From 77ea02cac3576f395e4548e7e6cbace90ba566ea Mon Sep 17 00:00:00 2001
From: Craig Andrews <candrews@integralblue.com>
Date: Wed, 20 Jan 2010 16:31:48 -0500
Subject: [PATCH 001/655] Any object (not just Notice's) can be queued

---
 classes/Queue_item.php                        | 13 +--
 classes/statusnet.ini                         |  6 +-
 db/statusnet.sql                              |  5 +-
 lib/dbqueuemanager.php                        | 95 ++++++-------------
 lib/jabberqueuehandler.php                    |  4 +-
 lib/ombqueuehandler.php                       |  2 +-
 lib/pingqueuehandler.php                      |  2 +-
 lib/pluginqueuehandler.php                    |  2 +-
 lib/publicqueuehandler.php                    |  6 +-
 lib/queuehandler.php                          | 95 ++-----------------
 lib/smsqueuehandler.php                       |  2 +-
 lib/stompqueuemanager.php                     | 38 +++-----
 lib/xmppmanager.php                           | 24 +++++
 plugins/Enjit/enjitqueuehandler.php           |  9 +-
 plugins/Facebook/facebookqueuehandler.php     |  2 +-
 plugins/RSSCloud/RSSCloudPlugin.php           | 41 ++------
 plugins/RSSCloud/RSSCloudQueueHandler.php     | 50 +---------
 plugins/TwitterBridge/twitterqueuehandler.php |  2 +-
 scripts/handlequeued.php                      |  2 +-
 19 files changed, 109 insertions(+), 291 deletions(-)
 mode change 100755 => 100644 plugins/RSSCloud/RSSCloudQueueHandler.php

diff --git a/classes/Queue_item.php b/classes/Queue_item.php
index cf805a6060..4d90e1d231 100644
--- a/classes/Queue_item.php
+++ b/classes/Queue_item.php
@@ -10,7 +10,8 @@ class Queue_item extends Memcached_DataObject
     /* the code below is auto generated do not remove the above tag */
 
     public $__table = 'queue_item';                      // table name
-    public $notice_id;                       // int(4)  primary_key not_null
+    public $id;                              // int(4)  primary_key not_null
+    public $frame;                           // blob   not_null
     public $transport;                       // varchar(8)  primary_key not_null
     public $created;                         // datetime()   not_null
     public $claimed;                         // datetime()
@@ -22,9 +23,6 @@ class Queue_item extends Memcached_DataObject
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
-    function sequenceKey()
-    { return array(false, false); }
-
     static function top($transport=null) {
 
         $qi = new Queue_item();
@@ -42,7 +40,7 @@ class Queue_item extends Memcached_DataObject
             # XXX: potential race condition
             # can we force it to only update if claimed is still null
             # (or old)?
-            common_log(LOG_INFO, 'claiming queue item = ' . $qi->notice_id .
+            common_log(LOG_INFO, 'claiming queue item id=' . $qi->id .
                 ' for transport ' . $qi->transport);
             $orig = clone($qi);
             $qi->claimed = common_sql_now();
@@ -57,9 +55,4 @@ class Queue_item extends Memcached_DataObject
         $qi = null;
         return null;
     }
-
-    function pkeyGet($kv)
-    {
-        return Memcached_DataObject::pkeyGet('Queue_item', $kv);
-    }
 }
diff --git a/classes/statusnet.ini b/classes/statusnet.ini
index 44088cf6b0..6203650a69 100644
--- a/classes/statusnet.ini
+++ b/classes/statusnet.ini
@@ -428,14 +428,14 @@ tagged = K
 tag = K
 
 [queue_item]
-notice_id = 129
+id = 129
+frame = 66
 transport = 130
 created = 142
 claimed = 14
 
 [queue_item__keys]
-notice_id = K
-transport = K
+id = K
 
 [related_group]
 group_id = 129
diff --git a/db/statusnet.sql b/db/statusnet.sql
index 2a9ab74c77..cb7dad3e24 100644
--- a/db/statusnet.sql
+++ b/db/statusnet.sql
@@ -274,13 +274,12 @@ create table remember_me (
 ) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
 
 create table queue_item (
-
-    notice_id integer not null comment 'notice queued' references notice (id),
+    id integer auto_increment primary key comment 'unique identifier',
+    frame blob not null comment 'serialized object',
     transport varchar(8) not null comment 'queue for what? "email", "jabber", "sms", "irc", ...',
     created datetime not null comment 'date this record was created',
     claimed datetime comment 'date this item was claimed',
 
-    constraint primary key (notice_id, transport),
     index queue_item_created_idx (created)
 
 ) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
diff --git a/lib/dbqueuemanager.php b/lib/dbqueuemanager.php
index 889365b649..139f502340 100644
--- a/lib/dbqueuemanager.php
+++ b/lib/dbqueuemanager.php
@@ -31,19 +31,17 @@
 class DBQueueManager extends QueueManager
 {
     /**
-     * Saves a notice object reference into the queue item table.
+     * Saves an object into the queue item table.
      * @return boolean true on success
      * @throws ServerException on failure
      */
     public function enqueue($object, $queue)
     {
-        $notice = $object;
-
         $qi = new Queue_item();
 
-        $qi->notice_id = $notice->id;
+        $qi->frame     = serialize($object);
         $qi->transport = $queue;
-        $qi->created   = $notice->created;
+        $qi->created   = common_sql_now();
         $result        = $qi->insert();
 
         if (!$result) {
@@ -73,34 +71,35 @@ class DBQueueManager extends QueueManager
      */
     public function poll()
     {
-        $this->_log(LOG_DEBUG, 'Checking for notices...');
-        $item = $this->_nextItem();
-        if ($item === false) {
-            $this->_log(LOG_DEBUG, 'No notices waiting; idling.');
+        $this->_log(LOG_DEBUG, 'Checking for queued objects...');
+        $qi = $this->_nextItem();
+        if ($qi === false) {
+            $this->_log(LOG_DEBUG, 'No queue items waiting; idling.');
             return false;
         }
-        if ($item === true) {
-            // We dequeued an entry for a deleted or invalid notice.
+        if ($qi === true) {
+            // We dequeued an entry for a deleted or invalid object.
             // Consider it a hit for poll rate purposes.
             return true;
         }
 
-        list($queue, $notice) = $item;
-        $this->_log(LOG_INFO, 'Got notice '. $notice->id . ' for transport ' . $queue);
+        $queue = $qi->transport;
+        $object = unserialize($qi->frame);
+        $this->_log(LOG_INFO, 'Got item id=' . $qi->id . ' for transport ' . $queue);
 
         // Yay! Got one!
         $handler = $this->getHandler($queue);
         if ($handler) {
-            if ($handler->handle_notice($notice)) {
-                $this->_log(LOG_INFO, "[$queue:notice $notice->id] Successfully handled notice");
-                $this->_done($notice, $queue);
+            if ($handler->handle($object)) {
+                $this->_log(LOG_INFO, "[$queue] Successfully handled object");
+                $this->_done($qi);
             } else {
-                $this->_log(LOG_INFO, "[$queue:notice $notice->id] Failed to handle notice");
-                $this->_fail($notice, $queue);
+                $this->_log(LOG_INFO, "[$queue] Failed to handle object");
+                $this->_fail($qi);
             }
         } else {
-            $this->_log(LOG_INFO, "[$queue:notice $notice->id] No handler for queue $queue; discarding.");
-            $this->_done($notice, $queue);
+            $this->_log(LOG_INFO, "[$queue] No handler for queue $queue; discarding.");
+            $this->_done($qi);
         }
         return true;
     }
@@ -108,8 +107,7 @@ class DBQueueManager extends QueueManager
     /**
      * Pop the oldest unclaimed item off the queue set and claim it.
      *
-     * @return mixed false if no items; true if bogus hit; otherwise array(string, Notice)
-     *               giving the queue transport name.
+     * @return mixed false if no items; true if bogus hit; otherwise Queue_item
      */
     protected function _nextItem()
     {
@@ -121,70 +119,42 @@ class DBQueueManager extends QueueManager
             return false;
         }
 
-        $queue = $qi->transport;
-        $notice = Notice::staticGet('id', $qi->notice_id);
-        if (empty($notice)) {
-            $this->_log(LOG_INFO, "[$queue:notice $notice->id] dequeued non-existent notice");
-            $qi->delete();
-            return true;
-        }
-
-        $result = $notice;
-        return array($queue, $notice);
+        return $qi;
     }
 
     /**
      * Delete our claimed item from the queue after successful processing.
      *
-     * @param Notice $object
-     * @param string $queue
+     * @param QueueItem $qi
      */
-    protected function _done($object, $queue)
+    protected function _done($qi)
     {
-        // XXX: right now, we only handle notices
-
-        $notice = $object;
-
-        $qi = Queue_item::pkeyGet(array('notice_id' => $notice->id,
-                                        'transport' => $queue));
-
         if (empty($qi)) {
-            $this->_log(LOG_INFO, "[$queue:notice $notice->id] Cannot find queue item");
+            $this->_log(LOG_INFO, "_done passed an empty queue item");
         } else {
             if (empty($qi->claimed)) {
-                $this->_log(LOG_WARNING, "[$queue:notice $notice->id] Reluctantly releasing unclaimed queue item");
+                $this->_log(LOG_WARNING, "Reluctantly releasing unclaimed queue item");
             }
             $qi->delete();
             $qi->free();
         }
 
-        $this->_log(LOG_INFO, "[$queue:notice $notice->id] done with item");
-        $this->stats('handled', $queue);
-
-        $notice->free();
+        $this->_log(LOG_INFO, "done with item");
     }
 
     /**
      * Free our claimed queue item for later reprocessing in case of
      * temporary failure.
      *
-     * @param Notice $object
-     * @param string $queue
+     * @param QueueItem $qi
      */
-    protected function _fail($object, $queue)
+    protected function _fail($qi)
     {
-        // XXX: right now, we only handle notices
-
-        $notice = $object;
-
-        $qi = Queue_item::pkeyGet(array('notice_id' => $notice->id,
-                                        'transport' => $queue));
-
         if (empty($qi)) {
-            $this->_log(LOG_INFO, "[$queue:notice $notice->id] Cannot find queue item");
+            $this->_log(LOG_INFO, "_fail passed an empty queue item");
         } else {
             if (empty($qi->claimed)) {
-                $this->_log(LOG_WARNING, "[$queue:notice $notice->id] Ignoring failure for unclaimed queue item");
+                $this->_log(LOG_WARNING, "Ignoring failure for unclaimed queue item");
             } else {
                 $orig = clone($qi);
                 $qi->claimed = null;
@@ -193,10 +163,7 @@ class DBQueueManager extends QueueManager
             }
         }
 
-        $this->_log(LOG_INFO, "[$queue:notice $notice->id] done with queue item");
-        $this->stats('error', $queue);
-
-        $notice->free();
+        $this->_log(LOG_INFO, "done with queue item");
     }
 
     protected function _log($level, $msg)
diff --git a/lib/jabberqueuehandler.php b/lib/jabberqueuehandler.php
index b1518866d7..83471f2df7 100644
--- a/lib/jabberqueuehandler.php
+++ b/lib/jabberqueuehandler.php
@@ -34,14 +34,14 @@ class JabberQueueHandler extends QueueHandler
         return 'jabber';
     }
 
-    function handle_notice($notice)
+    function handle($notice)
     {
         require_once(INSTALLDIR.'/lib/jabber.php');
         try {
             return jabber_broadcast_notice($notice);
         } catch (XMPPHP_Exception $e) {
             $this->log(LOG_ERR, "Got an XMPPHP_Exception: " . $e->getMessage());
-            exit(1);
+            return false;
         }
     }
 }
diff --git a/lib/ombqueuehandler.php b/lib/ombqueuehandler.php
index 3ffc1313bc..24896c784c 100644
--- a/lib/ombqueuehandler.php
+++ b/lib/ombqueuehandler.php
@@ -36,7 +36,7 @@ class OmbQueueHandler extends QueueHandler
      * @fixme doesn't currently report failure back to the queue manager
      * because omb_broadcast_notice() doesn't report it to us
      */
-    function handle_notice($notice)
+    function handle($notice)
     {
         if ($this->is_remote($notice)) {
             $this->log(LOG_DEBUG, 'Ignoring remote notice ' . $notice->id);
diff --git a/lib/pingqueuehandler.php b/lib/pingqueuehandler.php
index 8bb2180786..4e4d74cb1a 100644
--- a/lib/pingqueuehandler.php
+++ b/lib/pingqueuehandler.php
@@ -30,7 +30,7 @@ class PingQueueHandler extends QueueHandler {
         return 'ping';
     }
 
-    function handle_notice($notice) {
+    function handle($notice) {
         require_once INSTALLDIR . '/lib/ping.php';
         return ping_broadcast_notice($notice);
     }
diff --git a/lib/pluginqueuehandler.php b/lib/pluginqueuehandler.php
index 24d5046997..9653ccad42 100644
--- a/lib/pluginqueuehandler.php
+++ b/lib/pluginqueuehandler.php
@@ -42,7 +42,7 @@ class PluginQueueHandler extends QueueHandler
         return 'plugin';
     }
 
-    function handle_notice($notice)
+    function handle($notice)
     {
         Event::handle('HandleQueuedNotice', array(&$notice));
         return true;
diff --git a/lib/publicqueuehandler.php b/lib/publicqueuehandler.php
index 9ea9ee73a3..c9edb8d5d7 100644
--- a/lib/publicqueuehandler.php
+++ b/lib/publicqueuehandler.php
@@ -23,7 +23,6 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
 
 /**
  * Queue handler for pushing new notices to public XMPP subscribers.
- * @fixme correct this exception handling
  */
 class PublicQueueHandler extends QueueHandler
 {
@@ -33,15 +32,14 @@ class PublicQueueHandler extends QueueHandler
         return 'public';
     }
 
-    function handle_notice($notice)
+    function handle($notice)
     {
         require_once(INSTALLDIR.'/lib/jabber.php');
         try {
             return jabber_public_notice($notice);
         } catch (XMPPHP_Exception $e) {
             $this->log(LOG_ERR, "Got an XMPPHP_Exception: " . $e->getMessage());
-            die($e->getMessage());
+            return false;
         }
-        return true;
     }
 }
diff --git a/lib/queuehandler.php b/lib/queuehandler.php
index 613be6e330..2909cd83b1 100644
--- a/lib/queuehandler.php
+++ b/lib/queuehandler.php
@@ -22,51 +22,20 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 /**
  * Base class for queue handlers.
  *
- * As extensions of the Daemon class, each queue handler has the ability
- * to launch itself in the background, at which point it'll pass control
- * to the configured QueueManager class to poll for updates.
+ * As of 0.9, queue handlers are short-lived for items as they are
+ * dequeued by a QueueManager running in an IoMaster in a daemon
+ * such as queuedaemon.php.
+ *
+ * Extensions requiring long-running maintenance or polling should
+ * register an IoManager.
  *
  * Subclasses must override at least the following methods:
  * - transport
- * - handle_notice
+ * - handle
  */
-#class QueueHandler extends Daemon
 class QueueHandler
 {
 
-#    function __construct($id=null, $daemonize=true)
-#    {
-#        parent::__construct($daemonize);
-#
-#        if ($id) {
-#            $this->set_id($id);
-#        }
-#    }
-
-    /**
-     * How many seconds a polling-based queue manager should wait between
-     * checks for new items to handle.
-     *
-     * Defaults to 60 seconds; override to speed up or slow down.
-     *
-     * @fixme not really compatible with global queue manager
-     * @return int timeout in seconds
-     */
-#    function timeout()
-#    {
-#        return 60;
-#    }
-
-#    function class_name()
-#    {
-#        return ucfirst($this->transport()) . 'Handler';
-#    }
-
-#    function name()
-#    {
-#        return strtolower($this->class_name().'.'.$this->get_id());
-#    }
-
     /**
      * Return transport keyword which identifies items this queue handler
      * services; must be defined for all subclasses.
@@ -83,61 +52,17 @@ class QueueHandler
 
     /**
      * Here's the meat of your queue handler -- you're handed a Notice
-     * object, which you may do as you will with.
+     * or other object, which you may do as you will with.
      *
      * If this function indicates failure, a warning will be logged
      * and the item is placed back in the queue to be re-run.
      *
-     * @param Notice $notice
+     * @param mixed $object
      * @return boolean true on success, false on failure
      */
-    function handle_notice($notice)
+    function handle($object)
     {
         return true;
     }
-
-    /**
-     * Setup and start of run loop for this queue handler as a daemon.
-     * Most of the heavy lifting is passed on to the QueueManager's service()
-     * method, which passes control back to our handle_notice() method for
-     * each notice that comes in on the queue.
-     *
-     * Most of the time this won't need to be overridden in a subclass.
-     *
-     * @return boolean true on success, false on failure
-     */
-    function run()
-    {
-        if (!$this->start()) {
-            $this->log(LOG_WARNING, 'failed to start');
-            return false;
-        }
-
-        $this->log(LOG_INFO, 'checking for queued notices');
-
-        $queue   = $this->transport();
-        $timeout = $this->timeout();
-
-        $qm = QueueManager::get();
-
-        $qm->service($queue, $this);
-
-        $this->log(LOG_INFO, 'finished servicing the queue');
-
-        if (!$this->finish()) {
-            $this->log(LOG_WARNING, 'failed to clean up');
-            return false;
-        }
-
-        $this->log(LOG_INFO, 'terminating normally');
-
-        return true;
-    }
-
-
-    function log($level, $msg)
-    {
-        common_log($level, $this->class_name() . ' ('. $this->get_id() .'): '.$msg);
-    }
 }
 
diff --git a/lib/smsqueuehandler.php b/lib/smsqueuehandler.php
index 48a96409d0..6085d2b4ac 100644
--- a/lib/smsqueuehandler.php
+++ b/lib/smsqueuehandler.php
@@ -31,7 +31,7 @@ class SmsQueueHandler extends QueueHandler
         return 'sms';
     }
 
-    function handle_notice($notice)
+    function handle($notice)
     {
     	require_once(INSTALLDIR.'/lib/mail.php');
         return mail_broadcast_notice_sms($notice);
diff --git a/lib/stompqueuemanager.php b/lib/stompqueuemanager.php
index 00590fdb69..6496b5cf17 100644
--- a/lib/stompqueuemanager.php
+++ b/lib/stompqueuemanager.php
@@ -125,28 +125,25 @@ class StompQueueManager extends QueueManager
     }
 
     /**
-     * Saves a notice object reference into the queue item table.
+     * Saves an object into the queue item table.
      * @return boolean true on success
      */
     public function enqueue($object, $queue)
     {
-        $notice = $object;
+        $msg = serialize($object);
 
         $this->_connect();
 
-        // XXX: serialize and send entire notice
-
         $result = $this->con->send($this->queueName($queue),
-                                   $notice->id, 		// BODY of the message
-                                   array ('created' => $notice->created));
+                                   $msg, 		// BODY of the message
+                                   array ('created' => $timestamp));
 
         if (!$result) {
             common_log(LOG_ERR, 'Error sending to '.$queue.' queue');
             return false;
         }
 
-        common_log(LOG_DEBUG, 'complete remote queueing notice ID = '
-                   . $notice->id . ' for ' . $queue);
+        common_log(LOG_DEBUG, "complete remote queueing $log for $queue");
         $this->stats('enqueued', $queue);
     }
 
@@ -174,7 +171,7 @@ class StompQueueManager extends QueueManager
         $ok = true;
         $frames = $this->con->readFrames();
         foreach ($frames as $frame) {
-            $ok = $ok && $this->_handleNotice($frame);
+            $ok = $ok && $this->_handleItem($frame);
         }
         return $ok;
     }
@@ -265,10 +262,10 @@ class StompQueueManager extends QueueManager
     }
 
     /**
-     * Handle and acknowledge a notice event that's come in through a queue.
+     * Handle and acknowledge an event that's come in through a queue.
      *
      * If the queue handler reports failure, the message is requeued for later.
-     * Missing notices or handler classes will drop the message.
+     * Missing objects or handler classes will drop the message.
      *
      * Side effects: in multi-site mode, may reset site configuration to
      * match the site that queued the event.
@@ -276,24 +273,15 @@ class StompQueueManager extends QueueManager
      * @param StompFrame $frame
      * @return bool
      */
-    protected function _handleNotice($frame)
+    protected function _handleItem($frame)
     {
         list($site, $queue) = $this->parseDestination($frame->headers['destination']);
         if ($site != common_config('site', 'server')) {
             $this->stats('switch');
             StatusNet::init($site);
         }
-
-        $id = intval($frame->body);
-        $info = "notice $id posted at {$frame->headers['created']} in queue $queue";
-
-        $notice = Notice::staticGet('id', $id);
-        if (empty($notice)) {
-            $this->_log(LOG_WARNING, "Skipping missing $info");
-            $this->con->ack($frame);
-            $this->stats('badnotice', $queue);
-            return false;
-        }
+        $info = "object posted at {$frame->headers['created']} in queue $queue";
+        $item = unserialize($frame->body);
 
         $handler = $this->getHandler($queue);
         if (!$handler) {
@@ -303,7 +291,7 @@ class StompQueueManager extends QueueManager
             return false;
         }
 
-        $ok = $handler->handle_notice($notice);
+        $ok = $handler->handle($item);
 
         if (!$ok) {
             $this->_log(LOG_WARNING, "Failed handling $info");
@@ -311,7 +299,7 @@ class StompQueueManager extends QueueManager
             // this kind of queue management ourselves;
             // if we don't ack, it should resend...
             $this->con->ack($frame);
-            $this->enqueue($notice, $queue);
+            $this->enqueue($item, $queue);
             $this->stats('requeued', $queue);
             return false;
         }
diff --git a/lib/xmppmanager.php b/lib/xmppmanager.php
index dfff63a30c..c499868548 100644
--- a/lib/xmppmanager.php
+++ b/lib/xmppmanager.php
@@ -175,6 +175,30 @@ class XmppManager extends IoManager
         }
     }
 
+    /**
+     * For queue handlers to pass us a message to push out,
+     * if we're active.
+     *
+     * @fixme should this be blocking etc?
+     *
+     * @param string $msg XML stanza to send
+     * @return boolean success
+     */
+    public function send($msg)
+    {
+        if ($this->conn && !$this->conn->isDisconnected()) {
+            $bytes = $this->conn->send($msg);
+            if ($bytes > 0) {
+                return true;
+            } else {
+                return false;
+            }
+        } else {
+            // Can't send right now...
+            return false;
+        }
+    }
+
     /**
      * Send a keepalive ping to the XMPP server.
      */
diff --git a/plugins/Enjit/enjitqueuehandler.php b/plugins/Enjit/enjitqueuehandler.php
index f0e706b929..14085cc5e3 100644
--- a/plugins/Enjit/enjitqueuehandler.php
+++ b/plugins/Enjit/enjitqueuehandler.php
@@ -32,14 +32,7 @@ class EnjitQueueHandler extends QueueHandler
         return 'enjit';
     }
 
-    function start()
-    {
-        $this->log(LOG_INFO, "Starting EnjitQueueHandler");
-        $this->log(LOG_INFO, "Broadcasting to ".common_config('enjit', 'apiurl'));
-        return true;
-    }
-
-    function handle_notice($notice)
+    function handle($notice)
     {
 
         $profile = Profile::staticGet($notice->profile_id);
diff --git a/plugins/Facebook/facebookqueuehandler.php b/plugins/Facebook/facebookqueuehandler.php
index 1778690e5b..524af7bc45 100644
--- a/plugins/Facebook/facebookqueuehandler.php
+++ b/plugins/Facebook/facebookqueuehandler.php
@@ -28,7 +28,7 @@ class FacebookQueueHandler extends QueueHandler
         return 'facebook';
     }
 
-    function handle_notice($notice)
+    function handle($notice)
     {
         if ($this->_isLocal($notice)) {
             return facebookBroadcastNotice($notice);
diff --git a/plugins/RSSCloud/RSSCloudPlugin.php b/plugins/RSSCloud/RSSCloudPlugin.php
index 2de162628f..9f444c8bba 100644
--- a/plugins/RSSCloud/RSSCloudPlugin.php
+++ b/plugins/RSSCloud/RSSCloudPlugin.php
@@ -138,6 +138,9 @@ class RSSCloudPlugin extends Plugin
         case 'RSSCloudNotifier':
             include_once INSTALLDIR . '/plugins/RSSCloud/RSSCloudNotifier.php';
             return false;
+        case 'RSSCloudQueueHandler':
+            include_once INSTALLDIR . '/plugins/RSSCloud/RSSCloudQueueHandler.php';
+            return false;
         case 'RSSCloudRequestNotifyAction':
         case 'LoggingAggregatorAction':
             include_once INSTALLDIR . '/plugins/RSSCloud/' .
@@ -193,32 +196,6 @@ class RSSCloudPlugin extends Plugin
         return true;
     }
 
-    /**
-     * broadcast the message when not using queuehandler
-     *
-     * @param Notice &$notice the notice
-     * @param array  $queue   destination queue
-     *
-     * @return boolean hook return
-     */
-
-    function onUnqueueHandleNotice(&$notice, $queue)
-    {
-        if (($queue == 'rsscloud') && ($this->_isLocal($notice))) {
-
-            common_debug('broadcasting rssCloud bound notice ' . $notice->id);
-
-            $profile = $notice->getProfile();
-
-            $notifier = new RSSCloudNotifier();
-            $notifier->notify($profile);
-
-            return false;
-        }
-
-        return true;
-    }
-
     /**
      * Determine whether the notice was locally created
      *
@@ -261,19 +238,15 @@ class RSSCloudPlugin extends Plugin
     }
 
     /**
-     * Add RSSCloudQueueHandler to the list of valid daemons to
-     * start
+     * Register RSSCloud notice queue handler
      *
-     * @param array $daemons the list of daemons to run
+     * @param QueueManager $manager
      *
      * @return boolean hook return
-     *
      */
-
-    function onGetValidDaemons($daemons)
+    function onEndInitializeQueueManager($manager)
     {
-        array_push($daemons, INSTALLDIR .
-                   '/plugins/RSSCloud/RSSCloudQueueHandler.php');
+        $manager->connect('rsscloud', 'RSSCloudQueueHandler');
         return true;
     }
 
diff --git a/plugins/RSSCloud/RSSCloudQueueHandler.php b/plugins/RSSCloud/RSSCloudQueueHandler.php
old mode 100755
new mode 100644
index 693dd27c1f..295c261895
--- a/plugins/RSSCloud/RSSCloudQueueHandler.php
+++ b/plugins/RSSCloud/RSSCloudQueueHandler.php
@@ -1,4 +1,3 @@
-#!/usr/bin/env php
 <?php
 /*
  * StatusNet - the distributed open-source microblogging tool
@@ -18,61 +17,20 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-define('INSTALLDIR', realpath(dirname(__FILE__) . '/../..'));
-
-$shortoptions = 'i::';
-$longoptions = array('id::');
-
-$helptext = <<<END_OF_ENJIT_HELP
-Daemon script for pushing new notices to RSSCloud subscribers.
-
-    -i --id           Identity (default none)
-
-END_OF_ENJIT_HELP;
-
-require_once INSTALLDIR . '/scripts/commandline.inc';
-require_once INSTALLDIR . '/lib/queuehandler.php';
-require_once INSTALLDIR . '/plugins/RSSCloud/RSSCloudNotifier.php';
-require_once INSTALLDIR . '/plugins/RSSCloud/RSSCloudSubscription.php';
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 class RSSCloudQueueHandler extends QueueHandler
 {
-    var $notifier = null;
-
     function transport()
     {
         return 'rsscloud';
     }
 
-    function start()
-    {
-        $this->log(LOG_INFO, "INITIALIZE");
-        $this->notifier = new RSSCloudNotifier();
-        return true;
-    }
-
-    function handle_notice($notice)
+    function handle($notice)
     {
         $profile = $notice->getProfile();
-        return $this->notifier->notify($profile);
+        $notifier = new RSSCloudNotifier();
+        return $notifier->notify($profile);
     }
-
-    function finish()
-    {
-    }
-
 }
 
-if (have_option('i')) {
-    $id = get_option_value('i');
-} else if (have_option('--id')) {
-    $id = get_option_value('--id');
-} else if (count($args) > 0) {
-    $id = $args[0];
-} else {
-    $id = null;
-}
-
-$handler = new RSSCloudQueueHandler($id);
-
-$handler->runOnce();
diff --git a/plugins/TwitterBridge/twitterqueuehandler.php b/plugins/TwitterBridge/twitterqueuehandler.php
index 5089ca7b74..b5a624e83d 100644
--- a/plugins/TwitterBridge/twitterqueuehandler.php
+++ b/plugins/TwitterBridge/twitterqueuehandler.php
@@ -28,7 +28,7 @@ class TwitterQueueHandler extends QueueHandler
         return 'twitter';
     }
 
-    function handle_notice($notice)
+    function handle($notice)
     {
         return broadcast_twitter($notice);
     }
diff --git a/scripts/handlequeued.php b/scripts/handlequeued.php
index 9031437aac..8158849695 100755
--- a/scripts/handlequeued.php
+++ b/scripts/handlequeued.php
@@ -50,7 +50,7 @@ if (empty($notice)) {
     exit(1);
 }
 
-if (!$handler->handle_notice($notice)) {
+if (!$handler->handle($notice)) {
     print "Failed to handle notice id $noticeId on queue '$queue'.\n";
     exit(1);
 }

From bd72e8b96e1bc360ba46a1864c6121f3b5f11235 Mon Sep 17 00:00:00 2001
From: Craig Andrews <candrews@integralblue.com>
Date: Fri, 15 Jan 2010 22:28:43 -0500
Subject: [PATCH 002/655] Allow for instances as well as class names to be
 passed as queue handlers and iomanagers. Introduce
 IoManager::GLOBAL_SINGLE_ONLY which indicates that only one instance of this
 iomanager will be run, regardless of how many threads/processes and sites
 there are.

---
 lib/iomanager.php       |  1 +
 lib/iomaster.php        | 25 ++++++++++++++++++-------
 lib/queuemanager.php    |  6 ++++--
 scripts/queuedaemon.php | 13 +++++++++----
 4 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/lib/iomanager.php b/lib/iomanager.php
index ee2ff958b9..f9d97d6a97 100644
--- a/lib/iomanager.php
+++ b/lib/iomanager.php
@@ -31,6 +31,7 @@
 
 abstract class IoManager
 {
+    const GLOBAL_SINGLE_ONLY = -1;
     const SINGLE_ONLY = 0;
     const INSTANCE_PER_SITE = 1;
     const INSTANCE_PER_PROCESS = 2;
diff --git a/lib/iomaster.php b/lib/iomaster.php
index ce77b53b2e..979f73e753 100644
--- a/lib/iomaster.php
+++ b/lib/iomaster.php
@@ -32,6 +32,7 @@ class IoMaster
     public $id;
 
     protected $multiSite = false;
+    protected $includeGlobalSingletons = true;
     protected $managers = array();
     protected $singletons = array();
 
@@ -47,8 +48,9 @@ class IoMaster
         $this->monitor = new QueueMonitor();
     }
 
-    public function init($multiSite=null)
+    public function init($multiSite=null, $includeGlobalSingletons = true)
     {
+        $this->includeGlobalSingletons = $includeGlobalSingletons;
         if ($multiSite !== null) {
             $this->multiSite = $multiSite;
         }
@@ -107,7 +109,7 @@ class IoMaster
      */
     protected function instantiate($class)
     {
-        if (isset($this->singletons[$class])) {
+        if (is_string($class) && isset($this->singletons[$class])) {
             // Already instantiated a multi-site-capable handler.
             // Just let it know it should listen to this site too!
             $this->singletons[$class]->addSite(common_config('site', 'server'));
@@ -116,25 +118,34 @@ class IoMaster
 
         $manager = $this->getManager($class);
 
+        $caps = $manager->multiSite();
         if ($this->multiSite) {
-            $caps = $manager->multiSite();
             if ($caps == IoManager::SINGLE_ONLY) {
                 throw new Exception("$class can't run with --all; aborting.");
             }
-            if ($caps == IoManager::INSTANCE_PER_PROCESS) {
+            if ($caps == IoManager::INSTANCE_PER_PROCESS ||
+               ( $this->includeGlobalSingletons && $caps == IoManager::GLOBAL_SINGLE_ONLY )) {
                 // Save this guy for later!
                 // We'll only need the one to cover multiple sites.
-                $this->singletons[$class] = $manager;
+                if (is_string($class)){
+                    $this->singletons[$class] = $manager;
+                }
                 $manager->addSite(common_config('site', 'server'));
             }
         }
 
-        $this->managers[] = $manager;
+        if( $this->includeGlobalSingletons || $caps != IoManager::GLOBAL_SINGLE_ONLY ) {
+            $this->managers[] = $manager;
+        }
     }
     
     protected function getManager($class)
     {
-        return call_user_func(array($class, 'get'));
+        if(is_object($class)){
+            return $class;
+        }else{
+            return call_user_func(array($class, 'get'));
+        }
     }
 
     /**
diff --git a/lib/queuemanager.php b/lib/queuemanager.php
index 291174d3c4..b20a934687 100644
--- a/lib/queuemanager.php
+++ b/lib/queuemanager.php
@@ -119,7 +119,9 @@ abstract class QueueManager extends IoManager
     {
         if (isset($this->handlers[$queue])) {
             $class = $this->handlers[$queue];
-            if (class_exists($class)) {
+            if(is_object($class)) {
+                return $class;
+            } else if (class_exists($class)) {
                 return new $class();
             } else {
                 common_log(LOG_ERR, "Nonexistent handler class '$class' for queue '$queue'");
@@ -182,7 +184,7 @@ abstract class QueueManager extends IoManager
      * Only registered transports will be reliably picked up!
      *
      * @param string $transport
-     * @param string $class
+     * @param string $class class name or object instance
      */
     public function connect($transport, $class)
     {
diff --git a/scripts/queuedaemon.php b/scripts/queuedaemon.php
index 162f617e0d..6cce4eaa75 100755
--- a/scripts/queuedaemon.php
+++ b/scripts/queuedaemon.php
@@ -122,7 +122,7 @@ class QueueDaemon extends Daemon
         if ($this->threads > 1) {
             return $this->runThreads();
         } else {
-            return $this->runLoop();
+            return $this->runLoop(true);
         }
     }
     
@@ -176,7 +176,8 @@ class QueueDaemon extends Daemon
     {
         $this->set_id($this->get_id() . "." . $thread);
         $this->resetDb();
-        $this->runLoop();
+        //only include global singletons on the first thread
+        $this->runLoop($thread == 1);
     }
 
     /**
@@ -213,14 +214,18 @@ class QueueDaemon extends Daemon
      *
      * Most of the time this won't need to be overridden in a subclass.
      *
+     * @param boolean $includeGlobalSingletons Include IoManagers that are
+     * global singletons (should only be one instance - regardless of how
+     * many processes or sites there are)
+     *
      * @return boolean true on success, false on failure
      */
-    function runLoop()
+    function runLoop($includeGlobalSingletons)
     {
         $this->log(LOG_INFO, 'checking for queued notices');
 
         $master = new IoMaster($this->get_id());
-        $master->init($this->all);
+        $master->init($this->all, $includeGlobalSingletons);
         $master->service();
 
         $this->log(LOG_INFO, 'finished servicing the queue');

From ef7db60fed8575c381801c0b998d9ed58aab1745 Mon Sep 17 00:00:00 2001
From: Craig Andrews <candrews@integralblue.com>
Date: Fri, 22 Jan 2010 17:14:41 -0500
Subject: [PATCH 003/655] Revert "Allow for instances as well as class names to
 be passed as queue handlers and iomanagers."

Going to use brion's SpawningDaemon instead

This reverts commit bd72e8b96e1bc360ba46a1864c6121f3b5f11235.
---
 lib/iomanager.php       |  1 -
 lib/iomaster.php        | 25 +++++++------------------
 lib/queuemanager.php    |  6 ++----
 scripts/queuedaemon.php | 13 ++++---------
 4 files changed, 13 insertions(+), 32 deletions(-)

diff --git a/lib/iomanager.php b/lib/iomanager.php
index f9d97d6a97..ee2ff958b9 100644
--- a/lib/iomanager.php
+++ b/lib/iomanager.php
@@ -31,7 +31,6 @@
 
 abstract class IoManager
 {
-    const GLOBAL_SINGLE_ONLY = -1;
     const SINGLE_ONLY = 0;
     const INSTANCE_PER_SITE = 1;
     const INSTANCE_PER_PROCESS = 2;
diff --git a/lib/iomaster.php b/lib/iomaster.php
index 979f73e753..ce77b53b2e 100644
--- a/lib/iomaster.php
+++ b/lib/iomaster.php
@@ -32,7 +32,6 @@ class IoMaster
     public $id;
 
     protected $multiSite = false;
-    protected $includeGlobalSingletons = true;
     protected $managers = array();
     protected $singletons = array();
 
@@ -48,9 +47,8 @@ class IoMaster
         $this->monitor = new QueueMonitor();
     }
 
-    public function init($multiSite=null, $includeGlobalSingletons = true)
+    public function init($multiSite=null)
     {
-        $this->includeGlobalSingletons = $includeGlobalSingletons;
         if ($multiSite !== null) {
             $this->multiSite = $multiSite;
         }
@@ -109,7 +107,7 @@ class IoMaster
      */
     protected function instantiate($class)
     {
-        if (is_string($class) && isset($this->singletons[$class])) {
+        if (isset($this->singletons[$class])) {
             // Already instantiated a multi-site-capable handler.
             // Just let it know it should listen to this site too!
             $this->singletons[$class]->addSite(common_config('site', 'server'));
@@ -118,34 +116,25 @@ class IoMaster
 
         $manager = $this->getManager($class);
 
-        $caps = $manager->multiSite();
         if ($this->multiSite) {
+            $caps = $manager->multiSite();
             if ($caps == IoManager::SINGLE_ONLY) {
                 throw new Exception("$class can't run with --all; aborting.");
             }
-            if ($caps == IoManager::INSTANCE_PER_PROCESS ||
-               ( $this->includeGlobalSingletons && $caps == IoManager::GLOBAL_SINGLE_ONLY )) {
+            if ($caps == IoManager::INSTANCE_PER_PROCESS) {
                 // Save this guy for later!
                 // We'll only need the one to cover multiple sites.
-                if (is_string($class)){
-                    $this->singletons[$class] = $manager;
-                }
+                $this->singletons[$class] = $manager;
                 $manager->addSite(common_config('site', 'server'));
             }
         }
 
-        if( $this->includeGlobalSingletons || $caps != IoManager::GLOBAL_SINGLE_ONLY ) {
-            $this->managers[] = $manager;
-        }
+        $this->managers[] = $manager;
     }
     
     protected function getManager($class)
     {
-        if(is_object($class)){
-            return $class;
-        }else{
-            return call_user_func(array($class, 'get'));
-        }
+        return call_user_func(array($class, 'get'));
     }
 
     /**
diff --git a/lib/queuemanager.php b/lib/queuemanager.php
index b20a934687..291174d3c4 100644
--- a/lib/queuemanager.php
+++ b/lib/queuemanager.php
@@ -119,9 +119,7 @@ abstract class QueueManager extends IoManager
     {
         if (isset($this->handlers[$queue])) {
             $class = $this->handlers[$queue];
-            if(is_object($class)) {
-                return $class;
-            } else if (class_exists($class)) {
+            if (class_exists($class)) {
                 return new $class();
             } else {
                 common_log(LOG_ERR, "Nonexistent handler class '$class' for queue '$queue'");
@@ -184,7 +182,7 @@ abstract class QueueManager extends IoManager
      * Only registered transports will be reliably picked up!
      *
      * @param string $transport
-     * @param string $class class name or object instance
+     * @param string $class
      */
     public function connect($transport, $class)
     {
diff --git a/scripts/queuedaemon.php b/scripts/queuedaemon.php
index 6cce4eaa75..162f617e0d 100755
--- a/scripts/queuedaemon.php
+++ b/scripts/queuedaemon.php
@@ -122,7 +122,7 @@ class QueueDaemon extends Daemon
         if ($this->threads > 1) {
             return $this->runThreads();
         } else {
-            return $this->runLoop(true);
+            return $this->runLoop();
         }
     }
     
@@ -176,8 +176,7 @@ class QueueDaemon extends Daemon
     {
         $this->set_id($this->get_id() . "." . $thread);
         $this->resetDb();
-        //only include global singletons on the first thread
-        $this->runLoop($thread == 1);
+        $this->runLoop();
     }
 
     /**
@@ -214,18 +213,14 @@ class QueueDaemon extends Daemon
      *
      * Most of the time this won't need to be overridden in a subclass.
      *
-     * @param boolean $includeGlobalSingletons Include IoManagers that are
-     * global singletons (should only be one instance - regardless of how
-     * many processes or sites there are)
-     *
      * @return boolean true on success, false on failure
      */
-    function runLoop($includeGlobalSingletons)
+    function runLoop()
     {
         $this->log(LOG_INFO, 'checking for queued notices');
 
         $master = new IoMaster($this->get_id());
-        $master->init($this->all, $includeGlobalSingletons);
+        $master->init($this->all);
         $master->service();
 
         $this->log(LOG_INFO, 'finished servicing the queue');

From 78eb9c78a781ba8d6929a260e5f9c07714d59ee3 Mon Sep 17 00:00:00 2001
From: Craig Andrews <candrews@integralblue.com>
Date: Fri, 22 Jan 2010 17:19:32 -0500
Subject: [PATCH 004/655] Will re-enable anything queueing after 0.9.x merge

Revert "Any object (not just Notice's) can be queued"

This reverts commit 77ea02cac3576f395e4548e7e6cbace90ba566ea.
---
 classes/Queue_item.php                        | 13 ++-
 classes/statusnet.ini                         |  6 +-
 db/statusnet.sql                              |  5 +-
 lib/dbqueuemanager.php                        | 95 +++++++++++++------
 lib/jabberqueuehandler.php                    |  4 +-
 lib/ombqueuehandler.php                       |  2 +-
 lib/pingqueuehandler.php                      |  2 +-
 lib/pluginqueuehandler.php                    |  2 +-
 lib/publicqueuehandler.php                    |  6 +-
 lib/queuehandler.php                          | 95 +++++++++++++++++--
 lib/smsqueuehandler.php                       |  2 +-
 lib/stompqueuemanager.php                     | 38 +++++---
 lib/xmppmanager.php                           | 24 -----
 plugins/Enjit/enjitqueuehandler.php           |  9 +-
 plugins/Facebook/facebookqueuehandler.php     |  2 +-
 plugins/RSSCloud/RSSCloudPlugin.php           | 41 ++++++--
 plugins/RSSCloud/RSSCloudQueueHandler.php     | 50 +++++++++-
 plugins/TwitterBridge/twitterqueuehandler.php |  2 +-
 scripts/handlequeued.php                      |  2 +-
 19 files changed, 291 insertions(+), 109 deletions(-)
 mode change 100644 => 100755 plugins/RSSCloud/RSSCloudQueueHandler.php

diff --git a/classes/Queue_item.php b/classes/Queue_item.php
index 4d90e1d231..cf805a6060 100644
--- a/classes/Queue_item.php
+++ b/classes/Queue_item.php
@@ -10,8 +10,7 @@ class Queue_item extends Memcached_DataObject
     /* the code below is auto generated do not remove the above tag */
 
     public $__table = 'queue_item';                      // table name
-    public $id;                              // int(4)  primary_key not_null
-    public $frame;                           // blob   not_null
+    public $notice_id;                       // int(4)  primary_key not_null
     public $transport;                       // varchar(8)  primary_key not_null
     public $created;                         // datetime()   not_null
     public $claimed;                         // datetime()
@@ -23,6 +22,9 @@ class Queue_item extends Memcached_DataObject
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
+    function sequenceKey()
+    { return array(false, false); }
+
     static function top($transport=null) {
 
         $qi = new Queue_item();
@@ -40,7 +42,7 @@ class Queue_item extends Memcached_DataObject
             # XXX: potential race condition
             # can we force it to only update if claimed is still null
             # (or old)?
-            common_log(LOG_INFO, 'claiming queue item id=' . $qi->id .
+            common_log(LOG_INFO, 'claiming queue item = ' . $qi->notice_id .
                 ' for transport ' . $qi->transport);
             $orig = clone($qi);
             $qi->claimed = common_sql_now();
@@ -55,4 +57,9 @@ class Queue_item extends Memcached_DataObject
         $qi = null;
         return null;
     }
+
+    function pkeyGet($kv)
+    {
+        return Memcached_DataObject::pkeyGet('Queue_item', $kv);
+    }
 }
diff --git a/classes/statusnet.ini b/classes/statusnet.ini
index 6203650a69..44088cf6b0 100644
--- a/classes/statusnet.ini
+++ b/classes/statusnet.ini
@@ -428,14 +428,14 @@ tagged = K
 tag = K
 
 [queue_item]
-id = 129
-frame = 66
+notice_id = 129
 transport = 130
 created = 142
 claimed = 14
 
 [queue_item__keys]
-id = K
+notice_id = K
+transport = K
 
 [related_group]
 group_id = 129
diff --git a/db/statusnet.sql b/db/statusnet.sql
index cb7dad3e24..2a9ab74c77 100644
--- a/db/statusnet.sql
+++ b/db/statusnet.sql
@@ -274,12 +274,13 @@ create table remember_me (
 ) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
 
 create table queue_item (
-    id integer auto_increment primary key comment 'unique identifier',
-    frame blob not null comment 'serialized object',
+
+    notice_id integer not null comment 'notice queued' references notice (id),
     transport varchar(8) not null comment 'queue for what? "email", "jabber", "sms", "irc", ...',
     created datetime not null comment 'date this record was created',
     claimed datetime comment 'date this item was claimed',
 
+    constraint primary key (notice_id, transport),
     index queue_item_created_idx (created)
 
 ) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
diff --git a/lib/dbqueuemanager.php b/lib/dbqueuemanager.php
index 139f502340..889365b649 100644
--- a/lib/dbqueuemanager.php
+++ b/lib/dbqueuemanager.php
@@ -31,17 +31,19 @@
 class DBQueueManager extends QueueManager
 {
     /**
-     * Saves an object into the queue item table.
+     * Saves a notice object reference into the queue item table.
      * @return boolean true on success
      * @throws ServerException on failure
      */
     public function enqueue($object, $queue)
     {
+        $notice = $object;
+
         $qi = new Queue_item();
 
-        $qi->frame     = serialize($object);
+        $qi->notice_id = $notice->id;
         $qi->transport = $queue;
-        $qi->created   = common_sql_now();
+        $qi->created   = $notice->created;
         $result        = $qi->insert();
 
         if (!$result) {
@@ -71,35 +73,34 @@ class DBQueueManager extends QueueManager
      */
     public function poll()
     {
-        $this->_log(LOG_DEBUG, 'Checking for queued objects...');
-        $qi = $this->_nextItem();
-        if ($qi === false) {
-            $this->_log(LOG_DEBUG, 'No queue items waiting; idling.');
+        $this->_log(LOG_DEBUG, 'Checking for notices...');
+        $item = $this->_nextItem();
+        if ($item === false) {
+            $this->_log(LOG_DEBUG, 'No notices waiting; idling.');
             return false;
         }
-        if ($qi === true) {
-            // We dequeued an entry for a deleted or invalid object.
+        if ($item === true) {
+            // We dequeued an entry for a deleted or invalid notice.
             // Consider it a hit for poll rate purposes.
             return true;
         }
 
-        $queue = $qi->transport;
-        $object = unserialize($qi->frame);
-        $this->_log(LOG_INFO, 'Got item id=' . $qi->id . ' for transport ' . $queue);
+        list($queue, $notice) = $item;
+        $this->_log(LOG_INFO, 'Got notice '. $notice->id . ' for transport ' . $queue);
 
         // Yay! Got one!
         $handler = $this->getHandler($queue);
         if ($handler) {
-            if ($handler->handle($object)) {
-                $this->_log(LOG_INFO, "[$queue] Successfully handled object");
-                $this->_done($qi);
+            if ($handler->handle_notice($notice)) {
+                $this->_log(LOG_INFO, "[$queue:notice $notice->id] Successfully handled notice");
+                $this->_done($notice, $queue);
             } else {
-                $this->_log(LOG_INFO, "[$queue] Failed to handle object");
-                $this->_fail($qi);
+                $this->_log(LOG_INFO, "[$queue:notice $notice->id] Failed to handle notice");
+                $this->_fail($notice, $queue);
             }
         } else {
-            $this->_log(LOG_INFO, "[$queue] No handler for queue $queue; discarding.");
-            $this->_done($qi);
+            $this->_log(LOG_INFO, "[$queue:notice $notice->id] No handler for queue $queue; discarding.");
+            $this->_done($notice, $queue);
         }
         return true;
     }
@@ -107,7 +108,8 @@ class DBQueueManager extends QueueManager
     /**
      * Pop the oldest unclaimed item off the queue set and claim it.
      *
-     * @return mixed false if no items; true if bogus hit; otherwise Queue_item
+     * @return mixed false if no items; true if bogus hit; otherwise array(string, Notice)
+     *               giving the queue transport name.
      */
     protected function _nextItem()
     {
@@ -119,42 +121,70 @@ class DBQueueManager extends QueueManager
             return false;
         }
 
-        return $qi;
+        $queue = $qi->transport;
+        $notice = Notice::staticGet('id', $qi->notice_id);
+        if (empty($notice)) {
+            $this->_log(LOG_INFO, "[$queue:notice $notice->id] dequeued non-existent notice");
+            $qi->delete();
+            return true;
+        }
+
+        $result = $notice;
+        return array($queue, $notice);
     }
 
     /**
      * Delete our claimed item from the queue after successful processing.
      *
-     * @param QueueItem $qi
+     * @param Notice $object
+     * @param string $queue
      */
-    protected function _done($qi)
+    protected function _done($object, $queue)
     {
+        // XXX: right now, we only handle notices
+
+        $notice = $object;
+
+        $qi = Queue_item::pkeyGet(array('notice_id' => $notice->id,
+                                        'transport' => $queue));
+
         if (empty($qi)) {
-            $this->_log(LOG_INFO, "_done passed an empty queue item");
+            $this->_log(LOG_INFO, "[$queue:notice $notice->id] Cannot find queue item");
         } else {
             if (empty($qi->claimed)) {
-                $this->_log(LOG_WARNING, "Reluctantly releasing unclaimed queue item");
+                $this->_log(LOG_WARNING, "[$queue:notice $notice->id] Reluctantly releasing unclaimed queue item");
             }
             $qi->delete();
             $qi->free();
         }
 
-        $this->_log(LOG_INFO, "done with item");
+        $this->_log(LOG_INFO, "[$queue:notice $notice->id] done with item");
+        $this->stats('handled', $queue);
+
+        $notice->free();
     }
 
     /**
      * Free our claimed queue item for later reprocessing in case of
      * temporary failure.
      *
-     * @param QueueItem $qi
+     * @param Notice $object
+     * @param string $queue
      */
-    protected function _fail($qi)
+    protected function _fail($object, $queue)
     {
+        // XXX: right now, we only handle notices
+
+        $notice = $object;
+
+        $qi = Queue_item::pkeyGet(array('notice_id' => $notice->id,
+                                        'transport' => $queue));
+
         if (empty($qi)) {
-            $this->_log(LOG_INFO, "_fail passed an empty queue item");
+            $this->_log(LOG_INFO, "[$queue:notice $notice->id] Cannot find queue item");
         } else {
             if (empty($qi->claimed)) {
-                $this->_log(LOG_WARNING, "Ignoring failure for unclaimed queue item");
+                $this->_log(LOG_WARNING, "[$queue:notice $notice->id] Ignoring failure for unclaimed queue item");
             } else {
                 $orig = clone($qi);
                 $qi->claimed = null;
@@ -163,7 +193,10 @@ class DBQueueManager extends QueueManager
             }
         }
 
-        $this->_log(LOG_INFO, "done with queue item");
+        $this->_log(LOG_INFO, "[$queue:notice $notice->id] done with queue item");
+        $this->stats('error', $queue);
+
+        $notice->free();
     }
 
     protected function _log($level, $msg)
diff --git a/lib/jabberqueuehandler.php b/lib/jabberqueuehandler.php
index 83471f2df7..b1518866d7 100644
--- a/lib/jabberqueuehandler.php
+++ b/lib/jabberqueuehandler.php
@@ -34,14 +34,14 @@ class JabberQueueHandler extends QueueHandler
         return 'jabber';
     }
 
-    function handle($notice)
+    function handle_notice($notice)
     {
         require_once(INSTALLDIR.'/lib/jabber.php');
         try {
             return jabber_broadcast_notice($notice);
         } catch (XMPPHP_Exception $e) {
             $this->log(LOG_ERR, "Got an XMPPHP_Exception: " . $e->getMessage());
-            return false;
+            exit(1);
         }
     }
 }
diff --git a/lib/ombqueuehandler.php b/lib/ombqueuehandler.php
index 24896c784c..3ffc1313bc 100644
--- a/lib/ombqueuehandler.php
+++ b/lib/ombqueuehandler.php
@@ -36,7 +36,7 @@ class OmbQueueHandler extends QueueHandler
      * @fixme doesn't currently report failure back to the queue manager
      * because omb_broadcast_notice() doesn't report it to us
      */
-    function handle($notice)
+    function handle_notice($notice)
     {
         if ($this->is_remote($notice)) {
             $this->log(LOG_DEBUG, 'Ignoring remote notice ' . $notice->id);
diff --git a/lib/pingqueuehandler.php b/lib/pingqueuehandler.php
index 4e4d74cb1a..8bb2180786 100644
--- a/lib/pingqueuehandler.php
+++ b/lib/pingqueuehandler.php
@@ -30,7 +30,7 @@ class PingQueueHandler extends QueueHandler {
         return 'ping';
     }
 
-    function handle($notice) {
+    function handle_notice($notice) {
         require_once INSTALLDIR . '/lib/ping.php';
         return ping_broadcast_notice($notice);
     }
diff --git a/lib/pluginqueuehandler.php b/lib/pluginqueuehandler.php
index 9653ccad42..24d5046997 100644
--- a/lib/pluginqueuehandler.php
+++ b/lib/pluginqueuehandler.php
@@ -42,7 +42,7 @@ class PluginQueueHandler extends QueueHandler
         return 'plugin';
     }
 
-    function handle($notice)
+    function handle_notice($notice)
     {
         Event::handle('HandleQueuedNotice', array(&$notice));
         return true;
diff --git a/lib/publicqueuehandler.php b/lib/publicqueuehandler.php
index c9edb8d5d7..9ea9ee73a3 100644
--- a/lib/publicqueuehandler.php
+++ b/lib/publicqueuehandler.php
@@ -23,6 +23,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
 
 /**
  * Queue handler for pushing new notices to public XMPP subscribers.
+ * @fixme correct this exception handling
  */
 class PublicQueueHandler extends QueueHandler
 {
@@ -32,14 +33,15 @@ class PublicQueueHandler extends QueueHandler
         return 'public';
     }
 
-    function handle($notice)
+    function handle_notice($notice)
     {
         require_once(INSTALLDIR.'/lib/jabber.php');
         try {
             return jabber_public_notice($notice);
         } catch (XMPPHP_Exception $e) {
             $this->log(LOG_ERR, "Got an XMPPHP_Exception: " . $e->getMessage());
-            return false;
+            die($e->getMessage());
         }
+        return true;
     }
 }
diff --git a/lib/queuehandler.php b/lib/queuehandler.php
index 2909cd83b1..613be6e330 100644
--- a/lib/queuehandler.php
+++ b/lib/queuehandler.php
@@ -22,20 +22,51 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 /**
  * Base class for queue handlers.
  *
- * As of 0.9, queue handlers are short-lived for items as they are
- * dequeued by a QueueManager running in an IoMaster in a daemon
- * such as queuedaemon.php.
- *
- * Extensions requiring long-running maintenance or polling should
- * register an IoManager.
+ * As extensions of the Daemon class, each queue handler has the ability
+ * to launch itself in the background, at which point it'll pass control
+ * to the configured QueueManager class to poll for updates.
  *
  * Subclasses must override at least the following methods:
  * - transport
- * - handle
+ * - handle_notice
  */
+#class QueueHandler extends Daemon
 class QueueHandler
 {
 
+#    function __construct($id=null, $daemonize=true)
+#    {
+#        parent::__construct($daemonize);
+#
+#        if ($id) {
+#            $this->set_id($id);
+#        }
+#    }
+
+    /**
+     * How many seconds a polling-based queue manager should wait between
+     * checks for new items to handle.
+     *
+     * Defaults to 60 seconds; override to speed up or slow down.
+     *
+     * @fixme not really compatible with global queue manager
+     * @return int timeout in seconds
+     */
+#    function timeout()
+#    {
+#        return 60;
+#    }
+
+#    function class_name()
+#    {
+#        return ucfirst($this->transport()) . 'Handler';
+#    }
+
+#    function name()
+#    {
+#        return strtolower($this->class_name().'.'.$this->get_id());
+#    }
+
     /**
      * Return transport keyword which identifies items this queue handler
      * services; must be defined for all subclasses.
@@ -52,17 +83,61 @@ class QueueHandler
 
     /**
      * Here's the meat of your queue handler -- you're handed a Notice
-     * or other object, which you may do as you will with.
+     * object, which you may do as you will with.
      *
      * If this function indicates failure, a warning will be logged
      * and the item is placed back in the queue to be re-run.
      *
-     * @param mixed $object
+     * @param Notice $notice
      * @return boolean true on success, false on failure
      */
-    function handle($object)
+    function handle_notice($notice)
     {
         return true;
     }
+
+    /**
+     * Setup and start of run loop for this queue handler as a daemon.
+     * Most of the heavy lifting is passed on to the QueueManager's service()
+     * method, which passes control back to our handle_notice() method for
+     * each notice that comes in on the queue.
+     *
+     * Most of the time this won't need to be overridden in a subclass.
+     *
+     * @return boolean true on success, false on failure
+     */
+    function run()
+    {
+        if (!$this->start()) {
+            $this->log(LOG_WARNING, 'failed to start');
+            return false;
+        }
+
+        $this->log(LOG_INFO, 'checking for queued notices');
+
+        $queue   = $this->transport();
+        $timeout = $this->timeout();
+
+        $qm = QueueManager::get();
+
+        $qm->service($queue, $this);
+
+        $this->log(LOG_INFO, 'finished servicing the queue');
+
+        if (!$this->finish()) {
+            $this->log(LOG_WARNING, 'failed to clean up');
+            return false;
+        }
+
+        $this->log(LOG_INFO, 'terminating normally');
+
+        return true;
+    }
+
+
+    function log($level, $msg)
+    {
+        common_log($level, $this->class_name() . ' ('. $this->get_id() .'): '.$msg);
+    }
 }
 
diff --git a/lib/smsqueuehandler.php b/lib/smsqueuehandler.php
index 6085d2b4ac..48a96409d0 100644
--- a/lib/smsqueuehandler.php
+++ b/lib/smsqueuehandler.php
@@ -31,7 +31,7 @@ class SmsQueueHandler extends QueueHandler
         return 'sms';
     }
 
-    function handle($notice)
+    function handle_notice($notice)
     {
     	require_once(INSTALLDIR.'/lib/mail.php');
         return mail_broadcast_notice_sms($notice);
diff --git a/lib/stompqueuemanager.php b/lib/stompqueuemanager.php
index 6496b5cf17..00590fdb69 100644
--- a/lib/stompqueuemanager.php
+++ b/lib/stompqueuemanager.php
@@ -125,25 +125,28 @@ class StompQueueManager extends QueueManager
     }
 
     /**
-     * Saves an object into the queue item table.
+     * Saves a notice object reference into the queue item table.
      * @return boolean true on success
      */
     public function enqueue($object, $queue)
     {
-        $msg = serialize($object);
+        $notice = $object;
 
         $this->_connect();
 
+        // XXX: serialize and send entire notice
+
         $result = $this->con->send($this->queueName($queue),
-                                   $msg, 		// BODY of the message
-                                   array ('created' => $timestamp));
+                                   $notice->id, 		// BODY of the message
+                                   array ('created' => $notice->created));
 
         if (!$result) {
             common_log(LOG_ERR, 'Error sending to '.$queue.' queue');
             return false;
         }
 
-        common_log(LOG_DEBUG, "complete remote queueing $log for $queue");
+        common_log(LOG_DEBUG, 'complete remote queueing notice ID = '
+                   . $notice->id . ' for ' . $queue);
         $this->stats('enqueued', $queue);
     }
 
@@ -171,7 +174,7 @@ class StompQueueManager extends QueueManager
         $ok = true;
         $frames = $this->con->readFrames();
         foreach ($frames as $frame) {
-            $ok = $ok && $this->_handleItem($frame);
+            $ok = $ok && $this->_handleNotice($frame);
         }
         return $ok;
     }
@@ -262,10 +265,10 @@ class StompQueueManager extends QueueManager
     }
 
     /**
-     * Handle and acknowledge an event that's come in through a queue.
+     * Handle and acknowledge a notice event that's come in through a queue.
      *
      * If the queue handler reports failure, the message is requeued for later.
-     * Missing objects or handler classes will drop the message.
+     * Missing notices or handler classes will drop the message.
      *
      * Side effects: in multi-site mode, may reset site configuration to
      * match the site that queued the event.
@@ -273,15 +276,24 @@ class StompQueueManager extends QueueManager
      * @param StompFrame $frame
      * @return bool
      */
-    protected function _handleItem($frame)
+    protected function _handleNotice($frame)
     {
         list($site, $queue) = $this->parseDestination($frame->headers['destination']);
         if ($site != common_config('site', 'server')) {
             $this->stats('switch');
             StatusNet::init($site);
         }
-        $info = "object posted at {$frame->headers['created']} in queue $queue";
-        $item = unserialize($frame->body);
+
+        $id = intval($frame->body);
+        $info = "notice $id posted at {$frame->headers['created']} in queue $queue";
+
+        $notice = Notice::staticGet('id', $id);
+        if (empty($notice)) {
+            $this->_log(LOG_WARNING, "Skipping missing $info");
+            $this->con->ack($frame);
+            $this->stats('badnotice', $queue);
+            return false;
+        }
 
         $handler = $this->getHandler($queue);
         if (!$handler) {
@@ -291,7 +303,7 @@ class StompQueueManager extends QueueManager
             return false;
         }
 
-        $ok = $handler->handle($item);
+        $ok = $handler->handle_notice($notice);
 
         if (!$ok) {
             $this->_log(LOG_WARNING, "Failed handling $info");
@@ -299,7 +311,7 @@ class StompQueueManager extends QueueManager
             // this kind of queue management ourselves;
             // if we don't ack, it should resend...
             $this->con->ack($frame);
-            $this->enqueue($item, $queue);
+            $this->enqueue($notice, $queue);
             $this->stats('requeued', $queue);
             return false;
         }
diff --git a/lib/xmppmanager.php b/lib/xmppmanager.php
index c499868548..dfff63a30c 100644
--- a/lib/xmppmanager.php
+++ b/lib/xmppmanager.php
@@ -175,30 +175,6 @@ class XmppManager extends IoManager
         }
     }
 
-    /**
-     * For queue handlers to pass us a message to push out,
-     * if we're active.
-     *
-     * @fixme should this be blocking etc?
-     *
-     * @param string $msg XML stanza to send
-     * @return boolean success
-     */
-    public function send($msg)
-    {
-        if ($this->conn && !$this->conn->isDisconnected()) {
-            $bytes = $this->conn->send($msg);
-            if ($bytes > 0) {
-                return true;
-            } else {
-                return false;
-            }
-        } else {
-            // Can't send right now...
-            return false;
-        }
-    }
-
     /**
      * Send a keepalive ping to the XMPP server.
      */
diff --git a/plugins/Enjit/enjitqueuehandler.php b/plugins/Enjit/enjitqueuehandler.php
index 14085cc5e3..f0e706b929 100644
--- a/plugins/Enjit/enjitqueuehandler.php
+++ b/plugins/Enjit/enjitqueuehandler.php
@@ -32,7 +32,14 @@ class EnjitQueueHandler extends QueueHandler
         return 'enjit';
     }
 
-    function handle($notice)
+    function start()
+    {
+        $this->log(LOG_INFO, "Starting EnjitQueueHandler");
+        $this->log(LOG_INFO, "Broadcasting to ".common_config('enjit', 'apiurl'));
+        return true;
+    }
+
+    function handle_notice($notice)
     {
 
         $profile = Profile::staticGet($notice->profile_id);
diff --git a/plugins/Facebook/facebookqueuehandler.php b/plugins/Facebook/facebookqueuehandler.php
index 524af7bc45..1778690e5b 100644
--- a/plugins/Facebook/facebookqueuehandler.php
+++ b/plugins/Facebook/facebookqueuehandler.php
@@ -28,7 +28,7 @@ class FacebookQueueHandler extends QueueHandler
         return 'facebook';
     }
 
-    function handle($notice)
+    function handle_notice($notice)
     {
         if ($this->_isLocal($notice)) {
             return facebookBroadcastNotice($notice);
diff --git a/plugins/RSSCloud/RSSCloudPlugin.php b/plugins/RSSCloud/RSSCloudPlugin.php
index 9f444c8bba..2de162628f 100644
--- a/plugins/RSSCloud/RSSCloudPlugin.php
+++ b/plugins/RSSCloud/RSSCloudPlugin.php
@@ -138,9 +138,6 @@ class RSSCloudPlugin extends Plugin
         case 'RSSCloudNotifier':
             include_once INSTALLDIR . '/plugins/RSSCloud/RSSCloudNotifier.php';
             return false;
-        case 'RSSCloudQueueHandler':
-            include_once INSTALLDIR . '/plugins/RSSCloud/RSSCloudQueueHandler.php';
-            return false;
         case 'RSSCloudRequestNotifyAction':
         case 'LoggingAggregatorAction':
             include_once INSTALLDIR . '/plugins/RSSCloud/' .
@@ -196,6 +193,32 @@ class RSSCloudPlugin extends Plugin
         return true;
     }
 
+    /**
+     * broadcast the message when not using queuehandler
+     *
+     * @param Notice &$notice the notice
+     * @param array  $queue   destination queue
+     *
+     * @return boolean hook return
+     */
+
+    function onUnqueueHandleNotice(&$notice, $queue)
+    {
+        if (($queue == 'rsscloud') && ($this->_isLocal($notice))) {
+
+            common_debug('broadcasting rssCloud bound notice ' . $notice->id);
+
+            $profile = $notice->getProfile();
+
+            $notifier = new RSSCloudNotifier();
+            $notifier->notify($profile);
+
+            return false;
+        }
+
+        return true;
+    }
+
     /**
      * Determine whether the notice was locally created
      *
@@ -238,15 +261,19 @@ class RSSCloudPlugin extends Plugin
     }
 
     /**
-     * Register RSSCloud notice queue handler
+     * Add RSSCloudQueueHandler to the list of valid daemons to
+     * start
      *
-     * @param QueueManager $manager
+     * @param array $daemons the list of daemons to run
      *
      * @return boolean hook return
+     *
      */
-    function onEndInitializeQueueManager($manager)
+
+    function onGetValidDaemons($daemons)
     {
-        $manager->connect('rsscloud', 'RSSCloudQueueHandler');
+        array_push($daemons, INSTALLDIR .
+                   '/plugins/RSSCloud/RSSCloudQueueHandler.php');
         return true;
     }
 
diff --git a/plugins/RSSCloud/RSSCloudQueueHandler.php b/plugins/RSSCloud/RSSCloudQueueHandler.php
old mode 100644
new mode 100755
index 295c261895..693dd27c1f
--- a/plugins/RSSCloud/RSSCloudQueueHandler.php
+++ b/plugins/RSSCloud/RSSCloudQueueHandler.php
@@ -1,3 +1,4 @@
+#!/usr/bin/env php
 <?php
 /*
  * StatusNet - the distributed open-source microblogging tool
@@ -17,20 +18,61 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
+define('INSTALLDIR', realpath(dirname(__FILE__) . '/../..'));
+
+$shortoptions = 'i::';
+$longoptions = array('id::');
+
+$helptext = <<<END_OF_ENJIT_HELP
+Daemon script for pushing new notices to RSSCloud subscribers.
+
+    -i --id           Identity (default none)
+
+END_OF_ENJIT_HELP;
+
+require_once INSTALLDIR . '/scripts/commandline.inc';
+require_once INSTALLDIR . '/lib/queuehandler.php';
+require_once INSTALLDIR . '/plugins/RSSCloud/RSSCloudNotifier.php';
+require_once INSTALLDIR . '/plugins/RSSCloud/RSSCloudSubscription.php';
 
 class RSSCloudQueueHandler extends QueueHandler
 {
+    var $notifier = null;
+
     function transport()
     {
         return 'rsscloud';
     }
 
-    function handle($notice)
+    function start()
+    {
+        $this->log(LOG_INFO, "INITIALIZE");
+        $this->notifier = new RSSCloudNotifier();
+        return true;
+    }
+
+    function handle_notice($notice)
     {
         $profile = $notice->getProfile();
-        $notifier = new RSSCloudNotifier();
-        return $notifier->notify($profile);
+        return $this->notifier->notify($profile);
     }
+
+    function finish()
+    {
+    }
+
 }
 
+if (have_option('i')) {
+    $id = get_option_value('i');
+} else if (have_option('--id')) {
+    $id = get_option_value('--id');
+} else if (count($args) > 0) {
+    $id = $args[0];
+} else {
+    $id = null;
+}
+
+$handler = new RSSCloudQueueHandler($id);
+
+$handler->runOnce();
diff --git a/plugins/TwitterBridge/twitterqueuehandler.php b/plugins/TwitterBridge/twitterqueuehandler.php
index b5a624e83d..5089ca7b74 100644
--- a/plugins/TwitterBridge/twitterqueuehandler.php
+++ b/plugins/TwitterBridge/twitterqueuehandler.php
@@ -28,7 +28,7 @@ class TwitterQueueHandler extends QueueHandler
         return 'twitter';
     }
 
-    function handle($notice)
+    function handle_notice($notice)
     {
         return broadcast_twitter($notice);
     }
diff --git a/scripts/handlequeued.php b/scripts/handlequeued.php
index 8158849695..9031437aac 100755
--- a/scripts/handlequeued.php
+++ b/scripts/handlequeued.php
@@ -50,7 +50,7 @@ if (empty($notice)) {
     exit(1);
 }
 
-if (!$handler->handle($notice)) {
+if (!$handler->handle_notice($notice)) {
     print "Failed to handle notice id $noticeId on queue '$queue'.\n";
     exit(1);
 }

From b34bbb0e8045008a0048829672af905385241735 Mon Sep 17 00:00:00 2001
From: Craig Andrews <candrews@integralblue.com>
Date: Fri, 22 Jan 2010 17:55:26 -0500
Subject: [PATCH 005/655] Store serialized representations of queue items in
 the queue

---
 lib/queuemanager.php | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/lib/queuemanager.php b/lib/queuemanager.php
index 4eb39bfa8c..8921b02cc8 100644
--- a/lib/queuemanager.php
+++ b/lib/queuemanager.php
@@ -139,20 +139,13 @@ abstract class QueueManager extends IoManager
 
     /**
      * Encode an object for queued storage.
-     * Next gen may use serialization.
      *
      * @param mixed $object
      * @return string
      */
     protected function encode($object)
     {
-        if ($object instanceof Notice) {
-            return $object->id;
-        } else if (is_string($object)) {
-            return $object;
-        } else {
-            throw new ServerException("Can't queue this type", 500);
-        }
+        return serialize($object);
     }
 
     /**
@@ -164,11 +157,7 @@ abstract class QueueManager extends IoManager
      */
     protected function decode($frame)
     {
-        if (is_numeric($frame)) {
-            return Notice::staticGet(intval($frame));
-        } else {
-            return $frame;
-        }
+        return unserialize($frame);
     }
 
     /**

From e9995b0f6ab0788162e22c996e5ee0af416dd519 Mon Sep 17 00:00:00 2001
From: Craig Andrews <candrews@integralblue.com>
Date: Sat, 23 Jan 2010 01:25:27 -0500
Subject: [PATCH 006/655] Create IM plugin, Pluginize XMPP, Create AIM plugin

---
 EVENTS.txt                                    |   18 +
 actions/apiaccountupdatedeliverydevice.php    |   10 +-
 actions/confirmaddress.php                    |   87 +-
 actions/imsettings.php                        |  319 +--
 actions/shownotice.php                        |    6 -
 actions/showstream.php                        |    6 -
 classes/User.php                              |    7 +-
 classes/User_im_prefs.php                     |   71 +
 classes/statusnet.ini                         |   22 +-
 db/statusnet.sql                              |   28 +-
 lib/channel.php                               |   57 -
 lib/command.php                               |    4 +-
 lib/imchannel.php                             |  104 +
 lib/immanager.php                             |   70 +
 lib/implugin.php                              |  612 +++++
 ...berqueuehandler.php => imqueuehandler.php} |   33 +-
 ...handler.php => imreceiverqueuehandler.php} |   29 +-
 lib/imsenderqueuehandler.php                  |   44 +
 lib/jabber.php                                |  473 ----
 lib/queuehandler.php                          |   14 -
 lib/queuemanager.php                          |   14 +-
 lib/queuemonitor.php                          |    2 +-
 lib/util.php                                  |    9 -
 lib/xmppmanager.php                           |  485 ----
 lib/xmppoutqueuehandler.php                   |   55 -
 plugins/Aim/AimPlugin.php                     |  162 ++
 plugins/Aim/Fake_Aim.php                      |   43 +
 plugins/Aim/README                            |   27 +
 plugins/Aim/aimmanager.php                    |  100 +
 plugins/Aim/extlib/phptoclib/README.txt       |  169 ++
 plugins/Aim/extlib/phptoclib/aimclassw.php    | 2370 +++++++++++++++++
 plugins/Aim/extlib/phptoclib/dconnection.php  |  229 ++
 plugins/Imap/imapmanager.php                  |    8 +-
 .../Xmpp/Fake_XMPP.php                        |   37 +-
 plugins/Xmpp/README                           |   35 +
 plugins/Xmpp/Sharing_XMPP.php                 |   43 +
 plugins/Xmpp/XmppPlugin.php                   |  247 ++
 plugins/Xmpp/xmppmanager.php                  |  279 ++
 scripts/getvaliddaemons.php                   |    4 +-
 scripts/{xmppdaemon.php => imdaemon.php}      |   39 +-
 scripts/queuedaemon.php                       |    9 +-
 scripts/stopdaemons.sh                        |    4 +-
 42 files changed, 4968 insertions(+), 1416 deletions(-)
 create mode 100644 classes/User_im_prefs.php
 create mode 100644 lib/imchannel.php
 create mode 100644 lib/immanager.php
 create mode 100644 lib/implugin.php
 rename lib/{jabberqueuehandler.php => imqueuehandler.php} (60%)
 rename lib/{publicqueuehandler.php => imreceiverqueuehandler.php} (60%)
 create mode 100644 lib/imsenderqueuehandler.php
 delete mode 100644 lib/jabber.php
 delete mode 100644 lib/xmppmanager.php
 delete mode 100644 lib/xmppoutqueuehandler.php
 create mode 100644 plugins/Aim/AimPlugin.php
 create mode 100644 plugins/Aim/Fake_Aim.php
 create mode 100644 plugins/Aim/README
 create mode 100644 plugins/Aim/aimmanager.php
 create mode 100755 plugins/Aim/extlib/phptoclib/README.txt
 create mode 100755 plugins/Aim/extlib/phptoclib/aimclassw.php
 create mode 100755 plugins/Aim/extlib/phptoclib/dconnection.php
 rename lib/queued_xmpp.php => plugins/Xmpp/Fake_XMPP.php (68%)
 create mode 100644 plugins/Xmpp/README
 create mode 100644 plugins/Xmpp/Sharing_XMPP.php
 create mode 100644 plugins/Xmpp/XmppPlugin.php
 create mode 100644 plugins/Xmpp/xmppmanager.php
 rename scripts/{xmppdaemon.php => imdaemon.php} (66%)

diff --git a/EVENTS.txt b/EVENTS.txt
index 1ed670697b..45f1e9d70f 100644
--- a/EVENTS.txt
+++ b/EVENTS.txt
@@ -699,3 +699,21 @@ StartShowContentLicense: Showing the default license for content
 
 EndShowContentLicense: Showing the default license for content
 - $action: the current action
+
+GetImTransports: Get IM transports that are available
+- &$transports: append your transport to this array like so: $transports[transportName]=array('display'=>display)
+
+NormalizeImScreenname: Normalize an IM screenname
+- $transport: transport the screenname is on
+- &$screenname: screenname to be normalized
+
+ValidateImScreenname: Validate an IM screenname
+- $transport: transport the screenname is on
+- $screenname: screenname to be validated
+- $valid: is the screenname valid?
+
+SendImConfirmationCode: Send a confirmation code to confirm a user owns an IM screenname
+- $transport: transport the screenname exists on
+- $screenname: screenname being confirmed
+- $code: confirmation code for confirmation URL
+- $user: user requesting the confirmation
diff --git a/actions/apiaccountupdatedeliverydevice.php b/actions/apiaccountupdatedeliverydevice.php
index 684906fe90..4bd6c326f8 100644
--- a/actions/apiaccountupdatedeliverydevice.php
+++ b/actions/apiaccountupdatedeliverydevice.php
@@ -119,10 +119,16 @@ class ApiAccountUpdateDeliveryDeviceAction extends ApiAuthAction
         if (strtolower($this->device) == 'sms') {
             $this->user->smsnotify = true;
         } elseif (strtolower($this->device) == 'im') {
-            $this->user->jabbernotify = true;
+            //TODO IM is pluginized now, so what should we do?
+            //Enable notifications for all IM plugins?
+            //For now, don't do anything
+            //$this->user->jabbernotify = true;
         } elseif (strtolower($this->device == 'none')) {
             $this->user->smsnotify    = false;
-            $this->user->jabbernotify = false;
+            //TODO IM is pluginized now, so what should we do?
+            //Disable notifications for all IM plugins?
+            //For now, don't do anything
+            //$this->user->jabbernotify = false;
         }
 
         $result = $this->user->update($original);
diff --git a/actions/confirmaddress.php b/actions/confirmaddress.php
index cc8351d8dc..eaf1c91c1a 100644
--- a/actions/confirmaddress.php
+++ b/actions/confirmaddress.php
@@ -49,7 +49,7 @@ class ConfirmaddressAction extends Action
 {
     /** type of confirmation. */
 
-    var $type = null;
+    var $address;
 
     /**
      * Accept a confirmation code
@@ -86,37 +86,75 @@ class ConfirmaddressAction extends Action
             return;
         }
         $type = $confirm->address_type;
-        if (!in_array($type, array('email', 'jabber', 'sms'))) {
+        $transports = array();
+        Event::handle('GetImTransports', array(&$transports));
+        if (!in_array($type, array('email', 'sms')) && !in_array($type, array_keys($transports))) {
             $this->serverError(sprintf(_('Unrecognized address type %s'), $type));
             return;
         }
-        if ($cur->$type == $confirm->address) {
-            $this->clientError(_('That address has already been confirmed.'));
-            return;
-        }
-
+        $this->address = $confirm->address;
         $cur->query('BEGIN');
+        if (in_array($type, array('email', 'sms')))
+        {
+            if ($cur->$type == $confirm->address) {
+                $this->clientError(_('That address has already been confirmed.'));
+                return;
+            }
 
-        $orig_user = clone($cur);
+            $orig_user = clone($cur);
 
-        $cur->$type = $confirm->address;
+            $cur->$type = $confirm->address;
 
-        if ($type == 'sms') {
-            $cur->carrier  = ($confirm->address_extra)+0;
-            $carrier       = Sms_carrier::staticGet($cur->carrier);
-            $cur->smsemail = $carrier->toEmailAddress($cur->sms);
-        }
+            if ($type == 'sms') {
+                $cur->carrier  = ($confirm->address_extra)+0;
+                $carrier       = Sms_carrier::staticGet($cur->carrier);
+                $cur->smsemail = $carrier->toEmailAddress($cur->sms);
+            }
 
-        $result = $cur->updateKeys($orig_user);
+            $result = $cur->updateKeys($orig_user);
 
-        if (!$result) {
-            common_log_db_error($cur, 'UPDATE', __FILE__);
-            $this->serverError(_('Couldn\'t update user.'));
-            return;
-        }
+            if (!$result) {
+                common_log_db_error($cur, 'UPDATE', __FILE__);
+                $this->serverError(_('Couldn\'t update user.'));
+                return;
+            }
+
+            if ($type == 'email') {
+                $cur->emailChanged();
+            }
+
+        } else {
+
+            $user_im_prefs = new User_im_prefs();
+            $user_im_prefs->transport = $confirm->address_type;
+            $user_im_prefs->user_id = $cur->id;
+            if ($user_im_prefs->find() && $user_im_prefs->fetch()) {
+                if($user_im_prefs->screenname == $confirm->address){
+                    $this->clientError(_('That address has already been confirmed.'));
+                    return;
+                }
+                $user_im_prefs->screenname = $confirm->address;
+                $result = $user_im_prefs->update();
+
+                if (!$result) {
+                    common_log_db_error($user_im_prefs, 'UPDATE', __FILE__);
+                    $this->serverError(_('Couldn\'t update user im preferences.'));
+                    return;
+                }
+            }else{
+                $user_im_prefs = new User_im_prefs();
+                $user_im_prefs->screenname = $confirm->address;
+                $user_im_prefs->transport = $confirm->address_type;
+                $user_im_prefs->user_id = $cur->id;
+                $result = $user_im_prefs->insert();
+
+                if (!$result) {
+                    common_log_db_error($user_im_prefs, 'INSERT', __FILE__);
+                    $this->serverError(_('Couldn\'t insert user im preferences.'));
+                    return;
+                }
+            }
 
-        if ($type == 'email') {
-            $cur->emailChanged();
         }
 
         $result = $confirm->delete();
@@ -128,8 +166,6 @@ class ConfirmaddressAction extends Action
         }
 
         $cur->query('COMMIT');
-
-        $this->type = $type;
         $this->showPage();
     }
 
@@ -153,11 +189,10 @@ class ConfirmaddressAction extends Action
     function showContent()
     {
         $cur  = common_current_user();
-        $type = $this->type;
 
         $this->element('p', null,
                        sprintf(_('The address "%s" has been '.
                                  'confirmed for your account.'),
-                               $cur->$type));
+                               $this->address));
     }
 }
diff --git a/actions/imsettings.php b/actions/imsettings.php
index af4915843d..fe1864f0d1 100644
--- a/actions/imsettings.php
+++ b/actions/imsettings.php
@@ -31,9 +31,6 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
-require_once INSTALLDIR.'/lib/connectsettingsaction.php';
-require_once INSTALLDIR.'/lib/jabber.php';
-
 /**
  * Settings for Jabber/XMPP integration
  *
@@ -68,8 +65,8 @@ class ImsettingsAction extends ConnectSettingsAction
     function getInstructions()
     {
         return _('You can send and receive notices through '.
-                 'Jabber/GTalk [instant messages](%%doc.im%%). '.
-                 'Configure your address and settings below.');
+                 'instant messaging [instant messages](%%doc.im%%). '.
+                 'Configure your addresses and settings below.');
     }
 
     /**
@@ -84,85 +81,108 @@ class ImsettingsAction extends ConnectSettingsAction
 
     function showContent()
     {
-        if (!common_config('xmpp', 'enabled')) {
+        $transports = array();
+        Event::handle('GetImTransports', array(&$transports));
+        if (! $transports) {
             $this->element('div', array('class' => 'error'),
                            _('IM is not available.'));
             return;
         }
 
         $user = common_current_user();
-        $this->elementStart('form', array('method' => 'post',
-                                          'id' => 'form_settings_im',
-                                          'class' => 'form_settings',
-                                          'action' =>
-                                          common_local_url('imsettings')));
-        $this->elementStart('fieldset', array('id' => 'settings_im_address'));
-        $this->element('legend', null, _('Address'));
-        $this->hidden('token', common_session_token());
 
-        if ($user->jabber) {
-            $this->element('p', 'form_confirmed', $user->jabber);
-            $this->element('p', 'form_note',
-                           _('Current confirmed Jabber/GTalk address.'));
-            $this->hidden('jabber', $user->jabber);
-            $this->submit('remove', _('Remove'));
-        } else {
-            $confirm = $this->getConfirmation();
-            if ($confirm) {
-                $this->element('p', 'form_unconfirmed', $confirm->address);
-                $this->element('p', 'form_note',
-                               sprintf(_('Awaiting confirmation on this address. '.
-                                         'Check your Jabber/GTalk account for a '.
-                                         'message with further instructions. '.
-                                         '(Did you add %s to your buddy list?)'),
-                                       jabber_daemon_address()));
-                $this->hidden('jabber', $confirm->address);
-                $this->submit('cancel', _('Cancel'));
-            } else {
-                $this->elementStart('ul', 'form_data');
-                $this->elementStart('li');
-                $this->input('jabber', _('IM address'),
-                             ($this->arg('jabber')) ? $this->arg('jabber') : null,
-                             sprintf(_('Jabber or GTalk address, '.
-                                       'like "UserName@example.org". '.
-                                       'First, make sure to add %s to your '.
-                                       'buddy list in your IM client or on GTalk.'),
-                                     jabber_daemon_address()));
-                $this->elementEnd('li');
-                $this->elementEnd('ul');
-                $this->submit('add', _('Add'));
-            }
-        }
-        $this->elementEnd('fieldset');
+        $user_im_prefs_by_transport = array();
         
-        $this->elementStart('fieldset', array('id' => 'settings_im_preferences'));
-        $this->element('legend', null, _('Preferences'));
-        $this->elementStart('ul', 'form_data');
-        $this->elementStart('li');
-        $this->checkbox('jabbernotify',
-                        _('Send me notices through Jabber/GTalk.'),
-                        $user->jabbernotify);
-        $this->elementEnd('li');
-        $this->elementStart('li');
-        $this->checkbox('updatefrompresence',
-                        _('Post a notice when my Jabber/GTalk status changes.'),
-                        $user->updatefrompresence);
-        $this->elementEnd('li');
-        $this->elementStart('li');
-        $this->checkbox('jabberreplies',
-                        _('Send me replies through Jabber/GTalk '.
-                          'from people I\'m not subscribed to.'),
-                        $user->jabberreplies);
-        $this->elementEnd('li');
-        $this->elementStart('li');
-        $this->checkbox('jabbermicroid',
-                        _('Publish a MicroID for my Jabber/GTalk address.'),
-                        $user->jabbermicroid);
-        $this->elementEnd('li');
-        $this->elementEnd('ul');
-        $this->submit('save', _('Save'));
-        $this->elementEnd('fieldset');
-        $this->elementEnd('form');
+        foreach($transports as $transport=>$transport_info)
+        {
+            $this->elementStart('form', array('method' => 'post',
+                                              'id' => 'form_settings_im',
+                                              'class' => 'form_settings',
+                                              'action' =>
+                                              common_local_url('imsettings')));
+            $this->elementStart('fieldset', array('id' => 'settings_im_address'));
+            $this->element('legend', null, $transport_info['display']);
+            $this->hidden('token', common_session_token());
+            $this->hidden('transport', $transport);
+
+            if ($user_im_prefs = User_im_prefs::pkeyGet( array('transport' => $transport, 'user_id' => $user->id) )) {
+                $user_im_prefs_by_transport[$transport] = $user_im_prefs;
+                $this->element('p', 'form_confirmed', $user_im_prefs->screenname);
+                $this->element('p', 'form_note',
+                               sprintf(_('Current confirmed %s address.'),$transport_info['display']));
+                $this->hidden('screenname', $user_im_prefs->screenname);
+                $this->submit('remove', _('Remove'));
+            } else {
+                $confirm = $this->getConfirmation($transport);
+                if ($confirm) {
+                    $this->element('p', 'form_unconfirmed', $confirm->address);
+                    $this->element('p', 'form_note',
+                                   sprintf(_('Awaiting confirmation on this address. '.
+                                             'Check your %s account for a '.
+                                             'message with further instructions.'),
+                                           $transport_info['display']));
+                    $this->hidden('screenname', $confirm->address);
+                    $this->submit('cancel', _('Cancel'));
+                } else {
+                    $this->elementStart('ul', 'form_data');
+                    $this->elementStart('li');
+                    $this->input('screenname', _('IM address'),
+                                 ($this->arg('screenname')) ? $this->arg('screenname') : null,
+                                 sprintf(_('%s screenname.'),
+                                         $transport_info['display']));
+                    $this->elementEnd('li');
+                    $this->elementEnd('ul');
+                    $this->submit('add', _('Add'));
+                }
+            }
+            $this->elementEnd('fieldset');
+            $this->elementEnd('form');
+        }
+
+        if($user_im_prefs_by_transport)
+        {
+            $this->elementStart('form', array('method' => 'post',
+                                              'id' => 'form_settings_im',
+                                              'class' => 'form_settings',
+                                              'action' =>
+                                              common_local_url('imsettings')));
+            $this->elementStart('fieldset', array('id' => 'settings_im_preferences'));
+            $this->element('legend', null, _('Preferences'));
+            $this->hidden('token', common_session_token());
+            $this->elementStart('table');
+            $this->elementStart('tr');
+            $this->element('th', null, _('Preferences'));
+            foreach($user_im_prefs_by_transport as $transport=>$user_im_prefs)
+            {
+                $this->element('th', null, $transports[$transport]['display']);
+            }
+            $this->elementEnd('tr');
+            $preferences = array(
+                array('name'=>'notify', 'description'=>_('Send me notices')),
+                array('name'=>'updatefrompresence', 'description'=>_('Post a notice when my status changes.')),
+                array('name'=>'replies', 'description'=>_('Send me replies '.
+                              'from people I\'m not subscribed to.')),
+                array('name'=>'microid', 'description'=>_('Publish a MicroID'))
+            );
+            foreach($preferences as $preference)
+            {
+                $this->elementStart('tr');
+                foreach($user_im_prefs_by_transport as $transport=>$user_im_prefs)
+                {
+                    $preference_name = $preference['name'];
+                    $this->elementStart('td');
+                    $this->checkbox($transport . '_' . $preference['name'],
+                                $preference['description'],
+                                $user_im_prefs->$preference_name);
+                    $this->elementEnd('td');
+                }
+                $this->elementEnd('tr');
+            }
+            $this->elementEnd('table');
+            $this->submit('save', _('Save'));
+            $this->elementEnd('fieldset');
+            $this->elementEnd('form');
+        }
     }
 
     /**
@@ -171,14 +191,14 @@ class ImsettingsAction extends ConnectSettingsAction
      * @return Confirm_address address object for this user
      */
 
-    function getConfirmation()
+    function getConfirmation($transport)
     {
         $user = common_current_user();
 
         $confirm = new Confirm_address();
 
         $confirm->user_id      = $user->id;
-        $confirm->address_type = 'jabber';
+        $confirm->address_type = $transport;
 
         if ($confirm->find(true)) {
             return $confirm;
@@ -232,35 +252,31 @@ class ImsettingsAction extends ConnectSettingsAction
 
     function savePreferences()
     {
-
-        $jabbernotify       = $this->boolean('jabbernotify');
-        $updatefrompresence = $this->boolean('updatefrompresence');
-        $jabberreplies      = $this->boolean('jabberreplies');
-        $jabbermicroid      = $this->boolean('jabbermicroid');
-
         $user = common_current_user();
 
-        assert(!is_null($user)); // should already be checked
+        $user_im_prefs = new User_im_prefs();
+        $user_im_prefs->user_id = $user->id;
+        if($user_im_prefs->find() && $user_im_prefs->fetch())
+        {
+            $preferences = array('notify', 'updatefrompresence', 'replies', 'microid');
+            $user_im_prefs->query('BEGIN');
+            do
+            {
+                $original = clone($user_im_prefs);
+                foreach($preferences as $preference)
+                {
+                    $user_im_prefs->$preference = $this->boolean($user_im_prefs->transport . '_' . $preference);
+                }
+                $result = $user_im_prefs->update($original);
 
-        $user->query('BEGIN');
-
-        $original = clone($user);
-
-        $user->jabbernotify       = $jabbernotify;
-        $user->updatefrompresence = $updatefrompresence;
-        $user->jabberreplies      = $jabberreplies;
-        $user->jabbermicroid      = $jabbermicroid;
-
-        $result = $user->update($original);
-
-        if ($result === false) {
-            common_log_db_error($user, 'UPDATE', __FILE__);
-            $this->serverError(_('Couldn\'t update user.'));
-            return;
+                if ($result === false) {
+                    common_log_db_error($user, 'UPDATE', __FILE__);
+                    $this->serverError(_('Couldn\'t update IM preferences.'));
+                    return;
+                }
+            }while($user_im_prefs->fetch());
+            $user_im_prefs->query('COMMIT');
         }
-
-        $user->query('COMMIT');
-
         $this->showForm(_('Preferences saved.'), true);
     }
 
@@ -268,7 +284,7 @@ class ImsettingsAction extends ConnectSettingsAction
      * Sends a confirmation to the address given
      *
      * Stores a confirmation record and sends out a
-     * Jabber message with the confirmation info.
+     * message with the confirmation info.
      *
      * @return void
      */
@@ -277,36 +293,41 @@ class ImsettingsAction extends ConnectSettingsAction
     {
         $user = common_current_user();
 
-        $jabber = $this->trimmed('jabber');
+        $screenname = $this->trimmed('screenname');
+        $transport = $this->trimmed('transport');
 
         // Some validation
 
-        if (!$jabber) {
-            $this->showForm(_('No Jabber ID.'));
+        if (!$screenname) {
+            $this->showForm(_('No screenname.'));
             return;
         }
 
-        $jabber = jabber_normalize_jid($jabber);
-
-        if (!$jabber) {
-            $this->showForm(_('Cannot normalize that Jabber ID'));
+        if (!$transport) {
+            $this->showForm(_('No transport.'));
             return;
         }
-        if (!jabber_valid_base_jid($jabber)) {
-            $this->showForm(_('Not a valid Jabber ID'));
+
+        Event::handle('NormalizeImScreenname', array($transport, &$screenname));
+
+        if (!$screenname) {
+            $this->showForm(_('Cannot normalize that screenname'));
             return;
-        } else if ($user->jabber == $jabber) {
-            $this->showForm(_('That is already your Jabber ID.'));
+        }
+        $valid = false;
+        Event::handle('ValidateImScreenname', array($transport, $screenname, &$valid));
+        if (!$valid) {
+            $this->showForm(_('Not a valid screenname'));
             return;
-        } else if ($this->jabberExists($jabber)) {
-            $this->showForm(_('Jabber ID already belongs to another user.'));
+        } else if ($this->screennameExists($transport, $screenname)) {
+            $this->showForm(_('Screenname already belongs to another user.'));
             return;
         }
 
         $confirm = new Confirm_address();
 
-        $confirm->address      = $jabber;
-        $confirm->address_type = 'jabber';
+        $confirm->address      = $screenname;
+        $confirm->address_type = $transport;
         $confirm->user_id      = $user->id;
         $confirm->code         = common_confirmation_code(64);
         $confirm->sent         = common_sql_now();
@@ -320,15 +341,10 @@ class ImsettingsAction extends ConnectSettingsAction
             return;
         }
 
-        jabber_confirm_address($confirm->code,
-                               $user->nickname,
-                               $jabber);
+        Event::handle('SendImConfirmationCode', array($transport, $screenname, $confirm->code, $user));
 
-        $msg = sprintf(_('A confirmation code was sent '.
-                         'to the IM address you added. '.
-                         'You must approve %s for '.
-                         'sending messages to you.'),
-                       jabber_daemon_address());
+        $msg = _('A confirmation code was sent '.
+                         'to the IM address you added.');
 
         $this->showForm($msg, true);
     }
@@ -343,15 +359,16 @@ class ImsettingsAction extends ConnectSettingsAction
 
     function cancelConfirmation()
     {
-        $jabber = $this->arg('jabber');
+        $screenname = $this->trimmed('screenname');
+        $transport = $this->trimmed('transport');
 
-        $confirm = $this->getConfirmation();
+        $confirm = $this->getConfirmation($transport);
 
         if (!$confirm) {
             $this->showForm(_('No pending confirmation to cancel.'));
             return;
         }
-        if ($confirm->address != $jabber) {
+        if ($confirm->address != $screenname) {
             $this->showForm(_('That is the wrong IM address.'));
             return;
         }
@@ -360,7 +377,7 @@ class ImsettingsAction extends ConnectSettingsAction
 
         if (!$result) {
             common_log_db_error($confirm, 'DELETE', __FILE__);
-            $this->serverError(_('Couldn\'t delete email confirmation.'));
+            $this->serverError(_('Couldn\'t delete confirmation.'));
             return;
         }
 
@@ -379,29 +396,25 @@ class ImsettingsAction extends ConnectSettingsAction
     {
         $user = common_current_user();
 
-        $jabber = $this->arg('jabber');
+        $screenname = $this->trimmed('screenname');
+        $transport = $this->trimmed('transport');
 
         // Maybe an old tab open...?
 
-        if ($user->jabber != $jabber) {
-            $this->showForm(_('That is not your Jabber ID.'));
+        $user_im_prefs = new User_im_prefs();
+        $user_im_prefs->user_id = $user->id;
+        if(! ($user_im_prefs->find() && $user_im_prefs->fetch())) {
+            $this->showForm(_('That is not your screenname.'));
             return;
         }
 
-        $user->query('BEGIN');
-
-        $original = clone($user);
-
-        $user->jabber = null;
-
-        $result = $user->updateKeys($original);
+        $result = $user_im_prefs->delete();
 
         if (!$result) {
             common_log_db_error($user, 'UPDATE', __FILE__);
-            $this->serverError(_('Couldn\'t update user.'));
+            $this->serverError(_('Couldn\'t update user im prefs.'));
             return;
         }
-        $user->query('COMMIT');
 
         // XXX: unsubscribe to the old address
 
@@ -409,25 +422,27 @@ class ImsettingsAction extends ConnectSettingsAction
     }
 
     /**
-     * Does this Jabber ID exist?
+     * Does this screenname exist?
      *
      * Checks if we already have another user with this address.
      *
-     * @param string $jabber Address to check
+     * @param string $transport Transport to check
+     * @param string $screenname Screenname to check
      *
-     * @return boolean whether the Jabber ID exists
+     * @return boolean whether the screenname exists
      */
 
-    function jabberExists($jabber)
+    function screennameExists($transport, $screenname)
     {
         $user = common_current_user();
 
-        $other = User::staticGet('jabber', $jabber);
-
-        if (!$other) {
+        $user_im_prefs = new User_im_prefs();
+        $user_im_prefs->transport = $transport;
+        $user_im_prefs->screenname = $screenname;
+        if($user_im_prefs->find() && $user_im_prefs->fetch()){
+            return true;
+        }else{
             return false;
-        } else {
-            return $other->id != $user->id;
         }
     }
 }
diff --git a/actions/shownotice.php b/actions/shownotice.php
index d09100f676..d0528a9f0f 100644
--- a/actions/shownotice.php
+++ b/actions/shownotice.php
@@ -275,12 +275,6 @@ class ShownoticeAction extends OwnerDesignAction
                                          'content' => $id->toString()));
         }
 
-        if ($user->jabbermicroid && $user->jabber && $this->notice->uri) {
-            $id = new Microid('xmpp:', $user->jabber,
-                              $this->notice->uri);
-            $this->element('meta', array('name' => 'microid',
-                                         'content' => $id->toString()));
-        }
         $this->element('link',array('rel'=>'alternate',
             'type'=>'application/json+oembed',
             'href'=>common_local_url(
diff --git a/actions/showstream.php b/actions/showstream.php
index 75e10858d0..b9782a3f14 100644
--- a/actions/showstream.php
+++ b/actions/showstream.php
@@ -166,12 +166,6 @@ class ShowstreamAction extends ProfileAction
             $this->element('meta', array('name' => 'microid',
                                          'content' => $id->toString()));
         }
-        if ($this->user->jabbermicroid && $this->user->jabber && $this->profile->profileurl) {
-            $id = new Microid('xmpp:'.$this->user->jabber,
-                              $this->selfUrl());
-            $this->element('meta', array('name' => 'microid',
-                                         'content' => $id->toString()));
-        }
 
         // See https://wiki.mozilla.org/Microsummaries
 
diff --git a/classes/User.php b/classes/User.php
index 6ea975202d..57c56849d6 100644
--- a/classes/User.php
+++ b/classes/User.php
@@ -48,11 +48,6 @@ class User extends Memcached_DataObject
     public $language;                        // varchar(50)
     public $timezone;                        // varchar(50)
     public $emailpost;                       // tinyint(1)   default_1
-    public $jabber;                          // varchar(255)  unique_key
-    public $jabbernotify;                    // tinyint(1)
-    public $jabberreplies;                   // tinyint(1)
-    public $jabbermicroid;                   // tinyint(1)   default_1
-    public $updatefrompresence;              // tinyint(1)
     public $sms;                             // varchar(64)  unique_key
     public $carrier;                         // int(4)
     public $smsnotify;                       // tinyint(1)
@@ -92,7 +87,7 @@ class User extends Memcached_DataObject
     function updateKeys(&$orig)
     {
         $parts = array();
-        foreach (array('nickname', 'email', 'jabber', 'incomingemail', 'sms', 'carrier', 'smsemail', 'language', 'timezone') as $k) {
+        foreach (array('nickname', 'email', 'incomingemail', 'sms', 'carrier', 'smsemail', 'language', 'timezone') as $k) {
             if (strcmp($this->$k, $orig->$k) != 0) {
                 $parts[] = $k . ' = ' . $this->_quote($this->$k);
             }
diff --git a/classes/User_im_prefs.php b/classes/User_im_prefs.php
new file mode 100644
index 0000000000..8ecdfe9fab
--- /dev/null
+++ b/classes/User_im_prefs.php
@@ -0,0 +1,71 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Data class for user IM preferences
+ *
+ * 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  Data
+ * @package   StatusNet
+ * @author    Craig Andrews <candrews@integralblue.com>
+ * @copyright 2009 StatusNet Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://status.net/
+ */
+
+require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
+
+class User_im_prefs extends Memcached_DataObject
+{
+    ###START_AUTOCODE
+    /* the code below is auto generated do not remove the above tag */
+
+    public $__table = 'user_im_prefs';       // table name
+    public $user_id;                         // int(4)  primary_key not_null
+    public $screenname;                      // varchar(255)  not_null
+    public $transport;                       // varchar(255)  not_null
+    public $notify;                          // tinyint(1)
+    public $replies;                         // tinyint(1)
+    public $microid;                         // tinyint(1)
+    public $updatefrompresence;              // tinyint(1)
+    public $created;                         // datetime   not_null default_0000-00-00%2000%3A00%3A00
+    public $modified;                        // timestamp   not_null default_CURRENT_TIMESTAMP
+
+    /* Static get */
+    function staticGet($k,$v=NULL) { return Memcached_DataObject::staticGet('User_im_prefs',$k,$v); }
+
+    function pkeyGet($kv)
+    {
+        return Memcached_DataObject::pkeyGet('User_im_prefs', $kv);
+    }
+
+    /* the code above is auto generated do not remove the tag below */
+    ###END_AUTOCODE
+
+    /*
+    DB_DataObject calculates the sequence key(s) by taking the first key returned by the keys() function.
+    In this case, the keys() function returns user_id as the first key. user_id is not a sequence, but
+    DB_DataObject's sequenceKey() will incorrectly think it is. Then, since the sequenceKey() is a numeric
+    type, but is not set to autoincrement in the database, DB_DataObject will create a _seq table and
+    manage the sequence itself. This is not the correct behavior for the user_id in this class.
+    So we override that incorrect behavior, and simply say there is no sequence key.
+    */
+    function sequenceKey()
+    {
+        return array(false,false);
+    }
+}
diff --git a/classes/statusnet.ini b/classes/statusnet.ini
index 6203650a69..d8a817ebc7 100644
--- a/classes/statusnet.ini
+++ b/classes/statusnet.ini
@@ -540,11 +540,6 @@ emailmicroid = 17
 language = 2
 timezone = 2
 emailpost = 17
-jabber = 2
-jabbernotify = 17
-jabberreplies = 17
-jabbermicroid = 17
-updatefrompresence = 17
 sms = 2
 carrier = 1
 smsnotify = 17
@@ -564,7 +559,6 @@ id = K
 nickname = U
 email = U
 incomingemail = U
-jabber = U
 sms = U
 uri = U
 
@@ -616,3 +610,19 @@ modified = 384
 [user_location_prefs__keys]
 user_id = K
 
+[user_im_prefs]
+user_id = 129
+screenname = 130
+transport = 130
+notify = 17
+replies = 17
+microid = 17
+updatefrompresence = 17
+created = 142
+modified = 384
+
+[user_im_prefs__keys]
+user_id = K
+transport = K
+transport = U
+screenname = U
diff --git a/db/statusnet.sql b/db/statusnet.sql
index 17de4fd0d4..63b50a3f71 100644
--- a/db/statusnet.sql
+++ b/db/statusnet.sql
@@ -62,11 +62,6 @@ create table user (
     language varchar(50) comment 'preferred language',
     timezone varchar(50) comment 'timezone',
     emailpost tinyint default 1 comment 'Post by email',
-    jabber varchar(255) unique key comment 'jabber ID for notices',
-    jabbernotify tinyint default 0 comment 'whether to send notices to jabber',
-    jabberreplies tinyint default 0 comment 'whether to send notices to jabber on replies',
-    jabbermicroid tinyint default 1 comment 'whether to publish xmpp microid',
-    updatefrompresence tinyint default 0 comment 'whether to record updates from Jabber presence notices',
     sms varchar(64) unique key comment 'sms phone number',
     carrier integer comment 'foreign key to sms_carrier' references sms_carrier (id),
     smsnotify tinyint default 0 comment 'whether to send notices to SMS',
@@ -259,9 +254,9 @@ create table oid_nonces (
 create table confirm_address (
     code varchar(32) not null primary key comment 'good random code',
     user_id integer not null comment 'user who requested confirmation' references user (id),
-    address varchar(255) not null comment 'address (email, Jabber, SMS, etc.)',
+    address varchar(255) not null comment 'address (email, xmpp, SMS, etc.)',
     address_extra varchar(255) not null comment 'carrier ID, for SMS',
-    address_type varchar(8) not null comment 'address type ("email", "jabber", "sms")',
+    address_type varchar(8) not null comment 'address type ("email", "xmpp", "sms")',
     claimed datetime comment 'date this was claimed for queueing',
     sent datetime comment 'date this was sent for queueing',
     modified timestamp comment 'date this record was modified'
@@ -276,7 +271,7 @@ create table remember_me (
 create table queue_item (
     id integer auto_increment primary key comment 'unique identifier',
     frame blob not null comment 'data: object reference or opaque string',
-    transport varchar(8) not null comment 'queue for what? "email", "jabber", "sms", "irc", ...',
+    transport varchar(8) not null comment 'queue for what? "email", "xmpp", "sms", "irc", ...',
     created datetime not null comment 'date this record was created',
     claimed datetime comment 'date this item was claimed',
 
@@ -348,7 +343,7 @@ create table invitation (
      code varchar(32) not null primary key comment 'random code for an invitation',
      user_id int not null comment 'who sent the invitation' references user (id),
      address varchar(255) not null comment 'invitation sent to',
-     address_type varchar(8) not null comment 'address type ("email", "jabber", "sms")',
+     address_type varchar(8) not null comment 'address type ("email", "xmpp", "sms")',
      created datetime not null comment 'date this record was created',
 
      index invitation_address_idx (address, address_type),
@@ -633,3 +628,18 @@ create table inbox (
     constraint primary key (user_id)
 
 ) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
+
+create table user_im_prefs (
+    user_id integer not null comment 'user' references user (id),
+    screenname varchar(255) not null comment 'screenname on this service',
+    transport varchar(255) not null comment 'transport (ex xmpp, aim)',
+    notify tinyint(1) not null default 0 comment 'Notify when a new notice is sent',
+    replies tinyint(1) not null default 0 comment 'Send replies  from people not subscribed to',
+    microid tinyint(1) not null default 1 comment 'Publish a MicroID',
+    updatefrompresence tinyint(1) not null default 0 comment 'Send replies  from people not subscribed to.',
+    created timestamp not null DEFAULT CURRENT_TIMESTAMP comment 'date this record was created',
+    modified timestamp comment 'date this record was modified',
+
+    constraint primary key (user_id, transport),
+    constraint unique key `transport_screenname_key` ( `transport` , `screenname` )
+);
diff --git a/lib/channel.php b/lib/channel.php
index 3cd168786c..05437b4e9e 100644
--- a/lib/channel.php
+++ b/lib/channel.php
@@ -47,63 +47,6 @@ class Channel
     }
 }
 
-class XMPPChannel extends Channel
-{
-
-    var $conn = null;
-
-    function source()
-    {
-        return 'xmpp';
-    }
-
-    function __construct($conn)
-    {
-        $this->conn = $conn;
-    }
-
-    function on($user)
-    {
-        return $this->set_notify($user, 1);
-    }
-
-    function off($user)
-    {
-        return $this->set_notify($user, 0);
-    }
-
-    function output($user, $text)
-    {
-        $text = '['.common_config('site', 'name') . '] ' . $text;
-        jabber_send_message($user->jabber, $text);
-    }
-
-    function error($user, $text)
-    {
-        $text = '['.common_config('site', 'name') . '] ' . $text;
-        jabber_send_message($user->jabber, $text);
-    }
-
-    function set_notify(&$user, $notify)
-    {
-        $orig = clone($user);
-        $user->jabbernotify = $notify;
-        $result = $user->update($orig);
-        if (!$result) {
-            $last_error = &PEAR::getStaticProperty('DB_DataObject','lastError');
-            common_log(LOG_ERR,
-                       'Could not set notify flag to ' . $notify .
-                       ' for user ' . common_log_objstring($user) .
-                       ': ' . $last_error->message);
-            return false;
-        } else {
-            common_log(LOG_INFO,
-                       'User ' . $user->nickname . ' set notify flag to ' . $notify);
-            return true;
-        }
-    }
-}
-
 class WebChannel extends Channel
 {
     var $out = null;
diff --git a/lib/command.php b/lib/command.php
index 2a51fd6872..44b7b22743 100644
--- a/lib/command.php
+++ b/lib/command.php
@@ -596,7 +596,7 @@ class OffCommand extends Command
     }
     function execute($channel)
     {
-        if ($other) {
+        if ($this->other) {
             $channel->error($this->user, _("Command not yet implemented."));
         } else {
             if ($channel->off($this->user)) {
@@ -619,7 +619,7 @@ class OnCommand extends Command
 
     function execute($channel)
     {
-        if ($other) {
+        if ($this->other) {
             $channel->error($this->user, _("Command not yet implemented."));
         } else {
             if ($channel->on($this->user)) {
diff --git a/lib/imchannel.php b/lib/imchannel.php
new file mode 100644
index 0000000000..12354ce4b0
--- /dev/null
+++ b/lib/imchannel.php
@@ -0,0 +1,104 @@
+<?php
+/*
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2008, 2009, StatusNet, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
+
+class IMChannel extends Channel
+{
+
+    var $imPlugin;
+
+    function source()
+    {
+        return $imPlugin->transport;
+    }
+
+    function __construct($imPlugin)
+    {
+        $this->imPlugin = $imPlugin;
+    }
+
+    function on($user)
+    {
+        return $this->set_notify($user, 1);
+    }
+
+    function off($user)
+    {
+        return $this->set_notify($user, 0);
+    }
+
+    function output($user, $text)
+    {
+        $text = '['.common_config('site', 'name') . '] ' . $text;
+        $this->imPlugin->send_message($this->imPlugin->get_screenname($user), $text);
+    }
+
+    function error($user, $text)
+    {
+        $text = '['.common_config('site', 'name') . '] ' . $text;
+
+        $screenname = $this->imPlugin->get_screenname($user);
+        if($screenname){
+            $this->imPlugin->send_message($screenname, $text);
+            return true;
+        }else{
+            common_log(LOG_ERR,
+                'Could not send error message to user ' . common_log_objstring($user) .
+                ' on transport ' . $this->imPlugin->transport .' : user preference does not exist');
+            return false;
+        }
+    }
+
+    function set_notify($user, $notify)
+    {
+        $user_im_prefs = new User_im_prefs();
+        $user_im_prefs->transport = $this->imPlugin->transport;
+        $user_im_prefs->user_id = $user->id;
+        if($user_im_prefs->find() && $user_im_prefs->fetch()){
+            if($user_im_prefs->notify == $notify){
+                //notify is already set the way they want
+                return true;
+            }else{
+                $original = clone($user_im_prefs);
+                $user_im_prefs->notify = $notify;
+                $result = $user_im_prefs->update($original);
+
+                if (!$result) {
+                    $last_error = &PEAR::getStaticProperty('DB_DataObject','lastError');
+                    common_log(LOG_ERR,
+                               'Could not set notify flag to ' . $notify .
+                               ' for user ' . common_log_objstring($user) .
+                               ' on transport ' . $this->imPlugin->transport .' : ' . $last_error->message);
+                    return false;
+                } else {
+                    common_log(LOG_INFO,
+                               'User ' . $user->nickname . ' set notify flag to ' . $notify);
+                    return true;
+                }
+            }
+        }else{
+                common_log(LOG_ERR,
+                           'Could not set notify flag to ' . $notify .
+                           ' for user ' . common_log_objstring($user) .
+                           ' on transport ' . $this->imPlugin->transport .' : user preference does not exist');
+                return false;
+        }
+    }
+}
diff --git a/lib/immanager.php b/lib/immanager.php
new file mode 100644
index 0000000000..4c28ec0e6a
--- /dev/null
+++ b/lib/immanager.php
@@ -0,0 +1,70 @@
+<?php
+/*
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2008, 2009, StatusNet, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
+
+/**
+ * IKM background connection manager for IM-using queue handlers,
+ * allowing them to send outgoing messages on the right connection.
+ *
+ * In a multi-site queuedaemon.php run, one connection will be instantiated
+ * for each site being handled by the current process that has IM enabled.
+ *
+ * Implementations that extend this class will likely want to:
+ * 1) override start() with their connection process.
+ * 2) override handleInput() with what to do when data is waiting on
+ *    one of the sockets
+ * 3) override idle($timeout) to do keepalives (if necessary)
+ * 4) implement send_raw_message() to send raw data that ImPlugin::enqueue_outgoing_raw
+ *      enqueued
+ */
+
+abstract class ImManager extends IoManager
+{
+    abstract function send_raw_message($data);
+
+    function __construct($imPlugin)
+    {
+        $this->plugin = $imPlugin;
+        //TODO We only really want to register this event if this is the thread that runs the ImManager
+        Event::addHandler('EndInitializeQueueManager', array($this, 'onEndInitializeQueueManager'));
+    }
+
+    /**
+     * Fetch the singleton manager for the current site.
+     * @return mixed ImManager, or false if unneeded
+     */
+    public static function get()
+    {
+        throw new Exception('ImManager should be created using it\'s constructor, not the static get method');
+    }
+
+    /**
+     * Register notice queue handler
+     *
+     * @param QueueManager $manager
+     *
+     * @return boolean hook return
+     */
+    function onEndInitializeQueueManager($manager)
+    {
+        $manager->connect($this->plugin->transport . '-out', new ImSenderQueueHandler($this->plugin, $this), 'imdaemon');
+        return true;
+    }
+}
diff --git a/lib/implugin.php b/lib/implugin.php
new file mode 100644
index 0000000000..5d4d8949cd
--- /dev/null
+++ b/lib/implugin.php
@@ -0,0 +1,612 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Superclass for plugins that do instant messaging
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Plugin
+ * @package   StatusNet
+ * @author    Craig Andrews <candrews@integralblue.com>
+ * @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);
+}
+
+/**
+ * Superclass for plugins that do authentication
+ *
+ * Implementations will likely want to override onStartIoManagerClasses() so that their
+ *   IO manager is used
+ *
+ * @category Plugin
+ * @package  StatusNet
+ * @author   Craig Andrews <candrews@integralblue.com>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://status.net/
+ */
+
+abstract class ImPlugin extends Plugin
+{
+    //name of this IM transport
+    public $transport = null;
+    //list of screennames that should get all public notices
+    public $public = array();
+
+    /**
+     * normalize a screenname for comparison
+     *
+     * @param string $screenname screenname to normalize
+     *
+     * @return string an equivalent screenname in normalized form
+     */
+    abstract function normalize($screenname);
+
+
+    /**
+     * validate (ensure the validity of) a screenname
+     *
+     * @param string $screenname screenname to validate
+     *
+     * @return boolean
+     */
+    abstract function validate($screenname);
+
+    /**
+     * get the internationalized/translated display name of this IM service
+     *
+     * @return string
+     */
+    abstract function getDisplayName();
+
+    /**
+     * send a single notice to a given screenname
+     * The implementation should put raw data, ready to send, into the outgoing
+     *   queue using enqueue_outgoing_raw()
+     *
+     * @param string $screenname screenname to send to
+     * @param Notice $notice notice to send
+     *
+     * @return boolean success value
+     */
+    function send_notice($screenname, $notice)
+    {
+        return $this->send_message($screenname, $this->format_notice($notice));
+    }
+
+    /**
+     * send a message (text) to a given screenname
+     * The implementation should put raw data, ready to send, into the outgoing
+     *   queue using enqueue_outgoing_raw()
+     *
+     * @param string $screenname screenname to send to
+     * @param Notice $body text to send
+     *
+     * @return boolean success value
+     */
+    abstract function send_message($screenname, $body);
+
+    /**
+     * receive a raw message
+     * Raw IM data is taken from the incoming queue, and passed to this function.
+     * It should parse the raw message and call handle_incoming()
+     *
+     * @param object $data raw IM data
+     *
+     * @return boolean success value
+     */
+    abstract function receive_raw_message($data);
+
+    /**
+     * get the screenname of the daemon that sends and receives message for this service
+     *
+     * @return string screenname of this plugin
+     */
+    abstract function daemon_screenname();
+
+    /**
+     * get the microid uri of a given screenname
+     *
+     * @param string $screenname screenname
+     *
+     * @return string microid uri
+     */
+    function microiduri($screenname)
+    {
+        return $this->transport . ':' . $screenname;    
+    }
+    //========================UTILITY FUNCTIONS USEFUL TO IMPLEMENTATIONS - MISC ========================\
+
+    /**
+     * Put raw message data (ready to send) into the outgoing queue
+     *
+     * @param object $data
+     */
+    function enqueue_outgoing_raw($data)
+    {
+        $qm = QueueManager::get();
+        $qm->enqueue($data, $this->transport . '-out');
+    }
+
+    /**
+     * Put raw message data (received, ready to be processed) into the incoming queue
+     *
+     * @param object $data
+     */
+    function enqueue_incoming_raw($data)
+    {
+        $qm = QueueManager::get();
+        $qm->enqueue($data, $this->transport . '-in');
+    }
+
+    /**
+     * given a screenname, get the corresponding user
+     *
+     * @param string $screenname
+     *
+     * @return User user
+     */
+    function get_user($screenname)
+    {
+        $user_im_prefs = $this->get_user_im_prefs_from_screenname($screenname);
+        if($user_im_prefs){
+            $user = User::staticGet('id', $user_im_prefs->user_id);
+            $user_im_prefs->free();
+            return $user;
+        }else{
+            return false;
+        }
+    }
+
+
+    /**
+     * given a screenname, get the User_im_prefs object for this transport
+     *
+     * @param string $screenname
+     *
+     * @return User_im_prefs user_im_prefs
+     */
+    function get_user_im_prefs_from_screenname($screenname)
+    {
+        if($user_im_prefs = User_im_prefs::pkeyGet( array('transport' => $this->transport, 'screenname' => $screenname) )){
+            return $user_im_prefs;
+        }else{
+            return false;
+        }
+    }
+
+
+    /**
+     * given a User, get their screenname
+     *
+     * @param User $user
+     *
+     * @return string screenname of that user
+     */
+    function get_screenname($user)
+    {
+        $user_im_prefs = $this->get_user_im_prefs_from_user($user);
+        if($user_im_prefs){
+            return $user_im_prefs->screenname;
+        }else{
+            return false;
+        }
+    }
+
+
+    /**
+     * given a User, get their User_im_prefs
+     *
+     * @param User $user
+     *
+     * @return User_im_prefs user_im_prefs of that user
+     */
+    function get_user_im_prefs_from_user($user)
+    {
+        if($user_im_prefs = User_im_prefs::pkeyGet( array('transport' => $this->transport, 'user_id' => $user->id) )){
+            return $user_im_prefs;
+        }else{
+            return false;
+        }
+    }
+    //========================UTILITY FUNCTIONS USEFUL TO IMPLEMENTATIONS - SENDING ========================\
+    /**
+     * Send a message to a given screenname from the site
+     *
+     * @param string $screenname screenname to send the message to
+     * @param string $msg message contents to send
+     *
+     * @param boolean success
+     */
+    protected function send_from_site($screenname, $msg)
+    {
+        $text = '['.common_config('site', 'name') . '] ' . $msg;
+        $this->send_message($screenname, $text);
+    }
+
+    /**
+     * send a confirmation code to a user
+     *
+     * @param string $screenname screenname sending to
+     * @param string $code the confirmation code
+     * @param User $user user sending to
+     *
+     * @return boolean success value
+     */
+    function send_confirmation_code($screenname, $code, $user)
+    {
+        $body = sprintf(_('User "%s" on %s has said that your %s screenname belongs to them. ' .
+          'If that\'s true, you can confirm by clicking on this URL: ' .
+          '%s' .
+          ' . (If you cannot click it, copy-and-paste it into the ' .
+          'address bar of your browser). If that user isn\'t you, ' .
+          'or if you didn\'t request this confirmation, just ignore this message.'),
+          $user->nickname, common_config('site', 'name'), $this->getDisplayName(), common_local_url('confirmaddress', array('code' => $code)));
+
+        return $this->send_message($screenname, $body);
+    }
+
+    /**
+     * send a notice to all public listeners
+     *
+     * For notices that are generated on the local system (by users), we can optionally
+     * forward them to remote listeners by XMPP.
+     *
+     * @param Notice $notice notice to broadcast
+     *
+     * @return boolean success flag
+     */
+
+    function public_notice($notice)
+    {
+        // Now, users who want everything
+
+        // FIXME PRIV don't send out private messages here
+        // XXX: should we send out non-local messages if public,localonly
+        // = false? I think not
+
+        foreach ($this->public as $screenname) {
+            common_log(LOG_INFO,
+                       'Sending notice ' . $notice->id .
+                       ' to public listener ' . $screenname,
+                       __FILE__);
+            $this->send_notice($screenname, $notice);
+        }
+
+        return true;
+    }
+
+    /**
+     * broadcast a notice to all subscribers and reply recipients
+     *
+     * This function will send a notice to all subscribers on the local server
+     * who have IM addresses, and have IM notification enabled, and
+     * have this subscription enabled for IM. It also sends the notice to
+     * all recipients of @-replies who have IM addresses and IM notification
+     * enabled. This is really the heart of IM distribution in StatusNet.
+     *
+     * @param Notice $notice The notice to broadcast
+     *
+     * @return boolean success flag
+     */
+
+    function broadcast_notice($notice)
+    {
+
+        $ni = $notice->whoGets();
+
+        foreach ($ni as $user_id => $reason) {
+            $user = User::staticGet($user_id);
+            if (empty($user)) {
+                // either not a local user, or just not found
+                continue;
+            }
+            $user_im_prefs = $this->get_user_im_prefs_from_user($user);
+            if(!$user_im_prefs || !$user_im_prefs->notify){
+                continue;
+            }
+
+            switch ($reason) {
+            case NOTICE_INBOX_SOURCE_REPLY:
+                if (!$user_im_prefs->replies) {
+                    continue 2;
+                }
+                break;
+            case NOTICE_INBOX_SOURCE_SUB:
+                $sub = Subscription::pkeyGet(array('subscriber' => $user->id,
+                                                   'subscribed' => $notice->profile_id));
+                if (empty($sub) || !$sub->jabber) {
+                    continue 2;
+                }
+                break;
+            case NOTICE_INBOX_SOURCE_GROUP:
+                break;
+            default:
+                throw new Exception(sprintf(_("Unknown inbox source %d."), $reason));
+            }
+
+            common_log(LOG_INFO,
+                       'Sending notice ' . $notice->id . ' to ' . $user_im_prefs->screenname,
+                       __FILE__);
+            $this->send_notice($user_im_prefs->screenname, $notice);
+            $user_im_prefs->free();
+        }
+
+        return true;
+    }
+
+    /**
+     * makes a plain-text formatted version of a notice, suitable for IM distribution
+     *
+     * @param Notice  $notice  notice being sent
+     *
+     * @return string plain-text version of the notice, with user nickname prefixed
+     */
+
+    function format_notice($notice)
+    {
+        $profile = $notice->getProfile();
+        return $profile->nickname . ': ' . $notice->content . ' [' . $notice->id . ']';
+    }
+    //========================UTILITY FUNCTIONS USEFUL TO IMPLEMENTATIONS - RECEIVING ========================\
+
+    /**
+     * Attempt to handle a message as a command
+     * @param User $user user the message is from
+     * @param string $body message text
+     * @return boolean true if the message was a command and was executed, false if it was not a command
+     */
+    protected function handle_command($user, $body)
+    {
+        $inter = new CommandInterpreter();
+        $cmd = $inter->handle_command($user, $body);
+        if ($cmd) {
+            $chan = new IMChannel($this);
+            $cmd->execute($chan);
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    /**
+     * Is some text an autoreply message?
+     * @param string $txt message text
+     * @return boolean true if autoreply
+     */
+    protected function is_autoreply($txt)
+    {
+        if (preg_match('/[\[\(]?[Aa]uto[-\s]?[Rr]e(ply|sponse)[\]\)]/', $txt)) {
+            return true;
+        } else if (preg_match('/^System: Message wasn\'t delivered. Offline storage size was exceeded.$/', $txt)) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    /**
+     * Is some text an OTR message?
+     * @param string $txt message text
+     * @return boolean true if OTR
+     */
+    protected function is_otr($txt)
+    {
+        if (preg_match('/^\?OTR/', $txt)) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    /**
+     * Helper for handling incoming messages
+     * Your incoming message handler will probably want to call this function
+     *
+     * @param string $from screenname the message was sent from
+     * @param string $message message contents
+     *
+     * @param boolean success
+     */
+    protected function handle_incoming($from, $notice_text)
+    {
+        $user = $this->get_user($from);
+        // For common_current_user to work
+        global $_cur;
+        $_cur = $user;
+
+        if (!$user) {
+            $this->send_from_site($from, 'Unknown user; go to ' .
+                             common_local_url('imsettings') .
+                             ' to add your address to your account');
+            common_log(LOG_WARNING, 'Message from unknown user ' . $from);
+            return;
+        }
+        if ($this->handle_command($user, $notice_text)) {
+            common_log(LOG_INFO, "Command message by $from handled.");
+            return;
+        } else if ($this->is_autoreply($notice_text)) {
+            common_log(LOG_INFO, 'Ignoring auto reply from ' . $from);
+            return;
+        } else if ($this->is_otr($notice_text)) {
+            common_log(LOG_INFO, 'Ignoring OTR from ' . $from);
+            return;
+        } else {
+
+            common_log(LOG_INFO, 'Posting a notice from ' . $user->nickname);
+
+            $this->add_notice($from, $user, $notice_text);
+        }
+
+        $user->free();
+        unset($user);
+        unset($_cur);
+        unset($message);
+    }
+
+    /**
+     * Helper for handling incoming messages
+     * Your incoming message handler will probably want to call this function
+     *
+     * @param string $from screenname the message was sent from
+     * @param string $message message contents
+     *
+     * @param boolean success
+     */
+    protected function add_notice($screenname, $user, $body)
+    {
+        $body = trim(strip_tags($body));
+        $content_shortened = common_shorten_links($body);
+        if (Notice::contentTooLong($content_shortened)) {
+          $this->send_from_site($screenname, sprintf(_('Message too long - maximum is %1$d characters, you sent %2$d.'),
+                                          Notice::maxContent(),
+                                          mb_strlen($content_shortened)));
+          return;
+        }
+
+        try {
+            $notice = Notice::saveNew($user->id, $content_shortened, $this->transport);
+        } catch (Exception $e) {
+            common_log(LOG_ERR, $e->getMessage());
+            $this->send_from_site($from, $e->getMessage());
+            return;
+        }
+
+        common_broadcast_notice($notice);
+        common_log(LOG_INFO,
+                   'Added notice ' . $notice->id . ' from user ' . $user->nickname);
+        $notice->free();
+        unset($notice);
+    }
+
+    //========================EVENT HANDLERS========================\
+    
+    /**
+     * Register notice queue handler
+     *
+     * @param QueueManager $manager
+     *
+     * @return boolean hook return
+     */
+    function onEndInitializeQueueManager($manager)
+    {
+        $manager->connect($this->transport . '-in', new ImReceiverQueueHandler($this));
+        $manager->connect($this->transport, new ImQueueHandler($this));
+        return true;
+    }
+
+    function onStartImDaemonIoManagers(&$classes)
+    {
+        //$classes[] = new ImManager($this); // handles sending/receiving/pings/reconnects
+        return true;
+    }
+
+    function onStartEnqueueNotice($notice, &$transports)
+    {
+        $profile = Profile::staticGet($notice->profile_id);
+
+        if (!$profile) {
+            common_log(LOG_WARNING, 'Refusing to broadcast notice with ' .
+                       'unknown profile ' . common_log_objstring($notice),
+                       __FILE__);
+        }else{
+            $transports[] = $this->transport;
+        }
+
+        return true;
+    }
+
+    function onEndShowHeadElements($action)
+    {
+        $aname = $action->trimmed('action');
+
+        if ($aname == 'shownotice') {
+
+            $user_im_prefs = new User_im_prefs();
+            $user_im_prefs->user_id = $action->profile->id;
+            $user_im_prefs->transport = $this->transport;
+
+            if ($user_im_prefs->find() && $user_im_prefs->fetch() && $user_im_prefs->microid && $action->notice->uri) {
+                $id = new Microid($this->microiduri($user_im_prefs->screenname),
+                                  $action->notice->uri);
+                $action->element('meta', array('name' => 'microid',
+                                             'content' => $id->toString()));
+            }
+
+        } else if ($aname == 'showstream') {
+
+            $user_im_prefs = new User_im_prefs();
+            $user_im_prefs->user_id = $action->user->id;
+            $user_im_prefs->transport = $this->transport;
+
+            if ($user_im_prefs->find() && $user_im_prefs->fetch() && $user_im_prefs->microid && $action->profile->profileurl) {
+                $id = new Microid($this->microiduri($user_im_prefs->screenname),
+                                  $action->selfUrl());
+                $action->element('meta', array('name' => 'microid',
+                                               'content' => $id->toString()));
+            }
+        }
+    }
+
+    function onNormalizeImScreenname($transport, &$screenname)
+    {
+        if($transport == $this->transport)
+        {
+            $screenname = $this->normalize($screenname);
+            return false;
+        }
+    }
+
+    function onValidateImScreenname($transport, $screenname, &$valid)
+    {
+        if($transport == $this->transport)
+        {
+            $valid = $this->validate($screenname);
+            return false;
+        }
+    }
+
+    function onGetImTransports(&$transports)
+    {
+        $transports[$this->transport] = array('display' => $this->getDisplayName());
+    }
+
+    function onSendImConfirmationCode($transport, $screenname, $code, $user)
+    {
+        if($transport == $this->transport)
+        {
+            $this->send_confirmation_code($screenname, $code, $user);
+            return false;
+        }
+    }
+
+    function onUserDeleteRelated($user, &$tables)
+    {
+        $tables[] = 'User_im_prefs';
+        return true;
+    }
+
+    function initialize()
+    {
+        if(is_null($this->transport)){
+            throw new Exception('transport cannot be null');
+        }
+    }
+}
diff --git a/lib/jabberqueuehandler.php b/lib/imqueuehandler.php
similarity index 60%
rename from lib/jabberqueuehandler.php
rename to lib/imqueuehandler.php
index 83471f2df7..b42d8e7c0b 100644
--- a/lib/jabberqueuehandler.php
+++ b/lib/imqueuehandler.php
@@ -17,31 +17,32 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET') && !defined('LACONICA')) {
-    exit(1);
-}
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 /**
- * Queue handler for pushing new notices to Jabber users.
- * @fixme this exception handling doesn't look very good.
+ * Common superclass for all IM sending queue handlers.
  */
-class JabberQueueHandler extends QueueHandler
-{
-    var $conn = null;
 
-    function transport()
+class ImQueueHandler extends QueueHandler
+{
+    function __construct($plugin)
     {
-        return 'jabber';
+        $this->plugin = $plugin;
     }
 
+    /**
+     * Handle a notice
+     * @param Notice $notice
+     * @return boolean success
+     */
     function handle($notice)
     {
-        require_once(INSTALLDIR.'/lib/jabber.php');
-        try {
-            return jabber_broadcast_notice($notice);
-        } catch (XMPPHP_Exception $e) {
-            $this->log(LOG_ERR, "Got an XMPPHP_Exception: " . $e->getMessage());
-            return false;
+        $this->plugin->broadcast_notice($notice);
+        if ($notice->is_local == Notice::LOCAL_PUBLIC ||
+            $notice->is_local == Notice::LOCAL_NONPUBLIC) {
+            $this->plugin->public_notice($notice);
         }
+        return true;
     }
+
 }
diff --git a/lib/publicqueuehandler.php b/lib/imreceiverqueuehandler.php
similarity index 60%
rename from lib/publicqueuehandler.php
rename to lib/imreceiverqueuehandler.php
index c9edb8d5d7..269c7db918 100644
--- a/lib/publicqueuehandler.php
+++ b/lib/imreceiverqueuehandler.php
@@ -17,29 +17,26 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET') && !defined('LACONICA')) {
-    exit(1);
-}
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 /**
- * Queue handler for pushing new notices to public XMPP subscribers.
+ * Common superclass for all IM receiving queue handlers.
  */
-class PublicQueueHandler extends QueueHandler
-{
 
-    function transport()
+class ImReceiverQueueHandler extends QueueHandler
+{
+    function __construct($plugin)
     {
-        return 'public';
+        $this->plugin = $plugin;
     }
 
-    function handle($notice)
+    /**
+     * Handle incoming IM data sent by a user to the IM bot
+     * @param object $data
+     * @return boolean success
+     */
+    function handle($data)
     {
-        require_once(INSTALLDIR.'/lib/jabber.php');
-        try {
-            return jabber_public_notice($notice);
-        } catch (XMPPHP_Exception $e) {
-            $this->log(LOG_ERR, "Got an XMPPHP_Exception: " . $e->getMessage());
-            return false;
-        }
+        return $this->plugin->receive_raw_message($data);
     }
 }
diff --git a/lib/imsenderqueuehandler.php b/lib/imsenderqueuehandler.php
new file mode 100644
index 0000000000..3dd96ff731
--- /dev/null
+++ b/lib/imsenderqueuehandler.php
@@ -0,0 +1,44 @@
+<?php
+/*
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2008, 2009, StatusNet, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
+
+/**
+ * Common superclass for all IM sending queue handlers.
+ */
+
+class ImSenderQueueHandler extends QueueHandler
+{
+    function __construct($plugin, $immanager)
+    {
+        $this->plugin = $plugin;
+        $this->immanager = $immanager;
+    }
+
+    /**
+     * Handle outgoing IM data to be sent from the bot to a user
+     * @param object $data
+     * @return boolean success
+     */
+    function handle($data)
+    {
+        return $this->immanager->send_raw_message($data);
+    }
+}
+
diff --git a/lib/jabber.php b/lib/jabber.php
deleted file mode 100644
index b6b23521bd..0000000000
--- a/lib/jabber.php
+++ /dev/null
@@ -1,473 +0,0 @@
-<?php
-/**
- * StatusNet, the distributed open-source microblogging tool
- *
- * utility functions for Jabber/GTalk/XMPP messages
- *
- * 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  Network
- * @package   StatusNet
- * @author    Evan Prodromou <evan@status.net>
- * @copyright 2008 StatusNet, Inc.
- * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://status.net/
- */
-
-if (!defined('STATUSNET') && !defined('LACONICA')) {
-    exit(1);
-}
-
-require_once 'XMPPHP/XMPP.php';
-
-/**
- * checks whether a string is a syntactically valid Jabber ID (JID)
- *
- * @param string $jid string to check
- *
- * @return     boolean whether the string is a valid JID
- */
-
-function jabber_valid_base_jid($jid)
-{
-    // Cheap but effective
-    return Validate::email($jid);
-}
-
-/**
- * normalizes a Jabber ID for comparison
- *
- * @param string $jid JID to check
- *
- * @return string an equivalent JID in normalized (lowercase) form
- */
-
-function jabber_normalize_jid($jid)
-{
-    if (preg_match("/(?:([^\@]+)\@)?([^\/]+)(?:\/(.*))?$/", $jid, $matches)) {
-        $node   = $matches[1];
-        $server = $matches[2];
-        return strtolower($node.'@'.$server);
-    } else {
-        return null;
-    }
-}
-
-/**
- * the JID of the Jabber daemon for this StatusNet instance
- *
- * @return string JID of the Jabber daemon
- */
-
-function jabber_daemon_address()
-{
-    return common_config('xmpp', 'user') . '@' . common_config('xmpp', 'server');
-}
-
-class Sharing_XMPP extends XMPPHP_XMPP
-{
-    function getSocket()
-    {
-        return $this->socket;
-    }
-}
-
-/**
- * Build an XMPP proxy connection that'll save outgoing messages
- * to the 'xmppout' queue to be picked up by xmppdaemon later.
- */
-function jabber_proxy()
-{
-	$proxy = new Queued_XMPP(common_config('xmpp', 'host') ?
-                             common_config('xmpp', 'host') :
-                             common_config('xmpp', 'server'),
-                             common_config('xmpp', 'port'),
-                             common_config('xmpp', 'user'),
-                             common_config('xmpp', 'password'),
-                             common_config('xmpp', 'resource') . 'daemon',
-                             common_config('xmpp', 'server'),
-                             common_config('xmpp', 'debug') ?
-                             true : false,
-                             common_config('xmpp', 'debug') ?
-                             XMPPHP_Log::LEVEL_VERBOSE :  null);
-    return $proxy;
-}
-
-/**
- * Lazy-connect the configured Jabber account to the configured server;
- * if already opened, the same connection will be returned.
- *
- * In a multi-site background process, each site configuration
- * will get its own connection.
- *
- * @param string $resource Resource to connect (defaults to configured resource)
- *
- * @return XMPPHP connection to the configured server
- */
-
-function jabber_connect($resource=null)
-{
-    static $connections = array();
-    $site = common_config('site', 'server');
-    if (empty($connections[$site])) {
-        if (empty($resource)) {
-            $resource = common_config('xmpp', 'resource');
-        }
-        $conn = new Sharing_XMPP(common_config('xmpp', 'host') ?
-                                common_config('xmpp', 'host') :
-                                common_config('xmpp', 'server'),
-                                common_config('xmpp', 'port'),
-                                common_config('xmpp', 'user'),
-                                common_config('xmpp', 'password'),
-                                $resource,
-                                common_config('xmpp', 'server'),
-                                common_config('xmpp', 'debug') ?
-                                true : false,
-                                common_config('xmpp', 'debug') ?
-                                XMPPHP_Log::LEVEL_VERBOSE :  null
-                                );
-
-        if (!$conn) {
-            return false;
-        }
-        $connections[$site] = $conn;
-
-        $conn->autoSubscribe();
-        $conn->useEncryption(common_config('xmpp', 'encryption'));
-
-        try {
-            common_log(LOG_INFO, __METHOD__ . ": connecting " .
-                common_config('xmpp', 'user') . '/' . $resource);
-            //$conn->connect(true); // true = persistent connection
-            $conn->connect(); // persistent connections break multisite
-        } catch (XMPPHP_Exception $e) {
-            common_log(LOG_ERR, $e->getMessage());
-            return false;
-        }
-
-        $conn->processUntil('session_start');
-    }
-    return $connections[$site];
-}
-
-/**
- * Queue send for a single notice to a given Jabber address
- *
- * @param string $to     JID to send the notice to
- * @param Notice $notice notice to send
- *
- * @return boolean success value
- */
-
-function jabber_send_notice($to, $notice)
-{
-    $conn = jabber_proxy();
-    $profile = Profile::staticGet($notice->profile_id);
-    if (!$profile) {
-        common_log(LOG_WARNING, 'Refusing to send notice with ' .
-                   'unknown profile ' . common_log_objstring($notice),
-                   __FILE__);
-        return false;
-    }
-    $msg   = jabber_format_notice($profile, $notice);
-    $entry = jabber_format_entry($profile, $notice);
-    $conn->message($to, $msg, 'chat', null, $entry);
-    $profile->free();
-    return true;
-}
-
-/**
- * extra information for XMPP messages, as defined by Twitter
- *
- * @param Profile $profile Profile of the sending user
- * @param Notice  $notice  Notice being sent
- *
- * @return string Extra information (Atom, HTML, addresses) in string format
- */
-
-function jabber_format_entry($profile, $notice)
-{
-    $entry = $notice->asAtomEntry(true, true);
-
-    $xs = new XMLStringer();
-    $xs->elementStart('html', array('xmlns' => 'http://jabber.org/protocol/xhtml-im'));
-    $xs->elementStart('body', array('xmlns' => 'http://www.w3.org/1999/xhtml'));
-    $xs->element('a', array('href' => $profile->profileurl),
-                 $profile->nickname);
-    $xs->text(": ");
-    if (!empty($notice->rendered)) {
-        $xs->raw($notice->rendered);
-    } else {
-        $xs->raw(common_render_content($notice->content, $notice));
-    }
-    $xs->text(" ");
-    $xs->element('a', array(
-        'href'=>common_local_url('conversation',
-            array('id' => $notice->conversation)).'#notice-'.$notice->id
-         ),sprintf(_('[%s]'),$notice->id));
-    $xs->elementEnd('body');
-    $xs->elementEnd('html');
-
-    $html = $xs->getString();
-
-    return $html . ' ' . $entry;
-}
-
-/**
- * sends a single text message to a given JID
- *
- * @param string $to      JID to send the message to
- * @param string $body    body of the message
- * @param string $type    type of the message
- * @param string $subject subject of the message
- *
- * @return boolean success flag
- */
-
-function jabber_send_message($to, $body, $type='chat', $subject=null)
-{
-    $conn = jabber_proxy();
-    $conn->message($to, $body, $type, $subject);
-    return true;
-}
-
-/**
- * sends a presence stanza on the Jabber network
- *
- * @param string $status   current status, free-form string
- * @param string $show     structured status value
- * @param string $to       recipient of presence, null for general
- * @param string $type     type of status message, related to $show
- * @param int    $priority priority of the presence
- *
- * @return boolean success value
- */
-
-function jabber_send_presence($status, $show='available', $to=null,
-                              $type = 'available', $priority=null)
-{
-    $conn = jabber_connect();
-    if (!$conn) {
-        return false;
-    }
-    $conn->presence($status, $show, $to, $type, $priority);
-    return true;
-}
-
-/**
- * sends a confirmation request to a JID
- *
- * @param string $code     confirmation code for confirmation URL
- * @param string $nickname nickname of confirming user
- * @param string $address  JID to send confirmation to
- *
- * @return boolean success flag
- */
-
-function jabber_confirm_address($code, $nickname, $address)
-{
-    $body = 'User "' . $nickname . '" on ' . common_config('site', 'name') . ' ' .
-      'has said that your Jabber ID belongs to them. ' .
-      'If that\'s true, you can confirm by clicking on this URL: ' .
-      common_local_url('confirmaddress', array('code' => $code)) .
-      ' . (If you cannot click it, copy-and-paste it into the ' .
-      'address bar of your browser). If that user isn\'t you, ' .
-      'or if you didn\'t request this confirmation, just ignore this message.';
-
-    return jabber_send_message($address, $body);
-}
-
-/**
- * sends a "special" presence stanza on the Jabber network
- *
- * @param string $type   Type of presence
- * @param string $to     JID to send presence to
- * @param string $show   show value for presence
- * @param string $status status value for presence
- *
- * @return boolean success flag
- *
- * @see jabber_send_presence()
- */
-
-function jabber_special_presence($type, $to=null, $show=null, $status=null)
-{
-    // FIXME: why use this instead of jabber_send_presence()?
-    $conn = jabber_connect();
-
-    $to     = htmlspecialchars($to);
-    $status = htmlspecialchars($status);
-
-    $out = "<presence";
-    if ($to) {
-        $out .= " to='$to'";
-    }
-    if ($type) {
-        $out .= " type='$type'";
-    }
-    if ($show == 'available' and !$status) {
-        $out .= "/>";
-    } else {
-        $out .= ">";
-        if ($show && ($show != 'available')) {
-            $out .= "<show>$show</show>";
-        }
-        if ($status) {
-            $out .= "<status>$status</status>";
-        }
-        $out .= "</presence>";
-    }
-    $conn->send($out);
-}
-
-/**
- * Queue broadcast of a notice to all subscribers and reply recipients
- *
- * This function will send a notice to all subscribers on the local server
- * who have Jabber addresses, and have Jabber notification enabled, and
- * have this subscription enabled for Jabber. It also sends the notice to
- * all recipients of @-replies who have Jabber addresses and Jabber notification
- * enabled. This is really the heart of Jabber distribution in StatusNet.
- *
- * @param Notice $notice The notice to broadcast
- *
- * @return boolean success flag
- */
-
-function jabber_broadcast_notice($notice)
-{
-    if (!common_config('xmpp', 'enabled')) {
-        return true;
-    }
-    $profile = Profile::staticGet($notice->profile_id);
-
-    if (!$profile) {
-        common_log(LOG_WARNING, 'Refusing to broadcast notice with ' .
-                   'unknown profile ' . common_log_objstring($notice),
-                   __FILE__);
-        return false;
-    }
-
-    $msg   = jabber_format_notice($profile, $notice);
-    $entry = jabber_format_entry($profile, $notice);
-
-    $profile->free();
-    unset($profile);
-
-    $sent_to = array();
-
-    $conn = jabber_proxy();
-
-    $ni = $notice->whoGets();
-
-    foreach ($ni as $user_id => $reason) {
-        $user = User::staticGet($user_id);
-        if (empty($user) ||
-            empty($user->jabber) ||
-            !$user->jabbernotify) {
-            // either not a local user, or just not found
-            continue;
-        }
-        switch ($reason) {
-        case NOTICE_INBOX_SOURCE_REPLY:
-            if (!$user->jabberreplies) {
-                continue 2;
-            }
-            break;
-        case NOTICE_INBOX_SOURCE_SUB:
-            $sub = Subscription::pkeyGet(array('subscriber' => $user->id,
-                                               'subscribed' => $notice->profile_id));
-            if (empty($sub) || !$sub->jabber) {
-                continue 2;
-            }
-            break;
-        case NOTICE_INBOX_SOURCE_GROUP:
-            break;
-        default:
-            throw new Exception(sprintf(_("Unknown inbox source %d."), $reason));
-        }
-
-        common_log(LOG_INFO,
-                   'Sending notice ' . $notice->id . ' to ' . $user->jabber,
-                   __FILE__);
-        $conn->message($user->jabber, $msg, 'chat', null, $entry);
-    }
-
-    return true;
-}
-
-/**
- * Queue send of a notice to all public listeners
- *
- * For notices that are generated on the local system (by users), we can optionally
- * forward them to remote listeners by XMPP.
- *
- * @param Notice $notice notice to broadcast
- *
- * @return boolean success flag
- */
-
-function jabber_public_notice($notice)
-{
-    // Now, users who want everything
-
-    $public = common_config('xmpp', 'public');
-
-    // FIXME PRIV don't send out private messages here
-    // XXX: should we send out non-local messages if public,localonly
-    // = false? I think not
-
-    if ($public && $notice->is_local == Notice::LOCAL_PUBLIC) {
-        $profile = Profile::staticGet($notice->profile_id);
-
-        if (!$profile) {
-            common_log(LOG_WARNING, 'Refusing to broadcast notice with ' .
-                       'unknown profile ' . common_log_objstring($notice),
-                       __FILE__);
-            return false;
-        }
-
-        $msg   = jabber_format_notice($profile, $notice);
-        $entry = jabber_format_entry($profile, $notice);
-
-        $conn = jabber_proxy();
-
-        foreach ($public as $address) {
-            common_log(LOG_INFO,
-                       'Sending notice ' . $notice->id .
-                       ' to public listener ' . $address,
-                       __FILE__);
-            $conn->message($address, $msg, 'chat', null, $entry);
-        }
-        $profile->free();
-    }
-
-    return true;
-}
-
-/**
- * makes a plain-text formatted version of a notice, suitable for Jabber distribution
- *
- * @param Profile &$profile profile of the sending user
- * @param Notice  &$notice  notice being sent
- *
- * @return string plain-text version of the notice, with user nickname prefixed
- */
-
-function jabber_format_notice(&$profile, &$notice)
-{
-    return $profile->nickname . ': ' . $notice->content . ' [' . $notice->id . ']';
-}
diff --git a/lib/queuehandler.php b/lib/queuehandler.php
index 2909cd83b1..2194dd1618 100644
--- a/lib/queuehandler.php
+++ b/lib/queuehandler.php
@@ -36,20 +36,6 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 class QueueHandler
 {
 
-    /**
-     * Return transport keyword which identifies items this queue handler
-     * services; must be defined for all subclasses.
-     *
-     * Must be 8 characters or less to fit in the queue_item database.
-     * ex "email", "jabber", "sms", "irc", ...
-     *
-     * @return string
-     */
-    function transport()
-    {
-        return null;
-    }
-
     /**
      * Here's the meat of your queue handler -- you're handed a Notice
      * or other object, which you may do as you will with.
diff --git a/lib/queuemanager.php b/lib/queuemanager.php
index 61e28085ab..0b405943d3 100644
--- a/lib/queuemanager.php
+++ b/lib/queuemanager.php
@@ -213,18 +213,8 @@ abstract class QueueManager extends IoManager
                 $this->connect('sms', 'SmsQueueHandler');
             }
 
-            // XMPP output handlers...
-            $this->connect('jabber', 'JabberQueueHandler');
-            $this->connect('public', 'PublicQueueHandler');
-
-            // @fixme this should get an actual queue
-            //$this->connect('confirm', 'XmppConfirmHandler');
-
             // For compat with old plugins not registering their own handlers.
             $this->connect('plugin', 'PluginQueueHandler');
-
-            $this->connect('xmppout', 'XmppOutQueueHandler', 'xmppdaemon');
-
         }
         Event::handle('EndInitializeQueueManager', array($this));
     }
@@ -251,8 +241,8 @@ abstract class QueueManager extends IoManager
         $group = 'queuedaemon';
         if ($this->master) {
             // hack hack
-            if ($this->master instanceof XmppMaster) {
-                return 'xmppdaemon';
+            if ($this->master instanceof ImMaster) {
+                return 'imdaemon';
             }
         }
         return $group;
diff --git a/lib/queuemonitor.php b/lib/queuemonitor.php
index 1c306a6298..3dc0ea65aa 100644
--- a/lib/queuemonitor.php
+++ b/lib/queuemonitor.php
@@ -36,7 +36,7 @@ class QueueMonitor
      * Only explicitly listed thread/site/queue owners will be incremented.
      *
      * @param string $key counter name
-     * @param array $owners list of owner keys like 'queue:jabber' or 'site:stat01'
+     * @param array $owners list of owner keys like 'queue:xmpp' or 'site:stat01'
      */
     public function stats($key, $owners=array())
     {
diff --git a/lib/util.php b/lib/util.php
index 6c9f6316ad..e60cb6765c 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -994,18 +994,9 @@ function common_enqueue_notice($notice)
 
     $transports = $allTransports;
 
-    $xmpp = common_config('xmpp', 'enabled');
-
-    if ($xmpp) {
-        $transports[] = 'jabber';
-    }
-
     if ($notice->is_local == Notice::LOCAL_PUBLIC ||
         $notice->is_local == Notice::LOCAL_NONPUBLIC) {
         $transports = array_merge($transports, $localTransports);
-        if ($xmpp) {
-            $transports[] = 'public';
-        }
     }
 
     if (Event::handle('StartEnqueueNotice', array($notice, &$transports))) {
diff --git a/lib/xmppmanager.php b/lib/xmppmanager.php
deleted file mode 100644
index 985e7c32e4..0000000000
--- a/lib/xmppmanager.php
+++ /dev/null
@@ -1,485 +0,0 @@
-<?php
-/*
- * StatusNet - the distributed open-source microblogging tool
- * Copyright (C) 2008, 2009, StatusNet, Inc.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
-
-/**
- * XMPP background connection manager for XMPP-using queue handlers,
- * allowing them to send outgoing messages on the right connection.
- *
- * Input is handled during socket select loop, keepalive pings during idle.
- * Any incoming messages will be forwarded to the main XmppDaemon process,
- * which handles direct user interaction.
- *
- * In a multi-site queuedaemon.php run, one connection will be instantiated
- * for each site being handled by the current process that has XMPP enabled.
- */
-
-class XmppManager extends IoManager
-{
-    protected $site = null;
-    protected $pingid = 0;
-    protected $lastping = null;
-
-    static protected $singletons = array();
-    
-    const PING_INTERVAL = 120;
-
-    /**
-     * Fetch the singleton XmppManager for the current site.
-     * @return mixed XmppManager, or false if unneeded
-     */
-    public static function get()
-    {
-        if (common_config('xmpp', 'enabled')) {
-            $site = common_config('site', 'server');
-            if (empty(self::$singletons[$site])) {
-                self::$singletons[$site] = new XmppManager();
-            }
-            return self::$singletons[$site];
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * Tell the i/o master we need one instance for each supporting site
-     * being handled in this process.
-     */
-    public static function multiSite()
-    {
-        return IoManager::INSTANCE_PER_SITE;
-    }
-
-    function __construct()
-    {
-        $this->site = common_config('site', 'server');
-        $this->resource = common_config('xmpp', 'resource') . 'daemon';
-    }
-
-    /**
-     * Initialize connection to server.
-     * @return boolean true on success
-     */
-    public function start($master)
-    {
-        parent::start($master);
-        $this->switchSite();
-
-        require_once INSTALLDIR . "/lib/jabber.php";
-
-        # Low priority; we don't want to receive messages
-
-        common_log(LOG_INFO, "INITIALIZE");
-        $this->conn = jabber_connect($this->resource);
-
-        if (empty($this->conn)) {
-            common_log(LOG_ERR, "Couldn't connect to server.");
-            return false;
-        }
-
-        $this->log(LOG_DEBUG, "Initializing stanza handlers.");
-
-        $this->conn->addEventHandler('message', 'handle_message', $this);
-        $this->conn->addEventHandler('presence', 'handle_presence', $this);
-        $this->conn->addEventHandler('reconnect', 'handle_reconnect', $this);
-
-        $this->conn->setReconnectTimeout(600);
-        jabber_send_presence("Send me a message to post a notice", 'available', null, 'available', 100);
-
-        return !is_null($this->conn);
-    }
-
-    /**
-     * Message pump is triggered on socket input, so we only need an idle()
-     * call often enough to trigger our outgoing pings.
-     */
-    function timeout()
-    {
-        return self::PING_INTERVAL;
-    }
-
-    /**
-     * Lists the XMPP connection socket to allow i/o master to wake
-     * when input comes in here as well as from the queue source.
-     *
-     * @return array of resources
-     */
-    public function getSockets()
-    {
-        if ($this->conn) {
-            return array($this->conn->getSocket());
-        } else {
-            return array();
-        }
-    }
-
-    /**
-     * Process XMPP events that have come in over the wire.
-     * Side effects: may switch site configuration
-     * @fixme may kill process on XMPP error
-     * @param resource $socket
-     */
-    public function handleInput($socket)
-    {
-        $this->switchSite();
-
-        # Process the queue for as long as needed
-        try {
-            if ($this->conn) {
-                assert($socket === $this->conn->getSocket());
-                
-                common_log(LOG_DEBUG, "Servicing the XMPP queue.");
-                $this->stats('xmpp_process');
-                $this->conn->processTime(0);
-            }
-        } catch (XMPPHP_Exception $e) {
-            common_log(LOG_ERR, "Got an XMPPHP_Exception: " . $e->getMessage());
-            die($e->getMessage());
-        }
-    }
-
-    /**
-     * Idle processing for io manager's execution loop.
-     * Send keepalive pings to server.
-     *
-     * Side effect: kills process on exception from XMPP library.
-     *
-     * @fixme non-dying error handling
-     */
-    public function idle($timeout=0)
-    {
-        if ($this->conn) {
-            $now = time();
-            if (empty($this->lastping) || $now - $this->lastping > self::PING_INTERVAL) {
-                $this->switchSite();
-                try {
-                    $this->sendPing();
-                    $this->lastping = $now;
-                } catch (XMPPHP_Exception $e) {
-                    common_log(LOG_ERR, "Got an XMPPHP_Exception: " . $e->getMessage());
-                    die($e->getMessage());
-                }
-            }
-        }
-    }
-
-    /**
-     * For queue handlers to pass us a message to push out,
-     * if we're active.
-     *
-     * @fixme should this be blocking etc?
-     *
-     * @param string $msg XML stanza to send
-     * @return boolean success
-     */
-    public function send($msg)
-    {
-        if ($this->conn && !$this->conn->isDisconnected()) {
-            $bytes = $this->conn->send($msg);
-            if ($bytes > 0) {
-                $this->conn->processTime(0);
-                return true;
-            } else {
-                return false;
-            }
-        } else {
-            // Can't send right now...
-            return false;
-        }
-    }
-
-    /**
-     * Send a keepalive ping to the XMPP server.
-     */
-    protected function sendPing()
-    {
-        $jid = jabber_daemon_address().'/'.$this->resource;
-        $server = common_config('xmpp', 'server');
-
-        if (!isset($this->pingid)) {
-            $this->pingid = 0;
-        } else {
-            $this->pingid++;
-        }
-
-        common_log(LOG_DEBUG, "Sending ping #{$this->pingid}");
-
-        $this->conn->send("<iq from='{$jid}' to='{$server}' id='ping_{$this->pingid}' type='get'><ping xmlns='urn:xmpp:ping'/></iq>");
-    }
-
-    /**
-     * Callback for Jabber reconnect event
-     * @param $pl
-     */
-    function handle_reconnect(&$pl)
-    {
-        common_log(LOG_NOTICE, 'XMPP reconnected');
-
-        $this->conn->processUntil('session_start');
-        $this->conn->presence(null, 'available', null, 'available', 100);
-    }
-
-
-    function get_user($from)
-    {
-        $user = User::staticGet('jabber', jabber_normalize_jid($from));
-        return $user;
-    }
-
-    /**
-     * XMPP callback for handling message input...
-     * @param array $pl XMPP payload
-     */
-    function handle_message(&$pl)
-    {
-        $from = jabber_normalize_jid($pl['from']);
-
-        if ($pl['type'] != 'chat') {
-            $this->log(LOG_WARNING, "Ignoring message of type ".$pl['type']." from $from.");
-            return;
-        }
-
-        if (mb_strlen($pl['body']) == 0) {
-            $this->log(LOG_WARNING, "Ignoring message with empty body from $from.");
-            return;
-        }
-
-        // Forwarded from another daemon for us to handle; this shouldn't
-        // happen any more but we might get some legacy items.
-        if ($this->is_self($from)) {
-            $this->log(LOG_INFO, "Got forwarded notice from self ($from).");
-            $from = $this->get_ofrom($pl);
-            $this->log(LOG_INFO, "Originally sent by $from.");
-            if (is_null($from) || $this->is_self($from)) {
-                $this->log(LOG_INFO, "Ignoring notice originally sent by $from.");
-                return;
-            }
-        }
-
-        $user = $this->get_user($from);
-
-        // For common_current_user to work
-        global $_cur;
-        $_cur = $user;
-
-        if (!$user) {
-            $this->from_site($from, 'Unknown user; go to ' .
-                             common_local_url('imsettings') .
-                             ' to add your address to your account');
-            $this->log(LOG_WARNING, 'Message from unknown user ' . $from);
-            return;
-        }
-        if ($this->handle_command($user, $pl['body'])) {
-            $this->log(LOG_INFO, "Command message by $from handled.");
-            return;
-        } else if ($this->is_autoreply($pl['body'])) {
-            $this->log(LOG_INFO, 'Ignoring auto reply from ' . $from);
-            return;
-        } else if ($this->is_otr($pl['body'])) {
-            $this->log(LOG_INFO, 'Ignoring OTR from ' . $from);
-            return;
-        } else {
-
-            $this->log(LOG_INFO, 'Posting a notice from ' . $user->nickname);
-
-            $this->add_notice($user, $pl);
-        }
-
-        $user->free();
-        unset($user);
-        unset($_cur);
-
-        unset($pl['xml']);
-        $pl['xml'] = null;
-
-        $pl = null;
-        unset($pl);
-    }
-
-
-    function is_self($from)
-    {
-        return preg_match('/^'.strtolower(jabber_daemon_address()).'/', strtolower($from));
-    }
-
-    function get_ofrom($pl)
-    {
-        $xml = $pl['xml'];
-        $addresses = $xml->sub('addresses');
-        if (!$addresses) {
-            $this->log(LOG_WARNING, 'Forwarded message without addresses');
-            return null;
-        }
-        $address = $addresses->sub('address');
-        if (!$address) {
-            $this->log(LOG_WARNING, 'Forwarded message without address');
-            return null;
-        }
-        if (!array_key_exists('type', $address->attrs)) {
-            $this->log(LOG_WARNING, 'No type for forwarded message');
-            return null;
-        }
-        $type = $address->attrs['type'];
-        if ($type != 'ofrom') {
-            $this->log(LOG_WARNING, 'Type of forwarded message is not ofrom');
-            return null;
-        }
-        if (!array_key_exists('jid', $address->attrs)) {
-            $this->log(LOG_WARNING, 'No jid for forwarded message');
-            return null;
-        }
-        $jid = $address->attrs['jid'];
-        if (!$jid) {
-            $this->log(LOG_WARNING, 'Could not get jid from address');
-            return null;
-        }
-        $this->log(LOG_DEBUG, 'Got message forwarded from jid ' . $jid);
-        return $jid;
-    }
-
-    function is_autoreply($txt)
-    {
-        if (preg_match('/[\[\(]?[Aa]uto[-\s]?[Rr]e(ply|sponse)[\]\)]/', $txt)) {
-            return true;
-        } else if (preg_match('/^System: Message wasn\'t delivered. Offline storage size was exceeded.$/', $txt)) {
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    function is_otr($txt)
-    {
-        if (preg_match('/^\?OTR/', $txt)) {
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    function from_site($address, $msg)
-    {
-        $text = '['.common_config('site', 'name') . '] ' . $msg;
-        jabber_send_message($address, $text);
-    }
-
-    function handle_command($user, $body)
-    {
-        $inter = new CommandInterpreter();
-        $cmd = $inter->handle_command($user, $body);
-        if ($cmd) {
-            $chan = new XMPPChannel($this->conn);
-            $cmd->execute($chan);
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    function add_notice(&$user, &$pl)
-    {
-        $body = trim($pl['body']);
-        $content_shortened = common_shorten_links($body);
-        if (Notice::contentTooLong($content_shortened)) {
-          $from = jabber_normalize_jid($pl['from']);
-          $this->from_site($from, sprintf(_('Message too long - maximum is %1$d characters, you sent %2$d.'),
-                                          Notice::maxContent(),
-                                          mb_strlen($content_shortened)));
-          return;
-        }
-
-        try {
-            $notice = Notice::saveNew($user->id, $content_shortened, 'xmpp');
-        } catch (Exception $e) {
-            $this->log(LOG_ERR, $e->getMessage());
-            $this->from_site($user->jabber, $e->getMessage());
-            return;
-        }
-
-        common_broadcast_notice($notice);
-        $this->log(LOG_INFO,
-                   'Added notice ' . $notice->id . ' from user ' . $user->nickname);
-        $notice->free();
-        unset($notice);
-    }
-
-    function handle_presence(&$pl)
-    {
-        $from = jabber_normalize_jid($pl['from']);
-        switch ($pl['type']) {
-         case 'subscribe':
-            # We let anyone subscribe
-            $this->subscribed($from);
-            $this->log(LOG_INFO,
-                       'Accepted subscription from ' . $from);
-            break;
-         case 'subscribed':
-         case 'unsubscribed':
-         case 'unsubscribe':
-            $this->log(LOG_INFO,
-                       'Ignoring  "' . $pl['type'] . '" from ' . $from);
-            break;
-         default:
-            if (!$pl['type']) {
-                $user = User::staticGet('jabber', $from);
-                if (!$user) {
-                    $this->log(LOG_WARNING, 'Presence from unknown user ' . $from);
-                    return;
-                }
-                if ($user->updatefrompresence) {
-                    $this->log(LOG_INFO, 'Updating ' . $user->nickname .
-                               ' status from presence.');
-                    $this->add_notice($user, $pl);
-                }
-                $user->free();
-                unset($user);
-            }
-            break;
-        }
-        unset($pl['xml']);
-        $pl['xml'] = null;
-
-        $pl = null;
-        unset($pl);
-    }
-
-    function log($level, $msg)
-    {
-        $text = 'XMPPDaemon('.$this->resource.'): '.$msg;
-        common_log($level, $text);
-    }
-
-    function subscribed($to)
-    {
-        jabber_special_presence('subscribed', $to);
-    }
-
-    /**
-     * Make sure we're on the right site configuration
-     */
-    protected function switchSite()
-    {
-        if ($this->site != common_config('site', 'server')) {
-            common_log(LOG_DEBUG, __METHOD__ . ": switching to site $this->site");
-            $this->stats('switch');
-            StatusNet::init($this->site);
-        }
-    }
-}
diff --git a/lib/xmppoutqueuehandler.php b/lib/xmppoutqueuehandler.php
deleted file mode 100644
index 2afa260f18..0000000000
--- a/lib/xmppoutqueuehandler.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-/*
- * StatusNet - the distributed open-source microblogging tool
- * Copyright (C) 2010, StatusNet, Inc.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- * Queue handler for pre-processed outgoing XMPP messages.
- * Formatted XML stanzas will have been pushed into the queue
- * via the Queued_XMPP connection proxy, probably from some
- * other queue processor.
- *
- * Here, the XML stanzas are simply pulled out of the queue and
- * pushed out over the wire; an XmppManager is needed to set up
- * and maintain the actual server connection.
- *
- * This queue will be run via XmppDaemon rather than QueueDaemon.
- *
- * @author Brion Vibber <brion@status.net>
- */
-class XmppOutQueueHandler extends QueueHandler
-{
-    function transport() {
-        return 'xmppout';
-    }
-
-    /**
-     * Take a previously-queued XMPP stanza and send it out ot the server.
-     * @param string $msg
-     * @return boolean true on success
-     */
-    function handle($msg)
-    {
-        assert(is_string($msg));
-
-        $xmpp = XmppManager::get();
-        $ok = $xmpp->send($msg);
-
-        return $ok;
-    }
-}
-
diff --git a/plugins/Aim/AimPlugin.php b/plugins/Aim/AimPlugin.php
new file mode 100644
index 0000000000..3855d1fb05
--- /dev/null
+++ b/plugins/Aim/AimPlugin.php
@@ -0,0 +1,162 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2009, StatusNet, Inc.
+ *
+ * Send and receive notices using the AIM network
+ *
+ * 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  IM
+ * @package   StatusNet
+ * @author    Craig Andrews <candrews@integralblue.com>
+ * @copyright 2009 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);
+}
+// We bundle the phptoclib library...
+set_include_path(get_include_path() . PATH_SEPARATOR . dirname(__FILE__) . '/extlib/phptoclib');
+
+/**
+ * Plugin for AIM
+ *
+ * @category  Plugin
+ * @package   StatusNet
+ * @author    Craig Andrews <candrews@integralblue.com>
+ * @copyright 2009 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+
+class AimPlugin extends ImPlugin
+{
+    public $user =  null;
+    public $password = null;
+    public $publicFeed = array();
+
+    public $transport = 'aim';
+
+    function getDisplayName()
+    {
+        return _m('AIM');
+    }
+
+    function normalize($screenname)
+    {
+		$screenname = str_replace(" ","", $screenname);
+        return strtolower($screenname);
+    }
+
+    function daemon_screenname()
+    {
+        return $this->user;
+    }
+
+    function validate($screenname)
+    {
+        if(preg_match('/^[a-z]\w{2,15}$/i', $screenname)) {
+            return true;
+        }else{
+            return false;
+        }
+    }
+
+    /**
+     * Load related modules when needed
+     *
+     * @param string $cls Name of the class to be loaded
+     *
+     * @return boolean hook value; true means continue processing, false means stop.
+     */
+    function onAutoload($cls)
+    {
+        $dir = dirname(__FILE__);
+
+        switch ($cls)
+        {
+        case 'Aim':
+            require_once(INSTALLDIR.'/plugins/Aim/extlib/phptoclib/aimclassw.php');
+            return false;
+        case 'AimManager':
+            include_once $dir . '/'.strtolower($cls).'.php';
+            return false;
+        case 'Fake_Aim':
+            include_once $dir . '/'. $cls .'.php';
+            return false;
+        default:
+            return true;
+        }
+    }
+
+    function onStartImDaemonIoManagers(&$classes)
+    {
+        parent::onStartImDaemonIoManagers(&$classes);
+        $classes[] = new AimManager($this); // handles sending/receiving
+        return true;
+    }
+
+    function microiduri($screenname)
+    {
+        return 'aim:' . $screenname;    
+    }
+
+    function send_message($screenname, $body)
+    {
+        $this->fake_aim->sendIm($screenname, $body);
+	    $this->enqueue_outgoing_raw($this->fake_aim->would_be_sent);
+        return true;
+    }
+
+    function receive_raw_message($message)
+    {
+        $info=Aim::getMessageInfo($message);
+        $from = $info['from'];
+        $user = $this->get_user($from);
+        $notice_text = $info['message'];
+
+        return $this->handle_incoming($from, $notice_text);
+    }
+
+    function initialize(){
+        if(!isset($this->user)){
+            throw new Exception("must specify a user");
+        }
+        if(!isset($this->password)){
+            throw new Exception("must specify a password");
+        }
+
+        $this->fake_aim = new Fake_Aim($this->user,$this->password,4);
+        return true;
+    }
+
+    function onPluginVersion(&$versions)
+    {
+        $versions[] = array('name' => 'AIM',
+                            'version' => STATUSNET_VERSION,
+                            'author' => 'Craig Andrews',
+                            'homepage' => 'http://status.net/wiki/Plugin:AIM',
+                            'rawdescription' =>
+                            _m('The AIM plugin allows users to send and receive notices over the AIM network.'));
+        return true;
+    }
+}
+
diff --git a/plugins/Aim/Fake_Aim.php b/plugins/Aim/Fake_Aim.php
new file mode 100644
index 0000000000..139b68f82b
--- /dev/null
+++ b/plugins/Aim/Fake_Aim.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Instead of sending AIM messages, retrieve the raw data that would be sent
+ *
+ * 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  Network
+ * @package   StatusNet
+ * @author    Craig Andrews <candrews@integralblue.com>
+ * @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);
+}
+
+class Fake_Aim extends Aim
+{
+    public $would_be_sent = null;
+
+    function sflapSend($sflap_type, $sflap_data, $no_null, $formatted)
+    {
+        $this->would_be_sent = array($sflap_type, $sflap_data, $no_null, $formatted);
+    }
+}
+
diff --git a/plugins/Aim/README b/plugins/Aim/README
new file mode 100644
index 0000000000..0465917383
--- /dev/null
+++ b/plugins/Aim/README
@@ -0,0 +1,27 @@
+The AIM plugin allows users to send and receive notices over the AIM network.
+
+Installation
+============
+add "addPlugin('aim',
+    array('setting'=>'value', 'setting2'=>'value2', ...);"
+to the bottom of your config.php
+
+The daemon included with this plugin must be running. It will be started by
+the plugin along with their other daemons when you run scripts/startdaemons.sh.
+See the StatusNet README for more about queuing and daemons.
+
+Settings
+========
+user*: username (screenname) to use when logging into AIM
+password*: password for that user
+
+* required
+default values are in (parenthesis)
+
+Example
+=======
+addPlugin('aim', array(
+    'user=>'...',
+    'password'=>'...'
+));
+
diff --git a/plugins/Aim/aimmanager.php b/plugins/Aim/aimmanager.php
new file mode 100644
index 0000000000..d9b7421fb2
--- /dev/null
+++ b/plugins/Aim/aimmanager.php
@@ -0,0 +1,100 @@
+<?php
+/*
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2008, 2009, StatusNet, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
+
+/**
+ * AIM background connection manager for AIM-using queue handlers,
+ * allowing them to send outgoing messages on the right connection.
+ *
+ * Input is handled during socket select loop, keepalive pings during idle.
+ * Any incoming messages will be handled.
+ *
+ * In a multi-site queuedaemon.php run, one connection will be instantiated
+ * for each site being handled by the current process that has XMPP enabled.
+ */
+
+class AimManager extends ImManager
+{
+
+    public $conn = null;
+    /**
+     * Initialize connection to server.
+     * @return boolean true on success
+     */
+    public function start($master)
+    {
+        if(parent::start($master))
+        {
+            $this->connect();
+            return true;
+        }else{
+            return false;
+        }
+    }
+
+    public function getSockets()
+    {
+        $this->connect();
+        if($this->conn){
+            return array($this->conn->myConnection);
+        }else{
+            return array();
+        }
+    }
+
+    /**
+     * Process AIM events that have come in over the wire.
+     * @param resource $socket
+     */
+    public function handleInput($socket)
+    {
+        common_log(LOG_DEBUG, "Servicing the AIM queue.");
+        $this->stats('aim_process');
+        $this->conn->receive();
+    }
+
+    function connect()
+    {
+        if (!$this->conn) {
+            $this->conn=new Aim($this->plugin->user,$this->plugin->password,4);
+            $this->conn->registerHandler("IMIn",array($this,"handle_aim_message"));
+            $this->conn->myServer="toc.oscar.aol.com";
+            $this->conn->signon();
+            $this->conn->setProfile(_m('Send me a message to post a notice'),false);
+        }
+        return $this->conn;
+    }
+
+    function handle_aim_message($data)
+    {
+        $this->plugin->enqueue_incoming_raw($data);
+        return true;
+    }
+
+    function send_raw_message($data)
+    {
+        $this->connect();
+        if (!$this->conn) {
+            return false;
+        }
+        $this->conn->sflapSend($data[0],$data[1],$data[2],$data[3]);
+        return true;
+    }
+}
diff --git a/plugins/Aim/extlib/phptoclib/README.txt b/plugins/Aim/extlib/phptoclib/README.txt
new file mode 100755
index 0000000000..0eec13af8a
--- /dev/null
+++ b/plugins/Aim/extlib/phptoclib/README.txt
@@ -0,0 +1,169 @@
+phpTOCLib version 1.0 RC1
+
+This is released under the LGPL. AIM,TOC,OSCAR, and all other related protocols/terms are 
+copyright AOL/Time Warner. This project is in no way affiliated with them, nor is this
+project supported by them.
+
+Some of the code is loosely based off of a script by Jeffrey Grafton. Mainly the decoding of packets, and the
+function for roasting passwords is entirly his.
+
+TOC documentation used is available at http://simpleaim.sourceforge.net/docs/TOC.txt
+
+
+About:
+phpTOCLib aims to be a PHP equivalent to the PERL module NET::AIM. Due to some limitations, 
+this is difficult. Many features have been excluded in the name of simplicity, and leaves
+you alot of room to code with externally, providing function access to the variables that
+need them.
+
+I have aimed to make this extensible, and easy to use, therefore taking away some built in
+functionality that I had originally out in. This project comes after several months of
+researching the TOC protocol.
+
+example.php is included with the class. It needs to be executed from the command line
+(ie:php -q testscript.php) and you need to call php.exe with the -q
+example is provided as a demonstaration only. Though it creats a very simple, functional bot, it lacks any sort of commands, it merely resends the message it recieves in reverse.
+
+
+Revisions:
+
+-----------------------------------
+by Rajiv Makhijani
+(02/24/04)
+	 - Fixed Bug in Setting Permit/Deny Mode
+	 - Fixes so Uninitialized string offset notice doesn't appear
+	 - Replaced New Lines Outputed for Each Flap Read with " . " so
+	   that you can still tell it is active but it does not take so much space
+	 - Removed "eh?" message
+	 - Added MySQL Database Connection Message
+	 - New Functions:
+		update_profile(profile data string, powered by boolean)
+			* The profile data string is the text that goes in the profile.
+			* The powered by boolean if set to true displays a link to the
+			  sourceforge page of the script.
+(02/28/04)
+	- Silent option added to set object not to output any information
+		- To follow silent rule use sEcho function instead of Echo
+-----------------------------------
+by Jeremy (pickleman78)
+(05/26/04) beta 1 release
+	-Complete overhaul of class design and message handling
+	-Fixed bug involving sign off after long periods of idling
+	-Added new function $Aim->registerHandler
+	-Added the capability to handle all AIM messages
+		-Processing the messages is still the users responsibility
+	-Did a little bit of code cleanup
+	-Added a few internal functions to make the classes internal life easier
+	-Improved AIM server error message processing
+	-Updated this document (hopefully Rajiv will clean it up some, since I'm a terrible documenter)
+-------------------------------------------------------------------------------------------------------------
+
+
+
+Functions:
+
+Several methods are provided in the class that allow for simple access to some of the 
+common features of AIM. Below are details.
+
+$Aim->Aim($sn,$password,$pdmode, $silent=false)
+The constructor, it takes 4 arguments. 
+$sn is your screen name
+$password is you password, in plain text
+$pdmode is the permit deny mode. This can be as follows:
+1 - Allow All
+2 - Deny All
+3 - Permit only those on your permit list
+4 - Permit all those not on your deny list
+$silent if set to true prints out nothing
+
+So, if your screen-name is JohnDoe746 and your password is fertu, and you want to allow
+all users of the AIM server to contact you, you would code as follows
+$myaim=new Aim("JohnDoe746","fertu",1);
+
+
+$Aim->add_permit($buddy)
+This adds the buddy passed to the function to your permit list.
+ie: $myaim->add_permit("My friend22");
+
+$Aim->block_buddy($buddy)
+Blocks a user. This will switch your pd mode to 4. After using this, for the user to remain
+out of contact with you, it is required to provide the constructor with a pd mode of 4
+ie:$myaim->block_buddy("Annoying guy 4");
+
+$Aim->send_im($to,$message,$auto=false)
+Sends $message to $user. If you set the 3rd argument to true, then the recipient will receive it in
+the same format as an away message. (Auto Response from me:)
+A message longer than 65535 will be truncated
+ie:$myaim->send_im("myfriend","This is a happy message");
+
+$Aim->set_my_info()
+Sends an update buddy command to the server and allows some internal values about yourself
+to be set.
+ie:$myaim->set_my_info();
+
+$Aim->signon()
+Call this to connect to the server. This must be called before any other methods will work
+properly
+ie:$mybot->signon();
+
+$Aim->getLastReceived()
+Returns $this->myLastReceived['decoded']. This should be the only peice of the gotten data
+you need to concern yourself with. This is a preferred method of accessing this variable to prevent
+accidental modification of $this->myLastReceived. Accidently modifying this variable can
+cause some internal failures.
+
+$Aim->read_from_aim()
+This is a wrapper for $Aim->sflap_read(), and only returns the $this->myLastReceived['data']
+portion of the message. It is preferred that you do not call $Aim->sflap_read() and use this
+function instead. This function has a return value. Calling this prevents the need to call
+$Aim->getLastReceived()
+
+$Aim->setWarning($wl)
+This allows you to update the bots warning level when warned.
+
+$Aim->getBuddies()
+Returns the $this->myBuddyList array. Use this instead of modifying the internal variable
+
+$Aim->getPermit()
+Returns the $this->myPermitList array. Use this instead of modifying the internal variable
+
+$Aim->getBlocked()
+Returns the $this->myBlockedList array. Use this instead of modifying the internal variable
+
+$Aim->warn_user($user,$anon=false)
+Warn $user. If anon is set to true, then it warns the user anonomously
+
+$Aim->update_profile($information, $poweredby=false)
+Updates Profile to $information.  If $poweredby is true a link to
+sourceforge page for this script is appended to profile
+
+$Aim->registerHandler($function_name,$command)
+This is by far the best thing about the new release. 
+For more information please reas supplement.txt. It is not included here because of the sheer size of the document.
+supplement.txt contains full details on using registerHandler and what to expect for each input.
+
+
+For convenience, I have provided some functions to simplify message processing. 
+
+They can be read about in the file "supplement.txt". I chose not to include the text here because it
+is a huge document
+
+
+
+There are a few things you should note about AIM
+1)An incoming message has HTML tags in it. You are responsible for stripping those tags
+2)Outgoing messages can have HTML tags, but will work fine if they don't. To include things
+  in the time feild next to the users name, send it as a comment
+
+Conclusion:
+The class is released under the LGPL. If you have any bug reports, comments, questions
+feature requests, or want to help/show me what you've created with this(I am very interested in this), 
+please drop me an email: pickleman78@users.sourceforge.net. This code was written by 
+Jeremy(a.k.a pickleman78) and Rajiv M (a.k.a compwiz562).
+
+
+Special thanks:
+I'd like to thank all of the people who have contributed ideas, testing, bug reports, and code additions to
+this project. I'd like to especially thank Rajiv, who has done do much for the project, and has kept this documnet
+looking nice. He also has done alot of testing of this script too. I'd also like to thank SpazLink for his help in
+testing. And finally I'd like to thank Jeffery Grafton, whose script inspired me to start this project.
diff --git a/plugins/Aim/extlib/phptoclib/aimclassw.php b/plugins/Aim/extlib/phptoclib/aimclassw.php
new file mode 100755
index 0000000000..0657910d9e
--- /dev/null
+++ b/plugins/Aim/extlib/phptoclib/aimclassw.php
@@ -0,0 +1,2370 @@
+<?php
+/*
+*	PHPTOCLIB: A library for AIM connectivity through PHP using the TOC protocal.
+*
+*	This library is free software; you can redistribute it and/or
+*	modify it under the terms of the GNU Lesser General Public
+*	License as published by the Free Software Foundation; either
+*	version 2.1 of the License, or (at your option) any later version.
+*
+*	This library 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
+*	Lesser General Public License for more details.
+*
+*	You should have received a copy of the GNU Lesser General Public
+*	License along with this library; if not, write to the Free Software
+*	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*
+*/
+/**
+* The version of PHPTOCLIB we are running right now
+*
+* @access private
+* @var int
+*/
+define("PHPTOCLIB_VERSION","1.0.0 RC1");
+
+// Prevents Script from Timing Out
+//set_time_limit(0);
+
+// Constant Declarations
+
+/**
+* Maximum size for a direct connection IM in bytes
+*
+* @access private
+* @var int
+*/
+
+define("MAX_DIM_SIZE",3072); //Default to 3kb
+
+/**
+* Internally used for message type
+*
+* @access private
+* @var int
+*/
+define("AIM_TYPE_WARN",74);
+/**
+* Internally used for message type
+*
+* @access private
+* @var int
+*/
+define("AIM_TYPE_MSG",75);
+/**
+* Internally used for message type
+*
+* @access private
+* @var int
+*/
+define("AIM_TYPE_UPDATEBUDDY",76);
+/**
+* Internally used for message type
+*
+* @access private
+* @var int
+*/
+define("AIM_TYPE_SIGNON",77);
+/**
+* Internally used for message type
+*
+* @access private
+* @var int
+*/
+define("AIM_TYPE_NICK",78);
+/**
+* Internally used for message type
+*
+* @access private
+* @var int
+*/
+define("AIM_TYPE_ERROR",79);
+/**
+* Internally used for message type
+*
+* @access private
+* @var int
+*/
+define("AIM_TYPE_CHATJ",80);
+/**
+* Internally used for message type
+*
+* @access private
+* @var int
+*/
+define("AIM_TYPE_CHATI",81);
+/**
+* Internally used for message type
+*
+* @access private
+* @var int
+*/
+define("AIM_TYPE_CHATUPDBUD",82);
+/**
+* Internally used for message type
+*
+* @access private
+* @var int
+*/
+define("AIM_TYPE_CHATINV",83);
+/**
+* Internally used for message type
+*
+* @access private
+* @var int
+*/
+define("AIM_TYPE_CHATLE",84);
+/**
+* Internally used for message type
+*
+* @access private
+* @var int
+*/
+define("AIM_TYPE_URL",85);
+/**
+* Internally used for message type
+*
+* @access private
+* @var int
+*/
+define("AIM_TYPE_NICKSTAT",86);
+/**
+* Internally used for message type
+*
+* @access private
+* @var int
+*/
+define("AIM_TYPE_PASSSTAT",87);
+/**
+* Internally used for message type
+*
+* @access private
+* @var int
+*/
+define("AIM_TYPE_RVOUSP",88);
+/**
+* Internally used for message type
+*
+* @access private
+* @var int
+*/
+define("AIM_TYPE_NOT_IMPLEMENTED",666);
+
+
+
+/**
+* Internally used for connection type
+*
+* Internal type for a normal connection
+*
+* @access private
+* @var int
+*/
+define("CONN_TYPE_NORMAL",1);
+/**
+* Internally used for connection type
+*
+* Internal type of a Dirct Connection
+*
+* @access private
+* @var int
+*/
+define("CONN_TYPE_DC",2);
+/**
+* Internally used for connection type
+*
+*Internal type for a file transfer connection
+*
+* @access private
+* @var int
+*/
+define("CONN_TYPE_FT",3);
+/**
+* Internally used for connection type
+*
+*Internal type for a file get connection
+*
+* @access private
+* @var int
+*/
+define("CONN_TYPE_FTG",4);
+
+/**
+* Maximum size for a TOC packet
+*
+* @access private
+* @var int
+*/
+define("MAX_PACKLENGTH",2048);
+
+/**
+* TOC packet type
+*
+* @access private
+* @var int
+*/
+define("SFLAP_TYPE_SIGNON",1);
+/**
+* TOC packet type
+*
+* @access private
+* @var int
+*/
+define("SFLAP_TYPE_DATA",2);
+/**
+* TOC packet type
+*
+* @access private
+* @var int
+*/
+define("SFLAP_TYPE_ERROR",3);
+/**
+* TOC packet type
+*
+* @access private
+* @var int
+*/
+define("SFLAP_TYPE_SIGNOFF",4);
+/**
+* TOC packet type
+*
+* @access private
+* @var int
+*/
+define("SFLAP_TYPE_KEEPALIVE",5);
+/**
+* TOC packet type
+*
+* @access private
+* @var int
+*/
+define("SFLAP_MAX_LENGTH",1024);
+
+
+
+/**
+* Service UID for a voice connection
+*
+* @access private
+* @var int
+*/
+define('VOICE_UID', '09461341-4C7F-11D1-8222-444553540000');
+/**
+* Service UID for file sending 
+*
+* @access private
+* @var int
+*/
+define('FILE_SEND_UID', '09461343-4C7F-11D1-8222-444553540000');
+/**
+* Service UID for file getting
+*
+* @access private
+* @var int
+*/
+define('FILE_GET_UID', '09461348-4C7F-11D1-8222-444553540000');
+/**
+* Service UID for Direct connections 
+*
+* @access private
+* @var int
+*/
+define('IMAGE_UID', '09461345-4C7F-11D1-8222-444553540000');
+/**
+* Service UID for Buddy Icons
+*
+* @access private
+* @var int
+*/
+define('BUDDY_ICON_UID', '09461346-4C7F-11D1-8222-444553540000');
+/**
+* Service UID for stocks
+*
+* @access private
+* @var int
+*/
+define('STOCKS_UID', '09461347-4C7F-11D1-8222-444553540000');
+/**
+* Service UID for games
+*
+* @access private
+* @var int
+*/
+define('GAMES_UID', '0946134a-4C7F-11D1-8222-444553540000');
+
+/**
+* FLAP return code
+*
+* @access private
+* @var int
+*/
+define("SFLAP_SUCCESS",0);
+/**
+* FLAP return code
+*
+* @access private
+* @var int
+*/
+define("SFLAP_ERR_UNKNOWN",1);
+/**
+* FLAP return code
+*
+* @access private
+* @var int
+*/
+define("SFLAP_ERR_ARGS",2);
+/**
+* FLAP return code
+*
+* @access private
+* @var int
+*/
+define("SFLAP_ERR_LENGTH",3);
+/**
+* FLAP return code
+*
+* @access private
+* @var int
+*/
+define("SFLAP_ERR_READ",4);
+/**
+* FLAP return code
+*
+* @access private
+* @var int
+*/
+define("SFLAP_ERR_SEND",5);
+
+/**
+* FLAP version number
+*
+* @access private
+* @var int
+*/
+define("SFLAP_FLAP_VERSION",1);
+/**
+* FLAP TLV code
+*
+* @access private
+* @var int
+*/
+define("SFLAP_TLV_TAG",1);
+/**
+* Bytes in a FLAP header
+*
+* @access private
+* @var int
+*/
+define("SFLAP_HEADER_LEN",6);
+
+/** 
+ * PHPTocLib AIM Class
+ *
+ * @author Jeremy Bryant <pickleman78@users.sourceforge.net>
+ * @author Rajiv Makhijani <rajiv@blue-tech.org>
+ * @package phptoclib
+ * @version 1.0RC1
+ * @copyright 2005
+ * @access public
+ *
+ */
+class Aim
+{
+	/** 
+	 * AIM ScreenName
+	 *
+	 * @var String
+	 * @access private
+	 */
+	var $myScreenName;
+	
+	/** 
+	 * AIM Password (Plain Text)
+	 *
+	 * @var String
+	 * @access private
+	 */
+	var $myPassword;
+	
+
+	/** 
+	 * AIM TOC Server
+	 *
+	 * @var String
+	 * @access public
+	 */
+	var $myServer="toc.oscar.aol.com";
+	
+	/** 
+	 * AIM Formatted ScreenName
+	 *
+	 * @var String
+	 * @access private
+	 */
+	var $myFormatSN;
+	
+	/** 
+	 * AIM TOC Server Port
+	 *
+	 * @var String
+	 * @access public
+	 */
+	var $myPort="5190";
+	
+	/** 
+	 * Profile Data
+	 * Use setProfile() to update
+	 *
+	 * @var String
+	 * @access private
+	 */
+	var $myProfile="Powered by phpTOCLib. Please visit http://sourceforge.net/projects/phptoclib for more information";     //The profile of the bot
+
+	/** 
+	 * Socket Connection Resource ID
+	 *
+	 * @var Resource
+	 * @access private
+	 */
+	var $myConnection;  //Connection resource ID
+	
+	/** 
+	 * Roasted AIM Password
+	 *
+	 * @var String
+	 * @access private
+	 */
+	var $myRoastedPass;
+	
+	/** 
+	 * Last Message Recieved From Server
+	 *
+	 * @var String
+	 * @access private
+	 */
+	var $myLastReceived;
+	
+	/** 
+	 * Current Seq Number Used to Communicate with Server
+	 *
+	 * @var Integer
+	 * @access private
+	 */
+	var $mySeqNum;
+	 
+	 /** 
+	 * Current Warning Level
+	 * Getter: getWarning()
+	 * Setter: setWarning()
+	 *
+	 * @var Integer
+	 * @access private
+	 */
+	var $myWarnLevel;   //Warning Level of the bot
+	
+	 /** 
+	 * Auth Code
+	 *
+	 * @var Integer
+	 * @access private
+	 */
+	var $myAuthCode;
+	
+	/** 
+	 * Buddies
+	 * Getter: getBuddies()
+	 *
+	 * @var Array
+	 * @access private
+	 */
+	var $myBuddyList;
+	
+	/** 
+	 * Blocked Buddies
+	 * Getter: getBlocked()
+	 *
+	 * @var Array
+	 * @access private
+	 */
+	var $myBlockedList;
+	
+	/** 
+	 * Permited Buddies
+	 * Getter: getBlocked()
+	 *
+	 * @var Array
+	 * @access private
+	 */
+	var $myPermitList;
+	
+	/** 
+	 * Permit/Deny Mode
+	 * 1 - Allow All
+	 * 2 - Deny All
+	 * 3 - Permit only those on your permit list
+	 * 4 - Permit all those not on your deny list
+	 *
+	 * @var Integer
+	 * @access private
+	 */
+	var $myPdMode;
+	
+	//Below variables added 4-29 by Jeremy: Implementing chat
+
+	/** 
+	 * Contains Chat Room Info
+	 * $myChatRooms['roomid'] = people in room
+	 *
+	 * @var Array
+	 * @access private
+	 */
+	var $myChatRooms;
+		
+	//End of chat implementation
+	
+
+	/** 
+	 * Event Handler Functions
+	 *
+	 * @var Array
+	 * @access private
+	 */
+	var $myEventHandlers = array();
+	
+	/** 
+	 * Array of direct connection objects(including file transfers)
+	 *
+	 * @var Array
+	 * @access private
+	 */
+	var $myDirectConnections = array();
+	
+	/** 
+	 * Array of the actual connections
+	 *
+	 * @var Array
+	 * @access private
+	 */
+	var $myConnections = array();
+	
+	/**
+	 * The current state of logging
+	 * 
+	 * @var Boolean
+	 * @access private
+	 */
+	
+	var $myLogging = false;
+	
+    /** 
+	 * Constructor
+	 *
+	 * Permit/Deny Mode Options
+	 * 1 - Allow All
+	 * 2 - Deny All
+	 * 3 - Permit only those on your permit list
+	 * 4 - Permit all those not on your deny list
+	 *
+	 * @param String $sn AIM Screenname
+	 * @param String $password AIM Password
+	 * @param Integer $pdmode Permit/Deny Mode
+	 * @access public
+	 */
+	function Aim($sn, $password, $pdmode)
+    {
+        //Constructor assignment
+		$this->myScreenName = $this->normalize($sn);
+		$this->myPassword = $password;
+		$this->myRoastedPass = $this->roastPass($password);
+		$this->mySeqNum = 1;
+		$this->myConnection = 0;
+		$this->myWarnLevel = 0;
+		$this->myAuthCode = $this->makeCode();
+		$this->myPdMode = $pdmode;
+		$this->myFormatSN = $this->myScreenName;
+		
+		$this->log("PHPTOCLIB v" . PHPTOCLIB_VERSION . " Object Created");
+		
+	}
+
+	/** 
+	 * Enables debug logging (Logging is disabled by default)
+	 *
+	 * 
+	 * @access public
+	 * @return void
+	 */
+
+	function setLogging($enable)
+	{
+		$this->myLogging=$enable;
+	}
+
+	function log($data)
+	{
+	    if($this->myLogging){
+            error_log($data);
+        }
+	}
+	
+	 /** 
+	 * Logs a packet
+	 *
+	 * 
+	 * @access private
+	 * @param Array $packary Packet
+	 * @param String $in Prepend
+	 * @return void
+	 */
+	function logPacket($packary,$in)
+	{
+		if(!$this->myLogging || sizeof($packary)<=0 || (@strlen($packary['decoded'])<=0 && @isset($packary['decoded'])))
+		   return;
+		$towrite=$in . ":  ";
+		foreach($packary as $k=>$d)
+		{
+			$towrite.=$k . ":" . $d . "\r\n";
+		}
+		$towrite.="\r\n\r\n";
+		$this->log($towrite);
+	}
+	/** 
+	 * Roasts/Hashes Password
+	 *
+	 * @param String $password Password
+	 * @access private
+	 * @return String Roasted Password
+	 */
+	function roastPass($password)
+	{
+		$roaststring = 'Tic/Toc';
+		$roasted_password = '0x';
+		for ($i = 0; $i < strlen($password); $i++)
+			$roasted_password .= bin2hex($password[$i] ^ $roaststring[($i % 7)]);
+		return $roasted_password;
+	}
+	
+	/** 
+	 * Access Method for myScreenName
+	 *
+	 * @access public
+	 * @param $formated Returns formatted Screenname if true as returned by server
+	 * @return String Screenname
+	 */
+	function getMyScreenName($formated = false)
+	{
+		if ($formated)
+		{
+			return $this->myFormatSN;
+		}
+		else
+		{
+			return $this->normalize($this->myScreenName);
+		}
+	}
+	
+	/** 
+	 * Generated Authorization Code
+	 *
+	 * @access private
+	 * @return Integer Auth Code
+	 */
+	function makeCode()
+	{
+		$sn = ord($this->myScreenName[0]) - 96;
+		$pw = ord($this->myPassword[0]) - 96;
+		$a = $sn * 7696 + 738816;
+		$b = $sn * 746512;
+		$c = $pw * $a;
+
+		return $c - $a + $b + 71665152;
+	}
+
+
+	/** 
+	 * Reads from Socket
+	 *
+	 * @access private
+	 * @return String Data
+	 */
+	function sflapRead()
+	{
+		if ($this->socketcheck($this->myConnection))
+		{
+			$this->log("Disconnected.... Reconnecting in 60 seconds");
+			sleep(60);
+			$this->signon();
+		}
+		
+		$header = fread($this->myConnection,SFLAP_HEADER_LEN);
+		
+		if (strlen($header) == 0)
+		{
+			$this->myLastReceived = "";
+			return "";
+		}
+		$header_data = unpack("aast/Ctype/nseq/ndlen", $header);
+		$this->log(" . ", false);
+		$packet = fread($this->myConnection, $header_data['dlen']);
+		if (strlen($packet) <= 0 && $sockinfo['blocked'])
+			$this->derror("Could not read data");
+		
+		if ($header_data['type'] == SFLAP_TYPE_SIGNON)
+		{
+			$packet_data=unpack("Ndecoded", $packet);
+		}
+		
+		if ($header_data['type'] == SFLAP_TYPE_KEEPALIVE)
+		{
+			$this->myLastReceived = '';
+			return 0;
+		} 
+		else if (strlen($packet)>0)
+		{
+			$packet_data = unpack("a*decoded", $packet);
+		}
+		$this->log("socketcheck check now");
+		if ($this->socketcheck($this->myConnection))
+		{
+			$this->derror("Connection ended unexpectedly");
+		}
+		
+		$data = array_merge($header_data, $packet_data);
+		$this->myLastReceived = $data;
+		$this->logPacket($data,"in");
+		return $data;
+    }
+
+	/** 
+	 * Sends Data on Socket
+	 *
+	 * @param String $sflap_type Type
+	 * @param String $sflap_data Data
+	 * @param boolean $no_null No Null
+	 * @param boolean $formatted Format
+	 * @access private
+	 * @return String Roasted Password
+	 */
+	function sflapSend($sflap_type, $sflap_data, $no_null, $formatted)
+	{
+		$packet = "";
+		if (strlen($sflap_data) >= MAX_PACKLENGTH)
+			$sflap_data = substr($sflap_data,0,MAX_PACKLENGTH);
+			
+		if ($formatted)
+		{
+			$len = strlen($sflap_len);
+			$sflap_header = pack("aCnn",'*', $sflap_type, $this->mySeqNum, $len);
+			$packet = $sflap_header . $sflap_data;
+		} else {
+			if (!$no_null)
+			{
+				$sflap_data = str_replace("\0","", trim($sflap_data));
+				$sflap_data .= "\0";
+			}
+			$data = pack("a*", $sflap_data);
+			$len = strlen($sflap_data);
+			$header = pack("aCnn","*", $sflap_type, $this->mySeqNum, $len);
+			$packet = $header . $data;
+		}
+		
+		//Make sure we are still connected
+		if ($this->socketcheck($this->myConnection))
+		{
+			$this->log("Disconnected.... reconnecting in 60 seconds");
+			sleep(60);
+			$this->signon();
+		}
+		$sent = fputs($this->myConnection, $packet) or $this->derror("Error sending packet to AIM");
+		$this->mySeqNum++;
+		sleep(ceil($this->myWarnLevel/10));
+		$this->logPacket(array($sflap_type,$sflap_data),"out");
+	}
+
+	/** 
+	 * Escape the thing that TOC doesn't like,that would be
+	 * ",', $,{,},[,]
+	 *
+	 * @param String $data Data to Escape
+	 * @see decodeData
+	 * @access private
+	 * @return String $data Escaped Data
+	 */
+	function encodeData($data)
+	{
+		$data = str_replace('"','\"', $data);
+		$data = str_replace('$','\$', $data);
+		$data = str_replace("'","\'", $data);
+		$data = str_replace('{','\{', $data);
+		$data = str_replace('}','\}', $data);
+		$data = str_replace('[','\[', $data);
+		$data = str_replace(']','\]', $data);
+		return $data;
+	}
+	
+	/** 
+	 * Unescape data TOC has escaped
+	 * ",', $,{,},[,]
+	 *
+	 * @param String $data Data to Unescape
+	 * @see encodeData
+	 * @access private
+	 * @return String $data Unescape Data
+	 */
+	function decodeData($data)
+	{
+		$data = str_replace('\"','"', $data);
+		$data = str_replace('\$','$', $data);
+		$data = str_replace("\'","'", $data);
+		$data = str_replace('\{','{', $data);
+		$data = str_replace('\}','}', $data);
+		$data = str_replace('\[','[', $data);
+		$data = str_replace('\]',']', $data);
+		$data = str_replace('&quot;','"', $data);
+		$data = str_replace('&amp;','&', $data);
+		return $data;
+	}
+
+	/** 
+	 * Normalize ScreenName
+	 * no spaces and all lowercase
+	 *
+	 * @param String $nick ScreenName
+	 * @access public
+	 * @return String $nick Normalized ScreenName
+	 */
+	function normalize($nick)
+	{
+		$nick = str_replace(" ","", $nick);
+		$nick = strtolower($nick);
+		return $nick;
+	}
+
+	/** 
+	 * Sets internal info with update buddy
+	 * Currently only sets warning level
+	 * 
+	 * @access public
+	 * @return void
+	 */
+	function setMyInfo()
+	{
+		//Sets internal values bvase on the update buddy command
+		$this->log("Setting my warning level ...");
+		$this->sflapSend(SFLAP_TYPE_DATA,"toc_get_status " . $this->normalize($this->myScreenName),0,0);
+		//The rest of this will now be handled by the other functions. It is assumed
+		//that we may have other data queued in the socket, do we should just add this
+		//message to the queue instead of trying to set it in here
+	}
+
+	/** 
+	 * Connects to AIM and Signs On Using Info Provided in Constructor
+	 * 
+	 * @access public
+	 * @return void
+	 */
+	function signon()
+	{
+		$this->log("Ready to sign on to the server");
+		$this->myConnection = fsockopen($this->myServer, $this->myPort, $errno, $errstr,10) or die("$errorno:$errstr");
+		$this->log("Connected to server");
+		$this->mySeqNum = (time() % 65536); //Select an arbitrary starting point for
+										  //sequence numbers
+		if (!$this->myConnection)
+			$this->derror("Error connecting to toc.oscar.aol.com");
+		$this->log("Connected to AOL");
+		//Send the flapon packet
+		fputs($this->myConnection,"FLAPON\r\n\n\0"); //send the initial handshake
+		$this->log("Sent flapon");
+		$this->sflapRead();  //Make sure the server responds with what we expect
+		if (!$this->myLastReceived)
+			$this->derror("Error sending the initialization string");
+
+		//send the FLAP SIGNON packet back with what it needs
+		//There are 2 parts to the signon packet. They are sent in succession, there
+		//is no indication if either packet was correctly sent
+		$signon_packet = pack("Nnna".strlen($this->myScreenName),1,1,strlen($this->myScreenName), $this->myScreenName);
+		$this->sflapSend(SFLAP_TYPE_SIGNON, $signon_packet,1,0);
+		$this->log("sent signon packet part one");
+		
+		$signon_packet_part2 = 'toc2_signon login.oscar.aol.com 29999 ' . $this->myScreenName . ' ' . $this->myRoastedPass . ' english-US "TIC:TOC2:REVISION" 160 ' . $this->myAuthCode;
+		$this->log($signon_packet_part2 . "");
+		$this->sflapSend(SFLAP_TYPE_DATA, $signon_packet_part2,0,0);
+		$this->log("Sent signon packet part 2... Awaiting response...");
+
+		$this->sflapRead();
+		$this->log("Received Sign on packet, beginning initilization...");
+		$message = $this->getLastReceived();
+		$this->log($message . "\n");
+		if (strstr($message,"ERROR:"))
+		{
+			$this->onError($message);
+			die("Fatal signon error");
+		}
+		stream_set_timeout($this->myConnection,2);
+		//The information sent before the config2 command is utterly useless to us
+		//So we will just skim through them until we reach it
+		
+		//Add the first entry to the connection array
+		$this->myConnections[] = $this->myConnection;
+		
+		
+		//UPDATED 4/12/03: Now this will use the receive function and send the
+		//received messaged to the assigned handlers. This is where the signon 
+		//method has no more use
+		
+		$this->log("Done with signon proccess");
+		//socket_set_blocking($this->myConnection,false);
+	}
+	
+	/** 
+	 * Sends Instant Message
+	 *
+	 * @param String $to Message Recipient SN
+	 * @param String $message Message to Send
+	 * @param boolean $auto Sent as Auto Response / Away Message Style
+	 * @access public
+	 * @return void
+	 */
+	function sendIM($to, $message, $auto = false)
+	{
+		if ($auto) $auto = "auto";
+		else $auto = "";
+		$to = $this->normalize($to);
+		$message = $this->encodeData($message);
+		$command = 'toc2_send_im "' . $to . '" "' . $message . '" ' .  $auto;
+		$this->sflapSend(SFLAP_TYPE_DATA, trim($command),0,0);
+		$cleanedmessage = str_replace("<br>", "   ", $this->decodeData($message));
+		$cleanedmessage = strip_tags($cleanedmessage);
+		$this->log("TO - " . $to . " : " . $cleanedmessage);
+	}
+	
+	/** 
+	 * Set Away Message
+	 *
+	 * @param String $message Away message (some HTML supported).
+	 *   Use null to remove the away message
+	 * @access public
+	 * @return void
+	 */
+	function setAway($message)
+	{
+		$message = $this->encodeData($message);
+		$command = 'toc_set_away "' . $message . '"';
+		$this->sflapSend(SFLAP_TYPE_DATA, trim($command),0,0);
+		$this->log("SET AWAY MESSAGE - " . $this->decodeData($message));
+	}
+
+	/** 
+	 * Fills Buddy List
+	 * Not implemented fully yet
+	 *
+	 * @access public
+	 * @return void
+	 */
+	function setBuddyList()
+	{
+		//This better be the right message
+		$message = $this->myLastReceived['decoded'];
+		if (strpos($message,"CONFIG2:") === false)
+		{
+			$this->log("setBuddyList cannot be called at this time because I got $message");
+			return false;
+		}
+		$people = explode("\n",trim($message,"\n"));
+		//The first 3 elements of the array are who knows what, element 3 should be
+		//a letter followed by a person
+		for($i = 1; $i<sizeof($people); $i++)
+		{
+   			@list($mode, $name) = explode(":", $people[$i]);
+			switch($mode)
+			{
+				case 'p':
+					$this->myPermitList[] = $name;
+					break;
+				case 'd':
+					$this->myBlockedList[] = $name;
+					break;
+				case 'b':
+					$this->myBuddyList[] = $name;
+					break;
+				case 'done':
+	 				break;
+				default:
+					//
+			}
+		}
+	}
+	
+	/** 
+	 * Adds buddy to Permit list
+	 *
+	 * @param String $buddy Buddy's Screenname
+	 * @access public
+	 * @return void
+	 */
+	function addPermit($buddy)
+	{
+		$this->sflapSend(SFLAP_TYPE_DATA,"toc2_add_permit " . $this->normalize($buddy),0,0);
+		$this->myPermitList[] = $this->normalize($buddy);
+		return 1;
+	}
+	
+	/** 
+	 * Blocks buddy
+	 *
+	 * @param String $buddy Buddy's Screenname
+	 * @access public
+	 * @return void
+	 */
+	function blockBuddy($buddy)
+	{
+		$this->sflapSend(SFLAP_TYPE_DATA,"toc2_add_deny " . $this->normalize($buddy),0,0);
+		$this->myBlockedList[] = $this->normalize($buddy);
+		return 1;
+	}
+	
+	/** 
+	 * Returns last message received from server
+	 *
+	 * @access private
+	 * @return String Last Message from Server
+	 */
+	function getLastReceived()
+	{
+		if (@$instuff = $this->myLastReceived['decoded']){
+			return $this->myLastReceived['decoded'];
+		}else{
+			return;
+		}
+	}
+	
+	/** 
+	 * Returns Buddy List
+	 *
+	 * @access public
+	 * @return array Buddy List
+	 */
+	function getBuddies()
+	{
+		return $this->myBuddyList;
+	}
+	
+	/** 
+	 * Returns Permit List
+	 *
+	 * @access public
+	 * @return array Permit List
+	 */
+	function getPermit()
+	{
+		return $this->myPermitList;
+	}
+	
+	/** 
+	 * Returns Blocked Buddies
+	 *
+	 * @access public
+	 * @return array Blocked List
+	 */
+	function getBlocked()
+	{
+		return $this->myBlockedList;
+	}
+	
+	
+
+
+	/** 
+	 * Reads and returns data from server
+	 *
+	 * This is a wrapper for $Aim->sflap_read(), and only returns the $this->myLastReceived['data']
+	 * portion of the message. It is preferred that you do not call $Aim->sflap_read() and use this
+	 * function instead. This function has a return value. Calling this prevents the need to call
+	 * $Aim->getLastReceived()
+	 *
+	 * @access public
+	 * @return String Data recieved from server
+	 */
+	function read_from_aim()
+	{
+		$this->sflapRead();
+		$returnme = $this->getLastReceived();
+		return $returnme;
+	}
+	
+	/** 
+	 * Sets current internal warning level
+	 * 
+	 * This allows you to update the bots warning level when warned.
+	 *
+	 * @param int Warning Level %
+	 * @access private
+	 * @return void
+	 */
+	function setWarningLevel($warnlevel)
+	{
+		$this->myWarnLevel = $warnlevel;
+	}
+	
+	/** 
+	 * Warns / "Evils" a User
+	 *
+	 * To successfully warn another user they must have sent you a message.
+	 * There is a limit on how much and how often you can warn another user.
+	 * Normally when you warn another user they are aware who warned them,
+	 * however there is the option to warn anonymously.  When warning anon.
+	 * note that the warning is less severe.
+	 *
+	 * @param String $to Screenname to warn
+	 * @param boolean $anon Warn's anonymously if true. (default = false)
+	 * @access public
+	 * @return void
+	 */
+	function warnUser($to, $anon = false)
+	{
+		if (!$anon)
+			$anon = '"norm"';
+
+		else
+			$anon = '"anon"';
+		$this->sflapSend(SFLAP_TYPE_DATA,"toc_evil " . $this->normalize($to) . " $anon",0,0);
+	}
+	
+	/** 
+	 * Returns warning level of bot
+	 *
+	 * @access public
+	 * @return void
+	 */
+	function getWarningLevel()
+	{
+		return $this->myWarningLevel;
+	}
+	
+	/** 
+	 * Sets bot's profile/info
+	 *
+	 * Limited to 1024 bytes.
+	 *
+	 * @param String $profiledata Profile Data (Can contain limited html: br,hr,font,b,i,u etc)
+	 * @param boolean $poweredby If true, appends link to phpTOCLib project to profile
+	 * @access public
+	 * @return void
+	 */
+	function setProfile($profiledata, $poweredby = false)
+	{
+		if ($poweredby == false){
+			$this->myProfile = $profiledata;
+		}else{
+			$this->myProfile = $profiledata . "<font size=1 face=tahoma><br><br>Powered by phpTOCLib<br>http://sourceforge.net/projects/phptoclib</font>";
+		}
+		
+		$this->sflapSend(SFLAP_TYPE_DATA,"toc_set_info \"" . $this->encodeData($this->myProfile) . "\"",0,0);
+		$this->setMyInfo();
+		$this->log("Profile has been updated...");
+	}
+	
+	//6/29/04 by Jeremy:
+	//Added mthod to accept a rvous,decline it, and
+	//read from the rvous socket
+	
+	//Decline
+	
+	/** 
+	 * Declines a direct connection request (rvous)
+	 *
+	 * @param String $nick ScreenName request was from
+	 * @param String $cookie Request cookie (from server)
+	 * @param String $uuid UUID
+	 * 
+	 * @access public
+	 * @return void
+	 */
+	function declineRvous($nick, $cookie, $uuid)
+	{
+		$nick = $this->normalize($nick);
+		$this->sflapSend(SFLAP_TYPE_DATA,"toc_rvous_cancel $nick $cookie $uuid",0,0);
+	}
+	
+	/** 
+	 * Accepts a direct connection request (rvous)
+	 *
+	 * @param String $nick ScreenName request was from
+	 * @param String $cookie Request cookie (from server)
+	 * @param String $uuid UUID
+	 * @param String $vip IP of User DC with
+	 * @param int $port Port number to connect to
+	 * 
+	 * @access public
+	 * @return void
+	 */
+	function acceptRvous($nick, $cookie, $uuid, $vip, $port)
+	{
+		$this->sflapSend(SFLAP_TYPE_DATA,"toc_rvous_accept $nick $cookie $uuid",0,0);
+		
+		//Now open the connection to that user
+		if ($uuid == IMAGE_UID)
+		{	
+			$dcon = new Dconnect($vip, $port);
+		}
+		else if ($uuid == FILE_SEND_UID)
+		{
+			$dcon = new FileSendConnect($vip, $port);
+		}
+		if (!$dcon->connected)
+		{
+			$this->log("The connection failed");				
+			return false;
+		}
+		
+		//Place this dcon object inside the array
+		$this->myDirectConnections[] = $dcon;
+		//Place the socket in an array to
+		$this->myConnections[] = $dcon->sock;
+
+		
+		//Get rid of the first packet because its worthless
+		//and confusing
+		$dcon->readDIM();
+		//Assign the cookie
+		$dcon->cookie = $dcon->lastReceived['cookie'];
+		$dcon->connectedTo = $this->normalize($nick);
+		return $dcon;
+	}	
+	
+	/** 
+	 * Sends a Message over a Direct Connection
+	 *
+	 * Only works if a direct connection is already established with user
+	 *
+	 * @param String $to Message Recipient SN
+	 * @param String $message Message to Send
+	 * 
+	 * @access public
+	 * @return void
+	 */
+	function sendDim($to, $message)
+	{
+		//Find the connection
+		for($i = 0;$i<sizeof($this->myDirectConnections);$i++)
+		{
+			if ($this->normalize($to) == $this->myDirectConnections[$i]->connectedTo && $this->myDirectConnections[$i]->type == CONN_TYPE_DC)
+			{
+				$dcon = $this->myDirectConnections[$i];
+				break;
+			}
+		}
+		if (!$dcon)
+		{
+			$this->log("Could not find a direct connection to $to");
+			return false;
+		}
+		$dcon->sendMessage($message, $this->normalize($this->myScreenName));
+		return true;
+	}
+	
+	/** 
+	 * Closes an established Direct Connection
+	 *
+	 * @param DConnect $dcon Direct Connection Object to Close
+	 * 
+	 * @access public
+	 * @return void
+	 */
+	function closeDcon($dcon)
+	{
+		
+		$nary = array();
+		for($i = 0;$i<sizeof($this->myConnections);$i++)
+		{
+			if ($dcon->sock == $this->myConnections[$i])
+				unset($this->myConnections[$i]);
+		}
+		
+		$this->myConnections = array_values($this->myConnections);
+		unset($nary);
+		$nary2 = array();
+		
+		for($i = 0;$i<sizeof($this->myDirectConnections);$i++)
+		{
+			if ($dcon == $this->myDirectConnections[$i])
+				unset($this->myDirectConnections[$i]);
+		}
+		$this->myDirectConnections = array_values($this->myDirectConnections);
+		$dcon->close();
+		unset($dcon);
+	}
+	
+	//Added 4/29/04 by Jeremy:
+	//Various chat related methods
+	
+	/** 
+	 * Accepts a Chat Room Invitation (Joins room)
+	 *
+	 * @param String $chatid ID of Chat Room
+	 * 
+	 * @access public
+	 * @return void
+	 */
+	function joinChat($chatid)
+	{
+		$this->sflapSend(SFLAP_TYPE_DATA,"toc_chat_accept " . $chatid,0,0);
+	}
+	
+	/** 
+	 * Leaves a chat room
+	 *
+	 * @param String $chatid ID of Chat Room
+	 * 
+	 * @access public
+	 * @return void
+	 */
+	function leaveChat($chatid)
+	{
+		$this->sflapSend(SFLAP_TYPE_DATA,"toc_chat_leave " . $chatid,0,0);
+	}
+	
+	/** 
+	 * Sends a message in a chat room
+	 *
+	 * @param String $chatid ID of Chat Room
+	 * @param String $message Message to send
+	 * 
+	 * @access public
+	 * @return void
+	 */
+	function chatSay($chatid, $message)
+	{
+		$this->sflapSend(SFLAP_TYPE_DATA,"toc_chat_send " . $chatid . " \"" . $this->encodeData($message) . "\"",0,0);
+	}
+	
+	/** 
+	 * Invites a user to a chat room
+	 *
+	 * @param String $chatid ID of Chat Room
+	 * @param String $who Screenname of user
+	 * @param String $message Note to include with invitiation
+	 * 
+	 * @access public
+	 * @return void
+	 */
+	function chatInvite($chatid, $who, $message)
+	{
+		$who = $this->normalize($who);
+		$this->sflapSend(SFLAP_TYPE_DATA,"toc_chat_invite " . $chatid . " \"" . $this->encodeData($message) . "\" " . $who,0,0);
+	}
+	
+	/** 
+	 * Joins/Creates a new chat room
+	 *
+	 * @param String $name Name of the new chat room
+	 * @param String $exchange Exchange of new chat room
+	 * 
+	 * @access public
+	 * @return void
+	 */
+	function joinNewChat($name, $exchange)
+	{
+		//Creates a new chat
+		$this->sflapSend(SFLAP_TYPE_DATA,"toc_chat_join " . $exchange . " \"" . $name . "\"",0,0);
+	}
+	
+	/** 
+	 * Disconnect error handler, attempts to reconnect in 60 seconds
+	 *
+	 * @param String $message Error message (desc of where error encountered etc)
+	 * 
+	 * @access private
+	 * @return void
+	 */
+	function derror($message)
+	{
+		$this->log($message);
+		$this->log("Error");
+		fclose($this->myConnection);
+		if ((time() - $GLOBALS['errortime']) <  600){
+			$this->log("Reconnecting in 60 Seconds");
+			sleep(60);
+		}
+		$this->signon();
+		$GLOBALS['errortime'] = time();
+	}
+	
+	/** 
+	 * Returns connection type of socket (main or rvous etc)
+	 *
+	 * Helper method for recieve()
+	 *
+	 * @param Resource $sock Socket to determine type for
+	 * 
+	 * @access private
+	 * @return void
+	 * @see receive
+	 */
+	function connectionType($sock)
+	{
+		//Is it the main connection?
+		if ($sock == $this->myConnection)
+		   return CONN_TYPE_NORMAL;
+		else
+		{
+			for($i = 0;$i<sizeof($this->myDirectConnections);$i++)
+			{
+				if ($sock == $this->myDirectConnections[$i]->sock)
+				    return $this->myDirectConnections[$i]->type;
+			}
+		}
+		return false;
+	}
+	
+	/** 
+	 * Checks for new data and calls appropriate methods
+	 *
+	 * This method is usually called in an infinite loop to keep checking for new data
+	 * 
+	 * @access public
+	 * @return void
+	 * @see connectionType
+	 */ 
+	function receive()
+	{
+		//This function will be used to get the incoming data
+		//and it will be used to call the event handlers
+		
+		//First, get an array of sockets that have data that is ready to be read
+		$ready = array();
+		$ready = $this->myConnections;
+		$numrdy = stream_select($ready, $w = NULL, $x = NULL,NULL);
+		
+		//Now that we've waited for something, go through the $ready
+		//array and read appropriately
+		
+		for($i = 0;$i<sizeof($ready);$i++)
+		{
+			//Get the type
+			$type = $this->connectionType($ready[$i]);
+			if ($type == CONN_TYPE_NORMAL)
+			{
+				//Next step:Get the data sitting in the socket
+				$message = $this->read_from_aim();
+				if (strlen($message) <= 0)
+				{
+					return;
+				}
+				
+				//Third step: Get the command from the server
+				@list($cmd, $rest) = explode(":", $message);
+				
+				//Fourth step, take the command, test the type, and pass it off
+				//to the correct internal handler. The internal handler will
+				//do what needs to be done on the class internals to allow
+				//it to work, then proceed to pass it off to the user created handle
+				//if there is one
+				$this->log($cmd);
+				switch($cmd)
+				{
+					case 'SIGN_ON':
+						$this->onSignOn($message);
+						break;
+					case 'CONFIG2':
+						$this->onConfig($message);
+						break;
+					case 'ERROR':
+						$this->onError($message);
+						break;
+					case 'NICK':
+						$this->onNick($message);
+						break;
+					case 'IM_IN2':
+						$this->onImIn($message);
+						break;
+					case 'UPDATE_BUDDY2':
+						$this->onUpdateBuddy($message);
+						break;
+					case 'EVILED':
+						$this->onWarn($message);
+						break;
+					case 'CHAT_JOIN':
+						$this->onChatJoin($message);
+						break;
+					case 'CHAT_IN':
+						$this->onChatIn($message);
+						break;
+					case 'CHAT_UPDATE_BUDDY':
+						$this->onChatUpdate($message);
+						break;
+					case 'CHAT_INVITE':
+						$this->onChatInvite($message);
+						break;
+					case 'CHAT_LEFT':
+						$this->onChatLeft($message);
+						break;
+					case 'GOTO_URL':
+						$this->onGotoURL($message);
+						break;
+					case 'DIR_STATUS':
+						$this->onDirStatus($message);
+						break;
+					case 'ADMIN_NICK_STATUS':
+						$this->onAdminNick($message);
+						break;
+					case 'ADMIN_PASSWD_STATUS':
+						$this->onAdminPasswd($message);
+						break;
+					case 'PAUSE':
+						$this->onPause($message);
+						break;
+					case 'RVOUS_PROPOSE':
+						$this->onRvous($message);
+						break;
+					default:
+						$this->log("Fell through: $message");
+						$this->CatchAll($message);
+						break;
+				}
+			}
+			else
+			{
+				for($j = 0;$j<sizeof($this->myDirectConnections);$j++)
+				{
+					if ($this->myDirectConnections[$j]->sock == $ready[$i])
+					{
+						$dcon = $this->myDirectConnections[$j];
+						break;
+					}
+				}
+				//Now read from the dcon
+				if ($dcon->type == CONN_TYPE_DC)
+				{
+					if ($dcon->readDIM() == false)
+					{
+						$this->closeDcon($dcon);
+						continue;
+					}
+					
+					$message['message'] = $dcon->lastMessage;
+					if ($message['message'] == "too big")
+					{
+						$this->sendDim("Connection dropped because you sent a message larger that " . MAX_DCON_SIZE . " bytes.", $dcon->connectedTo);
+						$this->closeDcon($dcon);
+						continue;
+					}
+					$message['from'] = $dcon->connectedTo;
+					$this->onDimIn($message);
+				}
+			}
+		}
+        $this->conn->myLastReceived="";
+		//Now get out of this function because the handlers should take care
+		//of everything
+	}
+	
+	//The next block of code is all the event handlers needed by the class
+	//Some are left blank and only call the users handler because the class
+	//either does not support the command, or cannot do anything with it
+	// ---------------------------------------------------------------------
+
+	/** 
+	 * Direct IM In Event Handler
+	 *
+	 * Called when Direct IM is received.
+	 * Call's user handler (if available) for DimIn.
+	 * 
+	 * @access private
+	 * @param String $data Raw message from server
+	 * @return void
+	 */
+	function onDimIn($data)
+	{
+		$this->callHandler("DimIn", $data);
+	}
+	
+	/** 
+	 * Sign On Event Handler
+	 *
+	 * Called when Sign On event occurs.
+	 * Call's user handler (if available) for SIGN_ON.
+	 * 
+	 * @access private
+	 * @param String $data Raw message from server
+	 * @return void
+	 */
+	function onSignOn($data)
+	{
+		$this->callHandler("SignOn", $data);
+	}
+	
+	/** 
+	 * Config Event Handler
+	 *
+	 * Called when Config data received.
+	 * Call's user handler (if available) for Config.
+	 * 
+	 * Loads buddy list and other info
+	 * 
+	 * @access private
+	 * @param String $data Raw message from server
+	 * @return void
+	 */
+	function onConfig($data)
+	{
+		$this->log("onConfig Message: " . $data);
+		
+		if (strpos($data,"CONFIG2:") === false)
+		{
+			$this->log("get_buddy_list cannot be called at this time because I got $data");
+			//return false;
+		}
+		$people = explode("\n",trim($data,"\n"));
+		//The first 3 elements of the array are who knows what, element 3 should be
+		//a letter followed by a person
+		
+		//AIM decided to add this wonderful new feature, the recent buddy thing, this kind of
+		//messes this funtion up, so we need to adapt it... unfortuneately, its not really
+		//clear how this works, so we are just going to add their name to the permit list.
+		
+		//Recent buddies I believe are in the format
+		//number:name:number.... I think the first number counts down from 25 how long its
+		//been... but I don't know the second number,,,,
+		
+		//TODO: Figure out the new recent buddies system
+		
+		//Note: adding that at the bottom is a quick hack and may have adverse consequences...
+		for($i = 1;$i<sizeof($people);$i++)
+		{
+   			@list($mode, $name) = explode(":", $people[$i]);
+			switch($mode)
+			{
+				case 'p':
+					$this->myPermitList[] = $name;
+					break;
+				case 'd':
+					$this->myBlockedList[] = $name;
+					break;
+				case 'b':
+					$this->myBuddyList[] = $name;
+					break;
+				case 'done':
+	 				break;
+				default:
+					//This is assumed to be recent buddies...
+					$this->myPermitList[]=$name;
+			}
+		}
+		
+		//We only get the config message once, so now we should send our pd mode
+		
+		$this->sflapSend(SFLAP_TYPE_DATA,"toc2_set_pdmode " . $this->myPdMode,0,0);
+		//Adds yourself to the permit list
+		//This is to fix an odd behavior if you have nobody on your list
+		//the server won't send the config command... so this takes care of it
+		$this->sflapSend(SFLAP_TYPE_DATA,"toc2_add_permit " . $this->normalize($this->myScreenName),0,0); 
+		
+		//Now we allow the user to send a list, update anything they want, etc
+		$this->callHandler("Config", $data);
+		//Now that we have taken care of what the user wants, send the init_done message
+		$this->sflapSend(SFLAP_TYPE_DATA,"toc_init_done",0,0);
+		//'VOICE_UID' 
+		//'FILE_GET_UID'
+		//'IMAGE_UID'
+		//'BUDDY_ICON_UID'
+		//'STOCKS_UID'
+		//'GAMES_UID'
+		$this->sflapSend(SFLAP_TYPE_DATA, "toc_set_caps " . IMAGE_UID . " " .  FILE_SEND_UID ." " . FILE_GET_UID . " " . BUDDY_ICON_UID . "",0,0);
+	}
+	
+
+	/** 
+	 * Error Event Handler
+	 *
+	 * Called when an Error occurs.
+	 * Call's user handler (if available) for Error.
+	 * 
+	 * @access private
+	 * @param String $data Raw message from server
+	 * @return void
+	 */
+	function onError($data)
+	{
+	    static $errarg = '';
+		static $ERRORS = array(
+            0=>'Success',
+            901 =>'$errarg not currently available',
+            902 =>'Warning of $errarg not currently available',
+            903 =>'A message has been dropped, you are exceeding
+                  the server speed limit',
+            911 =>'Error validating input',
+            912 =>'Invalid account',
+            913 =>'Error encountered while processing request',
+            914 =>'Service unavailable',
+            950 =>'Chat in $errarg is unavailable.',
+            960 =>'You are sending message too fast to $errarg',
+            961 =>'You missed an im from $errarg because it was too big.',
+            962 =>'You missed an im from $errarg because it was sent too fast.',
+            970 =>'Failure',
+            971 =>'Too many matches',
+            972 =>'Need more qualifiers',
+            973 =>'Dir service temporarily unavailable',
+            974 =>'Email lookup restricted',
+            975 =>'Keyword Ignored',
+            976 =>'No Keywords',
+            977 =>'Language not supported',
+            978 =>'Country not supported',
+            979 =>'Failure unknown $errarg',
+            980 =>'Incorrect nickname or password.',
+            981 =>'The service is temporarily unavailable.',
+            982 =>'Your warning level is currently too high to sign on.',
+            983 =>'You have been connecting and
+               	   disconnecting too frequently.  Wait 10 minutes and try again.
+	               If you continue to try, you will need to wait even longer.',
+            989 =>'An unknown signon error has occurred $errarg'
+            );
+		$data_array = explode(":", $data);
+		for($i=0; $i<count($data_array); $i++)
+		{
+            switch($i)
+            {
+                case 0:
+                    $cmd = $data_array[$i];
+                    break;
+                case 1:
+                    $errornum = $data_array[$i];
+                    break;
+                case 2:
+                    $errargs = $data_array[$i];
+                    break;
+            }
+		}
+		eval("\$errorstring=\"\$ERRORS[" . $errornum . "]\";");
+		$string = "\$errorstring=\"\$ERRORS[$errornum]\";";
+		//This is important information! We need 
+		// a A different outputter for errors
+		// b Just to echo it
+		//I'm just going to do a straight echo here, becuse we assume that
+		//the user will NEED to see this error. An option to supress it will
+		//come later I think. Perhaps if we did an error reporting level, similar
+		//to PHP's, and we could probably even use PHP's error outputting system
+		//I think that may be an idea.... 
+		
+		$this->log($errorstring . "\n");
+		
+		$this->callHandler("Error", $data);
+	}
+	
+	/** 
+	 * Nick Event Handler
+	 *
+	 * Called when formatted own ScreenName is receieved
+	 * Call's user handler (if available) for Nick.
+	 * 
+	 * @access private
+	 * @param String $data Raw message from server
+	 * @return void
+	 */
+	function onNick($data)
+	{
+		//This is our nick, so set a field called "myFormatSN" which will represent
+		//the actual name given by the server to us, NOT the normalized screen name
+		@list($cmd, $nick) = explode(":", $data);
+		$this->myFormatSN = $nick;
+		
+		$this->callHandler("Nick", $data);
+	}
+	
+	/** 
+	 * IM In Event Handler
+	 *
+	 * Called when an Instant Message is received.
+	 * Call's user handler (if available) for IMIn.
+	 * 
+	 * @access private
+	 * @param String $data Raw message from server
+	 * @return void
+	 */
+	function onImIn($data)
+	{
+		//Perhaps we should add an internal log for debugging purposes??
+		//But now, this should probably be handled by the user purely
+		
+		$this->callHandler("IMIn", $data);
+	}
+	
+	/** 
+	 * UpdateBuddy Event Handler
+	 *
+	 * Called when a Buddy Update is receieved.
+	 * Call's user handler (if available) for UpdateBuddy.
+	 * If info is about self, updates self info (Currently ownly warning).
+	 *
+	 * ToDo: Keep track of idle, warning etc on Buddy List
+	 * 
+	 * @access private
+	 * @param String $data Raw message from server
+	 * @return void
+	 */
+	function onUpdateBuddy($data)
+	{
+		//Again, since our class currently does not deal with other people without
+		//outside help, then this is also probably best left to the user. Though
+		//we should probably allow this to replace the setMyInfo function above
+		//by handling the input if and only if it is us
+		//Check and see that this is the command expected
+		if (strpos($data,"UPDATE_BUDDY2:") == -1)
+		{
+			$this->log("A different message than expected was received");
+			return false;
+		}
+		
+		//@list($cmd, $info['sn'], $info['online'], $info['warnlevel'], $info['signon'], $info['idle'], $info['uc']) = explode(":", $command['incoming']);
+
+		//@list($cmd, $sn, $online, $warning, $starttime, $idletime, $uc) = explode(":", $data);
+		$info = $this->getMessageInfo($data);
+		if ($this->normalize($info['sn']) == $this->normalize($this->myScreenName))
+		{
+			$warning = rtrim($info['warnlevel'],"%");
+			$this->myWarnLevel = $warning;
+			$this->log("My warning level is $this->myWarnLevel %");
+		}
+		
+		$this->callHandler("UpdateBuddy", $data);
+	}
+	
+	/** 
+	 * Warning Event Handler
+	 *
+	 * Called when bot is warned.
+	 * Call's user handler (if available) for Warn.
+	 * Updates internal warning level
+	 * 
+	 * @access private
+	 * @param String $data Raw message from server
+	 * @return void
+	 */
+	function onWarn($data)
+	{
+		/*
+		For reference:
+			$command['incoming'] .= ":0";
+			$it = explode(":", $command['incoming']);
+			$info['warnlevel'] = $it[1];
+			$info['from'] = $it[2];		
+		*/
+		//SImply update our warning level
+		//@list($cmd, $newwarn, $user) = explode(":", $data);
+		
+		$info = $this->getMessageInfo($data);
+		
+		$this->setWarningLevel(trim($info['warnlevel'],"%"));
+		$this->log("My warning level is $this->myWarnLevel %");
+		
+		$this->callHandler("Warned", $data);
+	}
+	
+	/** 
+	 * Chat Join Handler
+	 *
+	 * Called when bot joins a chat room.
+	 * Call's user handler (if available) for ChatJoin.
+	 * Adds chat room to internal chat room list.
+	 * 
+	 * @access private
+	 * @param String $data Raw message from server
+	 * @return void
+	 */
+	function onChatJoin($data)
+	{
+		@list($cmd, $rmid, $rmname) = explode(":", $data);
+		$this->myChatRooms[$rmid] = 0;
+		
+		$this->callHandler("ChatJoin", $data);
+	}
+	
+	/** 
+	 * Returns number of chat rooms bot is in
+	 * 
+	 * @access public
+	 * @param String $data Raw message from server
+	 * @return int
+	 */
+	function getNumChats()
+	{
+		return count($this->myChatRooms);
+	}
+	
+	/** 
+	 * Chat Update Handler
+	 *
+	 * Called when bot received chat room data (user update).
+	 * Call's user handler (if available) for ChatUpdate.
+	 * 
+	 * @access private
+	 * @param String $data Raw message from server
+	 * @return void
+	 */
+	function onChatUpdate($data)
+	{
+		$stuff = explode(":", $data);
+		$people = sizeof($stuff);
+		$people -= 2;
+		
+		$this->callHandler("ChatUpdate", $data);
+	}
+	
+	/** 
+	 * Chat Message In Handler
+	 *
+	 * Called when chat room message is received.
+	 * Call's user handler (if available) for ChatIn.
+	 * 
+	 * @access private
+	 * @param String $data Raw message from server
+	 * @return void
+	 */
+	function onChatIn($data)
+	{
+		$this->callHandler("ChatIn", $data);
+	}
+	
+	
+	/** 
+	 * Chat Invite Handler
+	 *
+	 * Called when bot is invited to a chat room.
+	 * Call's user handler (if available) for ChatInvite.
+	 * 
+	 * @access private
+	 * @param String $data Raw message from server
+	 * @return void
+	 */
+	function onChatInvite($data)
+	{
+		//@list($cmd, $name, $id, $from, $data) = explode(":", $data,6);
+		//$data = explode(":",$data,6);
+		//$nm = array();
+		//@list($nm['cmd'],$nm['name'],$nm['id'],$nm['from'],$nm['message']) = $data;
+		
+		
+		$this->callHandler("ChatInvite", $data);
+	}
+	
+	/** 
+	 * Chat Left Handler
+	 *
+	 * Called when bot leaves a chat room
+	 * Call's user handler (if available) for ChatLeft.
+	 * 
+	 * @access private
+	 * @param String $data Raw message from server
+	 * @return void
+	 */
+	function onChatLeft($data)
+	{
+		$info = $this->getMessageInfo($data);
+		unset($this->myChatRooms[$info['chatid']]);
+		$this->callHandler("ChatLeft", $data);
+	}
+	
+	/** 
+	 * Goto URL Handler
+	 *
+	 * Called on GotoURL.
+	 * Call's user handler (if available) for GotoURL.
+	 * No detailed info available for this / Unsupported.
+	 * 
+	 * @access private
+	 * @param String $data Raw message from server
+	 * @return void
+	 */
+	function onGotoURL($data)
+	{
+		//This is of no use to the internal class
+		
+		$this->callHandler("GotoURL", $data);
+	}
+	
+	/** 
+	 * Dir Status Handler
+	 *
+	 * Called on DirStatus.
+	 * Call's user handler (if available) for DirStatus.
+	 * No detailed info available for this / Unsupported.
+	 * 
+	 * @access private
+	 * @param String $data Raw message from server
+	 * @return void
+	 */
+	function onDirStatus($data)
+	{
+		//This is not currently suported
+		
+		$this->callHandler("DirStatus", $data);
+	}
+	
+	/** 
+	 * AdminNick Handler
+	 *
+	 * Called on AdminNick.
+	 * Call's user handler (if available) for AdminNick.
+	 * No detailed info available for this / Unsupported.
+	 * 
+	 * @access private
+	 * @param String $data Raw message from server
+	 * @return void
+	 */
+	function onAdminNick($data)
+	{
+		//NOt particularly useful to us		
+		$this->callHandler("AdminNick", $data);
+	}
+	
+	/** 
+	 * AdminPasswd Handler
+	 *
+	 * Called on AdminPasswd.
+	 * Call's user handler (if available) for AdminPasswd.
+	 * No detailed info available for this / Unsupported.
+	 * 
+	 * @access private
+	 * @param String $data Raw message from server
+	 * @return void
+	 */
+	function onAdminPasswd($data)
+	{
+		//Also not particlualry useful to the internals
+		$this->callHandler("AdminPasswd", $data);
+	}
+	
+	/** 
+	 * Pause Handler
+	 *
+	 * Called on Pause.
+	 * Call's user handler (if available) for Pause.
+	 * No detailed info available for this / Unsupported.
+	 * 
+	 * @access private
+	 * @param String $data Raw message from server
+	 * @return void
+	 */
+	function onPause($data)
+	{
+		//This is pretty useless to us too...
+		
+		$this->callHandler("Pause", $data);
+	}
+	
+	/** 
+	 * Direct Connection Handler
+	 *
+	 * Called on Direct Connection Request(Rvous).
+	 * Call's user handler (if available) for Rvous.
+	 * 
+	 * @access private
+	 * @param String $data Raw message from server
+	 * @return void
+	 */
+	function onRvous($data)
+	{
+		$this->callHandler("Rvous", $data);
+	}
+	
+	/** 
+	 * CatchAll Handler
+	 *
+	 * Called for unrecognized commands.
+	 * Logs unsupported messages to array.
+	 * Call's user handler (if available) for CatchAll.
+	 * 
+	 * @access private
+	 * @param String $data Raw message from server
+	 * @return void
+	 */
+	function CatchAll($data)
+	{
+		//Add to a log of unsupported messages.
+		
+		$this->unsupported[] = $data;
+		//$this->log($data);
+		//print_r($data);
+		
+		$this->callHandler("CatchAll", $data);
+	}
+	
+	/** 
+	 * Calls User Handler
+	 *
+	 * Calls registered handler for a specific event.
+	 * 
+	 * @access private
+	 * @param String $event Command (event) name (Rvous etc)
+	 * @param String $data Raw message from server
+	 * @see registerHandler
+	 * @return void
+	 */
+	function callHandler($event, $data)
+	{
+		
+		if (isset($this->myEventHandlers[$event]))
+		{
+			//$function = $this->myEventHandlers[$event] . "(\$data);";
+			//eval($function);
+			call_user_func($this->myEventHandlers[$event], $data);
+		}
+		else
+		{
+			$this->noHandler($data);
+		}
+	}
+	
+	/** 
+	 * Registers a user handler
+	 * 
+	 * Handler List
+	 * SignOn, Config, ERROR, NICK, IMIn, UpdateBuddy, Eviled, Warned, ChatJoin
+	 * ChatIn, ChatUpdate, ChatInvite, ChatLeft, GotoURL, DirStatus, AdminNick
+	 * AdminPasswd, Pause, Rvous, DimIn, CatchAll
+	 *
+	 * @access private
+	 * @param String $event Event name
+	 * @param String $handler User function to call
+	 * @see callHandler
+	 * @return boolean Returns true if successful
+	 */
+	function registerHandler($event, $handler)
+	{
+		if (is_callable($handler))
+		{
+			$this->myEventHandlers[$event] = $handler;
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+    /** 
+     * No user handler method fall back.
+     *
+     * Does nothing with message.
+     *
+     * @access public
+     * @param String $message Raw server message
+     * @return void
+     */
+    function noHandler($message)
+    {
+	    //This function intentionally left blank
+	    //This is where the handlers will fall to for now. I plan on including a more
+	    //efficent check to avoid the apparent stack jumps that this code will produce
+	    //But for now, just fall into here, and be happy
+	    return;
+    }
+
+    //GLOBAL FUNCTIONS
+
+    /** 
+     * Finds type, and returns as part of array ['type']
+     * Puts message in ['incoming']
+     *
+     * Helper method for getMessageInfo.
+     *
+     * @access public
+     * @param String $message Raw server message
+     * @see msg_parse
+     * @see getMessageInfo
+     * @return array
+     */
+    static function msg_type($message)
+    {
+	    $command = array();
+	    @list($cmd, $rest) = explode(":", $message);
+	    switch($cmd)
+	    {
+		    case 'IM_IN2':
+			    $type = AIM_TYPE_MSG;
+		    break;
+		
+		    case 'UPDATE_BUDDY2':
+			    $type = AIM_TYPE_UPDATEBUDDY;
+		    break;
+		
+		    case 'EVILED':
+			    $type = AIM_TYPE_WARN;
+		    break;
+		
+		    case 'SIGN_ON':
+			    $type = AIM_TYPE_SIGNON;
+		    break;
+		
+		    case 'NICK':
+			    $type = AIM_TYPE_NICK;
+		    break;
+		
+		    case 'ERROR':
+			    $type = AIM_TYPE_ERROR;
+		    break;
+		
+		    case 'CHAT_JOIN':
+			    $type = AIM_TYPE_CHATJ;
+		    break;
+		
+		    case 'CHAT_IN':
+			    $type = AIM_TYPE_CHATI;
+		    break;
+		
+		    case 'CHAT_UPDATE_BUDDY':
+			    $type = AIM_TYPE_CHATUPDBUD;
+		    break;
+		
+		    case 'CHAT_INVITE':
+			    $type = AIM_TYPE_CHATINV;
+		    break;
+		
+		    case 'CHAT_LEFT':
+			    $type = AIM_TYPE_CHATLE;
+		    break;
+		
+		    case 'GOTO_URL':
+			    $type = AIM_TYPE_URL;
+		    break;
+		
+		    case 'ADMIN_NICK_STATUS':
+			    $type = AIM_TYPE_NICKSTAT;
+		    break;
+		
+		    case 'ADMIN_PASSWD_STATUS':
+			    $type = AIM_TYPE_PASSSTAT;
+		    break;
+		
+		    case 'RVOUS_PROPOSE':
+			    $type = AIM_TYPE_RVOUSP;
+		    break;
+		
+		    default:
+			    $type = AIM_TYPE_NOT_IMPLEMENTED;
+		    break;
+	    }
+	    $command['type'] = $type;
+	    $command['incoming'] = $message;
+	    return $command;
+    }
+
+    /** 
+     * Parses message and splits into info array
+     *
+     * Helper method for getMessageInfo.
+     *
+     * @access public
+     * @param String $command Message and type (after msg_type)
+     * @see msg_type
+     * @see getMessageInfo
+     * @return array
+     */
+    static function msg_parse($command)
+    {
+	    $info = array();
+	    switch($command['type'])
+	    {
+		    case AIM_TYPE_WARN:
+			    $command['incoming'] .= ":0";
+			    $it = explode(":", $command['incoming']);
+			    $info['warnlevel'] = $it[1];
+			    $info['from'] = $it[2];
+
+		    break;
+		
+		    case AIM_TYPE_MSG:
+			    $it = explode(":", $command['incoming'],5);
+			    $info['auto'] = $it[2];
+			    $info['from'] = $it[1];
+			    $info['message'] = $it[4];
+		    break;
+		
+		    case AIM_TYPE_UPDATEBUDDY:
+			    @list($cmd, $info['sn'], $info['online'], $info['warnlevel'], $info['signon'], $info['idle'], $info['uc']) = explode(":", $command['incoming']);
+		    break;
+		
+		    case AIM_TYPE_SIGNON:
+			    @list($cmd, $info['version']) = explode(":", $command['incoming']);		
+		    break;
+		
+		    case AIM_TYPE_NICK:
+			    @list($cmd, $info['nickname']) = explode(":", $command['incoming']);		
+		    break;
+		    case AIM_TYPE_ERROR:
+			    @list($cmd, $info['errorcode'], $info['args']) = explode(":", $command['incoming']);
+		    break;
+		
+		    case AIM_TYPE_CHATJ:
+			    @list($cmd, $info['chatid'], $info['chatname']) = explode(":", $command['incoming']);
+		    break;
+		
+		    case AIM_TYPE_CHATI:
+			    @list($cmd, $info['chatid'], $info['user'], $info['whisper'], $info['message']) = explode(":", $command['incoming'],5);
+		    break;
+		
+		    case AIM_TYPE_CHATUPDBUD:
+			    @list($cmd, $info['chatid'], $info['inside'], $info['userlist']) = explode(":", $command['incoming'],3);	
+		    break;
+		
+		    case AIM_TYPE_CHATINV:
+			    @list($cmd, $info['chatname'], $info['chatid'], $info['from'], $info['message']) = explode(":", $command['incoming'],5);
+		    break;
+		
+		    case AIM_TYPE_CHATLE:
+			    @list($cmd, $info['chatid']) = explode(":", $command['incoming']);		
+		    break;
+		
+		    case AIM_TYPE_URL:
+			    @list($cmd, $info['windowname'], $info['url']) = explode(":", $command['incoming'],3);
+		    break;
+		
+		    case AIM_TYPE_RVOUSP:
+			    @list($cmd,$info['user'],$info['uuid'],$info['cookie'],$info['seq'],$info['rip'],$info['pip'],$info['vip'],$info['port'],$info['tlvs']) = explode(":",$command['incoming'],10);
+		    break;
+		
+		    case AIM_TYPE_NICKSTAT:
+		    case AIM_TYPE_PASSSTAT:
+			    @list($cmd, $info['returncode'], $info['opt']) = explode(":", $command['incoming'],3);		
+		    break;
+		
+		    default:
+		    $info['command'] = $command['incoming'];
+	    }
+	    return $info;
+    }
+
+    /** 
+     * Returns a parsed message
+     *
+     * Calls msg_parse(msg_type( to first determine message type and then parse accordingly
+     *
+     * @access public
+     * @param String $command Raw server message
+     * @see msg_type
+     * @see msg_parse
+     * @return array
+     */
+    static function getMessageInfo($message)
+    {
+	    return self::msg_parse(self::msg_type($message));
+    }
+
+    /** 
+     * Checks socket for end of file
+     *
+     * @access public
+     * @param Resource $socket Socket to check
+     * @return boolean true if end of file (socket) 
+     */
+    static function socketcheck($socket){
+	    $info = stream_get_meta_data($socket);
+	    return $info['eof'];
+	    //return(feof($socket));
+    }
+}
+
+?>
diff --git a/plugins/Aim/extlib/phptoclib/dconnection.php b/plugins/Aim/extlib/phptoclib/dconnection.php
new file mode 100755
index 0000000000..c6be25ffb9
--- /dev/null
+++ b/plugins/Aim/extlib/phptoclib/dconnection.php
@@ -0,0 +1,229 @@
+<?php
+
+//The following class was created June 30th 2004 by Jeremy(pickle)
+//This class is designed to handle a direct connection
+
+class Dconnect
+{
+	var $sock;
+	var $lastReceived;
+	var $lastMessage;
+	var $connected;
+	var $cookie;
+	var $type=2;
+	var $connectedTo;
+	
+	
+	function Dconnect($ip,$port)
+	{
+		if(!$this->connect($ip,$port))
+		{
+			sEcho("Connection failed constructor");
+			$this->connected=false;
+		}
+		else
+			$this->connected=true;
+		
+		$this->lastMessage="";
+		$this->lastReceived="";
+	}
+	
+	function readDIM()
+	{
+		/*
+			if(!$this->stuffToRead())
+			{
+				sEcho("Nothing to read");
+				$this->lastMessage=$this->lastReceived="";
+				return false;
+			}
+		*/
+		$head=fread($this->sock,6);
+		if(strlen($head)<=0)
+		{
+			sEcho("The direct connection has been closed");
+			return false;
+		}
+		$minihead=unpack("a4ver/nsize",$head);
+		if($minihead['size'] <=0)
+		  return;
+		$headerinfo=unpack("nchan/nsix/nzero/a6cookie/Npt1/Npt2/npt3/Nlen/Npt/npt0/ntype/Nzerom/a*sn",fread($this->sock,($minihead['size']-6)));
+		$allheader=array_merge($minihead,$headerinfo);
+		sEcho($allheader);
+		if($allheader['len']>0 && $allheader['len'] <= MAX_DIM_SIZE)
+		{
+			$left=$allheader['len'];
+			$stuff="";
+			$nonin=0;
+			while(strlen($stuff) < $allheader['len'] && $nonin<3)
+			{
+				$stuffg=fread($this->sock,$left);
+				if(strlen($stuffg)<0)
+				{
+					$nonin++;
+					continue;
+				}
+				$left=$left - strlen($stuffg);
+				$stuff.=$stuffg;
+			}
+			$data=unpack("a*decoded",$stuff);
+		}
+		
+		else if($allheader['len'] > MAX_DIM_SIZE)
+		{
+			$data['decoded']="too big";
+		}
+		
+		else
+			$data['decoded']="";
+		$all=array_merge($allheader,$data);
+		
+		$this->lastReceived=$all;
+		$this->lastMessage=$all['decoded'];
+		
+		//$function=$this->DimInf . "(\$all);";
+		//eval($function);
+		
+		return $all;
+	}
+	
+	function sendMessage($message,$sn)
+	{
+		//Make the "mini header"
+		$minihead=pack("a4n","ODC2",76);
+		$header=pack("nnna6NNnNNnnNa*",1,6,0,$this->cookie,0,0,0,strlen($message),0,0,96,0,$sn);
+		$bighead=$minihead . $header;
+		while(strlen($bighead)<76)
+			$bighead.=pack("c",0);
+		
+		$tosend=$bighead . pack("a*",$message);
+		$w=array($this->sock);
+		stream_select($r=NULL,$w,$e=NULL,NULL);
+		//Now send it all
+		fputs($this->sock,$tosend,strlen($tosend));
+	}
+	function stuffToRead()
+	{
+		//$info=stream_get_meta_data($this->sock);
+		//sEcho($info);
+		$s=array($this->sock);
+		$changed=stream_select($s,$fds=NULL,$m=NULL,0,20000);
+		return ($changed>0);
+	}
+	
+	function close()
+	{
+		$this->connected=false;
+		return fclose($this->sock);
+	}
+	
+	function connect($ip,$port)
+	{
+		$this->sock=fsockopen($ip,$port,$en,$es,3);
+		if(!$this->sock)
+		{  sEcho("Connection failed");
+			$this->sock=null;
+			return false;
+		}
+		return true;
+	}
+}
+
+
+class FileSendConnect
+{
+	var $sock;
+	var $lastReceived;
+	var $lastMessage;
+	var $connected;
+	var $cookie;
+	var $tpye=3;
+	
+	
+	function FileSendConnect($ip,$port)
+	{
+		if(!$this->connect($ip,$port))
+		{
+			sEcho("Connection failed constructor");
+			$this->connected=false;
+		}
+		else
+			$this->connected=true;
+		
+		$this->lastMessage="";
+		$this->lastReceived="";
+	}
+	
+	function readDIM()
+	{
+		
+			if(!$this->stuffToRead())
+			{
+				sEcho("Nothing to read");
+				$this->lastMessage=$this->lastReceived="";
+				return;
+			}
+		
+		$minihead=unpack("a4ver/nsize",fread($this->sock,6));
+		if($minihead['size'] <=0)
+		  return;
+		$headerinfo=unpack("nchan/nsix/nzero/a6cookie/Npt1/Npt2/npt3/Nlen/Npt/npt0/ntype/Nzerom/a*sn",fread($this->sock,($minihead['size']-6)));
+		$allheader=array_merge($minihead,$headerinfo);
+		sEcho($allheader);
+		if($allheader['len']>0)
+			$data=unpack("a*decoded",fread($this->sock,$allheader['len']));
+		else
+			$data['decoded']="";
+		$all=array_merge($allheader,$data);
+		
+		$this->lastReceived=$all;
+		$this->lastMessage=$all['decoded'];
+		
+		//$function=$this->DimInf . "(\$all);";
+		//eval($function);
+		
+		return $all;
+	}
+	
+	function sendMessage($message,$sn)
+	{
+		//Make the "mini header"
+		$minihead=pack("a4n","ODC2",76);
+		$header=pack("nnna6NNnNNnnNa*",1,6,0,$this->cookie,0,0,0,strlen($message),0,0,96,0,$sn);
+		$bighead=$minihead . $header;
+		while(strlen($bighead)<76)
+			$bighead.=pack("c",0);
+		
+		$tosend=$bighead . pack("a*",$message);
+		
+		//Now send it all
+		fwrite($this->sock,$tosend,strlen($tosend));
+	}
+	function stuffToRead()
+	{
+		//$info=stream_get_meta_data($this->sock);
+		//sEcho($info);
+		$s=array($this->sock);
+		$changed=stream_select($s,$fds=NULL,$m=NULL,1);
+		return ($changed>0);
+	}
+	
+	function close()
+	{
+		$this->connected=false;
+		fclose($this->sock);
+		unset($this->sock);
+		return true;
+	}
+	
+	function connect($ip,$port)
+	{
+		$this->sock=fsockopen($ip,$port,$en,$es,3);
+		if(!$this->sock)
+		{  sEcho("Connection failed to" . $ip . ":" . $port);
+			$this->sock=null;
+			return false;
+		}
+		return true;
+	}
+}
diff --git a/plugins/Imap/imapmanager.php b/plugins/Imap/imapmanager.php
index e4fda58099..4c0edeaa1d 100644
--- a/plugins/Imap/imapmanager.php
+++ b/plugins/Imap/imapmanager.php
@@ -57,12 +57,14 @@ class ImapManager extends IoManager
     }
 
     /**
-     * Tell the i/o master we need one instance for each supporting site
-     * being handled in this process.
+     * Tell the i/o master we need one instance globally.
+     * Since this is a plugin manager, the plugin class itself will
+     * create one instance per site. This prevents the IoMaster from
+     * making more instances.
      */
     public static function multiSite()
     {
-        return IoManager::INSTANCE_PER_SITE;
+        return IoManager::GLOBAL_SINGLE_ONLY;
     }
 
     /**
diff --git a/lib/queued_xmpp.php b/plugins/Xmpp/Fake_XMPP.php
similarity index 68%
rename from lib/queued_xmpp.php
rename to plugins/Xmpp/Fake_XMPP.php
index 4b890c4ca4..a0f329ca08 100644
--- a/lib/queued_xmpp.php
+++ b/plugins/Xmpp/Fake_XMPP.php
@@ -2,7 +2,7 @@
 /**
  * StatusNet, the distributed open-source microblogging tool
  *
- * Queue-mediated proxy class for outgoing XMPP messages.
+ * Instead of sending XMPP messages, retrieve the raw XML that would be sent
  *
  * PHP version 5
  *
@@ -31,10 +31,10 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/jabber.php';
-
-class Queued_XMPP extends XMPPHP_XMPP
+class Fake_XMPP extends XMPPHP_XMPP
 {
+    public $would_be_sent = null;
+
 	/**
 	 * Constructor
 	 *
@@ -63,54 +63,41 @@ class Queued_XMPP extends XMPPHP_XMPP
      */
     public function send($msg, $timeout=NULL)
     {
-        $qm = QueueManager::get();
-        $qm->enqueue(strval($msg), 'xmppout');
-    }
-
-    /**
-     * Since we'll be getting input through a queue system's run loop,
-     * we'll process one standalone message at a time rather than our
-     * own XMPP message pump.
-     *
-     * @param string $message
-     */
-    public function processMessage($message) {
-       $frame = array_shift($this->frames);
-       xml_parse($this->parser, $frame->body, false);
+        $this->would_be_sent = $msg;
     }
 
     //@{
     /**
-     * Stream i/o functions disabled; push input through processMessage()
+     * Stream i/o functions disabled; only do output
      */
     public function connect($timeout = 30, $persistent = false, $sendinit = true)
     {
-        throw new Exception("Can't connect to server from XMPP queue proxy.");
+        throw new Exception("Can't connect to server from fake XMPP.");
     }
 
     public function disconnect()
     {
-        throw new Exception("Can't connect to server from XMPP queue proxy.");
+        throw new Exception("Can't connect to server from fake XMPP.");
     }
 
     public function process()
     {
-        throw new Exception("Can't read stream from XMPP queue proxy.");
+        throw new Exception("Can't read stream from fake XMPP.");
     }
 
     public function processUntil($event, $timeout=-1)
     {
-        throw new Exception("Can't read stream from XMPP queue proxy.");
+        throw new Exception("Can't read stream from fake XMPP.");
     }
 
     public function read()
     {
-        throw new Exception("Can't read stream from XMPP queue proxy.");
+        throw new Exception("Can't read stream from fake XMPP.");
     }
 
     public function readyToProcess()
     {
-        throw new Exception("Can't read stream from XMPP queue proxy.");
+        throw new Exception("Can't read stream from fake XMPP.");
     }
     //@}
 }
diff --git a/plugins/Xmpp/README b/plugins/Xmpp/README
new file mode 100644
index 0000000000..9bd71e9807
--- /dev/null
+++ b/plugins/Xmpp/README
@@ -0,0 +1,35 @@
+The XMPP plugin allows users to send and receive notices over the XMPP/Jabber/GTalk network.
+
+Installation
+============
+add "addPlugin('xmpp',
+    array('setting'=>'value', 'setting2'=>'value2', ...);"
+to the bottom of your config.php
+
+The daemon included with this plugin must be running. It will be started by
+the plugin along with their other daemons when you run scripts/startdaemons.sh.
+See the StatusNet README for more about queuing and daemons.
+
+Settings
+========
+user*: user part of the jid
+server*: server part of the jid
+resource: resource part of the jid
+port (5222): port on which to connect to the server
+encryption (true): use encryption on the connection
+host (same as server): host to connect to. Usually, you won't set this.
+debug (false): log extra debug info
+public: list of jid's that should get the public feed (firehose)
+
+* required
+default values are in (parenthesis)
+
+Example
+=======
+addPlugin('xmpp', array(
+    'user=>'update',
+    'server=>'identi.ca',
+    'password'=>'...',
+    'public'=>array('bob@aol.com', 'sue@google.com')
+));
+
diff --git a/plugins/Xmpp/Sharing_XMPP.php b/plugins/Xmpp/Sharing_XMPP.php
new file mode 100644
index 0000000000..4b69125da3
--- /dev/null
+++ b/plugins/Xmpp/Sharing_XMPP.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2009, StatusNet, Inc.
+ *
+ * Send and receive notices using the Jabber network
+ *
+ * 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  Jabber
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2009 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);
+}
+
+class Sharing_XMPP extends XMPPHP_XMPP
+{
+    function getSocket()
+    {
+        return $this->socket;
+    }
+}
diff --git a/plugins/Xmpp/XmppPlugin.php b/plugins/Xmpp/XmppPlugin.php
new file mode 100644
index 0000000000..b9551b8526
--- /dev/null
+++ b/plugins/Xmpp/XmppPlugin.php
@@ -0,0 +1,247 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2009, StatusNet, Inc.
+ *
+ * Send and receive notices using the XMPP network
+ *
+ * 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  IM
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2009 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);
+}
+
+/**
+ * Plugin for XMPP
+ *
+ * @category  Plugin
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2009 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+
+class XmppPlugin extends ImPlugin
+{
+    public $server = null;
+    public $port = 5222;
+    public $user =  'update';
+    public $resource = null;
+    public $encryption = true;
+    public $password = null;
+    public $host = null;  // only set if != server
+    public $debug = false; // print extra debug info
+
+    public $transport = 'xmpp';
+
+    protected $fake_xmpp;
+
+    function getDisplayName(){
+        return _m('XMPP/Jabber/GTalk');
+    }
+
+    function normalize($screenname)
+    {
+        if (preg_match("/(?:([^\@]+)\@)?([^\/]+)(?:\/(.*))?$/", $screenname, $matches)) {
+            $node   = $matches[1];
+            $server = $matches[2];
+            return strtolower($node.'@'.$server);
+        } else {
+            return null;
+        }
+    }
+
+    function daemon_screenname()
+    {
+        $ret = $this->user . '@' . $this->server;
+        if($this->resource)
+        {
+            return $ret . '/' . $this->resource;
+        }else{
+            return $ret;
+        }
+    }
+
+    function validate($screenname)
+    {
+        // Cheap but effective
+        return Validate::email($screenname);
+    }
+
+    /**
+     * Load related modules when needed
+     *
+     * @param string $cls Name of the class to be loaded
+     *
+     * @return boolean hook value; true means continue processing, false means stop.
+     */
+
+    function onAutoload($cls)
+    {
+        $dir = dirname(__FILE__);
+
+        switch ($cls)
+        {
+        case 'Sharing_XMPP':
+        case 'Fake_XMPP':
+            include_once $dir . '/'.$cls.'.php';
+            return false;
+        case 'XmppManager':
+            include_once $dir . '/'.strtolower($cls).'.php';
+            return false;
+        default:
+            return true;
+        }
+    }
+
+    function onStartImDaemonIoManagers(&$classes)
+    {
+        parent::onStartImDaemonIoManagers(&$classes);
+        $classes[] = new XmppManager($this); // handles pings/reconnects
+        return true;
+    }
+
+    function microiduri($screenname)
+    {
+        return 'xmpp:' . $screenname;    
+    }
+
+    function send_message($screenname, $body)
+    {
+        $this->fake_xmpp->message($screenname, $body, 'chat');
+        $this->enqueue_outgoing_raw($this->fake_xmpp->would_be_sent);
+        return true;
+    }
+
+    function send_notice($screenname, $notice)
+    {
+        $msg   = $this->format_notice($notice);
+        $entry = $this->format_entry($notice);
+        
+        $this->fake_xmpp->message($screenname, $msg, 'chat', null, $entry);
+        $this->enqueue_outgoing_raw($this->fake_xmpp->would_be_sent);
+        return true;
+    }
+
+    /**
+     * extra information for XMPP messages, as defined by Twitter
+     *
+     * @param Profile $profile Profile of the sending user
+     * @param Notice  $notice  Notice being sent
+     *
+     * @return string Extra information (Atom, HTML, addresses) in string format
+     */
+
+    function format_entry($notice)
+    {
+        $profile = $notice->getProfile();
+
+        $entry = $notice->asAtomEntry(true, true);
+
+        $xs = new XMLStringer();
+        $xs->elementStart('html', array('xmlns' => 'http://jabber.org/protocol/xhtml-im'));
+        $xs->elementStart('body', array('xmlns' => 'http://www.w3.org/1999/xhtml'));
+        $xs->element('a', array('href' => $profile->profileurl),
+                     $profile->nickname);
+        $xs->text(": ");
+        if (!empty($notice->rendered)) {
+            $xs->raw($notice->rendered);
+        } else {
+            $xs->raw(common_render_content($notice->content, $notice));
+        }
+        $xs->text(" ");
+        $xs->element('a', array(
+            'href'=>common_local_url('conversation',
+                array('id' => $notice->conversation)).'#notice-'.$notice->id
+             ),sprintf(_('[%s]'),$notice->id));
+        $xs->elementEnd('body');
+        $xs->elementEnd('html');
+
+        $html = $xs->getString();
+
+        return $html . ' ' . $entry;
+    }
+
+    function receive_raw_message($pl)
+    {
+        $from = $this->normalize($pl['from']);
+
+        if ($pl['type'] != 'chat') {
+            common_log(LOG_WARNING, "Ignoring message of type ".$pl['type']." from $from.");
+            return true;
+        }
+
+        if (mb_strlen($pl['body']) == 0) {
+            common_log(LOG_WARNING, "Ignoring message with empty body from $from.");
+            return true;
+        }
+
+        return $this->handle_incoming($from, $pl['body']);
+    }
+
+    function initialize(){
+        if(!isset($this->server)){
+            throw new Exception("must specify a server");
+        }
+        if(!isset($this->port)){
+            throw new Exception("must specify a port");
+        }
+        if(!isset($this->user)){
+            throw new Exception("must specify a user");
+        }
+        if(!isset($this->password)){
+            throw new Exception("must specify a password");
+        }
+
+        $this->fake_xmpp = new Fake_XMPP($this->host ?
+                                    $this->host :
+                                    $this->server,
+                                    $this->port,
+                                    $this->user,
+                                    $this->password,
+                                    $this->resource,
+                                    $this->server,
+                                    $this->debug ?
+                                    true : false,
+                                    $this->debug ?
+                                    XMPPHP_Log::LEVEL_VERBOSE :  null
+                                    );
+        return true;
+    }
+
+    function onPluginVersion(&$versions)
+    {
+        $versions[] = array('name' => 'XMPP',
+                            'version' => STATUSNET_VERSION,
+                            'author' => 'Craig Andrews, Evan Prodromou',
+                            'homepage' => 'http://status.net/wiki/Plugin:XMPP',
+                            'rawdescription' =>
+                            _m('The XMPP plugin allows users to send and receive notices over the XMPP/Jabber network.'));
+        return true;
+    }
+}
+
diff --git a/plugins/Xmpp/xmppmanager.php b/plugins/Xmpp/xmppmanager.php
new file mode 100644
index 0000000000..87d8186684
--- /dev/null
+++ b/plugins/Xmpp/xmppmanager.php
@@ -0,0 +1,279 @@
+<?php
+/*
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2008, 2009, StatusNet, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
+
+/**
+ * XMPP background connection manager for XMPP-using queue handlers,
+ * allowing them to send outgoing messages on the right connection.
+ *
+ * Input is handled during socket select loop, keepalive pings during idle.
+ * Any incoming messages will be handled.
+ *
+ * In a multi-site queuedaemon.php run, one connection will be instantiated
+ * for each site being handled by the current process that has XMPP enabled.
+ */
+
+class XmppManager extends ImManager
+{
+    protected $lastping = null;
+    protected $pingid = null;
+
+    public $conn = null;
+    
+    const PING_INTERVAL = 120;
+    
+
+    /**
+     * Initialize connection to server.
+     * @return boolean true on success
+     */
+    public function start($master)
+    {
+        if(parent::start($master))
+        {
+            $this->connect();
+            return true;
+        }else{
+            return false;
+        }
+    }
+
+    function send_raw_message($data)
+    {
+        $this->connect();
+        if (!$this->conn || $this->conn->isDisconnected()) {
+            return false;
+        }
+        $this->conn->send($data);
+        return true;
+    }
+
+    /**
+     * Message pump is triggered on socket input, so we only need an idle()
+     * call often enough to trigger our outgoing pings.
+     */
+    function timeout()
+    {
+        return self::PING_INTERVAL;
+    }
+
+    /**
+     * Process XMPP events that have come in over the wire.
+     * @fixme may kill process on XMPP error
+     * @param resource $socket
+     */
+    public function handleInput($socket)
+    {
+        # Process the queue for as long as needed
+        try {
+            common_log(LOG_DEBUG, "Servicing the XMPP queue.");
+            $this->stats('xmpp_process');
+            $this->conn->processTime(0);
+        } catch (XMPPHP_Exception $e) {
+            common_log(LOG_ERR, "Got an XMPPHP_Exception: " . $e->getMessage());
+            die($e->getMessage());
+        }
+    }
+
+    /**
+     * Lists the IM connection socket to allow i/o master to wake
+     * when input comes in here as well as from the queue source.
+     *
+     * @return array of resources
+     */
+    public function getSockets()
+    {
+        $this->connect();
+        if($this->conn){
+            return array($this->conn->getSocket());
+        }else{
+            return array();
+        }
+    }
+
+    /**
+     * Idle processing for io manager's execution loop.
+     * Send keepalive pings to server.
+     *
+     * Side effect: kills process on exception from XMPP library.
+     *
+     * @fixme non-dying error handling
+     */
+    public function idle($timeout=0)
+    {
+        $now = time();
+        if (empty($this->lastping) || $now - $this->lastping > self::PING_INTERVAL) {
+            try {
+                $this->send_ping();
+            } catch (XMPPHP_Exception $e) {
+                common_log(LOG_ERR, "Got an XMPPHP_Exception: " . $e->getMessage());
+                die($e->getMessage());
+            }
+        }
+    }
+
+    function connect()
+    {
+        if (!$this->conn || $this->conn->isDisconnected()) {
+            $resource = 'queue' . posix_getpid();
+            $this->conn = new Sharing_XMPP($this->plugin->host ?
+                                    $this->plugin->host :
+                                    $this->plugin->server,
+                                    $this->plugin->port,
+                                    $this->plugin->user,
+                                    $this->plugin->password,
+                                    $this->plugin->resource,
+                                    $this->plugin->server,
+                                    $this->plugin->debug ?
+                                    true : false,
+                                    $this->plugin->debug ?
+                                    XMPPHP_Log::LEVEL_VERBOSE :  null
+                                    );
+
+            if (!$this->conn) {
+                return false;
+            }
+            $this->conn->addEventHandler('message', 'handle_xmpp_message', $this);
+            $this->conn->addEventHandler('reconnect', 'handle_xmpp_reconnect', $this);
+            $this->conn->setReconnectTimeout(600);
+
+            $this->conn->autoSubscribe();
+            $this->conn->useEncryption($this->plugin->encryption);
+
+            try {
+                $this->conn->connect(true); // true = persistent connection
+            } catch (XMPPHP_Exception $e) {
+                common_log(LOG_ERR, $e->getMessage());
+                return false;
+            }
+
+            $this->conn->processUntil('session_start');
+            $this->send_presence(_m('Send me a message to post a notice'), 'available', null, 'available', 100);
+        }
+        return $this->conn;
+    }
+
+    function send_ping()
+    {
+        $this->connect();
+        if (!$this->conn || $this->conn->isDisconnected()) {
+            return false;
+        }
+        $now = time();
+        if (!isset($this->pingid)) {
+            $this->pingid = 0;
+        } else {
+            $this->pingid++;
+        }
+
+        common_log(LOG_DEBUG, "Sending ping #{$this->pingid}");
+		$this->conn->send("<iq from='{" . $this->plugin->daemon_screenname() . "}' to='{$this->plugin->server}' id='ping_{$this->pingid}' type='get'><ping xmlns='urn:xmpp:ping'/></iq>");
+        $this->lastping = $now;
+        return true;
+    }
+
+    function handle_xmpp_message(&$pl)
+    {
+        $this->plugin->enqueue_incoming_raw($pl);
+        return true;
+    }
+
+    /**
+     * Callback for Jabber reconnect event
+     * @param $pl
+     */
+    function handle_xmpp_reconnect(&$pl)
+    {
+        common_log(LOG_NOTICE, 'XMPP reconnected');
+
+        $this->conn->processUntil('session_start');
+        $this->send_presence(_m('Send me a message to post a notice'), 'available', null, 'available', 100);
+    }
+
+    /**
+     * sends a presence stanza on the XMPP network
+     *
+     * @param string $status   current status, free-form string
+     * @param string $show     structured status value
+     * @param string $to       recipient of presence, null for general
+     * @param string $type     type of status message, related to $show
+     * @param int    $priority priority of the presence
+     *
+     * @return boolean success value
+     */
+
+    function send_presence($status, $show='available', $to=null,
+                                  $type = 'available', $priority=null)
+    {
+        $this->connect();
+        if (!$this->conn || $this->conn->isDisconnected()) {
+            return false;
+        }
+        $this->conn->presence($status, $show, $to, $type, $priority);
+        return true;
+    }
+
+    /**
+     * sends a "special" presence stanza on the XMPP network
+     *
+     * @param string $type   Type of presence
+     * @param string $to     JID to send presence to
+     * @param string $show   show value for presence
+     * @param string $status status value for presence
+     *
+     * @return boolean success flag
+     *
+     * @see send_presence()
+     */
+
+    function special_presence($type, $to=null, $show=null, $status=null)
+    {
+        // FIXME: why use this instead of send_presence()?
+        $this->connect();
+        if (!$this->conn || $this->conn->isDisconnected()) {
+            return false;
+        }
+
+        $to     = htmlspecialchars($to);
+        $status = htmlspecialchars($status);
+
+        $out = "<presence";
+        if ($to) {
+            $out .= " to='$to'";
+        }
+        if ($type) {
+            $out .= " type='$type'";
+        }
+        if ($show == 'available' and !$status) {
+            $out .= "/>";
+        } else {
+            $out .= ">";
+            if ($show && ($show != 'available')) {
+                $out .= "<show>$show</show>";
+            }
+            if ($status) {
+                $out .= "<status>$status</status>";
+            }
+            $out .= "</presence>";
+        }
+        $this->conn->send($out);
+        return true;
+    }
+}
diff --git a/scripts/getvaliddaemons.php b/scripts/getvaliddaemons.php
index a332e06b58..80c21bce58 100755
--- a/scripts/getvaliddaemons.php
+++ b/scripts/getvaliddaemons.php
@@ -39,9 +39,7 @@ $daemons = array();
 
 $daemons[] = INSTALLDIR.'/scripts/queuedaemon.php';
 
-if(common_config('xmpp','enabled')) {
-    $daemons[] = INSTALLDIR.'/scripts/xmppdaemon.php';
-}
+$daemons[] = INSTALLDIR.'/scripts/imdaemon.php';
 
 if (Event::handle('GetValidDaemons', array(&$daemons))) {
     foreach ($daemons as $daemon) {
diff --git a/scripts/xmppdaemon.php b/scripts/imdaemon.php
similarity index 66%
rename from scripts/xmppdaemon.php
rename to scripts/imdaemon.php
index fd7cf055b4..c37a26b7c0 100755
--- a/scripts/xmppdaemon.php
+++ b/scripts/imdaemon.php
@@ -23,34 +23,32 @@ define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
 $shortoptions = 'fi::';
 $longoptions = array('id::', 'foreground');
 
-$helptext = <<<END_OF_XMPP_HELP
-Daemon script for receiving new notices from Jabber users.
+$helptext = <<<END_OF_IM_HELP
+Daemon script for receiving new notices from IM users.
 
     -i --id           Identity (default none)
     -f --foreground   Stay in the foreground (default background)
 
-END_OF_XMPP_HELP;
+END_OF_IM_HELP;
 
 require_once INSTALLDIR.'/scripts/commandline.inc';
 
-require_once INSTALLDIR . '/lib/jabber.php';
-
-class XMPPDaemon extends SpawningDaemon
+class ImDaemon extends SpawningDaemon
 {
     function __construct($id=null, $daemonize=true, $threads=1)
     {
         if ($threads != 1) {
             // This should never happen. :)
-            throw new Exception("XMPPDaemon can must run single-threaded");
+            throw new Exception("IMDaemon can must run single-threaded");
         }
         parent::__construct($id, $daemonize, $threads);
     }
 
     function runThread()
     {
-        common_log(LOG_INFO, 'Waiting to listen to XMPP and queues');
+        common_log(LOG_INFO, 'Waiting to listen to IM connections and queues');
 
-        $master = new XmppMaster($this->get_id());
+        $master = new ImMaster($this->get_id());
         $master->init();
         $master->service();
 
@@ -61,7 +59,7 @@ class XMPPDaemon extends SpawningDaemon
 
 }
 
-class XmppMaster extends IoMaster
+class ImMaster extends IoMaster
 {
     /**
      * Initialize IoManagers for the currently configured site
@@ -69,20 +67,17 @@ class XmppMaster extends IoMaster
      */
     function initManagers()
     {
-        // @fixme right now there's a hack in QueueManager to determine
-        // which queues to subscribe to based on the master class.
-        $this->instantiate('QueueManager');
-        $this->instantiate('XmppManager');
+        $classes = array();
+        if (Event::handle('StartImDaemonIoManagers', array(&$classes))) {
+            $classes[] = 'QueueManager';
+        }
+        Event::handle('EndImDaemonIoManagers', array(&$classes));
+        foreach ($classes as $class) {
+            $this->instantiate($class);
+        }
     }
 }
 
-// Abort immediately if xmpp is not enabled, otherwise the daemon chews up
-// lots of CPU trying to connect to unconfigured servers
-if (common_config('xmpp','enabled')==false) {
-    print "Aborting daemon - xmpp is disabled\n";
-    exit();
-}
-
 if (have_option('i', 'id')) {
     $id = get_option_value('i', 'id');
 } else if (count($args) > 0) {
@@ -93,6 +88,6 @@ if (have_option('i', 'id')) {
 
 $foreground = have_option('f', 'foreground');
 
-$daemon = new XMPPDaemon($id, !$foreground);
+$daemon = new ImDaemon($id, !$foreground);
 
 $daemon->runOnce();
diff --git a/scripts/queuedaemon.php b/scripts/queuedaemon.php
index a9cfda6d72..bedd14b1a3 100755
--- a/scripts/queuedaemon.php
+++ b/scripts/queuedaemon.php
@@ -21,7 +21,7 @@
 define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
 
 $shortoptions = 'fi:at:';
-$longoptions = array('id=', 'foreground', 'all', 'threads=', 'skip-xmpp', 'xmpp-only');
+$longoptions = array('id=', 'foreground', 'all', 'threads=');
 
 /**
  * Attempts to get a count of the processors available on the current system
@@ -163,13 +163,6 @@ if (!$threads) {
 $daemonize = !(have_option('f') || have_option('--foreground'));
 $all = have_option('a') || have_option('--all');
 
-if (have_option('--skip-xmpp')) {
-    define('XMPP_EMERGENCY_FLAG', true);
-}
-if (have_option('--xmpp-only')) {
-    define('XMPP_ONLY_FLAG', true);
-}
-
 $daemon = new QueueDaemon($id, $daemonize, $threads, $all);
 $daemon->runOnce();
 
diff --git a/scripts/stopdaemons.sh b/scripts/stopdaemons.sh
index c790f1f349..bc1230e645 100755
--- a/scripts/stopdaemons.sh
+++ b/scripts/stopdaemons.sh
@@ -23,8 +23,8 @@
 SDIR=`dirname $0`
 DIR=`php $SDIR/getpiddir.php`
 
-for f in jabberhandler ombhandler publichandler smshandler pinghandler \
-	 xmppconfirmhandler xmppdaemon twitterhandler facebookhandler \
+for f in ombhandler smshandler pinghandler \
+	 twitterhandler facebookhandler \
 	 twitterstatusfetcher synctwitterfriends pluginhandler rsscloudhandler; do
 
 	FILES="$DIR/$f.*.pid"

From 065140400018dec28ed82fd31a754c94b7b87521 Mon Sep 17 00:00:00 2001
From: Craig Andrews <candrews@integralblue.com>
Date: Thu, 28 Jan 2010 16:08:42 -0500
Subject: [PATCH 007/655] Add backwards compatibility for the XMPP
 configuration before XMPP was made into a plugin

---
 lib/statusnet.php | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/lib/statusnet.php b/lib/statusnet.php
index beeb26cccd..2654ba5736 100644
--- a/lib/statusnet.php
+++ b/lib/statusnet.php
@@ -274,7 +274,6 @@ class StatusNet
         }
 
         // Backwards compatibility
-
         if (array_key_exists('memcached', $config)) {
             if ($config['memcached']['enabled']) {
                 addPlugin('Memcache', array('servers' => $config['memcached']['server']));
@@ -284,6 +283,21 @@ class StatusNet
                 $config['cache']['base'] = $config['memcached']['base'];
             }
         }
+        if (array_key_exists('xmpp', $config)) {
+            if ($config['xmpp']['enabled']) {
+                addPlugin('xmpp', array(
+                    'server' => $config['xmpp']['server'],
+                    'port' => $config['xmpp']['port'],
+                    'user' => $config['xmpp']['user'],
+                    'resource' => $config['xmpp']['resource'],
+                    'encryption' => $config['xmpp']['encryption'],
+                    'password' => $config['xmpp']['password'],
+                    'host' => $config['xmpp']['host'],
+                    'debug' => $config['xmpp']['debug'],
+                    'public' => $config['xmpp']['public']
+                ));
+            }
+        }
     }
 }
 

From 886e28aaa9e4e9a524d5b1a933a2d2a13994aec9 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Tue, 16 Mar 2010 14:18:37 -0700
Subject: [PATCH 008/655] Stub plugins administration panel, allows for
 disabling/re-enabling plugins from the default plugins list.

---
 actions/plugindisable.php     |  78 +++++++++++++
 actions/pluginenable.php      | 166 ++++++++++++++++++++++++++
 actions/pluginsadminpanel.php | 110 ++++++++++++++++++
 lib/adminpanelaction.php      |   8 ++
 lib/default.php               |   3 +-
 lib/plugindisableform.php     |  93 +++++++++++++++
 lib/pluginenableform.php      | 114 ++++++++++++++++++
 lib/pluginlist.php            | 213 ++++++++++++++++++++++++++++++++++
 lib/router.php                |   7 ++
 lib/statusnet.php             |   5 +
 10 files changed, 796 insertions(+), 1 deletion(-)
 create mode 100644 actions/plugindisable.php
 create mode 100644 actions/pluginenable.php
 create mode 100644 actions/pluginsadminpanel.php
 create mode 100644 lib/plugindisableform.php
 create mode 100644 lib/pluginenableform.php
 create mode 100644 lib/pluginlist.php

diff --git a/actions/plugindisable.php b/actions/plugindisable.php
new file mode 100644
index 0000000000..7f107b3335
--- /dev/null
+++ b/actions/plugindisable.php
@@ -0,0 +1,78 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2010, StatusNet, Inc.
+ *
+ * Plugin enable action.
+ *
+ * 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/>.
+ *
+ * PHP version 5
+ *
+ * @category  Action
+ * @package   StatusNet
+ * @author    Brion Vibber <brion@status.net>
+ * @copyright 2010 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPLv3
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
+/**
+ * Plugin enable action.
+ *
+ * (Re)-enables a plugin from the default plugins list.
+ *
+ * Takes parameters:
+ *
+ *    - plugin: plugin name
+ *    - token: session token to prevent CSRF attacks
+ *    - ajax: boolean; whether to return Ajax or full-browser results
+ *
+ * Only works if the current user is logged in.
+ *
+ * @category  Action
+ * @package   StatusNet
+ * @author    Brion Vibber <brion@status.net>
+ * @copyright 2010 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPLv3
+ * @link      http://status.net/
+ */
+
+class PluginDisableAction extends PluginEnableAction
+{
+    /**
+     * Value to save into $config['plugins']['disable-<name>']
+     */
+    protected function overrideValue()
+    {
+        return 1;
+    }
+
+    protected function successShortTitle()
+    {
+        // TRANS: Page title for AJAX form return when a disabling a plugin.
+        return _m('plugin', 'Disabled');
+    }
+
+    protected function successNextForm()
+    {
+        return new EnablePluginForm($this, $this->plugin);
+    }
+}
+
+
diff --git a/actions/pluginenable.php b/actions/pluginenable.php
new file mode 100644
index 0000000000..2dbb3e3956
--- /dev/null
+++ b/actions/pluginenable.php
@@ -0,0 +1,166 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2010, StatusNet, Inc.
+ *
+ * Plugin enable action.
+ *
+ * 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/>.
+ *
+ * PHP version 5
+ *
+ * @category  Action
+ * @package   StatusNet
+ * @author    Brion Vibber <brion@status.net>
+ * @copyright 2010 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPLv3
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
+/**
+ * Plugin enable action.
+ *
+ * (Re)-enables a plugin from the default plugins list.
+ *
+ * Takes parameters:
+ *
+ *    - plugin: plugin name
+ *    - token: session token to prevent CSRF attacks
+ *    - ajax: boolean; whether to return Ajax or full-browser results
+ *
+ * Only works if the current user is logged in.
+ *
+ * @category  Action
+ * @package   StatusNet
+ * @author    Brion Vibber <brion@status.net>
+ * @copyright 2010 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPLv3
+ * @link      http://status.net/
+ */
+
+class PluginEnableAction extends Action
+{
+    var $user;
+    var $plugin;
+
+    /**
+     * Check pre-requisites and instantiate attributes
+     *
+     * @param Array $args array of arguments (URL, GET, POST)
+     *
+     * @return boolean success flag
+     */
+
+    function prepare($args)
+    {
+        parent::prepare($args);
+
+        // @fixme these are pretty common, should a parent class factor these out?
+
+        // Only allow POST requests
+
+        if ($_SERVER['REQUEST_METHOD'] != 'POST') {
+            $this->clientError(_('This action only accepts POST requests.'));
+            return false;
+        }
+
+        // CSRF protection
+
+        $token = $this->trimmed('token');
+
+        if (!$token || $token != common_session_token()) {
+            $this->clientError(_('There was a problem with your session token.'.
+                                 ' Try again, please.'));
+            return false;
+        }
+
+        // Only for logged-in users
+
+        $this->user = common_current_user();
+
+        if (empty($this->user)) {
+            $this->clientError(_('Not logged in.'));
+            return false;
+        }
+
+        if (!AdminPanelAction::canAdmin('plugins')) {
+            $this->clientError(_('You cannot administer plugins.'));
+            return false;
+        }
+
+        $this->plugin = $this->arg('plugin');
+        $defaultPlugins = common_config('plugins', 'default');
+        if (!array_key_exists($this->plugin, $defaultPlugins)) {
+            $this->clientError(_('No such plugin.'));
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Handle request
+     *
+     * Does the subscription and returns results.
+     *
+     * @param Array $args unused.
+     *
+     * @return void
+     */
+
+    function handle($args)
+    {
+        $key = 'disable-' . $this->plugin;
+        Config::save('plugins', $key, $this->overrideValue());
+
+        // @fixme this is a pretty common pattern and should be refactored down
+        if ($this->boolean('ajax')) {
+            $this->startHTML('text/xml;charset=utf-8');
+            $this->elementStart('head');
+            $this->element('title', null, $this->successShortTitle());
+            $this->elementEnd('head');
+            $this->elementStart('body');
+            $form = $this->successNextForm();
+            $form->show();
+            $this->elementEnd('body');
+            $this->elementEnd('html');
+        } else {
+            $url = common_local_url('pluginsadminpanel');
+            common_redirect($url, 303);
+        }
+    }
+
+    /**
+     * Value to save into $config['plugins']['disable-<name>']
+     */
+    protected function overrideValue()
+    {
+        return 0;
+    }
+
+    protected function successShortTitle()
+    {
+        // TRANS: Page title for AJAX form return when enabling a plugin.
+        return _m('plugin', 'Enabled');
+    }
+
+    protected function successNextForm()
+    {
+        return new DisablePluginForm($this, $this->plugin);
+    }
+}
diff --git a/actions/pluginsadminpanel.php b/actions/pluginsadminpanel.php
new file mode 100644
index 0000000000..bc400bd514
--- /dev/null
+++ b/actions/pluginsadminpanel.php
@@ -0,0 +1,110 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Plugins administration panel
+ *
+ * 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  Settings
+ * @package   StatusNet
+ * @author    Brion Vibber <brion@status.net>
+ * @copyright 2010 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
+/**
+ * Plugins settings
+ *
+ * @category Admin
+ * @package  StatusNet
+ * @author   Brion Vibber <brion@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://status.net/
+ */
+
+class PluginsadminpanelAction extends AdminPanelAction
+{
+
+    /**
+     * Returns the page title
+     *
+     * @return string page title
+     */
+
+    function title()
+    {
+        // TRANS: Tab and title for plugins admin panel.
+        return _('Plugins');
+    }
+
+    /**
+     * Instructions for using this form.
+     *
+     * @return string instructions
+     */
+
+    function getInstructions()
+    {
+        // TRANS: Instructions at top of plugin admin page.
+        return _('Additional plugins can be enabled and configured manually. ' . 
+                 'See the <a href="http://status.net/wiki/Plugins">online plugin ' .
+                 'documentation</a> for more details.');
+    }
+
+    /**
+     * Show the plugins admin panel form
+     *
+     * @return void
+     */
+
+    function showForm()
+    {
+        $this->elementStart('fieldset', array('id' => 'settings_plugins_default'));
+        
+        // TRANS: Admin form section header
+        $this->element('legend', null, _('Default plugins'), 'default');
+
+        $this->showDefaultPlugins();
+
+        $this->elementEnd('fieldset');
+    }
+
+    /**
+     * Until we have a general plugin metadata infrastructure, for now
+     * we'll just list up the ones we know from the global default
+     * plugins list.
+     */
+    protected function showDefaultPlugins()
+    {
+        $plugins = array_keys(common_config('plugins', 'default'));
+        natsort($plugins);
+
+        if ($plugins) {
+            $list = new PluginList($plugins, $this);
+            $list->show();
+        } else {
+            $this->element('p', null,
+                           _('All default plugins have been disabled from the ' .
+                             'site\'s configuration file.'));
+        }
+    }
+}
diff --git a/lib/adminpanelaction.php b/lib/adminpanelaction.php
index a927e23336..d87981b6a7 100644
--- a/lib/adminpanelaction.php
+++ b/lib/adminpanelaction.php
@@ -407,6 +407,14 @@ class AdminPanelNav extends Widget
                                      $menu_title, $action_name == 'snapshotadminpanel', 'nav_snapshot_admin_panel');
             }
 
+            if (AdminPanelAction::canAdmin('plugins')) {
+                // TRANS: Menu item title/tooltip
+                $menu_title = _('Plugins configuration');
+                // TRANS: Menu item for site administration
+                $this->out->menuItem(common_local_url('pluginsadminpanel'), _('Plugins'),
+                                     $menu_title, $action_name == 'pluginsadminpanel', 'nav_design_admin_panel');
+            }
+
             Event::handle('EndAdminPanelNav', array($this));
         }
         $this->action->elementEnd('ul');
diff --git a/lib/default.php b/lib/default.php
index 10f3f1a97e..eb0cb0b64a 100644
--- a/lib/default.php
+++ b/lib/default.php
@@ -285,8 +285,9 @@ $default =
                                  'RSSCloud' => null,
                                  'OpenID' => null),
               ),
+        'pluginlist' => array(),
         'admin' =>
-        array('panels' => array('design', 'site', 'user', 'paths', 'access', 'sessions', 'sitenotice')),
+        array('panels' => array('design', 'site', 'user', 'paths', 'access', 'sessions', 'sitenotice', 'plugins')),
         'singleuser' =>
         array('enabled' => false,
               'nickname' => null),
diff --git a/lib/plugindisableform.php b/lib/plugindisableform.php
new file mode 100644
index 0000000000..3cbabdb2ce
--- /dev/null
+++ b/lib/plugindisableform.php
@@ -0,0 +1,93 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Form for enabling/disabling plugins
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Form
+ * @package   StatusNet
+ * @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);
+}
+
+/**
+ * Form for joining a group
+ *
+ * @category Form
+ * @package  StatusNet
+ * @author   Brion Vibber <brion@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://status.net/
+ *
+ * @see      PluginEnableForm
+ */
+
+class PluginDisableForm extends PluginEnableForm
+{
+    /**
+     * ID of the form
+     *
+     * @return string ID of the form
+     */
+
+    function id()
+    {
+        return 'plugin-disable-' . $this->plugin;
+    }
+
+    /**
+     * class of the form
+     *
+     * @return string of the form class
+     */
+
+    function formClass()
+    {
+        return 'form_plugin_disable';
+    }
+
+    /**
+     * Action of the form
+     *
+     * @return string URL of the action
+     */
+
+    function action()
+    {
+        return common_local_url('plugindisable',
+                                array('plugin' => $this->plugin));
+    }
+
+    /**
+     * Action elements
+     *
+     * @return void
+     */
+
+    function formActions()
+    {
+        // TRANS: Plugin admin panel controls
+        $this->out->submit('submit', _m('plugin', 'Disable'));
+    }
+
+}
diff --git a/lib/pluginenableform.php b/lib/pluginenableform.php
new file mode 100644
index 0000000000..8683ffd0be
--- /dev/null
+++ b/lib/pluginenableform.php
@@ -0,0 +1,114 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Form for enabling/disabling plugins
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Form
+ * @package   StatusNet
+ * @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);
+}
+
+require_once INSTALLDIR.'/lib/form.php';
+
+/**
+ * Form for joining a group
+ *
+ * @category Form
+ * @package  StatusNet
+ * @author   Brion Vibber <brion@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://status.net/
+ *
+ * @see      PluginDisableForm
+ */
+
+class PluginEnableForm extends Form
+{
+    /**
+     * Plugin to enable/disable
+     */
+
+    var $plugin = null;
+
+    /**
+     * Constructor
+     *
+     * @param HTMLOutputter $out    output channel
+     * @param string        $plugin plugin to enable/disable
+     */
+
+    function __construct($out=null, $plugin=null)
+    {
+        parent::__construct($out);
+
+        $this->plugin = $plugin;
+    }
+
+    /**
+     * ID of the form
+     *
+     * @return string ID of the form
+     */
+
+    function id()
+    {
+        return 'plugin-enable-' . $this->plugin;
+    }
+
+    /**
+     * class of the form
+     *
+     * @return string of the form class
+     */
+
+    function formClass()
+    {
+        return 'form_plugin_enable';
+    }
+
+    /**
+     * Action of the form
+     *
+     * @return string URL of the action
+     */
+
+    function action()
+    {
+        return common_local_url('pluginenable',
+                                array('plugin' => $this->plugin));
+    }
+
+    /**
+     * Action elements
+     *
+     * @return void
+     */
+
+    function formActions()
+    {
+        // TRANS: Plugin admin panel controls
+        $this->out->submit('submit', _m('plugin', 'Enable'));
+    }
+}
diff --git a/lib/pluginlist.php b/lib/pluginlist.php
new file mode 100644
index 0000000000..07a17ba397
--- /dev/null
+++ b/lib/pluginlist.php
@@ -0,0 +1,213 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Plugins administration panel
+ *
+ * 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  Settings
+ * @package   StatusNet
+ * @author    Brion Vibber <brion@status.net>
+ * @copyright 2010 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
+require INSTALLDIR . "/lib/pluginenableform.php";
+require INSTALLDIR . "/lib/plugindisableform.php";
+
+/**
+ * Plugin list
+ *
+ * @category Admin
+ * @package  StatusNet
+ * @author   Brion Vibber <brion@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://status.net/
+ */
+
+class PluginList extends Widget
+{
+    var $plugins = array();
+
+    function __construct($plugins, $out)
+    {
+        parent::__construct($out);
+        $this->plugins = $plugins;
+    }
+
+    function show()
+    {
+        $this->startList();
+        $this->showPlugins();
+        $this->endList();
+    }
+
+    function startList()
+    {
+        $this->out->elementStart('table', 'plugin_list');
+    }
+
+    function endList()
+    {
+        $this->out->elementEnd('table');
+    }
+
+    function showPlugins()
+    {
+        foreach ($this->plugins as $plugin) {
+            $pli = $this->newListItem($plugin);
+            $pli->show();
+        }
+    }
+
+    function newListItem($plugin)
+    {
+        return new PluginListItem($plugin, $this->out);
+    }
+}
+
+class PluginListItem extends Widget
+{
+    /** Current plugin. */
+    var $plugin = null;
+
+    /** Local cache for plugin version info */
+    protected static $versions = false;
+
+    function __construct($plugin, $out)
+    {
+        parent::__construct($out);
+        $this->plugin = $plugin;
+    }
+
+    function show()
+    {
+        $meta = $this->metaInfo();
+
+        $this->out->elementStart('tr', array('id' => 'plugin-' . $this->plugin));
+
+        // Name and controls
+        $this->out->elementStart('td');
+        $this->out->elementStart('div');
+        if (!empty($meta['homepage'])) {
+            $this->out->elementStart('a', array('href' => $meta['homepage']));
+        }
+        $this->out->text($this->plugin);
+        if (!empty($meta['homepage'])) {
+            $this->out->elementEnd('a');
+        }
+        $this->out->elementEnd('div');
+        
+        $form = $this->getControlForm();
+        $form->show();
+
+        $this->out->elementEnd('td');
+
+        // Version and authors
+        $this->out->elementStart('td');
+        if (!empty($meta['version'])) {
+            $this->out->elementStart('div');
+            $this->out->text($meta['version']);
+            $this->out->elementEnd('div');
+        }
+        if (!empty($meta['author'])) {
+            $this->out->elementStart('div');
+            $this->out->text($meta['author']);
+            $this->out->elementEnd('div');
+        }
+        $this->out->elementEnd('td');
+
+        // Description
+        $this->out->elementStart('td');
+        if (!empty($meta['rawdescription'])) {
+            $this->out->raw($meta['rawdescription']);
+        }
+        $this->out->elementEnd('td');
+
+        $this->out->elementEnd('tr');
+    }
+
+    /**
+     * Pull up the appropriate control form for this plugin, depending
+     * on its current state.
+     *
+     * @return Form
+     */
+    protected function getControlForm()
+    {
+        $key = 'disable-' . $this->plugin;
+        if (common_config('plugins', $key)) {
+            return new PluginEnableForm($this->out, $this->plugin);
+        } else {
+            return new PluginDisableForm($this->out, $this->plugin);
+        }
+    }
+
+    /**
+     * Grab metadata about this plugin...
+     * Warning: horribly inefficient and may explode!
+     * Doesn't work for disabled plugins either.
+     *
+     * @fixme pull structured data from plugin source
+     */
+    function metaInfo()
+    {
+        $versions = self::getPluginVersions();
+        $found = false;
+
+        foreach ($versions as $info) {
+            // hack for URL shorteners... "LilUrl (ur1.ca)" etc
+            list($name, ) = explode(' ', $info['name']);
+
+            if ($name == $this->plugin) {
+                if ($found) {
+                    // hack for URL shorteners...
+                    $found['rawdescription'] .= "<br />\n" . $info['rawdescription'];
+                } else {
+                    $found = $info;
+                }
+            }
+        }
+
+        if ($found) {
+            return $found;
+        } else {
+            return array('name' => $this->plugin,
+                         'rawdescription' => _m('plugin-description',
+                                                '(Plugin descriptions unavailable when disabled.)'));
+        }
+    }
+
+    /**
+     * Lazy-load the set of active plugin version info
+     * @return array
+     */
+    protected static function getPluginVersions()
+    {
+        if (!is_array(self::$versions)) {
+            $versions = array();
+            Event::handle('PluginVersion', array(&$versions));
+            self::$versions = $versions;
+        }
+        return self::$versions;
+    }
+}
diff --git a/lib/router.php b/lib/router.php
index a48ee875e1..9fe2f60ae7 100644
--- a/lib/router.php
+++ b/lib/router.php
@@ -658,6 +658,13 @@ class Router
             $m->connect('admin/sessions', array('action' => 'sessionsadminpanel'));
             $m->connect('admin/sitenotice', array('action' => 'sitenoticeadminpanel'));
             $m->connect('admin/snapshot', array('action' => 'snapshotadminpanel'));
+            $m->connect('admin/plugins', array('action' => 'pluginsadminpanel'));
+            $m->connect('admin/plugins/enable/:plugin',
+                        array('action' => 'pluginenable'),
+                        array('plugin' => '[A-Za-z0-9_]+'));
+            $m->connect('admin/plugins/disable/:plugin',
+                        array('action' => 'plugindisable'),
+                        array('plugin' => '[A-Za-z0-9_]+'));
 
             $m->connect('getfile/:filename',
                         array('action' => 'getfile'),
diff --git a/lib/statusnet.php b/lib/statusnet.php
index 776cfb579b..98f25c8a08 100644
--- a/lib/statusnet.php
+++ b/lib/statusnet.php
@@ -163,6 +163,11 @@ class StatusNet
     {
         // Load default plugins
         foreach (common_config('plugins', 'default') as $name => $params) {
+            $key = 'disable-' . $name;
+            if (common_config('plugins', $key)) {
+                continue;
+            }
+
             if (is_null($params)) {
                 addPlugin($name);
             } else if (is_array($params)) {

From 64b5ea2e6238017fba5ad53274d26d53ed2b5fb3 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Wed, 24 Mar 2010 14:18:06 -0700
Subject: [PATCH 009/655] Use InnoDB and UTF-8 options when creating
 user_im_prefs table, to match others

---
 db/statusnet.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/db/statusnet.sql b/db/statusnet.sql
index d1cd670750..16d09a11f7 100644
--- a/db/statusnet.sql
+++ b/db/statusnet.sql
@@ -647,7 +647,7 @@ create table user_im_prefs (
 
     constraint primary key (user_id, transport),
     constraint unique key `transport_screenname_key` ( `transport` , `screenname` )
-);
+) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
 
 create table conversation (
     id integer auto_increment primary key comment 'unique identifier',

From abf2ce873b23f238041c4b4190dc709b2d40774d Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Wed, 24 Mar 2010 14:18:25 -0700
Subject: [PATCH 010/655] Avoid notice when reporting DB errors for objects
 that don't have an 'id' field

---
 classes/Memcached_DataObject.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/classes/Memcached_DataObject.php b/classes/Memcached_DataObject.php
index bc4c3a000c..af148ef693 100644
--- a/classes/Memcached_DataObject.php
+++ b/classes/Memcached_DataObject.php
@@ -502,7 +502,7 @@ class Memcached_DataObject extends Safe_DataObject
     function raiseError($message, $type = null, $behaviour = null)
     {
         $id = get_class($this);
-        if ($this->id) {
+        if (!empty($this->id)) {
             $id .= ':' . $this->id;
         }
         throw new ServerException("[$id] DB_DataObject error [$type]: $message");

From 9398c61ed321472ab7131c063ed319a51d2b2bef Mon Sep 17 00:00:00 2001
From: Craig Andrews <candrews@integralblue.com>
Date: Mon, 1 Mar 2010 21:40:42 -0500
Subject: [PATCH 011/655] Use PHP exceptions for PEAR error handling.

Allows for the common try/catch construct, which makes error handling cleaner and easier.
---
 index.php      | 97 ++++++++++++++++++++++++++------------------------
 lib/common.php | 12 +++++++
 2 files changed, 63 insertions(+), 46 deletions(-)

diff --git a/index.php b/index.php
index 6bfbc11da8..78c4de62a3 100644
--- a/index.php
+++ b/index.php
@@ -37,8 +37,6 @@ define('INSTALLDIR', dirname(__FILE__));
 define('STATUSNET', true);
 define('LACONICA', true); // compatibility
 
-require_once INSTALLDIR . '/lib/common.php';
-
 $user = null;
 $action = null;
 
@@ -68,52 +66,63 @@ function getPath($req)
  */
 function handleError($error)
 {
-    if ($error->getCode() == DB_DATAOBJECT_ERROR_NODATA) {
-        return;
-    }
+    try {
 
-    $logmsg = "PEAR error: " . $error->getMessage();
-    if (common_config('site', 'logdebug')) {
-        $logmsg .= " : ". $error->getDebugInfo();
-    }
-    // DB queries often end up with a lot of newlines; merge to a single line
-    // for easier grepability...
-    $logmsg = str_replace("\n", " ", $logmsg);
-    common_log(LOG_ERR, $logmsg);
-
-    // @fixme backtrace output should be consistent with exception handling
-    if (common_config('site', 'logdebug')) {
-        $bt = $error->getBacktrace();
-        foreach ($bt as $n => $line) {
-            common_log(LOG_ERR, formatBacktraceLine($n, $line));
+        if ($error->getCode() == DB_DATAOBJECT_ERROR_NODATA) {
+            return;
         }
-    }
-    if ($error instanceof DB_DataObject_Error
-        || $error instanceof DB_Error
-    ) {
-        $msg = sprintf(
-            _(
-                'The database for %s isn\'t responding correctly, '.
-                'so the site won\'t work properly. '.
-                'The site admins probably know about the problem, '.
-                'but you can contact them at %s to make sure. '.
-                'Otherwise, wait a few minutes and try again.'
-            ),
-            common_config('site', 'name'),
-            common_config('site', 'email')
-        );
-    } else {
-        $msg = _(
-            'An important error occured, probably related to email setup. '.
-            'Check logfiles for more info..'
-        );
-    }
 
-    $dac = new DBErrorAction($msg, 500);
-    $dac->showPage();
+        $logmsg = "PEAR error: " . $error->getMessage();
+        if ($error instanceof PEAR_Exception && common_config('site', 'logdebug')) {
+            $logmsg .= " : ". $error->toText();
+        }
+        // DB queries often end up with a lot of newlines; merge to a single line
+        // for easier grepability...
+        $logmsg = str_replace("\n", " ", $logmsg);
+        common_log(LOG_ERR, $logmsg);
+
+        // @fixme backtrace output should be consistent with exception handling
+        if (common_config('site', 'logdebug')) {
+            $bt = $error->getTrace();
+            foreach ($bt as $n => $line) {
+                common_log(LOG_ERR, formatBacktraceLine($n, $line));
+            }
+        }
+        if ($error instanceof DB_DataObject_Error
+            || $error instanceof DB_Error
+            || ($error instanceof PEAR_Exception && $error->getCode() == -24)
+        ) {
+            $msg = sprintf(
+                _(
+                    'The database for %s isn\'t responding correctly, '.
+                    'so the site won\'t work properly. '.
+                    'The site admins probably know about the problem, '.
+                    'but you can contact them at %s to make sure. '.
+                    'Otherwise, wait a few minutes and try again.'
+                ),
+                common_config('site', 'name'),
+                common_config('site', 'email')
+            );
+        } else {
+            $msg = _(
+                'An important error occured, probably related to email setup. '.
+                'Check logfiles for more info..'
+            );
+        }
+
+        $dac = new DBErrorAction($msg, 500);
+        $dac->showPage();
+
+    } catch (Exception $e) {
+        echo _('An error occurred.');
+    }
     exit(-1);
 }
 
+set_exception_handler('handleError');
+
+require_once INSTALLDIR . '/lib/common.php';
+
 /**
  * Format a backtrace line for debug output roughly like debug_print_backtrace() does.
  * Exceptions already have this built in, but PEAR error objects just give us the array.
@@ -238,10 +247,6 @@ function main()
         return;
     }
 
-    // For database errors
-
-    PEAR::setErrorHandling(PEAR_ERROR_CALLBACK, 'handleError');
-
     // Make sure RW database is setup
 
     setupRW();
diff --git a/lib/common.php b/lib/common.php
index 8d2e6b420b..45946c216a 100644
--- a/lib/common.php
+++ b/lib/common.php
@@ -71,6 +71,7 @@ if (!function_exists('dl')) {
 # global configuration object
 
 require_once('PEAR.php');
+require_once('PEAR/Exception.php');
 require_once('DB/DataObject.php');
 require_once('DB/DataObject/Cast.php'); # for dates
 
@@ -127,6 +128,17 @@ require_once INSTALLDIR.'/lib/subs.php';
 require_once INSTALLDIR.'/lib/clientexception.php';
 require_once INSTALLDIR.'/lib/serverexception.php';
 
+
+//set PEAR error handling to use regular PHP exceptions
+function PEAR_ErrorToPEAR_Exception($err)
+{
+    if ($err->getCode()) {
+        throw new PEAR_Exception($err->getMessage(), $err->getCode());
+    }
+    throw new PEAR_Exception($err->getMessage());
+}
+PEAR::setErrorHandling(PEAR_ERROR_CALLBACK, 'PEAR_ErrorToPEAR_Exception');
+
 try {
     StatusNet::init(@$server, @$path, @$conffile);
 } catch (NoConfigException $e) {

From d7d3a50d8751f071aa95541813af1d190e71430e Mon Sep 17 00:00:00 2001
From: Craig Andrews <candrews@integralblue.com>
Date: Mon, 1 Mar 2010 21:53:10 -0500
Subject: [PATCH 012/655] Don't attempt to retrieve the current user from the
 DB while processing a DB error

---
 index.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/index.php b/index.php
index 78c4de62a3..66a9838d65 100644
--- a/index.php
+++ b/index.php
@@ -92,6 +92,12 @@ function handleError($error)
             || $error instanceof DB_Error
             || ($error instanceof PEAR_Exception && $error->getCode() == -24)
         ) {
+            //If we run into a DB error, assume we can't connect to the DB at all
+            //so set the current user to null, so we don't try to access the DB
+            //while rendering the error page.
+            global $_cur;
+            $_cur = null;
+
             $msg = sprintf(
                 _(
                     'The database for %s isn\'t responding correctly, '.

From d259c37ad231ca0010c60e5cfd397bb1732874a4 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Sat, 24 Apr 2010 13:40:10 -0400
Subject: [PATCH 013/655] Add User_urlshortener_prefs

Add a table for URL shortener prefs, a corresponding class, and the
correct mumbo-jumbo in statusnet.ini to make everything work.
---
 classes/User_urlshortener_prefs.php | 47 +++++++++++++++++++++++++++++
 classes/statusnet.ini               | 11 +++++++
 db/statusnet.sql                    | 13 ++++++++
 3 files changed, 71 insertions(+)
 create mode 100755 classes/User_urlshortener_prefs.php

diff --git a/classes/User_urlshortener_prefs.php b/classes/User_urlshortener_prefs.php
new file mode 100755
index 0000000000..aef39e3719
--- /dev/null
+++ b/classes/User_urlshortener_prefs.php
@@ -0,0 +1,47 @@
+<?php
+/*
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2010, StatusNet, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+if (!defined('STATUSNET') && !defined('LACONICA')) {
+    exit(1);
+}
+
+class User_urlshortener_prefs extends Memcached_DataObject
+{
+    ###START_AUTOCODE
+    /* the code below is auto generated do not remove the above tag */
+
+    public $__table = 'user_urlshortener_prefs';         // table name
+    public $user_id;                         // int(4)  primary_key not_null
+    public $urlshorteningservice;            // varchar(50)   default_ur1.ca
+    public $maxurllength;                    // int(4)   not_null
+    public $maxnoticelength;                 // int(4)   not_null
+    public $created;                         // datetime   not_null default_0000-00-00%2000%3A00%3A00
+    public $modified;                        // timestamp   not_null default_CURRENT_TIMESTAMP
+
+    /* Static get */
+    function staticGet($k,$v=NULL) { return Memcached_DataObject::staticGet('User_urlshortener_prefs',$k,$v); }
+
+    /* the code above is auto generated do not remove the tag below */
+    ###END_AUTOCODE
+
+    function sequenceKey()
+    {
+        return array(false, false, false);
+    }
+}
diff --git a/classes/statusnet.ini b/classes/statusnet.ini
index 473bd6ff5f..d13fdfa526 100644
--- a/classes/statusnet.ini
+++ b/classes/statusnet.ini
@@ -649,3 +649,14 @@ user_id = K
 transport = K
 transport = U
 screenname = U
+
+[user_urlshortener_prefs]
+user_id = 129
+urlshorteningservice = 2
+maxurllength = 129
+maxnoticelength = 129
+created = 142
+modified = 384
+
+[user_urlshortener_prefs__keys]
+user_id = K
diff --git a/db/statusnet.sql b/db/statusnet.sql
index 16d09a11f7..a0c497fff5 100644
--- a/db/statusnet.sql
+++ b/db/statusnet.sql
@@ -665,3 +665,16 @@ create table local_group (
    modified timestamp comment 'date this record was modified'
 
 ) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
+
+create table user_urlshortener_prefs (
+
+   user_id integer not null comment 'user' references user (id),
+   urlshorteningservice varchar(50) default 'ur1.ca' comment 'service to use for auto-shortening URLs',
+   maxurllength integer not null comment 'urls greater than this length will be shortened, 0 = always, null = never',
+   maxnoticelength integer not null comment 'notices with content greater than this value will have all urls shortened, 0 = always, null = never',
+
+   created datetime not null comment 'date this record was created',
+   modified timestamp comment 'date this record was modified',
+
+   constraint primary key (user_id)
+) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;

From 7a1dd5798f0fcf2c03d1257a18ddcb9008879de0 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Sat, 24 Apr 2010 14:05:46 -0400
Subject: [PATCH 014/655] add defaults for URL shortening

---
 README          | 20 +++++++++++++++++---
 lib/default.php |  4 ++++
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/README b/README
index 1e244c4482..dcf305ea6f 100644
--- a/README
+++ b/README
@@ -843,9 +843,7 @@ sslserver: use an alternate server name for SSL URLs, like
     parameters correctly so that both the SSL server and the
     "normal" server can access the session cookie and
     preferably other cookies as well.
-shorturllength: Length of URL at which URLs in a message exceeding 140
-    characters will be sent to the user's chosen
-    shortening service.
+shorturllength: ignored. See 'url' section below.
 dupelimit: minimum time allowed for one person to say the same thing
     twice. Default 60s. Anything lower is considered a user
     or UI error.
@@ -1468,6 +1466,22 @@ disallow: Array of (virtual) directories to disallow. Default is 'main',
     'search', 'message', 'settings', 'admin'. Ignored when site
     is private, in which case the entire site ('/') is disallowed.
 
+url
+---
+
+Everybody loves URL shorteners. These are some options for fine-tuning
+how and when the server shortens URLs.
+
+shortener: URL shortening service to use by default. Users can override
+           individually. 'ur1.ca' by default.
+maxlength: If an URL is strictly longer than this limit, it will be
+           shortened. Note that the URL shortener service may return an
+           URL longer than this limit. Defaults to 25. Users can
+           override. If set to 0, all URLs will be shortened.
+maxnoticelength: If a notice is strictly longer than this limit, all
+           URLs in the notice will be shortened. Users can override.
+           -1 means the text limit for notices.
+
 Plugins
 =======
 
diff --git a/lib/default.php b/lib/default.php
index c98f179ae1..dec08fc066 100644
--- a/lib/default.php
+++ b/lib/default.php
@@ -304,4 +304,8 @@ $default =
         array('subscribers' => true,
               'members' => true,
               'peopletag' => true),
+        'url' =>
+        array('shortener' => 'ur1.ca',
+              'maxlength' => 25,
+              'maxnoticelength' => -1)
         );

From 9c0c9863d532942b99184f14e923fc3c050f8177 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Sat, 24 Apr 2010 14:20:28 -0400
Subject: [PATCH 015/655] documentation and whitespace on UrlShortenerPlugin

---
 plugins/UrlShortener/UrlShortenerPlugin.php | 108 +++++++++++++++-----
 1 file changed, 84 insertions(+), 24 deletions(-)

diff --git a/plugins/UrlShortener/UrlShortenerPlugin.php b/plugins/UrlShortener/UrlShortenerPlugin.php
index 027624b7ae..8acfac26f4 100644
--- a/plugins/UrlShortener/UrlShortenerPlugin.php
+++ b/plugins/UrlShortener/UrlShortenerPlugin.php
@@ -19,11 +19,11 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
- * @category  Plugin
- * @package   StatusNet
- * @author    Craig Andrews <candrews@integralblue.com>
- * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://status.net/
+ * @category Plugin
+ * @package  StatusNet
+ * @author   Craig Andrews <candrews@integralblue.com>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://status.net/
  */
 
 if (!defined('STATUSNET') && !defined('LACONICA')) {
@@ -43,53 +43,113 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
 abstract class UrlShortenerPlugin extends Plugin
 {
     public $shortenerName;
-    public $freeService=false;
-    //------------Url Shortener plugin should implement some (or all) of these methods------------\\
+    public $freeService = false;
+
+    // Url Shortener plugins should implement some (or all)
+    // of these methods
 
     /**
-    * Short a URL
-    * @param url
-    * @return string shortened version of the url, or null if URL shortening failed
-    */
+     * Make an URL shorter.
+     *
+     * @param string $url URL to shorten
+     *
+     * @return string shortened version of the url, or null on failure
+     */
+
     protected abstract function shorten($url);
 
-    //------------These methods may help you implement your plugin------------\\
+    /**
+     * Utility to get the data at an URL
+     *
+     * @param string $url URL to fetch
+     *
+     * @return string response body
+     *
+     * @todo rename to code-standard camelCase httpGet()
+     */
+
     protected function http_get($url)
     {
-        $request = HTTPClient::start();
+        $request  = HTTPClient::start();
         $response = $request->get($url);
         return $response->getBody();
     }
 
-    protected function http_post($url,$data)
+    /**
+     * Utility to post a request and get a response URL
+     *
+     * @param string $url  URL to fetch
+     * @param array  $data post parameters
+     *
+     * @return string response body
+     *
+     * @todo rename to code-standard httpPost()
+     */
+
+    protected function http_post($url, $data)
     {
-        $request = HTTPClient::start();
+        $request  = HTTPClient::start();
         $response = $request->post($url, null, $data);
         return $response->getBody();
     }
 
-    //------------Below are the methods that connect StatusNet to the implementing Url Shortener plugin------------\\
+    // Hook handlers
 
-    function onInitializePlugin(){
-        if(!isset($this->shortenerName)){
+    /**
+     * Called when all plugins have been initialized
+     *
+     * @return boolean hook value
+     */
+
+    function onInitializePlugin()
+    {
+        if (!isset($this->shortenerName)) {
             throw new Exception("must specify a shortenerName");
         }
+        return true;
     }
 
+    /**
+     * Called when a showing the URL shortener drop-down box
+     *
+     * Properties of the shortening service currently only
+     * include whether it's a free service.
+     *
+     * @param array &$shorteners array mapping shortener name to properties
+     *
+     * @return boolean hook value
+     */
+
     function onGetUrlShorteners(&$shorteners)
     {
-        $shorteners[$this->shortenerName]=array('freeService'=>$this->freeService);
+        $shorteners[$this->shortenerName] =
+          array('freeService' => $this->freeService);
+        return true;
     }
 
-    function onStartShortenUrl($url,$shortenerName,&$shortenedUrl)
+    /**
+     * Called to shorten an URL
+     *
+     * @param string $url           URL to shorten
+     * @param string $shortenerName Shortening service. Don't handle if it's
+     *                              not you!
+     * @param string &$shortenedUrl URL after shortening; out param.
+     *
+     * @return boolean hook value
+     */
+
+    function onStartShortenUrl($url, $shortenerName, &$shortenedUrl)
     {
-        if($shortenerName == $this->shortenerName && strlen($url) >= common_config('site', 'shorturllength')){
+        if ($shortenerName == $this->shortenerName) {
             $result = $this->shorten($url);
-            if(isset($result) && $result != null && $result !== false){
-                $shortenedUrl=$result;
-                common_log(LOG_INFO, __CLASS__ . ": $this->shortenerName shortened $url to $shortenedUrl");
+            if (isset($result) && $result != null && $result !== false) {
+                $shortenedUrl = $result;
+                common_log(LOG_INFO,
+                           __CLASS__ . ": $this->shortenerName ".
+                           "shortened $url to $shortenedUrl");
                 return false;
             }
         }
+        return true;
     }
 }

From 869a6be0f5779aff69018d02f9ac0273946040d9 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Sat, 24 Apr 2010 14:22:51 -0400
Subject: [PATCH 016/655] move url shortener superclass to lib from plugin

---
 .../UrlShortenerPlugin.php => lib/urlshortenerplugin.php        | 0
 plugins/BitlyUrl/BitlyUrlPlugin.php                             | 2 --
 plugins/LilUrl/LilUrlPlugin.php                                 | 2 --
 plugins/PtitUrl/PtitUrlPlugin.php                               | 1 -
 plugins/SimpleUrl/SimpleUrlPlugin.php                           | 2 --
 plugins/TightUrl/TightUrlPlugin.php                             | 2 --
 6 files changed, 9 deletions(-)
 rename plugins/UrlShortener/UrlShortenerPlugin.php => lib/urlshortenerplugin.php (100%)

diff --git a/plugins/UrlShortener/UrlShortenerPlugin.php b/lib/urlshortenerplugin.php
similarity index 100%
rename from plugins/UrlShortener/UrlShortenerPlugin.php
rename to lib/urlshortenerplugin.php
diff --git a/plugins/BitlyUrl/BitlyUrlPlugin.php b/plugins/BitlyUrl/BitlyUrlPlugin.php
index f7f28b4d6c..b649d3d0b2 100644
--- a/plugins/BitlyUrl/BitlyUrlPlugin.php
+++ b/plugins/BitlyUrl/BitlyUrlPlugin.php
@@ -31,8 +31,6 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR.'/plugins/UrlShortener/UrlShortenerPlugin.php';
-
 class BitlyUrlPlugin extends UrlShortenerPlugin
 {
     public $serviceUrl;
diff --git a/plugins/LilUrl/LilUrlPlugin.php b/plugins/LilUrl/LilUrlPlugin.php
index c3e37c0c0f..cdff9f4e65 100644
--- a/plugins/LilUrl/LilUrlPlugin.php
+++ b/plugins/LilUrl/LilUrlPlugin.php
@@ -31,8 +31,6 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR.'/plugins/UrlShortener/UrlShortenerPlugin.php';
-
 class LilUrlPlugin extends UrlShortenerPlugin
 {
     public $serviceUrl;
diff --git a/plugins/PtitUrl/PtitUrlPlugin.php b/plugins/PtitUrl/PtitUrlPlugin.php
index ddba942e6d..cdf46846ba 100644
--- a/plugins/PtitUrl/PtitUrlPlugin.php
+++ b/plugins/PtitUrl/PtitUrlPlugin.php
@@ -30,7 +30,6 @@
 if (!defined('STATUSNET')) {
     exit(1);
 }
-require_once INSTALLDIR.'/plugins/UrlShortener/UrlShortenerPlugin.php';
 
 class PtitUrlPlugin extends UrlShortenerPlugin
 {
diff --git a/plugins/SimpleUrl/SimpleUrlPlugin.php b/plugins/SimpleUrl/SimpleUrlPlugin.php
index 6eac7dbb1e..5d3f97d33d 100644
--- a/plugins/SimpleUrl/SimpleUrlPlugin.php
+++ b/plugins/SimpleUrl/SimpleUrlPlugin.php
@@ -31,8 +31,6 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR.'/plugins/UrlShortener/UrlShortenerPlugin.php';
-
 class SimpleUrlPlugin extends UrlShortenerPlugin
 {
     public $serviceUrl;
diff --git a/plugins/TightUrl/TightUrlPlugin.php b/plugins/TightUrl/TightUrlPlugin.php
index e2d494a7bd..f242db6c80 100644
--- a/plugins/TightUrl/TightUrlPlugin.php
+++ b/plugins/TightUrl/TightUrlPlugin.php
@@ -31,8 +31,6 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR.'/plugins/UrlShortener/UrlShortenerPlugin.php';
-
 class TightUrlPlugin extends UrlShortenerPlugin
 {
     public $serviceUrl;

From 1e21af42a685f600f4a53f49a194013e78b12f20 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Mon, 26 Apr 2010 02:01:11 -0400
Subject: [PATCH 017/655] add more URL-shortening options to othersettings

---
 actions/othersettings.php           | 58 ++++++++++++++++++++++++++++-
 classes/User_urlshortener_prefs.php | 41 ++++++++++++++++++++
 2 files changed, 97 insertions(+), 2 deletions(-)

diff --git a/actions/othersettings.php b/actions/othersettings.php
index 10e9873b39..ba3bdd8872 100644
--- a/actions/othersettings.php
+++ b/actions/othersettings.php
@@ -98,8 +98,10 @@ class OthersettingsAction extends AccountSettingsAction
         $this->hidden('token', common_session_token());
         $this->elementStart('ul', 'form_data');
 
-        $shorteners = array();
+        $shorteners = array(_('[none]') => array('freeService' => false));
+
         Event::handle('GetUrlShorteners', array(&$shorteners));
+
         $services = array();
         foreach($shorteners as $name=>$value)
         {
@@ -119,8 +121,22 @@ class OthersettingsAction extends AccountSettingsAction
             $this->elementEnd('li');
         }
         $this->elementStart('li');
+        $this->input('maxurllength',
+                     _('URL longer than'),
+                     ($this->arg('maxurllength')) ?
+                     $this->arg('maxurllength') : User_urlshortener_prefs::maxUrlLength($user),
+                     _('URLs longer than this will be shortened.'));
+        $this->elementEnd('li');
+        $this->elementStart('li');
+        $this->input('maxnoticelength',
+                     _('Text longer than'),
+                     ($this->arg('maxnoticelength')) ?
+                     $this->arg('maxnoticelength') : User_urlshortener_prefs::maxNoticeLength($user),
+                     _('URLs in notices longer than this will be shortened.'));
+        $this->elementEnd('li');
+        $this->elementStart('li');
         $this->checkbox('viewdesigns', _('View profile designs'),
-                        $user->viewdesigns, _('Show or hide profile designs.'));
+                         -                        $user->viewdesigns, _('Show or hide profile designs.'));
         $this->elementEnd('li');
         $this->elementEnd('ul');
         $this->submit('save', _('Save'));
@@ -156,6 +172,18 @@ class OthersettingsAction extends AccountSettingsAction
 
         $viewdesigns = $this->boolean('viewdesigns');
 
+        $maxurllength = $this->trimmed('maxurllength');
+
+        if (!Validate::number($maxurllength, array('min' => 0))) {
+            throw new ClientException(_('Invalid number for max url length.'));
+        }
+
+        $maxnoticelength = $this->trimmed('maxnoticelength');
+
+        if (!Validate::number($maxnoticelength, array('min' => 0))) {
+            throw new ClientException(_('Invalid number for max notice length.'));
+        }
+
         $user = common_current_user();
 
         assert(!is_null($user)); // should already be checked
@@ -175,6 +203,32 @@ class OthersettingsAction extends AccountSettingsAction
             return;
         }
 
+        $prefs = User_urlshortener_prefs::getPrefs($user);
+        $orig  = null;
+
+        if (empty($prefs)) {
+            $prefs = new User_urlshortener_prefs();
+
+            $prefs->user_id = $user->id;
+            $prefs->created = common_sql_now();
+        } else {
+            $orig = clone($prefs);
+        }
+
+        $prefs->urlshorteningservice = $urlshorteningservice;
+        $prefs->maxurllength         = $maxurllength;
+        $prefs->maxnoticelength      = $maxnoticelength;
+
+        if (!empty($orig)) {
+            $result = $prefs->update($orig);
+        } else {
+            $result = $prefs->insert();
+        }
+
+        if (!$result) {
+            throw new ServerException(_('Error saving user URL shortening preferences.'));
+        }
+
         $user->query('COMMIT');
 
         $this->showForm(_('Preferences saved.'), true);
diff --git a/classes/User_urlshortener_prefs.php b/classes/User_urlshortener_prefs.php
index aef39e3719..3eb008a672 100755
--- a/classes/User_urlshortener_prefs.php
+++ b/classes/User_urlshortener_prefs.php
@@ -44,4 +44,45 @@ class User_urlshortener_prefs extends Memcached_DataObject
     {
         return array(false, false, false);
     }
+
+    static function maxUrlLength($user)
+    {
+        $def = common_config('url', 'maxlength');
+
+        $prefs = self::getPrefs($user);
+
+        if (empty($prefs)) {
+            return $def;
+        } else {
+            return $prefs->maxurllength;
+        }
+    }
+
+    static function maxNoticeLength($user)
+    {
+        $def = common_config('url', 'maxnoticelength');
+
+        if ($def == -1) {
+            $def = Notice::maxContent();
+        }
+
+        $prefs = self::getPrefs($user);
+
+        if (empty($prefs)) {
+            return $def;
+        } else {
+            return $prefs->maxnoticelength;
+        }
+    }
+
+    static function getPrefs($user)
+    {
+        if (empty($user)) {
+            return null;
+        }
+
+        $prefs = User_urlshortener_prefs::staticGet('user_id', $user->id);
+
+        return $prefs;
+    }
 }

From 767ff2f7ecfd7e76e8418fc79d45e61898f09382 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Mon, 26 Apr 2010 02:36:46 -0400
Subject: [PATCH 018/655] allow 0 or blank string in inputs

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

diff --git a/lib/htmloutputter.php b/lib/htmloutputter.php
index 7786b5941e..9d06ba23c9 100644
--- a/lib/htmloutputter.php
+++ b/lib/htmloutputter.php
@@ -176,7 +176,7 @@ class HTMLOutputter extends XMLOutputter
         $attrs = array('name' => $id,
                        'type' => 'text',
                        'id' => $id);
-        if ($value) {
+        if (!is_null($value)) { // value can be 0 or ''
             $attrs['value'] = $value;
         }
         $this->element('input', $attrs);

From a9c6a3bace0af44bcf38d1c790425a7be9c72147 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Mon, 26 Apr 2010 02:37:11 -0400
Subject: [PATCH 019/655] allow 0 in numeric entries in othersettings

---
 actions/othersettings.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/actions/othersettings.php b/actions/othersettings.php
index ba3bdd8872..8d6e004047 100644
--- a/actions/othersettings.php
+++ b/actions/othersettings.php
@@ -123,14 +123,14 @@ class OthersettingsAction extends AccountSettingsAction
         $this->elementStart('li');
         $this->input('maxurllength',
                      _('URL longer than'),
-                     ($this->arg('maxurllength')) ?
+                     (!is_null($this->arg('maxurllength'))) ?
                      $this->arg('maxurllength') : User_urlshortener_prefs::maxUrlLength($user),
                      _('URLs longer than this will be shortened.'));
         $this->elementEnd('li');
         $this->elementStart('li');
         $this->input('maxnoticelength',
                      _('Text longer than'),
-                     ($this->arg('maxnoticelength')) ?
+                     (!is_null($this->arg('maxnoticelength'))) ?
                      $this->arg('maxnoticelength') : User_urlshortener_prefs::maxNoticeLength($user),
                      _('URLs in notices longer than this will be shortened.'));
         $this->elementEnd('li');

From 4d29ca0b91201f6df42940297ed5b64b070efe49 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Mon, 26 Apr 2010 02:37:41 -0400
Subject: [PATCH 020/655] static method for getting best URL shortening service

---
 classes/User_urlshortener_prefs.php | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/classes/User_urlshortener_prefs.php b/classes/User_urlshortener_prefs.php
index 3eb008a672..e0f85af012 100755
--- a/classes/User_urlshortener_prefs.php
+++ b/classes/User_urlshortener_prefs.php
@@ -75,6 +75,23 @@ class User_urlshortener_prefs extends Memcached_DataObject
         }
     }
 
+    static function urlShorteningService($user)
+    {
+        $def = common_config('url', 'shortener');
+
+        $prefs = self::getPrefs($user);
+
+        if (empty($prefs)) {
+            if (!empty($user)) {
+                return $user->urlshorteningservice;
+            } else {
+                return $def;
+            }
+        } else {
+            return $prefs->urlshorteningservice;
+        }
+    }
+
     static function getPrefs($user)
     {
         if (empty($user)) {

From 1e1c851ff3cb2da5e0dc3a0b06239a9d9c618488 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Mon, 26 Apr 2010 02:38:40 -0400
Subject: [PATCH 021/655] add a method to force shortening URLs

---
 classes/File_redirection.php | 38 ++++++++++++++++++++++++++++++++----
 1 file changed, 34 insertions(+), 4 deletions(-)

diff --git a/classes/File_redirection.php b/classes/File_redirection.php
index f128b3e07c..00ec75309a 100644
--- a/classes/File_redirection.php
+++ b/classes/File_redirection.php
@@ -176,22 +176,52 @@ class File_redirection extends Memcached_DataObject
      * @param string $long_url
      * @return string
      */
-    function makeShort($long_url) {
 
+    function makeShort($long_url)
+    {
         $canon = File_redirection::_canonUrl($long_url);
 
         $short_url = File_redirection::_userMakeShort($canon);
 
         // Did we get one? Is it shorter?
-        if (!empty($short_url) && mb_strlen($short_url) < mb_strlen($long_url)) {
+
+        if (!empty($short_url)) {
             return $short_url;
         } else {
             return $long_url;
         }
     }
 
-    function _userMakeShort($long_url) {
-        $short_url = common_shorten_url($long_url);
+    /**
+     * Shorten a URL with the current user's configured shortening
+     * options, if applicable.
+     *
+     * If it cannot be shortened or the "short" URL is longer than the
+     * original, the original is returned.
+     *
+     * If the referenced item has not been seen before, embedding data
+     * may be saved.
+     *
+     * @param string $long_url
+     * @return string
+     */
+
+    function forceShort($long_url)
+    {
+        $canon = File_redirection::_canonUrl($long_url);
+
+        $short_url = File_redirection::_userMakeShort($canon, true);
+
+        // Did we get one? Is it shorter?
+        if (!empty($short_url)) {
+            return $short_url;
+        } else {
+            return $long_url;
+        }
+    }
+
+    function _userMakeShort($long_url, $force = false) {
+        $short_url = common_shorten_url($long_url, $force);
         if (!empty($short_url) && $short_url != $long_url) {
             $short_url = (string)$short_url;
             // store it

From d136b390115829c4391b3666bb1967f190a0de35 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Mon, 26 Apr 2010 02:39:00 -0400
Subject: [PATCH 022/655] use site and user settings to determine when to
 shorten URLs

---
 lib/util.php | 54 +++++++++++++++++++++++++++++++++++++---------------
 1 file changed, 39 insertions(+), 15 deletions(-)

diff --git a/lib/util.php b/lib/util.php
index 96d21bc59c..c78ed33bd5 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -828,9 +828,21 @@ function common_linkify($url) {
 
 function common_shorten_links($text)
 {
-    $maxLength = Notice::maxContent();
-    if ($maxLength == 0 || mb_strlen($text) <= $maxLength) return $text;
-    return common_replace_urls_callback($text, array('File_redirection', 'makeShort'));
+    common_debug("common_shorten_links() called");
+
+    $user = common_current_user();
+
+    $maxLength = User_urlshortener_prefs::maxNoticeLength($user);
+
+    common_debug("maxLength = $maxLength");
+
+    if (mb_strlen($text) > $maxLength) {
+        common_debug("Forcing shortening");
+        return common_replace_urls_callback($text, array('File_redirection', 'forceShort'));
+    } else {
+        common_debug("Not forcing shortening");
+        return common_replace_urls_callback($text, array('File_redirection', 'makeShort'));
+    }
 }
 
 function common_xml_safe_str($str)
@@ -1392,7 +1404,7 @@ function common_valid_tag($tag)
  * Determine if given domain or address literal is valid
  * eg for use in JIDs and URLs. Does not check if the domain
  * exists!
- * 
+ *
  * @param string $domain
  * @return boolean valid or not
  */
@@ -1734,30 +1746,42 @@ function common_database_tablename($tablename)
 /**
  * Shorten a URL with the current user's configured shortening service,
  * or ur1.ca if configured, or not at all if no shortening is set up.
- * Length is not considered.
  *
- * @param string $long_url
+ * @param string  $long_url original URL
+ * @param boolean $force    Force shortening (used when notice is too long)
+ *
  * @return string may return the original URL if shortening failed
  *
  * @fixme provide a way to specify a particular shortener
  * @fixme provide a way to specify to use a given user's shortening preferences
  */
-function common_shorten_url($long_url)
+
+function common_shorten_url($long_url, $force = false)
 {
+    common_debug("Shortening URL '$long_url' (force = $force)");
+
     $long_url = trim($long_url);
+
     $user = common_current_user();
-    if (empty($user)) {
-        // common current user does not find a user when called from the XMPP daemon
-        // therefore we'll set one here fix, so that XMPP given URLs may be shortened
-        $shortenerName = 'ur1.ca';
-    } else {
-        $shortenerName = $user->urlshorteningservice;
+
+    $maxUrlLength = User_urlshortener_prefs::maxUrlLength($user);
+    common_debug("maxUrlLength = $maxUrlLength");
+
+    // $force forces shortening even if it's not strictly needed
+
+    if (mb_strlen($long_url) < $maxUrlLength && !$force) {
+        common_debug("Skipped shortening URL.");
+        return $long_url;
     }
 
-    if(Event::handle('StartShortenUrl', array($long_url,$shortenerName,&$shortenedUrl))){
+    $shortenerName = User_urlshortener_prefs::urlShorteningService($user);
+
+    common_debug("Shortener name = '$shortenerName'");
+
+    if (Event::handle('StartShortenUrl', array($long_url, $shortenerName, &$shortenedUrl))) {
         //URL wasn't shortened, so return the long url
         return $long_url;
-    }else{
+    } else {
         //URL was shortened, so return the result
         return trim($shortenedUrl);
     }

From 14adb7cc41e3d5d4e543c1f13f7a60d3cadb5c71 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Mon, 26 Apr 2010 02:40:36 -0400
Subject: [PATCH 023/655] Give users more control over URL shortening

Users and administrators can set how long an URL can be before it's
shortened, and how long a notice can be before all its URLs are
shortened. They can also turn off shortening altogether.

Squashed commit of the following:

commit d136b390115829c4391b3666bb1967f190a0de35
Author: Evan Prodromou <evan@status.net>
Date:   Mon Apr 26 02:39:00 2010 -0400

    use site and user settings to determine when to shorten URLs

commit 1e1c851ff3cb2da5e0dc3a0b06239a9d9c618488
Author: Evan Prodromou <evan@status.net>
Date:   Mon Apr 26 02:38:40 2010 -0400

    add a method to force shortening URLs

commit 4d29ca0b91201f6df42940297ed5b64b070efe49
Author: Evan Prodromou <evan@status.net>
Date:   Mon Apr 26 02:37:41 2010 -0400

    static method for getting best URL shortening service

commit a9c6a3bace0af44bcf38d1c790425a7be9c72147
Author: Evan Prodromou <evan@status.net>
Date:   Mon Apr 26 02:37:11 2010 -0400

    allow 0 in numeric entries in othersettings

commit 767ff2f7ecfd7e76e8418fc79d45e61898f09382
Author: Evan Prodromou <evan@status.net>
Date:   Mon Apr 26 02:36:46 2010 -0400

    allow 0 or blank string in inputs

commit 1e21af42a685f600f4a53f49a194013e78b12f20
Author: Evan Prodromou <evan@status.net>
Date:   Mon Apr 26 02:01:11 2010 -0400

    add more URL-shortening options to othersettings

commit 869a6be0f5779aff69018d02f9ac0273946040d9
Author: Evan Prodromou <evan@status.net>
Date:   Sat Apr 24 14:22:51 2010 -0400

    move url shortener superclass to lib from plugin

commit 9c0c9863d532942b99184f14e923fc3c050f8177
Author: Evan Prodromou <evan@status.net>
Date:   Sat Apr 24 14:20:28 2010 -0400

    documentation and whitespace on UrlShortenerPlugin

commit 7a1dd5798f0fcf2c03d1257a18ddcb9008879de0
Author: Evan Prodromou <evan@status.net>
Date:   Sat Apr 24 14:05:46 2010 -0400

    add defaults for URL shortening

commit d259c37ad231ca0010c60e5cfd397bb1732874a4
Author: Evan Prodromou <evan@status.net>
Date:   Sat Apr 24 13:40:10 2010 -0400

    Add User_urlshortener_prefs

    Add a table for URL shortener prefs, a corresponding class, and the
    correct mumbo-jumbo in statusnet.ini to make everything work.
---
 README                                      |  20 ++-
 actions/othersettings.php                   |  58 +++++++-
 classes/File_redirection.php                |  38 ++++-
 classes/User_urlshortener_prefs.php         | 105 +++++++++++++
 classes/statusnet.ini                       |  11 ++
 db/statusnet.sql                            |  13 ++
 lib/default.php                             |   4 +
 lib/htmloutputter.php                       |   2 +-
 lib/urlshortenerplugin.php                  | 155 ++++++++++++++++++++
 lib/util.php                                |  54 +++++--
 plugins/BitlyUrl/BitlyUrlPlugin.php         |   2 -
 plugins/LilUrl/LilUrlPlugin.php             |   2 -
 plugins/PtitUrl/PtitUrlPlugin.php           |   1 -
 plugins/SimpleUrl/SimpleUrlPlugin.php       |   2 -
 plugins/TightUrl/TightUrlPlugin.php         |   2 -
 plugins/UrlShortener/UrlShortenerPlugin.php |  95 ------------
 16 files changed, 435 insertions(+), 129 deletions(-)
 create mode 100755 classes/User_urlshortener_prefs.php
 create mode 100644 lib/urlshortenerplugin.php
 delete mode 100644 plugins/UrlShortener/UrlShortenerPlugin.php

diff --git a/README b/README
index 1e244c4482..dcf305ea6f 100644
--- a/README
+++ b/README
@@ -843,9 +843,7 @@ sslserver: use an alternate server name for SSL URLs, like
     parameters correctly so that both the SSL server and the
     "normal" server can access the session cookie and
     preferably other cookies as well.
-shorturllength: Length of URL at which URLs in a message exceeding 140
-    characters will be sent to the user's chosen
-    shortening service.
+shorturllength: ignored. See 'url' section below.
 dupelimit: minimum time allowed for one person to say the same thing
     twice. Default 60s. Anything lower is considered a user
     or UI error.
@@ -1468,6 +1466,22 @@ disallow: Array of (virtual) directories to disallow. Default is 'main',
     'search', 'message', 'settings', 'admin'. Ignored when site
     is private, in which case the entire site ('/') is disallowed.
 
+url
+---
+
+Everybody loves URL shorteners. These are some options for fine-tuning
+how and when the server shortens URLs.
+
+shortener: URL shortening service to use by default. Users can override
+           individually. 'ur1.ca' by default.
+maxlength: If an URL is strictly longer than this limit, it will be
+           shortened. Note that the URL shortener service may return an
+           URL longer than this limit. Defaults to 25. Users can
+           override. If set to 0, all URLs will be shortened.
+maxnoticelength: If a notice is strictly longer than this limit, all
+           URLs in the notice will be shortened. Users can override.
+           -1 means the text limit for notices.
+
 Plugins
 =======
 
diff --git a/actions/othersettings.php b/actions/othersettings.php
index 10e9873b39..8d6e004047 100644
--- a/actions/othersettings.php
+++ b/actions/othersettings.php
@@ -98,8 +98,10 @@ class OthersettingsAction extends AccountSettingsAction
         $this->hidden('token', common_session_token());
         $this->elementStart('ul', 'form_data');
 
-        $shorteners = array();
+        $shorteners = array(_('[none]') => array('freeService' => false));
+
         Event::handle('GetUrlShorteners', array(&$shorteners));
+
         $services = array();
         foreach($shorteners as $name=>$value)
         {
@@ -119,8 +121,22 @@ class OthersettingsAction extends AccountSettingsAction
             $this->elementEnd('li');
         }
         $this->elementStart('li');
+        $this->input('maxurllength',
+                     _('URL longer than'),
+                     (!is_null($this->arg('maxurllength'))) ?
+                     $this->arg('maxurllength') : User_urlshortener_prefs::maxUrlLength($user),
+                     _('URLs longer than this will be shortened.'));
+        $this->elementEnd('li');
+        $this->elementStart('li');
+        $this->input('maxnoticelength',
+                     _('Text longer than'),
+                     (!is_null($this->arg('maxnoticelength'))) ?
+                     $this->arg('maxnoticelength') : User_urlshortener_prefs::maxNoticeLength($user),
+                     _('URLs in notices longer than this will be shortened.'));
+        $this->elementEnd('li');
+        $this->elementStart('li');
         $this->checkbox('viewdesigns', _('View profile designs'),
-                        $user->viewdesigns, _('Show or hide profile designs.'));
+                         -                        $user->viewdesigns, _('Show or hide profile designs.'));
         $this->elementEnd('li');
         $this->elementEnd('ul');
         $this->submit('save', _('Save'));
@@ -156,6 +172,18 @@ class OthersettingsAction extends AccountSettingsAction
 
         $viewdesigns = $this->boolean('viewdesigns');
 
+        $maxurllength = $this->trimmed('maxurllength');
+
+        if (!Validate::number($maxurllength, array('min' => 0))) {
+            throw new ClientException(_('Invalid number for max url length.'));
+        }
+
+        $maxnoticelength = $this->trimmed('maxnoticelength');
+
+        if (!Validate::number($maxnoticelength, array('min' => 0))) {
+            throw new ClientException(_('Invalid number for max notice length.'));
+        }
+
         $user = common_current_user();
 
         assert(!is_null($user)); // should already be checked
@@ -175,6 +203,32 @@ class OthersettingsAction extends AccountSettingsAction
             return;
         }
 
+        $prefs = User_urlshortener_prefs::getPrefs($user);
+        $orig  = null;
+
+        if (empty($prefs)) {
+            $prefs = new User_urlshortener_prefs();
+
+            $prefs->user_id = $user->id;
+            $prefs->created = common_sql_now();
+        } else {
+            $orig = clone($prefs);
+        }
+
+        $prefs->urlshorteningservice = $urlshorteningservice;
+        $prefs->maxurllength         = $maxurllength;
+        $prefs->maxnoticelength      = $maxnoticelength;
+
+        if (!empty($orig)) {
+            $result = $prefs->update($orig);
+        } else {
+            $result = $prefs->insert();
+        }
+
+        if (!$result) {
+            throw new ServerException(_('Error saving user URL shortening preferences.'));
+        }
+
         $user->query('COMMIT');
 
         $this->showForm(_('Preferences saved.'), true);
diff --git a/classes/File_redirection.php b/classes/File_redirection.php
index f128b3e07c..00ec75309a 100644
--- a/classes/File_redirection.php
+++ b/classes/File_redirection.php
@@ -176,22 +176,52 @@ class File_redirection extends Memcached_DataObject
      * @param string $long_url
      * @return string
      */
-    function makeShort($long_url) {
 
+    function makeShort($long_url)
+    {
         $canon = File_redirection::_canonUrl($long_url);
 
         $short_url = File_redirection::_userMakeShort($canon);
 
         // Did we get one? Is it shorter?
-        if (!empty($short_url) && mb_strlen($short_url) < mb_strlen($long_url)) {
+
+        if (!empty($short_url)) {
             return $short_url;
         } else {
             return $long_url;
         }
     }
 
-    function _userMakeShort($long_url) {
-        $short_url = common_shorten_url($long_url);
+    /**
+     * Shorten a URL with the current user's configured shortening
+     * options, if applicable.
+     *
+     * If it cannot be shortened or the "short" URL is longer than the
+     * original, the original is returned.
+     *
+     * If the referenced item has not been seen before, embedding data
+     * may be saved.
+     *
+     * @param string $long_url
+     * @return string
+     */
+
+    function forceShort($long_url)
+    {
+        $canon = File_redirection::_canonUrl($long_url);
+
+        $short_url = File_redirection::_userMakeShort($canon, true);
+
+        // Did we get one? Is it shorter?
+        if (!empty($short_url)) {
+            return $short_url;
+        } else {
+            return $long_url;
+        }
+    }
+
+    function _userMakeShort($long_url, $force = false) {
+        $short_url = common_shorten_url($long_url, $force);
         if (!empty($short_url) && $short_url != $long_url) {
             $short_url = (string)$short_url;
             // store it
diff --git a/classes/User_urlshortener_prefs.php b/classes/User_urlshortener_prefs.php
new file mode 100755
index 0000000000..e0f85af012
--- /dev/null
+++ b/classes/User_urlshortener_prefs.php
@@ -0,0 +1,105 @@
+<?php
+/*
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2010, StatusNet, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+if (!defined('STATUSNET') && !defined('LACONICA')) {
+    exit(1);
+}
+
+class User_urlshortener_prefs extends Memcached_DataObject
+{
+    ###START_AUTOCODE
+    /* the code below is auto generated do not remove the above tag */
+
+    public $__table = 'user_urlshortener_prefs';         // table name
+    public $user_id;                         // int(4)  primary_key not_null
+    public $urlshorteningservice;            // varchar(50)   default_ur1.ca
+    public $maxurllength;                    // int(4)   not_null
+    public $maxnoticelength;                 // int(4)   not_null
+    public $created;                         // datetime   not_null default_0000-00-00%2000%3A00%3A00
+    public $modified;                        // timestamp   not_null default_CURRENT_TIMESTAMP
+
+    /* Static get */
+    function staticGet($k,$v=NULL) { return Memcached_DataObject::staticGet('User_urlshortener_prefs',$k,$v); }
+
+    /* the code above is auto generated do not remove the tag below */
+    ###END_AUTOCODE
+
+    function sequenceKey()
+    {
+        return array(false, false, false);
+    }
+
+    static function maxUrlLength($user)
+    {
+        $def = common_config('url', 'maxlength');
+
+        $prefs = self::getPrefs($user);
+
+        if (empty($prefs)) {
+            return $def;
+        } else {
+            return $prefs->maxurllength;
+        }
+    }
+
+    static function maxNoticeLength($user)
+    {
+        $def = common_config('url', 'maxnoticelength');
+
+        if ($def == -1) {
+            $def = Notice::maxContent();
+        }
+
+        $prefs = self::getPrefs($user);
+
+        if (empty($prefs)) {
+            return $def;
+        } else {
+            return $prefs->maxnoticelength;
+        }
+    }
+
+    static function urlShorteningService($user)
+    {
+        $def = common_config('url', 'shortener');
+
+        $prefs = self::getPrefs($user);
+
+        if (empty($prefs)) {
+            if (!empty($user)) {
+                return $user->urlshorteningservice;
+            } else {
+                return $def;
+            }
+        } else {
+            return $prefs->urlshorteningservice;
+        }
+    }
+
+    static function getPrefs($user)
+    {
+        if (empty($user)) {
+            return null;
+        }
+
+        $prefs = User_urlshortener_prefs::staticGet('user_id', $user->id);
+
+        return $prefs;
+    }
+}
diff --git a/classes/statusnet.ini b/classes/statusnet.ini
index 473bd6ff5f..d13fdfa526 100644
--- a/classes/statusnet.ini
+++ b/classes/statusnet.ini
@@ -649,3 +649,14 @@ user_id = K
 transport = K
 transport = U
 screenname = U
+
+[user_urlshortener_prefs]
+user_id = 129
+urlshorteningservice = 2
+maxurllength = 129
+maxnoticelength = 129
+created = 142
+modified = 384
+
+[user_urlshortener_prefs__keys]
+user_id = K
diff --git a/db/statusnet.sql b/db/statusnet.sql
index 16d09a11f7..a0c497fff5 100644
--- a/db/statusnet.sql
+++ b/db/statusnet.sql
@@ -665,3 +665,16 @@ create table local_group (
    modified timestamp comment 'date this record was modified'
 
 ) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
+
+create table user_urlshortener_prefs (
+
+   user_id integer not null comment 'user' references user (id),
+   urlshorteningservice varchar(50) default 'ur1.ca' comment 'service to use for auto-shortening URLs',
+   maxurllength integer not null comment 'urls greater than this length will be shortened, 0 = always, null = never',
+   maxnoticelength integer not null comment 'notices with content greater than this value will have all urls shortened, 0 = always, null = never',
+
+   created datetime not null comment 'date this record was created',
+   modified timestamp comment 'date this record was modified',
+
+   constraint primary key (user_id)
+) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
diff --git a/lib/default.php b/lib/default.php
index c98f179ae1..dec08fc066 100644
--- a/lib/default.php
+++ b/lib/default.php
@@ -304,4 +304,8 @@ $default =
         array('subscribers' => true,
               'members' => true,
               'peopletag' => true),
+        'url' =>
+        array('shortener' => 'ur1.ca',
+              'maxlength' => 25,
+              'maxnoticelength' => -1)
         );
diff --git a/lib/htmloutputter.php b/lib/htmloutputter.php
index 7786b5941e..9d06ba23c9 100644
--- a/lib/htmloutputter.php
+++ b/lib/htmloutputter.php
@@ -176,7 +176,7 @@ class HTMLOutputter extends XMLOutputter
         $attrs = array('name' => $id,
                        'type' => 'text',
                        'id' => $id);
-        if ($value) {
+        if (!is_null($value)) { // value can be 0 or ''
             $attrs['value'] = $value;
         }
         $this->element('input', $attrs);
diff --git a/lib/urlshortenerplugin.php b/lib/urlshortenerplugin.php
new file mode 100644
index 0000000000..8acfac26f4
--- /dev/null
+++ b/lib/urlshortenerplugin.php
@@ -0,0 +1,155 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Superclass for plugins that do URL shortening
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category Plugin
+ * @package  StatusNet
+ * @author   Craig Andrews <candrews@integralblue.com>
+ * @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);
+}
+
+/**
+ * Superclass for plugins that do URL shortening
+ *
+ * @category Plugin
+ * @package  StatusNet
+ * @author   Craig Andrews <candrews@integralblue.com>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://status.net/
+ */
+
+abstract class UrlShortenerPlugin extends Plugin
+{
+    public $shortenerName;
+    public $freeService = false;
+
+    // Url Shortener plugins should implement some (or all)
+    // of these methods
+
+    /**
+     * Make an URL shorter.
+     *
+     * @param string $url URL to shorten
+     *
+     * @return string shortened version of the url, or null on failure
+     */
+
+    protected abstract function shorten($url);
+
+    /**
+     * Utility to get the data at an URL
+     *
+     * @param string $url URL to fetch
+     *
+     * @return string response body
+     *
+     * @todo rename to code-standard camelCase httpGet()
+     */
+
+    protected function http_get($url)
+    {
+        $request  = HTTPClient::start();
+        $response = $request->get($url);
+        return $response->getBody();
+    }
+
+    /**
+     * Utility to post a request and get a response URL
+     *
+     * @param string $url  URL to fetch
+     * @param array  $data post parameters
+     *
+     * @return string response body
+     *
+     * @todo rename to code-standard httpPost()
+     */
+
+    protected function http_post($url, $data)
+    {
+        $request  = HTTPClient::start();
+        $response = $request->post($url, null, $data);
+        return $response->getBody();
+    }
+
+    // Hook handlers
+
+    /**
+     * Called when all plugins have been initialized
+     *
+     * @return boolean hook value
+     */
+
+    function onInitializePlugin()
+    {
+        if (!isset($this->shortenerName)) {
+            throw new Exception("must specify a shortenerName");
+        }
+        return true;
+    }
+
+    /**
+     * Called when a showing the URL shortener drop-down box
+     *
+     * Properties of the shortening service currently only
+     * include whether it's a free service.
+     *
+     * @param array &$shorteners array mapping shortener name to properties
+     *
+     * @return boolean hook value
+     */
+
+    function onGetUrlShorteners(&$shorteners)
+    {
+        $shorteners[$this->shortenerName] =
+          array('freeService' => $this->freeService);
+        return true;
+    }
+
+    /**
+     * Called to shorten an URL
+     *
+     * @param string $url           URL to shorten
+     * @param string $shortenerName Shortening service. Don't handle if it's
+     *                              not you!
+     * @param string &$shortenedUrl URL after shortening; out param.
+     *
+     * @return boolean hook value
+     */
+
+    function onStartShortenUrl($url, $shortenerName, &$shortenedUrl)
+    {
+        if ($shortenerName == $this->shortenerName) {
+            $result = $this->shorten($url);
+            if (isset($result) && $result != null && $result !== false) {
+                $shortenedUrl = $result;
+                common_log(LOG_INFO,
+                           __CLASS__ . ": $this->shortenerName ".
+                           "shortened $url to $shortenedUrl");
+                return false;
+            }
+        }
+        return true;
+    }
+}
diff --git a/lib/util.php b/lib/util.php
index 96d21bc59c..c78ed33bd5 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -828,9 +828,21 @@ function common_linkify($url) {
 
 function common_shorten_links($text)
 {
-    $maxLength = Notice::maxContent();
-    if ($maxLength == 0 || mb_strlen($text) <= $maxLength) return $text;
-    return common_replace_urls_callback($text, array('File_redirection', 'makeShort'));
+    common_debug("common_shorten_links() called");
+
+    $user = common_current_user();
+
+    $maxLength = User_urlshortener_prefs::maxNoticeLength($user);
+
+    common_debug("maxLength = $maxLength");
+
+    if (mb_strlen($text) > $maxLength) {
+        common_debug("Forcing shortening");
+        return common_replace_urls_callback($text, array('File_redirection', 'forceShort'));
+    } else {
+        common_debug("Not forcing shortening");
+        return common_replace_urls_callback($text, array('File_redirection', 'makeShort'));
+    }
 }
 
 function common_xml_safe_str($str)
@@ -1392,7 +1404,7 @@ function common_valid_tag($tag)
  * Determine if given domain or address literal is valid
  * eg for use in JIDs and URLs. Does not check if the domain
  * exists!
- * 
+ *
  * @param string $domain
  * @return boolean valid or not
  */
@@ -1734,30 +1746,42 @@ function common_database_tablename($tablename)
 /**
  * Shorten a URL with the current user's configured shortening service,
  * or ur1.ca if configured, or not at all if no shortening is set up.
- * Length is not considered.
  *
- * @param string $long_url
+ * @param string  $long_url original URL
+ * @param boolean $force    Force shortening (used when notice is too long)
+ *
  * @return string may return the original URL if shortening failed
  *
  * @fixme provide a way to specify a particular shortener
  * @fixme provide a way to specify to use a given user's shortening preferences
  */
-function common_shorten_url($long_url)
+
+function common_shorten_url($long_url, $force = false)
 {
+    common_debug("Shortening URL '$long_url' (force = $force)");
+
     $long_url = trim($long_url);
+
     $user = common_current_user();
-    if (empty($user)) {
-        // common current user does not find a user when called from the XMPP daemon
-        // therefore we'll set one here fix, so that XMPP given URLs may be shortened
-        $shortenerName = 'ur1.ca';
-    } else {
-        $shortenerName = $user->urlshorteningservice;
+
+    $maxUrlLength = User_urlshortener_prefs::maxUrlLength($user);
+    common_debug("maxUrlLength = $maxUrlLength");
+
+    // $force forces shortening even if it's not strictly needed
+
+    if (mb_strlen($long_url) < $maxUrlLength && !$force) {
+        common_debug("Skipped shortening URL.");
+        return $long_url;
     }
 
-    if(Event::handle('StartShortenUrl', array($long_url,$shortenerName,&$shortenedUrl))){
+    $shortenerName = User_urlshortener_prefs::urlShorteningService($user);
+
+    common_debug("Shortener name = '$shortenerName'");
+
+    if (Event::handle('StartShortenUrl', array($long_url, $shortenerName, &$shortenedUrl))) {
         //URL wasn't shortened, so return the long url
         return $long_url;
-    }else{
+    } else {
         //URL was shortened, so return the result
         return trim($shortenedUrl);
     }
diff --git a/plugins/BitlyUrl/BitlyUrlPlugin.php b/plugins/BitlyUrl/BitlyUrlPlugin.php
index f7f28b4d6c..b649d3d0b2 100644
--- a/plugins/BitlyUrl/BitlyUrlPlugin.php
+++ b/plugins/BitlyUrl/BitlyUrlPlugin.php
@@ -31,8 +31,6 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR.'/plugins/UrlShortener/UrlShortenerPlugin.php';
-
 class BitlyUrlPlugin extends UrlShortenerPlugin
 {
     public $serviceUrl;
diff --git a/plugins/LilUrl/LilUrlPlugin.php b/plugins/LilUrl/LilUrlPlugin.php
index c3e37c0c0f..cdff9f4e65 100644
--- a/plugins/LilUrl/LilUrlPlugin.php
+++ b/plugins/LilUrl/LilUrlPlugin.php
@@ -31,8 +31,6 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR.'/plugins/UrlShortener/UrlShortenerPlugin.php';
-
 class LilUrlPlugin extends UrlShortenerPlugin
 {
     public $serviceUrl;
diff --git a/plugins/PtitUrl/PtitUrlPlugin.php b/plugins/PtitUrl/PtitUrlPlugin.php
index ddba942e6d..cdf46846ba 100644
--- a/plugins/PtitUrl/PtitUrlPlugin.php
+++ b/plugins/PtitUrl/PtitUrlPlugin.php
@@ -30,7 +30,6 @@
 if (!defined('STATUSNET')) {
     exit(1);
 }
-require_once INSTALLDIR.'/plugins/UrlShortener/UrlShortenerPlugin.php';
 
 class PtitUrlPlugin extends UrlShortenerPlugin
 {
diff --git a/plugins/SimpleUrl/SimpleUrlPlugin.php b/plugins/SimpleUrl/SimpleUrlPlugin.php
index 6eac7dbb1e..5d3f97d33d 100644
--- a/plugins/SimpleUrl/SimpleUrlPlugin.php
+++ b/plugins/SimpleUrl/SimpleUrlPlugin.php
@@ -31,8 +31,6 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR.'/plugins/UrlShortener/UrlShortenerPlugin.php';
-
 class SimpleUrlPlugin extends UrlShortenerPlugin
 {
     public $serviceUrl;
diff --git a/plugins/TightUrl/TightUrlPlugin.php b/plugins/TightUrl/TightUrlPlugin.php
index e2d494a7bd..f242db6c80 100644
--- a/plugins/TightUrl/TightUrlPlugin.php
+++ b/plugins/TightUrl/TightUrlPlugin.php
@@ -31,8 +31,6 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR.'/plugins/UrlShortener/UrlShortenerPlugin.php';
-
 class TightUrlPlugin extends UrlShortenerPlugin
 {
     public $serviceUrl;
diff --git a/plugins/UrlShortener/UrlShortenerPlugin.php b/plugins/UrlShortener/UrlShortenerPlugin.php
deleted file mode 100644
index 027624b7ae..0000000000
--- a/plugins/UrlShortener/UrlShortenerPlugin.php
+++ /dev/null
@@ -1,95 +0,0 @@
-<?php
-/**
- * StatusNet, the distributed open-source microblogging tool
- *
- * Superclass for plugins that do URL shortening
- *
- * PHP version 5
- *
- * LICENCE: This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * @category  Plugin
- * @package   StatusNet
- * @author    Craig Andrews <candrews@integralblue.com>
- * @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);
-}
-
-/**
- * Superclass for plugins that do URL shortening
- *
- * @category Plugin
- * @package  StatusNet
- * @author   Craig Andrews <candrews@integralblue.com>
- * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://status.net/
- */
-
-abstract class UrlShortenerPlugin extends Plugin
-{
-    public $shortenerName;
-    public $freeService=false;
-    //------------Url Shortener plugin should implement some (or all) of these methods------------\\
-
-    /**
-    * Short a URL
-    * @param url
-    * @return string shortened version of the url, or null if URL shortening failed
-    */
-    protected abstract function shorten($url);
-
-    //------------These methods may help you implement your plugin------------\\
-    protected function http_get($url)
-    {
-        $request = HTTPClient::start();
-        $response = $request->get($url);
-        return $response->getBody();
-    }
-
-    protected function http_post($url,$data)
-    {
-        $request = HTTPClient::start();
-        $response = $request->post($url, null, $data);
-        return $response->getBody();
-    }
-
-    //------------Below are the methods that connect StatusNet to the implementing Url Shortener plugin------------\\
-
-    function onInitializePlugin(){
-        if(!isset($this->shortenerName)){
-            throw new Exception("must specify a shortenerName");
-        }
-    }
-
-    function onGetUrlShorteners(&$shorteners)
-    {
-        $shorteners[$this->shortenerName]=array('freeService'=>$this->freeService);
-    }
-
-    function onStartShortenUrl($url,$shortenerName,&$shortenedUrl)
-    {
-        if($shortenerName == $this->shortenerName && strlen($url) >= common_config('site', 'shorturllength')){
-            $result = $this->shorten($url);
-            if(isset($result) && $result != null && $result !== false){
-                $shortenedUrl=$result;
-                common_log(LOG_INFO, __CLASS__ . ": $this->shortenerName shortened $url to $shortenedUrl");
-                return false;
-            }
-        }
-    }
-}

From 5414396a2ee9f1401d69b60969e04a1941e24e21 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Fri, 30 Apr 2010 14:41:54 -0700
Subject: [PATCH 024/655] IM cleanup on 1.0.x branch: * Fake_XMPP back to
 Queued_XMPP, refactor how we use it and don't create objects and load classes
 until we need them. * fix fatal error in IM settings while waiting for a
 Jabber confirmation. * Caching fix for user_im_prefs * fix for saving
 multiple transport settings * some fixes for AIM & using normalized addresses
 for lookups

---
 actions/imsettings.php                        | 17 ++++++------
 classes/User_im_prefs.php                     | 23 ++++++++++++++++
 classes/statusnet.ini                         |  6 +++--
 lib/implugin.php                              | 25 ++++++++++++-----
 plugins/Aim/AimPlugin.php                     |  9 ++++++-
 plugins/Aim/README                            |  2 +-
 .../Xmpp/{Fake_XMPP.php => Queued_XMPP.php}   | 17 ++++++++----
 plugins/Xmpp/XmppPlugin.php                   | 27 ++++++++++---------
 8 files changed, 89 insertions(+), 37 deletions(-)
 rename plugins/Xmpp/{Fake_XMPP.php => Queued_XMPP.php} (87%)

diff --git a/actions/imsettings.php b/actions/imsettings.php
index 2c2606b76c..662b1063e7 100644
--- a/actions/imsettings.php
+++ b/actions/imsettings.php
@@ -133,8 +133,7 @@ class ImsettingsAction extends ConnectSettingsAction
                                              'message with further instructions. '.
                                              '(Did you add %s to your buddy list?)'),
                                              $transport_info['display'],
-                                             $transport_info['daemon_screenname'],
-                                             jabber_daemon_address()));
+                                             $transport_info['daemon_screenname']));
                     $this->hidden('screenname', $confirm->address);
                     // TRANS: Button label to cancel an IM address confirmation procedure.
                     $this->submit('cancel', _m('BUTTON','Cancel'));
@@ -163,12 +162,11 @@ class ImsettingsAction extends ConnectSettingsAction
                                               'action' =>
                                               common_local_url('imsettings')));
             $this->elementStart('fieldset', array('id' => 'settings_im_preferences'));
-            $this->element('legend', null, _('Preferences'));
+            // TRANS: Header for IM preferences form.
+            $this->element('legend', null, _('IM Preferences'));
             $this->hidden('token', common_session_token());
             $this->elementStart('table');
             $this->elementStart('tr');
-            // TRANS: Header for IM preferences form.
-            $this->element('th', null, _('IM Preferences'));
             foreach($user_im_prefs_by_transport as $transport=>$user_im_prefs)
             {
                 $this->element('th', null, $transports[$transport]['display']);
@@ -278,19 +276,20 @@ class ImsettingsAction extends ConnectSettingsAction
         $user = common_current_user();
 
         $user_im_prefs = new User_im_prefs();
+        $user_im_prefs->query('BEGIN');
         $user_im_prefs->user_id = $user->id;
         if($user_im_prefs->find() && $user_im_prefs->fetch())
         {
             $preferences = array('notify', 'updatefrompresence', 'replies', 'microid');
-            $user_im_prefs->query('BEGIN');
             do
             {
                 $original = clone($user_im_prefs);
+                $new = clone($user_im_prefs);
                 foreach($preferences as $preference)
                 {
-                    $user_im_prefs->$preference = $this->boolean($user_im_prefs->transport . '_' . $preference);
+                    $new->$preference = $this->boolean($new->transport . '_' . $preference);
                 }
-                $result = $user_im_prefs->update($original);
+                $result = $new->update($original);
 
                 if ($result === false) {
                     common_log_db_error($user, 'UPDATE', __FILE__);
@@ -299,8 +298,8 @@ class ImsettingsAction extends ConnectSettingsAction
                     return;
                 }
             }while($user_im_prefs->fetch());
-            $user_im_prefs->query('COMMIT');
         }
+        $user_im_prefs->query('COMMIT');
         // TRANS: Confirmation message for successful IM preferences save.
         $this->showForm(_('Preferences saved.'), true);
     }
diff --git a/classes/User_im_prefs.php b/classes/User_im_prefs.php
index 8ecdfe9fab..75be8969e0 100644
--- a/classes/User_im_prefs.php
+++ b/classes/User_im_prefs.php
@@ -68,4 +68,27 @@ class User_im_prefs extends Memcached_DataObject
     {
         return array(false,false);
     }
+
+    /**
+     * 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;
+    }
+
 }
diff --git a/classes/statusnet.ini b/classes/statusnet.ini
index d13fdfa526..b57d862263 100644
--- a/classes/statusnet.ini
+++ b/classes/statusnet.ini
@@ -647,8 +647,10 @@ modified = 384
 [user_im_prefs__keys]
 user_id = K
 transport = K
-transport = U
-screenname = U
+; There's another unique index on (transport, screenname)
+; but we have no way to represent a compound index other than
+; the primary key in here. To ensure proper cache purging,
+; we need to tweak the class.
 
 [user_urlshortener_prefs]
 user_id = 129
diff --git a/lib/implugin.php b/lib/implugin.php
index 7302859a47..7125aaee8d 100644
--- a/lib/implugin.php
+++ b/lib/implugin.php
@@ -107,10 +107,15 @@ abstract class ImPlugin extends Plugin
      * receive a raw message
      * Raw IM data is taken from the incoming queue, and passed to this function.
      * It should parse the raw message and call handle_incoming()
+     * 
+     * Returning false may CAUSE REPROCESSING OF THE QUEUE ITEM, and should
+     * be used for temporary failures only. For permanent failures such as
+     * unrecognized addresses, return true to indicate your processing has
+     * completed.
      *
      * @param object $data raw IM data
      *
-     * @return boolean success value
+     * @return boolean true if processing completed, false for temporary failures
      */
     abstract function receive_raw_message($data);
 
@@ -185,9 +190,12 @@ abstract class ImPlugin extends Plugin
      */
     function get_user_im_prefs_from_screenname($screenname)
     {
-        if($user_im_prefs = User_im_prefs::pkeyGet( array('transport' => $this->transport, 'screenname' => $screenname) )){
+        $user_im_prefs = User_im_prefs::pkeyGet(
+            array('transport' => $this->transport,
+                  'screenname' => $this->normalize($screenname)));
+        if ($user_im_prefs) {
             return $user_im_prefs;
-        }else{
+        } else {
             return false;
         }
     }
@@ -203,9 +211,9 @@ abstract class ImPlugin extends Plugin
     function get_screenname($user)
     {
         $user_im_prefs = $this->get_user_im_prefs_from_user($user);
-        if($user_im_prefs){
+        if ($user_im_prefs) {
             return $user_im_prefs->screenname;
-        }else{
+        } else {
             return false;
         }
     }
@@ -220,9 +228,12 @@ abstract class ImPlugin extends Plugin
      */
     function get_user_im_prefs_from_user($user)
     {
-        if($user_im_prefs = User_im_prefs::pkeyGet( array('transport' => $this->transport, 'user_id' => $user->id) )){
+        $user_im_prefs = User_im_prefs::pkeyGet(
+            array('transport' => $this->transport,
+                  'user_id' => $user->id));
+        if ($user_im_prefs){
             return $user_im_prefs;
-        }else{
+        } else {
             return false;
         }
     }
diff --git a/plugins/Aim/AimPlugin.php b/plugins/Aim/AimPlugin.php
index 3855d1fb05..30da1dbc79 100644
--- a/plugins/Aim/AimPlugin.php
+++ b/plugins/Aim/AimPlugin.php
@@ -126,6 +126,11 @@ class AimPlugin extends ImPlugin
         return true;
     }
 
+    /**
+     * Accept a queued input message.
+     *
+     * @return true if processing completed, false if message should be reprocessed
+     */
     function receive_raw_message($message)
     {
         $info=Aim::getMessageInfo($message);
@@ -133,7 +138,9 @@ class AimPlugin extends ImPlugin
         $user = $this->get_user($from);
         $notice_text = $info['message'];
 
-        return $this->handle_incoming($from, $notice_text);
+        $this->handle_incoming($from, $notice_text);
+
+        return true;
     }
 
     function initialize(){
diff --git a/plugins/Aim/README b/plugins/Aim/README
index 0465917383..7d486a0366 100644
--- a/plugins/Aim/README
+++ b/plugins/Aim/README
@@ -6,7 +6,7 @@ add "addPlugin('aim',
     array('setting'=>'value', 'setting2'=>'value2', ...);"
 to the bottom of your config.php
 
-The daemon included with this plugin must be running. It will be started by
+scripts/imdaemon.php included with StatusNet must be running. It will be started by
 the plugin along with their other daemons when you run scripts/startdaemons.sh.
 See the StatusNet README for more about queuing and daemons.
 
diff --git a/plugins/Xmpp/Fake_XMPP.php b/plugins/Xmpp/Queued_XMPP.php
similarity index 87%
rename from plugins/Xmpp/Fake_XMPP.php
rename to plugins/Xmpp/Queued_XMPP.php
index 0f7cfd3b4d..73eff22467 100644
--- a/plugins/Xmpp/Fake_XMPP.php
+++ b/plugins/Xmpp/Queued_XMPP.php
@@ -2,7 +2,7 @@
 /**
  * StatusNet, the distributed open-source microblogging tool
  *
- * Instead of sending XMPP messages, retrieve the raw XML that would be sent
+ * Queue-mediated proxy class for outgoing XMPP messages.
  *
  * PHP version 5
  *
@@ -31,13 +31,17 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
-class Fake_XMPP extends XMPPHP_XMPP
+class Queued_XMPP extends XMPPHP_XMPP
 {
-    public $would_be_sent = null;
+    /**
+     * Reference to the XmppPlugin object we're hooked up to.
+     */
+    public $plugin;
 
 	/**
 	 * Constructor
 	 *
+     * @param XmppPlugin $plugin
 	 * @param string  $host
 	 * @param integer $port
 	 * @param string  $user
@@ -47,8 +51,10 @@ class Fake_XMPP extends XMPPHP_XMPP
 	 * @param boolean $printlog
 	 * @param string  $loglevel
 	 */
-	public function __construct($host, $port, $user, $password, $resource, $server = null, $printlog = false, $loglevel = null)
+	public function __construct($plugin, $host, $port, $user, $password, $resource, $server = null, $printlog = false, $loglevel = null)
 	{
+        $this->plugin = $plugin;
+
         parent::__construct($host, $port, $user, $password, $resource, $server, $printlog, $loglevel);
 
         // We use $host to connect, but $server to build JIDs if specified.
@@ -73,7 +79,7 @@ class Fake_XMPP extends XMPPHP_XMPP
      */
     public function send($msg, $timeout=NULL)
     {
-        $this->would_be_sent = $msg;
+        $this->plugin->enqueue_outgoing_raw($msg);
     }
 
     //@{
@@ -110,5 +116,6 @@ class Fake_XMPP extends XMPPHP_XMPP
         throw new Exception("Can't read stream from fake XMPP.");
     }
     //@}
+
 }
 
diff --git a/plugins/Xmpp/XmppPlugin.php b/plugins/Xmpp/XmppPlugin.php
index 03bf47feac..a2521536bc 100644
--- a/plugins/Xmpp/XmppPlugin.php
+++ b/plugins/Xmpp/XmppPlugin.php
@@ -60,8 +60,6 @@ class XmppPlugin extends ImPlugin
 
     public $transport = 'xmpp';
 
-    protected $fake_xmpp;
-
     function getDisplayName(){
         return _m('XMPP/Jabber/GTalk');
     }
@@ -292,7 +290,7 @@ class XmppPlugin extends ImPlugin
             require_once 'XMPP.php';
             return false;
         case 'Sharing_XMPP':
-        case 'Fake_XMPP':
+        case 'Queued_XMPP':
             require_once $dir . '/'.$cls.'.php';
             return false;
         case 'XmppManager':
@@ -317,9 +315,7 @@ class XmppPlugin extends ImPlugin
 
     function send_message($screenname, $body)
     {
-        $this->fake_xmpp->message($screenname, $body, 'chat');
-        $this->enqueue_outgoing_raw($this->fake_xmpp->would_be_sent);
-        return true;
+        $this->queuedConnection()->message($screenname, $body, 'chat');
     }
 
     function send_notice($screenname, $notice)
@@ -327,8 +323,7 @@ class XmppPlugin extends ImPlugin
         $msg   = $this->format_notice($notice);
         $entry = $this->format_entry($notice);
         
-        $this->fake_xmpp->message($screenname, $msg, 'chat', null, $entry);
-        $this->enqueue_outgoing_raw($this->fake_xmpp->would_be_sent);
+        $this->queuedConnection()->message($screenname, $msg, 'chat', null, $entry);
         return true;
     }
 
@@ -385,10 +380,19 @@ class XmppPlugin extends ImPlugin
             return true;
         }
 
-        return $this->handle_incoming($from, $pl['body']);
+        $this->handle_incoming($from, $pl['body']);
+        
+        return true;
     }
 
-    function initialize(){
+    /**
+     * Build a queue-proxied XMPP interface object. Any outgoing messages
+     * will be run back through us for enqueing rather than sent directly.
+     * 
+     * @return Queued_XMPP
+     * @throws Exception if server settings are invalid.
+     */
+    function queuedConnection(){
         if(!isset($this->server)){
             throw new Exception("must specify a server");
         }
@@ -402,7 +406,7 @@ class XmppPlugin extends ImPlugin
             throw new Exception("must specify a password");
         }
 
-        $this->fake_xmpp = new Fake_XMPP($this->host ?
+        return new Queued_XMPP($this, $this->host ?
                                     $this->host :
                                     $this->server,
                                     $this->port,
@@ -415,7 +419,6 @@ class XmppPlugin extends ImPlugin
                                     $this->debug ?
                                     XMPPHP_Log::LEVEL_VERBOSE :  null
                                     );
-        return true;
     }
 
     function onPluginVersion(&$versions)

From 081ee9b29c7e4b207633aec0219b5a5b1ef36800 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Mon, 3 May 2010 16:49:59 -0700
Subject: [PATCH 025/655] extlibs updates: PEAR::Mail to 1.2.0, PEAR::Net_SMTP
 to 1.4.2 (need to go together as a pair)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

PEAR::Mail updated to 1.2.0 from 1.1.4, fixes deprecation warnings on PHP 5.3, as well as:
1.2.0:
• QA release - stable.
• Updated minimum dependencies (Net_SMTP, PEAR, PHP)
• Doc Bug #15620 Licence change to BSD
• Bug #13659 Mail parse error in special condition
• Bug #16200 - Security hole allow to read/write Arbitrary File
_hasUnclosedQuotes() doesn't properly handle a double slash before an end quote (slusarz@curecanti.org, Bug #9137).
• Make sure Net_SMTP is defined when calling getSMTPObject() directly (slusarz@curecanti.org, Bug #13772).
• Add addServiceExtensionParameter() to the SMTP driver (slusarz@curecanti.org, Bug #13764).
• Add a method to obtain the Net_SMTP object from the SMTP driver (slusarz@curecanti.org, Bug #13766).

PEAR::Net_SMTP updated to 1.4.2 from 1.3.1, needed to support updated PEAR::Mail:
1.4.2:
• Fixing header string quoting in data(). (Bug #17199)
1.4.1:
• The auth() method now includes an optional $tls parameter that determines whether or not TLS should be attempted (if supported by the PHP runtime and the remote SMTP server). This parameter defaults to true. (Bug #16349)
• Header data can be specified separately from message body data by passing it as the optional second parameter to ``data()``. This is especially useful when an open file resource is being used to supply message data because it allows header fields (like *Subject:*) to be built dynamically at runtime. (Request #17012)
1.4.0:
• The data() method now accepts either a string or a file resource containing the message data. (Request #16962)
1.3.4:
• All Net_Socket write failures are now recognized. (Bug #16831)
1.3.3:
• Added getGreeting(), for retrieving the server's greeting string. (Request #16066) [needed for PEAR::Mail]
• We no longer attempt a TLS connection if we're already using a secure socket. (Bug #16254)
• You can now specify a debug output handler via setDebug(). (Request #16420)
1.3.2:
• TLS connection only gets started if no AUTH methods are sent. (Bug #14944)
---
 extlib/Mail.php          |  82 +++++++++++-----
 extlib/Mail/RFC822.php   |  83 +++++++++-------
 extlib/Mail/mail.php     |  63 +++++++++----
 extlib/Mail/mock.php     |  64 +++++++++----
 extlib/Mail/null.php     |  64 +++++++++----
 extlib/Mail/sendmail.php |   7 +-
 extlib/Mail/smtp.php     |  73 +++++++++++----
 extlib/Mail/smtpmx.php   |  44 +++++++--
 extlib/Net/SMTP.php      | 198 ++++++++++++++++++++++++++++++---------
 9 files changed, 481 insertions(+), 197 deletions(-)
 mode change 100644 => 100755 extlib/Mail.php
 mode change 100644 => 100755 extlib/Mail/RFC822.php
 mode change 100644 => 100755 extlib/Mail/mail.php
 mode change 100644 => 100755 extlib/Mail/mock.php
 mode change 100644 => 100755 extlib/Mail/null.php
 mode change 100644 => 100755 extlib/Mail/sendmail.php
 mode change 100644 => 100755 extlib/Mail/smtp.php
 mode change 100644 => 100755 extlib/Mail/smtpmx.php

diff --git a/extlib/Mail.php b/extlib/Mail.php
old mode 100644
new mode 100755
index 3a0c1a9cb8..75132ac2a6
--- a/extlib/Mail.php
+++ b/extlib/Mail.php
@@ -1,22 +1,47 @@
 <?php
-//
-// +----------------------------------------------------------------------+
-// | PHP Version 4                                                        |
-// +----------------------------------------------------------------------+
-// | Copyright (c) 1997-2003 The PHP Group                                |
-// +----------------------------------------------------------------------+
-// | This source file is subject to version 2.02 of the PHP license,      |
-// | that is bundled with this package in the file LICENSE, and is        |
-// | available at through the world-wide-web at                           |
-// | http://www.php.net/license/2_02.txt.                                 |
-// | If you did not receive a copy of the PHP license and are unable to   |
-// | obtain it through the world-wide-web, please send a note to          |
-// | license@php.net so we can mail you a copy immediately.               |
-// +----------------------------------------------------------------------+
-// | Author: Chuck Hagenbuch <chuck@horde.org>                            |
-// +----------------------------------------------------------------------+
-//
-// $Id: Mail.php,v 1.17 2006/09/15 03:41:18 jon Exp $
+/**
+ *  PEAR's Mail:: interface.
+ *
+ * PHP versions 4 and 5
+ *
+ * LICENSE:
+ *
+ * Copyright (c) 2002-2007, Richard Heyes
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * o Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * o Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * o The names of the authors may not be used to endorse or promote
+ *   products derived from this software without specific prior written
+ *   permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @category    Mail
+ * @package     Mail
+ * @author      Chuck Hagenbuch <chuck@horde.org>
+ * @copyright   1997-2010 Chuck Hagenbuch
+ * @license     http://opensource.org/licenses/bsd-license.php New BSD License
+ * @version     CVS: $Id: Mail.php 294747 2010-02-08 08:18:33Z clockwerx $
+ * @link        http://pear.php.net/package/Mail/
+ */
 
 require_once 'PEAR.php';
 
@@ -26,7 +51,7 @@ require_once 'PEAR.php';
  * useful in multiple mailer backends.
  *
  * @access public
- * @version $Revision: 1.17 $
+ * @version $Revision: 294747 $
  * @package Mail
  */
 class Mail
@@ -82,12 +107,20 @@ class Mail
      * @return mixed Returns true on success, or a PEAR_Error
      *               containing a descriptive error message on
      *               failure.
+     *
      * @access public
      * @deprecated use Mail_mail::send instead
      */
     function send($recipients, $headers, $body)
     {
-        $this->_sanitizeHeaders($headers);
+        if (!is_array($headers)) {
+            return PEAR::raiseError('$headers must be an array');
+        }
+
+        $result = $this->_sanitizeHeaders($headers);
+        if (is_a($result, 'PEAR_Error')) {
+            return $result;
+        }
 
         // if we're passed an array of recipients, implode it.
         if (is_array($recipients)) {
@@ -103,10 +136,9 @@ class Mail
         }
 
         // flatten the headers out.
-        list(,$text_headers) = Mail::prepareHeaders($headers);
+        list(, $text_headers) = Mail::prepareHeaders($headers);
 
         return mail($recipients, $subject, $body, $text_headers);
-
     }
 
     /**
@@ -151,9 +183,9 @@ class Mail
         foreach ($headers as $key => $value) {
             if (strcasecmp($key, 'From') === 0) {
                 include_once 'Mail/RFC822.php';
-                $parser = &new Mail_RFC822();
+                $parser = new Mail_RFC822();
                 $addresses = $parser->parseAddressList($value, 'localhost', false);
-                if (PEAR::isError($addresses)) {
+                if (is_a($addresses, 'PEAR_Error')) {
                     return $addresses;
                 }
 
@@ -221,7 +253,7 @@ class Mail
         $addresses = Mail_RFC822::parseAddressList($recipients, 'localhost', false);
 
         // If parseAddressList() returned a PEAR_Error object, just return it.
-        if (PEAR::isError($addresses)) {
+        if (is_a($addresses, 'PEAR_Error')) {
             return $addresses;
         }
 
diff --git a/extlib/Mail/RFC822.php b/extlib/Mail/RFC822.php
old mode 100644
new mode 100755
index 8714df2e29..58d36465cb
--- a/extlib/Mail/RFC822.php
+++ b/extlib/Mail/RFC822.php
@@ -1,37 +1,48 @@
 <?php
-// +-----------------------------------------------------------------------+
-// | Copyright (c) 2001-2002, Richard Heyes                                |
-// | All rights reserved.                                                  |
-// |                                                                       |
-// | Redistribution and use in source and binary forms, with or without    |
-// | modification, are permitted provided that the following conditions    |
-// | are met:                                                              |
-// |                                                                       |
-// | o Redistributions of source code must retain the above copyright      |
-// |   notice, this list of conditions and the following disclaimer.       |
-// | o Redistributions in binary form must reproduce the above copyright   |
-// |   notice, this list of conditions and the following disclaimer in the |
-// |   documentation and/or other materials provided with the distribution.|
-// | o The names of the authors may not be used to endorse or promote      |
-// |   products derived from this software without specific prior written  |
-// |   permission.                                                         |
-// |                                                                       |
-// | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS   |
-// | "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT     |
-// | LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR |
-// | A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT  |
-// | OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
-// | SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT      |
-// | LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
-// | DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
-// | THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT   |
-// | (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
-// | OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  |
-// |                                                                       |
-// +-----------------------------------------------------------------------+
-// | Authors: Richard Heyes <richard@phpguru.org>                          |
-// |          Chuck Hagenbuch <chuck@horde.org>                            |
-// +-----------------------------------------------------------------------+
+/**
+ * RFC 822 Email address list validation Utility
+ *
+ * PHP versions 4 and 5
+ *
+ * LICENSE:
+ *
+ * Copyright (c) 2001-2010, Richard Heyes
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * o Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * o Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * o The names of the authors may not be used to endorse or promote
+ *   products derived from this software without specific prior written
+ *   permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @category    Mail
+ * @package     Mail
+ * @author      Richard Heyes <richard@phpguru.org>
+ * @author      Chuck Hagenbuch <chuck@horde.org
+ * @copyright   2001-2010 Richard Heyes
+ * @license     http://opensource.org/licenses/bsd-license.php New BSD License
+ * @version     CVS: $Id: RFC822.php 294749 2010-02-08 08:22:25Z clockwerx $
+ * @link        http://pear.php.net/package/Mail/
+ */
 
 /**
  * RFC 822 Email address list validation Utility
@@ -52,7 +63,7 @@
  *
  * @author  Richard Heyes <richard@phpguru.org>
  * @author  Chuck Hagenbuch <chuck@horde.org>
- * @version $Revision: 1.24 $
+ * @version $Revision: 294749 $
  * @license BSD
  * @package Mail
  */
@@ -635,8 +646,8 @@ class Mail_RFC822 {
                 $comment    = $this->_splitCheck($parts, ')');
                 $comments[] = $comment;
 
-                // +1 is for the trailing )
-                $_mailbox   = substr($_mailbox, strpos($_mailbox, $comment)+strlen($comment)+1);
+                // +2 is for the brackets
+                $_mailbox = substr($_mailbox, strpos($_mailbox, '('.$comment)+strlen($comment)+2);
             } else {
                 break;
             }
diff --git a/extlib/Mail/mail.php b/extlib/Mail/mail.php
old mode 100644
new mode 100755
index b13d695656..a8b4b5dbee
--- a/extlib/Mail/mail.php
+++ b/extlib/Mail/mail.php
@@ -1,27 +1,52 @@
 <?php
-//
-// +----------------------------------------------------------------------+
-// | PHP Version 4                                                        |
-// +----------------------------------------------------------------------+
-// | Copyright (c) 1997-2003 The PHP Group                                |
-// +----------------------------------------------------------------------+
-// | This source file is subject to version 2.02 of the PHP license,      |
-// | that is bundled with this package in the file LICENSE, and is        |
-// | available at through the world-wide-web at                           |
-// | http://www.php.net/license/2_02.txt.                                 |
-// | If you did not receive a copy of the PHP license and are unable to   |
-// | obtain it through the world-wide-web, please send a note to          |
-// | license@php.net so we can mail you a copy immediately.               |
-// +----------------------------------------------------------------------+
-// | Author: Chuck Hagenbuch <chuck@horde.org>                            |
-// +----------------------------------------------------------------------+
-//
-// $Id: mail.php,v 1.20 2007/10/06 17:00:00 chagenbu Exp $
+/**
+ * internal PHP-mail() implementation of the PEAR Mail:: interface.
+ *
+ * PHP versions 4 and 5
+ *
+ * LICENSE:
+ *
+ * Copyright (c) 2010 Chuck Hagenbuch
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * o Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * o Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * o The names of the authors may not be used to endorse or promote
+ *   products derived from this software without specific prior written
+ *   permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @category    Mail
+ * @package     Mail
+ * @author      Chuck Hagenbuch <chuck@horde.org> 
+ * @copyright   2010 Chuck Hagenbuch
+ * @license     http://opensource.org/licenses/bsd-license.php New BSD License
+ * @version     CVS: $Id: mail.php 294747 2010-02-08 08:18:33Z clockwerx $
+ * @link        http://pear.php.net/package/Mail/
+ */
 
 /**
  * internal PHP-mail() implementation of the PEAR Mail:: interface.
  * @package Mail
- * @version $Revision: 1.20 $
+ * @version $Revision: 294747 $
  */
 class Mail_mail extends Mail {
 
diff --git a/extlib/Mail/mock.php b/extlib/Mail/mock.php
old mode 100644
new mode 100755
index 971dae6a0e..61570ba408
--- a/extlib/Mail/mock.php
+++ b/extlib/Mail/mock.php
@@ -1,29 +1,53 @@
 <?php
-//
-// +----------------------------------------------------------------------+
-// | PHP Version 4                                                        |
-// +----------------------------------------------------------------------+
-// | Copyright (c) 1997-2003 The PHP Group                                |
-// +----------------------------------------------------------------------+
-// | This source file is subject to version 2.02 of the PHP license,      |
-// | that is bundled with this package in the file LICENSE, and is        |
-// | available at through the world-wide-web at                           |
-// | http://www.php.net/license/2_02.txt.                                 |
-// | If you did not receive a copy of the PHP license and are unable to   |
-// | obtain it through the world-wide-web, please send a note to          |
-// | license@php.net so we can mail you a copy immediately.               |
-// +----------------------------------------------------------------------+
-// | Author: Chuck Hagenbuch <chuck@horde.org>                            |
-// +----------------------------------------------------------------------+
-//
-// $Id: mock.php,v 1.1 2007/12/08 17:57:54 chagenbu Exp $
-//
+/**
+ * Mock implementation
+ *
+ * PHP versions 4 and 5
+ *
+ * LICENSE:
+ *
+ * Copyright (c) 2010 Chuck Hagenbuch
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * o Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * o Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * o The names of the authors may not be used to endorse or promote
+ *   products derived from this software without specific prior written
+ *   permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @category    Mail
+ * @package     Mail
+ * @author      Chuck Hagenbuch <chuck@horde.org> 
+ * @copyright   2010 Chuck Hagenbuch
+ * @license     http://opensource.org/licenses/bsd-license.php New BSD License
+ * @version     CVS: $Id: mock.php 294747 2010-02-08 08:18:33Z clockwerx $
+ * @link        http://pear.php.net/package/Mail/
+ */
 
 /**
  * Mock implementation of the PEAR Mail:: interface for testing.
  * @access public
  * @package Mail
- * @version $Revision: 1.1 $
+ * @version $Revision: 294747 $
  */
 class Mail_mock extends Mail {
 
diff --git a/extlib/Mail/null.php b/extlib/Mail/null.php
old mode 100644
new mode 100755
index 982bfa45b6..f8d58272ee
--- a/extlib/Mail/null.php
+++ b/extlib/Mail/null.php
@@ -1,29 +1,53 @@
 <?php
-//
-// +----------------------------------------------------------------------+
-// | PHP Version 4                                                        |
-// +----------------------------------------------------------------------+
-// | Copyright (c) 1997-2003 The PHP Group                                |
-// +----------------------------------------------------------------------+
-// | This source file is subject to version 2.02 of the PHP license,      |
-// | that is bundled with this package in the file LICENSE, and is        |
-// | available at through the world-wide-web at                           |
-// | http://www.php.net/license/2_02.txt.                                 |
-// | If you did not receive a copy of the PHP license and are unable to   |
-// | obtain it through the world-wide-web, please send a note to          |
-// | license@php.net so we can mail you a copy immediately.               |
-// +----------------------------------------------------------------------+
-// | Author: Phil Kernick <philk@rotfl.com.au>                            |
-// +----------------------------------------------------------------------+
-//
-// $Id: null.php,v 1.2 2004/04/06 05:19:03 jon Exp $
-//
+/**
+ * Null implementation of the PEAR Mail interface
+ *
+ * PHP versions 4 and 5
+ *
+ * LICENSE:
+ *
+ * Copyright (c) 2010 Phil Kernick
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * o Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * o Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * o The names of the authors may not be used to endorse or promote
+ *   products derived from this software without specific prior written
+ *   permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @category    Mail
+ * @package     Mail
+ * @author      Phil Kernick <philk@rotfl.com.au>
+ * @copyright   2010 Phil Kernick
+ * @license     http://opensource.org/licenses/bsd-license.php New BSD License
+ * @version     CVS: $Id: null.php 294747 2010-02-08 08:18:33Z clockwerx $
+ * @link        http://pear.php.net/package/Mail/
+ */
 
 /**
  * Null implementation of the PEAR Mail:: interface.
  * @access public
  * @package Mail
- * @version $Revision: 1.2 $
+ * @version $Revision: 294747 $
  */
 class Mail_null extends Mail {
 
diff --git a/extlib/Mail/sendmail.php b/extlib/Mail/sendmail.php
old mode 100644
new mode 100755
index cd248e61d2..b056575e99
--- a/extlib/Mail/sendmail.php
+++ b/extlib/Mail/sendmail.php
@@ -20,7 +20,7 @@
  * Sendmail implementation of the PEAR Mail:: interface.
  * @access public
  * @package Mail
- * @version $Revision: 1.19 $
+ * @version $Revision: 294744 $
  */
 class Mail_sendmail extends Mail {
 
@@ -117,7 +117,7 @@ class Mail_sendmail extends Mail {
         if (is_a($recipients, 'PEAR_Error')) {
             return $recipients;
         }
-        $recipients = escapeShellCmd(implode(' ', $recipients));
+        $recipients = implode(' ', array_map('escapeshellarg', $recipients));
 
         $headerElements = $this->prepareHeaders($headers);
         if (is_a($headerElements, 'PEAR_Error')) {
@@ -141,7 +141,8 @@ class Mail_sendmail extends Mail {
             return PEAR::raiseError('From address specified with dangerous characters.');
         }
 
-        $from = escapeShellCmd($from);
+        $from = escapeshellarg($from); // Security bug #16200
+
         $mail = @popen($this->sendmail_path . (!empty($this->sendmail_args) ? ' ' . $this->sendmail_args : '') . " -f$from -- $recipients", 'w');
         if (!$mail) {
             return PEAR::raiseError('Failed to open sendmail [' . $this->sendmail_path . '] for execution.');
diff --git a/extlib/Mail/smtp.php b/extlib/Mail/smtp.php
old mode 100644
new mode 100755
index baf3a962ba..52ea602086
--- a/extlib/Mail/smtp.php
+++ b/extlib/Mail/smtp.php
@@ -1,21 +1,48 @@
 <?php
-//
-// +----------------------------------------------------------------------+
-// | PHP Version 4                                                        |
-// +----------------------------------------------------------------------+
-// | Copyright (c) 1997-2003 The PHP Group                                |
-// +----------------------------------------------------------------------+
-// | This source file is subject to version 2.02 of the PHP license,      |
-// | that is bundled with this package in the file LICENSE, and is        |
-// | available at through the world-wide-web at                           |
-// | http://www.php.net/license/2_02.txt.                                 |
-// | If you did not receive a copy of the PHP license and are unable to   |
-// | obtain it through the world-wide-web, please send a note to          |
-// | license@php.net so we can mail you a copy immediately.               |
-// +----------------------------------------------------------------------+
-// | Authors: Chuck Hagenbuch <chuck@horde.org>                           |
-// |          Jon Parise <jon@php.net>                                    |
-// +----------------------------------------------------------------------+
+/**
+ * SMTP implementation of the PEAR Mail interface. Requires the Net_SMTP class.
+ *
+ * PHP versions 4 and 5
+ *
+ * LICENSE:
+ *
+ * Copyright (c) 2010, Chuck Hagenbuch
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * o Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * o Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * o The names of the authors may not be used to endorse or promote
+ *   products derived from this software without specific prior written
+ *   permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @category    HTTP
+ * @package     HTTP_Request
+ * @author      Jon Parise <jon@php.net> 
+ * @author      Chuck Hagenbuch <chuck@horde.org>
+ * @copyright   2010 Chuck Hagenbuch
+ * @license     http://opensource.org/licenses/bsd-license.php New BSD License
+ * @version     CVS: $Id: smtp.php 294747 2010-02-08 08:18:33Z clockwerx $
+ * @link        http://pear.php.net/package/Mail/
+ */
 
 /** Error: Failed to create a Net_SMTP object */
 define('PEAR_MAIL_SMTP_ERROR_CREATE', 10000);
@@ -42,7 +69,7 @@ define('PEAR_MAIL_SMTP_ERROR_DATA', 10006);
  * SMTP implementation of the PEAR Mail interface. Requires the Net_SMTP class.
  * @access public
  * @package Mail
- * @version $Revision: 1.33 $
+ * @version $Revision: 294747 $
  */
 class Mail_smtp extends Mail {
 
@@ -278,6 +305,16 @@ class Mail_smtp extends Mail {
 
         /* Send the message's headers and the body as SMTP data. */
         $res = $this->_smtp->data($textHeaders . "\r\n\r\n" . $body);
+		list(,$args) = $this->_smtp->getResponse();
+
+		if (preg_match("/Ok: queued as (.*)/", $args, $queued)) {
+			$this->queued_as = $queued[1];
+		}
+
+		/* we need the greeting; from it we can extract the authorative name of the mail server we've really connected to.
+		 * ideal if we're connecting to a round-robin of relay servers and need to track which exact one took the email */
+		$this->greeting = $this->_smtp->getGreeting();
+
         if (is_a($res, 'PEAR_Error')) {
             $error = $this->_error('Failed to send data', $res);
             $this->_smtp->rset();
diff --git a/extlib/Mail/smtpmx.php b/extlib/Mail/smtpmx.php
old mode 100644
new mode 100755
index 9d2dccfb13..f0b6940868
--- a/extlib/Mail/smtpmx.php
+++ b/extlib/Mail/smtpmx.php
@@ -8,19 +8,43 @@
  *
  * PHP versions 4 and 5
  *
- * LICENSE: This source file is subject to version 3.0 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
+ * LICENSE:
+ *
+ * Copyright (c) 2010, gERD Schaufelberger
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * o Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * o Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * o The names of the authors may not be used to endorse or promote
+ *   products derived from this software without specific prior written
+ *   permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * @category   Mail
  * @package    Mail_smtpmx
  * @author     gERD Schaufelberger <gerd@php-tools.net>
- * @copyright  1997-2005 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: smtpmx.php,v 1.2 2007/10/06 17:00:00 chagenbu Exp $
- * @see        Mail
+ * @copyright  2010 gERD Schaufelberger
+ * @license    http://opensource.org/licenses/bsd-license.php New BSD License
+ * @version    CVS: $Id: smtpmx.php 294747 2010-02-08 08:18:33Z clockwerx $
+ * @link       http://pear.php.net/package/Mail/
  */
 
 require_once 'Net/SMTP.php';
@@ -32,7 +56,7 @@ require_once 'Net/SMTP.php';
  * @access public
  * @author  gERD Schaufelberger <gerd@php-tools.net>
  * @package Mail
- * @version $Revision: 1.2 $
+ * @version $Revision: 294747 $
  */
 class Mail_smtpmx extends Mail {
 
diff --git a/extlib/Net/SMTP.php b/extlib/Net/SMTP.php
index d632258d63..ea4b55e8d2 100644
--- a/extlib/Net/SMTP.php
+++ b/extlib/Net/SMTP.php
@@ -18,7 +18,7 @@
 // |          Damian Alejandro Fernandez Sosa <damlists@cnba.uba.ar>      |
 // +----------------------------------------------------------------------+
 //
-// $Id: SMTP.php,v 1.63 2008/06/10 05:39:12 jon Exp $
+// $Id: SMTP.php 293948 2010-01-24 21:46:00Z jon $
 
 require_once 'PEAR.php';
 require_once 'Net/Socket.php';
@@ -91,6 +91,13 @@ class Net_SMTP
      */
     var $_debug = false;
 
+    /**
+     * Debug output handler.
+     * @var callback
+     * @access private
+     */
+    var $_debug_handler = null;
+
     /**
      * The socket resource being used to connect to the SMTP server.
      * @var resource
@@ -112,6 +119,13 @@ class Net_SMTP
      */
     var $_arguments = array();
 
+    /**
+     * Stores the SMTP server's greeting string.
+     * @var string
+     * @access private
+     */
+    var $_greeting = null;
+
     /**
      * Stores detected features of the SMTP server.
      * @var array
@@ -172,9 +186,30 @@ class Net_SMTP
      * @access  public
      * @since   1.1.0
      */
-    function setDebug($debug)
+    function setDebug($debug, $handler = null)
     {
         $this->_debug = $debug;
+        $this->_debug_handler = $handler;
+    }
+
+    /**
+     * Write the given debug text to the current debug output handler.
+     *
+     * @param   string  $message    Debug mesage text.
+     *
+     * @access  private
+     * @since   1.3.3
+     */
+    function _debug($message)
+    {
+        if ($this->_debug) {
+            if ($this->_debug_handler) {
+                call_user_func_array($this->_debug_handler,
+                                     array(&$this, $message));
+            } else {
+                echo "DEBUG: $message\n";
+            }
+        }
     }
 
     /**
@@ -189,13 +224,12 @@ class Net_SMTP
      */
     function _send($data)
     {
-        if ($this->_debug) {
-            echo "DEBUG: Send: $data\n";
-        }
+        $this->_debug("Send: $data");
 
-        if (PEAR::isError($error = $this->_socket->write($data))) {
-            return PEAR::raiseError('Failed to write to socket: ' .
-                                    $error->getMessage());
+        $error = $this->_socket->write($data);
+        if ($error === false || PEAR::isError($error)) {
+            $msg = ($error) ? $error->getMessage() : "unknown error";
+            return PEAR::raiseError("Failed to write to socket: $msg");
         }
 
         return true;
@@ -262,9 +296,7 @@ class Net_SMTP
 
         for ($i = 0; $i <= $this->_pipelined_commands; $i++) {
             while ($line = $this->_socket->readLine()) {
-                if ($this->_debug) {
-                    echo "DEBUG: Recv: $line\n";
-                }
+                $this->_debug("Recv: $line");
 
                 /* If we receive an empty line, the connection has been closed. */
                 if (empty($line)) {
@@ -319,6 +351,20 @@ class Net_SMTP
         return array($this->_code, join("\n", $this->_arguments));
     }
 
+    /**
+     * Return the SMTP server's greeting string.
+     *
+     * @return  string  A string containing the greeting string, or null if a 
+     *                  greeting has not been received.
+     *
+     * @access  public
+     * @since   1.3.3
+     */
+    function getGreeting()
+    {
+        return $this->_greeting;
+    }
+
     /**
      * Attempt to connect to the SMTP server.
      *
@@ -334,6 +380,7 @@ class Net_SMTP
      */
     function connect($timeout = null, $persistent = false)
     {
+        $this->_greeting = null;
         $result = $this->_socket->connect($this->host, $this->port,
                                           $persistent, $timeout);
         if (PEAR::isError($result)) {
@@ -344,6 +391,10 @@ class Net_SMTP
         if (PEAR::isError($error = $this->_parseResponse(220))) {
             return $error;
         }
+
+        /* Extract and store a copy of the server's greeting string. */
+        list(, $this->_greeting) = $this->getResponse();
+
         if (PEAR::isError($error = $this->_negotiate())) {
             return $error;
         }
@@ -452,40 +503,43 @@ class Net_SMTP
      * @param string The password to authenticate with.
      * @param string The requested authentication method.  If none is
      *               specified, the best supported method will be used.
+     * @param bool   Flag indicating whether or not TLS should be attempted.
      *
      * @return mixed Returns a PEAR_Error with an error message on any
      *               kind of failure, or true on success.
      * @access public
      * @since  1.0
      */
-    function auth($uid, $pwd , $method = '')
+    function auth($uid, $pwd , $method = '', $tls = true)
     {
-        if (empty($this->_esmtp['AUTH'])) {
-            if (version_compare(PHP_VERSION, '5.1.0', '>=')) {
-                if (!isset($this->_esmtp['STARTTLS'])) {
-                    return PEAR::raiseError('SMTP server does not support authentication');
-                }
-                if (PEAR::isError($result = $this->_put('STARTTLS'))) {
-                    return $result;
-                }
-                if (PEAR::isError($result = $this->_parseResponse(220))) {
-                    return $result;
-                }
-                if (PEAR::isError($result = $this->_socket->enableCrypto(true, STREAM_CRYPTO_METHOD_TLS_CLIENT))) {
-                    return $result;
-                } elseif ($result !== true) {
-                    return PEAR::raiseError('STARTTLS failed');
-                }
-
-                /* Send EHLO again to recieve the AUTH string from the
-                 * SMTP server. */
-                $this->_negotiate();
-                if (empty($this->_esmtp['AUTH'])) {
-                    return PEAR::raiseError('SMTP server does not support authentication');
-                }
-            } else {
-                return PEAR::raiseError('SMTP server does not support authentication');
+        /* We can only attempt a TLS connection if one has been requested,
+         * we're running PHP 5.1.0 or later, have access to the OpenSSL 
+         * extension, are connected to an SMTP server which supports the 
+         * STARTTLS extension, and aren't already connected over a secure 
+         * (SSL) socket connection. */
+        if ($tls && version_compare(PHP_VERSION, '5.1.0', '>=') &&
+            extension_loaded('openssl') && isset($this->_esmtp['STARTTLS']) &&
+            strncasecmp($this->host, 'ssl://', 6) !== 0) {
+            /* Start the TLS connection attempt. */
+            if (PEAR::isError($result = $this->_put('STARTTLS'))) {
+                return $result;
             }
+            if (PEAR::isError($result = $this->_parseResponse(220))) {
+                return $result;
+            }
+            if (PEAR::isError($result = $this->_socket->enableCrypto(true, STREAM_CRYPTO_METHOD_TLS_CLIENT))) {
+                return $result;
+            } elseif ($result !== true) {
+                return PEAR::raiseError('STARTTLS failed');
+            }
+
+            /* Send EHLO again to recieve the AUTH string from the
+             * SMTP server. */
+            $this->_negotiate();
+        }
+
+        if (empty($this->_esmtp['AUTH'])) {
+            return PEAR::raiseError('SMTP server does not support authentication');
         }
 
         /* If no method has been specified, get the name of the best
@@ -844,30 +898,51 @@ class Net_SMTP
     /**
      * Send the DATA command.
      *
-     * @param string $data  The message body to send.
+     * @param mixed $data     The message data, either as a string or an open
+     *                        file resource.
+     * @param string $headers The message headers.  If $headers is provided,
+     *                        $data is assumed to contain only body data.
      *
      * @return mixed Returns a PEAR_Error with an error message on any
      *               kind of failure, or true on success.
      * @access public
      * @since  1.0
      */
-    function data($data)
+    function data($data, $headers = null)
     {
+        /* Verify that $data is a supported type. */
+        if (!is_string($data) && !is_resource($data)) {
+            return PEAR::raiseError('Expected a string or file resource');
+        }
+
         /* RFC 1870, section 3, subsection 3 states "a value of zero
          * indicates that no fixed maximum message size is in force".
          * Furthermore, it says that if "the parameter is omitted no
          * information is conveyed about the server's fixed maximum
          * message size". */
         if (isset($this->_esmtp['SIZE']) && ($this->_esmtp['SIZE'] > 0)) {
-            if (strlen($data) >= $this->_esmtp['SIZE']) {
+            /* Start by considering the size of the optional headers string.  
+             * We also account for the addition 4 character "\r\n\r\n"
+             * separator sequence. */
+            $size = (is_null($headers)) ? 0 : strlen($headers) + 4;
+
+            if (is_resource($data)) {
+                $stat = fstat($data);
+                if ($stat === false) {
+                    return PEAR::raiseError('Failed to get file size');
+                }
+                $size += $stat['size'];
+            } else {
+                $size += strlen($data);
+            }
+
+            if ($size >= $this->_esmtp['SIZE']) {
                 $this->disconnect();
-                return PEAR::raiseError('Message size excedes the server limit');
+                return PEAR::raiseError('Message size exceeds server limit');
             }
         }
 
-        /* Quote the data based on the SMTP standards. */
-        $this->quotedata($data);
-
+        /* Initiate the DATA command. */
         if (PEAR::isError($error = $this->_put('DATA'))) {
             return $error;
         }
@@ -875,9 +950,40 @@ class Net_SMTP
             return $error;
         }
 
-        if (PEAR::isError($result = $this->_send($data . "\r\n.\r\n"))) {
-            return $result;
+        /* If we have a separate headers string, send it first. */
+        if (!is_null($headers)) {
+            $this->quotedata($headers);
+            if (PEAR::isError($result = $this->_send($headers . "\r\n\r\n"))) {
+                return $result;
+            }
         }
+
+        /* Now we can send the message body data. */
+        if (is_resource($data)) {
+            /* Stream the contents of the file resource out over our socket 
+             * connection, line by line.  Each line must be run through the 
+             * quoting routine. */
+            while ($line = fgets($data, 1024)) {
+                $this->quotedata($line);
+                if (PEAR::isError($result = $this->_send($line))) {
+                    return $result;
+                }
+            }
+
+            /* Finally, send the DATA terminator sequence. */
+            if (PEAR::isError($result = $this->_send("\r\n.\r\n"))) {
+                return $result;
+            }
+        } else {
+            /* Just send the entire quoted string followed by the DATA 
+             * terminator. */
+            $this->quotedata($data);
+            if (PEAR::isError($result = $this->_send($data . "\r\n.\r\n"))) {
+                return $result;
+            }
+        }
+
+        /* Verify that the data was successfully received by the server. */
         if (PEAR::isError($error = $this->_parseResponse(250, $this->pipelining))) {
             return $error;
         }

From ecf9dc6d1b5a068b2e5ba23debf2b7bec04d3d2c Mon Sep 17 00:00:00 2001
From: Craig Andrews <candrews@integralblue.com>
Date: Mon, 3 May 2010 21:25:10 -0400
Subject: [PATCH 026/655] use the new maxNoticeLength and maxUrlLength
 functionality introduced in commit 14adb7cc41e3d5d4e543c1f13f7a60d3cadb5c71

---
 .../ClientSideShorten/ClientSideShortenPlugin.php |  4 +++-
 plugins/ClientSideShorten/shorten.js              | 15 +++++++++++++--
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/plugins/ClientSideShorten/ClientSideShortenPlugin.php b/plugins/ClientSideShorten/ClientSideShortenPlugin.php
index ba1f7d3a7c..454bedb084 100644
--- a/plugins/ClientSideShorten/ClientSideShortenPlugin.php
+++ b/plugins/ClientSideShorten/ClientSideShortenPlugin.php
@@ -51,8 +51,10 @@ class ClientSideShortenPlugin extends Plugin
     }
 
     function onEndShowScripts($action){
-        $action->inlineScript('var Notice_maxContent = ' . Notice::maxContent());
         if (common_logged_in()) {
+            $user = common_current_user();
+            $action->inlineScript('var maxNoticeLength = ' . User_urlshortener_prefs::maxNoticeLength($user));
+            $action->inlineScript('var maxUrlLength = ' . User_urlshortener_prefs::maxUrlLength($user));
             $action->script('plugins/ClientSideShorten/shorten.js');
         }
     }
diff --git a/plugins/ClientSideShorten/shorten.js b/plugins/ClientSideShorten/shorten.js
index 856c7f05fd..bdffb81e26 100644
--- a/plugins/ClientSideShorten/shorten.js
+++ b/plugins/ClientSideShorten/shorten.js
@@ -31,10 +31,21 @@
 
     })(jQuery,'smartkeypress');
 
+    function longestWordInString(string)
+    {
+        var words = string.split(/\s/);
+        var longestWord = 0;
+        for(var i=0;i<words.length;i++)
+            if(words[i].length > longestWord) longestWord = words[i].length;
+        return longestWord;
+    }
+
     function shorten()
     {
-        $noticeDataText = $('#'+SN.C.S.NoticeDataText);
-        if(Notice_maxContent > 0 && $noticeDataText.val().length > Notice_maxContent){
+        var $noticeDataText = $('#'+SN.C.S.NoticeDataText);
+        var noticeText = $noticeDataText.val();
+
+        if(noticeText.length > maxNoticeLength || longestWordInString(noticeText) > maxUrlLength) {
             var original = $noticeDataText.val();
             shortenAjax = $.ajax({
                 url: $('address .url')[0].href+'/plugins/ClientSideShorten/shorten',

From f803c1fbfecbe31d30441c695e44b7f62b02cebf Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Tue, 4 May 2010 12:31:55 -0700
Subject: [PATCH 027/655] Add Emacs Identica-mode to notice sources

---
 db/notice_source.sql | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/db/notice_source.sql b/db/notice_source.sql
index 50660e9480..f9c5256791 100644
--- a/db/notice_source.sql
+++ b/db/notice_source.sql
@@ -12,7 +12,8 @@ VALUES
     ('deskbar','Deskbar-Applet','http://www.gnome.org/projects/deskbar-applet/', now()),
     ('Do','Gnome Do','http://do.davebsd.com/wiki/index.php?title=Microblog_Plugin', now()),
     ('drupal','Drupal','http://drupal.org/', now()),
-    ('eventbox','EventBox','http://thecosmicmachine.com/eventbox/ ', now()),
+    ('eventbox','EventBox','http://thecosmicmachine.com/eventbox/', now()),
+    ('identica-mode','Emacs Identica-mode','http://nongnu.org/identica-mode/', now()),
     ('Facebook','Facebook','http://apps.facebook.com/identica/', now()),
     ('feed2omb','feed2omb','http://projects.ciarang.com/p/feed2omb/', now()),
     ('get2gnow', 'get2gnow', 'http://uberchicgeekchick.com/?projects=get2gnow', now()),

From ddc7811a7b412c9c3c4b6bfb9350dd18a62fdf51 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Wed, 5 May 2010 16:52:31 -0700
Subject: [PATCH 028/655] Move XMPPHP from core extlibs to Xmpp plugin extlibs

---
 plugins/Xmpp/XmppPlugin.php                          | 4 +---
 {extlib => plugins/Xmpp/extlib}/XMPPHP/BOSH.php      | 0
 {extlib => plugins/Xmpp/extlib}/XMPPHP/Exception.php | 0
 {extlib => plugins/Xmpp/extlib}/XMPPHP/Log.php       | 0
 {extlib => plugins/Xmpp/extlib}/XMPPHP/Roster.php    | 0
 {extlib => plugins/Xmpp/extlib}/XMPPHP/XMLObj.php    | 0
 {extlib => plugins/Xmpp/extlib}/XMPPHP/XMLStream.php | 0
 {extlib => plugins/Xmpp/extlib}/XMPPHP/XMPP.php      | 0
 {extlib => plugins/Xmpp/extlib}/XMPPHP/XMPP_Old.php  | 0
 9 files changed, 1 insertion(+), 3 deletions(-)
 rename {extlib => plugins/Xmpp/extlib}/XMPPHP/BOSH.php (100%)
 rename {extlib => plugins/Xmpp/extlib}/XMPPHP/Exception.php (100%)
 rename {extlib => plugins/Xmpp/extlib}/XMPPHP/Log.php (100%)
 rename {extlib => plugins/Xmpp/extlib}/XMPPHP/Roster.php (100%)
 rename {extlib => plugins/Xmpp/extlib}/XMPPHP/XMLObj.php (100%)
 rename {extlib => plugins/Xmpp/extlib}/XMPPHP/XMLStream.php (100%)
 rename {extlib => plugins/Xmpp/extlib}/XMPPHP/XMPP.php (100%)
 rename {extlib => plugins/Xmpp/extlib}/XMPPHP/XMPP_Old.php (100%)

diff --git a/plugins/Xmpp/XmppPlugin.php b/plugins/Xmpp/XmppPlugin.php
index a2521536bc..9d75e2475d 100644
--- a/plugins/Xmpp/XmppPlugin.php
+++ b/plugins/Xmpp/XmppPlugin.php
@@ -34,8 +34,6 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-set_include_path(get_include_path() . PATH_SEPARATOR . INSTALLDIR . '/extlib/XMPPHP');
-
 /**
  * Plugin for XMPP
  *
@@ -287,7 +285,7 @@ class XmppPlugin extends ImPlugin
         switch ($cls)
         {
         case 'XMPPHP_XMPP':
-            require_once 'XMPP.php';
+            require_once $dir . '/extlib/XMPPHP/XMPP.php';
             return false;
         case 'Sharing_XMPP':
         case 'Queued_XMPP':
diff --git a/extlib/XMPPHP/BOSH.php b/plugins/Xmpp/extlib/XMPPHP/BOSH.php
similarity index 100%
rename from extlib/XMPPHP/BOSH.php
rename to plugins/Xmpp/extlib/XMPPHP/BOSH.php
diff --git a/extlib/XMPPHP/Exception.php b/plugins/Xmpp/extlib/XMPPHP/Exception.php
similarity index 100%
rename from extlib/XMPPHP/Exception.php
rename to plugins/Xmpp/extlib/XMPPHP/Exception.php
diff --git a/extlib/XMPPHP/Log.php b/plugins/Xmpp/extlib/XMPPHP/Log.php
similarity index 100%
rename from extlib/XMPPHP/Log.php
rename to plugins/Xmpp/extlib/XMPPHP/Log.php
diff --git a/extlib/XMPPHP/Roster.php b/plugins/Xmpp/extlib/XMPPHP/Roster.php
similarity index 100%
rename from extlib/XMPPHP/Roster.php
rename to plugins/Xmpp/extlib/XMPPHP/Roster.php
diff --git a/extlib/XMPPHP/XMLObj.php b/plugins/Xmpp/extlib/XMPPHP/XMLObj.php
similarity index 100%
rename from extlib/XMPPHP/XMLObj.php
rename to plugins/Xmpp/extlib/XMPPHP/XMLObj.php
diff --git a/extlib/XMPPHP/XMLStream.php b/plugins/Xmpp/extlib/XMPPHP/XMLStream.php
similarity index 100%
rename from extlib/XMPPHP/XMLStream.php
rename to plugins/Xmpp/extlib/XMPPHP/XMLStream.php
diff --git a/extlib/XMPPHP/XMPP.php b/plugins/Xmpp/extlib/XMPPHP/XMPP.php
similarity index 100%
rename from extlib/XMPPHP/XMPP.php
rename to plugins/Xmpp/extlib/XMPPHP/XMPP.php
diff --git a/extlib/XMPPHP/XMPP_Old.php b/plugins/Xmpp/extlib/XMPPHP/XMPP_Old.php
similarity index 100%
rename from extlib/XMPPHP/XMPP_Old.php
rename to plugins/Xmpp/extlib/XMPPHP/XMPP_Old.php

From 3e8af172d636cc7ca3a9e2301b928f6ca79b9eb2 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Wed, 5 May 2010 17:30:42 -0700
Subject: [PATCH 029/655] Add ?uselang=xx language override option (only valid,
 locally-enabled languages supported, just as with headers and user settings).
 Great aid for debugging & translation testing

---
 lib/util.php | 33 ++++++++++++++++++++++++---------
 1 file changed, 24 insertions(+), 9 deletions(-)

diff --git a/lib/util.php b/lib/util.php
index e7ea9df613..e15c69f950 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -138,23 +138,38 @@ function common_timezone()
     return common_config('site', 'timezone');
 }
 
+function common_valid_language($lang)
+{
+    if ($lang) {
+        // Validate -- we don't want to end up with a bogus code
+        // left over from some old junk.
+        foreach (common_config('site', 'languages') as $code => $info) {
+            if ($info['lang'] == $lang) {
+                return true;
+            }
+        }
+    }
+    return false;
+}
+
 function common_language()
 {
+    // Allow ?uselang=xx override, very useful for debugging
+    // and helping translators check usage and context.
+    if (isset($_GET['uselang'])) {
+        $uselang = strval($_GET['uselang']);
+        if (common_valid_language($uselang)) {
+            return $uselang;
+        }
+    }
 
     // If there is a user logged in and they've set a language preference
     // then return that one...
     if (_have_config() && common_logged_in()) {
         $user = common_current_user();
-        $user_language = $user->language;
 
-        if ($user->language) {
-            // Validate -- we don't want to end up with a bogus code
-            // left over from some old junk.
-            foreach (common_config('site', 'languages') as $code => $info) {
-                if ($info['lang'] == $user_language) {
-                    return $user_language;
-                }
-            }
+        if (common_valid_language($user->language)) {
+            return $user->language;
         }
     }
 

From 30328fc1666b9e3a6651c5d8881933debaf5ecc6 Mon Sep 17 00:00:00 2001
From: Craig Andrews <candrews@integralblue.com>
Date: Thu, 6 May 2010 23:33:27 -0400
Subject: [PATCH 030/655] Enable ClientSideShorten plugin by default

---
 lib/default.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/default.php b/lib/default.php
index 449d2b3bb4..52a4ec7836 100644
--- a/lib/default.php
+++ b/lib/default.php
@@ -287,6 +287,7 @@ $default =
                                  'OStatus' => null,
                                  'WikiHashtags' => null,
                                  'RSSCloud' => null,
+                                 'ClientSideShorten' => null,
                                  'OpenID' => null),
               ),
         'pluginlist' => array(),

From 4b0458801af03b40fa636849da0a7e96bbd3e860 Mon Sep 17 00:00:00 2001
From: Craig Andrews <candrews@integralblue.com>
Date: Thu, 6 May 2010 23:40:07 -0400
Subject: [PATCH 031/655] Ignore PEAR errors with code
 DB_DATAOBJECT_ERROR_NODATA

---
 lib/common.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lib/common.php b/lib/common.php
index 2bda88c974..72a1b70751 100644
--- a/lib/common.php
+++ b/lib/common.php
@@ -132,6 +132,12 @@ require_once INSTALLDIR.'/lib/serverexception.php';
 //set PEAR error handling to use regular PHP exceptions
 function PEAR_ErrorToPEAR_Exception($err)
 {
+    //DB_DataObject throws error when an empty set would be returned
+    //That behavior is weird, and not how the rest of StatusNet works.
+    //So just ignore those errors.
+    if ($err->getCode() == DB_DATAOBJECT_ERROR_NODATA) {
+        return;
+    }
     if ($err->getCode()) {
         throw new PEAR_Exception($err->getMessage(), $err->getCode());
     }

From b407665b983297078f5361db24c60a7d46e0f4ba Mon Sep 17 00:00:00 2001
From: Zachary Copley <zcopley@danube.local>
Date: Tue, 20 Apr 2010 11:29:13 -0700
Subject: [PATCH 032/655] Initial work on API method for updating a group's
 profile info

---
 actions/apigroupprofileupdate.php | 370 ++++++++++++++++++++++++++++++
 lib/router.php                    |   6 +
 2 files changed, 376 insertions(+)
 create mode 100644 actions/apigroupprofileupdate.php

diff --git a/actions/apigroupprofileupdate.php b/actions/apigroupprofileupdate.php
new file mode 100644
index 0000000000..0d3620c265
--- /dev/null
+++ b/actions/apigroupprofileupdate.php
@@ -0,0 +1,370 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Update a group's profile
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  API
+ * @package   StatusNet
+ * @author    Zach Copley <zach@status.net>
+ * @copyright 2010 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
+require_once INSTALLDIR . '/lib/apiauth.php';
+
+class ApiValidationException extends Exception { }
+
+/**
+ * API analog to the group edit page
+ *
+ * @category API
+ * @package  StatusNet
+ * @author   Zach Copley <zach@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://status.net/
+ */
+
+class ApiGroupProfileUpdateAction extends ApiAuthAction
+{
+
+    /**
+     * Take arguments for running
+     *
+     * @param array $args $_REQUEST args
+     *
+     * @return boolean success flag
+     *
+     */
+
+    function prepare($args)
+    {
+        parent::prepare($args);
+
+        $this->nickname    = common_canonical_nickname($this->trimmed('nickname'));
+        $this->fullname    = $this->trimmed('fullname');
+        $this->homepage    = $this->trimmed('homepage');
+        $this->description = $this->trimmed('description');
+        $this->location    = $this->trimmed('location');
+        $this->aliasstring = $this->trimmed('aliases');
+
+        $this->user  = $this->auth_user;
+        $this->group = $this->getTargetGroup($this->arg('id'));
+
+        return true;
+    }
+
+    /**
+     * Handle the request
+     *
+     * See which request params have been set, and update the profile
+     *
+     * @param array $args $_REQUEST data (unused)
+     *
+     * @return void
+     */
+
+    function handle($args)
+    {
+        parent::handle($args);
+
+        if ($_SERVER['REQUEST_METHOD'] != 'POST') {
+            $this->clientError(
+                _('This method requires a POST.'),
+                400, $this->format
+            );
+            return;
+        }
+
+        if (!in_array($this->format, array('xml', 'json'))) {
+            $this->clientError(
+                _('API method not found.'),
+                404,
+                $this->format
+            );
+            return;
+        }
+
+        if (empty($this->user)) {
+            $this->clientError(_('No such user.'), 404, $this->format);
+            return;
+        }
+
+        if (empty($this->group)) {
+            $this->clientError(_('Group not found.'), 404, $this->format);
+            return false;
+        }
+
+        if (!$this->user->isAdmin($this->group)) {
+            $this->clientError(_('You must be an admin to edit the group.'), 403);
+            return false;
+        }
+
+        $this->group->query('BEGIN');
+
+        $orig = clone($this->group);
+
+        try {
+
+            if (!empty($this->nickname)) {
+                if ($this->validateNickname()) {
+                    $this->group->nickname = $this->nickname;
+                    $this->group->mainpage = common_local_url(
+                        'showgroup',
+                        array('nickname' => $this->nickname)
+                    );
+                }
+            }
+
+            if (!empty($this->fullname)) {
+                $this->validateFullname();
+                $this->group->fullname = $this->fullname;
+            }
+
+            if (!empty($this->homepage)) {
+                $this->validateHomepage();
+                $this->group->homepage = $this->hompage;
+            }
+
+            if (!empty($this->description)) {
+                $this->validateDescription();
+                $this->group->description = $this->decription;
+            }
+
+            if (!empty($this->location)) {
+                $this->validateLocation();
+                $this->group->location = $this->location;
+            }
+
+        } catch (ApiValidationException $ave) {
+            $this->clientError(
+                $ave->getMessage(),
+                403,
+                $this->format
+            );
+            return;
+        }
+
+        $result = $this->group->update($orig);
+
+        if (!$result) {
+            common_log_db_error($this->group, 'UPDATE', __FILE__);
+            $this->serverError(_('Could not update group.'));
+        }
+
+        $aliases = null;
+
+        try {
+
+            if (!empty($this->aliasstring)) {
+                $aliases = $this->parseAliases();
+            }
+
+        } catch (ApiValidationException $ave) {
+            $this->clientError(
+                $ave->getMessage(),
+                403,
+                $this->format
+            );
+            return;
+        }
+
+        $result = $this->group->setAliases($aliases);
+
+        if (!$result) {
+            $this->serverError(_('Could not create aliases.'));
+        }
+
+        if (!empty($this->nickname) && $this->nickname != $orig->nickname) {
+            common_log(LOG_INFO, "Saving local group info.");
+            $local = Local_group::staticGet('group_id', $this->group->id);
+            $local->setNickname($this->nickname);
+        }
+
+        $this->group->query('COMMIT');
+
+        switch($this->format) {
+        case 'xml':
+            $this->showSingleXmlGroup($this->group);
+            break;
+        case 'json':
+            $this->showSingleJsonGroup($this->group);
+            break;
+        default:
+            $this->clientError(_('API method not found.'), 404, $this->format);
+            break;
+        }
+    }
+
+    function nicknameExists($nickname)
+    {
+        $group = Local_group::staticGet('nickname', $nickname);
+
+        if (!empty($group) &&
+            $group->group_id != $this->group->id) {
+            return true;
+        }
+
+        $alias = Group_alias::staticGet('alias', $nickname);
+
+        if (!empty($alias) &&
+            $alias->group_id != $this->group->id) {
+            return true;
+        }
+
+        return false;
+    }
+
+    function validateNickname()
+    {
+        if (!Validate::string(
+            $this->nickname, array(
+                'min_length' => 1,
+                'max_length' => 64,
+                'format' => NICKNAME_FMT
+                )
+            )
+        ) {
+            throw new ApiValidationException(
+                _(
+                    'Nickname must have only lowercase letters ' .
+                    'and numbers and no spaces.'
+                )
+            );
+        } else if ($this->nicknameExists($this->nickname)) {
+            throw new ApiValidationException(
+                _('Nickname already in use. Try another one.')
+            );
+        } else if (!User_group::allowedNickname($this->nickname)) {
+            throw new ApiValidationException(
+                _('Not a valid nickname.')
+            );
+        }
+    }
+
+    function validateHomepage()
+    {
+        if (!is_null($this->homepage)
+        && (strlen($this->homepage) > 0)
+        && !Validate::uri(
+                $this->homepage,
+                array('allowed_schemes' => array('http', 'https')
+                )
+            )
+        ) {
+            throw new ApiValidationException(
+                _('Homepage is not a valid URL.')
+            );
+        }
+    }
+
+    function validateFullname()
+    {
+        if (!is_null($this->fullname) && mb_strlen($this->fullname) > 255) {
+            throw new ApiValidationException(
+                _('Full name is too long (max 255 chars).')
+            );
+        }
+    }
+
+    function validateDescription()
+    {
+        if (User_group::descriptionTooLong($this->description)) {
+            throw new ApiValidationException(
+                sprintf(
+                    _('description is too long (max %d chars).'),
+                    User_group::maxDescription()
+                )
+            );
+        }
+    }
+
+    function validateLocation()
+    {
+        if (!is_null($this->location) && mb_strlen($this->location) > 255) {
+            throw new ApiValidationException(
+                _('Location is too long (max 255 chars).')
+            );
+        }
+    }
+
+    function validateAliases()
+    {
+        $aliases = array_map(
+            'common_canonical_nickname',
+            array_unique(
+                preg_split('/[\s,]+/',
+                $this->aliasstring
+                )
+            )
+        );
+
+        if (empty($aliases)) {
+            $aliases = array();
+        }
+
+        if (count($aliases) > common_config('group', 'maxaliases')) {
+            throw new ApiValidationException(
+                sprintf(
+                    _('Too many aliases! Maximum %d.'),
+                    common_config('group', 'maxaliases')
+                )
+            );
+        }
+
+        foreach ($aliases as $alias) {
+            if (!Validate::string(
+                $alias, array(
+                    'min_length' => 1,
+                    'max_length' => 64,
+                    'format' => NICKNAME_FMT)
+                )
+            ) {
+                throw new ApiValidationException(
+                    sprintf(
+                        _('Invalid alias: "%s"'),
+                        $alias
+                    )
+                );
+            }
+
+            if ($this->nicknameExists($alias)) {
+                throw new ApiValidationException(
+                    sprintf(
+                        _('Alias "%s" already in use. Try another one.'),
+                        $alias)
+                );
+            }
+
+            // XXX assumes alphanum nicknames
+            if (strcmp($alias, $nickname) == 0) {
+                throw new ApiValidationException(
+                    _('Alias can\'t be the same as nickname.')
+                );
+            }
+        }
+
+        return $aliases;
+    }
+
+}
\ No newline at end of file
diff --git a/lib/router.php b/lib/router.php
index a040abb832..faa26c8610 100644
--- a/lib/router.php
+++ b/lib/router.php
@@ -650,6 +650,12 @@ class Router
             $m->connect('api/statusnet/groups/create.:format',
                         array('action' => 'ApiGroupCreate',
                               'format' => '(xml|json)'));
+
+            $m->connect('api/statusnet/groups/update/:id.:format',
+                        array('action' => 'ApiGroupProfileUpdate',
+                              'id' => '[a-zA-Z0-9]+',
+                              'format' => '(xml|json)'));
+
             // Tags
             $m->connect('api/statusnet/tags/timeline/:tag.:format',
                         array('action' => 'ApiTimelineTag',

From 06a63b0404aa96efc1118563482c11567b048961 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Fri, 7 May 2010 00:52:54 -0700
Subject: [PATCH 033/655] Finish api/statusnet/groups/update

---
 actions/apigroupprofileupdate.php | 19 ++++++++-----------
 lib/apiaction.php                 |  2 ++
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/actions/apigroupprofileupdate.php b/actions/apigroupprofileupdate.php
index 0d3620c265..6ac4b5a4b5 100644
--- a/actions/apigroupprofileupdate.php
+++ b/actions/apigroupprofileupdate.php
@@ -33,8 +33,6 @@ if (!defined('STATUSNET')) {
 
 require_once INSTALLDIR . '/lib/apiauth.php';
 
-class ApiValidationException extends Exception { }
-
 /**
  * API analog to the group edit page
  *
@@ -62,6 +60,7 @@ class ApiGroupProfileUpdateAction extends ApiAuthAction
         parent::prepare($args);
 
         $this->nickname    = common_canonical_nickname($this->trimmed('nickname'));
+
         $this->fullname    = $this->trimmed('fullname');
         $this->homepage    = $this->trimmed('homepage');
         $this->description = $this->trimmed('description');
@@ -172,12 +171,12 @@ class ApiGroupProfileUpdateAction extends ApiAuthAction
             $this->serverError(_('Could not update group.'));
         }
 
-        $aliases = null;
+        $aliases = array();
 
         try {
 
-            if (!empty($this->aliasstring)) {
-                $aliases = $this->parseAliases();
+			if (!empty($this->aliasstring)) {
+				$aliases = $this->validateAliases();
             }
 
         } catch (ApiValidationException $ave) {
@@ -195,7 +194,7 @@ class ApiGroupProfileUpdateAction extends ApiAuthAction
             $this->serverError(_('Could not create aliases.'));
         }
 
-        if (!empty($this->nickname) && $this->nickname != $orig->nickname) {
+        if (!empty($this->nickname) && ($this->nickname != $orig->nickname)) {
             common_log(LOG_INFO, "Saving local group info.");
             $local = Local_group::staticGet('group_id', $this->group->id);
             $local->setNickname($this->nickname);
@@ -260,6 +259,8 @@ class ApiGroupProfileUpdateAction extends ApiAuthAction
                 _('Not a valid nickname.')
             );
         }
+
+		return true;
     }
 
     function validateHomepage()
@@ -319,10 +320,6 @@ class ApiGroupProfileUpdateAction extends ApiAuthAction
             )
         );
 
-        if (empty($aliases)) {
-            $aliases = array();
-        }
-
         if (count($aliases) > common_config('group', 'maxaliases')) {
             throw new ApiValidationException(
                 sprintf(
@@ -357,7 +354,7 @@ class ApiGroupProfileUpdateAction extends ApiAuthAction
             }
 
             // XXX assumes alphanum nicknames
-            if (strcmp($alias, $nickname) == 0) {
+            if (strcmp($alias, $this->nickname) == 0) {
                 throw new ApiValidationException(
                     _('Alias can\'t be the same as nickname.')
                 );
diff --git a/lib/apiaction.php b/lib/apiaction.php
index 42aa08ef7d..d35391d4ea 100644
--- a/lib/apiaction.php
+++ b/lib/apiaction.php
@@ -97,6 +97,8 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
+class ApiValidationException extends Exception { }
+
 /**
  * Contains most of the Twitter-compatible API output functions.
  *

From da18701394ef717cd68dad11f5a830719ad675e6 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Fri, 7 May 2010 16:32:24 -0700
Subject: [PATCH 034/655] Fix for repeats from the API having null source
 attribution

---
 actions/apidirectmessagenew.php |  8 --------
 actions/apistatusesretweet.php  |  2 +-
 actions/apistatusesupdate.php   | 12 ------------
 lib/apiaction.php               |  9 +++++++++
 lib/apiauth.php                 |  3 +--
 5 files changed, 11 insertions(+), 23 deletions(-)

diff --git a/actions/apidirectmessagenew.php b/actions/apidirectmessagenew.php
index b9ac92d77b..65d065648f 100644
--- a/actions/apidirectmessagenew.php
+++ b/actions/apidirectmessagenew.php
@@ -52,7 +52,6 @@ require_once INSTALLDIR . '/lib/apiauth.php';
 
 class ApiDirectMessageNewAction extends ApiAuthAction
 {
-    var $source  = null;
     var $other   = null;
     var $content = null;
 
@@ -76,13 +75,6 @@ class ApiDirectMessageNewAction extends ApiAuthAction
             return;
         }
 
-        $this->source = $this->trimmed('source'); // Not supported by Twitter.
-
-        $reserved_sources = array('web', 'omb', 'mail', 'xmpp', 'api');
-        if (empty($this->source) || in_array($this->source, $reserved_sources)) {
-            $source = 'api';
-        }
-
         $this->content = $this->trimmed('text');
 
         $this->user  = $this->auth_user;
diff --git a/actions/apistatusesretweet.php b/actions/apistatusesretweet.php
index 128c881e25..9aa3374854 100644
--- a/actions/apistatusesretweet.php
+++ b/actions/apistatusesretweet.php
@@ -79,7 +79,7 @@ class ApiStatusesRetweetAction extends ApiAuthAction
 
         $this->user = $this->auth_user;
 
-        if ($this->user->id == $notice->profile_id) {
+        if ($this->user->id == $this->original->profile_id) {
             $this->clientError(_('Cannot repeat your own notice.'),
                                400, $this->format);
             return false;
diff --git a/actions/apistatusesupdate.php b/actions/apistatusesupdate.php
index 5f3a447c23..a0a81f3368 100644
--- a/actions/apistatusesupdate.php
+++ b/actions/apistatusesupdate.php
@@ -155,8 +155,6 @@ class ApiStatusesUpdateAction extends ApiAuthAction
     var $lat                   = null;
     var $lon                   = null;
 
-    static $reserved_sources = array('web', 'omb', 'mail', 'xmpp', 'api');
-
     /**
      * Take arguments for running
      *
@@ -171,19 +169,9 @@ class ApiStatusesUpdateAction extends ApiAuthAction
         parent::prepare($args);
 
         $this->status = $this->trimmed('status');
-        $this->source = $this->trimmed('source');
         $this->lat    = $this->trimmed('lat');
         $this->lon    = $this->trimmed('long');
 
-        // try to set the source attr from OAuth app
-        if (empty($this->source)) {
-            $this->source = $this->oauth_source;
-        }
-
-        if (empty($this->source) || in_array($this->source, self::$reserved_sources)) {
-            $this->source = 'api';
-        }
-
         $this->in_reply_to_status_id
             = intval($this->trimmed('in_reply_to_status_id'));
 
diff --git a/lib/apiaction.php b/lib/apiaction.php
index d35391d4ea..e481a1ef29 100644
--- a/lib/apiaction.php
+++ b/lib/apiaction.php
@@ -126,9 +126,12 @@ class ApiAction extends Action
     var $count     = null;
     var $max_id    = null;
     var $since_id  = null;
+    var $source    = null;
 
     var $access    = self::READ_ONLY;  // read (default) or read-write
 
+    static $reserved_sources = array('web', 'omb', 'ostatus', 'mail', 'xmpp', 'api');
+
     /**
      * Initialization.
      *
@@ -152,6 +155,12 @@ class ApiAction extends Action
             header('X-StatusNet-Warning: since parameter is disabled; use since_id');
         }
 
+        $this->source = $this->trimmed('source');
+
+        if (empty($this->source) || in_array($this->source, self::$reserved_sources)) {
+            $this->source = 'api';
+        }
+
         return true;
     }
 
diff --git a/lib/apiauth.php b/lib/apiauth.php
index 8c39988889..9c68e27713 100644
--- a/lib/apiauth.php
+++ b/lib/apiauth.php
@@ -72,7 +72,6 @@ class ApiAuthAction extends ApiAction
 {
     var $auth_user_nickname = null;
     var $auth_user_password = null;
-    var $oauth_source       = null;
 
     /**
      * Take arguments for running, looks for an OAuth request,
@@ -181,7 +180,7 @@ class ApiAuthAction extends ApiAction
 
             // set the source attr
 
-            $this->oauth_source = $app->name;
+            $this->source = $app->name;
 
             $appUser = Oauth_application_user::staticGet('token', $access_token);
 

From cef2ded9e79b2d84fddd6e7f5af09c02c50315a8 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Fri, 21 May 2010 10:29:28 -0700
Subject: [PATCH 035/655] Add TweetDeck to notice sources

---
 db/notice_source.sql | 1 +
 1 file changed, 1 insertion(+)

diff --git a/db/notice_source.sql b/db/notice_source.sql
index f9c5256791..fbcdd6568e 100644
--- a/db/notice_source.sql
+++ b/db/notice_source.sql
@@ -54,6 +54,7 @@ VALUES
     ('tr.im','tr.im','http://tr.im/', now()),
     ('triklepost', 'Tricklepost', 'http://github.com/zcopley/tricklepost/tree/master', now()),
     ('tweenky','Tweenky','http://beta.tweenky.com/', now()),
+    ('TweetDeck', 'TweetDeck', 'http://www.tweetdeck.com/', now()),
     ('twhirl','Twhirl','http://www.twhirl.org/', now()),
     ('twibble','twibble','http://www.twibble.de/', now()),
     ('Twidge','Twidge','http://software.complete.org/twidge', now()),

From bcca10f5268ac2c2945479dd93d2f302478e02f9 Mon Sep 17 00:00:00 2001
From: Marcel van der Boom <marcel@hsdev.com>
Date: Thu, 27 May 2010 19:25:45 +0200
Subject: [PATCH 036/655] Add implementation of API method home_timeline method

---
 plugins/TwitterBridge/twitteroauthclient.php | 30 ++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/plugins/TwitterBridge/twitteroauthclient.php b/plugins/TwitterBridge/twitteroauthclient.php
index d895d8c73c..6b821ba181 100644
--- a/plugins/TwitterBridge/twitteroauthclient.php
+++ b/plugins/TwitterBridge/twitteroauthclient.php
@@ -217,6 +217,36 @@ class TwitterOAuthClient extends OAuthClient
         return $statuses;
     }
 
+    /**
+     * Calls Twitter's /statuses/home_timeline API method
+     *
+     * @param int $since_id show statuses after this id
+     * @param int $max_id   show statuses before this id
+     * @param int $cnt      number of statuses to show
+     * @param int $page     page number
+     *
+     * @return mixed an array of statuses, similare to friends_timeline, except including retweets
+     */
+    function statusesHomeTimeline($since_id = null, $max_id = null,
+                                     $cnt = null, $page = null)
+    {
+
+        $url    = 'https://twitter.com/statuses/home_timeline.json';
+        $params = array('since_id' => $since_id,
+                        'max_id' => $max_id,
+                        'count' => $cnt,
+                        'page' => $page);
+        $qry    = http_build_query($params);
+
+        if (!empty($qry)) {
+            $url .= "?$qry";
+        }
+
+        $response = $this->oAuthGet($url);
+        $statuses = json_decode($response);
+        return $statuses;
+    }
+
     /**
      * Calls Twitter's /statuses/friends API method
      *

From 4211b7f01188b4ab64407e32b380366a048102f4 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Thu, 27 May 2010 11:21:52 -0700
Subject: [PATCH 037/655] - Implement statusesHomeTimeline() in
 TwitterBasicAuthClient - Make TwitterStatusFetcher pull home_timeline
 (includes retweets) instead of friends_timeline

---
 .../daemons/twitterstatusfetcher.php          |  2 +-
 .../TwitterBridge/twitterbasicauthclient.php  | 31 ++++++++++++++++++-
 plugins/TwitterBridge/twitteroauthclient.php  |  2 +-
 3 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/plugins/TwitterBridge/daemons/twitterstatusfetcher.php b/plugins/TwitterBridge/daemons/twitterstatusfetcher.php
index 7c624fdb3b..03a4bd3f34 100755
--- a/plugins/TwitterBridge/daemons/twitterstatusfetcher.php
+++ b/plugins/TwitterBridge/daemons/twitterstatusfetcher.php
@@ -186,7 +186,7 @@ class TwitterStatusFetcher extends ParallelizingDaemon
         $timeline = null;
 
         try {
-            $timeline = $client->statusesFriendsTimeline();
+            $timeline = $client->statusesHomeTimeline();
         } catch (Exception $e) {
             common_log(LOG_WARNING, $this->name() .
                        ' - Twitter client unable to get friends timeline for user ' .
diff --git a/plugins/TwitterBridge/twitterbasicauthclient.php b/plugins/TwitterBridge/twitterbasicauthclient.php
index 2c18c94695..cc68b50100 100644
--- a/plugins/TwitterBridge/twitterbasicauthclient.php
+++ b/plugins/TwitterBridge/twitterbasicauthclient.php
@@ -2,7 +2,7 @@
 /**
  * StatusNet, the distributed open-source microblogging tool
  *
- * Class for doing OAuth calls against Twitter
+ * Class for doing HTTP basic auth calls against Twitter
  *
  * PHP version 5
  *
@@ -125,6 +125,35 @@ class TwitterBasicAuthClient
         return $statuses;
     }
 
+    /**
+     * Calls Twitter's /statuses/home_timeline API method
+     *
+     * @param int $since_id show statuses after this id
+     * @param int $max_id   show statuses before this id
+     * @param int $cnt      number of statuses to show
+     * @param int $page     page number
+     *
+     * @return mixed an array of statuses similar to friends timeline but including retweets
+     */
+    function statusesFriendsTimeline($since_id = null, $max_id = null,
+                                     $cnt = null, $page = null)
+    {
+        $url    = 'https://twitter.com/statuses/home_timeline.json';
+        $params = array('since_id' => $since_id,
+                        'max_id' => $max_id,
+                        'count' => $cnt,
+                        'page' => $page);
+        $qry    = http_build_query($params);
+
+        if (!empty($qry)) {
+            $url .= "?$qry";
+        }
+
+        $response = $this->httpRequest($url);
+        $statuses = json_decode($response);
+        return $statuses;
+    }
+
     /**
      * Calls Twitter's /statuses/friends API method
      *
diff --git a/plugins/TwitterBridge/twitteroauthclient.php b/plugins/TwitterBridge/twitteroauthclient.php
index 6b821ba181..f6ef786752 100644
--- a/plugins/TwitterBridge/twitteroauthclient.php
+++ b/plugins/TwitterBridge/twitteroauthclient.php
@@ -225,7 +225,7 @@ class TwitterOAuthClient extends OAuthClient
      * @param int $cnt      number of statuses to show
      * @param int $page     page number
      *
-     * @return mixed an array of statuses, similare to friends_timeline, except including retweets
+     * @return mixed an array of statuses, similar to friends_timeline but including retweets
      */
     function statusesHomeTimeline($since_id = null, $max_id = null,
                                      $cnt = null, $page = null)

From d2234580357349a6887a2321e69d11de7bb29106 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Mon, 31 May 2010 08:49:14 -0700
Subject: [PATCH 038/655] Widgetize the design form

Squashed commit of the following:

commit a4610db66974866fdeb98184ce7e2be1470fb4d7
Author: Evan Prodromou <evan@status.net>
Date:   Mon May 31 08:48:35 2010 -0700

    use selfUrl for designform action

commit fd9f46ab33caa2c2d0df90d1d596c7b8c6453ce3
Author: Evan Prodromou <evan@status.net>
Date:   Mon May 31 08:29:43 2010 -0700

    fix design settings syntax

commit d1797ef9f90bf038665463424ad962bfe039c9f0
Author: Evan Prodromou <evan@status.net>
Date:   Mon Nov 9 23:23:53 2009 -0500

    widgetizing design form
---
 lib/designform.php     | 293 +++++++++++++++++++++++++++++++++++++++++
 lib/designsettings.php | 173 +-----------------------
 2 files changed, 295 insertions(+), 171 deletions(-)
 create mode 100644 lib/designform.php

diff --git a/lib/designform.php b/lib/designform.php
new file mode 100644
index 0000000000..b22d77f312
--- /dev/null
+++ b/lib/designform.php
@@ -0,0 +1,293 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Form for choosing a design
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Form
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @author    Sarven Capadisli <csarven@status.net>
+ * @copyright 2009 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET') && !defined('LACONICA')) {
+    exit(1);
+}
+
+/**
+ * Form for choosing a design
+ *
+ * Used for choosing a site design, user design, or group design.
+ *
+ * @category Form
+ * @package  StatusNet
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Sarven Capadisli <csarven@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://status.net/
+ *
+ */
+
+class DesignForm extends Form
+{
+    /**
+     * Return-to args
+     */
+
+    var $design     = null;
+    var $actionurl  = null;
+
+    /**
+     * Constructor
+     *
+     * @param HTMLOutputter $out       output channel
+     * @param Design        $design    initial design
+     * @param Design        $actionurl url of action (for form posting)
+     */
+
+    function __construct($out, $design, $actionurl)
+    {
+        parent::__construct($out);
+
+        $this->design     = $design;
+        $this->actionurl = $actionurl;
+    }
+
+    /**
+     * ID of the form
+     *
+     * @return int ID of the form
+     */
+
+    function id()
+    {
+        return 'design';
+    }
+
+    /**
+     * class of the form
+     *
+     * @return string class of the form
+     */
+
+    function formClass()
+    {
+        return 'form_design';
+    }
+
+    /**
+     * Action of the form
+     *
+     * @return string URL of the action
+     */
+
+    function action()
+    {
+        return $this->actionurl;
+    }
+
+    /**
+     * Legend of the Form
+     *
+     * @return void
+     */
+    function formLegend()
+    {
+        $this->out->element('legend', null, _('Change design'));
+    }
+
+    /**
+     * Data elements of the form
+     *
+     * @return void
+     */
+
+    function formData()
+    {
+        $this->out->elementStart('ul', 'form_data');
+        $this->out->elementStart('li');
+        $this->out->element('label', array('for' => 'design_background-image_file'),
+                            _('Upload file'));
+        $this->out->element('input', array('name' => 'design_background-image_file',
+                                           'type' => 'file',
+                                           'id' => 'design_background-image_file'));
+        $this->out->element('p', 'form_guide', _('You can upload your personal ' .
+                                                 'background image. The maximum file size is 2Mb.'));
+        $this->out->element('input', array('name' => 'MAX_FILE_SIZE',
+                                           'type' => 'hidden',
+                                           'id' => 'MAX_FILE_SIZE',
+                                           'value' => ImageFile::maxFileSizeInt()));
+        $this->out->elementEnd('li');
+
+        if (!empty($design->backgroundimage)) {
+
+            $this->out->elementStart('li', array('id' =>
+                                                 'design_background-image_onoff'));
+
+            $this->out->element('img', array('src' =>
+                                             Design::url($design->backgroundimage)));
+
+            $attrs = array('name' => 'design_background-image_onoff',
+                           'type' => 'radio',
+                           'id' => 'design_background-image_on',
+                           'class' => 'radio',
+                           'value' => 'on');
+
+            if ($design->disposition & BACKGROUND_ON) {
+                $attrs['checked'] = 'checked';
+            }
+
+            $this->out->element('input', $attrs);
+
+            $this->out->element('label', array('for' => 'design_background-image_on',
+                                               'class' => 'radio'),
+                                _('On'));
+
+            $attrs = array('name' => 'design_background-image_onoff',
+                           'type' => 'radio',
+                           'id' => 'design_background-image_off',
+                           'class' => 'radio',
+                           'value' => 'off');
+
+            if ($design->disposition & BACKGROUND_OFF) {
+                $attrs['checked'] = 'checked';
+            }
+
+            $this->out->element('input', $attrs);
+
+            $this->out->element('label', array('for' => 'design_background-image_off',
+                                               'class' => 'radio'),
+                                _('Off'));
+            $this->out->element('p', 'form_guide', _('Turn background image on or off.'));
+            $this->out->elementEnd('li');
+
+            $this->out->elementStart('li');
+            $this->out->checkbox('design_background-image_repeat',
+                                 _('Tile background image'),
+                                 ($design->disposition & BACKGROUND_TILE) ? true : false);
+            $this->out->elementEnd('li');
+        }
+
+        $this->out->elementEnd('ul');
+        $this->out->elementEnd('fieldset');
+
+        $this->out->elementStart('fieldset', array('id' => 'settings_design_color'));
+        $this->out->element('legend', null, _('Change colours'));
+        $this->out->elementStart('ul', 'form_data');
+
+        try {
+
+            $bgcolor = new WebColor($design->backgroundcolor);
+
+            $this->out->elementStart('li');
+            $this->out->element('label', array('for' => 'swatch-1'), _('Background'));
+            $this->out->element('input', array('name' => 'design_background',
+                                               'type' => 'text',
+                                               'id' => 'swatch-1',
+                                               'class' => 'swatch',
+                                               'maxlength' => '7',
+                                               'size' => '7',
+                                               'value' => ''));
+            $this->out->elementEnd('li');
+
+            $ccolor = new WebColor($design->contentcolor);
+
+            $this->out->elementStart('li');
+            $this->out->element('label', array('for' => 'swatch-2'), _('Content'));
+            $this->out->element('input', array('name' => 'design_content',
+                                               'type' => 'text',
+                                               'id' => 'swatch-2',
+                                               'class' => 'swatch',
+                                               'maxlength' => '7',
+                                               'size' => '7',
+                                               'value' => ''));
+            $this->out->elementEnd('li');
+
+            $sbcolor = new WebColor($design->sidebarcolor);
+
+            $this->out->elementStart('li');
+            $this->out->element('label', array('for' => 'swatch-3'), _('Sidebar'));
+            $this->out->element('input', array('name' => 'design_sidebar',
+                                               'type' => 'text',
+                                               'id' => 'swatch-3',
+                                               'class' => 'swatch',
+                                               'maxlength' => '7',
+                                               'size' => '7',
+                                               'value' => ''));
+            $this->out->elementEnd('li');
+
+            $tcolor = new WebColor($design->textcolor);
+
+            $this->out->elementStart('li');
+            $this->out->element('label', array('for' => 'swatch-4'), _('Text'));
+            $this->out->element('input', array('name' => 'design_text',
+                                               'type' => 'text',
+                                               'id' => 'swatch-4',
+                                               'class' => 'swatch',
+                                               'maxlength' => '7',
+                                               'size' => '7',
+                                               'value' => ''));
+            $this->out->elementEnd('li');
+
+            $lcolor = new WebColor($design->linkcolor);
+
+            $this->out->elementStart('li');
+            $this->out->element('label', array('for' => 'swatch-5'), _('Links'));
+            $this->out->element('input', array('name' => 'design_links',
+                                               'type' => 'text',
+                                               'id' => 'swatch-5',
+                                               'class' => 'swatch',
+                                               'maxlength' => '7',
+                                               'size' => '7',
+                                               'value' => ''));
+            $this->out->elementEnd('li');
+
+        } catch (WebColorException $e) {
+            common_log(LOG_ERR, 'Bad color values in design ID: ' .$design->id);
+        }
+
+        $this->out->elementEnd('ul');
+        $this->out->elementEnd('fieldset');
+
+        $this->out->elementStart('fieldset');
+
+        $this->out->submit('defaults', _('Use defaults'), 'submit form_action-default',
+                           'defaults', _('Restore default designs'));
+
+        $this->out->element('input', array('id' => 'settings_design_reset',
+                                           'type' => 'reset',
+                                           'value' => 'Reset',
+                                           'class' => 'submit form_action-primary',
+                                           'title' => _('Reset back to default')));
+    }
+
+    /**
+     * Action elements
+     *
+     * @return void
+     */
+
+    function formActions()
+    {
+        $this->out->submit('save', _('Save'), 'submit form_action-secondary',
+                           'save', _('Save design'));
+    }
+}
diff --git a/lib/designsettings.php b/lib/designsettings.php
index 4955e92199..98ef8256cd 100644
--- a/lib/designsettings.php
+++ b/lib/designsettings.php
@@ -87,177 +87,8 @@ class DesignSettingsAction extends AccountSettingsAction
 
     function showDesignForm($design)
     {
-
-        $this->elementStart('form', array('method' => 'post',
-                                          'enctype' => 'multipart/form-data',
-                                          'id' => 'form_settings_design',
-                                          'class' => 'form_settings',
-                                          'action' => $this->submitaction));
-        $this->elementStart('fieldset');
-        $this->hidden('token', common_session_token());
-
-        $this->elementStart('fieldset', array('id' =>
-            'settings_design_background-image'));
-        $this->element('legend', null, _('Change background image'));
-        $this->elementStart('ul', 'form_data');
-        $this->elementStart('li');
-        $this->element('label', array('for' => 'design_background-image_file'),
-                                _('Upload file'));
-        $this->element('input', array('name' => 'design_background-image_file',
-                                      'type' => 'file',
-                                      'id' => 'design_background-image_file'));
-        $this->element('p', 'form_guide', _('You can upload your personal ' .
-            'background image. The maximum file size is 2MB.'));
-        $this->element('input', array('name' => 'MAX_FILE_SIZE',
-                                      'type' => 'hidden',
-                                      'id' => 'MAX_FILE_SIZE',
-                                      'value' => ImageFile::maxFileSizeInt()));
-        $this->elementEnd('li');
-
-        if (!empty($design->backgroundimage)) {
-
-            $this->elementStart('li', array('id' =>
-                'design_background-image_onoff'));
-
-            $this->element('img', array('src' =>
-                Design::url($design->backgroundimage)));
-
-            $attrs = array('name' => 'design_background-image_onoff',
-                           'type' => 'radio',
-                           'id' => 'design_background-image_on',
-                           'class' => 'radio',
-                           'value' => 'on');
-
-            if ($design->disposition & BACKGROUND_ON) {
-                $attrs['checked'] = 'checked';
-            }
-
-            $this->element('input', $attrs);
-
-            $this->element('label', array('for' => 'design_background-image_on',
-                                          'class' => 'radio'),
-                                          _('On'));
-
-            $attrs = array('name' => 'design_background-image_onoff',
-                           'type' => 'radio',
-                           'id' => 'design_background-image_off',
-                           'class' => 'radio',
-                           'value' => 'off');
-
-            if ($design->disposition & BACKGROUND_OFF) {
-                $attrs['checked'] = 'checked';
-            }
-
-            $this->element('input', $attrs);
-
-            $this->element('label', array('for' => 'design_background-image_off',
-                                          'class' => 'radio'),
-                                          _('Off'));
-            $this->element('p', 'form_guide', _('Turn background image on or off.'));
-            $this->elementEnd('li');
-
-            $this->elementStart('li');
-            $this->checkbox('design_background-image_repeat',
-                            _('Tile background image'),
-                            ($design->disposition & BACKGROUND_TILE) ? true : false);
-            $this->elementEnd('li');
-        }
-
-        $this->elementEnd('ul');
-        $this->elementEnd('fieldset');
-
-        $this->elementStart('fieldset', array('id' => 'settings_design_color'));
-        $this->element('legend', null, _('Change colours'));
-        $this->elementStart('ul', 'form_data');
-
-        try {
-
-            $bgcolor = new WebColor($design->backgroundcolor);
-
-            $this->elementStart('li');
-            $this->element('label', array('for' => 'swatch-1'), _('Background'));
-            $this->element('input', array('name' => 'design_background',
-                                          'type' => 'text',
-                                          'id' => 'swatch-1',
-                                          'class' => 'swatch',
-                                          'maxlength' => '7',
-                                          'size' => '7',
-                                          'value' => ''));
-            $this->elementEnd('li');
-
-            $ccolor = new WebColor($design->contentcolor);
-
-            $this->elementStart('li');
-            $this->element('label', array('for' => 'swatch-2'), _('Content'));
-            $this->element('input', array('name' => 'design_content',
-                                          'type' => 'text',
-                                          'id' => 'swatch-2',
-                                          'class' => 'swatch',
-                                          'maxlength' => '7',
-                                          'size' => '7',
-                                          'value' => ''));
-            $this->elementEnd('li');
-
-            $sbcolor = new WebColor($design->sidebarcolor);
-
-            $this->elementStart('li');
-            $this->element('label', array('for' => 'swatch-3'), _('Sidebar'));
-            $this->element('input', array('name' => 'design_sidebar',
-                                        'type' => 'text',
-                                        'id' => 'swatch-3',
-                                        'class' => 'swatch',
-                                        'maxlength' => '7',
-                                        'size' => '7',
-                                        'value' => ''));
-            $this->elementEnd('li');
-
-            $tcolor = new WebColor($design->textcolor);
-
-            $this->elementStart('li');
-            $this->element('label', array('for' => 'swatch-4'), _('Text'));
-            $this->element('input', array('name' => 'design_text',
-                                        'type' => 'text',
-                                        'id' => 'swatch-4',
-                                        'class' => 'swatch',
-                                        'maxlength' => '7',
-                                        'size' => '7',
-                                        'value' => ''));
-            $this->elementEnd('li');
-
-            $lcolor = new WebColor($design->linkcolor);
-
-            $this->elementStart('li');
-            $this->element('label', array('for' => 'swatch-5'), _('Links'));
-            $this->element('input', array('name' => 'design_links',
-                                         'type' => 'text',
-                                         'id' => 'swatch-5',
-                                         'class' => 'swatch',
-                                         'maxlength' => '7',
-                                         'size' => '7',
-                                         'value' => ''));
-            $this->elementEnd('li');
-
-        } catch (WebColorException $e) {
-            common_log(LOG_ERR, 'Bad color values in design ID: ' .$design->id);
-        }
-
-        $this->elementEnd('ul');
-        $this->elementEnd('fieldset');
-
-        $this->submit('defaults', _('Use defaults'), 'submit form_action-default',
-            'defaults', _('Restore default designs'));
-
-        $this->element('input', array('id' => 'settings_design_reset',
-                                     'type' => 'reset',
-                                     'value' => 'Reset',
-                                     'class' => 'submit form_action-primary',
-                                     'title' => _('Reset back to default')));
-
-        $this->submit('save', _('Save'), 'submit form_action-secondary',
-            'save', _('Save design'));
-
-        $this->elementEnd('fieldset');
-        $this->elementEnd('form');
+        $form = new DesignForm($this, $design, $this->selfUrl());
+        $form->show();
     }
 
     /**

From ed5549bd13e2af84ed3021ab65eaf504280e2bd7 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Mon, 31 May 2010 09:04:29 -0700
Subject: [PATCH 039/655] move long sets of controls to their own functions in
 designform

---
 lib/designform.php | 41 ++++++++++++++++++++++++++---------------
 1 file changed, 26 insertions(+), 15 deletions(-)

diff --git a/lib/designform.php b/lib/designform.php
index b22d77f312..89e7f6ce8b 100644
--- a/lib/designform.php
+++ b/lib/designform.php
@@ -121,6 +121,29 @@ class DesignForm extends Form
      */
 
     function formData()
+    {
+        $this->backgroundData();
+
+        $this->out->elementEnd('fieldset');
+
+        $this->out->elementStart('fieldset', array('id' => 'settings_design_color'));
+        $this->out->element('legend', null, _('Change colours'));
+        $this->colourData();
+        $this->out->elementEnd('fieldset');
+
+        $this->out->elementStart('fieldset');
+
+        $this->out->submit('defaults', _('Use defaults'), 'submit form_action-default',
+                           'defaults', _('Restore default designs'));
+
+        $this->out->element('input', array('id' => 'settings_design_reset',
+                                           'type' => 'reset',
+                                           'value' => 'Reset',
+                                           'class' => 'submit form_action-primary',
+                                           'title' => _('Reset back to default')));
+    }
+
+    function backgroundData()
     {
         $this->out->elementStart('ul', 'form_data');
         $this->out->elementStart('li');
@@ -187,10 +210,10 @@ class DesignForm extends Form
         }
 
         $this->out->elementEnd('ul');
-        $this->out->elementEnd('fieldset');
+    }
 
-        $this->out->elementStart('fieldset', array('id' => 'settings_design_color'));
-        $this->out->element('legend', null, _('Change colours'));
+    function colourData()
+    {
         $this->out->elementStart('ul', 'form_data');
 
         try {
@@ -265,18 +288,6 @@ class DesignForm extends Form
         }
 
         $this->out->elementEnd('ul');
-        $this->out->elementEnd('fieldset');
-
-        $this->out->elementStart('fieldset');
-
-        $this->out->submit('defaults', _('Use defaults'), 'submit form_action-default',
-                           'defaults', _('Restore default designs'));
-
-        $this->out->element('input', array('id' => 'settings_design_reset',
-                                           'type' => 'reset',
-                                           'value' => 'Reset',
-                                           'class' => 'submit form_action-primary',
-                                           'title' => _('Reset back to default')));
     }
 
     /**

From 7cc58b97feb822ab999b7fefa3a50ce53a7838d5 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Thu, 10 Jun 2010 15:23:57 -0700
Subject: [PATCH 040/655] Fix for compile error (misnamed function) in
 4211b7f01188b4ab64407e32b380366a048102f4

---
 plugins/TwitterBridge/twitterbasicauthclient.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/TwitterBridge/twitterbasicauthclient.php b/plugins/TwitterBridge/twitterbasicauthclient.php
index cc68b50100..23828ed4a3 100644
--- a/plugins/TwitterBridge/twitterbasicauthclient.php
+++ b/plugins/TwitterBridge/twitterbasicauthclient.php
@@ -135,7 +135,7 @@ class TwitterBasicAuthClient
      *
      * @return mixed an array of statuses similar to friends timeline but including retweets
      */
-    function statusesFriendsTimeline($since_id = null, $max_id = null,
+    function statusesHomeTimeline($since_id = null, $max_id = null,
                                      $cnt = null, $page = null)
     {
         $url    = 'https://twitter.com/statuses/home_timeline.json';

From 0264f66d76f6a8e5669d305985f96533a156e9ae Mon Sep 17 00:00:00 2001
From: Luke Fitzgerald <lw.fitzgerald@googlemail.com>
Date: Sat, 12 Jun 2010 17:28:43 +0100
Subject: [PATCH 041/655] Initial commit of msn-plugin work

---
 plugins/Msn/MsnPlugin.php                     |  173 +
 plugins/Msn/Queued_Msn.php                    |  120 +
 plugins/Msn/extlib/phpmsnclass/msn.class.php  | 3755 +++++++++++++++++
 plugins/Msn/extlib/phpmsnclass/msnbot.php     |   63 +
 plugins/Msn/extlib/phpmsnclass/sample.php     |   40 +
 .../extlib/phpmsnclass/soap/.svn/all-wcprops  |   23 +
 .../Msn/extlib/phpmsnclass/soap/.svn/entries  |  130 +
 .../text-base/msnab_datatypes.xsd.svn-base    |  832 ++++
 .../text-base/msnab_servicetypes.xsd.svn-base |  567 +++
 .../msnab_sharingservice.wsdl.svn-base        |  532 +++
 .../phpmsnclass/soap/msnab_datatypes.xsd      |  832 ++++
 .../phpmsnclass/soap/msnab_servicetypes.xsd   |  567 +++
 .../soap/msnab_sharingservice.wsdl            |  532 +++
 plugins/Msn/msnmanager.php                    |  105 +
 14 files changed, 8271 insertions(+)
 create mode 100644 plugins/Msn/MsnPlugin.php
 create mode 100644 plugins/Msn/Queued_Msn.php
 create mode 100644 plugins/Msn/extlib/phpmsnclass/msn.class.php
 create mode 100755 plugins/Msn/extlib/phpmsnclass/msnbot.php
 create mode 100644 plugins/Msn/extlib/phpmsnclass/sample.php
 create mode 100644 plugins/Msn/extlib/phpmsnclass/soap/.svn/all-wcprops
 create mode 100644 plugins/Msn/extlib/phpmsnclass/soap/.svn/entries
 create mode 100644 plugins/Msn/extlib/phpmsnclass/soap/.svn/text-base/msnab_datatypes.xsd.svn-base
 create mode 100644 plugins/Msn/extlib/phpmsnclass/soap/.svn/text-base/msnab_servicetypes.xsd.svn-base
 create mode 100644 plugins/Msn/extlib/phpmsnclass/soap/.svn/text-base/msnab_sharingservice.wsdl.svn-base
 create mode 100644 plugins/Msn/extlib/phpmsnclass/soap/msnab_datatypes.xsd
 create mode 100644 plugins/Msn/extlib/phpmsnclass/soap/msnab_servicetypes.xsd
 create mode 100644 plugins/Msn/extlib/phpmsnclass/soap/msnab_sharingservice.wsdl
 create mode 100644 plugins/Msn/msnmanager.php

diff --git a/plugins/Msn/MsnPlugin.php b/plugins/Msn/MsnPlugin.php
new file mode 100644
index 0000000000..6737e727ab
--- /dev/null
+++ b/plugins/Msn/MsnPlugin.php
@@ -0,0 +1,173 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2009, StatusNet, Inc.
+ *
+ * Send and receive notices using the AIM network
+ *
+ * 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  IM
+ * @package   StatusNet
+ * @author    Craig Andrews <candrews@integralblue.com>
+ * @copyright 2009 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);
+}
+// We bundle the phptoclib library...
+set_include_path(get_include_path() . PATH_SEPARATOR . dirname(__FILE__) . '/extlib/phptoclib');
+
+/**
+ * Plugin for AIM
+ *
+ * @category  Plugin
+ * @package   StatusNet
+ * @author    Craig Andrews <candrews@integralblue.com>
+ * @copyright 2009 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+
+class MsnPlugin extends ImPlugin
+{
+    public $user =  null;
+    public $password = null;
+    public $publicFeed = array();
+
+    public $transport = 'msnim';
+
+    function getDisplayName()
+    {
+        return _m('MSN');
+    }
+
+    function normalize($screenname)
+    {
+		$screenname = str_replace(" ","", $screenname);
+        return strtolower($screenname);
+    }
+
+    function daemon_screenname()
+    {
+        return $this->user;
+    }
+
+    function validate($screenname)
+    {
+        if(preg_match('/^[a-z]\w{2,15}$/i', $screenname)) {
+            return true;
+        }else{
+            return false;
+        }
+    }
+
+    /**
+     * Load related modules when needed
+     *
+     * @param string $cls Name of the class to be loaded
+     *
+     * @return boolean hook value; true means continue processing, false means stop.
+     */
+    function onAutoload($cls)
+    {
+        $dir = dirname(__FILE__);
+
+        switch ($cls)
+        {
+        case 'Msn':
+            require_once(INSTALLDIR.'/plugins/Msn/extlib/phpmsnclass/msn.class.php');
+            return false;
+        case 'MsnManager':
+            include_once $dir . '/'.strtolower($cls).'.php';
+            return false;
+        case 'Fake_Msn':
+            include_once $dir . '/'. $cls .'.php';
+            return false;
+        default:
+            return true;
+        }
+    }
+
+    function onStartImDaemonIoManagers(&$classes)
+    {
+        parent::onStartImDaemonIoManagers(&$classes);
+        $classes[] = new MsnManager($this); // handles sending/receiving
+        return true;
+    }
+
+    function microiduri($screenname)
+    {
+        return 'msnim:' . $screenname;    
+    }
+
+    function send_message($screenname, $body)
+    {
+        //$this->fake_aim->sendIm($screenname, $body);
+	    //$this->enqueue_outgoing_raw($this->fake_aim->would_be_sent);
+	    $this->enqueue_outgoing_raw(array($screenname, $body));
+        return true;
+    }
+
+    /**
+     * Accept a queued input message.
+     *
+     * @return true if processing completed, false if message should be reprocessed
+     */
+    function receive_raw_message($message)
+    {
+        $info=Aim::getMessageInfo($message);
+        $from = $info['from'];
+        $user = $this->get_user($from);
+        $notice_text = $info['message'];
+
+        $this->handle_incoming($from, $notice_text);
+
+        return true;
+    }
+
+    function initialize(){
+        if(!isset($this->user)){
+            throw new Exception("must specify a user");
+        }
+        if(!isset($this->password)){
+            throw new Exception("must specify a password");
+        }
+        if(!isset($this->nickname)) {
+            throw new Exception("must specify a nickname");
+        }
+
+        $this->fake_msn = new Fake_Msn($this->user,$this->password,4);
+        return true;
+    }
+
+    function onPluginVersion(&$versions)
+    {
+        $versions[] = array('name' => 'MSN',
+                            'version' => STATUSNET_VERSION,
+                            'author' => 'Luke Fitzgerald',
+                            'homepage' => 'http://status.net/wiki/Plugin:MSN',
+                            'rawdescription' =>
+                            _m('The MSN plugin allows users to send and receive notices over the MSN network.'));
+        return true;
+    }
+}
+
diff --git a/plugins/Msn/Queued_Msn.php b/plugins/Msn/Queued_Msn.php
new file mode 100644
index 0000000000..bc8e0a1d15
--- /dev/null
+++ b/plugins/Msn/Queued_Msn.php
@@ -0,0 +1,120 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Queue-mediated proxy class for outgoing MSN messages.
+ *
+ * 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  Network
+ * @package   StatusNet
+ * @author    Luke Fitzgerald <lw.fitzgerald@googlemail.com>
+ * @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);
+}
+
+class Queued_XMPP extends MSN {
+    /**
+     * Reference to the MsnPlugin object we're hooked up to.
+     */
+    public $plugin;
+
+    /**
+     * Constructor
+     *
+     * @param MsnPlugin $plugin
+     * @param string  $host
+     * @param integer $port
+     * @param string  $user
+     * @param string  $password
+     * @param string  $resource
+     * @param string  $server
+     * @param boolean $printlog
+     * @param string  $loglevel
+     */
+    public function __construct($plugin, $host, $port, $user, $password, $resource, $server = null, $printlog = false, $loglevel = null)
+    {
+        $this->plugin = $plugin;
+
+        parent::__construct($host, $port, $user, $password, $resource, $server, $printlog, $loglevel);
+
+        // We use $host to connect, but $server to build JIDs if specified.
+        // This seems to fix an upstream bug where $host was used to build
+        // $this->basejid, never seen since it isn't actually used in the base
+        // classes.
+        if (!$server) {
+            $server = $this->host;
+        }
+        $this->basejid = $this->user . '@' . $server;
+
+        // Normally the fulljid is filled out by the server at resource binding
+        // time, but we need to do it since we're not talking to a real server.
+        $this->fulljid = "{$this->basejid}/{$this->resource}";
+    }
+
+    /**
+     * Send a formatted message to the outgoing queue for later forwarding
+     * to a real XMPP connection.
+     *
+     * @param string $msg
+     */
+    public function send($msg, $timeout=NULL)
+    {
+        $this->plugin->enqueue_outgoing_raw($msg);
+    }
+
+    //@{
+    /**
+     * Stream i/o functions disabled; only do output
+     */
+    public function connect($timeout = 30, $persistent = false, $sendinit = true)
+    {
+        throw new Exception("Can't connect to server from fake XMPP.");
+    }
+
+    public function disconnect()
+    {
+        throw new Exception("Can't connect to server from fake XMPP.");
+    }
+
+    public function process()
+    {
+        throw new Exception("Can't read stream from fake XMPP.");
+    }
+
+    public function processUntil($event, $timeout=-1)
+    {
+        throw new Exception("Can't read stream from fake XMPP.");
+    }
+
+    public function read()
+    {
+        throw new Exception("Can't read stream from fake XMPP.");
+    }
+
+    public function readyToProcess()
+    {
+        throw new Exception("Can't read stream from fake XMPP.");
+    }
+    //@}
+
+}
+
diff --git a/plugins/Msn/extlib/phpmsnclass/msn.class.php b/plugins/Msn/extlib/phpmsnclass/msn.class.php
new file mode 100644
index 0000000000..355d828eb5
--- /dev/null
+++ b/plugins/Msn/extlib/phpmsnclass/msn.class.php
@@ -0,0 +1,3755 @@
+<?php
+/*
+
+MSN class ver 2.0 by Tommy Wu, Ricky Su
+License: GPL
+
+You can find MSN protocol from this site: http://msnpiki.msnfanatic.com/index.php/Main_Page
+
+This class support MSNP15 for send message. The PHP module needed:
+
+MSNP15: curl pcre mhash mcrypt bcmath
+
+Usually, this class will try to use MSNP15 if your system can support it, if your system can't support it,
+it will switch to use MSNP9. But if you use MSNP9, it won't support OIM (Offline Messages).
+*/
+
+class MSN {
+    private $debug;
+    private $timeout;
+    private $protocol = 'MSNP15';
+    private $passport_url = 'https://login.live.com/RST.srf';
+    private $buildver = '8.1.0178';
+    private $prod_key = 'PK}_A_0N_K%O?A9S';
+    private $prod_id = 'PROD0114ES4Z%Q5W';
+    private $login_method = 'SSO';
+    private $oim_send_url = 'https://ows.messenger.msn.com/OimWS/oim.asmx';
+    private $oim_send_soap = 'http://messenger.live.com/ws/2006/09/oim/Store2';
+    private $windows;
+    private $kill_me = false;
+    private $id;
+    private $ticket;
+    private $user = '';
+    private $password = '';
+    private $NSfp=false;
+    private $SBfp;
+    private $passport_policy = '';
+    private $alias;
+    private $psm;
+    private $use_ping;
+    private $retry_wait;
+    private $backup_file;
+    private $update_pending;
+    private $PhotoStickerFile=false;
+    private $Emotions=false;
+    private $MessageQueue=array();
+    private $ChildProcess=array();
+    private $MAXChildProcess=3;
+    private $ReqSBXFRTimeout=60;
+    private $SBTimeout=2;
+    private $LastPing;
+    private $ping_wait=50;
+    private $SBIdleTimeout=10;
+    private $SBStreamTimeout=10;
+    private $NSStreamTimeout=2;
+    private $MsnObjArray=array();
+    private $MsnObjMap=array();
+    private $SwitchBoardProcess=false;     // false=>Main Process,1 => sb_control_process,2 => sb_ring_process
+    private $SwitchBoardSessionUser=false;
+    private $SwitchBoardMessageQueue=array();
+    private $ABAuthHeader;
+    private $ABService;
+    private $Contacts;
+
+    public $server = 'messenger.hotmail.com';
+    public $port = 1863;
+
+
+    public $clientid = '';
+
+    public $oim_maildata_url = 'https://rsi.hotmail.com/rsi/rsi.asmx';
+    public $oim_maildata_soap = 'http://www.hotmail.msn.com/ws/2004/09/oim/rsi/GetMetadata';
+    public $oim_read_url = 'https://rsi.hotmail.com/rsi/rsi.asmx';
+    public $oim_read_soap = 'http://www.hotmail.msn.com/ws/2004/09/oim/rsi/GetMessage';
+    public $oim_del_url = 'https://rsi.hotmail.com/rsi/rsi.asmx';
+    public $oim_del_soap = 'http://www.hotmail.msn.com/ws/2004/09/oim/rsi/DeleteMessages';
+
+    public $membership_url = 'https://contacts.msn.com/abservice/SharingService.asmx';
+    public $membership_soap = 'http://www.msn.com/webservices/AddressBook/FindMembership';
+
+    public $addmember_url = 'https://contacts.msn.com/abservice/SharingService.asmx';
+    public $addmember_soap = 'http://www.msn.com/webservices/AddressBook/AddMember';
+
+    public $addcontact_url = 'https://contacts.msn.com/abservice/abservice.asmx';
+    public $addcontact_soap = 'http://www.msn.com/webservices/AddressBook/ABContactAdd';
+
+    public $delmember_url = 'https://contacts.msn.com/abservice/SharingService.asmx';
+    public $delmember_soap = 'http://www.msn.com/webservices/AddressBook/DeleteMember';
+
+
+    public $error = '';
+
+    public $authed = false;
+
+    public $oim_try = 3;
+
+    public $log_file = '';
+
+    public $log_path = false;
+
+    public $font_fn = 'Arial';
+    public $font_co = '333333';
+    public $font_ef = '';
+
+
+    // the message length (include header) is limited (maybe since WLM 8.5 released)
+    // for WLM: 1664 bytes
+    // for YIM: 518 bytes
+    public $max_msn_message_len = 1664;
+    public $max_yahoo_message_len = 518;
+    
+    // Begin added for StatusNet
+    
+    private $aContactList = array();
+    private $switchBoardSessions = array();
+    
+    /** 
+     * Event Handler Functions
+     */
+    private $myEventHandlers = array();
+    
+    // End added for StatusNet
+
+    private function Array2SoapVar($Array,$ReturnSoapVarObj=true,$TypeName=null,$TypeNameSpace=null)
+    {
+        $ArrayString='';
+        foreach($Array as $Key => $Val)
+        {
+            if($Key{0}==':') continue;
+            $Attrib='';
+            if(is_array($Val[':']))
+            {
+                foreach($Val[':'] as $AttribName => $AttribVal)
+                $Attrib.=" $AttribName='$AttribVal'";
+            }
+            if($Key{0}=='!')
+            {
+                //List Type Define
+                $Key=substr($Key,1);
+                foreach($Val as $ListKey => $ListVal)
+                {
+                    if($ListKey{0}==':') continue;
+                    if(is_array($ListVal)) $ListVal=$this->Array2SoapVar($ListVal,false);
+                    elseif(is_bool($ListVal)) $ListVal=$ListVal?'true':'false';
+                    $ArrayString.="<$Key$Attrib>$ListVal</$Key>";
+                }
+                continue;
+            }
+            if(is_array($Val)) $Val=$this->Array2SoapVar($Val,false);
+            elseif(is_bool($Val)) $Val=$Val?'true':'false';
+            $ArrayString.="<$Key$Attrib>$Val</$Key>";
+        }
+        if($ReturnSoapVarObj) return new SoapVar($ArrayString,XSD_ANYXML,$TypeName,$TypeNameSpace);
+        return $ArrayString;
+    }
+
+    public function End()
+    {
+        $this->log_message("*** someone kill me ***");
+        $this->kill_me=true;
+    }
+    public function __construct ($Configs=array(), $timeout = 15, $client_id = 0x7000800C)
+    {
+        $this->user = $Configs['user'];
+        $this->password = $Configs['password'];
+        $this->alias = isset($Configs['alias']) ? $Configs['alias'] : '';
+        $this->psm = isset($Configs['psm']) ? $Configs['psm'] : '';
+        $my_add_function = isset($Configs['add_user_function']) ? $Configs['add_user_function'] : false;
+        $my_rem_function = isset($Configs['remove_user_function']) ? $Configs['remove_user_function'] : false;
+        $this->use_ping = isset($Configs['use_ping']) ? $Configs['use_ping'] : false;
+        $this->retry_wait = isset($Configs['retry_wait']) ? $Configs['retry_wait'] : 30;
+        $this->backup_file = isset($Configs['backup_file']) ? $Configs['backup_file'] : true;
+        $this->update_pending = isset($Configs['update_pending']) ? $Configs['update_pending'] : true;
+        $this->PhotoStickerFile=$Configs['PhotoSticker'];
+        if($this->Emotions = isset($Configs['Emotions']) ? $Configs['Emotions']:false)
+        {
+            foreach($this->Emotions as $EmotionFilePath)
+            $this->MsnObj($EmotionFilePath,$Type=2);
+        }        
+        $this->debug = isset($Configs['debug']) ? $Configs['debug'] : false;
+        $this->timeout = $timeout;
+        // check support
+        if (!function_exists('curl_init')) throw new Exception("We need curl module!\n");
+        if (!function_exists('preg_match')) throw new Exception("We need pcre module!\n");
+        if (!function_exists('mhash')) throw new Exception("We need mhash module!\n");
+
+        if (!function_exists('mcrypt_cbc')) throw new Exception("We need mcrypt module!\n");
+        if (!function_exists('bcmod')) throw new Exception("We need bcmath module for $protocol!\n");
+
+        /*
+         http://msnpiki.msnfanatic.com/index.php/Client_ID
+         Client ID for MSN:
+         normal MSN 8.1 clientid is:
+         01110110 01001100 11000000 00101100
+         = 0x764CC02C
+
+         we just use following:
+         * 0x04: Your client can send/receive Ink (GIF format)
+         * 0x08: Your client can send/recieve Ink (ISF format)
+         * 0x8000: This means you support Winks receiving (If not set the official Client will warn with 'contact has an older client and is not capable of receiving Winks')
+         * 0x70000000: This is the value for MSNC7 (WL Msgr 8.1)
+         = 0x7000800C;
+         */
+        $this->clientid = $client_id;
+        $this->windows =(strtoupper(substr(PHP_OS, 0, 3)) === 'WIN');
+        $this->ABService=new SoapClient(realpath(dirname(__FILE__)).'/soap/msnab_sharingservice.wsdl',array('trace' => 1));
+    }
+
+    private function get_passport_ticket($url = '')
+    {
+        $user = $this->user;
+        $password = htmlspecialchars($this->password);
+
+        if ($url === '')
+        $passport_url = $this->passport_url;
+        else
+        $passport_url = $url;
+
+        $XML = '<?xml version="1.0" encoding="UTF-8"?>
+<Envelope xmlns="http://schemas.xmlsoap.org/soap/envelope/"
+          xmlns:wsse="http://schemas.xmlsoap.org/ws/2003/06/secext"
+          xmlns:saml="urn:oasis:names:tc:SAML:1.0:assertion"
+          xmlns:wsp="http://schemas.xmlsoap.org/ws/2002/12/policy"
+          xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"
+          xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/03/addressing"
+          xmlns:wssc="http://schemas.xmlsoap.org/ws/2004/04/sc"
+          xmlns:wst="http://schemas.xmlsoap.org/ws/2004/04/trust">
+<Header>
+  <ps:AuthInfo xmlns:ps="http://schemas.microsoft.com/Passport/SoapServices/PPCRL" Id="PPAuthInfo">
+    <ps:HostingApp>{7108E71A-9926-4FCB-BCC9-9A9D3F32E423}</ps:HostingApp>
+    <ps:BinaryVersion>4</ps:BinaryVersion>
+    <ps:UIVersion>1</ps:UIVersion>
+    <ps:Cookies></ps:Cookies>
+    <ps:RequestParams>AQAAAAIAAABsYwQAAAAxMDMz</ps:RequestParams>
+  </ps:AuthInfo>
+  <wsse:Security>
+    <wsse:UsernameToken Id="user">
+      <wsse:Username>'.$user.'</wsse:Username>
+      <wsse:Password>'.$password.'</wsse:Password>
+    </wsse:UsernameToken>
+  </wsse:Security>
+</Header>
+<Body>
+  <ps:RequestMultipleSecurityTokens xmlns:ps="http://schemas.microsoft.com/Passport/SoapServices/PPCRL" Id="RSTS">
+    <wst:RequestSecurityToken Id="RST0">
+      <wst:RequestType>http://schemas.xmlsoap.org/ws/2004/04/security/trust/Issue</wst:RequestType>
+      <wsp:AppliesTo>
+        <wsa:EndpointReference>
+          <wsa:Address>http://Passport.NET/tb</wsa:Address>
+        </wsa:EndpointReference>
+      </wsp:AppliesTo>
+    </wst:RequestSecurityToken>
+    <wst:RequestSecurityToken Id="RST1">
+      <wst:RequestType>http://schemas.xmlsoap.org/ws/2004/04/security/trust/Issue</wst:RequestType>
+      <wsp:AppliesTo>
+        <wsa:EndpointReference>
+          <wsa:Address>messengerclear.live.com</wsa:Address>
+        </wsa:EndpointReference>
+      </wsp:AppliesTo>
+      <wsse:PolicyReference URI="'.$this->passport_policy.'"></wsse:PolicyReference>
+    </wst:RequestSecurityToken>
+    <wst:RequestSecurityToken Id="RST2">
+      <wst:RequestType>http://schemas.xmlsoap.org/ws/2004/04/security/trust/Issue</wst:RequestType>
+      <wsp:AppliesTo>
+        <wsa:EndpointReference>
+          <wsa:Address>messenger.msn.com</wsa:Address>
+        </wsa:EndpointReference>
+      </wsp:AppliesTo>
+      <wsse:PolicyReference URI="?id=507"></wsse:PolicyReference>
+    </wst:RequestSecurityToken>
+    <wst:RequestSecurityToken Id="RST3">
+      <wst:RequestType>http://schemas.xmlsoap.org/ws/2004/04/security/trust/Issue</wst:RequestType>
+      <wsp:AppliesTo>
+        <wsa:EndpointReference>
+          <wsa:Address>contacts.msn.com</wsa:Address>
+        </wsa:EndpointReference>
+      </wsp:AppliesTo>
+      <wsse:PolicyReference URI="MBI"></wsse:PolicyReference>
+    </wst:RequestSecurityToken>
+    <wst:RequestSecurityToken Id="RST4">
+      <wst:RequestType>http://schemas.xmlsoap.org/ws/2004/04/security/trust/Issue</wst:RequestType>
+      <wsp:AppliesTo>
+        <wsa:EndpointReference>
+          <wsa:Address>messengersecure.live.com</wsa:Address>
+        </wsa:EndpointReference>
+      </wsp:AppliesTo>
+      <wsse:PolicyReference URI="MBI_SSL"></wsse:PolicyReference>
+    </wst:RequestSecurityToken>
+    <wst:RequestSecurityToken Id="RST5">
+      <wst:RequestType>http://schemas.xmlsoap.org/ws/2004/04/security/trust/Issue</wst:RequestType>
+      <wsp:AppliesTo>
+        <wsa:EndpointReference>
+          <wsa:Address>spaces.live.com</wsa:Address>
+        </wsa:EndpointReference>
+      </wsp:AppliesTo>
+      <wsse:PolicyReference URI="MBI"></wsse:PolicyReference>
+    </wst:RequestSecurityToken>
+    <wst:RequestSecurityToken Id="RST6">
+      <wst:RequestType>http://schemas.xmlsoap.org/ws/2004/04/security/trust/Issue</wst:RequestType>
+      <wsp:AppliesTo>
+        <wsa:EndpointReference>
+          <wsa:Address>storage.msn.com</wsa:Address>
+        </wsa:EndpointReference>
+      </wsp:AppliesTo>
+      <wsse:PolicyReference URI="MBI"></wsse:PolicyReference>
+    </wst:RequestSecurityToken>
+  </ps:RequestMultipleSecurityTokens>
+</Body>
+</Envelope>';
+
+        $this->debug_message("*** URL: $passport_url");
+        $this->debug_message("*** Sending SOAP:\n$XML");
+        $curl = curl_init();
+        curl_setopt($curl, CURLOPT_URL, $passport_url);
+        if ($this->debug) curl_setopt($curl, CURLOPT_HEADER, 1);
+        curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
+        curl_setopt($curl, CURLOPT_FOLLOWLOCATION, 1);
+        curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, 0);
+        curl_setopt($curl, CURLOPT_POST, 1);
+        curl_setopt($curl, CURLOPT_POSTFIELDS, $XML);
+        $data = curl_exec($curl);
+        $http_code = curl_getinfo($curl, CURLINFO_HTTP_CODE);
+        curl_close($curl);
+        $this->debug_message("*** Get Result:\n$data");
+
+        if ($http_code != 200) {
+            // sometimes, rediret to another URL
+            // MSNP15
+            //<faultcode>psf:Redirect</faultcode>
+            //<psf:redirectUrl>https://msnia.login.live.com/pp450/RST.srf</psf:redirectUrl>
+            //<faultstring>Authentication Failure</faultstring>
+            if (strpos($data, '<faultcode>psf:Redirect</faultcode>') === false) {
+                $this->debug_message("*** Can't get passport ticket! http code = $http_code");
+                return false;
+            }
+            preg_match("#<psf\:redirectUrl>(.*)</psf\:redirectUrl>#", $data, $matches);
+            if (count($matches) == 0) {
+                $this->debug_message("*** redirect, but can't get redirect URL!");
+                return false;
+            }
+            $redirect_url = $matches[1];
+            if ($redirect_url == $passport_url) {
+                $this->debug_message("*** redirect, but redirect to same URL!");
+                return false;
+            }
+            $this->debug_message("*** redirect to $redirect_url");
+            return $this->get_passport_ticket($redirect_url);
+        }
+
+        // sometimes, rediret to another URL, also return 200
+        // MSNP15
+        //<faultcode>psf:Redirect</faultcode>
+        //<psf:redirectUrl>https://msnia.login.live.com/pp450/RST.srf</psf:redirectUrl>
+        //<faultstring>Authentication Failure</faultstring>
+        if (strpos($data, '<faultcode>psf:Redirect</faultcode>') !== false) {
+            preg_match("#<psf\:redirectUrl>(.*)</psf\:redirectUrl>#", $data, $matches);
+            if (count($matches) != 0) {
+                $redirect_url = $matches[1];
+                if ($redirect_url == $passport_url) {
+                    $this->debug_message("*** redirect, but redirect to same URL!");
+                    return false;
+                }
+                $this->debug_message("*** redirect to $redirect_url");
+                return $this->get_passport_ticket($redirect_url);
+            }
+        }
+
+        // no Redurect faultcode or URL
+        // we should get the ticket here
+
+        // we need ticket and secret code
+        // RST1: messengerclear.live.com
+        // <wsse:BinarySecurityToken Id="Compact1">t=tick&p=</wsse:BinarySecurityToken>
+        // <wst:BinarySecret>binary secret</wst:BinarySecret>
+        // RST2: messenger.msn.com
+        // <wsse:BinarySecurityToken Id="PPToken2">t=tick</wsse:BinarySecurityToken>
+        // RST3: contacts.msn.com
+        // <wsse:BinarySecurityToken Id="Compact3">t=tick&p=</wsse:BinarySecurityToken>
+        // RST4: messengersecure.live.com
+        // <wsse:BinarySecurityToken Id="Compact4">t=tick&p=</wsse:BinarySecurityToken>
+        // RST5: spaces.live.com
+        // <wsse:BinarySecurityToken Id="Compact5">t=tick&p=</wsse:BinarySecurityToken>
+        // RST6: storage.msn.com
+        // <wsse:BinarySecurityToken Id="Compact6">t=tick&p=</wsse:BinarySecurityToken>
+        preg_match("#".
+            "<wsse\:BinarySecurityToken Id=\"Compact1\">(.*)</wsse\:BinarySecurityToken>(.*)".
+            "<wst\:BinarySecret>(.*)</wst\:BinarySecret>(.*)".
+            "<wsse\:BinarySecurityToken Id=\"PPToken2\">(.*)</wsse\:BinarySecurityToken>(.*)".
+            "<wsse\:BinarySecurityToken Id=\"Compact3\">(.*)</wsse\:BinarySecurityToken>(.*)".
+            "<wsse\:BinarySecurityToken Id=\"Compact4\">(.*)</wsse\:BinarySecurityToken>(.*)".
+            "<wsse\:BinarySecurityToken Id=\"Compact5\">(.*)</wsse\:BinarySecurityToken>(.*)".
+            "<wsse\:BinarySecurityToken Id=\"Compact6\">(.*)</wsse\:BinarySecurityToken>(.*)".
+            "#",
+        $data, $matches);
+
+        // no ticket found!
+        if (count($matches) == 0) {
+            $this->debug_message("*** Can't get passport ticket!");
+            return false;
+        }
+
+        //$this->debug_message(var_export($matches, true));
+        // matches[0]: all data
+        // matches[1]: RST1 (messengerclear.live.com) ticket
+        // matches[2]: ...
+        // matches[3]: RST1 (messengerclear.live.com) binary secret
+        // matches[4]: ...
+        // matches[5]: RST2 (messenger.msn.com) ticket
+        // matches[6]: ...
+        // matches[7]: RST3 (contacts.msn.com) ticket
+        // matches[8]: ...
+        // matches[9]: RST4 (messengersecure.live.com) ticket
+        // matches[10]: ...
+        // matches[11]: RST5 (spaces.live.com) ticket
+        // matches[12]: ...
+        // matches[13]: RST6 (storage.live.com) ticket
+        // matches[14]: ...
+
+        // so
+        // ticket => $matches[1]
+        // secret => $matches[3]
+        // web_ticket => $matches[5]
+        // contact_ticket => $matches[7]
+        // oim_ticket => $matches[9]
+        // space_ticket => $matches[11]
+        // storage_ticket => $matches[13]
+
+        // yes, we get ticket
+        $aTickets = array(
+            'ticket' => html_entity_decode($matches[1]),
+            'secret' => html_entity_decode($matches[3]),
+            'web_ticket' => html_entity_decode($matches[5]),
+            'contact_ticket' => html_entity_decode($matches[7]),
+            'oim_ticket' => html_entity_decode($matches[9]),
+            'space_ticket' => html_entity_decode($matches[11]),
+            'storage_ticket' => html_entity_decode($matches[13])
+        );        
+        $this->ticket=$aTickets;
+        $this->debug_message(var_export($aTickets, true));
+        $ABAuthHeaderArray=array(
+  'ABAuthHeader'=>array(
+    ':'=>array('xmlns'=>'http://www.msn.com/webservices/AddressBook'),
+    'ManagedGroupRequest'=>false,
+    'TicketToken'=>htmlspecialchars($this->ticket['contact_ticket']),
+        )
+        );
+        $this->ABAuthHeader=new SoapHeader("http://www.msn.com/webservices/AddressBook","ABAuthHeader", $this->Array2SoapVar($ABAuthHeaderArray));
+        file_put_contents('/tmp/STTicket.txt',htmlspecialchars($this->ticket['storage_ticket']));
+        //$this->debug_message("StorageTicket:\n",htmlspecialchars($this->ticket['storage_ticket']));
+        return $aTickets;
+    }
+    private function UpdateContacts()
+    {
+        $ABApplicationHeaderArray=array(
+ 'ABApplicationHeader'=>array(
+  ':'=>array('xmlns'=>'http://www.msn.com/webservices/AddressBook'),
+  'ApplicationId'=>'CFE80F9D-180F-4399-82AB-413F33A1FA11',
+  'IsMigration'=>false,
+  'PartnerScenario'=>'ContactSave'
+  )
+  );
+  $ABApplicationHeader=new SoapHeader("http://www.msn.com/webservices/AddressBook",'ABApplicationHeader', $this->Array2SoapVar($ABApplicationHeaderArray));
+  $ABFindAllArray=array(
+   'ABFindAll'=>array(
+    ':'=>array('xmlns'=>'http://www.msn.com/webservices/AddressBook'),
+    'abId'=>'00000000-0000-0000-0000-000000000000',
+    'abView'=>'Full',
+    'lastChange'=>'0001-01-01T00:00:00.0000000-08:00',
+  )
+  );
+  $ABFindAll=new SoapParam($this->Array2SoapVar($ABFindAllArray),'ABFindAll');
+  $this->ABService->__setSoapHeaders(array($ABApplicationHeader,$this->ABAuthHeader));
+  $this->Contacts=array();
+  try
+  {
+      $this->debug_message("*** Update Contacts...");
+      $Result=$this->ABService->ABFindAll($ABFindAll);
+      $this->debug_message("*** Result:\n".print_r($Result,true)."\n".$this->ABService->__getLastResponse());
+      foreach($Result->ABFindAllResult->contacts->Contact as $Contact)
+      $this->Contacts[$Contact->contactInfo->passportName]=$Contact;
+  }
+  catch(Exception $e)
+  {
+      $this->debug_message("*** Update Contacts Error \nRequest:".$this->ABService->__getLastRequest()."\nError:".$e->getMessage());
+  }
+    }
+    protected function addContact($email, $network, $display = '', $sendADL = false)
+    {
+        if ($network != 1) return true;
+        if(isset($this->Contacts[$email])) return true;
+
+        $ABContactAddArray=array(
+   'ABContactAdd'=>array(
+    ':'=>array('xmlns'=>'http://www.msn.com/webservices/AddressBook'),
+    'abId'=>'00000000-0000-0000-0000-000000000000',
+    'contacts'=>array(
+     'Contact'=>array(
+      ':'=>array('xmlns'=>'http://www.msn.com/webservices/AddressBook'),
+      'contactInfo'=>array(
+       'contactType'=>'LivePending',
+       'passportName'=>$email,
+       'isMessengerUser'=>true,
+       'MessengerMemberInfo'=>array(
+        'DisplayName'=>$email
+        )
+        )
+        )
+        ),
+    'options'=>array(
+     'EnableAllowListManagement'=>true
+        )
+        )
+        );
+        $ABContactAdd=new SoapParam($this->Array2SoapVar($ABContactAddArray),'ABContactAdd');
+        try
+        {
+            $this->debug_message("*** Add Contacts $email...");
+            $this->ABService->ABContactAdd($ABContactAdd);
+        }
+        catch(Exception $e)
+        {
+            $this->debug_message("*** Add Contacts Error \nRequest:".$this->ABService->__getLastRequest()."\nError:".$e->getMessage());
+        }
+        if ($sendADL && !feof($this->NSfp)) {
+            @list($u_name, $u_domain) = @explode('@', $email);
+            foreach (array('1', '2') as $l) {
+                $str = '<ml l="1"><d n="'.$u_domain.'"><c n="'.$u_name.'" l="'.$l.'" t="'.$network.'" /></d></ml>';
+                $len = strlen($str);
+                // NS: >>> ADL {id} {size}
+                $this->ns_writeln("ADL $this->id $len");
+                $this->ns_writedata($str);
+            }
+        }
+        $this->UpdateContacts();
+        return true;
+
+
+        $ABContactAdd=new SoapParam($this->Array2SoapVar($ABContactAddArray),'ABContactAdd');
+
+        // add contact for WLM
+        $ticket = htmlspecialchars($this->ticket['contact_ticket']);
+        $displayName = htmlspecialchars($display);
+        $user = $email;
+
+        $XML = '<?xml version="1.0" encoding="utf-8"?>
+<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/"
+               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+               xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+               xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/">
+<soap:Header>
+    <ABApplicationHeader xmlns="http://www.msn.com/webservices/AddressBook">
+        <ApplicationId>CFE80F9D-180F-4399-82AB-413F33A1FA11</ApplicationId>
+        <IsMigration>false</IsMigration>
+        <PartnerScenario>ContactSave</PartnerScenario>
+    </ABApplicationHeader>
+    <ABAuthHeader xmlns="http://www.msn.com/webservices/AddressBook">
+        <ManagedGroupRequest>false</ManagedGroupRequest>
+        <TicketToken>'.$ticket.'</TicketToken>
+    </ABAuthHeader>
+</soap:Header>
+<soap:Body>
+    <ABContactAdd xmlns="http://www.msn.com/webservices/AddressBook">
+        <abId>00000000-0000-0000-0000-000000000000</abId>
+        <contacts>
+            <Contact xmlns="http://www.msn.com/webservices/AddressBook">
+                <contactInfo>
+                    <contactType>LivePending</contactType>
+                    <passportName>'.$user.'</passportName>
+                    <isMessengerUser>true</isMessengerUser>
+                    <MessengerMemberInfo>
+                        <DisplayName>'.$displayName.'</DisplayName>
+                    </MessengerMemberInfo>
+                </contactInfo>
+            </Contact>
+        </contacts>
+        <options>
+            <EnableAllowListManagement>true</EnableAllowListManagement>
+        </options>
+    </ABContactAdd>
+</soap:Body>
+</soap:Envelope>';
+
+        $header_array = array(
+            'SOAPAction: '.$this->addcontact_soap,
+            'Content-Type: text/xml; charset=utf-8',
+            'User-Agent: MSN Explorer/9.0 (MSN 8.0; TmstmpExt)'
+            );
+
+            $this->debug_message("*** URL: $this->addcontact_url");
+            $this->debug_message("*** Sending SOAP:\n$XML");
+            $curl = curl_init();
+            curl_setopt($curl, CURLOPT_URL, $this->addcontact_url);
+            curl_setopt($curl, CURLOPT_HTTPHEADER, $header_array);
+            curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
+            curl_setopt($curl, CURLOPT_FOLLOWLOCATION, 1);
+            curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, 0);
+            if ($this->debug) curl_setopt($curl, CURLOPT_HEADER, 1);
+            curl_setopt($curl, CURLOPT_POST, 1);
+            curl_setopt($curl, CURLOPT_POSTFIELDS, $XML);
+            $data = curl_exec($curl);
+            $http_code = curl_getinfo($curl, CURLINFO_HTTP_CODE);
+            curl_close($curl);
+            $this->debug_message("*** Get Result:\n$data");
+
+            if ($http_code != 200) {
+                preg_match('#<faultcode>(.*)</faultcode><faultstring>(.*)</faultstring>#', $data, $matches);
+                if (count($matches) == 0) {
+                    $this->log_message("*** can't add contact (network: $network) $email");
+                    return false;
+                }
+                $faultcode = trim($matches[1]);
+                $faultstring = trim($matches[2]);
+                $this->log_message("*** can't add contact (network: $network) $email, error code: $faultcode, $faultstring");
+                return false;
+            }
+            $this->log_message("*** add contact (network: $network) $email");
+            if ($sendADL && !feof($this->NSfp)) {
+                @list($u_name, $u_domain) = @explode('@', $email);
+                foreach (array('1', '2') as $l) {
+                    $str = '<ml l="1"><d n="'.$u_domain.'"><c n="'.$u_name.'" l="'.$l.'" t="'.$network.'" /></d></ml>';
+                    $len = strlen($str);
+                    // NS: >>> ADL {id} {size}
+                    $this->ns_writeln("ADL $this->id $len");
+                    $this->ns_writedata($str);
+                }
+            }
+            $this->UpdateContacts();
+            return true;
+    }
+
+    function delMemberFromList($memberID, $email, $network, $list) {
+        if ($network != 1 && $network != 32) return true;
+        if ($memberID === false) return true;
+        $user = $email;
+        $ticket = htmlspecialchars($this->ticket['contact_ticket']);
+        if ($network == 1)
+        $XML = '<?xml version="1.0" encoding="utf-8"?>
+<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/"
+               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+               xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+               xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/">
+<soap:Header>
+    <ABApplicationHeader xmlns="http://www.msn.com/webservices/AddressBook">
+        <ApplicationId>996CDE1E-AA53-4477-B943-2BE802EA6166</ApplicationId>
+        <IsMigration>false</IsMigration>
+        <PartnerScenario>ContactMsgrAPI</PartnerScenario>
+    </ABApplicationHeader>
+    <ABAuthHeader xmlns="http://www.msn.com/webservices/AddressBook">
+        <ManagedGroupRequest>false</ManagedGroupRequest>
+        <TicketToken>'.$ticket.'</TicketToken>
+    </ABAuthHeader>
+</soap:Header>
+<soap:Body>
+    <DeleteMember xmlns="http://www.msn.com/webservices/AddressBook">
+        <serviceHandle>
+            <Id>0</Id>
+            <Type>Messenger</Type>
+            <ForeignId></ForeignId>
+        </serviceHandle>
+        <memberships>
+            <Membership>
+                <MemberRole>'.$list.'</MemberRole>
+                <Members>
+                    <Member xsi:type="PassportMember" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+                        <Type>Passport</Type>
+                        <MembershipId>'.$memberID.'</MembershipId>
+                        <State>Accepted</State>
+                    </Member>
+                </Members>
+            </Membership>
+        </memberships>
+    </DeleteMember>
+</soap:Body>
+</soap:Envelope>';
+        else
+        $XML = '<?xml version="1.0" encoding="utf-8"?>
+<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/"
+               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+               xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+               xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/">
+<soap:Header>
+    <ABApplicationHeader xmlns="http://www.msn.com/webservices/AddressBook">
+        <ApplicationId>996CDE1E-AA53-4477-B943-2BE802EA6166</ApplicationId>
+        <IsMigration>false</IsMigration>
+        <PartnerScenario>ContactMsgrAPI</PartnerScenario>
+    </ABApplicationHeader>
+    <ABAuthHeader xmlns="http://www.msn.com/webservices/AddressBook">
+        <ManagedGroupRequest>false</ManagedGroupRequest>
+        <TicketToken>'.$ticket.'</TicketToken>
+    </ABAuthHeader>
+</soap:Header>
+<soap:Body>
+    <DeleteMember xmlns="http://www.msn.com/webservices/AddressBook">
+        <serviceHandle>
+            <Id>0</Id>
+            <Type>Messenger</Type>
+            <ForeignId></ForeignId>
+        </serviceHandle>
+        <memberships>
+            <Membership>
+                <MemberRole>'.$list.'</MemberRole>
+                <Members>
+                    <Member xsi:type="EmailMember" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+                        <Type>Email</Type>
+                        <MembershipId>'.$memberID.'</MembershipId>
+                        <State>Accepted</State>
+                    </Member>
+                </Members>
+            </Membership>
+        </memberships>
+    </DeleteMember>
+</soap:Body>
+</soap:Envelope>';
+
+        $header_array = array(
+            'SOAPAction: '.$this->delmember_soap,
+            'Content-Type: text/xml; charset=utf-8',
+            'User-Agent: MSN Explorer/9.0 (MSN 8.0; TmstmpExt)'
+            );
+
+            $this->debug_message("*** URL: $this->delmember_url");
+            $this->debug_message("*** Sending SOAP:\n$XML");
+            $curl = curl_init();
+            curl_setopt($curl, CURLOPT_URL, $this->delmember_url);
+            curl_setopt($curl, CURLOPT_HTTPHEADER, $header_array);
+            curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
+            curl_setopt($curl, CURLOPT_FOLLOWLOCATION, 1);
+            curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, 0);
+            if ($this->debug) curl_setopt($curl, CURLOPT_HEADER, 1);
+            curl_setopt($curl, CURLOPT_POST, 1);
+            curl_setopt($curl, CURLOPT_POSTFIELDS, $XML);
+            $data = curl_exec($curl);
+            $http_code = curl_getinfo($curl, CURLINFO_HTTP_CODE);
+            curl_close($curl);
+            $this->debug_message("*** Get Result:\n$data");
+
+            if ($http_code != 200) {
+                preg_match('#<faultcode>(.*)</faultcode><faultstring>(.*)</faultstring>#', $data, $matches);
+                if (count($matches) == 0) {
+                    $this->log_message("*** can't delete member (network: $network) $email ($memberID) to $list");
+                    return false;
+                }
+                $faultcode = trim($matches[1]);
+                $faultstring = trim($matches[2]);
+                if (strcasecmp($faultcode, 'soap:Client') || stripos($faultstring, 'Member does not exist') === false) {
+                    $this->log_message("*** can't delete member (network: $network) $email ($memberID) to $list, error code: $faultcode, $faultstring");
+                    return false;
+                }
+                $this->log_message("*** delete member (network: $network) $email ($memberID) from $list, not exist");
+                return true;
+            }
+            $this->log_message("*** delete member (network: $network) $email ($memberID) from $list");
+            return true;
+    }
+
+    function addMemberToList($email, $network, $list) {
+        if ($network != 1 && $network != 32) return true;
+        $ticket = htmlspecialchars($this->ticket['contact_ticket']);
+        $user = $email;
+
+        if ($network == 1)
+        $XML = '<?xml version="1.0" encoding="utf-8"?>
+<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/"
+               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+               xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+               xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/">
+<soap:Header>
+    <ABApplicationHeader xmlns="http://www.msn.com/webservices/AddressBook">
+        <ApplicationId>996CDE1E-AA53-4477-B943-2BE802EA6166</ApplicationId>
+        <IsMigration>false</IsMigration>
+        <PartnerScenario>ContactMsgrAPI</PartnerScenario>
+    </ABApplicationHeader>
+    <ABAuthHeader xmlns="http://www.msn.com/webservices/AddressBook">
+        <ManagedGroupRequest>false</ManagedGroupRequest>
+        <TicketToken>'.$ticket.'</TicketToken>
+    </ABAuthHeader>
+</soap:Header>
+<soap:Body>
+    <AddMember xmlns="http://www.msn.com/webservices/AddressBook">
+        <serviceHandle>
+            <Id>0</Id>
+            <Type>Messenger</Type>
+            <ForeignId></ForeignId>
+        </serviceHandle>
+        <memberships>
+            <Membership>
+                <MemberRole>'.$list.'</MemberRole>
+                <Members>
+                    <Member xsi:type="PassportMember" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+                        <Type>Passport</Type>
+                        <State>Accepted</State>
+                        <PassportName>'.$user.'</PassportName>
+                    </Member>
+                </Members>
+            </Membership>
+        </memberships>
+    </AddMember>
+</soap:Body>
+</soap:Envelope>';
+        else
+        $XML = '<?xml version="1.0" encoding="utf-8"?>
+<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/"
+               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+               xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+               xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/">
+<soap:Header>
+    <ABApplicationHeader xmlns="http://www.msn.com/webservices/AddressBook">
+        <ApplicationId>996CDE1E-AA53-4477-B943-2BE802EA6166</ApplicationId>
+        <IsMigration>false</IsMigration>
+        <PartnerScenario>ContactMsgrAPI</PartnerScenario>
+    </ABApplicationHeader>
+    <ABAuthHeader xmlns="http://www.msn.com/webservices/AddressBook">
+        <ManagedGroupRequest>false</ManagedGroupRequest>
+        <TicketToken>'.$ticket.'</TicketToken>
+    </ABAuthHeader>
+</soap:Header>
+<soap:Body>
+    <AddMember xmlns="http://www.msn.com/webservices/AddressBook">
+        <serviceHandle>
+            <Id>0</Id>
+            <Type>Messenger</Type>
+            <ForeignId></ForeignId>
+        </serviceHandle>
+        <memberships>
+            <Membership>
+                <MemberRole>'.$list.'</MemberRole>
+                <Members>
+                    <Member xsi:type="EmailMember" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+                        <Type>Email</Type>
+                        <State>Accepted</State>
+                        <Email>'.$user.'</Email>
+                        <Annotations>
+                            <Annotation>
+                                <Name>MSN.IM.BuddyType</Name>
+                                <Value>32:YAHOO</Value>
+                            </Annotation>
+                        </Annotations>
+                    </Member>
+                </Members>
+            </Membership>
+        </memberships>
+    </AddMember>
+</soap:Body>
+</soap:Envelope>';
+        $header_array = array(
+            'SOAPAction: '.$this->addmember_soap,
+            'Content-Type: text/xml; charset=utf-8',
+            'User-Agent: MSN Explorer/9.0 (MSN 8.0; TmstmpExt)'
+            );
+
+            $this->debug_message("*** URL: $this->addmember_url");
+            $this->debug_message("*** Sending SOAP:\n$XML");
+            $curl = curl_init();
+            curl_setopt($curl, CURLOPT_URL, $this->addmember_url);
+            curl_setopt($curl, CURLOPT_HTTPHEADER, $header_array);
+            curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
+            curl_setopt($curl, CURLOPT_FOLLOWLOCATION, 1);
+            curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, 0);
+            if ($this->debug) curl_setopt($curl, CURLOPT_HEADER, 1);
+            curl_setopt($curl, CURLOPT_POST, 1);
+            curl_setopt($curl, CURLOPT_POSTFIELDS, $XML);
+            $data = curl_exec($curl);
+            $http_code = curl_getinfo($curl, CURLINFO_HTTP_CODE);
+            curl_close($curl);
+            $this->debug_message("*** Get Result:\n$data");
+
+            if ($http_code != 200) {
+                preg_match('#<faultcode>(.*)</faultcode><faultstring>(.*)</faultstring>#', $data, $matches);
+                if (count($matches) == 0) {
+                    $this->log_message("*** can't add member (network: $network) $email to $list");
+                    return false;
+                }
+                $faultcode = trim($matches[1]);
+                $faultstring = trim($matches[2]);
+                if (strcasecmp($faultcode, 'soap:Client') || stripos($faultstring, 'Member already exists') === false) {
+                    $this->log_message("*** can't add member (network: $network) $email to $list, error code: $faultcode, $faultstring");
+                    return false;
+                }
+                $this->log_message("*** add member (network: $network) $email to $list, already exist!");
+                return true;
+            }
+            $this->log_message("*** add member (network: $network) $email to $list");
+            return true;
+    }
+
+    function getMembershipList($returnData=false) {
+        $ticket = htmlspecialchars($this->ticket['contact_ticket']);
+        $XML = '<?xml version="1.0" encoding="utf-8"?>
+<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/"
+               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+               xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+               xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/">
+<soap:Header>
+    <ABApplicationHeader xmlns="http://www.msn.com/webservices/AddressBook">
+        <ApplicationId>996CDE1E-AA53-4477-B943-2BE802EA6166</ApplicationId>
+        <IsMigration>false</IsMigration>
+        <PartnerScenario>Initial</PartnerScenario>
+    </ABApplicationHeader>
+    <ABAuthHeader xmlns="http://www.msn.com/webservices/AddressBook">
+        <ManagedGroupRequest>false</ManagedGroupRequest>
+        <TicketToken>'.$ticket.'</TicketToken>
+    </ABAuthHeader>
+</soap:Header>
+<soap:Body>
+    <FindMembership xmlns="http://www.msn.com/webservices/AddressBook">
+        <serviceFilter>
+            <Types>
+                <ServiceType>Messenger</ServiceType>
+                <ServiceType>Invitation</ServiceType>
+                <ServiceType>SocialNetwork</ServiceType>
+                <ServiceType>Space</ServiceType>
+                <ServiceType>Profile</ServiceType>
+            </Types>
+        </serviceFilter>
+    </FindMembership>
+</soap:Body>
+</soap:Envelope>';
+        $header_array = array(
+            'SOAPAction: '.$this->membership_soap,
+            'Content-Type: text/xml; charset=utf-8',
+            'User-Agent: MSN Explorer/9.0 (MSN 8.0; TmstmpExt)'
+            );
+            $this->debug_message("*** URL: $this->membership_url");
+            $this->debug_message("*** Sending SOAP:\n$XML");
+            $curl = curl_init();
+            curl_setopt($curl, CURLOPT_URL, $this->membership_url);
+            curl_setopt($curl, CURLOPT_HTTPHEADER, $header_array);
+            curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
+            curl_setopt($curl, CURLOPT_FOLLOWLOCATION, 1);
+            curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, 0);
+            if ($this->debug) curl_setopt($curl, CURLOPT_HEADER, 1);
+            curl_setopt($curl, CURLOPT_POST, 1);
+            curl_setopt($curl, CURLOPT_POSTFIELDS, $XML);
+            $data = curl_exec($curl);
+            $http_code = curl_getinfo($curl, CURLINFO_HTTP_CODE);
+            curl_close($curl);
+            $this->debug_message("*** Get Result:\n$data");
+            if(($http_code != 200)||(!$returnData)) return array();
+            $p = $data;
+            $aMemberships = array();
+            while (1) {
+                //$this->debug_message("search p = $p");
+                $start = strpos($p, '<Membership>');
+                $end = strpos($p, '</Membership>');
+                if ($start === false || $end === false || $start > $end) break;
+                //$this->debug_message("start = $start, end = $end");
+                $end += 13;
+                $sMembership = substr($p, $start, $end - $start);
+                $aMemberships[] = $sMembership;
+                //$this->debug_message("add sMembership = $sMembership");
+                $p = substr($p, $end);
+            }
+            //$this->debug_message("aMemberships = ".var_export($aMemberships, true));
+
+            $aContactList = array();
+            foreach ($aMemberships as $sMembership) {
+                //$this->debug_message("sMembership = $sMembership");
+                if (isset($matches)) unset($matches);
+                preg_match('#<MemberRole>(.*)</MemberRole>#', $sMembership, $matches);
+                if (count($matches) == 0) continue;
+                $sMemberRole = $matches[1];
+                //$this->debug_message("MemberRole = $sMemberRole");
+                if ($sMemberRole != 'Allow' && $sMemberRole != 'Reverse' && $sMemberRole != 'Pending') continue;
+                $p = $sMembership;
+                if (isset($aMembers)) unset($aMembers);
+                $aMembers = array();
+                while (1) {
+                    //$this->debug_message("search p = $p");
+                    $start = strpos($p, '<Member xsi:type="');
+                    $end = strpos($p, '</Member>');
+                    if ($start === false || $end === false || $start > $end) break;
+                    //$this->debug_message("start = $start, end = $end");
+                    $end += 9;
+                    $sMember = substr($p, $start, $end - $start);
+                    $aMembers[] = $sMember;
+                    //$this->debug_message("add sMember = $sMember");
+                    $p = substr($p, $end);
+                }
+                //$this->debug_message("aMembers = ".var_export($aMembers, true));
+                foreach ($aMembers as $sMember) {
+                    //$this->debug_message("sMember = $sMember");
+                    if (isset($matches)) unset($matches);
+                    preg_match('#<Member xsi\:type="([^"]*)">#', $sMember, $matches);
+                    if (count($matches) == 0) continue;
+                    $sMemberType = $matches[1];
+                    //$this->debug_message("MemberType = $sMemberType");
+                    $network = -1;
+                    preg_match('#<MembershipId>(.*)</MembershipId>#', $sMember, $matches);
+                    if (count($matches) == 0) continue;
+                    $id = $matches[1];
+                    if ($sMemberType == 'PassportMember') {
+                        if (strpos($sMember, '<Type>Passport</Type>') === false) continue;
+                        $network = 1;
+                        preg_match('#<PassportName>(.*)</PassportName>#', $sMember, $matches);
+                    }
+                    else if ($sMemberType == 'EmailMember') {
+                        if (strpos($sMember, '<Type>Email</Type>') === false) continue;
+                        // Value is 32: or 32:YAHOO
+                        preg_match('#<Annotation><Name>MSN.IM.BuddyType</Name><Value>(.*):(.*)</Value></Annotation>#', $sMember, $matches);
+                        if (count($matches) == 0) continue;
+                        if ($matches[1] != 32) continue;
+                        $network = 32;
+                        preg_match('#<Email>(.*)</Email>#', $sMember, $matches);
+                    }
+                    if ($network == -1) continue;
+                    if (count($matches) > 0) {
+                        $email = $matches[1];
+                        @list($u_name, $u_domain) = @explode('@', $email);
+                        if ($u_domain == NULL) continue;
+                        $aContactList[$u_domain][$u_name][$network][$sMemberRole] = $id;
+                        $this->log_message("*** add new contact (network: $network, status: $sMemberRole): $u_name@$u_domain ($id)");
+                    }
+                }
+            }
+            return $aContactList;
+    }
+
+    private function connect($user, $password, $redirect_server = '', $redirect_port = 1863) {
+        $this->id = 1;
+        if ($redirect_server === '') {
+            $this->NSfp = @fsockopen($this->server, $this->port, $errno, $errstr, 5);
+            if (!$this->NSfp) {
+                $this->error = "Can't connect to $this->server:$this->port, error => $errno, $errstr";
+                return false;
+            }
+        }
+        else {
+            $this->NSfp = @fsockopen($redirect_server, $redirect_port, $errno, $errstr, 5);
+            if (!$this->NSfp) {
+                $this->error = "Can't connect to $redirect_server:$redirect_port, error => $errno, $errstr";
+                return false;
+            }
+        }
+
+        stream_set_timeout($this->NSfp, $this->NSStreamTimeout);
+        $this->authed = false;
+        // MSNP9
+        // NS: >> VER {id} MSNP9 CVR0
+        // MSNP15
+        // NS: >>> VER {id} MSNP15 CVR0
+        $this->ns_writeln("VER $this->id $this->protocol CVR0");
+
+        $start_tm = time();
+        while (!feof($this->NSfp))
+        {
+            $data = $this->ns_readln();
+            // no data?
+            if ($data === false) {
+                if ($this->timeout > 0) {
+                    $now_tm = time();
+                    $used_time = ($now_tm >= $start_tm) ? $now_tm - $start_tm : $now_tm;
+                    if ($used_time > $this->timeout) {
+                        // logout now
+                        // NS: >>> OUT
+                        $this->ns_writeln("OUT");
+                        fclose($this->NSfp);
+                        $this->error = 'Timeout, maybe protocol changed!';
+                        $this->debug_message("*** $this->error");
+                        return false;
+                    }
+                }
+                continue;
+            }
+            $code = substr($data, 0, 3);
+            $start_tm = time();
+
+            switch ($code) {
+                case 'VER':
+                    // MSNP9
+                    // NS: <<< VER {id} MSNP9 CVR0
+                    // NS: >>> CVR {id} 0x0409 winnt 5.1 i386 MSMSGS 6.0.0602 msmsgs {user}
+                    // MSNP15
+                    // NS: <<< VER {id} MSNP15 CVR0
+                    // NS: >>> CVR {id} 0x0409 winnt 5.1 i386 MSMSGS 8.1.0178 msmsgs {user}
+                    $this->ns_writeln("CVR $this->id 0x0409 winnt 5.1 i386 MSMSGS $this->buildver msmsgs $user");
+                    break;
+
+                case 'CVR':
+                    // MSNP9
+                    // NS: <<< CVR {id} {ver_list} {download_serve} ....
+                    // NS: >>> USR {id} TWN I {user}
+                    // MSNP15
+                    // NS: <<< CVR {id} {ver_list} {download_serve} ....
+                    // NS: >>> USR {id} SSO I {user}
+                    $this->ns_writeln("USR $this->id $this->login_method I $user");
+                    break;
+
+                case 'USR':
+                    // already login for passport site, finish the login process now.
+                    // NS: <<< USR {id} OK {user} {verify} 0
+                    if ($this->authed) return true;
+                    // max. 16 digits for password
+                    if (strlen($password) > 16)
+                    $password = substr($password, 0, 16);
+
+                    $this->user = $user;
+                    $this->password = $password;
+                    // NS: <<< USR {id} SSO S {policy} {nonce}
+                    @list(/* USR */, /* id */, /* SSO */, /* S */, $policy, $nonce,) = @explode(' ', $data);
+
+                    $this->passport_policy = $policy;
+                    $aTickets = $this->get_passport_ticket();
+                    if (!$aTickets || !is_array($aTickets)) {
+                        // logout now
+                        // NS: >>> OUT
+                        $this->ns_writeln("OUT");
+                        fclose($this->NSfp);
+                        $this->error = 'Passport authenticated fail!';
+                        $this->debug_message("*** $this->error");
+                        return false;
+                    }
+
+                    $ticket = $aTickets['ticket'];
+                    $secret = $aTickets['secret'];
+                    $this->ticket = $aTickets;
+                    $login_code = $this->generateLoginBLOB($secret, $nonce);
+
+                    // NS: >>> USR {id} SSO S {ticket} {login_code}
+                    $this->ns_writeln("USR $this->id $this->login_method S $ticket $login_code");
+                    $this->authed = true;
+                    break;
+
+                case 'XFR':
+                    // main login server will redirect to anther NS after USR command
+                    // MSNP9
+                    // NS: <<< XFR {id} NS {server} 0 {server}
+                    // MSNP15
+                    // NS: <<< XFR {id} NS {server} U D
+                    @list(/* XFR */, /* id */, $Type, $server, /* ... */) = @explode(' ', $data);
+                    if($Type!='NS') break;
+                    @list($ip, $port) = @explode(':', $server);
+                    // this connection will close after XFR
+                    fclose($this->NSfp);
+
+                    $this->NSfp = @fsockopen($ip, $port, $errno, $errstr, 5);
+                    if (!$this->NSfp) {
+                        $this->error = "Can't connect to $ip:$port, error => $errno, $errstr";
+                        $this->debug_message("*** $this->error");
+                        return false;
+                    }
+
+                    stream_set_timeout($this->NSfp, $this->NSStreamTimeout);
+                    // MSNP9
+                    // NS: >> VER {id} MSNP9 CVR0
+                    // MSNP15
+                    // NS: >>> VER {id} MSNP15 CVR0
+                    $this->ns_writeln("VER $this->id $this->protocol CVR0");
+                    break;
+
+                case 'GCF':
+                    // return some policy data after 'USR {id} SSO I {user}' command
+                    // NS: <<< GCF 0 {size}
+                    @list(/* GCF */, /* 0 */, $size,) = @explode(' ', $data);
+                    // we don't need the data, just read it and drop
+                    if (is_numeric($size) && $size > 0)
+                    $this->ns_readdata($size);
+                    break;
+
+                default:
+                    // we'll quit if got any error
+                    if (is_numeric($code)) {
+                        // logout now
+                        // NS: >>> OUT
+                        $this->ns_writeln("OUT");
+                        fclose($this->NSfp);
+                        $this->error = "Error code: $code, please check the detail information from: http://msnpiki.msnfanatic.com/index.php/Reference:Error_List";
+                        $this->debug_message("*** $this->error");
+                        return false;
+                    }
+                    // unknown response from server, just ignore it
+                    break;
+            }
+        }
+        // never goto here
+    }
+
+    function derive_key($key, $magic) {
+        $hash1 = mhash(MHASH_SHA1, $magic, $key);
+        $hash2 = mhash(MHASH_SHA1, $hash1.$magic, $key);
+        $hash3 = mhash(MHASH_SHA1, $hash1, $key);
+        $hash4 = mhash(MHASH_SHA1, $hash3.$magic, $key);
+        return $hash2.substr($hash4, 0, 4);
+    }
+
+    function generateLoginBLOB($key, $challenge) {
+        $key1 = base64_decode($key);
+        $key2 = $this->derive_key($key1, 'WS-SecureConversationSESSION KEY HASH');
+        $key3 = $this->derive_key($key1, 'WS-SecureConversationSESSION KEY ENCRYPTION');
+
+        // get hash of challenge using key2
+        $hash = mhash(MHASH_SHA1, $challenge, $key2);
+
+        // get 8 bytes random data
+        $iv = substr(base64_encode(rand(1000,9999).rand(1000,9999)), 2, 8);
+
+        $cipher = mcrypt_cbc(MCRYPT_3DES, $key3, $challenge."\x08\x08\x08\x08\x08\x08\x08\x08", MCRYPT_ENCRYPT, $iv);
+
+        $blob = pack('LLLLLLL', 28, 1, 0x6603, 0x8004, 8, 20, 72);
+        $blob .= $iv;
+        $blob .= $hash;
+        $blob .= $cipher;
+
+        return base64_encode($blob);
+    }
+
+    function getOIM_maildata() {
+        preg_match('#t=(.*)&p=(.*)#', $this->ticket['web_ticket'], $matches);
+        if (count($matches) == 0) {
+            $this->debug_message('*** no web ticket?');
+            return false;
+        }
+        $t = htmlspecialchars($matches[1]);
+        $p = htmlspecialchars($matches[2]);
+        $XML = '<?xml version="1.0" encoding="utf-8"?>
+<soap:Envelope xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+               xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+               xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/">
+<soap:Header>
+  <PassportCookie xmlns="http://www.hotmail.msn.com/ws/2004/09/oim/rsi">
+    <t>'.$t.'</t>
+    <p>'.$p.'</p>
+  </PassportCookie>
+</soap:Header>
+<soap:Body>
+  <GetMetadata xmlns="http://www.hotmail.msn.com/ws/2004/09/oim/rsi" />
+</soap:Body>
+</soap:Envelope>';
+
+        $header_array = array(
+            'SOAPAction: '.$this->oim_maildata_soap,
+            'Content-Type: text/xml; charset=utf-8',
+            'User-Agent: Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1; Messenger '.$this->buildver.')'
+            );
+
+            $this->debug_message("*** URL: $this->oim_maildata_url");
+            $this->debug_message("*** Sending SOAP:\n$XML");
+            $curl = curl_init();
+            curl_setopt($curl, CURLOPT_URL, $this->oim_maildata_url);
+            curl_setopt($curl, CURLOPT_HTTPHEADER, $header_array);
+            curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
+            curl_setopt($curl, CURLOPT_FOLLOWLOCATION, 1);
+            curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, 0);
+            if ($this->debug) curl_setopt($curl, CURLOPT_HEADER, 1);
+            curl_setopt($curl, CURLOPT_POST, 1);
+            curl_setopt($curl, CURLOPT_POSTFIELDS, $XML);
+            $data = curl_exec($curl);
+            $http_code = curl_getinfo($curl, CURLINFO_HTTP_CODE);
+            curl_close($curl);
+            $this->debug_message("*** Get Result:\n$data");
+
+            if ($http_code != 200) {
+                $this->debug_message("*** Can't get OIM maildata! http code: $http_code");
+                return false;
+            }
+
+            // <GetMetadataResponse xmlns="http://www.hotmail.msn.com/ws/2004/09/oim/rsi">See #XML_Data</GetMetadataResponse>
+            preg_match('#<GetMetadataResponse([^>]*)>(.*)</GetMetadataResponse>#', $data, $matches);
+            if (count($matches) == 0) {
+                $this->debug_message("*** Can't get OIM maildata");
+                return '';
+            }
+            return $matches[2];
+    }
+
+    function getOIM_message($msgid) {
+        preg_match('#t=(.*)&p=(.*)#', $this->ticket['web_ticket'], $matches);
+        if (count($matches) == 0) {
+            $this->debug_message('*** no web ticket?');
+            return false;
+        }
+        $t = htmlspecialchars($matches[1]);
+        $p = htmlspecialchars($matches[2]);
+
+        // read OIM
+        $XML = '<?xml version="1.0" encoding="utf-8"?>
+<soap:Envelope xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+               xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+               xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/">
+<soap:Header>
+  <PassportCookie xmlns="http://www.hotmail.msn.com/ws/2004/09/oim/rsi">
+    <t>'.$t.'</t>
+    <p>'.$p.'</p>
+  </PassportCookie>
+</soap:Header>
+<soap:Body>
+  <GetMessage xmlns="http://www.hotmail.msn.com/ws/2004/09/oim/rsi">
+    <messageId>'.$msgid.'</messageId>
+    <alsoMarkAsRead>false</alsoMarkAsRead>
+  </GetMessage>
+</soap:Body>
+</soap:Envelope>';
+
+        $header_array = array(
+            'SOAPAction: '.$this->oim_read_soap,
+            'Content-Type: text/xml; charset=utf-8',
+            'User-Agent: Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1; Messenger '.$this->buildver.')'
+            );
+
+            $this->debug_message("*** URL: $this->oim_read_url");
+            $this->debug_message("*** Sending SOAP:\n$XML");
+            $curl = curl_init();
+            curl_setopt($curl, CURLOPT_URL, $this->oim_read_url);
+            curl_setopt($curl, CURLOPT_HTTPHEADER, $header_array);
+            curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
+            curl_setopt($curl, CURLOPT_FOLLOWLOCATION, 1);
+            curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, 0);
+            if ($this->debug) curl_setopt($curl, CURLOPT_HEADER, 1);
+            curl_setopt($curl, CURLOPT_POST, 1);
+            curl_setopt($curl, CURLOPT_POSTFIELDS, $XML);
+            $data = curl_exec($curl);
+            $http_code = curl_getinfo($curl, CURLINFO_HTTP_CODE);
+            curl_close($curl);
+            $this->debug_message("*** Get Result:\n$data");
+
+            if ($http_code != 200) {
+                $this->debug_message("*** Can't get OIM: $msgid, http code = $http_code");
+                return false;
+            }
+
+            // why can't use preg_match('#<GetMessageResult>(.*)</GetMessageResult>#', $data, $matches)?
+            // multi-lines?
+            $start = strpos($data, '<GetMessageResult>');
+            $end = strpos($data, '</GetMessageResult>');
+            if ($start === false || $end === false || $start > $end) {
+                $this->debug_message("*** Can't get OIM: $msgid");
+                return false;
+            }
+            $lines = substr($data, $start + 18, $end - $start);
+            $aLines = @explode("\n", $lines);
+            $header = true;
+            $ignore = false;
+            $sOIM = '';
+            foreach ($aLines as $line) {
+                $line = rtrim($line);
+                if ($header) {
+                    if ($line === '') {
+                        $header = false;
+                        continue;
+                    }
+                    continue;
+                }
+                // stop at empty lines
+                if ($line === '') break;
+                $sOIM .= $line;
+            }
+            $sMsg = base64_decode($sOIM);
+            $this->debug_message("*** we get OIM ($msgid): $sMsg");
+
+            // delete OIM
+            $XML = '<?xml version="1.0" encoding="utf-8"?>
+<soap:Envelope xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+               xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+               xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/">
+<soap:Header>
+  <PassportCookie xmlns="http://www.hotmail.msn.com/ws/2004/09/oim/rsi">
+    <t>'.$t.'</t>
+    <p>'.$p.'</p>
+  </PassportCookie>
+</soap:Header>
+<soap:Body>
+  <DeleteMessages xmlns="http://www.hotmail.msn.com/ws/2004/09/oim/rsi">
+    <messageIds>
+      <messageId>'.$msgid.'</messageId>
+    </messageIds>
+  </DeleteMessages>
+</soap:Body>
+</soap:Envelope>';
+
+            $header_array = array(
+            'SOAPAction: '.$this->oim_del_soap,
+            'Content-Type: text/xml; charset=utf-8',
+            'User-Agent: Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1; Messenger '.$this->buildver.')'
+            );
+
+            $this->debug_message("*** URL: $this->oim_del_url");
+            $this->debug_message("*** Sending SOAP:\n$XML");
+            $curl = curl_init();
+            curl_setopt($curl, CURLOPT_URL, $this->oim_del_url);
+            curl_setopt($curl, CURLOPT_HTTPHEADER, $header_array);
+            curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
+            curl_setopt($curl, CURLOPT_FOLLOWLOCATION, 1);
+            curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, 0);
+            if ($this->debug) curl_setopt($curl, CURLOPT_HEADER, 1);
+            curl_setopt($curl, CURLOPT_POST, 1);
+            curl_setopt($curl, CURLOPT_POSTFIELDS, $XML);
+            $data = curl_exec($curl);
+            $http_code = curl_getinfo($curl, CURLINFO_HTTP_CODE);
+            curl_close($curl);
+            $this->debug_message("*** Get Result:\n$data");
+
+            if ($http_code != 200)
+            $this->debug_message("*** Can't delete OIM: $msgid, http code = $http_code");
+            else
+            $this->debug_message("*** OIM ($msgid) deleted");
+            return $sMsg;
+    }
+    private function NSLogout() {
+        if (is_resource($this->NSfp) && !feof($this->NSfp)) {
+            // logout now
+            // NS: >>> OUT
+            $this->ns_writeln("OUT");
+            fclose($this->NSfp);
+            $this->NSfp = false;
+            $this->log_message("*** logout now!");
+        }
+
+    }
+    private function NSRetryWait($Wait) {
+        $this->log_message("*** wait for $Wait seconds");
+        for($i=0;$i<$Wait;$i++) {
+            sleep(1);
+            if($this->kill_me) return false;
+        }
+        return true;
+    }
+    public function ProcessSendMessageFileQueue() {
+        $aFiles = glob(MSN_CLASS_SPOOL_DIR.DIRECTORY_SEPARATOR.'*.msn');
+        if (!is_array($aFiles)) return true;
+        clearstatcache();
+        foreach ($aFiles as $filename) {
+            $fp = fopen($filename, 'rt');
+            if (!$fp) continue;
+            $aTo = array();
+            $sMessage = '';
+            $buf = trim(fgets($fp));
+            if (substr($buf, 0, 3) == 'TO:') {
+                $aTo = @explode(',', str_replace(array("\r","\n","\t",' '),'',substr($buf, 3)));
+                while (!feof($fp)) $sMessage.=rtrim(fgets($fp))."\n";
+            }
+            fclose($fp);
+            if (!is_array($aTo) || count($aTo) == 0 || $sMessage == '')
+            $this->log_message("!!! message format error? delete $filename");
+            else
+            {
+                foreach($aTo as $To)
+                {
+                    @list($user, $domain, $network) = @explode('@', $To);
+                    $MessageList[$network]["$user@$domain"]=$sMessage;
+                }
+            }
+            if($this->backup_file)
+            {
+                $backup_dir = MSN_CLASS_SPOOL_DIR.'/backup';
+                if (!file_exists($backup_dir)) @mkdir($backup_dir);
+                $backup_name = $backup_dir.'/'.strftime('%Y%m%d%H%M%S').'_'.posix_getpid().'_'.basename($filename);
+                if (@rename($filename, $backup_name))
+                $this->log_message("*** move file to $backup_name");
+            }
+            else @unlink($filename);
+        }
+        foreach ($MessageList as $network => $Messages)
+        {
+            switch(trim($network))
+            {
+                case '':
+                case 1:   //MSN
+                    // okay, try to ask a switchboard (SB) for sending message
+                    // NS: >>> XFR {id} SB
+                    // $this->ns_writeln("XFR $this->id SB");
+                    foreach($Messages as $User => $Message)
+                    $this->MessageQueue[$User][]=$Message;
+                    break;
+                case 'Offline':  //MSN
+                    //Send OIM
+                    //FIXME: 修正Send OIM
+                    foreach($Messages as $To => $Message)
+                    {
+                        $lockkey='';
+                        for ($i = 0; $i < $this->oim_try; $i++)
+                        {
+                            if(($oim_result = $this->sendOIM($To, $Message, $lockkey))===true) break;
+                            if (is_array($oim_result) && $oim_result['challenge'] !== false) {
+                                // need challenge lockkey
+                                $this->log_message("*** we need a new challenge code for ".$oim_result['challenge']);
+                                $lockkey = $this->getChallenge($oim_result['challenge']);
+                                continue;
+                            }
+                            if ($oim_result === false || $oim_result['auth_policy'] !== false)
+                            {
+                                if ($re_login)
+                                {
+                                    $this->log_message("*** can't send OIM, but we already re-login again, so ignore this OIM");
+                                    break;
+                                }
+                                $this->log_message("*** can't send OIM, maybe ticket expired, try to login again");
+                                // maybe we need to re-login again
+                                if(!$this->get_passport_ticket())
+                                {
+                                    $this->log_message("*** can't re-login, something wrong here, ignore this OIM");
+                                    break;
+                                }
+                                $this->log_message("**** get new ticket, try it again");
+                                continue;
+                            }
+                        }
+                    }
+                    break;
+                default:  //Other
+                    foreach($Messages as $To => $Message) {
+                        $Message=$this->getMessage($Message, $network);
+                        $len = strlen($Message);
+                        $this->ns_writeln("UUM $this->id $To $network 1 $len");
+                        $this->ns_writedata($Message);
+                        $this->log_message("*** sent to $To (network: $network):\n$Message");
+                    }
+            }
+        }
+        if(isset($this->MessageQueue[$User])&&(!isset($this->MessageQueue[$User]['XFRSent'])))
+        {
+            $this->MessageQueue[$User]['XFRSent']=false;
+            $this->MessageQueue[$User]['ReqTime']=false;
+        }
+        return true;
+    }
+    public function SignalFunction($signal)
+    {
+        switch($signal)
+        {
+            case SIGTRAP:
+            case SIGTERM:
+            case SIGHUP:
+                $this->End();
+                return;
+            case SIGCHLD:
+                $ChildPid=pcntl_wait($status,WUNTRACED);
+                if($ChildPid>0)
+                {
+                    $this->log_message("*** Child Process End for ".$this->ChildProcess[$ChildPid]);
+                    unset($this->ChildProcess[$ChildPid]);
+                }
+                return;
+        }
+    }
+
+    public function Run()
+    {
+        $this->log_message("*** startup ***");
+        if(!pcntl_signal(SIGCHLD,array($this,'SignalFunction'))) die("Signal SIGCHLD Error\n");
+        if(!pcntl_signal(SIGTERM,array($this,'SignalFunction'))) die("Signal SIGTERM Error\n");
+        if(!pcntl_signal(SIGTRAP,array($this,'SignalFunction'))) die("Signal SIGTRAP Error\n");
+        $process_file = false;
+        $sent = false;
+        $aADL = array();
+        $aContactList = array();
+        while (true)
+        {
+            if($this->kill_me)
+            {
+                $this->log_message("*** Okay, kill me now!");
+                return $this->NSLogout();
+            }
+            if (!is_resource($this->NSfp) || feof($this->NSfp))
+            {
+                $this->log_message("*** try to connect to MSN network");
+                if (!$this->connect($this->user, $this->password))
+                {
+                    $this->log_message("!!! Can't connect to server: $this->error");
+                    if(!$this->NSRetryWait($this->retry_wait)) continue;
+                }
+                $this->UpdateContacts();
+                $this->LastPing=time();
+                $this->log_message("*** connected, wait for command");
+                $start_tm = time();
+                $ping_tm = time();
+                stream_set_timeout($this->NSfp, $this->NSStreamTimeout);
+                    $aContactList = $this->getMembershipList(true);
+                    if ($this->update_pending) {
+                        if (is_array($aContactList)) {
+                            $pending = 'Pending';
+                            foreach ($aContactList as $u_domain => $aUserList) {
+                                foreach ($aUserList as $u_name => $aNetworks) {
+                                    foreach ($aNetworks as $network => $aData) {
+                                        if (isset($aData[$pending])) {
+                                            // pending list
+                                            $cnt = 0;
+                                            foreach (array('Allow', 'Reverse') as $list) {
+                                                if (isset($aData[$list]))
+                                                $cnt++;
+                                                else {
+                                                    if ($this->addMemberToList($u_name.'@'.$u_domain, $network, $list)) {
+                                                        $aContactList[$u_domain][$u_name][$network][$list] = false;
+                                                        $cnt++;
+                                                    }
+                                                }
+                                            }
+                                            if ($cnt >= 2) {
+                                                $id = $aData[$pending];
+                                                // we can delete it from pending now
+                                                if ($this->delMemberFromList($id, $u_name.'@'.$u_domain, $network, $pending))
+                                                unset($aContactList[$u_domain][$u_name][$network][$pending]);
+                                            }
+                                        }
+                                        else {
+                                            // sync list
+                                            foreach (array('Allow', 'Reverse') as $list) {
+                                                if (!isset($aData[$list])) {
+                                                    if ($this->addMemberToList($u_name.'@'.$u_domain, $network, $list))
+                                                    $aContactList[$u_domain][$u_name][$network][$list] = false;
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                    $n = 0;
+                    $sList = '';
+                    $len = 0;
+                    if (is_array($aContactList)) {
+                        foreach ($aContactList as $u_domain => $aUserList) {
+                            $str = '<d n="'.$u_domain.'">';
+                            $len += strlen($str);
+                            if ($len > 7400) {
+                                $aADL[$n] = '<ml l="1">'.$sList.'</ml>';
+                                $n++;
+                                $sList = '';
+                                $len = strlen($str);
+                            }
+                            $sList .= $str;
+                            foreach ($aUserList as $u_name => $aNetworks) {
+                                foreach ($aNetworks as $network => $status) {
+                                    $str = '<c n="'.$u_name.'" l="3" t="'.$network.'" />';
+                                    $len += strlen($str);
+                                    // max: 7500, but <ml l="1"></d></ml> is 19,
+                                    // so we use 7475
+                                    if ($len > 7475) {
+                                        $sList .= '</d>';
+                                        $aADL[$n] = '<ml l="1">'.$sList.'</ml>';
+                                        $n++;
+                                        $sList = '<d n="'.$u_domain.'">'.$str;
+                                        $len = strlen($sList);
+                                    }
+                                    else
+                                    $sList .= $str;
+                                }
+                            }
+                            $sList .= '</d>';
+                        }
+                    }
+                    $aADL[$n] = '<ml l="1">'.$sList.'</ml>';
+                    // NS: >>> BLP {id} BL
+                    $this->ns_writeln("BLP $this->id BL");
+                    foreach ($aADL as $str) {
+                        $len = strlen($str);
+                        // NS: >>> ADL {id} {size}
+                        $this->ns_writeln("ADL $this->id $len");
+                        $this->ns_writedata($str);
+                    }
+                    // NS: >>> PRP {id} MFN name
+                    if ($this->alias == '') $this->alias = $user;
+                    $aliasname = rawurlencode($this->alias);
+                    $this->ns_writeln("PRP $this->id MFN $aliasname");
+                    //設定個人大頭貼
+                    //$MsnObj=$this->PhotoStckObj();
+                    // NS: >>> CHG {id} {status} {clientid} {msnobj}
+                    $this->ns_writeln("CHG $this->id NLN $this->clientid");                    
+                    if($this->PhotoStickerFile!==false)
+                     $this->ns_writeln("CHG $this->id NLN $this->clientid ".rawurlencode($this->MsnObj($this->PhotoStickerFile)));
+                    // NS: >>> UUX {id} length
+                    $str = '<Data><PSM>'.htmlspecialchars($this->psm).'</PSM><CurrentMedia></CurrentMedia><MachineGuid></MachineGuid></Data>';
+                    $len = strlen($str);
+                    $this->ns_writeln("UUX $this->id $len");
+                    $this->ns_writedata($str);               
+            }
+            $data = $this->ns_readln();
+            if($data===false)
+            {
+                //If No NS Message Process SendMessageFileQueue
+                if (time()-$this->LastPing > $this->ping_wait)
+                {
+                    // NS: >>> PNG
+                    $this->ns_writeln("PNG");
+                    $this->LastPing = time();
+                }
+                if(count($this->ChildProcess)<$this->MAXChildProcess)
+                {
+                    $Index=0;
+                    foreach($this->MessageQueue as $User => $Message)
+                    {
+                        if(!trim($User)) continue;
+                        if($Inxdex>=$this->MAXChildProcess-count($this->ChildProcess)) break;
+                        if((!$Message['XFRSent'])||($Message['XFRSent']&&(time()-$this->MessageQueue[$User]['ReqTime']>$this->ReqSBXFRTimeout)))
+                        {
+                            $this->MessageQueue[$User]['XFRSent']=true;
+                            $this->MessageQueue[$User]['ReqTime']=time();
+                            $this->log_message("*** Request SB for $User");
+                            $this->ns_writeln("XFR $this->id SB");
+                            $Index++;
+                        }
+                    }
+                }
+                if($this->ProcessSendMessageFileQueue()) continue;
+                break;
+            }
+            switch (substr($data,0,3))
+            {
+                case 'SBS':
+                    // after 'USR {id} OK {user} {verify} 0' response, the server will send SBS and profile to us
+                    // NS: <<< SBS 0 null
+                    break;
+
+                case 'RFS':
+                    // FIXME:
+                    // NS: <<< RFS ???
+                    // refresh ADL, so we re-send it again
+                    if (is_array($aADL)) {
+                        foreach ($aADL as $str) {
+                            $len = strlen($str);
+                            // NS: >>> ADL {id} {size}
+                            $this->ns_writeln("ADL $this->id $len");
+                            $this->ns_writedata($str);
+                        }
+                    }
+                    break;
+
+                case 'LST':
+                    // NS: <<< LST {email} {alias} 11 0
+                    @list(/* LST */, $email, /* alias */, ) = @explode(' ', $data);
+                    @list($u_name, $u_domain) = @explode('@', $email);
+                    if (!isset($aContactList[$u_domain][$u_name][1])) {
+                        $aContactList[$u_domain][$u_name][1]['Allow'] = 'Allow';
+                        $this->log_message("*** add to our contact list: $u_name@$u_domain");
+                    }
+                    break;
+
+                case 'ADL':
+                    // randomly, we get ADL command, someome add us to their contact list for MSNP15
+                    // NS: <<< ADL 0 {size}
+                    @list(/* ADL */, /* 0 */, $size,) = @explode(' ', $data);
+                    if (is_numeric($size) && $size > 0)
+                    {
+                        $data = $this->ns_readdata($size);
+                        preg_match('#<ml><d n="([^"]+)"><c n="([^"]+)"(.*) t="(\d*)"(.*) /></d></ml>#', $data, $matches);
+                        if (is_array($matches) && count($matches) > 0)
+                        {
+                            $u_domain = $matches[1];
+                            $u_name = $matches[2];
+                            $network = $matches[4];
+                            if (isset($aContactList[$u_domain][$u_name][$network]))
+                            $this->log_message("*** someone (network: $network) add us to their list (but already in our list): $u_name@$u_domain");
+                            else
+                            {
+                                $re_login = false;
+                                $cnt = 0;
+                                foreach (array('Allow', 'Reverse') as $list)
+                                {
+                                    if (!$this->addMemberToList($u_name.'@'.$u_domain, $network, $list))
+                                    {
+                                        if ($re_login) {
+                                            $this->log_message("*** can't add $u_name@$u_domain (network: $network) to $list");
+                                            continue;
+                                        }
+                                        $aTickets = $this->get_passport_ticket();
+                                        if (!$aTickets || !is_array($aTickets)) {
+                                            // failed to login? ignore it
+                                            $this->log_message("*** can't re-login, something wrong here");
+                                            $this->log_message("*** can't add $u_name@$u_domain (network: $network) to $list");
+                                            continue;
+                                        }
+                                        $re_login = true;
+                                        $this->ticket = $aTickets;
+                                        $this->log_message("**** get new ticket, try it again");
+                                        if (!$this->addMemberToList($u_name.'@'.$u_domain, $network, $list))
+                                        {
+                                            $this->log_message("*** can't add $u_name@$u_domain (network: $network) to $list");
+                                            continue;
+                                        }
+                                    }
+                                    $aContactList[$u_domain][$u_name][$network][$list] = false;
+                                    $cnt++;
+                                }
+                                $this->log_message("*** someone (network: $network) add us to their list: $u_name@$u_domain");
+                            }
+                            $str = '<ml l="1"><d n="'.$u_domain.'"><c n="'.$u_name.'" l="3" t="'.$network.'" /></d></ml>';
+                            $len = strlen($str);
+                        }
+                        else
+                        $this->log_message("*** someone add us to their list: $data");
+                        $this->AddUsToMemberList($u_name.'@'.$u_domain, $network);
+                    }
+                    break;
+
+                case 'RML':
+                    // randomly, we get RML command, someome remove us to their contact list for MSNP15
+                    // NS: <<< RML 0 {size}
+                    @list(/* RML */, /* 0 */, $size,) = @explode(' ', $data);
+                    if (is_numeric($size) && $size > 0)
+                    {
+                        $data = $this->ns_readdata($size);
+                        preg_match('#<ml><d n="([^"]+)"><c n="([^"]+)"(.*) t="(\d*)"(.*) /></d></ml>#', $data, $matches);
+                        if (is_array($matches) && count($matches) > 0)
+                        {
+                            $u_domain = $matches[1];
+                            $u_name = $matches[2];
+                            $network = $matches[4];
+                            if (isset($aContactList[$u_domain][$u_name][$network]))
+                            {
+                                $aData = $aContactList[$u_domain][$u_name][$network];
+                                foreach ($aData as $list => $id)
+                                $this->delMemberFromList($id, $u_name.'@'.$u_domain, $network, $list);
+                                unset($aContactList[$u_domain][$u_name][$network]);
+                                $this->log_message("*** someone (network: $network) remove us from their list: $u_name@$u_domain");
+                            }
+                            else
+                            $this->log_message("*** someone (network: $network) remove us from their list (but not in our list): $u_name@$u_domain");
+                            $this->RemoveUsFromMemberList($u_name.'@'.$u_domain, $network);
+                        }
+                        else
+                        $this->log_message("*** someone remove us from their list: $data");
+                    }
+                    break;
+
+                case 'MSG':
+                    // randomly, we get MSG notification from server
+                    // NS: <<< MSG Hotmail Hotmail {size}
+                    @list(/* MSG */, /* Hotmail */, /* Hotmail */, $size,) = @explode(' ', $data);
+                    if (is_numeric($size) && $size > 0) {
+                        $data = $this->ns_readdata($size);
+                        $aLines = @explode("\n", $data);
+                        $header = true;
+                        $ignore = false;
+                        $maildata = '';
+                        foreach ($aLines as $line) {
+                            $line = rtrim($line);
+                            if ($header) {
+                                if ($line === '') {
+                                    $header = false;
+                                    continue;
+                                }
+                                if (strncasecmp($line, 'Content-Type:', 13) == 0) {
+                                    if (strpos($line, 'text/x-msmsgsinitialmdatanotification') === false &&
+                                    strpos($line, 'text/x-msmsgsoimnotification') === false) {
+                                        // we just need text/x-msmsgsinitialmdatanotification
+                                        // or text/x-msmsgsoimnotification
+                                        $ignore = true;
+                                        break;
+                                    }
+                                }
+                                continue;
+                            }
+                            if (strncasecmp($line, 'Mail-Data:', 10) == 0) {
+                                $maildata = trim(substr($line, 10));
+                                break;
+                            }
+                        }
+                        if ($ignore) {
+                            $this->log_message("*** ingnore MSG for: $line");
+                            break;
+                        }
+                        if ($maildata == '') {
+                            $this->log_message("*** ingnore MSG not for OIM");
+                            break;
+                        }
+                        $re_login = false;
+                        if (strcasecmp($maildata, 'too-large') == 0) {
+                            $this->log_message("*** large mail-data, need to get the data via SOAP");
+                            $maildata = $this->getOIM_maildata();
+                            if ($maildata === false) {
+                                $this->log_message("*** can't get mail-data via SOAP");
+                                // maybe we need to re-login again
+                                $aTickets = $this->get_passport_ticket();
+                                if (!$aTickets || !is_array($aTickets)) {
+                                    // failed to login? ignore it
+                                    $this->log_message("*** can't re-login, something wrong here, ignore this OIM");
+                                    break;
+                                }
+                                $re_login = true;
+                                $this->ticket = $aTickets;
+                                $this->log_message("**** get new ticket, try it again");
+                                $maildata = $this->getOIM_maildata();
+                                if ($maildata === false) {
+                                    $this->log_message("*** can't get mail-data via SOAP, and we already re-login again, so ignore this OIM");
+                                    break;
+                                }
+                            }
+                        }
+                        // could be a lots of <M>...</M>, so we can't use preg_match here
+                        $p = $maildata;
+                        $aOIMs = array();
+                        while (1) {
+                            $start = strpos($p, '<M>');
+                            $end = strpos($p, '</M>');
+                            if ($start === false || $end === false || $start > $end) break;
+                            $end += 4;
+                            $sOIM = substr($p, $start, $end - $start);
+                            $aOIMs[] = $sOIM;
+                            $p = substr($p, $end);
+                        }
+                        if (count($aOIMs) == 0) {
+                            $this->log_message("*** ingnore empty OIM");
+                            break;
+                        }
+                        foreach ($aOIMs as $maildata) {
+                            // T: 11 for MSN, 13 for Yahoo
+                            // S: 6 for MSN, 7 for Yahoo
+                            // RT: the datetime received by server
+                            // RS: already read or not
+                            // SZ: size of message
+                            // E: sender
+                            // I: msgid
+                            // F: always 00000000-0000-0000-0000-000000000009
+                            // N: sender alias
+                            preg_match('#<T>(.*)</T>#', $maildata, $matches);
+                            if (count($matches) == 0) {
+                                $this->log_message("*** ingnore OIM maildata without <T>type</T>");
+                                continue;
+                            }
+                            $oim_type = $matches[1];
+                            if ($oim_type = 13)
+                            $network = 32;
+                            else
+                            $network = 1;
+                            preg_match('#<E>(.*)</E>#', $maildata, $matches);
+                            if (count($matches) == 0) {
+                                $this->log_message("*** ingnore OIM maildata without <E>sender</E>");
+                                continue;
+                            }
+                            $oim_sender = $matches[1];
+                            preg_match('#<I>(.*)</I>#', $maildata, $matches);
+                            if (count($matches) == 0) {
+                                $this->log_message("*** ingnore OIM maildata without <I>msgid</I>");
+                                continue;
+                            }
+                            $oim_msgid = $matches[1];
+                            preg_match('#<SZ>(.*)</SZ>#', $maildata, $matches);
+                            $oim_size = (count($matches) == 0) ? 0 : $matches[1];
+                            preg_match('#<RT>(.*)</RT>#', $maildata, $matches);
+                            $oim_time = (count($matches) == 0) ? 0 : $matches[1];
+                            $this->log_message("*** You've OIM sent by $oim_sender, Time: $oim_time, MSGID: $oim_msgid, size: $oim_size");
+                            $sMsg = $this->getOIM_message($oim_msgid);
+                            if ($sMsg === false) {
+                                $this->log_message("*** can't get OIM, msgid = $oim_msgid");
+                                if ($re_login) {
+                                    $this->log_message("*** can't get OIM via SOAP, and we already re-login again, so ignore this OIM");
+                                    continue;
+                                }
+                                $aTickets = $this->get_passport_ticket();
+                                if (!$aTickets || !is_array($aTickets)) {
+                                    // failed to login? ignore it
+                                    $this->log_message("*** can't re-login, something wrong here, ignore this OIM");
+                                    continue;
+                                }
+                                $re_login = true;
+                                $this->ticket = $aTickets;
+                                $this->log_message("**** get new ticket, try it again");
+                                $sMsg = $this->getOIM_message($oim_msgid);
+                                if ($sMsg === false) {
+                                    $this->log_message("*** can't get OIM via SOAP, and we already re-login again, so ignore this OIM");
+                                    continue;
+                                }
+                            }
+                            $this->log_message("*** MSG (Offline) from $oim_sender (network: $network): $sMsg");
+
+                            $this->ReceivedMessage($oim_sender,$sMsg,$network,true);
+                        }
+                    }
+                    break;
+
+                case 'UBM':
+                    // randomly, we get UBM, this is the message from other network, like Yahoo!
+                    // NS: <<< UBM {email} $network $type {size}
+                    @list(/* UBM */, $from_email, $network, $type, $size,) = @explode(' ', $data);
+                    if (is_numeric($size) && $size > 0)
+                    {
+                        $data = $this->ns_readdata($size);
+                        $aLines = @explode("\n", $data);
+                        $header = true;
+                        $ignore = false;
+                        $sMsg = '';
+                        foreach ($aLines as $line) {
+                            $line = rtrim($line);
+                            if ($header) {
+                                if ($line === '') {
+                                    $header = false;
+                                    continue;
+                                }
+                                if (strncasecmp($line, 'TypingUser:', 11) == 0) {
+                                    $ignore = true;
+                                    break;
+                                }
+                                continue;
+                            }
+                            $aSubLines = @explode("\r", $line);
+                            foreach ($aSubLines as $str) {
+                                if ($sMsg !== '')
+                                $sMsg .= "\n";
+                                $sMsg .= $str;
+                            }
+                        }
+                        if($ignore)
+                        {
+                            $this->log_message("*** ingnore from $from_email: $line");
+                            break;
+                        }
+                        $this->log_message("*** MSG from $from_email (network: $network): $sMsg");
+                        $this->ReceivedMessage($from_email,$sMsg,$network,false);
+                    }
+                    break;
+
+                case 'UBX':
+                    // randomly, we get UBX notification from server
+                    // NS: <<< UBX email {network} {size}
+                    @list(/* UBX */, /* email */, /* network */, $size,) = @explode(' ', $data);
+                    // we don't need the notification data, so just ignore it
+                    if (is_numeric($size) && $size > 0)
+                    $this->ns_readdata($size);
+                    break;
+
+                case 'CHL':
+                    // randomly, we'll get challenge from server
+                    // NS: <<< CHL 0 {code}
+                    @list(/* CHL */, /* 0 */, $chl_code,) = @explode(' ', $data);
+                    $fingerprint = $this->getChallenge($chl_code);
+                    // NS: >>> QRY {id} {product_id} 32
+                    // NS: >>> fingerprint
+                    $this->ns_writeln("QRY $this->id $this->prod_id 32");
+                    $this->ns_writedata($fingerprint);
+                    $this->ns_writeln("CHG $this->id NLN $this->clientid");                    
+                    if($this->PhotoStickerFile!==false)
+                    $this->ns_writeln("CHG $this->id NLN $this->clientid ".rawurlencode($this->MsnObj($this->PhotoStickerFile)));
+                    break;
+                case 'CHG':
+                    // NS: <<< CHG {id} {status} {code}
+                    // ignore it
+                    // change our status to online first
+                    break;
+
+                case 'XFR':
+                    // sometimes, NS will redirect to another NS
+                    // MSNP9
+                    // NS: <<< XFR {id} NS {server} 0 {server}
+                    // MSNP15
+                    // NS: <<< XFR {id} NS {server} U D
+                    // for normal switchboard XFR
+                    // NS: <<< XFR {id} SB {server} CKI {cki} U messenger.msn.com 0
+                    @list(/* XFR */, /* {id} */, $server_type, $server, /* CKI */, $cki_code, /* ... */) = @explode(' ', $data);
+                    @list($ip, $port) = @explode(':', $server);
+                    if ($server_type != 'SB') {
+                        // maybe exit?
+                        // this connection will close after XFR
+                        $this->NSLogout();
+                        continue;
+                    }
+                    if(count($this->MessageQueue))
+                    {
+                        foreach($this->MessageQueue as $User => $Message)
+                        {
+                            //$this->ChildProcess[$ChildPid]
+                            $this->log_message("*** XFR SB $User");
+                            $pid=pcntl_fork();
+                            if($pid)
+                            {
+                                //Parrent Process
+                                $this->ChildProcess[$pid]=$User;
+                                break;
+                            }
+                            elseif($pid==-1)
+                            {
+                                $this->log_message("*** Fork Error $User");
+                                break;
+                            }
+                            else
+                            {
+                                //Child Process
+                                $this->log_message("*** Child Process Start for $User");
+                                unset($Message['XFRSent']);
+                                unset($Message['ReqTime']);
+                                $bSBresult = $this->switchboard_control($ip, $port, $cki_code, $User, $Message);
+                                if ($bSBresult === false)
+                                {
+                                    // error for switchboard
+                                    $this->log_message("!!! error for sending message to ".$User);
+                                }
+                                die;
+                            }
+                        }
+                        unset($this->MessageQueue[$User]);
+                    }
+                    /*
+                     $bSBresult = $this->switchboard_control($ip, $port, $cki_code, $aMSNUsers[$nCurrentUser], $sMessage);
+                     if ($bSBresult === false) {
+                     // error for switchboard
+                     $this->log_message("!!! error for sending message to ".$aMSNUsers[$nCurrentUser]);
+                     $aOfflineUsers[] = $aMSNUsers[$nCurrentUser];
+                     }*/
+                    break;
+                case 'QNG':
+                    // NS: <<< QNG {time}
+                    @list(/* QNG */, $this->ping_wait) = @explode(' ', $data);
+                    if ($this->ping_wait == 0) $this->ping_wait = 50;
+                    //if (is_int($use_ping) && $use_ping > 0) $ping_wait = $use_ping;
+                    //Mod by Ricky Set Online
+                    break;
+
+                case 'RNG':
+                    if($this->PhotoStickerFile!==false)
+                    $this->ns_writeln("CHG $this->id NLN $this->clientid ".rawurlencode($this->MsnObj($this->PhotoStickerFile)));
+                    else
+                    $this->ns_writeln("CHG $this->id NLN $this->clientid");
+                    // someone is trying to talk to us
+                    // NS: <<< RNG {session_id} {server} {auth_type} {ticket} {email} {alias} U {client} 0
+                    $this->log_message("NS: <<< RNG $data");
+                    @list(/* RNG */, $sid, $server, /* auth_type */, $ticket, $email, $name, ) = @explode(' ', $data);
+                    @list($sb_ip, $sb_port) = @explode(':', $server);
+                    $this->log_message("*** RING from $email, $sb_ip:$sb_port");
+                    $this->addContact($email,1,$email, true);
+                    $pid=pcntl_fork();
+                    if($pid)
+                    {
+                        //Parrent Process
+                        $this->ChildProcess[$pid]='RNG';
+                        break;
+                    }
+                    elseif($pid==-1)
+                    {
+                        $this->log_message("*** Fork Error $User");
+                        break;
+                    }
+                    else
+                    {
+                        //Child Process
+                        $this->log_message("*** Ring Child Process Start for $User");
+                        $this->switchboard_ring($sb_ip, $sb_port, $sid, $ticket,$email);
+                        die;
+                    }
+                    break;
+                case 'OUT':
+                    // force logout from NS
+                    // NS: <<< OUT xxx
+                    fclose($this->NSfp);
+                    $this->log_message("*** LOGOUT from NS");
+                    break;
+
+                default:
+                	$code = substr($data,0,3);
+                    if (is_numeric($code)) {
+                        $this->error = "Error code: $code, please check the detail information from: http://msnpiki.msnfanatic.com/index.php/Reference:Error_List";
+                        $this->debug_message("*** NS: $this->error");
+
+                        return $this->NsLogout();
+                    }
+                    break;
+            }
+        }
+        return $this->NsLogout();
+    }
+
+    /*public function SendMessage($Message, $To)
+    {
+        $FileName = MSN_CLASS_SPOOL_DIR.'/'.strftime('%Y%m%d%H%M%S',time()).'_'.posix_getpid().'_sendMessage.msn';
+        if(!is_array($To))
+        $To=array($To);
+        $Receiver='';
+        foreach($To as $Email)
+        {
+            list($name,$host,$network)=explode('@',$Email);
+            $network=$network==''?1:$network;
+            if($network==1 && $this->SwitchBoardProcess && $this->SwitchBoardSessionUser=="$name@$host" )
+            {
+                $this->debug_message("*** SendMessage to $Receiver use SB message queue.");
+                array_push($this->SwitchBoardMessageQueue,$Message);
+                continue;
+            }
+            $Receiver.="$name@$host@$network,";
+        }
+        if($Receiver=='') return;
+        $Receiver=substr($Receiver,0,-1);
+        $this->debug_message("*** SendMessage to $Receiver use File queue.");
+        file_put_contents($FileName,"TO: $Receiver\n$Message\n");
+    }*/
+
+    function getChallenge($code)
+    {
+        // MSNP15
+        // http://msnpiki.msnfanatic.com/index.php/MSNP11:Challenges
+        // Step 1: The MD5 Hash
+        $md5Hash = md5($code.$this->prod_key);
+        $aMD5 = @explode("\0", chunk_split($md5Hash, 8, "\0"));
+        for ($i = 0; $i < 4; $i++) {
+            $aMD5[$i] = implode('', array_reverse(@explode("\0", chunk_split($aMD5[$i], 2, "\0"))));
+            $aMD5[$i] = (0 + base_convert($aMD5[$i], 16, 10)) & 0x7FFFFFFF;
+        }
+
+        // Step 2: A new string
+        $chl_id = $code.$this->prod_id;
+        $chl_id .= str_repeat('0', 8 - (strlen($chl_id) % 8));
+
+        $aID = @explode("\0", substr(chunk_split($chl_id, 4, "\0"), 0, -1));
+        for ($i = 0; $i < count($aID); $i++) {
+            $aID[$i] = implode('', array_reverse(@explode("\0", chunk_split($aID[$i], 1, "\0"))));
+            $aID[$i] = 0 + base_convert(bin2hex($aID[$i]), 16, 10);
+        }
+
+        // Step 3: The 64 bit key
+        $magic_num = 0x0E79A9C1;
+        $str7f = 0x7FFFFFFF;
+        $high = 0;
+        $low = 0;
+        for ($i = 0; $i < count($aID); $i += 2) {
+            $temp = $aID[$i];
+            $temp = bcmod(bcmul($magic_num, $temp), $str7f);
+            $temp = bcadd($temp, $high);
+            $temp = bcadd(bcmul($aMD5[0], $temp), $aMD5[1]);
+            $temp = bcmod($temp, $str7f);
+
+            $high = $aID[$i+1];
+            $high = bcmod(bcadd($high, $temp), $str7f);
+            $high = bcadd(bcmul($aMD5[2], $high), $aMD5[3]);
+            $high = bcmod($high, $str7f);
+
+            $low = bcadd(bcadd($low, $high), $temp);
+        }
+
+        $high = bcmod(bcadd($high, $aMD5[1]), $str7f);
+        $low = bcmod(bcadd($low, $aMD5[3]), $str7f);
+
+        $new_high = bcmul($high & 0xFF, 0x1000000);
+        $new_high = bcadd($new_high, bcmul($high & 0xFF00, 0x100));
+        $new_high = bcadd($new_high, bcdiv($high & 0xFF0000, 0x100));
+        $new_high = bcadd($new_high, bcdiv($high & 0xFF000000, 0x1000000));
+        // we need integer here
+        $high = 0+$new_high;
+
+        $new_low = bcmul($low & 0xFF, 0x1000000);
+        $new_low = bcadd($new_low, bcmul($low & 0xFF00, 0x100));
+        $new_low = bcadd($new_low, bcdiv($low & 0xFF0000, 0x100));
+        $new_low = bcadd($new_low, bcdiv($low & 0xFF000000, 0x1000000));
+        // we need integer here
+        $low = 0+$new_low;
+
+        // we just use 32 bits integer, don't need the key, just high/low
+        // $key = bcadd(bcmul($high, 0x100000000), $low);
+
+        // Step 4: Using the key
+        $md5Hash = md5($code.$this->prod_key);
+        $aHash = @explode("\0", chunk_split($md5Hash, 8, "\0"));
+
+        $hash = '';
+        $hash .= sprintf("%08x", (0 + base_convert($aHash[0], 16, 10)) ^ $high);
+        $hash .= sprintf("%08x", (0 + base_convert($aHash[1], 16, 10)) ^ $low);
+        $hash .= sprintf("%08x", (0 + base_convert($aHash[2], 16, 10)) ^ $high);
+        $hash .= sprintf("%08x", (0 + base_convert($aHash[3], 16, 10)) ^ $low);
+
+        return $hash;
+    }
+
+    private function getMessage($sMessage, $network = 1)
+    {
+        $msg_header = "MIME-Version: 1.0\r\nContent-Type: text/plain; charset=UTF-8\r\nX-MMS-IM-Format: FN=$this->font_fn; EF=$this->font_ef; CO=$this->font_co; CS=0; PF=22\r\n\r\n";
+        $msg_header_len = strlen($msg_header);
+        if ($network == 1)
+        $maxlen = $this->max_msn_message_len - $msg_header_len;
+        else
+        $maxlen = $this->max_yahoo_message_len - $msg_header_len;
+        $sMessage=str_replace("\r", '', $sMessage);
+        $msg=substr($sMessage,0,$maxlen);
+        return $msg_header.$msg;
+    }
+    /**
+     *
+     * @param $Action 連線模式 'Active' => 主動傳送訊息,'Passive' => 接收訊息
+     * @param $Param
+     * @return boolean
+     */
+    private function DoSwitchBoard($Action,$Param)
+    {
+        $SessionEnd=false;
+        $Joined=false;
+        $id=1;
+        $LastActive=time();
+        stream_set_timeout($this->SBFp, $this->SBTimeout);
+        switch($Action)
+        {
+            case 'Active':
+                $cki_code=$Param['cki'];
+                $user=$Param['user'];
+                $this->SwitchBoardMessageQueue=$Param['Msg'];
+                // SB: >>> USR {id} {user} {cki}
+                $this->SB_writeln("USR $id $this->user $cki_code");
+                $id++;
+                $this->SwitchBoardSessionUser=$user;
+                break;
+            case 'Passive':
+                $ticket=$Param['ticket'];
+                $sid=$Param['sid'];
+                $user=$Param['user'];
+                // SB: >>> ANS {id} {user} {ticket} {session_id}
+                $this->SB_writeln("ANS $id $this->user $ticket $sid");
+                $id++;
+                $this->SwitchBoardSessionUser=$user;
+                break;
+            default:
+                return false;
+        }
+        while((!feof($this->SBFp))&&(!$SessionEnd))
+        {
+            $data = $this->SB_readln();
+            if($this->kill_me)
+            {
+                $this->log_message("*** SB Okay, kill me now!");
+                break;
+            }
+            if($data === false)
+            {
+                if(time()-$LastActive > $this->SBIdleTimeout)
+                {
+                    $this->debug_message("*** SB Idle Timeout!");
+                    break;
+                }
+                if(!$Joined) continue;
+                foreach($this->SwitchBoardMessageQueue as $Message)
+                {
+                    if($Message=='') continue;
+                    $aMessage = $this->getMessage($Message);
+                    //CheckEmotion...
+                    $MsnObjDefine=$this->GetMsnObjDefine($aMessage);
+                    if($MsnObjDefine!=='')
+                    {
+                        $SendString="MIME-Version: 1.0\r\nContent-Type: text/x-mms-emoticon\r\n\r\n$MsnObjDefine";
+                        $len = strlen($SendString);
+                        $this->SB_writeln("MSG $id N $len");
+                        $id++;
+                        $this->SB_writedata($SendString);
+                        $this->id++;
+                    }
+                    $len = strlen($aMessage);
+                    $this->SB_writeln("MSG $id N $len");
+                    $id++;
+                    $this->SB_writedata($aMessage);
+                }
+                $this->SwitchBoardMessageQueue=array();
+                $LastActive=time();
+                continue;
+            }
+            $code = substr($data, 0, 3);
+            switch($code)
+            {
+                case 'IRO':
+                    // SB: <<< IRO {id} {rooster} {roostercount} {email} {alias} {clientid}
+                    @list(/* IRO */, /* id */, $cur_num, $total, $email, $alias, $clientid) = @explode(' ', $data);
+                    $this->log_message("*** $email join us");
+                    $Joined=true;
+                    break;
+                case 'BYE':
+                    $this->log_message("*** Quit for BYE");
+                    $SessionEnd=true;
+                    break;
+                case 'USR':
+                    // SB: <<< USR {id} OK {user} {alias}
+                    // we don't need the data, just ignore it
+                    // request user to join this switchboard
+                    // SB: >>> CAL {id} {user}
+                    $this->SB_writeln("CAL $id $user");
+                    $id++;
+                    break;
+                case 'CAL':
+                    // SB: <<< CAL {id} RINGING {?}
+                    // we don't need this, just ignore, and wait for other response
+                    $this->id++;
+                    break;
+                case 'JOI':
+                    // SB: <<< JOI {user} {alias} {clientid?}
+                    // someone join us
+                    // we don't need the data, just ignore it
+                    // no more user here
+                    $Joined=true;
+                    break;
+                case 'MSG':
+                    // SB: <<< MSG {email} {alias} {len}
+                    @list(/* MSG */, $from_email, /* alias */, $len, ) = @explode(' ', $data);
+                    $len = trim($len);
+                    $data = $this->SB_readdata($len);
+                    $aLines = @explode("\n", $data);
+                    $header = true;
+                    $ignore = false;
+                    $is_p2p = false;
+                    $sMsg = '';
+                    foreach ($aLines as $line)
+                    {
+                        $line = rtrim($line);
+                        if ($header) {
+                            if ($line === '') {
+                                $header = false;
+                                continue;
+                            }
+                            if (strncasecmp($line, 'TypingUser:', 11) == 0) {
+                                // typing notification, just ignore
+                                $ignore = true;
+                                break;
+                            }
+                            if (strncasecmp($line, 'Chunk:', 6) == 0) {
+                                // we don't handle any split message, just ignore
+                                $ignore = true;
+                                break;
+                            }
+                            if (strncasecmp($line, 'Content-Type: application/x-msnmsgrp2p', 38) == 0) {
+                                // p2p message, ignore it, but we need to send acknowledgement for it...
+                                $is_p2p = true;
+                                $p = strstr($data, "\n\n");
+                                $sMsg = '';
+                                if ($p === false) {
+                                    $p = strstr($data, "\r\n\r\n");
+                                    if ($p !== false)
+                                    $sMsg = substr($p, 4);
+                                }
+                                else
+                                $sMsg = substr($p, 2);
+                                break;
+                            }
+                            if (strncasecmp($line, 'Content-Type: application/x-', 28) == 0) {
+                                // ignore all application/x-... message
+                                // for example:
+                                //      application/x-ms-ink        => ink message
+                                $ignore = true;
+                                break;
+                            }
+                            if (strncasecmp($line, 'Content-Type: text/x-', 21) == 0) {
+                                // ignore all text/x-... message
+                                // for example:
+                                //      text/x-msnmsgr-datacast         => nudge, voice clip....
+                                //      text/x-mms-animemoticon         => customized animemotion word
+                                $ignore = true;
+                                break;
+                            }
+                            continue;
+                        }
+                        if ($sMsg !== '')
+                        $sMsg .= "\n";
+                        $sMsg .= $line;
+                    }
+                    if ($ignore)
+                    {
+                        $this->log_message("*** ingnore from $from_email: $line");
+                        break;
+                    }
+                    if ($is_p2p)
+                    {
+                        // we will ignore any p2p message after sending acknowledgement
+                        $ignore = true;
+                        $len = strlen($sMsg);
+                        $this->log_message("*** p2p message from $from_email, size $len");
+                        // header = 48 bytes
+                        // content >= 0 bytes
+                        // footer = 4 bytes
+                        // so it need to >= 52 bytes
+                        /*if ($len < 52) {
+                            $this->log_message("*** p2p: size error, less than 52!");
+                            break;
+                        }*/
+                        $aDwords = @unpack("V12dword", $sMsg);
+                        if (!is_array($aDwords)) {
+                            $this->log_message("*** p2p: header unpack error!");
+                            break;
+                        }
+                        $this->debug_message("*** p2p: dump received message:\n".$this->dump_binary($sMsg));
+                        $hdr_SessionID = $aDwords['dword1'];
+                        $hdr_Identifier = $aDwords['dword2'];
+                        $hdr_DataOffsetLow = $aDwords['dword3'];
+                        $hdr_DataOffsetHigh = $aDwords['dword4'];
+                        $hdr_TotalDataSizeLow = $aDwords['dword5'];
+                        $hdr_TotalDataSizeHigh = $aDwords['dword6'];
+                        $hdr_MessageLength = $aDwords['dword7'];
+                        $hdr_Flag = $aDwords['dword8'];
+                        $hdr_AckID = $aDwords['dword9'];
+                        $hdr_AckUID = $aDwords['dword10'];
+                        $hdr_AckSizeLow = $aDwords['dword11'];
+                        $hdr_AckSizeHigh = $aDwords['dword12'];
+                        $this->debug_message("*** p2p: header SessionID = $hdr_SessionID");
+                        $this->debug_message("*** p2p: header Inentifier = $hdr_Identifier");
+                        $this->debug_message("*** p2p: header Data Offset Low = $hdr_DataOffsetLow");
+                        $this->debug_message("*** p2p: header Data Offset High = $hdr_DataOffsetHigh");
+                        $this->debug_message("*** p2p: header Total Data Size Low = $hdr_TotalDataSizeLow");
+                        $this->debug_message("*** p2p: header Total Data Size High = $hdr_TotalDataSizeHigh");
+                        $this->debug_message("*** p2p: header MessageLength = $hdr_MessageLength");
+                        $this->debug_message("*** p2p: header Flag = $hdr_Flag");
+                        $this->debug_message("*** p2p: header AckID = $hdr_AckID");
+                        $this->debug_message("*** p2p: header AckUID = $hdr_AckUID");
+                        $this->debug_message("*** p2p: header AckSize Low = $hdr_AckSizeLow");
+                        $this->debug_message("*** p2p: header AckSize High = $hdr_AckSizeHigh");
+                        if($hdr_Flag==2) {
+                            //This is an ACK from SB ignore....
+                            $this->debug_message("*** p2p: //This is an ACK from SB ignore....:\n");
+                            break;
+                        }
+                        $MsgBody=$this->linetoArray(substr($sMsg,48,-4));
+                        $this->debug_message("*** p2p: body".print_r($MsgBody,true));
+                        if(($MsgBody['EUF-GUID']=='{A4268EEC-FEC5-49E5-95C3-F126696BDBF6}')&&($PictureFilePath=$this->GetPictureFilePath($MsgBody['Context'])))
+                        {
+                            while(true)
+                            {
+                                if($this->SB_readln()===false) break;
+                            }
+                            $this->debug_message("*** p2p: Inv hdr:\n".$this->dump_binary(substr($sMsg,0,48)));
+                            preg_match('/{([0-9A-F\-]*)}/i',$MsgBody['Via'],$Matches);
+                            $BranchGUID=$Matches[1];
+                            //it's an invite to send a display picture.
+                            $new_id = ~$hdr_Identifier;
+                            $hdr = pack("LLLLLLLLLLLL", $hdr_SessionID,
+                            $new_id,
+                            0, 0,
+                            $hdr_TotalDataSizeLow, $hdr_TotalDataSizeHigh,
+                            0,
+                            2,
+                            $hdr_Identifier,
+                            $hdr_AckID,
+                            $hdr_TotalDataSizeLow, $hdr_TotalDataSizeHigh);
+                            $footer = pack("L", 0);
+                            $message = "MIME-Version: 1.0\r\nContent-Type: application/x-msnmsgrp2p\r\nP2P-Dest: $from_email\r\n\r\n$hdr$footer";
+                            $len = strlen($message);
+                            $this->SB_writeln("MSG $id D $len");
+                            $id++;
+                            $this->SB_writedata($message);
+                            $this->log_message("*** p2p: send display picture acknowledgement for $hdr_SessionID");
+                            $this->debug_message("*** p2p: Invite ACK message:\n".$this->dump_binary($message));                            
+                            $this->SB_readln();//Read ACK;                            
+                            $this->debug_message("*** p2p: Invite ACK Hdr:\n".$this->dump_binary($hdr));
+                            $new_id-=3;
+                            //Send 200 OK message
+                            $MessageContent="SessionID: ".$MsgBody['SessionID']."\r\n\r\n".pack("C", 0);
+                            $MessagePayload=
+                                "MSNSLP/1.0 200 OK\r\n".
+                                "To: <msnmsgr:".$from_email.">\r\n".
+                                "From: <msnmsgr:".$this->user.">\r\n".
+                                "Via: ".$MsgBody['Via']."\r\n".
+                                "CSeq: ".($MsgBody['CSeq']+1)."\r\n".
+                                "Call-ID: ".$MsgBody['Call-ID']."\r\n".
+                                "Max-Forwards: 0\r\n".
+                                "Content-Type: application/x-msnmsgr-sessionreqbody\r\n".
+                                "Content-Length: ".strlen($MessageContent)."\r\n\r\n".
+                            $MessageContent;
+                            $hdr_TotalDataSizeLow=strlen($MessagePayload);
+                            $hdr_TotalDataSizeHigh=0;
+                            $hdr = pack("LLLLLLLLLLLL", $hdr_SessionID,
+                            $new_id,
+                            0, 0,
+                            $hdr_TotalDataSizeLow, $hdr_TotalDataSizeHigh,
+                            strlen($MessagePayload),
+                            0,
+                            rand(),
+                            0,
+                            0,0);
+
+                            $message =
+                                "MIME-Version: 1.0\r\n".
+                                "Content-Type: application/x-msnmsgrp2p\r\n".
+                                "P2P-Dest: $from_email\r\n\r\n$hdr$MessagePayload$footer";
+                            $this->SB_writeln("MSG $id D ".strlen($message));
+                            $id++;
+                            $this->SB_writedata($message);
+                            $this->debug_message("*** p2p: dump 200 ok message:\n".$this->dump_binary($message));
+                            $this->SB_readln();//Read ACK;
+                            
+                            $this->debug_message("*** p2p: 200 ok:\n".$this->dump_binary($hdr));
+                            //send Data preparation message
+                            //send 4 null bytes as data
+                            $hdr_TotalDataSizeLow=4;
+                            $hdr_TotalDataSizeHigh=0;
+                            $new_id++;
+                            $hdr = pack("LLLLLLLLLLLL",
+                            $MsgBody['SessionID'],
+                            $new_id,
+                            0, 0,
+                            $hdr_TotalDataSizeLow, $hdr_TotalDataSizeHigh,
+                            $hdr_TotalDataSizeLow,
+                            0,
+                            rand(),
+                            0,
+                            0,0);
+                            $message =
+                                "MIME-Version: 1.0\r\n".
+                                "Content-Type: application/x-msnmsgrp2p\r\n".
+                                "P2P-Dest: $from_email\r\n\r\n$hdr".pack('L',0)."$footer";
+                            $this->SB_writeln("MSG $id D ".strlen($message));
+                            $id++;
+                            $this->SB_writedata($message);
+                            $this->debug_message("*** p2p: dump send Data preparation message:\n".$this->dump_binary($message));
+                            $this->debug_message("*** p2p: Data Prepare Hdr:\n".$this->dump_binary($hdr));
+                            $this->SB_readln();//Read ACK;
+
+                            //send Data Content..
+                            $footer=pack('N',1);
+                            $new_id++;
+                            $FileSize=filesize($PictureFilePath);
+                            if($hTitle=fopen($PictureFilePath,'rb'))
+                            {
+                                $Offset=0;
+                                //$new_id++;
+                                while(!feof($hTitle))
+                                {
+                                    $FileContent=fread($hTitle,1024);
+                                    $FileContentSize=strlen($FileContent);
+                                    $hdr = pack("LLLLLLLLLLLL",
+                                    $MsgBody['SessionID'],
+                                    $new_id,
+                                    $Offset, 0,
+                                    $FileSize,0,
+                                    $FileContentSize,
+                                    0x20,
+                                    rand(),
+                                    0,
+                                    0,0
+                                    );
+                                    $message =
+                                        "MIME-Version: 1.0\r\n".
+                                        "Content-Type: application/x-msnmsgrp2p\r\n".
+                                        "P2P-Dest: $from_email\r\n\r\n$hdr$FileContent$footer";
+                                    $this->SB_writeln("MSG $id D ".strlen($message));
+                                    $id++;
+                                    $this->SB_writedata($message);
+                                    $this->debug_message("*** p2p: dump send Data Content message  $Offset / $FileSize :\n".$this->dump_binary($message));
+                                    $this->debug_message("*** p2p: Data Content Hdr:\n".$this->dump_binary($hdr));
+                                    //$this->SB_readln();//Read ACK;
+                                    $Offset+=$FileContentSize;
+                                }
+                            }
+                            //Send Bye
+                            /*
+                            $MessageContent="\r\n".pack("C", 0);
+                            $MessagePayload=
+                                "BYE MSNMSGR:MSNSLP/1.0\r\n".
+                                "To: <msnmsgr:$from_email>\r\n".
+                                "From: <msnmsgr:".$this->user.">\r\n".
+                                "Via: MSNSLP/1.0/TLP ;branch={".$BranchGUID."}\r\n".                            
+                                "CSeq: 0\r\n".
+                                "Call-ID: ".$MsgBody['Call-ID']."\r\n".
+                                "Max-Forwards: 0\r\n".
+                                "Content-Type: application/x-msnmsgr-sessionclosebody\r\n".
+                                "Content-Length: ".strlen($MessageContent)."\r\n\r\n".$MessageContent;
+                            $footer=pack('N',0);
+                            $hdr_TotalDataSizeLow=strlen($MessagePayload);
+                            $hdr_TotalDataSizeHigh=0;
+                            $new_id++;
+                            $hdr = pack("LLLLLLLLLLLL", 
+                            0,
+                            $new_id,
+                            0, 0,
+                            $hdr_TotalDataSizeLow, $hdr_TotalDataSizeHigh,
+                            0,
+                            0,
+                            rand(),
+                            0,
+                            0,0);
+                            $message =
+                                        "MIME-Version: 1.0\r\n".
+                                        "Content-Type: application/x-msnmsgrp2p\r\n".
+                                        "P2P-Dest: $from_email\r\n\r\n$hdr$MessagePayload$footer";
+                            $this->SB_writeln("MSG $id D ".strlen($message));
+                            $id++;
+                            $this->SB_writedata($message);
+                            $this->debug_message("*** p2p: dump send BYE message :\n".$this->dump_binary($message));
+                            */
+                            break;
+                        }
+                        //TODO:
+                        //if ($hdr_Flag == 2) {
+                        // just send ACK...
+                        //    $this->SB_writeln("ACK $id");
+                        //    break;
+                        //}
+                        if ($hdr_SessionID == 4) {
+                            // ignore?
+                            $this->debug_message("*** p2p: ignore flag 4");
+                            break;
+                        }
+                        $finished = false;
+                        if ($hdr_TotalDataSizeHigh == 0) {
+                            // only 32 bites size
+                            if (($hdr_MessageLength + $hdr_DataOffsetLow) == $hdr_TotalDataSizeLow)
+                            $finished = true;
+                        }
+                        else {
+                            // we won't accept any file transfer
+                            // so I think we won't get any message size need to use 64 bits
+                            // 64 bits size here, can't count directly...
+                            $totalsize = base_convert(sprintf("%X%08X", $hdr_TotalDataSizeHigh, $hdr_TotalDataSizeLow), 16, 10);
+                            $dataoffset = base_convert(sprintf("%X%08X", $hdr_DataOffsetHigh, $hdr_DataOffsetLow), 16, 10);
+                            $messagelength = base_convert(sprintf("%X", $hdr_MessageLength), 16, 10);
+                            $now_size = bcadd($dataoffset, $messagelength);
+                            if (bccomp($now_size, $totalsize) >= 0)
+                            $finished = true;
+                        }
+                        if (!$finished) {
+                            // ignore not finished split packet
+                            $this->debug_message("*** p2p: ignore split packet, not finished");
+                            break;
+                        }
+                        //$new_id = ~$hdr_Identifier;
+                        /*
+                         $new_id++;
+                         $hdr = pack("LLLLLLLLLLLL", $hdr_SessionID,
+                         $new_id,
+                         0, 0,
+                         $hdr_TotalDataSizeLow, $hdr_TotalDataSizeHigh,
+                         0,
+                         2,
+                         $hdr_Identifier,
+                         $hdr_AckID,
+                         $hdr_TotalDataSizeLow, $hdr_TotalDataSizeHigh);
+                         $footer = pack("L", 0);
+                         $message = "MIME-Version: 1.0\r\nContent-Type: application/x-msnmsgrp2p\r\nP2P-Dest: $from_email\r\n\r\n$hdr$footer";
+                         $len = strlen($message);
+                         $this->SB_writeln("MSG $id D $len");
+                         $id++;
+                         $this->SB_writedata($message);
+                         $this->log_message("*** p2p: send acknowledgement for $hdr_SessionID");
+                         $this->debug_message("*** p2p: dump sent message:\n".$this->dump_binary($hdr.$footer));
+                         */
+                        break;
+                    }
+                    $this->log_message("*** MSG from $from_email: $sMsg");
+                    $this->ReceivedMessage($from_email,$sMsg,$network,false);
+                    break;
+                case '217':
+                    $this->log_message("*** User $user is offline. Try OIM.");
+                    foreach($this->SwitchBoardMessageQueue as $Message)
+                    $this->SendMessage($Message,"$user@Offline");
+                    $SessionEnd=true;
+                    break;
+                default:
+                    if (is_numeric($code))
+                    {
+                        $this->error = "Error code: $code, please check the detail information from: http://msnpiki.msnfanatic.com/index.php/Reference:Error_List";
+                        $this->debug_message("*** SB: $this->error");
+                        $SessionEnd=true;
+                    }
+                    break;
+            }
+            $LastActive = time();
+        }
+        if (feof($this->SBFp))
+        {
+            // lost connection? error? try OIM later
+            @fclose($this->SBFp);
+            return false;
+        }
+        $this->SB_writeln("OUT");
+        @fclose($this->SBFp);
+        return true;
+    }
+    private function switchboard_control($ip, $port, $cki_code, $user, $Messages)
+    {
+        $this->SwitchBoardProcess=1;
+        $this->debug_message("*** SB: try to connect to switchboard server $ip:$port");
+        $this->SBFp = @fsockopen($ip, $port, $errno, $errstr, 5);
+        if (!$this->SBFp)
+        {
+            $this->debug_message("*** SB: Can't connect to $ip:$port, error => $errno, $errstr");
+            return false;
+        }
+        return $this->DoSwitchBoard('Active',array('cki'=>$cki_code, 'user'=>$user,'Msg'=>$Messages));
+    }
+    private function switchboard_ring($ip, $port, $sid, $ticket,$user)
+    {
+        $this->SwitchBoardProcess=2;
+        $this->debug_message("*** SB: try to connect to switchboard server $ip:$port");
+        $this->SBFp = @fsockopen($ip, $port, $errno, $errstr, 5);
+        if (!$this->SBFp)
+        {
+            $this->debug_message("*** SB: Can't connect to $ip:$port, error => $errno, $errstr");
+            return false;
+        }
+        return $this->DoSwitchBoard('Passive',array('sid'=>$sid,'user'=>$user,'ticket'=>$ticket));
+    }
+
+    private function sendOIM($to, $sMessage, $lockkey)
+    {
+        $XML = '<?xml version="1.0" encoding="utf-8"?>
+<soap:Envelope xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+               xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+               xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/">
+<soap:Header>
+  <From memberName="'.$this->user.'"
+        friendlyName="=?utf-8?B?'.base64_encode($this->user).'?="
+        xml:lang="zh-TW"
+        proxy="MSNMSGR"
+        xmlns="http://messenger.msn.com/ws/2004/09/oim/"
+        msnpVer="'.$this->protocol.'"
+        buildVer="'.$this->buildver.'"/>
+  <To memberName="'.$to.'" xmlns="http://messenger.msn.com/ws/2004/09/oim/"/>
+  <Ticket passport="'.htmlspecialchars($this->ticket['oim_ticket']).'"
+          appid="'.$this->prod_id.'"
+          lockkey="'.$lockkey.'"
+          xmlns="http://messenger.msn.com/ws/2004/09/oim/"/>
+  <Sequence xmlns="http://schemas.xmlsoap.org/ws/2003/03/rm">
+    <Identifier xmlns="http://schemas.xmlsoap.org/ws/2002/07/utility">http://messenger.msn.com</Identifier>
+    <MessageNumber>1</MessageNumber>
+  </Sequence>
+</soap:Header>
+<soap:Body>
+  <MessageType xmlns="http://messenger.msn.com/ws/2004/09/oim/">text</MessageType>
+  <Content xmlns="http://messenger.msn.com/ws/2004/09/oim/">MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: base64
+X-OIM-Message-Type: OfflineMessage
+X-OIM-Run-Id: {DAB68CFA-38C9-449B-945E-38AFA51E50A7}
+X-OIM-Sequence-Num: 1
+
+'.chunk_split(base64_encode($sMessage)).'
+  </Content>
+</soap:Body>
+</soap:Envelope>';
+
+        $header_array = array(
+            'SOAPAction: '.$this->oim_send_soap,
+            'Content-Type: text/xml',
+            'User-Agent: Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1; Messenger '.$this->buildver.')'
+            );
+
+            $this->debug_message("*** URL: $this->oim_send_url");
+            $this->debug_message("*** Sending SOAP:\n$XML");
+            $curl = curl_init();
+            curl_setopt($curl, CURLOPT_URL, $this->oim_send_url);
+            curl_setopt($curl, CURLOPT_HTTPHEADER, $header_array);
+            curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
+            curl_setopt($curl, CURLOPT_FOLLOWLOCATION, 1);
+            curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, 0);
+            if ($this->debug) curl_setopt($curl, CURLOPT_HEADER, 1);
+            curl_setopt($curl, CURLOPT_POST, 1);
+            curl_setopt($curl, CURLOPT_POSTFIELDS, $XML);
+            $data = curl_exec($curl);
+            $http_code = curl_getinfo($curl, CURLINFO_HTTP_CODE);
+            curl_close($curl);
+            $this->debug_message("*** Get Result:\n$data");
+
+            if ($http_code == 200) {
+                $this->debug_message("*** OIM sent for $to");
+                return true;
+            }
+
+            $challenge = false;
+            $auth_policy = false;
+            // the lockkey is invalid, authenticated fail, we need challenge it again
+            // <LockKeyChallenge xmlns="http://messenger.msn.com/ws/2004/09/oim/">364763969</LockKeyChallenge>
+            preg_match("#<LockKeyChallenge (.*)>(.*)</LockKeyChallenge>#", $data, $matches);
+            if (count($matches) != 0) {
+                // yes, we get new LockKeyChallenge
+                $challenge = $matches[2];
+                $this->debug_message("*** OIM need new challenge ($challenge) for $to");
+            }
+            // auth policy error
+            // <RequiredAuthPolicy xmlns="http://messenger.msn.com/ws/2004/09/oim/">MBI_SSL</RequiredAuthPolicy>
+            preg_match("#<RequiredAuthPolicy (.*)>(.*)</RequiredAuthPolicy>#", $data, $matches);
+            if (count($matches) != 0) {
+                $auth_policy = $matches[2];
+                $this->debug_message("*** OIM need new auth policy ($auth_policy) for $to");
+            }
+            if ($auth_policy === false && $challenge === false) {
+                //<faultcode xmlns:q0="http://messenger.msn.com/ws/2004/09/oim/">q0:AuthenticationFailed</faultcode>
+                preg_match("#<faultcode (.*)>(.*)</faultcode>#", $data, $matches);
+                if (count($matches) == 0) {
+                    // no error, we assume the OIM is sent
+                    $this->debug_message("*** OIM sent for $to");
+                    return true;
+                }
+                $err_code = $matches[2];
+                //<faultstring>Exception of type 'System.Web.Services.Protocols.SoapException' was thrown.</faultstring>
+                preg_match("#<faultstring>(.*)</faultstring>#", $data, $matches);
+                if (count($matches) > 0)
+                $err_msg = $matches[1];
+                else
+                $err_msg = '';
+                $this->debug_message("*** OIM failed for $to");
+                $this->debug_message("*** OIM Error code: $err_code");
+                $this->debug_message("*** OIM Error Message: $err_msg");
+                return false;
+            }
+            return array('challenge' => $challenge, 'auth_policy' => $auth_policy);
+    }
+
+    // read data for specified size
+    private function ns_readdata($size) {
+        $data = '';
+        $count = 0;
+        while (!feof($this->NSfp)) {
+            $buf = @fread($this->NSfp, $size - $count);
+            $data .= $buf;
+            $count += strlen($buf);
+            if ($count >= $size) break;
+        }
+        $this->debug_message("NS: data ($size/$count) <<<\n$data");
+        return $data;
+    }
+
+    // read one line
+    private function ns_readln() {
+        $data = @fgets($this->NSfp, 4096);
+        if ($data !== false) {
+            $data = trim($data);
+            $this->debug_message("NS: <<< $data");
+        }
+        return $data;
+    }
+
+    // write to server, append \r\n, also increase id
+    private function ns_writeln($data) {
+        @fwrite($this->NSfp, $data."\r\n");
+        $this->debug_message("NS: >>> $data");
+        $this->id++;
+        return;
+    }
+
+    // write data to server
+    private function ns_writedata($data) {
+        @fwrite($this->NSfp, $data);
+        $this->debug_message("NS: >>> $data");
+        return;
+    }
+
+    // read data for specified size for SB
+    private function sb_readdata($size) {
+        $data = '';
+        $count = 0;
+        while (!feof($this->SBFp)) {
+            $buf = @fread($this->SBFp, $size - $count);
+            $data .= $buf;
+            $count += strlen($buf);
+            if ($count >= $size) break;
+        }
+        $this->debug_message("SB: data ($size/$count) <<<\n$data");
+        return $data;
+    }
+
+    // read one line for SB
+    private function sb_readln() {
+        $data = @fgets($this->SBFp, 4096);
+        if ($data !== false) {
+            $data = trim($data);
+            $this->debug_message("SB: <<< $data");
+        }
+        return $data;
+    }
+
+    // write to server for SB, append \r\n, also increase id
+    // switchboard server only accept \r\n, it will lost connection if just \n only
+    private function sb_writeln($data) {
+        @fwrite($this->SBFp, $data."\r\n");
+        $this->debug_message("SB: >>> $data");
+        $this->id++;
+        return;
+    }
+
+    // write data to server
+    private function sb_writedata($data) {
+        @fwrite($this->SBFp, $data);
+        $this->debug_message("SB: >>> $data");
+        return;
+    }
+
+    // show debug information
+    function debug_message($str) {
+        if (!$this->debug) return;
+        if($this->debug===STDOUT) echo $str."\n";
+        /*$fname=MSN_CLASS_LOG_DIR.DIRECTORY_SEPARATOR.'msn_'.strftime('%Y%m%d').'.debug';
+        $fp = fopen($fname, 'at');
+        if ($fp) {
+            fputs($fp, strftime('%m/%d/%y %H:%M:%S').' ['.posix_getpid().'] '.$str."\n");
+            fclose($fp);
+            return;
+        }*/
+        // still show debug information, if we can't open log_file
+        echo $str."\n";
+        return;
+    }
+
+    function dump_binary($str) {
+        $buf = '';
+        $a_str = '';
+        $h_str = '';
+        $len = strlen($str);
+        for ($i = 0; $i < $len; $i++) {
+            if (($i % 16) == 0) {
+                if ($buf !== '') {
+                    $buf .= "$h_str $a_str\n";
+                }
+                $buf .= sprintf("%04X:", $i);
+                $a_str = '';
+                $h_str = '';
+            }
+            $ch = ord($str[$i]);
+            if ($ch < 32)
+            $a_str .= '.';
+            else
+            $a_str .= chr($ch);
+            $h_str .= sprintf(" %02X", $ch);
+        }
+        if ($h_str !== '')
+        $buf .= "$h_str $a_str\n";
+        return $buf;
+    }
+
+    // write log
+    function log_message($str) {
+        /*$fname = MSN_CLASS_LOG_DIR.DIRECTORY_SEPARATOR.'msn_'.strftime('%Y%m%d').'.log';
+        $fp = fopen($fname, 'at');
+        if ($fp) {
+            fputs($fp, strftime('%m/%d/%y %H:%M:%S').' ['.posix_getpid().'] '.$str."\n");
+            fclose($fp);
+        }*/
+        $this->debug_message($str);
+        return;
+    }
+    /**
+     *
+     * @param $FilePath 圖檔路徑
+     * @param $Type     檔案類型 3=>大頭貼,2表情圖案    
+     * @return array
+     */
+    private function MsnObj($FilePath,$Type=3)
+    {
+        if(!($FileSize=filesize($FilePath))) return '';
+        $Location=md5($FilePath);
+        $Friendly=md5($FilePath.$Type);
+        if(isset($this->MsnObjMap[$Location])) return $this->MsnObjMap[$Location];
+        $sha1d=base64_encode(sha1(file_get_contents($FilePath),true));
+        $sha1c=base64_encode(sha1("Creator".$this->user."Size$FileSize"."Type$Type"."Location$Location"."Friendly".$Friendly."SHA1D$sha1d",true));
+        $this->MsnObjArray[$Location]=$FilePath;
+        $MsnObj='<msnobj Creator="'.$this->user.'" Size="'.$FileSize.'" Type="'.$Type.'" Location="'.$Location.'" Friendly="'.$Friendly.'" SHA1D="'.$sha1d.'" SHA1C="'.$sha1c.'"/>';
+        $this->MsnObjMap[$Location]=$MsnObj;
+        $this->debug_message("*** p2p: addMsnObj $FilePath::$MsnObj\n");
+        return $MsnObj;
+    }
+    private function linetoArray($lines) {
+        $lines=str_replace("\r",'',$lines);
+        $lines=explode("\n",$lines);
+        foreach($lines as $line) {
+            if(!isset($line{3})) continue;
+            list($Key,$Val)=explode(':',$line);
+            $Data[trim($Key)]=trim($Val);
+        }
+        return $Data;
+    }
+    private function GetPictureFilePath($Context)
+    {
+        $MsnObj=base64_decode($Context);
+        if(preg_match('/location="(.*?)"/i',$MsnObj,$Match))
+        $location=$Match[1];
+        $this->debug_message("*** p2p: PictureFile[$location] ::All".print_r($this->MsnObjArray,true)."\n");
+        if($location&&(isset($this->MsnObjArray[$location])))
+        return $this->MsnObjArray[$location];
+        return false;
+    }
+    private function GetMsnObjDefine($Message)
+    {
+        $DefineString='';
+        if(is_array($this->Emotions))
+        foreach($this->Emotions as $Pattern => $FilePath)
+        {
+            if(strpos($Message,$Pattern)!==false)
+            $DefineString.="$Pattern\t".$this->MsnObj($FilePath,2)."\t";
+        }
+        return $DefineString;
+    }
+    /**
+     * Receive Message Overload Function
+     * @param $Sender
+     * @param $Message
+     * @param $Network   1 => msn , 32 =>yahoo
+     * @param $IsOIM
+     * @return unknown_type
+     */
+    protected function ReceivedMessage($Sender,$Message,$Network,$IsOIM=false){}
+    /**
+     * Remove Us From Member List Overload Function
+     * @param $User
+     * @param $Message
+     * @param $Network   1 => msn , 32 =>yahoo
+     * @return unknown_type
+     */
+    protected function RemoveUsFromMemberList($User,$Network){}
+    /**
+     * Add Us to Member List Overload Function
+     * @param $User
+     * @param $Message
+     * @param $Network   1 => msn , 32 =>yahoo
+     * @return unknown_type
+     */
+    protected function AddUsToMemberList($User,$Network){}
+    
+    public function signon() {
+        $this->log_message("*** try to connect to MSN network");
+        while(!$this->connect($this->user, $this->password))
+        {
+            $this->log_message("!!! Can't connect to server: $this->error");
+            if(!$this->NSRetryWait($this->retry_wait)) return;
+        }
+        $this->UpdateContacts();
+        $this->LastPing=time();
+        $this->log_message("*** connected, wait for command");
+        $start_tm = time();
+        $ping_tm = time();
+        stream_set_timeout($this->NSfp, $this->NSStreamTimeout);
+        $this->aContactList = $this->getMembershipList(true);
+        if ($this->update_pending) {
+            if (is_array($this->aContactList)) {
+                $pending = 'Pending';
+                foreach ($this->aContactList as $u_domain => $aUserList) {
+                    foreach ($aUserList as $u_name => $aNetworks) {
+                        foreach ($aNetworks as $network => $aData) {
+                            if (isset($aData[$pending])) {
+                                // pending list
+                                $cnt = 0;
+                                foreach (array('Allow', 'Reverse') as $list) {
+                                    if (isset($aData[$list]))
+                                    $cnt++;
+                                    else {
+                                        if ($this->addMemberToList($u_name.'@'.$u_domain, $network, $list)) {
+                                            $this->aContactList[$u_domain][$u_name][$network][$list] = false;
+                                            $cnt++;
+                                        }
+                                    }
+                                }
+                                if ($cnt >= 2) {
+                                    $id = $aData[$pending];
+                                    // we can delete it from pending now
+                                    if ($this->delMemberFromList($id, $u_name.'@'.$u_domain, $network, $pending))
+                                    unset($this->aContactList[$u_domain][$u_name][$network][$pending]);
+                                }
+                            }
+                            else {
+                                // sync list
+                                foreach (array('Allow', 'Reverse') as $list) {
+                                    if (!isset($aData[$list])) {
+                                        if ($this->addMemberToList($u_name.'@'.$u_domain, $network, $list))
+                                        $this->aContactList[$u_domain][$u_name][$network][$list] = false;
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        $n = 0;
+        $sList = '';
+        $len = 0;
+        if (is_array($this->aContactList)) {
+            foreach ($this->aContactList as $u_domain => $aUserList) {
+                $str = '<d n="'.$u_domain.'">';
+                $len += strlen($str);
+                if ($len > 7400) {
+                    $aADL[$n] = '<ml l="1">'.$sList.'</ml>';
+                    $n++;
+                    $sList = '';
+                    $len = strlen($str);
+                }
+                $sList .= $str;
+                foreach ($aUserList as $u_name => $aNetworks) {
+                    foreach ($aNetworks as $network => $status) {
+                        $str = '<c n="'.$u_name.'" l="3" t="'.$network.'" />';
+                        $len += strlen($str);
+                        // max: 7500, but <ml l="1"></d></ml> is 19,
+                        // so we use 7475
+                        if ($len > 7475) {
+                            $sList .= '</d>';
+                            $aADL[$n] = '<ml l="1">'.$sList.'</ml>';
+                            $n++;
+                            $sList = '<d n="'.$u_domain.'">'.$str;
+                            $len = strlen($sList);
+                        }
+                        else
+                        $sList .= $str;
+                    }
+                }
+                $sList .= '</d>';
+            }
+        }
+        $aADL[$n] = '<ml l="1">'.$sList.'</ml>';
+        // NS: >>> BLP {id} BL
+        $this->ns_writeln("BLP $this->id BL");
+        foreach ($aADL as $str) {
+            $len = strlen($str);
+            // NS: >>> ADL {id} {size}
+            $this->ns_writeln("ADL $this->id $len");
+            $this->ns_writedata($str);
+        }
+        // NS: >>> PRP {id} MFN name
+        if ($this->alias == '') $this->alias = $user;
+        $aliasname = rawurlencode($this->alias);
+        $this->ns_writeln("PRP $this->id MFN $aliasname");
+        //設定個人大頭貼
+        //$MsnObj=$this->PhotoStckObj();
+        // NS: >>> CHG {id} {status} {clientid} {msnobj}
+        $this->ns_writeln("CHG $this->id NLN $this->clientid");
+        if($this->PhotoStickerFile!==false)
+        $this->ns_writeln("CHG $this->id NLN $this->clientid ".rawurlencode($this->MsnObj($this->PhotoStickerFile)));
+        // NS: >>> UUX {id} length
+        $str = '<Data><PSM>'.htmlspecialchars($this->psm).'</PSM><CurrentMedia></CurrentMedia><MachineGuid></MachineGuid></Data>';
+        $len = strlen($str);
+        $this->ns_writeln("UUX $this->id $len");
+        $this->ns_writedata($str);
+    }
+    
+    public function NSreceive() {
+        $this->log_message("*** startup ***");
+        
+        $aADL = array();
+        
+        // Sign in again if not signed in or socket failed
+        if (!is_resource($this->NSfp) || feof($this->NSfp)) {
+            $this->signon();
+        }
+        
+        $data = $this->ns_readln();
+        /*if($data===false)
+        {
+            //If No NS Message Process SendMessageFileQueue
+            if (time()-$this->LastPing > $this->ping_wait)
+            {
+                // NS: >>> PNG
+                $this->ns_writeln("PNG");
+                $this->LastPing = time();
+            }
+            if(count($this->ChildProcess)<$this->MAXChildProcess)
+            {
+                $Index=0;
+                foreach($this->MessageQueue as $User => $Message)
+                {
+                    if(!trim($User)) continue;
+                    if($Inxdex>=$this->MAXChildProcess-count($this->ChildProcess)) break;
+                    if((!$Message['XFRSent'])||($Message['XFRSent']&&(time()-$this->MessageQueue[$User]['ReqTime']>$this->ReqSBXFRTimeout)))
+                    {
+                        $this->MessageQueue[$User]['XFRSent']=true;
+                        $this->MessageQueue[$User]['ReqTime']=time();
+                        $this->log_message("*** Request SB for $User");
+                        $this->ns_writeln("XFR $this->id SB");
+                        $Index++;
+                    }
+                }
+            }
+            if($this->ProcessSendMessageFileQueue()) continue;
+            break;
+        }*/
+        switch (substr($data,0,3))
+        {
+            case 'SBS':
+                // after 'USR {id} OK {user} {verify} 0' response, the server will send SBS and profile to us
+                // NS: <<< SBS 0 null
+                break;
+
+            case 'RFS':
+                // FIXME:
+                // NS: <<< RFS ???
+                // refresh ADL, so we re-send it again
+                if (is_array($aADL)) {
+                    foreach ($aADL as $str) {
+                        $len = strlen($str);
+                        // NS: >>> ADL {id} {size}
+                        $this->ns_writeln("ADL $this->id $len");
+                        $this->ns_writedata($str);
+                    }
+                }
+                break;
+
+            case 'LST':
+                // NS: <<< LST {email} {alias} 11 0
+                @list(/* LST */, $email, /* alias */, ) = @explode(' ', $data);
+                @list($u_name, $u_domain) = @explode('@', $email);
+                if (!isset($this->aContactList[$u_domain][$u_name][1])) {
+                    $this->aContactList[$u_domain][$u_name][1]['Allow'] = 'Allow';
+                    $this->log_message("*** add to our contact list: $u_name@$u_domain");
+                }
+                break;
+
+            case 'ADL':
+                // randomly, we get ADL command, someome add us to their contact list for MSNP15
+                // NS: <<< ADL 0 {size}
+                @list(/* ADL */, /* 0 */, $size,) = @explode(' ', $data);
+                if (is_numeric($size) && $size > 0)
+                {
+                    $data = $this->ns_readdata($size);
+                    preg_match('#<ml><d n="([^"]+)"><c n="([^"]+)"(.*) t="(\d*)"(.*) /></d></ml>#', $data, $matches);
+                    if (is_array($matches) && count($matches) > 0)
+                    {
+                        $u_domain = $matches[1];
+                        $u_name = $matches[2];
+                        $network = $matches[4];
+                        if (isset($this->aContactList[$u_domain][$u_name][$network]))
+                        $this->log_message("*** someone (network: $network) add us to their list (but already in our list): $u_name@$u_domain");
+                        else
+                        {
+                            $re_login = false;
+                            $cnt = 0;
+                            foreach (array('Allow', 'Reverse') as $list)
+                            {
+                                if (!$this->addMemberToList($u_name.'@'.$u_domain, $network, $list))
+                                {
+                                    if ($re_login) {
+                                        $this->log_message("*** can't add $u_name@$u_domain (network: $network) to $list");
+                                        continue;
+                                    }
+                                    $aTickets = $this->get_passport_ticket();
+                                    if (!$aTickets || !is_array($aTickets)) {
+                                        // failed to login? ignore it
+                                        $this->log_message("*** can't re-login, something wrong here");
+                                        $this->log_message("*** can't add $u_name@$u_domain (network: $network) to $list");
+                                        continue;
+                                    }
+                                    $re_login = true;
+                                    $this->ticket = $aTickets;
+                                    $this->log_message("**** get new ticket, try it again");
+                                    if (!$this->addMemberToList($u_name.'@'.$u_domain, $network, $list))
+                                    {
+                                        $this->log_message("*** can't add $u_name@$u_domain (network: $network) to $list");
+                                        continue;
+                                    }
+                                }
+                                $this->aContactList[$u_domain][$u_name][$network][$list] = false;
+                                $cnt++;
+                            }
+                            $this->log_message("*** someone (network: $network) add us to their list: $u_name@$u_domain");
+                        }
+                        $str = '<ml l="1"><d n="'.$u_domain.'"><c n="'.$u_name.'" l="3" t="'.$network.'" /></d></ml>';
+                        $len = strlen($str);
+                    }
+                    else
+                    $this->log_message("*** someone add us to their list: $data");
+                    $this->AddUsToMemberList($u_name.'@'.$u_domain, $network);
+                }
+                break;
+
+            case 'RML':
+                // randomly, we get RML command, someome remove us to their contact list for MSNP15
+                // NS: <<< RML 0 {size}
+                @list(/* RML */, /* 0 */, $size,) = @explode(' ', $data);
+                if (is_numeric($size) && $size > 0)
+                {
+                    $data = $this->ns_readdata($size);
+                    preg_match('#<ml><d n="([^"]+)"><c n="([^"]+)"(.*) t="(\d*)"(.*) /></d></ml>#', $data, $matches);
+                    if (is_array($matches) && count($matches) > 0)
+                    {
+                        $u_domain = $matches[1];
+                        $u_name = $matches[2];
+                        $network = $matches[4];
+                        if (isset($this->aContactList[$u_domain][$u_name][$network]))
+                        {
+                            $aData = $this->aContactList[$u_domain][$u_name][$network];
+                            foreach ($aData as $list => $id)
+                            $this->delMemberFromList($id, $u_name.'@'.$u_domain, $network, $list);
+                            unset($this->aContactList[$u_domain][$u_name][$network]);
+                            $this->log_message("*** someone (network: $network) remove us from their list: $u_name@$u_domain");
+                        }
+                        else
+                        $this->log_message("*** someone (network: $network) remove us from their list (but not in our list): $u_name@$u_domain");
+                        $this->RemoveUsFromMemberList($u_name.'@'.$u_domain, $network);
+                    }
+                    else
+                    $this->log_message("*** someone remove us from their list: $data");
+                }
+                break;
+
+            case 'MSG':
+                // randomly, we get MSG notification from server
+                // NS: <<< MSG Hotmail Hotmail {size}
+                @list(/* MSG */, /* Hotmail */, /* Hotmail */, $size,) = @explode(' ', $data);
+                if (is_numeric($size) && $size > 0) {
+                    $data = $this->ns_readdata($size);
+                    $aLines = @explode("\n", $data);
+                    $header = true;
+                    $ignore = false;
+                    $maildata = '';
+                    foreach ($aLines as $line) {
+                        $line = rtrim($line);
+                        if ($header) {
+                            if ($line === '') {
+                                $header = false;
+                                continue;
+                            }
+                            if (strncasecmp($line, 'Content-Type:', 13) == 0) {
+                                if (strpos($line, 'text/x-msmsgsinitialmdatanotification') === false &&
+                                strpos($line, 'text/x-msmsgsoimnotification') === false) {
+                                    // we just need text/x-msmsgsinitialmdatanotification
+                                    // or text/x-msmsgsoimnotification
+                                    $ignore = true;
+                                    break;
+                                }
+                            }
+                            continue;
+                        }
+                        if (strncasecmp($line, 'Mail-Data:', 10) == 0) {
+                            $maildata = trim(substr($line, 10));
+                            break;
+                        }
+                    }
+                    if ($ignore) {
+                        $this->log_message("*** ingnore MSG for: $line");
+                        break;
+                    }
+                    if ($maildata == '') {
+                        $this->log_message("*** ingnore MSG not for OIM");
+                        break;
+                    }
+                    $re_login = false;
+                    if (strcasecmp($maildata, 'too-large') == 0) {
+                        $this->log_message("*** large mail-data, need to get the data via SOAP");
+                        $maildata = $this->getOIM_maildata();
+                        if ($maildata === false) {
+                            $this->log_message("*** can't get mail-data via SOAP");
+                            // maybe we need to re-login again
+                            $aTickets = $this->get_passport_ticket();
+                            if (!$aTickets || !is_array($aTickets)) {
+                                // failed to login? ignore it
+                                $this->log_message("*** can't re-login, something wrong here, ignore this OIM");
+                                break;
+                            }
+                            $re_login = true;
+                            $this->ticket = $aTickets;
+                            $this->log_message("**** get new ticket, try it again");
+                            $maildata = $this->getOIM_maildata();
+                            if ($maildata === false) {
+                                $this->log_message("*** can't get mail-data via SOAP, and we already re-login again, so ignore this OIM");
+                                break;
+                            }
+                        }
+                    }
+                    // could be a lots of <M>...</M>, so we can't use preg_match here
+                    $p = $maildata;
+                    $aOIMs = array();
+                    while (1) {
+                        $start = strpos($p, '<M>');
+                        $end = strpos($p, '</M>');
+                        if ($start === false || $end === false || $start > $end) break;
+                        $end += 4;
+                        $sOIM = substr($p, $start, $end - $start);
+                        $aOIMs[] = $sOIM;
+                        $p = substr($p, $end);
+                    }
+                    if (count($aOIMs) == 0) {
+                        $this->log_message("*** ingnore empty OIM");
+                        break;
+                    }
+                    foreach ($aOIMs as $maildata) {
+                        // T: 11 for MSN, 13 for Yahoo
+                        // S: 6 for MSN, 7 for Yahoo
+                        // RT: the datetime received by server
+                        // RS: already read or not
+                        // SZ: size of message
+                        // E: sender
+                        // I: msgid
+                        // F: always 00000000-0000-0000-0000-000000000009
+                        // N: sender alias
+                        preg_match('#<T>(.*)</T>#', $maildata, $matches);
+                        if (count($matches) == 0) {
+                            $this->log_message("*** ingnore OIM maildata without <T>type</T>");
+                            continue;
+                        }
+                        $oim_type = $matches[1];
+                        if ($oim_type = 13)
+                        $network = 32;
+                        else
+                        $network = 1;
+                        preg_match('#<E>(.*)</E>#', $maildata, $matches);
+                        if (count($matches) == 0) {
+                            $this->log_message("*** ingnore OIM maildata without <E>sender</E>");
+                            continue;
+                        }
+                        $oim_sender = $matches[1];
+                        preg_match('#<I>(.*)</I>#', $maildata, $matches);
+                        if (count($matches) == 0) {
+                            $this->log_message("*** ingnore OIM maildata without <I>msgid</I>");
+                            continue;
+                        }
+                        $oim_msgid = $matches[1];
+                        preg_match('#<SZ>(.*)</SZ>#', $maildata, $matches);
+                        $oim_size = (count($matches) == 0) ? 0 : $matches[1];
+                        preg_match('#<RT>(.*)</RT>#', $maildata, $matches);
+                        $oim_time = (count($matches) == 0) ? 0 : $matches[1];
+                        $this->log_message("*** You've OIM sent by $oim_sender, Time: $oim_time, MSGID: $oim_msgid, size: $oim_size");
+                        $sMsg = $this->getOIM_message($oim_msgid);
+                        if ($sMsg === false) {
+                            $this->log_message("*** can't get OIM, msgid = $oim_msgid");
+                            if ($re_login) {
+                                $this->log_message("*** can't get OIM via SOAP, and we already re-login again, so ignore this OIM");
+                                continue;
+                            }
+                            $aTickets = $this->get_passport_ticket();
+                            if (!$aTickets || !is_array($aTickets)) {
+                                // failed to login? ignore it
+                                $this->log_message("*** can't re-login, something wrong here, ignore this OIM");
+                                continue;
+                            }
+                            $re_login = true;
+                            $this->ticket = $aTickets;
+                            $this->log_message("**** get new ticket, try it again");
+                            $sMsg = $this->getOIM_message($oim_msgid);
+                            if ($sMsg === false) {
+                                $this->log_message("*** can't get OIM via SOAP, and we already re-login again, so ignore this OIM");
+                                continue;
+                            }
+                        }
+                        $this->log_message("*** MSG (Offline) from $oim_sender (network: $network): $sMsg");
+
+                        //$this->ReceivedMessage($oim_sender,$sMsg,$network,true);
+                        $this->callHandler('IMin', array('sender' => $oim_sender, 'message' => $sMsg, 'network' => $network, 'offline' => true));
+                    }
+                }
+                break;
+
+            case 'UBM':
+                // randomly, we get UBM, this is the message from other network, like Yahoo!
+                // NS: <<< UBM {email} $network $type {size}
+                @list(/* UBM */, $from_email, $network, $type, $size,) = @explode(' ', $data);
+                if (is_numeric($size) && $size > 0)
+                {
+                    $data = $this->ns_readdata($size);
+                    $aLines = @explode("\n", $data);
+                    $header = true;
+                    $ignore = false;
+                    $sMsg = '';
+                    foreach ($aLines as $line) {
+                        $line = rtrim($line);
+                        if ($header) {
+                            if ($line === '') {
+                                $header = false;
+                                continue;
+                            }
+                            if (strncasecmp($line, 'TypingUser:', 11) == 0) {
+                                $ignore = true;
+                                break;
+                            }
+                            continue;
+                        }
+                        $aSubLines = @explode("\r", $line);
+                        foreach ($aSubLines as $str) {
+                            if ($sMsg !== '')
+                            $sMsg .= "\n";
+                            $sMsg .= $str;
+                        }
+                    }
+                    if($ignore)
+                    {
+                        $this->log_message("*** ingnore from $from_email: $line");
+                        break;
+                    }
+                    $this->log_message("*** MSG from $from_email (network: $network): $sMsg");
+                    //$this->ReceivedMessage($from_email,$sMsg,$network,false);
+                    $this->callHandler('IMin', array('sender' => $from_email, 'message' => $sMsg, 'network' => $network, 'offline' => false));
+                }
+                break;
+
+            case 'UBX':
+                // randomly, we get UBX notification from server
+                // NS: <<< UBX email {network} {size}
+                @list(/* UBX */, /* email */, /* network */, $size,) = @explode(' ', $data);
+                // we don't need the notification data, so just ignore it
+                if (is_numeric($size) && $size > 0)
+                $this->ns_readdata($size);
+                break;
+
+            case 'CHL':
+                // randomly, we'll get challenge from server
+                // NS: <<< CHL 0 {code}
+                @list(/* CHL */, /* 0 */, $chl_code,) = @explode(' ', $data);
+                $fingerprint = $this->getChallenge($chl_code);
+                // NS: >>> QRY {id} {product_id} 32
+                // NS: >>> fingerprint
+                $this->ns_writeln("QRY $this->id $this->prod_id 32");
+                $this->ns_writedata($fingerprint);
+                $this->ns_writeln("CHG $this->id NLN $this->clientid");                    
+                if($this->PhotoStickerFile!==false)
+                $this->ns_writeln("CHG $this->id NLN $this->clientid ".rawurlencode($this->MsnObj($this->PhotoStickerFile)));
+                break;
+            case 'CHG':
+                // NS: <<< CHG {id} {status} {code}
+                // ignore it
+                // change our status to online first
+                break;
+
+            case 'XFR':
+                // sometimes, NS will redirect to another NS
+                // MSNP9
+                // NS: <<< XFR {id} NS {server} 0 {server}
+                // MSNP15
+                // NS: <<< XFR {id} NS {server} U D
+                // for normal switchboard XFR
+                // NS: <<< XFR {id} SB {server} CKI {cki} U messenger.msn.com 0
+                @list(/* XFR */, /* {id} */, $server_type, $server, /* CKI */, $cki_code, /* ... */) = @explode(' ', $data);
+                @list($ip, $port) = @explode(':', $server);
+                if ($server_type != 'SB') {
+                    // maybe exit?
+                    // this connection will close after XFR
+                    $this->NSLogout();
+                    continue;
+                }
+                if(count($this->MessageQueue))
+                {
+                    foreach($this->MessageQueue as $User => $Message)
+                    {
+                        //$this->ChildProcess[$ChildPid]
+                        $this->log_message("*** XFR SB $User");
+                        $pid=pcntl_fork();
+                        if($pid)
+                        {
+                            //Parrent Process
+                            $this->ChildProcess[$pid]=$User;
+                            break;
+                        }
+                        elseif($pid==-1)
+                        {
+                            $this->log_message("*** Fork Error $User");
+                            break;
+                        }
+                        else
+                        {
+                            //Child Process
+                            $this->log_message("*** Child Process Start for $User");
+                            unset($Message['XFRSent']);
+                            unset($Message['ReqTime']);
+                            $bSBresult = $this->switchboard_control($ip, $port, $cki_code, $User, $Message);
+                            if ($bSBresult === false)
+                            {
+                                // error for switchboard
+                                $this->log_message("!!! error for sending message to ".$User);
+                            }
+                            die;
+                        }
+                    }
+                    unset($this->MessageQueue[$User]);
+                }
+                /*
+                 $bSBresult = $this->switchboard_control($ip, $port, $cki_code, $aMSNUsers[$nCurrentUser], $sMessage);
+                 if ($bSBresult === false) {
+                 // error for switchboard
+                 $this->log_message("!!! error for sending message to ".$aMSNUsers[$nCurrentUser]);
+                 $aOfflineUsers[] = $aMSNUsers[$nCurrentUser];
+                 }*/
+                break;
+            case 'QNG':
+                // NS: <<< QNG {time}
+                @list(/* QNG */, $this->ping_wait) = @explode(' ', $data);
+                if ($this->ping_wait == 0) $this->ping_wait = 50;
+                //if (is_int($use_ping) && $use_ping > 0) $ping_wait = $use_ping;
+                //Mod by Ricky Set Online
+                break;
+
+            case 'RNG':
+                if($this->PhotoStickerFile!==false)
+                $this->ns_writeln("CHG $this->id NLN $this->clientid ".rawurlencode($this->MsnObj($this->PhotoStickerFile)));
+                else
+                $this->ns_writeln("CHG $this->id NLN $this->clientid");
+                // someone is trying to talk to us
+                // NS: <<< RNG {session_id} {server} {auth_type} {ticket} {email} {alias} U {client} 0
+                $this->log_message("NS: <<< RNG $data");
+                @list(/* RNG */, $sid, $server, /* auth_type */, $ticket, $email, $name, ) = @explode(' ', $data);
+                @list($sb_ip, $sb_port) = @explode(':', $server);
+                $this->log_message("*** RING from $email, $sb_ip:$sb_port");
+                $this->addContact($email,1,$email, true);
+                $pid=pcntl_fork();
+                if($pid)
+                {
+                    //Parrent Process
+                    $this->ChildProcess[$pid]='RNG';
+                    break;
+                }
+                elseif($pid==-1)
+                {
+                    $this->log_message("*** Fork Error $User");
+                    break;
+                }
+                else
+                {
+                    //Child Process
+                    $this->log_message("*** Ring Child Process Start for $User");
+                    $this->switchboard_ring($sb_ip, $sb_port, $sid, $ticket,$email);
+                    die;
+                }
+                break;
+            case 'OUT':
+                // force logout from NS
+                // NS: <<< OUT xxx
+                $this->log_message("*** LOGOUT from NS");
+                return $this->NsLogout();
+
+            default:
+                $code = substr($data,0,3);
+                if (is_numeric($code)) {
+                    $this->error = "Error code: $code, please check the detail information from: http://msnpiki.msnfanatic.com/index.php/Reference:Error_List";
+                    $this->debug_message("*** NS: $this->error");
+
+                    return $this->NsLogout();
+                }
+                break;
+        }
+    }
+    
+    public function SendMessage($Message, $To) {
+        if(!is_array($To))
+            $To=array($To);
+        $Receiver='';
+        foreach($To as $Email)
+        {
+            list($name,$host,$network)=explode('@',$Email);
+            $network=$network==''?1:$network;
+            if($network==1 && isset($this->switchBoardSessions[$Email]) ) {
+                $this->debug_message("*** SendMessage to $Receiver use SB message queue.");
+                array_push($this->SwitchBoardMessageQueue,$Message);
+                continue;
+            }
+            $Receiver.="$name@$host@$network,";
+        }
+        if($Receiver=='') return;
+        $Receiver=substr($Receiver,0,-1);
+        $this->debug_message("*** SendMessage to $Receiver use File queue.");
+        file_put_contents($FileName,"TO: $Receiver\n$Message\n");
+    }
+    
+    public function getNSSocket() {
+        return $this->NSfp;
+    }
+    
+    public function getSBSocket() {
+        return $this->SBfp;
+    }
+    
+    public function getSockets() {
+        return array($this->NSfp, $this->SBfp);
+    }
+    
+    /**
+     * Calls User Handler
+     *
+     * Calls registered handler for a specific event.
+     * 
+     * @param String $event Command (event) name (Rvous etc)
+     * @param String $data Raw message from server
+     * @see registerHandler
+     * @return void
+     */
+    private function callHandler($event, $data) {
+        if (isset($this->myEventHandlers[$event])) {
+            call_user_func($this->myEventHandlers[$event], $data);
+        } else {
+            $this->noHandler($data);
+        }
+    }
+    
+    /** 
+     * Registers a user handler
+     * 
+     * Handler List
+     * IMIn
+     *
+     * @param String $event Event name
+     * @param String $handler User function to call
+     * @see callHandler
+     * @return boolean Returns true if successful
+     */
+    public function registerHandler($event, $handler) {
+        if (is_callable($handler)) {
+            $this->myEventHandlers[$event] = $handler;
+            return true;
+        } else {
+            return false;
+        }
+    }
+}
diff --git a/plugins/Msn/extlib/phpmsnclass/msnbot.php b/plugins/Msn/extlib/phpmsnclass/msnbot.php
new file mode 100755
index 0000000000..7a9f66ca2e
--- /dev/null
+++ b/plugins/Msn/extlib/phpmsnclass/msnbot.php
@@ -0,0 +1,63 @@
+#!/usr/bin/php
+<?php
+global $msn;
+function ChildSignalFunction($signal)
+{
+	global $msn;	
+	switch($signal)
+	{
+		case SIGTRAP:
+		case SIGTERM:
+		case SIGHUP:			
+			if(is_object($msn))	$msn->End();
+			return;
+	}
+}
+
+// network:
+//      1: WLM/MSN
+//      2: LCS
+//      4: Mobile Phones
+//     32: Yahoo!
+function getNetworkName($network)
+{
+	switch ($network)
+	{
+		case 1:
+			return 'WLM/MSN';
+		case 2:
+			return 'LCS';
+		case 4:
+			return 'Mobile Phones';
+		case 32:
+			return 'Yahoo!';
+	}
+	return "Unknown ($network)";
+}
+
+
+require_once('config.php');
+include_once('msn.class.php');
+
+$msn = new MSN(array(
+                'user' => 'xxx@hotmail.com',
+                'password' => 'mypassword',
+                'alias' => 'myalias',
+                'psm' => 'psm',
+//                'PhotoSticker' => 'msntitle.jpg',
+                'debug'=> true,
+/*                'Emotions' => array(
+                   'aaa' =>  'emotion.gif'
+                 ),*/
+));
+
+$fp=fopen(MSN_CLASS_LOG_DIR.DIRECTORY_SEPARATOR.'msnbot.pid', 'wt');
+if($fp)
+{
+	fputs($fp,posix_getpid());
+	fclose($fp);
+}
+declare(ticks = 1);
+$msn->Run();
+$msn->log_message("done!");
+@unlink(dirname($_SERVER['argv'][0]).DIRECTORY_SEPARATOR.'log'.DIRECTORY_SEPARATOR.'msnbot.pid');
diff --git a/plugins/Msn/extlib/phpmsnclass/sample.php b/plugins/Msn/extlib/phpmsnclass/sample.php
new file mode 100644
index 0000000000..32539c56c2
--- /dev/null
+++ b/plugins/Msn/extlib/phpmsnclass/sample.php
@@ -0,0 +1,40 @@
+#!/usr/bin/php -Cq
+<?php
+
+error_reporting(E_ALL);
+include_once('msn.class.php');
+
+// force to use MSNP9, without debug information
+// $msn = new MSN('MSNP9');
+
+// force to use MSNP9, with debug information
+// $msn = new MSN('MSNP9', true);
+
+// force to use MSNP15, without debug information
+// $msn = new MSN('MSNP15');
+
+// force to use MSNP15, with debug information
+// $msn = new MSN('MSNP15', true);
+
+// auto detect MSN protocol, without debug information
+// $msn = new MSN;
+
+// auto detect MSN protocol, with debug information
+$msn = new MSN(array('user' => 'statusnetbot@inflatablegoldfish.com', 'password' => 'statusnetplugin', 'alias' => 'statusnetbot', 'psm' => '', 'debug' => true));
+
+if ($msn->Run()) {
+    echo "Error for connect to MSN network\n";
+    echo "$msn->error\n";
+    exit;
+}
+
+//$msn->sendMessage('Now: '.strftime('%D %T')."\nTesting\nSecond Line\n\n\n\nand Empty Line",
+ //                 array(
+  //                  'darkip@inflatablegoldfish.com'
+   //                    )
+    //             );
+echo "Done!\n";
+exit;
+
+?>
+
diff --git a/plugins/Msn/extlib/phpmsnclass/soap/.svn/all-wcprops b/plugins/Msn/extlib/phpmsnclass/soap/.svn/all-wcprops
new file mode 100644
index 0000000000..0e73537c01
--- /dev/null
+++ b/plugins/Msn/extlib/phpmsnclass/soap/.svn/all-wcprops
@@ -0,0 +1,23 @@
+K 25
+svn:wc:ra_dav:version-url
+V 41
+/svn/!svn/ver/39/trunk/phpmsnclassv2/soap
+END
+msnab_servicetypes.xsd
+K 25
+svn:wc:ra_dav:version-url
+V 64
+/svn/!svn/ver/39/trunk/phpmsnclassv2/soap/msnab_servicetypes.xsd
+END
+msnab_sharingservice.wsdl
+K 25
+svn:wc:ra_dav:version-url
+V 67
+/svn/!svn/ver/39/trunk/phpmsnclassv2/soap/msnab_sharingservice.wsdl
+END
+msnab_datatypes.xsd
+K 25
+svn:wc:ra_dav:version-url
+V 61
+/svn/!svn/ver/39/trunk/phpmsnclassv2/soap/msnab_datatypes.xsd
+END
diff --git a/plugins/Msn/extlib/phpmsnclass/soap/.svn/entries b/plugins/Msn/extlib/phpmsnclass/soap/.svn/entries
new file mode 100644
index 0000000000..062f5cb1de
--- /dev/null
+++ b/plugins/Msn/extlib/phpmsnclass/soap/.svn/entries
@@ -0,0 +1,130 @@
+10
+
+dir
+46
+http://phpmsnclass.googlecode.com/svn/trunk/phpmsnclassv2/soap
+http://phpmsnclass.googlecode.com/svn
+
+
+
+2009-07-27T06:16:08.380493Z
+39
+ricky@ez2.us
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+d71849f3-712d-0410-a681-1795f7bea18a
+
+msnab_servicetypes.xsd
+file
+
+
+
+
+2010-06-08T18:29:30.506015Z
+096c0222d82879fa2b4bd47fa45f4aaf
+2009-07-27T06:16:08.380493Z
+39
+ricky@ez2.us
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+27903
+
+msnab_sharingservice.wsdl
+file
+
+
+
+
+2010-06-08T18:29:30.506015Z
+40f2d65d6cf6245c064defb02bd62705
+2009-07-27T06:16:08.380493Z
+39
+ricky@ez2.us
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+27625
+
+msnab_datatypes.xsd
+file
+
+
+
+
+2010-06-08T18:29:30.506015Z
+6a376c90de444594c1c75970586f99f8
+2009-07-27T06:16:08.380493Z
+39
+ricky@ez2.us
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+42170
+
diff --git a/plugins/Msn/extlib/phpmsnclass/soap/.svn/text-base/msnab_datatypes.xsd.svn-base b/plugins/Msn/extlib/phpmsnclass/soap/.svn/text-base/msnab_datatypes.xsd.svn-base
new file mode 100644
index 0000000000..46fc23f911
--- /dev/null
+++ b/plugins/Msn/extlib/phpmsnclass/soap/.svn/text-base/msnab_datatypes.xsd.svn-base
@@ -0,0 +1,832 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- edited with XMLSpy v2008 sp1 (http://www.altova.com) by wp (freezingsoft) -->
+<xsd:schema xmlns:msnab="http://www.msn.com/webservices/AddressBook" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" targetNamespace="http://www.msn.com/webservices/AddressBook" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0">
+    <xsd:complexType name="abInfoType">
+        <xsd:sequence>
+            <xsd:element name="name" type="xsd:string" minOccurs="0"/>
+            <xsd:element name="ownerPuid" type="xsd:string"/>
+            <xsd:element name="OwnerCID" type="xsd:integer" minOccurs="0"/>
+            <xsd:element name="ownerEmail" type="xsd:string"/>
+            <xsd:element name="fDefault" type="xsd:boolean"/>
+            <xsd:element name="joinedNamespace" type="xsd:boolean" minOccurs="0"/>
+            <xsd:element name="IsBot" type="xsd:boolean" minOccurs="0"/>
+            <xsd:element name="IsParentManaged" type="xsd:boolean" minOccurs="0"/>
+            <xsd:element name="SubscribeExternalPartner" type="xsd:boolean" minOccurs="0"/>
+            <xsd:element name="NotifyExternalPartner" type="xsd:boolean" minOccurs="0"/>
+            <xsd:element name="AddressBookType" type="xsd:string" minOccurs="0"/>
+            <xsd:element name="MessengerApplicationServiceCreated" type="xsd:boolean" minOccurs="0"/>
+            <xsd:element name="IsBetaMigrated" type="xsd:boolean" minOccurs="0"/>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:complexType name="HandleType">
+        <xsd:sequence>
+            <xsd:element name="Id" type="xsd:integer"/>
+            <xsd:element name="Type" type="xsd:string" default="Messenger"/>
+            <xsd:element name="ForeignId" type="xsd:string"/>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:complexType name="ServiceType">
+        <xsd:sequence>
+            <xsd:element name="Memberships" minOccurs="0">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element name="Membership" type="msnab:Membership" minOccurs="0" maxOccurs="unbounded"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="Info" type="msnab:InfoType"/>
+            <xsd:element name="Changes" type="xsd:string"/>
+            <xsd:element name="LastChange" type="xsd:dateTime" default="0001-01-01T00:00:00"/>
+            <xsd:element name="Deleted" type="xsd:boolean" default="false"/>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:complexType name="Membership">
+        <xsd:sequence>
+            <xsd:element name="MemberRole" type="xsd:string"/>
+            <xsd:element name="Members">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element name="Member" type="msnab:BaseMember" minOccurs="0" maxOccurs="unbounded"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="MembershipIsComplete" type="xsd:boolean" minOccurs="0"/>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:complexType name="BaseMember">
+        <xsd:sequence>
+            <xsd:element name="MembershipId" type="xsd:positiveInteger" minOccurs="0"/>
+            <xsd:element name="Type" type="xsd:string"/>
+            <xsd:element name="Location" minOccurs="0">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element name="Id" type="msnab:Guid"/>
+                        <xsd:element name="IsPassportNameHidden" type="xsd:boolean"/>
+                        <xsd:element name="CID" type="xsd:long"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="DisplayName" type="xsd:string" minOccurs="0"/>
+            <xsd:element name="State" type="msnab:MemberState"/>
+            <xsd:element name="Annotations" minOccurs="0">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element name="Annotation" type="msnab:Annotation" minOccurs="0" maxOccurs="unbounded"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="Deleted" type="xsd:boolean" default="false" minOccurs="0"/>
+            <xsd:element name="LastChanged" type="xsd:dateTime" minOccurs="0"/>
+            <xsd:element name="JoinedDate" type="xsd:dateTime" minOccurs="0"/>
+            <xsd:element name="ExpirationDate" type="xsd:dateTime" minOccurs="0"/>
+            <xsd:element name="Changes" type="xsd:string" minOccurs="0"/>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:complexType name="CircleMember" mixed="false">
+        <xsd:complexContent mixed="false">
+            <xsd:extension base="msnab:BaseMember">
+                <xsd:sequence>
+                    <xsd:element name="CircleId" type="msnab:Guid"/>
+                </xsd:sequence>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+    <xsd:complexType name="PassportMember" mixed="false">
+        <xsd:complexContent mixed="false">
+            <xsd:extension base="msnab:BaseMember">
+                <xsd:sequence>
+                    <xsd:element name="PassportName" type="xsd:string"/>
+                    <xsd:element name="IsPassportNameHidden" type="xsd:boolean" minOccurs="0"/>
+                    <xsd:element name="PassportId" type="xsd:int" minOccurs="0"/>
+                    <xsd:element name="CID" type="xsd:long" minOccurs="0"/>
+                    <xsd:element name="PassportChanges" type="xsd:string" minOccurs="0"/>
+                </xsd:sequence>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+    <xsd:complexType name="EmailMember" mixed="false">
+        <xsd:complexContent mixed="false">
+            <xsd:extension base="msnab:BaseMember">
+                <xsd:sequence>
+                    <xsd:element name="Email" type="xsd:string"/>
+                </xsd:sequence>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+    <xsd:complexType name="PhoneMember" mixed="false">
+        <xsd:complexContent mixed="false">
+            <xsd:extension base="msnab:BaseMember">
+                <xsd:sequence>
+                    <xsd:element name="PhoneNumber" type="xsd:string"/>
+                </xsd:sequence>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+    <xsd:complexType name="RoleMember" mixed="false">
+        <xsd:complexContent mixed="false">
+            <xsd:extension base="msnab:BaseMember">
+                <xsd:sequence>
+                    <xsd:element name="Id" type="xsd:string"/>
+                    <xsd:element name="DefiningService">
+                        <xsd:complexType>
+                            <xsd:sequence>
+                                <xsd:element name="Id" type="xsd:integer"/>
+                                <xsd:element name="Type" type="xsd:string"/>
+                                <xsd:element name="ForeignId" type="xsd:string"/>
+                            </xsd:sequence>
+                        </xsd:complexType>
+                    </xsd:element>
+                    <xsd:element name="MaxRoleRecursionDepth" type="xsd:integer"/>
+                    <xsd:element name="MaxDegreesSeparation" type="xsd:integer"/>
+                </xsd:sequence>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+    <xsd:complexType name="ServiceMember" mixed="false">
+        <xsd:complexContent mixed="false">
+            <xsd:extension base="msnab:BaseMember">
+                <xsd:sequence>
+                    <xsd:element name="Service" type="msnab:HandleType"/>
+                </xsd:sequence>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+    <xsd:complexType name="DomainMember" mixed="false">
+        <xsd:complexContent mixed="false">
+            <xsd:extension base="msnab:BaseMember">
+                <xsd:sequence>
+                    <xsd:element name="DomainName" type="xsd:string"/>
+                </xsd:sequence>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+    <xsd:complexType name="EveryoneMember" mixed="false">
+        <xsd:complexContent mixed="false">
+            <xsd:extension base="msnab:BaseMember"/>
+        </xsd:complexContent>
+    </xsd:complexType>
+    <xsd:complexType name="GroupMember" mixed="false">
+        <xsd:complexContent mixed="false">
+            <xsd:extension base="msnab:BaseMember">
+                <xsd:sequence>
+                    <xsd:element name="Id" type="msnab:Guid"/>
+                </xsd:sequence>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+    <xsd:simpleType name="Guid">
+        <xsd:restriction base="xsd:string">
+            <xsd:pattern value="[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}"/>
+        </xsd:restriction>
+    </xsd:simpleType>
+    <xsd:element name="MemberType">
+        <xsd:simpleType>
+            <xsd:restriction base="xsd:string">
+                <xsd:enumeration value="Allow"/>
+            </xsd:restriction>
+        </xsd:simpleType>
+    </xsd:element>
+    <xsd:simpleType name="MemberState">
+        <xsd:restriction base="xsd:string">
+            <xsd:enumeration value="Accepted"/>
+            <xsd:enumeration value="Pending"/>
+        </xsd:restriction>
+    </xsd:simpleType>
+    <xsd:complexType name="Annotation">
+        <xsd:sequence>
+            <xsd:element name="Name" type="xsd:string"/>
+            <xsd:element name="Value" type="xsd:string" minOccurs="0"/>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:complexType name="ContactType">
+        <xsd:sequence>
+            <xsd:element name="contactId" type="msnab:Guid" minOccurs="0"/>
+            <xsd:element name="contactInfo" type="msnab:contactInfoType" minOccurs="0"/>
+            <xsd:element name="propertiesChanged" type="xsd:string" minOccurs="0">
+                <xsd:annotation>
+                    <xsd:documentation>
+            A space (ASCII #32) separated list of properties that
+            have changed as part of an update request. The property
+            names don't always match the name of the associated
+            element.
+          </xsd:documentation>
+                </xsd:annotation>
+            </xsd:element>
+            <xsd:element name="fDeleted" type="xsd:boolean" minOccurs="0"/>
+            <xsd:element name="lastChange" type="xsd:dateTime" minOccurs="0"/>
+            <xsd:element name="CreateDate" type="xsd:dateTime" minOccurs="0"/>
+            <xsd:element name="LastModifiedBy" type="xsd:integer" minOccurs="0"/>
+            <xsd:element name="CreatedBy" type="xsd:integer" minOccurs="0"/>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:complexType name="ContactIdType">
+        <xsd:sequence>
+            <xsd:element name="contactId" type="msnab:Guid" minOccurs="0"/>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:complexType name="contactInfoType">
+        <xsd:sequence>
+            <xsd:element name="emails" minOccurs="0">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element name="ContactEmail" type="msnab:contactEmailType" maxOccurs="unbounded"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="phones" minOccurs="0">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element name="ContactPhone" type="msnab:contactPhoneType" maxOccurs="unbounded"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="locations" minOccurs="0">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element name="ContactLocation" type="msnab:contactLocationType" maxOccurs="unbounded"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="webSites" minOccurs="0">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element name="ContactWebSite" type="msnab:contactWebSiteType" maxOccurs="unbounded"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="annotations" minOccurs="0">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element name="Annotation" type="msnab:Annotation" maxOccurs="unbounded"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="groupIds" minOccurs="0">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element name="guid" type="msnab:Guid" maxOccurs="unbounded"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="groupIdsDeleted" minOccurs="0">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element name="guid" type="msnab:Guid" maxOccurs="unbounded"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="contactType" type="xsd:string" minOccurs="0"/>
+            <xsd:element name="quickName" type="xsd:string" minOccurs="0"/>
+            <xsd:element name="firstName" type="xsd:string" minOccurs="0"/>
+            <xsd:element name="MiddleName" type="xsd:string" minOccurs="0"/>
+            <xsd:element name="lastName" type="xsd:string" minOccurs="0"/>
+            <xsd:element name="Suffix" type="xsd:string" minOccurs="0"/>
+            <xsd:element name="NameTitle" type="xsd:string" minOccurs="0"/>
+            <xsd:element name="passportName" type="xsd:string" minOccurs="0"/>
+            <xsd:element name="IsPassportNameHidden" type="xsd:boolean" minOccurs="0"/>
+            <xsd:element name="displayName" type="xsd:string" minOccurs="0"/>
+            <xsd:element name="puid" type="xsd:long" minOccurs="0"/>
+            <xsd:element name="CID" type="xsd:long" minOccurs="0"/>
+            <xsd:element name="BrandIdList" type="xsd:anyType" minOccurs="0"/>
+            <xsd:element name="comment" type="xsd:string" minOccurs="0"/>
+            <xsd:element name="IsNotMobileVisible" type="xsd:boolean" minOccurs="0"/>
+            <xsd:element name="isMobileIMEnabled" type="xsd:boolean" minOccurs="0"/>
+            <xsd:element name="isMessengerUser" type="xsd:boolean" minOccurs="0"/>
+            <xsd:element name="isFavorite" type="xsd:boolean" minOccurs="0"/>
+            <xsd:element name="isSmtp" type="xsd:boolean" minOccurs="0"/>
+            <xsd:element name="hasSpace" type="xsd:boolean" minOccurs="0">
+                <xsd:annotation>
+                    <xsd:documentation>
+            Indicates whether the contact has a Windows Live
+            Space or not.
+          </xsd:documentation>
+                </xsd:annotation>
+            </xsd:element>
+            <xsd:element name="spotWatchState" type="xsd:string" minOccurs="0"/>
+            <xsd:element name="birthdate" type="xsd:dateTime" minOccurs="0"/>
+            <xsd:element name="primaryEmailType" type="msnab:ContactEmailTypeType" minOccurs="0"/>
+            <xsd:element name="PrimaryLocation" type="msnab:ContactLocationTypeType" minOccurs="0"/>
+            <xsd:element name="PrimaryPhone" type="msnab:ContactPhoneTypeType" minOccurs="0"/>
+            <xsd:element name="IsPrivate" type="xsd:boolean" minOccurs="0"/>
+            <xsd:element name="Anniversary" type="xsd:string" minOccurs="0">
+                <xsd:annotation>
+                    <xsd:documentation>
+            Seen is YYYY/MM/DD format.
+          </xsd:documentation>
+                </xsd:annotation>
+            </xsd:element>
+            <xsd:element name="Gender" type="xsd:string" minOccurs="0"/>
+            <xsd:element name="TimeZone" type="xsd:string" minOccurs="0"/>
+            <xsd:element name="NetworkInfoList" minOccurs="0">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element name="NetworkInfo" type="msnab:NetworkInfoType" minOccurs="0" maxOccurs="unbounded"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="PublicDisplayName" type="xsd:string" minOccurs="0"/>
+            <xsd:element name="IsAutoUpdateDisabled" type="xsd:boolean" minOccurs="0"/>
+            <xsd:element name="MessengerMemberInfo" type="msnab:MessengerMemberInfo" minOccurs="0"/>
+            <xsd:element name="PropertiesChanged" type="xsd:anyType" minOccurs="0"/>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:complexType name="contactEmailType">
+        <xsd:sequence>
+            <xsd:element name="contactEmailType" type="msnab:ContactEmailTypeType"/>
+            <xsd:element name="email" type="xsd:string"/>
+            <xsd:element name="isMessengerEnabled" type="xsd:boolean"/>
+            <xsd:element name="Capability" type="xsd:integer"/>
+            <xsd:element name="MessengerEnabledExternally" type="xsd:boolean"/>
+            <xsd:element name="propertiesChanged" type="xsd:string"/>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:simpleType name="ContactEmailTypeType">
+        <xsd:restriction base="xsd:string">
+            <xsd:enumeration value="ContactEmailPersonal"/>
+            <xsd:enumeration value="ContactEmailBusiness"/>
+            <xsd:enumeration value="ContactEmailOther"/>
+            <xsd:enumeration value="ContactEmailMessenger"/>
+            <xsd:enumeration value="Messenger2"/>
+            <xsd:enumeration value="Messenger3"/>
+            <xsd:enumeration value="Messenger4"/>
+            <xsd:enumeration value="Passport"/>
+        </xsd:restriction>
+    </xsd:simpleType>
+    <xsd:complexType name="contactPhoneType">
+        <xsd:sequence>
+            <xsd:element name="contactPhoneType" type="msnab:ContactPhoneTypeType"/>
+            <xsd:element name="number" type="xsd:string"/>
+            <xsd:element name="isMessengerEnabled" type="xsd:boolean"/>
+            <xsd:element name="propertiesChanged" type="xsd:string"/>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:simpleType name="ContactPhoneTypeType">
+        <xsd:restriction base="xsd:string">
+            <xsd:enumeration value="ContactPhonePersonal"/>
+            <xsd:enumeration value="ContactPhoneBusiness"/>
+            <xsd:enumeration value="ContactPhoneMobile"/>
+            <xsd:enumeration value="ContactPhonePager"/>
+            <xsd:enumeration value="ContactPhoneOther"/>
+            <xsd:enumeration value="ContactPhoneFax"/>
+            <xsd:enumeration value="Personal2"/>
+            <xsd:enumeration value="Business2"/>
+            <xsd:enumeration value="BusinessFax"/>
+            <xsd:enumeration value="BusinessMobile"/>
+        </xsd:restriction>
+    </xsd:simpleType>
+    <xsd:complexType name="contactLocationType">
+        <xsd:sequence>
+            <xsd:element name="contactLocationType" type="msnab:ContactLocationTypeType"/>
+            <xsd:element name="name" type="xsd:string" minOccurs="0"/>
+            <xsd:element name="street" type="xsd:string"/>
+            <xsd:element name="city" type="xsd:string"/>
+            <xsd:element name="state" type="xsd:string"/>
+            <xsd:element name="country" type="xsd:string"/>
+            <xsd:element name="postalCode" type="xsd:string"/>
+            <xsd:element name="Department" type="xsd:string" minOccurs="0"/>
+            <xsd:element name="Changes" type="xsd:string"/>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:simpleType name="ContactLocationTypeType">
+        <xsd:restriction base="xsd:string">
+            <xsd:enumeration value="ContactLocationPersonal"/>
+            <xsd:enumeration value="ContactLocationBusiness"/>
+        </xsd:restriction>
+    </xsd:simpleType>
+    <xsd:complexType name="contactWebSiteType">
+        <xsd:sequence>
+            <xsd:element name="contactWebSiteType" type="msnab:ContactWebSiteTypeType"/>
+            <xsd:element name="webURL" type="xsd:string"/>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:simpleType name="ContactWebSiteTypeType">
+        <xsd:restriction base="xsd:string">
+            <xsd:enumeration value="ContactWebSitePersonal"/>
+            <xsd:enumeration value="ContactWebSiteBusiness"/>
+        </xsd:restriction>
+    </xsd:simpleType>
+    <xsd:complexType name="GroupType">
+        <xsd:sequence>
+            <xsd:element name="groupId" type="msnab:Guid"/>
+            <xsd:element name="groupInfo" type="msnab:groupInfoType"/>
+            <xsd:element name="propertiesChanged" type="xsd:string">
+                <xsd:annotation>
+                    <xsd:documentation>
+            A space (ASCII #32) separated list of properties that
+            have changed as part of an update request. The property
+            names don't always match the name of the associated
+            element.
+          </xsd:documentation>
+                </xsd:annotation>
+            </xsd:element>
+            <xsd:element name="fDeleted" type="xsd:boolean" minOccurs="0"/>
+            <xsd:element name="lastChange" type="xsd:dateTime" minOccurs="0"/>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:complexType name="groupInfoType">
+        <xsd:sequence>
+            <xsd:element name="annotations" minOccurs="0">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element name="Annotation" type="msnab:Annotation" minOccurs="0" maxOccurs="unbounded"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="groupType" type="msnab:Guid" default="C8529CE2-6EAD-434d-881F-341E17DB3FF8" minOccurs="0"/>
+            <xsd:element name="name" type="xsd:string" minOccurs="0"/>
+            <xsd:element name="IsNotMobileVisible" type="xsd:boolean" minOccurs="0"/>
+            <xsd:element name="IsPrivate" type="xsd:boolean" minOccurs="0"/>
+            <xsd:element name="IsFavorite" type="xsd:boolean" minOccurs="0"/>
+            <xsd:element name="fMessenger" type="xsd:boolean" minOccurs="0"/>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:complexType name="groupFilterType">
+        <xsd:sequence>
+            <xsd:element name="groupIds">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element name="guid" type="msnab:Guid" minOccurs="0" maxOccurs="unbounded"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:element name="InvalidPassportUser">
+        <xsd:complexType>
+            <xsd:sequence>
+                <xsd:element name="errorcode" type="xsd:string"/>
+                <xsd:element name="errorstring" type="xsd:string"/>
+                <xsd:element name="additionalDetails">
+                    <xsd:complexType>
+                        <xsd:sequence>
+                            <xsd:element name="originalExceptionErrorMessage" type="xsd:string"/>
+                        </xsd:sequence>
+                    </xsd:complexType>
+                </xsd:element>
+            </xsd:sequence>
+        </xsd:complexType>
+    </xsd:element>
+    <xsd:complexType name="MessengerMemberInfo">
+        <xsd:sequence>
+            <xsd:element name="PendingAnnotations" minOccurs="0">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element name="Annotation" type="msnab:Annotation" maxOccurs="unbounded"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="DisplayName" type="xsd:string" minOccurs="0"/>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:complexType name="InfoType">
+        <xsd:sequence>
+            <xsd:element name="Handle" type="msnab:HandleType"/>
+            <xsd:element name="DisplayName" type="xsd:string" minOccurs="0"/>
+            <xsd:element name="InverseRequired" type="xsd:boolean" default="false"/>
+            <xsd:element name="AuthorizationCriteria" type="xsd:string" minOccurs="0"/>
+            <xsd:element name="RSSUrl" type="xsd:anyURI" minOccurs="0"/>
+            <xsd:element name="IsBot" type="xsd:boolean" default="false"/>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:complexType name="NotificationDataType">
+        <xsd:sequence>
+            <xsd:element name="StoreService" type="msnab:ServiceType"/>
+            <xsd:element name="Status" type="xsd:string"/>
+            <xsd:element name="LastChanged" type="xsd:dateTime"/>
+            <xsd:element name="Gleam" type="xsd:boolean" default="false"/>
+            <xsd:element name="InstanceId" type="xsd:string" default="0"/>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:complexType name="BaseDynamicItemType">
+        <xsd:sequence>
+            <xsd:element name="Type" type="xsd:string"/>
+            <xsd:element name="Deleted" type="xsd:boolean" minOccurs="0"/>
+            <xsd:element name="LastChanged" type="xsd:dateTime" minOccurs="0"/>
+            <xsd:element name="Notifications" minOccurs="0">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element name="NotificationData" type="msnab:NotificationDataType" maxOccurs="unbounded"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="Changes" type="xsd:string"/>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:complexType name="CircleDynamicItem" mixed="false">
+        <xsd:complexContent mixed="false">
+            <xsd:extension base="msnab:BaseDynamicItemType">
+                <xsd:sequence>
+                    <xsd:element name="Id" type="xsd:string"/>
+                </xsd:sequence>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+    <xsd:complexType name="PassportDynamicItem" block="" mixed="false">
+        <xsd:complexContent mixed="false">
+            <xsd:extension base="msnab:BaseDynamicItemType">
+                <xsd:sequence>
+                    <xsd:element name="CID" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="PassportName" type="xsd:string"/>
+                    <xsd:element name="PassportId" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="SpaceStatus" type="xsd:string"/>
+                    <xsd:element name="SpaceLastChanged" type="xsd:dateTime" minOccurs="0"/>
+                    <xsd:element name="SpaceLastViewed" type="xsd:dateTime" minOccurs="0"/>
+                    <xsd:element name="SpaceGleam" type="xsd:boolean" minOccurs="0"/>
+                    <xsd:element name="ProfileLastChanged" type="xsd:dateTime" minOccurs="0"/>
+                    <xsd:element name="ProfileLastView" type="xsd:dateTime" minOccurs="0"/>
+                    <xsd:element name="ProfileStatus" type="xsd:string"/>
+                    <xsd:element name="ProfileGleam" type="xsd:boolean" minOccurs="0"/>
+                    <xsd:element name="ContactProfileStatus" type="xsd:string"/>
+                    <xsd:element name="ContactProfileLastChanged" type="xsd:dateTime" minOccurs="0"/>
+                    <xsd:element name="ContactProfileLastViewed" type="xsd:dateTime" minOccurs="0"/>
+                    <xsd:element name="LiveContactLastChanged" type="xsd:dateTime" minOccurs="0"/>
+                </xsd:sequence>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+    <xsd:complexType name="abType">
+        <xsd:sequence>
+            <xsd:element name="abId" type="msnab:Guid"/>
+            <xsd:element name="abInfo" type="msnab:abInfoType"/>
+            <xsd:element name="lastChange" type="xsd:dateTime"/>
+            <xsd:element name="DynamicItemLastChanged" type="xsd:dateTime"/>
+            <xsd:element name="RecentActivityItemLastChanged" type="xsd:dateTime"/>
+            <xsd:element name="createDate" type="xsd:dateTime"/>
+            <xsd:element name="propertiesChanged" type="xsd:anyType"/>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:complexType name="CircleResultType">
+        <xsd:sequence>
+            <xsd:element name="Circles" minOccurs="0">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element name="CircleInverseInfo" type="msnab:CircleInverseInfoType" maxOccurs="unbounded"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="CircleTicket" type="xsd:string"/>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:complexType name="NetworkInfoType">
+        <xsd:sequence>
+            <xsd:element name="DomainId" type="xsd:int" minOccurs="0"/>
+            <xsd:element name="DomainTag" type="xsd:string" minOccurs="0"/>
+            <xsd:element name="UserTileURL" type="xsd:string" minOccurs="0"/>
+            <xsd:element name="ProfileURL" type="xsd:string" minOccurs="0"/>
+            <xsd:element name="DisplayName" type="xsd:string" minOccurs="0"/>
+            <xsd:element name="RelationshipType" type="xsd:int" minOccurs="0"/>
+            <xsd:element name="RelationshipState" type="xsd:int" minOccurs="0"/>
+            <xsd:element name="RelationshipStateDate" type="xsd:string" minOccurs="0"/>
+            <xsd:element name="RelationshipRole" type="xsd:int" minOccurs="0"/>
+            <xsd:element name="NDRCount" type="xsd:int" minOccurs="0"/>
+            <xsd:element name="InviterCID" type="xsd:long" minOccurs="0"/>
+            <xsd:element name="CreateDate" type="xsd:dateTime" minOccurs="0"/>
+            <xsd:element name="LastChanged" type="xsd:dateTime" minOccurs="0"/>
+            <xsd:element name="PropertiesChanged" type="xsd:anyType" minOccurs="0"/>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:complexType name="ContactFilterType">
+        <xsd:sequence>
+            <xsd:element name="IncludeHiddenContacts" type="xsd:boolean"/>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:complexType name="filterOptionsType">
+        <xsd:sequence>
+            <xsd:element name="DeltasOnly" type="xsd:boolean"/>
+            <xsd:element name="LastChanged" type="xsd:dateTime" minOccurs="0"/>
+            <xsd:element name="ContactFilter" type="msnab:ContactFilterType"/>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:complexType name="entityHandle">
+        <xsd:sequence>
+            <xsd:element name="Cid" type="xsd:long"/>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:complexType name="NotationType">
+        <xsd:sequence>
+            <xsd:element name="Name" type="xsd:string"/>
+            <xsd:element name="Value" type="xsd:string"/>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:complexType name="ListTemplateVariableItemType">
+        <xsd:sequence>
+            <xsd:element name="Values">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element name="Value" type="msnab:SimpleTemplateVariableBaseType" maxOccurs="unbounded"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:complexType name="TemplateVariableBaseType">
+        <xsd:sequence>
+            <xsd:element name="Name" type="xsd:string"/>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:complexType name="SimpleTemplateVariableBaseType">
+        <xsd:complexContent>
+            <xsd:extension base="msnab:TemplateVariableBaseType">
+                <xsd:sequence>
+                    <xsd:element name="Value" type="xsd:string"/>
+                </xsd:sequence>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+    <xsd:complexType name="PublisherIdTemplateVariable">
+        <xsd:complexContent>
+            <xsd:extension base="msnab:TemplateVariableBaseType">
+                <xsd:sequence>
+                    <xsd:element name="Id" type="xsd:string"/>
+                    <xsd:element name="NameHint" type="xsd:string" minOccurs="0"/>
+                </xsd:sequence>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+    <xsd:complexType name="TargetIdTemplateVariable">
+        <xsd:complexContent>
+            <xsd:extension base="msnab:PublisherIdTemplateVariable">
+                <xsd:sequence>
+                    <xsd:element name="IdOwner" type="xsd:string"/>
+                </xsd:sequence>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+    <xsd:complexType name="TextTemplateVariable">
+        <xsd:complexContent>
+            <xsd:extension base="msnab:SimpleTemplateVariableBaseType"/>
+        </xsd:complexContent>
+    </xsd:complexType>
+    <xsd:complexType name="HlinkTemplateVariable">
+        <xsd:complexContent>
+            <xsd:extension base="msnab:SimpleTemplateVariableBaseType">
+                <xsd:sequence>
+                    <xsd:element name="Text" type="xsd:string"/>
+                    <xsd:element name="Notations">
+                        <xsd:complexType>
+                            <xsd:sequence>
+                                <xsd:element name="Notation" type="msnab:NotationType" maxOccurs="unbounded"/>
+                            </xsd:sequence>
+                        </xsd:complexType>
+                    </xsd:element>
+                </xsd:sequence>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+    <xsd:complexType name="ListTemplateVariable">
+        <xsd:complexContent>
+            <xsd:extension base="msnab:TemplateVariableBaseType">
+                <xsd:sequence>
+                    <xsd:element name="Items">
+                        <xsd:complexType>
+                            <xsd:sequence>
+                                <xsd:element name="ListTemplateVariableItem" type="msnab:ListTemplateVariableItemType" maxOccurs="unbounded"/>
+                            </xsd:sequence>
+                        </xsd:complexType>
+                    </xsd:element>
+                </xsd:sequence>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+    <xsd:complexType name="ImageTemplateVariable">
+        <xsd:complexContent>
+            <xsd:extension base="msnab:SimpleTemplateVariableBaseType">
+                <xsd:sequence>
+                    <xsd:element name="Href" type="xsd:anyURI"/>
+                    <xsd:element name="Notations">
+                        <xsd:complexType>
+                            <xsd:sequence>
+                                <xsd:element name="Notation" type="msnab:NotationType" maxOccurs="unbounded"/>
+                            </xsd:sequence>
+                        </xsd:complexType>
+                    </xsd:element>
+                </xsd:sequence>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+    <xsd:complexType name="ActivityDetailsType">
+        <xsd:sequence>
+            <xsd:element name="OwnerCID" type="xsd:string"/>
+            <xsd:element name="ObjectId" type="xsd:string"/>
+            <xsd:element name="ApplicationId" type="xsd:string"/>
+            <xsd:element name="ChangeType" type="xsd:string"/>
+            <xsd:element name="PublishDate" type="xsd:dateTime"/>
+            <xsd:element name="TemplateVariables">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element name="TemplateVariable" type="msnab:TemplateVariableBaseType" maxOccurs="unbounded"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:complexType name="RecentActivityTemplateType">
+        <xsd:sequence>
+            <xsd:element name="Cardinality" type="xsd:string"/>
+            <xsd:element name="Data" type="xsd:string"/>
+            <xsd:element name="Title" type="xsd:string"/>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:complexType name="RequestedLocalesType">
+        <xsd:sequence>
+            <xsd:element name="string" type="xsd:string" maxOccurs="unbounded"/>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:complexType name="RecentActivityTemplateContainerType">
+        <xsd:sequence>
+            <xsd:element name="ApplicationId" type="xsd:string"/>
+            <xsd:element name="ApplicationName" type="xsd:string"/>
+            <xsd:element name="ChangeType" type="xsd:integer"/>
+            <xsd:element name="Locale" type="xsd:string"/>
+            <xsd:element name="RequestedLocales" type="msnab:RequestedLocalesType"/>
+            <xsd:element name="TemplateRevision" type="xsd:integer"/>
+            <xsd:element name="Templates">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element name="RecentActivityTemplate" type="msnab:RecentActivityTemplateType" maxOccurs="unbounded"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="CollapseCondition" type="msnab:CollapseConditionType" minOccurs="0"/>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:complexType name="CollapseConditionType">
+        <xsd:sequence>
+            <xsd:element name="string" type="xsd:string" maxOccurs="unbounded"/>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:complexType name="CirclePersonalMembershipType">
+        <xsd:sequence>
+            <xsd:element name="Role" type="xsd:string"/>
+            <xsd:element name="State" type="xsd:string"/>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:complexType name="abHandleType">
+        <xsd:sequence>
+            <xsd:element name="ABId" type="xsd:string"/>
+            <xsd:element name="Puid" type="xsd:long"/>
+            <xsd:element name="Cid" type="xsd:long"/>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:complexType name="contactHandleType">
+        <xsd:sequence>
+            <xsd:element name="Email" type="xsd:string"/>
+            <xsd:element name="Puid" type="xsd:long"/>
+            <xsd:element name="Cid" type="xsd:long"/>
+            <xsd:element name="CircleId" type="xsd:string"/>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:complexType name="MembershipInfoType">
+        <xsd:sequence>
+            <xsd:element name="CirclePersonalMembership" type="msnab:CirclePersonalMembershipType"/>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:complexType name="PersonalInfoType">
+        <xsd:sequence>
+            <xsd:element name="MembershipInfo" type="msnab:MembershipInfoType"/>
+            <xsd:element name="Name" type="xsd:string"/>
+            <xsd:element name="IsNotMobileVisible" type="xsd:boolean"/>
+            <xsd:element name="IsFavorite" type="xsd:boolean"/>
+            <xsd:element name="IsFamily" type="xsd:boolean"/>
+            <xsd:element name="Changes" type="xsd:anyType"/>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:complexType name="ContentInfoType">
+        <xsd:sequence>
+            <xsd:element name="Domain" type="xsd:int"/>
+            <xsd:element name="HostedDomain" type="xsd:string"/>
+            <xsd:element name="Type" type="xsd:int"/>
+            <xsd:element name="MembershipAccess" type="xsd:int"/>
+            <xsd:element name="IsPresenceEnabled" type="xsd:boolean"/>
+            <xsd:element name="RequestMembershipOption" type="xsd:int"/>
+            <xsd:element name="DisplayName" type="xsd:string"/>
+            <xsd:element name="ProfileLastUpdated" type="xsd:dateTime" minOccurs="0"/>
+            <xsd:element name="Changes" type="xsd:anyType" minOccurs="0"/>
+            <xsd:element name="CreateDate" type="xsd:dateTime" minOccurs="0"/>
+            <xsd:element name="LastChanged" type="xsd:dateTime" minOccurs="0"/>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:complexType name="ContentHandleType">
+        <xsd:sequence>
+            <xsd:element name="Id" type="xsd:string"/>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:complexType name="ContentType">
+        <xsd:sequence>
+            <xsd:element name="Handle" type="msnab:ContentHandleType"/>
+            <xsd:element name="Info" type="msnab:ContentInfoType"/>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:complexType name="CircleInverseInfoType">
+        <xsd:sequence>
+            <xsd:element name="Content" type="msnab:ContentType"/>
+            <xsd:element name="PersonalInfo" type="msnab:PersonalInfoType"/>
+            <xsd:element name="Deleted" type="xsd:boolean"/>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:complexType name="callerInfoType">
+        <xsd:sequence>
+            <xsd:element name="PublicDisplayName" type="xsd:string"/>
+        </xsd:sequence>
+    </xsd:complexType>
+</xsd:schema>
diff --git a/plugins/Msn/extlib/phpmsnclass/soap/.svn/text-base/msnab_servicetypes.xsd.svn-base b/plugins/Msn/extlib/phpmsnclass/soap/.svn/text-base/msnab_servicetypes.xsd.svn-base
new file mode 100644
index 0000000000..3fa9798b62
--- /dev/null
+++ b/plugins/Msn/extlib/phpmsnclass/soap/.svn/text-base/msnab_servicetypes.xsd.svn-base
@@ -0,0 +1,567 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- edited with XMLSpy v2008 sp1 (http://www.altova.com) by wp (freezingsoft) -->
+<xsd:schema xmlns:msnab="http://www.msn.com/webservices/AddressBook" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.msn.com/webservices/AddressBook" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0">
+    <xsd:include schemaLocation="msnab_datatypes.xsd"/>
+    <xsd:element name="ABApplicationHeader">
+        <xsd:complexType>
+            <xsd:sequence>
+                <xsd:element name="ApplicationId" type="msnab:Guid" fixed="09607671-1C32-421F-A6A6-CBFAA51AB5F4"/>
+                <xsd:element name="IsMigration" type="xsd:boolean" default="false"/>
+                <xsd:element name="PartnerScenario" type="xsd:string" default="Initial"/>
+                <xsd:element name="CacheKey" type="xsd:token" minOccurs="0"/>
+                <xsd:element name="BrandId" type="xsd:string" minOccurs="0"/>
+            </xsd:sequence>
+        </xsd:complexType>
+    </xsd:element>
+    <xsd:element name="ABAuthHeader">
+        <xsd:complexType>
+            <xsd:sequence>
+                <xsd:element name="ManagedGroupRequest" type="xsd:boolean" default="false"/>
+                <xsd:element name="TicketToken" type="xsd:string"/>
+            </xsd:sequence>
+        </xsd:complexType>
+    </xsd:element>
+    <xsd:element name="ServiceHeader">
+        <xsd:complexType>
+            <xsd:sequence>
+                <xsd:element name="Version" type="xsd:token"/>
+                <xsd:element name="CacheKey" type="xsd:token" minOccurs="0"/>
+                <xsd:element name="CacheKeyChanged" type="xsd:boolean" minOccurs="0"/>
+                <xsd:element name="PreferredHostName" type="xsd:string" minOccurs="0"/>
+                <xsd:element name="SessionId" type="msnab:Guid" minOccurs="0"/>
+            </xsd:sequence>
+        </xsd:complexType>
+    </xsd:element>
+    <xsd:element name="FindMembership" type="msnab:FindMembershipRequestType"/>
+    <xsd:complexType name="FindMembershipRequestType">
+        <xsd:sequence>
+            <xsd:element name="serviceFilter">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element name="Types">
+                            <xsd:complexType>
+                                <xsd:sequence>
+                                    <xsd:element name="ServiceType" type="xsd:string" maxOccurs="unbounded"/>
+                                </xsd:sequence>
+                            </xsd:complexType>
+                        </xsd:element>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="View" type="xsd:string" minOccurs="0"/>
+            <xsd:element name="deltasOnly" type="xsd:boolean" default="false" minOccurs="0"/>
+            <xsd:element name="lastChange" type="xsd:dateTime" default="0001-01-01T00:00:00.0000000-08:00" minOccurs="0"/>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:complexType name="FindMembershipResultType">
+        <xsd:sequence>
+            <xsd:element name="Services">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element name="Service" type="msnab:ServiceType" minOccurs="0" maxOccurs="unbounded"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="OwnerNamespace">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element name="Info">
+                            <xsd:complexType>
+                                <xsd:sequence>
+                                    <xsd:element name="Handle">
+                                        <xsd:complexType>
+                                            <xsd:sequence>
+                                                <xsd:element name="Id" type="xsd:string"/>
+                                                <xsd:element name="IsPassportNameHidden" type="xsd:boolean"/>
+                                                <xsd:element name="CID" type="xsd:integer"/>
+                                            </xsd:sequence>
+                                        </xsd:complexType>
+                                    </xsd:element>
+                                    <xsd:element name="CreatorPuid" type="xsd:integer"/>
+                                    <xsd:element name="CreatorCID" type="xsd:integer"/>
+                                    <xsd:element name="CreatorPassportName" type="xsd:string"/>
+                                    <xsd:element name="CircleAttributes">
+                                        <xsd:complexType>
+                                            <xsd:sequence>
+                                                <xsd:element name="IsPresenceEnabled" type="xsd:boolean"/>
+                                                <xsd:element name="IsEvent" type="xsd:boolean" minOccurs="0"/>
+                                                <xsd:element name="Domain" type="xsd:string"/>
+                                            </xsd:sequence>
+                                        </xsd:complexType>
+                                    </xsd:element>
+                                    <xsd:element name="MessengerApplicationServiceCreated" type="xsd:boolean" minOccurs="0"/>
+                                </xsd:sequence>
+                            </xsd:complexType>
+                        </xsd:element>
+                        <xsd:element name="Changes" type="xsd:string"/>
+                        <xsd:element name="CreateDate" type="xsd:dateTime"/>
+                        <xsd:element name="LastChange" type="xsd:dateTime"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:element name="FindMembershipResponse">
+        <xsd:complexType>
+            <xsd:sequence>
+                <xsd:element name="FindMembershipResult" type="msnab:FindMembershipResultType"/>
+            </xsd:sequence>
+        </xsd:complexType>
+    </xsd:element>
+    <xsd:element name="ABFindAll" type="msnab:ABFindAllRequestType"/>
+    <xsd:complexType name="ABFindAllRequestType">
+        <xsd:sequence>
+            <xsd:element name="abId" type="msnab:Guid" fixed="00000000-0000-0000-0000-000000000000"/>
+            <xsd:element name="abView" type="xsd:string" minOccurs="0"/>
+            <xsd:element name="deltasOnly" type="xsd:boolean" default="false" minOccurs="0"/>
+            <xsd:element name="lastChange" type="xsd:dateTime" default="0001-01-01T00:00:00.0000000-08:00" minOccurs="0"/>
+            <xsd:element name="dynamicItemView" type="xsd:string" fixed="Gleam" minOccurs="0"/>
+            <xsd:element name="dynamicItemLastChange" type="xsd:dateTime" default="0001-01-01T00:00:00.0000000-08:00" minOccurs="0"/>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:complexType name="ABFindAllResultType">
+        <xsd:sequence>
+            <xsd:element name="groups" minOccurs="0">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element name="Group" type="msnab:GroupType" maxOccurs="unbounded"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="contacts">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element name="Contact" type="msnab:ContactType" minOccurs="0" maxOccurs="unbounded"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="DynamicItems" minOccurs="0">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element name="DynamicItem" type="msnab:BaseDynamicItemType" minOccurs="0" maxOccurs="unbounded"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="CircleResult">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element name="CircleTicket" type="xsd:string"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="ab">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element name="abId" type="msnab:Guid"/>
+                        <xsd:element name="abInfo" type="msnab:abInfoType"/>
+                        <xsd:element name="lastChange" type="xsd:dateTime"/>
+                        <xsd:element name="DynamicItemLastChanged" type="xsd:dateTime"/>
+                        <xsd:element name="RecentActivityItemLastChanged" type="xsd:dateTime"/>
+                        <xsd:element name="createDate" type="xsd:dateTime"/>
+                        <xsd:element name="propertiesChanged" type="xsd:string"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:element name="ABFindAllResponse">
+        <xsd:complexType>
+            <xsd:sequence>
+                <xsd:element name="ABFindAllResult" type="msnab:ABFindAllResultType"/>
+            </xsd:sequence>
+        </xsd:complexType>
+    </xsd:element>
+    <xsd:element name="ABContactAdd" type="msnab:ABContactAddRequestType"/>
+    <xsd:complexType name="ABContactAddRequestType">
+        <xsd:sequence>
+            <xsd:element name="abId" type="msnab:Guid" fixed="00000000-0000-0000-0000-000000000000"/>
+            <xsd:element name="contacts">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element name="Contact" type="msnab:ContactType" minOccurs="0" maxOccurs="unbounded"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="options" minOccurs="0">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element name="EnableAllowListManagement" type="xsd:boolean"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:complexType name="ABContactAddResultType">
+        <xsd:sequence>
+            <xsd:element name="guid" type="msnab:Guid"/>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:element name="ABContactAddResponse">
+        <xsd:complexType>
+            <xsd:sequence>
+                <xsd:element name="ABContactAddResult" type="msnab:ABContactAddResultType" minOccurs="0"/>
+            </xsd:sequence>
+        </xsd:complexType>
+    </xsd:element>
+    <xsd:element name="ABContactDelete" type="msnab:ABContactDeleteRequestType"/>
+    <xsd:complexType name="ABContactDeleteRequestType">
+        <xsd:sequence>
+            <xsd:element name="abId" type="msnab:Guid" fixed="00000000-0000-0000-0000-000000000000"/>
+            <xsd:element name="contacts">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element name="Contact" type="msnab:ContactIdType" minOccurs="0" maxOccurs="unbounded"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:element name="ABContactDeleteResponse"/>
+    <xsd:element name="ABGroupContactAdd" type="msnab:ABGroupContactAddRequestType"/>
+    <xsd:complexType name="ABGroupContactAddRequestType">
+        <xsd:sequence>
+            <xsd:element name="abId" type="msnab:Guid" fixed="00000000-0000-0000-0000-000000000000"/>
+            <xsd:element name="groupFilter" type="msnab:groupFilterType"/>
+            <xsd:element name="contacts">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element name="Contact" type="msnab:ContactType" minOccurs="0" maxOccurs="unbounded"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="groupContactAddOptions" minOccurs="0">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element name="fGenerateMissingQuickName" type="xsd:boolean" minOccurs="0"/>
+                        <xsd:element name="EnableAllowListManagement" type="xsd:boolean" minOccurs="0"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:complexType name="ABGroupContactAddResultType">
+        <xsd:sequence>
+            <xsd:element name="guid" type="msnab:Guid"/>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:element name="ABGroupContactAddResponse">
+        <xsd:complexType>
+            <xsd:sequence>
+                <xsd:element name="ABGroupContactAddResult" type="msnab:ABGroupContactAddResultType" minOccurs="0"/>
+            </xsd:sequence>
+        </xsd:complexType>
+    </xsd:element>
+    <xsd:element name="ABGroupAdd" type="msnab:ABGroupAddRequestType"/>
+    <xsd:complexType name="ABGroupAddRequestType">
+        <xsd:sequence>
+            <xsd:element name="abId" type="msnab:Guid" fixed="00000000-0000-0000-0000-000000000000"/>
+            <xsd:element name="groupAddOptions">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element name="fRenameOnMsgrConflict" type="xsd:boolean" minOccurs="0"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="groupInfo">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element name="GroupInfo" type="msnab:groupInfoType"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:complexType name="ABGroupAddResultType">
+        <xsd:sequence>
+            <xsd:element name="guid" type="msnab:Guid"/>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:element name="ABGroupAddResponse">
+        <xsd:complexType>
+            <xsd:sequence>
+                <xsd:element name="ABGroupAddResult" type="msnab:ABGroupAddResultType" minOccurs="0"/>
+            </xsd:sequence>
+        </xsd:complexType>
+    </xsd:element>
+    <xsd:element name="ABGroupUpdate" type="msnab:ABGroupUpdateRequestType"/>
+    <xsd:complexType name="ABGroupUpdateRequestType">
+        <xsd:sequence>
+            <xsd:element name="abId" type="msnab:Guid" fixed="00000000-0000-0000-0000-000000000000"/>
+            <xsd:element name="groups">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element name="Group" type="msnab:GroupType" minOccurs="0" maxOccurs="unbounded"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:element name="ABGroupUpdateResponse">
+        <xsd:complexType/>
+    </xsd:element>
+    <xsd:element name="ABGroupDelete" type="msnab:ABGroupDeleteRequestType"/>
+    <xsd:complexType name="ABGroupDeleteRequestType">
+        <xsd:sequence>
+            <xsd:element name="abId" type="msnab:Guid" fixed="00000000-0000-0000-0000-000000000000"/>
+            <xsd:element name="groupFilter" type="msnab:groupFilterType"/>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:element name="ABGroupDeleteResponse">
+        <xsd:complexType/>
+    </xsd:element>
+    <xsd:element name="ABContactUpdate" type="msnab:ABContactUpdateRequestType"/>
+    <xsd:complexType name="ABContactUpdateRequestType">
+        <xsd:sequence>
+            <xsd:element name="abId" type="msnab:Guid" fixed="00000000-0000-0000-0000-000000000000"/>
+            <xsd:element name="contacts">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element name="Contact" type="msnab:ContactType" minOccurs="0" maxOccurs="unbounded"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:element name="ABContactUpdateResponse">
+        <xsd:complexType/>
+    </xsd:element>
+    <xsd:element name="ABGroupContactDelete" type="msnab:ABGroupContactDeleteRequestType"/>
+    <xsd:complexType name="ABGroupContactDeleteRequestType">
+        <xsd:sequence>
+            <xsd:element name="abId" type="msnab:Guid" fixed="00000000-0000-0000-0000-000000000000"/>
+            <xsd:element name="contacts">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element name="Contact" type="msnab:ContactType" minOccurs="0" maxOccurs="unbounded"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="groupFilter" type="msnab:groupFilterType"/>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:element name="ABGroupContactDeleteResponse">
+        <xsd:complexType/>
+    </xsd:element>
+    <xsd:element name="AddMember" type="msnab:AddMemberRequestType"/>
+    <xsd:complexType name="AddMemberRequestType">
+        <xsd:sequence>
+            <xsd:element name="serviceHandle" type="msnab:HandleType"/>
+            <xsd:element name="memberships">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element name="Membership" type="msnab:Membership" minOccurs="0" maxOccurs="unbounded"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:element name="AddMemberResponse">
+        <xsd:complexType/>
+    </xsd:element>
+    <xsd:element name="DeleteMember" type="msnab:DeleteMemberRequestType"/>
+    <xsd:complexType name="DeleteMemberRequestType">
+        <xsd:sequence>
+            <xsd:element name="serviceHandle" type="msnab:HandleType"/>
+            <xsd:element name="memberships">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element name="Membership" type="msnab:Membership" minOccurs="0" maxOccurs="unbounded"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="nsHandle" type="msnab:ContentHandleType" minOccurs="0"/>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:element name="DeleteMemberResponse">
+        <xsd:complexType/>
+    </xsd:element>
+    <xsd:complexType name="ABAddResponseType">
+        <xsd:sequence>
+            <xsd:element name="ABAddResult" type="xsd:string"/>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:element name="ABAddResponse" type="msnab:ABAddResponseType"/>
+    <xsd:element name="ABAdd" type="msnab:ABAddRequestType"/>
+    <xsd:complexType name="ABAddRequestType">
+        <xsd:sequence>
+            <xsd:element name="abInfo" type="msnab:abInfoType"/>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:complexType name="UpdateDynamicItemRequestType">
+        <xsd:sequence>
+            <xsd:element name="abId" type="xsd:string"/>
+            <xsd:element name="dynamicItems">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element name="DynamicItem" type="msnab:BaseDynamicItemType" maxOccurs="unbounded"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:element name="UpdateDynamicItem" type="msnab:UpdateDynamicItemRequestType"/>
+    <xsd:element name="UpdateDynamicItemResponse"/>
+    <xsd:element name="ABFindContactsPaged" type="msnab:ABFindContactsPagedRequestType"/>
+    <xsd:complexType name="ABFindContactsPagedRequestType">
+        <xsd:sequence>
+            <xsd:element name="filterOptions" type="msnab:filterOptionsType"/>
+            <xsd:element name="abView" type="xsd:string"/>
+            <xsd:element name="extendedContent" type="xsd:string"/>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:complexType name="ABFindContactsPagedResultType">
+        <xsd:sequence>
+            <xsd:element name="Groups" minOccurs="0">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element name="Group" type="msnab:GroupType" maxOccurs="unbounded"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="Contacts">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element name="Contact" type="msnab:ContactType" minOccurs="0" maxOccurs="unbounded"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="CircleResult" type="msnab:CircleResultType"/>
+            <xsd:element name="Ab">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element name="abId" type="msnab:Guid"/>
+                        <xsd:element name="abInfo" type="msnab:abInfoType"/>
+                        <xsd:element name="lastChange" type="xsd:dateTime"/>
+                        <xsd:element name="DynamicItemLastChanged" type="xsd:dateTime"/>
+                        <xsd:element name="RecentActivityItemLastChanged" type="xsd:dateTime"/>
+                        <xsd:element name="createDate" type="xsd:dateTime"/>
+                        <xsd:element name="propertiesChanged" type="xsd:string"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:element name="ABFindContactsPagedResponse">
+        <xsd:complexType>
+            <xsd:sequence>
+                <xsd:element name="ABFindContactsPagedResult" type="msnab:ABFindContactsPagedResultType"/>
+            </xsd:sequence>
+        </xsd:complexType>
+    </xsd:element>
+    <xsd:element name="WNApplicationHeader">
+        <xsd:complexType>
+            <xsd:sequence>
+                <xsd:element name="ApplicationId" type="msnab:Guid"/>
+            </xsd:sequence>
+        </xsd:complexType>
+    </xsd:element>
+    <xsd:element name="WNAuthHeader">
+        <xsd:complexType>
+            <xsd:sequence>
+                <xsd:element name="TicketToken" type="xsd:string"/>
+            </xsd:sequence>
+        </xsd:complexType>
+    </xsd:element>
+    <xsd:element name="WNServiceHeader">
+        <xsd:complexType>
+            <xsd:sequence>
+                <xsd:element name="Version" type="xsd:token"/>
+                <xsd:element name="CacheKey" type="xsd:token" minOccurs="0"/>
+                <xsd:element name="CacheKeyChanged" type="xsd:boolean" minOccurs="0"/>
+                <xsd:element name="PreferredHostName" type="xsd:string" minOccurs="0"/>
+            </xsd:sequence>
+        </xsd:complexType>
+    </xsd:element>
+    <xsd:element name="GetContactsRecentActivity" type="msnab:GetContactsRecentActivityRequestType"/>
+    <xsd:complexType name="GetContactsRecentActivityRequestType">
+        <xsd:sequence>
+            <xsd:element name="entityHandle" type="msnab:entityHandle"/>
+            <xsd:element name="locales">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element name="string" type="xsd:string" maxOccurs="unbounded"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="count" type="xsd:int"/>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:element name="GetContactsRecentActivityResponse">
+        <xsd:complexType>
+            <xsd:sequence>
+                <xsd:element name="GetContactsRecentActivityResult" type="msnab:GetContactsRecentActivityResultType"/>
+            </xsd:sequence>
+        </xsd:complexType>
+    </xsd:element>
+    <xsd:complexType name="GetContactsRecentActivityResultType">
+        <xsd:sequence>
+            <xsd:element name="Activities">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element name="ActivityDetails" type="msnab:ActivityDetailsType" maxOccurs="unbounded"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="Templates">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element name="RecentActivityTemplateContainer" type="msnab:RecentActivityTemplateContainerType" maxOccurs="unbounded"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="FeedUrl" type="xsd:anyURI"/>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:element name="ManageWLConnection" type="msnab:ManageWLConnectionRequestType"/>
+    <xsd:complexType name="ManageWLConnectionRequestType">
+        <xsd:sequence>
+            <xsd:element name="abHandle" type="msnab:abHandleType"/>
+            <xsd:element name="contactId" type="xsd:string"/>
+            <xsd:element name="connection" type="xsd:boolean"/>
+            <xsd:element name="presence" type="xsd:boolean"/>
+            <xsd:element name="action" type="xsd:integer"/>
+            <xsd:element name="relationshipType" type="xsd:int"/>
+            <xsd:element name="relationshipRole" type="xsd:int"/>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:element name="ManageWLConnectionResponse">
+        <xsd:complexType>
+            <xsd:sequence>
+                <xsd:element name="ManageWLConnectionResult" type="msnab:ContactType"/>
+            </xsd:sequence>
+        </xsd:complexType>
+    </xsd:element>
+    <xsd:element name="CreateContact" type="msnab:CreateContactType"/>
+    <xsd:complexType name="CreateContactType">
+        <xsd:sequence>
+            <xsd:element name="abHandle" type="msnab:abHandleType"/>
+            <xsd:element name="contactHandle" type="msnab:contactHandleType"/>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:element name="CreateContactResponse">
+        <xsd:complexType>
+            <xsd:sequence>
+                <xsd:element name="CreateContactResult" type="msnab:ContactType"/>
+            </xsd:sequence>
+        </xsd:complexType>
+    </xsd:element>
+    <xsd:element name="CreateCircle" type="msnab:CreateCircleRequestType"/>
+    <xsd:complexType name="CreateCircleRequestType">
+        <xsd:sequence>
+            <xsd:element name="properties" type="msnab:ContentInfoType"/>
+            <xsd:element name="callerInfo" type="msnab:callerInfoType"/>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:complexType name="CreateCircleResponseType">
+        <xsd:sequence>
+            <xsd:element name="Id" type="msnab:Guid"/>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:element name="CreateCircleResponse">
+        <xsd:complexType>
+            <xsd:sequence>
+                <xsd:element name="CreateCircleResult" type="msnab:CreateCircleResponseType"/>
+            </xsd:sequence>
+        </xsd:complexType>
+    </xsd:element>
+</xsd:schema>
diff --git a/plugins/Msn/extlib/phpmsnclass/soap/.svn/text-base/msnab_sharingservice.wsdl.svn-base b/plugins/Msn/extlib/phpmsnclass/soap/.svn/text-base/msnab_sharingservice.wsdl.svn-base
new file mode 100644
index 0000000000..7ec87f90c9
--- /dev/null
+++ b/plugins/Msn/extlib/phpmsnclass/soap/.svn/text-base/msnab_sharingservice.wsdl.svn-base
@@ -0,0 +1,532 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- edited with XMLSpy v2008 sp1 (http://www.altova.com) by wp (freezingsoft) -->
+<definitions xmlns:msnab="http://www.msn.com/webservices/AddressBook" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:ns="http://www.w3.org/2001/XMLSchema" xmlns:ns1="http://schemas.xmlsoap.org/soap/encoding/" xmlns="http://schemas.xmlsoap.org/wsdl/" targetNamespace="http://www.msn.com/webservices/AddressBook">
+    <types>
+        <ns:schema xmlns="http://www.w3.org/2001/XMLSchema">
+            <ns:import schemaLocation="msnab_servicetypes.xsd" namespace="http://www.msn.com/webservices/AddressBook"/>
+        </ns:schema>
+    </types>
+    <message name="ABHeader">
+        <part name="ApplicationHeader" element="msnab:ABApplicationHeader"/>
+        <part name="AuthHeader" element="msnab:ABAuthHeader"/>
+    </message>
+    <message name="FindMembershipMessage">
+        <part name="FindMembershipRequest" element="msnab:FindMembership"/>
+    </message>
+    <message name="ABFindAllMessage">
+        <part name="ABFindAllRequest" element="msnab:ABFindAll"/>
+    </message>
+    <message name="ABContactAddMessage">
+        <part name="ABContactAddRequest" element="msnab:ABContactAdd"/>
+    </message>
+    <message name="ABContactDeleteMessage">
+        <part name="ABContactDeleteRequest" element="msnab:ABContactDelete"/>
+    </message>
+    <message name="ABGroupContactAddMessage">
+        <part name="ABGroupContactAddRequest" element="msnab:ABGroupContactAdd"/>
+    </message>
+    <message name="ABGroupAddMessage">
+        <part name="ABGroupAddRequest" element="msnab:ABGroupAdd"/>
+    </message>
+    <message name="ABGroupUpdateMessage">
+        <part name="ABGroupUpdateRequest" element="msnab:ABGroupUpdate"/>
+    </message>
+    <message name="ABGroupDeleteMessage">
+        <part name="ABGroupDeleteRequest" element="msnab:ABGroupDelete"/>
+    </message>
+    <message name="ABGroupContactDeleteMessage">
+        <part name="ABGroupContactDeleteRequest" element="msnab:ABGroupContactDelete"/>
+    </message>
+    <message name="ABContactUpdateMessage">
+        <part name="ABContactUpdateRequest" element="msnab:ABContactUpdate"/>
+    </message>
+    <message name="AddMemberMessage">
+        <part name="AddMemberRequest" element="msnab:AddMember"/>
+    </message>
+    <message name="DeleteMemberMessage">
+        <part name="DeleteMemberRequest" element="msnab:DeleteMember"/>
+    </message>
+    <message name="ServiceHeader">
+        <part name="ServiceHeader" element="msnab:ServiceHeader"/>
+    </message>
+    <message name="FindMembershipResponseMessage">
+        <part name="FindMembershipResponse" element="msnab:FindMembershipResponse"/>
+    </message>
+    <message name="ABFindAllResponseMessage">
+        <part name="ABFindAllResponse" element="msnab:ABFindAllResponse"/>
+    </message>
+    <message name="ABContactAddResponseMessage">
+        <part name="ABContactAddResponse" element="msnab:ABContactAddResponse"/>
+    </message>
+    <message name="ABContactDeleteResponseMessage">
+        <part name="ABContactDeleteResponse" element="msnab:ABContactDeleteResponse"/>
+    </message>
+    <message name="ABGroupContactAddResponseMessage">
+        <part name="ABGroupContactAddResponse" element="msnab:ABGroupContactAddResponse"/>
+    </message>
+    <message name="ABGroupAddResponseMessage">
+        <part name="ABGroupAddResponse" element="msnab:ABGroupAddResponse"/>
+    </message>
+    <message name="ABGroupUpdateResponseMessage">
+        <part name="ABGroupUpdateResponse" element="msnab:ABGroupUpdateResponse"/>
+    </message>
+    <message name="ABGroupDeleteResponseMessage">
+        <part name="ABGroupDeleteResponse" element="msnab:ABGroupDeleteResponse"/>
+    </message>
+    <message name="ABGroupContactDeleteResponseMessage">
+        <part name="ABGroupContactDeleteResponse" element="msnab:ABGroupContactDeleteResponse"/>
+    </message>
+    <message name="ABContactUpdateResponseMessage">
+        <part name="ABContactUpdateResponse" element="msnab:ABContactUpdateResponse"/>
+    </message>
+    <message name="AddMemberResponseMessage">
+        <part name="AddMemberResponse" element="msnab:AddMemberResponse"/>
+    </message>
+    <message name="DeleteMemberResponseMessage">
+        <part name="DeleteMemberResponse" element="msnab:DeleteMemberResponse"/>
+    </message>
+    <message name="InvalidPassportUserMessage">
+        <part name="fault" element="msnab:InvalidPassportUser"/>
+    </message>
+    <message name="ABAddMessage">
+        <part name="ABAddRequest" element="msnab:ABAdd"/>
+    </message>
+    <message name="ABAddResponseMessage">
+        <part name="ABAddResponse" element="msnab:ABAddResponse"/>
+    </message>
+    <message name="UpdateDynamicItemMessage">
+        <part name="UpdateDynamicItem" element="msnab:UpdateDynamicItem"/>
+    </message>
+    <message name="UpdateDynamicItemResponseMessage">
+        <part name="UpdateDynamicItemResponse" element="msnab:UpdateDynamicItemResponse"/>
+    </message>
+    <message name="ABFindContactsPagedMessage">
+        <part name="ABFindContactsPagedRequest" element="msnab:ABFindContactsPaged"/>
+    </message>
+    <message name="ABFindContactsPagedResponseMessage">
+        <part name="ABFindContactsPagedResponse" element="msnab:ABFindContactsPagedResponse"/>
+    </message>
+    <message name="GetContactsRecentActivityMessage">
+        <part name="GetContactsRecentActivityRequest" element="msnab:GetContactsRecentActivity"/>
+    </message>
+    <message name="GetContactsRecentActivityResponseMessage">
+        <part name="GetContactsRecentActivityResponse" element="msnab:GetContactsRecentActivityResponse"/>
+    </message>
+    <message name="WNHeader">
+        <part name="WNApplicationHeader" element="msnab:WNApplicationHeader"/>
+        <part name="WNAuthHeader" element="msnab:WNAuthHeader"/>
+        <part name="WNServiceHeader" element="msnab:WNServiceHeader"/>
+    </message>
+    <message name="CreateCircleMessage">
+        <part name="CreateCircleRequest" element="msnab:CreateCircle"/>
+    </message>
+    <message name="CreateCircleResponseMessage">
+        <part name="CreateCircleResponse" element="msnab:CreateCircleResponse"/>
+    </message>
+    <message name="CreateContactMessage">
+        <part name="CreateContactRequest" element="msnab:CreateContact"/>
+    </message>
+    <message name="CreateContactResponseMessage">
+        <part name="CreateContactResponse" element="msnab:CreateContactResponse"/>
+    </message>
+    <message name="ManageWLConnectionMessage">
+        <part name="ManageWLConnection" element="msnab:ManageWLConnection"/>
+    </message>
+    <message name="ManageWLConnectionResponseMessage">
+        <part name="ManageWLConnectionResponse" element="msnab:ManageWLConnectionResponse"/>
+    </message>
+    <portType name="SharingServicePortType">
+        <operation name="FindMembership">
+            <input message="msnab:FindMembershipMessage"/>
+            <output message="msnab:FindMembershipResponseMessage"/>
+        </operation>
+        <operation name="AddMember">
+            <input message="msnab:AddMemberMessage"/>
+            <output message="msnab:AddMemberResponseMessage"/>
+        </operation>
+        <operation name="DeleteMember">
+            <input message="msnab:DeleteMemberMessage"/>
+            <output message="msnab:DeleteMemberResponseMessage"/>
+        </operation>
+        <operation name="CreateCircle">
+            <input message="msnab:CreateCircleMessage"/>
+            <output message="msnab:CreateCircleResponseMessage"/>
+        </operation>
+    </portType>
+    <portType name="ABServicePortType">
+        <operation name="ABFindAll">
+            <input message="msnab:ABFindAllMessage"/>
+            <output message="msnab:ABFindAllResponseMessage"/>
+        </operation>
+        <operation name="ABContactAdd">
+            <input message="msnab:ABContactAddMessage"/>
+            <output message="msnab:ABContactAddResponseMessage"/>
+            <fault name="InvalidPassportUserException" message="msnab:InvalidPassportUserMessage"/>
+        </operation>
+        <operation name="ABContactDelete">
+            <input message="msnab:ABContactDeleteMessage"/>
+            <output message="msnab:ABContactDeleteResponseMessage"/>
+            <fault name="InvalidPassportUserException" message="msnab:InvalidPassportUserMessage"/>
+        </operation>
+        <operation name="ABGroupContactAdd">
+            <input message="msnab:ABGroupContactAddMessage"/>
+            <output message="msnab:ABGroupContactAddResponseMessage"/>
+            <fault name="InvalidPassportUserException" message="msnab:InvalidPassportUserMessage"/>
+        </operation>
+        <operation name="ABGroupAdd">
+            <input message="msnab:ABGroupAddMessage"/>
+            <output message="msnab:ABGroupAddResponseMessage"/>
+        </operation>
+        <operation name="ABGroupUpdate">
+            <input message="msnab:ABGroupUpdateMessage"/>
+            <output message="msnab:ABGroupUpdateResponseMessage"/>
+        </operation>
+        <operation name="ABGroupDelete">
+            <input message="msnab:ABGroupDeleteMessage"/>
+            <output message="msnab:ABGroupDeleteResponseMessage"/>
+        </operation>
+        <operation name="ABGroupContactDelete">
+            <input message="msnab:ABGroupContactDeleteMessage"/>
+            <output message="msnab:ABGroupContactDeleteResponseMessage"/>
+        </operation>
+        <operation name="ABContactUpdate">
+            <input message="msnab:ABContactUpdateMessage"/>
+            <output message="msnab:ABContactUpdateResponseMessage"/>
+        </operation>
+        <operation name="ABAdd">
+            <input message="msnab:ABAddMessage"/>
+            <output message="msnab:ABAddResponseMessage"/>
+        </operation>
+        <operation name="UpdateDynamicItem">
+            <input message="msnab:UpdateDynamicItemMessage"/>
+            <output message="msnab:UpdateDynamicItemResponseMessage"/>
+        </operation>
+        <operation name="ABFindContactsPaged">
+            <input message="msnab:ABFindContactsPagedMessage"/>
+            <output message="msnab:ABFindContactsPagedResponseMessage"/>
+        </operation>
+        <operation name="CreateContact">
+            <input message="msnab:CreateContactMessage"/>
+            <output message="msnab:CreateContactResponseMessage"/>
+        </operation>
+        <operation name="ManageWLConnection">
+            <input message="msnab:ManageWLConnectionMessage"/>
+            <output message="msnab:ManageWLConnectionResponseMessage"/>
+        </operation>
+    </portType>
+    <portType name="WhatsUpServicePortType">
+        <operation name="GetContactsRecentActivity">
+            <input message="msnab:GetContactsRecentActivityMessage"/>
+            <output message="msnab:GetContactsRecentActivityResponseMessage"/>
+        </operation>
+    </portType>
+    <binding name="SharingServiceBinding" type="msnab:SharingServicePortType">
+        <soap:binding transport="http://schemas.xmlsoap.org/soap/http"/>
+        <operation name="FindMembership">
+            <soap:operation soapAction="http://www.msn.com/webservices/AddressBook/FindMembership"/>
+            <input>
+                <soap:header message="msnab:ABHeader" part="ApplicationHeader" use="literal"/>
+                <soap:header message="msnab:ABHeader" part="AuthHeader" use="literal"/>
+                <soap:body use="literal"/>
+            </input>
+            <output>
+                <soap:header message="msnab:ServiceHeader" part="ServiceHeader" use="literal"/>
+                <soap:body use="literal"/>
+            </output>
+        </operation>
+        <operation name="AddMember">
+            <soap:operation soapAction="http://www.msn.com/webservices/AddressBook/AddMember"/>
+            <input>
+                <soap:header message="msnab:ABHeader" part="ApplicationHeader" use="literal"/>
+                <soap:header message="msnab:ABHeader" part="AuthHeader" use="literal"/>
+                <soap:body use="literal"/>
+            </input>
+            <output>
+                <soap:header message="msnab:ServiceHeader" part="ServiceHeader" use="literal"/>
+                <soap:body use="literal"/>
+            </output>
+        </operation>
+        <operation name="DeleteMember">
+            <soap:operation soapAction="http://www.msn.com/webservices/AddressBook/DeleteMember"/>
+            <input>
+                <soap:header message="msnab:ABHeader" part="ApplicationHeader" use="literal"/>
+                <soap:header message="msnab:ABHeader" part="AuthHeader" use="literal"/>
+                <soap:body use="literal"/>
+            </input>
+            <output>
+                <soap:header message="msnab:ServiceHeader" part="ServiceHeader" use="literal"/>
+                <soap:body use="literal"/>
+            </output>
+        </operation>
+        <operation name="CreateCircle">
+            <soap:operation soapAction="http://www.msn.com/webservices/AddressBook/CreateCircle"/>
+            <input>
+                <soap:body use="literal"/>
+                <soap:header message="msnab:ABHeader" part="ApplicationHeader" use="literal"/>
+                <soap:header message="msnab:ABHeader" part="AuthHeader" use="literal"/>
+            </input>
+            <output>
+                <soap:body use="literal"/>
+                <soap:header message="msnab:ServiceHeader" part="ServiceHeader" use="literal"/>
+            </output>
+        </operation>
+    </binding>
+    <binding name="ABServiceBinding" type="msnab:ABServicePortType">
+        <soap:binding transport="http://schemas.xmlsoap.org/soap/http"/>
+        <operation name="ABFindAll">
+            <soap:operation soapAction="http://www.msn.com/webservices/AddressBook/ABFindAll"/>
+            <input>
+                <soap:header message="msnab:ABHeader" part="ApplicationHeader" use="literal"/>
+                <soap:header message="msnab:ABHeader" part="AuthHeader" use="literal"/>
+                <soap:body use="literal"/>
+            </input>
+            <output>
+                <soap:header message="msnab:ServiceHeader" part="ServiceHeader" use="literal"/>
+                <soap:body use="literal"/>
+            </output>
+        </operation>
+        <operation name="ABContactAdd">
+            <soap:operation soapAction="http://www.msn.com/webservices/AddressBook/ABContactAdd"/>
+            <input>
+                <soap:header message="msnab:ABHeader" part="ApplicationHeader" use="literal"/>
+                <soap:header message="msnab:ABHeader" part="AuthHeader" use="literal"/>
+                <soap:body use="literal"/>
+            </input>
+            <output>
+                <soap:header message="msnab:ServiceHeader" part="ServiceHeader" use="literal"/>
+                <soap:body use="literal"/>
+            </output>
+            <fault name="InvalidPassportUserException">
+                <soap:fault name="InvalidPassportUserException" use="literal"/>
+            </fault>
+        </operation>
+        <operation name="ABContactDelete">
+            <soap:operation soapAction="http://www.msn.com/webservices/AddressBook/ABContactDelete"/>
+            <input>
+                <soap:header message="msnab:ABHeader" part="ApplicationHeader" use="literal"/>
+                <soap:header message="msnab:ABHeader" part="AuthHeader" use="literal"/>
+                <soap:body use="literal"/>
+            </input>
+            <output>
+                <soap:header message="msnab:ServiceHeader" part="ServiceHeader" use="literal"/>
+                <soap:body use="literal"/>
+            </output>
+            <fault name="InvalidPassportUserException">
+                <soap:fault name="InvalidPassportUserException" use="literal"/>
+            </fault>
+        </operation>
+        <operation name="ABGroupContactAdd">
+            <soap:operation soapAction="http://www.msn.com/webservices/AddressBook/ABGroupContactAdd"/>
+            <input>
+                <soap:header message="msnab:ABHeader" part="ApplicationHeader" use="literal"/>
+                <soap:header message="msnab:ABHeader" part="AuthHeader" use="literal"/>
+                <soap:body use="literal"/>
+            </input>
+            <output>
+                <soap:header message="msnab:ServiceHeader" part="ServiceHeader" use="literal"/>
+                <soap:body use="literal"/>
+            </output>
+            <fault name="InvalidPassportUserException">
+                <soap:fault name="InvalidPassportUserException" use="literal"/>
+            </fault>
+        </operation>
+        <operation name="ABGroupAdd">
+            <soap:operation soapAction="http://www.msn.com/webservices/AddressBook/ABGroupAdd"/>
+            <input>
+                <soap:header message="msnab:ABHeader" part="ApplicationHeader" use="literal"/>
+                <soap:header message="msnab:ABHeader" part="AuthHeader" use="literal"/>
+                <soap:body use="literal"/>
+            </input>
+            <output>
+                <soap:header message="msnab:ServiceHeader" part="ServiceHeader" use="literal"/>
+                <soap:body use="literal"/>
+            </output>
+        </operation>
+        <operation name="ABGroupUpdate">
+            <soap:operation soapAction="http://www.msn.com/webservices/AddressBook/ABGroupUpdate"/>
+            <input>
+                <soap:header message="msnab:ABHeader" part="ApplicationHeader" use="literal"/>
+                <soap:header message="msnab:ABHeader" part="AuthHeader" use="literal"/>
+                <soap:body use="literal"/>
+            </input>
+            <output>
+                <soap:header message="msnab:ServiceHeader" part="ServiceHeader" use="literal"/>
+                <soap:body use="literal"/>
+            </output>
+        </operation>
+        <operation name="ABGroupDelete">
+            <soap:operation soapAction="http://www.msn.com/webservices/AddressBook/ABGroupDelete"/>
+            <input>
+                <soap:header message="msnab:ABHeader" part="ApplicationHeader" use="literal"/>
+                <soap:header message="msnab:ABHeader" part="AuthHeader" use="literal"/>
+                <soap:body use="literal"/>
+            </input>
+            <output>
+                <soap:header message="msnab:ServiceHeader" part="ServiceHeader" use="literal"/>
+                <soap:body use="literal"/>
+            </output>
+        </operation>
+        <operation name="ABGroupContactDelete">
+            <soap:operation soapAction="http://www.msn.com/webservices/AddressBook/ABGroupContactDelete"/>
+            <input>
+                <soap:header message="msnab:ABHeader" part="ApplicationHeader" use="literal"/>
+                <soap:header message="msnab:ABHeader" part="AuthHeader" use="literal"/>
+                <soap:body use="literal"/>
+            </input>
+            <output>
+                <soap:header message="msnab:ServiceHeader" part="ServiceHeader" use="literal"/>
+                <soap:body use="literal"/>
+            </output>
+        </operation>
+        <operation name="ABContactUpdate">
+            <soap:operation soapAction="http://www.msn.com/webservices/AddressBook/ABContactUpdate"/>
+            <input>
+                <soap:header message="msnab:ABHeader" part="ApplicationHeader" use="literal"/>
+                <soap:header message="msnab:ABHeader" part="AuthHeader" use="literal"/>
+                <soap:body use="literal"/>
+            </input>
+            <output>
+                <soap:header message="msnab:ServiceHeader" part="ServiceHeader" use="literal"/>
+                <soap:body use="literal"/>
+            </output>
+        </operation>
+        <operation name="ABAdd">
+            <soap:operation soapAction="http://www.msn.com/webservices/AddressBook/ABAdd"/>
+            <input>
+                <soap:body use="literal"/>
+                <soap:header message="msnab:ABHeader" part="ApplicationHeader" use="literal"/>
+                <soap:header message="msnab:ABHeader" part="AuthHeader" use="literal"/>
+            </input>
+            <output>
+                <soap:body use="literal"/>
+                <soap:header message="msnab:ServiceHeader" part="ServiceHeader" use="literal"/>
+            </output>
+        </operation>
+        <operation name="UpdateDynamicItem">
+            <soap:operation soapAction="http://www.msn.com/webservices/AddressBook/UpdateDynamicItem"/>
+            <input>
+                <soap:body use="literal"/>
+                <soap:header message="msnab:ABHeader" part="ApplicationHeader" use="literal"/>
+                <soap:header message="msnab:ABHeader" part="AuthHeader" use="literal"/>
+            </input>
+            <output>
+                <soap:body use="literal"/>
+                <soap:header message="msnab:ServiceHeader" part="ServiceHeader" use="literal"/>
+            </output>
+        </operation>
+        <operation name="ABFindContactsPaged">
+            <soap:operation soapAction="http://www.msn.com/webservices/AddressBook/ABFindContactsPaged"/>
+            <input>
+                <soap:body use="literal"/>
+                <soap:header message="msnab:ABHeader" part="ApplicationHeader" use="literal"/>
+                <soap:header message="msnab:ABHeader" part="AuthHeader" use="literal"/>
+            </input>
+            <output>
+                <soap:body use="literal"/>
+                <soap:header message="msnab:ServiceHeader" part="ServiceHeader" use="literal"/>
+            </output>
+        </operation>
+        <operation name="CreateContact">
+            <soap:operation soapAction="http://www.msn.com/webservices/AddressBook/CreateContact"/>
+            <input>
+                <soap:body use="literal"/>
+                <soap:header message="msnab:ABHeader" part="ApplicationHeader" use="literal"/>
+                <soap:header message="msnab:ABHeader" part="AuthHeader" use="literal"/>
+            </input>
+            <output>
+                <soap:body use="literal"/>
+                <soap:header message="msnab:ServiceHeader" part="ServiceHeader" use="literal"/>
+            </output>
+        </operation>
+        <operation name="ManageWLConnection">
+            <soap:operation soapAction="http://www.msn.com/webservices/AddressBook/ManageWLConnection"/>
+            <input>
+                <soap:body use="literal"/>
+                <soap:header message="msnab:ABHeader" part="ApplicationHeader" use="literal"/>
+                <soap:header message="msnab:ABHeader" part="AuthHeader" use="literal"/>
+            </input>
+            <output>
+                <soap:body use="literal"/>
+                <soap:header message="msnab:ServiceHeader" part="ServiceHeader" use="literal"/>
+            </output>
+        </operation>
+    </binding>
+    <binding name="WhatsUpServiceBinding" type="msnab:WhatsUpServicePortType">
+        <soap:binding transport="http://schemas.xmlsoap.org/soap/http"/>
+        <operation name="GetContactsRecentActivity">
+            <soap:operation soapAction="http://www.msn.com/webservices/AddressBook/GetContactsRecentActivity"/>
+            <input>
+                <soap:body use="literal"/>
+                <soap:header message="msnab:WNHeader" part="WNApplicationHeader" use="literal"/>
+                <soap:header message="msnab:WNHeader" part="WNAuthHeader" use="literal"/>
+            </input>
+            <output>
+                <soap:body use="literal"/>
+                <soap:header message="msnab:WNHeader" part="WNServiceHeader" use="literal"/>
+            </output>
+        </operation>
+    </binding>
+    <service name="SharingService">
+        <port name="FindMembershipPort" binding="msnab:SharingServiceBinding">
+            <soap:address location="https://contacts.msn.com/abservice/SharingService.asmx"/>
+        </port>
+        <port name="AddMemberPort" binding="msnab:SharingServiceBinding">
+            <soap:address location="https://contacts.msn.com/abservice/SharingService.asmx"/>
+        </port>
+        <port name="DeleteMemberPort" binding="msnab:SharingServiceBinding">
+            <soap:address location="https://contacts.msn.com/abservice/SharingService.asmx"/>
+        </port>
+        <port name="CreateCirclePort" binding="msnab:SharingServiceBinding">
+            <soap:address location="https://contacts.msn.com/abservice/SharingService.asmx"/>
+        </port>
+    </service>
+    <service name="ABService">
+        <port name="ABFindAllPort" binding="msnab:ABServiceBinding">
+            <soap:address location="https://contacts.msn.com/abservice/abservice.asmx"/>
+        </port>
+        <port name="ABContactAddPort" binding="msnab:ABServiceBinding">
+            <soap:address location="https://contacts.msn.com/abservice/abservice.asmx"/>
+        </port>
+        <port name="ABContactDeletePort" binding="msnab:ABServiceBinding">
+            <soap:address location="https://contacts.msn.com/abservice/abservice.asmx"/>
+        </port>
+        <port name="ABGroupContactAddPort" binding="msnab:ABServiceBinding">
+            <soap:address location="https://contacts.msn.com/abservice/abservice.asmx"/>
+        </port>
+        <port name="ABGroupAddPort" binding="msnab:ABServiceBinding">
+            <soap:address location="https://contacts.msn.com/abservice/abservice.asmx"/>
+        </port>
+        <port name="ABGroupUpdatePort" binding="msnab:ABServiceBinding">
+            <soap:address location="https://contacts.msn.com/abservice/abservice.asmx"/>
+        </port>
+        <port name="ABGroupDeletePort" binding="msnab:ABServiceBinding">
+            <soap:address location="https://contacts.msn.com/abservice/abservice.asmx"/>
+        </port>
+        <port name="ABGroupContactDeletePort" binding="msnab:ABServiceBinding">
+            <soap:address location="https://contacts.msn.com/abservice/abservice.asmx"/>
+        </port>
+        <port name="ABContactUpdatePort" binding="msnab:ABServiceBinding">
+            <soap:address location="https://contacts.msn.com/abservice/abservice.asmx"/>
+        </port>
+        <port name="ABAddPort" binding="msnab:ABServiceBinding">
+            <soap:address location="https://contacts.msn.com/abservice/abservice.asmx"/>
+        </port>
+        <port name="UpdateDynamicItemPort" binding="msnab:ABServiceBinding">
+            <soap:address location="https://contacts.msn.com/abservice/abservice.asmx"/>
+        </port>
+        <port name="ABFindContactsPagedPort" binding="msnab:ABServiceBinding">
+            <soap:address location="https://contacts.msn.com/abservice/abservice.asmx"/>
+        </port>
+        <port name="CreateContactPort" binding="msnab:ABServiceBinding">
+            <soap:address location="https://contacts.msn.com/abservice/abservice.asmx"/>
+        </port>
+        <port name="ManageWLConnectionPort" binding="msnab:ABServiceBinding">
+            <soap:address location="https://contacts.msn.com/abservice/abservice.asmx"/>
+        </port>
+    </service>
+    <service name="WhatsUpService">
+        <port name="GetContactsRecentActivityPort" binding="msnab:WhatsUpServiceBinding">
+            <soap:address location="http://sup.live.com/whatsnew/whatsnewservice.asmx"/>
+        </port>
+    </service>
+</definitions>
diff --git a/plugins/Msn/extlib/phpmsnclass/soap/msnab_datatypes.xsd b/plugins/Msn/extlib/phpmsnclass/soap/msnab_datatypes.xsd
new file mode 100644
index 0000000000..46fc23f911
--- /dev/null
+++ b/plugins/Msn/extlib/phpmsnclass/soap/msnab_datatypes.xsd
@@ -0,0 +1,832 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- edited with XMLSpy v2008 sp1 (http://www.altova.com) by wp (freezingsoft) -->
+<xsd:schema xmlns:msnab="http://www.msn.com/webservices/AddressBook" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" targetNamespace="http://www.msn.com/webservices/AddressBook" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0">
+    <xsd:complexType name="abInfoType">
+        <xsd:sequence>
+            <xsd:element name="name" type="xsd:string" minOccurs="0"/>
+            <xsd:element name="ownerPuid" type="xsd:string"/>
+            <xsd:element name="OwnerCID" type="xsd:integer" minOccurs="0"/>
+            <xsd:element name="ownerEmail" type="xsd:string"/>
+            <xsd:element name="fDefault" type="xsd:boolean"/>
+            <xsd:element name="joinedNamespace" type="xsd:boolean" minOccurs="0"/>
+            <xsd:element name="IsBot" type="xsd:boolean" minOccurs="0"/>
+            <xsd:element name="IsParentManaged" type="xsd:boolean" minOccurs="0"/>
+            <xsd:element name="SubscribeExternalPartner" type="xsd:boolean" minOccurs="0"/>
+            <xsd:element name="NotifyExternalPartner" type="xsd:boolean" minOccurs="0"/>
+            <xsd:element name="AddressBookType" type="xsd:string" minOccurs="0"/>
+            <xsd:element name="MessengerApplicationServiceCreated" type="xsd:boolean" minOccurs="0"/>
+            <xsd:element name="IsBetaMigrated" type="xsd:boolean" minOccurs="0"/>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:complexType name="HandleType">
+        <xsd:sequence>
+            <xsd:element name="Id" type="xsd:integer"/>
+            <xsd:element name="Type" type="xsd:string" default="Messenger"/>
+            <xsd:element name="ForeignId" type="xsd:string"/>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:complexType name="ServiceType">
+        <xsd:sequence>
+            <xsd:element name="Memberships" minOccurs="0">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element name="Membership" type="msnab:Membership" minOccurs="0" maxOccurs="unbounded"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="Info" type="msnab:InfoType"/>
+            <xsd:element name="Changes" type="xsd:string"/>
+            <xsd:element name="LastChange" type="xsd:dateTime" default="0001-01-01T00:00:00"/>
+            <xsd:element name="Deleted" type="xsd:boolean" default="false"/>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:complexType name="Membership">
+        <xsd:sequence>
+            <xsd:element name="MemberRole" type="xsd:string"/>
+            <xsd:element name="Members">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element name="Member" type="msnab:BaseMember" minOccurs="0" maxOccurs="unbounded"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="MembershipIsComplete" type="xsd:boolean" minOccurs="0"/>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:complexType name="BaseMember">
+        <xsd:sequence>
+            <xsd:element name="MembershipId" type="xsd:positiveInteger" minOccurs="0"/>
+            <xsd:element name="Type" type="xsd:string"/>
+            <xsd:element name="Location" minOccurs="0">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element name="Id" type="msnab:Guid"/>
+                        <xsd:element name="IsPassportNameHidden" type="xsd:boolean"/>
+                        <xsd:element name="CID" type="xsd:long"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="DisplayName" type="xsd:string" minOccurs="0"/>
+            <xsd:element name="State" type="msnab:MemberState"/>
+            <xsd:element name="Annotations" minOccurs="0">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element name="Annotation" type="msnab:Annotation" minOccurs="0" maxOccurs="unbounded"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="Deleted" type="xsd:boolean" default="false" minOccurs="0"/>
+            <xsd:element name="LastChanged" type="xsd:dateTime" minOccurs="0"/>
+            <xsd:element name="JoinedDate" type="xsd:dateTime" minOccurs="0"/>
+            <xsd:element name="ExpirationDate" type="xsd:dateTime" minOccurs="0"/>
+            <xsd:element name="Changes" type="xsd:string" minOccurs="0"/>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:complexType name="CircleMember" mixed="false">
+        <xsd:complexContent mixed="false">
+            <xsd:extension base="msnab:BaseMember">
+                <xsd:sequence>
+                    <xsd:element name="CircleId" type="msnab:Guid"/>
+                </xsd:sequence>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+    <xsd:complexType name="PassportMember" mixed="false">
+        <xsd:complexContent mixed="false">
+            <xsd:extension base="msnab:BaseMember">
+                <xsd:sequence>
+                    <xsd:element name="PassportName" type="xsd:string"/>
+                    <xsd:element name="IsPassportNameHidden" type="xsd:boolean" minOccurs="0"/>
+                    <xsd:element name="PassportId" type="xsd:int" minOccurs="0"/>
+                    <xsd:element name="CID" type="xsd:long" minOccurs="0"/>
+                    <xsd:element name="PassportChanges" type="xsd:string" minOccurs="0"/>
+                </xsd:sequence>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+    <xsd:complexType name="EmailMember" mixed="false">
+        <xsd:complexContent mixed="false">
+            <xsd:extension base="msnab:BaseMember">
+                <xsd:sequence>
+                    <xsd:element name="Email" type="xsd:string"/>
+                </xsd:sequence>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+    <xsd:complexType name="PhoneMember" mixed="false">
+        <xsd:complexContent mixed="false">
+            <xsd:extension base="msnab:BaseMember">
+                <xsd:sequence>
+                    <xsd:element name="PhoneNumber" type="xsd:string"/>
+                </xsd:sequence>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+    <xsd:complexType name="RoleMember" mixed="false">
+        <xsd:complexContent mixed="false">
+            <xsd:extension base="msnab:BaseMember">
+                <xsd:sequence>
+                    <xsd:element name="Id" type="xsd:string"/>
+                    <xsd:element name="DefiningService">
+                        <xsd:complexType>
+                            <xsd:sequence>
+                                <xsd:element name="Id" type="xsd:integer"/>
+                                <xsd:element name="Type" type="xsd:string"/>
+                                <xsd:element name="ForeignId" type="xsd:string"/>
+                            </xsd:sequence>
+                        </xsd:complexType>
+                    </xsd:element>
+                    <xsd:element name="MaxRoleRecursionDepth" type="xsd:integer"/>
+                    <xsd:element name="MaxDegreesSeparation" type="xsd:integer"/>
+                </xsd:sequence>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+    <xsd:complexType name="ServiceMember" mixed="false">
+        <xsd:complexContent mixed="false">
+            <xsd:extension base="msnab:BaseMember">
+                <xsd:sequence>
+                    <xsd:element name="Service" type="msnab:HandleType"/>
+                </xsd:sequence>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+    <xsd:complexType name="DomainMember" mixed="false">
+        <xsd:complexContent mixed="false">
+            <xsd:extension base="msnab:BaseMember">
+                <xsd:sequence>
+                    <xsd:element name="DomainName" type="xsd:string"/>
+                </xsd:sequence>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+    <xsd:complexType name="EveryoneMember" mixed="false">
+        <xsd:complexContent mixed="false">
+            <xsd:extension base="msnab:BaseMember"/>
+        </xsd:complexContent>
+    </xsd:complexType>
+    <xsd:complexType name="GroupMember" mixed="false">
+        <xsd:complexContent mixed="false">
+            <xsd:extension base="msnab:BaseMember">
+                <xsd:sequence>
+                    <xsd:element name="Id" type="msnab:Guid"/>
+                </xsd:sequence>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+    <xsd:simpleType name="Guid">
+        <xsd:restriction base="xsd:string">
+            <xsd:pattern value="[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}"/>
+        </xsd:restriction>
+    </xsd:simpleType>
+    <xsd:element name="MemberType">
+        <xsd:simpleType>
+            <xsd:restriction base="xsd:string">
+                <xsd:enumeration value="Allow"/>
+            </xsd:restriction>
+        </xsd:simpleType>
+    </xsd:element>
+    <xsd:simpleType name="MemberState">
+        <xsd:restriction base="xsd:string">
+            <xsd:enumeration value="Accepted"/>
+            <xsd:enumeration value="Pending"/>
+        </xsd:restriction>
+    </xsd:simpleType>
+    <xsd:complexType name="Annotation">
+        <xsd:sequence>
+            <xsd:element name="Name" type="xsd:string"/>
+            <xsd:element name="Value" type="xsd:string" minOccurs="0"/>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:complexType name="ContactType">
+        <xsd:sequence>
+            <xsd:element name="contactId" type="msnab:Guid" minOccurs="0"/>
+            <xsd:element name="contactInfo" type="msnab:contactInfoType" minOccurs="0"/>
+            <xsd:element name="propertiesChanged" type="xsd:string" minOccurs="0">
+                <xsd:annotation>
+                    <xsd:documentation>
+            A space (ASCII #32) separated list of properties that
+            have changed as part of an update request. The property
+            names don't always match the name of the associated
+            element.
+          </xsd:documentation>
+                </xsd:annotation>
+            </xsd:element>
+            <xsd:element name="fDeleted" type="xsd:boolean" minOccurs="0"/>
+            <xsd:element name="lastChange" type="xsd:dateTime" minOccurs="0"/>
+            <xsd:element name="CreateDate" type="xsd:dateTime" minOccurs="0"/>
+            <xsd:element name="LastModifiedBy" type="xsd:integer" minOccurs="0"/>
+            <xsd:element name="CreatedBy" type="xsd:integer" minOccurs="0"/>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:complexType name="ContactIdType">
+        <xsd:sequence>
+            <xsd:element name="contactId" type="msnab:Guid" minOccurs="0"/>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:complexType name="contactInfoType">
+        <xsd:sequence>
+            <xsd:element name="emails" minOccurs="0">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element name="ContactEmail" type="msnab:contactEmailType" maxOccurs="unbounded"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="phones" minOccurs="0">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element name="ContactPhone" type="msnab:contactPhoneType" maxOccurs="unbounded"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="locations" minOccurs="0">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element name="ContactLocation" type="msnab:contactLocationType" maxOccurs="unbounded"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="webSites" minOccurs="0">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element name="ContactWebSite" type="msnab:contactWebSiteType" maxOccurs="unbounded"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="annotations" minOccurs="0">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element name="Annotation" type="msnab:Annotation" maxOccurs="unbounded"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="groupIds" minOccurs="0">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element name="guid" type="msnab:Guid" maxOccurs="unbounded"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="groupIdsDeleted" minOccurs="0">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element name="guid" type="msnab:Guid" maxOccurs="unbounded"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="contactType" type="xsd:string" minOccurs="0"/>
+            <xsd:element name="quickName" type="xsd:string" minOccurs="0"/>
+            <xsd:element name="firstName" type="xsd:string" minOccurs="0"/>
+            <xsd:element name="MiddleName" type="xsd:string" minOccurs="0"/>
+            <xsd:element name="lastName" type="xsd:string" minOccurs="0"/>
+            <xsd:element name="Suffix" type="xsd:string" minOccurs="0"/>
+            <xsd:element name="NameTitle" type="xsd:string" minOccurs="0"/>
+            <xsd:element name="passportName" type="xsd:string" minOccurs="0"/>
+            <xsd:element name="IsPassportNameHidden" type="xsd:boolean" minOccurs="0"/>
+            <xsd:element name="displayName" type="xsd:string" minOccurs="0"/>
+            <xsd:element name="puid" type="xsd:long" minOccurs="0"/>
+            <xsd:element name="CID" type="xsd:long" minOccurs="0"/>
+            <xsd:element name="BrandIdList" type="xsd:anyType" minOccurs="0"/>
+            <xsd:element name="comment" type="xsd:string" minOccurs="0"/>
+            <xsd:element name="IsNotMobileVisible" type="xsd:boolean" minOccurs="0"/>
+            <xsd:element name="isMobileIMEnabled" type="xsd:boolean" minOccurs="0"/>
+            <xsd:element name="isMessengerUser" type="xsd:boolean" minOccurs="0"/>
+            <xsd:element name="isFavorite" type="xsd:boolean" minOccurs="0"/>
+            <xsd:element name="isSmtp" type="xsd:boolean" minOccurs="0"/>
+            <xsd:element name="hasSpace" type="xsd:boolean" minOccurs="0">
+                <xsd:annotation>
+                    <xsd:documentation>
+            Indicates whether the contact has a Windows Live
+            Space or not.
+          </xsd:documentation>
+                </xsd:annotation>
+            </xsd:element>
+            <xsd:element name="spotWatchState" type="xsd:string" minOccurs="0"/>
+            <xsd:element name="birthdate" type="xsd:dateTime" minOccurs="0"/>
+            <xsd:element name="primaryEmailType" type="msnab:ContactEmailTypeType" minOccurs="0"/>
+            <xsd:element name="PrimaryLocation" type="msnab:ContactLocationTypeType" minOccurs="0"/>
+            <xsd:element name="PrimaryPhone" type="msnab:ContactPhoneTypeType" minOccurs="0"/>
+            <xsd:element name="IsPrivate" type="xsd:boolean" minOccurs="0"/>
+            <xsd:element name="Anniversary" type="xsd:string" minOccurs="0">
+                <xsd:annotation>
+                    <xsd:documentation>
+            Seen is YYYY/MM/DD format.
+          </xsd:documentation>
+                </xsd:annotation>
+            </xsd:element>
+            <xsd:element name="Gender" type="xsd:string" minOccurs="0"/>
+            <xsd:element name="TimeZone" type="xsd:string" minOccurs="0"/>
+            <xsd:element name="NetworkInfoList" minOccurs="0">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element name="NetworkInfo" type="msnab:NetworkInfoType" minOccurs="0" maxOccurs="unbounded"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="PublicDisplayName" type="xsd:string" minOccurs="0"/>
+            <xsd:element name="IsAutoUpdateDisabled" type="xsd:boolean" minOccurs="0"/>
+            <xsd:element name="MessengerMemberInfo" type="msnab:MessengerMemberInfo" minOccurs="0"/>
+            <xsd:element name="PropertiesChanged" type="xsd:anyType" minOccurs="0"/>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:complexType name="contactEmailType">
+        <xsd:sequence>
+            <xsd:element name="contactEmailType" type="msnab:ContactEmailTypeType"/>
+            <xsd:element name="email" type="xsd:string"/>
+            <xsd:element name="isMessengerEnabled" type="xsd:boolean"/>
+            <xsd:element name="Capability" type="xsd:integer"/>
+            <xsd:element name="MessengerEnabledExternally" type="xsd:boolean"/>
+            <xsd:element name="propertiesChanged" type="xsd:string"/>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:simpleType name="ContactEmailTypeType">
+        <xsd:restriction base="xsd:string">
+            <xsd:enumeration value="ContactEmailPersonal"/>
+            <xsd:enumeration value="ContactEmailBusiness"/>
+            <xsd:enumeration value="ContactEmailOther"/>
+            <xsd:enumeration value="ContactEmailMessenger"/>
+            <xsd:enumeration value="Messenger2"/>
+            <xsd:enumeration value="Messenger3"/>
+            <xsd:enumeration value="Messenger4"/>
+            <xsd:enumeration value="Passport"/>
+        </xsd:restriction>
+    </xsd:simpleType>
+    <xsd:complexType name="contactPhoneType">
+        <xsd:sequence>
+            <xsd:element name="contactPhoneType" type="msnab:ContactPhoneTypeType"/>
+            <xsd:element name="number" type="xsd:string"/>
+            <xsd:element name="isMessengerEnabled" type="xsd:boolean"/>
+            <xsd:element name="propertiesChanged" type="xsd:string"/>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:simpleType name="ContactPhoneTypeType">
+        <xsd:restriction base="xsd:string">
+            <xsd:enumeration value="ContactPhonePersonal"/>
+            <xsd:enumeration value="ContactPhoneBusiness"/>
+            <xsd:enumeration value="ContactPhoneMobile"/>
+            <xsd:enumeration value="ContactPhonePager"/>
+            <xsd:enumeration value="ContactPhoneOther"/>
+            <xsd:enumeration value="ContactPhoneFax"/>
+            <xsd:enumeration value="Personal2"/>
+            <xsd:enumeration value="Business2"/>
+            <xsd:enumeration value="BusinessFax"/>
+            <xsd:enumeration value="BusinessMobile"/>
+        </xsd:restriction>
+    </xsd:simpleType>
+    <xsd:complexType name="contactLocationType">
+        <xsd:sequence>
+            <xsd:element name="contactLocationType" type="msnab:ContactLocationTypeType"/>
+            <xsd:element name="name" type="xsd:string" minOccurs="0"/>
+            <xsd:element name="street" type="xsd:string"/>
+            <xsd:element name="city" type="xsd:string"/>
+            <xsd:element name="state" type="xsd:string"/>
+            <xsd:element name="country" type="xsd:string"/>
+            <xsd:element name="postalCode" type="xsd:string"/>
+            <xsd:element name="Department" type="xsd:string" minOccurs="0"/>
+            <xsd:element name="Changes" type="xsd:string"/>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:simpleType name="ContactLocationTypeType">
+        <xsd:restriction base="xsd:string">
+            <xsd:enumeration value="ContactLocationPersonal"/>
+            <xsd:enumeration value="ContactLocationBusiness"/>
+        </xsd:restriction>
+    </xsd:simpleType>
+    <xsd:complexType name="contactWebSiteType">
+        <xsd:sequence>
+            <xsd:element name="contactWebSiteType" type="msnab:ContactWebSiteTypeType"/>
+            <xsd:element name="webURL" type="xsd:string"/>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:simpleType name="ContactWebSiteTypeType">
+        <xsd:restriction base="xsd:string">
+            <xsd:enumeration value="ContactWebSitePersonal"/>
+            <xsd:enumeration value="ContactWebSiteBusiness"/>
+        </xsd:restriction>
+    </xsd:simpleType>
+    <xsd:complexType name="GroupType">
+        <xsd:sequence>
+            <xsd:element name="groupId" type="msnab:Guid"/>
+            <xsd:element name="groupInfo" type="msnab:groupInfoType"/>
+            <xsd:element name="propertiesChanged" type="xsd:string">
+                <xsd:annotation>
+                    <xsd:documentation>
+            A space (ASCII #32) separated list of properties that
+            have changed as part of an update request. The property
+            names don't always match the name of the associated
+            element.
+          </xsd:documentation>
+                </xsd:annotation>
+            </xsd:element>
+            <xsd:element name="fDeleted" type="xsd:boolean" minOccurs="0"/>
+            <xsd:element name="lastChange" type="xsd:dateTime" minOccurs="0"/>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:complexType name="groupInfoType">
+        <xsd:sequence>
+            <xsd:element name="annotations" minOccurs="0">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element name="Annotation" type="msnab:Annotation" minOccurs="0" maxOccurs="unbounded"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="groupType" type="msnab:Guid" default="C8529CE2-6EAD-434d-881F-341E17DB3FF8" minOccurs="0"/>
+            <xsd:element name="name" type="xsd:string" minOccurs="0"/>
+            <xsd:element name="IsNotMobileVisible" type="xsd:boolean" minOccurs="0"/>
+            <xsd:element name="IsPrivate" type="xsd:boolean" minOccurs="0"/>
+            <xsd:element name="IsFavorite" type="xsd:boolean" minOccurs="0"/>
+            <xsd:element name="fMessenger" type="xsd:boolean" minOccurs="0"/>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:complexType name="groupFilterType">
+        <xsd:sequence>
+            <xsd:element name="groupIds">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element name="guid" type="msnab:Guid" minOccurs="0" maxOccurs="unbounded"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:element name="InvalidPassportUser">
+        <xsd:complexType>
+            <xsd:sequence>
+                <xsd:element name="errorcode" type="xsd:string"/>
+                <xsd:element name="errorstring" type="xsd:string"/>
+                <xsd:element name="additionalDetails">
+                    <xsd:complexType>
+                        <xsd:sequence>
+                            <xsd:element name="originalExceptionErrorMessage" type="xsd:string"/>
+                        </xsd:sequence>
+                    </xsd:complexType>
+                </xsd:element>
+            </xsd:sequence>
+        </xsd:complexType>
+    </xsd:element>
+    <xsd:complexType name="MessengerMemberInfo">
+        <xsd:sequence>
+            <xsd:element name="PendingAnnotations" minOccurs="0">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element name="Annotation" type="msnab:Annotation" maxOccurs="unbounded"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="DisplayName" type="xsd:string" minOccurs="0"/>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:complexType name="InfoType">
+        <xsd:sequence>
+            <xsd:element name="Handle" type="msnab:HandleType"/>
+            <xsd:element name="DisplayName" type="xsd:string" minOccurs="0"/>
+            <xsd:element name="InverseRequired" type="xsd:boolean" default="false"/>
+            <xsd:element name="AuthorizationCriteria" type="xsd:string" minOccurs="0"/>
+            <xsd:element name="RSSUrl" type="xsd:anyURI" minOccurs="0"/>
+            <xsd:element name="IsBot" type="xsd:boolean" default="false"/>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:complexType name="NotificationDataType">
+        <xsd:sequence>
+            <xsd:element name="StoreService" type="msnab:ServiceType"/>
+            <xsd:element name="Status" type="xsd:string"/>
+            <xsd:element name="LastChanged" type="xsd:dateTime"/>
+            <xsd:element name="Gleam" type="xsd:boolean" default="false"/>
+            <xsd:element name="InstanceId" type="xsd:string" default="0"/>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:complexType name="BaseDynamicItemType">
+        <xsd:sequence>
+            <xsd:element name="Type" type="xsd:string"/>
+            <xsd:element name="Deleted" type="xsd:boolean" minOccurs="0"/>
+            <xsd:element name="LastChanged" type="xsd:dateTime" minOccurs="0"/>
+            <xsd:element name="Notifications" minOccurs="0">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element name="NotificationData" type="msnab:NotificationDataType" maxOccurs="unbounded"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="Changes" type="xsd:string"/>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:complexType name="CircleDynamicItem" mixed="false">
+        <xsd:complexContent mixed="false">
+            <xsd:extension base="msnab:BaseDynamicItemType">
+                <xsd:sequence>
+                    <xsd:element name="Id" type="xsd:string"/>
+                </xsd:sequence>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+    <xsd:complexType name="PassportDynamicItem" block="" mixed="false">
+        <xsd:complexContent mixed="false">
+            <xsd:extension base="msnab:BaseDynamicItemType">
+                <xsd:sequence>
+                    <xsd:element name="CID" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="PassportName" type="xsd:string"/>
+                    <xsd:element name="PassportId" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="SpaceStatus" type="xsd:string"/>
+                    <xsd:element name="SpaceLastChanged" type="xsd:dateTime" minOccurs="0"/>
+                    <xsd:element name="SpaceLastViewed" type="xsd:dateTime" minOccurs="0"/>
+                    <xsd:element name="SpaceGleam" type="xsd:boolean" minOccurs="0"/>
+                    <xsd:element name="ProfileLastChanged" type="xsd:dateTime" minOccurs="0"/>
+                    <xsd:element name="ProfileLastView" type="xsd:dateTime" minOccurs="0"/>
+                    <xsd:element name="ProfileStatus" type="xsd:string"/>
+                    <xsd:element name="ProfileGleam" type="xsd:boolean" minOccurs="0"/>
+                    <xsd:element name="ContactProfileStatus" type="xsd:string"/>
+                    <xsd:element name="ContactProfileLastChanged" type="xsd:dateTime" minOccurs="0"/>
+                    <xsd:element name="ContactProfileLastViewed" type="xsd:dateTime" minOccurs="0"/>
+                    <xsd:element name="LiveContactLastChanged" type="xsd:dateTime" minOccurs="0"/>
+                </xsd:sequence>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+    <xsd:complexType name="abType">
+        <xsd:sequence>
+            <xsd:element name="abId" type="msnab:Guid"/>
+            <xsd:element name="abInfo" type="msnab:abInfoType"/>
+            <xsd:element name="lastChange" type="xsd:dateTime"/>
+            <xsd:element name="DynamicItemLastChanged" type="xsd:dateTime"/>
+            <xsd:element name="RecentActivityItemLastChanged" type="xsd:dateTime"/>
+            <xsd:element name="createDate" type="xsd:dateTime"/>
+            <xsd:element name="propertiesChanged" type="xsd:anyType"/>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:complexType name="CircleResultType">
+        <xsd:sequence>
+            <xsd:element name="Circles" minOccurs="0">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element name="CircleInverseInfo" type="msnab:CircleInverseInfoType" maxOccurs="unbounded"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="CircleTicket" type="xsd:string"/>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:complexType name="NetworkInfoType">
+        <xsd:sequence>
+            <xsd:element name="DomainId" type="xsd:int" minOccurs="0"/>
+            <xsd:element name="DomainTag" type="xsd:string" minOccurs="0"/>
+            <xsd:element name="UserTileURL" type="xsd:string" minOccurs="0"/>
+            <xsd:element name="ProfileURL" type="xsd:string" minOccurs="0"/>
+            <xsd:element name="DisplayName" type="xsd:string" minOccurs="0"/>
+            <xsd:element name="RelationshipType" type="xsd:int" minOccurs="0"/>
+            <xsd:element name="RelationshipState" type="xsd:int" minOccurs="0"/>
+            <xsd:element name="RelationshipStateDate" type="xsd:string" minOccurs="0"/>
+            <xsd:element name="RelationshipRole" type="xsd:int" minOccurs="0"/>
+            <xsd:element name="NDRCount" type="xsd:int" minOccurs="0"/>
+            <xsd:element name="InviterCID" type="xsd:long" minOccurs="0"/>
+            <xsd:element name="CreateDate" type="xsd:dateTime" minOccurs="0"/>
+            <xsd:element name="LastChanged" type="xsd:dateTime" minOccurs="0"/>
+            <xsd:element name="PropertiesChanged" type="xsd:anyType" minOccurs="0"/>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:complexType name="ContactFilterType">
+        <xsd:sequence>
+            <xsd:element name="IncludeHiddenContacts" type="xsd:boolean"/>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:complexType name="filterOptionsType">
+        <xsd:sequence>
+            <xsd:element name="DeltasOnly" type="xsd:boolean"/>
+            <xsd:element name="LastChanged" type="xsd:dateTime" minOccurs="0"/>
+            <xsd:element name="ContactFilter" type="msnab:ContactFilterType"/>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:complexType name="entityHandle">
+        <xsd:sequence>
+            <xsd:element name="Cid" type="xsd:long"/>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:complexType name="NotationType">
+        <xsd:sequence>
+            <xsd:element name="Name" type="xsd:string"/>
+            <xsd:element name="Value" type="xsd:string"/>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:complexType name="ListTemplateVariableItemType">
+        <xsd:sequence>
+            <xsd:element name="Values">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element name="Value" type="msnab:SimpleTemplateVariableBaseType" maxOccurs="unbounded"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:complexType name="TemplateVariableBaseType">
+        <xsd:sequence>
+            <xsd:element name="Name" type="xsd:string"/>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:complexType name="SimpleTemplateVariableBaseType">
+        <xsd:complexContent>
+            <xsd:extension base="msnab:TemplateVariableBaseType">
+                <xsd:sequence>
+                    <xsd:element name="Value" type="xsd:string"/>
+                </xsd:sequence>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+    <xsd:complexType name="PublisherIdTemplateVariable">
+        <xsd:complexContent>
+            <xsd:extension base="msnab:TemplateVariableBaseType">
+                <xsd:sequence>
+                    <xsd:element name="Id" type="xsd:string"/>
+                    <xsd:element name="NameHint" type="xsd:string" minOccurs="0"/>
+                </xsd:sequence>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+    <xsd:complexType name="TargetIdTemplateVariable">
+        <xsd:complexContent>
+            <xsd:extension base="msnab:PublisherIdTemplateVariable">
+                <xsd:sequence>
+                    <xsd:element name="IdOwner" type="xsd:string"/>
+                </xsd:sequence>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+    <xsd:complexType name="TextTemplateVariable">
+        <xsd:complexContent>
+            <xsd:extension base="msnab:SimpleTemplateVariableBaseType"/>
+        </xsd:complexContent>
+    </xsd:complexType>
+    <xsd:complexType name="HlinkTemplateVariable">
+        <xsd:complexContent>
+            <xsd:extension base="msnab:SimpleTemplateVariableBaseType">
+                <xsd:sequence>
+                    <xsd:element name="Text" type="xsd:string"/>
+                    <xsd:element name="Notations">
+                        <xsd:complexType>
+                            <xsd:sequence>
+                                <xsd:element name="Notation" type="msnab:NotationType" maxOccurs="unbounded"/>
+                            </xsd:sequence>
+                        </xsd:complexType>
+                    </xsd:element>
+                </xsd:sequence>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+    <xsd:complexType name="ListTemplateVariable">
+        <xsd:complexContent>
+            <xsd:extension base="msnab:TemplateVariableBaseType">
+                <xsd:sequence>
+                    <xsd:element name="Items">
+                        <xsd:complexType>
+                            <xsd:sequence>
+                                <xsd:element name="ListTemplateVariableItem" type="msnab:ListTemplateVariableItemType" maxOccurs="unbounded"/>
+                            </xsd:sequence>
+                        </xsd:complexType>
+                    </xsd:element>
+                </xsd:sequence>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+    <xsd:complexType name="ImageTemplateVariable">
+        <xsd:complexContent>
+            <xsd:extension base="msnab:SimpleTemplateVariableBaseType">
+                <xsd:sequence>
+                    <xsd:element name="Href" type="xsd:anyURI"/>
+                    <xsd:element name="Notations">
+                        <xsd:complexType>
+                            <xsd:sequence>
+                                <xsd:element name="Notation" type="msnab:NotationType" maxOccurs="unbounded"/>
+                            </xsd:sequence>
+                        </xsd:complexType>
+                    </xsd:element>
+                </xsd:sequence>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+    <xsd:complexType name="ActivityDetailsType">
+        <xsd:sequence>
+            <xsd:element name="OwnerCID" type="xsd:string"/>
+            <xsd:element name="ObjectId" type="xsd:string"/>
+            <xsd:element name="ApplicationId" type="xsd:string"/>
+            <xsd:element name="ChangeType" type="xsd:string"/>
+            <xsd:element name="PublishDate" type="xsd:dateTime"/>
+            <xsd:element name="TemplateVariables">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element name="TemplateVariable" type="msnab:TemplateVariableBaseType" maxOccurs="unbounded"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:complexType name="RecentActivityTemplateType">
+        <xsd:sequence>
+            <xsd:element name="Cardinality" type="xsd:string"/>
+            <xsd:element name="Data" type="xsd:string"/>
+            <xsd:element name="Title" type="xsd:string"/>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:complexType name="RequestedLocalesType">
+        <xsd:sequence>
+            <xsd:element name="string" type="xsd:string" maxOccurs="unbounded"/>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:complexType name="RecentActivityTemplateContainerType">
+        <xsd:sequence>
+            <xsd:element name="ApplicationId" type="xsd:string"/>
+            <xsd:element name="ApplicationName" type="xsd:string"/>
+            <xsd:element name="ChangeType" type="xsd:integer"/>
+            <xsd:element name="Locale" type="xsd:string"/>
+            <xsd:element name="RequestedLocales" type="msnab:RequestedLocalesType"/>
+            <xsd:element name="TemplateRevision" type="xsd:integer"/>
+            <xsd:element name="Templates">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element name="RecentActivityTemplate" type="msnab:RecentActivityTemplateType" maxOccurs="unbounded"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="CollapseCondition" type="msnab:CollapseConditionType" minOccurs="0"/>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:complexType name="CollapseConditionType">
+        <xsd:sequence>
+            <xsd:element name="string" type="xsd:string" maxOccurs="unbounded"/>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:complexType name="CirclePersonalMembershipType">
+        <xsd:sequence>
+            <xsd:element name="Role" type="xsd:string"/>
+            <xsd:element name="State" type="xsd:string"/>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:complexType name="abHandleType">
+        <xsd:sequence>
+            <xsd:element name="ABId" type="xsd:string"/>
+            <xsd:element name="Puid" type="xsd:long"/>
+            <xsd:element name="Cid" type="xsd:long"/>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:complexType name="contactHandleType">
+        <xsd:sequence>
+            <xsd:element name="Email" type="xsd:string"/>
+            <xsd:element name="Puid" type="xsd:long"/>
+            <xsd:element name="Cid" type="xsd:long"/>
+            <xsd:element name="CircleId" type="xsd:string"/>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:complexType name="MembershipInfoType">
+        <xsd:sequence>
+            <xsd:element name="CirclePersonalMembership" type="msnab:CirclePersonalMembershipType"/>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:complexType name="PersonalInfoType">
+        <xsd:sequence>
+            <xsd:element name="MembershipInfo" type="msnab:MembershipInfoType"/>
+            <xsd:element name="Name" type="xsd:string"/>
+            <xsd:element name="IsNotMobileVisible" type="xsd:boolean"/>
+            <xsd:element name="IsFavorite" type="xsd:boolean"/>
+            <xsd:element name="IsFamily" type="xsd:boolean"/>
+            <xsd:element name="Changes" type="xsd:anyType"/>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:complexType name="ContentInfoType">
+        <xsd:sequence>
+            <xsd:element name="Domain" type="xsd:int"/>
+            <xsd:element name="HostedDomain" type="xsd:string"/>
+            <xsd:element name="Type" type="xsd:int"/>
+            <xsd:element name="MembershipAccess" type="xsd:int"/>
+            <xsd:element name="IsPresenceEnabled" type="xsd:boolean"/>
+            <xsd:element name="RequestMembershipOption" type="xsd:int"/>
+            <xsd:element name="DisplayName" type="xsd:string"/>
+            <xsd:element name="ProfileLastUpdated" type="xsd:dateTime" minOccurs="0"/>
+            <xsd:element name="Changes" type="xsd:anyType" minOccurs="0"/>
+            <xsd:element name="CreateDate" type="xsd:dateTime" minOccurs="0"/>
+            <xsd:element name="LastChanged" type="xsd:dateTime" minOccurs="0"/>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:complexType name="ContentHandleType">
+        <xsd:sequence>
+            <xsd:element name="Id" type="xsd:string"/>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:complexType name="ContentType">
+        <xsd:sequence>
+            <xsd:element name="Handle" type="msnab:ContentHandleType"/>
+            <xsd:element name="Info" type="msnab:ContentInfoType"/>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:complexType name="CircleInverseInfoType">
+        <xsd:sequence>
+            <xsd:element name="Content" type="msnab:ContentType"/>
+            <xsd:element name="PersonalInfo" type="msnab:PersonalInfoType"/>
+            <xsd:element name="Deleted" type="xsd:boolean"/>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:complexType name="callerInfoType">
+        <xsd:sequence>
+            <xsd:element name="PublicDisplayName" type="xsd:string"/>
+        </xsd:sequence>
+    </xsd:complexType>
+</xsd:schema>
diff --git a/plugins/Msn/extlib/phpmsnclass/soap/msnab_servicetypes.xsd b/plugins/Msn/extlib/phpmsnclass/soap/msnab_servicetypes.xsd
new file mode 100644
index 0000000000..3fa9798b62
--- /dev/null
+++ b/plugins/Msn/extlib/phpmsnclass/soap/msnab_servicetypes.xsd
@@ -0,0 +1,567 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- edited with XMLSpy v2008 sp1 (http://www.altova.com) by wp (freezingsoft) -->
+<xsd:schema xmlns:msnab="http://www.msn.com/webservices/AddressBook" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.msn.com/webservices/AddressBook" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0">
+    <xsd:include schemaLocation="msnab_datatypes.xsd"/>
+    <xsd:element name="ABApplicationHeader">
+        <xsd:complexType>
+            <xsd:sequence>
+                <xsd:element name="ApplicationId" type="msnab:Guid" fixed="09607671-1C32-421F-A6A6-CBFAA51AB5F4"/>
+                <xsd:element name="IsMigration" type="xsd:boolean" default="false"/>
+                <xsd:element name="PartnerScenario" type="xsd:string" default="Initial"/>
+                <xsd:element name="CacheKey" type="xsd:token" minOccurs="0"/>
+                <xsd:element name="BrandId" type="xsd:string" minOccurs="0"/>
+            </xsd:sequence>
+        </xsd:complexType>
+    </xsd:element>
+    <xsd:element name="ABAuthHeader">
+        <xsd:complexType>
+            <xsd:sequence>
+                <xsd:element name="ManagedGroupRequest" type="xsd:boolean" default="false"/>
+                <xsd:element name="TicketToken" type="xsd:string"/>
+            </xsd:sequence>
+        </xsd:complexType>
+    </xsd:element>
+    <xsd:element name="ServiceHeader">
+        <xsd:complexType>
+            <xsd:sequence>
+                <xsd:element name="Version" type="xsd:token"/>
+                <xsd:element name="CacheKey" type="xsd:token" minOccurs="0"/>
+                <xsd:element name="CacheKeyChanged" type="xsd:boolean" minOccurs="0"/>
+                <xsd:element name="PreferredHostName" type="xsd:string" minOccurs="0"/>
+                <xsd:element name="SessionId" type="msnab:Guid" minOccurs="0"/>
+            </xsd:sequence>
+        </xsd:complexType>
+    </xsd:element>
+    <xsd:element name="FindMembership" type="msnab:FindMembershipRequestType"/>
+    <xsd:complexType name="FindMembershipRequestType">
+        <xsd:sequence>
+            <xsd:element name="serviceFilter">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element name="Types">
+                            <xsd:complexType>
+                                <xsd:sequence>
+                                    <xsd:element name="ServiceType" type="xsd:string" maxOccurs="unbounded"/>
+                                </xsd:sequence>
+                            </xsd:complexType>
+                        </xsd:element>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="View" type="xsd:string" minOccurs="0"/>
+            <xsd:element name="deltasOnly" type="xsd:boolean" default="false" minOccurs="0"/>
+            <xsd:element name="lastChange" type="xsd:dateTime" default="0001-01-01T00:00:00.0000000-08:00" minOccurs="0"/>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:complexType name="FindMembershipResultType">
+        <xsd:sequence>
+            <xsd:element name="Services">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element name="Service" type="msnab:ServiceType" minOccurs="0" maxOccurs="unbounded"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="OwnerNamespace">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element name="Info">
+                            <xsd:complexType>
+                                <xsd:sequence>
+                                    <xsd:element name="Handle">
+                                        <xsd:complexType>
+                                            <xsd:sequence>
+                                                <xsd:element name="Id" type="xsd:string"/>
+                                                <xsd:element name="IsPassportNameHidden" type="xsd:boolean"/>
+                                                <xsd:element name="CID" type="xsd:integer"/>
+                                            </xsd:sequence>
+                                        </xsd:complexType>
+                                    </xsd:element>
+                                    <xsd:element name="CreatorPuid" type="xsd:integer"/>
+                                    <xsd:element name="CreatorCID" type="xsd:integer"/>
+                                    <xsd:element name="CreatorPassportName" type="xsd:string"/>
+                                    <xsd:element name="CircleAttributes">
+                                        <xsd:complexType>
+                                            <xsd:sequence>
+                                                <xsd:element name="IsPresenceEnabled" type="xsd:boolean"/>
+                                                <xsd:element name="IsEvent" type="xsd:boolean" minOccurs="0"/>
+                                                <xsd:element name="Domain" type="xsd:string"/>
+                                            </xsd:sequence>
+                                        </xsd:complexType>
+                                    </xsd:element>
+                                    <xsd:element name="MessengerApplicationServiceCreated" type="xsd:boolean" minOccurs="0"/>
+                                </xsd:sequence>
+                            </xsd:complexType>
+                        </xsd:element>
+                        <xsd:element name="Changes" type="xsd:string"/>
+                        <xsd:element name="CreateDate" type="xsd:dateTime"/>
+                        <xsd:element name="LastChange" type="xsd:dateTime"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:element name="FindMembershipResponse">
+        <xsd:complexType>
+            <xsd:sequence>
+                <xsd:element name="FindMembershipResult" type="msnab:FindMembershipResultType"/>
+            </xsd:sequence>
+        </xsd:complexType>
+    </xsd:element>
+    <xsd:element name="ABFindAll" type="msnab:ABFindAllRequestType"/>
+    <xsd:complexType name="ABFindAllRequestType">
+        <xsd:sequence>
+            <xsd:element name="abId" type="msnab:Guid" fixed="00000000-0000-0000-0000-000000000000"/>
+            <xsd:element name="abView" type="xsd:string" minOccurs="0"/>
+            <xsd:element name="deltasOnly" type="xsd:boolean" default="false" minOccurs="0"/>
+            <xsd:element name="lastChange" type="xsd:dateTime" default="0001-01-01T00:00:00.0000000-08:00" minOccurs="0"/>
+            <xsd:element name="dynamicItemView" type="xsd:string" fixed="Gleam" minOccurs="0"/>
+            <xsd:element name="dynamicItemLastChange" type="xsd:dateTime" default="0001-01-01T00:00:00.0000000-08:00" minOccurs="0"/>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:complexType name="ABFindAllResultType">
+        <xsd:sequence>
+            <xsd:element name="groups" minOccurs="0">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element name="Group" type="msnab:GroupType" maxOccurs="unbounded"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="contacts">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element name="Contact" type="msnab:ContactType" minOccurs="0" maxOccurs="unbounded"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="DynamicItems" minOccurs="0">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element name="DynamicItem" type="msnab:BaseDynamicItemType" minOccurs="0" maxOccurs="unbounded"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="CircleResult">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element name="CircleTicket" type="xsd:string"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="ab">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element name="abId" type="msnab:Guid"/>
+                        <xsd:element name="abInfo" type="msnab:abInfoType"/>
+                        <xsd:element name="lastChange" type="xsd:dateTime"/>
+                        <xsd:element name="DynamicItemLastChanged" type="xsd:dateTime"/>
+                        <xsd:element name="RecentActivityItemLastChanged" type="xsd:dateTime"/>
+                        <xsd:element name="createDate" type="xsd:dateTime"/>
+                        <xsd:element name="propertiesChanged" type="xsd:string"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:element name="ABFindAllResponse">
+        <xsd:complexType>
+            <xsd:sequence>
+                <xsd:element name="ABFindAllResult" type="msnab:ABFindAllResultType"/>
+            </xsd:sequence>
+        </xsd:complexType>
+    </xsd:element>
+    <xsd:element name="ABContactAdd" type="msnab:ABContactAddRequestType"/>
+    <xsd:complexType name="ABContactAddRequestType">
+        <xsd:sequence>
+            <xsd:element name="abId" type="msnab:Guid" fixed="00000000-0000-0000-0000-000000000000"/>
+            <xsd:element name="contacts">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element name="Contact" type="msnab:ContactType" minOccurs="0" maxOccurs="unbounded"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="options" minOccurs="0">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element name="EnableAllowListManagement" type="xsd:boolean"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:complexType name="ABContactAddResultType">
+        <xsd:sequence>
+            <xsd:element name="guid" type="msnab:Guid"/>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:element name="ABContactAddResponse">
+        <xsd:complexType>
+            <xsd:sequence>
+                <xsd:element name="ABContactAddResult" type="msnab:ABContactAddResultType" minOccurs="0"/>
+            </xsd:sequence>
+        </xsd:complexType>
+    </xsd:element>
+    <xsd:element name="ABContactDelete" type="msnab:ABContactDeleteRequestType"/>
+    <xsd:complexType name="ABContactDeleteRequestType">
+        <xsd:sequence>
+            <xsd:element name="abId" type="msnab:Guid" fixed="00000000-0000-0000-0000-000000000000"/>
+            <xsd:element name="contacts">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element name="Contact" type="msnab:ContactIdType" minOccurs="0" maxOccurs="unbounded"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:element name="ABContactDeleteResponse"/>
+    <xsd:element name="ABGroupContactAdd" type="msnab:ABGroupContactAddRequestType"/>
+    <xsd:complexType name="ABGroupContactAddRequestType">
+        <xsd:sequence>
+            <xsd:element name="abId" type="msnab:Guid" fixed="00000000-0000-0000-0000-000000000000"/>
+            <xsd:element name="groupFilter" type="msnab:groupFilterType"/>
+            <xsd:element name="contacts">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element name="Contact" type="msnab:ContactType" minOccurs="0" maxOccurs="unbounded"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="groupContactAddOptions" minOccurs="0">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element name="fGenerateMissingQuickName" type="xsd:boolean" minOccurs="0"/>
+                        <xsd:element name="EnableAllowListManagement" type="xsd:boolean" minOccurs="0"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:complexType name="ABGroupContactAddResultType">
+        <xsd:sequence>
+            <xsd:element name="guid" type="msnab:Guid"/>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:element name="ABGroupContactAddResponse">
+        <xsd:complexType>
+            <xsd:sequence>
+                <xsd:element name="ABGroupContactAddResult" type="msnab:ABGroupContactAddResultType" minOccurs="0"/>
+            </xsd:sequence>
+        </xsd:complexType>
+    </xsd:element>
+    <xsd:element name="ABGroupAdd" type="msnab:ABGroupAddRequestType"/>
+    <xsd:complexType name="ABGroupAddRequestType">
+        <xsd:sequence>
+            <xsd:element name="abId" type="msnab:Guid" fixed="00000000-0000-0000-0000-000000000000"/>
+            <xsd:element name="groupAddOptions">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element name="fRenameOnMsgrConflict" type="xsd:boolean" minOccurs="0"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="groupInfo">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element name="GroupInfo" type="msnab:groupInfoType"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:complexType name="ABGroupAddResultType">
+        <xsd:sequence>
+            <xsd:element name="guid" type="msnab:Guid"/>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:element name="ABGroupAddResponse">
+        <xsd:complexType>
+            <xsd:sequence>
+                <xsd:element name="ABGroupAddResult" type="msnab:ABGroupAddResultType" minOccurs="0"/>
+            </xsd:sequence>
+        </xsd:complexType>
+    </xsd:element>
+    <xsd:element name="ABGroupUpdate" type="msnab:ABGroupUpdateRequestType"/>
+    <xsd:complexType name="ABGroupUpdateRequestType">
+        <xsd:sequence>
+            <xsd:element name="abId" type="msnab:Guid" fixed="00000000-0000-0000-0000-000000000000"/>
+            <xsd:element name="groups">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element name="Group" type="msnab:GroupType" minOccurs="0" maxOccurs="unbounded"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:element name="ABGroupUpdateResponse">
+        <xsd:complexType/>
+    </xsd:element>
+    <xsd:element name="ABGroupDelete" type="msnab:ABGroupDeleteRequestType"/>
+    <xsd:complexType name="ABGroupDeleteRequestType">
+        <xsd:sequence>
+            <xsd:element name="abId" type="msnab:Guid" fixed="00000000-0000-0000-0000-000000000000"/>
+            <xsd:element name="groupFilter" type="msnab:groupFilterType"/>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:element name="ABGroupDeleteResponse">
+        <xsd:complexType/>
+    </xsd:element>
+    <xsd:element name="ABContactUpdate" type="msnab:ABContactUpdateRequestType"/>
+    <xsd:complexType name="ABContactUpdateRequestType">
+        <xsd:sequence>
+            <xsd:element name="abId" type="msnab:Guid" fixed="00000000-0000-0000-0000-000000000000"/>
+            <xsd:element name="contacts">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element name="Contact" type="msnab:ContactType" minOccurs="0" maxOccurs="unbounded"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:element name="ABContactUpdateResponse">
+        <xsd:complexType/>
+    </xsd:element>
+    <xsd:element name="ABGroupContactDelete" type="msnab:ABGroupContactDeleteRequestType"/>
+    <xsd:complexType name="ABGroupContactDeleteRequestType">
+        <xsd:sequence>
+            <xsd:element name="abId" type="msnab:Guid" fixed="00000000-0000-0000-0000-000000000000"/>
+            <xsd:element name="contacts">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element name="Contact" type="msnab:ContactType" minOccurs="0" maxOccurs="unbounded"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="groupFilter" type="msnab:groupFilterType"/>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:element name="ABGroupContactDeleteResponse">
+        <xsd:complexType/>
+    </xsd:element>
+    <xsd:element name="AddMember" type="msnab:AddMemberRequestType"/>
+    <xsd:complexType name="AddMemberRequestType">
+        <xsd:sequence>
+            <xsd:element name="serviceHandle" type="msnab:HandleType"/>
+            <xsd:element name="memberships">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element name="Membership" type="msnab:Membership" minOccurs="0" maxOccurs="unbounded"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:element name="AddMemberResponse">
+        <xsd:complexType/>
+    </xsd:element>
+    <xsd:element name="DeleteMember" type="msnab:DeleteMemberRequestType"/>
+    <xsd:complexType name="DeleteMemberRequestType">
+        <xsd:sequence>
+            <xsd:element name="serviceHandle" type="msnab:HandleType"/>
+            <xsd:element name="memberships">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element name="Membership" type="msnab:Membership" minOccurs="0" maxOccurs="unbounded"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="nsHandle" type="msnab:ContentHandleType" minOccurs="0"/>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:element name="DeleteMemberResponse">
+        <xsd:complexType/>
+    </xsd:element>
+    <xsd:complexType name="ABAddResponseType">
+        <xsd:sequence>
+            <xsd:element name="ABAddResult" type="xsd:string"/>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:element name="ABAddResponse" type="msnab:ABAddResponseType"/>
+    <xsd:element name="ABAdd" type="msnab:ABAddRequestType"/>
+    <xsd:complexType name="ABAddRequestType">
+        <xsd:sequence>
+            <xsd:element name="abInfo" type="msnab:abInfoType"/>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:complexType name="UpdateDynamicItemRequestType">
+        <xsd:sequence>
+            <xsd:element name="abId" type="xsd:string"/>
+            <xsd:element name="dynamicItems">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element name="DynamicItem" type="msnab:BaseDynamicItemType" maxOccurs="unbounded"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:element name="UpdateDynamicItem" type="msnab:UpdateDynamicItemRequestType"/>
+    <xsd:element name="UpdateDynamicItemResponse"/>
+    <xsd:element name="ABFindContactsPaged" type="msnab:ABFindContactsPagedRequestType"/>
+    <xsd:complexType name="ABFindContactsPagedRequestType">
+        <xsd:sequence>
+            <xsd:element name="filterOptions" type="msnab:filterOptionsType"/>
+            <xsd:element name="abView" type="xsd:string"/>
+            <xsd:element name="extendedContent" type="xsd:string"/>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:complexType name="ABFindContactsPagedResultType">
+        <xsd:sequence>
+            <xsd:element name="Groups" minOccurs="0">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element name="Group" type="msnab:GroupType" maxOccurs="unbounded"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="Contacts">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element name="Contact" type="msnab:ContactType" minOccurs="0" maxOccurs="unbounded"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="CircleResult" type="msnab:CircleResultType"/>
+            <xsd:element name="Ab">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element name="abId" type="msnab:Guid"/>
+                        <xsd:element name="abInfo" type="msnab:abInfoType"/>
+                        <xsd:element name="lastChange" type="xsd:dateTime"/>
+                        <xsd:element name="DynamicItemLastChanged" type="xsd:dateTime"/>
+                        <xsd:element name="RecentActivityItemLastChanged" type="xsd:dateTime"/>
+                        <xsd:element name="createDate" type="xsd:dateTime"/>
+                        <xsd:element name="propertiesChanged" type="xsd:string"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:element name="ABFindContactsPagedResponse">
+        <xsd:complexType>
+            <xsd:sequence>
+                <xsd:element name="ABFindContactsPagedResult" type="msnab:ABFindContactsPagedResultType"/>
+            </xsd:sequence>
+        </xsd:complexType>
+    </xsd:element>
+    <xsd:element name="WNApplicationHeader">
+        <xsd:complexType>
+            <xsd:sequence>
+                <xsd:element name="ApplicationId" type="msnab:Guid"/>
+            </xsd:sequence>
+        </xsd:complexType>
+    </xsd:element>
+    <xsd:element name="WNAuthHeader">
+        <xsd:complexType>
+            <xsd:sequence>
+                <xsd:element name="TicketToken" type="xsd:string"/>
+            </xsd:sequence>
+        </xsd:complexType>
+    </xsd:element>
+    <xsd:element name="WNServiceHeader">
+        <xsd:complexType>
+            <xsd:sequence>
+                <xsd:element name="Version" type="xsd:token"/>
+                <xsd:element name="CacheKey" type="xsd:token" minOccurs="0"/>
+                <xsd:element name="CacheKeyChanged" type="xsd:boolean" minOccurs="0"/>
+                <xsd:element name="PreferredHostName" type="xsd:string" minOccurs="0"/>
+            </xsd:sequence>
+        </xsd:complexType>
+    </xsd:element>
+    <xsd:element name="GetContactsRecentActivity" type="msnab:GetContactsRecentActivityRequestType"/>
+    <xsd:complexType name="GetContactsRecentActivityRequestType">
+        <xsd:sequence>
+            <xsd:element name="entityHandle" type="msnab:entityHandle"/>
+            <xsd:element name="locales">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element name="string" type="xsd:string" maxOccurs="unbounded"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="count" type="xsd:int"/>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:element name="GetContactsRecentActivityResponse">
+        <xsd:complexType>
+            <xsd:sequence>
+                <xsd:element name="GetContactsRecentActivityResult" type="msnab:GetContactsRecentActivityResultType"/>
+            </xsd:sequence>
+        </xsd:complexType>
+    </xsd:element>
+    <xsd:complexType name="GetContactsRecentActivityResultType">
+        <xsd:sequence>
+            <xsd:element name="Activities">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element name="ActivityDetails" type="msnab:ActivityDetailsType" maxOccurs="unbounded"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="Templates">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element name="RecentActivityTemplateContainer" type="msnab:RecentActivityTemplateContainerType" maxOccurs="unbounded"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="FeedUrl" type="xsd:anyURI"/>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:element name="ManageWLConnection" type="msnab:ManageWLConnectionRequestType"/>
+    <xsd:complexType name="ManageWLConnectionRequestType">
+        <xsd:sequence>
+            <xsd:element name="abHandle" type="msnab:abHandleType"/>
+            <xsd:element name="contactId" type="xsd:string"/>
+            <xsd:element name="connection" type="xsd:boolean"/>
+            <xsd:element name="presence" type="xsd:boolean"/>
+            <xsd:element name="action" type="xsd:integer"/>
+            <xsd:element name="relationshipType" type="xsd:int"/>
+            <xsd:element name="relationshipRole" type="xsd:int"/>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:element name="ManageWLConnectionResponse">
+        <xsd:complexType>
+            <xsd:sequence>
+                <xsd:element name="ManageWLConnectionResult" type="msnab:ContactType"/>
+            </xsd:sequence>
+        </xsd:complexType>
+    </xsd:element>
+    <xsd:element name="CreateContact" type="msnab:CreateContactType"/>
+    <xsd:complexType name="CreateContactType">
+        <xsd:sequence>
+            <xsd:element name="abHandle" type="msnab:abHandleType"/>
+            <xsd:element name="contactHandle" type="msnab:contactHandleType"/>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:element name="CreateContactResponse">
+        <xsd:complexType>
+            <xsd:sequence>
+                <xsd:element name="CreateContactResult" type="msnab:ContactType"/>
+            </xsd:sequence>
+        </xsd:complexType>
+    </xsd:element>
+    <xsd:element name="CreateCircle" type="msnab:CreateCircleRequestType"/>
+    <xsd:complexType name="CreateCircleRequestType">
+        <xsd:sequence>
+            <xsd:element name="properties" type="msnab:ContentInfoType"/>
+            <xsd:element name="callerInfo" type="msnab:callerInfoType"/>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:complexType name="CreateCircleResponseType">
+        <xsd:sequence>
+            <xsd:element name="Id" type="msnab:Guid"/>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:element name="CreateCircleResponse">
+        <xsd:complexType>
+            <xsd:sequence>
+                <xsd:element name="CreateCircleResult" type="msnab:CreateCircleResponseType"/>
+            </xsd:sequence>
+        </xsd:complexType>
+    </xsd:element>
+</xsd:schema>
diff --git a/plugins/Msn/extlib/phpmsnclass/soap/msnab_sharingservice.wsdl b/plugins/Msn/extlib/phpmsnclass/soap/msnab_sharingservice.wsdl
new file mode 100644
index 0000000000..7ec87f90c9
--- /dev/null
+++ b/plugins/Msn/extlib/phpmsnclass/soap/msnab_sharingservice.wsdl
@@ -0,0 +1,532 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- edited with XMLSpy v2008 sp1 (http://www.altova.com) by wp (freezingsoft) -->
+<definitions xmlns:msnab="http://www.msn.com/webservices/AddressBook" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:ns="http://www.w3.org/2001/XMLSchema" xmlns:ns1="http://schemas.xmlsoap.org/soap/encoding/" xmlns="http://schemas.xmlsoap.org/wsdl/" targetNamespace="http://www.msn.com/webservices/AddressBook">
+    <types>
+        <ns:schema xmlns="http://www.w3.org/2001/XMLSchema">
+            <ns:import schemaLocation="msnab_servicetypes.xsd" namespace="http://www.msn.com/webservices/AddressBook"/>
+        </ns:schema>
+    </types>
+    <message name="ABHeader">
+        <part name="ApplicationHeader" element="msnab:ABApplicationHeader"/>
+        <part name="AuthHeader" element="msnab:ABAuthHeader"/>
+    </message>
+    <message name="FindMembershipMessage">
+        <part name="FindMembershipRequest" element="msnab:FindMembership"/>
+    </message>
+    <message name="ABFindAllMessage">
+        <part name="ABFindAllRequest" element="msnab:ABFindAll"/>
+    </message>
+    <message name="ABContactAddMessage">
+        <part name="ABContactAddRequest" element="msnab:ABContactAdd"/>
+    </message>
+    <message name="ABContactDeleteMessage">
+        <part name="ABContactDeleteRequest" element="msnab:ABContactDelete"/>
+    </message>
+    <message name="ABGroupContactAddMessage">
+        <part name="ABGroupContactAddRequest" element="msnab:ABGroupContactAdd"/>
+    </message>
+    <message name="ABGroupAddMessage">
+        <part name="ABGroupAddRequest" element="msnab:ABGroupAdd"/>
+    </message>
+    <message name="ABGroupUpdateMessage">
+        <part name="ABGroupUpdateRequest" element="msnab:ABGroupUpdate"/>
+    </message>
+    <message name="ABGroupDeleteMessage">
+        <part name="ABGroupDeleteRequest" element="msnab:ABGroupDelete"/>
+    </message>
+    <message name="ABGroupContactDeleteMessage">
+        <part name="ABGroupContactDeleteRequest" element="msnab:ABGroupContactDelete"/>
+    </message>
+    <message name="ABContactUpdateMessage">
+        <part name="ABContactUpdateRequest" element="msnab:ABContactUpdate"/>
+    </message>
+    <message name="AddMemberMessage">
+        <part name="AddMemberRequest" element="msnab:AddMember"/>
+    </message>
+    <message name="DeleteMemberMessage">
+        <part name="DeleteMemberRequest" element="msnab:DeleteMember"/>
+    </message>
+    <message name="ServiceHeader">
+        <part name="ServiceHeader" element="msnab:ServiceHeader"/>
+    </message>
+    <message name="FindMembershipResponseMessage">
+        <part name="FindMembershipResponse" element="msnab:FindMembershipResponse"/>
+    </message>
+    <message name="ABFindAllResponseMessage">
+        <part name="ABFindAllResponse" element="msnab:ABFindAllResponse"/>
+    </message>
+    <message name="ABContactAddResponseMessage">
+        <part name="ABContactAddResponse" element="msnab:ABContactAddResponse"/>
+    </message>
+    <message name="ABContactDeleteResponseMessage">
+        <part name="ABContactDeleteResponse" element="msnab:ABContactDeleteResponse"/>
+    </message>
+    <message name="ABGroupContactAddResponseMessage">
+        <part name="ABGroupContactAddResponse" element="msnab:ABGroupContactAddResponse"/>
+    </message>
+    <message name="ABGroupAddResponseMessage">
+        <part name="ABGroupAddResponse" element="msnab:ABGroupAddResponse"/>
+    </message>
+    <message name="ABGroupUpdateResponseMessage">
+        <part name="ABGroupUpdateResponse" element="msnab:ABGroupUpdateResponse"/>
+    </message>
+    <message name="ABGroupDeleteResponseMessage">
+        <part name="ABGroupDeleteResponse" element="msnab:ABGroupDeleteResponse"/>
+    </message>
+    <message name="ABGroupContactDeleteResponseMessage">
+        <part name="ABGroupContactDeleteResponse" element="msnab:ABGroupContactDeleteResponse"/>
+    </message>
+    <message name="ABContactUpdateResponseMessage">
+        <part name="ABContactUpdateResponse" element="msnab:ABContactUpdateResponse"/>
+    </message>
+    <message name="AddMemberResponseMessage">
+        <part name="AddMemberResponse" element="msnab:AddMemberResponse"/>
+    </message>
+    <message name="DeleteMemberResponseMessage">
+        <part name="DeleteMemberResponse" element="msnab:DeleteMemberResponse"/>
+    </message>
+    <message name="InvalidPassportUserMessage">
+        <part name="fault" element="msnab:InvalidPassportUser"/>
+    </message>
+    <message name="ABAddMessage">
+        <part name="ABAddRequest" element="msnab:ABAdd"/>
+    </message>
+    <message name="ABAddResponseMessage">
+        <part name="ABAddResponse" element="msnab:ABAddResponse"/>
+    </message>
+    <message name="UpdateDynamicItemMessage">
+        <part name="UpdateDynamicItem" element="msnab:UpdateDynamicItem"/>
+    </message>
+    <message name="UpdateDynamicItemResponseMessage">
+        <part name="UpdateDynamicItemResponse" element="msnab:UpdateDynamicItemResponse"/>
+    </message>
+    <message name="ABFindContactsPagedMessage">
+        <part name="ABFindContactsPagedRequest" element="msnab:ABFindContactsPaged"/>
+    </message>
+    <message name="ABFindContactsPagedResponseMessage">
+        <part name="ABFindContactsPagedResponse" element="msnab:ABFindContactsPagedResponse"/>
+    </message>
+    <message name="GetContactsRecentActivityMessage">
+        <part name="GetContactsRecentActivityRequest" element="msnab:GetContactsRecentActivity"/>
+    </message>
+    <message name="GetContactsRecentActivityResponseMessage">
+        <part name="GetContactsRecentActivityResponse" element="msnab:GetContactsRecentActivityResponse"/>
+    </message>
+    <message name="WNHeader">
+        <part name="WNApplicationHeader" element="msnab:WNApplicationHeader"/>
+        <part name="WNAuthHeader" element="msnab:WNAuthHeader"/>
+        <part name="WNServiceHeader" element="msnab:WNServiceHeader"/>
+    </message>
+    <message name="CreateCircleMessage">
+        <part name="CreateCircleRequest" element="msnab:CreateCircle"/>
+    </message>
+    <message name="CreateCircleResponseMessage">
+        <part name="CreateCircleResponse" element="msnab:CreateCircleResponse"/>
+    </message>
+    <message name="CreateContactMessage">
+        <part name="CreateContactRequest" element="msnab:CreateContact"/>
+    </message>
+    <message name="CreateContactResponseMessage">
+        <part name="CreateContactResponse" element="msnab:CreateContactResponse"/>
+    </message>
+    <message name="ManageWLConnectionMessage">
+        <part name="ManageWLConnection" element="msnab:ManageWLConnection"/>
+    </message>
+    <message name="ManageWLConnectionResponseMessage">
+        <part name="ManageWLConnectionResponse" element="msnab:ManageWLConnectionResponse"/>
+    </message>
+    <portType name="SharingServicePortType">
+        <operation name="FindMembership">
+            <input message="msnab:FindMembershipMessage"/>
+            <output message="msnab:FindMembershipResponseMessage"/>
+        </operation>
+        <operation name="AddMember">
+            <input message="msnab:AddMemberMessage"/>
+            <output message="msnab:AddMemberResponseMessage"/>
+        </operation>
+        <operation name="DeleteMember">
+            <input message="msnab:DeleteMemberMessage"/>
+            <output message="msnab:DeleteMemberResponseMessage"/>
+        </operation>
+        <operation name="CreateCircle">
+            <input message="msnab:CreateCircleMessage"/>
+            <output message="msnab:CreateCircleResponseMessage"/>
+        </operation>
+    </portType>
+    <portType name="ABServicePortType">
+        <operation name="ABFindAll">
+            <input message="msnab:ABFindAllMessage"/>
+            <output message="msnab:ABFindAllResponseMessage"/>
+        </operation>
+        <operation name="ABContactAdd">
+            <input message="msnab:ABContactAddMessage"/>
+            <output message="msnab:ABContactAddResponseMessage"/>
+            <fault name="InvalidPassportUserException" message="msnab:InvalidPassportUserMessage"/>
+        </operation>
+        <operation name="ABContactDelete">
+            <input message="msnab:ABContactDeleteMessage"/>
+            <output message="msnab:ABContactDeleteResponseMessage"/>
+            <fault name="InvalidPassportUserException" message="msnab:InvalidPassportUserMessage"/>
+        </operation>
+        <operation name="ABGroupContactAdd">
+            <input message="msnab:ABGroupContactAddMessage"/>
+            <output message="msnab:ABGroupContactAddResponseMessage"/>
+            <fault name="InvalidPassportUserException" message="msnab:InvalidPassportUserMessage"/>
+        </operation>
+        <operation name="ABGroupAdd">
+            <input message="msnab:ABGroupAddMessage"/>
+            <output message="msnab:ABGroupAddResponseMessage"/>
+        </operation>
+        <operation name="ABGroupUpdate">
+            <input message="msnab:ABGroupUpdateMessage"/>
+            <output message="msnab:ABGroupUpdateResponseMessage"/>
+        </operation>
+        <operation name="ABGroupDelete">
+            <input message="msnab:ABGroupDeleteMessage"/>
+            <output message="msnab:ABGroupDeleteResponseMessage"/>
+        </operation>
+        <operation name="ABGroupContactDelete">
+            <input message="msnab:ABGroupContactDeleteMessage"/>
+            <output message="msnab:ABGroupContactDeleteResponseMessage"/>
+        </operation>
+        <operation name="ABContactUpdate">
+            <input message="msnab:ABContactUpdateMessage"/>
+            <output message="msnab:ABContactUpdateResponseMessage"/>
+        </operation>
+        <operation name="ABAdd">
+            <input message="msnab:ABAddMessage"/>
+            <output message="msnab:ABAddResponseMessage"/>
+        </operation>
+        <operation name="UpdateDynamicItem">
+            <input message="msnab:UpdateDynamicItemMessage"/>
+            <output message="msnab:UpdateDynamicItemResponseMessage"/>
+        </operation>
+        <operation name="ABFindContactsPaged">
+            <input message="msnab:ABFindContactsPagedMessage"/>
+            <output message="msnab:ABFindContactsPagedResponseMessage"/>
+        </operation>
+        <operation name="CreateContact">
+            <input message="msnab:CreateContactMessage"/>
+            <output message="msnab:CreateContactResponseMessage"/>
+        </operation>
+        <operation name="ManageWLConnection">
+            <input message="msnab:ManageWLConnectionMessage"/>
+            <output message="msnab:ManageWLConnectionResponseMessage"/>
+        </operation>
+    </portType>
+    <portType name="WhatsUpServicePortType">
+        <operation name="GetContactsRecentActivity">
+            <input message="msnab:GetContactsRecentActivityMessage"/>
+            <output message="msnab:GetContactsRecentActivityResponseMessage"/>
+        </operation>
+    </portType>
+    <binding name="SharingServiceBinding" type="msnab:SharingServicePortType">
+        <soap:binding transport="http://schemas.xmlsoap.org/soap/http"/>
+        <operation name="FindMembership">
+            <soap:operation soapAction="http://www.msn.com/webservices/AddressBook/FindMembership"/>
+            <input>
+                <soap:header message="msnab:ABHeader" part="ApplicationHeader" use="literal"/>
+                <soap:header message="msnab:ABHeader" part="AuthHeader" use="literal"/>
+                <soap:body use="literal"/>
+            </input>
+            <output>
+                <soap:header message="msnab:ServiceHeader" part="ServiceHeader" use="literal"/>
+                <soap:body use="literal"/>
+            </output>
+        </operation>
+        <operation name="AddMember">
+            <soap:operation soapAction="http://www.msn.com/webservices/AddressBook/AddMember"/>
+            <input>
+                <soap:header message="msnab:ABHeader" part="ApplicationHeader" use="literal"/>
+                <soap:header message="msnab:ABHeader" part="AuthHeader" use="literal"/>
+                <soap:body use="literal"/>
+            </input>
+            <output>
+                <soap:header message="msnab:ServiceHeader" part="ServiceHeader" use="literal"/>
+                <soap:body use="literal"/>
+            </output>
+        </operation>
+        <operation name="DeleteMember">
+            <soap:operation soapAction="http://www.msn.com/webservices/AddressBook/DeleteMember"/>
+            <input>
+                <soap:header message="msnab:ABHeader" part="ApplicationHeader" use="literal"/>
+                <soap:header message="msnab:ABHeader" part="AuthHeader" use="literal"/>
+                <soap:body use="literal"/>
+            </input>
+            <output>
+                <soap:header message="msnab:ServiceHeader" part="ServiceHeader" use="literal"/>
+                <soap:body use="literal"/>
+            </output>
+        </operation>
+        <operation name="CreateCircle">
+            <soap:operation soapAction="http://www.msn.com/webservices/AddressBook/CreateCircle"/>
+            <input>
+                <soap:body use="literal"/>
+                <soap:header message="msnab:ABHeader" part="ApplicationHeader" use="literal"/>
+                <soap:header message="msnab:ABHeader" part="AuthHeader" use="literal"/>
+            </input>
+            <output>
+                <soap:body use="literal"/>
+                <soap:header message="msnab:ServiceHeader" part="ServiceHeader" use="literal"/>
+            </output>
+        </operation>
+    </binding>
+    <binding name="ABServiceBinding" type="msnab:ABServicePortType">
+        <soap:binding transport="http://schemas.xmlsoap.org/soap/http"/>
+        <operation name="ABFindAll">
+            <soap:operation soapAction="http://www.msn.com/webservices/AddressBook/ABFindAll"/>
+            <input>
+                <soap:header message="msnab:ABHeader" part="ApplicationHeader" use="literal"/>
+                <soap:header message="msnab:ABHeader" part="AuthHeader" use="literal"/>
+                <soap:body use="literal"/>
+            </input>
+            <output>
+                <soap:header message="msnab:ServiceHeader" part="ServiceHeader" use="literal"/>
+                <soap:body use="literal"/>
+            </output>
+        </operation>
+        <operation name="ABContactAdd">
+            <soap:operation soapAction="http://www.msn.com/webservices/AddressBook/ABContactAdd"/>
+            <input>
+                <soap:header message="msnab:ABHeader" part="ApplicationHeader" use="literal"/>
+                <soap:header message="msnab:ABHeader" part="AuthHeader" use="literal"/>
+                <soap:body use="literal"/>
+            </input>
+            <output>
+                <soap:header message="msnab:ServiceHeader" part="ServiceHeader" use="literal"/>
+                <soap:body use="literal"/>
+            </output>
+            <fault name="InvalidPassportUserException">
+                <soap:fault name="InvalidPassportUserException" use="literal"/>
+            </fault>
+        </operation>
+        <operation name="ABContactDelete">
+            <soap:operation soapAction="http://www.msn.com/webservices/AddressBook/ABContactDelete"/>
+            <input>
+                <soap:header message="msnab:ABHeader" part="ApplicationHeader" use="literal"/>
+                <soap:header message="msnab:ABHeader" part="AuthHeader" use="literal"/>
+                <soap:body use="literal"/>
+            </input>
+            <output>
+                <soap:header message="msnab:ServiceHeader" part="ServiceHeader" use="literal"/>
+                <soap:body use="literal"/>
+            </output>
+            <fault name="InvalidPassportUserException">
+                <soap:fault name="InvalidPassportUserException" use="literal"/>
+            </fault>
+        </operation>
+        <operation name="ABGroupContactAdd">
+            <soap:operation soapAction="http://www.msn.com/webservices/AddressBook/ABGroupContactAdd"/>
+            <input>
+                <soap:header message="msnab:ABHeader" part="ApplicationHeader" use="literal"/>
+                <soap:header message="msnab:ABHeader" part="AuthHeader" use="literal"/>
+                <soap:body use="literal"/>
+            </input>
+            <output>
+                <soap:header message="msnab:ServiceHeader" part="ServiceHeader" use="literal"/>
+                <soap:body use="literal"/>
+            </output>
+            <fault name="InvalidPassportUserException">
+                <soap:fault name="InvalidPassportUserException" use="literal"/>
+            </fault>
+        </operation>
+        <operation name="ABGroupAdd">
+            <soap:operation soapAction="http://www.msn.com/webservices/AddressBook/ABGroupAdd"/>
+            <input>
+                <soap:header message="msnab:ABHeader" part="ApplicationHeader" use="literal"/>
+                <soap:header message="msnab:ABHeader" part="AuthHeader" use="literal"/>
+                <soap:body use="literal"/>
+            </input>
+            <output>
+                <soap:header message="msnab:ServiceHeader" part="ServiceHeader" use="literal"/>
+                <soap:body use="literal"/>
+            </output>
+        </operation>
+        <operation name="ABGroupUpdate">
+            <soap:operation soapAction="http://www.msn.com/webservices/AddressBook/ABGroupUpdate"/>
+            <input>
+                <soap:header message="msnab:ABHeader" part="ApplicationHeader" use="literal"/>
+                <soap:header message="msnab:ABHeader" part="AuthHeader" use="literal"/>
+                <soap:body use="literal"/>
+            </input>
+            <output>
+                <soap:header message="msnab:ServiceHeader" part="ServiceHeader" use="literal"/>
+                <soap:body use="literal"/>
+            </output>
+        </operation>
+        <operation name="ABGroupDelete">
+            <soap:operation soapAction="http://www.msn.com/webservices/AddressBook/ABGroupDelete"/>
+            <input>
+                <soap:header message="msnab:ABHeader" part="ApplicationHeader" use="literal"/>
+                <soap:header message="msnab:ABHeader" part="AuthHeader" use="literal"/>
+                <soap:body use="literal"/>
+            </input>
+            <output>
+                <soap:header message="msnab:ServiceHeader" part="ServiceHeader" use="literal"/>
+                <soap:body use="literal"/>
+            </output>
+        </operation>
+        <operation name="ABGroupContactDelete">
+            <soap:operation soapAction="http://www.msn.com/webservices/AddressBook/ABGroupContactDelete"/>
+            <input>
+                <soap:header message="msnab:ABHeader" part="ApplicationHeader" use="literal"/>
+                <soap:header message="msnab:ABHeader" part="AuthHeader" use="literal"/>
+                <soap:body use="literal"/>
+            </input>
+            <output>
+                <soap:header message="msnab:ServiceHeader" part="ServiceHeader" use="literal"/>
+                <soap:body use="literal"/>
+            </output>
+        </operation>
+        <operation name="ABContactUpdate">
+            <soap:operation soapAction="http://www.msn.com/webservices/AddressBook/ABContactUpdate"/>
+            <input>
+                <soap:header message="msnab:ABHeader" part="ApplicationHeader" use="literal"/>
+                <soap:header message="msnab:ABHeader" part="AuthHeader" use="literal"/>
+                <soap:body use="literal"/>
+            </input>
+            <output>
+                <soap:header message="msnab:ServiceHeader" part="ServiceHeader" use="literal"/>
+                <soap:body use="literal"/>
+            </output>
+        </operation>
+        <operation name="ABAdd">
+            <soap:operation soapAction="http://www.msn.com/webservices/AddressBook/ABAdd"/>
+            <input>
+                <soap:body use="literal"/>
+                <soap:header message="msnab:ABHeader" part="ApplicationHeader" use="literal"/>
+                <soap:header message="msnab:ABHeader" part="AuthHeader" use="literal"/>
+            </input>
+            <output>
+                <soap:body use="literal"/>
+                <soap:header message="msnab:ServiceHeader" part="ServiceHeader" use="literal"/>
+            </output>
+        </operation>
+        <operation name="UpdateDynamicItem">
+            <soap:operation soapAction="http://www.msn.com/webservices/AddressBook/UpdateDynamicItem"/>
+            <input>
+                <soap:body use="literal"/>
+                <soap:header message="msnab:ABHeader" part="ApplicationHeader" use="literal"/>
+                <soap:header message="msnab:ABHeader" part="AuthHeader" use="literal"/>
+            </input>
+            <output>
+                <soap:body use="literal"/>
+                <soap:header message="msnab:ServiceHeader" part="ServiceHeader" use="literal"/>
+            </output>
+        </operation>
+        <operation name="ABFindContactsPaged">
+            <soap:operation soapAction="http://www.msn.com/webservices/AddressBook/ABFindContactsPaged"/>
+            <input>
+                <soap:body use="literal"/>
+                <soap:header message="msnab:ABHeader" part="ApplicationHeader" use="literal"/>
+                <soap:header message="msnab:ABHeader" part="AuthHeader" use="literal"/>
+            </input>
+            <output>
+                <soap:body use="literal"/>
+                <soap:header message="msnab:ServiceHeader" part="ServiceHeader" use="literal"/>
+            </output>
+        </operation>
+        <operation name="CreateContact">
+            <soap:operation soapAction="http://www.msn.com/webservices/AddressBook/CreateContact"/>
+            <input>
+                <soap:body use="literal"/>
+                <soap:header message="msnab:ABHeader" part="ApplicationHeader" use="literal"/>
+                <soap:header message="msnab:ABHeader" part="AuthHeader" use="literal"/>
+            </input>
+            <output>
+                <soap:body use="literal"/>
+                <soap:header message="msnab:ServiceHeader" part="ServiceHeader" use="literal"/>
+            </output>
+        </operation>
+        <operation name="ManageWLConnection">
+            <soap:operation soapAction="http://www.msn.com/webservices/AddressBook/ManageWLConnection"/>
+            <input>
+                <soap:body use="literal"/>
+                <soap:header message="msnab:ABHeader" part="ApplicationHeader" use="literal"/>
+                <soap:header message="msnab:ABHeader" part="AuthHeader" use="literal"/>
+            </input>
+            <output>
+                <soap:body use="literal"/>
+                <soap:header message="msnab:ServiceHeader" part="ServiceHeader" use="literal"/>
+            </output>
+        </operation>
+    </binding>
+    <binding name="WhatsUpServiceBinding" type="msnab:WhatsUpServicePortType">
+        <soap:binding transport="http://schemas.xmlsoap.org/soap/http"/>
+        <operation name="GetContactsRecentActivity">
+            <soap:operation soapAction="http://www.msn.com/webservices/AddressBook/GetContactsRecentActivity"/>
+            <input>
+                <soap:body use="literal"/>
+                <soap:header message="msnab:WNHeader" part="WNApplicationHeader" use="literal"/>
+                <soap:header message="msnab:WNHeader" part="WNAuthHeader" use="literal"/>
+            </input>
+            <output>
+                <soap:body use="literal"/>
+                <soap:header message="msnab:WNHeader" part="WNServiceHeader" use="literal"/>
+            </output>
+        </operation>
+    </binding>
+    <service name="SharingService">
+        <port name="FindMembershipPort" binding="msnab:SharingServiceBinding">
+            <soap:address location="https://contacts.msn.com/abservice/SharingService.asmx"/>
+        </port>
+        <port name="AddMemberPort" binding="msnab:SharingServiceBinding">
+            <soap:address location="https://contacts.msn.com/abservice/SharingService.asmx"/>
+        </port>
+        <port name="DeleteMemberPort" binding="msnab:SharingServiceBinding">
+            <soap:address location="https://contacts.msn.com/abservice/SharingService.asmx"/>
+        </port>
+        <port name="CreateCirclePort" binding="msnab:SharingServiceBinding">
+            <soap:address location="https://contacts.msn.com/abservice/SharingService.asmx"/>
+        </port>
+    </service>
+    <service name="ABService">
+        <port name="ABFindAllPort" binding="msnab:ABServiceBinding">
+            <soap:address location="https://contacts.msn.com/abservice/abservice.asmx"/>
+        </port>
+        <port name="ABContactAddPort" binding="msnab:ABServiceBinding">
+            <soap:address location="https://contacts.msn.com/abservice/abservice.asmx"/>
+        </port>
+        <port name="ABContactDeletePort" binding="msnab:ABServiceBinding">
+            <soap:address location="https://contacts.msn.com/abservice/abservice.asmx"/>
+        </port>
+        <port name="ABGroupContactAddPort" binding="msnab:ABServiceBinding">
+            <soap:address location="https://contacts.msn.com/abservice/abservice.asmx"/>
+        </port>
+        <port name="ABGroupAddPort" binding="msnab:ABServiceBinding">
+            <soap:address location="https://contacts.msn.com/abservice/abservice.asmx"/>
+        </port>
+        <port name="ABGroupUpdatePort" binding="msnab:ABServiceBinding">
+            <soap:address location="https://contacts.msn.com/abservice/abservice.asmx"/>
+        </port>
+        <port name="ABGroupDeletePort" binding="msnab:ABServiceBinding">
+            <soap:address location="https://contacts.msn.com/abservice/abservice.asmx"/>
+        </port>
+        <port name="ABGroupContactDeletePort" binding="msnab:ABServiceBinding">
+            <soap:address location="https://contacts.msn.com/abservice/abservice.asmx"/>
+        </port>
+        <port name="ABContactUpdatePort" binding="msnab:ABServiceBinding">
+            <soap:address location="https://contacts.msn.com/abservice/abservice.asmx"/>
+        </port>
+        <port name="ABAddPort" binding="msnab:ABServiceBinding">
+            <soap:address location="https://contacts.msn.com/abservice/abservice.asmx"/>
+        </port>
+        <port name="UpdateDynamicItemPort" binding="msnab:ABServiceBinding">
+            <soap:address location="https://contacts.msn.com/abservice/abservice.asmx"/>
+        </port>
+        <port name="ABFindContactsPagedPort" binding="msnab:ABServiceBinding">
+            <soap:address location="https://contacts.msn.com/abservice/abservice.asmx"/>
+        </port>
+        <port name="CreateContactPort" binding="msnab:ABServiceBinding">
+            <soap:address location="https://contacts.msn.com/abservice/abservice.asmx"/>
+        </port>
+        <port name="ManageWLConnectionPort" binding="msnab:ABServiceBinding">
+            <soap:address location="https://contacts.msn.com/abservice/abservice.asmx"/>
+        </port>
+    </service>
+    <service name="WhatsUpService">
+        <port name="GetContactsRecentActivityPort" binding="msnab:WhatsUpServiceBinding">
+            <soap:address location="http://sup.live.com/whatsnew/whatsnewservice.asmx"/>
+        </port>
+    </service>
+</definitions>
diff --git a/plugins/Msn/msnmanager.php b/plugins/Msn/msnmanager.php
new file mode 100644
index 0000000000..72de11cb10
--- /dev/null
+++ b/plugins/Msn/msnmanager.php
@@ -0,0 +1,105 @@
+<?php
+/*
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2008, 2009, StatusNet, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
+
+/**
+ * AIM background connection manager for AIM-using queue handlers,
+ * allowing them to send outgoing messages on the right connection.
+ *
+ * Input is handled during socket select loop, keepalive pings during idle.
+ * Any incoming messages will be handled.
+ *
+ * In a multi-site queuedaemon.php run, one connection will be instantiated
+ * for each site being handled by the current process that has XMPP enabled.
+ */
+
+class MsnManager extends ImManager
+{
+
+    public $conn = null;
+    /**
+     * Initialize connection to server.
+     * @return boolean true on success
+     */
+    public function start($master)
+    {
+        if(parent::start($master))
+        {
+            $this->connect();
+            return true;
+        }else{
+            return false;
+        }
+    }
+
+    public function getSockets()
+    {
+        $this->connect();
+        if($this->conn){
+            return $this->conn->getSockets();
+        }else{
+            return array();
+        }
+    }
+
+    /**
+     * Process AIM events that have come in over the wire.
+     * @param resource $socket
+     */
+    public function handleInput($socket)
+    {
+        common_log(LOG_DEBUG, "Servicing the MSN queue.");
+        $this->stats('msn_process');
+        $this->conn->receive();
+    }
+
+    function connect()
+    {
+        if (!$this->conn) {
+            $this->conn=new MSN(array(
+                                      'user' => $this->plugin->user,
+                                      'password' => $this->plugin->password,
+                                      'alias' => $this->plugin->nickname,
+                                      'psm' => 'Send me a message to post a notice',
+                                      'debug' => true
+                                )
+                        );
+            $this->conn->registerHandler("IMIn", array($this, 'handle_msn_message'));
+            $this->conn->signon();
+        }
+        return $this->conn;
+    }
+
+    function handle_msn_message($data)
+    {
+        $this->plugin->enqueue_incoming_raw($data);
+        return true;
+    }
+
+    function send_raw_message($data)
+    {
+        $this->connect();
+        if (!$this->conn) {
+            return false;
+        }
+        $this->conn->sflapSend($data[0],$data[1],$data[2],$data[3]);
+        return true;
+    }
+}

From d97b5982144571b70cee4c833dfa8262ba13a2f1 Mon Sep 17 00:00:00 2001
From: Luke Fitzgerald <lw.fitzgerald@googlemail.com>
Date: Sat, 12 Jun 2010 17:34:25 +0100
Subject: [PATCH 042/655] Removed phpmsnclass sample

---
 plugins/Msn/extlib/phpmsnclass/sample.php | 40 -----------------------
 1 file changed, 40 deletions(-)
 delete mode 100644 plugins/Msn/extlib/phpmsnclass/sample.php

diff --git a/plugins/Msn/extlib/phpmsnclass/sample.php b/plugins/Msn/extlib/phpmsnclass/sample.php
deleted file mode 100644
index 32539c56c2..0000000000
--- a/plugins/Msn/extlib/phpmsnclass/sample.php
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/usr/bin/php -Cq
-<?php
-
-error_reporting(E_ALL);
-include_once('msn.class.php');
-
-// force to use MSNP9, without debug information
-// $msn = new MSN('MSNP9');
-
-// force to use MSNP9, with debug information
-// $msn = new MSN('MSNP9', true);
-
-// force to use MSNP15, without debug information
-// $msn = new MSN('MSNP15');
-
-// force to use MSNP15, with debug information
-// $msn = new MSN('MSNP15', true);
-
-// auto detect MSN protocol, without debug information
-// $msn = new MSN;
-
-// auto detect MSN protocol, with debug information
-$msn = new MSN(array('user' => 'statusnetbot@inflatablegoldfish.com', 'password' => 'statusnetplugin', 'alias' => 'statusnetbot', 'psm' => '', 'debug' => true));
-
-if ($msn->Run()) {
-    echo "Error for connect to MSN network\n";
-    echo "$msn->error\n";
-    exit;
-}
-
-//$msn->sendMessage('Now: '.strftime('%D %T')."\nTesting\nSecond Line\n\n\n\nand Empty Line",
- //                 array(
-  //                  'darkip@inflatablegoldfish.com'
-   //                    )
-    //             );
-echo "Done!\n";
-exit;
-
-?>
-

From 89808a86d53cbb6581b2c549e6015626ec1f0242 Mon Sep 17 00:00:00 2001
From: Luke Fitzgerald <lw.fitzgerald@googlemail.com>
Date: Sat, 12 Jun 2010 19:49:28 +0100
Subject: [PATCH 043/655] More work on adapting the phpmsnclass to work with
 the IM architecture (far from finished still)

---
 plugins/Msn/extlib/phpmsnclass/msn.class.php | 114 ++++++++++++++-----
 plugins/Msn/msnmanager.php                   |  38 ++++++-
 2 files changed, 122 insertions(+), 30 deletions(-)

diff --git a/plugins/Msn/extlib/phpmsnclass/msn.class.php b/plugins/Msn/extlib/phpmsnclass/msn.class.php
index 355d828eb5..c387bbeae9 100644
--- a/plugins/Msn/extlib/phpmsnclass/msn.class.php
+++ b/plugins/Msn/extlib/phpmsnclass/msn.class.php
@@ -3203,13 +3203,6 @@ X-OIM-Sequence-Num: 1
         $data = $this->ns_readln();
         /*if($data===false)
         {
-            //If No NS Message Process SendMessageFileQueue
-            if (time()-$this->LastPing > $this->ping_wait)
-            {
-                // NS: >>> PNG
-                $this->ns_writeln("PNG");
-                $this->LastPing = time();
-            }
             if(count($this->ChildProcess)<$this->MAXChildProcess)
             {
                 $Index=0;
@@ -3626,8 +3619,8 @@ X-OIM-Sequence-Num: 1
                 break;
             case 'QNG':
                 // NS: <<< QNG {time}
-                @list(/* QNG */, $this->ping_wait) = @explode(' ', $data);
-                if ($this->ping_wait == 0) $this->ping_wait = 50;
+                //@list(/* QNG */, $this->ping_wait) = @explode(' ', $data);
+                //if ($this->ping_wait == 0) $this->ping_wait = 50;
                 //if (is_int($use_ping) && $use_ping > 0) $ping_wait = $use_ping;
                 //Mod by Ricky Set Online
                 break;
@@ -3682,31 +3675,100 @@ X-OIM-Sequence-Num: 1
         }
     }
     
-    public function SendMessage($Message, $To) {
-        if(!is_array($To))
-            $To=array($To);
-        $Receiver='';
-        foreach($To as $Email)
+    public function sendMessageViaSB($message, $to) {
+        $socket = $this->switchBoardSessions[$to]['socket'];
+        $lastActive = $this->switchBoardSessions[$to]['lastActive'];
+        $joined = $this->switchBoardSessions[$to]['joined'];
+        
+        //TODO Probably not needed (we're not running in a loop anymore)
+        /*if($this->kill_me)
         {
-            list($name,$host,$network)=explode('@',$Email);
-            $network=$network==''?1:$network;
-            if($network==1 && isset($this->switchBoardSessions[$Email]) ) {
-                $this->debug_message("*** SendMessage to $Receiver use SB message queue.");
-                array_push($this->SwitchBoardMessageQueue,$Message);
-                continue;
-            }
-            $Receiver.="$name@$host@$network,";
+            $this->log_message("*** SB Okay, kill me now!");
+            endSBSession($socket);
+        }*/
+        
+        if(!$Joined) {
+            // If our participant has not joined the session yet we can't message them!
+            //TODO Check the behaviour of the queue runner when we return false
+            return false;
         }
-        if($Receiver=='') return;
-        $Receiver=substr($Receiver,0,-1);
-        $this->debug_message("*** SendMessage to $Receiver use File queue.");
-        file_put_contents($FileName,"TO: $Receiver\n$Message\n");
+        
+        $aMessage = $this->getMessage($Message);
+        //CheckEmotion...
+        $MsnObjDefine=$this->GetMsnObjDefine($aMessage);
+        if($MsnObjDefine !== '')
+        {
+            $SendString="MIME-Version: 1.0\r\nContent-Type: text/x-mms-emoticon\r\n\r\n$MsnObjDefine";
+            $len = strlen($SendString);
+            $this->SB_writeln("MSG $id N $len");
+            $id++;
+            $this->SB_writedata($SendString);
+            $this->id++;
+        }
+        $len = strlen($aMessage);
+        $this->SB_writeln("MSG $id N $len");
+        
+        // Increment the trID
+        $this->switchBoardSessions[$to]['id']++;
+        
+        $this->SB_writedata($aMessage);
+        
+        if (feof($this->SBFp))
+        {
+            // lost connection? error? try OIM later
+            @fclose($this->SBFp);
+            //TODO introduce callback to add offline message to queue?
+            return false;
+        }
+        $this->SB_writeln("OUT");
+        @fclose($this->SBFp);
+        return true;
+    }
+    
+    //TODO Not sure if this is needed?
+    private function endSBSession($socket) {
+        if (feof($this->SBFp))
+        {
+            // lost connection? error? try OIM later
+            @fclose($this->SBFp);
+            return false;
+        }
+        $this->SB_writeln("OUT");
+        @fclose($this->SBFp);
+        return true;
+    }
+    
+    public function sendMessage($message, $to) {
+        if($message != '') {
+            list($name,$host,$network)=explode('@',$to);
+            $network=$network==''?1:$network;
+            
+            if($network === 1 && isset($this->switchBoardSessions[$to])) {
+                $recipient = $name . $host;
+                $this->debug_message("*** Sending Message to $recipient using existing SB session");
+                $this->sendMessageViaSB($message, $recipient);
+            } else {
+                $this->debug_message("*** Not MSN network or no existing SB session");
+                
+            }
+        }
+    }
+    
+    /**
+     * Sends a ping command
+     * 
+     * Should be called about every 50 seconds
+     */
+    public function send_ping() {
+        // NS: >>> PNG
+        $this->ns_writeln("PNG");
     }
     
     public function getNSSocket() {
         return $this->NSfp;
     }
     
+    // TODO Allow for multiple SB session sockets
     public function getSBSocket() {
         return $this->SBfp;
     }
diff --git a/plugins/Msn/msnmanager.php b/plugins/Msn/msnmanager.php
index 72de11cb10..aae6906d6c 100644
--- a/plugins/Msn/msnmanager.php
+++ b/plugins/Msn/msnmanager.php
@@ -32,8 +32,12 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 class MsnManager extends ImManager
 {
-
     public $conn = null;
+    
+    protected $lastping = null;
+    
+    const PING_INTERVAL = 50;
+    
     /**
      * Initialize connection to server.
      * @return boolean true on success
@@ -58,9 +62,21 @@ class MsnManager extends ImManager
             return array();
         }
     }
-
+    
     /**
-     * Process AIM events that have come in over the wire.
+     * Idle processing for io manager's execution loop.
+     * Send keepalive pings to server.
+     */
+    public function idle($timeout=0)
+    {
+        $now = time();
+        if (empty($this->lastping) || $now - $this->lastping > self::PING_INTERVAL) {
+            $this->send_ping();
+        }
+    }
+    
+    /**
+     * Process MSN events that have come in over the wire.
      * @param resource $socket
      */
     public function handleInput($socket)
@@ -83,10 +99,24 @@ class MsnManager extends ImManager
                         );
             $this->conn->registerHandler("IMIn", array($this, 'handle_msn_message'));
             $this->conn->signon();
+            $this->lastping = time();
         }
         return $this->conn;
     }
-
+    
+    function send_ping() {
+        $this->connect();
+        if (!$this->conn) {
+            return false;
+        }
+        
+        $now = time();
+        
+        $this->conn->send_ping();
+        $this->lastping = $now;
+        return true;
+    }
+    
     function handle_msn_message($data)
     {
         $this->plugin->enqueue_incoming_raw($data);

From 52cfc0866c4dd54f8628d47c56abd105e1f79d18 Mon Sep 17 00:00:00 2001
From: Luke Fitzgerald <lw.fitzgerald@googlemail.com>
Date: Sat, 12 Jun 2010 21:19:08 +0100
Subject: [PATCH 044/655] Merged in changes to phpmsnclass

---
 plugins/Msn/extlib/phpmsnclass/msn.class.php | 986 +++++++++----------
 1 file changed, 443 insertions(+), 543 deletions(-)

diff --git a/plugins/Msn/extlib/phpmsnclass/msn.class.php b/plugins/Msn/extlib/phpmsnclass/msn.class.php
index c387bbeae9..030cc5dc04 100644
--- a/plugins/Msn/extlib/phpmsnclass/msn.class.php
+++ b/plugins/Msn/extlib/phpmsnclass/msn.class.php
@@ -60,6 +60,7 @@ class MSN {
     private $ABAuthHeader;
     private $ABService;
     private $Contacts;
+    private $IgnoreList;
 
     public $server = 'messenger.hotmail.com';
     public $port = 1863;
@@ -107,18 +108,6 @@ class MSN {
     // for YIM: 518 bytes
     public $max_msn_message_len = 1664;
     public $max_yahoo_message_len = 518;
-    
-    // Begin added for StatusNet
-    
-    private $aContactList = array();
-    private $switchBoardSessions = array();
-    
-    /** 
-     * Event Handler Functions
-     */
-    private $myEventHandlers = array();
-    
-    // End added for StatusNet
 
     private function Array2SoapVar($Array,$ReturnSoapVarObj=true,$TypeName=null,$TypeNameSpace=null)
     {
@@ -158,6 +147,15 @@ class MSN {
         $this->log_message("*** someone kill me ***");
         $this->kill_me=true;
     }
+    private function IsIgnoreMail($Email)
+    {        
+        if($this->IgnoreList==false) return false;
+        foreach($this->IgnoreList as $Pattern)
+        {
+            if(preg_match($Pattern,$Email)) return true;
+        }
+        return false;
+    }
     public function __construct ($Configs=array(), $timeout = 15, $client_id = 0x7000800C)
     {
         $this->user = $Configs['user'];
@@ -171,6 +169,7 @@ class MSN {
         $this->backup_file = isset($Configs['backup_file']) ? $Configs['backup_file'] : true;
         $this->update_pending = isset($Configs['update_pending']) ? $Configs['update_pending'] : true;
         $this->PhotoStickerFile=$Configs['PhotoSticker'];
+        $this->IgnoreList=isset($Configs['IgnoreList'])?$Configs['IgnoreList']:false;
         if($this->Emotions = isset($Configs['Emotions']) ? $Configs['Emotions']:false)
         {
             foreach($this->Emotions as $EmotionFilePath)
@@ -532,99 +531,6 @@ class MSN {
         }
         $this->UpdateContacts();
         return true;
-
-
-        $ABContactAdd=new SoapParam($this->Array2SoapVar($ABContactAddArray),'ABContactAdd');
-
-        // add contact for WLM
-        $ticket = htmlspecialchars($this->ticket['contact_ticket']);
-        $displayName = htmlspecialchars($display);
-        $user = $email;
-
-        $XML = '<?xml version="1.0" encoding="utf-8"?>
-<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/"
-               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-               xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-               xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/">
-<soap:Header>
-    <ABApplicationHeader xmlns="http://www.msn.com/webservices/AddressBook">
-        <ApplicationId>CFE80F9D-180F-4399-82AB-413F33A1FA11</ApplicationId>
-        <IsMigration>false</IsMigration>
-        <PartnerScenario>ContactSave</PartnerScenario>
-    </ABApplicationHeader>
-    <ABAuthHeader xmlns="http://www.msn.com/webservices/AddressBook">
-        <ManagedGroupRequest>false</ManagedGroupRequest>
-        <TicketToken>'.$ticket.'</TicketToken>
-    </ABAuthHeader>
-</soap:Header>
-<soap:Body>
-    <ABContactAdd xmlns="http://www.msn.com/webservices/AddressBook">
-        <abId>00000000-0000-0000-0000-000000000000</abId>
-        <contacts>
-            <Contact xmlns="http://www.msn.com/webservices/AddressBook">
-                <contactInfo>
-                    <contactType>LivePending</contactType>
-                    <passportName>'.$user.'</passportName>
-                    <isMessengerUser>true</isMessengerUser>
-                    <MessengerMemberInfo>
-                        <DisplayName>'.$displayName.'</DisplayName>
-                    </MessengerMemberInfo>
-                </contactInfo>
-            </Contact>
-        </contacts>
-        <options>
-            <EnableAllowListManagement>true</EnableAllowListManagement>
-        </options>
-    </ABContactAdd>
-</soap:Body>
-</soap:Envelope>';
-
-        $header_array = array(
-            'SOAPAction: '.$this->addcontact_soap,
-            'Content-Type: text/xml; charset=utf-8',
-            'User-Agent: MSN Explorer/9.0 (MSN 8.0; TmstmpExt)'
-            );
-
-            $this->debug_message("*** URL: $this->addcontact_url");
-            $this->debug_message("*** Sending SOAP:\n$XML");
-            $curl = curl_init();
-            curl_setopt($curl, CURLOPT_URL, $this->addcontact_url);
-            curl_setopt($curl, CURLOPT_HTTPHEADER, $header_array);
-            curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
-            curl_setopt($curl, CURLOPT_FOLLOWLOCATION, 1);
-            curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, 0);
-            if ($this->debug) curl_setopt($curl, CURLOPT_HEADER, 1);
-            curl_setopt($curl, CURLOPT_POST, 1);
-            curl_setopt($curl, CURLOPT_POSTFIELDS, $XML);
-            $data = curl_exec($curl);
-            $http_code = curl_getinfo($curl, CURLINFO_HTTP_CODE);
-            curl_close($curl);
-            $this->debug_message("*** Get Result:\n$data");
-
-            if ($http_code != 200) {
-                preg_match('#<faultcode>(.*)</faultcode><faultstring>(.*)</faultstring>#', $data, $matches);
-                if (count($matches) == 0) {
-                    $this->log_message("*** can't add contact (network: $network) $email");
-                    return false;
-                }
-                $faultcode = trim($matches[1]);
-                $faultstring = trim($matches[2]);
-                $this->log_message("*** can't add contact (network: $network) $email, error code: $faultcode, $faultstring");
-                return false;
-            }
-            $this->log_message("*** add contact (network: $network) $email");
-            if ($sendADL && !feof($this->NSfp)) {
-                @list($u_name, $u_domain) = @explode('@', $email);
-                foreach (array('1', '2') as $l) {
-                    $str = '<ml l="1"><d n="'.$u_domain.'"><c n="'.$u_name.'" l="'.$l.'" t="'.$network.'" /></d></ml>';
-                    $len = strlen($str);
-                    // NS: >>> ADL {id} {size}
-                    $this->ns_writeln("ADL $this->id $len");
-                    $this->ns_writedata($str);
-                }
-            }
-            $this->UpdateContacts();
-            return true;
     }
 
     function delMemberFromList($memberID, $email, $network, $list) {
@@ -934,7 +840,7 @@ class MSN {
             $http_code = curl_getinfo($curl, CURLINFO_HTTP_CODE);
             curl_close($curl);
             $this->debug_message("*** Get Result:\n$data");
-            if(($http_code != 200)||(!$returnData)) return array();
+            if($http_code != 200) return array();
             $p = $data;
             $aMemberships = array();
             while (1) {
@@ -1562,7 +1468,7 @@ class MSN {
                 $start_tm = time();
                 $ping_tm = time();
                 stream_set_timeout($this->NSfp, $this->NSStreamTimeout);
-                    $aContactList = $this->getMembershipList(true);
+                    $aContactList = $this->getMembershipList();
                     if ($this->update_pending) {
                         if (is_array($aContactList)) {
                             $pending = 'Pending';
@@ -2102,6 +2008,11 @@ class MSN {
                     $this->log_message("NS: <<< RNG $data");
                     @list(/* RNG */, $sid, $server, /* auth_type */, $ticket, $email, $name, ) = @explode(' ', $data);
                     @list($sb_ip, $sb_port) = @explode(':', $server);
+                    if($this->IsIgnoreMail($email)) 
+                    {
+                     $this->log_message("*** Ignore RNG from $email");
+                     break;   
+                    }
                     $this->log_message("*** RING from $email, $sb_ip:$sb_port");
                     $this->addContact($email,1,$email, true);
                     $pid=pcntl_fork();
@@ -2132,7 +2043,7 @@ class MSN {
                     break;
 
                 default:
-                	$code = substr($data,0,3);
+                    $code = substr($data,0,3);
                     if (is_numeric($code)) {
                         $this->error = "Error code: $code, please check the detail information from: http://msnpiki.msnfanatic.com/index.php/Reference:Error_List";
                         $this->debug_message("*** NS: $this->error");
@@ -2329,7 +2240,7 @@ class MSN {
                     $this->SB_writedata($aMessage);
                 }
                 $this->SwitchBoardMessageQueue=array();
-                $LastActive=time();
+                if(!$this->IsIgnoreMail($user)) $LastActive = time();
                 continue;
             }
             $code = substr($data, 0, 3);
@@ -2725,7 +2636,7 @@ class MSN {
                     }
                     break;
             }
-            $LastActive = time();
+            if(!$this->IsIgnoreMail($user)) $LastActive = time();
         }
         if (feof($this->SBFp))
         {
@@ -3089,7 +3000,7 @@ X-OIM-Sequence-Num: 1
         $start_tm = time();
         $ping_tm = time();
         stream_set_timeout($this->NSfp, $this->NSStreamTimeout);
-        $this->aContactList = $this->getMembershipList(true);
+        $this->aContactList = $this->getMembershipList();
         if ($this->update_pending) {
             if (is_array($this->aContactList)) {
                 $pending = 'Pending';
@@ -3182,7 +3093,7 @@ X-OIM-Sequence-Num: 1
         // NS: >>> CHG {id} {status} {clientid} {msnobj}
         $this->ns_writeln("CHG $this->id NLN $this->clientid");
         if($this->PhotoStickerFile!==false)
-        $this->ns_writeln("CHG $this->id NLN $this->clientid ".rawurlencode($this->MsnObj($this->PhotoStickerFile)));
+            $this->ns_writeln("CHG $this->id NLN $this->clientid ".rawurlencode($this->MsnObj($this->PhotoStickerFile)));
         // NS: >>> UUX {id} length
         $str = '<Data><PSM>'.htmlspecialchars($this->psm).'</PSM><CurrentMedia></CurrentMedia><MachineGuid></MachineGuid></Data>';
         $len = strlen($str);
@@ -3201,477 +3112,465 @@ X-OIM-Sequence-Num: 1
         }
         
         $data = $this->ns_readln();
-        /*if($data===false)
-        {
-            if(count($this->ChildProcess)<$this->MAXChildProcess)
+        if($data === false) {
+            // There was no data / an error when reading from the socket so reconnect
+            $this->signon();
+        } else {
+            switch (substr($data,0,3))
             {
-                $Index=0;
-                foreach($this->MessageQueue as $User => $Message)
-                {
-                    if(!trim($User)) continue;
-                    if($Inxdex>=$this->MAXChildProcess-count($this->ChildProcess)) break;
-                    if((!$Message['XFRSent'])||($Message['XFRSent']&&(time()-$this->MessageQueue[$User]['ReqTime']>$this->ReqSBXFRTimeout)))
-                    {
-                        $this->MessageQueue[$User]['XFRSent']=true;
-                        $this->MessageQueue[$User]['ReqTime']=time();
-                        $this->log_message("*** Request SB for $User");
-                        $this->ns_writeln("XFR $this->id SB");
-                        $Index++;
+                case 'SBS':
+                    // after 'USR {id} OK {user} {verify} 0' response, the server will send SBS and profile to us
+                    // NS: <<< SBS 0 null
+                    break;
+    
+                case 'RFS':
+                    // FIXME:
+                    // NS: <<< RFS ???
+                    // refresh ADL, so we re-send it again
+                    if (is_array($aADL)) {
+                        foreach ($aADL as $str) {
+                            $len = strlen($str);
+                            // NS: >>> ADL {id} {size}
+                            $this->ns_writeln("ADL $this->id $len");
+                            $this->ns_writedata($str);
+                        }
                     }
-                }
-            }
-            if($this->ProcessSendMessageFileQueue()) continue;
-            break;
-        }*/
-        switch (substr($data,0,3))
-        {
-            case 'SBS':
-                // after 'USR {id} OK {user} {verify} 0' response, the server will send SBS and profile to us
-                // NS: <<< SBS 0 null
-                break;
-
-            case 'RFS':
-                // FIXME:
-                // NS: <<< RFS ???
-                // refresh ADL, so we re-send it again
-                if (is_array($aADL)) {
-                    foreach ($aADL as $str) {
-                        $len = strlen($str);
-                        // NS: >>> ADL {id} {size}
-                        $this->ns_writeln("ADL $this->id $len");
-                        $this->ns_writedata($str);
+                    break;
+    
+                case 'LST':
+                    // NS: <<< LST {email} {alias} 11 0
+                    @list(/* LST */, $email, /* alias */, ) = @explode(' ', $data);
+                    @list($u_name, $u_domain) = @explode('@', $email);
+                    if (!isset($this->aContactList[$u_domain][$u_name][1])) {
+                        $this->aContactList[$u_domain][$u_name][1]['Allow'] = 'Allow';
+                        $this->log_message("*** add to our contact list: $u_name@$u_domain");
                     }
-                }
-                break;
-
-            case 'LST':
-                // NS: <<< LST {email} {alias} 11 0
-                @list(/* LST */, $email, /* alias */, ) = @explode(' ', $data);
-                @list($u_name, $u_domain) = @explode('@', $email);
-                if (!isset($this->aContactList[$u_domain][$u_name][1])) {
-                    $this->aContactList[$u_domain][$u_name][1]['Allow'] = 'Allow';
-                    $this->log_message("*** add to our contact list: $u_name@$u_domain");
-                }
-                break;
-
-            case 'ADL':
-                // randomly, we get ADL command, someome add us to their contact list for MSNP15
-                // NS: <<< ADL 0 {size}
-                @list(/* ADL */, /* 0 */, $size,) = @explode(' ', $data);
-                if (is_numeric($size) && $size > 0)
-                {
-                    $data = $this->ns_readdata($size);
-                    preg_match('#<ml><d n="([^"]+)"><c n="([^"]+)"(.*) t="(\d*)"(.*) /></d></ml>#', $data, $matches);
-                    if (is_array($matches) && count($matches) > 0)
+                    break;
+    
+                case 'ADL':
+                    // randomly, we get ADL command, someome add us to their contact list for MSNP15
+                    // NS: <<< ADL 0 {size}
+                    @list(/* ADL */, /* 0 */, $size,) = @explode(' ', $data);
+                    if (is_numeric($size) && $size > 0)
                     {
-                        $u_domain = $matches[1];
-                        $u_name = $matches[2];
-                        $network = $matches[4];
-                        if (isset($this->aContactList[$u_domain][$u_name][$network]))
-                        $this->log_message("*** someone (network: $network) add us to their list (but already in our list): $u_name@$u_domain");
-                        else
+                        $data = $this->ns_readdata($size);
+                        preg_match('#<ml><d n="([^"]+)"><c n="([^"]+)"(.*) t="(\d*)"(.*) /></d></ml>#', $data, $matches);
+                        if (is_array($matches) && count($matches) > 0)
                         {
-                            $re_login = false;
-                            $cnt = 0;
-                            foreach (array('Allow', 'Reverse') as $list)
+                            $u_domain = $matches[1];
+                            $u_name = $matches[2];
+                            $network = $matches[4];
+                            if (isset($this->aContactList[$u_domain][$u_name][$network]))
+                            $this->log_message("*** someone (network: $network) add us to their list (but already in our list): $u_name@$u_domain");
+                            else
                             {
-                                if (!$this->addMemberToList($u_name.'@'.$u_domain, $network, $list))
+                                $re_login = false;
+                                $cnt = 0;
+                                foreach (array('Allow', 'Reverse') as $list)
                                 {
-                                    if ($re_login) {
-                                        $this->log_message("*** can't add $u_name@$u_domain (network: $network) to $list");
-                                        continue;
-                                    }
-                                    $aTickets = $this->get_passport_ticket();
-                                    if (!$aTickets || !is_array($aTickets)) {
-                                        // failed to login? ignore it
-                                        $this->log_message("*** can't re-login, something wrong here");
-                                        $this->log_message("*** can't add $u_name@$u_domain (network: $network) to $list");
-                                        continue;
-                                    }
-                                    $re_login = true;
-                                    $this->ticket = $aTickets;
-                                    $this->log_message("**** get new ticket, try it again");
                                     if (!$this->addMemberToList($u_name.'@'.$u_domain, $network, $list))
                                     {
-                                        $this->log_message("*** can't add $u_name@$u_domain (network: $network) to $list");
-                                        continue;
+                                        if ($re_login) {
+                                            $this->log_message("*** can't add $u_name@$u_domain (network: $network) to $list");
+                                            continue;
+                                        }
+                                        $aTickets = $this->get_passport_ticket();
+                                        if (!$aTickets || !is_array($aTickets)) {
+                                            // failed to login? ignore it
+                                            $this->log_message("*** can't re-login, something wrong here");
+                                            $this->log_message("*** can't add $u_name@$u_domain (network: $network) to $list");
+                                            continue;
+                                        }
+                                        $re_login = true;
+                                        $this->ticket = $aTickets;
+                                        $this->log_message("**** get new ticket, try it again");
+                                        if (!$this->addMemberToList($u_name.'@'.$u_domain, $network, $list))
+                                        {
+                                            $this->log_message("*** can't add $u_name@$u_domain (network: $network) to $list");
+                                            continue;
+                                        }
                                     }
+                                    $this->aContactList[$u_domain][$u_name][$network][$list] = false;
+                                    $cnt++;
                                 }
-                                $this->aContactList[$u_domain][$u_name][$network][$list] = false;
-                                $cnt++;
+                                $this->log_message("*** someone (network: $network) add us to their list: $u_name@$u_domain");
                             }
-                            $this->log_message("*** someone (network: $network) add us to their list: $u_name@$u_domain");
-                        }
-                        $str = '<ml l="1"><d n="'.$u_domain.'"><c n="'.$u_name.'" l="3" t="'.$network.'" /></d></ml>';
-                        $len = strlen($str);
-                    }
-                    else
-                    $this->log_message("*** someone add us to their list: $data");
-                    $this->AddUsToMemberList($u_name.'@'.$u_domain, $network);
-                }
-                break;
-
-            case 'RML':
-                // randomly, we get RML command, someome remove us to their contact list for MSNP15
-                // NS: <<< RML 0 {size}
-                @list(/* RML */, /* 0 */, $size,) = @explode(' ', $data);
-                if (is_numeric($size) && $size > 0)
-                {
-                    $data = $this->ns_readdata($size);
-                    preg_match('#<ml><d n="([^"]+)"><c n="([^"]+)"(.*) t="(\d*)"(.*) /></d></ml>#', $data, $matches);
-                    if (is_array($matches) && count($matches) > 0)
-                    {
-                        $u_domain = $matches[1];
-                        $u_name = $matches[2];
-                        $network = $matches[4];
-                        if (isset($this->aContactList[$u_domain][$u_name][$network]))
-                        {
-                            $aData = $this->aContactList[$u_domain][$u_name][$network];
-                            foreach ($aData as $list => $id)
-                            $this->delMemberFromList($id, $u_name.'@'.$u_domain, $network, $list);
-                            unset($this->aContactList[$u_domain][$u_name][$network]);
-                            $this->log_message("*** someone (network: $network) remove us from their list: $u_name@$u_domain");
+                            $str = '<ml l="1"><d n="'.$u_domain.'"><c n="'.$u_name.'" l="3" t="'.$network.'" /></d></ml>';
+                            $len = strlen($str);
                         }
                         else
-                        $this->log_message("*** someone (network: $network) remove us from their list (but not in our list): $u_name@$u_domain");
-                        $this->RemoveUsFromMemberList($u_name.'@'.$u_domain, $network);
+                        $this->log_message("*** someone add us to their list: $data");
+                        $this->AddUsToMemberList($u_name.'@'.$u_domain, $network);
                     }
-                    else
-                    $this->log_message("*** someone remove us from their list: $data");
-                }
-                break;
-
-            case 'MSG':
-                // randomly, we get MSG notification from server
-                // NS: <<< MSG Hotmail Hotmail {size}
-                @list(/* MSG */, /* Hotmail */, /* Hotmail */, $size,) = @explode(' ', $data);
-                if (is_numeric($size) && $size > 0) {
-                    $data = $this->ns_readdata($size);
-                    $aLines = @explode("\n", $data);
-                    $header = true;
-                    $ignore = false;
-                    $maildata = '';
-                    foreach ($aLines as $line) {
-                        $line = rtrim($line);
-                        if ($header) {
-                            if ($line === '') {
-                                $header = false;
+                    break;
+    
+                case 'RML':
+                    // randomly, we get RML command, someome remove us to their contact list for MSNP15
+                    // NS: <<< RML 0 {size}
+                    @list(/* RML */, /* 0 */, $size,) = @explode(' ', $data);
+                    if (is_numeric($size) && $size > 0)
+                    {
+                        $data = $this->ns_readdata($size);
+                        preg_match('#<ml><d n="([^"]+)"><c n="([^"]+)"(.*) t="(\d*)"(.*) /></d></ml>#', $data, $matches);
+                        if (is_array($matches) && count($matches) > 0)
+                        {
+                            $u_domain = $matches[1];
+                            $u_name = $matches[2];
+                            $network = $matches[4];
+                            if (isset($this->aContactList[$u_domain][$u_name][$network]))
+                            {
+                                $aData = $this->aContactList[$u_domain][$u_name][$network];
+                                foreach ($aData as $list => $id)
+                                $this->delMemberFromList($id, $u_name.'@'.$u_domain, $network, $list);
+                                unset($this->aContactList[$u_domain][$u_name][$network]);
+                                $this->log_message("*** someone (network: $network) remove us from their list: $u_name@$u_domain");
+                            }
+                            else
+                            $this->log_message("*** someone (network: $network) remove us from their list (but not in our list): $u_name@$u_domain");
+                            $this->RemoveUsFromMemberList($u_name.'@'.$u_domain, $network);
+                        }
+                        else
+                        $this->log_message("*** someone remove us from their list: $data");
+                    }
+                    break;
+    
+                case 'MSG':
+                    // randomly, we get MSG notification from server
+                    // NS: <<< MSG Hotmail Hotmail {size}
+                    @list(/* MSG */, /* Hotmail */, /* Hotmail */, $size,) = @explode(' ', $data);
+                    if (is_numeric($size) && $size > 0) {
+                        $data = $this->ns_readdata($size);
+                        $aLines = @explode("\n", $data);
+                        $header = true;
+                        $ignore = false;
+                        $maildata = '';
+                        foreach ($aLines as $line) {
+                            $line = rtrim($line);
+                            if ($header) {
+                                if ($line === '') {
+                                    $header = false;
+                                    continue;
+                                }
+                                if (strncasecmp($line, 'Content-Type:', 13) == 0) {
+                                    if (strpos($line, 'text/x-msmsgsinitialmdatanotification') === false &&
+                                    strpos($line, 'text/x-msmsgsoimnotification') === false) {
+                                        // we just need text/x-msmsgsinitialmdatanotification
+                                        // or text/x-msmsgsoimnotification
+                                        $ignore = true;
+                                        break;
+                                    }
+                                }
                                 continue;
                             }
-                            if (strncasecmp($line, 'Content-Type:', 13) == 0) {
-                                if (strpos($line, 'text/x-msmsgsinitialmdatanotification') === false &&
-                                strpos($line, 'text/x-msmsgsoimnotification') === false) {
-                                    // we just need text/x-msmsgsinitialmdatanotification
-                                    // or text/x-msmsgsoimnotification
-                                    $ignore = true;
+                            if (strncasecmp($line, 'Mail-Data:', 10) == 0) {
+                                $maildata = trim(substr($line, 10));
+                                break;
+                            }
+                        }
+                        if ($ignore) {
+                            $this->log_message("*** ingnore MSG for: $line");
+                            break;
+                        }
+                        if ($maildata == '') {
+                            $this->log_message("*** ingnore MSG not for OIM");
+                            break;
+                        }
+                        $re_login = false;
+                        if (strcasecmp($maildata, 'too-large') == 0) {
+                            $this->log_message("*** large mail-data, need to get the data via SOAP");
+                            $maildata = $this->getOIM_maildata();
+                            if ($maildata === false) {
+                                $this->log_message("*** can't get mail-data via SOAP");
+                                // maybe we need to re-login again
+                                $aTickets = $this->get_passport_ticket();
+                                if (!$aTickets || !is_array($aTickets)) {
+                                    // failed to login? ignore it
+                                    $this->log_message("*** can't re-login, something wrong here, ignore this OIM");
+                                    break;
+                                }
+                                $re_login = true;
+                                $this->ticket = $aTickets;
+                                $this->log_message("**** get new ticket, try it again");
+                                $maildata = $this->getOIM_maildata();
+                                if ($maildata === false) {
+                                    $this->log_message("*** can't get mail-data via SOAP, and we already re-login again, so ignore this OIM");
                                     break;
                                 }
                             }
-                            continue;
                         }
-                        if (strncasecmp($line, 'Mail-Data:', 10) == 0) {
-                            $maildata = trim(substr($line, 10));
+                        // could be a lots of <M>...</M>, so we can't use preg_match here
+                        $p = $maildata;
+                        $aOIMs = array();
+                        while (1) {
+                            $start = strpos($p, '<M>');
+                            $end = strpos($p, '</M>');
+                            if ($start === false || $end === false || $start > $end) break;
+                            $end += 4;
+                            $sOIM = substr($p, $start, $end - $start);
+                            $aOIMs[] = $sOIM;
+                            $p = substr($p, $end);
+                        }
+                        if (count($aOIMs) == 0) {
+                            $this->log_message("*** ingnore empty OIM");
                             break;
                         }
-                    }
-                    if ($ignore) {
-                        $this->log_message("*** ingnore MSG for: $line");
-                        break;
-                    }
-                    if ($maildata == '') {
-                        $this->log_message("*** ingnore MSG not for OIM");
-                        break;
-                    }
-                    $re_login = false;
-                    if (strcasecmp($maildata, 'too-large') == 0) {
-                        $this->log_message("*** large mail-data, need to get the data via SOAP");
-                        $maildata = $this->getOIM_maildata();
-                        if ($maildata === false) {
-                            $this->log_message("*** can't get mail-data via SOAP");
-                            // maybe we need to re-login again
-                            $aTickets = $this->get_passport_ticket();
-                            if (!$aTickets || !is_array($aTickets)) {
-                                // failed to login? ignore it
-                                $this->log_message("*** can't re-login, something wrong here, ignore this OIM");
-                                break;
-                            }
-                            $re_login = true;
-                            $this->ticket = $aTickets;
-                            $this->log_message("**** get new ticket, try it again");
-                            $maildata = $this->getOIM_maildata();
-                            if ($maildata === false) {
-                                $this->log_message("*** can't get mail-data via SOAP, and we already re-login again, so ignore this OIM");
-                                break;
-                            }
-                        }
-                    }
-                    // could be a lots of <M>...</M>, so we can't use preg_match here
-                    $p = $maildata;
-                    $aOIMs = array();
-                    while (1) {
-                        $start = strpos($p, '<M>');
-                        $end = strpos($p, '</M>');
-                        if ($start === false || $end === false || $start > $end) break;
-                        $end += 4;
-                        $sOIM = substr($p, $start, $end - $start);
-                        $aOIMs[] = $sOIM;
-                        $p = substr($p, $end);
-                    }
-                    if (count($aOIMs) == 0) {
-                        $this->log_message("*** ingnore empty OIM");
-                        break;
-                    }
-                    foreach ($aOIMs as $maildata) {
-                        // T: 11 for MSN, 13 for Yahoo
-                        // S: 6 for MSN, 7 for Yahoo
-                        // RT: the datetime received by server
-                        // RS: already read or not
-                        // SZ: size of message
-                        // E: sender
-                        // I: msgid
-                        // F: always 00000000-0000-0000-0000-000000000009
-                        // N: sender alias
-                        preg_match('#<T>(.*)</T>#', $maildata, $matches);
-                        if (count($matches) == 0) {
-                            $this->log_message("*** ingnore OIM maildata without <T>type</T>");
-                            continue;
-                        }
-                        $oim_type = $matches[1];
-                        if ($oim_type = 13)
-                        $network = 32;
-                        else
-                        $network = 1;
-                        preg_match('#<E>(.*)</E>#', $maildata, $matches);
-                        if (count($matches) == 0) {
-                            $this->log_message("*** ingnore OIM maildata without <E>sender</E>");
-                            continue;
-                        }
-                        $oim_sender = $matches[1];
-                        preg_match('#<I>(.*)</I>#', $maildata, $matches);
-                        if (count($matches) == 0) {
-                            $this->log_message("*** ingnore OIM maildata without <I>msgid</I>");
-                            continue;
-                        }
-                        $oim_msgid = $matches[1];
-                        preg_match('#<SZ>(.*)</SZ>#', $maildata, $matches);
-                        $oim_size = (count($matches) == 0) ? 0 : $matches[1];
-                        preg_match('#<RT>(.*)</RT>#', $maildata, $matches);
-                        $oim_time = (count($matches) == 0) ? 0 : $matches[1];
-                        $this->log_message("*** You've OIM sent by $oim_sender, Time: $oim_time, MSGID: $oim_msgid, size: $oim_size");
-                        $sMsg = $this->getOIM_message($oim_msgid);
-                        if ($sMsg === false) {
-                            $this->log_message("*** can't get OIM, msgid = $oim_msgid");
-                            if ($re_login) {
-                                $this->log_message("*** can't get OIM via SOAP, and we already re-login again, so ignore this OIM");
+                        foreach ($aOIMs as $maildata) {
+                            // T: 11 for MSN, 13 for Yahoo
+                            // S: 6 for MSN, 7 for Yahoo
+                            // RT: the datetime received by server
+                            // RS: already read or not
+                            // SZ: size of message
+                            // E: sender
+                            // I: msgid
+                            // F: always 00000000-0000-0000-0000-000000000009
+                            // N: sender alias
+                            preg_match('#<T>(.*)</T>#', $maildata, $matches);
+                            if (count($matches) == 0) {
+                                $this->log_message("*** ingnore OIM maildata without <T>type</T>");
                                 continue;
                             }
-                            $aTickets = $this->get_passport_ticket();
-                            if (!$aTickets || !is_array($aTickets)) {
-                                // failed to login? ignore it
-                                $this->log_message("*** can't re-login, something wrong here, ignore this OIM");
+                            $oim_type = $matches[1];
+                            if ($oim_type = 13)
+                            $network = 32;
+                            else
+                            $network = 1;
+                            preg_match('#<E>(.*)</E>#', $maildata, $matches);
+                            if (count($matches) == 0) {
+                                $this->log_message("*** ingnore OIM maildata without <E>sender</E>");
                                 continue;
                             }
-                            $re_login = true;
-                            $this->ticket = $aTickets;
-                            $this->log_message("**** get new ticket, try it again");
+                            $oim_sender = $matches[1];
+                            preg_match('#<I>(.*)</I>#', $maildata, $matches);
+                            if (count($matches) == 0) {
+                                $this->log_message("*** ingnore OIM maildata without <I>msgid</I>");
+                                continue;
+                            }
+                            $oim_msgid = $matches[1];
+                            preg_match('#<SZ>(.*)</SZ>#', $maildata, $matches);
+                            $oim_size = (count($matches) == 0) ? 0 : $matches[1];
+                            preg_match('#<RT>(.*)</RT>#', $maildata, $matches);
+                            $oim_time = (count($matches) == 0) ? 0 : $matches[1];
+                            $this->log_message("*** You've OIM sent by $oim_sender, Time: $oim_time, MSGID: $oim_msgid, size: $oim_size");
                             $sMsg = $this->getOIM_message($oim_msgid);
                             if ($sMsg === false) {
-                                $this->log_message("*** can't get OIM via SOAP, and we already re-login again, so ignore this OIM");
+                                $this->log_message("*** can't get OIM, msgid = $oim_msgid");
+                                if ($re_login) {
+                                    $this->log_message("*** can't get OIM via SOAP, and we already re-login again, so ignore this OIM");
+                                    continue;
+                                }
+                                $aTickets = $this->get_passport_ticket();
+                                if (!$aTickets || !is_array($aTickets)) {
+                                    // failed to login? ignore it
+                                    $this->log_message("*** can't re-login, something wrong here, ignore this OIM");
+                                    continue;
+                                }
+                                $re_login = true;
+                                $this->ticket = $aTickets;
+                                $this->log_message("**** get new ticket, try it again");
+                                $sMsg = $this->getOIM_message($oim_msgid);
+                                if ($sMsg === false) {
+                                    $this->log_message("*** can't get OIM via SOAP, and we already re-login again, so ignore this OIM");
+                                    continue;
+                                }
+                            }
+                            $this->log_message("*** MSG (Offline) from $oim_sender (network: $network): $sMsg");
+    
+                            //$this->ReceivedMessage($oim_sender,$sMsg,$network,true);
+                            $this->callHandler('IMin', array('sender' => $oim_sender, 'message' => $sMsg, 'network' => $network, 'offline' => true));
+                        }
+                    }
+                    break;
+    
+                case 'UBM':
+                    // randomly, we get UBM, this is the message from other network, like Yahoo!
+                    // NS: <<< UBM {email} $network $type {size}
+                    @list(/* UBM */, $from_email, $network, $type, $size,) = @explode(' ', $data);
+                    if (is_numeric($size) && $size > 0)
+                    {
+                        $data = $this->ns_readdata($size);
+                        $aLines = @explode("\n", $data);
+                        $header = true;
+                        $ignore = false;
+                        $sMsg = '';
+                        foreach ($aLines as $line) {
+                            $line = rtrim($line);
+                            if ($header) {
+                                if ($line === '') {
+                                    $header = false;
+                                    continue;
+                                }
+                                if (strncasecmp($line, 'TypingUser:', 11) == 0) {
+                                    $ignore = true;
+                                    break;
+                                }
                                 continue;
                             }
+                            $aSubLines = @explode("\r", $line);
+                            foreach ($aSubLines as $str) {
+                                if ($sMsg !== '')
+                                $sMsg .= "\n";
+                                $sMsg .= $str;
+                            }
                         }
-                        $this->log_message("*** MSG (Offline) from $oim_sender (network: $network): $sMsg");
-
-                        //$this->ReceivedMessage($oim_sender,$sMsg,$network,true);
-                        $this->callHandler('IMin', array('sender' => $oim_sender, 'message' => $sMsg, 'network' => $network, 'offline' => true));
+                        if($ignore)
+                        {
+                            $this->log_message("*** ingnore from $from_email: $line");
+                            break;
+                        }
+                        $this->log_message("*** MSG from $from_email (network: $network): $sMsg");
+                        //$this->ReceivedMessage($from_email,$sMsg,$network,false);
+                        $this->callHandler('IMin', array('sender' => $from_email, 'message' => $sMsg, 'network' => $network, 'offline' => false));
                     }
-                }
-                break;
-
-            case 'UBM':
-                // randomly, we get UBM, this is the message from other network, like Yahoo!
-                // NS: <<< UBM {email} $network $type {size}
-                @list(/* UBM */, $from_email, $network, $type, $size,) = @explode(' ', $data);
-                if (is_numeric($size) && $size > 0)
-                {
-                    $data = $this->ns_readdata($size);
-                    $aLines = @explode("\n", $data);
-                    $header = true;
-                    $ignore = false;
-                    $sMsg = '';
-                    foreach ($aLines as $line) {
-                        $line = rtrim($line);
-                        if ($header) {
-                            if ($line === '') {
-                                $header = false;
-                                continue;
-                            }
-                            if (strncasecmp($line, 'TypingUser:', 11) == 0) {
-                                $ignore = true;
+                    break;
+    
+                case 'UBX':
+                    // randomly, we get UBX notification from server
+                    // NS: <<< UBX email {network} {size}
+                    @list(/* UBX */, /* email */, /* network */, $size,) = @explode(' ', $data);
+                    // we don't need the notification data, so just ignore it
+                    if (is_numeric($size) && $size > 0)
+                    $this->ns_readdata($size);
+                    break;
+    
+                case 'CHL':
+                    // randomly, we'll get challenge from server
+                    // NS: <<< CHL 0 {code}
+                    @list(/* CHL */, /* 0 */, $chl_code,) = @explode(' ', $data);
+                    $fingerprint = $this->getChallenge($chl_code);
+                    // NS: >>> QRY {id} {product_id} 32
+                    // NS: >>> fingerprint
+                    $this->ns_writeln("QRY $this->id $this->prod_id 32");
+                    $this->ns_writedata($fingerprint);
+                    $this->ns_writeln("CHG $this->id NLN $this->clientid");                    
+                    if($this->PhotoStickerFile!==false)
+                    $this->ns_writeln("CHG $this->id NLN $this->clientid ".rawurlencode($this->MsnObj($this->PhotoStickerFile)));
+                    break;
+                case 'CHG':
+                    // NS: <<< CHG {id} {status} {code}
+                    // ignore it
+                    // change our status to online first
+                    break;
+    
+                case 'XFR':
+                    // sometimes, NS will redirect to another NS
+                    // MSNP9
+                    // NS: <<< XFR {id} NS {server} 0 {server}
+                    // MSNP15
+                    // NS: <<< XFR {id} NS {server} U D
+                    // for normal switchboard XFR
+                    // NS: <<< XFR {id} SB {server} CKI {cki} U messenger.msn.com 0
+                    @list(/* XFR */, /* {id} */, $server_type, $server, /* CKI */, $cki_code, /* ... */) = @explode(' ', $data);
+                    @list($ip, $port) = @explode(':', $server);
+                    if ($server_type != 'SB') {
+                        // maybe exit?
+                        // this connection will close after XFR
+                        $this->NSLogout();
+                        continue;
+                    }
+                    if(count($this->MessageQueue))
+                    {
+                        foreach($this->MessageQueue as $User => $Message)
+                        {
+                            //$this->ChildProcess[$ChildPid]
+                            $this->log_message("*** XFR SB $User");
+                            $pid=pcntl_fork();
+                            if($pid)
+                            {
+                                //Parrent Process
+                                $this->ChildProcess[$pid]=$User;
                                 break;
                             }
-                            continue;
-                        }
-                        $aSubLines = @explode("\r", $line);
-                        foreach ($aSubLines as $str) {
-                            if ($sMsg !== '')
-                            $sMsg .= "\n";
-                            $sMsg .= $str;
+                            elseif($pid==-1)
+                            {
+                                $this->log_message("*** Fork Error $User");
+                                break;
+                            }
+                            else
+                            {
+                                //Child Process
+                                $this->log_message("*** Child Process Start for $User");
+                                unset($Message['XFRSent']);
+                                unset($Message['ReqTime']);
+                                $bSBresult = $this->switchboard_control($ip, $port, $cki_code, $User, $Message);
+                                if ($bSBresult === false)
+                                {
+                                    // error for switchboard
+                                    $this->log_message("!!! error for sending message to ".$User);
+                                }
+                                die;
+                            }
                         }
+                        unset($this->MessageQueue[$User]);
                     }
-                    if($ignore)
+                    /*
+                     $bSBresult = $this->switchboard_control($ip, $port, $cki_code, $aMSNUsers[$nCurrentUser], $sMessage);
+                     if ($bSBresult === false) {
+                     // error for switchboard
+                     $this->log_message("!!! error for sending message to ".$aMSNUsers[$nCurrentUser]);
+                     $aOfflineUsers[] = $aMSNUsers[$nCurrentUser];
+                     }*/
+                    break;
+                case 'QNG':
+                    // NS: <<< QNG {time}
+                    //@list(/* QNG */, $this->ping_wait) = @explode(' ', $data);
+                    //if ($this->ping_wait == 0) $this->ping_wait = 50;
+                    //if (is_int($use_ping) && $use_ping > 0) $ping_wait = $use_ping;
+                    //Mod by Ricky Set Online
+                    break;
+    
+                case 'RNG':
+                    if($this->PhotoStickerFile!==false)
+                    $this->ns_writeln("CHG $this->id NLN $this->clientid ".rawurlencode($this->MsnObj($this->PhotoStickerFile)));
+                    else
+                    $this->ns_writeln("CHG $this->id NLN $this->clientid");
+                    // someone is trying to talk to us
+                    // NS: <<< RNG {session_id} {server} {auth_type} {ticket} {email} {alias} U {client} 0
+                    $this->log_message("NS: <<< RNG $data");
+                    @list(/* RNG */, $sid, $server, /* auth_type */, $ticket, $email, $name, ) = @explode(' ', $data);
+                    @list($sb_ip, $sb_port) = @explode(':', $server);
+                    if($this->IsIgnoreMail($email))
                     {
-                        $this->log_message("*** ingnore from $from_email: $line");
+                        $this->log_message("*** Ignore RNG from $email");
                         break;
                     }
-                    $this->log_message("*** MSG from $from_email (network: $network): $sMsg");
-                    //$this->ReceivedMessage($from_email,$sMsg,$network,false);
-                    $this->callHandler('IMin', array('sender' => $from_email, 'message' => $sMsg, 'network' => $network, 'offline' => false));
-                }
-                break;
-
-            case 'UBX':
-                // randomly, we get UBX notification from server
-                // NS: <<< UBX email {network} {size}
-                @list(/* UBX */, /* email */, /* network */, $size,) = @explode(' ', $data);
-                // we don't need the notification data, so just ignore it
-                if (is_numeric($size) && $size > 0)
-                $this->ns_readdata($size);
-                break;
-
-            case 'CHL':
-                // randomly, we'll get challenge from server
-                // NS: <<< CHL 0 {code}
-                @list(/* CHL */, /* 0 */, $chl_code,) = @explode(' ', $data);
-                $fingerprint = $this->getChallenge($chl_code);
-                // NS: >>> QRY {id} {product_id} 32
-                // NS: >>> fingerprint
-                $this->ns_writeln("QRY $this->id $this->prod_id 32");
-                $this->ns_writedata($fingerprint);
-                $this->ns_writeln("CHG $this->id NLN $this->clientid");                    
-                if($this->PhotoStickerFile!==false)
-                $this->ns_writeln("CHG $this->id NLN $this->clientid ".rawurlencode($this->MsnObj($this->PhotoStickerFile)));
-                break;
-            case 'CHG':
-                // NS: <<< CHG {id} {status} {code}
-                // ignore it
-                // change our status to online first
-                break;
-
-            case 'XFR':
-                // sometimes, NS will redirect to another NS
-                // MSNP9
-                // NS: <<< XFR {id} NS {server} 0 {server}
-                // MSNP15
-                // NS: <<< XFR {id} NS {server} U D
-                // for normal switchboard XFR
-                // NS: <<< XFR {id} SB {server} CKI {cki} U messenger.msn.com 0
-                @list(/* XFR */, /* {id} */, $server_type, $server, /* CKI */, $cki_code, /* ... */) = @explode(' ', $data);
-                @list($ip, $port) = @explode(':', $server);
-                if ($server_type != 'SB') {
-                    // maybe exit?
-                    // this connection will close after XFR
-                    $this->NSLogout();
-                    continue;
-                }
-                if(count($this->MessageQueue))
-                {
-                    foreach($this->MessageQueue as $User => $Message)
+                    $this->log_message("*** RING from $email, $sb_ip:$sb_port");
+                    $this->addContact($email,1,$email, true);
+                    $pid=pcntl_fork();
+                    if($pid)
                     {
-                        //$this->ChildProcess[$ChildPid]
-                        $this->log_message("*** XFR SB $User");
-                        $pid=pcntl_fork();
-                        if($pid)
-                        {
-                            //Parrent Process
-                            $this->ChildProcess[$pid]=$User;
-                            break;
-                        }
-                        elseif($pid==-1)
-                        {
-                            $this->log_message("*** Fork Error $User");
-                            break;
-                        }
-                        else
-                        {
-                            //Child Process
-                            $this->log_message("*** Child Process Start for $User");
-                            unset($Message['XFRSent']);
-                            unset($Message['ReqTime']);
-                            $bSBresult = $this->switchboard_control($ip, $port, $cki_code, $User, $Message);
-                            if ($bSBresult === false)
-                            {
-                                // error for switchboard
-                                $this->log_message("!!! error for sending message to ".$User);
-                            }
-                            die;
-                        }
+                        //Parrent Process
+                        $this->ChildProcess[$pid]='RNG';
+                        break;
+                    }
+                    elseif($pid==-1)
+                    {
+                        $this->log_message("*** Fork Error $User");
+                        break;
+                    }
+                    else
+                    {
+                        //Child Process
+                        $this->log_message("*** Ring Child Process Start for $User");
+                        $this->switchboard_ring($sb_ip, $sb_port, $sid, $ticket,$email);
+                        die;
                     }
-                    unset($this->MessageQueue[$User]);
-                }
-                /*
-                 $bSBresult = $this->switchboard_control($ip, $port, $cki_code, $aMSNUsers[$nCurrentUser], $sMessage);
-                 if ($bSBresult === false) {
-                 // error for switchboard
-                 $this->log_message("!!! error for sending message to ".$aMSNUsers[$nCurrentUser]);
-                 $aOfflineUsers[] = $aMSNUsers[$nCurrentUser];
-                 }*/
-                break;
-            case 'QNG':
-                // NS: <<< QNG {time}
-                //@list(/* QNG */, $this->ping_wait) = @explode(' ', $data);
-                //if ($this->ping_wait == 0) $this->ping_wait = 50;
-                //if (is_int($use_ping) && $use_ping > 0) $ping_wait = $use_ping;
-                //Mod by Ricky Set Online
-                break;
-
-            case 'RNG':
-                if($this->PhotoStickerFile!==false)
-                $this->ns_writeln("CHG $this->id NLN $this->clientid ".rawurlencode($this->MsnObj($this->PhotoStickerFile)));
-                else
-                $this->ns_writeln("CHG $this->id NLN $this->clientid");
-                // someone is trying to talk to us
-                // NS: <<< RNG {session_id} {server} {auth_type} {ticket} {email} {alias} U {client} 0
-                $this->log_message("NS: <<< RNG $data");
-                @list(/* RNG */, $sid, $server, /* auth_type */, $ticket, $email, $name, ) = @explode(' ', $data);
-                @list($sb_ip, $sb_port) = @explode(':', $server);
-                $this->log_message("*** RING from $email, $sb_ip:$sb_port");
-                $this->addContact($email,1,$email, true);
-                $pid=pcntl_fork();
-                if($pid)
-                {
-                    //Parrent Process
-                    $this->ChildProcess[$pid]='RNG';
                     break;
-                }
-                elseif($pid==-1)
-                {
-                    $this->log_message("*** Fork Error $User");
-                    break;
-                }
-                else
-                {
-                    //Child Process
-                    $this->log_message("*** Ring Child Process Start for $User");
-                    $this->switchboard_ring($sb_ip, $sb_port, $sid, $ticket,$email);
-                    die;
-                }
-                break;
-            case 'OUT':
-                // force logout from NS
-                // NS: <<< OUT xxx
-                $this->log_message("*** LOGOUT from NS");
-                return $this->NsLogout();
-
-            default:
-                $code = substr($data,0,3);
-                if (is_numeric($code)) {
-                    $this->error = "Error code: $code, please check the detail information from: http://msnpiki.msnfanatic.com/index.php/Reference:Error_List";
-                    $this->debug_message("*** NS: $this->error");
-
+                case 'OUT':
+                    // force logout from NS
+                    // NS: <<< OUT xxx
+                    $this->log_message("*** LOGOUT from NS");
                     return $this->NsLogout();
-                }
-                break;
+    
+                default:
+                    $code = substr($data,0,3);
+                    if (is_numeric($code)) {
+                        $this->error = "Error code: $code, please check the detail information from: http://msnpiki.msnfanatic.com/index.php/Reference:Error_List";
+                        $this->debug_message("*** NS: $this->error");
+    
+                        return $this->NsLogout();
+                    }
+                    break;
+            }
         }
     }
     
@@ -3680,7 +3579,7 @@ X-OIM-Sequence-Num: 1
         $lastActive = $this->switchBoardSessions[$to]['lastActive'];
         $joined = $this->switchBoardSessions[$to]['joined'];
         
-        //TODO Probably not needed (we're not running in a loop anymore)
+        //FIXME Probably not needed (we're not running in a loop anymore)
         /*if($this->kill_me)
         {
             $this->log_message("*** SB Okay, kill me now!");
@@ -3725,7 +3624,7 @@ X-OIM-Sequence-Num: 1
         return true;
     }
     
-    //TODO Not sure if this is needed?
+    //FIXME Not sure if this is needed?
     private function endSBSession($socket) {
         if (feof($this->SBFp))
         {
@@ -3746,12 +3645,13 @@ X-OIM-Sequence-Num: 1
             if($network === 1 && isset($this->switchBoardSessions[$to])) {
                 $recipient = $name . $host;
                 $this->debug_message("*** Sending Message to $recipient using existing SB session");
-                $this->sendMessageViaSB($message, $recipient);
+                return $this->sendMessageViaSB($message, $recipient);
             } else {
                 $this->debug_message("*** Not MSN network or no existing SB session");
-                
+                //TODO implement creation of SB session etc
             }
         }
+        return true;
     }
     
     /**

From 4007bce9aa7e1364d5aa90de65a9715f6e11d12f Mon Sep 17 00:00:00 2001
From: Luke Fitzgerald <lw.fitzgerald@googlemail.com>
Date: Sat, 12 Jun 2010 21:21:09 +0100
Subject: [PATCH 045/655] Added in missing properties

---
 plugins/Msn/extlib/phpmsnclass/msn.class.php | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/plugins/Msn/extlib/phpmsnclass/msn.class.php b/plugins/Msn/extlib/phpmsnclass/msn.class.php
index 030cc5dc04..b230e346f7 100644
--- a/plugins/Msn/extlib/phpmsnclass/msn.class.php
+++ b/plugins/Msn/extlib/phpmsnclass/msn.class.php
@@ -108,6 +108,18 @@ class MSN {
     // for YIM: 518 bytes
     public $max_msn_message_len = 1664;
     public $max_yahoo_message_len = 518;
+    
+    // Begin added for StatusNet
+    
+    private $aContactList = array();
+    private $switchBoardSessions = array();
+    
+    /**
+    * Event Handler Functions
+    */
+    private $myEventHandlers = array();
+    
+    // End added for StatusNet
 
     private function Array2SoapVar($Array,$ReturnSoapVarObj=true,$TypeName=null,$TypeNameSpace=null)
     {

From dc66503f33929c2218a8f05151075329fac5005a Mon Sep 17 00:00:00 2001
From: Luke Fitzgerald <lw.fitzgerald@googlemail.com>
Date: Sun, 13 Jun 2010 01:54:09 +0100
Subject: [PATCH 046/655] Added callback for pong (to update time till next
 ping required)

---
 plugins/Msn/extlib/phpmsnclass/msn.class.php | 24 +++++++++++---------
 plugins/Msn/msnmanager.php                   | 13 +++++++++--
 2 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/plugins/Msn/extlib/phpmsnclass/msn.class.php b/plugins/Msn/extlib/phpmsnclass/msn.class.php
index b230e346f7..65525fe556 100644
--- a/plugins/Msn/extlib/phpmsnclass/msn.class.php
+++ b/plugins/Msn/extlib/phpmsnclass/msn.class.php
@@ -1573,7 +1573,7 @@ class MSN {
                     // NS: >>> CHG {id} {status} {clientid} {msnobj}
                     $this->ns_writeln("CHG $this->id NLN $this->clientid");                    
                     if($this->PhotoStickerFile!==false)
-                     $this->ns_writeln("CHG $this->id NLN $this->clientid ".rawurlencode($this->MsnObj($this->PhotoStickerFile)));
+                        $this->ns_writeln("CHG $this->id NLN $this->clientid ".rawurlencode($this->MsnObj($this->PhotoStickerFile)));
                     // NS: >>> UUX {id} length
                     $str = '<Data><PSM>'.htmlspecialchars($this->psm).'</PSM><CurrentMedia></CurrentMedia><MachineGuid></MachineGuid></Data>';
                     $len = strlen($str);
@@ -1935,7 +1935,7 @@ class MSN {
                     $this->ns_writedata($fingerprint);
                     $this->ns_writeln("CHG $this->id NLN $this->clientid");                    
                     if($this->PhotoStickerFile!==false)
-                    $this->ns_writeln("CHG $this->id NLN $this->clientid ".rawurlencode($this->MsnObj($this->PhotoStickerFile)));
+                        $this->ns_writeln("CHG $this->id NLN $this->clientid ".rawurlencode($this->MsnObj($this->PhotoStickerFile)));
                     break;
                 case 'CHG':
                     // NS: <<< CHG {id} {status} {code}
@@ -2012,9 +2012,9 @@ class MSN {
 
                 case 'RNG':
                     if($this->PhotoStickerFile!==false)
-                    $this->ns_writeln("CHG $this->id NLN $this->clientid ".rawurlencode($this->MsnObj($this->PhotoStickerFile)));
+                        $this->ns_writeln("CHG $this->id NLN $this->clientid ".rawurlencode($this->MsnObj($this->PhotoStickerFile)));
                     else
-                    $this->ns_writeln("CHG $this->id NLN $this->clientid");
+                        $this->ns_writeln("CHG $this->id NLN $this->clientid");
                     // someone is trying to talk to us
                     // NS: <<< RNG {session_id} {server} {auth_type} {ticket} {email} {alias} U {client} 0
                     $this->log_message("NS: <<< RNG $data");
@@ -2022,8 +2022,8 @@ class MSN {
                     @list($sb_ip, $sb_port) = @explode(':', $server);
                     if($this->IsIgnoreMail($email)) 
                     {
-                     $this->log_message("*** Ignore RNG from $email");
-                     break;   
+                        $this->log_message("*** Ignore RNG from $email");
+                        break;
                     }
                     $this->log_message("*** RING from $email, $sb_ip:$sb_port");
                     $this->addContact($email,1,$email, true);
@@ -3455,7 +3455,7 @@ X-OIM-Sequence-Num: 1
                     $this->ns_writedata($fingerprint);
                     $this->ns_writeln("CHG $this->id NLN $this->clientid");                    
                     if($this->PhotoStickerFile!==false)
-                    $this->ns_writeln("CHG $this->id NLN $this->clientid ".rawurlencode($this->MsnObj($this->PhotoStickerFile)));
+                        $this->ns_writeln("CHG $this->id NLN $this->clientid ".rawurlencode($this->MsnObj($this->PhotoStickerFile)));
                     break;
                 case 'CHG':
                     // NS: <<< CHG {id} {status} {code}
@@ -3524,17 +3524,19 @@ X-OIM-Sequence-Num: 1
                     break;
                 case 'QNG':
                     // NS: <<< QNG {time}
-                    //@list(/* QNG */, $this->ping_wait) = @explode(' ', $data);
+                    @list(/* QNG */, $ping_wait) = @explode(' ', $data);
                     //if ($this->ping_wait == 0) $this->ping_wait = 50;
                     //if (is_int($use_ping) && $use_ping > 0) $ping_wait = $use_ping;
                     //Mod by Ricky Set Online
+                    
+                    $this->callHandler('Pong', $ping_wait);
                     break;
     
                 case 'RNG':
                     if($this->PhotoStickerFile!==false)
-                    $this->ns_writeln("CHG $this->id NLN $this->clientid ".rawurlencode($this->MsnObj($this->PhotoStickerFile)));
+                        $this->ns_writeln("CHG $this->id NLN $this->clientid ".rawurlencode($this->MsnObj($this->PhotoStickerFile)));
                     else
-                    $this->ns_writeln("CHG $this->id NLN $this->clientid");
+                        $this->ns_writeln("CHG $this->id NLN $this->clientid");
                     // someone is trying to talk to us
                     // NS: <<< RNG {session_id} {server} {auth_type} {ticket} {email} {alias} U {client} 0
                     $this->log_message("NS: <<< RNG $data");
@@ -3711,7 +3713,7 @@ X-OIM-Sequence-Num: 1
      * Registers a user handler
      * 
      * Handler List
-     * IMIn
+     * IMIn, Pong
      *
      * @param String $event Event name
      * @param String $handler User function to call
diff --git a/plugins/Msn/msnmanager.php b/plugins/Msn/msnmanager.php
index aae6906d6c..99ac219157 100644
--- a/plugins/Msn/msnmanager.php
+++ b/plugins/Msn/msnmanager.php
@@ -36,7 +36,7 @@ class MsnManager extends ImManager
     
     protected $lastping = null;
     
-    const PING_INTERVAL = 50;
+    private $pingInterval;
     
     /**
      * Initialize connection to server.
@@ -70,7 +70,7 @@ class MsnManager extends ImManager
     public function idle($timeout=0)
     {
         $now = time();
-        if (empty($this->lastping) || $now - $this->lastping > self::PING_INTERVAL) {
+        if (empty($this->lastping) || $now - $this->lastping > $pingInterval) {
             $this->send_ping();
         }
     }
@@ -98,6 +98,7 @@ class MsnManager extends ImManager
                                 )
                         );
             $this->conn->registerHandler("IMIn", array($this, 'handle_msn_message'));
+            $this->conn->registerHandler('Pong', array($this, 'update_ping_time'));
             $this->conn->signon();
             $this->lastping = time();
         }
@@ -117,6 +118,14 @@ class MsnManager extends ImManager
         return true;
     }
     
+    /**
+     * Update the time till the next ping
+     * @param $data Time till next ping
+     */
+    function update_ping_time($data) {
+        $pingInterval = $data;
+    }
+    
     function handle_msn_message($data)
     {
         $this->plugin->enqueue_incoming_raw($data);

From 0083e58db304704be71c6c2fe9dba5484b7ae492 Mon Sep 17 00:00:00 2001
From: Luke Fitzgerald <lw.fitzgerald@googlemail.com>
Date: Sun, 13 Jun 2010 03:42:21 +0100
Subject: [PATCH 047/655]  - Corrected PhotoSticker bug in phpmsnclass  -
 Update time till next ping when a command is sent

---
 plugins/Msn/extlib/phpmsnclass/msn.class.php | 17 +++++++----------
 plugins/Msn/msnmanager.php                   |  4 ++++
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/plugins/Msn/extlib/phpmsnclass/msn.class.php b/plugins/Msn/extlib/phpmsnclass/msn.class.php
index 65525fe556..ef4f45b441 100644
--- a/plugins/Msn/extlib/phpmsnclass/msn.class.php
+++ b/plugins/Msn/extlib/phpmsnclass/msn.class.php
@@ -180,7 +180,7 @@ class MSN {
         $this->retry_wait = isset($Configs['retry_wait']) ? $Configs['retry_wait'] : 30;
         $this->backup_file = isset($Configs['backup_file']) ? $Configs['backup_file'] : true;
         $this->update_pending = isset($Configs['update_pending']) ? $Configs['update_pending'] : true;
-        $this->PhotoStickerFile=$Configs['PhotoSticker'];
+        $this->PhotoStickerFile=isset($Configs['PhotoSticker']) ? $Configs['PhotoSticker'] : false;
         $this->IgnoreList=isset($Configs['IgnoreList'])?$Configs['IgnoreList']:false;
         if($this->Emotions = isset($Configs['Emotions']) ? $Configs['Emotions']:false)
         {
@@ -3626,15 +3626,8 @@ X-OIM-Sequence-Num: 1
         
         $this->SB_writedata($aMessage);
         
-        if (feof($this->SBFp))
-        {
-            // lost connection? error? try OIM later
-            @fclose($this->SBFp);
-            //TODO introduce callback to add offline message to queue?
-            return false;
-        }
-        $this->SB_writeln("OUT");
-        @fclose($this->SBFp);
+        // Don't close the SB session, we might as well leave it open
+        
         return true;
     }
     
@@ -3651,6 +3644,10 @@ X-OIM-Sequence-Num: 1
         return true;
     }
     
+    private function getSBSession($to) {
+        
+    }
+    
     public function sendMessage($message, $to) {
         if($message != '') {
             list($name,$host,$network)=explode('@',$to);
diff --git a/plugins/Msn/msnmanager.php b/plugins/Msn/msnmanager.php
index 99ac219157..1ef496f56f 100644
--- a/plugins/Msn/msnmanager.php
+++ b/plugins/Msn/msnmanager.php
@@ -139,6 +139,10 @@ class MsnManager extends ImManager
             return false;
         }
         $this->conn->sflapSend($data[0],$data[1],$data[2],$data[3]);
+        
+        // Sending a command updates the time till next ping
+        $this->lastping = time();
+        $this->pingInterval = 50;
         return true;
     }
 }

From f3c1e9da9a0784dc3e071ad8610f701197ab0c84 Mon Sep 17 00:00:00 2001
From: Luke Fitzgerald <lw.fitzgerald@googlemail.com>
Date: Sun, 13 Jun 2010 04:14:29 +0100
Subject: [PATCH 048/655] Added some more event handlers and corrected aADL
 scope

---
 plugins/Msn/extlib/phpmsnclass/msn.class.php | 28 ++++++++++----------
 plugins/Msn/msnmanager.php                   | 10 +++++++
 2 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/plugins/Msn/extlib/phpmsnclass/msn.class.php b/plugins/Msn/extlib/phpmsnclass/msn.class.php
index ef4f45b441..36b47f8e9c 100644
--- a/plugins/Msn/extlib/phpmsnclass/msn.class.php
+++ b/plugins/Msn/extlib/phpmsnclass/msn.class.php
@@ -112,6 +112,7 @@ class MSN {
     // Begin added for StatusNet
     
     private $aContactList = array();
+    private $aADL = array();
     private $switchBoardSessions = array();
     
     /**
@@ -2172,9 +2173,9 @@ class MSN {
         $msg_header = "MIME-Version: 1.0\r\nContent-Type: text/plain; charset=UTF-8\r\nX-MMS-IM-Format: FN=$this->font_fn; EF=$this->font_ef; CO=$this->font_co; CS=0; PF=22\r\n\r\n";
         $msg_header_len = strlen($msg_header);
         if ($network == 1)
-        $maxlen = $this->max_msn_message_len - $msg_header_len;
+            $maxlen = $this->max_msn_message_len - $msg_header_len;
         else
-        $maxlen = $this->max_yahoo_message_len - $msg_header_len;
+            $maxlen = $this->max_yahoo_message_len - $msg_header_len;
         $sMessage=str_replace("\r", '', $sMessage);
         $msg=substr($sMessage,0,$maxlen);
         return $msg_header.$msg;
@@ -3004,7 +3005,8 @@ X-OIM-Sequence-Num: 1
         while(!$this->connect($this->user, $this->password))
         {
             $this->log_message("!!! Can't connect to server: $this->error");
-            if(!$this->NSRetryWait($this->retry_wait)) return;
+            $this->callHandler('ConnectFailed', NULL);
+            $this->NSRetryWait($this->retry_wait);
         }
         $this->UpdateContacts();
         $this->LastPing=time();
@@ -3061,7 +3063,7 @@ X-OIM-Sequence-Num: 1
                 $str = '<d n="'.$u_domain.'">';
                 $len += strlen($str);
                 if ($len > 7400) {
-                    $aADL[$n] = '<ml l="1">'.$sList.'</ml>';
+                    $this->aADL[$n] = '<ml l="1">'.$sList.'</ml>';
                     $n++;
                     $sList = '';
                     $len = strlen($str);
@@ -3075,7 +3077,7 @@ X-OIM-Sequence-Num: 1
                         // so we use 7475
                         if ($len > 7475) {
                             $sList .= '</d>';
-                            $aADL[$n] = '<ml l="1">'.$sList.'</ml>';
+                            $this->aADL[$n] = '<ml l="1">'.$sList.'</ml>';
                             $n++;
                             $sList = '<d n="'.$u_domain.'">'.$str;
                             $len = strlen($sList);
@@ -3087,10 +3089,10 @@ X-OIM-Sequence-Num: 1
                 $sList .= '</d>';
             }
         }
-        $aADL[$n] = '<ml l="1">'.$sList.'</ml>';
+        $this->aADL[$n] = '<ml l="1">'.$sList.'</ml>';
         // NS: >>> BLP {id} BL
         $this->ns_writeln("BLP $this->id BL");
-        foreach ($aADL as $str) {
+        foreach ($this->aADL as $str) {
             $len = strlen($str);
             // NS: >>> ADL {id} {size}
             $this->ns_writeln("ADL $this->id $len");
@@ -3116,16 +3118,16 @@ X-OIM-Sequence-Num: 1
     public function NSreceive() {
         $this->log_message("*** startup ***");
         
-        $aADL = array();
-        
         // Sign in again if not signed in or socket failed
         if (!is_resource($this->NSfp) || feof($this->NSfp)) {
+            $this->callHandler('Reconnect', NULL);
             $this->signon();
         }
         
         $data = $this->ns_readln();
         if($data === false) {
             // There was no data / an error when reading from the socket so reconnect
+            $this->callHandler('Reconnect', NULL);
             $this->signon();
         } else {
             switch (substr($data,0,3))
@@ -3139,8 +3141,8 @@ X-OIM-Sequence-Num: 1
                     // FIXME:
                     // NS: <<< RFS ???
                     // refresh ADL, so we re-send it again
-                    if (is_array($aADL)) {
-                        foreach ($aADL as $str) {
+                    if (is_array($this->aADL)) {
+                        foreach ($this->aADL as $str) {
                             $len = strlen($str);
                             // NS: >>> ADL {id} {size}
                             $this->ns_writeln("ADL $this->id $len");
@@ -3701,8 +3703,6 @@ X-OIM-Sequence-Num: 1
     private function callHandler($event, $data) {
         if (isset($this->myEventHandlers[$event])) {
             call_user_func($this->myEventHandlers[$event], $data);
-        } else {
-            $this->noHandler($data);
         }
     }
     
@@ -3710,7 +3710,7 @@ X-OIM-Sequence-Num: 1
      * Registers a user handler
      * 
      * Handler List
-     * IMIn, Pong
+     * IMIn, Pong, ConnectFailed, Reconnect
      *
      * @param String $event Event name
      * @param String $handler User function to call
diff --git a/plugins/Msn/msnmanager.php b/plugins/Msn/msnmanager.php
index 1ef496f56f..354ed0f3ef 100644
--- a/plugins/Msn/msnmanager.php
+++ b/plugins/Msn/msnmanager.php
@@ -99,6 +99,8 @@ class MsnManager extends ImManager
                         );
             $this->conn->registerHandler("IMIn", array($this, 'handle_msn_message'));
             $this->conn->registerHandler('Pong', array($this, 'update_ping_time'));
+            $this->conn->registerHandler('ConnectFailed', array($this, 'handle_connect_failed'));
+            $this->conn->registerHandler('Reconnect', array($this, 'handle_reconnect'));
             $this->conn->signon();
             $this->lastping = time();
         }
@@ -131,6 +133,14 @@ class MsnManager extends ImManager
         $this->plugin->enqueue_incoming_raw($data);
         return true;
     }
+    
+    function handle_connect_failed($data) {
+        common_log(LOG_NOTICE, 'MSN connect failed, retrying');
+    }
+    
+    function handle_reconnect($data) {
+        common_log(LOG_NOTICE, 'MSN reconnecting');
+    }
 
     function send_raw_message($data)
     {

From 3d6bb5a5974d002dfbf067374783adf89c296d43 Mon Sep 17 00:00:00 2001
From: Luke Fitzgerald <lw.fitzgerald@googlemail.com>
Date: Mon, 14 Jun 2010 03:47:44 +0100
Subject: [PATCH 049/655] More work on adapting phpmsnclass

---
 plugins/Msn/MsnPlugin.php                    |    1 -
 plugins/Msn/Queued_Msn.php                   |  120 --
 plugins/Msn/extlib/phpmsnclass/msn.class.php | 1567 +++++++++---------
 plugins/Msn/msnmanager.php                   |    2 +-
 4 files changed, 827 insertions(+), 863 deletions(-)
 delete mode 100644 plugins/Msn/Queued_Msn.php

diff --git a/plugins/Msn/MsnPlugin.php b/plugins/Msn/MsnPlugin.php
index 6737e727ab..5566b54302 100644
--- a/plugins/Msn/MsnPlugin.php
+++ b/plugins/Msn/MsnPlugin.php
@@ -170,4 +170,3 @@ class MsnPlugin extends ImPlugin
         return true;
     }
 }
-
diff --git a/plugins/Msn/Queued_Msn.php b/plugins/Msn/Queued_Msn.php
deleted file mode 100644
index bc8e0a1d15..0000000000
--- a/plugins/Msn/Queued_Msn.php
+++ /dev/null
@@ -1,120 +0,0 @@
-<?php
-/**
- * StatusNet, the distributed open-source microblogging tool
- *
- * Queue-mediated proxy class for outgoing MSN messages.
- *
- * 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  Network
- * @package   StatusNet
- * @author    Luke Fitzgerald <lw.fitzgerald@googlemail.com>
- * @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);
-}
-
-class Queued_XMPP extends MSN {
-    /**
-     * Reference to the MsnPlugin object we're hooked up to.
-     */
-    public $plugin;
-
-    /**
-     * Constructor
-     *
-     * @param MsnPlugin $plugin
-     * @param string  $host
-     * @param integer $port
-     * @param string  $user
-     * @param string  $password
-     * @param string  $resource
-     * @param string  $server
-     * @param boolean $printlog
-     * @param string  $loglevel
-     */
-    public function __construct($plugin, $host, $port, $user, $password, $resource, $server = null, $printlog = false, $loglevel = null)
-    {
-        $this->plugin = $plugin;
-
-        parent::__construct($host, $port, $user, $password, $resource, $server, $printlog, $loglevel);
-
-        // We use $host to connect, but $server to build JIDs if specified.
-        // This seems to fix an upstream bug where $host was used to build
-        // $this->basejid, never seen since it isn't actually used in the base
-        // classes.
-        if (!$server) {
-            $server = $this->host;
-        }
-        $this->basejid = $this->user . '@' . $server;
-
-        // Normally the fulljid is filled out by the server at resource binding
-        // time, but we need to do it since we're not talking to a real server.
-        $this->fulljid = "{$this->basejid}/{$this->resource}";
-    }
-
-    /**
-     * Send a formatted message to the outgoing queue for later forwarding
-     * to a real XMPP connection.
-     *
-     * @param string $msg
-     */
-    public function send($msg, $timeout=NULL)
-    {
-        $this->plugin->enqueue_outgoing_raw($msg);
-    }
-
-    //@{
-    /**
-     * Stream i/o functions disabled; only do output
-     */
-    public function connect($timeout = 30, $persistent = false, $sendinit = true)
-    {
-        throw new Exception("Can't connect to server from fake XMPP.");
-    }
-
-    public function disconnect()
-    {
-        throw new Exception("Can't connect to server from fake XMPP.");
-    }
-
-    public function process()
-    {
-        throw new Exception("Can't read stream from fake XMPP.");
-    }
-
-    public function processUntil($event, $timeout=-1)
-    {
-        throw new Exception("Can't read stream from fake XMPP.");
-    }
-
-    public function read()
-    {
-        throw new Exception("Can't read stream from fake XMPP.");
-    }
-
-    public function readyToProcess()
-    {
-        throw new Exception("Can't read stream from fake XMPP.");
-    }
-    //@}
-
-}
-
diff --git a/plugins/Msn/extlib/phpmsnclass/msn.class.php b/plugins/Msn/extlib/phpmsnclass/msn.class.php
index 36b47f8e9c..317acd0d53 100644
--- a/plugins/Msn/extlib/phpmsnclass/msn.class.php
+++ b/plugins/Msn/extlib/phpmsnclass/msn.class.php
@@ -25,14 +25,11 @@ class MSN {
     private $login_method = 'SSO';
     private $oim_send_url = 'https://ows.messenger.msn.com/OimWS/oim.asmx';
     private $oim_send_soap = 'http://messenger.live.com/ws/2006/09/oim/Store2';
-    private $windows;
-    private $kill_me = false;
     private $id;
     private $ticket;
     private $user = '';
     private $password = '';
     private $NSfp=false;
-    private $SBfp;
     private $passport_policy = '';
     private $alias;
     private $psm;
@@ -46,11 +43,10 @@ class MSN {
     private $ChildProcess=array();
     private $MAXChildProcess=3;
     private $ReqSBXFRTimeout=60;
-    private $SBTimeout=2;
     private $LastPing;
     private $ping_wait=50;
     private $SBIdleTimeout=10;
-    private $SBStreamTimeout=10;
+    private $SBStreamTimeout=2;
     private $NSStreamTimeout=2;
     private $MsnObjArray=array();
     private $MsnObjMap=array();
@@ -113,7 +109,10 @@ class MSN {
     
     private $aContactList = array();
     private $aADL = array();
+    private $re_login;
     private $switchBoardSessions = array();
+    private $switchBoardSockets = array();
+    private $waitingForXFR = array();
     
     /**
     * Event Handler Functions
@@ -121,6 +120,50 @@ class MSN {
     private $myEventHandlers = array();
     
     // End added for StatusNet
+    
+    public function __construct ($Configs=array(), $timeout = 15, $client_id = 0x7000800C)
+    {
+        $this->user = $Configs['user'];
+        $this->password = $Configs['password'];
+        $this->alias = isset($Configs['alias']) ? $Configs['alias'] : '';
+        $this->psm = isset($Configs['psm']) ? $Configs['psm'] : '';
+        $this->use_ping = isset($Configs['use_ping']) ? $Configs['use_ping'] : false;
+        $this->retry_wait = isset($Configs['retry_wait']) ? $Configs['retry_wait'] : 30;
+        $this->backup_file = isset($Configs['backup_file']) ? $Configs['backup_file'] : true;
+        $this->update_pending = isset($Configs['update_pending']) ? $Configs['update_pending'] : true;
+        $this->PhotoStickerFile=isset($Configs['PhotoSticker']) ? $Configs['PhotoSticker'] : false;
+        if($this->Emotions = isset($Configs['Emotions']) ? $Configs['Emotions']:false)
+        {
+            foreach($this->Emotions as $EmotionFilePath)
+                $this->MsnObj($EmotionFilePath,$Type=2);
+        }        
+        $this->debug = isset($Configs['debug']) ? $Configs['debug'] : false;
+        $this->timeout = $timeout;
+        // check support
+        if (!function_exists('curl_init')) throw new Exception("We need curl module!\n");
+        if (!function_exists('preg_match')) throw new Exception("We need pcre module!\n");
+        if (!function_exists('mhash')) throw new Exception("We need mhash module!\n");
+
+        if (!function_exists('mcrypt_cbc')) throw new Exception("We need mcrypt module!\n");
+        if (!function_exists('bcmod')) throw new Exception("We need bcmath module for $protocol!\n");
+
+        /*
+         http://msnpiki.msnfanatic.com/index.php/Client_ID
+         Client ID for MSN:
+         normal MSN 8.1 clientid is:
+         01110110 01001100 11000000 00101100
+         = 0x764CC02C
+
+         we just use following:
+         * 0x04: Your client can send/receive Ink (GIF format)
+         * 0x08: Your client can send/recieve Ink (ISF format)
+         * 0x8000: This means you support Winks receiving (If not set the official Client will warn with 'contact has an older client and is not capable of receiving Winks')
+         * 0x70000000: This is the value for MSNC7 (WL Msgr 8.1)
+         = 0x7000800C;
+         */
+        $this->clientid = $client_id;
+        $this->ABService=new SoapClient(realpath(dirname(__FILE__)).'/soap/msnab_sharingservice.wsdl',array('trace' => 1));
+    }
 
     private function Array2SoapVar($Array,$ReturnSoapVarObj=true,$TypeName=null,$TypeNameSpace=null)
     {
@@ -154,78 +197,16 @@ class MSN {
         if($ReturnSoapVarObj) return new SoapVar($ArrayString,XSD_ANYXML,$TypeName,$TypeNameSpace);
         return $ArrayString;
     }
-
-    public function End()
-    {
-        $this->log_message("*** someone kill me ***");
-        $this->kill_me=true;
-    }
-    private function IsIgnoreMail($Email)
-    {        
-        if($this->IgnoreList==false) return false;
-        foreach($this->IgnoreList as $Pattern)
-        {
-            if(preg_match($Pattern,$Email)) return true;
-        }
-        return false;
-    }
-    public function __construct ($Configs=array(), $timeout = 15, $client_id = 0x7000800C)
-    {
-        $this->user = $Configs['user'];
-        $this->password = $Configs['password'];
-        $this->alias = isset($Configs['alias']) ? $Configs['alias'] : '';
-        $this->psm = isset($Configs['psm']) ? $Configs['psm'] : '';
-        $my_add_function = isset($Configs['add_user_function']) ? $Configs['add_user_function'] : false;
-        $my_rem_function = isset($Configs['remove_user_function']) ? $Configs['remove_user_function'] : false;
-        $this->use_ping = isset($Configs['use_ping']) ? $Configs['use_ping'] : false;
-        $this->retry_wait = isset($Configs['retry_wait']) ? $Configs['retry_wait'] : 30;
-        $this->backup_file = isset($Configs['backup_file']) ? $Configs['backup_file'] : true;
-        $this->update_pending = isset($Configs['update_pending']) ? $Configs['update_pending'] : true;
-        $this->PhotoStickerFile=isset($Configs['PhotoSticker']) ? $Configs['PhotoSticker'] : false;
-        $this->IgnoreList=isset($Configs['IgnoreList'])?$Configs['IgnoreList']:false;
-        if($this->Emotions = isset($Configs['Emotions']) ? $Configs['Emotions']:false)
-        {
-            foreach($this->Emotions as $EmotionFilePath)
-            $this->MsnObj($EmotionFilePath,$Type=2);
-        }        
-        $this->debug = isset($Configs['debug']) ? $Configs['debug'] : false;
-        $this->timeout = $timeout;
-        // check support
-        if (!function_exists('curl_init')) throw new Exception("We need curl module!\n");
-        if (!function_exists('preg_match')) throw new Exception("We need pcre module!\n");
-        if (!function_exists('mhash')) throw new Exception("We need mhash module!\n");
-
-        if (!function_exists('mcrypt_cbc')) throw new Exception("We need mcrypt module!\n");
-        if (!function_exists('bcmod')) throw new Exception("We need bcmath module for $protocol!\n");
-
-        /*
-         http://msnpiki.msnfanatic.com/index.php/Client_ID
-         Client ID for MSN:
-         normal MSN 8.1 clientid is:
-         01110110 01001100 11000000 00101100
-         = 0x764CC02C
-
-         we just use following:
-         * 0x04: Your client can send/receive Ink (GIF format)
-         * 0x08: Your client can send/recieve Ink (ISF format)
-         * 0x8000: This means you support Winks receiving (If not set the official Client will warn with 'contact has an older client and is not capable of receiving Winks')
-         * 0x70000000: This is the value for MSNC7 (WL Msgr 8.1)
-         = 0x7000800C;
-         */
-        $this->clientid = $client_id;
-        $this->windows =(strtoupper(substr(PHP_OS, 0, 3)) === 'WIN');
-        $this->ABService=new SoapClient(realpath(dirname(__FILE__)).'/soap/msnab_sharingservice.wsdl',array('trace' => 1));
-    }
-
+    
     private function get_passport_ticket($url = '')
     {
         $user = $this->user;
         $password = htmlspecialchars($this->password);
 
         if ($url === '')
-        $passport_url = $this->passport_url;
+            $passport_url = $this->passport_url;
         else
-        $passport_url = $url;
+            $passport_url = $url;
 
         $XML = '<?xml version="1.0" encoding="UTF-8"?>
 <Envelope xmlns="http://schemas.xmlsoap.org/soap/envelope/"
@@ -449,78 +430,81 @@ class MSN {
         $this->ticket=$aTickets;
         $this->debug_message(var_export($aTickets, true));
         $ABAuthHeaderArray=array(
-  'ABAuthHeader'=>array(
-    ':'=>array('xmlns'=>'http://www.msn.com/webservices/AddressBook'),
-    'ManagedGroupRequest'=>false,
-    'TicketToken'=>htmlspecialchars($this->ticket['contact_ticket']),
-        )
+            'ABAuthHeader'=>array(
+                ':'=>array('xmlns'=>'http://www.msn.com/webservices/AddressBook'),
+                'ManagedGroupRequest'=>false,
+                'TicketToken'=>htmlspecialchars($this->ticket['contact_ticket']),
+            )
         );
         $this->ABAuthHeader=new SoapHeader("http://www.msn.com/webservices/AddressBook","ABAuthHeader", $this->Array2SoapVar($ABAuthHeaderArray));
-        file_put_contents('/tmp/STTicket.txt',htmlspecialchars($this->ticket['storage_ticket']));
-        //$this->debug_message("StorageTicket:\n",htmlspecialchars($this->ticket['storage_ticket']));
         return $aTickets;
     }
+    
     private function UpdateContacts()
     {
         $ABApplicationHeaderArray=array(
- 'ABApplicationHeader'=>array(
-  ':'=>array('xmlns'=>'http://www.msn.com/webservices/AddressBook'),
-  'ApplicationId'=>'CFE80F9D-180F-4399-82AB-413F33A1FA11',
-  'IsMigration'=>false,
-  'PartnerScenario'=>'ContactSave'
-  )
-  );
-  $ABApplicationHeader=new SoapHeader("http://www.msn.com/webservices/AddressBook",'ABApplicationHeader', $this->Array2SoapVar($ABApplicationHeaderArray));
-  $ABFindAllArray=array(
-   'ABFindAll'=>array(
-    ':'=>array('xmlns'=>'http://www.msn.com/webservices/AddressBook'),
-    'abId'=>'00000000-0000-0000-0000-000000000000',
-    'abView'=>'Full',
-    'lastChange'=>'0001-01-01T00:00:00.0000000-08:00',
-  )
-  );
-  $ABFindAll=new SoapParam($this->Array2SoapVar($ABFindAllArray),'ABFindAll');
-  $this->ABService->__setSoapHeaders(array($ABApplicationHeader,$this->ABAuthHeader));
-  $this->Contacts=array();
-  try
-  {
-      $this->debug_message("*** Update Contacts...");
-      $Result=$this->ABService->ABFindAll($ABFindAll);
-      $this->debug_message("*** Result:\n".print_r($Result,true)."\n".$this->ABService->__getLastResponse());
-      foreach($Result->ABFindAllResult->contacts->Contact as $Contact)
-      $this->Contacts[$Contact->contactInfo->passportName]=$Contact;
-  }
-  catch(Exception $e)
-  {
-      $this->debug_message("*** Update Contacts Error \nRequest:".$this->ABService->__getLastRequest()."\nError:".$e->getMessage());
-  }
+            'ABApplicationHeader'=>array(
+                ':'=>array('xmlns'=>'http://www.msn.com/webservices/AddressBook'),
+                'ApplicationId'=>'CFE80F9D-180F-4399-82AB-413F33A1FA11',
+                'IsMigration'=>false,
+                'PartnerScenario'=>'ContactSave'
+             )
+        );
+        
+        $ABApplicationHeader=new SoapHeader("http://www.msn.com/webservices/AddressBook",'ABApplicationHeader', $this->Array2SoapVar($ABApplicationHeaderArray));
+        $ABFindAllArray=array(
+            'ABFindAll'=>array(
+                ':'=>array('xmlns'=>'http://www.msn.com/webservices/AddressBook'),
+                'abId'=>'00000000-0000-0000-0000-000000000000',
+                'abView'=>'Full',
+                'lastChange'=>'0001-01-01T00:00:00.0000000-08:00',
+            )
+        );
+        $ABFindAll=new SoapParam($this->Array2SoapVar($ABFindAllArray),'ABFindAll');
+        $this->ABService->__setSoapHeaders(array($ABApplicationHeader,$this->ABAuthHeader));
+        $this->Contacts=array();
+        try
+        {
+            $this->debug_message("*** Update Contacts...");
+            $Result=$this->ABService->ABFindAll($ABFindAll);
+            $this->debug_message("*** Result:\n".print_r($Result,true)."\n".$this->ABService->__getLastResponse());
+            foreach($Result->ABFindAllResult->contacts->Contact as $Contact)
+                $this->Contacts[$Contact->contactInfo->passportName]=$Contact;
+        }
+        catch(Exception $e)
+        {
+            $this->debug_message("*** Update Contacts Error \nRequest:".$this->ABService->__getLastRequest()."\nError:".$e->getMessage());
+            return false;
+        }
+        return true;
     }
-    protected function addContact($email, $network, $display = '', $sendADL = false)
+    
+    private function addContact($email, $network, $display = '', $sendADL = false)
     {
         if ($network != 1) return true;
         if(isset($this->Contacts[$email])) return true;
 
         $ABContactAddArray=array(
-   'ABContactAdd'=>array(
-    ':'=>array('xmlns'=>'http://www.msn.com/webservices/AddressBook'),
-    'abId'=>'00000000-0000-0000-0000-000000000000',
-    'contacts'=>array(
-     'Contact'=>array(
-      ':'=>array('xmlns'=>'http://www.msn.com/webservices/AddressBook'),
-      'contactInfo'=>array(
-       'contactType'=>'LivePending',
-       'passportName'=>$email,
-       'isMessengerUser'=>true,
-       'MessengerMemberInfo'=>array(
-        'DisplayName'=>$email
-        )
-        )
-        )
-        ),
-    'options'=>array(
-     'EnableAllowListManagement'=>true
-        )
-        )
+            'ABContactAdd'=>array(
+                ':'=>array('xmlns'=>'http://www.msn.com/webservices/AddressBook'),
+                'abId'=>'00000000-0000-0000-0000-000000000000',
+                'contacts'=>array(
+                    'Contact'=>array(
+                        ':'=>array('xmlns'=>'http://www.msn.com/webservices/AddressBook'),
+                        'contactInfo'=>array(
+                            'contactType'=>'LivePending',
+                            'passportName'=>$email,
+                            'isMessengerUser'=>true,
+                            'MessengerMemberInfo'=>array(
+                                'DisplayName'=>$email
+                            )
+                        )
+                    )
+                ),
+                'options'=>array(
+                    'EnableAllowListManagement'=>true
+                )
+            )
         );
         $ABContactAdd=new SoapParam($this->Array2SoapVar($ABContactAddArray),'ABContactAdd');
         try
@@ -531,6 +515,7 @@ class MSN {
         catch(Exception $e)
         {
             $this->debug_message("*** Add Contacts Error \nRequest:".$this->ABService->__getLastRequest()."\nError:".$e->getMessage());
+            return false;
         }
         if ($sendADL && !feof($this->NSfp)) {
             @list($u_name, $u_domain) = @explode('@', $email);
@@ -552,7 +537,7 @@ class MSN {
         $user = $email;
         $ticket = htmlspecialchars($this->ticket['contact_ticket']);
         if ($network == 1)
-        $XML = '<?xml version="1.0" encoding="utf-8"?>
+            $XML = '<?xml version="1.0" encoding="utf-8"?>
 <soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/"
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns:xsd="http://www.w3.org/2001/XMLSchema"
@@ -591,7 +576,7 @@ class MSN {
 </soap:Body>
 </soap:Envelope>';
         else
-        $XML = '<?xml version="1.0" encoding="utf-8"?>
+            $XML = '<?xml version="1.0" encoding="utf-8"?>
 <soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/"
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns:xsd="http://www.w3.org/2001/XMLSchema"
@@ -634,41 +619,41 @@ class MSN {
             'SOAPAction: '.$this->delmember_soap,
             'Content-Type: text/xml; charset=utf-8',
             'User-Agent: MSN Explorer/9.0 (MSN 8.0; TmstmpExt)'
-            );
+        );
 
-            $this->debug_message("*** URL: $this->delmember_url");
-            $this->debug_message("*** Sending SOAP:\n$XML");
-            $curl = curl_init();
-            curl_setopt($curl, CURLOPT_URL, $this->delmember_url);
-            curl_setopt($curl, CURLOPT_HTTPHEADER, $header_array);
-            curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
-            curl_setopt($curl, CURLOPT_FOLLOWLOCATION, 1);
-            curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, 0);
-            if ($this->debug) curl_setopt($curl, CURLOPT_HEADER, 1);
-            curl_setopt($curl, CURLOPT_POST, 1);
-            curl_setopt($curl, CURLOPT_POSTFIELDS, $XML);
-            $data = curl_exec($curl);
-            $http_code = curl_getinfo($curl, CURLINFO_HTTP_CODE);
-            curl_close($curl);
-            $this->debug_message("*** Get Result:\n$data");
+        $this->debug_message("*** URL: $this->delmember_url");
+        $this->debug_message("*** Sending SOAP:\n$XML");
+        $curl = curl_init();
+        curl_setopt($curl, CURLOPT_URL, $this->delmember_url);
+        curl_setopt($curl, CURLOPT_HTTPHEADER, $header_array);
+        curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
+        curl_setopt($curl, CURLOPT_FOLLOWLOCATION, 1);
+        curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, 0);
+        if ($this->debug) curl_setopt($curl, CURLOPT_HEADER, 1);
+        curl_setopt($curl, CURLOPT_POST, 1);
+        curl_setopt($curl, CURLOPT_POSTFIELDS, $XML);
+        $data = curl_exec($curl);
+        $http_code = curl_getinfo($curl, CURLINFO_HTTP_CODE);
+        curl_close($curl);
+        $this->debug_message("*** Get Result:\n$data");
 
-            if ($http_code != 200) {
-                preg_match('#<faultcode>(.*)</faultcode><faultstring>(.*)</faultstring>#', $data, $matches);
-                if (count($matches) == 0) {
-                    $this->log_message("*** can't delete member (network: $network) $email ($memberID) to $list");
-                    return false;
-                }
-                $faultcode = trim($matches[1]);
-                $faultstring = trim($matches[2]);
-                if (strcasecmp($faultcode, 'soap:Client') || stripos($faultstring, 'Member does not exist') === false) {
-                    $this->log_message("*** can't delete member (network: $network) $email ($memberID) to $list, error code: $faultcode, $faultstring");
-                    return false;
-                }
-                $this->log_message("*** delete member (network: $network) $email ($memberID) from $list, not exist");
-                return true;
+        if ($http_code != 200) {
+            preg_match('#<faultcode>(.*)</faultcode><faultstring>(.*)</faultstring>#', $data, $matches);
+            if (count($matches) == 0) {
+                $this->log_message("*** can't delete member (network: $network) $email ($memberID) to $list");
+                return false;
             }
-            $this->log_message("*** delete member (network: $network) $email ($memberID) from $list");
+            $faultcode = trim($matches[1]);
+            $faultstring = trim($matches[2]);
+            if (strcasecmp($faultcode, 'soap:Client') || stripos($faultstring, 'Member does not exist') === false) {
+                $this->log_message("*** can't delete member (network: $network) $email ($memberID) to $list, error code: $faultcode, $faultstring");
+                return false;
+            }
+            $this->log_message("*** delete member (network: $network) $email ($memberID) from $list, not exist");
             return true;
+        }
+        $this->log_message("*** delete member (network: $network) $email ($memberID) from $list");
+        return true;
     }
 
     function addMemberToList($email, $network, $list) {
@@ -677,7 +662,7 @@ class MSN {
         $user = $email;
 
         if ($network == 1)
-        $XML = '<?xml version="1.0" encoding="utf-8"?>
+            $XML = '<?xml version="1.0" encoding="utf-8"?>
 <soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/"
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns:xsd="http://www.w3.org/2001/XMLSchema"
@@ -716,7 +701,7 @@ class MSN {
 </soap:Body>
 </soap:Envelope>';
         else
-        $XML = '<?xml version="1.0" encoding="utf-8"?>
+            $XML = '<?xml version="1.0" encoding="utf-8"?>
 <soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/"
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns:xsd="http://www.w3.org/2001/XMLSchema"
@@ -764,41 +749,41 @@ class MSN {
             'SOAPAction: '.$this->addmember_soap,
             'Content-Type: text/xml; charset=utf-8',
             'User-Agent: MSN Explorer/9.0 (MSN 8.0; TmstmpExt)'
-            );
+        );
 
-            $this->debug_message("*** URL: $this->addmember_url");
-            $this->debug_message("*** Sending SOAP:\n$XML");
-            $curl = curl_init();
-            curl_setopt($curl, CURLOPT_URL, $this->addmember_url);
-            curl_setopt($curl, CURLOPT_HTTPHEADER, $header_array);
-            curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
-            curl_setopt($curl, CURLOPT_FOLLOWLOCATION, 1);
-            curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, 0);
-            if ($this->debug) curl_setopt($curl, CURLOPT_HEADER, 1);
-            curl_setopt($curl, CURLOPT_POST, 1);
-            curl_setopt($curl, CURLOPT_POSTFIELDS, $XML);
-            $data = curl_exec($curl);
-            $http_code = curl_getinfo($curl, CURLINFO_HTTP_CODE);
-            curl_close($curl);
-            $this->debug_message("*** Get Result:\n$data");
+        $this->debug_message("*** URL: $this->addmember_url");
+        $this->debug_message("*** Sending SOAP:\n$XML");
+        $curl = curl_init();
+        curl_setopt($curl, CURLOPT_URL, $this->addmember_url);
+        curl_setopt($curl, CURLOPT_HTTPHEADER, $header_array);
+        curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
+        curl_setopt($curl, CURLOPT_FOLLOWLOCATION, 1);
+        curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, 0);
+        if ($this->debug) curl_setopt($curl, CURLOPT_HEADER, 1);
+        curl_setopt($curl, CURLOPT_POST, 1);
+        curl_setopt($curl, CURLOPT_POSTFIELDS, $XML);
+        $data = curl_exec($curl);
+        $http_code = curl_getinfo($curl, CURLINFO_HTTP_CODE);
+        curl_close($curl);
+        $this->debug_message("*** Get Result:\n$data");
 
-            if ($http_code != 200) {
-                preg_match('#<faultcode>(.*)</faultcode><faultstring>(.*)</faultstring>#', $data, $matches);
-                if (count($matches) == 0) {
-                    $this->log_message("*** can't add member (network: $network) $email to $list");
-                    return false;
-                }
-                $faultcode = trim($matches[1]);
-                $faultstring = trim($matches[2]);
-                if (strcasecmp($faultcode, 'soap:Client') || stripos($faultstring, 'Member already exists') === false) {
-                    $this->log_message("*** can't add member (network: $network) $email to $list, error code: $faultcode, $faultstring");
-                    return false;
-                }
-                $this->log_message("*** add member (network: $network) $email to $list, already exist!");
-                return true;
+        if ($http_code != 200) {
+            preg_match('#<faultcode>(.*)</faultcode><faultstring>(.*)</faultstring>#', $data, $matches);
+            if (count($matches) == 0) {
+                $this->log_message("*** can't add member (network: $network) $email to $list");
+                return false;
             }
-            $this->log_message("*** add member (network: $network) $email to $list");
+            $faultcode = trim($matches[1]);
+            $faultstring = trim($matches[2]);
+            if (strcasecmp($faultcode, 'soap:Client') || stripos($faultstring, 'Member already exists') === false) {
+                $this->log_message("*** can't add member (network: $network) $email to $list, error code: $faultcode, $faultstring");
+                return false;
+            }
+            $this->log_message("*** add member (network: $network) $email to $list, already exist!");
             return true;
+        }
+        $this->log_message("*** add member (network: $network) $email to $list");
+        return true;
     }
 
     function getMembershipList($returnData=false) {
@@ -837,102 +822,109 @@ class MSN {
             'SOAPAction: '.$this->membership_soap,
             'Content-Type: text/xml; charset=utf-8',
             'User-Agent: MSN Explorer/9.0 (MSN 8.0; TmstmpExt)'
-            );
-            $this->debug_message("*** URL: $this->membership_url");
-            $this->debug_message("*** Sending SOAP:\n$XML");
-            $curl = curl_init();
-            curl_setopt($curl, CURLOPT_URL, $this->membership_url);
-            curl_setopt($curl, CURLOPT_HTTPHEADER, $header_array);
-            curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
-            curl_setopt($curl, CURLOPT_FOLLOWLOCATION, 1);
-            curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, 0);
-            if ($this->debug) curl_setopt($curl, CURLOPT_HEADER, 1);
-            curl_setopt($curl, CURLOPT_POST, 1);
-            curl_setopt($curl, CURLOPT_POSTFIELDS, $XML);
-            $data = curl_exec($curl);
-            $http_code = curl_getinfo($curl, CURLINFO_HTTP_CODE);
-            curl_close($curl);
-            $this->debug_message("*** Get Result:\n$data");
-            if($http_code != 200) return array();
-            $p = $data;
-            $aMemberships = array();
+        );
+        $this->debug_message("*** URL: $this->membership_url");
+        $this->debug_message("*** Sending SOAP:\n$XML");
+        $curl = curl_init();
+        curl_setopt($curl, CURLOPT_URL, $this->membership_url);
+        curl_setopt($curl, CURLOPT_HTTPHEADER, $header_array);
+        curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
+        curl_setopt($curl, CURLOPT_FOLLOWLOCATION, 1);
+        curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, 0);
+        if ($this->debug) curl_setopt($curl, CURLOPT_HEADER, 1);
+        curl_setopt($curl, CURLOPT_POST, 1);
+        curl_setopt($curl, CURLOPT_POSTFIELDS, $XML);
+        $data = curl_exec($curl);
+        $http_code = curl_getinfo($curl, CURLINFO_HTTP_CODE);
+        curl_close($curl);
+        $this->debug_message("*** Get Result:\n$data");
+        if($http_code != 200) return false;
+        $p = $data;
+        $aMemberships = array();
+        while (1) {
+            //$this->debug_message("search p = $p");
+            $start = strpos($p, '<Membership>');
+            $end = strpos($p, '</Membership>');
+            if ($start === false || $end === false || $start > $end) break;
+            //$this->debug_message("start = $start, end = $end");
+            $end += 13;
+            $sMembership = substr($p, $start, $end - $start);
+            $aMemberships[] = $sMembership;
+            //$this->debug_message("add sMembership = $sMembership");
+            $p = substr($p, $end);
+        }
+        //$this->debug_message("aMemberships = ".var_export($aMemberships, true));
+
+        $aContactList = array();
+        foreach ($aMemberships as $sMembership) {
+            //$this->debug_message("sMembership = $sMembership");
+            if (isset($matches)) unset($matches);
+            preg_match('#<MemberRole>(.*)</MemberRole>#', $sMembership, $matches);
+            if (count($matches) == 0) continue;
+            $sMemberRole = $matches[1];
+            //$this->debug_message("MemberRole = $sMemberRole");
+            if ($sMemberRole != 'Allow' && $sMemberRole != 'Reverse' && $sMemberRole != 'Pending') continue;
+            $p = $sMembership;
+            if (isset($aMembers)) unset($aMembers);
+            $aMembers = array();
             while (1) {
                 //$this->debug_message("search p = $p");
-                $start = strpos($p, '<Membership>');
-                $end = strpos($p, '</Membership>');
+                $start = strpos($p, '<Member xsi:type="');
+                $end = strpos($p, '</Member>');
                 if ($start === false || $end === false || $start > $end) break;
                 //$this->debug_message("start = $start, end = $end");
-                $end += 13;
-                $sMembership = substr($p, $start, $end - $start);
-                $aMemberships[] = $sMembership;
-                //$this->debug_message("add sMembership = $sMembership");
+                $end += 9;
+                $sMember = substr($p, $start, $end - $start);
+                $aMembers[] = $sMember;
+                //$this->debug_message("add sMember = $sMember");
                 $p = substr($p, $end);
             }
-            //$this->debug_message("aMemberships = ".var_export($aMemberships, true));
-
-            $aContactList = array();
-            foreach ($aMemberships as $sMembership) {
-                //$this->debug_message("sMembership = $sMembership");
+            //$this->debug_message("aMembers = ".var_export($aMembers, true));
+            foreach ($aMembers as $sMember) {
+                //$this->debug_message("sMember = $sMember");
                 if (isset($matches)) unset($matches);
-                preg_match('#<MemberRole>(.*)</MemberRole>#', $sMembership, $matches);
+                preg_match('#<Member xsi\:type="([^"]*)">#', $sMember, $matches);
                 if (count($matches) == 0) continue;
-                $sMemberRole = $matches[1];
-                //$this->debug_message("MemberRole = $sMemberRole");
-                if ($sMemberRole != 'Allow' && $sMemberRole != 'Reverse' && $sMemberRole != 'Pending') continue;
-                $p = $sMembership;
-                if (isset($aMembers)) unset($aMembers);
-                $aMembers = array();
-                while (1) {
-                    //$this->debug_message("search p = $p");
-                    $start = strpos($p, '<Member xsi:type="');
-                    $end = strpos($p, '</Member>');
-                    if ($start === false || $end === false || $start > $end) break;
-                    //$this->debug_message("start = $start, end = $end");
-                    $end += 9;
-                    $sMember = substr($p, $start, $end - $start);
-                    $aMembers[] = $sMember;
-                    //$this->debug_message("add sMember = $sMember");
-                    $p = substr($p, $end);
+                $sMemberType = $matches[1];
+                //$this->debug_message("MemberType = $sMemberType");
+                $network = -1;
+                preg_match('#<MembershipId>(.*)</MembershipId>#', $sMember, $matches);
+                if (count($matches) == 0) continue;
+                $id = $matches[1];
+                if ($sMemberType == 'PassportMember') {
+                    if (strpos($sMember, '<Type>Passport</Type>') === false) continue;
+                    $network = 1;
+                    preg_match('#<PassportName>(.*)</PassportName>#', $sMember, $matches);
                 }
-                //$this->debug_message("aMembers = ".var_export($aMembers, true));
-                foreach ($aMembers as $sMember) {
-                    //$this->debug_message("sMember = $sMember");
-                    if (isset($matches)) unset($matches);
-                    preg_match('#<Member xsi\:type="([^"]*)">#', $sMember, $matches);
+                else if ($sMemberType == 'EmailMember') {
+                    if (strpos($sMember, '<Type>Email</Type>') === false) continue;
+                    // Value is 32: or 32:YAHOO
+                    preg_match('#<Annotation><Name>MSN.IM.BuddyType</Name><Value>(.*):(.*)</Value></Annotation>#', $sMember, $matches);
                     if (count($matches) == 0) continue;
-                    $sMemberType = $matches[1];
-                    //$this->debug_message("MemberType = $sMemberType");
-                    $network = -1;
-                    preg_match('#<MembershipId>(.*)</MembershipId>#', $sMember, $matches);
-                    if (count($matches) == 0) continue;
-                    $id = $matches[1];
-                    if ($sMemberType == 'PassportMember') {
-                        if (strpos($sMember, '<Type>Passport</Type>') === false) continue;
-                        $network = 1;
-                        preg_match('#<PassportName>(.*)</PassportName>#', $sMember, $matches);
-                    }
-                    else if ($sMemberType == 'EmailMember') {
-                        if (strpos($sMember, '<Type>Email</Type>') === false) continue;
-                        // Value is 32: or 32:YAHOO
-                        preg_match('#<Annotation><Name>MSN.IM.BuddyType</Name><Value>(.*):(.*)</Value></Annotation>#', $sMember, $matches);
-                        if (count($matches) == 0) continue;
-                        if ($matches[1] != 32) continue;
-                        $network = 32;
-                        preg_match('#<Email>(.*)</Email>#', $sMember, $matches);
-                    }
-                    if ($network == -1) continue;
-                    if (count($matches) > 0) {
-                        $email = $matches[1];
-                        @list($u_name, $u_domain) = @explode('@', $email);
-                        if ($u_domain == NULL) continue;
-                        $aContactList[$u_domain][$u_name][$network][$sMemberRole] = $id;
-                        $this->log_message("*** add new contact (network: $network, status: $sMemberRole): $u_name@$u_domain ($id)");
-                    }
+                    if ($matches[1] != 32) continue;
+                    $network = 32;
+                    preg_match('#<Email>(.*)</Email>#', $sMember, $matches);
+                }
+                if ($network == -1) continue;
+                if (count($matches) > 0) {
+                    $email = $matches[1];
+                    @list($u_name, $u_domain) = @explode('@', $email);
+                    if ($u_domain == NULL) continue;
+                    $aContactList[$u_domain][$u_name][$network][$sMemberRole] = $id;
+                    $this->log_message("*** add new contact (network: $network, status: $sMemberRole): $u_name@$u_domain ($id)");
                 }
             }
-            return $aContactList;
+        }
+        return $aContactList;
     }
 
+    /**
+     * Connect to the NS server
+     * @param $user Username
+     * @param $password Password
+     * @param $redirect_server Redirect server
+     * @param $redirect_port Redirect port
+     */
     private function connect($user, $password, $redirect_server = '', $redirect_port = 1863) {
         $this->id = 1;
         if ($redirect_server === '') {
@@ -1092,6 +1084,133 @@ class MSN {
         // never goto here
     }
 
+    /**
+     * Sign onto the NS server and retrieve the address book
+     */
+    public function signon() {
+        $this->log_message("*** try to connect to MSN network");
+        while(!$this->connect($this->user, $this->password))
+        {
+            $this->signonFailed("!!! Can't connect to server: $this->error");
+        }
+        if(!$this->UpdateContacts()) {
+            $this->signonFailed('!!! Could not update contacts');
+            return $this->signon();
+        }
+        $this->LastPing=time();
+        $this->log_message("*** connected, wait for command");
+        $start_tm = time();
+        $ping_tm = time();
+        if(($this->aContactList = $this->getMembershipList()) === false) {
+            $this->signonFailed('!!! Could not get Membership List');
+            return $this->signon();
+        }
+        if ($this->update_pending) {
+            if (is_array($this->aContactList)) {
+                $pending = 'Pending';
+                foreach ($this->aContactList as $u_domain => $aUserList) {
+                    foreach ($aUserList as $u_name => $aNetworks) {
+                        foreach ($aNetworks as $network => $aData) {
+                            if (isset($aData[$pending])) {
+                                // pending list
+                                $cnt = 0;
+                                foreach (array('Allow', 'Reverse') as $list) {
+                                    if (isset($aData[$list]))
+                                        $cnt++;
+                                    else {
+                                        if ($this->addMemberToList($u_name.'@'.$u_domain, $network, $list)) {
+                                            $this->aContactList[$u_domain][$u_name][$network][$list] = false;
+                                            $cnt++;
+                                        }
+                                    }
+                                }
+                                if ($cnt >= 2) {
+                                    $id = $aData[$pending];
+                                    // we can delete it from pending now
+                                    if ($this->delMemberFromList($id, $u_name.'@'.$u_domain, $network, $pending))
+                                        unset($this->aContactList[$u_domain][$u_name][$network][$pending]);
+                                }
+                            }
+                            else {
+                                // sync list
+                                foreach (array('Allow', 'Reverse') as $list) {
+                                    if (!isset($aData[$list])) {
+                                        if ($this->addMemberToList($u_name.'@'.$u_domain, $network, $list))
+                                            $this->aContactList[$u_domain][$u_name][$network][$list] = false;
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        $n = 0;
+        $sList = '';
+        $len = 0;
+        if (is_array($this->aContactList)) {
+            foreach ($this->aContactList as $u_domain => $aUserList) {
+                $str = '<d n="'.$u_domain.'">';
+                $len += strlen($str);
+                if ($len > 7400) {
+                    $this->aADL[$n] = '<ml l="1">'.$sList.'</ml>';
+                    $n++;
+                    $sList = '';
+                    $len = strlen($str);
+                }
+                $sList .= $str;
+                foreach ($aUserList as $u_name => $aNetworks) {
+                    foreach ($aNetworks as $network => $status) {
+                        $str = '<c n="'.$u_name.'" l="3" t="'.$network.'" />';
+                        $len += strlen($str);
+                        // max: 7500, but <ml l="1"></d></ml> is 19,
+                        // so we use 7475
+                        if ($len > 7475) {
+                            $sList .= '</d>';
+                            $this->aADL[$n] = '<ml l="1">'.$sList.'</ml>';
+                            $n++;
+                            $sList = '<d n="'.$u_domain.'">'.$str;
+                            $len = strlen($sList);
+                        }
+                        else
+                            $sList .= $str;
+                    }
+                }
+                $sList .= '</d>';
+            }
+        }
+        $this->aADL[$n] = '<ml l="1">'.$sList.'</ml>';
+        // NS: >>> BLP {id} BL
+        $this->ns_writeln("BLP $this->id BL");
+        foreach ($this->aADL as $str) {
+            $len = strlen($str);
+            // NS: >>> ADL {id} {size}
+            $this->ns_writeln("ADL $this->id $len");
+            $this->ns_writedata($str);
+        }
+        // NS: >>> PRP {id} MFN name
+        if ($this->alias == '') $this->alias = $user;
+        $aliasname = rawurlencode($this->alias);
+        $this->ns_writeln("PRP $this->id MFN $aliasname");
+        //設定個人大頭貼
+        //$MsnObj=$this->PhotoStckObj();
+        // NS: >>> CHG {id} {status} {clientid} {msnobj}
+        $this->ns_writeln("CHG $this->id NLN $this->clientid");
+        if($this->PhotoStickerFile!==false)
+            $this->ns_writeln("CHG $this->id NLN $this->clientid ".rawurlencode($this->MsnObj($this->PhotoStickerFile)));
+        // NS: >>> UUX {id} length
+        $str = '<Data><PSM>'.htmlspecialchars($this->psm).'</PSM><CurrentMedia></CurrentMedia><MachineGuid></MachineGuid></Data>';
+        $len = strlen($str);
+        $this->ns_writeln("UUX $this->id $len");
+        $this->ns_writedata($str);
+    }
+    
+    private function signonFailed($message) {
+        $this->log_message($message);
+        $this->callHandler('ConnectFailed', NULL);
+        $this->NSRetryWait($this->retry_wait);
+    }
+    
     function derive_key($key, $magic) {
         $hash1 = mhash(MHASH_SHA1, $magic, $key);
         $hash2 = mhash(MHASH_SHA1, $hash1.$magic, $key);
@@ -1148,36 +1267,36 @@ class MSN {
             'SOAPAction: '.$this->oim_maildata_soap,
             'Content-Type: text/xml; charset=utf-8',
             'User-Agent: Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1; Messenger '.$this->buildver.')'
-            );
+        );
 
-            $this->debug_message("*** URL: $this->oim_maildata_url");
-            $this->debug_message("*** Sending SOAP:\n$XML");
-            $curl = curl_init();
-            curl_setopt($curl, CURLOPT_URL, $this->oim_maildata_url);
-            curl_setopt($curl, CURLOPT_HTTPHEADER, $header_array);
-            curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
-            curl_setopt($curl, CURLOPT_FOLLOWLOCATION, 1);
-            curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, 0);
-            if ($this->debug) curl_setopt($curl, CURLOPT_HEADER, 1);
-            curl_setopt($curl, CURLOPT_POST, 1);
-            curl_setopt($curl, CURLOPT_POSTFIELDS, $XML);
-            $data = curl_exec($curl);
-            $http_code = curl_getinfo($curl, CURLINFO_HTTP_CODE);
-            curl_close($curl);
-            $this->debug_message("*** Get Result:\n$data");
+        $this->debug_message("*** URL: $this->oim_maildata_url");
+        $this->debug_message("*** Sending SOAP:\n$XML");
+        $curl = curl_init();
+        curl_setopt($curl, CURLOPT_URL, $this->oim_maildata_url);
+        curl_setopt($curl, CURLOPT_HTTPHEADER, $header_array);
+        curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
+        curl_setopt($curl, CURLOPT_FOLLOWLOCATION, 1);
+        curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, 0);
+        if ($this->debug) curl_setopt($curl, CURLOPT_HEADER, 1);
+        curl_setopt($curl, CURLOPT_POST, 1);
+        curl_setopt($curl, CURLOPT_POSTFIELDS, $XML);
+        $data = curl_exec($curl);
+        $http_code = curl_getinfo($curl, CURLINFO_HTTP_CODE);
+        curl_close($curl);
+        $this->debug_message("*** Get Result:\n$data");
 
-            if ($http_code != 200) {
-                $this->debug_message("*** Can't get OIM maildata! http code: $http_code");
-                return false;
-            }
+        if ($http_code != 200) {
+            $this->debug_message("*** Can't get OIM maildata! http code: $http_code");
+            return false;
+        }
 
-            // <GetMetadataResponse xmlns="http://www.hotmail.msn.com/ws/2004/09/oim/rsi">See #XML_Data</GetMetadataResponse>
-            preg_match('#<GetMetadataResponse([^>]*)>(.*)</GetMetadataResponse>#', $data, $matches);
-            if (count($matches) == 0) {
-                $this->debug_message("*** Can't get OIM maildata");
-                return '';
-            }
-            return $matches[2];
+        // <GetMetadataResponse xmlns="http://www.hotmail.msn.com/ws/2004/09/oim/rsi">See #XML_Data</GetMetadataResponse>
+        preg_match('#<GetMetadataResponse([^>]*)>(.*)</GetMetadataResponse>#', $data, $matches);
+        if (count($matches) == 0) {
+            $this->debug_message("*** Can't get OIM maildata");
+            return '';
+        }
+        return $matches[2];
     }
 
     function getOIM_message($msgid) {
@@ -1212,60 +1331,60 @@ class MSN {
             'SOAPAction: '.$this->oim_read_soap,
             'Content-Type: text/xml; charset=utf-8',
             'User-Agent: Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1; Messenger '.$this->buildver.')'
-            );
+        );
 
-            $this->debug_message("*** URL: $this->oim_read_url");
-            $this->debug_message("*** Sending SOAP:\n$XML");
-            $curl = curl_init();
-            curl_setopt($curl, CURLOPT_URL, $this->oim_read_url);
-            curl_setopt($curl, CURLOPT_HTTPHEADER, $header_array);
-            curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
-            curl_setopt($curl, CURLOPT_FOLLOWLOCATION, 1);
-            curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, 0);
-            if ($this->debug) curl_setopt($curl, CURLOPT_HEADER, 1);
-            curl_setopt($curl, CURLOPT_POST, 1);
-            curl_setopt($curl, CURLOPT_POSTFIELDS, $XML);
-            $data = curl_exec($curl);
-            $http_code = curl_getinfo($curl, CURLINFO_HTTP_CODE);
-            curl_close($curl);
-            $this->debug_message("*** Get Result:\n$data");
+        $this->debug_message("*** URL: $this->oim_read_url");
+        $this->debug_message("*** Sending SOAP:\n$XML");
+        $curl = curl_init();
+        curl_setopt($curl, CURLOPT_URL, $this->oim_read_url);
+        curl_setopt($curl, CURLOPT_HTTPHEADER, $header_array);
+        curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
+        curl_setopt($curl, CURLOPT_FOLLOWLOCATION, 1);
+        curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, 0);
+        if ($this->debug) curl_setopt($curl, CURLOPT_HEADER, 1);
+        curl_setopt($curl, CURLOPT_POST, 1);
+        curl_setopt($curl, CURLOPT_POSTFIELDS, $XML);
+        $data = curl_exec($curl);
+        $http_code = curl_getinfo($curl, CURLINFO_HTTP_CODE);
+        curl_close($curl);
+        $this->debug_message("*** Get Result:\n$data");
 
-            if ($http_code != 200) {
-                $this->debug_message("*** Can't get OIM: $msgid, http code = $http_code");
-                return false;
-            }
+        if ($http_code != 200) {
+            $this->debug_message("*** Can't get OIM: $msgid, http code = $http_code");
+            return false;
+        }
 
-            // why can't use preg_match('#<GetMessageResult>(.*)</GetMessageResult>#', $data, $matches)?
-            // multi-lines?
-            $start = strpos($data, '<GetMessageResult>');
-            $end = strpos($data, '</GetMessageResult>');
-            if ($start === false || $end === false || $start > $end) {
-                $this->debug_message("*** Can't get OIM: $msgid");
-                return false;
-            }
-            $lines = substr($data, $start + 18, $end - $start);
-            $aLines = @explode("\n", $lines);
-            $header = true;
-            $ignore = false;
-            $sOIM = '';
-            foreach ($aLines as $line) {
-                $line = rtrim($line);
-                if ($header) {
-                    if ($line === '') {
-                        $header = false;
-                        continue;
-                    }
+        // why can't use preg_match('#<GetMessageResult>(.*)</GetMessageResult>#', $data, $matches)?
+        // multi-lines?
+        $start = strpos($data, '<GetMessageResult>');
+        $end = strpos($data, '</GetMessageResult>');
+        if ($start === false || $end === false || $start > $end) {
+            $this->debug_message("*** Can't get OIM: $msgid");
+            return false;
+        }
+        $lines = substr($data, $start + 18, $end - $start);
+        $aLines = @explode("\n", $lines);
+        $header = true;
+        $ignore = false;
+        $sOIM = '';
+        foreach ($aLines as $line) {
+            $line = rtrim($line);
+            if ($header) {
+                if ($line === '') {
+                    $header = false;
                     continue;
                 }
-                // stop at empty lines
-                if ($line === '') break;
-                $sOIM .= $line;
+                continue;
             }
-            $sMsg = base64_decode($sOIM);
-            $this->debug_message("*** we get OIM ($msgid): $sMsg");
+            // stop at empty lines
+            if ($line === '') break;
+            $sOIM .= $line;
+        }
+        $sMsg = base64_decode($sOIM);
+        $this->debug_message("*** we get OIM ($msgid): $sMsg");
 
-            // delete OIM
-            $XML = '<?xml version="1.0" encoding="utf-8"?>
+        // delete OIM
+        $XML = '<?xml version="1.0" encoding="utf-8"?>
 <soap:Envelope xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xmlns:xsd="http://www.w3.org/2001/XMLSchema"
                xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/">
@@ -1284,33 +1403,33 @@ class MSN {
 </soap:Body>
 </soap:Envelope>';
 
-            $header_array = array(
+        $header_array = array(
             'SOAPAction: '.$this->oim_del_soap,
             'Content-Type: text/xml; charset=utf-8',
             'User-Agent: Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1; Messenger '.$this->buildver.')'
-            );
+        );
 
-            $this->debug_message("*** URL: $this->oim_del_url");
-            $this->debug_message("*** Sending SOAP:\n$XML");
-            $curl = curl_init();
-            curl_setopt($curl, CURLOPT_URL, $this->oim_del_url);
-            curl_setopt($curl, CURLOPT_HTTPHEADER, $header_array);
-            curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
-            curl_setopt($curl, CURLOPT_FOLLOWLOCATION, 1);
-            curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, 0);
-            if ($this->debug) curl_setopt($curl, CURLOPT_HEADER, 1);
-            curl_setopt($curl, CURLOPT_POST, 1);
-            curl_setopt($curl, CURLOPT_POSTFIELDS, $XML);
-            $data = curl_exec($curl);
-            $http_code = curl_getinfo($curl, CURLINFO_HTTP_CODE);
-            curl_close($curl);
-            $this->debug_message("*** Get Result:\n$data");
+        $this->debug_message("*** URL: $this->oim_del_url");
+        $this->debug_message("*** Sending SOAP:\n$XML");
+        $curl = curl_init();
+        curl_setopt($curl, CURLOPT_URL, $this->oim_del_url);
+        curl_setopt($curl, CURLOPT_HTTPHEADER, $header_array);
+        curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
+        curl_setopt($curl, CURLOPT_FOLLOWLOCATION, 1);
+        curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, 0);
+        if ($this->debug) curl_setopt($curl, CURLOPT_HEADER, 1);
+        curl_setopt($curl, CURLOPT_POST, 1);
+        curl_setopt($curl, CURLOPT_POSTFIELDS, $XML);
+        $data = curl_exec($curl);
+        $http_code = curl_getinfo($curl, CURLINFO_HTTP_CODE);
+        curl_close($curl);
+        $this->debug_message("*** Get Result:\n$data");
 
-            if ($http_code != 200)
+        if ($http_code != 200)
             $this->debug_message("*** Can't delete OIM: $msgid, http code = $http_code");
-            else
+        else
             $this->debug_message("*** OIM ($msgid) deleted");
-            return $sMsg;
+        return $sMsg;
     }
     private function NSLogout() {
         if (is_resource($this->NSfp) && !feof($this->NSfp)) {
@@ -1395,7 +1514,7 @@ class MSN {
                             }
                             if ($oim_result === false || $oim_result['auth_policy'] !== false)
                             {
-                                if ($re_login)
+                                if ($this->re_login)
                                 {
                                     $this->log_message("*** can't send OIM, but we already re-login again, so ignore this OIM");
                                     break;
@@ -1480,7 +1599,6 @@ class MSN {
                 $this->log_message("*** connected, wait for command");
                 $start_tm = time();
                 $ping_tm = time();
-                stream_set_timeout($this->NSfp, $this->NSStreamTimeout);
                     $aContactList = $this->getMembershipList();
                     if ($this->update_pending) {
                         if (is_array($aContactList)) {
@@ -1659,13 +1777,13 @@ class MSN {
                             $this->log_message("*** someone (network: $network) add us to their list (but already in our list): $u_name@$u_domain");
                             else
                             {
-                                $re_login = false;
+                                $this->re_login = false;
                                 $cnt = 0;
                                 foreach (array('Allow', 'Reverse') as $list)
                                 {
                                     if (!$this->addMemberToList($u_name.'@'.$u_domain, $network, $list))
                                     {
-                                        if ($re_login) {
+                                        if ($this->re_login) {
                                             $this->log_message("*** can't add $u_name@$u_domain (network: $network) to $list");
                                             continue;
                                         }
@@ -1676,7 +1794,7 @@ class MSN {
                                             $this->log_message("*** can't add $u_name@$u_domain (network: $network) to $list");
                                             continue;
                                         }
-                                        $re_login = true;
+                                        $this->re_login = true;
                                         $this->ticket = $aTickets;
                                         $this->log_message("**** get new ticket, try it again");
                                         if (!$this->addMemberToList($u_name.'@'.$u_domain, $network, $list))
@@ -1770,7 +1888,7 @@ class MSN {
                             $this->log_message("*** ingnore MSG not for OIM");
                             break;
                         }
-                        $re_login = false;
+                        $this->re_login = false;
                         if (strcasecmp($maildata, 'too-large') == 0) {
                             $this->log_message("*** large mail-data, need to get the data via SOAP");
                             $maildata = $this->getOIM_maildata();
@@ -1783,7 +1901,7 @@ class MSN {
                                     $this->log_message("*** can't re-login, something wrong here, ignore this OIM");
                                     break;
                                 }
-                                $re_login = true;
+                                $this->re_login = true;
                                 $this->ticket = $aTickets;
                                 $this->log_message("**** get new ticket, try it again");
                                 $maildata = $this->getOIM_maildata();
@@ -1849,7 +1967,7 @@ class MSN {
                             $sMsg = $this->getOIM_message($oim_msgid);
                             if ($sMsg === false) {
                                 $this->log_message("*** can't get OIM, msgid = $oim_msgid");
-                                if ($re_login) {
+                                if ($this->re_login) {
                                     $this->log_message("*** can't get OIM via SOAP, and we already re-login again, so ignore this OIM");
                                     continue;
                                 }
@@ -1859,7 +1977,7 @@ class MSN {
                                     $this->log_message("*** can't re-login, something wrong here, ignore this OIM");
                                     continue;
                                 }
-                                $re_login = true;
+                                $this->re_login = true;
                                 $this->ticket = $aTickets;
                                 $this->log_message("**** get new ticket, try it again");
                                 $sMsg = $this->getOIM_message($oim_msgid);
@@ -2069,30 +2187,6 @@ class MSN {
         return $this->NsLogout();
     }
 
-    /*public function SendMessage($Message, $To)
-    {
-        $FileName = MSN_CLASS_SPOOL_DIR.'/'.strftime('%Y%m%d%H%M%S',time()).'_'.posix_getpid().'_sendMessage.msn';
-        if(!is_array($To))
-        $To=array($To);
-        $Receiver='';
-        foreach($To as $Email)
-        {
-            list($name,$host,$network)=explode('@',$Email);
-            $network=$network==''?1:$network;
-            if($network==1 && $this->SwitchBoardProcess && $this->SwitchBoardSessionUser=="$name@$host" )
-            {
-                $this->debug_message("*** SendMessage to $Receiver use SB message queue.");
-                array_push($this->SwitchBoardMessageQueue,$Message);
-                continue;
-            }
-            $Receiver.="$name@$host@$network,";
-        }
-        if($Receiver=='') return;
-        $Receiver=substr($Receiver,0,-1);
-        $this->debug_message("*** SendMessage to $Receiver use File queue.");
-        file_put_contents($FileName,"TO: $Receiver\n$Message\n");
-    }*/
-
     function getChallenge($code)
     {
         // MSNP15
@@ -2190,9 +2284,9 @@ class MSN {
     {
         $SessionEnd=false;
         $Joined=false;
-        $id=1;
+        $this->id=1;
         $LastActive=time();
-        stream_set_timeout($this->SBFp, $this->SBTimeout);
+        stream_set_timeout($this->SBfp, $this->SBStreamTimeout);
         switch($Action)
         {
             case 'Active':
@@ -2200,8 +2294,7 @@ class MSN {
                 $user=$Param['user'];
                 $this->SwitchBoardMessageQueue=$Param['Msg'];
                 // SB: >>> USR {id} {user} {cki}
-                $this->SB_writeln("USR $id $this->user $cki_code");
-                $id++;
+                $this->SB_writeln("USR $this->id $this->user $cki_code");
                 $this->SwitchBoardSessionUser=$user;
                 break;
             case 'Passive':
@@ -2209,14 +2302,13 @@ class MSN {
                 $sid=$Param['sid'];
                 $user=$Param['user'];
                 // SB: >>> ANS {id} {user} {ticket} {session_id}
-                $this->SB_writeln("ANS $id $this->user $ticket $sid");
-                $id++;
+                $this->SB_writeln("ANS $this->id $this->user $ticket $sid");
                 $this->SwitchBoardSessionUser=$user;
                 break;
             default:
                 return false;
         }
-        while((!feof($this->SBFp))&&(!$SessionEnd))
+        while((!feof($this->SBfp))&&(!$SessionEnd))
         {
             $data = $this->SB_readln();
             if($this->kill_me)
@@ -2242,14 +2334,12 @@ class MSN {
                     {
                         $SendString="MIME-Version: 1.0\r\nContent-Type: text/x-mms-emoticon\r\n\r\n$MsnObjDefine";
                         $len = strlen($SendString);
-                        $this->SB_writeln("MSG $id N $len");
-                        $id++;
+                        $this->SB_writeln("MSG $this->id N $len");
                         $this->SB_writedata($SendString);
                         $this->id++;
                     }
                     $len = strlen($aMessage);
-                    $this->SB_writeln("MSG $id N $len");
-                    $id++;
+                    $this->SB_writeln("MSG $this->id N $len");
                     $this->SB_writedata($aMessage);
                 }
                 $this->SwitchBoardMessageQueue=array();
@@ -2274,8 +2364,7 @@ class MSN {
                     // we don't need the data, just ignore it
                     // request user to join this switchboard
                     // SB: >>> CAL {id} {user}
-                    $this->SB_writeln("CAL $id $user");
-                    $id++;
+                    $this->SB_writeln("CAL $this->id $user");
                     break;
                 case 'CAL':
                     // SB: <<< CAL {id} RINGING {?}
@@ -2431,8 +2520,7 @@ class MSN {
                             $footer = pack("L", 0);
                             $message = "MIME-Version: 1.0\r\nContent-Type: application/x-msnmsgrp2p\r\nP2P-Dest: $from_email\r\n\r\n$hdr$footer";
                             $len = strlen($message);
-                            $this->SB_writeln("MSG $id D $len");
-                            $id++;
+                            $this->SB_writeln("MSG $this->id D $len");
                             $this->SB_writedata($message);
                             $this->log_message("*** p2p: send display picture acknowledgement for $hdr_SessionID");
                             $this->debug_message("*** p2p: Invite ACK message:\n".$this->dump_binary($message));                            
@@ -2468,8 +2556,7 @@ class MSN {
                                 "MIME-Version: 1.0\r\n".
                                 "Content-Type: application/x-msnmsgrp2p\r\n".
                                 "P2P-Dest: $from_email\r\n\r\n$hdr$MessagePayload$footer";
-                            $this->SB_writeln("MSG $id D ".strlen($message));
-                            $id++;
+                            $this->SB_writeln("MSG $this->id D ".strlen($message));
                             $this->SB_writedata($message);
                             $this->debug_message("*** p2p: dump 200 ok message:\n".$this->dump_binary($message));
                             $this->SB_readln();//Read ACK;
@@ -2494,8 +2581,7 @@ class MSN {
                                 "MIME-Version: 1.0\r\n".
                                 "Content-Type: application/x-msnmsgrp2p\r\n".
                                 "P2P-Dest: $from_email\r\n\r\n$hdr".pack('L',0)."$footer";
-                            $this->SB_writeln("MSG $id D ".strlen($message));
-                            $id++;
+                            $this->SB_writeln("MSG $this->id D ".strlen($message));
                             $this->SB_writedata($message);
                             $this->debug_message("*** p2p: dump send Data preparation message:\n".$this->dump_binary($message));
                             $this->debug_message("*** p2p: Data Prepare Hdr:\n".$this->dump_binary($hdr));
@@ -2528,8 +2614,7 @@ class MSN {
                                         "MIME-Version: 1.0\r\n".
                                         "Content-Type: application/x-msnmsgrp2p\r\n".
                                         "P2P-Dest: $from_email\r\n\r\n$hdr$FileContent$footer";
-                                    $this->SB_writeln("MSG $id D ".strlen($message));
-                                    $id++;
+                                    $this->SB_writeln("MSG $this->id D ".strlen($message));
                                     $this->SB_writedata($message);
                                     $this->debug_message("*** p2p: dump send Data Content message  $Offset / $FileSize :\n".$this->dump_binary($message));
                                     $this->debug_message("*** p2p: Data Content Hdr:\n".$this->dump_binary($hdr));
@@ -2651,22 +2736,22 @@ class MSN {
             }
             if(!$this->IsIgnoreMail($user)) $LastActive = time();
         }
-        if (feof($this->SBFp))
+        if (feof($this->SBfp))
         {
             // lost connection? error? try OIM later
-            @fclose($this->SBFp);
+            @fclose($this->SBfp);
             return false;
         }
         $this->SB_writeln("OUT");
-        @fclose($this->SBFp);
+        @fclose($this->SBfp);
         return true;
     }
-    private function switchboard_control($ip, $port, $cki_code, $user, $Messages)
+    /*private function switchboard_control($ip, $port, $cki_code, $user, $Messages)
     {
         $this->SwitchBoardProcess=1;
         $this->debug_message("*** SB: try to connect to switchboard server $ip:$port");
-        $this->SBFp = @fsockopen($ip, $port, $errno, $errstr, 5);
-        if (!$this->SBFp)
+        $this->SBfp = @fsockopen($ip, $port, $errno, $errstr, 5);
+        if (!$this->SBfp)
         {
             $this->debug_message("*** SB: Can't connect to $ip:$port, error => $errno, $errstr");
             return false;
@@ -2677,119 +2762,14 @@ class MSN {
     {
         $this->SwitchBoardProcess=2;
         $this->debug_message("*** SB: try to connect to switchboard server $ip:$port");
-        $this->SBFp = @fsockopen($ip, $port, $errno, $errstr, 5);
-        if (!$this->SBFp)
+        $this->SBfp = @fsockopen($ip, $port, $errno, $errstr, 5);
+        if (!$this->SBfp)
         {
             $this->debug_message("*** SB: Can't connect to $ip:$port, error => $errno, $errstr");
             return false;
         }
         return $this->DoSwitchBoard('Passive',array('sid'=>$sid,'user'=>$user,'ticket'=>$ticket));
-    }
-
-    private function sendOIM($to, $sMessage, $lockkey)
-    {
-        $XML = '<?xml version="1.0" encoding="utf-8"?>
-<soap:Envelope xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-               xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-               xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/">
-<soap:Header>
-  <From memberName="'.$this->user.'"
-        friendlyName="=?utf-8?B?'.base64_encode($this->user).'?="
-        xml:lang="zh-TW"
-        proxy="MSNMSGR"
-        xmlns="http://messenger.msn.com/ws/2004/09/oim/"
-        msnpVer="'.$this->protocol.'"
-        buildVer="'.$this->buildver.'"/>
-  <To memberName="'.$to.'" xmlns="http://messenger.msn.com/ws/2004/09/oim/"/>
-  <Ticket passport="'.htmlspecialchars($this->ticket['oim_ticket']).'"
-          appid="'.$this->prod_id.'"
-          lockkey="'.$lockkey.'"
-          xmlns="http://messenger.msn.com/ws/2004/09/oim/"/>
-  <Sequence xmlns="http://schemas.xmlsoap.org/ws/2003/03/rm">
-    <Identifier xmlns="http://schemas.xmlsoap.org/ws/2002/07/utility">http://messenger.msn.com</Identifier>
-    <MessageNumber>1</MessageNumber>
-  </Sequence>
-</soap:Header>
-<soap:Body>
-  <MessageType xmlns="http://messenger.msn.com/ws/2004/09/oim/">text</MessageType>
-  <Content xmlns="http://messenger.msn.com/ws/2004/09/oim/">MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: base64
-X-OIM-Message-Type: OfflineMessage
-X-OIM-Run-Id: {DAB68CFA-38C9-449B-945E-38AFA51E50A7}
-X-OIM-Sequence-Num: 1
-
-'.chunk_split(base64_encode($sMessage)).'
-  </Content>
-</soap:Body>
-</soap:Envelope>';
-
-        $header_array = array(
-            'SOAPAction: '.$this->oim_send_soap,
-            'Content-Type: text/xml',
-            'User-Agent: Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1; Messenger '.$this->buildver.')'
-            );
-
-            $this->debug_message("*** URL: $this->oim_send_url");
-            $this->debug_message("*** Sending SOAP:\n$XML");
-            $curl = curl_init();
-            curl_setopt($curl, CURLOPT_URL, $this->oim_send_url);
-            curl_setopt($curl, CURLOPT_HTTPHEADER, $header_array);
-            curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
-            curl_setopt($curl, CURLOPT_FOLLOWLOCATION, 1);
-            curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, 0);
-            if ($this->debug) curl_setopt($curl, CURLOPT_HEADER, 1);
-            curl_setopt($curl, CURLOPT_POST, 1);
-            curl_setopt($curl, CURLOPT_POSTFIELDS, $XML);
-            $data = curl_exec($curl);
-            $http_code = curl_getinfo($curl, CURLINFO_HTTP_CODE);
-            curl_close($curl);
-            $this->debug_message("*** Get Result:\n$data");
-
-            if ($http_code == 200) {
-                $this->debug_message("*** OIM sent for $to");
-                return true;
-            }
-
-            $challenge = false;
-            $auth_policy = false;
-            // the lockkey is invalid, authenticated fail, we need challenge it again
-            // <LockKeyChallenge xmlns="http://messenger.msn.com/ws/2004/09/oim/">364763969</LockKeyChallenge>
-            preg_match("#<LockKeyChallenge (.*)>(.*)</LockKeyChallenge>#", $data, $matches);
-            if (count($matches) != 0) {
-                // yes, we get new LockKeyChallenge
-                $challenge = $matches[2];
-                $this->debug_message("*** OIM need new challenge ($challenge) for $to");
-            }
-            // auth policy error
-            // <RequiredAuthPolicy xmlns="http://messenger.msn.com/ws/2004/09/oim/">MBI_SSL</RequiredAuthPolicy>
-            preg_match("#<RequiredAuthPolicy (.*)>(.*)</RequiredAuthPolicy>#", $data, $matches);
-            if (count($matches) != 0) {
-                $auth_policy = $matches[2];
-                $this->debug_message("*** OIM need new auth policy ($auth_policy) for $to");
-            }
-            if ($auth_policy === false && $challenge === false) {
-                //<faultcode xmlns:q0="http://messenger.msn.com/ws/2004/09/oim/">q0:AuthenticationFailed</faultcode>
-                preg_match("#<faultcode (.*)>(.*)</faultcode>#", $data, $matches);
-                if (count($matches) == 0) {
-                    // no error, we assume the OIM is sent
-                    $this->debug_message("*** OIM sent for $to");
-                    return true;
-                }
-                $err_code = $matches[2];
-                //<faultstring>Exception of type 'System.Web.Services.Protocols.SoapException' was thrown.</faultstring>
-                preg_match("#<faultstring>(.*)</faultstring>#", $data, $matches);
-                if (count($matches) > 0)
-                $err_msg = $matches[1];
-                else
-                $err_msg = '';
-                $this->debug_message("*** OIM failed for $to");
-                $this->debug_message("*** OIM Error code: $err_code");
-                $this->debug_message("*** OIM Error Message: $err_msg");
-                return false;
-            }
-            return array('challenge' => $challenge, 'auth_policy' => $auth_policy);
-    }
+    }*/
 
     // read data for specified size
     private function ns_readdata($size) {
@@ -2831,11 +2811,11 @@ X-OIM-Sequence-Num: 1
     }
 
     // read data for specified size for SB
-    private function sb_readdata($size) {
+    private function sb_readdata($socket, $size) {
         $data = '';
         $count = 0;
-        while (!feof($this->SBFp)) {
-            $buf = @fread($this->SBFp, $size - $count);
+        while (!feof($this->SBfp)) {
+            $buf = @fread($this->SBfp, $size - $count);
             $data .= $buf;
             $count += strlen($buf);
             if ($count >= $size) break;
@@ -2845,8 +2825,8 @@ X-OIM-Sequence-Num: 1
     }
 
     // read one line for SB
-    private function sb_readln() {
-        $data = @fgets($this->SBFp, 4096);
+    private function sb_readln($socket) {
+        $data = @fgets($socket, 4096);
         if ($data !== false) {
             $data = trim($data);
             $this->debug_message("SB: <<< $data");
@@ -2856,16 +2836,16 @@ X-OIM-Sequence-Num: 1
 
     // write to server for SB, append \r\n, also increase id
     // switchboard server only accept \r\n, it will lost connection if just \n only
-    private function sb_writeln($data) {
-        @fwrite($this->SBFp, $data."\r\n");
+    private function sb_writeln($socket, &$id, $data) {
+        @fwrite($socket, $data."\r\n");
         $this->debug_message("SB: >>> $data");
-        $this->id++;
+        $id++;
         return;
     }
 
     // write data to server
-    private function sb_writedata($data) {
-        @fwrite($this->SBFp, $data);
+    private function sb_writedata($socket, $data) {
+        @fwrite($socket, $data);
         $this->debug_message("SB: >>> $data");
         return;
     }
@@ -2943,6 +2923,7 @@ X-OIM-Sequence-Num: 1
         $this->debug_message("*** p2p: addMsnObj $FilePath::$MsnObj\n");
         return $MsnObj;
     }
+    
     private function linetoArray($lines) {
         $lines=str_replace("\r",'',$lines);
         $lines=explode("\n",$lines);
@@ -2953,6 +2934,7 @@ X-OIM-Sequence-Num: 1
         }
         return $Data;
     }
+    
     private function GetPictureFilePath($Context)
     {
         $MsnObj=base64_decode($Context);
@@ -2963,6 +2945,7 @@ X-OIM-Sequence-Num: 1
         return $this->MsnObjArray[$location];
         return false;
     }
+    
     private function GetMsnObjDefine($Message)
     {
         $DefineString='';
@@ -2974,154 +2957,16 @@ X-OIM-Sequence-Num: 1
         }
         return $DefineString;
     }
-    /**
-     * Receive Message Overload Function
-     * @param $Sender
-     * @param $Message
-     * @param $Network   1 => msn , 32 =>yahoo
-     * @param $IsOIM
-     * @return unknown_type
-     */
-    protected function ReceivedMessage($Sender,$Message,$Network,$IsOIM=false){}
-    /**
-     * Remove Us From Member List Overload Function
-     * @param $User
-     * @param $Message
-     * @param $Network   1 => msn , 32 =>yahoo
-     * @return unknown_type
-     */
-    protected function RemoveUsFromMemberList($User,$Network){}
-    /**
-     * Add Us to Member List Overload Function
-     * @param $User
-     * @param $Message
-     * @param $Network   1 => msn , 32 =>yahoo
-     * @return unknown_type
-     */
-    protected function AddUsToMemberList($User,$Network){}
     
-    public function signon() {
-        $this->log_message("*** try to connect to MSN network");
-        while(!$this->connect($this->user, $this->password))
-        {
-            $this->log_message("!!! Can't connect to server: $this->error");
-            $this->callHandler('ConnectFailed', NULL);
-            $this->NSRetryWait($this->retry_wait);
-        }
-        $this->UpdateContacts();
-        $this->LastPing=time();
-        $this->log_message("*** connected, wait for command");
-        $start_tm = time();
-        $ping_tm = time();
-        stream_set_timeout($this->NSfp, $this->NSStreamTimeout);
-        $this->aContactList = $this->getMembershipList();
-        if ($this->update_pending) {
-            if (is_array($this->aContactList)) {
-                $pending = 'Pending';
-                foreach ($this->aContactList as $u_domain => $aUserList) {
-                    foreach ($aUserList as $u_name => $aNetworks) {
-                        foreach ($aNetworks as $network => $aData) {
-                            if (isset($aData[$pending])) {
-                                // pending list
-                                $cnt = 0;
-                                foreach (array('Allow', 'Reverse') as $list) {
-                                    if (isset($aData[$list]))
-                                    $cnt++;
-                                    else {
-                                        if ($this->addMemberToList($u_name.'@'.$u_domain, $network, $list)) {
-                                            $this->aContactList[$u_domain][$u_name][$network][$list] = false;
-                                            $cnt++;
-                                        }
-                                    }
-                                }
-                                if ($cnt >= 2) {
-                                    $id = $aData[$pending];
-                                    // we can delete it from pending now
-                                    if ($this->delMemberFromList($id, $u_name.'@'.$u_domain, $network, $pending))
-                                    unset($this->aContactList[$u_domain][$u_name][$network][$pending]);
-                                }
-                            }
-                            else {
-                                // sync list
-                                foreach (array('Allow', 'Reverse') as $list) {
-                                    if (!isset($aData[$list])) {
-                                        if ($this->addMemberToList($u_name.'@'.$u_domain, $network, $list))
-                                        $this->aContactList[$u_domain][$u_name][$network][$list] = false;
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        $n = 0;
-        $sList = '';
-        $len = 0;
-        if (is_array($this->aContactList)) {
-            foreach ($this->aContactList as $u_domain => $aUserList) {
-                $str = '<d n="'.$u_domain.'">';
-                $len += strlen($str);
-                if ($len > 7400) {
-                    $this->aADL[$n] = '<ml l="1">'.$sList.'</ml>';
-                    $n++;
-                    $sList = '';
-                    $len = strlen($str);
-                }
-                $sList .= $str;
-                foreach ($aUserList as $u_name => $aNetworks) {
-                    foreach ($aNetworks as $network => $status) {
-                        $str = '<c n="'.$u_name.'" l="3" t="'.$network.'" />';
-                        $len += strlen($str);
-                        // max: 7500, but <ml l="1"></d></ml> is 19,
-                        // so we use 7475
-                        if ($len > 7475) {
-                            $sList .= '</d>';
-                            $this->aADL[$n] = '<ml l="1">'.$sList.'</ml>';
-                            $n++;
-                            $sList = '<d n="'.$u_domain.'">'.$str;
-                            $len = strlen($sList);
-                        }
-                        else
-                        $sList .= $str;
-                    }
-                }
-                $sList .= '</d>';
-            }
-        }
-        $this->aADL[$n] = '<ml l="1">'.$sList.'</ml>';
-        // NS: >>> BLP {id} BL
-        $this->ns_writeln("BLP $this->id BL");
-        foreach ($this->aADL as $str) {
-            $len = strlen($str);
-            // NS: >>> ADL {id} {size}
-            $this->ns_writeln("ADL $this->id $len");
-            $this->ns_writedata($str);
-        }
-        // NS: >>> PRP {id} MFN name
-        if ($this->alias == '') $this->alias = $user;
-        $aliasname = rawurlencode($this->alias);
-        $this->ns_writeln("PRP $this->id MFN $aliasname");
-        //設定個人大頭貼
-        //$MsnObj=$this->PhotoStckObj();
-        // NS: >>> CHG {id} {status} {clientid} {msnobj}
-        $this->ns_writeln("CHG $this->id NLN $this->clientid");
-        if($this->PhotoStickerFile!==false)
-            $this->ns_writeln("CHG $this->id NLN $this->clientid ".rawurlencode($this->MsnObj($this->PhotoStickerFile)));
-        // NS: >>> UUX {id} length
-        $str = '<Data><PSM>'.htmlspecialchars($this->psm).'</PSM><CurrentMedia></CurrentMedia><MachineGuid></MachineGuid></Data>';
-        $len = strlen($str);
-        $this->ns_writeln("UUX $this->id $len");
-        $this->ns_writedata($str);
-    }
-    
-    public function NSreceive() {
-        $this->log_message("*** startup ***");
-        
+    /**
+     * Read and handle incoming command from NS
+     */
+    public function nsReceive() {
         // Sign in again if not signed in or socket failed
         if (!is_resource($this->NSfp) || feof($this->NSfp)) {
             $this->callHandler('Reconnect', NULL);
             $this->signon();
+            return;
         }
         
         $data = $this->ns_readln();
@@ -3178,13 +3023,13 @@ X-OIM-Sequence-Num: 1
                             $this->log_message("*** someone (network: $network) add us to their list (but already in our list): $u_name@$u_domain");
                             else
                             {
-                                $re_login = false;
+                                $this->re_login = false;
                                 $cnt = 0;
                                 foreach (array('Allow', 'Reverse') as $list)
                                 {
                                     if (!$this->addMemberToList($u_name.'@'.$u_domain, $network, $list))
                                     {
-                                        if ($re_login) {
+                                        if ($this->re_login) {
                                             $this->log_message("*** can't add $u_name@$u_domain (network: $network) to $list");
                                             continue;
                                         }
@@ -3195,7 +3040,7 @@ X-OIM-Sequence-Num: 1
                                             $this->log_message("*** can't add $u_name@$u_domain (network: $network) to $list");
                                             continue;
                                         }
-                                        $re_login = true;
+                                        $this->re_login = true;
                                         $this->ticket = $aTickets;
                                         $this->log_message("**** get new ticket, try it again");
                                         if (!$this->addMemberToList($u_name.'@'.$u_domain, $network, $list))
@@ -3289,7 +3134,7 @@ X-OIM-Sequence-Num: 1
                             $this->log_message("*** ingnore MSG not for OIM");
                             break;
                         }
-                        $re_login = false;
+                        $this->re_login = false;
                         if (strcasecmp($maildata, 'too-large') == 0) {
                             $this->log_message("*** large mail-data, need to get the data via SOAP");
                             $maildata = $this->getOIM_maildata();
@@ -3302,7 +3147,7 @@ X-OIM-Sequence-Num: 1
                                     $this->log_message("*** can't re-login, something wrong here, ignore this OIM");
                                     break;
                                 }
-                                $re_login = true;
+                                $this->re_login = true;
                                 $this->ticket = $aTickets;
                                 $this->log_message("**** get new ticket, try it again");
                                 $maildata = $this->getOIM_maildata();
@@ -3368,7 +3213,7 @@ X-OIM-Sequence-Num: 1
                             $sMsg = $this->getOIM_message($oim_msgid);
                             if ($sMsg === false) {
                                 $this->log_message("*** can't get OIM, msgid = $oim_msgid");
-                                if ($re_login) {
+                                if ($this->re_login) {
                                     $this->log_message("*** can't get OIM via SOAP, and we already re-login again, so ignore this OIM");
                                     continue;
                                 }
@@ -3378,7 +3223,7 @@ X-OIM-Sequence-Num: 1
                                     $this->log_message("*** can't re-login, something wrong here, ignore this OIM");
                                     continue;
                                 }
-                                $re_login = true;
+                                $this->re_login = true;
                                 $this->ticket = $aTickets;
                                 $this->log_message("**** get new ticket, try it again");
                                 $sMsg = $this->getOIM_message($oim_msgid);
@@ -3590,23 +3435,87 @@ X-OIM-Sequence-Num: 1
         }
     }
     
-    public function sendMessageViaSB($message, $to) {
+    /**
+     * Read and handle incoming command/message from
+     * a switchboard session socket
+     */
+    public function sbReceive() {
+        
+    }
+
+    /**
+     * Send a request for a switchboard session
+     * @param $to Target email for switchboard session
+     */
+    private function reqSBSession($to) {
+        $this->log_message("*** Request SB for $to");
+        $this->ns_writeln("XFR $this->id SB");
+        
+        // Add to the queue of those waiting for a switchboard session reponse
+        $this->switchBoardSessions[$to] = array('socket' => NULL, 'id' => 1, 'lastActive' => NULL, 'joined' => false, 'XFRReqTime' => time());
+        $this->waitingForXFR[] = &$this->switchBoardSessions[$to];
+    }
+    
+    /**
+     * Following an XFR or RNG, connect to the switchboard session
+     * @param $mode Mode, either 'Active' (in the case of XFR) or 'Passive' (in the case or RNG)
+     * @param $ip IP of Switchboard
+     * @param $port Port of Switchboard
+     * @param $to User on other end of Switchboard
+     * @param $param Array of parameters - 'cki', 'ticket', 'sid'
+     * @return Whether successful
+     */
+    private function connectToSBSession($mode, $ip, $port, $to, $param) {
+        $this->debug_message("*** SB: try to connect to switchboard server $ip:$port");
+        
+        $this->switchBoardSessions[$to]['socket'] = @fsockopen($ip, $port, $errno, $errstr, 5);
         $socket = $this->switchBoardSessions[$to]['socket'];
-        $lastActive = $this->switchBoardSessions[$to]['lastActive'];
-        $joined = $this->switchBoardSessions[$to]['joined'];
-        
-        //FIXME Probably not needed (we're not running in a loop anymore)
-        /*if($this->kill_me)
-        {
-            $this->log_message("*** SB Okay, kill me now!");
-            endSBSession($socket);
-        }*/
-        
-        if(!$Joined) {
-            // If our participant has not joined the session yet we can't message them!
-            //TODO Check the behaviour of the queue runner when we return false
+        if(!$socket) {
+            $this->debug_message("*** SB: Can't connect to $ip:$port, error => $errno, $errstr");
             return false;
         }
+        $this->switchBoardSockets[$socket] = $socket;
+        
+        stream_set_timeout($socket, $this->SBStreamTimeout);
+        
+        $id = &$this->switchBoardSessions[$to]['id'];
+        
+        if($mode == 'Active') {
+            $cki_code = $param['cki'];
+            
+            // SB: >>> USR {id} {user} {cki}
+            $this->sb_writeln($socket, $id, "USR $id $this->user $cki_code");
+        } else {
+            // Passive
+            $ticket = $param['ticket'];
+            $sid = $param['sid'];
+            
+            // SB: >>> ANS {id} {user} {ticket} {session_id}
+            $this->sb_writeln($socket, $id, "ANS $id $this->user $ticket $sid");
+        }
+        
+        $this->switchBoardSessions[$to]['lastActive'] = time();
+    }
+    
+    /**
+     * Send a message via an existing SB session
+     * @param $message Message
+     * @param $to Recipient for message
+     * @return Whether successful
+     */
+    private function sendMessageViaSB($message, $to) {
+        if(socketcheck($this->switchBoardSessions[$to]['socket'])) {
+            $this->reqSBSession($to);
+            return false;
+        }
+        
+        if(!$this->switchBoardSessions[$to]['joined']) {
+            // If our participant has not joined the session yet we can't message them!
+            return false;
+        }
+        
+        $id = &$this->switchBoardSessions[$to]['id'];
+        $socket = $this->switchBoardSessions[$to]['socket'];
         
         $aMessage = $this->getMessage($Message);
         //CheckEmotion...
@@ -3615,79 +3524,255 @@ X-OIM-Sequence-Num: 1
         {
             $SendString="MIME-Version: 1.0\r\nContent-Type: text/x-mms-emoticon\r\n\r\n$MsnObjDefine";
             $len = strlen($SendString);
-            $this->SB_writeln("MSG $id N $len");
-            $id++;
-            $this->SB_writedata($SendString);
-            $this->id++;
+            // TODO handle failure during write to socket
+            $this->sb_writeln($socket, $id, "MSG $id N $len");
+            $this->sb_writedata($socket, $SendString);
         }
         $len = strlen($aMessage);
-        $this->SB_writeln("MSG $id N $len");
-        
-        // Increment the trID
-        $this->switchBoardSessions[$to]['id']++;
-        
-        $this->SB_writedata($aMessage);
+        // TODO handle failure during write to socket
+        $this->sb_writeln($socket, $id, "MSG $id N $len");
+        $this->sb_writedata($socket, $aMessage);
         
         // Don't close the SB session, we might as well leave it open
         
         return true;
     }
     
-    //FIXME Not sure if this is needed?
-    private function endSBSession($socket) {
-        if (feof($this->SBFp))
-        {
-            // lost connection? error? try OIM later
-            @fclose($this->SBFp);
+    /**
+     * 
+     * @param $to
+     * @param $sMessage
+     * @param $lockkey
+     */
+    private function sendOIM($to, $sMessage, $lockkey) {
+        $XML = '<?xml version="1.0" encoding="utf-8"?>
+<soap:Envelope xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+               xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+               xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/">
+<soap:Header>
+  <From memberName="'.$this->user.'"
+        friendlyName="=?utf-8?B?'.base64_encode($this->user).'?="
+        xml:lang="zh-TW"
+        proxy="MSNMSGR"
+        xmlns="http://messenger.msn.com/ws/2004/09/oim/"
+        msnpVer="'.$this->protocol.'"
+        buildVer="'.$this->buildver.'"/>
+  <To memberName="'.$to.'" xmlns="http://messenger.msn.com/ws/2004/09/oim/"/>
+  <Ticket passport="'.htmlspecialchars($this->ticket['oim_ticket']).'"
+          appid="'.$this->prod_id.'"
+          lockkey="'.$lockkey.'"
+          xmlns="http://messenger.msn.com/ws/2004/09/oim/"/>
+  <Sequence xmlns="http://schemas.xmlsoap.org/ws/2003/03/rm">
+    <Identifier xmlns="http://schemas.xmlsoap.org/ws/2002/07/utility">http://messenger.msn.com</Identifier>
+    <MessageNumber>1</MessageNumber>
+  </Sequence>
+</soap:Header>
+<soap:Body>
+  <MessageType xmlns="http://messenger.msn.com/ws/2004/09/oim/">text</MessageType>
+  <Content xmlns="http://messenger.msn.com/ws/2004/09/oim/">MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: base64
+X-OIM-Message-Type: OfflineMessage
+X-OIM-Run-Id: {DAB68CFA-38C9-449B-945E-38AFA51E50A7}
+X-OIM-Sequence-Num: 1
+
+'.chunk_split(base64_encode($sMessage)).'
+  </Content>
+</soap:Body>
+</soap:Envelope>';
+
+        $header_array = array(
+            'SOAPAction: '.$this->oim_send_soap,
+            'Content-Type: text/xml',
+            'User-Agent: Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1; Messenger '.$this->buildver.')'
+        );
+
+        $this->debug_message("*** URL: $this->oim_send_url");
+        $this->debug_message("*** Sending SOAP:\n$XML");
+        $curl = curl_init();
+        curl_setopt($curl, CURLOPT_URL, $this->oim_send_url);
+        curl_setopt($curl, CURLOPT_HTTPHEADER, $header_array);
+        curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
+        curl_setopt($curl, CURLOPT_FOLLOWLOCATION, 1);
+        curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, 0);
+        if ($this->debug) curl_setopt($curl, CURLOPT_HEADER, 1);
+        curl_setopt($curl, CURLOPT_POST, 1);
+        curl_setopt($curl, CURLOPT_POSTFIELDS, $XML);
+        $data = curl_exec($curl);
+        $http_code = curl_getinfo($curl, CURLINFO_HTTP_CODE);
+        curl_close($curl);
+        $this->debug_message("*** Get Result:\n$data");
+
+        if ($http_code == 200) {
+            $this->debug_message("*** OIM sent for $to");
+            return true;
+        }
+
+        $challenge = false;
+        $auth_policy = false;
+        // the lockkey is invalid, authenticated fail, we need challenge it again
+        // <LockKeyChallenge xmlns="http://messenger.msn.com/ws/2004/09/oim/">364763969</LockKeyChallenge>
+        preg_match("#<LockKeyChallenge (.*)>(.*)</LockKeyChallenge>#", $data, $matches);
+        if (count($matches) != 0) {
+            // yes, we get new LockKeyChallenge
+            $challenge = $matches[2];
+            $this->debug_message("*** OIM need new challenge ($challenge) for $to");
+        }
+        // auth policy error
+        // <RequiredAuthPolicy xmlns="http://messenger.msn.com/ws/2004/09/oim/">MBI_SSL</RequiredAuthPolicy>
+        preg_match("#<RequiredAuthPolicy (.*)>(.*)</RequiredAuthPolicy>#", $data, $matches);
+        if (count($matches) != 0) {
+            $auth_policy = $matches[2];
+            $this->debug_message("*** OIM need new auth policy ($auth_policy) for $to");
+        }
+        if ($auth_policy === false && $challenge === false) {
+            //<faultcode xmlns:q0="http://messenger.msn.com/ws/2004/09/oim/">q0:AuthenticationFailed</faultcode>
+            preg_match("#<faultcode (.*)>(.*)</faultcode>#", $data, $matches);
+            if (count($matches) == 0) {
+                // no error, we assume the OIM is sent
+                $this->debug_message("*** OIM sent for $to");
+                return true;
+            }
+            $err_code = $matches[2];
+            //<faultstring>Exception of type 'System.Web.Services.Protocols.SoapException' was thrown.</faultstring>
+            preg_match("#<faultstring>(.*)</faultstring>#", $data, $matches);
+            if (count($matches) > 0)
+            $err_msg = $matches[1];
+            else
+            $err_msg = '';
+            $this->debug_message("*** OIM failed for $to");
+            $this->debug_message("*** OIM Error code: $err_code");
+            $this->debug_message("*** OIM Error Message: $err_msg");
             return false;
         }
-        $this->SB_writeln("OUT");
-        @fclose($this->SBFp);
-        return true;
+        return array('challenge' => $challenge, 'auth_policy' => $auth_policy);
     }
     
-    private function getSBSession($to) {
-        
+    /**
+     * Send a message to a user on another network
+     * @param $message Message
+     * @param $to Intended recipient
+     * @param $network Network
+     */
+    private function sendOtherNetworkMessage($message, $to, $network) {
+        $message=$this->getMessage($nessage, $network);
+        $len = strlen($message);
+        $this->ns_writeln("UUM $this->id $to $network 1 $len");
+        $this->ns_writedata($Message);
+        $this->log_message("*** sent to $to (network: $network):\n$Message");
     }
     
+    /**
+     * Send a message
+     * @param $message Message
+     * @param $to To address in form user@host.com@network
+     *            where network is 1 for MSN, 32 for Yahoo
+     *            and 'Offline' for offline messages
+     */
     public function sendMessage($message, $to) {
         if($message != '') {
             list($name,$host,$network)=explode('@',$to);
             $network=$network==''?1:$network;
             
-            if($network === 1 && isset($this->switchBoardSessions[$to])) {
+            if($network === 1 && $this->switchBoardSessions[$to]['socket'] != NULL && time()-$this->switchBoardSessions[$to]['lastActive'] < $this->SBIdleTimeout) {
                 $recipient = $name . $host;
                 $this->debug_message("*** Sending Message to $recipient using existing SB session");
                 return $this->sendMessageViaSB($message, $recipient);
+            } elseif($network == 'Offline') {
+                //Send OIM
+                //FIXME: 修正Send OIM
+                $lockkey='';
+                for ($i = 0; $i < $this->oim_try; $i++)
+                {
+                    if(($oim_result = $this->sendOIM($To, $Message, $lockkey))===true) break;
+                    if (is_array($oim_result) && $oim_result['challenge'] !== false) {
+                        // need challenge lockkey
+                        $this->log_message("*** we need a new challenge code for ".$oim_result['challenge']);
+                        $lockkey = $this->getChallenge($oim_result['challenge']);
+                        continue;
+                    }
+                    if ($oim_result === false || $oim_result['auth_policy'] !== false)
+                    {
+                        if ($this->re_login)
+                        {
+                            $this->log_message("*** can't send OIM, but we already re-login again, so ignore this OIM");
+                            break;
+                        }
+                        $this->log_message("*** can't send OIM, maybe ticket expired, try to login again");
+                        // maybe we need to re-login again
+                        if(!$this->get_passport_ticket())
+                        {
+                            $this->log_message("*** can't re-login, something wrong here, ignore this OIM");
+                            break;
+                        }
+                        $this->log_message("**** get new ticket, try it again");
+                        continue;
+                    }
+                }
             } else {
                 $this->debug_message("*** Not MSN network or no existing SB session");
-                //TODO implement creation of SB session etc
+                $this->reqSBSession($to);
+                return false;
             }
         }
         return true;
     }
     
+    //FIXME Not sure if this is needed?
+    private function endSBSession($socket) {
+        if (feof($socket))
+        {
+            // lost connection? error? try OIM later
+            @fclose($socket);
+            return false;
+        }
+        $fake = 0;
+        $this->sb_writeln($socket, $fake, "OUT");
+        @fclose($socket);
+        return true;
+    }
+    
     /**
      * Sends a ping command
      * 
      * Should be called about every 50 seconds
      */
-    public function send_ping() {
+    public function sendPing() {
         // NS: >>> PNG
         $this->ns_writeln("PNG");
     }
     
+    /**
+     * Get the NS socket
+     */
     public function getNSSocket() {
         return $this->NSfp;
     }
     
-    // TODO Allow for multiple SB session sockets
-    public function getSBSocket() {
-        return $this->SBfp;
+    /**
+     * Get the Switchboard sockets currently in use
+     */
+    public function getSBSockets() {
+        return $this->switchBoardSockets;
     }
     
+    /**
+     * Get all the sockets currently in use
+     */
     public function getSockets() {
-        return array($this->NSfp, $this->SBfp);
+        return array_merge($this->NSfp, $this->switchBoardSockets);
+    }
+    
+    /** 
+     * Checks socket for end of file
+     *
+     * @access public
+     * @param Resource $socket Socket to check
+     * @return boolean true if end of file (socket) 
+     */
+    private static function socketcheck($socket){
+        $info = stream_get_meta_data($socket);
+        return $info['eof'];
     }
     
     /**
diff --git a/plugins/Msn/msnmanager.php b/plugins/Msn/msnmanager.php
index 354ed0f3ef..b0540c46e5 100644
--- a/plugins/Msn/msnmanager.php
+++ b/plugins/Msn/msnmanager.php
@@ -115,7 +115,7 @@ class MsnManager extends ImManager
         
         $now = time();
         
-        $this->conn->send_ping();
+        $this->conn->sendPing();
         $this->lastping = $now;
         return true;
     }

From d1c9908282052228be9822846c9dcac1f430cbfe Mon Sep 17 00:00:00 2001
From: Luke Fitzgerald <lw.fitzgerald@googlemail.com>
Date: Mon, 14 Jun 2010 04:26:41 +0100
Subject: [PATCH 050/655] Added better error handling to signon method

---
 plugins/Msn/extlib/phpmsnclass/msn.class.php | 209 ++++++++++---------
 1 file changed, 109 insertions(+), 100 deletions(-)

diff --git a/plugins/Msn/extlib/phpmsnclass/msn.class.php b/plugins/Msn/extlib/phpmsnclass/msn.class.php
index 317acd0d53..73f02f6d73 100644
--- a/plugins/Msn/extlib/phpmsnclass/msn.class.php
+++ b/plugins/Msn/extlib/phpmsnclass/msn.class.php
@@ -139,6 +139,7 @@ class MSN {
         }        
         $this->debug = isset($Configs['debug']) ? $Configs['debug'] : false;
         $this->timeout = $timeout;
+        
         // check support
         if (!function_exists('curl_init')) throw new Exception("We need curl module!\n");
         if (!function_exists('preg_match')) throw new Exception("We need pcre module!\n");
@@ -1089,123 +1090,131 @@ class MSN {
      */
     public function signon() {
         $this->log_message("*** try to connect to MSN network");
-        while(!$this->connect($this->user, $this->password))
-        {
-            $this->signonFailed("!!! Can't connect to server: $this->error");
-        }
-        if(!$this->UpdateContacts()) {
-            $this->signonFailed('!!! Could not update contacts');
-            return $this->signon();
-        }
-        $this->LastPing=time();
-        $this->log_message("*** connected, wait for command");
-        $start_tm = time();
-        $ping_tm = time();
-        if(($this->aContactList = $this->getMembershipList()) === false) {
-            $this->signonFailed('!!! Could not get Membership List');
-            return $this->signon();
-        }
-        if ($this->update_pending) {
-            if (is_array($this->aContactList)) {
-                $pending = 'Pending';
-                foreach ($this->aContactList as $u_domain => $aUserList) {
-                    foreach ($aUserList as $u_name => $aNetworks) {
-                        foreach ($aNetworks as $network => $aData) {
-                            if (isset($aData[$pending])) {
-                                // pending list
-                                $cnt = 0;
-                                foreach (array('Allow', 'Reverse') as $list) {
-                                    if (isset($aData[$list]))
-                                        $cnt++;
-                                    else {
-                                        if ($this->addMemberToList($u_name.'@'.$u_domain, $network, $list)) {
-                                            $this->aContactList[$u_domain][$u_name][$network][$list] = false;
+        
+        while(true) {
+            while(!$this->connect($this->user, $this->password))
+            {
+                $this->signonFailure("!!! Can't connect to server: $this->error");
+            }
+            if($this->UpdateContacts() === false) {
+                $this->signonFailure('!!! Update Contacts failed');
+                continue;
+            }
+            $this->LastPing=time();
+            $this->log_message("*** connected, wait for command");
+            $start_tm = time();
+            $ping_tm = time();
+            if(($this->aContactList = $this->getMembershipList()) === false) {
+                continue;
+            }
+            if ($this->update_pending) {
+                if (is_array($this->aContactList)) {
+                    $pending = 'Pending';
+                    foreach ($this->aContactList as $u_domain => $aUserList) {
+                        foreach ($aUserList as $u_name => $aNetworks) {
+                            foreach ($aNetworks as $network => $aData) {
+                                if (isset($aData[$pending])) {
+                                    // pending list
+                                    $cnt = 0;
+                                    foreach (array('Allow', 'Reverse') as $list) {
+                                        if (isset($aData[$list]))
                                             $cnt++;
+                                        else {
+                                            if ($this->addMemberToList($u_name.'@'.$u_domain, $network, $list)) {
+                                                $this->aContactList[$u_domain][$u_name][$network][$list] = false;
+                                                $cnt++;
+                                            }
+                                        }
+                                    }
+                                    if ($cnt >= 2) {
+                                        $id = $aData[$pending];
+                                        // we can delete it from pending now
+                                        if ($this->delMemberFromList($id, $u_name.'@'.$u_domain, $network, $pending))
+                                            unset($this->aContactList[$u_domain][$u_name][$network][$pending]);
+                                    }
+                                }
+                                else {
+                                    // sync list
+                                    foreach (array('Allow', 'Reverse') as $list) {
+                                        if (!isset($aData[$list])) {
+                                            if ($this->addMemberToList($u_name.'@'.$u_domain, $network, $list))
+                                                $this->aContactList[$u_domain][$u_name][$network][$list] = false;
                                         }
                                     }
                                 }
-                                if ($cnt >= 2) {
-                                    $id = $aData[$pending];
-                                    // we can delete it from pending now
-                                    if ($this->delMemberFromList($id, $u_name.'@'.$u_domain, $network, $pending))
-                                        unset($this->aContactList[$u_domain][$u_name][$network][$pending]);
-                                }
-                            }
-                            else {
-                                // sync list
-                                foreach (array('Allow', 'Reverse') as $list) {
-                                    if (!isset($aData[$list])) {
-                                        if ($this->addMemberToList($u_name.'@'.$u_domain, $network, $list))
-                                            $this->aContactList[$u_domain][$u_name][$network][$list] = false;
-                                    }
-                                }
                             }
                         }
                     }
                 }
             }
-        }
-        $n = 0;
-        $sList = '';
-        $len = 0;
-        if (is_array($this->aContactList)) {
-            foreach ($this->aContactList as $u_domain => $aUserList) {
-                $str = '<d n="'.$u_domain.'">';
-                $len += strlen($str);
-                if ($len > 7400) {
-                    $this->aADL[$n] = '<ml l="1">'.$sList.'</ml>';
-                    $n++;
-                    $sList = '';
-                    $len = strlen($str);
-                }
-                $sList .= $str;
-                foreach ($aUserList as $u_name => $aNetworks) {
-                    foreach ($aNetworks as $network => $status) {
-                        $str = '<c n="'.$u_name.'" l="3" t="'.$network.'" />';
-                        $len += strlen($str);
-                        // max: 7500, but <ml l="1"></d></ml> is 19,
-                        // so we use 7475
-                        if ($len > 7475) {
-                            $sList .= '</d>';
-                            $this->aADL[$n] = '<ml l="1">'.$sList.'</ml>';
-                            $n++;
-                            $sList = '<d n="'.$u_domain.'">'.$str;
-                            $len = strlen($sList);
-                        }
-                        else
-                            $sList .= $str;
+            $n = 0;
+            $sList = '';
+            $len = 0;
+            if (is_array($this->aContactList)) {
+                foreach ($this->aContactList as $u_domain => $aUserList) {
+                    $str = '<d n="'.$u_domain.'">';
+                    $len += strlen($str);
+                    if ($len > 7400) {
+                        $this->aADL[$n] = '<ml l="1">'.$sList.'</ml>';
+                        $n++;
+                        $sList = '';
+                        $len = strlen($str);
                     }
+                    $sList .= $str;
+                    foreach ($aUserList as $u_name => $aNetworks) {
+                        foreach ($aNetworks as $network => $status) {
+                            $str = '<c n="'.$u_name.'" l="3" t="'.$network.'" />';
+                            $len += strlen($str);
+                            // max: 7500, but <ml l="1"></d></ml> is 19,
+                            // so we use 7475
+                            if ($len > 7475) {
+                                $sList .= '</d>';
+                                $this->aADL[$n] = '<ml l="1">'.$sList.'</ml>';
+                                $n++;
+                                $sList = '<d n="'.$u_domain.'">'.$str;
+                                $len = strlen($sList);
+                            }
+                            else
+                                $sList .= $str;
+                        }
+                    }
+                    $sList .= '</d>';
                 }
-                $sList .= '</d>';
             }
-        }
-        $this->aADL[$n] = '<ml l="1">'.$sList.'</ml>';
-        // NS: >>> BLP {id} BL
-        $this->ns_writeln("BLP $this->id BL");
-        foreach ($this->aADL as $str) {
+            $this->aADL[$n] = '<ml l="1">'.$sList.'</ml>';
+            // NS: >>> BLP {id} BL
+            $this->ns_writeln("BLP $this->id BL");
+            foreach ($this->aADL as $str) {
+                $len = strlen($str);
+                // NS: >>> ADL {id} {size}
+                $this->ns_writeln("ADL $this->id $len");
+                $this->ns_writedata($str);
+            }
+            // NS: >>> PRP {id} MFN name
+            if ($this->alias == '') $this->alias = $user;
+            $aliasname = rawurlencode($this->alias);
+            $this->ns_writeln("PRP $this->id MFN $aliasname");
+            //設定個人大頭貼
+            //$MsnObj=$this->PhotoStckObj();
+            // NS: >>> CHG {id} {status} {clientid} {msnobj}
+            $this->ns_writeln("CHG $this->id NLN $this->clientid");
+            if($this->PhotoStickerFile!==false)
+                $this->ns_writeln("CHG $this->id NLN $this->clientid ".rawurlencode($this->MsnObj($this->PhotoStickerFile)));
+            // NS: >>> UUX {id} length
+            $str = '<Data><PSM>'.htmlspecialchars($this->psm).'</PSM><CurrentMedia></CurrentMedia><MachineGuid></MachineGuid></Data>';
             $len = strlen($str);
-            // NS: >>> ADL {id} {size}
-            $this->ns_writeln("ADL $this->id $len");
+            $this->ns_writeln("UUX $this->id $len");
             $this->ns_writedata($str);
+            break;
         }
-        // NS: >>> PRP {id} MFN name
-        if ($this->alias == '') $this->alias = $user;
-        $aliasname = rawurlencode($this->alias);
-        $this->ns_writeln("PRP $this->id MFN $aliasname");
-        //設定個人大頭貼
-        //$MsnObj=$this->PhotoStckObj();
-        // NS: >>> CHG {id} {status} {clientid} {msnobj}
-        $this->ns_writeln("CHG $this->id NLN $this->clientid");
-        if($this->PhotoStickerFile!==false)
-            $this->ns_writeln("CHG $this->id NLN $this->clientid ".rawurlencode($this->MsnObj($this->PhotoStickerFile)));
-        // NS: >>> UUX {id} length
-        $str = '<Data><PSM>'.htmlspecialchars($this->psm).'</PSM><CurrentMedia></CurrentMedia><MachineGuid></MachineGuid></Data>';
-        $len = strlen($str);
-        $this->ns_writeln("UUX $this->id $len");
-        $this->ns_writedata($str);
     }
     
-    private function signonFailed($message) {
+    /**
+    * Called if there is an error during signon
+    * 
+    * @param $message Error message to log
+    */
+    private function signonFailure($message) {
         $this->log_message($message);
         $this->callHandler('ConnectFailed', NULL);
         $this->NSRetryWait($this->retry_wait);

From 2ef01c5b7468c269bcb5f1abc837687cc5644b21 Mon Sep 17 00:00:00 2001
From: Luke Fitzgerald <lw.fitzgerald@googlemail.com>
Date: Mon, 14 Jun 2010 04:54:03 +0100
Subject: [PATCH 051/655] Removed Run method as all code has been moved into
 new methods

---
 plugins/Msn/extlib/phpmsnclass/msn.class.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/Msn/extlib/phpmsnclass/msn.class.php b/plugins/Msn/extlib/phpmsnclass/msn.class.php
index 73f02f6d73..16ce72bde7 100644
--- a/plugins/Msn/extlib/phpmsnclass/msn.class.php
+++ b/plugins/Msn/extlib/phpmsnclass/msn.class.php
@@ -1097,7 +1097,7 @@ class MSN {
                 $this->signonFailure("!!! Can't connect to server: $this->error");
             }
             if($this->UpdateContacts() === false) {
-                $this->signonFailure('!!! Update Contacts failed');
+                $this->signonFailure('!!! Update contacts failed');
                 continue;
             }
             $this->LastPing=time();
@@ -1105,6 +1105,7 @@ class MSN {
             $start_tm = time();
             $ping_tm = time();
             if(($this->aContactList = $this->getMembershipList()) === false) {
+                $this->signonFailure('!!! Get Membership list failed');
                 continue;
             }
             if ($this->update_pending) {

From 0a4738a8060714fa7dc6dbd7af7f7f4d6b6c0c70 Mon Sep 17 00:00:00 2001
From: Luke Fitzgerald <lw.fitzgerald@googlemail.com>
Date: Mon, 14 Jun 2010 19:53:43 +0100
Subject: [PATCH 052/655] Lots more work on adapting library. Added more
 commenting and fixed some stuff on the integration side.

---
 plugins/Msn/MsnPlugin.php                    |  362 ++---
 plugins/Msn/extlib/phpmsnclass/msn.class.php | 1371 +++++-------------
 plugins/Msn/msnmanager.php                   |  341 +++--
 3 files changed, 716 insertions(+), 1358 deletions(-)

diff --git a/plugins/Msn/MsnPlugin.php b/plugins/Msn/MsnPlugin.php
index 5566b54302..9a9e703986 100644
--- a/plugins/Msn/MsnPlugin.php
+++ b/plugins/Msn/MsnPlugin.php
@@ -1,172 +1,190 @@
-<?php
-/**
- * StatusNet - the distributed open-source microblogging tool
- * Copyright (C) 2009, StatusNet, Inc.
- *
- * Send and receive notices using the AIM network
- *
- * 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  IM
- * @package   StatusNet
- * @author    Craig Andrews <candrews@integralblue.com>
- * @copyright 2009 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);
-}
-// We bundle the phptoclib library...
-set_include_path(get_include_path() . PATH_SEPARATOR . dirname(__FILE__) . '/extlib/phptoclib');
-
-/**
- * Plugin for AIM
- *
- * @category  Plugin
- * @package   StatusNet
- * @author    Craig Andrews <candrews@integralblue.com>
- * @copyright 2009 StatusNet, Inc.
- * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
- * @link      http://status.net/
- */
-
-class MsnPlugin extends ImPlugin
-{
-    public $user =  null;
-    public $password = null;
-    public $publicFeed = array();
-
-    public $transport = 'msnim';
-
-    function getDisplayName()
-    {
-        return _m('MSN');
-    }
-
-    function normalize($screenname)
-    {
-		$screenname = str_replace(" ","", $screenname);
-        return strtolower($screenname);
-    }
-
-    function daemon_screenname()
-    {
-        return $this->user;
-    }
-
-    function validate($screenname)
-    {
-        if(preg_match('/^[a-z]\w{2,15}$/i', $screenname)) {
-            return true;
-        }else{
-            return false;
-        }
-    }
-
-    /**
-     * Load related modules when needed
-     *
-     * @param string $cls Name of the class to be loaded
-     *
-     * @return boolean hook value; true means continue processing, false means stop.
-     */
-    function onAutoload($cls)
-    {
-        $dir = dirname(__FILE__);
-
-        switch ($cls)
-        {
-        case 'Msn':
-            require_once(INSTALLDIR.'/plugins/Msn/extlib/phpmsnclass/msn.class.php');
-            return false;
-        case 'MsnManager':
-            include_once $dir . '/'.strtolower($cls).'.php';
-            return false;
-        case 'Fake_Msn':
-            include_once $dir . '/'. $cls .'.php';
-            return false;
-        default:
-            return true;
-        }
-    }
-
-    function onStartImDaemonIoManagers(&$classes)
-    {
-        parent::onStartImDaemonIoManagers(&$classes);
-        $classes[] = new MsnManager($this); // handles sending/receiving
-        return true;
-    }
-
-    function microiduri($screenname)
-    {
-        return 'msnim:' . $screenname;    
-    }
-
-    function send_message($screenname, $body)
-    {
-        //$this->fake_aim->sendIm($screenname, $body);
-	    //$this->enqueue_outgoing_raw($this->fake_aim->would_be_sent);
-	    $this->enqueue_outgoing_raw(array($screenname, $body));
-        return true;
-    }
-
-    /**
-     * Accept a queued input message.
-     *
-     * @return true if processing completed, false if message should be reprocessed
-     */
-    function receive_raw_message($message)
-    {
-        $info=Aim::getMessageInfo($message);
-        $from = $info['from'];
-        $user = $this->get_user($from);
-        $notice_text = $info['message'];
-
-        $this->handle_incoming($from, $notice_text);
-
-        return true;
-    }
-
-    function initialize(){
-        if(!isset($this->user)){
-            throw new Exception("must specify a user");
-        }
-        if(!isset($this->password)){
-            throw new Exception("must specify a password");
-        }
-        if(!isset($this->nickname)) {
-            throw new Exception("must specify a nickname");
-        }
-
-        $this->fake_msn = new Fake_Msn($this->user,$this->password,4);
-        return true;
-    }
-
-    function onPluginVersion(&$versions)
-    {
-        $versions[] = array('name' => 'MSN',
-                            'version' => STATUSNET_VERSION,
-                            'author' => 'Luke Fitzgerald',
-                            'homepage' => 'http://status.net/wiki/Plugin:MSN',
-                            'rawdescription' =>
-                            _m('The MSN plugin allows users to send and receive notices over the MSN network.'));
-        return true;
-    }
-}
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2009, StatusNet, Inc.
+ *
+ * Send and receive notices using the MSN network
+ *
+ * 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  IM
+ * @package   StatusNet
+ * @author    Luke Fitzgerald <lw.fitzgerald@googlemail.com>
+ * @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);
+}
+// We bundle the phpmsnclass library...
+set_include_path(get_include_path() . PATH_SEPARATOR . dirname(__FILE__) . '/extlib/phpmsnclass');
+
+/**
+ * Plugin for MSN
+ *
+ * @category  Plugin
+ * @package   StatusNet
+ * @author    Luke Fitzgerald <lw.fitzgerald@googlemail.com>
+ * @copyright 2010 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+
+class MsnPlugin extends ImPlugin {
+    public $user = null;
+    public $password = null;
+    public $nickname = null;
+    public $transport = 'msnim';
+
+    /**
+     * Get the internationalized/translated display name of this IM service
+     *
+     * @return string Name of service
+     */
+    function getDisplayName() {
+        return _m('MSN');
+    }
+
+    /**
+     * Normalize a screenname for comparison
+     *
+     * @param string $screenname screenname to normalize
+     * @return string an equivalent screenname in normalized form
+     */
+    function normalize($screenname) {
+		$screenname = str_replace(" ","", $screenname);
+        return strtolower($screenname);
+    }
+
+    /**
+     * Get the screenname of the daemon that sends and receives messages
+     *
+     * @return string Screenname
+     */
+    function daemon_screenname() {
+        return $this->user;
+    }
+
+    /**
+     * Validate (ensure the validity of) a screenname
+     *
+     * @param string $screenname screenname to validate
+     *
+     * @return boolean
+     */
+    function validate($screenname) {
+        //TODO Correct this for MSN screennames
+        if(preg_match('/^[a-z]\w{2,15}$/i', $screenname)) {
+            return true;
+        }else{
+            return false;
+        }
+    }
+
+    /**
+     * Load related modules when needed
+     *
+     * @param string $cls Name of the class to be loaded
+     *
+     * @return boolean hook value; true means continue processing, false means stop.
+     */
+    public function onAutoload($cls) {
+        $dir = dirname(__FILE__);
+
+        switch ($cls) {
+            case 'Msn':
+                require_once(INSTALLDIR.'/plugins/Msn/extlib/phpmsnclass/msn.class.php');
+                return false;
+            case 'MsnManager':
+                include_once $dir . '/'.strtolower($cls).'.php';
+                return false;
+            default:
+                return true;
+        }
+    }
+
+    public function onStartImDaemonIoManagers(&$classes) {
+        parent::onStartImDaemonIoManagers(&$classes);
+        $classes[] = new MsnManager($this); // handles sending/receiving
+        return true;
+    }
+
+    /**
+    * Get a microid URI for the given screenname
+    *
+    * @param string $screenname
+    * @return string microid URI
+    */
+    public function microiduri($screenname) {
+        return 'msnim:' . $screenname;
+    }
+
+    /**
+     * Send a message to a given screenname
+     *
+     * @param string $screenname Screenname to send to
+     * @param string $body Text to send
+     * @return boolean success value
+     */
+    public function send_message($screenname, $body) {
+	    $this->enqueue_outgoing_raw(array('to' => $screenname, 'message' => $body));
+        return true;
+    }
+
+    /**
+     * Accept a queued input message.
+     *
+     * @param array $data Data
+     * @return true if processing completed, false if message should be reprocessed
+     */
+    public function receive_raw_message($data) {
+        $this->handle_incoming($data['sender'], $data['message']);
+        return true;
+    }
+
+    /**
+    * Initialize plugin
+    *
+    * @return void
+    */
+    public function initialize() {
+        if (!isset($this->user)) {
+            throw new Exception("Must specify a user");
+        }
+        if (!isset($this->password)) {
+            throw new Exception("Must specify a password");
+        }
+        if (!isset($this->nickname)) {
+            throw new Exception("Must specify a nickname");
+        }
+
+        return true;
+    }
+
+    function onPluginVersion(&$versions) {
+        $versions[] = array('name' => 'MSN',
+                            'version' => STATUSNET_VERSION,
+                            'author' => 'Luke Fitzgerald',
+                            'homepage' => 'http://status.net/wiki/Plugin:MSN',
+                            'rawdescription' =>
+                            _m('The MSN plugin allows users to send and receive notices over the MSN network.'));
+        return true;
+    }
+}
diff --git a/plugins/Msn/extlib/phpmsnclass/msn.class.php b/plugins/Msn/extlib/phpmsnclass/msn.class.php
index 16ce72bde7..9b087ac792 100644
--- a/plugins/Msn/extlib/phpmsnclass/msn.class.php
+++ b/plugins/Msn/extlib/phpmsnclass/msn.class.php
@@ -33,33 +33,24 @@ class MSN {
     private $passport_policy = '';
     private $alias;
     private $psm;
-    private $use_ping;
     private $retry_wait;
-    private $backup_file;
     private $update_pending;
     private $PhotoStickerFile=false;
     private $Emotions=false;
-    private $MessageQueue=array();
-    private $ChildProcess=array();
-    private $MAXChildProcess=3;
     private $ReqSBXFRTimeout=60;
     private $LastPing;
     private $ping_wait=50;
     private $SBIdleTimeout=10;
     private $SBStreamTimeout=2;
-    private $NSStreamTimeout=2;
     private $MsnObjArray=array();
     private $MsnObjMap=array();
-    private $SwitchBoardProcess=false;     // false=>Main Process,1 => sb_control_process,2 => sb_ring_process
-    private $SwitchBoardSessionUser=false;
-    private $SwitchBoardMessageQueue=array();
     private $ABAuthHeader;
     private $ABService;
     private $Contacts;
     private $IgnoreList;
 
-    public $server = 'messenger.hotmail.com';
-    public $port = 1863;
+    private $server = 'messenger.hotmail.com';
+    private $port = 1863;
 
 
     public $clientid = '';
@@ -104,49 +95,61 @@ class MSN {
     // for YIM: 518 bytes
     public $max_msn_message_len = 1664;
     public $max_yahoo_message_len = 518;
-    
+
     // Begin added for StatusNet
-    
+
     private $aContactList = array();
     private $aADL = array();
-    private $re_login;
     private $switchBoardSessions = array();
     private $switchBoardSockets = array();
     private $waitingForXFR = array();
-    
+
     /**
     * Event Handler Functions
     */
     private $myEventHandlers = array();
-    
+
     // End added for StatusNet
-    
+
+    /**
+    * Constructor method
+    *
+    * @param array $Configs Array of configuration options
+    *                       'user'           - Username
+    *                       'password'       - Password
+    *                       'alias'          - Bot nickname
+    *                       'psm'            - Bot personal status message
+    *                       'retry_wait'     - Time to wait before trying to reconnect
+    *                       'update_pending' - Whether to update pending contacts
+    *                       'PhotoSticker'   - Photo file to use (?)
+    *                       'debug'          - Enable/Disable debugging mode
+    * @param integer $timeout Connection timeout
+    * @param integer $client_id Client id (hexadecimal)
+    * @return MSN
+    */
     public function __construct ($Configs=array(), $timeout = 15, $client_id = 0x7000800C)
     {
         $this->user = $Configs['user'];
         $this->password = $Configs['password'];
         $this->alias = isset($Configs['alias']) ? $Configs['alias'] : '';
         $this->psm = isset($Configs['psm']) ? $Configs['psm'] : '';
-        $this->use_ping = isset($Configs['use_ping']) ? $Configs['use_ping'] : false;
         $this->retry_wait = isset($Configs['retry_wait']) ? $Configs['retry_wait'] : 30;
-        $this->backup_file = isset($Configs['backup_file']) ? $Configs['backup_file'] : true;
         $this->update_pending = isset($Configs['update_pending']) ? $Configs['update_pending'] : true;
         $this->PhotoStickerFile=isset($Configs['PhotoSticker']) ? $Configs['PhotoSticker'] : false;
-        if($this->Emotions = isset($Configs['Emotions']) ? $Configs['Emotions']:false)
-        {
+
+        if($this->Emotions = isset($Configs['Emotions']) ? $Configs['Emotions']:false) {
             foreach($this->Emotions as $EmotionFilePath)
                 $this->MsnObj($EmotionFilePath,$Type=2);
-        }        
+        }
         $this->debug = isset($Configs['debug']) ? $Configs['debug'] : false;
         $this->timeout = $timeout;
-        
-        // check support
-        if (!function_exists('curl_init')) throw new Exception("We need curl module!\n");
-        if (!function_exists('preg_match')) throw new Exception("We need pcre module!\n");
-        if (!function_exists('mhash')) throw new Exception("We need mhash module!\n");
 
-        if (!function_exists('mcrypt_cbc')) throw new Exception("We need mcrypt module!\n");
-        if (!function_exists('bcmod')) throw new Exception("We need bcmath module for $protocol!\n");
+        // Check support
+        if (!function_exists('curl_init')) throw new Exception("curl module not found!\n");
+        if (!function_exists('preg_match')) throw new Exception("pcre module not found!\n");
+        if (!function_exists('mhash')) throw new Exception("mhash module not found!\n");
+        if (!function_exists('mcrypt_cbc')) throw new Exception("mcrypt module not found!\n");
+        if (!function_exists('bcmod')) throw new Exception("bcmath module not found!\n");
 
         /*
          http://msnpiki.msnfanatic.com/index.php/Client_ID
@@ -198,7 +201,13 @@ class MSN {
         if($ReturnSoapVarObj) return new SoapVar($ArrayString,XSD_ANYXML,$TypeName,$TypeNameSpace);
         return $ArrayString;
     }
-    
+
+    /**
+    * Get Passport ticket
+    *
+    * @param string $url URL string (Optional)
+    * @return mixed Array of tickets or false on failure
+    */
     private function get_passport_ticket($url = '')
     {
         $user = $this->user;
@@ -427,7 +436,7 @@ class MSN {
             'oim_ticket' => html_entity_decode($matches[9]),
             'space_ticket' => html_entity_decode($matches[11]),
             'storage_ticket' => html_entity_decode($matches[13])
-        );        
+        );
         $this->ticket=$aTickets;
         $this->debug_message(var_export($aTickets, true));
         $ABAuthHeaderArray=array(
@@ -440,7 +449,7 @@ class MSN {
         $this->ABAuthHeader=new SoapHeader("http://www.msn.com/webservices/AddressBook","ABAuthHeader", $this->Array2SoapVar($ABAuthHeaderArray));
         return $aTickets;
     }
-    
+
     private function UpdateContacts()
     {
         $ABApplicationHeaderArray=array(
@@ -451,7 +460,7 @@ class MSN {
                 'PartnerScenario'=>'ContactSave'
              )
         );
-        
+
         $ABApplicationHeader=new SoapHeader("http://www.msn.com/webservices/AddressBook",'ABApplicationHeader', $this->Array2SoapVar($ABApplicationHeaderArray));
         $ABFindAllArray=array(
             'ABFindAll'=>array(
@@ -479,7 +488,7 @@ class MSN {
         }
         return true;
     }
-    
+
     private function addContact($email, $network, $display = '', $sendADL = false)
     {
         if ($network != 1) return true;
@@ -532,7 +541,8 @@ class MSN {
         return true;
     }
 
-    function delMemberFromList($memberID, $email, $network, $list) {
+    function delMemberFromList($memberID, $email, $network, $list)
+    {
         if ($network != 1 && $network != 32) return true;
         if ($memberID === false) return true;
         $user = $email;
@@ -641,23 +651,24 @@ class MSN {
         if ($http_code != 200) {
             preg_match('#<faultcode>(.*)</faultcode><faultstring>(.*)</faultstring>#', $data, $matches);
             if (count($matches) == 0) {
-                $this->log_message("*** can't delete member (network: $network) $email ($memberID) to $list");
+                $this->debug_message("*** can't delete member (network: $network) $email ($memberID) to $list");
                 return false;
             }
             $faultcode = trim($matches[1]);
             $faultstring = trim($matches[2]);
             if (strcasecmp($faultcode, 'soap:Client') || stripos($faultstring, 'Member does not exist') === false) {
-                $this->log_message("*** can't delete member (network: $network) $email ($memberID) to $list, error code: $faultcode, $faultstring");
+                $this->debug_message("*** can't delete member (network: $network) $email ($memberID) to $list, error code: $faultcode, $faultstring");
                 return false;
             }
-            $this->log_message("*** delete member (network: $network) $email ($memberID) from $list, not exist");
+            $this->debug_message("*** delete member (network: $network) $email ($memberID) from $list, not exist");
             return true;
         }
-        $this->log_message("*** delete member (network: $network) $email ($memberID) from $list");
+        $this->debug_message("*** delete member (network: $network) $email ($memberID) from $list");
         return true;
     }
 
-    function addMemberToList($email, $network, $list) {
+    function addMemberToList($email, $network, $list)
+    {
         if ($network != 1 && $network != 32) return true;
         $ticket = htmlspecialchars($this->ticket['contact_ticket']);
         $user = $email;
@@ -771,23 +782,24 @@ class MSN {
         if ($http_code != 200) {
             preg_match('#<faultcode>(.*)</faultcode><faultstring>(.*)</faultstring>#', $data, $matches);
             if (count($matches) == 0) {
-                $this->log_message("*** can't add member (network: $network) $email to $list");
+                $this->debug_message("*** can't add member (network: $network) $email to $list");
                 return false;
             }
             $faultcode = trim($matches[1]);
             $faultstring = trim($matches[2]);
             if (strcasecmp($faultcode, 'soap:Client') || stripos($faultstring, 'Member already exists') === false) {
-                $this->log_message("*** can't add member (network: $network) $email to $list, error code: $faultcode, $faultstring");
+                $this->debug_message("*** can't add member (network: $network) $email to $list, error code: $faultcode, $faultstring");
                 return false;
             }
-            $this->log_message("*** add member (network: $network) $email to $list, already exist!");
+            $this->debug_message("*** add member (network: $network) $email to $list, already exist!");
             return true;
         }
-        $this->log_message("*** add member (network: $network) $email to $list");
+        $this->debug_message("*** add member (network: $network) $email to $list");
         return true;
     }
 
-    function getMembershipList($returnData=false) {
+    function getMembershipList($returnData=false)
+    {
         $ticket = htmlspecialchars($this->ticket['contact_ticket']);
         $XML = '<?xml version="1.0" encoding="utf-8"?>
 <soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/"
@@ -912,7 +924,7 @@ class MSN {
                     @list($u_name, $u_domain) = @explode('@', $email);
                     if ($u_domain == NULL) continue;
                     $aContactList[$u_domain][$u_name][$network][$sMemberRole] = $id;
-                    $this->log_message("*** add new contact (network: $network, status: $sMemberRole): $u_name@$u_domain ($id)");
+                    $this->debug_message("*** add new contact (network: $network, status: $sMemberRole): $u_name@$u_domain ($id)");
                 }
             }
         }
@@ -921,10 +933,11 @@ class MSN {
 
     /**
      * Connect to the NS server
-     * @param $user Username
-     * @param $password Password
-     * @param $redirect_server Redirect server
-     * @param $redirect_port Redirect port
+     * @param String $user Username
+     * @param String $password Password
+     * @param String $redirect_server Redirect server
+     * @param Integer $redirect_port Redirect port
+     * @return Boolean Returns true if successful
      */
     private function connect($user, $password, $redirect_server = '', $redirect_port = 1863) {
         $this->id = 1;
@@ -943,7 +956,7 @@ class MSN {
             }
         }
 
-        stream_set_timeout($this->NSfp, $this->NSStreamTimeout);
+        stream_set_timeout($this->NSfp, $this->timeout);
         $this->authed = false;
         // MSNP9
         // NS: >> VER {id} MSNP9 CVR0
@@ -952,26 +965,20 @@ class MSN {
         $this->ns_writeln("VER $this->id $this->protocol CVR0");
 
         $start_tm = time();
-        while (!feof($this->NSfp))
+        while (!self::socketcheck($this->NSfp))
         {
             $data = $this->ns_readln();
             // no data?
             if ($data === false) {
-                if ($this->timeout > 0) {
-                    $now_tm = time();
-                    $used_time = ($now_tm >= $start_tm) ? $now_tm - $start_tm : $now_tm;
-                    if ($used_time > $this->timeout) {
-                        // logout now
-                        // NS: >>> OUT
-                        $this->ns_writeln("OUT");
-                        fclose($this->NSfp);
-                        $this->error = 'Timeout, maybe protocol changed!';
-                        $this->debug_message("*** $this->error");
-                        return false;
-                    }
-                }
-                continue;
+                // logout now
+                // NS: >>> OUT
+                $this->ns_writeln("OUT");
+                @fclose($this->NSfp);
+                $this->error = 'Timeout, maybe protocol changed!';
+                $this->debug_message("*** $this->error");
+                return false;
             }
+
             $code = substr($data, 0, 3);
             $start_tm = time();
 
@@ -1015,7 +1022,7 @@ class MSN {
                         // logout now
                         // NS: >>> OUT
                         $this->ns_writeln("OUT");
-                        fclose($this->NSfp);
+                        @fclose($this->NSfp);
                         $this->error = 'Passport authenticated fail!';
                         $this->debug_message("*** $this->error");
                         return false;
@@ -1041,7 +1048,7 @@ class MSN {
                     if($Type!='NS') break;
                     @list($ip, $port) = @explode(':', $server);
                     // this connection will close after XFR
-                    fclose($this->NSfp);
+                    @fclose($this->NSfp);
 
                     $this->NSfp = @fsockopen($ip, $port, $errno, $errstr, 5);
                     if (!$this->NSfp) {
@@ -1050,7 +1057,7 @@ class MSN {
                         return false;
                     }
 
-                    stream_set_timeout($this->NSfp, $this->NSStreamTimeout);
+                    stream_set_timeout($this->NSfp, $this->timeout);
                     // MSNP9
                     // NS: >> VER {id} MSNP9 CVR0
                     // MSNP15
@@ -1073,7 +1080,7 @@ class MSN {
                         // logout now
                         // NS: >>> OUT
                         $this->ns_writeln("OUT");
-                        fclose($this->NSfp);
+                        @fclose($this->NSfp);
                         $this->error = "Error code: $code, please check the detail information from: http://msnpiki.msnfanatic.com/index.php/Reference:Error_List";
                         $this->debug_message("*** $this->error");
                         return false;
@@ -1087,13 +1094,14 @@ class MSN {
 
     /**
      * Sign onto the NS server and retrieve the address book
+     *
+     * @return void
      */
     public function signon() {
-        $this->log_message("*** try to connect to MSN network");
-        
+        $this->debug_message("*** try to connect to MSN network");
+
         while(true) {
-            while(!$this->connect($this->user, $this->password))
-            {
+            while(!$this->connect($this->user, $this->password)) {
                 $this->signonFailure("!!! Can't connect to server: $this->error");
             }
             if($this->UpdateContacts() === false) {
@@ -1101,11 +1109,10 @@ class MSN {
                 continue;
             }
             $this->LastPing=time();
-            $this->log_message("*** connected, wait for command");
             $start_tm = time();
             $ping_tm = time();
             if(($this->aContactList = $this->getMembershipList()) === false) {
-                $this->signonFailure('!!! Get Membership list failed');
+                $this->signonFailure('!!! Get membership list failed');
                 continue;
             }
             if ($this->update_pending) {
@@ -1206,21 +1213,26 @@ class MSN {
             $len = strlen($str);
             $this->ns_writeln("UUX $this->id $len");
             $this->ns_writedata($str);
-            break;
+            if(!socketcheck($this->NSfp)) {
+                $this->debug_message("*** connected, wait for command");
+                break;
+            } else {
+                $this->NSRetryWait($this->retry_wait);
+            }
         }
     }
-    
+
     /**
     * Called if there is an error during signon
-    * 
-    * @param $message Error message to log
+    *
+    * @param string $message Error message to log
     */
     private function signonFailure($message) {
-        $this->log_message($message);
-        $this->callHandler('ConnectFailed', NULL);
+        $this->debug_message($message);
+        $this->callHandler('ConnectFailed');
         $this->NSRetryWait($this->retry_wait);
     }
-    
+
     function derive_key($key, $magic) {
         $hash1 = mhash(MHASH_SHA1, $magic, $key);
         $hash2 = mhash(MHASH_SHA1, $hash1.$magic, $key);
@@ -1441,6 +1453,7 @@ class MSN {
             $this->debug_message("*** OIM ($msgid) deleted");
         return $sMsg;
     }
+
     private function NSLogout() {
         if (is_resource($this->NSfp) && !feof($this->NSfp)) {
             // logout now
@@ -1448,753 +1461,14 @@ class MSN {
             $this->ns_writeln("OUT");
             fclose($this->NSfp);
             $this->NSfp = false;
-            $this->log_message("*** logout now!");
+            $this->debug_message("*** logout now!");
         }
 
     }
-    private function NSRetryWait($Wait) {
-        $this->log_message("*** wait for $Wait seconds");
-        for($i=0;$i<$Wait;$i++) {
-            sleep(1);
-            if($this->kill_me) return false;
-        }
-        return true;
-    }
-    public function ProcessSendMessageFileQueue() {
-        $aFiles = glob(MSN_CLASS_SPOOL_DIR.DIRECTORY_SEPARATOR.'*.msn');
-        if (!is_array($aFiles)) return true;
-        clearstatcache();
-        foreach ($aFiles as $filename) {
-            $fp = fopen($filename, 'rt');
-            if (!$fp) continue;
-            $aTo = array();
-            $sMessage = '';
-            $buf = trim(fgets($fp));
-            if (substr($buf, 0, 3) == 'TO:') {
-                $aTo = @explode(',', str_replace(array("\r","\n","\t",' '),'',substr($buf, 3)));
-                while (!feof($fp)) $sMessage.=rtrim(fgets($fp))."\n";
-            }
-            fclose($fp);
-            if (!is_array($aTo) || count($aTo) == 0 || $sMessage == '')
-            $this->log_message("!!! message format error? delete $filename");
-            else
-            {
-                foreach($aTo as $To)
-                {
-                    @list($user, $domain, $network) = @explode('@', $To);
-                    $MessageList[$network]["$user@$domain"]=$sMessage;
-                }
-            }
-            if($this->backup_file)
-            {
-                $backup_dir = MSN_CLASS_SPOOL_DIR.'/backup';
-                if (!file_exists($backup_dir)) @mkdir($backup_dir);
-                $backup_name = $backup_dir.'/'.strftime('%Y%m%d%H%M%S').'_'.posix_getpid().'_'.basename($filename);
-                if (@rename($filename, $backup_name))
-                $this->log_message("*** move file to $backup_name");
-            }
-            else @unlink($filename);
-        }
-        foreach ($MessageList as $network => $Messages)
-        {
-            switch(trim($network))
-            {
-                case '':
-                case 1:   //MSN
-                    // okay, try to ask a switchboard (SB) for sending message
-                    // NS: >>> XFR {id} SB
-                    // $this->ns_writeln("XFR $this->id SB");
-                    foreach($Messages as $User => $Message)
-                    $this->MessageQueue[$User][]=$Message;
-                    break;
-                case 'Offline':  //MSN
-                    //Send OIM
-                    //FIXME: 修正Send OIM
-                    foreach($Messages as $To => $Message)
-                    {
-                        $lockkey='';
-                        for ($i = 0; $i < $this->oim_try; $i++)
-                        {
-                            if(($oim_result = $this->sendOIM($To, $Message, $lockkey))===true) break;
-                            if (is_array($oim_result) && $oim_result['challenge'] !== false) {
-                                // need challenge lockkey
-                                $this->log_message("*** we need a new challenge code for ".$oim_result['challenge']);
-                                $lockkey = $this->getChallenge($oim_result['challenge']);
-                                continue;
-                            }
-                            if ($oim_result === false || $oim_result['auth_policy'] !== false)
-                            {
-                                if ($this->re_login)
-                                {
-                                    $this->log_message("*** can't send OIM, but we already re-login again, so ignore this OIM");
-                                    break;
-                                }
-                                $this->log_message("*** can't send OIM, maybe ticket expired, try to login again");
-                                // maybe we need to re-login again
-                                if(!$this->get_passport_ticket())
-                                {
-                                    $this->log_message("*** can't re-login, something wrong here, ignore this OIM");
-                                    break;
-                                }
-                                $this->log_message("**** get new ticket, try it again");
-                                continue;
-                            }
-                        }
-                    }
-                    break;
-                default:  //Other
-                    foreach($Messages as $To => $Message) {
-                        $Message=$this->getMessage($Message, $network);
-                        $len = strlen($Message);
-                        $this->ns_writeln("UUM $this->id $To $network 1 $len");
-                        $this->ns_writedata($Message);
-                        $this->log_message("*** sent to $To (network: $network):\n$Message");
-                    }
-            }
-        }
-        if(isset($this->MessageQueue[$User])&&(!isset($this->MessageQueue[$User]['XFRSent'])))
-        {
-            $this->MessageQueue[$User]['XFRSent']=false;
-            $this->MessageQueue[$User]['ReqTime']=false;
-        }
-        return true;
-    }
-    public function SignalFunction($signal)
-    {
-        switch($signal)
-        {
-            case SIGTRAP:
-            case SIGTERM:
-            case SIGHUP:
-                $this->End();
-                return;
-            case SIGCHLD:
-                $ChildPid=pcntl_wait($status,WUNTRACED);
-                if($ChildPid>0)
-                {
-                    $this->log_message("*** Child Process End for ".$this->ChildProcess[$ChildPid]);
-                    unset($this->ChildProcess[$ChildPid]);
-                }
-                return;
-        }
-    }
 
-    public function Run()
-    {
-        $this->log_message("*** startup ***");
-        if(!pcntl_signal(SIGCHLD,array($this,'SignalFunction'))) die("Signal SIGCHLD Error\n");
-        if(!pcntl_signal(SIGTERM,array($this,'SignalFunction'))) die("Signal SIGTERM Error\n");
-        if(!pcntl_signal(SIGTRAP,array($this,'SignalFunction'))) die("Signal SIGTRAP Error\n");
-        $process_file = false;
-        $sent = false;
-        $aADL = array();
-        $aContactList = array();
-        while (true)
-        {
-            if($this->kill_me)
-            {
-                $this->log_message("*** Okay, kill me now!");
-                return $this->NSLogout();
-            }
-            if (!is_resource($this->NSfp) || feof($this->NSfp))
-            {
-                $this->log_message("*** try to connect to MSN network");
-                if (!$this->connect($this->user, $this->password))
-                {
-                    $this->log_message("!!! Can't connect to server: $this->error");
-                    if(!$this->NSRetryWait($this->retry_wait)) continue;
-                }
-                $this->UpdateContacts();
-                $this->LastPing=time();
-                $this->log_message("*** connected, wait for command");
-                $start_tm = time();
-                $ping_tm = time();
-                    $aContactList = $this->getMembershipList();
-                    if ($this->update_pending) {
-                        if (is_array($aContactList)) {
-                            $pending = 'Pending';
-                            foreach ($aContactList as $u_domain => $aUserList) {
-                                foreach ($aUserList as $u_name => $aNetworks) {
-                                    foreach ($aNetworks as $network => $aData) {
-                                        if (isset($aData[$pending])) {
-                                            // pending list
-                                            $cnt = 0;
-                                            foreach (array('Allow', 'Reverse') as $list) {
-                                                if (isset($aData[$list]))
-                                                $cnt++;
-                                                else {
-                                                    if ($this->addMemberToList($u_name.'@'.$u_domain, $network, $list)) {
-                                                        $aContactList[$u_domain][$u_name][$network][$list] = false;
-                                                        $cnt++;
-                                                    }
-                                                }
-                                            }
-                                            if ($cnt >= 2) {
-                                                $id = $aData[$pending];
-                                                // we can delete it from pending now
-                                                if ($this->delMemberFromList($id, $u_name.'@'.$u_domain, $network, $pending))
-                                                unset($aContactList[$u_domain][$u_name][$network][$pending]);
-                                            }
-                                        }
-                                        else {
-                                            // sync list
-                                            foreach (array('Allow', 'Reverse') as $list) {
-                                                if (!isset($aData[$list])) {
-                                                    if ($this->addMemberToList($u_name.'@'.$u_domain, $network, $list))
-                                                    $aContactList[$u_domain][$u_name][$network][$list] = false;
-                                                }
-                                            }
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    }
-                    $n = 0;
-                    $sList = '';
-                    $len = 0;
-                    if (is_array($aContactList)) {
-                        foreach ($aContactList as $u_domain => $aUserList) {
-                            $str = '<d n="'.$u_domain.'">';
-                            $len += strlen($str);
-                            if ($len > 7400) {
-                                $aADL[$n] = '<ml l="1">'.$sList.'</ml>';
-                                $n++;
-                                $sList = '';
-                                $len = strlen($str);
-                            }
-                            $sList .= $str;
-                            foreach ($aUserList as $u_name => $aNetworks) {
-                                foreach ($aNetworks as $network => $status) {
-                                    $str = '<c n="'.$u_name.'" l="3" t="'.$network.'" />';
-                                    $len += strlen($str);
-                                    // max: 7500, but <ml l="1"></d></ml> is 19,
-                                    // so we use 7475
-                                    if ($len > 7475) {
-                                        $sList .= '</d>';
-                                        $aADL[$n] = '<ml l="1">'.$sList.'</ml>';
-                                        $n++;
-                                        $sList = '<d n="'.$u_domain.'">'.$str;
-                                        $len = strlen($sList);
-                                    }
-                                    else
-                                    $sList .= $str;
-                                }
-                            }
-                            $sList .= '</d>';
-                        }
-                    }
-                    $aADL[$n] = '<ml l="1">'.$sList.'</ml>';
-                    // NS: >>> BLP {id} BL
-                    $this->ns_writeln("BLP $this->id BL");
-                    foreach ($aADL as $str) {
-                        $len = strlen($str);
-                        // NS: >>> ADL {id} {size}
-                        $this->ns_writeln("ADL $this->id $len");
-                        $this->ns_writedata($str);
-                    }
-                    // NS: >>> PRP {id} MFN name
-                    if ($this->alias == '') $this->alias = $user;
-                    $aliasname = rawurlencode($this->alias);
-                    $this->ns_writeln("PRP $this->id MFN $aliasname");
-                    //設定個人大頭貼
-                    //$MsnObj=$this->PhotoStckObj();
-                    // NS: >>> CHG {id} {status} {clientid} {msnobj}
-                    $this->ns_writeln("CHG $this->id NLN $this->clientid");                    
-                    if($this->PhotoStickerFile!==false)
-                        $this->ns_writeln("CHG $this->id NLN $this->clientid ".rawurlencode($this->MsnObj($this->PhotoStickerFile)));
-                    // NS: >>> UUX {id} length
-                    $str = '<Data><PSM>'.htmlspecialchars($this->psm).'</PSM><CurrentMedia></CurrentMedia><MachineGuid></MachineGuid></Data>';
-                    $len = strlen($str);
-                    $this->ns_writeln("UUX $this->id $len");
-                    $this->ns_writedata($str);               
-            }
-            $data = $this->ns_readln();
-            if($data===false)
-            {
-                //If No NS Message Process SendMessageFileQueue
-                if (time()-$this->LastPing > $this->ping_wait)
-                {
-                    // NS: >>> PNG
-                    $this->ns_writeln("PNG");
-                    $this->LastPing = time();
-                }
-                if(count($this->ChildProcess)<$this->MAXChildProcess)
-                {
-                    $Index=0;
-                    foreach($this->MessageQueue as $User => $Message)
-                    {
-                        if(!trim($User)) continue;
-                        if($Inxdex>=$this->MAXChildProcess-count($this->ChildProcess)) break;
-                        if((!$Message['XFRSent'])||($Message['XFRSent']&&(time()-$this->MessageQueue[$User]['ReqTime']>$this->ReqSBXFRTimeout)))
-                        {
-                            $this->MessageQueue[$User]['XFRSent']=true;
-                            $this->MessageQueue[$User]['ReqTime']=time();
-                            $this->log_message("*** Request SB for $User");
-                            $this->ns_writeln("XFR $this->id SB");
-                            $Index++;
-                        }
-                    }
-                }
-                if($this->ProcessSendMessageFileQueue()) continue;
-                break;
-            }
-            switch (substr($data,0,3))
-            {
-                case 'SBS':
-                    // after 'USR {id} OK {user} {verify} 0' response, the server will send SBS and profile to us
-                    // NS: <<< SBS 0 null
-                    break;
-
-                case 'RFS':
-                    // FIXME:
-                    // NS: <<< RFS ???
-                    // refresh ADL, so we re-send it again
-                    if (is_array($aADL)) {
-                        foreach ($aADL as $str) {
-                            $len = strlen($str);
-                            // NS: >>> ADL {id} {size}
-                            $this->ns_writeln("ADL $this->id $len");
-                            $this->ns_writedata($str);
-                        }
-                    }
-                    break;
-
-                case 'LST':
-                    // NS: <<< LST {email} {alias} 11 0
-                    @list(/* LST */, $email, /* alias */, ) = @explode(' ', $data);
-                    @list($u_name, $u_domain) = @explode('@', $email);
-                    if (!isset($aContactList[$u_domain][$u_name][1])) {
-                        $aContactList[$u_domain][$u_name][1]['Allow'] = 'Allow';
-                        $this->log_message("*** add to our contact list: $u_name@$u_domain");
-                    }
-                    break;
-
-                case 'ADL':
-                    // randomly, we get ADL command, someome add us to their contact list for MSNP15
-                    // NS: <<< ADL 0 {size}
-                    @list(/* ADL */, /* 0 */, $size,) = @explode(' ', $data);
-                    if (is_numeric($size) && $size > 0)
-                    {
-                        $data = $this->ns_readdata($size);
-                        preg_match('#<ml><d n="([^"]+)"><c n="([^"]+)"(.*) t="(\d*)"(.*) /></d></ml>#', $data, $matches);
-                        if (is_array($matches) && count($matches) > 0)
-                        {
-                            $u_domain = $matches[1];
-                            $u_name = $matches[2];
-                            $network = $matches[4];
-                            if (isset($aContactList[$u_domain][$u_name][$network]))
-                            $this->log_message("*** someone (network: $network) add us to their list (but already in our list): $u_name@$u_domain");
-                            else
-                            {
-                                $this->re_login = false;
-                                $cnt = 0;
-                                foreach (array('Allow', 'Reverse') as $list)
-                                {
-                                    if (!$this->addMemberToList($u_name.'@'.$u_domain, $network, $list))
-                                    {
-                                        if ($this->re_login) {
-                                            $this->log_message("*** can't add $u_name@$u_domain (network: $network) to $list");
-                                            continue;
-                                        }
-                                        $aTickets = $this->get_passport_ticket();
-                                        if (!$aTickets || !is_array($aTickets)) {
-                                            // failed to login? ignore it
-                                            $this->log_message("*** can't re-login, something wrong here");
-                                            $this->log_message("*** can't add $u_name@$u_domain (network: $network) to $list");
-                                            continue;
-                                        }
-                                        $this->re_login = true;
-                                        $this->ticket = $aTickets;
-                                        $this->log_message("**** get new ticket, try it again");
-                                        if (!$this->addMemberToList($u_name.'@'.$u_domain, $network, $list))
-                                        {
-                                            $this->log_message("*** can't add $u_name@$u_domain (network: $network) to $list");
-                                            continue;
-                                        }
-                                    }
-                                    $aContactList[$u_domain][$u_name][$network][$list] = false;
-                                    $cnt++;
-                                }
-                                $this->log_message("*** someone (network: $network) add us to their list: $u_name@$u_domain");
-                            }
-                            $str = '<ml l="1"><d n="'.$u_domain.'"><c n="'.$u_name.'" l="3" t="'.$network.'" /></d></ml>';
-                            $len = strlen($str);
-                        }
-                        else
-                        $this->log_message("*** someone add us to their list: $data");
-                        $this->AddUsToMemberList($u_name.'@'.$u_domain, $network);
-                    }
-                    break;
-
-                case 'RML':
-                    // randomly, we get RML command, someome remove us to their contact list for MSNP15
-                    // NS: <<< RML 0 {size}
-                    @list(/* RML */, /* 0 */, $size,) = @explode(' ', $data);
-                    if (is_numeric($size) && $size > 0)
-                    {
-                        $data = $this->ns_readdata($size);
-                        preg_match('#<ml><d n="([^"]+)"><c n="([^"]+)"(.*) t="(\d*)"(.*) /></d></ml>#', $data, $matches);
-                        if (is_array($matches) && count($matches) > 0)
-                        {
-                            $u_domain = $matches[1];
-                            $u_name = $matches[2];
-                            $network = $matches[4];
-                            if (isset($aContactList[$u_domain][$u_name][$network]))
-                            {
-                                $aData = $aContactList[$u_domain][$u_name][$network];
-                                foreach ($aData as $list => $id)
-                                $this->delMemberFromList($id, $u_name.'@'.$u_domain, $network, $list);
-                                unset($aContactList[$u_domain][$u_name][$network]);
-                                $this->log_message("*** someone (network: $network) remove us from their list: $u_name@$u_domain");
-                            }
-                            else
-                            $this->log_message("*** someone (network: $network) remove us from their list (but not in our list): $u_name@$u_domain");
-                            $this->RemoveUsFromMemberList($u_name.'@'.$u_domain, $network);
-                        }
-                        else
-                        $this->log_message("*** someone remove us from their list: $data");
-                    }
-                    break;
-
-                case 'MSG':
-                    // randomly, we get MSG notification from server
-                    // NS: <<< MSG Hotmail Hotmail {size}
-                    @list(/* MSG */, /* Hotmail */, /* Hotmail */, $size,) = @explode(' ', $data);
-                    if (is_numeric($size) && $size > 0) {
-                        $data = $this->ns_readdata($size);
-                        $aLines = @explode("\n", $data);
-                        $header = true;
-                        $ignore = false;
-                        $maildata = '';
-                        foreach ($aLines as $line) {
-                            $line = rtrim($line);
-                            if ($header) {
-                                if ($line === '') {
-                                    $header = false;
-                                    continue;
-                                }
-                                if (strncasecmp($line, 'Content-Type:', 13) == 0) {
-                                    if (strpos($line, 'text/x-msmsgsinitialmdatanotification') === false &&
-                                    strpos($line, 'text/x-msmsgsoimnotification') === false) {
-                                        // we just need text/x-msmsgsinitialmdatanotification
-                                        // or text/x-msmsgsoimnotification
-                                        $ignore = true;
-                                        break;
-                                    }
-                                }
-                                continue;
-                            }
-                            if (strncasecmp($line, 'Mail-Data:', 10) == 0) {
-                                $maildata = trim(substr($line, 10));
-                                break;
-                            }
-                        }
-                        if ($ignore) {
-                            $this->log_message("*** ingnore MSG for: $line");
-                            break;
-                        }
-                        if ($maildata == '') {
-                            $this->log_message("*** ingnore MSG not for OIM");
-                            break;
-                        }
-                        $this->re_login = false;
-                        if (strcasecmp($maildata, 'too-large') == 0) {
-                            $this->log_message("*** large mail-data, need to get the data via SOAP");
-                            $maildata = $this->getOIM_maildata();
-                            if ($maildata === false) {
-                                $this->log_message("*** can't get mail-data via SOAP");
-                                // maybe we need to re-login again
-                                $aTickets = $this->get_passport_ticket();
-                                if (!$aTickets || !is_array($aTickets)) {
-                                    // failed to login? ignore it
-                                    $this->log_message("*** can't re-login, something wrong here, ignore this OIM");
-                                    break;
-                                }
-                                $this->re_login = true;
-                                $this->ticket = $aTickets;
-                                $this->log_message("**** get new ticket, try it again");
-                                $maildata = $this->getOIM_maildata();
-                                if ($maildata === false) {
-                                    $this->log_message("*** can't get mail-data via SOAP, and we already re-login again, so ignore this OIM");
-                                    break;
-                                }
-                            }
-                        }
-                        // could be a lots of <M>...</M>, so we can't use preg_match here
-                        $p = $maildata;
-                        $aOIMs = array();
-                        while (1) {
-                            $start = strpos($p, '<M>');
-                            $end = strpos($p, '</M>');
-                            if ($start === false || $end === false || $start > $end) break;
-                            $end += 4;
-                            $sOIM = substr($p, $start, $end - $start);
-                            $aOIMs[] = $sOIM;
-                            $p = substr($p, $end);
-                        }
-                        if (count($aOIMs) == 0) {
-                            $this->log_message("*** ingnore empty OIM");
-                            break;
-                        }
-                        foreach ($aOIMs as $maildata) {
-                            // T: 11 for MSN, 13 for Yahoo
-                            // S: 6 for MSN, 7 for Yahoo
-                            // RT: the datetime received by server
-                            // RS: already read or not
-                            // SZ: size of message
-                            // E: sender
-                            // I: msgid
-                            // F: always 00000000-0000-0000-0000-000000000009
-                            // N: sender alias
-                            preg_match('#<T>(.*)</T>#', $maildata, $matches);
-                            if (count($matches) == 0) {
-                                $this->log_message("*** ingnore OIM maildata without <T>type</T>");
-                                continue;
-                            }
-                            $oim_type = $matches[1];
-                            if ($oim_type = 13)
-                            $network = 32;
-                            else
-                            $network = 1;
-                            preg_match('#<E>(.*)</E>#', $maildata, $matches);
-                            if (count($matches) == 0) {
-                                $this->log_message("*** ingnore OIM maildata without <E>sender</E>");
-                                continue;
-                            }
-                            $oim_sender = $matches[1];
-                            preg_match('#<I>(.*)</I>#', $maildata, $matches);
-                            if (count($matches) == 0) {
-                                $this->log_message("*** ingnore OIM maildata without <I>msgid</I>");
-                                continue;
-                            }
-                            $oim_msgid = $matches[1];
-                            preg_match('#<SZ>(.*)</SZ>#', $maildata, $matches);
-                            $oim_size = (count($matches) == 0) ? 0 : $matches[1];
-                            preg_match('#<RT>(.*)</RT>#', $maildata, $matches);
-                            $oim_time = (count($matches) == 0) ? 0 : $matches[1];
-                            $this->log_message("*** You've OIM sent by $oim_sender, Time: $oim_time, MSGID: $oim_msgid, size: $oim_size");
-                            $sMsg = $this->getOIM_message($oim_msgid);
-                            if ($sMsg === false) {
-                                $this->log_message("*** can't get OIM, msgid = $oim_msgid");
-                                if ($this->re_login) {
-                                    $this->log_message("*** can't get OIM via SOAP, and we already re-login again, so ignore this OIM");
-                                    continue;
-                                }
-                                $aTickets = $this->get_passport_ticket();
-                                if (!$aTickets || !is_array($aTickets)) {
-                                    // failed to login? ignore it
-                                    $this->log_message("*** can't re-login, something wrong here, ignore this OIM");
-                                    continue;
-                                }
-                                $this->re_login = true;
-                                $this->ticket = $aTickets;
-                                $this->log_message("**** get new ticket, try it again");
-                                $sMsg = $this->getOIM_message($oim_msgid);
-                                if ($sMsg === false) {
-                                    $this->log_message("*** can't get OIM via SOAP, and we already re-login again, so ignore this OIM");
-                                    continue;
-                                }
-                            }
-                            $this->log_message("*** MSG (Offline) from $oim_sender (network: $network): $sMsg");
-
-                            $this->ReceivedMessage($oim_sender,$sMsg,$network,true);
-                        }
-                    }
-                    break;
-
-                case 'UBM':
-                    // randomly, we get UBM, this is the message from other network, like Yahoo!
-                    // NS: <<< UBM {email} $network $type {size}
-                    @list(/* UBM */, $from_email, $network, $type, $size,) = @explode(' ', $data);
-                    if (is_numeric($size) && $size > 0)
-                    {
-                        $data = $this->ns_readdata($size);
-                        $aLines = @explode("\n", $data);
-                        $header = true;
-                        $ignore = false;
-                        $sMsg = '';
-                        foreach ($aLines as $line) {
-                            $line = rtrim($line);
-                            if ($header) {
-                                if ($line === '') {
-                                    $header = false;
-                                    continue;
-                                }
-                                if (strncasecmp($line, 'TypingUser:', 11) == 0) {
-                                    $ignore = true;
-                                    break;
-                                }
-                                continue;
-                            }
-                            $aSubLines = @explode("\r", $line);
-                            foreach ($aSubLines as $str) {
-                                if ($sMsg !== '')
-                                $sMsg .= "\n";
-                                $sMsg .= $str;
-                            }
-                        }
-                        if($ignore)
-                        {
-                            $this->log_message("*** ingnore from $from_email: $line");
-                            break;
-                        }
-                        $this->log_message("*** MSG from $from_email (network: $network): $sMsg");
-                        $this->ReceivedMessage($from_email,$sMsg,$network,false);
-                    }
-                    break;
-
-                case 'UBX':
-                    // randomly, we get UBX notification from server
-                    // NS: <<< UBX email {network} {size}
-                    @list(/* UBX */, /* email */, /* network */, $size,) = @explode(' ', $data);
-                    // we don't need the notification data, so just ignore it
-                    if (is_numeric($size) && $size > 0)
-                    $this->ns_readdata($size);
-                    break;
-
-                case 'CHL':
-                    // randomly, we'll get challenge from server
-                    // NS: <<< CHL 0 {code}
-                    @list(/* CHL */, /* 0 */, $chl_code,) = @explode(' ', $data);
-                    $fingerprint = $this->getChallenge($chl_code);
-                    // NS: >>> QRY {id} {product_id} 32
-                    // NS: >>> fingerprint
-                    $this->ns_writeln("QRY $this->id $this->prod_id 32");
-                    $this->ns_writedata($fingerprint);
-                    $this->ns_writeln("CHG $this->id NLN $this->clientid");                    
-                    if($this->PhotoStickerFile!==false)
-                        $this->ns_writeln("CHG $this->id NLN $this->clientid ".rawurlencode($this->MsnObj($this->PhotoStickerFile)));
-                    break;
-                case 'CHG':
-                    // NS: <<< CHG {id} {status} {code}
-                    // ignore it
-                    // change our status to online first
-                    break;
-
-                case 'XFR':
-                    // sometimes, NS will redirect to another NS
-                    // MSNP9
-                    // NS: <<< XFR {id} NS {server} 0 {server}
-                    // MSNP15
-                    // NS: <<< XFR {id} NS {server} U D
-                    // for normal switchboard XFR
-                    // NS: <<< XFR {id} SB {server} CKI {cki} U messenger.msn.com 0
-                    @list(/* XFR */, /* {id} */, $server_type, $server, /* CKI */, $cki_code, /* ... */) = @explode(' ', $data);
-                    @list($ip, $port) = @explode(':', $server);
-                    if ($server_type != 'SB') {
-                        // maybe exit?
-                        // this connection will close after XFR
-                        $this->NSLogout();
-                        continue;
-                    }
-                    if(count($this->MessageQueue))
-                    {
-                        foreach($this->MessageQueue as $User => $Message)
-                        {
-                            //$this->ChildProcess[$ChildPid]
-                            $this->log_message("*** XFR SB $User");
-                            $pid=pcntl_fork();
-                            if($pid)
-                            {
-                                //Parrent Process
-                                $this->ChildProcess[$pid]=$User;
-                                break;
-                            }
-                            elseif($pid==-1)
-                            {
-                                $this->log_message("*** Fork Error $User");
-                                break;
-                            }
-                            else
-                            {
-                                //Child Process
-                                $this->log_message("*** Child Process Start for $User");
-                                unset($Message['XFRSent']);
-                                unset($Message['ReqTime']);
-                                $bSBresult = $this->switchboard_control($ip, $port, $cki_code, $User, $Message);
-                                if ($bSBresult === false)
-                                {
-                                    // error for switchboard
-                                    $this->log_message("!!! error for sending message to ".$User);
-                                }
-                                die;
-                            }
-                        }
-                        unset($this->MessageQueue[$User]);
-                    }
-                    /*
-                     $bSBresult = $this->switchboard_control($ip, $port, $cki_code, $aMSNUsers[$nCurrentUser], $sMessage);
-                     if ($bSBresult === false) {
-                     // error for switchboard
-                     $this->log_message("!!! error for sending message to ".$aMSNUsers[$nCurrentUser]);
-                     $aOfflineUsers[] = $aMSNUsers[$nCurrentUser];
-                     }*/
-                    break;
-                case 'QNG':
-                    // NS: <<< QNG {time}
-                    @list(/* QNG */, $this->ping_wait) = @explode(' ', $data);
-                    if ($this->ping_wait == 0) $this->ping_wait = 50;
-                    //if (is_int($use_ping) && $use_ping > 0) $ping_wait = $use_ping;
-                    //Mod by Ricky Set Online
-                    break;
-
-                case 'RNG':
-                    if($this->PhotoStickerFile!==false)
-                        $this->ns_writeln("CHG $this->id NLN $this->clientid ".rawurlencode($this->MsnObj($this->PhotoStickerFile)));
-                    else
-                        $this->ns_writeln("CHG $this->id NLN $this->clientid");
-                    // someone is trying to talk to us
-                    // NS: <<< RNG {session_id} {server} {auth_type} {ticket} {email} {alias} U {client} 0
-                    $this->log_message("NS: <<< RNG $data");
-                    @list(/* RNG */, $sid, $server, /* auth_type */, $ticket, $email, $name, ) = @explode(' ', $data);
-                    @list($sb_ip, $sb_port) = @explode(':', $server);
-                    if($this->IsIgnoreMail($email)) 
-                    {
-                        $this->log_message("*** Ignore RNG from $email");
-                        break;
-                    }
-                    $this->log_message("*** RING from $email, $sb_ip:$sb_port");
-                    $this->addContact($email,1,$email, true);
-                    $pid=pcntl_fork();
-                    if($pid)
-                    {
-                        //Parrent Process
-                        $this->ChildProcess[$pid]='RNG';
-                        break;
-                    }
-                    elseif($pid==-1)
-                    {
-                        $this->log_message("*** Fork Error $User");
-                        break;
-                    }
-                    else
-                    {
-                        //Child Process
-                        $this->log_message("*** Ring Child Process Start for $User");
-                        $this->switchboard_ring($sb_ip, $sb_port, $sid, $ticket,$email);
-                        die;
-                    }
-                    break;
-                case 'OUT':
-                    // force logout from NS
-                    // NS: <<< OUT xxx
-                    fclose($this->NSfp);
-                    $this->log_message("*** LOGOUT from NS");
-                    break;
-
-                default:
-                    $code = substr($data,0,3);
-                    if (is_numeric($code)) {
-                        $this->error = "Error code: $code, please check the detail information from: http://msnpiki.msnfanatic.com/index.php/Reference:Error_List";
-                        $this->debug_message("*** NS: $this->error");
-
-                        return $this->NsLogout();
-                    }
-                    break;
-            }
-        }
-        return $this->NsLogout();
+    private function NSRetryWait($wait) {
+        $this->debug_message("*** wait for $Wait seconds");
+        sleep($wait);
     }
 
     function getChallenge($code)
@@ -2323,7 +1597,7 @@ class MSN {
             $data = $this->SB_readln();
             if($this->kill_me)
             {
-                $this->log_message("*** SB Okay, kill me now!");
+                $this->debug_message("*** SB Okay, kill me now!");
                 break;
             }
             if($data === false)
@@ -2362,11 +1636,11 @@ class MSN {
                 case 'IRO':
                     // SB: <<< IRO {id} {rooster} {roostercount} {email} {alias} {clientid}
                     @list(/* IRO */, /* id */, $cur_num, $total, $email, $alias, $clientid) = @explode(' ', $data);
-                    $this->log_message("*** $email join us");
+                    $this->debug_message("*** $email join us");
                     $Joined=true;
                     break;
                 case 'BYE':
-                    $this->log_message("*** Quit for BYE");
+                    $this->debug_message("*** Quit for BYE");
                     $SessionEnd=true;
                     break;
                 case 'USR':
@@ -2453,7 +1727,7 @@ class MSN {
                     }
                     if ($ignore)
                     {
-                        $this->log_message("*** ingnore from $from_email: $line");
+                        $this->debug_message("*** ingnore from $from_email: $line");
                         break;
                     }
                     if ($is_p2p)
@@ -2461,18 +1735,18 @@ class MSN {
                         // we will ignore any p2p message after sending acknowledgement
                         $ignore = true;
                         $len = strlen($sMsg);
-                        $this->log_message("*** p2p message from $from_email, size $len");
+                        $this->debug_message("*** p2p message from $from_email, size $len");
                         // header = 48 bytes
                         // content >= 0 bytes
                         // footer = 4 bytes
                         // so it need to >= 52 bytes
                         /*if ($len < 52) {
-                            $this->log_message("*** p2p: size error, less than 52!");
+                            $this->debug_message("*** p2p: size error, less than 52!");
                             break;
                         }*/
                         $aDwords = @unpack("V12dword", $sMsg);
                         if (!is_array($aDwords)) {
-                            $this->log_message("*** p2p: header unpack error!");
+                            $this->debug_message("*** p2p: header unpack error!");
                             break;
                         }
                         $this->debug_message("*** p2p: dump received message:\n".$this->dump_binary($sMsg));
@@ -2532,9 +1806,9 @@ class MSN {
                             $len = strlen($message);
                             $this->SB_writeln("MSG $this->id D $len");
                             $this->SB_writedata($message);
-                            $this->log_message("*** p2p: send display picture acknowledgement for $hdr_SessionID");
-                            $this->debug_message("*** p2p: Invite ACK message:\n".$this->dump_binary($message));                            
-                            $this->SB_readln();//Read ACK;                            
+                            $this->debug_message("*** p2p: send display picture acknowledgement for $hdr_SessionID");
+                            $this->debug_message("*** p2p: Invite ACK message:\n".$this->dump_binary($message));
+                            $this->SB_readln();//Read ACK;
                             $this->debug_message("*** p2p: Invite ACK Hdr:\n".$this->dump_binary($hdr));
                             $new_id-=3;
                             //Send 200 OK message
@@ -2570,7 +1844,7 @@ class MSN {
                             $this->SB_writedata($message);
                             $this->debug_message("*** p2p: dump 200 ok message:\n".$this->dump_binary($message));
                             $this->SB_readln();//Read ACK;
-                            
+
                             $this->debug_message("*** p2p: 200 ok:\n".$this->dump_binary($hdr));
                             //send Data preparation message
                             //send 4 null bytes as data
@@ -2639,7 +1913,7 @@ class MSN {
                                 "BYE MSNMSGR:MSNSLP/1.0\r\n".
                                 "To: <msnmsgr:$from_email>\r\n".
                                 "From: <msnmsgr:".$this->user.">\r\n".
-                                "Via: MSNSLP/1.0/TLP ;branch={".$BranchGUID."}\r\n".                            
+                                "Via: MSNSLP/1.0/TLP ;branch={".$BranchGUID."}\r\n".
                                 "CSeq: 0\r\n".
                                 "Call-ID: ".$MsgBody['Call-ID']."\r\n".
                                 "Max-Forwards: 0\r\n".
@@ -2649,7 +1923,7 @@ class MSN {
                             $hdr_TotalDataSizeLow=strlen($MessagePayload);
                             $hdr_TotalDataSizeHigh=0;
                             $new_id++;
-                            $hdr = pack("LLLLLLLLLLLL", 
+                            $hdr = pack("LLLLLLLLLLLL",
                             0,
                             $new_id,
                             0, 0,
@@ -2721,16 +1995,16 @@ class MSN {
                          $this->SB_writeln("MSG $id D $len");
                          $id++;
                          $this->SB_writedata($message);
-                         $this->log_message("*** p2p: send acknowledgement for $hdr_SessionID");
+                         $this->debug_message("*** p2p: send acknowledgement for $hdr_SessionID");
                          $this->debug_message("*** p2p: dump sent message:\n".$this->dump_binary($hdr.$footer));
                          */
                         break;
                     }
-                    $this->log_message("*** MSG from $from_email: $sMsg");
+                    $this->debug_message("*** MSG from $from_email: $sMsg");
                     $this->ReceivedMessage($from_email,$sMsg,$network,false);
                     break;
                 case '217':
-                    $this->log_message("*** User $user is offline. Try OIM.");
+                    $this->debug_message("*** User $user is offline. Try OIM.");
                     foreach($this->SwitchBoardMessageQueue as $Message)
                     $this->SendMessage($Message,"$user@Offline");
                     $SessionEnd=true;
@@ -2902,21 +2176,10 @@ class MSN {
         return $buf;
     }
 
-    // write log
-    function log_message($str) {
-        /*$fname = MSN_CLASS_LOG_DIR.DIRECTORY_SEPARATOR.'msn_'.strftime('%Y%m%d').'.log';
-        $fp = fopen($fname, 'at');
-        if ($fp) {
-            fputs($fp, strftime('%m/%d/%y %H:%M:%S').' ['.posix_getpid().'] '.$str."\n");
-            fclose($fp);
-        }*/
-        $this->debug_message($str);
-        return;
-    }
     /**
      *
      * @param $FilePath 圖檔路徑
-     * @param $Type     檔案類型 3=>大頭貼,2表情圖案    
+     * @param $Type     檔案類型 3=>大頭貼,2表情圖案
      * @return array
      */
     private function MsnObj($FilePath,$Type=3)
@@ -2933,7 +2196,7 @@ class MSN {
         $this->debug_message("*** p2p: addMsnObj $FilePath::$MsnObj\n");
         return $MsnObj;
     }
-    
+
     private function linetoArray($lines) {
         $lines=str_replace("\r",'',$lines);
         $lines=explode("\n",$lines);
@@ -2944,7 +2207,7 @@ class MSN {
         }
         return $Data;
     }
-    
+
     private function GetPictureFilePath($Context)
     {
         $MsnObj=base64_decode($Context);
@@ -2955,7 +2218,7 @@ class MSN {
         return $this->MsnObjArray[$location];
         return false;
     }
-    
+
     private function GetMsnObjDefine($Message)
     {
         $DefineString='';
@@ -2967,23 +2230,26 @@ class MSN {
         }
         return $DefineString;
     }
-    
+
     /**
      * Read and handle incoming command from NS
      */
-    public function nsReceive() {
+    private function nsReceive() {
         // Sign in again if not signed in or socket failed
-        if (!is_resource($this->NSfp) || feof($this->NSfp)) {
-            $this->callHandler('Reconnect', NULL);
+        if (!is_resource($this->NSfp) || self::socketcheck($this->NSfp)) {
+            $this->callHandler('Reconnect');
+            $this->NSRetryWait($this->retry_wait);
             $this->signon();
             return;
         }
-        
+
         $data = $this->ns_readln();
         if($data === false) {
             // There was no data / an error when reading from the socket so reconnect
-            $this->callHandler('Reconnect', NULL);
+            $this->callHandler('Reconnect');
+            $this->NSRetryWait($this->retry_wait);
             $this->signon();
+            return;
         } else {
             switch (substr($data,0,3))
             {
@@ -2991,7 +2257,7 @@ class MSN {
                     // after 'USR {id} OK {user} {verify} 0' response, the server will send SBS and profile to us
                     // NS: <<< SBS 0 null
                     break;
-    
+
                 case 'RFS':
                     // FIXME:
                     // NS: <<< RFS ???
@@ -3005,17 +2271,17 @@ class MSN {
                         }
                     }
                     break;
-    
+
                 case 'LST':
                     // NS: <<< LST {email} {alias} 11 0
                     @list(/* LST */, $email, /* alias */, ) = @explode(' ', $data);
                     @list($u_name, $u_domain) = @explode('@', $email);
                     if (!isset($this->aContactList[$u_domain][$u_name][1])) {
                         $this->aContactList[$u_domain][$u_name][1]['Allow'] = 'Allow';
-                        $this->log_message("*** add to our contact list: $u_name@$u_domain");
+                        $this->debug_message("*** add to our contact list: $u_name@$u_domain");
                     }
                     break;
-    
+
                 case 'ADL':
                     // randomly, we get ADL command, someome add us to their contact list for MSNP15
                     // NS: <<< ADL 0 {size}
@@ -3030,49 +2296,48 @@ class MSN {
                             $u_name = $matches[2];
                             $network = $matches[4];
                             if (isset($this->aContactList[$u_domain][$u_name][$network]))
-                            $this->log_message("*** someone (network: $network) add us to their list (but already in our list): $u_name@$u_domain");
-                            else
-                            {
-                                $this->re_login = false;
+                                $this->debug_message("*** someone (network: $network) add us to their list (but already in our list): $u_name@$u_domain");
+                            else {
+                                $re_login = false;
                                 $cnt = 0;
                                 foreach (array('Allow', 'Reverse') as $list)
                                 {
                                     if (!$this->addMemberToList($u_name.'@'.$u_domain, $network, $list))
                                     {
-                                        if ($this->re_login) {
-                                            $this->log_message("*** can't add $u_name@$u_domain (network: $network) to $list");
+                                        if ($re_login) {
+                                            $this->debug_message("*** can't add $u_name@$u_domain (network: $network) to $list");
                                             continue;
                                         }
                                         $aTickets = $this->get_passport_ticket();
                                         if (!$aTickets || !is_array($aTickets)) {
                                             // failed to login? ignore it
-                                            $this->log_message("*** can't re-login, something wrong here");
-                                            $this->log_message("*** can't add $u_name@$u_domain (network: $network) to $list");
+                                            $this->debug_message("*** can't re-login, something wrong here");
+                                            $this->debug_message("*** can't add $u_name@$u_domain (network: $network) to $list");
                                             continue;
                                         }
-                                        $this->re_login = true;
+                                        $re_login = true;
                                         $this->ticket = $aTickets;
-                                        $this->log_message("**** get new ticket, try it again");
+                                        $this->debug_message("**** get new ticket, try it again");
                                         if (!$this->addMemberToList($u_name.'@'.$u_domain, $network, $list))
                                         {
-                                            $this->log_message("*** can't add $u_name@$u_domain (network: $network) to $list");
+                                            $this->debug_message("*** can't add $u_name@$u_domain (network: $network) to $list");
                                             continue;
                                         }
                                     }
                                     $this->aContactList[$u_domain][$u_name][$network][$list] = false;
                                     $cnt++;
                                 }
-                                $this->log_message("*** someone (network: $network) add us to their list: $u_name@$u_domain");
+                                $this->debug_message("*** someone (network: $network) add us to their list: $u_name@$u_domain");
                             }
                             $str = '<ml l="1"><d n="'.$u_domain.'"><c n="'.$u_name.'" l="3" t="'.$network.'" /></d></ml>';
                             $len = strlen($str);
                         }
                         else
-                        $this->log_message("*** someone add us to their list: $data");
+                        $this->debug_message("*** someone add us to their list: $data");
                         $this->AddUsToMemberList($u_name.'@'.$u_domain, $network);
                     }
                     break;
-    
+
                 case 'RML':
                     // randomly, we get RML command, someome remove us to their contact list for MSNP15
                     // NS: <<< RML 0 {size}
@@ -3092,17 +2357,17 @@ class MSN {
                                 foreach ($aData as $list => $id)
                                 $this->delMemberFromList($id, $u_name.'@'.$u_domain, $network, $list);
                                 unset($this->aContactList[$u_domain][$u_name][$network]);
-                                $this->log_message("*** someone (network: $network) remove us from their list: $u_name@$u_domain");
+                                $this->debug_message("*** someone (network: $network) remove us from their list: $u_name@$u_domain");
                             }
                             else
-                            $this->log_message("*** someone (network: $network) remove us from their list (but not in our list): $u_name@$u_domain");
+                            $this->debug_message("*** someone (network: $network) remove us from their list (but not in our list): $u_name@$u_domain");
                             $this->RemoveUsFromMemberList($u_name.'@'.$u_domain, $network);
                         }
                         else
-                        $this->log_message("*** someone remove us from their list: $data");
+                        $this->debug_message("*** someone remove us from their list: $data");
                     }
                     break;
-    
+
                 case 'MSG':
                     // randomly, we get MSG notification from server
                     // NS: <<< MSG Hotmail Hotmail {size}
@@ -3137,32 +2402,32 @@ class MSN {
                             }
                         }
                         if ($ignore) {
-                            $this->log_message("*** ingnore MSG for: $line");
+                            $this->debug_message("*** ingnore MSG for: $line");
                             break;
                         }
                         if ($maildata == '') {
-                            $this->log_message("*** ingnore MSG not for OIM");
+                            $this->debug_message("*** ingnore MSG not for OIM");
                             break;
                         }
-                        $this->re_login = false;
+                        $re_login = false;
                         if (strcasecmp($maildata, 'too-large') == 0) {
-                            $this->log_message("*** large mail-data, need to get the data via SOAP");
+                            $this->debug_message("*** large mail-data, need to get the data via SOAP");
                             $maildata = $this->getOIM_maildata();
                             if ($maildata === false) {
-                                $this->log_message("*** can't get mail-data via SOAP");
+                                $this->debug_message("*** can't get mail-data via SOAP");
                                 // maybe we need to re-login again
                                 $aTickets = $this->get_passport_ticket();
                                 if (!$aTickets || !is_array($aTickets)) {
                                     // failed to login? ignore it
-                                    $this->log_message("*** can't re-login, something wrong here, ignore this OIM");
+                                    $this->debug_message("*** can't re-login, something wrong here, ignore this OIM");
                                     break;
                                 }
-                                $this->re_login = true;
+                                $re_login = true;
                                 $this->ticket = $aTickets;
-                                $this->log_message("**** get new ticket, try it again");
+                                $this->debug_message("*** get new ticket, try it again");
                                 $maildata = $this->getOIM_maildata();
                                 if ($maildata === false) {
-                                    $this->log_message("*** can't get mail-data via SOAP, and we already re-login again, so ignore this OIM");
+                                    $this->debug_message("*** can't get mail-data via SOAP, and we already re-login again, so ignore this OIM");
                                     break;
                                 }
                             }
@@ -3180,7 +2445,7 @@ class MSN {
                             $p = substr($p, $end);
                         }
                         if (count($aOIMs) == 0) {
-                            $this->log_message("*** ingnore empty OIM");
+                            $this->debug_message("*** ingnore empty OIM");
                             break;
                         }
                         foreach ($aOIMs as $maildata) {
@@ -3195,7 +2460,7 @@ class MSN {
                             // N: sender alias
                             preg_match('#<T>(.*)</T>#', $maildata, $matches);
                             if (count($matches) == 0) {
-                                $this->log_message("*** ingnore OIM maildata without <T>type</T>");
+                                $this->debug_message("*** ingnore OIM maildata without <T>type</T>");
                                 continue;
                             }
                             $oim_type = $matches[1];
@@ -3205,13 +2470,13 @@ class MSN {
                             $network = 1;
                             preg_match('#<E>(.*)</E>#', $maildata, $matches);
                             if (count($matches) == 0) {
-                                $this->log_message("*** ingnore OIM maildata without <E>sender</E>");
+                                $this->debug_message("*** ingnore OIM maildata without <E>sender</E>");
                                 continue;
                             }
                             $oim_sender = $matches[1];
                             preg_match('#<I>(.*)</I>#', $maildata, $matches);
                             if (count($matches) == 0) {
-                                $this->log_message("*** ingnore OIM maildata without <I>msgid</I>");
+                                $this->debug_message("*** ingnore OIM maildata without <I>msgid</I>");
                                 continue;
                             }
                             $oim_msgid = $matches[1];
@@ -3219,37 +2484,37 @@ class MSN {
                             $oim_size = (count($matches) == 0) ? 0 : $matches[1];
                             preg_match('#<RT>(.*)</RT>#', $maildata, $matches);
                             $oim_time = (count($matches) == 0) ? 0 : $matches[1];
-                            $this->log_message("*** You've OIM sent by $oim_sender, Time: $oim_time, MSGID: $oim_msgid, size: $oim_size");
+                            $this->debug_message("*** You've OIM sent by $oim_sender, Time: $oim_time, MSGID: $oim_msgid, size: $oim_size");
                             $sMsg = $this->getOIM_message($oim_msgid);
                             if ($sMsg === false) {
-                                $this->log_message("*** can't get OIM, msgid = $oim_msgid");
-                                if ($this->re_login) {
-                                    $this->log_message("*** can't get OIM via SOAP, and we already re-login again, so ignore this OIM");
+                                $this->debug_message("*** can't get OIM, msgid = $oim_msgid");
+                                if ($re_login) {
+                                    $this->debug_message("*** can't get OIM via SOAP, and we already re-login again, so ignore this OIM");
                                     continue;
                                 }
                                 $aTickets = $this->get_passport_ticket();
                                 if (!$aTickets || !is_array($aTickets)) {
                                     // failed to login? ignore it
-                                    $this->log_message("*** can't re-login, something wrong here, ignore this OIM");
+                                    $this->debug_message("*** can't re-login, something wrong here, ignore this OIM");
                                     continue;
                                 }
-                                $this->re_login = true;
+                                $re_login = true;
                                 $this->ticket = $aTickets;
-                                $this->log_message("**** get new ticket, try it again");
+                                $this->debug_message("*** get new ticket, try it again");
                                 $sMsg = $this->getOIM_message($oim_msgid);
                                 if ($sMsg === false) {
-                                    $this->log_message("*** can't get OIM via SOAP, and we already re-login again, so ignore this OIM");
+                                    $this->debug_message("*** can't get OIM via SOAP, and we already re-login again, so ignore this OIM");
                                     continue;
                                 }
                             }
-                            $this->log_message("*** MSG (Offline) from $oim_sender (network: $network): $sMsg");
-    
+                            $this->debug_message("*** MSG (Offline) from $oim_sender (network: $network): $sMsg");
+
                             //$this->ReceivedMessage($oim_sender,$sMsg,$network,true);
                             $this->callHandler('IMin', array('sender' => $oim_sender, 'message' => $sMsg, 'network' => $network, 'offline' => true));
                         }
                     }
                     break;
-    
+
                 case 'UBM':
                     // randomly, we get UBM, this is the message from other network, like Yahoo!
                     // NS: <<< UBM {email} $network $type {size}
@@ -3283,15 +2548,15 @@ class MSN {
                         }
                         if($ignore)
                         {
-                            $this->log_message("*** ingnore from $from_email: $line");
+                            $this->debug_message("*** ingnore from $from_email: $line");
                             break;
                         }
-                        $this->log_message("*** MSG from $from_email (network: $network): $sMsg");
+                        $this->debug_message("*** MSG from $from_email (network: $network): $sMsg");
                         //$this->ReceivedMessage($from_email,$sMsg,$network,false);
                         $this->callHandler('IMin', array('sender' => $from_email, 'message' => $sMsg, 'network' => $network, 'offline' => false));
                     }
                     break;
-    
+
                 case 'UBX':
                     // randomly, we get UBX notification from server
                     // NS: <<< UBX email {network} {size}
@@ -3300,7 +2565,7 @@ class MSN {
                     if (is_numeric($size) && $size > 0)
                     $this->ns_readdata($size);
                     break;
-    
+
                 case 'CHL':
                     // randomly, we'll get challenge from server
                     // NS: <<< CHL 0 {code}
@@ -3310,7 +2575,7 @@ class MSN {
                     // NS: >>> fingerprint
                     $this->ns_writeln("QRY $this->id $this->prod_id 32");
                     $this->ns_writedata($fingerprint);
-                    $this->ns_writeln("CHG $this->id NLN $this->clientid");                    
+                    $this->ns_writeln("CHG $this->id NLN $this->clientid");
                     if($this->PhotoStickerFile!==false)
                         $this->ns_writeln("CHG $this->id NLN $this->clientid ".rawurlencode($this->MsnObj($this->PhotoStickerFile)));
                     break;
@@ -3319,7 +2584,7 @@ class MSN {
                     // ignore it
                     // change our status to online first
                     break;
-    
+
                 case 'XFR':
                     // sometimes, NS will redirect to another NS
                     // MSNP9
@@ -3341,7 +2606,7 @@ class MSN {
                         foreach($this->MessageQueue as $User => $Message)
                         {
                             //$this->ChildProcess[$ChildPid]
-                            $this->log_message("*** XFR SB $User");
+                            $this->debug_message("*** XFR SB $User");
                             $pid=pcntl_fork();
                             if($pid)
                             {
@@ -3351,20 +2616,20 @@ class MSN {
                             }
                             elseif($pid==-1)
                             {
-                                $this->log_message("*** Fork Error $User");
+                                $this->debug_message("*** Fork Error $User");
                                 break;
                             }
                             else
                             {
                                 //Child Process
-                                $this->log_message("*** Child Process Start for $User");
+                                $this->debug_message("*** Child Process Start for $User");
                                 unset($Message['XFRSent']);
                                 unset($Message['ReqTime']);
                                 $bSBresult = $this->switchboard_control($ip, $port, $cki_code, $User, $Message);
                                 if ($bSBresult === false)
                                 {
                                     // error for switchboard
-                                    $this->log_message("!!! error for sending message to ".$User);
+                                    $this->debug_message("!!! error for sending message to ".$User);
                                 }
                                 die;
                             }
@@ -3375,20 +2640,16 @@ class MSN {
                      $bSBresult = $this->switchboard_control($ip, $port, $cki_code, $aMSNUsers[$nCurrentUser], $sMessage);
                      if ($bSBresult === false) {
                      // error for switchboard
-                     $this->log_message("!!! error for sending message to ".$aMSNUsers[$nCurrentUser]);
+                     $this->debug_message("!!! error for sending message to ".$aMSNUsers[$nCurrentUser]);
                      $aOfflineUsers[] = $aMSNUsers[$nCurrentUser];
                      }*/
                     break;
                 case 'QNG':
                     // NS: <<< QNG {time}
                     @list(/* QNG */, $ping_wait) = @explode(' ', $data);
-                    //if ($this->ping_wait == 0) $this->ping_wait = 50;
-                    //if (is_int($use_ping) && $use_ping > 0) $ping_wait = $use_ping;
-                    //Mod by Ricky Set Online
-                    
                     $this->callHandler('Pong', $ping_wait);
                     break;
-    
+
                 case 'RNG':
                     if($this->PhotoStickerFile!==false)
                         $this->ns_writeln("CHG $this->id NLN $this->clientid ".rawurlencode($this->MsnObj($this->PhotoStickerFile)));
@@ -3396,15 +2657,15 @@ class MSN {
                         $this->ns_writeln("CHG $this->id NLN $this->clientid");
                     // someone is trying to talk to us
                     // NS: <<< RNG {session_id} {server} {auth_type} {ticket} {email} {alias} U {client} 0
-                    $this->log_message("NS: <<< RNG $data");
+                    $this->debug_message("NS: <<< RNG $data");
                     @list(/* RNG */, $sid, $server, /* auth_type */, $ticket, $email, $name, ) = @explode(' ', $data);
                     @list($sb_ip, $sb_port) = @explode(':', $server);
                     if($this->IsIgnoreMail($email))
                     {
-                        $this->log_message("*** Ignore RNG from $email");
+                        $this->debug_message("*** Ignore RNG from $email");
                         break;
                     }
-                    $this->log_message("*** RING from $email, $sb_ip:$sb_port");
+                    $this->debug_message("*** RING from $email, $sb_ip:$sb_port");
                     $this->addContact($email,1,$email, true);
                     $pid=pcntl_fork();
                     if($pid)
@@ -3415,13 +2676,13 @@ class MSN {
                     }
                     elseif($pid==-1)
                     {
-                        $this->log_message("*** Fork Error $User");
+                        $this->debug_message("*** Fork Error $User");
                         break;
                     }
                     else
                     {
                         //Child Process
-                        $this->log_message("*** Ring Child Process Start for $User");
+                        $this->debug_message("*** Ring Child Process Start for $User");
                         $this->switchboard_ring($sb_ip, $sb_port, $sid, $ticket,$email);
                         die;
                     }
@@ -3429,104 +2690,131 @@ class MSN {
                 case 'OUT':
                     // force logout from NS
                     // NS: <<< OUT xxx
-                    $this->log_message("*** LOGOUT from NS");
+                    $this->debug_message("*** LOGOUT from NS");
                     return $this->NsLogout();
-    
+
                 default:
                     $code = substr($data,0,3);
                     if (is_numeric($code)) {
                         $this->error = "Error code: $code, please check the detail information from: http://msnpiki.msnfanatic.com/index.php/Reference:Error_List";
                         $this->debug_message("*** NS: $this->error");
-    
+
                         return $this->NsLogout();
                     }
                     break;
             }
         }
     }
-    
+
     /**
      * Read and handle incoming command/message from
      * a switchboard session socket
      */
-    public function sbReceive() {
-        
+    private function sbReceive() {
+
+    }
+
+    /**
+     * Checks for new data and calls appropriate methods
+     *
+     * This method is usually called in an infinite loop to keep checking for new data
+     *
+     * @return void
+     */
+    public function receive() {
+        //First, get an array of sockets that have data that is ready to be read
+        $ready = array();
+        $ready = $this->getSockets();
+        $numrdy = stream_select($ready, $w = NULL, $x = NULL,NULL);
+
+        //Now that we've waited for something, go through the $ready
+        //array and read appropriately
+
+        for($i = 0;$i<sizeof($ready);$i++) {
+            if ($ready[$i] == $this->NSfp) {
+                $this->nsReceive();
+            } else {
+                $this->sbReceive($socket);
+            }
+        }
     }
 
     /**
      * Send a request for a switchboard session
-     * @param $to Target email for switchboard session
+     * @param String $to Target email for switchboard session
      */
     private function reqSBSession($to) {
-        $this->log_message("*** Request SB for $to");
+        $this->debug_message("*** Request SB for $to");
         $this->ns_writeln("XFR $this->id SB");
-        
+
         // Add to the queue of those waiting for a switchboard session reponse
         $this->switchBoardSessions[$to] = array('socket' => NULL, 'id' => 1, 'lastActive' => NULL, 'joined' => false, 'XFRReqTime' => time());
         $this->waitingForXFR[] = &$this->switchBoardSessions[$to];
     }
-    
+
     /**
      * Following an XFR or RNG, connect to the switchboard session
-     * @param $mode Mode, either 'Active' (in the case of XFR) or 'Passive' (in the case or RNG)
-     * @param $ip IP of Switchboard
-     * @param $port Port of Switchboard
-     * @param $to User on other end of Switchboard
-     * @param $param Array of parameters - 'cki', 'ticket', 'sid'
-     * @return Whether successful
+     *
+     * @param string $mode Mode, either 'Active' (in the case of XFR) or 'Passive' (in the case or RNG)
+     * @param string $ip IP of Switchboard
+     * @param integer $port Port of Switchboard
+     * @param string $to User on other end of Switchboard
+     * @param array $param Array of parameters - 'cki', 'ticket', 'sid'
+     * @return boolean true if successful
      */
     private function connectToSBSession($mode, $ip, $port, $to, $param) {
         $this->debug_message("*** SB: try to connect to switchboard server $ip:$port");
-        
+
         $this->switchBoardSessions[$to]['socket'] = @fsockopen($ip, $port, $errno, $errstr, 5);
         $socket = $this->switchBoardSessions[$to]['socket'];
         if(!$socket) {
             $this->debug_message("*** SB: Can't connect to $ip:$port, error => $errno, $errstr");
             return false;
         }
-        $this->switchBoardSockets[$socket] = $socket;
-        
+        $this->switchBoardSockets[(int) $socket] = $socket;
+
         stream_set_timeout($socket, $this->SBStreamTimeout);
-        
+
         $id = &$this->switchBoardSessions[$to]['id'];
-        
+
         if($mode == 'Active') {
             $cki_code = $param['cki'];
-            
+
             // SB: >>> USR {id} {user} {cki}
             $this->sb_writeln($socket, $id, "USR $id $this->user $cki_code");
         } else {
             // Passive
             $ticket = $param['ticket'];
             $sid = $param['sid'];
-            
+
             // SB: >>> ANS {id} {user} {ticket} {session_id}
             $this->sb_writeln($socket, $id, "ANS $id $this->user $ticket $sid");
         }
-        
+
         $this->switchBoardSessions[$to]['lastActive'] = time();
     }
-    
+
     /**
      * Send a message via an existing SB session
-     * @param $message Message
-     * @param $to Recipient for message
-     * @return Whether successful
+     *
+     * @param string $to Recipient for message
+     * @param string $message Message
+     * @return boolean true on success
      */
-    private function sendMessageViaSB($message, $to) {
+    private function sendMessageViaSB($to, $message) {
         if(socketcheck($this->switchBoardSessions[$to]['socket'])) {
             $this->reqSBSession($to);
             return false;
         }
-        
+
         if(!$this->switchBoardSessions[$to]['joined']) {
             // If our participant has not joined the session yet we can't message them!
             return false;
         }
-        
+
         $id = &$this->switchBoardSessions[$to]['id'];
         $socket = $this->switchBoardSessions[$to]['socket'];
-        
+
         $aMessage = $this->getMessage($Message);
         //CheckEmotion...
         $MsnObjDefine=$this->GetMsnObjDefine($aMessage);
@@ -3542,17 +2830,17 @@ class MSN {
         // TODO handle failure during write to socket
         $this->sb_writeln($socket, $id, "MSG $id N $len");
         $this->sb_writedata($socket, $aMessage);
-        
+
         // Don't close the SB session, we might as well leave it open
-        
+
         return true;
     }
-    
+
     /**
-     * 
-     * @param $to
-     * @param $sMessage
-     * @param $lockkey
+     * Send offline message
+     * @param string $to Intended recipient
+     * @param string $sMessage Message
+     * @param string $lockkey Lock key
      */
     private function sendOIM($to, $sMessage, $lockkey) {
         $XML = '<?xml version="1.0" encoding="utf-8"?>
@@ -3657,65 +2945,74 @@ X-OIM-Sequence-Num: 1
         }
         return array('challenge' => $challenge, 'auth_policy' => $auth_policy);
     }
-    
+
     /**
      * Send a message to a user on another network
+     *
      * @param $message Message
      * @param $to Intended recipient
      * @param $network Network
+     * @return void
      */
     private function sendOtherNetworkMessage($message, $to, $network) {
-        $message=$this->getMessage($nessage, $network);
+        $message = $this->getMessage($message, $network);
         $len = strlen($message);
         $this->ns_writeln("UUM $this->id $to $network 1 $len");
         $this->ns_writedata($Message);
-        $this->log_message("*** sent to $to (network: $network):\n$Message");
+        $this->debug_message("*** Sent to $to (network: $network):\n$Message");
     }
-    
+
     /**
      * Send a message
-     * @param $message Message
-     * @param $to To address in form user@host.com@network
-     *            where network is 1 for MSN, 32 for Yahoo
-     *            and 'Offline' for offline messages
+     *
+     * @param string $to To address in form user@host.com(@network)
+     *                   where network is 1 for MSN, 32 for Yahoo
+     *                   and 'Offline' for offline messages
+     * @param string $message Message
      */
-    public function sendMessage($message, $to) {
+    public function sendMessage($to, $message) {
         if($message != '') {
-            list($name,$host,$network)=explode('@',$to);
-            $network=$network==''?1:$network;
-            
-            if($network === 1 && $this->switchBoardSessions[$to]['socket'] != NULL && time()-$this->switchBoardSessions[$to]['lastActive'] < $this->SBIdleTimeout) {
+            list($name, $host, $network) = explode('@', $to);
+            $network = $network == '' ? 1 : $network;
+
+            if ($network === 1 && $this->switchBoardSessions[$to]['socket'] !== NULL) {
                 $recipient = $name . $host;
-                $this->debug_message("*** Sending Message to $recipient using existing SB session");
-                return $this->sendMessageViaSB($message, $recipient);
-            } elseif($network == 'Offline') {
+                $this->debug_message("*** Attempting to send message to $recipient using existing SB session");
+
+                if ($this->sendMessageViaSB($message, $recipient)) {
+                    $this->debug_message('*** Message sent successfully');
+                    return true;
+                } else {
+                    $this->debug_message('*** Message sending failed, requesting new SB session');
+                    $this->reqSBSession($to);
+                    return false;
+                }
+            } elseif ($network == 'Offline') {
                 //Send OIM
                 //FIXME: 修正Send OIM
-                $lockkey='';
-                for ($i = 0; $i < $this->oim_try; $i++)
-                {
-                    if(($oim_result = $this->sendOIM($To, $Message, $lockkey))===true) break;
+                $lockkey = '';
+                $re_login = false;
+                for ($i = 0; $i < $this->oim_try; $i++) {
+                    if (($oim_result = $this->sendOIM($to, $message, $lockkey)) === true) break;
                     if (is_array($oim_result) && $oim_result['challenge'] !== false) {
                         // need challenge lockkey
-                        $this->log_message("*** we need a new challenge code for ".$oim_result['challenge']);
+                        $this->debug_message("*** Need challenge code for ".$oim_result['challenge']);
                         $lockkey = $this->getChallenge($oim_result['challenge']);
                         continue;
                     }
-                    if ($oim_result === false || $oim_result['auth_policy'] !== false)
-                    {
-                        if ($this->re_login)
-                        {
-                            $this->log_message("*** can't send OIM, but we already re-login again, so ignore this OIM");
-                            break;
+                    if ($oim_result === false || $oim_result['auth_policy'] !== false) {
+                        if ($re_login) {
+                            $this->debug_message("*** Can't send OIM, but we already re-logged-in again, so ignore this OIM");
+                            return true;
                         }
-                        $this->log_message("*** can't send OIM, maybe ticket expired, try to login again");
-                        // maybe we need to re-login again
-                        if(!$this->get_passport_ticket())
-                        {
-                            $this->log_message("*** can't re-login, something wrong here, ignore this OIM");
-                            break;
+                        $this->debug_message("*** Can't send OIM, maybe ticket expired, trying to login again");
+
+                        // Maybe we need to re-login again
+                        if (!$this->get_passport_ticket()) {
+                            $this->debug_message("*** Can't re-login, something went wrong here, ignore this OIM");
+                            return false;
                         }
-                        $this->log_message("**** get new ticket, try it again");
+                        $this->debug_message("*** Getting new ticket and trying again");
                         continue;
                     }
                 }
@@ -3727,11 +3024,10 @@ X-OIM-Sequence-Num: 1
         }
         return true;
     }
-    
+
     //FIXME Not sure if this is needed?
     private function endSBSession($socket) {
-        if (feof($socket))
-        {
+        if (feof($socket)) {
             // lost connection? error? try OIM later
             @fclose($socket);
             return false;
@@ -3741,76 +3037,95 @@ X-OIM-Sequence-Num: 1
         @fclose($socket);
         return true;
     }
-    
+
     /**
      * Sends a ping command
-     * 
+     *
      * Should be called about every 50 seconds
+     *
+     * @return void
      */
     public function sendPing() {
         // NS: >>> PNG
         $this->ns_writeln("PNG");
     }
-    
+
+    /**
+    * Methods to return sockets / check socket status
+    */
+
     /**
      * Get the NS socket
+     *
+     * @return resource NS socket
      */
     public function getNSSocket() {
         return $this->NSfp;
     }
-    
+
     /**
      * Get the Switchboard sockets currently in use
+     *
+     * @return array Array of Switchboard sockets
      */
     public function getSBSockets() {
         return $this->switchBoardSockets;
     }
-    
+
     /**
      * Get all the sockets currently in use
+     *
+     * @return array Array of socket resources
      */
     public function getSockets() {
         return array_merge($this->NSfp, $this->switchBoardSockets);
     }
-    
-    /** 
+
+    /**
      * Checks socket for end of file
      *
-     * @access public
-     * @param Resource $socket Socket to check
-     * @return boolean true if end of file (socket) 
+     * @param resource $socket Socket to check
+     * @return boolean true if end of file (socket)
      */
     private static function socketcheck($socket){
         $info = stream_get_meta_data($socket);
         return $info['eof'];
     }
-    
+
+    /**
+    * Methods to add / call callbacks
+    */
+
     /**
      * Calls User Handler
      *
      * Calls registered handler for a specific event.
-     * 
-     * @param String $event Command (event) name (Rvous etc)
-     * @param String $data Raw message from server
+     *
+     * @param string $event Command (event) name (Rvous etc)
+     * @param array $data Data
      * @see registerHandler
      * @return void
      */
-    private function callHandler($event, $data) {
+    private function callHandler($event, $data = NULL) {
         if (isset($this->myEventHandlers[$event])) {
-            call_user_func($this->myEventHandlers[$event], $data);
+            if ($data !== NULL) {
+                call_user_func($this->myEventHandlers[$event], $data);
+            } else {
+                call_user_func($this->myEventHandlers[$event]);
+            }
         }
     }
-    
-    /** 
+
+    /**
      * Registers a user handler
-     * 
+     *
      * Handler List
      * IMIn, Pong, ConnectFailed, Reconnect
      *
-     * @param String $event Event name
-     * @param String $handler User function to call
+     * @param string $event Event name
+     * @param string $handler User function to call
      * @see callHandler
-     * @return boolean Returns true if successful
+     * @return boolean true if successful
      */
     public function registerHandler($event, $handler) {
         if (is_callable($handler)) {
diff --git a/plugins/Msn/msnmanager.php b/plugins/Msn/msnmanager.php
index b0540c46e5..8f436bdff8 100644
--- a/plugins/Msn/msnmanager.php
+++ b/plugins/Msn/msnmanager.php
@@ -1,158 +1,183 @@
-<?php
-/*
- * StatusNet - the distributed open-source microblogging tool
- * Copyright (C) 2008, 2009, StatusNet, Inc.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
-
-/**
- * AIM background connection manager for AIM-using queue handlers,
- * allowing them to send outgoing messages on the right connection.
- *
- * Input is handled during socket select loop, keepalive pings during idle.
- * Any incoming messages will be handled.
- *
- * In a multi-site queuedaemon.php run, one connection will be instantiated
- * for each site being handled by the current process that has XMPP enabled.
- */
-
-class MsnManager extends ImManager
-{
-    public $conn = null;
-    
-    protected $lastping = null;
-    
-    private $pingInterval;
-    
-    /**
-     * Initialize connection to server.
-     * @return boolean true on success
-     */
-    public function start($master)
-    {
-        if(parent::start($master))
-        {
-            $this->connect();
-            return true;
-        }else{
-            return false;
-        }
-    }
-
-    public function getSockets()
-    {
-        $this->connect();
-        if($this->conn){
-            return $this->conn->getSockets();
-        }else{
-            return array();
-        }
-    }
-    
-    /**
-     * Idle processing for io manager's execution loop.
-     * Send keepalive pings to server.
-     */
-    public function idle($timeout=0)
-    {
-        $now = time();
-        if (empty($this->lastping) || $now - $this->lastping > $pingInterval) {
-            $this->send_ping();
-        }
-    }
-    
-    /**
-     * Process MSN events that have come in over the wire.
-     * @param resource $socket
-     */
-    public function handleInput($socket)
-    {
-        common_log(LOG_DEBUG, "Servicing the MSN queue.");
-        $this->stats('msn_process');
-        $this->conn->receive();
-    }
-
-    function connect()
-    {
-        if (!$this->conn) {
-            $this->conn=new MSN(array(
-                                      'user' => $this->plugin->user,
-                                      'password' => $this->plugin->password,
-                                      'alias' => $this->plugin->nickname,
-                                      'psm' => 'Send me a message to post a notice',
-                                      'debug' => true
-                                )
-                        );
-            $this->conn->registerHandler("IMIn", array($this, 'handle_msn_message'));
-            $this->conn->registerHandler('Pong', array($this, 'update_ping_time'));
-            $this->conn->registerHandler('ConnectFailed', array($this, 'handle_connect_failed'));
-            $this->conn->registerHandler('Reconnect', array($this, 'handle_reconnect'));
-            $this->conn->signon();
-            $this->lastping = time();
-        }
-        return $this->conn;
-    }
-    
-    function send_ping() {
-        $this->connect();
-        if (!$this->conn) {
-            return false;
-        }
-        
-        $now = time();
-        
-        $this->conn->sendPing();
-        $this->lastping = $now;
-        return true;
-    }
-    
-    /**
-     * Update the time till the next ping
-     * @param $data Time till next ping
-     */
-    function update_ping_time($data) {
-        $pingInterval = $data;
-    }
-    
-    function handle_msn_message($data)
-    {
-        $this->plugin->enqueue_incoming_raw($data);
-        return true;
-    }
-    
-    function handle_connect_failed($data) {
-        common_log(LOG_NOTICE, 'MSN connect failed, retrying');
-    }
-    
-    function handle_reconnect($data) {
-        common_log(LOG_NOTICE, 'MSN reconnecting');
-    }
-
-    function send_raw_message($data)
-    {
-        $this->connect();
-        if (!$this->conn) {
-            return false;
-        }
-        $this->conn->sflapSend($data[0],$data[1],$data[2],$data[3]);
-        
-        // Sending a command updates the time till next ping
-        $this->lastping = time();
-        $this->pingInterval = 50;
-        return true;
-    }
-}
+<?php
+/*
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2008, 2009, StatusNet, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
+
+/**
+ * MSN background connection manager for MSN-using queue handlers,
+ * allowing them to send outgoing messages on the right connection.
+ *
+ * Input is handled during socket select loop, keepalive pings during idle.
+ * Any incoming messages will be handled.
+ *
+ * In a multi-site queuedaemon.php run, one connection will be instantiated
+ * for each site being handled by the current process that has MSN enabled.
+ */
+
+class MsnManager extends ImManager {
+    public $conn = null;
+    private $lastping = null;
+    private $pingInterval;
+
+    /**
+     * Initialise connection to server.
+     *
+     * @return boolean true on success
+     */
+    public function start($master) {
+        if (parent::start($master)) {
+            $this->connect();
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    /**
+    * Return any open sockets that the run loop should listen
+    * for input on.
+    *
+    * @return array Array of socket resources
+    */
+    public function getSockets() {
+        $this->connect();
+        if ($this->conn) {
+            return $this->conn->getSockets();
+        } else {
+            return array();
+        }
+    }
+
+    /**
+     * Idle processing for io manager's execution loop.
+     * Send keepalive pings to server.
+     *
+     * @return void
+     */
+    public function idle($timeout = 0) {
+        if (empty($this->lastping) || time() - $this->lastping > $this->pingInterval) {
+            $this->send_ping();
+        }
+    }
+
+    /**
+     * Process MSN events that have come in over the wire.
+     *
+     * @param resource $socket Socket ready
+     * @return void
+     */
+    public function handleInput($socket) {
+        common_log(LOG_DEBUG, 'Servicing the MSN queue.');
+        $this->stats('msn_process');
+        $this->conn->receive();
+    }
+
+    /**
+    * Initiate connection
+    *
+    * @return void
+    */
+    function connect() {
+        if (!$this->conn) {
+            $this->conn = new MSN(array('user' => $this->plugin->user,
+                                        'password' => $this->plugin->password,
+                                        'alias' => $this->plugin->nickname,
+                                        'psm' => 'Send me a message to post a notice',
+                                        'debug' => true));
+            $this->conn->registerHandler("IMIn", array($this, 'handle_msn_message'));
+            $this->conn->registerHandler('Pong', array($this, 'update_ping_time'));
+            $this->conn->registerHandler('ConnectFailed', array($this, 'handle_connect_failed'));
+            $this->conn->registerHandler('Reconnect', array($this, 'handle_reconnect'));
+            $this->conn->signon();
+            $this->lastping = time();
+        }
+        return $this->conn;
+    }
+
+    /**
+    * Called by the idle process to send a ping
+    * when necessary
+    *
+    * @return void
+    */
+    private function send_ping() {
+        $this->connect();
+        if (!$this->conn) {
+            return false;
+        }
+
+        $this->conn->sendPing();
+        $this->lastping = time();
+        return true;
+    }
+
+    /**
+     * Update the time till the next ping
+     * @param $data Time till next ping
+     */
+    private function update_ping_time($data) {
+        $pingInterval = $data;
+    }
+
+    /**
+    * Called via a callback when a message is received
+    *
+    * Passes it back to the queuing system
+    *
+    * @param array $data Data
+    */
+    private function handle_msn_message($data) {
+        $this->plugin->enqueue_incoming_raw($data);
+        return true;
+    }
+
+    /**
+    * Called by callback to log failure during connect
+    *
+    * @param void $data Not used (there to keep callback happy)
+    */
+    function handle_connect_failed($data) {
+        common_log(LOG_NOTICE, 'MSN connect failed, retrying');
+    }
+
+    /**
+    * Called by callback to log reconnection
+    *
+    * @param void $data Not used (there to keep callback happy)
+    */
+    function handle_reconnect($data) {
+        common_log(LOG_NOTICE, 'MSN reconnecting');
+    }
+
+    function send_raw_message($data) {
+        $this->connect();
+        if (!$this->conn) {
+            return false;
+        }
+
+        if (!$this->conn->sendMessage($data['to'], $data['message'])) {
+            return false;
+        }
+
+        // Sending a command updates the time till next ping
+        $this->lastping = time();
+        $this->pingInterval = 50;
+        return true;
+    }
+}

From 27e8cfd360323cdfed1562c87740464d8bac502b Mon Sep 17 00:00:00 2001
From: Luke Fitzgerald <lw.fitzgerald@googlemail.com>
Date: Tue, 15 Jun 2010 20:51:04 +0100
Subject: [PATCH 053/655] Adaptation of library almost complete. Bot now signs
 in correctly when launched using startdaemons.sh

---
 plugins/Msn/MsnPlugin.php                    |   23 +-
 plugins/Msn/extlib/phpmsnclass/msn.class.php | 1760 +++++++++---------
 plugins/Msn/msnmanager.php                   |   15 +-
 3 files changed, 871 insertions(+), 927 deletions(-)

diff --git a/plugins/Msn/MsnPlugin.php b/plugins/Msn/MsnPlugin.php
index 9a9e703986..8452f15220 100644
--- a/plugins/Msn/MsnPlugin.php
+++ b/plugins/Msn/MsnPlugin.php
@@ -91,11 +91,8 @@ class MsnPlugin extends ImPlugin {
      */
     function validate($screenname) {
         //TODO Correct this for MSN screennames
-        if(preg_match('/^[a-z]\w{2,15}$/i', $screenname)) {
-            return true;
-        }else{
-            return false;
-        }
+        //if(preg_match('/^[a-z]\w{2,15}$/i', $screenname)) {
+        return true;
     }
 
     /**
@@ -109,7 +106,7 @@ class MsnPlugin extends ImPlugin {
         $dir = dirname(__FILE__);
 
         switch ($cls) {
-            case 'Msn':
+            case 'MSN':
                 require_once(INSTALLDIR.'/plugins/Msn/extlib/phpmsnclass/msn.class.php');
                 return false;
             case 'MsnManager':
@@ -179,12 +176,14 @@ class MsnPlugin extends ImPlugin {
     }
 
     function onPluginVersion(&$versions) {
-        $versions[] = array('name' => 'MSN',
-                            'version' => STATUSNET_VERSION,
-                            'author' => 'Luke Fitzgerald',
-                            'homepage' => 'http://status.net/wiki/Plugin:MSN',
-                            'rawdescription' =>
-                            _m('The MSN plugin allows users to send and receive notices over the MSN network.'));
+        $versions[] = array(
+            'name' => 'MSN',
+            'version' => STATUSNET_VERSION,
+            'author' => 'Luke Fitzgerald',
+            'homepage' => 'http://status.net/wiki/Plugin:MSN',
+            'rawdescription' =>
+            _m('The MSN plugin allows users to send and receive notices over the MSN network.')
+        );
         return true;
     }
 }
diff --git a/plugins/Msn/extlib/phpmsnclass/msn.class.php b/plugins/Msn/extlib/phpmsnclass/msn.class.php
index 9b087ac792..6146bd1c5a 100644
--- a/plugins/Msn/extlib/phpmsnclass/msn.class.php
+++ b/plugins/Msn/extlib/phpmsnclass/msn.class.php
@@ -37,7 +37,7 @@ class MSN {
     private $update_pending;
     private $PhotoStickerFile=false;
     private $Emotions=false;
-    private $ReqSBXFRTimeout=60;
+    private $XFRReqTimeout=60;
     private $LastPing;
     private $ping_wait=50;
     private $SBIdleTimeout=10;
@@ -47,7 +47,6 @@ class MSN {
     private $ABAuthHeader;
     private $ABService;
     private $Contacts;
-    private $IgnoreList;
 
     private $server = 'messenger.hotmail.com';
     private $port = 1863;
@@ -81,10 +80,6 @@ class MSN {
 
     public $oim_try = 3;
 
-    public $log_file = '';
-
-    public $log_path = false;
-
     public $font_fn = 'Arial';
     public $font_co = '333333';
     public $font_ef = '';
@@ -100,8 +95,27 @@ class MSN {
 
     private $aContactList = array();
     private $aADL = array();
+
+    /**
+    * Holds session information indexed by screenname if
+    * session has no socket or socket if socket present
+    *
+    * @var array
+    */
     private $switchBoardSessions = array();
-    private $switchBoardSockets = array();
+
+    /**
+    * Holds sockets indexed by screenname
+    *
+    * @var array
+    */
+    private $switchBoardSessionLookup = array();
+
+    /**
+    * Holds references to sessions waiting for XFR
+    *
+    * @var array
+    */
     private $waitingForXFR = array();
 
     /**
@@ -127,8 +141,7 @@ class MSN {
     * @param integer $client_id Client id (hexadecimal)
     * @return MSN
     */
-    public function __construct ($Configs=array(), $timeout = 15, $client_id = 0x7000800C)
-    {
+    public function __construct ($Configs=array(), $timeout = 15, $client_id = 0x7000800C) {
         $this->user = $Configs['user'];
         $this->password = $Configs['password'];
         $this->alias = isset($Configs['alias']) ? $Configs['alias'] : '';
@@ -137,7 +150,7 @@ class MSN {
         $this->update_pending = isset($Configs['update_pending']) ? $Configs['update_pending'] : true;
         $this->PhotoStickerFile=isset($Configs['PhotoSticker']) ? $Configs['PhotoSticker'] : false;
 
-        if($this->Emotions = isset($Configs['Emotions']) ? $Configs['Emotions']:false) {
+        if ($this->Emotions = isset($Configs['Emotions']) ? $Configs['Emotions']:false) {
             foreach($this->Emotions as $EmotionFilePath)
                 $this->MsnObj($EmotionFilePath,$Type=2);
         }
@@ -169,36 +182,31 @@ class MSN {
         $this->ABService=new SoapClient(realpath(dirname(__FILE__)).'/soap/msnab_sharingservice.wsdl',array('trace' => 1));
     }
 
-    private function Array2SoapVar($Array,$ReturnSoapVarObj=true,$TypeName=null,$TypeNameSpace=null)
-    {
-        $ArrayString='';
-        foreach($Array as $Key => $Val)
-        {
-            if($Key{0}==':') continue;
-            $Attrib='';
-            if(is_array($Val[':']))
-            {
-                foreach($Val[':'] as $AttribName => $AttribVal)
-                $Attrib.=" $AttribName='$AttribVal'";
+    private function Array2SoapVar($Array, $ReturnSoapVarObj = true, $TypeName = null, $TypeNameSpace = null) {
+        $ArrayString = '';
+        foreach($Array as $Key => $Val) {
+            if ($Key{0} == ':') continue;
+            $Attrib = '';
+            if (is_array($Val[':'])) {
+                foreach ($Val[':'] as $AttribName => $AttribVal)
+                $Attrib .= " $AttribName='$AttribVal'";
             }
-            if($Key{0}=='!')
-            {
+            if ($Key{0} == '!') {
                 //List Type Define
-                $Key=substr($Key,1);
-                foreach($Val as $ListKey => $ListVal)
-                {
-                    if($ListKey{0}==':') continue;
-                    if(is_array($ListVal)) $ListVal=$this->Array2SoapVar($ListVal,false);
-                    elseif(is_bool($ListVal)) $ListVal=$ListVal?'true':'false';
-                    $ArrayString.="<$Key$Attrib>$ListVal</$Key>";
+                $Key = substr($Key,1);
+                foreach ($Val as $ListKey => $ListVal) {
+                    if ($ListKey{0} == ':') continue;
+                    if (is_array($ListVal)) $ListVal = $this->Array2SoapVar($ListVal, false);
+                    elseif (is_bool($ListVal)) $ListVal = $ListVal ? 'true' : 'false';
+                    $ArrayString .= "<$Key$Attrib>$ListVal</$Key>";
                 }
                 continue;
             }
-            if(is_array($Val)) $Val=$this->Array2SoapVar($Val,false);
-            elseif(is_bool($Val)) $Val=$Val?'true':'false';
-            $ArrayString.="<$Key$Attrib>$Val</$Key>";
+            if (is_array($Val)) $Val = $this->Array2SoapVar($Val, false);
+            elseif (is_bool($Val)) $Val = $Val ? 'true' : 'false';
+            $ArrayString .= "<$Key$Attrib>$Val</$Key>";
         }
-        if($ReturnSoapVarObj) return new SoapVar($ArrayString,XSD_ANYXML,$TypeName,$TypeNameSpace);
+        if ($ReturnSoapVarObj) return new SoapVar($ArrayString, XSD_ANYXML, $TypeName, $TypeNameSpace);
         return $ArrayString;
     }
 
@@ -208,8 +216,7 @@ class MSN {
     * @param string $url URL string (Optional)
     * @return mixed Array of tickets or false on failure
     */
-    private function get_passport_ticket($url = '')
-    {
+    private function get_passport_ticket($url = '') {
         $user = $this->user;
         $password = htmlspecialchars($this->password);
 
@@ -310,8 +317,8 @@ class MSN {
 </Body>
 </Envelope>';
 
-        $this->debug_message("*** URL: $passport_url");
-        $this->debug_message("*** Sending SOAP:\n$XML");
+        //$this->debug_message("*** URL: $passport_url");
+        //$this->debug_message("*** Sending SOAP:\n$XML");
         $curl = curl_init();
         curl_setopt($curl, CURLOPT_URL, $passport_url);
         if ($this->debug) curl_setopt($curl, CURLOPT_HEADER, 1);
@@ -323,33 +330,33 @@ class MSN {
         $data = curl_exec($curl);
         $http_code = curl_getinfo($curl, CURLINFO_HTTP_CODE);
         curl_close($curl);
-        $this->debug_message("*** Get Result:\n$data");
+        //$this->debug_message("*** Get Result:\n$data");
 
         if ($http_code != 200) {
-            // sometimes, rediret to another URL
+            // sometimes, redirect to another URL
             // MSNP15
             //<faultcode>psf:Redirect</faultcode>
             //<psf:redirectUrl>https://msnia.login.live.com/pp450/RST.srf</psf:redirectUrl>
             //<faultstring>Authentication Failure</faultstring>
             if (strpos($data, '<faultcode>psf:Redirect</faultcode>') === false) {
-                $this->debug_message("*** Can't get passport ticket! http code = $http_code");
+                $this->debug_message("*** Could not get passport ticket! http code = $http_code");
                 return false;
             }
             preg_match("#<psf\:redirectUrl>(.*)</psf\:redirectUrl>#", $data, $matches);
             if (count($matches) == 0) {
-                $this->debug_message("*** redirect, but can't get redirect URL!");
+                $this->debug_message('*** Redirected, but could not get redirect URL!');
                 return false;
             }
             $redirect_url = $matches[1];
             if ($redirect_url == $passport_url) {
-                $this->debug_message("*** redirect, but redirect to same URL!");
+                $this->debug_message('*** Redirected, but to same URL!');
                 return false;
             }
-            $this->debug_message("*** redirect to $redirect_url");
+            $this->debug_message("*** Redirected to $redirect_url");
             return $this->get_passport_ticket($redirect_url);
         }
 
-        // sometimes, rediret to another URL, also return 200
+        // sometimes, redirect to another URL, also return 200
         // MSNP15
         //<faultcode>psf:Redirect</faultcode>
         //<psf:redirectUrl>https://msnia.login.live.com/pp450/RST.srf</psf:redirectUrl>
@@ -359,10 +366,10 @@ class MSN {
             if (count($matches) != 0) {
                 $redirect_url = $matches[1];
                 if ($redirect_url == $passport_url) {
-                    $this->debug_message("*** redirect, but redirect to same URL!");
+                    $this->debug_message('*** Redirected, but to same URL!');
                     return false;
                 }
-                $this->debug_message("*** redirect to $redirect_url");
+                $this->debug_message("*** Redirected to $redirect_url");
                 return $this->get_passport_ticket($redirect_url);
             }
         }
@@ -397,7 +404,7 @@ class MSN {
 
         // no ticket found!
         if (count($matches) == 0) {
-            $this->debug_message("*** Can't get passport ticket!");
+            $this->debug_message('*** Could not get passport ticket!');
             return false;
         }
 
@@ -437,94 +444,100 @@ class MSN {
             'space_ticket' => html_entity_decode($matches[11]),
             'storage_ticket' => html_entity_decode($matches[13])
         );
-        $this->ticket=$aTickets;
-        $this->debug_message(var_export($aTickets, true));
-        $ABAuthHeaderArray=array(
-            'ABAuthHeader'=>array(
-                ':'=>array('xmlns'=>'http://www.msn.com/webservices/AddressBook'),
-                'ManagedGroupRequest'=>false,
-                'TicketToken'=>htmlspecialchars($this->ticket['contact_ticket']),
+        $this->ticket = $aTickets;
+        //$this->debug_message(var_export($aTickets, true));
+        $ABAuthHeaderArray = array(
+            'ABAuthHeader' => array(
+                ':' => array('xmlns' => 'http://www.msn.com/webservices/AddressBook'),
+                'ManagedGroupRequest' => false,
+                'TicketToken' => htmlspecialchars($this->ticket['contact_ticket']),
             )
         );
-        $this->ABAuthHeader=new SoapHeader("http://www.msn.com/webservices/AddressBook","ABAuthHeader", $this->Array2SoapVar($ABAuthHeaderArray));
+        $this->ABAuthHeader = new SoapHeader('http://www.msn.com/webservices/AddressBook', 'ABAuthHeader', $this->Array2SoapVar($ABAuthHeaderArray));
         return $aTickets;
     }
 
-    private function UpdateContacts()
-    {
-        $ABApplicationHeaderArray=array(
-            'ABApplicationHeader'=>array(
-                ':'=>array('xmlns'=>'http://www.msn.com/webservices/AddressBook'),
-                'ApplicationId'=>'CFE80F9D-180F-4399-82AB-413F33A1FA11',
-                'IsMigration'=>false,
-                'PartnerScenario'=>'ContactSave'
+    /**
+    * Fetch contact list
+    *
+    * @return boolean true on success
+    */
+    private function UpdateContacts() {
+        $ABApplicationHeaderArray = array(
+            'ABApplicationHeader' => array(
+                ':' => array('xmlns' => 'http://www.msn.com/webservices/AddressBook'),
+                'ApplicationId' => 'CFE80F9D-180F-4399-82AB-413F33A1FA11',
+                'IsMigration' => false,
+                'PartnerScenario' => 'ContactSave'
              )
         );
 
-        $ABApplicationHeader=new SoapHeader("http://www.msn.com/webservices/AddressBook",'ABApplicationHeader', $this->Array2SoapVar($ABApplicationHeaderArray));
-        $ABFindAllArray=array(
-            'ABFindAll'=>array(
-                ':'=>array('xmlns'=>'http://www.msn.com/webservices/AddressBook'),
-                'abId'=>'00000000-0000-0000-0000-000000000000',
-                'abView'=>'Full',
-                'lastChange'=>'0001-01-01T00:00:00.0000000-08:00',
+        $ABApplicationHeader = new SoapHeader('http://www.msn.com/webservices/AddressBook', 'ABApplicationHeader', $this->Array2SoapVar($ABApplicationHeaderArray));
+        $ABFindAllArray = array(
+            'ABFindAll' => array(
+                ':' => array('xmlns'=>'http://www.msn.com/webservices/AddressBook'),
+                'abId' => '00000000-0000-0000-0000-000000000000',
+                'abView' => 'Full',
+                'lastChange' => '0001-01-01T00:00:00.0000000-08:00',
             )
         );
-        $ABFindAll=new SoapParam($this->Array2SoapVar($ABFindAllArray),'ABFindAll');
-        $this->ABService->__setSoapHeaders(array($ABApplicationHeader,$this->ABAuthHeader));
-        $this->Contacts=array();
-        try
-        {
-            $this->debug_message("*** Update Contacts...");
-            $Result=$this->ABService->ABFindAll($ABFindAll);
-            $this->debug_message("*** Result:\n".print_r($Result,true)."\n".$this->ABService->__getLastResponse());
+        $ABFindAll = new SoapParam($this->Array2SoapVar($ABFindAllArray), 'ABFindAll');
+        $this->ABService->__setSoapHeaders(array($ABApplicationHeader, $this->ABAuthHeader));
+        $this->Contacts = array();
+        try {
+            $this->debug_message('*** Updating Contacts...');
+            $Result = $this->ABService->ABFindAll($ABFindAll);
+            $this->debug_message("*** Result:\n".print_r($Result, true)."\n".$this->ABService->__getLastResponse());
             foreach($Result->ABFindAllResult->contacts->Contact as $Contact)
-                $this->Contacts[$Contact->contactInfo->passportName]=$Contact;
-        }
-        catch(Exception $e)
-        {
+                $this->Contacts[$Contact->contactInfo->passportName] = $Contact;
+        } catch(Exception $e) {
             $this->debug_message("*** Update Contacts Error \nRequest:".$this->ABService->__getLastRequest()."\nError:".$e->getMessage());
             return false;
         }
         return true;
     }
 
-    private function addContact($email, $network, $display = '', $sendADL = false)
-    {
+    /**
+    * Add contact
+    *
+    * @param string $email
+    * @param integer $network
+    * @param string $display
+    * @param boolean $sendADL
+    * @return boolean true on success
+    */
+    private function addContact($email, $network, $display = '', $sendADL = false) {
         if ($network != 1) return true;
-        if(isset($this->Contacts[$email])) return true;
+        if (isset($this->Contacts[$email])) return true;
 
-        $ABContactAddArray=array(
-            'ABContactAdd'=>array(
-                ':'=>array('xmlns'=>'http://www.msn.com/webservices/AddressBook'),
-                'abId'=>'00000000-0000-0000-0000-000000000000',
-                'contacts'=>array(
-                    'Contact'=>array(
-                        ':'=>array('xmlns'=>'http://www.msn.com/webservices/AddressBook'),
-                        'contactInfo'=>array(
-                            'contactType'=>'LivePending',
-                            'passportName'=>$email,
-                            'isMessengerUser'=>true,
-                            'MessengerMemberInfo'=>array(
-                                'DisplayName'=>$email
+        $ABContactAddArray = array(
+            'ABContactAdd' => array(
+                ':' => array('xmlns' => 'http://www.msn.com/webservices/AddressBook'),
+                'abId' => '00000000-0000-0000-0000-000000000000',
+                'contacts' => array(
+                    'Contact' => array(
+                        ':' => array('xmlns' => 'http://www.msn.com/webservices/AddressBook'),
+                        'contactInfo' => array(
+                            'contactType' => 'LivePending',
+                            'passportName' => $email,
+                            'isMessengerUser' => true,
+                            'MessengerMemberInfo' => array(
+                                'DisplayName' => $email
                             )
                         )
                     )
                 ),
-                'options'=>array(
-                    'EnableAllowListManagement'=>true
+                'options' => array(
+                    'EnableAllowListManagement' => true
                 )
             )
         );
-        $ABContactAdd=new SoapParam($this->Array2SoapVar($ABContactAddArray),'ABContactAdd');
-        try
-        {
-            $this->debug_message("*** Add Contacts $email...");
+        $ABContactAdd = new SoapParam($this->Array2SoapVar($ABContactAddArray), 'ABContactAdd');
+        try {
+            $this->debug_message("*** Adding Contact $email...");
             $this->ABService->ABContactAdd($ABContactAdd);
-        }
-        catch(Exception $e)
-        {
-            $this->debug_message("*** Add Contacts Error \nRequest:".$this->ABService->__getLastRequest()."\nError:".$e->getMessage());
+        } catch(Exception $e) {
+            $this->debug_message("*** Add Contact Error \nRequest:".$this->ABService->__getLastRequest()."\nError:".$e->getMessage());
             return false;
         }
         if ($sendADL && !feof($this->NSfp)) {
@@ -533,6 +546,7 @@ class MSN {
                 $str = '<ml l="1"><d n="'.$u_domain.'"><c n="'.$u_name.'" l="'.$l.'" t="'.$network.'" /></d></ml>';
                 $len = strlen($str);
                 // NS: >>> ADL {id} {size}
+                //TODO introduce error checking
                 $this->ns_writeln("ADL $this->id $len");
                 $this->ns_writedata($str);
             }
@@ -541,8 +555,15 @@ class MSN {
         return true;
     }
 
-    function delMemberFromList($memberID, $email, $network, $list)
-    {
+    /**
+    * Remove contact from list
+    *
+    * @param integer $memberID
+    * @param string $email
+    * @param integer $network
+    * @param string $list
+    */
+    function delMemberFromList($memberID, $email, $network, $list) {
         if ($network != 1 && $network != 32) return true;
         if ($memberID === false) return true;
         $user = $email;
@@ -632,8 +653,8 @@ class MSN {
             'User-Agent: MSN Explorer/9.0 (MSN 8.0; TmstmpExt)'
         );
 
-        $this->debug_message("*** URL: $this->delmember_url");
-        $this->debug_message("*** Sending SOAP:\n$XML");
+        //$this->debug_message("*** URL: $this->delmember_url");
+        //$this->debug_message("*** Sending SOAP:\n$XML");
         $curl = curl_init();
         curl_setopt($curl, CURLOPT_URL, $this->delmember_url);
         curl_setopt($curl, CURLOPT_HTTPHEADER, $header_array);
@@ -646,29 +667,35 @@ class MSN {
         $data = curl_exec($curl);
         $http_code = curl_getinfo($curl, CURLINFO_HTTP_CODE);
         curl_close($curl);
-        $this->debug_message("*** Get Result:\n$data");
+        //$this->debug_message("*** Get Result:\n$data");
 
         if ($http_code != 200) {
             preg_match('#<faultcode>(.*)</faultcode><faultstring>(.*)</faultstring>#', $data, $matches);
             if (count($matches) == 0) {
-                $this->debug_message("*** can't delete member (network: $network) $email ($memberID) to $list");
+                $this->debug_message("*** Could not delete member (network: $network) $email ($memberID) from $list list");
                 return false;
             }
             $faultcode = trim($matches[1]);
             $faultstring = trim($matches[2]);
             if (strcasecmp($faultcode, 'soap:Client') || stripos($faultstring, 'Member does not exist') === false) {
-                $this->debug_message("*** can't delete member (network: $network) $email ($memberID) to $list, error code: $faultcode, $faultstring");
+                $this->debug_message("*** Could not delete member (network: $network) $email ($memberID) from $list list, error code: $faultcode, $faultstring");
                 return false;
             }
-            $this->debug_message("*** delete member (network: $network) $email ($memberID) from $list, not exist");
+            $this->debug_message("*** Could not delete member (network: $network) $email ($memberID) from $list list, not present in list");
             return true;
         }
-        $this->debug_message("*** delete member (network: $network) $email ($memberID) from $list");
+        $this->debug_message("*** Member successfully deleted (network: $network) $email ($memberID) from $list list");
         return true;
     }
 
-    function addMemberToList($email, $network, $list)
-    {
+    /**
+    * Add contact to list
+    *
+    * @param string $email
+    * @param integer $network
+    * @param string $list
+    */
+    function addMemberToList($email, $network, $list) {
         if ($network != 1 && $network != 32) return true;
         $ticket = htmlspecialchars($this->ticket['contact_ticket']);
         $user = $email;
@@ -763,8 +790,8 @@ class MSN {
             'User-Agent: MSN Explorer/9.0 (MSN 8.0; TmstmpExt)'
         );
 
-        $this->debug_message("*** URL: $this->addmember_url");
-        $this->debug_message("*** Sending SOAP:\n$XML");
+        //$this->debug_message("*** URL: $this->addmember_url");
+        //$this->debug_message("*** Sending SOAP:\n$XML");
         $curl = curl_init();
         curl_setopt($curl, CURLOPT_URL, $this->addmember_url);
         curl_setopt($curl, CURLOPT_HTTPHEADER, $header_array);
@@ -777,29 +804,33 @@ class MSN {
         $data = curl_exec($curl);
         $http_code = curl_getinfo($curl, CURLINFO_HTTP_CODE);
         curl_close($curl);
-        $this->debug_message("*** Get Result:\n$data");
+        //$this->debug_message("*** Get Result:\n$data");
 
         if ($http_code != 200) {
             preg_match('#<faultcode>(.*)</faultcode><faultstring>(.*)</faultstring>#', $data, $matches);
             if (count($matches) == 0) {
-                $this->debug_message("*** can't add member (network: $network) $email to $list");
+                $this->debug_message("*** Could not add member (network: $network) $email to $list list");
                 return false;
             }
             $faultcode = trim($matches[1]);
             $faultstring = trim($matches[2]);
             if (strcasecmp($faultcode, 'soap:Client') || stripos($faultstring, 'Member already exists') === false) {
-                $this->debug_message("*** can't add member (network: $network) $email to $list, error code: $faultcode, $faultstring");
+                $this->debug_message("*** Could not add member (network: $network) $email to $list list, error code: $faultcode, $faultstring");
                 return false;
             }
-            $this->debug_message("*** add member (network: $network) $email to $list, already exist!");
+            $this->debug_message("*** Could not add member (network: $network) $email to $list list, already present");
             return true;
         }
-        $this->debug_message("*** add member (network: $network) $email to $list");
+        $this->debug_message("*** Member successfully added (network: $network) $email to $list list");
         return true;
     }
 
-    function getMembershipList($returnData=false)
-    {
+    /**
+    * Get membership lists
+    *
+    * @param mixed $returnData Membership list or false on failure
+    */
+    function getMembershipList($returnData = false) {
         $ticket = htmlspecialchars($this->ticket['contact_ticket']);
         $XML = '<?xml version="1.0" encoding="utf-8"?>
 <soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/"
@@ -836,8 +867,8 @@ class MSN {
             'Content-Type: text/xml; charset=utf-8',
             'User-Agent: MSN Explorer/9.0 (MSN 8.0; TmstmpExt)'
         );
-        $this->debug_message("*** URL: $this->membership_url");
-        $this->debug_message("*** Sending SOAP:\n$XML");
+        //$this->debug_message("*** URL: $this->membership_url");
+        //$this->debug_message("*** Sending SOAP:\n$XML");
         $curl = curl_init();
         curl_setopt($curl, CURLOPT_URL, $this->membership_url);
         curl_setopt($curl, CURLOPT_HTTPHEADER, $header_array);
@@ -850,8 +881,8 @@ class MSN {
         $data = curl_exec($curl);
         $http_code = curl_getinfo($curl, CURLINFO_HTTP_CODE);
         curl_close($curl);
-        $this->debug_message("*** Get Result:\n$data");
-        if($http_code != 200) return false;
+        //$this->debug_message("*** Get Result:\n$data");
+        if ($http_code != 200) return false;
         $p = $data;
         $aMemberships = array();
         while (1) {
@@ -924,7 +955,7 @@ class MSN {
                     @list($u_name, $u_domain) = @explode('@', $email);
                     if ($u_domain == NULL) continue;
                     $aContactList[$u_domain][$u_name][$network][$sMemberRole] = $id;
-                    $this->debug_message("*** add new contact (network: $network, status: $sMemberRole): $u_name@$u_domain ($id)");
+                    $this->debug_message("*** Adding new contact (network: $network, status: $sMemberRole): $u_name@$u_domain ($id)");
                 }
             }
         }
@@ -933,6 +964,7 @@ class MSN {
 
     /**
      * Connect to the NS server
+     *
      * @param String $user Username
      * @param String $password Password
      * @param String $redirect_server Redirect server
@@ -942,21 +974,19 @@ class MSN {
     private function connect($user, $password, $redirect_server = '', $redirect_port = 1863) {
         $this->id = 1;
         if ($redirect_server === '') {
-            $this->NSfp = @fsockopen($this->server, $this->port, $errno, $errstr, 5);
+            $this->NSfp = @fsockopen($this->server, $this->port, $errno, $errstr, $this->timeout);
             if (!$this->NSfp) {
-                $this->error = "Can't connect to $this->server:$this->port, error => $errno, $errstr";
+                $this->error = "!!! Could not connect to $this->server:$this->port, error => $errno, $errstr";
                 return false;
             }
         }
         else {
-            $this->NSfp = @fsockopen($redirect_server, $redirect_port, $errno, $errstr, 5);
+            $this->NSfp = @fsockopen($redirect_server, $redirect_port, $errno, $errstr, $this->timeout);
             if (!$this->NSfp) {
-                $this->error = "Can't connect to $redirect_server:$redirect_port, error => $errno, $errstr";
+                $this->error = "!!! Could not connect to $redirect_server:$redirect_port, error => $errno, $errstr";
                 return false;
             }
         }
-
-        stream_set_timeout($this->NSfp, $this->timeout);
         $this->authed = false;
         // MSNP9
         // NS: >> VER {id} MSNP9 CVR0
@@ -965,8 +995,7 @@ class MSN {
         $this->ns_writeln("VER $this->id $this->protocol CVR0");
 
         $start_tm = time();
-        while (!self::socketcheck($this->NSfp))
-        {
+        while (!self::socketcheck($this->NSfp)) {
             $data = $this->ns_readln();
             // no data?
             if ($data === false) {
@@ -975,7 +1004,6 @@ class MSN {
                 $this->ns_writeln("OUT");
                 @fclose($this->NSfp);
                 $this->error = 'Timeout, maybe protocol changed!';
-                $this->debug_message("*** $this->error");
                 return false;
             }
 
@@ -1024,7 +1052,6 @@ class MSN {
                         $this->ns_writeln("OUT");
                         @fclose($this->NSfp);
                         $this->error = 'Passport authenticated fail!';
-                        $this->debug_message("*** $this->error");
                         return false;
                     }
 
@@ -1045,19 +1072,17 @@ class MSN {
                     // MSNP15
                     // NS: <<< XFR {id} NS {server} U D
                     @list(/* XFR */, /* id */, $Type, $server, /* ... */) = @explode(' ', $data);
-                    if($Type!='NS') break;
+                    if ($Type!='NS') break;
                     @list($ip, $port) = @explode(':', $server);
                     // this connection will close after XFR
                     @fclose($this->NSfp);
 
-                    $this->NSfp = @fsockopen($ip, $port, $errno, $errstr, 5);
+                    $this->NSfp = @fsockopen($ip, $port, $errno, $errstr, $this->timeout);
                     if (!$this->NSfp) {
                         $this->error = "Can't connect to $ip:$port, error => $errno, $errstr";
-                        $this->debug_message("*** $this->error");
                         return false;
                     }
 
-                    stream_set_timeout($this->NSfp, $this->timeout);
                     // MSNP9
                     // NS: >> VER {id} MSNP9 CVR0
                     // MSNP15
@@ -1071,7 +1096,7 @@ class MSN {
                     @list(/* GCF */, /* 0 */, $size,) = @explode(' ', $data);
                     // we don't need the data, just read it and drop
                     if (is_numeric($size) && $size > 0)
-                    $this->ns_readdata($size);
+                        $this->ns_readdata($size);
                     break;
 
                 default:
@@ -1082,7 +1107,6 @@ class MSN {
                         $this->ns_writeln("OUT");
                         @fclose($this->NSfp);
                         $this->error = "Error code: $code, please check the detail information from: http://msnpiki.msnfanatic.com/index.php/Reference:Error_List";
-                        $this->debug_message("*** $this->error");
                         return false;
                     }
                     // unknown response from server, just ignore it
@@ -1098,23 +1122,26 @@ class MSN {
      * @return void
      */
     public function signon() {
-        $this->debug_message("*** try to connect to MSN network");
+        /* FIXME Don't implement the signon as a loop or we could hang
+        *        the queue handler! */
+        $this->debug_message('*** Trying to connect to MSN network');
 
-        while(true) {
-            while(!$this->connect($this->user, $this->password)) {
-                $this->signonFailure("!!! Can't connect to server: $this->error");
-            }
-            if($this->UpdateContacts() === false) {
-                $this->signonFailure('!!! Update contacts failed');
+        while (true) {
+            // Connect
+            if (!$this->connect($this->user, $this->password)) {
+                $this->signonFailure("!!! Could not connect to server: $this->error");
                 continue;
             }
-            $this->LastPing=time();
-            $start_tm = time();
-            $ping_tm = time();
-            if(($this->aContactList = $this->getMembershipList()) === false) {
+
+            // Update contacts
+            if ($this->UpdateContacts() === false) continue;
+
+            // Get membership lists
+            if (($this->aContactList = $this->getMembershipList()) === false) {
                 $this->signonFailure('!!! Get membership list failed');
                 continue;
             }
+
             if ($this->update_pending) {
                 if (is_array($this->aContactList)) {
                     $pending = 'Pending';
@@ -1206,15 +1233,15 @@ class MSN {
             //$MsnObj=$this->PhotoStckObj();
             // NS: >>> CHG {id} {status} {clientid} {msnobj}
             $this->ns_writeln("CHG $this->id NLN $this->clientid");
-            if($this->PhotoStickerFile!==false)
+            if ($this->PhotoStickerFile !== false)
                 $this->ns_writeln("CHG $this->id NLN $this->clientid ".rawurlencode($this->MsnObj($this->PhotoStickerFile)));
             // NS: >>> UUX {id} length
             $str = '<Data><PSM>'.htmlspecialchars($this->psm).'</PSM><CurrentMedia></CurrentMedia><MachineGuid></MachineGuid></Data>';
             $len = strlen($str);
             $this->ns_writeln("UUX $this->id $len");
             $this->ns_writedata($str);
-            if(!socketcheck($this->NSfp)) {
-                $this->debug_message("*** connected, wait for command");
+            if (!self::socketcheck($this->NSfp)) {
+                $this->debug_message('*** Connected, waiting for commands');
                 break;
             } else {
                 $this->NSRetryWait($this->retry_wait);
@@ -1262,10 +1289,15 @@ class MSN {
         return base64_encode($blob);
     }
 
+    /**
+    * Get OIM mail data
+    *
+    * @return string mail data or false on failure
+    */
     function getOIM_maildata() {
         preg_match('#t=(.*)&p=(.*)#', $this->ticket['web_ticket'], $matches);
         if (count($matches) == 0) {
-            $this->debug_message('*** no web ticket?');
+            $this->debug_message('*** No web ticket?');
             return false;
         }
         $t = htmlspecialchars($matches[1]);
@@ -1291,8 +1323,8 @@ class MSN {
             'User-Agent: Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1; Messenger '.$this->buildver.')'
         );
 
-        $this->debug_message("*** URL: $this->oim_maildata_url");
-        $this->debug_message("*** Sending SOAP:\n$XML");
+        //$this->debug_message("*** URL: $this->oim_maildata_url");
+        //$this->debug_message("*** Sending SOAP:\n$XML");
         $curl = curl_init();
         curl_setopt($curl, CURLOPT_URL, $this->oim_maildata_url);
         curl_setopt($curl, CURLOPT_HTTPHEADER, $header_array);
@@ -1305,26 +1337,32 @@ class MSN {
         $data = curl_exec($curl);
         $http_code = curl_getinfo($curl, CURLINFO_HTTP_CODE);
         curl_close($curl);
-        $this->debug_message("*** Get Result:\n$data");
+        //$this->debug_message("*** Get Result:\n$data");
 
         if ($http_code != 200) {
-            $this->debug_message("*** Can't get OIM maildata! http code: $http_code");
+            $this->debug_message("*** Could not get OIM maildata! http code: $http_code");
             return false;
         }
 
         // <GetMetadataResponse xmlns="http://www.hotmail.msn.com/ws/2004/09/oim/rsi">See #XML_Data</GetMetadataResponse>
         preg_match('#<GetMetadataResponse([^>]*)>(.*)</GetMetadataResponse>#', $data, $matches);
         if (count($matches) == 0) {
-            $this->debug_message("*** Can't get OIM maildata");
-            return '';
+            $this->debug_message('*** Could not get OIM maildata');
+            return false;
         }
         return $matches[2];
     }
 
+    /**
+    * Fetch OIM message with given id
+    *
+    * @param string $msgid
+    * @return string Message or false on failure
+    */
     function getOIM_message($msgid) {
         preg_match('#t=(.*)&p=(.*)#', $this->ticket['web_ticket'], $matches);
         if (count($matches) == 0) {
-            $this->debug_message('*** no web ticket?');
+            $this->debug_message('*** No web ticket?');
             return false;
         }
         $t = htmlspecialchars($matches[1]);
@@ -1355,8 +1393,8 @@ class MSN {
             'User-Agent: Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1; Messenger '.$this->buildver.')'
         );
 
-        $this->debug_message("*** URL: $this->oim_read_url");
-        $this->debug_message("*** Sending SOAP:\n$XML");
+        //$this->debug_message("*** URL: $this->oim_read_url");
+        //$this->debug_message("*** Sending SOAP:\n$XML");
         $curl = curl_init();
         curl_setopt($curl, CURLOPT_URL, $this->oim_read_url);
         curl_setopt($curl, CURLOPT_HTTPHEADER, $header_array);
@@ -1369,7 +1407,7 @@ class MSN {
         $data = curl_exec($curl);
         $http_code = curl_getinfo($curl, CURLINFO_HTTP_CODE);
         curl_close($curl);
-        $this->debug_message("*** Get Result:\n$data");
+        //$this->debug_message("*** Get Result:\n$data");
 
         if ($http_code != 200) {
             $this->debug_message("*** Can't get OIM: $msgid, http code = $http_code");
@@ -1403,7 +1441,7 @@ class MSN {
             $sOIM .= $line;
         }
         $sMsg = base64_decode($sOIM);
-        $this->debug_message("*** we get OIM ($msgid): $sMsg");
+        //$this->debug_message("*** we get OIM ($msgid): $sMsg");
 
         // delete OIM
         $XML = '<?xml version="1.0" encoding="utf-8"?>
@@ -1431,8 +1469,8 @@ class MSN {
             'User-Agent: Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1; Messenger '.$this->buildver.')'
         );
 
-        $this->debug_message("*** URL: $this->oim_del_url");
-        $this->debug_message("*** Sending SOAP:\n$XML");
+        //$this->debug_message("*** URL: $this->oim_del_url");
+        //$this->debug_message("*** Sending SOAP:\n$XML");
         $curl = curl_init();
         curl_setopt($curl, CURLOPT_URL, $this->oim_del_url);
         curl_setopt($curl, CURLOPT_HTTPHEADER, $header_array);
@@ -1445,15 +1483,20 @@ class MSN {
         $data = curl_exec($curl);
         $http_code = curl_getinfo($curl, CURLINFO_HTTP_CODE);
         curl_close($curl);
-        $this->debug_message("*** Get Result:\n$data");
+        //$this->debug_message("*** Get Result:\n$data");
 
         if ($http_code != 200)
-            $this->debug_message("*** Can't delete OIM: $msgid, http code = $http_code");
+            $this->debug_message("*** Could not delete OIM: $msgid, http code = $http_code");
         else
             $this->debug_message("*** OIM ($msgid) deleted");
         return $sMsg;
     }
 
+    /**
+    * Log out and close the NS connection
+    *
+    * @return void
+    */
     private function NSLogout() {
         if (is_resource($this->NSfp) && !feof($this->NSfp)) {
             // logout now
@@ -1461,18 +1504,27 @@ class MSN {
             $this->ns_writeln("OUT");
             fclose($this->NSfp);
             $this->NSfp = false;
-            $this->debug_message("*** logout now!");
+            $this->debug_message("*** Logged out");
         }
-
     }
 
+    /**
+    * Sleep for the given number of seconds
+    *
+    * @param integer $wait Number of seconds to sleep for
+    */
     private function NSRetryWait($wait) {
-        $this->debug_message("*** wait for $Wait seconds");
+        $this->debug_message("*** Sleeping for $wait seconds before retrying");
         sleep($wait);
     }
 
-    function getChallenge($code)
-    {
+    /**
+    * Generate challenge response
+    *
+    * @param string $code
+    * @return string challenge response code
+    */
+    function getChallenge($code) {
         // MSNP15
         // http://msnpiki.msnfanatic.com/index.php/MSNP11:Challenges
         // Step 1: The MD5 Hash
@@ -1546,514 +1598,23 @@ class MSN {
         return $hash;
     }
 
-    private function getMessage($sMessage, $network = 1)
-    {
+    /**
+    * Generate the data to send a message
+    *
+    * @param string $sMessage Message
+    * @param integer $network Network
+    */
+    private function getMessage($sMessage, $network = 1) {
         $msg_header = "MIME-Version: 1.0\r\nContent-Type: text/plain; charset=UTF-8\r\nX-MMS-IM-Format: FN=$this->font_fn; EF=$this->font_ef; CO=$this->font_co; CS=0; PF=22\r\n\r\n";
         $msg_header_len = strlen($msg_header);
         if ($network == 1)
             $maxlen = $this->max_msn_message_len - $msg_header_len;
         else
             $maxlen = $this->max_yahoo_message_len - $msg_header_len;
-        $sMessage=str_replace("\r", '', $sMessage);
-        $msg=substr($sMessage,0,$maxlen);
+        $sMessage = str_replace("\r", '', $sMessage);
+        $msg = substr($sMessage, 0, $maxlen);
         return $msg_header.$msg;
     }
-    /**
-     *
-     * @param $Action 連線模式 'Active' => 主動傳送訊息,'Passive' => 接收訊息
-     * @param $Param
-     * @return boolean
-     */
-    private function DoSwitchBoard($Action,$Param)
-    {
-        $SessionEnd=false;
-        $Joined=false;
-        $this->id=1;
-        $LastActive=time();
-        stream_set_timeout($this->SBfp, $this->SBStreamTimeout);
-        switch($Action)
-        {
-            case 'Active':
-                $cki_code=$Param['cki'];
-                $user=$Param['user'];
-                $this->SwitchBoardMessageQueue=$Param['Msg'];
-                // SB: >>> USR {id} {user} {cki}
-                $this->SB_writeln("USR $this->id $this->user $cki_code");
-                $this->SwitchBoardSessionUser=$user;
-                break;
-            case 'Passive':
-                $ticket=$Param['ticket'];
-                $sid=$Param['sid'];
-                $user=$Param['user'];
-                // SB: >>> ANS {id} {user} {ticket} {session_id}
-                $this->SB_writeln("ANS $this->id $this->user $ticket $sid");
-                $this->SwitchBoardSessionUser=$user;
-                break;
-            default:
-                return false;
-        }
-        while((!feof($this->SBfp))&&(!$SessionEnd))
-        {
-            $data = $this->SB_readln();
-            if($this->kill_me)
-            {
-                $this->debug_message("*** SB Okay, kill me now!");
-                break;
-            }
-            if($data === false)
-            {
-                if(time()-$LastActive > $this->SBIdleTimeout)
-                {
-                    $this->debug_message("*** SB Idle Timeout!");
-                    break;
-                }
-                if(!$Joined) continue;
-                foreach($this->SwitchBoardMessageQueue as $Message)
-                {
-                    if($Message=='') continue;
-                    $aMessage = $this->getMessage($Message);
-                    //CheckEmotion...
-                    $MsnObjDefine=$this->GetMsnObjDefine($aMessage);
-                    if($MsnObjDefine!=='')
-                    {
-                        $SendString="MIME-Version: 1.0\r\nContent-Type: text/x-mms-emoticon\r\n\r\n$MsnObjDefine";
-                        $len = strlen($SendString);
-                        $this->SB_writeln("MSG $this->id N $len");
-                        $this->SB_writedata($SendString);
-                        $this->id++;
-                    }
-                    $len = strlen($aMessage);
-                    $this->SB_writeln("MSG $this->id N $len");
-                    $this->SB_writedata($aMessage);
-                }
-                $this->SwitchBoardMessageQueue=array();
-                if(!$this->IsIgnoreMail($user)) $LastActive = time();
-                continue;
-            }
-            $code = substr($data, 0, 3);
-            switch($code)
-            {
-                case 'IRO':
-                    // SB: <<< IRO {id} {rooster} {roostercount} {email} {alias} {clientid}
-                    @list(/* IRO */, /* id */, $cur_num, $total, $email, $alias, $clientid) = @explode(' ', $data);
-                    $this->debug_message("*** $email join us");
-                    $Joined=true;
-                    break;
-                case 'BYE':
-                    $this->debug_message("*** Quit for BYE");
-                    $SessionEnd=true;
-                    break;
-                case 'USR':
-                    // SB: <<< USR {id} OK {user} {alias}
-                    // we don't need the data, just ignore it
-                    // request user to join this switchboard
-                    // SB: >>> CAL {id} {user}
-                    $this->SB_writeln("CAL $this->id $user");
-                    break;
-                case 'CAL':
-                    // SB: <<< CAL {id} RINGING {?}
-                    // we don't need this, just ignore, and wait for other response
-                    $this->id++;
-                    break;
-                case 'JOI':
-                    // SB: <<< JOI {user} {alias} {clientid?}
-                    // someone join us
-                    // we don't need the data, just ignore it
-                    // no more user here
-                    $Joined=true;
-                    break;
-                case 'MSG':
-                    // SB: <<< MSG {email} {alias} {len}
-                    @list(/* MSG */, $from_email, /* alias */, $len, ) = @explode(' ', $data);
-                    $len = trim($len);
-                    $data = $this->SB_readdata($len);
-                    $aLines = @explode("\n", $data);
-                    $header = true;
-                    $ignore = false;
-                    $is_p2p = false;
-                    $sMsg = '';
-                    foreach ($aLines as $line)
-                    {
-                        $line = rtrim($line);
-                        if ($header) {
-                            if ($line === '') {
-                                $header = false;
-                                continue;
-                            }
-                            if (strncasecmp($line, 'TypingUser:', 11) == 0) {
-                                // typing notification, just ignore
-                                $ignore = true;
-                                break;
-                            }
-                            if (strncasecmp($line, 'Chunk:', 6) == 0) {
-                                // we don't handle any split message, just ignore
-                                $ignore = true;
-                                break;
-                            }
-                            if (strncasecmp($line, 'Content-Type: application/x-msnmsgrp2p', 38) == 0) {
-                                // p2p message, ignore it, but we need to send acknowledgement for it...
-                                $is_p2p = true;
-                                $p = strstr($data, "\n\n");
-                                $sMsg = '';
-                                if ($p === false) {
-                                    $p = strstr($data, "\r\n\r\n");
-                                    if ($p !== false)
-                                    $sMsg = substr($p, 4);
-                                }
-                                else
-                                $sMsg = substr($p, 2);
-                                break;
-                            }
-                            if (strncasecmp($line, 'Content-Type: application/x-', 28) == 0) {
-                                // ignore all application/x-... message
-                                // for example:
-                                //      application/x-ms-ink        => ink message
-                                $ignore = true;
-                                break;
-                            }
-                            if (strncasecmp($line, 'Content-Type: text/x-', 21) == 0) {
-                                // ignore all text/x-... message
-                                // for example:
-                                //      text/x-msnmsgr-datacast         => nudge, voice clip....
-                                //      text/x-mms-animemoticon         => customized animemotion word
-                                $ignore = true;
-                                break;
-                            }
-                            continue;
-                        }
-                        if ($sMsg !== '')
-                        $sMsg .= "\n";
-                        $sMsg .= $line;
-                    }
-                    if ($ignore)
-                    {
-                        $this->debug_message("*** ingnore from $from_email: $line");
-                        break;
-                    }
-                    if ($is_p2p)
-                    {
-                        // we will ignore any p2p message after sending acknowledgement
-                        $ignore = true;
-                        $len = strlen($sMsg);
-                        $this->debug_message("*** p2p message from $from_email, size $len");
-                        // header = 48 bytes
-                        // content >= 0 bytes
-                        // footer = 4 bytes
-                        // so it need to >= 52 bytes
-                        /*if ($len < 52) {
-                            $this->debug_message("*** p2p: size error, less than 52!");
-                            break;
-                        }*/
-                        $aDwords = @unpack("V12dword", $sMsg);
-                        if (!is_array($aDwords)) {
-                            $this->debug_message("*** p2p: header unpack error!");
-                            break;
-                        }
-                        $this->debug_message("*** p2p: dump received message:\n".$this->dump_binary($sMsg));
-                        $hdr_SessionID = $aDwords['dword1'];
-                        $hdr_Identifier = $aDwords['dword2'];
-                        $hdr_DataOffsetLow = $aDwords['dword3'];
-                        $hdr_DataOffsetHigh = $aDwords['dword4'];
-                        $hdr_TotalDataSizeLow = $aDwords['dword5'];
-                        $hdr_TotalDataSizeHigh = $aDwords['dword6'];
-                        $hdr_MessageLength = $aDwords['dword7'];
-                        $hdr_Flag = $aDwords['dword8'];
-                        $hdr_AckID = $aDwords['dword9'];
-                        $hdr_AckUID = $aDwords['dword10'];
-                        $hdr_AckSizeLow = $aDwords['dword11'];
-                        $hdr_AckSizeHigh = $aDwords['dword12'];
-                        $this->debug_message("*** p2p: header SessionID = $hdr_SessionID");
-                        $this->debug_message("*** p2p: header Inentifier = $hdr_Identifier");
-                        $this->debug_message("*** p2p: header Data Offset Low = $hdr_DataOffsetLow");
-                        $this->debug_message("*** p2p: header Data Offset High = $hdr_DataOffsetHigh");
-                        $this->debug_message("*** p2p: header Total Data Size Low = $hdr_TotalDataSizeLow");
-                        $this->debug_message("*** p2p: header Total Data Size High = $hdr_TotalDataSizeHigh");
-                        $this->debug_message("*** p2p: header MessageLength = $hdr_MessageLength");
-                        $this->debug_message("*** p2p: header Flag = $hdr_Flag");
-                        $this->debug_message("*** p2p: header AckID = $hdr_AckID");
-                        $this->debug_message("*** p2p: header AckUID = $hdr_AckUID");
-                        $this->debug_message("*** p2p: header AckSize Low = $hdr_AckSizeLow");
-                        $this->debug_message("*** p2p: header AckSize High = $hdr_AckSizeHigh");
-                        if($hdr_Flag==2) {
-                            //This is an ACK from SB ignore....
-                            $this->debug_message("*** p2p: //This is an ACK from SB ignore....:\n");
-                            break;
-                        }
-                        $MsgBody=$this->linetoArray(substr($sMsg,48,-4));
-                        $this->debug_message("*** p2p: body".print_r($MsgBody,true));
-                        if(($MsgBody['EUF-GUID']=='{A4268EEC-FEC5-49E5-95C3-F126696BDBF6}')&&($PictureFilePath=$this->GetPictureFilePath($MsgBody['Context'])))
-                        {
-                            while(true)
-                            {
-                                if($this->SB_readln()===false) break;
-                            }
-                            $this->debug_message("*** p2p: Inv hdr:\n".$this->dump_binary(substr($sMsg,0,48)));
-                            preg_match('/{([0-9A-F\-]*)}/i',$MsgBody['Via'],$Matches);
-                            $BranchGUID=$Matches[1];
-                            //it's an invite to send a display picture.
-                            $new_id = ~$hdr_Identifier;
-                            $hdr = pack("LLLLLLLLLLLL", $hdr_SessionID,
-                            $new_id,
-                            0, 0,
-                            $hdr_TotalDataSizeLow, $hdr_TotalDataSizeHigh,
-                            0,
-                            2,
-                            $hdr_Identifier,
-                            $hdr_AckID,
-                            $hdr_TotalDataSizeLow, $hdr_TotalDataSizeHigh);
-                            $footer = pack("L", 0);
-                            $message = "MIME-Version: 1.0\r\nContent-Type: application/x-msnmsgrp2p\r\nP2P-Dest: $from_email\r\n\r\n$hdr$footer";
-                            $len = strlen($message);
-                            $this->SB_writeln("MSG $this->id D $len");
-                            $this->SB_writedata($message);
-                            $this->debug_message("*** p2p: send display picture acknowledgement for $hdr_SessionID");
-                            $this->debug_message("*** p2p: Invite ACK message:\n".$this->dump_binary($message));
-                            $this->SB_readln();//Read ACK;
-                            $this->debug_message("*** p2p: Invite ACK Hdr:\n".$this->dump_binary($hdr));
-                            $new_id-=3;
-                            //Send 200 OK message
-                            $MessageContent="SessionID: ".$MsgBody['SessionID']."\r\n\r\n".pack("C", 0);
-                            $MessagePayload=
-                                "MSNSLP/1.0 200 OK\r\n".
-                                "To: <msnmsgr:".$from_email.">\r\n".
-                                "From: <msnmsgr:".$this->user.">\r\n".
-                                "Via: ".$MsgBody['Via']."\r\n".
-                                "CSeq: ".($MsgBody['CSeq']+1)."\r\n".
-                                "Call-ID: ".$MsgBody['Call-ID']."\r\n".
-                                "Max-Forwards: 0\r\n".
-                                "Content-Type: application/x-msnmsgr-sessionreqbody\r\n".
-                                "Content-Length: ".strlen($MessageContent)."\r\n\r\n".
-                            $MessageContent;
-                            $hdr_TotalDataSizeLow=strlen($MessagePayload);
-                            $hdr_TotalDataSizeHigh=0;
-                            $hdr = pack("LLLLLLLLLLLL", $hdr_SessionID,
-                            $new_id,
-                            0, 0,
-                            $hdr_TotalDataSizeLow, $hdr_TotalDataSizeHigh,
-                            strlen($MessagePayload),
-                            0,
-                            rand(),
-                            0,
-                            0,0);
-
-                            $message =
-                                "MIME-Version: 1.0\r\n".
-                                "Content-Type: application/x-msnmsgrp2p\r\n".
-                                "P2P-Dest: $from_email\r\n\r\n$hdr$MessagePayload$footer";
-                            $this->SB_writeln("MSG $this->id D ".strlen($message));
-                            $this->SB_writedata($message);
-                            $this->debug_message("*** p2p: dump 200 ok message:\n".$this->dump_binary($message));
-                            $this->SB_readln();//Read ACK;
-
-                            $this->debug_message("*** p2p: 200 ok:\n".$this->dump_binary($hdr));
-                            //send Data preparation message
-                            //send 4 null bytes as data
-                            $hdr_TotalDataSizeLow=4;
-                            $hdr_TotalDataSizeHigh=0;
-                            $new_id++;
-                            $hdr = pack("LLLLLLLLLLLL",
-                            $MsgBody['SessionID'],
-                            $new_id,
-                            0, 0,
-                            $hdr_TotalDataSizeLow, $hdr_TotalDataSizeHigh,
-                            $hdr_TotalDataSizeLow,
-                            0,
-                            rand(),
-                            0,
-                            0,0);
-                            $message =
-                                "MIME-Version: 1.0\r\n".
-                                "Content-Type: application/x-msnmsgrp2p\r\n".
-                                "P2P-Dest: $from_email\r\n\r\n$hdr".pack('L',0)."$footer";
-                            $this->SB_writeln("MSG $this->id D ".strlen($message));
-                            $this->SB_writedata($message);
-                            $this->debug_message("*** p2p: dump send Data preparation message:\n".$this->dump_binary($message));
-                            $this->debug_message("*** p2p: Data Prepare Hdr:\n".$this->dump_binary($hdr));
-                            $this->SB_readln();//Read ACK;
-
-                            //send Data Content..
-                            $footer=pack('N',1);
-                            $new_id++;
-                            $FileSize=filesize($PictureFilePath);
-                            if($hTitle=fopen($PictureFilePath,'rb'))
-                            {
-                                $Offset=0;
-                                //$new_id++;
-                                while(!feof($hTitle))
-                                {
-                                    $FileContent=fread($hTitle,1024);
-                                    $FileContentSize=strlen($FileContent);
-                                    $hdr = pack("LLLLLLLLLLLL",
-                                    $MsgBody['SessionID'],
-                                    $new_id,
-                                    $Offset, 0,
-                                    $FileSize,0,
-                                    $FileContentSize,
-                                    0x20,
-                                    rand(),
-                                    0,
-                                    0,0
-                                    );
-                                    $message =
-                                        "MIME-Version: 1.0\r\n".
-                                        "Content-Type: application/x-msnmsgrp2p\r\n".
-                                        "P2P-Dest: $from_email\r\n\r\n$hdr$FileContent$footer";
-                                    $this->SB_writeln("MSG $this->id D ".strlen($message));
-                                    $this->SB_writedata($message);
-                                    $this->debug_message("*** p2p: dump send Data Content message  $Offset / $FileSize :\n".$this->dump_binary($message));
-                                    $this->debug_message("*** p2p: Data Content Hdr:\n".$this->dump_binary($hdr));
-                                    //$this->SB_readln();//Read ACK;
-                                    $Offset+=$FileContentSize;
-                                }
-                            }
-                            //Send Bye
-                            /*
-                            $MessageContent="\r\n".pack("C", 0);
-                            $MessagePayload=
-                                "BYE MSNMSGR:MSNSLP/1.0\r\n".
-                                "To: <msnmsgr:$from_email>\r\n".
-                                "From: <msnmsgr:".$this->user.">\r\n".
-                                "Via: MSNSLP/1.0/TLP ;branch={".$BranchGUID."}\r\n".
-                                "CSeq: 0\r\n".
-                                "Call-ID: ".$MsgBody['Call-ID']."\r\n".
-                                "Max-Forwards: 0\r\n".
-                                "Content-Type: application/x-msnmsgr-sessionclosebody\r\n".
-                                "Content-Length: ".strlen($MessageContent)."\r\n\r\n".$MessageContent;
-                            $footer=pack('N',0);
-                            $hdr_TotalDataSizeLow=strlen($MessagePayload);
-                            $hdr_TotalDataSizeHigh=0;
-                            $new_id++;
-                            $hdr = pack("LLLLLLLLLLLL",
-                            0,
-                            $new_id,
-                            0, 0,
-                            $hdr_TotalDataSizeLow, $hdr_TotalDataSizeHigh,
-                            0,
-                            0,
-                            rand(),
-                            0,
-                            0,0);
-                            $message =
-                                        "MIME-Version: 1.0\r\n".
-                                        "Content-Type: application/x-msnmsgrp2p\r\n".
-                                        "P2P-Dest: $from_email\r\n\r\n$hdr$MessagePayload$footer";
-                            $this->SB_writeln("MSG $id D ".strlen($message));
-                            $id++;
-                            $this->SB_writedata($message);
-                            $this->debug_message("*** p2p: dump send BYE message :\n".$this->dump_binary($message));
-                            */
-                            break;
-                        }
-                        //TODO:
-                        //if ($hdr_Flag == 2) {
-                        // just send ACK...
-                        //    $this->SB_writeln("ACK $id");
-                        //    break;
-                        //}
-                        if ($hdr_SessionID == 4) {
-                            // ignore?
-                            $this->debug_message("*** p2p: ignore flag 4");
-                            break;
-                        }
-                        $finished = false;
-                        if ($hdr_TotalDataSizeHigh == 0) {
-                            // only 32 bites size
-                            if (($hdr_MessageLength + $hdr_DataOffsetLow) == $hdr_TotalDataSizeLow)
-                            $finished = true;
-                        }
-                        else {
-                            // we won't accept any file transfer
-                            // so I think we won't get any message size need to use 64 bits
-                            // 64 bits size here, can't count directly...
-                            $totalsize = base_convert(sprintf("%X%08X", $hdr_TotalDataSizeHigh, $hdr_TotalDataSizeLow), 16, 10);
-                            $dataoffset = base_convert(sprintf("%X%08X", $hdr_DataOffsetHigh, $hdr_DataOffsetLow), 16, 10);
-                            $messagelength = base_convert(sprintf("%X", $hdr_MessageLength), 16, 10);
-                            $now_size = bcadd($dataoffset, $messagelength);
-                            if (bccomp($now_size, $totalsize) >= 0)
-                            $finished = true;
-                        }
-                        if (!$finished) {
-                            // ignore not finished split packet
-                            $this->debug_message("*** p2p: ignore split packet, not finished");
-                            break;
-                        }
-                        //$new_id = ~$hdr_Identifier;
-                        /*
-                         $new_id++;
-                         $hdr = pack("LLLLLLLLLLLL", $hdr_SessionID,
-                         $new_id,
-                         0, 0,
-                         $hdr_TotalDataSizeLow, $hdr_TotalDataSizeHigh,
-                         0,
-                         2,
-                         $hdr_Identifier,
-                         $hdr_AckID,
-                         $hdr_TotalDataSizeLow, $hdr_TotalDataSizeHigh);
-                         $footer = pack("L", 0);
-                         $message = "MIME-Version: 1.0\r\nContent-Type: application/x-msnmsgrp2p\r\nP2P-Dest: $from_email\r\n\r\n$hdr$footer";
-                         $len = strlen($message);
-                         $this->SB_writeln("MSG $id D $len");
-                         $id++;
-                         $this->SB_writedata($message);
-                         $this->debug_message("*** p2p: send acknowledgement for $hdr_SessionID");
-                         $this->debug_message("*** p2p: dump sent message:\n".$this->dump_binary($hdr.$footer));
-                         */
-                        break;
-                    }
-                    $this->debug_message("*** MSG from $from_email: $sMsg");
-                    $this->ReceivedMessage($from_email,$sMsg,$network,false);
-                    break;
-                case '217':
-                    $this->debug_message("*** User $user is offline. Try OIM.");
-                    foreach($this->SwitchBoardMessageQueue as $Message)
-                    $this->SendMessage($Message,"$user@Offline");
-                    $SessionEnd=true;
-                    break;
-                default:
-                    if (is_numeric($code))
-                    {
-                        $this->error = "Error code: $code, please check the detail information from: http://msnpiki.msnfanatic.com/index.php/Reference:Error_List";
-                        $this->debug_message("*** SB: $this->error");
-                        $SessionEnd=true;
-                    }
-                    break;
-            }
-            if(!$this->IsIgnoreMail($user)) $LastActive = time();
-        }
-        if (feof($this->SBfp))
-        {
-            // lost connection? error? try OIM later
-            @fclose($this->SBfp);
-            return false;
-        }
-        $this->SB_writeln("OUT");
-        @fclose($this->SBfp);
-        return true;
-    }
-    /*private function switchboard_control($ip, $port, $cki_code, $user, $Messages)
-    {
-        $this->SwitchBoardProcess=1;
-        $this->debug_message("*** SB: try to connect to switchboard server $ip:$port");
-        $this->SBfp = @fsockopen($ip, $port, $errno, $errstr, 5);
-        if (!$this->SBfp)
-        {
-            $this->debug_message("*** SB: Can't connect to $ip:$port, error => $errno, $errstr");
-            return false;
-        }
-        return $this->DoSwitchBoard('Active',array('cki'=>$cki_code, 'user'=>$user,'Msg'=>$Messages));
-    }
-    private function switchboard_ring($ip, $port, $sid, $ticket,$user)
-    {
-        $this->SwitchBoardProcess=2;
-        $this->debug_message("*** SB: try to connect to switchboard server $ip:$port");
-        $this->SBfp = @fsockopen($ip, $port, $errno, $errstr, 5);
-        if (!$this->SBfp)
-        {
-            $this->debug_message("*** SB: Can't connect to $ip:$port, error => $errno, $errstr");
-            return false;
-        }
-        return $this->DoSwitchBoard('Passive',array('sid'=>$sid,'user'=>$user,'ticket'=>$ticket));
-    }*/
 
     // read data for specified size
     private function ns_readdata($size) {
@@ -2098,8 +1659,8 @@ class MSN {
     private function sb_readdata($socket, $size) {
         $data = '';
         $count = 0;
-        while (!feof($this->SBfp)) {
-            $buf = @fread($this->SBfp, $size - $count);
+        while (!feof($socket)) {
+            $buf = @fread($socket, $size - $count);
             $data .= $buf;
             $count += strlen($buf);
             if ($count >= $size) break;
@@ -2137,7 +1698,7 @@ class MSN {
     // show debug information
     function debug_message($str) {
         if (!$this->debug) return;
-        if($this->debug===STDOUT) echo $str."\n";
+        if ($this->debug===STDOUT) echo $str."\n";
         /*$fname=MSN_CLASS_LOG_DIR.DIRECTORY_SEPARATOR.'msn_'.strftime('%Y%m%d').'.debug';
         $fp = fopen($fname, 'at');
         if ($fp) {
@@ -2184,55 +1745,54 @@ class MSN {
      */
     private function MsnObj($FilePath,$Type=3)
     {
-        if(!($FileSize=filesize($FilePath))) return '';
-        $Location=md5($FilePath);
-        $Friendly=md5($FilePath.$Type);
-        if(isset($this->MsnObjMap[$Location])) return $this->MsnObjMap[$Location];
-        $sha1d=base64_encode(sha1(file_get_contents($FilePath),true));
-        $sha1c=base64_encode(sha1("Creator".$this->user."Size$FileSize"."Type$Type"."Location$Location"."Friendly".$Friendly."SHA1D$sha1d",true));
-        $this->MsnObjArray[$Location]=$FilePath;
-        $MsnObj='<msnobj Creator="'.$this->user.'" Size="'.$FileSize.'" Type="'.$Type.'" Location="'.$Location.'" Friendly="'.$Friendly.'" SHA1D="'.$sha1d.'" SHA1C="'.$sha1c.'"/>';
-        $this->MsnObjMap[$Location]=$MsnObj;
+        if (!($FileSize=filesize($FilePath))) return '';
+        $Location = md5($FilePath);
+        $Friendly = md5($FilePath.$Type);
+        if (isset($this->MsnObjMap[$Location])) return $this->MsnObjMap[$Location];
+        $sha1d = base64_encode(sha1(file_get_contents($FilePath), true));
+        $sha1c = base64_encode(sha1("Creator".$this->user."Size$FileSize"."Type$Type"."Location$Location"."Friendly".$Friendly."SHA1D$sha1d",true));
+        $this->MsnObjArray[$Location] = $FilePath;
+        $MsnObj = '<msnobj Creator="'.$this->user.'" Size="'.$FileSize.'" Type="'.$Type.'" Location="'.$Location.'" Friendly="'.$Friendly.'" SHA1D="'.$sha1d.'" SHA1C="'.$sha1c.'"/>';
+        $this->MsnObjMap[$Location] = $MsnObj;
         $this->debug_message("*** p2p: addMsnObj $FilePath::$MsnObj\n");
         return $MsnObj;
     }
 
     private function linetoArray($lines) {
-        $lines=str_replace("\r",'',$lines);
-        $lines=explode("\n",$lines);
-        foreach($lines as $line) {
-            if(!isset($line{3})) continue;
-            list($Key,$Val)=explode(':',$line);
-            $Data[trim($Key)]=trim($Val);
+        $lines = str_replace("\r", '', $lines);
+        $lines = explode("\n", $lines);
+        foreach ($lines as $line) {
+            if (!isset($line{3})) continue;
+            list($Key,$Val) = explode(':', $line);
+            $Data[trim($Key)] = trim($Val);
         }
         return $Data;
     }
 
-    private function GetPictureFilePath($Context)
-    {
-        $MsnObj=base64_decode($Context);
-        if(preg_match('/location="(.*?)"/i',$MsnObj,$Match))
-        $location=$Match[1];
+    private function GetPictureFilePath($Context) {
+        $MsnObj = base64_decode($Context);
+        if (preg_match('/location="(.*?)"/i', $MsnObj, $Match))
+            $location = $Match[1];
         $this->debug_message("*** p2p: PictureFile[$location] ::All".print_r($this->MsnObjArray,true)."\n");
-        if($location&&(isset($this->MsnObjArray[$location])))
-        return $this->MsnObjArray[$location];
+        if ($location && isset($this->MsnObjArray[$location]))
+            return $this->MsnObjArray[$location];
         return false;
     }
 
-    private function GetMsnObjDefine($Message)
-    {
-        $DefineString='';
-        if(is_array($this->Emotions))
-        foreach($this->Emotions as $Pattern => $FilePath)
-        {
-            if(strpos($Message,$Pattern)!==false)
-            $DefineString.="$Pattern\t".$this->MsnObj($FilePath,2)."\t";
-        }
+    private function GetMsnObjDefine($Message) {
+        $DefineString = '';
+        if (is_array($this->Emotions))
+            foreach ($this->Emotions as $Pattern => $FilePath) {
+                if (strpos($Message, $Pattern)!==false)
+                $DefineString .= "$Pattern\t".$this->MsnObj($FilePath, 2)."\t";
+            }
         return $DefineString;
     }
 
     /**
      * Read and handle incoming command from NS
+     *
+     * @return void
      */
     private function nsReceive() {
         // Sign in again if not signed in or socket failed
@@ -2244,15 +1804,14 @@ class MSN {
         }
 
         $data = $this->ns_readln();
-        if($data === false) {
+        if ($data === false) {
             // There was no data / an error when reading from the socket so reconnect
             $this->callHandler('Reconnect');
             $this->NSRetryWait($this->retry_wait);
             $this->signon();
             return;
         } else {
-            switch (substr($data,0,3))
-            {
+            switch (substr($data, 0, 3)) {
                 case 'SBS':
                     // after 'USR {id} OK {user} {verify} 0' response, the server will send SBS and profile to us
                     // NS: <<< SBS 0 null
@@ -2274,67 +1833,63 @@ class MSN {
 
                 case 'LST':
                     // NS: <<< LST {email} {alias} 11 0
-                    @list(/* LST */, $email, /* alias */, ) = @explode(' ', $data);
+                    @list(/* LST */, $email, /* alias */,) = @explode(' ', $data);
                     @list($u_name, $u_domain) = @explode('@', $email);
                     if (!isset($this->aContactList[$u_domain][$u_name][1])) {
                         $this->aContactList[$u_domain][$u_name][1]['Allow'] = 'Allow';
-                        $this->debug_message("*** add to our contact list: $u_name@$u_domain");
+                        $this->debug_message("*** Added to contact list: $u_name@$u_domain");
                     }
                     break;
 
                 case 'ADL':
-                    // randomly, we get ADL command, someome add us to their contact list for MSNP15
+                    // randomly, we get ADL command, someone add us to their contact list for MSNP15
                     // NS: <<< ADL 0 {size}
                     @list(/* ADL */, /* 0 */, $size,) = @explode(' ', $data);
-                    if (is_numeric($size) && $size > 0)
-                    {
+                    if (is_numeric($size) && $size > 0) {
                         $data = $this->ns_readdata($size);
                         preg_match('#<ml><d n="([^"]+)"><c n="([^"]+)"(.*) t="(\d*)"(.*) /></d></ml>#', $data, $matches);
-                        if (is_array($matches) && count($matches) > 0)
-                        {
+                        if (is_array($matches) && count($matches) > 0) {
                             $u_domain = $matches[1];
                             $u_name = $matches[2];
                             $network = $matches[4];
                             if (isset($this->aContactList[$u_domain][$u_name][$network]))
-                                $this->debug_message("*** someone (network: $network) add us to their list (but already in our list): $u_name@$u_domain");
+                                $this->debug_message("*** Someone (network: $network) added us to their list (but already in our list): $u_name@$u_domain");
                             else {
                                 $re_login = false;
                                 $cnt = 0;
-                                foreach (array('Allow', 'Reverse') as $list)
-                                {
-                                    if (!$this->addMemberToList($u_name.'@'.$u_domain, $network, $list))
-                                    {
+                                foreach (array('Allow', 'Reverse') as $list) {
+                                    if (!$this->addMemberToList($u_name.'@'.$u_domain, $network, $list)) {
                                         if ($re_login) {
-                                            $this->debug_message("*** can't add $u_name@$u_domain (network: $network) to $list");
+                                            $this->debug_message("*** Could not add $u_name@$u_domain (network: $network) to $list list");
                                             continue;
                                         }
                                         $aTickets = $this->get_passport_ticket();
                                         if (!$aTickets || !is_array($aTickets)) {
                                             // failed to login? ignore it
-                                            $this->debug_message("*** can't re-login, something wrong here");
-                                            $this->debug_message("*** can't add $u_name@$u_domain (network: $network) to $list");
+                                            $this->debug_message("*** Could not re-login, something wrong here");
+                                            $this->debug_message("*** Could not add $u_name@$u_domain (network: $network) to $list list");
                                             continue;
                                         }
                                         $re_login = true;
                                         $this->ticket = $aTickets;
-                                        $this->debug_message("**** get new ticket, try it again");
-                                        if (!$this->addMemberToList($u_name.'@'.$u_domain, $network, $list))
-                                        {
-                                            $this->debug_message("*** can't add $u_name@$u_domain (network: $network) to $list");
+                                        $this->debug_message("**** Got new ticket, trying again");
+                                        if (!$this->addMemberToList($u_name.'@'.$u_domain, $network, $list)) {
+                                            $this->debug_message("*** Could not add $u_name@$u_domain (network: $network) to $list list");
                                             continue;
                                         }
                                     }
                                     $this->aContactList[$u_domain][$u_name][$network][$list] = false;
                                     $cnt++;
                                 }
-                                $this->debug_message("*** someone (network: $network) add us to their list: $u_name@$u_domain");
+                                $this->debug_message("*** Someone (network: $network) added us to their list: $u_name@$u_domain");
                             }
                             $str = '<ml l="1"><d n="'.$u_domain.'"><c n="'.$u_name.'" l="3" t="'.$network.'" /></d></ml>';
                             $len = strlen($str);
+
+                            $this->callHandler('AddedToList', array('screenname' => $u_name.'@'.$u_domain, 'network' => $network));
                         }
                         else
-                        $this->debug_message("*** someone add us to their list: $data");
-                        $this->AddUsToMemberList($u_name.'@'.$u_domain, $network);
+                            $this->debug_message("*** Someone added us to their list: $data");
                     }
                     break;
 
@@ -2342,29 +1897,29 @@ class MSN {
                     // randomly, we get RML command, someome remove us to their contact list for MSNP15
                     // NS: <<< RML 0 {size}
                     @list(/* RML */, /* 0 */, $size,) = @explode(' ', $data);
-                    if (is_numeric($size) && $size > 0)
-                    {
+                    if (is_numeric($size) && $size > 0) {
                         $data = $this->ns_readdata($size);
                         preg_match('#<ml><d n="([^"]+)"><c n="([^"]+)"(.*) t="(\d*)"(.*) /></d></ml>#', $data, $matches);
-                        if (is_array($matches) && count($matches) > 0)
-                        {
+                        if (is_array($matches) && count($matches) > 0) {
                             $u_domain = $matches[1];
                             $u_name = $matches[2];
                             $network = $matches[4];
-                            if (isset($this->aContactList[$u_domain][$u_name][$network]))
-                            {
+                            if (isset($this->aContactList[$u_domain][$u_name][$network])) {
                                 $aData = $this->aContactList[$u_domain][$u_name][$network];
+
                                 foreach ($aData as $list => $id)
-                                $this->delMemberFromList($id, $u_name.'@'.$u_domain, $network, $list);
+                                    $this->delMemberFromList($id, $u_name.'@'.$u_domain, $network, $list);
+
                                 unset($this->aContactList[$u_domain][$u_name][$network]);
-                                $this->debug_message("*** someone (network: $network) remove us from their list: $u_name@$u_domain");
+                                $this->debug_message("*** Someone (network: $network) removed us from their list: $u_name@$u_domain");
                             }
                             else
-                            $this->debug_message("*** someone (network: $network) remove us from their list (but not in our list): $u_name@$u_domain");
-                            $this->RemoveUsFromMemberList($u_name.'@'.$u_domain, $network);
+                                $this->debug_message("*** Someone (network: $network) removed us from their list (but not in our list): $u_name@$u_domain");
+
+                            $this->callHandler('RemovedFromList', array('screenname' => $u_name.'@'.$u_domain, 'network' => $network));
                         }
                         else
-                        $this->debug_message("*** someone remove us from their list: $data");
+                            $this->debug_message("*** Someone removed us from their list: $data");
                     }
                     break;
 
@@ -2386,8 +1941,7 @@ class MSN {
                                     continue;
                                 }
                                 if (strncasecmp($line, 'Content-Type:', 13) == 0) {
-                                    if (strpos($line, 'text/x-msmsgsinitialmdatanotification') === false &&
-                                    strpos($line, 'text/x-msmsgsoimnotification') === false) {
+                                    if (strpos($line, 'text/x-msmsgsinitialmdatanotification') === false && strpos($line, 'text/x-msmsgsoimnotification') === false) {
                                         // we just need text/x-msmsgsinitialmdatanotification
                                         // or text/x-msmsgsoimnotification
                                         $ignore = true;
@@ -2402,32 +1956,33 @@ class MSN {
                             }
                         }
                         if ($ignore) {
-                            $this->debug_message("*** ingnore MSG for: $line");
+                            $this->debug_message("*** Ignoring MSG for: $line");
                             break;
                         }
                         if ($maildata == '') {
-                            $this->debug_message("*** ingnore MSG not for OIM");
+                            $this->debug_message("*** Ignoring MSG not for OIM");
                             break;
                         }
                         $re_login = false;
                         if (strcasecmp($maildata, 'too-large') == 0) {
-                            $this->debug_message("*** large mail-data, need to get the data via SOAP");
+                            $this->debug_message("*** Large mail-data, need to get the data via SOAP");
                             $maildata = $this->getOIM_maildata();
                             if ($maildata === false) {
-                                $this->debug_message("*** can't get mail-data via SOAP");
+                                $this->debug_message("*** Could not get mail-data via SOAP");
+
                                 // maybe we need to re-login again
                                 $aTickets = $this->get_passport_ticket();
                                 if (!$aTickets || !is_array($aTickets)) {
                                     // failed to login? ignore it
-                                    $this->debug_message("*** can't re-login, something wrong here, ignore this OIM");
+                                    $this->debug_message("*** Could not re-login, something wrong here, ignoring this OIM");
                                     break;
                                 }
                                 $re_login = true;
                                 $this->ticket = $aTickets;
-                                $this->debug_message("*** get new ticket, try it again");
+                                $this->debug_message("*** Got new ticket, trying again");
                                 $maildata = $this->getOIM_maildata();
                                 if ($maildata === false) {
-                                    $this->debug_message("*** can't get mail-data via SOAP, and we already re-login again, so ignore this OIM");
+                                    $this->debug_message("*** Could not get mail-data via SOAP, and re-login already attempted, ignoring this OIM");
                                     break;
                                 }
                             }
@@ -2445,7 +2000,7 @@ class MSN {
                             $p = substr($p, $end);
                         }
                         if (count($aOIMs) == 0) {
-                            $this->debug_message("*** ingnore empty OIM");
+                            $this->debug_message("*** Ignoring empty OIM");
                             break;
                         }
                         foreach ($aOIMs as $maildata) {
@@ -2460,23 +2015,23 @@ class MSN {
                             // N: sender alias
                             preg_match('#<T>(.*)</T>#', $maildata, $matches);
                             if (count($matches) == 0) {
-                                $this->debug_message("*** ingnore OIM maildata without <T>type</T>");
+                                $this->debug_message("*** Ignoring OIM maildata without <T>type</T>");
                                 continue;
                             }
                             $oim_type = $matches[1];
                             if ($oim_type = 13)
-                            $network = 32;
+                                $network = 32;
                             else
-                            $network = 1;
+                                $network = 1;
                             preg_match('#<E>(.*)</E>#', $maildata, $matches);
                             if (count($matches) == 0) {
-                                $this->debug_message("*** ingnore OIM maildata without <E>sender</E>");
+                                $this->debug_message("*** Ignoring OIM maildata without <E>sender</E>");
                                 continue;
                             }
                             $oim_sender = $matches[1];
                             preg_match('#<I>(.*)</I>#', $maildata, $matches);
                             if (count($matches) == 0) {
-                                $this->debug_message("*** ingnore OIM maildata without <I>msgid</I>");
+                                $this->debug_message("*** Ignoring OIM maildata without <I>msgid</I>");
                                 continue;
                             }
                             $oim_msgid = $matches[1];
@@ -2484,18 +2039,18 @@ class MSN {
                             $oim_size = (count($matches) == 0) ? 0 : $matches[1];
                             preg_match('#<RT>(.*)</RT>#', $maildata, $matches);
                             $oim_time = (count($matches) == 0) ? 0 : $matches[1];
-                            $this->debug_message("*** You've OIM sent by $oim_sender, Time: $oim_time, MSGID: $oim_msgid, size: $oim_size");
+                            $this->debug_message("*** OIM received from $oim_sender, Time: $oim_time, MSGID: $oim_msgid, size: $oim_size");
                             $sMsg = $this->getOIM_message($oim_msgid);
                             if ($sMsg === false) {
-                                $this->debug_message("*** can't get OIM, msgid = $oim_msgid");
+                                $this->debug_message("*** Could not get OIM, msgid = $oim_msgid");
                                 if ($re_login) {
-                                    $this->debug_message("*** can't get OIM via SOAP, and we already re-login again, so ignore this OIM");
+                                    $this->debug_message("*** Could not get OIM via SOAP, and re-login already attempted, ignoring this OIM");
                                     continue;
                                 }
                                 $aTickets = $this->get_passport_ticket();
                                 if (!$aTickets || !is_array($aTickets)) {
                                     // failed to login? ignore it
-                                    $this->debug_message("*** can't re-login, something wrong here, ignore this OIM");
+                                    $this->debug_message("*** Could not re-login, something wrong here, ignoring this OIM");
                                     continue;
                                 }
                                 $re_login = true;
@@ -2503,13 +2058,11 @@ class MSN {
                                 $this->debug_message("*** get new ticket, try it again");
                                 $sMsg = $this->getOIM_message($oim_msgid);
                                 if ($sMsg === false) {
-                                    $this->debug_message("*** can't get OIM via SOAP, and we already re-login again, so ignore this OIM");
+                                    $this->debug_message("*** Could not get OIM via SOAP, and re-login already attempted, ignoring this OIM");
                                     continue;
                                 }
                             }
                             $this->debug_message("*** MSG (Offline) from $oim_sender (network: $network): $sMsg");
-
-                            //$this->ReceivedMessage($oim_sender,$sMsg,$network,true);
                             $this->callHandler('IMin', array('sender' => $oim_sender, 'message' => $sMsg, 'network' => $network, 'offline' => true));
                         }
                     }
@@ -2519,8 +2072,7 @@ class MSN {
                     // randomly, we get UBM, this is the message from other network, like Yahoo!
                     // NS: <<< UBM {email} $network $type {size}
                     @list(/* UBM */, $from_email, $network, $type, $size,) = @explode(' ', $data);
-                    if (is_numeric($size) && $size > 0)
-                    {
+                    if (is_numeric($size) && $size > 0) {
                         $data = $this->ns_readdata($size);
                         $aLines = @explode("\n", $data);
                         $header = true;
@@ -2546,13 +2098,11 @@ class MSN {
                                 $sMsg .= $str;
                             }
                         }
-                        if($ignore)
-                        {
-                            $this->debug_message("*** ingnore from $from_email: $line");
+                        if ($ignore) {
+                            $this->debug_message("*** Ignoring message from $from_email: $line");
                             break;
                         }
                         $this->debug_message("*** MSG from $from_email (network: $network): $sMsg");
-                        //$this->ReceivedMessage($from_email,$sMsg,$network,false);
                         $this->callHandler('IMin', array('sender' => $from_email, 'message' => $sMsg, 'network' => $network, 'offline' => false));
                     }
                     break;
@@ -2563,7 +2113,7 @@ class MSN {
                     @list(/* UBX */, /* email */, /* network */, $size,) = @explode(' ', $data);
                     // we don't need the notification data, so just ignore it
                     if (is_numeric($size) && $size > 0)
-                    $this->ns_readdata($size);
+                        $this->ns_readdata($size);
                     break;
 
                 case 'CHL':
@@ -2576,7 +2126,7 @@ class MSN {
                     $this->ns_writeln("QRY $this->id $this->prod_id 32");
                     $this->ns_writedata($fingerprint);
                     $this->ns_writeln("CHG $this->id NLN $this->clientid");
-                    if($this->PhotoStickerFile!==false)
+                    if ($this->PhotoStickerFile !== false)
                         $this->ns_writeln("CHG $this->id NLN $this->clientid ".rawurlencode($this->MsnObj($this->PhotoStickerFile)));
                     break;
                 case 'CHG':
@@ -2601,41 +2151,10 @@ class MSN {
                         $this->NSLogout();
                         continue;
                     }
-                    if(count($this->MessageQueue))
-                    {
-                        foreach($this->MessageQueue as $User => $Message)
-                        {
-                            //$this->ChildProcess[$ChildPid]
-                            $this->debug_message("*** XFR SB $User");
-                            $pid=pcntl_fork();
-                            if($pid)
-                            {
-                                //Parrent Process
-                                $this->ChildProcess[$pid]=$User;
-                                break;
-                            }
-                            elseif($pid==-1)
-                            {
-                                $this->debug_message("*** Fork Error $User");
-                                break;
-                            }
-                            else
-                            {
-                                //Child Process
-                                $this->debug_message("*** Child Process Start for $User");
-                                unset($Message['XFRSent']);
-                                unset($Message['ReqTime']);
+
+                    $this->debug_message("NS: <<< XFR SB");
+                    $user = array_shift($this->waitingForXFR);
                                 $bSBresult = $this->switchboard_control($ip, $port, $cki_code, $User, $Message);
-                                if ($bSBresult === false)
-                                {
-                                    // error for switchboard
-                                    $this->debug_message("!!! error for sending message to ".$User);
-                                }
-                                die;
-                            }
-                        }
-                        unset($this->MessageQueue[$User]);
-                    }
                     /*
                      $bSBresult = $this->switchboard_control($ip, $port, $cki_code, $aMSNUsers[$nCurrentUser], $sMessage);
                      if ($bSBresult === false) {
@@ -2651,7 +2170,7 @@ class MSN {
                     break;
 
                 case 'RNG':
-                    if($this->PhotoStickerFile!==false)
+                    if ($this->PhotoStickerFile !== false)
                         $this->ns_writeln("CHG $this->id NLN $this->clientid ".rawurlencode($this->MsnObj($this->PhotoStickerFile)));
                     else
                         $this->ns_writeln("CHG $this->id NLN $this->clientid");
@@ -2660,32 +2179,9 @@ class MSN {
                     $this->debug_message("NS: <<< RNG $data");
                     @list(/* RNG */, $sid, $server, /* auth_type */, $ticket, $email, $name, ) = @explode(' ', $data);
                     @list($sb_ip, $sb_port) = @explode(':', $server);
-                    if($this->IsIgnoreMail($email))
-                    {
-                        $this->debug_message("*** Ignore RNG from $email");
-                        break;
-                    }
                     $this->debug_message("*** RING from $email, $sb_ip:$sb_port");
-                    $this->addContact($email,1,$email, true);
-                    $pid=pcntl_fork();
-                    if($pid)
-                    {
-                        //Parrent Process
-                        $this->ChildProcess[$pid]='RNG';
-                        break;
-                    }
-                    elseif($pid==-1)
-                    {
-                        $this->debug_message("*** Fork Error $User");
-                        break;
-                    }
-                    else
-                    {
-                        //Child Process
-                        $this->debug_message("*** Ring Child Process Start for $User");
-                        $this->switchboard_ring($sb_ip, $sb_port, $sid, $ticket,$email);
-                        die;
-                    }
+                    $this->addContact($email, 1, $email, true);
+                    $this->connectToSBSession('Passive', $sb_ip, $sb_port, $email, array('sid' => $sid, 'ticket' => $ticket));
                     break;
                 case 'OUT':
                     // force logout from NS
@@ -2710,8 +2206,428 @@ class MSN {
      * Read and handle incoming command/message from
      * a switchboard session socket
      */
-    private function sbReceive() {
+    private function sbReceive($socket) {
+        $intsocket = (int) $socket;
+        $session = &$this->switchBoardSessions[$intsocket];
 
+        if (feof($socket)) {
+            // Unset session lookup value
+            unset($this->switchBoardSessionLookup[$session['to']]);
+
+            // Unset session itself
+            unset($this->switchBoardSessions[$intsocket]);
+            return;
+        }
+
+        $id = &$session['id'];
+
+        $data = $this->sb_readln($socket);
+        $code = substr($data, 0, 3);
+        switch($code) {
+            case 'IRO':
+                // SB: <<< IRO {id} {rooster} {roostercount} {email} {alias} {clientid}
+                @list(/* IRO */, /* id */, $cur_num, $total, $email, $alias, $clientid) = @explode(' ', $data);
+                $this->debug_message("*** $email joined session");
+                $session['joined'] = true;
+                break;
+            case 'BYE':
+                $this->debug_message("*** Quit for BYE");
+                $this->endSBSession();
+                break;
+            case 'USR':
+                // SB: <<< USR {id} OK {user} {alias}
+                // we don't need the data, just ignore it
+                // request user to join this switchboard
+                // SB: >>> CAL {id} {user}
+                $this->sb_writeln($socket, $id, "CAL $this->id $user");
+                break;
+            case 'CAL':
+                // SB: <<< CAL {id} RINGING {?}
+                // we don't need this, just ignore, and wait for other response
+                $session['id']++;
+                break;
+            case 'JOI':
+                // SB: <<< JOI {user} {alias} {clientid?}
+                // someone join us
+                // we don't need the data, just ignore it
+                // no more user here
+                $session['joined'] = true;
+                break;
+            case 'MSG':
+                // SB: <<< MSG {email} {alias} {len}
+                @list(/* MSG */, $from_email, /* alias */, $len, ) = @explode(' ', $data);
+                $len = trim($len);
+                $data = $this->sb_readdata($socket, $len);
+                $aLines = @explode("\n", $data);
+                $header = true;
+                $ignore = false;
+                $is_p2p = false;
+                $sMsg = '';
+                foreach ($aLines as $line) {
+                    $line = rtrim($line);
+                    if ($header) {
+                        if ($line === '') {
+                            $header = false;
+                            continue;
+                        }
+                        if (strncasecmp($line, 'TypingUser:', 11) == 0) {
+                            // typing notification, just ignore
+                            $ignore = true;
+                            break;
+                        }
+                        if (strncasecmp($line, 'Chunk:', 6) == 0) {
+                            // we don't handle any split message, just ignore
+                            $ignore = true;
+                            break;
+                        }
+                        if (strncasecmp($line, 'Content-Type: application/x-msnmsgrp2p', 38) == 0) {
+                            // p2p message, ignore it, but we need to send acknowledgement for it...
+                            $is_p2p = true;
+                            $p = strstr($data, "\n\n");
+                            $sMsg = '';
+                            if ($p === false) {
+                                $p = strstr($data, "\r\n\r\n");
+                                if ($p !== false)
+                                $sMsg = substr($p, 4);
+                            }
+                            else
+                            $sMsg = substr($p, 2);
+                            break;
+                        }
+                        if (strncasecmp($line, 'Content-Type: application/x-', 28) == 0) {
+                            // ignore all application/x-... message
+                            // for example:
+                            //      application/x-ms-ink        => ink message
+                            $ignore = true;
+                            break;
+                        }
+                        if (strncasecmp($line, 'Content-Type: text/x-', 21) == 0) {
+                            // ignore all text/x-... message
+                            // for example:
+                            //      text/x-msnmsgr-datacast         => nudge, voice clip....
+                            //      text/x-mms-animemoticon         => customized animemotion word
+                            $ignore = true;
+                            break;
+                        }
+                        continue;
+                    }
+                    if ($sMsg !== '')
+                        $sMsg .= "\n";
+                    $sMsg .= $line;
+                }
+                if ($ignore) {
+                    $this->debug_message("*** Ignoring SB data from $from_email: $line");
+                    break;
+                }
+                if ($is_p2p) {
+                    // we will ignore any p2p message after sending acknowledgement
+                    $ignore = true;
+                    $len = strlen($sMsg);
+                    $this->debug_message("*** p2p message from $from_email, size $len");
+                    // header = 48 bytes
+                    // content >= 0 bytes
+                    // footer = 4 bytes
+                    // so it need to >= 52 bytes
+                    /*if ($len < 52) {
+                        $this->debug_message("*** p2p: size error, less than 52!");
+                        break;
+                    }*/
+                    $aDwords = @unpack("V12dword", $sMsg);
+                    if (!is_array($aDwords)) {
+                        $this->debug_message("*** p2p: header unpack error!");
+                        break;
+                    }
+                    $this->debug_message("*** p2p: dump received message:\n".$this->dump_binary($sMsg));
+                    $hdr_SessionID = $aDwords['dword1'];
+                    $hdr_Identifier = $aDwords['dword2'];
+                    $hdr_DataOffsetLow = $aDwords['dword3'];
+                    $hdr_DataOffsetHigh = $aDwords['dword4'];
+                    $hdr_TotalDataSizeLow = $aDwords['dword5'];
+                    $hdr_TotalDataSizeHigh = $aDwords['dword6'];
+                    $hdr_MessageLength = $aDwords['dword7'];
+                    $hdr_Flag = $aDwords['dword8'];
+                    $hdr_AckID = $aDwords['dword9'];
+                    $hdr_AckUID = $aDwords['dword10'];
+                    $hdr_AckSizeLow = $aDwords['dword11'];
+                    $hdr_AckSizeHigh = $aDwords['dword12'];
+                    $this->debug_message("*** p2p: header SessionID = $hdr_SessionID");
+                    $this->debug_message("*** p2p: header Inentifier = $hdr_Identifier");
+                    $this->debug_message("*** p2p: header Data Offset Low = $hdr_DataOffsetLow");
+                    $this->debug_message("*** p2p: header Data Offset High = $hdr_DataOffsetHigh");
+                    $this->debug_message("*** p2p: header Total Data Size Low = $hdr_TotalDataSizeLow");
+                    $this->debug_message("*** p2p: header Total Data Size High = $hdr_TotalDataSizeHigh");
+                    $this->debug_message("*** p2p: header MessageLength = $hdr_MessageLength");
+                    $this->debug_message("*** p2p: header Flag = $hdr_Flag");
+                    $this->debug_message("*** p2p: header AckID = $hdr_AckID");
+                    $this->debug_message("*** p2p: header AckUID = $hdr_AckUID");
+                    $this->debug_message("*** p2p: header AckSize Low = $hdr_AckSizeLow");
+                    $this->debug_message("*** p2p: header AckSize High = $hdr_AckSizeHigh");
+                    if ($hdr_Flag == 2) {
+                        //This is an ACK from SB ignore....
+                        $this->debug_message("*** p2p: //This is an ACK from SB ignore....:\n");
+                        break;
+                    }
+                    $MsgBody = $this->linetoArray(substr($sMsg, 48, -4));
+                    $this->debug_message("*** p2p: body".print_r($MsgBody, true));
+                    if (($MsgBody['EUF-GUID']=='{A4268EEC-FEC5-49E5-95C3-F126696BDBF6}')&&($PictureFilePath=$this->GetPictureFilePath($MsgBody['Context']))) {
+                        while (true) {
+                            if ($this->sb_readln($socket) === false) break;
+                        }
+                        $this->debug_message("*** p2p: Inv hdr:\n".$this->dump_binary(substr($sMsg, 0, 48)));
+                        preg_match('/{([0-9A-F\-]*)}/i', $MsgBody['Via'], $Matches);
+                        $BranchGUID = $Matches[1];
+                        //it's an invite to send a display picture.
+                        $new_id = ~$hdr_Identifier;
+                        $hdr = pack(
+                            "LLLLLLLLLLLL", $hdr_SessionID,
+                            $new_id,
+                            0, 0,
+                            $hdr_TotalDataSizeLow, $hdr_TotalDataSizeHigh,
+                            0,
+                            2,
+                            $hdr_Identifier,
+                            $hdr_AckID,
+                            $hdr_TotalDataSizeLow, $hdr_TotalDataSizeHigh
+                        );
+                        $footer = pack("L", 0);
+                        $message = "MIME-Version: 1.0\r\nContent-Type: application/x-msnmsgrp2p\r\nP2P-Dest: $from_email\r\n\r\n$hdr$footer";
+                        $len = strlen($message);
+                        $this->sb_writeln($socket, $id, "MSG $this->id D $len");
+                        $this->sb_writedata($socket, $message);
+                        $this->debug_message("*** p2p: send display picture acknowledgement for $hdr_SessionID");
+                        $this->debug_message("*** p2p: Invite ACK message:\n".$this->dump_binary($message));
+                        $this->sb_readln($socket); // Read ACK;
+                        $this->debug_message("*** p2p: Invite ACK Hdr:\n".$this->dump_binary($hdr));
+                        $new_id -= 3;
+                        //Send 200 OK message
+                        $MessageContent="SessionID: ".$MsgBody['SessionID']."\r\n\r\n".pack("C", 0);
+                        $MessagePayload=
+                            "MSNSLP/1.0 200 OK\r\n".
+                            "To: <msnmsgr:".$from_email.">\r\n".
+                            "From: <msnmsgr:".$this->user.">\r\n".
+                            "Via: ".$MsgBody['Via']."\r\n".
+                            "CSeq: ".($MsgBody['CSeq']+1)."\r\n".
+                            "Call-ID: ".$MsgBody['Call-ID']."\r\n".
+                            "Max-Forwards: 0\r\n".
+                            "Content-Type: application/x-msnmsgr-sessionreqbody\r\n".
+                            "Content-Length: ".strlen($MessageContent)."\r\n\r\n".
+                        $MessageContent;
+                        $hdr_TotalDataSizeLow=strlen($MessagePayload);
+                        $hdr_TotalDataSizeHigh=0;
+                        $hdr = pack(
+                            "LLLLLLLLLLLL", $hdr_SessionID,
+                            $new_id,
+                            0, 0,
+                            $hdr_TotalDataSizeLow, $hdr_TotalDataSizeHigh,
+                            strlen($MessagePayload),
+                            0,
+                            rand(),
+                            0,
+                            0, 0
+                        );
+
+                        $message =
+                            "MIME-Version: 1.0\r\n".
+                            "Content-Type: application/x-msnmsgrp2p\r\n".
+                            "P2P-Dest: $from_email\r\n\r\n$hdr$MessagePayload$footer";
+                        $this->sb_writeln($socket, $id, "MSG $this->id D ".strlen($message));
+                        $this->sb_writedata($socket, $message);
+                        $this->debug_message("*** p2p: dump 200 ok message:\n".$this->dump_binary($message));
+                        $this->sb_readln($socket); // Read ACK;
+
+                        $this->debug_message("*** p2p: 200 ok:\n".$this->dump_binary($hdr));
+                        // send data preparation message
+                        // send 4 null bytes as data
+                        $hdr_TotalDataSizeLow = 4;
+                        $hdr_TotalDataSizeHigh = 0 ;
+                        $new_id++;
+                        $hdr = pack(
+                            "LLLLLLLLLLLL",
+                            $MsgBody['SessionID'],
+                            $new_id,
+                            0, 0,
+                            $hdr_TotalDataSizeLow, $hdr_TotalDataSizeHigh,
+                            $hdr_TotalDataSizeLow,
+                            0,
+                            rand(),
+                            0,
+                            0, 0
+                        );
+                        $message =
+                            "MIME-Version: 1.0\r\n".
+                            "Content-Type: application/x-msnmsgrp2p\r\n".
+                            "P2P-Dest: $from_email\r\n\r\n$hdr".pack('L', 0)."$footer";
+                        $this->sb_writeln($socket, $id, "MSG $this->id D ".strlen($message));
+                        $this->sb_writedata($socket, $message);
+                        $this->debug_message("*** p2p: dump send Data preparation message:\n".$this->dump_binary($message));
+                        $this->debug_message("*** p2p: Data Prepare Hdr:\n".$this->dump_binary($hdr));
+                        $this->sb_readln($socket); // Read ACK;
+
+                        // send Data Content..
+                        $footer=pack('N',1);
+                        $new_id++;
+                        $FileSize=filesize($PictureFilePath);
+                        if ($hTitle=fopen($PictureFilePath,'rb')) {
+                            $Offset = 0;
+                            //$new_id++;
+                            while (!feof($hTitle)) {
+                                $FileContent = fread($hTitle, 1024);
+                                $FileContentSize = strlen($FileContent);
+                                $hdr = pack(
+                                    "LLLLLLLLLLLL",
+                                    $MsgBody['SessionID'],
+                                    $new_id,
+                                    $Offset, 0,
+                                    $FileSize, 0,
+                                    $FileContentSize,
+                                    0x20,
+                                    rand(),
+                                    0,
+                                    0, 0
+                                );
+                                $message =
+                                    "MIME-Version: 1.0\r\n".
+                                    "Content-Type: application/x-msnmsgrp2p\r\n".
+                                    "P2P-Dest: $from_email\r\n\r\n$hdr$FileContent$footer";
+                                $this->sb_writeln($socket, $id, "MSG $this->id D ".strlen($message));
+                                $this->sb_writedata($socket, $message);
+                                $this->debug_message("*** p2p: dump send Data Content message  $Offset / $FileSize :\n".$this->dump_binary($message));
+                                $this->debug_message("*** p2p: Data Content Hdr:\n".$this->dump_binary($hdr));
+                                //$this->SB_readln($socket);//Read ACK;
+                                $Offset += $FileContentSize;
+                            }
+                        }
+                        //Send Bye
+                        /*
+                        $MessageContent="\r\n".pack("C", 0);
+                        $MessagePayload=
+                            "BYE MSNMSGR:MSNSLP/1.0\r\n".
+                            "To: <msnmsgr:$from_email>\r\n".
+                            "From: <msnmsgr:".$this->user.">\r\n".
+                            "Via: MSNSLP/1.0/TLP ;branch={".$BranchGUID."}\r\n".
+                            "CSeq: 0\r\n".
+                            "Call-ID: ".$MsgBody['Call-ID']."\r\n".
+                            "Max-Forwards: 0\r\n".
+                            "Content-Type: application/x-msnmsgr-sessionclosebody\r\n".
+                            "Content-Length: ".strlen($MessageContent)."\r\n\r\n".$MessageContent;
+                        $footer=pack('N',0);
+                        $hdr_TotalDataSizeLow=strlen($MessagePayload);
+                        $hdr_TotalDataSizeHigh=0;
+                        $new_id++;
+                        $hdr = pack("LLLLLLLLLLLL",
+                        0,
+                        $new_id,
+                        0, 0,
+                        $hdr_TotalDataSizeLow, $hdr_TotalDataSizeHigh,
+                        0,
+                        0,
+                        rand(),
+                        0,
+                        0,0);
+                        $message =
+                                    "MIME-Version: 1.0\r\n".
+                                    "Content-Type: application/x-msnmsgrp2p\r\n".
+                                    "P2P-Dest: $from_email\r\n\r\n$hdr$MessagePayload$footer";
+                        $this->sb_writeln($socket, $id, "MSG $id D ".strlen($message));
+                        $id++;
+                        $this->sb_writedata($socket, $message);
+                        $this->debug_message("*** p2p: dump send BYE message :\n".$this->dump_binary($message));
+                        */
+                        break;
+                    }
+                    //TODO:
+                    //if ($hdr_Flag == 2) {
+                    // just send ACK...
+                    //    $this->sb_writeln($socket, $id, "ACK $id");
+                    //    break;
+                    //}
+                    if ($hdr_SessionID == 4) {
+                        // ignore?
+                        $this->debug_message("*** p2p: ignore flag 4");
+                        break;
+                    }
+                    $finished = false;
+                    if ($hdr_TotalDataSizeHigh == 0) {
+                        // only 32 bites size
+                        if (($hdr_MessageLength + $hdr_DataOffsetLow) == $hdr_TotalDataSizeLow)
+                        $finished = true;
+                    }
+                    else {
+                        // we won't accept any file transfer
+                        // so I think we won't get any message size need to use 64 bits
+                        // 64 bits size here, can't count directly...
+                        $totalsize = base_convert(sprintf("%X%08X", $hdr_TotalDataSizeHigh, $hdr_TotalDataSizeLow), 16, 10);
+                        $dataoffset = base_convert(sprintf("%X%08X", $hdr_DataOffsetHigh, $hdr_DataOffsetLow), 16, 10);
+                        $messagelength = base_convert(sprintf("%X", $hdr_MessageLength), 16, 10);
+                        $now_size = bcadd($dataoffset, $messagelength);
+                        if (bccomp($now_size, $totalsize) >= 0)
+                        $finished = true;
+                    }
+                    if (!$finished) {
+                        // ignore not finished split packet
+                        $this->debug_message("*** p2p: ignore split packet, not finished");
+                        break;
+                    }
+                    //$new_id = ~$hdr_Identifier;
+                    /*
+                     $new_id++;
+                     $hdr = pack("LLLLLLLLLLLL", $hdr_SessionID,
+                     $new_id,
+                     0, 0,
+                     $hdr_TotalDataSizeLow, $hdr_TotalDataSizeHigh,
+                     0,
+                     2,
+                     $hdr_Identifier,
+                     $hdr_AckID,
+                     $hdr_TotalDataSizeLow, $hdr_TotalDataSizeHigh);
+                     $footer = pack("L", 0);
+                     $message = "MIME-Version: 1.0\r\nContent-Type: application/x-msnmsgrp2p\r\nP2P-Dest: $from_email\r\n\r\n$hdr$footer";
+                     $len = strlen($message);
+                     $this->sb_writeln($socket, $id, "MSG $id D $len");
+                     $id++;
+                     $this->sb_writedata($socket, $message);
+                     $this->debug_message("*** p2p: send acknowledgement for $hdr_SessionID");
+                     $this->debug_message("*** p2p: dump sent message:\n".$this->dump_binary($hdr.$footer));
+                     */
+                    break;
+                }
+                $this->debug_message("*** MSG from $from_email: $sMsg");
+                $this->callHandler('IMin', array('sender' => $from_email, 'message' => $sMsg, 'network' => $network, 'offline' => false));
+                break;
+            case '217':
+                $this->debug_message("*** User $user is offline. Trying OIM.");
+                $session['offline'] = true;
+                break;
+            default:
+                if (is_numeric($code)) {
+                    $this->error = "Error code: $code, please check the detail information from: http://msnpiki.msnfanatic.com/index.php/Reference:Error_List";
+                    $this->debug_message("*** SB: $this->error");
+                    $sessionEnd=true;
+                }
+                break;
+        }
+    }
+
+    /**
+    * Called when we want to end a switchboard session
+    * or a switchboard session ends
+    *
+    * @param resource $socket Socket
+    * @param boolean $killsession Whether to delete the session
+    * @return void
+    */
+    private function endSBSession($socket, $killsession = false) {
+        if (!self::socketcheck($socket)) {
+            $this->sb_writeln($socket, $fake = 0, 'OUT');
+        }
+        @fclose($socket);
+
+        // Unset session lookup value
+        $intsocket = (int) $socket;
+        unset($this->switchBoardSessionLookup[$this->switchBoardSessions[$intsocket]['to']]);
+
+        // Unset session itself
+        unset($this->switchBoardSessions[$intsocket]);
     }
 
     /**
@@ -2722,16 +2638,16 @@ class MSN {
      * @return void
      */
     public function receive() {
-        //First, get an array of sockets that have data that is ready to be read
+        // First, get an array of sockets that have data that is ready to be read
         $ready = array();
         $ready = $this->getSockets();
-        $numrdy = stream_select($ready, $w = NULL, $x = NULL,NULL);
+        $numrdy = stream_select($ready, $w = NULL, $x = NULL, NULL);
 
-        //Now that we've waited for something, go through the $ready
-        //array and read appropriately
+        // Now that we've waited for something, go through the $ready
+        // array and read appropriately
 
-        for($i = 0;$i<sizeof($ready);$i++) {
-            if ($ready[$i] == $this->NSfp) {
+        foreach ($ready as $socket) {
+            if ($socket == $this->NSfp) {
                 $this->nsReceive();
             } else {
                 $this->sbReceive($socket);
@@ -2741,21 +2657,29 @@ class MSN {
 
     /**
      * Send a request for a switchboard session
-     * @param String $to Target email for switchboard session
+     *
+     * @param string $to Target email for switchboard session
      */
     private function reqSBSession($to) {
         $this->debug_message("*** Request SB for $to");
         $this->ns_writeln("XFR $this->id SB");
 
         // Add to the queue of those waiting for a switchboard session reponse
-        $this->switchBoardSessions[$to] = array('socket' => NULL, 'id' => 1, 'lastActive' => NULL, 'joined' => false, 'XFRReqTime' => time());
+        $this->switchBoardSessions[$to] = array(
+            'to' => $to,
+            'socket' => NULL,
+            'id' => 1,
+            'joined' => false,
+            'offline' => false,
+            'XFRReqTime' => time()
+        );
         $this->waitingForXFR[] = &$this->switchBoardSessions[$to];
     }
 
     /**
      * Following an XFR or RNG, connect to the switchboard session
      *
-     * @param string $mode Mode, either 'Active' (in the case of XFR) or 'Passive' (in the case or RNG)
+     * @param string $mode Mode, either 'Active' (in the case of XFR) or 'Passive' (in the case of RNG)
      * @param string $ip IP of Switchboard
      * @param integer $port Port of Switchboard
      * @param string $to User on other end of Switchboard
@@ -2763,21 +2687,35 @@ class MSN {
      * @return boolean true if successful
      */
     private function connectToSBSession($mode, $ip, $port, $to, $param) {
-        $this->debug_message("*** SB: try to connect to switchboard server $ip:$port");
+        $this->debug_message("*** SB: Trying to connect to switchboard server $ip:$port");
 
-        $this->switchBoardSessions[$to]['socket'] = @fsockopen($ip, $port, $errno, $errstr, 5);
-        $socket = $this->switchBoardSessions[$to]['socket'];
-        if(!$socket) {
+        $socket = @fsockopen($ip, $port, $errno, $errstr, $this->timeout);
+        if (!$socket) {
             $this->debug_message("*** SB: Can't connect to $ip:$port, error => $errno, $errstr");
             return false;
         }
-        $this->switchBoardSockets[(int) $socket] = $socket;
 
-        stream_set_timeout($socket, $this->SBStreamTimeout);
+        // Store the socket in the lookup array
+        $this->switchBoardSessionLookup[$to] = $socket;
 
-        $id = &$this->switchBoardSessions[$to]['id'];
+        // Store the socket in the sessions array
+        $intsocket = (int) $socket;
+        $this->switchBoardSessions[$to] = array(
+            'to' => $to,
+            'socket' => $socket,
+            'id' => 1,
+            'joined' => false,
+            'offline' => false,
+            'XFRReqTime' => time()
+        );
 
-        if($mode == 'Active') {
+        // Change the index of the session to the socket
+        $this->switchBoardSessions[$intsocket] = $this->switchBoardSessions[$to];
+        unset($this->switchBoardSessions[$to]);
+
+        $id = &$this->switchBoardSessions[$intsocket]['id'];
+
+        if ($mode == 'Active') {
             $cki_code = $param['cki'];
 
             // SB: >>> USR {id} {user} {cki}
@@ -2790,8 +2728,6 @@ class MSN {
             // SB: >>> ANS {id} {user} {ticket} {session_id}
             $this->sb_writeln($socket, $id, "ANS $id $this->user $ticket $sid");
         }
-
-        $this->switchBoardSessions[$to]['lastActive'] = time();
     }
 
     /**
@@ -2802,24 +2738,23 @@ class MSN {
      * @return boolean true on success
      */
     private function sendMessageViaSB($to, $message) {
-        if(socketcheck($this->switchBoardSessions[$to]['socket'])) {
-            $this->reqSBSession($to);
+        $socket = $this->switchBoardSessionLookup[$to];
+        if (self::socketcheck($socket)) {
             return false;
         }
 
-        if(!$this->switchBoardSessions[$to]['joined']) {
+        if (!$this->switchBoardSessions[$to]['joined']) {
             // If our participant has not joined the session yet we can't message them!
             return false;
         }
 
-        $id = &$this->switchBoardSessions[$to]['id'];
-        $socket = $this->switchBoardSessions[$to]['socket'];
+        $intsocket = (int) $socket;
+        $id = &$this->switchBoardSessions[$intsocket]['id'];
 
         $aMessage = $this->getMessage($Message);
         //CheckEmotion...
         $MsnObjDefine=$this->GetMsnObjDefine($aMessage);
-        if($MsnObjDefine !== '')
-        {
+        if ($MsnObjDefine !== '') {
             $SendString="MIME-Version: 1.0\r\nContent-Type: text/x-mms-emoticon\r\n\r\n$MsnObjDefine";
             $len = strlen($SendString);
             // TODO handle failure during write to socket
@@ -2838,9 +2773,11 @@ class MSN {
 
     /**
      * Send offline message
+     *
      * @param string $to Intended recipient
      * @param string $sMessage Message
      * @param string $lockkey Lock key
+     * @return mixed true on success or error data
      */
     private function sendOIM($to, $sMessage, $lockkey) {
         $XML = '<?xml version="1.0" encoding="utf-8"?>
@@ -2949,17 +2886,19 @@ X-OIM-Sequence-Num: 1
     /**
      * Send a message to a user on another network
      *
-     * @param $message Message
-     * @param $to Intended recipient
-     * @param $network Network
+     * @param string $to Intended recipient
+     * @param string $message Message
+     * @param integer $network Network
      * @return void
      */
-    private function sendOtherNetworkMessage($message, $to, $network) {
+    private function sendOtherNetworkMessage($to, $message, $network) {
         $message = $this->getMessage($message, $network);
         $len = strlen($message);
+        // TODO Introduce error checking for message sending
         $this->ns_writeln("UUM $this->id $to $network 1 $len");
         $this->ns_writedata($Message);
         $this->debug_message("*** Sent to $to (network: $network):\n$Message");
+        return true;
     }
 
     /**
@@ -2971,21 +2910,35 @@ X-OIM-Sequence-Num: 1
      * @param string $message Message
      */
     public function sendMessage($to, $message) {
-        if($message != '') {
+        if ($message != '') {
             list($name, $host, $network) = explode('@', $to);
             $network = $network == '' ? 1 : $network;
+            $recipient = $name.$host;
 
-            if ($network === 1 && $this->switchBoardSessions[$to]['socket'] !== NULL) {
-                $recipient = $name . $host;
-                $this->debug_message("*** Attempting to send message to $recipient using existing SB session");
-
-                if ($this->sendMessageViaSB($message, $recipient)) {
-                    $this->debug_message('*** Message sent successfully');
-                    return true;
-                } else {
-                    $this->debug_message('*** Message sending failed, requesting new SB session');
-                    $this->reqSBSession($to);
+            if ($network === 1) {
+                if (!isset($this->switchBoardSessionLookup[$recipient]) && (!isset($this->switchBoardSessions[$recipient])
+                    || time() - $this->switchBoardSessions[$recipient]['XFRReqTime'] > $this->XFRReqTimeout)) {
+                    $this->debug_message("*** No existing SB session or request has timed out");
+                    $this->reqSBSession($recipient);
                     return false;
+                } else {
+                    $socket = $this->switchBoardSessionLookup[$to];
+                    if ($this->switchBoardSessions[(int) $socket]['offline']) {
+                        $this->debug_message("*** Contact ($recipient) offline, sending OIM");
+                        $this->endSBSession($socket);
+                        return $this->sendMessage($recipient.'@Offline', $message);
+                    } else {
+                        $this->debug_message("*** Attempting to send message to $recipient using existing SB session");
+
+                        if ($this->sendMessageViaSB($recipient, $message)) {
+                            $this->debug_message('*** Message sent successfully');
+                            return true;
+                        } else {
+                            $this->debug_message('*** Message sending failed, requesting new SB session');
+                            $this->reqSBSession($to);
+                            return false;
+                        }
+                    }
                 }
             } elseif ($network == 'Offline') {
                 //Send OIM
@@ -2993,7 +2946,7 @@ X-OIM-Sequence-Num: 1
                 $lockkey = '';
                 $re_login = false;
                 for ($i = 0; $i < $this->oim_try; $i++) {
-                    if (($oim_result = $this->sendOIM($to, $message, $lockkey)) === true) break;
+                    if (($oim_result = $this->sendOIM($recipient, $message, $lockkey)) === true) break;
                     if (is_array($oim_result) && $oim_result['challenge'] !== false) {
                         // need challenge lockkey
                         $this->debug_message("*** Need challenge code for ".$oim_result['challenge']);
@@ -3002,14 +2955,14 @@ X-OIM-Sequence-Num: 1
                     }
                     if ($oim_result === false || $oim_result['auth_policy'] !== false) {
                         if ($re_login) {
-                            $this->debug_message("*** Can't send OIM, but we already re-logged-in again, so ignore this OIM");
-                            return true;
+                            $this->debug_message("*** Can't send OIM, but we already re-logged-in again, so returning false");
+                            return false;
                         }
                         $this->debug_message("*** Can't send OIM, maybe ticket expired, trying to login again");
 
                         // Maybe we need to re-login again
                         if (!$this->get_passport_ticket()) {
-                            $this->debug_message("*** Can't re-login, something went wrong here, ignore this OIM");
+                            $this->debug_message("*** Can't re-login, something went wrong here, returning false");
                             return false;
                         }
                         $this->debug_message("*** Getting new ticket and trying again");
@@ -3017,27 +2970,13 @@ X-OIM-Sequence-Num: 1
                     }
                 }
             } else {
-                $this->debug_message("*** Not MSN network or no existing SB session");
-                $this->reqSBSession($to);
-                return false;
+                // Other network
+                return $this->sendOtherNetworkMessage($recipient, $message, $network);
             }
         }
         return true;
     }
 
-    //FIXME Not sure if this is needed?
-    private function endSBSession($socket) {
-        if (feof($socket)) {
-            // lost connection? error? try OIM later
-            @fclose($socket);
-            return false;
-        }
-        $fake = 0;
-        $this->sb_writeln($socket, $fake, "OUT");
-        @fclose($socket);
-        return true;
-    }
-
     /**
      * Sends a ping command
      *
@@ -3069,7 +3008,7 @@ X-OIM-Sequence-Num: 1
      * @return array Array of Switchboard sockets
      */
     public function getSBSockets() {
-        return $this->switchBoardSockets;
+        return $this->switchBoardSessionLookup;
     }
 
     /**
@@ -3078,7 +3017,7 @@ X-OIM-Sequence-Num: 1
      * @return array Array of socket resources
      */
     public function getSockets() {
-        return array_merge($this->NSfp, $this->switchBoardSockets);
+        return array_merge(array($this->NSfp), $this->switchBoardSessionLookup);
     }
 
     /**
@@ -3120,7 +3059,8 @@ X-OIM-Sequence-Num: 1
      * Registers a user handler
      *
      * Handler List
-     * IMIn, Pong, ConnectFailed, Reconnect
+     * IMIn, Pong, ConnectFailed, Reconnect,
+     * AddedToList, RemovedFromList
      *
      * @param string $event Event name
      * @param string $handler User function to call
diff --git a/plugins/Msn/msnmanager.php b/plugins/Msn/msnmanager.php
index 8f436bdff8..5b04995c18 100644
--- a/plugins/Msn/msnmanager.php
+++ b/plugins/Msn/msnmanager.php
@@ -95,11 +95,15 @@ class MsnManager extends ImManager {
     */
     function connect() {
         if (!$this->conn) {
-            $this->conn = new MSN(array('user' => $this->plugin->user,
-                                        'password' => $this->plugin->password,
-                                        'alias' => $this->plugin->nickname,
-                                        'psm' => 'Send me a message to post a notice',
-                                        'debug' => true));
+            $this->conn = new MSN(
+                array(
+                    'user' => $this->plugin->user,
+                    'password' => $this->plugin->password,
+                    'alias' => $this->plugin->nickname,
+                    'psm' => 'Send me a message to post a notice',
+                    'debug' => true
+                )
+            );
             $this->conn->registerHandler("IMIn", array($this, 'handle_msn_message'));
             $this->conn->registerHandler('Pong', array($this, 'update_ping_time'));
             $this->conn->registerHandler('ConnectFailed', array($this, 'handle_connect_failed'));
@@ -124,6 +128,7 @@ class MsnManager extends ImManager {
 
         $this->conn->sendPing();
         $this->lastping = time();
+        $this->pingInterval = 50;
         return true;
     }
 

From 4ee2c12507b046e048ff023b94872cbbe9bde9a4 Mon Sep 17 00:00:00 2001
From: Craig Andrews <candrews@integralblue.com>
Date: Tue, 15 Jun 2010 17:04:15 -0400
Subject: [PATCH 054/655] Use presence of IM plugins to decide if "IM" menu
 option should be shown in Connect

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

diff --git a/lib/connectsettingsaction.php b/lib/connectsettingsaction.php
index b9c14799e0..c3a88be552 100644
--- a/lib/connectsettingsaction.php
+++ b/lib/connectsettingsaction.php
@@ -105,7 +105,7 @@ class ConnectSettingsNav extends Widget
 
             # action => array('prompt', 'title')
             $menu = array();
-            if (common_config('xmpp', 'enabled')) {
+            if (Event::handle('GetImTransports', array(&$transports))) {
                 $menu['imsettings'] =
                   array(_('IM'),
                         _('Updates by instant messenger (IM)'));

From d41298950b9c2d05067d71f6b2ab3315c6330489 Mon Sep 17 00:00:00 2001
From: Luke Fitzgerald <lw.fitzgerald@googlemail.com>
Date: Wed, 16 Jun 2010 00:04:59 +0100
Subject: [PATCH 055/655] Added validate regexp and a few more comments

---
 plugins/Msn/MsnPlugin.php  | 29 ++++++++++++++++++-----------
 plugins/Msn/msnmanager.php |  3 +++
 2 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/plugins/Msn/MsnPlugin.php b/plugins/Msn/MsnPlugin.php
index 8452f15220..f00333d728 100644
--- a/plugins/Msn/MsnPlugin.php
+++ b/plugins/Msn/MsnPlugin.php
@@ -58,7 +58,7 @@ class MsnPlugin extends ImPlugin {
      *
      * @return string Name of service
      */
-    function getDisplayName() {
+    public function getDisplayName() {
         return _m('MSN');
     }
 
@@ -68,7 +68,7 @@ class MsnPlugin extends ImPlugin {
      * @param string $screenname screenname to normalize
      * @return string an equivalent screenname in normalized form
      */
-    function normalize($screenname) {
+    public function normalize($screenname) {
 		$screenname = str_replace(" ","", $screenname);
         return strtolower($screenname);
     }
@@ -78,7 +78,7 @@ class MsnPlugin extends ImPlugin {
      *
      * @return string Screenname
      */
-    function daemon_screenname() {
+    public function daemon_screenname() {
         return $this->user;
     }
 
@@ -86,20 +86,21 @@ class MsnPlugin extends ImPlugin {
      * Validate (ensure the validity of) a screenname
      *
      * @param string $screenname screenname to validate
-     *
      * @return boolean
      */
-    function validate($screenname) {
-        //TODO Correct this for MSN screennames
-        //if(preg_match('/^[a-z]\w{2,15}$/i', $screenname)) {
-        return true;
+    public function validate($screenname) {
+        // RFC 2822 (simplified) regexp
+        if(preg_match('/[a-z0-9!#$%&\'*+\/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&\'*+\/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?/i', $screenname)) {
+            return true;
+        } else {
+            return false;
+        }
     }
 
     /**
      * Load related modules when needed
      *
      * @param string $cls Name of the class to be loaded
-     *
      * @return boolean hook value; true means continue processing, false means stop.
      */
     public function onAutoload($cls) {
@@ -159,7 +160,7 @@ class MsnPlugin extends ImPlugin {
     /**
     * Initialize plugin
     *
-    * @return void
+    * @return boolean
     */
     public function initialize() {
         if (!isset($this->user)) {
@@ -175,7 +176,13 @@ class MsnPlugin extends ImPlugin {
         return true;
     }
 
-    function onPluginVersion(&$versions) {
+    /**
+     * Get plugin information
+     * 
+     * @param array $versions array to insert information into
+     * @return void
+     */
+    public function onPluginVersion(&$versions) {
         $versions[] = array(
             'name' => 'MSN',
             'version' => STATUSNET_VERSION,
diff --git a/plugins/Msn/msnmanager.php b/plugins/Msn/msnmanager.php
index 5b04995c18..66152f0d2a 100644
--- a/plugins/Msn/msnmanager.php
+++ b/plugins/Msn/msnmanager.php
@@ -146,6 +146,7 @@ class MsnManager extends ImManager {
     * Passes it back to the queuing system
     *
     * @param array $data Data
+    * @return void
     */
     private function handle_msn_message($data) {
         $this->plugin->enqueue_incoming_raw($data);
@@ -156,6 +157,7 @@ class MsnManager extends ImManager {
     * Called by callback to log failure during connect
     *
     * @param void $data Not used (there to keep callback happy)
+    * @return void
     */
     function handle_connect_failed($data) {
         common_log(LOG_NOTICE, 'MSN connect failed, retrying');
@@ -165,6 +167,7 @@ class MsnManager extends ImManager {
     * Called by callback to log reconnection
     *
     * @param void $data Not used (there to keep callback happy)
+    * @return void
     */
     function handle_reconnect($data) {
         common_log(LOG_NOTICE, 'MSN reconnecting');

From 2d883eed893f4c7178030c032b518444b43eeabe Mon Sep 17 00:00:00 2001
From: Luke Fitzgerald <lw.fitzgerald@googlemail.com>
Date: Wed, 16 Jun 2010 01:22:52 +0100
Subject: [PATCH 056/655] Reordered methods and changed properties to constants
 as needed

---
 plugins/Msn/extlib/phpmsnclass/msn.class.php | 3086 +++++++++---------
 1 file changed, 1572 insertions(+), 1514 deletions(-)

diff --git a/plugins/Msn/extlib/phpmsnclass/msn.class.php b/plugins/Msn/extlib/phpmsnclass/msn.class.php
index 6146bd1c5a..1e8d7e0f1f 100644
--- a/plugins/Msn/extlib/phpmsnclass/msn.class.php
+++ b/plugins/Msn/extlib/phpmsnclass/msn.class.php
@@ -1,49 +1,66 @@
 <?php
 /*
 
-MSN class ver 2.0 by Tommy Wu, Ricky Su
+phpmsnclass ver 2.0s
+
+Based on MSN class ver 2.0 by Tommy Wu, Ricky Su
 License: GPL
 
-You can find MSN protocol from this site: http://msnpiki.msnfanatic.com/index.php/Main_Page
+Documentation on the MSN protocol can be found at: http://msnpiki.msnfanatic.com/index.php/Main_Page
 
-This class support MSNP15 for send message. The PHP module needed:
+This class uses MSNP15.
 
-MSNP15: curl pcre mhash mcrypt bcmath
+In addition to PHP5, the additional php modules required are:
+curl pcre mhash mcrypt bcmath
 
-Usually, this class will try to use MSNP15 if your system can support it, if your system can't support it,
-it will switch to use MSNP9. But if you use MSNP9, it won't support OIM (Offline Messages).
 */
 
 class MSN {
+    const PROTOCOL = 'MSNP15';
+    const PASSPORT_URL = 'https://login.live.com/RST.srf';
+    const BUILDVER = '8.1.0178';
+    const PROD_KEY = 'PK}_A_0N_K%O?A9S';
+    const PROD_ID = 'PROD0114ES4Z%Q5W';
+    const LOGIN_METHOD = 'SSO';
+    
+    const OIM_SEND_URL = 'https://ows.messenger.msn.com/OimWS/oim.asmx';
+    const OIM_SEND_SOAP = 'http://messenger.live.com/ws/2006/09/oim/Store2';
+    
+    const OIM_MAILDATA_URL = 'https://rsi.hotmail.com/rsi/rsi.asmx';
+    const OIM_MAILDATA_SOAP = 'http://www.hotmail.msn.com/ws/2004/09/oim/rsi/GetMetadata';
+    const OIM_READ_URL = 'https://rsi.hotmail.com/rsi/rsi.asmx';
+    const OIM_READ_SOAP = 'http://www.hotmail.msn.com/ws/2004/09/oim/rsi/GetMessage';
+    const OIM_DEL_URL = 'https://rsi.hotmail.com/rsi/rsi.asmx';
+    const OIM_DEL_SOAP = 'http://www.hotmail.msn.com/ws/2004/09/oim/rsi/DeleteMessages';
+
+    const MEMBERSHIP_URL = 'https://contacts.msn.com/abservice/SharingService.asmx';
+    const MEMBERSHIP_SOAP = 'http://www.msn.com/webservices/AddressBook/FindMembership';
+
+    const ADDMEMBER_URL = 'https://contacts.msn.com/abservice/SharingService.asmx';
+    const ADDMEMBER_SOAP = 'http://www.msn.com/webservices/AddressBook/AddMember';
+
+    const DELMEMBER_URL = 'https://contacts.msn.com/abservice/SharingService.asmx';
+    const DELMEMBER_SOAP = 'http://www.msn.com/webservices/AddressBook/DeleteMember';
+    
     private $debug;
     private $timeout;
-    private $protocol = 'MSNP15';
-    private $passport_url = 'https://login.live.com/RST.srf';
-    private $buildver = '8.1.0178';
-    private $prod_key = 'PK}_A_0N_K%O?A9S';
-    private $prod_id = 'PROD0114ES4Z%Q5W';
-    private $login_method = 'SSO';
-    private $oim_send_url = 'https://ows.messenger.msn.com/OimWS/oim.asmx';
-    private $oim_send_soap = 'http://messenger.live.com/ws/2006/09/oim/Store2';
+    
     private $id;
     private $ticket;
     private $user = '';
     private $password = '';
-    private $NSfp=false;
+    private $NSfp = false;
     private $passport_policy = '';
     private $alias;
     private $psm;
     private $retry_wait;
     private $update_pending;
-    private $PhotoStickerFile=false;
-    private $Emotions=false;
-    private $XFRReqTimeout=60;
-    private $LastPing;
-    private $ping_wait=50;
-    private $SBIdleTimeout=10;
-    private $SBStreamTimeout=2;
-    private $MsnObjArray=array();
-    private $MsnObjMap=array();
+    private $PhotoStickerFile = false;
+    private $Emotions = false;
+    private $XFRReqTimeout = 60;
+    private $SBStreamTimeout = 2;
+    private $MsnObjArray = array();
+    private $MsnObjMap = array();
     private $ABAuthHeader;
     private $ABService;
     private $Contacts;
@@ -51,45 +68,24 @@ class MSN {
     private $server = 'messenger.hotmail.com';
     private $port = 1863;
 
+    private $clientid = '';
+    
+    private $error = '';
 
-    public $clientid = '';
+    private $authed = false;
 
-    public $oim_maildata_url = 'https://rsi.hotmail.com/rsi/rsi.asmx';
-    public $oim_maildata_soap = 'http://www.hotmail.msn.com/ws/2004/09/oim/rsi/GetMetadata';
-    public $oim_read_url = 'https://rsi.hotmail.com/rsi/rsi.asmx';
-    public $oim_read_soap = 'http://www.hotmail.msn.com/ws/2004/09/oim/rsi/GetMessage';
-    public $oim_del_url = 'https://rsi.hotmail.com/rsi/rsi.asmx';
-    public $oim_del_soap = 'http://www.hotmail.msn.com/ws/2004/09/oim/rsi/DeleteMessages';
+    private $oim_try = 3;
 
-    public $membership_url = 'https://contacts.msn.com/abservice/SharingService.asmx';
-    public $membership_soap = 'http://www.msn.com/webservices/AddressBook/FindMembership';
-
-    public $addmember_url = 'https://contacts.msn.com/abservice/SharingService.asmx';
-    public $addmember_soap = 'http://www.msn.com/webservices/AddressBook/AddMember';
-
-    public $addcontact_url = 'https://contacts.msn.com/abservice/abservice.asmx';
-    public $addcontact_soap = 'http://www.msn.com/webservices/AddressBook/ABContactAdd';
-
-    public $delmember_url = 'https://contacts.msn.com/abservice/SharingService.asmx';
-    public $delmember_soap = 'http://www.msn.com/webservices/AddressBook/DeleteMember';
-
-
-    public $error = '';
-
-    public $authed = false;
-
-    public $oim_try = 3;
-
-    public $font_fn = 'Arial';
-    public $font_co = '333333';
-    public $font_ef = '';
+    private $font_fn = 'Arial';
+    private $font_co = '333333';
+    private $font_ef = '';
 
 
     // the message length (include header) is limited (maybe since WLM 8.5 released)
     // for WLM: 1664 bytes
     // for YIM: 518 bytes
-    public $max_msn_message_len = 1664;
-    public $max_yahoo_message_len = 518;
+    const max_msn_message_len = 1664;
+    const max_yahoo_message_len = 518;
 
     // Begin added for StatusNet
 
@@ -141,7 +137,7 @@ class MSN {
     * @param integer $client_id Client id (hexadecimal)
     * @return MSN
     */
-    public function __construct ($Configs=array(), $timeout = 15, $client_id = 0x7000800C) {
+    public function __construct ($Configs = array(), $timeout = 15, $client_id = 0x7000800C) {
         $this->user = $Configs['user'];
         $this->password = $Configs['password'];
         $this->alias = isset($Configs['alias']) ? $Configs['alias'] : '';
@@ -179,789 +175,13 @@ class MSN {
          = 0x7000800C;
          */
         $this->clientid = $client_id;
-        $this->ABService=new SoapClient(realpath(dirname(__FILE__)).'/soap/msnab_sharingservice.wsdl',array('trace' => 1));
-    }
-
-    private function Array2SoapVar($Array, $ReturnSoapVarObj = true, $TypeName = null, $TypeNameSpace = null) {
-        $ArrayString = '';
-        foreach($Array as $Key => $Val) {
-            if ($Key{0} == ':') continue;
-            $Attrib = '';
-            if (is_array($Val[':'])) {
-                foreach ($Val[':'] as $AttribName => $AttribVal)
-                $Attrib .= " $AttribName='$AttribVal'";
-            }
-            if ($Key{0} == '!') {
-                //List Type Define
-                $Key = substr($Key,1);
-                foreach ($Val as $ListKey => $ListVal) {
-                    if ($ListKey{0} == ':') continue;
-                    if (is_array($ListVal)) $ListVal = $this->Array2SoapVar($ListVal, false);
-                    elseif (is_bool($ListVal)) $ListVal = $ListVal ? 'true' : 'false';
-                    $ArrayString .= "<$Key$Attrib>$ListVal</$Key>";
-                }
-                continue;
-            }
-            if (is_array($Val)) $Val = $this->Array2SoapVar($Val, false);
-            elseif (is_bool($Val)) $Val = $Val ? 'true' : 'false';
-            $ArrayString .= "<$Key$Attrib>$Val</$Key>";
-        }
-        if ($ReturnSoapVarObj) return new SoapVar($ArrayString, XSD_ANYXML, $TypeName, $TypeNameSpace);
-        return $ArrayString;
+        $this->ABService = new SoapClient(realpath(dirname(__FILE__)).'/soap/msnab_sharingservice.wsdl', array('trace' => 1));
     }
 
     /**
-    * Get Passport ticket
-    *
-    * @param string $url URL string (Optional)
-    * @return mixed Array of tickets or false on failure
-    */
-    private function get_passport_ticket($url = '') {
-        $user = $this->user;
-        $password = htmlspecialchars($this->password);
-
-        if ($url === '')
-            $passport_url = $this->passport_url;
-        else
-            $passport_url = $url;
-
-        $XML = '<?xml version="1.0" encoding="UTF-8"?>
-<Envelope xmlns="http://schemas.xmlsoap.org/soap/envelope/"
-          xmlns:wsse="http://schemas.xmlsoap.org/ws/2003/06/secext"
-          xmlns:saml="urn:oasis:names:tc:SAML:1.0:assertion"
-          xmlns:wsp="http://schemas.xmlsoap.org/ws/2002/12/policy"
-          xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"
-          xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/03/addressing"
-          xmlns:wssc="http://schemas.xmlsoap.org/ws/2004/04/sc"
-          xmlns:wst="http://schemas.xmlsoap.org/ws/2004/04/trust">
-<Header>
-  <ps:AuthInfo xmlns:ps="http://schemas.microsoft.com/Passport/SoapServices/PPCRL" Id="PPAuthInfo">
-    <ps:HostingApp>{7108E71A-9926-4FCB-BCC9-9A9D3F32E423}</ps:HostingApp>
-    <ps:BinaryVersion>4</ps:BinaryVersion>
-    <ps:UIVersion>1</ps:UIVersion>
-    <ps:Cookies></ps:Cookies>
-    <ps:RequestParams>AQAAAAIAAABsYwQAAAAxMDMz</ps:RequestParams>
-  </ps:AuthInfo>
-  <wsse:Security>
-    <wsse:UsernameToken Id="user">
-      <wsse:Username>'.$user.'</wsse:Username>
-      <wsse:Password>'.$password.'</wsse:Password>
-    </wsse:UsernameToken>
-  </wsse:Security>
-</Header>
-<Body>
-  <ps:RequestMultipleSecurityTokens xmlns:ps="http://schemas.microsoft.com/Passport/SoapServices/PPCRL" Id="RSTS">
-    <wst:RequestSecurityToken Id="RST0">
-      <wst:RequestType>http://schemas.xmlsoap.org/ws/2004/04/security/trust/Issue</wst:RequestType>
-      <wsp:AppliesTo>
-        <wsa:EndpointReference>
-          <wsa:Address>http://Passport.NET/tb</wsa:Address>
-        </wsa:EndpointReference>
-      </wsp:AppliesTo>
-    </wst:RequestSecurityToken>
-    <wst:RequestSecurityToken Id="RST1">
-      <wst:RequestType>http://schemas.xmlsoap.org/ws/2004/04/security/trust/Issue</wst:RequestType>
-      <wsp:AppliesTo>
-        <wsa:EndpointReference>
-          <wsa:Address>messengerclear.live.com</wsa:Address>
-        </wsa:EndpointReference>
-      </wsp:AppliesTo>
-      <wsse:PolicyReference URI="'.$this->passport_policy.'"></wsse:PolicyReference>
-    </wst:RequestSecurityToken>
-    <wst:RequestSecurityToken Id="RST2">
-      <wst:RequestType>http://schemas.xmlsoap.org/ws/2004/04/security/trust/Issue</wst:RequestType>
-      <wsp:AppliesTo>
-        <wsa:EndpointReference>
-          <wsa:Address>messenger.msn.com</wsa:Address>
-        </wsa:EndpointReference>
-      </wsp:AppliesTo>
-      <wsse:PolicyReference URI="?id=507"></wsse:PolicyReference>
-    </wst:RequestSecurityToken>
-    <wst:RequestSecurityToken Id="RST3">
-      <wst:RequestType>http://schemas.xmlsoap.org/ws/2004/04/security/trust/Issue</wst:RequestType>
-      <wsp:AppliesTo>
-        <wsa:EndpointReference>
-          <wsa:Address>contacts.msn.com</wsa:Address>
-        </wsa:EndpointReference>
-      </wsp:AppliesTo>
-      <wsse:PolicyReference URI="MBI"></wsse:PolicyReference>
-    </wst:RequestSecurityToken>
-    <wst:RequestSecurityToken Id="RST4">
-      <wst:RequestType>http://schemas.xmlsoap.org/ws/2004/04/security/trust/Issue</wst:RequestType>
-      <wsp:AppliesTo>
-        <wsa:EndpointReference>
-          <wsa:Address>messengersecure.live.com</wsa:Address>
-        </wsa:EndpointReference>
-      </wsp:AppliesTo>
-      <wsse:PolicyReference URI="MBI_SSL"></wsse:PolicyReference>
-    </wst:RequestSecurityToken>
-    <wst:RequestSecurityToken Id="RST5">
-      <wst:RequestType>http://schemas.xmlsoap.org/ws/2004/04/security/trust/Issue</wst:RequestType>
-      <wsp:AppliesTo>
-        <wsa:EndpointReference>
-          <wsa:Address>spaces.live.com</wsa:Address>
-        </wsa:EndpointReference>
-      </wsp:AppliesTo>
-      <wsse:PolicyReference URI="MBI"></wsse:PolicyReference>
-    </wst:RequestSecurityToken>
-    <wst:RequestSecurityToken Id="RST6">
-      <wst:RequestType>http://schemas.xmlsoap.org/ws/2004/04/security/trust/Issue</wst:RequestType>
-      <wsp:AppliesTo>
-        <wsa:EndpointReference>
-          <wsa:Address>storage.msn.com</wsa:Address>
-        </wsa:EndpointReference>
-      </wsp:AppliesTo>
-      <wsse:PolicyReference URI="MBI"></wsse:PolicyReference>
-    </wst:RequestSecurityToken>
-  </ps:RequestMultipleSecurityTokens>
-</Body>
-</Envelope>';
-
-        //$this->debug_message("*** URL: $passport_url");
-        //$this->debug_message("*** Sending SOAP:\n$XML");
-        $curl = curl_init();
-        curl_setopt($curl, CURLOPT_URL, $passport_url);
-        if ($this->debug) curl_setopt($curl, CURLOPT_HEADER, 1);
-        curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
-        curl_setopt($curl, CURLOPT_FOLLOWLOCATION, 1);
-        curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, 0);
-        curl_setopt($curl, CURLOPT_POST, 1);
-        curl_setopt($curl, CURLOPT_POSTFIELDS, $XML);
-        $data = curl_exec($curl);
-        $http_code = curl_getinfo($curl, CURLINFO_HTTP_CODE);
-        curl_close($curl);
-        //$this->debug_message("*** Get Result:\n$data");
-
-        if ($http_code != 200) {
-            // sometimes, redirect to another URL
-            // MSNP15
-            //<faultcode>psf:Redirect</faultcode>
-            //<psf:redirectUrl>https://msnia.login.live.com/pp450/RST.srf</psf:redirectUrl>
-            //<faultstring>Authentication Failure</faultstring>
-            if (strpos($data, '<faultcode>psf:Redirect</faultcode>') === false) {
-                $this->debug_message("*** Could not get passport ticket! http code = $http_code");
-                return false;
-            }
-            preg_match("#<psf\:redirectUrl>(.*)</psf\:redirectUrl>#", $data, $matches);
-            if (count($matches) == 0) {
-                $this->debug_message('*** Redirected, but could not get redirect URL!');
-                return false;
-            }
-            $redirect_url = $matches[1];
-            if ($redirect_url == $passport_url) {
-                $this->debug_message('*** Redirected, but to same URL!');
-                return false;
-            }
-            $this->debug_message("*** Redirected to $redirect_url");
-            return $this->get_passport_ticket($redirect_url);
-        }
-
-        // sometimes, redirect to another URL, also return 200
-        // MSNP15
-        //<faultcode>psf:Redirect</faultcode>
-        //<psf:redirectUrl>https://msnia.login.live.com/pp450/RST.srf</psf:redirectUrl>
-        //<faultstring>Authentication Failure</faultstring>
-        if (strpos($data, '<faultcode>psf:Redirect</faultcode>') !== false) {
-            preg_match("#<psf\:redirectUrl>(.*)</psf\:redirectUrl>#", $data, $matches);
-            if (count($matches) != 0) {
-                $redirect_url = $matches[1];
-                if ($redirect_url == $passport_url) {
-                    $this->debug_message('*** Redirected, but to same URL!');
-                    return false;
-                }
-                $this->debug_message("*** Redirected to $redirect_url");
-                return $this->get_passport_ticket($redirect_url);
-            }
-        }
-
-        // no Redurect faultcode or URL
-        // we should get the ticket here
-
-        // we need ticket and secret code
-        // RST1: messengerclear.live.com
-        // <wsse:BinarySecurityToken Id="Compact1">t=tick&p=</wsse:BinarySecurityToken>
-        // <wst:BinarySecret>binary secret</wst:BinarySecret>
-        // RST2: messenger.msn.com
-        // <wsse:BinarySecurityToken Id="PPToken2">t=tick</wsse:BinarySecurityToken>
-        // RST3: contacts.msn.com
-        // <wsse:BinarySecurityToken Id="Compact3">t=tick&p=</wsse:BinarySecurityToken>
-        // RST4: messengersecure.live.com
-        // <wsse:BinarySecurityToken Id="Compact4">t=tick&p=</wsse:BinarySecurityToken>
-        // RST5: spaces.live.com
-        // <wsse:BinarySecurityToken Id="Compact5">t=tick&p=</wsse:BinarySecurityToken>
-        // RST6: storage.msn.com
-        // <wsse:BinarySecurityToken Id="Compact6">t=tick&p=</wsse:BinarySecurityToken>
-        preg_match("#".
-            "<wsse\:BinarySecurityToken Id=\"Compact1\">(.*)</wsse\:BinarySecurityToken>(.*)".
-            "<wst\:BinarySecret>(.*)</wst\:BinarySecret>(.*)".
-            "<wsse\:BinarySecurityToken Id=\"PPToken2\">(.*)</wsse\:BinarySecurityToken>(.*)".
-            "<wsse\:BinarySecurityToken Id=\"Compact3\">(.*)</wsse\:BinarySecurityToken>(.*)".
-            "<wsse\:BinarySecurityToken Id=\"Compact4\">(.*)</wsse\:BinarySecurityToken>(.*)".
-            "<wsse\:BinarySecurityToken Id=\"Compact5\">(.*)</wsse\:BinarySecurityToken>(.*)".
-            "<wsse\:BinarySecurityToken Id=\"Compact6\">(.*)</wsse\:BinarySecurityToken>(.*)".
-            "#",
-        $data, $matches);
-
-        // no ticket found!
-        if (count($matches) == 0) {
-            $this->debug_message('*** Could not get passport ticket!');
-            return false;
-        }
-
-        //$this->debug_message(var_export($matches, true));
-        // matches[0]: all data
-        // matches[1]: RST1 (messengerclear.live.com) ticket
-        // matches[2]: ...
-        // matches[3]: RST1 (messengerclear.live.com) binary secret
-        // matches[4]: ...
-        // matches[5]: RST2 (messenger.msn.com) ticket
-        // matches[6]: ...
-        // matches[7]: RST3 (contacts.msn.com) ticket
-        // matches[8]: ...
-        // matches[9]: RST4 (messengersecure.live.com) ticket
-        // matches[10]: ...
-        // matches[11]: RST5 (spaces.live.com) ticket
-        // matches[12]: ...
-        // matches[13]: RST6 (storage.live.com) ticket
-        // matches[14]: ...
-
-        // so
-        // ticket => $matches[1]
-        // secret => $matches[3]
-        // web_ticket => $matches[5]
-        // contact_ticket => $matches[7]
-        // oim_ticket => $matches[9]
-        // space_ticket => $matches[11]
-        // storage_ticket => $matches[13]
-
-        // yes, we get ticket
-        $aTickets = array(
-            'ticket' => html_entity_decode($matches[1]),
-            'secret' => html_entity_decode($matches[3]),
-            'web_ticket' => html_entity_decode($matches[5]),
-            'contact_ticket' => html_entity_decode($matches[7]),
-            'oim_ticket' => html_entity_decode($matches[9]),
-            'space_ticket' => html_entity_decode($matches[11]),
-            'storage_ticket' => html_entity_decode($matches[13])
-        );
-        $this->ticket = $aTickets;
-        //$this->debug_message(var_export($aTickets, true));
-        $ABAuthHeaderArray = array(
-            'ABAuthHeader' => array(
-                ':' => array('xmlns' => 'http://www.msn.com/webservices/AddressBook'),
-                'ManagedGroupRequest' => false,
-                'TicketToken' => htmlspecialchars($this->ticket['contact_ticket']),
-            )
-        );
-        $this->ABAuthHeader = new SoapHeader('http://www.msn.com/webservices/AddressBook', 'ABAuthHeader', $this->Array2SoapVar($ABAuthHeaderArray));
-        return $aTickets;
-    }
-
-    /**
-    * Fetch contact list
-    *
-    * @return boolean true on success
-    */
-    private function UpdateContacts() {
-        $ABApplicationHeaderArray = array(
-            'ABApplicationHeader' => array(
-                ':' => array('xmlns' => 'http://www.msn.com/webservices/AddressBook'),
-                'ApplicationId' => 'CFE80F9D-180F-4399-82AB-413F33A1FA11',
-                'IsMigration' => false,
-                'PartnerScenario' => 'ContactSave'
-             )
-        );
-
-        $ABApplicationHeader = new SoapHeader('http://www.msn.com/webservices/AddressBook', 'ABApplicationHeader', $this->Array2SoapVar($ABApplicationHeaderArray));
-        $ABFindAllArray = array(
-            'ABFindAll' => array(
-                ':' => array('xmlns'=>'http://www.msn.com/webservices/AddressBook'),
-                'abId' => '00000000-0000-0000-0000-000000000000',
-                'abView' => 'Full',
-                'lastChange' => '0001-01-01T00:00:00.0000000-08:00',
-            )
-        );
-        $ABFindAll = new SoapParam($this->Array2SoapVar($ABFindAllArray), 'ABFindAll');
-        $this->ABService->__setSoapHeaders(array($ABApplicationHeader, $this->ABAuthHeader));
-        $this->Contacts = array();
-        try {
-            $this->debug_message('*** Updating Contacts...');
-            $Result = $this->ABService->ABFindAll($ABFindAll);
-            $this->debug_message("*** Result:\n".print_r($Result, true)."\n".$this->ABService->__getLastResponse());
-            foreach($Result->ABFindAllResult->contacts->Contact as $Contact)
-                $this->Contacts[$Contact->contactInfo->passportName] = $Contact;
-        } catch(Exception $e) {
-            $this->debug_message("*** Update Contacts Error \nRequest:".$this->ABService->__getLastRequest()."\nError:".$e->getMessage());
-            return false;
-        }
-        return true;
-    }
-
-    /**
-    * Add contact
-    *
-    * @param string $email
-    * @param integer $network
-    * @param string $display
-    * @param boolean $sendADL
-    * @return boolean true on success
-    */
-    private function addContact($email, $network, $display = '', $sendADL = false) {
-        if ($network != 1) return true;
-        if (isset($this->Contacts[$email])) return true;
-
-        $ABContactAddArray = array(
-            'ABContactAdd' => array(
-                ':' => array('xmlns' => 'http://www.msn.com/webservices/AddressBook'),
-                'abId' => '00000000-0000-0000-0000-000000000000',
-                'contacts' => array(
-                    'Contact' => array(
-                        ':' => array('xmlns' => 'http://www.msn.com/webservices/AddressBook'),
-                        'contactInfo' => array(
-                            'contactType' => 'LivePending',
-                            'passportName' => $email,
-                            'isMessengerUser' => true,
-                            'MessengerMemberInfo' => array(
-                                'DisplayName' => $email
-                            )
-                        )
-                    )
-                ),
-                'options' => array(
-                    'EnableAllowListManagement' => true
-                )
-            )
-        );
-        $ABContactAdd = new SoapParam($this->Array2SoapVar($ABContactAddArray), 'ABContactAdd');
-        try {
-            $this->debug_message("*** Adding Contact $email...");
-            $this->ABService->ABContactAdd($ABContactAdd);
-        } catch(Exception $e) {
-            $this->debug_message("*** Add Contact Error \nRequest:".$this->ABService->__getLastRequest()."\nError:".$e->getMessage());
-            return false;
-        }
-        if ($sendADL && !feof($this->NSfp)) {
-            @list($u_name, $u_domain) = @explode('@', $email);
-            foreach (array('1', '2') as $l) {
-                $str = '<ml l="1"><d n="'.$u_domain.'"><c n="'.$u_name.'" l="'.$l.'" t="'.$network.'" /></d></ml>';
-                $len = strlen($str);
-                // NS: >>> ADL {id} {size}
-                //TODO introduce error checking
-                $this->ns_writeln("ADL $this->id $len");
-                $this->ns_writedata($str);
-            }
-        }
-        $this->UpdateContacts();
-        return true;
-    }
-
-    /**
-    * Remove contact from list
-    *
-    * @param integer $memberID
-    * @param string $email
-    * @param integer $network
-    * @param string $list
-    */
-    function delMemberFromList($memberID, $email, $network, $list) {
-        if ($network != 1 && $network != 32) return true;
-        if ($memberID === false) return true;
-        $user = $email;
-        $ticket = htmlspecialchars($this->ticket['contact_ticket']);
-        if ($network == 1)
-            $XML = '<?xml version="1.0" encoding="utf-8"?>
-<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/"
-               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-               xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-               xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/">
-<soap:Header>
-    <ABApplicationHeader xmlns="http://www.msn.com/webservices/AddressBook">
-        <ApplicationId>996CDE1E-AA53-4477-B943-2BE802EA6166</ApplicationId>
-        <IsMigration>false</IsMigration>
-        <PartnerScenario>ContactMsgrAPI</PartnerScenario>
-    </ABApplicationHeader>
-    <ABAuthHeader xmlns="http://www.msn.com/webservices/AddressBook">
-        <ManagedGroupRequest>false</ManagedGroupRequest>
-        <TicketToken>'.$ticket.'</TicketToken>
-    </ABAuthHeader>
-</soap:Header>
-<soap:Body>
-    <DeleteMember xmlns="http://www.msn.com/webservices/AddressBook">
-        <serviceHandle>
-            <Id>0</Id>
-            <Type>Messenger</Type>
-            <ForeignId></ForeignId>
-        </serviceHandle>
-        <memberships>
-            <Membership>
-                <MemberRole>'.$list.'</MemberRole>
-                <Members>
-                    <Member xsi:type="PassportMember" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-                        <Type>Passport</Type>
-                        <MembershipId>'.$memberID.'</MembershipId>
-                        <State>Accepted</State>
-                    </Member>
-                </Members>
-            </Membership>
-        </memberships>
-    </DeleteMember>
-</soap:Body>
-</soap:Envelope>';
-        else
-            $XML = '<?xml version="1.0" encoding="utf-8"?>
-<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/"
-               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-               xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-               xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/">
-<soap:Header>
-    <ABApplicationHeader xmlns="http://www.msn.com/webservices/AddressBook">
-        <ApplicationId>996CDE1E-AA53-4477-B943-2BE802EA6166</ApplicationId>
-        <IsMigration>false</IsMigration>
-        <PartnerScenario>ContactMsgrAPI</PartnerScenario>
-    </ABApplicationHeader>
-    <ABAuthHeader xmlns="http://www.msn.com/webservices/AddressBook">
-        <ManagedGroupRequest>false</ManagedGroupRequest>
-        <TicketToken>'.$ticket.'</TicketToken>
-    </ABAuthHeader>
-</soap:Header>
-<soap:Body>
-    <DeleteMember xmlns="http://www.msn.com/webservices/AddressBook">
-        <serviceHandle>
-            <Id>0</Id>
-            <Type>Messenger</Type>
-            <ForeignId></ForeignId>
-        </serviceHandle>
-        <memberships>
-            <Membership>
-                <MemberRole>'.$list.'</MemberRole>
-                <Members>
-                    <Member xsi:type="EmailMember" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-                        <Type>Email</Type>
-                        <MembershipId>'.$memberID.'</MembershipId>
-                        <State>Accepted</State>
-                    </Member>
-                </Members>
-            </Membership>
-        </memberships>
-    </DeleteMember>
-</soap:Body>
-</soap:Envelope>';
-
-        $header_array = array(
-            'SOAPAction: '.$this->delmember_soap,
-            'Content-Type: text/xml; charset=utf-8',
-            'User-Agent: MSN Explorer/9.0 (MSN 8.0; TmstmpExt)'
-        );
-
-        //$this->debug_message("*** URL: $this->delmember_url");
-        //$this->debug_message("*** Sending SOAP:\n$XML");
-        $curl = curl_init();
-        curl_setopt($curl, CURLOPT_URL, $this->delmember_url);
-        curl_setopt($curl, CURLOPT_HTTPHEADER, $header_array);
-        curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
-        curl_setopt($curl, CURLOPT_FOLLOWLOCATION, 1);
-        curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, 0);
-        if ($this->debug) curl_setopt($curl, CURLOPT_HEADER, 1);
-        curl_setopt($curl, CURLOPT_POST, 1);
-        curl_setopt($curl, CURLOPT_POSTFIELDS, $XML);
-        $data = curl_exec($curl);
-        $http_code = curl_getinfo($curl, CURLINFO_HTTP_CODE);
-        curl_close($curl);
-        //$this->debug_message("*** Get Result:\n$data");
-
-        if ($http_code != 200) {
-            preg_match('#<faultcode>(.*)</faultcode><faultstring>(.*)</faultstring>#', $data, $matches);
-            if (count($matches) == 0) {
-                $this->debug_message("*** Could not delete member (network: $network) $email ($memberID) from $list list");
-                return false;
-            }
-            $faultcode = trim($matches[1]);
-            $faultstring = trim($matches[2]);
-            if (strcasecmp($faultcode, 'soap:Client') || stripos($faultstring, 'Member does not exist') === false) {
-                $this->debug_message("*** Could not delete member (network: $network) $email ($memberID) from $list list, error code: $faultcode, $faultstring");
-                return false;
-            }
-            $this->debug_message("*** Could not delete member (network: $network) $email ($memberID) from $list list, not present in list");
-            return true;
-        }
-        $this->debug_message("*** Member successfully deleted (network: $network) $email ($memberID) from $list list");
-        return true;
-    }
-
-    /**
-    * Add contact to list
-    *
-    * @param string $email
-    * @param integer $network
-    * @param string $list
-    */
-    function addMemberToList($email, $network, $list) {
-        if ($network != 1 && $network != 32) return true;
-        $ticket = htmlspecialchars($this->ticket['contact_ticket']);
-        $user = $email;
-
-        if ($network == 1)
-            $XML = '<?xml version="1.0" encoding="utf-8"?>
-<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/"
-               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-               xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-               xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/">
-<soap:Header>
-    <ABApplicationHeader xmlns="http://www.msn.com/webservices/AddressBook">
-        <ApplicationId>996CDE1E-AA53-4477-B943-2BE802EA6166</ApplicationId>
-        <IsMigration>false</IsMigration>
-        <PartnerScenario>ContactMsgrAPI</PartnerScenario>
-    </ABApplicationHeader>
-    <ABAuthHeader xmlns="http://www.msn.com/webservices/AddressBook">
-        <ManagedGroupRequest>false</ManagedGroupRequest>
-        <TicketToken>'.$ticket.'</TicketToken>
-    </ABAuthHeader>
-</soap:Header>
-<soap:Body>
-    <AddMember xmlns="http://www.msn.com/webservices/AddressBook">
-        <serviceHandle>
-            <Id>0</Id>
-            <Type>Messenger</Type>
-            <ForeignId></ForeignId>
-        </serviceHandle>
-        <memberships>
-            <Membership>
-                <MemberRole>'.$list.'</MemberRole>
-                <Members>
-                    <Member xsi:type="PassportMember" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-                        <Type>Passport</Type>
-                        <State>Accepted</State>
-                        <PassportName>'.$user.'</PassportName>
-                    </Member>
-                </Members>
-            </Membership>
-        </memberships>
-    </AddMember>
-</soap:Body>
-</soap:Envelope>';
-        else
-            $XML = '<?xml version="1.0" encoding="utf-8"?>
-<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/"
-               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-               xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-               xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/">
-<soap:Header>
-    <ABApplicationHeader xmlns="http://www.msn.com/webservices/AddressBook">
-        <ApplicationId>996CDE1E-AA53-4477-B943-2BE802EA6166</ApplicationId>
-        <IsMigration>false</IsMigration>
-        <PartnerScenario>ContactMsgrAPI</PartnerScenario>
-    </ABApplicationHeader>
-    <ABAuthHeader xmlns="http://www.msn.com/webservices/AddressBook">
-        <ManagedGroupRequest>false</ManagedGroupRequest>
-        <TicketToken>'.$ticket.'</TicketToken>
-    </ABAuthHeader>
-</soap:Header>
-<soap:Body>
-    <AddMember xmlns="http://www.msn.com/webservices/AddressBook">
-        <serviceHandle>
-            <Id>0</Id>
-            <Type>Messenger</Type>
-            <ForeignId></ForeignId>
-        </serviceHandle>
-        <memberships>
-            <Membership>
-                <MemberRole>'.$list.'</MemberRole>
-                <Members>
-                    <Member xsi:type="EmailMember" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-                        <Type>Email</Type>
-                        <State>Accepted</State>
-                        <Email>'.$user.'</Email>
-                        <Annotations>
-                            <Annotation>
-                                <Name>MSN.IM.BuddyType</Name>
-                                <Value>32:YAHOO</Value>
-                            </Annotation>
-                        </Annotations>
-                    </Member>
-                </Members>
-            </Membership>
-        </memberships>
-    </AddMember>
-</soap:Body>
-</soap:Envelope>';
-        $header_array = array(
-            'SOAPAction: '.$this->addmember_soap,
-            'Content-Type: text/xml; charset=utf-8',
-            'User-Agent: MSN Explorer/9.0 (MSN 8.0; TmstmpExt)'
-        );
-
-        //$this->debug_message("*** URL: $this->addmember_url");
-        //$this->debug_message("*** Sending SOAP:\n$XML");
-        $curl = curl_init();
-        curl_setopt($curl, CURLOPT_URL, $this->addmember_url);
-        curl_setopt($curl, CURLOPT_HTTPHEADER, $header_array);
-        curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
-        curl_setopt($curl, CURLOPT_FOLLOWLOCATION, 1);
-        curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, 0);
-        if ($this->debug) curl_setopt($curl, CURLOPT_HEADER, 1);
-        curl_setopt($curl, CURLOPT_POST, 1);
-        curl_setopt($curl, CURLOPT_POSTFIELDS, $XML);
-        $data = curl_exec($curl);
-        $http_code = curl_getinfo($curl, CURLINFO_HTTP_CODE);
-        curl_close($curl);
-        //$this->debug_message("*** Get Result:\n$data");
-
-        if ($http_code != 200) {
-            preg_match('#<faultcode>(.*)</faultcode><faultstring>(.*)</faultstring>#', $data, $matches);
-            if (count($matches) == 0) {
-                $this->debug_message("*** Could not add member (network: $network) $email to $list list");
-                return false;
-            }
-            $faultcode = trim($matches[1]);
-            $faultstring = trim($matches[2]);
-            if (strcasecmp($faultcode, 'soap:Client') || stripos($faultstring, 'Member already exists') === false) {
-                $this->debug_message("*** Could not add member (network: $network) $email to $list list, error code: $faultcode, $faultstring");
-                return false;
-            }
-            $this->debug_message("*** Could not add member (network: $network) $email to $list list, already present");
-            return true;
-        }
-        $this->debug_message("*** Member successfully added (network: $network) $email to $list list");
-        return true;
-    }
-
-    /**
-    * Get membership lists
-    *
-    * @param mixed $returnData Membership list or false on failure
-    */
-    function getMembershipList($returnData = false) {
-        $ticket = htmlspecialchars($this->ticket['contact_ticket']);
-        $XML = '<?xml version="1.0" encoding="utf-8"?>
-<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/"
-               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-               xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-               xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/">
-<soap:Header>
-    <ABApplicationHeader xmlns="http://www.msn.com/webservices/AddressBook">
-        <ApplicationId>996CDE1E-AA53-4477-B943-2BE802EA6166</ApplicationId>
-        <IsMigration>false</IsMigration>
-        <PartnerScenario>Initial</PartnerScenario>
-    </ABApplicationHeader>
-    <ABAuthHeader xmlns="http://www.msn.com/webservices/AddressBook">
-        <ManagedGroupRequest>false</ManagedGroupRequest>
-        <TicketToken>'.$ticket.'</TicketToken>
-    </ABAuthHeader>
-</soap:Header>
-<soap:Body>
-    <FindMembership xmlns="http://www.msn.com/webservices/AddressBook">
-        <serviceFilter>
-            <Types>
-                <ServiceType>Messenger</ServiceType>
-                <ServiceType>Invitation</ServiceType>
-                <ServiceType>SocialNetwork</ServiceType>
-                <ServiceType>Space</ServiceType>
-                <ServiceType>Profile</ServiceType>
-            </Types>
-        </serviceFilter>
-    </FindMembership>
-</soap:Body>
-</soap:Envelope>';
-        $header_array = array(
-            'SOAPAction: '.$this->membership_soap,
-            'Content-Type: text/xml; charset=utf-8',
-            'User-Agent: MSN Explorer/9.0 (MSN 8.0; TmstmpExt)'
-        );
-        //$this->debug_message("*** URL: $this->membership_url");
-        //$this->debug_message("*** Sending SOAP:\n$XML");
-        $curl = curl_init();
-        curl_setopt($curl, CURLOPT_URL, $this->membership_url);
-        curl_setopt($curl, CURLOPT_HTTPHEADER, $header_array);
-        curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
-        curl_setopt($curl, CURLOPT_FOLLOWLOCATION, 1);
-        curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, 0);
-        if ($this->debug) curl_setopt($curl, CURLOPT_HEADER, 1);
-        curl_setopt($curl, CURLOPT_POST, 1);
-        curl_setopt($curl, CURLOPT_POSTFIELDS, $XML);
-        $data = curl_exec($curl);
-        $http_code = curl_getinfo($curl, CURLINFO_HTTP_CODE);
-        curl_close($curl);
-        //$this->debug_message("*** Get Result:\n$data");
-        if ($http_code != 200) return false;
-        $p = $data;
-        $aMemberships = array();
-        while (1) {
-            //$this->debug_message("search p = $p");
-            $start = strpos($p, '<Membership>');
-            $end = strpos($p, '</Membership>');
-            if ($start === false || $end === false || $start > $end) break;
-            //$this->debug_message("start = $start, end = $end");
-            $end += 13;
-            $sMembership = substr($p, $start, $end - $start);
-            $aMemberships[] = $sMembership;
-            //$this->debug_message("add sMembership = $sMembership");
-            $p = substr($p, $end);
-        }
-        //$this->debug_message("aMemberships = ".var_export($aMemberships, true));
-
-        $aContactList = array();
-        foreach ($aMemberships as $sMembership) {
-            //$this->debug_message("sMembership = $sMembership");
-            if (isset($matches)) unset($matches);
-            preg_match('#<MemberRole>(.*)</MemberRole>#', $sMembership, $matches);
-            if (count($matches) == 0) continue;
-            $sMemberRole = $matches[1];
-            //$this->debug_message("MemberRole = $sMemberRole");
-            if ($sMemberRole != 'Allow' && $sMemberRole != 'Reverse' && $sMemberRole != 'Pending') continue;
-            $p = $sMembership;
-            if (isset($aMembers)) unset($aMembers);
-            $aMembers = array();
-            while (1) {
-                //$this->debug_message("search p = $p");
-                $start = strpos($p, '<Member xsi:type="');
-                $end = strpos($p, '</Member>');
-                if ($start === false || $end === false || $start > $end) break;
-                //$this->debug_message("start = $start, end = $end");
-                $end += 9;
-                $sMember = substr($p, $start, $end - $start);
-                $aMembers[] = $sMember;
-                //$this->debug_message("add sMember = $sMember");
-                $p = substr($p, $end);
-            }
-            //$this->debug_message("aMembers = ".var_export($aMembers, true));
-            foreach ($aMembers as $sMember) {
-                //$this->debug_message("sMember = $sMember");
-                if (isset($matches)) unset($matches);
-                preg_match('#<Member xsi\:type="([^"]*)">#', $sMember, $matches);
-                if (count($matches) == 0) continue;
-                $sMemberType = $matches[1];
-                //$this->debug_message("MemberType = $sMemberType");
-                $network = -1;
-                preg_match('#<MembershipId>(.*)</MembershipId>#', $sMember, $matches);
-                if (count($matches) == 0) continue;
-                $id = $matches[1];
-                if ($sMemberType == 'PassportMember') {
-                    if (strpos($sMember, '<Type>Passport</Type>') === false) continue;
-                    $network = 1;
-                    preg_match('#<PassportName>(.*)</PassportName>#', $sMember, $matches);
-                }
-                else if ($sMemberType == 'EmailMember') {
-                    if (strpos($sMember, '<Type>Email</Type>') === false) continue;
-                    // Value is 32: or 32:YAHOO
-                    preg_match('#<Annotation><Name>MSN.IM.BuddyType</Name><Value>(.*):(.*)</Value></Annotation>#', $sMember, $matches);
-                    if (count($matches) == 0) continue;
-                    if ($matches[1] != 32) continue;
-                    $network = 32;
-                    preg_match('#<Email>(.*)</Email>#', $sMember, $matches);
-                }
-                if ($network == -1) continue;
-                if (count($matches) > 0) {
-                    $email = $matches[1];
-                    @list($u_name, $u_domain) = @explode('@', $email);
-                    if ($u_domain == NULL) continue;
-                    $aContactList[$u_domain][$u_name][$network][$sMemberRole] = $id;
-                    $this->debug_message("*** Adding new contact (network: $network, status: $sMemberRole): $u_name@$u_domain ($id)");
-                }
-            }
-        }
-        return $aContactList;
-    }
-
+     * Signon methods
+     */
+    
     /**
      * Connect to the NS server
      *
@@ -992,10 +212,10 @@ class MSN {
         // NS: >> VER {id} MSNP9 CVR0
         // MSNP15
         // NS: >>> VER {id} MSNP15 CVR0
-        $this->ns_writeln("VER $this->id $this->protocol CVR0");
+        $this->ns_writeln("VER $this->id ".PROTOCOL.' CVR0');
 
         $start_tm = time();
-        while (!self::socketcheck($this->NSfp)) {
+        while (!socketcheck($this->NSfp)) {
             $data = $this->ns_readln();
             // no data?
             if ($data === false) {
@@ -1018,7 +238,7 @@ class MSN {
                     // MSNP15
                     // NS: <<< VER {id} MSNP15 CVR0
                     // NS: >>> CVR {id} 0x0409 winnt 5.1 i386 MSMSGS 8.1.0178 msmsgs {user}
-                    $this->ns_writeln("CVR $this->id 0x0409 winnt 5.1 i386 MSMSGS $this->buildver msmsgs $user");
+                    $this->ns_writeln("CVR $this->id 0x0409 winnt 5.1 i386 MSMSGS ".BUILDVER." msmsgs $user");
                     break;
 
                 case 'CVR':
@@ -1028,7 +248,7 @@ class MSN {
                     // MSNP15
                     // NS: <<< CVR {id} {ver_list} {download_serve} ....
                     // NS: >>> USR {id} SSO I {user}
-                    $this->ns_writeln("USR $this->id $this->login_method I $user");
+                    $this->ns_writeln("USR $this->id ".LOGIN_METHOD." I $user");
                     break;
 
                 case 'USR':
@@ -1061,7 +281,7 @@ class MSN {
                     $login_code = $this->generateLoginBLOB($secret, $nonce);
 
                     // NS: >>> USR {id} SSO S {ticket} {login_code}
-                    $this->ns_writeln("USR $this->id $this->login_method S $ticket $login_code");
+                    $this->ns_writeln("USR $this->id ".LOGIN_METHOD." S $ticket $login_code");
                     $this->authed = true;
                     break;
 
@@ -1087,7 +307,7 @@ class MSN {
                     // NS: >> VER {id} MSNP9 CVR0
                     // MSNP15
                     // NS: >>> VER {id} MSNP15 CVR0
-                    $this->ns_writeln("VER $this->id $this->protocol CVR0");
+                    $this->ns_writeln("VER $this->id ".PROTOCOL.' CVR0');
                     break;
 
                 case 'GCF':
@@ -1240,7 +460,7 @@ class MSN {
             $len = strlen($str);
             $this->ns_writeln("UUX $this->id $len");
             $this->ns_writedata($str);
-            if (!self::socketcheck($this->NSfp)) {
+            if (!socketcheck($this->NSfp)) {
                 $this->debug_message('*** Connected, waiting for commands');
                 break;
             } else {
@@ -1253,6 +473,7 @@ class MSN {
     * Called if there is an error during signon
     *
     * @param string $message Error message to log
+    * @return void
     */
     private function signonFailure($message) {
         $this->debug_message($message);
@@ -1260,244 +481,12 @@ class MSN {
         $this->NSRetryWait($this->retry_wait);
     }
 
-    function derive_key($key, $magic) {
-        $hash1 = mhash(MHASH_SHA1, $magic, $key);
-        $hash2 = mhash(MHASH_SHA1, $hash1.$magic, $key);
-        $hash3 = mhash(MHASH_SHA1, $hash1, $key);
-        $hash4 = mhash(MHASH_SHA1, $hash3.$magic, $key);
-        return $hash2.substr($hash4, 0, 4);
-    }
-
-    function generateLoginBLOB($key, $challenge) {
-        $key1 = base64_decode($key);
-        $key2 = $this->derive_key($key1, 'WS-SecureConversationSESSION KEY HASH');
-        $key3 = $this->derive_key($key1, 'WS-SecureConversationSESSION KEY ENCRYPTION');
-
-        // get hash of challenge using key2
-        $hash = mhash(MHASH_SHA1, $challenge, $key2);
-
-        // get 8 bytes random data
-        $iv = substr(base64_encode(rand(1000,9999).rand(1000,9999)), 2, 8);
-
-        $cipher = mcrypt_cbc(MCRYPT_3DES, $key3, $challenge."\x08\x08\x08\x08\x08\x08\x08\x08", MCRYPT_ENCRYPT, $iv);
-
-        $blob = pack('LLLLLLL', 28, 1, 0x6603, 0x8004, 8, 20, 72);
-        $blob .= $iv;
-        $blob .= $hash;
-        $blob .= $cipher;
-
-        return base64_encode($blob);
-    }
-
-    /**
-    * Get OIM mail data
-    *
-    * @return string mail data or false on failure
-    */
-    function getOIM_maildata() {
-        preg_match('#t=(.*)&p=(.*)#', $this->ticket['web_ticket'], $matches);
-        if (count($matches) == 0) {
-            $this->debug_message('*** No web ticket?');
-            return false;
-        }
-        $t = htmlspecialchars($matches[1]);
-        $p = htmlspecialchars($matches[2]);
-        $XML = '<?xml version="1.0" encoding="utf-8"?>
-<soap:Envelope xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-               xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-               xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/">
-<soap:Header>
-  <PassportCookie xmlns="http://www.hotmail.msn.com/ws/2004/09/oim/rsi">
-    <t>'.$t.'</t>
-    <p>'.$p.'</p>
-  </PassportCookie>
-</soap:Header>
-<soap:Body>
-  <GetMetadata xmlns="http://www.hotmail.msn.com/ws/2004/09/oim/rsi" />
-</soap:Body>
-</soap:Envelope>';
-
-        $header_array = array(
-            'SOAPAction: '.$this->oim_maildata_soap,
-            'Content-Type: text/xml; charset=utf-8',
-            'User-Agent: Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1; Messenger '.$this->buildver.')'
-        );
-
-        //$this->debug_message("*** URL: $this->oim_maildata_url");
-        //$this->debug_message("*** Sending SOAP:\n$XML");
-        $curl = curl_init();
-        curl_setopt($curl, CURLOPT_URL, $this->oim_maildata_url);
-        curl_setopt($curl, CURLOPT_HTTPHEADER, $header_array);
-        curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
-        curl_setopt($curl, CURLOPT_FOLLOWLOCATION, 1);
-        curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, 0);
-        if ($this->debug) curl_setopt($curl, CURLOPT_HEADER, 1);
-        curl_setopt($curl, CURLOPT_POST, 1);
-        curl_setopt($curl, CURLOPT_POSTFIELDS, $XML);
-        $data = curl_exec($curl);
-        $http_code = curl_getinfo($curl, CURLINFO_HTTP_CODE);
-        curl_close($curl);
-        //$this->debug_message("*** Get Result:\n$data");
-
-        if ($http_code != 200) {
-            $this->debug_message("*** Could not get OIM maildata! http code: $http_code");
-            return false;
-        }
-
-        // <GetMetadataResponse xmlns="http://www.hotmail.msn.com/ws/2004/09/oim/rsi">See #XML_Data</GetMetadataResponse>
-        preg_match('#<GetMetadataResponse([^>]*)>(.*)</GetMetadataResponse>#', $data, $matches);
-        if (count($matches) == 0) {
-            $this->debug_message('*** Could not get OIM maildata');
-            return false;
-        }
-        return $matches[2];
-    }
-
-    /**
-    * Fetch OIM message with given id
-    *
-    * @param string $msgid
-    * @return string Message or false on failure
-    */
-    function getOIM_message($msgid) {
-        preg_match('#t=(.*)&p=(.*)#', $this->ticket['web_ticket'], $matches);
-        if (count($matches) == 0) {
-            $this->debug_message('*** No web ticket?');
-            return false;
-        }
-        $t = htmlspecialchars($matches[1]);
-        $p = htmlspecialchars($matches[2]);
-
-        // read OIM
-        $XML = '<?xml version="1.0" encoding="utf-8"?>
-<soap:Envelope xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-               xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-               xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/">
-<soap:Header>
-  <PassportCookie xmlns="http://www.hotmail.msn.com/ws/2004/09/oim/rsi">
-    <t>'.$t.'</t>
-    <p>'.$p.'</p>
-  </PassportCookie>
-</soap:Header>
-<soap:Body>
-  <GetMessage xmlns="http://www.hotmail.msn.com/ws/2004/09/oim/rsi">
-    <messageId>'.$msgid.'</messageId>
-    <alsoMarkAsRead>false</alsoMarkAsRead>
-  </GetMessage>
-</soap:Body>
-</soap:Envelope>';
-
-        $header_array = array(
-            'SOAPAction: '.$this->oim_read_soap,
-            'Content-Type: text/xml; charset=utf-8',
-            'User-Agent: Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1; Messenger '.$this->buildver.')'
-        );
-
-        //$this->debug_message("*** URL: $this->oim_read_url");
-        //$this->debug_message("*** Sending SOAP:\n$XML");
-        $curl = curl_init();
-        curl_setopt($curl, CURLOPT_URL, $this->oim_read_url);
-        curl_setopt($curl, CURLOPT_HTTPHEADER, $header_array);
-        curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
-        curl_setopt($curl, CURLOPT_FOLLOWLOCATION, 1);
-        curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, 0);
-        if ($this->debug) curl_setopt($curl, CURLOPT_HEADER, 1);
-        curl_setopt($curl, CURLOPT_POST, 1);
-        curl_setopt($curl, CURLOPT_POSTFIELDS, $XML);
-        $data = curl_exec($curl);
-        $http_code = curl_getinfo($curl, CURLINFO_HTTP_CODE);
-        curl_close($curl);
-        //$this->debug_message("*** Get Result:\n$data");
-
-        if ($http_code != 200) {
-            $this->debug_message("*** Can't get OIM: $msgid, http code = $http_code");
-            return false;
-        }
-
-        // why can't use preg_match('#<GetMessageResult>(.*)</GetMessageResult>#', $data, $matches)?
-        // multi-lines?
-        $start = strpos($data, '<GetMessageResult>');
-        $end = strpos($data, '</GetMessageResult>');
-        if ($start === false || $end === false || $start > $end) {
-            $this->debug_message("*** Can't get OIM: $msgid");
-            return false;
-        }
-        $lines = substr($data, $start + 18, $end - $start);
-        $aLines = @explode("\n", $lines);
-        $header = true;
-        $ignore = false;
-        $sOIM = '';
-        foreach ($aLines as $line) {
-            $line = rtrim($line);
-            if ($header) {
-                if ($line === '') {
-                    $header = false;
-                    continue;
-                }
-                continue;
-            }
-            // stop at empty lines
-            if ($line === '') break;
-            $sOIM .= $line;
-        }
-        $sMsg = base64_decode($sOIM);
-        //$this->debug_message("*** we get OIM ($msgid): $sMsg");
-
-        // delete OIM
-        $XML = '<?xml version="1.0" encoding="utf-8"?>
-<soap:Envelope xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-               xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-               xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/">
-<soap:Header>
-  <PassportCookie xmlns="http://www.hotmail.msn.com/ws/2004/09/oim/rsi">
-    <t>'.$t.'</t>
-    <p>'.$p.'</p>
-  </PassportCookie>
-</soap:Header>
-<soap:Body>
-  <DeleteMessages xmlns="http://www.hotmail.msn.com/ws/2004/09/oim/rsi">
-    <messageIds>
-      <messageId>'.$msgid.'</messageId>
-    </messageIds>
-  </DeleteMessages>
-</soap:Body>
-</soap:Envelope>';
-
-        $header_array = array(
-            'SOAPAction: '.$this->oim_del_soap,
-            'Content-Type: text/xml; charset=utf-8',
-            'User-Agent: Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1; Messenger '.$this->buildver.')'
-        );
-
-        //$this->debug_message("*** URL: $this->oim_del_url");
-        //$this->debug_message("*** Sending SOAP:\n$XML");
-        $curl = curl_init();
-        curl_setopt($curl, CURLOPT_URL, $this->oim_del_url);
-        curl_setopt($curl, CURLOPT_HTTPHEADER, $header_array);
-        curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
-        curl_setopt($curl, CURLOPT_FOLLOWLOCATION, 1);
-        curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, 0);
-        if ($this->debug) curl_setopt($curl, CURLOPT_HEADER, 1);
-        curl_setopt($curl, CURLOPT_POST, 1);
-        curl_setopt($curl, CURLOPT_POSTFIELDS, $XML);
-        $data = curl_exec($curl);
-        $http_code = curl_getinfo($curl, CURLINFO_HTTP_CODE);
-        curl_close($curl);
-        //$this->debug_message("*** Get Result:\n$data");
-
-        if ($http_code != 200)
-            $this->debug_message("*** Could not delete OIM: $msgid, http code = $http_code");
-        else
-            $this->debug_message("*** OIM ($msgid) deleted");
-        return $sMsg;
-    }
-
     /**
     * Log out and close the NS connection
     *
     * @return void
     */
-    private function NSLogout() {
+    private function nsLogout() {
         if (is_resource($this->NSfp) && !feof($this->NSfp)) {
             // logout now
             // NS: >>> OUT
@@ -1509,286 +498,9 @@ class MSN {
     }
 
     /**
-    * Sleep for the given number of seconds
-    *
-    * @param integer $wait Number of seconds to sleep for
-    */
-    private function NSRetryWait($wait) {
-        $this->debug_message("*** Sleeping for $wait seconds before retrying");
-        sleep($wait);
-    }
-
-    /**
-    * Generate challenge response
-    *
-    * @param string $code
-    * @return string challenge response code
-    */
-    function getChallenge($code) {
-        // MSNP15
-        // http://msnpiki.msnfanatic.com/index.php/MSNP11:Challenges
-        // Step 1: The MD5 Hash
-        $md5Hash = md5($code.$this->prod_key);
-        $aMD5 = @explode("\0", chunk_split($md5Hash, 8, "\0"));
-        for ($i = 0; $i < 4; $i++) {
-            $aMD5[$i] = implode('', array_reverse(@explode("\0", chunk_split($aMD5[$i], 2, "\0"))));
-            $aMD5[$i] = (0 + base_convert($aMD5[$i], 16, 10)) & 0x7FFFFFFF;
-        }
-
-        // Step 2: A new string
-        $chl_id = $code.$this->prod_id;
-        $chl_id .= str_repeat('0', 8 - (strlen($chl_id) % 8));
-
-        $aID = @explode("\0", substr(chunk_split($chl_id, 4, "\0"), 0, -1));
-        for ($i = 0; $i < count($aID); $i++) {
-            $aID[$i] = implode('', array_reverse(@explode("\0", chunk_split($aID[$i], 1, "\0"))));
-            $aID[$i] = 0 + base_convert(bin2hex($aID[$i]), 16, 10);
-        }
-
-        // Step 3: The 64 bit key
-        $magic_num = 0x0E79A9C1;
-        $str7f = 0x7FFFFFFF;
-        $high = 0;
-        $low = 0;
-        for ($i = 0; $i < count($aID); $i += 2) {
-            $temp = $aID[$i];
-            $temp = bcmod(bcmul($magic_num, $temp), $str7f);
-            $temp = bcadd($temp, $high);
-            $temp = bcadd(bcmul($aMD5[0], $temp), $aMD5[1]);
-            $temp = bcmod($temp, $str7f);
-
-            $high = $aID[$i+1];
-            $high = bcmod(bcadd($high, $temp), $str7f);
-            $high = bcadd(bcmul($aMD5[2], $high), $aMD5[3]);
-            $high = bcmod($high, $str7f);
-
-            $low = bcadd(bcadd($low, $high), $temp);
-        }
-
-        $high = bcmod(bcadd($high, $aMD5[1]), $str7f);
-        $low = bcmod(bcadd($low, $aMD5[3]), $str7f);
-
-        $new_high = bcmul($high & 0xFF, 0x1000000);
-        $new_high = bcadd($new_high, bcmul($high & 0xFF00, 0x100));
-        $new_high = bcadd($new_high, bcdiv($high & 0xFF0000, 0x100));
-        $new_high = bcadd($new_high, bcdiv($high & 0xFF000000, 0x1000000));
-        // we need integer here
-        $high = 0+$new_high;
-
-        $new_low = bcmul($low & 0xFF, 0x1000000);
-        $new_low = bcadd($new_low, bcmul($low & 0xFF00, 0x100));
-        $new_low = bcadd($new_low, bcdiv($low & 0xFF0000, 0x100));
-        $new_low = bcadd($new_low, bcdiv($low & 0xFF000000, 0x1000000));
-        // we need integer here
-        $low = 0+$new_low;
-
-        // we just use 32 bits integer, don't need the key, just high/low
-        // $key = bcadd(bcmul($high, 0x100000000), $low);
-
-        // Step 4: Using the key
-        $md5Hash = md5($code.$this->prod_key);
-        $aHash = @explode("\0", chunk_split($md5Hash, 8, "\0"));
-
-        $hash = '';
-        $hash .= sprintf("%08x", (0 + base_convert($aHash[0], 16, 10)) ^ $high);
-        $hash .= sprintf("%08x", (0 + base_convert($aHash[1], 16, 10)) ^ $low);
-        $hash .= sprintf("%08x", (0 + base_convert($aHash[2], 16, 10)) ^ $high);
-        $hash .= sprintf("%08x", (0 + base_convert($aHash[3], 16, 10)) ^ $low);
-
-        return $hash;
-    }
-
-    /**
-    * Generate the data to send a message
-    *
-    * @param string $sMessage Message
-    * @param integer $network Network
-    */
-    private function getMessage($sMessage, $network = 1) {
-        $msg_header = "MIME-Version: 1.0\r\nContent-Type: text/plain; charset=UTF-8\r\nX-MMS-IM-Format: FN=$this->font_fn; EF=$this->font_ef; CO=$this->font_co; CS=0; PF=22\r\n\r\n";
-        $msg_header_len = strlen($msg_header);
-        if ($network == 1)
-            $maxlen = $this->max_msn_message_len - $msg_header_len;
-        else
-            $maxlen = $this->max_yahoo_message_len - $msg_header_len;
-        $sMessage = str_replace("\r", '', $sMessage);
-        $msg = substr($sMessage, 0, $maxlen);
-        return $msg_header.$msg;
-    }
-
-    // read data for specified size
-    private function ns_readdata($size) {
-        $data = '';
-        $count = 0;
-        while (!feof($this->NSfp)) {
-            $buf = @fread($this->NSfp, $size - $count);
-            $data .= $buf;
-            $count += strlen($buf);
-            if ($count >= $size) break;
-        }
-        $this->debug_message("NS: data ($size/$count) <<<\n$data");
-        return $data;
-    }
-
-    // read one line
-    private function ns_readln() {
-        $data = @fgets($this->NSfp, 4096);
-        if ($data !== false) {
-            $data = trim($data);
-            $this->debug_message("NS: <<< $data");
-        }
-        return $data;
-    }
-
-    // write to server, append \r\n, also increase id
-    private function ns_writeln($data) {
-        @fwrite($this->NSfp, $data."\r\n");
-        $this->debug_message("NS: >>> $data");
-        $this->id++;
-        return;
-    }
-
-    // write data to server
-    private function ns_writedata($data) {
-        @fwrite($this->NSfp, $data);
-        $this->debug_message("NS: >>> $data");
-        return;
-    }
-
-    // read data for specified size for SB
-    private function sb_readdata($socket, $size) {
-        $data = '';
-        $count = 0;
-        while (!feof($socket)) {
-            $buf = @fread($socket, $size - $count);
-            $data .= $buf;
-            $count += strlen($buf);
-            if ($count >= $size) break;
-        }
-        $this->debug_message("SB: data ($size/$count) <<<\n$data");
-        return $data;
-    }
-
-    // read one line for SB
-    private function sb_readln($socket) {
-        $data = @fgets($socket, 4096);
-        if ($data !== false) {
-            $data = trim($data);
-            $this->debug_message("SB: <<< $data");
-        }
-        return $data;
-    }
-
-    // write to server for SB, append \r\n, also increase id
-    // switchboard server only accept \r\n, it will lost connection if just \n only
-    private function sb_writeln($socket, &$id, $data) {
-        @fwrite($socket, $data."\r\n");
-        $this->debug_message("SB: >>> $data");
-        $id++;
-        return;
-    }
-
-    // write data to server
-    private function sb_writedata($socket, $data) {
-        @fwrite($socket, $data);
-        $this->debug_message("SB: >>> $data");
-        return;
-    }
-
-    // show debug information
-    function debug_message($str) {
-        if (!$this->debug) return;
-        if ($this->debug===STDOUT) echo $str."\n";
-        /*$fname=MSN_CLASS_LOG_DIR.DIRECTORY_SEPARATOR.'msn_'.strftime('%Y%m%d').'.debug';
-        $fp = fopen($fname, 'at');
-        if ($fp) {
-            fputs($fp, strftime('%m/%d/%y %H:%M:%S').' ['.posix_getpid().'] '.$str."\n");
-            fclose($fp);
-            return;
-        }*/
-        // still show debug information, if we can't open log_file
-        echo $str."\n";
-        return;
-    }
-
-    function dump_binary($str) {
-        $buf = '';
-        $a_str = '';
-        $h_str = '';
-        $len = strlen($str);
-        for ($i = 0; $i < $len; $i++) {
-            if (($i % 16) == 0) {
-                if ($buf !== '') {
-                    $buf .= "$h_str $a_str\n";
-                }
-                $buf .= sprintf("%04X:", $i);
-                $a_str = '';
-                $h_str = '';
-            }
-            $ch = ord($str[$i]);
-            if ($ch < 32)
-            $a_str .= '.';
-            else
-            $a_str .= chr($ch);
-            $h_str .= sprintf(" %02X", $ch);
-        }
-        if ($h_str !== '')
-        $buf .= "$h_str $a_str\n";
-        return $buf;
-    }
-
-    /**
-     *
-     * @param $FilePath 圖檔路徑
-     * @param $Type     檔案類型 3=>大頭貼,2表情圖案
-     * @return array
+     * NS and SB command handling methods
      */
-    private function MsnObj($FilePath,$Type=3)
-    {
-        if (!($FileSize=filesize($FilePath))) return '';
-        $Location = md5($FilePath);
-        $Friendly = md5($FilePath.$Type);
-        if (isset($this->MsnObjMap[$Location])) return $this->MsnObjMap[$Location];
-        $sha1d = base64_encode(sha1(file_get_contents($FilePath), true));
-        $sha1c = base64_encode(sha1("Creator".$this->user."Size$FileSize"."Type$Type"."Location$Location"."Friendly".$Friendly."SHA1D$sha1d",true));
-        $this->MsnObjArray[$Location] = $FilePath;
-        $MsnObj = '<msnobj Creator="'.$this->user.'" Size="'.$FileSize.'" Type="'.$Type.'" Location="'.$Location.'" Friendly="'.$Friendly.'" SHA1D="'.$sha1d.'" SHA1C="'.$sha1c.'"/>';
-        $this->MsnObjMap[$Location] = $MsnObj;
-        $this->debug_message("*** p2p: addMsnObj $FilePath::$MsnObj\n");
-        return $MsnObj;
-    }
-
-    private function linetoArray($lines) {
-        $lines = str_replace("\r", '', $lines);
-        $lines = explode("\n", $lines);
-        foreach ($lines as $line) {
-            if (!isset($line{3})) continue;
-            list($Key,$Val) = explode(':', $line);
-            $Data[trim($Key)] = trim($Val);
-        }
-        return $Data;
-    }
-
-    private function GetPictureFilePath($Context) {
-        $MsnObj = base64_decode($Context);
-        if (preg_match('/location="(.*?)"/i', $MsnObj, $Match))
-            $location = $Match[1];
-        $this->debug_message("*** p2p: PictureFile[$location] ::All".print_r($this->MsnObjArray,true)."\n");
-        if ($location && isset($this->MsnObjArray[$location]))
-            return $this->MsnObjArray[$location];
-        return false;
-    }
-
-    private function GetMsnObjDefine($Message) {
-        $DefineString = '';
-        if (is_array($this->Emotions))
-            foreach ($this->Emotions as $Pattern => $FilePath) {
-                if (strpos($Message, $Pattern)!==false)
-                $DefineString .= "$Pattern\t".$this->MsnObj($FilePath, 2)."\t";
-            }
-        return $DefineString;
-    }
-
+    
     /**
      * Read and handle incoming command from NS
      *
@@ -1796,7 +508,7 @@ class MSN {
      */
     private function nsReceive() {
         // Sign in again if not signed in or socket failed
-        if (!is_resource($this->NSfp) || self::socketcheck($this->NSfp)) {
+        if (!is_resource($this->NSfp) || socketcheck($this->NSfp)) {
             $this->callHandler('Reconnect');
             $this->NSRetryWait($this->retry_wait);
             $this->signon();
@@ -2123,7 +835,7 @@ class MSN {
                     $fingerprint = $this->getChallenge($chl_code);
                     // NS: >>> QRY {id} {product_id} 32
                     // NS: >>> fingerprint
-                    $this->ns_writeln("QRY $this->id $this->prod_id 32");
+                    $this->ns_writeln("QRY $this->id ".PROD_ID.' 32');
                     $this->ns_writedata($fingerprint);
                     $this->ns_writeln("CHG $this->id NLN $this->clientid");
                     if ($this->PhotoStickerFile !== false)
@@ -2148,7 +860,7 @@ class MSN {
                     if ($server_type != 'SB') {
                         // maybe exit?
                         // this connection will close after XFR
-                        $this->NSLogout();
+                        $this->nsLogout();
                         continue;
                     }
 
@@ -2187,7 +899,7 @@ class MSN {
                     // force logout from NS
                     // NS: <<< OUT xxx
                     $this->debug_message("*** LOGOUT from NS");
-                    return $this->NsLogout();
+                    return $this->nsLogout();
 
                 default:
                     $code = substr($data,0,3);
@@ -2195,7 +907,7 @@ class MSN {
                         $this->error = "Error code: $code, please check the detail information from: http://msnpiki.msnfanatic.com/index.php/Reference:Error_List";
                         $this->debug_message("*** NS: $this->error");
 
-                        return $this->NsLogout();
+                        return $this->nsLogout();
                     }
                     break;
             }
@@ -2608,28 +1320,6 @@ class MSN {
         }
     }
 
-    /**
-    * Called when we want to end a switchboard session
-    * or a switchboard session ends
-    *
-    * @param resource $socket Socket
-    * @param boolean $killsession Whether to delete the session
-    * @return void
-    */
-    private function endSBSession($socket, $killsession = false) {
-        if (!self::socketcheck($socket)) {
-            $this->sb_writeln($socket, $fake = 0, 'OUT');
-        }
-        @fclose($socket);
-
-        // Unset session lookup value
-        $intsocket = (int) $socket;
-        unset($this->switchBoardSessionLookup[$this->switchBoardSessions[$intsocket]['to']]);
-
-        // Unset session itself
-        unset($this->switchBoardSessions[$intsocket]);
-    }
-
     /**
      * Checks for new data and calls appropriate methods
      *
@@ -2655,6 +1345,10 @@ class MSN {
         }
     }
 
+    /**
+     * Switchboard related methods
+     */
+    
     /**
      * Send a request for a switchboard session
      *
@@ -2729,6 +1423,28 @@ class MSN {
             $this->sb_writeln($socket, $id, "ANS $id $this->user $ticket $sid");
         }
     }
+    
+    /**
+    * Called when we want to end a switchboard session
+    * or a switchboard session ends
+    *
+    * @param resource $socket Socket
+    * @param boolean $killsession Whether to delete the session
+    * @return void
+    */
+    private function endSBSession($socket, $killsession = false) {
+        if (!socketcheck($socket)) {
+            $this->sb_writeln($socket, $fake = 0, 'OUT');
+        }
+        @fclose($socket);
+
+        // Unset session lookup value
+        $intsocket = (int) $socket;
+        unset($this->switchBoardSessionLookup[$this->switchBoardSessions[$intsocket]['to']]);
+
+        // Unset session itself
+        unset($this->switchBoardSessions[$intsocket]);
+    }
 
     /**
      * Send a message via an existing SB session
@@ -2739,7 +1455,7 @@ class MSN {
      */
     private function sendMessageViaSB($to, $message) {
         $socket = $this->switchBoardSessionLookup[$to];
-        if (self::socketcheck($socket)) {
+        if (socketcheck($socket)) {
             return false;
         }
 
@@ -2771,118 +1487,6 @@ class MSN {
         return true;
     }
 
-    /**
-     * Send offline message
-     *
-     * @param string $to Intended recipient
-     * @param string $sMessage Message
-     * @param string $lockkey Lock key
-     * @return mixed true on success or error data
-     */
-    private function sendOIM($to, $sMessage, $lockkey) {
-        $XML = '<?xml version="1.0" encoding="utf-8"?>
-<soap:Envelope xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-               xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-               xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/">
-<soap:Header>
-  <From memberName="'.$this->user.'"
-        friendlyName="=?utf-8?B?'.base64_encode($this->user).'?="
-        xml:lang="zh-TW"
-        proxy="MSNMSGR"
-        xmlns="http://messenger.msn.com/ws/2004/09/oim/"
-        msnpVer="'.$this->protocol.'"
-        buildVer="'.$this->buildver.'"/>
-  <To memberName="'.$to.'" xmlns="http://messenger.msn.com/ws/2004/09/oim/"/>
-  <Ticket passport="'.htmlspecialchars($this->ticket['oim_ticket']).'"
-          appid="'.$this->prod_id.'"
-          lockkey="'.$lockkey.'"
-          xmlns="http://messenger.msn.com/ws/2004/09/oim/"/>
-  <Sequence xmlns="http://schemas.xmlsoap.org/ws/2003/03/rm">
-    <Identifier xmlns="http://schemas.xmlsoap.org/ws/2002/07/utility">http://messenger.msn.com</Identifier>
-    <MessageNumber>1</MessageNumber>
-  </Sequence>
-</soap:Header>
-<soap:Body>
-  <MessageType xmlns="http://messenger.msn.com/ws/2004/09/oim/">text</MessageType>
-  <Content xmlns="http://messenger.msn.com/ws/2004/09/oim/">MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: base64
-X-OIM-Message-Type: OfflineMessage
-X-OIM-Run-Id: {DAB68CFA-38C9-449B-945E-38AFA51E50A7}
-X-OIM-Sequence-Num: 1
-
-'.chunk_split(base64_encode($sMessage)).'
-  </Content>
-</soap:Body>
-</soap:Envelope>';
-
-        $header_array = array(
-            'SOAPAction: '.$this->oim_send_soap,
-            'Content-Type: text/xml',
-            'User-Agent: Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1; Messenger '.$this->buildver.')'
-        );
-
-        $this->debug_message("*** URL: $this->oim_send_url");
-        $this->debug_message("*** Sending SOAP:\n$XML");
-        $curl = curl_init();
-        curl_setopt($curl, CURLOPT_URL, $this->oim_send_url);
-        curl_setopt($curl, CURLOPT_HTTPHEADER, $header_array);
-        curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
-        curl_setopt($curl, CURLOPT_FOLLOWLOCATION, 1);
-        curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, 0);
-        if ($this->debug) curl_setopt($curl, CURLOPT_HEADER, 1);
-        curl_setopt($curl, CURLOPT_POST, 1);
-        curl_setopt($curl, CURLOPT_POSTFIELDS, $XML);
-        $data = curl_exec($curl);
-        $http_code = curl_getinfo($curl, CURLINFO_HTTP_CODE);
-        curl_close($curl);
-        $this->debug_message("*** Get Result:\n$data");
-
-        if ($http_code == 200) {
-            $this->debug_message("*** OIM sent for $to");
-            return true;
-        }
-
-        $challenge = false;
-        $auth_policy = false;
-        // the lockkey is invalid, authenticated fail, we need challenge it again
-        // <LockKeyChallenge xmlns="http://messenger.msn.com/ws/2004/09/oim/">364763969</LockKeyChallenge>
-        preg_match("#<LockKeyChallenge (.*)>(.*)</LockKeyChallenge>#", $data, $matches);
-        if (count($matches) != 0) {
-            // yes, we get new LockKeyChallenge
-            $challenge = $matches[2];
-            $this->debug_message("*** OIM need new challenge ($challenge) for $to");
-        }
-        // auth policy error
-        // <RequiredAuthPolicy xmlns="http://messenger.msn.com/ws/2004/09/oim/">MBI_SSL</RequiredAuthPolicy>
-        preg_match("#<RequiredAuthPolicy (.*)>(.*)</RequiredAuthPolicy>#", $data, $matches);
-        if (count($matches) != 0) {
-            $auth_policy = $matches[2];
-            $this->debug_message("*** OIM need new auth policy ($auth_policy) for $to");
-        }
-        if ($auth_policy === false && $challenge === false) {
-            //<faultcode xmlns:q0="http://messenger.msn.com/ws/2004/09/oim/">q0:AuthenticationFailed</faultcode>
-            preg_match("#<faultcode (.*)>(.*)</faultcode>#", $data, $matches);
-            if (count($matches) == 0) {
-                // no error, we assume the OIM is sent
-                $this->debug_message("*** OIM sent for $to");
-                return true;
-            }
-            $err_code = $matches[2];
-            //<faultstring>Exception of type 'System.Web.Services.Protocols.SoapException' was thrown.</faultstring>
-            preg_match("#<faultstring>(.*)</faultstring>#", $data, $matches);
-            if (count($matches) > 0)
-            $err_msg = $matches[1];
-            else
-            $err_msg = '';
-            $this->debug_message("*** OIM failed for $to");
-            $this->debug_message("*** OIM Error code: $err_code");
-            $this->debug_message("*** OIM Error Message: $err_msg");
-            return false;
-        }
-        return array('challenge' => $challenge, 'auth_policy' => $auth_policy);
-    }
-
     /**
      * Send a message to a user on another network
      *
@@ -2978,37 +1582,1001 @@ X-OIM-Sequence-Num: 1
     }
 
     /**
-     * Sends a ping command
+     * OIM methods
+     */
+    
+    /**
+    * Get OIM mail data
+    *
+    * @return string mail data or false on failure
+    */
+    function getOIM_maildata() {
+        preg_match('#t=(.*)&p=(.*)#', $this->ticket['web_ticket'], $matches);
+        if (count($matches) == 0) {
+            $this->debug_message('*** No web ticket?');
+            return false;
+        }
+        $t = htmlspecialchars($matches[1]);
+        $p = htmlspecialchars($matches[2]);
+        $XML = '<?xml version="1.0" encoding="utf-8"?>
+<soap:Envelope xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+               xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+               xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/">
+<soap:Header>
+  <PassportCookie xmlns="http://www.hotmail.msn.com/ws/2004/09/oim/rsi">
+    <t>'.$t.'</t>
+    <p>'.$p.'</p>
+  </PassportCookie>
+</soap:Header>
+<soap:Body>
+  <GetMetadata xmlns="http://www.hotmail.msn.com/ws/2004/09/oim/rsi" />
+</soap:Body>
+</soap:Envelope>';
+
+        $header_array = array(
+            'SOAPAction: '.OIM_MAILDATA_SOAP,
+            'Content-Type: text/xml; charset=utf-8',
+            'User-Agent: Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1; Messenger '.BUILDVER.')'
+        );
+
+        $this->debug_message('*** URL: '.OIM_MAILDATA_URL);
+        $this->debug_message("*** Sending SOAP:\n$XML");
+        $curl = curl_init();
+        curl_setopt($curl, CURLOPT_URL, OIM_MAILDATA_URL);
+        curl_setopt($curl, CURLOPT_HTTPHEADER, $header_array);
+        curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
+        curl_setopt($curl, CURLOPT_FOLLOWLOCATION, 1);
+        curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, 0);
+        if ($this->debug) curl_setopt($curl, CURLOPT_HEADER, 1);
+        curl_setopt($curl, CURLOPT_POST, 1);
+        curl_setopt($curl, CURLOPT_POSTFIELDS, $XML);
+        $data = curl_exec($curl);
+        $http_code = curl_getinfo($curl, CURLINFO_HTTP_CODE);
+        curl_close($curl);
+        $this->debug_message("*** Get Result:\n$data");
+
+        if ($http_code != 200) {
+            $this->debug_message("*** Could not get OIM maildata! http code: $http_code");
+            return false;
+        }
+
+        // <GetMetadataResponse xmlns="http://www.hotmail.msn.com/ws/2004/09/oim/rsi">See #XML_Data</GetMetadataResponse>
+        preg_match('#<GetMetadataResponse([^>]*)>(.*)</GetMetadataResponse>#', $data, $matches);
+        if (count($matches) == 0) {
+            $this->debug_message('*** Could not get OIM maildata');
+            return false;
+        }
+        return $matches[2];
+    }
+
+    /**
+    * Fetch OIM message with given id
+    *
+    * @param string $msgid
+    * @return string Message or false on failure
+    */
+    function getOIM_message($msgid) {
+        preg_match('#t=(.*)&p=(.*)#', $this->ticket['web_ticket'], $matches);
+        if (count($matches) == 0) {
+            $this->debug_message('*** No web ticket?');
+            return false;
+        }
+        $t = htmlspecialchars($matches[1]);
+        $p = htmlspecialchars($matches[2]);
+
+        // read OIM
+        $XML = '<?xml version="1.0" encoding="utf-8"?>
+<soap:Envelope xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+               xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+               xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/">
+<soap:Header>
+  <PassportCookie xmlns="http://www.hotmail.msn.com/ws/2004/09/oim/rsi">
+    <t>'.$t.'</t>
+    <p>'.$p.'</p>
+  </PassportCookie>
+</soap:Header>
+<soap:Body>
+  <GetMessage xmlns="http://www.hotmail.msn.com/ws/2004/09/oim/rsi">
+    <messageId>'.$msgid.'</messageId>
+    <alsoMarkAsRead>false</alsoMarkAsRead>
+  </GetMessage>
+</soap:Body>
+</soap:Envelope>';
+
+        $header_array = array(
+            'SOAPAction: '.OIM_READ_SOAP,
+            'Content-Type: text/xml; charset=utf-8',
+            'User-Agent: Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1; Messenger '.BUILDVER.')'
+        );
+
+        $this->debug_message('*** URL: '.OIM_READ_URL);
+        $this->debug_message("*** Sending SOAP:\n$XML");
+        $curl = curl_init();
+        curl_setopt($curl, CURLOPT_URL, OIM_READ_URL);
+        curl_setopt($curl, CURLOPT_HTTPHEADER, $header_array);
+        curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
+        curl_setopt($curl, CURLOPT_FOLLOWLOCATION, 1);
+        curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, 0);
+        if ($this->debug) curl_setopt($curl, CURLOPT_HEADER, 1);
+        curl_setopt($curl, CURLOPT_POST, 1);
+        curl_setopt($curl, CURLOPT_POSTFIELDS, $XML);
+        $data = curl_exec($curl);
+        $http_code = curl_getinfo($curl, CURLINFO_HTTP_CODE);
+        curl_close($curl);
+        $this->debug_message("*** Get Result:\n$data");
+
+        if ($http_code != 200) {
+            $this->debug_message("*** Can't get OIM: $msgid, http code = $http_code");
+            return false;
+        }
+
+        // why can't use preg_match('#<GetMessageResult>(.*)</GetMessageResult>#', $data, $matches)?
+        // multi-lines?
+        $start = strpos($data, '<GetMessageResult>');
+        $end = strpos($data, '</GetMessageResult>');
+        if ($start === false || $end === false || $start > $end) {
+            $this->debug_message("*** Can't get OIM: $msgid");
+            return false;
+        }
+        $lines = substr($data, $start + 18, $end - $start);
+        $aLines = @explode("\n", $lines);
+        $header = true;
+        $ignore = false;
+        $sOIM = '';
+        foreach ($aLines as $line) {
+            $line = rtrim($line);
+            if ($header) {
+                if ($line === '') {
+                    $header = false;
+                    continue;
+                }
+                continue;
+            }
+            // stop at empty lines
+            if ($line === '') break;
+            $sOIM .= $line;
+        }
+        $sMsg = base64_decode($sOIM);
+        //$this->debug_message("*** we get OIM ($msgid): $sMsg");
+
+        // delete OIM
+        $XML = '<?xml version="1.0" encoding="utf-8"?>
+<soap:Envelope xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+               xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+               xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/">
+<soap:Header>
+  <PassportCookie xmlns="http://www.hotmail.msn.com/ws/2004/09/oim/rsi">
+    <t>'.$t.'</t>
+    <p>'.$p.'</p>
+  </PassportCookie>
+</soap:Header>
+<soap:Body>
+  <DeleteMessages xmlns="http://www.hotmail.msn.com/ws/2004/09/oim/rsi">
+    <messageIds>
+      <messageId>'.$msgid.'</messageId>
+    </messageIds>
+  </DeleteMessages>
+</soap:Body>
+</soap:Envelope>';
+
+        $header_array = array(
+            'SOAPAction: '.OIM_DEL_SOAP,
+            'Content-Type: text/xml; charset=utf-8',
+            'User-Agent: Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1; Messenger '.BUILDVER.')'
+        );
+
+        $this->debug_message('*** URL: '.OIM_DEL_URL);
+        $this->debug_message("*** Sending SOAP:\n$XML");
+        $curl = curl_init();
+        curl_setopt($curl, CURLOPT_URL, OIM_DEL_URL);
+        curl_setopt($curl, CURLOPT_HTTPHEADER, $header_array);
+        curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
+        curl_setopt($curl, CURLOPT_FOLLOWLOCATION, 1);
+        curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, 0);
+        if ($this->debug) curl_setopt($curl, CURLOPT_HEADER, 1);
+        curl_setopt($curl, CURLOPT_POST, 1);
+        curl_setopt($curl, CURLOPT_POSTFIELDS, $XML);
+        $data = curl_exec($curl);
+        $http_code = curl_getinfo($curl, CURLINFO_HTTP_CODE);
+        curl_close($curl);
+        $this->debug_message("*** Get Result:\n$data");
+
+        if ($http_code != 200)
+            $this->debug_message("*** Could not delete OIM: $msgid, http code = $http_code");
+        else
+            $this->debug_message("*** OIM ($msgid) deleted");
+        return $sMsg;
+    }
+    
+    /**
+     * Send offline message
      *
-     * Should be called about every 50 seconds
+     * @param string $to Intended recipient
+     * @param string $sMessage Message
+     * @param string $lockkey Lock key
+     * @return mixed true on success or error data
+     */
+    private function sendOIM($to, $sMessage, $lockkey) {
+        $XML = '<?xml version="1.0" encoding="utf-8"?>
+<soap:Envelope xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+               xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+               xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/">
+<soap:Header>
+  <From memberName="'.$this->user.'"
+        friendlyName="=?utf-8?B?'.base64_encode($this->user).'?="
+        xml:lang="zh-TW"
+        proxy="MSNMSGR"
+        xmlns="http://messenger.msn.com/ws/2004/09/oim/"
+        msnpVer="'.PROTOCOL.'"
+        buildVer="'.BUILDVER.'"/>
+  <To memberName="'.$to.'" xmlns="http://messenger.msn.com/ws/2004/09/oim/"/>
+  <Ticket passport="'.htmlspecialchars($this->ticket['oim_ticket']).'"
+          appid="'.PROD_ID.'"
+          lockkey="'.$lockkey.'"
+          xmlns="http://messenger.msn.com/ws/2004/09/oim/"/>
+  <Sequence xmlns="http://schemas.xmlsoap.org/ws/2003/03/rm">
+    <Identifier xmlns="http://schemas.xmlsoap.org/ws/2002/07/utility">http://messenger.msn.com</Identifier>
+    <MessageNumber>1</MessageNumber>
+  </Sequence>
+</soap:Header>
+<soap:Body>
+  <MessageType xmlns="http://messenger.msn.com/ws/2004/09/oim/">text</MessageType>
+  <Content xmlns="http://messenger.msn.com/ws/2004/09/oim/">MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: base64
+X-OIM-Message-Type: OfflineMessage
+X-OIM-Run-Id: {DAB68CFA-38C9-449B-945E-38AFA51E50A7}
+X-OIM-Sequence-Num: 1
+
+'.chunk_split(base64_encode($sMessage)).'
+  </Content>
+</soap:Body>
+</soap:Envelope>';
+
+        $header_array = array(
+            'SOAPAction: '.OIM_SEND_SOAP,
+            'Content-Type: text/xml',
+            'User-Agent: Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1; Messenger '.BUILDVER.')'
+        );
+
+        $this->debug_message('*** URL: '.OIM_SEND_URL);
+        $this->debug_message("*** Sending SOAP:\n$XML");
+        $curl = curl_init();
+        curl_setopt($curl, CURLOPT_URL, OIM_SEND_URL);
+        curl_setopt($curl, CURLOPT_HTTPHEADER, $header_array);
+        curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
+        curl_setopt($curl, CURLOPT_FOLLOWLOCATION, 1);
+        curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, 0);
+        if ($this->debug) curl_setopt($curl, CURLOPT_HEADER, 1);
+        curl_setopt($curl, CURLOPT_POST, 1);
+        curl_setopt($curl, CURLOPT_POSTFIELDS, $XML);
+        $data = curl_exec($curl);
+        $http_code = curl_getinfo($curl, CURLINFO_HTTP_CODE);
+        curl_close($curl);
+        $this->debug_message("*** Get Result:\n$data");
+
+        if ($http_code == 200) {
+            $this->debug_message("*** OIM sent for $to");
+            return true;
+        }
+
+        $challenge = false;
+        $auth_policy = false;
+        // the lockkey is invalid, authenticated fail, we need challenge it again
+        // <LockKeyChallenge xmlns="http://messenger.msn.com/ws/2004/09/oim/">364763969</LockKeyChallenge>
+        preg_match("#<LockKeyChallenge (.*)>(.*)</LockKeyChallenge>#", $data, $matches);
+        if (count($matches) != 0) {
+            // yes, we get new LockKeyChallenge
+            $challenge = $matches[2];
+            $this->debug_message("*** OIM need new challenge ($challenge) for $to");
+        }
+        // auth policy error
+        // <RequiredAuthPolicy xmlns="http://messenger.msn.com/ws/2004/09/oim/">MBI_SSL</RequiredAuthPolicy>
+        preg_match("#<RequiredAuthPolicy (.*)>(.*)</RequiredAuthPolicy>#", $data, $matches);
+        if (count($matches) != 0) {
+            $auth_policy = $matches[2];
+            $this->debug_message("*** OIM need new auth policy ($auth_policy) for $to");
+        }
+        if ($auth_policy === false && $challenge === false) {
+            //<faultcode xmlns:q0="http://messenger.msn.com/ws/2004/09/oim/">q0:AuthenticationFailed</faultcode>
+            preg_match("#<faultcode (.*)>(.*)</faultcode>#", $data, $matches);
+            if (count($matches) == 0) {
+                // no error, we assume the OIM is sent
+                $this->debug_message("*** OIM sent for $to");
+                return true;
+            }
+            $err_code = $matches[2];
+            //<faultstring>Exception of type 'System.Web.Services.Protocols.SoapException' was thrown.</faultstring>
+            preg_match("#<faultstring>(.*)</faultstring>#", $data, $matches);
+            if (count($matches) > 0)
+            $err_msg = $matches[1];
+            else
+            $err_msg = '';
+            $this->debug_message("*** OIM failed for $to");
+            $this->debug_message("*** OIM Error code: $err_code");
+            $this->debug_message("*** OIM Error Message: $err_msg");
+            return false;
+        }
+        return array('challenge' => $challenge, 'auth_policy' => $auth_policy);
+    }
+    
+    /**
+     * Contact / Membership list methods
+     */
+    
+    /**
+    * Fetch contact list
+    *
+    * @return boolean true on success
+    */
+    private function UpdateContacts() {
+        $ABApplicationHeaderArray = array(
+            'ABApplicationHeader' => array(
+                ':' => array('xmlns' => 'http://www.msn.com/webservices/AddressBook'),
+                'ApplicationId' => 'CFE80F9D-180F-4399-82AB-413F33A1FA11',
+                'IsMigration' => false,
+                'PartnerScenario' => 'ContactSave'
+             )
+        );
+
+        $ABApplicationHeader = new SoapHeader('http://www.msn.com/webservices/AddressBook', 'ABApplicationHeader', $this->Array2SoapVar($ABApplicationHeaderArray));
+        $ABFindAllArray = array(
+            'ABFindAll' => array(
+                ':' => array('xmlns'=>'http://www.msn.com/webservices/AddressBook'),
+                'abId' => '00000000-0000-0000-0000-000000000000',
+                'abView' => 'Full',
+                'lastChange' => '0001-01-01T00:00:00.0000000-08:00',
+            )
+        );
+        $ABFindAll = new SoapParam($this->Array2SoapVar($ABFindAllArray), 'ABFindAll');
+        $this->ABService->__setSoapHeaders(array($ABApplicationHeader, $this->ABAuthHeader));
+        $this->Contacts = array();
+        try {
+            $this->debug_message('*** Updating Contacts...');
+            $Result = $this->ABService->ABFindAll($ABFindAll);
+            $this->debug_message("*** Result:\n".print_r($Result, true)."\n".$this->ABService->__getLastResponse());
+            foreach($Result->ABFindAllResult->contacts->Contact as $Contact)
+                $this->Contacts[$Contact->contactInfo->passportName] = $Contact;
+        } catch(Exception $e) {
+            $this->debug_message("*** Update Contacts Error \nRequest:".$this->ABService->__getLastRequest()."\nError:".$e->getMessage());
+            return false;
+        }
+        return true;
+    }
+
+    /**
+    * Add contact
+    *
+    * @param string $email
+    * @param integer $network
+    * @param string $display
+    * @param boolean $sendADL
+    * @return boolean true on success
+    */
+    private function addContact($email, $network, $display = '', $sendADL = false) {
+        if ($network != 1) return true;
+        if (isset($this->Contacts[$email])) return true;
+
+        $ABContactAddArray = array(
+            'ABContactAdd' => array(
+                ':' => array('xmlns' => 'http://www.msn.com/webservices/AddressBook'),
+                'abId' => '00000000-0000-0000-0000-000000000000',
+                'contacts' => array(
+                    'Contact' => array(
+                        ':' => array('xmlns' => 'http://www.msn.com/webservices/AddressBook'),
+                        'contactInfo' => array(
+                            'contactType' => 'LivePending',
+                            'passportName' => $email,
+                            'isMessengerUser' => true,
+                            'MessengerMemberInfo' => array(
+                                'DisplayName' => $email
+                            )
+                        )
+                    )
+                ),
+                'options' => array(
+                    'EnableAllowListManagement' => true
+                )
+            )
+        );
+        $ABContactAdd = new SoapParam($this->Array2SoapVar($ABContactAddArray), 'ABContactAdd');
+        try {
+            $this->debug_message("*** Adding Contact $email...");
+            $this->ABService->ABContactAdd($ABContactAdd);
+        } catch(Exception $e) {
+            $this->debug_message("*** Add Contact Error \nRequest:".$this->ABService->__getLastRequest()."\nError:".$e->getMessage());
+            return false;
+        }
+        if ($sendADL && !feof($this->NSfp)) {
+            @list($u_name, $u_domain) = @explode('@', $email);
+            foreach (array('1', '2') as $l) {
+                $str = '<ml l="1"><d n="'.$u_domain.'"><c n="'.$u_name.'" l="'.$l.'" t="'.$network.'" /></d></ml>';
+                $len = strlen($str);
+                // NS: >>> ADL {id} {size}
+                //TODO introduce error checking
+                $this->ns_writeln("ADL $this->id $len");
+                $this->ns_writedata($str);
+            }
+        }
+        $this->UpdateContacts();
+        return true;
+    }
+
+    /**
+    * Remove contact from list
+    *
+    * @param integer $memberID
+    * @param string $email
+    * @param integer $network
+    * @param string $list
+    */
+    function delMemberFromList($memberID, $email, $network, $list) {
+        if ($network != 1 && $network != 32) return true;
+        if ($memberID === false) return true;
+        $user = $email;
+        $ticket = htmlspecialchars($this->ticket['contact_ticket']);
+        if ($network == 1)
+            $XML = '<?xml version="1.0" encoding="utf-8"?>
+<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/"
+               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+               xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+               xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/">
+<soap:Header>
+    <ABApplicationHeader xmlns="http://www.msn.com/webservices/AddressBook">
+        <ApplicationId>996CDE1E-AA53-4477-B943-2BE802EA6166</ApplicationId>
+        <IsMigration>false</IsMigration>
+        <PartnerScenario>ContactMsgrAPI</PartnerScenario>
+    </ABApplicationHeader>
+    <ABAuthHeader xmlns="http://www.msn.com/webservices/AddressBook">
+        <ManagedGroupRequest>false</ManagedGroupRequest>
+        <TicketToken>'.$ticket.'</TicketToken>
+    </ABAuthHeader>
+</soap:Header>
+<soap:Body>
+    <DeleteMember xmlns="http://www.msn.com/webservices/AddressBook">
+        <serviceHandle>
+            <Id>0</Id>
+            <Type>Messenger</Type>
+            <ForeignId></ForeignId>
+        </serviceHandle>
+        <memberships>
+            <Membership>
+                <MemberRole>'.$list.'</MemberRole>
+                <Members>
+                    <Member xsi:type="PassportMember" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+                        <Type>Passport</Type>
+                        <MembershipId>'.$memberID.'</MembershipId>
+                        <State>Accepted</State>
+                    </Member>
+                </Members>
+            </Membership>
+        </memberships>
+    </DeleteMember>
+</soap:Body>
+</soap:Envelope>';
+        else
+            $XML = '<?xml version="1.0" encoding="utf-8"?>
+<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/"
+               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+               xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+               xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/">
+<soap:Header>
+    <ABApplicationHeader xmlns="http://www.msn.com/webservices/AddressBook">
+        <ApplicationId>996CDE1E-AA53-4477-B943-2BE802EA6166</ApplicationId>
+        <IsMigration>false</IsMigration>
+        <PartnerScenario>ContactMsgrAPI</PartnerScenario>
+    </ABApplicationHeader>
+    <ABAuthHeader xmlns="http://www.msn.com/webservices/AddressBook">
+        <ManagedGroupRequest>false</ManagedGroupRequest>
+        <TicketToken>'.$ticket.'</TicketToken>
+    </ABAuthHeader>
+</soap:Header>
+<soap:Body>
+    <DeleteMember xmlns="http://www.msn.com/webservices/AddressBook">
+        <serviceHandle>
+            <Id>0</Id>
+            <Type>Messenger</Type>
+            <ForeignId></ForeignId>
+        </serviceHandle>
+        <memberships>
+            <Membership>
+                <MemberRole>'.$list.'</MemberRole>
+                <Members>
+                    <Member xsi:type="EmailMember" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+                        <Type>Email</Type>
+                        <MembershipId>'.$memberID.'</MembershipId>
+                        <State>Accepted</State>
+                    </Member>
+                </Members>
+            </Membership>
+        </memberships>
+    </DeleteMember>
+</soap:Body>
+</soap:Envelope>';
+
+        $header_array = array(
+            'SOAPAction: '.DELMEMBER_SOAP,
+            'Content-Type: text/xml; charset=utf-8',
+            'User-Agent: MSN Explorer/9.0 (MSN 8.0; TmstmpExt)'
+        );
+
+        $this->debug_message('*** URL: '.DELMEMBER_URL);
+        $this->debug_message("*** Sending SOAP:\n$XML");
+        $curl = curl_init();
+        curl_setopt($curl, CURLOPT_URL, DELMEMBER_URL);
+        curl_setopt($curl, CURLOPT_HTTPHEADER, $header_array);
+        curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
+        curl_setopt($curl, CURLOPT_FOLLOWLOCATION, 1);
+        curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, 0);
+        if ($this->debug) curl_setopt($curl, CURLOPT_HEADER, 1);
+        curl_setopt($curl, CURLOPT_POST, 1);
+        curl_setopt($curl, CURLOPT_POSTFIELDS, $XML);
+        $data = curl_exec($curl);
+        $http_code = curl_getinfo($curl, CURLINFO_HTTP_CODE);
+        curl_close($curl);
+        $this->debug_message("*** Get Result:\n$data");
+
+        if ($http_code != 200) {
+            preg_match('#<faultcode>(.*)</faultcode><faultstring>(.*)</faultstring>#', $data, $matches);
+            if (count($matches) == 0) {
+                $this->debug_message("*** Could not delete member (network: $network) $email ($memberID) from $list list");
+                return false;
+            }
+            $faultcode = trim($matches[1]);
+            $faultstring = trim($matches[2]);
+            if (strcasecmp($faultcode, 'soap:Client') || stripos($faultstring, 'Member does not exist') === false) {
+                $this->debug_message("*** Could not delete member (network: $network) $email ($memberID) from $list list, error code: $faultcode, $faultstring");
+                return false;
+            }
+            $this->debug_message("*** Could not delete member (network: $network) $email ($memberID) from $list list, not present in list");
+            return true;
+        }
+        $this->debug_message("*** Member successfully deleted (network: $network) $email ($memberID) from $list list");
+        return true;
+    }
+
+    /**
+    * Add contact to list
+    *
+    * @param string $email
+    * @param integer $network
+    * @param string $list
+    */
+    function addMemberToList($email, $network, $list) {
+        if ($network != 1 && $network != 32) return true;
+        $ticket = htmlspecialchars($this->ticket['contact_ticket']);
+        $user = $email;
+
+        if ($network == 1)
+            $XML = '<?xml version="1.0" encoding="utf-8"?>
+<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/"
+               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+               xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+               xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/">
+<soap:Header>
+    <ABApplicationHeader xmlns="http://www.msn.com/webservices/AddressBook">
+        <ApplicationId>996CDE1E-AA53-4477-B943-2BE802EA6166</ApplicationId>
+        <IsMigration>false</IsMigration>
+        <PartnerScenario>ContactMsgrAPI</PartnerScenario>
+    </ABApplicationHeader>
+    <ABAuthHeader xmlns="http://www.msn.com/webservices/AddressBook">
+        <ManagedGroupRequest>false</ManagedGroupRequest>
+        <TicketToken>'.$ticket.'</TicketToken>
+    </ABAuthHeader>
+</soap:Header>
+<soap:Body>
+    <AddMember xmlns="http://www.msn.com/webservices/AddressBook">
+        <serviceHandle>
+            <Id>0</Id>
+            <Type>Messenger</Type>
+            <ForeignId></ForeignId>
+        </serviceHandle>
+        <memberships>
+            <Membership>
+                <MemberRole>'.$list.'</MemberRole>
+                <Members>
+                    <Member xsi:type="PassportMember" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+                        <Type>Passport</Type>
+                        <State>Accepted</State>
+                        <PassportName>'.$user.'</PassportName>
+                    </Member>
+                </Members>
+            </Membership>
+        </memberships>
+    </AddMember>
+</soap:Body>
+</soap:Envelope>';
+        else
+            $XML = '<?xml version="1.0" encoding="utf-8"?>
+<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/"
+               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+               xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+               xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/">
+<soap:Header>
+    <ABApplicationHeader xmlns="http://www.msn.com/webservices/AddressBook">
+        <ApplicationId>996CDE1E-AA53-4477-B943-2BE802EA6166</ApplicationId>
+        <IsMigration>false</IsMigration>
+        <PartnerScenario>ContactMsgrAPI</PartnerScenario>
+    </ABApplicationHeader>
+    <ABAuthHeader xmlns="http://www.msn.com/webservices/AddressBook">
+        <ManagedGroupRequest>false</ManagedGroupRequest>
+        <TicketToken>'.$ticket.'</TicketToken>
+    </ABAuthHeader>
+</soap:Header>
+<soap:Body>
+    <AddMember xmlns="http://www.msn.com/webservices/AddressBook">
+        <serviceHandle>
+            <Id>0</Id>
+            <Type>Messenger</Type>
+            <ForeignId></ForeignId>
+        </serviceHandle>
+        <memberships>
+            <Membership>
+                <MemberRole>'.$list.'</MemberRole>
+                <Members>
+                    <Member xsi:type="EmailMember" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+                        <Type>Email</Type>
+                        <State>Accepted</State>
+                        <Email>'.$user.'</Email>
+                        <Annotations>
+                            <Annotation>
+                                <Name>MSN.IM.BuddyType</Name>
+                                <Value>32:YAHOO</Value>
+                            </Annotation>
+                        </Annotations>
+                    </Member>
+                </Members>
+            </Membership>
+        </memberships>
+    </AddMember>
+</soap:Body>
+</soap:Envelope>';
+        $header_array = array(
+            'SOAPAction: '.ADDMEMBER_SOAP,
+            'Content-Type: text/xml; charset=utf-8',
+            'User-Agent: MSN Explorer/9.0 (MSN 8.0; TmstmpExt)'
+        );
+
+        $this->debug_message('*** URL: '.ADDMEMBER_URL);
+        $this->debug_message("*** Sending SOAP:\n$XML");
+        $curl = curl_init();
+        curl_setopt($curl, CURLOPT_URL, ADDMEMBER_URL);
+        curl_setopt($curl, CURLOPT_HTTPHEADER, $header_array);
+        curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
+        curl_setopt($curl, CURLOPT_FOLLOWLOCATION, 1);
+        curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, 0);
+        if ($this->debug) curl_setopt($curl, CURLOPT_HEADER, 1);
+        curl_setopt($curl, CURLOPT_POST, 1);
+        curl_setopt($curl, CURLOPT_POSTFIELDS, $XML);
+        $data = curl_exec($curl);
+        $http_code = curl_getinfo($curl, CURLINFO_HTTP_CODE);
+        curl_close($curl);
+        $this->debug_message("*** Get Result:\n$data");
+
+        if ($http_code != 200) {
+            preg_match('#<faultcode>(.*)</faultcode><faultstring>(.*)</faultstring>#', $data, $matches);
+            if (count($matches) == 0) {
+                $this->debug_message("*** Could not add member (network: $network) $email to $list list");
+                return false;
+            }
+            $faultcode = trim($matches[1]);
+            $faultstring = trim($matches[2]);
+            if (strcasecmp($faultcode, 'soap:Client') || stripos($faultstring, 'Member already exists') === false) {
+                $this->debug_message("*** Could not add member (network: $network) $email to $list list, error code: $faultcode, $faultstring");
+                return false;
+            }
+            $this->debug_message("*** Could not add member (network: $network) $email to $list list, already present");
+            return true;
+        }
+        $this->debug_message("*** Member successfully added (network: $network) $email to $list list");
+        return true;
+    }
+
+    /**
+    * Get membership lists
+    *
+    * @param mixed $returnData Membership list or false on failure
+    */
+    function getMembershipList($returnData = false) {
+        $ticket = htmlspecialchars($this->ticket['contact_ticket']);
+        $XML = '<?xml version="1.0" encoding="utf-8"?>
+<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/"
+               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+               xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+               xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/">
+<soap:Header>
+    <ABApplicationHeader xmlns="http://www.msn.com/webservices/AddressBook">
+        <ApplicationId>996CDE1E-AA53-4477-B943-2BE802EA6166</ApplicationId>
+        <IsMigration>false</IsMigration>
+        <PartnerScenario>Initial</PartnerScenario>
+    </ABApplicationHeader>
+    <ABAuthHeader xmlns="http://www.msn.com/webservices/AddressBook">
+        <ManagedGroupRequest>false</ManagedGroupRequest>
+        <TicketToken>'.$ticket.'</TicketToken>
+    </ABAuthHeader>
+</soap:Header>
+<soap:Body>
+    <FindMembership xmlns="http://www.msn.com/webservices/AddressBook">
+        <serviceFilter>
+            <Types>
+                <ServiceType>Messenger</ServiceType>
+                <ServiceType>Invitation</ServiceType>
+                <ServiceType>SocialNetwork</ServiceType>
+                <ServiceType>Space</ServiceType>
+                <ServiceType>Profile</ServiceType>
+            </Types>
+        </serviceFilter>
+    </FindMembership>
+</soap:Body>
+</soap:Envelope>';
+        $header_array = array(
+            'SOAPAction: '.MEMBERSHIP_SOAP,
+            'Content-Type: text/xml; charset=utf-8',
+            'User-Agent: MSN Explorer/9.0 (MSN 8.0; TmstmpExt)'
+        );
+        $this->debug_message('*** URL: '.MEMBERSHIP_URL);
+        $this->debug_message("*** Sending SOAP:\n$XML");
+        $curl = curl_init();
+        curl_setopt($curl, CURLOPT_URL, MEMBERSHIP_URL);
+        curl_setopt($curl, CURLOPT_HTTPHEADER, $header_array);
+        curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
+        curl_setopt($curl, CURLOPT_FOLLOWLOCATION, 1);
+        curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, 0);
+        if ($this->debug) curl_setopt($curl, CURLOPT_HEADER, 1);
+        curl_setopt($curl, CURLOPT_POST, 1);
+        curl_setopt($curl, CURLOPT_POSTFIELDS, $XML);
+        $data = curl_exec($curl);
+        $http_code = curl_getinfo($curl, CURLINFO_HTTP_CODE);
+        curl_close($curl);
+        $this->debug_message("*** Get Result:\n$data");
+        
+        if ($http_code != 200) return false;
+        $p = $data;
+        $aMemberships = array();
+        while (1) {
+            //$this->debug_message("search p = $p");
+            $start = strpos($p, '<Membership>');
+            $end = strpos($p, '</Membership>');
+            if ($start === false || $end === false || $start > $end) break;
+            //$this->debug_message("start = $start, end = $end");
+            $end += 13;
+            $sMembership = substr($p, $start, $end - $start);
+            $aMemberships[] = $sMembership;
+            //$this->debug_message("add sMembership = $sMembership");
+            $p = substr($p, $end);
+        }
+        //$this->debug_message("aMemberships = ".var_export($aMemberships, true));
+
+        $aContactList = array();
+        foreach ($aMemberships as $sMembership) {
+            //$this->debug_message("sMembership = $sMembership");
+            if (isset($matches)) unset($matches);
+            preg_match('#<MemberRole>(.*)</MemberRole>#', $sMembership, $matches);
+            if (count($matches) == 0) continue;
+            $sMemberRole = $matches[1];
+            //$this->debug_message("MemberRole = $sMemberRole");
+            if ($sMemberRole != 'Allow' && $sMemberRole != 'Reverse' && $sMemberRole != 'Pending') continue;
+            $p = $sMembership;
+            if (isset($aMembers)) unset($aMembers);
+            $aMembers = array();
+            while (1) {
+                //$this->debug_message("search p = $p");
+                $start = strpos($p, '<Member xsi:type="');
+                $end = strpos($p, '</Member>');
+                if ($start === false || $end === false || $start > $end) break;
+                //$this->debug_message("start = $start, end = $end");
+                $end += 9;
+                $sMember = substr($p, $start, $end - $start);
+                $aMembers[] = $sMember;
+                //$this->debug_message("add sMember = $sMember");
+                $p = substr($p, $end);
+            }
+            //$this->debug_message("aMembers = ".var_export($aMembers, true));
+            foreach ($aMembers as $sMember) {
+                //$this->debug_message("sMember = $sMember");
+                if (isset($matches)) unset($matches);
+                preg_match('#<Member xsi\:type="([^"]*)">#', $sMember, $matches);
+                if (count($matches) == 0) continue;
+                $sMemberType = $matches[1];
+                //$this->debug_message("MemberType = $sMemberType");
+                $network = -1;
+                preg_match('#<MembershipId>(.*)</MembershipId>#', $sMember, $matches);
+                if (count($matches) == 0) continue;
+                $id = $matches[1];
+                if ($sMemberType == 'PassportMember') {
+                    if (strpos($sMember, '<Type>Passport</Type>') === false) continue;
+                    $network = 1;
+                    preg_match('#<PassportName>(.*)</PassportName>#', $sMember, $matches);
+                }
+                else if ($sMemberType == 'EmailMember') {
+                    if (strpos($sMember, '<Type>Email</Type>') === false) continue;
+                    // Value is 32: or 32:YAHOO
+                    preg_match('#<Annotation><Name>MSN.IM.BuddyType</Name><Value>(.*):(.*)</Value></Annotation>#', $sMember, $matches);
+                    if (count($matches) == 0) continue;
+                    if ($matches[1] != 32) continue;
+                    $network = 32;
+                    preg_match('#<Email>(.*)</Email>#', $sMember, $matches);
+                }
+                if ($network == -1) continue;
+                if (count($matches) > 0) {
+                    $email = $matches[1];
+                    @list($u_name, $u_domain) = @explode('@', $email);
+                    if ($u_domain == NULL) continue;
+                    $aContactList[$u_domain][$u_name][$network][$sMemberRole] = $id;
+                    $this->debug_message("*** Adding new contact (network: $network, status: $sMemberRole): $u_name@$u_domain ($id)");
+                }
+            }
+        }
+        return $aContactList;
+    }
+    
+    /**
+     * MsnObj related methods
+     */
+    
+    /**
      *
+     * @param $FilePath 圖檔路徑
+     * @param $Type     檔案類型 3=>大頭貼,2表情圖案
+     * @return array
+     */
+    private function MsnObj($FilePath, $Type = 3) {
+        if (!($FileSize=filesize($FilePath))) return '';
+        $Location = md5($FilePath);
+        $Friendly = md5($FilePath.$Type);
+        if (isset($this->MsnObjMap[$Location])) return $this->MsnObjMap[$Location];
+        $sha1d = base64_encode(sha1(file_get_contents($FilePath), true));
+        $sha1c = base64_encode(sha1("Creator".$this->user."Size$FileSize"."Type$Type"."Location$Location"."Friendly".$Friendly."SHA1D$sha1d", true));
+        $this->MsnObjArray[$Location] = $FilePath;
+        $MsnObj = '<msnobj Creator="'.$this->user.'" Size="'.$FileSize.'" Type="'.$Type.'" Location="'.$Location.'" Friendly="'.$Friendly.'" SHA1D="'.$sha1d.'" SHA1C="'.$sha1c.'"/>';
+        $this->MsnObjMap[$Location] = $MsnObj;
+        $this->debug_message("*** p2p: addMsnObj $FilePath::$MsnObj\n");
+        return $MsnObj;
+    }
+
+    private function GetPictureFilePath($Context) {
+        $MsnObj = base64_decode($Context);
+        if (preg_match('/location="(.*?)"/i', $MsnObj, $Match))
+            $location = $Match[1];
+        $this->debug_message("*** p2p: PictureFile[$location] ::All".print_r($this->MsnObjArray,true)."\n");
+        if ($location && isset($this->MsnObjArray[$location]))
+            return $this->MsnObjArray[$location];
+        return false;
+    }
+
+    private function GetMsnObjDefine($Message) {
+        $DefineString = '';
+        if (is_array($this->Emotions))
+            foreach ($this->Emotions as $Pattern => $FilePath) {
+                if (strpos($Message, $Pattern) !== false)
+                $DefineString .= "$Pattern\t".$this->MsnObj($FilePath, 2)."\t";
+            }
+        return $DefineString;
+    }
+    
+    /**
+     * Socket methods
+     */
+    
+    /**
+     * Read data of specified size from NS socket
+     * 
+     * @param integer $size Size to read
+     * @return string Data read
+     */
+    private function ns_readdata($size) {
+        $data = '';
+        $count = 0;
+        while (!feof($this->NSfp)) {
+            $buf = @fread($this->NSfp, $size - $count);
+            $data .= $buf;
+            $count += strlen($buf);
+            if ($count >= $size) break;
+        }
+        $this->debug_message("NS: data ($size/$count) <<<\n$data");
+        return $data;
+    }
+
+    /**
+     * Read line from the NS socket
+     * 
+     * @return string Data read
+     */
+    private function ns_readln() {
+        $data = @fgets($this->NSfp, 4096);
+        if ($data !== false) {
+            $data = trim($data);
+            $this->debug_message("NS: <<< $data");
+        }
+        return $data;
+    }
+
+    /**
+     * Write line to NS socket
+     * 
+     * Also increments id
+     * 
+     * @param string $data Line to write to socket
      * @return void
      */
-    public function sendPing() {
-        // NS: >>> PNG
-        $this->ns_writeln("PNG");
+    private function ns_writeln($data) {
+        @fwrite($this->NSfp, $data."\r\n");
+        $this->debug_message("NS: >>> $data");
+        $this->id++;
     }
 
     /**
-    * Methods to return sockets / check socket status
-    */
-
-    /**
-     * Get the NS socket
-     *
-     * @return resource NS socket
+     * Write data to NS socket
+     * 
+     * @param string $data Data to write to socket
+     * @return void
      */
-    public function getNSSocket() {
-        return $this->NSfp;
+    private function ns_writedata($data) {
+        @fwrite($this->NSfp, $data);
+        $this->debug_message("NS: >>> $data");
     }
 
     /**
-     * Get the Switchboard sockets currently in use
-     *
-     * @return array Array of Switchboard sockets
+     * Read data of specified size from given SB socket
+     * 
+     * @param resource $socket SB socket
+     * @param integer $size Size to read
+     * @return string Data read
      */
-    public function getSBSockets() {
-        return $this->switchBoardSessionLookup;
+    private function sb_readdata($socket, $size) {
+        $data = '';
+        $count = 0;
+        while (!feof($socket)) {
+            $buf = @fread($socket, $size - $count);
+            $data .= $buf;
+            $count += strlen($buf);
+            if ($count >= $size) break;
+        }
+        $this->debug_message("SB: data ($size/$count) <<<\n$data");
+        return $data;
+    }
+
+    /**
+     * Read line from given SB socket
+     * 
+     * @param resource $socket SB Socket
+     * @return string Line read
+     */
+    private function sb_readln($socket) {
+        $data = @fgets($socket, 4096);
+        if ($data !== false) {
+            $data = trim($data);
+            $this->debug_message("SB: <<< $data");
+        }
+        return $data;
+    }
+
+    /**
+     * Write line to given SB socket
+     * 
+     * Also increments id
+     * 
+     * @param resource $socket SB socket
+     * @param integer $id Reference to SB id
+     * @param string $data Line to write
+     * @return void
+     */
+    private function sb_writeln($socket, &$id, $data) {
+        @fwrite($socket, $data."\r\n");
+        $this->debug_message("SB: >>> $data");
+        $id++;
+    }
+
+    /**
+     * Write data to given SB socket
+     * 
+     * @param resource $socket SB socket
+     * @param $data Data to write to socket
+     * @return void
+     */
+    private function sb_writedata($socket, $data) {
+        @fwrite($socket, $data);
+        $this->debug_message("SB: >>> $data");
     }
 
     /**
@@ -3030,7 +2598,451 @@ X-OIM-Sequence-Num: 1
         $info = stream_get_meta_data($socket);
         return $info['eof'];
     }
+    
+    /**
+     * Key generation methods
+     */
+    
+    private function derive_key($key, $magic) {
+        $hash1 = mhash(MHASH_SHA1, $magic, $key);
+        $hash2 = mhash(MHASH_SHA1, $hash1.$magic, $key);
+        $hash3 = mhash(MHASH_SHA1, $hash1, $key);
+        $hash4 = mhash(MHASH_SHA1, $hash3.$magic, $key);
+        return $hash2.substr($hash4, 0, 4);
+    }
 
+    private function generateLoginBLOB($key, $challenge) {
+        $key1 = base64_decode($key);
+        $key2 = $this->derive_key($key1, 'WS-SecureConversationSESSION KEY HASH');
+        $key3 = $this->derive_key($key1, 'WS-SecureConversationSESSION KEY ENCRYPTION');
+
+        // get hash of challenge using key2
+        $hash = mhash(MHASH_SHA1, $challenge, $key2);
+
+        // get 8 bytes random data
+        $iv = substr(base64_encode(rand(1000,9999).rand(1000,9999)), 2, 8);
+
+        $cipher = mcrypt_cbc(MCRYPT_3DES, $key3, $challenge."\x08\x08\x08\x08\x08\x08\x08\x08", MCRYPT_ENCRYPT, $iv);
+
+        $blob = pack('LLLLLLL', 28, 1, 0x6603, 0x8004, 8, 20, 72);
+        $blob .= $iv;
+        $blob .= $hash;
+        $blob .= $cipher;
+
+        return base64_encode($blob);
+    }
+    
+    /**
+    * Generate challenge response
+    *
+    * @param string $code
+    * @return string challenge response code
+    */
+    private function getChallenge($code) {
+        // MSNP15
+        // http://msnpiki.msnfanatic.com/index.php/MSNP11:Challenges
+        // Step 1: The MD5 Hash
+        $md5Hash = md5($code.PROD_KEY);
+        $aMD5 = @explode("\0", chunk_split($md5Hash, 8, "\0"));
+        for ($i = 0; $i < 4; $i++) {
+            $aMD5[$i] = implode('', array_reverse(@explode("\0", chunk_split($aMD5[$i], 2, "\0"))));
+            $aMD5[$i] = (0 + base_convert($aMD5[$i], 16, 10)) & 0x7FFFFFFF;
+        }
+
+        // Step 2: A new string
+        $chl_id = $code.PROD_ID;
+        $chl_id .= str_repeat('0', 8 - (strlen($chl_id) % 8));
+
+        $aID = @explode("\0", substr(chunk_split($chl_id, 4, "\0"), 0, -1));
+        for ($i = 0; $i < count($aID); $i++) {
+            $aID[$i] = implode('', array_reverse(@explode("\0", chunk_split($aID[$i], 1, "\0"))));
+            $aID[$i] = 0 + base_convert(bin2hex($aID[$i]), 16, 10);
+        }
+
+        // Step 3: The 64 bit key
+        $magic_num = 0x0E79A9C1;
+        $str7f = 0x7FFFFFFF;
+        $high = 0;
+        $low = 0;
+        for ($i = 0; $i < count($aID); $i += 2) {
+            $temp = $aID[$i];
+            $temp = bcmod(bcmul($magic_num, $temp), $str7f);
+            $temp = bcadd($temp, $high);
+            $temp = bcadd(bcmul($aMD5[0], $temp), $aMD5[1]);
+            $temp = bcmod($temp, $str7f);
+
+            $high = $aID[$i+1];
+            $high = bcmod(bcadd($high, $temp), $str7f);
+            $high = bcadd(bcmul($aMD5[2], $high), $aMD5[3]);
+            $high = bcmod($high, $str7f);
+
+            $low = bcadd(bcadd($low, $high), $temp);
+        }
+
+        $high = bcmod(bcadd($high, $aMD5[1]), $str7f);
+        $low = bcmod(bcadd($low, $aMD5[3]), $str7f);
+
+        $new_high = bcmul($high & 0xFF, 0x1000000);
+        $new_high = bcadd($new_high, bcmul($high & 0xFF00, 0x100));
+        $new_high = bcadd($new_high, bcdiv($high & 0xFF0000, 0x100));
+        $new_high = bcadd($new_high, bcdiv($high & 0xFF000000, 0x1000000));
+        // we need integer here
+        $high = 0+$new_high;
+
+        $new_low = bcmul($low & 0xFF, 0x1000000);
+        $new_low = bcadd($new_low, bcmul($low & 0xFF00, 0x100));
+        $new_low = bcadd($new_low, bcdiv($low & 0xFF0000, 0x100));
+        $new_low = bcadd($new_low, bcdiv($low & 0xFF000000, 0x1000000));
+        // we need integer here
+        $low = 0+$new_low;
+
+        // we just use 32 bits integer, don't need the key, just high/low
+        // $key = bcadd(bcmul($high, 0x100000000), $low);
+
+        // Step 4: Using the key
+        $md5Hash = md5($code.PROD_KEY);
+        $aHash = @explode("\0", chunk_split($md5Hash, 8, "\0"));
+
+        $hash = '';
+        $hash .= sprintf("%08x", (0 + base_convert($aHash[0], 16, 10)) ^ $high);
+        $hash .= sprintf("%08x", (0 + base_convert($aHash[1], 16, 10)) ^ $low);
+        $hash .= sprintf("%08x", (0 + base_convert($aHash[2], 16, 10)) ^ $high);
+        $hash .= sprintf("%08x", (0 + base_convert($aHash[3], 16, 10)) ^ $low);
+
+        return $hash;
+    }
+    
+    /**
+     * Utility methods
+     */
+    
+    private function Array2SoapVar($Array, $ReturnSoapVarObj = true, $TypeName = null, $TypeNameSpace = null) {
+        $ArrayString = '';
+        foreach($Array as $Key => $Val) {
+            if ($Key{0} == ':') continue;
+            $Attrib = '';
+            if (is_array($Val[':'])) {
+                foreach ($Val[':'] as $AttribName => $AttribVal)
+                $Attrib .= " $AttribName = '$AttribVal'";
+            }
+            if ($Key{0} == '!') {
+                //List Type Define
+                $Key = substr($Key,1);
+                foreach ($Val as $ListKey => $ListVal) {
+                    if ($ListKey{0} == ':') continue;
+                    if (is_array($ListVal)) $ListVal = $this->Array2SoapVar($ListVal, false);
+                    elseif (is_bool($ListVal)) $ListVal = $ListVal ? 'true' : 'false';
+                    $ArrayString .= "<$Key$Attrib>$ListVal</$Key>";
+                }
+                continue;
+            }
+            if (is_array($Val)) $Val = $this->Array2SoapVar($Val, false);
+            elseif (is_bool($Val)) $Val = $Val ? 'true' : 'false';
+            $ArrayString .= "<$Key$Attrib>$Val</$Key>";
+        }
+        if ($ReturnSoapVarObj) return new SoapVar($ArrayString, XSD_ANYXML, $TypeName, $TypeNameSpace);
+        return $ArrayString;
+    }
+    
+    private function linetoArray($lines) {
+        $lines = str_replace("\r", '', $lines);
+        $lines = explode("\n", $lines);
+        foreach ($lines as $line) {
+            if (!isset($line{3})) continue;
+            list($Key, $Val) = explode(':', $line);
+            $Data[trim($Key)] = trim($Val);
+        }
+        return $Data;
+    }
+    
+    /**
+    * Get Passport ticket
+    *
+    * @param string $url URL string (Optional)
+    * @return mixed Array of tickets or false on failure
+    */
+    private function get_passport_ticket($url = '') {
+        $user = $this->user;
+        $password = htmlspecialchars($this->password);
+
+        if ($url === '')
+            $passport_url = PASSPORT_URL;
+        else
+            $passport_url = $url;
+
+        $XML = '<?xml version="1.0" encoding="UTF-8"?>
+<Envelope xmlns="http://schemas.xmlsoap.org/soap/envelope/"
+          xmlns:wsse="http://schemas.xmlsoap.org/ws/2003/06/secext"
+          xmlns:saml="urn:oasis:names:tc:SAML:1.0:assertion"
+          xmlns:wsp="http://schemas.xmlsoap.org/ws/2002/12/policy"
+          xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"
+          xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/03/addressing"
+          xmlns:wssc="http://schemas.xmlsoap.org/ws/2004/04/sc"
+          xmlns:wst="http://schemas.xmlsoap.org/ws/2004/04/trust">
+<Header>
+  <ps:AuthInfo xmlns:ps="http://schemas.microsoft.com/Passport/SoapServices/PPCRL" Id="PPAuthInfo">
+    <ps:HostingApp>{7108E71A-9926-4FCB-BCC9-9A9D3F32E423}</ps:HostingApp>
+    <ps:BinaryVersion>4</ps:BinaryVersion>
+    <ps:UIVersion>1</ps:UIVersion>
+    <ps:Cookies></ps:Cookies>
+    <ps:RequestParams>AQAAAAIAAABsYwQAAAAxMDMz</ps:RequestParams>
+  </ps:AuthInfo>
+  <wsse:Security>
+    <wsse:UsernameToken Id="user">
+      <wsse:Username>'.$user.'</wsse:Username>
+      <wsse:Password>'.$password.'</wsse:Password>
+    </wsse:UsernameToken>
+  </wsse:Security>
+</Header>
+<Body>
+  <ps:RequestMultipleSecurityTokens xmlns:ps="http://schemas.microsoft.com/Passport/SoapServices/PPCRL" Id="RSTS">
+    <wst:RequestSecurityToken Id="RST0">
+      <wst:RequestType>http://schemas.xmlsoap.org/ws/2004/04/security/trust/Issue</wst:RequestType>
+      <wsp:AppliesTo>
+        <wsa:EndpointReference>
+          <wsa:Address>http://Passport.NET/tb</wsa:Address>
+        </wsa:EndpointReference>
+      </wsp:AppliesTo>
+    </wst:RequestSecurityToken>
+    <wst:RequestSecurityToken Id="RST1">
+      <wst:RequestType>http://schemas.xmlsoap.org/ws/2004/04/security/trust/Issue</wst:RequestType>
+      <wsp:AppliesTo>
+        <wsa:EndpointReference>
+          <wsa:Address>messengerclear.live.com</wsa:Address>
+        </wsa:EndpointReference>
+      </wsp:AppliesTo>
+      <wsse:PolicyReference URI="'.$this->passport_policy.'"></wsse:PolicyReference>
+    </wst:RequestSecurityToken>
+    <wst:RequestSecurityToken Id="RST2">
+      <wst:RequestType>http://schemas.xmlsoap.org/ws/2004/04/security/trust/Issue</wst:RequestType>
+      <wsp:AppliesTo>
+        <wsa:EndpointReference>
+          <wsa:Address>messenger.msn.com</wsa:Address>
+        </wsa:EndpointReference>
+      </wsp:AppliesTo>
+      <wsse:PolicyReference URI="?id=507"></wsse:PolicyReference>
+    </wst:RequestSecurityToken>
+    <wst:RequestSecurityToken Id="RST3">
+      <wst:RequestType>http://schemas.xmlsoap.org/ws/2004/04/security/trust/Issue</wst:RequestType>
+      <wsp:AppliesTo>
+        <wsa:EndpointReference>
+          <wsa:Address>contacts.msn.com</wsa:Address>
+        </wsa:EndpointReference>
+      </wsp:AppliesTo>
+      <wsse:PolicyReference URI="MBI"></wsse:PolicyReference>
+    </wst:RequestSecurityToken>
+    <wst:RequestSecurityToken Id="RST4">
+      <wst:RequestType>http://schemas.xmlsoap.org/ws/2004/04/security/trust/Issue</wst:RequestType>
+      <wsp:AppliesTo>
+        <wsa:EndpointReference>
+          <wsa:Address>messengersecure.live.com</wsa:Address>
+        </wsa:EndpointReference>
+      </wsp:AppliesTo>
+      <wsse:PolicyReference URI="MBI_SSL"></wsse:PolicyReference>
+    </wst:RequestSecurityToken>
+    <wst:RequestSecurityToken Id="RST5">
+      <wst:RequestType>http://schemas.xmlsoap.org/ws/2004/04/security/trust/Issue</wst:RequestType>
+      <wsp:AppliesTo>
+        <wsa:EndpointReference>
+          <wsa:Address>spaces.live.com</wsa:Address>
+        </wsa:EndpointReference>
+      </wsp:AppliesTo>
+      <wsse:PolicyReference URI="MBI"></wsse:PolicyReference>
+    </wst:RequestSecurityToken>
+    <wst:RequestSecurityToken Id="RST6">
+      <wst:RequestType>http://schemas.xmlsoap.org/ws/2004/04/security/trust/Issue</wst:RequestType>
+      <wsp:AppliesTo>
+        <wsa:EndpointReference>
+          <wsa:Address>storage.msn.com</wsa:Address>
+        </wsa:EndpointReference>
+      </wsp:AppliesTo>
+      <wsse:PolicyReference URI="MBI"></wsse:PolicyReference>
+    </wst:RequestSecurityToken>
+  </ps:RequestMultipleSecurityTokens>
+</Body>
+</Envelope>';
+
+        $this->debug_message("*** URL: $passport_url");
+        $this->debug_message("*** Sending SOAP:\n$XML");
+        $curl = curl_init();
+        curl_setopt($curl, CURLOPT_URL, $passport_url);
+        if ($this->debug) curl_setopt($curl, CURLOPT_HEADER, 1);
+        curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
+        curl_setopt($curl, CURLOPT_FOLLOWLOCATION, 1);
+        curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, 0);
+        curl_setopt($curl, CURLOPT_POST, 1);
+        curl_setopt($curl, CURLOPT_POSTFIELDS, $XML);
+        $data = curl_exec($curl);
+        $http_code = curl_getinfo($curl, CURLINFO_HTTP_CODE);
+        curl_close($curl);
+        $this->debug_message("*** Get Result:\n$data");
+
+        if ($http_code != 200) {
+            // sometimes, redirect to another URL
+            // MSNP15
+            //<faultcode>psf:Redirect</faultcode>
+            //<psf:redirectUrl>https://msnia.login.live.com/pp450/RST.srf</psf:redirectUrl>
+            //<faultstring>Authentication Failure</faultstring>
+            if (strpos($data, '<faultcode>psf:Redirect</faultcode>') === false) {
+                $this->debug_message("*** Could not get passport ticket! http code = $http_code");
+                return false;
+            }
+            preg_match("#<psf\:redirectUrl>(.*)</psf\:redirectUrl>#", $data, $matches);
+            if (count($matches) == 0) {
+                $this->debug_message('*** Redirected, but could not get redirect URL!');
+                return false;
+            }
+            $redirect_url = $matches[1];
+            if ($redirect_url == $passport_url) {
+                $this->debug_message('*** Redirected, but to same URL!');
+                return false;
+            }
+            $this->debug_message("*** Redirected to $redirect_url");
+            return $this->get_passport_ticket($redirect_url);
+        }
+
+        // sometimes, redirect to another URL, also return 200
+        // MSNP15
+        //<faultcode>psf:Redirect</faultcode>
+        //<psf:redirectUrl>https://msnia.login.live.com/pp450/RST.srf</psf:redirectUrl>
+        //<faultstring>Authentication Failure</faultstring>
+        if (strpos($data, '<faultcode>psf:Redirect</faultcode>') !== false) {
+            preg_match("#<psf\:redirectUrl>(.*)</psf\:redirectUrl>#", $data, $matches);
+            if (count($matches) != 0) {
+                $redirect_url = $matches[1];
+                if ($redirect_url == $passport_url) {
+                    $this->debug_message('*** Redirected, but to same URL!');
+                    return false;
+                }
+                $this->debug_message("*** Redirected to $redirect_url");
+                return $this->get_passport_ticket($redirect_url);
+            }
+        }
+
+        // no Redurect faultcode or URL
+        // we should get the ticket here
+
+        // we need ticket and secret code
+        // RST1: messengerclear.live.com
+        // <wsse:BinarySecurityToken Id="Compact1">t=tick&p=</wsse:BinarySecurityToken>
+        // <wst:BinarySecret>binary secret</wst:BinarySecret>
+        // RST2: messenger.msn.com
+        // <wsse:BinarySecurityToken Id="PPToken2">t=tick</wsse:BinarySecurityToken>
+        // RST3: contacts.msn.com
+        // <wsse:BinarySecurityToken Id="Compact3">t=tick&p=</wsse:BinarySecurityToken>
+        // RST4: messengersecure.live.com
+        // <wsse:BinarySecurityToken Id="Compact4">t=tick&p=</wsse:BinarySecurityToken>
+        // RST5: spaces.live.com
+        // <wsse:BinarySecurityToken Id="Compact5">t=tick&p=</wsse:BinarySecurityToken>
+        // RST6: storage.msn.com
+        // <wsse:BinarySecurityToken Id="Compact6">t=tick&p=</wsse:BinarySecurityToken>
+        preg_match("#".
+            "<wsse\:BinarySecurityToken Id=\"Compact1\">(.*)</wsse\:BinarySecurityToken>(.*)".
+            "<wst\:BinarySecret>(.*)</wst\:BinarySecret>(.*)".
+            "<wsse\:BinarySecurityToken Id=\"PPToken2\">(.*)</wsse\:BinarySecurityToken>(.*)".
+            "<wsse\:BinarySecurityToken Id=\"Compact3\">(.*)</wsse\:BinarySecurityToken>(.*)".
+            "<wsse\:BinarySecurityToken Id=\"Compact4\">(.*)</wsse\:BinarySecurityToken>(.*)".
+            "<wsse\:BinarySecurityToken Id=\"Compact5\">(.*)</wsse\:BinarySecurityToken>(.*)".
+            "<wsse\:BinarySecurityToken Id=\"Compact6\">(.*)</wsse\:BinarySecurityToken>(.*)".
+            "#",
+        $data, $matches);
+
+        // no ticket found!
+        if (count($matches) == 0) {
+            $this->debug_message('*** Could not get passport ticket!');
+            return false;
+        }
+
+        //$this->debug_message(var_export($matches, true));
+        // matches[0]: all data
+        // matches[1]: RST1 (messengerclear.live.com) ticket
+        // matches[2]: ...
+        // matches[3]: RST1 (messengerclear.live.com) binary secret
+        // matches[4]: ...
+        // matches[5]: RST2 (messenger.msn.com) ticket
+        // matches[6]: ...
+        // matches[7]: RST3 (contacts.msn.com) ticket
+        // matches[8]: ...
+        // matches[9]: RST4 (messengersecure.live.com) ticket
+        // matches[10]: ...
+        // matches[11]: RST5 (spaces.live.com) ticket
+        // matches[12]: ...
+        // matches[13]: RST6 (storage.live.com) ticket
+        // matches[14]: ...
+
+        // so
+        // ticket => $matches[1]
+        // secret => $matches[3]
+        // web_ticket => $matches[5]
+        // contact_ticket => $matches[7]
+        // oim_ticket => $matches[9]
+        // space_ticket => $matches[11]
+        // storage_ticket => $matches[13]
+
+        // yes, we get ticket
+        $aTickets = array(
+            'ticket' => html_entity_decode($matches[1]),
+            'secret' => html_entity_decode($matches[3]),
+            'web_ticket' => html_entity_decode($matches[5]),
+            'contact_ticket' => html_entity_decode($matches[7]),
+            'oim_ticket' => html_entity_decode($matches[9]),
+            'space_ticket' => html_entity_decode($matches[11]),
+            'storage_ticket' => html_entity_decode($matches[13])
+        );
+        $this->ticket = $aTickets;
+        //$this->debug_message(var_export($aTickets, true));
+        $ABAuthHeaderArray = array(
+            'ABAuthHeader' => array(
+                ':' => array('xmlns' => 'http://www.msn.com/webservices/AddressBook'),
+                'ManagedGroupRequest' => false,
+                'TicketToken' => htmlspecialchars($this->ticket['contact_ticket']),
+            )
+        );
+        $this->ABAuthHeader = new SoapHeader('http://www.msn.com/webservices/AddressBook', 'ABAuthHeader', $this->Array2SoapVar($ABAuthHeaderArray));
+        return $aTickets;
+    }
+    
+    /**
+    * Generate the data to send a message
+    *
+    * @param string $sMessage Message
+    * @param integer $network Network
+    * @return string Message data
+    */
+    private function getMessage($sMessage, $network = 1) {
+        $msg_header = "MIME-Version: 1.0\r\nContent-Type: text/plain; charset=UTF-8\r\nX-MMS-IM-Format: FN=$this->font_fn; EF=$this->font_ef; CO=$this->font_co; CS=0; PF=22\r\n\r\n";
+        $msg_header_len = strlen($msg_header);
+        if ($network == 1)
+            $maxlen = $this->max_msn_message_len - $msg_header_len;
+        else
+            $maxlen = $this->max_yahoo_message_len - $msg_header_len;
+        $sMessage = str_replace("\r", '', $sMessage);
+        $msg = substr($sMessage, 0, $maxlen);
+        return $msg_header.$msg;
+    }
+    
+    /**
+    * Sleep for the given number of seconds
+    *
+    * @param integer $wait Number of seconds to sleep for
+    */
+    private function NSRetryWait($wait) {
+        $this->debug_message("*** Sleeping for $wait seconds before retrying");
+        sleep($wait);
+    }
+    
+    /**
+     * Sends a ping command
+     *
+     * Should be called about every 50 seconds
+     *
+     * @return void
+     */
+    public function sendPing() {
+        // NS: >>> PNG
+        $this->ns_writeln("PNG");
+    }
+    
     /**
     * Methods to add / call callbacks
     */
@@ -3075,4 +3087,50 @@ X-OIM-Sequence-Num: 1
             return false;
         }
     }
+    
+    /**
+     * Debugging methods
+     */
+    
+    /**
+     * Print message if debugging is enabled
+     * 
+     * @param string $str Message to print
+     */
+    private function debug_message($str) {
+        if (!$this->debug) return;
+        echo $str."\n";
+    }
+    
+    /**
+     * Dump binary data
+     * 
+     * @param string $str Data string
+     * @return Binary data
+     */
+    private function dump_binary($str) {
+        $buf = '';
+        $a_str = '';
+        $h_str = '';
+        $len = strlen($str);
+        for ($i = 0; $i < $len; $i++) {
+            if (($i % 16) == 0) {
+                if ($buf !== '') {
+                    $buf .= "$h_str $a_str\n";
+                }
+                $buf .= sprintf("%04X:", $i);
+                $a_str = '';
+                $h_str = '';
+            }
+            $ch = ord($str[$i]);
+            if ($ch < 32)
+            $a_str .= '.';
+            else
+            $a_str .= chr($ch);
+            $h_str .= sprintf(" %02X", $ch);
+        }
+        if ($h_str !== '')
+        $buf .= "$h_str $a_str\n";
+        return $buf;
+    }
 }

From d52f6d5aeaa820e44beadf397dd5c0f15e0d33e7 Mon Sep 17 00:00:00 2001
From: Luke Fitzgerald <lw.fitzgerald@googlemail.com>
Date: Wed, 16 Jun 2010 01:24:28 +0100
Subject: [PATCH 057/655] Removed unnecessary else statement

---
 plugins/Msn/extlib/phpmsnclass/msn.class.php | 726 +++++++++----------
 1 file changed, 363 insertions(+), 363 deletions(-)

diff --git a/plugins/Msn/extlib/phpmsnclass/msn.class.php b/plugins/Msn/extlib/phpmsnclass/msn.class.php
index 1e8d7e0f1f..af9a45e49d 100644
--- a/plugins/Msn/extlib/phpmsnclass/msn.class.php
+++ b/plugins/Msn/extlib/phpmsnclass/msn.class.php
@@ -522,395 +522,395 @@ class MSN {
             $this->NSRetryWait($this->retry_wait);
             $this->signon();
             return;
-        } else {
-            switch (substr($data, 0, 3)) {
-                case 'SBS':
-                    // after 'USR {id} OK {user} {verify} 0' response, the server will send SBS and profile to us
-                    // NS: <<< SBS 0 null
-                    break;
+        }
+        
+        switch (substr($data, 0, 3)) {
+            case 'SBS':
+                // after 'USR {id} OK {user} {verify} 0' response, the server will send SBS and profile to us
+                // NS: <<< SBS 0 null
+                break;
 
-                case 'RFS':
-                    // FIXME:
-                    // NS: <<< RFS ???
-                    // refresh ADL, so we re-send it again
-                    if (is_array($this->aADL)) {
-                        foreach ($this->aADL as $str) {
-                            $len = strlen($str);
-                            // NS: >>> ADL {id} {size}
-                            $this->ns_writeln("ADL $this->id $len");
-                            $this->ns_writedata($str);
-                        }
+            case 'RFS':
+                // FIXME:
+                // NS: <<< RFS ???
+                // refresh ADL, so we re-send it again
+                if (is_array($this->aADL)) {
+                    foreach ($this->aADL as $str) {
+                        $len = strlen($str);
+                        // NS: >>> ADL {id} {size}
+                        $this->ns_writeln("ADL $this->id $len");
+                        $this->ns_writedata($str);
                     }
-                    break;
+                }
+                break;
 
-                case 'LST':
-                    // NS: <<< LST {email} {alias} 11 0
-                    @list(/* LST */, $email, /* alias */,) = @explode(' ', $data);
-                    @list($u_name, $u_domain) = @explode('@', $email);
-                    if (!isset($this->aContactList[$u_domain][$u_name][1])) {
-                        $this->aContactList[$u_domain][$u_name][1]['Allow'] = 'Allow';
-                        $this->debug_message("*** Added to contact list: $u_name@$u_domain");
-                    }
-                    break;
+            case 'LST':
+                // NS: <<< LST {email} {alias} 11 0
+                @list(/* LST */, $email, /* alias */,) = @explode(' ', $data);
+                @list($u_name, $u_domain) = @explode('@', $email);
+                if (!isset($this->aContactList[$u_domain][$u_name][1])) {
+                    $this->aContactList[$u_domain][$u_name][1]['Allow'] = 'Allow';
+                    $this->debug_message("*** Added to contact list: $u_name@$u_domain");
+                }
+                break;
 
-                case 'ADL':
-                    // randomly, we get ADL command, someone add us to their contact list for MSNP15
-                    // NS: <<< ADL 0 {size}
-                    @list(/* ADL */, /* 0 */, $size,) = @explode(' ', $data);
-                    if (is_numeric($size) && $size > 0) {
-                        $data = $this->ns_readdata($size);
-                        preg_match('#<ml><d n="([^"]+)"><c n="([^"]+)"(.*) t="(\d*)"(.*) /></d></ml>#', $data, $matches);
-                        if (is_array($matches) && count($matches) > 0) {
-                            $u_domain = $matches[1];
-                            $u_name = $matches[2];
-                            $network = $matches[4];
-                            if (isset($this->aContactList[$u_domain][$u_name][$network]))
-                                $this->debug_message("*** Someone (network: $network) added us to their list (but already in our list): $u_name@$u_domain");
-                            else {
-                                $re_login = false;
-                                $cnt = 0;
-                                foreach (array('Allow', 'Reverse') as $list) {
+            case 'ADL':
+                // randomly, we get ADL command, someone add us to their contact list for MSNP15
+                // NS: <<< ADL 0 {size}
+                @list(/* ADL */, /* 0 */, $size,) = @explode(' ', $data);
+                if (is_numeric($size) && $size > 0) {
+                    $data = $this->ns_readdata($size);
+                    preg_match('#<ml><d n="([^"]+)"><c n="([^"]+)"(.*) t="(\d*)"(.*) /></d></ml>#', $data, $matches);
+                    if (is_array($matches) && count($matches) > 0) {
+                        $u_domain = $matches[1];
+                        $u_name = $matches[2];
+                        $network = $matches[4];
+                        if (isset($this->aContactList[$u_domain][$u_name][$network]))
+                            $this->debug_message("*** Someone (network: $network) added us to their list (but already in our list): $u_name@$u_domain");
+                        else {
+                            $re_login = false;
+                            $cnt = 0;
+                            foreach (array('Allow', 'Reverse') as $list) {
+                                if (!$this->addMemberToList($u_name.'@'.$u_domain, $network, $list)) {
+                                    if ($re_login) {
+                                        $this->debug_message("*** Could not add $u_name@$u_domain (network: $network) to $list list");
+                                        continue;
+                                    }
+                                    $aTickets = $this->get_passport_ticket();
+                                    if (!$aTickets || !is_array($aTickets)) {
+                                        // failed to login? ignore it
+                                        $this->debug_message("*** Could not re-login, something wrong here");
+                                        $this->debug_message("*** Could not add $u_name@$u_domain (network: $network) to $list list");
+                                        continue;
+                                    }
+                                    $re_login = true;
+                                    $this->ticket = $aTickets;
+                                    $this->debug_message("**** Got new ticket, trying again");
                                     if (!$this->addMemberToList($u_name.'@'.$u_domain, $network, $list)) {
-                                        if ($re_login) {
-                                            $this->debug_message("*** Could not add $u_name@$u_domain (network: $network) to $list list");
-                                            continue;
-                                        }
-                                        $aTickets = $this->get_passport_ticket();
-                                        if (!$aTickets || !is_array($aTickets)) {
-                                            // failed to login? ignore it
-                                            $this->debug_message("*** Could not re-login, something wrong here");
-                                            $this->debug_message("*** Could not add $u_name@$u_domain (network: $network) to $list list");
-                                            continue;
-                                        }
-                                        $re_login = true;
-                                        $this->ticket = $aTickets;
-                                        $this->debug_message("**** Got new ticket, trying again");
-                                        if (!$this->addMemberToList($u_name.'@'.$u_domain, $network, $list)) {
-                                            $this->debug_message("*** Could not add $u_name@$u_domain (network: $network) to $list list");
-                                            continue;
-                                        }
-                                    }
-                                    $this->aContactList[$u_domain][$u_name][$network][$list] = false;
-                                    $cnt++;
-                                }
-                                $this->debug_message("*** Someone (network: $network) added us to their list: $u_name@$u_domain");
-                            }
-                            $str = '<ml l="1"><d n="'.$u_domain.'"><c n="'.$u_name.'" l="3" t="'.$network.'" /></d></ml>';
-                            $len = strlen($str);
-
-                            $this->callHandler('AddedToList', array('screenname' => $u_name.'@'.$u_domain, 'network' => $network));
-                        }
-                        else
-                            $this->debug_message("*** Someone added us to their list: $data");
-                    }
-                    break;
-
-                case 'RML':
-                    // randomly, we get RML command, someome remove us to their contact list for MSNP15
-                    // NS: <<< RML 0 {size}
-                    @list(/* RML */, /* 0 */, $size,) = @explode(' ', $data);
-                    if (is_numeric($size) && $size > 0) {
-                        $data = $this->ns_readdata($size);
-                        preg_match('#<ml><d n="([^"]+)"><c n="([^"]+)"(.*) t="(\d*)"(.*) /></d></ml>#', $data, $matches);
-                        if (is_array($matches) && count($matches) > 0) {
-                            $u_domain = $matches[1];
-                            $u_name = $matches[2];
-                            $network = $matches[4];
-                            if (isset($this->aContactList[$u_domain][$u_name][$network])) {
-                                $aData = $this->aContactList[$u_domain][$u_name][$network];
-
-                                foreach ($aData as $list => $id)
-                                    $this->delMemberFromList($id, $u_name.'@'.$u_domain, $network, $list);
-
-                                unset($this->aContactList[$u_domain][$u_name][$network]);
-                                $this->debug_message("*** Someone (network: $network) removed us from their list: $u_name@$u_domain");
-                            }
-                            else
-                                $this->debug_message("*** Someone (network: $network) removed us from their list (but not in our list): $u_name@$u_domain");
-
-                            $this->callHandler('RemovedFromList', array('screenname' => $u_name.'@'.$u_domain, 'network' => $network));
-                        }
-                        else
-                            $this->debug_message("*** Someone removed us from their list: $data");
-                    }
-                    break;
-
-                case 'MSG':
-                    // randomly, we get MSG notification from server
-                    // NS: <<< MSG Hotmail Hotmail {size}
-                    @list(/* MSG */, /* Hotmail */, /* Hotmail */, $size,) = @explode(' ', $data);
-                    if (is_numeric($size) && $size > 0) {
-                        $data = $this->ns_readdata($size);
-                        $aLines = @explode("\n", $data);
-                        $header = true;
-                        $ignore = false;
-                        $maildata = '';
-                        foreach ($aLines as $line) {
-                            $line = rtrim($line);
-                            if ($header) {
-                                if ($line === '') {
-                                    $header = false;
-                                    continue;
-                                }
-                                if (strncasecmp($line, 'Content-Type:', 13) == 0) {
-                                    if (strpos($line, 'text/x-msmsgsinitialmdatanotification') === false && strpos($line, 'text/x-msmsgsoimnotification') === false) {
-                                        // we just need text/x-msmsgsinitialmdatanotification
-                                        // or text/x-msmsgsoimnotification
-                                        $ignore = true;
-                                        break;
+                                        $this->debug_message("*** Could not add $u_name@$u_domain (network: $network) to $list list");
+                                        continue;
                                     }
                                 }
-                                continue;
-                            }
-                            if (strncasecmp($line, 'Mail-Data:', 10) == 0) {
-                                $maildata = trim(substr($line, 10));
-                                break;
+                                $this->aContactList[$u_domain][$u_name][$network][$list] = false;
+                                $cnt++;
                             }
+                            $this->debug_message("*** Someone (network: $network) added us to their list: $u_name@$u_domain");
                         }
-                        if ($ignore) {
-                            $this->debug_message("*** Ignoring MSG for: $line");
-                            break;
-                        }
-                        if ($maildata == '') {
-                            $this->debug_message("*** Ignoring MSG not for OIM");
-                            break;
-                        }
-                        $re_login = false;
-                        if (strcasecmp($maildata, 'too-large') == 0) {
-                            $this->debug_message("*** Large mail-data, need to get the data via SOAP");
-                            $maildata = $this->getOIM_maildata();
-                            if ($maildata === false) {
-                                $this->debug_message("*** Could not get mail-data via SOAP");
+                        $str = '<ml l="1"><d n="'.$u_domain.'"><c n="'.$u_name.'" l="3" t="'.$network.'" /></d></ml>';
+                        $len = strlen($str);
 
-                                // maybe we need to re-login again
-                                $aTickets = $this->get_passport_ticket();
-                                if (!$aTickets || !is_array($aTickets)) {
-                                    // failed to login? ignore it
-                                    $this->debug_message("*** Could not re-login, something wrong here, ignoring this OIM");
-                                    break;
-                                }
-                                $re_login = true;
-                                $this->ticket = $aTickets;
-                                $this->debug_message("*** Got new ticket, trying again");
-                                $maildata = $this->getOIM_maildata();
-                                if ($maildata === false) {
-                                    $this->debug_message("*** Could not get mail-data via SOAP, and re-login already attempted, ignoring this OIM");
-                                    break;
-                                }
-                            }
-                        }
-                        // could be a lots of <M>...</M>, so we can't use preg_match here
-                        $p = $maildata;
-                        $aOIMs = array();
-                        while (1) {
-                            $start = strpos($p, '<M>');
-                            $end = strpos($p, '</M>');
-                            if ($start === false || $end === false || $start > $end) break;
-                            $end += 4;
-                            $sOIM = substr($p, $start, $end - $start);
-                            $aOIMs[] = $sOIM;
-                            $p = substr($p, $end);
-                        }
-                        if (count($aOIMs) == 0) {
-                            $this->debug_message("*** Ignoring empty OIM");
-                            break;
-                        }
-                        foreach ($aOIMs as $maildata) {
-                            // T: 11 for MSN, 13 for Yahoo
-                            // S: 6 for MSN, 7 for Yahoo
-                            // RT: the datetime received by server
-                            // RS: already read or not
-                            // SZ: size of message
-                            // E: sender
-                            // I: msgid
-                            // F: always 00000000-0000-0000-0000-000000000009
-                            // N: sender alias
-                            preg_match('#<T>(.*)</T>#', $maildata, $matches);
-                            if (count($matches) == 0) {
-                                $this->debug_message("*** Ignoring OIM maildata without <T>type</T>");
-                                continue;
-                            }
-                            $oim_type = $matches[1];
-                            if ($oim_type = 13)
-                                $network = 32;
-                            else
-                                $network = 1;
-                            preg_match('#<E>(.*)</E>#', $maildata, $matches);
-                            if (count($matches) == 0) {
-                                $this->debug_message("*** Ignoring OIM maildata without <E>sender</E>");
-                                continue;
-                            }
-                            $oim_sender = $matches[1];
-                            preg_match('#<I>(.*)</I>#', $maildata, $matches);
-                            if (count($matches) == 0) {
-                                $this->debug_message("*** Ignoring OIM maildata without <I>msgid</I>");
-                                continue;
-                            }
-                            $oim_msgid = $matches[1];
-                            preg_match('#<SZ>(.*)</SZ>#', $maildata, $matches);
-                            $oim_size = (count($matches) == 0) ? 0 : $matches[1];
-                            preg_match('#<RT>(.*)</RT>#', $maildata, $matches);
-                            $oim_time = (count($matches) == 0) ? 0 : $matches[1];
-                            $this->debug_message("*** OIM received from $oim_sender, Time: $oim_time, MSGID: $oim_msgid, size: $oim_size");
-                            $sMsg = $this->getOIM_message($oim_msgid);
-                            if ($sMsg === false) {
-                                $this->debug_message("*** Could not get OIM, msgid = $oim_msgid");
-                                if ($re_login) {
-                                    $this->debug_message("*** Could not get OIM via SOAP, and re-login already attempted, ignoring this OIM");
-                                    continue;
-                                }
-                                $aTickets = $this->get_passport_ticket();
-                                if (!$aTickets || !is_array($aTickets)) {
-                                    // failed to login? ignore it
-                                    $this->debug_message("*** Could not re-login, something wrong here, ignoring this OIM");
-                                    continue;
-                                }
-                                $re_login = true;
-                                $this->ticket = $aTickets;
-                                $this->debug_message("*** get new ticket, try it again");
-                                $sMsg = $this->getOIM_message($oim_msgid);
-                                if ($sMsg === false) {
-                                    $this->debug_message("*** Could not get OIM via SOAP, and re-login already attempted, ignoring this OIM");
-                                    continue;
-                                }
-                            }
-                            $this->debug_message("*** MSG (Offline) from $oim_sender (network: $network): $sMsg");
-                            $this->callHandler('IMin', array('sender' => $oim_sender, 'message' => $sMsg, 'network' => $network, 'offline' => true));
-                        }
+                        $this->callHandler('AddedToList', array('screenname' => $u_name.'@'.$u_domain, 'network' => $network));
                     }
-                    break;
+                    else
+                        $this->debug_message("*** Someone added us to their list: $data");
+                }
+                break;
 
-                case 'UBM':
-                    // randomly, we get UBM, this is the message from other network, like Yahoo!
-                    // NS: <<< UBM {email} $network $type {size}
-                    @list(/* UBM */, $from_email, $network, $type, $size,) = @explode(' ', $data);
-                    if (is_numeric($size) && $size > 0) {
-                        $data = $this->ns_readdata($size);
-                        $aLines = @explode("\n", $data);
-                        $header = true;
-                        $ignore = false;
-                        $sMsg = '';
-                        foreach ($aLines as $line) {
-                            $line = rtrim($line);
-                            if ($header) {
-                                if ($line === '') {
-                                    $header = false;
-                                    continue;
-                                }
-                                if (strncasecmp($line, 'TypingUser:', 11) == 0) {
+            case 'RML':
+                // randomly, we get RML command, someome remove us to their contact list for MSNP15
+                // NS: <<< RML 0 {size}
+                @list(/* RML */, /* 0 */, $size,) = @explode(' ', $data);
+                if (is_numeric($size) && $size > 0) {
+                    $data = $this->ns_readdata($size);
+                    preg_match('#<ml><d n="([^"]+)"><c n="([^"]+)"(.*) t="(\d*)"(.*) /></d></ml>#', $data, $matches);
+                    if (is_array($matches) && count($matches) > 0) {
+                        $u_domain = $matches[1];
+                        $u_name = $matches[2];
+                        $network = $matches[4];
+                        if (isset($this->aContactList[$u_domain][$u_name][$network])) {
+                            $aData = $this->aContactList[$u_domain][$u_name][$network];
+
+                            foreach ($aData as $list => $id)
+                                $this->delMemberFromList($id, $u_name.'@'.$u_domain, $network, $list);
+
+                            unset($this->aContactList[$u_domain][$u_name][$network]);
+                            $this->debug_message("*** Someone (network: $network) removed us from their list: $u_name@$u_domain");
+                        }
+                        else
+                            $this->debug_message("*** Someone (network: $network) removed us from their list (but not in our list): $u_name@$u_domain");
+
+                        $this->callHandler('RemovedFromList', array('screenname' => $u_name.'@'.$u_domain, 'network' => $network));
+                    }
+                    else
+                        $this->debug_message("*** Someone removed us from their list: $data");
+                }
+                break;
+
+            case 'MSG':
+                // randomly, we get MSG notification from server
+                // NS: <<< MSG Hotmail Hotmail {size}
+                @list(/* MSG */, /* Hotmail */, /* Hotmail */, $size,) = @explode(' ', $data);
+                if (is_numeric($size) && $size > 0) {
+                    $data = $this->ns_readdata($size);
+                    $aLines = @explode("\n", $data);
+                    $header = true;
+                    $ignore = false;
+                    $maildata = '';
+                    foreach ($aLines as $line) {
+                        $line = rtrim($line);
+                        if ($header) {
+                            if ($line === '') {
+                                $header = false;
+                                continue;
+                            }
+                            if (strncasecmp($line, 'Content-Type:', 13) == 0) {
+                                if (strpos($line, 'text/x-msmsgsinitialmdatanotification') === false && strpos($line, 'text/x-msmsgsoimnotification') === false) {
+                                    // we just need text/x-msmsgsinitialmdatanotification
+                                    // or text/x-msmsgsoimnotification
                                     $ignore = true;
                                     break;
                                 }
-                                continue;
-                            }
-                            $aSubLines = @explode("\r", $line);
-                            foreach ($aSubLines as $str) {
-                                if ($sMsg !== '')
-                                $sMsg .= "\n";
-                                $sMsg .= $str;
                             }
+                            continue;
                         }
-                        if ($ignore) {
-                            $this->debug_message("*** Ignoring message from $from_email: $line");
+                        if (strncasecmp($line, 'Mail-Data:', 10) == 0) {
+                            $maildata = trim(substr($line, 10));
                             break;
                         }
-                        $this->debug_message("*** MSG from $from_email (network: $network): $sMsg");
-                        $this->callHandler('IMin', array('sender' => $from_email, 'message' => $sMsg, 'network' => $network, 'offline' => false));
                     }
-                    break;
+                    if ($ignore) {
+                        $this->debug_message("*** Ignoring MSG for: $line");
+                        break;
+                    }
+                    if ($maildata == '') {
+                        $this->debug_message("*** Ignoring MSG not for OIM");
+                        break;
+                    }
+                    $re_login = false;
+                    if (strcasecmp($maildata, 'too-large') == 0) {
+                        $this->debug_message("*** Large mail-data, need to get the data via SOAP");
+                        $maildata = $this->getOIM_maildata();
+                        if ($maildata === false) {
+                            $this->debug_message("*** Could not get mail-data via SOAP");
 
-                case 'UBX':
-                    // randomly, we get UBX notification from server
-                    // NS: <<< UBX email {network} {size}
-                    @list(/* UBX */, /* email */, /* network */, $size,) = @explode(' ', $data);
-                    // we don't need the notification data, so just ignore it
-                    if (is_numeric($size) && $size > 0)
-                        $this->ns_readdata($size);
-                    break;
+                            // maybe we need to re-login again
+                            $aTickets = $this->get_passport_ticket();
+                            if (!$aTickets || !is_array($aTickets)) {
+                                // failed to login? ignore it
+                                $this->debug_message("*** Could not re-login, something wrong here, ignoring this OIM");
+                                break;
+                            }
+                            $re_login = true;
+                            $this->ticket = $aTickets;
+                            $this->debug_message("*** Got new ticket, trying again");
+                            $maildata = $this->getOIM_maildata();
+                            if ($maildata === false) {
+                                $this->debug_message("*** Could not get mail-data via SOAP, and re-login already attempted, ignoring this OIM");
+                                break;
+                            }
+                        }
+                    }
+                    // could be a lots of <M>...</M>, so we can't use preg_match here
+                    $p = $maildata;
+                    $aOIMs = array();
+                    while (1) {
+                        $start = strpos($p, '<M>');
+                        $end = strpos($p, '</M>');
+                        if ($start === false || $end === false || $start > $end) break;
+                        $end += 4;
+                        $sOIM = substr($p, $start, $end - $start);
+                        $aOIMs[] = $sOIM;
+                        $p = substr($p, $end);
+                    }
+                    if (count($aOIMs) == 0) {
+                        $this->debug_message("*** Ignoring empty OIM");
+                        break;
+                    }
+                    foreach ($aOIMs as $maildata) {
+                        // T: 11 for MSN, 13 for Yahoo
+                        // S: 6 for MSN, 7 for Yahoo
+                        // RT: the datetime received by server
+                        // RS: already read or not
+                        // SZ: size of message
+                        // E: sender
+                        // I: msgid
+                        // F: always 00000000-0000-0000-0000-000000000009
+                        // N: sender alias
+                        preg_match('#<T>(.*)</T>#', $maildata, $matches);
+                        if (count($matches) == 0) {
+                            $this->debug_message("*** Ignoring OIM maildata without <T>type</T>");
+                            continue;
+                        }
+                        $oim_type = $matches[1];
+                        if ($oim_type = 13)
+                            $network = 32;
+                        else
+                            $network = 1;
+                        preg_match('#<E>(.*)</E>#', $maildata, $matches);
+                        if (count($matches) == 0) {
+                            $this->debug_message("*** Ignoring OIM maildata without <E>sender</E>");
+                            continue;
+                        }
+                        $oim_sender = $matches[1];
+                        preg_match('#<I>(.*)</I>#', $maildata, $matches);
+                        if (count($matches) == 0) {
+                            $this->debug_message("*** Ignoring OIM maildata without <I>msgid</I>");
+                            continue;
+                        }
+                        $oim_msgid = $matches[1];
+                        preg_match('#<SZ>(.*)</SZ>#', $maildata, $matches);
+                        $oim_size = (count($matches) == 0) ? 0 : $matches[1];
+                        preg_match('#<RT>(.*)</RT>#', $maildata, $matches);
+                        $oim_time = (count($matches) == 0) ? 0 : $matches[1];
+                        $this->debug_message("*** OIM received from $oim_sender, Time: $oim_time, MSGID: $oim_msgid, size: $oim_size");
+                        $sMsg = $this->getOIM_message($oim_msgid);
+                        if ($sMsg === false) {
+                            $this->debug_message("*** Could not get OIM, msgid = $oim_msgid");
+                            if ($re_login) {
+                                $this->debug_message("*** Could not get OIM via SOAP, and re-login already attempted, ignoring this OIM");
+                                continue;
+                            }
+                            $aTickets = $this->get_passport_ticket();
+                            if (!$aTickets || !is_array($aTickets)) {
+                                // failed to login? ignore it
+                                $this->debug_message("*** Could not re-login, something wrong here, ignoring this OIM");
+                                continue;
+                            }
+                            $re_login = true;
+                            $this->ticket = $aTickets;
+                            $this->debug_message("*** get new ticket, try it again");
+                            $sMsg = $this->getOIM_message($oim_msgid);
+                            if ($sMsg === false) {
+                                $this->debug_message("*** Could not get OIM via SOAP, and re-login already attempted, ignoring this OIM");
+                                continue;
+                            }
+                        }
+                        $this->debug_message("*** MSG (Offline) from $oim_sender (network: $network): $sMsg");
+                        $this->callHandler('IMin', array('sender' => $oim_sender, 'message' => $sMsg, 'network' => $network, 'offline' => true));
+                    }
+                }
+                break;
 
-                case 'CHL':
-                    // randomly, we'll get challenge from server
-                    // NS: <<< CHL 0 {code}
-                    @list(/* CHL */, /* 0 */, $chl_code,) = @explode(' ', $data);
-                    $fingerprint = $this->getChallenge($chl_code);
-                    // NS: >>> QRY {id} {product_id} 32
-                    // NS: >>> fingerprint
-                    $this->ns_writeln("QRY $this->id ".PROD_ID.' 32');
-                    $this->ns_writedata($fingerprint);
+            case 'UBM':
+                // randomly, we get UBM, this is the message from other network, like Yahoo!
+                // NS: <<< UBM {email} $network $type {size}
+                @list(/* UBM */, $from_email, $network, $type, $size,) = @explode(' ', $data);
+                if (is_numeric($size) && $size > 0) {
+                    $data = $this->ns_readdata($size);
+                    $aLines = @explode("\n", $data);
+                    $header = true;
+                    $ignore = false;
+                    $sMsg = '';
+                    foreach ($aLines as $line) {
+                        $line = rtrim($line);
+                        if ($header) {
+                            if ($line === '') {
+                                $header = false;
+                                continue;
+                            }
+                            if (strncasecmp($line, 'TypingUser:', 11) == 0) {
+                                $ignore = true;
+                                break;
+                            }
+                            continue;
+                        }
+                        $aSubLines = @explode("\r", $line);
+                        foreach ($aSubLines as $str) {
+                            if ($sMsg !== '')
+                            $sMsg .= "\n";
+                            $sMsg .= $str;
+                        }
+                    }
+                    if ($ignore) {
+                        $this->debug_message("*** Ignoring message from $from_email: $line");
+                        break;
+                    }
+                    $this->debug_message("*** MSG from $from_email (network: $network): $sMsg");
+                    $this->callHandler('IMin', array('sender' => $from_email, 'message' => $sMsg, 'network' => $network, 'offline' => false));
+                }
+                break;
+
+            case 'UBX':
+                // randomly, we get UBX notification from server
+                // NS: <<< UBX email {network} {size}
+                @list(/* UBX */, /* email */, /* network */, $size,) = @explode(' ', $data);
+                // we don't need the notification data, so just ignore it
+                if (is_numeric($size) && $size > 0)
+                    $this->ns_readdata($size);
+                break;
+
+            case 'CHL':
+                // randomly, we'll get challenge from server
+                // NS: <<< CHL 0 {code}
+                @list(/* CHL */, /* 0 */, $chl_code,) = @explode(' ', $data);
+                $fingerprint = $this->getChallenge($chl_code);
+                // NS: >>> QRY {id} {product_id} 32
+                // NS: >>> fingerprint
+                $this->ns_writeln("QRY $this->id ".PROD_ID.' 32');
+                $this->ns_writedata($fingerprint);
+                $this->ns_writeln("CHG $this->id NLN $this->clientid");
+                if ($this->PhotoStickerFile !== false)
+                    $this->ns_writeln("CHG $this->id NLN $this->clientid ".rawurlencode($this->MsnObj($this->PhotoStickerFile)));
+                break;
+            case 'CHG':
+                // NS: <<< CHG {id} {status} {code}
+                // ignore it
+                // change our status to online first
+                break;
+
+            case 'XFR':
+                // sometimes, NS will redirect to another NS
+                // MSNP9
+                // NS: <<< XFR {id} NS {server} 0 {server}
+                // MSNP15
+                // NS: <<< XFR {id} NS {server} U D
+                // for normal switchboard XFR
+                // NS: <<< XFR {id} SB {server} CKI {cki} U messenger.msn.com 0
+                @list(/* XFR */, /* {id} */, $server_type, $server, /* CKI */, $cki_code, /* ... */) = @explode(' ', $data);
+                @list($ip, $port) = @explode(':', $server);
+                if ($server_type != 'SB') {
+                    // maybe exit?
+                    // this connection will close after XFR
+                    $this->nsLogout();
+                    continue;
+                }
+
+                $this->debug_message("NS: <<< XFR SB");
+                $user = array_shift($this->waitingForXFR);
+                            $bSBresult = $this->switchboard_control($ip, $port, $cki_code, $User, $Message);
+                /*
+                 $bSBresult = $this->switchboard_control($ip, $port, $cki_code, $aMSNUsers[$nCurrentUser], $sMessage);
+                 if ($bSBresult === false) {
+                 // error for switchboard
+                 $this->debug_message("!!! error for sending message to ".$aMSNUsers[$nCurrentUser]);
+                 $aOfflineUsers[] = $aMSNUsers[$nCurrentUser];
+                 }*/
+                break;
+            case 'QNG':
+                // NS: <<< QNG {time}
+                @list(/* QNG */, $ping_wait) = @explode(' ', $data);
+                $this->callHandler('Pong', $ping_wait);
+                break;
+
+            case 'RNG':
+                if ($this->PhotoStickerFile !== false)
+                    $this->ns_writeln("CHG $this->id NLN $this->clientid ".rawurlencode($this->MsnObj($this->PhotoStickerFile)));
+                else
                     $this->ns_writeln("CHG $this->id NLN $this->clientid");
-                    if ($this->PhotoStickerFile !== false)
-                        $this->ns_writeln("CHG $this->id NLN $this->clientid ".rawurlencode($this->MsnObj($this->PhotoStickerFile)));
-                    break;
-                case 'CHG':
-                    // NS: <<< CHG {id} {status} {code}
-                    // ignore it
-                    // change our status to online first
-                    break;
+                // someone is trying to talk to us
+                // NS: <<< RNG {session_id} {server} {auth_type} {ticket} {email} {alias} U {client} 0
+                $this->debug_message("NS: <<< RNG $data");
+                @list(/* RNG */, $sid, $server, /* auth_type */, $ticket, $email, $name, ) = @explode(' ', $data);
+                @list($sb_ip, $sb_port) = @explode(':', $server);
+                $this->debug_message("*** RING from $email, $sb_ip:$sb_port");
+                $this->addContact($email, 1, $email, true);
+                $this->connectToSBSession('Passive', $sb_ip, $sb_port, $email, array('sid' => $sid, 'ticket' => $ticket));
+                break;
+            case 'OUT':
+                // force logout from NS
+                // NS: <<< OUT xxx
+                $this->debug_message("*** LOGOUT from NS");
+                return $this->nsLogout();
 
-                case 'XFR':
-                    // sometimes, NS will redirect to another NS
-                    // MSNP9
-                    // NS: <<< XFR {id} NS {server} 0 {server}
-                    // MSNP15
-                    // NS: <<< XFR {id} NS {server} U D
-                    // for normal switchboard XFR
-                    // NS: <<< XFR {id} SB {server} CKI {cki} U messenger.msn.com 0
-                    @list(/* XFR */, /* {id} */, $server_type, $server, /* CKI */, $cki_code, /* ... */) = @explode(' ', $data);
-                    @list($ip, $port) = @explode(':', $server);
-                    if ($server_type != 'SB') {
-                        // maybe exit?
-                        // this connection will close after XFR
-                        $this->nsLogout();
-                        continue;
-                    }
+            default:
+                $code = substr($data,0,3);
+                if (is_numeric($code)) {
+                    $this->error = "Error code: $code, please check the detail information from: http://msnpiki.msnfanatic.com/index.php/Reference:Error_List";
+                    $this->debug_message("*** NS: $this->error");
 
-                    $this->debug_message("NS: <<< XFR SB");
-                    $user = array_shift($this->waitingForXFR);
-                                $bSBresult = $this->switchboard_control($ip, $port, $cki_code, $User, $Message);
-                    /*
-                     $bSBresult = $this->switchboard_control($ip, $port, $cki_code, $aMSNUsers[$nCurrentUser], $sMessage);
-                     if ($bSBresult === false) {
-                     // error for switchboard
-                     $this->debug_message("!!! error for sending message to ".$aMSNUsers[$nCurrentUser]);
-                     $aOfflineUsers[] = $aMSNUsers[$nCurrentUser];
-                     }*/
-                    break;
-                case 'QNG':
-                    // NS: <<< QNG {time}
-                    @list(/* QNG */, $ping_wait) = @explode(' ', $data);
-                    $this->callHandler('Pong', $ping_wait);
-                    break;
-
-                case 'RNG':
-                    if ($this->PhotoStickerFile !== false)
-                        $this->ns_writeln("CHG $this->id NLN $this->clientid ".rawurlencode($this->MsnObj($this->PhotoStickerFile)));
-                    else
-                        $this->ns_writeln("CHG $this->id NLN $this->clientid");
-                    // someone is trying to talk to us
-                    // NS: <<< RNG {session_id} {server} {auth_type} {ticket} {email} {alias} U {client} 0
-                    $this->debug_message("NS: <<< RNG $data");
-                    @list(/* RNG */, $sid, $server, /* auth_type */, $ticket, $email, $name, ) = @explode(' ', $data);
-                    @list($sb_ip, $sb_port) = @explode(':', $server);
-                    $this->debug_message("*** RING from $email, $sb_ip:$sb_port");
-                    $this->addContact($email, 1, $email, true);
-                    $this->connectToSBSession('Passive', $sb_ip, $sb_port, $email, array('sid' => $sid, 'ticket' => $ticket));
-                    break;
-                case 'OUT':
-                    // force logout from NS
-                    // NS: <<< OUT xxx
-                    $this->debug_message("*** LOGOUT from NS");
                     return $this->nsLogout();
-
-                default:
-                    $code = substr($data,0,3);
-                    if (is_numeric($code)) {
-                        $this->error = "Error code: $code, please check the detail information from: http://msnpiki.msnfanatic.com/index.php/Reference:Error_List";
-                        $this->debug_message("*** NS: $this->error");
-
-                        return $this->nsLogout();
-                    }
-                    break;
-            }
+                }
+                break;
         }
     }
 

From 956b24f05d93f05afe1c5071a5d9798c849efecc Mon Sep 17 00:00:00 2001
From: Luke Fitzgerald <lw.fitzgerald@googlemail.com>
Date: Wed, 16 Jun 2010 01:30:44 +0100
Subject: [PATCH 058/655] Access constants and static methods properly ;)

---
 plugins/Msn/extlib/phpmsnclass/msn.class.php | 86 ++++++++++----------
 1 file changed, 43 insertions(+), 43 deletions(-)

diff --git a/plugins/Msn/extlib/phpmsnclass/msn.class.php b/plugins/Msn/extlib/phpmsnclass/msn.class.php
index af9a45e49d..5c1a83940b 100644
--- a/plugins/Msn/extlib/phpmsnclass/msn.class.php
+++ b/plugins/Msn/extlib/phpmsnclass/msn.class.php
@@ -212,10 +212,10 @@ class MSN {
         // NS: >> VER {id} MSNP9 CVR0
         // MSNP15
         // NS: >>> VER {id} MSNP15 CVR0
-        $this->ns_writeln("VER $this->id ".PROTOCOL.' CVR0');
+        $this->ns_writeln("VER $this->id ".self::PROTOCOL.' CVR0');
 
         $start_tm = time();
-        while (!socketcheck($this->NSfp)) {
+        while (!self::socketcheck($this->NSfp)) {
             $data = $this->ns_readln();
             // no data?
             if ($data === false) {
@@ -238,7 +238,7 @@ class MSN {
                     // MSNP15
                     // NS: <<< VER {id} MSNP15 CVR0
                     // NS: >>> CVR {id} 0x0409 winnt 5.1 i386 MSMSGS 8.1.0178 msmsgs {user}
-                    $this->ns_writeln("CVR $this->id 0x0409 winnt 5.1 i386 MSMSGS ".BUILDVER." msmsgs $user");
+                    $this->ns_writeln("CVR $this->id 0x0409 winnt 5.1 i386 MSMSGS ".self::BUILDVER." msmsgs $user");
                     break;
 
                 case 'CVR':
@@ -248,7 +248,7 @@ class MSN {
                     // MSNP15
                     // NS: <<< CVR {id} {ver_list} {download_serve} ....
                     // NS: >>> USR {id} SSO I {user}
-                    $this->ns_writeln("USR $this->id ".LOGIN_METHOD." I $user");
+                    $this->ns_writeln("USR $this->id ".self::LOGIN_METHOD." I $user");
                     break;
 
                 case 'USR':
@@ -281,7 +281,7 @@ class MSN {
                     $login_code = $this->generateLoginBLOB($secret, $nonce);
 
                     // NS: >>> USR {id} SSO S {ticket} {login_code}
-                    $this->ns_writeln("USR $this->id ".LOGIN_METHOD." S $ticket $login_code");
+                    $this->ns_writeln("USR $this->id ".self::LOGIN_METHOD." S $ticket $login_code");
                     $this->authed = true;
                     break;
 
@@ -307,7 +307,7 @@ class MSN {
                     // NS: >> VER {id} MSNP9 CVR0
                     // MSNP15
                     // NS: >>> VER {id} MSNP15 CVR0
-                    $this->ns_writeln("VER $this->id ".PROTOCOL.' CVR0');
+                    $this->ns_writeln("VER $this->id ".self::PROTOCOL.' CVR0');
                     break;
 
                 case 'GCF':
@@ -460,7 +460,7 @@ class MSN {
             $len = strlen($str);
             $this->ns_writeln("UUX $this->id $len");
             $this->ns_writedata($str);
-            if (!socketcheck($this->NSfp)) {
+            if (!self::socketcheck($this->NSfp)) {
                 $this->debug_message('*** Connected, waiting for commands');
                 break;
             } else {
@@ -508,7 +508,7 @@ class MSN {
      */
     private function nsReceive() {
         // Sign in again if not signed in or socket failed
-        if (!is_resource($this->NSfp) || socketcheck($this->NSfp)) {
+        if (!is_resource($this->NSfp) || self::socketcheck($this->NSfp)) {
             $this->callHandler('Reconnect');
             $this->NSRetryWait($this->retry_wait);
             $this->signon();
@@ -836,7 +836,7 @@ class MSN {
                 $fingerprint = $this->getChallenge($chl_code);
                 // NS: >>> QRY {id} {product_id} 32
                 // NS: >>> fingerprint
-                $this->ns_writeln("QRY $this->id ".PROD_ID.' 32');
+                $this->ns_writeln("QRY $this->id ".self::PROD_ID.' 32');
                 $this->ns_writedata($fingerprint);
                 $this->ns_writeln("CHG $this->id NLN $this->clientid");
                 if ($this->PhotoStickerFile !== false)
@@ -1433,7 +1433,7 @@ class MSN {
     * @return void
     */
     private function endSBSession($socket, $killsession = false) {
-        if (!socketcheck($socket)) {
+        if (!self::socketcheck($socket)) {
             $this->sb_writeln($socket, $fake = 0, 'OUT');
         }
         @fclose($socket);
@@ -1455,7 +1455,7 @@ class MSN {
      */
     private function sendMessageViaSB($to, $message) {
         $socket = $this->switchBoardSessionLookup[$to];
-        if (socketcheck($socket)) {
+        if (self::socketcheck($socket)) {
             return false;
         }
 
@@ -1614,15 +1614,15 @@ class MSN {
 </soap:Envelope>';
 
         $header_array = array(
-            'SOAPAction: '.OIM_MAILDATA_SOAP,
+            'SOAPAction: '.self::OIM_MAILDATA_SOAP,
             'Content-Type: text/xml; charset=utf-8',
-            'User-Agent: Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1; Messenger '.BUILDVER.')'
+            'User-Agent: Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1; Messenger '.self::BUILDVER.')'
         );
 
-        $this->debug_message('*** URL: '.OIM_MAILDATA_URL);
+        $this->debug_message('*** URL: '.self::OIM_MAILDATA_URL);
         $this->debug_message("*** Sending SOAP:\n$XML");
         $curl = curl_init();
-        curl_setopt($curl, CURLOPT_URL, OIM_MAILDATA_URL);
+        curl_setopt($curl, CURLOPT_URL, self::OIM_MAILDATA_URL);
         curl_setopt($curl, CURLOPT_HTTPHEADER, $header_array);
         curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
         curl_setopt($curl, CURLOPT_FOLLOWLOCATION, 1);
@@ -1684,15 +1684,15 @@ class MSN {
 </soap:Envelope>';
 
         $header_array = array(
-            'SOAPAction: '.OIM_READ_SOAP,
+            'SOAPAction: '.self::OIM_READ_SOAP,
             'Content-Type: text/xml; charset=utf-8',
-            'User-Agent: Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1; Messenger '.BUILDVER.')'
+            'User-Agent: Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1; Messenger '.self::BUILDVER.')'
         );
 
-        $this->debug_message('*** URL: '.OIM_READ_URL);
+        $this->debug_message('*** URL: '.self::OIM_READ_URL);
         $this->debug_message("*** Sending SOAP:\n$XML");
         $curl = curl_init();
-        curl_setopt($curl, CURLOPT_URL, OIM_READ_URL);
+        curl_setopt($curl, CURLOPT_URL, self::OIM_READ_URL);
         curl_setopt($curl, CURLOPT_HTTPHEADER, $header_array);
         curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
         curl_setopt($curl, CURLOPT_FOLLOWLOCATION, 1);
@@ -1760,15 +1760,15 @@ class MSN {
 </soap:Envelope>';
 
         $header_array = array(
-            'SOAPAction: '.OIM_DEL_SOAP,
+            'SOAPAction: '.self::OIM_DEL_SOAP,
             'Content-Type: text/xml; charset=utf-8',
-            'User-Agent: Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1; Messenger '.BUILDVER.')'
+            'User-Agent: Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1; Messenger '.self::BUILDVER.')'
         );
 
-        $this->debug_message('*** URL: '.OIM_DEL_URL);
+        $this->debug_message('*** URL: '.self::OIM_DEL_URL);
         $this->debug_message("*** Sending SOAP:\n$XML");
         $curl = curl_init();
-        curl_setopt($curl, CURLOPT_URL, OIM_DEL_URL);
+        curl_setopt($curl, CURLOPT_URL, self::OIM_DEL_URL);
         curl_setopt($curl, CURLOPT_HTTPHEADER, $header_array);
         curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
         curl_setopt($curl, CURLOPT_FOLLOWLOCATION, 1);
@@ -1807,11 +1807,11 @@ class MSN {
         xml:lang="zh-TW"
         proxy="MSNMSGR"
         xmlns="http://messenger.msn.com/ws/2004/09/oim/"
-        msnpVer="'.PROTOCOL.'"
-        buildVer="'.BUILDVER.'"/>
+        msnpVer="'.self::PROTOCOL.'"
+        buildVer="'.self::BUILDVER.'"/>
   <To memberName="'.$to.'" xmlns="http://messenger.msn.com/ws/2004/09/oim/"/>
   <Ticket passport="'.htmlspecialchars($this->ticket['oim_ticket']).'"
-          appid="'.PROD_ID.'"
+          appid="'.self::PROD_ID.'"
           lockkey="'.$lockkey.'"
           xmlns="http://messenger.msn.com/ws/2004/09/oim/"/>
   <Sequence xmlns="http://schemas.xmlsoap.org/ws/2003/03/rm">
@@ -1834,15 +1834,15 @@ X-OIM-Sequence-Num: 1
 </soap:Envelope>';
 
         $header_array = array(
-            'SOAPAction: '.OIM_SEND_SOAP,
+            'SOAPAction: '.self::OIM_SEND_SOAP,
             'Content-Type: text/xml',
-            'User-Agent: Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1; Messenger '.BUILDVER.')'
+            'User-Agent: Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1; Messenger '.self::BUILDVER.')'
         );
 
-        $this->debug_message('*** URL: '.OIM_SEND_URL);
+        $this->debug_message('*** URL: '.self::OIM_SEND_URL);
         $this->debug_message("*** Sending SOAP:\n$XML");
         $curl = curl_init();
-        curl_setopt($curl, CURLOPT_URL, OIM_SEND_URL);
+        curl_setopt($curl, CURLOPT_URL, self::OIM_SEND_URL);
         curl_setopt($curl, CURLOPT_HTTPHEADER, $header_array);
         curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
         curl_setopt($curl, CURLOPT_FOLLOWLOCATION, 1);
@@ -2095,15 +2095,15 @@ X-OIM-Sequence-Num: 1
 </soap:Envelope>';
 
         $header_array = array(
-            'SOAPAction: '.DELMEMBER_SOAP,
+            'SOAPAction: '.self::DELMEMBER_SOAP,
             'Content-Type: text/xml; charset=utf-8',
             'User-Agent: MSN Explorer/9.0 (MSN 8.0; TmstmpExt)'
         );
 
-        $this->debug_message('*** URL: '.DELMEMBER_URL);
+        $this->debug_message('*** URL: '.self::DELMEMBER_URL);
         $this->debug_message("*** Sending SOAP:\n$XML");
         $curl = curl_init();
-        curl_setopt($curl, CURLOPT_URL, DELMEMBER_URL);
+        curl_setopt($curl, CURLOPT_URL, self::DELMEMBER_URL);
         curl_setopt($curl, CURLOPT_HTTPHEADER, $header_array);
         curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
         curl_setopt($curl, CURLOPT_FOLLOWLOCATION, 1);
@@ -2232,15 +2232,15 @@ X-OIM-Sequence-Num: 1
 </soap:Body>
 </soap:Envelope>';
         $header_array = array(
-            'SOAPAction: '.ADDMEMBER_SOAP,
+            'SOAPAction: '.self::ADDMEMBER_SOAP,
             'Content-Type: text/xml; charset=utf-8',
             'User-Agent: MSN Explorer/9.0 (MSN 8.0; TmstmpExt)'
         );
 
-        $this->debug_message('*** URL: '.ADDMEMBER_URL);
+        $this->debug_message('*** URL: '.self::ADDMEMBER_URL);
         $this->debug_message("*** Sending SOAP:\n$XML");
         $curl = curl_init();
-        curl_setopt($curl, CURLOPT_URL, ADDMEMBER_URL);
+        curl_setopt($curl, CURLOPT_URL, self::ADDMEMBER_URL);
         curl_setopt($curl, CURLOPT_HTTPHEADER, $header_array);
         curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
         curl_setopt($curl, CURLOPT_FOLLOWLOCATION, 1);
@@ -2310,14 +2310,14 @@ X-OIM-Sequence-Num: 1
 </soap:Body>
 </soap:Envelope>';
         $header_array = array(
-            'SOAPAction: '.MEMBERSHIP_SOAP,
+            'SOAPAction: '.self::MEMBERSHIP_SOAP,
             'Content-Type: text/xml; charset=utf-8',
             'User-Agent: MSN Explorer/9.0 (MSN 8.0; TmstmpExt)'
         );
-        $this->debug_message('*** URL: '.MEMBERSHIP_URL);
+        $this->debug_message('*** URL: '.self::MEMBERSHIP_URL);
         $this->debug_message("*** Sending SOAP:\n$XML");
         $curl = curl_init();
-        curl_setopt($curl, CURLOPT_URL, MEMBERSHIP_URL);
+        curl_setopt($curl, CURLOPT_URL, self::MEMBERSHIP_URL);
         curl_setopt($curl, CURLOPT_HTTPHEADER, $header_array);
         curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
         curl_setopt($curl, CURLOPT_FOLLOWLOCATION, 1);
@@ -2642,7 +2642,7 @@ X-OIM-Sequence-Num: 1
         // MSNP15
         // http://msnpiki.msnfanatic.com/index.php/MSNP11:Challenges
         // Step 1: The MD5 Hash
-        $md5Hash = md5($code.PROD_KEY);
+        $md5Hash = md5($code.self::PROD_KEY);
         $aMD5 = @explode("\0", chunk_split($md5Hash, 8, "\0"));
         for ($i = 0; $i < 4; $i++) {
             $aMD5[$i] = implode('', array_reverse(@explode("\0", chunk_split($aMD5[$i], 2, "\0"))));
@@ -2650,7 +2650,7 @@ X-OIM-Sequence-Num: 1
         }
 
         // Step 2: A new string
-        $chl_id = $code.PROD_ID;
+        $chl_id = $code.self::PROD_ID;
         $chl_id .= str_repeat('0', 8 - (strlen($chl_id) % 8));
 
         $aID = @explode("\0", substr(chunk_split($chl_id, 4, "\0"), 0, -1));
@@ -2700,7 +2700,7 @@ X-OIM-Sequence-Num: 1
         // $key = bcadd(bcmul($high, 0x100000000), $low);
 
         // Step 4: Using the key
-        $md5Hash = md5($code.PROD_KEY);
+        $md5Hash = md5($code.self::PROD_KEY);
         $aHash = @explode("\0", chunk_split($md5Hash, 8, "\0"));
 
         $hash = '';
@@ -2766,7 +2766,7 @@ X-OIM-Sequence-Num: 1
         $password = htmlspecialchars($this->password);
 
         if ($url === '')
-            $passport_url = PASSPORT_URL;
+            $passport_url = self::PASSPORT_URL;
         else
             $passport_url = $url;
 

From 62a7f102757d51eab83134621763deeb313847ce Mon Sep 17 00:00:00 2001
From: Luke Fitzgerald <lw.fitzgerald@googlemail.com>
Date: Wed, 16 Jun 2010 01:43:55 +0100
Subject: [PATCH 059/655] $killsession parameter not needed - we'll kill the
 session later anyway

---
 plugins/Msn/extlib/phpmsnclass/msn.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/Msn/extlib/phpmsnclass/msn.class.php b/plugins/Msn/extlib/phpmsnclass/msn.class.php
index 5c1a83940b..74a7e3eec1 100644
--- a/plugins/Msn/extlib/phpmsnclass/msn.class.php
+++ b/plugins/Msn/extlib/phpmsnclass/msn.class.php
@@ -1432,7 +1432,7 @@ class MSN {
     * @param boolean $killsession Whether to delete the session
     * @return void
     */
-    private function endSBSession($socket, $killsession = false) {
+    private function endSBSession($socket) {
         if (!self::socketcheck($socket)) {
             $this->sb_writeln($socket, $fake = 0, 'OUT');
         }

From 0b2bbd20aa015f5d9d48c4264f56e13324346b4a Mon Sep 17 00:00:00 2001
From: Luke Fitzgerald <lw.fitzgerald@googlemail.com>
Date: Wed, 16 Jun 2010 01:55:39 +0100
Subject: [PATCH 060/655] Added Phergie PHP IRC library

---
 plugins/Irc/extlib/phergie/.gitignore         |   2 +
 plugins/Irc/extlib/phergie/LICENSE            |  27 +
 .../Irc/extlib/phergie/Phergie/Autoload.php   |  84 ++
 plugins/Irc/extlib/phergie/Phergie/Bot.php    | 390 +++++++
 plugins/Irc/extlib/phergie/Phergie/Config.php | 170 ++++
 .../phergie/Phergie/Config/Exception.php      |  44 +
 .../Irc/extlib/phergie/Phergie/Connection.php | 359 +++++++
 .../phergie/Phergie/Connection/Exception.php  |  44 +
 .../phergie/Phergie/Connection/Handler.php    | 130 +++
 .../phergie/Phergie/Driver/Abstract.php       | 301 ++++++
 .../phergie/Phergie/Driver/Exception.php      |  49 +
 .../extlib/phergie/Phergie/Driver/Streams.php | 696 +++++++++++++
 .../extlib/phergie/Phergie/Event/Abstract.php |  62 ++
 .../extlib/phergie/Phergie/Event/Command.php  |  62 ++
 .../phergie/Phergie/Event/Exception.php       |  38 +
 .../extlib/phergie/Phergie/Event/Handler.php  | 174 ++++
 .../extlib/phergie/Phergie/Event/Request.php  | 450 +++++++++
 .../extlib/phergie/Phergie/Event/Response.php | 953 ++++++++++++++++++
 .../Irc/extlib/phergie/Phergie/Exception.php  |  33 +
 .../Irc/extlib/phergie/Phergie/Hostmask.php   | 217 ++++
 .../phergie/Phergie/Hostmask/Exception.php    |  37 +
 .../phergie/Phergie/Plugin/Abstract.php       | 582 +++++++++++
 .../Irc/extlib/phergie/Phergie/Plugin/Acl.php |  92 ++
 .../extlib/phergie/Phergie/Plugin/AltNick.php |  95 ++
 .../phergie/Phergie/Plugin/AudioScrobbler.php | 191 ++++
 .../phergie/Phergie/Plugin/AutoJoin.php       |  69 ++
 .../phergie/Phergie/Plugin/BeerScore.php      | 156 +++
 .../extlib/phergie/Phergie/Plugin/Cache.php   | 106 ++
 .../extlib/phergie/Phergie/Plugin/Command.php | 134 +++
 .../extlib/phergie/Phergie/Plugin/Ctcp.php    |  91 ++
 .../extlib/phergie/Phergie/Plugin/Daddy.php   |  60 ++
 .../phergie/Phergie/Plugin/Exception.php      | 113 +++
 .../extlib/phergie/Phergie/Plugin/Google.php  | 375 +++++++
 .../extlib/phergie/Phergie/Plugin/Handler.php | 412 ++++++++
 .../extlib/phergie/Phergie/Plugin/Help.php    | 250 +++++
 .../extlib/phergie/Phergie/Plugin/Http.php    | 275 +++++
 .../phergie/Phergie/Plugin/Http/Response.php  | 228 +++++
 .../phergie/Phergie/Plugin/Invisible.php      |  44 +
 .../extlib/phergie/Phergie/Plugin/Join.php    |  56 +
 .../extlib/phergie/Phergie/Plugin/Part.php    |  55 +
 .../Irc/extlib/phergie/Phergie/Plugin/Php.php |  88 ++
 .../phergie/Phergie/Plugin/Php/Source.php     |  46 +
 .../Phergie/Plugin/Php/Source/Local.php       | 203 ++++
 .../extlib/phergie/Phergie/Plugin/Ping.php    | 162 +++
 .../extlib/phergie/Phergie/Plugin/Pong.php    |  44 +
 .../phergie/Phergie/Plugin/Prioritize.php     |  99 ++
 .../extlib/phergie/Phergie/Plugin/Puppet.php  |  89 ++
 .../extlib/phergie/Phergie/Plugin/Quit.php    |  60 ++
 .../extlib/phergie/Phergie/Plugin/Remind.php  | 360 +++++++
 .../phergie/Phergie/Plugin/TerryChay.php      | 109 ++
 .../Phergie/Plugin/TheFuckingWeather.php      | 150 +++
 .../extlib/phergie/Phergie/Plugin/Time.php    |  72 ++
 .../extlib/phergie/Phergie/Plugin/Twitter.php | 223 ++++
 .../Phergie/Plugin/Twitter/laconica.class.php |  41 +
 .../Phergie/Plugin/Twitter/twitter.class.php  | 287 ++++++
 .../Irc/extlib/phergie/Phergie/Plugin/Url.php | 739 ++++++++++++++
 .../Phergie/Plugin/Url/Shorten/Abstract.php   |  41 +
 .../Phergie/Plugin/Url/Shorten/Trim.php       |  44 +
 .../phergie/Phergie/Plugin/UserInfo.php       | 413 ++++++++
 .../phergie/Phergie/Process/Abstract.php      | 130 +++
 .../extlib/phergie/Phergie/Process/Async.php  | 161 +++
 .../phergie/Phergie/Process/Exception.php     |  33 +
 .../phergie/Phergie/Process/Standard.php      |  61 ++
 .../phergie/Phergie/Tools/LogViewer/INSTALL   |  24 +
 .../phergie/Phergie/Tools/LogViewer/index.php | 368 +++++++
 .../Irc/extlib/phergie/Phergie/Tools/README   |   6 +
 .../extlib/phergie/Phergie/Ui/Abstract.php    | 116 +++
 .../Irc/extlib/phergie/Phergie/Ui/Console.php | 223 ++++
 .../Irc/extlib/phergie/PhergiePackageTask.php | 110 ++
 plugins/Irc/extlib/phergie/README             |  11 +
 plugins/Irc/extlib/phergie/Settings.php.dist  |  97 ++
 .../Tests/Phergie/Plugin/HandlerTest.php      | 461 +++++++++
 .../phergie/Tests/Phergie/Plugin/Mock.php     |  49 +
 .../phergie/Tests/Phergie/Plugin/PingTest.php | 175 ++++
 .../phergie/Tests/Phergie/Plugin/PongTest.php |  74 ++
 .../Tests/Phergie/Plugin/TerryChayTest.php    |  99 ++
 .../phergie/Tests/Phergie/Plugin/TestCase.php | 207 ++++
 .../TestNonInstantiablePluginFromFile.php     |  43 +
 .../Irc/extlib/phergie/Tests/TestHelper.php   |  26 +
 plugins/Irc/extlib/phergie/Tests/phpunit.xml  |  26 +
 plugins/Irc/extlib/phergie/build.xml          | 298 ++++++
 plugins/Irc/extlib/phergie/phergie.bat        |  14 +
 plugins/Irc/extlib/phergie/phergie.php        |  54 +
 83 files changed, 13842 insertions(+)
 create mode 100644 plugins/Irc/extlib/phergie/.gitignore
 create mode 100644 plugins/Irc/extlib/phergie/LICENSE
 create mode 100755 plugins/Irc/extlib/phergie/Phergie/Autoload.php
 create mode 100755 plugins/Irc/extlib/phergie/Phergie/Bot.php
 create mode 100755 plugins/Irc/extlib/phergie/Phergie/Config.php
 create mode 100644 plugins/Irc/extlib/phergie/Phergie/Config/Exception.php
 create mode 100755 plugins/Irc/extlib/phergie/Phergie/Connection.php
 create mode 100644 plugins/Irc/extlib/phergie/Phergie/Connection/Exception.php
 create mode 100644 plugins/Irc/extlib/phergie/Phergie/Connection/Handler.php
 create mode 100755 plugins/Irc/extlib/phergie/Phergie/Driver/Abstract.php
 create mode 100755 plugins/Irc/extlib/phergie/Phergie/Driver/Exception.php
 create mode 100755 plugins/Irc/extlib/phergie/Phergie/Driver/Streams.php
 create mode 100644 plugins/Irc/extlib/phergie/Phergie/Event/Abstract.php
 create mode 100644 plugins/Irc/extlib/phergie/Phergie/Event/Command.php
 create mode 100644 plugins/Irc/extlib/phergie/Phergie/Event/Exception.php
 create mode 100644 plugins/Irc/extlib/phergie/Phergie/Event/Handler.php
 create mode 100755 plugins/Irc/extlib/phergie/Phergie/Event/Request.php
 create mode 100755 plugins/Irc/extlib/phergie/Phergie/Event/Response.php
 create mode 100755 plugins/Irc/extlib/phergie/Phergie/Exception.php
 create mode 100755 plugins/Irc/extlib/phergie/Phergie/Hostmask.php
 create mode 100644 plugins/Irc/extlib/phergie/Phergie/Hostmask/Exception.php
 create mode 100755 plugins/Irc/extlib/phergie/Phergie/Plugin/Abstract.php
 create mode 100755 plugins/Irc/extlib/phergie/Phergie/Plugin/Acl.php
 create mode 100755 plugins/Irc/extlib/phergie/Phergie/Plugin/AltNick.php
 create mode 100755 plugins/Irc/extlib/phergie/Phergie/Plugin/AudioScrobbler.php
 create mode 100755 plugins/Irc/extlib/phergie/Phergie/Plugin/AutoJoin.php
 create mode 100644 plugins/Irc/extlib/phergie/Phergie/Plugin/BeerScore.php
 create mode 100644 plugins/Irc/extlib/phergie/Phergie/Plugin/Cache.php
 create mode 100755 plugins/Irc/extlib/phergie/Phergie/Plugin/Command.php
 create mode 100755 plugins/Irc/extlib/phergie/Phergie/Plugin/Ctcp.php
 create mode 100644 plugins/Irc/extlib/phergie/Phergie/Plugin/Daddy.php
 create mode 100755 plugins/Irc/extlib/phergie/Phergie/Plugin/Exception.php
 create mode 100644 plugins/Irc/extlib/phergie/Phergie/Plugin/Google.php
 create mode 100755 plugins/Irc/extlib/phergie/Phergie/Plugin/Handler.php
 create mode 100644 plugins/Irc/extlib/phergie/Phergie/Plugin/Help.php
 create mode 100644 plugins/Irc/extlib/phergie/Phergie/Plugin/Http.php
 create mode 100644 plugins/Irc/extlib/phergie/Phergie/Plugin/Http/Response.php
 create mode 100755 plugins/Irc/extlib/phergie/Phergie/Plugin/Invisible.php
 create mode 100755 plugins/Irc/extlib/phergie/Phergie/Plugin/Join.php
 create mode 100755 plugins/Irc/extlib/phergie/Phergie/Plugin/Part.php
 create mode 100644 plugins/Irc/extlib/phergie/Phergie/Plugin/Php.php
 create mode 100644 plugins/Irc/extlib/phergie/Phergie/Plugin/Php/Source.php
 create mode 100644 plugins/Irc/extlib/phergie/Phergie/Plugin/Php/Source/Local.php
 create mode 100755 plugins/Irc/extlib/phergie/Phergie/Plugin/Ping.php
 create mode 100755 plugins/Irc/extlib/phergie/Phergie/Plugin/Pong.php
 create mode 100755 plugins/Irc/extlib/phergie/Phergie/Plugin/Prioritize.php
 create mode 100644 plugins/Irc/extlib/phergie/Phergie/Plugin/Puppet.php
 create mode 100755 plugins/Irc/extlib/phergie/Phergie/Plugin/Quit.php
 create mode 100644 plugins/Irc/extlib/phergie/Phergie/Plugin/Remind.php
 create mode 100644 plugins/Irc/extlib/phergie/Phergie/Plugin/TerryChay.php
 create mode 100644 plugins/Irc/extlib/phergie/Phergie/Plugin/TheFuckingWeather.php
 create mode 100644 plugins/Irc/extlib/phergie/Phergie/Plugin/Time.php
 create mode 100644 plugins/Irc/extlib/phergie/Phergie/Plugin/Twitter.php
 create mode 100644 plugins/Irc/extlib/phergie/Phergie/Plugin/Twitter/laconica.class.php
 create mode 100644 plugins/Irc/extlib/phergie/Phergie/Plugin/Twitter/twitter.class.php
 create mode 100644 plugins/Irc/extlib/phergie/Phergie/Plugin/Url.php
 create mode 100644 plugins/Irc/extlib/phergie/Phergie/Plugin/Url/Shorten/Abstract.php
 create mode 100644 plugins/Irc/extlib/phergie/Phergie/Plugin/Url/Shorten/Trim.php
 create mode 100644 plugins/Irc/extlib/phergie/Phergie/Plugin/UserInfo.php
 create mode 100755 plugins/Irc/extlib/phergie/Phergie/Process/Abstract.php
 create mode 100644 plugins/Irc/extlib/phergie/Phergie/Process/Async.php
 create mode 100755 plugins/Irc/extlib/phergie/Phergie/Process/Exception.php
 create mode 100644 plugins/Irc/extlib/phergie/Phergie/Process/Standard.php
 create mode 100755 plugins/Irc/extlib/phergie/Phergie/Tools/LogViewer/INSTALL
 create mode 100755 plugins/Irc/extlib/phergie/Phergie/Tools/LogViewer/index.php
 create mode 100755 plugins/Irc/extlib/phergie/Phergie/Tools/README
 create mode 100644 plugins/Irc/extlib/phergie/Phergie/Ui/Abstract.php
 create mode 100644 plugins/Irc/extlib/phergie/Phergie/Ui/Console.php
 create mode 100644 plugins/Irc/extlib/phergie/PhergiePackageTask.php
 create mode 100644 plugins/Irc/extlib/phergie/README
 create mode 100755 plugins/Irc/extlib/phergie/Settings.php.dist
 create mode 100644 plugins/Irc/extlib/phergie/Tests/Phergie/Plugin/HandlerTest.php
 create mode 100755 plugins/Irc/extlib/phergie/Tests/Phergie/Plugin/Mock.php
 create mode 100644 plugins/Irc/extlib/phergie/Tests/Phergie/Plugin/PingTest.php
 create mode 100644 plugins/Irc/extlib/phergie/Tests/Phergie/Plugin/PongTest.php
 create mode 100644 plugins/Irc/extlib/phergie/Tests/Phergie/Plugin/TerryChayTest.php
 create mode 100644 plugins/Irc/extlib/phergie/Tests/Phergie/Plugin/TestCase.php
 create mode 100755 plugins/Irc/extlib/phergie/Tests/Phergie/Plugin/TestNonInstantiablePluginFromFile.php
 create mode 100644 plugins/Irc/extlib/phergie/Tests/TestHelper.php
 create mode 100644 plugins/Irc/extlib/phergie/Tests/phpunit.xml
 create mode 100644 plugins/Irc/extlib/phergie/build.xml
 create mode 100644 plugins/Irc/extlib/phergie/phergie.bat
 create mode 100755 plugins/Irc/extlib/phergie/phergie.php

diff --git a/plugins/Irc/extlib/phergie/.gitignore b/plugins/Irc/extlib/phergie/.gitignore
new file mode 100644
index 0000000000..553fe8e258
--- /dev/null
+++ b/plugins/Irc/extlib/phergie/.gitignore
@@ -0,0 +1,2 @@
+Settings.php
+*.db
diff --git a/plugins/Irc/extlib/phergie/LICENSE b/plugins/Irc/extlib/phergie/LICENSE
new file mode 100644
index 0000000000..d7d23420ac
--- /dev/null
+++ b/plugins/Irc/extlib/phergie/LICENSE
@@ -0,0 +1,27 @@
+Copyright (c) 2010, Phergie Development Team 
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without 
+modification, are permitted provided that the following conditions are met:
+
+Redistributions of source code must retain the above copyright notice, this 
+list of conditions and the following disclaimer.
+
+Redistributions in binary form must reproduce the above copyright notice, 
+this list of conditions and the following disclaimer in the documentation 
+and/or other materials provided with the distribution.
+
+Neither the name of the Phergie Development Team nor the names of its 
+contributors may be used to endorse or promote products derived from this 
+software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/plugins/Irc/extlib/phergie/Phergie/Autoload.php b/plugins/Irc/extlib/phergie/Phergie/Autoload.php
new file mode 100755
index 0000000000..b03fe2ae10
--- /dev/null
+++ b/plugins/Irc/extlib/phergie/Phergie/Autoload.php
@@ -0,0 +1,84 @@
+<?php
+/**
+ * Phergie 
+ *
+ * PHP version 5
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.
+ * It is also available through the world-wide-web at this URL:
+ * http://phergie.org/license
+ *
+ * @category  Phergie 
+ * @package   Phergie
+ * @author    Phergie Development Team <team@phergie.org>
+ * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
+ * @license   http://phergie.org/license New BSD License
+ * @link      http://pear.phergie.org/package/Phergie
+ */
+
+/**
+ * Autoloader for Phergie classes.
+ *
+ * @category Phergie 
+ * @package  Phergie
+ * @author   Phergie Development Team <team@phergie.org>
+ * @license  http://phergie.org/license New BSD License
+ * @link     http://pear.phergie.org/package/Phergie
+ */
+class Phergie_Autoload
+{
+    /**
+     * Constructor to add the base Phergie path to the include_path.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        $path = dirname(__FILE__);
+        $includePath = get_include_path();
+        $includePathList = explode(PATH_SEPARATOR, $includePath); 
+        if (!in_array($path, $includePathList)) {
+            self::addPath($path);
+        }
+    }
+
+    /**
+     * Autoload callback for loading class files.
+     *
+     * @param string $class Class to load
+     *
+     * @return void
+     */
+    public function load($class)
+    {
+        if (substr($class, 0, 8) == 'Phergie_') {
+            $class = substr($class, 8);
+        }
+        include str_replace('_', DIRECTORY_SEPARATOR, $class) . '.php';
+    }
+
+    /**
+     * Registers an instance of this class as an autoloader.
+     *
+     * @return void
+     */
+    public static function registerAutoloader()
+    {
+        spl_autoload_register(array(new self, 'load'));
+    }
+
+    /**
+     * Add a path to the include path.
+     *
+     * @param string $path Path to add
+     *
+     * @return void
+     */
+    public static function addPath($path)
+    {
+        set_include_path($path . PATH_SEPARATOR . get_include_path());
+    }
+}
diff --git a/plugins/Irc/extlib/phergie/Phergie/Bot.php b/plugins/Irc/extlib/phergie/Phergie/Bot.php
new file mode 100755
index 0000000000..153bd55905
--- /dev/null
+++ b/plugins/Irc/extlib/phergie/Phergie/Bot.php
@@ -0,0 +1,390 @@
+<?php
+/**
+ * Phergie 
+ *
+ * PHP version 5
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.
+ * It is also available through the world-wide-web at this URL:
+ * http://phergie.org/license
+ *
+ * @category  Phergie 
+ * @package   Phergie
+ * @author    Phergie Development Team <team@phergie.org>
+ * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
+ * @license   http://phergie.org/license New BSD License
+ * @link      http://pear.phergie.org/package/Phergie
+ */
+
+/**
+ * Composite class for other components to represent the bot.
+ *
+ * @category Phergie 
+ * @package  Phergie
+ * @author   Phergie Development Team <team@phergie.org>
+ * @license  http://phergie.org/license New BSD License
+ * @link     http://pear.phergie.org/package/Phergie
+ */
+class Phergie_Bot
+{
+    /**
+     * Current version of Phergie
+     */
+    const VERSION = '2.0.1';
+
+    /**
+     * Current driver instance
+     *
+     * @var Phergie_Driver_Abstract
+     */
+    protected $driver;
+
+    /**
+     * Current configuration instance
+     *
+     * @var Phergie_Config
+     */
+    protected $config;
+
+    /**
+     * Current connection handler instance 
+     *
+     * @var Phergie_Connection_Handler 
+     */
+    protected $connections;
+
+    /**
+     * Current plugin handler instance
+     *
+     * @var Phergie_Plugin_Handler
+     */
+    protected $plugins;
+
+    /**
+     * Current event handler instance
+     *
+     * @var Phergie_Event_Handler
+     */
+    protected $events;
+
+    /**
+     * Current end-user interface instance
+     *
+     * @var Phergie_Ui_Abstract
+     */
+    protected $ui;
+
+    /**
+     * Current processor instance
+     *
+     * @var Phergie_Process_Abstract
+     */
+    protected $processor;
+
+    /**
+     * Returns a driver instance, creating one of the default class if 
+     * none has been set.
+     *
+     * @return Phergie_Driver_Abstract
+     */
+    public function getDriver()
+    {
+        if (empty($this->driver)) {
+            // Check if a driver has been defined in the configuration to use
+            // as the default
+            $config = $this->getConfig();
+            if (isset($config['driver'])) {
+                $class = 'Phergie_Driver_' . ucfirst($config['driver']);
+            } else {
+                // Otherwise default to the Streams driver.
+                $class = 'Phergie_Driver_Streams';
+            }
+
+            $this->driver = new $class;
+        }
+        return $this->driver;
+    }
+
+    /**
+     * Sets the driver instance to use.
+     *
+     * @param Phergie_Driver_Abstract $driver Driver instance
+     *
+     * @return Phergie_Bot Provides a fluent interface
+     */
+    public function setDriver(Phergie_Driver_Abstract $driver)
+    {
+        $this->driver = $driver;
+        return $this;
+    }
+
+    /**
+     * Sets the configuration to use.
+     *
+     * @param Phergie_Config $config Configuration instance
+     *
+     * @return Phergie_Runner_Abstract Provides a fluent interface
+     */
+    public function setConfig(Phergie_Config $config)
+    {
+        $this->config = $config;
+        return $this;
+    }
+
+    /**
+     * Returns the entire configuration in use or the value of a specific 
+     * configuration setting.
+     *
+     * @param string $index   Optional index of a specific configuration 
+     *        setting for which the corresponding value should be returned
+     * @param mixed  $default Value to return if no match is found for $index
+     *
+     * @return mixed Value corresponding to $index or the entire 
+     *         configuration if $index is not specified
+     */
+    public function getConfig($index = null, $default = null)
+    {
+        if (empty($this->config)) {
+            $this->config = new Phergie_Config;
+            $this->config->read('Settings.php');
+        }
+        if ($index !== null) {
+            if (isset($this->config[$index])) {
+                return $this->config[$index];
+            } else {
+                return $default;
+            }
+        }
+        return $this->config;
+    }
+
+    /**
+     * Returns a plugin handler instance, creating it if it does not already
+     * exist and using a default class if none has been set.
+     *
+     * @return Phergie_Plugin_Handler
+     */
+    public function getPluginHandler()
+    {
+        if (empty($this->plugins)) {
+            $this->plugins = new Phergie_Plugin_Handler(
+                $this->getConfig(),
+                $this->getEventHandler()
+            );
+        }
+        return $this->plugins;
+    }
+
+    /**
+     * Sets the plugin handler instance to use.
+     *
+     * @param Phergie_Plugin_Handler $handler Plugin handler instance
+     *
+     * @return Phergie_Bot Provides a fluent interface
+     */
+    public function setPluginHandler(Phergie_Plugin_Handler $handler)
+    {
+        $this->plugins = $handler;
+        return $this;
+    }
+
+    /**
+     * Returns an event handler instance, creating it if it does not already
+     * exist and using a default class if none has been set.
+     *
+     * @return Phergie_Event_Handler
+     */
+    public function getEventHandler()
+    {
+        if (empty($this->events)) {
+            $this->events = new Phergie_Event_Handler;
+        }
+        return $this->events;
+    }
+
+    /**
+     * Sets the event handler instance to use.
+     *
+     * @param Phergie_Event_Handler $handler Event handler instance
+     *
+     * @return Phergie_Bot Provides a fluent interface
+     */
+    public function setEventHandler(Phergie_Event_Handler $handler)
+    {
+        $this->events = $handler;
+        return $this;
+    }
+
+    /**
+     * Returns a connection handler instance, creating it if it does not 
+     * already exist and using a default class if none has been set.
+     *
+     * @return Phergie_Connection_Handler
+     */
+    public function getConnectionHandler()
+    {
+        if (empty($this->connections)) {
+            $this->connections = new Phergie_Connection_Handler;
+        }
+        return $this->connections;
+    }
+
+    /**
+     * Sets the connection handler instance to use.
+     *
+     * @param Phergie_Connection_Handler $handler Connection handler instance
+     *
+     * @return Phergie_Bot Provides a fluent interface
+     */
+    public function setConnectionHandler(Phergie_Connection_Handler $handler)
+    {
+        $this->connections = $handler;
+        return $this;
+    }
+
+    /**
+     * Returns an end-user interface instance, creating it if it does not 
+     * already exist and using a default class if none has been set.
+     *
+     * @return Phergie_Ui_Abstract
+     */
+    public function getUi()
+    {
+        if (empty($this->ui)) {
+            $this->ui = new Phergie_Ui_Console;
+        }
+        return $this->ui;
+    }
+
+    /**
+     * Sets the end-user interface instance to use.
+     *
+     * @param Phergie_Ui_Abstract $ui End-user interface instance
+     *
+     * @return Phergie_Bot Provides a fluent interface
+     */
+    public function setUi(Phergie_Ui_Abstract $ui)
+    {
+        $this->ui = $ui;
+        return $this;
+    }
+
+    /**
+     * Returns a processer instance, creating one if none exists. 
+     *
+     * @return Phergie_Process_Abstract
+     */
+    public function getProcessor()
+    {
+        if (empty($this->processor)) {
+            $class = 'Phergie_Process_Standard';
+            
+            $type = $this->getConfig('processor');
+            if (!empty($type)) {
+                $class = 'Phergie_Process_' . ucfirst($type);
+            }
+
+            $this->processor = new $class(
+                $this, 
+                $this->getConfig('processor.options', array())
+            );
+        }
+        return $this->processor;
+    }
+
+    /**
+     * Sets the processer instance to use.
+     *
+     * @param Phergie_Process_Abstract $processor Processer instance
+     *
+     * @return Phergie_Bot Provides a fluent interface
+     */
+    public function setProcessor(Phergie_Process_Abstract $processor)
+    {
+        $this->processor = $processor;
+        return $this;
+    }
+
+    /**
+     * Loads plugins into the plugin handler.
+     *
+     * @return void
+     */
+    protected function loadPlugins()
+    {
+        $config = $this->getConfig();
+        $plugins = $this->getPluginHandler();
+        $ui = $this->getUi();
+        
+        $plugins->setAutoload($config['plugins.autoload']);
+        foreach ($config['plugins'] as $name) {
+            try {
+                $plugin = $plugins->addPlugin($name);
+                $ui->onPluginLoad($name);
+            } catch (Phergie_Plugin_Exception $e) {
+                $ui->onPluginFailure($name, $e->getMessage());
+                if (!empty($plugin)) {
+                    $plugins->removePlugin($plugin);
+                }
+            }
+        }
+    }
+
+    /**
+     * Configures and establishes connections to IRC servers.
+     *
+     * @return void
+     */
+    protected function loadConnections()
+    {
+        $config = $this->getConfig();
+        $driver = $this->getDriver();
+        $connections = $this->getConnectionHandler();
+        $plugins = $this->getPluginHandler();
+        $ui = $this->getUi();
+
+        foreach ($config['connections'] as $data) {
+            $connection = new Phergie_Connection($data);
+            $connections->addConnection($connection);
+
+            $ui->onConnect($data['host']);
+            $driver->setConnection($connection)->doConnect();
+            $plugins->setConnection($connection);
+            $plugins->onConnect();
+        }
+    }
+
+    /**
+     * Establishes server connections and initiates an execution loop to 
+     * continuously receive and process events.
+     *
+     * @return Phergie_Bot Provides a fluent interface 
+     */
+    public function run()
+    {
+        set_time_limit(0);
+        
+        $timezone = $this->getConfig('timezone', 'UTC');
+        date_default_timezone_set($timezone);
+
+        $ui = $this->getUi();
+        $ui->setEnabled($this->getConfig('ui.enabled'));
+
+        $this->loadPlugins();
+        $this->loadConnections();
+
+        $processor = $this->getProcessor();
+
+        $connections = $this->getConnectionHandler();
+        while (count($connections)) {
+            $processor->handleEvents();
+        }
+
+        $ui->onShutdown();
+
+        return $this;
+    }
+}
diff --git a/plugins/Irc/extlib/phergie/Phergie/Config.php b/plugins/Irc/extlib/phergie/Phergie/Config.php
new file mode 100755
index 0000000000..f011db2365
--- /dev/null
+++ b/plugins/Irc/extlib/phergie/Phergie/Config.php
@@ -0,0 +1,170 @@
+<?php
+/**
+ * Phergie
+ *
+ * PHP version 5
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.
+ * It is also available through the world-wide-web at this URL:
+ * http://phergie.org/license
+ *
+ * @category  Phergie
+ * @package   Phergie
+ * @author    Phergie Development Team <team@phergie.org>
+ * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
+ * @license   http://phergie.org/license New BSD License
+ * @link      http://pear.phergie.org/package/Phergie
+ */
+
+/**
+ * Reads from and writes to PHP configuration files and provides access to
+ * the settings they contain.
+ *
+ * @category Phergie
+ * @package  Phergie
+ * @author   Phergie Development Team <team@phergie.org>
+ * @license  http://phergie.org/license New BSD License
+ * @link     http://pear.phergie.org/package/Phergie
+ */
+class Phergie_Config implements ArrayAccess
+{
+    /**
+     * Mapping of configuration file paths to an array of names of settings
+     * they contain
+     *
+     * @var array
+     */
+    protected $files = array();
+
+    /**
+     * Mapping of setting names to their current corresponding values
+     *
+     * @var array
+     */
+    protected $settings = array();
+
+    /**
+     * Includes a specified PHP configuration file and incorporates its
+     * return value (which should be an associative array) into the current
+     * configuration settings.
+     *
+     * @param string $file Path to the file to read
+     *
+     * @return Phergie_Config Provides a fluent interface
+     * @throws Phergie_Config_Exception
+     */
+    public function read($file)
+    {
+        if (!(strtoupper(substr(PHP_OS, 0, 3)) === 'WIN'
+            && file_exists($file))
+            && !is_executable($file)
+        ) {
+            throw new Phergie_Config_Exception(
+                'Path "' . $file . '" does not reference an executable file',
+                Phergie_Config_Exception::ERR_FILE_NOT_EXECUTABLE
+            );
+        }
+
+        $settings = include $file;
+        if (!is_array($settings)) {
+            throw new Phergie_Config_Exception(
+                'File "' . $file . '" does not return an array',
+                Phergie_Config_Exception::ERR_ARRAY_NOT_RETURNED
+            );
+        }
+
+        $this->files[$file] = array_keys($settings);
+        $this->settings += $settings;
+
+        return $this;
+    }
+
+    /**
+     * Writes the values of the current configuration settings back to their
+     * originating files.
+     *
+     * @return Phergie_Config Provides a fluent interface
+     */
+    public function write()
+    {
+        foreach ($this->files as $file => &$settings) {
+            $values = array();
+            foreach ($settings as $setting) {
+                $values[$setting] = $this->settings[$setting];
+            }
+            $source = '<?php' . PHP_EOL . PHP_EOL .
+                'return ' . var_export($value, true) . ';';
+            file_put_contents($file, $source);
+        }
+    }
+
+    /**
+     * Checks to see if a configuration setting is assigned a value.
+     *
+     * @param string $offset Configuration setting name
+     *
+     * @return bool TRUE if the setting has a value, FALSE otherwise
+     * @see ArrayAccess::offsetExists()
+     */
+    public function offsetExists($offset)
+    {
+        return isset($this->settings[$offset]);
+    }
+
+    /**
+     * Returns the value of a configuration setting.
+     *
+     * @param string $offset Configuration setting name
+     *
+     * @return mixed Configuration setting value or NULL if it is not
+     *         assigned a value
+     * @see ArrayAccess::offsetGet()
+     */
+    public function offsetGet($offset)
+    {
+        if (isset($this->settings[$offset])) {
+            $value = &$this->settings[$offset];
+        } else {
+            $value = null;
+        }
+
+        return $value;
+    }
+
+    /**
+     * Sets the value of a configuration setting.
+     *
+     * @param string $offset Configuration setting name
+     * @param mixed  $value  New setting value
+     *
+     * @return void
+     * @see ArrayAccess::offsetSet()
+     */
+    public function offsetSet($offset, $value)
+    {
+        $this->settings[$offset] = $value;
+    }
+
+    /**
+     * Removes the value set for a configuration setting.
+     *
+     * @param string $offset Configuration setting name
+     *
+     * @return void
+     * @see ArrayAccess::offsetUnset()
+     */
+    public function offsetUnset($offset)
+    {
+        unset($this->settings[$offset]);
+
+        foreach ($this->files as $file => $settings) {
+            $key = array_search($offset, $settings);
+            if ($key !== false) {
+                unset($this->files[$file][$key]);
+            }
+        }
+    }
+}
diff --git a/plugins/Irc/extlib/phergie/Phergie/Config/Exception.php b/plugins/Irc/extlib/phergie/Phergie/Config/Exception.php
new file mode 100644
index 0000000000..fb646c10c1
--- /dev/null
+++ b/plugins/Irc/extlib/phergie/Phergie/Config/Exception.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * Phergie 
+ *
+ * PHP version 5
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.
+ * It is also available through the world-wide-web at this URL:
+ * http://phergie.org/license
+ *
+ * @category  Phergie 
+ * @package   Phergie
+ * @author    Phergie Development Team <team@phergie.org>
+ * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
+ * @license   http://phergie.org/license New BSD License
+ * @link      http://pear.phergie.org/package/Phergie
+ */
+
+/**
+ * Exception related to configuration.
+ *
+ * @category Phergie 
+ * @package  Phergie
+ * @author   Phergie Development Team <team@phergie.org>
+ * @license  http://phergie.org/license New BSD License
+ * @link     http://pear.phergie.org/package/Phergie
+ */
+class Phergie_Config_Exception extends Phergie_Exception
+{
+    /**
+     * Error indicating that an attempt was made to read a configuration 
+     * file that could not be executed
+     */
+    const ERR_FILE_NOT_EXECUTABLE = 1;
+
+    /**
+     * Error indicating that a read configuration file does not return an 
+     * array
+     */
+    const ERR_ARRAY_NOT_RETURNED = 2; 
+}
diff --git a/plugins/Irc/extlib/phergie/Phergie/Connection.php b/plugins/Irc/extlib/phergie/Phergie/Connection.php
new file mode 100755
index 0000000000..80f91e8da5
--- /dev/null
+++ b/plugins/Irc/extlib/phergie/Phergie/Connection.php
@@ -0,0 +1,359 @@
+<?php
+/**
+ * Phergie 
+ *
+ * PHP version 5
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.
+ * It is also available through the world-wide-web at this URL:
+ * http://phergie.org/license
+ *
+ * @category  Phergie 
+ * @package   Phergie
+ * @author    Phergie Development Team <team@phergie.org>
+ * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
+ * @license   http://phergie.org/license New BSD License
+ * @link      http://pear.phergie.org/package/Phergie
+ */
+
+/**
+ * Data structure for connection metadata.
+ *
+ * @category Phergie 
+ * @package  Phergie
+ * @author   Phergie Development Team <team@phergie.org>
+ * @license  http://phergie.org/license New BSD License
+ * @link     http://pear.phergie.org/package/Phergie
+ */
+class Phergie_Connection
+{
+    /**
+     * Host to which the client will connect
+     *
+     * @var string
+     */
+    protected $host;
+
+    /**
+     * Port on which the client will connect, defaults to the standard IRC 
+     * port
+     *
+     * @var int
+     */
+    protected $port;
+
+    /**
+     * Transport for the connection, defaults to tcp but can be set to ssl 
+     * or variations thereof to connect over SSL
+     *
+     * @var string 
+     */
+    protected $transport;
+
+    /**
+     * Nick that the client will use
+     *
+     * @var string
+     */
+    protected $nick;
+
+    /**
+     * Username that the client will use
+     *
+     * @var string
+     */
+    protected $username;
+
+    /**
+     * Realname that the client will use
+     *
+     * @var string
+     */
+    protected $realname;
+
+    /**
+     * Password that the client will use
+     *
+     * @var string
+     */
+    protected $password;
+
+    /**
+     * Hostmask for the connection
+     *
+     * @var Phergie_Hostmask
+     */
+    protected $hostmask;
+
+    /**
+     * Constructor to initialize instance properties.
+     *
+     * @param array $options Optional associative array of property values 
+     *        to initialize
+     *
+     * @return void
+     */
+    public function __construct(array $options = array())
+    {
+        $this->transport = 'tcp';
+
+        $this->setOptions($options);
+    }
+
+    /**
+     * Emits an error related to a required connection setting does not have
+     * value set for it.
+     *
+     * @param string $setting Name of the setting
+     *
+     * @return void
+     */
+    protected function checkSetting($setting)
+    {
+        if (empty($this->$setting)) {
+            throw new Phergie_Connection_Exception(
+                'Required connection setting "' . $setting . '" missing',
+                Phergie_Connection_Exception::ERR_REQUIRED_SETTING_MISSING
+            );
+        }
+    }
+ 
+    /**
+     * Returns a hostmask that uniquely identifies the connection.
+     *
+     * @return string
+     */
+    public function getHostmask()
+    {
+        if (empty($this->hostmask)) {
+            $this->hostmask = new Phergie_Hostmask(
+                $this->nick,
+                $this->username,
+                $this->host
+            );
+        }
+
+        return $this->hostmask; 
+    }
+
+    /**
+     * Sets the host to which the client will connect.
+     *
+     * @param string $host Hostname
+     *
+     * @return Phergie_Connection Provides a fluent interface 
+     */
+    public function setHost($host)
+    {
+        if (empty($this->host)) {
+            $this->host = (string) $host;
+        }
+
+        return $this;
+    }
+   
+    /**
+     * Returns the host to which the client will connect if it is set or 
+     * emits an error if it is not set.
+     *
+     * @return string
+     */
+    public function getHost()
+    {
+        $this->checkSetting('host');
+
+        return $this->host;
+    }
+
+    /**
+     * Sets the port on which the client will connect.
+     *
+     * @param int $port Port
+     *
+     * @return Phergie_Connection Provides a fluent interface 
+     */
+    public function setPort($port)
+    {
+        if (empty($this->port)) {
+            $this->port = (int) $port;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Returns the port on which the client will connect.
+     *
+     * @return int
+     */
+    public function getPort()
+    {
+        if (empty($this->port)) {
+            $this->port = 6667;
+        }
+
+        return $this->port;
+    }
+
+    /**
+     * Sets the transport for the connection to use. 
+     *
+     * @param string $transport Transport (ex: tcp, ssl, etc.) 
+     *
+     * @return Phergie_Connection Provides a fluent interface
+     */
+    public function setTransport($transport)
+    {
+        $this->transport = (string) $transport;
+
+        if (!in_array($this->transport, stream_get_transports())) {
+            throw new Phergie_Connection_Exception(
+                'Transport ' . $this->transport . ' is not supported',
+                Phergie_Connection_Exception::TRANSPORT_NOT_SUPPORTED
+            );
+        }
+
+        return $this;
+    }
+
+    /**
+     * Returns the transport in use by the connection. 
+     *
+     * @return string Transport (ex: tcp, ssl, etc.) 
+     */
+    public function getTransport()
+    {
+        return $this->transport;
+    }
+
+    /**
+     * Sets the nick that the client will use.
+     *
+     * @param string $nick Nickname
+     *
+     * @return Phergie_Connection Provides a fluent interface 
+     */
+    public function setNick($nick)
+    {
+        if (empty($this->nick)) {
+            $this->nick = (string) $nick;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Returns the nick that the client will use.
+     *
+     * @return string
+     */
+    public function getNick()
+    {
+        $this->checkSetting('nick');
+
+        return $this->nick;
+    }
+
+    /**
+     * Sets the username that the client will use.
+     *
+     * @param string $username Username
+     *
+     * @return Phergie_Connection Provides a fluent interface 
+     */
+    public function setUsername($username)
+    {
+        if (empty($this->username)) {
+            $this->username = (string) $username;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Returns the username that the client will use.
+     *
+     * @return string
+     */
+    public function getUsername()
+    {
+        $this->checkSetting('username');
+
+        return $this->username;
+    }
+
+    /**
+     * Sets the realname that the client will use.
+     *
+     * @param string $realname Real name
+     *
+     * @return Phergie_Connection Provides a fluent interface 
+     */
+    public function setRealname($realname)
+    {
+        if (empty($this->realname)) {
+            $this->realname = (string) $realname;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Returns the realname that the client will use.
+     *
+     * @return string
+     */
+    public function getRealname()
+    {
+        $this->checkSetting('realname');
+
+        return $this->realname;
+    }
+
+    /**
+     * Sets the password that the client will use.
+     *
+     * @param string $password Password
+     *
+     * @return Phergie_Connection Provides a fluent interface 
+     */
+    public function setPassword($password)
+    {
+        if (empty($this->password)) {
+            $this->password = (string) $password;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Returns the password that the client will use.
+     *
+     * @return string
+     */
+    public function getPassword()
+    {
+        return $this->password;
+    }
+
+    /**
+     * Sets multiple connection settings using an array.
+     *
+     * @param array $options Associative array of setting names mapped to 
+     *        corresponding values
+     *
+     * @return Phergie_Connection Provides a fluent interface 
+     */
+    public function setOptions(array $options)
+    {
+        foreach ($options as $option => $value) {
+            $method = 'set' . ucfirst($option);
+            if (method_exists($this, $method)) {
+                $this->$method($value);
+            }
+        }
+    }
+}
diff --git a/plugins/Irc/extlib/phergie/Phergie/Connection/Exception.php b/plugins/Irc/extlib/phergie/Phergie/Connection/Exception.php
new file mode 100644
index 0000000000..a750e1d860
--- /dev/null
+++ b/plugins/Irc/extlib/phergie/Phergie/Connection/Exception.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * Phergie 
+ *
+ * PHP version 5
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.
+ * It is also available through the world-wide-web at this URL:
+ * http://phergie.org/license
+ *
+ * @category  Phergie 
+ * @package   Phergie
+ * @author    Phergie Development Team <team@phergie.org>
+ * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
+ * @license   http://phergie.org/license New BSD License
+ * @link      http://pear.phergie.org/package/Phergie
+ */
+
+/**
+ * Exception related to a connection to an IRC server.
+ *
+ * @category Phergie 
+ * @package  Phergie
+ * @author   Phergie Development Team <team@phergie.org>
+ * @license  http://phergie.org/license New BSD License
+ * @link     http://pear.phergie.org/package/Phergie
+ */
+class Phergie_Connection_Exception extends Phergie_Exception
+{
+    /**
+     * Error indicating that an operation was attempted requiring a value 
+     * for a specific configuration setting, but none was set
+     */
+    const ERR_REQUIRED_SETTING_MISSING = 1;
+
+    /**
+     * Error indicating that a connection is configured to use a transport, 
+     * but that transport is not supported by the current PHP installation
+     */
+    const ERR_TRANSPORT_NOT_SUPPORTED = 2;
+}
diff --git a/plugins/Irc/extlib/phergie/Phergie/Connection/Handler.php b/plugins/Irc/extlib/phergie/Phergie/Connection/Handler.php
new file mode 100644
index 0000000000..e9aeddcd3e
--- /dev/null
+++ b/plugins/Irc/extlib/phergie/Phergie/Connection/Handler.php
@@ -0,0 +1,130 @@
+<?php
+/**
+ * Phergie 
+ *
+ * PHP version 5
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.
+ * It is also available through the world-wide-web at this URL:
+ * http://phergie.org/license
+ *
+ * @category  Phergie 
+ * @package   Phergie
+ * @author    Phergie Development Team <team@phergie.org>
+ * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
+ * @license   http://phergie.org/license New BSD License
+ * @link      http://pear.phergie.org/package/Phergie
+ */
+
+/**
+ * Handles connections initiated by the bot.
+ *
+ * @category Phergie 
+ * @package  Phergie
+ * @author   Phergie Development Team <team@phergie.org>
+ * @license  http://phergie.org/license New BSD License
+ * @link     http://pear.phergie.org/package/Phergie
+ */
+class Phergie_Connection_Handler implements Countable, IteratorAggregate
+{
+    /**
+     * Map of connections indexed by hostmask
+     *
+     * @var array
+     */
+    protected $connections;
+
+    /**
+     * Constructor to initialize storage for connections. 
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        $this->connections = array();
+    }
+
+    /**
+     * Adds a connection to the connection list.
+     *
+     * @param Phergie_Connection $connection Connection to add
+     *
+     * @return Phergie_Connection_Handler Provides a fluent interface
+     */
+    public function addConnection(Phergie_Connection $connection)
+    {
+        $this->connections[(string) $connection->getHostmask()] = $connection;
+        return $this;
+    }
+
+    /**
+     * Removes a connection from the connection list.
+     *
+     * @param Phergie_Connection|string $connection Instance or hostmask for
+     *        the connection to remove
+     *
+     * @return Phergie_Connection_Handler Provides a fluent interface
+     */
+    public function removeConnection($connection)
+    {
+        if ($connection instanceof Phergie_Connection) {
+            $hostmask = (string) $connection->getHostmask(); 
+        } elseif (is_string($connection) 
+            && isset($this->connections[$connection])) {
+            $hostmask = $connection;
+        } else {
+            return $this;
+        }
+        unset($this->connections[$hostmask]);
+        return $this;
+    }
+
+    /**
+     * Returns the number of connections in the list. 
+     *
+     * @return int Number of connections 
+     */
+    public function count()
+    {
+        return count($this->connections);
+    }
+
+    /**
+     * Returns an iterator for the connection list. 
+     *
+     * @return ArrayIterator
+     */
+    public function getIterator()
+    {
+        return new ArrayIterator($this->connections);
+    }
+
+    /**
+     * Returns a list of specified connection objects.
+     *
+     * @param array|string $keys One or more hostmasks identifying the 
+     *        connections to return
+     *
+     * @return array List of Phergie_Connection objects corresponding to the 
+     *         specified hostmask(s)
+     */
+    public function getConnections($keys)
+    {
+        $connections = array();
+
+        if (!is_array($keys)) {
+            $keys = array($keys);
+        }
+        
+        foreach ($keys as $key) {
+            if (isset($this->connections[$key])) {
+                $connections[] = $this->connections[$key];
+            }
+        }
+
+        return $connections;
+    }
+}
diff --git a/plugins/Irc/extlib/phergie/Phergie/Driver/Abstract.php b/plugins/Irc/extlib/phergie/Phergie/Driver/Abstract.php
new file mode 100755
index 0000000000..62736620d4
--- /dev/null
+++ b/plugins/Irc/extlib/phergie/Phergie/Driver/Abstract.php
@@ -0,0 +1,301 @@
+<?php
+/**
+ * Phergie 
+ *
+ * PHP version 5
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.
+ * It is also available through the world-wide-web at this URL:
+ * http://phergie.org/license
+ *
+ * @category  Phergie 
+ * @package   Phergie
+ * @author    Phergie Development Team <team@phergie.org>
+ * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
+ * @license   http://phergie.org/license New BSD License
+ * @link      http://pear.phergie.org/package/Phergie
+ */
+
+/**
+ * Base class for drivers which handle issuing client commands to the IRC
+ * server and converting responses into usable data objects.
+ *
+ * @category Phergie 
+ * @package  Phergie
+ * @author   Phergie Development Team <team@phergie.org>
+ * @license  http://phergie.org/license New BSD License
+ * @link     http://pear.phergie.org/package/Phergie
+ */
+abstract class Phergie_Driver_Abstract
+{
+    /**
+     * Currently active connection
+     *
+     * @var Phergie_Connection
+     */
+    protected $connection;
+
+    /**
+     * Sets the currently active connection.
+     *
+     * @param Phergie_Connection $connection Active connection
+     *
+     * @return Phergie_Driver_Abstract Provides a fluent interface
+     */
+    public function setConnection(Phergie_Connection $connection)
+    {
+        $this->connection = $connection;
+
+        return $this;
+    }
+
+    /**
+     * Returns the currently active connection.
+     *
+     * @return Phergie_Connection
+     * @throws Phergie_Driver_Exception
+     */
+    public function getConnection()
+    {
+        if (empty($this->connection)) {
+            throw new Phergie_Driver_Exception(
+                'Operation requires an active connection, but none is set',
+                Phergie_Driver_Exception::ERR_NO_ACTIVE_CONNECTION
+            );
+        }
+
+        return $this->connection;
+    }
+
+    /**
+     * Returns an event if one has been received from the server.
+     *
+     * @return Phergie_Event_Interface|null Event instance if an event has
+     *         been received, NULL otherwise
+     */
+    public abstract function getEvent();
+
+    /**
+     * Initiates a connection with the server.
+     *
+     * @return void
+     */
+    public abstract function doConnect();
+
+    /**
+     * Terminates the connection with the server.
+     *
+     * @param string $reason Reason for connection termination (optional)
+     *
+     * @return void
+     * @link http://www.irchelp.org/irchelp/rfc/chapter4.html#c4_1_6
+     */
+    public abstract function doQuit($reason = null);
+
+    /**
+     * Joins a channel.
+     *
+     * @param string $channels Comma-delimited list of channels to join 
+     * @param string $keys     Optional comma-delimited list of channel keys
+     *
+     * @return void
+     * @link http://www.irchelp.org/irchelp/rfc/chapter4.html#c4_2_1
+     */
+    public abstract function doJoin($channels, $keys = null);
+
+    /**
+     * Leaves a channel.
+     *
+     * @param string $channels Comma-delimited list of channels to leave 
+     *
+     * @return void
+     * @link http://www.irchelp.org/irchelp/rfc/chapter4.html#c4_2_2
+     */
+    public abstract function doPart($channels);
+
+    /**
+     * Invites a user to an invite-only channel.
+     *
+     * @param string $nick    Nick of the user to invite
+     * @param string $channel Name of the channel
+     *
+     * @return void
+     * @link http://www.irchelp.org/irchelp/rfc/chapter4.html#c4_2_7
+     */
+    public abstract function doInvite($nick, $channel);
+
+    /**
+     * Obtains a list of nicks of users in specified channels.
+     *
+     * @param string $channels Comma-delimited list of one or more channels
+     *
+     * @return void
+     * @link http://www.irchelp.org/irchelp/rfc/chapter4.html#c4_2_5
+     */
+    public abstract function doNames($channels);
+
+    /**
+     * Obtains a list of channel names and topics.
+     *
+     * @param string $channels Comma-delimited list of one or more channels
+     *                         to which the response should be restricted
+     *                         (optional)
+     *
+     * @return void
+     * @link http://www.irchelp.org/irchelp/rfc/chapter4.html#c4_2_6
+     */
+    public abstract function doList($channels = null);
+
+    /**
+     * Retrieves or changes a channel topic.
+     *
+     * @param string $channel Name of the channel
+     * @param string $topic   New topic to assign (optional)
+     *
+     * @return void
+     * @link http://www.irchelp.org/irchelp/rfc/chapter4.html#c4_2_4
+     */
+    public abstract function doTopic($channel, $topic = null);
+
+    /**
+     * Retrieves or changes a channel or user mode.
+     *
+     * @param string $target Channel name or user nick
+     * @param string $mode   New mode to assign (optional)
+     *
+     * @return void
+     * @link http://www.irchelp.org/irchelp/rfc/chapter4.html#c4_2_3
+     */
+    public abstract function doMode($target, $mode = null);
+
+    /**
+     * Changes the client nick.
+     *
+     * @param string $nick New nick to assign
+     *
+     * @return void
+     * @link http://www.irchelp.org/irchelp/rfc/chapter4.html#c4_1_2
+     */
+    public abstract function doNick($nick);
+
+    /**
+     * Retrieves information about a nick.
+     *
+     * @param string $nick Nick
+     *
+     * @return void
+     * @link http://www.irchelp.org/irchelp/rfc/chapter4.html#c4_5_2
+     */
+    public abstract function doWhois($nick);
+
+    /**
+     * Sends a message to a nick or channel.
+     *
+     * @param string $target Channel name or user nick
+     * @param string $text   Text of the message to send
+     *
+     * @return void
+     * @link http://www.irchelp.org/irchelp/rfc/chapter4.html#c4_4_1
+     */
+    public abstract function doPrivmsg($target, $text);
+
+    /**
+     * Sends a notice to a nick or channel.
+     *
+     * @param string $target Channel name or user nick
+     * @param string $text   Text of the notice to send
+     *
+     * @return void
+     * @link http://www.irchelp.org/irchelp/rfc/chapter4.html#c4_4_2
+     */
+    public abstract function doNotice($target, $text);
+
+    /**
+     * Kicks a user from a channel.
+     *
+     * @param string $nick    Nick of the user
+     * @param string $channel Channel name
+     * @param string $reason  Reason for the kick (optional)
+     *
+     * @return void
+     * @link http://www.irchelp.org/irchelp/rfc/chapter4.html#c4_2_8
+     */
+    public abstract function doKick($nick, $channel, $reason = null);
+
+    /**
+     * Responds to a server test of client responsiveness.
+     *
+     * @param string $daemon Daemon from which the original request originates
+     *
+     * @return void
+     * @link http://www.irchelp.org/irchelp/rfc/chapter4.html#c4_6_3
+     */
+    public abstract function doPong($daemon);
+
+    /**
+     * Sends a CTCP ACTION (/me) command to a nick or channel.
+     *
+     * @param string $target Channel name or user nick
+     * @param string $text   Text of the action to perform
+     *
+     * @return void
+     * @link http://www.invlogic.com/irc/ctcp.html#4.4
+     */
+    public abstract function doAction($target, $text);
+
+    /**
+     * Sends a CTCP PING request to a user.
+     *
+     * @param string $nick User nick
+     * @param string $hash Hash to use in the handshake
+     *
+     * @return void
+     * @link http://www.invlogic.com/irc/ctcp.html#4.2
+     */
+    public abstract function doPing($nick, $hash);
+
+    /**
+     * Sends a CTCP VERSION request or response to a user.
+     *
+     * @param string $nick    User nick
+     * @param string $version Version string to send for a response
+     *
+     * @return void
+     * @link http://www.invlogic.com/irc/ctcp.html#4.1
+     */
+    public abstract function doVersion($nick, $version = null);
+
+    /**
+     * Sends a CTCP TIME request to a user.
+     *
+     * @param string $nick User nick
+     * @param string $time Time string to send for a response
+     *
+     * @return void
+     * @link http://www.invlogic.com/irc/ctcp.html#4.6
+     */
+    public abstract function doTime($nick, $time = null);
+
+    /**
+     * Sends a CTCP FINGER request to a user.
+     *
+     * @param string $nick   User nick
+     * @param string $finger Finger string to send for a response
+     *
+     * @return void
+     * @link http://www.irchelp.org/irchelp/rfc/ctcpspec.html 
+     */
+    public abstract function doFinger($nick, $finger = null);
+
+    /**
+     * Sends a raw command to the server.
+     *
+     * @param string $command Command string to send
+     *
+     * @return void
+     */
+    public abstract function doRaw($command);
+}
diff --git a/plugins/Irc/extlib/phergie/Phergie/Driver/Exception.php b/plugins/Irc/extlib/phergie/Phergie/Driver/Exception.php
new file mode 100755
index 0000000000..c405522292
--- /dev/null
+++ b/plugins/Irc/extlib/phergie/Phergie/Driver/Exception.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * Phergie 
+ *
+ * PHP version 5
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.
+ * It is also available through the world-wide-web at this URL:
+ * http://phergie.org/license
+ *
+ * @category  Phergie 
+ * @package   Phergie
+ * @author    Phergie Development Team <team@phergie.org>
+ * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
+ * @license   http://phergie.org/license New BSD License
+ * @link      http://pear.phergie.org/package/Phergie
+ */
+
+/**
+ * Exception related to driver operations.
+ *
+ * @category Phergie 
+ * @package  Phergie
+ * @author   Phergie Development Team <team@phergie.org>
+ * @license  http://phergie.org/license New BSD License
+ * @link     http://pear.phergie.org/package/Phergie
+ */
+class Phergie_Driver_Exception extends Phergie_Exception
+{
+    /**
+     * Error indicating that an operation was requested requiring an active 
+     * connection before one had been set
+     */
+    const ERR_NO_ACTIVE_CONNECTION = 1;
+
+    /**
+     * Error indicating that an operation was requested requiring an active 
+     * connection where one had been set but not initiated
+     */
+    const ERR_NO_INITIATED_CONNECTION = 2;
+
+    /**
+     * Error indicating that an attempt to initiate a connection failed
+     */
+    const ERR_CONNECTION_ATTEMPT_FAILED = 3;
+}
diff --git a/plugins/Irc/extlib/phergie/Phergie/Driver/Streams.php b/plugins/Irc/extlib/phergie/Phergie/Driver/Streams.php
new file mode 100755
index 0000000000..8fe53aaa2f
--- /dev/null
+++ b/plugins/Irc/extlib/phergie/Phergie/Driver/Streams.php
@@ -0,0 +1,696 @@
+<?php
+/**
+ * Phergie 
+ *
+ * PHP version 5
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.
+ * It is also available through the world-wide-web at this URL:
+ * http://phergie.org/license
+ *
+ * @category  Phergie 
+ * @package   Phergie
+ * @author    Phergie Development Team <team@phergie.org>
+ * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
+ * @license   http://phergie.org/license New BSD License
+ * @link      http://pear.phergie.org/package/Phergie
+ */
+
+/**
+ * Driver that uses the sockets wrapper of the streams extension for 
+ * communicating with the server and handles formatting and parsing of 
+ * events using PHP.
+ *
+ * @category Phergie 
+ * @package  Phergie
+ * @author   Phergie Development Team <team@phergie.org>
+ * @license  http://phergie.org/license New BSD License
+ * @link     http://pear.phergie.org/package/Phergie
+ */
+class Phergie_Driver_Streams extends Phergie_Driver_Abstract
+{
+    /**
+     * Socket handlers
+     *
+     * @var array
+     */
+    protected $sockets = array();
+
+    /**
+     * Reference to the currently active socket handler
+     *
+     * @var resource
+     */
+    protected $socket;
+
+    /**
+     * Amount of time in seconds to wait to receive an event each time the 
+     * socket is polled
+     *
+     * @var float 
+     */
+    protected $timeout = 0.1;
+
+    /**
+     * Handles construction of command strings and their transmission to the 
+     * server.
+     *
+     * @param string       $command Command to send
+     * @param string|array $args    Optional string or array of sequential 
+     *        arguments
+     *
+     * @return string Command string that was sent 
+     * @throws Phergie_Driver_Exception
+     */
+    protected function send($command, $args = '')
+    {
+        // Require an open socket connection to continue
+        if (empty($this->socket)) {
+            throw new Phergie_Driver_Exception(
+                'doConnect() must be called first',
+                Phergie_Driver_Exception::ERR_NO_INITIATED_CONNECTION
+            );
+        }
+
+        // Add the command
+        $buffer = strtoupper($command);
+
+        // Add arguments
+        if (!empty($args)) {
+
+            // Apply formatting if arguments are passed in as an array
+            if (is_array($args)) {
+                $end = count($args) - 1;
+                $args[$end] = ':' . $args[$end];
+                $args = implode(' ', $args);
+            }
+
+            $buffer .= ' ' . $args;
+        }
+
+        // Transmit the command over the socket connection
+        fwrite($this->socket, $buffer . "\r\n");
+
+        // Return the command string that was transmitted
+        return $buffer;
+    }
+
+    /**
+     * Overrides the parent class to set the currently active socket handler 
+     * when the active connection is changed.
+     *
+     * @param Phergie_Connection $connection Active connection
+     *
+     * @return Phergie_Driver_Streams Provides a fluent interface
+     */
+    public function setConnection(Phergie_Connection $connection)
+    {
+        // Set the active socket handler
+        $hostmask = (string) $connection->getHostmask();
+        if (!empty($this->sockets[$hostmask])) {
+            $this->socket = $this->sockets[$hostmask];
+        }
+
+        // Set the active connection
+        return parent::setConnection($connection);
+    }
+
+    /**
+     * Returns a list of hostmasks corresponding to sockets with data to read.
+     * 
+     * @param int $sec  Length of time to wait for new data (seconds)
+     * @param int $usec Length of time to wait for new data (microseconds)
+     *
+     * @return array List of hostmasks or an empty array if none were found 
+     *         to have data to read
+     */
+    public function getActiveReadSockets($sec = 0, $usec = 200000)
+    {
+        $read = $this->sockets;
+        $write = null;
+        $error = null;
+        $active = array();
+
+        if (count($this->sockets) > 0) {
+            $number = stream_select($read, $write, $error, $sec, $usec);
+            if ($number > 0) {
+                foreach ($read as $item) {
+                    $active[] = array_search($item, $this->sockets);
+                }
+            }
+        }
+
+        return $active;
+    }
+
+    /**
+     * Sets the amount of time to wait for a new event each time the socket 
+     * is polled.
+     *
+     * @param float $timeout Amount of time in seconds
+     *
+     * @return Phergie_Driver_Streams Provides a fluent interface
+     */
+    public function setTimeout($timeout)
+    {
+        $timeout = (float) $timeout;
+        if ($timeout) {
+            $this->timeout = $timeout;
+        }
+        return $this;
+    }
+
+    /**
+     * Returns the amount of time to wait for a new event each time the 
+     * socket is polled.
+     *
+     * @return float Amount of time in seconds
+     */
+    public function getTimeout()
+    {
+        return $this->timeout;
+    }
+
+    /**
+     * Supporting method to parse event argument strings where the last 
+     * argument may contain a colon.
+     *
+     * @param string $args  Argument string to parse
+     * @param int    $count Optional maximum number of arguments
+     *
+     * @return array Array of argument values
+     */
+    protected function parseArguments($args, $count = -1)
+    {
+        return preg_split('/ :?/S', $args, $count);
+    }
+
+    /**
+     * Listens for an event on the current connection.
+     *
+     * @return Phergie_Event_Interface|null Event instance if an event was 
+     *         received, NULL otherwise
+     */
+    public function getEvent()
+    {
+        // Check for a new event on the current connection
+        $buffer = fgets($this->socket, 512);
+
+        // If no new event was found, return NULL
+        if (empty($buffer)) {
+            return null;
+        }
+
+        // Strip the trailing newline from the buffer
+        $buffer = rtrim($buffer);
+
+        // If the event is from the server...
+        if (substr($buffer, 0, 1) != ':') {
+
+            // Parse the command and arguments
+            list($cmd, $args) = array_pad(explode(' ', $buffer, 2), 2, null);
+
+        } else {
+            // If the event could be from the server or a user...
+
+            // Parse the server hostname or user hostmask, command, and arguments
+            list($prefix, $cmd, $args) 
+                = array_pad(explode(' ', ltrim($buffer, ':'), 3), 3, null);
+            if (strpos($prefix, '@') !== false) {
+                $hostmask = Phergie_Hostmask::fromString($prefix);
+            }
+        }
+
+        // Parse the event arguments depending on the event type
+        $cmd = strtolower($cmd);
+        switch ($cmd) {
+        case 'names':
+        case 'nick':
+        case 'quit':
+        case 'ping':
+        case 'join':
+        case 'error':
+            $args = array(ltrim($args, ':'));
+            break;
+
+        case 'privmsg':
+        case 'notice':
+            $ctcp = substr(strstr($args, ':'), 1);
+            if (substr($ctcp, 0, 1) === "\x01" && substr($ctcp, -1) === "\x01") {
+                $ctcp = substr($ctcp, 1, -1);
+                $reply = ($cmd == 'notice');
+                list($cmd, $args) = array_pad(explode(' ', $ctcp, 2), 2, null);
+                $cmd = strtolower($cmd);
+                switch ($cmd) {
+                case 'version':
+                case 'time':
+                case 'finger':
+                    if ($reply) {
+                        $args = $ctcp;
+                    }
+                    break;
+                case 'ping':
+                    if ($reply) {
+                        $cmd .= 'Response';
+                    } else {
+                        $cmd = 'ctcpPing';
+                    }
+                    break;
+                case 'action':
+                    $args = array($this->getConnection()->getNick(), $args);
+                    break;
+
+                default:
+                    $cmd = 'ctcp';
+                    if ($reply) {
+                        $cmd .= 'Response';
+                    }
+                    $args = array($this->getConnection()->getNick(), $ctcp);
+                    break;
+                }
+            } else {
+                $args = $this->parseArguments($args, 2);
+            }
+            break;
+
+        case 'oper':
+        case 'topic':
+        case 'mode':
+            $args = $this->parseArguments($args); 
+            break;
+
+        case 'part':
+        case 'kill':
+        case 'invite':
+            $args = $this->parseArguments($args, 2); 
+            break;
+
+        case 'kick':
+            $args = $this->parseArguments($args, 3); 
+            break;
+
+        // Remove the target from responses
+        default:
+            $args = substr($args, strpos($args, ' ') + 1);
+            break;
+        }
+
+        // Create, populate, and return an event object
+        if (ctype_digit($cmd)) {
+            $event = new Phergie_Event_Response;
+            $event
+                ->setCode($cmd)
+                ->setDescription($args);
+        } else {
+            $event = new Phergie_Event_Request;
+            $event
+                ->setType($cmd)
+                ->setArguments($args);
+            if (isset($hostmask)) {
+                $event->setHostmask($hostmask);
+            }
+        }
+        $event->setRawData($buffer);
+        return $event;
+    }
+
+    /**
+     * Initiates a connection with the server.
+     *
+     * @return void
+     */
+    public function doConnect()
+    {
+        // Listen for input indefinitely
+        set_time_limit(0);
+
+        // Get connection information
+        $connection = $this->getConnection();
+        $hostname = $connection->getHost();
+        $port = $connection->getPort();
+        $password = $connection->getPassword();
+        $username = $connection->getUsername();
+        $nick = $connection->getNick();
+        $realname = $connection->getRealname();
+        $transport = $connection->getTransport();
+
+        // Establish and configure the socket connection
+        $remote = $transport . '://' . $hostname . ':' . $port;
+        $this->socket = @stream_socket_client($remote, $errno, $errstr);
+        if (!$this->socket) {
+            throw new Phergie_Driver_Exception(
+                'Unable to connect: socket error ' . $errno . ' ' . $errstr,
+                Phergie_Driver_Exception::ERR_CONNECTION_ATTEMPT_FAILED
+            );
+        }
+
+        $seconds = (int) $this->timeout;
+        $microseconds = ($this->timeout - $seconds) * 1000000;
+        stream_set_timeout($this->socket, $seconds, $microseconds);
+
+        // Send the password if one is specified
+        if (!empty($password)) {
+            $this->send('PASS', $password);
+        }
+
+        // Send user information
+        $this->send(
+            'USER',
+            array(
+                $username, 
+                $hostname, 
+                $hostname, 
+                $realname
+            )
+        );
+
+        $this->send('NICK', $nick); 
+
+        // Add the socket handler to the internal array for socket handlers
+        $this->sockets[(string) $connection->getHostmask()] = $this->socket;
+    }
+
+    /**
+     * Terminates the connection with the server.
+     *
+     * @param string $reason Reason for connection termination (optional)
+     *
+     * @return void
+     */
+    public function doQuit($reason = null)
+    {
+        // Send a QUIT command to the server
+        $this->send('QUIT', $reason);
+
+        // Terminate the socket connection
+        fclose($this->socket);
+
+        // Remove the socket from the internal socket list
+        unset($this->sockets[(string) $this->getConnection()->getHostmask()]);
+    }
+
+    /**
+     * Joins a channel.
+     *
+     * @param string $channels Comma-delimited list of channels to join 
+     * @param string $keys     Optional comma-delimited list of channel keys
+     *
+     * @return void
+     */
+    public function doJoin($channels, $keys = null)
+    {
+        $args = array($channels);
+
+        if (!empty($keys)) {
+            $args[] = $keys;
+        }
+
+        $this->send('JOIN', $args);
+    }
+
+    /**
+     * Leaves a channel.
+     *
+     * @param string $channels Comma-delimited list of channels to leave 
+     *
+     * @return void
+     */
+    public function doPart($channels)
+    {
+        $this->send('PART', $channels);
+    }
+
+    /**
+     * Invites a user to an invite-only channel.
+     *
+     * @param string $nick    Nick of the user to invite
+     * @param string $channel Name of the channel
+     *
+     * @return void
+     */
+    public function doInvite($nick, $channel)
+    {
+        $this->send('INVITE', array($nick, $channel));
+    }
+
+    /**
+     * Obtains a list of nicks of usrs in currently joined channels.
+     *
+     * @param string $channels Comma-delimited list of one or more channels
+     *
+     * @return void
+     */
+    public function doNames($channels)
+    {
+        $this->send('NAMES', $channels);
+    }
+
+    /**
+     * Obtains a list of channel names and topics.
+     *
+     * @param string $channels Comma-delimited list of one or more channels
+     *                         to which the response should be restricted
+     *                         (optional)
+     *
+     * @return void
+     */
+    public function doList($channels = null)
+    {
+        $this->send('LIST', $channels);
+    }
+
+    /**
+     * Retrieves or changes a channel topic.
+     *
+     * @param string $channel Name of the channel
+     * @param string $topic   New topic to assign (optional)
+     *
+     * @return void
+     */
+    public function doTopic($channel, $topic = null)
+    {
+        $args = array($channel);
+
+        if (!empty($topic)) {
+            $args[] = $topic;
+        }
+
+        $this->send('TOPIC', $args);
+    }
+
+    /**
+     * Retrieves or changes a channel or user mode.
+     *
+     * @param string $target Channel name or user nick
+     * @param string $mode   New mode to assign (optional)
+     *
+     * @return void
+     */
+    public function doMode($target, $mode = null)
+    {
+        $args = array($target);
+
+        if (!empty($mode)) {
+            $args[] = $mode;
+        }
+
+        $this->send('MODE', $args);
+    }
+
+    /**
+     * Changes the client nick.
+     *
+     * @param string $nick New nick to assign
+     *
+     * @return void
+     */
+    public function doNick($nick)
+    {
+        $this->send('NICK', $nick);
+    }
+
+    /**
+     * Retrieves information about a nick.
+     *
+     * @param string $nick Nick
+     *
+     * @return void
+     */
+    public function doWhois($nick)
+    {
+        $this->send('WHOIS', $nick);
+    }
+
+    /**
+     * Sends a message to a nick or channel.
+     *
+     * @param string $target Channel name or user nick
+     * @param string $text   Text of the message to send
+     *
+     * @return void
+     */
+    public function doPrivmsg($target, $text)
+    {
+        $this->send('PRIVMSG', array($target, $text));
+    }
+
+    /**
+     * Sends a notice to a nick or channel.
+     *
+     * @param string $target Channel name or user nick
+     * @param string $text   Text of the notice to send
+     *
+     * @return void
+     */
+    public function doNotice($target, $text)
+    {
+        $this->send('NOTICE', array($target, $text));
+    }
+
+    /**
+     * Kicks a user from a channel.
+     *
+     * @param string $nick    Nick of the user
+     * @param string $channel Channel name
+     * @param string $reason  Reason for the kick (optional)
+     *
+     * @return void
+     */
+    public function doKick($nick, $channel, $reason = null)
+    {
+        $args = array($nick, $channel);
+
+        if (!empty($reason)) {
+            $args[] = $response;
+        }
+
+        $this->send('KICK', $args);
+    }
+
+    /**
+     * Responds to a server test of client responsiveness.
+     *
+     * @param string $daemon Daemon from which the original request originates
+     *
+     * @return void
+     */
+    public function doPong($daemon)
+    {
+        $this->send('PONG', $daemon);
+    }
+
+    /**
+     * Sends a CTCP ACTION (/me) command to a nick or channel.
+     *
+     * @param string $target Channel name or user nick
+     * @param string $text   Text of the action to perform
+     *
+     * @return void
+     */
+    public function doAction($target, $text)
+    {
+        $buffer = rtrim('ACTION ' . $text);
+
+        $this->doPrivmsg($target, chr(1) . $buffer . chr(1));
+    }
+
+    /**
+     * Sends a CTCP response to a user.
+     *
+     * @param string       $nick    User nick 
+     * @param string       $command Command to send
+     * @param string|array $args    String or array of sequential arguments 
+     *        (optional)
+     *
+     * @return void
+     */
+    protected function doCtcp($nick, $command, $args = null)
+    {
+        if (is_array($args)) {
+            $args = implode(' ', $args);
+        }
+
+        $buffer = rtrim(strtoupper($command) . ' ' . $args);
+
+        $this->doNotice($nick, chr(1) . $buffer . chr(1)); 
+    }
+
+    /**
+     * Sends a CTCP PING request or response (they are identical) to a user.
+     *
+     * @param string $nick User nick
+     * @param string $hash Hash to use in the handshake
+     *
+     * @return void
+     */
+    public function doPing($nick, $hash)
+    {
+        $this->doCtcp($nick, 'PING', $hash);
+    }
+
+    /**
+     * Sends a CTCP VERSION request or response to a user.
+     *
+     * @param string $nick    User nick
+     * @param string $version Version string to send for a response
+     *
+     * @return void
+     */
+    public function doVersion($nick, $version = null)
+    {
+        if ($version) {
+            $this->doCtcp($nick, 'VERSION', $version);
+        } else {
+            $this->doCtcp($nick, 'VERSION');
+        }
+    }
+
+    /**
+     * Sends a CTCP TIME request to a user.
+     *
+     * @param string $nick User nick
+     * @param string $time Time string to send for a response 
+     *
+     * @return void
+     */
+    public function doTime($nick, $time = null)
+    {
+        if ($time) {
+            $this->doCtcp($nick, 'TIME', $time);
+        } else {
+            $this->doCtcp($nick, 'TIME');
+        }
+    }
+
+    /**
+     * Sends a CTCP FINGER request to a user.
+     *
+     * @param string $nick   User nick
+     * @param string $finger Finger string to send for a response
+     *
+     * @return void
+     */
+    public function doFinger($nick, $finger = null)
+    {
+        if ($finger) {
+            $this->doCtcp($nick, 'FINGER', $finger);
+        } else {
+            $this->doCtcp($nick, 'FINGER');
+        }
+    }
+
+    /**
+     * Sends a raw command to the server.
+     *
+     * @param string $command Command string to send
+     *
+     * @return void
+     */
+    public function doRaw($command)
+    {
+        $this->send('RAW', $command);
+    }
+}
diff --git a/plugins/Irc/extlib/phergie/Phergie/Event/Abstract.php b/plugins/Irc/extlib/phergie/Phergie/Event/Abstract.php
new file mode 100644
index 0000000000..54b035dc03
--- /dev/null
+++ b/plugins/Irc/extlib/phergie/Phergie/Event/Abstract.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ * Phergie 
+ *
+ * PHP version 5
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.
+ * It is also available through the world-wide-web at this URL:
+ * http://phergie.org/license
+ *
+ * @category  Phergie 
+ * @package   Phergie
+ * @author    Phergie Development Team <team@phergie.org>
+ * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
+ * @license   http://phergie.org/license New BSD License
+ * @link      http://pear.phergie.org/package/Phergie
+ */
+
+/**
+ * Base class for events.
+ *
+ * @category Phergie 
+ * @package  Phergie
+ * @author   Phergie Development Team <team@phergie.org>
+ * @license  http://phergie.org/license New BSD License
+ * @link     http://pear.phergie.org/package/Phergie
+ */
+abstract class Phergie_Event_Abstract
+{
+    /**
+     * Event type, used for determining the callback to execute in response
+     *
+     * @var string
+     */
+    protected $type;
+
+    /**
+     * Returns the event type.
+     *
+     * @return string
+     */
+    public function getType()
+    {
+        return $this->type; 
+    }
+
+    /**
+     * Sets the event type.
+     *
+     * @param string $type Event type
+     *
+     * @return Phergie_Event_Abstract Implements a fluent interface
+     */
+    public function setType($type)
+    {
+        $this->type = (string) $type;
+        return $this;
+    }
+}
diff --git a/plugins/Irc/extlib/phergie/Phergie/Event/Command.php b/plugins/Irc/extlib/phergie/Phergie/Event/Command.php
new file mode 100644
index 0000000000..5940636ba7
--- /dev/null
+++ b/plugins/Irc/extlib/phergie/Phergie/Event/Command.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ * Phergie 
+ *
+ * PHP version 5
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.
+ * It is also available through the world-wide-web at this URL:
+ * http://phergie.org/license
+ *
+ * @category  Phergie 
+ * @package   Phergie
+ * @author    Phergie Development Team <team@phergie.org>
+ * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
+ * @license   http://phergie.org/license New BSD License
+ * @link      http://pear.phergie.org/package/Phergie
+ */
+
+/**
+ * Event originating from a plugin for the bot.
+ *
+ * @category Phergie 
+ * @package  Phergie
+ * @author   Phergie Development Team <team@phergie.org>
+ * @license  http://phergie.org/license New BSD License
+ * @link     http://pear.phergie.org/package/Phergie
+ */
+class Phergie_Event_Command extends Phergie_Event_Request
+{
+    /**
+     * Reference to the plugin instance that created the event
+     *
+     * @var Phergie_Plugin_Abstract
+     */
+    protected $plugin;
+
+    /**
+     * Stores a reference to the plugin instance that created the event.
+     *
+     * @param Phergie_Plugin_Abstract $plugin Plugin instance
+     *
+     * @return Phergie_Event_Command Provides a fluent interface
+     */
+    public function setPlugin(Phergie_Plugin_Abstract $plugin)
+    {
+        $this->plugin = $plugin;
+        return $this;
+    }
+
+    /**
+     * Returns a reference to the plugin instance that created the event.
+     *
+     * @return Phergie_Plugin_Abstract
+     */
+    public function getPlugin()
+    {
+        return $this->plugin;
+    }
+}
diff --git a/plugins/Irc/extlib/phergie/Phergie/Event/Exception.php b/plugins/Irc/extlib/phergie/Phergie/Event/Exception.php
new file mode 100644
index 0000000000..6b094a810c
--- /dev/null
+++ b/plugins/Irc/extlib/phergie/Phergie/Event/Exception.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * Phergie 
+ *
+ * PHP version 5
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.
+ * It is also available through the world-wide-web at this URL:
+ * http://phergie.org/license
+ *
+ * @category  Phergie 
+ * @package   Phergie
+ * @author    Phergie Development Team <team@phergie.org>
+ * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
+ * @license   http://phergie.org/license New BSD License
+ * @link      http://pear.phergie.org/package/Phergie
+ */
+
+/**
+ * Exception related to outgoing events. 
+ *
+ * @category Phergie 
+ * @package  Phergie
+ * @author   Phergie Development Team <team@phergie.org>
+ * @license  http://phergie.org/license New BSD License
+ * @link     http://pear.phergie.org/package/Phergie
+ */
+class Phergie_Event_Exception extends Phergie_Exception
+{
+    /**
+     * Error indicating that an attempt was made to create an event of an 
+     * unknown type
+     */
+    const ERR_UNKNOWN_EVENT_TYPE = 1;
+}
diff --git a/plugins/Irc/extlib/phergie/Phergie/Event/Handler.php b/plugins/Irc/extlib/phergie/Phergie/Event/Handler.php
new file mode 100644
index 0000000000..7df1fca35a
--- /dev/null
+++ b/plugins/Irc/extlib/phergie/Phergie/Event/Handler.php
@@ -0,0 +1,174 @@
+<?php
+/**
+ * Phergie 
+ *
+ * PHP version 5
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.
+ * It is also available through the world-wide-web at this URL:
+ * http://phergie.org/license
+ *
+ * @category  Phergie 
+ * @package   Phergie
+ * @author    Phergie Development Team <team@phergie.org>
+ * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
+ * @license   http://phergie.org/license New BSD License
+ * @link      http://pear.phergie.org/package/Phergie
+ */
+
+/**
+ * Handles events initiated by plugins. 
+ *
+ * @category Phergie 
+ * @package  Phergie
+ * @author   Phergie Development Team <team@phergie.org>
+ * @license  http://phergie.org/license New BSD License
+ * @link     http://pear.phergie.org/package/Phergie
+ */
+class Phergie_Event_Handler implements IteratorAggregate, Countable
+{
+    /**
+     * Current queue of events
+     *
+     * @var array
+     */
+    protected $events;
+
+    /**
+     * Constructor to initialize the event queue.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        $this->events = array();
+    }
+
+    /**
+     * Adds an event to the queue.
+     *
+     * @param Phergie_Plugin_Abstract $plugin Plugin originating the event
+     * @param string                  $type   Event type, corresponding to a 
+     *        Phergie_Event_Command::TYPE_* constant
+     * @param array                   $args   Optional event arguments
+     *
+     * @return Phergie_Event_Handler Provides a fluent interface
+     */
+    public function addEvent(Phergie_Plugin_Abstract $plugin, $type, 
+        array $args = array()
+    ) {
+        if (!defined('Phergie_Event_Command::TYPE_' . strtoupper($type))) {
+            throw new Phergie_Event_Exception(
+                'Unknown event type "' . $type . '"',
+                Phergie_Event_Exception::ERR_UNKNOWN_EVENT_TYPE
+            );
+        }
+
+        $event = new Phergie_Event_Command;
+        $event
+            ->setPlugin($plugin)
+            ->setType($type)
+            ->setArguments($args);
+
+        $this->events[] = $event;
+
+        return $this;
+    }
+
+    /**
+     * Returns the current event queue.
+     *
+     * @return array Enumerated array of Phergie_Event_Command objects
+     */
+    public function getEvents()
+    {
+        return $this->events;
+    }
+
+    /**
+     * Clears the event queue.
+     *
+     * @return Phergie_Event_Handler Provides a fluent interface
+     */
+    public function clearEvents()
+    {
+        $this->events = array();
+        return $this;
+    }
+
+    /**
+     * Replaces the current event queue with a given queue of events.
+     *
+     * @param array $events Ordered list of objects of the class 
+     *        Phergie_Event_Command
+     *
+     * @return Phergie_Event_Handler Provides a fluent interface
+     */
+    public function replaceEvents(array $events)
+    {
+        $this->events = $events;
+        return $this;
+    }
+
+    /**
+     * Returns whether an event of the given type exists in the queue.
+     *
+     * @param string $type Event type from Phergie_Event_Request::TYPE_* 
+     *        constants
+     *
+     * @return bool TRUE if an event of the specified type exists in the 
+     *         queue, FALSE otherwise
+     */
+    public function hasEventOfType($type)
+    {
+        foreach ($this->events as $event) {
+            if ($event->getType() == $type) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Returns a list of events of a specified type.
+     *
+     * @param string $type Event type from Phergie_Event_Request::TYPE_* 
+     *        constants
+     *
+     * @return array Array containing event instances of the specified type 
+     *         or an empty array if no such events were found
+     */
+    public function getEventsOfType($type)
+    {
+        $events = array();
+        foreach ($this->events as $event) {
+            if ($event->getType() == $type) {
+                $events[] = $event;
+            }
+        }
+        return $events;
+    }
+
+    /**
+     * Returns an iterator for the current event queue.
+     *
+     * @return ArrayIterator
+     */
+    public function getIterator()
+    {
+        return new ArrayIterator($this->events);
+    }
+
+    /**
+     * Returns the number of events in the event queue
+     *
+     * @return int number of queued events
+     */
+    public function count()
+    {
+        return count($this->events);
+    }
+}
diff --git a/plugins/Irc/extlib/phergie/Phergie/Event/Request.php b/plugins/Irc/extlib/phergie/Phergie/Event/Request.php
new file mode 100755
index 0000000000..a559d9dbe5
--- /dev/null
+++ b/plugins/Irc/extlib/phergie/Phergie/Event/Request.php
@@ -0,0 +1,450 @@
+<?php
+/**
+ * Phergie 
+ *
+ * PHP version 5
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.
+ * It is also available through the world-wide-web at this URL:
+ * http://phergie.org/license
+ *
+ * @category  Phergie 
+ * @package   Phergie
+ * @author    Phergie Development Team <team@phergie.org>
+ * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
+ * @license   http://phergie.org/license New BSD License
+ * @link      http://pear.phergie.org/package/Phergie
+ */
+
+/**
+ * Autonomous event originating from a user or the server.
+ *
+ * @category Phergie 
+ * @package  Phergie
+ * @author   Phergie Development Team <team@phergie.org>
+ * @license  http://phergie.org/license New BSD License
+ * @link     http://pear.phergie.org/package/Phergie
+ * @link     http://www.irchelp.org/irchelp/rfc/chapter4.html
+ */
+class Phergie_Event_Request 
+    extends Phergie_Event_Abstract 
+    implements ArrayAccess
+{
+    /**
+     * Nick message event type
+     */
+    const TYPE_NICK = 'nick';
+
+    /**
+     * Whois message event type
+     */
+    const TYPE_WHOIS = 'whois';
+
+    /**
+     * Quit command event type
+     */
+    const TYPE_QUIT = 'quit';
+
+    /**
+     * Join message event type
+     */
+    const TYPE_JOIN = 'join';
+
+    /**
+     * Kick message event type
+     */
+    const TYPE_KICK = 'kick';
+
+    /**
+     * Part message event type
+     */
+    const TYPE_PART = 'part';
+
+    /**
+     * Invite message event type
+     */
+    const TYPE_INVITE = 'invite';
+
+    /**
+     * Mode message event type
+     */
+    const TYPE_MODE = 'mode';
+
+    /**
+     * Topic message event type
+     */
+    const TYPE_TOPIC = 'topic';
+
+    /**
+     * Private message command event type
+     */
+    const TYPE_PRIVMSG = 'privmsg';
+
+    /**
+     * Notice message event type
+     */
+    const TYPE_NOTICE = 'notice';
+
+    /**
+     * Pong message event type
+     */
+    const TYPE_PONG = 'pong';
+
+    /**
+     * CTCP ACTION command event type
+     */
+    const TYPE_ACTION = 'action';
+
+    /**
+     * CTCP PING command event type
+     */
+    const TYPE_PING = 'ping';
+
+    /**
+     * CTCP TIME command event type
+     */
+    const TYPE_TIME = 'time';
+
+    /**
+     * CTCP VERSION command event type
+     */
+    const TYPE_VERSION = 'version';
+
+    /**
+     * RAW message event type
+     */
+    const TYPE_RAW = 'raw';
+
+    /**
+     * Mapping of event types to their named parameters
+     *
+     * @var array
+     */
+    protected static $map = array(
+
+        self::TYPE_QUIT => array(
+            'message' => 0
+        ),
+
+        self::TYPE_JOIN => array(
+            'channel' => 0
+        ),
+
+        self::TYPE_KICK => array(
+            'channel' => 0,
+            'user'    => 1,
+            'comment' => 2
+        ),
+
+        self::TYPE_PART => array(
+            'channel' => 0,
+            'message' => 1
+        ),
+
+        self::TYPE_INVITE => array(
+            'nickname' => 0,
+            'channel'  => 1
+        ),
+
+        self::TYPE_MODE => array(
+            'target'  => 0,
+            'mode'    => 1,
+            'limit'   => 2,
+            'user'    => 3,
+            'banmask' => 4
+        ),
+
+        self::TYPE_TOPIC => array(
+            'channel' => 0,
+            'topic'   => 1
+        ),
+
+        self::TYPE_PRIVMSG => array(
+            'receiver' => 0,
+            'text'     => 1
+        ),
+
+        self::TYPE_NOTICE => array(
+            'nickname' => 0,
+            'text'     => 1
+        ),
+
+        self::TYPE_ACTION => array(
+            'target' => 0,
+            'action' => 1
+        ),
+
+        self::TYPE_RAW => array(
+            'message' => 0
+        )
+
+    );
+
+    /**
+     * Hostmask representing the originating user, if applicable
+     *
+     * @var Phergie_Hostmask
+     */
+    protected $hostmask;
+
+    /**
+     * Arguments included with the message
+     *
+     * @var array
+     */
+    protected $arguments;
+
+    /**
+     * Raw data sent by the server
+     *
+     * @var string
+     */
+    protected $rawData;
+
+    /**
+     * Sets the hostmask representing the originating user.
+     *
+     * @param Phergie_Hostmask $hostmask User hostmask
+     *
+     * @return Phergie_Event_Request Provides a fluent interface
+     */
+    public function setHostmask(Phergie_Hostmask $hostmask)
+    {
+        $this->hostmask = $hostmask;
+        return $this;
+    }
+
+    /**
+     * Returns the hostmask representing the originating user.
+     *
+     * @return Phergie_Event_Request|null Hostmask or NULL if none was set
+     */
+    public function getHostmask()
+    {
+        return $this->hostmask;
+    }
+
+    /**
+     * Sets the arguments for the request.
+     *
+     * @param array $arguments Request arguments
+     *
+     * @return Phergie_Event_Request Provides a fluent interface
+     */
+    public function setArguments($arguments)
+    {
+        $this->arguments = $arguments;
+        return $this;
+    }
+
+    /**
+     * Returns the arguments for the request.
+     *
+     * @return array
+     */
+    public function getArguments()
+    {
+        return $this->arguments;
+    }
+
+    /**
+     * Resolves an argument specification to an integer position.
+     *
+     * @param mixed $argument Integer position (starting from 0) or the
+     *        equivalent string name of the argument from self::$map
+     *
+     * @return int|null Integer position of the argument or NULL if no 
+     *         corresponding argument was found
+     */
+    protected function resolveArgument($argument)
+    {
+        if (isset($this->arguments[$argument])) {
+            return $argument; 
+        } else {
+            $argument = strtolower($argument);
+            if (isset(self::$map[$this->type][$argument])
+                && isset($this->arguments[self::$map[$this->type][$argument]])
+            ) {
+                return self::$map[$this->type][$argument];
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Returns a single specified argument for the request.
+     *
+     * @param mixed $argument Integer position (starting from 0) or the
+     *        equivalent string name of the argument from self::$map
+     *
+     * @return string|null Argument value or NULL if none is set
+     */
+    public function getArgument($argument)
+    {
+        $argument = $this->resolveArgument($argument);
+        if ($argument !== null) { 
+            return $this->arguments[$argument];
+        }
+        return null;
+    }
+
+    /**
+     * Sets the raw buffer for the event.
+     *
+     * @param string $buffer Raw event buffer
+     *
+     * @return Phergie_Event_Request Provides a fluent interface
+     */
+    public function setRawData($buffer)
+    {
+        $this->rawData = $buffer;
+        return $this;
+    }
+
+    /**
+     * Returns the raw buffer sent from the server for the event.
+     *
+     * @return string
+     */
+    public function getRawData()
+    {
+        return $this->rawData;
+    }
+
+    /**
+     * Returns the nick of the user who originated the event.
+     *
+     * @return string
+     */
+    public function getNick()
+    {
+        return $this->hostmask->getNick();
+    }
+
+    /**
+     * Returns the channel name if the event occurred in a channel or the 
+     * user nick if the event was a private message directed at the bot by a 
+     * user. 
+     *
+     * @return string
+     */
+    public function getSource()
+    {
+        if (substr($this->arguments[0], 0, 1) == '#') {
+            return $this->arguments[0];
+        }
+        return $this->hostmask->getNick();
+    }
+
+    /**
+     * Returns whether or not the event occurred within a channel.
+     *
+     * @return TRUE if the event is in a channel, FALSE otherwise
+     */
+    public function isInChannel()
+    {
+        return (substr($this->getSource(), 0, 1) == '#');
+    }
+
+    /**
+     * Returns whether or not the event originated from a user.
+     *
+     * @return TRUE if the event is from a user, FALSE otherwise
+     */
+    public function isFromUser()
+    {
+        if (empty($this->hostmask)) {
+            return false;
+        }
+        $username = $this->hostmask->getUsername();
+        return !empty($username);
+    }
+
+    /**
+     * Returns whether or not the event originated from the server.
+     *
+     * @return TRUE if the event is from the server, FALSE otherwise
+     */
+    public function isFromServer()
+    {
+        $username = $this->hostmask->getUsername();
+        return empty($username);
+    }
+
+    /**
+     * Provides access to named parameters via virtual "getter" methods.
+     *
+     * @param string $name      Name of the method called
+     * @param array  $arguments Arguments passed to the method (should always
+     *        be empty)
+     *
+     * @return mixed Method return value
+     */
+    public function __call($name, array $arguments)
+    {
+        if (!count($arguments) && substr($name, 0, 3) == 'get') {
+            return $this->getArgument(substr($name, 3));
+        }
+    }
+
+    /**
+     * Checks to see if an event argument is assigned a value.
+     *
+     * @param string|int $offset Argument name or position beginning from 0
+     *
+     * @return bool TRUE if the argument has a value, FALSE otherwise 
+     * @see ArrayAccess::offsetExists()
+     */
+    public function offsetExists($offset)
+    {
+        return ($this->resolveArgument($offset) !== null);
+    }
+
+    /**
+     * Returns the value of an event argument.
+     *
+     * @param string|int $offset Argument name or position beginning from 0
+     *
+     * @return string|null Argument value or NULL if none is set
+     * @see ArrayAccess::offsetGet()
+     */
+    public function offsetGet($offset)
+    {
+        return $this->getArgument($offset);
+    }
+
+    /**
+     * Sets the value of an event argument.
+     *
+     * @param string|int $offset Argument name or position beginning from 0
+     * @param string     $value  New argument value
+     *
+     * @return void
+     * @see ArrayAccess::offsetSet()
+     */
+    public function offsetSet($offset, $value)
+    {
+        $offset = $this->resolveArgument($offset);
+        if ($offset !== null) { 
+            $this->arguments[$offset] = $value;
+        }
+    }
+
+    /**
+     * Removes the value set for an event argument.
+     *
+     * @param string|int $offset Argument name or position beginning from 0
+     *
+     * @return void
+     * @see ArrayAccess::offsetUnset()
+     */
+    public function offsetUnset($offset)
+    {
+        if ($offset = $this->resolveArgument($offset)) {
+            unset($this->arguments[$offset]);
+        }
+    }
+}
diff --git a/plugins/Irc/extlib/phergie/Phergie/Event/Response.php b/plugins/Irc/extlib/phergie/Phergie/Event/Response.php
new file mode 100755
index 0000000000..097e2535e8
--- /dev/null
+++ b/plugins/Irc/extlib/phergie/Phergie/Event/Response.php
@@ -0,0 +1,953 @@
+<?php
+/**
+ * Phergie 
+ *
+ * PHP version 5
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.
+ * It is also available through the world-wide-web at this URL:
+ * http://phergie.org/license
+ *
+ * @category  Phergie 
+ * @package   Phergie
+ * @author    Phergie Development Team <team@phergie.org>
+ * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
+ * @license   http://phergie.org/license New BSD License
+ * @link      http://pear.phergie.org/package/Phergie
+ */
+
+/**
+ * Event originating from the server in response to an event sent by the
+ * current client.
+ *
+ * @category Phergie 
+ * @package  Phergie
+ * @author   Phergie Development Team <team@phergie.org>
+ * @license  http://phergie.org/license New BSD License
+ * @link     http://pear.phergie.org/package/Phergie
+ * @link     http://www.irchelp.org/irchelp/rfc/chapter6.html
+ */
+class Phergie_Event_Response extends Phergie_Event_Abstract
+{
+    /**
+     * <nickname> No such nick/channel
+     *
+     * Used to indicate the nickname parameter supplied to a command is currently
+     * unused.
+     */
+    const ERR_NOSUCHNICK = '401';
+
+    /**
+     * <server name> No such server
+     *
+     * Used to indicate the server name given currently doesn't exist.
+     */
+    const ERR_NOSUCHSERVER = '402';
+
+    /**
+     * <channel name> No such channel
+     *
+     * Used to indicate the given channel name is invalid.
+     */
+    const ERR_NOSUCHCHANNEL = '403';
+
+    /**
+     * <channel name> Cannot send to channel
+     *
+     * Sent to a user who is either (a) not on a channel which is mode +n or (b) not
+     * a chanop (or mode +v) on a channel which has mode +m set and is trying to send
+     * a PRIVMSG message to that channel.
+     */
+    const ERR_CANNOTSENDTOCHAN = '404';
+
+    /**
+     * <channel name> You have joined too many channels
+     *
+     * Sent to a user when they have joined the maximum number of allowed channels
+     * and they try to join another channel.
+     */
+    const ERR_TOOMANYCHANNELS = '405';
+
+    /**
+     * <nickname> There was no such nickname
+     *
+     * Returned by WHOWAS to indicate there is no history information for that
+     * nickname.
+     */
+    const ERR_WASNOSUCHNICK = '406';
+
+    /**
+     * <target> Duplicate recipients. No message delivered
+     *
+     * Returned to a client which is attempting to send PRIVMSG/NOTICE using the
+     * user@host destination format and for a user@host which has several
+     * occurrences.
+     */
+    const ERR_TOOMANYTARGETS = '407';
+
+    /**
+     * No origin specified
+     *
+     * PING or PONG message missing the originator parameter which is required since
+     * these commands must work without valid prefixes.
+     */
+    const ERR_NOORIGIN = '409';
+
+    /**
+     * No recipient given (<command>)
+     */
+    const ERR_NORECIPIENT = '411';
+
+    /**
+     * No text to send
+     */
+    const ERR_NOTEXTTOSEND = '412';
+
+    /**
+     * <mask> No toplevel domain specified
+     */
+    const ERR_NOTOPLEVEL = '413';
+
+    /**
+     * <mask> Wildcard in toplevel domain
+     *
+     * 412 - 414 are returned by PRIVMSG to indicate that the message wasn't
+     * delivered for some reason. ERR_NOTOPLEVEL and ERR_WILDTOPLEVEL are errors that
+     * are returned when an invalid use of "PRIVMSG $<server>" or "PRIVMSG #<host>"
+     * is attempted.
+     */
+    const ERR_WILDTOPLEVEL = '414';
+
+    /**
+     * <command> Unknown command
+     *
+     * Returned to a registered client to indicate that the command sent is unknown
+     * by the server.
+     */
+    const ERR_UNKNOWNCOMMAND = '421';
+
+    /**
+     * MOTD File is missing
+     *
+     * Server's MOTD file could not be opened by the server.
+     */
+    const ERR_NOMOTD = '422';
+
+    /**
+     * <server> No administrative info available
+     *
+     * Returned by a server in response to an ADMIN message when there is an error in
+     * finding the appropriate information.
+     */
+    const ERR_NOADMININFO = '423';
+
+    /**
+     * File error doing <file op> on <file>
+     *
+     * Generic error message used to report a failed file operation during the
+     * processing of a message.
+     */
+    const ERR_FILEERROR = '424';
+
+    /**
+     * No nickname given
+     *
+     * Returned when a nickname parameter expected for a command and isn't found.
+     */
+    const ERR_NONICKNAMEGIVEN = '431';
+
+    /**
+     * <nick> Erroneus nickname
+     *
+     * Returned after receiving a NICK message which contains characters which do not
+     * fall in the defined set. See section x.x.x for details on valid nicknames.
+     */
+    const ERR_ERRONEUSNICKNAME = '432';
+
+    /**
+     * <nick> Nickname is already in use
+     *
+     * Returned when a NICK message is processed that results in an attempt to change
+     * to a currently existing nickname.
+     */
+    const ERR_NICKNAMEINUSE = '433';
+
+    /**
+     * <nick> Nickname collision KILL
+     *
+     * Returned by a server to a client when it detects a nickname collision
+     * (registered of a NICK that already exists by another server).
+     */
+    const ERR_NICKCOLLISION = '436';
+
+    /**
+     * <nick> <channel> They aren't on that channel
+     *
+     * Returned by the server to indicate that the target user of the command is not
+     * on the given channel.
+     */
+    const ERR_USERNOTINCHANNEL = '441';
+
+    /**
+     * <channel> You're not on that channel
+     *
+     * Returned by the server whenever a client tries to perform a channel effecting
+     * command for which the client isn't a member.
+     */
+    const ERR_NOTONCHANNEL = '442';
+
+    /**
+     * <user> <channel> is already on channel
+     *
+     * Returned when a client tries to invite a user to a channel they are already
+     * on.
+     */
+    const ERR_USERONCHANNEL = '443';
+
+    /**
+     * <user> User not logged in
+     *
+     * Returned by the summon after a SUMMON command for a user was unable to be
+     * performed since they were not logged in.
+     */
+    const ERR_NOLOGIN = '444';
+
+    /**
+     * SUMMON has been disabled
+     *
+     * Returned as a response to the SUMMON command. Must be returned by any server
+     * which does not implement it.
+     */
+    const ERR_SUMMONDISABLED = '445';
+
+    /**
+     * USERS has been disabled
+     *
+     * Returned as a response to the USERS command. Must be returned by any server
+     * which does not implement it.
+     */
+    const ERR_USERSDISABLED = '446';
+
+    /**
+     * You have not registered
+     *
+     * Returned by the server to indicate that the client must be registered before
+     * the server will allow it to be parsed in detail.
+     */
+    const ERR_NOTREGISTERED = '451';
+
+    /**
+     * <command> Not enough parameters
+     *
+     * Returned by the server by numerous commands to indicate to the client that it
+     * didn't supply enough parameters.
+     */
+    const ERR_NEEDMOREPARAMS = '461';
+
+    /**
+     * You may not reregister
+     *
+     * Returned by the server to any link which tries to change part of the
+     * registered details (such as password or user details from second USER
+     * message).
+     */
+    const ERR_ALREADYREGISTRED = '462';
+
+    /**
+     * Your host isn't among the privileged
+     *
+     * Returned to a client which attempts to register with a server which does not
+     * been setup to allow connections from the host the attempted connection is
+     * tried.
+     */
+    const ERR_NOPERMFORHOST = '463';
+
+    /**
+     * Password incorrect
+     *
+     * Returned to indicate a failed attempt at registering a connection for which a
+     * password was required and was either not given or incorrect.
+     */
+    const ERR_PASSWDMISMATCH = '464';
+
+    /**
+     * You are banned from this server
+     *
+     * Returned after an attempt to connect and register yourself with a server which
+     * has been setup to explicitly deny connections to you.
+     */
+    const ERR_YOUREBANNEDCREEP = '465';
+
+    /**
+     * <channel> Channel key already set
+     */
+    const ERR_KEYSET = '467';
+
+    /**
+     * <channel> Cannot join channel (+l)
+     */
+    const ERR_CHANNELISFULL = '471';
+
+    /**
+     * <char> is unknown mode char to me
+     */
+    const ERR_UNKNOWNMODE = '472';
+
+    /**
+     * <channel> Cannot join channel (+i)
+     */
+    const ERR_INVITEONLYCHAN = '473';
+
+    /**
+     * <channel> Cannot join channel (+b)
+     */
+    const ERR_BANNEDFROMCHAN = '474';
+
+    /**
+     * <channel> Cannot join channel (+k)
+     */
+    const ERR_BADCHANNELKEY = '475';
+
+    /**
+     * Permission Denied- You're not an IRC operator
+     *
+     * Any command requiring operator privileges to operate must return this error to
+     * indicate the attempt was unsuccessful.
+     */
+    const ERR_NOPRIVILEGES = '481';
+
+    /**
+     * <channel> You're not channel operator
+     *
+     * Any command requiring 'chanop' privileges (such as MODE messages) must return
+     * this error if the client making the attempt is not a chanop on the specified
+     * channel.
+     */
+    const ERR_CHANOPRIVSNEEDED = '482';
+
+    /**
+     * You cant kill a server!
+     *
+     * Any attempts to use the KILL command on a server are to be refused and this
+     * error returned directly to the client.
+     */
+    const ERR_CANTKILLSERVER = '483';
+
+    /**
+     * No O-lines for your host
+     *
+     * If a client sends an OPER message and the server has not been configured to
+     * allow connections from the client's host as an operator, this error must be
+     * returned.
+     */
+    const ERR_NOOPERHOST = '491';
+
+    /**
+     * Unknown MODE flag
+     *
+     * Returned by the server to indicate that a MODE message was sent with a
+     * nickname parameter and that the a mode flag sent was not recognized.
+     */
+    const ERR_UMODEUNKNOWNFLAG = '501';
+
+    /**
+     * Cant change mode for other users
+     *
+     * Error sent to any user trying to view or change the user mode for a user other
+     * than themselves.
+     */
+    const ERR_USERSDONTMATCH = '502';
+
+    /**
+     * Dummy reply number. Not used.
+     */
+    const RPL_NONE = '300';
+
+    /**
+     * [<reply>{<space><reply>}]
+     *
+     * Reply format used by USERHOST to list replies to the query list. The reply
+     * string is composed as follows <reply> = <nick>['*'] '=' <'+'|'-'><hostname>
+     * The '*' indicates whether the client has registered as an Operator. The '-' or
+     * '+' characters represent whether the client has set an AWAY message or not
+     * respectively.
+     */
+    const RPL_USERHOST = '302';
+
+    /**
+     * [<nick> {<space><nick>}]
+     *
+     * Reply format used by ISON to list replies to the query list.
+     */
+    const RPL_ISON = '303';
+
+    /**
+     * <nick> <away message>
+     */
+    const RPL_AWAY = '301';
+
+    /**
+     * You are no longer marked as being away
+     */
+    const RPL_UNAWAY = '305';
+
+    /**
+     * You have been marked as being away
+     *
+     * These replies are used with the AWAY command (if allowed). RPL_AWAY is sent to
+     * any client sending a PRIVMSG to a client which is away. RPL_AWAY is only sent
+     * by the server to which the client is connected. Replies RPL_UNAWAY and
+     * RPL_NOWAWAY are sent when the client removes and sets an AWAY message.
+     */
+    const RPL_NOWAWAY = '306';
+
+    /**
+     * <nick> <user> <host> * <real name>
+     */
+    const RPL_WHOISUSER = '311';
+
+    /**
+     * <nick> <server> <server info>
+     */
+    const RPL_WHOISSERVER = '312';
+
+    /**
+     * <nick> is an IRC operator
+     */
+    const RPL_WHOISOPERATOR = '313';
+
+    /**
+     * <nick> <integer> seconds idle
+     */
+    const RPL_WHOISIDLE = '317';
+
+    /**
+     * <nick> End of /WHOIS list
+     */
+    const RPL_ENDOFWHOIS = '318';
+
+    /**
+     * <nick> {[@|+]<channel><space>}
+     *
+     * Replies 311 - 313, 317 - 319 are all replies generated in response to a WHOIS
+     * message. Given that there are enough parameters present, the answering server
+     * must either formulate a reply out of the above numerics (if the query nick is
+     * found) or return an error reply. The '*' in RPL_WHOISUSER is there as the
+     * literal character and not as a wild card. For each reply set, only
+     * RPL_WHOISCHANNELS may appear more than once (for long lists of channel names).
+     * The '@' and '+' characters next to the channel name indicate whether a client
+     * is a channel operator or has been granted permission to speak on a moderated
+     * channel. The RPL_ENDOFWHOIS reply is used to mark the end of processing a
+     * WHOIS message.
+     */
+    const RPL_WHOISCHANNELS = '319';
+
+    /**
+     * <nick> <user> <host> * <real name>
+     */
+    const RPL_WHOWASUSER = '314';
+
+    /**
+     * <nick> End of WHOWAS
+     *
+     * When replying to a WHOWAS message, a server must use the replies
+     * RPL_WHOWASUSER, RPL_WHOISSERVER or ERR_WASNOSUCHNICK for each nickname in the
+     * presented list. At the end of all reply batches, there must be RPL_ENDOFWHOWAS
+     * (even if there was only one reply and it was an error).
+     */
+    const RPL_ENDOFWHOWAS = '369';
+
+    /**
+     * Channel Users Name
+     */
+    const RPL_LISTSTART = '321';
+
+    /**
+     * <channel> <# visible> <topic>
+     */
+    const RPL_LIST = '322';
+
+    /**
+     * End of /LIST
+     *
+     * Replies RPL_LISTSTART, RPL_LIST, RPL_LISTEND mark the start, actual replies
+     * with data and end of the server's response to a LIST command. If there are no
+     * channels available to return, only the start and end reply must be sent.
+     */
+    const RPL_LISTEND = '323';
+
+    /**
+     * <channel> <mode> <mode params>
+     */
+    const RPL_CHANNELMODEIS = '324';
+
+    /**
+     * <channel> No topic is set
+     */
+    const RPL_NOTOPIC = '331';
+
+    /**
+     * <channel> <topic>
+     *
+     * When sending a TOPIC message to determine the channel topic, one of two
+     * replies is sent. If the topic is set, RPL_TOPIC is sent back else RPL_NOTOPIC.
+     */
+    const RPL_TOPIC = '332';
+
+    /**
+     * <channel> <nick>
+     *
+     * Returned by the server to indicate that the attempted INVITE message was
+     * successful and is being passed onto the end client.
+     */
+    const RPL_INVITING = '341';
+
+    /**
+     * <user> Summoning user to IRC
+     *
+     * Returned by a server answering a SUMMON message to indicate that it is
+     * summoning that user.
+     */
+    const RPL_SUMMONING = '342';
+
+    /**
+     * <version>.<debuglevel> <server> <comments>
+     *
+     * Reply by the server showing its version details. The <version> is the version
+     * of the software being used (including any patchlevel revisions) and the
+     * <debuglevel> is used to indicate if the server is running in "debug mode". The
+     * "comments" field may contain any comments about the version or further version
+     * details.
+     */
+    const RPL_VERSION = '351';
+
+    /**
+     * <channel> <user> <host> <server> <nick> <H|G>[*][@|+] <hopcount> <real name>
+     */
+    const RPL_WHOREPLY = '352';
+
+    /**
+     * <name> End of /WHO list
+     *
+     * The RPL_WHOREPLY and RPL_ENDOFWHO pair are used to answer a WHO message. The
+     * RPL_WHOREPLY is only sent if there is an appropriate match to the WHO query.
+     * If there is a list of parameters supplied with a WHO message, a RPL_ENDOFWHO
+     * must be sent after processing each list item with <name> being the item.
+     */
+    const RPL_ENDOFWHO = '315';
+
+    /**
+     * <channel> [[@|+]<nick> [[@|+]<nick> [...]]]
+     */
+    const RPL_NAMREPLY = '353';
+
+    /**
+     * <channel> End of /NAMES list
+     *
+     * To reply to a NAMES message, a reply pair consisting of RPL_NAMREPLY and
+     * RPL_ENDOFNAMES is sent by the server back to the client. If there is no
+     * channel found as in the query, then only RPL_ENDOFNAMES is returned. The
+     * exception to this is when a NAMES message is sent with no parameters and all
+     * visible channels and contents are sent back in a series of RPL_NAMEREPLY
+     * messages with a RPL_ENDOFNAMES to mark the end.
+     */
+    const RPL_ENDOFNAMES = '366';
+
+    /**
+     * <mask> <server> <hopcount> <server info>
+     */
+    const RPL_LINKS = '364';
+
+    /**
+     * <mask> End of /LINKS list
+     *
+     * In replying to the LINKS message, a server must send replies back using the
+     * RPL_LINKS numeric and mark the end of the list using an RPL_ENDOFLINKS reply.v
+     */
+    const RPL_ENDOFLINKS = '365';
+
+    /**
+     * <channel> <banid>
+     */
+    const RPL_BANLIST = '367';
+
+    /**
+     * <channel> End of channel ban list
+     *
+     * When listing the active 'bans' for a given channel, a server is required to
+     * send the list back using the RPL_BANLIST and RPL_ENDOFBANLIST messages. A
+     * separate RPL_BANLIST is sent for each active banid. After the banids have been
+     * listed (or if none present) a RPL_ENDOFBANLIST must be sent.
+     */
+    const RPL_ENDOFBANLIST = '368';
+
+    /**
+     * <string>
+     */
+    const RPL_INFO = '371';
+
+    /**
+     * End of /INFO list
+     *
+     * A server responding to an INFO message is required to send all its 'info' in a
+     * series of RPL_INFO messages with a RPL_ENDOFINFO reply to indicate the end of
+     * the replies.
+     */
+    const RPL_ENDOFINFO = '374';
+
+    /**
+     * - <server> Message of the day -
+     */
+    const RPL_MOTDSTART = '375';
+
+    /**
+     * - <text>
+     */
+    const RPL_MOTD = '372';
+
+    /**
+     * End of /MOTD command
+     *
+     * When responding to the MOTD message and the MOTD file is found, the file is
+     * displayed line by line, with each line no longer than 80 characters, using
+     * RPL_MOTD format replies. These should be surrounded by a RPL_MOTDSTART (before
+     * the RPL_MOTDs) and an RPL_ENDOFMOTD (after).
+     */
+    const RPL_ENDOFMOTD = '376';
+
+    /**
+     * You are now an IRC operator
+     *
+     * RPL_YOUREOPER is sent back to a client which has just successfully issued an
+     * OPER message and gained operator status.
+     */
+    const RPL_YOUREOPER = '381';
+
+    /**
+     * <config file> Rehashing
+     *
+     * If the REHASH option is used and an operator sends a REHASH message, an
+     * RPL_REHASHING is sent back to the operator.
+     */
+    const RPL_REHASHING = '382';
+
+    /**
+     * <server> <string showing server's local time>
+     *
+     * When replying to the TIME message, a server must send the reply using the
+     * RPL_TIME format above. The string showing the time need only contain the
+     * correct day and time there. There is no further requirement for the time
+     * string.
+     */
+    const RPL_TIME = '391';
+
+    /**
+     * UserID Terminal Host
+     */
+    const RPL_USERSSTART = '392';
+
+    /**
+     * %-8s %-9s %-8s
+     */
+    const RPL_USERS = '393';
+
+    /**
+     * End of users
+     */
+    const RPL_ENDOFUSERS = '394';
+
+    /**
+     * Nobody logged in
+     *
+     * If the USERS message is handled by a server, the replies RPL_USERSTART,
+     * RPL_USERS, RPL_ENDOFUSERS and RPL_NOUSERS are used. RPL_USERSSTART must be
+     * sent first, following by either a sequence of RPL_USERS or a single
+     * RPL_NOUSER. Following this is RPL_ENDOFUSERS.
+     */
+    const RPL_NOUSERS = '395';
+
+    /**
+     * Link <version & debug level> <destination> <next server>
+     */
+    const RPL_TRACELINK = '200';
+
+    /**
+     * Try. <class> <server>
+     */
+    const RPL_TRACECONNECTING = '201';
+
+    /**
+     * H.S. <class> <server>
+     */
+    const RPL_TRACEHANDSHAKE = '202';
+
+    /**
+     * ???? <class> [<client IP address in dot form>]
+     */
+    const RPL_TRACEUNKNOWN = '203';
+
+    /**
+     * Oper <class> <nick>
+     */
+    const RPL_TRACEOPERATOR = '204';
+
+    /**
+     * User <class> <nick>
+     */
+    const RPL_TRACEUSER = '205';
+
+    /**
+     * Serv <class> <int>S <int>C <server> <nick!user|*!*>@<host|server>
+     */
+    const RPL_TRACESERVER = '206';
+
+    /**
+     * <newtype> 0 <client name>
+     */
+    const RPL_TRACENEWTYPE = '208';
+
+    /**
+     * File <logfile> <debug level>
+     *
+     * The RPL_TRACE* are all returned by the server in response to the TRACE
+     * message. How many are returned is dependent on the the TRACE message and
+     * whether it was sent by an operator or not. There is no predefined order for
+     * which occurs first. Replies RPL_TRACEUNKNOWN, RPL_TRACECONNECTING and
+     * RPL_TRACEHANDSHAKE are all used for connections which have not been fully
+     * established and are either unknown, still attempting to connect or in the
+     * process of completing the 'server handshake'. RPL_TRACELINK is sent by any
+     * server which handles a TRACE message and has to pass it on to another server.
+     * The list of RPL_TRACELINKs sent in response to a TRACE command traversing the
+     * IRC network should reflect the actual connectivity of the servers themselves
+     * along that path. RPL_TRACENEWTYPE is to be used for any connection which does
+     * not fit in the other categories but is being displayed anyway.
+     */
+    const RPL_TRACELOG = '261';
+
+    /**
+     * <linkname> <sendq> <sent messages> <sent bytes> <received messages> <received
+     * bytes> <time open>
+     */
+    const RPL_STATSLINKINFO = '211';
+
+    /**
+     * <command> <count>
+     */
+    const RPL_STATSCOMMANDS = '212';
+
+    /**
+     * C <host> * <name> <port> <class>
+     */
+    const RPL_STATSCLINE = '213';
+
+    /**
+     * N <host> * <name> <port> <class>
+     */
+    const RPL_STATSNLINE = '214';
+
+    /**
+     * I <host> * <host> <port> <class>
+     */
+    const RPL_STATSILINE = '215';
+
+    /**
+     * K <host> * <username> <port> <class>
+     */
+    const RPL_STATSKLINE = '216';
+
+    /**
+     * Y <class> <ping frequency> <connect frequency> <max sendq>
+     */
+    const RPL_STATSYLINE = '218';
+
+    /**
+     * <stats letter> End of /STATS report
+     */
+    const RPL_ENDOFSTATS = '219';
+
+    /**
+     * L <hostmask> * <servername> <maxdepth>
+     */
+    const RPL_STATSLLINE = '241';
+
+    /**
+     * Server Up %d days %d%02d%02d
+     */
+    const RPL_STATSUPTIME = '242';
+
+    /**
+     * O <hostmask> * <name>
+     */
+    const RPL_STATSOLINE = '243';
+
+    /**
+     * H <hostmask> * <servername>
+     */
+    const RPL_STATSHLINE = '244';
+
+    /**
+     * <user mode string>
+     *
+     * To answer a query about a client's own mode, RPL_UMODEIS is sent back.
+     */
+    const RPL_UMODEIS = '221';
+
+    /**
+     * There are <integer> users and <integer> invisible on <integer> servers
+     */
+    const RPL_LUSERCLIENT = '251';
+
+    /**
+     * <integer> operator(s) online
+     */
+    const RPL_LUSEROP = '252';
+
+    /**
+     * <integer> unknown connection(s)
+     */
+    const RPL_LUSERUNKNOWN = '253';
+
+    /**
+     * <integer> channels formed
+     */
+    const RPL_LUSERCHANNELS = '254';
+
+    /**
+     * I have <integer> clients and <integer> servers
+     *
+     * In processing an LUSERS message, the server sends a set of replies from
+     * RPL_LUSERCLIENT, RPL_LUSEROP, RPL_USERUNKNOWN, RPL_LUSERCHANNELS and
+     * RPL_LUSERME. When replying, a server must send back RPL_LUSERCLIENT and
+     * RPL_LUSERME. The other replies are only sent back if a non-zero count is found
+     * for them.
+     */
+    const RPL_LUSERME = '255';
+
+    /**
+     * <server> Administrative info
+     */
+    const RPL_ADMINME = '256';
+
+    /**
+     * <admin info>
+     */
+    const RPL_ADMINLOC1 = '257';
+
+    /**
+     * <admin info>
+     */
+    const RPL_ADMINLOC2 = '258';
+
+    /**
+     * <admin info>
+     *
+     * When replying to an ADMIN message, a server is expected to use replies
+     * RLP_ADMINME through to RPL_ADMINEMAIL and provide a text message with each.
+     * For RPL_ADMINLOC1 a description of what city, state and country the server is
+     * in is expected, followed by details of the university and department
+     * (RPL_ADMINLOC2) and finally the administrative contact for the server (an
+     * email address here is required) in RPL_ADMINEMAIL.
+     */
+    const RPL_ADMINEMAIL = '259';
+
+    /**
+     * Reply code sent by the server, which can be compared to the ERR_* and
+     * RPL_* constants
+     *
+     * @var string
+     */
+    protected $code;
+
+    /**
+     * Reply code description sent by the server.
+     *
+     * @var string
+     */
+    protected $description;
+
+    /**
+     * Raw data sent by the server
+     *
+     * @var string
+     */
+    protected $rawData;
+
+    /**
+     * Event type
+     *
+     * @var string
+     */
+    protected $type = 'response';
+
+    /**
+     * Sets the reply code sent by the server.
+     *
+     * @param string $code Reply code
+     *
+     * @return Phergie_Event_Response Provides a fluent interface
+     */
+    public function setCode($code)
+    {
+        $this->code = $code;
+        return $this;
+    }
+
+    /**
+     * Returns the reply code sent by the server.
+     *
+     * @return string
+     */
+    public function getCode()
+    {
+        return $this->code;
+    }
+
+    /**
+     * Sets the reply code description sent by the server.
+     *
+     * @param string $description Reply code description
+     *
+     * @return Phergie_Event_Response Provides a fluent interface
+     */
+    public function setDescription($description)
+    {
+        $this->description = $description;
+        return $this;
+    }
+
+    /**
+     * Returns the reply code description sent by the server.
+     *
+     * @return string
+     */
+    public function getDescription()
+    {
+        return $this->description;
+    }
+
+    /**
+     * Sets the raw buffer for the given event
+     *
+     * @param string $buffer Raw event buffer
+     *
+     * @return Phergie_Event_Response Provides a fluent interface
+     */
+    public function setRawData($buffer)
+    {
+        $this->rawData = $buffer;
+        return $this;
+    }
+
+    /**
+     * Returns the raw buffer that was sent from the server for that event
+     *
+     * @return string
+     */
+    public function getRawData()
+    {
+        return $this->rawData;
+    }
+}
diff --git a/plugins/Irc/extlib/phergie/Phergie/Exception.php b/plugins/Irc/extlib/phergie/Phergie/Exception.php
new file mode 100755
index 0000000000..f4d71e5319
--- /dev/null
+++ b/plugins/Irc/extlib/phergie/Phergie/Exception.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Phergie 
+ *
+ * PHP version 5
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.
+ * It is also available through the world-wide-web at this URL:
+ * http://phergie.org/license
+ *
+ * @category  Phergie 
+ * @package   Phergie
+ * @author    Phergie Development Team <team@phergie.org>
+ * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
+ * @license   http://phergie.org/license New BSD License
+ * @link      http://pear.phergie.org/package/Phergie
+ */
+
+/**
+ * Base class for all Phergie-related exceptions.
+ *
+ * @category Phergie 
+ * @package  Phergie
+ * @author   Phergie Development Team <team@phergie.org>
+ * @license  http://phergie.org/license New BSD License
+ * @link     http://pear.phergie.org/package/Phergie
+ */
+class Phergie_Exception extends Exception
+{
+}
diff --git a/plugins/Irc/extlib/phergie/Phergie/Hostmask.php b/plugins/Irc/extlib/phergie/Phergie/Hostmask.php
new file mode 100755
index 0000000000..b13842f53c
--- /dev/null
+++ b/plugins/Irc/extlib/phergie/Phergie/Hostmask.php
@@ -0,0 +1,217 @@
+<?php
+/**
+ * Phergie 
+ *
+ * PHP version 5
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.
+ * It is also available through the world-wide-web at this URL:
+ * http://phergie.org/license
+ *
+ * @category  Phergie 
+ * @package   Phergie
+ * @author    Phergie Development Team <team@phergie.org>
+ * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
+ * @license   http://phergie.org/license New BSD License
+ * @link      http://pear.phergie.org/package/Phergie
+ */
+
+/**
+ * Data structure for a hostmask.
+ *
+ * @category Phergie 
+ * @package  Phergie
+ * @author   Phergie Development Team <team@phergie.org>
+ * @license  http://phergie.org/license New BSD License
+ * @link     http://pear.phergie.org/package/Phergie
+ */
+class Phergie_Hostmask
+{
+    /**
+     * Host
+     *
+     * @var string
+     */
+    protected $host;
+
+    /**
+     * Nick
+     *
+     * @var string
+     */
+    protected $nick;
+
+    /**
+     * Username
+     *
+     * @var string
+     */
+    protected $username;
+
+    /**
+     * Regular expression used to parse a hostmask
+     *
+     * @var string
+     */
+    protected static $regex = '/^([^!@]+)!(?:[ni]=)?([^@]+)@([^ ]+)/';
+
+    /**
+     * Constructor to initialize components of the hostmask.
+     *
+     * @param string $nick     Nick component
+     * @param string $username Username component
+     * @param string $host     Host component
+     *
+     * @return void
+     */
+    public function __construct($nick, $username, $host)
+    {
+        $this->nick = $nick;
+        $this->username = $username;
+        $this->host = $host;
+    }
+
+    /**
+     * Returns whether a given string appears to be a valid hostmask.
+     *
+     * @param string $string Alleged hostmask string
+     *
+     * @return bool TRUE if the string appears to be a valid hostmask, FALSE 
+     *         otherwise
+     */
+    public static function isValid($string)
+    {
+        return (preg_match(self::$regex, $string) > 0);
+    }
+
+    /**
+     * Parses a string containing the entire hostmask into a new instance of 
+     * this class.
+     *
+     * @param string $hostmask Entire hostmask including the nick, username, 
+     *        and host components
+     *
+     * @return Phergie_Hostmask New instance populated with data parsed from 
+     *         the provided hostmask string
+     * @throws Phergie_Hostmask_Exception
+     */
+    public static function fromString($hostmask)
+    {
+        if (preg_match(self::$regex, $hostmask, $match)) {
+            list(, $nick, $username, $host) = $match; 
+            return new self($nick, $username, $host);
+        }
+
+        throw new Phergie_Hostmask_Exception(
+            'Invalid hostmask specified: "' . $hostmask . '"',
+            Phergie_Hostmask_Exception::ERR_INVALID_HOSTMASK
+        );
+    }
+
+    /**
+     * Sets the hostname.
+     *
+     * @param string $host Hostname
+     *
+     * @return Phergie_Hostmask Provides a fluent interface
+     */
+    public function setHost($host)
+    {
+        $this->host = $host;
+
+        return $this;
+    }
+
+    /**
+     * Returns the hostname.
+     *
+     * @return string
+     */
+    public function getHost()
+    {
+        return $this->host;
+    }
+
+    /**
+     * Sets the username of the user.
+     *
+     * @param string $username Username
+     *
+     * @return Phergie_Hostmask Provides a fluent interface
+     */
+    public function setUsername($username)
+    {
+        $this->username = $username;
+
+        return $this;
+    }
+
+    /**
+     * Returns the username of the user.
+     *
+     * @return string
+     */
+    public function getUsername()
+    {
+        return $this->username;
+    }
+
+    /**
+     * Sets the nick of the user.
+     *
+     * @param string $nick User nick
+     *
+     * @return Phergie_Hostmask Provides a fluent interface
+     */
+    public function setNick($nick)
+    {
+        $this->nick = $nick;
+
+        return $this;
+    }
+
+    /**
+     * Returns the nick of the user.
+     *
+     * @return string
+     */
+    public function getNick()
+    {
+        return $this->nick;
+    }
+
+    /**
+     * Returns the hostmask for the originating server or user.
+     *
+     * @return string
+     */
+    public function __toString()
+    {
+        return $this->nick . '!' . $this->username . '@' . $this->host;
+    }
+
+    /**
+     * Returns whether a given hostmask matches a given pattern.
+     *
+     * @param string $pattern  Pattern using conventions of a ban mask where 
+     *        represents a wildcard
+     * @param string $hostmask Optional hostmask to match against, if not 
+     *        the current hostmask instance
+     *
+     * @return bool TRUE if the hostmask matches the pattern, FALSE otherwise
+     * @link http://irchelp.org/irchelp/rfc/chapter4.html#c4_2_3 Examples
+     */
+    public function matches($pattern, $hostmask = null)
+    {
+        if (!$hostmask) {
+            $hostmask = (string) $this;
+        }
+
+        $pattern = str_replace('*', '.*', $pattern);
+
+        return (preg_match('#^' . $pattern . '$#', $hostmask) > 0);
+    }
+}
diff --git a/plugins/Irc/extlib/phergie/Phergie/Hostmask/Exception.php b/plugins/Irc/extlib/phergie/Phergie/Hostmask/Exception.php
new file mode 100644
index 0000000000..590f020046
--- /dev/null
+++ b/plugins/Irc/extlib/phergie/Phergie/Hostmask/Exception.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * Phergie 
+ *
+ * PHP version 5
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.
+ * It is also available through the world-wide-web at this URL:
+ * http://phergie.org/license
+ *
+ * @category  Phergie 
+ * @package   Phergie
+ * @author    Phergie Development Team <team@phergie.org>
+ * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
+ * @license   http://phergie.org/license New BSD License
+ * @link      http://pear.phergie.org/package/Phergie
+ */
+
+/**
+ * Exception related to hostmask handling.
+ *
+ * @category Phergie 
+ * @package  Phergie
+ * @author   Phergie Development Team <team@phergie.org>
+ * @license  http://phergie.org/license New BSD License
+ * @link     http://pear.phergie.org/package/Phergie
+ */
+class Phergie_Hostmask_Exception extends Phergie_Exception
+{
+    /**
+     * Error indicating that an invalid hostmask string was specified
+     */
+    const ERR_INVALID_HOSTMASK = 1;
+}
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Abstract.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Abstract.php
new file mode 100755
index 0000000000..294c04ce52
--- /dev/null
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Abstract.php
@@ -0,0 +1,582 @@
+<?php
+/**
+ * Phergie 
+ *
+ * PHP version 5
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.
+ * It is also available through the world-wide-web at this URL:
+ * http://phergie.org/license
+ *
+ * @category  Phergie 
+ * @package   Phergie
+ * @author    Phergie Development Team <team@phergie.org>
+ * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
+ * @license   http://phergie.org/license New BSD License
+ * @link      http://pear.phergie.org/package/Phergie
+ */
+
+/**
+ * Base class for plugins to provide event handler stubs and commonly needed
+ * functionality.
+ *
+ * @category Phergie 
+ * @package  Phergie
+ * @author   Phergie Development Team <team@phergie.org>
+ * @license  http://phergie.org/license New BSD License
+ * @link     http://pear.phergie.org/package/Phergie
+ */
+abstract class Phergie_Plugin_Abstract
+{
+    /**
+     * Current configuration handler
+     *
+     * @var Phergie_Config
+     */
+    protected $config;
+
+    /**
+     * Plugin handler used to provide access to other plugins
+     *
+     * @var Phergie_Plugin_Handler
+     */
+    protected $plugins;
+
+    /**
+     * Current event handler instance for outgoing events
+     *
+     * @var Phergie_Event_Handler
+     */
+    protected $events;
+
+    /**
+     * Current connection instance
+     *
+     * @var Phergie_Connection
+     */
+    protected $connection;
+
+    /**
+     * Current incoming event being handled
+     *
+     * @var Phergie_Event_Request|Phergie_Event_Response
+     */
+    protected $event;
+
+    /**
+     * Returns the short name for the plugin based on its class name.
+     *
+     * @return string
+     */
+    public function getName()
+    {
+        return substr(strrchr(get_class($this), '_'), 1);
+    }
+
+    /**
+     * Indicates that the plugin failed to load due to an unsatisfied 
+     * runtime requirement, such as a missing dependency.
+     *
+     * @param string $message Error message to provide more information 
+     *        about the reason for the failure
+     *
+     * @return Phergie_Plugin_Abstract Provides a fluent interface
+     * @throws Phergie_Plugin_Exception Always
+     */
+    protected function fail($message)
+    {
+        throw new Phergie_Plugin_Exception(
+            $message,
+            Phergie_Plugin_Exception::ERR_REQUIREMENT_UNSATISFIED
+        );
+    }
+
+    /**
+     * Sets the current configuration handler.
+     *
+     * @param Phergie_Config $config Configuration handler
+     *
+     * @return Phergie_Plugin_Abstract Provides a fluent interface
+     */
+    public function setConfig(Phergie_Config $config)
+    {
+        $this->config = $config;
+        return $this;
+    }
+
+    /**
+     * Returns the current configuration handler or the value of a single 
+     * setting from it.
+     *
+     * @param string $name    Optional name of a setting for which the value 
+     *        should be returned instead of the entire configuration handler
+     * @param mixed  $default Optional default value to return if no value 
+     *        is set for the setting indicated by $name
+     *
+     * @return Phergie_Config|mixed Configuration handler or value of the 
+     *         setting specified by $name
+     * @throws Phergie_Plugin_Exception No configuration handler has been set 
+     */
+    public function getConfig($name = null, $default = null)
+    {
+        if (empty($this->config)) {
+            throw new Phergie_Plugin_Exception(
+                'Configuration handler cannot be accessed before one is set',
+                Phergie_Plugin_Exception::ERR_NO_CONFIG_HANDLER
+            );
+        }
+        if (!is_null($name)) {
+            if (!isset($this->config[$name])) {
+                return $default;
+            }
+            return $this->config[$name];
+        }
+        return $this->config;
+    }
+
+    /**
+     * Sets the current plugin handler.
+     *
+     * @param Phergie_Plugin_Handler $handler Plugin handler
+     *
+     * @return Phergie_Plugin_Abstract Provides a fluent interface
+     */
+    public function setPluginHandler(Phergie_Plugin_Handler $handler)
+    {
+        $this->plugins = $handler;
+        return $this;
+    }
+
+    /**
+     * Returns the current plugin handler.
+     *
+     * @return Phergie_Plugin_Handler
+     * @throws Phergie_Plugin_Exception No plugin handler has been set 
+     */
+    public function getPluginHandler()
+    {
+        if (empty($this->plugins)) {
+            throw new Phergie_Plugin_Exception(
+                'Plugin handler cannot be accessed before one is set',
+                Phergie_Plugin_Exception::ERR_NO_PLUGIN_HANDLER
+            );
+        }
+        return $this->plugins;
+    }
+
+    /**
+     * Sets the current event handler.
+     *
+     * @param Phergie_Event_Handler $handler Event handler
+     *
+     * @return Phergie_Plugin_Abstract Provides a fluent interface
+     */
+    public function setEventHandler(Phergie_Event_Handler $handler)
+    {
+        $this->events = $handler;
+        return $this;
+    }
+
+    /**
+     * Returns the current event handler.
+     *
+     * @return Phergie_Event_Handler
+     * @throws Phergie_Plugin_Exception No event handler has been set 
+     */
+    public function getEventHandler()
+    {
+        if (empty($this->events)) {
+            throw new Phergie_Plugin_Exception(
+                'Event handler cannot be accessed before one is set',
+                Phergie_Plugin_Exception::ERR_NO_EVENT_HANDLER
+            );
+        }
+        return $this->events;
+    }
+
+    /**
+     * Sets the current connection.
+     *
+     * @param Phergie_Connection $connection Connection
+     *
+     * @return Phergie_Plugin_Abstract Provides a fluent interface
+     */
+    public function setConnection(Phergie_Connection $connection)
+    {
+        $this->connection = $connection;
+        return $this;
+    }
+
+    /**
+     * Returns the current event connection.
+     *
+     * @return Phergie_Connection
+     * @throws Phergie_Plugin_Exception No connection has been set 
+     */
+    public function getConnection()
+    {
+        if (empty($this->connection)) {
+            throw new Phergie_Plugin_Exception(
+                'Connection cannot be accessed before one is set',
+                Phergie_Plugin_Exception::ERR_NO_CONNECTION
+            );
+        }
+        return $this->connection;
+    }
+
+    /**
+     * Sets the current incoming event to be handled.
+     *
+     * @param Phergie_Event_Request|Phergie_Event_Response $event Event
+     *
+     * @return Phergie_Plugin_Abstract Provides a fluent interface
+     */
+    public function setEvent($event)
+    {
+        $this->event = $event;
+        return $this;
+    }
+
+    /**
+     * Returns the current incoming event to be handled.
+     *
+     * @return Phergie_Event_Request|Phergie_Event_Response
+     */
+    public function getEvent()
+    {
+        if (empty($this->connection)) {
+            throw new Phergie_Plugin_Exception(
+                'Event cannot be accessed before one is set',
+                Phergie_Plugin_Exception::ERR_NO_EVENT
+            );
+        }
+        return $this->event;
+    }
+
+    /**
+     * Provides do* methods with signatures identical to those of
+     * Phergie_Driver_Abstract but that queue up events to be dispatched
+     * later.
+     *
+     * @param string $name Name of the method called
+     * @param array  $args Arguments passed in the call
+     *
+     * @return mixed
+     */
+    public function __call($name, array $args)
+    {
+        $subcmd = substr($name, 0, 2);
+        if ($subcmd == 'do') {
+            $type = strtolower(substr($name, 2));
+            $this->getEventHandler()->addEvent($this, $type, $args);
+        } else if ($subcmd != 'on') {
+            throw new Phergie_Plugin_Exception(
+                'Called invalid method ' . $name . ' in ' . get_class($this),
+                Phergie_Plugin_Exception::ERR_INVALID_CALL
+            );
+        }
+    }
+
+    /**
+     * Handler for when the plugin is initially loaded - useful for checking 
+     * runtime dependencies or performing any setup necessary for the plugin 
+     * to function properly such as initializing a database.
+     *
+     * @return void
+     */
+    public function onLoad()
+    {
+    }
+
+    /**
+     * Handler for when the bot initially connects to a server.
+     *
+     * @return void
+     */
+    public function onConnect()
+    {
+    }
+
+    /**
+     * Handler for each tick, a single iteration of the continuous loop 
+     * executed by the bot to receive, handle, and send events - useful for  
+     * repeated execution of tasks on a time interval.
+     *
+     * @return void
+     */
+    public function onTick()
+    {
+    }
+
+    /**
+     * Handler for when any event is received but has not yet been dispatched 
+     * to the plugin handler method specific to its event type.
+     *
+     * @return bool|null|void FALSE to short-circuit further event 
+     *         processing, TRUE or NULL otherwise
+     */
+    public function preEvent()
+    {
+    }
+
+    /**
+     * Handler for after plugin processing of an event has concluded but 
+     * before any events triggered in response by plugins are sent to the 
+     * server - useful for modifying outgoing events before they are sent.
+     *
+     * @return void
+     */
+    public function preDispatch()
+    {
+    }
+
+    /**
+     * Handler for after any events triggered by plugins in response to a 
+     * received event are sent to the server. 
+     *
+     * @return void
+     */
+    public function postDispatch()
+    {
+    }
+
+    /**
+     * Handler for when the server prompts the client for a nick.
+     *
+     * @return void
+     * @link http://irchelp.org/irchelp/rfc/chapter4.html#c4_1_2
+     */
+    public function onNick()
+    {
+    }
+
+    /**
+     * Handler for when a user obtains operator privileges.
+     *
+     * @return void
+     * @link http://irchelp.org/irchelp/rfc/chapter4.html#c4_1_5
+     */
+    public function onOper()
+    {
+    }
+
+    /**
+     * Handler for when the client session is about to be terminated.
+     *
+     * @return void
+     * @link http://irchelp.org/irchelp/rfc/chapter4.html#c4_1_6
+     */
+    public function onQuit()
+    {
+    }
+
+    /**
+     * Handler for when a user joins a channel.
+     *
+     * @return void
+     * @link http://irchelp.org/irchelp/rfc/chapter4.html#c4_2_1
+     */
+    public function onJoin()
+    {
+    }
+
+    /**
+     * Handler for when a user leaves a channel.
+     *
+     * @return void
+     * @link http://irchelp.org/irchelp/rfc/chapter4.html#c4_2_2
+     */
+    public function onPart()
+    {
+    }
+
+    /**
+     * Handler for when a user or channel mode is changed.
+     *
+     * @return void
+     * @link http://irchelp.org/irchelp/rfc/chapter4.html#c4_2_3
+     */
+    public function onMode()
+    {
+    }
+
+    /**
+     * Handler for when a channel topic is viewed or changed.
+     *
+     * @return void
+     * @link http://irchelp.org/irchelp/rfc/chapter4.html#c4_2_4
+     */
+    public function onTopic()
+    {
+    }
+
+    /**
+     * Handler for when a message is received from a channel or user.
+     *
+     * @return void
+     * @link http://irchelp.org/irchelp/rfc/chapter4.html#c4_4_1
+     */
+    public function onPrivmsg()
+    {
+    }
+
+    /**
+     * Handler for when the bot receives a CTCP ACTION request.
+     *
+     * @return void
+     * @link http://www.invlogic.com/irc/ctcp.html#4.4
+     */
+    public function onAction()
+    {
+    }
+
+    /**
+     * Handler for when a notice is received.
+     *
+     * @return void
+     * @link http://irchelp.org/irchelp/rfc/chapter4.html#c4_4_2
+     */
+    public function onNotice()
+    {
+    }
+
+    /**
+     * Handler for when a user is kicked from a channel.
+     *
+     * @return void
+     * @link http://irchelp.org/irchelp/rfc/chapter4.html#c4_2_8
+     */
+    public function onKick()
+    {
+    }
+
+    /**
+     * Handler for when the bot receives a ping event from a server, at 
+     * which point it is expected to respond with a pong request within 
+     * a short period else the server may terminate its connection.
+     *
+     * @return void
+     * @link http://irchelp.org/irchelp/rfc/chapter4.html#c4_6_2 
+     */
+    public function onPing()
+    {
+    }
+
+    /**
+     * Handler for when the bot receives a CTCP TIME request.
+     *
+     * @return void
+     * @link http://www.invlogic.com/irc/ctcp.html#4.6
+     */
+    public function onTime()
+    {
+    }
+
+    /**
+     * Handler for when the bot receives a CTCP VERSION request.
+     *
+     * @return void
+     * @link http://www.invlogic.com/irc/ctcp.html#4.1
+     */
+    public function onVersion()
+    {
+    }
+
+    /**
+     * Handler for when the bot receives a CTCP PING request.
+     *
+     * @return void
+     * @link http://www.invlogic.com/irc/ctcp.html#4.2
+     */
+    public function onCtcpPing()
+    {
+    }
+
+    /**
+     * Handler for when the bot receives a CTCP request of an unknown type. 
+     *
+     * @return void
+     * @link http://www.invlogic.com/irc/ctcp.html
+     */
+    public function onCtcp()
+    {
+    }
+
+    /**
+     * Handler for when a reply is received for a CTCP PING request sent by 
+     * the bot.
+     *
+     * @return void
+     * @link http://www.invlogic.com/irc/ctcp.html#4.2
+     */
+    public function onPingReply()
+    {
+    }
+
+    /**
+     * Handler for when a reply is received for a CTCP TIME request sent by 
+     * the bot.
+     *
+     * @return void
+     * @link http://www.invlogic.com/irc/ctcp.html#4.6
+     */
+    public function onTimeReply()
+    {
+    }
+
+    /**
+     * Handler for when a reply is received for a CTCP VERSION request sent 
+     * by the bot.
+     *
+     * @return void
+     * @link http://www.invlogic.com/irc/ctcp.html#4.1
+     */
+    public function onVersionReply()
+    {
+    }
+
+    /**
+     * Handler for when a reply received for a CTCP request of an unknown 
+     * type.
+     *
+     * @return void
+     * @link http://www.invlogic.com/irc/ctcp.html
+     */
+    public function onCtcpReply()
+    {
+    }
+
+    /**
+     * Handler for when the bot receives a kill request from a server.
+     *
+     * @return void
+     * @link http://irchelp.org/irchelp/rfc/chapter4.html#c4_6_1
+     */
+    public function onKill()
+    {
+    }
+
+    /**
+     * Handler for when the bot receives an invitation to join a channel. 
+     *
+     * @return void
+     * @link http://irchelp.org/irchelp/rfc/chapter4.html#c4_2_7
+     */
+    public function onInvite()
+    {
+    }
+
+    /**
+     * Handler for when a server response is received to a command issued by 
+     * the bot.
+     *
+     * @return void
+     * @link http://irchelp.org/irchelp/rfc/chapter6.html
+     */
+    public function onResponse()
+    {
+    }
+}
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Acl.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Acl.php
new file mode 100755
index 0000000000..9738df60e0
--- /dev/null
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Acl.php
@@ -0,0 +1,92 @@
+<?php
+/**
+ * Phergie 
+ *
+ * PHP version 5
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.
+ * It is also available through the world-wide-web at this URL:
+ * http://phergie.org/license
+ *
+ * @category  Phergie 
+ * @package   Phergie_Plugin_Acl
+ * @author    Phergie Development Team <team@phergie.org>
+ * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
+ * @license   http://phergie.org/license New BSD License
+ * @link      http://pear.phergie.org/package/Phergie_Plugin_Acl
+ */
+
+/**
+ * Provides an access control system to limit reponses to events based on 
+ * the users who originate them.
+ *
+ * @category Phergie 
+ * @package  Phergie_Plugin_Acl
+ * @author   Phergie Development Team <team@phergie.org>
+ * @license  http://phergie.org/license New BSD License
+ * @link     http://pear.phergie.org/package/Phergie_Plugin_Acl
+ */
+class Phergie_Plugin_Acl extends Phergie_Plugin_Abstract
+{
+    /**
+     * Checks for permission settings and removes the plugin if none are set.
+     *
+     * @return void
+     */
+    public function onLoad()
+    {
+        if (!$this->getConfig('acl.blacklist')
+            && !$this->getConfig('acl.whitelist')
+        ) {
+            $this->plugins->removePlugin($this);
+        }
+    }
+
+    /**
+     * Checks permission settings and short-circuits event processing for 
+     * blacklisted users.
+     *
+     * @return bool FALSE to short-circuit event processing if the user is 
+     *         blacklisted, TRUE otherwise
+     */
+    public function preEvent()
+    {
+        // Ignore server responses
+        if ($this->event instanceof Phergie_Event_Response) {
+            return true;
+        }
+
+        // Ignore server-initiated events
+        if (!$this->event->isFromUser()) {
+            return true;
+        }
+
+        // Determine whether a whitelist or blacklist is being used
+        $list = $this->getConfig('acl.whitelist');
+        $matches = true;
+        if (!$list) {
+            $list = $this->getConfig('acl.blacklist');
+            $matches = false;
+        }
+
+        // Support host-specific lists 
+        $host = $this->connection->getHost();
+        if (isset($list[$host])) {
+            $list = $list[$host];
+        }
+
+        // Short-circuit event processing if appropriate 
+        $hostmask = $this->event->getHostmask();
+        foreach ($list as $pattern) {
+            if ($hostmask->matches($pattern)) {
+                return $matches;
+            }
+        }
+
+        // Allow event processing if appropriate 
+        return !$matches;
+    }
+}
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/AltNick.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/AltNick.php
new file mode 100755
index 0000000000..16d5f9b9cc
--- /dev/null
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/AltNick.php
@@ -0,0 +1,95 @@
+<?php
+/**
+ * Phergie 
+ *
+ * PHP version 5
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.
+ * It is also available through the world-wide-web at this URL:
+ * http://phergie.org/license
+ *
+ * @category  Phergie 
+ * @package   Phergie_Plugin_AltNick
+ * @author    Phergie Development Team <team@phergie.org>
+ * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
+ * @license   http://phergie.org/license New BSD License
+ * @link      http://pear.phergie.org/package/Phergie_Plugin_AltNick
+ */
+
+/**
+ * Handles switching to alternate nicks in cases where the primary nick is 
+ * not available for use.
+ *
+ * @category Phergie 
+ * @package  Phergie_Plugin_AltNick
+ * @author   Phergie Development Team <team@phergie.org>
+ * @license  http://phergie.org/license New BSD License
+ * @link     http://pear.phergie.org/package/Phergie_Plugin_AltNick
+ * @uses     extension spl 
+ */
+class Phergie_Plugin_AltNick extends Phergie_Plugin_Abstract
+{
+    /**
+     * Iterator for the alternate nick list
+     *
+     * @var ArrayIterator 
+     */
+    protected $iterator;
+
+    /**
+     * Initializes instance variables.
+     *
+     * @return void
+     */
+    public function onConnect()
+    {
+        if ($this->config['altnick.nicks']) {
+            if (is_string($this->config['altnick.nicks'])) {
+                $this->config['altnick.nicks'] 
+                    = array($this->config['altnick.nicks']);
+            }
+            $this->iterator = new ArrayIterator($this->config['altnick.nicks']);
+        }
+    }
+
+    /**
+     * Switches to alternate nicks as needed when nick collisions occur.
+     *
+     * @return void
+     */
+    public function onResponse()
+    {
+        // If no alternate nick list was found, return
+        if (empty($this->iterator)) {
+            return;
+        }
+
+        // If the response event indicates that the nick set is in use...
+        $code = $this->getEvent()->getCode();
+        if ($code == Phergie_Event_Response::ERR_NICKNAMEINUSE) {
+
+            // Attempt to move to the next nick in the alternate nick list
+            $this->iterator->next();
+
+            // If another nick is available...
+            if ($this->iterator->valid()) {
+                
+                // Switch to the new nick
+                $altNick = $this->iterator->current();
+                $this->doNick($altNick);
+
+                // Update the connection to reflect the nick change
+                $this->getConnection()->setNick($altNick);
+
+            } else {
+                // If no other nicks are available...
+
+                // Terminate the connection
+                $this->doQuit('All specified alternate nicks are in use');
+            }
+        }
+    }
+}
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/AudioScrobbler.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/AudioScrobbler.php
new file mode 100755
index 0000000000..ed4030a284
--- /dev/null
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/AudioScrobbler.php
@@ -0,0 +1,191 @@
+<?php
+/**
+ * Phergie
+ *
+ * PHP version 5
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.
+ * It is also available through the world-wide-web at this URL:
+ * http://phergie.org/license
+ *
+ * @category  Phergie
+ * @package   Phergie_Plugin_AudioScrobbler
+ * @author    Phergie Development Team <team@phergie.org>
+ * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
+ * @license   http://phergie.org/license New BSD License
+ * @link      http://pear.phergie.org/package/Phergie_Plugin_AudioScrobbler
+ */
+
+/**
+ * Provides commands to look up information on tracks played by specific 
+ * users on the Last.fm and Libre.fm services.
+ *
+ * TODO: Make the "nick-binding" use an SQLite database instead of having them
+ *       hard-coded in to the config file.
+ * 
+ * Configuration settings:
+ * "audioscrobbler.lastfm_api_key":  API given by last.fm (string).
+ * "audioscrobbler.librefm_api_key": API key given by libre.fm (string).
+ * 
+ * @category Phergie
+ * @package  Phergie_Plugin_AudioScrobbler
+ * @author   Phergie Development Team <team@phergie.org>
+ * @license  http://phergie.org/license New BSD License
+ * @link     http://pear.phergie.org/package/Phergie_Plugin_AudioScrobbler
+ * @uses     Phergie_Plugin_Command pear.phergie.org
+ * @uses     Phergie_Plugin_Http pear.phergie.org
+ * @uses     extension simplexml
+ */
+class Phergie_Plugin_AudioScrobbler extends Phergie_Plugin_Abstract
+{
+    /**
+     * Last.FM API entry point
+     *
+     * @var string
+     */
+    protected $lastfmUrl = 'http://ws.audioscrobbler.com/2.0/';
+    
+    /**
+     * Libre.FM API entry point
+     *
+     * @var string
+     */
+    protected $librefmUrl = 'http://alpha.dev.libre.fm/2.0/';
+    
+    /**
+     * Scrobbler query string for user.getRecentTracks
+     *
+     * @var string
+     */
+    protected $query = '?method=user.getrecenttracks&user=%s&api_key=%s';
+
+    /**
+     * HTTP plugin
+     *
+     * @var Phergie_Plugin_Http
+     */
+    protected $http;
+    
+    /**
+     * Check for dependencies.
+     *
+     * @return void
+     */
+    public function onLoad()
+    {
+        if (!extension_loaded('simplexml')) {
+            $this->fail('SimpleXML php extension is required');
+        }
+        
+        $plugins = $this->getPluginHandler();
+        $plugins->getPlugin('Command');
+        $this->http = $plugins->getPlugin('Http');
+    }
+    
+    /**
+     * Command function to get a user's status on last.fm.
+     * 
+     * @param string $user User identifier
+     *
+     * @return void
+     */
+    public function onCommandLastfm($user = null)
+    {
+        if ($key = $this->config['audioscrobbler.lastfm_api_key']) {
+            $scrobbled = $this->getScrobbled($user, $this->lastfmUrl, $key);
+            if ($scrobbled) {
+                $this->doPrivmsg($this->getEvent()->getSource(), $scrobbled);
+            }
+        }
+    }
+
+    /**
+     * Command function to get a user's status on libre.fm.
+     * 
+     * @param string $user User identifier
+     *
+     * @return void
+     */
+    public function onCommandLibrefm($user = null)
+    {
+        if ($key = $this->config['audioscrobbler.librefm_api_key']) {
+            $scrobbled = $this->getScrobbled($user, $this->librefmUrl, $key);
+            if ($scrobbled) {
+                $this->doPrivmsg($this->getEvent()->getSource(), $scrobbled);
+            }
+        }
+    }
+
+    /**
+     * Simple Scrobbler API function to get a formatted string of the most 
+     * recent track played by a user.
+     * 
+     * @param string $user Username to look up
+     * @param string $url  Base URL of the scrobbler service
+     * @param string $key  Scrobbler service API key
+     *
+     * @return string Formatted string of the most recent track played
+     */
+    public function getScrobbled($user, $url, $key)
+    {
+        $event = $this->getEvent();
+        $user = $user ? $user : $event->getNick();
+        $url = sprintf($url . $this->query, urlencode($user), urlencode($key));
+
+        $response = $this->http->get($url);
+        if ($response->isError()) {
+            $this->doNotice(
+                $event->getNick(),
+                'Can\'t find status for ' . $user . ': HTTP ' . 
+                $response->getCode() . ' ' . $response->getMessage()
+            );
+            return false; 
+        }
+        
+        $xml = $response->getContent();
+        if ($xml->error) {
+            $this->doNotice(
+                $event->getNick(),
+                'Can\'t find status for ' . $user . ': API ' . $xml->error
+            );
+            return false; 
+        }
+        
+        $recenttracks = $xml->recenttracks;
+        $track = $recenttracks->track[0];
+        
+        // If the user exists but has not scrobbled anything, the result will
+        // be empty.
+        if (empty($track->name) && empty($track->artist)) {
+            $this->doNotice(
+                $event->getNick(),
+                'Can\'t find track information for ' . $recenttracks['user']
+            );
+            return false;
+        }
+        
+        if (isset($track['nowplaying'])) {
+            $msg = sprintf(
+                '%s is listening to %s by %s',
+                $recenttracks['user'],
+                $track->name,
+                $track->artist
+            );
+        } else {
+            $msg = sprintf(
+                '%s, %s was listening to %s by %s',
+                date('j M Y, H:i', (int) $track->date['uts']),
+                $recenttracks['user'],
+                $track->name,
+                $track->artist
+            );
+        }
+        if ($track->streamable == 1) {
+            $msg .= ' - ' . $track->url;
+        }
+        return $msg;
+    }
+}
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/AutoJoin.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/AutoJoin.php
new file mode 100755
index 0000000000..a6d1adfbb2
--- /dev/null
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/AutoJoin.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ * Phergie 
+ *
+ * PHP version 5
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.
+ * It is also available through the world-wide-web at this URL:
+ * http://phergie.org/license
+ *
+ * @category  Phergie 
+ * @package   Phergie_Plugin_AutoJoin
+ * @author    Phergie Development Team <team@phergie.org>
+ * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
+ * @license   http://phergie.org/license New BSD License
+ * @link      http://pear.phergie.org/package/Phergie_Plugin_AutoJoin
+ */
+
+/**
+ * Automates the process of having the bot join one or more channels upon
+ * connection to the server.
+ *
+ * The configuration setting autojoin.channels is used to determine which 
+ * channels to join. This setting can point to a comma-delimited string or 
+ * enumerated array containing a single list of channels or an associative 
+ * array keyed by hostname where each value is a comma-delimited string or  
+ * enumerated array containing a list of channels to join on the server  
+ * corresponding to that hostname.
+ *
+ * @category Phergie 
+ * @package  Phergie_Plugin_AutoJoin
+ * @author   Phergie Development Team <team@phergie.org>
+ * @license  http://phergie.org/license New BSD License
+ * @link     http://pear.phergie.org/package/Phergie_Plugin_AutoJoin
+ */
+class Phergie_Plugin_AutoJoin extends Phergie_Plugin_Abstract
+{
+    /**
+     * Intercepts the end of the "message of the day" response and responds by
+     * joining the channels specified in the configuration file.
+     *
+     * @return void
+     */
+    public function onResponse()
+    {
+        switch ($this->getEvent()->getCode()) {
+        case Phergie_Event_Response::RPL_ENDOFMOTD:
+        case Phergie_Event_Response::ERR_NOMOTD:
+            if ($channels = $this->config['autojoin.channels']) {
+                if (is_array($channels)) {
+                    // Support autojoin.channels being in these formats:
+                    // 'hostname' => array('#channel1', '#channel2', ... )
+                    $host = $this->getConnection()->getHost();
+                    if (isset($channels[$host])) {
+                        $channels = $channels[$host];
+                    }
+                    if (is_array($channels)) {
+                        $channels = implode(',', $channels);
+                    }
+                }
+                $this->doJoin($channels);
+            }
+            $this->getPluginHandler()->removePlugin($this);
+        }
+    }
+}
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/BeerScore.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/BeerScore.php
new file mode 100644
index 0000000000..16c671f683
--- /dev/null
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/BeerScore.php
@@ -0,0 +1,156 @@
+<?php
+/**
+ * Phergie 
+ *
+ * PHP version 5
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.
+ * It is also available through the world-wide-web at this URL:
+ * http://phergie.org/license
+ *
+ * @category  Phergie 
+ * @package   Phergie_Plugin_BeerScore
+ * @author    Phergie Development Team <team@phergie.org> 
+ * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
+ * @license   http://phergie.org/license New BSD License
+ * @link      http://pear.phergie.org/package/Phergie_Plugin_BeerScore
+ */
+
+/**
+ * Handles incoming requests for beer scores.
+ *
+ * @category Phergie 
+ * @package  Phergie_Plugin_BeerScore
+ * @author   Phergie Development Team <team@phergie.org> 
+ * @license  http://phergie.org/license New BSD License
+ * @link     http://pear.phergie.org/package/Phergie_Plugin_BeerScore
+ * @uses     Phergie_Plugin_Http pear.phergie.org
+ */
+class Phergie_Plugin_BeerScore extends Phergie_Plugin_Abstract
+{
+    /**
+     * Score result type
+     *
+     * @const string
+     */
+    const TYPE_SCORE = 'SCORE';
+
+    /**
+     * Search result type
+     *
+     * @const string
+     */
+    const TYPE_SEARCH = 'SEARCH';
+
+    /**
+     * Refine result type
+     *
+     * @const type
+     */
+    const TYPE_REFINE = 'REFINE';
+
+    /**
+     * Base API URL
+     *
+     * @const string
+     */
+    const API_BASE_URL = 'http://caedmon.net/beerscore/';
+
+    /**
+     * HTTP plugin
+     *
+     * @var Phergie_Plugin_Http
+     */
+    protected $http;
+
+    /** 
+     * Checks for dependencies.
+     *
+     * @return void
+     */
+    public function onLoad()
+    {
+        $this->http = $this->getPluginHandler()->getPlugin('Http');
+    }
+
+    /**
+     * Handles beerscore commands.
+     *
+     * @param string $searchstring String to use in seaching for beer scores
+     *
+     * @return void
+     */
+    public function onCommandBeerscore($searchstring)
+    {
+        $event = $this->getEvent();
+        $target = $event->getNick();
+        $source = $event->getSource();
+
+        $apiurl = self::API_BASE_URL . rawurlencode($searchstring);
+        $response = $this->http->get($apiurl);
+
+        if ($response->isError()) {
+            $this->doNotice($target, 'Score not found (or failed to contact API)');
+            return;
+        }
+
+        $result = $response->getContent();
+        switch ($result->type) {
+        case self::TYPE_SCORE:
+            // small enough number to get scores
+            foreach ($result->beer as $beer) {
+                if ($beer->score === -1) {
+                    $score = '(not rated)';
+                } else {
+                    $score = $beer->score;
+                }
+                $str 
+                    = "{$target}: rating for {$beer->name}" . 
+                    " = {$score} ({$beer->url})";
+                $this->doPrivmsg($source, $str);
+            }
+            break;
+
+        case self::TYPE_SEARCH:
+            // only beer names, no scores
+            $str = '';
+            $found = 0;
+            foreach ($result->beer as $beer) {
+                if (isset($beer->score)) {
+                    ++$found;
+                    if ($beer->score === -1) {
+                        $score = '(not rated)';
+                    } else {
+                        $score = $beer->score;
+                    }
+                    $str 
+                        = "{$target}: rating for {$beer->name}" . 
+                        " = {$score} ({$beer->url})";
+                    $this->doPrivmsg($source, $str);
+                } else {
+                    $str .= "({$beer->name} -> {$beer->url}) ";
+                }
+            }
+            $foundnum = $result->num - $found;
+            $more = $found ? 'more ' : '';
+            $str = "{$target}: {$foundnum} {$more}results... {$str}";
+            $this->doPrivmsg($source, $str);
+            break;
+
+        case self::TYPE_REFINE:
+            // Too many results; only output search URL
+            if ($result->num < 100) {
+                $num = $result->num;
+            } else {
+                $num = 'at least 100';
+            }
+            $resultsword = (($result->num > 1) ? 'results' : 'result');
+            $str = "{$target}: {$num} {$resultsword}; {$result->searchurl}";
+            $this->doPrivmsg($source, $str);
+            break;
+        }
+    }
+}
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Cache.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Cache.php
new file mode 100644
index 0000000000..2b54fab68a
--- /dev/null
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Cache.php
@@ -0,0 +1,106 @@
+<?php
+/**
+ * Phergie
+ *
+ * PHP version 5
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.
+ * It is also available through the world-wide-web at this URL:
+ * http://phergie.org/license
+ *
+ * @category  Phergie
+ * @package   Phergie_Plugin_Cache
+ * @author    Phergie Development Team <team@phergie.org>
+ * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
+ * @license   http://phergie.org/license New BSD License
+ * @link      http://pear.phergie.org/package/Phergie_Plugin_Cache
+ */
+
+/**
+ * Implements a generic cache to be used by other plugins.
+ *
+ * @category Phergie
+ * @package  Phergie_Plugin_Cache
+ * @author   Phergie Development Team <team@phergie.org>
+ * @license  http://phergie.org/license New BSD License
+ * @link     http://pear.phergie.org/package/Phergie_Plugin_Cache
+ */
+class Phergie_Plugin_Cache extends Phergie_Plugin_Abstract
+{
+    /**
+     * Key-value data storage for the cache 
+     * 
+     * @var array 
+     */
+    protected $cache = array();
+
+    /**
+     * Stores a value in the cache. 
+     *
+     * @param string   $key       Key to associate with the value 
+     * @param mixed    $data      Data to be stored
+     * @param int|null $ttl       Time to live in seconds or NULL for forever
+     * @param bool     $overwrite TRUE to overwrite any existing value 
+     *        associated with the specified key
+     *
+     * @return bool
+     */
+    public function store($key, $data, $ttl = 3600, $overwrite = true)
+    {
+        if (!$overwrite && isset($this->cache[$key])) {
+            return false;
+        }
+
+        if ($ttl) {
+            $expires = time()+$ttl;
+        } else {
+            $expires = null;
+        }
+
+        $this->cache[$key] = array('data' => $data, 'expires' => $expires);
+        return true;
+
+    }
+
+    /**
+     * Fetches a previously stored value. 
+     *
+     * @param string $key Key associated with the value 
+     *
+     * @return mixed Stored value or FALSE if no value or an expired value 
+     *         is associated with the specified key 
+     */
+    public function fetch($key)
+    {
+        if (!isset($this->cache[$key])) {
+            return false;
+        }
+
+        $item = $this->cache[$key];
+        if (!is_null($item['expires']) && $item['expires'] < time()) {
+            $this->expire($key);
+            return false;
+        }
+
+        return $item['data'];
+    }
+
+    /**
+     * Expires a value that has exceeded its time to live.
+     *
+     * @param string $key Key associated with the value to expire 
+     *
+     * @return bool
+     */
+    protected function expire($key)
+    {
+        if (!isset($this->cache[$key])) {
+            return false;
+        }
+        unset($this->cache[$key]);
+        return true;
+    }
+}
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Command.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Command.php
new file mode 100755
index 0000000000..2ab5b69d1d
--- /dev/null
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Command.php
@@ -0,0 +1,134 @@
+<?php
+/**
+ * Phergie 
+ *
+ * PHP version 5
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.
+ * It is also available through the world-wide-web at this URL:
+ * http://phergie.org/license
+ *
+ * @category  Phergie 
+ * @package   Phergie_Plugin_Command
+ * @author    Phergie Development Team <team@phergie.org>
+ * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
+ * @license   http://phergie.org/license New BSD License
+ * @link      http://pear.phergie.org/package/Phergie_Plugin_Command
+ */
+
+/**
+ * Handles parsing and execution of commands sent by users via messages sent 
+ * to channels in which the bot is present or directly to the bot.
+ *
+ * @category Phergie 
+ * @package  Phergie_Plugin_Command
+ * @author   Phergie Development Team <team@phergie.org>
+ * @license  http://phergie.org/license New BSD License
+ * @link     http://pear.phergie.org/package/Phergie_Plugin_Command
+ * @uses     extension reflection
+ */
+class Phergie_Plugin_Command extends Phergie_Plugin_Abstract
+{
+    /**
+     * Cache for command lookups used to confirm that methods exist and 
+     * parameter counts match
+     *
+     * @var array
+     */
+    protected $methods = array();
+
+    /**
+     * Prefix for command method names
+     *
+     * @var string
+     */
+    protected $methodPrefix = 'onCommand';
+
+    /**
+     * Populates the methods cache.
+     *
+     * @return void
+     */
+    protected function populateMethodCache()
+    {
+        foreach ($this->getPluginHandler() as $plugin) {
+            $reflector = new ReflectionClass($plugin);
+            foreach ($reflector->getMethods() as $method) {
+                $name = $method->getName();
+                if (strpos($name, $this->methodPrefix) === 0 
+                    && !isset($this->methods[$name])
+                ) {
+                    $this->methods[$name] = array(
+                        'total' => $method->getNumberOfParameters(),
+                        'required' => $method->getNumberOfRequiredParameters()
+                    );
+                }
+            }
+        }
+    }
+
+    /**
+     * Parses a given message and, if its format corresponds to that of a
+     * defined command, calls the handler method for that command with any
+     * provided parameters.
+     *
+     * @return void
+     */
+    public function onPrivmsg()
+    {
+        // Populate the methods cache if needed
+        if (empty($this->methods)) {
+            $this->populateMethodCache();
+        }
+
+        // Get the content of the message
+        $event = $this->getEvent();
+        $msg = trim($event->getText());
+        $prefix = $this->getConfig('command.prefix');
+
+        // Check for the command prefix if one is set and needed
+        if ($prefix && $event->isInChannel()) {
+            if (strpos($msg, $prefix) !== 0) {
+                return;
+            } else {
+                $msg = substr($msg, strlen($prefix));
+            }
+        }
+
+        // Separate the command and arguments
+        $parsed = preg_split('/\s+/', $msg, 2);
+        $method = $this->methodPrefix . ucfirst(strtolower(array_shift($parsed))); 
+        $args = count($parsed) ? array_shift($parsed) : '';
+
+        // Check to ensure the command exists
+        if (empty($this->methods[$method])) {
+            return;
+        }
+
+        // If no arguments are passed...
+        if (empty($args)) {
+
+            // If the method requires no arguments, call it
+            if (empty($this->methods[$method]['required'])) {
+                $this->getPluginHandler()->$method();
+            }
+
+        } else {
+            // If arguments are passed...
+
+            // Parse the arguments
+            $args = preg_split('/\s+/', $args, $this->methods[$method]['total']);
+
+            // If the minimum arguments are passed, call the method 
+            if ($this->methods[$method]['required'] <= count($args)) {
+                call_user_func_array(
+                    array($this->getPluginHandler(), $method),
+                    $args
+                );
+            }
+        }
+    }
+}
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Ctcp.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Ctcp.php
new file mode 100755
index 0000000000..e79fcf13ee
--- /dev/null
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Ctcp.php
@@ -0,0 +1,91 @@
+<?php
+/**
+ * Phergie
+ *
+ * PHP version 5
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.
+ * It is also available through the world-wide-web at this URL:
+ * http://phergie.org/license
+ *
+ * @category  Phergie
+ * @package   Phergie_Plugin_Ctcp
+ * @author    Phergie Development Team <team@phergie.org>
+ * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
+ * @license   http://phergie.org/license New BSD License
+ * @link      http://pear.phergie.org/package/Phergie_Plugin_Ctcp
+ */
+
+/**
+ * Responds to various CTCP requests sent by the server and users.
+ *
+ * @category Phergie
+ * @package  Phergie_Plugin_Ctcp
+ * @author   Phergie Development Team <team@phergie.org>
+ * @license  http://phergie.org/license New BSD License
+ * @link     http://pear.phergie.org/package/Phergie_Plugin_Ctcp
+ * @link     http://www.irchelp.org/irchelp/rfc/ctcpspec.html
+ */
+class Phergie_Plugin_Ctcp extends Phergie_Plugin_Abstract
+{
+    /**
+     * Responds to a CTCP TIME request from a user with the current local
+     * time.
+     *
+     * @return void
+     */
+    public function onTime()
+    {
+        $source = $this->getEvent()->getSource();
+        $this->doTime($source, strftime('%c %z'));
+    }
+
+    /**
+     * Responds to a CTCP VERSION request from a user with the codebase
+     * version.
+     *
+     * @return void
+     */
+    public function onVersion()
+    {
+        $source = $this->getEvent()->getSource();
+        $msg = 'Phergie ' . Phergie_Bot::VERSION . ' (http://phergie.org)';
+        $this->doVersion($source, $msg);
+    }
+
+    /**
+     * Responds to a CTCP PING request from a user.
+     *
+     * @return void
+     */
+    public function onCtcpPing()
+    {
+        $event = $this->getEvent();
+        $source = $event->getSource();
+        $handshake = $event->getArgument(1);
+        $this->doPing($source, $handshake);
+    }
+
+    /**
+     * Responds to a CTCP FINGER request from a user.
+     *
+     * @return void
+     */
+    public function onFinger()
+    {
+        $connection = $this->getConnection();
+        $name = $connection->getNick();
+        $realname = $connection->getRealname();
+        $username = $connection->getUsername();
+
+        $finger
+            = (empty($realname) ? $realname : $name) .
+            ' (' . (!empty($username) ? $username : $name) . ')';
+
+        $this->doFinger($source, $finger);
+    }
+}
+?>
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Daddy.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Daddy.php
new file mode 100644
index 0000000000..d47c3c41d3
--- /dev/null
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Daddy.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * Phergie 
+ *
+ * PHP version 5
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.
+ * It is also available through the world-wide-web at this URL:
+ * http://phergie.org/license
+ *
+ * @category  Phergie 
+ * @package   Phergie_Plugin_Daddy
+ * @author    Phergie Development Team <team@phergie.org>
+ * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
+ * @license   http://phergie.org/license New BSD License
+ * @link      http://pear.phergie.org/package/Phergie_Plugin_Daddy
+ */
+
+/**
+ * Simply responds to messages addressed to the bot that contain the phrase
+ * "Who's your daddy?" and related variations.
+ *
+ * @category Phergie 
+ * @package  Phergie_Plugin_Daddy
+ * @author   Phergie Development Team <team@phergie.org>
+ * @license  http://phergie.org/license New BSD License
+ * @link     http://pear.phergie.org/package/Phergie_Plugin_Daddy
+ */
+class Phergie_Plugin_Daddy extends Phergie_Plugin_Abstract
+{
+    /**
+     * Checks messages for the question to which it should respond and sends a
+     * response when appropriate
+     *
+     * @return void
+     */
+    public function onPrivmsg()
+    {
+        $config = $this->getConfig();
+        $prefix = $config['command.prefix'];
+        $event = $this->getEvent();
+        $text = $event->getArgument(1);
+        $target = $event->getNick();
+        $source = $event->getSource();
+        $pattern 
+            = '/' . preg_quote($prefix) . 
+            '\s*?who\'?s y(?:our|a) ([^?]+)\??/iAD';
+        if (preg_match($pattern, $text, $m)) {
+            if ($config['daddy.curses'] && mt_rand(0, 5) === 5) {
+                $msg = $target . ': I am your ' . $m[1] . ', bitch!';
+            } else {
+                $msg = 'You\'re my ' . $m[1] . ', ' . $target . '!';
+            }
+            $this->doPrivmsg($source, $msg);
+        }
+    }
+}
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Exception.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Exception.php
new file mode 100755
index 0000000000..e58734bef9
--- /dev/null
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Exception.php
@@ -0,0 +1,113 @@
+<?php
+/**
+ * Phergie 
+ *
+ * PHP version 5
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.
+ * It is also available through the world-wide-web at this URL:
+ * http://phergie.org/license
+ *
+ * @category  Phergie 
+ * @package   Phergie
+ * @author    Phergie Development Team <team@phergie.org>
+ * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
+ * @license   http://phergie.org/license New BSD License
+ * @link      http://pear.phergie.org/package/Phergie
+ */
+
+/**
+ * Exception related to plugin handling.
+ *
+ * @category Phergie 
+ * @package  Phergie
+ * @author   Phergie Development Team <team@phergie.org>
+ * @license  http://phergie.org/license New BSD License
+ * @link     http://pear.phergie.org/package/Phergie
+ */
+class Phergie_Plugin_Exception extends Phergie_Exception
+{
+    /**
+     * Error indicating that a path containing plugins was specified, but 
+     * did not reference a readable directory
+     */
+    const ERR_DIRECTORY_NOT_READABLE = 1;
+
+    /**
+     * Error indicating that an attempt was made to locate the class for a 
+     * specified plugin, but the class could not be found
+     */
+    const ERR_CLASS_NOT_FOUND = 2;
+
+    /**
+     * Error indicating that an attempt was made to locate the class for a 
+     * specified plugin, but that the found class did not extend the base 
+     * plugin class
+     */
+    const ERR_INCORRECT_BASE_CLASS = 3;
+
+    /**
+     * Error indicating that an attempt was made to locate the class for a 
+     * specified plugin, but that the found class cannot be instantiated
+     */
+    const ERR_CLASS_NOT_INSTANTIABLE = 4;
+
+    /**
+     * Error indicating that an attempt was made to access a plugin that had 
+     * not been loaded and autoloading was not enabled to load it
+     */
+    const ERR_PLUGIN_NOT_LOADED = 5;
+
+    /**
+     * Error indicating that an attempt was made to access the configuration 
+     * handler before one had been set
+     */
+    const ERR_NO_CONFIG_HANDLER = 6;
+
+    /**
+     * Error indicating that an attempt was made to access the plugin 
+     * handler before one had been set
+     */
+    const ERR_NO_PLUGIN_HANDLER = 7;
+
+    /**
+     * Error indicating that an attempt was made to access the event  
+     * handler before one had been set
+     */
+    const ERR_NO_EVENT_HANDLER = 8;
+
+    /**
+     * Error indicating that an attempt was made to access the connection  
+     * before one had been set
+     */
+    const ERR_NO_CONNECTION = 9;
+
+    /**
+     * Error indicating that an attempt was made to access the current 
+     * incoming event before one had been set
+     */
+    const ERR_NO_EVENT = 10;
+
+    /**
+     * Error indicating that a dependency of the plugin was unavailable at  
+     * the time that an attempt was made to load it
+     */
+    const ERR_REQUIREMENT_UNSATISFIED = 11;
+
+    /**
+     * Error indicating that a call was made to a nonexistent plugin method 
+     * and that its __call() implementation did not process that call as an 
+     * attempt to trigger an event - this is intended to aid in debugging of 
+     * such situations
+     */
+    const ERR_INVALID_CALL = 12;
+
+    /**
+     * Error indicating that a fatal runtime issue was encountered within a 
+     * plugin
+     */
+    const ERR_FATAL_ERROR = 13;
+}
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Google.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Google.php
new file mode 100644
index 0000000000..413a936075
--- /dev/null
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Google.php
@@ -0,0 +1,375 @@
+<?php
+/**
+ * Phergie 
+ *
+ * PHP version 5
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.
+ * It is also available through the world-wide-web at this URL:
+ * http://phergie.org/license
+ *
+ * @category  Phergie 
+ * @package   Phergie_Plugin_Google
+ * @author    Phergie Development Team <team@phergie.org>
+ * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
+ * @license   http://phergie.org/license New BSD License
+ * @link      http://pear.phergie.org/package/Phergie_Plugin_Google
+ */
+
+/**
+ * Provides commands used to access several services offered by Google 
+ * including search, translation, weather, maps, and currency and general 
+ * value unit conversion.
+ *
+ * @category Phergie 
+ * @package  Phergie_Plugin_Google
+ * @author   Phergie Development Team <team@phergie.org>
+ * @license  http://phergie.org/license New BSD License
+ * @link     http://pear.phergie.org/package/Phergie_Plugin_Google
+ * @uses     Phergie_Plugin_Command pear.phergie.org
+ * @uses     Phergie_Plugin_Http pear.phergie.org
+ *
+ * @pluginDesc Provide access to some Google services
+ */
+class Phergie_Plugin_Google extends Phergie_Plugin_Abstract
+{
+
+    /**
+     * HTTP plugin
+     *
+     * @var Phergie_Plugin_Http
+     */
+    protected $http;
+
+    /**
+     * Checks for dependencies.
+     *
+     * @return void
+     */
+    public function onLoad()
+    {
+        $plugins = $this->getPluginHandler();
+        $plugins->getPlugin('Command');
+        $this->http = $plugins->getPlugin('Http');
+        $plugins->getPlugin('Help')->register($this);
+    }
+
+    /**
+     * Returns the first result of a Google search.
+     *
+     * @param string $query Search term
+     *
+     * @return void
+     * @todo Implement use of URL shortening here
+     *
+     * @pluginCmd [query] do a search on google
+     */
+    public function onCommandG($query)
+    {
+        $url = 'http://ajax.googleapis.com/ajax/services/search/web';
+        $params = array(
+            'v' => '1.0',
+            'q' => $query
+        );
+        $response = $this->http->get($url, $params);
+        $json = $response->getContent()->responseData;
+        $event = $this->getEvent();
+        $source = $event->getSource();
+        $nick = $event->getNick();
+        if ($json->cursor->estimatedResultCount > 0) {
+            $msg
+                = $nick
+                . ': [ '
+                . $json->results[0]->titleNoFormatting
+                . ' ] - '
+                . $json->results[0]->url
+                . ' - More results: '
+                . $json->cursor->moreResultsUrl;
+            $this->doPrivmsg($source, $msg);
+        } else {
+            $msg = $nick . ': No results for this query.';
+            $this->doPrivmsg($source, $msg);
+        }
+    }
+
+    /**
+     * Performs a Google Count search for the given term.
+     *
+     * @param string $query Search term
+     *
+     * @return void
+     *
+     * @pluginCmd [query] Do a search on Google and count the results
+     */
+    public function onCommandGc($query)
+    {
+        $url = 'http://ajax.googleapis.com/ajax/services/search/web';
+        $params = array(
+            'v' => '1.0',
+            'q' => $query
+        );
+        $response = $this->http->get($url, $params);
+        $json = $response->getContent()->responseData->cursor;
+        $count = $json->estimatedResultCount;
+        $event = $this->getEvent();
+        $source = $event->getSource();
+        $nick = $event->getNick();
+        if ($count) {
+            $msg
+                = $nick . ': ' . 
+                number_format($count, 0) . 
+                ' estimated results for ' . $query;
+            $this->doPrivmsg($source, $msg);
+        } else {
+            $this->doPrivmsg($source, $nick . ': No results for this query.');
+        }
+    }
+
+    /**
+     * Performs a Google Translate search for the given term.
+     *
+     * @param string $from  Language of the search term
+     * @param string $to    Language to which the search term should be 
+     *        translated
+     * @param string $query Term to translate
+     *
+     * @return void
+     *
+     * @pluginCmd [from language] [to language] [text to translate] Do a translation on Google
+     */
+    public function onCommandGt($from, $to, $query)
+    {
+        $url = 'http://ajax.googleapis.com/ajax/services/language/translate';
+        $params = array(
+            'v' => '1.0',
+            'q' => $query,
+            'langpair' => $from . '|' . $to
+        );
+        $response = $this->http->get($url, $params);
+        $json = $response->getContent();
+        $event = $this->getEvent();
+        $source = $event->getSource();
+        $nick = $event->getNick();
+        if (empty($json->responseData->translatedText)) {
+            $this->doPrivmsg($source, $nick . ': ' . $json->responseDetails);
+        } else {
+            $this->doPrivmsg(
+                $source, 
+                $nick . ': ' . $json->responseData->translatedText
+            );
+        }
+    }
+
+    /**
+     * Performs a Google Weather search for the given term.
+     * 
+     * @param string $location Location to search for
+     *
+     * @return void
+     *
+     * @pluginCmd [location] Show the weather for the specified location
+     */
+    public function onCommandGw($location)
+    {
+        $url = 'http://www.google.com/ig/api';
+        $params = array(
+            'weather' => $location,
+            'hl' => 'pt-br',
+            'oe' => 'UTF-8'
+        );
+        $response = $this->http->get($url, $params);
+        $xml = $response->getContent()->weather;
+        $source = $this->getEvent()->getSource();
+        if (!isset($xml->problem_cause)) {
+            $city = $xml->forecast_information->city->attributes()->data[0];
+            $time = $xml->forecast_information->current_date_time->attributes()
+                ->data[0];
+            $condition = $xml->current_conditions->condition->attributes()->data[0];
+            $temp = $xml->current_conditions->temp_c->attributes()->data[0] 
+                . '� C';
+            $humidity = $xml->current_conditions->humidity->attributes()->data[0];
+            $wind = $xml->current_conditions->wind_condition->attributes()->data[0];
+            $msg = implode(' - ', array($city, $temp, $condition, $humidity, $wind));
+            $this->doPrivmsg($source, $msg);
+
+            foreach ($xml->forecast_conditions as $key => $linha) {
+                $day = ucfirst($linha->day_of_week->attributes()->data[0]);
+                $min = $linha->low->attributes()->data[0];
+                $max = $linha->high->attributes()->data[0];
+                $condition = $linha->condition->attributes()->data[0];
+                $msg 
+                    = 'Forecast: ' . $day . 
+                    ' - Min: ' . $min . '� C' . 
+                    ' - Max: ' . $max . '� C' . 
+                    ' - ' . $condition;
+                $this->doPrivmsg($source, $msg);
+            }
+        } else {
+            $this->doPrivmsg($source, $xml->problem_cause->attributes()->data[0]);
+        }
+    }
+
+    /**
+     * Performs a Google Maps search for the given term.
+     *
+     * @param string $location Location to search for
+     *
+     * @return void
+     *
+     * @pluginCmd [location] Get the location from Google Maps to the location specified
+     */
+    public function onCommandGmap($location)
+    {
+        $location = utf8_encode($location);
+        $url = 'http://maps.google.com/maps/geo';
+        $params = array(
+            'q' => $location,
+            'output' => 'json',
+            'gl' => 'br',
+            'sensor' => 'false',
+            'oe' => 'utf8',
+            'mrt' => 'all',
+            'key' => $this->_config['google.key']
+        );
+        $response = $this->http->get($url, $params); 
+        $json = (array) $response->getContent();
+        $event = $this->getEvent();
+        $source = $event->getSource();
+        $nick = $event->getNick();
+        if (!empty($json)) {
+            $qtd = count($json['Placemark']);
+            if ($qtd > 1) {
+                if ($qtd <= 3) {
+                    foreach ($json['Placemark'] as $places) {
+                        $xy = $places['Point']['coordinates'];
+                        $address = utf8_decode($places['address']);
+                        $url = 'http://maps.google.com/maps?sll=' . $xy[1] . ',' 
+                            . $xy[0] . '&z=15';
+                        $msg = $nick . ' -> ' . $address . ' - ' . $url;
+                        $this->doPrivmsg($source, $msg);
+                    }
+                } else {
+                    $msg
+                        = $nick . 
+                        ', there are a lot of places with that query.' . 
+                        ' Try to be more specific!';
+                    $this->doPrivmsg($source, $msg);
+                }
+            } elseif ($qtd == 1) {
+                $xy = $json['Placemark'][0]['Point']['coordinates'];
+                $address = utf8_decode($json['Placemark'][0]['address']);
+                $url = 'http://maps.google.com/maps?sll=' . $xy[1] . ',' . $xy[0] 
+                    . '&z=15';
+                $msg = $nick . ' -> ' . $address . ' - ' . $url;
+                $this->doPrivmsg($source, $msg);
+            } else {
+                $this->doPrivmsg($source, $nick . ', I found nothing.');
+            }
+        } else {
+            $this->doPrivmsg($source, $nick . ', we have a problem.');
+        }
+    }
+
+    /**
+     * Perform a Google Convert query to convert a value from one metric to 
+     * another.
+     *
+     * @param string $value Value to convert
+     * @param string $from  Source metric
+     * @param string $to    Destination metric
+     *
+     * @return void
+     *
+     * @pluginCmd [value] [currency from] [currency to] Converts a monetary value from one currency to another
+     */
+    public function onCommandGconvert($value, $from, $to)
+    {
+        $url = 'http://www.google.com/finance/converter';
+        $params = array(
+            'a' => $value,
+            'from' => $from,
+            'to' => $to
+        );
+        $response = $this->http->get($url, $params);
+        $contents = $response->getContent();
+        $event = $this->getEvent();
+        $source = $event->getSource();
+        $nick = $event->getNick();
+        if ($contents) {
+            preg_match(
+                '#<span class=bld>.*? ' . $to . '</span>#im',
+                $contents,
+                $matches
+            );
+            if (!$matches[0]) {
+                $this->doPrivmsg($source, $nick . ', I can\'t do that.');
+            } else {
+                $str = str_replace('<span class=bld>', '', $matches[0]);
+                $str = str_replace($to . '</span>', '', $str);
+                $text 
+                    = number_format($value, 2, ',', '.') . ' ' . $from . 
+                    ' => ' . number_format($str, 2, ',', '.') . ' ' . $to;
+                $this->doPrivmsg($source, $text);
+            }
+        } else {
+            $this->doPrivmsg($source, $nick . ', we had a problem.');
+        }
+    }
+
+    /**
+     * Performs a Google search to convert a value from one unit to another.
+     *
+     * @param string $unit  Source metric 
+     * @param string $to    Value to be converted
+     * @param string $unit2 Destination metric 
+     *
+     * @return void
+     *
+     * @pluginCmd [unit] [to] [unit2] Convert a value from one metric to another
+     */
+    public function onCommandConvert($unit, $to, $unit2)
+    {
+        $url = 'http://www.google.com/search?q=' 
+            . urlencode($unit . ' ' . $to . ' ' . $unit2);
+        $response = $this->http->get($url);
+        $contents = $response->getContent();
+        $event = $this->getEvent();
+        $source = $event->getSource();
+        $nick = $event->getNick();
+
+        if (empty($contents)) {
+            $this->doPrivmsg(
+                $target,
+                $nick . ', sorry, I can\'t give you an answer right now.'
+            );
+            return;
+        }
+
+        $doc = new DomDocument;
+        $doc->loadHTML($contents);
+        foreach ($doc->getElementsByTagName('h2') as $element) {
+            if ($element->getAttribute('class') == 'r') {
+                $children = $element->childNodes;
+                $text = str_replace(
+                    array(chr(195), chr(151), chr(160)),
+                    array('x', '', ' '),
+                    $children->item(0)->nodeValue
+                );
+                if ($children->length >= 3) {
+                    $text
+                        .= '^' . $children->item(1)->nodeValue 
+                        . $children->item(2)->nodeValue;
+                }
+            }
+        }
+
+        if (isset($text)) {
+            $this->doPrivmsg($source, $nick . ': ' . $text);
+        } else {
+            $this->doPrivmsg($target, $nick . ', sorry I can\'t do that.');
+        }
+    }
+}
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Handler.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Handler.php
new file mode 100755
index 0000000000..ee03ae9581
--- /dev/null
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Handler.php
@@ -0,0 +1,412 @@
+<?php
+/**
+ * Phergie 
+ *
+ * PHP version 5
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.
+ * It is also available through the world-wide-web at this URL:
+ * http://phergie.org/license
+ *
+ * @category  Phergie 
+ * @package   Phergie
+ * @author    Phergie Development Team <team@phergie.org>
+ * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
+ * @license   http://phergie.org/license New BSD License
+ * @link      http://pear.phergie.org/package/Phergie
+ */
+
+/**
+ * Handles on-demand loading of, iteration over, and access to plugins.
+ *
+ * @category Phergie 
+ * @package  Phergie
+ * @author   Phergie Development Team <team@phergie.org>
+ * @license  http://phergie.org/license New BSD License
+ * @link     http://pear.phergie.org/package/Phergie
+ */
+class Phergie_Plugin_Handler implements IteratorAggregate
+{
+    /**
+     * Current list of plugin instances
+     *
+     * @var array
+     */
+    protected $plugins;
+
+    /**
+     * Paths in which to search for plugin class files
+     *
+     * @var array
+     */
+    protected $paths;
+
+    /**
+     * Flag indicating whether plugin classes should be instantiated on 
+     * demand if they are requested but no instance currently exists
+     *
+     * @var bool
+     */
+    protected $autoload;
+
+    /**
+     * Phergie_Config instance that should be passed in to any plugin
+     * instantiated within the handler
+     *
+     * @var Phergie_Config
+     */
+    protected $config;
+
+    /**
+     * Phergie_Event_Handler instance that should be passed in to any plugin
+     * instantiated within the handler
+     *
+     * @var Phergie_Event_Handler
+     */
+    protected $events;
+
+    /**
+     * Constructor to initialize class properties and add the path for core 
+     * plugins.
+     *
+     * @param Phergie_Config        $config configuration to pass to any
+     *                                      instantiated plugin
+     * @param Phergie_Event_Handler $events event handler to pass to any
+     *                                      instantiated plugin
+     *
+     * @return void
+     */
+    public function __construct(
+        Phergie_Config $config,
+        Phergie_Event_Handler $events
+    ) {
+        $this->config = $config;
+        $this->events = $events;
+
+        $this->plugins = array();
+        $this->paths = array();
+        $this->autoload = false;
+
+        $this->addPath(dirname(__FILE__), 'Phergie_Plugin_');
+    }
+
+
+    /**
+     * Adds a path to search for plugin class files. Paths are searched in
+     * the reverse order in which they are added.
+     *
+     * @param string $path   Filesystem directory path
+     * @param string $prefix Optional class name prefix corresponding to the 
+     *        path
+     *
+     * @return Phergie_Plugin_Handler Provides a fluent interface
+     * @throws Phergie_Plugin_Exception
+     */
+    public function addPath($path, $prefix = '')
+    {
+        if (!is_readable($path)) {
+            throw new Phergie_Plugin_Exception(
+                'Path "' . $path . '" does not reference a readable directory',
+                Phergie_Plugin_Exception::ERR_DIRECTORY_NOT_READABLE
+            );
+        }
+
+        $this->paths[] = array(
+            'path' => rtrim($path, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR,
+            'prefix' => $prefix
+        );
+
+        return $this;
+    }
+
+    /**
+     * Adds a plugin instance to the handler. 
+     *
+     * @param string|Phergie_Plugin_Abstract $plugin Short name of the 
+     *        plugin class or a plugin object
+     * @param array                          $args   Optional array of 
+     *        arguments to pass to the plugin constructor if a short name is 
+     *        passed for $plugin
+     *
+     * @return Phergie_Plugin_Abstract New plugin instance
+     */
+    public function addPlugin($plugin, array $args = null)
+    {
+        // If a short plugin name is specified...
+        if (is_string($plugin)) {
+            $index = strtolower($plugin);
+            if (isset($this->plugins[$index])) {
+                return $this->plugins[$index];
+            }
+
+            // Attempt to locate and load the class
+            foreach (array_reverse($this->paths) as $path) {
+                $file = $path['path'] . $plugin . '.php';
+                if (file_exists($file)) {
+                    include_once $file;
+                    $class = $path['prefix'] . $plugin;
+                    if (class_exists($class)) {
+                        break;
+                    }
+                    unset($class);
+                }
+            }
+
+            // If the class can't be found, display an error
+            if (!isset($class)) {
+                throw new Phergie_Plugin_Exception(
+                    'Class file for plugin "' . $plugin . '" cannot be found',
+                    Phergie_Plugin_Exception::ERR_CLASS_NOT_FOUND
+                );
+            }
+
+            // Check to ensure the class is a plugin class 
+            if (!is_subclass_of($class, 'Phergie_Plugin_Abstract')) {
+                $msg
+                    = 'Class for plugin "' . $plugin . 
+                    '" does not extend Phergie_Plugin_Abstract';
+                throw new Phergie_Plugin_Exception(
+                    $msg,
+                    Phergie_Plugin_Exception::ERR_INCORRECT_BASE_CLASS
+                );
+            }
+
+            // Check to ensure the class can be instantiated
+            $reflection = new ReflectionClass($class);
+            if (!$reflection->isInstantiable()) {
+                throw new Phergie_Plugin_Exception(
+                    'Class for plugin "' . $plugin . '" cannot be instantiated',
+                    Phergie_Plugin_Exception::ERR_CLASS_NOT_INSTANTIABLE
+                );
+            }
+
+            // If the class is found, instantiate it
+            if (!empty($args)) {
+                $instance = $reflection->newInstanceArgs($args);
+            } else {
+                $instance = new $class;
+            }
+
+            // Configure and add the instance 
+            $instance->setPluginHandler($this);
+            $instance->setConfig($this->config);
+            $instance->setEventHandler($this->events);
+            $instance->onLoad();
+            $this->plugins[$index] = $instance;
+            $plugin = $instance;
+
+        } elseif ($plugin instanceof Phergie_Plugin_Abstract) {
+            // If a plugin instance is specified...
+
+            // Add the plugin instance to the list of plugins
+            $this->plugins[strtolower($plugin->getName())] = $plugin;
+        }
+
+        return $plugin;
+    }
+
+    /**
+     * Adds multiple plugin instances to the handler.
+     *
+     * @param array $plugins List of elements where each is of the form 
+     *        'ShortPluginName' or array('ShortPluginName', array($arg1, 
+     *        ..., $argN))
+     *
+     * @return Phergie_Plugin_Handler Provides a fluent interface
+     */
+    public function addPlugins(array $plugins)
+    {
+        foreach ($plugins as $plugin) {
+            if (is_array($plugin)) {
+                $this->addPlugin($plugin[0], $plugin[1]);
+            } else {
+                $this->addPlugin($plugin);
+            }
+        }
+
+        return $this;
+    }
+
+    /**
+     * Removes a plugin instance from the handler.
+     *
+     * @param string|Phergie_Plugin_Abstract $plugin Short name of the 
+     *        plugin class or a plugin object
+     *
+     * @return Phergie_Plugin_Handler Provides a fluent interface
+     */
+    public function removePlugin($plugin)
+    {
+        if ($plugin instanceof Phergie_Plugin_Abstract) {
+            $plugin = $plugin->getName();
+        }
+        $plugin = strtolower($plugin);
+
+        unset($this->plugins[$plugin]);
+
+        return $this;
+    }
+
+    /**
+     * Returns the corresponding instance for a specified plugin, loading it 
+     * if it is not already loaded and autoloading is enabled.
+     *
+     * @param string $name Short name of the plugin class
+     *
+     * @return Phergie_Plugin_Abstract Plugin instance
+     */
+    public function getPlugin($name)
+    {
+        // If the plugin is loaded, return the instance
+        $lower = strtolower($name);
+        if (isset($this->plugins[$lower])) {
+            return $this->plugins[$lower];
+        }
+
+        // If autoloading is disabled, display an error
+        if (!$this->autoload) {
+            $msg 
+                = 'Plugin "' . $name . '" has been requested, ' . 
+                'is not loaded, and autoload is disabled';
+            throw new Phergie_Plugin_Exception(
+                $msg,
+                Phergie_Plugin_Exception::ERR_PLUGIN_NOT_LOADED
+            );
+        }
+
+        // If autoloading is enabled, attempt to load the plugin
+        $plugin = $this->addPlugin($name);
+
+        // Return the added plugin
+        return $plugin;
+    }
+
+    /**
+     * Returns the corresponding instances for multiple specified plugins, 
+     * loading them if they are not already loaded and autoloading is 
+     * enabled.
+     *
+     * @param array $names List of short names of the plugin classes
+     *
+     * @return array Associative array mapping plugin class short names to 
+     *         corresponding plugin instances
+     */
+    public function getPlugins(array $names)
+    {
+        $plugins = array();
+        foreach ($names as $name) {
+            $plugins[$name] = $this->getPlugin($name);
+        }
+        return $plugins;
+    }
+
+    /**
+     * Returns whether or not at least one instance of a specified plugin 
+     * class is loaded.
+     *
+     * @param string $name Short name of the plugin class
+     *
+     * @return bool TRUE if an instance exists, FALSE otherwise
+     */
+    public function hasPlugin($name)
+    {
+        return isset($this->plugins[strtolower($name)]);
+    }
+
+    /**
+     * Sets a flag used to determine whether plugins should be loaded 
+     * automatically if they have not been explicitly loaded.
+     *
+     * @param bool $flag TRUE to have plugins autoload (default), FALSE 
+     *        otherwise
+     *
+     * @return Phergie_Plugin_Handler Provides a fluent interface.
+     */
+    public function setAutoload($flag = true)
+    {
+        $this->autoload = $flag;
+
+        return $this;
+    }
+
+    /**
+     * Returns the value of a flag used to determine whether plugins should 
+     * be loaded automatically if they have not been explicitly loaded.
+     *
+     * @return bool TRUE if autoloading is enabled, FALSE otherwise
+     */
+    public function getAutoload()
+    {
+        return $this->autoload;
+    }
+
+    /**
+     * Allows plugin instances to be accessed as properties of the handler. 
+     *
+     * @param string $name Short name of the plugin
+     *
+     * @return Phergie_Plugin_Abstract Requested plugin instance
+     */
+    public function __get($name)
+    {
+        return $this->getPlugin($name); 
+    }
+
+    /**
+     * Allows plugin instances to be detected as properties of the handler.
+     *
+     * @param string $name Short name of the plugin
+     *
+     * @return bool TRUE if the plugin is loaded, FALSE otherwise
+     */
+    public function __isset($name)
+    {
+        return $this->hasPlugin($name);
+    }
+
+    /**
+     * Allows plugin instances to be removed as properties of handler.
+     *
+     * @param string $name Short name of the plugin
+     *
+     * @return void
+     */
+    public function __unset($name)
+    {
+        $this->removePlugin($name);
+    }
+
+    /**
+     * Returns an iterator for all currently loaded plugin instances.
+     *
+     * @return ArrayIterator
+     */
+    public function getIterator()
+    {
+        return new ArrayIterator($this->plugins);
+    }
+
+    /**
+     * Proxies method calls to all plugins containing the called method. An  
+     * individual plugin may short-circuit this process by explicitly 
+     * returning FALSE.
+     *
+     * @param string $name Name of the method called
+     * @param array  $args Arguments passed in the method call
+     *
+     * @return bool FALSE if a plugin short-circuits processing by returning 
+     *         FALSE, TRUE otherwise
+     */
+    public function __call($name, array $args)
+    {
+        foreach ($this->plugins as $plugin) {
+            if (call_user_func_array(array($plugin, $name), $args) === false) {
+                return false;
+            }
+        }
+        return true;
+    }
+}
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Help.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Help.php
new file mode 100644
index 0000000000..0de13308db
--- /dev/null
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Help.php
@@ -0,0 +1,250 @@
+<?php
+/**
+ * Phergie 
+ *
+ * PHP version 5
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.
+ * It is also available through the world-wide-web at this URL:
+ * http://phergie.org/license
+ *
+ * @category  Phergie 
+ * @package   Phergie_Plugin_Help
+ * @author    Phergie Development Team <team@phergie.org>
+ * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
+ * @license   http://phergie.org/license New BSD License
+ * @link      http://pear.phergie.org/package/Phergie_Plugin_Help
+ */
+
+/**
+ * Provides access to descriptions of plugins and the commands they provide.
+ *
+ * @category Phergie 
+ * @package  Phergie_Plugin_Help
+ * @author   Phergie Development Team <team@phergie.org>
+ * @license  http://phergie.org/license New BSD License
+ * @link     http://pear.phergie.org/package/Phergie_Plugin_Help
+ * @uses     Phergie_Plugin_Command pear.phergie.org
+ *
+ * @pluginDesc Provides access to plugin help information
+ */
+class Phergie_Plugin_Help extends Phergie_Plugin_Abstract
+{
+
+    /**
+     * Holds the registry of help data indexed by plugin name
+     *
+     * @var array
+     */
+    protected $registry;
+
+    /**
+     * Whether the registry has been alpha sorted
+     *
+     * @var bool
+     */
+    protected $registry_sorted = false;
+
+    /**
+     * Checks for dependencies.
+     *
+     * @return void
+     */
+    public function onLoad()
+    {
+        $this->getPluginHandler()->getPlugin('Command');
+        $this->register($this);
+    }
+
+    /**
+     * Displays a list of plugins with help information available or 
+     * commands available for a specific plugin.
+     *
+     * @param string $plugin Short name of the plugin for which commands 
+     *        should be returned, else a list of plugins with help 
+     *        information available is returned
+     *
+     * @return void
+     *
+     * @pluginCmd Show all active plugins with help available
+     * @pluginCmd [plugin] Shows commands line for a specific plugin
+     */
+    public function onCommandHelp($plugin = null)
+    {
+        $nick = $this->getEvent()->getNick();
+
+        if (!$plugin) {
+            // protect from sorting the registry each time help is called
+            if (!$this->registry_sorted) {
+                asort($this->registry);
+                $this->registry_sorted = true;
+            }
+
+            $msg = 'These plugins below have help information available.';
+            $this->doPrivMsg($nick, $msg);
+
+            foreach ($this->registry as $plugin => $data) {
+                $this->doPrivMsg($nick, "{$plugin} - {$data['desc']}");
+            }
+        } else {
+            if (isset($this->getPluginHandler()->{$plugin})
+                && isset($this->registry[strtolower($plugin)]['cmd'])
+            ) {
+                $msg
+                    = 'The ' . 
+                    $plugin . 
+                    ' plugin exposes the commands shown below.';
+                $this->doPrivMsg($nick, $msg);
+                if ($this->getConfig('command.prefix')) {
+                    $msg
+                        = 'Note that these commands must be prefixed with "' .  
+                        $this->getConfig('command.prefix') .
+                        '" (without quotes) when issued in a public channel.';
+                    $this->doPrivMsg($nick, $msg);
+                }
+
+                foreach ($this->registry[strtolower($plugin)]['cmd']
+                    as $cmd => $descs
+                ) {
+                    foreach ($descs as $desc) {
+                        $this->doPrivMsg($nick, "{$cmd} {$desc}");
+                    }
+                }
+
+            } else {
+                $this->doPrivMsg($nick, 'That plugin is not loaded.');
+            }
+        }
+    }
+
+    /**
+     * Sets the description for the plugin instance
+     * 
+     * @param Phergie_Plugin_Abstract $plugin      plugin instance
+     * @param string                  $description plugin description
+     * 
+     * @return void
+     */
+    public function setPluginDescription(
+        Phergie_Plugin_Abstract $plugin,
+        $description
+    ) {
+        $this->registry[strtolower($plugin->getName())]
+                ['desc'] = $description;
+    }
+
+    /**
+     * Sets the description for the command on the plugin instance
+     * 
+     * @param Phergie_Plugin_Abstract $plugin      plugin instance
+     * @param string                  $command     from onCommand method
+     * @param string                  $description command description
+     *
+     * @return void
+     */
+    public function setCommandDescription(
+        Phergie_Plugin_Abstract $plugin,
+        $command,
+        array $description
+    ) {
+        $this->registry[strtolower($plugin->getName())]
+            ['cmd'][$command] = $description;
+    }
+
+    /**
+     * registers the plugin with the help plugin. this will parse the docblocks
+     * for specific annotations that this plugin will respond with when
+     * queried.
+     * 
+     * @param Phergie_Plugin_Abstract $plugin plugin instance
+     *
+     * @return void
+     */
+    public function register(Phergie_Plugin_Abstract $plugin)
+    {
+        $class = new ReflectionClass($plugin);
+
+        $annotations = self::parseAnnotations($class->getDocComment());
+        if (isset($annotations['pluginDesc'])) {
+            $this->setPluginDescription(
+                $plugin,
+                join(' ', $annotations['pluginDesc'])
+            );
+        }
+
+        foreach ($class->getMethods() as $method) {
+            if (strpos($method->getName(), 'onCommand') !== false) {
+                $annotations = self::parseAnnotations($method->getDocComment());
+                if (isset($annotations['pluginCmd'])) {
+                    $cmd = strtolower(substr($method->getName(), 9));
+                    $this->setCommandDescription(
+                        $plugin,
+                        $cmd,
+                        $annotations['pluginCmd']
+                    );
+                }
+            }
+        }
+    }
+
+    /**
+     * Taken from PHPUnit/Util/Test.php:436
+     *
+     * PHPUnit
+     *
+     * Copyright (c) 2002-2010, Sebastian Bergmann <sb@sebastian-bergmann.de>.
+     * All rights reserved.
+     *
+     * Redistribution and use in source and binary forms, with or without
+     * modification, are permitted provided that the following conditions
+     * are met:
+     *
+     *   * Redistributions of source code must retain the above copyright
+     *     notice, this list of conditions and the following disclaimer.
+     *
+     *   * Redistributions in binary form must reproduce the above copyright
+     *     notice, this list of conditions and the following disclaimer in
+     *     the documentation and/or other materials provided with the
+     *     distribution.
+     *
+     *   * Neither the name of Sebastian Bergmann nor the names of his
+     *     contributors may be used to endorse or promote products derived
+     *     from this software without specific prior written permission.
+     *
+     * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+     * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+     * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+     * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+     * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+     * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+     * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+     * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+     * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+     * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+     * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+     * POSSIBILITY OF SUCH DAMAGE.
+     *
+     * @param string $docblock docblock to parse
+     *
+     * @return array
+     */
+    protected static function parseAnnotations($docblock)
+    {
+        $annotations = array();
+
+        $regex = '/@(?P<name>[A-Za-z_-]+)(?:[ \t]+(?P<value>.*?))?[ \t]*\r?$/m';
+
+        if (preg_match_all($regex, $docblock, $matches)) {
+            $numMatches = count($matches[0]);
+
+            for ($i = 0; $i < $numMatches; ++$i) {
+                $annotations[$matches['name'][$i]][] = $matches['value'][$i];
+            }
+        }
+
+        return $annotations;
+    }
+}
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Http.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Http.php
new file mode 100644
index 0000000000..ae43b34c30
--- /dev/null
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Http.php
@@ -0,0 +1,275 @@
+<?php
+/**
+ * Phergie 
+ *
+ * PHP version 5
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.
+ * It is also available through the world-wide-web at this URL:
+ * http://phergie.org/license
+ *
+ * @category  Phergie 
+ * @package   Phergie_Plugin_Http
+ * @author    Phergie Development Team <team@phergie.org>
+ * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
+ * @license   http://phergie.org/license New BSD License
+ * @link      http://pear.phergie.org/package/Phergie_Plugin_Http
+ */
+
+/**
+ * Provides an HTTP client for plugins to use in contacting web services or 
+ * retrieving feeds or web pages.
+ *
+ * @category Phergie 
+ * @package  Phergie_Plugin_Http
+ * @author   Phergie Development Team <team@phergie.org>
+ * @license  http://phergie.org/license New BSD License
+ * @link     http://pear.phergie.org/package/Phergie_Plugin_Http
+ * @uses     extension simplexml optional
+ * @uses     extension json optional
+ */
+class Phergie_Plugin_Http extends Phergie_Plugin_Abstract
+{
+    /**
+     * Response to the last executed HTTP request
+     *
+     * @var Phergie_Plugin_Http_Response
+     */
+    protected $response;
+
+    /**
+     * Mapping of content types to handlers for them
+     *
+     * @var array
+     */
+    protected $handlers;
+    
+    /**
+     * Initializes the handler lookup table.
+     *
+     * @return void
+     */
+    public function onLoad()
+    {
+        $this->handlers = array(
+            '(?:application|text)/xml(?:;.*)?' => 'simplexml_load_string',
+            '(?:(?:application|text)/(?:x-)?json)|text/javascript.*' => 'json_decode',
+        );
+
+        if (is_array($this->config['http.handlers'])) {
+            $this->handlers = array_merge(
+                $this->handlers,
+                $this->config['http.handlers']
+            );
+        }
+    }
+
+    /**
+     * Sets a handler callback for a content type, which is called when a 
+     * response of that content type is received to perform any needed 
+     * transformations on the response body content before storing it in the 
+     * response object. Note that the calling plugin is responsible for 
+     * indicating any dependencies related to specified handler callbacks.
+     *
+     * @param string   $type     PCRE regular expression (without delimiters) that
+     *        matches one or more MIME types
+     * @param callback $callback Callback to execute when a response of a content
+     *        type matched by $type is encountered
+     *
+     * @return Phergie_Plugin_Http Provides a fluent interface
+     */
+    public function setHandler($type, $callback)
+    {
+        if (!is_callable($callback)) {
+            throw new Phergie_Plugin_Exception(
+                'Invalid callback specified',
+                Phergie_Plugin_Exception::ERR_FATAL_ERROR
+            );
+        }
+
+        $this->handlers[$type] = $callback;
+
+        return $this;
+    }
+
+    /**
+     * Supporting method that parses the status line of an HTTP response 
+     * message.
+     *
+     * @param string $status Status line
+     *
+     * @return array Associative array containing the HTTP version, response 
+     *         code, and response description
+     */
+    protected function parseStatusLine($status)
+    {
+        $parts = explode(' ', $status, 3);
+        $parsed = array(
+            'version' => str_replace('HTTP/', '', $parts[0]),
+            'code' => $parts[1],
+            'message' => rtrim($parts[2])
+        );
+        return $parsed;
+    }
+
+    /**
+     * Supporting method that acts as an error handler to intercept HTTP 
+     * responses resulting in PHP-level errors.
+     *
+     * @param int    $errno   Level of the error raised
+     * @param string $errstr  Error message
+     * @param string $errfile Name of the file in which the error was raised
+     * @param string $errline Line number on which the error was raised
+     *
+     * @return bool Always returns TRUE to allow normal execution to 
+     *         continue once this method terminates
+     */
+    protected function handleError($errno, $errstr, $errfile, $errline)
+    {
+        if ($httperr = strstr($errstr, 'HTTP/')) {
+            $parts = $this->parseStatusLine($httperr); 
+            $this->response
+                ->setCode($parts['code'])
+                ->setMessage($parts['message']);
+        }
+
+        return true;
+    }
+
+    /**
+     * Supporting method that executes a request and handles the response.
+     *
+     * @param string $url     URL to request
+     * @param array  $context Associative array of stream context parameters 
+     *
+     * @return Phergie_Plugin_Http_Response Object representing the response 
+     *         resulting from the request
+     */
+    public function request($url, array $context)
+    {
+        $this->response = new Phergie_Plugin_Http_Response;
+
+        $url = (string) $url;
+        $context = stream_context_create(array('http' => $context));
+
+        set_error_handler(array($this, 'handleError'), E_WARNING);
+        $stream = fopen($url, 'r', false, $context);
+        if ($stream) {
+            $meta = stream_get_meta_data($stream);
+            $status = $this->parseStatusLine($meta['wrapper_data'][0]);
+            $code = $status['code'];
+            $message = $status['message'];
+            $headers = array();
+            foreach (array_slice($meta['wrapper_data'], 1) as $header) {
+                list($name, $value) = explode(': ', $header, 2);
+                $headers[$name] = $value;
+            }
+            unset($meta['wrapper_data']);
+
+            $this->response
+                ->setCode($code)
+                ->setMessage($message)
+                ->setHeaders($headers)
+                ->setMeta($meta);
+ 
+            $body = stream_get_contents($stream);
+            $type = $this->response->getHeaders('content-type');
+            foreach ($this->handlers as $expr => $handler) {
+                if (preg_match('#^' . $expr . '$#i', $type)) {
+                    $body = call_user_func($handler, $body);
+                }
+            }
+
+            $this->response->setContent($body);
+        }
+        restore_error_handler();
+
+        return $this->response;
+    }
+
+    /**
+     * Performs a GET request.
+     *
+     * @param string $url     URL for the request
+     * @param array  $query   Optional associative array of parameters
+     *        constituting the URL query string if $url has none
+     * @param array  $context Optional associative array of additional stream
+     *        context parameters
+     *
+     * @return Phergie_Plugin_Http_Response Received response data
+     */
+    public function get($url, array $query = array(), array $context = array())
+    {
+        if (!empty($query)) {
+            $url .= '?' . http_build_query($query);
+        }
+
+        $context['method'] = 'GET';
+
+        return $this->request($url, $context);
+    }
+
+    /**
+     * Performs a HEAD request.
+     *
+     * @param string $url     URL for the request
+     * @param array  $query   Optional associative array of parameters
+     *        constituting the URL query string if $url has none
+     * @param array  $context Optional associative array of additional stream 
+     *        context parameters
+     *
+     * @return Phergie_Plugin_Http_Response Received response data
+     */
+    public function head($url, array $query = array(), array $context = array())
+    {
+        if (!empty($query)) {
+            $url .= '?' . http_build_query($query);
+        }
+
+        $context['method'] = 'HEAD';
+
+        return $this->request($url, $context);
+    }
+
+    /**
+     * Performs a POST request.
+     *
+     * @param string $url     URL for the request
+     * @param array  $query   Optional associative array of parameters 
+     *        constituting the URL query string if $url has none
+     * @param array  $post    Optional associative array of parameters 
+     *        constituting the POST request body if it is using the 
+     *        traditional URL-encoded format
+     * @param array  $context Optional associative array of additional stream 
+     *        context parameters
+     *
+     * @return Phergie_Plugin_Http_Response Received response data
+     */
+    public function post($url, array $query = array(), array $post = array(), array $context = array())
+    {
+        if (!empty($params)) {
+            $url .= '?' . http_build_query($query);
+        }
+
+        $context['method'] = 'POST';
+
+        if (!empty($post) 
+            && (!empty($context['header'])
+            xor stripos($context['header'], 'Content-Type'))
+        ) {
+            if (!empty($context['header'])) {
+                $context['header'] .= "\r\n";
+            } else {
+                $context['header'] = '';
+            }
+            $context['header'] .= 
+                'Content-Type: application/x-www-form-urlencoded';
+            $context['content'] = http_build_query($post);
+        }
+
+        return $this->request($url, $context);
+    }
+}
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Http/Response.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Http/Response.php
new file mode 100644
index 0000000000..def9d81c26
--- /dev/null
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Http/Response.php
@@ -0,0 +1,228 @@
+<?php
+/**
+ * Phergie 
+ *
+ * PHP version 5
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.
+ * It is also available through the world-wide-web at this URL:
+ * http://phergie.org/license
+ *
+ * @category  Phergie 
+ * @package   Phergie_Plugin_Http
+ * @author    Phergie Development Team <team@phergie.org>
+ * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
+ * @license   http://phergie.org/license New BSD License
+ * @link      http://pear.phergie.org/package/Phergie_Plugin_Http
+ */
+
+/**
+ * Data structure for HTTP response information. 
+ *
+ * @category Phergie 
+ * @package  Phergie_Plugin_Http
+ * @author   Phergie Development Team <team@phergie.org>
+ * @license  http://phergie.org/license New BSD License
+ * @link     http://pear.phergie.org/package/Phergie_Plugin_Http
+ */
+class Phergie_Plugin_Http_Response
+{
+    /**
+     * HTTP response code or 0 if no HTTP response was received
+     *
+     * @var string 
+     */
+    protected $code;
+
+    /**
+     * Description of the HTTP response code or the error message if no HTTP 
+     * response was received
+     *
+     * @var string
+     */
+    protected $message;
+
+    /**
+     * Content of the response body, decoded for supported content types
+     *
+     * @var mixed
+     */
+    protected $content;
+
+    /**
+     * Associative array mapping response header names to their values
+     *
+     * @var array
+     */
+    protected $headers;
+
+    /**
+     * Associative array containing other metadata about the response
+     *
+     * @var array
+     */
+    protected $meta;
+
+    /**
+     * Sets the HTTP response code.
+     *
+     * @param string $code Response code
+     *
+     * @return Phergie_Plugin_Http_Response Provides a fluent interface
+     */
+    public function setCode($code)
+    {
+        $this->code = $code;
+        return $this;
+    }
+
+    /**
+     * Returns the HTTP response code.
+     *
+     * @return string Response code
+     */
+    public function getCode()
+    {
+        return $this->code;
+    }
+
+    /**
+     * Returns whether the response indicates a client- or server-side error.
+     *
+     * @return bool TRUE if the response indicates an error, FALSE otherwise
+     */
+    public function isError()
+    {
+        switch (substr($this->code, 0, 1)) {
+        case '0':
+        case '4':
+        case '5':
+            return true;
+        default:
+            return false;
+        }
+    }
+
+    /**
+     * Sets the HTTP response description.
+     *
+     * @param string $message Response description
+     *
+     * @return Phergie_Plugin_Http_Response Provides a fluent interface
+     */
+    public function setMessage($message)
+    {
+        $this->message = $message;
+        return $this;
+    }
+
+    /**
+     * Returns the HTTP response description.
+     *
+     * @return string
+     */
+    public function getMessage()
+    {
+        return $this->message;
+    }
+
+    /**
+     * Sets the content of the response body.
+     *
+     * @param mixed $content Response body content
+     *
+     * @return Phergie_Plugin_Http_Response Provides a fluent interface
+     */
+    public function setContent($content)
+    {
+        $this->content = $content;
+        return $this;
+    }
+
+    /**
+     * Returns the content of the response body.
+     *
+     * @return mixed Response body content, decoded for supported content 
+     *         types
+     */
+    public function getContent()
+    {
+        return $this->content;
+    }
+
+    /**
+     * Sets the response headers.
+     *
+     * @param array $headers Associative array of response headers indexed 
+     *        by header name
+     *
+     * @return Phergie_Plugin_Http_Response Provides a fluent interface
+     */
+    public function setHeaders(array $headers)
+    {
+        $names = array_map('strtolower', array_keys($headers));
+        $values = array_values($headers);
+        $this->headers = array_combine($names, $values);
+        return $this;
+    }
+
+    /**
+     * Returns all response headers or the value of a single specified 
+     * response header.
+     *
+     * @param string $name Optional name of a single header for which the 
+     *        associated value should be returned
+     *
+     * @return array|string Associative array of all header values, a string  
+     *         containing the value of the header indicated by $name if one 
+     *         is set, or null if one is not
+     */
+    public function getHeaders($name = null)
+    {
+        if ($name) {
+            $name = strtolower($name);
+            if (empty($this->headers[$name])) {
+                return null;
+            }
+            return $this->headers[$name];
+        }
+        return $this->headers;
+    }
+
+    /**
+     * Sets the response metadata.
+     *
+     * @param array $meta Associative array of response metadata
+     *
+     * @return Phergie_Plugin_Http_Response Provides a fluent interface
+     */
+    public function setMeta(array $meta)
+    {
+        $this->meta = $meta;
+        return $this;
+    }
+
+    /**
+     * Returns all metadata or the value of a single specified metadatum.
+     *
+     * @param string $name Optional name of a single metadatum for which the 
+     *        associated value should be returned
+     * 
+     * @return array|string|null Associative array of all metadata values, a  
+     *         string containing the value of the metadatum indicated by 
+     *         $name if one is set, or null if one is not
+     */
+    public function getMeta($name = null)
+    {
+        if ($name) {
+            if (empty($this->meta[$name])) {
+                return null;
+            }
+            return $this->meta[$name];
+        }
+        return $this->meta;
+    }
+}
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Invisible.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Invisible.php
new file mode 100755
index 0000000000..622f7d3db0
--- /dev/null
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Invisible.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * Phergie 
+ *
+ * PHP version 5
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.
+ * It is also available through the world-wide-web at this URL:
+ * http://phergie.org/license
+ *
+ * @category  Phergie 
+ * @package   Phergie_Plugin_Invisible
+ * @author    Phergie Development Team <team@phergie.org>
+ * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
+ * @license   http://phergie.org/license New BSD License
+ * @link      http://pear.phergie.org/package/Phergie_Plugin_Invisible
+ */
+
+/**
+ * Marks the bot as invisible when it connects to the server.
+ *
+ * @category Phergie 
+ * @package  Phergie_Plugin_Invisible
+ * @author   Phergie Development Team <team@phergie.org>
+ * @license  http://phergie.org/license New BSD License
+ * @link     http://pear.phergie.org/package/Phergie_Plugin_Invisible
+ * @link     http://irchelp.org/irchelp/rfc/chapter4.html#c4_2_3_2
+ */
+class Phergie_Plugin_Invisible extends Phergie_Plugin_Abstract
+{
+    /**
+     * Marks the bot as invisible when it connects to the server.
+     *
+     * @return void
+     */
+    public function onConnect()
+    {
+        $this->doMode($this->getConnection()->getNick(), '+i');
+        $this->getPluginHandler()->removePlugin($this);
+    }
+}
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Join.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Join.php
new file mode 100755
index 0000000000..50c3ad8e69
--- /dev/null
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Join.php
@@ -0,0 +1,56 @@
+<?php
+/**
+ * Phergie 
+ *
+ * PHP version 5
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.
+ * It is also available through the world-wide-web at this URL:
+ * http://phergie.org/license
+ *
+ * @category  Phergie 
+ * @package   Phergie_Plugin_Join
+ * @author    Phergie Development Team <team@phergie.org>
+ * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
+ * @license   http://phergie.org/license New BSD License
+ * @link      http://pear.phergie.org/package/Phergie_Plugin_Join
+ */
+
+/**
+ * Joins a specified channel on command from a user.
+ *
+ * @category Phergie 
+ * @package  Phergie_Plugin_Join
+ * @author   Phergie Development Team <team@phergie.org>
+ * @license  http://phergie.org/license New BSD License
+ * @link     http://pear.phergie.org/package/Phergie_Plugin_Join
+ * @uses     Phergie_Plugin_Command pear.phergie.org
+ */
+class Phergie_Plugin_Join extends Phergie_Plugin_Abstract
+{
+    /**
+     * Checks for dependencies.
+     *
+     * @return void
+     */
+    public function onLoad()
+    {
+        $this->getPluginHandler()->getPlugin('Command');
+    }
+
+    /**
+     * Joins a channel.
+     *
+     * @param string $channels Comma-delimited list of channels to join
+     * @param string $keys     Optional comma-delimited list of channel keys
+     *
+     * @return void
+     */
+    public function onCommandJoin($channels, $keys = null)
+    {
+        $this->doJoin($channels, $keys);
+    }
+}
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Part.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Part.php
new file mode 100755
index 0000000000..c07cdd918b
--- /dev/null
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Part.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * Phergie 
+ *
+ * PHP version 5
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.
+ * It is also available through the world-wide-web at this URL:
+ * http://phergie.org/license
+ *
+ * @category  Phergie 
+ * @package   Phergie_Plugin_Part
+ * @author    Phergie Development Team <team@phergie.org>
+ * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
+ * @license   http://phergie.org/license New BSD License
+ * @link      http://pear.phergie.org/package/Phergie_Plugin_Part
+ */
+
+/**
+ * Parts a specified channel on command from a user.
+ *
+ * @category Phergie 
+ * @package  Phergie_Plugin_Part
+ * @author   Phergie Development Team <team@phergie.org>
+ * @license  http://phergie.org/license New BSD License
+ * @link     http://pear.phergie.org/package/Phergie_Plugin_Part
+ * @uses     Phergie_Plugin_Command pear.phergie.org
+ */
+class Phergie_Plugin_Part extends Phergie_Plugin_Abstract
+{
+    /**
+     * Checks for dependencies.
+     *
+     * @return void
+     */
+    public function onLoad()
+    {
+        $this->getPluginHandler()->getPlugin('Command');
+    }
+
+    /**
+     * Parts a channel.
+     *
+     * @param string $channels Comma-delimited list of channels to leave
+     *
+     * @return void
+     */
+    public function onCommandPart($channels)
+    {
+        $this->doPart($channels);
+    }
+}
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Php.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Php.php
new file mode 100644
index 0000000000..29d5118023
--- /dev/null
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Php.php
@@ -0,0 +1,88 @@
+<?php
+/**
+ * Phergie 
+ *
+ * PHP version 5
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.
+ * It is also available through the world-wide-web at this URL:
+ * http://phergie.org/license
+ *
+ * @category  Phergie 
+ * @package   Phergie_Plugin_Php
+ * @author    Phergie Development Team <team@phergie.org>
+ * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
+ * @license   http://phergie.org/license New BSD License
+ * @link      http://pear.phergie.org/package/Phergie_Plugin_Php
+ */
+
+/**
+ * Returns information on PHP functions as requested. 
+ *
+ * @category Phergie 
+ * @package  Phergie_Plugin_Php
+ * @author   Phergie Development Team <team@phergie.org>
+ * @license  http://phergie.org/license New BSD License
+ * @link     http://pear.phergie.org/package/Phergie_Plugin_Php
+ * @uses     extension pdo 
+ * @uses     extension pdo_sqlite 
+ * @uses     Phergie_Plugin_Command pear.phergie.org
+ */
+class Phergie_Plugin_Php extends Phergie_Plugin_Abstract
+{
+    /**
+     * Data source to use
+     *
+     * @var Phergie_Plugin_Php_Source
+     */
+    protected $source;
+
+    /**
+     * Check for dependencies.
+     *
+     * @return void
+     */
+    public function onLoad()
+    {
+        // @todo find a way to move this to Phergie_Plugin_Php_Source_Local
+        if (!extension_loaded('PDO') || !extension_loaded('pdo_sqlite')) {
+            $this->fail('PDO and pdo_sqlite extensions must be installed');
+        }
+
+        $this->getPluginHandler()->getPlugin('Command');
+    }
+
+    /**
+     * Initializes the data source. 
+     *
+     * @return void
+     */
+    public function onConnect()
+    {
+        // Construct a new data source
+        $this->source = new Phergie_Plugin_Php_Source_Local;
+    }
+
+    /**
+     * Searches the data source for the requested function.
+     * 
+     * @param string $functionName Name of the function to search for
+     *
+     * @return void
+     */
+    public function onCommandPhp($functionName)
+    {
+        // Search for the function
+        if ($function = $this->source->findFunction($functionName)) {
+            $msg = 'PHP ' . $function['name'] . ': ' . $function['description'];
+        } else {
+            $msg = 'Search for function ' . $functionName . ' returned no results.';
+        }
+        
+        // Return the result to the source
+        $this->doPrivmsg($this->getEvent()->getSource(), $msg);
+    }
+}
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Php/Source.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Php/Source.php
new file mode 100644
index 0000000000..c6cf3261bd
--- /dev/null
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Php/Source.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Phergie 
+ *
+ * PHP version 5
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.
+ * It is also available through the world-wide-web at this URL:
+ * http://phergie.org/license
+ *
+ * @category  Phergie 
+ * @package   Phergie_Plugin_Php
+ * @author    Phergie Development Team <team@phergie.org>
+ * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
+ * @license   http://phergie.org/license New BSD License
+ * @link      http://pear.phergie.org/package/Phergie_Plugin_Php
+ */
+
+/**
+ * Data source interface for the Php plugin.
+ *
+ * @category Phergie 
+ * @package  Phergie_Plugin_Php
+ * @author   Phergie Development Team <team@phergie.org>
+ * @license  http://phergie.org/license New BSD License
+ * @link     http://pear.phergie.org/package/Phergie_Plugin_Php
+ * @uses     extension pdo 
+ * @uses     extension pdo_sqlite 
+ * @uses     Phergie_Plugin_Command pear.phergie.org
+ */
+interface Phergie_Plugin_Php_Source
+{
+    /**
+     * Searches for a description of the function.
+     * 
+     * @param string $function Search pattern to match against the function 
+     *        name, wildcards supported using %
+     *
+     * @return array|null Associative array containing the function name and 
+     *         description or NULL if no results are found
+     */
+    public function findFunction($function);
+}
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Php/Source/Local.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Php/Source/Local.php
new file mode 100644
index 0000000000..b72443c2e5
--- /dev/null
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Php/Source/Local.php
@@ -0,0 +1,203 @@
+<?php
+/**
+ * Phergie 
+ *
+ * PHP version 5
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.
+ * It is also available through the world-wide-web at this URL:
+ * http://phergie.org/license
+ *
+ * @category  Phergie 
+ * @package   Phergie_Plugin_Php
+ * @author    Phergie Development Team <team@phergie.org>
+ * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
+ * @license   http://phergie.org/license New BSD License
+ * @link      http://pear.phergie.org/package/Phergie_Plugin_Php
+ */
+
+/**
+ * Data source for {@see Phergie_Plugin_Php}. This source reads function 
+ * descriptions from a file and stores them in a SQLite database. When a 
+ * function description is requested, the function is retrieved from the 
+ * local database.
+ *
+ * @category Phergie 
+ * @package  Phergie_Plugin_Php
+ * @author   Phergie Development Team <team@phergie.org>
+ * @license  http://phergie.org/license New BSD License
+ * @link     http://pear.phergie.org/package/Phergie_Plugin_Php
+ * @uses     extension pdo 
+ * @uses     extension pdo_sqlite 
+ * @uses     Phergie_Plugin_Command pear.phergie.org
+ */
+class Phergie_Plugin_Php_Source_Local implements Phergie_Plugin_Php_Source
+{
+    /**
+     * Local database for storage
+     *
+     * @var PDO 
+     */
+    protected $database;
+
+    /**
+     * Source of the PHP function summary
+     *
+     * @var string
+     */
+    protected $url = 'http://cvs.php.net/viewvc.cgi/phpdoc/funcsummary.txt?revision=HEAD';
+
+    /**
+     * Constructor to initialize the data source.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        $path = dirname(__FILE__);
+
+        try {
+            $this->database = new PDO('sqlite:' . $path . '/functions.db');
+            $this->buildDatabase();
+            // @todo Modify this to be rethrown as an appropriate 
+            //       Phergie_Plugin_Exception and handled in Phergie_Plugin_Php
+        } catch (PDOException $e) {
+        }
+    }
+
+    /**
+     * Searches for a description of the function.
+     * 
+     * @param string $function Search pattern to match against the function 
+     *        name, wildcards supported using %
+     *
+     * @return array|null Associative array containing the function name and 
+     *         description or NULL if no results are found
+     */
+    public function findFunction($function)
+    {
+        // Remove possible parentheses
+        $split = preg_split('{\(|\)}', $function);
+        $function = (count($split)) ? array_shift($split) : $function;
+
+        // Prepare the database statement
+        $stmt = $this->database->prepare('SELECT `name`, `description` FROM `functions` WHERE `name` LIKE :function');
+        $stmt->execute(array(':function' => $function));
+
+        // Check the results
+        if (count($stmt) > 0) {
+            $result = $stmt->fetch(PDO::FETCH_ASSOC);
+            /**
+             * @todo add class and function URLS
+             * class methods: http://php.net/manual/en/classname.methodname.php
+             * functions: http://php.net/manual/en/function.functionname.php
+             * where '_' is replaced with '-'
+             */
+            return $result;
+        }
+
+        // No results found, return
+        return null;
+    }
+
+    /**
+     * Build the database and parses the function summary file into it.
+     *
+     * @param bool $rebuild TRUE to force a rebuild of the table used to 
+     *        house function information, FALSE otherwise, defaults to FALSE
+     *
+     * @return void
+     */
+    protected function buildDatabase($rebuild = false)
+    {
+        // Check to see if the functions table exists
+        $table = $this->database->exec("SELECT COUNT(*) FROM `sqlite_master` WHERE `name` = 'functions'");
+
+        // If the table doesn't exist, create it
+        if (!$table) {
+            $this->database->exec('CREATE TABLE `functions` (`name` VARCHAR(255), `description` TEXT)');
+            $this->database->exec('CREATE UNIQUE INDEX `functions_name` ON `functions` (`name`)');
+        }
+
+        // If we created a new table, fill it with data
+        if (!$table || $rebuild) {
+            // Get the contents of the source file
+            // @todo Handle possible error cases better here; the @ operator 
+            //       shouldn't be needed
+            $contents = @file($this->url, FILE_IGNORE_NEW_LINES + FILE_SKIP_EMPTY_LINES);
+
+            if (!$contents) {
+                return;
+            }
+
+            // Parse the contents
+            $valid = array();
+            $firstPart = '';
+            $lineNumber = 0;
+            foreach ($contents as $line) {
+                // Clean the current line
+                $line = trim($line);
+
+                // Skip comment lines
+                if (0 === strpos($line, '#')) {
+                    // reset the line if the current line is odd
+                    if (($lineNumber % 2) !== 0) {
+                        $lineNumber--;
+                    }
+                    continue;
+                }
+
+                /*
+                 * If the current line is even, it's the first part of the
+                 * complete function description ...
+                 */
+                if (($lineNumber % 2) === 0) {
+                    $firstPart = $line;
+                } else {
+                    // ... it's the last part of the complete function description
+                    $completeLine = $firstPart . ' ' . $line;
+                    $firstPart = '';
+                    if (preg_match('{^([^\s]*)[\s]?([^)]*)\(([^\)]*)\)[\sU]+([\sa-zA-Z0-9\.\-_]*)$}', $completeLine, $matches)) {
+                        $valid[] = $matches;
+                    }
+                }
+                // Up the line number before going to the next line
+                $lineNumber++;
+            }
+            // free up some memory
+            unset($contents);
+
+            // Process the valid matches
+            if (count($valid) > 0) {
+                // Clear the database
+                $this->database->exec('DELETE * FROM `functions`');
+
+                // Prepare the sql statement
+                $stmt = $this->database->prepare('INSERT INTO `functions` (`name`, `description`) VALUES (:name, :description)');
+                $this->database->beginTransaction();
+
+                // Insert the data
+                foreach ($valid as $function) {
+                    // Extract function values
+                    list( , $retval, $name, $params, $desc) = $function;
+                    if (empty($name)) {
+                        $name = $retval;
+                        $retval = '';
+                    }
+                    // Reconstruct the complete function line
+                    $line = trim($retval . ' ' . $name . '(' . $params . ') - ' . $desc);
+                    // Execute the statement
+                    $stmt->execute(array(':name' => $name, ':description' => $line));
+                }
+                
+                // Commit the changes to the database
+                $this->database->commit();
+            }
+            // free up some more memory
+            unset($valid);
+        }
+    }
+}
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Ping.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Ping.php
new file mode 100755
index 0000000000..29ac69f464
--- /dev/null
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Ping.php
@@ -0,0 +1,162 @@
+<?php
+/**
+ * Phergie
+ *
+ * PHP version 5
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.
+ * It is also available through the world-wide-web at this URL:
+ * http://phergie.org/license
+ *
+ * @category  Phergie
+ * @package   Phergie_Plugin_Ping
+ * @author    Phergie Development Team <team@phergie.org>
+ * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
+ * @license   http://phergie.org/license New BSD License
+ * @link      http://pear.phergie.org/package/Phergie_Plugin_Ping
+ */
+
+/**
+ * Uses a self CTCP PING to ensure that the client connection has not been
+ * dropped.
+ *
+ * @category Phergie
+ * @package  Phergie_Plugin_Ping
+ * @author   Phergie Development Team <team@phergie.org>
+ * @license  http://phergie.org/license New BSD License
+ * @link     http://pear.phergie.org/package/Phergie_Plugin_Ping
+ */
+class Phergie_Plugin_Ping extends Phergie_Plugin_Abstract
+{
+    /**
+     * Timestamp for the last instance in which an event was received
+     *
+     * @var int
+     */
+    protected $lastEvent;
+
+    /**
+     * Timestamp for the last instance in which a PING was sent
+     *
+     * @var int
+     */
+    protected $lastPing;
+
+    /**
+     * Initialize event timestamps upon connecting to the server.
+     *
+     * @return void
+     */
+    public function onConnect()
+    {
+        $this->lastEvent = time();
+        $this->lastPing = null;
+    }
+
+    /**
+     * Updates the timestamp since the last received event when a new event
+     * arrives.
+     *
+     * @return void
+     */
+    public function preEvent()
+    {
+        $this->lastEvent = time();
+    }
+
+    /**
+     * Clears the ping time if a reply is received.
+     *
+     * @return void
+     */
+    public function onPingResponse()
+    {
+        $this->lastPing = null;
+    }
+
+    /**
+     * Performs a self ping if the event threshold has been exceeded or
+     * issues a termination command if the ping threshold has been exceeded.
+     *
+     * @return void
+     */
+    public function onTick()
+    {
+        $time = time();
+        if (!empty($this->lastPing)) {
+            if ($time - $this->lastPing > $this->getConfig('ping.ping', 10)) {
+                $this->doQuit();
+            }
+        } elseif (
+            $time - $this->lastEvent > $this->getConfig('ping.event', 300)
+        ) {
+            $this->lastPing = $time;
+            $this->doPing($this->getConnection()->getNick(), $this->lastPing);
+        }
+    }
+
+    /**
+     * Gets the last ping time
+     * lastPing needs exposing for things such as unit testing
+     *
+     * @return int timestamp of last ping
+     */
+    public function getLastPing()
+    {
+        return $this->lastPing;
+    }
+
+    /**
+     * Set the last ping time
+     * lastPing needs to be exposed for unit testing
+     * 
+     * @param int|null $ping timestamp of last ping
+     *
+     * @return self
+     */
+    public function setLastPing($ping = null)
+    {
+        if (null === $ping) {
+            $ping = time();
+        }
+        if (!is_int($ping)) {
+            throw new InvalidArgumentException('$ping must be an integer or null');
+        }
+        $this->lastPing = $ping;
+        return $this;
+    }
+
+    /**
+     * Gets the last event time
+     * lastEvent needs exposing for things such as unit testing
+     *
+     * @return int timestamp of last ping
+     */
+    public function getLastEvent()
+    {
+        return $this->lastEvent;
+    }
+
+    /**
+     * Set the last event time
+     * lastEvent needs to be exposed for unit testing
+     *
+     * @param int|null $event timestamp of last ping
+     *
+     * @return self
+     */
+    public function setLastEvent($event = null)
+    {
+        if (null === $event) {
+            $event = time();
+        }
+        if (!is_int($event)) {
+            throw new InvalidArgumentException('$ping must be an integer or null');
+        }
+        $this->lastEvent = $event;
+        return $this;
+    }
+}
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Pong.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Pong.php
new file mode 100755
index 0000000000..54e19fc06d
--- /dev/null
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Pong.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * Phergie 
+ *
+ * PHP version 5
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.
+ * It is also available through the world-wide-web at this URL:
+ * http://phergie.org/license
+ *
+ * @category  Phergie 
+ * @package   Phergie_Plugin_Pong
+ * @author    Phergie Development Team <team@phergie.org>
+ * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
+ * @license   http://phergie.org/license New BSD License
+ * @link      http://pear.phergie.org/package/Phergie_Plugin_Pong
+ */
+
+/**
+ * Responds to PING requests from the server.
+ *
+ * @category Phergie 
+ * @package  Phergie_Plugin_Pong
+ * @author   Phergie Development Team <team@phergie.org>
+ * @license  http://phergie.org/license New BSD License
+ * @link     http://pear.phergie.org/package/Phergie_Plugin_Pong
+ * @link     http://irchelp.org/irchelp/rfc/chapter4.html#c4_6_2
+ * @link     http://irchelp.org/irchelp/rfc/chapter4.html#c4_6_3
+ */
+class Phergie_Plugin_Pong extends Phergie_Plugin_Abstract
+{
+    /**
+     * Sends a PONG response for each PING request received by the server. 
+     *
+     * @return void
+     */
+    public function onPing()
+    {
+        $this->doPong($this->getEvent()->getArgument(0));
+    }
+}
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Prioritize.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Prioritize.php
new file mode 100755
index 0000000000..2312567fb7
--- /dev/null
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Prioritize.php
@@ -0,0 +1,99 @@
+<?php
+/**
+ * Phergie 
+ *
+ * PHP version 5
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.
+ * It is also available through the world-wide-web at this URL:
+ * http://phergie.org/license
+ *
+ * @category  Phergie 
+ * @package   Phergie_Plugin_Prioritize
+ * @author    Phergie Development Team <team@phergie.org>
+ * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
+ * @license   http://phergie.org/license New BSD License
+ * @link      http://pear.phergie.org/package/Phergie_Plugin_Prioritize
+ */
+
+/**
+ * Prioritizes events such that they are executed in order from least to most 
+ * destructive.
+ *
+ * @category Phergie 
+ * @package  Phergie_Plugin_Prioritize
+ * @author   Phergie Development Team <team@phergie.org>
+ * @license  http://phergie.org/license New BSD License
+ * @link     http://pear.phergie.org/package/Phergie_Plugin_Prioritize
+ */
+class Phergie_Plugin_Prioritize extends Phergie_Plugin_Abstract
+{
+    /** 
+     * Event types ordered by priority of execution
+     *
+     * @var array
+     */
+    protected $priority = array(
+        'raw',
+        'pass',
+        'user',
+        'ping',
+        'pong',
+        'notice',
+        'join',
+        'list',
+        'names',
+        'version',
+        'stats',
+        'links',
+        'time',
+        'trace',
+        'admin',
+        'info',
+        'who',
+        'whois',
+        'whowas',
+        'mode',
+        'privmsg',
+        'action',
+        'nick',
+        'topic',
+        'invite',
+        'kill',
+        'part',
+        'quit'
+    );  
+
+    /**
+     * Prioritizes events from least to most destructive. 
+     *
+     * @return void 
+     */
+    public function preDispatch()
+    {
+        $events = $this->getEventHandler();
+
+        // Categorize events by type
+        $categorized = array();
+        foreach ($events as $event) {
+            $type = $event->getType();
+            if (!isset($categorized[$type])) {
+                $categorized[$type] = array();
+            }
+            $categorized[$type][] = $event;
+        }
+
+        // Order events by type from least to most destructive
+        $types = array_intersect($this->priority, array_keys($categorized));
+        $prioritized = array();
+        foreach ($types as $type) {
+            $prioritized = array_merge($prioritized, $categorized[$type]);
+        }
+
+        // Replace the original events array with the prioritized one
+        $events->replaceEvents($prioritized);
+    }
+}
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Puppet.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Puppet.php
new file mode 100644
index 0000000000..bede0be2c8
--- /dev/null
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Puppet.php
@@ -0,0 +1,89 @@
+<?php
+/**
+ * Phergie 
+ *
+ * PHP version 5
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.
+ * It is also available through the world-wide-web at this URL:
+ * http://phergie.org/license
+ *
+ * @category  Phergie 
+ * @package   Phergie_Plugin_Puppet
+ * @author    Phergie Development Team <team@phergie.org>
+ * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
+ * @license   http://phergie.org/license New BSD License
+ * @link      http://pear.phergie.org/package/Phergie_Plugin_Puppet
+ */
+
+/**
+ * Allows a user to effectively speak and act as the bot.
+ *
+ * @category Phergie 
+ * @package  Phergie_Plugin_Puppet
+ * @author   Phergie Development Team <team@phergie.org>
+ * @license  http://phergie.org/license New BSD License
+ * @link     http://pear.phergie.org/package/Phergie_Plugin_Puppet
+ * @uses     Phergie_Plugin_Command pear.phergie.org
+ */
+class Phergie_Plugin_Puppet extends Phergie_Plugin_Abstract
+{
+    /**
+     * Checks for dependencies.
+     *
+     * @return void
+     */
+    public function onLoad()
+    {
+        $this->getPluginHandler()->getPlugin('Command');
+    }
+
+    /**
+     * Handles a request for the bot to repeat a given message in a specified
+     * channel.
+     *
+     * <code>say #chan message</code>
+     *
+     * @param string $channel Name of the channel
+     * @param string $message Message to repeat
+     *
+     * @return void
+     */
+    public function onCommandSay($channel, $message)
+    {
+        $this->doPrivmsg($channel, $message);
+    }
+
+    /**
+     * Handles a request for the bot to repeat a given action in a specified
+     * channel.
+     *
+     * <code>act #chan action</code>
+     *
+     * @param string $channel Name of the channel
+     * @param string $action  Action to perform
+     *
+     * @return void
+     */
+    public function onCommandAct($channel, $action)
+    {
+        $this->doAction($channel, $action);
+    }
+
+    /**
+     * Handles a request for the bot to send the server a raw message
+     *
+     * <code>raw message</code>
+     *
+     * @param string $message Message to send
+     *
+     * @return void
+     */
+    public function onCommandRaw($message)
+    {
+        $this->doRaw($message);
+    }
+}
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Quit.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Quit.php
new file mode 100755
index 0000000000..cacd77d3f3
--- /dev/null
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Quit.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * Phergie 
+ *
+ * PHP version 5
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.
+ * It is also available through the world-wide-web at this URL:
+ * http://phergie.org/license
+ *
+ * @category  Phergie 
+ * @package   Phergie_Plugin_Quit
+ * @author    Phergie Development Team <team@phergie.org>
+ * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
+ * @license   http://phergie.org/license New BSD License
+ * @link      http://pear.phergie.org/package/Phergie_Plugin_Quit
+ */
+
+/**
+ * Terminates the current connection upon command.
+ *
+ * @category Phergie 
+ * @package  Phergie_Plugin_Quit
+ * @author   Phergie Development Team <team@phergie.org>
+ * @license  http://phergie.org/license New BSD License
+ * @link     http://pear.phergie.org/package/Phergie_Plugin_Quit
+ * @uses     Phergie_Plugin_Command pear.phergie.org
+ *
+ * @pluginDesc Terminates the current connection upon command.
+ */
+class Phergie_Plugin_Quit extends Phergie_Plugin_Abstract
+{
+    /**
+     * Checks for dependencies.
+     *
+     * @return void
+     */
+    public function onLoad()
+    {
+        $this->getPluginHandler()->getPlugin('Command');
+        $help = $this->getPluginHandler()->getPlugin('Help');
+        $help->register($this);
+    }
+
+    /**
+     * Issues a quit command when a message is received requesting that the 
+     * bot terminate the current connection.
+     *
+     * @return void
+     *
+     * @pluginCmd terminates the connection
+     */
+    public function onCommandQuit()
+    {
+        $this->doQuit('Requested by ' . $this->getEvent()->getNick());
+    }
+}
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Remind.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Remind.php
new file mode 100644
index 0000000000..bfd5333674
--- /dev/null
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Remind.php
@@ -0,0 +1,360 @@
+<?php
+/**
+ * Phergie
+ *
+ * PHP version 5
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.
+ * It is also available through the world-wide-web at this URL:
+ * http://phergie.org/license
+ *
+ * @category  Phergie
+ * @package   Phergie_Plugin_Remind
+ * @author    Phergie Development Team <team@phergie.org>
+ * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
+ * @license   http://phergie.org/license New BSD License
+ * @link      http://pear.phergie.org/package/Phergie_Plugin_Remind
+ */
+
+/**
+ * Parses and logs messages that should be relayed to other users the next time
+ * the recipient is active on the same channel.
+ *
+ * @category Phergie
+ * @package  Phergie_Plugin_Remind
+ * @author   Phergie Development Team <team@phergie.org>
+ * @license  http://phergie.org/license New BSD License
+ * @link     http://pear.phergie.org/package/Phergie_Plugin_Drink
+ * @uses     Phergie_Plugin_Command pear.phergie.org
+ * @uses     Phergie_Plugin_Helper_Time pear.phergie.org
+ */
+class Phergie_Plugin_Remind extends Phergie_Plugin_Abstract
+{
+    /**
+     * Number of reminders to show in public.
+     */
+    const PUBLIC_REMINDERS = 3;
+
+    /**
+     * PDO resource for a SQLite database containing the reminders.
+     *
+     * @var resource
+     */
+    protected $db;
+
+    /**
+     * Flag that indicates whether or not to use an in-memory reminder list.
+     *
+     * @var bool
+     */
+    protected $keepListInMemory = true;
+
+    /**
+     * In-memory store for pending reminders.
+     */
+    protected $msgStorage = array();
+
+    /**
+     * Check for dependencies.
+     *
+     * @return void
+     */
+    public function onLoad()
+    {
+        $this->getPluginHandler()->getPlugin('Command');
+        $path = dirname(__FILE__) . '/reminder.db';
+
+        if (isset($this->config['remind.use_memory'])) {
+            $this->keepListInMemory = (bool)$this->config['remind.use_memory'];
+        }
+
+        try {
+            $this->db = new PDO('sqlite:' . $path);
+            $this->createTables();
+        } catch (PDO_Exception $e) {
+            throw new Phergie_Plugin_Exception($e->getMessage());
+        }
+    }
+
+    /**
+     * Intercepts a message and processes any contained recognized commands.
+     *
+     * @return void
+     */
+    public function onPrivmsg()
+    {
+        $source = $this->getEvent()->getSource();
+        $nick = $this->getEvent()->getNick();
+
+        $this->deliverReminders($source, $nick);
+    }
+
+    /**
+     * Handle reminder requests
+     *
+     * @param string $recipient recipient of the message
+     * @param string $message   message to tell the recipient
+     *
+     * @return void
+     * @see handleRemind()
+     */
+    public function onCommandTell($recipient, $message)
+    {
+        $this->handleRemind($recipient, $message);
+    }
+
+    /**
+     * Handle reminder requests
+     *
+     * @param string $recipient recipient of the message
+     * @param string $message   message to tell the recipient
+     *
+     * @return void
+     * @see handleRemind()
+     */
+    public function onCommandAsk($recipient, $message)
+    {
+        $this->handleRemind($recipient, $message);
+    }
+
+    /**
+     * Handle reminder requests
+     *
+     * @param string $recipient recipient of the message
+     * @param string $message   message to tell the recipient
+     *
+     * @return void
+     * @see handleRemind()
+     */
+    public function onCommandRemind($recipient, $message)
+    {
+        $this->handleRemind($recipient, $message);
+    }
+
+    /**
+     * Handles the tell/remind command (stores the message)
+     *
+     * @param string $recipient name of the recipient
+     * @param string $message   message to store
+     *
+     * @return void
+     */
+    protected function handleRemind($recipient, $message)
+    {
+        $source = $this->getEvent()->getSource();
+        $nick = $this->getEvent()->getNick();
+
+        if (!$this->getEvent()->isInChannel()) {
+            $this->doPrivmsg($source, 'Reminders must be requested in-channel.');
+            return;
+        }
+
+        $q = $this->db->prepare(
+            'INSERT INTO remind
+                (
+                    time,
+                    channel,
+                    recipient,
+                    sender,
+                    message
+                )
+            VALUES
+                (
+                    :time,
+                    :channel,
+                    :recipient,
+                    :sender,
+                    :message
+               )'
+        );
+        try {
+            $q->execute(
+                array(
+                    'time' => date(DATE_RFC822),
+                    'channel' => $source,
+                    'recipient' => strtolower($recipient),
+                    'sender' => strtolower($nick),
+                    'message' => $message
+                )
+            );
+        } catch (PDOException $e) {
+        }
+
+        if ($rowid = $this->db->lastInsertId()) {
+            $this->doPrivmsg($source, 'ok, ' . $nick . ', message stored');
+        } else {
+            $this->doPrivmsg(
+                $source,
+                $nick . ': bad things happened. Message not saved.'
+            );
+            return;
+        }
+
+        if ($this->keepListInMemory) {
+            $this->msgStorage[$source][strtolower($recipient)] = $rowid;
+        }
+    }
+
+    /**
+     * Determines if the user has pending reminders, and if so, delivers them.
+     *
+     * @param string $channel channel to check
+     * @param string $nick    nick to check
+     *
+     * @return void
+     */
+    protected function deliverReminders($channel, $nick)
+    {
+        if ($channel[0] != '#') {
+            // private message, not a channel, so don't check
+            return;
+        }
+
+        // short circuit if there's no message in memory (if allowed)
+        if ($this->keepListInMemory
+            && !isset($this->msgStorage[$channel][strtolower($nick)])
+        ) {
+            return;
+        }
+
+        // fetch and deliver messages
+        $reminders = $this->fetchMessages($channel, $nick);
+        if (count($reminders) > self::PUBLIC_REMINDERS) {
+            $msgs = array_slice($reminders, 0, self::PUBLIC_REMINDERS);
+            $privmsgs = array_slice($reminders, self::PUBLIC_REMINDERS);
+        } else {
+            $msgs = $reminders;
+            $privmsgs = false;
+        }
+
+        foreach ($msgs as $msg) {
+            $ts = new Phergie_Plugin_Helper_Time($msg['time']);
+            $formatted = sprintf(
+                '%s: (from %s, %s ago) %s',
+                $nick, $msg['sender'], $ts->getCountdown(), $msg['message']
+            );
+            $this->doPrivmsg($channel, $formatted);
+            $this->deleteMessage($msg['rowid'], $channel, $nick);
+        }
+
+        if ($privmsgs) {
+            foreach ($privmsgs as $msg) {
+                $ts = new Phergie_Plugin_Helper_Time($msg['time']);
+                $formatted = sprintf(
+                    'from %s, %s ago: %s',
+                    $msg['sender'], $ts->getCountdown(), $msg['message']
+                );
+                $this->doPrivmsg($nick, $formatted);
+                $this->deleteMessage($msg['rowid'], $channel, $nick);
+            }
+            $formatted = sprintf(
+                '%s: (%d more messages sent in private.)',
+                $nick, count($privmsgs)
+            );
+            $this->doPrivmsg($channel, $formatted);
+        }
+    }
+
+    /**
+     * Get pending messages (for a specific channel/recipient)
+     *
+     * @param string $channel   channel on which to check for pending messages
+     * @param string $recipient user for which to check pending messages
+     *
+     * @return array of records
+     */
+    protected function fetchMessages($channel = null, $recipient = null)
+    {
+        if ($channel) {
+            $qClause = 'WHERE channel = :channel AND recipient LIKE :recipient';
+            $params = compact('channel', 'recipient');
+        } else {
+            $qClause = '';
+            $params = array();
+        }
+        $q = $this->db->prepare(
+            'SELECT rowid, channel, sender, recipient, time, message
+            FROM remind ' . $qClause
+        );
+        $q->execute($params);
+        return $q->fetchAll();
+    }
+
+    /**
+     * Deletes a delivered message
+     *
+     * @param int    $rowid   ID of the message to delete
+     * @param string $channel message's channel
+     * @param string $nick    message's recipient
+     *
+     * @return void
+     */
+    protected function deleteMessage($rowid, $channel, $nick)
+    {
+        $nick = strtolower($nick);
+        $q = $this->db->prepare('DELETE FROM remind WHERE rowid = :rowid');
+        $q->execute(array('rowid' => $rowid));
+
+        if ($this->keepListInMemory) {
+            if (isset($this->msgStorage[$channel][$nick])
+                && $this->msgStorage[$channel][$nick] == $rowid
+            ) {
+                unset($this->msgStorage[$channel][$nick]);
+            }
+        }
+    }
+
+    /**
+     * Determines if a table exists
+     *
+     * @param string $name Table name
+     *
+     * @return bool
+     */
+    protected function haveTable($name)
+    {
+        $sql = 'SELECT COUNT(*) FROM sqlite_master WHERE name = '
+            . $this->db->quote($name);
+        return (bool) $this->db->query($sql)->fetchColumn();
+    }
+
+    /**
+     * Creates the database table(s) (if they don't exist)
+     *
+     * @return void
+     */
+    protected function createTables()
+    {
+        if (!$this->haveTable('remind')) {
+            $this->db->exec(
+                'CREATE TABLE
+                    remind
+                    (
+                        time INTEGER,
+                        channel TEXT,
+                        recipient TEXT,
+                        sender TEXT,
+                        message TEXT
+                    )'
+            );
+        }
+    }
+
+    /**
+     * Populates the in-memory cache of pending reminders
+     *
+     * @return void
+     */
+    protected function populateMemory()
+    {
+        if (!$this->keepListInMemory) {
+            return;
+        }
+        foreach ($this->fetchMessages() as $msg) {
+            $this->msgStorage[$msg['channel']][$msg['recipient']] = $msg['rowid'];
+        }
+    }
+}
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/TerryChay.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/TerryChay.php
new file mode 100644
index 0000000000..611dfc9ef1
--- /dev/null
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/TerryChay.php
@@ -0,0 +1,109 @@
+<?php
+/**
+ * Phergie 
+ *
+ * PHP version 5
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.
+ * It is also available through the world-wide-web at this URL:
+ * http://phergie.org/license
+ *
+ * @category  Phergie 
+ * @package   Phergie_Plugin_TerryChay
+ * @author    Phergie Development Team <team@phergie.org>
+ * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
+ * @license   http://phergie.org/license New BSD License
+ * @link      http://pear.phergie.org/package/Phergie_Plugin_TerryChay
+ */
+
+/**
+ * Parses incoming messages for the words "Terry Chay" or tychay and responds
+ * with a random Terry fact retrieved from the Chayism web service. 
+ *
+ * @category Phergie 
+ * @package  Phergie_Plugin_TerryChay
+ * @author   Phergie Development Team <team@phergie.org>
+ * @license  http://phergie.org/license New BSD License
+ * @link     http://pear.phergie.org/package/Phergie_Plugin_TerryChay
+ * @uses     Phergie_Plugin_Http pear.phergie.org
+ */
+class Phergie_Plugin_TerryChay extends Phergie_Plugin_Abstract
+{
+    /**
+     * URL to the web service
+     *
+     * @const string
+     */
+    const URL = 'http://phpdoc.info/chayism/';
+
+    /**
+     * HTTP plugin
+     *
+     * @var Phergie_Plugin_Http
+     */
+    protected $http;
+
+    /**
+     * Checks for dependencies.
+     *
+     * @return void
+     */
+    public function onLoad()
+    {
+        $this->http = $this->getPluginHandler()->getPlugin('Http');
+    }
+
+    /**
+     * Fetches a chayism.
+     *
+     * @return string|bool Fetched chayism or FALSE if the operation failed 
+     */
+    public function getChayism()
+    {
+        return $this->http->get(self::URL)->getContent();
+    }
+
+    /**
+     * Parses incoming messages for "Terry Chay" and related variations and 
+     * responds with a chayism.
+     *
+     * @return void
+     */
+    public function onPrivmsg()
+    {
+        $event = $this->getEvent();
+        $source = $event->getSource();
+        $message = $event->getText();
+        $pattern 
+            = '{^(' . preg_quote($this->getConfig('command.prefix')) . 
+            '\s*)?.*(terry\s+chay|tychay)}ix';
+
+        if (preg_match($pattern, $message)
+            && $fact = $this->getChayism()
+        ) {
+            $this->doPrivmsg($source, 'Fact: ' . $fact);
+        }
+    }
+
+    /**
+     * Parses incoming CTCP request for "Terry Chay" and related variations 
+     * and responds with a chayism.
+     *
+     * @return void
+     */
+    public function onCtcp()
+    {
+        $event = $this->getEvent();
+        $source = $event->getSource();
+        $ctcp = $event->getArgument(1);
+
+        if (preg_match('({terry[\s_+-]*chay}|tychay)ix', $ctcp)
+            && $fact = $this->getChayism()
+        ) {
+            $this->doCtcpReply($source, 'TERRYCHAY', $fact);
+        }
+    }
+}
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/TheFuckingWeather.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/TheFuckingWeather.php
new file mode 100644
index 0000000000..e8a02860b2
--- /dev/null
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/TheFuckingWeather.php
@@ -0,0 +1,150 @@
+<?php
+/**
+ * Phergie
+ *
+ * PHP version 5
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.
+ * It is also available through the world-wide-web at this URL:
+ * http://phergie.org/license
+ *
+ * @category  Phergie
+ * @package   Phergie_Plugin_TheFuckingWeather
+ * @author    Phergie Development Team <team@phergie.org>
+ * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
+ * @license   http://phergie.org/license New BSD License
+ * @link      http://pear.phergie.org/package/Phergie_Plugin_TheFuckingWeather
+ */
+
+/**
+ * Detects and responds to requests for current weather conditions in a
+ * particular location using data from a web service.
+ *
+ * @category Phergie
+ * @package  Phergie_Plugin_TheFuckingWeather
+ * @author   Phergie Development Team <team@phergie.org>
+ * @license  http://phergie.org/license New BSD License
+ * @link     http://pear.phergie.org/package/Phergie_Plugin_TheFuckingWeather
+ * @link     http://thefuckingweather.com
+ * @uses     Phergie_Plugin_Command pear.phergie.org
+ * @uses     Phergie_Plugin_Http pear.phergie.org
+ *
+ * @pluginDesc Detects and responds to requests for current weather 
+ *             conditions in a particular location.
+ */
+
+class Phergie_Plugin_TheFuckingWeather extends Phergie_Plugin_Abstract
+{
+    /**
+     * HTTP plugin
+     *
+     * @var Phergie_Plugin_Http
+     */
+    protected $http = null;
+
+    /**
+     * Base API URL
+     *
+     * @var string
+     */
+    protected $url = 'http://www.thefuckingweather.com/?zipcode=';
+
+    /**
+     * Checks for dependencies.
+     *
+     * @return void
+     */
+    public function onLoad()
+    {
+        $pluginHandler = $this->getPluginHandler();
+        $pluginHandler->getPlugin('Command');
+        $this->http = $pluginHandler->getPlugin('Http');
+    }
+
+    /**
+     * Returns the weather from the specified location.
+     *
+     * @param string $location Location term
+     *
+     * @return void
+     * @todo Implement use of URL shortening here
+     * @pluginCmd [location] Detects and responds to requests for current 
+     *            weather conditions in a particular location.
+     */
+    public function onCommandThefuckingweather($location)
+    {
+        $source = $this->getEvent()->getSource();
+        $target = $this->getEvent()->getNick();
+        $out = $this->getWeather($location);
+        if (!$out) {
+            $this->doNotice($source, $out);
+        } else {
+            $this->doPrivmsg($source, $target . ': ' . $out);
+        }
+    }
+
+    /**
+    * Alias for TheFuckingWeather command.
+    *
+    * @param string $location Location term
+    *
+    * @return void
+    * @pluginCmd [location] Alias for thefuckingweather command.
+    */
+    public function onCommandTfw($location)
+    {
+        $this->onCommandThefuckingweather($location);
+    }
+
+    /**
+     * Get the necessary content and returns the search result.
+     *
+     * @param string $location Location term
+     *
+     * @return string|bool Search result or FALSE if none is found
+     * @todo Try to optimize pregs
+     */
+    protected function getWeather($location)
+    {
+        $url = $this->url . urlencode($location);
+        $response = $this->http->get($url);
+        $content = $response->getContent();
+
+        preg_match_all(
+            '#<div><span class="small">(.*?)<\/span><\/div>#im',
+            $content, $matches
+        );
+        $location = $matches[1][0];
+
+        if (!empty($location)) {
+            preg_match_all(
+                '#<div class="large" >(.*?)<br \/>#im',
+                $content, $matches
+            );
+            $temp_numb = (int) $matches[1][0];
+            $temp_numb .= ' F / ' . round(($temp_numb - 32) / 1.8, 0) . ' C?!';
+
+            preg_match_all(
+                '#<br \/>(.*?)<\/div><div  id="remark"><br \/>#im',
+                $content, $matches
+            );
+            $temp_desc = $matches[1][0];
+
+            preg_match_all(
+                '#<div  id="remark"><br \/>\n<span>(.*?)<\/span><\/div>#im',
+                $content, $matches
+            );
+            $remark = $matches[1][0];
+
+            $result = "{$location}: {$temp_numb} {$temp_desc} ({$remark})";
+            $result = preg_replace('/</', ' <', $result);
+            $result = strip_tags($result);
+            return html_entity_decode($result);
+        } else {
+            return 'No fucking clue where that is.';
+        }
+    }
+}
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Time.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Time.php
new file mode 100644
index 0000000000..0d90bd8a68
--- /dev/null
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Time.php
@@ -0,0 +1,72 @@
+<?php
+/**
+ * Phergie 
+ *
+ * PHP version 5
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.
+ * It is also available through the world-wide-web at this URL:
+ * http://phergie.org/license
+ *
+ * @category  Phergie 
+ * @package   Phergie_Plugin_Time
+ * @author    Phergie Development Team <team@phergie.org>
+ * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
+ * @license   http://phergie.org/license New BSD License
+ * @link      http://pear.phergie.org/package/Phergie_Plugin_Time
+ */
+
+/**
+ * Helper plugin to assist other plugins with time manipulation, display.
+ *
+ * Any shared time-related code should go into this class.
+ *
+ * @category Phergie
+ * @package  Phergie_Plugin_Time
+ * @author   Phergie Development Team <team@phergie.org>
+ * @license  http://phergie.org/license New BSD License
+ * @link     http://pear.phergie.org/package/Phergie_Plugin_Time
+ */
+class Phergie_Plugin_Time extends Phergie_Plugin_Abstract 
+{
+    /**
+     * Returns the time interval between the current time and a given 
+     * timestamp. 
+     *
+     * @param string $timestamp Timestamp compatible with strtotime()
+     *
+     * @return string
+     */
+    public function getCountdown($timestamp)
+    {
+        $time = time() - strtotime($timestamp); 
+        $return = array();
+
+        $days = floor($time / 86400);
+        if ($days > 0) {
+            $return[] = $days . 'd';
+            $time %= 86400;
+        }
+
+        $hours = floor($time / 3600);
+        if ($hours > 0) {
+            $return[] = $hours . 'h';
+            $time %= 3600;
+        }
+
+        $minutes = floor($time / 60);
+        if ($minutes > 0) {
+            $return[] = $minutes . 'm';
+            $time %= 60;
+        }
+
+        if ($time > 0 || count($return) <= 0) {
+            $return[] = ($time > 0 ? $time : '0') . 's';
+        }
+
+        return implode(' ', $return);
+    }
+}
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Twitter.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Twitter.php
new file mode 100644
index 0000000000..91f177d2ae
--- /dev/null
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Twitter.php
@@ -0,0 +1,223 @@
+<?php
+/**
+ * Phergie 
+ *
+ * PHP version 5
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.
+ * It is also available through the world-wide-web at this URL:
+ * http://phergie.org/license
+ *
+ * @category  Phergie 
+ * @package   Phergie_Plugin_Twitter
+ * @author    Phergie Development Team <team@phergie.org>
+ * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
+ * @license   http://phergie.org/license New BSD License
+ * @link      http://pear.phergie.org/package/Phergie_Plugin_Twitter
+ */
+
+/**
+ * These requires are for library code, so they don't fit Autoload's normal 
+ * conventions.
+ *
+ * @link http://github.com/scoates/simpletweet
+ */
+require dirname(__FILE__) . '/Twitter/twitter.class.php';
+require dirname(__FILE__) . '/Twitter/laconica.class.php';
+
+/**
+ * Twitter plugin; Allows tweet (if configured) and twitter commands
+ *
+ * Usage:
+ *   tweet text to tweet
+ *    (sends a message to twitter and Phergie will give you the link)
+ *   twitter username
+ *    (fetches and displays the last tweet by @username)
+ *   twitter username 3
+ *    (fetches and displays the third last tweet by @username)
+ *   twitter 1234567
+ *    (fetches and displays tweet number 1234567)
+ *   http://twitter.com/username/statuses/1234567
+ *    (same as `twitter 1234567`)
+ *
+ * @category Phergie
+ * @package  Phergie_Plugin_Twitter
+ * @author   Phergie Development Team <team@phergie.org>
+ * @license  http://phergie.org/license New BSD License
+ * @link     http://pear.phergie.org/package/Phergie_Plugin_Twitter
+ * @uses     Phergie_Plugin_Time pear.phergie.org
+ */
+class Phergie_Plugin_Twitter extends Phergie_Plugin_Abstract
+{
+    /**
+     * Twitter object (from Simpletweet)
+     */
+    protected $twitter;
+
+    /**
+     * Twitter user
+     */
+    protected $twitteruser = null;
+
+    /**
+     * Password
+     */
+    protected $twitterpassword = null;
+
+    /**
+     * Allow only admins to tweet
+     */
+    protected $requireAdmin = true;
+
+    /**
+     * Register with the URL plugin, if possible
+     *
+     * @return void
+     */
+    public function onConnect()
+    {
+        if ($url = $this->getPluginHandler()->getPlugin('Url')) {
+            $url->registerRenderer($this);
+        }
+    }
+
+    /**
+     * Initialize (set up configuration vars)
+     *
+     * @return void
+     */
+    public function onLoad()
+    {
+        // see if tweetrequireadmin defined in config
+        if (isset($this->config['twitter.tweetrequireadmin'])
+            && $req = $this->config['twitter.tweetrequireadmin']
+        ) {
+            // if so, override default
+            $this->requireAdmin = $req;
+        }
+        if (!isset($this->config['twitter.class'])
+            || !$twitterClass = $this->config['twitter.class']
+        ) {
+            $twitterClass = 'Twitter';
+        }
+
+        $this->twitteruser = $this->config['twitter.user'];
+        $this->twitterpassword = $this->config['twitter.password'];
+        $url = $this->config['twitter.url'];
+
+        $this->twitter = new $twitterClass(
+            $this->twitteruser,
+            $this->twitterpassword,
+            $url
+        );
+
+    }
+
+    /**
+     * Fetches the associated tweet and relays it to the channel
+     *
+     * @param string $tweeter if numeric the tweet number/id, otherwise the
+     *  twitter user name (optionally prefixed with @)
+     * @param int    $num     optional tweet number for this user (number of
+     *  tweets ago)
+     *
+     * @return void
+     */
+    public function onCommandTwitter($tweeter = null, $num = 1)
+    {
+        $source = $this->getEvent()->getSource();
+        if (is_numeric($tweeter)) {
+            $tweet = $this->twitter->getTweetByNum($tweeter);
+        } else if (is_null($tweeter) && $this->twitteruser) {
+            $tweet = $this->twitter->getLastTweet($this->twitteruser, 1);
+        } else {
+            $tweet = $this->twitter->getLastTweet(ltrim($tweeter, '@'), $num);
+        }
+        if ($tweet) {
+            $this->doPrivmsg($source, $this->formatTweet($tweet));
+        }
+    }
+
+    /**
+     * Sends a tweet to Twitter as the configured user
+     *
+     * @param string $txt the text to tweet
+     *
+     * @return void
+     */
+    public function onCommandTweet($txt)
+    {
+        echo "Tweet!\n";
+        $nick = $this->getEvent()->getNick();
+        if (!$this->twitteruser) {
+            return;
+        }
+        if ($this->requireAdmin && !$this->fromAdmin(true)) {
+            return;
+        }
+        $source = $this->getEvent()->getSource();
+        if ($tweet = $this->twitter->sendTweet($txt)) {
+            $this->doPrivmsg(
+                $source, 'Tweeted: '
+                . $this->twitter->getUrlOutputStatus($tweet)
+            );
+        } else {
+            $this->doNotice($nick, 'Tweet failed');
+        }
+    }
+
+    /**
+     * Formats a Tweet into a message suitable for output
+     *
+     * @param object $tweet      JSON-decoded tweet object from Twitter
+     * @param bool   $includeUrl whether or not to include the URL in the 
+     *  formatted output
+     *
+     * @return string
+     */
+    protected function formatTweet(StdClass $tweet, $includeUrl = true)
+    {
+        $ts = $this->plugins->time->getCountDown($tweet->created_at);
+        $out =  '<@' . $tweet->user->screen_name .'> '. $tweet->text
+            . ' - ' . $ts . ' ago';
+        if ($includeUrl) {
+            $out .= ' (' . $this->twitter->getUrlOutputStatus($tweet) . ')';
+        }
+        return $out;
+    }
+
+    /**
+     * Renders a URL
+     *
+     * @param array $parsed parse_url() output for the URL to render
+     *
+     * @return bool
+     */
+    public function renderUrl(array $parsed)
+    {
+        if ($parsed['host'] != 'twitter.com'
+            && $parsed['host'] != 'www.twitter.com'
+        ) {
+            // unable to render non-twitter URLs
+            return false;
+        }
+
+        $source = $this->getEvent()->getSource();
+
+        if (preg_match('#^/(.*?)/status(es)?/([0-9]+)$#', $parsed['path'], $matches)
+        ) {
+            $tweet = $this->twitter->getTweetByNum($matches[3]);
+            if ($tweet) {
+                $this->doPrivmsg($source, $this->formatTweet($tweet, false));
+            }
+            return true;
+        }
+
+        // if we get this far, we haven't satisfied the URL, so bail:
+        return false;
+
+    }
+}
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Twitter/laconica.class.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Twitter/laconica.class.php
new file mode 100644
index 0000000000..e411991dbe
--- /dev/null
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Twitter/laconica.class.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * Sean's Simple Twitter Library - Laconica extension
+ *
+ * Copyright 2008, Sean Coates
+ * Usage of the works is permitted provided that this instrument is retained
+ * with the works, so that any entity that uses the works is notified of this
+ * instrument.
+ * DISCLAIMER: THE WORKS ARE WITHOUT WARRANTY.
+ * ( Fair License - http://www.opensource.org/licenses/fair.php )
+ * Short license: do whatever you like with this.
+ * 
+ */
+class Twitter_Laconica extends Twitter {
+
+    /**
+     * Constructor; sets up configuration.
+     * 
+     * @param string $user Laconica user name; null for limited read-only access
+     * @param string $pass Laconica password; null for limited read-only access
+     * @param string $baseUrl Base URL of Laconica install. Defaults to identi.ca
+     */
+    public function __construct($user=null, $pass=null, $baseUrl = 'http://identi.ca/') {
+        $this->baseUrl = $baseUrl;
+        parent::__construct($user, $pass);
+    }
+    
+    /**
+     * Returns the base API URL
+     */
+    protected function getUrlApi() {
+        return $this->baseUrlFull . 'api/';
+    }
+    
+    /**
+     * Output URL: status
+     */
+    public function getUrlOutputStatus(StdClass $tweet) {
+        return $this->baseUrl . 'notice/' . urlencode($tweet->id);
+    }
+}
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Twitter/twitter.class.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Twitter/twitter.class.php
new file mode 100644
index 0000000000..31173a6d08
--- /dev/null
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Twitter/twitter.class.php
@@ -0,0 +1,287 @@
+<?php
+/**
+ * Sean's Simple Twitter Library
+ *
+ * Probably a little more or a little less than you need.
+ *
+ * Copyright 2008, Sean Coates
+ * Usage of the works is permitted provided that this instrument is retained
+ * with the works, so that any entity that uses the works is notified of this
+ * instrument.
+ * DISCLAIMER: THE WORKS ARE WITHOUT WARRANTY.
+ * ( Fair License - http://www.opensource.org/licenses/fair.php )
+ * Short license: do whatever you like with this.
+ *
+ * komode: le=unix language=php codepage=utf8 tab=4 notabs indent=4
+ */
+class Twitter {
+
+    /**
+     * Base URL for Twitter API
+     *
+     * Do not specify user/password in URL
+     */
+    protected $baseUrl = 'http://twitter.com/';
+    
+    /**
+     * Full base URL (includes user/pass)
+     *
+     * (created in Init)
+     */
+    protected $baseUrlFull = null;
+    
+    /**
+     * Twitter API user
+     */
+    protected $user;
+    
+    /**
+     * Twitter API password
+     */
+    protected $pass;
+    
+    /**
+     * Constructor; sets up configuration.
+     * 
+     * @param string $user Twitter user name; null for limited read-only access
+     * @param string $pass Twitter password; null for limited read-only access
+     */
+    public function __construct($user=null, $pass=null) {
+        $this->baseUrlFull = $this->baseUrl;
+        if (null !== $user) {
+            // user is defined, so use it in the URL
+            $this->user = $user;
+            $this->pass = $pass;
+            $parsed = parse_url($this->baseUrl);
+            $this->baseUrlFull = $parsed['scheme'] . '://' . $this->user . ':' .
+                $this->pass . '@' . $parsed['host'];
+            // port (optional)
+            if (isset($parsed['port']) && is_numeric($parsed['port'])) {
+                $this->baseUrlFull .= ':' . $parsed['port'];
+            }
+            // append path (default: /)
+            if (isset($parsed['path'])) {
+                $this->baseUrlFull .= $parsed['path'];
+            } else {
+                $this->baseUrlFull .= '/';
+            }
+        }
+    }
+
+    /**
+     * Fetches a tweet by its number/id
+     *
+     * @param int $num the tweet id/number
+     * @return string (null on failure)
+     */
+    public function getTweetByNum($num) {
+        if (!is_numeric($num)) {
+            return;
+        }
+        $tweet = json_decode(file_get_contents($this->getUrlStatus($num)));
+        return $tweet;
+    }
+
+    /**
+     * Reads [last] tweet from user
+     *
+     * @param string $tweeter the tweeter username
+     * @param int $num this many tweets ago (1 = current tweet)
+     * @return string (false on failure)
+     */
+    public function getLastTweet($tweeter, $num = 1)
+    {
+        $source = json_decode(file_get_contents($this->getUrlUserTimeline($tweeter)));
+        if ($num > count($source)) {
+            return false;
+        }
+        $tweet = $source[$num - 1];
+        if (!isset($tweet->user->screen_name) || !$tweet->user->screen_name) {
+            return false;
+        }
+        return $tweet;
+    }
+    
+    /**
+     * fetches mentions for a user
+     */
+    public function getMentions($sinceId=null, $count=20) {
+        return json_decode(file_get_contents($this->getUrlMentions($sinceId, $count)));
+    }
+    
+    /**
+     * Fetches followers for a user
+     */
+    public function getFollowers($cursor=-1) {
+        return json_decode(file_get_contents($this->getUrlFollowers($cursor)));
+    }
+    
+    /**
+     * Follow a userid
+     */
+    public function follow($userId) {
+        $params = array(
+            'http' => array(
+                'method' => 'POST',
+                'content' => array(),
+                'header' => 'Content-type: application/x-www-form-urlencoded',
+            )
+        );
+        $ctx = stream_context_create($params);
+        $fp = fopen($this->getUrlFollow($userId), 'rb', false, $ctx);
+        if (!$fp) {
+            return false;
+        }
+        $response = stream_get_contents($fp);
+        if ($response === false) {
+            return false;
+        }
+        $response = json_decode($response);
+        return $response;
+    }
+    
+    /**
+     * fetches DMs for a user
+     */
+    public function getDMs($sinceId=null, $count=20, $page=1) {
+        return json_decode(file_get_contents($this->getUrlDMs($sinceId, $count, $page)));
+    }
+    
+    /**
+     * Send DM
+     */
+    public function sendDM($screenName, $text) {
+        $data = http_build_query(array('screen_name'=>$screenName, 'text'=>$text));
+        $params = array(
+            'http' => array(
+                'method' => 'POST',
+                'content' => $data,
+                'header' => 'Content-type: application/x-www-form-urlencoded',
+            )
+        );
+        $ctx = stream_context_create($params);
+        $fp = fopen($this->getUrlSendDM(), 'rb', false, $ctx);
+        if (!$fp) {
+            return false;
+        }
+        $response = stream_get_contents($fp);
+        if ($response === false) {
+            return false;
+        }
+        $response = json_decode($response);
+        return $response;
+    }
+
+    /**
+     * Sends a tweet
+     *
+     * @param string $txt the tweet text to send
+     * @return string URL of tweet (or false on failure)
+     */
+    public function sendTweet($txt, $limit=true) {
+        if ($limit) {
+            $txt = substr($txt, 0, 140); // twitter message size limit
+        }
+        $data = 'status=' . urlencode($txt);
+        $params = array(
+            'http' => array(
+                'method' => 'POST',
+                'content' => $data,
+                'header' => 'Content-type: application/x-www-form-urlencoded',
+            )
+        );
+        $ctx = stream_context_create($params);
+        $fp = fopen($this->getUrlTweetPost(), 'rb', false, $ctx);
+        if (!$fp) {
+            return false;
+        }
+        $response = stream_get_contents($fp);
+        if ($response === false) {
+            return false;
+        }
+        $response = json_decode($response);
+        return $response;
+    }
+    
+    /**
+     * Returns the base API URL
+     */
+    protected function getUrlApi() {
+        return $this->baseUrlFull;
+    }
+    
+    /**
+     * Returns the status URL
+     *
+     * @param int $num the tweet number
+     */
+    protected function getUrlStatus($num) {
+        return $this->getUrlApi() . 'statuses/show/'. urlencode($num) .'.json';
+    }
+    
+    /**
+     * Returns the user timeline URL
+     */
+    protected function getUrlUserTimeline($user) {
+        return $this->getUrlApi() . 'statuses/user_timeline/'. urlencode($user) .'.json';
+    }
+    
+    /**
+     * Returns the tweet posting URL
+     */
+    protected function getUrlTweetPost() {
+        return $this->getUrlApi() . 'statuses/update.json';
+    }
+    
+    /**
+     * Output URL: status
+     */
+    public function getUrlOutputStatus(StdClass $tweet) {
+        return $this->baseUrl . urlencode($tweet->user->screen_name) . '/statuses/' . urlencode($tweet->id);
+    }
+    
+    /**
+     * Return mentions URL
+     */
+    public function getUrlMentions($sinceId=null, $count=20) {
+        $url = $this->baseUrlFull . 'statuses/mentions.json?count=' . urlencode($count);
+        if ($sinceId !== null) {
+            $url .= '&since_id=' . urlencode($sinceId);
+        }
+        return $url;
+    }
+    
+    /**
+     * Returns the followers URL
+     */
+    public function getUrlFollowers($cursor=-1) {
+        return $this->baseUrlFull . 'statuses/followers.json?cursor=' . ((int)$cursor);
+    }
+    
+    /**
+     * Returns the follow-user URL
+     */
+    public function getUrlFollow($userid) {
+        return $this->baseUrlFull . 'friendships/create/' . ((int) $userid) . '.json';
+    }
+    
+    /**
+     * Returns the get DMs URL
+     */
+    public function getUrlDMs($sinceId=null, $count=20, $page=1) {
+        $url = $this->baseUrlFull . 'direct_messages.json?';
+        if ($sinceId !== null) {
+            $url .= 'since_id=' . urlencode($sinceId);
+        }
+        $url .= "&page={$page}";
+        $url .= "&count={$count}";
+        return $url;
+    }
+
+    /**
+     * Returns the send DM URL
+     */
+    public function getURLSendDM() {
+        return $this->baseUrlFull . 'direct_messages/new.json';
+    }
+}
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Url.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Url.php
new file mode 100644
index 0000000000..8fc1c3538e
--- /dev/null
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Url.php
@@ -0,0 +1,739 @@
+<?php
+/**
+ * Phergie 
+ *
+ * PHP version 5
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.
+ * It is also available through the world-wide-web at this URL:
+ * http://phergie.org/license
+ *
+ * @category  Phergie 
+ * @package   Phergie_Plugin_Url
+ * @author    Phergie Development Team <team@phergie.org>
+ * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
+ * @license   http://phergie.org/license New BSD License
+ * @link      http://pear.phergie.org/package/Phergie_Plugin_Url
+ */
+
+/**
+ * Monitors incoming messages for instances of URLs and responds with messages
+ * containing relevant information about detected URLs.
+ *
+ * Has an utility method accessible via 
+ * $this->getPlugin('Url')->getTitle('http://foo..').
+ *
+ * @category Phergie 
+ * @package  Phergie_Plugin_Url
+ * @author   Phergie Development Team <team@phergie.org>
+ * @license  http://phergie.org/license New BSD License
+ * @link     http://pear.phergie.org/package/Phergie_Plugin_Url
+ */
+class Phergie_Plugin_Url extends Phergie_Plugin_Abstract
+{
+    /**
+     * Links output format
+     *
+     * Can use the variables %nick%, %title% and %link% in it to display 
+     * page titles and links
+     *
+     * @var string
+     */
+    protected $baseFormat = '%nick%: %message%';
+    protected $messageFormat = '[ %link% ] %title%';
+
+    /**
+     * Flag indicating whether a single response should be sent for a single 
+     * message containing multiple links
+     *
+     * @var bool
+     */
+    protected $mergeLinks = true;
+
+    /**
+     * Max length of the fetched URL title
+     *
+     * @var int
+     */
+    protected $titleLength = 40;
+
+    /**
+     * Url cache to prevent spamming, especially with multiple bots on the 
+     * same channel
+     *
+     * @var array
+     */
+    protected $urlCache = array();
+    protected $shortCache = array();
+
+    /**
+     * Time in seconds to store the cached entries
+     *
+     * Setting it to 0 or below disables the cache expiration
+     *
+     * @var int
+     */
+    protected $expire = 1800;
+
+    /**
+     * Number of entries to keep in the cache at one time per channel
+     *
+     * Setting it to 0 or below disables the cache limit
+     *
+     * @var int
+     */
+    protected $limit = 10;
+
+    /**
+     * Flag that determines if the plugin will fall back to using an HTTP 
+     * stream when a URL using SSL is detected and OpenSSL support isn't 
+     * available in the PHP installation in use 
+     *
+     * @var bool
+     */
+    protected $sslFallback = true;
+
+    /**
+     * Flag that is set to true by the custom error handler if an HTTP error 
+     * code has been received
+     *
+     * @var boolean
+     */
+    protected $errorStatus = false;
+    protected $errorMessage = null;
+
+    /**
+     * Flag indicating whether or not to display error messages as the title 
+     * if a link posted encounters an error
+     *
+     * @var boolean
+     */
+    protected $showErrors = true;
+
+    /**
+     * Flag indicating whether to detect schemeless URLS (i.e. "example.com")
+     *
+     * @var boolean
+     */
+    protected $detectSchemeless = false;
+
+    /**
+     * List of error messages to return when the requested URL returns an 
+     * HTTP error
+     *
+     * @var array
+     */
+    protected $httpErrors = array(
+        100 => '100 Continue',
+        200 => '200 OK',
+        201 => '201 Created',
+        204 => '204 No Content',
+        206 => '206 Partial Content',
+        300 => '300 Multiple Choices',
+        301 => '301 Moved Permanently',
+        302 => '302 Found',
+        303 => '303 See Other',
+        304 => '304 Not Modified',
+        307 => '307 Temporary Redirect',
+        400 => '400 Bad Request',
+        401 => '401 Unauthorized',
+        403 => '403 Forbidden',
+        404 => '404 Not Found',
+        405 => '405 Method Not Allowed',
+        406 => '406 Not Acceptable',
+        408 => '408 Request Timeout',
+        410 => '410 Gone',
+        413 => '413 Request Entity Too Large',
+        414 => '414 Request URI Too Long',
+        415 => '415 Unsupported Media Type',
+        416 => '416 Requested Range Not Satisfiable',
+        417 => '417 Expectation Failed',
+        500 => '500 Internal Server Error',
+        501 => '501 Method Not Implemented',
+        503 => '503 Service Unavailable',
+        506 => '506 Variant Also Negotiates'
+    );
+
+    /**
+     * An array containing a list of TLDs used for non-scheme matches
+     *
+     * @var array
+     */
+    protected $tldList = array();
+
+    /**
+     * Shortener object
+     */
+    protected $shortener;
+
+    /**
+     * Array of renderers
+     */
+    protected $renderers = array();
+
+    /**
+     * Initializes settings, checks dependencies.
+     *
+     * @return void
+     */
+    public function onConnect()
+    {
+        // make the shortener configurable
+        $shortener = $this->getConfig('url.shortener', 'Trim');
+        $shortener = "Phergie_Plugin_Url_Shorten_{$shortener}";
+        $this->shortener = new $shortener;
+
+        if (!$this->shortener instanceof Phergie_Plugin_Url_Shorten_Abstract) {
+            $this->fail("Declared shortener class {$shortener} is not of proper ancestry");
+        }
+
+        // Get a list of valid TLDs
+        if (!is_array($this->tldList) || count($this->tldList) <= 6) {
+            /* Omitted for port
+            if ($this->pluginLoaded('Tld')) {
+                $this->tldList = Phergie_Plugin_Tld::getTlds();
+                if (is_array($this->tldList)) {
+                    $this->tldList = array_keys($this->tldList);
+                }
+            }
+            */
+            if (!is_array($this->tldList) || count($this->tldList) <= 0) {
+                $this->tldList = array('ac', 'ad', 'ae', 'aero', 'af', 'ag', 'ai', 'al', 'am', 'an', 'ao', 'aq', 'ar', 'arpa', 'as', 'asia', 'at', 'au', 'aw', 'ax', 'az', 'ba', 'bb', 'bd', 'be', 'bf', 'bg', 'bh', 'bi', 'biz', 'bj', 'bl', 'bm', 'bn', 'bo', 'br', 'bs', 'bt', 'bv', 'bw', 'by', 'bz', 'ca', 'cat', 'cc', 'cd', 'cf', 'cg', 'ch', 'ci', 'ck', 'cl', 'cm', 'cn', 'co', 'com', 'coop', 'cr', 'cu', 'cv', 'cx', 'cy', 'cz', 'de', 'dj', 'dk', 'dm', 'do', 'dz', 'ec', 'edu', 'ee', 'eg', 'eh', 'er', 'es', 'et', 'eu', 'fi', 'fj', 'fk', 'fm', 'fo', 'fr', 'ga', 'gb', 'gd', 'ge', 'gf', 'gg', 'gh', 'gi', 'gl', 'gm', 'gn', 'gov', 'gp', 'gq', 'gr', 'gs', 'gt', 'gu', 'gw', 'gy', 'hk', 'hm', 'hn', 'hr', 'ht', 'hu', 'id', 'ie', 'il', 'im', 'in', 'info', 'int', 'io', 'iq', 'ir', 'is', 'it', 'je', 'jm', 'jo', 'jobs', 'jp', 'ke', 'kg', 'kh', 'ki', 'km', 'kn', 'kp', 'kr', 'kw', 'ky', 'kz', 'la', 'lb', 'lc', 'li', 'lk', 'lr', 'ls', 'lt', 'lu', 'lv', 'ly', 'ma', 'mc', 'md', 'me', 'mf', 'mg', 'mh', 'mil', 'mk', 'ml', 'mm', 'mn', 'mo', 'mobi', 'mp', 'mq', 'mr', 'ms', 'mt', 'mu', 'museum', 'mv', 'mw', 'mx', 'my', 'mz', 'na', 'name', 'nc', 'ne', 'net', 'nf', 'ng', 'ni', 'nl', 'no', 'np', 'nr', 'nu', 'nz', 'om', 'org', 'pa', 'pe', 'pf', 'pg', 'ph', 'pk', 'pl', 'pm', 'pn', 'pr', 'pro', 'ps', 'pt', 'pw', 'py', 'qa', 're', 'ro', 'rs', 'ru', 'rw', 'sa', 'sb', 'sc', 'sd', 'se', 'sg', 'sh', 'si', 'sj', 'sk', 'sl', 'sm', 'sn', 'so', 'sr', 'st', 'su', 'sv', 'sy', 'sz', 'tc', 'td', 'tel', 'tf', 'tg', 'th', 'tj', 'tk', 'tl', 'tm', 'tn', 'to', 'tp', 'tr', 'travel', 'tt', 'tv', 'tw', 'tz', 'ua', 'ug', 'uk', 'um', 'us', 'uy', 'uz', 'va', 'vc', 've', 'vg', 'vi', 'vn', 'vu', 'wf', 'ws', 'ye', 'yt', 'yu', 'za', 'zm', 'zw');
+            }
+            rsort($this->tldList);
+        }
+
+        // load config (a bit ugly, but focusing on porting):
+        foreach (
+            array(
+                'detect_schemeless' => 'detectSchemeless',
+                'base_format' => 'baseFormat',
+                'message_format' => 'messageFormat',
+                'merge_links' => 'mergeLinks',
+                'title_length' => 'titleLength',
+                'show_errors' => 'showErrors',
+            ) as $config => $local) {
+            if (isset($this->config["url.{$config}"])) {
+                $this->$local = $this->config["uri.{$config}"];
+            }
+        }
+    }
+
+    /**
+     * Checks an incoming message for the presence of a URL and, if one is
+     * found, responds with its title if it is an HTML document and the
+     * shortened equivalent of its original URL if it meets length requirements.
+     *
+     * @todo Update this to pull configuration settings from $this->config 
+     *       rather than caching them as class properties
+     * @return void
+     */
+    public function onPrivmsg()
+    {
+        $source = $this->getEvent()->getSource();
+        $user = $this->getEvent()->getNick();
+
+        $pattern = '#'.($this->detectSchemeless ? '' : 'https?://').'(?:([0-9]{1,3}(?:\.[0-9]{1,3}){3})(?![^/]) | ('
+            .($this->detectSchemeless ? '(?<!http:/|https:/)[@/\\\]' : '').')?(?:(?:[a-z0-9_-]+\.?)+\.[a-z0-9]{1,6}))[^\s]*#xis';
+
+        // URL Match
+        if (preg_match_all($pattern, $this->getEvent()->getArgument(1), $matches, PREG_SET_ORDER)) {
+            $responses = array();
+            foreach ($matches as $m) {
+                $url = trim(rtrim($m[0], ', ].?!;'));
+
+                // Check to see if the URL was from an email address, is a directory, etc
+                if (!empty($m[2])) {
+                    $this->debug('Invalid Url: URL is either an email or a directory path. (' . $url . ')');
+                    continue;
+                }
+
+                // Parse the given URL
+                if (!$parsed = $this->parseUrl($url)) {
+                    $this->debug('Invalid Url: Could not parse the URL. (' . $url . ')');
+                    continue;
+                }
+
+                // allow out-of-class renderers to handle this URL
+                foreach ($this->renderers as $renderer) {
+                    if ($renderer->renderUrl($parsed) === true) {
+                        // renderers should return true if they've fully
+                        // rendered the passed URL (they're responsible
+                        // for their own output)
+                        $this->debug('Handled by renderer: ' . get_class($renderer));
+                        continue 2;
+                    }
+                }
+
+                // Check to see if the given IP/Host is valid
+                if (!empty($m[1]) and !$this->checkValidIP($m[1])) {
+                    $this->debug('Invalid Url: ' . $m[1] . ' is not a valid IP address. (' . $url . ')');
+                    continue;
+                }
+
+                // Process TLD if it's not an IP
+                if (empty($m[1])) {
+                    // Get the TLD from the host
+                    $pos = strrpos($parsed['host'], '.');
+                    $parsed['tld'] = ($pos !== false ? substr($parsed['host'], ($pos+1)) : '');
+
+                    // Check to see if the URL has a valid TLD
+                    if (is_array($this->tldList) && !in_array(strtolower($parsed['tld']), $this->tldList)) {
+                        $this->debug('Invalid Url: ' . $parsed['tld'] . ' is not a supported TLD. (' . $url . ')');
+                        continue;
+                    }
+                }
+
+                // Check to see if the URL is to a secured site or not and handle it accordingly
+                if ($parsed['scheme'] == 'https' && !extension_loaded('openssl')) {
+                    if (!$this->sslFallback) {
+                        $this->debug('Invalid Url: HTTPS is an invalid scheme, OpenSSL isn\'t available. (' . $url . ')');
+                        continue;
+                    } else {
+                        $parsed['scheme'] = 'http';
+                    }
+                }
+
+                if (!in_array($parsed['scheme'], array('http', 'https'))) {
+                    $this->debug('Invalid Url: ' . $parsed['scheme'] . ' is not a supported scheme. (' . $url . ')');
+                    continue;
+                }
+                $url = $this->glueURL($parsed);
+                unset($parsed);
+
+                // Convert url
+                $shortenedUrl = $this->shortener->shorten($url);
+
+                // Prevent spamfest
+                if ($this->checkUrlCache($url, $shortenedUrl)) {
+                    $this->debug('Invalid Url: URL is in the cache. (' . $url . ')');
+                    continue;
+                }
+
+                $title = self::getTitle($url);
+                if (!empty($title)) {
+                    $responses[] = str_replace(
+                        array(
+                            '%title%',
+                            '%link%',
+                            '%nick%'
+                        ), array(
+                         $title,
+                            $shortenedUrl,
+                            $user
+                        ), $this->messageFormat
+                    );
+                }
+
+                // Update cache
+                $this->updateUrlCache($url, $shortenedUrl);
+                unset($title, $shortenedUrl, $title);
+            }
+            /**
+             * Check to see if there were any URL responses, format them and handle if they
+             * get merged into one message or not
+             */
+            if (count($responses) > 0) {
+                if ($this->mergeLinks) {
+                    $message = str_replace(
+                        array(
+                            '%message%',
+                            '%nick%'
+                        ), array(
+                            implode('; ', $responses),
+                            $user
+                        ), $this->baseFormat
+                    );
+                    $this->doPrivmsg($source, $message);
+                } else {
+                    foreach ($responses as $response) {
+                        $message = str_replace(
+                            array(
+                                '%message%',
+                                '%nick%'
+                            ), array(
+                                implode('; ', $responses),
+                                $user
+                            ), $this->baseFormat
+                        );
+                        $this->doPrivmsg($source, $message);
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * Checks a given URL (+shortened) against the cache to verify if they were
+     * previously posted on the channel.
+     *
+     * @param string $url          The URL to check against
+     * @param string $shortenedUrl The shortened URL to check against
+     *
+     * @return bool
+     */
+    protected function checkUrlCache($url, $shortenedUrl)
+    {
+        $source = $this->getEvent()->getSource();
+
+        /**
+         * Transform the URL (+shortened) into a HEX CRC32 checksum to prevent potential problems
+         * and minimize the size of the cache for less cache bloat.
+         */
+        $url = $this->getUrlChecksum($url);
+        $shortenedUrl = $this->getUrlChecksum($shortenedUrl);
+
+        $cache = array(
+            'url' => isset($this->urlCache[$source][$url]) ? $this->urlCache[$source][$url] : null,
+            'shortened' => isset($this->shortCache[$source][$shortenedUrl]) ? $this->shortCache[$source][$shortenedUrl] : null
+        );
+
+        $expire = $this->expire;
+        $this->debug("Cache expire: {$expire}");
+        /**
+         * If cache expiration is enabled, check to see if the given url has expired in the cache
+         * If expire is disabled, simply check to see if the url is listed
+         */
+        if (($expire > 0 && (($cache['url'] + $expire) > time() || ($cache['shortened'] + $expire) > time()))
+            || ($expire <= 0 && (isset($cache['url']) || isset($cache['shortened'])))
+        ) {
+            unset($cache, $url, $shortenedUrl, $expire);
+            return true;
+        }
+        unset($cache, $url, $shortenedUrl, $expire);
+        return false;
+    }
+
+    /**
+     * Updates the cache and adds the given URL (+shortened) to the cache. It
+     * also handles cleaning the cache of old entries as well.
+     *
+     * @param string $url          The URL to add to the cache
+     * @param string $shortenedUrl The shortened to add to the cache
+     *
+     * @return bool
+     */
+    protected function updateUrlCache($url, $shortenedUrl)
+    {
+        $source = $this->getEvent()->getSource();
+
+        /**
+         * Transform the URL (+shortened) into a HEX CRC32 checksum to prevent potential problems
+         * and minimize the size of the cache for less cache bloat.
+         */
+        $url = $this->getUrlChecksum($url);
+        $shortenedUrl = $this->getUrlChecksum($shortenedUrl);
+        $time = time();
+
+        // Handle the URL cache and remove old entries that surpass the limit if enabled
+        $this->urlCache[$source][$url] = $time;
+        if ($this->limit > 0 && count($this->urlCache[$source]) > $this->limit) {
+            asort($this->urlCache[$source], SORT_NUMERIC);
+            array_shift($this->urlCache[$source]);
+        }
+
+        // Handle the shortened cache and remove old entries that surpass the limit if enabled
+        $this->shortCache[$source][$shortenedUrl] = $time;
+        if ($this->limit > 0 && count($this->shortCache[$source]) > $this->limit) {
+            asort($this->shortCache[$source], SORT_NUMERIC);
+            array_shift($this->shortCache[$source]);
+        }
+        unset($url, $shortenedUrl, $time);
+    }
+
+    /**
+     * Transliterates a UTF-8 string into corresponding ASCII characters and
+     * truncates and appends an ellipsis to the string if it exceeds a given
+     * length.
+     *
+     * @param string $str  String to decode
+     * @param int    $trim Maximum string length, optional
+     *
+     * @return string
+     */
+    protected function decode($str, $trim = null)
+    {
+        $out = $this->decodeTranslit($str);
+        if ($trim > 0) {
+            $out = substr($out, 0, $trim) . (strlen($out) > $trim ? '...' : '');
+        }
+        return $out;
+    }
+
+    /**
+     * Custom error handler meant to handle 404 errors and such
+     *
+     * @param int    $errno   the error code
+     * @param string $errstr  the error string
+     * @param string $errfile file the error occured in
+     * @param int    $errline line the error occured on
+     *
+     * @return bool
+     */
+    public function onPhpError($errno, $errstr, $errfile, $errline)
+    {
+        if ($errno === E_WARNING) {
+            // Check to see if there was HTTP warning while connecting to the site
+            if (preg_match('{HTTP/1\.[01] ([0-9]{3})}i', $errstr, $m)) {
+                $this->errorStatus = $m[1];
+                $this->errorMessage = (isset($this->httpErrors[$m[1]]) ? $this->httpErrors[$m[1]] : $m[1]);
+                $this->debug('PHP Warning:  ' . $errstr . 'in ' . $errfile . ' on line ' . $errline);
+                return true;
+            }
+
+            // Safely ignore these SSL warnings so they don't appear in the log
+            if (stripos($errstr, 'SSL: fatal protocol error in') !== false
+                || stripos($errstr, 'failed to open stream') !== false
+                || stripos($errstr, 'HTTP request failed') !== false
+                || stripos($errstr, 'SSL: An existing connection was forcibly closed by the remote host') !== false
+                || stripos($errstr, 'Failed to enable crypto in') !== false
+                || stripos($errstr, 'SSL: An established connection was aborted by the software in your host machine') !== false
+                || stripos($errstr, 'SSL operation failed with code') !== false
+                || stripos($errstr, 'unable to connect to') !== false
+            ) {
+                $this->errorStatus = true;
+                $this->debug('PHP Warning:  ' . $errstr . 'in ' . $errfile . ' on line ' . $errline);
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Takes a url, parses and cleans the URL without of all the junk
+     * and then return the hex checksum of the url.
+     *
+     * @param string $url url to checksum
+     *
+     * @return string the hex checksum of the cleaned url
+     */
+    protected function getUrlChecksum($url)
+    {
+        $checksum = strtolower(urldecode($this->glueUrl($url, true)));
+        $checksum = preg_replace('#\s#', '', $this->decodeTranslit($checksum));
+        return dechex(crc32($checksum));
+    }
+
+    /**
+     * Parses a given URI and procceses the output to remove redundant
+     * or missing values.
+     *
+     * @param string $url the url to parse
+     *
+     * @return array the url components
+     */
+    protected function parseUrl($url)
+    {
+        if (is_array($url)) return $url;
+
+        $url = trim(ltrim($url, ' /@\\'));
+        if (!preg_match('&^(?:([a-z][-+.a-z0-9]*):)&xis', $url, $matches)) {
+            $url = 'http://' . $url;
+        }
+        $parsed = parse_url($url);
+
+        if (!isset($parsed['scheme'])) {
+            $parsed['scheme'] = 'http';
+        }
+        $parsed['scheme'] = strtolower($parsed['scheme']);
+
+        if (isset($parsed['path']) && !isset($parsed['host'])) {
+            $host = $parsed['path'];
+            $path = '';
+            if (strpos($parsed['path'], '/') !== false) {
+                list($host, $path) = array_pad(explode('/', $parsed['path'], 2), 2, null);
+            }
+            $parsed['host'] = $host;
+            $parsed['path'] = $path;
+        }
+
+        return $parsed;
+    }
+
+    /**
+     * Parses a given URI and then glues it back together in the proper format.
+     * If base is set, then it chops off the scheme, user and pass and fragment
+     * information to return a more unique base URI.
+     *
+     * @param string $uri  uri to rebuild
+     * @param string $base set to true to only return the base components
+     *
+     * @return string the rebuilt uri
+     */
+    protected function glueUrl($uri, $base = false)
+    {
+        $parsed = $uri;
+        if (!is_array($parsed)) {
+            $parsed = $this->parseUrl($parsed);
+        }
+
+        if (is_array($parsed)) {
+            $uri = '';
+            if (!$base) {
+                $uri .= (!empty($parsed['scheme']) ? $parsed['scheme'] . ':' .
+                        ((strtolower($parsed['scheme']) == 'mailto') ? '' : '//') : '');
+                $uri .= (!empty($parsed['user']) ? $parsed['user'] .
+                        (!empty($parsed['pass']) ? ':' . $parsed['pass'] : '') . '@' : '');
+            }
+            if ($base && !empty($parsed['host'])) {
+                $parsed['host'] = trim($parsed['host']);
+                if (substr($parsed['host'], 0, 4) == 'www.') {
+                    $parsed['host'] = substr($parsed['host'], 4);
+                }
+            }
+            $uri .= (!empty($parsed['host']) ? $parsed['host'] : '');
+            if (!empty($parsed['port'])
+                && (($parsed['scheme'] == 'http' && $parsed['port'] == 80)
+                || ($parsed['scheme'] == 'https' && $parsed['port'] == 443))
+            ) {
+                unset($parsed['port']);
+            }
+            $uri .= (!empty($parsed['port']) ? ':' . $parsed['port'] : '');
+            if (!empty($parsed['path']) && (!$base || $base && $parsed['path'] != '/')) {
+                $uri .= (substr($parsed['path'], 0, 1) == '/') ? $parsed['path'] : ('/' . $parsed['path']);
+            }
+            $uri .= (!empty($parsed['query']) ? '?' . $parsed['query'] : '');
+            if (!$base) {
+                $uri .= (!empty($parsed['fragment']) ? '#' . $parsed['fragment'] : '');
+            }
+        }
+        return $uri;
+    }
+
+    /**
+     * Checks the given string to see if its a valid IP4 address
+     *
+     * @param string $ip the ip to validate
+     *
+     * @return bool
+     */
+    protected function checkValidIP($ip)
+    {
+        return long2ip(ip2long($ip)) === $ip;
+    }
+
+    /**
+     * Returns the title of the given page
+     *
+     * @param string $url url to the page
+     *
+     * @return string title
+     */
+    public function getTitle($url)
+    {
+        $opts = array(
+            'http' => array(
+                'timeout' => 3.5,
+                'method' => 'GET',
+                'user_agent' => 'Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.8.1.12) Gecko/20080201 Firefox/2.0.0.12'
+            )
+        );
+        $context = stream_context_create($opts);
+
+        if ($page = fopen($url, 'r', false, $context)) {
+            stream_set_timeout($page, 3.5);
+            $data = stream_get_meta_data($page);
+            foreach ($data['wrapper_data'] as $header) {
+                if (preg_match('/^Content-Type: ([^;]+)/', $header, $match)
+                    && !preg_match('#^(text/x?html|application/xhtml+xml)$#', $match[1])
+                ) {
+                    $title = $match[1];
+                }
+            }
+            if (!isset($title)) {
+                $content = '';
+                $tstamp = time() + 5;
+
+                while ($chunk = fread($page, 64)) {
+                    $data = stream_get_meta_data($page);
+                    if ($data['timed_out']) {
+                        $this->debug('Url Timed Out: ' . $url);
+                        $this->errorStatus = true;
+                        break;
+                    }
+                    $content .= $chunk;
+                    // Check for timeout
+                    if (time() > $tstamp) break;
+                    // Try to read title
+                    if (preg_match('#<title[^>]*>(.*)#is', $content, $m)) {
+                        // Start another loop to grab some more data in order to be sure we have the complete title
+                        $content = $m[1];
+                        $loop = 2;
+                        while (($chunk = fread($page, 64)) && $loop-- && !strstr($content, '<')) {
+                            $content .= $chunk;
+                            // Check for timeout
+                            if (time() > $tstamp) break;
+                        }
+                        preg_match('#^([^<]*)#is', $content, $m);
+                        $title = preg_replace('#\s+#', ' ', $m[1]);
+                        $title = trim($this->decode($title, $this->titleLength));
+                        break;
+                    }
+                    // Title won't appear beyond that point so stop parsing
+                    if (preg_match('#</head>|<body#i', $content)) {
+                        break;
+                    }
+                }
+            }
+            fclose($page);
+        } else if (!$this->errorStatus) {
+            $this->debug('Couldn\t Open Url: ' . $url);
+        }
+
+        if (empty($title)) {
+            if ($this->errorStatus) {
+                if (!$this->showErrors || empty($this->errorMessage)) {
+                    return;
+                }
+                $title = $this->errorMessage;
+                $this->errorStatus = false;
+                $this->errorMessage = null;
+            } else {
+                $title = 'No Title';
+            }
+        }
+
+        return $title;
+    }
+
+    /**
+     * Output a debug message
+     *
+     * @param string $msg the message to output
+     *
+     * @return void
+     */
+    protected function debug($msg)
+    {
+        echo "(DEBUG:Url) $msg\n";
+    }
+
+    /**
+     * Placeholder/porting helper. Has no function.
+     *
+     * @param string $str a string to return
+     *
+     * @return string
+     */
+    protected function decodeTranslit($str)
+    {
+        // placeholder/porting helper
+        return $str;
+    }
+
+    /**
+     * Add a renderer to the stack
+     *
+     * @param object $obj the renderer to add
+     *
+     * @return void
+     */
+    public function registerRenderer($obj)
+    {
+        $this->renderers[] = $obj;
+        array_unique($this->renderers);
+    }
+}
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Url/Shorten/Abstract.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Url/Shorten/Abstract.php
new file mode 100644
index 0000000000..bf5dff0d3b
--- /dev/null
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Url/Shorten/Abstract.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * Phergie 
+ *
+ * PHP version 5
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.
+ * It is also available through the world-wide-web at this URL:
+ * http://phergie.org/license
+ *
+ * @category  Phergie 
+ * @package   Phergie_Plugin_Php
+ * @author    Phergie Development Team <team@phergie.org>
+ * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
+ * @license   http://phergie.org/license New BSD License
+ * @link      http://pear.phergie.org/package/Phergie_Plugin_Php
+ */
+
+/**
+ * URL shortener abstract class
+ *
+ * @category Phergie 
+ * @package  Phergie_Plugin_Url
+ * @author   Phergie Development Team <team@phergie.org>
+ * @license  http://phergie.org/license New BSD License
+ * @link     http://pear.phergie.org/package/Phergie_Plugin_Url
+ */
+abstract class Phergie_Plugin_Url_Shorten_Abstract
+{
+    /**
+     * Takes a long url and returns a shortened link
+     *
+     * @param string $url the url to shorten
+     *
+     * @return string string the shortened url
+     */
+    public abstract function shorten($url);
+}
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Url/Shorten/Trim.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Url/Shorten/Trim.php
new file mode 100644
index 0000000000..a90459b37e
--- /dev/null
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Url/Shorten/Trim.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * Phergie 
+ *
+ * PHP version 5
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.
+ * It is also available through the world-wide-web at this URL:
+ * http://phergie.org/license
+ *
+ * @category  Phergie 
+ * @package   Phergie_Plugin_Php
+ * @author    Phergie Development Team <team@phergie.org>
+ * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
+ * @license   http://phergie.org/license New BSD License
+ * @link      http://pear.phergie.org/package/Phergie_Plugin_Php
+ */
+
+/**
+ * Shortens urls via the tr.im service
+ *
+ * @category Phergie 
+ * @package  Phergie_Plugin_Url
+ * @author   Phergie Development Team <team@phergie.org>
+ * @license  http://phergie.org/license New BSD License
+ * @link     http://pear.phergie.org/package/Phergie_Plugin_Url
+ */
+class Phergie_Plugin_Url_Shorten_Trim extends Phergie_Plugin_Url_Shorten_Abstract
+{
+    /**
+     * Short a URL through the tr.im api
+     *
+     * @param string $url the url to shorten
+     *
+     * @return string string the shortened url
+     */
+    public function shorten($url)
+    {
+        return file_get_contents('http://api.tr.im/v1/trim_simple?url=' . rawurlencode($url));
+    }
+}
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/UserInfo.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/UserInfo.php
new file mode 100644
index 0000000000..9437073d8f
--- /dev/null
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/UserInfo.php
@@ -0,0 +1,413 @@
+<?php
+/**
+ * Phergie
+ *
+ * PHP version 5
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.
+ * It is also available through the world-wide-web at this URL:
+ * http://phergie.org/license
+ *
+ * @category  Phergie
+ * @package   Phergie_Plugin_UserInfo
+ * @author    Phergie Development Team <team@phergie.org>
+ * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
+ * @license   http://phergie.org/license New BSD License
+ * @link      http://pear.phergie.org/package/Phergie_Plugin_UserInfo
+ */
+
+/**
+ * Provides an API for querying information on users.
+ *
+ * @category Phergie
+ * @package  Phergie_Plugin_UserInfo
+ * @author   Phergie Development Team <team@phergie.org>
+ * @license  http://phergie.org/license New BSD License
+ * @link     http://pear.phergie.org/package/Phergie_Plugin_UserInfo
+ */
+class Phergie_Plugin_UserInfo extends Phergie_Plugin_Abstract
+{
+    const REGULAR = 1;
+    const VOICE   = 2;
+    const HALFOP  = 4;
+    const OP      = 8;
+    const ADMIN   = 16;
+    const OWNER   = 32;
+
+    /**
+     * An array containing all the user information for a given channel
+     *
+     * @var array
+     */
+    protected $store = array();
+
+    /**
+     * Tracks mode changes
+     *
+     * @return void
+     */
+    public function onMode()
+    {
+        $args = $this->event->getArguments();
+
+        if (count($args) != 3) {
+            return;
+        }
+
+        list($chan, $modes, $nicks) = $args;
+
+        if (!preg_match('/(?:\+|-)[hovaq+-]+/i', $modes)) {
+            return;
+        }
+
+        $chan = trim(strtolower($chan));
+        $modes = str_split(trim(strtolower($modes)), 1);
+        $nicks = explode(' ', trim(strtolower($nicks)));
+        $operation = array_shift($modes); // + or -
+
+        while ($char = array_shift($modes)) {
+            $nick = array_shift($nicks);
+            $mode = null;
+
+            switch ($char) {
+            case 'q':
+                $mode = self::OWNER;
+                break;
+            case 'a':
+                $mode = self::ADMIN;
+                break;
+            case 'o':
+                $mode = self::OP;
+                break;
+            case 'h':
+                $mode = self::HALFOP;
+                break;
+            case 'v':
+                $mode = self::VOICE;
+                break;
+            }
+
+            if (!empty($mode)) {
+                if ($operation == '+') {
+                    $this->store[$chan][$nick] |= $mode;
+                } else if ($operation == '-') {
+                    $this->store[$chan][$nick] ^= $mode;
+                }
+            }
+        }
+    }
+
+    /**
+     * Tracks users joining a channel
+     *
+     * @return void
+     */
+    public function onJoin()
+    {
+        $chan = trim(strtolower($this->event->getArgument(0)));
+        $nick = trim(strtolower($this->event->getNick()));
+
+        $this->store[$chan][$nick] = self::REGULAR;
+    }
+
+    /**
+     * Tracks users leaving a channel
+     *
+     * @return void
+     */
+    public function onPart()
+    {
+        $chan = trim(strtolower($this->event->getArgument(0)));
+        $nick = trim(strtolower($this->event->getNick()));
+
+        if (isset($this->store[$chan][$nick])) {
+            unset($this->store[$chan][$nick]);
+        }
+    }
+
+    /**
+     * Tracks users quitting a server
+     *
+     * @return void
+     */
+    public function onQuit()
+    {
+        $nick = trim(strtolower($this->event->getNick()));
+
+        foreach ($this->store as $chan => $store) {
+            if (isset($store[$nick])) {
+                unset($this->store[$chan][$nick]);
+            }
+        }
+    }
+
+    /**
+     * Tracks users changing nicks
+     *
+     * @return void
+     */
+    public function onNick()
+    {
+        $nick = trim(strtolower($this->event->getNick()));
+        $newNick = trim(strtolower($this->event->getArgument(0)));
+
+        foreach ($this->store as $chan => $store) {
+            if (isset($store[$nick])) {
+                $this->store[$chan][$newNick] = $store[$nick];
+                unset($this->store[$chan][$nick]);
+            }
+        }
+    }
+
+    /**
+     * Populates the internal user listing for a channel when the bot joins it.
+     *
+     * @return void
+     */
+    public function onResponse()
+    {
+        if ($this->event->getCode() != Phergie_Event_Response::RPL_NAMREPLY) {
+            return;
+        }
+
+        $desc = preg_split('/[@*=]\s*/', $this->event->getDescription(), 2);
+        list($chan, $users) = array_pad(explode(' :', trim($desc[1])), 2, null);
+        $users = explode(' ', trim($users));
+
+        $chan = trim(strtolower($chan));
+
+        foreach ($users as $user) {
+            if (empty($user)) {
+                continue;
+            }
+
+            $user = trim(strtolower($user));
+            $flag = self::REGULAR;
+
+            if ($user[0] == '~') {
+                $flag |= self::OWNER;
+            } else if ($user[0] == '&') {
+                $flag |= self::ADMIN;
+            } else if ($user[0] == '@') {
+                $flag |= self::OP;
+            } else if ($user[0] == '%') {
+                $flag |= self::HALFOP;
+            } else if ($user[0] == '+') {
+                $flag |= self::VOICE;
+            }
+
+            if ($flag != self::REGULAR) {
+                $user = substr($user, 1);
+            }
+
+            $this->store[$chan][$user] = $flag;
+        }
+    }
+
+    /**
+     * Debugging function
+     *
+     * @return void
+     */
+    public function onPrivmsg()
+    {
+        if ($this->getConfig('debug', false) == false) {
+            return;
+        }
+
+        list($target, $msg) = array_pad($this->event->getArguments(), 2, null);
+
+        if (preg_match('#^ishere (\S+)$#', $msg, $m)) {
+            $this->doPrivmsg($target, $this->isIn($m[1], $target) ? 'true' : 'false');
+        } elseif (preg_match('#^isowner (\S+)$#', $msg, $m)) {
+            $this->doPrivmsg($target, $this->isOwner($m[1], $target) ? 'true' : 'false');
+        } elseif (preg_match('#^isadmin (\S+)$#', $msg, $m)) {
+            $this->doPrivmsg($target, $this->isAdmin($m[1], $target) ? 'true' : 'false');
+        } elseif (preg_match('#^isop (\S+)$#', $msg, $m)) {
+            $this->doPrivmsg($target, $this->isOp($m[1], $target) ? 'true' : 'false');
+        } elseif (preg_match('#^ishop (\S+)$#', $msg, $m)) {
+            $this->doPrivmsg($target, $this->isHalfop($m[1], $target) ? 'true' : 'false');
+        } elseif (preg_match('#^isvoice (\S+)$#', $msg, $m)) {
+            $this->doPrivmsg($target, $this->isVoice($m[1], $target) ? 'true' : 'false');
+        } elseif (preg_match('#^channels (\S+)$#', $msg, $m)) {
+            $channels = $this->getChannels($m[1]);
+            $this->doPrivmsg($target, $channels ? join(', ', $channels) : 'unable to find nick');
+        } elseif (preg_match('#^users (\S+)$#', $msg, $m)) {
+            $nicks = $this->getUsers($m[1]);
+            $this->doPrivmsg($target, $nicks ? join(', ', $nicks) : 'unable to find channel');
+        } elseif (preg_match('#^random (\S+)$#', $msg, $m)) {
+            $nick = $this->getrandomuser($m[1]);
+            $this->doPrivmsg($target, $nick ? $nick : 'unable to  find channel');
+        }
+    }
+
+    /**
+     * Checks whether or not a given user has a mode
+     *
+     * @param int    $mode A numeric mode (identified by the class constants)
+     * @param string $nick The nick to check
+     * @param string $chan The channel to check in
+     *
+     * @return bool
+     */
+    public function is($mode, $nick, $chan)
+    {
+        $chan = trim(strtolower($chan));
+        $nick = trim(strtolower($nick));
+
+        if (!isset($this->store[$chan][$nick])) {
+            return false;
+        }
+
+        return ($this->store[$chan][$nick] & $mode) != 0;
+    }
+
+    /**
+     * Checks whether or not a given user has owner (~) status
+     *
+     * @param string $nick The nick to check
+     * @param string $chan The channel to check in
+     *
+     * @return bool
+     */
+    public function isOwner($nick, $chan)
+    {
+        return $this->is(self::OWNER, $nick, $chan);
+    }
+
+    /**
+     * Checks whether or not a given user has admin (&) status
+     *
+     * @param string $nick The nick to check
+     * @param string $chan The channel to check in
+     *
+     * @return bool
+     */
+    public function isAdmin($nick, $chan)
+    {
+        return $this->is(self::ADMIN, $nick, $chan);
+    }
+
+    /**
+     * Checks whether or not a given user has operator (@) status
+     *
+     * @param string $nick The nick to check
+     * @param string $chan The channel to check in
+     *
+     * @return bool
+     */
+    public function isOp($nick, $chan)
+    {
+        return $this->is(self::OP, $nick, $chan);
+    }
+
+    /**
+     * Checks whether or not a given user has halfop (%) status
+     *
+     * @param string $nick The nick to check
+     * @param string $chan The channel to check in
+     *
+     * @return bool
+     */
+    public function isHalfop($nick, $chan)
+    {
+        return $this->is(self::HALFOP, $nick, $chan);
+    }
+
+    /**
+     * Checks whether or not a given user has voice (+) status
+     *
+     * @param string $nick The nick to check
+     * @param string $chan The channel to check in
+     *
+     * @return bool
+     */
+    public function isVoice($nick, $chan)
+    {
+        return $this->is(self::VOICE, $nick, $chan);
+    }
+
+    /**
+     * Checks whether or not a given user is in a channel
+     *
+     * @param string $nick The nick to check
+     * @param string $chan The channel to check in
+     *
+     * @return bool
+     */
+    public function isIn($nick, $chan)
+    {
+        return $this->is(self::REGULAR, $nick, $chan);
+    }
+
+    /**
+     * Returns the entire user list for a channel or false if the bot is not
+     * in the channel.
+     *
+     * @param string $chan The channel name
+     *
+     * @return array|bool
+     */
+    public function getUsers($chan)
+    {
+        $chan = trim(strtolower($chan));
+        if (isset($this->store[$chan])) {
+            return array_keys($this->store[$chan]);
+        }
+        return false;
+    }
+
+    /**
+     * Returns the nick of a random user present in a given channel or false
+     * if the bot is not present in the channel.
+     *
+     * @param string $chan The channel name
+     *
+     * @return array|bool
+     */
+    public function getRandomUser($chan)
+    {
+        $chan = trim(strtolower($chan));
+
+        if (isset($this->store[$chan])) {
+            $ignore = array('chanserv', 'q', 'l', 's');
+
+            do {
+                $nick = array_rand($this->store[$chan], 1);
+            } while (in_array($nick, $ignore));
+
+            return $nick;
+        }
+
+        return false;
+    }
+
+    /**
+     * Returns a list of channels in which a given user is present.
+     *
+     * @param string $nick Nick of the user (optional, defaults to the bot's
+     *               nick)
+     *
+     * @return array|bool
+     */
+    public function getChannels($nick = null)
+    {
+        if (empty($nick)) {
+            $nick = $this->connection->getNick();
+        }
+
+        $nick = trim(strtolower($nick));
+        $channels = array();
+
+        foreach ($this->store as $chan => $store) {
+            if (isset($store[$nick])) {
+                $channels[] = $chan;
+            }
+        }
+
+        return $channels;
+    }
+}
diff --git a/plugins/Irc/extlib/phergie/Phergie/Process/Abstract.php b/plugins/Irc/extlib/phergie/Phergie/Process/Abstract.php
new file mode 100755
index 0000000000..68d45289e8
--- /dev/null
+++ b/plugins/Irc/extlib/phergie/Phergie/Process/Abstract.php
@@ -0,0 +1,130 @@
+<?php
+/**
+ * Phergie 
+ *
+ * PHP version 5
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.
+ * It is also available through the world-wide-web at this URL:
+ * http://phergie.org/license
+ *
+ * @category  Phergie 
+ * @package   Phergie
+ * @author    Phergie Development Team <team@phergie.org>
+ * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
+ * @license   http://phergie.org/license New BSD License
+ * @link      http://pear.phergie.org/package/Phergie
+ */
+
+/**
+ * Base class for obtaining and processing incoming events.
+ *
+ * @category Phergie 
+ * @package  Phergie
+ * @author   Phergie Development Team <team@phergie.org>
+ * @license  http://phergie.org/license New BSD License
+ * @link     http://pear.phergie.org/package/Phergie
+ */
+abstract class Phergie_Process_Abstract
+{
+    /**
+     * Current driver instance
+     *
+     * @var Phergie_Driver_Abstract
+     */
+    protected $driver;
+
+    /**
+     * Current connection handler instance 
+     *
+     * @var Phergie_Connection_Handler 
+     */
+    protected $connections;
+
+    /**
+     * Current plugin handler instance
+     *
+     * @var Phergie_Plugin_Handler
+     */
+    protected $plugins;
+
+    /**
+     * Current event handler instance
+     *
+     * @var Phergie_Event_Handler
+     */
+    protected $events;
+
+    /**
+     * Current end-user interface instance
+     *
+     * @var Phergie_Ui_Abstract
+     */
+    protected $ui;
+
+    /**
+     * List of arguments for use within the instance
+     *
+     * @var array
+     */
+    protected $options = array();
+
+    /**
+     * Gets the required class refences from Phergie_Bot.
+     *
+     * @param Phergie_Bot $bot     Current bot instance in use 
+     * @param array       $options Optional processor arguments
+     *      
+     * @return void
+     */
+    public function __construct(Phergie_Bot $bot, array $options = array())
+    {
+        $this->driver = $bot->getDriver();
+        $this->plugins = $bot->getPluginHandler();
+        $this->connections = $bot->getConnectionHandler();
+        $this->events = $bot->getEventHandler();
+        $this->ui = $bot->getUi();
+        $this->options = $options;
+    }
+
+    /**
+     * Sends resulting outgoing events from ealier processing in handleEvents.
+     *
+     * @param Phergie_Connection $connection Active connection
+     *
+     * @return void
+     */
+    protected function processEvents(Phergie_Connection $connection)
+    {
+        if (count($this->events)) {
+            $this->plugins->preDispatch();
+            foreach ($this->events as $event) {
+                $this->ui->onCommand($event, $connection);
+
+                $method = 'do' . ucfirst(strtolower($event->getType()));
+                call_user_func_array(
+                    array($this->driver, $method),
+                    $event->getArguments()
+                );
+            }
+            $this->plugins->postDispatch();
+
+            if ($this->events->hasEventOfType(Phergie_Event_Request::TYPE_QUIT)) {
+                $this->ui->onQuit($connection);
+                $this->connections->removeConnection($connection);
+            }
+
+            $this->events->clearEvents();
+        }
+    }
+
+    /**
+     * Obtains and processes incoming events.
+     *
+     * @return void
+     */
+    public abstract function handleEvents();
+}
diff --git a/plugins/Irc/extlib/phergie/Phergie/Process/Async.php b/plugins/Irc/extlib/phergie/Phergie/Process/Async.php
new file mode 100644
index 0000000000..8605bf39f2
--- /dev/null
+++ b/plugins/Irc/extlib/phergie/Phergie/Process/Async.php
@@ -0,0 +1,161 @@
+<?php
+/**
+ * Phergie 
+ *
+ * PHP version 5
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.
+ * It is also available through the world-wide-web at this URL:
+ * http://phergie.org/license
+ *
+ * @category  Phergie 
+ * @package   Phergie
+ * @author    Phergie Development Team <team@phergie.org>
+ * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
+ * @license   http://phergie.org/license New BSD License
+ * @link      http://pear.phergie.org/package/Phergie
+ */
+
+/**
+ * Connection data processor which polls to handle input in an 
+ * asynchronous manner. Will also cause the application tick at
+ * the user-defined wait time.
+ *
+ * @category Phergie 
+ * @package  Phergie
+ * @author   Phergie Development Team <team@phergie.org>
+ * @license  http://phergie.org/license New BSD License
+ * @link     http://pear.phergie.org/package/Phergie
+ */
+class Phergie_Process_Async extends Phergie_Process_Abstract
+{
+    /**
+     * Length of time to poll for stream activity (seconds)
+     *
+     * @var int
+     */
+    protected $sec;
+
+    /**
+     * Length of time to poll for stream activity (microseconds)
+     *
+     * @var int
+     */
+    protected $usec;
+
+    /**
+     * Length of time to wait between ticks.
+     *
+     * @var int
+     */
+    protected $wait = 0;
+
+    /**
+     * Records when the application last performed a tick
+     *
+     * @var int
+     */
+    protected $lastTick = 0;
+
+    /**
+     * Overrides the parent class to set the poll time. 
+     *
+     * @param Phergie_Bot $bot     Main bot class
+     * @param array       $options Processor arguments
+     *
+     * @return void
+     */
+    public function __construct(Phergie_Bot $bot, array $options)
+    {
+        if (!$bot->getDriver() instanceof Phergie_Driver_Streams) {
+            throw new Phergie_Process_Exception(
+                'The Async event processor requires the Streams driver'
+            );
+        }
+
+        foreach (array('sec', 'usec') as $var) {
+            if (isset($options[$var])) {
+                if (!is_int($options[$var])) {
+                     throw new Phergie_Process_Exception(
+                        'Processor option "' . $var . '" must be an integer'
+                     );
+                }
+                $this->$var = $options[$var];
+            }
+        }
+
+        if (empty($this->sec) && empty($this->usec)) {
+            throw new Phergie_Process_Exception(
+                'One of the processor options "sec" or "usec" must be specified'
+            );
+        }
+
+        parent::__construct($bot, $options);
+    }
+
+    /**
+     * Waits for stream activity and performs event processing on 
+     * connections with data to read.
+     *
+     * @return void
+     */
+    protected function handleEventsAsync()
+    {
+        $hostmasks = $this->driver->getActiveReadSockets($this->sec, $this->usec);
+        if (!$hostmasks) {
+            return;
+        }
+        $connections = $this->connections->getConnections($hostmasks);
+        foreach ($connections as $connection) {
+            $this->driver->setConnection($connection);
+            $this->plugins->setConnection($connection);
+            $this->plugins->onTick();
+
+            if ($event = $this->driver->getEvent()) {
+                $this->ui->onEvent($event, $connection);
+                $this->plugins->setEvent($event);
+
+                if (!$this->plugins->preEvent()) {
+                    continue;
+                }
+
+                $this->plugins->{'on' . ucfirst($event->getType())}();
+            }
+
+            $this->processEvents($connection);
+        }
+    }
+
+    /**
+     * Perform application tick event on all plugins and connections.
+     *
+     * @return void
+     */
+    protected function doTick()
+    {
+        foreach ($this->connections as $connection) {
+            $this->plugins->setConnection($connection);
+            $this->plugins->onTick();
+            $this->processEvents($connection);
+        }
+    }
+
+    /**
+     * Obtains and processes incoming events, then sends resulting outgoing 
+     * events.
+     *
+     * @return void
+     */
+    public function handleEvents()
+    {
+        $time = time();
+        if ($this->lastTick == 0 || ($this->lastTick + $this->wait <= $time)) {
+            $this->doTick();
+            $this->lastTick = $time;
+        }
+        $this->handleEventsAsync();
+    }
+}
diff --git a/plugins/Irc/extlib/phergie/Phergie/Process/Exception.php b/plugins/Irc/extlib/phergie/Phergie/Process/Exception.php
new file mode 100755
index 0000000000..f964443c66
--- /dev/null
+++ b/plugins/Irc/extlib/phergie/Phergie/Process/Exception.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Phergie 
+ *
+ * PHP version 5
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.
+ * It is also available through the world-wide-web at this URL:
+ * http://phergie.org/license
+ *
+ * @category  Phergie 
+ * @package   Phergie
+ * @author    Phergie Development Team <team@phergie.org>
+ * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
+ * @license   http://phergie.org/license New BSD License
+ * @link      http://pear.phergie.org/package/Phergie
+ */
+
+/**
+ * Exception related to event processor operations.
+ *
+ * @category Phergie 
+ * @package  Phergie
+ * @author   Phergie Development Team <team@phergie.org>
+ * @license  http://phergie.org/license New BSD License
+ * @link     http://pear.phergie.org/package/Phergie
+ */
+class Phergie_Process_Exception extends Phergie_Exception
+{
+}
diff --git a/plugins/Irc/extlib/phergie/Phergie/Process/Standard.php b/plugins/Irc/extlib/phergie/Phergie/Process/Standard.php
new file mode 100644
index 0000000000..385c65fa22
--- /dev/null
+++ b/plugins/Irc/extlib/phergie/Phergie/Process/Standard.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * Phergie 
+ *
+ * PHP version 5
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.
+ * It is also available through the world-wide-web at this URL:
+ * http://phergie.org/license
+ *
+ * @category  Phergie 
+ * @package   Phergie
+ * @author    Phergie Development Team <team@phergie.org>
+ * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
+ * @license   http://phergie.org/license New BSD License
+ * @link      http://pear.phergie.org/package/Phergie
+ */
+
+/**
+ * Connection data processor which reads all connections looking
+ * for a response.
+ *
+ * @category Phergie 
+ * @package  Phergie
+ * @author   Phergie Development Team <team@phergie.org>
+ * @license  http://phergie.org/license New BSD License
+ * @link     http://pear.phergie.org/package/Phergie
+ */
+class Phergie_Process_Standard extends Phergie_Process_Abstract
+{
+    /**
+     * Obtains and processes incoming events, then sends resulting outgoing 
+     * events.
+     *
+     * @return void
+     */
+    public function handleEvents()
+    {
+        foreach ($this->connections as $connection) {
+            $this->driver->setConnection($connection);
+            $this->plugins->setConnection($connection);
+            $this->plugins->onTick();
+
+            if ($event = $this->driver->getEvent()) {
+                $this->ui->onEvent($event, $connection);
+                $this->plugins->setEvent($event);
+
+                if (!$this->plugins->preEvent()) {
+                    continue;
+                }
+
+                $this->plugins->{'on' . ucfirst($event->getType())}();
+            }
+
+            $this->processEvents($connection);
+        }
+    }
+}
diff --git a/plugins/Irc/extlib/phergie/Phergie/Tools/LogViewer/INSTALL b/plugins/Irc/extlib/phergie/Phergie/Tools/LogViewer/INSTALL
new file mode 100755
index 0000000000..dfc9857561
--- /dev/null
+++ b/plugins/Irc/extlib/phergie/Phergie/Tools/LogViewer/INSTALL
@@ -0,0 +1,24 @@
+-----------------------------------------------------------------------------
+-- About LogViewer
+-----------------------------------------------------------------------------
+
+The purpose of this tool is to make an HTML display of the Logs made by the 
+Logging plugin for Phergie stored in SQLite database.
+
+-----------------------------------------------------------------------------
+-- Installation
+-----------------------------------------------------------------------------
+
+To install this, simply copy the contents of this directory into whatever
+directory you want this to run under.
+
+-----------------------------------------------------------------------------
+-- Configuration
+-----------------------------------------------------------------------------
+
+The only configuration needed at this point in time is to edit the $database
+variable in the top of the index.php to point to the appropriate Phergie
+log file.
+
+Stuff may get more complicated in the future ;)  But this is meant to be 
+simple for now.
\ No newline at end of file
diff --git a/plugins/Irc/extlib/phergie/Phergie/Tools/LogViewer/index.php b/plugins/Irc/extlib/phergie/Phergie/Tools/LogViewer/index.php
new file mode 100755
index 0000000000..fc27fa2942
--- /dev/null
+++ b/plugins/Irc/extlib/phergie/Phergie/Tools/LogViewer/index.php
@@ -0,0 +1,368 @@
+<?php
+// Phergie Log Viewer ... Currently designed as a single PHP file in order to make it easy to
+//  'install' this.  Just drop the index.php (or whatever name you wish to rename it to) wherever
+//  you wish, and it will simply work.  Sure, it would be nice to structure some of this stuff into
+//  various include files/etc.  But right now this is simple enough of a quick log viewer, that it's
+//  just one file.
+
+
+/********** SETUP **********/
+
+// (Change any of these if/as needed for your setup) 
+ini_set('default_charset', 'UTF-8');
+date_default_timezone_set('UTC');
+$log = "/PATH/AND/FILENAME/TO/YOUR/LOGFILE/PLEASE.db";
+
+
+/********** PREPARATION **********/
+
+$db = new PDO('sqlite:' . $log);
+if (!is_object($db)) {
+    // Failure, can't access Phergie Log.  Bail with an error message, not pretty, but works:
+    echo "ERROR: Cannot access Phergie Log File, please check the configuration & access privileges";
+    exit();
+}
+
+
+/********** DETECTION **********/
+
+// Determine the mode of the application and call the appropriate handler function
+$mode = empty($_GET['m']) ? '' : $_GET['m'];
+switch ($mode) {
+    case 'channel':
+        show_days($db);
+        break;
+    case 'day':
+        show_log($db);
+        break;
+    default:
+        show_channels($db);
+}
+
+// Exit not really needed here, but reminds us that everything below is support functions:
+exit();
+
+
+/********** MODES **********/
+
+/**
+ * show_channels
+ *
+ * Provide a list of all channel's that we are logging information for:
+ *
+ * @param PDO A PDO object referring to the database 
+ * @return void
+ * @author Eli White <eli@eliw.com>
+ **/
+function show_channels(PDO $db) {
+    // Begin the HTML page:
+    template_header('Channels');
+    echo "\nChannels:\n<ul>\n";
+
+    // Loop through the database reading in each channel, and echoing out a <li> for it.
+    // only grab actual channels that start with # ... also pre-lowercase everything.
+    // this allows us to 'deal' with variable caps in how the channels were logged.
+    $channels = $db->query("
+        select distinct lower(chan) as c
+        from logs
+        where chan like '#%'
+        ");
+    foreach ($channels as $row) {
+        $html = utf8specialchars($row['c']);
+        $url = urlencode($row['c']);
+        echo "<li><a href=\"?m=channel&w={$url}\">{$html}</a></li>\n";        
+    }
+
+    // Finish off the page:
+    echo "\n</ul>\n";
+    template_footer();
+}
+
+/**
+ * show_days
+ *
+ * Create a calendar view of all days available for this particular channel
+ * 
+ * NOTE: May get unwieldy if large log files.  Perhaps consider in the future
+ *  making a paginated version of this?  by year?  Or a separate 'which year' page
+ *  before this?  Not to worry about now.
+ *
+ * @param PDO A PDO object referring to the database 
+ * @return void
+ * @author Eli White <eli@eliw.com>
+ **/
+function show_days(PDO $db) {
+    $channel = $_GET['w'];
+    $url = urlencode($channel);
+
+    // Begin the HTML page:
+    template_header('Daily Logs for Channel: ' . utf8specialchars($channel));
+    echo "\n<ul>\n";
+
+    // Query the database to discover all days that are available for this channel:
+    $data = array();
+    $prepared = $db->prepare("
+        select distinct date(tstamp) as day
+        from logs
+        where lower(chan) = :chan
+        ");
+    $prepared->execute(array(':chan' => $channel));
+    foreach ($prepared as $row) {
+        list($y, $m, $d) = explode('-', $row['day']);
+        $data[$y][$m][$d] = "{$y}-{$m}-{$d}";
+    }
+
+    // For now, just loop over them all and provide a list:
+    ksort($data);
+    foreach ($data as $year => $months) {
+        ksort($months);
+        foreach ($months as $month => $days) {
+            // Figure out a few facts about this month:
+            $stamp = mktime(0, 0, 0, $month, 1, $year);
+            $first_weekday = idate('w', $stamp);
+            $days_in_month = idate('t', $stamp);
+            $name = date('F', $stamp);
+
+            // We have a month ... start a new table:
+            echo <<<EOTABLE
+<div class="month">
+  <table>
+    <caption>{$name} {$year}</caption>
+    <tr><th>Sun</th><th>Mon</th><th>Tue</th><th>Wed</th><th>Thu</th><th>Fri</th><th>Sat</th></tr>
+EOTABLE;
+            // Now we need to start looping through the days in this month:
+            echo '<tr>';
+            $rowmod = 0;
+            // Loop through all day entries, no matter how many blanks we need:
+            for ($d = (-$first_weekday + 1); $d < $days_in_month + 1; $d++) {
+                if (!($rowmod++ % 7)) {
+                    // Stop/start a new row:
+                    echo '</tr><tr>';
+                }
+                echo '<td>';
+                // If this day is pre or post actual month days, make it blank:
+                if (($d < 1) || ($d > $days_in_month)) {
+                    echo '&nbsp;';
+                } elseif (isset($days[$d])) {
+                    // Make a link to the day's log:
+                    echo "<a href=\"?m=day&w={$url}&d={$days[$d]}\">{$d}</a>";            
+                } else {
+                    // Just a dead number:
+                    echo $d;
+                }
+                echo '</td>';
+            }
+            // Finish off any blanks needed for a complete table row:
+            while ($rowmod++ % 7) {
+                echo '<td>&nbsp;</td>';
+            }
+            echo "</tr></table></div>\n";
+        }
+    }
+
+    // Finish off the page:
+    echo "\n</ul>\n";
+    template_footer();    
+}
+
+/**
+ * show_log
+ *
+ * Actually show the log for this specific day
+ *
+ * @param PDO A PDO object referring to the database 
+ * @return void
+ * @author Eli White <eli@eliw.com>
+ **/
+function show_log(PDO $db) {
+    $channel = $_GET['w'];
+    $day = $_GET['d'];
+    $parts = explode('-', $day);
+    $formatted_date = "{$parts[0]}-{$parts[1]}-{$parts[2]}";
+
+    // Begin the HTML page:
+    template_header('Date: ' . utf8specialchars($formatted_date) .
+        ' - Channel: ' . utf8specialchars($channel));
+
+    // Query the database to get all log lines for this date:
+    $prepared = $db->prepare("
+        select time(tstamp) as t, type, nick, message
+        from logs
+        where lower(chan) = :chan and date(tstamp) = :day
+        order by tstamp asc
+        ");
+    $prepared->execute(array(
+        ':chan' => $channel,
+        ':day' => $day,
+        ));
+
+    // Loop through each line,
+    foreach ($prepared as $row) {
+        // Prepare some basic details for output:
+        $color = nick_color($row['nick']);
+        $time = utf8specialchars($row['t']);
+        $msg = utf8specialchars($row['message']);
+        $nick = utf8specialchars($row['nick']);
+        $type = false;
+        
+        // Now change the format of the line based upon the type:
+        switch ($row['type']) {
+            case 4: // PRIVMSG (A Regular Message)
+                echo "[$time] <span style=\"color:#{$color};\">&lt;{$nick}&gt;</span> {$msg}<br />\n";
+                break;
+            case 5: // ACTION (emote)
+                echo "[$time] <span style=\"color:#{$color};\">*{$nick} {$msg}</span><br />\n";
+                break;
+            case 1: // JOIN
+                echo "[$time] -> {$nick} joined the room.<br />\n";
+                break;
+            case 2: // PART (leaves channel)
+                echo "[$time] -> {$nick} left the room: {$msg}<br />\n";
+                break;
+            case 3: // QUIT (quits the server)
+                echo "[$time] -> {$nick} left the server: {$msg}<br />\n";
+                break;
+            case 6: // NICK (changes their nickname)
+                echo "[$time] -> {$nick} is now known as: {$msg}<br />\n";
+                break;
+            case 7: // KICK (booted)
+                echo "[$time] -> {$nick} boots {$msg} from the room.<br />\n";
+                break;
+            case 8: // MODE (changed their mode)
+                $type = 'MODE';
+            case 9: // TOPIC (changed the topic)
+                $type = $type ? $type : 'TOPIC';
+                echo "[$time] -> {$nick}: :{$type}: {$msg}<br />\n";
+        }
+    }
+        
+    // Finish up the page:
+    template_footer();
+}
+
+/**
+ * nick_color
+ *
+ * Uses a silly little algorithm to pick a consistent but unique(ish) color for
+ *  any given username.  NOTE: Augment this in the future to make it not generate
+ *  'close to white' ones, also maybe to ensure uniqueness?  (Not allow two to have
+ *  colors that are close to each other?)
+ *
+ * @return string A CSS valid hex color string
+ * @author Eli White <eli@eliw.com>
+ **/
+function nick_color($user) {
+    static $colors = array();
+    
+    if (!isset($colors[$user])) {
+        $colors[$user] = substr(md5($user), 0, 6);
+    }
+
+    return $colors[$user];
+}
+
+/**
+ * utf8specialchars
+ *
+ * Just a quick wrapper around htmlspecialchars
+ *
+ * @param string The UTF8 string to escape
+ * @return string An escaped and ready for HTML use string
+ * @author Eli White <eli@eliw.com>
+ **/
+function utf8specialchars($string) {
+    return htmlspecialchars($string, ENT_COMPAT, 'UTF-8');
+}
+
+
+/********** TEMPLATES **********/
+
+/**
+ * template_header
+ *
+ * Echo out the header for each HTML page
+ *
+ * @param $title string The title to be used for this page.
+ * @return void
+ * @author Eli White <eli@eliw.com>
+ **/
+function template_header($title) {
+    $css = template_css();
+    echo <<<EOHTML
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" 
+  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html lang="en" xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <title>Phergie LogViewer - {$title}</title>
+    <style type="text/css" media="all">{$css}</style>
+  </head>
+  <body>
+    <h2>Phergie LogViewer - {$title}</h2>
+EOHTML;
+}
+
+/**
+ * template_footer
+ *
+ * Echo out the bottom of each HTML page
+ *
+ * @return void
+ * @author Eli White <eli@eliw.com>
+ **/
+function template_footer() {
+    echo <<<EOHTML
+  </body>
+</html>
+EOHTML;
+}
+
+/**
+ * template_css
+ *
+ * Generate the CSS used by these HTML pages & return it.
+ *
+ * @return string The CSS in question:
+ * @author Eli White <eli@eliw.com>
+ **/
+function template_css() {
+    return <<<EOCSS
+    div.month {
+        float: left;
+        height: 15em;
+    }
+
+    div.month table {
+        border-collapse: collapse;
+        border: 2px solid black;
+        margin-right: 2em;
+    }
+
+    div.month td, div.month th {
+        text-align: center;
+        vertical-align: bottom;
+        border: 1px solid gray;
+        width: 2em;
+        height: 1.7em;
+        padding: 1px;
+        margin: 0px;
+    }
+
+    div.month th {
+        text-decoration: bold;
+        border: 2px solid black;
+    }
+
+    div.month a {
+        text-decoration: none;
+    }
+
+    a:visited, a:link {
+        color: blue;
+    }
+
+    a:active, a:hover {
+        color: red;
+    }
+EOCSS;
+}
diff --git a/plugins/Irc/extlib/phergie/Phergie/Tools/README b/plugins/Irc/extlib/phergie/Phergie/Tools/README
new file mode 100755
index 0000000000..ed8fe29469
--- /dev/null
+++ b/plugins/Irc/extlib/phergie/Phergie/Tools/README
@@ -0,0 +1,6 @@
+This directory holds any assorted tools that work with Phergie but that are
+not part of Phergie itself.  Such as tools to examine data that Phergie is
+capturing/logging.
+
+Each should live inside of it's own directory, and be completely self-contained
+with instructions inside on how to use it.
diff --git a/plugins/Irc/extlib/phergie/Phergie/Ui/Abstract.php b/plugins/Irc/extlib/phergie/Phergie/Ui/Abstract.php
new file mode 100644
index 0000000000..e2e2ce2f19
--- /dev/null
+++ b/plugins/Irc/extlib/phergie/Phergie/Ui/Abstract.php
@@ -0,0 +1,116 @@
+<?php
+/**
+ * Phergie 
+ *
+ * PHP version 5
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.
+ * It is also available through the world-wide-web at this URL:
+ * http://phergie.org/license
+ *
+ * @category  Phergie 
+ * @package   Phergie
+ * @author    Phergie Development Team <team@phergie.org>
+ * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
+ * @license   http://phergie.org/license New BSD License
+ * @link      http://pear.phergie.org/package/Phergie
+ */
+
+/**
+ * Base class for end-user interfaces.
+ *
+ * @category Phergie 
+ * @package  Phergie
+ * @author   Phergie Development Team <team@phergie.org>
+ * @license  http://phergie.org/license New BSD License
+ * @link     http://pear.phergie.org/package/Phergie
+ */
+abstract class Phergie_Ui_Abstract
+{
+    /**
+     * Handler for when a server connection is attempted.
+     *
+     * @param string $host Server hostname
+     *
+     * @return void 
+     */
+    public function onConnect($host)
+    {
+    }
+
+    /**
+     * Handler for when an attempt is made to load a plugin.
+     *
+     * @param string $plugin Short name of the plugin
+     *
+     * @return void 
+     */
+    public function onPluginLoad($plugin)
+    {
+    }
+
+    /**
+     * Handler for when a plugin fails to load.
+     *
+     * @param string $plugin  Short name of the plugin
+     * @param string $message Message describing the reason for the failure
+     *
+     * @return void 
+     */
+    public function onPluginFailure($plugin, $message)
+    {
+    }
+
+    /**
+     * Handler for when the bot receives an IRC event. 
+     *
+     * @param Phergie_Event_Abstract $event      Received event
+     * @param Phergie_Connection     $connection Connection on which the event 
+     *        was received
+     *
+     * @return void
+     */
+    public function onEvent(Phergie_Event_Abstract $event, 
+        Phergie_Connection $connection
+    ) {
+    }
+
+    /**
+     * Handler for when the bot sends a command to a server.
+     *
+     * @param Phergie_Event_Command $event      Event representing the command 
+     *        being sent
+     * @param Phergie_Connection    $connection Connection on which the command  
+     *        is being sent 
+     *
+     * @return void
+     */
+    public function onCommand(Phergie_Event_Command $event, 
+        Phergie_Connection $connection
+    ) {
+    }
+
+    /**
+     * Handler for when the bot terminates a connection to a server.
+     *
+     * @param Phergie_Connection $connection Terminated connection 
+     *
+     * @return void
+     */
+    public function onQuit(Phergie_Connection $connection)
+    {
+    }
+
+    /**
+     * Handler for when the bot shuts down after terminating all server 
+     * connections.
+     *
+     * @return void
+     */
+    public function onShutdown()
+    {
+    }
+}
diff --git a/plugins/Irc/extlib/phergie/Phergie/Ui/Console.php b/plugins/Irc/extlib/phergie/Phergie/Ui/Console.php
new file mode 100644
index 0000000000..a0a528b3f2
--- /dev/null
+++ b/plugins/Irc/extlib/phergie/Phergie/Ui/Console.php
@@ -0,0 +1,223 @@
+<?php
+/**
+ * Phergie 
+ *
+ * PHP version 5
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.
+ * It is also available through the world-wide-web at this URL:
+ * http://phergie.org/license
+ *
+ * @category  Phergie 
+ * @package   Phergie
+ * @author    Phergie Development Team <team@phergie.org>
+ * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
+ * @license   http://phergie.org/license New BSD License
+ * @link      http://pear.phergie.org/package/Phergie
+ */
+
+/**
+ * End-user interface that produces console output when running the bot from 
+ * a shell.
+ *
+ * @category Phergie 
+ * @package  Phergie
+ * @author   Phergie Development Team <team@phergie.org>
+ * @license  http://phergie.org/license New BSD License
+ * @link     http://pear.phergie.org/package/Phergie
+ */
+class Phergie_Ui_Console extends Phergie_Ui_Abstract
+{
+    /**
+     * Flag that toggles all console output
+     *
+     * @var bool
+     */
+    protected $enabled;
+
+    /**
+     * Format for timestamps included in console output
+     *
+     * @var string
+     * @link http://php.net/date
+     */
+    protected $format;
+
+    /**
+     * Constructor to initialize object properties.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        $this->enabled = true;
+        $this->format = 'H:i:s';
+    }
+
+    /** 
+     * Outputs a timestamped line to the console if console output is enabled.
+     *
+     * @param string $line Line to output
+     *
+     * @return void
+     */
+    protected function console($line)
+    {
+        if ($this->enabled) {
+            echo date($this->format), ' ', $line, PHP_EOL;
+        }
+    }
+
+    /**
+     * Returns whether console output is enabled.
+     *
+     * @return bool TRUE if console output is enabled, FALSE otherwise
+     */
+    public function isEnabled()
+    {
+        return $this->enabled;
+    }
+
+    /**
+     * Sets whether console output is enabled.
+     *
+     * @param bool $enabled TRUE to enable console output, FALSE otherwise, 
+     *        defaults to TRUE
+     *
+     * @return Phergie_Ui_Console Provides a fluent interface
+     */
+    public function setEnabled($enabled = true)
+    {
+        $this->enabled = (bool) $enabled;
+        return $this;
+    }
+
+    /**
+     * Returns the format used for timestamps in console output.
+     *
+     * @return string
+     * @link http://php.net/date
+     */
+    public function getFormat()
+    {
+        return $this->format;
+    }
+
+    /**
+     * Sets the format used for timestamps in console output, overwriting 
+     * any previous format used.
+     *
+     * @param string $format Timestamp format
+     *
+     * @return Phergie_Ui_Console Provides a fluent interface
+     * @link http://php.net/date
+     */
+    public function setFormat($format)
+    {
+        $this->format = (string) $format;
+        return $this;
+    }
+
+    /**
+     * Outputs a prompt when a server connection is attempted.
+     *
+     * @param string $host Server hostname
+     *
+     * @return void 
+     */
+    public function onConnect($host)
+    {
+        $this->console('Connecting to ' . $host);
+    }
+
+    /**
+     * Outputs a prompt when a plugin is loaded successfully. 
+     *
+     * @param string $plugin Short name of the plugin
+     *
+     * @return void 
+     */
+    public function onPluginLoad($plugin)
+    {
+        $this->console('Loaded plugin ' . $plugin);
+    }
+
+    /**
+     * Outputs a prompt when a plugin fails to load.
+     *
+     * @param string $plugin  Short name of the plugin
+     * @param string $message Message describing the reason for the failure
+     *
+     * @return void 
+     */
+    public function onPluginFailure($plugin, $message)
+    {
+        $this->console('Unable to load plugin ' . $plugin . ' - ' . $message);
+    }
+
+    /**
+     * Outputs a prompt when the bot receives an IRC event. 
+     *
+     * @param Phergie_Event_Abstract $event      Received event
+     * @param Phergie_Connection     $connection Connection on which the 
+     *        event was received
+     *
+     * @return void
+     */
+    public function onEvent(Phergie_Event_Abstract $event, 
+        Phergie_Connection $connection
+    ) {
+        $host = $connection->getHostmask()->getHost();
+        $this->console($host . ' <- ' . $event->getRawData());
+    }
+
+    /**
+     * Outputs a prompt when the bot sends a command to a server.
+     *
+     * @param Phergie_Event_Command $event      Event representing the 
+     *        command being sent
+     * @param Phergie_Connection    $connection Connection on which the 
+     *        command is being sent 
+     *
+     * @return void
+     */
+    public function onCommand(Phergie_Event_Command $event, 
+        Phergie_Connection $connection
+    ) {
+        $plugin = $event->getPlugin()->getName();
+        $host = $connection->getHostmask()->getHost();
+        $type = strtoupper($event->getType());
+        $args = implode(' ', $event->getArguments());
+        $this->console(
+            $plugin . ' plugin: ' . 
+            $host . ' -> ' . $type . ' ' . $args
+        ); 
+    }
+
+    /**
+     * Outputs a prompt when the bot terminates a connection to a server.
+     *
+     * @param Phergie_Connection $connection Terminated connection 
+     *
+     * @return void
+     */
+    public function onQuit(Phergie_Connection $connection)
+    {
+        $host = $connection->getHostmask()->getHost();
+        $this->console('Disconnecting from ' . $host);
+    }
+
+    /**
+     * Outputs a prompt when the bot shuts down after terminating all server 
+     * connections.
+     *
+     * @return void
+     */
+    public function onShutdown()
+    {
+        $this->console('Shutting down');
+    }
+}
diff --git a/plugins/Irc/extlib/phergie/PhergiePackageTask.php b/plugins/Irc/extlib/phergie/PhergiePackageTask.php
new file mode 100644
index 0000000000..dfc760a16d
--- /dev/null
+++ b/plugins/Irc/extlib/phergie/PhergiePackageTask.php
@@ -0,0 +1,110 @@
+<?php
+
+require_once 'phing/tasks/ext/PearPackage2Task.php';
+
+class PhergiePackageTask extends PearPackage2Task
+{
+    protected function setOptions()
+    {
+        $this->pkg->addMaintainer('lead', 'team', 'Phergie Development Team', 'team@phergie.org');
+
+        $path = str_replace('_', '/', $this->package) . '.php'; 
+        if (file_exists($path)) {
+            $contents = file_get_contents($path);
+            preg_match_all('#/\*\*(.*)\*/#Ums', $contents, $matches, PREG_SET_ORDER);
+            $doc = $matches[1][1];
+
+            $have_summary = false;
+            $have_description = false;
+            foreach ($this->options as $option) {
+                switch ($option->getName()) {
+                    case 'summary':
+                        $have_summary = true;
+                        break;
+                    case 'description':
+                        $have_descripion = true;
+                        break;
+                }
+            }
+
+            if (!$have_summary || !$have_description) {
+                $description = substr($doc, 0, strpos($doc, '@'));
+                $description = trim(preg_replace(array('#^[\h*]*|[\h*]*$#m', '#[\h]+#m'), array('', ' '), $description));
+                $split = preg_split('/\v\v+/', $description);
+                $summary = trim(array_shift($split));
+                if (!$have_summary) {
+                    $this->pkg->setSummary(htmlentities($summary, ENT_QUOTES));
+                }
+                if (!$have_description) {
+                    $this->pkg->setDescription(htmlentities($description, ENT_QUOTES));
+                }
+            }
+
+            $doc = preg_split('/\v+/', $doc);
+            $doc = preg_grep('/@uses/', $doc);
+            $doc = preg_replace('/\s*\* @uses\s+|\s+$/', '', $doc);
+            foreach ($doc as $line) {
+                if (strpos($line, 'extension') === 0) {
+                    $line = explode(' ', $line);
+                    $name = $line[1];
+                    $optional = 'required';
+                    if (isset($line[2])) {
+                        $optional = $line[2];
+                    }
+                    $this->pkg->addExtensionDep(
+                        $optional,
+                        $name
+                    );
+                } else {
+                    $line = explode(' ', $line);
+                    $name = $line[0];
+                    $channel = $line[1];
+                    $optional = 'required';
+                    if (isset($line[2])) {
+                        $optional = $line[2];
+                    }
+                    $this->pkg->addPackageDepWithChannel(
+                        $optional,
+                        $name,
+                        $channel
+                    );
+                }
+            }
+        }
+
+        $newmap = array();
+        foreach ($this->mappings as $key => $map) {
+            switch ($map->getName()) {
+                case 'releases':
+                    $releases = $map->getValue();
+                    foreach ($releases as $release) {
+                        $this->pkg->addRelease();
+                        if (isset($release['installconditions'])) {
+                            if (isset($release['installconditions']['os'])) {
+                                $this->pkg->setOsInstallCondition($release['installconditions']['os']);
+                            }
+                        }
+                        if (isset($release['filelist'])) {
+                            if (isset($release['filelist']['install'])) {
+                                foreach ($release['filelist']['install'] as $file => $as) {
+                                    $this->pkg->addInstallAs($file, $as);
+                                }
+                            }
+                            if (isset($release['filelist']['ignore'])) {
+                                foreach ($release['filelist']['ignore'] as $file) {
+                                    $this->pkg->addIgnoreToRelease($file);
+                                }
+                            }
+                        }
+                    }
+                    break;
+
+                default:
+                    $newmap[] = $map;
+            }
+        }
+        $this->mappings = $newmap;
+
+        parent::setOptions();
+    }
+}
diff --git a/plugins/Irc/extlib/phergie/README b/plugins/Irc/extlib/phergie/README
new file mode 100644
index 0000000000..d97ce05242
--- /dev/null
+++ b/plugins/Irc/extlib/phergie/README
@@ -0,0 +1,11 @@
+Phergie is an IRC bot written for PHP 5.2.
+
+Main project web site: http://phergie.org
+
+Instructions for running your own instance of Phergie: http://phergie.org/users/
+
+Architectural overview for plugin developers: http://phergie.org/developers/
+
+Support: http://phergie.org/support/
+
+Bug reports/feature requests: http://github.com/elazar/phergie/issues
diff --git a/plugins/Irc/extlib/phergie/Settings.php.dist b/plugins/Irc/extlib/phergie/Settings.php.dist
new file mode 100755
index 0000000000..b0450a4bb2
--- /dev/null
+++ b/plugins/Irc/extlib/phergie/Settings.php.dist
@@ -0,0 +1,97 @@
+<?php
+
+return array(
+
+    // One array per connection, pretty self-explanatory
+    'connections' => array(
+        // Ex: All connection info for the Freenode network
+        array(
+            'host' => 'irc.freenode.net',
+            'port' => 6667,
+            'username' => 'Elazar',
+            'realname' => 'Matthew Turland',
+            'nick' => 'Phergie2',
+            // 'password' => 'password goes here if needed',
+            // 'transport' => 'ssl' // uncomment to connect using SSL
+        )
+    ),
+    
+    'processor' => 'async',    
+    'processor.options' => array('usec' => 200000),
+    // Time zone. See: http://www.php.net/manual/en/timezones.php
+    'timezone' => 'UTC',
+
+    // Whitelist of plugins to load
+    'plugins' => array(
+        // To enable a plugin, simply add a string to this array containing 
+        // the short name of the plugin as shown below. 
+
+        // 'ShortPluginName',
+
+        // Below is an example of enabling the AutoJoin plugin, for which 
+        // the corresponding PEAR package is Phergie_Plugin_AutoJoin. This 
+        // plugin allows you to set a list of channels in this configuration  
+        // file that the bot will automatically join when it connects to a 
+        // server. If you'd like to enable this plugin, simply install it, 
+        // uncomment the line below, and set a value for the setting 
+        // autojoin.channels (examples for which are located further down in 
+        // this file).
+
+        // 'AutoJoin',
+
+        // A few other recommended plugins:
+
+        // Servers randomly send PING events to clients to ensure that 
+        // they're still connected and will eventually terminate the 
+        
+        // connection if a PONG response is not received. The Pong plugin 
+        // handles sending these responses.
+
+        // 'Pong', 
+
+        // It's sometimes difficult to distinguish between a lack of 
+        // activity on a server and the client not receiving data even 
+        // though a connection remains open. The Ping plugin performs a self 
+        // CTCP PING sporadically to ensure that its connection is still 
+        // functioning and, if not, terminates the bot.
+
+        // 'Ping',
+
+        // Sometimes it's desirable to have the bot disconnect gracefully 
+        // when issued a command to do so via a PRIVMSG event. The Quit 
+        // plugin implements this using the Command plugin to intercept the 
+        // command.
+
+        // 'Quit',
+    ),
+
+    // If set to true, this allows any plugin dependencies for plugins 
+    // listed in the 'plugins' option to be loaded even if they are not 
+    // explicitly included in that list
+    'plugins.autoload' => true,
+
+    // Enables shell output describing bot events via Phergie_Ui_Console
+    'ui.enabled' => true,
+
+    // Examples of supported values for autojoins.channel:
+    // 'autojoin.channels' => '#channel1,#channel2',
+    // 'autojoin.channels' => array('#channel1', '#channel2'),
+    // 'autojoin.channels' => array(
+    //                            'host1' => '#channel1,#channel2',
+    //                            'host2' => array('#channel3', '#channel4')
+    //                        ),
+
+    // Examples of setting values for Ping plugin settings
+
+    // This is the amount of time in seconds that the Ping plugin will wait 
+    // to receive an event from the server before it initiates a self-ping 
+
+    // 'ping.event' => 300, // 5 minutes
+
+    // This is the amount of time in seconds that the Ping plugin will wait 
+    // following a self-ping attempt before it assumes that a response will 
+    // never be received and terminates the connection
+
+    // 'ping.ping' => 10, // 10 seconds
+
+);
diff --git a/plugins/Irc/extlib/phergie/Tests/Phergie/Plugin/HandlerTest.php b/plugins/Irc/extlib/phergie/Tests/Phergie/Plugin/HandlerTest.php
new file mode 100644
index 0000000000..b359c11554
--- /dev/null
+++ b/plugins/Irc/extlib/phergie/Tests/Phergie/Plugin/HandlerTest.php
@@ -0,0 +1,461 @@
+<?php
+/**
+ * Phergie
+ *
+ * PHP version 5
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.
+ * It is also available through the world-wide-web at this URL:
+ * http://phergie.org/license
+ *
+ * @category  Phergie
+ * @package   Phergie_Tests
+ * @author    Phergie Development Team <team@phergie.org>
+ * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
+ * @license   http://phergie.org/license New BSD License
+ * @link      http://pear.phergie.org/package/Phergie_Tests
+ */
+
+/**
+ * Unit test suite for Pherge_Plugin_Handler.
+ *
+ * @category Phergie
+ * @package  Phergie_Tests
+ * @author   Phergie Development Team <team@phergie.org>
+ * @license  http://phergie.org/license New BSD License
+ * @link     http://pear.phergie.org/package/Phergie_Tests
+ */
+class Phergie_Plugin_HandlerTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * Plugin handler instance being tested
+     *
+     * @var Phergie_Plugin_Handler
+     */
+    protected $handler;
+
+    /**
+     * Sets up a new handler instance before each test.
+     *
+     * @return void
+     */
+    public function setUp()
+    {
+        $this->handler = new Phergie_Plugin_Handler(
+            new Phergie_Config(),
+            new Phergie_Event_Handler()
+        );
+    }
+
+    /**
+     * Destroys the handler instance after each test
+     *
+     * @return void
+     */
+    public function tearDown()
+    {
+        unset($this->handler);
+    }
+
+    /**
+     * Ensures that we can iterate over the handler
+     *
+     * @return void
+     */
+    public function testImplementsIterator()
+    {
+        $reflection = new ReflectionObject($this->handler);
+        $this->assertTrue(
+            $reflection->implementsInterface('IteratorAggregate')
+        );
+
+        $this->assertType(
+            'Iterator', $this->handler->getIterator(),
+            'getIterator() must actually return an Iterator'
+        );
+    }
+
+    /**
+     * Ensures a newly instantiated handler does not have plugins associated
+     * with it
+     *
+     * @depends testImplementsIterator
+     * @return void
+     */
+    public function testEmptyHandlerHasNoPlugins()
+    {
+        $count = 0;
+        foreach ($this->handler as $plugin) {
+            $count++;
+        }
+
+        $this->assertEquals(0, $count);
+    }
+    
+    /**
+     * Ensures a newly instantiated handler does not default to autoload
+     *
+     * @return void
+     */
+    public function testDefaultsToNotAutoload()
+    {
+        $this->assertFalse($this->handler->getAutoload());
+    }
+
+    /**
+     * addPath provides a fluent interface
+     *
+     * @return void
+     */
+    public function testAddPathProvidesFluentInterface()
+    {
+        $handler = $this->handler->addPath(dirname(__FILE__));
+        $this->assertSame($this->handler, $handler);
+    }
+
+    /**
+     * addPath throws an exception when it cannot read the directory
+     *
+     * @return void
+     */
+    public function testAddPathThrowsExceptionOnUnreadableDirectory()
+    {
+        try {
+            $this->handler->addPath('/an/unreadable/directory/path');
+        } catch(Phergie_Plugin_Exception $e) {
+            $this->assertEquals(
+                Phergie_Plugin_Exception::ERR_DIRECTORY_NOT_READABLE,
+                $e->getCode()
+            );
+            return;
+        }
+
+        $this->fail('An expected exception has not been raised.');
+    }
+
+    /**
+     * adds a path into the plugin handler and then ensures that files
+     * in that location can be found
+     *
+     * @return void
+     */
+    public function testAddPath()
+    {
+        $plugin_name = 'Mock';
+        try {
+            $this->handler->addPlugin($plugin_name);
+        } catch(Phergie_Plugin_Exception $e) {
+            $this->assertEquals(
+                Phergie_Plugin_Exception::ERR_CLASS_NOT_FOUND,
+                $e->getCode()
+            );
+            
+            $this->handler->addPath(dirname(__FILE__), 'Phergie_Plugin_');
+
+            try {
+                $this->handler->addPlugin($plugin_name);
+            } catch(Phergie_Plugin_Exception $e) {
+                $this->fail(
+                    'After adding the directory, the plugin was still '
+                    . 'not found.'
+                );
+            }
+            
+            return;
+        }
+
+        $this->fail(
+            'Before adding the directory, an expected exception '
+            . 'was not raised'
+        );
+    }
+
+    /**
+     * addPlugin returns the plugin instance that was added
+     *
+     * @return void
+     */
+    public function testAddPluginByInstanceReturnsPluginInstance() {
+        $plugin = $this->getMock('Phergie_Plugin_Abstract');
+        $plugin
+            ->expects($this->any())
+            ->method('getName')
+            ->will($this->returnValue('TestPlugin'));
+
+        $returned_plugin = $this->handler->addPlugin($plugin);
+        $this->assertSame(
+            $returned_plugin,
+            $plugin,
+            'addPlugin returns the same instance that is passed to it'
+        );
+    }
+
+    /**
+     * Can add a plugin to the handler by shortname
+     *
+     * @return void
+     */
+    public function testAddPluginToHandlerByShortname()
+    {
+        $plugin_name = 'Mock';
+        $this->handler->addPath(dirname(__FILE__), 'Phergie_Plugin_');
+
+        $returned_plugin = $this->handler->addPlugin($plugin_name);
+        $this->assertTrue($this->handler->hasPlugin($plugin_name));
+        $this->assertType(
+            'Phergie_Plugin_Mock',
+            $this->handler->getPlugin($plugin_name)
+        );
+        $this->assertSame(
+            $this->handler->getPlugin($plugin_name),
+            $returned_plugin,
+            'Handler contains plugin when added by shortname.'
+        );
+    }
+
+
+    /**
+     * Can add a plugin to the handler by instance
+     *
+     * @return void
+     */
+    public function testAddPluginToHandlerByInstance()
+    {
+        $plugin = $this->getMock('Phergie_Plugin_Abstract');
+        $plugin
+            ->expects($this->any())
+            ->method('getName')
+            ->will($this->returnValue('TestPlugin'));
+
+        $returned_plugin = $this->handler->addPlugin($plugin);
+
+        $this->assertTrue($this->handler->hasPlugin('TestPlugin'));
+        $this->assertSame(
+            $plugin, $returned_plugin,
+            'addPlugin returns the same plugin'
+        );
+        $this->assertSame(
+            $plugin, $this->handler->getPlugin('TestPlugin'),
+            'getPlugin returns the same plugin'
+        );
+    }
+
+    /**
+     * addPlugin throws an exception when it can't find the plugin
+     *
+     * @return void
+     */
+    public function testAddPluginThrowsExceptionIfCannotFindPlugin()
+    {
+        try {
+            $this->handler->addPlugin('TestPlugin');
+        } catch(Phergie_Plugin_Exception $e) {
+            $this->assertEquals(
+                Phergie_Plugin_Exception::ERR_CLASS_NOT_FOUND,
+                $e->getCode()
+            );
+            return;
+        }
+
+        $this->fail('An expected exception has not been raised.');
+    }
+
+    /**
+     * addPlugin throws an exception when trying to instantiate a
+     * class that doesn't extend from Phergie_Plugin_Abstract
+     *
+     * @return void
+     */
+    public function testAddPluginThrowsExceptionIfRequestingNonPlugin()
+    {
+        try {
+            $this->handler->addPlugin('Handler');
+        } catch(Phergie_Plugin_Exception $e) {
+            $this->assertEquals(
+                Phergie_Plugin_Exception::ERR_INCORRECT_BASE_CLASS,
+                $e->getCode()
+            );
+            return;
+        }
+
+        $this->fail('An expected exception has not been raised.');
+    }
+
+    /**
+     * addPlugin throws an exception when trying to instantiate a
+     * class that can't be instantiated.
+     *
+     * @return void
+     */
+    public function testAddPluginThrowsExceptionIfPluginNotInstantiable()
+    {
+        $this->handler->addPath(dirname(__FILE__), 'Phergie_Plugin_');
+        try {
+            $this->handler->addPlugin('TestNonInstantiablePluginFromFile');
+        } catch(Phergie_Plugin_Exception $e) {
+            $this->assertEquals(
+                Phergie_Plugin_Exception::ERR_CLASS_NOT_INSTANTIABLE,
+                $e->getCode()
+            );
+            return;
+        }
+
+        $this->fail('An expected exception has not been raised.');
+    }
+
+    /**
+     * addPlugin with shortname and arguments passes args to constructor
+     *
+     * @return null
+     */
+    public function testAddPluginShortnamePassesArgsToConstructor()
+    {
+        $plugin_name = 'Mock';
+        $this->handler->addPath(dirname(__FILE__), 'Phergie_Plugin_');
+
+        $arguments = array('a', 'b', 'c');
+
+        $plugin = $this->handler->addPlugin($plugin_name, $arguments);
+        $this->assertAttributeSame(
+            $arguments,
+            'args',
+            $plugin,
+            'Arguments passed in to addPlugin match the arguments '
+            . 'the Mock plugin constructor received'
+        );
+    }
+
+    /**
+     * addPlugin passes Phergie_Config to instantiated plugin
+     *
+     * @return null
+     */
+    public function testAddPluginPassesPhergieConfigToInstantiatedPlugin()
+    {
+        $my_config = new Phergie_Config();
+        $my_config['my_option'] = 'my_value';
+
+        // create a new handler with this config
+        unset($this->handler);
+        $this->handler = new Phergie_Plugin_Handler(
+            $my_config,
+            new Phergie_Event_Handler()
+        );
+
+        $plugin_name = 'Mock';
+        $this->handler->addPath(dirname(__FILE__), 'Phergie_Plugin_');
+
+        $plugin = $this->handler->addPlugin($plugin_name);
+
+        $this->assertSame(
+            $my_config,
+            $plugin->getConfig(),
+            'addPlugin passes Phergie_Config to instantiated plugin'
+        );
+    }
+
+    /**
+     * addPlugin passes Phergie_Event_Handler to instantiated plugin
+     *
+     * @return null
+     */
+    public function testAddPluginPassesPhergieEventHandlerToInstantiatedPlugin()
+    {
+        $plugin = $this->getMock('Phergie_Plugin_Abstract');
+        $plugin
+            ->expects($this->any())
+            ->method('getName')
+            ->will($this->returnValue('TestPlugin'));
+
+        $my_event_handler = new Phergie_Event_Handler();
+        $my_event_handler->addEvent($plugin, 'ping');
+
+        // create a new plugin handler with this event handler
+        unset($this->handler);
+        $this->handler = new Phergie_Plugin_Handler(
+            new Phergie_Config(),
+            $my_event_handler
+        );
+
+        $plugin_name = 'Mock';
+        $this->handler->addPath(dirname(__FILE__), 'Phergie_Plugin_');
+
+        $plugin = $this->handler->addPlugin($plugin_name);
+
+        $this->assertSame(
+            $my_event_handler,
+            $plugin->getEventHandler(),
+            'addPlugin passes Phergie_Event_Handler to instantiated plugin'
+        );
+    }
+
+    /**
+     * @todo addPlugin calls onLoad() to instantiated plugin
+     */
+
+    /**
+     * implements __isset
+     *
+     * @return void
+     */
+    public function testPluginHandlerImplementsIsset()
+    {
+        $plugin_name = 'TestPlugin';
+
+        $this->assertFalse(isset($this->handler->{$plugin_name}));
+
+        $plugin = $this->getMock('Phergie_Plugin_Abstract');
+        $plugin
+            ->expects($this->any())
+            ->method('getName')
+            ->will($this->returnValue($plugin_name));
+
+        $this->handler->addPlugin($plugin);
+
+        $this->assertTrue(isset($this->handler->{$plugin_name}));
+
+    }
+
+    /**
+     * addPlugin() returns the same plugin when requested twice
+     *
+     * @return void
+     */
+    public function testAddPluginReturnsSamePluginWhenAskedTwice()
+    {
+        $plugin_name = 'Mock';
+        $this->handler->addPath(dirname(__FILE__), 'Phergie_Plugin_');
+
+        $plugin1 = $this->handler->addPlugin($plugin_name);
+        $plugin2 = $this->handler->addPlugin($plugin_name);
+        $this->assertSame($plugin1, $plugin2);
+    }
+
+    
+    /**
+     * Tests an exception is thrown when trying to get a plugin
+     * that is not already loaded and autoload is off
+     *
+     * @depends testDefaultsToNotAutoload
+     * @return void
+     */
+    public function testExceptionThrownWhenLoadingPluginWithoutAutoload()
+    {
+        $this->handler->addPath(dirname(__FILE__), 'Phergie_Plugin_');
+
+        try {
+            $this->handler->getPlugin('Mock');
+        } catch (Phergie_Plugin_Exception $expected) {
+            $this->assertEquals(
+                Phergie_Plugin_Exception::ERR_PLUGIN_NOT_LOADED,
+                $expected->getCode()
+            );
+            return;
+        }
+
+        $this->fail('An expected exception has not been raised.');
+    }
+}
diff --git a/plugins/Irc/extlib/phergie/Tests/Phergie/Plugin/Mock.php b/plugins/Irc/extlib/phergie/Tests/Phergie/Plugin/Mock.php
new file mode 100755
index 0000000000..714e3d9a44
--- /dev/null
+++ b/plugins/Irc/extlib/phergie/Tests/Phergie/Plugin/Mock.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * Phergie
+ *
+ * PHP version 5
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.
+ * It is also available through the world-wide-web at this URL:
+ * http://phergie.org/license
+ *
+ * @category  Phergie
+ * @package   Phergie_Tests
+ * @author    Phergie Development Team <team@phergie.org>
+ * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
+ * @license   http://phergie.org/license New BSD License
+ * @link      http://pear.phergie.org/package/Phergie_Tests
+ */
+
+/**
+ * Creates a plugin on the filesystem that can be used by
+ * Phergie_Plugin_Handler's addPath utility to be located and loaded.
+ *
+ * @category Phergie
+ * @package  Phergie_Tests
+ * @author   Phergie Development Team <team@phergie.org>
+ * @license  http://phergie.org/license New BSD License
+ * @link     http://pear.phergie.org/package/Phergie_Tests
+ */
+class Phergie_Plugin_Mock extends Phergie_Plugin_Abstract
+{
+    /**
+     * holds the arguments that were passed in to the constructor
+     * @var array
+     */
+    protected $args;
+
+    /**
+     * processes a variable number of arguments into the args property
+     *
+     * @return null
+     */
+    public function __construct()
+    {
+        $this->args = func_get_args();
+    }
+}
diff --git a/plugins/Irc/extlib/phergie/Tests/Phergie/Plugin/PingTest.php b/plugins/Irc/extlib/phergie/Tests/Phergie/Plugin/PingTest.php
new file mode 100644
index 0000000000..b9c2dde3d4
--- /dev/null
+++ b/plugins/Irc/extlib/phergie/Tests/Phergie/Plugin/PingTest.php
@@ -0,0 +1,175 @@
+<?php
+/**
+ * Phergie
+ *
+ * PHP version 5
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.
+ * It is also available through the world-wide-web at this URL:
+ * http://phergie.org/license
+ *
+ * @category  Phergie
+ * @package   Phergie
+ * @author    Phergie Development Team <team@phergie.org>
+ * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
+ * @license   http://phergie.org/license New BSD License
+ * @link      http://pear.phergie.org/package/Phergie
+ */
+
+require_once(dirname(__FILE__) . '/TestCase.php');
+
+/**
+ * Unit test suite for Pherge_Plugin_Ping.
+ *
+ * @category Phergie
+ * @package  Phergie_Tests
+ * @author   Phergie Development Team <team@phergie.org>
+ * @license  http://phergie.org/license New BSD License
+ * @link     http://pear.phergie.org/package/Phergie
+ */
+class Phergie_Plugin_PingTest extends Phergie_Plugin_TestCase
+{
+    protected $config = array('ping.ping'  => 10,
+                              'ping.event' => 300);
+    
+    /**
+     * Sets up the fixture, for example, opens a network connection.
+     * This method is called before a test is executed.
+     */
+    protected function setUp()
+    {
+        $this->setPlugin(new Phergie_Plugin_Ping);
+    }
+
+    /**
+     * Test the lastEvent setter and getter
+     */
+    public function testSetGetLastEvent()
+    {
+        $expected = rand(100000,200000);
+        $this->plugin->setLastEvent($expected);
+        $this->assertEquals($expected,
+                            $this->plugin->getLastEvent(),
+                            'Assert that the last event was set and gotten ' .
+                            'correctly');
+    }
+
+    /**
+     * Test the lastPing setter and getter
+     */
+    public function testSetGetLastPing()
+    {
+
+        $expected = rand(100000,200000);
+        $this->plugin->setLastPing($expected);
+        $this->assertEquals($expected,
+                            $this->plugin->getLastPing(),
+                            'Assert that the last ping was set and gotten ' .
+                            'correctly');
+    }
+
+    /**
+     * Tests the onConnect hook
+     */
+    public function testOnConnect()
+    {
+        $time = time() - 1;
+        // We need to make sure time() is going to be creater next time it is called
+        
+        $this->plugin->onConnect();
+        $this->assertNull($this->plugin->getLastPing(), 
+                          'onConnect should set last ping to null');
+        $this->assertGreaterThan($time,
+                                 $this->plugin->getLastEvent(),
+                                 'onConnect should update lastEvent with the ' .
+                                 'current timestamp');
+        $this->assertLessThan($time + 2,
+                              $this->plugin->getLastEvent(),
+                              'onConnect should update lastEvent with the ' .
+                              'current timestamp');
+    }
+
+    /**
+     * Test that the preEvent method updates the lastEvent with the current time
+     */
+    public function testPreEvent()
+    {
+        $time = time() -1;
+        $this->plugin->preEvent();
+        $this->assertGreaterThan($time,
+                                 $this->plugin->getLastEvent(),
+                                 'Last event time was set properly on preEvent');
+        $this->assertLessThan($time +2,
+                              $this->plugin->getLastEvent(),
+                              'Last Event time was set properly on preEvent');
+    }
+
+    /**
+     * @todo Implement testOnPingResponse().
+     */
+    public function testOnPingResponse()
+    {
+        $this->plugin->setLastPing(time());
+        $this->plugin->onPingResponse();
+        $this->assertNull($this->plugin->getLastPing(),
+                          'Last ping time should be null after onPingResponse');
+
+    }
+
+    /**
+     * Test that the plugin issues a quit when the ping threashold
+     * has been exceeded
+     */
+    public function testOnTickExceededPingThresholdQuits()
+    {
+        $this->plugin->setLastPing(1);
+        $this->plugin->onTick();
+        $this->assertHasEvent(Phergie_Event_Command::TYPE_QUIT);
+    }
+    
+    /**
+     * Test that the plugin issues a quit when the ping threashold
+     * has been exceeded
+     */
+    public function testOnTickPingWithinThresholdDoesNotQuits()
+    {
+        $this->plugin->setLastPing(time());
+        $this->plugin->onTick();
+        $this->assertDoesNotHaveEvent(Phergie_Event_Command::TYPE_QUIT);
+    }
+
+    /**
+     * Test that a ping is emitted when the event threashold is exceeded
+     */
+    public function testPingEmittedAfterThresholdExceeded()
+    {
+        $this->plugin->setLastEvent(time() - $this->config['ping.event'] - 1);
+        $this->plugin->onTick();
+        $this->assertHasEvent(Phergie_Event_Command::TYPE_PING);
+        $events = $this->getResponseEvents(Phergie_Event_Command::TYPE_PING);
+        foreach ($events as $event) {
+            $this->assertEventEmitter($event,
+                                      $this->plugin,
+                    'Assert that the event was emitted by the tested plugin');
+        }
+    }
+
+    /**
+     * Test that no ping is emitted when the event thresthold is not exceeded
+     */
+    public function testNoPingEmittedWhenThresholdNotExceeded()
+    {
+        $this->plugin->setLastEvent(time() - $this->config['ping.event'] +1);
+        $this->plugin->onTick();
+        $this->assertDoesNotHaveEvent(Phergie_Event_Command::TYPE_PING);
+    }
+
+    public function tearDown()
+    {
+        $this->handler->clearEvents();
+    }
+
+}
\ No newline at end of file
diff --git a/plugins/Irc/extlib/phergie/Tests/Phergie/Plugin/PongTest.php b/plugins/Irc/extlib/phergie/Tests/Phergie/Plugin/PongTest.php
new file mode 100644
index 0000000000..a8bc8fd05f
--- /dev/null
+++ b/plugins/Irc/extlib/phergie/Tests/Phergie/Plugin/PongTest.php
@@ -0,0 +1,74 @@
+<?php
+/**
+ * Phergie
+ *
+ * PHP version 5
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.
+ * It is also available through the world-wide-web at this URL:
+ * http://phergie.org/license
+ *
+ * @category  Phergie
+ * @package   Phergie
+ * @author    Phergie Development Team <team@phergie.org>
+ * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
+ * @license   http://phergie.org/license New BSD License
+ * @link      http://pear.phergie.org/package/Phergie
+ */
+
+require_once(dirname(__FILE__) . '/TestCase.php');
+
+/**
+ * Unit test suite for Pherge_Plugin_Pong.
+ *
+ * @category Phergie
+ * @package  Phergie_Tests
+ * @author   Phergie Development Team <team@phergie.org>
+ * @license  http://phergie.org/license New BSD License
+ * @link     http://pear.phergie.org/package/Phergie
+ */
+class Phergie_Plugin_PongTest extends Phergie_Plugin_TestCase
+{
+    /**
+     * Sets up the fixture, for example, opens a network connection.
+     * This method is called before a test is executed.
+     */
+    protected function setUp()
+    {
+        $this->setPlugin(new Phergie_Plugin_Pong);
+    }
+
+    /**
+     * Test that when a ping is received, a Phergie_Event_Command::TYPE_PONG
+     * is set to the handler
+     *
+     * @event Phergie_Event_Command::TYPE_PING
+     */
+    public function testOnPing()
+    {
+        $this->plugin->onPing();
+        $this->assertHasEvent(Phergie_Event_Command::TYPE_PONG);
+    }
+
+    /**
+     * Test that when a ping is received, a Phergie_Event_Command::TYPE_PONG
+     * is set to the handler
+     *
+     * @event Phergie_Event_Command::TYPE_PING
+     */
+    public function testOnPingResponseArguement()
+    {
+        $this->plugin->onPing();
+        $this->assertHasEvent(Phergie_Event_Command::TYPE_PONG);
+        $events = $this->getResponseEvents(Phergie_Event_Command::TYPE_PONG);
+        $this->assertTrue(count($events) === 1, 'Assert that only one pong is emitted');
+        $this->assertEventEmitter(current($events),
+                                  $this->plugin,
+                                  'Assert that the tested plugin emitted the event');
+
+    }
+
+}
diff --git a/plugins/Irc/extlib/phergie/Tests/Phergie/Plugin/TerryChayTest.php b/plugins/Irc/extlib/phergie/Tests/Phergie/Plugin/TerryChayTest.php
new file mode 100644
index 0000000000..e76020b6b3
--- /dev/null
+++ b/plugins/Irc/extlib/phergie/Tests/Phergie/Plugin/TerryChayTest.php
@@ -0,0 +1,99 @@
+<?php
+/**
+ * Phergie
+ *
+ * PHP version 5
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.
+ * It is also available through the world-wide-web at this URL:
+ * http://phergie.org/license
+ *
+ * @category  Phergie
+ * @package   Phergie
+ * @author    Phergie Development Team <team@phergie.org>
+ * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
+ * @license   http://phergie.org/license New BSD License
+ * @link      http://pear.phergie.org/package/Phergie
+ */
+
+require_once(dirname(__FILE__) . '/TestCase.php');
+
+/**
+ * Unit test suite for Pherge_Plugin_TerryChay.
+ *
+ * @category Phergie
+ * @package  Phergie_Tests
+ * @author   Phergie Development Team <team@phergie.org>
+ * @license  http://phergie.org/license New BSD License
+ * @link     http://pear.phergie.org/package/Phergie
+ */
+class Phergie_Plugin_TerryChayTest extends Phergie_Plugin_TestCase
+{
+    /**
+     * Sets up the fixture, for example, opens a network connection.
+     * This method is called before a test is executed.
+     */
+    protected function setUp()
+    {
+        $this->setPlugin(new Phergie_Plugin_TerryChay());
+        $config = new Phergie_Config();
+        $handler = new Phergie_Plugin_Handler($config, $this->handler);
+        $this->plugin->setPluginHandler($handler);
+        $handler->addPlugin($this->plugin);
+        $handler->addPlugin(new Phergie_Plugin_Http($config));
+        $this->plugin->setConfig($config);
+        $this->connection->setNick('phergie');
+        $this->plugin->onLoad();
+    }
+
+    /**
+     * @event Phergie_Event_Request::privmsg
+     * @eventArg #zftalk
+     * @eventArg tychay
+     */
+    public function testWithTyChay()
+    {
+        $this->plugin->onPrivMsg();
+        $this->assertHasEvent(Phergie_Event_Command::TYPE_PRIVMSG);
+    }
+
+    /**
+     * @event Phergie_Event_Request::privmsg
+     * @eventArg #zftalk
+     * @eventArg terrychay
+     */
+    public function testWithTerryChay()
+    {
+        $this->plugin->onPrivMsg();
+        $this->assertDoesNotHaveEvent(Phergie_Event_Command::TYPE_PRIVMSG,
+                              'string "terrychay" should not invoke a response');
+    }
+    
+    /**
+     * @event Phergie_Event_Request::privmsg
+     * @eventArg #zftalk
+     * @eventArg terry chay
+     */
+    public function testWithTerry_Chay()
+    {
+        $this->plugin->onPrivMsg();
+        $this->assertHasEvent(Phergie_Event_Command::TYPE_PRIVMSG,
+                              'string "terry chay" should invoke a response');
+    }
+
+    /**
+     * @event Phergie_Event_Request::privmsg
+     * @eventArg #zftalk
+     * @eventArg Elazar is not Mr. Chay
+     */
+    public function testWithNoTyChay()
+    {
+        $this->plugin->onPrivMsg();
+        $this->assertDoesNotHaveEvent(Phergie_Event_Command::TYPE_PRIVMSG,
+                                      'Failed asserting that elazar is not ' .
+                                      'tychay');
+    }
+}
\ No newline at end of file
diff --git a/plugins/Irc/extlib/phergie/Tests/Phergie/Plugin/TestCase.php b/plugins/Irc/extlib/phergie/Tests/Phergie/Plugin/TestCase.php
new file mode 100644
index 0000000000..36b81d6fae
--- /dev/null
+++ b/plugins/Irc/extlib/phergie/Tests/Phergie/Plugin/TestCase.php
@@ -0,0 +1,207 @@
+<?php
+/**
+ * Phergie
+ *
+ * PHP version 5
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.
+ * It is also available through the world-wide-web at this URL:
+ * http://phergie.org/license
+ *
+ * @category  Phergie
+ * @package   Phergie_Tests
+ * @author    Phergie Development Team <team@phergie.org>
+ * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
+ * @license   http://phergie.org/license New BSD License
+ * @link      http://pear.phergie.org/package/Phergie_Tests
+ */
+
+/**
+ * Unit test suite for Pherge_Plugin classes
+ *
+ * @category Phergie
+ * @package  Phergie_Tests
+ * @author   Phergie Development Team <team@phergie.org>
+ * @license  http://phergie.org/license New BSD License
+ * @link     http://pear.phergie.org/package/Phergie_Tests
+ */
+abstract class Phergie_Plugin_TestCase extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @var Phergie_Event_Handler
+     */
+    protected $handler;
+
+    /**
+     * @var Phergie_Connection
+     */
+    protected $connection;
+
+    /**
+     * @var array
+     */
+    protected $eventArgs;
+
+    /**
+     * @var Phergie_Plugin_Abstract
+     */
+    protected $plugin;
+
+    /**
+     * @var array
+     */
+    protected $config = array();
+
+    /**
+     * Constructs a test case with the given name.
+     *
+     * @param  string $name
+     * @param  array  $data
+     * @param  string $dataName
+     */
+    public function __construct($name = NULL, array $data = array(), $dataName = '')
+    {
+        parent::__construct($name, $data, $dataName);
+        $this->connection = new Phergie_Connection();
+        $this->handler    = new Phergie_Event_Handler();
+    }
+
+    /**
+     * Assert that a given event type exists in the event handler
+     * @param string $event
+     * @param string $message
+     */
+    public function assertHasEvent($event, $message = null)
+    {
+        self::assertTrue($this->handler->hasEventOfType($event), $message);
+    }
+
+    /**
+     * Assert that a given event type DOES NOT exist in the event handler
+     * @param string $event
+     * @param string $message
+     */
+    public function assertDoesNotHaveEvent($event, $message = null)
+    {
+        self::assertFalse($this->handler->hasEventOfType($event), $message);
+    }
+
+    /**
+     * Assert that the emitter of the given command event was the given
+     * plugin
+     *
+     * @param Phergie_Event_Command   $event
+     * @param Phergie_Plugin_Abstract $plugin
+     * @param string                  $message
+     */
+    public function assertEventEmitter(Phergie_Event_Command $event,
+                                       Phergie_Plugin_Abstract $plugin,
+                                       $message = null)
+    {
+        $this->assertSame($plugin, $event->getPlugin(), $message);
+    }
+
+    /**
+     * Gets the events added to the handler by the plugin
+     * @param string $type
+     * @return array | null
+     */
+    public function getResponseEvents($type = null)
+    {
+        if (is_string($type) && strlen($type) > 0) {
+            return $this->handler->getEventsOfType($type);
+        }
+        return $this->handler->getEvents();
+    }
+
+    /**
+     * Sets the event for the test
+     * @param array $event
+     * @param array $eventArgs
+     */
+    public function setEvent(array $event, array $eventArgs = null)
+    {
+        $eventClass = 'Phergie_Event_Request';
+        if (is_array($event)) {
+            $eventClass = $event[0];
+            $eventType  = $event[1];
+        } else {
+            throw new InvalidArgumentException("Invalid value for \$event");
+        }
+        $event = new $eventClass();
+        $event->setType($eventType);
+        $event->setArguments($eventArgs);
+        $this->plugin->setEvent($event);
+        $this->eventArgs = $eventArgs;
+    }
+
+    /**
+     * Sets the plugin to be tested
+     * If a plugin requries config for testing, an array placed in
+     * $this->config will be parsed into a Phergie_Config object and
+     * attached to the plugin
+     */
+    protected function setPlugin(Phergie_Plugin_Abstract $plugin)
+    {
+        $this->plugin = $plugin;
+        $this->plugin->setEventHandler($this->handler);
+        $this->plugin->setConnection($this->connection);
+        $this->connection->setNick('test');
+        if (!empty($this->config)) {
+            $config = new Phergie_Config();
+            foreach ($this->config as $configKey => $configValue) {
+                $config[$configKey] = $configValue;
+            }
+            $plugin->setConfig($config);
+        }
+    }
+
+    /**
+     * Overrides the runTest method to add additional annotations
+     * @return PHPUnit_Framework_TestResult
+     */
+    protected function runTest()
+    {
+        if (null === $this->plugin) {
+            throw new RuntimeException(
+                    'Tests cannot be run before plugin is set'
+            );
+        }
+        
+        // Clean the event handler... important!
+        $this->handler->clearEvents();
+
+        $info      = $this->getAnnotations();
+        $event     = null;
+        $eventArgs = array();
+        if (isset($info['method']['event']) && isset($info['method']['event'][0])) {
+            if (!is_string($info['method']['event'][0])) {
+                throw new InvalidArgumentException(
+                        'Only one event may be specified'
+                );
+            }
+            $event = $info['method']['event'][0];
+
+            if (stristr($event, '::')) {
+                $event = explode('::', $event);
+            }
+        }
+        if (isset($info['method']['eventArg'])) {
+            $eventArgs = $info['method']['eventArg'];
+        }
+        if (null !== $event) {
+            $this->setEvent($event, $eventArgs);
+        }
+
+        $testResult = parent::runTest();
+
+        // Clean the event handler again... just incase this time.
+        $this->handler->clearEvents();
+
+        return $testResult;
+    }
+
+}
diff --git a/plugins/Irc/extlib/phergie/Tests/Phergie/Plugin/TestNonInstantiablePluginFromFile.php b/plugins/Irc/extlib/phergie/Tests/Phergie/Plugin/TestNonInstantiablePluginFromFile.php
new file mode 100755
index 0000000000..f9bddd1516
--- /dev/null
+++ b/plugins/Irc/extlib/phergie/Tests/Phergie/Plugin/TestNonInstantiablePluginFromFile.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * Phergie
+ *
+ * PHP version 5
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.
+ * It is also available through the world-wide-web at this URL:
+ * http://phergie.org/license
+ *
+ * @category  Phergie
+ * @package   Phergie_Tests
+ * @author    Phergie Development Team <team@phergie.org>
+ * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
+ * @license   http://phergie.org/license New BSD License
+ * @link      http://pear.phergie.org/package/Phergie_Tests
+ */
+
+/**
+ * Creates a plugin on the filesystem that can be used by
+ * Phergie_Plugin_Handler's addPath utility to be located and loaded.
+ *
+ * @category Phergie
+ * @package  Phergie_Tests
+ * @author   Phergie Development Team <team@phergie.org>
+ * @license  http://phergie.org/license New BSD License
+ * @link     http://pear.phergie.org/package/Phergie_Tests
+ */
+class Phergie_Plugin_TestNonInstantiablePluginFromFile
+extends Phergie_Plugin_Abstract
+{
+    /**
+     * Private constructor to ensure that this class is not instantiable.
+     *
+     * @return void
+     */
+    private function __construct()
+    {
+    }
+}
diff --git a/plugins/Irc/extlib/phergie/Tests/TestHelper.php b/plugins/Irc/extlib/phergie/Tests/TestHelper.php
new file mode 100644
index 0000000000..6593539bc1
--- /dev/null
+++ b/plugins/Irc/extlib/phergie/Tests/TestHelper.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Phergie
+ *
+ * PHP version 5
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.
+ * It is also available through the world-wide-web at this URL:
+ * http://phergie.org/license
+ *
+ * @category  Phergie
+ * @package   Phergie_Tests 
+ * @author    Phergie Development Team <team@phergie.org>
+ * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
+ * @license   http://phergie.org/license New BSD License
+ * @link      http://pear.phergie.org/package/Phergie_Tests
+ */
+
+error_reporting(E_ALL | E_STRICT);
+
+// Phergie components require Phergie_Autoload to function correctly.
+require_once dirname(__FILE__) . '/../Phergie/Autoload.php';
+Phergie_Autoload::registerAutoloader();
diff --git a/plugins/Irc/extlib/phergie/Tests/phpunit.xml b/plugins/Irc/extlib/phergie/Tests/phpunit.xml
new file mode 100644
index 0000000000..b96589e4a1
--- /dev/null
+++ b/plugins/Irc/extlib/phergie/Tests/phpunit.xml
@@ -0,0 +1,26 @@
+<!--
+/**
+ * Phergie
+ *
+ * PHP version 5
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.
+ * It is also available through the world-wide-web at this URL:
+ * http://phergie.org/license
+ *
+ * @category  Phergie
+ * @package   Phergie_Tests
+ * @author    Phergie Development Team <team@phergie.org>
+ * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
+ * @license   http://phergie.org/license New BSD License
+ * @link      http://pear.phergie.org/package/Phergie_Tests
+ */
+-->
+<phpunit colors="true" bootstrap="./TestHelper.php">
+    <testsuite name="Phergie Test Suite">
+        <directory>./</directory>
+    </testsuite>
+</phpunit>
diff --git a/plugins/Irc/extlib/phergie/build.xml b/plugins/Irc/extlib/phergie/build.xml
new file mode 100644
index 0000000000..9b84014ed5
--- /dev/null
+++ b/plugins/Irc/extlib/phergie/build.xml
@@ -0,0 +1,298 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project name="Phergie" default="core">
+
+    <tstamp>
+        <format property="DSTAMP" pattern="%Y-%m-%d" />
+    </tstamp>
+
+    <taskdef name="phergiepkg" classname="PhergiePackageTask" />
+    <taskdef name="phpdocumentor" classname="phing.tasks.ext.phpdoc.PhpDocumentorTask" />
+
+    <available file="./build.properties" property="have_properties_file" />
+
+    <property name="clean" value="true" />
+
+    <target name="input">
+
+        <if>
+            <equals arg1="${have_properties_file}" arg2="true" />
+            <then>
+                <property file="./build.properties" />
+            </then>
+            <else>
+                <input propertyname="build.srcdir" defaultvalue="./" message="Source directory" /> 
+                <input propertyname="build.dstdir" defaultvalue="./" message="Destination directory" /> 
+                <input propertyname="build.version.release" message="Release version" />
+                <input propertyname="build.version.api" message="API version" />
+                <input propertyname="build.stability.release" defaultvalue="stable" message="Release stability" validArgs="snapshot,devel,alpha,beta,stable" />
+                <input propertyname="build.stability.api" defaultvalue="stable"  message="API stability" validArgs="snapshot,devel,alpha,beta,stable" />
+                <input propertyname="build.notes" message="Release notes" />
+                <input propertyname="build.phpdep" defaultvalue="5.2.0" message="PHP version required" />
+                <input propertyname="build.pearinstallerdep" defaultvalue="1.9.0" message="PEAR installer version required" />
+            </else>
+        </if>
+
+        <fileset dir="${build.srcdir}" id="core">
+            <include name="phergie.php" />
+            <include name="phergie.bat" />
+            <include name="LICENSE" />
+            <include name="Settings.php.dist" />
+            <include name="Phergie/Autoload.php" />
+            <include name="Phergie/Bot.php" />
+            <include name="Phergie/Config/Exception.php" />
+            <include name="Phergie/Config.php" />
+            <include name="Phergie/Connection/Exception.php" />
+            <include name="Phergie/Connection/Handler.php" />
+            <include name="Phergie/Connection.php" />
+            <include name="Phergie/Driver/Abstract.php" />
+            <include name="Phergie/Driver/Exception.php" />
+            <include name="Phergie/Driver/Streams.php" />
+            <include name="Phergie/Event/Abstract.php" />
+            <include name="Phergie/Event/Command.php" />
+            <include name="Phergie/Event/Exception.php" />
+            <include name="Phergie/Event/Handler.php" />
+            <include name="Phergie/Event/Request.php" />
+            <include name="Phergie/Event/Response.php" />
+            <include name="Phergie/Exception.php" />
+            <include name="Phergie/Hostmask/Exception.php" />
+            <include name="Phergie/Hostmask.php" />
+            <include name="Phergie/Plugin/Abstract.php" />
+            <include name="Phergie/Plugin/Exception.php" />
+            <include name="Phergie/Plugin/Handler.php" />
+            <include name="Phergie/Ui/Abstract.php" />
+            <include name="Phergie/Ui/Console.php" />
+        </fileset>
+
+    </target>
+
+    <target name="core" depends="input">
+
+        <property name="build.tmpdir" value="Phergie-${build.version.release}" />
+        <property name="build.tarball" value="${build.dstdir}${build.tmpdir}.tgz" />
+
+        <delete file="${build.tarball}" quiet="true" />
+
+        <mkdir dir="${build.tmpdir}" />
+
+        <copy todir="${build.tmpdir}">
+            <fileset refid="core" />
+        </copy>
+
+        <reflexive file="${build.tmpdir}/Phergie/Bot.php">
+            <filterchain>
+                <replaceregexp>
+                    <regexp
+                        pattern="const VERSION = '[^']+';"
+                        replace="const VERSION = '${build.version.release}';"
+                    />
+                </replaceregexp>
+            </filterchain>
+        </reflexive>
+
+        <phergiepkg name="Phergie" dir="${build.tmpdir}">
+            <fileset refid="core" />
+            <option name="baseinstalldir" value="/" />
+            <option name="outputdirectory" value="${build.dstdir}" />
+            <option name="channel" value="pear.phergie.org" />
+            <option name="summary" value="Phergie core library" />
+            <option name="description" value="The Phergie package provides all files necessary to run a basic IRC bot." />
+            <option name="apiversion" value="${build.version.api}" />
+            <option name="apistability" value="${build.stability.api}" />
+            <option name="releaseversion" value="${build.version.release}" />
+            <option name="releasestability" value="${build.stability.release}" />
+            <option name="phpdep" value="${build.phpdep}" />
+            <option name="pearinstallerdep" value="${build.pearinstallerdep}" />
+            <option name="license" value="http://phergie.org/license New BSD License" />
+            <option name="packagetype" value="php" />
+            <option name="notes" value="${build.notes}" />
+            <mapping name="replacements">
+                <element>
+                    <element key="path" value="phergie.php" />
+                    <element key="type" value="pear-config" />
+                    <element key="from" value="/usr/bin/env php" />
+                    <element key="to" value="php_bin" />
+                </element>
+                <element>
+                    <element key="path" value="phergie.bat" />
+                    <element key="type" value="pear-config" />
+                    <element key="from" value="@php_bin@" />
+                    <element key="to" value="php_bin" />
+                </element>
+                <element>
+                    <element key="path" value="phergie.bat" />
+                    <element key="type" value="pear-config" />
+                    <element key="from" value="@bin_dir@" />
+                    <element key="to" value="bin_dir" />
+                </element>
+            </mapping>
+            <mapping name="exceptions">
+                <element key="phergie.php" value="script" />
+                <element key="phergie.bat" value="script" />
+            </mapping>
+            <mapping name="releases">
+                <element>
+                    <element key="installconditions">
+                        <element key="os" value="windows" />
+                    </element>
+                    <element key="filelist">
+                        <element key="install">
+                            <element key="phergie.php" value="phergie" />
+                        </element>
+                    </element>
+                </element>
+                <element>
+                    <element key="filelist">
+                        <element key="install">
+                            <element key="phergie.php" value="phergie" />
+                        </element>
+                        <element key="ignore">
+                            <element value="phergie.bat" />
+                        </element>
+                    </element>
+                </element>
+            </mapping>
+            <mapping name="deps">
+                <element>
+                    <element key="type" value="ext" />
+                    <element key="name" value="pcre" />
+                </element>
+                <element>
+                    <element key="type" value="ext" />
+                    <element key="name" value="reflection" />
+                </element>
+            </mapping>
+        </phergiepkg>
+
+        <phingcall target="build" />
+
+        <phingcall target="clean" />
+
+    </target>
+
+    <target name="plugin" depends="input">
+        
+        <if>
+            <equals arg1="${have_properties_file}" arg2="true" />
+            <then>
+                <property file="./build.properties" />
+            </then>
+            <else>
+                <input propertyname="build.plugin" message="Short plugin name" />
+                <input propertyname="build.summary" message="Plugin summary" />
+                <input propertyname="build.description" message="Plugin description" />
+            </else>
+        </if>
+
+        <property name="build.class" value="Phergie_Plugin_${build.plugin}" />
+        <property name="build.tmpdir" value="${build.class}-${build.version.release}" />
+        <property name="build.tarball" value="${build.dstdir}${build.tmpdir}.tgz" />
+
+        <fileset dir="${build.srcdir}" id="plugin">
+            <include name="Phergie/Plugin/${build.plugin}.php" />
+            <include name="Phergie/Plugin/${build.plugin}/**" />
+        </fileset>
+
+        <delete file="${build.tarball}" quiet="true" />
+
+        <mkdir dir="${build.tmpdir}" />
+
+        <copy todir="${build.tmpdir}">
+            <fileset refid="plugin" />
+        </copy>
+
+        <phergiepkg name="${build.class}" dir="${build.tmpdir}">
+            <fileset refid="plugin" />
+            <option name="baseinstalldir" value="/" />
+            <option name="outputdirectory" value="${build.dstdir}" />
+            <option name="channel" value="pear.phergie.org"/>
+            <option name="summary" value="${build.summary}"/>
+            <option name="description" value="${build.description}"/>
+            <option name="apiversion" value="${build.version.api}"/>
+            <option name="apistability" value="${build.stability.api}"/>
+            <option name="releaseversion" value="${build.version.release}"/>
+            <option name="releasestability" value="${build.stability.release}"/>
+            <option name="phpdep" value="${build.phpdep}" />
+            <option name="pearinstallerdep" value="${build.pearinstallerdep}" />
+            <option name="license" value="http://phergie.org/license New BSD License"/>
+            <option name="packagetype" value="php"/>
+            <option name="notes" value="${build.notes}"/>
+        </phergiepkg>
+
+        <phingcall target="build" />
+
+        <phingcall target="clean" />
+
+    </target>
+
+    <target name="docs" depends="input">
+        
+        <property name="build.tmpdir" value="Phergie_Docs-${build.version.release}" />
+        <property name="build.tarball" value="${build.dstdir}${build.tmpdir}.tgz" />
+
+        <delete file="${build.tarball}" quiet="true" />
+
+        <mkdir dir="${build.tmpdir}" />
+
+        <phpdocumentor title="API Documentation"
+            destdir="${build.tmpdir}/api"
+            output="HTML:Smarty:PHP">
+            <fileset refid="core" />
+            <projdocfileset dir=".">
+                <include name="LICENSE" />
+            </projdocfileset>
+        </phpdocumentor>
+
+        <phergiepkg name="Phergie_Docs" dir="${build.tmpdir}">
+            <fileset dir="${build.tmpdir}">
+                <include name="api**" />
+            </fileset>
+            <option name="baseinstalldir" value="/" />
+            <option name="outputdirectory" value="${build.dstdir}" />
+            <option name="channel" value="pear.phergie.org" />
+            <option name="summary" value="Phergie core library documentation" />
+            <option name="description" value="The Phergie_Docs package provides documentation for the Phergie core libraries." />
+            <option name="apiversion" value="${build.version.api}" />
+            <option name="apistability" value="${build.stability.api}" />
+            <option name="releaseversion" value="${build.version.release}" />
+            <option name="releasestability" value="${build.stability.release}" />
+            <option name="phpdep" value="${build.phpdep}" />
+            <option name="pearinstallerdep" value="${build.pearinstallerdep}" />
+            <option name="license" value="http://phergie.org/license New BSD License" />
+            <option name="packagetype" value="php" />
+            <option name="notes" value="${build.notes}" />
+            <mapping name="exceptions">
+                <element key="api" value="doc" />
+            </mapping>
+        </phergiepkg>
+
+        <phingcall target="build" />
+
+        <phingcall target="clean" />
+
+    </target>
+
+    <target name="build">
+
+        <tar destfile="${build.tarball}" compression="gzip">
+            <fileset dir="${build.dstdir}">
+                <include name="${build.tmpdir}**" />
+                <include name="package.xml" />
+            </fileset>
+        </tar>
+
+    </target>
+
+    <target name="clean">
+
+        <if>
+            <istrue value="${clean}" />
+            <then>
+                <delete dir="${build.tmpdir}" />
+                <delete file="${build.dstdir}package.xml" />
+            </then>
+        </if>
+
+    </target>
+
+</project>
diff --git a/plugins/Irc/extlib/phergie/phergie.bat b/plugins/Irc/extlib/phergie/phergie.bat
new file mode 100644
index 0000000000..4eec11d5c7
--- /dev/null
+++ b/plugins/Irc/extlib/phergie/phergie.bat
@@ -0,0 +1,14 @@
+@echo off
+REM  Phergie 
+REM 
+REM  PHP version 5
+REM 
+REM  LICENSE
+REM 
+REM  This source file is subject to the new BSD license that is bundled
+REM  with this package in the file LICENSE.
+REM  It is also available through the world-wide-web at this URL:
+REM  http://phergie.org/license
+
+set PHPBIN="@php_bin@"
+%PHPBIN% "@bin_dir@\phergie" %*
diff --git a/plugins/Irc/extlib/phergie/phergie.php b/plugins/Irc/extlib/phergie/phergie.php
new file mode 100755
index 0000000000..f0b9f6ced5
--- /dev/null
+++ b/plugins/Irc/extlib/phergie/phergie.php
@@ -0,0 +1,54 @@
+#!/usr/bin/env php
+<?php
+/**
+ * Phergie 
+ *
+ * PHP version 5
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.
+ * It is also available through the world-wide-web at this URL:
+ * http://phergie.org/license
+ *
+ * @category  Phergie
+ * @package   Phergie
+ * @author    Phergie Development Team <team@phergie.org>
+ * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
+ * @license   http://phergie.org/license New BSD License
+ * @link      http://pear.phergie.org/package/Phergie
+ */
+
+/**
+ * @see Phergie_Autoload
+ */
+require 'Phergie/Autoload.php';
+Phergie_Autoload::registerAutoloader();
+
+$bot = new Phergie_Bot;
+
+if (!isset($argc)) {
+    echo
+        'The PHP setting register_argc_argv must be enabled for Phergie ', 
+        'configuration files to be specified using command line arguments; ',
+        'defaulting to Settings.php in the current working directory',
+        PHP_EOL;
+} else if ($argc > 0) {
+    // Skip the current file for manual installations
+    // ex: php phergie.php Settings.php
+    if (realpath($argv[0]) == __FILE__) {
+        array_shift($argv);
+    }
+
+    // If configuration files were specified, override default behavior
+    if (count($argv) > 0) {
+        $config = new Phergie_Config;
+        foreach ($argv as $file) {
+            $config->read($file);
+        }
+        $bot->setConfig($config);
+    }
+}
+
+$bot->run();

From 392ea6fd321a39e4f534baed33993c42a6df64df Mon Sep 17 00:00:00 2001
From: Luke Fitzgerald <lw.fitzgerald@googlemail.com>
Date: Wed, 16 Jun 2010 02:03:31 +0100
Subject: [PATCH 061/655] Correctly access length constants

---
 plugins/Msn/extlib/phpmsnclass/msn.class.php | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/plugins/Msn/extlib/phpmsnclass/msn.class.php b/plugins/Msn/extlib/phpmsnclass/msn.class.php
index 74a7e3eec1..967fa97874 100644
--- a/plugins/Msn/extlib/phpmsnclass/msn.class.php
+++ b/plugins/Msn/extlib/phpmsnclass/msn.class.php
@@ -42,6 +42,12 @@ class MSN {
     const DELMEMBER_URL = 'https://contacts.msn.com/abservice/SharingService.asmx';
     const DELMEMBER_SOAP = 'http://www.msn.com/webservices/AddressBook/DeleteMember';
     
+    // the message length (include header) is limited (maybe since WLM 8.5 released)
+    // for WLM: 1664 bytes
+    // for YIM: 518 bytes
+    const MAX_MSN_MESSAGE_LEN = 1664;
+    const MAX_YAHOO_MESSAGE_LEN = 518;
+    
     private $debug;
     private $timeout;
     
@@ -80,13 +86,6 @@ class MSN {
     private $font_co = '333333';
     private $font_ef = '';
 
-
-    // the message length (include header) is limited (maybe since WLM 8.5 released)
-    // for WLM: 1664 bytes
-    // for YIM: 518 bytes
-    const max_msn_message_len = 1664;
-    const max_yahoo_message_len = 518;
-
     // Begin added for StatusNet
 
     private $aContactList = array();
@@ -3013,9 +3012,9 @@ X-OIM-Sequence-Num: 1
         $msg_header = "MIME-Version: 1.0\r\nContent-Type: text/plain; charset=UTF-8\r\nX-MMS-IM-Format: FN=$this->font_fn; EF=$this->font_ef; CO=$this->font_co; CS=0; PF=22\r\n\r\n";
         $msg_header_len = strlen($msg_header);
         if ($network == 1)
-            $maxlen = $this->max_msn_message_len - $msg_header_len;
+            $maxlen = self::MAX_MSN_MESSAGE_LEN - $msg_header_len;
         else
-            $maxlen = $this->max_yahoo_message_len - $msg_header_len;
+            $maxlen = self::MAX_YAHOO_MESSAGE_LEN - $msg_header_len;
         $sMessage = str_replace("\r", '', $sMessage);
         $msg = substr($sMessage, 0, $maxlen);
         return $msg_header.$msg;

From 3d36f24b493417190215dd60df544389cc64845b Mon Sep 17 00:00:00 2001
From: Luke Fitzgerald <lw.fitzgerald@googlemail.com>
Date: Wed, 16 Jun 2010 02:11:39 +0100
Subject: [PATCH 062/655] Return true if OIM is sent successfully

---
 plugins/Msn/extlib/phpmsnclass/msn.class.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/Msn/extlib/phpmsnclass/msn.class.php b/plugins/Msn/extlib/phpmsnclass/msn.class.php
index 967fa97874..85b7b01784 100644
--- a/plugins/Msn/extlib/phpmsnclass/msn.class.php
+++ b/plugins/Msn/extlib/phpmsnclass/msn.class.php
@@ -1572,6 +1572,7 @@ class MSN {
                         continue;
                     }
                 }
+                return true;
             } else {
                 // Other network
                 return $this->sendOtherNetworkMessage($recipient, $message, $network);

From 242e8905cda3ce1328db58e673359b50fefbfe2d Mon Sep 17 00:00:00 2001
From: Luke Fitzgerald <lw.fitzgerald@googlemail.com>
Date: Wed, 16 Jun 2010 02:16:29 +0100
Subject: [PATCH 063/655] Fix indentation

---
 plugins/Msn/extlib/phpmsnclass/msn.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/Msn/extlib/phpmsnclass/msn.class.php b/plugins/Msn/extlib/phpmsnclass/msn.class.php
index 85b7b01784..45d6afabb1 100644
--- a/plugins/Msn/extlib/phpmsnclass/msn.class.php
+++ b/plugins/Msn/extlib/phpmsnclass/msn.class.php
@@ -1889,9 +1889,9 @@ X-OIM-Sequence-Num: 1
             //<faultstring>Exception of type 'System.Web.Services.Protocols.SoapException' was thrown.</faultstring>
             preg_match("#<faultstring>(.*)</faultstring>#", $data, $matches);
             if (count($matches) > 0)
-            $err_msg = $matches[1];
+                $err_msg = $matches[1];
             else
-            $err_msg = '';
+                $err_msg = '';
             $this->debug_message("*** OIM failed for $to");
             $this->debug_message("*** OIM Error code: $err_code");
             $this->debug_message("*** OIM Error Message: $err_msg");

From 47bc0ae4c42f4a6682d0e423838f4369496ae9b1 Mon Sep 17 00:00:00 2001
From: Luke Fitzgerald <lw.fitzgerald@googlemail.com>
Date: Wed, 16 Jun 2010 02:23:19 +0100
Subject: [PATCH 064/655] Implemented error checking in sendOtherNetworkMessage

---
 plugins/Msn/extlib/phpmsnclass/msn.class.php | 29 +++++++++++++-------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/plugins/Msn/extlib/phpmsnclass/msn.class.php b/plugins/Msn/extlib/phpmsnclass/msn.class.php
index 45d6afabb1..8049d4ca49 100644
--- a/plugins/Msn/extlib/phpmsnclass/msn.class.php
+++ b/plugins/Msn/extlib/phpmsnclass/msn.class.php
@@ -1497,9 +1497,12 @@ class MSN {
     private function sendOtherNetworkMessage($to, $message, $network) {
         $message = $this->getMessage($message, $network);
         $len = strlen($message);
-        // TODO Introduce error checking for message sending
-        $this->ns_writeln("UUM $this->id $to $network 1 $len");
-        $this->ns_writedata($Message);
+        if ($this->ns_writeln("UUM $this->id $to $network 1 $len") === false) {
+            return false;
+        }
+        if ($this->ns_writedata($Message)) {
+            return false;
+        }
         $this->debug_message("*** Sent to $to (network: $network):\n$Message");
         return true;
     }
@@ -2497,23 +2500,29 @@ X-OIM-Sequence-Num: 1
      * Also increments id
      * 
      * @param string $data Line to write to socket
-     * @return void
+     * @return mixed Bytes written or false on failure
      */
     private function ns_writeln($data) {
-        @fwrite($this->NSfp, $data."\r\n");
-        $this->debug_message("NS: >>> $data");
-        $this->id++;
+        $result = @fwrite($this->NSfp, $data."\r\n");
+        if ($result !== false) {
+            $this->debug_message("NS: >>> $data");
+            $this->id++;
+        }
+        return $result;
     }
 
     /**
      * Write data to NS socket
      * 
      * @param string $data Data to write to socket
-     * @return void
+     * @return mixed Bytes written or false on failure
      */
     private function ns_writedata($data) {
-        @fwrite($this->NSfp, $data);
-        $this->debug_message("NS: >>> $data");
+        $result = @fwrite($this->NSfp, $data);
+        if ($result !== false) {
+            $this->debug_message("NS: >>> $data");
+        }
+        return $result;
     }
 
     /**

From 7b998f4b2a21b86ae6a3a22e6e7891e2d98d3902 Mon Sep 17 00:00:00 2001
From: Luke Fitzgerald <lw.fitzgerald@googlemail.com>
Date: Wed, 16 Jun 2010 02:25:09 +0100
Subject: [PATCH 065/655] Reduced if statements used in sendOtherNetworkMessage

---
 plugins/Msn/extlib/phpmsnclass/msn.class.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/plugins/Msn/extlib/phpmsnclass/msn.class.php b/plugins/Msn/extlib/phpmsnclass/msn.class.php
index 8049d4ca49..c37b945e77 100644
--- a/plugins/Msn/extlib/phpmsnclass/msn.class.php
+++ b/plugins/Msn/extlib/phpmsnclass/msn.class.php
@@ -1497,10 +1497,8 @@ class MSN {
     private function sendOtherNetworkMessage($to, $message, $network) {
         $message = $this->getMessage($message, $network);
         $len = strlen($message);
-        if ($this->ns_writeln("UUM $this->id $to $network 1 $len") === false) {
-            return false;
-        }
-        if ($this->ns_writedata($Message)) {
+        if ($this->ns_writeln("UUM $this->id $to $network 1 $len") === false ||
+            $this->ns_writedata($Message) === false) {
             return false;
         }
         $this->debug_message("*** Sent to $to (network: $network):\n$Message");

From 6f388a8b500d069e39298cf705d59bad64eba6c5 Mon Sep 17 00:00:00 2001
From: Luke Fitzgerald <lw.fitzgerald@googlemail.com>
Date: Wed, 16 Jun 2010 02:28:13 +0100
Subject: [PATCH 066/655] Use correct array index access for
 switchBoardSessions in sendMessageToSBSession

---
 plugins/Msn/extlib/phpmsnclass/msn.class.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/plugins/Msn/extlib/phpmsnclass/msn.class.php b/plugins/Msn/extlib/phpmsnclass/msn.class.php
index c37b945e77..e38c3cc118 100644
--- a/plugins/Msn/extlib/phpmsnclass/msn.class.php
+++ b/plugins/Msn/extlib/phpmsnclass/msn.class.php
@@ -1392,7 +1392,6 @@ class MSN {
         $this->switchBoardSessionLookup[$to] = $socket;
 
         // Store the socket in the sessions array
-        $intsocket = (int) $socket;
         $this->switchBoardSessions[$to] = array(
             'to' => $to,
             'socket' => $socket,
@@ -1403,6 +1402,7 @@ class MSN {
         );
 
         // Change the index of the session to the socket
+        $intsocket = (int) $socket;
         $this->switchBoardSessions[$intsocket] = $this->switchBoardSessions[$to];
         unset($this->switchBoardSessions[$to]);
 
@@ -1457,13 +1457,13 @@ class MSN {
         if (self::socketcheck($socket)) {
             return false;
         }
-
-        if (!$this->switchBoardSessions[$to]['joined']) {
+        
+        $intsocket = (int) $socket;
+        if (!$this->switchBoardSessions[$intsocket]['joined']) {
             // If our participant has not joined the session yet we can't message them!
             return false;
         }
 
-        $intsocket = (int) $socket;
         $id = &$this->switchBoardSessions[$intsocket]['id'];
 
         $aMessage = $this->getMessage($Message);

From a6657392833469228522045254ba698417a15e6f Mon Sep 17 00:00:00 2001
From: Luke Fitzgerald <lw.fitzgerald@googlemail.com>
Date: Wed, 16 Jun 2010 02:31:51 +0100
Subject: [PATCH 067/655] Added error reporting to SB socket writes and call
 endSBSession if socket is dead when we try to send a message

---
 plugins/Msn/extlib/phpmsnclass/msn.class.php | 25 +++++++++++++-------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/plugins/Msn/extlib/phpmsnclass/msn.class.php b/plugins/Msn/extlib/phpmsnclass/msn.class.php
index e38c3cc118..378a3eb3ce 100644
--- a/plugins/Msn/extlib/phpmsnclass/msn.class.php
+++ b/plugins/Msn/extlib/phpmsnclass/msn.class.php
@@ -1455,6 +1455,7 @@ class MSN {
     private function sendMessageViaSB($to, $message) {
         $socket = $this->switchBoardSessionLookup[$to];
         if (self::socketcheck($socket)) {
+            $this->endSBSession($socket);
             return false;
         }
         
@@ -1467,10 +1468,10 @@ class MSN {
         $id = &$this->switchBoardSessions[$intsocket]['id'];
 
         $aMessage = $this->getMessage($Message);
-        //CheckEmotion...
+        // CheckEmotion...
         $MsnObjDefine=$this->GetMsnObjDefine($aMessage);
         if ($MsnObjDefine !== '') {
-            $SendString="MIME-Version: 1.0\r\nContent-Type: text/x-mms-emoticon\r\n\r\n$MsnObjDefine";
+            $SendString = "MIME-Version: 1.0\r\nContent-Type: text/x-mms-emoticon\r\n\r\n$MsnObjDefine";
             $len = strlen($SendString);
             // TODO handle failure during write to socket
             $this->sb_writeln($socket, $id, "MSG $id N $len");
@@ -2566,12 +2567,15 @@ X-OIM-Sequence-Num: 1
      * @param resource $socket SB socket
      * @param integer $id Reference to SB id
      * @param string $data Line to write
-     * @return void
+     * @return mixed Bytes written or false on error
      */
     private function sb_writeln($socket, &$id, $data) {
-        @fwrite($socket, $data."\r\n");
-        $this->debug_message("SB: >>> $data");
-        $id++;
+        $result = @fwrite($socket, $data."\r\n");
+        if ($result !== false) {
+            $this->debug_message("SB: >>> $data");
+            $id++;
+        }
+        return $result;
     }
 
     /**
@@ -2579,11 +2583,14 @@ X-OIM-Sequence-Num: 1
      * 
      * @param resource $socket SB socket
      * @param $data Data to write to socket
-     * @return void
+     * @return mixed Bytes written or false on error
      */
     private function sb_writedata($socket, $data) {
-        @fwrite($socket, $data);
-        $this->debug_message("SB: >>> $data");
+        $result = @fwrite($socket, $data);
+        if ($result !== false) {
+            $this->debug_message("SB: >>> $data");
+        }
+        return $result;
     }
 
     /**

From 50610c2611b16aced92539117b9021253dc150f9 Mon Sep 17 00:00:00 2001
From: Luke Fitzgerald <lw.fitzgerald@googlemail.com>
Date: Wed, 16 Jun 2010 14:15:08 +0100
Subject: [PATCH 068/655] Added some more error handling and commenting

---
 plugins/Msn/MsnPlugin.php                    |  5 +++++
 plugins/Msn/extlib/phpmsnclass/msn.class.php | 21 ++++++++++----------
 plugins/Msn/msnmanager.php                   |  8 ++++++++
 3 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/plugins/Msn/MsnPlugin.php b/plugins/Msn/MsnPlugin.php
index f00333d728..acbc6446e0 100644
--- a/plugins/Msn/MsnPlugin.php
+++ b/plugins/Msn/MsnPlugin.php
@@ -118,6 +118,11 @@ class MsnPlugin extends ImPlugin {
         }
     }
 
+    /*
+     * Start manager on daemon start
+     * 
+     * @return boolean
+     */
     public function onStartImDaemonIoManagers(&$classes) {
         parent::onStartImDaemonIoManagers(&$classes);
         $classes[] = new MsnManager($this); // handles sending/receiving
diff --git a/plugins/Msn/extlib/phpmsnclass/msn.class.php b/plugins/Msn/extlib/phpmsnclass/msn.class.php
index 378a3eb3ce..3d33340b22 100644
--- a/plugins/Msn/extlib/phpmsnclass/msn.class.php
+++ b/plugins/Msn/extlib/phpmsnclass/msn.class.php
@@ -1455,7 +1455,6 @@ class MSN {
     private function sendMessageViaSB($to, $message) {
         $socket = $this->switchBoardSessionLookup[$to];
         if (self::socketcheck($socket)) {
-            $this->endSBSession($socket);
             return false;
         }
         
@@ -1469,21 +1468,24 @@ class MSN {
 
         $aMessage = $this->getMessage($Message);
         // CheckEmotion...
-        $MsnObjDefine=$this->GetMsnObjDefine($aMessage);
+        $MsnObjDefine = $this->GetMsnObjDefine($aMessage);
         if ($MsnObjDefine !== '') {
             $SendString = "MIME-Version: 1.0\r\nContent-Type: text/x-mms-emoticon\r\n\r\n$MsnObjDefine";
             $len = strlen($SendString);
-            // TODO handle failure during write to socket
-            $this->sb_writeln($socket, $id, "MSG $id N $len");
-            $this->sb_writedata($socket, $SendString);
+
+            if ($this->sb_writeln($socket, $id, "MSG $id N $len") === false ||
+                $this->sb_writedata($socket, $SendString) === false) {
+                    return false;
+                }
         }
         $len = strlen($aMessage);
-        // TODO handle failure during write to socket
-        $this->sb_writeln($socket, $id, "MSG $id N $len");
-        $this->sb_writedata($socket, $aMessage);
+
+        if ($this->sb_writeln($socket, $id, "MSG $id N $len") === false ||
+            $this->sb_writedata($socket, $aMessage) === false) {
+                return false;
+            }
 
         // Don't close the SB session, we might as well leave it open
-
         return true;
     }
 
@@ -1995,7 +1997,6 @@ X-OIM-Sequence-Num: 1
                 $str = '<ml l="1"><d n="'.$u_domain.'"><c n="'.$u_name.'" l="'.$l.'" t="'.$network.'" /></d></ml>';
                 $len = strlen($str);
                 // NS: >>> ADL {id} {size}
-                //TODO introduce error checking
                 $this->ns_writeln("ADL $this->id $len");
                 $this->ns_writedata($str);
             }
diff --git a/plugins/Msn/msnmanager.php b/plugins/Msn/msnmanager.php
index 66152f0d2a..9826608ea6 100644
--- a/plugins/Msn/msnmanager.php
+++ b/plugins/Msn/msnmanager.php
@@ -134,7 +134,9 @@ class MsnManager extends ImManager {
 
     /**
      * Update the time till the next ping
+     * 
      * @param $data Time till next ping
+     * @return void
      */
     private function update_ping_time($data) {
         $pingInterval = $data;
@@ -173,6 +175,12 @@ class MsnManager extends ImManager {
         common_log(LOG_NOTICE, 'MSN reconnecting');
     }
 
+    /**
+     * Send a message using the daemon
+     * 
+     * @param $data Message
+     * @return boolean true on success
+     */
     function send_raw_message($data) {
         $this->connect();
         if (!$this->conn) {

From b313bc3cdefe72f038f5f4e6b163e1294c95ea1e Mon Sep 17 00:00:00 2001
From: Luke Fitzgerald <lw.fitzgerald@googlemail.com>
Date: Wed, 16 Jun 2010 17:12:20 +0100
Subject: [PATCH 069/655] Remove any existing switchboard sessions when we
 (re)signon

---
 plugins/Msn/extlib/phpmsnclass/msn.class.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/plugins/Msn/extlib/phpmsnclass/msn.class.php b/plugins/Msn/extlib/phpmsnclass/msn.class.php
index 3d33340b22..6dc1c49826 100644
--- a/plugins/Msn/extlib/phpmsnclass/msn.class.php
+++ b/plugins/Msn/extlib/phpmsnclass/msn.class.php
@@ -2,6 +2,7 @@
 /*
 
 phpmsnclass ver 2.0s
+Luke Fitzgerald <lw.fitzgerald@googlemail.com>
 
 Based on MSN class ver 2.0 by Tommy Wu, Ricky Su
 License: GPL
@@ -344,6 +345,10 @@ class MSN {
         /* FIXME Don't implement the signon as a loop or we could hang
         *        the queue handler! */
         $this->debug_message('*** Trying to connect to MSN network');
+        
+        // Remove any remaining switchboard sessions
+        $this->switchBoardSessions = array();
+        $this->switchBoardSessionLookup = array();
 
         while (true) {
             // Connect

From 6dbf0ab1fe355032bfa4c3858b6b75079a2d5dcf Mon Sep 17 00:00:00 2001
From: Luke Fitzgerald <lw.fitzgerald@googlemail.com>
Date: Wed, 16 Jun 2010 18:05:29 +0100
Subject: [PATCH 070/655] Add callback for status changes

---
 plugins/Msn/extlib/phpmsnclass/msn.class.php | 10 +++++++++-
 plugins/Msn/msnmanager.php                   | 17 +++++++++++++----
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/plugins/Msn/extlib/phpmsnclass/msn.class.php b/plugins/Msn/extlib/phpmsnclass/msn.class.php
index 6dc1c49826..05edf86d8b 100644
--- a/plugins/Msn/extlib/phpmsnclass/msn.class.php
+++ b/plugins/Msn/extlib/phpmsnclass/msn.class.php
@@ -900,6 +900,14 @@ class MSN {
                 $this->addContact($email, 1, $email, true);
                 $this->connectToSBSession('Passive', $sb_ip, $sb_port, $email, array('sid' => $sid, 'ticket' => $ticket));
                 break;
+            
+            case 'NLN':
+                // NS: <<< NLN {status} {email} {networkid} {nickname} {clientid} {dpobj}
+                // NS: <<< NLN NLN darkip@inflatablegoldfish.com 1 Luke 2685403136 0
+                @list(/* NLN */, $email, $network, $nickname, /* clientid */, /* dbobj */) = @explode(' ', $data);
+                $this->callHandler('StatusChange', array('screenname' => $email, 'network' => $network, 'nickname' => $nickname));
+                break;
+            
             case 'OUT':
                 // force logout from NS
                 // NS: <<< OUT xxx
@@ -3092,7 +3100,7 @@ X-OIM-Sequence-Num: 1
      *
      * Handler List
      * IMIn, Pong, ConnectFailed, Reconnect,
-     * AddedToList, RemovedFromList
+     * AddedToList, RemovedFromList, StatusChange
      *
      * @param string $event Event name
      * @param string $handler User function to call
diff --git a/plugins/Msn/msnmanager.php b/plugins/Msn/msnmanager.php
index 9826608ea6..8322cde32d 100644
--- a/plugins/Msn/msnmanager.php
+++ b/plugins/Msn/msnmanager.php
@@ -93,7 +93,7 @@ class MsnManager extends ImManager {
     *
     * @return void
     */
-    function connect() {
+    public function connect() {
         if (!$this->conn) {
             $this->conn = new MSN(
                 array(
@@ -161,7 +161,7 @@ class MsnManager extends ImManager {
     * @param void $data Not used (there to keep callback happy)
     * @return void
     */
-    function handle_connect_failed($data) {
+    private function handle_connect_failed($data) {
         common_log(LOG_NOTICE, 'MSN connect failed, retrying');
     }
 
@@ -171,9 +171,18 @@ class MsnManager extends ImManager {
     * @param void $data Not used (there to keep callback happy)
     * @return void
     */
-    function handle_reconnect($data) {
+    private function handle_reconnect($data) {
         common_log(LOG_NOTICE, 'MSN reconnecting');
     }
+    
+    /**
+     * Called by callback when contact changes status
+     * 
+     * @param array $data Data
+     */
+    private function handle_status_change($data) {
+        
+    }
 
     /**
      * Send a message using the daemon
@@ -181,7 +190,7 @@ class MsnManager extends ImManager {
      * @param $data Message
      * @return boolean true on success
      */
-    function send_raw_message($data) {
+    public function send_raw_message($data) {
         $this->connect();
         if (!$this->conn) {
             return false;

From d69aa725f760aeb6f07344c5f9cac9cd6d41dcd8 Mon Sep 17 00:00:00 2001
From: Luke Fitzgerald <lw.fitzgerald@googlemail.com>
Date: Wed, 16 Jun 2010 20:35:46 +0100
Subject: [PATCH 071/655] Remove callback method as we're not using status
 changes

---
 plugins/Msn/msnmanager.php | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/plugins/Msn/msnmanager.php b/plugins/Msn/msnmanager.php
index 8322cde32d..933213587c 100644
--- a/plugins/Msn/msnmanager.php
+++ b/plugins/Msn/msnmanager.php
@@ -148,7 +148,7 @@ class MsnManager extends ImManager {
     * Passes it back to the queuing system
     *
     * @param array $data Data
-    * @return void
+    * @return boolean
     */
     private function handle_msn_message($data) {
         $this->plugin->enqueue_incoming_raw($data);
@@ -175,15 +175,6 @@ class MsnManager extends ImManager {
         common_log(LOG_NOTICE, 'MSN reconnecting');
     }
     
-    /**
-     * Called by callback when contact changes status
-     * 
-     * @param array $data Data
-     */
-    private function handle_status_change($data) {
-        
-    }
-
     /**
      * Send a message using the daemon
      * 

From 6dd221957e1e3be4885f6abd8ee17d4380c0f07b Mon Sep 17 00:00:00 2001
From: Luke Fitzgerald <lw.fitzgerald@googlemail.com>
Date: Wed, 16 Jun 2010 20:58:27 +0100
Subject: [PATCH 072/655] Add comma to end of list and small cosmetic change

---
 plugins/Msn/extlib/phpmsnclass/msn.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/Msn/extlib/phpmsnclass/msn.class.php b/plugins/Msn/extlib/phpmsnclass/msn.class.php
index 05edf86d8b..0435905df4 100644
--- a/plugins/Msn/extlib/phpmsnclass/msn.class.php
+++ b/plugins/Msn/extlib/phpmsnclass/msn.class.php
@@ -894,7 +894,7 @@ class MSN {
                 // someone is trying to talk to us
                 // NS: <<< RNG {session_id} {server} {auth_type} {ticket} {email} {alias} U {client} 0
                 $this->debug_message("NS: <<< RNG $data");
-                @list(/* RNG */, $sid, $server, /* auth_type */, $ticket, $email, $name, ) = @explode(' ', $data);
+                @list(/* RNG */, $sid, $server, /* auth_type */, $ticket, $email, $name,) = @explode(' ', $data);
                 @list($sb_ip, $sb_port) = @explode(':', $server);
                 $this->debug_message("*** RING from $email, $sb_ip:$sb_port");
                 $this->addContact($email, 1, $email, true);
@@ -904,7 +904,7 @@ class MSN {
             case 'NLN':
                 // NS: <<< NLN {status} {email} {networkid} {nickname} {clientid} {dpobj}
                 // NS: <<< NLN NLN darkip@inflatablegoldfish.com 1 Luke 2685403136 0
-                @list(/* NLN */, $email, $network, $nickname, /* clientid */, /* dbobj */) = @explode(' ', $data);
+                @list(/* NLN */, $email, $network, $nickname, /* clientid */, /* dbobj */,) = @explode(' ', $data);
                 $this->callHandler('StatusChange', array('screenname' => $email, 'network' => $network, 'nickname' => $nickname));
                 break;
             

From 1a62d1b49378bba4b69476282b9a5d0e03073405 Mon Sep 17 00:00:00 2001
From: Craig Andrews <candrews@integralblue.com>
Date: Wed, 16 Jun 2010 16:00:54 -0400
Subject: [PATCH 073/655] Use presence of IM plugins to decide if "IM" options
 should be available

---
 actions/subscriptions.php     | 8 +++++---
 lib/connectsettingsaction.php | 4 +++-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/actions/subscriptions.php b/actions/subscriptions.php
index 7b10b3425b..da563a218f 100644
--- a/actions/subscriptions.php
+++ b/actions/subscriptions.php
@@ -185,7 +185,9 @@ class SubscriptionsListItem extends SubscriptionListItem
             return;
         }
 
-        if (!common_config('xmpp', 'enabled') && !common_config('sms', 'enabled')) {
+        $transports = array();
+        Event::handle('GetImTransports', array(&$transports));
+        if (!$transports && !common_config('sms', 'enabled')) {
             return;
         }
 
@@ -195,7 +197,7 @@ class SubscriptionsListItem extends SubscriptionListItem
                                           'action' => common_local_url('subedit')));
         $this->out->hidden('token', common_session_token());
         $this->out->hidden('profile', $this->profile->id);
-        if (common_config('xmpp', 'enabled')) {
+        if ($transports) {
             $attrs = array('name' => 'jabber',
                            'type' => 'checkbox',
                            'class' => 'checkbox',
@@ -205,7 +207,7 @@ class SubscriptionsListItem extends SubscriptionListItem
             }
 
             $this->out->element('input', $attrs);
-            $this->out->element('label', array('for' => 'jabber-'.$this->profile->id), _('Jabber'));
+            $this->out->element('label', array('for' => 'jabber-'.$this->profile->id), _('IM'));
         } else {
             $this->out->hidden('jabber', $sub->jabber);
         }
diff --git a/lib/connectsettingsaction.php b/lib/connectsettingsaction.php
index c3a88be552..5d62fc56b3 100644
--- a/lib/connectsettingsaction.php
+++ b/lib/connectsettingsaction.php
@@ -105,7 +105,9 @@ class ConnectSettingsNav extends Widget
 
             # action => array('prompt', 'title')
             $menu = array();
-            if (Event::handle('GetImTransports', array(&$transports))) {
+            $transports = array();
+            Event::handle('GetImTransports', array(&$transports));
+            if ($transports) {
                 $menu['imsettings'] =
                   array(_('IM'),
                         _('Updates by instant messenger (IM)'));

From f37228f413ad85fb30b7c9d4f79827a7fa6d2584 Mon Sep 17 00:00:00 2001
From: Luke Fitzgerald <lw.fitzgerald@googlemail.com>
Date: Sun, 20 Jun 2010 15:53:36 +0100
Subject: [PATCH 074/655] Use built in email verifier

---
 plugins/Msn/MsnPlugin.php                    | 7 +------
 plugins/Msn/extlib/phpmsnclass/msn.class.php | 6 +++---
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/plugins/Msn/MsnPlugin.php b/plugins/Msn/MsnPlugin.php
index acbc6446e0..b62481f761 100644
--- a/plugins/Msn/MsnPlugin.php
+++ b/plugins/Msn/MsnPlugin.php
@@ -89,12 +89,7 @@ class MsnPlugin extends ImPlugin {
      * @return boolean
      */
     public function validate($screenname) {
-        // RFC 2822 (simplified) regexp
-        if(preg_match('/[a-z0-9!#$%&\'*+\/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&\'*+\/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?/i', $screenname)) {
-            return true;
-        } else {
-            return false;
-        }
+        return Validate::email($screenname, common_config('email', 'check_domain'));
     }
 
     /**
diff --git a/plugins/Msn/extlib/phpmsnclass/msn.class.php b/plugins/Msn/extlib/phpmsnclass/msn.class.php
index 0435905df4..b809472119 100644
--- a/plugins/Msn/extlib/phpmsnclass/msn.class.php
+++ b/plugins/Msn/extlib/phpmsnclass/msn.class.php
@@ -871,7 +871,7 @@ class MSN {
 
                 $this->debug_message("NS: <<< XFR SB");
                 $user = array_shift($this->waitingForXFR);
-                            $bSBresult = $this->switchboard_control($ip, $port, $cki_code, $User, $Message);
+                $bSBresult = $this->switchboard_control($ip, $port, $cki_code, $User, $Message);
                 /*
                  $bSBresult = $this->switchboard_control($ip, $port, $cki_code, $aMSNUsers[$nCurrentUser], $sMessage);
                  if ($bSBresult === false) {
@@ -904,8 +904,8 @@ class MSN {
             case 'NLN':
                 // NS: <<< NLN {status} {email} {networkid} {nickname} {clientid} {dpobj}
                 // NS: <<< NLN NLN darkip@inflatablegoldfish.com 1 Luke 2685403136 0
-                @list(/* NLN */, $email, $network, $nickname, /* clientid */, /* dbobj */,) = @explode(' ', $data);
-                $this->callHandler('StatusChange', array('screenname' => $email, 'network' => $network, 'nickname' => $nickname));
+                @list(/* NLN */, $status, $email, $network, $nickname, /* clientid */, /* dbobj */,) = @explode(' ', $data);
+                $this->callHandler('StatusChange', array('screenname' => $email, 'status' => $status, 'network' => $network, 'nickname' => $nickname));
                 break;
             
             case 'OUT':

From dad0b06a386092b159118780a6a6801f3cf674de Mon Sep 17 00:00:00 2001
From: Craig Andrews <candrews@integralblue.com>
Date: Tue, 22 Jun 2010 22:01:13 -0400
Subject: [PATCH 075/655] Throw an error if queueing is disable when using an
 IM plugin

---
 lib/implugin.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/implugin.php b/lib/implugin.php
index 7125aaee8d..dafb8a416b 100644
--- a/lib/implugin.php
+++ b/lib/implugin.php
@@ -619,8 +619,13 @@ abstract class ImPlugin extends Plugin
 
     function initialize()
     {
+        if( ! common_config('queue', 'enabled'))
+        {
+            throw new ServerException("Queueing must be enabled to use IM plugins");
+        }
+
         if(is_null($this->transport)){
-            throw new Exception('transport cannot be null');
+            throw new ServerException('transport cannot be null');
         }
     }
 }

From c5ad04c865c4fa5017662212e3394944eb9c1da1 Mon Sep 17 00:00:00 2001
From: Luke Fitzgerald <lw.fitzgerald@googlemail.com>
Date: Tue, 22 Jun 2010 20:26:23 -0700
Subject: [PATCH 076/655] Lots of fixes for library. Almost have confirmation
 emails working

---
 plugins/Msn/MsnPlugin.php                    |  4 +-
 plugins/Msn/extlib/phpmsnclass/msn.class.php | 50 +++++++++-----------
 2 files changed, 24 insertions(+), 30 deletions(-)

diff --git a/plugins/Msn/MsnPlugin.php b/plugins/Msn/MsnPlugin.php
index b62481f761..8b20367139 100644
--- a/plugins/Msn/MsnPlugin.php
+++ b/plugins/Msn/MsnPlugin.php
@@ -51,8 +51,8 @@ class MsnPlugin extends ImPlugin {
     public $user = null;
     public $password = null;
     public $nickname = null;
-    public $transport = 'msnim';
-
+    public $transport = 'msn';
+    
     /**
      * Get the internationalized/translated display name of this IM service
      *
diff --git a/plugins/Msn/extlib/phpmsnclass/msn.class.php b/plugins/Msn/extlib/phpmsnclass/msn.class.php
index b809472119..5c79b31261 100644
--- a/plugins/Msn/extlib/phpmsnclass/msn.class.php
+++ b/plugins/Msn/extlib/phpmsnclass/msn.class.php
@@ -870,15 +870,8 @@ class MSN {
                 }
 
                 $this->debug_message("NS: <<< XFR SB");
-                $user = array_shift($this->waitingForXFR);
-                $bSBresult = $this->switchboard_control($ip, $port, $cki_code, $User, $Message);
-                /*
-                 $bSBresult = $this->switchboard_control($ip, $port, $cki_code, $aMSNUsers[$nCurrentUser], $sMessage);
-                 if ($bSBresult === false) {
-                 // error for switchboard
-                 $this->debug_message("!!! error for sending message to ".$aMSNUsers[$nCurrentUser]);
-                 $aOfflineUsers[] = $aMSNUsers[$nCurrentUser];
-                 }*/
+                $session = array_shift($this->waitingForXFR);
+                $this->connectToSBSession('Active', $ip, $port, $session['to'], array('cki' => $cki_code));
                 break;
             case 'QNG':
                 // NS: <<< QNG {time}
@@ -963,7 +956,7 @@ class MSN {
                 // we don't need the data, just ignore it
                 // request user to join this switchboard
                 // SB: >>> CAL {id} {user}
-                $this->sb_writeln($socket, $id, "CAL $this->id $user");
+                $this->sb_writeln($socket, $id, "CAL $id ".$session['to']);
                 break;
             case 'CAL':
                 // SB: <<< CAL {id} RINGING {?}
@@ -1116,7 +1109,7 @@ class MSN {
                         $footer = pack("L", 0);
                         $message = "MIME-Version: 1.0\r\nContent-Type: application/x-msnmsgrp2p\r\nP2P-Dest: $from_email\r\n\r\n$hdr$footer";
                         $len = strlen($message);
-                        $this->sb_writeln($socket, $id, "MSG $this->id D $len");
+                        $this->sb_writeln($socket, $id, "MSG $id D $len");
                         $this->sb_writedata($socket, $message);
                         $this->debug_message("*** p2p: send display picture acknowledgement for $hdr_SessionID");
                         $this->debug_message("*** p2p: Invite ACK message:\n".$this->dump_binary($message));
@@ -1154,7 +1147,7 @@ class MSN {
                             "MIME-Version: 1.0\r\n".
                             "Content-Type: application/x-msnmsgrp2p\r\n".
                             "P2P-Dest: $from_email\r\n\r\n$hdr$MessagePayload$footer";
-                        $this->sb_writeln($socket, $id, "MSG $this->id D ".strlen($message));
+                        $this->sb_writeln($socket, $id, "MSG $id D ".strlen($message));
                         $this->sb_writedata($socket, $message);
                         $this->debug_message("*** p2p: dump 200 ok message:\n".$this->dump_binary($message));
                         $this->sb_readln($socket); // Read ACK;
@@ -1181,7 +1174,7 @@ class MSN {
                             "MIME-Version: 1.0\r\n".
                             "Content-Type: application/x-msnmsgrp2p\r\n".
                             "P2P-Dest: $from_email\r\n\r\n$hdr".pack('L', 0)."$footer";
-                        $this->sb_writeln($socket, $id, "MSG $this->id D ".strlen($message));
+                        $this->sb_writeln($socket, $id, "MSG $id D ".strlen($message));
                         $this->sb_writedata($socket, $message);
                         $this->debug_message("*** p2p: dump send Data preparation message:\n".$this->dump_binary($message));
                         $this->debug_message("*** p2p: Data Prepare Hdr:\n".$this->dump_binary($hdr));
@@ -1213,7 +1206,7 @@ class MSN {
                                     "MIME-Version: 1.0\r\n".
                                     "Content-Type: application/x-msnmsgrp2p\r\n".
                                     "P2P-Dest: $from_email\r\n\r\n$hdr$FileContent$footer";
-                                $this->sb_writeln($socket, $id, "MSG $this->id D ".strlen($message));
+                                $this->sb_writeln($socket, $id, "MSG $id D ".strlen($message));
                                 $this->sb_writedata($socket, $message);
                                 $this->debug_message("*** p2p: dump send Data Content message  $Offset / $FileSize :\n".$this->dump_binary($message));
                                 $this->debug_message("*** p2p: Data Content Hdr:\n".$this->dump_binary($hdr));
@@ -1319,7 +1312,7 @@ class MSN {
                 $this->callHandler('IMin', array('sender' => $from_email, 'message' => $sMsg, 'network' => $network, 'offline' => false));
                 break;
             case '217':
-                $this->debug_message("*** User $user is offline. Trying OIM.");
+                $this->debug_message('*** User '.$session['to'].' is offline. Trying OIM.');
                 $session['offline'] = true;
                 break;
             default:
@@ -1379,7 +1372,7 @@ class MSN {
             'offline' => false,
             'XFRReqTime' => time()
         );
-        $this->waitingForXFR[] = &$this->switchBoardSessions[$to];
+        $this->waitingForXFR[$to] = &$this->switchBoardSessions[$to];
     }
 
     /**
@@ -1413,12 +1406,12 @@ class MSN {
             'offline' => false,
             'XFRReqTime' => time()
         );
-
+        
         // Change the index of the session to the socket
         $intsocket = (int) $socket;
         $this->switchBoardSessions[$intsocket] = $this->switchBoardSessions[$to];
         unset($this->switchBoardSessions[$to]);
-
+        
         $id = &$this->switchBoardSessions[$intsocket]['id'];
 
         if ($mode == 'Active') {
@@ -1479,7 +1472,7 @@ class MSN {
 
         $id = &$this->switchBoardSessions[$intsocket]['id'];
 
-        $aMessage = $this->getMessage($Message);
+        $aMessage = $this->getMessage($message);
         // CheckEmotion...
         $MsnObjDefine = $this->GetMsnObjDefine($aMessage);
         if ($MsnObjDefine !== '') {
@@ -1495,7 +1488,7 @@ class MSN {
 
         if ($this->sb_writeln($socket, $id, "MSG $id N $len") === false ||
             $this->sb_writedata($socket, $aMessage) === false) {
-                return false;
+            	return false;
             }
 
         // Don't close the SB session, we might as well leave it open
@@ -1533,16 +1526,17 @@ class MSN {
         if ($message != '') {
             list($name, $host, $network) = explode('@', $to);
             $network = $network == '' ? 1 : $network;
-            $recipient = $name.$host;
+            $recipient = $name.'@'.$host;
 
             if ($network === 1) {
-                if (!isset($this->switchBoardSessionLookup[$recipient]) && (!isset($this->switchBoardSessions[$recipient])
-                    || time() - $this->switchBoardSessions[$recipient]['XFRReqTime'] > $this->XFRReqTimeout)) {
-                    $this->debug_message("*** No existing SB session or request has timed out");
-                    $this->reqSBSession($recipient);
-                    return false;
+                if (!isset($this->switchBoardSessionLookup[$recipient])) {
+                   	if (!isset($this->switchBoardSessions[$recipient]) || time() - $this->switchBoardSessions[$recipient]['XFRReqTime'] > $this->XFRReqTimeout) {
+                   		$this->debug_message("*** No existing SB session or request has timed out");
+	                    $this->reqSBSession($recipient);
+                   	}
+                   	return false;
                 } else {
-                    $socket = $this->switchBoardSessionLookup[$to];
+                    $socket = $this->switchBoardSessionLookup[$recipient];
                     if ($this->switchBoardSessions[(int) $socket]['offline']) {
                         $this->debug_message("*** Contact ($recipient) offline, sending OIM");
                         $this->endSBSession($socket);
@@ -1555,7 +1549,7 @@ class MSN {
                             return true;
                         } else {
                             $this->debug_message('*** Message sending failed, requesting new SB session');
-                            $this->reqSBSession($to);
+                            $this->reqSBSession($recipient);
                             return false;
                         }
                     }

From 8175f0f3bf9fcc4c9432f9c0b78405b1e6768f9b Mon Sep 17 00:00:00 2001
From: Luke Fitzgerald <lw.fitzgerald@googlemail.com>
Date: Sat, 26 Jun 2010 12:55:32 -0700
Subject: [PATCH 077/655] Fixed a number of bugs in the library and wrapper -
 Seems to work!

---
 plugins/Msn/extlib/phpmsnclass/msn.class.php | 25 +++++++++-----------
 plugins/Msn/msnmanager.php                   | 12 +++++-----
 2 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/plugins/Msn/extlib/phpmsnclass/msn.class.php b/plugins/Msn/extlib/phpmsnclass/msn.class.php
index 5c79b31261..1c04ef7fc1 100644
--- a/plugins/Msn/extlib/phpmsnclass/msn.class.php
+++ b/plugins/Msn/extlib/phpmsnclass/msn.class.php
@@ -1309,7 +1309,7 @@ class MSN {
                     break;
                 }
                 $this->debug_message("*** MSG from $from_email: $sMsg");
-                $this->callHandler('IMin', array('sender' => $from_email, 'message' => $sMsg, 'network' => $network, 'offline' => false));
+                $this->callHandler('IMin', array('sender' => $from_email, 'message' => $sMsg, 'network' => 1, 'offline' => false));
                 break;
             case '217':
                 $this->debug_message('*** User '.$session['to'].' is offline. Trying OIM.');
@@ -1319,7 +1319,6 @@ class MSN {
                 if (is_numeric($code)) {
                     $this->error = "Error code: $code, please check the detail information from: http://msnpiki.msnfanatic.com/index.php/Reference:Error_List";
                     $this->debug_message("*** SB: $this->error");
-                    $sessionEnd=true;
                 }
                 break;
         }
@@ -1463,14 +1462,8 @@ class MSN {
         if (self::socketcheck($socket)) {
             return false;
         }
-        
-        $intsocket = (int) $socket;
-        if (!$this->switchBoardSessions[$intsocket]['joined']) {
-            // If our participant has not joined the session yet we can't message them!
-            return false;
-        }
 
-        $id = &$this->switchBoardSessions[$intsocket]['id'];
+        $id = &$this->switchBoardSessions[(int) $socket]['id'];
 
         $aMessage = $this->getMessage($message);
         // CheckEmotion...
@@ -1537,21 +1530,25 @@ class MSN {
                    	return false;
                 } else {
                     $socket = $this->switchBoardSessionLookup[$recipient];
-                    if ($this->switchBoardSessions[(int) $socket]['offline']) {
+                    $intsocket = (int) $socket;
+                    if ($this->switchBoardSessions[$intsocket]['offline']) {
                         $this->debug_message("*** Contact ($recipient) offline, sending OIM");
                         $this->endSBSession($socket);
                         return $this->sendMessage($recipient.'@Offline', $message);
                     } else {
+                    	if ($this->switchBoardSessions[$intsocket]['joined'] !== true) {
+                    		$this->debug_message("*** Recipient has not joined session, returning false");
+                    		return false;
+                    	}
+                    	
                         $this->debug_message("*** Attempting to send message to $recipient using existing SB session");
 
                         if ($this->sendMessageViaSB($recipient, $message)) {
                             $this->debug_message('*** Message sent successfully');
                             return true;
-                        } else {
-                            $this->debug_message('*** Message sending failed, requesting new SB session');
-                            $this->reqSBSession($recipient);
-                            return false;
                         }
+                        
+                        return false;
                     }
                 }
             } elseif ($network == 'Offline') {
diff --git a/plugins/Msn/msnmanager.php b/plugins/Msn/msnmanager.php
index 933213587c..6fc8f1556f 100644
--- a/plugins/Msn/msnmanager.php
+++ b/plugins/Msn/msnmanager.php
@@ -104,7 +104,7 @@ class MsnManager extends ImManager {
                     'debug' => true
                 )
             );
-            $this->conn->registerHandler("IMIn", array($this, 'handle_msn_message'));
+            $this->conn->registerHandler('IMin', array($this, 'handle_msn_message'));
             $this->conn->registerHandler('Pong', array($this, 'update_ping_time'));
             $this->conn->registerHandler('ConnectFailed', array($this, 'handle_connect_failed'));
             $this->conn->registerHandler('Reconnect', array($this, 'handle_reconnect'));
@@ -138,7 +138,7 @@ class MsnManager extends ImManager {
      * @param $data Time till next ping
      * @return void
      */
-    private function update_ping_time($data) {
+    public function update_ping_time($data) {
         $pingInterval = $data;
     }
 
@@ -150,7 +150,7 @@ class MsnManager extends ImManager {
     * @param array $data Data
     * @return boolean
     */
-    private function handle_msn_message($data) {
+    public function handle_msn_message($data) {
         $this->plugin->enqueue_incoming_raw($data);
         return true;
     }
@@ -161,7 +161,7 @@ class MsnManager extends ImManager {
     * @param void $data Not used (there to keep callback happy)
     * @return void
     */
-    private function handle_connect_failed($data) {
+    public function handle_connect_failed($data) {
         common_log(LOG_NOTICE, 'MSN connect failed, retrying');
     }
 
@@ -171,7 +171,7 @@ class MsnManager extends ImManager {
     * @param void $data Not used (there to keep callback happy)
     * @return void
     */
-    private function handle_reconnect($data) {
+    public function handle_reconnect($data) {
         common_log(LOG_NOTICE, 'MSN reconnecting');
     }
     
@@ -190,7 +190,7 @@ class MsnManager extends ImManager {
         if (!$this->conn->sendMessage($data['to'], $data['message'])) {
             return false;
         }
-
+        
         // Sending a command updates the time till next ping
         $this->lastping = time();
         $this->pingInterval = 50;

From bcb718cd31203f70c282ba9b55a60913e86f24e5 Mon Sep 17 00:00:00 2001
From: Luke Fitzgerald <lw.fitzgerald@googlemail.com>
Date: Mon, 28 Jun 2010 17:03:19 -0700
Subject: [PATCH 078/655] Fixed a bug where sessions were not cleared

---
 plugins/Msn/extlib/phpmsnclass/msn.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/Msn/extlib/phpmsnclass/msn.class.php b/plugins/Msn/extlib/phpmsnclass/msn.class.php
index 1c04ef7fc1..2c0c765f38 100644
--- a/plugins/Msn/extlib/phpmsnclass/msn.class.php
+++ b/plugins/Msn/extlib/phpmsnclass/msn.class.php
@@ -949,7 +949,7 @@ class MSN {
                 break;
             case 'BYE':
                 $this->debug_message("*** Quit for BYE");
-                $this->endSBSession();
+                $this->endSBSession($socket);
                 break;
             case 'USR':
                 // SB: <<< USR {id} OK {user} {alias}
@@ -2742,7 +2742,7 @@ X-OIM-Sequence-Num: 1
             $Attrib = '';
             if (is_array($Val[':'])) {
                 foreach ($Val[':'] as $AttribName => $AttribVal)
-                $Attrib .= " $AttribName = '$AttribVal'";
+                    $Attrib .= " $AttribName = '$AttribVal'";
             }
             if ($Key{0} == '!') {
                 //List Type Define

From 6aa8ce08ae86ba7bbae958fcd10d2e6a5a0aea30 Mon Sep 17 00:00:00 2001
From: Luke Fitzgerald <lw.fitzgerald@googlemail.com>
Date: Mon, 28 Jun 2010 17:17:51 -0700
Subject: [PATCH 079/655] Hide list error if network is not specified

---
 plugins/Msn/extlib/phpmsnclass/msn.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/Msn/extlib/phpmsnclass/msn.class.php b/plugins/Msn/extlib/phpmsnclass/msn.class.php
index 2c0c765f38..6cb917768f 100644
--- a/plugins/Msn/extlib/phpmsnclass/msn.class.php
+++ b/plugins/Msn/extlib/phpmsnclass/msn.class.php
@@ -1517,7 +1517,7 @@ class MSN {
      */
     public function sendMessage($to, $message) {
         if ($message != '') {
-            list($name, $host, $network) = explode('@', $to);
+            @list($name, $host, $network) = @explode('@', $to);
             $network = $network == '' ? 1 : $network;
             $recipient = $name.'@'.$host;
 

From 2e8a4e3a0f4cbbf56e8a80e92a01b83d9dec15df Mon Sep 17 00:00:00 2001
From: Luke Fitzgerald <lw.fitzgerald@googlemail.com>
Date: Tue, 29 Jun 2010 10:57:48 -0700
Subject: [PATCH 080/655] Added README file

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

diff --git a/plugins/Msn/README b/plugins/Msn/README
new file mode 100644
index 0000000000..1c799a253f
--- /dev/null
+++ b/plugins/Msn/README
@@ -0,0 +1,29 @@
+The MSN plugin allows users to send and receive notices over the MSN network.
+
+Installation
+============
+add "addPlugin('msn',
+    array('setting'=>'value', 'setting2'=>'value2', ...);"
+to the bottom of your config.php
+
+scripts/imdaemon.php included with StatusNet must be running. It will be started by
+the plugin along with their other daemons when you run scripts/startdaemons.sh.
+See the StatusNet README for more about queuing and daemons.
+
+Settings
+========
+user*: username (screenname) to use when logging into MSN
+password*: password for that user
+nickname*: nickname for the bot
+
+* required
+default values are in (parenthesis)
+
+Example
+=======
+addPlugin('msn', array(
+    'user' => '...',
+    'password' => '...',
+    'nickname' => '...'
+));
+

From 7ac937e8e00b83135c6473496dcbbf9d3bef8bdd Mon Sep 17 00:00:00 2001
From: Luke Fitzgerald <lw.fitzgerald@googlemail.com>
Date: Tue, 29 Jun 2010 11:14:26 -0700
Subject: [PATCH 081/655] Added required PHP extensions to README

---
 plugins/Msn/README | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/plugins/Msn/README b/plugins/Msn/README
index 1c799a253f..fa7bc2fb22 100644
--- a/plugins/Msn/README
+++ b/plugins/Msn/README
@@ -1,5 +1,8 @@
 The MSN plugin allows users to send and receive notices over the MSN network.
 
+Required PHP extensions:
+curl pcre mhash mcrypt bcmath
+
 Installation
 ============
 add "addPlugin('msn',

From 4c3b42096939306e4901dd320ac76a1c1d901e48 Mon Sep 17 00:00:00 2001
From: Luke Fitzgerald <lw.fitzgerald@googlemail.com>
Date: Tue, 29 Jun 2010 17:06:44 -0700
Subject: [PATCH 082/655] Fixed warning thrown and simplified list calls

---
 plugins/Msn/extlib/phpmsnclass/msn.class.php | 38 +++++++++++---------
 1 file changed, 22 insertions(+), 16 deletions(-)

diff --git a/plugins/Msn/extlib/phpmsnclass/msn.class.php b/plugins/Msn/extlib/phpmsnclass/msn.class.php
index 6cb917768f..6d7b95b72b 100644
--- a/plugins/Msn/extlib/phpmsnclass/msn.class.php
+++ b/plugins/Msn/extlib/phpmsnclass/msn.class.php
@@ -262,7 +262,7 @@ class MSN {
                     $this->user = $user;
                     $this->password = $password;
                     // NS: <<< USR {id} SSO S {policy} {nonce}
-                    @list(/* USR */, /* id */, /* SSO */, /* S */, $policy, $nonce,) = @explode(' ', $data);
+                    @list(/* USR */, /* id */, /* SSO */, /* S */, $policy, $nonce) = @explode(' ', $data);
 
                     $this->passport_policy = $policy;
                     $aTickets = $this->get_passport_ticket();
@@ -291,7 +291,7 @@ class MSN {
                     // NS: <<< XFR {id} NS {server} 0 {server}
                     // MSNP15
                     // NS: <<< XFR {id} NS {server} U D
-                    @list(/* XFR */, /* id */, $Type, $server, /* ... */) = @explode(' ', $data);
+                    @list(/* XFR */, /* id */, $Type, $server) = @explode(' ', $data);
                     if ($Type!='NS') break;
                     @list($ip, $port) = @explode(':', $server);
                     // this connection will close after XFR
@@ -313,7 +313,7 @@ class MSN {
                 case 'GCF':
                     // return some policy data after 'USR {id} SSO I {user}' command
                     // NS: <<< GCF 0 {size}
-                    @list(/* GCF */, /* 0 */, $size,) = @explode(' ', $data);
+                    @list(/* GCF */, /* 0 */, $size) = @explode(' ', $data);
                     // we don't need the data, just read it and drop
                     if (is_numeric($size) && $size > 0)
                         $this->ns_readdata($size);
@@ -550,7 +550,7 @@ class MSN {
 
             case 'LST':
                 // NS: <<< LST {email} {alias} 11 0
-                @list(/* LST */, $email, /* alias */,) = @explode(' ', $data);
+                @list(/* LST */, $email) = @explode(' ', $data);
                 @list($u_name, $u_domain) = @explode('@', $email);
                 if (!isset($this->aContactList[$u_domain][$u_name][1])) {
                     $this->aContactList[$u_domain][$u_name][1]['Allow'] = 'Allow';
@@ -561,7 +561,7 @@ class MSN {
             case 'ADL':
                 // randomly, we get ADL command, someone add us to their contact list for MSNP15
                 // NS: <<< ADL 0 {size}
-                @list(/* ADL */, /* 0 */, $size,) = @explode(' ', $data);
+                @list(/* ADL */, /* 0 */, $size) = @explode(' ', $data);
                 if (is_numeric($size) && $size > 0) {
                     $data = $this->ns_readdata($size);
                     preg_match('#<ml><d n="([^"]+)"><c n="([^"]+)"(.*) t="(\d*)"(.*) /></d></ml>#', $data, $matches);
@@ -613,7 +613,7 @@ class MSN {
             case 'RML':
                 // randomly, we get RML command, someome remove us to their contact list for MSNP15
                 // NS: <<< RML 0 {size}
-                @list(/* RML */, /* 0 */, $size,) = @explode(' ', $data);
+                @list(/* RML */, /* 0 */, $size) = @explode(' ', $data);
                 if (is_numeric($size) && $size > 0) {
                     $data = $this->ns_readdata($size);
                     preg_match('#<ml><d n="([^"]+)"><c n="([^"]+)"(.*) t="(\d*)"(.*) /></d></ml>#', $data, $matches);
@@ -643,7 +643,7 @@ class MSN {
             case 'MSG':
                 // randomly, we get MSG notification from server
                 // NS: <<< MSG Hotmail Hotmail {size}
-                @list(/* MSG */, /* Hotmail */, /* Hotmail */, $size,) = @explode(' ', $data);
+                @list(/* MSG */, /* Hotmail */, /* Hotmail */, $size) = @explode(' ', $data);
                 if (is_numeric($size) && $size > 0) {
                     $data = $this->ns_readdata($size);
                     $aLines = @explode("\n", $data);
@@ -788,7 +788,7 @@ class MSN {
             case 'UBM':
                 // randomly, we get UBM, this is the message from other network, like Yahoo!
                 // NS: <<< UBM {email} $network $type {size}
-                @list(/* UBM */, $from_email, $network, $type, $size,) = @explode(' ', $data);
+                @list(/* UBM */, $from_email, $network, $type, $size) = @explode(' ', $data);
                 if (is_numeric($size) && $size > 0) {
                     $data = $this->ns_readdata($size);
                     $aLines = @explode("\n", $data);
@@ -827,7 +827,7 @@ class MSN {
             case 'UBX':
                 // randomly, we get UBX notification from server
                 // NS: <<< UBX email {network} {size}
-                @list(/* UBX */, /* email */, /* network */, $size,) = @explode(' ', $data);
+                @list(/* UBX */, /* email */, /* network */, $size) = @explode(' ', $data);
                 // we don't need the notification data, so just ignore it
                 if (is_numeric($size) && $size > 0)
                     $this->ns_readdata($size);
@@ -836,7 +836,7 @@ class MSN {
             case 'CHL':
                 // randomly, we'll get challenge from server
                 // NS: <<< CHL 0 {code}
-                @list(/* CHL */, /* 0 */, $chl_code,) = @explode(' ', $data);
+                @list(/* CHL */, /* 0 */, $chl_code) = @explode(' ', $data);
                 $fingerprint = $this->getChallenge($chl_code);
                 // NS: >>> QRY {id} {product_id} 32
                 // NS: >>> fingerprint
@@ -860,7 +860,7 @@ class MSN {
                 // NS: <<< XFR {id} NS {server} U D
                 // for normal switchboard XFR
                 // NS: <<< XFR {id} SB {server} CKI {cki} U messenger.msn.com 0
-                @list(/* XFR */, /* {id} */, $server_type, $server, /* CKI */, $cki_code, /* ... */) = @explode(' ', $data);
+                @list(/* XFR */, /* {id} */, $server_type, $server, /* CKI */, $cki_code) = @explode(' ', $data);
                 @list($ip, $port) = @explode(':', $server);
                 if ($server_type != 'SB') {
                     // maybe exit?
@@ -887,7 +887,7 @@ class MSN {
                 // someone is trying to talk to us
                 // NS: <<< RNG {session_id} {server} {auth_type} {ticket} {email} {alias} U {client} 0
                 $this->debug_message("NS: <<< RNG $data");
-                @list(/* RNG */, $sid, $server, /* auth_type */, $ticket, $email, $name,) = @explode(' ', $data);
+                @list(/* RNG */, $sid, $server, /* auth_type */, $ticket, $email, $name) = @explode(' ', $data);
                 @list($sb_ip, $sb_port) = @explode(':', $server);
                 $this->debug_message("*** RING from $email, $sb_ip:$sb_port");
                 $this->addContact($email, 1, $email, true);
@@ -897,7 +897,7 @@ class MSN {
             case 'NLN':
                 // NS: <<< NLN {status} {email} {networkid} {nickname} {clientid} {dpobj}
                 // NS: <<< NLN NLN darkip@inflatablegoldfish.com 1 Luke 2685403136 0
-                @list(/* NLN */, $status, $email, $network, $nickname, /* clientid */, /* dbobj */,) = @explode(' ', $data);
+                @list(/* NLN */, $status, $email, $network, $nickname) = @explode(' ', $data);
                 $this->callHandler('StatusChange', array('screenname' => $email, 'status' => $status, 'network' => $network, 'nickname' => $nickname));
                 break;
             
@@ -972,7 +972,7 @@ class MSN {
                 break;
             case 'MSG':
                 // SB: <<< MSG {email} {alias} {len}
-                @list(/* MSG */, $from_email, /* alias */, $len, ) = @explode(' ', $data);
+                @list(/* MSG */, $from_email, /* alias */, $len) = @explode(' ', $data);
                 $len = trim($len);
                 $data = $this->sb_readdata($socket, $len);
                 $aLines = @explode("\n", $data);
@@ -1517,8 +1517,14 @@ class MSN {
      */
     public function sendMessage($to, $message) {
         if ($message != '') {
-            @list($name, $host, $network) = @explode('@', $to);
-            $network = $network == '' ? 1 : $network;
+        	$toParts = explode('@', $to);
+        	if(count($toParts) < 3) {
+        		list($name, $host) = $toParts;
+        		$network = 1;
+        	} else {
+        		list($name, $host, $network) = $toParts;
+        	}
+        	
             $recipient = $name.'@'.$host;
 
             if ($network === 1) {

From 9a7c60a3e2160297c7fceaa5f535ce9e7085f61e Mon Sep 17 00:00:00 2001
From: Luke Fitzgerald <lw.fitzgerald@googlemail.com>
Date: Wed, 30 Jun 2010 09:18:44 -0700
Subject: [PATCH 083/655] Added wait on signon failure due to update contacts
 failing

---
 plugins/Msn/extlib/phpmsnclass/msn.class.php | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/plugins/Msn/extlib/phpmsnclass/msn.class.php b/plugins/Msn/extlib/phpmsnclass/msn.class.php
index 6d7b95b72b..350d7fca9b 100644
--- a/plugins/Msn/extlib/phpmsnclass/msn.class.php
+++ b/plugins/Msn/extlib/phpmsnclass/msn.class.php
@@ -271,7 +271,7 @@ class MSN {
                         // NS: >>> OUT
                         $this->ns_writeln("OUT");
                         @fclose($this->NSfp);
-                        $this->error = 'Passport authenticated fail!';
+                        $this->error = 'Passport authentication failed!';
                         return false;
                     }
 
@@ -358,7 +358,10 @@ class MSN {
             }
 
             // Update contacts
-            if ($this->UpdateContacts() === false) continue;
+            if ($this->UpdateContacts() === false) {
+                $this->signonFailure('');
+                continue;
+            }
 
             // Get membership lists
             if (($this->aContactList = $this->getMembershipList()) === false) {
@@ -480,7 +483,9 @@ class MSN {
     * @return void
     */
     private function signonFailure($message) {
-        $this->debug_message($message);
+    	if(!empty($message)) {
+            $this->debug_message($message);
+    	}
         $this->callHandler('ConnectFailed');
         $this->NSRetryWait($this->retry_wait);
     }

From bf6ecfbffc795c1f5b011751a7f4dc8a9d0c14f1 Mon Sep 17 00:00:00 2001
From: Luke Fitzgerald <lw.fitzgerald@googlemail.com>
Date: Wed, 30 Jun 2010 09:33:29 -0700
Subject: [PATCH 084/655] Updated phergie library

---
 .../Irc/extlib/phergie/Phergie/Autoload.php   |  13 +-
 plugins/Irc/extlib/phergie/Phergie/Bot.php    |  36 +-
 .../Irc/extlib/phergie/Phergie/Connection.php |  88 ++-
 .../extlib/phergie/Phergie/Db/Exception.php   |  39 +
 .../Irc/extlib/phergie/Phergie/Db/Manager.php |  49 ++
 .../Irc/extlib/phergie/Phergie/Db/Sqlite.php  | 117 +++
 .../phergie/Phergie/Driver/Exception.php      |   5 +
 .../extlib/phergie/Phergie/Driver/Streams.php |  87 ++-
 .../extlib/phergie/Phergie/Event/Handler.php  |  38 +-
 .../extlib/phergie/Phergie/Event/Request.php  |  44 +-
 .../phergie/Phergie/Plugin/Abstract.php       |  91 ++-
 .../extlib/phergie/Phergie/Plugin/Censor.php  | 108 +++
 .../extlib/phergie/Phergie/Plugin/Cron.php    | 147 ++++
 .../phergie/Phergie/Plugin/Exception.php      |  38 +-
 .../extlib/phergie/Phergie/Plugin/Google.php  |  73 +-
 .../extlib/phergie/Phergie/Plugin/Handler.php | 152 ++--
 .../extlib/phergie/Phergie/Plugin/Help.php    |  36 +-
 .../phergie/Phergie/Plugin/Http/Response.php  |  53 ++
 .../Irc/extlib/phergie/Phergie/Plugin/Php.php |  10 +-
 .../Phergie/Plugin/Php/Source/Local.php       |  17 +-
 .../extlib/phergie/Phergie/Plugin/Reload.php  |  96 +++
 .../extlib/phergie/Phergie/Plugin/Remind.php  |  46 +-
 .../phergie/Phergie/Plugin/SpellCheck.php     | 120 +++
 .../Irc/extlib/phergie/Phergie/Plugin/Tld.php | 261 +++++++
 .../Irc/extlib/phergie/Phergie/Plugin/Url.php | 128 +--
 .../Phergie/Plugin/Url/Shorten/Abstract.php   |  70 +-
 .../Phergie/Plugin/Url/Shorten/Trim.php       |  28 +-
 .../phergie/Phergie/Plugin/Url/url.tld.txt    | 273 +++++++
 .../extlib/phergie/Phergie/Plugin/Weather.php | 132 ++++
 plugins/Irc/extlib/phergie/Settings.php.dist  |  61 +-
 .../Tests/Phergie/Plugin/HandlerTest.php      | 726 ++++++++++++------
 .../phergie/Tests/Phergie/Plugin/Mock.php     |  24 +-
 .../Tests/Phergie/Plugin/SpellCheckTest.php   | 205 +++++
 .../Irc/extlib/phergie/Tests/TestHelper.php   |   2 +-
 plugins/Irc/extlib/phergie/build.xml          |   3 +
 35 files changed, 2765 insertions(+), 651 deletions(-)
 create mode 100644 plugins/Irc/extlib/phergie/Phergie/Db/Exception.php
 create mode 100755 plugins/Irc/extlib/phergie/Phergie/Db/Manager.php
 create mode 100644 plugins/Irc/extlib/phergie/Phergie/Db/Sqlite.php
 create mode 100755 plugins/Irc/extlib/phergie/Phergie/Plugin/Censor.php
 create mode 100644 plugins/Irc/extlib/phergie/Phergie/Plugin/Cron.php
 create mode 100755 plugins/Irc/extlib/phergie/Phergie/Plugin/Reload.php
 create mode 100644 plugins/Irc/extlib/phergie/Phergie/Plugin/SpellCheck.php
 create mode 100644 plugins/Irc/extlib/phergie/Phergie/Plugin/Tld.php
 create mode 100644 plugins/Irc/extlib/phergie/Phergie/Plugin/Url/url.tld.txt
 create mode 100755 plugins/Irc/extlib/phergie/Phergie/Plugin/Weather.php
 create mode 100644 plugins/Irc/extlib/phergie/Tests/Phergie/Plugin/SpellCheckTest.php

diff --git a/plugins/Irc/extlib/phergie/Phergie/Autoload.php b/plugins/Irc/extlib/phergie/Phergie/Autoload.php
index b03fe2ae10..0004f44e22 100755
--- a/plugins/Irc/extlib/phergie/Phergie/Autoload.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Autoload.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Phergie 
+ * Phergie
  *
  * PHP version 5
  *
@@ -11,7 +11,7 @@
  * It is also available through the world-wide-web at this URL:
  * http://phergie.org/license
  *
- * @category  Phergie 
+ * @category  Phergie
  * @package   Phergie
  * @author    Phergie Development Team <team@phergie.org>
  * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
@@ -22,7 +22,7 @@
 /**
  * Autoloader for Phergie classes.
  *
- * @category Phergie 
+ * @category Phergie
  * @package  Phergie
  * @author   Phergie Development Team <team@phergie.org>
  * @license  http://phergie.org/license New BSD License
@@ -37,9 +37,9 @@ class Phergie_Autoload
      */
     public function __construct()
     {
-        $path = dirname(__FILE__);
+        $path = realpath(dirname(__FILE__) . '/..');
         $includePath = get_include_path();
-        $includePathList = explode(PATH_SEPARATOR, $includePath); 
+        $includePathList = explode(PATH_SEPARATOR, $includePath);
         if (!in_array($path, $includePathList)) {
             self::addPath($path);
         }
@@ -54,9 +54,6 @@ class Phergie_Autoload
      */
     public function load($class)
     {
-        if (substr($class, 0, 8) == 'Phergie_') {
-            $class = substr($class, 8);
-        }
         include str_replace('_', DIRECTORY_SEPARATOR, $class) . '.php';
     }
 
diff --git a/plugins/Irc/extlib/phergie/Phergie/Bot.php b/plugins/Irc/extlib/phergie/Phergie/Bot.php
index 153bd55905..85e8a00fc9 100755
--- a/plugins/Irc/extlib/phergie/Phergie/Bot.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Bot.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Phergie 
+ * Phergie
  *
  * PHP version 5
  *
@@ -11,7 +11,7 @@
  * It is also available through the world-wide-web at this URL:
  * http://phergie.org/license
  *
- * @category  Phergie 
+ * @category  Phergie
  * @package   Phergie
  * @author    Phergie Development Team <team@phergie.org>
  * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
@@ -22,7 +22,7 @@
 /**
  * Composite class for other components to represent the bot.
  *
- * @category Phergie 
+ * @category Phergie
  * @package  Phergie
  * @author   Phergie Development Team <team@phergie.org>
  * @license  http://phergie.org/license New BSD License
@@ -50,9 +50,9 @@ class Phergie_Bot
     protected $config;
 
     /**
-     * Current connection handler instance 
+     * Current connection handler instance
      *
-     * @var Phergie_Connection_Handler 
+     * @var Phergie_Connection_Handler
      */
     protected $connections;
 
@@ -85,7 +85,7 @@ class Phergie_Bot
     protected $processor;
 
     /**
-     * Returns a driver instance, creating one of the default class if 
+     * Returns a driver instance, creating one of the default class if
      * none has been set.
      *
      * @return Phergie_Driver_Abstract
@@ -135,14 +135,14 @@ class Phergie_Bot
     }
 
     /**
-     * Returns the entire configuration in use or the value of a specific 
+     * Returns the entire configuration in use or the value of a specific
      * configuration setting.
      *
-     * @param string $index   Optional index of a specific configuration 
+     * @param string $index   Optional index of a specific configuration
      *        setting for which the corresponding value should be returned
      * @param mixed  $default Value to return if no match is found for $index
      *
-     * @return mixed Value corresponding to $index or the entire 
+     * @return mixed Value corresponding to $index or the entire
      *         configuration if $index is not specified
      */
     public function getConfig($index = null, $default = null)
@@ -219,7 +219,7 @@ class Phergie_Bot
     }
 
     /**
-     * Returns a connection handler instance, creating it if it does not 
+     * Returns a connection handler instance, creating it if it does not
      * already exist and using a default class if none has been set.
      *
      * @return Phergie_Connection_Handler
@@ -246,7 +246,7 @@ class Phergie_Bot
     }
 
     /**
-     * Returns an end-user interface instance, creating it if it does not 
+     * Returns an end-user interface instance, creating it if it does not
      * already exist and using a default class if none has been set.
      *
      * @return Phergie_Ui_Abstract
@@ -273,7 +273,7 @@ class Phergie_Bot
     }
 
     /**
-     * Returns a processer instance, creating one if none exists. 
+     * Returns a processer instance, creating one if none exists.
      *
      * @return Phergie_Process_Abstract
      */
@@ -281,14 +281,14 @@ class Phergie_Bot
     {
         if (empty($this->processor)) {
             $class = 'Phergie_Process_Standard';
-            
+
             $type = $this->getConfig('processor');
             if (!empty($type)) {
                 $class = 'Phergie_Process_' . ucfirst($type);
             }
 
             $this->processor = new $class(
-                $this, 
+                $this,
                 $this->getConfig('processor.options', array())
             );
         }
@@ -318,7 +318,7 @@ class Phergie_Bot
         $config = $this->getConfig();
         $plugins = $this->getPluginHandler();
         $ui = $this->getUi();
-        
+
         $plugins->setAutoload($config['plugins.autoload']);
         foreach ($config['plugins'] as $name) {
             try {
@@ -358,15 +358,15 @@ class Phergie_Bot
     }
 
     /**
-     * Establishes server connections and initiates an execution loop to 
+     * Establishes server connections and initiates an execution loop to
      * continuously receive and process events.
      *
-     * @return Phergie_Bot Provides a fluent interface 
+     * @return Phergie_Bot Provides a fluent interface
      */
     public function run()
     {
         set_time_limit(0);
-        
+
         $timezone = $this->getConfig('timezone', 'UTC');
         date_default_timezone_set($timezone);
 
diff --git a/plugins/Irc/extlib/phergie/Phergie/Connection.php b/plugins/Irc/extlib/phergie/Phergie/Connection.php
index 80f91e8da5..d6c89ea801 100755
--- a/plugins/Irc/extlib/phergie/Phergie/Connection.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Connection.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Phergie 
+ * Phergie
  *
  * PHP version 5
  *
@@ -11,7 +11,7 @@
  * It is also available through the world-wide-web at this URL:
  * http://phergie.org/license
  *
- * @category  Phergie 
+ * @category  Phergie
  * @package   Phergie
  * @author    Phergie Development Team <team@phergie.org>
  * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
@@ -22,7 +22,7 @@
 /**
  * Data structure for connection metadata.
  *
- * @category Phergie 
+ * @category Phergie
  * @package  Phergie
  * @author   Phergie Development Team <team@phergie.org>
  * @license  http://phergie.org/license New BSD License
@@ -38,7 +38,7 @@ class Phergie_Connection
     protected $host;
 
     /**
-     * Port on which the client will connect, defaults to the standard IRC 
+     * Port on which the client will connect, defaults to the standard IRC
      * port
      *
      * @var int
@@ -46,13 +46,21 @@ class Phergie_Connection
     protected $port;
 
     /**
-     * Transport for the connection, defaults to tcp but can be set to ssl 
+     * Transport for the connection, defaults to tcp but can be set to ssl
      * or variations thereof to connect over SSL
      *
-     * @var string 
+     * @var string
      */
     protected $transport;
 
+    /**
+     * Encoding method for the connection, defaults to ISO-8859-1 but can
+     * be set to UTF8 if necessary
+     *
+     * @var strng
+     */
+    protected $encoding;
+
     /**
      * Nick that the client will use
      *
@@ -91,7 +99,7 @@ class Phergie_Connection
     /**
      * Constructor to initialize instance properties.
      *
-     * @param array $options Optional associative array of property values 
+     * @param array $options Optional associative array of property values
      *        to initialize
      *
      * @return void
@@ -99,6 +107,9 @@ class Phergie_Connection
     public function __construct(array $options = array())
     {
         $this->transport = 'tcp';
+        $this->encoding = 'ISO-8859-1';
+        // @note this may need changed to something different, for broader support.
+        // @note also may need to make use of http://us.php.net/manual/en/function.stream-encoding.php
 
         $this->setOptions($options);
     }
@@ -120,7 +131,7 @@ class Phergie_Connection
             );
         }
     }
- 
+
     /**
      * Returns a hostmask that uniquely identifies the connection.
      *
@@ -136,7 +147,7 @@ class Phergie_Connection
             );
         }
 
-        return $this->hostmask; 
+        return $this->hostmask;
     }
 
     /**
@@ -144,7 +155,7 @@ class Phergie_Connection
      *
      * @param string $host Hostname
      *
-     * @return Phergie_Connection Provides a fluent interface 
+     * @return Phergie_Connection Provides a fluent interface
      */
     public function setHost($host)
     {
@@ -154,9 +165,9 @@ class Phergie_Connection
 
         return $this;
     }
-   
+
     /**
-     * Returns the host to which the client will connect if it is set or 
+     * Returns the host to which the client will connect if it is set or
      * emits an error if it is not set.
      *
      * @return string
@@ -173,7 +184,7 @@ class Phergie_Connection
      *
      * @param int $port Port
      *
-     * @return Phergie_Connection Provides a fluent interface 
+     * @return Phergie_Connection Provides a fluent interface
      */
     public function setPort($port)
     {
@@ -199,9 +210,9 @@ class Phergie_Connection
     }
 
     /**
-     * Sets the transport for the connection to use. 
+     * Sets the transport for the connection to use.
      *
-     * @param string $transport Transport (ex: tcp, ssl, etc.) 
+     * @param string $transport Transport (ex: tcp, ssl, etc.)
      *
      * @return Phergie_Connection Provides a fluent interface
      */
@@ -220,21 +231,52 @@ class Phergie_Connection
     }
 
     /**
-     * Returns the transport in use by the connection. 
+     * Returns the transport in use by the connection.
      *
-     * @return string Transport (ex: tcp, ssl, etc.) 
+     * @return string Transport (ex: tcp, ssl, etc.)
      */
     public function getTransport()
     {
         return $this->transport;
     }
 
+    /**
+     * Sets the encoding for the connection to use.
+     *
+     * @param string $encoding Encoding to use (ex: ASCII, ISO-8859-1, UTF8, etc.)
+     *
+     * @return Phergie_Connection Provides a fluent interface
+     */
+    public function setEncoding($encoding)
+    {
+        $this->encoding = (string) $encoding;
+
+        if (!in_array($this->encoding, mb_list_encodings())) {
+            throw new Phergie_Connection_Exception(
+                'Encoding ' . $this->encoding . ' is not supported',
+                Phergie_Connection_Exception::ENCODING_NOT_SUPPORTED
+            );
+        }
+
+        return $this;
+    }
+
+    /**
+     * Returns the encoding in use by the connection.
+     *
+     * @return string Encoding (ex: ASCII, ISO-8859-1, UTF8, etc.)
+     */
+    public function getEncoding()
+    {
+        return $this->encoding;
+    }
+
     /**
      * Sets the nick that the client will use.
      *
      * @param string $nick Nickname
      *
-     * @return Phergie_Connection Provides a fluent interface 
+     * @return Phergie_Connection Provides a fluent interface
      */
     public function setNick($nick)
     {
@@ -262,7 +304,7 @@ class Phergie_Connection
      *
      * @param string $username Username
      *
-     * @return Phergie_Connection Provides a fluent interface 
+     * @return Phergie_Connection Provides a fluent interface
      */
     public function setUsername($username)
     {
@@ -290,7 +332,7 @@ class Phergie_Connection
      *
      * @param string $realname Real name
      *
-     * @return Phergie_Connection Provides a fluent interface 
+     * @return Phergie_Connection Provides a fluent interface
      */
     public function setRealname($realname)
     {
@@ -318,7 +360,7 @@ class Phergie_Connection
      *
      * @param string $password Password
      *
-     * @return Phergie_Connection Provides a fluent interface 
+     * @return Phergie_Connection Provides a fluent interface
      */
     public function setPassword($password)
     {
@@ -342,10 +384,10 @@ class Phergie_Connection
     /**
      * Sets multiple connection settings using an array.
      *
-     * @param array $options Associative array of setting names mapped to 
+     * @param array $options Associative array of setting names mapped to
      *        corresponding values
      *
-     * @return Phergie_Connection Provides a fluent interface 
+     * @return Phergie_Connection Provides a fluent interface
      */
     public function setOptions(array $options)
     {
diff --git a/plugins/Irc/extlib/phergie/Phergie/Db/Exception.php b/plugins/Irc/extlib/phergie/Phergie/Db/Exception.php
new file mode 100644
index 0000000000..77421108ad
--- /dev/null
+++ b/plugins/Irc/extlib/phergie/Phergie/Db/Exception.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * Phergie
+ *
+ * PHP version 5
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.
+ * It is also available through the world-wide-web at this URL:
+ * http://phergie.org/license
+ *
+ * @category  Phergie
+ * @package   Phergie
+ * @author    Phergie Development Team <team@phergie.org>
+ * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
+ * @license   http://phergie.org/license New BSD License
+ * @link      http://pear.phergie.org/package/Phergie
+ */
+
+/**
+ * Exceptions related to handling databases for plugins.
+ *
+ * @category Phergie
+ * @package  Phergie
+ * @author   Phergie Development Team <team@phergie.org>
+ * @license  http://phergie.org/license New BSD License
+ * @link     http://pear.phergie.org/package/Phergie
+ */
+
+class Phergie_Db_Exception extends Phergie_Exception
+{
+    /**
+     * Error indicating that a directory needed to support database
+     * functionality was unable to be created.
+     */
+    const ERR_UNABLE_TO_CREATE_DIRECTORY = 1;
+}
diff --git a/plugins/Irc/extlib/phergie/Phergie/Db/Manager.php b/plugins/Irc/extlib/phergie/Phergie/Db/Manager.php
new file mode 100755
index 0000000000..2a8215e96d
--- /dev/null
+++ b/plugins/Irc/extlib/phergie/Phergie/Db/Manager.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * Phergie
+ *
+ * PHP version 5
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.
+ * It is also available through the world-wide-web at this URL:
+ * http://phergie.org/license
+ *
+ * @category  Phergie
+ * @package   Phergie
+ * @author    Phergie Development Team <team@phergie.org>
+ * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
+ * @license   http://phergie.org/license New BSD License
+ * @link      http://pear.phergie.org/package/Phergie_Command
+ */
+
+/**
+ * Database management class. Provides a base API for managing databases
+ * within
+ *
+ * @category Phergie
+ * @package  Phergie
+ * @author   Phergie Development Team <team@phergie.org>
+ * @license  http://phergie.org/license New BSD License
+ * @link     http://pear.phergie.org/package/Phergie_Db_Manager
+ */
+abstract class Phergie_Db_Manager
+{
+    /**
+     * Returns a connection to the database.
+     *
+     * @return object
+     */
+    public abstract function getDb();
+
+    /**
+     * Checks if a table/collection exists within the database.
+     *
+     * @param string $table Table/collection name to check for
+     *
+     * @return boolean
+     */
+    public abstract function hasTable($table);
+}
diff --git a/plugins/Irc/extlib/phergie/Phergie/Db/Sqlite.php b/plugins/Irc/extlib/phergie/Phergie/Db/Sqlite.php
new file mode 100644
index 0000000000..14ee520fd1
--- /dev/null
+++ b/plugins/Irc/extlib/phergie/Phergie/Db/Sqlite.php
@@ -0,0 +1,117 @@
+<?php
+
+/**
+ * Phergie
+ *
+ * PHP version 5
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.
+ * It is also available through the world-wide-web at this URL:
+ * http://phergie.org/license
+ *
+ * @category  Phergie
+ * @package   Phergie
+ * @author    Phergie Development Team <team@phergie.org>
+ * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
+ * @license   http://phergie.org/license New BSD License
+ * @link      http://pear.phergie.org/package/Phergie
+ */
+
+/**
+ * Provides basic management for SQLite databases
+ *
+ * @category Phergie
+ * @package  Phergie
+ * @author   Phergie Development Team <team@phergie.org>
+ * @license  http://phergie.org/license New BSD License
+ * @link     http://pear.phergie.org/package/Phergie
+ */
+class Phergie_Db_Sqlite extends Phergie_Db_Manager
+{
+    /**
+     * Database connection
+     *
+     * @var PDO
+     */
+    protected $db;
+
+    /**
+     * Database file path
+     *
+     * @var string
+     */
+    protected $dbFile;
+
+    /**
+     * Allows setting of the database file path when creating the class.
+     *
+     * @param string $dbFile database file path (optional)
+     *
+     * @return void
+     */
+    public function __construct($dbFile = null)
+    {
+        if ($dbFile != null) {
+            $this->setDbFile($dbFile);
+        }
+    }
+
+    /**
+     * Sets the database file path.
+     *
+     * @param string $dbFile SQLite database file path
+     *
+     * @return null
+     */
+    public function setDbFile($dbFile)
+    {
+        if (is_string($dbFile) && !empty($dbFile)) {
+            $this->dbFile = $dbFile;
+        }
+    }
+
+    /**
+     * Returns a configured database connection.
+     *
+     * @return PDO
+     */
+    public function getDb()
+    {
+        if (!empty($this->db)) {
+            return $this->db;
+        }
+
+        $dir = dirname($this->dbFile);
+        if (!is_dir($dir) && !mkdir($dir, 0755, true)) {
+            throw new Phergie_Db_Exception(
+                'Unable to create directory',
+                Phergie_Db_Exception::ERR_UNABLE_TO_CREATE_DIRECTORY
+            );
+        }
+
+        $this->db = new PDO('sqlite:' . $this->dbFile);
+
+        return $this->db;
+    }
+
+
+    /**
+     * Returns whether a given table exists in the database.
+     *
+     * @param string $table Name of the table to check for
+     *
+     * @return boolean TRUE if the table exists, FALSE otherwise
+     */
+    public function hasTable($table)
+    {
+        $db = $this->getDb();
+
+        return (bool) $db->query(
+            'SELECT COUNT(*) FROM sqlite_master WHERE name = '
+            . $db->quote($table)
+        )->fetchColumn();
+    }
+}
diff --git a/plugins/Irc/extlib/phergie/Phergie/Driver/Exception.php b/plugins/Irc/extlib/phergie/Phergie/Driver/Exception.php
index c405522292..aa2b838f7e 100755
--- a/plugins/Irc/extlib/phergie/Phergie/Driver/Exception.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Driver/Exception.php
@@ -46,4 +46,9 @@ class Phergie_Driver_Exception extends Phergie_Exception
      * Error indicating that an attempt to initiate a connection failed
      */
     const ERR_CONNECTION_ATTEMPT_FAILED = 3;
+
+    /**
+     * Error indicating that an attempt to send data via a connection failed
+     */
+    const ERR_CONNECTION_WRITE_FAILED = 4;
 }
diff --git a/plugins/Irc/extlib/phergie/Phergie/Driver/Streams.php b/plugins/Irc/extlib/phergie/Phergie/Driver/Streams.php
index 8fe53aaa2f..bb0c611aa3 100755
--- a/plugins/Irc/extlib/phergie/Phergie/Driver/Streams.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Driver/Streams.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Phergie 
+ * Phergie
  *
  * PHP version 5
  *
@@ -11,7 +11,7 @@
  * It is also available through the world-wide-web at this URL:
  * http://phergie.org/license
  *
- * @category  Phergie 
+ * @category  Phergie
  * @package   Phergie
  * @author    Phergie Development Team <team@phergie.org>
  * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
@@ -20,11 +20,11 @@
  */
 
 /**
- * Driver that uses the sockets wrapper of the streams extension for 
- * communicating with the server and handles formatting and parsing of 
+ * Driver that uses the sockets wrapper of the streams extension for
+ * communicating with the server and handles formatting and parsing of
  * events using PHP.
  *
- * @category Phergie 
+ * @category Phergie
  * @package  Phergie
  * @author   Phergie Development Team <team@phergie.org>
  * @license  http://phergie.org/license New BSD License
@@ -47,26 +47,29 @@ class Phergie_Driver_Streams extends Phergie_Driver_Abstract
     protected $socket;
 
     /**
-     * Amount of time in seconds to wait to receive an event each time the 
+     * Amount of time in seconds to wait to receive an event each time the
      * socket is polled
      *
-     * @var float 
+     * @var float
      */
     protected $timeout = 0.1;
 
     /**
-     * Handles construction of command strings and their transmission to the 
+     * Handles construction of command strings and their transmission to the
      * server.
      *
      * @param string       $command Command to send
-     * @param string|array $args    Optional string or array of sequential 
+     * @param string|array $args    Optional string or array of sequential
      *        arguments
      *
-     * @return string Command string that was sent 
+     * @return string Command string that was sent
      * @throws Phergie_Driver_Exception
      */
     protected function send($command, $args = '')
     {
+        $connection = $this->getConnection();
+        $encoding = $connection->getEncoding();
+
         // Require an open socket connection to continue
         if (empty($this->socket)) {
             throw new Phergie_Driver_Exception(
@@ -86,20 +89,40 @@ class Phergie_Driver_Streams extends Phergie_Driver_Abstract
                 $end = count($args) - 1;
                 $args[$end] = ':' . $args[$end];
                 $args = implode(' ', $args);
+            } else {
+                $args = ':' . $args;
             }
 
             $buffer .= ' ' . $args;
         }
 
         // Transmit the command over the socket connection
-        fwrite($this->socket, $buffer . "\r\n");
+        $attempts = $written = 0;
+        $temp = $buffer . "\r\n";
+        $is_multibyte = !substr($encoding, 0, 8) === 'ISO-8859' && $encoding !== 'ASCII' && $encoding !== 'CP1252';
+        $length = ($is_multibyte) ? mb_strlen($buffer, '8bit') : strlen($buffer);
+        while (true) {
+            $written += (int) fwrite($this->socket, $temp);
+            if ($written < $length) {
+                $temp = substr($temp, $written);
+                $attempts++;
+                if ($attempts == 3) {
+                    throw new Phergie_Driver_Exception(
+                        'Unable to write to socket',
+                        Phergie_Driver_Exception::ERR_CONNECTION_WRITE_FAILED
+                    );
+                }
+            } else {
+                break;
+            }
+        }
 
         // Return the command string that was transmitted
         return $buffer;
     }
 
     /**
-     * Overrides the parent class to set the currently active socket handler 
+     * Overrides the parent class to set the currently active socket handler
      * when the active connection is changed.
      *
      * @param Phergie_Connection $connection Active connection
@@ -120,11 +143,11 @@ class Phergie_Driver_Streams extends Phergie_Driver_Abstract
 
     /**
      * Returns a list of hostmasks corresponding to sockets with data to read.
-     * 
+     *
      * @param int $sec  Length of time to wait for new data (seconds)
      * @param int $usec Length of time to wait for new data (microseconds)
      *
-     * @return array List of hostmasks or an empty array if none were found 
+     * @return array List of hostmasks or an empty array if none were found
      *         to have data to read
      */
     public function getActiveReadSockets($sec = 0, $usec = 200000)
@@ -147,7 +170,7 @@ class Phergie_Driver_Streams extends Phergie_Driver_Abstract
     }
 
     /**
-     * Sets the amount of time to wait for a new event each time the socket 
+     * Sets the amount of time to wait for a new event each time the socket
      * is polled.
      *
      * @param float $timeout Amount of time in seconds
@@ -164,7 +187,7 @@ class Phergie_Driver_Streams extends Phergie_Driver_Abstract
     }
 
     /**
-     * Returns the amount of time to wait for a new event each time the 
+     * Returns the amount of time to wait for a new event each time the
      * socket is polled.
      *
      * @return float Amount of time in seconds
@@ -175,7 +198,7 @@ class Phergie_Driver_Streams extends Phergie_Driver_Abstract
     }
 
     /**
-     * Supporting method to parse event argument strings where the last 
+     * Supporting method to parse event argument strings where the last
      * argument may contain a colon.
      *
      * @param string $args  Argument string to parse
@@ -191,7 +214,7 @@ class Phergie_Driver_Streams extends Phergie_Driver_Abstract
     /**
      * Listens for an event on the current connection.
      *
-     * @return Phergie_Event_Interface|null Event instance if an event was 
+     * @return Phergie_Event_Interface|null Event instance if an event was
      *         received, NULL otherwise
      */
     public function getEvent()
@@ -217,7 +240,7 @@ class Phergie_Driver_Streams extends Phergie_Driver_Abstract
             // If the event could be from the server or a user...
 
             // Parse the server hostname or user hostmask, command, and arguments
-            list($prefix, $cmd, $args) 
+            list($prefix, $cmd, $args)
                 = array_pad(explode(' ', ltrim($buffer, ':'), 3), 3, null);
             if (strpos($prefix, '@') !== false) {
                 $hostmask = Phergie_Hostmask::fromString($prefix);
@@ -279,17 +302,17 @@ class Phergie_Driver_Streams extends Phergie_Driver_Abstract
         case 'oper':
         case 'topic':
         case 'mode':
-            $args = $this->parseArguments($args); 
+            $args = $this->parseArguments($args);
             break;
 
         case 'part':
         case 'kill':
         case 'invite':
-            $args = $this->parseArguments($args, 2); 
+            $args = $this->parseArguments($args, 2);
             break;
 
         case 'kick':
-            $args = $this->parseArguments($args, 3); 
+            $args = $this->parseArguments($args, 3);
             break;
 
         // Remove the target from responses
@@ -360,14 +383,14 @@ class Phergie_Driver_Streams extends Phergie_Driver_Abstract
         $this->send(
             'USER',
             array(
-                $username, 
-                $hostname, 
-                $hostname, 
+                $username,
+                $hostname,
+                $hostname,
                 $realname
             )
         );
 
-        $this->send('NICK', $nick); 
+        $this->send('NICK', $nick);
 
         // Add the socket handler to the internal array for socket handlers
         $this->sockets[(string) $connection->getHostmask()] = $this->socket;
@@ -395,7 +418,7 @@ class Phergie_Driver_Streams extends Phergie_Driver_Abstract
     /**
      * Joins a channel.
      *
-     * @param string $channels Comma-delimited list of channels to join 
+     * @param string $channels Comma-delimited list of channels to join
      * @param string $keys     Optional comma-delimited list of channel keys
      *
      * @return void
@@ -414,7 +437,7 @@ class Phergie_Driver_Streams extends Phergie_Driver_Abstract
     /**
      * Leaves a channel.
      *
-     * @param string $channels Comma-delimited list of channels to leave 
+     * @param string $channels Comma-delimited list of channels to leave
      *
      * @return void
      */
@@ -600,9 +623,9 @@ class Phergie_Driver_Streams extends Phergie_Driver_Abstract
     /**
      * Sends a CTCP response to a user.
      *
-     * @param string       $nick    User nick 
+     * @param string       $nick    User nick
      * @param string       $command Command to send
-     * @param string|array $args    String or array of sequential arguments 
+     * @param string|array $args    String or array of sequential arguments
      *        (optional)
      *
      * @return void
@@ -615,7 +638,7 @@ class Phergie_Driver_Streams extends Phergie_Driver_Abstract
 
         $buffer = rtrim(strtoupper($command) . ' ' . $args);
 
-        $this->doNotice($nick, chr(1) . $buffer . chr(1)); 
+        $this->doNotice($nick, chr(1) . $buffer . chr(1));
     }
 
     /**
@@ -652,7 +675,7 @@ class Phergie_Driver_Streams extends Phergie_Driver_Abstract
      * Sends a CTCP TIME request to a user.
      *
      * @param string $nick User nick
-     * @param string $time Time string to send for a response 
+     * @param string $time Time string to send for a response
      *
      * @return void
      */
diff --git a/plugins/Irc/extlib/phergie/Phergie/Event/Handler.php b/plugins/Irc/extlib/phergie/Phergie/Event/Handler.php
index 7df1fca35a..e308df8a56 100644
--- a/plugins/Irc/extlib/phergie/Phergie/Event/Handler.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Event/Handler.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Phergie 
+ * Phergie
  *
  * PHP version 5
  *
@@ -11,7 +11,7 @@
  * It is also available through the world-wide-web at this URL:
  * http://phergie.org/license
  *
- * @category  Phergie 
+ * @category  Phergie
  * @package   Phergie
  * @author    Phergie Development Team <team@phergie.org>
  * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
@@ -20,9 +20,9 @@
  */
 
 /**
- * Handles events initiated by plugins. 
+ * Handles events initiated by plugins.
  *
- * @category Phergie 
+ * @category Phergie
  * @package  Phergie
  * @author   Phergie Development Team <team@phergie.org>
  * @license  http://phergie.org/license New BSD License
@@ -51,13 +51,13 @@ class Phergie_Event_Handler implements IteratorAggregate, Countable
      * Adds an event to the queue.
      *
      * @param Phergie_Plugin_Abstract $plugin Plugin originating the event
-     * @param string                  $type   Event type, corresponding to a 
+     * @param string                  $type   Event type, corresponding to a
      *        Phergie_Event_Command::TYPE_* constant
      * @param array                   $args   Optional event arguments
      *
      * @return Phergie_Event_Handler Provides a fluent interface
      */
-    public function addEvent(Phergie_Plugin_Abstract $plugin, $type, 
+    public function addEvent(Phergie_Plugin_Abstract $plugin, $type,
         array $args = array()
     ) {
         if (!defined('Phergie_Event_Command::TYPE_' . strtoupper($type))) {
@@ -102,7 +102,7 @@ class Phergie_Event_Handler implements IteratorAggregate, Countable
     /**
      * Replaces the current event queue with a given queue of events.
      *
-     * @param array $events Ordered list of objects of the class 
+     * @param array $events Ordered list of objects of the class
      *        Phergie_Event_Command
      *
      * @return Phergie_Event_Handler Provides a fluent interface
@@ -116,10 +116,10 @@ class Phergie_Event_Handler implements IteratorAggregate, Countable
     /**
      * Returns whether an event of the given type exists in the queue.
      *
-     * @param string $type Event type from Phergie_Event_Request::TYPE_* 
+     * @param string $type Event type from Phergie_Event_Request::TYPE_*
      *        constants
      *
-     * @return bool TRUE if an event of the specified type exists in the 
+     * @return bool TRUE if an event of the specified type exists in the
      *         queue, FALSE otherwise
      */
     public function hasEventOfType($type)
@@ -135,10 +135,10 @@ class Phergie_Event_Handler implements IteratorAggregate, Countable
     /**
      * Returns a list of events of a specified type.
      *
-     * @param string $type Event type from Phergie_Event_Request::TYPE_* 
+     * @param string $type Event type from Phergie_Event_Request::TYPE_*
      *        constants
      *
-     * @return array Array containing event instances of the specified type 
+     * @return array Array containing event instances of the specified type
      *         or an empty array if no such events were found
      */
     public function getEventsOfType($type)
@@ -152,6 +152,22 @@ class Phergie_Event_Handler implements IteratorAggregate, Countable
         return $events;
     }
 
+    /**
+     * Removes a single event from the event queue.
+     *
+     * @param Phergie_Event_Command $event Event to remove
+     *
+     * @return Phergie_Event_Handler Provides a fluent interface
+     */
+    public function removeEvent(Phergie_Event_Command $event)
+    {
+        $key = array_search($event, $this->events);
+        if ($key !== false) {
+            unset($this->events[$key]);
+        }
+        return $this;
+    }
+
     /**
      * Returns an iterator for the current event queue.
      *
diff --git a/plugins/Irc/extlib/phergie/Phergie/Event/Request.php b/plugins/Irc/extlib/phergie/Phergie/Event/Request.php
index a559d9dbe5..647b5acb87 100755
--- a/plugins/Irc/extlib/phergie/Phergie/Event/Request.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Event/Request.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Phergie 
+ * Phergie
  *
  * PHP version 5
  *
@@ -11,7 +11,7 @@
  * It is also available through the world-wide-web at this URL:
  * http://phergie.org/license
  *
- * @category  Phergie 
+ * @category  Phergie
  * @package   Phergie
  * @author    Phergie Development Team <team@phergie.org>
  * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
@@ -22,15 +22,15 @@
 /**
  * Autonomous event originating from a user or the server.
  *
- * @category Phergie 
+ * @category Phergie
  * @package  Phergie
  * @author   Phergie Development Team <team@phergie.org>
  * @license  http://phergie.org/license New BSD License
  * @link     http://pear.phergie.org/package/Phergie
  * @link     http://www.irchelp.org/irchelp/rfc/chapter4.html
  */
-class Phergie_Event_Request 
-    extends Phergie_Event_Abstract 
+class Phergie_Event_Request
+    extends Phergie_Event_Abstract
     implements ArrayAccess
 {
     /**
@@ -240,6 +240,24 @@ class Phergie_Event_Request
         return $this;
     }
 
+    /**
+     * Sets the value of a single argument for the request.
+     *
+     * @param mixed  $argument Integer position (starting from 0) or the
+     *        equivalent string name of the argument from self::$map
+     * @param string $value    Value to assign to the argument
+     *
+     * @return Phergie_Event_Request Provides a fluent interface
+     */
+    public function setArgument($argument, $value)
+    {
+        $argument = $this->resolveArgument($argument);
+        if ($argument !== null) {
+            $this->arguments[$argument] = (string) $value;
+        }
+        return $this;
+    }
+
     /**
      * Returns the arguments for the request.
      *
@@ -256,13 +274,13 @@ class Phergie_Event_Request
      * @param mixed $argument Integer position (starting from 0) or the
      *        equivalent string name of the argument from self::$map
      *
-     * @return int|null Integer position of the argument or NULL if no 
+     * @return int|null Integer position of the argument or NULL if no
      *         corresponding argument was found
      */
     protected function resolveArgument($argument)
     {
         if (isset($this->arguments[$argument])) {
-            return $argument; 
+            return $argument;
         } else {
             $argument = strtolower($argument);
             if (isset(self::$map[$this->type][$argument])
@@ -285,7 +303,7 @@ class Phergie_Event_Request
     public function getArgument($argument)
     {
         $argument = $this->resolveArgument($argument);
-        if ($argument !== null) { 
+        if ($argument !== null) {
             return $this->arguments[$argument];
         }
         return null;
@@ -325,9 +343,9 @@ class Phergie_Event_Request
     }
 
     /**
-     * Returns the channel name if the event occurred in a channel or the 
-     * user nick if the event was a private message directed at the bot by a 
-     * user. 
+     * Returns the channel name if the event occurred in a channel or the
+     * user nick if the event was a private message directed at the bot by a
+     * user.
      *
      * @return string
      */
@@ -395,7 +413,7 @@ class Phergie_Event_Request
      *
      * @param string|int $offset Argument name or position beginning from 0
      *
-     * @return bool TRUE if the argument has a value, FALSE otherwise 
+     * @return bool TRUE if the argument has a value, FALSE otherwise
      * @see ArrayAccess::offsetExists()
      */
     public function offsetExists($offset)
@@ -428,7 +446,7 @@ class Phergie_Event_Request
     public function offsetSet($offset, $value)
     {
         $offset = $this->resolveArgument($offset);
-        if ($offset !== null) { 
+        if ($offset !== null) {
             $this->arguments[$offset] = $value;
         }
     }
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Abstract.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Abstract.php
index 294c04ce52..d7e0d351af 100755
--- a/plugins/Irc/extlib/phergie/Phergie/Plugin/Abstract.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Abstract.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Phergie 
+ * Phergie
  *
  * PHP version 5
  *
@@ -11,7 +11,7 @@
  * It is also available through the world-wide-web at this URL:
  * http://phergie.org/license
  *
- * @category  Phergie 
+ * @category  Phergie
  * @package   Phergie
  * @author    Phergie Development Team <team@phergie.org>
  * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
@@ -23,7 +23,7 @@
  * Base class for plugins to provide event handler stubs and commonly needed
  * functionality.
  *
- * @category Phergie 
+ * @category Phergie
  * @package  Phergie
  * @author   Phergie Development Team <team@phergie.org>
  * @license  http://phergie.org/license New BSD License
@@ -66,6 +66,13 @@ abstract class Phergie_Plugin_Abstract
      */
     protected $event;
 
+    /**
+     * Plugin short name
+     *
+     * @var string
+     */
+    protected $name;
+
     /**
      * Returns the short name for the plugin based on its class name.
      *
@@ -73,14 +80,30 @@ abstract class Phergie_Plugin_Abstract
      */
     public function getName()
     {
-        return substr(strrchr(get_class($this), '_'), 1);
+        if (empty($this->name)) {
+            $this->name = substr(strrchr(get_class($this), '_'), 1);
+        }
+        return $this->name;
     }
 
     /**
-     * Indicates that the plugin failed to load due to an unsatisfied 
+     * Sets the short name for the plugin.
+     *
+     * @param string $name Plugin short name
+     *
+     * @return Phergie_Plugin_Abstract Provides a fluent interface
+     */
+    public function setName($name)
+    {
+        $this->name = (string) $name;
+        return $this;
+    }
+
+    /**
+     * Indicates that the plugin failed to load due to an unsatisfied
      * runtime requirement, such as a missing dependency.
      *
-     * @param string $message Error message to provide more information 
+     * @param string $message Error message to provide more information
      *        about the reason for the failure
      *
      * @return Phergie_Plugin_Abstract Provides a fluent interface
@@ -108,17 +131,17 @@ abstract class Phergie_Plugin_Abstract
     }
 
     /**
-     * Returns the current configuration handler or the value of a single 
+     * Returns the current configuration handler or the value of a single
      * setting from it.
      *
-     * @param string $name    Optional name of a setting for which the value 
+     * @param string $name    Optional name of a setting for which the value
      *        should be returned instead of the entire configuration handler
-     * @param mixed  $default Optional default value to return if no value 
+     * @param mixed  $default Optional default value to return if no value
      *        is set for the setting indicated by $name
      *
-     * @return Phergie_Config|mixed Configuration handler or value of the 
+     * @return Phergie_Config|mixed Configuration handler or value of the
      *         setting specified by $name
-     * @throws Phergie_Plugin_Exception No configuration handler has been set 
+     * @throws Phergie_Plugin_Exception No configuration handler has been set
      */
     public function getConfig($name = null, $default = null)
     {
@@ -154,7 +177,7 @@ abstract class Phergie_Plugin_Abstract
      * Returns the current plugin handler.
      *
      * @return Phergie_Plugin_Handler
-     * @throws Phergie_Plugin_Exception No plugin handler has been set 
+     * @throws Phergie_Plugin_Exception No plugin handler has been set
      */
     public function getPluginHandler()
     {
@@ -184,7 +207,7 @@ abstract class Phergie_Plugin_Abstract
      * Returns the current event handler.
      *
      * @return Phergie_Event_Handler
-     * @throws Phergie_Plugin_Exception No event handler has been set 
+     * @throws Phergie_Plugin_Exception No event handler has been set
      */
     public function getEventHandler()
     {
@@ -214,7 +237,7 @@ abstract class Phergie_Plugin_Abstract
      * Returns the current event connection.
      *
      * @return Phergie_Connection
-     * @throws Phergie_Plugin_Exception No connection has been set 
+     * @throws Phergie_Plugin_Exception No connection has been set
      */
     public function getConnection()
     {
@@ -281,8 +304,8 @@ abstract class Phergie_Plugin_Abstract
     }
 
     /**
-     * Handler for when the plugin is initially loaded - useful for checking 
-     * runtime dependencies or performing any setup necessary for the plugin 
+     * Handler for when the plugin is initially loaded - useful for checking
+     * runtime dependencies or performing any setup necessary for the plugin
      * to function properly such as initializing a database.
      *
      * @return void
@@ -301,8 +324,8 @@ abstract class Phergie_Plugin_Abstract
     }
 
     /**
-     * Handler for each tick, a single iteration of the continuous loop 
-     * executed by the bot to receive, handle, and send events - useful for  
+     * Handler for each tick, a single iteration of the continuous loop
+     * executed by the bot to receive, handle, and send events - useful for
      * repeated execution of tasks on a time interval.
      *
      * @return void
@@ -312,10 +335,10 @@ abstract class Phergie_Plugin_Abstract
     }
 
     /**
-     * Handler for when any event is received but has not yet been dispatched 
+     * Handler for when any event is received but has not yet been dispatched
      * to the plugin handler method specific to its event type.
      *
-     * @return bool|null|void FALSE to short-circuit further event 
+     * @return bool|null|void FALSE to short-circuit further event
      *         processing, TRUE or NULL otherwise
      */
     public function preEvent()
@@ -323,8 +346,8 @@ abstract class Phergie_Plugin_Abstract
     }
 
     /**
-     * Handler for after plugin processing of an event has concluded but 
-     * before any events triggered in response by plugins are sent to the 
+     * Handler for after plugin processing of an event has concluded but
+     * before any events triggered in response by plugins are sent to the
      * server - useful for modifying outgoing events before they are sent.
      *
      * @return void
@@ -334,8 +357,8 @@ abstract class Phergie_Plugin_Abstract
     }
 
     /**
-     * Handler for after any events triggered by plugins in response to a 
-     * received event are sent to the server. 
+     * Handler for after any events triggered by plugins in response to a
+     * received event are sent to the server.
      *
      * @return void
      */
@@ -454,12 +477,12 @@ abstract class Phergie_Plugin_Abstract
     }
 
     /**
-     * Handler for when the bot receives a ping event from a server, at 
-     * which point it is expected to respond with a pong request within 
+     * Handler for when the bot receives a ping event from a server, at
+     * which point it is expected to respond with a pong request within
      * a short period else the server may terminate its connection.
      *
      * @return void
-     * @link http://irchelp.org/irchelp/rfc/chapter4.html#c4_6_2 
+     * @link http://irchelp.org/irchelp/rfc/chapter4.html#c4_6_2
      */
     public function onPing()
     {
@@ -496,7 +519,7 @@ abstract class Phergie_Plugin_Abstract
     }
 
     /**
-     * Handler for when the bot receives a CTCP request of an unknown type. 
+     * Handler for when the bot receives a CTCP request of an unknown type.
      *
      * @return void
      * @link http://www.invlogic.com/irc/ctcp.html
@@ -506,7 +529,7 @@ abstract class Phergie_Plugin_Abstract
     }
 
     /**
-     * Handler for when a reply is received for a CTCP PING request sent by 
+     * Handler for when a reply is received for a CTCP PING request sent by
      * the bot.
      *
      * @return void
@@ -517,7 +540,7 @@ abstract class Phergie_Plugin_Abstract
     }
 
     /**
-     * Handler for when a reply is received for a CTCP TIME request sent by 
+     * Handler for when a reply is received for a CTCP TIME request sent by
      * the bot.
      *
      * @return void
@@ -528,7 +551,7 @@ abstract class Phergie_Plugin_Abstract
     }
 
     /**
-     * Handler for when a reply is received for a CTCP VERSION request sent 
+     * Handler for when a reply is received for a CTCP VERSION request sent
      * by the bot.
      *
      * @return void
@@ -539,7 +562,7 @@ abstract class Phergie_Plugin_Abstract
     }
 
     /**
-     * Handler for when a reply received for a CTCP request of an unknown 
+     * Handler for when a reply received for a CTCP request of an unknown
      * type.
      *
      * @return void
@@ -560,7 +583,7 @@ abstract class Phergie_Plugin_Abstract
     }
 
     /**
-     * Handler for when the bot receives an invitation to join a channel. 
+     * Handler for when the bot receives an invitation to join a channel.
      *
      * @return void
      * @link http://irchelp.org/irchelp/rfc/chapter4.html#c4_2_7
@@ -570,7 +593,7 @@ abstract class Phergie_Plugin_Abstract
     }
 
     /**
-     * Handler for when a server response is received to a command issued by 
+     * Handler for when a server response is received to a command issued by
      * the bot.
      *
      * @return void
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Censor.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Censor.php
new file mode 100755
index 0000000000..3206bdd288
--- /dev/null
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Censor.php
@@ -0,0 +1,108 @@
+<?php
+/**
+ * Phergie
+ *
+ * PHP version 5
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.
+ * It is also available through the world-wide-web at this URL:
+ * http://phergie.org/license
+ *
+ * @category  Phergie
+ * @package   Phergie_Plugin_Censor
+ * @author    Phergie Development Team <team@phergie.org>
+ * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
+ * @license   http://phergie.org/license New BSD License
+ * @link      http://pear.phergie.org/package/Phergie_Plugin_Censor
+ */
+
+/**
+ * Facilitates censoring of event content or discardment of events
+ * containing potentially offensive phrases depending on the value of the
+ * configuration setting censor.mode ('off', 'censor', 'discard'). Also
+ * provides access to a web service for detecting censored words so that
+ * other plugins may optionally integrate and adjust behavior accordingly to
+ * prevent discardment of events.
+ *
+ * @category Phergie
+ * @package  Phergie_Plugin_Censor
+ * @author   Phergie Development Team <team@phergie.org>
+ * @license  http://phergie.org/license New BSD License
+ * @link     http://pear.phergie.org/package/Phergie_Plugin_Censor
+ * @uses     extension soap
+ */
+class Phergie_Plugin_Censor extends Phergie_Plugin_Abstract
+{
+    /**
+     * SOAP client to interact with the CDYNE Profanity Filter API
+     *
+     * @var SoapClient
+     */
+    protected $soap;
+
+    /**
+     * Checks for dependencies.
+     *
+     * @return void
+     */
+    public function onLoad()
+    {
+        if (!extension_loaded('soap')) {
+            $this->fail('The PHP soap extension is required');
+        }
+
+        if (!in_array($this->config['censor.mode'], array('censor', 'discard'))) {
+            $this->plugins->removePlugin($this);
+        }
+    }
+
+    /**
+     * Returns a "clean" version of a given string.
+     *
+     * @param string $string String to clean
+     *
+     * @return string Cleaned string
+     */
+    public function cleanString($string)
+    {
+        if (empty($this->soap)) {
+            $this->soap = new SoapClient('http://ws.cdyne.com/ProfanityWS/Profanity.asmx?wsdl');
+        }
+        $params = array('Text' => $string);
+        $response = $this->soap->SimpleProfanityFilter($params);
+        return $response->SimpleProfanityFilterResult->CleanText;
+    }
+
+    /**
+     * Processes events before they are dispatched and either censors their
+     * content or discards them if they contain potentially offensive
+     * content.
+     *
+     * @return void
+     */
+    public function preDispatch()
+    {
+        $events = $this->events->getEvents();
+
+        foreach ($events as $event) {
+            switch ($event->getType()) {
+                case Phergie_Event_Request::TYPE_PRIVMSG:
+                case Phergie_Event_Request::TYPE_ACTION:
+                case Phergie_Event_Request::TYPE_NOTICE:
+                    $text = $event->getArgument(1);
+                    $clean = $this->cleanString($text);
+                    if ($text != $clean) {
+                        if ($this->config['censor.mode'] == 'censor') {
+                            $event->setArgument(1, $clean);
+                        } else {
+                            $this->events->removeEvent($event);
+                        }
+                    }
+                    break;
+            }
+        }
+    }
+}
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Cron.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Cron.php
new file mode 100644
index 0000000000..1c27f97842
--- /dev/null
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Cron.php
@@ -0,0 +1,147 @@
+<?php
+/**
+ * Phergie
+ *
+ * PHP version 5
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.
+ * It is also available through the world-wide-web at this URL:
+ * http://phergie.org/license
+ *
+ * @category  Phergie
+ * @package   Phergie_Plugin_Cron
+ * @author    Phergie Development Team <team@phergie.org>
+ * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
+ * @license   http://phergie.org/license New BSD License
+ * @link      http://pear.phergie.org/package/Phergie_Plugin_Cron
+ */
+
+/**
+ * Allows callbacks to be registered for asynchronous execution.
+ *
+ * @category Phergie
+ * @package  Phergie_Plugin_Cron
+ * @author   Phergie Development Team <team@phergie.org>
+ * @license  http://phergie.org/license New BSD License
+ * @link     http://pear.phergie.org/package/Phergie_Plugin_Cron
+ */
+class Phergie_Plugin_Cron extends Phergie_Plugin_Abstract
+{
+    /**
+     * Array of all registered callbacks with delays and arguments
+     *
+     * @var array
+     */
+    protected $callbacks;
+
+    /**
+     * Returns a human-readable representation of a callback for debugging
+     * purposes.
+     *
+     * @param callback $callback Callback to analyze
+     *
+     * @return string|boolean String representation of the callback or FALSE
+     *         if the specified value is not a valid callback
+     */
+    protected function getCallbackString($callback)
+    {
+        if (!is_callable($callback)) {
+            return false;
+        }
+
+        if (is_array($callback)) {
+            $class = is_string($callback[0]) ?
+                $callback[0] : get_class($callback[0]);
+            $method = $class . '::' . $callback[1];
+            return $method;
+        }
+
+        return $callback;
+    }
+
+    /**
+     * Registers a callback for execution sometime after a given delay
+     * relative to now.
+     *
+     * @param callback $callback  Callback to be registered
+     * @param int      $delay     Delay in seconds from now when the callback
+     *        will be executed
+     * @param array    $arguments Arguments to pass to the callback when
+     *        it's executed
+     * @param bool     $repeat    TRUE to automatically re-register the
+     *        callback for the same delay after it's executed, FALSE
+     *        otherwise
+     *
+     * @return void
+     */
+    public function registerCallback($callback, $delay,
+        array $arguments = array(), $repeat = false)
+    {
+        $callbackString = $this->getCallbackString($callback);
+        if ($callbackString === false) {
+            echo 'DEBUG(Cron): Invalid callback specified - ',
+                var_export($callback, true), PHP_EOL;
+            return;
+        }
+
+        $registered = time();
+        $scheduled = $registered + $delay;
+
+        $this->callbacks[] = array(
+            'callback'   => $callback,
+            'delay'      => $delay,
+            'arguments'  => $arguments,
+            'registered' => $registered,
+            'scheduled'  => $scheduled,
+            'repeat'     => $repeat,
+        );
+
+        echo 'DEBUG(Cron): Callback ', $callbackString,
+            ' scheduled for ', date('H:i:s', $scheduled), PHP_EOL;
+    }
+
+    /**
+     * Handles callback execution.
+     *
+     * @return void
+     */
+    public function onTick()
+    {
+        $now = time();
+        foreach ($this->callbacks as $key => &$callback) {
+            $callbackString = $this->getCallbackString($callback);
+
+            $scheduled = $callback['scheduled'];
+            if ($time < $scheduled) {
+                continue;
+            }
+
+            if (empty($callback['arguments'])) {
+                call_user_func($callback['callback']);
+            } else {
+                call_user_func_array(
+                    $callback['callback'],
+                    $callback['arguments']
+                );
+            }
+
+            echo 'DEBUG(Cron): Callback ', $callbackString,
+                ' scheduled for ', date('H:i:s', $scheduled), ',',
+                ' executed at ', date('H:i:s', $now), PHP_EOL;
+
+            if ($callback['repeat']) {
+                $callback['scheduled'] = $time + $callback['delay'];
+                echo 'DEBUG(Cron): Callback ', $callbackString,
+                    ' scheduled for ', date('H:i:s', $callback['scheduled']),
+                    PHP_EOL;
+            } else {
+                echo 'DEBUG(Cron): Callback ', $callbackString,
+                    ' removed from callback list', PHP_EOL;
+                unset($this->callbacks[$key]);
+            }
+        }
+    }
+}
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Exception.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Exception.php
index e58734bef9..fd07d9d5ea 100755
--- a/plugins/Irc/extlib/phergie/Phergie/Plugin/Exception.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Exception.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Phergie 
+ * Phergie
  *
  * PHP version 5
  *
@@ -11,7 +11,7 @@
  * It is also available through the world-wide-web at this URL:
  * http://phergie.org/license
  *
- * @category  Phergie 
+ * @category  Phergie
  * @package   Phergie
  * @author    Phergie Development Team <team@phergie.org>
  * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
@@ -22,7 +22,7 @@
 /**
  * Exception related to plugin handling.
  *
- * @category Phergie 
+ * @category Phergie
  * @package  Phergie
  * @author   Phergie Development Team <team@phergie.org>
  * @license  http://phergie.org/license New BSD License
@@ -31,82 +31,82 @@
 class Phergie_Plugin_Exception extends Phergie_Exception
 {
     /**
-     * Error indicating that a path containing plugins was specified, but 
+     * Error indicating that a path containing plugins was specified, but
      * did not reference a readable directory
      */
     const ERR_DIRECTORY_NOT_READABLE = 1;
 
     /**
-     * Error indicating that an attempt was made to locate the class for a 
+     * Error indicating that an attempt was made to locate the class for a
      * specified plugin, but the class could not be found
      */
     const ERR_CLASS_NOT_FOUND = 2;
 
     /**
-     * Error indicating that an attempt was made to locate the class for a 
-     * specified plugin, but that the found class did not extend the base 
+     * Error indicating that an attempt was made to locate the class for a
+     * specified plugin, but that the found class did not extend the base
      * plugin class
      */
     const ERR_INCORRECT_BASE_CLASS = 3;
 
     /**
-     * Error indicating that an attempt was made to locate the class for a 
+     * Error indicating that an attempt was made to locate the class for a
      * specified plugin, but that the found class cannot be instantiated
      */
     const ERR_CLASS_NOT_INSTANTIABLE = 4;
 
     /**
-     * Error indicating that an attempt was made to access a plugin that had 
+     * Error indicating that an attempt was made to access a plugin that had
      * not been loaded and autoloading was not enabled to load it
      */
     const ERR_PLUGIN_NOT_LOADED = 5;
 
     /**
-     * Error indicating that an attempt was made to access the configuration 
+     * Error indicating that an attempt was made to access the configuration
      * handler before one had been set
      */
     const ERR_NO_CONFIG_HANDLER = 6;
 
     /**
-     * Error indicating that an attempt was made to access the plugin 
+     * Error indicating that an attempt was made to access the plugin
      * handler before one had been set
      */
     const ERR_NO_PLUGIN_HANDLER = 7;
 
     /**
-     * Error indicating that an attempt was made to access the event  
+     * Error indicating that an attempt was made to access the event
      * handler before one had been set
      */
     const ERR_NO_EVENT_HANDLER = 8;
 
     /**
-     * Error indicating that an attempt was made to access the connection  
+     * Error indicating that an attempt was made to access the connection
      * before one had been set
      */
     const ERR_NO_CONNECTION = 9;
 
     /**
-     * Error indicating that an attempt was made to access the current 
+     * Error indicating that an attempt was made to access the current
      * incoming event before one had been set
      */
     const ERR_NO_EVENT = 10;
 
     /**
-     * Error indicating that a dependency of the plugin was unavailable at  
+     * Error indicating that a dependency of the plugin was unavailable at
      * the time that an attempt was made to load it
      */
     const ERR_REQUIREMENT_UNSATISFIED = 11;
 
     /**
-     * Error indicating that a call was made to a nonexistent plugin method 
-     * and that its __call() implementation did not process that call as an 
-     * attempt to trigger an event - this is intended to aid in debugging of 
+     * Error indicating that a call was made to a nonexistent plugin method
+     * and that its __call() implementation did not process that call as an
+     * attempt to trigger an event - this is intended to aid in debugging of
      * such situations
      */
     const ERR_INVALID_CALL = 12;
 
     /**
-     * Error indicating that a fatal runtime issue was encountered within a 
+     * Error indicating that a fatal runtime issue was encountered within a
      * plugin
      */
     const ERR_FATAL_ERROR = 13;
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Google.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Google.php
index 413a936075..40c203a672 100644
--- a/plugins/Irc/extlib/phergie/Phergie/Plugin/Google.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Google.php
@@ -222,7 +222,11 @@ class Phergie_Plugin_Google extends Phergie_Plugin_Abstract
      * @pluginCmd [location] Get the location from Google Maps to the location specified
      */
     public function onCommandGmap($location)
-    {
+    {	
+        $event = $this->getEvent();
+        $source = $event->getSource();
+        $nick = $event->getNick();
+	
         $location = utf8_encode($location);
         $url = 'http://maps.google.com/maps/geo';
         $params = array(
@@ -232,20 +236,17 @@ class Phergie_Plugin_Google extends Phergie_Plugin_Abstract
             'sensor' => 'false',
             'oe' => 'utf8',
             'mrt' => 'all',
-            'key' => $this->_config['google.key']
+            'key' => $this->getConfig('google.key')
         );
         $response = $this->http->get($url, $params); 
-        $json = (array) $response->getContent();
-        $event = $this->getEvent();
-        $source = $event->getSource();
-        $nick = $event->getNick();
+        $json =  $response->getContent();
         if (!empty($json)) {
-            $qtd = count($json['Placemark']);
+            $qtd = count($json->Placemark);
             if ($qtd > 1) {
                 if ($qtd <= 3) {
-                    foreach ($json['Placemark'] as $places) {
-                        $xy = $places['Point']['coordinates'];
-                        $address = utf8_decode($places['address']);
+                    foreach ($json->Placemark as $places) {
+                        $xy = $places->Point->coordinates;
+                        $address = utf8_decode($places->address);
                         $url = 'http://maps.google.com/maps?sll=' . $xy[1] . ',' 
                             . $xy[0] . '&z=15';
                         $msg = $nick . ' -> ' . $address . ' - ' . $url;
@@ -259,8 +260,8 @@ class Phergie_Plugin_Google extends Phergie_Plugin_Abstract
                     $this->doPrivmsg($source, $msg);
                 }
             } elseif ($qtd == 1) {
-                $xy = $json['Placemark'][0]['Point']['coordinates'];
-                $address = utf8_decode($json['Placemark'][0]['address']);
+                $xy = $json->Placemark[0]->Point->coordinates;
+                $address = utf8_decode($json->Placemark[0]->address);
                 $url = 'http://maps.google.com/maps?sll=' . $xy[1] . ',' . $xy[0] 
                     . '&z=15';
                 $msg = $nick . ' -> ' . $address . ' - ' . $url;
@@ -322,54 +323,44 @@ class Phergie_Plugin_Google extends Phergie_Plugin_Abstract
     /**
      * Performs a Google search to convert a value from one unit to another.
      *
-     * @param string $unit  Source metric 
-     * @param string $to    Value to be converted
-     * @param string $unit2 Destination metric 
+     * @param string $query Query of the form "[quantity] [unit] to [unit2]"
      *
      * @return void
      *
-     * @pluginCmd [unit] [to] [unit2] Convert a value from one metric to another
+     * @pluginCmd [quantity] [unit] to [unit2] Convert a value from one 
+     *            metric to another
      */
-    public function onCommandConvert($unit, $to, $unit2)
+    public function onCommandConvert($query)
     {
-        $url = 'http://www.google.com/search?q=' 
-            . urlencode($unit . ' ' . $to . ' ' . $unit2);
+        $url = 'http://www.google.com/search?q=' . urlencode($query);
         $response = $this->http->get($url);
         $contents = $response->getContent();
         $event = $this->getEvent();
         $source = $event->getSource();
         $nick = $event->getNick();
 
-        if (empty($contents)) {
-            $this->doPrivmsg(
-                $target,
-                $nick . ', sorry, I can\'t give you an answer right now.'
-            );
+        if ($response->isError()) {
+            $code = $response->getCode();
+            $message = $response->getMessage();
+            $this->doNotice($nick, 'ERROR: ' . $code . ' ' . $message);
             return;
         }
 
-        $doc = new DomDocument;
-        $doc->loadHTML($contents);
-        foreach ($doc->getElementsByTagName('h2') as $element) {
-            if ($element->getAttribute('class') == 'r') {
-                $children = $element->childNodes;
-                $text = str_replace(
-                    array(chr(195), chr(151), chr(160)),
-                    array('x', '', ' '),
-                    $children->item(0)->nodeValue
-                );
-                if ($children->length >= 3) {
-                    $text
-                        .= '^' . $children->item(1)->nodeValue 
-                        . $children->item(2)->nodeValue;
-                }
-            }
+        $start = strpos($contents, '<h3 class=r>');
+        if ($start !== false) {
+            $end = strpos($contents, '</b>', $start);
+            $text = strip_tags(substr($contents, $start, $end - $start));
+            $text = str_replace(
+                array(chr(195), chr(151), chr(160)),
+                array('x', '', ' '),
+                $text
+            );
         }
 
         if (isset($text)) {
             $this->doPrivmsg($source, $nick . ': ' . $text);
         } else {
-            $this->doPrivmsg($target, $nick . ', sorry I can\'t do that.');
+            $this->doNotice($nick, 'Sorry I couldn\'t find an answer.');
         }
     }
 }
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Handler.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Handler.php
index ee03ae9581..b2ef089b44 100755
--- a/plugins/Irc/extlib/phergie/Phergie/Plugin/Handler.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Handler.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Phergie 
+ * Phergie
  *
  * PHP version 5
  *
@@ -11,7 +11,7 @@
  * It is also available through the world-wide-web at this URL:
  * http://phergie.org/license
  *
- * @category  Phergie 
+ * @category  Phergie
  * @package   Phergie
  * @author    Phergie Development Team <team@phergie.org>
  * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
@@ -22,13 +22,13 @@
 /**
  * Handles on-demand loading of, iteration over, and access to plugins.
  *
- * @category Phergie 
+ * @category Phergie
  * @package  Phergie
  * @author   Phergie Development Team <team@phergie.org>
  * @license  http://phergie.org/license New BSD License
  * @link     http://pear.phergie.org/package/Phergie
  */
-class Phergie_Plugin_Handler implements IteratorAggregate
+class Phergie_Plugin_Handler implements IteratorAggregate, Countable
 {
     /**
      * Current list of plugin instances
@@ -45,7 +45,7 @@ class Phergie_Plugin_Handler implements IteratorAggregate
     protected $paths;
 
     /**
-     * Flag indicating whether plugin classes should be instantiated on 
+     * Flag indicating whether plugin classes should be instantiated on
      * demand if they are requested but no instance currently exists
      *
      * @var bool
@@ -69,13 +69,13 @@ class Phergie_Plugin_Handler implements IteratorAggregate
     protected $events;
 
     /**
-     * Constructor to initialize class properties and add the path for core 
+     * Constructor to initialize class properties and add the path for core
      * plugins.
      *
      * @param Phergie_Config        $config configuration to pass to any
-     *                                      instantiated plugin
+     *        instantiated plugin
      * @param Phergie_Event_Handler $events event handler to pass to any
-     *                                      instantiated plugin
+     *        instantiated plugin
      *
      * @return void
      */
@@ -99,7 +99,7 @@ class Phergie_Plugin_Handler implements IteratorAggregate
      * the reverse order in which they are added.
      *
      * @param string $path   Filesystem directory path
-     * @param string $prefix Optional class name prefix corresponding to the 
+     * @param string $prefix Optional class name prefix corresponding to the
      *        path
      *
      * @return Phergie_Plugin_Handler Provides a fluent interface
@@ -123,12 +123,43 @@ class Phergie_Plugin_Handler implements IteratorAggregate
     }
 
     /**
-     * Adds a plugin instance to the handler. 
+     * Returns metadata corresponding to a specified plugin.
      *
-     * @param string|Phergie_Plugin_Abstract $plugin Short name of the 
+     * @param string $plugin Short name of the plugin class
+     * @throws Phergie_Plugin_Exception Class file can't be found
+     *
+     * @return array|boolean Associative array containing the path to the
+     *         class file and its containing directory as well as the full
+     *         class name
+     */
+    public function getPluginInfo($plugin)
+    {
+       foreach (array_reverse($this->paths) as $path) {
+            $file = $path['path'] . $plugin . '.php';
+            if (file_exists($file)) {
+                $path = array(
+                    'dir' => $path['path'],
+                    'file' => $file,
+                    'class' => $path['prefix'] . $plugin,
+                );
+                return $path;
+            }
+        }
+
+        // If the class can't be found, display an error
+        throw new Phergie_Plugin_Exception(
+            'Class file for plugin "' . $plugin . '" cannot be found',
+            Phergie_Plugin_Exception::ERR_CLASS_NOT_FOUND
+        );
+    }
+
+    /**
+     * Adds a plugin instance to the handler.
+     *
+     * @param string|Phergie_Plugin_Abstract $plugin Short name of the
      *        plugin class or a plugin object
-     * @param array                          $args   Optional array of 
-     *        arguments to pass to the plugin constructor if a short name is 
+     * @param array                          $args   Optional array of
+     *        arguments to pass to the plugin constructor if a short name is
      *        passed for $plugin
      *
      * @return Phergie_Plugin_Abstract New plugin instance
@@ -143,30 +174,21 @@ class Phergie_Plugin_Handler implements IteratorAggregate
             }
 
             // Attempt to locate and load the class
-            foreach (array_reverse($this->paths) as $path) {
-                $file = $path['path'] . $plugin . '.php';
-                if (file_exists($file)) {
-                    include_once $file;
-                    $class = $path['prefix'] . $plugin;
-                    if (class_exists($class)) {
-                        break;
-                    }
-                    unset($class);
-                }
-            }
-
-            // If the class can't be found, display an error
-            if (!isset($class)) {
+            $info = $this->getPluginInfo($plugin);
+            $file = $info['file'];
+            $class = $info['class'];
+            include_once $file;
+            if (!class_exists($class, false)) {
                 throw new Phergie_Plugin_Exception(
-                    'Class file for plugin "' . $plugin . '" cannot be found',
+                    'File "' . $file . '" does not contain class "' . $class . '"',
                     Phergie_Plugin_Exception::ERR_CLASS_NOT_FOUND
                 );
             }
 
-            // Check to ensure the class is a plugin class 
+            // Check to ensure the class is a plugin class
             if (!is_subclass_of($class, 'Phergie_Plugin_Abstract')) {
                 $msg
-                    = 'Class for plugin "' . $plugin . 
+                    = 'Class for plugin "' . $plugin .
                     '" does not extend Phergie_Plugin_Abstract';
                 throw new Phergie_Plugin_Exception(
                     $msg,
@@ -190,11 +212,7 @@ class Phergie_Plugin_Handler implements IteratorAggregate
                 $instance = new $class;
             }
 
-            // Configure and add the instance 
-            $instance->setPluginHandler($this);
-            $instance->setConfig($this->config);
-            $instance->setEventHandler($this->events);
-            $instance->onLoad();
+            // Store the instance
             $this->plugins[$index] = $instance;
             $plugin = $instance;
 
@@ -205,14 +223,20 @@ class Phergie_Plugin_Handler implements IteratorAggregate
             $this->plugins[strtolower($plugin->getName())] = $plugin;
         }
 
+        // Configure and initialize the instance
+        $plugin->setPluginHandler($this);
+        $plugin->setConfig($this->config);
+        $plugin->setEventHandler($this->events);
+        $plugin->onLoad();
+
         return $plugin;
     }
 
     /**
      * Adds multiple plugin instances to the handler.
      *
-     * @param array $plugins List of elements where each is of the form 
-     *        'ShortPluginName' or array('ShortPluginName', array($arg1, 
+     * @param array $plugins List of elements where each is of the form
+     *        'ShortPluginName' or array('ShortPluginName', array($arg1,
      *        ..., $argN))
      *
      * @return Phergie_Plugin_Handler Provides a fluent interface
@@ -233,7 +257,7 @@ class Phergie_Plugin_Handler implements IteratorAggregate
     /**
      * Removes a plugin instance from the handler.
      *
-     * @param string|Phergie_Plugin_Abstract $plugin Short name of the 
+     * @param string|Phergie_Plugin_Abstract $plugin Short name of the
      *        plugin class or a plugin object
      *
      * @return Phergie_Plugin_Handler Provides a fluent interface
@@ -251,7 +275,7 @@ class Phergie_Plugin_Handler implements IteratorAggregate
     }
 
     /**
-     * Returns the corresponding instance for a specified plugin, loading it 
+     * Returns the corresponding instance for a specified plugin, loading it
      * if it is not already loaded and autoloading is enabled.
      *
      * @param string $name Short name of the plugin class
@@ -268,8 +292,8 @@ class Phergie_Plugin_Handler implements IteratorAggregate
 
         // If autoloading is disabled, display an error
         if (!$this->autoload) {
-            $msg 
-                = 'Plugin "' . $name . '" has been requested, ' . 
+            $msg
+                = 'Plugin "' . $name . '" has been requested, ' .
                 'is not loaded, and autoload is disabled';
             throw new Phergie_Plugin_Exception(
                 $msg,
@@ -285,17 +309,23 @@ class Phergie_Plugin_Handler implements IteratorAggregate
     }
 
     /**
-     * Returns the corresponding instances for multiple specified plugins, 
-     * loading them if they are not already loaded and autoloading is 
+     * Returns the corresponding instances for multiple specified plugins,
+     * loading them if they are not already loaded and autoloading is
      * enabled.
      *
-     * @param array $names List of short names of the plugin classes
+     * @param array $names Optional list of short names of the plugin
+     *        classes to which the returned plugin list will be limited,
+     *        defaults to all presently loaded plugins
      *
-     * @return array Associative array mapping plugin class short names to 
-     *         corresponding plugin instances
+     * @return array Associative array mapping lowercased plugin class short
+     *         names to corresponding plugin instances
      */
-    public function getPlugins(array $names)
+    public function getPlugins(array $names = array())
     {
+        if (empty($names)) {
+            return $this->plugins;
+        }
+
         $plugins = array();
         foreach ($names as $name) {
             $plugins[$name] = $this->getPlugin($name);
@@ -304,7 +334,7 @@ class Phergie_Plugin_Handler implements IteratorAggregate
     }
 
     /**
-     * Returns whether or not at least one instance of a specified plugin 
+     * Returns whether or not at least one instance of a specified plugin
      * class is loaded.
      *
      * @param string $name Short name of the plugin class
@@ -317,10 +347,10 @@ class Phergie_Plugin_Handler implements IteratorAggregate
     }
 
     /**
-     * Sets a flag used to determine whether plugins should be loaded 
+     * Sets a flag used to determine whether plugins should be loaded
      * automatically if they have not been explicitly loaded.
      *
-     * @param bool $flag TRUE to have plugins autoload (default), FALSE 
+     * @param bool $flag TRUE to have plugins autoload (default), FALSE
      *        otherwise
      *
      * @return Phergie_Plugin_Handler Provides a fluent interface.
@@ -333,7 +363,7 @@ class Phergie_Plugin_Handler implements IteratorAggregate
     }
 
     /**
-     * Returns the value of a flag used to determine whether plugins should 
+     * Returns the value of a flag used to determine whether plugins should
      * be loaded automatically if they have not been explicitly loaded.
      *
      * @return bool TRUE if autoloading is enabled, FALSE otherwise
@@ -344,7 +374,7 @@ class Phergie_Plugin_Handler implements IteratorAggregate
     }
 
     /**
-     * Allows plugin instances to be accessed as properties of the handler. 
+     * Allows plugin instances to be accessed as properties of the handler.
      *
      * @param string $name Short name of the plugin
      *
@@ -352,7 +382,7 @@ class Phergie_Plugin_Handler implements IteratorAggregate
      */
     public function __get($name)
     {
-        return $this->getPlugin($name); 
+        return $this->getPlugin($name);
     }
 
     /**
@@ -390,14 +420,14 @@ class Phergie_Plugin_Handler implements IteratorAggregate
     }
 
     /**
-     * Proxies method calls to all plugins containing the called method. An  
-     * individual plugin may short-circuit this process by explicitly 
+     * Proxies method calls to all plugins containing the called method. An
+     * individual plugin may short-circuit this process by explicitly
      * returning FALSE.
      *
      * @param string $name Name of the method called
      * @param array  $args Arguments passed in the method call
      *
-     * @return bool FALSE if a plugin short-circuits processing by returning 
+     * @return bool FALSE if a plugin short-circuits processing by returning
      *         FALSE, TRUE otherwise
      */
     public function __call($name, array $args)
@@ -409,4 +439,14 @@ class Phergie_Plugin_Handler implements IteratorAggregate
         }
         return true;
     }
+
+    /**
+     * Returns the number of plugins contained within the handler.
+     *
+     * @return int Plugin count
+     */
+    public function count()
+    {
+        return count($this->plugins);
+    }
 }
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Help.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Help.php
index 0de13308db..7cc8349571 100644
--- a/plugins/Irc/extlib/phergie/Phergie/Plugin/Help.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Help.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Phergie 
+ * Phergie
  *
  * PHP version 5
  *
@@ -11,7 +11,7 @@
  * It is also available through the world-wide-web at this URL:
  * http://phergie.org/license
  *
- * @category  Phergie 
+ * @category  Phergie
  * @package   Phergie_Plugin_Help
  * @author    Phergie Development Team <team@phergie.org>
  * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
@@ -22,7 +22,7 @@
 /**
  * Provides access to descriptions of plugins and the commands they provide.
  *
- * @category Phergie 
+ * @category Phergie
  * @package  Phergie_Plugin_Help
  * @author   Phergie Development Team <team@phergie.org>
  * @license  http://phergie.org/license New BSD License
@@ -60,11 +60,11 @@ class Phergie_Plugin_Help extends Phergie_Plugin_Abstract
     }
 
     /**
-     * Displays a list of plugins with help information available or 
+     * Displays a list of plugins with help information available or
      * commands available for a specific plugin.
      *
-     * @param string $plugin Short name of the plugin for which commands 
-     *        should be returned, else a list of plugins with help 
+     * @param string $plugin Short name of the plugin for which commands
+     *        should be returned, else a list of plugins with help
      *        information available is returned
      *
      * @return void
@@ -94,13 +94,13 @@ class Phergie_Plugin_Help extends Phergie_Plugin_Abstract
                 && isset($this->registry[strtolower($plugin)]['cmd'])
             ) {
                 $msg
-                    = 'The ' . 
-                    $plugin . 
+                    = 'The ' .
+                    $plugin .
                     ' plugin exposes the commands shown below.';
                 $this->doPrivMsg($nick, $msg);
                 if ($this->getConfig('command.prefix')) {
                     $msg
-                        = 'Note that these commands must be prefixed with "' .  
+                        = 'Note that these commands must be prefixed with "' .
                         $this->getConfig('command.prefix') .
                         '" (without quotes) when issued in a public channel.';
                     $this->doPrivMsg($nick, $msg);
@@ -122,10 +122,10 @@ class Phergie_Plugin_Help extends Phergie_Plugin_Abstract
 
     /**
      * Sets the description for the plugin instance
-     * 
+     *
      * @param Phergie_Plugin_Abstract $plugin      plugin instance
      * @param string                  $description plugin description
-     * 
+     *
      * @return void
      */
     public function setPluginDescription(
@@ -138,7 +138,7 @@ class Phergie_Plugin_Help extends Phergie_Plugin_Abstract
 
     /**
      * Sets the description for the command on the plugin instance
-     * 
+     *
      * @param Phergie_Plugin_Abstract $plugin      plugin instance
      * @param string                  $command     from onCommand method
      * @param string                  $description command description
@@ -158,7 +158,7 @@ class Phergie_Plugin_Help extends Phergie_Plugin_Abstract
      * registers the plugin with the help plugin. this will parse the docblocks
      * for specific annotations that this plugin will respond with when
      * queried.
-     * 
+     *
      * @param Phergie_Plugin_Abstract $plugin plugin instance
      *
      * @return void
@@ -191,7 +191,8 @@ class Phergie_Plugin_Help extends Phergie_Plugin_Abstract
     }
 
     /**
-     * Taken from PHPUnit/Util/Test.php:436
+     * Taken from PHPUnit/Util/Test.php:243 and modified to fix an issue
+     * with tag content spanning multiple lines.
      *
      * PHPUnit
      *
@@ -235,13 +236,16 @@ class Phergie_Plugin_Help extends Phergie_Plugin_Abstract
     {
         $annotations = array();
 
-        $regex = '/@(?P<name>[A-Za-z_-]+)(?:[ \t]+(?P<value>.*?))?[ \t]*\r?$/m';
+        $regex = '/@(?P<name>[A-Za-z_-]+)(?:[ \t]+(?P<value>.*?))?(?:\*\/|\* @)/ms';
 
         if (preg_match_all($regex, $docblock, $matches)) {
             $numMatches = count($matches[0]);
 
             for ($i = 0; $i < $numMatches; ++$i) {
-                $annotations[$matches['name'][$i]][] = $matches['value'][$i];
+                $annotation = $matches['value'][$i];
+                $annotation = preg_replace('/\s*\v+\s*\*\s*/', ' ', $annotation);
+                $annotation = rtrim($annotation);
+                $annotations[$matches['name'][$i]][] = $annotation;
             }
         }
 
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Http/Response.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Http/Response.php
index def9d81c26..80d16c4b85 100644
--- a/plugins/Irc/extlib/phergie/Phergie/Plugin/Http/Response.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Http/Response.php
@@ -37,6 +37,43 @@ class Phergie_Plugin_Http_Response
      */
     protected $code;
 
+    /**
+     * HTTP response strings
+     *
+     * @var array
+     */
+    protected $codeStrings = array(
+        0   => 'No Response',
+        100 => 'Continue',
+        200 => 'OK',
+        201 => 'Created',
+        204 => 'No Content',
+        206 => 'Partial Content',
+        300 => 'Multiple Choices',
+        301 => 'Moved Permanently',
+        302 => 'Found',
+        303 => 'See Other',
+        304 => 'Not Modified',
+        307 => 'Temporary Redirect',
+        400 => 'Bad Request',
+        401 => 'Unauthorized',
+        403 => 'Forbidden',
+        404 => 'Not Found',
+        405 => 'Method Not Allowed',
+        406 => 'Not Acceptable',
+        408 => 'Request Timeout',
+        410 => 'Gone',
+        413 => 'Request Entity Too Large',
+        414 => 'Request URI Too Long',
+        415 => 'Unsupported Media Type',
+        416 => 'Requested Range Not Satisfiable',
+        417 => 'Expectation Failed',
+        500 => 'Internal Server Error',
+        501 => 'Method Not Implemented',
+        503 => 'Service Unavailable',
+        506 => 'Variant Also Negotiates'
+    );
+
     /**
      * Description of the HTTP response code or the error message if no HTTP 
      * response was received
@@ -89,6 +126,22 @@ class Phergie_Plugin_Http_Response
         return $this->code;
     }
 
+    /**
+     * Returns the HTTP response code text.
+     *
+     * @return string Response code text
+     */
+    public function getCodeAsString()
+    {
+        $code = $this->code;
+
+        if (!isset($this->codeStrings[$code])) {
+            return 'Unkown HTTP Status';
+        }
+
+        return $this->codeStrings[$code];
+    }
+
     /**
      * Returns whether the response indicates a client- or server-side error.
      *
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Php.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Php.php
index 29d5118023..94abfb031c 100644
--- a/plugins/Irc/extlib/phergie/Phergie/Plugin/Php.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Php.php
@@ -62,7 +62,6 @@ class Phergie_Plugin_Php extends Phergie_Plugin_Abstract
      */
     public function onConnect()
     {
-        // Construct a new data source
         $this->source = new Phergie_Plugin_Php_Source_Local;
     }
 
@@ -75,14 +74,13 @@ class Phergie_Plugin_Php extends Phergie_Plugin_Abstract
      */
     public function onCommandPhp($functionName)
     {
-        // Search for the function
+        $nick = $this->event->getNick();
         if ($function = $this->source->findFunction($functionName)) {
-            $msg = 'PHP ' . $function['name'] . ': ' . $function['description'];
+            $msg = $nick . ': ' . $function['description'];
+            $this->doPrivmsg($this->event->getSource(), $msg);
         } else {
             $msg = 'Search for function ' . $functionName . ' returned no results.';
+            $this->doNotice($nick, $msg);
         }
-        
-        // Return the result to the source
-        $this->doPrivmsg($this->getEvent()->getSource(), $msg);
     }
 }
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Php/Source/Local.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Php/Source/Local.php
index b72443c2e5..9292bea848 100644
--- a/plugins/Irc/extlib/phergie/Phergie/Plugin/Php/Source/Local.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Php/Source/Local.php
@@ -65,7 +65,8 @@ class Phergie_Plugin_Php_Source_Local implements Phergie_Plugin_Php_Source
             // @todo Modify this to be rethrown as an appropriate 
             //       Phergie_Plugin_Exception and handled in Phergie_Plugin_Php
         } catch (PDOException $e) {
-        }
+            echo 'PDO failure: '.$e->getMessage();
+        } 
     }
 
     /**
@@ -114,12 +115,16 @@ class Phergie_Plugin_Php_Source_Local implements Phergie_Plugin_Php_Source
     protected function buildDatabase($rebuild = false)
     {
         // Check to see if the functions table exists
-        $table = $this->database->exec("SELECT COUNT(*) FROM `sqlite_master` WHERE `name` = 'functions'");
-
+        $checkstmt = $this->database->query("SELECT COUNT(*) FROM `sqlite_master` WHERE `name` = 'functions'");
+        $checkstmt->execute();
+        $result = $checkstmt->fetch(PDO::FETCH_ASSOC);
+        unset( $checkstmt );
+        $table = $result['COUNT(*)'];
+        unset( $result );
         // If the table doesn't exist, create it
         if (!$table) {
-            $this->database->exec('CREATE TABLE `functions` (`name` VARCHAR(255), `description` TEXT)');
-            $this->database->exec('CREATE UNIQUE INDEX `functions_name` ON `functions` (`name`)');
+                $this->database->exec('CREATE TABLE `functions` (`name` VARCHAR(255), `description` TEXT)');
+                $this->database->exec('CREATE UNIQUE INDEX `functions_name` ON `functions` (`name`)');
         }
 
         // If we created a new table, fill it with data
@@ -160,7 +165,7 @@ class Phergie_Plugin_Php_Source_Local implements Phergie_Plugin_Php_Source
                     // ... it's the last part of the complete function description
                     $completeLine = $firstPart . ' ' . $line;
                     $firstPart = '';
-                    if (preg_match('{^([^\s]*)[\s]?([^)]*)\(([^\)]*)\)[\sU]+([\sa-zA-Z0-9\.\-_]*)$}', $completeLine, $matches)) {
+                    if (preg_match('{^([^\s]*)[\s]?([^)]*)\(([^\)]*)\)[\sU]+([\sa-zA-Z0-9\.,\-_()]*)$}', $completeLine, $matches)) {
                         $valid[] = $matches;
                     }
                 }
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Reload.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Reload.php
new file mode 100755
index 0000000000..a2d680d7aa
--- /dev/null
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Reload.php
@@ -0,0 +1,96 @@
+<?php
+/**
+ * Phergie
+ *
+ * PHP version 5
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.
+ * It is also available through the world-wide-web at this URL:
+ * http://phergie.org/license
+ *
+ * @category  Phergie
+ * @package   Phergie_Plugin_Reload
+ * @author    Phergie Development Team <team@phergie.org>
+ * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
+ * @license   http://phergie.org/license New BSD License
+ * @link      http://pear.phergie.org/package/Phergie_Plugin_Reload
+ */
+
+/**
+ * Facilitates reloading of individual plugins for development purposes.
+ * Note that, because existing class definitions cannot be removed from
+ * memory, increased memory usage is an expected result of using this plugin.
+ *
+ * @category Phergie
+ * @package  Phergie_Plugin_Reload
+ * @author   Phergie Development Team <team@phergie.org>
+ * @license  http://phergie.org/license New BSD License
+ * @link     http://pear.phergie.org/package/Phergie_Plugin_Reload
+ * @uses     Phergie_Plugin_Command pear.phergie.org
+ */
+class Phergie_Plugin_Reload extends Phergie_Plugin_Abstract
+{
+    /**
+     * Checks for dependencies.
+     *
+     * @return void
+     */
+    public function onLoad()
+    {
+        $this->getPluginHandler()->getPlugin('Command');
+    }
+
+    /**
+     * Reloads a specified plugin.
+     *
+     * @param string $plugin Short name of the plugin to reload
+     *
+     * @return void
+     */
+    public function onCommandReload($plugin)
+    {
+        $plugin = ucfirst($plugin);
+
+        if (!$this->plugins->hasPlugin($plugin)) {
+            echo 'DEBUG(Reload): ' . ucfirst($plugin) . ' is not loaded yet, loading', PHP_EOL;
+            $this->plugins->getPlugin($plugin);
+            return;
+        }
+
+        try {
+            $info = $this->plugins->getPluginInfo($plugin);
+        } catch (Phergie_Plugin_Exception $e) {
+            $source = $this->event->getSource();
+            $nick = $this->event->getNick();
+            $this->doNotice($source, $nick . ': ' . $e->getMessage());
+            return;
+        }
+
+        $class = $info['class'];
+        $contents = file_get_contents($info['file']);
+        $newClass = $class . '_' . sha1($contents);
+
+        if (class_exists($newClass, false)) {
+            echo 'DEBUG(Reload): Class ', $class, ' has not changed since last reload', PHP_EOL;
+            return;
+        }
+
+        $contents = preg_replace(
+            array('/<\?(?:php)?/', '/class\s+' . $class . '/i'),
+            array('', 'class ' . $newClass),
+            $contents
+        );
+        eval($contents);
+
+        $instance = new $newClass;
+        $instance->setName($plugin);
+        $this->plugins
+            ->removePlugin($plugin)
+            ->addPlugin($instance);
+
+        echo 'DEBUG(Reload): Reloaded ', $class, ' to ', $newClass, PHP_EOL;
+    }
+}
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Remind.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Remind.php
index bfd5333674..cfb3c07e8c 100644
--- a/plugins/Irc/extlib/phergie/Phergie/Plugin/Remind.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Remind.php
@@ -27,16 +27,16 @@
  * @package  Phergie_Plugin_Remind
  * @author   Phergie Development Team <team@phergie.org>
  * @license  http://phergie.org/license New BSD License
- * @link     http://pear.phergie.org/package/Phergie_Plugin_Drink
+ * @link     http://pear.phergie.org/package/Phergie_Plugin_Remind
  * @uses     Phergie_Plugin_Command pear.phergie.org
- * @uses     Phergie_Plugin_Helper_Time pear.phergie.org
+ * @uses     Phergie_Plugin_Time pear.phergie.org
  */
 class Phergie_Plugin_Remind extends Phergie_Plugin_Abstract
 {
     /**
      * Number of reminders to show in public.
      */
-    const PUBLIC_REMINDERS = 3;
+    protected $publicReminders = 3;
 
     /**
      * PDO resource for a SQLite database containing the reminders.
@@ -64,11 +64,31 @@ class Phergie_Plugin_Remind extends Phergie_Plugin_Abstract
      */
     public function onLoad()
     {
-        $this->getPluginHandler()->getPlugin('Command');
-        $path = dirname(__FILE__) . '/reminder.db';
+        $plugins = $this->getPluginHandler();
+        $plugins->getPlugin('Command');
+        $plugins->getPlugin('Time');
+    }
+
+    /**
+     * Creates the database if it does not already exist.
+     *
+     * @return void
+     */
+    public function onConnect()
+    {
+        $dir = dirname(__FILE__) . '/' . $this->getName();
+        $path = $dir . '/reminder.db';
+        if (!file_exists($dir)) {
+            mkdir($dir);
+        }
 
         if (isset($this->config['remind.use_memory'])) {
-            $this->keepListInMemory = (bool)$this->config['remind.use_memory'];
+            $this->keepListInMemory = (bool) $this->config['remind.use_memory'];
+        }
+
+        if (isset($this->config['remind.public_reminders'])) {
+            $this->publicReminders = (int) $this->config['remind.public_reminders'];
+            $this->publicReminders = max($this->publicReminders, 0);
         }
 
         try {
@@ -222,19 +242,19 @@ class Phergie_Plugin_Remind extends Phergie_Plugin_Abstract
 
         // fetch and deliver messages
         $reminders = $this->fetchMessages($channel, $nick);
-        if (count($reminders) > self::PUBLIC_REMINDERS) {
-            $msgs = array_slice($reminders, 0, self::PUBLIC_REMINDERS);
-            $privmsgs = array_slice($reminders, self::PUBLIC_REMINDERS);
+        if (count($reminders) > $this->publicReminders) {
+            $msgs = array_slice($reminders, 0, $this->publicReminders);
+            $privmsgs = array_slice($reminders, $this->publicReminders);
         } else {
             $msgs = $reminders;
             $privmsgs = false;
         }
 
         foreach ($msgs as $msg) {
-            $ts = new Phergie_Plugin_Helper_Time($msg['time']);
+            $ts = $this->plugins->time->getCountdown($msg['time']);
             $formatted = sprintf(
                 '%s: (from %s, %s ago) %s',
-                $nick, $msg['sender'], $ts->getCountdown(), $msg['message']
+                $nick, $msg['sender'], $ts, $msg['message']
             );
             $this->doPrivmsg($channel, $formatted);
             $this->deleteMessage($msg['rowid'], $channel, $nick);
@@ -242,10 +262,10 @@ class Phergie_Plugin_Remind extends Phergie_Plugin_Abstract
 
         if ($privmsgs) {
             foreach ($privmsgs as $msg) {
-                $ts = new Phergie_Plugin_Helper_Time($msg['time']);
+                $ts = $this->plugins->time->getCountdown($msg['time']);
                 $formatted = sprintf(
                     'from %s, %s ago: %s',
-                    $msg['sender'], $ts->getCountdown(), $msg['message']
+                    $msg['sender'], $ts, $msg['message']
                 );
                 $this->doPrivmsg($nick, $formatted);
                 $this->deleteMessage($msg['rowid'], $channel, $nick);
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/SpellCheck.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/SpellCheck.php
new file mode 100644
index 0000000000..33240829d8
--- /dev/null
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/SpellCheck.php
@@ -0,0 +1,120 @@
+<?php
+/**
+ * Phergie 
+ *
+ * PHP version 5
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.
+ * It is also available through the world-wide-web at this URL:
+ * http://phergie.org/license
+ *
+ * @category  Phergie 
+ * @package   Phergie_Plugin_TerryChay
+ * @author    Phergie Development Team <team@phergie.org>
+ * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
+ * @license   http://phergie.org/license New BSD License
+ * @link      http://pear.phergie.org/package/Phergie_Plugin_TerryChay
+ */
+
+/**
+ * Handles requests for checking spelling of specified words and returning
+ * either confirmation of correctly spelled words or potential correct
+ * spellings for misspelled words.
+ *
+ * @category Phergie 
+ * @package  Phergie_Plugin_SpellCheck
+ * @author   Phergie Development Team <team@phergie.org>
+ * @license  http://phergie.org/license New BSD License
+ * @link     http://pear.phergie.org/package/Phergie_Plugin_TerryChay
+ * @uses     Phergie_Plugin_Command pear.phergie.org
+ * @uses     extension pspell
+ */
+class Phergie_Plugin_SpellCheck extends Phergie_Plugin_Abstract
+{
+
+    /**
+     * Spell check dictionary handler
+     *
+     * @var resource
+     */
+    protected $pspell;
+
+    /**
+     * Limit on the number of potential correct spellings returned
+     *
+     * @var int
+     */
+    protected $limit;
+
+    /**
+     * Check for dependencies.
+     *
+     * @return void
+     */
+    public function onLoad()
+    {
+        if (!extension_loaded('pspell')) {
+            $this->fail('pspell php extension is required');
+        }
+
+        if (!$this->getConfig('spellcheck.lang')) {
+            $this->fail('Setting spellcheck.lang must be filled-in');
+        }
+
+        $this->plugins->getPlugin('Command');
+       
+        set_error_handler(array($this, 'loadDictionaryError'));
+        $this->pspell = pspell_new($this->getConfig('spellcheck.lang'));
+        restore_error_handler();
+
+        $this->limit = $this->getConfig('spellcheck.limit', 5);
+    }
+
+    /**
+     * Intercepts and handles requests for spell checks.
+     *
+     * @param string $word the string to perform checks against
+     *
+     * @return void
+     */
+    public function onCommandSpell($word)
+    {
+        $source = $this->event->getSource();
+        $target = $this->event->getNick();
+
+        $message  = $target . ': The word "' . $word;
+        $message .= '" seems to be spelt correctly.';
+        if (!pspell_check($this->pspell, $word)) {
+            $suggestions = pspell_suggest($this->pspell, $word);
+           
+            $message  = $target; 
+            $message .= ': I could not find any suggestions for "' . $word . '".';
+            if (!empty($suggestions)) {
+                $suggestions = array_splice($suggestions, 0, $this->limit);
+                $message     = $target . ': Suggestions for "';
+                $message    .= $word . '": ' . implode(', ', $suggestions) . '.';
+            }
+        }
+         
+        $this->doPrivmsg($source, $message);
+    }
+
+    /**
+     * Handle any errors from loading dictionary
+     *
+     * @param integer $errno   Error code
+     * @param string  $errstr  Error message
+     * @param string  $errfile File that errored
+     * @param integer $errline Line where the error happened
+     *
+     * @return void
+     */
+    protected function loadDictionaryError($errno, $errstr, $errfile, $errline)
+    {
+        $this->fail($errstr);
+    }
+
+}
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Tld.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Tld.php
new file mode 100644
index 0000000000..21ba1e6719
--- /dev/null
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Tld.php
@@ -0,0 +1,261 @@
+<?php
+
+/**
+ * Phergie
+ *
+ * PHP version 5
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.
+ * It is also available through the world-wide-web at this URL:
+ * http://phergie.org/license
+ *
+ * @category  Phergie
+ * @package   Phergie_Plugin_Url
+ * @author    Phergie Development Team <team@phergie.org>
+ * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
+ * @license   http://phergie.org/license New BSD License
+ * @link      http://pear.phergie.org/package/Phergie_Plugin_Url
+ */
+
+/**
+ * Responds to a request for a TLD (formatted as .tld where tld is the TLD to
+ * be looked up) with its corresponding description.
+ *
+ * @category Phergie
+ * @package  Phergie_Plugin_Tld
+ * @author   Phergie Development Team <team@phergie.org>
+ * @license  http://phergie.org/license New BSD License
+ * @link     http://pear.phergie.org/package/Phergie_Plugin_Tld
+ * @uses     Phergie_Plugin_Http pear.phergie.org
+ *
+ * @pluginDesc Provides information for a top level domain.
+ */
+class Phergie_Plugin_Tld extends Phergie_Plugin_Abstract
+{
+    /**
+     * connection to the database
+     * @var PDO
+     */
+    protected $db;
+    /**
+     * Some fixed TLD values, keys must be lowercase
+     * @var array
+     */
+    protected static $fixedTlds;
+
+    /**
+     * Prepared statement for selecting a single tld
+     * @var PDOStatement
+     */
+    protected $select;
+
+    /**
+     * Prepared statement for selecting all tlds
+     * @var PDOStatement
+     */
+    protected $selectAll;
+
+    /**
+     * Checks for dependencies, sets up database and hard coded values
+     *
+     * @return void
+     */
+    public function onLoad()
+    {
+        $help = $this->getPluginHandler()->getPlugin('Help');
+        $help->register($this);
+
+        if (!is_array(self::$fixedTlds)) {
+            self::$fixedTlds = array(
+                'phergie' => 'You can find Phergie at http://www.phergie.org',
+                'spoon'   => 'Don\'t you know? There is no spoon!',
+                'poo'     => 'Do you really think that\'s funny?',
+                'root'    => 'Diagnostic marker to indicate '
+                . 'a root zone load was not truncated.'
+            );
+        }
+
+        try {
+            $dbFile = dirname(__FILE__) . '/Tld/tld.db';
+            $dbManager = new Phergie_Db_Sqlite($dbFile);
+            $this->db = $dbManager->getDb();
+            if (!$dbManager->hasTable('tld')) {
+                $query = 'CREATE TABLE tld ('
+                        . 'tld VARCHAR(20), '
+                        . 'type VARCHAR(20), '
+                        . 'description VARCHAR(255))';
+
+                $this->db->exec($query);
+
+                // prepare a statement to populate the table with
+                // tld information
+                $insert = $this->db->prepare(
+                    'INSERT INTO tld
+                    (tld, type, description)
+                    VALUES (:tld, :type, :description)'
+                );
+
+                // grab tld data from iana.org...
+                $contents = file_get_contents(
+                    'http://www.iana.org/domains/root/db/'
+                );
+
+                // ...and then parse it out
+                $regex = '{<tr class="iana-group[^>]*><td><a[^>]*>\s*\.?([^<]+)\s*'
+                        . '(?:<br/><span[^>]*>[^<]*</span>)?</a></td><td>\s*'
+                        . '([^<]+)\s*</td><td>\s*([^<]+)\s*}i';
+                preg_match_all($regex, $contents, $matches, PREG_SET_ORDER);
+
+                foreach ($matches as $match) {
+                    list(, $tld, $type, $description) = array_pad($match, 4, null);
+                    $type = trim(strtolower($type));
+                    if ($type != 'test') {
+                        $tld = trim(strtolower($tld));
+                        $description = trim($description);
+
+                        switch ($tld) {
+
+                        case 'com':
+                            $description = 'Commercial';
+                            break;
+
+                        case 'info':
+                            $description = 'Information';
+                            break;
+
+                        case 'net':
+                            $description = 'Network';
+                            break;
+
+                        case 'org':
+                            $description = 'Organization';
+                            break;
+
+                        case 'edu':
+                            $description = 'Educational';
+                            break;
+
+                        case 'name':
+                            $description = 'Individuals, by name';
+                            break;
+                        }
+
+                        if (empty($tld) || empty($description)) {
+                            continue;
+                        }
+
+                        $regex = '{(^(?:Reserved|Restricted)\s*(?:exclusively\s*)?'
+                                 . '(?:for|to)\s*(?:members of\s*)?(?:the|support)?'
+                                 . '\s*|\s*as advised.*$)}i';
+                        $description = preg_replace($regex, '', $description);
+                        $description = ucfirst(trim($description));
+
+                        $data = array_map(
+                            'html_entity_decode', array(
+                                'tld' => $tld,
+                                'type' => $type,
+                                'description' => $description
+                            )
+                        );
+
+                        $insert->execute($data);
+                    }
+                }
+
+                unset(
+                    $insert,
+                    $matches,
+                    $match,
+                    $contents,
+                    $tld,
+                    $type,
+                    $description,
+                    $data,
+                    $regex
+                );
+            }
+
+            // Create a prepared statements for retrieving TLDs
+            $this->select = $this->db->prepare(
+                'SELECT type, description '
+                . 'FROM tld WHERE LOWER(tld) = LOWER(:tld)'
+            );
+
+            $this->selectAll = $this->db->prepare(
+                'SELECT tld, type, description FROM tld'
+            );
+        } catch (PDOException $e) {
+        }
+    }
+
+    /**
+     * takes a tld in the format '.tld' and returns its related data
+     *
+     * @param string $tld tld to process
+     *
+     * @return null
+     *
+     * @pluginCmd .[tld] request details about the tld
+     */
+    public function onCommandTld($tld)
+    {
+        $tld = ltrim($tld, '.');
+        $description = $this->getTld($tld);
+        $this->doPrivmsg(
+            $this->event->getSource(),
+            "{$this->getEvent()->getNick()}: .{$tld} -> "
+            . ($description ? $description : 'Unknown TLD')
+        );
+    }
+
+    /**
+     * Retrieves the definition for a given TLD if it exists
+     *
+     * @param string $tld TLD to search for
+     *
+     * @return string Definition of the given TLD
+     */
+    public function getTld($tld)
+    {
+        $tld = trim(strtolower($tld));
+        if (isset(self::$fixedTlds[$tld])) {
+            return self::$fixedTlds[$tld];
+        } else {
+            if ($this->select->execute(array('tld' => $tld))) {
+                $tlds = $this->select->fetch();
+                if (is_array($tlds)) {
+                    return '(' . $tlds['type'] . ') ' . $tlds['description'];
+                }
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Retrieves a list of all the TLDs and their definitions
+     *
+     * @return array Array of all the TLDs and their definitions
+     */
+    public function getTlds()
+    {
+        if ($this->selectAll->execute()) {
+            $tlds = $this->selectAll->fetchAll();
+            if (is_array($tlds)) {
+                $tldinfo = array();
+                foreach ($tlds as $key => $tld) {
+                    if (!empty($tld['tld'])) {
+                        $tldinfo[$tld['tld']] = "({$tld['type']}) "
+                        . $tld['description'];
+                    }
+                }
+                unset($tlds);
+                return $tldinfo;
+            }
+        }
+        return false;
+    }
+}
+
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Url.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Url.php
index 8fc1c3538e..2ea33befdf 100644
--- a/plugins/Irc/extlib/phergie/Phergie/Plugin/Url.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Url.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Phergie 
+ * Phergie
  *
  * PHP version 5
  *
@@ -11,7 +11,7 @@
  * It is also available through the world-wide-web at this URL:
  * http://phergie.org/license
  *
- * @category  Phergie 
+ * @category  Phergie
  * @package   Phergie_Plugin_Url
  * @author    Phergie Development Team <team@phergie.org>
  * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
@@ -23,30 +23,31 @@
  * Monitors incoming messages for instances of URLs and responds with messages
  * containing relevant information about detected URLs.
  *
- * Has an utility method accessible via 
+ * Has an utility method accessible via
  * $this->getPlugin('Url')->getTitle('http://foo..').
  *
- * @category Phergie 
+ * @category Phergie
  * @package  Phergie_Plugin_Url
  * @author   Phergie Development Team <team@phergie.org>
  * @license  http://phergie.org/license New BSD License
  * @link     http://pear.phergie.org/package/Phergie_Plugin_Url
+ * @uses     Phergie_Plugin_Http pear.phergie.org
  */
 class Phergie_Plugin_Url extends Phergie_Plugin_Abstract
 {
     /**
      * Links output format
      *
-     * Can use the variables %nick%, %title% and %link% in it to display 
+     * Can use the variables %nick%, %title% and %link% in it to display
      * page titles and links
      *
      * @var string
      */
-    protected $baseFormat = '%nick%: %message%';
+    protected $baseFormat = '%message%';
     protected $messageFormat = '[ %link% ] %title%';
 
     /**
-     * Flag indicating whether a single response should be sent for a single 
+     * Flag indicating whether a single response should be sent for a single
      * message containing multiple links
      *
      * @var bool
@@ -61,7 +62,7 @@ class Phergie_Plugin_Url extends Phergie_Plugin_Abstract
     protected $titleLength = 40;
 
     /**
-     * Url cache to prevent spamming, especially with multiple bots on the 
+     * Url cache to prevent spamming, especially with multiple bots on the
      * same channel
      *
      * @var array
@@ -88,16 +89,16 @@ class Phergie_Plugin_Url extends Phergie_Plugin_Abstract
     protected $limit = 10;
 
     /**
-     * Flag that determines if the plugin will fall back to using an HTTP 
-     * stream when a URL using SSL is detected and OpenSSL support isn't 
-     * available in the PHP installation in use 
+     * Flag that determines if the plugin will fall back to using an HTTP
+     * stream when a URL using SSL is detected and OpenSSL support isn't
+     * available in the PHP installation in use
      *
      * @var bool
      */
     protected $sslFallback = true;
 
     /**
-     * Flag that is set to true by the custom error handler if an HTTP error 
+     * Flag that is set to true by the custom error handler if an HTTP error
      * code has been received
      *
      * @var boolean
@@ -106,7 +107,7 @@ class Phergie_Plugin_Url extends Phergie_Plugin_Abstract
     protected $errorMessage = null;
 
     /**
-     * Flag indicating whether or not to display error messages as the title 
+     * Flag indicating whether or not to display error messages as the title
      * if a link posted encounters an error
      *
      * @var boolean
@@ -121,7 +122,7 @@ class Phergie_Plugin_Url extends Phergie_Plugin_Abstract
     protected $detectSchemeless = false;
 
     /**
-     * List of error messages to return when the requested URL returns an 
+     * List of error messages to return when the requested URL returns an
      * HTTP error
      *
      * @var array
@@ -184,7 +185,7 @@ class Phergie_Plugin_Url extends Phergie_Plugin_Abstract
         // make the shortener configurable
         $shortener = $this->getConfig('url.shortener', 'Trim');
         $shortener = "Phergie_Plugin_Url_Shorten_{$shortener}";
-        $this->shortener = new $shortener;
+        $this->shortener = new $shortener($this->plugins->getPlugin('Http'));
 
         if (!$this->shortener instanceof Phergie_Plugin_Url_Shorten_Abstract) {
             $this->fail("Declared shortener class {$shortener} is not of proper ancestry");
@@ -192,17 +193,9 @@ class Phergie_Plugin_Url extends Phergie_Plugin_Abstract
 
         // Get a list of valid TLDs
         if (!is_array($this->tldList) || count($this->tldList) <= 6) {
-            /* Omitted for port
-            if ($this->pluginLoaded('Tld')) {
-                $this->tldList = Phergie_Plugin_Tld::getTlds();
-                if (is_array($this->tldList)) {
-                    $this->tldList = array_keys($this->tldList);
-                }
-            }
-            */
-            if (!is_array($this->tldList) || count($this->tldList) <= 0) {
-                $this->tldList = array('ac', 'ad', 'ae', 'aero', 'af', 'ag', 'ai', 'al', 'am', 'an', 'ao', 'aq', 'ar', 'arpa', 'as', 'asia', 'at', 'au', 'aw', 'ax', 'az', 'ba', 'bb', 'bd', 'be', 'bf', 'bg', 'bh', 'bi', 'biz', 'bj', 'bl', 'bm', 'bn', 'bo', 'br', 'bs', 'bt', 'bv', 'bw', 'by', 'bz', 'ca', 'cat', 'cc', 'cd', 'cf', 'cg', 'ch', 'ci', 'ck', 'cl', 'cm', 'cn', 'co', 'com', 'coop', 'cr', 'cu', 'cv', 'cx', 'cy', 'cz', 'de', 'dj', 'dk', 'dm', 'do', 'dz', 'ec', 'edu', 'ee', 'eg', 'eh', 'er', 'es', 'et', 'eu', 'fi', 'fj', 'fk', 'fm', 'fo', 'fr', 'ga', 'gb', 'gd', 'ge', 'gf', 'gg', 'gh', 'gi', 'gl', 'gm', 'gn', 'gov', 'gp', 'gq', 'gr', 'gs', 'gt', 'gu', 'gw', 'gy', 'hk', 'hm', 'hn', 'hr', 'ht', 'hu', 'id', 'ie', 'il', 'im', 'in', 'info', 'int', 'io', 'iq', 'ir', 'is', 'it', 'je', 'jm', 'jo', 'jobs', 'jp', 'ke', 'kg', 'kh', 'ki', 'km', 'kn', 'kp', 'kr', 'kw', 'ky', 'kz', 'la', 'lb', 'lc', 'li', 'lk', 'lr', 'ls', 'lt', 'lu', 'lv', 'ly', 'ma', 'mc', 'md', 'me', 'mf', 'mg', 'mh', 'mil', 'mk', 'ml', 'mm', 'mn', 'mo', 'mobi', 'mp', 'mq', 'mr', 'ms', 'mt', 'mu', 'museum', 'mv', 'mw', 'mx', 'my', 'mz', 'na', 'name', 'nc', 'ne', 'net', 'nf', 'ng', 'ni', 'nl', 'no', 'np', 'nr', 'nu', 'nz', 'om', 'org', 'pa', 'pe', 'pf', 'pg', 'ph', 'pk', 'pl', 'pm', 'pn', 'pr', 'pro', 'ps', 'pt', 'pw', 'py', 'qa', 're', 'ro', 'rs', 'ru', 'rw', 'sa', 'sb', 'sc', 'sd', 'se', 'sg', 'sh', 'si', 'sj', 'sk', 'sl', 'sm', 'sn', 'so', 'sr', 'st', 'su', 'sv', 'sy', 'sz', 'tc', 'td', 'tel', 'tf', 'tg', 'th', 'tj', 'tk', 'tl', 'tm', 'tn', 'to', 'tp', 'tr', 'travel', 'tt', 'tv', 'tw', 'tz', 'ua', 'ug', 'uk', 'um', 'us', 'uy', 'uz', 'va', 'vc', 've', 'vg', 'vi', 'vn', 'vu', 'wf', 'ws', 'ye', 'yt', 'yu', 'za', 'zm', 'zw');
-            }
+            $tldPath = dirname(__FILE__) . '/Url/url.tld.txt';
+            $this->tldList = explode("\n", file_get_contents($tldPath));
+            $this->debug('Loaded ' . count($this->tldList) . ' tlds');
             rsort($this->tldList);
         }
 
@@ -215,6 +208,7 @@ class Phergie_Plugin_Url extends Phergie_Plugin_Abstract
                 'merge_links' => 'mergeLinks',
                 'title_length' => 'titleLength',
                 'show_errors' => 'showErrors',
+                'expire' => 'expire',
             ) as $config => $local) {
             if (isset($this->config["url.{$config}"])) {
                 $this->$local = $this->config["uri.{$config}"];
@@ -227,7 +221,7 @@ class Phergie_Plugin_Url extends Phergie_Plugin_Abstract
      * found, responds with its title if it is an HTML document and the
      * shortened equivalent of its original URL if it meets length requirements.
      *
-     * @todo Update this to pull configuration settings from $this->config 
+     * @todo Update this to pull configuration settings from $this->config
      *       rather than caching them as class properties
      * @return void
      */
@@ -306,6 +300,10 @@ class Phergie_Plugin_Url extends Phergie_Plugin_Abstract
 
                 // Convert url
                 $shortenedUrl = $this->shortener->shorten($url);
+                if (!$shortenedUrl) {
+                    $this->debug('Invalid Url: Unable to shorten. (' . $url . ')');
+                    continue;
+                }
 
                 // Prevent spamfest
                 if ($this->checkUrlCache($url, $shortenedUrl)) {
@@ -624,73 +622,29 @@ class Phergie_Plugin_Url extends Phergie_Plugin_Abstract
      */
     public function getTitle($url)
     {
-        $opts = array(
-            'http' => array(
-                'timeout' => 3.5,
-                'method' => 'GET',
-                'user_agent' => 'Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.8.1.12) Gecko/20080201 Firefox/2.0.0.12'
-            )
+        $http = $this->plugins->getPlugin('Http');
+        $options = array(
+            'timeout' => 3.5,
+            'user_agent' => 'Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.8.1.12) Gecko/20080201 Firefox/2.0.0.12'
         );
-        $context = stream_context_create($opts);
 
-        if ($page = fopen($url, 'r', false, $context)) {
-            stream_set_timeout($page, 3.5);
-            $data = stream_get_meta_data($page);
-            foreach ($data['wrapper_data'] as $header) {
-                if (preg_match('/^Content-Type: ([^;]+)/', $header, $match)
-                    && !preg_match('#^(text/x?html|application/xhtml+xml)$#', $match[1])
-                ) {
-                    $title = $match[1];
-                }
-            }
-            if (!isset($title)) {
-                $content = '';
-                $tstamp = time() + 5;
+        $response = $http->get($url, array(), $options);
 
-                while ($chunk = fread($page, 64)) {
-                    $data = stream_get_meta_data($page);
-                    if ($data['timed_out']) {
-                        $this->debug('Url Timed Out: ' . $url);
-                        $this->errorStatus = true;
-                        break;
-                    }
-                    $content .= $chunk;
-                    // Check for timeout
-                    if (time() > $tstamp) break;
-                    // Try to read title
-                    if (preg_match('#<title[^>]*>(.*)#is', $content, $m)) {
-                        // Start another loop to grab some more data in order to be sure we have the complete title
-                        $content = $m[1];
-                        $loop = 2;
-                        while (($chunk = fread($page, 64)) && $loop-- && !strstr($content, '<')) {
-                            $content .= $chunk;
-                            // Check for timeout
-                            if (time() > $tstamp) break;
-                        }
-                        preg_match('#^([^<]*)#is', $content, $m);
-                        $title = preg_replace('#\s+#', ' ', $m[1]);
-                        $title = trim($this->decode($title, $this->titleLength));
-                        break;
-                    }
-                    // Title won't appear beyond that point so stop parsing
-                    if (preg_match('#</head>|<body#i', $content)) {
-                        break;
-                    }
-                }
+        $header = $response->getHeaders('Content-Type');
+        if (!preg_match('#^(text/x?html|application/xhtml+xml)(?:;.*)?$#', $header)) {
+            $title = $header;
+        }
+
+        $content = $response->getContent();
+        if (empty($title)) {
+            if (preg_match('#<title[^>]*>(.*?)</title>#is', $content, $match)) {
+                $title = html_entity_decode(trim($match[1]));
             }
-            fclose($page);
-        } else if (!$this->errorStatus) {
-            $this->debug('Couldn\t Open Url: ' . $url);
         }
 
         if (empty($title)) {
-            if ($this->errorStatus) {
-                if (!$this->showErrors || empty($this->errorMessage)) {
-                    return;
-                }
-                $title = $this->errorMessage;
-                $this->errorStatus = false;
-                $this->errorMessage = null;
+            if ($response->isError()) {
+                $title = $response->getCodeAsString();
             } else {
                 $title = 'No Title';
             }
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Url/Shorten/Abstract.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Url/Shorten/Abstract.php
index bf5dff0d3b..607d1654c4 100644
--- a/plugins/Irc/extlib/phergie/Phergie/Plugin/Url/Shorten/Abstract.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Url/Shorten/Abstract.php
@@ -27,15 +27,79 @@
  * @author   Phergie Development Team <team@phergie.org>
  * @license  http://phergie.org/license New BSD License
  * @link     http://pear.phergie.org/package/Phergie_Plugin_Url
+ * @uses     Phergie_Plugin_Http pear.phergie.org
  */
 abstract class Phergie_Plugin_Url_Shorten_Abstract
 {
+    protected $http;
+
     /**
-     * Takes a long url and returns a shortened link
+     * Constructor
+     *
+     * @param Phergie_Plugin_Http $http instance of the http plugin
+     */
+    public function __construct(Phergie_Plugin_Http $http)
+    {
+        $this->http = $http;
+    }
+
+    /**
+     * Returns an array of request parameters given a url to shorten. The
+     * following keys are valid request parameters:
+     *
+     *  * 'uri': the URI for the request (required)
+     *  * 'query': an array of key-value pairs sent in a GET request
+     *  * 'post': an array of key-value pairs sent in a POST request
+     *  * 'callback': to be called after the request is finished. Should accept
+     *    a Phergie_Plugin_Http_Response object and return either the shortened
+     *    url or false if an error has occured.
+     *
+     * If the 'post' key is present a POST request shall be made; otherwise
+     * a GET request will be made. The 'post' key can be an empty array and
+     * a post request will still be made.
+     *
+     * If no callback is provided the contents of the response will be returned.
      *
      * @param string $url the url to shorten
      *
-     * @return string string the shortened url
+     * @return array the request parameters
      */
-    public abstract function shorten($url);
+    protected abstract function getRequestParams($url);
+
+    /**
+     * Shortens a given url.
+     *
+     * @param string $url the url to shorten
+     *
+     * @return string the shortened url or false on a failure
+     */
+    public function shorten($url)
+    {
+        $defaults = array('get' => array(), 'post' => array(), 'callback' => null);
+        $options = array('timeout' => 2);
+        $params = $this->getRequestParams($url) + $defaults;
+
+        // Should some kind of notice be thrown? Maybe just if getRequestParams does not return an array?
+        if (!is_array($params) || empty($params['uri'])) {
+            return $url;
+        }
+
+        if (!empty($params['post'])) {
+            $response = $this->http->post($params['uri'], $params['get'], $params['post'], $options);
+        } else {
+            $response = $this->http->get($params['uri'], $params['get'], $options);
+        }
+
+        if (is_callable($params['callback'])) {
+            return call_user_func($params['callback'], $response);
+        }
+
+        $code = $response->getCode();
+        $content = trim($response->getContent);
+        if ($code < 200 || $code >= 300 || empty($content)) {
+            return false;
+        }
+
+        return $response->getContent();
+    }
 }
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Url/Shorten/Trim.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Url/Shorten/Trim.php
index a90459b37e..af7e8a514f 100644
--- a/plugins/Irc/extlib/phergie/Phergie/Plugin/Url/Shorten/Trim.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Url/Shorten/Trim.php
@@ -31,14 +31,34 @@
 class Phergie_Plugin_Url_Shorten_Trim extends Phergie_Plugin_Url_Shorten_Abstract
 {
     /**
-     * Short a URL through the tr.im api
+     * Returns an array of request parameters given a url to shorten. The
+     * following keys are valid request parameters:
      *
      * @param string $url the url to shorten
      *
-     * @return string string the shortened url
+     * @return array the request parameters
      */
-    public function shorten($url)
+    protected function getRequestParams($url)
     {
-        return file_get_contents('http://api.tr.im/v1/trim_simple?url=' . rawurlencode($url));
+        return array(
+            'uri' => 'http://api.tr.im/v1/trim_simple?url=' . rawurlencode($url),
+            'callback' => array($this, 'onComplete')
+        );
+    }
+
+    /**
+     * Callback for when the URL has been shortened. Checks for error messages.
+     *
+     * @param Phergie_Plugin_Http_Response $response the response object
+     *
+     * @return string|bool the shortened url or false on failure
+     */
+    protected function onComplete($response)
+    {
+        if (strpos($response->getContent(), 'Error: ') === 0) {
+            return false;
+        }
+
+        return $response->getContent();
     }
 }
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Url/url.tld.txt b/plugins/Irc/extlib/phergie/Phergie/Plugin/Url/url.tld.txt
new file mode 100644
index 0000000000..cc46fdd620
--- /dev/null
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Url/url.tld.txt
@@ -0,0 +1,273 @@
+ac
+ad
+ae
+aero
+af
+ag
+ai
+al
+am
+an
+ao
+aq
+ar
+arpa
+as
+asia
+at
+au
+aw
+ax
+az
+ba
+bb
+bd
+be
+bf
+bg
+bh
+bi
+biz
+bj
+bl
+bm
+bn
+bo
+br
+bs
+bt
+bv
+bw
+by
+bz
+ca
+cat
+cc
+cd
+cf
+cg
+ch
+ci
+ck
+cl
+cm
+cn
+co
+com
+coop
+cr
+cu
+cv
+cx
+cy
+cz
+de
+dj
+dk
+dm
+do
+dz
+ec
+edu
+ee
+eg
+eh
+er
+es
+et
+eu
+fi
+fj
+fk
+fm
+fo
+fr
+ga
+gb
+gd
+ge
+gf
+gg
+gh
+gi
+gl
+gm
+gn
+gov
+gp
+gq
+gr
+gs
+gt
+gu
+gw
+gy
+hk
+hm
+hn
+hr
+ht
+hu
+id
+ie
+il
+im
+in
+info
+int
+io
+iq
+ir
+is
+it
+je
+jm
+jo
+jobs
+jp
+ke
+kg
+kh
+ki
+km
+kn
+kp
+kr
+kw
+ky
+kz
+la
+lb
+lc
+li
+lk
+lr
+ls
+lt
+lu
+lv
+ly
+ma
+mc
+md
+me
+mf
+mg
+mh
+mil
+mk
+ml
+mm
+mn
+mo
+mobi
+mp
+mq
+mr
+ms
+mt
+mu
+museum
+mv
+mw
+mx
+my
+mz
+na
+name
+nc
+ne
+net
+nf
+ng
+ni
+nl
+no
+np
+nr
+nu
+nz
+om
+org
+pa
+pe
+pf
+pg
+ph
+pk
+pl
+pm
+pn
+pr
+pro
+ps
+pt
+pw
+py
+qa
+re
+ro
+rs
+ru
+rw
+sa
+sb
+sc
+sd
+se
+sg
+sh
+si
+sj
+sk
+sl
+sm
+sn
+so
+sr
+st
+su
+sv
+sy
+sz
+tc
+td
+tel
+tf
+tg
+th
+tj
+tk
+tl
+tm
+tn
+to
+tp
+tr
+travel
+tt
+tv
+tw
+tz
+ua
+ug
+uk
+um
+us
+uy
+uz
+va
+vc
+ve
+vg
+vi
+vn
+vu
+wf
+ws
+ye
+yt
+yu
+za
+zm
+zw
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Weather.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Weather.php
new file mode 100755
index 0000000000..7d3cc1de03
--- /dev/null
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Weather.php
@@ -0,0 +1,132 @@
+<?php
+/**
+ * Phergie
+ *
+ * PHP version 5
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.
+ * It is also available through the world-wide-web at this URL:
+ * http://phergie.org/license
+ *
+ * @category  Phergie
+ * @package   Phergie_Plugin_Weather
+ * @author    Phergie Development Team <team@phergie.org>
+ * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
+ * @license   http://phergie.org/license New BSD License
+ * @link      http://pear.phergie.org/package/Phergie_Plugin_Weather
+ */
+
+/**
+ * Detects and responds to requests for current weather conditions in a
+ * particular location using data from a web service. Requires registering
+ * with weather.com to obtain authentication credentials, which must be
+ * stored in the configuration settings weather.partner_id and
+ * weather.license_key for the plugin to function.
+ *
+ * @category Phergie
+ * @package  Phergie_Plugin_Weather
+ * @author   Phergie Development Team <team@phergie.org>
+ * @license  http://phergie.org/license New BSD License
+ * @link     http://pear.phergie.org/package/Phergie_Plugin_Weather
+ * @link     http://www.weather.com/services/xmloap.html
+ * @uses     Phergie_Plugin_Command pear.phergie.org
+ * @uses     Phergie_Plugin_Http pear.phergie.org
+ * @uses     extension SimpleXML
+ */
+class Phergie_Plugin_Weather extends Phergie_Plugin_Abstract
+{
+    /**
+     * Checks for dependencies.
+     *
+     * @return void
+     */
+    public function onLoad()
+    {
+        $plugins = $this->getPluginHandler();
+        $plugins->getPlugin('Command');
+        $plugins->getPlugin('Http');
+
+        if (empty($this->config['weather.partner_id'])
+            || empty($this->config['weather.license_key'])) {
+            $this->fail('weather.partner_id and weather.license_key must be specified');
+        }
+    }
+
+    /**
+     * Returns a weather report for a specified location.
+     *
+     * @param string $location Zip code or city/state/country specification
+     *
+     * @return void
+     */
+    public function onCommandWeather($location)
+    {
+        $response = $this->plugins->http->get(
+            'http://xoap.weather.com/search/search',
+            array('where' => $location)
+        );
+
+        if ($response->isError()) {
+            $this->doNotice(
+                $this->event->getNick(),
+                'ERROR: ' . $response->getCode() . ' ' . $response->getMessage()
+            );
+            return;
+        }
+
+        $nick = $this->event->getNick();
+
+        $xml = $response->getContent();
+        if (count($xml->loc) == 0) {
+            $this->doNotice($nick, 'No results for that location.');
+            return;
+        }
+
+        $where = (string) $xml->loc[0]['id'];
+        $response = $this->plugins->http->get(
+            'http://xoap.weather.com/weather/local/' . $where,
+            array(
+                'cc' => '*',
+                'link' => 'xoap',
+                'prod' => 'xoap',
+                'par' => $this->config['weather.partner_id'],
+                'key' => $this->config['weather.license_key'],
+            )
+        );
+
+        if ($response->isError()) {
+            $this->doNotice(
+                $this->event->getNick(),
+                'ERROR: ' . $response->getCode() . ' ' . $response->getMessage()
+            );
+            return;
+        }
+
+        $xml = $response->getContent();
+        $weather = 'Weather for ' . (string) $xml->loc->dnam . ' - ';
+        $weather .= 'Current temperature ' .
+            (string) $xml->cc->tmp .
+            (string) $xml->head->ut . ' / ';
+        if ((string) $xml->head->ut == 'F') {
+            $weather .= round(((((int) $xml->cc->tmp - 32) * 5) / 9)) . 'C';
+        } else {
+            $weather .= round(((((int) $xml->cc->tmp * 9) / 5) + 32)) . 'F';
+        }
+        $weather .=
+            ', Relative humidity ' . (string) $xml->cc->hmid . '%' .
+            ', Current conditions ' . (string) $xml->cc->t .
+            ', Last update ' . (string) $xml->cc->lsup .
+            ' [ http://weather.com/weather/today/' .
+            str_replace(
+                array('(', ')', ',', ' '),
+                array('', '', '', '+'),
+                (string) $xml->loc->dnam
+            ) .
+            ' ]';
+
+        $this->doPrivmsg($this->event->getSource(), $nick . ': ' . $weather);
+    }
+}
diff --git a/plugins/Irc/extlib/phergie/Settings.php.dist b/plugins/Irc/extlib/phergie/Settings.php.dist
index b0450a4bb2..87b4a95c68 100755
--- a/plugins/Irc/extlib/phergie/Settings.php.dist
+++ b/plugins/Irc/extlib/phergie/Settings.php.dist
@@ -12,61 +12,62 @@ return array(
             'realname' => 'Matthew Turland',
             'nick' => 'Phergie2',
             // 'password' => 'password goes here if needed',
-            // 'transport' => 'ssl' // uncomment to connect using SSL
+            // 'transport' => 'ssl', // uncomment to connect using SSL
+            // 'encoding' => 'UTF8', // uncomment if using UTF8
         )
     ),
-    
-    'processor' => 'async',    
+
+    'processor' => 'async',
     'processor.options' => array('usec' => 200000),
     // Time zone. See: http://www.php.net/manual/en/timezones.php
     'timezone' => 'UTC',
 
     // Whitelist of plugins to load
     'plugins' => array(
-        // To enable a plugin, simply add a string to this array containing 
-        // the short name of the plugin as shown below. 
+        // To enable a plugin, simply add a string to this array containing
+        // the short name of the plugin as shown below.
 
         // 'ShortPluginName',
 
-        // Below is an example of enabling the AutoJoin plugin, for which 
-        // the corresponding PEAR package is Phergie_Plugin_AutoJoin. This 
-        // plugin allows you to set a list of channels in this configuration  
-        // file that the bot will automatically join when it connects to a 
-        // server. If you'd like to enable this plugin, simply install it, 
-        // uncomment the line below, and set a value for the setting 
-        // autojoin.channels (examples for which are located further down in 
+        // Below is an example of enabling the AutoJoin plugin, for which
+        // the corresponding PEAR package is Phergie_Plugin_AutoJoin. This
+        // plugin allows you to set a list of channels in this configuration
+        // file that the bot will automatically join when it connects to a
+        // server. If you'd like to enable this plugin, simply install it,
+        // uncomment the line below, and set a value for the setting
+        // autojoin.channels (examples for which are located further down in
         // this file).
 
         // 'AutoJoin',
 
         // A few other recommended plugins:
 
-        // Servers randomly send PING events to clients to ensure that 
-        // they're still connected and will eventually terminate the 
-        
-        // connection if a PONG response is not received. The Pong plugin 
+        // Servers randomly send PING events to clients to ensure that
+        // they're still connected and will eventually terminate the
+
+        // connection if a PONG response is not received. The Pong plugin
         // handles sending these responses.
 
-        // 'Pong', 
+        // 'Pong',
 
-        // It's sometimes difficult to distinguish between a lack of 
-        // activity on a server and the client not receiving data even 
-        // though a connection remains open. The Ping plugin performs a self 
-        // CTCP PING sporadically to ensure that its connection is still 
+        // It's sometimes difficult to distinguish between a lack of
+        // activity on a server and the client not receiving data even
+        // though a connection remains open. The Ping plugin performs a self
+        // CTCP PING sporadically to ensure that its connection is still
         // functioning and, if not, terminates the bot.
 
         // 'Ping',
 
-        // Sometimes it's desirable to have the bot disconnect gracefully 
-        // when issued a command to do so via a PRIVMSG event. The Quit 
-        // plugin implements this using the Command plugin to intercept the 
+        // Sometimes it's desirable to have the bot disconnect gracefully
+        // when issued a command to do so via a PRIVMSG event. The Quit
+        // plugin implements this using the Command plugin to intercept the
         // command.
 
         // 'Quit',
     ),
 
-    // If set to true, this allows any plugin dependencies for plugins 
-    // listed in the 'plugins' option to be loaded even if they are not 
+    // If set to true, this allows any plugin dependencies for plugins
+    // listed in the 'plugins' option to be loaded even if they are not
     // explicitly included in that list
     'plugins.autoload' => true,
 
@@ -83,13 +84,13 @@ return array(
 
     // Examples of setting values for Ping plugin settings
 
-    // This is the amount of time in seconds that the Ping plugin will wait 
-    // to receive an event from the server before it initiates a self-ping 
+    // This is the amount of time in seconds that the Ping plugin will wait
+    // to receive an event from the server before it initiates a self-ping
 
     // 'ping.event' => 300, // 5 minutes
 
-    // This is the amount of time in seconds that the Ping plugin will wait 
-    // following a self-ping attempt before it assumes that a response will 
+    // This is the amount of time in seconds that the Ping plugin will wait
+    // following a self-ping attempt before it assumes that a response will
     // never be received and terminates the connection
 
     // 'ping.ping' => 10, // 10 seconds
diff --git a/plugins/Irc/extlib/phergie/Tests/Phergie/Plugin/HandlerTest.php b/plugins/Irc/extlib/phergie/Tests/Phergie/Plugin/HandlerTest.php
index b359c11554..0d6ac454a8 100644
--- a/plugins/Irc/extlib/phergie/Tests/Phergie/Plugin/HandlerTest.php
+++ b/plugins/Irc/extlib/phergie/Tests/Phergie/Plugin/HandlerTest.php
@@ -37,6 +37,41 @@ class Phergie_Plugin_HandlerTest extends PHPUnit_Framework_TestCase
      */
     protected $handler;
 
+    /**
+     * Mock Phergie_Config instance passed to the plugin handler constructor
+     *
+     * @var Phergie_Config
+     */
+    protected $config;
+
+    /**
+     * Mock Phergie_Event_Handler instance passed to the plugin handler
+     * constructor
+     *
+     * @var Phergie_Event_Handler
+     */
+    protected $events;
+
+    /**
+     * Returns a mock plugin instance.
+     *
+     * @param string $name    Optional short name for the mock plugin, defaults
+     *        to 'TestPlugin'
+     * @param array  $methods Optional list of methods to override
+     *
+     * @return Phergie_Plugin_Abstract
+     */
+    protected function getMockPlugin($name = 'TestPlugin', array $methods = array())
+    {
+        $methods[] = 'getName';
+        $plugin = $this->getMock('Phergie_Plugin_Abstract', $methods);
+        $plugin
+            ->expects($this->any())
+            ->method('getName')
+            ->will($this->returnValue($name));
+        return $plugin;
+    }
+
     /**
      * Sets up a new handler instance before each test.
      *
@@ -44,69 +79,191 @@ class Phergie_Plugin_HandlerTest extends PHPUnit_Framework_TestCase
      */
     public function setUp()
     {
+        $this->config = $this->getMock('Phergie_Config');
+        $this->events = $this->getMock('Phergie_Event_Handler');
         $this->handler = new Phergie_Plugin_Handler(
-            new Phergie_Config(),
-            new Phergie_Event_Handler()
+            $this->config,
+            $this->events
         );
     }
 
     /**
-     * Destroys the handler instance after each test
+     * Tests iterability of the plugin handler.
      *
      * @return void
      */
-    public function tearDown()
-    {
-        unset($this->handler);
-    }
-
-    /**
-     * Ensures that we can iterate over the handler
-     *
-     * @return void
-     */
-    public function testImplementsIterator()
+    public function testImplementsIteratorAggregate()
     {
         $reflection = new ReflectionObject($this->handler);
+
         $this->assertTrue(
-            $reflection->implementsInterface('IteratorAggregate')
+            $reflection->implementsInterface('IteratorAggregate'),
+            'Handler does not implement IteratorAggregate'
         );
 
         $this->assertType(
-            'Iterator', $this->handler->getIterator(),
-            'getIterator() must actually return an Iterator'
+            'Iterator',
+            $this->handler->getIterator(),
+            'getIterator() must return an iterator'
         );
     }
 
     /**
-     * Ensures a newly instantiated handler does not have plugins associated
-     * with it
+     * Tests countability of the plugin handler.
      *
-     * @depends testImplementsIterator
+     * @return void
+     */
+    public function testImplementsCountable()
+    {
+        $reflection = new ReflectionObject($this->handler);
+
+        $this->assertTrue(
+            $reflection->implementsInterface('Countable'),
+            'Handler does not implement Countable'
+        );
+
+        $this->assertType(
+            'int',
+            count($this->handler),
+            'count() must return an integer'
+        );
+    }
+
+    /**
+     * Tests the plugin handler exposing added plugins as instance
+     * properties of the handler via isset().
+     *
+     * @return void
+     */
+    public function testImplementsIsset()
+    {
+        $pluginName = 'TestPlugin';
+        $this->assertFalse(isset($this->handler->{$pluginName}));
+        $plugin = $this->getMockPlugin($pluginName);
+        $this->handler->addPlugin($plugin);
+        $this->assertTrue(isset($this->handler->{$pluginName}));
+    }
+
+    /**
+     * Tests the plugin handler exposing added plugins as instance
+     * properties of the handler.
+     *
+     * @depends testImplementsIsset
+     * @return void
+     */
+    public function testImplementsGet()
+    {
+        $plugin = $this->getMockPlugin();
+        $this->handler->addPlugin($plugin);
+        $name = $plugin->getName();
+        $getPlugin = $this->handler->getPlugin($name);
+        $this->assertTrue(isset($this->handler->$name));
+        $get = $this->handler->$name;
+        $this->assertSame($getPlugin, $get);
+    }
+
+    /**
+     * Tests the plugin handler allowing for plugin removal via unset().
+     *
+     * @depends testImplementsGet
+     * @return void
+     */
+    public function testImplementsUnset()
+    {
+        $plugin = $this->getMockPlugin();
+        $this->handler->addPlugin($plugin);
+        unset($this->handler->{$plugin->getName()});
+        $this->assertFalse($this->handler->hasPlugin($plugin->getName()));
+    }
+
+    /**
+     * Tests the plugin handler executing a callback on all contained
+     * plugins where one plugin short-circuits the process.
+     *
+     * @return void
+     */
+    public function testImplementsCallWithShortCircuit()
+    {
+        $plugin1 = $this->getMockPlugin('TestPlugin1', array('callback'));
+        $plugin1
+            ->expects($this->once())
+            ->method('callback')
+            ->will($this->returnValue(false));
+        $this->handler->addPlugin($plugin1);
+
+        $plugin2 = $this->getMockPlugin('TestPlugin2', array('callback'));
+        $plugin2
+            ->expects($this->exactly(0))
+            ->method('callback');
+        $this->handler->addPlugin($plugin2);
+
+        $this->assertFalse($this->handler->callback());
+    }
+
+    /**
+     * Tests the plugin handler executing a callback on all contained
+     * plugins where no plugins short-circuit the process.
+     *
+     * @return void
+     */
+    public function testImplementsCallWithoutShortCircuit()
+    {
+        foreach (range(1, 2) as $index) {
+            $plugin = $this->getMockPlugin('TestPlugin' . $index, array('callback'));
+            $plugin
+                ->expects($this->once())
+                ->method('callback');
+            $this->handler->addPlugin($plugin);
+        }
+
+        $this->assertTrue($this->handler->callback());
+    }
+
+    /**
+     * Tests a newly instantiated handler not having plugins associated with
+     * it.
+     *
+     * @depends testImplementsCountable
      * @return void
      */
     public function testEmptyHandlerHasNoPlugins()
     {
-        $count = 0;
-        foreach ($this->handler as $plugin) {
-            $count++;
-        }
-
-        $this->assertEquals(0, $count);
+        $this->assertEquals(0, count($this->handler));
     }
-    
+
     /**
-     * Ensures a newly instantiated handler does not default to autoload
+     * Tests a newly instantiated handler not having autoloading enabled by
+     * default.
      *
      * @return void
      */
-    public function testDefaultsToNotAutoload()
+    public function testGetAutoloadDefaultsToNotAutoload()
     {
         $this->assertFalse($this->handler->getAutoload());
     }
 
     /**
-     * addPath provides a fluent interface
+     * Tests setAutoload().
+     *
+     * @depends testGetAutoloadDefaultsToNotAutoload
+     * @return void
+     */
+    public function testSetAutoload()
+    {
+        $this->assertSame(
+            $this->handler->setAutoload(true),
+            $this->handler,
+            'setAutoload() does not provide a fluent interface'
+        );
+
+        $this->assertTrue(
+            $this->handler->getAutoload(),
+            'setAutoload() had no effect on getAutoload()'
+        );
+    }
+
+    /**
+     * Tests addPath() providing a fluent interface.
      *
      * @return void
      */
@@ -117,7 +274,8 @@ class Phergie_Plugin_HandlerTest extends PHPUnit_Framework_TestCase
     }
 
     /**
-     * addPath throws an exception when it cannot read the directory
+     * Tests addPath() throwing an exception when it cannot read the
+     * directory.
      *
      * @return void
      */
@@ -133,122 +291,113 @@ class Phergie_Plugin_HandlerTest extends PHPUnit_Framework_TestCase
             return;
         }
 
-        $this->fail('An expected exception has not been raised.');
+        $this->fail('An expected exception has not been raised');
     }
 
     /**
-     * adds a path into the plugin handler and then ensures that files
-     * in that location can be found
+     * Tests adding a path to the plugin handler.
      *
      * @return void
      */
     public function testAddPath()
     {
-        $plugin_name = 'Mock';
+        $pluginName = 'Mock';
+
         try {
-            $this->handler->addPlugin($plugin_name);
+            $this->handler->addPlugin($pluginName);
         } catch(Phergie_Plugin_Exception $e) {
             $this->assertEquals(
                 Phergie_Plugin_Exception::ERR_CLASS_NOT_FOUND,
                 $e->getCode()
             );
-            
-            $this->handler->addPath(dirname(__FILE__), 'Phergie_Plugin_');
-
-            try {
-                $this->handler->addPlugin($plugin_name);
-            } catch(Phergie_Plugin_Exception $e) {
-                $this->fail(
-                    'After adding the directory, the plugin was still '
-                    . 'not found.'
-                );
-            }
-            
-            return;
         }
 
-        $this->fail(
-            'Before adding the directory, an expected exception '
-            . 'was not raised'
-        );
-    }
+        if (!isset($e)) {
+            $this->fail('Plugin loaded, path was already present');
+        }
 
-    /**
-     * addPlugin returns the plugin instance that was added
-     *
-     * @return void
-     */
-    public function testAddPluginByInstanceReturnsPluginInstance() {
-        $plugin = $this->getMock('Phergie_Plugin_Abstract');
-        $plugin
-            ->expects($this->any())
-            ->method('getName')
-            ->will($this->returnValue('TestPlugin'));
-
-        $returned_plugin = $this->handler->addPlugin($plugin);
-        $this->assertSame(
-            $returned_plugin,
-            $plugin,
-            'addPlugin returns the same instance that is passed to it'
-        );
-    }
-
-    /**
-     * Can add a plugin to the handler by shortname
-     *
-     * @return void
-     */
-    public function testAddPluginToHandlerByShortname()
-    {
-        $plugin_name = 'Mock';
         $this->handler->addPath(dirname(__FILE__), 'Phergie_Plugin_');
 
-        $returned_plugin = $this->handler->addPlugin($plugin_name);
-        $this->assertTrue($this->handler->hasPlugin($plugin_name));
+        try {
+            $this->handler->addPlugin($pluginName);
+        } catch(Phergie_Plugin_Exception $e) {
+            $this->fail('Added path, plugin still not found');
+        }
+    }
+
+    /**
+     * Tests addPlugin() returning an added plugin instance.
+     *
+     * @return void
+     */
+    public function testAddPluginByInstanceReturnsPluginInstance()
+    {
+        $plugin = $this->getMockPlugin();
+        $returnedPlugin = $this->handler->addPlugin($plugin);
+        $this->assertSame(
+            $returnedPlugin,
+            $plugin,
+            'addPlugin() does not return the instance passed to it'
+        );
+    }
+
+    /**
+     * Tests adding a plugin to the handler using the plugin's short name.
+     *
+     * @return void
+     */
+    public function testAddPluginByShortName()
+    {
+        $pluginName = 'Mock';
+        $this->handler->addPath(dirname(__FILE__), 'Phergie_Plugin_');
+
+        $returnedPlugin = $this->handler->addPlugin($pluginName);
+        $this->assertTrue($this->handler->hasPlugin($pluginName));
+
         $this->assertType(
             'Phergie_Plugin_Mock',
-            $this->handler->getPlugin($plugin_name)
+            $this->handler->getPlugin($pluginName)
         );
+
         $this->assertSame(
-            $this->handler->getPlugin($plugin_name),
-            $returned_plugin,
-            'Handler contains plugin when added by shortname.'
+            $this->handler->getPlugin($pluginName),
+            $returnedPlugin,
+            'Handler does not contain added plugin'
         );
     }
 
 
     /**
-     * Can add a plugin to the handler by instance
+     * Tests adding a plugin instance to the handler.
      *
      * @return void
      */
-    public function testAddPluginToHandlerByInstance()
+    public function testAddPluginByInstance()
     {
-        $plugin = $this->getMock('Phergie_Plugin_Abstract');
-        $plugin
-            ->expects($this->any())
-            ->method('getName')
-            ->will($this->returnValue('TestPlugin'));
-
-        $returned_plugin = $this->handler->addPlugin($plugin);
-
+        $plugin = $this->getMockPlugin();
+        $returnedPlugin = $this->handler->addPlugin($plugin);
         $this->assertTrue($this->handler->hasPlugin('TestPlugin'));
+
         $this->assertSame(
-            $plugin, $returned_plugin,
-            'addPlugin returns the same plugin'
+            $plugin,
+            $returnedPlugin,
+            'addPlugin() does not return added plugin instance'
         );
+
         $this->assertSame(
-            $plugin, $this->handler->getPlugin('TestPlugin'),
-            'getPlugin returns the same plugin'
+            $plugin,
+            $this->handler->getPlugin('TestPlugin'),
+            'getPlugin() does not return added plugin instance'
         );
     }
 
     /**
-     * addPlugin throws an exception when it can't find the plugin
+     * Tests addPlugin() throwing an exception when the plugin class file
+     * can't be found.
      *
      * @return void
      */
-    public function testAddPluginThrowsExceptionIfCannotFindPlugin()
+    public function testAddPluginThrowsExceptionWhenPluginFileNotFound()
     {
         try {
             $this->handler->addPlugin('TestPlugin');
@@ -260,12 +409,68 @@ class Phergie_Plugin_HandlerTest extends PHPUnit_Framework_TestCase
             return;
         }
 
-        $this->fail('An expected exception has not been raised.');
+        $this->fail('An expected exception has not been raised');
     }
 
     /**
-     * addPlugin throws an exception when trying to instantiate a
-     * class that doesn't extend from Phergie_Plugin_Abstract
+     * Recursively removes all files and subdirectories in a directory.
+     *
+     * @param string $path Directory path
+     * @return void
+     */
+    private function removeDirectory($path)
+    {
+        if (file_exists($path)) {
+            $it = new RecursiveIteratorIterator(
+                new RecursiveDirectoryIterator($path),
+                RecursiveIteratorIterator::CHILD_FIRST
+            );
+            foreach ($it as $entry) {
+                if ($it->isDot()) {
+                    continue;
+                }
+                if ($entry->isDir()) {
+                    rmdir($entry->getPathname());
+                } else {
+                    unlink($entry->getPathname());
+                }
+            }
+        }
+    }
+
+    /**
+     * Tests addPlugin() throwing an exception when the plugin class file is
+     * found, but does not contain the plugin class as expected.
+     *
+     * @return void
+     */
+    public function testAddPluginThrowsExceptionWhenPluginClassNotFound()
+    {
+        $path = sys_get_temp_dir() . '/Phergie/Plugin';
+        $this->removeDirectory(dirname($path));
+        mkdir($path, 0777, true);
+        touch($path . '/TestPlugin.php');
+        $this->handler->addPath($path, 'Phergie_Plugin_');
+
+        try {
+            $this->handler->addPlugin('TestPlugin');
+        } catch(Phergie_Plugin_Exception $e) { }
+
+        if (isset($e)) {
+            $this->assertEquals(
+                Phergie_Plugin_Exception::ERR_CLASS_NOT_FOUND,
+                $e->getCode()
+            );
+        } else {
+            $this->fail('An expected exception has not been raised');
+        }
+
+        $this->removeDirectory(dirname($path));
+    }
+
+    /**
+     * Tests addPlugin() throwing an exception when trying to instantiate a
+     * class that doesn't extend Phergie_Plugin_Abstract.
      *
      * @return void
      */
@@ -281,11 +486,11 @@ class Phergie_Plugin_HandlerTest extends PHPUnit_Framework_TestCase
             return;
         }
 
-        $this->fail('An expected exception has not been raised.');
+        $this->fail('An expected exception has not been raised');
     }
 
     /**
-     * addPlugin throws an exception when trying to instantiate a
+     * Tests addPlugin() throwing an exception when trying to instantiate a
      * class that can't be instantiated.
      *
      * @return void
@@ -303,143 +508,88 @@ class Phergie_Plugin_HandlerTest extends PHPUnit_Framework_TestCase
             return;
         }
 
-        $this->fail('An expected exception has not been raised.');
+        $this->fail('An expected exception has not been raised');
     }
 
     /**
-     * addPlugin with shortname and arguments passes args to constructor
-     *
-     * @return null
-     */
-    public function testAddPluginShortnamePassesArgsToConstructor()
-    {
-        $plugin_name = 'Mock';
-        $this->handler->addPath(dirname(__FILE__), 'Phergie_Plugin_');
-
-        $arguments = array('a', 'b', 'c');
-
-        $plugin = $this->handler->addPlugin($plugin_name, $arguments);
-        $this->assertAttributeSame(
-            $arguments,
-            'args',
-            $plugin,
-            'Arguments passed in to addPlugin match the arguments '
-            . 'the Mock plugin constructor received'
-        );
-    }
-
-    /**
-     * addPlugin passes Phergie_Config to instantiated plugin
-     *
-     * @return null
-     */
-    public function testAddPluginPassesPhergieConfigToInstantiatedPlugin()
-    {
-        $my_config = new Phergie_Config();
-        $my_config['my_option'] = 'my_value';
-
-        // create a new handler with this config
-        unset($this->handler);
-        $this->handler = new Phergie_Plugin_Handler(
-            $my_config,
-            new Phergie_Event_Handler()
-        );
-
-        $plugin_name = 'Mock';
-        $this->handler->addPath(dirname(__FILE__), 'Phergie_Plugin_');
-
-        $plugin = $this->handler->addPlugin($plugin_name);
-
-        $this->assertSame(
-            $my_config,
-            $plugin->getConfig(),
-            'addPlugin passes Phergie_Config to instantiated plugin'
-        );
-    }
-
-    /**
-     * addPlugin passes Phergie_Event_Handler to instantiated plugin
-     *
-     * @return null
-     */
-    public function testAddPluginPassesPhergieEventHandlerToInstantiatedPlugin()
-    {
-        $plugin = $this->getMock('Phergie_Plugin_Abstract');
-        $plugin
-            ->expects($this->any())
-            ->method('getName')
-            ->will($this->returnValue('TestPlugin'));
-
-        $my_event_handler = new Phergie_Event_Handler();
-        $my_event_handler->addEvent($plugin, 'ping');
-
-        // create a new plugin handler with this event handler
-        unset($this->handler);
-        $this->handler = new Phergie_Plugin_Handler(
-            new Phergie_Config(),
-            $my_event_handler
-        );
-
-        $plugin_name = 'Mock';
-        $this->handler->addPath(dirname(__FILE__), 'Phergie_Plugin_');
-
-        $plugin = $this->handler->addPlugin($plugin_name);
-
-        $this->assertSame(
-            $my_event_handler,
-            $plugin->getEventHandler(),
-            'addPlugin passes Phergie_Event_Handler to instantiated plugin'
-        );
-    }
-
-    /**
-     * @todo addPlugin calls onLoad() to instantiated plugin
-     */
-
-    /**
-     * implements __isset
+     * Tests adding a plugin by its short name with arguments passed to the
+     * plugin constructor.
      *
      * @return void
      */
-    public function testPluginHandlerImplementsIsset()
+    public function testAddPluginShortNamePassesArgsToConstructor()
     {
-        $plugin_name = 'TestPlugin';
+        $pluginName = 'Mock';
+        $this->handler->addPath(dirname(__FILE__), 'Phergie_Plugin_');
 
-        $this->assertFalse(isset($this->handler->{$plugin_name}));
-
-        $plugin = $this->getMock('Phergie_Plugin_Abstract');
-        $plugin
-            ->expects($this->any())
-            ->method('getName')
-            ->will($this->returnValue($plugin_name));
-
-        $this->handler->addPlugin($plugin);
-
-        $this->assertTrue(isset($this->handler->{$plugin_name}));
+        $arguments = array('a', 'b', 'c');
+        $plugin = $this->handler->addPlugin($pluginName, $arguments);
 
+        $this->assertAttributeSame(
+            $arguments,
+            'arguments',
+            $plugin,
+            'Arguments do not match'
+        );
     }
 
     /**
-     * addPlugin() returns the same plugin when requested twice
+     * Tests addPlugin() passing Phergie_Config to an instantiated plugin.
+     *
+     * @return void
+     */
+    public function testAddPluginPassesConstructorArguments()
+    {
+        $pluginName = 'Mock';
+        $this->handler->addPath(dirname(__FILE__), 'Phergie_Plugin_');
+        $plugin = $this->handler->addPlugin($pluginName);
+
+        $this->assertSame(
+            $this->config,
+            $plugin->getConfig(),
+            'Phergie_Config instances do not match'
+        );
+
+        $this->assertSame(
+            $this->events,
+            $plugin->getEventHandler(),
+            'Phergie_Event_Handler instances do not match'
+        );
+    }
+
+    /**
+     * Tests addPlugin() calling onLoad() on an instantiated plugin.
+     *
+     * @return void
+     */
+    public function testAddPluginCallsOnLoadOnInstantiatedPlugin()
+    {
+        $plugin = $this->getMockPlugin(null, array('onLoad'));
+        $plugin
+            ->expects($this->once())
+            ->method('onLoad');
+        $this->handler->addPlugin($plugin);
+    }
+
+    /**
+     * Tests addPlugin() returning the same plugin when called twice.
      *
      * @return void
      */
     public function testAddPluginReturnsSamePluginWhenAskedTwice()
     {
-        $plugin_name = 'Mock';
+        $pluginName = 'Mock';
         $this->handler->addPath(dirname(__FILE__), 'Phergie_Plugin_');
-
-        $plugin1 = $this->handler->addPlugin($plugin_name);
-        $plugin2 = $this->handler->addPlugin($plugin_name);
+        $plugin1 = $this->handler->addPlugin($pluginName);
+        $plugin2 = $this->handler->addPlugin($pluginName);
         $this->assertSame($plugin1, $plugin2);
     }
 
-    
     /**
-     * Tests an exception is thrown when trying to get a plugin
-     * that is not already loaded and autoload is off
+     * Tests getPlugin() throwing an exception when trying to get an
+     * unloaded plugin with autoload disabled.
      *
-     * @depends testDefaultsToNotAutoload
+     * @depends testGetAutoloadDefaultsToNotAutoload
      * @return void
      */
     public function testExceptionThrownWhenLoadingPluginWithoutAutoload()
@@ -456,6 +606,134 @@ class Phergie_Plugin_HandlerTest extends PHPUnit_Framework_TestCase
             return;
         }
 
-        $this->fail('An expected exception has not been raised.');
+        $this->fail('An expected exception has not been raised');
+    }
+
+    /**
+     * Tests addPlugins() with a plugin short name and no plugin constructor
+     * arguments.
+     *
+     * @depends testAddPluginByShortName
+     * @depends testAddPluginByInstance
+     * @return void
+     */
+    public function testAddPluginsWithoutArguments()
+    {
+        $prefix = 'Phergie_Plugin_';
+        $this->handler->addPath(dirname(__FILE__), $prefix);
+
+        $plugin = 'Mock';
+        $this->handler->addPlugins(array($plugin));
+        $returnedPlugin = $this->handler->getPlugin($plugin);
+        $this->assertContains(
+            get_class($returnedPlugin),
+            $prefix . $plugin,
+            'Short name plugin not of expected class'
+        );
+    }
+
+    /**
+     * Tests addPlugins() with a plugin short name and plugin constructor
+     * arguments.
+     *
+     * @depends testAddPluginByShortName
+     * @depends testAddPluginByInstance
+     * @return void
+     */
+    public function testAddPluginsWithArguments()
+    {
+        $prefix = 'Phergie_Plugin_';
+        $this->handler->addPath(dirname(__FILE__), $prefix);
+
+        $arguments = array(1, 2, 3);
+        $plugin = array('Mock', $arguments);
+        $this->handler->addPlugins(array($plugin));
+        $returnedPlugin = $this->handler->getPlugin('Mock');
+        $this->assertEquals(
+            $arguments,
+            $returnedPlugin->getArguments(),
+            'Constructor arguments for instance plugin do not match'
+        );
+    }
+
+    /**
+     * Tests removePlugin() with a plugin instance.
+     *
+     * @depends testAddPluginByInstance
+     * @return void
+     */
+    public function testRemovePluginByInstance()
+    {
+        $plugin = $this->getMockPlugin();
+        $this->handler->addPlugin($plugin);
+        $this->handler->removePlugin($plugin);
+        $this->assertFalse(
+            $this->handler->hasPlugin($plugin->getName()),
+            'Plugin was not removed'
+        );
+    }
+
+    /**
+     * Tests removePlugin() with a plugin short name.
+     *
+     * @depends testAddPluginByShortName
+     * @return void
+     */
+    public function testRemovePluginByShortName()
+    {
+        $plugin = 'Mock';
+        $this->handler->addPath(dirname(__FILE__), 'Phergie_Plugin_');
+
+        $this->handler->addPlugin($plugin);
+        $this->handler->removePlugin($plugin);
+        $this->assertFalse(
+            $this->handler->hasPlugin($plugin),
+            'Plugin was not removed'
+        );
+    }
+
+    /**
+     * Tests getPlugin() when the plugin is not already loaded and
+     * autoloading is disabled.
+     *
+     * @depends testSetAutoload
+     * @return void
+     */
+    public function testGetPluginWithAutoloadEnabled()
+    {
+        $this->handler->setAutoload(true);
+        $this->handler->addPath(dirname(__FILE__), 'Phergie_Plugin_');
+        $plugin = $this->handler->getPlugin('Mock');
+        $this->assertType(
+            'Phergie_Plugin_Mock',
+            $plugin,
+            'Retrieved plugin not of expected class'
+        );
+    }
+
+    /**
+     * Tests getPlugins().
+     *
+     * @depends testGetPluginWithAutoloadEnabled
+     * @return void
+     */
+    public function testGetPlugins()
+    {
+        $plugin1 = $this->getMockPlugin('TestPlugin1');
+        $this->handler->addPlugin($plugin1);
+
+        $plugin2 = $this->getMockPlugin('TestPlugin2');
+        $this->handler->addPlugin($plugin2);
+
+        $expected = array(
+            'testplugin1' => $plugin1,
+            'testplugin2' => $plugin2,
+        );
+
+        $actual = $this->handler->getPlugins();
+        $this->assertEquals($expected, $actual);
+
+        $actual = $this->handler->getPlugins(array('testplugin1', 'testplugin2'));
+        $this->assertEquals($expected, $actual);
     }
 }
diff --git a/plugins/Irc/extlib/phergie/Tests/Phergie/Plugin/Mock.php b/plugins/Irc/extlib/phergie/Tests/Phergie/Plugin/Mock.php
index 714e3d9a44..44a5d11c7c 100755
--- a/plugins/Irc/extlib/phergie/Tests/Phergie/Plugin/Mock.php
+++ b/plugins/Irc/extlib/phergie/Tests/Phergie/Plugin/Mock.php
@@ -21,7 +21,7 @@
 
 /**
  * Creates a plugin on the filesystem that can be used by
- * Phergie_Plugin_Handler's addPath utility to be located and loaded.
+ * Phergie_Plugin_Handler::addPath() to be located and loaded.
  *
  * @category Phergie
  * @package  Phergie_Tests
@@ -32,18 +32,30 @@
 class Phergie_Plugin_Mock extends Phergie_Plugin_Abstract
 {
     /**
-     * holds the arguments that were passed in to the constructor
+     * Arguments passed to the constructor
+     *
      * @var array
      */
-    protected $args;
+    protected $arguments;
 
     /**
-     * processes a variable number of arguments into the args property
+     * Stores all arguments for later use.
      *
-     * @return null
+     * @return void
      */
     public function __construct()
     {
-        $this->args = func_get_args();
+        $this->arguments = func_get_args();
+    }
+
+    /**
+     * Returns all constructor arguments.
+     *
+     * @return array Enumerated array containing the arguments passed to the
+     *         constructor in order
+     */
+    public function getArguments()
+    {
+        return $this->arguments;
     }
 }
diff --git a/plugins/Irc/extlib/phergie/Tests/Phergie/Plugin/SpellCheckTest.php b/plugins/Irc/extlib/phergie/Tests/Phergie/Plugin/SpellCheckTest.php
new file mode 100644
index 0000000000..8ed9f0d36d
--- /dev/null
+++ b/plugins/Irc/extlib/phergie/Tests/Phergie/Plugin/SpellCheckTest.php
@@ -0,0 +1,205 @@
+<?php
+/**
+ * Phergie
+ *
+ * PHP version 5
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.
+ * It is also available through the world-wide-web at this URL:
+ * http://phergie.org/license
+ *
+ * @category  Phergie
+ * @package   Phergie
+ * @author    Phergie Development Team <team@phergie.org>
+ * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
+ * @license   http://phergie.org/license New BSD License
+ * @link      http://pear.phergie.org/package/Phergie
+ */
+
+require_once dirname(__FILE__) . '/TestCase.php';
+
+/**
+ * Unit test suite for Pherge_Plugin_SpellCheck.
+ *
+ * @category Phergie
+ * @package  Phergie_Tests
+ * @author   Phergie Development Team <team@phergie.org>
+ * @license  http://phergie.org/license New BSD License
+ * @link     http://pear.phergie.org/package/Phergie
+ */
+class Phergie_Plugin_SpellCheckTest extends Phergie_Plugin_TestCase
+{
+
+    /**
+     * Current SpellCheck plugin instance
+     *
+     * @var Phergie_Plugin_SpellCheck
+     */
+    protected $spell;
+
+    /**
+     * Sets up the fixture, for example, opens a network connection.
+     * This method is called before a test is executed.
+     * 
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->config = array('spellcheck.lang' => 'en');
+
+        $this->spell = new Phergie_Plugin_SpellCheck();
+        $this->setPlugin(new Phergie_Plugin_Command());
+        
+        $config = $this->plugin->getConfig();
+        
+        $handler = new Phergie_Plugin_Handler($config, $this->handler);
+        $this->plugin->setPluginHandler($handler);
+        
+        $handler->addPlugin($this->plugin);
+        $handler->addPlugin($this->spell);
+
+        $this->spell->setEventHandler($this->handler);
+        $this->spell->setConnection($this->connection);
+    }
+
+    /**
+     * @event Phergie_Event_Request::privmsg
+     * @eventArg #zftalk
+     * @eventArg spell
+     */
+    public function testSpell()
+    {
+        $this->spell->onLoad();
+        
+        $this->copyEvent();
+        $this->plugin->onPrivMsg();
+        $this->assertDoesNotHaveEvent(Phergie_Event_Command::TYPE_PRIVMSG);
+    }
+
+    /**
+     * @event Phergie_Event_Request::privmsg
+     * @eventArg #phergie
+     * @eventArg spell test
+     */
+    public function testSpellTest()
+    {
+        $this->spell->onLoad();
+        
+        $this->copyEvent();
+        $this->plugin->onPrivMsg();
+
+        $events = $this->getResponseEvents(Phergie_Event_Command::TYPE_PRIVMSG);
+        
+        $this->assertEquals(1, count($events));
+        foreach ($events as $event) {
+            $args = $event->getArguments();
+            
+            $this->assertEquals('#phergie', $args[0]);
+            
+            $this->assertContains('CheckSpellUser:', $args[1]);
+            $this->assertContains('test', $args[1]);
+            $this->assertContains('correct', $args[1]);
+        }            
+    }
+
+    /**
+     * @event Phergie_Event_Request::privmsg
+     * @eventArg #phergie
+     * @eventArg spell testz
+     */
+    public function testSpellTestz()
+    {
+        $this->spell->onLoad();
+        
+        $this->copyEvent();
+        $this->plugin->onPrivMsg();
+        
+        $events = $this->getResponseEvents(Phergie_Event_Command::TYPE_PRIVMSG);
+        
+        $this->assertEquals(1, count($events));
+        foreach ($events as $event) {
+            $args = $event->getArguments();
+            
+            $this->assertEquals('#phergie', $args[0]);
+            
+            $this->assertContains('CheckSpellUser:', $args[1]);
+            $this->assertRegExp('/([a-z]+, ){4}/', $args[1]);
+            $this->assertContains('testz', $args[1]);
+            $this->assertContains('test,', $args[1]);
+        }
+    }
+
+    /**
+     * @event Phergie_Event_Request::privmsg
+     * @eventArg #phergie
+     * @eventArg spell testz
+     */
+    public function testSpellMoreSuggestions()
+    {
+        $config = $this->spell->getConfig();
+        
+        $this->copyEvent();
+        $config['spellcheck.limit'] = 6;
+        
+        $this->spell->onLoad();
+        $this->plugin->onPrivMsg();
+        
+        $events = $this->getResponseEvents(Phergie_Event_Command::TYPE_PRIVMSG);
+        
+        $this->assertEquals(1, count($events));
+        foreach ($events as $event) {
+            $args = $event->getArguments();
+            
+            $this->assertEquals('#phergie', $args[0]);
+            
+            $this->assertContains('CheckSpellUser:', $args[1]);
+            $this->assertRegExp('/([a-z]+, ){5}/', $args[1]);
+            $this->assertContains('testz', $args[1]);
+            $this->assertContains('test,', $args[1]);
+        }
+    }
+
+    /**
+     * @event Phergie_Event_Request::privmsg
+     * @eventArg #phergie
+     * @eventArg spell qwertyuiopasdfghjklzxcvbnm
+     */
+    public function testSpellNoSuggestions()
+    {
+        $this->spell->onLoad();
+        
+        $this->copyEvent();
+        $this->plugin->onPrivMsg();
+        
+        $events = $this->getResponseEvents(Phergie_Event_Command::TYPE_PRIVMSG);
+        
+        $this->assertEquals(1, count($events));
+        foreach ($events as $event) {
+            $args = $event->getArguments();
+            
+            $this->assertEquals('#phergie', $args[0]);
+            
+            $this->assertContains('CheckSpellUser:', $args[1]);
+            $this->assertContains('find any suggestions', $args[1]);
+        }
+    }
+    
+    /**
+     * Copy event from command to spell plugin
+     * 
+     * @return void
+     */
+    protected function copyEvent()
+    {
+        $hostmask = Phergie_Hostmask::fromString('CheckSpellUser!test@testing.org');
+
+        $event = $this->plugin->getEvent();
+        $event->setHostmask($hostmask);
+
+        $this->spell->setEvent($event);
+    }
+
+}
diff --git a/plugins/Irc/extlib/phergie/Tests/TestHelper.php b/plugins/Irc/extlib/phergie/Tests/TestHelper.php
index 6593539bc1..e70af44562 100644
--- a/plugins/Irc/extlib/phergie/Tests/TestHelper.php
+++ b/plugins/Irc/extlib/phergie/Tests/TestHelper.php
@@ -12,7 +12,7 @@
  * http://phergie.org/license
  *
  * @category  Phergie
- * @package   Phergie_Tests 
+ * @package   Phergie_Tests
  * @author    Phergie Development Team <team@phergie.org>
  * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
  * @license   http://phergie.org/license New BSD License
diff --git a/plugins/Irc/extlib/phergie/build.xml b/plugins/Irc/extlib/phergie/build.xml
index 9b84014ed5..7510c75a15 100644
--- a/plugins/Irc/extlib/phergie/build.xml
+++ b/plugins/Irc/extlib/phergie/build.xml
@@ -45,6 +45,9 @@
             <include name="Phergie/Connection/Exception.php" />
             <include name="Phergie/Connection/Handler.php" />
             <include name="Phergie/Connection.php" />
+            <include name="Phergie/Db/Exception.php" />
+            <include name="Phergie/Db/Manager.php" />
+            <include name="Phergie/Db/Sqlite.php" />
             <include name="Phergie/Driver/Abstract.php" />
             <include name="Phergie/Driver/Exception.php" />
             <include name="Phergie/Driver/Streams.php" />

From c4458bc40ae4269baf6627191f44d8fe4eb60075 Mon Sep 17 00:00:00 2001
From: Luke Fitzgerald <lw.fitzgerald@googlemail.com>
Date: Wed, 30 Jun 2010 12:50:07 -0700
Subject: [PATCH 085/655] Removed hard tabs

---
 plugins/Msn/extlib/phpmsnclass/msn.class.php | 146 +++++++++----------
 1 file changed, 73 insertions(+), 73 deletions(-)

diff --git a/plugins/Msn/extlib/phpmsnclass/msn.class.php b/plugins/Msn/extlib/phpmsnclass/msn.class.php
index 350d7fca9b..3362c2f434 100644
--- a/plugins/Msn/extlib/phpmsnclass/msn.class.php
+++ b/plugins/Msn/extlib/phpmsnclass/msn.class.php
@@ -23,10 +23,10 @@ class MSN {
     const PROD_KEY = 'PK}_A_0N_K%O?A9S';
     const PROD_ID = 'PROD0114ES4Z%Q5W';
     const LOGIN_METHOD = 'SSO';
-    
+
     const OIM_SEND_URL = 'https://ows.messenger.msn.com/OimWS/oim.asmx';
     const OIM_SEND_SOAP = 'http://messenger.live.com/ws/2006/09/oim/Store2';
-    
+
     const OIM_MAILDATA_URL = 'https://rsi.hotmail.com/rsi/rsi.asmx';
     const OIM_MAILDATA_SOAP = 'http://www.hotmail.msn.com/ws/2004/09/oim/rsi/GetMetadata';
     const OIM_READ_URL = 'https://rsi.hotmail.com/rsi/rsi.asmx';
@@ -42,16 +42,16 @@ class MSN {
 
     const DELMEMBER_URL = 'https://contacts.msn.com/abservice/SharingService.asmx';
     const DELMEMBER_SOAP = 'http://www.msn.com/webservices/AddressBook/DeleteMember';
-    
+
     // the message length (include header) is limited (maybe since WLM 8.5 released)
     // for WLM: 1664 bytes
     // for YIM: 518 bytes
     const MAX_MSN_MESSAGE_LEN = 1664;
     const MAX_YAHOO_MESSAGE_LEN = 518;
-    
+
     private $debug;
     private $timeout;
-    
+
     private $id;
     private $ticket;
     private $user = '';
@@ -76,7 +76,7 @@ class MSN {
     private $port = 1863;
 
     private $clientid = '';
-    
+
     private $error = '';
 
     private $authed = false;
@@ -181,7 +181,7 @@ class MSN {
     /**
      * Signon methods
      */
-    
+
     /**
      * Connect to the NS server
      *
@@ -345,7 +345,7 @@ class MSN {
         /* FIXME Don't implement the signon as a loop or we could hang
         *        the queue handler! */
         $this->debug_message('*** Trying to connect to MSN network');
-        
+
         // Remove any remaining switchboard sessions
         $this->switchBoardSessions = array();
         $this->switchBoardSessionLookup = array();
@@ -483,9 +483,9 @@ class MSN {
     * @return void
     */
     private function signonFailure($message) {
-    	if(!empty($message)) {
+        if(!empty($message)) {
             $this->debug_message($message);
-    	}
+        }
         $this->callHandler('ConnectFailed');
         $this->NSRetryWait($this->retry_wait);
     }
@@ -509,7 +509,7 @@ class MSN {
     /**
      * NS and SB command handling methods
      */
-    
+
     /**
      * Read and handle incoming command from NS
      *
@@ -532,7 +532,7 @@ class MSN {
             $this->signon();
             return;
         }
-        
+
         switch (substr($data, 0, 3)) {
             case 'SBS':
                 // after 'USR {id} OK {user} {verify} 0' response, the server will send SBS and profile to us
@@ -898,14 +898,14 @@ class MSN {
                 $this->addContact($email, 1, $email, true);
                 $this->connectToSBSession('Passive', $sb_ip, $sb_port, $email, array('sid' => $sid, 'ticket' => $ticket));
                 break;
-            
+
             case 'NLN':
                 // NS: <<< NLN {status} {email} {networkid} {nickname} {clientid} {dpobj}
                 // NS: <<< NLN NLN darkip@inflatablegoldfish.com 1 Luke 2685403136 0
                 @list(/* NLN */, $status, $email, $network, $nickname) = @explode(' ', $data);
                 $this->callHandler('StatusChange', array('screenname' => $email, 'status' => $status, 'network' => $network, 'nickname' => $nickname));
                 break;
-            
+
             case 'OUT':
                 // force logout from NS
                 // NS: <<< OUT xxx
@@ -1357,7 +1357,7 @@ class MSN {
     /**
      * Switchboard related methods
      */
-    
+
     /**
      * Send a request for a switchboard session
      *
@@ -1410,12 +1410,12 @@ class MSN {
             'offline' => false,
             'XFRReqTime' => time()
         );
-        
+
         // Change the index of the session to the socket
         $intsocket = (int) $socket;
         $this->switchBoardSessions[$intsocket] = $this->switchBoardSessions[$to];
         unset($this->switchBoardSessions[$to]);
-        
+
         $id = &$this->switchBoardSessions[$intsocket]['id'];
 
         if ($mode == 'Active') {
@@ -1432,7 +1432,7 @@ class MSN {
             $this->sb_writeln($socket, $id, "ANS $id $this->user $ticket $sid");
         }
     }
-    
+
     /**
     * Called when we want to end a switchboard session
     * or a switchboard session ends
@@ -1486,7 +1486,7 @@ class MSN {
 
         if ($this->sb_writeln($socket, $id, "MSG $id N $len") === false ||
             $this->sb_writedata($socket, $aMessage) === false) {
-            	return false;
+                return false;
             }
 
         // Don't close the SB session, we might as well leave it open
@@ -1522,23 +1522,23 @@ class MSN {
      */
     public function sendMessage($to, $message) {
         if ($message != '') {
-        	$toParts = explode('@', $to);
-        	if(count($toParts) < 3) {
-        		list($name, $host) = $toParts;
-        		$network = 1;
-        	} else {
-        		list($name, $host, $network) = $toParts;
-        	}
-        	
+            $toParts = explode('@', $to);
+            if(count($toParts) < 3) {
+                list($name, $host) = $toParts;
+                $network = 1;
+            } else {
+                list($name, $host, $network) = $toParts;
+            }
+
             $recipient = $name.'@'.$host;
 
             if ($network === 1) {
                 if (!isset($this->switchBoardSessionLookup[$recipient])) {
-                   	if (!isset($this->switchBoardSessions[$recipient]) || time() - $this->switchBoardSessions[$recipient]['XFRReqTime'] > $this->XFRReqTimeout) {
-                   		$this->debug_message("*** No existing SB session or request has timed out");
-	                    $this->reqSBSession($recipient);
-                   	}
-                   	return false;
+                    if (!isset($this->switchBoardSessions[$recipient]) || time() - $this->switchBoardSessions[$recipient]['XFRReqTime'] > $this->XFRReqTimeout) {
+                        $this->debug_message("*** No existing SB session or request has timed out");
+                        $this->reqSBSession($recipient);
+                    }
+                    return false;
                 } else {
                     $socket = $this->switchBoardSessionLookup[$recipient];
                     $intsocket = (int) $socket;
@@ -1547,18 +1547,18 @@ class MSN {
                         $this->endSBSession($socket);
                         return $this->sendMessage($recipient.'@Offline', $message);
                     } else {
-                    	if ($this->switchBoardSessions[$intsocket]['joined'] !== true) {
-                    		$this->debug_message("*** Recipient has not joined session, returning false");
-                    		return false;
-                    	}
-                    	
+                        if ($this->switchBoardSessions[$intsocket]['joined'] !== true) {
+                            $this->debug_message("*** Recipient has not joined session, returning false");
+                            return false;
+                        }
+
                         $this->debug_message("*** Attempting to send message to $recipient using existing SB session");
 
                         if ($this->sendMessageViaSB($recipient, $message)) {
                             $this->debug_message('*** Message sent successfully');
                             return true;
                         }
-                        
+
                         return false;
                     }
                 }
@@ -1603,7 +1603,7 @@ class MSN {
     /**
      * OIM methods
      */
-    
+
     /**
     * Get OIM mail data
     *
@@ -1806,7 +1806,7 @@ class MSN {
             $this->debug_message("*** OIM ($msgid) deleted");
         return $sMsg;
     }
-    
+
     /**
      * Send offline message
      *
@@ -1918,11 +1918,11 @@ X-OIM-Sequence-Num: 1
         }
         return array('challenge' => $challenge, 'auth_policy' => $auth_policy);
     }
-    
+
     /**
      * Contact / Membership list methods
      */
-    
+
     /**
     * Fetch contact list
     *
@@ -2347,7 +2347,7 @@ X-OIM-Sequence-Num: 1
         $http_code = curl_getinfo($curl, CURLINFO_HTTP_CODE);
         curl_close($curl);
         $this->debug_message("*** Get Result:\n$data");
-        
+
         if ($http_code != 200) return false;
         $p = $data;
         $aMemberships = array();
@@ -2427,11 +2427,11 @@ X-OIM-Sequence-Num: 1
         }
         return $aContactList;
     }
-    
+
     /**
      * MsnObj related methods
      */
-    
+
     /**
      *
      * @param $FilePath 圖檔路徑
@@ -2471,14 +2471,14 @@ X-OIM-Sequence-Num: 1
             }
         return $DefineString;
     }
-    
+
     /**
      * Socket methods
      */
-    
+
     /**
      * Read data of specified size from NS socket
-     * 
+     *
      * @param integer $size Size to read
      * @return string Data read
      */
@@ -2497,7 +2497,7 @@ X-OIM-Sequence-Num: 1
 
     /**
      * Read line from the NS socket
-     * 
+     *
      * @return string Data read
      */
     private function ns_readln() {
@@ -2511,9 +2511,9 @@ X-OIM-Sequence-Num: 1
 
     /**
      * Write line to NS socket
-     * 
+     *
      * Also increments id
-     * 
+     *
      * @param string $data Line to write to socket
      * @return mixed Bytes written or false on failure
      */
@@ -2528,7 +2528,7 @@ X-OIM-Sequence-Num: 1
 
     /**
      * Write data to NS socket
-     * 
+     *
      * @param string $data Data to write to socket
      * @return mixed Bytes written or false on failure
      */
@@ -2542,7 +2542,7 @@ X-OIM-Sequence-Num: 1
 
     /**
      * Read data of specified size from given SB socket
-     * 
+     *
      * @param resource $socket SB socket
      * @param integer $size Size to read
      * @return string Data read
@@ -2562,7 +2562,7 @@ X-OIM-Sequence-Num: 1
 
     /**
      * Read line from given SB socket
-     * 
+     *
      * @param resource $socket SB Socket
      * @return string Line read
      */
@@ -2577,9 +2577,9 @@ X-OIM-Sequence-Num: 1
 
     /**
      * Write line to given SB socket
-     * 
+     *
      * Also increments id
-     * 
+     *
      * @param resource $socket SB socket
      * @param integer $id Reference to SB id
      * @param string $data Line to write
@@ -2596,7 +2596,7 @@ X-OIM-Sequence-Num: 1
 
     /**
      * Write data to given SB socket
-     * 
+     *
      * @param resource $socket SB socket
      * @param $data Data to write to socket
      * @return mixed Bytes written or false on error
@@ -2628,11 +2628,11 @@ X-OIM-Sequence-Num: 1
         $info = stream_get_meta_data($socket);
         return $info['eof'];
     }
-    
+
     /**
      * Key generation methods
      */
-    
+
     private function derive_key($key, $magic) {
         $hash1 = mhash(MHASH_SHA1, $magic, $key);
         $hash2 = mhash(MHASH_SHA1, $hash1.$magic, $key);
@@ -2661,7 +2661,7 @@ X-OIM-Sequence-Num: 1
 
         return base64_encode($blob);
     }
-    
+
     /**
     * Generate challenge response
     *
@@ -2741,11 +2741,11 @@ X-OIM-Sequence-Num: 1
 
         return $hash;
     }
-    
+
     /**
      * Utility methods
      */
-    
+
     private function Array2SoapVar($Array, $ReturnSoapVarObj = true, $TypeName = null, $TypeNameSpace = null) {
         $ArrayString = '';
         foreach($Array as $Key => $Val) {
@@ -2773,7 +2773,7 @@ X-OIM-Sequence-Num: 1
         if ($ReturnSoapVarObj) return new SoapVar($ArrayString, XSD_ANYXML, $TypeName, $TypeNameSpace);
         return $ArrayString;
     }
-    
+
     private function linetoArray($lines) {
         $lines = str_replace("\r", '', $lines);
         $lines = explode("\n", $lines);
@@ -2784,7 +2784,7 @@ X-OIM-Sequence-Num: 1
         }
         return $Data;
     }
-    
+
     /**
     * Get Passport ticket
     *
@@ -3031,7 +3031,7 @@ X-OIM-Sequence-Num: 1
         $this->ABAuthHeader = new SoapHeader('http://www.msn.com/webservices/AddressBook', 'ABAuthHeader', $this->Array2SoapVar($ABAuthHeaderArray));
         return $aTickets;
     }
-    
+
     /**
     * Generate the data to send a message
     *
@@ -3050,7 +3050,7 @@ X-OIM-Sequence-Num: 1
         $msg = substr($sMessage, 0, $maxlen);
         return $msg_header.$msg;
     }
-    
+
     /**
     * Sleep for the given number of seconds
     *
@@ -3060,7 +3060,7 @@ X-OIM-Sequence-Num: 1
         $this->debug_message("*** Sleeping for $wait seconds before retrying");
         sleep($wait);
     }
-    
+
     /**
      * Sends a ping command
      *
@@ -3072,7 +3072,7 @@ X-OIM-Sequence-Num: 1
         // NS: >>> PNG
         $this->ns_writeln("PNG");
     }
-    
+
     /**
     * Methods to add / call callbacks
     */
@@ -3117,24 +3117,24 @@ X-OIM-Sequence-Num: 1
             return false;
         }
     }
-    
+
     /**
      * Debugging methods
      */
-    
+
     /**
      * Print message if debugging is enabled
-     * 
+     *
      * @param string $str Message to print
      */
     private function debug_message($str) {
         if (!$this->debug) return;
         echo $str."\n";
     }
-    
+
     /**
      * Dump binary data
-     * 
+     *
      * @param string $str Data string
      * @return Binary data
      */

From 0ef7c5559f6fabd4325c9c892a2b2f5fcbddb9b3 Mon Sep 17 00:00:00 2001
From: Luke Fitzgerald <lw.fitzgerald@googlemail.com>
Date: Sun, 4 Jul 2010 09:51:44 -0700
Subject: [PATCH 086/655] Initial IRC plugin work

---
 plugins/Irc/Fake_Irc.php   |  58 +++++++++++
 plugins/Irc/IrcPlugin.php  | 155 +++++++++++++++++++++++++++++
 plugins/Irc/ircmanager.php | 195 +++++++++++++++++++++++++++++++++++++
 3 files changed, 408 insertions(+)
 create mode 100644 plugins/Irc/Fake_Irc.php
 create mode 100644 plugins/Irc/IrcPlugin.php
 create mode 100644 plugins/Irc/ircmanager.php

diff --git a/plugins/Irc/Fake_Irc.php b/plugins/Irc/Fake_Irc.php
new file mode 100644
index 0000000000..eb302aea14
--- /dev/null
+++ b/plugins/Irc/Fake_Irc.php
@@ -0,0 +1,58 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Instead of sending IRC messages, retrieve the raw data that would be sent
+ *
+ * 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  Network
+ * @package   StatusNet
+ * @author    Luke Fitzgerald <lw.fitzgerald@googlemail.com>
+ * @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);
+}
+
+class Fake_Irc extends Phergie_Driver_Streams {
+    public $would_be_sent = null;
+
+    private function send($command, $args = '') {
+        // Add the command
+        $buffer = strtoupper($command);
+
+        // Add arguments
+        if (!empty($args)) {
+
+            // Apply formatting if arguments are passed in as an array
+            if (is_array($args)) {
+                $end = count($args) - 1;
+                $args[$end] = ':' . $args[$end];
+                $args = implode(' ', $args);
+            } else {
+                $args = ':' . $args;
+            }
+
+            $buffer .= ' ' . $args;
+        }
+
+        $this->would_be_sent = $buffer . "\r\n";
+    }
+}
diff --git a/plugins/Irc/IrcPlugin.php b/plugins/Irc/IrcPlugin.php
new file mode 100644
index 0000000000..3a188f667a
--- /dev/null
+++ b/plugins/Irc/IrcPlugin.php
@@ -0,0 +1,155 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2009, StatusNet, Inc.
+ *
+ * Send and receive notices using the AIM network
+ *
+ * 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  IM
+ * @package   StatusNet
+ * @author    Luke Fitzgerald <lw.fitzgerald@googlemail.com>
+ * @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);
+}
+// We bundle the Phergie library...
+set_include_path(get_include_path() . PATH_SEPARATOR . dirname(__FILE__) . '/extlib/phergie');
+require 'Phergie/Autoload.php';
+Phergie_Autoload::registerAutoloader();
+
+/**
+ * Plugin for IRC
+ *
+ * @category  Plugin
+ * @package   StatusNet
+ * @author    Luke Fitzgerald <lw.fitzgerald@googlemail.com>
+ * @copyright 2010 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+
+class IrcPlugin extends ImPlugin {
+    public $user =  null;
+    public $password = null;
+    public $publicFeed = array();
+
+    public $transport = 'irc';
+
+    function getDisplayName() {
+        return _m('IRC');
+    }
+
+    function normalize($screenname) {
+		$screenname = str_replace(" ","", $screenname);
+        return strtolower($screenname);
+    }
+
+    function daemon_screenname() {
+        return $this->user;
+    }
+
+    function validate($screenname) {
+        if (preg_match('/^[a-z]\w{2,15}$/i', $screenname)) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    /**
+     * Load related modules when needed
+     *
+     * @param string $cls Name of the class to be loaded
+     *
+     * @return boolean hook value; true means continue processing, false means stop.
+     */
+    function onAutoload($cls) {
+        $dir = dirname(__FILE__);
+
+        switch ($cls) {
+            case 'IrcManager':
+                include_once $dir . '/'.strtolower($cls).'.php';
+                return false;
+            case 'Fake_Irc':
+                include_once $dir . '/'. $cls .'.php';
+                return false;
+            default:
+                return true;
+        }
+    }
+
+    function onStartImDaemonIoManagers(&$classes) {
+        parent::onStartImDaemonIoManagers(&$classes);
+        $classes[] = new IrcManager($this); // handles sending/receiving
+        return true;
+    }
+
+    function microiduri($screenname) {
+        return 'irc:' . $screenname;
+    }
+
+    function send_message($screenname, $body) {
+        $this->fake_irc->sendIm($screenname, $body);
+        $this->enqueue_outgoing_raw($this->fake_irc->would_be_sent);
+        return true;
+    }
+
+    /**
+     * Accept a queued input message.
+     *
+     * @return true if processing completed, false if message should be reprocessed
+     */
+    function receive_raw_message($message) {
+        $info=Aim::getMessageInfo($message);
+        $from = $info['from'];
+        $user = $this->get_user($from);
+        $notice_text = $info['message'];
+
+        $this->handle_incoming($from, $notice_text);
+
+        return true;
+    }
+
+    function initialize() {
+        if (!isset($this->user)) {
+            throw new Exception("must specify a user");
+        }
+        if (!isset($this->password)) {
+            throw new Exception("must specify a password");
+        }
+
+        $this->fake_irc = new Fake_Irc($this->user, $this->password, 4);
+        return true;
+    }
+
+    function onPluginVersion(&$versions) {
+        $versions[] = array('name' => 'IRC',
+                            'version' => STATUSNET_VERSION,
+                            'author' => 'Luke Fitzgerald',
+                            'homepage' => 'http://status.net/wiki/Plugin:IRC',
+                            'rawdescription' =>
+                            _m('The IRC plugin allows users to send and receive notices over an IRC network.'));
+        return true;
+    }
+}
diff --git a/plugins/Irc/ircmanager.php b/plugins/Irc/ircmanager.php
new file mode 100644
index 0000000000..6a86e34fd3
--- /dev/null
+++ b/plugins/Irc/ircmanager.php
@@ -0,0 +1,195 @@
+<?php
+/*
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2008, 2009, StatusNet, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
+
+/**
+ * IRC background connection manager for IRC-using queue handlers,
+ * allowing them to send outgoing messages on the right connection.
+ *
+ * Input is handled during socket select loop, keepalive pings during idle.
+ * Any incoming messages will be handled.
+ *
+ * In a multi-site queuedaemon.php run, one connection will be instantiated
+ * for each site being handled by the current process that has IRC enabled.
+ */
+
+class IrcManager extends ImManager {
+
+    public $conn = null;
+    /**
+     * Initialize connection to server.
+     * @return boolean true on success
+     */
+    public function start($master) {
+        if (parent::start($master)) {
+            $this->connect();
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    public function getSockets() {
+        $this->connect();
+        if ($this->conn) {
+            return array($this->conn->myConnection);
+        } else {
+            return array();
+        }
+    }
+
+    /**
+     * Process IRC events that have come in over the wire.
+     * @param resource $socket
+     */
+    public function handleInput($socket) {
+        common_log(LOG_DEBUG, "Servicing the IRC queue.");
+        $this->stats('irc_process');
+        $this->conn->receive();
+    }
+
+    function connect() {
+        if (!$this->conn) {
+            $this->conn = new Phergie_Bot;
+
+            $password = isset($this->plugin->password) ? $this->plugin->password : NULL;
+            $transport = isset($this->plugin->transport) ? $this->plugin->transport : 'tcp';
+            $encoding = isset($this->plugin->encoding) ? $this->plugin->encoding : 'ISO-8859-1';
+
+            $config = new Phergie_Extended_Config;
+            $config->readArray(
+                array(
+                    // One array per connection, pretty self-explanatory
+                    'connections' => array(
+                        // Ex: All connection info for the Freenode network
+                        array(
+                            'host' => $this->plugin->host,
+                            'port' => $this->plugin->port,
+                            'username' => $this->plugin->username,
+                            'realname' => $this->plugin->realname,
+                            'nick' => $this->plugin->nickname,
+                            'password' => $password,
+                            'transport' => $transport,
+                            'encoding' => $encoding
+                        )
+                    ),
+
+                    'processor' => 'async',
+                    'processor.options' => array('usec' => 200000),
+                    // Time zone. See: http://www.php.net/manual/en/timezones.php
+                    'timezone' => 'UTC',
+
+    // Whitelist of plugins to load
+    'plugins' => array(
+        // To enable a plugin, simply add a string to this array containing
+        // the short name of the plugin as shown below.
+
+        // 'ShortPluginName',
+
+        // Below is an example of enabling the AutoJoin plugin, for which
+        // the corresponding PEAR package is Phergie_Plugin_AutoJoin. This
+        // plugin allows you to set a list of channels in this configuration
+        // file that the bot will automatically join when it connects to a
+        // server. If you'd like to enable this plugin, simply install it,
+        // uncomment the line below, and set a value for the setting
+        // autojoin.channels (examples for which are located further down in
+        // this file).
+
+        // 'AutoJoin',
+
+        // A few other recommended plugins:
+
+        // Servers randomly send PING events to clients to ensure that
+        // they're still connected and will eventually terminate the
+
+        // connection if a PONG response is not received. The Pong plugin
+        // handles sending these responses.
+
+        // 'Pong',
+
+        // It's sometimes difficult to distinguish between a lack of
+        // activity on a server and the client not receiving data even
+        // though a connection remains open. The Ping plugin performs a self
+        // CTCP PING sporadically to ensure that its connection is still
+        // functioning and, if not, terminates the bot.
+
+        // 'Ping',
+
+        // Sometimes it's desirable to have the bot disconnect gracefully
+        // when issued a command to do so via a PRIVMSG event. The Quit
+        // plugin implements this using the Command plugin to intercept the
+        // command.
+
+        // 'Quit',
+    ),
+
+    // If set to true, this allows any plugin dependencies for plugins
+    // listed in the 'plugins' option to be loaded even if they are not
+    // explicitly included in that list
+    'plugins.autoload' => true,
+
+    // Enables shell output describing bot events via Phergie_Ui_Console
+    'ui.enabled' => true,
+
+    // Examples of supported values for autojoins.channel:
+    // 'autojoin.channels' => '#channel1,#channel2',
+    // 'autojoin.channels' => array('#channel1', '#channel2'),
+    // 'autojoin.channels' => array(
+    //                            'host1' => '#channel1,#channel2',
+    //                            'host2' => array('#channel3', '#channel4')
+    //                        ),
+
+    // Examples of setting values for Ping plugin settings
+
+    // This is the amount of time in seconds that the Ping plugin will wait
+    // to receive an event from the server before it initiates a self-ping
+
+    // 'ping.event' => 300, // 5 minutes
+
+    // This is the amount of time in seconds that the Ping plugin will wait
+    // following a self-ping attempt before it assumes that a response will
+    // never be received and terminates the connection
+
+    // 'ping.ping' => 10, // 10 seconds
+
+));
+            $this->conn=new Aim($this->plugin->user,$this->plugin->password,4);
+            $this->conn->registerHandler("IMIn",array($this,"handle_aim_message"));
+            $this->conn->myServer="toc.oscar.aol.com";
+            $this->conn->signon();
+            $this->conn->setProfile(_m('Send me a message to post a notice'), false);
+        }
+        return $this->conn;
+    }
+
+    function handle_irc_message($data) {
+        $this->plugin->enqueue_incoming_raw($data);
+        return true;
+    }
+
+    function send_raw_message($data) {
+        $this->connect();
+        if (!$this->conn) {
+            return false;
+        }
+        $this->conn->sflapSend($data[0],$data[1],$data[2],$data[3]);
+        return true;
+    }
+}

From 3dce582182b59e00c0932ce99d47e76bdf99ac64 Mon Sep 17 00:00:00 2001
From: Luke Fitzgerald <lw.fitzgerald@googlemail.com>
Date: Sun, 4 Jul 2010 10:24:22 -0700
Subject: [PATCH 087/655] Added README

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

diff --git a/plugins/Irc/README b/plugins/Irc/README
new file mode 100644
index 0000000000..f3d1897779
--- /dev/null
+++ b/plugins/Irc/README
@@ -0,0 +1,35 @@
+The IRC plugin allows users to send and receive notices over an IRC network.
+
+Installation
+============
+add "addPlugin('irc',
+    array('setting'=>'value', 'setting2'=>'value2', ...);"
+to the bottom of your config.php
+
+scripts/imdaemon.php included with StatusNet must be running. It will be started by
+the plugin along with their other daemons when you run scripts/startdaemons.sh.
+See the StatusNet README for more about queuing and daemons.
+
+Settings
+========
+host*: => Hostname of IRC server
+port*: => Port of IRC server
+username*: => Username of bot
+realname*: => Real name of bot
+nick*: => Nickname of bot
+password: Password
+transport: Set to 'ssl' to enable SSL
+encoding: Set to UTF8 to enable UTF8 encoding
+
+* required
+
+Example
+=======
+addPlugin('irc', array(
+    'host' => '...',
+    'port' => '...',
+    'username' => '...',
+    'realname' => '...',
+    'nick' => '...'
+));
+

From 2d12d7b9e4faff8df6ffb46782a2488a582c1999 Mon Sep 17 00:00:00 2001
From: Luke Fitzgerald <lw.fitzgerald@googlemail.com>
Date: Wed, 7 Jul 2010 08:42:10 -0700
Subject: [PATCH 088/655] Fixed bug in Stream driver

---
 plugins/Irc/extlib/phergie/Phergie/Driver/Streams.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugins/Irc/extlib/phergie/Phergie/Driver/Streams.php b/plugins/Irc/extlib/phergie/Phergie/Driver/Streams.php
index bb0c611aa3..1d0f1c5572 100755
--- a/plugins/Irc/extlib/phergie/Phergie/Driver/Streams.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Driver/Streams.php
@@ -244,6 +244,8 @@ class Phergie_Driver_Streams extends Phergie_Driver_Abstract
                 = array_pad(explode(' ', ltrim($buffer, ':'), 3), 3, null);
             if (strpos($prefix, '@') !== false) {
                 $hostmask = Phergie_Hostmask::fromString($prefix);
+            } else {
+                $hostmask = new Phergie_Hostmask(null, null, $prefix);
             }
         }
 

From 4601fddad310e5830c6ed9cbf76124a5bfa1bc5e Mon Sep 17 00:00:00 2001
From: Luke Fitzgerald <lw.fitzgerald@googlemail.com>
Date: Wed, 7 Jul 2010 08:42:35 -0700
Subject: [PATCH 089/655] Ported 1.x.x NickServ plugin to 2.x.x

---
 .../phergie/Phergie/Plugin/NickServ.php       | 143 ++++++++++++++++++
 1 file changed, 143 insertions(+)
 create mode 100644 plugins/Irc/extlib/phergie/Phergie/Plugin/NickServ.php

diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/NickServ.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/NickServ.php
new file mode 100644
index 0000000000..c3af4ed42d
--- /dev/null
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/NickServ.php
@@ -0,0 +1,143 @@
+<?php
+
+/**
+ * Intercepts and responds to messages from the NickServ agent requesting that
+ * the bot authenticate its identify.
+ *
+ * The password configuration setting should contain the password registered
+ * with NickServ for the nick used by the bot.
+ */
+class Phergie_Plugin_NickServ extends Phergie_Plugin_Abstract {
+    /**
+     * The name of the nickserv bot
+     *
+     * @var string
+     */
+    protected $botNick;
+
+    /**
+    * Identify message
+    */
+    protected $identifyMessage;
+
+    /**
+     * Initializes instance variables.
+     *
+     * @return void
+     */
+    public function onLoad() {
+        $this->getPluginHandler()->getPlugin('Command');
+
+        // Get the name of the NickServ bot, defaults to NickServ
+        $this->botNick = $this->config['nickserv.botnick'];
+        if (!$this->botNick) $this->botNick = 'NickServ';
+
+        // Get the identify message
+        $this->identifyMessage = $this->config['nickserv.identify_message'];
+        if (!$this->identifyMessage) $this->identifyMessage = 'This nickname is registered.';
+    }
+
+    /**
+     * Checks for a notice from NickServ and responds accordingly if it is an
+     * authentication request or a notice that a ghost connection has been
+     * killed.
+     *
+     * @return void
+     */
+    public function onNotice() {
+        $event = $this->event;
+        if (strtolower($event->getNick()) == strtolower($this->botNick)) {
+            $message = $event->getArgument(1);
+            $nick = $this->connection->getNick();
+            if (strpos($message, $this->identifyMessage) !== false) {
+                $password = $this->config['nickserv.password'];
+                if (!empty($password)) {
+                    $this->doPrivmsg($this->botNick, 'IDENTIFY ' . $password);
+                }
+                unset($password);
+            } elseif (preg_match('/^.*' . $nick . '.* has been killed/', $message)) {
+                $this->doNick($nick);
+            }
+        }
+    }
+
+    /**
+     * Checks to see if the original Nick has quit, if so, take the name back
+     *
+     * @return void
+     */
+    public function onQuit() {
+        $eventnick = $this->event->getNick();
+        $nick = $this->connection->getNick();
+        if ($eventnick == $nick) {
+            $this->doNick($nick);
+        }
+    }
+
+    /**
+     * Changes the in-memory configuration setting for the bot nick if it is
+     * successfully changed.
+     *
+     * @return void
+     */
+    public function onNick() {
+        $event = $this->event;
+        $connection = $this->connection;
+        if ($event->getNick() == $connection->getNick()) {
+            $connection->setNick($event->getArgument(0));
+        }
+    }
+
+    /**
+     * Provides a command to terminate ghost connections.
+     *
+     * @return void
+     */
+    public function onDoGhostbust() {
+        $event = $this->event;
+        $user = $event->getNick();
+        $conn = $this->connection;
+        $nick = $conn->getNick();
+
+        if ($nick != $this->config['connections'][$conn->getHost()]['nick']) {
+            $password = $this->config['nickserv.password'];
+            if (!empty($password)) {
+                $this->doPrivmsg($this->event->getSource(), $user . ': Attempting to ghost ' . $nick .'.');
+                $this->doPrivmsg(
+                    $this->botNick,
+                    'GHOST ' . $nick . ' ' . $password,
+                    true
+                );
+            }
+            unset($password);
+        }
+    }
+
+    /**
+     * Automatically send the GHOST command if the Nickname is in use
+     *
+     * @return void
+     */
+    public function onResponse() {
+        if ($this->event->getCode() == Phergie_Event_Response::ERR_NICKNAMEINUSE) {
+            $password = $this->config['nickserv.password'];
+            if (!empty($password)) {
+                $this->doPrivmsg(
+                    $this->botNick,
+                    'GHOST ' . $this->connection->getNick() . ' ' . $password,
+                    true
+                );
+            }
+            unset($password);
+        }
+    }
+
+    /**
+     * The server sent a KILL request, so quit the server
+     *
+     * @return void
+     */
+    public function onKill() {
+        $this->doQuit($this->event->getArgument(1));
+    }
+}

From 2f585076c009ae575d94d6161fb036f770718ecc Mon Sep 17 00:00:00 2001
From: Luke Fitzgerald <lw.fitzgerald@googlemail.com>
Date: Fri, 9 Jul 2010 01:25:18 -0700
Subject: [PATCH 090/655] Add StatusNet Phergie plugin to pass messages
 received to IM architecture

---
 .../Phergie/Plugin/Statusnet_Callback.php     | 63 +++++++++++++++++++
 1 file changed, 63 insertions(+)
 create mode 100644 plugins/Irc/extlib/phergie/Phergie/Plugin/Statusnet_Callback.php

diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Statusnet_Callback.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Statusnet_Callback.php
new file mode 100644
index 0000000000..d5d2bfcaa0
--- /dev/null
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Statusnet_Callback.php
@@ -0,0 +1,63 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ *
+ * 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/>.
+ *
+ * Calls the given Statusnet IM architecture enqueuing method to enqueue
+ * a new incoming message
+ *
+ * @category  Phergie
+ * @package   Phergie_Plugin_Statusnet_Callback
+ * @author    Luke Fitzgerald <lw.fitzgerald@googlemail.com
+ * @copyright 2010 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+
+class Phergie_Plugin_Statusnet_Callback extends Phergie_Plugin_Abstract {
+    /**
+    * Callback details
+    *
+    * @var array
+    */
+    protected $callback;
+
+    /**
+    * Load callback from config
+    */
+    public function onLoad() {
+        $callback = $this->config['statusnet_callback.callback'];
+        if (is_callable($callback)) {
+            $this->callback = $callback;
+        } else {
+            $this->callback = NULL;
+        }
+    }
+
+    /**
+     * Passes incoming messages to StatusNet
+     *
+     * @return void
+     */
+    public function onPrivmsg() {
+        if ($this->callback !== NULL) {
+            $event = $this->getEvent();
+            $source = $event->getSource();
+            $message = trim($event->getText());
+
+            call_user_func($this->callback, array('sender' => $source, 'message' => $message);
+        }
+    }
+}

From 63107beb8ce55dc52c6f97e382a314d14a4dc20d Mon Sep 17 00:00:00 2001
From: Luke Fitzgerald <lw.fitzgerald@googlemail.com>
Date: Fri, 9 Jul 2010 01:21:33 -0700
Subject: [PATCH 091/655] Fix Fake_Irc to store data to send, not raw socket
 data to send

---
 plugins/Irc/Fake_Irc.php | 20 +-------------------
 1 file changed, 1 insertion(+), 19 deletions(-)

diff --git a/plugins/Irc/Fake_Irc.php b/plugins/Irc/Fake_Irc.php
index eb302aea14..9f2a611e68 100644
--- a/plugins/Irc/Fake_Irc.php
+++ b/plugins/Irc/Fake_Irc.php
@@ -35,24 +35,6 @@ class Fake_Irc extends Phergie_Driver_Streams {
     public $would_be_sent = null;
 
     private function send($command, $args = '') {
-        // Add the command
-        $buffer = strtoupper($command);
-
-        // Add arguments
-        if (!empty($args)) {
-
-            // Apply formatting if arguments are passed in as an array
-            if (is_array($args)) {
-                $end = count($args) - 1;
-                $args[$end] = ':' . $args[$end];
-                $args = implode(' ', $args);
-            } else {
-                $args = ':' . $args;
-            }
-
-            $buffer .= ' ' . $args;
-        }
-
-        $this->would_be_sent = $buffer . "\r\n";
+        $this->would_be_sent = array($command, $args);
     }
 }

From 9080fdd56ee63b6bff8636b9f4a81d96bc290547 Mon Sep 17 00:00:00 2001
From: Luke Fitzgerald <lw.fitzgerald@googlemail.com>
Date: Fri, 9 Jul 2010 02:02:50 -0700
Subject: [PATCH 092/655] Updated README

---
 plugins/Irc/README | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/plugins/Irc/README b/plugins/Irc/README
index f3d1897779..bed57e1e45 100644
--- a/plugins/Irc/README
+++ b/plugins/Irc/README
@@ -12,12 +12,14 @@ See the StatusNet README for more about queuing and daemons.
 
 Settings
 ========
-host*: => Hostname of IRC server
-port*: => Port of IRC server
-username*: => Username of bot
-realname*: => Real name of bot
-nick*: => Nickname of bot
+host*: Hostname of IRC server
+port*: Port of IRC server
+username*: Username of bot
+realname*: Real name of bot
+nick*: Nickname of bot
 password: Password
+nickservpassword: NickServ password for identification
+channels: Channels for bot to idle in
 transport: Set to 'ssl' to enable SSL
 encoding: Set to UTF8 to enable UTF8 encoding
 
@@ -30,6 +32,7 @@ addPlugin('irc', array(
     'port' => '...',
     'username' => '...',
     'realname' => '...',
-    'nick' => '...'
+    'nick' => '...',
+    'channels' => array('#channel1', '#channel2')
 ));
 

From 80516cba2f550f8f6a4243adb536f3b4aaab0b5f Mon Sep 17 00:00:00 2001
From: Luke Fitzgerald <lw.fitzgerald@googlemail.com>
Date: Fri, 9 Jul 2010 02:43:40 -0700
Subject: [PATCH 093/655] Extended Phergie_Config to allow passing config array
 instead of loading from file

---
 .../extlib/phergie/Phergie/ExtendedConfig.php | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 plugins/Irc/extlib/phergie/Phergie/ExtendedConfig.php

diff --git a/plugins/Irc/extlib/phergie/Phergie/ExtendedConfig.php b/plugins/Irc/extlib/phergie/Phergie/ExtendedConfig.php
new file mode 100644
index 0000000000..ea7368adfe
--- /dev/null
+++ b/plugins/Irc/extlib/phergie/Phergie/ExtendedConfig.php
@@ -0,0 +1,26 @@
+<?php
+class Phergie_Extended_Config extends Phergie_Config {
+    /**
+     * Incorporates an associative array of settings into the current
+     * configuration settings.
+     *
+     * @param array $array Array of settings
+     *
+     * @return Phergie_Config Provides a fluent interface
+     * @throws Phergie_Config_Exception
+     */
+    public function readArray($array) {
+        $settings = $array;
+        if (!is_array($settings)) {
+            throw new Phergie_Config_Exception(
+                'Parameter is not an array',
+                Phergie_Config_Exception::ERR_ARRAY_NOT_RETURNED
+            );
+        }
+
+        $this->files[$file] = array_keys($settings);
+        $this->settings += $settings;
+
+        return $this;
+    }
+}

From def70cd67f4237281e22774798e0d52060229456 Mon Sep 17 00:00:00 2001
From: Luke Fitzgerald <lw.fitzgerald@googlemail.com>
Date: Fri, 9 Jul 2010 02:45:56 -0700
Subject: [PATCH 094/655] Stopped extended config adding to files array

---
 plugins/Irc/extlib/phergie/Phergie/ExtendedConfig.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/plugins/Irc/extlib/phergie/Phergie/ExtendedConfig.php b/plugins/Irc/extlib/phergie/Phergie/ExtendedConfig.php
index ea7368adfe..9d53726f49 100644
--- a/plugins/Irc/extlib/phergie/Phergie/ExtendedConfig.php
+++ b/plugins/Irc/extlib/phergie/Phergie/ExtendedConfig.php
@@ -17,8 +17,7 @@ class Phergie_Extended_Config extends Phergie_Config {
                 Phergie_Config_Exception::ERR_ARRAY_NOT_RETURNED
             );
         }
-
-        $this->files[$file] = array_keys($settings);
+        
         $this->settings += $settings;
 
         return $this;

From 9650d48008393b91b65fb14616b3629da94fca7e Mon Sep 17 00:00:00 2001
From: Luke Fitzgerald <lw.fitzgerald@googlemail.com>
Date: Fri, 9 Jul 2010 02:53:58 -0700
Subject: [PATCH 095/655] Added missing closing bracket

---
 .../Irc/extlib/phergie/Phergie/Plugin/Statusnet_Callback.php    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Statusnet_Callback.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Statusnet_Callback.php
index d5d2bfcaa0..149d906249 100644
--- a/plugins/Irc/extlib/phergie/Phergie/Plugin/Statusnet_Callback.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Statusnet_Callback.php
@@ -57,7 +57,7 @@ class Phergie_Plugin_Statusnet_Callback extends Phergie_Plugin_Abstract {
             $source = $event->getSource();
             $message = trim($event->getText());
 
-            call_user_func($this->callback, array('sender' => $source, 'message' => $message);
+            call_user_func($this->callback, array('sender' => $source, 'message' => $message));
         }
     }
 }

From ba36fb2bfe220c940264b2f6fcc0e4d7a67c1e9e Mon Sep 17 00:00:00 2001
From: Luke Fitzgerald <lw.fitzgerald@googlemail.com>
Date: Fri, 9 Jul 2010 03:05:03 -0700
Subject: [PATCH 096/655] Lots more work on ircmanager.php

---
 plugins/Irc/ircmanager.php | 100 +++++++------------------------------
 1 file changed, 19 insertions(+), 81 deletions(-)

diff --git a/plugins/Irc/ircmanager.php b/plugins/Irc/ircmanager.php
index 6a86e34fd3..37d9980853 100644
--- a/plugins/Irc/ircmanager.php
+++ b/plugins/Irc/ircmanager.php
@@ -60,25 +60,26 @@ class IrcManager extends ImManager {
      * @param resource $socket
      */
     public function handleInput($socket) {
-        common_log(LOG_DEBUG, "Servicing the IRC queue.");
+        common_log(LOG_DEBUG, 'Servicing the IRC queue.');
         $this->stats('irc_process');
         $this->conn->receive();
     }
 
     function connect() {
         if (!$this->conn) {
-            $this->conn = new Phergie_Bot;
+            $this->conn = new Phergie_Extended_Bot;
 
-            $password = isset($this->plugin->password) ? $this->plugin->password : NULL;
+            $password = isset($this->plugin->password) ? $this->plugin->password : '';
             $transport = isset($this->plugin->transport) ? $this->plugin->transport : 'tcp';
             $encoding = isset($this->plugin->encoding) ? $this->plugin->encoding : 'ISO-8859-1';
+            $channels = isset($this->plugin->channels) ? $this->plugin->channels : array();
+            $nickservpassword = isset($this->plugin->nickservpassword) ? $this->plugin->nickservpassword : '';
 
             $config = new Phergie_Extended_Config;
             $config->readArray(
                 array(
                     // One array per connection, pretty self-explanatory
                     'connections' => array(
-                        // Ex: All connection info for the Freenode network
                         array(
                             'host' => $this->plugin->host,
                             'port' => $this->plugin->port,
@@ -93,88 +94,25 @@ class IrcManager extends ImManager {
 
                     'processor' => 'async',
                     'processor.options' => array('usec' => 200000),
-                    // Time zone. See: http://www.php.net/manual/en/timezones.php
-                    'timezone' => 'UTC',
 
-    // Whitelist of plugins to load
-    'plugins' => array(
-        // To enable a plugin, simply add a string to this array containing
-        // the short name of the plugin as shown below.
+                    'plugins' => array(
+                        'Pong',
+                        'NickServ',
+                        'AutoJoin',
+                        'Statusnet_Callback',
+                    ),
 
-        // 'ShortPluginName',
+                    'plugins.autoload' => true,
 
-        // Below is an example of enabling the AutoJoin plugin, for which
-        // the corresponding PEAR package is Phergie_Plugin_AutoJoin. This
-        // plugin allows you to set a list of channels in this configuration
-        // file that the bot will automatically join when it connects to a
-        // server. If you'd like to enable this plugin, simply install it,
-        // uncomment the line below, and set a value for the setting
-        // autojoin.channels (examples for which are located further down in
-        // this file).
+                    'ui.enabled' => true,
 
-        // 'AutoJoin',
+                    'nickserv.password' => $nickservpassword,
+                    'autojoin.channels' => $channels
+                )
+            );
 
-        // A few other recommended plugins:
-
-        // Servers randomly send PING events to clients to ensure that
-        // they're still connected and will eventually terminate the
-
-        // connection if a PONG response is not received. The Pong plugin
-        // handles sending these responses.
-
-        // 'Pong',
-
-        // It's sometimes difficult to distinguish between a lack of
-        // activity on a server and the client not receiving data even
-        // though a connection remains open. The Ping plugin performs a self
-        // CTCP PING sporadically to ensure that its connection is still
-        // functioning and, if not, terminates the bot.
-
-        // 'Ping',
-
-        // Sometimes it's desirable to have the bot disconnect gracefully
-        // when issued a command to do so via a PRIVMSG event. The Quit
-        // plugin implements this using the Command plugin to intercept the
-        // command.
-
-        // 'Quit',
-    ),
-
-    // If set to true, this allows any plugin dependencies for plugins
-    // listed in the 'plugins' option to be loaded even if they are not
-    // explicitly included in that list
-    'plugins.autoload' => true,
-
-    // Enables shell output describing bot events via Phergie_Ui_Console
-    'ui.enabled' => true,
-
-    // Examples of supported values for autojoins.channel:
-    // 'autojoin.channels' => '#channel1,#channel2',
-    // 'autojoin.channels' => array('#channel1', '#channel2'),
-    // 'autojoin.channels' => array(
-    //                            'host1' => '#channel1,#channel2',
-    //                            'host2' => array('#channel3', '#channel4')
-    //                        ),
-
-    // Examples of setting values for Ping plugin settings
-
-    // This is the amount of time in seconds that the Ping plugin will wait
-    // to receive an event from the server before it initiates a self-ping
-
-    // 'ping.event' => 300, // 5 minutes
-
-    // This is the amount of time in seconds that the Ping plugin will wait
-    // following a self-ping attempt before it assumes that a response will
-    // never be received and terminates the connection
-
-    // 'ping.ping' => 10, // 10 seconds
-
-));
-            $this->conn=new Aim($this->plugin->user,$this->plugin->password,4);
-            $this->conn->registerHandler("IMIn",array($this,"handle_aim_message"));
-            $this->conn->myServer="toc.oscar.aol.com";
-            $this->conn->signon();
-            $this->conn->setProfile(_m('Send me a message to post a notice'), false);
+            $this->conn->setConfig($config);
+            $this->conn->connect();
         }
         return $this->conn;
     }

From a86cabfb1940d0c495092f2e17a0c1d6b7b5ed72 Mon Sep 17 00:00:00 2001
From: Luke Fitzgerald <lw.fitzgerald@googlemail.com>
Date: Fri, 9 Jul 2010 03:19:18 -0700
Subject: [PATCH 097/655] Added Statusnet Driver to give access to sockets and
 send method

---
 .../phergie/Phergie/Driver/Statusnet.php      | 53 +++++++++++++++++++
 1 file changed, 53 insertions(+)
 create mode 100644 plugins/Irc/extlib/phergie/Phergie/Driver/Statusnet.php

diff --git a/plugins/Irc/extlib/phergie/Phergie/Driver/Statusnet.php b/plugins/Irc/extlib/phergie/Phergie/Driver/Statusnet.php
new file mode 100644
index 0000000000..e1e51a0f9b
--- /dev/null
+++ b/plugins/Irc/extlib/phergie/Phergie/Driver/Statusnet.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ *
+ * 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/>.
+ *
+ * Calls the given Statusnet IM architecture enqueuing method to enqueue
+ * a new incoming message
+ *
+ * @category  Phergie
+ * @package   Phergie_Driver_Statusnet
+ * @author    Luke Fitzgerald <lw.fitzgerald@googlemail.com
+ * @copyright 2010 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+
+class Phergie_Driver_Statusnet extends Phergie_Driver_Streams {
+    /**
+     * Handles construction of command strings and their transmission to the
+     * server.
+     *
+     * @param string       $command Command to send
+     * @param string|array $args    Optional string or array of sequential
+     *        arguments
+     *
+     * @return string Command string that was sent
+     * @throws Phergie_Driver_Exception
+     */
+    public function send($command, $args = '') {
+        return parent::send($command, $args);
+    }
+
+    /**
+    * Returns the array of sockets
+    *
+    * @return array Array of socket resources
+    */
+    public function getSockets() {
+        return $this->sockets;
+    }
+}
\ No newline at end of file

From 7ef33061bb16480a17e68b324010d4aff00bbd5f Mon Sep 17 00:00:00 2001
From: Luke Fitzgerald <lw.fitzgerald@googlemail.com>
Date: Fri, 9 Jul 2010 03:21:51 -0700
Subject: [PATCH 098/655] Updated old comments

---
 plugins/Irc/extlib/phergie/Phergie/Driver/Statusnet.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/Irc/extlib/phergie/Phergie/Driver/Statusnet.php b/plugins/Irc/extlib/phergie/Phergie/Driver/Statusnet.php
index e1e51a0f9b..5bca7fcc6f 100644
--- a/plugins/Irc/extlib/phergie/Phergie/Driver/Statusnet.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Driver/Statusnet.php
@@ -15,8 +15,8 @@
  * 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/>.
  *
- * Calls the given Statusnet IM architecture enqueuing method to enqueue
- * a new incoming message
+ * Extends the Streams driver (Phergie_Driver_Streams) to give external access
+ * to the socket resources and send method
  *
  * @category  Phergie
  * @package   Phergie_Driver_Statusnet

From 054d16426fdf680b1d700dfd9f0864c8e35b580c Mon Sep 17 00:00:00 2001
From: Luke Fitzgerald <lw.fitzgerald@googlemail.com>
Date: Fri, 9 Jul 2010 04:04:18 -0700
Subject: [PATCH 099/655] Added commenting

---
 .../extlib/phergie/Phergie/ExtendedConfig.php | 28 ++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/plugins/Irc/extlib/phergie/Phergie/ExtendedConfig.php b/plugins/Irc/extlib/phergie/Phergie/ExtendedConfig.php
index 9d53726f49..1eb3fb16e0 100644
--- a/plugins/Irc/extlib/phergie/Phergie/ExtendedConfig.php
+++ b/plugins/Irc/extlib/phergie/Phergie/ExtendedConfig.php
@@ -1,4 +1,30 @@
 <?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ *
+ * 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/>.
+ *
+ * Extends the configuration class (Phergie_Config) to allow passing config
+ * array instead of loading from file
+ *
+ * @category  Phergie
+ * @package   Phergie_Extended_Config
+ * @author    Luke Fitzgerald <lw.fitzgerald@googlemail.com
+ * @copyright 2010 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
 class Phergie_Extended_Config extends Phergie_Config {
     /**
      * Incorporates an associative array of settings into the current
@@ -17,7 +43,7 @@ class Phergie_Extended_Config extends Phergie_Config {
                 Phergie_Config_Exception::ERR_ARRAY_NOT_RETURNED
             );
         }
-        
+
         $this->settings += $settings;
 
         return $this;

From 03670d21d46783daa0b161a28bcfa3d386448fa8 Mon Sep 17 00:00:00 2001
From: Luke Fitzgerald <lw.fitzgerald@googlemail.com>
Date: Fri, 9 Jul 2010 04:04:45 -0700
Subject: [PATCH 100/655] Extended Phergie_Bot to allow Statusnet to be the
 driver

---
 .../extlib/phergie/Phergie/ExtendedBot.php    | 50 +++++++++++++++++++
 1 file changed, 50 insertions(+)
 create mode 100644 plugins/Irc/extlib/phergie/Phergie/ExtendedBot.php

diff --git a/plugins/Irc/extlib/phergie/Phergie/ExtendedBot.php b/plugins/Irc/extlib/phergie/Phergie/ExtendedBot.php
new file mode 100644
index 0000000000..b063d6ff52
--- /dev/null
+++ b/plugins/Irc/extlib/phergie/Phergie/ExtendedBot.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ *
+ * 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/>.
+ *
+ * Extends the bot class (Phergie_Bot) to allow connection and access to
+ * sockets and to allow StatusNet to 'drive' the bot
+ *
+ * @category  Phergie
+ * @package   Phergie_Extended_Bot
+ * @author    Luke Fitzgerald <lw.fitzgerald@googlemail.com
+ * @copyright 2010 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+class Phergie_Extended_Bot extends Phergie_Bot {
+    /**
+    * Set up bot and connect to servers
+    *
+    * @return void
+    */
+    public function connect() {
+        $ui = $this->getUi();
+        $ui->setEnabled($this->getConfig('ui.enabled'));
+
+        $this->loadPlugins();
+        $this->loadConnections();
+    }
+
+    /**
+    * Get the sockets used by the bot
+    *
+    * @return array Array of socket resources
+    */
+    public function getSockets() {
+        return $this->getDriver()->getSockets();
+    }
+}
\ No newline at end of file

From 022e92ce5db9511938b6fc5ffca4a4ec87d551b7 Mon Sep 17 00:00:00 2001
From: Luke Fitzgerald <lw.fitzgerald@googlemail.com>
Date: Fri, 9 Jul 2010 04:18:19 -0700
Subject: [PATCH 101/655] Extended Async Processor to allow use of Statusnet
 driver

---
 .../phergie/Phergie/Process/Statusnet.php     | 34 +++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 plugins/Irc/extlib/phergie/Phergie/Process/Statusnet.php

diff --git a/plugins/Irc/extlib/phergie/Phergie/Process/Statusnet.php b/plugins/Irc/extlib/phergie/Phergie/Process/Statusnet.php
new file mode 100644
index 0000000000..cee2a6ffb6
--- /dev/null
+++ b/plugins/Irc/extlib/phergie/Phergie/Process/Statusnet.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ *
+ * 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/>.
+ *
+ * Extends the Async processor class (Phergie_Process_Async) to allow it to
+ * operate with the Statusnet driver
+ *
+ * @category  Phergie
+ * @package   Phergie_Process_Statusnet
+ * @author    Luke Fitzgerald <lw.fitzgerald@googlemail.com
+ * @copyright 2010 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+
+class Phergie_Process_Statusnet extends Phergie_Process_Async {
+    public function __constuct(Phergie_Extended_Bot $bot, array $options) {
+        $this->usec = 0;
+        Phergie_Process_Abstract::__construct($bot, $options);
+    }
+}
\ No newline at end of file

From 4a602eb4ba817281779c6d55e321cb4a490c1eb6 Mon Sep 17 00:00:00 2001
From: Luke Fitzgerald <lw.fitzgerald@googlemail.com>
Date: Fri, 9 Jul 2010 04:20:00 -0700
Subject: [PATCH 102/655] Modified some config options

---
 plugins/Irc/ircmanager.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/plugins/Irc/ircmanager.php b/plugins/Irc/ircmanager.php
index 37d9980853..71aa9644aa 100644
--- a/plugins/Irc/ircmanager.php
+++ b/plugins/Irc/ircmanager.php
@@ -72,8 +72,8 @@ class IrcManager extends ImManager {
             $password = isset($this->plugin->password) ? $this->plugin->password : '';
             $transport = isset($this->plugin->transport) ? $this->plugin->transport : 'tcp';
             $encoding = isset($this->plugin->encoding) ? $this->plugin->encoding : 'ISO-8859-1';
-            $channels = isset($this->plugin->channels) ? $this->plugin->channels : array();
             $nickservpassword = isset($this->plugin->nickservpassword) ? $this->plugin->nickservpassword : '';
+            $channels = isset($this->plugin->channels) ? $this->plugin->channels : array();
 
             $config = new Phergie_Extended_Config;
             $config->readArray(
@@ -92,8 +92,9 @@ class IrcManager extends ImManager {
                         )
                     ),
 
-                    'processor' => 'async',
-                    'processor.options' => array('usec' => 200000),
+                    'driver' => 'statusnet',
+
+                    'processor' => 'statusnet',
 
                     'plugins' => array(
                         'Pong',
@@ -107,7 +108,8 @@ class IrcManager extends ImManager {
                     'ui.enabled' => true,
 
                     'nickserv.password' => $nickservpassword,
-                    'autojoin.channels' => $channels
+                    'autojoin.channels' => $channels,
+                    'statusnet_callback.callback' => array($this, 'handle_irc_message')
                 )
             );
 

From 8abef1fd653a1c017679aa9bd54b7f80f743af78 Mon Sep 17 00:00:00 2001
From: Luke Fitzgerald <lw.fitzgerald@googlemail.com>
Date: Fri, 9 Jul 2010 16:29:42 -0700
Subject: [PATCH 103/655] Added missing '>'

---
 plugins/Irc/extlib/phergie/Phergie/Driver/Statusnet.php         | 2 +-
 plugins/Irc/extlib/phergie/Phergie/ExtendedBot.php              | 2 +-
 plugins/Irc/extlib/phergie/Phergie/ExtendedConfig.php           | 2 +-
 .../Irc/extlib/phergie/Phergie/Plugin/Statusnet_Callback.php    | 2 +-
 plugins/Irc/extlib/phergie/Phergie/Process/Statusnet.php        | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/plugins/Irc/extlib/phergie/Phergie/Driver/Statusnet.php b/plugins/Irc/extlib/phergie/Phergie/Driver/Statusnet.php
index 5bca7fcc6f..48540069ce 100644
--- a/plugins/Irc/extlib/phergie/Phergie/Driver/Statusnet.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Driver/Statusnet.php
@@ -20,7 +20,7 @@
  *
  * @category  Phergie
  * @package   Phergie_Driver_Statusnet
- * @author    Luke Fitzgerald <lw.fitzgerald@googlemail.com
+ * @author    Luke Fitzgerald <lw.fitzgerald@googlemail.com>
  * @copyright 2010 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
  * @link      http://status.net/
diff --git a/plugins/Irc/extlib/phergie/Phergie/ExtendedBot.php b/plugins/Irc/extlib/phergie/Phergie/ExtendedBot.php
index b063d6ff52..5d0d3adca1 100644
--- a/plugins/Irc/extlib/phergie/Phergie/ExtendedBot.php
+++ b/plugins/Irc/extlib/phergie/Phergie/ExtendedBot.php
@@ -20,7 +20,7 @@
  *
  * @category  Phergie
  * @package   Phergie_Extended_Bot
- * @author    Luke Fitzgerald <lw.fitzgerald@googlemail.com
+ * @author    Luke Fitzgerald <lw.fitzgerald@googlemail.com>
  * @copyright 2010 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
  * @link      http://status.net/
diff --git a/plugins/Irc/extlib/phergie/Phergie/ExtendedConfig.php b/plugins/Irc/extlib/phergie/Phergie/ExtendedConfig.php
index 1eb3fb16e0..4ae6b0293c 100644
--- a/plugins/Irc/extlib/phergie/Phergie/ExtendedConfig.php
+++ b/plugins/Irc/extlib/phergie/Phergie/ExtendedConfig.php
@@ -20,7 +20,7 @@
  *
  * @category  Phergie
  * @package   Phergie_Extended_Config
- * @author    Luke Fitzgerald <lw.fitzgerald@googlemail.com
+ * @author    Luke Fitzgerald <lw.fitzgerald@googlemail.com>
  * @copyright 2010 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
  * @link      http://status.net/
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Statusnet_Callback.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Statusnet_Callback.php
index 149d906249..7bc287714b 100644
--- a/plugins/Irc/extlib/phergie/Phergie/Plugin/Statusnet_Callback.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Statusnet_Callback.php
@@ -20,7 +20,7 @@
  *
  * @category  Phergie
  * @package   Phergie_Plugin_Statusnet_Callback
- * @author    Luke Fitzgerald <lw.fitzgerald@googlemail.com
+ * @author    Luke Fitzgerald <lw.fitzgerald@googlemail.com>
  * @copyright 2010 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
  * @link      http://status.net/
diff --git a/plugins/Irc/extlib/phergie/Phergie/Process/Statusnet.php b/plugins/Irc/extlib/phergie/Phergie/Process/Statusnet.php
index cee2a6ffb6..c5999956b3 100644
--- a/plugins/Irc/extlib/phergie/Phergie/Process/Statusnet.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Process/Statusnet.php
@@ -20,7 +20,7 @@
  *
  * @category  Phergie
  * @package   Phergie_Process_Statusnet
- * @author    Luke Fitzgerald <lw.fitzgerald@googlemail.com
+ * @author    Luke Fitzgerald <lw.fitzgerald@googlemail.com>
  * @copyright 2010 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
  * @link      http://status.net/

From 7caff948f6cc70d8b14ddf02051476d8feb0c696 Mon Sep 17 00:00:00 2001
From: Luke Fitzgerald <lw.fitzgerald@googlemail.com>
Date: Sun, 18 Jul 2010 06:28:15 -0700
Subject: [PATCH 104/655] Merged in changes to Phergie

---
 plugins/Irc/extlib/phergie/Phergie/Config.php |  16 +++
 .../extlib/phergie/Phergie/Db/Exception.php   |  39 ------
 .../Irc/extlib/phergie/Phergie/Db/Manager.php |  49 -------
 .../Irc/extlib/phergie/Phergie/Db/Sqlite.php  | 117 -----------------
 .../extlib/phergie/Phergie/ExtendedConfig.php |  51 --------
 .../phergie/Phergie/Plugin/NickServ.php       |  82 ++++++++----
 .../Irc/extlib/phergie/Phergie/Plugin/Tld.php | 121 ++----------------
 .../extlib/phergie/Phergie/Plugin/Tld/db.php  |  68 ++++++++++
 .../extlib/phergie/Phergie/Plugin/Twitter.php |  25 +---
 .../extlib/phergie/Phergie/Plugin/Weather.php |  70 ++++++++--
 10 files changed, 222 insertions(+), 416 deletions(-)
 delete mode 100644 plugins/Irc/extlib/phergie/Phergie/Db/Exception.php
 delete mode 100755 plugins/Irc/extlib/phergie/Phergie/Db/Manager.php
 delete mode 100644 plugins/Irc/extlib/phergie/Phergie/Db/Sqlite.php
 delete mode 100644 plugins/Irc/extlib/phergie/Phergie/ExtendedConfig.php
 create mode 100644 plugins/Irc/extlib/phergie/Phergie/Plugin/Tld/db.php
 mode change 100755 => 100644 plugins/Irc/extlib/phergie/Phergie/Plugin/Weather.php

diff --git a/plugins/Irc/extlib/phergie/Phergie/Config.php b/plugins/Irc/extlib/phergie/Phergie/Config.php
index f011db2365..c182f2ac1e 100755
--- a/plugins/Irc/extlib/phergie/Phergie/Config.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Config.php
@@ -82,6 +82,22 @@ class Phergie_Config implements ArrayAccess
         return $this;
     }
 
+    /**
+     * Merges an associative array of configuration setting values into the
+     * current configuration settings.
+     *
+     * @param array $settings Associative array of configuration setting
+     *        values keyed by setting name
+     *
+     * @return Phergie_Config Provides a fluent interface
+     */
+    public function readArray(array $settings)
+    {
+        $this->settings += $settings;
+
+        return $this;
+    }
+
     /**
      * Writes the values of the current configuration settings back to their
      * originating files.
diff --git a/plugins/Irc/extlib/phergie/Phergie/Db/Exception.php b/plugins/Irc/extlib/phergie/Phergie/Db/Exception.php
deleted file mode 100644
index 77421108ad..0000000000
--- a/plugins/Irc/extlib/phergie/Phergie/Db/Exception.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/**
- * Phergie
- *
- * PHP version 5
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.
- * It is also available through the world-wide-web at this URL:
- * http://phergie.org/license
- *
- * @category  Phergie
- * @package   Phergie
- * @author    Phergie Development Team <team@phergie.org>
- * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
- * @license   http://phergie.org/license New BSD License
- * @link      http://pear.phergie.org/package/Phergie
- */
-
-/**
- * Exceptions related to handling databases for plugins.
- *
- * @category Phergie
- * @package  Phergie
- * @author   Phergie Development Team <team@phergie.org>
- * @license  http://phergie.org/license New BSD License
- * @link     http://pear.phergie.org/package/Phergie
- */
-
-class Phergie_Db_Exception extends Phergie_Exception
-{
-    /**
-     * Error indicating that a directory needed to support database
-     * functionality was unable to be created.
-     */
-    const ERR_UNABLE_TO_CREATE_DIRECTORY = 1;
-}
diff --git a/plugins/Irc/extlib/phergie/Phergie/Db/Manager.php b/plugins/Irc/extlib/phergie/Phergie/Db/Manager.php
deleted file mode 100755
index 2a8215e96d..0000000000
--- a/plugins/Irc/extlib/phergie/Phergie/Db/Manager.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-/**
- * Phergie
- *
- * PHP version 5
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.
- * It is also available through the world-wide-web at this URL:
- * http://phergie.org/license
- *
- * @category  Phergie
- * @package   Phergie
- * @author    Phergie Development Team <team@phergie.org>
- * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
- * @license   http://phergie.org/license New BSD License
- * @link      http://pear.phergie.org/package/Phergie_Command
- */
-
-/**
- * Database management class. Provides a base API for managing databases
- * within
- *
- * @category Phergie
- * @package  Phergie
- * @author   Phergie Development Team <team@phergie.org>
- * @license  http://phergie.org/license New BSD License
- * @link     http://pear.phergie.org/package/Phergie_Db_Manager
- */
-abstract class Phergie_Db_Manager
-{
-    /**
-     * Returns a connection to the database.
-     *
-     * @return object
-     */
-    public abstract function getDb();
-
-    /**
-     * Checks if a table/collection exists within the database.
-     *
-     * @param string $table Table/collection name to check for
-     *
-     * @return boolean
-     */
-    public abstract function hasTable($table);
-}
diff --git a/plugins/Irc/extlib/phergie/Phergie/Db/Sqlite.php b/plugins/Irc/extlib/phergie/Phergie/Db/Sqlite.php
deleted file mode 100644
index 14ee520fd1..0000000000
--- a/plugins/Irc/extlib/phergie/Phergie/Db/Sqlite.php
+++ /dev/null
@@ -1,117 +0,0 @@
-<?php
-
-/**
- * Phergie
- *
- * PHP version 5
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.
- * It is also available through the world-wide-web at this URL:
- * http://phergie.org/license
- *
- * @category  Phergie
- * @package   Phergie
- * @author    Phergie Development Team <team@phergie.org>
- * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
- * @license   http://phergie.org/license New BSD License
- * @link      http://pear.phergie.org/package/Phergie
- */
-
-/**
- * Provides basic management for SQLite databases
- *
- * @category Phergie
- * @package  Phergie
- * @author   Phergie Development Team <team@phergie.org>
- * @license  http://phergie.org/license New BSD License
- * @link     http://pear.phergie.org/package/Phergie
- */
-class Phergie_Db_Sqlite extends Phergie_Db_Manager
-{
-    /**
-     * Database connection
-     *
-     * @var PDO
-     */
-    protected $db;
-
-    /**
-     * Database file path
-     *
-     * @var string
-     */
-    protected $dbFile;
-
-    /**
-     * Allows setting of the database file path when creating the class.
-     *
-     * @param string $dbFile database file path (optional)
-     *
-     * @return void
-     */
-    public function __construct($dbFile = null)
-    {
-        if ($dbFile != null) {
-            $this->setDbFile($dbFile);
-        }
-    }
-
-    /**
-     * Sets the database file path.
-     *
-     * @param string $dbFile SQLite database file path
-     *
-     * @return null
-     */
-    public function setDbFile($dbFile)
-    {
-        if (is_string($dbFile) && !empty($dbFile)) {
-            $this->dbFile = $dbFile;
-        }
-    }
-
-    /**
-     * Returns a configured database connection.
-     *
-     * @return PDO
-     */
-    public function getDb()
-    {
-        if (!empty($this->db)) {
-            return $this->db;
-        }
-
-        $dir = dirname($this->dbFile);
-        if (!is_dir($dir) && !mkdir($dir, 0755, true)) {
-            throw new Phergie_Db_Exception(
-                'Unable to create directory',
-                Phergie_Db_Exception::ERR_UNABLE_TO_CREATE_DIRECTORY
-            );
-        }
-
-        $this->db = new PDO('sqlite:' . $this->dbFile);
-
-        return $this->db;
-    }
-
-
-    /**
-     * Returns whether a given table exists in the database.
-     *
-     * @param string $table Name of the table to check for
-     *
-     * @return boolean TRUE if the table exists, FALSE otherwise
-     */
-    public function hasTable($table)
-    {
-        $db = $this->getDb();
-
-        return (bool) $db->query(
-            'SELECT COUNT(*) FROM sqlite_master WHERE name = '
-            . $db->quote($table)
-        )->fetchColumn();
-    }
-}
diff --git a/plugins/Irc/extlib/phergie/Phergie/ExtendedConfig.php b/plugins/Irc/extlib/phergie/Phergie/ExtendedConfig.php
deleted file mode 100644
index 4ae6b0293c..0000000000
--- a/plugins/Irc/extlib/phergie/Phergie/ExtendedConfig.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-/**
- * StatusNet - the distributed open-source microblogging tool
- *
- * 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/>.
- *
- * Extends the configuration class (Phergie_Config) to allow passing config
- * array instead of loading from file
- *
- * @category  Phergie
- * @package   Phergie_Extended_Config
- * @author    Luke Fitzgerald <lw.fitzgerald@googlemail.com>
- * @copyright 2010 StatusNet, Inc.
- * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
- * @link      http://status.net/
- */
-class Phergie_Extended_Config extends Phergie_Config {
-    /**
-     * Incorporates an associative array of settings into the current
-     * configuration settings.
-     *
-     * @param array $array Array of settings
-     *
-     * @return Phergie_Config Provides a fluent interface
-     * @throws Phergie_Config_Exception
-     */
-    public function readArray($array) {
-        $settings = $array;
-        if (!is_array($settings)) {
-            throw new Phergie_Config_Exception(
-                'Parameter is not an array',
-                Phergie_Config_Exception::ERR_ARRAY_NOT_RETURNED
-            );
-        }
-
-        $this->settings += $settings;
-
-        return $this;
-    }
-}
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/NickServ.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/NickServ.php
index c3af4ed42d..ff181d94e2 100644
--- a/plugins/Irc/extlib/phergie/Phergie/Plugin/NickServ.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/NickServ.php
@@ -1,4 +1,23 @@
 <?php
+/**
+ * Phergie
+ *
+ * PHP version 5
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.
+ * It is also available through the world-wide-web at this URL:
+ * http://phergie.org/license
+ *
+ * @category  Phergie
+ * @package   Phergie_Plugin_NickServ
+ * @author    Phergie Development Team <team@phergie.org>
+ * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
+ * @license   http://phergie.org/license New BSD License
+ * @link      http://pear.phergie.org/package/Phergie_Plugin_NickServ
+ */
 
 /**
  * Intercepts and responds to messages from the NickServ agent requesting that
@@ -6,10 +25,18 @@
  *
  * The password configuration setting should contain the password registered
  * with NickServ for the nick used by the bot.
+ *
+ * @category Phergie
+ * @package  Phergie_Plugin_NickServ
+ * @author   Phergie Development Team <team@phergie.org>
+ * @license  http://phergie.org/license New BSD License
+ * @link     http://pear.phergie.org/package/Phergie_Plugin_NickServ
+ * @uses     Phergie_Plugin_Command pear.phergie.org
  */
-class Phergie_Plugin_NickServ extends Phergie_Plugin_Abstract {
+class Phergie_Plugin_NickServ extends Phergie_Plugin_Abstract
+{
     /**
-     * The name of the nickserv bot
+     * Nick of the NickServ bot
      *
      * @var string
      */
@@ -21,20 +48,25 @@ class Phergie_Plugin_NickServ extends Phergie_Plugin_Abstract {
     protected $identifyMessage;
 
     /**
-     * Initializes instance variables.
+     * Checks for dependencies and required configuration settings.
      *
      * @return void
      */
-    public function onLoad() {
+    public function onLoad()
+    {
         $this->getPluginHandler()->getPlugin('Command');
 
         // Get the name of the NickServ bot, defaults to NickServ
         $this->botNick = $this->config['nickserv.botnick'];
-        if (!$this->botNick) $this->botNick = 'NickServ';
+        if (!$this->botNick) {
+            $this->botNick = 'NickServ';
+        }
 
         // Get the identify message
         $this->identifyMessage = $this->config['nickserv.identify_message'];
-        if (!$this->identifyMessage) $this->identifyMessage = 'This nickname is registered.';
+        if (!$this->identifyMessage) {
+            $this->identifyMessage = 'This nickname is registered.';
+        }
     }
 
     /**
@@ -44,7 +76,8 @@ class Phergie_Plugin_NickServ extends Phergie_Plugin_Abstract {
      *
      * @return void
      */
-    public function onNotice() {
+    public function onNotice()
+    {
         $event = $this->event;
         if (strtolower($event->getNick()) == strtolower($this->botNick)) {
             $message = $event->getArgument(1);
@@ -62,14 +95,15 @@ class Phergie_Plugin_NickServ extends Phergie_Plugin_Abstract {
     }
 
     /**
-     * Checks to see if the original Nick has quit, if so, take the name back
+     * Checks to see if the original nick has quit; if so, take the name back.
      *
      * @return void
      */
-    public function onQuit() {
-        $eventnick = $this->event->getNick();
+    public function onQuit()
+    {
+        $eventNick = $this->event->getNick();
         $nick = $this->connection->getNick();
-        if ($eventnick == $nick) {
+        if ($eventNick == $nick) {
             $this->doNick($nick);
         }
     }
@@ -80,7 +114,8 @@ class Phergie_Plugin_NickServ extends Phergie_Plugin_Abstract {
      *
      * @return void
      */
-    public function onNick() {
+    public function onNick()
+    {
         $event = $this->event;
         $connection = $this->connection;
         if ($event->getNick() == $connection->getNick()) {
@@ -93,7 +128,8 @@ class Phergie_Plugin_NickServ extends Phergie_Plugin_Abstract {
      *
      * @return void
      */
-    public function onDoGhostbust() {
+    public function onCommandGhostbust()
+    {
         $event = $this->event;
         $user = $event->getNick();
         $conn = $this->connection;
@@ -102,42 +138,44 @@ class Phergie_Plugin_NickServ extends Phergie_Plugin_Abstract {
         if ($nick != $this->config['connections'][$conn->getHost()]['nick']) {
             $password = $this->config['nickserv.password'];
             if (!empty($password)) {
-                $this->doPrivmsg($this->event->getSource(), $user . ': Attempting to ghost ' . $nick .'.');
+                $this->doPrivmsg(
+                    $this->event->getSource(),
+                    $user . ': Attempting to ghost ' . $nick .'.'
+                );
                 $this->doPrivmsg(
                     $this->botNick,
                     'GHOST ' . $nick . ' ' . $password,
                     true
                 );
             }
-            unset($password);
         }
     }
 
     /**
-     * Automatically send the GHOST command if the Nickname is in use
+     * Automatically send the GHOST command if the bot's nick is in use.
      *
      * @return void
      */
-    public function onResponse() {
+    public function onResponse()
+    {
         if ($this->event->getCode() == Phergie_Event_Response::ERR_NICKNAMEINUSE) {
             $password = $this->config['nickserv.password'];
             if (!empty($password)) {
                 $this->doPrivmsg(
                     $this->botNick,
-                    'GHOST ' . $this->connection->getNick() . ' ' . $password,
-                    true
+                    'GHOST ' . $this->connection->getNick() . ' ' . $password
                 );
             }
-            unset($password);
         }
     }
 
     /**
-     * The server sent a KILL request, so quit the server
+     * Handle the server sending a KILL request.
      *
      * @return void
      */
-    public function onKill() {
+    public function onKill()
+    {
         $this->doQuit($this->event->getArgument(1));
     }
 }
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Tld.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Tld.php
index 21ba1e6719..5efc265c64 100644
--- a/plugins/Irc/extlib/phergie/Phergie/Plugin/Tld.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Tld.php
@@ -30,6 +30,8 @@
  * @license  http://phergie.org/license New BSD License
  * @link     http://pear.phergie.org/package/Phergie_Plugin_Tld
  * @uses     Phergie_Plugin_Http pear.phergie.org
+ * @uses     extension PDO
+ * @uses     extension pdo_sqlite
  *
  * @pluginDesc Provides information for a top level domain.
  */
@@ -78,116 +80,22 @@ class Phergie_Plugin_Tld extends Phergie_Plugin_Abstract
             );
         }
 
+        $dbFile = dirname(__FILE__) . '/Tld/tld.db';
         try {
-            $dbFile = dirname(__FILE__) . '/Tld/tld.db';
-            $dbManager = new Phergie_Db_Sqlite($dbFile);
-            $this->db = $dbManager->getDb();
-            if (!$dbManager->hasTable('tld')) {
-                $query = 'CREATE TABLE tld ('
-                        . 'tld VARCHAR(20), '
-                        . 'type VARCHAR(20), '
-                        . 'description VARCHAR(255))';
+            $this->db = new PDO('sqlite:' . $dbFile);
 
-                $this->db->exec($query);
+            $this->select = $this->db->prepare('
+                SELECT type, description
+                FROM tld
+                WHERE LOWER(tld) = LOWER(:tld)
+            ');
 
-                // prepare a statement to populate the table with
-                // tld information
-                $insert = $this->db->prepare(
-                    'INSERT INTO tld
-                    (tld, type, description)
-                    VALUES (:tld, :type, :description)'
-                );
-
-                // grab tld data from iana.org...
-                $contents = file_get_contents(
-                    'http://www.iana.org/domains/root/db/'
-                );
-
-                // ...and then parse it out
-                $regex = '{<tr class="iana-group[^>]*><td><a[^>]*>\s*\.?([^<]+)\s*'
-                        . '(?:<br/><span[^>]*>[^<]*</span>)?</a></td><td>\s*'
-                        . '([^<]+)\s*</td><td>\s*([^<]+)\s*}i';
-                preg_match_all($regex, $contents, $matches, PREG_SET_ORDER);
-
-                foreach ($matches as $match) {
-                    list(, $tld, $type, $description) = array_pad($match, 4, null);
-                    $type = trim(strtolower($type));
-                    if ($type != 'test') {
-                        $tld = trim(strtolower($tld));
-                        $description = trim($description);
-
-                        switch ($tld) {
-
-                        case 'com':
-                            $description = 'Commercial';
-                            break;
-
-                        case 'info':
-                            $description = 'Information';
-                            break;
-
-                        case 'net':
-                            $description = 'Network';
-                            break;
-
-                        case 'org':
-                            $description = 'Organization';
-                            break;
-
-                        case 'edu':
-                            $description = 'Educational';
-                            break;
-
-                        case 'name':
-                            $description = 'Individuals, by name';
-                            break;
-                        }
-
-                        if (empty($tld) || empty($description)) {
-                            continue;
-                        }
-
-                        $regex = '{(^(?:Reserved|Restricted)\s*(?:exclusively\s*)?'
-                                 . '(?:for|to)\s*(?:members of\s*)?(?:the|support)?'
-                                 . '\s*|\s*as advised.*$)}i';
-                        $description = preg_replace($regex, '', $description);
-                        $description = ucfirst(trim($description));
-
-                        $data = array_map(
-                            'html_entity_decode', array(
-                                'tld' => $tld,
-                                'type' => $type,
-                                'description' => $description
-                            )
-                        );
-
-                        $insert->execute($data);
-                    }
-                }
-
-                unset(
-                    $insert,
-                    $matches,
-                    $match,
-                    $contents,
-                    $tld,
-                    $type,
-                    $description,
-                    $data,
-                    $regex
-                );
-            }
-
-            // Create a prepared statements for retrieving TLDs
-            $this->select = $this->db->prepare(
-                'SELECT type, description '
-                . 'FROM tld WHERE LOWER(tld) = LOWER(:tld)'
-            );
-
-            $this->selectAll = $this->db->prepare(
-                'SELECT tld, type, description FROM tld'
-            );
+            $this->selectAll = $this->db->prepare('
+                SELECT tld, type, description
+                FROM btld
+            ');
         } catch (PDOException $e) {
+            $this->getPluginHandler()->removePlugin($this);
         }
     }
 
@@ -258,4 +166,3 @@ class Phergie_Plugin_Tld extends Phergie_Plugin_Abstract
         return false;
     }
 }
-
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Tld/db.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Tld/db.php
new file mode 100644
index 0000000000..28f963ad10
--- /dev/null
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Tld/db.php
@@ -0,0 +1,68 @@
+<?php
+
+$dbFile = 'tld.db';
+
+if (file_exists($dbFile)) {
+    exit;
+}
+
+$db = new PDO('sqlite:' . dirname(__FILE__) . '/' . $dbFile);
+
+$query = '
+    CREATE TABLE tld (
+        tld VARCHAR(20),
+        type VARCHAR(20),
+        description VARCHAR(255)
+    )
+';
+$db->exec($query);
+
+$insert = $db->prepare('
+    INSERT INTO tld (tld, type, description)
+    VALUES (:tld, :type, :description)
+');
+
+$contents = file_get_contents(
+    'http://www.iana.org/domains/root/db/'
+);
+
+libxml_use_internal_errors(true);
+$doc = new DOMDocument;
+$doc->loadHTML($contents);
+libxml_clear_errors();
+
+$descriptions = array(
+    'com' => 'Commercial',
+    'info' => 'Information',
+    'net' => 'Network',
+    'org' => 'Organization',
+    'edu' => 'Educational',
+    'name' => 'Individuals, by name'
+);
+
+$xpath = new DOMXPath($doc);
+$rows = $xpath->query('//tr[contains(@class, "iana-group")]');
+foreach (range(0, $rows->length - 1) as $index) {
+    $row = $rows->item($index);
+    $tld = strtolower(ltrim($row->childNodes->item(0)->textContent, '.'));
+    $type = $row->childNodes->item(1)->nodeValue;
+    if (isset($descriptions[$tld])) {
+        $description = $descriptions[$tld];
+    } else {
+        $description = $row->childNodes->item(2)->textContent;
+        $regex = '{(^(?:Reserved|Restricted)\s*(?:exclusively\s*)?'
+         . '(?:for|to)\s*(?:members of\s*)?(?:the|support)?'
+         . '\s*|\s*as advised.*$)}i';
+        $description = preg_replace($regex, '', $description);
+        $description = ucfirst(trim($description));
+    }
+    $data = array_map(
+        'html_entity_decode',
+        array(
+            'tld' => $tld,
+            'type' => $type,
+            'description' => $description
+        )
+    );
+    $insert->execute($data);
+}
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Twitter.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Twitter.php
index 91f177d2ae..4a77d1e418 100644
--- a/plugins/Irc/extlib/phergie/Phergie/Plugin/Twitter.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Twitter.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Phergie 
+ * Phergie
  *
  * PHP version 5
  *
@@ -11,7 +11,7 @@
  * It is also available through the world-wide-web at this URL:
  * http://phergie.org/license
  *
- * @category  Phergie 
+ * @category  Phergie
  * @package   Phergie_Plugin_Twitter
  * @author    Phergie Development Team <team@phergie.org>
  * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
@@ -20,7 +20,7 @@
  */
 
 /**
- * These requires are for library code, so they don't fit Autoload's normal 
+ * These requires are for library code, so they don't fit Autoload's normal
  * conventions.
  *
  * @link http://github.com/scoates/simpletweet
@@ -67,11 +67,6 @@ class Phergie_Plugin_Twitter extends Phergie_Plugin_Abstract
      */
     protected $twitterpassword = null;
 
-    /**
-     * Allow only admins to tweet
-     */
-    protected $requireAdmin = true;
-
     /**
      * Register with the URL plugin, if possible
      *
@@ -91,13 +86,6 @@ class Phergie_Plugin_Twitter extends Phergie_Plugin_Abstract
      */
     public function onLoad()
     {
-        // see if tweetrequireadmin defined in config
-        if (isset($this->config['twitter.tweetrequireadmin'])
-            && $req = $this->config['twitter.tweetrequireadmin']
-        ) {
-            // if so, override default
-            $this->requireAdmin = $req;
-        }
         if (!isset($this->config['twitter.class'])
             || !$twitterClass = $this->config['twitter.class']
         ) {
@@ -150,14 +138,10 @@ class Phergie_Plugin_Twitter extends Phergie_Plugin_Abstract
      */
     public function onCommandTweet($txt)
     {
-        echo "Tweet!\n";
         $nick = $this->getEvent()->getNick();
         if (!$this->twitteruser) {
             return;
         }
-        if ($this->requireAdmin && !$this->fromAdmin(true)) {
-            return;
-        }
         $source = $this->getEvent()->getSource();
         if ($tweet = $this->twitter->sendTweet($txt)) {
             $this->doPrivmsg(
@@ -173,7 +157,7 @@ class Phergie_Plugin_Twitter extends Phergie_Plugin_Abstract
      * Formats a Tweet into a message suitable for output
      *
      * @param object $tweet      JSON-decoded tweet object from Twitter
-     * @param bool   $includeUrl whether or not to include the URL in the 
+     * @param bool   $includeUrl whether or not to include the URL in the
      *  formatted output
      *
      * @return string
@@ -218,6 +202,5 @@ class Phergie_Plugin_Twitter extends Phergie_Plugin_Abstract
 
         // if we get this far, we haven't satisfied the URL, so bail:
         return false;
-
     }
 }
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Weather.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Weather.php
old mode 100755
new mode 100644
index 7d3cc1de03..499cd9d556
--- a/plugins/Irc/extlib/phergie/Phergie/Plugin/Weather.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Weather.php
@@ -55,6 +55,30 @@ class Phergie_Plugin_Weather extends Phergie_Plugin_Abstract
         }
     }
 
+    /**
+     * Converts a temperature in Celsius to Fahrenheit.
+     *
+     * @param int $temp Temperature in Celsius
+     *
+     * @return int Temperature converted to Fahrenheit
+     */
+    public function convertCelsiusToFahrenheit($temp)
+    {
+        return round(((((int) $temp * 9) / 5) + 32));
+    }
+
+    /**
+     * Converts a temperature in Fahrenheit to Celsius.
+     *
+     * @param int $temp Temperature in Fahrenheit
+     *
+     * @return int Temperature converted to Celsius
+     */
+    public function convertFahrenheitToCelsius($temp)
+    {
+        return round(((((int) $temp - 32) * 5) / 9));
+    }
+
     /**
      * Returns a weather report for a specified location.
      *
@@ -107,18 +131,44 @@ class Phergie_Plugin_Weather extends Phergie_Plugin_Abstract
 
         $xml = $response->getContent();
         $weather = 'Weather for ' . (string) $xml->loc->dnam . ' - ';
-        $weather .= 'Current temperature ' .
-            (string) $xml->cc->tmp .
-            (string) $xml->head->ut . ' / ';
-        if ((string) $xml->head->ut == 'F') {
-            $weather .= round(((((int) $xml->cc->tmp - 32) * 5) / 9)) . 'C';
-        } else {
-            $weather .= round(((((int) $xml->cc->tmp * 9) / 5) + 32)) . 'F';
+        switch ($xml->head->ut) {
+            case 'F':
+                $tempF = $xml->cc->tmp;
+                $tempC = $this->convertFahrenheitToCelsius($tempF);
+                break;
+            case 'C':
+                $tempC = $xml->cc->tmp;
+                $tempF = $this->convertCelsiusToFahrenheit($tempC);
+                break;
+            default:
+                $this->doNotice(
+                    $this->event->getNick(),
+                    'ERROR: No scale information given.');
+                break;
+        }
+        $r = $xml->cc->hmid;
+        $tempF2 = $tempF * $tempF;
+        $r2 = $r * $r;
+        $hiF = round(
+            -42.379 +
+            (2.04901523 * $tempF) +
+            (10.14333127 * $r) -
+            (.22475541 * $tempF * $r) -
+            (6.83783 * pow(10,-3) * $tempF2) -
+            (5.481717 * pow(10,-2) * $r2) +
+            (1.22874 * pow(10,-3) * $tempF2 * $r) +
+            (8.5282 * pow(10,-4) * $tempF * $r2) -
+            (1.99 * pow(10,-6) * $tempF2 * $r2)
+        );
+        $hiC = $this->convertFahrenheitToCelsius($hiF);
+        $weather .= 'Temperature: ' . $tempF . 'F/' . $tempC . 'C';
+        $weather .= ', Humidity: ' . (string) $xml->cc->hmid . '%';
+        if ($hiF > $tempF || $hiC > $tempC) {
+            $weather .= ', Heat Index: ' . $hiF . 'F/' . $hiC . 'C';
         }
         $weather .=
-            ', Relative humidity ' . (string) $xml->cc->hmid . '%' .
-            ', Current conditions ' . (string) $xml->cc->t .
-            ', Last update ' . (string) $xml->cc->lsup .
+            ', Conditions: ' . (string) $xml->cc->t .
+            ', Updated: ' . (string) $xml->cc->lsup .
             ' [ http://weather.com/weather/today/' .
             str_replace(
                 array('(', ')', ',', ' '),

From 4c4dc6571231b188740c106a1f558b10388004cc Mon Sep 17 00:00:00 2001
From: Luke Fitzgerald <lw.fitzgerald@googlemail.com>
Date: Sun, 18 Jul 2010 06:30:52 -0700
Subject: [PATCH 105/655] Use original config class as readArray was added
 upstream

---
 plugins/Irc/ircmanager.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/Irc/ircmanager.php b/plugins/Irc/ircmanager.php
index 71aa9644aa..c404c751ca 100644
--- a/plugins/Irc/ircmanager.php
+++ b/plugins/Irc/ircmanager.php
@@ -75,7 +75,7 @@ class IrcManager extends ImManager {
             $nickservpassword = isset($this->plugin->nickservpassword) ? $this->plugin->nickservpassword : '';
             $channels = isset($this->plugin->channels) ? $this->plugin->channels : array();
 
-            $config = new Phergie_Extended_Config;
+            $config = new Phergie_Config;
             $config->readArray(
                 array(
                     // One array per connection, pretty self-explanatory

From 7f2555126a165f75f2681da4a4bece5c05cc1694 Mon Sep 17 00:00:00 2001
From: Luke Fitzgerald <lw.fitzgerald@googlemail.com>
Date: Sun, 18 Jul 2010 12:26:11 -0700
Subject: [PATCH 106/655] IrcPlugin.php almost complete

---
 plugins/Irc/IrcPlugin.php | 113 ++++++++++++++++++++++++++++----------
 1 file changed, 83 insertions(+), 30 deletions(-)

diff --git a/plugins/Irc/IrcPlugin.php b/plugins/Irc/IrcPlugin.php
index 3a188f667a..0422a6389b 100644
--- a/plugins/Irc/IrcPlugin.php
+++ b/plugins/Irc/IrcPlugin.php
@@ -1,9 +1,9 @@
 <?php
 /**
  * StatusNet - the distributed open-source microblogging tool
- * Copyright (C) 2009, StatusNet, Inc.
+ * Copyright (C) 2010, StatusNet, Inc.
  *
- * Send and receive notices using the AIM network
+ * Send and receive notices using an IRC network
  *
  * PHP version 5
  *
@@ -56,21 +56,43 @@ class IrcPlugin extends ImPlugin {
 
     public $transport = 'irc';
 
-    function getDisplayName() {
+    /**
+     * Get the internationalized/translated display name of this IM service
+     *
+     * @return string Name of service
+     */
+    public function getDisplayName() {
         return _m('IRC');
     }
 
-    function normalize($screenname) {
-		$screenname = str_replace(" ","", $screenname);
+    /**
+     * Normalize a screenname for comparison
+     *
+     * @param string $screenname screenname to normalize
+     * @return string an equivalent screenname in normalized form
+     */
+    public function normalize($screenname) {
+        $screenname = str_replace(" ","", $screenname);
         return strtolower($screenname);
     }
 
-    function daemon_screenname() {
-        return $this->user;
+    /**
+     * Get the screenname of the daemon that sends and receives messages
+     *
+     * @return string Screenname
+     */
+    public function daemon_screenname() {
+        return $this->nick;
     }
 
-    function validate($screenname) {
-        if (preg_match('/^[a-z]\w{2,15}$/i', $screenname)) {
+    /**
+     * Validate (ensure the validity of) a screenname
+     *
+     * @param string $screenname screenname to validate
+     * @return boolean
+     */
+    public function validate($screenname) {
+        if (preg_match('/\A[a-z0-9\-_]{1,1000}\z/i', $screenname)) {
             return true;
         } else {
             return false;
@@ -81,10 +103,9 @@ class IrcPlugin extends ImPlugin {
      * Load related modules when needed
      *
      * @param string $cls Name of the class to be loaded
-     *
      * @return boolean hook value; true means continue processing, false means stop.
      */
-    function onAutoload($cls) {
+    public function onAutoload($cls) {
         $dir = dirname(__FILE__);
 
         switch ($cls) {
@@ -99,18 +120,36 @@ class IrcPlugin extends ImPlugin {
         }
     }
 
-    function onStartImDaemonIoManagers(&$classes) {
+    /*
+     * Start manager on daemon start
+     *
+     * @return boolean
+     */
+    public function onStartImDaemonIoManagers(&$classes) {
         parent::onStartImDaemonIoManagers(&$classes);
         $classes[] = new IrcManager($this); // handles sending/receiving
         return true;
     }
 
-    function microiduri($screenname) {
+    /**
+    * Get a microid URI for the given screenname
+    *
+    * @param string $screenname
+    * @return string microid URI
+    */
+    public function microiduri($screenname) {
         return 'irc:' . $screenname;
     }
 
-    function send_message($screenname, $body) {
-        $this->fake_irc->sendIm($screenname, $body);
+    /**
+     * Send a message to a given screenname
+     *
+     * @param string $screenname Screenname to send to
+     * @param string $body Text to send
+     * @return boolean success value
+     */
+    public function send_message($screenname, $body) {
+        $this->fake_irc->doPrivmsg($screenname, $body);
         $this->enqueue_outgoing_raw($this->fake_irc->would_be_sent);
         return true;
     }
@@ -120,30 +159,44 @@ class IrcPlugin extends ImPlugin {
      *
      * @return true if processing completed, false if message should be reprocessed
      */
-    function receive_raw_message($message) {
-        $info=Aim::getMessageInfo($message);
-        $from = $info['from'];
-        $user = $this->get_user($from);
-        $notice_text = $info['message'];
-
-        $this->handle_incoming($from, $notice_text);
-
+    public function receive_raw_message($data) {
+        $this->handle_incoming($data['sender'], $data['message']);
         return true;
     }
 
-    function initialize() {
-        if (!isset($this->user)) {
-            throw new Exception("must specify a user");
+    /**
+    * Initialize plugin
+    *
+    * @return boolean
+    */
+    public function initialize() {
+        if (!isset($this->host)) {
+            throw new Exception('must specify a host');
         }
-        if (!isset($this->password)) {
-            throw new Exception("must specify a password");
+        if (!isset($this->port)) {
+            throw new Exception('must specify a port');
+        }
+        if (!isset($this->username)) {
+            throw new Exception('must specify a username');
+        }
+        if (!isset($this->realname)) {
+            throw new Exception('must specify a "real name"');
+        }
+        if (!isset($this->nick)) {
+            throw new Exception('must specify a nickname');
         }
 
-        $this->fake_irc = new Fake_Irc($this->user, $this->password, 4);
+        $this->fake_irc = new Fake_Irc;
         return true;
     }
 
-    function onPluginVersion(&$versions) {
+    /**
+     * Get plugin information
+     *
+     * @param array $versions array to insert information into
+     * @return void
+     */
+    public function onPluginVersion(&$versions) {
         $versions[] = array('name' => 'IRC',
                             'version' => STATUSNET_VERSION,
                             'author' => 'Luke Fitzgerald',

From 942ce88a75a4ef84c831c89ecf1666dd57124fc9 Mon Sep 17 00:00:00 2001
From: Luke Fitzgerald <lw.fitzgerald@googlemail.com>
Date: Sun, 18 Jul 2010 12:40:07 -0700
Subject: [PATCH 107/655] Added send method to avoid having to call getDriver()

---
 .../Irc/extlib/phergie/Phergie/ExtendedBot.php  | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/plugins/Irc/extlib/phergie/Phergie/ExtendedBot.php b/plugins/Irc/extlib/phergie/Phergie/ExtendedBot.php
index 5d0d3adca1..32bb8bad37 100644
--- a/plugins/Irc/extlib/phergie/Phergie/ExtendedBot.php
+++ b/plugins/Irc/extlib/phergie/Phergie/ExtendedBot.php
@@ -39,6 +39,23 @@ class Phergie_Extended_Bot extends Phergie_Bot {
         $this->loadConnections();
     }
 
+    /**
+    * Transmit raw command to server using driver
+    *
+    * Handles construction of command strings and their transmission to the
+    * server.
+    *
+    * @param string       $command Command to send
+    * @param string|array $args    Optional string or array of sequential
+    *        arguments
+    *
+    * @return string Command string that was sent
+    * @throws Phergie_Driver_Exception
+    */
+    public function send($command, $args = '') {
+        $this->getDriver()->send($command, $args);
+    }
+
     /**
     * Get the sockets used by the bot
     *

From 2550971450a4ce8d56298463186ad751352394c3 Mon Sep 17 00:00:00 2001
From: Luke Fitzgerald <lw.fitzgerald@googlemail.com>
Date: Sun, 18 Jul 2010 12:45:28 -0700
Subject: [PATCH 108/655] ircmanager.php almost complete - Need to add
 exception catching

---
 plugins/Irc/ircmanager.php | 41 +++++++++++++++++++++++++++++++-------
 1 file changed, 34 insertions(+), 7 deletions(-)

diff --git a/plugins/Irc/ircmanager.php b/plugins/Irc/ircmanager.php
index c404c751ca..549936ae7b 100644
--- a/plugins/Irc/ircmanager.php
+++ b/plugins/Irc/ircmanager.php
@@ -31,10 +31,11 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
  */
 
 class IrcManager extends ImManager {
-
     public $conn = null;
+
     /**
      * Initialize connection to server.
+     *
      * @return boolean true on success
      */
     public function start($master) {
@@ -46,10 +47,16 @@ class IrcManager extends ImManager {
         }
     }
 
+    /**
+    * Return any open sockets that the run loop should listen
+    * for input on.
+    *
+    * @return array Array of socket resources
+    */
     public function getSockets() {
         $this->connect();
         if ($this->conn) {
-            return array($this->conn->myConnection);
+            return $this->conn->getSockets();
         } else {
             return array();
         }
@@ -57,7 +64,9 @@ class IrcManager extends ImManager {
 
     /**
      * Process IRC events that have come in over the wire.
+     *
      * @param resource $socket
+     * @return void
      */
     public function handleInput($socket) {
         common_log(LOG_DEBUG, 'Servicing the IRC queue.');
@@ -65,7 +74,12 @@ class IrcManager extends ImManager {
         $this->conn->receive();
     }
 
-    function connect() {
+    /**
+    * Initiate connection
+    *
+    * @return void
+    */
+    public function connect() {
         if (!$this->conn) {
             $this->conn = new Phergie_Extended_Bot;
 
@@ -78,7 +92,6 @@ class IrcManager extends ImManager {
             $config = new Phergie_Config;
             $config->readArray(
                 array(
-                    // One array per connection, pretty self-explanatory
                     'connections' => array(
                         array(
                             'host' => $this->plugin->host,
@@ -119,17 +132,31 @@ class IrcManager extends ImManager {
         return $this->conn;
     }
 
-    function handle_irc_message($data) {
+    /**
+    * Called via a callback when a message is received
+    *
+    * Passes it back to the queuing system
+    *
+    * @param array $data Data
+    * @return boolean
+    */
+    public function handle_irc_message($data) {
         $this->plugin->enqueue_incoming_raw($data);
         return true;
     }
 
-    function send_raw_message($data) {
+    /**
+     * Send a message using the daemon
+     *
+     * @param $data Message
+     * @return boolean true on success
+     */
+    public function send_raw_message($data) {
         $this->connect();
         if (!$this->conn) {
             return false;
         }
-        $this->conn->sflapSend($data[0],$data[1],$data[2],$data[3]);
+        $this->conn->send($data[0], $data[1]);
         return true;
     }
 }

From ee7098c0dbee884e920bba845b5fdbe6336a7b89 Mon Sep 17 00:00:00 2001
From: Luke Fitzgerald <lw.fitzgerald@googlemail.com>
Date: Sun, 18 Jul 2010 12:58:06 -0700
Subject: [PATCH 109/655] Removed hard tabs

---
 plugins/Msn/MsnPlugin.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/plugins/Msn/MsnPlugin.php b/plugins/Msn/MsnPlugin.php
index 8b20367139..2d31f99758 100644
--- a/plugins/Msn/MsnPlugin.php
+++ b/plugins/Msn/MsnPlugin.php
@@ -52,7 +52,7 @@ class MsnPlugin extends ImPlugin {
     public $password = null;
     public $nickname = null;
     public $transport = 'msn';
-    
+
     /**
      * Get the internationalized/translated display name of this IM service
      *
@@ -69,7 +69,7 @@ class MsnPlugin extends ImPlugin {
      * @return string an equivalent screenname in normalized form
      */
     public function normalize($screenname) {
-		$screenname = str_replace(" ","", $screenname);
+        $screenname = str_replace(" ","", $screenname);
         return strtolower($screenname);
     }
 
@@ -115,7 +115,7 @@ class MsnPlugin extends ImPlugin {
 
     /*
      * Start manager on daemon start
-     * 
+     *
      * @return boolean
      */
     public function onStartImDaemonIoManagers(&$classes) {
@@ -142,7 +142,7 @@ class MsnPlugin extends ImPlugin {
      * @return boolean success value
      */
     public function send_message($screenname, $body) {
-	    $this->enqueue_outgoing_raw(array('to' => $screenname, 'message' => $body));
+        $this->enqueue_outgoing_raw(array('to' => $screenname, 'message' => $body));
         return true;
     }
 
@@ -178,7 +178,7 @@ class MsnPlugin extends ImPlugin {
 
     /**
      * Get plugin information
-     * 
+     *
      * @param array $versions array to insert information into
      * @return void
      */

From 1e5198645c0588cec11ff0bcd5e2864e88da3cdf Mon Sep 17 00:00:00 2001
From: Luke Fitzgerald <lw.fitzgerald@googlemail.com>
Date: Tue, 20 Jul 2010 06:26:51 -0700
Subject: [PATCH 110/655] Weaken send scope to protected

---
 plugins/Irc/Fake_Irc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/Irc/Fake_Irc.php b/plugins/Irc/Fake_Irc.php
index 9f2a611e68..a1e296e8b1 100644
--- a/plugins/Irc/Fake_Irc.php
+++ b/plugins/Irc/Fake_Irc.php
@@ -34,7 +34,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
 class Fake_Irc extends Phergie_Driver_Streams {
     public $would_be_sent = null;
 
-    private function send($command, $args = '') {
+    protected function send($command, $args = '') {
         $this->would_be_sent = array($command, $args);
     }
 }

From efdf9b6d4e3c6e8c4ce49a5d5f9e42658d1dc004 Mon Sep 17 00:00:00 2001
From: Luke Fitzgerald <lw.fitzgerald@googlemail.com>
Date: Tue, 20 Jul 2010 11:16:59 -0700
Subject: [PATCH 111/655] Code now functional - lots of error checking and
 extras missing still though

---
 plugins/Irc/IrcPlugin.php                     | 21 ++++++++++++-------
 plugins/Irc/README                            |  5 ++---
 .../extlib/phergie/Phergie/ExtendedBot.php    | 14 +++++++++++--
 .../phergie/Phergie/Process/Statusnet.php     |  2 +-
 plugins/Irc/ircmanager.php                    | 17 ++++++++-------
 5 files changed, 38 insertions(+), 21 deletions(-)

diff --git a/plugins/Irc/IrcPlugin.php b/plugins/Irc/IrcPlugin.php
index 0422a6389b..a9044df8d2 100644
--- a/plugins/Irc/IrcPlugin.php
+++ b/plugins/Irc/IrcPlugin.php
@@ -33,10 +33,9 @@ if (!defined('STATUSNET')) {
     // your code file can't be executed directly from the web.
     exit(1);
 }
+
 // We bundle the Phergie library...
 set_include_path(get_include_path() . PATH_SEPARATOR . dirname(__FILE__) . '/extlib/phergie');
-require 'Phergie/Autoload.php';
-Phergie_Autoload::registerAutoloader();
 
 /**
  * Plugin for IRC
@@ -50,9 +49,16 @@ Phergie_Autoload::registerAutoloader();
  */
 
 class IrcPlugin extends ImPlugin {
-    public $user =  null;
+    public $host =  null;
+    public $port = null;
+    public $username = null;
+    public $realname = null;
+    public $nick = null;
     public $password = null;
-    public $publicFeed = array();
+    public $nickservpassword = null;
+    public $channels = null;
+    public $transporttype = null;
+    public $encoding = null;
 
     public $transport = 'irc';
 
@@ -116,6 +122,10 @@ class IrcPlugin extends ImPlugin {
                 include_once $dir . '/'. $cls .'.php';
                 return false;
             default:
+                if (substr($cls, 0, 7) == 'Phergie') {
+                    include_once str_replace('_', DIRECTORY_SEPARATOR, $cls) . '.php';
+                    return false;
+                }
                 return true;
         }
     }
@@ -173,9 +183,6 @@ class IrcPlugin extends ImPlugin {
         if (!isset($this->host)) {
             throw new Exception('must specify a host');
         }
-        if (!isset($this->port)) {
-            throw new Exception('must specify a port');
-        }
         if (!isset($this->username)) {
             throw new Exception('must specify a username');
         }
diff --git a/plugins/Irc/README b/plugins/Irc/README
index bed57e1e45..5b86a04499 100644
--- a/plugins/Irc/README
+++ b/plugins/Irc/README
@@ -13,14 +13,14 @@ See the StatusNet README for more about queuing and daemons.
 Settings
 ========
 host*: Hostname of IRC server
-port*: Port of IRC server
+port: Port of IRC server (defaults to 6667)
 username*: Username of bot
 realname*: Real name of bot
 nick*: Nickname of bot
 password: Password
 nickservpassword: NickServ password for identification
 channels: Channels for bot to idle in
-transport: Set to 'ssl' to enable SSL
+transporttype: Set to 'ssl' to enable SSL
 encoding: Set to UTF8 to enable UTF8 encoding
 
 * required
@@ -29,7 +29,6 @@ Example
 =======
 addPlugin('irc', array(
     'host' => '...',
-    'port' => '...',
     'username' => '...',
     'realname' => '...',
     'nick' => '...',
diff --git a/plugins/Irc/extlib/phergie/Phergie/ExtendedBot.php b/plugins/Irc/extlib/phergie/Phergie/ExtendedBot.php
index 32bb8bad37..113bb8b51b 100644
--- a/plugins/Irc/extlib/phergie/Phergie/ExtendedBot.php
+++ b/plugins/Irc/extlib/phergie/Phergie/ExtendedBot.php
@@ -25,7 +25,7 @@
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
  * @link      http://status.net/
  */
-class Phergie_Extended_Bot extends Phergie_Bot {
+class Phergie_ExtendedBot extends Phergie_Bot {
     /**
     * Set up bot and connect to servers
     *
@@ -53,7 +53,17 @@ class Phergie_Extended_Bot extends Phergie_Bot {
     * @throws Phergie_Driver_Exception
     */
     public function send($command, $args = '') {
-        $this->getDriver()->send($command, $args);
+        return $this->getDriver()->send($command, $args);
+    }
+
+    /**
+    * Handle incoming data on the socket using the handleEvents
+    * method of the Processor
+    *
+    * @return void
+    */
+    public function receive() {
+        $this->getProcessor()->handleEvents();
     }
 
     /**
diff --git a/plugins/Irc/extlib/phergie/Phergie/Process/Statusnet.php b/plugins/Irc/extlib/phergie/Phergie/Process/Statusnet.php
index c5999956b3..672e6f610b 100644
--- a/plugins/Irc/extlib/phergie/Phergie/Process/Statusnet.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Process/Statusnet.php
@@ -27,7 +27,7 @@
  */
 
 class Phergie_Process_Statusnet extends Phergie_Process_Async {
-    public function __constuct(Phergie_Extended_Bot $bot, array $options) {
+    public function __construct(Phergie_ExtendedBot $bot, array $options) {
         $this->usec = 0;
         Phergie_Process_Abstract::__construct($bot, $options);
     }
diff --git a/plugins/Irc/ircmanager.php b/plugins/Irc/ircmanager.php
index 549936ae7b..2157964f61 100644
--- a/plugins/Irc/ircmanager.php
+++ b/plugins/Irc/ircmanager.php
@@ -81,13 +81,14 @@ class IrcManager extends ImManager {
     */
     public function connect() {
         if (!$this->conn) {
-            $this->conn = new Phergie_Extended_Bot;
+            $this->conn = new Phergie_ExtendedBot;
 
-            $password = isset($this->plugin->password) ? $this->plugin->password : '';
-            $transport = isset($this->plugin->transport) ? $this->plugin->transport : 'tcp';
-            $encoding = isset($this->plugin->encoding) ? $this->plugin->encoding : 'ISO-8859-1';
-            $nickservpassword = isset($this->plugin->nickservpassword) ? $this->plugin->nickservpassword : '';
-            $channels = isset($this->plugin->channels) ? $this->plugin->channels : array();
+            $port = empty($this->plugin->port) ? 6667 : $this->plugin->port;
+            $password = empty($this->plugin->password) ? '' : $this->plugin->password;
+            $transport = empty($this->plugin->transporttype) ? 'tcp' : $this->plugin->transporttype;
+            $encoding = empty($this->plugin->encoding) ? 'ISO-8859-1' : $this->plugin->encoding;
+            $nickservpassword = empty($this->plugin->nickservpassword) ? '' : $this->plugin->nickservpassword;
+            $channels = empty($this->plugin->channels) ? array() : $this->plugin->channels;
 
             $config = new Phergie_Config;
             $config->readArray(
@@ -95,10 +96,10 @@ class IrcManager extends ImManager {
                     'connections' => array(
                         array(
                             'host' => $this->plugin->host,
-                            'port' => $this->plugin->port,
+                            'port' => $port,
                             'username' => $this->plugin->username,
                             'realname' => $this->plugin->realname,
-                            'nick' => $this->plugin->nickname,
+                            'nick' => $this->plugin->nick,
                             'password' => $password,
                             'transport' => $transport,
                             'encoding' => $encoding

From a34e55e1a32d3cd99984c305ecaaa662fd211173 Mon Sep 17 00:00:00 2001
From: Luke Fitzgerald <lw.fitzgerald@googlemail.com>
Date: Tue, 20 Jul 2010 11:32:09 -0700
Subject: [PATCH 112/655] Change default encoding to UTF-8

---
 plugins/Irc/ircmanager.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/Irc/ircmanager.php b/plugins/Irc/ircmanager.php
index 2157964f61..8919e005e3 100644
--- a/plugins/Irc/ircmanager.php
+++ b/plugins/Irc/ircmanager.php
@@ -86,7 +86,7 @@ class IrcManager extends ImManager {
             $port = empty($this->plugin->port) ? 6667 : $this->plugin->port;
             $password = empty($this->plugin->password) ? '' : $this->plugin->password;
             $transport = empty($this->plugin->transporttype) ? 'tcp' : $this->plugin->transporttype;
-            $encoding = empty($this->plugin->encoding) ? 'ISO-8859-1' : $this->plugin->encoding;
+            $encoding = empty($this->plugin->encoding) ? 'UTF8' : $this->plugin->encoding;
             $nickservpassword = empty($this->plugin->nickservpassword) ? '' : $this->plugin->nickservpassword;
             $channels = empty($this->plugin->channels) ? array() : $this->plugin->channels;
 

From af5ecb88b153c44ab5dbb263edf58a8914a6ca17 Mon Sep 17 00:00:00 2001
From: Luke Fitzgerald <lw.fitzgerald@googlemail.com>
Date: Wed, 21 Jul 2010 05:21:37 -0700
Subject: [PATCH 113/655] Corrected UTF8 to UTF-8

---
 plugins/Irc/README         | 2 +-
 plugins/Irc/ircmanager.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/Irc/README b/plugins/Irc/README
index 5b86a04499..2429a5b81f 100644
--- a/plugins/Irc/README
+++ b/plugins/Irc/README
@@ -21,7 +21,7 @@ password: Password
 nickservpassword: NickServ password for identification
 channels: Channels for bot to idle in
 transporttype: Set to 'ssl' to enable SSL
-encoding: Set to UTF8 to enable UTF8 encoding
+encoding: Set to change encoding
 
 * required
 
diff --git a/plugins/Irc/ircmanager.php b/plugins/Irc/ircmanager.php
index 8919e005e3..c885064916 100644
--- a/plugins/Irc/ircmanager.php
+++ b/plugins/Irc/ircmanager.php
@@ -86,7 +86,7 @@ class IrcManager extends ImManager {
             $port = empty($this->plugin->port) ? 6667 : $this->plugin->port;
             $password = empty($this->plugin->password) ? '' : $this->plugin->password;
             $transport = empty($this->plugin->transporttype) ? 'tcp' : $this->plugin->transporttype;
-            $encoding = empty($this->plugin->encoding) ? 'UTF8' : $this->plugin->encoding;
+            $encoding = empty($this->plugin->encoding) ? 'UTF-8' : $this->plugin->encoding;
             $nickservpassword = empty($this->plugin->nickservpassword) ? '' : $this->plugin->nickservpassword;
             $channels = empty($this->plugin->channels) ? array() : $this->plugin->channels;
 

From 2e9da023c04d826628063b36553a764126970599 Mon Sep 17 00:00:00 2001
From: Luke Fitzgerald <lw.fitzgerald@googlemail.com>
Date: Wed, 21 Jul 2010 07:33:43 -0700
Subject: [PATCH 114/655] Rename Phergie_ExtendedBot to Phergie_StatusnetBot

---
 plugins/Irc/extlib/phergie/Phergie/Process/Statusnet.php      | 2 +-
 .../phergie/Phergie/{ExtendedBot.php => StatusnetBot.php}     | 4 ++--
 plugins/Irc/ircmanager.php                                    | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)
 rename plugins/Irc/extlib/phergie/Phergie/{ExtendedBot.php => StatusnetBot.php} (93%)

diff --git a/plugins/Irc/extlib/phergie/Phergie/Process/Statusnet.php b/plugins/Irc/extlib/phergie/Phergie/Process/Statusnet.php
index 672e6f610b..9369c2c1e7 100644
--- a/plugins/Irc/extlib/phergie/Phergie/Process/Statusnet.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Process/Statusnet.php
@@ -27,7 +27,7 @@
  */
 
 class Phergie_Process_Statusnet extends Phergie_Process_Async {
-    public function __construct(Phergie_ExtendedBot $bot, array $options) {
+    public function __construct(Phergie_StatusnetBot $bot, array $options) {
         $this->usec = 0;
         Phergie_Process_Abstract::__construct($bot, $options);
     }
diff --git a/plugins/Irc/extlib/phergie/Phergie/ExtendedBot.php b/plugins/Irc/extlib/phergie/Phergie/StatusnetBot.php
similarity index 93%
rename from plugins/Irc/extlib/phergie/Phergie/ExtendedBot.php
rename to plugins/Irc/extlib/phergie/Phergie/StatusnetBot.php
index 113bb8b51b..ba41f26db0 100644
--- a/plugins/Irc/extlib/phergie/Phergie/ExtendedBot.php
+++ b/plugins/Irc/extlib/phergie/Phergie/StatusnetBot.php
@@ -19,13 +19,13 @@
  * sockets and to allow StatusNet to 'drive' the bot
  *
  * @category  Phergie
- * @package   Phergie_Extended_Bot
+ * @package   Phergie_StatusnetBot
  * @author    Luke Fitzgerald <lw.fitzgerald@googlemail.com>
  * @copyright 2010 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
  * @link      http://status.net/
  */
-class Phergie_ExtendedBot extends Phergie_Bot {
+class Phergie_StatusnetBot extends Phergie_Bot {
     /**
     * Set up bot and connect to servers
     *
diff --git a/plugins/Irc/ircmanager.php b/plugins/Irc/ircmanager.php
index c885064916..ea98263a53 100644
--- a/plugins/Irc/ircmanager.php
+++ b/plugins/Irc/ircmanager.php
@@ -81,7 +81,7 @@ class IrcManager extends ImManager {
     */
     public function connect() {
         if (!$this->conn) {
-            $this->conn = new Phergie_ExtendedBot;
+            $this->conn = new Phergie_StatusnetBot;
 
             $port = empty($this->plugin->port) ? 6667 : $this->plugin->port;
             $password = empty($this->plugin->password) ? '' : $this->plugin->password;

From 3cb51e182b014b0631b805376d1f673fe61f4ff0 Mon Sep 17 00:00:00 2001
From: Luke Fitzgerald <lw.fitzgerald@googlemail.com>
Date: Wed, 21 Jul 2010 07:37:10 -0700
Subject: [PATCH 115/655] Rename Phergie_Plugin_Statusnet_Callback to
 Phergie_Plugin_StatusnetCallback

---
 .../{Statusnet_Callback.php => StatusnetCallback.php}       | 6 +++---
 plugins/Irc/ircmanager.php                                  | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename plugins/Irc/extlib/phergie/Phergie/Plugin/{Statusnet_Callback.php => StatusnetCallback.php} (87%)

diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Statusnet_Callback.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/StatusnetCallback.php
similarity index 87%
rename from plugins/Irc/extlib/phergie/Phergie/Plugin/Statusnet_Callback.php
rename to plugins/Irc/extlib/phergie/Phergie/Plugin/StatusnetCallback.php
index 7bc287714b..545ee343b8 100644
--- a/plugins/Irc/extlib/phergie/Phergie/Plugin/Statusnet_Callback.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/StatusnetCallback.php
@@ -19,14 +19,14 @@
  * a new incoming message
  *
  * @category  Phergie
- * @package   Phergie_Plugin_Statusnet_Callback
+ * @package   Phergie_Plugin_StatusnetCallback
  * @author    Luke Fitzgerald <lw.fitzgerald@googlemail.com>
  * @copyright 2010 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
  * @link      http://status.net/
  */
 
-class Phergie_Plugin_Statusnet_Callback extends Phergie_Plugin_Abstract {
+class Phergie_Plugin_StatusnetCallback extends Phergie_Plugin_Abstract {
     /**
     * Callback details
     *
@@ -38,7 +38,7 @@ class Phergie_Plugin_Statusnet_Callback extends Phergie_Plugin_Abstract {
     * Load callback from config
     */
     public function onLoad() {
-        $callback = $this->config['statusnet_callback.callback'];
+        $callback = $this->config['statusnetcallback.callback'];
         if (is_callable($callback)) {
             $this->callback = $callback;
         } else {
diff --git a/plugins/Irc/ircmanager.php b/plugins/Irc/ircmanager.php
index ea98263a53..480d4c8f6c 100644
--- a/plugins/Irc/ircmanager.php
+++ b/plugins/Irc/ircmanager.php
@@ -123,7 +123,7 @@ class IrcManager extends ImManager {
 
                     'nickserv.password' => $nickservpassword,
                     'autojoin.channels' => $channels,
-                    'statusnet_callback.callback' => array($this, 'handle_irc_message')
+                    'statusnetcallback.callback' => array($this, 'handle_irc_message')
                 )
             );
 

From f818182a373f10abac49cb476a0f16dbaf051965 Mon Sep 17 00:00:00 2001
From: Luke Fitzgerald <lw.fitzgerald@googlemail.com>
Date: Wed, 21 Jul 2010 07:39:28 -0700
Subject: [PATCH 116/655] Update classname in ircmanager too!

---
 plugins/Irc/ircmanager.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/Irc/ircmanager.php b/plugins/Irc/ircmanager.php
index 480d4c8f6c..741b324a98 100644
--- a/plugins/Irc/ircmanager.php
+++ b/plugins/Irc/ircmanager.php
@@ -114,7 +114,7 @@ class IrcManager extends ImManager {
                         'Pong',
                         'NickServ',
                         'AutoJoin',
-                        'Statusnet_Callback',
+                        'StatusnetCallback',
                     ),
 
                     'plugins.autoload' => true,

From c4640c50d38c6f05cd6c076a5cb17656fb72240e Mon Sep 17 00:00:00 2001
From: Luke Fitzgerald <lw.fitzgerald@googlemail.com>
Date: Fri, 23 Jul 2010 13:33:41 -0700
Subject: [PATCH 117/655] Lots more work - Implemented nickname checking

---
 plugins/Irc/Fake_Irc.php                      |  2 +-
 plugins/Irc/IrcPlugin.php                     | 78 ++++++++++++++-
 plugins/Irc/README                            |  5 +
 .../phergie/Phergie/Driver/Statusnet.php      | 13 +++
 .../phergie/Phergie/Plugin/NickServ.php       |  4 +-
 .../phergie/Phergie/Plugin/Statusnet.php      | 98 +++++++++++++++++++
 .../Phergie/Plugin/StatusnetCallback.php      | 63 ------------
 .../extlib/phergie/Phergie/Plugin/patch.diff  | 22 +++++
 .../extlib/phergie/Phergie/StatusnetBot.php   | 21 ++++
 plugins/Irc/ircmanager.php                    | 82 +++++++++++++---
 10 files changed, 306 insertions(+), 82 deletions(-)
 create mode 100644 plugins/Irc/extlib/phergie/Phergie/Plugin/Statusnet.php
 delete mode 100644 plugins/Irc/extlib/phergie/Phergie/Plugin/StatusnetCallback.php
 create mode 100644 plugins/Irc/extlib/phergie/Phergie/Plugin/patch.diff

diff --git a/plugins/Irc/Fake_Irc.php b/plugins/Irc/Fake_Irc.php
index a1e296e8b1..71892abf6e 100644
--- a/plugins/Irc/Fake_Irc.php
+++ b/plugins/Irc/Fake_Irc.php
@@ -35,6 +35,6 @@ class Fake_Irc extends Phergie_Driver_Streams {
     public $would_be_sent = null;
 
     protected function send($command, $args = '') {
-        $this->would_be_sent = array($command, $args);
+        $this->would_be_sent = array('command' => $command, 'args' => $args);
     }
 }
diff --git a/plugins/Irc/IrcPlugin.php b/plugins/Irc/IrcPlugin.php
index a9044df8d2..ce8f317843 100644
--- a/plugins/Irc/IrcPlugin.php
+++ b/plugins/Irc/IrcPlugin.php
@@ -60,7 +60,10 @@ class IrcPlugin extends ImPlugin {
     public $transporttype = null;
     public $encoding = null;
 
+    public $regcheck = null;
+
     public $transport = 'irc';
+    public $fake_irc;
 
     /**
      * Get the internationalized/translated display name of this IM service
@@ -160,7 +163,33 @@ class IrcPlugin extends ImPlugin {
      */
     public function send_message($screenname, $body) {
         $this->fake_irc->doPrivmsg($screenname, $body);
-        $this->enqueue_outgoing_raw($this->fake_irc->would_be_sent);
+        $this->enqueue_outgoing_raw(array('type' => 'message', 'data' => $this->fake_irc->would_be_sent));
+        return true;
+    }
+
+    /**
+    * Only sends the confirmation message if the nick is
+    * registered
+    *
+    * @param string $screenname screenname sending to
+    * @param string $code the confirmation code
+    * @param User $user user sending to
+    * @return boolean success value
+    */
+    public function checked_send_confirmation_code($screenname, $code, $user) {
+        $this->fake_irc->doPrivmsg('NickServ', 'INFO '.$screenname);
+        $this->enqueue_outgoing_raw(
+            array(
+                'type' => 'nickcheck',
+                'data' => $this->fake_irc->would_be_sent,
+                'nickdata' =>
+                    array(
+                        'screenname' => $screenname,
+                        'code' => $code,
+                        'user' => $user
+                    )
+            )
+        );
         return true;
     }
 
@@ -174,6 +203,30 @@ class IrcPlugin extends ImPlugin {
         return true;
     }
 
+    /**
+     * Send a confirmation code to a user
+     *
+     * @param string $screenname screenname sending to
+     * @param string $code the confirmation code
+     * @param User $user user sending to
+     * @return boolean success value
+     */
+    public function send_confirmation_code($screenname, $code, $user, $checked = false) {
+        $body = sprintf(_('User "%s" on %s has said that your %s screenname belongs to them. ' .
+          'If that\'s true, you can confirm by clicking on this URL: ' .
+          '%s' .
+          ' . (If you cannot click it, copy-and-paste it into the ' .
+          'address bar of your browser). If that user isn\'t you, ' .
+          'or if you didn\'t request this confirmation, just ignore this message.'),
+          $user->nickname, common_config('site', 'name'), $this->getDisplayName(), common_local_url('confirmaddress', array('code' => $code)));
+
+        if ($this->regcheck && !$checked) {
+            return $this->checked_send_confirmation_code($screenname, $code, $user);
+        } else {
+            return $this->send_message($screenname, $body);
+        }
+    }
+
     /**
     * Initialize plugin
     *
@@ -193,6 +246,29 @@ class IrcPlugin extends ImPlugin {
             throw new Exception('must specify a nickname');
         }
 
+        if (!isset($this->port)) {
+            $this->port = 6667;
+        }
+        if (!isset($this->password)) {
+            $this->password = '';
+        }
+        if (!isset($this->transporttype)) {
+            $this->transporttype = 'tcp';
+        }
+        if (!isset($this->encoding)) {
+            $this->encoding = 'UTF-8';
+        }
+        if (!isset($this->nickservpassword)) {
+            $this->nickservpassword = '';
+        }
+        if (!isset($this->channels)) {
+            $this->channels = array();
+        }
+
+        if (!isset($this->regcheck)) {
+            $this->regcheck = true;
+        }
+
         $this->fake_irc = new Fake_Irc;
         return true;
     }
diff --git a/plugins/Irc/README b/plugins/Irc/README
index 2429a5b81f..79ce8ff56a 100644
--- a/plugins/Irc/README
+++ b/plugins/Irc/README
@@ -22,6 +22,11 @@ nickservpassword: NickServ password for identification
 channels: Channels for bot to idle in
 transporttype: Set to 'ssl' to enable SSL
 encoding: Set to change encoding
+regcheck: Check user's nicknames are registered, enabled by default, set to false to disable
+regregexp: Override existing regexp matching response from NickServ if nick checked is registered.
+           Must contain a capturing group catching the nick
+unregregexp: Override existing regexp matching response from NickServ if nick checked is unregistered
+             Must contain a capturing group catching the nick
 
 * required
 
diff --git a/plugins/Irc/extlib/phergie/Phergie/Driver/Statusnet.php b/plugins/Irc/extlib/phergie/Phergie/Driver/Statusnet.php
index 48540069ce..6a0cbb8d15 100644
--- a/plugins/Irc/extlib/phergie/Phergie/Driver/Statusnet.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Driver/Statusnet.php
@@ -42,6 +42,19 @@ class Phergie_Driver_Statusnet extends Phergie_Driver_Streams {
         return parent::send($command, $args);
     }
 
+    public function forceQuit() {
+        try {
+            // Send a QUIT command to the server
+        $this->send('QUIT', 'Reconnecting');
+        } catch (Phergie_Driver_Exception $e){}
+
+        // Terminate the socket connection
+        fclose($this->socket);
+
+        // Remove the socket from the internal socket list
+        unset($this->sockets[(string) $this->getConnection()->getHostmask()]);
+    }
+
     /**
     * Returns the array of sockets
     *
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/NickServ.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/NickServ.php
index ff181d94e2..f873c753bb 100644
--- a/plugins/Irc/extlib/phergie/Phergie/Plugin/NickServ.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/NickServ.php
@@ -65,7 +65,7 @@ class Phergie_Plugin_NickServ extends Phergie_Plugin_Abstract
         // Get the identify message
         $this->identifyMessage = $this->config['nickserv.identify_message'];
         if (!$this->identifyMessage) {
-            $this->identifyMessage = 'This nickname is registered.';
+            $this->identifyMessage = '/This nickname is registered./';
         }
     }
 
@@ -82,7 +82,7 @@ class Phergie_Plugin_NickServ extends Phergie_Plugin_Abstract
         if (strtolower($event->getNick()) == strtolower($this->botNick)) {
             $message = $event->getArgument(1);
             $nick = $this->connection->getNick();
-            if (strpos($message, $this->identifyMessage) !== false) {
+            if (preg_match($this->identifyMessage, $message)) {
                 $password = $this->config['nickserv.password'];
                 if (!empty($password)) {
                     $this->doPrivmsg($this->botNick, 'IDENTIFY ' . $password);
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Statusnet.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Statusnet.php
new file mode 100644
index 0000000000..71b7b06bce
--- /dev/null
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Statusnet.php
@@ -0,0 +1,98 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ *
+ * 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/>.
+ *
+ * Calls the given Statusnet IM architecture enqueuing method to enqueue
+ * a new incoming message
+ *
+ * @category  Phergie
+ * @package   Phergie_Plugin_Statusnet
+ * @author    Luke Fitzgerald <lw.fitzgerald@googlemail.com>
+ * @copyright 2010 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+
+class Phergie_Plugin_Statusnet extends Phergie_Plugin_Abstract {
+    /**
+    * Message callback details
+    *
+    * @var array
+    */
+    protected $messageCallback;
+
+    protected $regCallback;
+
+    protected $tocheck = array();
+
+    /**
+    * Load callback from config
+    */
+    public function onLoad() {
+        $messageCallback = $this->config['statusnet.messagecallback'];
+        if (is_callable($messageCallback)) {
+            $this->messageCallback = $messageCallback;
+        } else {
+            $this->messageCallback = NULL;
+        }
+
+        $regCallback = $this->config['statusnet.regcallback'];
+        if (is_callable($regCallback)) {
+            $this->regCallback = $regCallback;
+        } else {
+            $this->regCallback = NULL;
+        }
+
+        $this->unregRegexp = $this->config['statusnet.unregregexp'];
+        if (!$this->unregRegexp) {
+            $this->unregRegexp = '/\x02(.*?)\x02 (?:isn\'t|is not) registered/i';
+        }
+
+        $this->regRegexp = $this->config['statusnet.regregexp'];
+        if (!$this->regRegexp) {
+            $this->regRegexp = '/(?:\A|\x02)(\w+?)\x02? (?:\(account|is \w+?\z)/i';
+        }
+    }
+
+    /**
+     * Passes incoming messages to StatusNet
+     *
+     * @return void
+     */
+    public function onPrivmsg() {
+        if ($this->messageCallback !== NULL) {
+            $event = $this->getEvent();
+            $source = $event->getSource();
+            $message = trim($event->getText());
+
+            call_user_func($this->messageCallback, array('sender' => $source, 'message' => $message));
+        }
+    }
+
+    public function onNotice() {
+        $event = $this->getEvent();
+        if ($event->getNick() == 'NickServ') {
+            $message = $event->getArgument(1);
+            if (preg_match($this->unregRegexp, $message, $groups)) {
+                $nick = $groups[1];
+                call_user_func($this->regCallback, array('nick' => $nick, 'registered' => false));
+            } elseif (preg_match($this->regRegexp, $message, $groups)) {
+                $nick = $groups[1];
+                call_user_func($this->regCallback, array('nick' => $nick, 'registered' => true));
+            }
+        }
+    }
+}
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/StatusnetCallback.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/StatusnetCallback.php
deleted file mode 100644
index 545ee343b8..0000000000
--- a/plugins/Irc/extlib/phergie/Phergie/Plugin/StatusnetCallback.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-/**
- * StatusNet - the distributed open-source microblogging tool
- *
- * 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/>.
- *
- * Calls the given Statusnet IM architecture enqueuing method to enqueue
- * a new incoming message
- *
- * @category  Phergie
- * @package   Phergie_Plugin_StatusnetCallback
- * @author    Luke Fitzgerald <lw.fitzgerald@googlemail.com>
- * @copyright 2010 StatusNet, Inc.
- * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
- * @link      http://status.net/
- */
-
-class Phergie_Plugin_StatusnetCallback extends Phergie_Plugin_Abstract {
-    /**
-    * Callback details
-    *
-    * @var array
-    */
-    protected $callback;
-
-    /**
-    * Load callback from config
-    */
-    public function onLoad() {
-        $callback = $this->config['statusnetcallback.callback'];
-        if (is_callable($callback)) {
-            $this->callback = $callback;
-        } else {
-            $this->callback = NULL;
-        }
-    }
-
-    /**
-     * Passes incoming messages to StatusNet
-     *
-     * @return void
-     */
-    public function onPrivmsg() {
-        if ($this->callback !== NULL) {
-            $event = $this->getEvent();
-            $source = $event->getSource();
-            $message = trim($event->getText());
-
-            call_user_func($this->callback, array('sender' => $source, 'message' => $message));
-        }
-    }
-}
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/patch.diff b/plugins/Irc/extlib/phergie/Phergie/Plugin/patch.diff
new file mode 100644
index 0000000000..9cfa3c2b8b
--- /dev/null
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/patch.diff
@@ -0,0 +1,22 @@
+diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/NickServ.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/NickServ.php
+index ff181d9..f873c75 100644
+--- a/plugins/Irc/extlib/phergie/Phergie/Plugin/NickServ.php
++++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/NickServ.php
+@@ -65,7 +65,7 @@ class Phergie_Plugin_NickServ extends Phergie_Plugin_Abstract
+         // Get the identify message
+         $this->identifyMessage = $this->config['nickserv.identify_message'];
+         if (!$this->identifyMessage) {
+-            $this->identifyMessage = 'This nickname is registered.';
++            $this->identifyMessage = '/This nickname is registered./';
+         }
+     }
+ 
+@@ -82,7 +82,7 @@ class Phergie_Plugin_NickServ extends Phergie_Plugin_Abstract
+         if (strtolower($event->getNick()) == strtolower($this->botNick)) {
+             $message = $event->getArgument(1);
+             $nick = $this->connection->getNick();
+-            if (strpos($message, $this->identifyMessage) !== false) {
++            if (preg_match($this->identifyMessage, $message)) {
+                 $password = $this->config['nickserv.password'];
+                 if (!empty($password)) {
+                     $this->doPrivmsg($this->botNick, 'IDENTIFY ' . $password);
diff --git a/plugins/Irc/extlib/phergie/Phergie/StatusnetBot.php b/plugins/Irc/extlib/phergie/Phergie/StatusnetBot.php
index ba41f26db0..5fe65444b1 100644
--- a/plugins/Irc/extlib/phergie/Phergie/StatusnetBot.php
+++ b/plugins/Irc/extlib/phergie/Phergie/StatusnetBot.php
@@ -66,6 +66,27 @@ class Phergie_StatusnetBot extends Phergie_Bot {
         $this->getProcessor()->handleEvents();
     }
 
+    /**
+    * Close the current connection and reconnect to the server
+    *
+    * @return void
+    */
+    public function reconnect() {
+        $driver = $this->getDriver();
+        $sockets = $driver->getSockets();
+
+        // Close any existing connections
+        try {
+            $driver->forceQuit();
+        } catch (Phergie_Driver_Exception $e){}
+        try {
+            $driver->doConnect();
+        } catch (Phergie_Driver_Exception $e){
+            $driver->forceQuit();
+            throw $e;
+        }
+    }
+
     /**
     * Get the sockets used by the bot
     *
diff --git a/plugins/Irc/ircmanager.php b/plugins/Irc/ircmanager.php
index 741b324a98..93513df861 100644
--- a/plugins/Irc/ircmanager.php
+++ b/plugins/Irc/ircmanager.php
@@ -32,6 +32,8 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 class IrcManager extends ImManager {
     public $conn = null;
+    public $regchecks = array();
+    public $regchecksLookup = array();
 
     /**
      * Initialize connection to server.
@@ -83,13 +85,6 @@ class IrcManager extends ImManager {
         if (!$this->conn) {
             $this->conn = new Phergie_StatusnetBot;
 
-            $port = empty($this->plugin->port) ? 6667 : $this->plugin->port;
-            $password = empty($this->plugin->password) ? '' : $this->plugin->password;
-            $transport = empty($this->plugin->transporttype) ? 'tcp' : $this->plugin->transporttype;
-            $encoding = empty($this->plugin->encoding) ? 'UTF-8' : $this->plugin->encoding;
-            $nickservpassword = empty($this->plugin->nickservpassword) ? '' : $this->plugin->nickservpassword;
-            $channels = empty($this->plugin->channels) ? array() : $this->plugin->channels;
-
             $config = new Phergie_Config;
             $config->readArray(
                 array(
@@ -100,9 +95,9 @@ class IrcManager extends ImManager {
                             'username' => $this->plugin->username,
                             'realname' => $this->plugin->realname,
                             'nick' => $this->plugin->nick,
-                            'password' => $password,
-                            'transport' => $transport,
-                            'encoding' => $encoding
+                            'password' => $this->plugin->password,
+                            'transport' => $this->plugin->transporttype,
+                            'encoding' => $this->plugin->encoding
                         )
                     ),
 
@@ -114,16 +109,17 @@ class IrcManager extends ImManager {
                         'Pong',
                         'NickServ',
                         'AutoJoin',
-                        'StatusnetCallback',
+                        'Statusnet',
                     ),
 
                     'plugins.autoload' => true,
 
                     'ui.enabled' => true,
 
-                    'nickserv.password' => $nickservpassword,
-                    'autojoin.channels' => $channels,
-                    'statusnetcallback.callback' => array($this, 'handle_irc_message')
+                    'nickserv.password' => $this->plugin->nickservpassword,
+                    'autojoin.channels' => $this->plugin->channels,
+                    'statusnet.messagecallback' => array($this, 'handle_irc_message'),
+                    'statusnet.regcallback' => array($this, 'handle_reg_response')
                 )
             );
 
@@ -146,6 +142,47 @@ class IrcManager extends ImManager {
         return true;
     }
 
+    /**
+    * Called via a callback when NickServ responds to
+    * the bots query asking if a nick is registered
+    *
+    * @param array $data Data
+    * @return void
+    */
+    public function handle_reg_response($data) {
+        // Retrieve data
+        $nickdata = $this->regchecks[$data['nick']];
+
+        if ($data['registered']) {
+            // Send message
+            $this->plugin->send_confirmation_code($nickdata['screenname'], $nickdata['code'], $nickdata['user'], true);
+        } else {
+            $this->plugin->send_message($nickdata['screenname'], _m('Your nickname is not registered so IRC connectivity cannot be enabled'));
+
+            $confirm = new Confirm_address();
+
+            $confirm->user_id      = $user->id;
+            $confirm->address_type = $this->plugin->transport;
+
+            if ($confirm->find(true)) {
+                $result = $confirm->delete();
+
+                if (!$result) {
+                    common_log_db_error($confirm, 'DELETE', __FILE__);
+                    // TRANS: Server error thrown on database error canceling IM address confirmation.
+                    $this->serverError(_('Couldn\'t delete confirmation.'));
+                    return;
+                }
+            }
+        }
+
+        // Unset lookup value
+        unset($this->regchecksLookup[$nickdata['screenname']]);
+
+        // Unset data
+        unset($this->regchecks[$data['nick']]);
+    }
+
     /**
      * Send a message using the daemon
      *
@@ -157,7 +194,22 @@ class IrcManager extends ImManager {
         if (!$this->conn) {
             return false;
         }
-        $this->conn->send($data[0], $data[1]);
+        if ($data['type'] != 'message') {
+            // Nick checking
+            $screenname = $data['nickdata']['screenname'];
+            if (isset($this->regchecksLookup[$user->nickname])) {
+
+            }
+            $this->regchecks[$screenname] = $data['nickdata'];
+            $this->regchecksLookup[$user->nickname] = $screenname;
+        }
+
+        try {
+            $this->conn->send($data['data']['command'], $data['data']['args']);
+        } catch (Phergie_Driver_Exception $e) {
+            $this->conn->reconnect();
+            return false;
+        }
         return true;
     }
 }

From f1f78b3142b8837049017dd92c6cc97a87819a1a Mon Sep 17 00:00:00 2001
From: Luke Fitzgerald <lw.fitzgerald@googlemail.com>
Date: Fri, 23 Jul 2010 13:34:39 -0700
Subject: [PATCH 118/655] Remove Phergie diff file

---
 .../extlib/phergie/Phergie/Plugin/patch.diff  | 22 -------------------
 1 file changed, 22 deletions(-)
 delete mode 100644 plugins/Irc/extlib/phergie/Phergie/Plugin/patch.diff

diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/patch.diff b/plugins/Irc/extlib/phergie/Phergie/Plugin/patch.diff
deleted file mode 100644
index 9cfa3c2b8b..0000000000
--- a/plugins/Irc/extlib/phergie/Phergie/Plugin/patch.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/NickServ.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/NickServ.php
-index ff181d9..f873c75 100644
---- a/plugins/Irc/extlib/phergie/Phergie/Plugin/NickServ.php
-+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/NickServ.php
-@@ -65,7 +65,7 @@ class Phergie_Plugin_NickServ extends Phergie_Plugin_Abstract
-         // Get the identify message
-         $this->identifyMessage = $this->config['nickserv.identify_message'];
-         if (!$this->identifyMessage) {
--            $this->identifyMessage = 'This nickname is registered.';
-+            $this->identifyMessage = '/This nickname is registered./';
-         }
-     }
- 
-@@ -82,7 +82,7 @@ class Phergie_Plugin_NickServ extends Phergie_Plugin_Abstract
-         if (strtolower($event->getNick()) == strtolower($this->botNick)) {
-             $message = $event->getArgument(1);
-             $nick = $this->connection->getNick();
--            if (strpos($message, $this->identifyMessage) !== false) {
-+            if (preg_match($this->identifyMessage, $message)) {
-                 $password = $this->config['nickserv.password'];
-                 if (!empty($password)) {
-                     $this->doPrivmsg($this->botNick, 'IDENTIFY ' . $password);

From 13c63d554db10dff1d9b2687211fa5b098930f2c Mon Sep 17 00:00:00 2001
From: Luke Fitzgerald <lw.fitzgerald@googlemail.com>
Date: Fri, 23 Jul 2010 13:40:11 -0700
Subject: [PATCH 119/655] Added some missing comments

---
 plugins/Irc/extlib/phergie/Phergie/Plugin/Statusnet.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Statusnet.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Statusnet.php
index 71b7b06bce..937a3fbe8f 100644
--- a/plugins/Irc/extlib/phergie/Phergie/Plugin/Statusnet.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Statusnet.php
@@ -34,10 +34,13 @@ class Phergie_Plugin_Statusnet extends Phergie_Plugin_Abstract {
     */
     protected $messageCallback;
 
+    /**
+    * Registration check callback details
+    *
+    * @var array
+    */
     protected $regCallback;
 
-    protected $tocheck = array();
-
     /**
     * Load callback from config
     */

From 4dcf2a1f51311bc8c5c1acee80a23af220e0f405 Mon Sep 17 00:00:00 2001
From: Luke Fitzgerald <lw.fitzgerald@googlemail.com>
Date: Fri, 23 Jul 2010 13:57:39 -0700
Subject: [PATCH 120/655] Another comment

---
 plugins/Irc/extlib/phergie/Phergie/Plugin/Statusnet.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Statusnet.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Statusnet.php
index 937a3fbe8f..459fe1312c 100644
--- a/plugins/Irc/extlib/phergie/Phergie/Plugin/Statusnet.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Statusnet.php
@@ -85,6 +85,11 @@ class Phergie_Plugin_Statusnet extends Phergie_Plugin_Abstract {
         }
     }
 
+    /**
+     * Catches the response from NickServ
+     *
+     * @return void
+     */
     public function onNotice() {
         $event = $this->getEvent();
         if ($event->getNick() == 'NickServ') {

From be0fb0356022bc647e30f79f71c9e6d104747699 Mon Sep 17 00:00:00 2001
From: Luke Fitzgerald <lw.fitzgerald@googlemail.com>
Date: Fri, 23 Jul 2010 14:13:23 -0700
Subject: [PATCH 121/655] Cosmetic: Rearrange code

---
 plugins/Irc/IrcPlugin.php | 52 +++++++++++++++++++--------------------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/plugins/Irc/IrcPlugin.php b/plugins/Irc/IrcPlugin.php
index ce8f317843..d23f5005c0 100644
--- a/plugins/Irc/IrcPlugin.php
+++ b/plugins/Irc/IrcPlugin.php
@@ -167,32 +167,6 @@ class IrcPlugin extends ImPlugin {
         return true;
     }
 
-    /**
-    * Only sends the confirmation message if the nick is
-    * registered
-    *
-    * @param string $screenname screenname sending to
-    * @param string $code the confirmation code
-    * @param User $user user sending to
-    * @return boolean success value
-    */
-    public function checked_send_confirmation_code($screenname, $code, $user) {
-        $this->fake_irc->doPrivmsg('NickServ', 'INFO '.$screenname);
-        $this->enqueue_outgoing_raw(
-            array(
-                'type' => 'nickcheck',
-                'data' => $this->fake_irc->would_be_sent,
-                'nickdata' =>
-                    array(
-                        'screenname' => $screenname,
-                        'code' => $code,
-                        'user' => $user
-                    )
-            )
-        );
-        return true;
-    }
-
     /**
      * Accept a queued input message.
      *
@@ -227,6 +201,32 @@ class IrcPlugin extends ImPlugin {
         }
     }
 
+    /**
+    * Only sends the confirmation message if the nick is
+    * registered
+    *
+    * @param string $screenname screenname sending to
+    * @param string $code the confirmation code
+    * @param User $user user sending to
+    * @return boolean success value
+    */
+    public function checked_send_confirmation_code($screenname, $code, $user) {
+        $this->fake_irc->doPrivmsg('NickServ', 'INFO '.$screenname);
+        $this->enqueue_outgoing_raw(
+            array(
+                'type' => 'nickcheck',
+                'data' => $this->fake_irc->would_be_sent,
+                'nickdata' =>
+                    array(
+                        'screenname' => $screenname,
+                        'code' => $code,
+                        'user' => $user
+                    )
+            )
+        );
+        return true;
+    }
+
     /**
     * Initialize plugin
     *

From 9f0eea69ff9cd67b638e70c42d887c7bb45c4ffd Mon Sep 17 00:00:00 2001
From: Luke Fitzgerald <lw.fitzgerald@googlemail.com>
Date: Sat, 24 Jul 2010 07:54:09 -0700
Subject: [PATCH 122/655] Handle the case where confirmation is cancelled

---
 .../phergie/Phergie/Plugin/Statusnet.php      |  8 +--
 plugins/Irc/ircmanager.php                    | 63 +++++++++++--------
 2 files changed, 41 insertions(+), 30 deletions(-)

diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Statusnet.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Statusnet.php
index 459fe1312c..f2b7bcdab7 100644
--- a/plugins/Irc/extlib/phergie/Phergie/Plugin/Statusnet.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Statusnet.php
@@ -95,11 +95,11 @@ class Phergie_Plugin_Statusnet extends Phergie_Plugin_Abstract {
         if ($event->getNick() == 'NickServ') {
             $message = $event->getArgument(1);
             if (preg_match($this->unregRegexp, $message, $groups)) {
-                $nick = $groups[1];
-                call_user_func($this->regCallback, array('nick' => $nick, 'registered' => false));
+                $screenname = $groups[1];
+                call_user_func($this->regCallback, array('screenname' => $screenname, 'registered' => false));
             } elseif (preg_match($this->regRegexp, $message, $groups)) {
-                $nick = $groups[1];
-                call_user_func($this->regCallback, array('nick' => $nick, 'registered' => true));
+                $screenname = $groups[1];
+                call_user_func($this->regCallback, array('screenname' => $screenname, 'registered' => true));
             }
         }
     }
diff --git a/plugins/Irc/ircmanager.php b/plugins/Irc/ircmanager.php
index 93513df861..40888e4137 100644
--- a/plugins/Irc/ircmanager.php
+++ b/plugins/Irc/ircmanager.php
@@ -151,36 +151,40 @@ class IrcManager extends ImManager {
     */
     public function handle_reg_response($data) {
         // Retrieve data
-        $nickdata = $this->regchecks[$data['nick']];
+        $screenname = $data['screenname'];
+        $nickdata = $this->regchecks[$screenname];
+        $usernick = $nickdata['user']->nickname;
 
-        if ($data['registered']) {
-            // Send message
-            $this->plugin->send_confirmation_code($nickdata['screenname'], $nickdata['code'], $nickdata['user'], true);
-        } else {
-            $this->plugin->send_message($nickdata['screenname'], _m('Your nickname is not registered so IRC connectivity cannot be enabled'));
+        if (isset($this->regchecksLookup[$usernick])) {
+            if ($data['registered']) {
+                // Send message
+                $this->plugin->send_confirmation_code($screenname, $nickdata['code'], $nickdata['user'], true);
+            } else {
+                $this->plugin->send_message($screenname, _m('Your nickname is not registered so IRC connectivity cannot be enabled'));
 
-            $confirm = new Confirm_address();
+                $confirm = new Confirm_address();
 
-            $confirm->user_id      = $user->id;
-            $confirm->address_type = $this->plugin->transport;
+                $confirm->user_id      = $user->id;
+                $confirm->address_type = $this->plugin->transport;
 
-            if ($confirm->find(true)) {
-                $result = $confirm->delete();
+                if ($confirm->find(true)) {
+                    $result = $confirm->delete();
 
-                if (!$result) {
-                    common_log_db_error($confirm, 'DELETE', __FILE__);
-                    // TRANS: Server error thrown on database error canceling IM address confirmation.
-                    $this->serverError(_('Couldn\'t delete confirmation.'));
-                    return;
+                    if (!$result) {
+                        common_log_db_error($confirm, 'DELETE', __FILE__);
+                        // TRANS: Server error thrown on database error canceling IM address confirmation.
+                        $this->serverError(_('Couldn\'t delete confirmation.'));
+                        return;
+                    }
                 }
             }
+
+            // Unset lookup value
+            unset($this->regchecksLookup[$usernick]);
+
+            // Unset data
+            unset($this->regchecks[$screename]);
         }
-
-        // Unset lookup value
-        unset($this->regchecksLookup[$nickdata['screenname']]);
-
-        // Unset data
-        unset($this->regchecks[$data['nick']]);
     }
 
     /**
@@ -194,14 +198,20 @@ class IrcManager extends ImManager {
         if (!$this->conn) {
             return false;
         }
+
         if ($data['type'] != 'message') {
             // Nick checking
-            $screenname = $data['nickdata']['screenname'];
-            if (isset($this->regchecksLookup[$user->nickname])) {
+            $nickdata = $data['nickdata'];
+            $usernick = $nickdata['user']->nickname;
+            $screenname = $nickdata['screenname'];
 
+            // Cancel any existing checks for this user
+            if (isset($this->regchecksLookup[$usernick])) {
+                unset($this->regchecks[$this->regchecksLookup[$usernick]]);
             }
-            $this->regchecks[$screenname] = $data['nickdata'];
-            $this->regchecksLookup[$user->nickname] = $screenname;
+
+            $this->regchecks[$screenname] = $nickdata;
+            $this->regchecksLookup[$usernick] = $screenname;
         }
 
         try {
@@ -210,6 +220,7 @@ class IrcManager extends ImManager {
             $this->conn->reconnect();
             return false;
         }
+
         return true;
     }
 }

From 007d9ec8ce2df36367681e877332eae7dbf93637 Mon Sep 17 00:00:00 2001
From: Luke Fitzgerald <lw.fitzgerald@googlemail.com>
Date: Sat, 24 Jul 2010 10:01:37 -0700
Subject: [PATCH 123/655] Updated commenting

---
 plugins/Irc/extlib/phergie/Phergie/Plugin/Statusnet.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Statusnet.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Statusnet.php
index f2b7bcdab7..f0cee28184 100644
--- a/plugins/Irc/extlib/phergie/Phergie/Plugin/Statusnet.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Statusnet.php
@@ -15,8 +15,8 @@
  * 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/>.
  *
- * Calls the given Statusnet IM architecture enqueuing method to enqueue
- * a new incoming message
+ * Talks to the Statusnet IM architecture to enqueue incoming message messages
+ * and notify result of nickname registration checks
  *
  * @category  Phergie
  * @package   Phergie_Plugin_Statusnet

From 75373e4a7a09f058cc6fb0bce8ee0958ed7d7bcb Mon Sep 17 00:00:00 2001
From: Luke Fitzgerald <lw.fitzgerald@googlemail.com>
Date: Sat, 24 Jul 2010 10:07:02 -0700
Subject: [PATCH 124/655] Remove old comment

---
 plugins/Msn/extlib/phpmsnclass/msn.class.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/plugins/Msn/extlib/phpmsnclass/msn.class.php b/plugins/Msn/extlib/phpmsnclass/msn.class.php
index 3362c2f434..9766a36376 100644
--- a/plugins/Msn/extlib/phpmsnclass/msn.class.php
+++ b/plugins/Msn/extlib/phpmsnclass/msn.class.php
@@ -901,7 +901,6 @@ class MSN {
 
             case 'NLN':
                 // NS: <<< NLN {status} {email} {networkid} {nickname} {clientid} {dpobj}
-                // NS: <<< NLN NLN darkip@inflatablegoldfish.com 1 Luke 2685403136 0
                 @list(/* NLN */, $status, $email, $network, $nickname) = @explode(' ', $data);
                 $this->callHandler('StatusChange', array('screenname' => $email, 'status' => $status, 'network' => $network, 'nickname' => $nickname));
                 break;

From c0214ac0a47f215f552baa6ffad3080c18038a06 Mon Sep 17 00:00:00 2001
From: Luke Fitzgerald <lw.fitzgerald@googlemail.com>
Date: Sat, 24 Jul 2010 11:26:20 -0700
Subject: [PATCH 125/655] Merged in Phergie change (Allow sec/usec = 0)

---
 .../Irc/extlib/phergie/Phergie/Process/Async.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/plugins/Irc/extlib/phergie/Phergie/Process/Async.php b/plugins/Irc/extlib/phergie/Phergie/Process/Async.php
index 8605bf39f2..4946152bb3 100644
--- a/plugins/Irc/extlib/phergie/Phergie/Process/Async.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Process/Async.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Phergie 
+ * Phergie
  *
  * PHP version 5
  *
@@ -11,7 +11,7 @@
  * It is also available through the world-wide-web at this URL:
  * http://phergie.org/license
  *
- * @category  Phergie 
+ * @category  Phergie
  * @package   Phergie
  * @author    Phergie Development Team <team@phergie.org>
  * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
@@ -20,11 +20,11 @@
  */
 
 /**
- * Connection data processor which polls to handle input in an 
+ * Connection data processor which polls to handle input in an
  * asynchronous manner. Will also cause the application tick at
  * the user-defined wait time.
  *
- * @category Phergie 
+ * @category Phergie
  * @package  Phergie
  * @author   Phergie Development Team <team@phergie.org>
  * @license  http://phergie.org/license New BSD License
@@ -61,7 +61,7 @@ class Phergie_Process_Async extends Phergie_Process_Abstract
     protected $lastTick = 0;
 
     /**
-     * Overrides the parent class to set the poll time. 
+     * Overrides the parent class to set the poll time.
      *
      * @param Phergie_Bot $bot     Main bot class
      * @param array       $options Processor arguments
@@ -87,7 +87,7 @@ class Phergie_Process_Async extends Phergie_Process_Abstract
             }
         }
 
-        if (empty($this->sec) && empty($this->usec)) {
+        if (isset($this->sec) && isset($this->usec)) {
             throw new Phergie_Process_Exception(
                 'One of the processor options "sec" or "usec" must be specified'
             );
@@ -97,7 +97,7 @@ class Phergie_Process_Async extends Phergie_Process_Abstract
     }
 
     /**
-     * Waits for stream activity and performs event processing on 
+     * Waits for stream activity and performs event processing on
      * connections with data to read.
      *
      * @return void
@@ -144,7 +144,7 @@ class Phergie_Process_Async extends Phergie_Process_Abstract
     }
 
     /**
-     * Obtains and processes incoming events, then sends resulting outgoing 
+     * Obtains and processes incoming events, then sends resulting outgoing
      * events.
      *
      * @return void

From 3b9d720df5efb8f20853a7e935dd42231ffd738b Mon Sep 17 00:00:00 2001
From: Luke Fitzgerald <lw.fitzgerald@googlemail.com>
Date: Sat, 24 Jul 2010 20:03:16 -0700
Subject: [PATCH 126/655] Change ircmanager to not use unnecessary class

---
 .../phergie/Phergie/Process/Statusnet.php     | 34 -------------------
 1 file changed, 34 deletions(-)
 delete mode 100644 plugins/Irc/extlib/phergie/Phergie/Process/Statusnet.php

diff --git a/plugins/Irc/extlib/phergie/Phergie/Process/Statusnet.php b/plugins/Irc/extlib/phergie/Phergie/Process/Statusnet.php
deleted file mode 100644
index 9369c2c1e7..0000000000
--- a/plugins/Irc/extlib/phergie/Phergie/Process/Statusnet.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-/**
- * StatusNet - the distributed open-source microblogging tool
- *
- * 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/>.
- *
- * Extends the Async processor class (Phergie_Process_Async) to allow it to
- * operate with the Statusnet driver
- *
- * @category  Phergie
- * @package   Phergie_Process_Statusnet
- * @author    Luke Fitzgerald <lw.fitzgerald@googlemail.com>
- * @copyright 2010 StatusNet, Inc.
- * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
- * @link      http://status.net/
- */
-
-class Phergie_Process_Statusnet extends Phergie_Process_Async {
-    public function __construct(Phergie_StatusnetBot $bot, array $options) {
-        $this->usec = 0;
-        Phergie_Process_Abstract::__construct($bot, $options);
-    }
-}
\ No newline at end of file

From 2645133c43eb0c2989ed96384876638a184bbbcc Mon Sep 17 00:00:00 2001
From: Luke Fitzgerald <lw.fitzgerald@googlemail.com>
Date: Sat, 24 Jul 2010 20:04:00 -0700
Subject: [PATCH 127/655] Use non-statusnet class

---
 plugins/Irc/ircmanager.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/Irc/ircmanager.php b/plugins/Irc/ircmanager.php
index 40888e4137..8c04da68fc 100644
--- a/plugins/Irc/ircmanager.php
+++ b/plugins/Irc/ircmanager.php
@@ -103,7 +103,8 @@ class IrcManager extends ImManager {
 
                     'driver' => 'statusnet',
 
-                    'processor' => 'statusnet',
+                    'processor' => 'async',
+                    'processor.options' => array('usec' => 0),
 
                     'plugins' => array(
                         'Pong',

From 950685a4662fd91610fd2f176485aa34ea02bf96 Mon Sep 17 00:00:00 2001
From: Luke Fitzgerald <lw.fitzgerald@googlemail.com>
Date: Sun, 25 Jul 2010 16:04:12 -0700
Subject: [PATCH 128/655] Merged in Phergie changes

---
 .../phergie/Phergie/Driver/Exception.php      |  15 +-
 .../extlib/phergie/Phergie/Driver/Streams.php |  17 +-
 .../extlib/phergie/Phergie/Plugin/Beer/db.php |  79 +++++
 .../phergie/Phergie/Plugin/Encoding.php       | 182 ++++++++++
 .../extlib/phergie/Phergie/Plugin/Google.php  | 219 +++++++++---
 .../extlib/phergie/Phergie/Plugin/Http.php    |  64 ++--
 .../phergie/Phergie/Plugin/Http/Response.php  |  38 +-
 .../extlib/phergie/Phergie/Plugin/Lart.php    | 303 ++++++++++++++++
 .../phergie/Phergie/Plugin/NickServ.php       |  13 +-
 .../extlib/phergie/Phergie/Plugin/Remind.php  |  14 +-
 .../phergie/Phergie/Plugin/Temperature.php    |  81 +++++
 .../Irc/extlib/phergie/Phergie/Plugin/Tld.php |  38 +-
 .../Irc/extlib/phergie/Phergie/Plugin/Url.php | 335 ++++++++----------
 .../phergie/Phergie/Plugin/Url/url.tld.txt    | 273 --------------
 .../extlib/phergie/Phergie/Plugin/Weather.php |  47 +--
 .../extlib/phergie/Phergie/Plugin/Youtube.php | 168 +++++++++
 16 files changed, 1226 insertions(+), 660 deletions(-)
 create mode 100644 plugins/Irc/extlib/phergie/Phergie/Plugin/Beer/db.php
 create mode 100644 plugins/Irc/extlib/phergie/Phergie/Plugin/Encoding.php
 create mode 100644 plugins/Irc/extlib/phergie/Phergie/Plugin/Lart.php
 create mode 100644 plugins/Irc/extlib/phergie/Phergie/Plugin/Temperature.php
 delete mode 100644 plugins/Irc/extlib/phergie/Phergie/Plugin/Url/url.tld.txt
 create mode 100644 plugins/Irc/extlib/phergie/Phergie/Plugin/Youtube.php

diff --git a/plugins/Irc/extlib/phergie/Phergie/Driver/Exception.php b/plugins/Irc/extlib/phergie/Phergie/Driver/Exception.php
index aa2b838f7e..5873b2cb96 100755
--- a/plugins/Irc/extlib/phergie/Phergie/Driver/Exception.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Driver/Exception.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Phergie 
+ * Phergie
  *
  * PHP version 5
  *
@@ -11,7 +11,7 @@
  * It is also available through the world-wide-web at this URL:
  * http://phergie.org/license
  *
- * @category  Phergie 
+ * @category  Phergie
  * @package   Phergie
  * @author    Phergie Development Team <team@phergie.org>
  * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
@@ -22,7 +22,7 @@
 /**
  * Exception related to driver operations.
  *
- * @category Phergie 
+ * @category Phergie
  * @package  Phergie
  * @author   Phergie Development Team <team@phergie.org>
  * @license  http://phergie.org/license New BSD License
@@ -31,13 +31,13 @@
 class Phergie_Driver_Exception extends Phergie_Exception
 {
     /**
-     * Error indicating that an operation was requested requiring an active 
+     * Error indicating that an operation was requested requiring an active
      * connection before one had been set
      */
     const ERR_NO_ACTIVE_CONNECTION = 1;
 
     /**
-     * Error indicating that an operation was requested requiring an active 
+     * Error indicating that an operation was requested requiring an active
      * connection where one had been set but not initiated
      */
     const ERR_NO_INITIATED_CONNECTION = 2;
@@ -51,4 +51,9 @@ class Phergie_Driver_Exception extends Phergie_Exception
      * Error indicating that an attempt to send data via a connection failed
      */
     const ERR_CONNECTION_WRITE_FAILED = 4;
+
+    /**
+     * Error indicating that an attempt to read data via a connection failed
+     */
+    const ERR_CONNECTION_READ_FAILED = 5;
 }
diff --git a/plugins/Irc/extlib/phergie/Phergie/Driver/Streams.php b/plugins/Irc/extlib/phergie/Phergie/Driver/Streams.php
index 1d0f1c5572..9f9e2585d2 100755
--- a/plugins/Irc/extlib/phergie/Phergie/Driver/Streams.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Driver/Streams.php
@@ -221,6 +221,12 @@ class Phergie_Driver_Streams extends Phergie_Driver_Abstract
     {
         // Check for a new event on the current connection
         $buffer = fgets($this->socket, 512);
+        if ($buffer === false) {
+            throw new Phergie_Driver_Exception(
+                'Unable to read from socket',
+                Phergie_Driver_Exception::ERR_CONNECTION_READ_FAILED
+            );
+        }
 
         // If no new event was found, return NULL
         if (empty($buffer)) {
@@ -263,8 +269,9 @@ class Phergie_Driver_Streams extends Phergie_Driver_Abstract
 
         case 'privmsg':
         case 'notice':
-            $ctcp = substr(strstr($args, ':'), 1);
-            if (substr($ctcp, 0, 1) === "\x01" && substr($ctcp, -1) === "\x01") {
+            $args = $this->parseArguments($args, 2);
+            list($source, $ctcp) = $args;
+            if (substr($ctcp, 0, 1) === "\001" && substr($ctcp, -1) === "\001") {
                 $ctcp = substr($ctcp, 1, -1);
                 $reply = ($cmd == 'notice');
                 list($cmd, $args) = array_pad(explode(' ', $ctcp, 2), 2, null);
@@ -285,7 +292,7 @@ class Phergie_Driver_Streams extends Phergie_Driver_Abstract
                     }
                     break;
                 case 'action':
-                    $args = array($this->getConnection()->getNick(), $args);
+                    $args = array($source, $args);
                     break;
 
                 default:
@@ -293,11 +300,9 @@ class Phergie_Driver_Streams extends Phergie_Driver_Abstract
                     if ($reply) {
                         $cmd .= 'Response';
                     }
-                    $args = array($this->getConnection()->getNick(), $ctcp);
+                    $args = array($source, $args);
                     break;
                 }
-            } else {
-                $args = $this->parseArguments($args, 2);
             }
             break;
 
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Beer/db.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Beer/db.php
new file mode 100644
index 0000000000..309d389b55
--- /dev/null
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Beer/db.php
@@ -0,0 +1,79 @@
+<?php
+
+if (!defined('__DIR__')) {
+    define('__DIR__', dirname(__FILE__));
+}
+
+// Create database schema
+echo 'Creating database', PHP_EOL;
+$file = __DIR__ . '/beer.db';
+if (file_exists($file)) {
+    unlink($file);
+}
+$db = new PDO('sqlite:' . $file);
+$db->exec('CREATE TABLE beer (name VARCHAR(255), link VARCHAR(255))');
+$db->exec('CREATE UNIQUE INDEX beer_name ON beer (name)');
+$insert = $db->prepare('INSERT INTO beer (name, link) VALUES (:name, :link)');
+
+// Get raw beerme.com data set
+echo 'Downloading beerme.com data set', PHP_EOL;
+$file = __DIR__ . '/beerlist.txt';
+if (!file_exists($file)) {
+    copy('http://beerme.com/beerlist.php', $file);
+}
+$contents = file_get_contents($file);
+
+// Extract data from data set
+echo 'Processing beerme.com data', PHP_EOL;
+$contents = tidy_repair_string($contents);
+libxml_use_internal_errors(true);
+$doc = new DOMDocument;
+$doc->loadHTML($contents);
+libxml_clear_errors();
+$xpath = new DOMXPath($doc);
+$beers = $xpath->query('//table[@class="beerlist"]/tr/td[1]');
+$db->beginTransaction();
+foreach ($beers as $beer) {
+    $name = $beer->textContent;
+    $link = 'http://beerme.com' . $beer->childNodes->item(1)->getAttribute('href');
+    $insert->execute(array($name, $link));
+}
+$db->commit();
+
+// Clean up
+echo 'Cleaning up', PHP_EOL;
+unlink($file);
+
+// Get and decompress openbeerdb.com data set
+$archive = __DIR__ . '/beers.zip';
+if (!file_exists($archive)) {
+    echo 'Downloading openbeerdb.com data set', PHP_EOL;
+    copy('http://openbeerdb.googlecode.com/files/beers.zip', $archive);
+}
+
+echo 'Decompressing openbeerdb.com data set', PHP_EOL;
+$zip = new ZipArchive;
+$zip->open($archive);
+$zip->extractTo(__DIR__, 'beers/beers.csv');
+$zip->close();
+$file = __DIR__ . '/beers/beers.csv';
+
+// Extract data from data set
+echo 'Processing openbeerdb.com data', PHP_EOL;
+$fp = fopen($file, 'r');
+$columns = fgetcsv($fp, 0, '|');
+$db->beginTransaction();
+while ($line = fgetcsv($fp, 0, '|')) {
+    $line = array_combine($columns, $line);
+    $name = $line['name'];
+    $link = null;
+    $insert->execute(array($name, $link));
+}
+$db->commit();
+fclose($fp);
+
+// Clean up
+echo 'Cleaning up', PHP_EOL;
+unlink($file);
+unlink($archive);
+rmdir(__DIR__ . '/beers');
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Encoding.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Encoding.php
new file mode 100644
index 0000000000..419322bd7a
--- /dev/null
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Encoding.php
@@ -0,0 +1,182 @@
+<?php
+/**
+ * Phergie
+ *
+ * PHP version 5
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.
+ * It is also available through the world-wide-web at this URL:
+ * http://phergie.org/license
+ *
+ * @category  Phergie
+ * @package   Phergie_Plugin_Encoding
+ * @author    Phergie Development Team <team@phergie.org>
+ * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
+ * @license   http://phergie.org/license New BSD License
+ * @link      http://pear.phergie.org/package/Phergie_Plugin_Encoding
+ */
+
+/**
+ * Handles decoding markup entities and converting text between character
+ * encodings.
+ *
+ * @category Phergie
+ * @package  Phergie_Plugin_Encoding
+ * @author   Phergie Development Team <team@phergie.org>
+ * @license  http://phergie.org/license New BSD License
+ * @link     http://pear.phergie.org/package/Phergie_Plugin_Encoding
+ */
+class Phergie_Plugin_Encoding extends Phergie_Plugin_Abstract
+{
+    /**
+     * Lookup table for entity conversions not supported by
+     * html_entity_decode()
+     *
+     * @var array
+     * @link http://us.php.net/manual/en/function.get-html-translation-table.php#73409
+     * @link http://us.php.net/manual/en/function.get-html-translation-table.php#73410
+     */
+    protected static $entities = array(
+        '&alpha;' => 913,
+        '&apos;' => 39,
+        '&beta;' => 914,
+        '&bull;' => 149,
+        '&chi;' => 935,
+        '&circ;' => 94,
+        '&delta;' => 916,
+        '&epsilon;' => 917,
+        '&eta;' => 919,
+        '&fnof;' => 402,
+        '&gamma;' => 915,
+        '&iota;' => 921,
+        '&kappa;' => 922,
+        '&lambda;' => 923,
+        '&ldquo;' => 147,
+        '&lsaquo;' => 139,
+        '&lsquo;' => 145,
+        '&mdash;' => 151,
+        '&minus;' => 45,
+        '&mu;' => 924,
+        '&ndash;' => 150,
+        '&nu;' => 925,
+        '&oelig;' => 140,
+        '&omega;' => 937,
+        '&omicron;' => 927,
+        '&phi;' => 934,
+        '&pi;' => 928,
+        '&piv;' => 982,
+        '&psi;' => 936,
+        '&rdquo;' => 148,
+        '&rho;' => 929,
+        '&rsaquo;' => 155,
+        '&rsquo;' => 146,
+        '&scaron;' => 138,
+        '&sigma;' => 931,
+        '&sigmaf;' => 962,
+        '&tau;' => 932,
+        '&theta;' => 920,
+        '&thetasym;' => 977,
+        '&tilde;' => 126,
+        '&trade;' => 153,
+        '&upsih;' => 978,
+        '&upsilon;' => 933,
+        '&xi;' => 926,
+        '&yuml;' => 159,
+        '&zeta;' => 918,
+    );
+
+    /**
+     * Decodes markup entities in a given string.
+     *
+     * @param string $string  String containing markup entities
+     * @param string $charset Optional character set name to use in decoding
+     *        entities, defaults to UTF-8
+     *
+     * @return string String with markup entities decoded
+     */
+    public function decodeEntities($string, $charset = 'UTF-8')
+    {
+        $string = str_ireplace(
+            array_keys(self::$entities),
+            array_map('chr', self::$entities),
+            $string
+        );
+        $string = html_entity_decode($string, ENT_QUOTES, $charset);
+        $string = preg_replace(
+            array('/&#0*([0-9]+);/me', '/&#x0*([a-f0-9]+);/mei'),
+            array('$this->codeToUtf(\\1)', '$this->codeToUtf(hexdec(\\1))'),
+            $string
+        );
+        return $string;
+    }
+
+    /**
+     * Converts a given unicode to its UTF-8 equivalent.
+     *
+     * @param int $code Code to convert
+     * @return string Character corresponding to code
+     */
+    public function codeToUtf8($code)
+    {
+        $code = (int) $code;
+        switch ($code) {
+            // 1 byte, 7 bits
+            case 0:
+                return chr(0);
+            case ($code & 0x7F):
+                return chr($code);
+
+            // 2 bytes, 11 bits
+            case ($code & 0x7FF):
+                return chr(0xC0 | (($code >> 6) & 0x1F)) .
+                       chr(0x80 | ($code & 0x3F));
+
+            // 3 bytes, 16 bits
+            case ($code & 0xFFFF):
+                return chr(0xE0 | (($code >> 12) & 0x0F)) .
+                       chr(0x80 | (($code >> 6) & 0x3F)) .
+                       chr(0x80 | ($code & 0x3F));
+
+            // 4 bytes, 21 bits
+            case ($code & 0x1FFFFF):
+                return chr(0xF0 | ($code >> 18)) .
+                       chr(0x80 | (($code >> 12) & 0x3F)) .
+                       chr(0x80 | (($code >> 6) & 0x3F)) .
+                       chr(0x80 | ($code & 0x3F));
+        }
+    }
+
+    /**
+     * Transliterates characters in a given string where possible.
+     *
+     * @param string $string      String containing characters to
+     *        transliterate
+     * @param string $charsetFrom Optional character set of the string,
+     *        defaults to UTF-8
+     * @param string $charsetTo   Optional character set to which the string
+     *        should be converted, defaults to ISO-8859-1
+     *
+     * @return string String with characters transliterated or the original
+     *         string if transliteration was not possible
+     */
+    public function transliterate($string, $charsetFrom = 'UTF-8', $charsetTo = 'ISO-8859-1')
+    {
+        // @link http://pecl.php.net/package/translit
+        if (function_exists('transliterate')) {
+            $string = transliterate($string, array('han_transliterate', 'diacritical_remove'), $charsetFrom, $charsetTo);
+        } elseif (function_exists('iconv')) {
+            $string = iconv($charsetFrom, $charsetTo . '//TRANSLIT', $string);
+        } else {
+            // @link http://stackoverflow.com/questions/1284535/php-transliteration/1285491#1285491
+            $string = preg_replace(
+                '~&([a-z]{1,2})(acute|cedil|circ|grave|lig|orn|ring|slash|th|tilde|uml);~i',
+                '$1',
+                htmlentities($string, ENT_COMPAT, $charsetFrom)
+            );
+        }
+        return $string;
+    }
+}
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Google.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Google.php
index 40c203a672..faa98f926a 100644
--- a/plugins/Irc/extlib/phergie/Phergie/Plugin/Google.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Google.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Phergie 
+ * Phergie
  *
  * PHP version 5
  *
@@ -11,7 +11,7 @@
  * It is also available through the world-wide-web at this URL:
  * http://phergie.org/license
  *
- * @category  Phergie 
+ * @category  Phergie
  * @package   Phergie_Plugin_Google
  * @author    Phergie Development Team <team@phergie.org>
  * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
@@ -20,17 +20,18 @@
  */
 
 /**
- * Provides commands used to access several services offered by Google 
- * including search, translation, weather, maps, and currency and general 
+ * Provides commands used to access several services offered by Google
+ * including search, translation, weather, maps, and currency and general
  * value unit conversion.
  *
- * @category Phergie 
+ * @category Phergie
  * @package  Phergie_Plugin_Google
  * @author   Phergie Development Team <team@phergie.org>
  * @license  http://phergie.org/license New BSD License
  * @link     http://pear.phergie.org/package/Phergie_Plugin_Google
  * @uses     Phergie_Plugin_Command pear.phergie.org
  * @uses     Phergie_Plugin_Http pear.phergie.org
+ * @uses     Phergie_Plugin_Temperature pear.phergie.org
  *
  * @pluginDesc Provide access to some Google services
  */
@@ -44,6 +45,11 @@ class Phergie_Plugin_Google extends Phergie_Plugin_Abstract
      */
     protected $http;
 
+    /**
+     * Language for Google Services
+     */
+    protected $lang;
+
     /**
      * Checks for dependencies.
      *
@@ -55,6 +61,9 @@ class Phergie_Plugin_Google extends Phergie_Plugin_Abstract
         $plugins->getPlugin('Command');
         $this->http = $plugins->getPlugin('Http');
         $plugins->getPlugin('Help')->register($this);
+        $plugins->getPlugin('Weather');
+
+        $this->lang = $this->getConfig('google.lang', 'en');
     }
 
     /**
@@ -119,8 +128,8 @@ class Phergie_Plugin_Google extends Phergie_Plugin_Abstract
         $nick = $event->getNick();
         if ($count) {
             $msg
-                = $nick . ': ' . 
-                number_format($count, 0) . 
+                = $nick . ': ' .
+                number_format($count, 0) .
                 ' estimated results for ' . $query;
             $this->doPrivmsg($source, $msg);
         } else {
@@ -132,7 +141,7 @@ class Phergie_Plugin_Google extends Phergie_Plugin_Abstract
      * Performs a Google Translate search for the given term.
      *
      * @param string $from  Language of the search term
-     * @param string $to    Language to which the search term should be 
+     * @param string $to    Language to which the search term should be
      *        translated
      * @param string $query Term to translate
      *
@@ -157,7 +166,7 @@ class Phergie_Plugin_Google extends Phergie_Plugin_Abstract
             $this->doPrivmsg($source, $nick . ': ' . $json->responseDetails);
         } else {
             $this->doPrivmsg(
-                $source, 
+                $source,
                 $nick . ': ' . $json->responseData->translatedText
             );
         }
@@ -165,51 +174,104 @@ class Phergie_Plugin_Google extends Phergie_Plugin_Abstract
 
     /**
      * Performs a Google Weather search for the given term.
-     * 
+     *
      * @param string $location Location to search for
+     * @param int    $offset   Optional day offset from the current date
+     *        between 0 and 3 to get the forecast
      *
      * @return void
      *
      * @pluginCmd [location] Show the weather for the specified location
      */
-    public function onCommandGw($location)
+    public function onCommandGw($location, $offset = null)
     {
         $url = 'http://www.google.com/ig/api';
         $params = array(
             'weather' => $location,
-            'hl' => 'pt-br',
+            'hl' => $this->lang,
             'oe' => 'UTF-8'
         );
         $response = $this->http->get($url, $params);
         $xml = $response->getContent()->weather;
-        $source = $this->getEvent()->getSource();
-        if (!isset($xml->problem_cause)) {
-            $city = $xml->forecast_information->city->attributes()->data[0];
-            $time = $xml->forecast_information->current_date_time->attributes()
-                ->data[0];
-            $condition = $xml->current_conditions->condition->attributes()->data[0];
-            $temp = $xml->current_conditions->temp_c->attributes()->data[0] 
-                . '� C';
-            $humidity = $xml->current_conditions->humidity->attributes()->data[0];
-            $wind = $xml->current_conditions->wind_condition->attributes()->data[0];
-            $msg = implode(' - ', array($city, $temp, $condition, $humidity, $wind));
-            $this->doPrivmsg($source, $msg);
 
-            foreach ($xml->forecast_conditions as $key => $linha) {
-                $day = ucfirst($linha->day_of_week->attributes()->data[0]);
-                $min = $linha->low->attributes()->data[0];
-                $max = $linha->high->attributes()->data[0];
-                $condition = $linha->condition->attributes()->data[0];
-                $msg 
-                    = 'Forecast: ' . $day . 
-                    ' - Min: ' . $min . '� C' . 
-                    ' - Max: ' . $max . '� C' . 
-                    ' - ' . $condition;
-                $this->doPrivmsg($source, $msg);
-            }
-        } else {
-            $this->doPrivmsg($source, $xml->problem_cause->attributes()->data[0]);
+        $event = $this->getEvent();
+        $source = $event->getSource();
+        $msg = '';
+        if ($event->isInChannel()) {
+            $msg .= $event->getNick() . ': ';
         }
+
+        if (isset($xml->problem_cause)) {
+            $msg .= $xml->problem_cause->attributes()->data[0];
+            $this->doPrivmsg($source, $msg);
+            return;
+        }
+
+        $temperature = $this->plugins->getPlugin('Temperature');
+
+        $forecast = $xml->forecast_information;
+        $city = $forecast->city->attributes()->data[0];
+        $zip = $forecast->postal_code->attributes()->data[0];
+
+        if ($offset !== null) {
+            $offset = (int) $offset;
+            if ($offset < 0) {
+                $this->doNotice($source, 'Past weather data is not available');
+                return;
+            } elseif ($offset > 3) {
+                $this->doNotice($source, 'Future weather data is limited to 3 days from today');
+                return;
+            }
+
+            $linha = $xml->forecast_conditions[$offset];
+            $low = $linha->low->attributes()->data[0];
+            $high = $linha->high->attributes()->data[0];
+            $units = $forecast->unit_system->attributes()->data[0];
+            $condition = $linha->condition->attributes()->data[0];
+            $day = $linha->day_of_week->attributes()->data[0];
+
+            $date = ($offset == 0) ? time() : strtotime('next ' . $day);
+            $day = ucfirst($day) . ' ' . date('n/j/y', $date);
+
+            if ($units == 'US') {
+                $lowF = $low;
+                $lowC = $temperature->convertFahrenheitToCelsius($low);
+                $highF = $high;
+                $highC = $temperature->convertFahrenheitToCelsius($high);
+            } else {
+                $lowC = $low;
+                $lowF = $temperature->convertCelsiusToFahrenheit($lowC);
+                $highC = $high;
+                $highF = $temperature->convertCelsiusToFahrenheit($high);
+            }
+
+            $msg .= 'Forecast for ' . $city . ' (' . $zip . ')'
+                . ' on ' . $day . ' ::'
+                . ' Low: ' . $lowF . 'F/' . $lowC . 'C,'
+                . ' High: ' . $highF . 'F/' . $highC . 'C,'
+                . ' Conditions: ' . $condition;
+        } else {
+            $conditions = $xml->current_conditions;
+            $condition = $conditions->condition->attributes()->data[0];
+            $tempF = $conditions->temp_f->attributes()->data[0];
+            $tempC = $conditions->temp_c->attributes()->data[0];
+            $humidity = $conditions->humidity->attributes()->data[0];
+            $wind = $conditions->wind_condition->attributes()->data[0];
+            $time = $forecast->current_date_time->attributes()->data[0];
+            $time = date('n/j/y g:i A', strtotime($time)) . ' +0000';
+
+            $hiF = $temperature->getHeatIndex($tempF, $humidity);
+            $hiC = $temperature->convertFahrenheitToCelsius($hiF);
+
+            $msg .= 'Weather for ' . $city . ' (' . $zip . ') -'
+                . ' Temperature: ' . $tempF . 'F/' . $tempC . 'C,'
+                . ' ' . $humidity . ','
+                . ' Heat Index: ' . $hiF . 'F/' . $hiC . 'C,'
+                . ' Conditions: ' . $condition . ','
+                . ' Updated: ' . $time;
+        }
+
+        $this->doPrivmsg($source, $msg);
     }
 
     /**
@@ -222,23 +284,23 @@ class Phergie_Plugin_Google extends Phergie_Plugin_Abstract
      * @pluginCmd [location] Get the location from Google Maps to the location specified
      */
     public function onCommandGmap($location)
-    {	
+    {
         $event = $this->getEvent();
         $source = $event->getSource();
         $nick = $event->getNick();
-	
+
         $location = utf8_encode($location);
         $url = 'http://maps.google.com/maps/geo';
         $params = array(
             'q' => $location,
             'output' => 'json',
-            'gl' => 'br',
+            'gl' => $this->lang,
             'sensor' => 'false',
             'oe' => 'utf8',
             'mrt' => 'all',
             'key' => $this->getConfig('google.key')
         );
-        $response = $this->http->get($url, $params); 
+        $response = $this->http->get($url, $params);
         $json =  $response->getContent();
         if (!empty($json)) {
             $qtd = count($json->Placemark);
@@ -247,22 +309,22 @@ class Phergie_Plugin_Google extends Phergie_Plugin_Abstract
                     foreach ($json->Placemark as $places) {
                         $xy = $places->Point->coordinates;
                         $address = utf8_decode($places->address);
-                        $url = 'http://maps.google.com/maps?sll=' . $xy[1] . ',' 
+                        $url = 'http://maps.google.com/maps?sll=' . $xy[1] . ','
                             . $xy[0] . '&z=15';
                         $msg = $nick . ' -> ' . $address . ' - ' . $url;
                         $this->doPrivmsg($source, $msg);
                     }
                 } else {
                     $msg
-                        = $nick . 
-                        ', there are a lot of places with that query.' . 
+                        = $nick .
+                        ', there are a lot of places with that query.' .
                         ' Try to be more specific!';
                     $this->doPrivmsg($source, $msg);
                 }
             } elseif ($qtd == 1) {
                 $xy = $json->Placemark[0]->Point->coordinates;
                 $address = utf8_decode($json->Placemark[0]->address);
-                $url = 'http://maps.google.com/maps?sll=' . $xy[1] . ',' . $xy[0] 
+                $url = 'http://maps.google.com/maps?sll=' . $xy[1] . ',' . $xy[0]
                     . '&z=15';
                 $msg = $nick . ' -> ' . $address . ' - ' . $url;
                 $this->doPrivmsg($source, $msg);
@@ -275,7 +337,7 @@ class Phergie_Plugin_Google extends Phergie_Plugin_Abstract
     }
 
     /**
-     * Perform a Google Convert query to convert a value from one metric to 
+     * Perform a Google Convert query to convert a value from one metric to
      * another.
      *
      * @param string $value Value to convert
@@ -310,8 +372,8 @@ class Phergie_Plugin_Google extends Phergie_Plugin_Abstract
             } else {
                 $str = str_replace('<span class=bld>', '', $matches[0]);
                 $str = str_replace($to . '</span>', '', $str);
-                $text 
-                    = number_format($value, 2, ',', '.') . ' ' . $from . 
+                $text
+                    = number_format($value, 2, ',', '.') . ' ' . $from .
                     ' => ' . number_format($str, 2, ',', '.') . ' ' . $to;
                 $this->doPrivmsg($source, $text);
             }
@@ -327,7 +389,7 @@ class Phergie_Plugin_Google extends Phergie_Plugin_Abstract
      *
      * @return void
      *
-     * @pluginCmd [quantity] [unit] to [unit2] Convert a value from one 
+     * @pluginCmd [quantity] [unit] to [unit2] Convert a value from one
      *            metric to another
      */
     public function onCommandConvert($query)
@@ -363,4 +425,61 @@ class Phergie_Plugin_Google extends Phergie_Plugin_Abstract
             $this->doNotice($nick, 'Sorry I couldn\'t find an answer.');
         }
     }
+
+
+    /**
+     * Returns the first definition of a Google Dictionary search.
+     *
+     * @param string $query Word to get the definition
+     *
+     * @return void
+     * @todo Implement use of URL shortening here
+     *
+     * @pluginCmd [query] do a search of a definition on Google Dictionary
+     */
+    public function onCommandDefine($query)
+    {
+        $query = urlencode($query);
+        $url = 'http://www.google.com/dictionary/json?callback=result'.
+               '&q='.$query.'&sl='.$this->lang.'&tl='.$this->lang.
+               '&restrict=pr,de';
+        $json = file_get_contents($url);
+
+        //Remove some garbage from the json
+        $json = str_replace(array("result(", ",200,null)"), "", $json);
+
+        //Awesome workaround to remove a lot of slashes from json
+        $json = str_replace('"', '¿?¿', $json);
+        $json = strip_tags(stripcslashes($json));
+        $json = str_replace('"', "'", $json);
+        $json = str_replace('¿?¿', '"', $json);
+
+        $json = json_decode($json);
+
+        $event = $this->getEvent();
+        $source = $event->getSource();
+        $nick = $event->getNick();
+        if (!empty($json->webDefinitions)){
+            $results = count($json->webDefinitions[0]->entries);
+            $more = $results > 1 ? ($results-1).' ' : NULL;
+            $lang_code = substr($this->lang, 0, 2);
+            $msg =
+                $nick . ': ' .
+                $json->webDefinitions[0]->entries[0]->terms[0]->text .
+                ' - You can find more '.$more.'results at '.
+                'http://www.google.com/dictionary?aq=f&langpair='.
+                $lang_code.'%7C'.$lang_code.'&q='.$query.'&hl='.$lang_code;
+            $this->doPrivmsg($source, $msg);
+        }else{
+            if ($this->lang != 'en'){
+               $temp = $this->lang;
+               $this->lang = 'en';
+               $this->onCommandDefine($query);
+               $this->lang = $temp;
+            }else{
+               $msg = $nick . ': No results for this query.';
+               $this->doPrivmsg($source, $msg);
+            }
+        }
+    }
 }
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Http.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Http.php
index ae43b34c30..43c69eb879 100644
--- a/plugins/Irc/extlib/phergie/Phergie/Plugin/Http.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Http.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Phergie 
+ * Phergie
  *
  * PHP version 5
  *
@@ -11,7 +11,7 @@
  * It is also available through the world-wide-web at this URL:
  * http://phergie.org/license
  *
- * @category  Phergie 
+ * @category  Phergie
  * @package   Phergie_Plugin_Http
  * @author    Phergie Development Team <team@phergie.org>
  * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
@@ -20,10 +20,10 @@
  */
 
 /**
- * Provides an HTTP client for plugins to use in contacting web services or 
+ * Provides an HTTP client for plugins to use in contacting web services or
  * retrieving feeds or web pages.
  *
- * @category Phergie 
+ * @category Phergie
  * @package  Phergie_Plugin_Http
  * @author   Phergie Development Team <team@phergie.org>
  * @license  http://phergie.org/license New BSD License
@@ -46,7 +46,7 @@ class Phergie_Plugin_Http extends Phergie_Plugin_Abstract
      * @var array
      */
     protected $handlers;
-    
+
     /**
      * Initializes the handler lookup table.
      *
@@ -55,8 +55,10 @@ class Phergie_Plugin_Http extends Phergie_Plugin_Abstract
     public function onLoad()
     {
         $this->handlers = array(
-            '(?:application|text)/xml(?:;.*)?' => 'simplexml_load_string',
-            '(?:(?:application|text)/(?:x-)?json)|text/javascript.*' => 'json_decode',
+            '(?:application|text)/xml(?:;.*)?'
+                => 'simplexml_load_string',
+            '(?:(?:application|text)/(?:x-)?json)|text/javascript.*'
+                => 'json_decode',
         );
 
         if (is_array($this->config['http.handlers'])) {
@@ -68,10 +70,10 @@ class Phergie_Plugin_Http extends Phergie_Plugin_Abstract
     }
 
     /**
-     * Sets a handler callback for a content type, which is called when a 
-     * response of that content type is received to perform any needed 
-     * transformations on the response body content before storing it in the 
-     * response object. Note that the calling plugin is responsible for 
+     * Sets a handler callback for a content type, which is called when a
+     * response of that content type is received to perform any needed
+     * transformations on the response body content before storing it in the
+     * response object. Note that the calling plugin is responsible for
      * indicating any dependencies related to specified handler callbacks.
      *
      * @param string   $type     PCRE regular expression (without delimiters) that
@@ -96,12 +98,12 @@ class Phergie_Plugin_Http extends Phergie_Plugin_Abstract
     }
 
     /**
-     * Supporting method that parses the status line of an HTTP response 
+     * Supporting method that parses the status line of an HTTP response
      * message.
      *
      * @param string $status Status line
      *
-     * @return array Associative array containing the HTTP version, response 
+     * @return array Associative array containing the HTTP version, response
      *         code, and response description
      */
     protected function parseStatusLine($status)
@@ -116,7 +118,7 @@ class Phergie_Plugin_Http extends Phergie_Plugin_Abstract
     }
 
     /**
-     * Supporting method that acts as an error handler to intercept HTTP 
+     * Supporting method that acts as an error handler to intercept HTTP
      * responses resulting in PHP-level errors.
      *
      * @param int    $errno   Level of the error raised
@@ -124,13 +126,13 @@ class Phergie_Plugin_Http extends Phergie_Plugin_Abstract
      * @param string $errfile Name of the file in which the error was raised
      * @param string $errline Line number on which the error was raised
      *
-     * @return bool Always returns TRUE to allow normal execution to 
+     * @return bool Always returns TRUE to allow normal execution to
      *         continue once this method terminates
      */
-    protected function handleError($errno, $errstr, $errfile, $errline)
+    public function handleError($errno, $errstr, $errfile, $errline)
     {
         if ($httperr = strstr($errstr, 'HTTP/')) {
-            $parts = $this->parseStatusLine($httperr); 
+            $parts = $this->parseStatusLine($httperr);
             $this->response
                 ->setCode($parts['code'])
                 ->setMessage($parts['message']);
@@ -143,9 +145,9 @@ class Phergie_Plugin_Http extends Phergie_Plugin_Abstract
      * Supporting method that executes a request and handles the response.
      *
      * @param string $url     URL to request
-     * @param array  $context Associative array of stream context parameters 
+     * @param array  $context Associative array of stream context parameters
      *
-     * @return Phergie_Plugin_Http_Response Object representing the response 
+     * @return Phergie_Plugin_Http_Response Object representing the response
      *         resulting from the request
      */
     public function request($url, array $context)
@@ -164,6 +166,9 @@ class Phergie_Plugin_Http extends Phergie_Plugin_Abstract
             $message = $status['message'];
             $headers = array();
             foreach (array_slice($meta['wrapper_data'], 1) as $header) {
+                if (!strpos($header, ':')) {
+                    continue;
+                }
                 list($name, $value) = explode(': ', $header, 2);
                 $headers[$name] = $value;
             }
@@ -174,7 +179,7 @@ class Phergie_Plugin_Http extends Phergie_Plugin_Abstract
                 ->setMessage($message)
                 ->setHeaders($headers)
                 ->setMeta($meta);
- 
+
             $body = stream_get_contents($stream);
             $type = $this->response->getHeaders('content-type');
             foreach ($this->handlers as $expr => $handler) {
@@ -218,7 +223,7 @@ class Phergie_Plugin_Http extends Phergie_Plugin_Abstract
      * @param string $url     URL for the request
      * @param array  $query   Optional associative array of parameters
      *        constituting the URL query string if $url has none
-     * @param array  $context Optional associative array of additional stream 
+     * @param array  $context Optional associative array of additional stream
      *        context parameters
      *
      * @return Phergie_Plugin_Http_Response Received response data
@@ -238,25 +243,26 @@ class Phergie_Plugin_Http extends Phergie_Plugin_Abstract
      * Performs a POST request.
      *
      * @param string $url     URL for the request
-     * @param array  $query   Optional associative array of parameters 
+     * @param array  $query   Optional associative array of parameters
      *        constituting the URL query string if $url has none
-     * @param array  $post    Optional associative array of parameters 
-     *        constituting the POST request body if it is using the 
+     * @param array  $post    Optional associative array of parameters
+     *        constituting the POST request body if it is using the
      *        traditional URL-encoded format
-     * @param array  $context Optional associative array of additional stream 
+     * @param array  $context Optional associative array of additional stream
      *        context parameters
      *
      * @return Phergie_Plugin_Http_Response Received response data
      */
-    public function post($url, array $query = array(), array $post = array(), array $context = array())
-    {
+    public function post($url, array $query = array(),
+        array $post = array(), array $context = array()
+    ) {
         if (!empty($params)) {
             $url .= '?' . http_build_query($query);
         }
 
         $context['method'] = 'POST';
 
-        if (!empty($post) 
+        if (!empty($post)
             && (!empty($context['header'])
             xor stripos($context['header'], 'Content-Type'))
         ) {
@@ -265,7 +271,7 @@ class Phergie_Plugin_Http extends Phergie_Plugin_Abstract
             } else {
                 $context['header'] = '';
             }
-            $context['header'] .= 
+            $context['header'] .=
                 'Content-Type: application/x-www-form-urlencoded';
             $context['content'] = http_build_query($post);
         }
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Http/Response.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Http/Response.php
index 80d16c4b85..b9e377cf64 100644
--- a/plugins/Irc/extlib/phergie/Phergie/Plugin/Http/Response.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Http/Response.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Phergie 
+ * Phergie
  *
  * PHP version 5
  *
@@ -11,7 +11,7 @@
  * It is also available through the world-wide-web at this URL:
  * http://phergie.org/license
  *
- * @category  Phergie 
+ * @category  Phergie
  * @package   Phergie_Plugin_Http
  * @author    Phergie Development Team <team@phergie.org>
  * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
@@ -20,9 +20,9 @@
  */
 
 /**
- * Data structure for HTTP response information. 
+ * Data structure for HTTP response information.
  *
- * @category Phergie 
+ * @category Phergie
  * @package  Phergie_Plugin_Http
  * @author   Phergie Development Team <team@phergie.org>
  * @license  http://phergie.org/license New BSD License
@@ -33,7 +33,7 @@ class Phergie_Plugin_Http_Response
     /**
      * HTTP response code or 0 if no HTTP response was received
      *
-     * @var string 
+     * @var string
      */
     protected $code;
 
@@ -42,7 +42,7 @@ class Phergie_Plugin_Http_Response
      *
      * @var array
      */
-    protected $codeStrings = array(
+    protected static $codeStrings = array(
         0   => 'No Response',
         100 => 'Continue',
         200 => 'OK',
@@ -75,7 +75,7 @@ class Phergie_Plugin_Http_Response
     );
 
     /**
-     * Description of the HTTP response code or the error message if no HTTP 
+     * Description of the HTTP response code or the error message if no HTTP
      * response was received
      *
      * @var string
@@ -135,11 +135,11 @@ class Phergie_Plugin_Http_Response
     {
         $code = $this->code;
 
-        if (!isset($this->codeStrings[$code])) {
+        if (!isset(self::$codeStrings[$code])) {
             return 'Unkown HTTP Status';
         }
 
-        return $this->codeStrings[$code];
+        return self::$codeStrings[$code];
     }
 
     /**
@@ -198,7 +198,7 @@ class Phergie_Plugin_Http_Response
     /**
      * Returns the content of the response body.
      *
-     * @return mixed Response body content, decoded for supported content 
+     * @return mixed Response body content, decoded for supported content
      *         types
      */
     public function getContent()
@@ -209,7 +209,7 @@ class Phergie_Plugin_Http_Response
     /**
      * Sets the response headers.
      *
-     * @param array $headers Associative array of response headers indexed 
+     * @param array $headers Associative array of response headers indexed
      *        by header name
      *
      * @return Phergie_Plugin_Http_Response Provides a fluent interface
@@ -223,14 +223,14 @@ class Phergie_Plugin_Http_Response
     }
 
     /**
-     * Returns all response headers or the value of a single specified 
+     * Returns all response headers or the value of a single specified
      * response header.
      *
-     * @param string $name Optional name of a single header for which the 
+     * @param string $name Optional name of a single header for which the
      *        associated value should be returned
      *
-     * @return array|string Associative array of all header values, a string  
-     *         containing the value of the header indicated by $name if one 
+     * @return array|string Associative array of all header values, a string
+     *         containing the value of the header indicated by $name if one
      *         is set, or null if one is not
      */
     public function getHeaders($name = null)
@@ -261,11 +261,11 @@ class Phergie_Plugin_Http_Response
     /**
      * Returns all metadata or the value of a single specified metadatum.
      *
-     * @param string $name Optional name of a single metadatum for which the 
+     * @param string $name Optional name of a single metadatum for which the
      *        associated value should be returned
-     * 
-     * @return array|string|null Associative array of all metadata values, a  
-     *         string containing the value of the metadatum indicated by 
+     *
+     * @return array|string|null Associative array of all metadata values, a
+     *         string containing the value of the metadatum indicated by
      *         $name if one is set, or null if one is not
      */
     public function getMeta($name = null)
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Lart.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Lart.php
new file mode 100644
index 0000000000..d00cae0dd1
--- /dev/null
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Lart.php
@@ -0,0 +1,303 @@
+<?php
+/**
+ * Phergie
+ *
+ * PHP version 5
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.
+ * It is also available through the world-wide-web at this URL:
+ * http://phergie.org/license
+ *
+ * @category  Phergie
+ * @package   Phergie_Plugin_Lart
+ * @author    Phergie Development Team <team@phergie.org>
+ * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
+ * @license   http://phergie.org/license New BSD License
+ * @link      http://pear.phergie.org/package/Phergie_Plugin_Lart
+ */
+
+/**
+ * Accepts terms and corresponding definitions for storage to a local data
+ * source and performs and returns the result of lookups for term definitions
+ * as they are requested.
+ *
+ * @category Phergie
+ * @package  Phergie_Plugin_Lart
+ * @author   Phergie Development Team <team@phergie.org>
+ * @license  http://phergie.org/license New BSD License
+ * @link     http://pear.phergie.org/package/Phergie_Plugin_Lart
+ * @uses     Phergie_Plugin_Command pear.phergie.org
+ * @uses     extension PDO
+ * @uses     extension pdo_sqlite
+ */
+class Phergie_Plugin_Lart extends Phergie_Plugin_Abstract
+{
+    /**
+     * PDO instance for the database
+     *
+     * @var PDO
+     */
+    protected $db;
+
+    /**
+     * Prepared statement for inserting a new definition
+     *
+     * @var PDOStatement
+     */
+    protected $save;
+
+    /**
+     * Prepared statement for deleting the definition for a given term
+     *
+     * @var PDOStatement
+     */
+    protected $delete;
+
+    /**
+     * Prepared statement for searching for a definition for which the term
+     * matches as a regular expression against a given search string
+     *
+     * @var PDOStatement
+     */
+    protected $process;
+
+    /**
+     * Prepared statement for searching for a definition by its exact term
+     *
+     * @var PDOStatement
+     */
+    protected $select;
+
+    /**
+     * Checks for dependencies and initializes the database.
+     *
+     * @return void
+     */
+    public function onLoad()
+    {
+        if (!extension_loaded('PDO') || !extension_loaded('pdo_sqlite')) {
+            $this->fail('PDO and pdo_sqlite extensions must be installed');
+        }
+
+        $this->plugins->getPlugin('Command');
+
+        $dir = dirname(__FILE__) . '/' . $this->getName();
+        $path = $dir . '/lart.db';
+        $exists = file_exists($path);
+        if (!$exists) {
+            mkdir($dir);
+        }
+
+        try {
+            $this->db = new PDO('sqlite:' . $path);
+        } catch (PDO_Exception $e) {
+            throw new Phergie_Plugin_Exception($e->getMessage());
+        }
+
+        $this->db->sqliteCreateFunction('preg_match', 'preg_match');
+
+        if (!$exists) {
+            $this->db->exec('
+                CREATE TABLE lart (
+                    name VARCHAR(255),
+                    definition TEXT,
+                    hostmask VARCHAR(50),
+                    tstamp VARCHAR(19)
+                )
+            ');
+            $this->db->exec('
+                CREATE UNIQUE INDEX lart_name ON lart (name)
+            ');
+        }
+
+        $this->save = $this->db->prepare('
+            REPLACE INTO lart (name, definition, hostmask, tstamp)
+            VALUES (:name, :definition, :hostmask, :tstamp)
+        ');
+
+        $this->process = $this->db->prepare('
+            SELECT *
+            FROM lart
+            WHERE preg_match(name, :name)
+        ');
+
+        $this->select = $this->db->prepare('
+            SELECT *
+            FROM lart
+            WHERE name = :name
+        ');
+
+        $this->delete = $this->db->prepare('
+            DELETE FROM lart
+            WHERE name = :name
+        ');
+    }
+
+    /**
+     * Retrieves the definition for a given term if it exists.
+     *
+     * @param string $term Term to search for
+     *
+     * @return mixed String containing the definition or FALSE if no definition
+     *               exists
+     */
+    protected function getLart($term)
+    {
+        $this->process->execute(array(':name' => $term));
+        $row = $this->process->fetchObject();
+        if ($row === false) {
+            return false;
+        }
+        preg_match($row->name, $term, $match);
+        $definition = preg_replace(
+            "/(?:\\\\|\\$)([0-9]+)/e",
+            '$match[\1]',
+            $row->definition
+        );
+        $event = $this->getEvent();
+        $definition = str_replace(
+            array('$source', '$nick'),
+            array($event->getSource(), $event->getNick()),
+            $definition
+        );
+        return $definition;
+    }
+
+    /**
+     * Deletes a given definition.
+     *
+     * @param string $term Term for which the definition should be deleted
+     *
+     * @return boolean TRUE if the definition was found and deleted, FALSE
+     *         otherwise
+     */
+    protected function deleteLart($term)
+    {
+        $this->delete->execute(array(':name' => $term));
+        return ($this->delete->rowCount() > 0);
+    }
+
+    /**
+     * Saves a given definition.
+     *
+     * @param string $term       Term to trigger a response containing the
+     *        corresponding definition, may be a regular expression
+     * @param string $definition Definition corresponding to the term
+     *
+     * @return boolean TRUE if the definition was saved successfully, FALSE
+     *         otherwise
+     */
+    protected function saveLart($term, $definition)
+    {
+        $data = array(
+            ':name' => $term,
+            ':definition' => $definition,
+            ':hostmask' => (string) $this->getEvent()->getHostmask(),
+            ':tstamp' => time()
+        );
+        $this->save->execute($data);
+        return ($this->save->rowCount() > 0);
+    }
+
+    /**
+     * Returns information about a definition.
+     *
+     * @param string $term Term about which to return information
+     *
+     * @return void
+     */
+    public function onCommandLartinfo($term)
+    {
+        $this->select->execute(array(':name' => $term));
+        $row = $this->select->fetchObject();
+        $msg = $this->getEvent()->getNick() . ': ';
+        if (!$row) {
+            $msg .= 'Lart not found';
+        } else {
+            $msg .= 'Term: ' . $row->name
+                . ', Definition: ' . $row->definition
+                . ', User: ' . $row->hostmask
+                . ', Added: ' . date('n/j/y g:i A', $row->tstamp);
+        }
+        $this->doNotice($this->getEvent()->getSource(), $msg);
+    }
+
+    /**
+     * Creates a new definition.
+     *
+     * @param string $term       Term to add
+     * @param string $definition Definition to add
+     *
+     * @return void
+     */
+    public function onCommandAddlart($term, $definition)
+    {
+        $result = $this->saveLart($term, $definition);
+        if ($result) {
+            $msg = 'Lart saved successfully';
+        } else {
+            $msg = 'Lart could not be saved';
+        }
+        $this->doNotice($this->getEvent()->getSource(), $msg);
+    }
+
+    /**
+     * Removes an existing definition.
+     *
+     * @param string $term Term for which the definition should be removed
+     *
+     * @return void
+     */
+    public function onCommandDeletelart($term)
+    {
+        $source = $this->getEvent()->getSource();
+        if ($this->deleteLart($term)) {
+            $msg = 'Lart deleted successfully';
+        } else {
+            $msg = 'Lart not found';
+        }
+        $this->doNotice($source, $msg);
+    }
+
+    /**
+     * Processes definition triggers in the text of the current event.
+     *
+     * @return void
+     */
+    protected function processLart()
+    {
+        $lart = $this->getLart($this->getEvent()->getText());
+        if ($lart) {
+            if (strpos($lart, '/me') === 0) {
+                $lart = substr($lart, 4);
+                $method = 'doAction';
+            } else {
+                $method = 'doPrivmsg';
+            }
+            $this->$method($this->getEvent()->getSource(), $lart);
+        }
+    }
+
+    /**
+     * Processes definition triggers in messages.
+     *
+     * @return void
+     */
+    public function onPrivmsg()
+    {
+        $this->processLart();
+    }
+
+    /**
+     * Processes definition triggers in CTCP actions.
+     *
+     * @return void
+     */
+    public function onAction()
+    {
+        $this->processLart();
+    }
+}
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/NickServ.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/NickServ.php
index f873c753bb..e97abecf78 100644
--- a/plugins/Irc/extlib/phergie/Phergie/Plugin/NickServ.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/NickServ.php
@@ -57,16 +57,13 @@ class Phergie_Plugin_NickServ extends Phergie_Plugin_Abstract
         $this->getPluginHandler()->getPlugin('Command');
 
         // Get the name of the NickServ bot, defaults to NickServ
-        $this->botNick = $this->config['nickserv.botnick'];
-        if (!$this->botNick) {
-            $this->botNick = 'NickServ';
-        }
+        $this->botNick = $this->getConfig('nickserv.botnick', 'NickServ');
 
         // Get the identify message
-        $this->identifyMessage = $this->config['nickserv.identify_message'];
-        if (!$this->identifyMessage) {
-            $this->identifyMessage = '/This nickname is registered./';
-        }
+        $this->identifyMessage = $this->getConfig(
+            'nickserv.identify_message',
+            '/This nickname is registered./'
+        );
     }
 
     /**
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Remind.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Remind.php
index cfb3c07e8c..42d674c68f 100644
--- a/plugins/Irc/extlib/phergie/Phergie/Plugin/Remind.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Remind.php
@@ -30,6 +30,8 @@
  * @link     http://pear.phergie.org/package/Phergie_Plugin_Remind
  * @uses     Phergie_Plugin_Command pear.phergie.org
  * @uses     Phergie_Plugin_Time pear.phergie.org
+ * @uses     extension PDO
+ * @uses     extension pdo_sqlite
  */
 class Phergie_Plugin_Remind extends Phergie_Plugin_Abstract
 {
@@ -67,15 +69,11 @@ class Phergie_Plugin_Remind extends Phergie_Plugin_Abstract
         $plugins = $this->getPluginHandler();
         $plugins->getPlugin('Command');
         $plugins->getPlugin('Time');
-    }
 
-    /**
-     * Creates the database if it does not already exist.
-     *
-     * @return void
-     */
-    public function onConnect()
-    {
+        if (!extension_loaded('PDO') || !extension_loaded('pdo_sqlite')) {
+            $this->fail('PDO and pdo_sqlite extensions must be installed');
+        }
+
         $dir = dirname(__FILE__) . '/' . $this->getName();
         $path = $dir . '/reminder.db';
         if (!file_exists($dir)) {
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Temperature.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Temperature.php
new file mode 100644
index 0000000000..541fd85cff
--- /dev/null
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Temperature.php
@@ -0,0 +1,81 @@
+<?php
+/**
+ * Phergie
+ *
+ * PHP version 5
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.
+ * It is also available through the world-wide-web at this URL:
+ * http://phergie.org/license
+ *
+ * @category  Phergie
+ * @package   Phergie_Plugin_Temperature
+ * @author    Phergie Development Team <team@phergie.org>
+ * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
+ * @license   http://phergie.org/license New BSD License
+ * @link      http://pear.phergie.org/package/Phergie_Plugin_Temperature
+ */
+
+/**
+ * Performs temperature calculations for other plugins.
+ *
+ * @category Phergie
+ * @package  Phergie_Plugin_Temperature
+ * @author   Phergie Development Team <team@phergie.org>
+ * @license  http://phergie.org/license New BSD License
+ * @link     http://pear.phergie.org/package/Phergie_Plugin_Temperature
+ */
+class Phergie_Plugin_Temperature extends Phergie_Plugin_Abstract
+{
+    /**
+     * Converts a temperature in Celsius to Fahrenheit.
+     *
+     * @param int $temp Temperature in Celsius
+     *
+     * @return int Temperature converted to Fahrenheit
+     */
+    public function convertCelsiusToFahrenheit($temp)
+    {
+        return round(((((int) $temp * 9) / 5) + 32));
+    }
+
+    /**
+     * Converts a temperature in Fahrenheit to Celsius.
+     *
+     * @param int $temp Temperature in Fahrenheit
+     *
+     * @return int Temperature converted to Celsius
+     */
+    public function convertFahrenheitToCelsius($temp)
+    {
+        return round(((((int) $temp - 32) * 5) / 9));
+    }
+
+    /**
+     * Calculates the heat index (i.e. "feels like" temperature) based on
+     * temperature and relative humidity.
+     *
+     * @param int $temperature Temperature in degrees Fahrenheit
+     * @param int $humidity Relative humidity (ex: 68)
+     * @return int Heat index in degrees Fahrenheit
+     */
+    public function getHeatIndex($temperature, $humidity)
+    {
+        $temperature2 = $temperature * $temperature;
+        $humidity2 = $humidity * $humidity;
+        return round(
+            -42.379 +
+            (2.04901523 * $temperature) +
+            (10.14333127 * $humidity) -
+            (0.22475541 * $temperature * $humidity) -
+            (0.00683783 * $temperature2) -
+            (0.05481717 * $humidity2) +
+            (0.00122874 * $temperature2 * $humidity) +
+            (0.00085282 * $temperature * $humidity2) -
+            (0.00000199 * $temperature2 * $humidity2)
+        );
+    }
+}
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Tld.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Tld.php
index 5efc265c64..21993f73c5 100644
--- a/plugins/Irc/extlib/phergie/Phergie/Plugin/Tld.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Tld.php
@@ -29,7 +29,6 @@
  * @author   Phergie Development Team <team@phergie.org>
  * @license  http://phergie.org/license New BSD License
  * @link     http://pear.phergie.org/package/Phergie_Plugin_Tld
- * @uses     Phergie_Plugin_Http pear.phergie.org
  * @uses     extension PDO
  * @uses     extension pdo_sqlite
  *
@@ -42,11 +41,6 @@ class Phergie_Plugin_Tld extends Phergie_Plugin_Abstract
      * @var PDO
      */
     protected $db;
-    /**
-     * Some fixed TLD values, keys must be lowercase
-     * @var array
-     */
-    protected static $fixedTlds;
 
     /**
      * Prepared statement for selecting a single tld
@@ -67,19 +61,13 @@ class Phergie_Plugin_Tld extends Phergie_Plugin_Abstract
      */
     public function onLoad()
     {
+        if (!extension_loaded('PDO') || !extension_loaded('pdo_sqlite')) {
+            $this->fail('PDO and pdo_sqlite extensions must be installed');
+        }
+
         $help = $this->getPluginHandler()->getPlugin('Help');
         $help->register($this);
 
-        if (!is_array(self::$fixedTlds)) {
-            self::$fixedTlds = array(
-                'phergie' => 'You can find Phergie at http://www.phergie.org',
-                'spoon'   => 'Don\'t you know? There is no spoon!',
-                'poo'     => 'Do you really think that\'s funny?',
-                'root'    => 'Diagnostic marker to indicate '
-                . 'a root zone load was not truncated.'
-            );
-        }
-
         $dbFile = dirname(__FILE__) . '/Tld/tld.db';
         try {
             $this->db = new PDO('sqlite:' . $dbFile);
@@ -124,19 +112,15 @@ class Phergie_Plugin_Tld extends Phergie_Plugin_Abstract
      *
      * @param string $tld TLD to search for
      *
-     * @return string Definition of the given TLD
+     * @return mixed Definition of the given TLD as a string or false if unknown
      */
     public function getTld($tld)
     {
         $tld = trim(strtolower($tld));
-        if (isset(self::$fixedTlds[$tld])) {
-            return self::$fixedTlds[$tld];
-        } else {
-            if ($this->select->execute(array('tld' => $tld))) {
-                $tlds = $this->select->fetch();
-                if (is_array($tlds)) {
-                    return '(' . $tlds['type'] . ') ' . $tlds['description'];
-                }
+        if ($this->select->execute(array('tld' => $tld))) {
+            $tlds = $this->select->fetch();
+            if (is_array($tlds)) {
+                return '(' . $tlds['type'] . ') ' . $tlds['description'];
             }
         }
         return false;
@@ -145,7 +129,8 @@ class Phergie_Plugin_Tld extends Phergie_Plugin_Abstract
     /**
      * Retrieves a list of all the TLDs and their definitions
      *
-     * @return array Array of all the TLDs and their definitions
+     * @return mixed Array of all the TLDs and their definitions or FALSE on
+      *        failure
      */
     public function getTlds()
     {
@@ -159,7 +144,6 @@ class Phergie_Plugin_Tld extends Phergie_Plugin_Abstract
                         . $tld['description'];
                     }
                 }
-                unset($tlds);
                 return $tldinfo;
             }
         }
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Url.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Url.php
index 2ea33befdf..bac115b1b9 100644
--- a/plugins/Irc/extlib/phergie/Phergie/Plugin/Url.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Url.php
@@ -31,7 +31,9 @@
  * @author   Phergie Development Team <team@phergie.org>
  * @license  http://phergie.org/license New BSD License
  * @link     http://pear.phergie.org/package/Phergie_Plugin_Url
+ * @uses     Phergie_Plugin_Encoding pear.phergie.org
  * @uses     Phergie_Plugin_Http pear.phergie.org
+ * @uses     Phergie_Plugin_Tld pear.phergie.org
  */
 class Phergie_Plugin_Url extends Phergie_Plugin_Abstract
 {
@@ -121,50 +123,6 @@ class Phergie_Plugin_Url extends Phergie_Plugin_Abstract
      */
     protected $detectSchemeless = false;
 
-    /**
-     * List of error messages to return when the requested URL returns an
-     * HTTP error
-     *
-     * @var array
-     */
-    protected $httpErrors = array(
-        100 => '100 Continue',
-        200 => '200 OK',
-        201 => '201 Created',
-        204 => '204 No Content',
-        206 => '206 Partial Content',
-        300 => '300 Multiple Choices',
-        301 => '301 Moved Permanently',
-        302 => '302 Found',
-        303 => '303 See Other',
-        304 => '304 Not Modified',
-        307 => '307 Temporary Redirect',
-        400 => '400 Bad Request',
-        401 => '401 Unauthorized',
-        403 => '403 Forbidden',
-        404 => '404 Not Found',
-        405 => '405 Method Not Allowed',
-        406 => '406 Not Acceptable',
-        408 => '408 Request Timeout',
-        410 => '410 Gone',
-        413 => '413 Request Entity Too Large',
-        414 => '414 Request URI Too Long',
-        415 => '415 Unsupported Media Type',
-        416 => '416 Requested Range Not Satisfiable',
-        417 => '417 Expectation Failed',
-        500 => '500 Internal Server Error',
-        501 => '501 Method Not Implemented',
-        503 => '503 Service Unavailable',
-        506 => '506 Variant Also Negotiates'
-    );
-
-    /**
-     * An array containing a list of TLDs used for non-scheme matches
-     *
-     * @var array
-     */
-    protected $tldList = array();
-
     /**
      * Shortener object
      */
@@ -176,12 +134,17 @@ class Phergie_Plugin_Url extends Phergie_Plugin_Abstract
     protected $renderers = array();
 
     /**
-     * Initializes settings, checks dependencies.
+     * Checks for dependencies.
      *
      * @return void
      */
-    public function onConnect()
+    public function onLoad()
     {
+        $plugins = $this->plugins;
+        $plugins->getPlugin('Encoding');
+        $plugins->getPlugin('Http');
+        $plugins->getPlugin('Tld');
+
         // make the shortener configurable
         $shortener = $this->getConfig('url.shortener', 'Trim');
         $shortener = "Phergie_Plugin_Url_Shorten_{$shortener}";
@@ -191,14 +154,6 @@ class Phergie_Plugin_Url extends Phergie_Plugin_Abstract
             $this->fail("Declared shortener class {$shortener} is not of proper ancestry");
         }
 
-        // Get a list of valid TLDs
-        if (!is_array($this->tldList) || count($this->tldList) <= 6) {
-            $tldPath = dirname(__FILE__) . '/Url/url.tld.txt';
-            $this->tldList = explode("\n", file_get_contents($tldPath));
-            $this->debug('Loaded ' . count($this->tldList) . ' tlds');
-            rsort($this->tldList);
-        }
-
         // load config (a bit ugly, but focusing on porting):
         foreach (
             array(
@@ -226,16 +181,130 @@ class Phergie_Plugin_Url extends Phergie_Plugin_Abstract
      * @return void
      */
     public function onPrivmsg()
+    {
+        $this->handleMsg();
+    }
+
+    /**
+     * Checks an incoming message for the presence of a URL and, if one is
+     * found, responds with its title if it is an HTML document and the
+     * shortened equivalent of its original URL if it meets length requirements.
+     *
+     * @todo Update this to pull configuration settings from $this->config
+     *       rather than caching them as class properties
+     * @return void
+     */
+    public function onAction()
+    {
+        $this->handleMsg();
+    }
+
+    /**
+     * Handles message events and responds with url titles.
+     *
+     * @return void
+     */
+    protected function handleMsg()
     {
         $source = $this->getEvent()->getSource();
         $user = $this->getEvent()->getNick();
 
+        $responses = array();
+        $urls = $this->findUrls($this->getEvent()->getArgument(1));
+
+        foreach ($urls as $parsed) {
+            $url = $parsed['glued'];
+
+            // allow out-of-class renderers to handle this URL
+            foreach ($this->renderers as $renderer) {
+                if ($renderer->renderUrl($parsed) === true) {
+                    // renderers should return true if they've fully
+                    // rendered the passed URL (they're responsible
+                    // for their own output)
+                    $this->debug('Handled by renderer: ' . get_class($renderer));
+                    continue 2;
+                }
+            }
+
+            // Convert url
+            $shortenedUrl = $this->shortener->shorten($url);
+            if (!$shortenedUrl) {
+                $this->debug('Invalid Url: Unable to shorten. (' . $url . ')');
+                $shortenedUrl = $url;
+            }
+
+            // Prevent spamfest
+            if ($this->checkUrlCache($url, $shortenedUrl)) {
+                $this->debug('Invalid Url: URL is in the cache. (' . $url . ')');
+                continue;
+            }
+
+            $title = $this->getTitle($url);
+            if (!empty($title)) {
+                $responses[] = str_replace(
+                    array(
+                        '%title%',
+                        '%link%',
+                        '%nick%'
+                    ), array(
+                        $title,
+                        $shortenedUrl,
+                        $user
+                    ), $this->messageFormat
+                );
+            }
+
+            // Update cache
+            $this->updateUrlCache($url, $shortenedUrl);
+            unset($title, $shortenedUrl, $title);
+        }
+
+        // Check to see if there were any URL responses, format them and handle if they
+        // get merged into one message or not
+        if (count($responses) > 0) {
+            if ($this->mergeLinks) {
+                $message = str_replace(
+                    array(
+                        '%message%',
+                        '%nick%'
+                    ), array(
+                        implode('; ', $responses),
+                        $user
+                    ), $this->baseFormat
+                );
+                $this->doPrivmsg($source, $message);
+            } else {
+                foreach ($responses as $response) {
+                    $message = str_replace(
+                        array(
+                            '%message%',
+                            '%nick%'
+                        ), array(
+                            implode('; ', $responses),
+                            $user
+                        ), $this->baseFormat
+                    );
+                    $this->doPrivmsg($source, $message);
+                }
+            }
+        }
+    }
+
+    /**
+     * Detect URLs in a given string.
+     *
+     * @param string $message the string to detect urls in
+     *
+     * @return array the array of urls found
+     */
+    public function findUrls($message)
+    {
         $pattern = '#'.($this->detectSchemeless ? '' : 'https?://').'(?:([0-9]{1,3}(?:\.[0-9]{1,3}){3})(?![^/]) | ('
             .($this->detectSchemeless ? '(?<!http:/|https:/)[@/\\\]' : '').')?(?:(?:[a-z0-9_-]+\.?)+\.[a-z0-9]{1,6}))[^\s]*#xis';
+        $urls = array();
 
         // URL Match
-        if (preg_match_all($pattern, $this->getEvent()->getArgument(1), $matches, PREG_SET_ORDER)) {
-            $responses = array();
+        if (preg_match_all($pattern, $message, $matches, PREG_SET_ORDER)) {
             foreach ($matches as $m) {
                 $url = trim(rtrim($m[0], ', ].?!;'));
 
@@ -251,17 +320,6 @@ class Phergie_Plugin_Url extends Phergie_Plugin_Abstract
                     continue;
                 }
 
-                // allow out-of-class renderers to handle this URL
-                foreach ($this->renderers as $renderer) {
-                    if ($renderer->renderUrl($parsed) === true) {
-                        // renderers should return true if they've fully
-                        // rendered the passed URL (they're responsible
-                        // for their own output)
-                        $this->debug('Handled by renderer: ' . get_class($renderer));
-                        continue 2;
-                    }
-                }
-
                 // Check to see if the given IP/Host is valid
                 if (!empty($m[1]) and !$this->checkValidIP($m[1])) {
                     $this->debug('Invalid Url: ' . $m[1] . ' is not a valid IP address. (' . $url . ')');
@@ -275,7 +333,7 @@ class Phergie_Plugin_Url extends Phergie_Plugin_Abstract
                     $parsed['tld'] = ($pos !== false ? substr($parsed['host'], ($pos+1)) : '');
 
                     // Check to see if the URL has a valid TLD
-                    if (is_array($this->tldList) && !in_array(strtolower($parsed['tld']), $this->tldList)) {
+                    if ($this->plugins->tld->getTld($parsed['tld']) === false) {
                         $this->debug('Invalid Url: ' . $parsed['tld'] . ' is not a supported TLD. (' . $url . ')');
                         continue;
                     }
@@ -295,73 +353,12 @@ class Phergie_Plugin_Url extends Phergie_Plugin_Abstract
                     $this->debug('Invalid Url: ' . $parsed['scheme'] . ' is not a supported scheme. (' . $url . ')');
                     continue;
                 }
-                $url = $this->glueURL($parsed);
-                unset($parsed);
 
-                // Convert url
-                $shortenedUrl = $this->shortener->shorten($url);
-                if (!$shortenedUrl) {
-                    $this->debug('Invalid Url: Unable to shorten. (' . $url . ')');
-                    continue;
-                }
-
-                // Prevent spamfest
-                if ($this->checkUrlCache($url, $shortenedUrl)) {
-                    $this->debug('Invalid Url: URL is in the cache. (' . $url . ')');
-                    continue;
-                }
-
-                $title = self::getTitle($url);
-                if (!empty($title)) {
-                    $responses[] = str_replace(
-                        array(
-                            '%title%',
-                            '%link%',
-                            '%nick%'
-                        ), array(
-                         $title,
-                            $shortenedUrl,
-                            $user
-                        ), $this->messageFormat
-                    );
-                }
-
-                // Update cache
-                $this->updateUrlCache($url, $shortenedUrl);
-                unset($title, $shortenedUrl, $title);
-            }
-            /**
-             * Check to see if there were any URL responses, format them and handle if they
-             * get merged into one message or not
-             */
-            if (count($responses) > 0) {
-                if ($this->mergeLinks) {
-                    $message = str_replace(
-                        array(
-                            '%message%',
-                            '%nick%'
-                        ), array(
-                            implode('; ', $responses),
-                            $user
-                        ), $this->baseFormat
-                    );
-                    $this->doPrivmsg($source, $message);
-                } else {
-                    foreach ($responses as $response) {
-                        $message = str_replace(
-                            array(
-                                '%message%',
-                                '%nick%'
-                            ), array(
-                                implode('; ', $responses),
-                                $user
-                            ), $this->baseFormat
-                        );
-                        $this->doPrivmsg($source, $message);
-                    }
-                }
+                $urls[] = $parsed + array('glued' => $this->glueURL($parsed));
             }
         }
+
+        return $urls;
     }
 
     /**
@@ -454,52 +451,13 @@ class Phergie_Plugin_Url extends Phergie_Plugin_Abstract
      */
     protected function decode($str, $trim = null)
     {
-        $out = $this->decodeTranslit($str);
+        $out = $this->plugins->encoding->transliterate($str);
         if ($trim > 0) {
             $out = substr($out, 0, $trim) . (strlen($out) > $trim ? '...' : '');
         }
         return $out;
     }
 
-    /**
-     * Custom error handler meant to handle 404 errors and such
-     *
-     * @param int    $errno   the error code
-     * @param string $errstr  the error string
-     * @param string $errfile file the error occured in
-     * @param int    $errline line the error occured on
-     *
-     * @return bool
-     */
-    public function onPhpError($errno, $errstr, $errfile, $errline)
-    {
-        if ($errno === E_WARNING) {
-            // Check to see if there was HTTP warning while connecting to the site
-            if (preg_match('{HTTP/1\.[01] ([0-9]{3})}i', $errstr, $m)) {
-                $this->errorStatus = $m[1];
-                $this->errorMessage = (isset($this->httpErrors[$m[1]]) ? $this->httpErrors[$m[1]] : $m[1]);
-                $this->debug('PHP Warning:  ' . $errstr . 'in ' . $errfile . ' on line ' . $errline);
-                return true;
-            }
-
-            // Safely ignore these SSL warnings so they don't appear in the log
-            if (stripos($errstr, 'SSL: fatal protocol error in') !== false
-                || stripos($errstr, 'failed to open stream') !== false
-                || stripos($errstr, 'HTTP request failed') !== false
-                || stripos($errstr, 'SSL: An existing connection was forcibly closed by the remote host') !== false
-                || stripos($errstr, 'Failed to enable crypto in') !== false
-                || stripos($errstr, 'SSL: An established connection was aborted by the software in your host machine') !== false
-                || stripos($errstr, 'SSL operation failed with code') !== false
-                || stripos($errstr, 'unable to connect to') !== false
-            ) {
-                $this->errorStatus = true;
-                $this->debug('PHP Warning:  ' . $errstr . 'in ' . $errfile . ' on line ' . $errline);
-                return true;
-            }
-        }
-        return false;
-    }
-
     /**
      * Takes a url, parses and cleans the URL without of all the junk
      * and then return the hex checksum of the url.
@@ -511,7 +469,7 @@ class Phergie_Plugin_Url extends Phergie_Plugin_Abstract
     protected function getUrlChecksum($url)
     {
         $checksum = strtolower(urldecode($this->glueUrl($url, true)));
-        $checksum = preg_replace('#\s#', '', $this->decodeTranslit($checksum));
+        $checksum = preg_replace('#\s#', '', $this->plugins->encoding->transliterate($checksum));
         return dechex(crc32($checksum));
     }
 
@@ -628,19 +586,20 @@ class Phergie_Plugin_Url extends Phergie_Plugin_Abstract
             'user_agent' => 'Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.8.1.12) Gecko/20080201 Firefox/2.0.0.12'
         );
 
-        $response = $http->get($url, array(), $options);
-
+        $response = $http->head($url, array(), $options);
         $header = $response->getHeaders('Content-Type');
+
         if (!preg_match('#^(text/x?html|application/xhtml+xml)(?:;.*)?$#', $header)) {
             $title = $header;
-        }
-
-        $content = $response->getContent();
-        if (empty($title)) {
+        } else {
+            $response = $http->get($url, array(), $options);
+            $content = $response->getContent();
             if (preg_match('#<title[^>]*>(.*?)</title>#is', $content, $match)) {
-                $title = html_entity_decode(trim($match[1]));
+                $title = preg_replace('/[\s\v]+/', ' ', trim($match[1]));
             }
         }
+        $encoding = $this->plugins->getPlugin('Encoding');
+        $title = $encoding->decodeEntities($title);
 
         if (empty($title)) {
             if ($response->isError()) {
@@ -665,19 +624,6 @@ class Phergie_Plugin_Url extends Phergie_Plugin_Abstract
         echo "(DEBUG:Url) $msg\n";
     }
 
-    /**
-     * Placeholder/porting helper. Has no function.
-     *
-     * @param string $str a string to return
-     *
-     * @return string
-     */
-    protected function decodeTranslit($str)
-    {
-        // placeholder/porting helper
-        return $str;
-    }
-
     /**
      * Add a renderer to the stack
      *
@@ -687,7 +633,6 @@ class Phergie_Plugin_Url extends Phergie_Plugin_Abstract
      */
     public function registerRenderer($obj)
     {
-        $this->renderers[] = $obj;
-        array_unique($this->renderers);
+        $this->renderers[spl_object_hash($obj)] = $obj;
     }
 }
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Url/url.tld.txt b/plugins/Irc/extlib/phergie/Phergie/Plugin/Url/url.tld.txt
deleted file mode 100644
index cc46fdd620..0000000000
--- a/plugins/Irc/extlib/phergie/Phergie/Plugin/Url/url.tld.txt
+++ /dev/null
@@ -1,273 +0,0 @@
-ac
-ad
-ae
-aero
-af
-ag
-ai
-al
-am
-an
-ao
-aq
-ar
-arpa
-as
-asia
-at
-au
-aw
-ax
-az
-ba
-bb
-bd
-be
-bf
-bg
-bh
-bi
-biz
-bj
-bl
-bm
-bn
-bo
-br
-bs
-bt
-bv
-bw
-by
-bz
-ca
-cat
-cc
-cd
-cf
-cg
-ch
-ci
-ck
-cl
-cm
-cn
-co
-com
-coop
-cr
-cu
-cv
-cx
-cy
-cz
-de
-dj
-dk
-dm
-do
-dz
-ec
-edu
-ee
-eg
-eh
-er
-es
-et
-eu
-fi
-fj
-fk
-fm
-fo
-fr
-ga
-gb
-gd
-ge
-gf
-gg
-gh
-gi
-gl
-gm
-gn
-gov
-gp
-gq
-gr
-gs
-gt
-gu
-gw
-gy
-hk
-hm
-hn
-hr
-ht
-hu
-id
-ie
-il
-im
-in
-info
-int
-io
-iq
-ir
-is
-it
-je
-jm
-jo
-jobs
-jp
-ke
-kg
-kh
-ki
-km
-kn
-kp
-kr
-kw
-ky
-kz
-la
-lb
-lc
-li
-lk
-lr
-ls
-lt
-lu
-lv
-ly
-ma
-mc
-md
-me
-mf
-mg
-mh
-mil
-mk
-ml
-mm
-mn
-mo
-mobi
-mp
-mq
-mr
-ms
-mt
-mu
-museum
-mv
-mw
-mx
-my
-mz
-na
-name
-nc
-ne
-net
-nf
-ng
-ni
-nl
-no
-np
-nr
-nu
-nz
-om
-org
-pa
-pe
-pf
-pg
-ph
-pk
-pl
-pm
-pn
-pr
-pro
-ps
-pt
-pw
-py
-qa
-re
-ro
-rs
-ru
-rw
-sa
-sb
-sc
-sd
-se
-sg
-sh
-si
-sj
-sk
-sl
-sm
-sn
-so
-sr
-st
-su
-sv
-sy
-sz
-tc
-td
-tel
-tf
-tg
-th
-tj
-tk
-tl
-tm
-tn
-to
-tp
-tr
-travel
-tt
-tv
-tw
-tz
-ua
-ug
-uk
-um
-us
-uy
-uz
-va
-vc
-ve
-vg
-vi
-vn
-vu
-wf
-ws
-ye
-yt
-yu
-za
-zm
-zw
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Weather.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Weather.php
index 499cd9d556..7d4f85a19d 100644
--- a/plugins/Irc/extlib/phergie/Phergie/Plugin/Weather.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Weather.php
@@ -34,6 +34,7 @@
  * @link     http://www.weather.com/services/xmloap.html
  * @uses     Phergie_Plugin_Command pear.phergie.org
  * @uses     Phergie_Plugin_Http pear.phergie.org
+ * @uses     Phergie_Plugin_Temperature pear.phergie.org
  * @uses     extension SimpleXML
  */
 class Phergie_Plugin_Weather extends Phergie_Plugin_Abstract
@@ -48,6 +49,7 @@ class Phergie_Plugin_Weather extends Phergie_Plugin_Abstract
         $plugins = $this->getPluginHandler();
         $plugins->getPlugin('Command');
         $plugins->getPlugin('Http');
+        $plugins->getPlugin('Temperature');
 
         if (empty($this->config['weather.partner_id'])
             || empty($this->config['weather.license_key'])) {
@@ -55,30 +57,6 @@ class Phergie_Plugin_Weather extends Phergie_Plugin_Abstract
         }
     }
 
-    /**
-     * Converts a temperature in Celsius to Fahrenheit.
-     *
-     * @param int $temp Temperature in Celsius
-     *
-     * @return int Temperature converted to Fahrenheit
-     */
-    public function convertCelsiusToFahrenheit($temp)
-    {
-        return round(((((int) $temp * 9) / 5) + 32));
-    }
-
-    /**
-     * Converts a temperature in Fahrenheit to Celsius.
-     *
-     * @param int $temp Temperature in Fahrenheit
-     *
-     * @return int Temperature converted to Celsius
-     */
-    public function convertFahrenheitToCelsius($temp)
-    {
-        return round(((((int) $temp - 32) * 5) / 9));
-    }
-
     /**
      * Returns a weather report for a specified location.
      *
@@ -129,16 +107,17 @@ class Phergie_Plugin_Weather extends Phergie_Plugin_Abstract
             return;
         }
 
+        $temperature = $this->plugins->getPlugin('Temperature');
         $xml = $response->getContent();
         $weather = 'Weather for ' . (string) $xml->loc->dnam . ' - ';
         switch ($xml->head->ut) {
             case 'F':
                 $tempF = $xml->cc->tmp;
-                $tempC = $this->convertFahrenheitToCelsius($tempF);
+                $tempC = $temperature->convertFahrenheitToCelsius($tempF);
                 break;
             case 'C':
                 $tempC = $xml->cc->tmp;
-                $tempF = $this->convertCelsiusToFahrenheit($tempC);
+                $tempF = $temperature->convertCelsiusToFahrenheit($tempC);
                 break;
             default:
                 $this->doNotice(
@@ -147,20 +126,8 @@ class Phergie_Plugin_Weather extends Phergie_Plugin_Abstract
                 break;
         }
         $r = $xml->cc->hmid;
-        $tempF2 = $tempF * $tempF;
-        $r2 = $r * $r;
-        $hiF = round(
-            -42.379 +
-            (2.04901523 * $tempF) +
-            (10.14333127 * $r) -
-            (.22475541 * $tempF * $r) -
-            (6.83783 * pow(10,-3) * $tempF2) -
-            (5.481717 * pow(10,-2) * $r2) +
-            (1.22874 * pow(10,-3) * $tempF2 * $r) +
-            (8.5282 * pow(10,-4) * $tempF * $r2) -
-            (1.99 * pow(10,-6) * $tempF2 * $r2)
-        );
-        $hiC = $this->convertFahrenheitToCelsius($hiF);
+        $hiF = $temperature->getHeatIndex($tempF, $r);
+        $hiC = $temperature->convertFahrenheitToCelsius($hiF);
         $weather .= 'Temperature: ' . $tempF . 'F/' . $tempC . 'C';
         $weather .= ', Humidity: ' . (string) $xml->cc->hmid . '%';
         if ($hiF > $tempF || $hiC > $tempC) {
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Youtube.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Youtube.php
new file mode 100644
index 0000000000..b19e9d5aef
--- /dev/null
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Youtube.php
@@ -0,0 +1,168 @@
+<?php
+/**
+ * Phergie
+ *
+ * PHP version 5
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.
+ * It is also available through the world-wide-web at this URL:
+ * http://phergie.org/license
+ *
+ * @category  Phergie
+ * @package   Phergie_Plugin_Youtube
+ * @author    Phergie Development Team <team@phergie.org>
+ * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
+ * @license   http://phergie.org/license New BSD License
+ * @link      http://pear.phergie.org/package/Phergie_Plugin_Youtube
+ */
+
+/**
+ * Provides commands used to access several services offered by Google
+ * including search, translation, weather, maps, and currency and general
+ * value unit conversion.
+ *
+ * @category Phergie
+ * @package  Phergie_Plugin_Youtube
+ * @author   Phergie Development Team <team@phergie.org>
+ * @license  http://phergie.org/license New BSD License
+ * @link     http://pear.phergie.org/package/Phergie_Plugin_Youtube
+ * @uses     Phergie_Plugin_Command pear.phergie.org
+ * @uses     Phergie_Plugin_Http pear.phergie.org
+ */
+class Phergie_Plugin_Youtube extends Phergie_Plugin_Abstract
+{
+    /**
+     * Checks for dependencies.
+     *
+     * @return void
+     */
+    public function onLoad()
+    {
+        $plugins = $this->getPluginHandler();
+        $plugins->getPlugin('Command');
+        $plugins->getPlugin('Http');
+        if ($url = $plugins->getPlugin('Url')) {
+            $url->registerRenderer($this);
+        }
+    }
+
+    /**
+     * Queries the YouTube video search web service, processes the first
+     * result, and sends a message back to the current event source.
+     *
+     * @param string $query Search term
+     *
+     * @return object YouTube result object
+     */
+    protected function queryYoutube($query)
+    {
+        $url = 'http://gdata.youtube.com/feeds/api/videos';
+        $params = array(
+            'max-results' => '1',
+            'alt' => 'json',
+            'q' => $query
+        );
+        $http = $this->plugins->getPlugin('Http');
+        $response = $http->get($url, $params);
+        $json = $response->getContent();
+
+        $entries = $json->feed->entry;
+        if (!$entries) {
+            $this->doNotice($this->event->getNick(), 'Query returned no results');
+            return;
+        }
+        $entry = reset($entries);
+
+        $nick = $this->event->getNick();
+        $link = $entry->link[0]->href;
+        $title = $entry->title->{'$t'};
+        $author = $entry->author[0]->name->{'$t'};
+        $seconds = $entry->{'media$group'}->{'yt$duration'}->seconds;
+        $published = $entry->published->{'$t'};
+        $views = $entry->{'yt$statistics'}->viewCount;
+        $rating = $entry->{'gd$rating'}->average;
+
+        $minutes = floor($seconds / 60);
+        $seconds = str_pad($seconds % 60, 2, '0', STR_PAD_LEFT);
+        $parsed_link = parse_url($link);
+        parse_str($parsed_link['query'], $parsed_query);
+        $link = 'http://youtu.be/' . $parsed_query['v'];
+        $published = date('n/j/y g:i A', strtotime($published));
+        $views = number_format($views, 0);
+        $rating = round($rating, 2);
+
+        $format = $this->getConfig('youtube.format');
+        if (!$format) {
+            $format = '%nick%:'
+                . ' [ %link% ]'
+                . ' "%title%" by %author%,'
+                . ' Length %minutes%:%seconds%,'
+                . ' Published %published%,'
+                . ' Views %views%,'
+                . ' Rating %rating%';
+        }
+
+        $replacements = array(
+            'nick' => $nick,
+            'link' => $link,
+            'title' => $title,
+            'author' => $author,
+            'minutes' => $minutes,
+            'seconds' => $seconds,
+            'published' => $published,
+            'views' => $views,
+            'rating' => $rating
+        );
+
+        $msg = $format;
+        foreach ($replacements as $from => $to) {
+            $msg = str_replace('%' . $from . '%', $to, $msg);
+        }
+        $this->doPrivmsg($this->event->getSource(), $msg);
+    }
+
+    /**
+     * Returns the first result of a YouTube search.
+     *
+     * @param string $query Search query
+     *
+     * @return void
+     */
+    public function onCommandYoutube($query)
+    {
+        $this->queryYoutube($query);
+    }
+
+    /**
+     * Renders YouTube URLs.
+     *
+     * @param array $parsed parse_url() output for the URL to render
+     *
+     * @return boolean TRUE if the URL was rendered successfully, FALSE
+     *         otherwise
+     */
+    public function renderUrl(array $parsed)
+    {
+        switch ($parsed['host']) {
+            case 'youtu.be':
+                $v = ltrim('/', $parsed['path']);
+                break;
+            case 'youtube.com':
+            case 'www.youtube.com':
+                parse_str($parsed['query'], $parsed_query);
+                if (!empty($parsed_query['v'])) {
+                    $v = $parsed_query['v'];
+                    break;
+                }
+            default:
+                return false;
+        }
+
+        $this->queryYoutube($v);
+
+        return true;
+    }
+}

From 742b302739bf31979b3c7f6b41136297264b86d3 Mon Sep 17 00:00:00 2001
From: Luke Fitzgerald <lw.fitzgerald@googlemail.com>
Date: Mon, 26 Jul 2010 11:13:00 -0700
Subject: [PATCH 129/655] More Irc plugin work

---
 plugins/Irc/IrcPlugin.php                     |  12 +-
 plugins/Irc/README                            |   1 +
 .../extlib/phergie/Phergie/Plugin/Beer.php    |  82 ++++
 .../extlib/phergie/Phergie/Plugin/Beer/db.php |   4 +-
 .../extlib/phergie/Phergie/Plugin/Censor.php  |  14 +-
 .../phergie/Phergie/Plugin/Cocktail.php       |  71 +++
 .../phergie/Phergie/Plugin/Cocktail/db.php    |  74 +++
 .../extlib/phergie/Phergie/Plugin/Cookie.php  |  69 +++
 .../phergie/Phergie/Plugin/Cookie/db.php      |  49 ++
 .../extlib/phergie/Phergie/Plugin/Karma.php   | 447 ++++++++++++++++++
 .../extlib/phergie/Phergie/Plugin/Serve.php   | 159 +++++++
 .../phergie/Phergie/Plugin/Statusnet.php      |  19 +-
 .../extlib/phergie/Phergie/Plugin/Wine.php    |  69 +++
 .../extlib/phergie/Phergie/Plugin/Wine/db.php |  53 +++
 .../extlib/phergie/Phergie/Process/Async.php  |   6 +-
 .../extlib/phergie/Phergie/StatusnetBot.php   |   2 +-
 plugins/Irc/ircmanager.php                    |  32 +-
 17 files changed, 1133 insertions(+), 30 deletions(-)
 create mode 100644 plugins/Irc/extlib/phergie/Phergie/Plugin/Beer.php
 create mode 100644 plugins/Irc/extlib/phergie/Phergie/Plugin/Cocktail.php
 create mode 100644 plugins/Irc/extlib/phergie/Phergie/Plugin/Cocktail/db.php
 create mode 100644 plugins/Irc/extlib/phergie/Phergie/Plugin/Cookie.php
 create mode 100644 plugins/Irc/extlib/phergie/Phergie/Plugin/Cookie/db.php
 create mode 100644 plugins/Irc/extlib/phergie/Phergie/Plugin/Karma.php
 create mode 100755 plugins/Irc/extlib/phergie/Phergie/Plugin/Serve.php
 create mode 100644 plugins/Irc/extlib/phergie/Phergie/Plugin/Wine.php
 create mode 100644 plugins/Irc/extlib/phergie/Phergie/Plugin/Wine/db.php

diff --git a/plugins/Irc/IrcPlugin.php b/plugins/Irc/IrcPlugin.php
index d23f5005c0..dec6d7e832 100644
--- a/plugins/Irc/IrcPlugin.php
+++ b/plugins/Irc/IrcPlugin.php
@@ -55,12 +55,15 @@ class IrcPlugin extends ImPlugin {
     public $realname = null;
     public $nick = null;
     public $password = null;
+    public $nickservidentifyregexp = null;
     public $nickservpassword = null;
     public $channels = null;
     public $transporttype = null;
     public $encoding = null;
 
     public $regcheck = null;
+    public $unregregexp = null;
+    public $regregexp = null;
 
     public $transport = 'irc';
     public $fake_irc;
@@ -249,21 +252,12 @@ class IrcPlugin extends ImPlugin {
         if (!isset($this->port)) {
             $this->port = 6667;
         }
-        if (!isset($this->password)) {
-            $this->password = '';
-        }
         if (!isset($this->transporttype)) {
             $this->transporttype = 'tcp';
         }
         if (!isset($this->encoding)) {
             $this->encoding = 'UTF-8';
         }
-        if (!isset($this->nickservpassword)) {
-            $this->nickservpassword = '';
-        }
-        if (!isset($this->channels)) {
-            $this->channels = array();
-        }
 
         if (!isset($this->regcheck)) {
             $this->regcheck = true;
diff --git a/plugins/Irc/README b/plugins/Irc/README
index 79ce8ff56a..bc45688f1e 100644
--- a/plugins/Irc/README
+++ b/plugins/Irc/README
@@ -19,6 +19,7 @@ realname*: Real name of bot
 nick*: Nickname of bot
 password: Password
 nickservpassword: NickServ password for identification
+nickservidentifyregexp: Override existing regexp matching request for identification from NickServ
 channels: Channels for bot to idle in
 transporttype: Set to 'ssl' to enable SSL
 encoding: Set to change encoding
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Beer.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Beer.php
new file mode 100644
index 0000000000..7213cdee8b
--- /dev/null
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Beer.php
@@ -0,0 +1,82 @@
+<?php
+/**
+ * Phergie
+ *
+ * PHP version 5
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.
+ * It is also available through the world-wide-web at this URL:
+ * http://phergie.org/license
+ *
+ * @category  Phergie
+ * @package   Phergie_Plugin_Beer
+ * @author    Phergie Development Team <team@phergie.org>
+ * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
+ * @license   http://phergie.org/license New BSD License
+ * @link      http://pear.phergie.org/package/Phergie_Plugin_Beer
+ */
+
+/**
+ * Processes requests to serve users beer.
+ *
+ * @category Phergie
+ * @package  Phergie_Plugin_Beer
+ * @author   Phergie Development Team <team@phergie.org>
+ * @license  http://phergie.org/license New BSD License
+ * @link     http://pear.phergie.org/package/Phergie_Plugin_Beer
+ * @uses     Phergie_Plugin_Command pear.phergie.org
+ * @uses     Phergie_Plugin_Serve pear.phergie.org
+ */
+class Phergie_Plugin_Beer extends Phergie_Plugin_Abstract
+{
+    /**
+     * Checks for dependencies.
+     *
+     * @return void
+     */
+    public function onLoad()
+    {
+        $plugins = $this->plugins;
+        $plugins->getPlugin('Command');
+        $plugins->getPlugin('Serve');
+    }
+
+    /**
+     * Processes requests to serve a user a beer.
+     *
+     * @param string $request Request including the target and an optional
+     *        suggestion of what beer to serve
+     *
+     * @return void
+     */
+    public function onCommandBeer($request)
+    {
+        $format = $this->getConfig(
+            'beer.format',
+            'throws %target% %article% %item%.'
+        );
+
+        $this->plugins->getPlugin('Serve')->serve(
+            dirname(__FILE__) . '/Beer/beer.db',
+            'beer',
+            $format,
+            $request
+        );
+    }
+
+    /**
+     * Adds a "booze" alias for the "beer" command.
+     *
+     * @param string $request Request including the target and an optional
+     *        suggestion of what beer to serve
+     *
+     * @return void
+     */
+    public function onCommandBooze($request)
+    {
+        $this->onCommandBeer($request);
+    }
+}
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Beer/db.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Beer/db.php
index 309d389b55..05ae064ed7 100644
--- a/plugins/Irc/extlib/phergie/Phergie/Plugin/Beer/db.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Beer/db.php
@@ -34,7 +34,7 @@ $xpath = new DOMXPath($doc);
 $beers = $xpath->query('//table[@class="beerlist"]/tr/td[1]');
 $db->beginTransaction();
 foreach ($beers as $beer) {
-    $name = $beer->textContent;
+    $name = iconv('UTF-8', 'ISO-8859-1//TRANSLIT', $beer->textContent);
     $link = 'http://beerme.com' . $beer->childNodes->item(1)->getAttribute('href');
     $insert->execute(array($name, $link));
 }
@@ -65,7 +65,7 @@ $columns = fgetcsv($fp, 0, '|');
 $db->beginTransaction();
 while ($line = fgetcsv($fp, 0, '|')) {
     $line = array_combine($columns, $line);
-    $name = $line['name'];
+    $name = iconv('UTF-8', 'ISO-8859-1//TRANSLIT', $line['name']);
     $link = null;
     $insert->execute(array($name, $link));
 }
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Censor.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Censor.php
index 3206bdd288..99c69d8734 100755
--- a/plugins/Irc/extlib/phergie/Phergie/Plugin/Censor.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Censor.php
@@ -72,7 +72,19 @@ class Phergie_Plugin_Censor extends Phergie_Plugin_Abstract
             $this->soap = new SoapClient('http://ws.cdyne.com/ProfanityWS/Profanity.asmx?wsdl');
         }
         $params = array('Text' => $string);
-        $response = $this->soap->SimpleProfanityFilter($params);
+        $attempts = 0;
+        while ($attempts < 3) {
+            try {
+                $response = $this->soap->SimpleProfanityFilter($params);
+                break;
+            } catch (SoapFault $e) {
+                $attempts++;
+                sleep(1);
+            }
+        }
+        if ($attempts == 3) {
+            return $string;
+        }
         return $response->SimpleProfanityFilterResult->CleanText;
     }
 
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Cocktail.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Cocktail.php
new file mode 100644
index 0000000000..eafeb657bf
--- /dev/null
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Cocktail.php
@@ -0,0 +1,71 @@
+<?php
+/**
+ * Phergie
+ *
+ * PHP version 5
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.
+ * It is also available through the world-wide-web at this URL:
+ * http://phergie.org/license
+ *
+ * @category  Phergie
+ * @package   Phergie_Plugin_Cocktail
+ * @author    Phergie Development Team <team@phergie.org>
+ * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
+ * @license   http://phergie.org/license New BSD License
+ * @link      http://pear.phergie.org/package/Phergie_Plugin_Cocktail
+ */
+
+/**
+ * Processes requests to serve users cocktail.
+ *
+ * @category Phergie
+ * @package  Phergie_Plugin_Cocktail
+ * @author   Phergie Development Team <team@phergie.org>
+ * @license  http://phergie.org/license New BSD License
+ * @link     http://pear.phergie.org/package/Phergie_Plugin_Cocktail
+ * @uses     Phergie_Plugin_Command pear.phergie.org
+ * @uses     Phergie_Plugin_Serve pear.phergie.org
+ */
+class Phergie_Plugin_Cocktail extends Phergie_Plugin_Abstract
+{
+    /**
+     * Checks for dependencies.
+     *
+     * @return void
+     */
+    public function onLoad()
+    {
+        $plugins = $this->plugins;
+        $plugins->getPlugin('Command');
+        $plugins->getPlugin('Serve');
+    }
+
+    /**
+     * Processes requests to serve a user a cocktail.
+     *
+     * @param string $request Request including the target and an optional
+     *        suggestion of what cocktail to serve
+     *
+     * @return void
+     */
+    public function onCommandCocktail($request)
+    {
+        $format = $this->getConfig(
+            'cocktail.format',
+            'throws %target% %article% %item%.'
+        );
+
+        $this->plugins->getPlugin('Serve')->serve(
+            dirname(__FILE__) . '/Cocktail/cocktail.db',
+            'cocktail',
+            $format,
+            $request,
+            true
+        );
+    }
+}
+
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Cocktail/db.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Cocktail/db.php
new file mode 100644
index 0000000000..2e61dd0bdb
--- /dev/null
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Cocktail/db.php
@@ -0,0 +1,74 @@
+<?php
+
+if (!defined('__DIR__')) {
+    define('__DIR__', dirname(__FILE__));
+}
+
+// Create database schema
+echo 'Creating database', PHP_EOL;
+$file = __DIR__ . '/cocktail.db';
+if (file_exists($file)) {
+    unlink($file);
+}
+$db = new PDO('sqlite:' . $file);
+$db->exec('CREATE TABLE cocktail (name VARCHAR(255), link VARCHAR(255))');
+$db->exec('CREATE UNIQUE INDEX cocktail_name ON cocktail (name)');
+$insert = $db->prepare('INSERT INTO cocktail (name, link) VALUES (:name, :link)');
+
+// Get raw webtender.com data set
+echo 'Downloading webtender.com data set', PHP_EOL;
+$start = 1;
+do {
+    $file = __DIR__ . '/' . $start . '.html';
+    if (file_exists($file)) {
+        continue;
+    }
+    copy(
+        'http://www.webtender.com/db/browse?level=2&dir=drinks&char=%2A&start=' . $start,
+        $file
+    );
+    if (!isset($limit)) {
+        $contents = file_get_contents($file);
+        preg_match('/([0-9]+) found/', $contents, $match);
+        $limit = $match[1] + (150 - ($match[1] % 150));
+    }
+    echo 'Got records ', $start, ' - ', min($start + 150, $limit), ' of ', $limit, PHP_EOL;
+    $start += 150;
+} while ($start < $limit);
+
+// Extract data from data set
+$start = 1;
+while ($start < $limit) {
+    echo 'Processing ', $start, ' - ', min($start + 150, $limit), ' of ', $limit, PHP_EOL;
+
+    $file = __DIR__ . '/' . $start . '.html';
+    $contents = file_get_contents($file);
+    $contents = tidy_repair_string($contents);
+    libxml_use_internal_errors(true);
+    $doc = new DOMDocument;
+    $doc->loadHTML($contents);
+    libxml_clear_errors();
+    $xpath = new DOMXPath($doc);
+
+    $cocktails = $xpath->query('//li/a');
+    $db->beginTransaction();
+    foreach ($cocktails as $cocktail) {
+        $name = $cocktail->nodeValue;
+        $name = preg_replace('/ The$|^The |\s*\([^)]+\)\s*| #[0-9]+$/', '', $name);
+        $name = html_entity_decode($name);
+        $link = 'http://www.webtender.com' . $cocktail->getAttribute('href');
+        $insert->execute(array($name, $link));
+    }
+    $db->commit();
+
+    $start += 150;
+}
+
+// Clean up
+echo 'Cleaning up', PHP_EOL;
+$start = 1;
+while ($start < $limit) {
+    $file = __DIR__ . '/' . $start . '.html';
+    unlink($file);
+    $start += 150;
+}
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Cookie.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Cookie.php
new file mode 100644
index 0000000000..4bc2ceecbc
--- /dev/null
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Cookie.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ * Phergie
+ *
+ * PHP version 5
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.
+ * It is also available through the world-wide-web at this URL:
+ * http://phergie.org/license
+ *
+ * @category  Phergie
+ * @package   Phergie_Plugin_Cookie
+ * @author    Phergie Development Team <team@phergie.org>
+ * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
+ * @license   http://phergie.org/license New BSD License
+ * @link      http://pear.phergie.org/package/Phergie_Plugin_Cookie
+ */
+
+/**
+ * Processes requests to serve users cookies.
+ *
+ * @category Phergie
+ * @package  Phergie_Plugin_Cookie
+ * @author   Phergie Development Team <team@phergie.org>
+ * @license  http://phergie.org/license New BSD License
+ * @link     http://pear.phergie.org/package/Phergie_Plugin_Cookie
+ * @uses     Phergie_Plugin_Command pear.phergie.org
+ * @uses     Phergie_Plugin_Serve pear.phergie.org
+ */
+class Phergie_Plugin_Cookie extends Phergie_Plugin_Abstract
+{
+    /**
+     * Checks for dependencies.
+     *
+     * @return void
+     */
+    public function onLoad()
+    {
+        $plugins = $this->plugins;
+        $plugins->getPlugin('Command');
+        $plugins->getPlugin('Serve');
+    }
+
+    /**
+     * Processes requests to serve a user a cookie.
+     *
+     * @param string $request Request including the target and an optional
+     *        suggestion of what cookie to serve
+     *
+     * @return void
+     */
+    public function onCommandCookie($request)
+    {
+        $format = $this->getConfig(
+            'cookie.format',
+            'throws %target% %article% %item%.'
+        );
+
+        $this->plugins->getPlugin('Serve')->serve(
+            dirname(__FILE__) . '/Cookie/cookie.db',
+            'cookies',
+            $format,
+            $request
+        );
+    }
+}
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Cookie/db.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Cookie/db.php
new file mode 100644
index 0000000000..4b3d29c53e
--- /dev/null
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Cookie/db.php
@@ -0,0 +1,49 @@
+<?php
+
+if (!defined('__DIR__')) {
+    define('__DIR__', dirname(__FILE__));
+}
+
+// Create database schema
+echo 'Creating database', PHP_EOL;
+$file = __DIR__ . '/cookie.db';
+if (file_exists($file)) {
+    unlink($file);
+}
+$db = new PDO('sqlite:' . $file);
+$db->exec('CREATE TABLE cookies (name VARCHAR(255), link VARCHAR(255))');
+$db->exec('CREATE UNIQUE INDEX cookie_name ON cookies (name)');
+$insert = $db->prepare('INSERT INTO cookies (name, link) VALUES (:name, :link)');
+
+// Get Cookies list from http://en.wikipedia.org/wiki/List_of_cookies
+echo 'Downloading data from Wikipedia', PHP_EOL;
+$file = __DIR__ . '/cookieslist.txt';
+if (!file_exists($file)) {
+    copy('http://en.wikipedia.org/wiki/List_of_cookies', $file);
+}
+$contents = file_get_contents($file);
+
+// Extract data from data set
+echo 'Processing Wikipedia\'s cookies list', PHP_EOL;
+$contents = tidy_repair_string($contents);
+libxml_use_internal_errors(true);
+$doc = new DOMDocument;
+$doc->loadHTML($contents);
+libxml_clear_errors();
+$xpath = new DOMXPath($doc);
+
+$cookies = $xpath->query('//table[@width="90%"]/tr/td[1]/a');
+
+foreach ($cookies as $cookie) {
+    
+    $name = str_replace(array('(',')',"\n", 'cookies'), array('','', ' ', 'cookie' ), trim( $cookie->textContent));
+
+    $link =  'http://en.wikipedia.org' . $cookie->getAttribute('href');
+    $insert->execute(array($name, $link));
+    print 'added ['.$name.'] -> '. $link . PHP_EOL;
+}
+
+// Clean up
+echo 'Cleaning up', PHP_EOL;
+unlink($file);
+
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Karma.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Karma.php
new file mode 100644
index 0000000000..b7ce48685a
--- /dev/null
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Karma.php
@@ -0,0 +1,447 @@
+<?php
+/**
+ * Phergie
+ *
+ * PHP version 5
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.
+ * It is also available through the world-wide-web at this URL:
+ * http://phergie.org/license
+ *
+ * @category  Phergie
+ * @package   Phergie_Plugin_Karma
+ * @author    Phergie Development Team <team@phergie.org>
+ * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
+ * @license   http://phergie.org/license New BSD License
+ * @link      http://pear.phergie.org/package/Phergie_Plugin_Karma
+ */
+
+/**
+ * Handles requests for incrementation or decrementation of a maintained list
+ * of counters for specified terms and antithrottling to prevent extreme
+ * inflation or depression of counters by any single individual.
+ *
+ * @category Phergie
+ * @package  Phergie_Plugin_Karma
+ * @author   Phergie Development Team <team@phergie.org>
+ * @license  http://phergie.org/license New BSD License
+ * @link     http://pear.phergie.org/package/Phergie_Plugin_Karma
+ */
+class Phergie_Plugin_Karma extends Phergie_Plugin_Abstract
+{
+    /**
+     * Stores the SQLite object
+     *
+     * @var resource
+     */
+    protected $db = null;
+
+    /**
+     * Retains the last garbage collection date
+     *
+     * @var array
+     */
+    protected $lastGc = null;
+
+    /**
+     * Logs the karma usages and limits users to one karma change per word
+     * and per day
+     *
+     * @return void
+     */
+    protected $log = array();
+
+    /**
+     * Some fixed karma values, keys must be lowercase
+     *
+     * @var array
+     */
+    protected $fixedKarma;
+
+    /**
+     * A list of blacklisted values
+     *
+     * @var array
+     */
+    protected $karmaBlacklist;
+
+    /**
+     * Answers for correct assertions
+     */
+    protected $positiveAnswers;
+
+    /**
+     * Answers for incorrect assertions
+     */
+    protected $negativeAnswers;
+
+    /**
+     * Prepared PDO statements
+     *
+     * @var PDOStatement
+     */
+    protected $insertKarma;
+    protected $updateKarma;
+    protected $fetchKarma;
+    protected $insertComment;
+
+    /**
+     * Connects to the database containing karma ratings and initializes
+     * class properties.
+     *
+     * @return void
+     */
+    public function onLoad()
+    {
+        $this->db = null;
+        $this->lastGc = null;
+        $this->log = array();
+
+        if(!defined('M_EULER')) {
+            define('M_EULER', '0.57721566490153286061');
+        }
+
+        $this->fixedKarma = array(
+            'phergie'      => '%s has karma of awesome',
+            'pi'           => '%s has karma of ' . M_PI,
+            'Î '            => '%s has karma of ' . M_PI,
+            'Ï€'            => '%s has karma of ' . M_PI,
+            'chucknorris'  => '%s has karma of Warning: Integer out of range',
+            'chuck norris' => '%s has karma of Warning: Integer out of range',
+            'c'            => '%s has karma of 299 792 458 m/s',
+            'e'            => '%s has karma of ' . M_E,
+            'euler'        => '%s has karma of ' . M_EULER,
+            'mole'         => '%s has karma of 6.02214e23 molecules',
+            'avogadro'     => '%s has karma of 6.02214e23 molecules',
+            'spoon'        => '%s has no karma. There is no spoon',
+            'mc^2'         => '%s has karma of E',
+            'mc2'          => '%s has karma of E',
+            'mc²'          => '%s has karma of E',
+            'i'            => '%s haz big karma',
+            'karma' => 'The karma law says that all living creatures are responsible for their karma - their actions and the effects of their actions. You should watch yours.'
+        );
+
+        $this->karmaBlacklist = array(
+            '*',
+            'all',
+            'everything'
+        );
+
+        $this->positiveAnswers = array(
+            'No kidding, %owner% totally kicks %owned%\'s ass !',
+            'True that.',
+            'I concur.',
+            'Yay, %owner% ftw !',
+            '%owner% is made of WIN!',
+            'Nothing can beat %owner%!',
+        );
+
+        $this->negativeAnswers = array(
+            'No sir, not at all.',
+            'You\'re wrong dude, %owner% wins.',
+            'I\'d say %owner% is better than %owned%.',
+            'You must be joking, %owner% ftw!',
+            '%owned% is made of LOSE!',
+            '%owned% = Epic Fail',
+        );
+
+        // Load or initialize the database
+        $class = new ReflectionClass(get_class($this));
+        $dir = dirname($class->getFileName() . '/' . $this->name);
+        $this->db = new PDO('sqlite:' . $dir . 'karma.db');
+
+        // Check to see if the table exists
+        $table = $this->db->query('
+            SELECT COUNT(*)
+            FROM sqlite_master
+            WHERE name = ' . $this->db->quote('karmas')
+        )->fetchColumn();
+
+        // Create database tables if necessary
+        if (!$table) {
+            $this->db->query('
+                CREATE TABLE karmas ( word VARCHAR ( 255 ), karma MEDIUMINT );
+                CREATE UNIQUE INDEX word ON karmas ( word );
+                CREATE INDEX karmaIndex ON karmas ( karma );
+                CREATE TABLE comments ( wordid INT , comment VARCHAR ( 255 ) );
+                CREATE INDEX wordidIndex ON comments ( wordid );
+                CREATE UNIQUE INDEX commentUnique ON comments ( comment );
+            ');
+        }
+
+        $this->insertKarma = $this->db->prepare('
+            INSERT INTO karmas (
+                word,
+                karma
+            )
+            VALUES (
+                :word,
+                :karma
+            )
+        ');
+
+        $this->insertComment = $this->db->prepare('
+            INSERT INTO comments (
+                wordid,
+                comment
+            )
+            VALUES (
+                :wordid,
+                :comment
+            )
+        ');
+
+        $this->fetchKarma = $this->db->prepare('
+            SELECT karma, ROWID id FROM karmas WHERE LOWER(word) = LOWER(:word) LIMIT 1
+        ');
+
+        $this->updateKarma = $this->db->prepare('
+            UPDATE karmas SET karma = :karma WHERE LOWER(word) = LOWER(:word)
+        ');
+    }
+
+    /**
+     * Checks for dependencies.
+     *
+     * @return void
+     */
+    public static function onLoad()
+    {
+    	if (!extension_loaded('PDO') || !extension_loaded('pdo_sqlite')) {
+            $this->fail('PDO and pdo_sqlite extensions must be installed');
+    	}
+    }
+
+    /**
+     * Handles requests for incrementation, decrementation, or lookup of karma
+     * ratings sent via messages from users.
+     *
+     * @return void
+     */
+    public function onPrivmsg()
+    {
+        $source = $this->event->getSource();
+        $message = $this->event->getArgument(1);
+        $target = $this->event->getNick();
+
+        // Command prefix check
+        $prefix = preg_quote(trim($this->getConfig('command.prefix')));
+        $bot = preg_quote($this->getConfig('connections.nick'));
+        $exp = '(?:(?:' . $bot . '\s*[:,>]?\s+(?:' . $prefix . ')?)|(?:' . $prefix . '))';
+
+        // Karma status request
+        if (preg_match('#^' . $exp . 'karma\s+(.+)$#i', $message, $m)) {
+            // Return user's value if "me" is requested
+            if (strtolower($m[1]) === 'me') {
+                $m[1] = $target;
+            }
+            // Clean the term
+            $term = $this->doCleanWord($m[1]);
+
+            // Check the blacklist
+            if (is_array($this->karmaBlacklist) && in_array($term, $this->karmaBlacklist)) {
+                $this->doNotice($target, $term . ' is blacklisted');
+                return;
+            }
+
+            // Return fixed value if set
+            if (isset($this->fixedKarma[$term])) {
+                $this->doPrivmsg($source, $target . ': ' . sprintf($this->fixedKarma[$term], $m[1]) . '.');
+                return;
+            }
+
+            // Return current karma or neutral if not set yet
+            $this->fetchKarma->execute(array(':word'=>$term));
+            $res = $this->fetchKarma->fetch(PDO::FETCH_ASSOC);
+
+            // Sanity check if someone if someone prefixed their conversation with karma
+            if (!$res && substr_count($term, ' ') > 1 && !(substr($m[1], 0, 1) === '(' && substr($m[1], -1) === ')')) {
+                return;
+            }
+
+            // Clean the raw term if it was contained within brackets
+            if (substr($m[1], 0, 1) === '(' && substr($m[1], -1) === ')') {
+                $m[1] = substr($m[1], 1, -1);
+            }
+
+            if ($res && $res['karma'] != 0) {
+                $this->doPrivmsg($source, $target . ': ' . $m[1] . ' has karma of ' . $res['karma'] . '.');
+            } else {
+                $this->doPrivmsg($source, $target . ': ' . $m[1] . ' has neutral karma.');
+            }
+        // Incrementation/decrementation request
+        } elseif (preg_match('{^' . $exp . '?(?:(\+{2,2}|-{2,2})(\S+?|\(.+?\)+)|(\S+?|\(.+?\)+)(\+{2,2}|-{2,2}))(?:\s+(.*))?$}ix', $message, $m)) {
+            if (!empty($m[4])) {
+                $m[1] = $m[4]; // Increment/Decrement
+                $m[2] = $m[3]; // Word
+            }
+            $m[3] = (isset($m[5]) ? $m[5] : null); // Comment
+            unset($m[4], $m[5]);
+            list(, $sign, $word, $comment) = array_pad($m, 4, null);
+
+            // Clean the word
+            $word = strtolower($this->doCleanWord($word));
+            if (empty($word)) {
+                return;
+            }
+
+            // Do nothing if the karma is fixed or blacklisted
+            if (isset($this->fixedKarma[$word]) ||
+                is_array($this->karmaBlacklist) && in_array($word, $this->karmaBlacklist)) {
+                return;
+            }
+
+            // Force a decrementation if someone tries to update his own karma
+            if ($word == strtolower($target) && $sign != '--' && !$this->fromAdmin(true)) {
+                $this->doNotice($target, 'Bad ' . $target . '! You can not modify your own Karma. Shame on you!');
+                $sign = '--';
+            }
+
+            // Antithrottling check
+            $host = $this->event->getHost();
+            $limit = $this->getConfig('karma.limit');
+            // This is waiting on the Acl plugin from Elazar, being bypassed for now
+            //if ($limit > 0 && !$this->fromAdmin()) {
+            if ($limit > 0) {
+                if (isset($this->log[$host][$word]) && $this->log[$host][$word] >= $limit) {
+                    // Three strikes, you're out, so lets decrement their karma for spammage
+                    if ($this->log[$host][$word] == ($limit+3)) {
+                        $this->doNotice($target, 'Bad ' . $target . '! Didn\'t I tell you that you reached your limit already?');
+                        $this->log[$host][$word] = $limit;
+                        $word = $target;
+                        $sign = '--';
+                    // Toss a notice to the user if they reached their limit
+                    } else {
+                        $this->doNotice($target, 'You have currently reached your limit in modifying ' . $word . ' for this day, please wait a bit.');
+                        $this->log[$host][$word]++;
+                        return;
+                    }
+                } else {
+                    if (isset($this->log[$host][$word])) {
+                        $this->log[$host][$word]++;
+                    } else {
+                        $this->log[$host][$word] = 1;
+                    }
+                }
+            }
+
+            // Get the current value then update or create entry
+            $this->fetchKarma->execute(array(':word'=>$word));
+            $res = $this->fetchKarma->fetch(PDO::FETCH_ASSOC);
+            if ($res) {
+                $karma = ($res['karma'] + ($sign == '++' ? 1 : -1));
+                $args = array(
+                    ':word' => $word,
+                    ':karma' => $karma
+                );
+                $this->updateKarma->execute($args);
+            } else {
+                $karma = ($sign == '++' ? '1' : '-1');
+                $args = array(
+                    ':word' => $word,
+                    ':karma' => $karma
+                );
+                $this->insertKarma->execute($args);
+                $this->fetchKarma->execute(array(':word'=>$word));
+                $res = $this->fetchKarma->fetch(PDO::FETCH_ASSOC);
+            }
+            $id = $res['id'];
+            // Add comment
+            $comment = preg_replace('{(?:^//(.*)|^#(.*)|^/\*(.*?)\*/$)}', '$1$2$3', $comment);
+            if (!empty($comment)) {
+                $this->insertComment->execute(array(':wordid' => $id, ':comment' => $comment));
+            }
+            // Perform garbage collection on the antithrottling log if needed
+            if (date('d') !== $this->lastGc) {
+                $this->doGc();
+            }
+        // Assertion request
+        } elseif (preg_match('#^' . $exp . '?([^><]+)(<|>)([^><]+)$#', $message, $m)) {
+            // Trim words
+            $word1 = strtolower($this->doCleanWord($m[1]));
+            $word2 = strtolower($this->doCleanWord($m[3]));
+            $operator = $m[2];
+
+            // Do nothing if the karma is fixed
+            if (isset($this->fixedKarma[$word1]) || isset($this->fixedKarma[$word2]) ||
+                empty($word1) || empty($word2)) {
+                return;
+            }
+
+            // Fetch first word
+            if ($word1 === '*' || $word1 === 'all' || $word1 === 'everything') {
+                $res = array('karma' => 0);
+                $word1 = 'everything';
+            } else {
+                $this->fetchKarma->execute(array(':word'=>$word1));
+                $res = $this->fetchKarma->fetch(PDO::FETCH_ASSOC);
+            }
+            // If it exists, fetch second word
+            if ($res) {
+                if ($word2 === '*' || $word2 === 'all' || $word2 === 'everything') {
+                    $res2 = array('karma' => 0);
+                    $word2 = 'everything';
+                } else {
+                    $this->fetchKarma->execute(array(':word'=>$word2));
+                    $res2 = $this->fetchKarma->fetch(PDO::FETCH_ASSOC);
+                }
+                // If it exists, compare and return value
+                if ($res2 && $res['karma'] != $res2['karma']) {
+                    $assertion = ($operator === '<' && $res['karma'] < $res2['karma']) || ($operator === '>' && $res['karma'] > $res2['karma']);
+                    // Switch arguments if they are in the wrong order
+                    if ($operator === '<') {
+                        $tmp = $word2;
+                        $word2 = $word1;
+                        $word1 = $tmp;
+                    }
+                    $this->doPrivmsg($source, $assertion ? $this->fetchPositiveAnswer($word1, $word2) : $this->fetchNegativeAnswer($word1, $word2));
+                    // If someone asserts that something is greater or lesser than everything, we increment/decrement that something at the same time
+                    if ($word2 === 'everything') {
+                        $this->event = clone$this->event;
+                        $this->event->setArguments(array($this->event->getArgument(0), '++'.$word1));
+                        $this->onPrivmsg();
+                    } elseif ($word1 === 'everything') {
+                        $this->event = clone$this->event;
+                        $this->event->setArguments(array($this->event->getArgument(0), '--'.$word2));
+                        $this->onPrivmsg();
+                    }
+                }
+            }
+        }
+    }
+
+    protected function fetchPositiveAnswer($owner, $owned)
+    {
+        return str_replace(array('%owner%','%owned%'), array($owner, $owned), $this->positiveAnswers[array_rand($this->positiveAnswers,1)]);
+    }
+
+    protected function fetchNegativeAnswer($owned, $owner)
+    {
+        return str_replace(array('%owner%','%owned%'), array($owner, $owned), $this->negativeAnswers[array_rand($this->negativeAnswers,1)]);
+    }
+
+    protected function doCleanWord($word)
+    {
+        $word = trim($word);
+        if (substr($word, 0, 1) === '(' && substr($word, -1) === ')') {
+            $word = trim(substr($word, 1, -1));
+        }
+        $word = preg_replace('#\s+#', ' ', strtolower(trim($word)));
+        return $word;
+    }
+
+    /**
+     * Performs garbage collection on the antithrottling log.
+     *
+     * @return void
+     */
+    public function doGc()
+    {
+        unset($this->log);
+        $this->log = array();
+        $this->lastGc = date('d');
+    }
+}
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Serve.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Serve.php
new file mode 100755
index 0000000000..19ecb0c7e4
--- /dev/null
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Serve.php
@@ -0,0 +1,159 @@
+<?php
+/**
+ * Phergie
+ *
+ * PHP version 5
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.
+ * It is also available through the world-wide-web at this URL:
+ * http://phergie.org/license
+ *
+ * @category  Phergie
+ * @package   Phergie_Plugin_Serve
+ * @author    Phergie Development Team <team@phergie.org>
+ * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
+ * @license   http://phergie.org/license New BSD License
+ * @link      http://pear.phergie.org/package/Phergie_Plugin_Serve
+ */
+
+/**
+ * Processes requests to serve a user something from a database.
+ *
+ * @category Phergie
+ * @package  Phergie_Plugin_Serve
+ * @author   Phergie Development Team <team@phergie.org>
+ * @license  http://phergie.org/license New BSD License
+ * @link     http://pear.phergie.org/package/Phergie_Plugin_Serve
+ * @uses     extension pdo
+ * @uses     extension pdo_sqlite
+ */
+class Phergie_Plugin_Serve extends Phergie_Plugin_Abstract
+{
+    /**
+     * Checks for dependencies.
+     *
+     * @return void
+     */
+    public function onLoad()
+    {
+        if (!extension_loaded('PDO') || !extension_loaded('pdo_sqlite')) {
+            $this->fail('PDO and pdo_sqlite extensions must be installed');
+        }
+    }
+
+    /**
+     * Retrieves a random item from the database table.
+     *
+     * @param string $database Path to the SQLite database file
+     * @param string $table    Name of the database table
+     * @param array  $request  Parsed request
+     *
+     * @return object Retrieved item
+     */
+    protected function getItem($database, $table, array $request)
+    {
+        $db = new PDO('sqlite:' . $database);
+        if (!empty($request['suggestion'])) {
+            $query = 'SELECT * FROM ' . $table . ' WHERE name LIKE ? ORDER BY RANDOM() LIMIT 1';
+            $stmt = $db->prepare($query);
+            $stmt->execute(array('%' . $request['suggestion'] . '%'));
+            $item = $stmt->fetchObject();
+            if (!$item) {
+                $item = new stdClass;
+                $item->name = $request['suggestion'];
+                $item->link = null;
+            }
+        } else {
+            $query = 'SELECT * FROM ' . $table . ' ORDER BY RANDOM() LIMIT 1';
+            $stmt = $db->query($query);
+            $item = $stmt->fetchObject();
+        }
+        return $item;
+    }
+
+    /**
+     * Processes a request to serve a user something.
+     *
+     * @param string $database Path to the SQLite database file
+     * @param string $table    Name of the database table
+     * @param string $format   Format of the response where %target%,
+     *        %item%, %article%', and %link will be replaced with their
+     *        respective data
+     * @param string $request  Request string including the target and an
+     *        optional suggestion of the item to fetch
+     * @param boolean $censor  TRUE to integrate with the Censor plugin,
+     *        defaults to FALSE
+     *
+     * @return boolean TRUE if the request was processed successfully, FALSE
+     *         otherwise
+     */
+    public function serve($database, $table, $format, $request, $censor = false)
+    {
+        // Parse the request
+        $result = preg_match(
+            '/(?P<target>[^\s]+)(\s+an?\s+)?(?P<suggestion>.*)?/',
+            $request,
+            $match
+        );
+
+        if (!$result) {
+            return false;
+        }
+
+        // Resolve the target
+        $target = $match['target'];
+        if ($target == 'me') {
+            $target = $this->event->getNick();
+        }
+
+        // Process the request
+        $item = $this->getItem($database, $table, $match);
+
+        // Reprocess the request for censorship if required
+        $attempts = 0;
+        while ($censor && $attempts < 3) {
+            $plugin = $this->plugins->getPlugin('Censor');
+            $clean = $plugin->cleanString($item->name);
+            if ($item->name != $clean) {
+                $attempts++;
+                $item = $this->getItem($database, $table, $match);
+            } else {
+                $censor = false;
+            }
+        }
+
+        if ($censor && $attempts == 3) {
+            $this->doAction($this->event->getSource(), 'shrugs.');
+        }
+
+        // Derive the proper article for the item
+        if (preg_match('/^[aeiou]/i', $item->name)) {
+            $article = 'an';
+        } else {
+            $article = 'a';
+        }
+
+        // Format the message
+        $replacements = array(
+            'target' => $target,
+            'item' => $item->name,
+            'link' => $item->link,
+            'article' => $article
+        );
+
+        $msg = $format;
+        foreach ($replacements as $placeholder => $value) {
+            $msg = str_replace(
+                '%' . $placeholder . '%',
+                $value,
+                $msg
+            );
+        }
+
+        // Send the message
+        $this->doAction($this->event->getSource(), $msg);
+    }
+}
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Statusnet.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Statusnet.php
index f0cee28184..3da5fdf4fc 100644
--- a/plugins/Irc/extlib/phergie/Phergie/Plugin/Statusnet.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Statusnet.php
@@ -59,15 +59,8 @@ class Phergie_Plugin_Statusnet extends Phergie_Plugin_Abstract {
             $this->regCallback = NULL;
         }
 
-        $this->unregRegexp = $this->config['statusnet.unregregexp'];
-        if (!$this->unregRegexp) {
-            $this->unregRegexp = '/\x02(.*?)\x02 (?:isn\'t|is not) registered/i';
-        }
-
-        $this->regRegexp = $this->config['statusnet.regregexp'];
-        if (!$this->regRegexp) {
-            $this->regRegexp = '/(?:\A|\x02)(\w+?)\x02? (?:\(account|is \w+?\z)/i';
-        }
+        $this->unregRegexp = $this->getConfig('statusnet.unregregexp', '/\x02(.*?)\x02 (?:isn\'t|is not) registered/i');
+        $this->regRegexp = $this->getConfig('statusnet.regregexp', '/(?:\A|\x02)(\w+?)\x02? (?:\(account|is \w+?\z)/i');
     }
 
     /**
@@ -81,6 +74,10 @@ class Phergie_Plugin_Statusnet extends Phergie_Plugin_Abstract {
             $source = $event->getSource();
             $message = trim($event->getText());
 
+            if ($source == '#statustest') {
+                $this->doPrivmsg('#statustest', "\001Line1\020nLine2");
+            }
+
             call_user_func($this->messageCallback, array('sender' => $source, 'message' => $message));
         }
     }
@@ -103,4 +100,8 @@ class Phergie_Plugin_Statusnet extends Phergie_Plugin_Abstract {
             }
         }
     }
+
+    public function onTick() {
+        echo "\nTICK!\n";
+    }
 }
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Wine.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Wine.php
new file mode 100644
index 0000000000..9aa0845a6a
--- /dev/null
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Wine.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ * Phergie
+ *
+ * PHP version 5
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.
+ * It is also available through the world-wide-web at this URL:
+ * http://phergie.org/license
+ *
+ * @category  Phergie
+ * @package   Phergie_Plugin_Wine
+ * @author    Phergie Development Team <team@phergie.org>
+ * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
+ * @license   http://phergie.org/license New BSD License
+ * @link      http://pear.phergie.org/package/Phergie_Plugin_Wine
+ */
+
+/**
+ * Processes requests to serve users wine.
+ *
+ * @category Phergie
+ * @package  Phergie_Plugin_Wine
+ * @author   Phergie Development Team <team@phergie.org>
+ * @license  http://phergie.org/license New BSD License
+ * @link     http://pear.phergie.org/package/Phergie_Plugin_Wine
+ * @uses     Phergie_Plugin_Command pear.phergie.org
+ * @uses     Phergie_Plugin_Serve pear.phergie.org
+ */
+class Phergie_Plugin_Wine extends Phergie_Plugin_Abstract
+{
+    /**
+     * Checks for dependencies.
+     *
+     * @return void
+     */
+    public function onLoad()
+    {
+        $plugins = $this->plugins;
+        $plugins->getPlugin('Command');
+        $plugins->getPlugin('Serve');
+    }
+
+    /**
+     * Processes requests to serve a user a wine.
+     *
+     * @param string $request Request including the target and an optional
+     *        suggestion of what wine to serve
+     *
+     * @return void
+     */
+    public function onCommandWine($request)
+    {
+        $format = $this->getConfig(
+            'wine.format',
+            'serves %target% a glass of %item%.'
+        );
+
+        $this->plugins->getPlugin('Serve')->serve(
+            dirname(__FILE__) . '/Wine/wine.db',
+            'wine',
+            $format,
+            $request
+        );
+    }
+}
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Wine/db.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Wine/db.php
new file mode 100644
index 0000000000..ce01c2d983
--- /dev/null
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Wine/db.php
@@ -0,0 +1,53 @@
+<?php
+
+// Create database schema
+echo 'Creating database', PHP_EOL;
+$file = __DIR__ . '/wine.db';
+if (file_exists($file)) {
+    unlink($file);
+}
+$db = new PDO('sqlite:' . $file);
+$db->exec('CREATE TABLE wine (name VARCHAR(255), link VARCHAR(255))');
+$db->exec('CREATE UNIQUE INDEX wine_name ON wine (name)');
+$insert = $db->prepare('INSERT INTO wine (name, link) VALUES (:name, :link)');
+
+// Get and decompress lcboapi.com data set
+$outer = __DIR__ . '/current.zip';
+if (!file_exists($outer)) {
+    echo 'Downloading lcboapi.com data set', PHP_EOL;
+    copy('http://lcboapi.com/download/current.zip', $outer);
+}
+
+echo 'Decompressing lcboapi.com data set', PHP_EOL;
+$zip = new ZipArchive;
+$zip->open($outer);
+$stat = $zip->statIndex(0);
+$inner = __DIR__ . '/' . $stat['name'];
+$zip->extractTo(__DIR__);
+$zip->close();
+$zip = new ZipArchive;
+$zip->open($inner);
+$stat = $zip->statIndex(0);
+$file = __DIR__ . '/' . $stat['name'];
+$zip->extractTo(__DIR__);
+$zip->close();
+
+// Aggregate data set into the database
+$lcbo = new PDO('sqlite:' . $file);
+$result = $lcbo->query('SELECT product_no, name FROM products WHERE primary_category = "Wine"');
+$wines = $result->fetchAll();
+echo 'Processing lcboapi.com data - ', number_format(count($wines), 0), ' records', PHP_EOL;
+$db->beginTransaction();
+foreach ($wines as $wine) {
+    $name = $wine['name'];
+    $link = 'http://lcboapi.com/products/' . $wine['product_no'];
+    $insert->execute(array($name, $link));
+}
+$db->commit();
+
+// Clean up
+echo 'Cleaning up', PHP_EOL;
+unset($lcbo);
+unlink($outer);
+unlink($inner);
+unlink($file);
diff --git a/plugins/Irc/extlib/phergie/Phergie/Process/Async.php b/plugins/Irc/extlib/phergie/Phergie/Process/Async.php
index 4946152bb3..e553ad5a82 100644
--- a/plugins/Irc/extlib/phergie/Phergie/Process/Async.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Process/Async.php
@@ -37,14 +37,14 @@ class Phergie_Process_Async extends Phergie_Process_Abstract
      *
      * @var int
      */
-    protected $sec;
+    protected $sec = 0;
 
     /**
      * Length of time to poll for stream activity (microseconds)
      *
      * @var int
      */
-    protected $usec;
+    protected $usec = 200000;
 
     /**
      * Length of time to wait between ticks.
@@ -87,7 +87,7 @@ class Phergie_Process_Async extends Phergie_Process_Abstract
             }
         }
 
-        if (isset($this->sec) && isset($this->usec)) {
+        if (!isset($this->sec) && !isset($this->usec)) {
             throw new Phergie_Process_Exception(
                 'One of the processor options "sec" or "usec" must be specified'
             );
diff --git a/plugins/Irc/extlib/phergie/Phergie/StatusnetBot.php b/plugins/Irc/extlib/phergie/Phergie/StatusnetBot.php
index 5fe65444b1..9c1b3a6f18 100644
--- a/plugins/Irc/extlib/phergie/Phergie/StatusnetBot.php
+++ b/plugins/Irc/extlib/phergie/Phergie/StatusnetBot.php
@@ -62,7 +62,7 @@ class Phergie_StatusnetBot extends Phergie_Bot {
     *
     * @return void
     */
-    public function receive() {
+    public function handleEvents() {
         $this->getProcessor()->handleEvents();
     }
 
diff --git a/plugins/Irc/ircmanager.php b/plugins/Irc/ircmanager.php
index 8c04da68fc..933cc03878 100644
--- a/plugins/Irc/ircmanager.php
+++ b/plugins/Irc/ircmanager.php
@@ -64,6 +64,19 @@ class IrcManager extends ImManager {
         }
     }
 
+    /**
+     * Idle processing for io manager's execution loop.
+     * Send keepalive pings to server.
+     *
+     * @return void
+     */
+    public function idle() {
+        // Call Phergie's doTick methods if necessary
+        echo "BEGIN IDLE\n";
+        $this->conn->handleEvents();
+        echo "END IDLE\n";
+    }
+
     /**
      * Process IRC events that have come in over the wire.
      *
@@ -73,7 +86,7 @@ class IrcManager extends ImManager {
     public function handleInput($socket) {
         common_log(LOG_DEBUG, 'Servicing the IRC queue.');
         $this->stats('irc_process');
-        $this->conn->receive();
+        $this->conn->handleEvents();
     }
 
     /**
@@ -91,7 +104,7 @@ class IrcManager extends ImManager {
                     'connections' => array(
                         array(
                             'host' => $this->plugin->host,
-                            'port' => $port,
+                            'port' => $this->plugin->port,
                             'username' => $this->plugin->username,
                             'realname' => $this->plugin->realname,
                             'nick' => $this->plugin->nick,
@@ -104,7 +117,7 @@ class IrcManager extends ImManager {
                     'driver' => 'statusnet',
 
                     'processor' => 'async',
-                    'processor.options' => array('usec' => 0),
+                    'processor.options' => array('sec' => 0, 'usec' => 0),
 
                     'plugins' => array(
                         'Pong',
@@ -118,9 +131,14 @@ class IrcManager extends ImManager {
                     'ui.enabled' => true,
 
                     'nickserv.password' => $this->plugin->nickservpassword,
+                    'nickserv.identify_message' => $this->plugin->nickservidentifyregexp,
+
                     'autojoin.channels' => $this->plugin->channels,
+
                     'statusnet.messagecallback' => array($this, 'handle_irc_message'),
-                    'statusnet.regcallback' => array($this, 'handle_reg_response')
+                    'statusnet.regcallback' => array($this, 'handle_reg_response'),
+                    'statusnet.unregregexp' => $this->plugin->unregregexp,
+                    'statusnet.regregexp' => $this->plugin->regregexp
                 )
             );
 
@@ -215,8 +233,12 @@ class IrcManager extends ImManager {
             $this->regchecksLookup[$usernick] = $screenname;
         }
 
+        $args = $data['data']['args'];
+        $lines = explode("\n", $args[1]);
         try {
-            $this->conn->send($data['data']['command'], $data['data']['args']);
+            foreach ($lines as $line) {
+                $this->conn->send($data['data']['command'], array($args[0], $line));
+            }
         } catch (Phergie_Driver_Exception $e) {
             $this->conn->reconnect();
             return false;

From 82f44c5fa0507211d78ef1ef535a81bb5b01573d Mon Sep 17 00:00:00 2001
From: Luke Fitzgerald <lw.fitzgerald@googlemail.com>
Date: Mon, 26 Jul 2010 11:14:18 -0700
Subject: [PATCH 130/655] Fix typo

---
 plugins/Msn/msnmanager.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/Msn/msnmanager.php b/plugins/Msn/msnmanager.php
index 6fc8f1556f..daafced3b4 100644
--- a/plugins/Msn/msnmanager.php
+++ b/plugins/Msn/msnmanager.php
@@ -139,7 +139,7 @@ class MsnManager extends ImManager {
      * @return void
      */
     public function update_ping_time($data) {
-        $pingInterval = $data;
+        $this->pingInterval = $data;
     }
 
     /**

From e911480587f4d86102a4a428b9f532c12ac23945 Mon Sep 17 00:00:00 2001
From: Luke Fitzgerald <lw.fitzgerald@googlemail.com>
Date: Mon, 26 Jul 2010 11:21:11 -0700
Subject: [PATCH 131/655] Add timeout method to force call of idle to send ping

---
 plugins/Msn/msnmanager.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/plugins/Msn/msnmanager.php b/plugins/Msn/msnmanager.php
index daafced3b4..b62bbd7ad8 100644
--- a/plugins/Msn/msnmanager.php
+++ b/plugins/Msn/msnmanager.php
@@ -76,6 +76,14 @@ class MsnManager extends ImManager {
         }
     }
 
+    /**
+     * Message pump is triggered on socket input, so we only need an idle()
+     * call often enough to trigger our outgoing pings.
+     */
+    function timeout() {
+        return $this->pingInterval;
+    }
+
     /**
      * Process MSN events that have come in over the wire.
      *

From 3c1d7d81cf76fbd358885ed4ec540871236072f8 Mon Sep 17 00:00:00 2001
From: Luke Fitzgerald <lw.fitzgerald@googlemail.com>
Date: Mon, 26 Jul 2010 12:25:23 -0700
Subject: [PATCH 132/655] Remove some testing/debugging code

---
 plugins/Irc/extlib/phergie/Phergie/Plugin/Statusnet.php | 4 ----
 plugins/Irc/ircmanager.php                              | 4 ++--
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Statusnet.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Statusnet.php
index 3da5fdf4fc..41995ee358 100644
--- a/plugins/Irc/extlib/phergie/Phergie/Plugin/Statusnet.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Statusnet.php
@@ -100,8 +100,4 @@ class Phergie_Plugin_Statusnet extends Phergie_Plugin_Abstract {
             }
         }
     }
-
-    public function onTick() {
-        echo "\nTICK!\n";
-    }
 }
diff --git a/plugins/Irc/ircmanager.php b/plugins/Irc/ircmanager.php
index 933cc03878..8042ae24c2 100644
--- a/plugins/Irc/ircmanager.php
+++ b/plugins/Irc/ircmanager.php
@@ -64,6 +64,8 @@ class IrcManager extends ImManager {
         }
     }
 
+
+
     /**
      * Idle processing for io manager's execution loop.
      * Send keepalive pings to server.
@@ -72,9 +74,7 @@ class IrcManager extends ImManager {
      */
     public function idle() {
         // Call Phergie's doTick methods if necessary
-        echo "BEGIN IDLE\n";
         $this->conn->handleEvents();
-        echo "END IDLE\n";
     }
 
     /**

From dd882be8032a6fdd70e5a943abe78cdd7e34f49e Mon Sep 17 00:00:00 2001
From: Luke Fitzgerald <lw.fitzgerald@googlemail.com>
Date: Tue, 27 Jul 2010 09:14:07 -0700
Subject: [PATCH 133/655] Merge in Phergie fixes and remove some whitespace

---
 .../extlib/phergie/Phergie/Driver/Streams.php |   8 ++++++++
 .../phergie/Phergie/Plugin/Cookie/db.php      |  17 +++++++++++++----
 .../extlib/phergie/Phergie/Plugin/Tld/db.php  | Bin 1740 -> 47104 bytes
 plugins/Irc/ircmanager.php                    |   2 --
 4 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/plugins/Irc/extlib/phergie/Phergie/Driver/Streams.php b/plugins/Irc/extlib/phergie/Phergie/Driver/Streams.php
index 9f9e2585d2..ed64bba2ac 100755
--- a/plugins/Irc/extlib/phergie/Phergie/Driver/Streams.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Driver/Streams.php
@@ -219,6 +219,14 @@ class Phergie_Driver_Streams extends Phergie_Driver_Abstract
      */
     public function getEvent()
     {
+        // Check the socket is still active
+        if (feof($this->socket)) {
+            throw new Phergie_Driver_Exception(
+                'EOF detected on socket',
+                Phergie_Driver_Exception::ERR_CONNECTION_READ_FAILED
+            );
+        }
+
         // Check for a new event on the current connection
         $buffer = fgets($this->socket, 512);
         if ($buffer === false) {
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Cookie/db.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Cookie/db.php
index 4b3d29c53e..91d375ca6d 100644
--- a/plugins/Irc/extlib/phergie/Phergie/Plugin/Cookie/db.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Cookie/db.php
@@ -35,15 +35,24 @@ $xpath = new DOMXPath($doc);
 $cookies = $xpath->query('//table[@width="90%"]/tr/td[1]/a');
 
 foreach ($cookies as $cookie) {
-    
-    $name = str_replace(array('(',')',"\n", 'cookies'), array('','', ' ', 'cookie' ), trim( $cookie->textContent));
+    $name = $cookie->textContent;
+    foreach (range(0, mb_strlen($name) - 1) as $index) {
+        echo mb_strcut($name, $index, 1), PHP_EOL;
+    }
+    $name = str_replace(
+        array('(',')',"\n", 'cookies'),
+        array('','', ' ', 'cookie'),
+        $name
+    );
+    $name = iconv('UTF-8', 'ISO-8859-1//TRANSLIT', $name);
+    $name = trim($name);
+    $name = rtrim($name, 's');
 
     $link =  'http://en.wikipedia.org' . $cookie->getAttribute('href');
     $insert->execute(array($name, $link));
-    print 'added ['.$name.'] -> '. $link . PHP_EOL;
+    echo 'added [' . $name . '] -> '. $link . PHP_EOL;
 }
 
 // Clean up
 echo 'Cleaning up', PHP_EOL;
 unlink($file);
-
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Tld/db.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Tld/db.php
index 28f963ad108b859cda1911ab57744c2224516c4d..364d9a09f86b340b0610cf1e5fd135d92105840f 100644
GIT binary patch
literal 47104
zcmeHw3v?UTdFDLC*p4l~WZ72y8by&rNF*g$*3*_`5Clnx1W6H)WJ$4|0Wbtd1TfG%
zD1(mU%nZ_|Y0`GPZBLryv`yk9wOc!G8*l9-ZPHbmZM$99**)7Ro3_z5P1Bw>yX`*O
z)9r3|zyHn*Fqe9m4^Zl!V;pHn&g0IVd;j<S=0ontsBUY@lwnp?TiGeB5=2pWR8a&$
z8WQ-Ah(GCn^ojo-?Yrd9)z~Y_&kFeW*5|DecxwdOBk-(v-Cb+eh^}U<g^FfZO86(G
zCez7$TFEE-N7D*+DBW*Y!Vmp*EIFAPPEK||xINL+KG3LZmp)R`tfHycZQZD~PuR69
z!7fd7p)XtIw^5J!<bRa^PX1f@ujTK{e=7g6d|v+d^6$%Em%l21QT~GblKhMEr{qt_
zKO_Hy{2{q1zfXQjHsy*uCBH{LDd*)ed06h3ACY&<+vP3tyX5=jyXD*En}Vj>5B%0|
zZ;ik|%Ms{p_M=}t&Ar%eZEnMMOLHT(iRRtdb~kUrcC-IJY&ZFJY&ZHPY~SS{!*+w8
z#`c~59&Fe9J=iM#1K2*`--hk|zJ%?4o{8<fUIE*Cyd1Xg@W{ii^XQIudt0%+%ex=j
zJH0!wUF+S5?HwLA!W!4Y_I7s)+uPj7u)WnijO{J%L2Pe!d$C>Z-iPf??ycC~=&r){
z?G83Kl(D(~I5yV}WAiq;Sr^@F)xFrrtI0R77J3BPmruy6q@R=~r8~qw75{}eCEg``
zUHEAnYJJM9yKdX)?o!R7;nZxi(OWc1TGA|QHCwN#*~xS&lTx~~dQG=%&D0I0q$!hH
zMJ>YgXqJ+GitRNut0!etH50p)Obz>L><qP{G?bK6v5myGn^xVnaY#MG-KS>b#<pHm
zvxaReYOSOsEz2nCs;yb$H&V~KRD-{wY*f@iwdhnzD!PJy=^8pat(v;3lvL$tO`p|F
zOJ_%uWy8W_OdHCWW*gbJQ-h*fi#Lb^)0$bqtt};qXRcH<D{8}TD8`hMpVsK|i_S{i
zfCqY5t;SnRnpLf)tHB6pwvxlMXm(@#`ruJ2+_{y4igVKyt!SG@O)s+NpFoc>Y8cF_
zgMBKQc=XJ%rwvm_hkBLdNP1%Xb+~s%)w%X+We43?hYSor4gIjG_sMYYBX7eMs#@l+
zu=TQ|vitU{X2B_`M~8DsC0Cp_j0#<y)k=C%uW1LnaJ8mRaaT{3r||&jZY>ZGlMUCr
zp3|IW^7U0+Yaehks%9Ei9S>xfS}CcUy|$^=u*0+!y;gE8$X_sGS|mjD_-cjCb6&$p
z%^Mc9S5qBZKjUahcP^7pDw(mAax|Ar<YXH1)haG&%QYs})*xf1T2Rte-6S!)s9A`2
z*{P_uf#+$Ddv|^^ndp`<4Exklyv<~-WSFKJ{!qf^o)+o$kE=!QRI8}fEb`eIizE(G
zb=ELv@T@_oPDfIhH_cSKlPP7usH%F6x`RPB8;RmJLrGCc!6xjuZel<z3#ZO&HbMG-
zi*QJgUzXo1_eg&z{jBt~l$7oj|E+jb_+P>s!UqKvhcEY0?!{9k3e)kf_p8$;I@6CB
zW;8Xv@gAJ9v%m>czf&ob5(eGX%)b7i!FS*^r@%=~zhln8uqcD7WelW8hce0l9;3|U
z9CAOT)ijePyfr46+U|8U>;-Nr`?X40cd7$pIi)|X%+8(Nrdox{iMwgo*A=)K>Q`&!
z3XFv{9hXy5G-XpXUomBCpRVMzqKPODPi1TNUDWh=p}-G|Sx`%c#p@jD677xOE?qQg
zMiok)oSIT~(_(Wtpv`I(qfWYdkr-NJ%Ixtw>8@P`mAk89!Emq^hBb3eD;u*I($H$z
zdV?NHk7TOIM9PGI9L;A^i4AKpmfO_1czek?4IS1`t2G!dQyt6gy#ptmP@m#XB8d$J
z*E;usz+$rPj9Rx$tqku_E8n{YSFTsja#xy8LCvM}$;pRr$I&NMhdWAYuU2%mPjw=Z
zPnN38;Xpx2C%RQ<AeqSDMniFnYF~7<u8w6=eaSq8hCC1K?lH|gt5$5MR<;xe-R{?H
zQ`ZVsS+lfC#VSs#Q?^p=EA$PI-Ab0JOSN>hWtk?_T5l3N*a)*<Cg9DcFnOW<u^R)1
z%?^y4WwL=mKS%9S--EZ{5wohrbrOydro5)))T*H-bJ1f)nmu;&s<nw{RI?5Zn=)05
zhf}m2QyZ^C7Xk}dfn$dKM=KSW%GgQtcZr<!ln%3D)zzYA1^RzLkiRDXl$?_{zyf?+
z+AIE}_;t|}C&c@O|0aA*IB*&DcUNttaW;ya$feYpT2k3o$Ah#6I(&rS`D4~Hm4Ug$
z-{iD3SS?(wYqgrD)D6c}V7K75Av0vyG!lQS-6Tw3I+N(xf^ke1I5~yR>vLKt=j06G
zp@Mx|5;*%np%EW-98pcj!XUz`8i+KCwn8(sy&LCd3Y>`c8@6>8ot)QpxOe+zcEv2$
zy5Y=1&;mn#bSyKL&gYdeJTBbJwp{-vTv07>qS`<0%yX438wVLD<>FoE&W&heyue8k
z%&=NjEec6e211pxMq_~3L<x^P{4QMdWPyw3`b~9Cub^?7iXqLyq)?>Pn!}o*;1o-*
zs2gbJ69q2f>NhI-tga>zWFan7>Z++KS_M|yQcV+mU=d-3nqy9^sGs|_8ii%p#e6ve
zF$FUaHnZ=Y=-;UV7lQShPEFI50h%pKt*F(*YC*+NG21+2RM9&+VPrineYU{GTm70@
zMbr{0Qsh43hIdpgkjOFPRjumfK%@E;G?p%K0a;Gf5i`MfV>~NbwJ~NOB(*HPT+>R2
z9>DqK!f8$f5bD*&r(hQ#&TuaZxfJ|>SX^w)`|e-0X2+g_K8JB6YtW0388)eic%<L4
z5Mo)@nC9f*Y<e)1#lHRb;f9YFxCjrv6UI!Z5CQglEHn*lus6443H~yO|4$0?D{@-;
z8|fp`xFn0ui8JC(;lB%?7Hr|<Wpw{dci+8t)tY<O!wQB^K@v+rzgp?tgZ`$9oajJA
zjcNgwJvH8zwp?GbFV{D=n?y}6a)OYWh8v>|thACW!ev*Pj^_|W*D%O|*jMWgMMzQb
z6a-8Mcj5M0krR%TioO{}E&6$hSy8%E$t*&e#O{Z1{m~*P59mongJ)6LFYupXY7rP7
zwllG3C$2kQoQcat$}kYqu?R1UE}^aMeas3y{vZv&`XV>MDFYf>+MJm+5Zq<PCVGea
zF>pv>Y{zcT_k>Yt*jjPA#=_n~7{#ZQVZ*6U8xBOT-+;h24(~v}o+)xMT<)xH!_$+`
z&K=L>Q^PE^!CnNB>5>!V8VHFdG5ko&rlTQ#WINhYi(Iq^gIYGm$0qW4GW-^(7kS^h
zK}r<6mAZ`?l_D1fG7*OBN=^liaZ;;0g^FH`qW|DHI|ykY3BOpQ5b%$uC>~AZ`sfy`
zi(J&l`qjf8aX_mYMbi5so-MdhXg1mGvIpo5BsA=Pa&olROO2+ATm+wjd?Vr>(I~(w
zC!$#nq~y}a*lbVOjUJ`6t*{Mtk_kpkA2f58EJ&tj)tU#M#U!-CkQ9s{CQG4PIq;NW
zhKSS`!2t#jYDi(L-57*bpmbZQBh|r>kpAB)3<&Z$c}7;GZ%Uq&mo`X(_=fmN(Z*W9
z1>sjw1sJ%Jx{nXj<9BIX(4B_wK;+r7JdtcNFO-_r5Z|I-6VnY#F9s2Azi!lnKkpgB
z^KH<O<wXf#OXk!{&mcrBsc~bSE;<OJO$zPOC_&(7I+ak!d_0iG*_%sTY>=!_0IH_a
zlbKxp%m8&hQ{t=<(kTR$6oy4YFoCFm!aBIMNVmybVcg;KimH-TOR%#I{3KfqFN0Lr
zHW0<pHjnI#%)XL5<LEVGYYKfjRN@R!bVme>16e2vlq2vyz5O^jRpPA1fL5!j=F9*R
zV#)}^Kz7hDooZhar>9Gt^BFj;!>`$T^fOWr8ld%$;{2^8Zt8~MDb-qIAWb5#4Q)Gw
zQ-+G%5T@o}R9b_RI@yO)dz868tFPW?^c=(m$s!kFr5bg(>}cphv&i=44g?y>We}-p
z6H-j07U;nIzuQkeFa96ZDRe0fJ%TQrEplO4N~IFHW};?QKKBBPP{yLlQwev1gMx|_
z)pMUa_X=EdcXBM5N@N~JLr)jEG$e%_C56FBMnj(o3KEcw2F<u~*swI*O()qvJt@4&
zvHkR*Yl>XJm7*GsGKt%^H02WBEZBwiqqazxQsn87iafk;)!GNtqG8lq>H-%M<O8!P
z0EAUCWJeaHt91y0<mhNBi2n}?@^kX6ya5%!uS!259hO#!UldE?KH+}|uM0mTP?hnL
zpJT__Bb7O8I%H~;0FVc6J<}yjG6J!vbV8v4JPXU;#`2S?#O`Al^`m7je}?Q(L1qLN
zu4Gin@tCvtJFI-bCS$(dbrjd_C}S|%g`6P-bv3q$<UW<hS;iDM4}+*K6}99bi9Fd4
zCD@Tb5iNtb1s-Q!ohgw+BM(n;W@At_4V)IZ^TBaQl!F<n<R@vAZkgf~KC2f|kkXJk
z_9%l|iLy654T3rf3yrD4TsG=%tloeYTZUoy2s+T1;ta!}TA3lA9rXd#ShYe4zm>S?
zP`eH>FoBlNOmQ}2P(Q8H4DuR_Xcv(>3XDpa<!16Id<0HuV4StW1u27ijk<#$NPMT!
zd#+L$lYmw_*f)k&(i*34X~%>(L$A;oqn188iNq<Y;`C>6epTbLr?fo{SAueB_%p~3
zLKhf>E~M?Pk-TpdZEV0YSxjnjlweP4r9RC%GD6dL17g?M@idZEQ&Ynq7f)4dSmHNQ
zx^X^KA<=UfcT8$r$aNf!0~HAv5EQ7@ctUY9LmjwB<D#l`xly;-hLY^oH0h9@DBSH%
zA012NoI0h==mwKT3TEOb2mXJ%ApfEKqWp|JAm1r{U-~!FtR$iW@Nv-*{-^M-glB~9
zk@}C6(er1^Tt++ur>3dB{ZL`mVF3nA=%-QK&m%(2rUx>~)-9t#JUiFeGlj;Em$}Iv
za@1<8gDj+{J&>Frln+Aq0~#(YmbqESX|`5H6ck-e{<(zo^O%b4mkeg>jQ5pjK#OI5
z#+h6XX@*&bp(Q11OFN8u>8uWq7wUFfcW68Vjfh_v?3sU+(mj+L%H=YNcNNk79c50S
zU^TU(mPzG$2gfJ#!^+TPqJXm=E_16O=`(mrR1Oe21*1Nc&Zl$9eJV~pRj$V+6i<t%
zN35@f@&LmLIYlmjRI5yKGGyYY^`5RZ54cBA7i@VC3}DO_wVyRCxVA-`_q|EmuI*Qj
z<OdK5Jec0TSLyCUtC4{Y^KO=iCdQwn3Fs<wDP8bDES!&d4oa4zq)r(|@lOkC_$;34
zH&6yZ%C6r31O{MZnX|A%DkYRd*<P6Q-p6q~RpxRw8gXWxkQbye7~x+EYBD|V#_7p2
zXUm540wQT7-8r>hpGMLZ>6x|X6wW?g=CpYT>m6#Oh%M>OHK5~FO9`WtzLU5xUFP(9
z$bk{Cv_=^FhfUxTl%qDE!1;U1TzWJJZwtZ1-~~5SCMu5A{TNQ%SDqKuG09G$q^equ
zrHt2*EU^6lX5qMiwf+yt2c`cb{hIW{(n0BM;>+TD#Ub%V;lJYG;y><M2V&)|MG)K;
zD+><Js8t$-Hd0Jh(L)>#sYJ(68J%OYftm;+A|!a$G)^xxP{Jg$7!@$c=-MQ_1uTeQ
z#uSJc4zs#o6pqotAgjbEV@|bz6~6Y`%scE=Ywy{Bs;CiGC0ex*qqg6|pgpd0GKt8J
z%VEM$JN*>O!dOcr?PsU#G;!^?&dDEUke!f4t-SrK($=R3&)}l0&Ix74GF7e8dXjKa
zkllwJ$=6A9Zqd1^&0u*47Ai7)h_0iG-vFh`wLt!8q$6kDlE^^ab{pu)QJo9p@LWNB
zk{KWcnwUr)RkHdFBAkjg!&V_@)S()#J3Gx8@L^QaRkIQEH^CmR7Cd2M9RfiQ!tB&=
zW+JhriiQqMa|V4_MG+gRIaUB|EZ-=D1G#OJ0|Udu6`b3c=B#JRG$0mgDme*-LChBZ
zT?<P?VLCj&T5)IwEtRLa86P$f%%j8!-%maxR=dnm$*!hTBp98PK8*&fX>QtwQ4om&
zFy=<G#Q|EFjP_Z>*?BgxF`}cHXQ#PP4!0;PBiOWlY3Dp~Tgt^3WF&f~(O9y~WnV*1
z1J)rXACTK%Ul9Lq66BwkpFsWZRq1D>C#9|8Ux~jWo)vcqe=EEw91%8kyQ|RXz8UU8
zAwve%XxR@aWEkR~aM^0=x*5)Rj_9V2LaiRJw&KEAXxpRYqXpg`Hf(v=b=|6B23iYW
zNtYH?XJ$A{i;`WzfR@IaW(#)Y!Y|G{lCH?w;Ee7_!z?%EV0UV?QbRW3;w!NV0qw7&
zPud|@KpW*5P6<b}T0>=<$T48TE?%r1p#o51@3Uy&#A(i9A6DyXjct%v2kW>keZ?&I
z^)Mf>_kGCrPMtOiR?DysJ4n}IP{|V(H3fgDC~#QmYQ18hB7t>zl~TQf&)}ZgX)a?q
zY?vjr)=Jaj9d3mRuqLdE{NQ_WefBgb1BbE1fZUarEQ(~AS=6juPve^0X>Onnqi+}c
zx9(tff<2@%hszQ=XAUx`a5XZBDWTnCle-%@<EYL>aG4@AgP9!VZ()(HMhh>&ex(BK
zs60jX^N`M2j|?OarF7(NwCWm_d|-6jMJsYyIorX?lm(AOr9$8mf;G0NhJ{#HMaT#o
zEmgF-GZWdwp|j{^S?5AH-0Tc5`hk^T(?kcNOgNQIC7zt6?rzk%N$aQ8J)~32^VF2_
zBIQPT&BSg15i;YbH`SF<Qk(gP=3+<y>Hkf_E&-^%L(<<$UzSv9o%oaD9^s#`?pMcw
zOMUjbx8k`@RJcJL)!}M&bpVw}bS4ZlQ4cXH2-sl7gSCny?k)60H&i%dmos%`RISaZ
zk=LN%zO*ooj?8-~)!gIWjP4vq9WIujjlxAv!(PK?>$PE{IE|HD2d10bzuR3+VpQRZ
ziNV^=sDs)HFV_<Y%}~ulvBr4Jy@?*<t_oM87}WsNF>1+Z4VS;XU(-zo^%u%y$QP4+
z3d6g&Yj$Oqp_!@xPQ{-`HIxa>s8_Vj7Hr~0Rq9b3kLht3s4#i5Z4FEMqe(J6VJID+
zA?ioEHmjo?!H_^~`L2<6-;SZNX1KE7h&rdvOb2$-V%RIH*-#Kf#r-Pm7wHH7ZlCy=
zdjlJ(8O|Z4)CSqCAjoBlHSyV|9#PMoHmWHmQLS3RgYNa{Vs?g0Mn{~ph#TV0fNyEU
zB|Ox#Go0*>K$%g8iD^FD0}%|zaT6?Y5&j6FRWLj#>}LQS8gt)9PbbfCmON}OHcPFU
zyXY1)Y;2J#$ZV@_7d4oi;ewJtBu8``i{F9R%<3Fu1QiylU-c+CKqOTBK~YM~b8^Z=
zNR~)HN&i<1NdY+Dcgwq_FGx>_|0I4&tcbhB>xC}?{gb?u0f_AzaPLF0-l^)9mOp~n
z$MQ!6xH_^Xz#s-9ap!syJok2&kVKg(=i0NXX-y-0kK_dA3n`1O1PiH$U4j-pQ{_B4
z>hNkAkP4L+1A4PVDCS)rIn_QnvBf0-(t#?MTLr_8UO->t1(}CjLKz*Ya&9e)6#}f+
zmQAA_;gc$~_wRJ?#%1GGF3ipvm69>b3m@%cb~M+Q?mOW!G|{>$XQa?7%)<~N3xHx_
zdW&c^*gJsa6i7*ECMD0j_$%oMLx{y+>v5N1hSpcnR=Z-FMOcTMF+p!<;;e)+dG7f#
z*1Hi8z{`a<$e(+@a_;#eudk?{Pv#RjcP&Zt>I$d)@DvC~185xu5J;x=h8k5DE+4zm
zqrk*8o^|h_R<#OO-XB$MU=Mhc8|-U)ahi^pj}Gljpnsud9MAw;u-Sm(>_~W8UQFo*
zj4ZLiCG66+3YYkdI!|c`MIEy|na<_YW6836JN0u{g^OeGzRk1)L#d9a4hpla(pa!2
z($>tlL2U1xr_{lEueQg%4gEO|v{GyuM-dPL3fgiC^M)ok8r1)G3i79c0Ny9xDE*0~
zOWnW#{J!`JWB`L=m+-rY19rwVe!ts`n>}9T7HqQGQ*et+=h$x<l%=v1s;Mw<R-go?
zsWpzdJv1h3s+`eAm0CTk2iwb<uxKujI|7-3qC6G1ahZ}E7@J7!bGM>br>dMx;Diz|
zzSaOl41iWgnV7Zvf(WyFU^sIuJxpMn#6fq<s&x+(tB$2P)s`8{27d-WqM#$og6qIf
zwij0VTmluPtDHP!RdN`*W3{|UpqO<3ce;cu>aB8;f!^8#Ph(YkTTS%31SU#VxmhK1
zf~5~E7i7mWk$eW_p@&?85*?{>t}W;V$s0faV}_&70K9A4?{o=0)LZ4E)WGNwY9Mz4
z!aRD=CA5%M<@_8lObB>Uv&Pv}ev0fg>?ZUSC>;Q)jA{`0neGNc&t<DdL2nH)W%mxE
zrNFDzTSWnA9-RjthJAn=gl><Pd}#f<njamwILHl)YD%d9bhlw=(ZCj$FhmCsEXDL9
zs}@y*9}L>%Y;_4Wbg0UCUJN%-<Uv@AXMqU{^ROY8U_ocATsoA6U8}0*<)e=t2K=!?
zFe${iK5gCS5@2XUm8%0m7WCXW20oiS>E2H&b5E5EnbBnp1sYmDLNcNZ;srh+T~0WF
zu~*dDcqkL^4NlWg8pGiVGvEyWcN?w$e^Ykx{?2XE??|7Meq5T6ZWMoA)WrjM$?uPZ
z&kFCo5&~eCOAEd^gByx*#CP-`vBpJM?9h&Hb`RjXJvA=G9MjG!Cp9Q`trY3a*vXwP
zt>=!{IQ<&a9W6RVISSc8p*X<M!|u?*^)4;mZmn_pFb1u3uzEWI)HHN|zq=pjJYM7F
z8a|+s#exr3?@0*J-*_zAG9n3gA1;2l#)%h{;;h=Z2<A89?!~#!*0@=QNsHbU$RTT-
zW_dyDnXt5p+$AWK5*UCg&ZwEu&>V61kWAcw068YvV@SnKn7Nj!(-KH*$rynYik2pV
zbb>!nQqK^1G#!9n_Pe{$!)lF-r^a-Kl?Z>}`Y<5oN>He`M#;b<E}^T`8W%@lNT!TR
z1a#v6VpgJ6=UD4L1k~6)HO&s|v!T(y-zD(W#u^uKu}<a2$KY#52i*s80+zVA@qjF)
zfDmVT5(JGbB)TH_&fT$U?T%eF0K&p9#Nc<7aiebOs1>BMs7=#ZkGR{}6T{TCL#Q!S
z60rCX{-{NE`VxU}&Sjvd)m2Ulvc?>(Ucmger>PYX6k*@mE3<4#4fq&T9S!ocCCG=i
z$?Zd@c2&8!i`*sPHfr_+IT_#~r`1xB|DO`%@5-K>lYT=wAl)E-U;L~%D&8ji2jNuA
z?=SXO$35J&W`~=C3BPzGQ+TTb0*Hky)LC)H6hMs#C^4`s!J&dS<q&iVmHRJM5Noa9
zlEIHom@tip-3*@n$vUU@vD|$~#i9`|2$5?9`h<4TD;xx--0KeG>JxR&3rwIC1tfkg
z`WZSpg<k+W?hcVsuB~&1Fi0XMpmSI<qKGp~(^^59VBuhcgD!!dv^r-zfbBzbt>>Vo
zlMD!n8djjvZRq0zF2h09ITtda&H!Yi)+R<E4?Ele++w88C14YPHR|;`k}hjvI0}IV
zA?GFLJ)Ut>^uTJJGZ_<V9WM%z9S>IYCdP&odiR1KtYdKGKuc2A3Scm7cc7o-%jP$5
z*$~;i-R(yQyc_GBxe1rV2>ZwY7J&mi_lp?+dC=QSWiH4s=`6%3rVTB}LXTNK_dM;Y
zQMN@deJOU7KU28_x>(t)w@bY}E@7~eb<S2zXr@C;3Iy6=Kr$88920qf`h@!^4dMpC
z@nZ&L0!ONx9Y+ojtlS3bADj?u5e39nI$8mLXglBG9)eBXh()$g4aZ~4ZKVG<3l9l+
zn|HJHN78GOFFhjuJt_c?i<^aS2tOv2aB$wI*QMpfl*Q$-Ibf@6Y}0lUp*!B}9>@86
zEY3FPv_=uwX^iHvR89ftk;39fT>}2-7FSh6?uC_xR<S7hli~_Oe22kAw5FPKkJ50i
zwz%QUsVLpDj1!KJ_vWNGEz^qI#Bwb<GpNSybO|#wZgN@6Bwhn3v4A}QwqAq_?RN<z
zRK+VAv6-EO^`ZF+K|e5hfMl5^)NEKr9h5`Z5-CNwlSe0A1|Pc7<kA2v<iWoLTeuf?
zEkFT*8HC<b?K*VTAwmki2*TPuIhGm7CHh@L4^@%p$9o2tB1EaxSUYc~a_r=$0jhkr
zhN@@{xC}UiVne(U%^{S|B8=Nkmyko_XSfMFg51Gmn<#)(x{vf?&J)TJV8T;<ic3hL
zM4j_+6G8aXpgeTq#IQ@?phlgWv<WytrwzWs^B_MA@_mwoc+D&Z5gKzxNvh;Jm#|I1
zL^x%&62rW(cOFzGlz4?Bz`-z`KldWgqiq16yUJy-B7pYdqlez1H^82<z&Whw_n^dI
zbn3cRYK8LSQ_--*1Jg~d$>HR<CsvSZIfg*a`U3se1o<m?m;ZL@Ytjd?{<ll~JMjzR
z88Iu~BYaNK=BfYU|2*Up(5Gy1xp}$*s8eND1#UNY45kW8)_n?liBugh`{<oZ0#7D!
zhN;b+aWxwMjK!%^4vWYz*U07Yyxj!^%VniLtumZ}V<#d_<K;L$!^kry7??Z?(5&vs
zaV#HYuuW`pOX&5G#Z7q*Wp==M15Z8y^g>auYh;>rt6{Bo3D~pM;v$b6ssOO%I0;kh
zn2)*y>(LP~$CL)S6Y{-<E@2*W3GP$2xDX{rwMVtm%4^BFYWmDHy{W7!0|3NP&=;Qd
zi2EM2pjz_+l^~I?8DYw%(2^V04hhmq89rYA$pPP+?Az=<iOcs`TsV@W2nP#|8c+kl
z@3vOi<PtDvm&L^$xe5xNGq7GG1kJ%}FJQy_TteuavN#Z8ZdS#M&sa?-%{<I{(a>s_
zNUaF2^DKbm@gc=cuv)LSLLzFT6)c6Wk?OP58#)ny-^sCbE^*vFMWVLW;v%6SiW|lp
z){t?xU!$c~^MqAK@9?5j%E9a9F?FN%QE>{cn{ZE3%hy?4xRis`st7hPXyGrBFt%+i
z#GB;-^ycyq#w-DciKQ&NbkHS85JFk*(a%zBO_5Z~2f#4IUKT{PAPV6~|5pRxD?cwE
zl^>9PUvjYi_bsdd9s~C0MPc^x*k3XOyIjJ|<ZMn7^Kbz0aAEm4_=~;IhqqNipY)JR
zc$p(MCx3ao?u)`28_WDf7zujXQ|=iW!24`Y@bWrv2)(1Qn_A00V%+&hj$1}HXHf*#
zfNo$h1r}u3t)o*7o0HYNF@sdZ2{oc^Y+(f00a*H09-?&9X|^$gVk7}-PT8C^=hf4C
z5OBvk6Aw2K8fxZ%OQ4!FHYa}hX%+9>)k^g9vf=@^-=5e5E<tLFHYaO&qim$qDgKq|
zOTUD6!mZF)ud^=|S~Gkj75?(jd0KTw9J~mRpLb^nbhrivqE!lv-fTmRLi3}yGi?QH
zuIx=5EP10`qMLY|C3r;>S%``uM-haiqi@1J&GgIW0#oD|B??5(J#U|To`v@KdGUfp
z$x-r%^+C47%5DnYc}fl>cDe-38MnF6l>{~DWr}DOqIVRmtX46#r*P#FcbYnKgT>|a
zxwG_cB_6J2qk}irqTT$;L(5Tz>k@glOl{s`aRE=RL50^~DJ5E34EJ3mvUqa~W{M%}
zSpB*ibzS!U|7u}Bt^XgF{z0;(yTv~dKZd&B^}@G>mjoS$F7xT}2n3UKxcCK+)?WJK
zUQ+CL3Gz~PIF;v4M`Bz<oH_2;l?Hk8aB(=k@V3Q$9~wE}a4H%$622HPMz8KrP%yH^
zCBVx8htq(gKpKL&f^9<xB$J&7U50LPxFGcC3=tV<T*9EVFr0Sjr290@$vrkV&v~^r
zM{#ry1tv5a(Zs;pM8__x!^ly)?Kv{>NtZw{Gd35!=2aa@N3gwY8?Xc2`Qy~a9+zM;
z$89d~$~$nY2!YAc20R?$>M>Ki5O#IKWk8vAHW&TC)76MBB|NjBmgg1Hp`S_&{xeAA
zE5X7Rs8=wQ4DacR?%A$&54dH#D20T&WdhP+u}3*OjTdN871B{lZzzcWRC3gKDI1m=
zt?3McL$?YVAY;J@L4Y8uAYegB0b?E_sA3B?q*7Qu1deJn)pyEe(3<;fE?6Vg)*4y8
zR6^M|jo0g8;jmPW$h{J)LR>~uV~@DobujQpZLX{wqzhPf#Vd;Bvn~;`_Eue+L@H@>
z@nIgT5c9$cdi+r2X>iyX!+n!|!+ivPJX=#(aEd!Qc#YmRHmi&hgw|WAvevqU{Qr%@
zdO`jz`K0t$@cy@f`QtI+zhLcO$8JGLdpF`qth1b&Gjf7?VU7yE0#2yHrG}8iV%%et
zI$dWue{!5AEU=}64mcRpMR<|z-VNwkW|m6{j;S>u<RgC#>_7W6Dh`xA#;&t#mJ3*p
zQ4)dlINtlXiza`>*#HJ{A)kWq7$OqWZzXE0?p;UoIE3}8SWtRQ$IAt+N(KxBQdxdq
zl#jrA7x_9xV0YLoj`yb@YsYpd0<cxFl=n7_hcV09JHGWEydTf7V-wKD0$zBYi6^{l
z6;bsV03|WYg_OsTUCg0s38Ti|&S&d=@dppf)Um||(wv}R6}<Zxjwq2qS>7rdoa`*;
zR)Y}x7*Z<4LCnICj0bO%p}QR3<znXs=u7bGcTb?Q^pXQ?2c`~1duAOf9z&)cn&oW#
zFsg(|i(qz-p@@PNAC%}|V{-H&R-$zf=%0w)g;a+fje^;*a!LEC!_hS*Pojt1=5Ws8
z=v+Yyf<UrH1pEnc?_pO_X(0e%Jb$MeW0<s(TMQESqbD<CgX5|3>?0oGSyhJ%3yzu&
zR)HEhEtNTn#W46Gz(g3)6{}WKxjcBcStb3yK{z4EKMU@Um!(1RkHsGnw+X+4UCaAa
zygRy*YuyLVf9m|Ne(MA0KlkkqpZ~(QKa7{#?EO<}FX}V}`aO^T^iVoW48kfF5VpWx
zBPE8aQ08p4M*8x={*t$*YX@%k=db?qUp)U=cAL5BUX+&se(T_E^4{&M_HESv?9~^)
z_lX~!n}%5~J4Wx^^nSWiT+@k~fbkPxQ9Mj~uHdip-fdB{AODT0+5N!-aE5nr%}#l@
zcJ0ETeDkB<{M0u;`OS~AVQJ{S)6o5n4olg)rE3pv^n(w4_^&_o+z&qVD!bE+K@(8!
z=$-1`&0QJX>5W&v;lA;eZ~W*tyf<Ec<2T-T^^I59ElsDl*f1*{y`|-??i$A}FFg0c
zh38(r@R|2tc<!e!eC8t;p8NF+&;2I5>$Kim(q>^WIw)x+@1{VYU-{9$`20_^+l2Da
z(c6&zzg^fWfYY;E`jRvzen&hlt`lAr#;}wBDBk_BG>Hc17)}rvjI1&HrR?3u<lwvh
z4}I5r?YsU5S-(%Ky)#(O=xD#6@b2x}fr2bd%PZ%91yy=;ziKkG64yfZeq^hjeUa0k
zC^32mxrHhv@Bj$h#=Lu0B{o*S@&0c#&8hvNT*cdts*4M)<D1?)y2i0EasG4PYM%eK
z^RIpDgXcg0tq+}l9!s9IIH68o>H(I!Zc*{pbtREC;-;{{=YIwNUjRZK>z$XnTbQpT
zugG~vOQ)9@HAZ@O+Pk~!0957tXU@NL{)O|uNVjAn5YA0UMc}k|7rWW(UwHj1uYd9N
z*Ixhf>o2jJX_elxiFcGbsg6&2cfvwH`<I{n**|~v^JMpD@IN&CoP}<^uG9LZ?Eu20
zB=GO?!Vy(3EN^XKW?p*X!b>k-c<Cz_Ui$e9pZ~~(mp*pk^MM}OYOk$UJ8Rs6`rjjh
z{F?lJc|iIO@c+BT3u0C55q=<iQJ5AU;f+B2uY^aCy9Lr(dRr(O>QcGVU2-|RmL6g5
zGK(U%^aypgbY@GB@OaCiw)8e#b#6;<BaM5f$t^uX11^l+(ql|v*NEP-;JuR`f9o7q
zMLDTg3u@u4MmQiO_LL-C<Qpzy<`CpZS1a8U<8Txw6Z<>@4xXChN?Rw{+s7x9S%A#=
z>@i+J>f7xRjPU3jmy-mqj|YTDCzBEGf);SwZ?X<}gc>~4;G)i~+5n()F*Fu|{x^yL
z^9k^O{%h$B*8l%X{3+D`_Xz)6_(P!?*Z7tBecap2Y(oc`D?OqZdsFI4j{t8=<F51w
z=5~4VN{=|gmdsx1?WFPOIDMt}V2AlDy&ZVUEZ(+=l{k{o%TJdhu=KWfmcg>@F#z4w
zpr!T*RJSNzYL794b&{CcWB7RyMb6luV>vUzk<xnaBABU3|8Eh%|NSF!pDasX1OvDs
zJqY%XuZTY;J}RyfenBYUF#GKEhVcB0rkV5zyS8MWNiR*hu(Cvx9zoxh$TaB@nODcC
zCcS>NwivESkFaLTBAfIcT_oG2cL=v!BHg6o5mfxjgwY<M!WY08?GYxt6O_>&!NeED
z8U2{YIK1v!0n%vO+ed<awMnB%|8Ej%g8U`<gFpauV-4_(v=Qi^C&2#wB^>DJ=deeB
zxK43RdXs2u>131M5oTFdlx@<RpnG(hZqgg4R<9!8q&L<v!bx|Pm!;lcbJA#!Sics|
z8tskX^o7z!d&KXxINoTFK<k+Tw^9pwqbm_ddxTV9CUbP)|Az(n7w}C!z0zNU{d)#)
z|J*LVh8n;I;ok{ACsYLb=8!k}toI1k_9jG<9^uv&#U$wwPHo{-k{;ugT3zH`O`Oji
zIsfl=eTGM<M~j9-9%0xzLMG`E$gM+clHR*XjaGn8(mS;bKFPbilb5A^_6Vz%S~%~s
z_ZU542Z^6O!l5sR`PpN<luMv~_K28rN!-s~o(5t4N|8U4{@*I>734nv1JD`pe|=l}
zW$DLI1NaUYz}_uBBK$qR1?X9vFz++q5rS{|q>&zRV4VRpI+o1<jzTag`~XB{VXToJ
zLH8Cz8|e{1Z@IjY9wGIvKpg2+Y3^?5D08Go>{kn?j`U`z3oFANIqosMT_=g3J^f0|
z&)zh9b`CXg1?p$7jMJ~k{p?NA=v-a$XOFlm7tH?b5e9t`^v@n4&=<k~9OysR|6W1;
z??L$g-<Ccs?Ub$u3h+hI5(mUP@I3&ZWNU$zFI@|&NS}Q@QYX10eF83Ci7e71sNy2n
zB0WMSE}SmXBV6K=_#!<5DK3UE(j)$@1u;f?gf?6dW#lohL0Yq>^Q_O_Q|QA|XrDde
z*?M!{XKxm#Et~k+BWT|OnV&s|=Ic21vq!M|j&MH*@jv+gz9xSZ{{L@)0h*P%#eWcg
zNi2%%QU8Blcv9H3+b4dJr4U5=x8lN%Fhu&dprwUUMEW<=0Cj{T(kF_rWsyYsH=%_N
zutfTV#OxSNq)+@_3+9O&@d<3%G2&<cdbGAA=4bypT)7PDXP*&vT|@3?zY7oW=H$=*
zDxCK4!q}gE8RssI{+aauW}%PX|FPwRvMBwTG$Q_`_&IT}@PEPl@tk1bVC!?xr$xu*
za7g-uAzCbnq<<eSS^|rte=n}PGL5899AZo1k@Vj|PVlM`N&4&1&t)-5`gc=@SCC55
zUF+ZV&y)1ozw-*L&;DAB>{4l;{X1~+qIsYFHMnZA#Lqq>6YDhdGwJ_oVN#HP8wkK*
z_Wd6vX`lGJ;#1-laQ}Y{hZgxs`#pHN4iHEBTS;K=S_$Gve+x~(B8ek?!W(srIMVN?
zr|Tebq`#ROylTXe-To#F$HFL~eTG3=8A@oMkVwm<g!VVEHn<lj7E1~36VuqTD4~5q
z5iN}q+E<oJ3QhWdqcA7P4f%fQd(tmS$MN02e+uoN#CQMBEmHLtb$ZTc6jq()hV<FD
z1zt;TNS~lVZ^{knKSb(!HMk-Do#@X}xFPrY#HqD3nrD9pJzi&Np8f6YLAY8mN9TN5
znrD9-u3QSuv(LURaAjzoeTEIX#x&1C{69+Te*^N(`2N2aq{pQ#;&<^D(3E&D-UIwC
zVRWHtZTjhJK=J4kcxRy$k3OMw7EJNz6B?%@6puc^bgn@0=razem7#bX@WKDo0fuIu
zpgW6WX!Z%p(<z2#pYT2lWoY&Z)3bPnW}ny~7tPS@Gw9CBFf{uN8@qm`7@A4{Z=?7B
zz9N52F3LM$1O8b0g!CTiI`Q}L4WJ|9P2d6eN#V?*-v?alAG<V@qfbkrS7LJXiE678
zOpbnTkxY(00~8Ul_L7(!eFiA%G?Sx0f#FyHljDAW949W7mf0U8f4u^<%sz2&Es>Vl
zA6+IbvrnL%#n3YQ1l)NuT4tZ1I*XuX_6eu6cv@zk(6(<z%j^@lb{VwHf&Vw@{r~p@
z{r8`wmw^AvN_UAr5ML2LD((Rfh`CVzzp(S%+kN`_y?<_`jXo`$E}XQ{FOa^hAZeqo
zUY@jZmrt;$B@izAPvW`-5ia|Ld0I5#vQPM?Hz8d1-;HyYO1SKw!o>?DT=q}m+>Q}0
z`zKgJ(^0}@pLjHvOStS4sA<WB%cTD|(f9woUmlgWNPh|L@4R%U_;cc&!fzx0U&?p?
zkr`0@I(l_wc1E8dIGtf<^lLOZon&Y98Fc4bvokt=<=Rjv`!krEB~vK-r*ZYtD3pDj
zW^yGclzjpZEr&wcXK<n`Q7HRUxWytVlzojJ_?l5D2mb$%Apah||KlL^|2e4!4zT}-
z_5Y{E{lfQ!j|hjZ;MYfdg1&T&deMJ|&Hf5dFZ%DLmODzl=o7YP8PtotK0$64L8I&w
znb(47lzjryERROnKT8AFX&Pmp5IBpbQT7ROvs@ZwpFwdtOrz`*5NEkG%07eAE}KT#
zCn)V=X_N!~uM+;}<MJ6G0RKjMQTh?-I4Xdj6b}o3Cwx_?UP1pCcW9z{6Vt*@5;Qgm
z6tif8#wH^p>nuTIlYP-$rwJMlH3=%SEbincqawSy+{w+iq1TJzPHqw|=1sVhn*@qk
z9(Qt+urkZyPHswQVd>n-O%azbh&#DSIMs!4C;Nm~T^e_C5dY5*{wFK1mcA~1NIE3`
zXYmEm6eWD~*UaJ+{EBCvYBB`MN--`r@4_G~g>kXTz60;7F)r?E65wPBoXJhXnk=3(
zxw(dH?n-ecH*ZI$I>VXVB#h}2Ig^{W;@ahNCN~LVx(v?b=FK$LE5n)GT)h&U$)x|Q
z>HYtw!T$X{>66lcbPLx1UlHqK5*Fa&(Yybo*_9^4aa=V5#pb(cG*_HJu}SEUB@-z2
zGzs{za2n($p*)sLgWOcm$U<q5n}pe1C=GIx;WHOWgWSB2CTfLfkedYJTqX^2lTe;Z
zqCsvlnCA-7AUD@ta~fpQ|F_fn--qN)(gmrCZ~lBke4n^m_=82S_>qZdf2`)VYr&e>
z?7JGQiRor91gZn1$W6xP(n(U}=2rA<aiqviM$L9LNRgWfG89*p6uH@r@mMw~a+858
zSC$mHxrqknDw86U{@)-xA;=#A|L+&2qI8q^8EF4kv8w~0C!2d$nl-Vx=NhmkR+_u7
zD!FlU*Hs}mZax&T5O<W^xVbZGwxi_6%?Ga%xp8yH)gm`;Zok^(#)1FeCdmI1{{PF;
zB<g-O@jl_p!2NH#gaJ^R1c|#c2XHfawK#yAk9O@?Q4Zkdp$>BZHxFI|4&dg2tH}Xe
zZa&hrYomMH_kR54@4KJ2*%y{viXlDt5)*tOHht?iePsuzH5tA6g1_CQ+<Z8?)1SZg
zo7|l^O2Xye>2!1dRpd2p?z?)t#-#tNr0=x&e=ni)Z|!<(1pa>=fkJbTg6b9K|83Hj
XD=(4%w@L8zrSShY3Cg}~{@?!xn}Ex^

literal 1740
zcmZuyZExC05dO}uSXD?~SAf$>{X#C}xP+>a(xjqXbW*QpE#3iExAwZb>i})|?>Dn+
zf^!NI$ewv-=9yQ1yR0{Luh*B$k4gi(V2RgqB$vr~ucuawuTYx9PC4&*3rbV=tH<zz
zVt?K{1Z%XcV9UN--}A)%(8|L&VIwA$twaet&p+PW&hk7(S(1_F=nUiZe>7nC6g#-R
zn$M<-8Cy*MxScU%!*~!=M0$Ie&aXaA=luOyIyfozHN38o;0mj1uS|6UeE5(C)3k?q
zB9q|+c2Mw0Bqd6!a$r4j3fkI2EiCXz@aFF8Y`$POcZ>VT4`~gUM+yVh2^T{=OmF|3
zePw(cK;wuSzknqnVqq!|m3J636nzaoKgwbSl8yKEILo%%?MR7AjEr4p(v$+pX4V*=
z$z_)G$eUKnU8(cNL9Wm(HbLiLt+9@K+W<oP(iCmeuJ1ozo1!T(dXx_*+6eh+@%fhb
zj}*|Pby{c;_UJ88?_@*tg|%YeQZ7uHu!{*xu1r~iEtJqnY+ItLm5I6=e6ppW9vzhx
z_^7)Bzcu#Xqa0I?@_V}$mHPR@2xJqLGuaeDbBab|c#J01qmqr#Zorm%7Br!1{ar2m
z=2VrxzThj4y(y?*)@&)e2pUep(DEe9y!}Q+qAu{?3oRVFeM9{juB~b6H|ck3FlGp%
z*f4HIwFZ7RV8J1l8mcu09kO>R6OQ5JN!T4%j4%|FVh<;{RV8l$=V5^Rv=JA~dFzcf
zTd-Vvs}O_+!%4AGTHYCKPiuRY4ksRV{wmJefF+|OMRK%TeHzU+)+?s((6mBV4?;H(
zE$BWd=fGo$PFv=_5vlLbS0ecC=qW_!wS`BI2L{?fdtP2Md_ArAFVl*?g1Ln?>@Z^T
zi~qwf$8*4~egyf14_K$dgG~Q+Z&3rgLN`u5g5IMby^NbqKImd00Q>jkO^Ys}T!MAX
ztO6L-egjXgscU2X|BVsygkS8fkdMlN9KG$Q2Zfg>xW}JvJ&-J3n{|#CM~ecmlavB>
zD#3~A)UE9rx#)_~yeU@7I**G^gU~f;Z4R;DQh0&zu&sG1>eHFULxaZy&w=v$Ttb0u
zZ}*SFb=I3+=|g`SVY#UFr>h)QI99EWF6494LD^v!F&)7(vc1)@UhQR$7rXITAj$(X
HJM{hoI8Ffi

diff --git a/plugins/Irc/ircmanager.php b/plugins/Irc/ircmanager.php
index 8042ae24c2..a54db566a9 100644
--- a/plugins/Irc/ircmanager.php
+++ b/plugins/Irc/ircmanager.php
@@ -64,8 +64,6 @@ class IrcManager extends ImManager {
         }
     }
 
-
-
     /**
      * Idle processing for io manager's execution loop.
      * Send keepalive pings to server.

From 2fe1b128043d5a4056d68b555c6e9de9c646baa9 Mon Sep 17 00:00:00 2001
From: Luke Fitzgerald <lw.fitzgerald@googlemail.com>
Date: Wed, 28 Jul 2010 10:42:01 -0700
Subject: [PATCH 134/655] Merge in Phergie changes

---
 plugins/Irc/extlib/phergie/Phergie/Driver/Streams.php | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/plugins/Irc/extlib/phergie/Phergie/Driver/Streams.php b/plugins/Irc/extlib/phergie/Phergie/Driver/Streams.php
index ed64bba2ac..3f2ce052b1 100755
--- a/plugins/Irc/extlib/phergie/Phergie/Driver/Streams.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Driver/Streams.php
@@ -229,12 +229,6 @@ class Phergie_Driver_Streams extends Phergie_Driver_Abstract
 
         // Check for a new event on the current connection
         $buffer = fgets($this->socket, 512);
-        if ($buffer === false) {
-            throw new Phergie_Driver_Exception(
-                'Unable to read from socket',
-                Phergie_Driver_Exception::ERR_CONNECTION_READ_FAILED
-            );
-        }
 
         // If no new event was found, return NULL
         if (empty($buffer)) {

From 9b9a36e492523a7fa630475a4a3d46c3d58ffd8c Mon Sep 17 00:00:00 2001
From: Luke Fitzgerald <lw.fitzgerald@googlemail.com>
Date: Wed, 28 Jul 2010 11:56:15 -0700
Subject: [PATCH 135/655] Introduce error checking when calling handleEvents

---
 plugins/Irc/ircmanager.php | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/plugins/Irc/ircmanager.php b/plugins/Irc/ircmanager.php
index a54db566a9..8d9cac885b 100644
--- a/plugins/Irc/ircmanager.php
+++ b/plugins/Irc/ircmanager.php
@@ -72,7 +72,11 @@ class IrcManager extends ImManager {
      */
     public function idle() {
         // Call Phergie's doTick methods if necessary
-        $this->conn->handleEvents();
+        try {
+            $this->conn->handleEvents();
+        } catch (Phergie_Driver_Exception $e) {
+            $this->conn->reconnect();
+        }
     }
 
     /**
@@ -84,7 +88,12 @@ class IrcManager extends ImManager {
     public function handleInput($socket) {
         common_log(LOG_DEBUG, 'Servicing the IRC queue.');
         $this->stats('irc_process');
-        $this->conn->handleEvents();
+
+        try {
+            $this->conn->handleEvents();
+        } catch (Phergie_Driver_Exception $e) {
+            $this->conn->reconnect();
+        }
     }
 
     /**

From 0f7fdd480447d105ecae129714f7329ef5fd76e0 Mon Sep 17 00:00:00 2001
From: Luke Fitzgerald <lw.fitzgerald@googlemail.com>
Date: Fri, 30 Jul 2010 17:12:35 -0700
Subject: [PATCH 136/655] Changes to make plugin use database instead of
 polling session readiness

---
 plugins/Msn/MsnPlugin.php                    | 20 ++++++
 plugins/Msn/extlib/phpmsnclass/msn.class.php | 30 ++++++--
 plugins/Msn/msn_waiting_message.php          | 73 ++++++++++++++++++++
 plugins/Msn/msnmanager.php                   | 59 ++++++++++++++--
 4 files changed, 169 insertions(+), 13 deletions(-)
 create mode 100644 plugins/Msn/msn_waiting_message.php

diff --git a/plugins/Msn/MsnPlugin.php b/plugins/Msn/MsnPlugin.php
index 2d31f99758..3d9f19c0a5 100644
--- a/plugins/Msn/MsnPlugin.php
+++ b/plugins/Msn/MsnPlugin.php
@@ -106,6 +106,7 @@ class MsnPlugin extends ImPlugin {
                 require_once(INSTALLDIR.'/plugins/Msn/extlib/phpmsnclass/msn.class.php');
                 return false;
             case 'MsnManager':
+            case 'Msn_waiting_message':
                 include_once $dir . '/'.strtolower($cls).'.php';
                 return false;
             default:
@@ -124,6 +125,25 @@ class MsnPlugin extends ImPlugin {
         return true;
     }
 
+    /**
+    * Ensure the database table is present
+    *
+    */
+    public function onCheckSchema() {
+        $schema = Schema::get();
+
+        // For storing messages while sessions become ready
+        $schema->ensureTable('msn_waiting_message',
+                             array(new ColumnDef('id', 'integer', null,
+                                                 false, 'PRI', null, null, true),
+                                   new ColumnDef('screenname', 'integer', null, false),
+                                   new ColumnDef('message', 'text', null, false),
+                                   new ColumnDef('created', 'datetime', null, false),
+                                   new ColumnDef('claimed', 'datetime')));
+
+        return true;
+    }
+
     /**
     * Get a microid URI for the given screenname
     *
diff --git a/plugins/Msn/extlib/phpmsnclass/msn.class.php b/plugins/Msn/extlib/phpmsnclass/msn.class.php
index 9766a36376..9abdce1b61 100644
--- a/plugins/Msn/extlib/phpmsnclass/msn.class.php
+++ b/plugins/Msn/extlib/phpmsnclass/msn.class.php
@@ -949,7 +949,10 @@ class MSN {
                 // SB: <<< IRO {id} {rooster} {roostercount} {email} {alias} {clientid}
                 @list(/* IRO */, /* id */, $cur_num, $total, $email, $alias, $clientid) = @explode(' ', $data);
                 $this->debug_message("*** $email joined session");
-                $session['joined'] = true;
+                if ($email == $session['to']) {
+                    $session['joined'] = true;
+                    $this->callHandler('SessionReady', array('to' => $email));
+                }
                 break;
             case 'BYE':
                 $this->debug_message("*** Quit for BYE");
@@ -970,9 +973,11 @@ class MSN {
             case 'JOI':
                 // SB: <<< JOI {user} {alias} {clientid?}
                 // someone join us
-                // we don't need the data, just ignore it
-                // no more user here
-                $session['joined'] = true;
+                @list(/* JOI */, $email) = @explode(' ', $data);
+                if ($email == $session['to']) {
+                    $session['joined'] = true;
+                    $this->callHandler('SessionReady', array('to' => $email));
+                }
                 break;
             case 'MSG':
                 // SB: <<< MSG {email} {alias} {len}
@@ -1478,6 +1483,7 @@ class MSN {
 
             if ($this->sb_writeln($socket, $id, "MSG $id N $len") === false ||
                 $this->sb_writedata($socket, $SendString) === false) {
+                    $this->endSBSession($socket);
                     return false;
                 }
         }
@@ -1485,6 +1491,7 @@ class MSN {
 
         if ($this->sb_writeln($socket, $id, "MSG $id N $len") === false ||
             $this->sb_writedata($socket, $aMessage) === false) {
+                $this->endSBSession($socket);
                 return false;
             }
 
@@ -1518,8 +1525,14 @@ class MSN {
      *                   where network is 1 for MSN, 32 for Yahoo
      *                   and 'Offline' for offline messages
      * @param string $message Message
+     * @param boolean &$waitForSession Boolean passed by reference,
+     *                                 if set to true on return, message
+     *                                 did not fail to send but is
+     *                                 waiting for a valid session
+     *
+     * @return boolean true on success
      */
-    public function sendMessage($to, $message) {
+    public function sendMessage($to, $message, &$waitForSession) {
         if ($message != '') {
             $toParts = explode('@', $to);
             if(count($toParts) < 3) {
@@ -1537,6 +1550,8 @@ class MSN {
                         $this->debug_message("*** No existing SB session or request has timed out");
                         $this->reqSBSession($recipient);
                     }
+
+                    $waitForSession = true;
                     return false;
                 } else {
                     $socket = $this->switchBoardSessionLookup[$recipient];
@@ -1544,10 +1559,12 @@ class MSN {
                     if ($this->switchBoardSessions[$intsocket]['offline']) {
                         $this->debug_message("*** Contact ($recipient) offline, sending OIM");
                         $this->endSBSession($socket);
+                        $waitForSession = false;
                         return $this->sendMessage($recipient.'@Offline', $message);
                     } else {
                         if ($this->switchBoardSessions[$intsocket]['joined'] !== true) {
                             $this->debug_message("*** Recipient has not joined session, returning false");
+                            $waitForSession = true;
                             return false;
                         }
 
@@ -1558,6 +1575,7 @@ class MSN {
                             return true;
                         }
 
+                        $waitForSession = false;
                         return false;
                     }
                 }
@@ -3100,7 +3118,7 @@ X-OIM-Sequence-Num: 1
      * Registers a user handler
      *
      * Handler List
-     * IMIn, Pong, ConnectFailed, Reconnect,
+     * IMIn, SessionReady, Pong, ConnectFailed, Reconnect,
      * AddedToList, RemovedFromList, StatusChange
      *
      * @param string $event Event name
diff --git a/plugins/Msn/msn_waiting_message.php b/plugins/Msn/msn_waiting_message.php
new file mode 100644
index 0000000000..0efd8b0203
--- /dev/null
+++ b/plugins/Msn/msn_waiting_message.php
@@ -0,0 +1,73 @@
+<?php
+/**
+ * Table Definition for msn_plugin_message
+ */
+require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
+
+class Msn_waiting_message extends Memcached_DataObject {
+
+    public $__table = 'msn_waiting_message'; // table name
+    public $id;                              // int primary_key not_null auto_increment
+    public $screenname;                      // varchar(255) not_null
+    public $message;                         // text not_null
+    public $created;                         // datetime() not_null
+    public $claimed;                         // datetime()
+
+    /* Static get */
+    public function staticGet($k, $v = null) {
+        return Memcached_DataObject::staticGet('Msn_waiting_message', $k, $v);
+    }
+
+    /**
+     * @param mixed $screenname screenname or array of screennames to pull from
+     *                          If not specified, checks all queues in the system.
+     */
+    public static function top($screenname = null) {
+        $wm = new Msn_waiting_message();
+        if ($screenname) {
+            if (is_array($screenname)) {
+                // @fixme use safer escaping
+                $list = implode("','", array_map('addslashes', $transports));
+                $wm->whereAdd("screename in ('$list')");
+            } else {
+                $wm->screenname = $screenname;
+            }
+        }
+        $wm->orderBy('created');
+        $wm->whereAdd('claimed is null');
+
+        $wm->limit(1);
+
+        $cnt = $wm->find(true);
+
+        if ($cnt) {
+            # XXX: potential race condition
+            # can we force it to only update if claimed is still null
+            # (or old)?
+            common_log(LOG_INFO, 'claiming msn waiting message id = ' . $wm->id);
+            $orig = clone($wm);
+            $wm->claimed = common_sql_now();
+            $result = $wm->update($orig);
+            if ($result) {
+                common_log(LOG_INFO, 'claim succeeded.');
+                return $wm;
+            } else {
+                common_log(LOG_INFO, 'claim failed.');
+            }
+        }
+        $wm = null;
+        return null;
+    }
+
+    /**
+     * Release a claimed item.
+     */
+    public function releaseClaim() {
+        // DB_DataObject doesn't let us save nulls right now
+        $sql = sprintf("UPDATE msn_waiting_message SET claimed=NULL WHERE id=%d", $this->id);
+        $this->query($sql);
+
+        $this->claimed = null;
+        $this->encache();
+    }
+}
diff --git a/plugins/Msn/msnmanager.php b/plugins/Msn/msnmanager.php
index b62bbd7ad8..9014501e7e 100644
--- a/plugins/Msn/msnmanager.php
+++ b/plugins/Msn/msnmanager.php
@@ -113,6 +113,7 @@ class MsnManager extends ImManager {
                 )
             );
             $this->conn->registerHandler('IMin', array($this, 'handle_msn_message'));
+            $this->conn->registerHandler('SessionReady', array($this, 'handle_session_ready'));
             $this->conn->registerHandler('Pong', array($this, 'update_ping_time'));
             $this->conn->registerHandler('ConnectFailed', array($this, 'handle_connect_failed'));
             $this->conn->registerHandler('Reconnect', array($this, 'handle_reconnect'));
@@ -142,7 +143,7 @@ class MsnManager extends ImManager {
 
     /**
      * Update the time till the next ping
-     * 
+     *
      * @param $data Time till next ping
      * @return void
      */
@@ -163,6 +164,22 @@ class MsnManager extends ImManager {
         return true;
     }
 
+    /**
+    * Called via a callback when a session becomes ready
+    *
+    * @param array $data Data
+    */
+    public function handle_session_ready($data) {
+        while (($wm = Msn_waiting_message::top($data['to']) != NULL)) {
+            if ($this->conn->sendMessage($wm->screenname, $wm->message, $ignore)) {
+                $wm->delete();
+            } else {
+                // Requeue the message in the regular queue
+                $this->plugin->send_message($wm->screenname, $wm->message);
+            }
+        }
+    }
+
     /**
     * Called by callback to log failure during connect
     *
@@ -182,11 +199,34 @@ class MsnManager extends ImManager {
     public function handle_reconnect($data) {
         common_log(LOG_NOTICE, 'MSN reconnecting');
     }
-    
+
+    /**
+    * Enters a message into the database for sending via a callback
+    * when the session is established
+    *
+    * @param string $to Intended recipient
+    * @param string $message Message
+    */
+    private function enqueue_waiting_message($to, $message) {
+        $wm = new Msn_waiting_message();
+
+        $wm->screenname = $to;
+        $wm->message    = $message;
+        $wm->created    = common_sql_now();
+        $result         = $wm->insert();
+
+        if (!$result) {
+            common_log_db_error($wm, 'INSERT', __FILE__);
+            throw new ServerException('DB error inserting queue item');
+        }
+
+        return true;
+    }
+
     /**
      * Send a message using the daemon
-     * 
-     * @param $data Message
+     *
+     * @param $data Message data
      * @return boolean true on success
      */
     public function send_raw_message($data) {
@@ -195,10 +235,15 @@ class MsnManager extends ImManager {
             return false;
         }
 
-        if (!$this->conn->sendMessage($data['to'], $data['message'])) {
-            return false;
+        $waitForSession = false;
+        if (!$this->conn->sendMessage($data['to'], $data['message'], $waitForSession)) {
+            if ($waitForSession) {
+                $this->enqueue_waiting_message($data['to'], $data['message']);
+            } else {
+                return false;
+            }
         }
-        
+
         // Sending a command updates the time till next ping
         $this->lastping = time();
         $this->pingInterval = 50;

From 68ec3f855d84025a124b5a25736f9cef7badd8d6 Mon Sep 17 00:00:00 2001
From: Luke Fitzgerald <lw.fitzgerald@googlemail.com>
Date: Sat, 31 Jul 2010 10:47:58 -0700
Subject: [PATCH 137/655] Fix a bunch of bugs where DB object wasn't correctly
 defined

---
 plugins/Msn/MsnPlugin.php           |  2 +-
 plugins/Msn/msn_waiting_message.php | 63 ++++++++++++++++++++++++++++-
 plugins/Msn/msnmanager.php          |  5 ++-
 3 files changed, 66 insertions(+), 4 deletions(-)

diff --git a/plugins/Msn/MsnPlugin.php b/plugins/Msn/MsnPlugin.php
index 3d9f19c0a5..9db3f7763b 100644
--- a/plugins/Msn/MsnPlugin.php
+++ b/plugins/Msn/MsnPlugin.php
@@ -136,7 +136,7 @@ class MsnPlugin extends ImPlugin {
         $schema->ensureTable('msn_waiting_message',
                              array(new ColumnDef('id', 'integer', null,
                                                  false, 'PRI', null, null, true),
-                                   new ColumnDef('screenname', 'integer', null, false),
+                                   new ColumnDef('screenname', 'varchar', 255, false),
                                    new ColumnDef('message', 'text', null, false),
                                    new ColumnDef('created', 'datetime', null, false),
                                    new ColumnDef('claimed', 'datetime')));
diff --git a/plugins/Msn/msn_waiting_message.php b/plugins/Msn/msn_waiting_message.php
index 0efd8b0203..d69520b40b 100644
--- a/plugins/Msn/msn_waiting_message.php
+++ b/plugins/Msn/msn_waiting_message.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Table Definition for msn_plugin_message
+ * Table Definition for msn_waiting_message
  */
 require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
 
@@ -19,7 +19,66 @@ class Msn_waiting_message extends Memcached_DataObject {
     }
 
     /**
-     * @param mixed $screenname screenname or array of screennames to pull from
+    * return table definition for DB_DataObject
+    *
+    * DB_DataObject needs to know something about the table to manipulate
+    * instances. This method provides all the DB_DataObject needs to know.
+    *
+    * @return array array of column definitions
+    */
+    public function table() {
+        return array('id' => DB_DATAOBJECT_INT + DB_DATAOBJECT_NOTNULL,
+                     'screenname' => DB_DATAOBJECT_STR + DB_DATAOBJECT_NOTNULL,
+                     'message' => DB_DATAOBJECT_STR + DB_DATAOBJECT_NOTNULL,
+                     'created' => DB_DATAOBJECT_STR + DB_DATAOBJECT_NOTNULL,
+                     'claimed' => DB_DATAOBJECT_STR);
+    }
+
+    /**
+    * return key definitions for DB_DataObject
+    *
+    * DB_DataObject needs to know about keys that the table has, since it
+    * won't appear in StatusNet's own keys list. In most cases, this will
+    * simply reference your keyTypes() function.
+    *
+    * @return array list of key field names
+    */
+    public function keys() {
+        return array_keys($this->keyTypes());
+    }
+
+    /**
+    * return key definitions for Memcached_DataObject
+    *
+    * Our caching system uses the same key definitions, but uses a different
+    * method to get them. This key information is used to store and clear
+    * cached data, so be sure to list any key that will be used for static
+    * lookups.
+    *
+    * @return array associative array of key definitions, field name to type:
+    *         'K' for primary key: for compound keys, add an entry for each component;
+    *         'U' for unique keys: compound keys are not well supported here.
+    */
+    public function keyTypes() {
+        return array('id' => 'K');
+    }
+
+    /**
+    * Magic formula for non-autoincrementing integer primary keys
+    *
+    * If a table has a single integer column as its primary key, DB_DataObject
+    * assumes that the column is auto-incrementing and makes a sequence table
+    * to do this incrementation. Since we don't need this for our class, we
+    * overload this method and return the magic formula that DB_DataObject needs.
+    *
+    * @return array magic three-false array that stops auto-incrementing.
+    */
+    function sequenceKey() {
+        return array(false, false, false);
+    }
+
+    /**
+     * @param string $screenname screenname or array of screennames to pull from
      *                          If not specified, checks all queues in the system.
      */
     public static function top($screenname = null) {
diff --git a/plugins/Msn/msnmanager.php b/plugins/Msn/msnmanager.php
index 9014501e7e..1eac596df2 100644
--- a/plugins/Msn/msnmanager.php
+++ b/plugins/Msn/msnmanager.php
@@ -170,13 +170,16 @@ class MsnManager extends ImManager {
     * @param array $data Data
     */
     public function handle_session_ready($data) {
-        while (($wm = Msn_waiting_message::top($data['to']) != NULL)) {
+        $wm = Msn_waiting_message::top($data['to']);
+        while ($wm != NULL) {
             if ($this->conn->sendMessage($wm->screenname, $wm->message, $ignore)) {
                 $wm->delete();
             } else {
                 // Requeue the message in the regular queue
                 $this->plugin->send_message($wm->screenname, $wm->message);
             }
+
+            $wm = Msn_waiting_message::top($data['to']);
         }
     }
 

From a3df3b63670aeb31785ba8665ebc2b78d4e7760f Mon Sep 17 00:00:00 2001
From: Luke Fitzgerald <lw.fitzgerald@googlemail.com>
Date: Tue, 3 Aug 2010 09:42:02 -0700
Subject: [PATCH 138/655] Merged in Phergie changes

---
 .../Irc/extlib/phergie/Phergie/Beer/db.php    |  81 ++
 .../Irc/extlib/phergie/Phergie/Connection.php |   2 +-
 .../phergie/Phergie/Connection/Exception.php  |   6 +
 .../extlib/phergie/Phergie/Driver/Streams.php |   1 +
 .../Irc/extlib/phergie/Phergie/Plugin/Acl.php | 150 +++-
 .../phergie/Phergie/Plugin/Caffeine.php       |  69 ++
 .../phergie/Phergie/Plugin/Caffeine/db.php    |  51 ++
 .../extlib/phergie/Phergie/Plugin/Command.php |  60 +-
 .../phergie/Phergie/Plugin/Cookie/db.php      |   3 -
 .../extlib/phergie/Phergie/Plugin/Daddy.php   |  16 +-
 .../extlib/phergie/Phergie/Plugin/Google.php  | 144 ++--
 .../extlib/phergie/Phergie/Plugin/Handler.php |  41 +-
 .../extlib/phergie/Phergie/Plugin/Help.php    | 266 ++++---
 .../extlib/phergie/Phergie/Plugin/Http.php    |   9 +-
 .../extlib/phergie/Phergie/Plugin/Ideone.php  | 180 +++++
 .../phergie/Phergie/Plugin/Iterator.php       | 126 ++++
 .../extlib/phergie/Phergie/Plugin/Karma.php   | 700 +++++++++---------
 .../extlib/phergie/Phergie/Plugin/Message.php | 112 +++
 .../extlib/phergie/Phergie/Plugin/Ping.php    |   4 +-
 .../extlib/phergie/Phergie/Plugin/Quit.php    |  14 +-
 .../extlib/phergie/Phergie/Plugin/Reload.php  |   9 +-
 .../extlib/phergie/Phergie/Plugin/Serve.php   |  25 +-
 .../Irc/extlib/phergie/Phergie/Plugin/Tea.php |  69 ++
 .../extlib/phergie/Phergie/Plugin/Tea/db.php  |  49 ++
 .../Phergie/Plugin/TheFuckingWeather.php      |   6 -
 .../Irc/extlib/phergie/Phergie/Plugin/Tld.php |  18 +-
 .../extlib/phergie/Phergie/Plugin/Youtube.php |   2 +-
 .../phergie/Phergie/Process/Abstract.php      |  32 +-
 .../extlib/phergie/Phergie/Process/Async.php  |   6 +-
 .../phergie/Phergie/Process/Standard.php      |  14 +-
 30 files changed, 1546 insertions(+), 719 deletions(-)
 create mode 100644 plugins/Irc/extlib/phergie/Phergie/Beer/db.php
 create mode 100644 plugins/Irc/extlib/phergie/Phergie/Plugin/Caffeine.php
 create mode 100644 plugins/Irc/extlib/phergie/Phergie/Plugin/Caffeine/db.php
 create mode 100644 plugins/Irc/extlib/phergie/Phergie/Plugin/Ideone.php
 create mode 100644 plugins/Irc/extlib/phergie/Phergie/Plugin/Iterator.php
 create mode 100644 plugins/Irc/extlib/phergie/Phergie/Plugin/Message.php
 create mode 100644 plugins/Irc/extlib/phergie/Phergie/Plugin/Tea.php
 create mode 100644 plugins/Irc/extlib/phergie/Phergie/Plugin/Tea/db.php

diff --git a/plugins/Irc/extlib/phergie/Phergie/Beer/db.php b/plugins/Irc/extlib/phergie/Phergie/Beer/db.php
new file mode 100644
index 0000000000..c7921e5193
--- /dev/null
+++ b/plugins/Irc/extlib/phergie/Phergie/Beer/db.php
@@ -0,0 +1,81 @@
+<?php
+
+if (!defined('__DIR__')) {
+    define('__DIR__', dirname(__FILE__));
+}
+
+// Create database schema
+echo 'Creating database', PHP_EOL;
+$file = __DIR__ . '/beer.db';
+if (file_exists($file)) {
+    unlink($file);
+}
+$db = new PDO('sqlite:' . $file);
+$db->exec('CREATE TABLE beer (name VARCHAR(255), link VARCHAR(255))');
+$db->exec('CREATE UNIQUE INDEX beer_name ON beer (name)');
+$insert = $db->prepare('INSERT INTO beer (name, link) VALUES (:name, :link)');
+
+// Get raw beerme.com data set
+echo 'Downloading beerme.com data set', PHP_EOL;
+$file = __DIR__ . '/beerlist.txt';
+if (!file_exists($file)) {
+    copy('http://beerme.com/beerlist.php', $file);
+}
+$contents = file_get_contents($file);
+
+// Extract data from data set
+echo 'Processing beerme.com data', PHP_EOL;
+$contents = tidy_repair_string($contents);
+libxml_use_internal_errors(true);
+$doc = new DOMDocument;
+$doc->loadHTML($contents);
+libxml_clear_errors();
+$xpath = new DOMXPath($doc);
+$beers = $xpath->query('//table[@class="beerlist"]/tr/td[1]');
+$db->beginTransaction();
+foreach ($beers as $beer) {
+    $name = iconv('UTF-8', 'ISO-8859-1//TRANSLIT', $beer->textContent);
+    $name = preg_replace('/\h*\v+\h*/', '', $name);
+    $link = 'http://beerme.com' . $beer->childNodes->item(1)->getAttribute('href');
+    $insert->execute(array($name, $link));
+}
+$db->commit();
+
+// Clean up
+echo 'Cleaning up', PHP_EOL;
+unlink($file);
+
+// Get and decompress openbeerdb.com data set
+$archive = __DIR__ . '/beers.zip';
+if (!file_exists($archive)) {
+    echo 'Downloading openbeerdb.com data set', PHP_EOL;
+    copy('http://openbeerdb.googlecode.com/files/beers.zip', $archive);
+}
+
+echo 'Decompressing openbeerdb.com data set', PHP_EOL;
+$zip = new ZipArchive;
+$zip->open($archive);
+$zip->extractTo(__DIR__, 'beers/beers.csv');
+$zip->close();
+$file = __DIR__ . '/beers/beers.csv';
+
+// Extract data from data set
+echo 'Processing openbeerdb.com data', PHP_EOL;
+$fp = fopen($file, 'r');
+$columns = fgetcsv($fp, 0, '|');
+$db->beginTransaction();
+while ($line = fgetcsv($fp, 0, '|')) {
+    $line = array_combine($columns, $line);
+    $name = iconv('UTF-8', 'ISO-8859-1//TRANSLIT', $line['name']);
+    $name = preg_replace('/\h*\v+\h*/', '', $name);
+    $link = null;
+    $insert->execute(array($name, $link));
+}
+$db->commit();
+fclose($fp);
+
+// Clean up
+echo 'Cleaning up', PHP_EOL;
+unlink($file);
+unlink($archive);
+rmdir(__DIR__ . '/beers');
diff --git a/plugins/Irc/extlib/phergie/Phergie/Connection.php b/plugins/Irc/extlib/phergie/Phergie/Connection.php
index d6c89ea801..b3f0acf83d 100755
--- a/plugins/Irc/extlib/phergie/Phergie/Connection.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Connection.php
@@ -254,7 +254,7 @@ class Phergie_Connection
         if (!in_array($this->encoding, mb_list_encodings())) {
             throw new Phergie_Connection_Exception(
                 'Encoding ' . $this->encoding . ' is not supported',
-                Phergie_Connection_Exception::ENCODING_NOT_SUPPORTED
+                Phergie_Connection_Exception::ERR_ENCODING_NOT_SUPPORTED
             );
         }
 
diff --git a/plugins/Irc/extlib/phergie/Phergie/Connection/Exception.php b/plugins/Irc/extlib/phergie/Phergie/Connection/Exception.php
index a750e1d860..aec1cd8e0f 100644
--- a/plugins/Irc/extlib/phergie/Phergie/Connection/Exception.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Connection/Exception.php
@@ -41,4 +41,10 @@ class Phergie_Connection_Exception extends Phergie_Exception
      * but that transport is not supported by the current PHP installation
      */
     const ERR_TRANSPORT_NOT_SUPPORTED = 2;
+
+    /**
+     * Error indicating that a connection is configured to use an encoding,
+     * but that encoding is not supported by the current PHP installation
+     */
+    const ERR_ENCODING_NOT_SUPPORTED = 3;
 }
diff --git a/plugins/Irc/extlib/phergie/Phergie/Driver/Streams.php b/plugins/Irc/extlib/phergie/Phergie/Driver/Streams.php
index 3f2ce052b1..73c0230c71 100755
--- a/plugins/Irc/extlib/phergie/Phergie/Driver/Streams.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Driver/Streams.php
@@ -243,6 +243,7 @@ class Phergie_Driver_Streams extends Phergie_Driver_Abstract
 
             // Parse the command and arguments
             list($cmd, $args) = array_pad(explode(' ', $buffer, 2), 2, null);
+            $hostmask = new Phergie_Hostmask(null, null, $this->connection->getHost());
 
         } else {
             // If the event could be from the server or a user...
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Acl.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Acl.php
index 9738df60e0..e209e32e14 100755
--- a/plugins/Irc/extlib/phergie/Phergie/Plugin/Acl.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Acl.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Phergie 
+ * Phergie
  *
  * PHP version 5
  *
@@ -11,7 +11,7 @@
  * It is also available through the world-wide-web at this URL:
  * http://phergie.org/license
  *
- * @category  Phergie 
+ * @category  Phergie
  * @package   Phergie_Plugin_Acl
  * @author    Phergie Development Team <team@phergie.org>
  * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
@@ -20,14 +20,48 @@
  */
 
 /**
- * Provides an access control system to limit reponses to events based on 
+ * Provides an access control system to limit reponses to events based on
  * the users who originate them.
  *
- * @category Phergie 
+ * Configuration settings:
+ * acl.whitelist - mapping of user hostmask patterns (optionally by host) to
+ *                 plugins and methods where those plugins and methods will
+ *                 only be accessible to those users (i.e. and inaccessible
+ *                 to other users)
+ * acl.blacklist - mapping of user hostmasks (optionally by host) to plugins
+ *                 and methods where where those plugins and methods will be
+ *                 inaccessible to those users but accessible to other users
+ * acl.ops       - TRUE to automatically give access to whitelisted plugins
+ *                 and methods to users with ops for events they initiate in
+ *                 channels where they have ops
+ *
+ * The whitelist and blacklist settings are formatted like so:
+ * <code>
+ * 'acl.whitelist' => array(
+ *     'hostname1' => array(
+ *         'pattern1' => array(
+ *             'plugins' => array(
+ *                 'ShortPluginName'
+ *             ),
+ *             'methods' => array(
+ *                 'methodName'
+ *             )
+ *         ),
+ *     )
+ * ),
+ * </code>
+ *
+ * The hostname array dimension is optional; if not used, rules will be
+ * applied across all connections. The pattern is a user hostmask pattern
+ * where asterisks (*) are used for wildcards. Plugins and methods do not
+ * need to be set to empty arrays if they are not used; simply exclude them.
+ *
+ * @category Phergie
  * @package  Phergie_Plugin_Acl
  * @author   Phergie Development Team <team@phergie.org>
  * @license  http://phergie.org/license New BSD License
  * @link     http://pear.phergie.org/package/Phergie_Plugin_Acl
+ * @uses     Phergie_Plugin_UserInfo pear.phergie.org
  */
 class Phergie_Plugin_Acl extends Phergie_Plugin_Abstract
 {
@@ -38,6 +72,8 @@ class Phergie_Plugin_Acl extends Phergie_Plugin_Abstract
      */
     public function onLoad()
     {
+        $this->plugins->getPlugin('UserInfo');
+
         if (!$this->getConfig('acl.blacklist')
             && !$this->getConfig('acl.whitelist')
         ) {
@@ -46,47 +82,105 @@ class Phergie_Plugin_Acl extends Phergie_Plugin_Abstract
     }
 
     /**
-     * Checks permission settings and short-circuits event processing for 
+     * Applies a set of rules to a plugin handler iterator.
+     *
+     * @param Phergie_Plugin_Iterator $iterator Iterator to receive rules
+     * @param array                   $rules    Associate array containing
+     *        either a 'plugins' key pointing to an array containing plugin
+     *        short names to filter, a 'methods' key pointing to an array
+     *        containing method names to filter, or both
+     *
+     * @return void
+     */
+    protected function applyRules(Phergie_Plugin_Iterator $iterator, array $rules)
+    {
+        if (!empty($rules['plugins'])) {
+            $iterator->addPluginFilter($rules['plugins']);
+        }
+        if (!empty($rules['methods'])) {
+            $iterator->addMethodFilter($rules['methods']);
+        }
+    }
+
+    /**
+     * Checks permission settings and short-circuits event processing for
      * blacklisted users.
      *
-     * @return bool FALSE to short-circuit event processing if the user is 
-     *         blacklisted, TRUE otherwise
+     * @return void
      */
     public function preEvent()
     {
         // Ignore server responses
         if ($this->event instanceof Phergie_Event_Response) {
-            return true;
+            return;
         }
 
         // Ignore server-initiated events
         if (!$this->event->isFromUser()) {
-            return true;
+            return;
         }
 
-        // Determine whether a whitelist or blacklist is being used
-        $list = $this->getConfig('acl.whitelist');
-        $matches = true;
-        if (!$list) {
-            $list = $this->getConfig('acl.blacklist');
-            $matches = false;
-        }
+        // Get the iterator used to filter plugins when processing events
+        $iterator = $this->plugins->getIterator();
 
-        // Support host-specific lists 
+        // Get configuration setting values
+        $whitelist = $this->getConfig('acl.whitelist', array());
+        $blacklist = $this->getConfig('acl.blacklist', array());
+        $ops = $this->getConfig('acl.ops', false);
+
+        // Support host-specific lists
         $host = $this->connection->getHost();
-        if (isset($list[$host])) {
-            $list = $list[$host];
-        }
-
-        // Short-circuit event processing if appropriate 
-        $hostmask = $this->event->getHostmask();
-        foreach ($list as $pattern) {
-            if ($hostmask->matches($pattern)) {
-                return $matches;
+        foreach (array('whitelist', 'blacklist') as $var) {
+            foreach ($$var as $pattern => $rules) {
+                $regex = '/^' . str_replace('*', '.*', $pattern) . '$/i';
+                if (preg_match($regex, $host)) {
+                    ${$var} = ${$var}[$pattern];
+                    break;
+                }
             }
         }
 
-        // Allow event processing if appropriate 
-        return !$matches;
+        // Get information on the user initiating the current event
+        $hostmask = $this->event->getHostmask();
+        $isOp = $ops
+              && $this->event->isInChannel()
+              && $this->plugins->userInfo->isOp(
+                $this->event->getNick(),
+                $this->event->getSource()
+              );
+
+        // Filter whitelisted commands if the user is not on the whitelist
+        if (!$isOp) {
+            $whitelisted = false;
+            foreach ($whitelist as $pattern => $rules) {
+                if ($hostmask->matches($pattern)) {
+                    $whitelisted = true;
+                }
+            }
+            if (!$whitelisted) {
+                foreach ($whitelist as $pattern => $rules) {
+                    $this->applyRules($iterator, $rules);
+                }
+            }
+        }
+
+        // Filter blacklisted commands if the user is on the blacklist
+        $blacklisted = false;
+        foreach ($blacklist as $pattern => $rules) {
+            if ($hostmask->matches($pattern)) {
+                $this->applyRules($iterator, $rules);
+                break;
+            }
+        }
+    }
+
+    /**
+     * Clears filters on the plugin handler iterator.
+     *
+     * @return void
+     */
+    public function postDispatch()
+    {
+        $this->plugins->getIterator()->clearFilters();
     }
 }
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Caffeine.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Caffeine.php
new file mode 100644
index 0000000000..2b76bd312f
--- /dev/null
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Caffeine.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ * Phergie
+ *
+ * PHP version 5
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.
+ * It is also available through the world-wide-web at this URL:
+ * http://phergie.org/license
+ *
+ * @category  Phergie
+ * @package   Phergie_Plugin_Caffeine
+ * @author    Phergie Development Team <team@phergie.org>
+ * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
+ * @license   http://phergie.org/license New BSD License
+ * @link      http://pear.phergie.org/package/Phergie_Plugin_Caffeine
+ */
+
+/**
+ * Processes requests to serve users caffeinated beverages.
+ *
+ * @category Phergie
+ * @package  Phergie_Plugin_Caffeine
+ * @author   Phergie Development Team <team@phergie.org>
+ * @license  http://phergie.org/license New BSD License
+ * @link     http://pear.phergie.org/package/Phergie_Plugin_Caffeine
+ * @uses     Phergie_Plugin_Command pear.phergie.org
+ * @uses     Phergie_Plugin_Serve pear.phergie.org
+ */
+class Phergie_Plugin_Caffeine extends Phergie_Plugin_Abstract
+{
+    /**
+     * Checks for dependencies.
+     *
+     * @return void
+     */
+    public function onLoad()
+    {
+        $plugins = $this->plugins;
+        $plugins->getPlugin('Command');
+        $plugins->getPlugin('Serve');
+    }
+
+    /**
+     * Processes requests to serve a user a caffeinated beverage.
+     *
+     * @param string $request Request including the target and an optional
+     *        suggestion of what caffeinated beverage to serve
+     *
+     * @return void
+     */
+    public function onCommandCaffeine($request)
+    {
+        $format = $this->getConfig(
+            'beer.format',
+            'throws %target% %article% %item%.'
+        );
+
+        $this->plugins->getPlugin('Serve')->serve(
+            dirname(__FILE__) . '/Caffeine/caffeine.db',
+            'caffeine',
+            $format,
+            $request
+        );
+    }
+}
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Caffeine/db.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Caffeine/db.php
new file mode 100644
index 0000000000..cdff52fd8d
--- /dev/null
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Caffeine/db.php
@@ -0,0 +1,51 @@
+<?php
+
+if (!defined('__DIR__')) {
+    define('__DIR__', dirname(__FILE__));
+}
+
+// Create database schema
+echo 'Creating database', PHP_EOL;
+$file = __DIR__ . '/caffeine.db';
+if (file_exists($file)) {
+    unlink($file);
+}
+$db = new PDO('sqlite:' . $file);
+$db->exec('CREATE TABLE caffeine (name VARCHAR(255), link VARCHAR(255))');
+$db->exec('CREATE UNIQUE INDEX caffeine_name ON caffeine (name)');
+$insert = $db->prepare('INSERT INTO caffeine (name, link) VALUES (:name, :link)');
+
+// Get raw energyfiend.com data set
+echo 'Downloading energyfiend.com data set', PHP_EOL;
+$file = __DIR__ . '/the-caffeine-database.html';
+if (!file_exists($file)) {
+    copy('http://www.energyfiend.com/the-caffeine-database', $file);
+}
+$contents = file_get_contents($file);
+
+// Extract data from data set
+echo 'Processing energyfiend.com data', PHP_EOL;
+$contents = tidy_repair_string($contents);
+libxml_use_internal_errors(true);
+$doc = new DOMDocument;
+$doc->loadHTML($contents);
+libxml_clear_errors();
+$xpath = new DOMXPath($doc);
+$caffeine = $xpath->query('//table[@id="caffeinedb"]//tr/td[1]');
+$db->beginTransaction();
+foreach ($caffeine as $drink) {
+    $name = iconv('UTF-8', 'ISO-8859-1//TRANSLIT', $drink->textContent);
+    $name = preg_replace('/\s*\v+\s*/', ' ', $name);
+    if ($drink->firstChild->nodeName == 'a') {
+        $link = 'http://energyfiend.com'
+              . $drink->firstChild->getAttribute('href');
+    } else {
+        $link = null;
+    }
+    $insert->execute(array($name, $link));
+}
+$db->commit();
+
+// Clean up
+echo 'Cleaning up', PHP_EOL;
+unlink($file);
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Command.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Command.php
index 2ab5b69d1d..48352b15dd 100755
--- a/plugins/Irc/extlib/phergie/Phergie/Plugin/Command.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Command.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Phergie 
+ * Phergie
  *
  * PHP version 5
  *
@@ -11,7 +11,7 @@
  * It is also available through the world-wide-web at this URL:
  * http://phergie.org/license
  *
- * @category  Phergie 
+ * @category  Phergie
  * @package   Phergie_Plugin_Command
  * @author    Phergie Development Team <team@phergie.org>
  * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
@@ -20,20 +20,28 @@
  */
 
 /**
- * Handles parsing and execution of commands sent by users via messages sent 
+ * Handles parsing and execution of commands sent by users via messages sent
  * to channels in which the bot is present or directly to the bot.
  *
- * @category Phergie 
+ * @category Phergie
  * @package  Phergie_Plugin_Command
  * @author   Phergie Development Team <team@phergie.org>
  * @license  http://phergie.org/license New BSD License
  * @link     http://pear.phergie.org/package/Phergie_Plugin_Command
  * @uses     extension reflection
+ * @uses     Phergie_Plugin_Message pear.phergie.org
  */
 class Phergie_Plugin_Command extends Phergie_Plugin_Abstract
 {
     /**
-     * Cache for command lookups used to confirm that methods exist and 
+     * Prefix for command method names
+     *
+     * @var string
+     */
+    const METHOD_PREFIX = 'onCommand';
+
+    /**
+     * Cache for command lookups used to confirm that methods exist and
      * parameter counts match
      *
      * @var array
@@ -41,24 +49,28 @@ class Phergie_Plugin_Command extends Phergie_Plugin_Abstract
     protected $methods = array();
 
     /**
-     * Prefix for command method names
+     * Load the Message plugin
      *
-     * @var string
+     * @return void
      */
-    protected $methodPrefix = 'onCommand';
+    public function onLoad()
+    {
+        $plugins = $this->getPluginHandler();
+        $plugins->getPlugin('Message');
+    }
 
     /**
      * Populates the methods cache.
      *
      * @return void
      */
-    protected function populateMethodCache()
+    public function populateMethodCache()
     {
         foreach ($this->getPluginHandler() as $plugin) {
             $reflector = new ReflectionClass($plugin);
             foreach ($reflector->getMethods() as $method) {
                 $name = $method->getName();
-                if (strpos($name, $this->methodPrefix) === 0 
+                if (strpos($name, self::METHOD_PREFIX) === 0
                     && !isset($this->methods[$name])
                 ) {
                     $this->methods[$name] = array(
@@ -84,26 +96,26 @@ class Phergie_Plugin_Command extends Phergie_Plugin_Abstract
             $this->populateMethodCache();
         }
 
-        // Get the content of the message
-        $event = $this->getEvent();
-        $msg = trim($event->getText());
-        $prefix = $this->getConfig('command.prefix');
-
-        // Check for the command prefix if one is set and needed
-        if ($prefix && $event->isInChannel()) {
-            if (strpos($msg, $prefix) !== 0) {
-                return;
-            } else {
-                $msg = substr($msg, strlen($prefix));
-            }
+        // Check for a prefixed message
+        $msg = $this->plugins->message->getMessage();
+        if ($msg === false) {
+            return;
         }
 
         // Separate the command and arguments
         $parsed = preg_split('/\s+/', $msg, 2);
-        $method = $this->methodPrefix . ucfirst(strtolower(array_shift($parsed))); 
+        $command = strtolower(array_shift($parsed));
         $args = count($parsed) ? array_shift($parsed) : '';
 
+        // Resolve aliases to their corresponding commands
+        $aliases = $this->getConfig('command.aliases', array());
+        $result = preg_grep('/^' . $command . '$/i', array_keys($aliases));
+        if ($result) {
+            $command = $aliases[array_shift($result)];
+        }
+
         // Check to ensure the command exists
+        $method = self::METHOD_PREFIX . ucfirst($command);
         if (empty($this->methods[$method])) {
             return;
         }
@@ -122,7 +134,7 @@ class Phergie_Plugin_Command extends Phergie_Plugin_Abstract
             // Parse the arguments
             $args = preg_split('/\s+/', $args, $this->methods[$method]['total']);
 
-            // If the minimum arguments are passed, call the method 
+            // If the minimum arguments are passed, call the method
             if ($this->methods[$method]['required'] <= count($args)) {
                 call_user_func_array(
                     array($this->getPluginHandler(), $method),
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Cookie/db.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Cookie/db.php
index 91d375ca6d..27763159cc 100644
--- a/plugins/Irc/extlib/phergie/Phergie/Plugin/Cookie/db.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Cookie/db.php
@@ -36,9 +36,6 @@ $cookies = $xpath->query('//table[@width="90%"]/tr/td[1]/a');
 
 foreach ($cookies as $cookie) {
     $name = $cookie->textContent;
-    foreach (range(0, mb_strlen($name) - 1) as $index) {
-        echo mb_strcut($name, $index, 1), PHP_EOL;
-    }
     $name = str_replace(
         array('(',')',"\n", 'cookies'),
         array('','', ' ', 'cookie'),
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Daddy.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Daddy.php
index d47c3c41d3..ed258e10ff 100644
--- a/plugins/Irc/extlib/phergie/Phergie/Plugin/Daddy.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Daddy.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Phergie 
+ * Phergie
  *
  * PHP version 5
  *
@@ -11,7 +11,7 @@
  * It is also available through the world-wide-web at this URL:
  * http://phergie.org/license
  *
- * @category  Phergie 
+ * @category  Phergie
  * @package   Phergie_Plugin_Daddy
  * @author    Phergie Development Team <team@phergie.org>
  * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
@@ -23,7 +23,7 @@
  * Simply responds to messages addressed to the bot that contain the phrase
  * "Who's your daddy?" and related variations.
  *
- * @category Phergie 
+ * @category Phergie
  * @package  Phergie_Plugin_Daddy
  * @author   Phergie Development Team <team@phergie.org>
  * @license  http://phergie.org/license New BSD License
@@ -45,15 +45,11 @@ class Phergie_Plugin_Daddy extends Phergie_Plugin_Abstract
         $text = $event->getArgument(1);
         $target = $event->getNick();
         $source = $event->getSource();
-        $pattern 
-            = '/' . preg_quote($prefix) . 
+        $pattern
+            = '/' . preg_quote($prefix) .
             '\s*?who\'?s y(?:our|a) ([^?]+)\??/iAD';
         if (preg_match($pattern, $text, $m)) {
-            if ($config['daddy.curses'] && mt_rand(0, 5) === 5) {
-                $msg = $target . ': I am your ' . $m[1] . ', bitch!';
-            } else {
-                $msg = 'You\'re my ' . $m[1] . ', ' . $target . '!';
-            }
+            $msg = 'You\'re my ' . $m[1] . ', ' . $target . '!';
             $this->doPrivmsg($source, $msg);
         }
     }
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Google.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Google.php
index faa98f926a..d2a9d4dce9 100644
--- a/plugins/Irc/extlib/phergie/Phergie/Plugin/Google.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Google.php
@@ -32,24 +32,9 @@
  * @uses     Phergie_Plugin_Command pear.phergie.org
  * @uses     Phergie_Plugin_Http pear.phergie.org
  * @uses     Phergie_Plugin_Temperature pear.phergie.org
- *
- * @pluginDesc Provide access to some Google services
  */
 class Phergie_Plugin_Google extends Phergie_Plugin_Abstract
 {
-
-    /**
-     * HTTP plugin
-     *
-     * @var Phergie_Plugin_Http
-     */
-    protected $http;
-
-    /**
-     * Language for Google Services
-     */
-    protected $lang;
-
     /**
      * Checks for dependencies.
      *
@@ -59,11 +44,8 @@ class Phergie_Plugin_Google extends Phergie_Plugin_Abstract
     {
         $plugins = $this->getPluginHandler();
         $plugins->getPlugin('Command');
-        $this->http = $plugins->getPlugin('Http');
-        $plugins->getPlugin('Help')->register($this);
+        $plugins->getPlugin('Http');
         $plugins->getPlugin('Weather');
-
-        $this->lang = $this->getConfig('google.lang', 'en');
     }
 
     /**
@@ -73,8 +55,6 @@ class Phergie_Plugin_Google extends Phergie_Plugin_Abstract
      *
      * @return void
      * @todo Implement use of URL shortening here
-     *
-     * @pluginCmd [query] do a search on google
      */
     public function onCommandG($query)
     {
@@ -83,7 +63,7 @@ class Phergie_Plugin_Google extends Phergie_Plugin_Abstract
             'v' => '1.0',
             'q' => $query
         );
-        $response = $this->http->get($url, $params);
+        $response = $this->plugins->http->get($url, $params);
         $json = $response->getContent()->responseData;
         $event = $this->getEvent();
         $source = $event->getSource();
@@ -110,8 +90,6 @@ class Phergie_Plugin_Google extends Phergie_Plugin_Abstract
      * @param string $query Search term
      *
      * @return void
-     *
-     * @pluginCmd [query] Do a search on Google and count the results
      */
     public function onCommandGc($query)
     {
@@ -120,7 +98,7 @@ class Phergie_Plugin_Google extends Phergie_Plugin_Abstract
             'v' => '1.0',
             'q' => $query
         );
-        $response = $this->http->get($url, $params);
+        $response = $this->plugins->http->get($url, $params);
         $json = $response->getContent()->responseData->cursor;
         $count = $json->estimatedResultCount;
         $event = $this->getEvent();
@@ -146,8 +124,6 @@ class Phergie_Plugin_Google extends Phergie_Plugin_Abstract
      * @param string $query Term to translate
      *
      * @return void
-     *
-     * @pluginCmd [from language] [to language] [text to translate] Do a translation on Google
      */
     public function onCommandGt($from, $to, $query)
     {
@@ -157,7 +133,7 @@ class Phergie_Plugin_Google extends Phergie_Plugin_Abstract
             'q' => $query,
             'langpair' => $from . '|' . $to
         );
-        $response = $this->http->get($url, $params);
+        $response = $this->plugins->http->get($url, $params);
         $json = $response->getContent();
         $event = $this->getEvent();
         $source = $event->getSource();
@@ -180,18 +156,16 @@ class Phergie_Plugin_Google extends Phergie_Plugin_Abstract
      *        between 0 and 3 to get the forecast
      *
      * @return void
-     *
-     * @pluginCmd [location] Show the weather for the specified location
      */
     public function onCommandGw($location, $offset = null)
     {
         $url = 'http://www.google.com/ig/api';
         $params = array(
             'weather' => $location,
-            'hl' => $this->lang,
+            'hl' => $this->getConfig('google.lang', 'en'),
             'oe' => 'UTF-8'
         );
-        $response = $this->http->get($url, $params);
+        $response = $this->plugins->http->get($url, $params);
         $xml = $response->getContent()->weather;
 
         $event = $this->getEvent();
@@ -280,8 +254,6 @@ class Phergie_Plugin_Google extends Phergie_Plugin_Abstract
      * @param string $location Location to search for
      *
      * @return void
-     *
-     * @pluginCmd [location] Get the location from Google Maps to the location specified
      */
     public function onCommandGmap($location)
     {
@@ -294,13 +266,13 @@ class Phergie_Plugin_Google extends Phergie_Plugin_Abstract
         $params = array(
             'q' => $location,
             'output' => 'json',
-            'gl' => $this->lang,
+            'gl' => $this->getConfig('google.lang', 'en'),
             'sensor' => 'false',
             'oe' => 'utf8',
             'mrt' => 'all',
             'key' => $this->getConfig('google.key')
         );
-        $response = $this->http->get($url, $params);
+        $response = $this->plugins->http->get($url, $params);
         $json =  $response->getContent();
         if (!empty($json)) {
             $qtd = count($json->Placemark);
@@ -345,8 +317,6 @@ class Phergie_Plugin_Google extends Phergie_Plugin_Abstract
      * @param string $to    Destination metric
      *
      * @return void
-     *
-     * @pluginCmd [value] [currency from] [currency to] Converts a monetary value from one currency to another
      */
     public function onCommandGconvert($value, $from, $to)
     {
@@ -356,29 +326,21 @@ class Phergie_Plugin_Google extends Phergie_Plugin_Abstract
             'from' => $from,
             'to' => $to
         );
-        $response = $this->http->get($url, $params);
+        $response = $this->plugins->http->get($url, $params);
         $contents = $response->getContent();
         $event = $this->getEvent();
         $source = $event->getSource();
         $nick = $event->getNick();
         if ($contents) {
-            preg_match(
-                '#<span class=bld>.*? ' . $to . '</span>#im',
-                $contents,
-                $matches
-            );
-            if (!$matches[0]) {
-                $this->doPrivmsg($source, $nick . ', I can\'t do that.');
-            } else {
-                $str = str_replace('<span class=bld>', '', $matches[0]);
-                $str = str_replace($to . '</span>', '', $str);
-                $text
-                    = number_format($value, 2, ',', '.') . ' ' . $from .
-                    ' => ' . number_format($str, 2, ',', '.') . ' ' . $to;
-                $this->doPrivmsg($source, $text);
-            }
-        } else {
-            $this->doPrivmsg($source, $nick . ', we had a problem.');
+            libxml_use_internal_errors(true);
+            $doc = new DOMDocument;
+            $doc->loadHTML($contents);
+            libxml_clear_errors();
+            $xpath = new DOMXPath($doc);
+            $result = $xpath->query('//div[@id="currency_converter_result"]');
+            $div = $result->item(0);
+            $text = rtrim($div->textContent);
+            $this->doPrivmsg($source, $text);
         }
     }
 
@@ -395,7 +357,7 @@ class Phergie_Plugin_Google extends Phergie_Plugin_Abstract
     public function onCommandConvert($query)
     {
         $url = 'http://www.google.com/search?q=' . urlencode($query);
-        $response = $this->http->get($url);
+        $response = $this->plugins->http->get($url);
         $contents = $response->getContent();
         $event = $this->getEvent();
         $source = $event->getSource();
@@ -434,49 +396,61 @@ class Phergie_Plugin_Google extends Phergie_Plugin_Abstract
      *
      * @return void
      * @todo Implement use of URL shortening here
-     *
-     * @pluginCmd [query] do a search of a definition on Google Dictionary
      */
     public function onCommandDefine($query)
     {
-        $query = urlencode($query);
-        $url = 'http://www.google.com/dictionary/json?callback=result'.
-               '&q='.$query.'&sl='.$this->lang.'&tl='.$this->lang.
-               '&restrict=pr,de';
-        $json = file_get_contents($url);
+        $lang = $this->getConfig('google.lang', 'en');
+        $url = 'http://www.google.com/dictionary/json';
+        $params = array(
+            'callback' => 'result',
+            'q' => $query,
+            'sl' => $lang,
+            'tl' => $lang,
+            'restrict' => 'pr,de'
+        );
+        $response = $this->plugins->http->get($url, $params);
+        $json = $response->getContent();
 
-        //Remove some garbage from the json
-        $json = str_replace(array("result(", ",200,null)"), "", $json);
-
-        //Awesome workaround to remove a lot of slashes from json
+        // Remove some garbage from the JSON and decode it
+        $json = str_replace(array('result(', ',200,null)'), '', $json);
         $json = str_replace('"', '¿?¿', $json);
         $json = strip_tags(stripcslashes($json));
         $json = str_replace('"', "'", $json);
         $json = str_replace('¿?¿', '"', $json);
-
         $json = json_decode($json);
 
         $event = $this->getEvent();
         $source = $event->getSource();
         $nick = $event->getNick();
-        if (!empty($json->webDefinitions)){
-            $results = count($json->webDefinitions[0]->entries);
-            $more = $results > 1 ? ($results-1).' ' : NULL;
-            $lang_code = substr($this->lang, 0, 2);
-            $msg =
-                $nick . ': ' .
-                $json->webDefinitions[0]->entries[0]->terms[0]->text .
-                ' - You can find more '.$more.'results at '.
-                'http://www.google.com/dictionary?aq=f&langpair='.
-                $lang_code.'%7C'.$lang_code.'&q='.$query.'&hl='.$lang_code;
+        if (!empty($json->webDefinitions)) {
+            $results = 0;
+            foreach ($json->primaries[0]->entries as $entry) {
+                if ($entry->type == 'meaning') {
+                    $results++;
+                    if (empty($text)) {
+                        foreach ($entry->terms as $term) {
+                            if ($term->type == 'text') {
+                                $text = trim($term->text);
+                            }
+                        }
+                    }
+                }
+            }
+            $more = $results > 1 ? ($results - 1) . ' ' : '';
+            $lang_code = substr($lang, 0, 2);
+            $msg = $nick . ': ' . $text
+                 . ' - You can find ' . $more . 'more results at '
+                 . 'http://www.google.com/dictionary'
+                 . '?aq=f'
+                 . '&langpair=' . $lang_code . '%7C' . $lang_code
+                 . '&q=' . $query
+                 . '&hl=' . $lang_code;
             $this->doPrivmsg($source, $msg);
-        }else{
-            if ($this->lang != 'en'){
-               $temp = $this->lang;
-               $this->lang = 'en';
+        } else {
+            if ($lang != 'en'){
+               $lang = 'en';
                $this->onCommandDefine($query);
-               $this->lang = $temp;
-            }else{
+            } else {
                $msg = $nick . ': No results for this query.';
                $this->doPrivmsg($source, $msg);
             }
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Handler.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Handler.php
index b2ef089b44..4304bef99e 100755
--- a/plugins/Irc/extlib/phergie/Phergie/Plugin/Handler.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Handler.php
@@ -68,6 +68,14 @@ class Phergie_Plugin_Handler implements IteratorAggregate, Countable
      */
     protected $events;
 
+    /**
+     * Iterator used for selectively proxying method calls to contained
+     * plugins
+     *
+     * @var Iterator
+     */
+    protected $iterator;
+
     /**
      * Constructor to initialize class properties and add the path for core
      * plugins.
@@ -416,26 +424,39 @@ class Phergie_Plugin_Handler implements IteratorAggregate, Countable
      */
     public function getIterator()
     {
-        return new ArrayIterator($this->plugins);
+        if (empty($this->iterator)) {
+            $this->iterator = new Phergie_Plugin_Iterator(
+                new ArrayIterator($this->plugins)
+            );
+        }
+        return $this->iterator;
     }
 
     /**
-     * Proxies method calls to all plugins containing the called method. An
-     * individual plugin may short-circuit this process by explicitly
-     * returning FALSE.
+     * Sets the iterator for all currently loaded plugin instances.
+     *
+     * @param Iterator $iterator Plugin iterator
+     *
+     * @return Phergie_Plugin_Handler Provides a fluent interface
+     */
+    public function setIterator(Iterator $iterator)
+    {
+        $this->iterator = $iterator;
+        return $this;
+    }
+
+    /**
+     * Proxies method calls to all plugins containing the called method.
      *
      * @param string $name Name of the method called
      * @param array  $args Arguments passed in the method call
      *
-     * @return bool FALSE if a plugin short-circuits processing by returning
-     *         FALSE, TRUE otherwise
+     * @return void
      */
     public function __call($name, array $args)
     {
-        foreach ($this->plugins as $plugin) {
-            if (call_user_func_array(array($plugin, $name), $args) === false) {
-                return false;
-            }
+        foreach ($this->getIterator() as $plugin) {
+            call_user_func_array(array($plugin, $name), $args);
         }
         return true;
     }
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Help.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Help.php
index 7cc8349571..4c2c49b314 100644
--- a/plugins/Irc/extlib/phergie/Phergie/Plugin/Help.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Help.php
@@ -28,26 +28,16 @@
  * @license  http://phergie.org/license New BSD License
  * @link     http://pear.phergie.org/package/Phergie_Plugin_Help
  * @uses     Phergie_Plugin_Command pear.phergie.org
- *
- * @pluginDesc Provides access to plugin help information
  */
 class Phergie_Plugin_Help extends Phergie_Plugin_Abstract
 {
-
     /**
-     * Holds the registry of help data indexed by plugin name
+     * Registry of help data indexed by plugin name
      *
      * @var array
      */
     protected $registry;
 
-    /**
-     * Whether the registry has been alpha sorted
-     *
-     * @var bool
-     */
-    protected $registry_sorted = false;
-
     /**
      * Checks for dependencies.
      *
@@ -56,143 +46,175 @@ class Phergie_Plugin_Help extends Phergie_Plugin_Abstract
     public function onLoad()
     {
         $this->getPluginHandler()->getPlugin('Command');
-        $this->register($this);
+    }
+
+    /**
+     * Creates a registry of plugin metadata on connect.
+     *
+     * @return void
+     */
+    public function onConnect()
+    {
+        $this->populateRegistry();
+    }
+
+    /**
+     * Creates a registry of plugin metadata.
+     *
+     * @return void
+     */
+    public function populateRegistry()
+    {
+        $this->registry = array();
+
+        foreach ($this->plugins as $plugin) {
+            $class = new ReflectionClass($plugin);
+            $pluginName = strtolower($plugin->getName());
+
+            // Parse the plugin description
+            $docblock = $class->getDocComment();
+            $annotations = $this->getAnnotations($docblock);
+            if (isset($annotations['pluginDesc'])) {
+                $pluginDesc = implode(' ', $annotations['pluginDesc']);
+            } else {
+                $pluginDesc = $this->parseShortDescription($docblock);
+            }
+            $this->registry[$pluginName] = array(
+                'desc' => $pluginDesc,
+                'cmds' => array()
+            );
+
+            // Parse command method descriptions
+            $methodPrefix = Phergie_Plugin_Command::METHOD_PREFIX;
+            $methodPrefixLength = strlen($methodPrefix);
+            foreach ($class->getMethods() as $method) {
+                if (strpos($method->getName(), $methodPrefix) !== 0) {
+                    continue;
+                }
+
+                $cmd = strtolower(substr($method->getName(), $methodPrefixLength));
+                $docblock = $method->getDocComment();
+                $annotations = $this->getAnnotations($docblock);
+
+                if (isset($annotations['pluginCmd'])) {
+                    $cmdDesc = implode(' ', $annotations['pluginCmd']);
+                } else {
+                    $cmdDesc = $this->parseShortDescription($docblock);
+                }
+
+                $cmdParams = array();
+                if (!empty($annotations['param'])) {
+                    foreach ($annotations['param'] as $param) {
+                        $match = null;
+                        if (preg_match('/\h+\$([^\h]+)\h+/', $param, $match)) {
+                            $cmdParams[] = $match[1];
+                        }
+                    }
+                }
+
+                $this->registry[$pluginName]['cmds'][$cmd] = array(
+                    'desc' => $cmdDesc,
+                    'params' => $cmdParams
+                );
+            }
+
+            if (empty($this->registry[$pluginName]['cmds'])) {
+                unset($this->registry[$pluginName]);
+            }
+        }
     }
 
     /**
      * Displays a list of plugins with help information available or
      * commands available for a specific plugin.
      *
-     * @param string $plugin Short name of the plugin for which commands
-     *        should be returned, else a list of plugins with help
-     *        information available is returned
+     * @param string $query Optional short name of a plugin for which commands
+     *        should be returned or a command; if unspecified, a list of
+     *        plugins with help information available is returned
      *
      * @return void
-     *
-     * @pluginCmd Show all active plugins with help available
-     * @pluginCmd [plugin] Shows commands line for a specific plugin
      */
-    public function onCommandHelp($plugin = null)
+    public function onCommandHelp($query = null)
     {
+        if ($query == 'refresh') {
+            $this->populateRegistry();
+        }
+
         $nick = $this->getEvent()->getNick();
+        $delay = $this->getConfig('help.delay', 2);
 
-        if (!$plugin) {
-            // protect from sorting the registry each time help is called
-            if (!$this->registry_sorted) {
-                asort($this->registry);
-                $this->registry_sorted = true;
-            }
+        // Handle requests for a plugin list
+        if (!$query) {
+            $msg = 'These plugins have help information available: '
+                 . implode(', ', array_keys($this->registry));
+            $this->doPrivmsg($nick, $msg);
+            return;
+        }
 
-            $msg = 'These plugins below have help information available.';
-            $this->doPrivMsg($nick, $msg);
+        // Handle requests for plugin information
+        $query = strtolower($query);
+        if (isset($this->registry[$query])
+            && empty($this->registry[$query]['cmds'][$query])) {
+            $msg = $query . ' - ' . $this->registry[$query]['desc'];
+            $this->doPrivmsg($nick, $msg);
 
-            foreach ($this->registry as $plugin => $data) {
-                $this->doPrivMsg($nick, "{$plugin} - {$data['desc']}");
-            }
-        } else {
-            if (isset($this->getPluginHandler()->{$plugin})
-                && isset($this->registry[strtolower($plugin)]['cmd'])
-            ) {
+            $msg = 'Available commands - '
+                 . implode(', ', array_keys($this->registry[$query]['cmds']));
+            $this->doPrivmsg($nick, $msg);
+
+            if ($this->getConfig('command.prefix')) {
                 $msg
-                    = 'The ' .
-                    $plugin .
-                    ' plugin exposes the commands shown below.';
-                $this->doPrivMsg($nick, $msg);
-                if ($this->getConfig('command.prefix')) {
-                    $msg
-                        = 'Note that these commands must be prefixed with "' .
-                        $this->getConfig('command.prefix') .
-                        '" (without quotes) when issued in a public channel.';
-                    $this->doPrivMsg($nick, $msg);
-                }
-
-                foreach ($this->registry[strtolower($plugin)]['cmd']
-                    as $cmd => $descs
-                ) {
-                    foreach ($descs as $desc) {
-                        $this->doPrivMsg($nick, "{$cmd} {$desc}");
-                    }
-                }
-
-            } else {
-                $this->doPrivMsg($nick, 'That plugin is not loaded.');
+                    = 'Note that these commands must be prefixed with "'
+                    . $this->getConfig('command.prefix')
+                    . '" (without quotes) when issued in a public channel.';
+                $this->doPrivmsg($nick, $msg);
             }
+
+            return;
+        }
+
+        // Handle requests for command information
+        foreach ($this->registry as $plugin => $data) {
+            if (empty($data['cmds'])) {
+                continue;
+            }
+
+            $result = preg_grep('/^' . $query . '$/i', array_keys($data['cmds']));
+            if (!$result) {
+                continue;
+            }
+
+            $cmd = $data['cmds'][array_shift($result)];
+            $msg = $query;
+            if (!empty($cmd['params'])) {
+                $msg .= ' [' . implode('] [', $cmd['params']) . ']';
+            }
+            $msg .= ' - ' . $cmd['desc'];
+            $this->doPrivmsg($nick, $msg);
         }
     }
 
     /**
-     * Sets the description for the plugin instance
+     * Parses and returns the short description from a docblock.
      *
-     * @param Phergie_Plugin_Abstract $plugin      plugin instance
-     * @param string                  $description plugin description
+     * @param string $docblock Docblock comment code
      *
-     * @return void
+     * @return string Short description (i.e. content from the start of the
+     *         docblock up to the first double-newline)
      */
-    public function setPluginDescription(
-        Phergie_Plugin_Abstract $plugin,
-        $description
-    ) {
-        $this->registry[strtolower($plugin->getName())]
-                ['desc'] = $description;
-    }
-
-    /**
-     * Sets the description for the command on the plugin instance
-     *
-     * @param Phergie_Plugin_Abstract $plugin      plugin instance
-     * @param string                  $command     from onCommand method
-     * @param string                  $description command description
-     *
-     * @return void
-     */
-    public function setCommandDescription(
-        Phergie_Plugin_Abstract $plugin,
-        $command,
-        array $description
-    ) {
-        $this->registry[strtolower($plugin->getName())]
-            ['cmd'][$command] = $description;
-    }
-
-    /**
-     * registers the plugin with the help plugin. this will parse the docblocks
-     * for specific annotations that this plugin will respond with when
-     * queried.
-     *
-     * @param Phergie_Plugin_Abstract $plugin plugin instance
-     *
-     * @return void
-     */
-    public function register(Phergie_Plugin_Abstract $plugin)
+    protected function parseShortDescription($docblock)
     {
-        $class = new ReflectionClass($plugin);
-
-        $annotations = self::parseAnnotations($class->getDocComment());
-        if (isset($annotations['pluginDesc'])) {
-            $this->setPluginDescription(
-                $plugin,
-                join(' ', $annotations['pluginDesc'])
-            );
-        }
-
-        foreach ($class->getMethods() as $method) {
-            if (strpos($method->getName(), 'onCommand') !== false) {
-                $annotations = self::parseAnnotations($method->getDocComment());
-                if (isset($annotations['pluginCmd'])) {
-                    $cmd = strtolower(substr($method->getName(), 9));
-                    $this->setCommandDescription(
-                        $plugin,
-                        $cmd,
-                        $annotations['pluginCmd']
-                    );
-                }
-            }
-        }
+        $desc = preg_replace(
+            array('#^\h*\*\h*#m', '#^/\*\*\h*\v+\h*#', '#(?:\r?\n){2,}.*#s', '#\s*\v+\s*#'),
+            array('', '', '', ' '),
+            $docblock
+        );
+        return $desc;
     }
 
     /**
-     * Taken from PHPUnit/Util/Test.php:243 and modified to fix an issue
-     * with tag content spanning multiple lines.
+     * Taken from PHPUnit/Util/Test.php and modified to fix an issue with
+     * tag content spanning multiple lines.
      *
      * PHPUnit
      *
@@ -232,7 +254,7 @@ class Phergie_Plugin_Help extends Phergie_Plugin_Abstract
      *
      * @return array
      */
-    protected static function parseAnnotations($docblock)
+    protected function getAnnotations($docblock)
     {
         $annotations = array();
 
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Http.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Http.php
index 43c69eb879..7c5c8704c2 100644
--- a/plugins/Irc/extlib/phergie/Phergie/Plugin/Http.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Http.php
@@ -184,7 +184,10 @@ class Phergie_Plugin_Http extends Phergie_Plugin_Abstract
             $type = $this->response->getHeaders('content-type');
             foreach ($this->handlers as $expr => $handler) {
                 if (preg_match('#^' . $expr . '$#i', $type)) {
-                    $body = call_user_func($handler, $body);
+                    $handled = call_user_func($handler, $body);
+                    if (!empty($handled)) {
+                        $body = $handled;
+                    }
                 }
             }
 
@@ -256,7 +259,7 @@ class Phergie_Plugin_Http extends Phergie_Plugin_Abstract
     public function post($url, array $query = array(),
         array $post = array(), array $context = array()
     ) {
-        if (!empty($params)) {
+        if (!empty($query)) {
             $url .= '?' . http_build_query($query);
         }
 
@@ -278,4 +281,4 @@ class Phergie_Plugin_Http extends Phergie_Plugin_Abstract
 
         return $this->request($url, $context);
     }
-}
+}
\ No newline at end of file
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Ideone.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Ideone.php
new file mode 100644
index 0000000000..3af88dda94
--- /dev/null
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Ideone.php
@@ -0,0 +1,180 @@
+<?php
+/**
+ * Phergie
+ *
+ * PHP version 5
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.
+ * It is also available through the world-wide-web at this URL:
+ * http://phergie.org/license
+ *
+ * @category  Phergie
+ * @package   Phergie_Plugin_Ideone
+ * @author    Phergie Development Team <team@phergie.org>
+ * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
+ * @license   http://phergie.org/license New BSD License
+ * @link      http://pear.phergie.org/package/Phergie_Plugin_Ideone
+ */
+
+/**
+ * Interfaces with ideone.com to execute code and return the result.
+ *
+ * @category Phergie
+ * @package  Phergie_Plugin_Ideone
+ * @author   Phergie Development Team <team@phergie.org>
+ * @license  http://phergie.org/license New BSD License
+ * @link     http://pear.phergie.org/package/Phergie_Plugin_Ideone
+ * @uses     Phergie_Plugin_Command pear.phergie.org
+ */
+class Phergie_Plugin_Ideone extends Phergie_Plugin_Abstract
+{
+    /**
+     * Checks for dependencies.
+     *
+     * @return void
+     */
+    public function onLoad()
+    {
+        $this->plugins->getPlugin('Command');
+    }
+
+    /**
+     * Checks a service response for an error, sends a notice to the event
+     * source if an error has occurred, and returns whether an error was found.
+     *
+     * @param array $result Associative array representing the service response
+     *
+     * @return boolean TRUE if an error is found, FALSE otherwise
+     */
+    protected function isError($result)
+    {
+        if ($result['error'] != 'OK') {
+            $this->doNotice($this->event->getNick(), 'ideone error: ' . $result['error']);
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * Executes a source code sequence in a specified language and returns
+     * the result.
+     *
+     * @param string $language Programming language the source code is in
+     * @param string $code     Source code to execute
+     *
+     * @return void
+     */
+    public function onCommandIdeone($language, $code)
+    {
+        $source = $this->event->getSource();
+        $nick = $this->event->getNick();
+
+        // Get authentication credentials
+        $user = $this->getConfig('ideone.user', 'test');
+        $pass = $this->getConfig('ideone.pass', 'test');
+
+        // Normalize the command parameters
+        $language = strtolower($language);
+
+        // Massage PHP code to allow for convenient shorthand
+        if ($language == 'php') {
+            if (!preg_match('/^<\?(?:php)?/', $code)) {
+                $code = '<?php ' . $code;
+            }
+            switch (substr($code, -1)) {
+                case '}':
+                case ';':
+                    break;
+                default:
+                    $code .= ';';
+                    break;
+            }
+        }
+
+        // Identify the language to use
+        $client = new SoapClient('http://ideone.com/api/1/service.wsdl');
+        $response = $client->getLanguages($user, $pass);
+        if ($this->isError($response)) {
+            return;
+        }
+        $languageLength = strlen($language);
+        foreach ($response['languages'] as $languageId => $languageName) {
+            if (strncasecmp($language, $languageName, $languageLength) == 0) {
+                break;
+            }
+        }
+
+        // Send the paste data
+        $response = $client->createSubmission(
+            $user,
+            $pass,
+            $code,
+            $languageId,
+            null, // string input - data from stdin
+            true, // boolean run - TRUE to execute the code
+            false // boolean private - FALSE to make the paste public
+        );
+        if ($this->isError($response)) {
+            return;
+        }
+        $link = $response['link'];
+
+        // Wait until the paste data is processed or the service fails
+        $attempts = $this->getConfig('ideone.attempts', 10);
+        foreach (range(1, $attempts) as $attempt) {
+            $response = $client->getSubmissionStatus($user, $pass, $link);
+            if ($this->isError($response)) {
+                return;
+            }
+            if ($response['status'] == 0) {
+                $result = $response['result'];
+                break;
+            } else {
+                $result = null;
+                sleep(1);
+            }
+        }
+        if ($result == null) {
+            $this->doNotice($nick, 'ideone error: Timed out');
+            return;
+        }
+        if ($result != 15) {
+            $this->doNotice($nick, 'ideone error: Status code ' . $result);
+            return;
+        }
+
+        // Get details for the created paste
+        $response = $client->getSubmissionDetails(
+            $user,
+            $pass,
+            $link,
+            false, // boolean withSource - FALSE to not return the source code
+            false, // boolean withInput - FALSE to not return stdin data
+            true,  // boolean withOutput - TRUE to include output
+            true,  // boolean withStderr - TRUE to return stderr data
+            false  // boolean withCmpinfo - TRUE to return compilation info
+        );
+        if ($this->isError($response)) {
+            return;
+        }
+
+        // Replace the output if it exceeds a specified maximum length
+        $outputLimit = $this->getConfig('ideone.output_limit', 100);
+        var_dump($response);
+        if ($outputLimit && strlen($response['output']) > $outputLimit) {
+            $response['output'] = 'Output is too long to post';
+        }
+
+        // Format the message
+        $msg = $this->getConfig('ideone.format', '%nick%: [ %link% ] %output%');
+        $response['nick'] = $nick;
+        $response['link'] = 'http://ideone.com/' . $link;
+        foreach ($response as $key => $value) {
+            $msg = str_replace('%' . $key . '%', $value, $msg);
+        }
+        $this->doPrivmsg($source, $msg);
+    }
+}
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Iterator.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Iterator.php
new file mode 100644
index 0000000000..5963300713
--- /dev/null
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Iterator.php
@@ -0,0 +1,126 @@
+<?php
+/**
+ * Phergie
+ *
+ * PHP version 5
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.
+ * It is also available through the world-wide-web at this URL:
+ * http://phergie.org/license
+ *
+ * @category  Phergie
+ * @package   Phergie
+ * @author    Phergie Development Team <team@phergie.org>
+ * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
+ * @license   http://phergie.org/license New BSD License
+ * @link      http://pear.phergie.org/package/Phergie
+ */
+
+/**
+ * Implements a filtering iterator for limiting executing of methods across
+ * a group of plugins.
+ *
+ * @category Phergie
+ * @package  Phergie
+ * @author   Phergie Development Team <team@phergie.org>
+ * @license  http://phergie.org/license New BSD License
+ * @link     http://pear.phergie.org/package/Phergie
+ */
+class Phergie_Plugin_Iterator extends FilterIterator
+{
+    /**
+     * List of short names of plugins to exclude when iterating
+     *
+     * @var array
+     */
+    protected $plugins = array();
+
+    /**
+     * List of method names where plugins with these methods will be
+     * excluded when iterating
+     *
+     * @var array
+     */
+    protected $methods = array();
+
+    /**
+     * Adds to a list of plugins to exclude when iterating.
+     *
+     * @param mixed $plugins String containing the short name of a single
+     *        plugin to exclude or an array of short names of multiple
+     *        plugins to exclude
+     *
+     * @return Phergie_Plugin_Iterator Provides a fluent interface
+     */
+    public function addPluginFilter($plugins)
+    {
+        if (is_array($plugins)) {
+            $this->plugins = array_unique(
+                array_merge($this->plugins, $plugins)
+            );
+        } else {
+            $this->plugins[] = $plugins;
+        }
+        return $this;
+    }
+
+    /**
+     * Adds to a list of method names where plugins defining these methods
+     * will be excluded when iterating.
+     *
+     * @param mixed $methods String containing the name of a single method
+     *        or an array containing the name of multiple methods
+     *
+     * @return Phergie_Plugin_Iterator Provides a fluent interface
+     */
+    public function addMethodFilter($methods)
+    {
+        if (is_array($methods)) {
+            $this->methods = array_merge($this->methods, $methods);
+        } else {
+            $this->methods[]= $methods;
+        }
+        return $this;
+    }
+
+    /**
+     * Clears any existing plugin and methods filters.
+     *
+     * @return Phergie_Plugin_Iterator Provides a fluent interface
+     */
+    public function clearFilters()
+    {
+        $this->plugins = array();
+        $this->methods = array();
+    }
+
+    /**
+     * Implements FilterIterator::accept().
+     *
+     * @return boolean TRUE to include the current item in those by returned
+     *         during iteration, FALSE otherwise
+     */
+    public function accept()
+    {
+        if (!$this->plugins && !$this->methods) {
+            return true;
+        }
+
+        $current = $this->current();
+
+        if (in_array($current->getName(), $this->plugins)) {
+            return false;
+        }
+
+        foreach ($this->methods as $method) {
+            if (method_exists($current, $method)) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+}
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Karma.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Karma.php
index b7ce48685a..f55f8d6edf 100644
--- a/plugins/Irc/extlib/phergie/Phergie/Plugin/Karma.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Karma.php
@@ -21,427 +21,407 @@
 
 /**
  * Handles requests for incrementation or decrementation of a maintained list
- * of counters for specified terms and antithrottling to prevent extreme
- * inflation or depression of counters by any single individual.
+ * of counters for specified terms.
  *
  * @category Phergie
  * @package  Phergie_Plugin_Karma
  * @author   Phergie Development Team <team@phergie.org>
  * @license  http://phergie.org/license New BSD License
  * @link     http://pear.phergie.org/package/Phergie_Plugin_Karma
+ * @uses     extension PDO
+ * @uses     extension pdo_sqlite
+ * @uses     Phergie_Plugin_Command pear.phergie.org
+ * @uses     Phergie_Plugin_Message pear.phergie.org
  */
 class Phergie_Plugin_Karma extends Phergie_Plugin_Abstract
 {
     /**
-     * Stores the SQLite object
+     * SQLite object
      *
      * @var resource
      */
     protected $db = null;
 
     /**
-     * Retains the last garbage collection date
-     *
-     * @var array
-     */
-    protected $lastGc = null;
-
-    /**
-     * Logs the karma usages and limits users to one karma change per word
-     * and per day
-     *
-     * @return void
-     */
-    protected $log = array();
-
-    /**
-     * Some fixed karma values, keys must be lowercase
-     *
-     * @var array
-     */
-    protected $fixedKarma;
-
-    /**
-     * A list of blacklisted values
-     *
-     * @var array
-     */
-    protected $karmaBlacklist;
-
-    /**
-     * Answers for correct assertions
-     */
-    protected $positiveAnswers;
-
-    /**
-     * Answers for incorrect assertions
-     */
-    protected $negativeAnswers;
-
-    /**
-     * Prepared PDO statements
+     * Prepared statement to add a new karma record
      *
      * @var PDOStatement
      */
     protected $insertKarma;
-    protected $updateKarma;
-    protected $fetchKarma;
-    protected $insertComment;
 
     /**
-     * Connects to the database containing karma ratings and initializes
-     * class properties.
+     * Prepared statement to update an existing karma record
+     *
+     * @var PDOStatement
+     */
+    protected $updateKarma;
+
+    /**
+     * Retrieves an existing karma record
+     *
+     * @var PDOStatement
+     */
+    protected $fetchKarma;
+
+    /**
+     * Retrieves an existing fixed karma record
+     *
+     * @var PDOStatement
+     */
+    protected $fetchFixedKarma;
+
+    /**
+     * Retrieves a positive answer for a karma comparison
+     *
+     * @var PDOStatement
+     */
+    protected $fetchPositiveAnswer;
+
+    /**
+     * Retrieves a negative answer for a karma comparison
+     *
+     * @var PDOStatement
+     */
+    protected $fetchNegativeAnswer;
+
+    /**
+     * Check for dependencies and initializes a database connection and
+     * prepared statements.
      *
      * @return void
      */
     public function onLoad()
     {
-        $this->db = null;
-        $this->lastGc = null;
-        $this->log = array();
+        $plugins = $this->getPluginHandler();
+        $plugins->getPlugin('Command');
+        $plugins->getPlugin('Message');
 
-        if(!defined('M_EULER')) {
-            define('M_EULER', '0.57721566490153286061');
-        }
-
-        $this->fixedKarma = array(
-            'phergie'      => '%s has karma of awesome',
-            'pi'           => '%s has karma of ' . M_PI,
-            'Î '            => '%s has karma of ' . M_PI,
-            'Ï€'            => '%s has karma of ' . M_PI,
-            'chucknorris'  => '%s has karma of Warning: Integer out of range',
-            'chuck norris' => '%s has karma of Warning: Integer out of range',
-            'c'            => '%s has karma of 299 792 458 m/s',
-            'e'            => '%s has karma of ' . M_E,
-            'euler'        => '%s has karma of ' . M_EULER,
-            'mole'         => '%s has karma of 6.02214e23 molecules',
-            'avogadro'     => '%s has karma of 6.02214e23 molecules',
-            'spoon'        => '%s has no karma. There is no spoon',
-            'mc^2'         => '%s has karma of E',
-            'mc2'          => '%s has karma of E',
-            'mc²'          => '%s has karma of E',
-            'i'            => '%s haz big karma',
-            'karma' => 'The karma law says that all living creatures are responsible for their karma - their actions and the effects of their actions. You should watch yours.'
-        );
-
-        $this->karmaBlacklist = array(
-            '*',
-            'all',
-            'everything'
-        );
-
-        $this->positiveAnswers = array(
-            'No kidding, %owner% totally kicks %owned%\'s ass !',
-            'True that.',
-            'I concur.',
-            'Yay, %owner% ftw !',
-            '%owner% is made of WIN!',
-            'Nothing can beat %owner%!',
-        );
-
-        $this->negativeAnswers = array(
-            'No sir, not at all.',
-            'You\'re wrong dude, %owner% wins.',
-            'I\'d say %owner% is better than %owned%.',
-            'You must be joking, %owner% ftw!',
-            '%owned% is made of LOSE!',
-            '%owned% = Epic Fail',
-        );
-
-        // Load or initialize the database
-        $class = new ReflectionClass(get_class($this));
-        $dir = dirname($class->getFileName() . '/' . $this->name);
-        $this->db = new PDO('sqlite:' . $dir . 'karma.db');
-
-        // Check to see if the table exists
-        $table = $this->db->query('
-            SELECT COUNT(*)
-            FROM sqlite_master
-            WHERE name = ' . $this->db->quote('karmas')
-        )->fetchColumn();
-
-        // Create database tables if necessary
-        if (!$table) {
-            $this->db->query('
-                CREATE TABLE karmas ( word VARCHAR ( 255 ), karma MEDIUMINT );
-                CREATE UNIQUE INDEX word ON karmas ( word );
-                CREATE INDEX karmaIndex ON karmas ( karma );
-                CREATE TABLE comments ( wordid INT , comment VARCHAR ( 255 ) );
-                CREATE INDEX wordidIndex ON comments ( wordid );
-                CREATE UNIQUE INDEX commentUnique ON comments ( comment );
-            ');
-        }
-
-        $this->insertKarma = $this->db->prepare('
-            INSERT INTO karmas (
-                word,
-                karma
-            )
-            VALUES (
-                :word,
-                :karma
-            )
-        ');
-
-        $this->insertComment = $this->db->prepare('
-            INSERT INTO comments (
-                wordid,
-                comment
-            )
-            VALUES (
-                :wordid,
-                :comment
-            )
-        ');
+        $file = dirname(__FILE__) . '/Karma/karma.db';
+        $this->db = new PDO('sqlite:' . $file);
 
         $this->fetchKarma = $this->db->prepare('
-            SELECT karma, ROWID id FROM karmas WHERE LOWER(word) = LOWER(:word) LIMIT 1
+            SELECT karma
+            FROM karmas
+            WHERE term = :term
+            LIMIT 1
+        ');
+
+        $this->insertKarma = $this->db->prepare('
+            INSERT INTO karmas (term, karma)
+            VALUES (:term, :karma)
         ');
 
         $this->updateKarma = $this->db->prepare('
-            UPDATE karmas SET karma = :karma WHERE LOWER(word) = LOWER(:word)
+            UPDATE karmas
+            SET karma = :karma
+            WHERE term = :term
+        ');
+
+        $this->fetchFixedKarma = $this->db->prepare('
+            SELECT karma
+            FROM fixed_karmas
+            WHERE term = :term
+            LIMIT 1
+        ');
+
+        $this->fetchPositiveAnswer = $this->db->prepare('
+            SELECT answer
+            FROM positive_answers
+            ORDER BY RANDOM()
+            LIMIT 1
+        ');
+
+        $this->fetchNegativeAnswer = $this->db->prepare('
+            SELECT answer
+            FROM negative_answers
+            ORDER BY RANDOM()
+            LIMIT 1
         ');
     }
 
     /**
-     * Checks for dependencies.
+     * Get the canonical form of a given term.
      *
-     * @return void
+     * In the canonical form all sequences of whitespace
+     * are replaced by a single space and all characters
+     * are lowercased.
+     *
+     * @param string $term Term for which a canonical form is required
+     *
+     * @return string Canonical term
      */
-    public static function onLoad()
+    protected function getCanonicalTerm($term)
     {
-    	if (!extension_loaded('PDO') || !extension_loaded('pdo_sqlite')) {
-            $this->fail('PDO and pdo_sqlite extensions must be installed');
-    	}
+        $canonicalTerm = strtolower(preg_replace('|\s+|', ' ', trim($term, '()')));
+        switch ($canonicalTerm) {
+            case 'me':
+                $canonicalTerm = strtolower($this->event->getNick());
+                break;
+            case 'all':
+            case '*':
+            case 'everything':
+                $canonicalTerm = 'everything';
+                break;
+        }
+        return $canonicalTerm;
     }
 
     /**
-     * Handles requests for incrementation, decrementation, or lookup of karma
-     * ratings sent via messages from users.
+     * Intercepts a message and processes any contained recognized commands.
      *
      * @return void
      */
     public function onPrivmsg()
     {
-        $source = $this->event->getSource();
-        $message = $this->event->getArgument(1);
-        $target = $this->event->getNick();
+        $message = $this->getEvent()->getText();
 
-        // Command prefix check
-        $prefix = preg_quote(trim($this->getConfig('command.prefix')));
-        $bot = preg_quote($this->getConfig('connections.nick'));
-        $exp = '(?:(?:' . $bot . '\s*[:,>]?\s+(?:' . $prefix . ')?)|(?:' . $prefix . '))';
+        $termPattern = '\S+?|\([^<>]+?\)+';
+        $actionPattern = '(?P<action>\+\+|--)';
 
-        // Karma status request
-        if (preg_match('#^' . $exp . 'karma\s+(.+)$#i', $message, $m)) {
-            // Return user's value if "me" is requested
-            if (strtolower($m[1]) === 'me') {
-                $m[1] = $target;
-            }
-            // Clean the term
-            $term = $this->doCleanWord($m[1]);
+        $modifyPattern = <<<REGEX
+		{^
+		(?J) # allow overwriting capture names
+		\s*  # ignore leading whitespace
 
-            // Check the blacklist
-            if (is_array($this->karmaBlacklist) && in_array($term, $this->karmaBlacklist)) {
-                $this->doNotice($target, $term . ' is blacklisted');
-                return;
-            }
+		(?:  # start with ++ or -- before the term
+            $actionPattern
+            (?P<term>$termPattern)
+		|   # follow the term with ++ or --
+            (?P<term>$termPattern)
+			$actionPattern # allow no whitespace between the term and the action
+		)
+		$}ix
+REGEX;
 
-            // Return fixed value if set
-            if (isset($this->fixedKarma[$term])) {
-                $this->doPrivmsg($source, $target . ': ' . sprintf($this->fixedKarma[$term], $m[1]) . '.');
-                return;
-            }
+        $versusPattern = <<<REGEX
+        {^
+        	(?P<term0>$termPattern)
+        		\s+(?P<method><|>)\s+
+        	(?P<term1>$termPattern)$#
+        $}ix
+REGEX;
 
-            // Return current karma or neutral if not set yet
-            $this->fetchKarma->execute(array(':word'=>$term));
-            $res = $this->fetchKarma->fetch(PDO::FETCH_ASSOC);
+        $match = null;
 
-            // Sanity check if someone if someone prefixed their conversation with karma
-            if (!$res && substr_count($term, ' ') > 1 && !(substr($m[1], 0, 1) === '(' && substr($m[1], -1) === ')')) {
-                return;
-            }
-
-            // Clean the raw term if it was contained within brackets
-            if (substr($m[1], 0, 1) === '(' && substr($m[1], -1) === ')') {
-                $m[1] = substr($m[1], 1, -1);
-            }
-
-            if ($res && $res['karma'] != 0) {
-                $this->doPrivmsg($source, $target . ': ' . $m[1] . ' has karma of ' . $res['karma'] . '.');
-            } else {
-                $this->doPrivmsg($source, $target . ': ' . $m[1] . ' has neutral karma.');
-            }
-        // Incrementation/decrementation request
-        } elseif (preg_match('{^' . $exp . '?(?:(\+{2,2}|-{2,2})(\S+?|\(.+?\)+)|(\S+?|\(.+?\)+)(\+{2,2}|-{2,2}))(?:\s+(.*))?$}ix', $message, $m)) {
-            if (!empty($m[4])) {
-                $m[1] = $m[4]; // Increment/Decrement
-                $m[2] = $m[3]; // Word
-            }
-            $m[3] = (isset($m[5]) ? $m[5] : null); // Comment
-            unset($m[4], $m[5]);
-            list(, $sign, $word, $comment) = array_pad($m, 4, null);
-
-            // Clean the word
-            $word = strtolower($this->doCleanWord($word));
-            if (empty($word)) {
-                return;
-            }
-
-            // Do nothing if the karma is fixed or blacklisted
-            if (isset($this->fixedKarma[$word]) ||
-                is_array($this->karmaBlacklist) && in_array($word, $this->karmaBlacklist)) {
-                return;
-            }
-
-            // Force a decrementation if someone tries to update his own karma
-            if ($word == strtolower($target) && $sign != '--' && !$this->fromAdmin(true)) {
-                $this->doNotice($target, 'Bad ' . $target . '! You can not modify your own Karma. Shame on you!');
-                $sign = '--';
-            }
-
-            // Antithrottling check
-            $host = $this->event->getHost();
-            $limit = $this->getConfig('karma.limit');
-            // This is waiting on the Acl plugin from Elazar, being bypassed for now
-            //if ($limit > 0 && !$this->fromAdmin()) {
-            if ($limit > 0) {
-                if (isset($this->log[$host][$word]) && $this->log[$host][$word] >= $limit) {
-                    // Three strikes, you're out, so lets decrement their karma for spammage
-                    if ($this->log[$host][$word] == ($limit+3)) {
-                        $this->doNotice($target, 'Bad ' . $target . '! Didn\'t I tell you that you reached your limit already?');
-                        $this->log[$host][$word] = $limit;
-                        $word = $target;
-                        $sign = '--';
-                    // Toss a notice to the user if they reached their limit
-                    } else {
-                        $this->doNotice($target, 'You have currently reached your limit in modifying ' . $word . ' for this day, please wait a bit.');
-                        $this->log[$host][$word]++;
-                        return;
-                    }
-                } else {
-                    if (isset($this->log[$host][$word])) {
-                        $this->log[$host][$word]++;
-                    } else {
-                        $this->log[$host][$word] = 1;
-                    }
-                }
-            }
-
-            // Get the current value then update or create entry
-            $this->fetchKarma->execute(array(':word'=>$word));
-            $res = $this->fetchKarma->fetch(PDO::FETCH_ASSOC);
-            if ($res) {
-                $karma = ($res['karma'] + ($sign == '++' ? 1 : -1));
-                $args = array(
-                    ':word' => $word,
-                    ':karma' => $karma
-                );
-                $this->updateKarma->execute($args);
-            } else {
-                $karma = ($sign == '++' ? '1' : '-1');
-                $args = array(
-                    ':word' => $word,
-                    ':karma' => $karma
-                );
-                $this->insertKarma->execute($args);
-                $this->fetchKarma->execute(array(':word'=>$word));
-                $res = $this->fetchKarma->fetch(PDO::FETCH_ASSOC);
-            }
-            $id = $res['id'];
-            // Add comment
-            $comment = preg_replace('{(?:^//(.*)|^#(.*)|^/\*(.*?)\*/$)}', '$1$2$3', $comment);
-            if (!empty($comment)) {
-                $this->insertComment->execute(array(':wordid' => $id, ':comment' => $comment));
-            }
-            // Perform garbage collection on the antithrottling log if needed
-            if (date('d') !== $this->lastGc) {
-                $this->doGc();
-            }
-        // Assertion request
-        } elseif (preg_match('#^' . $exp . '?([^><]+)(<|>)([^><]+)$#', $message, $m)) {
-            // Trim words
-            $word1 = strtolower($this->doCleanWord($m[1]));
-            $word2 = strtolower($this->doCleanWord($m[3]));
-            $operator = $m[2];
-
-            // Do nothing if the karma is fixed
-            if (isset($this->fixedKarma[$word1]) || isset($this->fixedKarma[$word2]) ||
-                empty($word1) || empty($word2)) {
-                return;
-            }
-
-            // Fetch first word
-            if ($word1 === '*' || $word1 === 'all' || $word1 === 'everything') {
-                $res = array('karma' => 0);
-                $word1 = 'everything';
-            } else {
-                $this->fetchKarma->execute(array(':word'=>$word1));
-                $res = $this->fetchKarma->fetch(PDO::FETCH_ASSOC);
-            }
-            // If it exists, fetch second word
-            if ($res) {
-                if ($word2 === '*' || $word2 === 'all' || $word2 === 'everything') {
-                    $res2 = array('karma' => 0);
-                    $word2 = 'everything';
-                } else {
-                    $this->fetchKarma->execute(array(':word'=>$word2));
-                    $res2 = $this->fetchKarma->fetch(PDO::FETCH_ASSOC);
-                }
-                // If it exists, compare and return value
-                if ($res2 && $res['karma'] != $res2['karma']) {
-                    $assertion = ($operator === '<' && $res['karma'] < $res2['karma']) || ($operator === '>' && $res['karma'] > $res2['karma']);
-                    // Switch arguments if they are in the wrong order
-                    if ($operator === '<') {
-                        $tmp = $word2;
-                        $word2 = $word1;
-                        $word1 = $tmp;
-                    }
-                    $this->doPrivmsg($source, $assertion ? $this->fetchPositiveAnswer($word1, $word2) : $this->fetchNegativeAnswer($word1, $word2));
-                    // If someone asserts that something is greater or lesser than everything, we increment/decrement that something at the same time
-                    if ($word2 === 'everything') {
-                        $this->event = clone$this->event;
-                        $this->event->setArguments(array($this->event->getArgument(0), '++'.$word1));
-                        $this->onPrivmsg();
-                    } elseif ($word1 === 'everything') {
-                        $this->event = clone$this->event;
-                        $this->event->setArguments(array($this->event->getArgument(0), '--'.$word2));
-                        $this->onPrivmsg();
-                    }
-                }
-            }
+        if (preg_match($modifyPattern, $message, $match)) {
+            $action = $match['action'];
+            $term = $this->getCanonicalTerm($match['term']);
+            $this->modifyKarma($term, $action);
+        } elseif (preg_match($versusPattern, $message, $match)) {
+            $term0 = trim($match['term0']);
+            $term1 = trim($match['term1']);
+            $method = $match['method'];
+            $this->compareKarma($term0, $term1, $method);
         }
     }
 
-    protected function fetchPositiveAnswer($owner, $owned)
-    {
-        return str_replace(array('%owner%','%owned%'), array($owner, $owned), $this->positiveAnswers[array_rand($this->positiveAnswers,1)]);
-    }
-
-    protected function fetchNegativeAnswer($owned, $owner)
-    {
-        return str_replace(array('%owner%','%owned%'), array($owner, $owned), $this->negativeAnswers[array_rand($this->negativeAnswers,1)]);
-    }
-
-    protected function doCleanWord($word)
-    {
-        $word = trim($word);
-        if (substr($word, 0, 1) === '(' && substr($word, -1) === ')') {
-            $word = trim(substr($word, 1, -1));
-        }
-        $word = preg_replace('#\s+#', ' ', strtolower(trim($word)));
-        return $word;
-    }
-
     /**
-     * Performs garbage collection on the antithrottling log.
+     * Get the karma rating for a given term.
+     *
+     * @param string $term Term for which the karma rating needs to be
+     *        retrieved
      *
      * @return void
      */
-    public function doGc()
+    public function onCommandKarma($term)
     {
-        unset($this->log);
-        $this->log = array();
-        $this->lastGc = date('d');
+        $source = $this->getEvent()->getSource();
+        $nick = $this->getEvent()->getNick();
+
+        if (empty($term)) {
+            return;
+        }
+
+        $canonicalTerm = $this->getCanonicalTerm($term);
+
+        $fixedKarma = $this->fetchFixedKarma($canonicalTerm);
+        if ($fixedKarma) {
+            $message = $nick . ': ' . $term . $fixedKarma . '.';
+            $this->doPrivmsg($source, $message);
+            return;
+        }
+
+        $karma = $this->fetchKarma($canonicalTerm);
+
+        $message = $nick . ': ';
+
+        if ($term == 'me') {
+            $message .= 'You have';
+        } else {
+            $message .= $term . ' has';
+        }
+
+        $message .= ' ';
+
+        if ($karma) {
+            $message .= 'karma of ' . $karma;
+        } else {
+            $message .= 'neutral karma';
+        }
+
+        $message .= '.';
+
+        $this->doPrivmsg($source, $message);
+    }
+
+    /**
+     * Resets the karma for a term to 0.
+     *
+     * @param string $term Term for which to reset the karma rating
+     *
+     * @return void
+     */
+    public function onCommandReincarnate($term)
+    {
+        $data = array(
+            ':term' => $term,
+            ':karma' => 0
+        );
+        $this->updateKarma->execute($data);
+    }
+
+    /**
+     * Compares the karma between two terms. Optionally increases/decreases
+     * the karma of either term.
+     *
+     * @param string $term0  First term
+     * @param string $term1  Second term
+     * @param string $method Comparison method (< or >)
+     *
+     * @return void
+     */
+    protected function compareKarma($term0, $term1, $method)
+    {
+        $event = $this->getEvent();
+        $nick = $event->getNick();
+        $source = $event->getSource();
+
+        $canonicalTerm0 = $this->getCanonicalTerm($term0);
+        $canonicalTerm1 = $this->getCanonicalTerm($term1);
+
+        $fixedKarma0 = $this->fetchFixedKarma($canonicalTerm0);
+        $fixedKarma1 = $this->fetchFixedKarma($canonicalTerm1);
+
+        if ($fixedKarma0
+            || $fixedKarma1
+            || empty($canonicalTerm0)
+            || empty($canonicalTerm1)
+        ) {
+            return;
+        }
+
+        if ($canonicalTerm0 == 'everything') {
+            $change = $method == '<' ? '++' : '--';
+            $this->modifyKarma($canonicalTerm1, $change);
+            $karma0 = 0;
+            $karma1 = $this->fetchKarma($canonicalTerm1);
+        } elseif ($canonicalTerm1 == 'everything') {
+            $change = $method == '<' ? '--' : '++';
+            $this->modifyKarma($canonicalTerm0, $change);
+            $karma0 = $this->fetchKarma($canonicalTerm1);
+            $karma1 = 0;
+        } else {
+            $karma0 = $this->fetchKarma($canonicalTerm0);
+            $karma1 = $this->fetchKarma($canonicalTerm1);
+        }
+
+        if (($method == '<'
+            && $karma0 < $karma1)
+            || ($method == '>'
+            && $karma0 > $karma1)) {
+            $replies = $this->fetchPositiveAnswer;
+        } else {
+            $replies = $this->fetchNegativeAnswer;
+        }
+        $replies->execute();
+        $reply = $replies->fetchColumn();
+
+        if (max($karma0, $karma1) == $karma1) {
+            list($canonicalTerm0, $canonicalTerm1) =
+                array($canonicalTerm1, $canonicalTerm0);
+        }
+
+        $message = str_replace(
+            array('%owner%','%owned%'),
+            array($canonicalTerm0, $canonicalTerm1),
+            $reply
+        );
+
+        $this->doPrivmsg($source, $message);
+    }
+
+    /**
+     * Modifes a term's karma.
+     *
+     * @param string $term   Term to modify
+     * @param string $action Karma action (either ++ or --)
+     *
+     * @return void
+     */
+    protected function modifyKarma($term, $action)
+    {
+        if (empty($term)) {
+            return;
+        }
+
+        $karma = $this->fetchKarma($term);
+        if ($karma !== false) {
+            $statement = $this->updateKarma;
+        } else {
+            $statement = $this->insertKarma;
+        }
+
+        $karma += ($action == '++') ? 1 : -1;
+
+        $args = array(
+            ':term'  => $term,
+            ':karma' => $karma
+        );
+        $statement->execute($args);
+    }
+
+    /**
+     * Returns the karma rating for a specified term for which the karma
+     * rating can be modified.
+     *
+     * @param string $term Term for which to fetch the corresponding karma
+     *        rating
+     *
+     * @return integer|boolean Integer value denoting the term's karma or
+     *         FALSE if there is the specified term has no associated karma
+     *         rating
+     */
+    protected function fetchKarma($term)
+    {
+        $this->fetchKarma->execute(array(':term' => $term));
+        $result = $this->fetchKarma->fetch(PDO::FETCH_ASSOC);
+
+        if ($result === false) {
+            return false;
+        }
+
+        return (int) $result['karma'];
+    }
+
+    /**
+     * Returns a phrase describing the karma rating for a specified term for
+     * which the karma rating is fixed.
+     *
+     * @param string $term Term for which to fetch the corresponding karma
+     *        rating
+     *
+     * @return string Phrase describing the karma rating, which may be append
+     *         to the term to form a complete response
+     */
+    protected function fetchFixedKarma($term)
+    {
+        $this->fetchFixedKarma->execute(array(':term' => $term));
+        $result = $this->fetchFixedKarma->fetch(PDO::FETCH_ASSOC);
+
+        if ($result === false) {
+            return false;
+        }
+
+        return $result['karma'];
     }
 }
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Message.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Message.php
new file mode 100644
index 0000000000..af8fc7287b
--- /dev/null
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Message.php
@@ -0,0 +1,112 @@
+<?php
+/**
+ * Phergie
+ *
+ * PHP version 5
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.
+ * It is also available through the world-wide-web at this URL:
+ * http://phergie.org/license
+ *
+ * @category  Phergie
+ * @package   Phergie_Plugin_Message
+ * @author    Phergie Development Team <team@phergie.org>
+ * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
+ * @license   http://phergie.org/license New BSD License
+ * @link      http://pear.phergie.org/package/Phergie_Plugin_Message
+ */
+
+/**
+ * Generalized plugin providing utility methods for
+ * prefix and bot named based message extraction.
+ *
+ * @category Phergie
+ * @package  Phergie_Plugin_Message
+ * @author   Phergie Development Team <team@phergie.org>
+ * @license  http://phergie.org/license New BSD License
+ * @link     http://pear.phergie.org/package/Phergie_Plugin_Message
+ */
+class Phergie_Plugin_Message extends Phergie_Plugin_Abstract
+{
+
+    /**
+     * Check whether a message is specifically targeted at the bot.
+     * This is the case when the message starts with the bot's name
+     * followed by [,:>] or when it is a private message.
+     *
+     * @return boolean true when the message is specifically targeted at the bot,
+     *                 false otherwise.
+     */
+    public function isTargetedMessage()
+    {
+        $event = $this->getEvent();
+
+        $self = preg_quote($this->connection->getNick());
+
+        $targetPattern = <<<REGEX
+        {^
+        \s*{$self}\s*[:>,].* # expect the bots name, followed by a [:>,]
+        $}ix
+REGEX;
+
+        return !$event->isInChannel() 
+            || preg_match($targetPattern, $event->getText()) > 0;
+    }
+
+    /**
+     * Allow for prefix and bot name aware extraction of a message
+     *
+     * @return string|bool $message The message, which is possibly targeted at the 
+     *                              bot or false if a prefix requirement failed
+     */
+    public function getMessage()
+    {
+        $event = $this->getEvent();
+
+        $prefix = preg_quote($this->getConfig('command.prefix'));
+        $self = preg_quote($this->connection->getNick());
+        $message = $event->getText();
+
+        // $prefixPattern matches : Phergie, do command <parameters>
+        // where $prefix = 'do'   : do command <parameters>
+        //                        : Phergie, command <parameters>
+        $prefixPattern = <<<REGEX
+        {^
+        (?:
+        	\s*{$self}\s*[:>,]\s* # start with bot name
+			(?:{$prefix})?        # which is optionally followed by the prefix
+        |
+        	\s*{$prefix}          # or start with the prefix
+        )
+        \s*(.*)                   # always end with the message
+        $}ix
+REGEX;
+
+        // $noPrefixPattern matches : Phergie, command <parameters>
+        //                          : command <parameters>
+        $noPrefixPattern = <<<REGEX
+        {^
+        \s*(?:{$self}\s*[:>,]\s*)? # optionally start with the bot name
+        (.*?)                      # always end with the message
+        $}ix
+REGEX;
+
+        $pattern = $noPrefixPattern;
+
+        // If a prefix is set, force it as a requirement
+        if ($prefix && $event->isInChannel()) {
+            $pattern = $prefixPattern;
+        }
+
+        $match = null;
+
+        if (!preg_match($pattern, $message, $match)) {
+            return false;
+        }
+
+        return $match[1];
+    }
+}
\ No newline at end of file
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Ping.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Ping.php
index 29ac69f464..021670d97d 100755
--- a/plugins/Irc/extlib/phergie/Phergie/Plugin/Ping.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Ping.php
@@ -87,7 +87,7 @@ class Phergie_Plugin_Ping extends Phergie_Plugin_Abstract
     {
         $time = time();
         if (!empty($this->lastPing)) {
-            if ($time - $this->lastPing > $this->getConfig('ping.ping', 10)) {
+            if ($time - $this->lastPing > $this->getConfig('ping.ping', 20)) {
                 $this->doQuit();
             }
         } elseif (
@@ -112,7 +112,7 @@ class Phergie_Plugin_Ping extends Phergie_Plugin_Abstract
     /**
      * Set the last ping time
      * lastPing needs to be exposed for unit testing
-     * 
+     *
      * @param int|null $ping timestamp of last ping
      *
      * @return self
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Quit.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Quit.php
index cacd77d3f3..eca22a98e3 100755
--- a/plugins/Irc/extlib/phergie/Phergie/Plugin/Quit.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Quit.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Phergie 
+ * Phergie
  *
  * PHP version 5
  *
@@ -11,7 +11,7 @@
  * It is also available through the world-wide-web at this URL:
  * http://phergie.org/license
  *
- * @category  Phergie 
+ * @category  Phergie
  * @package   Phergie_Plugin_Quit
  * @author    Phergie Development Team <team@phergie.org>
  * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
@@ -22,14 +22,12 @@
 /**
  * Terminates the current connection upon command.
  *
- * @category Phergie 
+ * @category Phergie
  * @package  Phergie_Plugin_Quit
  * @author   Phergie Development Team <team@phergie.org>
  * @license  http://phergie.org/license New BSD License
  * @link     http://pear.phergie.org/package/Phergie_Plugin_Quit
  * @uses     Phergie_Plugin_Command pear.phergie.org
- *
- * @pluginDesc Terminates the current connection upon command.
  */
 class Phergie_Plugin_Quit extends Phergie_Plugin_Abstract
 {
@@ -41,17 +39,13 @@ class Phergie_Plugin_Quit extends Phergie_Plugin_Abstract
     public function onLoad()
     {
         $this->getPluginHandler()->getPlugin('Command');
-        $help = $this->getPluginHandler()->getPlugin('Help');
-        $help->register($this);
     }
 
     /**
-     * Issues a quit command when a message is received requesting that the 
+     * Issues a quit command when a message is received requesting that the
      * bot terminate the current connection.
      *
      * @return void
-     *
-     * @pluginCmd terminates the connection
      */
     public function onCommandQuit()
     {
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Reload.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Reload.php
index a2d680d7aa..90e3adcd52 100755
--- a/plugins/Irc/extlib/phergie/Phergie/Plugin/Reload.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Reload.php
@@ -57,6 +57,7 @@ class Phergie_Plugin_Reload extends Phergie_Plugin_Abstract
         if (!$this->plugins->hasPlugin($plugin)) {
             echo 'DEBUG(Reload): ' . ucfirst($plugin) . ' is not loaded yet, loading', PHP_EOL;
             $this->plugins->getPlugin($plugin);
+            $this->plugins->command->populateMethodCache();
             return;
         }
 
@@ -79,7 +80,7 @@ class Phergie_Plugin_Reload extends Phergie_Plugin_Abstract
         }
 
         $contents = preg_replace(
-            array('/<\?(?:php)?/', '/class\s+' . $class . '/i'),
+            array('/^<\?(?:php)?/', '/class\s+' . $class . '/i'),
             array('', 'class ' . $newClass),
             $contents
         );
@@ -87,10 +88,16 @@ class Phergie_Plugin_Reload extends Phergie_Plugin_Abstract
 
         $instance = new $newClass;
         $instance->setName($plugin);
+        $instance->setEvent($this->event);
         $this->plugins
             ->removePlugin($plugin)
             ->addPlugin($instance);
 
+        $this->plugins->command->populateMethodCache();
+        if ($this->plugins->hasPlugin('Help')) {
+            $this->plugins->help->populateRegistry();
+        }
+
         echo 'DEBUG(Reload): Reloaded ', $class, ' to ', $newClass, PHP_EOL;
     }
 }
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Serve.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Serve.php
index 19ecb0c7e4..cdb8f7f919 100755
--- a/plugins/Irc/extlib/phergie/Phergie/Plugin/Serve.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Serve.php
@@ -113,20 +113,21 @@ class Phergie_Plugin_Serve extends Phergie_Plugin_Abstract
         $item = $this->getItem($database, $table, $match);
 
         // Reprocess the request for censorship if required
-        $attempts = 0;
-        while ($censor && $attempts < 3) {
+        if ($this->plugins->hasPlugin('Censor')) {
             $plugin = $this->plugins->getPlugin('Censor');
-            $clean = $plugin->cleanString($item->name);
-            if ($item->name != $clean) {
-                $attempts++;
-                $item = $this->getItem($database, $table, $match);
-            } else {
-                $censor = false;
+            $attempts = 0;
+            while ($censor && $attempts < 3) {
+                $clean = $plugin->cleanString($item->name);
+                if ($item->name != $clean) {
+                    $attempts++;
+                    $item = $this->getItem($database, $table, $match);
+                } else {
+                    $censor = false;
+                }
+            }
+            if ($censor && $attempts == 3) {
+                $this->doAction($this->event->getSource(), 'shrugs.');
             }
-        }
-
-        if ($censor && $attempts == 3) {
-            $this->doAction($this->event->getSource(), 'shrugs.');
         }
 
         // Derive the proper article for the item
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Tea.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Tea.php
new file mode 100644
index 0000000000..c6453566c7
--- /dev/null
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Tea.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ * Phergie
+ *
+ * PHP version 5
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.
+ * It is also available through the world-wide-web at this URL:
+ * http://phergie.org/license
+ *
+ * @category  Phergie
+ * @package   Phergie_Plugin_Tea
+ * @author    Phergie Development Team <team@phergie.org>
+ * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
+ * @license   http://phergie.org/license New BSD License
+ * @link      http://pear.phergie.org/package/Phergie_Plugin_Tea
+ */
+
+/**
+ * Processes requests to serve users tea.
+ *
+ * @category Phergie
+ * @package  Phergie_Plugin_Tea
+ * @author   Phergie Development Team <team@phergie.org>
+ * @license  http://phergie.org/license New BSD License
+ * @link     http://pear.phergie.org/package/Phergie_Plugin_Tea
+ * @uses     Phergie_Plugin_Command pear.phergie.org
+ * @uses     Phergie_Plugin_Serve pear.phergie.org
+ */
+class Phergie_Plugin_Tea extends Phergie_Plugin_Abstract
+{
+    /**
+     * Checks for dependencies.
+     *
+     * @return void
+     */
+    public function onLoad()
+    {
+        $plugins = $this->plugins;
+        $plugins->getPlugin('Command');
+        $plugins->getPlugin('Serve');
+    }
+
+    /**
+     * Processes requests to serve a user tea.
+     *
+     * @param string $request Request including the target and an optional
+     *        suggestion of what tea to serve
+     *
+     * @return void
+     */
+    public function onCommandTea($request)
+    {
+        $format = $this->getConfig(
+            'tea.format',
+            'serves %target% a cup of %item% tea.'
+        );
+
+        $this->plugins->getPlugin('Serve')->serve(
+            dirname(__FILE__) . '/Tea/tea.db',
+            'tea',
+            $format,
+            $request
+        );
+    }
+}
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Tea/db.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Tea/db.php
new file mode 100644
index 0000000000..21fe1950d1
--- /dev/null
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Tea/db.php
@@ -0,0 +1,49 @@
+<?php
+
+if (!defined('__DIR__')) {
+    define('__DIR__', dirname(__FILE__));
+}
+
+// Create database schema
+echo 'Creating database', PHP_EOL;
+$file = __DIR__ . '/tea.db';
+if (file_exists($file)) {
+    unlink($file);
+}
+$db = new PDO('sqlite:' . $file);
+$db->exec('CREATE TABLE tea (name VARCHAR(255), link VARCHAR(255))');
+$db->exec('CREATE UNIQUE INDEX tea_name ON tea (name)');
+$insert = $db->prepare('INSERT INTO tea (name, link) VALUES (:name, :link)');
+
+// Get raw teacuppa.com data set
+echo 'Downloading teacuppa.com data set', PHP_EOL;
+$file = __DIR__ . '/tea-list.html';
+if (!file_exists($file)) {
+    copy('http://www.teacuppa.com/tea-list.asp', $file);
+}
+$contents = file_get_contents($file);
+
+// Extract data from data set
+echo 'Processing teacuppa.com data', PHP_EOL;
+$contents = tidy_repair_string($contents);
+libxml_use_internal_errors(true);
+$doc = new DOMDocument;
+$doc->loadHTML($contents);
+libxml_clear_errors();
+$xpath = new DOMXPath($doc);
+$teas = $xpath->query('//p[@class="page_title"]/following-sibling::table//a');
+$db->beginTransaction();
+foreach ($teas as $tea) {
+    $name = preg_replace(
+        array('/\s*\v+\s*/', '/\s+tea\s*$/i'),
+        array(' ', ''),
+        $tea->textContent
+    );
+    $link = 'http://teacuppa.com/' . $tea->getAttribute('href');
+    $insert->execute(array($name, $link));
+}
+$db->commit();
+
+// Clean up
+echo 'Cleaning up', PHP_EOL;
+unlink($file);
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/TheFuckingWeather.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/TheFuckingWeather.php
index e8a02860b2..8559426b61 100644
--- a/plugins/Irc/extlib/phergie/Phergie/Plugin/TheFuckingWeather.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/TheFuckingWeather.php
@@ -31,9 +31,6 @@
  * @link     http://thefuckingweather.com
  * @uses     Phergie_Plugin_Command pear.phergie.org
  * @uses     Phergie_Plugin_Http pear.phergie.org
- *
- * @pluginDesc Detects and responds to requests for current weather 
- *             conditions in a particular location.
  */
 
 class Phergie_Plugin_TheFuckingWeather extends Phergie_Plugin_Abstract
@@ -71,8 +68,6 @@ class Phergie_Plugin_TheFuckingWeather extends Phergie_Plugin_Abstract
      *
      * @return void
      * @todo Implement use of URL shortening here
-     * @pluginCmd [location] Detects and responds to requests for current 
-     *            weather conditions in a particular location.
      */
     public function onCommandThefuckingweather($location)
     {
@@ -92,7 +87,6 @@ class Phergie_Plugin_TheFuckingWeather extends Phergie_Plugin_Abstract
     * @param string $location Location term
     *
     * @return void
-    * @pluginCmd [location] Alias for thefuckingweather command.
     */
     public function onCommandTfw($location)
     {
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Tld.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Tld.php
index 21993f73c5..d7d64a4717 100644
--- a/plugins/Irc/extlib/phergie/Phergie/Plugin/Tld.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Tld.php
@@ -31,31 +31,32 @@
  * @link     http://pear.phergie.org/package/Phergie_Plugin_Tld
  * @uses     extension PDO
  * @uses     extension pdo_sqlite
- *
- * @pluginDesc Provides information for a top level domain.
  */
 class Phergie_Plugin_Tld extends Phergie_Plugin_Abstract
 {
     /**
-     * connection to the database
+     * Connection to the database
+     *
      * @var PDO
      */
     protected $db;
 
     /**
-     * Prepared statement for selecting a single tld
+     * Prepared statement for selecting a single TLD
+     *
      * @var PDOStatement
      */
     protected $select;
 
     /**
-     * Prepared statement for selecting all tlds
+     * Prepared statement for selecting all TLDs
+     *
      * @var PDOStatement
      */
     protected $selectAll;
 
     /**
-     * Checks for dependencies, sets up database and hard coded values
+     * Checks for dependencies and sets up the database and hard-coded values.
      *
      * @return void
      */
@@ -65,9 +66,6 @@ class Phergie_Plugin_Tld extends Phergie_Plugin_Abstract
             $this->fail('PDO and pdo_sqlite extensions must be installed');
         }
 
-        $help = $this->getPluginHandler()->getPlugin('Help');
-        $help->register($this);
-
         $dbFile = dirname(__FILE__) . '/Tld/tld.db';
         try {
             $this->db = new PDO('sqlite:' . $dbFile);
@@ -93,8 +91,6 @@ class Phergie_Plugin_Tld extends Phergie_Plugin_Abstract
      * @param string $tld tld to process
      *
      * @return null
-     *
-     * @pluginCmd .[tld] request details about the tld
      */
     public function onCommandTld($tld)
     {
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Youtube.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Youtube.php
index b19e9d5aef..e06ea5640b 100644
--- a/plugins/Irc/extlib/phergie/Phergie/Plugin/Youtube.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Youtube.php
@@ -148,7 +148,7 @@ class Phergie_Plugin_Youtube extends Phergie_Plugin_Abstract
     {
         switch ($parsed['host']) {
             case 'youtu.be':
-                $v = ltrim('/', $parsed['path']);
+                $v = ltrim($parsed['path'], '/');
                 break;
             case 'youtube.com':
             case 'www.youtube.com':
diff --git a/plugins/Irc/extlib/phergie/Phergie/Process/Abstract.php b/plugins/Irc/extlib/phergie/Phergie/Process/Abstract.php
index 68d45289e8..0ec3569feb 100755
--- a/plugins/Irc/extlib/phergie/Phergie/Process/Abstract.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Process/Abstract.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Phergie 
+ * Phergie
  *
  * PHP version 5
  *
@@ -11,7 +11,7 @@
  * It is also available through the world-wide-web at this URL:
  * http://phergie.org/license
  *
- * @category  Phergie 
+ * @category  Phergie
  * @package   Phergie
  * @author    Phergie Development Team <team@phergie.org>
  * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
@@ -22,7 +22,7 @@
 /**
  * Base class for obtaining and processing incoming events.
  *
- * @category Phergie 
+ * @category Phergie
  * @package  Phergie
  * @author   Phergie Development Team <team@phergie.org>
  * @license  http://phergie.org/license New BSD License
@@ -38,9 +38,9 @@ abstract class Phergie_Process_Abstract
     protected $driver;
 
     /**
-     * Current connection handler instance 
+     * Current connection handler instance
      *
-     * @var Phergie_Connection_Handler 
+     * @var Phergie_Connection_Handler
      */
     protected $connections;
 
@@ -75,9 +75,9 @@ abstract class Phergie_Process_Abstract
     /**
      * Gets the required class refences from Phergie_Bot.
      *
-     * @param Phergie_Bot $bot     Current bot instance in use 
+     * @param Phergie_Bot $bot     Current bot instance in use
      * @param array       $options Optional processor arguments
-     *      
+     *
      * @return void
      */
     public function __construct(Phergie_Bot $bot, array $options = array())
@@ -99,8 +99,8 @@ abstract class Phergie_Process_Abstract
      */
     protected function processEvents(Phergie_Connection $connection)
     {
+        $this->plugins->preDispatch();
         if (count($this->events)) {
-            $this->plugins->preDispatch();
             foreach ($this->events as $event) {
                 $this->ui->onCommand($event, $connection);
 
@@ -110,15 +110,15 @@ abstract class Phergie_Process_Abstract
                     $event->getArguments()
                 );
             }
-            $this->plugins->postDispatch();
-
-            if ($this->events->hasEventOfType(Phergie_Event_Request::TYPE_QUIT)) {
-                $this->ui->onQuit($connection);
-                $this->connections->removeConnection($connection);
-            }
-
-            $this->events->clearEvents();
         }
+        $this->plugins->postDispatch();
+
+        if ($this->events->hasEventOfType(Phergie_Event_Request::TYPE_QUIT)) {
+            $this->ui->onQuit($connection);
+            $this->connections->removeConnection($connection);
+        }
+
+        $this->events->clearEvents();
     }
 
     /**
diff --git a/plugins/Irc/extlib/phergie/Phergie/Process/Async.php b/plugins/Irc/extlib/phergie/Phergie/Process/Async.php
index e553ad5a82..78d5959144 100644
--- a/plugins/Irc/extlib/phergie/Phergie/Process/Async.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Process/Async.php
@@ -117,11 +117,7 @@ class Phergie_Process_Async extends Phergie_Process_Abstract
             if ($event = $this->driver->getEvent()) {
                 $this->ui->onEvent($event, $connection);
                 $this->plugins->setEvent($event);
-
-                if (!$this->plugins->preEvent()) {
-                    continue;
-                }
-
+                $this->plugins->preEvent();
                 $this->plugins->{'on' . ucfirst($event->getType())}();
             }
 
diff --git a/plugins/Irc/extlib/phergie/Phergie/Process/Standard.php b/plugins/Irc/extlib/phergie/Phergie/Process/Standard.php
index 385c65fa22..24adbaf991 100644
--- a/plugins/Irc/extlib/phergie/Phergie/Process/Standard.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Process/Standard.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Phergie 
+ * Phergie
  *
  * PHP version 5
  *
@@ -11,7 +11,7 @@
  * It is also available through the world-wide-web at this URL:
  * http://phergie.org/license
  *
- * @category  Phergie 
+ * @category  Phergie
  * @package   Phergie
  * @author    Phergie Development Team <team@phergie.org>
  * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
@@ -23,7 +23,7 @@
  * Connection data processor which reads all connections looking
  * for a response.
  *
- * @category Phergie 
+ * @category Phergie
  * @package  Phergie
  * @author   Phergie Development Team <team@phergie.org>
  * @license  http://phergie.org/license New BSD License
@@ -32,7 +32,7 @@
 class Phergie_Process_Standard extends Phergie_Process_Abstract
 {
     /**
-     * Obtains and processes incoming events, then sends resulting outgoing 
+     * Obtains and processes incoming events, then sends resulting outgoing
      * events.
      *
      * @return void
@@ -47,11 +47,7 @@ class Phergie_Process_Standard extends Phergie_Process_Abstract
             if ($event = $this->driver->getEvent()) {
                 $this->ui->onEvent($event, $connection);
                 $this->plugins->setEvent($event);
-
-                if (!$this->plugins->preEvent()) {
-                    continue;
-                }
-
+                $this->plugins->preEvent();
                 $this->plugins->{'on' . ucfirst($event->getType())}();
             }
 

From c71319419bd00ee563fd87a6fe2f202293441d82 Mon Sep 17 00:00:00 2001
From: Luke Fitzgerald <lw.fitzgerald@googlemail.com>
Date: Tue, 3 Aug 2010 10:02:47 -0700
Subject: [PATCH 139/655] Cosmetic whitespace change

---
 plugins/Irc/extlib/phergie/Phergie/Driver/Statusnet.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/Irc/extlib/phergie/Phergie/Driver/Statusnet.php b/plugins/Irc/extlib/phergie/Phergie/Driver/Statusnet.php
index 6a0cbb8d15..84c85a01cc 100644
--- a/plugins/Irc/extlib/phergie/Phergie/Driver/Statusnet.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Driver/Statusnet.php
@@ -45,7 +45,7 @@ class Phergie_Driver_Statusnet extends Phergie_Driver_Streams {
     public function forceQuit() {
         try {
             // Send a QUIT command to the server
-        $this->send('QUIT', 'Reconnecting');
+            $this->send('QUIT', 'Reconnecting');
         } catch (Phergie_Driver_Exception $e){}
 
         // Terminate the socket connection

From 678911af249ddc5d2db8d182ce3fd0c748c05fd7 Mon Sep 17 00:00:00 2001
From: Luke Fitzgerald <lw.fitzgerald@googlemail.com>
Date: Tue, 3 Aug 2010 11:45:55 -0700
Subject: [PATCH 140/655] Revert "Merged in Phergie changes"

This reverts commit a3df3b63670aeb31785ba8665ebc2b78d4e7760f.
---
 .../Irc/extlib/phergie/Phergie/Beer/db.php    |  81 --
 .../Irc/extlib/phergie/Phergie/Connection.php |   2 +-
 .../phergie/Phergie/Connection/Exception.php  |   6 -
 .../extlib/phergie/Phergie/Driver/Streams.php |   1 -
 .../Irc/extlib/phergie/Phergie/Plugin/Acl.php | 142 +---
 .../phergie/Phergie/Plugin/Caffeine.php       |  69 --
 .../phergie/Phergie/Plugin/Caffeine/db.php    |  51 --
 .../extlib/phergie/Phergie/Plugin/Command.php |  60 +-
 .../phergie/Phergie/Plugin/Cookie/db.php      |   3 +
 .../extlib/phergie/Phergie/Plugin/Daddy.php   |  16 +-
 .../extlib/phergie/Phergie/Plugin/Google.php  | 144 ++--
 .../extlib/phergie/Phergie/Plugin/Handler.php |  41 +-
 .../extlib/phergie/Phergie/Plugin/Help.php    | 284 ++++---
 .../extlib/phergie/Phergie/Plugin/Http.php    |   9 +-
 .../extlib/phergie/Phergie/Plugin/Ideone.php  | 180 -----
 .../phergie/Phergie/Plugin/Iterator.php       | 126 ----
 .../extlib/phergie/Phergie/Plugin/Karma.php   | 694 +++++++++---------
 .../extlib/phergie/Phergie/Plugin/Message.php | 112 ---
 .../extlib/phergie/Phergie/Plugin/Ping.php    |   4 +-
 .../extlib/phergie/Phergie/Plugin/Quit.php    |  14 +-
 .../extlib/phergie/Phergie/Plugin/Reload.php  |   9 +-
 .../extlib/phergie/Phergie/Plugin/Serve.php   |  25 +-
 .../Irc/extlib/phergie/Phergie/Plugin/Tea.php |  69 --
 .../extlib/phergie/Phergie/Plugin/Tea/db.php  |  49 --
 .../Phergie/Plugin/TheFuckingWeather.php      |   6 +
 .../Irc/extlib/phergie/Phergie/Plugin/Tld.php |  18 +-
 .../extlib/phergie/Phergie/Plugin/Youtube.php |   2 +-
 .../phergie/Phergie/Process/Abstract.php      |  30 +-
 .../extlib/phergie/Phergie/Process/Async.php  |   6 +-
 .../phergie/Phergie/Process/Standard.php      |  14 +-
 30 files changed, 720 insertions(+), 1547 deletions(-)
 delete mode 100644 plugins/Irc/extlib/phergie/Phergie/Beer/db.php
 delete mode 100644 plugins/Irc/extlib/phergie/Phergie/Plugin/Caffeine.php
 delete mode 100644 plugins/Irc/extlib/phergie/Phergie/Plugin/Caffeine/db.php
 delete mode 100644 plugins/Irc/extlib/phergie/Phergie/Plugin/Ideone.php
 delete mode 100644 plugins/Irc/extlib/phergie/Phergie/Plugin/Iterator.php
 delete mode 100644 plugins/Irc/extlib/phergie/Phergie/Plugin/Message.php
 delete mode 100644 plugins/Irc/extlib/phergie/Phergie/Plugin/Tea.php
 delete mode 100644 plugins/Irc/extlib/phergie/Phergie/Plugin/Tea/db.php

diff --git a/plugins/Irc/extlib/phergie/Phergie/Beer/db.php b/plugins/Irc/extlib/phergie/Phergie/Beer/db.php
deleted file mode 100644
index c7921e5193..0000000000
--- a/plugins/Irc/extlib/phergie/Phergie/Beer/db.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-
-if (!defined('__DIR__')) {
-    define('__DIR__', dirname(__FILE__));
-}
-
-// Create database schema
-echo 'Creating database', PHP_EOL;
-$file = __DIR__ . '/beer.db';
-if (file_exists($file)) {
-    unlink($file);
-}
-$db = new PDO('sqlite:' . $file);
-$db->exec('CREATE TABLE beer (name VARCHAR(255), link VARCHAR(255))');
-$db->exec('CREATE UNIQUE INDEX beer_name ON beer (name)');
-$insert = $db->prepare('INSERT INTO beer (name, link) VALUES (:name, :link)');
-
-// Get raw beerme.com data set
-echo 'Downloading beerme.com data set', PHP_EOL;
-$file = __DIR__ . '/beerlist.txt';
-if (!file_exists($file)) {
-    copy('http://beerme.com/beerlist.php', $file);
-}
-$contents = file_get_contents($file);
-
-// Extract data from data set
-echo 'Processing beerme.com data', PHP_EOL;
-$contents = tidy_repair_string($contents);
-libxml_use_internal_errors(true);
-$doc = new DOMDocument;
-$doc->loadHTML($contents);
-libxml_clear_errors();
-$xpath = new DOMXPath($doc);
-$beers = $xpath->query('//table[@class="beerlist"]/tr/td[1]');
-$db->beginTransaction();
-foreach ($beers as $beer) {
-    $name = iconv('UTF-8', 'ISO-8859-1//TRANSLIT', $beer->textContent);
-    $name = preg_replace('/\h*\v+\h*/', '', $name);
-    $link = 'http://beerme.com' . $beer->childNodes->item(1)->getAttribute('href');
-    $insert->execute(array($name, $link));
-}
-$db->commit();
-
-// Clean up
-echo 'Cleaning up', PHP_EOL;
-unlink($file);
-
-// Get and decompress openbeerdb.com data set
-$archive = __DIR__ . '/beers.zip';
-if (!file_exists($archive)) {
-    echo 'Downloading openbeerdb.com data set', PHP_EOL;
-    copy('http://openbeerdb.googlecode.com/files/beers.zip', $archive);
-}
-
-echo 'Decompressing openbeerdb.com data set', PHP_EOL;
-$zip = new ZipArchive;
-$zip->open($archive);
-$zip->extractTo(__DIR__, 'beers/beers.csv');
-$zip->close();
-$file = __DIR__ . '/beers/beers.csv';
-
-// Extract data from data set
-echo 'Processing openbeerdb.com data', PHP_EOL;
-$fp = fopen($file, 'r');
-$columns = fgetcsv($fp, 0, '|');
-$db->beginTransaction();
-while ($line = fgetcsv($fp, 0, '|')) {
-    $line = array_combine($columns, $line);
-    $name = iconv('UTF-8', 'ISO-8859-1//TRANSLIT', $line['name']);
-    $name = preg_replace('/\h*\v+\h*/', '', $name);
-    $link = null;
-    $insert->execute(array($name, $link));
-}
-$db->commit();
-fclose($fp);
-
-// Clean up
-echo 'Cleaning up', PHP_EOL;
-unlink($file);
-unlink($archive);
-rmdir(__DIR__ . '/beers');
diff --git a/plugins/Irc/extlib/phergie/Phergie/Connection.php b/plugins/Irc/extlib/phergie/Phergie/Connection.php
index b3f0acf83d..d6c89ea801 100755
--- a/plugins/Irc/extlib/phergie/Phergie/Connection.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Connection.php
@@ -254,7 +254,7 @@ class Phergie_Connection
         if (!in_array($this->encoding, mb_list_encodings())) {
             throw new Phergie_Connection_Exception(
                 'Encoding ' . $this->encoding . ' is not supported',
-                Phergie_Connection_Exception::ERR_ENCODING_NOT_SUPPORTED
+                Phergie_Connection_Exception::ENCODING_NOT_SUPPORTED
             );
         }
 
diff --git a/plugins/Irc/extlib/phergie/Phergie/Connection/Exception.php b/plugins/Irc/extlib/phergie/Phergie/Connection/Exception.php
index aec1cd8e0f..a750e1d860 100644
--- a/plugins/Irc/extlib/phergie/Phergie/Connection/Exception.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Connection/Exception.php
@@ -41,10 +41,4 @@ class Phergie_Connection_Exception extends Phergie_Exception
      * but that transport is not supported by the current PHP installation
      */
     const ERR_TRANSPORT_NOT_SUPPORTED = 2;
-
-    /**
-     * Error indicating that a connection is configured to use an encoding,
-     * but that encoding is not supported by the current PHP installation
-     */
-    const ERR_ENCODING_NOT_SUPPORTED = 3;
 }
diff --git a/plugins/Irc/extlib/phergie/Phergie/Driver/Streams.php b/plugins/Irc/extlib/phergie/Phergie/Driver/Streams.php
index 73c0230c71..3f2ce052b1 100755
--- a/plugins/Irc/extlib/phergie/Phergie/Driver/Streams.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Driver/Streams.php
@@ -243,7 +243,6 @@ class Phergie_Driver_Streams extends Phergie_Driver_Abstract
 
             // Parse the command and arguments
             list($cmd, $args) = array_pad(explode(' ', $buffer, 2), 2, null);
-            $hostmask = new Phergie_Hostmask(null, null, $this->connection->getHost());
 
         } else {
             // If the event could be from the server or a user...
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Acl.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Acl.php
index e209e32e14..9738df60e0 100755
--- a/plugins/Irc/extlib/phergie/Phergie/Plugin/Acl.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Acl.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Phergie
+ * Phergie 
  *
  * PHP version 5
  *
@@ -11,7 +11,7 @@
  * It is also available through the world-wide-web at this URL:
  * http://phergie.org/license
  *
- * @category  Phergie
+ * @category  Phergie 
  * @package   Phergie_Plugin_Acl
  * @author    Phergie Development Team <team@phergie.org>
  * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
@@ -20,48 +20,14 @@
  */
 
 /**
- * Provides an access control system to limit reponses to events based on
+ * Provides an access control system to limit reponses to events based on 
  * the users who originate them.
  *
- * Configuration settings:
- * acl.whitelist - mapping of user hostmask patterns (optionally by host) to
- *                 plugins and methods where those plugins and methods will
- *                 only be accessible to those users (i.e. and inaccessible
- *                 to other users)
- * acl.blacklist - mapping of user hostmasks (optionally by host) to plugins
- *                 and methods where where those plugins and methods will be
- *                 inaccessible to those users but accessible to other users
- * acl.ops       - TRUE to automatically give access to whitelisted plugins
- *                 and methods to users with ops for events they initiate in
- *                 channels where they have ops
- *
- * The whitelist and blacklist settings are formatted like so:
- * <code>
- * 'acl.whitelist' => array(
- *     'hostname1' => array(
- *         'pattern1' => array(
- *             'plugins' => array(
- *                 'ShortPluginName'
- *             ),
- *             'methods' => array(
- *                 'methodName'
- *             )
- *         ),
- *     )
- * ),
- * </code>
- *
- * The hostname array dimension is optional; if not used, rules will be
- * applied across all connections. The pattern is a user hostmask pattern
- * where asterisks (*) are used for wildcards. Plugins and methods do not
- * need to be set to empty arrays if they are not used; simply exclude them.
- *
- * @category Phergie
+ * @category Phergie 
  * @package  Phergie_Plugin_Acl
  * @author   Phergie Development Team <team@phergie.org>
  * @license  http://phergie.org/license New BSD License
  * @link     http://pear.phergie.org/package/Phergie_Plugin_Acl
- * @uses     Phergie_Plugin_UserInfo pear.phergie.org
  */
 class Phergie_Plugin_Acl extends Phergie_Plugin_Abstract
 {
@@ -72,8 +38,6 @@ class Phergie_Plugin_Acl extends Phergie_Plugin_Abstract
      */
     public function onLoad()
     {
-        $this->plugins->getPlugin('UserInfo');
-
         if (!$this->getConfig('acl.blacklist')
             && !$this->getConfig('acl.whitelist')
         ) {
@@ -82,105 +46,47 @@ class Phergie_Plugin_Acl extends Phergie_Plugin_Abstract
     }
 
     /**
-     * Applies a set of rules to a plugin handler iterator.
-     *
-     * @param Phergie_Plugin_Iterator $iterator Iterator to receive rules
-     * @param array                   $rules    Associate array containing
-     *        either a 'plugins' key pointing to an array containing plugin
-     *        short names to filter, a 'methods' key pointing to an array
-     *        containing method names to filter, or both
-     *
-     * @return void
-     */
-    protected function applyRules(Phergie_Plugin_Iterator $iterator, array $rules)
-    {
-        if (!empty($rules['plugins'])) {
-            $iterator->addPluginFilter($rules['plugins']);
-        }
-        if (!empty($rules['methods'])) {
-            $iterator->addMethodFilter($rules['methods']);
-        }
-    }
-
-    /**
-     * Checks permission settings and short-circuits event processing for
+     * Checks permission settings and short-circuits event processing for 
      * blacklisted users.
      *
-     * @return void
+     * @return bool FALSE to short-circuit event processing if the user is 
+     *         blacklisted, TRUE otherwise
      */
     public function preEvent()
     {
         // Ignore server responses
         if ($this->event instanceof Phergie_Event_Response) {
-            return;
+            return true;
         }
 
         // Ignore server-initiated events
         if (!$this->event->isFromUser()) {
-            return;
+            return true;
         }
 
-        // Get the iterator used to filter plugins when processing events
-        $iterator = $this->plugins->getIterator();
+        // Determine whether a whitelist or blacklist is being used
+        $list = $this->getConfig('acl.whitelist');
+        $matches = true;
+        if (!$list) {
+            $list = $this->getConfig('acl.blacklist');
+            $matches = false;
+        }
 
-        // Get configuration setting values
-        $whitelist = $this->getConfig('acl.whitelist', array());
-        $blacklist = $this->getConfig('acl.blacklist', array());
-        $ops = $this->getConfig('acl.ops', false);
-
-        // Support host-specific lists
+        // Support host-specific lists 
         $host = $this->connection->getHost();
-        foreach (array('whitelist', 'blacklist') as $var) {
-            foreach ($$var as $pattern => $rules) {
-                $regex = '/^' . str_replace('*', '.*', $pattern) . '$/i';
-                if (preg_match($regex, $host)) {
-                    ${$var} = ${$var}[$pattern];
-                    break;
-                }
-            }
+        if (isset($list[$host])) {
+            $list = $list[$host];
         }
 
-        // Get information on the user initiating the current event
+        // Short-circuit event processing if appropriate 
         $hostmask = $this->event->getHostmask();
-        $isOp = $ops
-              && $this->event->isInChannel()
-              && $this->plugins->userInfo->isOp(
-                $this->event->getNick(),
-                $this->event->getSource()
-              );
-
-        // Filter whitelisted commands if the user is not on the whitelist
-        if (!$isOp) {
-            $whitelisted = false;
-            foreach ($whitelist as $pattern => $rules) {
-                if ($hostmask->matches($pattern)) {
-                    $whitelisted = true;
-                }
-            }
-            if (!$whitelisted) {
-                foreach ($whitelist as $pattern => $rules) {
-                    $this->applyRules($iterator, $rules);
-                }
-            }
-        }
-
-        // Filter blacklisted commands if the user is on the blacklist
-        $blacklisted = false;
-        foreach ($blacklist as $pattern => $rules) {
+        foreach ($list as $pattern) {
             if ($hostmask->matches($pattern)) {
-                $this->applyRules($iterator, $rules);
-                break;
+                return $matches;
             }
         }
-    }
 
-    /**
-     * Clears filters on the plugin handler iterator.
-     *
-     * @return void
-     */
-    public function postDispatch()
-    {
-        $this->plugins->getIterator()->clearFilters();
+        // Allow event processing if appropriate 
+        return !$matches;
     }
 }
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Caffeine.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Caffeine.php
deleted file mode 100644
index 2b76bd312f..0000000000
--- a/plugins/Irc/extlib/phergie/Phergie/Plugin/Caffeine.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-/**
- * Phergie
- *
- * PHP version 5
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.
- * It is also available through the world-wide-web at this URL:
- * http://phergie.org/license
- *
- * @category  Phergie
- * @package   Phergie_Plugin_Caffeine
- * @author    Phergie Development Team <team@phergie.org>
- * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
- * @license   http://phergie.org/license New BSD License
- * @link      http://pear.phergie.org/package/Phergie_Plugin_Caffeine
- */
-
-/**
- * Processes requests to serve users caffeinated beverages.
- *
- * @category Phergie
- * @package  Phergie_Plugin_Caffeine
- * @author   Phergie Development Team <team@phergie.org>
- * @license  http://phergie.org/license New BSD License
- * @link     http://pear.phergie.org/package/Phergie_Plugin_Caffeine
- * @uses     Phergie_Plugin_Command pear.phergie.org
- * @uses     Phergie_Plugin_Serve pear.phergie.org
- */
-class Phergie_Plugin_Caffeine extends Phergie_Plugin_Abstract
-{
-    /**
-     * Checks for dependencies.
-     *
-     * @return void
-     */
-    public function onLoad()
-    {
-        $plugins = $this->plugins;
-        $plugins->getPlugin('Command');
-        $plugins->getPlugin('Serve');
-    }
-
-    /**
-     * Processes requests to serve a user a caffeinated beverage.
-     *
-     * @param string $request Request including the target and an optional
-     *        suggestion of what caffeinated beverage to serve
-     *
-     * @return void
-     */
-    public function onCommandCaffeine($request)
-    {
-        $format = $this->getConfig(
-            'beer.format',
-            'throws %target% %article% %item%.'
-        );
-
-        $this->plugins->getPlugin('Serve')->serve(
-            dirname(__FILE__) . '/Caffeine/caffeine.db',
-            'caffeine',
-            $format,
-            $request
-        );
-    }
-}
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Caffeine/db.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Caffeine/db.php
deleted file mode 100644
index cdff52fd8d..0000000000
--- a/plugins/Irc/extlib/phergie/Phergie/Plugin/Caffeine/db.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-
-if (!defined('__DIR__')) {
-    define('__DIR__', dirname(__FILE__));
-}
-
-// Create database schema
-echo 'Creating database', PHP_EOL;
-$file = __DIR__ . '/caffeine.db';
-if (file_exists($file)) {
-    unlink($file);
-}
-$db = new PDO('sqlite:' . $file);
-$db->exec('CREATE TABLE caffeine (name VARCHAR(255), link VARCHAR(255))');
-$db->exec('CREATE UNIQUE INDEX caffeine_name ON caffeine (name)');
-$insert = $db->prepare('INSERT INTO caffeine (name, link) VALUES (:name, :link)');
-
-// Get raw energyfiend.com data set
-echo 'Downloading energyfiend.com data set', PHP_EOL;
-$file = __DIR__ . '/the-caffeine-database.html';
-if (!file_exists($file)) {
-    copy('http://www.energyfiend.com/the-caffeine-database', $file);
-}
-$contents = file_get_contents($file);
-
-// Extract data from data set
-echo 'Processing energyfiend.com data', PHP_EOL;
-$contents = tidy_repair_string($contents);
-libxml_use_internal_errors(true);
-$doc = new DOMDocument;
-$doc->loadHTML($contents);
-libxml_clear_errors();
-$xpath = new DOMXPath($doc);
-$caffeine = $xpath->query('//table[@id="caffeinedb"]//tr/td[1]');
-$db->beginTransaction();
-foreach ($caffeine as $drink) {
-    $name = iconv('UTF-8', 'ISO-8859-1//TRANSLIT', $drink->textContent);
-    $name = preg_replace('/\s*\v+\s*/', ' ', $name);
-    if ($drink->firstChild->nodeName == 'a') {
-        $link = 'http://energyfiend.com'
-              . $drink->firstChild->getAttribute('href');
-    } else {
-        $link = null;
-    }
-    $insert->execute(array($name, $link));
-}
-$db->commit();
-
-// Clean up
-echo 'Cleaning up', PHP_EOL;
-unlink($file);
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Command.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Command.php
index 48352b15dd..2ab5b69d1d 100755
--- a/plugins/Irc/extlib/phergie/Phergie/Plugin/Command.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Command.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Phergie
+ * Phergie 
  *
  * PHP version 5
  *
@@ -11,7 +11,7 @@
  * It is also available through the world-wide-web at this URL:
  * http://phergie.org/license
  *
- * @category  Phergie
+ * @category  Phergie 
  * @package   Phergie_Plugin_Command
  * @author    Phergie Development Team <team@phergie.org>
  * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
@@ -20,28 +20,20 @@
  */
 
 /**
- * Handles parsing and execution of commands sent by users via messages sent
+ * Handles parsing and execution of commands sent by users via messages sent 
  * to channels in which the bot is present or directly to the bot.
  *
- * @category Phergie
+ * @category Phergie 
  * @package  Phergie_Plugin_Command
  * @author   Phergie Development Team <team@phergie.org>
  * @license  http://phergie.org/license New BSD License
  * @link     http://pear.phergie.org/package/Phergie_Plugin_Command
  * @uses     extension reflection
- * @uses     Phergie_Plugin_Message pear.phergie.org
  */
 class Phergie_Plugin_Command extends Phergie_Plugin_Abstract
 {
     /**
-     * Prefix for command method names
-     *
-     * @var string
-     */
-    const METHOD_PREFIX = 'onCommand';
-
-    /**
-     * Cache for command lookups used to confirm that methods exist and
+     * Cache for command lookups used to confirm that methods exist and 
      * parameter counts match
      *
      * @var array
@@ -49,28 +41,24 @@ class Phergie_Plugin_Command extends Phergie_Plugin_Abstract
     protected $methods = array();
 
     /**
-     * Load the Message plugin
+     * Prefix for command method names
      *
-     * @return void
+     * @var string
      */
-    public function onLoad()
-    {
-        $plugins = $this->getPluginHandler();
-        $plugins->getPlugin('Message');
-    }
+    protected $methodPrefix = 'onCommand';
 
     /**
      * Populates the methods cache.
      *
      * @return void
      */
-    public function populateMethodCache()
+    protected function populateMethodCache()
     {
         foreach ($this->getPluginHandler() as $plugin) {
             $reflector = new ReflectionClass($plugin);
             foreach ($reflector->getMethods() as $method) {
                 $name = $method->getName();
-                if (strpos($name, self::METHOD_PREFIX) === 0
+                if (strpos($name, $this->methodPrefix) === 0 
                     && !isset($this->methods[$name])
                 ) {
                     $this->methods[$name] = array(
@@ -96,26 +84,26 @@ class Phergie_Plugin_Command extends Phergie_Plugin_Abstract
             $this->populateMethodCache();
         }
 
-        // Check for a prefixed message
-        $msg = $this->plugins->message->getMessage();
-        if ($msg === false) {
-            return;
+        // Get the content of the message
+        $event = $this->getEvent();
+        $msg = trim($event->getText());
+        $prefix = $this->getConfig('command.prefix');
+
+        // Check for the command prefix if one is set and needed
+        if ($prefix && $event->isInChannel()) {
+            if (strpos($msg, $prefix) !== 0) {
+                return;
+            } else {
+                $msg = substr($msg, strlen($prefix));
+            }
         }
 
         // Separate the command and arguments
         $parsed = preg_split('/\s+/', $msg, 2);
-        $command = strtolower(array_shift($parsed));
+        $method = $this->methodPrefix . ucfirst(strtolower(array_shift($parsed))); 
         $args = count($parsed) ? array_shift($parsed) : '';
 
-        // Resolve aliases to their corresponding commands
-        $aliases = $this->getConfig('command.aliases', array());
-        $result = preg_grep('/^' . $command . '$/i', array_keys($aliases));
-        if ($result) {
-            $command = $aliases[array_shift($result)];
-        }
-
         // Check to ensure the command exists
-        $method = self::METHOD_PREFIX . ucfirst($command);
         if (empty($this->methods[$method])) {
             return;
         }
@@ -134,7 +122,7 @@ class Phergie_Plugin_Command extends Phergie_Plugin_Abstract
             // Parse the arguments
             $args = preg_split('/\s+/', $args, $this->methods[$method]['total']);
 
-            // If the minimum arguments are passed, call the method
+            // If the minimum arguments are passed, call the method 
             if ($this->methods[$method]['required'] <= count($args)) {
                 call_user_func_array(
                     array($this->getPluginHandler(), $method),
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Cookie/db.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Cookie/db.php
index 27763159cc..91d375ca6d 100644
--- a/plugins/Irc/extlib/phergie/Phergie/Plugin/Cookie/db.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Cookie/db.php
@@ -36,6 +36,9 @@ $cookies = $xpath->query('//table[@width="90%"]/tr/td[1]/a');
 
 foreach ($cookies as $cookie) {
     $name = $cookie->textContent;
+    foreach (range(0, mb_strlen($name) - 1) as $index) {
+        echo mb_strcut($name, $index, 1), PHP_EOL;
+    }
     $name = str_replace(
         array('(',')',"\n", 'cookies'),
         array('','', ' ', 'cookie'),
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Daddy.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Daddy.php
index ed258e10ff..d47c3c41d3 100644
--- a/plugins/Irc/extlib/phergie/Phergie/Plugin/Daddy.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Daddy.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Phergie
+ * Phergie 
  *
  * PHP version 5
  *
@@ -11,7 +11,7 @@
  * It is also available through the world-wide-web at this URL:
  * http://phergie.org/license
  *
- * @category  Phergie
+ * @category  Phergie 
  * @package   Phergie_Plugin_Daddy
  * @author    Phergie Development Team <team@phergie.org>
  * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
@@ -23,7 +23,7 @@
  * Simply responds to messages addressed to the bot that contain the phrase
  * "Who's your daddy?" and related variations.
  *
- * @category Phergie
+ * @category Phergie 
  * @package  Phergie_Plugin_Daddy
  * @author   Phergie Development Team <team@phergie.org>
  * @license  http://phergie.org/license New BSD License
@@ -45,11 +45,15 @@ class Phergie_Plugin_Daddy extends Phergie_Plugin_Abstract
         $text = $event->getArgument(1);
         $target = $event->getNick();
         $source = $event->getSource();
-        $pattern
-            = '/' . preg_quote($prefix) .
+        $pattern 
+            = '/' . preg_quote($prefix) . 
             '\s*?who\'?s y(?:our|a) ([^?]+)\??/iAD';
         if (preg_match($pattern, $text, $m)) {
-            $msg = 'You\'re my ' . $m[1] . ', ' . $target . '!';
+            if ($config['daddy.curses'] && mt_rand(0, 5) === 5) {
+                $msg = $target . ': I am your ' . $m[1] . ', bitch!';
+            } else {
+                $msg = 'You\'re my ' . $m[1] . ', ' . $target . '!';
+            }
             $this->doPrivmsg($source, $msg);
         }
     }
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Google.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Google.php
index d2a9d4dce9..faa98f926a 100644
--- a/plugins/Irc/extlib/phergie/Phergie/Plugin/Google.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Google.php
@@ -32,9 +32,24 @@
  * @uses     Phergie_Plugin_Command pear.phergie.org
  * @uses     Phergie_Plugin_Http pear.phergie.org
  * @uses     Phergie_Plugin_Temperature pear.phergie.org
+ *
+ * @pluginDesc Provide access to some Google services
  */
 class Phergie_Plugin_Google extends Phergie_Plugin_Abstract
 {
+
+    /**
+     * HTTP plugin
+     *
+     * @var Phergie_Plugin_Http
+     */
+    protected $http;
+
+    /**
+     * Language for Google Services
+     */
+    protected $lang;
+
     /**
      * Checks for dependencies.
      *
@@ -44,8 +59,11 @@ class Phergie_Plugin_Google extends Phergie_Plugin_Abstract
     {
         $plugins = $this->getPluginHandler();
         $plugins->getPlugin('Command');
-        $plugins->getPlugin('Http');
+        $this->http = $plugins->getPlugin('Http');
+        $plugins->getPlugin('Help')->register($this);
         $plugins->getPlugin('Weather');
+
+        $this->lang = $this->getConfig('google.lang', 'en');
     }
 
     /**
@@ -55,6 +73,8 @@ class Phergie_Plugin_Google extends Phergie_Plugin_Abstract
      *
      * @return void
      * @todo Implement use of URL shortening here
+     *
+     * @pluginCmd [query] do a search on google
      */
     public function onCommandG($query)
     {
@@ -63,7 +83,7 @@ class Phergie_Plugin_Google extends Phergie_Plugin_Abstract
             'v' => '1.0',
             'q' => $query
         );
-        $response = $this->plugins->http->get($url, $params);
+        $response = $this->http->get($url, $params);
         $json = $response->getContent()->responseData;
         $event = $this->getEvent();
         $source = $event->getSource();
@@ -90,6 +110,8 @@ class Phergie_Plugin_Google extends Phergie_Plugin_Abstract
      * @param string $query Search term
      *
      * @return void
+     *
+     * @pluginCmd [query] Do a search on Google and count the results
      */
     public function onCommandGc($query)
     {
@@ -98,7 +120,7 @@ class Phergie_Plugin_Google extends Phergie_Plugin_Abstract
             'v' => '1.0',
             'q' => $query
         );
-        $response = $this->plugins->http->get($url, $params);
+        $response = $this->http->get($url, $params);
         $json = $response->getContent()->responseData->cursor;
         $count = $json->estimatedResultCount;
         $event = $this->getEvent();
@@ -124,6 +146,8 @@ class Phergie_Plugin_Google extends Phergie_Plugin_Abstract
      * @param string $query Term to translate
      *
      * @return void
+     *
+     * @pluginCmd [from language] [to language] [text to translate] Do a translation on Google
      */
     public function onCommandGt($from, $to, $query)
     {
@@ -133,7 +157,7 @@ class Phergie_Plugin_Google extends Phergie_Plugin_Abstract
             'q' => $query,
             'langpair' => $from . '|' . $to
         );
-        $response = $this->plugins->http->get($url, $params);
+        $response = $this->http->get($url, $params);
         $json = $response->getContent();
         $event = $this->getEvent();
         $source = $event->getSource();
@@ -156,16 +180,18 @@ class Phergie_Plugin_Google extends Phergie_Plugin_Abstract
      *        between 0 and 3 to get the forecast
      *
      * @return void
+     *
+     * @pluginCmd [location] Show the weather for the specified location
      */
     public function onCommandGw($location, $offset = null)
     {
         $url = 'http://www.google.com/ig/api';
         $params = array(
             'weather' => $location,
-            'hl' => $this->getConfig('google.lang', 'en'),
+            'hl' => $this->lang,
             'oe' => 'UTF-8'
         );
-        $response = $this->plugins->http->get($url, $params);
+        $response = $this->http->get($url, $params);
         $xml = $response->getContent()->weather;
 
         $event = $this->getEvent();
@@ -254,6 +280,8 @@ class Phergie_Plugin_Google extends Phergie_Plugin_Abstract
      * @param string $location Location to search for
      *
      * @return void
+     *
+     * @pluginCmd [location] Get the location from Google Maps to the location specified
      */
     public function onCommandGmap($location)
     {
@@ -266,13 +294,13 @@ class Phergie_Plugin_Google extends Phergie_Plugin_Abstract
         $params = array(
             'q' => $location,
             'output' => 'json',
-            'gl' => $this->getConfig('google.lang', 'en'),
+            'gl' => $this->lang,
             'sensor' => 'false',
             'oe' => 'utf8',
             'mrt' => 'all',
             'key' => $this->getConfig('google.key')
         );
-        $response = $this->plugins->http->get($url, $params);
+        $response = $this->http->get($url, $params);
         $json =  $response->getContent();
         if (!empty($json)) {
             $qtd = count($json->Placemark);
@@ -317,6 +345,8 @@ class Phergie_Plugin_Google extends Phergie_Plugin_Abstract
      * @param string $to    Destination metric
      *
      * @return void
+     *
+     * @pluginCmd [value] [currency from] [currency to] Converts a monetary value from one currency to another
      */
     public function onCommandGconvert($value, $from, $to)
     {
@@ -326,21 +356,29 @@ class Phergie_Plugin_Google extends Phergie_Plugin_Abstract
             'from' => $from,
             'to' => $to
         );
-        $response = $this->plugins->http->get($url, $params);
+        $response = $this->http->get($url, $params);
         $contents = $response->getContent();
         $event = $this->getEvent();
         $source = $event->getSource();
         $nick = $event->getNick();
         if ($contents) {
-            libxml_use_internal_errors(true);
-            $doc = new DOMDocument;
-            $doc->loadHTML($contents);
-            libxml_clear_errors();
-            $xpath = new DOMXPath($doc);
-            $result = $xpath->query('//div[@id="currency_converter_result"]');
-            $div = $result->item(0);
-            $text = rtrim($div->textContent);
-            $this->doPrivmsg($source, $text);
+            preg_match(
+                '#<span class=bld>.*? ' . $to . '</span>#im',
+                $contents,
+                $matches
+            );
+            if (!$matches[0]) {
+                $this->doPrivmsg($source, $nick . ', I can\'t do that.');
+            } else {
+                $str = str_replace('<span class=bld>', '', $matches[0]);
+                $str = str_replace($to . '</span>', '', $str);
+                $text
+                    = number_format($value, 2, ',', '.') . ' ' . $from .
+                    ' => ' . number_format($str, 2, ',', '.') . ' ' . $to;
+                $this->doPrivmsg($source, $text);
+            }
+        } else {
+            $this->doPrivmsg($source, $nick . ', we had a problem.');
         }
     }
 
@@ -357,7 +395,7 @@ class Phergie_Plugin_Google extends Phergie_Plugin_Abstract
     public function onCommandConvert($query)
     {
         $url = 'http://www.google.com/search?q=' . urlencode($query);
-        $response = $this->plugins->http->get($url);
+        $response = $this->http->get($url);
         $contents = $response->getContent();
         $event = $this->getEvent();
         $source = $event->getSource();
@@ -396,61 +434,49 @@ class Phergie_Plugin_Google extends Phergie_Plugin_Abstract
      *
      * @return void
      * @todo Implement use of URL shortening here
+     *
+     * @pluginCmd [query] do a search of a definition on Google Dictionary
      */
     public function onCommandDefine($query)
     {
-        $lang = $this->getConfig('google.lang', 'en');
-        $url = 'http://www.google.com/dictionary/json';
-        $params = array(
-            'callback' => 'result',
-            'q' => $query,
-            'sl' => $lang,
-            'tl' => $lang,
-            'restrict' => 'pr,de'
-        );
-        $response = $this->plugins->http->get($url, $params);
-        $json = $response->getContent();
+        $query = urlencode($query);
+        $url = 'http://www.google.com/dictionary/json?callback=result'.
+               '&q='.$query.'&sl='.$this->lang.'&tl='.$this->lang.
+               '&restrict=pr,de';
+        $json = file_get_contents($url);
 
-        // Remove some garbage from the JSON and decode it
-        $json = str_replace(array('result(', ',200,null)'), '', $json);
+        //Remove some garbage from the json
+        $json = str_replace(array("result(", ",200,null)"), "", $json);
+
+        //Awesome workaround to remove a lot of slashes from json
         $json = str_replace('"', '¿?¿', $json);
         $json = strip_tags(stripcslashes($json));
         $json = str_replace('"', "'", $json);
         $json = str_replace('¿?¿', '"', $json);
+
         $json = json_decode($json);
 
         $event = $this->getEvent();
         $source = $event->getSource();
         $nick = $event->getNick();
-        if (!empty($json->webDefinitions)) {
-            $results = 0;
-            foreach ($json->primaries[0]->entries as $entry) {
-                if ($entry->type == 'meaning') {
-                    $results++;
-                    if (empty($text)) {
-                        foreach ($entry->terms as $term) {
-                            if ($term->type == 'text') {
-                                $text = trim($term->text);
-                            }
-                        }
-                    }
-                }
-            }
-            $more = $results > 1 ? ($results - 1) . ' ' : '';
-            $lang_code = substr($lang, 0, 2);
-            $msg = $nick . ': ' . $text
-                 . ' - You can find ' . $more . 'more results at '
-                 . 'http://www.google.com/dictionary'
-                 . '?aq=f'
-                 . '&langpair=' . $lang_code . '%7C' . $lang_code
-                 . '&q=' . $query
-                 . '&hl=' . $lang_code;
+        if (!empty($json->webDefinitions)){
+            $results = count($json->webDefinitions[0]->entries);
+            $more = $results > 1 ? ($results-1).' ' : NULL;
+            $lang_code = substr($this->lang, 0, 2);
+            $msg =
+                $nick . ': ' .
+                $json->webDefinitions[0]->entries[0]->terms[0]->text .
+                ' - You can find more '.$more.'results at '.
+                'http://www.google.com/dictionary?aq=f&langpair='.
+                $lang_code.'%7C'.$lang_code.'&q='.$query.'&hl='.$lang_code;
             $this->doPrivmsg($source, $msg);
-        } else {
-            if ($lang != 'en'){
-               $lang = 'en';
+        }else{
+            if ($this->lang != 'en'){
+               $temp = $this->lang;
+               $this->lang = 'en';
                $this->onCommandDefine($query);
-            } else {
+               $this->lang = $temp;
+            }else{
                $msg = $nick . ': No results for this query.';
                $this->doPrivmsg($source, $msg);
             }
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Handler.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Handler.php
index 4304bef99e..b2ef089b44 100755
--- a/plugins/Irc/extlib/phergie/Phergie/Plugin/Handler.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Handler.php
@@ -68,14 +68,6 @@ class Phergie_Plugin_Handler implements IteratorAggregate, Countable
      */
     protected $events;
 
-    /**
-     * Iterator used for selectively proxying method calls to contained
-     * plugins
-     *
-     * @var Iterator
-     */
-    protected $iterator;
-
     /**
      * Constructor to initialize class properties and add the path for core
      * plugins.
@@ -424,39 +416,26 @@ class Phergie_Plugin_Handler implements IteratorAggregate, Countable
      */
     public function getIterator()
     {
-        if (empty($this->iterator)) {
-            $this->iterator = new Phergie_Plugin_Iterator(
-                new ArrayIterator($this->plugins)
-            );
-        }
-        return $this->iterator;
+        return new ArrayIterator($this->plugins);
     }
 
     /**
-     * Sets the iterator for all currently loaded plugin instances.
-     *
-     * @param Iterator $iterator Plugin iterator
-     *
-     * @return Phergie_Plugin_Handler Provides a fluent interface
-     */
-    public function setIterator(Iterator $iterator)
-    {
-        $this->iterator = $iterator;
-        return $this;
-    }
-
-    /**
-     * Proxies method calls to all plugins containing the called method.
+     * Proxies method calls to all plugins containing the called method. An
+     * individual plugin may short-circuit this process by explicitly
+     * returning FALSE.
      *
      * @param string $name Name of the method called
      * @param array  $args Arguments passed in the method call
      *
-     * @return void
+     * @return bool FALSE if a plugin short-circuits processing by returning
+     *         FALSE, TRUE otherwise
      */
     public function __call($name, array $args)
     {
-        foreach ($this->getIterator() as $plugin) {
-            call_user_func_array(array($plugin, $name), $args);
+        foreach ($this->plugins as $plugin) {
+            if (call_user_func_array(array($plugin, $name), $args) === false) {
+                return false;
+            }
         }
         return true;
     }
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Help.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Help.php
index 4c2c49b314..7cc8349571 100644
--- a/plugins/Irc/extlib/phergie/Phergie/Plugin/Help.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Help.php
@@ -28,16 +28,26 @@
  * @license  http://phergie.org/license New BSD License
  * @link     http://pear.phergie.org/package/Phergie_Plugin_Help
  * @uses     Phergie_Plugin_Command pear.phergie.org
+ *
+ * @pluginDesc Provides access to plugin help information
  */
 class Phergie_Plugin_Help extends Phergie_Plugin_Abstract
 {
+
     /**
-     * Registry of help data indexed by plugin name
+     * Holds the registry of help data indexed by plugin name
      *
      * @var array
      */
     protected $registry;
 
+    /**
+     * Whether the registry has been alpha sorted
+     *
+     * @var bool
+     */
+    protected $registry_sorted = false;
+
     /**
      * Checks for dependencies.
      *
@@ -46,175 +56,143 @@ class Phergie_Plugin_Help extends Phergie_Plugin_Abstract
     public function onLoad()
     {
         $this->getPluginHandler()->getPlugin('Command');
-    }
-
-    /**
-     * Creates a registry of plugin metadata on connect.
-     *
-     * @return void
-     */
-    public function onConnect()
-    {
-        $this->populateRegistry();
-    }
-
-    /**
-     * Creates a registry of plugin metadata.
-     *
-     * @return void
-     */
-    public function populateRegistry()
-    {
-        $this->registry = array();
-
-        foreach ($this->plugins as $plugin) {
-            $class = new ReflectionClass($plugin);
-            $pluginName = strtolower($plugin->getName());
-
-            // Parse the plugin description
-            $docblock = $class->getDocComment();
-            $annotations = $this->getAnnotations($docblock);
-            if (isset($annotations['pluginDesc'])) {
-                $pluginDesc = implode(' ', $annotations['pluginDesc']);
-            } else {
-                $pluginDesc = $this->parseShortDescription($docblock);
-            }
-            $this->registry[$pluginName] = array(
-                'desc' => $pluginDesc,
-                'cmds' => array()
-            );
-
-            // Parse command method descriptions
-            $methodPrefix = Phergie_Plugin_Command::METHOD_PREFIX;
-            $methodPrefixLength = strlen($methodPrefix);
-            foreach ($class->getMethods() as $method) {
-                if (strpos($method->getName(), $methodPrefix) !== 0) {
-                    continue;
-                }
-
-                $cmd = strtolower(substr($method->getName(), $methodPrefixLength));
-                $docblock = $method->getDocComment();
-                $annotations = $this->getAnnotations($docblock);
-
-                if (isset($annotations['pluginCmd'])) {
-                    $cmdDesc = implode(' ', $annotations['pluginCmd']);
-                } else {
-                    $cmdDesc = $this->parseShortDescription($docblock);
-                }
-
-                $cmdParams = array();
-                if (!empty($annotations['param'])) {
-                    foreach ($annotations['param'] as $param) {
-                        $match = null;
-                        if (preg_match('/\h+\$([^\h]+)\h+/', $param, $match)) {
-                            $cmdParams[] = $match[1];
-                        }
-                    }
-                }
-
-                $this->registry[$pluginName]['cmds'][$cmd] = array(
-                    'desc' => $cmdDesc,
-                    'params' => $cmdParams
-                );
-            }
-
-            if (empty($this->registry[$pluginName]['cmds'])) {
-                unset($this->registry[$pluginName]);
-            }
-        }
+        $this->register($this);
     }
 
     /**
      * Displays a list of plugins with help information available or
      * commands available for a specific plugin.
      *
-     * @param string $query Optional short name of a plugin for which commands
-     *        should be returned or a command; if unspecified, a list of
-     *        plugins with help information available is returned
+     * @param string $plugin Short name of the plugin for which commands
+     *        should be returned, else a list of plugins with help
+     *        information available is returned
+     *
+     * @return void
+     *
+     * @pluginCmd Show all active plugins with help available
+     * @pluginCmd [plugin] Shows commands line for a specific plugin
+     */
+    public function onCommandHelp($plugin = null)
+    {
+        $nick = $this->getEvent()->getNick();
+
+        if (!$plugin) {
+            // protect from sorting the registry each time help is called
+            if (!$this->registry_sorted) {
+                asort($this->registry);
+                $this->registry_sorted = true;
+            }
+
+            $msg = 'These plugins below have help information available.';
+            $this->doPrivMsg($nick, $msg);
+
+            foreach ($this->registry as $plugin => $data) {
+                $this->doPrivMsg($nick, "{$plugin} - {$data['desc']}");
+            }
+        } else {
+            if (isset($this->getPluginHandler()->{$plugin})
+                && isset($this->registry[strtolower($plugin)]['cmd'])
+            ) {
+                $msg
+                    = 'The ' .
+                    $plugin .
+                    ' plugin exposes the commands shown below.';
+                $this->doPrivMsg($nick, $msg);
+                if ($this->getConfig('command.prefix')) {
+                    $msg
+                        = 'Note that these commands must be prefixed with "' .
+                        $this->getConfig('command.prefix') .
+                        '" (without quotes) when issued in a public channel.';
+                    $this->doPrivMsg($nick, $msg);
+                }
+
+                foreach ($this->registry[strtolower($plugin)]['cmd']
+                    as $cmd => $descs
+                ) {
+                    foreach ($descs as $desc) {
+                        $this->doPrivMsg($nick, "{$cmd} {$desc}");
+                    }
+                }
+
+            } else {
+                $this->doPrivMsg($nick, 'That plugin is not loaded.');
+            }
+        }
+    }
+
+    /**
+     * Sets the description for the plugin instance
+     *
+     * @param Phergie_Plugin_Abstract $plugin      plugin instance
+     * @param string                  $description plugin description
      *
      * @return void
      */
-    public function onCommandHelp($query = null)
-    {
-        if ($query == 'refresh') {
-            $this->populateRegistry();
-        }
-
-        $nick = $this->getEvent()->getNick();
-        $delay = $this->getConfig('help.delay', 2);
-
-        // Handle requests for a plugin list
-        if (!$query) {
-            $msg = 'These plugins have help information available: '
-                 . implode(', ', array_keys($this->registry));
-            $this->doPrivmsg($nick, $msg);
-            return;
-        }
-
-        // Handle requests for plugin information
-        $query = strtolower($query);
-        if (isset($this->registry[$query])
-            && empty($this->registry[$query]['cmds'][$query])) {
-            $msg = $query . ' - ' . $this->registry[$query]['desc'];
-            $this->doPrivmsg($nick, $msg);
-
-            $msg = 'Available commands - '
-                 . implode(', ', array_keys($this->registry[$query]['cmds']));
-            $this->doPrivmsg($nick, $msg);
-
-            if ($this->getConfig('command.prefix')) {
-                $msg
-                    = 'Note that these commands must be prefixed with "'
-                    . $this->getConfig('command.prefix')
-                    . '" (without quotes) when issued in a public channel.';
-                $this->doPrivmsg($nick, $msg);
-            }
-
-            return;
-        }
-
-        // Handle requests for command information
-        foreach ($this->registry as $plugin => $data) {
-            if (empty($data['cmds'])) {
-                continue;
-            }
-
-            $result = preg_grep('/^' . $query . '$/i', array_keys($data['cmds']));
-            if (!$result) {
-                continue;
-            }
-
-            $cmd = $data['cmds'][array_shift($result)];
-            $msg = $query;
-            if (!empty($cmd['params'])) {
-                $msg .= ' [' . implode('] [', $cmd['params']) . ']';
-            }
-            $msg .= ' - ' . $cmd['desc'];
-            $this->doPrivmsg($nick, $msg);
-        }
+    public function setPluginDescription(
+        Phergie_Plugin_Abstract $plugin,
+        $description
+    ) {
+        $this->registry[strtolower($plugin->getName())]
+                ['desc'] = $description;
     }
 
     /**
-     * Parses and returns the short description from a docblock.
+     * Sets the description for the command on the plugin instance
      *
-     * @param string $docblock Docblock comment code
+     * @param Phergie_Plugin_Abstract $plugin      plugin instance
+     * @param string                  $command     from onCommand method
+     * @param string                  $description command description
      *
-     * @return string Short description (i.e. content from the start of the
-     *         docblock up to the first double-newline)
+     * @return void
      */
-    protected function parseShortDescription($docblock)
-    {
-        $desc = preg_replace(
-            array('#^\h*\*\h*#m', '#^/\*\*\h*\v+\h*#', '#(?:\r?\n){2,}.*#s', '#\s*\v+\s*#'),
-            array('', '', '', ' '),
-            $docblock
-        );
-        return $desc;
+    public function setCommandDescription(
+        Phergie_Plugin_Abstract $plugin,
+        $command,
+        array $description
+    ) {
+        $this->registry[strtolower($plugin->getName())]
+            ['cmd'][$command] = $description;
     }
 
     /**
-     * Taken from PHPUnit/Util/Test.php and modified to fix an issue with
-     * tag content spanning multiple lines.
+     * registers the plugin with the help plugin. this will parse the docblocks
+     * for specific annotations that this plugin will respond with when
+     * queried.
+     *
+     * @param Phergie_Plugin_Abstract $plugin plugin instance
+     *
+     * @return void
+     */
+    public function register(Phergie_Plugin_Abstract $plugin)
+    {
+        $class = new ReflectionClass($plugin);
+
+        $annotations = self::parseAnnotations($class->getDocComment());
+        if (isset($annotations['pluginDesc'])) {
+            $this->setPluginDescription(
+                $plugin,
+                join(' ', $annotations['pluginDesc'])
+            );
+        }
+
+        foreach ($class->getMethods() as $method) {
+            if (strpos($method->getName(), 'onCommand') !== false) {
+                $annotations = self::parseAnnotations($method->getDocComment());
+                if (isset($annotations['pluginCmd'])) {
+                    $cmd = strtolower(substr($method->getName(), 9));
+                    $this->setCommandDescription(
+                        $plugin,
+                        $cmd,
+                        $annotations['pluginCmd']
+                    );
+                }
+            }
+        }
+    }
+
+    /**
+     * Taken from PHPUnit/Util/Test.php:243 and modified to fix an issue
+     * with tag content spanning multiple lines.
      *
      * PHPUnit
      *
@@ -254,7 +232,7 @@ class Phergie_Plugin_Help extends Phergie_Plugin_Abstract
      *
      * @return array
      */
-    protected function getAnnotations($docblock)
+    protected static function parseAnnotations($docblock)
     {
         $annotations = array();
 
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Http.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Http.php
index 7c5c8704c2..43c69eb879 100644
--- a/plugins/Irc/extlib/phergie/Phergie/Plugin/Http.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Http.php
@@ -184,10 +184,7 @@ class Phergie_Plugin_Http extends Phergie_Plugin_Abstract
             $type = $this->response->getHeaders('content-type');
             foreach ($this->handlers as $expr => $handler) {
                 if (preg_match('#^' . $expr . '$#i', $type)) {
-                    $handled = call_user_func($handler, $body);
-                    if (!empty($handled)) {
-                        $body = $handled;
-                    }
+                    $body = call_user_func($handler, $body);
                 }
             }
 
@@ -259,7 +256,7 @@ class Phergie_Plugin_Http extends Phergie_Plugin_Abstract
     public function post($url, array $query = array(),
         array $post = array(), array $context = array()
     ) {
-        if (!empty($query)) {
+        if (!empty($params)) {
             $url .= '?' . http_build_query($query);
         }
 
@@ -281,4 +278,4 @@ class Phergie_Plugin_Http extends Phergie_Plugin_Abstract
 
         return $this->request($url, $context);
     }
-}
\ No newline at end of file
+}
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Ideone.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Ideone.php
deleted file mode 100644
index 3af88dda94..0000000000
--- a/plugins/Irc/extlib/phergie/Phergie/Plugin/Ideone.php
+++ /dev/null
@@ -1,180 +0,0 @@
-<?php
-/**
- * Phergie
- *
- * PHP version 5
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.
- * It is also available through the world-wide-web at this URL:
- * http://phergie.org/license
- *
- * @category  Phergie
- * @package   Phergie_Plugin_Ideone
- * @author    Phergie Development Team <team@phergie.org>
- * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
- * @license   http://phergie.org/license New BSD License
- * @link      http://pear.phergie.org/package/Phergie_Plugin_Ideone
- */
-
-/**
- * Interfaces with ideone.com to execute code and return the result.
- *
- * @category Phergie
- * @package  Phergie_Plugin_Ideone
- * @author   Phergie Development Team <team@phergie.org>
- * @license  http://phergie.org/license New BSD License
- * @link     http://pear.phergie.org/package/Phergie_Plugin_Ideone
- * @uses     Phergie_Plugin_Command pear.phergie.org
- */
-class Phergie_Plugin_Ideone extends Phergie_Plugin_Abstract
-{
-    /**
-     * Checks for dependencies.
-     *
-     * @return void
-     */
-    public function onLoad()
-    {
-        $this->plugins->getPlugin('Command');
-    }
-
-    /**
-     * Checks a service response for an error, sends a notice to the event
-     * source if an error has occurred, and returns whether an error was found.
-     *
-     * @param array $result Associative array representing the service response
-     *
-     * @return boolean TRUE if an error is found, FALSE otherwise
-     */
-    protected function isError($result)
-    {
-        if ($result['error'] != 'OK') {
-            $this->doNotice($this->event->getNick(), 'ideone error: ' . $result['error']);
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * Executes a source code sequence in a specified language and returns
-     * the result.
-     *
-     * @param string $language Programming language the source code is in
-     * @param string $code     Source code to execute
-     *
-     * @return void
-     */
-    public function onCommandIdeone($language, $code)
-    {
-        $source = $this->event->getSource();
-        $nick = $this->event->getNick();
-
-        // Get authentication credentials
-        $user = $this->getConfig('ideone.user', 'test');
-        $pass = $this->getConfig('ideone.pass', 'test');
-
-        // Normalize the command parameters
-        $language = strtolower($language);
-
-        // Massage PHP code to allow for convenient shorthand
-        if ($language == 'php') {
-            if (!preg_match('/^<\?(?:php)?/', $code)) {
-                $code = '<?php ' . $code;
-            }
-            switch (substr($code, -1)) {
-                case '}':
-                case ';':
-                    break;
-                default:
-                    $code .= ';';
-                    break;
-            }
-        }
-
-        // Identify the language to use
-        $client = new SoapClient('http://ideone.com/api/1/service.wsdl');
-        $response = $client->getLanguages($user, $pass);
-        if ($this->isError($response)) {
-            return;
-        }
-        $languageLength = strlen($language);
-        foreach ($response['languages'] as $languageId => $languageName) {
-            if (strncasecmp($language, $languageName, $languageLength) == 0) {
-                break;
-            }
-        }
-
-        // Send the paste data
-        $response = $client->createSubmission(
-            $user,
-            $pass,
-            $code,
-            $languageId,
-            null, // string input - data from stdin
-            true, // boolean run - TRUE to execute the code
-            false // boolean private - FALSE to make the paste public
-        );
-        if ($this->isError($response)) {
-            return;
-        }
-        $link = $response['link'];
-
-        // Wait until the paste data is processed or the service fails
-        $attempts = $this->getConfig('ideone.attempts', 10);
-        foreach (range(1, $attempts) as $attempt) {
-            $response = $client->getSubmissionStatus($user, $pass, $link);
-            if ($this->isError($response)) {
-                return;
-            }
-            if ($response['status'] == 0) {
-                $result = $response['result'];
-                break;
-            } else {
-                $result = null;
-                sleep(1);
-            }
-        }
-        if ($result == null) {
-            $this->doNotice($nick, 'ideone error: Timed out');
-            return;
-        }
-        if ($result != 15) {
-            $this->doNotice($nick, 'ideone error: Status code ' . $result);
-            return;
-        }
-
-        // Get details for the created paste
-        $response = $client->getSubmissionDetails(
-            $user,
-            $pass,
-            $link,
-            false, // boolean withSource - FALSE to not return the source code
-            false, // boolean withInput - FALSE to not return stdin data
-            true,  // boolean withOutput - TRUE to include output
-            true,  // boolean withStderr - TRUE to return stderr data
-            false  // boolean withCmpinfo - TRUE to return compilation info
-        );
-        if ($this->isError($response)) {
-            return;
-        }
-
-        // Replace the output if it exceeds a specified maximum length
-        $outputLimit = $this->getConfig('ideone.output_limit', 100);
-        var_dump($response);
-        if ($outputLimit && strlen($response['output']) > $outputLimit) {
-            $response['output'] = 'Output is too long to post';
-        }
-
-        // Format the message
-        $msg = $this->getConfig('ideone.format', '%nick%: [ %link% ] %output%');
-        $response['nick'] = $nick;
-        $response['link'] = 'http://ideone.com/' . $link;
-        foreach ($response as $key => $value) {
-            $msg = str_replace('%' . $key . '%', $value, $msg);
-        }
-        $this->doPrivmsg($source, $msg);
-    }
-}
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Iterator.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Iterator.php
deleted file mode 100644
index 5963300713..0000000000
--- a/plugins/Irc/extlib/phergie/Phergie/Plugin/Iterator.php
+++ /dev/null
@@ -1,126 +0,0 @@
-<?php
-/**
- * Phergie
- *
- * PHP version 5
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.
- * It is also available through the world-wide-web at this URL:
- * http://phergie.org/license
- *
- * @category  Phergie
- * @package   Phergie
- * @author    Phergie Development Team <team@phergie.org>
- * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
- * @license   http://phergie.org/license New BSD License
- * @link      http://pear.phergie.org/package/Phergie
- */
-
-/**
- * Implements a filtering iterator for limiting executing of methods across
- * a group of plugins.
- *
- * @category Phergie
- * @package  Phergie
- * @author   Phergie Development Team <team@phergie.org>
- * @license  http://phergie.org/license New BSD License
- * @link     http://pear.phergie.org/package/Phergie
- */
-class Phergie_Plugin_Iterator extends FilterIterator
-{
-    /**
-     * List of short names of plugins to exclude when iterating
-     *
-     * @var array
-     */
-    protected $plugins = array();
-
-    /**
-     * List of method names where plugins with these methods will be
-     * excluded when iterating
-     *
-     * @var array
-     */
-    protected $methods = array();
-
-    /**
-     * Adds to a list of plugins to exclude when iterating.
-     *
-     * @param mixed $plugins String containing the short name of a single
-     *        plugin to exclude or an array of short names of multiple
-     *        plugins to exclude
-     *
-     * @return Phergie_Plugin_Iterator Provides a fluent interface
-     */
-    public function addPluginFilter($plugins)
-    {
-        if (is_array($plugins)) {
-            $this->plugins = array_unique(
-                array_merge($this->plugins, $plugins)
-            );
-        } else {
-            $this->plugins[] = $plugins;
-        }
-        return $this;
-    }
-
-    /**
-     * Adds to a list of method names where plugins defining these methods
-     * will be excluded when iterating.
-     *
-     * @param mixed $methods String containing the name of a single method
-     *        or an array containing the name of multiple methods
-     *
-     * @return Phergie_Plugin_Iterator Provides a fluent interface
-     */
-    public function addMethodFilter($methods)
-    {
-        if (is_array($methods)) {
-            $this->methods = array_merge($this->methods, $methods);
-        } else {
-            $this->methods[]= $methods;
-        }
-        return $this;
-    }
-
-    /**
-     * Clears any existing plugin and methods filters.
-     *
-     * @return Phergie_Plugin_Iterator Provides a fluent interface
-     */
-    public function clearFilters()
-    {
-        $this->plugins = array();
-        $this->methods = array();
-    }
-
-    /**
-     * Implements FilterIterator::accept().
-     *
-     * @return boolean TRUE to include the current item in those by returned
-     *         during iteration, FALSE otherwise
-     */
-    public function accept()
-    {
-        if (!$this->plugins && !$this->methods) {
-            return true;
-        }
-
-        $current = $this->current();
-
-        if (in_array($current->getName(), $this->plugins)) {
-            return false;
-        }
-
-        foreach ($this->methods as $method) {
-            if (method_exists($current, $method)) {
-                return false;
-            }
-        }
-
-        return true;
-    }
-}
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Karma.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Karma.php
index f55f8d6edf..b7ce48685a 100644
--- a/plugins/Irc/extlib/phergie/Phergie/Plugin/Karma.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Karma.php
@@ -21,407 +21,427 @@
 
 /**
  * Handles requests for incrementation or decrementation of a maintained list
- * of counters for specified terms.
+ * of counters for specified terms and antithrottling to prevent extreme
+ * inflation or depression of counters by any single individual.
  *
  * @category Phergie
  * @package  Phergie_Plugin_Karma
  * @author   Phergie Development Team <team@phergie.org>
  * @license  http://phergie.org/license New BSD License
  * @link     http://pear.phergie.org/package/Phergie_Plugin_Karma
- * @uses     extension PDO
- * @uses     extension pdo_sqlite
- * @uses     Phergie_Plugin_Command pear.phergie.org
- * @uses     Phergie_Plugin_Message pear.phergie.org
  */
 class Phergie_Plugin_Karma extends Phergie_Plugin_Abstract
 {
     /**
-     * SQLite object
+     * Stores the SQLite object
      *
      * @var resource
      */
     protected $db = null;
 
     /**
-     * Prepared statement to add a new karma record
+     * Retains the last garbage collection date
+     *
+     * @var array
+     */
+    protected $lastGc = null;
+
+    /**
+     * Logs the karma usages and limits users to one karma change per word
+     * and per day
+     *
+     * @return void
+     */
+    protected $log = array();
+
+    /**
+     * Some fixed karma values, keys must be lowercase
+     *
+     * @var array
+     */
+    protected $fixedKarma;
+
+    /**
+     * A list of blacklisted values
+     *
+     * @var array
+     */
+    protected $karmaBlacklist;
+
+    /**
+     * Answers for correct assertions
+     */
+    protected $positiveAnswers;
+
+    /**
+     * Answers for incorrect assertions
+     */
+    protected $negativeAnswers;
+
+    /**
+     * Prepared PDO statements
      *
      * @var PDOStatement
      */
     protected $insertKarma;
-
-    /**
-     * Prepared statement to update an existing karma record
-     *
-     * @var PDOStatement
-     */
     protected $updateKarma;
-
-    /**
-     * Retrieves an existing karma record
-     *
-     * @var PDOStatement
-     */
     protected $fetchKarma;
+    protected $insertComment;
 
     /**
-     * Retrieves an existing fixed karma record
-     *
-     * @var PDOStatement
-     */
-    protected $fetchFixedKarma;
-
-    /**
-     * Retrieves a positive answer for a karma comparison
-     *
-     * @var PDOStatement
-     */
-    protected $fetchPositiveAnswer;
-
-    /**
-     * Retrieves a negative answer for a karma comparison
-     *
-     * @var PDOStatement
-     */
-    protected $fetchNegativeAnswer;
-
-    /**
-     * Check for dependencies and initializes a database connection and
-     * prepared statements.
+     * Connects to the database containing karma ratings and initializes
+     * class properties.
      *
      * @return void
      */
     public function onLoad()
     {
-        $plugins = $this->getPluginHandler();
-        $plugins->getPlugin('Command');
-        $plugins->getPlugin('Message');
+        $this->db = null;
+        $this->lastGc = null;
+        $this->log = array();
 
-        $file = dirname(__FILE__) . '/Karma/karma.db';
-        $this->db = new PDO('sqlite:' . $file);
+        if(!defined('M_EULER')) {
+            define('M_EULER', '0.57721566490153286061');
+        }
 
-        $this->fetchKarma = $this->db->prepare('
-            SELECT karma
-            FROM karmas
-            WHERE term = :term
-            LIMIT 1
-        ');
+        $this->fixedKarma = array(
+            'phergie'      => '%s has karma of awesome',
+            'pi'           => '%s has karma of ' . M_PI,
+            'Î '            => '%s has karma of ' . M_PI,
+            'Ï€'            => '%s has karma of ' . M_PI,
+            'chucknorris'  => '%s has karma of Warning: Integer out of range',
+            'chuck norris' => '%s has karma of Warning: Integer out of range',
+            'c'            => '%s has karma of 299 792 458 m/s',
+            'e'            => '%s has karma of ' . M_E,
+            'euler'        => '%s has karma of ' . M_EULER,
+            'mole'         => '%s has karma of 6.02214e23 molecules',
+            'avogadro'     => '%s has karma of 6.02214e23 molecules',
+            'spoon'        => '%s has no karma. There is no spoon',
+            'mc^2'         => '%s has karma of E',
+            'mc2'          => '%s has karma of E',
+            'mc²'          => '%s has karma of E',
+            'i'            => '%s haz big karma',
+            'karma' => 'The karma law says that all living creatures are responsible for their karma - their actions and the effects of their actions. You should watch yours.'
+        );
+
+        $this->karmaBlacklist = array(
+            '*',
+            'all',
+            'everything'
+        );
+
+        $this->positiveAnswers = array(
+            'No kidding, %owner% totally kicks %owned%\'s ass !',
+            'True that.',
+            'I concur.',
+            'Yay, %owner% ftw !',
+            '%owner% is made of WIN!',
+            'Nothing can beat %owner%!',
+        );
+
+        $this->negativeAnswers = array(
+            'No sir, not at all.',
+            'You\'re wrong dude, %owner% wins.',
+            'I\'d say %owner% is better than %owned%.',
+            'You must be joking, %owner% ftw!',
+            '%owned% is made of LOSE!',
+            '%owned% = Epic Fail',
+        );
+
+        // Load or initialize the database
+        $class = new ReflectionClass(get_class($this));
+        $dir = dirname($class->getFileName() . '/' . $this->name);
+        $this->db = new PDO('sqlite:' . $dir . 'karma.db');
+
+        // Check to see if the table exists
+        $table = $this->db->query('
+            SELECT COUNT(*)
+            FROM sqlite_master
+            WHERE name = ' . $this->db->quote('karmas')
+        )->fetchColumn();
+
+        // Create database tables if necessary
+        if (!$table) {
+            $this->db->query('
+                CREATE TABLE karmas ( word VARCHAR ( 255 ), karma MEDIUMINT );
+                CREATE UNIQUE INDEX word ON karmas ( word );
+                CREATE INDEX karmaIndex ON karmas ( karma );
+                CREATE TABLE comments ( wordid INT , comment VARCHAR ( 255 ) );
+                CREATE INDEX wordidIndex ON comments ( wordid );
+                CREATE UNIQUE INDEX commentUnique ON comments ( comment );
+            ');
+        }
 
         $this->insertKarma = $this->db->prepare('
-            INSERT INTO karmas (term, karma)
-            VALUES (:term, :karma)
+            INSERT INTO karmas (
+                word,
+                karma
+            )
+            VALUES (
+                :word,
+                :karma
+            )
+        ');
+
+        $this->insertComment = $this->db->prepare('
+            INSERT INTO comments (
+                wordid,
+                comment
+            )
+            VALUES (
+                :wordid,
+                :comment
+            )
+        ');
+
+        $this->fetchKarma = $this->db->prepare('
+            SELECT karma, ROWID id FROM karmas WHERE LOWER(word) = LOWER(:word) LIMIT 1
         ');
 
         $this->updateKarma = $this->db->prepare('
-            UPDATE karmas
-            SET karma = :karma
-            WHERE term = :term
-        ');
-
-        $this->fetchFixedKarma = $this->db->prepare('
-            SELECT karma
-            FROM fixed_karmas
-            WHERE term = :term
-            LIMIT 1
-        ');
-
-        $this->fetchPositiveAnswer = $this->db->prepare('
-            SELECT answer
-            FROM positive_answers
-            ORDER BY RANDOM()
-            LIMIT 1
-        ');
-
-        $this->fetchNegativeAnswer = $this->db->prepare('
-            SELECT answer
-            FROM negative_answers
-            ORDER BY RANDOM()
-            LIMIT 1
+            UPDATE karmas SET karma = :karma WHERE LOWER(word) = LOWER(:word)
         ');
     }
 
     /**
-     * Get the canonical form of a given term.
+     * Checks for dependencies.
      *
-     * In the canonical form all sequences of whitespace
-     * are replaced by a single space and all characters
-     * are lowercased.
-     *
-     * @param string $term Term for which a canonical form is required
-     *
-     * @return string Canonical term
+     * @return void
      */
-    protected function getCanonicalTerm($term)
+    public static function onLoad()
     {
-        $canonicalTerm = strtolower(preg_replace('|\s+|', ' ', trim($term, '()')));
-        switch ($canonicalTerm) {
-            case 'me':
-                $canonicalTerm = strtolower($this->event->getNick());
-                break;
-            case 'all':
-            case '*':
-            case 'everything':
-                $canonicalTerm = 'everything';
-                break;
-        }
-        return $canonicalTerm;
+    	if (!extension_loaded('PDO') || !extension_loaded('pdo_sqlite')) {
+            $this->fail('PDO and pdo_sqlite extensions must be installed');
+    	}
     }
 
     /**
-     * Intercepts a message and processes any contained recognized commands.
+     * Handles requests for incrementation, decrementation, or lookup of karma
+     * ratings sent via messages from users.
      *
      * @return void
      */
     public function onPrivmsg()
     {
-        $message = $this->getEvent()->getText();
+        $source = $this->event->getSource();
+        $message = $this->event->getArgument(1);
+        $target = $this->event->getNick();
 
-        $termPattern = '\S+?|\([^<>]+?\)+';
-        $actionPattern = '(?P<action>\+\+|--)';
+        // Command prefix check
+        $prefix = preg_quote(trim($this->getConfig('command.prefix')));
+        $bot = preg_quote($this->getConfig('connections.nick'));
+        $exp = '(?:(?:' . $bot . '\s*[:,>]?\s+(?:' . $prefix . ')?)|(?:' . $prefix . '))';
 
-        $modifyPattern = <<<REGEX
-		{^
-		(?J) # allow overwriting capture names
-		\s*  # ignore leading whitespace
+        // Karma status request
+        if (preg_match('#^' . $exp . 'karma\s+(.+)$#i', $message, $m)) {
+            // Return user's value if "me" is requested
+            if (strtolower($m[1]) === 'me') {
+                $m[1] = $target;
+            }
+            // Clean the term
+            $term = $this->doCleanWord($m[1]);
 
-		(?:  # start with ++ or -- before the term
-            $actionPattern
-            (?P<term>$termPattern)
-		|   # follow the term with ++ or --
-            (?P<term>$termPattern)
-			$actionPattern # allow no whitespace between the term and the action
-		)
-		$}ix
-REGEX;
+            // Check the blacklist
+            if (is_array($this->karmaBlacklist) && in_array($term, $this->karmaBlacklist)) {
+                $this->doNotice($target, $term . ' is blacklisted');
+                return;
+            }
 
-        $versusPattern = <<<REGEX
-        {^
-        	(?P<term0>$termPattern)
-        		\s+(?P<method><|>)\s+
-        	(?P<term1>$termPattern)$#
-        $}ix
-REGEX;
+            // Return fixed value if set
+            if (isset($this->fixedKarma[$term])) {
+                $this->doPrivmsg($source, $target . ': ' . sprintf($this->fixedKarma[$term], $m[1]) . '.');
+                return;
+            }
 
-        $match = null;
+            // Return current karma or neutral if not set yet
+            $this->fetchKarma->execute(array(':word'=>$term));
+            $res = $this->fetchKarma->fetch(PDO::FETCH_ASSOC);
 
-        if (preg_match($modifyPattern, $message, $match)) {
-            $action = $match['action'];
-            $term = $this->getCanonicalTerm($match['term']);
-            $this->modifyKarma($term, $action);
-        } elseif (preg_match($versusPattern, $message, $match)) {
-            $term0 = trim($match['term0']);
-            $term1 = trim($match['term1']);
-            $method = $match['method'];
-            $this->compareKarma($term0, $term1, $method);
+            // Sanity check if someone if someone prefixed their conversation with karma
+            if (!$res && substr_count($term, ' ') > 1 && !(substr($m[1], 0, 1) === '(' && substr($m[1], -1) === ')')) {
+                return;
+            }
+
+            // Clean the raw term if it was contained within brackets
+            if (substr($m[1], 0, 1) === '(' && substr($m[1], -1) === ')') {
+                $m[1] = substr($m[1], 1, -1);
+            }
+
+            if ($res && $res['karma'] != 0) {
+                $this->doPrivmsg($source, $target . ': ' . $m[1] . ' has karma of ' . $res['karma'] . '.');
+            } else {
+                $this->doPrivmsg($source, $target . ': ' . $m[1] . ' has neutral karma.');
+            }
+        // Incrementation/decrementation request
+        } elseif (preg_match('{^' . $exp . '?(?:(\+{2,2}|-{2,2})(\S+?|\(.+?\)+)|(\S+?|\(.+?\)+)(\+{2,2}|-{2,2}))(?:\s+(.*))?$}ix', $message, $m)) {
+            if (!empty($m[4])) {
+                $m[1] = $m[4]; // Increment/Decrement
+                $m[2] = $m[3]; // Word
+            }
+            $m[3] = (isset($m[5]) ? $m[5] : null); // Comment
+            unset($m[4], $m[5]);
+            list(, $sign, $word, $comment) = array_pad($m, 4, null);
+
+            // Clean the word
+            $word = strtolower($this->doCleanWord($word));
+            if (empty($word)) {
+                return;
+            }
+
+            // Do nothing if the karma is fixed or blacklisted
+            if (isset($this->fixedKarma[$word]) ||
+                is_array($this->karmaBlacklist) && in_array($word, $this->karmaBlacklist)) {
+                return;
+            }
+
+            // Force a decrementation if someone tries to update his own karma
+            if ($word == strtolower($target) && $sign != '--' && !$this->fromAdmin(true)) {
+                $this->doNotice($target, 'Bad ' . $target . '! You can not modify your own Karma. Shame on you!');
+                $sign = '--';
+            }
+
+            // Antithrottling check
+            $host = $this->event->getHost();
+            $limit = $this->getConfig('karma.limit');
+            // This is waiting on the Acl plugin from Elazar, being bypassed for now
+            //if ($limit > 0 && !$this->fromAdmin()) {
+            if ($limit > 0) {
+                if (isset($this->log[$host][$word]) && $this->log[$host][$word] >= $limit) {
+                    // Three strikes, you're out, so lets decrement their karma for spammage
+                    if ($this->log[$host][$word] == ($limit+3)) {
+                        $this->doNotice($target, 'Bad ' . $target . '! Didn\'t I tell you that you reached your limit already?');
+                        $this->log[$host][$word] = $limit;
+                        $word = $target;
+                        $sign = '--';
+                    // Toss a notice to the user if they reached their limit
+                    } else {
+                        $this->doNotice($target, 'You have currently reached your limit in modifying ' . $word . ' for this day, please wait a bit.');
+                        $this->log[$host][$word]++;
+                        return;
+                    }
+                } else {
+                    if (isset($this->log[$host][$word])) {
+                        $this->log[$host][$word]++;
+                    } else {
+                        $this->log[$host][$word] = 1;
+                    }
+                }
+            }
+
+            // Get the current value then update or create entry
+            $this->fetchKarma->execute(array(':word'=>$word));
+            $res = $this->fetchKarma->fetch(PDO::FETCH_ASSOC);
+            if ($res) {
+                $karma = ($res['karma'] + ($sign == '++' ? 1 : -1));
+                $args = array(
+                    ':word' => $word,
+                    ':karma' => $karma
+                );
+                $this->updateKarma->execute($args);
+            } else {
+                $karma = ($sign == '++' ? '1' : '-1');
+                $args = array(
+                    ':word' => $word,
+                    ':karma' => $karma
+                );
+                $this->insertKarma->execute($args);
+                $this->fetchKarma->execute(array(':word'=>$word));
+                $res = $this->fetchKarma->fetch(PDO::FETCH_ASSOC);
+            }
+            $id = $res['id'];
+            // Add comment
+            $comment = preg_replace('{(?:^//(.*)|^#(.*)|^/\*(.*?)\*/$)}', '$1$2$3', $comment);
+            if (!empty($comment)) {
+                $this->insertComment->execute(array(':wordid' => $id, ':comment' => $comment));
+            }
+            // Perform garbage collection on the antithrottling log if needed
+            if (date('d') !== $this->lastGc) {
+                $this->doGc();
+            }
+        // Assertion request
+        } elseif (preg_match('#^' . $exp . '?([^><]+)(<|>)([^><]+)$#', $message, $m)) {
+            // Trim words
+            $word1 = strtolower($this->doCleanWord($m[1]));
+            $word2 = strtolower($this->doCleanWord($m[3]));
+            $operator = $m[2];
+
+            // Do nothing if the karma is fixed
+            if (isset($this->fixedKarma[$word1]) || isset($this->fixedKarma[$word2]) ||
+                empty($word1) || empty($word2)) {
+                return;
+            }
+
+            // Fetch first word
+            if ($word1 === '*' || $word1 === 'all' || $word1 === 'everything') {
+                $res = array('karma' => 0);
+                $word1 = 'everything';
+            } else {
+                $this->fetchKarma->execute(array(':word'=>$word1));
+                $res = $this->fetchKarma->fetch(PDO::FETCH_ASSOC);
+            }
+            // If it exists, fetch second word
+            if ($res) {
+                if ($word2 === '*' || $word2 === 'all' || $word2 === 'everything') {
+                    $res2 = array('karma' => 0);
+                    $word2 = 'everything';
+                } else {
+                    $this->fetchKarma->execute(array(':word'=>$word2));
+                    $res2 = $this->fetchKarma->fetch(PDO::FETCH_ASSOC);
+                }
+                // If it exists, compare and return value
+                if ($res2 && $res['karma'] != $res2['karma']) {
+                    $assertion = ($operator === '<' && $res['karma'] < $res2['karma']) || ($operator === '>' && $res['karma'] > $res2['karma']);
+                    // Switch arguments if they are in the wrong order
+                    if ($operator === '<') {
+                        $tmp = $word2;
+                        $word2 = $word1;
+                        $word1 = $tmp;
+                    }
+                    $this->doPrivmsg($source, $assertion ? $this->fetchPositiveAnswer($word1, $word2) : $this->fetchNegativeAnswer($word1, $word2));
+                    // If someone asserts that something is greater or lesser than everything, we increment/decrement that something at the same time
+                    if ($word2 === 'everything') {
+                        $this->event = clone$this->event;
+                        $this->event->setArguments(array($this->event->getArgument(0), '++'.$word1));
+                        $this->onPrivmsg();
+                    } elseif ($word1 === 'everything') {
+                        $this->event = clone$this->event;
+                        $this->event->setArguments(array($this->event->getArgument(0), '--'.$word2));
+                        $this->onPrivmsg();
+                    }
+                }
+            }
         }
     }
 
+    protected function fetchPositiveAnswer($owner, $owned)
+    {
+        return str_replace(array('%owner%','%owned%'), array($owner, $owned), $this->positiveAnswers[array_rand($this->positiveAnswers,1)]);
+    }
+
+    protected function fetchNegativeAnswer($owned, $owner)
+    {
+        return str_replace(array('%owner%','%owned%'), array($owner, $owned), $this->negativeAnswers[array_rand($this->negativeAnswers,1)]);
+    }
+
+    protected function doCleanWord($word)
+    {
+        $word = trim($word);
+        if (substr($word, 0, 1) === '(' && substr($word, -1) === ')') {
+            $word = trim(substr($word, 1, -1));
+        }
+        $word = preg_replace('#\s+#', ' ', strtolower(trim($word)));
+        return $word;
+    }
+
     /**
-     * Get the karma rating for a given term.
-     *
-     * @param string $term Term for which the karma rating needs to be
-     *        retrieved
+     * Performs garbage collection on the antithrottling log.
      *
      * @return void
      */
-    public function onCommandKarma($term)
+    public function doGc()
     {
-        $source = $this->getEvent()->getSource();
-        $nick = $this->getEvent()->getNick();
-
-        if (empty($term)) {
-            return;
-        }
-
-        $canonicalTerm = $this->getCanonicalTerm($term);
-
-        $fixedKarma = $this->fetchFixedKarma($canonicalTerm);
-        if ($fixedKarma) {
-            $message = $nick . ': ' . $term . $fixedKarma . '.';
-            $this->doPrivmsg($source, $message);
-            return;
-        }
-
-        $karma = $this->fetchKarma($canonicalTerm);
-
-        $message = $nick . ': ';
-
-        if ($term == 'me') {
-            $message .= 'You have';
-        } else {
-            $message .= $term . ' has';
-        }
-
-        $message .= ' ';
-
-        if ($karma) {
-            $message .= 'karma of ' . $karma;
-        } else {
-            $message .= 'neutral karma';
-        }
-
-        $message .= '.';
-
-        $this->doPrivmsg($source, $message);
-    }
-
-    /**
-     * Resets the karma for a term to 0.
-     *
-     * @param string $term Term for which to reset the karma rating
-     *
-     * @return void
-     */
-    public function onCommandReincarnate($term)
-    {
-        $data = array(
-            ':term' => $term,
-            ':karma' => 0
-        );
-        $this->updateKarma->execute($data);
-    }
-
-    /**
-     * Compares the karma between two terms. Optionally increases/decreases
-     * the karma of either term.
-     *
-     * @param string $term0  First term
-     * @param string $term1  Second term
-     * @param string $method Comparison method (< or >)
-     *
-     * @return void
-     */
-    protected function compareKarma($term0, $term1, $method)
-    {
-        $event = $this->getEvent();
-        $nick = $event->getNick();
-        $source = $event->getSource();
-
-        $canonicalTerm0 = $this->getCanonicalTerm($term0);
-        $canonicalTerm1 = $this->getCanonicalTerm($term1);
-
-        $fixedKarma0 = $this->fetchFixedKarma($canonicalTerm0);
-        $fixedKarma1 = $this->fetchFixedKarma($canonicalTerm1);
-
-        if ($fixedKarma0
-            || $fixedKarma1
-            || empty($canonicalTerm0)
-            || empty($canonicalTerm1)
-        ) {
-            return;
-        }
-
-        if ($canonicalTerm0 == 'everything') {
-            $change = $method == '<' ? '++' : '--';
-            $this->modifyKarma($canonicalTerm1, $change);
-            $karma0 = 0;
-            $karma1 = $this->fetchKarma($canonicalTerm1);
-        } elseif ($canonicalTerm1 == 'everything') {
-            $change = $method == '<' ? '--' : '++';
-            $this->modifyKarma($canonicalTerm0, $change);
-            $karma0 = $this->fetchKarma($canonicalTerm1);
-            $karma1 = 0;
-        } else {
-            $karma0 = $this->fetchKarma($canonicalTerm0);
-            $karma1 = $this->fetchKarma($canonicalTerm1);
-        }
-
-        if (($method == '<'
-            && $karma0 < $karma1)
-            || ($method == '>'
-            && $karma0 > $karma1)) {
-            $replies = $this->fetchPositiveAnswer;
-        } else {
-            $replies = $this->fetchNegativeAnswer;
-        }
-        $replies->execute();
-        $reply = $replies->fetchColumn();
-
-        if (max($karma0, $karma1) == $karma1) {
-            list($canonicalTerm0, $canonicalTerm1) =
-                array($canonicalTerm1, $canonicalTerm0);
-        }
-
-        $message = str_replace(
-            array('%owner%','%owned%'),
-            array($canonicalTerm0, $canonicalTerm1),
-            $reply
-        );
-
-        $this->doPrivmsg($source, $message);
-    }
-
-    /**
-     * Modifes a term's karma.
-     *
-     * @param string $term   Term to modify
-     * @param string $action Karma action (either ++ or --)
-     *
-     * @return void
-     */
-    protected function modifyKarma($term, $action)
-    {
-        if (empty($term)) {
-            return;
-        }
-
-        $karma = $this->fetchKarma($term);
-        if ($karma !== false) {
-            $statement = $this->updateKarma;
-        } else {
-            $statement = $this->insertKarma;
-        }
-
-        $karma += ($action == '++') ? 1 : -1;
-
-        $args = array(
-            ':term'  => $term,
-            ':karma' => $karma
-        );
-        $statement->execute($args);
-    }
-
-    /**
-     * Returns the karma rating for a specified term for which the karma
-     * rating can be modified.
-     *
-     * @param string $term Term for which to fetch the corresponding karma
-     *        rating
-     *
-     * @return integer|boolean Integer value denoting the term's karma or
-     *         FALSE if there is the specified term has no associated karma
-     *         rating
-     */
-    protected function fetchKarma($term)
-    {
-        $this->fetchKarma->execute(array(':term' => $term));
-        $result = $this->fetchKarma->fetch(PDO::FETCH_ASSOC);
-
-        if ($result === false) {
-            return false;
-        }
-
-        return (int) $result['karma'];
-    }
-
-    /**
-     * Returns a phrase describing the karma rating for a specified term for
-     * which the karma rating is fixed.
-     *
-     * @param string $term Term for which to fetch the corresponding karma
-     *        rating
-     *
-     * @return string Phrase describing the karma rating, which may be append
-     *         to the term to form a complete response
-     */
-    protected function fetchFixedKarma($term)
-    {
-        $this->fetchFixedKarma->execute(array(':term' => $term));
-        $result = $this->fetchFixedKarma->fetch(PDO::FETCH_ASSOC);
-
-        if ($result === false) {
-            return false;
-        }
-
-        return $result['karma'];
+        unset($this->log);
+        $this->log = array();
+        $this->lastGc = date('d');
     }
 }
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Message.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Message.php
deleted file mode 100644
index af8fc7287b..0000000000
--- a/plugins/Irc/extlib/phergie/Phergie/Plugin/Message.php
+++ /dev/null
@@ -1,112 +0,0 @@
-<?php
-/**
- * Phergie
- *
- * PHP version 5
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.
- * It is also available through the world-wide-web at this URL:
- * http://phergie.org/license
- *
- * @category  Phergie
- * @package   Phergie_Plugin_Message
- * @author    Phergie Development Team <team@phergie.org>
- * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
- * @license   http://phergie.org/license New BSD License
- * @link      http://pear.phergie.org/package/Phergie_Plugin_Message
- */
-
-/**
- * Generalized plugin providing utility methods for
- * prefix and bot named based message extraction.
- *
- * @category Phergie
- * @package  Phergie_Plugin_Message
- * @author   Phergie Development Team <team@phergie.org>
- * @license  http://phergie.org/license New BSD License
- * @link     http://pear.phergie.org/package/Phergie_Plugin_Message
- */
-class Phergie_Plugin_Message extends Phergie_Plugin_Abstract
-{
-
-    /**
-     * Check whether a message is specifically targeted at the bot.
-     * This is the case when the message starts with the bot's name
-     * followed by [,:>] or when it is a private message.
-     *
-     * @return boolean true when the message is specifically targeted at the bot,
-     *                 false otherwise.
-     */
-    public function isTargetedMessage()
-    {
-        $event = $this->getEvent();
-
-        $self = preg_quote($this->connection->getNick());
-
-        $targetPattern = <<<REGEX
-        {^
-        \s*{$self}\s*[:>,].* # expect the bots name, followed by a [:>,]
-        $}ix
-REGEX;
-
-        return !$event->isInChannel() 
-            || preg_match($targetPattern, $event->getText()) > 0;
-    }
-
-    /**
-     * Allow for prefix and bot name aware extraction of a message
-     *
-     * @return string|bool $message The message, which is possibly targeted at the 
-     *                              bot or false if a prefix requirement failed
-     */
-    public function getMessage()
-    {
-        $event = $this->getEvent();
-
-        $prefix = preg_quote($this->getConfig('command.prefix'));
-        $self = preg_quote($this->connection->getNick());
-        $message = $event->getText();
-
-        // $prefixPattern matches : Phergie, do command <parameters>
-        // where $prefix = 'do'   : do command <parameters>
-        //                        : Phergie, command <parameters>
-        $prefixPattern = <<<REGEX
-        {^
-        (?:
-        	\s*{$self}\s*[:>,]\s* # start with bot name
-			(?:{$prefix})?        # which is optionally followed by the prefix
-        |
-        	\s*{$prefix}          # or start with the prefix
-        )
-        \s*(.*)                   # always end with the message
-        $}ix
-REGEX;
-
-        // $noPrefixPattern matches : Phergie, command <parameters>
-        //                          : command <parameters>
-        $noPrefixPattern = <<<REGEX
-        {^
-        \s*(?:{$self}\s*[:>,]\s*)? # optionally start with the bot name
-        (.*?)                      # always end with the message
-        $}ix
-REGEX;
-
-        $pattern = $noPrefixPattern;
-
-        // If a prefix is set, force it as a requirement
-        if ($prefix && $event->isInChannel()) {
-            $pattern = $prefixPattern;
-        }
-
-        $match = null;
-
-        if (!preg_match($pattern, $message, $match)) {
-            return false;
-        }
-
-        return $match[1];
-    }
-}
\ No newline at end of file
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Ping.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Ping.php
index 021670d97d..29ac69f464 100755
--- a/plugins/Irc/extlib/phergie/Phergie/Plugin/Ping.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Ping.php
@@ -87,7 +87,7 @@ class Phergie_Plugin_Ping extends Phergie_Plugin_Abstract
     {
         $time = time();
         if (!empty($this->lastPing)) {
-            if ($time - $this->lastPing > $this->getConfig('ping.ping', 20)) {
+            if ($time - $this->lastPing > $this->getConfig('ping.ping', 10)) {
                 $this->doQuit();
             }
         } elseif (
@@ -112,7 +112,7 @@ class Phergie_Plugin_Ping extends Phergie_Plugin_Abstract
     /**
      * Set the last ping time
      * lastPing needs to be exposed for unit testing
-     *
+     * 
      * @param int|null $ping timestamp of last ping
      *
      * @return self
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Quit.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Quit.php
index eca22a98e3..cacd77d3f3 100755
--- a/plugins/Irc/extlib/phergie/Phergie/Plugin/Quit.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Quit.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Phergie
+ * Phergie 
  *
  * PHP version 5
  *
@@ -11,7 +11,7 @@
  * It is also available through the world-wide-web at this URL:
  * http://phergie.org/license
  *
- * @category  Phergie
+ * @category  Phergie 
  * @package   Phergie_Plugin_Quit
  * @author    Phergie Development Team <team@phergie.org>
  * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
@@ -22,12 +22,14 @@
 /**
  * Terminates the current connection upon command.
  *
- * @category Phergie
+ * @category Phergie 
  * @package  Phergie_Plugin_Quit
  * @author   Phergie Development Team <team@phergie.org>
  * @license  http://phergie.org/license New BSD License
  * @link     http://pear.phergie.org/package/Phergie_Plugin_Quit
  * @uses     Phergie_Plugin_Command pear.phergie.org
+ *
+ * @pluginDesc Terminates the current connection upon command.
  */
 class Phergie_Plugin_Quit extends Phergie_Plugin_Abstract
 {
@@ -39,13 +41,17 @@ class Phergie_Plugin_Quit extends Phergie_Plugin_Abstract
     public function onLoad()
     {
         $this->getPluginHandler()->getPlugin('Command');
+        $help = $this->getPluginHandler()->getPlugin('Help');
+        $help->register($this);
     }
 
     /**
-     * Issues a quit command when a message is received requesting that the
+     * Issues a quit command when a message is received requesting that the 
      * bot terminate the current connection.
      *
      * @return void
+     *
+     * @pluginCmd terminates the connection
      */
     public function onCommandQuit()
     {
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Reload.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Reload.php
index 90e3adcd52..a2d680d7aa 100755
--- a/plugins/Irc/extlib/phergie/Phergie/Plugin/Reload.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Reload.php
@@ -57,7 +57,6 @@ class Phergie_Plugin_Reload extends Phergie_Plugin_Abstract
         if (!$this->plugins->hasPlugin($plugin)) {
             echo 'DEBUG(Reload): ' . ucfirst($plugin) . ' is not loaded yet, loading', PHP_EOL;
             $this->plugins->getPlugin($plugin);
-            $this->plugins->command->populateMethodCache();
             return;
         }
 
@@ -80,7 +79,7 @@ class Phergie_Plugin_Reload extends Phergie_Plugin_Abstract
         }
 
         $contents = preg_replace(
-            array('/^<\?(?:php)?/', '/class\s+' . $class . '/i'),
+            array('/<\?(?:php)?/', '/class\s+' . $class . '/i'),
             array('', 'class ' . $newClass),
             $contents
         );
@@ -88,16 +87,10 @@ class Phergie_Plugin_Reload extends Phergie_Plugin_Abstract
 
         $instance = new $newClass;
         $instance->setName($plugin);
-        $instance->setEvent($this->event);
         $this->plugins
             ->removePlugin($plugin)
             ->addPlugin($instance);
 
-        $this->plugins->command->populateMethodCache();
-        if ($this->plugins->hasPlugin('Help')) {
-            $this->plugins->help->populateRegistry();
-        }
-
         echo 'DEBUG(Reload): Reloaded ', $class, ' to ', $newClass, PHP_EOL;
     }
 }
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Serve.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Serve.php
index cdb8f7f919..19ecb0c7e4 100755
--- a/plugins/Irc/extlib/phergie/Phergie/Plugin/Serve.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Serve.php
@@ -113,23 +113,22 @@ class Phergie_Plugin_Serve extends Phergie_Plugin_Abstract
         $item = $this->getItem($database, $table, $match);
 
         // Reprocess the request for censorship if required
-        if ($this->plugins->hasPlugin('Censor')) {
+        $attempts = 0;
+        while ($censor && $attempts < 3) {
             $plugin = $this->plugins->getPlugin('Censor');
-            $attempts = 0;
-            while ($censor && $attempts < 3) {
-                $clean = $plugin->cleanString($item->name);
-                if ($item->name != $clean) {
-                    $attempts++;
-                    $item = $this->getItem($database, $table, $match);
-                } else {
-                    $censor = false;
-                }
-            }
-            if ($censor && $attempts == 3) {
-                $this->doAction($this->event->getSource(), 'shrugs.');
+            $clean = $plugin->cleanString($item->name);
+            if ($item->name != $clean) {
+                $attempts++;
+                $item = $this->getItem($database, $table, $match);
+            } else {
+                $censor = false;
             }
         }
 
+        if ($censor && $attempts == 3) {
+            $this->doAction($this->event->getSource(), 'shrugs.');
+        }
+
         // Derive the proper article for the item
         if (preg_match('/^[aeiou]/i', $item->name)) {
             $article = 'an';
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Tea.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Tea.php
deleted file mode 100644
index c6453566c7..0000000000
--- a/plugins/Irc/extlib/phergie/Phergie/Plugin/Tea.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-/**
- * Phergie
- *
- * PHP version 5
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.
- * It is also available through the world-wide-web at this URL:
- * http://phergie.org/license
- *
- * @category  Phergie
- * @package   Phergie_Plugin_Tea
- * @author    Phergie Development Team <team@phergie.org>
- * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
- * @license   http://phergie.org/license New BSD License
- * @link      http://pear.phergie.org/package/Phergie_Plugin_Tea
- */
-
-/**
- * Processes requests to serve users tea.
- *
- * @category Phergie
- * @package  Phergie_Plugin_Tea
- * @author   Phergie Development Team <team@phergie.org>
- * @license  http://phergie.org/license New BSD License
- * @link     http://pear.phergie.org/package/Phergie_Plugin_Tea
- * @uses     Phergie_Plugin_Command pear.phergie.org
- * @uses     Phergie_Plugin_Serve pear.phergie.org
- */
-class Phergie_Plugin_Tea extends Phergie_Plugin_Abstract
-{
-    /**
-     * Checks for dependencies.
-     *
-     * @return void
-     */
-    public function onLoad()
-    {
-        $plugins = $this->plugins;
-        $plugins->getPlugin('Command');
-        $plugins->getPlugin('Serve');
-    }
-
-    /**
-     * Processes requests to serve a user tea.
-     *
-     * @param string $request Request including the target and an optional
-     *        suggestion of what tea to serve
-     *
-     * @return void
-     */
-    public function onCommandTea($request)
-    {
-        $format = $this->getConfig(
-            'tea.format',
-            'serves %target% a cup of %item% tea.'
-        );
-
-        $this->plugins->getPlugin('Serve')->serve(
-            dirname(__FILE__) . '/Tea/tea.db',
-            'tea',
-            $format,
-            $request
-        );
-    }
-}
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Tea/db.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Tea/db.php
deleted file mode 100644
index 21fe1950d1..0000000000
--- a/plugins/Irc/extlib/phergie/Phergie/Plugin/Tea/db.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-if (!defined('__DIR__')) {
-    define('__DIR__', dirname(__FILE__));
-}
-
-// Create database schema
-echo 'Creating database', PHP_EOL;
-$file = __DIR__ . '/tea.db';
-if (file_exists($file)) {
-    unlink($file);
-}
-$db = new PDO('sqlite:' . $file);
-$db->exec('CREATE TABLE tea (name VARCHAR(255), link VARCHAR(255))');
-$db->exec('CREATE UNIQUE INDEX tea_name ON tea (name)');
-$insert = $db->prepare('INSERT INTO tea (name, link) VALUES (:name, :link)');
-
-// Get raw teacuppa.com data set
-echo 'Downloading teacuppa.com data set', PHP_EOL;
-$file = __DIR__ . '/tea-list.html';
-if (!file_exists($file)) {
-    copy('http://www.teacuppa.com/tea-list.asp', $file);
-}
-$contents = file_get_contents($file);
-
-// Extract data from data set
-echo 'Processing teacuppa.com data', PHP_EOL;
-$contents = tidy_repair_string($contents);
-libxml_use_internal_errors(true);
-$doc = new DOMDocument;
-$doc->loadHTML($contents);
-libxml_clear_errors();
-$xpath = new DOMXPath($doc);
-$teas = $xpath->query('//p[@class="page_title"]/following-sibling::table//a');
-$db->beginTransaction();
-foreach ($teas as $tea) {
-    $name = preg_replace(
-        array('/\s*\v+\s*/', '/\s+tea\s*$/i'),
-        array(' ', ''),
-        $tea->textContent
-    );
-    $link = 'http://teacuppa.com/' . $tea->getAttribute('href');
-    $insert->execute(array($name, $link));
-}
-$db->commit();
-
-// Clean up
-echo 'Cleaning up', PHP_EOL;
-unlink($file);
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/TheFuckingWeather.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/TheFuckingWeather.php
index 8559426b61..e8a02860b2 100644
--- a/plugins/Irc/extlib/phergie/Phergie/Plugin/TheFuckingWeather.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/TheFuckingWeather.php
@@ -31,6 +31,9 @@
  * @link     http://thefuckingweather.com
  * @uses     Phergie_Plugin_Command pear.phergie.org
  * @uses     Phergie_Plugin_Http pear.phergie.org
+ *
+ * @pluginDesc Detects and responds to requests for current weather 
+ *             conditions in a particular location.
  */
 
 class Phergie_Plugin_TheFuckingWeather extends Phergie_Plugin_Abstract
@@ -68,6 +71,8 @@ class Phergie_Plugin_TheFuckingWeather extends Phergie_Plugin_Abstract
      *
      * @return void
      * @todo Implement use of URL shortening here
+     * @pluginCmd [location] Detects and responds to requests for current 
+     *            weather conditions in a particular location.
      */
     public function onCommandThefuckingweather($location)
     {
@@ -87,6 +92,7 @@ class Phergie_Plugin_TheFuckingWeather extends Phergie_Plugin_Abstract
     * @param string $location Location term
     *
     * @return void
+    * @pluginCmd [location] Alias for thefuckingweather command.
     */
     public function onCommandTfw($location)
     {
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Tld.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Tld.php
index d7d64a4717..21993f73c5 100644
--- a/plugins/Irc/extlib/phergie/Phergie/Plugin/Tld.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Tld.php
@@ -31,32 +31,31 @@
  * @link     http://pear.phergie.org/package/Phergie_Plugin_Tld
  * @uses     extension PDO
  * @uses     extension pdo_sqlite
+ *
+ * @pluginDesc Provides information for a top level domain.
  */
 class Phergie_Plugin_Tld extends Phergie_Plugin_Abstract
 {
     /**
-     * Connection to the database
-     *
+     * connection to the database
      * @var PDO
      */
     protected $db;
 
     /**
-     * Prepared statement for selecting a single TLD
-     *
+     * Prepared statement for selecting a single tld
      * @var PDOStatement
      */
     protected $select;
 
     /**
-     * Prepared statement for selecting all TLDs
-     *
+     * Prepared statement for selecting all tlds
      * @var PDOStatement
      */
     protected $selectAll;
 
     /**
-     * Checks for dependencies and sets up the database and hard-coded values.
+     * Checks for dependencies, sets up database and hard coded values
      *
      * @return void
      */
@@ -66,6 +65,9 @@ class Phergie_Plugin_Tld extends Phergie_Plugin_Abstract
             $this->fail('PDO and pdo_sqlite extensions must be installed');
         }
 
+        $help = $this->getPluginHandler()->getPlugin('Help');
+        $help->register($this);
+
         $dbFile = dirname(__FILE__) . '/Tld/tld.db';
         try {
             $this->db = new PDO('sqlite:' . $dbFile);
@@ -91,6 +93,8 @@ class Phergie_Plugin_Tld extends Phergie_Plugin_Abstract
      * @param string $tld tld to process
      *
      * @return null
+     *
+     * @pluginCmd .[tld] request details about the tld
      */
     public function onCommandTld($tld)
     {
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Youtube.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Youtube.php
index e06ea5640b..b19e9d5aef 100644
--- a/plugins/Irc/extlib/phergie/Phergie/Plugin/Youtube.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Youtube.php
@@ -148,7 +148,7 @@ class Phergie_Plugin_Youtube extends Phergie_Plugin_Abstract
     {
         switch ($parsed['host']) {
             case 'youtu.be':
-                $v = ltrim($parsed['path'], '/');
+                $v = ltrim('/', $parsed['path']);
                 break;
             case 'youtube.com':
             case 'www.youtube.com':
diff --git a/plugins/Irc/extlib/phergie/Phergie/Process/Abstract.php b/plugins/Irc/extlib/phergie/Phergie/Process/Abstract.php
index 0ec3569feb..68d45289e8 100755
--- a/plugins/Irc/extlib/phergie/Phergie/Process/Abstract.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Process/Abstract.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Phergie
+ * Phergie 
  *
  * PHP version 5
  *
@@ -11,7 +11,7 @@
  * It is also available through the world-wide-web at this URL:
  * http://phergie.org/license
  *
- * @category  Phergie
+ * @category  Phergie 
  * @package   Phergie
  * @author    Phergie Development Team <team@phergie.org>
  * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
@@ -22,7 +22,7 @@
 /**
  * Base class for obtaining and processing incoming events.
  *
- * @category Phergie
+ * @category Phergie 
  * @package  Phergie
  * @author   Phergie Development Team <team@phergie.org>
  * @license  http://phergie.org/license New BSD License
@@ -38,9 +38,9 @@ abstract class Phergie_Process_Abstract
     protected $driver;
 
     /**
-     * Current connection handler instance
+     * Current connection handler instance 
      *
-     * @var Phergie_Connection_Handler
+     * @var Phergie_Connection_Handler 
      */
     protected $connections;
 
@@ -75,9 +75,9 @@ abstract class Phergie_Process_Abstract
     /**
      * Gets the required class refences from Phergie_Bot.
      *
-     * @param Phergie_Bot $bot     Current bot instance in use
+     * @param Phergie_Bot $bot     Current bot instance in use 
      * @param array       $options Optional processor arguments
-     *
+     *      
      * @return void
      */
     public function __construct(Phergie_Bot $bot, array $options = array())
@@ -99,8 +99,8 @@ abstract class Phergie_Process_Abstract
      */
     protected function processEvents(Phergie_Connection $connection)
     {
-        $this->plugins->preDispatch();
         if (count($this->events)) {
+            $this->plugins->preDispatch();
             foreach ($this->events as $event) {
                 $this->ui->onCommand($event, $connection);
 
@@ -110,15 +110,15 @@ abstract class Phergie_Process_Abstract
                     $event->getArguments()
                 );
             }
-        }
-        $this->plugins->postDispatch();
+            $this->plugins->postDispatch();
 
-        if ($this->events->hasEventOfType(Phergie_Event_Request::TYPE_QUIT)) {
-            $this->ui->onQuit($connection);
-            $this->connections->removeConnection($connection);
-        }
+            if ($this->events->hasEventOfType(Phergie_Event_Request::TYPE_QUIT)) {
+                $this->ui->onQuit($connection);
+                $this->connections->removeConnection($connection);
+            }
 
-        $this->events->clearEvents();
+            $this->events->clearEvents();
+        }
     }
 
     /**
diff --git a/plugins/Irc/extlib/phergie/Phergie/Process/Async.php b/plugins/Irc/extlib/phergie/Phergie/Process/Async.php
index 78d5959144..e553ad5a82 100644
--- a/plugins/Irc/extlib/phergie/Phergie/Process/Async.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Process/Async.php
@@ -117,7 +117,11 @@ class Phergie_Process_Async extends Phergie_Process_Abstract
             if ($event = $this->driver->getEvent()) {
                 $this->ui->onEvent($event, $connection);
                 $this->plugins->setEvent($event);
-                $this->plugins->preEvent();
+
+                if (!$this->plugins->preEvent()) {
+                    continue;
+                }
+
                 $this->plugins->{'on' . ucfirst($event->getType())}();
             }
 
diff --git a/plugins/Irc/extlib/phergie/Phergie/Process/Standard.php b/plugins/Irc/extlib/phergie/Phergie/Process/Standard.php
index 24adbaf991..385c65fa22 100644
--- a/plugins/Irc/extlib/phergie/Phergie/Process/Standard.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Process/Standard.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Phergie
+ * Phergie 
  *
  * PHP version 5
  *
@@ -11,7 +11,7 @@
  * It is also available through the world-wide-web at this URL:
  * http://phergie.org/license
  *
- * @category  Phergie
+ * @category  Phergie 
  * @package   Phergie
  * @author    Phergie Development Team <team@phergie.org>
  * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
@@ -23,7 +23,7 @@
  * Connection data processor which reads all connections looking
  * for a response.
  *
- * @category Phergie
+ * @category Phergie 
  * @package  Phergie
  * @author   Phergie Development Team <team@phergie.org>
  * @license  http://phergie.org/license New BSD License
@@ -32,7 +32,7 @@
 class Phergie_Process_Standard extends Phergie_Process_Abstract
 {
     /**
-     * Obtains and processes incoming events, then sends resulting outgoing
+     * Obtains and processes incoming events, then sends resulting outgoing 
      * events.
      *
      * @return void
@@ -47,7 +47,11 @@ class Phergie_Process_Standard extends Phergie_Process_Abstract
             if ($event = $this->driver->getEvent()) {
                 $this->ui->onEvent($event, $connection);
                 $this->plugins->setEvent($event);
-                $this->plugins->preEvent();
+
+                if (!$this->plugins->preEvent()) {
+                    continue;
+                }
+
                 $this->plugins->{'on' . ucfirst($event->getType())}();
             }
 

From 4cfe04a68f094740cf22943c0375c33d374d5954 Mon Sep 17 00:00:00 2001
From: Luke Fitzgerald <lw.fitzgerald@googlemail.com>
Date: Tue, 3 Aug 2010 20:07:59 -0700
Subject: [PATCH 141/655] Remove old debugging code

---
 plugins/Irc/extlib/phergie/Phergie/Plugin/Statusnet.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Statusnet.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Statusnet.php
index 41995ee358..bd17971976 100644
--- a/plugins/Irc/extlib/phergie/Phergie/Plugin/Statusnet.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Statusnet.php
@@ -74,10 +74,6 @@ class Phergie_Plugin_Statusnet extends Phergie_Plugin_Abstract {
             $source = $event->getSource();
             $message = trim($event->getText());
 
-            if ($source == '#statustest') {
-                $this->doPrivmsg('#statustest', "\001Line1\020nLine2");
-            }
-
             call_user_func($this->messageCallback, array('sender' => $source, 'message' => $message));
         }
     }

From 2250273942aadbdf8ec4603eb693259c359d1b79 Mon Sep 17 00:00:00 2001
From: Luke Fitzgerald <lw.fitzgerald@googlemail.com>
Date: Wed, 4 Aug 2010 08:46:04 -0700
Subject: [PATCH 142/655] Only attempt callback if non-null

---
 .../phergie/Phergie/Plugin/Statusnet.php      | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Statusnet.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Statusnet.php
index bd17971976..694fefc06b 100644
--- a/plugins/Irc/extlib/phergie/Phergie/Plugin/Statusnet.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Statusnet.php
@@ -84,15 +84,17 @@ class Phergie_Plugin_Statusnet extends Phergie_Plugin_Abstract {
      * @return void
      */
     public function onNotice() {
-        $event = $this->getEvent();
-        if ($event->getNick() == 'NickServ') {
-            $message = $event->getArgument(1);
-            if (preg_match($this->unregRegexp, $message, $groups)) {
-                $screenname = $groups[1];
-                call_user_func($this->regCallback, array('screenname' => $screenname, 'registered' => false));
-            } elseif (preg_match($this->regRegexp, $message, $groups)) {
-                $screenname = $groups[1];
-                call_user_func($this->regCallback, array('screenname' => $screenname, 'registered' => true));
+        if ($this->regCallback !== NULL) {
+            $event = $this->getEvent();
+            if ($event->getNick() == 'NickServ') {
+                $message = $event->getArgument(1);
+                if (preg_match($this->unregRegexp, $message, $groups)) {
+                    $screenname = $groups[1];
+                    call_user_func($this->regCallback, array('screenname' => $screenname, 'registered' => false));
+                } elseif (preg_match($this->regRegexp, $message, $groups)) {
+                    $screenname = $groups[1];
+                    call_user_func($this->regCallback, array('screenname' => $screenname, 'registered' => true));
+                }
             }
         }
     }

From 65a741cce2a02057e858ab4bbf8b5e8ae8c4a73e Mon Sep 17 00:00:00 2001
From: Luke Fitzgerald <lw.fitzgerald@googlemail.com>
Date: Wed, 4 Aug 2010 09:10:57 -0700
Subject: [PATCH 143/655] Messages with new lines split at plugin stage for
 reliability

---
 plugins/Irc/IrcPlugin.php  | 7 +++++--
 plugins/Irc/ircmanager.php | 6 +-----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/plugins/Irc/IrcPlugin.php b/plugins/Irc/IrcPlugin.php
index dec6d7e832..855aa3305e 100644
--- a/plugins/Irc/IrcPlugin.php
+++ b/plugins/Irc/IrcPlugin.php
@@ -165,8 +165,11 @@ class IrcPlugin extends ImPlugin {
      * @return boolean success value
      */
     public function send_message($screenname, $body) {
-        $this->fake_irc->doPrivmsg($screenname, $body);
-        $this->enqueue_outgoing_raw(array('type' => 'message', 'data' => $this->fake_irc->would_be_sent));
+        $lines = explode("\n", $body);
+        foreach ($lines as $line) {
+            $this->fake_irc->doPrivmsg($screenname, $line);
+            $this->enqueue_outgoing_raw(array('type' => 'message', 'data' => $this->fake_irc->would_be_sent));
+        }
         return true;
     }
 
diff --git a/plugins/Irc/ircmanager.php b/plugins/Irc/ircmanager.php
index 8d9cac885b..51996bef99 100644
--- a/plugins/Irc/ircmanager.php
+++ b/plugins/Irc/ircmanager.php
@@ -240,12 +240,8 @@ class IrcManager extends ImManager {
             $this->regchecksLookup[$usernick] = $screenname;
         }
 
-        $args = $data['data']['args'];
-        $lines = explode("\n", $args[1]);
         try {
-            foreach ($lines as $line) {
-                $this->conn->send($data['data']['command'], array($args[0], $line));
-            }
+            $this->conn->send($data['data']['command'], $data['data']['args']);
         } catch (Phergie_Driver_Exception $e) {
             $this->conn->reconnect();
             return false;

From cb34d9519753913138d3831d16687e03d729dabc Mon Sep 17 00:00:00 2001
From: Luke Fitzgerald <lw.fitzgerald@googlemail.com>
Date: Wed, 4 Aug 2010 16:02:24 -0700
Subject: [PATCH 144/655] Merge in Phergie changes

---
 plugins/Irc/extlib/.gitignore                 |   2 +
 .../Irc/extlib/phergie/Phergie/Connection.php |   2 +-
 .../phergie/Phergie/Connection/Exception.php  |   6 +
 .../extlib/phergie/Phergie/Driver/Streams.php |   1 +
 .../phergie/Phergie/Plugin/Abstract.php       |   2 +-
 .../Irc/extlib/phergie/Phergie/Plugin/Acl.php | 150 +++-
 .../extlib/phergie/Phergie/Plugin/Beer/db.php |   2 +
 .../phergie/Phergie/Plugin/Caffeine.php       |  69 ++
 .../phergie/Phergie/Plugin/Caffeine/db.php    |  51 ++
 .../extlib/phergie/Phergie/Plugin/Command.php |  62 +-
 .../phergie/Phergie/Plugin/Cookie/db.php      |   3 -
 .../extlib/phergie/Phergie/Plugin/Daddy.php   |  16 +-
 .../extlib/phergie/Phergie/Plugin/Google.php  | 144 ++--
 .../extlib/phergie/Phergie/Plugin/Handler.php |  43 +-
 .../extlib/phergie/Phergie/Plugin/Help.php    | 266 ++++---
 .../extlib/phergie/Phergie/Plugin/Http.php    |   9 +-
 .../extlib/phergie/Phergie/Plugin/Ideone.php  | 180 +++++
 .../phergie/Phergie/Plugin/Iterator.php       | 126 ++++
 .../extlib/phergie/Phergie/Plugin/Karma.php   | 700 +++++++++---------
 .../extlib/phergie/Phergie/Plugin/Message.php | 112 +++
 .../extlib/phergie/Phergie/Plugin/Ping.php    |   4 +-
 .../extlib/phergie/Phergie/Plugin/Quit.php    |  14 +-
 .../extlib/phergie/Phergie/Plugin/Reload.php  |   9 +-
 .../extlib/phergie/Phergie/Plugin/Serve.php   |  25 +-
 .../Irc/extlib/phergie/Phergie/Plugin/Tea.php |  69 ++
 .../extlib/phergie/Phergie/Plugin/Tea/db.php  |  49 ++
 .../Phergie/Plugin/TheFuckingWeather.php      |   6 -
 .../Irc/extlib/phergie/Phergie/Plugin/Tld.php |  18 +-
 .../extlib/phergie/Phergie/Plugin/Tld/db.php  | Bin 47104 -> 1740 bytes
 .../extlib/phergie/Phergie/Plugin/Youtube.php |   2 +-
 .../phergie/Phergie/Process/Abstract.php      |  32 +-
 .../extlib/phergie/Phergie/Process/Async.php  |   6 +-
 .../phergie/Phergie/Process/Standard.php      |  14 +-
 .../Tests/Phergie/Plugin/HandlerTest.php      |  49 +-
 .../Tests/Phergie/Plugin/IteratorTest.php     | 151 ++++
 35 files changed, 1646 insertions(+), 748 deletions(-)
 create mode 100644 plugins/Irc/extlib/.gitignore
 create mode 100644 plugins/Irc/extlib/phergie/Phergie/Plugin/Caffeine.php
 create mode 100644 plugins/Irc/extlib/phergie/Phergie/Plugin/Caffeine/db.php
 mode change 100755 => 100644 plugins/Irc/extlib/phergie/Phergie/Plugin/Command.php
 create mode 100644 plugins/Irc/extlib/phergie/Phergie/Plugin/Ideone.php
 create mode 100644 plugins/Irc/extlib/phergie/Phergie/Plugin/Iterator.php
 create mode 100644 plugins/Irc/extlib/phergie/Phergie/Plugin/Message.php
 create mode 100644 plugins/Irc/extlib/phergie/Phergie/Plugin/Tea.php
 create mode 100644 plugins/Irc/extlib/phergie/Phergie/Plugin/Tea/db.php
 create mode 100644 plugins/Irc/extlib/phergie/Tests/Phergie/Plugin/IteratorTest.php

diff --git a/plugins/Irc/extlib/.gitignore b/plugins/Irc/extlib/.gitignore
new file mode 100644
index 0000000000..553fe8e258
--- /dev/null
+++ b/plugins/Irc/extlib/.gitignore
@@ -0,0 +1,2 @@
+Settings.php
+*.db
diff --git a/plugins/Irc/extlib/phergie/Phergie/Connection.php b/plugins/Irc/extlib/phergie/Phergie/Connection.php
index d6c89ea801..b3f0acf83d 100755
--- a/plugins/Irc/extlib/phergie/Phergie/Connection.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Connection.php
@@ -254,7 +254,7 @@ class Phergie_Connection
         if (!in_array($this->encoding, mb_list_encodings())) {
             throw new Phergie_Connection_Exception(
                 'Encoding ' . $this->encoding . ' is not supported',
-                Phergie_Connection_Exception::ENCODING_NOT_SUPPORTED
+                Phergie_Connection_Exception::ERR_ENCODING_NOT_SUPPORTED
             );
         }
 
diff --git a/plugins/Irc/extlib/phergie/Phergie/Connection/Exception.php b/plugins/Irc/extlib/phergie/Phergie/Connection/Exception.php
index a750e1d860..aec1cd8e0f 100644
--- a/plugins/Irc/extlib/phergie/Phergie/Connection/Exception.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Connection/Exception.php
@@ -41,4 +41,10 @@ class Phergie_Connection_Exception extends Phergie_Exception
      * but that transport is not supported by the current PHP installation
      */
     const ERR_TRANSPORT_NOT_SUPPORTED = 2;
+
+    /**
+     * Error indicating that a connection is configured to use an encoding,
+     * but that encoding is not supported by the current PHP installation
+     */
+    const ERR_ENCODING_NOT_SUPPORTED = 3;
 }
diff --git a/plugins/Irc/extlib/phergie/Phergie/Driver/Streams.php b/plugins/Irc/extlib/phergie/Phergie/Driver/Streams.php
index 3f2ce052b1..73c0230c71 100755
--- a/plugins/Irc/extlib/phergie/Phergie/Driver/Streams.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Driver/Streams.php
@@ -243,6 +243,7 @@ class Phergie_Driver_Streams extends Phergie_Driver_Abstract
 
             // Parse the command and arguments
             list($cmd, $args) = array_pad(explode(' ', $buffer, 2), 2, null);
+            $hostmask = new Phergie_Hostmask(null, null, $this->connection->getHost());
 
         } else {
             // If the event could be from the server or a user...
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Abstract.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Abstract.php
index d7e0d351af..b7105ecdb2 100755
--- a/plugins/Irc/extlib/phergie/Phergie/Plugin/Abstract.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Abstract.php
@@ -270,7 +270,7 @@ abstract class Phergie_Plugin_Abstract
      */
     public function getEvent()
     {
-        if (empty($this->connection)) {
+        if (empty($this->event)) {
             throw new Phergie_Plugin_Exception(
                 'Event cannot be accessed before one is set',
                 Phergie_Plugin_Exception::ERR_NO_EVENT
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Acl.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Acl.php
index 9738df60e0..e209e32e14 100755
--- a/plugins/Irc/extlib/phergie/Phergie/Plugin/Acl.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Acl.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Phergie 
+ * Phergie
  *
  * PHP version 5
  *
@@ -11,7 +11,7 @@
  * It is also available through the world-wide-web at this URL:
  * http://phergie.org/license
  *
- * @category  Phergie 
+ * @category  Phergie
  * @package   Phergie_Plugin_Acl
  * @author    Phergie Development Team <team@phergie.org>
  * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
@@ -20,14 +20,48 @@
  */
 
 /**
- * Provides an access control system to limit reponses to events based on 
+ * Provides an access control system to limit reponses to events based on
  * the users who originate them.
  *
- * @category Phergie 
+ * Configuration settings:
+ * acl.whitelist - mapping of user hostmask patterns (optionally by host) to
+ *                 plugins and methods where those plugins and methods will
+ *                 only be accessible to those users (i.e. and inaccessible
+ *                 to other users)
+ * acl.blacklist - mapping of user hostmasks (optionally by host) to plugins
+ *                 and methods where where those plugins and methods will be
+ *                 inaccessible to those users but accessible to other users
+ * acl.ops       - TRUE to automatically give access to whitelisted plugins
+ *                 and methods to users with ops for events they initiate in
+ *                 channels where they have ops
+ *
+ * The whitelist and blacklist settings are formatted like so:
+ * <code>
+ * 'acl.whitelist' => array(
+ *     'hostname1' => array(
+ *         'pattern1' => array(
+ *             'plugins' => array(
+ *                 'ShortPluginName'
+ *             ),
+ *             'methods' => array(
+ *                 'methodName'
+ *             )
+ *         ),
+ *     )
+ * ),
+ * </code>
+ *
+ * The hostname array dimension is optional; if not used, rules will be
+ * applied across all connections. The pattern is a user hostmask pattern
+ * where asterisks (*) are used for wildcards. Plugins and methods do not
+ * need to be set to empty arrays if they are not used; simply exclude them.
+ *
+ * @category Phergie
  * @package  Phergie_Plugin_Acl
  * @author   Phergie Development Team <team@phergie.org>
  * @license  http://phergie.org/license New BSD License
  * @link     http://pear.phergie.org/package/Phergie_Plugin_Acl
+ * @uses     Phergie_Plugin_UserInfo pear.phergie.org
  */
 class Phergie_Plugin_Acl extends Phergie_Plugin_Abstract
 {
@@ -38,6 +72,8 @@ class Phergie_Plugin_Acl extends Phergie_Plugin_Abstract
      */
     public function onLoad()
     {
+        $this->plugins->getPlugin('UserInfo');
+
         if (!$this->getConfig('acl.blacklist')
             && !$this->getConfig('acl.whitelist')
         ) {
@@ -46,47 +82,105 @@ class Phergie_Plugin_Acl extends Phergie_Plugin_Abstract
     }
 
     /**
-     * Checks permission settings and short-circuits event processing for 
+     * Applies a set of rules to a plugin handler iterator.
+     *
+     * @param Phergie_Plugin_Iterator $iterator Iterator to receive rules
+     * @param array                   $rules    Associate array containing
+     *        either a 'plugins' key pointing to an array containing plugin
+     *        short names to filter, a 'methods' key pointing to an array
+     *        containing method names to filter, or both
+     *
+     * @return void
+     */
+    protected function applyRules(Phergie_Plugin_Iterator $iterator, array $rules)
+    {
+        if (!empty($rules['plugins'])) {
+            $iterator->addPluginFilter($rules['plugins']);
+        }
+        if (!empty($rules['methods'])) {
+            $iterator->addMethodFilter($rules['methods']);
+        }
+    }
+
+    /**
+     * Checks permission settings and short-circuits event processing for
      * blacklisted users.
      *
-     * @return bool FALSE to short-circuit event processing if the user is 
-     *         blacklisted, TRUE otherwise
+     * @return void
      */
     public function preEvent()
     {
         // Ignore server responses
         if ($this->event instanceof Phergie_Event_Response) {
-            return true;
+            return;
         }
 
         // Ignore server-initiated events
         if (!$this->event->isFromUser()) {
-            return true;
+            return;
         }
 
-        // Determine whether a whitelist or blacklist is being used
-        $list = $this->getConfig('acl.whitelist');
-        $matches = true;
-        if (!$list) {
-            $list = $this->getConfig('acl.blacklist');
-            $matches = false;
-        }
+        // Get the iterator used to filter plugins when processing events
+        $iterator = $this->plugins->getIterator();
 
-        // Support host-specific lists 
+        // Get configuration setting values
+        $whitelist = $this->getConfig('acl.whitelist', array());
+        $blacklist = $this->getConfig('acl.blacklist', array());
+        $ops = $this->getConfig('acl.ops', false);
+
+        // Support host-specific lists
         $host = $this->connection->getHost();
-        if (isset($list[$host])) {
-            $list = $list[$host];
-        }
-
-        // Short-circuit event processing if appropriate 
-        $hostmask = $this->event->getHostmask();
-        foreach ($list as $pattern) {
-            if ($hostmask->matches($pattern)) {
-                return $matches;
+        foreach (array('whitelist', 'blacklist') as $var) {
+            foreach ($$var as $pattern => $rules) {
+                $regex = '/^' . str_replace('*', '.*', $pattern) . '$/i';
+                if (preg_match($regex, $host)) {
+                    ${$var} = ${$var}[$pattern];
+                    break;
+                }
             }
         }
 
-        // Allow event processing if appropriate 
-        return !$matches;
+        // Get information on the user initiating the current event
+        $hostmask = $this->event->getHostmask();
+        $isOp = $ops
+              && $this->event->isInChannel()
+              && $this->plugins->userInfo->isOp(
+                $this->event->getNick(),
+                $this->event->getSource()
+              );
+
+        // Filter whitelisted commands if the user is not on the whitelist
+        if (!$isOp) {
+            $whitelisted = false;
+            foreach ($whitelist as $pattern => $rules) {
+                if ($hostmask->matches($pattern)) {
+                    $whitelisted = true;
+                }
+            }
+            if (!$whitelisted) {
+                foreach ($whitelist as $pattern => $rules) {
+                    $this->applyRules($iterator, $rules);
+                }
+            }
+        }
+
+        // Filter blacklisted commands if the user is on the blacklist
+        $blacklisted = false;
+        foreach ($blacklist as $pattern => $rules) {
+            if ($hostmask->matches($pattern)) {
+                $this->applyRules($iterator, $rules);
+                break;
+            }
+        }
+    }
+
+    /**
+     * Clears filters on the plugin handler iterator.
+     *
+     * @return void
+     */
+    public function postDispatch()
+    {
+        $this->plugins->getIterator()->clearFilters();
     }
 }
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Beer/db.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Beer/db.php
index 05ae064ed7..c7921e5193 100644
--- a/plugins/Irc/extlib/phergie/Phergie/Plugin/Beer/db.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Beer/db.php
@@ -35,6 +35,7 @@ $beers = $xpath->query('//table[@class="beerlist"]/tr/td[1]');
 $db->beginTransaction();
 foreach ($beers as $beer) {
     $name = iconv('UTF-8', 'ISO-8859-1//TRANSLIT', $beer->textContent);
+    $name = preg_replace('/\h*\v+\h*/', '', $name);
     $link = 'http://beerme.com' . $beer->childNodes->item(1)->getAttribute('href');
     $insert->execute(array($name, $link));
 }
@@ -66,6 +67,7 @@ $db->beginTransaction();
 while ($line = fgetcsv($fp, 0, '|')) {
     $line = array_combine($columns, $line);
     $name = iconv('UTF-8', 'ISO-8859-1//TRANSLIT', $line['name']);
+    $name = preg_replace('/\h*\v+\h*/', '', $name);
     $link = null;
     $insert->execute(array($name, $link));
 }
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Caffeine.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Caffeine.php
new file mode 100644
index 0000000000..2b76bd312f
--- /dev/null
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Caffeine.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ * Phergie
+ *
+ * PHP version 5
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.
+ * It is also available through the world-wide-web at this URL:
+ * http://phergie.org/license
+ *
+ * @category  Phergie
+ * @package   Phergie_Plugin_Caffeine
+ * @author    Phergie Development Team <team@phergie.org>
+ * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
+ * @license   http://phergie.org/license New BSD License
+ * @link      http://pear.phergie.org/package/Phergie_Plugin_Caffeine
+ */
+
+/**
+ * Processes requests to serve users caffeinated beverages.
+ *
+ * @category Phergie
+ * @package  Phergie_Plugin_Caffeine
+ * @author   Phergie Development Team <team@phergie.org>
+ * @license  http://phergie.org/license New BSD License
+ * @link     http://pear.phergie.org/package/Phergie_Plugin_Caffeine
+ * @uses     Phergie_Plugin_Command pear.phergie.org
+ * @uses     Phergie_Plugin_Serve pear.phergie.org
+ */
+class Phergie_Plugin_Caffeine extends Phergie_Plugin_Abstract
+{
+    /**
+     * Checks for dependencies.
+     *
+     * @return void
+     */
+    public function onLoad()
+    {
+        $plugins = $this->plugins;
+        $plugins->getPlugin('Command');
+        $plugins->getPlugin('Serve');
+    }
+
+    /**
+     * Processes requests to serve a user a caffeinated beverage.
+     *
+     * @param string $request Request including the target and an optional
+     *        suggestion of what caffeinated beverage to serve
+     *
+     * @return void
+     */
+    public function onCommandCaffeine($request)
+    {
+        $format = $this->getConfig(
+            'beer.format',
+            'throws %target% %article% %item%.'
+        );
+
+        $this->plugins->getPlugin('Serve')->serve(
+            dirname(__FILE__) . '/Caffeine/caffeine.db',
+            'caffeine',
+            $format,
+            $request
+        );
+    }
+}
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Caffeine/db.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Caffeine/db.php
new file mode 100644
index 0000000000..cdff52fd8d
--- /dev/null
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Caffeine/db.php
@@ -0,0 +1,51 @@
+<?php
+
+if (!defined('__DIR__')) {
+    define('__DIR__', dirname(__FILE__));
+}
+
+// Create database schema
+echo 'Creating database', PHP_EOL;
+$file = __DIR__ . '/caffeine.db';
+if (file_exists($file)) {
+    unlink($file);
+}
+$db = new PDO('sqlite:' . $file);
+$db->exec('CREATE TABLE caffeine (name VARCHAR(255), link VARCHAR(255))');
+$db->exec('CREATE UNIQUE INDEX caffeine_name ON caffeine (name)');
+$insert = $db->prepare('INSERT INTO caffeine (name, link) VALUES (:name, :link)');
+
+// Get raw energyfiend.com data set
+echo 'Downloading energyfiend.com data set', PHP_EOL;
+$file = __DIR__ . '/the-caffeine-database.html';
+if (!file_exists($file)) {
+    copy('http://www.energyfiend.com/the-caffeine-database', $file);
+}
+$contents = file_get_contents($file);
+
+// Extract data from data set
+echo 'Processing energyfiend.com data', PHP_EOL;
+$contents = tidy_repair_string($contents);
+libxml_use_internal_errors(true);
+$doc = new DOMDocument;
+$doc->loadHTML($contents);
+libxml_clear_errors();
+$xpath = new DOMXPath($doc);
+$caffeine = $xpath->query('//table[@id="caffeinedb"]//tr/td[1]');
+$db->beginTransaction();
+foreach ($caffeine as $drink) {
+    $name = iconv('UTF-8', 'ISO-8859-1//TRANSLIT', $drink->textContent);
+    $name = preg_replace('/\s*\v+\s*/', ' ', $name);
+    if ($drink->firstChild->nodeName == 'a') {
+        $link = 'http://energyfiend.com'
+              . $drink->firstChild->getAttribute('href');
+    } else {
+        $link = null;
+    }
+    $insert->execute(array($name, $link));
+}
+$db->commit();
+
+// Clean up
+echo 'Cleaning up', PHP_EOL;
+unlink($file);
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Command.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Command.php
old mode 100755
new mode 100644
index 2ab5b69d1d..5c0a52e916
--- a/plugins/Irc/extlib/phergie/Phergie/Plugin/Command.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Command.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Phergie 
+ * Phergie
  *
  * PHP version 5
  *
@@ -11,7 +11,7 @@
  * It is also available through the world-wide-web at this URL:
  * http://phergie.org/license
  *
- * @category  Phergie 
+ * @category  Phergie
  * @package   Phergie_Plugin_Command
  * @author    Phergie Development Team <team@phergie.org>
  * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
@@ -20,20 +20,28 @@
  */
 
 /**
- * Handles parsing and execution of commands sent by users via messages sent 
+ * Handles parsing and execution of commands sent by users via messages sent
  * to channels in which the bot is present or directly to the bot.
  *
- * @category Phergie 
+ * @category Phergie
  * @package  Phergie_Plugin_Command
  * @author   Phergie Development Team <team@phergie.org>
  * @license  http://phergie.org/license New BSD License
  * @link     http://pear.phergie.org/package/Phergie_Plugin_Command
  * @uses     extension reflection
+ * @uses     Phergie_Plugin_Message pear.phergie.org
  */
 class Phergie_Plugin_Command extends Phergie_Plugin_Abstract
 {
     /**
-     * Cache for command lookups used to confirm that methods exist and 
+     * Prefix for command method names
+     *
+     * @var string
+     */
+    const METHOD_PREFIX = 'onCommand';
+
+    /**
+     * Cache for command lookups used to confirm that methods exist and
      * parameter counts match
      *
      * @var array
@@ -41,24 +49,28 @@ class Phergie_Plugin_Command extends Phergie_Plugin_Abstract
     protected $methods = array();
 
     /**
-     * Prefix for command method names
+     * Load the Message plugin
      *
-     * @var string
+     * @return void
      */
-    protected $methodPrefix = 'onCommand';
+    public function onLoad()
+    {
+        $plugins = $this->getPluginHandler();
+        $plugins->getPlugin('Message');
+    }
 
     /**
      * Populates the methods cache.
      *
      * @return void
      */
-    protected function populateMethodCache()
+    public function populateMethodCache()
     {
-        foreach ($this->getPluginHandler() as $plugin) {
+        foreach ($this->getPluginHandler()->getPlugins() as $plugin) {
             $reflector = new ReflectionClass($plugin);
             foreach ($reflector->getMethods() as $method) {
                 $name = $method->getName();
-                if (strpos($name, $this->methodPrefix) === 0 
+                if (strpos($name, self::METHOD_PREFIX) === 0
                     && !isset($this->methods[$name])
                 ) {
                     $this->methods[$name] = array(
@@ -84,26 +96,26 @@ class Phergie_Plugin_Command extends Phergie_Plugin_Abstract
             $this->populateMethodCache();
         }
 
-        // Get the content of the message
-        $event = $this->getEvent();
-        $msg = trim($event->getText());
-        $prefix = $this->getConfig('command.prefix');
-
-        // Check for the command prefix if one is set and needed
-        if ($prefix && $event->isInChannel()) {
-            if (strpos($msg, $prefix) !== 0) {
-                return;
-            } else {
-                $msg = substr($msg, strlen($prefix));
-            }
+        // Check for a prefixed message
+        $msg = $this->plugins->message->getMessage();
+        if ($msg === false) {
+            return;
         }
 
         // Separate the command and arguments
         $parsed = preg_split('/\s+/', $msg, 2);
-        $method = $this->methodPrefix . ucfirst(strtolower(array_shift($parsed))); 
+        $command = strtolower(array_shift($parsed));
         $args = count($parsed) ? array_shift($parsed) : '';
 
+        // Resolve aliases to their corresponding commands
+        $aliases = $this->getConfig('command.aliases', array());
+        $result = preg_grep('/^' . $command . '$/i', array_keys($aliases));
+        if ($result) {
+            $command = $aliases[array_shift($result)];
+        }
+
         // Check to ensure the command exists
+        $method = self::METHOD_PREFIX . ucfirst($command);
         if (empty($this->methods[$method])) {
             return;
         }
@@ -122,7 +134,7 @@ class Phergie_Plugin_Command extends Phergie_Plugin_Abstract
             // Parse the arguments
             $args = preg_split('/\s+/', $args, $this->methods[$method]['total']);
 
-            // If the minimum arguments are passed, call the method 
+            // If the minimum arguments are passed, call the method
             if ($this->methods[$method]['required'] <= count($args)) {
                 call_user_func_array(
                     array($this->getPluginHandler(), $method),
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Cookie/db.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Cookie/db.php
index 91d375ca6d..27763159cc 100644
--- a/plugins/Irc/extlib/phergie/Phergie/Plugin/Cookie/db.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Cookie/db.php
@@ -36,9 +36,6 @@ $cookies = $xpath->query('//table[@width="90%"]/tr/td[1]/a');
 
 foreach ($cookies as $cookie) {
     $name = $cookie->textContent;
-    foreach (range(0, mb_strlen($name) - 1) as $index) {
-        echo mb_strcut($name, $index, 1), PHP_EOL;
-    }
     $name = str_replace(
         array('(',')',"\n", 'cookies'),
         array('','', ' ', 'cookie'),
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Daddy.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Daddy.php
index d47c3c41d3..ed258e10ff 100644
--- a/plugins/Irc/extlib/phergie/Phergie/Plugin/Daddy.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Daddy.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Phergie 
+ * Phergie
  *
  * PHP version 5
  *
@@ -11,7 +11,7 @@
  * It is also available through the world-wide-web at this URL:
  * http://phergie.org/license
  *
- * @category  Phergie 
+ * @category  Phergie
  * @package   Phergie_Plugin_Daddy
  * @author    Phergie Development Team <team@phergie.org>
  * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
@@ -23,7 +23,7 @@
  * Simply responds to messages addressed to the bot that contain the phrase
  * "Who's your daddy?" and related variations.
  *
- * @category Phergie 
+ * @category Phergie
  * @package  Phergie_Plugin_Daddy
  * @author   Phergie Development Team <team@phergie.org>
  * @license  http://phergie.org/license New BSD License
@@ -45,15 +45,11 @@ class Phergie_Plugin_Daddy extends Phergie_Plugin_Abstract
         $text = $event->getArgument(1);
         $target = $event->getNick();
         $source = $event->getSource();
-        $pattern 
-            = '/' . preg_quote($prefix) . 
+        $pattern
+            = '/' . preg_quote($prefix) .
             '\s*?who\'?s y(?:our|a) ([^?]+)\??/iAD';
         if (preg_match($pattern, $text, $m)) {
-            if ($config['daddy.curses'] && mt_rand(0, 5) === 5) {
-                $msg = $target . ': I am your ' . $m[1] . ', bitch!';
-            } else {
-                $msg = 'You\'re my ' . $m[1] . ', ' . $target . '!';
-            }
+            $msg = 'You\'re my ' . $m[1] . ', ' . $target . '!';
             $this->doPrivmsg($source, $msg);
         }
     }
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Google.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Google.php
index faa98f926a..d2a9d4dce9 100644
--- a/plugins/Irc/extlib/phergie/Phergie/Plugin/Google.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Google.php
@@ -32,24 +32,9 @@
  * @uses     Phergie_Plugin_Command pear.phergie.org
  * @uses     Phergie_Plugin_Http pear.phergie.org
  * @uses     Phergie_Plugin_Temperature pear.phergie.org
- *
- * @pluginDesc Provide access to some Google services
  */
 class Phergie_Plugin_Google extends Phergie_Plugin_Abstract
 {
-
-    /**
-     * HTTP plugin
-     *
-     * @var Phergie_Plugin_Http
-     */
-    protected $http;
-
-    /**
-     * Language for Google Services
-     */
-    protected $lang;
-
     /**
      * Checks for dependencies.
      *
@@ -59,11 +44,8 @@ class Phergie_Plugin_Google extends Phergie_Plugin_Abstract
     {
         $plugins = $this->getPluginHandler();
         $plugins->getPlugin('Command');
-        $this->http = $plugins->getPlugin('Http');
-        $plugins->getPlugin('Help')->register($this);
+        $plugins->getPlugin('Http');
         $plugins->getPlugin('Weather');
-
-        $this->lang = $this->getConfig('google.lang', 'en');
     }
 
     /**
@@ -73,8 +55,6 @@ class Phergie_Plugin_Google extends Phergie_Plugin_Abstract
      *
      * @return void
      * @todo Implement use of URL shortening here
-     *
-     * @pluginCmd [query] do a search on google
      */
     public function onCommandG($query)
     {
@@ -83,7 +63,7 @@ class Phergie_Plugin_Google extends Phergie_Plugin_Abstract
             'v' => '1.0',
             'q' => $query
         );
-        $response = $this->http->get($url, $params);
+        $response = $this->plugins->http->get($url, $params);
         $json = $response->getContent()->responseData;
         $event = $this->getEvent();
         $source = $event->getSource();
@@ -110,8 +90,6 @@ class Phergie_Plugin_Google extends Phergie_Plugin_Abstract
      * @param string $query Search term
      *
      * @return void
-     *
-     * @pluginCmd [query] Do a search on Google and count the results
      */
     public function onCommandGc($query)
     {
@@ -120,7 +98,7 @@ class Phergie_Plugin_Google extends Phergie_Plugin_Abstract
             'v' => '1.0',
             'q' => $query
         );
-        $response = $this->http->get($url, $params);
+        $response = $this->plugins->http->get($url, $params);
         $json = $response->getContent()->responseData->cursor;
         $count = $json->estimatedResultCount;
         $event = $this->getEvent();
@@ -146,8 +124,6 @@ class Phergie_Plugin_Google extends Phergie_Plugin_Abstract
      * @param string $query Term to translate
      *
      * @return void
-     *
-     * @pluginCmd [from language] [to language] [text to translate] Do a translation on Google
      */
     public function onCommandGt($from, $to, $query)
     {
@@ -157,7 +133,7 @@ class Phergie_Plugin_Google extends Phergie_Plugin_Abstract
             'q' => $query,
             'langpair' => $from . '|' . $to
         );
-        $response = $this->http->get($url, $params);
+        $response = $this->plugins->http->get($url, $params);
         $json = $response->getContent();
         $event = $this->getEvent();
         $source = $event->getSource();
@@ -180,18 +156,16 @@ class Phergie_Plugin_Google extends Phergie_Plugin_Abstract
      *        between 0 and 3 to get the forecast
      *
      * @return void
-     *
-     * @pluginCmd [location] Show the weather for the specified location
      */
     public function onCommandGw($location, $offset = null)
     {
         $url = 'http://www.google.com/ig/api';
         $params = array(
             'weather' => $location,
-            'hl' => $this->lang,
+            'hl' => $this->getConfig('google.lang', 'en'),
             'oe' => 'UTF-8'
         );
-        $response = $this->http->get($url, $params);
+        $response = $this->plugins->http->get($url, $params);
         $xml = $response->getContent()->weather;
 
         $event = $this->getEvent();
@@ -280,8 +254,6 @@ class Phergie_Plugin_Google extends Phergie_Plugin_Abstract
      * @param string $location Location to search for
      *
      * @return void
-     *
-     * @pluginCmd [location] Get the location from Google Maps to the location specified
      */
     public function onCommandGmap($location)
     {
@@ -294,13 +266,13 @@ class Phergie_Plugin_Google extends Phergie_Plugin_Abstract
         $params = array(
             'q' => $location,
             'output' => 'json',
-            'gl' => $this->lang,
+            'gl' => $this->getConfig('google.lang', 'en'),
             'sensor' => 'false',
             'oe' => 'utf8',
             'mrt' => 'all',
             'key' => $this->getConfig('google.key')
         );
-        $response = $this->http->get($url, $params);
+        $response = $this->plugins->http->get($url, $params);
         $json =  $response->getContent();
         if (!empty($json)) {
             $qtd = count($json->Placemark);
@@ -345,8 +317,6 @@ class Phergie_Plugin_Google extends Phergie_Plugin_Abstract
      * @param string $to    Destination metric
      *
      * @return void
-     *
-     * @pluginCmd [value] [currency from] [currency to] Converts a monetary value from one currency to another
      */
     public function onCommandGconvert($value, $from, $to)
     {
@@ -356,29 +326,21 @@ class Phergie_Plugin_Google extends Phergie_Plugin_Abstract
             'from' => $from,
             'to' => $to
         );
-        $response = $this->http->get($url, $params);
+        $response = $this->plugins->http->get($url, $params);
         $contents = $response->getContent();
         $event = $this->getEvent();
         $source = $event->getSource();
         $nick = $event->getNick();
         if ($contents) {
-            preg_match(
-                '#<span class=bld>.*? ' . $to . '</span>#im',
-                $contents,
-                $matches
-            );
-            if (!$matches[0]) {
-                $this->doPrivmsg($source, $nick . ', I can\'t do that.');
-            } else {
-                $str = str_replace('<span class=bld>', '', $matches[0]);
-                $str = str_replace($to . '</span>', '', $str);
-                $text
-                    = number_format($value, 2, ',', '.') . ' ' . $from .
-                    ' => ' . number_format($str, 2, ',', '.') . ' ' . $to;
-                $this->doPrivmsg($source, $text);
-            }
-        } else {
-            $this->doPrivmsg($source, $nick . ', we had a problem.');
+            libxml_use_internal_errors(true);
+            $doc = new DOMDocument;
+            $doc->loadHTML($contents);
+            libxml_clear_errors();
+            $xpath = new DOMXPath($doc);
+            $result = $xpath->query('//div[@id="currency_converter_result"]');
+            $div = $result->item(0);
+            $text = rtrim($div->textContent);
+            $this->doPrivmsg($source, $text);
         }
     }
 
@@ -395,7 +357,7 @@ class Phergie_Plugin_Google extends Phergie_Plugin_Abstract
     public function onCommandConvert($query)
     {
         $url = 'http://www.google.com/search?q=' . urlencode($query);
-        $response = $this->http->get($url);
+        $response = $this->plugins->http->get($url);
         $contents = $response->getContent();
         $event = $this->getEvent();
         $source = $event->getSource();
@@ -434,49 +396,61 @@ class Phergie_Plugin_Google extends Phergie_Plugin_Abstract
      *
      * @return void
      * @todo Implement use of URL shortening here
-     *
-     * @pluginCmd [query] do a search of a definition on Google Dictionary
      */
     public function onCommandDefine($query)
     {
-        $query = urlencode($query);
-        $url = 'http://www.google.com/dictionary/json?callback=result'.
-               '&q='.$query.'&sl='.$this->lang.'&tl='.$this->lang.
-               '&restrict=pr,de';
-        $json = file_get_contents($url);
+        $lang = $this->getConfig('google.lang', 'en');
+        $url = 'http://www.google.com/dictionary/json';
+        $params = array(
+            'callback' => 'result',
+            'q' => $query,
+            'sl' => $lang,
+            'tl' => $lang,
+            'restrict' => 'pr,de'
+        );
+        $response = $this->plugins->http->get($url, $params);
+        $json = $response->getContent();
 
-        //Remove some garbage from the json
-        $json = str_replace(array("result(", ",200,null)"), "", $json);
-
-        //Awesome workaround to remove a lot of slashes from json
+        // Remove some garbage from the JSON and decode it
+        $json = str_replace(array('result(', ',200,null)'), '', $json);
         $json = str_replace('"', '¿?¿', $json);
         $json = strip_tags(stripcslashes($json));
         $json = str_replace('"', "'", $json);
         $json = str_replace('¿?¿', '"', $json);
-
         $json = json_decode($json);
 
         $event = $this->getEvent();
         $source = $event->getSource();
         $nick = $event->getNick();
-        if (!empty($json->webDefinitions)){
-            $results = count($json->webDefinitions[0]->entries);
-            $more = $results > 1 ? ($results-1).' ' : NULL;
-            $lang_code = substr($this->lang, 0, 2);
-            $msg =
-                $nick . ': ' .
-                $json->webDefinitions[0]->entries[0]->terms[0]->text .
-                ' - You can find more '.$more.'results at '.
-                'http://www.google.com/dictionary?aq=f&langpair='.
-                $lang_code.'%7C'.$lang_code.'&q='.$query.'&hl='.$lang_code;
+        if (!empty($json->webDefinitions)) {
+            $results = 0;
+            foreach ($json->primaries[0]->entries as $entry) {
+                if ($entry->type == 'meaning') {
+                    $results++;
+                    if (empty($text)) {
+                        foreach ($entry->terms as $term) {
+                            if ($term->type == 'text') {
+                                $text = trim($term->text);
+                            }
+                        }
+                    }
+                }
+            }
+            $more = $results > 1 ? ($results - 1) . ' ' : '';
+            $lang_code = substr($lang, 0, 2);
+            $msg = $nick . ': ' . $text
+                 . ' - You can find ' . $more . 'more results at '
+                 . 'http://www.google.com/dictionary'
+                 . '?aq=f'
+                 . '&langpair=' . $lang_code . '%7C' . $lang_code
+                 . '&q=' . $query
+                 . '&hl=' . $lang_code;
             $this->doPrivmsg($source, $msg);
-        }else{
-            if ($this->lang != 'en'){
-               $temp = $this->lang;
-               $this->lang = 'en';
+        } else {
+            if ($lang != 'en'){
+               $lang = 'en';
                $this->onCommandDefine($query);
-               $this->lang = $temp;
-            }else{
+            } else {
                $msg = $nick . ': No results for this query.';
                $this->doPrivmsg($source, $msg);
             }
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Handler.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Handler.php
index b2ef089b44..13d2eac8fe 100755
--- a/plugins/Irc/extlib/phergie/Phergie/Plugin/Handler.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Handler.php
@@ -68,6 +68,14 @@ class Phergie_Plugin_Handler implements IteratorAggregate, Countable
      */
     protected $events;
 
+    /**
+     * Iterator used for selectively proxying method calls to contained
+     * plugins
+     *
+     * @var Iterator
+     */
+    protected $iterator;
+
     /**
      * Constructor to initialize class properties and add the path for core
      * plugins.
@@ -328,7 +336,7 @@ class Phergie_Plugin_Handler implements IteratorAggregate, Countable
 
         $plugins = array();
         foreach ($names as $name) {
-            $plugins[$name] = $this->getPlugin($name);
+            $plugins[strtolower($name)] = $this->getPlugin($name);
         }
         return $plugins;
     }
@@ -416,26 +424,39 @@ class Phergie_Plugin_Handler implements IteratorAggregate, Countable
      */
     public function getIterator()
     {
-        return new ArrayIterator($this->plugins);
+        if (empty($this->iterator)) {
+            $this->iterator = new Phergie_Plugin_Iterator(
+                new ArrayIterator($this->plugins)
+            );
+        }
+        return $this->iterator;
     }
 
     /**
-     * Proxies method calls to all plugins containing the called method. An
-     * individual plugin may short-circuit this process by explicitly
-     * returning FALSE.
+     * Sets the iterator for all currently loaded plugin instances.
+     *
+     * @param Iterator $iterator Plugin iterator
+     *
+     * @return Phergie_Plugin_Handler Provides a fluent interface
+     */
+    public function setIterator(Iterator $iterator)
+    {
+        $this->iterator = $iterator;
+        return $this;
+    }
+
+    /**
+     * Proxies method calls to all plugins containing the called method.
      *
      * @param string $name Name of the method called
      * @param array  $args Arguments passed in the method call
      *
-     * @return bool FALSE if a plugin short-circuits processing by returning
-     *         FALSE, TRUE otherwise
+     * @return void
      */
     public function __call($name, array $args)
     {
-        foreach ($this->plugins as $plugin) {
-            if (call_user_func_array(array($plugin, $name), $args) === false) {
-                return false;
-            }
+        foreach ($this->getIterator() as $plugin) {
+            call_user_func_array(array($plugin, $name), $args);
         }
         return true;
     }
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Help.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Help.php
index 7cc8349571..4c2c49b314 100644
--- a/plugins/Irc/extlib/phergie/Phergie/Plugin/Help.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Help.php
@@ -28,26 +28,16 @@
  * @license  http://phergie.org/license New BSD License
  * @link     http://pear.phergie.org/package/Phergie_Plugin_Help
  * @uses     Phergie_Plugin_Command pear.phergie.org
- *
- * @pluginDesc Provides access to plugin help information
  */
 class Phergie_Plugin_Help extends Phergie_Plugin_Abstract
 {
-
     /**
-     * Holds the registry of help data indexed by plugin name
+     * Registry of help data indexed by plugin name
      *
      * @var array
      */
     protected $registry;
 
-    /**
-     * Whether the registry has been alpha sorted
-     *
-     * @var bool
-     */
-    protected $registry_sorted = false;
-
     /**
      * Checks for dependencies.
      *
@@ -56,143 +46,175 @@ class Phergie_Plugin_Help extends Phergie_Plugin_Abstract
     public function onLoad()
     {
         $this->getPluginHandler()->getPlugin('Command');
-        $this->register($this);
+    }
+
+    /**
+     * Creates a registry of plugin metadata on connect.
+     *
+     * @return void
+     */
+    public function onConnect()
+    {
+        $this->populateRegistry();
+    }
+
+    /**
+     * Creates a registry of plugin metadata.
+     *
+     * @return void
+     */
+    public function populateRegistry()
+    {
+        $this->registry = array();
+
+        foreach ($this->plugins as $plugin) {
+            $class = new ReflectionClass($plugin);
+            $pluginName = strtolower($plugin->getName());
+
+            // Parse the plugin description
+            $docblock = $class->getDocComment();
+            $annotations = $this->getAnnotations($docblock);
+            if (isset($annotations['pluginDesc'])) {
+                $pluginDesc = implode(' ', $annotations['pluginDesc']);
+            } else {
+                $pluginDesc = $this->parseShortDescription($docblock);
+            }
+            $this->registry[$pluginName] = array(
+                'desc' => $pluginDesc,
+                'cmds' => array()
+            );
+
+            // Parse command method descriptions
+            $methodPrefix = Phergie_Plugin_Command::METHOD_PREFIX;
+            $methodPrefixLength = strlen($methodPrefix);
+            foreach ($class->getMethods() as $method) {
+                if (strpos($method->getName(), $methodPrefix) !== 0) {
+                    continue;
+                }
+
+                $cmd = strtolower(substr($method->getName(), $methodPrefixLength));
+                $docblock = $method->getDocComment();
+                $annotations = $this->getAnnotations($docblock);
+
+                if (isset($annotations['pluginCmd'])) {
+                    $cmdDesc = implode(' ', $annotations['pluginCmd']);
+                } else {
+                    $cmdDesc = $this->parseShortDescription($docblock);
+                }
+
+                $cmdParams = array();
+                if (!empty($annotations['param'])) {
+                    foreach ($annotations['param'] as $param) {
+                        $match = null;
+                        if (preg_match('/\h+\$([^\h]+)\h+/', $param, $match)) {
+                            $cmdParams[] = $match[1];
+                        }
+                    }
+                }
+
+                $this->registry[$pluginName]['cmds'][$cmd] = array(
+                    'desc' => $cmdDesc,
+                    'params' => $cmdParams
+                );
+            }
+
+            if (empty($this->registry[$pluginName]['cmds'])) {
+                unset($this->registry[$pluginName]);
+            }
+        }
     }
 
     /**
      * Displays a list of plugins with help information available or
      * commands available for a specific plugin.
      *
-     * @param string $plugin Short name of the plugin for which commands
-     *        should be returned, else a list of plugins with help
-     *        information available is returned
+     * @param string $query Optional short name of a plugin for which commands
+     *        should be returned or a command; if unspecified, a list of
+     *        plugins with help information available is returned
      *
      * @return void
-     *
-     * @pluginCmd Show all active plugins with help available
-     * @pluginCmd [plugin] Shows commands line for a specific plugin
      */
-    public function onCommandHelp($plugin = null)
+    public function onCommandHelp($query = null)
     {
+        if ($query == 'refresh') {
+            $this->populateRegistry();
+        }
+
         $nick = $this->getEvent()->getNick();
+        $delay = $this->getConfig('help.delay', 2);
 
-        if (!$plugin) {
-            // protect from sorting the registry each time help is called
-            if (!$this->registry_sorted) {
-                asort($this->registry);
-                $this->registry_sorted = true;
-            }
+        // Handle requests for a plugin list
+        if (!$query) {
+            $msg = 'These plugins have help information available: '
+                 . implode(', ', array_keys($this->registry));
+            $this->doPrivmsg($nick, $msg);
+            return;
+        }
 
-            $msg = 'These plugins below have help information available.';
-            $this->doPrivMsg($nick, $msg);
+        // Handle requests for plugin information
+        $query = strtolower($query);
+        if (isset($this->registry[$query])
+            && empty($this->registry[$query]['cmds'][$query])) {
+            $msg = $query . ' - ' . $this->registry[$query]['desc'];
+            $this->doPrivmsg($nick, $msg);
 
-            foreach ($this->registry as $plugin => $data) {
-                $this->doPrivMsg($nick, "{$plugin} - {$data['desc']}");
-            }
-        } else {
-            if (isset($this->getPluginHandler()->{$plugin})
-                && isset($this->registry[strtolower($plugin)]['cmd'])
-            ) {
+            $msg = 'Available commands - '
+                 . implode(', ', array_keys($this->registry[$query]['cmds']));
+            $this->doPrivmsg($nick, $msg);
+
+            if ($this->getConfig('command.prefix')) {
                 $msg
-                    = 'The ' .
-                    $plugin .
-                    ' plugin exposes the commands shown below.';
-                $this->doPrivMsg($nick, $msg);
-                if ($this->getConfig('command.prefix')) {
-                    $msg
-                        = 'Note that these commands must be prefixed with "' .
-                        $this->getConfig('command.prefix') .
-                        '" (without quotes) when issued in a public channel.';
-                    $this->doPrivMsg($nick, $msg);
-                }
-
-                foreach ($this->registry[strtolower($plugin)]['cmd']
-                    as $cmd => $descs
-                ) {
-                    foreach ($descs as $desc) {
-                        $this->doPrivMsg($nick, "{$cmd} {$desc}");
-                    }
-                }
-
-            } else {
-                $this->doPrivMsg($nick, 'That plugin is not loaded.');
+                    = 'Note that these commands must be prefixed with "'
+                    . $this->getConfig('command.prefix')
+                    . '" (without quotes) when issued in a public channel.';
+                $this->doPrivmsg($nick, $msg);
             }
+
+            return;
+        }
+
+        // Handle requests for command information
+        foreach ($this->registry as $plugin => $data) {
+            if (empty($data['cmds'])) {
+                continue;
+            }
+
+            $result = preg_grep('/^' . $query . '$/i', array_keys($data['cmds']));
+            if (!$result) {
+                continue;
+            }
+
+            $cmd = $data['cmds'][array_shift($result)];
+            $msg = $query;
+            if (!empty($cmd['params'])) {
+                $msg .= ' [' . implode('] [', $cmd['params']) . ']';
+            }
+            $msg .= ' - ' . $cmd['desc'];
+            $this->doPrivmsg($nick, $msg);
         }
     }
 
     /**
-     * Sets the description for the plugin instance
+     * Parses and returns the short description from a docblock.
      *
-     * @param Phergie_Plugin_Abstract $plugin      plugin instance
-     * @param string                  $description plugin description
+     * @param string $docblock Docblock comment code
      *
-     * @return void
+     * @return string Short description (i.e. content from the start of the
+     *         docblock up to the first double-newline)
      */
-    public function setPluginDescription(
-        Phergie_Plugin_Abstract $plugin,
-        $description
-    ) {
-        $this->registry[strtolower($plugin->getName())]
-                ['desc'] = $description;
-    }
-
-    /**
-     * Sets the description for the command on the plugin instance
-     *
-     * @param Phergie_Plugin_Abstract $plugin      plugin instance
-     * @param string                  $command     from onCommand method
-     * @param string                  $description command description
-     *
-     * @return void
-     */
-    public function setCommandDescription(
-        Phergie_Plugin_Abstract $plugin,
-        $command,
-        array $description
-    ) {
-        $this->registry[strtolower($plugin->getName())]
-            ['cmd'][$command] = $description;
-    }
-
-    /**
-     * registers the plugin with the help plugin. this will parse the docblocks
-     * for specific annotations that this plugin will respond with when
-     * queried.
-     *
-     * @param Phergie_Plugin_Abstract $plugin plugin instance
-     *
-     * @return void
-     */
-    public function register(Phergie_Plugin_Abstract $plugin)
+    protected function parseShortDescription($docblock)
     {
-        $class = new ReflectionClass($plugin);
-
-        $annotations = self::parseAnnotations($class->getDocComment());
-        if (isset($annotations['pluginDesc'])) {
-            $this->setPluginDescription(
-                $plugin,
-                join(' ', $annotations['pluginDesc'])
-            );
-        }
-
-        foreach ($class->getMethods() as $method) {
-            if (strpos($method->getName(), 'onCommand') !== false) {
-                $annotations = self::parseAnnotations($method->getDocComment());
-                if (isset($annotations['pluginCmd'])) {
-                    $cmd = strtolower(substr($method->getName(), 9));
-                    $this->setCommandDescription(
-                        $plugin,
-                        $cmd,
-                        $annotations['pluginCmd']
-                    );
-                }
-            }
-        }
+        $desc = preg_replace(
+            array('#^\h*\*\h*#m', '#^/\*\*\h*\v+\h*#', '#(?:\r?\n){2,}.*#s', '#\s*\v+\s*#'),
+            array('', '', '', ' '),
+            $docblock
+        );
+        return $desc;
     }
 
     /**
-     * Taken from PHPUnit/Util/Test.php:243 and modified to fix an issue
-     * with tag content spanning multiple lines.
+     * Taken from PHPUnit/Util/Test.php and modified to fix an issue with
+     * tag content spanning multiple lines.
      *
      * PHPUnit
      *
@@ -232,7 +254,7 @@ class Phergie_Plugin_Help extends Phergie_Plugin_Abstract
      *
      * @return array
      */
-    protected static function parseAnnotations($docblock)
+    protected function getAnnotations($docblock)
     {
         $annotations = array();
 
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Http.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Http.php
index 43c69eb879..7c5c8704c2 100644
--- a/plugins/Irc/extlib/phergie/Phergie/Plugin/Http.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Http.php
@@ -184,7 +184,10 @@ class Phergie_Plugin_Http extends Phergie_Plugin_Abstract
             $type = $this->response->getHeaders('content-type');
             foreach ($this->handlers as $expr => $handler) {
                 if (preg_match('#^' . $expr . '$#i', $type)) {
-                    $body = call_user_func($handler, $body);
+                    $handled = call_user_func($handler, $body);
+                    if (!empty($handled)) {
+                        $body = $handled;
+                    }
                 }
             }
 
@@ -256,7 +259,7 @@ class Phergie_Plugin_Http extends Phergie_Plugin_Abstract
     public function post($url, array $query = array(),
         array $post = array(), array $context = array()
     ) {
-        if (!empty($params)) {
+        if (!empty($query)) {
             $url .= '?' . http_build_query($query);
         }
 
@@ -278,4 +281,4 @@ class Phergie_Plugin_Http extends Phergie_Plugin_Abstract
 
         return $this->request($url, $context);
     }
-}
+}
\ No newline at end of file
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Ideone.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Ideone.php
new file mode 100644
index 0000000000..3af88dda94
--- /dev/null
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Ideone.php
@@ -0,0 +1,180 @@
+<?php
+/**
+ * Phergie
+ *
+ * PHP version 5
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.
+ * It is also available through the world-wide-web at this URL:
+ * http://phergie.org/license
+ *
+ * @category  Phergie
+ * @package   Phergie_Plugin_Ideone
+ * @author    Phergie Development Team <team@phergie.org>
+ * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
+ * @license   http://phergie.org/license New BSD License
+ * @link      http://pear.phergie.org/package/Phergie_Plugin_Ideone
+ */
+
+/**
+ * Interfaces with ideone.com to execute code and return the result.
+ *
+ * @category Phergie
+ * @package  Phergie_Plugin_Ideone
+ * @author   Phergie Development Team <team@phergie.org>
+ * @license  http://phergie.org/license New BSD License
+ * @link     http://pear.phergie.org/package/Phergie_Plugin_Ideone
+ * @uses     Phergie_Plugin_Command pear.phergie.org
+ */
+class Phergie_Plugin_Ideone extends Phergie_Plugin_Abstract
+{
+    /**
+     * Checks for dependencies.
+     *
+     * @return void
+     */
+    public function onLoad()
+    {
+        $this->plugins->getPlugin('Command');
+    }
+
+    /**
+     * Checks a service response for an error, sends a notice to the event
+     * source if an error has occurred, and returns whether an error was found.
+     *
+     * @param array $result Associative array representing the service response
+     *
+     * @return boolean TRUE if an error is found, FALSE otherwise
+     */
+    protected function isError($result)
+    {
+        if ($result['error'] != 'OK') {
+            $this->doNotice($this->event->getNick(), 'ideone error: ' . $result['error']);
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * Executes a source code sequence in a specified language and returns
+     * the result.
+     *
+     * @param string $language Programming language the source code is in
+     * @param string $code     Source code to execute
+     *
+     * @return void
+     */
+    public function onCommandIdeone($language, $code)
+    {
+        $source = $this->event->getSource();
+        $nick = $this->event->getNick();
+
+        // Get authentication credentials
+        $user = $this->getConfig('ideone.user', 'test');
+        $pass = $this->getConfig('ideone.pass', 'test');
+
+        // Normalize the command parameters
+        $language = strtolower($language);
+
+        // Massage PHP code to allow for convenient shorthand
+        if ($language == 'php') {
+            if (!preg_match('/^<\?(?:php)?/', $code)) {
+                $code = '<?php ' . $code;
+            }
+            switch (substr($code, -1)) {
+                case '}':
+                case ';':
+                    break;
+                default:
+                    $code .= ';';
+                    break;
+            }
+        }
+
+        // Identify the language to use
+        $client = new SoapClient('http://ideone.com/api/1/service.wsdl');
+        $response = $client->getLanguages($user, $pass);
+        if ($this->isError($response)) {
+            return;
+        }
+        $languageLength = strlen($language);
+        foreach ($response['languages'] as $languageId => $languageName) {
+            if (strncasecmp($language, $languageName, $languageLength) == 0) {
+                break;
+            }
+        }
+
+        // Send the paste data
+        $response = $client->createSubmission(
+            $user,
+            $pass,
+            $code,
+            $languageId,
+            null, // string input - data from stdin
+            true, // boolean run - TRUE to execute the code
+            false // boolean private - FALSE to make the paste public
+        );
+        if ($this->isError($response)) {
+            return;
+        }
+        $link = $response['link'];
+
+        // Wait until the paste data is processed or the service fails
+        $attempts = $this->getConfig('ideone.attempts', 10);
+        foreach (range(1, $attempts) as $attempt) {
+            $response = $client->getSubmissionStatus($user, $pass, $link);
+            if ($this->isError($response)) {
+                return;
+            }
+            if ($response['status'] == 0) {
+                $result = $response['result'];
+                break;
+            } else {
+                $result = null;
+                sleep(1);
+            }
+        }
+        if ($result == null) {
+            $this->doNotice($nick, 'ideone error: Timed out');
+            return;
+        }
+        if ($result != 15) {
+            $this->doNotice($nick, 'ideone error: Status code ' . $result);
+            return;
+        }
+
+        // Get details for the created paste
+        $response = $client->getSubmissionDetails(
+            $user,
+            $pass,
+            $link,
+            false, // boolean withSource - FALSE to not return the source code
+            false, // boolean withInput - FALSE to not return stdin data
+            true,  // boolean withOutput - TRUE to include output
+            true,  // boolean withStderr - TRUE to return stderr data
+            false  // boolean withCmpinfo - TRUE to return compilation info
+        );
+        if ($this->isError($response)) {
+            return;
+        }
+
+        // Replace the output if it exceeds a specified maximum length
+        $outputLimit = $this->getConfig('ideone.output_limit', 100);
+        var_dump($response);
+        if ($outputLimit && strlen($response['output']) > $outputLimit) {
+            $response['output'] = 'Output is too long to post';
+        }
+
+        // Format the message
+        $msg = $this->getConfig('ideone.format', '%nick%: [ %link% ] %output%');
+        $response['nick'] = $nick;
+        $response['link'] = 'http://ideone.com/' . $link;
+        foreach ($response as $key => $value) {
+            $msg = str_replace('%' . $key . '%', $value, $msg);
+        }
+        $this->doPrivmsg($source, $msg);
+    }
+}
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Iterator.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Iterator.php
new file mode 100644
index 0000000000..5963300713
--- /dev/null
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Iterator.php
@@ -0,0 +1,126 @@
+<?php
+/**
+ * Phergie
+ *
+ * PHP version 5
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.
+ * It is also available through the world-wide-web at this URL:
+ * http://phergie.org/license
+ *
+ * @category  Phergie
+ * @package   Phergie
+ * @author    Phergie Development Team <team@phergie.org>
+ * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
+ * @license   http://phergie.org/license New BSD License
+ * @link      http://pear.phergie.org/package/Phergie
+ */
+
+/**
+ * Implements a filtering iterator for limiting executing of methods across
+ * a group of plugins.
+ *
+ * @category Phergie
+ * @package  Phergie
+ * @author   Phergie Development Team <team@phergie.org>
+ * @license  http://phergie.org/license New BSD License
+ * @link     http://pear.phergie.org/package/Phergie
+ */
+class Phergie_Plugin_Iterator extends FilterIterator
+{
+    /**
+     * List of short names of plugins to exclude when iterating
+     *
+     * @var array
+     */
+    protected $plugins = array();
+
+    /**
+     * List of method names where plugins with these methods will be
+     * excluded when iterating
+     *
+     * @var array
+     */
+    protected $methods = array();
+
+    /**
+     * Adds to a list of plugins to exclude when iterating.
+     *
+     * @param mixed $plugins String containing the short name of a single
+     *        plugin to exclude or an array of short names of multiple
+     *        plugins to exclude
+     *
+     * @return Phergie_Plugin_Iterator Provides a fluent interface
+     */
+    public function addPluginFilter($plugins)
+    {
+        if (is_array($plugins)) {
+            $this->plugins = array_unique(
+                array_merge($this->plugins, $plugins)
+            );
+        } else {
+            $this->plugins[] = $plugins;
+        }
+        return $this;
+    }
+
+    /**
+     * Adds to a list of method names where plugins defining these methods
+     * will be excluded when iterating.
+     *
+     * @param mixed $methods String containing the name of a single method
+     *        or an array containing the name of multiple methods
+     *
+     * @return Phergie_Plugin_Iterator Provides a fluent interface
+     */
+    public function addMethodFilter($methods)
+    {
+        if (is_array($methods)) {
+            $this->methods = array_merge($this->methods, $methods);
+        } else {
+            $this->methods[]= $methods;
+        }
+        return $this;
+    }
+
+    /**
+     * Clears any existing plugin and methods filters.
+     *
+     * @return Phergie_Plugin_Iterator Provides a fluent interface
+     */
+    public function clearFilters()
+    {
+        $this->plugins = array();
+        $this->methods = array();
+    }
+
+    /**
+     * Implements FilterIterator::accept().
+     *
+     * @return boolean TRUE to include the current item in those by returned
+     *         during iteration, FALSE otherwise
+     */
+    public function accept()
+    {
+        if (!$this->plugins && !$this->methods) {
+            return true;
+        }
+
+        $current = $this->current();
+
+        if (in_array($current->getName(), $this->plugins)) {
+            return false;
+        }
+
+        foreach ($this->methods as $method) {
+            if (method_exists($current, $method)) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+}
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Karma.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Karma.php
index b7ce48685a..f55f8d6edf 100644
--- a/plugins/Irc/extlib/phergie/Phergie/Plugin/Karma.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Karma.php
@@ -21,427 +21,407 @@
 
 /**
  * Handles requests for incrementation or decrementation of a maintained list
- * of counters for specified terms and antithrottling to prevent extreme
- * inflation or depression of counters by any single individual.
+ * of counters for specified terms.
  *
  * @category Phergie
  * @package  Phergie_Plugin_Karma
  * @author   Phergie Development Team <team@phergie.org>
  * @license  http://phergie.org/license New BSD License
  * @link     http://pear.phergie.org/package/Phergie_Plugin_Karma
+ * @uses     extension PDO
+ * @uses     extension pdo_sqlite
+ * @uses     Phergie_Plugin_Command pear.phergie.org
+ * @uses     Phergie_Plugin_Message pear.phergie.org
  */
 class Phergie_Plugin_Karma extends Phergie_Plugin_Abstract
 {
     /**
-     * Stores the SQLite object
+     * SQLite object
      *
      * @var resource
      */
     protected $db = null;
 
     /**
-     * Retains the last garbage collection date
-     *
-     * @var array
-     */
-    protected $lastGc = null;
-
-    /**
-     * Logs the karma usages and limits users to one karma change per word
-     * and per day
-     *
-     * @return void
-     */
-    protected $log = array();
-
-    /**
-     * Some fixed karma values, keys must be lowercase
-     *
-     * @var array
-     */
-    protected $fixedKarma;
-
-    /**
-     * A list of blacklisted values
-     *
-     * @var array
-     */
-    protected $karmaBlacklist;
-
-    /**
-     * Answers for correct assertions
-     */
-    protected $positiveAnswers;
-
-    /**
-     * Answers for incorrect assertions
-     */
-    protected $negativeAnswers;
-
-    /**
-     * Prepared PDO statements
+     * Prepared statement to add a new karma record
      *
      * @var PDOStatement
      */
     protected $insertKarma;
-    protected $updateKarma;
-    protected $fetchKarma;
-    protected $insertComment;
 
     /**
-     * Connects to the database containing karma ratings and initializes
-     * class properties.
+     * Prepared statement to update an existing karma record
+     *
+     * @var PDOStatement
+     */
+    protected $updateKarma;
+
+    /**
+     * Retrieves an existing karma record
+     *
+     * @var PDOStatement
+     */
+    protected $fetchKarma;
+
+    /**
+     * Retrieves an existing fixed karma record
+     *
+     * @var PDOStatement
+     */
+    protected $fetchFixedKarma;
+
+    /**
+     * Retrieves a positive answer for a karma comparison
+     *
+     * @var PDOStatement
+     */
+    protected $fetchPositiveAnswer;
+
+    /**
+     * Retrieves a negative answer for a karma comparison
+     *
+     * @var PDOStatement
+     */
+    protected $fetchNegativeAnswer;
+
+    /**
+     * Check for dependencies and initializes a database connection and
+     * prepared statements.
      *
      * @return void
      */
     public function onLoad()
     {
-        $this->db = null;
-        $this->lastGc = null;
-        $this->log = array();
+        $plugins = $this->getPluginHandler();
+        $plugins->getPlugin('Command');
+        $plugins->getPlugin('Message');
 
-        if(!defined('M_EULER')) {
-            define('M_EULER', '0.57721566490153286061');
-        }
-
-        $this->fixedKarma = array(
-            'phergie'      => '%s has karma of awesome',
-            'pi'           => '%s has karma of ' . M_PI,
-            'Î '            => '%s has karma of ' . M_PI,
-            'Ï€'            => '%s has karma of ' . M_PI,
-            'chucknorris'  => '%s has karma of Warning: Integer out of range',
-            'chuck norris' => '%s has karma of Warning: Integer out of range',
-            'c'            => '%s has karma of 299 792 458 m/s',
-            'e'            => '%s has karma of ' . M_E,
-            'euler'        => '%s has karma of ' . M_EULER,
-            'mole'         => '%s has karma of 6.02214e23 molecules',
-            'avogadro'     => '%s has karma of 6.02214e23 molecules',
-            'spoon'        => '%s has no karma. There is no spoon',
-            'mc^2'         => '%s has karma of E',
-            'mc2'          => '%s has karma of E',
-            'mc²'          => '%s has karma of E',
-            'i'            => '%s haz big karma',
-            'karma' => 'The karma law says that all living creatures are responsible for their karma - their actions and the effects of their actions. You should watch yours.'
-        );
-
-        $this->karmaBlacklist = array(
-            '*',
-            'all',
-            'everything'
-        );
-
-        $this->positiveAnswers = array(
-            'No kidding, %owner% totally kicks %owned%\'s ass !',
-            'True that.',
-            'I concur.',
-            'Yay, %owner% ftw !',
-            '%owner% is made of WIN!',
-            'Nothing can beat %owner%!',
-        );
-
-        $this->negativeAnswers = array(
-            'No sir, not at all.',
-            'You\'re wrong dude, %owner% wins.',
-            'I\'d say %owner% is better than %owned%.',
-            'You must be joking, %owner% ftw!',
-            '%owned% is made of LOSE!',
-            '%owned% = Epic Fail',
-        );
-
-        // Load or initialize the database
-        $class = new ReflectionClass(get_class($this));
-        $dir = dirname($class->getFileName() . '/' . $this->name);
-        $this->db = new PDO('sqlite:' . $dir . 'karma.db');
-
-        // Check to see if the table exists
-        $table = $this->db->query('
-            SELECT COUNT(*)
-            FROM sqlite_master
-            WHERE name = ' . $this->db->quote('karmas')
-        )->fetchColumn();
-
-        // Create database tables if necessary
-        if (!$table) {
-            $this->db->query('
-                CREATE TABLE karmas ( word VARCHAR ( 255 ), karma MEDIUMINT );
-                CREATE UNIQUE INDEX word ON karmas ( word );
-                CREATE INDEX karmaIndex ON karmas ( karma );
-                CREATE TABLE comments ( wordid INT , comment VARCHAR ( 255 ) );
-                CREATE INDEX wordidIndex ON comments ( wordid );
-                CREATE UNIQUE INDEX commentUnique ON comments ( comment );
-            ');
-        }
-
-        $this->insertKarma = $this->db->prepare('
-            INSERT INTO karmas (
-                word,
-                karma
-            )
-            VALUES (
-                :word,
-                :karma
-            )
-        ');
-
-        $this->insertComment = $this->db->prepare('
-            INSERT INTO comments (
-                wordid,
-                comment
-            )
-            VALUES (
-                :wordid,
-                :comment
-            )
-        ');
+        $file = dirname(__FILE__) . '/Karma/karma.db';
+        $this->db = new PDO('sqlite:' . $file);
 
         $this->fetchKarma = $this->db->prepare('
-            SELECT karma, ROWID id FROM karmas WHERE LOWER(word) = LOWER(:word) LIMIT 1
+            SELECT karma
+            FROM karmas
+            WHERE term = :term
+            LIMIT 1
+        ');
+
+        $this->insertKarma = $this->db->prepare('
+            INSERT INTO karmas (term, karma)
+            VALUES (:term, :karma)
         ');
 
         $this->updateKarma = $this->db->prepare('
-            UPDATE karmas SET karma = :karma WHERE LOWER(word) = LOWER(:word)
+            UPDATE karmas
+            SET karma = :karma
+            WHERE term = :term
+        ');
+
+        $this->fetchFixedKarma = $this->db->prepare('
+            SELECT karma
+            FROM fixed_karmas
+            WHERE term = :term
+            LIMIT 1
+        ');
+
+        $this->fetchPositiveAnswer = $this->db->prepare('
+            SELECT answer
+            FROM positive_answers
+            ORDER BY RANDOM()
+            LIMIT 1
+        ');
+
+        $this->fetchNegativeAnswer = $this->db->prepare('
+            SELECT answer
+            FROM negative_answers
+            ORDER BY RANDOM()
+            LIMIT 1
         ');
     }
 
     /**
-     * Checks for dependencies.
+     * Get the canonical form of a given term.
      *
-     * @return void
+     * In the canonical form all sequences of whitespace
+     * are replaced by a single space and all characters
+     * are lowercased.
+     *
+     * @param string $term Term for which a canonical form is required
+     *
+     * @return string Canonical term
      */
-    public static function onLoad()
+    protected function getCanonicalTerm($term)
     {
-    	if (!extension_loaded('PDO') || !extension_loaded('pdo_sqlite')) {
-            $this->fail('PDO and pdo_sqlite extensions must be installed');
-    	}
+        $canonicalTerm = strtolower(preg_replace('|\s+|', ' ', trim($term, '()')));
+        switch ($canonicalTerm) {
+            case 'me':
+                $canonicalTerm = strtolower($this->event->getNick());
+                break;
+            case 'all':
+            case '*':
+            case 'everything':
+                $canonicalTerm = 'everything';
+                break;
+        }
+        return $canonicalTerm;
     }
 
     /**
-     * Handles requests for incrementation, decrementation, or lookup of karma
-     * ratings sent via messages from users.
+     * Intercepts a message and processes any contained recognized commands.
      *
      * @return void
      */
     public function onPrivmsg()
     {
-        $source = $this->event->getSource();
-        $message = $this->event->getArgument(1);
-        $target = $this->event->getNick();
+        $message = $this->getEvent()->getText();
 
-        // Command prefix check
-        $prefix = preg_quote(trim($this->getConfig('command.prefix')));
-        $bot = preg_quote($this->getConfig('connections.nick'));
-        $exp = '(?:(?:' . $bot . '\s*[:,>]?\s+(?:' . $prefix . ')?)|(?:' . $prefix . '))';
+        $termPattern = '\S+?|\([^<>]+?\)+';
+        $actionPattern = '(?P<action>\+\+|--)';
 
-        // Karma status request
-        if (preg_match('#^' . $exp . 'karma\s+(.+)$#i', $message, $m)) {
-            // Return user's value if "me" is requested
-            if (strtolower($m[1]) === 'me') {
-                $m[1] = $target;
-            }
-            // Clean the term
-            $term = $this->doCleanWord($m[1]);
+        $modifyPattern = <<<REGEX
+		{^
+		(?J) # allow overwriting capture names
+		\s*  # ignore leading whitespace
 
-            // Check the blacklist
-            if (is_array($this->karmaBlacklist) && in_array($term, $this->karmaBlacklist)) {
-                $this->doNotice($target, $term . ' is blacklisted');
-                return;
-            }
+		(?:  # start with ++ or -- before the term
+            $actionPattern
+            (?P<term>$termPattern)
+		|   # follow the term with ++ or --
+            (?P<term>$termPattern)
+			$actionPattern # allow no whitespace between the term and the action
+		)
+		$}ix
+REGEX;
 
-            // Return fixed value if set
-            if (isset($this->fixedKarma[$term])) {
-                $this->doPrivmsg($source, $target . ': ' . sprintf($this->fixedKarma[$term], $m[1]) . '.');
-                return;
-            }
+        $versusPattern = <<<REGEX
+        {^
+        	(?P<term0>$termPattern)
+        		\s+(?P<method><|>)\s+
+        	(?P<term1>$termPattern)$#
+        $}ix
+REGEX;
 
-            // Return current karma or neutral if not set yet
-            $this->fetchKarma->execute(array(':word'=>$term));
-            $res = $this->fetchKarma->fetch(PDO::FETCH_ASSOC);
+        $match = null;
 
-            // Sanity check if someone if someone prefixed their conversation with karma
-            if (!$res && substr_count($term, ' ') > 1 && !(substr($m[1], 0, 1) === '(' && substr($m[1], -1) === ')')) {
-                return;
-            }
-
-            // Clean the raw term if it was contained within brackets
-            if (substr($m[1], 0, 1) === '(' && substr($m[1], -1) === ')') {
-                $m[1] = substr($m[1], 1, -1);
-            }
-
-            if ($res && $res['karma'] != 0) {
-                $this->doPrivmsg($source, $target . ': ' . $m[1] . ' has karma of ' . $res['karma'] . '.');
-            } else {
-                $this->doPrivmsg($source, $target . ': ' . $m[1] . ' has neutral karma.');
-            }
-        // Incrementation/decrementation request
-        } elseif (preg_match('{^' . $exp . '?(?:(\+{2,2}|-{2,2})(\S+?|\(.+?\)+)|(\S+?|\(.+?\)+)(\+{2,2}|-{2,2}))(?:\s+(.*))?$}ix', $message, $m)) {
-            if (!empty($m[4])) {
-                $m[1] = $m[4]; // Increment/Decrement
-                $m[2] = $m[3]; // Word
-            }
-            $m[3] = (isset($m[5]) ? $m[5] : null); // Comment
-            unset($m[4], $m[5]);
-            list(, $sign, $word, $comment) = array_pad($m, 4, null);
-
-            // Clean the word
-            $word = strtolower($this->doCleanWord($word));
-            if (empty($word)) {
-                return;
-            }
-
-            // Do nothing if the karma is fixed or blacklisted
-            if (isset($this->fixedKarma[$word]) ||
-                is_array($this->karmaBlacklist) && in_array($word, $this->karmaBlacklist)) {
-                return;
-            }
-
-            // Force a decrementation if someone tries to update his own karma
-            if ($word == strtolower($target) && $sign != '--' && !$this->fromAdmin(true)) {
-                $this->doNotice($target, 'Bad ' . $target . '! You can not modify your own Karma. Shame on you!');
-                $sign = '--';
-            }
-
-            // Antithrottling check
-            $host = $this->event->getHost();
-            $limit = $this->getConfig('karma.limit');
-            // This is waiting on the Acl plugin from Elazar, being bypassed for now
-            //if ($limit > 0 && !$this->fromAdmin()) {
-            if ($limit > 0) {
-                if (isset($this->log[$host][$word]) && $this->log[$host][$word] >= $limit) {
-                    // Three strikes, you're out, so lets decrement their karma for spammage
-                    if ($this->log[$host][$word] == ($limit+3)) {
-                        $this->doNotice($target, 'Bad ' . $target . '! Didn\'t I tell you that you reached your limit already?');
-                        $this->log[$host][$word] = $limit;
-                        $word = $target;
-                        $sign = '--';
-                    // Toss a notice to the user if they reached their limit
-                    } else {
-                        $this->doNotice($target, 'You have currently reached your limit in modifying ' . $word . ' for this day, please wait a bit.');
-                        $this->log[$host][$word]++;
-                        return;
-                    }
-                } else {
-                    if (isset($this->log[$host][$word])) {
-                        $this->log[$host][$word]++;
-                    } else {
-                        $this->log[$host][$word] = 1;
-                    }
-                }
-            }
-
-            // Get the current value then update or create entry
-            $this->fetchKarma->execute(array(':word'=>$word));
-            $res = $this->fetchKarma->fetch(PDO::FETCH_ASSOC);
-            if ($res) {
-                $karma = ($res['karma'] + ($sign == '++' ? 1 : -1));
-                $args = array(
-                    ':word' => $word,
-                    ':karma' => $karma
-                );
-                $this->updateKarma->execute($args);
-            } else {
-                $karma = ($sign == '++' ? '1' : '-1');
-                $args = array(
-                    ':word' => $word,
-                    ':karma' => $karma
-                );
-                $this->insertKarma->execute($args);
-                $this->fetchKarma->execute(array(':word'=>$word));
-                $res = $this->fetchKarma->fetch(PDO::FETCH_ASSOC);
-            }
-            $id = $res['id'];
-            // Add comment
-            $comment = preg_replace('{(?:^//(.*)|^#(.*)|^/\*(.*?)\*/$)}', '$1$2$3', $comment);
-            if (!empty($comment)) {
-                $this->insertComment->execute(array(':wordid' => $id, ':comment' => $comment));
-            }
-            // Perform garbage collection on the antithrottling log if needed
-            if (date('d') !== $this->lastGc) {
-                $this->doGc();
-            }
-        // Assertion request
-        } elseif (preg_match('#^' . $exp . '?([^><]+)(<|>)([^><]+)$#', $message, $m)) {
-            // Trim words
-            $word1 = strtolower($this->doCleanWord($m[1]));
-            $word2 = strtolower($this->doCleanWord($m[3]));
-            $operator = $m[2];
-
-            // Do nothing if the karma is fixed
-            if (isset($this->fixedKarma[$word1]) || isset($this->fixedKarma[$word2]) ||
-                empty($word1) || empty($word2)) {
-                return;
-            }
-
-            // Fetch first word
-            if ($word1 === '*' || $word1 === 'all' || $word1 === 'everything') {
-                $res = array('karma' => 0);
-                $word1 = 'everything';
-            } else {
-                $this->fetchKarma->execute(array(':word'=>$word1));
-                $res = $this->fetchKarma->fetch(PDO::FETCH_ASSOC);
-            }
-            // If it exists, fetch second word
-            if ($res) {
-                if ($word2 === '*' || $word2 === 'all' || $word2 === 'everything') {
-                    $res2 = array('karma' => 0);
-                    $word2 = 'everything';
-                } else {
-                    $this->fetchKarma->execute(array(':word'=>$word2));
-                    $res2 = $this->fetchKarma->fetch(PDO::FETCH_ASSOC);
-                }
-                // If it exists, compare and return value
-                if ($res2 && $res['karma'] != $res2['karma']) {
-                    $assertion = ($operator === '<' && $res['karma'] < $res2['karma']) || ($operator === '>' && $res['karma'] > $res2['karma']);
-                    // Switch arguments if they are in the wrong order
-                    if ($operator === '<') {
-                        $tmp = $word2;
-                        $word2 = $word1;
-                        $word1 = $tmp;
-                    }
-                    $this->doPrivmsg($source, $assertion ? $this->fetchPositiveAnswer($word1, $word2) : $this->fetchNegativeAnswer($word1, $word2));
-                    // If someone asserts that something is greater or lesser than everything, we increment/decrement that something at the same time
-                    if ($word2 === 'everything') {
-                        $this->event = clone$this->event;
-                        $this->event->setArguments(array($this->event->getArgument(0), '++'.$word1));
-                        $this->onPrivmsg();
-                    } elseif ($word1 === 'everything') {
-                        $this->event = clone$this->event;
-                        $this->event->setArguments(array($this->event->getArgument(0), '--'.$word2));
-                        $this->onPrivmsg();
-                    }
-                }
-            }
+        if (preg_match($modifyPattern, $message, $match)) {
+            $action = $match['action'];
+            $term = $this->getCanonicalTerm($match['term']);
+            $this->modifyKarma($term, $action);
+        } elseif (preg_match($versusPattern, $message, $match)) {
+            $term0 = trim($match['term0']);
+            $term1 = trim($match['term1']);
+            $method = $match['method'];
+            $this->compareKarma($term0, $term1, $method);
         }
     }
 
-    protected function fetchPositiveAnswer($owner, $owned)
-    {
-        return str_replace(array('%owner%','%owned%'), array($owner, $owned), $this->positiveAnswers[array_rand($this->positiveAnswers,1)]);
-    }
-
-    protected function fetchNegativeAnswer($owned, $owner)
-    {
-        return str_replace(array('%owner%','%owned%'), array($owner, $owned), $this->negativeAnswers[array_rand($this->negativeAnswers,1)]);
-    }
-
-    protected function doCleanWord($word)
-    {
-        $word = trim($word);
-        if (substr($word, 0, 1) === '(' && substr($word, -1) === ')') {
-            $word = trim(substr($word, 1, -1));
-        }
-        $word = preg_replace('#\s+#', ' ', strtolower(trim($word)));
-        return $word;
-    }
-
     /**
-     * Performs garbage collection on the antithrottling log.
+     * Get the karma rating for a given term.
+     *
+     * @param string $term Term for which the karma rating needs to be
+     *        retrieved
      *
      * @return void
      */
-    public function doGc()
+    public function onCommandKarma($term)
     {
-        unset($this->log);
-        $this->log = array();
-        $this->lastGc = date('d');
+        $source = $this->getEvent()->getSource();
+        $nick = $this->getEvent()->getNick();
+
+        if (empty($term)) {
+            return;
+        }
+
+        $canonicalTerm = $this->getCanonicalTerm($term);
+
+        $fixedKarma = $this->fetchFixedKarma($canonicalTerm);
+        if ($fixedKarma) {
+            $message = $nick . ': ' . $term . $fixedKarma . '.';
+            $this->doPrivmsg($source, $message);
+            return;
+        }
+
+        $karma = $this->fetchKarma($canonicalTerm);
+
+        $message = $nick . ': ';
+
+        if ($term == 'me') {
+            $message .= 'You have';
+        } else {
+            $message .= $term . ' has';
+        }
+
+        $message .= ' ';
+
+        if ($karma) {
+            $message .= 'karma of ' . $karma;
+        } else {
+            $message .= 'neutral karma';
+        }
+
+        $message .= '.';
+
+        $this->doPrivmsg($source, $message);
+    }
+
+    /**
+     * Resets the karma for a term to 0.
+     *
+     * @param string $term Term for which to reset the karma rating
+     *
+     * @return void
+     */
+    public function onCommandReincarnate($term)
+    {
+        $data = array(
+            ':term' => $term,
+            ':karma' => 0
+        );
+        $this->updateKarma->execute($data);
+    }
+
+    /**
+     * Compares the karma between two terms. Optionally increases/decreases
+     * the karma of either term.
+     *
+     * @param string $term0  First term
+     * @param string $term1  Second term
+     * @param string $method Comparison method (< or >)
+     *
+     * @return void
+     */
+    protected function compareKarma($term0, $term1, $method)
+    {
+        $event = $this->getEvent();
+        $nick = $event->getNick();
+        $source = $event->getSource();
+
+        $canonicalTerm0 = $this->getCanonicalTerm($term0);
+        $canonicalTerm1 = $this->getCanonicalTerm($term1);
+
+        $fixedKarma0 = $this->fetchFixedKarma($canonicalTerm0);
+        $fixedKarma1 = $this->fetchFixedKarma($canonicalTerm1);
+
+        if ($fixedKarma0
+            || $fixedKarma1
+            || empty($canonicalTerm0)
+            || empty($canonicalTerm1)
+        ) {
+            return;
+        }
+
+        if ($canonicalTerm0 == 'everything') {
+            $change = $method == '<' ? '++' : '--';
+            $this->modifyKarma($canonicalTerm1, $change);
+            $karma0 = 0;
+            $karma1 = $this->fetchKarma($canonicalTerm1);
+        } elseif ($canonicalTerm1 == 'everything') {
+            $change = $method == '<' ? '--' : '++';
+            $this->modifyKarma($canonicalTerm0, $change);
+            $karma0 = $this->fetchKarma($canonicalTerm1);
+            $karma1 = 0;
+        } else {
+            $karma0 = $this->fetchKarma($canonicalTerm0);
+            $karma1 = $this->fetchKarma($canonicalTerm1);
+        }
+
+        if (($method == '<'
+            && $karma0 < $karma1)
+            || ($method == '>'
+            && $karma0 > $karma1)) {
+            $replies = $this->fetchPositiveAnswer;
+        } else {
+            $replies = $this->fetchNegativeAnswer;
+        }
+        $replies->execute();
+        $reply = $replies->fetchColumn();
+
+        if (max($karma0, $karma1) == $karma1) {
+            list($canonicalTerm0, $canonicalTerm1) =
+                array($canonicalTerm1, $canonicalTerm0);
+        }
+
+        $message = str_replace(
+            array('%owner%','%owned%'),
+            array($canonicalTerm0, $canonicalTerm1),
+            $reply
+        );
+
+        $this->doPrivmsg($source, $message);
+    }
+
+    /**
+     * Modifes a term's karma.
+     *
+     * @param string $term   Term to modify
+     * @param string $action Karma action (either ++ or --)
+     *
+     * @return void
+     */
+    protected function modifyKarma($term, $action)
+    {
+        if (empty($term)) {
+            return;
+        }
+
+        $karma = $this->fetchKarma($term);
+        if ($karma !== false) {
+            $statement = $this->updateKarma;
+        } else {
+            $statement = $this->insertKarma;
+        }
+
+        $karma += ($action == '++') ? 1 : -1;
+
+        $args = array(
+            ':term'  => $term,
+            ':karma' => $karma
+        );
+        $statement->execute($args);
+    }
+
+    /**
+     * Returns the karma rating for a specified term for which the karma
+     * rating can be modified.
+     *
+     * @param string $term Term for which to fetch the corresponding karma
+     *        rating
+     *
+     * @return integer|boolean Integer value denoting the term's karma or
+     *         FALSE if there is the specified term has no associated karma
+     *         rating
+     */
+    protected function fetchKarma($term)
+    {
+        $this->fetchKarma->execute(array(':term' => $term));
+        $result = $this->fetchKarma->fetch(PDO::FETCH_ASSOC);
+
+        if ($result === false) {
+            return false;
+        }
+
+        return (int) $result['karma'];
+    }
+
+    /**
+     * Returns a phrase describing the karma rating for a specified term for
+     * which the karma rating is fixed.
+     *
+     * @param string $term Term for which to fetch the corresponding karma
+     *        rating
+     *
+     * @return string Phrase describing the karma rating, which may be append
+     *         to the term to form a complete response
+     */
+    protected function fetchFixedKarma($term)
+    {
+        $this->fetchFixedKarma->execute(array(':term' => $term));
+        $result = $this->fetchFixedKarma->fetch(PDO::FETCH_ASSOC);
+
+        if ($result === false) {
+            return false;
+        }
+
+        return $result['karma'];
     }
 }
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Message.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Message.php
new file mode 100644
index 0000000000..4dfbb30dee
--- /dev/null
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Message.php
@@ -0,0 +1,112 @@
+<?php
+/**
+ * Phergie
+ *
+ * PHP version 5
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.
+ * It is also available through the world-wide-web at this URL:
+ * http://phergie.org/license
+ *
+ * @category  Phergie
+ * @package   Phergie_Plugin_Message
+ * @author    Phergie Development Team <team@phergie.org>
+ * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
+ * @license   http://phergie.org/license New BSD License
+ * @link      http://pear.phergie.org/package/Phergie_Plugin_Message
+ */
+
+/**
+ * Generalized plugin providing utility methods for
+ * prefix and bot named based message extraction.
+ *
+ * @category Phergie
+ * @package  Phergie_Plugin_Message
+ * @author   Phergie Development Team <team@phergie.org>
+ * @license  http://phergie.org/license New BSD License
+ * @link     http://pear.phergie.org/package/Phergie_Plugin_Message
+ */
+class Phergie_Plugin_Message extends Phergie_Plugin_Abstract
+{
+
+    /**
+     * Check whether a message is specifically targeted at the bot.
+     * This is the case when the message starts with the bot's name
+     * followed by [,:>] or when it is a private message.
+     *
+     * @return boolean true when the message is specifically targeted at the bot,
+     *                 false otherwise.
+     */
+    public function isTargetedMessage()
+    {
+        $event = $this->getEvent();
+
+        $self = preg_quote($this->connection->getNick());
+
+        $targetPattern = <<<REGEX
+        {^
+        \s*{$self}\s*[:>,].* # expect the bots name, followed by a [:>,]
+        $}ix
+REGEX;
+
+        return !$event->isInChannel()
+            || preg_match($targetPattern, $event->getText()) > 0;
+    }
+
+    /**
+     * Allow for prefix and bot name aware extraction of a message
+     *
+     * @return string|bool $message The message, which is possibly targeted at the
+     *                              bot or false if a prefix requirement failed
+     */
+    public function getMessage()
+    {
+        $event = $this->getEvent();
+
+        $prefix = preg_quote($this->getConfig('command.prefix'));
+        $self = preg_quote($this->connection->getNick());
+        $message = $event->getText();
+
+        // $prefixPattern matches : Phergie, do command <parameters>
+        // where $prefix = 'do'   : do command <parameters>
+        //                        : Phergie, command <parameters>
+        $prefixPattern = <<<REGEX
+        {^
+        (?:
+        	\s*{$self}\s*[:>,]\s* # start with bot name
+			(?:{$prefix})?        # which is optionally followed by the prefix
+        |
+        	\s*{$prefix}          # or start with the prefix
+        )
+        \s*(.*)                   # always end with the message
+        $}ix
+REGEX;
+
+        // $noPrefixPattern matches : Phergie, command <parameters>
+        //                          : command <parameters>
+        $noPrefixPattern = <<<REGEX
+        {^
+        \s*(?:{$self}\s*[:>,]\s*)? # optionally start with the bot name
+        (.*?)                      # always end with the message
+        $}ix
+REGEX;
+
+        $pattern = $noPrefixPattern;
+
+        // If a prefix is set, force it as a requirement
+        if ($prefix && $event->isInChannel()) {
+            $pattern = $prefixPattern;
+        }
+
+        $match = null;
+
+        if (!preg_match($pattern, $message, $match)) {
+            return false;
+        }
+
+        return $match[1];
+    }
+}
\ No newline at end of file
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Ping.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Ping.php
index 29ac69f464..021670d97d 100755
--- a/plugins/Irc/extlib/phergie/Phergie/Plugin/Ping.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Ping.php
@@ -87,7 +87,7 @@ class Phergie_Plugin_Ping extends Phergie_Plugin_Abstract
     {
         $time = time();
         if (!empty($this->lastPing)) {
-            if ($time - $this->lastPing > $this->getConfig('ping.ping', 10)) {
+            if ($time - $this->lastPing > $this->getConfig('ping.ping', 20)) {
                 $this->doQuit();
             }
         } elseif (
@@ -112,7 +112,7 @@ class Phergie_Plugin_Ping extends Phergie_Plugin_Abstract
     /**
      * Set the last ping time
      * lastPing needs to be exposed for unit testing
-     * 
+     *
      * @param int|null $ping timestamp of last ping
      *
      * @return self
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Quit.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Quit.php
index cacd77d3f3..eca22a98e3 100755
--- a/plugins/Irc/extlib/phergie/Phergie/Plugin/Quit.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Quit.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Phergie 
+ * Phergie
  *
  * PHP version 5
  *
@@ -11,7 +11,7 @@
  * It is also available through the world-wide-web at this URL:
  * http://phergie.org/license
  *
- * @category  Phergie 
+ * @category  Phergie
  * @package   Phergie_Plugin_Quit
  * @author    Phergie Development Team <team@phergie.org>
  * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
@@ -22,14 +22,12 @@
 /**
  * Terminates the current connection upon command.
  *
- * @category Phergie 
+ * @category Phergie
  * @package  Phergie_Plugin_Quit
  * @author   Phergie Development Team <team@phergie.org>
  * @license  http://phergie.org/license New BSD License
  * @link     http://pear.phergie.org/package/Phergie_Plugin_Quit
  * @uses     Phergie_Plugin_Command pear.phergie.org
- *
- * @pluginDesc Terminates the current connection upon command.
  */
 class Phergie_Plugin_Quit extends Phergie_Plugin_Abstract
 {
@@ -41,17 +39,13 @@ class Phergie_Plugin_Quit extends Phergie_Plugin_Abstract
     public function onLoad()
     {
         $this->getPluginHandler()->getPlugin('Command');
-        $help = $this->getPluginHandler()->getPlugin('Help');
-        $help->register($this);
     }
 
     /**
-     * Issues a quit command when a message is received requesting that the 
+     * Issues a quit command when a message is received requesting that the
      * bot terminate the current connection.
      *
      * @return void
-     *
-     * @pluginCmd terminates the connection
      */
     public function onCommandQuit()
     {
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Reload.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Reload.php
index a2d680d7aa..90e3adcd52 100755
--- a/plugins/Irc/extlib/phergie/Phergie/Plugin/Reload.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Reload.php
@@ -57,6 +57,7 @@ class Phergie_Plugin_Reload extends Phergie_Plugin_Abstract
         if (!$this->plugins->hasPlugin($plugin)) {
             echo 'DEBUG(Reload): ' . ucfirst($plugin) . ' is not loaded yet, loading', PHP_EOL;
             $this->plugins->getPlugin($plugin);
+            $this->plugins->command->populateMethodCache();
             return;
         }
 
@@ -79,7 +80,7 @@ class Phergie_Plugin_Reload extends Phergie_Plugin_Abstract
         }
 
         $contents = preg_replace(
-            array('/<\?(?:php)?/', '/class\s+' . $class . '/i'),
+            array('/^<\?(?:php)?/', '/class\s+' . $class . '/i'),
             array('', 'class ' . $newClass),
             $contents
         );
@@ -87,10 +88,16 @@ class Phergie_Plugin_Reload extends Phergie_Plugin_Abstract
 
         $instance = new $newClass;
         $instance->setName($plugin);
+        $instance->setEvent($this->event);
         $this->plugins
             ->removePlugin($plugin)
             ->addPlugin($instance);
 
+        $this->plugins->command->populateMethodCache();
+        if ($this->plugins->hasPlugin('Help')) {
+            $this->plugins->help->populateRegistry();
+        }
+
         echo 'DEBUG(Reload): Reloaded ', $class, ' to ', $newClass, PHP_EOL;
     }
 }
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Serve.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Serve.php
index 19ecb0c7e4..cdb8f7f919 100755
--- a/plugins/Irc/extlib/phergie/Phergie/Plugin/Serve.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Serve.php
@@ -113,20 +113,21 @@ class Phergie_Plugin_Serve extends Phergie_Plugin_Abstract
         $item = $this->getItem($database, $table, $match);
 
         // Reprocess the request for censorship if required
-        $attempts = 0;
-        while ($censor && $attempts < 3) {
+        if ($this->plugins->hasPlugin('Censor')) {
             $plugin = $this->plugins->getPlugin('Censor');
-            $clean = $plugin->cleanString($item->name);
-            if ($item->name != $clean) {
-                $attempts++;
-                $item = $this->getItem($database, $table, $match);
-            } else {
-                $censor = false;
+            $attempts = 0;
+            while ($censor && $attempts < 3) {
+                $clean = $plugin->cleanString($item->name);
+                if ($item->name != $clean) {
+                    $attempts++;
+                    $item = $this->getItem($database, $table, $match);
+                } else {
+                    $censor = false;
+                }
+            }
+            if ($censor && $attempts == 3) {
+                $this->doAction($this->event->getSource(), 'shrugs.');
             }
-        }
-
-        if ($censor && $attempts == 3) {
-            $this->doAction($this->event->getSource(), 'shrugs.');
         }
 
         // Derive the proper article for the item
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Tea.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Tea.php
new file mode 100644
index 0000000000..c6453566c7
--- /dev/null
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Tea.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ * Phergie
+ *
+ * PHP version 5
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.
+ * It is also available through the world-wide-web at this URL:
+ * http://phergie.org/license
+ *
+ * @category  Phergie
+ * @package   Phergie_Plugin_Tea
+ * @author    Phergie Development Team <team@phergie.org>
+ * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
+ * @license   http://phergie.org/license New BSD License
+ * @link      http://pear.phergie.org/package/Phergie_Plugin_Tea
+ */
+
+/**
+ * Processes requests to serve users tea.
+ *
+ * @category Phergie
+ * @package  Phergie_Plugin_Tea
+ * @author   Phergie Development Team <team@phergie.org>
+ * @license  http://phergie.org/license New BSD License
+ * @link     http://pear.phergie.org/package/Phergie_Plugin_Tea
+ * @uses     Phergie_Plugin_Command pear.phergie.org
+ * @uses     Phergie_Plugin_Serve pear.phergie.org
+ */
+class Phergie_Plugin_Tea extends Phergie_Plugin_Abstract
+{
+    /**
+     * Checks for dependencies.
+     *
+     * @return void
+     */
+    public function onLoad()
+    {
+        $plugins = $this->plugins;
+        $plugins->getPlugin('Command');
+        $plugins->getPlugin('Serve');
+    }
+
+    /**
+     * Processes requests to serve a user tea.
+     *
+     * @param string $request Request including the target and an optional
+     *        suggestion of what tea to serve
+     *
+     * @return void
+     */
+    public function onCommandTea($request)
+    {
+        $format = $this->getConfig(
+            'tea.format',
+            'serves %target% a cup of %item% tea.'
+        );
+
+        $this->plugins->getPlugin('Serve')->serve(
+            dirname(__FILE__) . '/Tea/tea.db',
+            'tea',
+            $format,
+            $request
+        );
+    }
+}
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Tea/db.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Tea/db.php
new file mode 100644
index 0000000000..21fe1950d1
--- /dev/null
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Tea/db.php
@@ -0,0 +1,49 @@
+<?php
+
+if (!defined('__DIR__')) {
+    define('__DIR__', dirname(__FILE__));
+}
+
+// Create database schema
+echo 'Creating database', PHP_EOL;
+$file = __DIR__ . '/tea.db';
+if (file_exists($file)) {
+    unlink($file);
+}
+$db = new PDO('sqlite:' . $file);
+$db->exec('CREATE TABLE tea (name VARCHAR(255), link VARCHAR(255))');
+$db->exec('CREATE UNIQUE INDEX tea_name ON tea (name)');
+$insert = $db->prepare('INSERT INTO tea (name, link) VALUES (:name, :link)');
+
+// Get raw teacuppa.com data set
+echo 'Downloading teacuppa.com data set', PHP_EOL;
+$file = __DIR__ . '/tea-list.html';
+if (!file_exists($file)) {
+    copy('http://www.teacuppa.com/tea-list.asp', $file);
+}
+$contents = file_get_contents($file);
+
+// Extract data from data set
+echo 'Processing teacuppa.com data', PHP_EOL;
+$contents = tidy_repair_string($contents);
+libxml_use_internal_errors(true);
+$doc = new DOMDocument;
+$doc->loadHTML($contents);
+libxml_clear_errors();
+$xpath = new DOMXPath($doc);
+$teas = $xpath->query('//p[@class="page_title"]/following-sibling::table//a');
+$db->beginTransaction();
+foreach ($teas as $tea) {
+    $name = preg_replace(
+        array('/\s*\v+\s*/', '/\s+tea\s*$/i'),
+        array(' ', ''),
+        $tea->textContent
+    );
+    $link = 'http://teacuppa.com/' . $tea->getAttribute('href');
+    $insert->execute(array($name, $link));
+}
+$db->commit();
+
+// Clean up
+echo 'Cleaning up', PHP_EOL;
+unlink($file);
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/TheFuckingWeather.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/TheFuckingWeather.php
index e8a02860b2..8559426b61 100644
--- a/plugins/Irc/extlib/phergie/Phergie/Plugin/TheFuckingWeather.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/TheFuckingWeather.php
@@ -31,9 +31,6 @@
  * @link     http://thefuckingweather.com
  * @uses     Phergie_Plugin_Command pear.phergie.org
  * @uses     Phergie_Plugin_Http pear.phergie.org
- *
- * @pluginDesc Detects and responds to requests for current weather 
- *             conditions in a particular location.
  */
 
 class Phergie_Plugin_TheFuckingWeather extends Phergie_Plugin_Abstract
@@ -71,8 +68,6 @@ class Phergie_Plugin_TheFuckingWeather extends Phergie_Plugin_Abstract
      *
      * @return void
      * @todo Implement use of URL shortening here
-     * @pluginCmd [location] Detects and responds to requests for current 
-     *            weather conditions in a particular location.
      */
     public function onCommandThefuckingweather($location)
     {
@@ -92,7 +87,6 @@ class Phergie_Plugin_TheFuckingWeather extends Phergie_Plugin_Abstract
     * @param string $location Location term
     *
     * @return void
-    * @pluginCmd [location] Alias for thefuckingweather command.
     */
     public function onCommandTfw($location)
     {
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Tld.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Tld.php
index 21993f73c5..d7d64a4717 100644
--- a/plugins/Irc/extlib/phergie/Phergie/Plugin/Tld.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Tld.php
@@ -31,31 +31,32 @@
  * @link     http://pear.phergie.org/package/Phergie_Plugin_Tld
  * @uses     extension PDO
  * @uses     extension pdo_sqlite
- *
- * @pluginDesc Provides information for a top level domain.
  */
 class Phergie_Plugin_Tld extends Phergie_Plugin_Abstract
 {
     /**
-     * connection to the database
+     * Connection to the database
+     *
      * @var PDO
      */
     protected $db;
 
     /**
-     * Prepared statement for selecting a single tld
+     * Prepared statement for selecting a single TLD
+     *
      * @var PDOStatement
      */
     protected $select;
 
     /**
-     * Prepared statement for selecting all tlds
+     * Prepared statement for selecting all TLDs
+     *
      * @var PDOStatement
      */
     protected $selectAll;
 
     /**
-     * Checks for dependencies, sets up database and hard coded values
+     * Checks for dependencies and sets up the database and hard-coded values.
      *
      * @return void
      */
@@ -65,9 +66,6 @@ class Phergie_Plugin_Tld extends Phergie_Plugin_Abstract
             $this->fail('PDO and pdo_sqlite extensions must be installed');
         }
 
-        $help = $this->getPluginHandler()->getPlugin('Help');
-        $help->register($this);
-
         $dbFile = dirname(__FILE__) . '/Tld/tld.db';
         try {
             $this->db = new PDO('sqlite:' . $dbFile);
@@ -93,8 +91,6 @@ class Phergie_Plugin_Tld extends Phergie_Plugin_Abstract
      * @param string $tld tld to process
      *
      * @return null
-     *
-     * @pluginCmd .[tld] request details about the tld
      */
     public function onCommandTld($tld)
     {
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Tld/db.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Tld/db.php
index 364d9a09f86b340b0610cf1e5fd135d92105840f..28f963ad108b859cda1911ab57744c2224516c4d 100644
GIT binary patch
literal 1740
zcmZuyZExC05dO}uSXD?~SAf$>{X#C}xP+>a(xjqXbW*QpE#3iExAwZb>i})|?>Dn+
zf^!NI$ewv-=9yQ1yR0{Luh*B$k4gi(V2RgqB$vr~ucuawuTYx9PC4&*3rbV=tH<zz
zVt?K{1Z%XcV9UN--}A)%(8|L&VIwA$twaet&p+PW&hk7(S(1_F=nUiZe>7nC6g#-R
zn$M<-8Cy*MxScU%!*~!=M0$Ie&aXaA=luOyIyfozHN38o;0mj1uS|6UeE5(C)3k?q
zB9q|+c2Mw0Bqd6!a$r4j3fkI2EiCXz@aFF8Y`$POcZ>VT4`~gUM+yVh2^T{=OmF|3
zePw(cK;wuSzknqnVqq!|m3J636nzaoKgwbSl8yKEILo%%?MR7AjEr4p(v$+pX4V*=
z$z_)G$eUKnU8(cNL9Wm(HbLiLt+9@K+W<oP(iCmeuJ1ozo1!T(dXx_*+6eh+@%fhb
zj}*|Pby{c;_UJ88?_@*tg|%YeQZ7uHu!{*xu1r~iEtJqnY+ItLm5I6=e6ppW9vzhx
z_^7)Bzcu#Xqa0I?@_V}$mHPR@2xJqLGuaeDbBab|c#J01qmqr#Zorm%7Br!1{ar2m
z=2VrxzThj4y(y?*)@&)e2pUep(DEe9y!}Q+qAu{?3oRVFeM9{juB~b6H|ck3FlGp%
z*f4HIwFZ7RV8J1l8mcu09kO>R6OQ5JN!T4%j4%|FVh<;{RV8l$=V5^Rv=JA~dFzcf
zTd-Vvs}O_+!%4AGTHYCKPiuRY4ksRV{wmJefF+|OMRK%TeHzU+)+?s((6mBV4?;H(
zE$BWd=fGo$PFv=_5vlLbS0ecC=qW_!wS`BI2L{?fdtP2Md_ArAFVl*?g1Ln?>@Z^T
zi~qwf$8*4~egyf14_K$dgG~Q+Z&3rgLN`u5g5IMby^NbqKImd00Q>jkO^Ys}T!MAX
ztO6L-egjXgscU2X|BVsygkS8fkdMlN9KG$Q2Zfg>xW}JvJ&-J3n{|#CM~ecmlavB>
zD#3~A)UE9rx#)_~yeU@7I**G^gU~f;Z4R;DQh0&zu&sG1>eHFULxaZy&w=v$Ttb0u
zZ}*SFb=I3+=|g`SVY#UFr>h)QI99EWF6494LD^v!F&)7(vc1)@UhQR$7rXITAj$(X
HJM{hoI8Ffi

literal 47104
zcmeHw3v?UTdFDLC*p4l~WZ72y8by&rNF*g$*3*_`5Clnx1W6H)WJ$4|0Wbtd1TfG%
zD1(mU%nZ_|Y0`GPZBLryv`yk9wOc!G8*l9-ZPHbmZM$99**)7Ro3_z5P1Bw>yX`*O
z)9r3|zyHn*Fqe9m4^Zl!V;pHn&g0IVd;j<S=0ontsBUY@lwnp?TiGeB5=2pWR8a&$
z8WQ-Ah(GCn^ojo-?Yrd9)z~Y_&kFeW*5|DecxwdOBk-(v-Cb+eh^}U<g^FfZO86(G
zCez7$TFEE-N7D*+DBW*Y!Vmp*EIFAPPEK||xINL+KG3LZmp)R`tfHycZQZD~PuR69
z!7fd7p)XtIw^5J!<bRa^PX1f@ujTK{e=7g6d|v+d^6$%Em%l21QT~GblKhMEr{qt_
zKO_Hy{2{q1zfXQjHsy*uCBH{LDd*)ed06h3ACY&<+vP3tyX5=jyXD*En}Vj>5B%0|
zZ;ik|%Ms{p_M=}t&Ar%eZEnMMOLHT(iRRtdb~kUrcC-IJY&ZFJY&ZHPY~SS{!*+w8
z#`c~59&Fe9J=iM#1K2*`--hk|zJ%?4o{8<fUIE*Cyd1Xg@W{ii^XQIudt0%+%ex=j
zJH0!wUF+S5?HwLA!W!4Y_I7s)+uPj7u)WnijO{J%L2Pe!d$C>Z-iPf??ycC~=&r){
z?G83Kl(D(~I5yV}WAiq;Sr^@F)xFrrtI0R77J3BPmruy6q@R=~r8~qw75{}eCEg``
zUHEAnYJJM9yKdX)?o!R7;nZxi(OWc1TGA|QHCwN#*~xS&lTx~~dQG=%&D0I0q$!hH
zMJ>YgXqJ+GitRNut0!etH50p)Obz>L><qP{G?bK6v5myGn^xVnaY#MG-KS>b#<pHm
zvxaReYOSOsEz2nCs;yb$H&V~KRD-{wY*f@iwdhnzD!PJy=^8pat(v;3lvL$tO`p|F
zOJ_%uWy8W_OdHCWW*gbJQ-h*fi#Lb^)0$bqtt};qXRcH<D{8}TD8`hMpVsK|i_S{i
zfCqY5t;SnRnpLf)tHB6pwvxlMXm(@#`ruJ2+_{y4igVKyt!SG@O)s+NpFoc>Y8cF_
zgMBKQc=XJ%rwvm_hkBLdNP1%Xb+~s%)w%X+We43?hYSor4gIjG_sMYYBX7eMs#@l+
zu=TQ|vitU{X2B_`M~8DsC0Cp_j0#<y)k=C%uW1LnaJ8mRaaT{3r||&jZY>ZGlMUCr
zp3|IW^7U0+Yaehks%9Ei9S>xfS}CcUy|$^=u*0+!y;gE8$X_sGS|mjD_-cjCb6&$p
z%^Mc9S5qBZKjUahcP^7pDw(mAax|Ar<YXH1)haG&%QYs})*xf1T2Rte-6S!)s9A`2
z*{P_uf#+$Ddv|^^ndp`<4Exklyv<~-WSFKJ{!qf^o)+o$kE=!QRI8}fEb`eIizE(G
zb=ELv@T@_oPDfIhH_cSKlPP7usH%F6x`RPB8;RmJLrGCc!6xjuZel<z3#ZO&HbMG-
zi*QJgUzXo1_eg&z{jBt~l$7oj|E+jb_+P>s!UqKvhcEY0?!{9k3e)kf_p8$;I@6CB
zW;8Xv@gAJ9v%m>czf&ob5(eGX%)b7i!FS*^r@%=~zhln8uqcD7WelW8hce0l9;3|U
z9CAOT)ijePyfr46+U|8U>;-Nr`?X40cd7$pIi)|X%+8(Nrdox{iMwgo*A=)K>Q`&!
z3XFv{9hXy5G-XpXUomBCpRVMzqKPODPi1TNUDWh=p}-G|Sx`%c#p@jD677xOE?qQg
zMiok)oSIT~(_(Wtpv`I(qfWYdkr-NJ%Ixtw>8@P`mAk89!Emq^hBb3eD;u*I($H$z
zdV?NHk7TOIM9PGI9L;A^i4AKpmfO_1czek?4IS1`t2G!dQyt6gy#ptmP@m#XB8d$J
z*E;usz+$rPj9Rx$tqku_E8n{YSFTsja#xy8LCvM}$;pRr$I&NMhdWAYuU2%mPjw=Z
zPnN38;Xpx2C%RQ<AeqSDMniFnYF~7<u8w6=eaSq8hCC1K?lH|gt5$5MR<;xe-R{?H
zQ`ZVsS+lfC#VSs#Q?^p=EA$PI-Ab0JOSN>hWtk?_T5l3N*a)*<Cg9DcFnOW<u^R)1
z%?^y4WwL=mKS%9S--EZ{5wohrbrOydro5)))T*H-bJ1f)nmu;&s<nw{RI?5Zn=)05
zhf}m2QyZ^C7Xk}dfn$dKM=KSW%GgQtcZr<!ln%3D)zzYA1^RzLkiRDXl$?_{zyf?+
z+AIE}_;t|}C&c@O|0aA*IB*&DcUNttaW;ya$feYpT2k3o$Ah#6I(&rS`D4~Hm4Ug$
z-{iD3SS?(wYqgrD)D6c}V7K75Av0vyG!lQS-6Tw3I+N(xf^ke1I5~yR>vLKt=j06G
zp@Mx|5;*%np%EW-98pcj!XUz`8i+KCwn8(sy&LCd3Y>`c8@6>8ot)QpxOe+zcEv2$
zy5Y=1&;mn#bSyKL&gYdeJTBbJwp{-vTv07>qS`<0%yX438wVLD<>FoE&W&heyue8k
z%&=NjEec6e211pxMq_~3L<x^P{4QMdWPyw3`b~9Cub^?7iXqLyq)?>Pn!}o*;1o-*
zs2gbJ69q2f>NhI-tga>zWFan7>Z++KS_M|yQcV+mU=d-3nqy9^sGs|_8ii%p#e6ve
zF$FUaHnZ=Y=-;UV7lQShPEFI50h%pKt*F(*YC*+NG21+2RM9&+VPrineYU{GTm70@
zMbr{0Qsh43hIdpgkjOFPRjumfK%@E;G?p%K0a;Gf5i`MfV>~NbwJ~NOB(*HPT+>R2
z9>DqK!f8$f5bD*&r(hQ#&TuaZxfJ|>SX^w)`|e-0X2+g_K8JB6YtW0388)eic%<L4
z5Mo)@nC9f*Y<e)1#lHRb;f9YFxCjrv6UI!Z5CQglEHn*lus6443H~yO|4$0?D{@-;
z8|fp`xFn0ui8JC(;lB%?7Hr|<Wpw{dci+8t)tY<O!wQB^K@v+rzgp?tgZ`$9oajJA
zjcNgwJvH8zwp?GbFV{D=n?y}6a)OYWh8v>|thACW!ev*Pj^_|W*D%O|*jMWgMMzQb
z6a-8Mcj5M0krR%TioO{}E&6$hSy8%E$t*&e#O{Z1{m~*P59mongJ)6LFYupXY7rP7
zwllG3C$2kQoQcat$}kYqu?R1UE}^aMeas3y{vZv&`XV>MDFYf>+MJm+5Zq<PCVGea
zF>pv>Y{zcT_k>Yt*jjPA#=_n~7{#ZQVZ*6U8xBOT-+;h24(~v}o+)xMT<)xH!_$+`
z&K=L>Q^PE^!CnNB>5>!V8VHFdG5ko&rlTQ#WINhYi(Iq^gIYGm$0qW4GW-^(7kS^h
zK}r<6mAZ`?l_D1fG7*OBN=^liaZ;;0g^FH`qW|DHI|ykY3BOpQ5b%$uC>~AZ`sfy`
zi(J&l`qjf8aX_mYMbi5so-MdhXg1mGvIpo5BsA=Pa&olROO2+ATm+wjd?Vr>(I~(w
zC!$#nq~y}a*lbVOjUJ`6t*{Mtk_kpkA2f58EJ&tj)tU#M#U!-CkQ9s{CQG4PIq;NW
zhKSS`!2t#jYDi(L-57*bpmbZQBh|r>kpAB)3<&Z$c}7;GZ%Uq&mo`X(_=fmN(Z*W9
z1>sjw1sJ%Jx{nXj<9BIX(4B_wK;+r7JdtcNFO-_r5Z|I-6VnY#F9s2Azi!lnKkpgB
z^KH<O<wXf#OXk!{&mcrBsc~bSE;<OJO$zPOC_&(7I+ak!d_0iG*_%sTY>=!_0IH_a
zlbKxp%m8&hQ{t=<(kTR$6oy4YFoCFm!aBIMNVmybVcg;KimH-TOR%#I{3KfqFN0Lr
zHW0<pHjnI#%)XL5<LEVGYYKfjRN@R!bVme>16e2vlq2vyz5O^jRpPA1fL5!j=F9*R
zV#)}^Kz7hDooZhar>9Gt^BFj;!>`$T^fOWr8ld%$;{2^8Zt8~MDb-qIAWb5#4Q)Gw
zQ-+G%5T@o}R9b_RI@yO)dz868tFPW?^c=(m$s!kFr5bg(>}cphv&i=44g?y>We}-p
z6H-j07U;nIzuQkeFa96ZDRe0fJ%TQrEplO4N~IFHW};?QKKBBPP{yLlQwev1gMx|_
z)pMUa_X=EdcXBM5N@N~JLr)jEG$e%_C56FBMnj(o3KEcw2F<u~*swI*O()qvJt@4&
zvHkR*Yl>XJm7*GsGKt%^H02WBEZBwiqqazxQsn87iafk;)!GNtqG8lq>H-%M<O8!P
z0EAUCWJeaHt91y0<mhNBi2n}?@^kX6ya5%!uS!259hO#!UldE?KH+}|uM0mTP?hnL
zpJT__Bb7O8I%H~;0FVc6J<}yjG6J!vbV8v4JPXU;#`2S?#O`Al^`m7je}?Q(L1qLN
zu4Gin@tCvtJFI-bCS$(dbrjd_C}S|%g`6P-bv3q$<UW<hS;iDM4}+*K6}99bi9Fd4
zCD@Tb5iNtb1s-Q!ohgw+BM(n;W@At_4V)IZ^TBaQl!F<n<R@vAZkgf~KC2f|kkXJk
z_9%l|iLy654T3rf3yrD4TsG=%tloeYTZUoy2s+T1;ta!}TA3lA9rXd#ShYe4zm>S?
zP`eH>FoBlNOmQ}2P(Q8H4DuR_Xcv(>3XDpa<!16Id<0HuV4StW1u27ijk<#$NPMT!
zd#+L$lYmw_*f)k&(i*34X~%>(L$A;oqn188iNq<Y;`C>6epTbLr?fo{SAueB_%p~3
zLKhf>E~M?Pk-TpdZEV0YSxjnjlweP4r9RC%GD6dL17g?M@idZEQ&Ynq7f)4dSmHNQ
zx^X^KA<=UfcT8$r$aNf!0~HAv5EQ7@ctUY9LmjwB<D#l`xly;-hLY^oH0h9@DBSH%
zA012NoI0h==mwKT3TEOb2mXJ%ApfEKqWp|JAm1r{U-~!FtR$iW@Nv-*{-^M-glB~9
zk@}C6(er1^Tt++ur>3dB{ZL`mVF3nA=%-QK&m%(2rUx>~)-9t#JUiFeGlj;Em$}Iv
za@1<8gDj+{J&>Frln+Aq0~#(YmbqESX|`5H6ck-e{<(zo^O%b4mkeg>jQ5pjK#OI5
z#+h6XX@*&bp(Q11OFN8u>8uWq7wUFfcW68Vjfh_v?3sU+(mj+L%H=YNcNNk79c50S
zU^TU(mPzG$2gfJ#!^+TPqJXm=E_16O=`(mrR1Oe21*1Nc&Zl$9eJV~pRj$V+6i<t%
zN35@f@&LmLIYlmjRI5yKGGyYY^`5RZ54cBA7i@VC3}DO_wVyRCxVA-`_q|EmuI*Qj
z<OdK5Jec0TSLyCUtC4{Y^KO=iCdQwn3Fs<wDP8bDES!&d4oa4zq)r(|@lOkC_$;34
zH&6yZ%C6r31O{MZnX|A%DkYRd*<P6Q-p6q~RpxRw8gXWxkQbye7~x+EYBD|V#_7p2
zXUm540wQT7-8r>hpGMLZ>6x|X6wW?g=CpYT>m6#Oh%M>OHK5~FO9`WtzLU5xUFP(9
z$bk{Cv_=^FhfUxTl%qDE!1;U1TzWJJZwtZ1-~~5SCMu5A{TNQ%SDqKuG09G$q^equ
zrHt2*EU^6lX5qMiwf+yt2c`cb{hIW{(n0BM;>+TD#Ub%V;lJYG;y><M2V&)|MG)K;
zD+><Js8t$-Hd0Jh(L)>#sYJ(68J%OYftm;+A|!a$G)^xxP{Jg$7!@$c=-MQ_1uTeQ
z#uSJc4zs#o6pqotAgjbEV@|bz6~6Y`%scE=Ywy{Bs;CiGC0ex*qqg6|pgpd0GKt8J
z%VEM$JN*>O!dOcr?PsU#G;!^?&dDEUke!f4t-SrK($=R3&)}l0&Ix74GF7e8dXjKa
zkllwJ$=6A9Zqd1^&0u*47Ai7)h_0iG-vFh`wLt!8q$6kDlE^^ab{pu)QJo9p@LWNB
zk{KWcnwUr)RkHdFBAkjg!&V_@)S()#J3Gx8@L^QaRkIQEH^CmR7Cd2M9RfiQ!tB&=
zW+JhriiQqMa|V4_MG+gRIaUB|EZ-=D1G#OJ0|Udu6`b3c=B#JRG$0mgDme*-LChBZ
zT?<P?VLCj&T5)IwEtRLa86P$f%%j8!-%maxR=dnm$*!hTBp98PK8*&fX>QtwQ4om&
zFy=<G#Q|EFjP_Z>*?BgxF`}cHXQ#PP4!0;PBiOWlY3Dp~Tgt^3WF&f~(O9y~WnV*1
z1J)rXACTK%Ul9Lq66BwkpFsWZRq1D>C#9|8Ux~jWo)vcqe=EEw91%8kyQ|RXz8UU8
zAwve%XxR@aWEkR~aM^0=x*5)Rj_9V2LaiRJw&KEAXxpRYqXpg`Hf(v=b=|6B23iYW
zNtYH?XJ$A{i;`WzfR@IaW(#)Y!Y|G{lCH?w;Ee7_!z?%EV0UV?QbRW3;w!NV0qw7&
zPud|@KpW*5P6<b}T0>=<$T48TE?%r1p#o51@3Uy&#A(i9A6DyXjct%v2kW>keZ?&I
z^)Mf>_kGCrPMtOiR?DysJ4n}IP{|V(H3fgDC~#QmYQ18hB7t>zl~TQf&)}ZgX)a?q
zY?vjr)=Jaj9d3mRuqLdE{NQ_WefBgb1BbE1fZUarEQ(~AS=6juPve^0X>Onnqi+}c
zx9(tff<2@%hszQ=XAUx`a5XZBDWTnCle-%@<EYL>aG4@AgP9!VZ()(HMhh>&ex(BK
zs60jX^N`M2j|?OarF7(NwCWm_d|-6jMJsYyIorX?lm(AOr9$8mf;G0NhJ{#HMaT#o
zEmgF-GZWdwp|j{^S?5AH-0Tc5`hk^T(?kcNOgNQIC7zt6?rzk%N$aQ8J)~32^VF2_
zBIQPT&BSg15i;YbH`SF<Qk(gP=3+<y>Hkf_E&-^%L(<<$UzSv9o%oaD9^s#`?pMcw
zOMUjbx8k`@RJcJL)!}M&bpVw}bS4ZlQ4cXH2-sl7gSCny?k)60H&i%dmos%`RISaZ
zk=LN%zO*ooj?8-~)!gIWjP4vq9WIujjlxAv!(PK?>$PE{IE|HD2d10bzuR3+VpQRZ
ziNV^=sDs)HFV_<Y%}~ulvBr4Jy@?*<t_oM87}WsNF>1+Z4VS;XU(-zo^%u%y$QP4+
z3d6g&Yj$Oqp_!@xPQ{-`HIxa>s8_Vj7Hr~0Rq9b3kLht3s4#i5Z4FEMqe(J6VJID+
zA?ioEHmjo?!H_^~`L2<6-;SZNX1KE7h&rdvOb2$-V%RIH*-#Kf#r-Pm7wHH7ZlCy=
zdjlJ(8O|Z4)CSqCAjoBlHSyV|9#PMoHmWHmQLS3RgYNa{Vs?g0Mn{~ph#TV0fNyEU
zB|Ox#Go0*>K$%g8iD^FD0}%|zaT6?Y5&j6FRWLj#>}LQS8gt)9PbbfCmON}OHcPFU
zyXY1)Y;2J#$ZV@_7d4oi;ewJtBu8``i{F9R%<3Fu1QiylU-c+CKqOTBK~YM~b8^Z=
zNR~)HN&i<1NdY+Dcgwq_FGx>_|0I4&tcbhB>xC}?{gb?u0f_AzaPLF0-l^)9mOp~n
z$MQ!6xH_^Xz#s-9ap!syJok2&kVKg(=i0NXX-y-0kK_dA3n`1O1PiH$U4j-pQ{_B4
z>hNkAkP4L+1A4PVDCS)rIn_QnvBf0-(t#?MTLr_8UO->t1(}CjLKz*Ya&9e)6#}f+
zmQAA_;gc$~_wRJ?#%1GGF3ipvm69>b3m@%cb~M+Q?mOW!G|{>$XQa?7%)<~N3xHx_
zdW&c^*gJsa6i7*ECMD0j_$%oMLx{y+>v5N1hSpcnR=Z-FMOcTMF+p!<;;e)+dG7f#
z*1Hi8z{`a<$e(+@a_;#eudk?{Pv#RjcP&Zt>I$d)@DvC~185xu5J;x=h8k5DE+4zm
zqrk*8o^|h_R<#OO-XB$MU=Mhc8|-U)ahi^pj}Gljpnsud9MAw;u-Sm(>_~W8UQFo*
zj4ZLiCG66+3YYkdI!|c`MIEy|na<_YW6836JN0u{g^OeGzRk1)L#d9a4hpla(pa!2
z($>tlL2U1xr_{lEueQg%4gEO|v{GyuM-dPL3fgiC^M)ok8r1)G3i79c0Ny9xDE*0~
zOWnW#{J!`JWB`L=m+-rY19rwVe!ts`n>}9T7HqQGQ*et+=h$x<l%=v1s;Mw<R-go?
zsWpzdJv1h3s+`eAm0CTk2iwb<uxKujI|7-3qC6G1ahZ}E7@J7!bGM>br>dMx;Diz|
zzSaOl41iWgnV7Zvf(WyFU^sIuJxpMn#6fq<s&x+(tB$2P)s`8{27d-WqM#$og6qIf
zwij0VTmluPtDHP!RdN`*W3{|UpqO<3ce;cu>aB8;f!^8#Ph(YkTTS%31SU#VxmhK1
zf~5~E7i7mWk$eW_p@&?85*?{>t}W;V$s0faV}_&70K9A4?{o=0)LZ4E)WGNwY9Mz4
z!aRD=CA5%M<@_8lObB>Uv&Pv}ev0fg>?ZUSC>;Q)jA{`0neGNc&t<DdL2nH)W%mxE
zrNFDzTSWnA9-RjthJAn=gl><Pd}#f<njamwILHl)YD%d9bhlw=(ZCj$FhmCsEXDL9
zs}@y*9}L>%Y;_4Wbg0UCUJN%-<Uv@AXMqU{^ROY8U_ocATsoA6U8}0*<)e=t2K=!?
zFe${iK5gCS5@2XUm8%0m7WCXW20oiS>E2H&b5E5EnbBnp1sYmDLNcNZ;srh+T~0WF
zu~*dDcqkL^4NlWg8pGiVGvEyWcN?w$e^Ykx{?2XE??|7Meq5T6ZWMoA)WrjM$?uPZ
z&kFCo5&~eCOAEd^gByx*#CP-`vBpJM?9h&Hb`RjXJvA=G9MjG!Cp9Q`trY3a*vXwP
zt>=!{IQ<&a9W6RVISSc8p*X<M!|u?*^)4;mZmn_pFb1u3uzEWI)HHN|zq=pjJYM7F
z8a|+s#exr3?@0*J-*_zAG9n3gA1;2l#)%h{;;h=Z2<A89?!~#!*0@=QNsHbU$RTT-
zW_dyDnXt5p+$AWK5*UCg&ZwEu&>V61kWAcw068YvV@SnKn7Nj!(-KH*$rynYik2pV
zbb>!nQqK^1G#!9n_Pe{$!)lF-r^a-Kl?Z>}`Y<5oN>He`M#;b<E}^T`8W%@lNT!TR
z1a#v6VpgJ6=UD4L1k~6)HO&s|v!T(y-zD(W#u^uKu}<a2$KY#52i*s80+zVA@qjF)
zfDmVT5(JGbB)TH_&fT$U?T%eF0K&p9#Nc<7aiebOs1>BMs7=#ZkGR{}6T{TCL#Q!S
z60rCX{-{NE`VxU}&Sjvd)m2Ulvc?>(Ucmger>PYX6k*@mE3<4#4fq&T9S!ocCCG=i
z$?Zd@c2&8!i`*sPHfr_+IT_#~r`1xB|DO`%@5-K>lYT=wAl)E-U;L~%D&8ji2jNuA
z?=SXO$35J&W`~=C3BPzGQ+TTb0*Hky)LC)H6hMs#C^4`s!J&dS<q&iVmHRJM5Noa9
zlEIHom@tip-3*@n$vUU@vD|$~#i9`|2$5?9`h<4TD;xx--0KeG>JxR&3rwIC1tfkg
z`WZSpg<k+W?hcVsuB~&1Fi0XMpmSI<qKGp~(^^59VBuhcgD!!dv^r-zfbBzbt>>Vo
zlMD!n8djjvZRq0zF2h09ITtda&H!Yi)+R<E4?Ele++w88C14YPHR|;`k}hjvI0}IV
zA?GFLJ)Ut>^uTJJGZ_<V9WM%z9S>IYCdP&odiR1KtYdKGKuc2A3Scm7cc7o-%jP$5
z*$~;i-R(yQyc_GBxe1rV2>ZwY7J&mi_lp?+dC=QSWiH4s=`6%3rVTB}LXTNK_dM;Y
zQMN@deJOU7KU28_x>(t)w@bY}E@7~eb<S2zXr@C;3Iy6=Kr$88920qf`h@!^4dMpC
z@nZ&L0!ONx9Y+ojtlS3bADj?u5e39nI$8mLXglBG9)eBXh()$g4aZ~4ZKVG<3l9l+
zn|HJHN78GOFFhjuJt_c?i<^aS2tOv2aB$wI*QMpfl*Q$-Ibf@6Y}0lUp*!B}9>@86
zEY3FPv_=uwX^iHvR89ftk;39fT>}2-7FSh6?uC_xR<S7hli~_Oe22kAw5FPKkJ50i
zwz%QUsVLpDj1!KJ_vWNGEz^qI#Bwb<GpNSybO|#wZgN@6Bwhn3v4A}QwqAq_?RN<z
zRK+VAv6-EO^`ZF+K|e5hfMl5^)NEKr9h5`Z5-CNwlSe0A1|Pc7<kA2v<iWoLTeuf?
zEkFT*8HC<b?K*VTAwmki2*TPuIhGm7CHh@L4^@%p$9o2tB1EaxSUYc~a_r=$0jhkr
zhN@@{xC}UiVne(U%^{S|B8=Nkmyko_XSfMFg51Gmn<#)(x{vf?&J)TJV8T;<ic3hL
zM4j_+6G8aXpgeTq#IQ@?phlgWv<WytrwzWs^B_MA@_mwoc+D&Z5gKzxNvh;Jm#|I1
zL^x%&62rW(cOFzGlz4?Bz`-z`KldWgqiq16yUJy-B7pYdqlez1H^82<z&Whw_n^dI
zbn3cRYK8LSQ_--*1Jg~d$>HR<CsvSZIfg*a`U3se1o<m?m;ZL@Ytjd?{<ll~JMjzR
z88Iu~BYaNK=BfYU|2*Up(5Gy1xp}$*s8eND1#UNY45kW8)_n?liBugh`{<oZ0#7D!
zhN;b+aWxwMjK!%^4vWYz*U07Yyxj!^%VniLtumZ}V<#d_<K;L$!^kry7??Z?(5&vs
zaV#HYuuW`pOX&5G#Z7q*Wp==M15Z8y^g>auYh;>rt6{Bo3D~pM;v$b6ssOO%I0;kh
zn2)*y>(LP~$CL)S6Y{-<E@2*W3GP$2xDX{rwMVtm%4^BFYWmDHy{W7!0|3NP&=;Qd
zi2EM2pjz_+l^~I?8DYw%(2^V04hhmq89rYA$pPP+?Az=<iOcs`TsV@W2nP#|8c+kl
z@3vOi<PtDvm&L^$xe5xNGq7GG1kJ%}FJQy_TteuavN#Z8ZdS#M&sa?-%{<I{(a>s_
zNUaF2^DKbm@gc=cuv)LSLLzFT6)c6Wk?OP58#)ny-^sCbE^*vFMWVLW;v%6SiW|lp
z){t?xU!$c~^MqAK@9?5j%E9a9F?FN%QE>{cn{ZE3%hy?4xRis`st7hPXyGrBFt%+i
z#GB;-^ycyq#w-DciKQ&NbkHS85JFk*(a%zBO_5Z~2f#4IUKT{PAPV6~|5pRxD?cwE
zl^>9PUvjYi_bsdd9s~C0MPc^x*k3XOyIjJ|<ZMn7^Kbz0aAEm4_=~;IhqqNipY)JR
zc$p(MCx3ao?u)`28_WDf7zujXQ|=iW!24`Y@bWrv2)(1Qn_A00V%+&hj$1}HXHf*#
zfNo$h1r}u3t)o*7o0HYNF@sdZ2{oc^Y+(f00a*H09-?&9X|^$gVk7}-PT8C^=hf4C
z5OBvk6Aw2K8fxZ%OQ4!FHYa}hX%+9>)k^g9vf=@^-=5e5E<tLFHYaO&qim$qDgKq|
zOTUD6!mZF)ud^=|S~Gkj75?(jd0KTw9J~mRpLb^nbhrivqE!lv-fTmRLi3}yGi?QH
zuIx=5EP10`qMLY|C3r;>S%``uM-haiqi@1J&GgIW0#oD|B??5(J#U|To`v@KdGUfp
z$x-r%^+C47%5DnYc}fl>cDe-38MnF6l>{~DWr}DOqIVRmtX46#r*P#FcbYnKgT>|a
zxwG_cB_6J2qk}irqTT$;L(5Tz>k@glOl{s`aRE=RL50^~DJ5E34EJ3mvUqa~W{M%}
zSpB*ibzS!U|7u}Bt^XgF{z0;(yTv~dKZd&B^}@G>mjoS$F7xT}2n3UKxcCK+)?WJK
zUQ+CL3Gz~PIF;v4M`Bz<oH_2;l?Hk8aB(=k@V3Q$9~wE}a4H%$622HPMz8KrP%yH^
zCBVx8htq(gKpKL&f^9<xB$J&7U50LPxFGcC3=tV<T*9EVFr0Sjr290@$vrkV&v~^r
zM{#ry1tv5a(Zs;pM8__x!^ly)?Kv{>NtZw{Gd35!=2aa@N3gwY8?Xc2`Qy~a9+zM;
z$89d~$~$nY2!YAc20R?$>M>Ki5O#IKWk8vAHW&TC)76MBB|NjBmgg1Hp`S_&{xeAA
zE5X7Rs8=wQ4DacR?%A$&54dH#D20T&WdhP+u}3*OjTdN871B{lZzzcWRC3gKDI1m=
zt?3McL$?YVAY;J@L4Y8uAYegB0b?E_sA3B?q*7Qu1deJn)pyEe(3<;fE?6Vg)*4y8
zR6^M|jo0g8;jmPW$h{J)LR>~uV~@DobujQpZLX{wqzhPf#Vd;Bvn~;`_Eue+L@H@>
z@nIgT5c9$cdi+r2X>iyX!+n!|!+ivPJX=#(aEd!Qc#YmRHmi&hgw|WAvevqU{Qr%@
zdO`jz`K0t$@cy@f`QtI+zhLcO$8JGLdpF`qth1b&Gjf7?VU7yE0#2yHrG}8iV%%et
zI$dWue{!5AEU=}64mcRpMR<|z-VNwkW|m6{j;S>u<RgC#>_7W6Dh`xA#;&t#mJ3*p
zQ4)dlINtlXiza`>*#HJ{A)kWq7$OqWZzXE0?p;UoIE3}8SWtRQ$IAt+N(KxBQdxdq
zl#jrA7x_9xV0YLoj`yb@YsYpd0<cxFl=n7_hcV09JHGWEydTf7V-wKD0$zBYi6^{l
z6;bsV03|WYg_OsTUCg0s38Ti|&S&d=@dppf)Um||(wv}R6}<Zxjwq2qS>7rdoa`*;
zR)Y}x7*Z<4LCnICj0bO%p}QR3<znXs=u7bGcTb?Q^pXQ?2c`~1duAOf9z&)cn&oW#
zFsg(|i(qz-p@@PNAC%}|V{-H&R-$zf=%0w)g;a+fje^;*a!LEC!_hS*Pojt1=5Ws8
z=v+Yyf<UrH1pEnc?_pO_X(0e%Jb$MeW0<s(TMQESqbD<CgX5|3>?0oGSyhJ%3yzu&
zR)HEhEtNTn#W46Gz(g3)6{}WKxjcBcStb3yK{z4EKMU@Um!(1RkHsGnw+X+4UCaAa
zygRy*YuyLVf9m|Ne(MA0KlkkqpZ~(QKa7{#?EO<}FX}V}`aO^T^iVoW48kfF5VpWx
zBPE8aQ08p4M*8x={*t$*YX@%k=db?qUp)U=cAL5BUX+&se(T_E^4{&M_HESv?9~^)
z_lX~!n}%5~J4Wx^^nSWiT+@k~fbkPxQ9Mj~uHdip-fdB{AODT0+5N!-aE5nr%}#l@
zcJ0ETeDkB<{M0u;`OS~AVQJ{S)6o5n4olg)rE3pv^n(w4_^&_o+z&qVD!bE+K@(8!
z=$-1`&0QJX>5W&v;lA;eZ~W*tyf<Ec<2T-T^^I59ElsDl*f1*{y`|-??i$A}FFg0c
zh38(r@R|2tc<!e!eC8t;p8NF+&;2I5>$Kim(q>^WIw)x+@1{VYU-{9$`20_^+l2Da
z(c6&zzg^fWfYY;E`jRvzen&hlt`lAr#;}wBDBk_BG>Hc17)}rvjI1&HrR?3u<lwvh
z4}I5r?YsU5S-(%Ky)#(O=xD#6@b2x}fr2bd%PZ%91yy=;ziKkG64yfZeq^hjeUa0k
zC^32mxrHhv@Bj$h#=Lu0B{o*S@&0c#&8hvNT*cdts*4M)<D1?)y2i0EasG4PYM%eK
z^RIpDgXcg0tq+}l9!s9IIH68o>H(I!Zc*{pbtREC;-;{{=YIwNUjRZK>z$XnTbQpT
zugG~vOQ)9@HAZ@O+Pk~!0957tXU@NL{)O|uNVjAn5YA0UMc}k|7rWW(UwHj1uYd9N
z*Ixhf>o2jJX_elxiFcGbsg6&2cfvwH`<I{n**|~v^JMpD@IN&CoP}<^uG9LZ?Eu20
zB=GO?!Vy(3EN^XKW?p*X!b>k-c<Cz_Ui$e9pZ~~(mp*pk^MM}OYOk$UJ8Rs6`rjjh
z{F?lJc|iIO@c+BT3u0C55q=<iQJ5AU;f+B2uY^aCy9Lr(dRr(O>QcGVU2-|RmL6g5
zGK(U%^aypgbY@GB@OaCiw)8e#b#6;<BaM5f$t^uX11^l+(ql|v*NEP-;JuR`f9o7q
zMLDTg3u@u4MmQiO_LL-C<Qpzy<`CpZS1a8U<8Txw6Z<>@4xXChN?Rw{+s7x9S%A#=
z>@i+J>f7xRjPU3jmy-mqj|YTDCzBEGf);SwZ?X<}gc>~4;G)i~+5n()F*Fu|{x^yL
z^9k^O{%h$B*8l%X{3+D`_Xz)6_(P!?*Z7tBecap2Y(oc`D?OqZdsFI4j{t8=<F51w
z=5~4VN{=|gmdsx1?WFPOIDMt}V2AlDy&ZVUEZ(+=l{k{o%TJdhu=KWfmcg>@F#z4w
zpr!T*RJSNzYL794b&{CcWB7RyMb6luV>vUzk<xnaBABU3|8Eh%|NSF!pDasX1OvDs
zJqY%XuZTY;J}RyfenBYUF#GKEhVcB0rkV5zyS8MWNiR*hu(Cvx9zoxh$TaB@nODcC
zCcS>NwivESkFaLTBAfIcT_oG2cL=v!BHg6o5mfxjgwY<M!WY08?GYxt6O_>&!NeED
z8U2{YIK1v!0n%vO+ed<awMnB%|8Ej%g8U`<gFpauV-4_(v=Qi^C&2#wB^>DJ=deeB
zxK43RdXs2u>131M5oTFdlx@<RpnG(hZqgg4R<9!8q&L<v!bx|Pm!;lcbJA#!Sics|
z8tskX^o7z!d&KXxINoTFK<k+Tw^9pwqbm_ddxTV9CUbP)|Az(n7w}C!z0zNU{d)#)
z|J*LVh8n;I;ok{ACsYLb=8!k}toI1k_9jG<9^uv&#U$wwPHo{-k{;ugT3zH`O`Oji
zIsfl=eTGM<M~j9-9%0xzLMG`E$gM+clHR*XjaGn8(mS;bKFPbilb5A^_6Vz%S~%~s
z_ZU542Z^6O!l5sR`PpN<luMv~_K28rN!-s~o(5t4N|8U4{@*I>734nv1JD`pe|=l}
zW$DLI1NaUYz}_uBBK$qR1?X9vFz++q5rS{|q>&zRV4VRpI+o1<jzTag`~XB{VXToJ
zLH8Cz8|e{1Z@IjY9wGIvKpg2+Y3^?5D08Go>{kn?j`U`z3oFANIqosMT_=g3J^f0|
z&)zh9b`CXg1?p$7jMJ~k{p?NA=v-a$XOFlm7tH?b5e9t`^v@n4&=<k~9OysR|6W1;
z??L$g-<Ccs?Ub$u3h+hI5(mUP@I3&ZWNU$zFI@|&NS}Q@QYX10eF83Ci7e71sNy2n
zB0WMSE}SmXBV6K=_#!<5DK3UE(j)$@1u;f?gf?6dW#lohL0Yq>^Q_O_Q|QA|XrDde
z*?M!{XKxm#Et~k+BWT|OnV&s|=Ic21vq!M|j&MH*@jv+gz9xSZ{{L@)0h*P%#eWcg
zNi2%%QU8Blcv9H3+b4dJr4U5=x8lN%Fhu&dprwUUMEW<=0Cj{T(kF_rWsyYsH=%_N
zutfTV#OxSNq)+@_3+9O&@d<3%G2&<cdbGAA=4bypT)7PDXP*&vT|@3?zY7oW=H$=*
zDxCK4!q}gE8RssI{+aauW}%PX|FPwRvMBwTG$Q_`_&IT}@PEPl@tk1bVC!?xr$xu*
za7g-uAzCbnq<<eSS^|rte=n}PGL5899AZo1k@Vj|PVlM`N&4&1&t)-5`gc=@SCC55
zUF+ZV&y)1ozw-*L&;DAB>{4l;{X1~+qIsYFHMnZA#Lqq>6YDhdGwJ_oVN#HP8wkK*
z_Wd6vX`lGJ;#1-laQ}Y{hZgxs`#pHN4iHEBTS;K=S_$Gve+x~(B8ek?!W(srIMVN?
zr|Tebq`#ROylTXe-To#F$HFL~eTG3=8A@oMkVwm<g!VVEHn<lj7E1~36VuqTD4~5q
z5iN}q+E<oJ3QhWdqcA7P4f%fQd(tmS$MN02e+uoN#CQMBEmHLtb$ZTc6jq()hV<FD
z1zt;TNS~lVZ^{knKSb(!HMk-Do#@X}xFPrY#HqD3nrD9pJzi&Np8f6YLAY8mN9TN5
znrD9-u3QSuv(LURaAjzoeTEIX#x&1C{69+Te*^N(`2N2aq{pQ#;&<^D(3E&D-UIwC
zVRWHtZTjhJK=J4kcxRy$k3OMw7EJNz6B?%@6puc^bgn@0=razem7#bX@WKDo0fuIu
zpgW6WX!Z%p(<z2#pYT2lWoY&Z)3bPnW}ny~7tPS@Gw9CBFf{uN8@qm`7@A4{Z=?7B
zz9N52F3LM$1O8b0g!CTiI`Q}L4WJ|9P2d6eN#V?*-v?alAG<V@qfbkrS7LJXiE678
zOpbnTkxY(00~8Ul_L7(!eFiA%G?Sx0f#FyHljDAW949W7mf0U8f4u^<%sz2&Es>Vl
zA6+IbvrnL%#n3YQ1l)NuT4tZ1I*XuX_6eu6cv@zk(6(<z%j^@lb{VwHf&Vw@{r~p@
z{r8`wmw^AvN_UAr5ML2LD((Rfh`CVzzp(S%+kN`_y?<_`jXo`$E}XQ{FOa^hAZeqo
zUY@jZmrt;$B@izAPvW`-5ia|Ld0I5#vQPM?Hz8d1-;HyYO1SKw!o>?DT=q}m+>Q}0
z`zKgJ(^0}@pLjHvOStS4sA<WB%cTD|(f9woUmlgWNPh|L@4R%U_;cc&!fzx0U&?p?
zkr`0@I(l_wc1E8dIGtf<^lLOZon&Y98Fc4bvokt=<=Rjv`!krEB~vK-r*ZYtD3pDj
zW^yGclzjpZEr&wcXK<n`Q7HRUxWytVlzojJ_?l5D2mb$%Apah||KlL^|2e4!4zT}-
z_5Y{E{lfQ!j|hjZ;MYfdg1&T&deMJ|&Hf5dFZ%DLmODzl=o7YP8PtotK0$64L8I&w
znb(47lzjryERROnKT8AFX&Pmp5IBpbQT7ROvs@ZwpFwdtOrz`*5NEkG%07eAE}KT#
zCn)V=X_N!~uM+;}<MJ6G0RKjMQTh?-I4Xdj6b}o3Cwx_?UP1pCcW9z{6Vt*@5;Qgm
z6tif8#wH^p>nuTIlYP-$rwJMlH3=%SEbincqawSy+{w+iq1TJzPHqw|=1sVhn*@qk
z9(Qt+urkZyPHswQVd>n-O%azbh&#DSIMs!4C;Nm~T^e_C5dY5*{wFK1mcA~1NIE3`
zXYmEm6eWD~*UaJ+{EBCvYBB`MN--`r@4_G~g>kXTz60;7F)r?E65wPBoXJhXnk=3(
zxw(dH?n-ecH*ZI$I>VXVB#h}2Ig^{W;@ahNCN~LVx(v?b=FK$LE5n)GT)h&U$)x|Q
z>HYtw!T$X{>66lcbPLx1UlHqK5*Fa&(Yybo*_9^4aa=V5#pb(cG*_HJu}SEUB@-z2
zGzs{za2n($p*)sLgWOcm$U<q5n}pe1C=GIx;WHOWgWSB2CTfLfkedYJTqX^2lTe;Z
zqCsvlnCA-7AUD@ta~fpQ|F_fn--qN)(gmrCZ~lBke4n^m_=82S_>qZdf2`)VYr&e>
z?7JGQiRor91gZn1$W6xP(n(U}=2rA<aiqviM$L9LNRgWfG89*p6uH@r@mMw~a+858
zSC$mHxrqknDw86U{@)-xA;=#A|L+&2qI8q^8EF4kv8w~0C!2d$nl-Vx=NhmkR+_u7
zD!FlU*Hs}mZax&T5O<W^xVbZGwxi_6%?Ga%xp8yH)gm`;Zok^(#)1FeCdmI1{{PF;
zB<g-O@jl_p!2NH#gaJ^R1c|#c2XHfawK#yAk9O@?Q4Zkdp$>BZHxFI|4&dg2tH}Xe
zZa&hrYomMH_kR54@4KJ2*%y{viXlDt5)*tOHht?iePsuzH5tA6g1_CQ+<Z8?)1SZg
zo7|l^O2Xye>2!1dRpd2p?z?)t#-#tNr0=x&e=ni)Z|!<(1pa>=fkJbTg6b9K|83Hj
XD=(4%w@L8zrSShY3Cg}~{@?!xn}Ex^

diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Youtube.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Youtube.php
index b19e9d5aef..e06ea5640b 100644
--- a/plugins/Irc/extlib/phergie/Phergie/Plugin/Youtube.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Youtube.php
@@ -148,7 +148,7 @@ class Phergie_Plugin_Youtube extends Phergie_Plugin_Abstract
     {
         switch ($parsed['host']) {
             case 'youtu.be':
-                $v = ltrim('/', $parsed['path']);
+                $v = ltrim($parsed['path'], '/');
                 break;
             case 'youtube.com':
             case 'www.youtube.com':
diff --git a/plugins/Irc/extlib/phergie/Phergie/Process/Abstract.php b/plugins/Irc/extlib/phergie/Phergie/Process/Abstract.php
index 68d45289e8..0ec3569feb 100755
--- a/plugins/Irc/extlib/phergie/Phergie/Process/Abstract.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Process/Abstract.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Phergie 
+ * Phergie
  *
  * PHP version 5
  *
@@ -11,7 +11,7 @@
  * It is also available through the world-wide-web at this URL:
  * http://phergie.org/license
  *
- * @category  Phergie 
+ * @category  Phergie
  * @package   Phergie
  * @author    Phergie Development Team <team@phergie.org>
  * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
@@ -22,7 +22,7 @@
 /**
  * Base class for obtaining and processing incoming events.
  *
- * @category Phergie 
+ * @category Phergie
  * @package  Phergie
  * @author   Phergie Development Team <team@phergie.org>
  * @license  http://phergie.org/license New BSD License
@@ -38,9 +38,9 @@ abstract class Phergie_Process_Abstract
     protected $driver;
 
     /**
-     * Current connection handler instance 
+     * Current connection handler instance
      *
-     * @var Phergie_Connection_Handler 
+     * @var Phergie_Connection_Handler
      */
     protected $connections;
 
@@ -75,9 +75,9 @@ abstract class Phergie_Process_Abstract
     /**
      * Gets the required class refences from Phergie_Bot.
      *
-     * @param Phergie_Bot $bot     Current bot instance in use 
+     * @param Phergie_Bot $bot     Current bot instance in use
      * @param array       $options Optional processor arguments
-     *      
+     *
      * @return void
      */
     public function __construct(Phergie_Bot $bot, array $options = array())
@@ -99,8 +99,8 @@ abstract class Phergie_Process_Abstract
      */
     protected function processEvents(Phergie_Connection $connection)
     {
+        $this->plugins->preDispatch();
         if (count($this->events)) {
-            $this->plugins->preDispatch();
             foreach ($this->events as $event) {
                 $this->ui->onCommand($event, $connection);
 
@@ -110,15 +110,15 @@ abstract class Phergie_Process_Abstract
                     $event->getArguments()
                 );
             }
-            $this->plugins->postDispatch();
-
-            if ($this->events->hasEventOfType(Phergie_Event_Request::TYPE_QUIT)) {
-                $this->ui->onQuit($connection);
-                $this->connections->removeConnection($connection);
-            }
-
-            $this->events->clearEvents();
         }
+        $this->plugins->postDispatch();
+
+        if ($this->events->hasEventOfType(Phergie_Event_Request::TYPE_QUIT)) {
+            $this->ui->onQuit($connection);
+            $this->connections->removeConnection($connection);
+        }
+
+        $this->events->clearEvents();
     }
 
     /**
diff --git a/plugins/Irc/extlib/phergie/Phergie/Process/Async.php b/plugins/Irc/extlib/phergie/Phergie/Process/Async.php
index e553ad5a82..78d5959144 100644
--- a/plugins/Irc/extlib/phergie/Phergie/Process/Async.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Process/Async.php
@@ -117,11 +117,7 @@ class Phergie_Process_Async extends Phergie_Process_Abstract
             if ($event = $this->driver->getEvent()) {
                 $this->ui->onEvent($event, $connection);
                 $this->plugins->setEvent($event);
-
-                if (!$this->plugins->preEvent()) {
-                    continue;
-                }
-
+                $this->plugins->preEvent();
                 $this->plugins->{'on' . ucfirst($event->getType())}();
             }
 
diff --git a/plugins/Irc/extlib/phergie/Phergie/Process/Standard.php b/plugins/Irc/extlib/phergie/Phergie/Process/Standard.php
index 385c65fa22..24adbaf991 100644
--- a/plugins/Irc/extlib/phergie/Phergie/Process/Standard.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Process/Standard.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Phergie 
+ * Phergie
  *
  * PHP version 5
  *
@@ -11,7 +11,7 @@
  * It is also available through the world-wide-web at this URL:
  * http://phergie.org/license
  *
- * @category  Phergie 
+ * @category  Phergie
  * @package   Phergie
  * @author    Phergie Development Team <team@phergie.org>
  * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
@@ -23,7 +23,7 @@
  * Connection data processor which reads all connections looking
  * for a response.
  *
- * @category Phergie 
+ * @category Phergie
  * @package  Phergie
  * @author   Phergie Development Team <team@phergie.org>
  * @license  http://phergie.org/license New BSD License
@@ -32,7 +32,7 @@
 class Phergie_Process_Standard extends Phergie_Process_Abstract
 {
     /**
-     * Obtains and processes incoming events, then sends resulting outgoing 
+     * Obtains and processes incoming events, then sends resulting outgoing
      * events.
      *
      * @return void
@@ -47,11 +47,7 @@ class Phergie_Process_Standard extends Phergie_Process_Abstract
             if ($event = $this->driver->getEvent()) {
                 $this->ui->onEvent($event, $connection);
                 $this->plugins->setEvent($event);
-
-                if (!$this->plugins->preEvent()) {
-                    continue;
-                }
-
+                $this->plugins->preEvent();
                 $this->plugins->{'on' . ucfirst($event->getType())}();
             }
 
diff --git a/plugins/Irc/extlib/phergie/Tests/Phergie/Plugin/HandlerTest.php b/plugins/Irc/extlib/phergie/Tests/Phergie/Plugin/HandlerTest.php
index 0d6ac454a8..dcf52a65a1 100644
--- a/plugins/Irc/extlib/phergie/Tests/Phergie/Plugin/HandlerTest.php
+++ b/plugins/Irc/extlib/phergie/Tests/Phergie/Plugin/HandlerTest.php
@@ -178,35 +178,11 @@ class Phergie_Plugin_HandlerTest extends PHPUnit_Framework_TestCase
 
     /**
      * Tests the plugin handler executing a callback on all contained
-     * plugins where one plugin short-circuits the process.
+     * plugins.
      *
      * @return void
      */
-    public function testImplementsCallWithShortCircuit()
-    {
-        $plugin1 = $this->getMockPlugin('TestPlugin1', array('callback'));
-        $plugin1
-            ->expects($this->once())
-            ->method('callback')
-            ->will($this->returnValue(false));
-        $this->handler->addPlugin($plugin1);
-
-        $plugin2 = $this->getMockPlugin('TestPlugin2', array('callback'));
-        $plugin2
-            ->expects($this->exactly(0))
-            ->method('callback');
-        $this->handler->addPlugin($plugin2);
-
-        $this->assertFalse($this->handler->callback());
-    }
-
-    /**
-     * Tests the plugin handler executing a callback on all contained
-     * plugins where no plugins short-circuit the process.
-     *
-     * @return void
-     */
-    public function testImplementsCallWithoutShortCircuit()
+    public function testImplementsCall()
     {
         foreach (range(1, 2) as $index) {
             $plugin = $this->getMockPlugin('TestPlugin' . $index, array('callback'));
@@ -736,4 +712,25 @@ class Phergie_Plugin_HandlerTest extends PHPUnit_Framework_TestCase
         $actual = $this->handler->getPlugins(array('testplugin1', 'testplugin2'));
         $this->assertEquals($expected, $actual);
     }
+
+    /**
+     * Tests the plugin receiving and using a predefined iterator instance.
+     *
+     * @depends testGetPlugins
+     * @return void
+     */
+    public function testSetIterator()
+    {
+        $plugin = $this->getMockPlugin('TestPlugin');
+        $this->handler->addPlugin($plugin);
+        $plugins = $this->handler->getPlugins();
+        $iterator = new ArrayIterator($plugins);
+        $this->handler->setIterator($iterator);
+        $this->assertSame($this->handler->getIterator(), $iterator);
+        $iterated = array();
+        foreach ($this->handler as $plugin) {
+            $iterated[strtolower($plugin->getName())] = $plugin;
+        }
+        $this->assertEquals($iterated, $plugins);
+    }
 }
diff --git a/plugins/Irc/extlib/phergie/Tests/Phergie/Plugin/IteratorTest.php b/plugins/Irc/extlib/phergie/Tests/Phergie/Plugin/IteratorTest.php
new file mode 100644
index 0000000000..336b25d355
--- /dev/null
+++ b/plugins/Irc/extlib/phergie/Tests/Phergie/Plugin/IteratorTest.php
@@ -0,0 +1,151 @@
+<?php
+/**
+ * Phergie
+ *
+ * PHP version 5
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.
+ * It is also available through the world-wide-web at this URL:
+ * http://phergie.org/license
+ *
+ * @category  Phergie
+ * @package   Phergie_Tests
+ * @author    Phergie Development Team <team@phergie.org>
+ * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
+ * @license   http://phergie.org/license New BSD License
+ * @link      http://pear.phergie.org/package/Phergie_Tests
+ */
+
+/**
+ * Unit test suite for Pherge_Plugin_Iterator.
+ *
+ * @category Phergie
+ * @package  Phergie_Tests
+ * @author   Phergie Development Team <team@phergie.org>
+ * @license  http://phergie.org/license New BSD License
+ * @link     http://pear.phergie.org/package/Phergie_Tests
+ */
+class Phergie_Plugin_IteratorTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * Iterator instance being tested
+     *
+     * @var Phergie_Plugin_Iterator
+     */
+    protected $iterator;
+
+    /**
+     * List of mock plugin instances to be iterated
+     *
+     * @var array
+     */
+    protected $plugins;
+
+    /**
+     * Initializes the iterator instance being tested.
+     *
+     * @return void
+     */
+    public function setUp()
+    {
+        $this->plugins = array();
+        foreach (range(0, 4) as $index) {
+            $plugin = $this->getMock('Phergie_Plugin_Abstract');
+            $plugin
+                ->expects($this->any())
+                ->method('getName')
+                ->will($this->returnValue($index));
+            $this->plugins[] = $plugin;
+        }
+
+        $this->iterator = new Phergie_Plugin_Iterator(
+            new ArrayIterator($this->plugins)
+        );
+    }
+
+    /**
+     * Tests that all plugins are iterated when no filters are applied.
+     */
+    public function testIteratesAllPluginsWithNoFilters()
+    {
+        $expected = range(0, 4);
+        $actual = array();
+        foreach ($this->iterator as $plugin) {
+            $actual[] = $plugin->getName();
+        }
+        $this->assertEquals($expected, $actual);
+    }
+
+    /**
+     * Tests that appropriate plugins are iterated when plugin name filters
+     * are applied.
+     */
+    public function testIteratesPluginsWithNameFilters()
+    {
+        // Test acceptance of strings and fluent interface implementation
+        $returned = $this->iterator->addPluginFilter('0');
+        $this->assertSame($this->iterator, $returned);
+
+        // Test acceptance of arrays
+        $this->iterator->addPluginFilter(array('1', '3'));
+
+        // Test application of filters to iteration
+        $expected = array('2', '4');
+        $actual = array();
+        foreach ($this->iterator as $plugin) {
+            $actual[] = $plugin->getName();
+        }
+        $this->assertEquals($expected, $actual);
+    }
+
+    /**
+     * Tests that appropriate plugins are iterated when method name filters
+     * are applied.
+     *
+     * The same method name is used in all cases here because mocked methods
+     * of mock objects do not appear to be detected by method_exists() or
+     * ReflectionClass, so filtering by a method defined in the base plugin
+     * class seems the easiest way to test that method filtering really
+     * works.
+     */
+    public function testIteratesPluginsWithMethodFilters()
+    {
+        // Tests acceptance of strings and fluent interface implementation
+        $returned = $this->iterator->addMethodFilter('getName');
+        $this->assertSame($this->iterator, $returned);
+
+        // Test acceptance of arrays
+        $this->iterator->addMethodFilter(array('getName', 'getName'));
+
+        // Test application of filters to iteration
+        $expected = array();
+        $actual = array();
+        foreach ($this->iterator as $plugin) {
+            $actual[] = $plugin->getName();
+        }
+        $this->assertEquals($expected, $actual);
+    }
+
+    /**
+     * Tests that all plugins are iterated after filters are cleared.
+     *
+     * @depends testIteratesPluginsWithNameFilters
+     * @depends testIteratesPluginsWithMethodFilters
+     */
+    public function testIteratesPluginsAfterClearingFilters()
+    {
+        $this->iterator->addPluginFilter('0');
+        $this->iterator->addMethodFilter('method1');
+        $this->iterator->clearFilters();
+
+        $expected = range(0, 4);
+        $actual = array();
+        foreach ($this->iterator as $plugin) {
+            $actual[] = $plugin->getName();
+        }
+        $this->assertEquals($expected, $actual);
+    }
+}

From 55ec8a74657618d36c6b7018ff4519a3838fea6a Mon Sep 17 00:00:00 2001
From: Luke Fitzgerald <lw.fitzgerald@googlemail.com>
Date: Wed, 4 Aug 2010 16:14:25 -0700
Subject: [PATCH 145/655] Always remove messages from waiting queue and requeue
 messages if one fails

---
 plugins/Msn/msnmanager.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/plugins/Msn/msnmanager.php b/plugins/Msn/msnmanager.php
index 1eac596df2..42eb18b9c4 100644
--- a/plugins/Msn/msnmanager.php
+++ b/plugins/Msn/msnmanager.php
@@ -170,15 +170,17 @@ class MsnManager extends ImManager {
     * @param array $data Data
     */
     public function handle_session_ready($data) {
+        $sessionFailed = false;
         $wm = Msn_waiting_message::top($data['to']);
         while ($wm != NULL) {
-            if ($this->conn->sendMessage($wm->screenname, $wm->message, $ignore)) {
-                $wm->delete();
-            } else {
-                // Requeue the message in the regular queue
+            if ($sessionFailed) {
+                $this->plugin->send_message($wm->screenname, $wm->message);
+                $sessionFailed = true;
+            } elseif (!$this->conn->sendMessage($wm->screenname, $wm->message, $ignore)) {
                 $this->plugin->send_message($wm->screenname, $wm->message);
             }
 
+            $wm->delete();
             $wm = Msn_waiting_message::top($data['to']);
         }
     }

From 1f3dbe11989a320be6f82e9d02e8c2dbd7b1cb4d Mon Sep 17 00:00:00 2001
From: Luke Fitzgerald <lw.fitzgerald@googlemail.com>
Date: Thu, 5 Aug 2010 10:48:15 -0700
Subject: [PATCH 146/655] Bot responds to channel commands via PM

---
 plugins/Irc/IrcPlugin.php                         | 11 ++++++++++-
 .../extlib/phergie/Phergie/Plugin/Statusnet.php   |  3 ++-
 plugins/Irc/ircmanager.php                        | 15 ---------------
 3 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/plugins/Irc/IrcPlugin.php b/plugins/Irc/IrcPlugin.php
index 855aa3305e..5b5cab2ec5 100644
--- a/plugins/Irc/IrcPlugin.php
+++ b/plugins/Irc/IrcPlugin.php
@@ -179,7 +179,16 @@ class IrcPlugin extends ImPlugin {
      * @return true if processing completed, false if message should be reprocessed
      */
     public function receive_raw_message($data) {
-        $this->handle_incoming($data['sender'], $data['message']);
+        if (strpos($data['source'], '#') === 0) {
+            $message = $data['message'];
+            $nickpos = strpos($message, $this->nick);
+            $colonpos = strpos($message, ':', $nickpos);
+            if ($nickpos === 0 && $colonpos == strlen($this->nick)) {
+                $this->handle_incoming($data['sender'], substr($message, $colonpos+1));
+            }
+        } else {
+            $this->handle_incoming($data['sender'], $data['message']);
+        }
         return true;
     }
 
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Statusnet.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Statusnet.php
index 694fefc06b..ec2b427466 100644
--- a/plugins/Irc/extlib/phergie/Phergie/Plugin/Statusnet.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Statusnet.php
@@ -72,9 +72,10 @@ class Phergie_Plugin_Statusnet extends Phergie_Plugin_Abstract {
         if ($this->messageCallback !== NULL) {
             $event = $this->getEvent();
             $source = $event->getSource();
+            $sender = $event->getNick();
             $message = trim($event->getText());
 
-            call_user_func($this->messageCallback, array('sender' => $source, 'message' => $message));
+            call_user_func($this->messageCallback, array('source' => $source, 'sender' => $sender, 'message' => $message));
         }
     }
 
diff --git a/plugins/Irc/ircmanager.php b/plugins/Irc/ircmanager.php
index 51996bef99..2ceb9db2c0 100644
--- a/plugins/Irc/ircmanager.php
+++ b/plugins/Irc/ircmanager.php
@@ -64,21 +64,6 @@ class IrcManager extends ImManager {
         }
     }
 
-    /**
-     * Idle processing for io manager's execution loop.
-     * Send keepalive pings to server.
-     *
-     * @return void
-     */
-    public function idle() {
-        // Call Phergie's doTick methods if necessary
-        try {
-            $this->conn->handleEvents();
-        } catch (Phergie_Driver_Exception $e) {
-            $this->conn->reconnect();
-        }
-    }
-
     /**
      * Process IRC events that have come in over the wire.
      *

From a6e865c47ad923f2c4cf97b1966f9eb9baad4553 Mon Sep 17 00:00:00 2001
From: Luke Fitzgerald <lw.fitzgerald@googlemail.com>
Date: Thu, 5 Aug 2010 11:12:36 -0700
Subject: [PATCH 147/655] Use nick length instead

---
 plugins/Irc/IrcPlugin.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/plugins/Irc/IrcPlugin.php b/plugins/Irc/IrcPlugin.php
index 5b5cab2ec5..8fda359452 100644
--- a/plugins/Irc/IrcPlugin.php
+++ b/plugins/Irc/IrcPlugin.php
@@ -182,8 +182,9 @@ class IrcPlugin extends ImPlugin {
         if (strpos($data['source'], '#') === 0) {
             $message = $data['message'];
             $nickpos = strpos($message, $this->nick);
-            $colonpos = strpos($message, ':', $nickpos);
-            if ($nickpos === 0 && $colonpos == strlen($this->nick)) {
+            $nicklen = strlen($this->nick);
+            $colonpos = strpos($message, ':', $nicklen);
+            if ($nickpos === 0 && $colonpos == $nicklen) {
                 $this->handle_incoming($data['sender'], substr($message, $colonpos+1));
             }
         } else {

From 422a6ef5185a522ebff03733dd7bfe73c2b68fb5 Mon Sep 17 00:00:00 2001
From: Eric Helgeson <erichelgeson@gmail.com>
Date: Fri, 6 Aug 2010 22:48:00 -0500
Subject: [PATCH 148/655] Fixed PHP 5.3 by & value Cleaned up {}'s

---
 plugins/Gravatar/GravatarPlugin.php | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/plugins/Gravatar/GravatarPlugin.php b/plugins/Gravatar/GravatarPlugin.php
index 580852072d..8a9721ea90 100644
--- a/plugins/Gravatar/GravatarPlugin.php
+++ b/plugins/Gravatar/GravatarPlugin.php
@@ -30,11 +30,13 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
 
 class GravatarPlugin extends Plugin
 {
-    function onInitializePlugin() {
+    function onInitializePlugin()
+    {
         return true;
     }
     
-    function onStartAvatarFormData($action) {
+    function onStartAvatarFormData($action)
+    {
         $user = common_current_user();
         $hasGravatar = $this->hasGravatar($user->id);
         
@@ -43,7 +45,8 @@ class GravatarPlugin extends Plugin
         }
     }
     
-    function onEndAvatarFormData(&$action) {
+    function onEndAvatarFormData($action)
+    {
         $user = common_current_user();
         $hasGravatar = $this->hasGravatar($user->id);
 
@@ -89,7 +92,8 @@ class GravatarPlugin extends Plugin
         }
     }
     
-    function onStartAvatarSaveForm($action) {
+    function onStartAvatarSaveForm($action)
+    {
         if ($action->arg('add')) {
             $result = $this->gravatar_save();
 
@@ -178,7 +182,8 @@ class GravatarPlugin extends Plugin
                      'success' => true);
     }
  
-    function gravatar_url($email, $size) {
+    function gravatar_url($email, $size)
+    {
         $url = "http://www.gravatar.com/avatar.php?gravatar_id=".
                 md5(strtolower($email)).
                 "&default=".urlencode(Avatar::defaultImage($size)).
@@ -197,4 +202,4 @@ class GravatarPlugin extends Plugin
 
         return true;
     }
-}
+}
\ No newline at end of file

From edb62db613478d50def223ec1d60ef5863fa3a4b Mon Sep 17 00:00:00 2001
From: Eric Helgeson <erichelgeson@gmail.com>
Date: Fri, 6 Aug 2010 23:07:34 -0500
Subject: [PATCH 149/655] Locale error message, clean up {}, Verified under
 1.0.x && php 5.3

---
 plugins/Recaptcha/RecaptchaPlugin.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/plugins/Recaptcha/RecaptchaPlugin.php b/plugins/Recaptcha/RecaptchaPlugin.php
index 7cc34c5686..b7a0e92c7f 100644
--- a/plugins/Recaptcha/RecaptchaPlugin.php
+++ b/plugins/Recaptcha/RecaptchaPlugin.php
@@ -41,7 +41,8 @@ class RecaptchaPlugin extends Plugin
     var $failed;
     var $ssl;
 
-    function onInitializePlugin(){
+    function onInitializePlugin()
+    {
         if(!isset($this->private_key)) {
             common_log(LOG_ERR, 'Recaptcha: Must specify private_key in config.php');
         }
@@ -50,7 +51,8 @@ class RecaptchaPlugin extends Plugin
         }
     }
 
-    function checkssl(){
+    function checkssl()
+    {
         if(common_config('site', 'ssl') === 'sometimes' || common_config('site', 'ssl') === 'always') {
             return true;
         }
@@ -102,7 +104,7 @@ class RecaptchaPlugin extends Plugin
             if($this->display_errors) {
                 $action->showForm ("(reCAPTCHA error: " . $resp->error . ")");
             }
-            $action->showForm("Captcha does not match!");
+            $action->showForm(_m("Captcha does not match!"));
             return false;
         }
     }
@@ -118,4 +120,4 @@ class RecaptchaPlugin extends Plugin
                                'captcha to the registration page.'));
         return true;
     }
-}
+}
\ No newline at end of file

From e23ad0bdb34418161b46d4b15a5306ceb6a8a5a1 Mon Sep 17 00:00:00 2001
From: Luke Fitzgerald <lw.fitzgerald@googlemail.com>
Date: Sat, 7 Aug 2010 13:25:05 -0700
Subject: [PATCH 150/655] Commands can now be whitelisted to allow response to
 the channel

---
 plugins/Irc/ChannelResponseChannel.php        | 47 ++++++++++++
 plugins/Irc/IrcPlugin.php                     | 72 +++++++++++++++++--
 .../phergie/Phergie/Plugin/Statusnet.php      | 13 +++-
 3 files changed, 126 insertions(+), 6 deletions(-)
 create mode 100644 plugins/Irc/ChannelResponseChannel.php

diff --git a/plugins/Irc/ChannelResponseChannel.php b/plugins/Irc/ChannelResponseChannel.php
new file mode 100644
index 0000000000..0fee49c8eb
--- /dev/null
+++ b/plugins/Irc/ChannelResponseChannel.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Override the IMChannel class to allow commands to send messages
+ * to a channel instead of PMing a user
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Network
+ * @package   StatusNet
+ * @author    Luke Fitzgerald <lw.fitzgerald@googlemail.com>
+ * @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);
+}
+
+class ChannelResponseChannel extends IMChannel {
+    protected $ircChannel;
+
+    public function __construct($imPlugin, $ircChannel) {
+        $this->ircChannel = $ircChannel;
+        parent::__construct($imPlugin);
+    }
+
+    public function output($user, $text) {
+        $text = $user->nickname.': ['.common_config('site', 'name') . '] ' . $text;
+        $this->imPlugin->send_message($this->ircChannel, $text);
+    }
+}
\ No newline at end of file
diff --git a/plugins/Irc/IrcPlugin.php b/plugins/Irc/IrcPlugin.php
index 8fda359452..75eaf687b2 100644
--- a/plugins/Irc/IrcPlugin.php
+++ b/plugins/Irc/IrcPlugin.php
@@ -66,6 +66,7 @@ class IrcPlugin extends ImPlugin {
     public $regregexp = null;
 
     public $transport = 'irc';
+    public $whiteList;
     public $fake_irc;
 
     /**
@@ -125,6 +126,7 @@ class IrcPlugin extends ImPlugin {
                 include_once $dir . '/'.strtolower($cls).'.php';
                 return false;
             case 'Fake_Irc':
+            case 'ChannelResponseChannel':
                 include_once $dir . '/'. $cls .'.php';
                 return false;
             default:
@@ -181,11 +183,12 @@ class IrcPlugin extends ImPlugin {
     public function receive_raw_message($data) {
         if (strpos($data['source'], '#') === 0) {
             $message = $data['message'];
-            $nickpos = strpos($message, $this->nick);
-            $nicklen = strlen($this->nick);
-            $colonpos = strpos($message, ':', $nicklen);
-            if ($nickpos === 0 && $colonpos == $nicklen) {
-                $this->handle_incoming($data['sender'], substr($message, $colonpos+1));
+            $parts = explode(' ', $message, 2);
+            $command = $parts[0];
+            if (in_array($command, $this->whiteList)) {
+                $this->handle_channel_incoming($data['sender'], $data['source'], $message);
+            } else {
+                $this->handle_incoming($data['sender'], $message);
             }
         } else {
             $this->handle_incoming($data['sender'], $data['message']);
@@ -193,6 +196,59 @@ class IrcPlugin extends ImPlugin {
         return true;
     }
 
+    protected function handle_channel_incoming($nick, $channel, $notice_text) {
+        $user = $this->get_user($nick);
+        // For common_current_user to work
+        global $_cur;
+        $_cur = $user;
+
+        if (!$user) {
+            $this->send_from_site($nick, 'Unknown user; go to ' .
+                             common_local_url('imsettings') .
+                             ' to add your address to your account');
+            common_log(LOG_WARNING, 'Message from unknown user ' . $nick);
+            return;
+        }
+        if ($this->handle_channel_command($user, $channel, $notice_text)) {
+            common_log(LOG_INFO, "Command message by $nick handled.");
+            return;
+        } else if ($this->is_autoreply($notice_text)) {
+            common_log(LOG_INFO, 'Ignoring auto reply from ' . $nick);
+            return;
+        } else if ($this->is_otr($notice_text)) {
+            common_log(LOG_INFO, 'Ignoring OTR from ' . $nick);
+            return;
+        } else {
+            common_log(LOG_INFO, 'Posting a notice from ' . $user->nickname);
+            $this->add_notice($nick, $user, $notice_text);
+        }
+
+        $user->free();
+        unset($user);
+        unset($_cur);
+        unset($message);
+    }
+
+    /**
+     * Attempt to handle a message from a channel as a command
+     *
+     * @param User $user user the message is from
+     * @param string $channel Channel the message originated from
+     * @param string $body message text
+     * @return boolean true if the message was a command and was executed, false if it was not a command
+     */
+    protected function handle_channel_command($user, $channel, $body) {
+        $inter = new CommandInterpreter();
+        $cmd = $inter->handle_command($user, $body);
+        if ($cmd) {
+            $chan = new ChannelResponseChannel($this, $channel);
+            $cmd->execute($chan);
+            return true;
+        } else {
+            return false;
+        }
+    }
+
     /**
      * Send a confirmation code to a user
      *
@@ -277,6 +333,12 @@ class IrcPlugin extends ImPlugin {
         }
 
         $this->fake_irc = new Fake_Irc;
+
+        /*
+         * Commands allowed to return output to a channel
+         */
+        $this->whiteList = array('stats', 'last', 'get');
+
         return true;
     }
 
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Statusnet.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Statusnet.php
index ec2b427466..fb75f1d798 100644
--- a/plugins/Irc/extlib/phergie/Phergie/Plugin/Statusnet.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Statusnet.php
@@ -75,7 +75,18 @@ class Phergie_Plugin_Statusnet extends Phergie_Plugin_Abstract {
             $sender = $event->getNick();
             $message = trim($event->getText());
 
-            call_user_func($this->messageCallback, array('source' => $source, 'sender' => $sender, 'message' => $message));
+            if (strpos($source, '#') === 0) {
+                $botNick = $this->getConnection()->getNick();
+                $nickPos = strpos($message, $botNick);
+                $nickLen = strlen($botNick);
+                $colonPos = strpos($message, ':', $nickLen);
+                $commandStr = trim(substr($message, $colonPos+1));
+                if ($nickPos === 0 && $colonPos == $nickLen && !empty($commandStr)) {
+                    call_user_func($this->messageCallback, array('source' => $source, 'sender' => $sender, 'message' => $commandStr));
+                }
+            } else {
+                call_user_func($this->messageCallback, array('source' => $source, 'sender' => $sender, 'message' => $message));
+            }
         }
     }
 

From 4b12b8f396182cbd073429a7bfc2e6213a65a17a Mon Sep 17 00:00:00 2001
From: Luke Fitzgerald <lw.fitzgerald@googlemail.com>
Date: Sat, 7 Aug 2010 13:28:11 -0700
Subject: [PATCH 151/655] Cosmetic comment change

---
 plugins/Irc/ChannelResponseChannel.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/Irc/ChannelResponseChannel.php b/plugins/Irc/ChannelResponseChannel.php
index 0fee49c8eb..580a3c12d7 100644
--- a/plugins/Irc/ChannelResponseChannel.php
+++ b/plugins/Irc/ChannelResponseChannel.php
@@ -2,7 +2,7 @@
 /**
  * StatusNet, the distributed open-source microblogging tool
  *
- * Override the IMChannel class to allow commands to send messages
+ * Extend the IMChannel class to allow commands to send messages
  * to a channel instead of PMing a user
  *
  * PHP version 5

From a9d9e077ba5ddc516836f00e667fc92235bed48d Mon Sep 17 00:00:00 2001
From: Luke Fitzgerald <lw.fitzgerald@googlemail.com>
Date: Sat, 7 Aug 2010 16:31:30 -0700
Subject: [PATCH 152/655] Merged in Phergie changes

---
 .../extlib/phergie/Phergie/Plugin/Command.php |  2 +-
 .../phergie/Phergie/Plugin/Exception.php      |  7 +++
 .../extlib/phergie/Phergie/Plugin/Handler.php | 45 ++++++++++++-------
 .../phergie/Phergie/Plugin/Iterator.php       | 16 +++++++
 .../extlib/phergie/Phergie/Plugin/Karma.php   |  2 +-
 .../Irc/extlib/phergie/Phergie/Plugin/Php.php |  8 ----
 6 files changed, 55 insertions(+), 25 deletions(-)

diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Command.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Command.php
index 5c0a52e916..2058977ed5 100644
--- a/plugins/Irc/extlib/phergie/Phergie/Plugin/Command.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Command.php
@@ -109,7 +109,7 @@ class Phergie_Plugin_Command extends Phergie_Plugin_Abstract
 
         // Resolve aliases to their corresponding commands
         $aliases = $this->getConfig('command.aliases', array());
-        $result = preg_grep('/^' . $command . '$/i', array_keys($aliases));
+        $result = preg_grep('/^' . preg_quote($command, '/') . '$/i', array_keys($aliases));
         if ($result) {
             $command = $aliases[array_shift($result)];
         }
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Exception.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Exception.php
index fd07d9d5ea..ca4d53fede 100755
--- a/plugins/Irc/extlib/phergie/Phergie/Plugin/Exception.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Exception.php
@@ -110,4 +110,11 @@ class Phergie_Plugin_Exception extends Phergie_Exception
      * plugin
      */
     const ERR_FATAL_ERROR = 13;
+
+    /**
+     * Error indicating that a class specified to be used for iterating
+     * plugins cannot be found by the autoloader or does not extend
+     * FilterIterator
+     */
+    const ERR_INVALID_ITERATOR_CLASS = 14;
 }
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Handler.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Handler.php
index 13d2eac8fe..335c10f881 100755
--- a/plugins/Irc/extlib/phergie/Phergie/Plugin/Handler.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Handler.php
@@ -69,12 +69,12 @@ class Phergie_Plugin_Handler implements IteratorAggregate, Countable
     protected $events;
 
     /**
-     * Iterator used for selectively proxying method calls to contained
+     * Name of the class to use for iterating over all currently loaded
      * plugins
      *
-     * @var Iterator
+     * @var string
      */
-    protected $iterator;
+    protected $iteratorClass = 'Phergie_Plugin_Iterator';
 
     /**
      * Constructor to initialize class properties and add the path for core
@@ -424,25 +424,40 @@ class Phergie_Plugin_Handler implements IteratorAggregate, Countable
      */
     public function getIterator()
     {
-        if (empty($this->iterator)) {
-            $this->iterator = new Phergie_Plugin_Iterator(
-                new ArrayIterator($this->plugins)
-            );
-        }
-        return $this->iterator;
+        return new $this->iteratorClass(
+            new ArrayIterator($this->plugins)
+        );
     }
 
     /**
-     * Sets the iterator for all currently loaded plugin instances.
+     * Sets the iterator class used for all currently loaded plugin
+     * instances.
      *
-     * @param Iterator $iterator Plugin iterator
+     * @param string $class Name of a class that extends FilterIterator
      *
-     * @return Phergie_Plugin_Handler Provides a fluent interface
+     * @return Phergie_Plugin_Handler Provides a fluent API
+     * @throws Phergie_Plugin_Exception Class cannot be found or is not an
+     *         FilterIterator-based class
      */
-    public function setIterator(Iterator $iterator)
+    public function setIteratorClass($class)
     {
-        $this->iterator = $iterator;
-        return $this;
+        $valid = true;
+
+        try {
+            $r = new ReflectionClass($class);
+            $valid = $r->isSubclassOf('FilterIterator');
+        } catch (ReflectionException $e) {
+            $valid = false;
+        }
+
+        if (!$valid) {
+            throw new Phergie_Plugin_Exception(
+                $e->getMessage(),
+                Phergie_Plugin_Exception::ERR_INVALID_ITERATOR_CLASS
+            );
+        }
+
+        $this->iteratorClass = $class;
     }
 
     /**
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Iterator.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Iterator.php
index 5963300713..d610962986 100644
--- a/plugins/Irc/extlib/phergie/Phergie/Plugin/Iterator.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Iterator.php
@@ -46,6 +46,22 @@ class Phergie_Plugin_Iterator extends FilterIterator
      */
     protected $methods = array();
 
+    /**
+     * Overrides the parent constructor to reset the internal iterator's
+     * pointer to the current item, which the parent class errantly does not
+     * do.
+     *
+     * @param Iterator $iterator Iterator to filter
+     *
+     * @return void
+     * @link http://bugs.php.net/bug.php?id=52560
+     */
+    public function __construct(Iterator $iterator)
+    {
+        parent::__construct($iterator);
+        $this->rewind();
+    }
+
     /**
      * Adds to a list of plugins to exclude when iterating.
      *
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Karma.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Karma.php
index f55f8d6edf..e6227be4a5 100644
--- a/plugins/Irc/extlib/phergie/Phergie/Plugin/Karma.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Karma.php
@@ -236,7 +236,7 @@ REGEX;
 
         $fixedKarma = $this->fetchFixedKarma($canonicalTerm);
         if ($fixedKarma) {
-            $message = $nick . ': ' . $term . $fixedKarma . '.';
+            $message = $nick . ': ' . $term . ' ' . $fixedKarma . '.';
             $this->doPrivmsg($source, $message);
             return;
         }
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Php.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Php.php
index 94abfb031c..e10d101e73 100644
--- a/plugins/Irc/extlib/phergie/Phergie/Plugin/Php.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Php.php
@@ -53,15 +53,7 @@ class Phergie_Plugin_Php extends Phergie_Plugin_Abstract
         }
 
         $this->getPluginHandler()->getPlugin('Command');
-    }
 
-    /**
-     * Initializes the data source. 
-     *
-     * @return void
-     */
-    public function onConnect()
-    {
         $this->source = new Phergie_Plugin_Php_Source_Local;
     }
 

From 067633a608a7567168cadf96e1bd1d5907931430 Mon Sep 17 00:00:00 2001
From: Luke Fitzgerald <lw.fitzgerald@googlemail.com>
Date: Sat, 7 Aug 2010 16:32:17 -0700
Subject: [PATCH 153/655] Added more commenting

---
 plugins/Irc/ChannelResponseChannel.php | 14 +++++++++
 plugins/Irc/Fake_Irc.php               |  9 +++++-
 plugins/Irc/IrcPlugin.php              | 42 ++++++++++++++++----------
 plugins/Irc/ircmanager.php             | 14 ++++-----
 4 files changed, 54 insertions(+), 25 deletions(-)

diff --git a/plugins/Irc/ChannelResponseChannel.php b/plugins/Irc/ChannelResponseChannel.php
index 580a3c12d7..d29a1da029 100644
--- a/plugins/Irc/ChannelResponseChannel.php
+++ b/plugins/Irc/ChannelResponseChannel.php
@@ -35,11 +35,25 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
 class ChannelResponseChannel extends IMChannel {
     protected $ircChannel;
 
+    /**
+    * Construct a ChannelResponseChannel
+    *
+    * @param IMplugin $imPlugin IMPlugin
+    * @param string $ircChannel IRC Channel to reply to
+    * @return ChannelResponseChannel
+    */
     public function __construct($imPlugin, $ircChannel) {
         $this->ircChannel = $ircChannel;
         parent::__construct($imPlugin);
     }
 
+    /**
+    * Send a message using the plugin
+    *
+    * @param User $user User
+    * @param string $text Message text
+    * @return void
+    */
     public function output($user, $text) {
         $text = $user->nickname.': ['.common_config('site', 'name') . '] ' . $text;
         $this->imPlugin->send_message($this->ircChannel, $text);
diff --git a/plugins/Irc/Fake_Irc.php b/plugins/Irc/Fake_Irc.php
index 71892abf6e..d95ab0491d 100644
--- a/plugins/Irc/Fake_Irc.php
+++ b/plugins/Irc/Fake_Irc.php
@@ -34,7 +34,14 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
 class Fake_Irc extends Phergie_Driver_Streams {
     public $would_be_sent = null;
 
+    /**
+    * Store the components for sending a command
+    *
+    * @param string $command Command
+    * @param array $args Arguments
+    * @return void
+    */
     protected function send($command, $args = '') {
         $this->would_be_sent = array('command' => $command, 'args' => $args);
     }
-}
+}
\ No newline at end of file
diff --git a/plugins/Irc/IrcPlugin.php b/plugins/Irc/IrcPlugin.php
index 75eaf687b2..85c348d9b3 100644
--- a/plugins/Irc/IrcPlugin.php
+++ b/plugins/Irc/IrcPlugin.php
@@ -66,8 +66,8 @@ class IrcPlugin extends ImPlugin {
     public $regregexp = null;
 
     public $transport = 'irc';
-    public $whiteList;
-    public $fake_irc;
+    protected $whiteList;
+    protected $fake_irc;
 
     /**
      * Get the internationalized/translated display name of this IM service
@@ -81,8 +81,8 @@ class IrcPlugin extends ImPlugin {
     /**
      * Normalize a screenname for comparison
      *
-     * @param string $screenname screenname to normalize
-     * @return string an equivalent screenname in normalized form
+     * @param string $screenname Screenname to normalize
+     * @return string An equivalent screenname in normalized form
      */
     public function normalize($screenname) {
         $screenname = str_replace(" ","", $screenname);
@@ -101,8 +101,8 @@ class IrcPlugin extends ImPlugin {
     /**
      * Validate (ensure the validity of) a screenname
      *
-     * @param string $screenname screenname to validate
-     * @return boolean
+     * @param string $screenname Screenname to validate
+     * @return boolean true if screenname is valid
      */
     public function validate($screenname) {
         if (preg_match('/\A[a-z0-9\-_]{1,1000}\z/i', $screenname)) {
@@ -141,6 +141,7 @@ class IrcPlugin extends ImPlugin {
     /*
      * Start manager on daemon start
      *
+     * @param array &$versions Array to insert manager into
      * @return boolean
      */
     public function onStartImDaemonIoManagers(&$classes) {
@@ -152,7 +153,7 @@ class IrcPlugin extends ImPlugin {
     /**
     * Get a microid URI for the given screenname
     *
-    * @param string $screenname
+    * @param string $screenname Screenname
     * @return string microid URI
     */
     public function microiduri($screenname) {
@@ -164,7 +165,7 @@ class IrcPlugin extends ImPlugin {
      *
      * @param string $screenname Screenname to send to
      * @param string $body Text to send
-     * @return boolean success value
+     * @return boolean true on success
      */
     public function send_message($screenname, $body) {
         $lines = explode("\n", $body);
@@ -178,7 +179,7 @@ class IrcPlugin extends ImPlugin {
     /**
      * Accept a queued input message.
      *
-     * @return true if processing completed, false if message should be reprocessed
+     * @return boolean true if processing completed, false if message should be reprocessed
      */
     public function receive_raw_message($data) {
         if (strpos($data['source'], '#') === 0) {
@@ -196,6 +197,15 @@ class IrcPlugin extends ImPlugin {
         return true;
     }
 
+    /**
+     * Helper for handling incoming messages from a channel requiring response
+     * to the channel instead of via PM
+     *
+     * @param string $nick Screenname the message was sent from
+     * @param string $channel Channel the message originated from
+     * @param string $message Message text
+     * @param boolean true on success
+     */
     protected function handle_channel_incoming($nick, $channel, $notice_text) {
         $user = $this->get_user($nick);
         // For common_current_user to work
@@ -232,9 +242,9 @@ class IrcPlugin extends ImPlugin {
     /**
      * Attempt to handle a message from a channel as a command
      *
-     * @param User $user user the message is from
+     * @param User $user User the message is from
      * @param string $channel Channel the message originated from
-     * @param string $body message text
+     * @param string $body Message text
      * @return boolean true if the message was a command and was executed, false if it was not a command
      */
     protected function handle_channel_command($user, $channel, $body) {
@@ -277,10 +287,10 @@ class IrcPlugin extends ImPlugin {
     * Only sends the confirmation message if the nick is
     * registered
     *
-    * @param string $screenname screenname sending to
-    * @param string $code the confirmation code
-    * @param User $user user sending to
-    * @return boolean success value
+    * @param string $screenname Screenname sending to
+    * @param string $code The confirmation code
+    * @param User $user User sending to
+    * @return boolean true on succes
     */
     public function checked_send_confirmation_code($screenname, $code, $user) {
         $this->fake_irc->doPrivmsg('NickServ', 'INFO '.$screenname);
@@ -345,7 +355,7 @@ class IrcPlugin extends ImPlugin {
     /**
      * Get plugin information
      *
-     * @param array $versions array to insert information into
+     * @param array $versions Array to insert information into
      * @return void
      */
     public function onPluginVersion(&$versions) {
diff --git a/plugins/Irc/ircmanager.php b/plugins/Irc/ircmanager.php
index 2ceb9db2c0..b99c7b2fea 100644
--- a/plugins/Irc/ircmanager.php
+++ b/plugins/Irc/ircmanager.php
@@ -23,17 +23,16 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
  * IRC background connection manager for IRC-using queue handlers,
  * allowing them to send outgoing messages on the right connection.
  *
- * Input is handled during socket select loop, keepalive pings during idle.
- * Any incoming messages will be handled.
+ * Input is handled during socket select loop, Any incoming messages will be handled.
  *
  * In a multi-site queuedaemon.php run, one connection will be instantiated
  * for each site being handled by the current process that has IRC enabled.
  */
 
 class IrcManager extends ImManager {
-    public $conn = null;
-    public $regchecks = array();
-    public $regchecksLookup = array();
+    protected $conn = null;
+    protected $regchecks = array();
+    protected $regchecksLookup = array();
 
     /**
      * Initialize connection to server.
@@ -67,7 +66,7 @@ class IrcManager extends ImManager {
     /**
      * Process IRC events that have come in over the wire.
      *
-     * @param resource $socket
+     * @param resource $socket Socket to handle input on
      * @return void
      */
     public function handleInput($socket) {
@@ -142,7 +141,6 @@ class IrcManager extends ImManager {
 
     /**
     * Called via a callback when a message is received
-    *
     * Passes it back to the queuing system
     *
     * @param array $data Data
@@ -201,7 +199,7 @@ class IrcManager extends ImManager {
     /**
      * Send a message using the daemon
      *
-     * @param $data Message
+     * @param $data Message data
      * @return boolean true on success
      */
     public function send_raw_message($data) {

From 7cd52847a519d2572fd5ceb34228969cab95f068 Mon Sep 17 00:00:00 2001
From: Luke Fitzgerald <lw.fitzgerald@googlemail.com>
Date: Sat, 7 Aug 2010 17:25:43 -0700
Subject: [PATCH 154/655] Added pinging to keep connection open

---
 plugins/Irc/ircmanager.php | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/plugins/Irc/ircmanager.php b/plugins/Irc/ircmanager.php
index b99c7b2fea..bd6242a6a5 100644
--- a/plugins/Irc/ircmanager.php
+++ b/plugins/Irc/ircmanager.php
@@ -31,6 +31,8 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 class IrcManager extends ImManager {
     protected $conn = null;
+    protected $lastPing = null;
+
     protected $regchecks = array();
     protected $regchecksLookup = array();
 
@@ -63,6 +65,18 @@ class IrcManager extends ImManager {
         }
     }
 
+    /**
+     * Idle processing for io manager's execution loop.
+     * Send keepalive pings to server.
+     *
+     * @return void
+     */
+    public function idle($timeout = 0) {
+        if (empty($this->lastPing) || time() - $this->lastPing > 120) {
+            $this->send_ping();
+        }
+    }
+
     /**
      * Process IRC events that have come in over the wire.
      *
@@ -232,4 +246,14 @@ class IrcManager extends ImManager {
 
         return true;
     }
+
+    /**
+    * Sends a ping
+    *
+    * @return void
+    */
+    protected function send_ping() {
+        $this->lastPing = time();
+        $this->conn->send('PING', $this->lastPing);
+    }
 }

From da61c8567c3cd96bf27462f3ca10cee276473c83 Mon Sep 17 00:00:00 2001
From: Luke Fitzgerald <lw.fitzgerald@googlemail.com>
Date: Sat, 7 Aug 2010 17:29:13 -0700
Subject: [PATCH 155/655] Small cosmetic changes

---
 plugins/Irc/ircmanager.php | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/plugins/Irc/ircmanager.php b/plugins/Irc/ircmanager.php
index bd6242a6a5..ebde56a947 100644
--- a/plugins/Irc/ircmanager.php
+++ b/plugins/Irc/ircmanager.php
@@ -33,8 +33,8 @@ class IrcManager extends ImManager {
     protected $conn = null;
     protected $lastPing = null;
 
-    protected $regchecks = array();
-    protected $regchecksLookup = array();
+    protected $regChecks = array();
+    protected $regChecksLookup = array();
 
     /**
      * Initialize connection to server.
@@ -71,9 +71,9 @@ class IrcManager extends ImManager {
      *
      * @return void
      */
-    public function idle($timeout = 0) {
+    public function idle() {
         if (empty($this->lastPing) || time() - $this->lastPing > 120) {
-            $this->send_ping();
+            $this->sendPing();
         }
     }
 
@@ -175,10 +175,10 @@ class IrcManager extends ImManager {
     public function handle_reg_response($data) {
         // Retrieve data
         $screenname = $data['screenname'];
-        $nickdata = $this->regchecks[$screenname];
+        $nickdata = $this->regChecks[$screenname];
         $usernick = $nickdata['user']->nickname;
 
-        if (isset($this->regchecksLookup[$usernick])) {
+        if (isset($this->regChecksLookup[$usernick])) {
             if ($data['registered']) {
                 // Send message
                 $this->plugin->send_confirmation_code($screenname, $nickdata['code'], $nickdata['user'], true);
@@ -203,10 +203,10 @@ class IrcManager extends ImManager {
             }
 
             // Unset lookup value
-            unset($this->regchecksLookup[$usernick]);
+            unset($this->regChecksLookup[$usernick]);
 
             // Unset data
-            unset($this->regchecks[$screename]);
+            unset($this->regChecks[$screename]);
         }
     }
 
@@ -229,12 +229,12 @@ class IrcManager extends ImManager {
             $screenname = $nickdata['screenname'];
 
             // Cancel any existing checks for this user
-            if (isset($this->regchecksLookup[$usernick])) {
-                unset($this->regchecks[$this->regchecksLookup[$usernick]]);
+            if (isset($this->regChecksLookup[$usernick])) {
+                unset($this->regChecks[$this->regChecksLookup[$usernick]]);
             }
 
-            $this->regchecks[$screenname] = $nickdata;
-            $this->regchecksLookup[$usernick] = $screenname;
+            $this->regChecks[$screenname] = $nickdata;
+            $this->regChecksLookup[$usernick] = $screenname;
         }
 
         try {
@@ -252,7 +252,7 @@ class IrcManager extends ImManager {
     *
     * @return void
     */
-    protected function send_ping() {
+    protected function sendPing() {
         $this->lastPing = time();
         $this->conn->send('PING', $this->lastPing);
     }

From d321b6e76f3d683b080db19cc63500d159fc0053 Mon Sep 17 00:00:00 2001
From: Luke Fitzgerald <lw.fitzgerald@googlemail.com>
Date: Mon, 9 Aug 2010 07:03:54 -0700
Subject: [PATCH 156/655] Requeue waiting messages on start/connection loss

---
 plugins/Msn/msnmanager.php | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/plugins/Msn/msnmanager.php b/plugins/Msn/msnmanager.php
index 42eb18b9c4..235c8a9430 100644
--- a/plugins/Msn/msnmanager.php
+++ b/plugins/Msn/msnmanager.php
@@ -42,6 +42,7 @@ class MsnManager extends ImManager {
      */
     public function start($master) {
         if (parent::start($master)) {
+            $this->requeue_waiting_messages();
             $this->connect();
             return true;
         } else {
@@ -185,6 +186,21 @@ class MsnManager extends ImManager {
         }
     }
 
+    /**
+    * Requeue messages from the waiting table so we try
+    * to send them again
+    *
+    * @return void
+    */
+    protected function requeue_waiting_messages() {
+        $wm = Msn_waiting_message::top($data['to']);
+        while ($wm != NULL) {
+            $this->plugin->send_message($wm->screenname, $wm->message);
+            $wm->delete();
+            $wm = Msn_waiting_message::top($data['to']);
+        }
+    }
+
     /**
     * Called by callback to log failure during connect
     *
@@ -203,6 +219,8 @@ class MsnManager extends ImManager {
     */
     public function handle_reconnect($data) {
         common_log(LOG_NOTICE, 'MSN reconnecting');
+        // Requeue messages waiting in the DB
+        $this->requeue_waiting_messages();
     }
 
     /**

From bc331a015560c239b8ec377c29958947e07a6baa Mon Sep 17 00:00:00 2001
From: Luke Fitzgerald <lw.fitzgerald@googlemail.com>
Date: Mon, 9 Aug 2010 07:05:58 -0700
Subject: [PATCH 157/655] Made private methods protected

---
 plugins/Msn/msnmanager.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/plugins/Msn/msnmanager.php b/plugins/Msn/msnmanager.php
index 235c8a9430..8e568c64cb 100644
--- a/plugins/Msn/msnmanager.php
+++ b/plugins/Msn/msnmanager.php
@@ -32,8 +32,8 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 class MsnManager extends ImManager {
     public $conn = null;
-    private $lastping = null;
-    private $pingInterval;
+    protected $lastPing = null;
+    protected $pingInterval;
 
     /**
      * Initialise connection to server.
@@ -72,7 +72,7 @@ class MsnManager extends ImManager {
      * @return void
      */
     public function idle($timeout = 0) {
-        if (empty($this->lastping) || time() - $this->lastping > $this->pingInterval) {
+        if (empty($this->lastPing) || time() - $this->lastPing > $this->pingInterval) {
             $this->send_ping();
         }
     }
@@ -81,7 +81,7 @@ class MsnManager extends ImManager {
      * Message pump is triggered on socket input, so we only need an idle()
      * call often enough to trigger our outgoing pings.
      */
-    function timeout() {
+    public function timeout() {
         return $this->pingInterval;
     }
 
@@ -119,7 +119,7 @@ class MsnManager extends ImManager {
             $this->conn->registerHandler('ConnectFailed', array($this, 'handle_connect_failed'));
             $this->conn->registerHandler('Reconnect', array($this, 'handle_reconnect'));
             $this->conn->signon();
-            $this->lastping = time();
+            $this->lastPing = time();
         }
         return $this->conn;
     }
@@ -130,14 +130,14 @@ class MsnManager extends ImManager {
     *
     * @return void
     */
-    private function send_ping() {
+    protected function send_ping() {
         $this->connect();
         if (!$this->conn) {
             return false;
         }
 
         $this->conn->sendPing();
-        $this->lastping = time();
+        $this->lastPing = time();
         $this->pingInterval = 50;
         return true;
     }
@@ -230,7 +230,7 @@ class MsnManager extends ImManager {
     * @param string $to Intended recipient
     * @param string $message Message
     */
-    private function enqueue_waiting_message($to, $message) {
+    protected function enqueue_waiting_message($to, $message) {
         $wm = new Msn_waiting_message();
 
         $wm->screenname = $to;
@@ -268,7 +268,7 @@ class MsnManager extends ImManager {
         }
 
         // Sending a command updates the time till next ping
-        $this->lastping = time();
+        $this->lastPing = time();
         $this->pingInterval = 50;
         return true;
     }

From 613ae551c66affa904ae18279d9d5847ed5d88bc Mon Sep 17 00:00:00 2001
From: Luke Fitzgerald <lw.fitzgerald@googlemail.com>
Date: Mon, 9 Aug 2010 07:08:29 -0700
Subject: [PATCH 158/655] Set lastPing on connect

---
 plugins/Irc/ircmanager.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/Irc/ircmanager.php b/plugins/Irc/ircmanager.php
index ebde56a947..7acb85468f 100644
--- a/plugins/Irc/ircmanager.php
+++ b/plugins/Irc/ircmanager.php
@@ -148,6 +148,7 @@ class IrcManager extends ImManager {
             );
 
             $this->conn->setConfig($config);
+            $this->lastPing = time();
             $this->conn->connect();
         }
         return $this->conn;

From 322e7c4e9fe6f5e53623776c850ecfe61b5a3182 Mon Sep 17 00:00:00 2001
From: Luke Fitzgerald <lw.fitzgerald@googlemail.com>
Date: Mon, 9 Aug 2010 09:26:31 -0700
Subject: [PATCH 159/655] Small reordering of code (cosmetic)

---
 plugins/Irc/ircmanager.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/Irc/ircmanager.php b/plugins/Irc/ircmanager.php
index 7acb85468f..96c019b7fc 100644
--- a/plugins/Irc/ircmanager.php
+++ b/plugins/Irc/ircmanager.php
@@ -148,8 +148,8 @@ class IrcManager extends ImManager {
             );
 
             $this->conn->setConfig($config);
-            $this->lastPing = time();
             $this->conn->connect();
+            $this->lastPing = time();
         }
         return $this->conn;
     }

From 8e925927c6fe1bb485030bdc0151f0b90e8ceab4 Mon Sep 17 00:00:00 2001
From: Luke Fitzgerald <lw.fitzgerald@googlemail.com>
Date: Tue, 10 Aug 2010 17:27:02 -0700
Subject: [PATCH 160/655] First commit of message throttling code

---
 plugins/Irc/IrcPlugin.php                     |  23 +++-
 plugins/Irc/Irc_waiting_message.php           | 125 ++++++++++++++++++
 .../phergie/Phergie/Plugin/Statusnet.php      |  30 +++++
 plugins/Irc/ircmanager.php                    | 100 ++++++++++++--
 4 files changed, 266 insertions(+), 12 deletions(-)
 create mode 100644 plugins/Irc/Irc_waiting_message.php

diff --git a/plugins/Irc/IrcPlugin.php b/plugins/Irc/IrcPlugin.php
index 85c348d9b3..54b7585211 100644
--- a/plugins/Irc/IrcPlugin.php
+++ b/plugins/Irc/IrcPlugin.php
@@ -126,6 +126,7 @@ class IrcPlugin extends ImPlugin {
                 include_once $dir . '/'.strtolower($cls).'.php';
                 return false;
             case 'Fake_Irc':
+            case 'Irc_waiting_message':
             case 'ChannelResponseChannel':
                 include_once $dir . '/'. $cls .'.php';
                 return false;
@@ -150,6 +151,25 @@ class IrcPlugin extends ImPlugin {
         return true;
     }
 
+    /**
+    * Ensure the database table is present
+    *
+    */
+    public function onCheckSchema() {
+        $schema = Schema::get();
+
+        // For storing messages while sessions become ready
+        $schema->ensureTable('irc_waiting_message',
+                             array(new ColumnDef('id', 'integer', null,
+                                                 false, 'PRI', null, null, true),
+                                   new ColumnDef('data', 'blob', null, false),
+                                   new ColumnDef('prioritise', 'tinyint', 1, false),
+                                   new ColumnDef('created', 'datetime', null, false),
+                                   new ColumnDef('claimed', 'datetime')));
+
+        return true;
+    }
+
     /**
     * Get a microid URI for the given screenname
     *
@@ -171,7 +191,7 @@ class IrcPlugin extends ImPlugin {
         $lines = explode("\n", $body);
         foreach ($lines as $line) {
             $this->fake_irc->doPrivmsg($screenname, $line);
-            $this->enqueue_outgoing_raw(array('type' => 'message', 'data' => $this->fake_irc->would_be_sent));
+            $this->enqueue_outgoing_raw(array('type' => 'message', 'prioritise' => 0, 'data' => $this->fake_irc->would_be_sent));
         }
         return true;
     }
@@ -297,6 +317,7 @@ class IrcPlugin extends ImPlugin {
         $this->enqueue_outgoing_raw(
             array(
                 'type' => 'nickcheck',
+                'prioritise' => 1,
                 'data' => $this->fake_irc->would_be_sent,
                 'nickdata' =>
                     array(
diff --git a/plugins/Irc/Irc_waiting_message.php b/plugins/Irc/Irc_waiting_message.php
new file mode 100644
index 0000000000..05f72754c7
--- /dev/null
+++ b/plugins/Irc/Irc_waiting_message.php
@@ -0,0 +1,125 @@
+<?php
+/**
+ * Table Definition for irc_waiting_message
+ */
+require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
+
+class Irc_waiting_message extends Memcached_DataObject {
+
+    public $__table = 'irc_waiting_message'; // table name
+    public $id;                              // int primary_key not_null auto_increment
+    public $data;                            // blob not_null
+    public $prioritise;                      // tinyint(1) not_null
+    public $created;                         // datetime() not_null
+    public $claimed;                         // datetime()
+
+    /* Static get */
+    public function staticGet($k, $v = null) {
+        return Memcached_DataObject::staticGet('Irc_waiting_message', $k, $v);
+    }
+
+    /**
+    * return table definition for DB_DataObject
+    *
+    * DB_DataObject needs to know something about the table to manipulate
+    * instances. This method provides all the DB_DataObject needs to know.
+    *
+    * @return array array of column definitions
+    */
+    public function table() {
+        return array('id' => DB_DATAOBJECT_INT + DB_DATAOBJECT_NOTNULL,
+                     'data' => DB_DATAOBJECT_BLOB + DB_DATAOBJECT_STR + DB_DATAOBJECT_NOTNULL,
+                     'prioritise' => DB_DATAOBJECT_INT + DB_DATAOBJECT_NOTNULL,
+                     'created' => DB_DATAOBJECT_TIME + DB_DATAOBJECT_STR + DB_DATAOBJECT_NOTNULL,
+                     'claimed' => DB_DATAOBJECT_TIME + DB_DATAOBJECT_STR);
+    }
+
+    /**
+    * return key definitions for DB_DataObject
+    *
+    * DB_DataObject needs to know about keys that the table has, since it
+    * won't appear in StatusNet's own keys list. In most cases, this will
+    * simply reference your keyTypes() function.
+    *
+    * @return array list of key field names
+    */
+    public function keys() {
+        return array_keys($this->keyTypes());
+    }
+
+    /**
+    * return key definitions for Memcached_DataObject
+    *
+    * Our caching system uses the same key definitions, but uses a different
+    * method to get them. This key information is used to store and clear
+    * cached data, so be sure to list any key that will be used for static
+    * lookups.
+    *
+    * @return array associative array of key definitions, field name to type:
+    *         'K' for primary key: for compound keys, add an entry for each component;
+    *         'U' for unique keys: compound keys are not well supported here.
+    */
+    public function keyTypes() {
+        return array('id' => 'K');
+    }
+
+    /**
+    * Magic formula for non-autoincrementing integer primary keys
+    *
+    * If a table has a single integer column as its primary key, DB_DataObject
+    * assumes that the column is auto-incrementing and makes a sequence table
+    * to do this incrementation. Since we don't need this for our class, we
+    * overload this method and return the magic formula that DB_DataObject needs.
+    *
+    * @return array magic three-false array that stops auto-incrementing.
+    */
+    public function sequenceKey() {
+        return array(false, false, false);
+    }
+
+    /**
+     * Get the next item in the queue
+     *
+     * @return Irc_waiting_message Next message if there is one
+     */
+    public static function top() {
+        $wm = new Irc_waiting_message();
+
+        $wm->orderBy('prioritise DESC, created');
+        $wm->whereAdd('claimed is null');
+
+        $wm->limit(1);
+
+        $cnt = $wm->find(true);
+
+        if ($cnt) {
+            # XXX: potential race condition
+            # can we force it to only update if claimed is still null
+            # (or old)?
+            common_log(LOG_INFO, 'claiming IRC waiting message id = ' . $wm->id);
+            $orig = clone($wm);
+            $wm->claimed = common_sql_now();
+            $result = $wm->update($orig);
+            if ($result) {
+                common_log(LOG_INFO, 'claim succeeded.');
+                return $wm;
+            } else {
+                common_log(LOG_INFO, 'claim failed.');
+            }
+        }
+        $wm = null;
+        return null;
+    }
+
+    /**
+     * Release a claimed item.
+     */
+    public function releaseClaim() {
+        // DB_DataObject doesn't let us save nulls right now
+        $sql = sprintf("UPDATE irc_waiting_message SET claimed=NULL WHERE id=%d", $this->id);
+        $this->query($sql);
+
+        $this->claimed = null;
+        $this->encache();
+    }
+}
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Statusnet.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Statusnet.php
index fb75f1d798..dc2680a6df 100644
--- a/plugins/Irc/extlib/phergie/Phergie/Plugin/Statusnet.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Statusnet.php
@@ -41,6 +41,13 @@ class Phergie_Plugin_Statusnet extends Phergie_Plugin_Abstract {
     */
     protected $regCallback;
 
+    /**
+    * Connection established callback details
+    *
+    * @var array
+    */
+    protected $connectedCallback;
+
     /**
     * Load callback from config
     */
@@ -59,6 +66,13 @@ class Phergie_Plugin_Statusnet extends Phergie_Plugin_Abstract {
             $this->regCallback = NULL;
         }
 
+        $connectedCallback = $this->config['statusnet.connectedcallback'];
+        if (is_callable($connectedCallback)) {
+            $this->connectedCallback = $connectedCallback;
+        } else {
+            $this->connectedCallback = NULL;
+        }
+
         $this->unregRegexp = $this->getConfig('statusnet.unregregexp', '/\x02(.*?)\x02 (?:isn\'t|is not) registered/i');
         $this->regRegexp = $this->getConfig('statusnet.regregexp', '/(?:\A|\x02)(\w+?)\x02? (?:\(account|is \w+?\z)/i');
     }
@@ -110,4 +124,20 @@ class Phergie_Plugin_Statusnet extends Phergie_Plugin_Abstract {
             }
         }
     }
+
+    /**
+     * Intercepts the end of the "message of the day" response and tells
+     * StatusNet we're connected
+     *
+     * @return void
+     */
+    public function onResponse() {
+        switch ($this->getEvent()->getCode()) {
+        case Phergie_Event_Response::RPL_ENDOFMOTD:
+        case Phergie_Event_Response::ERR_NOMOTD:
+            if ($this->connectedCallback !== NULL) {
+                call_user_func($this->connectedCallback);
+            }
+        }
+    }
 }
diff --git a/plugins/Irc/ircmanager.php b/plugins/Irc/ircmanager.php
index 96c019b7fc..7e2b32b23e 100644
--- a/plugins/Irc/ircmanager.php
+++ b/plugins/Irc/ircmanager.php
@@ -32,10 +32,14 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 class IrcManager extends ImManager {
     protected $conn = null;
     protected $lastPing = null;
+    protected $messageWaiting = true;
+    protected $lastMessage = null;
 
     protected $regChecks = array();
     protected $regChecksLookup = array();
 
+    protected $connected = false;
+
     /**
      * Initialize connection to server.
      *
@@ -65,16 +69,38 @@ class IrcManager extends ImManager {
         }
     }
 
+    public function timeout() {
+        return 1;
+    }
+
     /**
      * Idle processing for io manager's execution loop.
-     * Send keepalive pings to server.
      *
      * @return void
      */
     public function idle() {
+        // Send a ping if necessary
         if (empty($this->lastPing) || time() - $this->lastPing > 120) {
             $this->sendPing();
         }
+
+        if ($this->connected) {
+            // Send a waiting message if appropriate
+            if ($this->messageWaiting && time() - $this->lastMessage > 1) {
+                $wm = Irc_waiting_message::top();
+                if ($wm === NULL) {
+                    $this->messageWaiting = false;
+                    return;
+                }
+                $data = unserialize($wm->data);
+
+                if (!$this->send_raw_message($data)) {
+                    $this->plugin->enqueue_outgoing_raw($data);
+                }
+
+                $wm->delete();
+            }
+        }
     }
 
     /**
@@ -90,6 +116,7 @@ class IrcManager extends ImManager {
         try {
             $this->conn->handleEvents();
         } catch (Phergie_Driver_Exception $e) {
+            $this->connected = false;
             $this->conn->reconnect();
         }
     }
@@ -142,6 +169,7 @@ class IrcManager extends ImManager {
 
                     'statusnet.messagecallback' => array($this, 'handle_irc_message'),
                     'statusnet.regcallback' => array($this, 'handle_reg_response'),
+                    'statusnet.connectedcallback' => array($this, 'handle_connected'),
                     'statusnet.unregregexp' => $this->plugin->unregregexp,
                     'statusnet.regregexp' => $this->plugin->regregexp
                 )
@@ -150,6 +178,7 @@ class IrcManager extends ImManager {
             $this->conn->setConfig($config);
             $this->conn->connect();
             $this->lastPing = time();
+            $this->lastMessage = time();
         }
         return $this->conn;
     }
@@ -211,6 +240,38 @@ class IrcManager extends ImManager {
         }
     }
 
+    /**
+    * Called when the connection is established
+    *
+    * @return void
+    */
+    public function handle_connected() {
+        $this->connected = true;
+    }
+
+    /**
+    * Enters a message into the database for sending when ready
+    *
+    * @param string $command Command
+    * @param array $args Arguments
+    * @return boolean
+    */
+    protected function enqueue_waiting_message($data) {
+        $wm = new Irc_waiting_message();
+
+        $wm->data       = serialize($data);
+        $wm->prioritise = $data['prioritise'];
+        $wm->created    = common_sql_now();
+        $result         = $wm->insert();
+
+        if (!$result) {
+            common_log_db_error($wm, 'INSERT', __FILE__);
+            throw new ServerException('DB error inserting IRC waiting queue item');
+        }
+
+        return true;
+    }
+
     /**
      * Send a message using the daemon
      *
@@ -223,28 +284,45 @@ class IrcManager extends ImManager {
             return false;
         }
 
-        if ($data['type'] != 'message') {
-            // Nick checking
-            $nickdata = $data['nickdata'];
-            $usernick = $nickdata['user']->nickname;
-            $screenname = $nickdata['screenname'];
+        if ($data['type'] != 'delayedmessage') {
+            if ($data['type'] != 'message') {
+                // Nick checking
+                $nickdata = $data['nickdata'];
+                $usernick = $nickdata['user']->nickname;
+                $screenname = $nickdata['screenname'];
 
-            // Cancel any existing checks for this user
-            if (isset($this->regChecksLookup[$usernick])) {
-                unset($this->regChecks[$this->regChecksLookup[$usernick]]);
+                // Cancel any existing checks for this user
+                if (isset($this->regChecksLookup[$usernick])) {
+                    unset($this->regChecks[$this->regChecksLookup[$usernick]]);
+                }
+
+                $this->regChecks[$screenname] = $nickdata;
+                $this->regChecksLookup[$usernick] = $screenname;
             }
 
-            $this->regChecks[$screenname] = $nickdata;
-            $this->regChecksLookup[$usernick] = $screenname;
+            // If there is a backlog or we need to wait, queue the message
+            if ($this->messageWaiting || time() - $this->lastMessage < 1) {
+                $this->enqueue_waiting_message(
+                    array(
+                        'type' => 'delayedmessage',
+                        'prioritise' => $data['prioritise'],
+                        'data' => $data['data']
+                    )
+                );
+                $this->messageWaiting = true;
+                return true;
+            }
         }
 
         try {
             $this->conn->send($data['data']['command'], $data['data']['args']);
         } catch (Phergie_Driver_Exception $e) {
+            $this->connected = false;
             $this->conn->reconnect();
             return false;
         }
 
+        $this->lastMessage = time();
         return true;
     }
 

From ef6813eb67669f873b99c604cb72507792b0a7af Mon Sep 17 00:00:00 2001
From: Luke Fitzgerald <lw.fitzgerald@googlemail.com>
Date: Tue, 10 Aug 2010 17:42:18 -0700
Subject: [PATCH 161/655] Fix some typos and missing letters

---
 plugins/Msn/msn_waiting_message.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/plugins/Msn/msn_waiting_message.php b/plugins/Msn/msn_waiting_message.php
index d69520b40b..0af7c4f3ec 100644
--- a/plugins/Msn/msn_waiting_message.php
+++ b/plugins/Msn/msn_waiting_message.php
@@ -30,8 +30,8 @@ class Msn_waiting_message extends Memcached_DataObject {
         return array('id' => DB_DATAOBJECT_INT + DB_DATAOBJECT_NOTNULL,
                      'screenname' => DB_DATAOBJECT_STR + DB_DATAOBJECT_NOTNULL,
                      'message' => DB_DATAOBJECT_STR + DB_DATAOBJECT_NOTNULL,
-                     'created' => DB_DATAOBJECT_STR + DB_DATAOBJECT_NOTNULL,
-                     'claimed' => DB_DATAOBJECT_STR);
+                     'created' => DB_DATAOBJECT_TIME + DB_DATAOBJECT_STR + DB_DATAOBJECT_NOTNULL,
+                     'claimed' => DB_DATAOBJECT_TIME + DB_DATAOBJECT_STR);
     }
 
     /**
@@ -86,8 +86,8 @@ class Msn_waiting_message extends Memcached_DataObject {
         if ($screenname) {
             if (is_array($screenname)) {
                 // @fixme use safer escaping
-                $list = implode("','", array_map('addslashes', $transports));
-                $wm->whereAdd("screename in ('$list')");
+                $list = implode("','", array_map('addslashes', $screenname));
+                $wm->whereAdd("screenname in ('$list')");
             } else {
                 $wm->screenname = $screenname;
             }

From 8005bdb421eaad1c77195d8efa4aaf169082d51d Mon Sep 17 00:00:00 2001
From: Luke Fitzgerald <lw.fitzgerald@googlemail.com>
Date: Tue, 10 Aug 2010 18:34:12 -0700
Subject: [PATCH 162/655] Reset message to non-delay type before requeuing

---
 plugins/Irc/ircmanager.php | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/plugins/Irc/ircmanager.php b/plugins/Irc/ircmanager.php
index 7e2b32b23e..aa0ff3539f 100644
--- a/plugins/Irc/ircmanager.php
+++ b/plugins/Irc/ircmanager.php
@@ -69,8 +69,17 @@ class IrcManager extends ImManager {
         }
     }
 
+    /**
+     * Request a maximum timeout for listeners before the next idle period.
+     *
+     * @return integer Maximum timeout
+     */
     public function timeout() {
-        return 1;
+        if ($this->messageWaiting) {
+            return 1;
+        } else {
+            return 120;
+        }
     }
 
     /**
@@ -95,7 +104,13 @@ class IrcManager extends ImManager {
                 $data = unserialize($wm->data);
 
                 if (!$this->send_raw_message($data)) {
-                    $this->plugin->enqueue_outgoing_raw($data);
+                    $this->plugin->enqueue_outgoing_raw(
+                        array(
+                            'type' => 'message',
+                            'prioritise' => $data['prioritise'],
+                            'data' => $data['data']
+                        )
+                    );
                 }
 
                 $wm->delete();

From 9da2368383701988dbca08544479c95ad8a7c11f Mon Sep 17 00:00:00 2001
From: Luke Fitzgerald <lw.fitzgerald@googlemail.com>
Date: Tue, 10 Aug 2010 19:23:45 -0700
Subject: [PATCH 163/655] Retry using the waiting queue so as to preserve
 message ordering

---
 plugins/Irc/IrcPlugin.php           |  1 +
 plugins/Irc/Irc_waiting_message.php | 17 +++++++++++++++++
 plugins/Irc/ircmanager.php          | 23 +++++++++++++----------
 3 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/plugins/Irc/IrcPlugin.php b/plugins/Irc/IrcPlugin.php
index 54b7585211..e073d6f13d 100644
--- a/plugins/Irc/IrcPlugin.php
+++ b/plugins/Irc/IrcPlugin.php
@@ -164,6 +164,7 @@ class IrcPlugin extends ImPlugin {
                                                  false, 'PRI', null, null, true),
                                    new ColumnDef('data', 'blob', null, false),
                                    new ColumnDef('prioritise', 'tinyint', 1, false),
+                                   new ColumnDef('attempts', 'integer', null, false),
                                    new ColumnDef('created', 'datetime', null, false),
                                    new ColumnDef('claimed', 'datetime')));
 
diff --git a/plugins/Irc/Irc_waiting_message.php b/plugins/Irc/Irc_waiting_message.php
index 05f72754c7..59eec63d8d 100644
--- a/plugins/Irc/Irc_waiting_message.php
+++ b/plugins/Irc/Irc_waiting_message.php
@@ -10,6 +10,7 @@ class Irc_waiting_message extends Memcached_DataObject {
     public $id;                              // int primary_key not_null auto_increment
     public $data;                            // blob not_null
     public $prioritise;                      // tinyint(1) not_null
+    public $attempts;                        // int not_null
     public $created;                         // datetime() not_null
     public $claimed;                         // datetime()
 
@@ -111,6 +112,22 @@ class Irc_waiting_message extends Memcached_DataObject {
         return null;
     }
 
+    /**
+    * Increment the attempts count
+    *
+    * @return void
+    * @throws Exception
+    */
+    public function incAttempts() {
+        $orig = clone($this);
+        $this->attempts++;
+        $result = $this->update($orig);
+
+        if (!$result) {
+            throw Exception(sprintf(_m("Could not increment attempts count for %d"), $this->id));
+        }
+    }
+
     /**
      * Release a claimed item.
      */
diff --git a/plugins/Irc/ircmanager.php b/plugins/Irc/ircmanager.php
index aa0ff3539f..5f55e6b34d 100644
--- a/plugins/Irc/ircmanager.php
+++ b/plugins/Irc/ircmanager.php
@@ -101,19 +101,21 @@ class IrcManager extends ImManager {
                     $this->messageWaiting = false;
                     return;
                 }
+
                 $data = unserialize($wm->data);
+                $wm->incAttempts();
 
-                if (!$this->send_raw_message($data)) {
-                    $this->plugin->enqueue_outgoing_raw(
-                        array(
-                            'type' => 'message',
-                            'prioritise' => $data['prioritise'],
-                            'data' => $data['data']
-                        )
-                    );
+                if ($this->send_raw_message($data)) {
+                    $wm->delete();
+                } else {
+                    if ($wm->attempts <= common_config('queue', 'max_retries')) {
+                        // Try again next idle
+                        $wm->releaseClaim();
+                    } else {
+                        // Exceeded the maximum number of retries
+                        $wm->delete();
+                    }
                 }
-
-                $wm->delete();
             }
         }
     }
@@ -276,6 +278,7 @@ class IrcManager extends ImManager {
 
         $wm->data       = serialize($data);
         $wm->prioritise = $data['prioritise'];
+        $wm->attempts   = 0;
         $wm->created    = common_sql_now();
         $result         = $wm->insert();
 

From e10ff3475bc3b5a456c86f78074472d17badd3c3 Mon Sep 17 00:00:00 2001
From: Luke Fitzgerald <lw.fitzgerald@googlemail.com>
Date: Wed, 11 Aug 2010 10:35:20 -0700
Subject: [PATCH 164/655] Disabled debugging output

---
 plugins/Irc/ircmanager.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/Irc/ircmanager.php b/plugins/Irc/ircmanager.php
index 5f55e6b34d..76c02660ff 100644
--- a/plugins/Irc/ircmanager.php
+++ b/plugins/Irc/ircmanager.php
@@ -177,7 +177,7 @@ class IrcManager extends ImManager {
 
                     'plugins.autoload' => true,
 
-                    'ui.enabled' => true,
+                    //'ui.enabled' => true,
 
                     'nickserv.password' => $this->plugin->nickservpassword,
                     'nickserv.identify_message' => $this->plugin->nickservidentifyregexp,

From 17f6c080634f3382981755b8a4c9823bf090dd7d Mon Sep 17 00:00:00 2001
From: Luke Fitzgerald <lw.fitzgerald@googlemail.com>
Date: Wed, 11 Aug 2010 10:36:19 -0700
Subject: [PATCH 165/655] Disabled debugging output

---
 plugins/Msn/msnmanager.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/Msn/msnmanager.php b/plugins/Msn/msnmanager.php
index 8e568c64cb..8f434dad99 100644
--- a/plugins/Msn/msnmanager.php
+++ b/plugins/Msn/msnmanager.php
@@ -110,7 +110,7 @@ class MsnManager extends ImManager {
                     'password' => $this->plugin->password,
                     'alias' => $this->plugin->nickname,
                     'psm' => 'Send me a message to post a notice',
-                    'debug' => true
+                    'debug' => false
                 )
             );
             $this->conn->registerHandler('IMin', array($this, 'handle_msn_message'));

From 4b2abf05155d3bcce845d5f959bb5bb8761a7fcb Mon Sep 17 00:00:00 2001
From: Luke Fitzgerald <lw.fitzgerald@googlemail.com>
Date: Wed, 11 Aug 2010 10:37:43 -0700
Subject: [PATCH 166/655] Disabled debugging output

---
 plugins/Irc/ircmanager.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/Irc/ircmanager.php b/plugins/Irc/ircmanager.php
index 96c019b7fc..5efc732682 100644
--- a/plugins/Irc/ircmanager.php
+++ b/plugins/Irc/ircmanager.php
@@ -133,7 +133,7 @@ class IrcManager extends ImManager {
 
                     'plugins.autoload' => true,
 
-                    'ui.enabled' => true,
+                    //'ui.enabled' => true,
 
                     'nickserv.password' => $this->plugin->nickservpassword,
                     'nickserv.identify_message' => $this->plugin->nickservidentifyregexp,

From daa3fef96dc709b9aca1fb44802c45612320987f Mon Sep 17 00:00:00 2001
From: Luke Fitzgerald <lw.fitzgerald@googlemail.com>
Date: Wed, 11 Aug 2010 10:42:11 -0700
Subject: [PATCH 167/655] Added comment to show debugging toggle

---
 plugins/Irc/ircmanager.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/Irc/ircmanager.php b/plugins/Irc/ircmanager.php
index 76c02660ff..5c8e09e356 100644
--- a/plugins/Irc/ircmanager.php
+++ b/plugins/Irc/ircmanager.php
@@ -177,6 +177,7 @@ class IrcManager extends ImManager {
 
                     'plugins.autoload' => true,
 
+                    // Uncomment to enable debugging output
                     //'ui.enabled' => true,
 
                     'nickserv.password' => $this->plugin->nickservpassword,

From d2c72d8ae195525bcfb8f99c7f1e740fd3a84104 Mon Sep 17 00:00:00 2001
From: Luke Fitzgerald <lw.fitzgerald@googlemail.com>
Date: Wed, 11 Aug 2010 10:49:09 -0700
Subject: [PATCH 168/655] Add an config option to change the ping interval

---
 plugins/Irc/IrcPlugin.php  | 4 ++++
 plugins/Irc/README         | 2 ++
 plugins/Irc/ircmanager.php | 4 ++--
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/plugins/Irc/IrcPlugin.php b/plugins/Irc/IrcPlugin.php
index e073d6f13d..c555580c38 100644
--- a/plugins/Irc/IrcPlugin.php
+++ b/plugins/Irc/IrcPlugin.php
@@ -60,6 +60,7 @@ class IrcPlugin extends ImPlugin {
     public $channels = null;
     public $transporttype = null;
     public $encoding = null;
+    public $pinginterval = null;
 
     public $regcheck = null;
     public $unregregexp = null;
@@ -359,6 +360,9 @@ class IrcPlugin extends ImPlugin {
         if (!isset($this->encoding)) {
             $this->encoding = 'UTF-8';
         }
+        if (!isset($this->pinginterval)) {
+            $this->pinginterval = 120;
+        }
 
         if (!isset($this->regcheck)) {
             $this->regcheck = true;
diff --git a/plugins/Irc/README b/plugins/Irc/README
index bc45688f1e..0a5d9ea83f 100644
--- a/plugins/Irc/README
+++ b/plugins/Irc/README
@@ -23,6 +23,8 @@ nickservidentifyregexp: Override existing regexp matching request for identifica
 channels: Channels for bot to idle in
 transporttype: Set to 'ssl' to enable SSL
 encoding: Set to change encoding
+pinginterval: Set to change the number of seconds between pings (helps keep the connection open)
+              Defaults to 120 seconds
 regcheck: Check user's nicknames are registered, enabled by default, set to false to disable
 regregexp: Override existing regexp matching response from NickServ if nick checked is registered.
            Must contain a capturing group catching the nick
diff --git a/plugins/Irc/ircmanager.php b/plugins/Irc/ircmanager.php
index 5c8e09e356..f036ef3091 100644
--- a/plugins/Irc/ircmanager.php
+++ b/plugins/Irc/ircmanager.php
@@ -78,7 +78,7 @@ class IrcManager extends ImManager {
         if ($this->messageWaiting) {
             return 1;
         } else {
-            return 120;
+            return $this->plugin->pinginterval;
         }
     }
 
@@ -89,7 +89,7 @@ class IrcManager extends ImManager {
      */
     public function idle() {
         // Send a ping if necessary
-        if (empty($this->lastPing) || time() - $this->lastPing > 120) {
+        if (empty($this->lastPing) || time() - $this->lastPing > $this->plugin->pinginterval) {
             $this->sendPing();
         }
 

From a3fea6f673392f4cfa94164899cc7b07fd65ce9c Mon Sep 17 00:00:00 2001
From: Luke Fitzgerald <lw.fitzgerald@googlemail.com>
Date: Thu, 12 Aug 2010 11:58:53 -0700
Subject: [PATCH 169/655] Merge in Phergie changes

---
 .../Irc/extlib/phergie/Phergie/Connection.php |   8 +-
 .../extlib/phergie/Phergie/Plugin/Cron.php    |   2 +-
 .../extlib/phergie/Phergie/Plugin/Handler.php |  19 +-
 .../extlib/phergie/Phergie/Plugin/Karma.php   |  80 ++-
 .../extlib/phergie/Phergie/Plugin/Message.php |   4 +-
 .../extlib/phergie/Phergie/Plugin/Reload.php  |  41 +-
 .../phergie/Phergie/Plugin/SpellCheck.php     |  18 +-
 .../phergie/Phergie/Plugin/TerryChay.php      |  51 +-
 .../phergie/Tests/Phergie/ConnectionTest.php  | 262 ++++++++++
 .../Tests/Phergie/Plugin/HandlerTest.php      | 129 ++++-
 .../Tests/Phergie/Plugin/KarmaTest.php        | 335 ++++++++++++
 .../phergie/Tests/Phergie/Plugin/PingTest.php | 201 ++++----
 .../phergie/Tests/Phergie/Plugin/PongTest.php |  48 +-
 .../Tests/Phergie/Plugin/SpellCheckTest.php   | 281 +++++-----
 .../Tests/Phergie/Plugin/TerryChayTest.php    | 136 +++--
 .../phergie/Tests/Phergie/Plugin/TestCase.php | 488 +++++++++++++-----
 16 files changed, 1513 insertions(+), 590 deletions(-)
 create mode 100644 plugins/Irc/extlib/phergie/Tests/Phergie/ConnectionTest.php
 create mode 100644 plugins/Irc/extlib/phergie/Tests/Phergie/Plugin/KarmaTest.php

diff --git a/plugins/Irc/extlib/phergie/Phergie/Connection.php b/plugins/Irc/extlib/phergie/Phergie/Connection.php
index b3f0acf83d..746dec05f4 100755
--- a/plugins/Irc/extlib/phergie/Phergie/Connection.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Connection.php
@@ -141,9 +141,9 @@ class Phergie_Connection
     {
         if (empty($this->hostmask)) {
             $this->hostmask = new Phergie_Hostmask(
-                $this->nick,
-                $this->username,
-                $this->host
+                $this->getNick(),
+                $this->getUsername(),
+                $this->getHost()
             );
         }
 
@@ -223,7 +223,7 @@ class Phergie_Connection
         if (!in_array($this->transport, stream_get_transports())) {
             throw new Phergie_Connection_Exception(
                 'Transport ' . $this->transport . ' is not supported',
-                Phergie_Connection_Exception::TRANSPORT_NOT_SUPPORTED
+                Phergie_Connection_Exception::ERR_TRANSPORT_NOT_SUPPORTED
             );
         }
 
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Cron.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Cron.php
index 1c27f97842..d24910fa32 100644
--- a/plugins/Irc/extlib/phergie/Phergie/Plugin/Cron.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Cron.php
@@ -110,7 +110,7 @@ class Phergie_Plugin_Cron extends Phergie_Plugin_Abstract
      */
     public function onTick()
     {
-        $now = time();
+        $time = time();
         foreach ($this->callbacks as $key => &$callback) {
             $callbackString = $this->getCallbackString($callback);
 
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Handler.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Handler.php
index 335c10f881..c3086587be 100755
--- a/plugins/Irc/extlib/phergie/Phergie/Plugin/Handler.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Handler.php
@@ -98,6 +98,12 @@ class Phergie_Plugin_Handler implements IteratorAggregate, Countable
         $this->paths = array();
         $this->autoload = false;
 
+        if (!empty($config['plugins.paths'])) {
+            foreach ($config['plugins.paths'] as $dir => $prefix) {
+                $this->addPath($dir, $prefix);
+            }
+        }
+
         $this->addPath(dirname(__FILE__), 'Phergie_Plugin_');
     }
 
@@ -134,6 +140,7 @@ class Phergie_Plugin_Handler implements IteratorAggregate, Countable
      * Returns metadata corresponding to a specified plugin.
      *
      * @param string $plugin Short name of the plugin class
+     *
      * @throws Phergie_Plugin_Exception Class file can't be found
      *
      * @return array|boolean Associative array containing the path to the
@@ -142,7 +149,7 @@ class Phergie_Plugin_Handler implements IteratorAggregate, Countable
      */
     public function getPluginInfo($plugin)
     {
-       foreach (array_reverse($this->paths) as $path) {
+        foreach (array_reverse($this->paths) as $path) {
             $file = $path['path'] . $plugin . '.php';
             if (file_exists($file)) {
                 $path = array(
@@ -444,15 +451,21 @@ class Phergie_Plugin_Handler implements IteratorAggregate, Countable
         $valid = true;
 
         try {
+            $error_reporting = error_reporting(0); // ignore autoloader errors
             $r = new ReflectionClass($class);
-            $valid = $r->isSubclassOf('FilterIterator');
+            error_reporting($error_reporting);
+            if (!$r->isSubclassOf('FilterIterator')) {
+                $message = 'Class ' . $class . ' is not a subclass of FilterIterator';
+                $valid = false;
+            }
         } catch (ReflectionException $e) {
+            $message = $e->getMessage();
             $valid = false;
         }
 
         if (!$valid) {
             throw new Phergie_Plugin_Exception(
-                $e->getMessage(),
+                $message,
                 Phergie_Plugin_Exception::ERR_INVALID_ITERATOR_CLASS
             );
         }
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Karma.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Karma.php
index e6227be4a5..27b4a087d3 100644
--- a/plugins/Irc/extlib/phergie/Phergie/Plugin/Karma.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Karma.php
@@ -31,7 +31,6 @@
  * @uses     extension PDO
  * @uses     extension pdo_sqlite
  * @uses     Phergie_Plugin_Command pear.phergie.org
- * @uses     Phergie_Plugin_Message pear.phergie.org
  */
 class Phergie_Plugin_Karma extends Phergie_Plugin_Abstract
 {
@@ -94,11 +93,16 @@ class Phergie_Plugin_Karma extends Phergie_Plugin_Abstract
     {
         $plugins = $this->getPluginHandler();
         $plugins->getPlugin('Command');
-        $plugins->getPlugin('Message');
-
-        $file = dirname(__FILE__) . '/Karma/karma.db';
-        $this->db = new PDO('sqlite:' . $file);
+        $this->getDb();
+    }
 
+    /**
+     * Initializes prepared statements used by the plugin.
+     *
+     * @return void
+     */
+    protected function initializePreparedStatements()
+    {
         $this->fetchKarma = $this->db->prepare('
             SELECT karma
             FROM karmas
@@ -139,6 +143,36 @@ class Phergie_Plugin_Karma extends Phergie_Plugin_Abstract
         ');
     }
 
+    /**
+     * Returns a connection to the plugin database, initializing one if none
+     * is explicitly set.
+     *
+     * @return PDO Database connection
+     */
+    public function getDb()
+    {
+        if (empty($this->db)) {
+            $this->db = new PDO('sqlite:' . dirname(__FILE__) . '/Karma/karma.db');
+            $this->initializePreparedStatements();
+        }
+        return $this->db;
+    }
+
+    /**
+     * Sets the connection to the plugin database, mainly intended for unit
+     * testing.
+     *
+     * @param PDO $db Database connection
+     *
+     * @return Phergie_Plugin_Karma Provides a fluent interface
+     */
+    public function setDb(PDO $db)
+    {
+        $this->db = $db;
+        $this->initializePreparedStatements();
+        return $this;
+    }
+
     /**
      * Get the canonical form of a given term.
      *
@@ -228,15 +262,11 @@ REGEX;
         $source = $this->getEvent()->getSource();
         $nick = $this->getEvent()->getNick();
 
-        if (empty($term)) {
-            return;
-        }
-
         $canonicalTerm = $this->getCanonicalTerm($term);
 
         $fixedKarma = $this->fetchFixedKarma($canonicalTerm);
         if ($fixedKarma) {
-            $message = $nick . ': ' . $term . ' ' . $fixedKarma . '.';
+            $message = $nick . ': ' . $term . ' ' . $fixedKarma;
             $this->doPrivmsg($source, $message);
             return;
         }
@@ -302,33 +332,29 @@ REGEX;
         $fixedKarma0 = $this->fetchFixedKarma($canonicalTerm0);
         $fixedKarma1 = $this->fetchFixedKarma($canonicalTerm1);
 
-        if ($fixedKarma0
-            || $fixedKarma1
-            || empty($canonicalTerm0)
-            || empty($canonicalTerm1)
-        ) {
+        if ($fixedKarma0 || $fixedKarma1) {
             return;
         }
 
         if ($canonicalTerm0 == 'everything') {
             $change = $method == '<' ? '++' : '--';
-            $this->modifyKarma($canonicalTerm1, $change);
             $karma0 = 0;
-            $karma1 = $this->fetchKarma($canonicalTerm1);
+            $karma1 = $this->modifyKarma($canonicalTerm1, $change);
         } elseif ($canonicalTerm1 == 'everything') {
             $change = $method == '<' ? '--' : '++';
-            $this->modifyKarma($canonicalTerm0, $change);
-            $karma0 = $this->fetchKarma($canonicalTerm1);
+            $karma0 = $this->modifyKarma($canonicalTerm0, $change);
             $karma1 = 0;
         } else {
             $karma0 = $this->fetchKarma($canonicalTerm0);
             $karma1 = $this->fetchKarma($canonicalTerm1);
         }
 
-        if (($method == '<'
-            && $karma0 < $karma1)
-            || ($method == '>'
-            && $karma0 > $karma1)) {
+        // Combining the first and second branches here causes an odd
+        // single-line lapse in code coverage, but the lapse disappears if
+        // they're separated
+        if ($method == '<' && $karma0 < $karma1) {
+            $replies = $this->fetchPositiveAnswer;
+        } elseif ($method == '>' && $karma0 > $karma1) {
             $replies = $this->fetchPositiveAnswer;
         } else {
             $replies = $this->fetchNegativeAnswer;
@@ -356,14 +382,10 @@ REGEX;
      * @param string $term   Term to modify
      * @param string $action Karma action (either ++ or --)
      *
-     * @return void
+     * @return int Modified karma rating
      */
     protected function modifyKarma($term, $action)
     {
-        if (empty($term)) {
-            return;
-        }
-
         $karma = $this->fetchKarma($term);
         if ($karma !== false) {
             $statement = $this->updateKarma;
@@ -378,6 +400,8 @@ REGEX;
             ':karma' => $karma
         );
         $statement->execute($args);
+
+        return $karma;
     }
 
     /**
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Message.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Message.php
index 4dfbb30dee..af8fc7287b 100644
--- a/plugins/Irc/extlib/phergie/Phergie/Plugin/Message.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Message.php
@@ -52,14 +52,14 @@ class Phergie_Plugin_Message extends Phergie_Plugin_Abstract
         $}ix
 REGEX;
 
-        return !$event->isInChannel()
+        return !$event->isInChannel() 
             || preg_match($targetPattern, $event->getText()) > 0;
     }
 
     /**
      * Allow for prefix and bot name aware extraction of a message
      *
-     * @return string|bool $message The message, which is possibly targeted at the
+     * @return string|bool $message The message, which is possibly targeted at the 
      *                              bot or false if a prefix requirement failed
      */
     public function getMessage()
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/Reload.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/Reload.php
index 90e3adcd52..4305770812 100755
--- a/plugins/Irc/extlib/phergie/Phergie/Plugin/Reload.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Reload.php
@@ -54,10 +54,27 @@ class Phergie_Plugin_Reload extends Phergie_Plugin_Abstract
     {
         $plugin = ucfirst($plugin);
 
+        $evalClass = true;
+        if (strpos($plugin, ' ') !== false) {
+            $args = explode(' ', $plugin);
+            $plugin = $args[0];
+            if (strtolower($args[1]) == 'force') {
+                $evalClass = false;
+            }
+        }
+
         if (!$this->plugins->hasPlugin($plugin)) {
             echo 'DEBUG(Reload): ' . ucfirst($plugin) . ' is not loaded yet, loading', PHP_EOL;
-            $this->plugins->getPlugin($plugin);
-            $this->plugins->command->populateMethodCache();
+            try {
+                $this->plugins->getPlugin($plugin);
+                $this->plugins->command->populateMethodCache();
+            } catch (Phergie_Plugin_Exception $e) {
+                if ($e->getCode() == Phergie_Plugin_Exception::ERR_CLASS_NOT_FOUND) {
+                    echo 'DEBUG(Reload): ', $e->getMessage(), PHP_EOL;
+                } else {
+                    throw $e;
+                }
+            }
             return;
         }
 
@@ -75,17 +92,19 @@ class Phergie_Plugin_Reload extends Phergie_Plugin_Abstract
         $newClass = $class . '_' . sha1($contents);
 
         if (class_exists($newClass, false)) {
-            echo 'DEBUG(Reload): Class ', $class, ' has not changed since last reload', PHP_EOL;
-            return;
+            if ($evalClass == true) {
+                echo 'DEBUG(Reload): Class ', $class, ' has not changed since last reload', PHP_EOL;
+                return;
+            }
+        } else {
+            $contents = preg_replace(
+                array('/^<\?(?:php)?/', '/class\s+' . $class . '/i'),
+                array('', 'class ' . $newClass),
+                $contents
+            );
+            eval($contents);
         }
 
-        $contents = preg_replace(
-            array('/^<\?(?:php)?/', '/class\s+' . $class . '/i'),
-            array('', 'class ' . $newClass),
-            $contents
-        );
-        eval($contents);
-
         $instance = new $newClass;
         $instance->setName($plugin);
         $instance->setEvent($this->event);
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/SpellCheck.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/SpellCheck.php
index 33240829d8..b731cffc87 100644
--- a/plugins/Irc/extlib/phergie/Phergie/Plugin/SpellCheck.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/SpellCheck.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Phergie 
+ * Phergie
  *
  * PHP version 5
  *
@@ -11,7 +11,7 @@
  * It is also available through the world-wide-web at this URL:
  * http://phergie.org/license
  *
- * @category  Phergie 
+ * @category  Phergie
  * @package   Phergie_Plugin_TerryChay
  * @author    Phergie Development Team <team@phergie.org>
  * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
@@ -24,7 +24,7 @@
  * either confirmation of correctly spelled words or potential correct
  * spellings for misspelled words.
  *
- * @category Phergie 
+ * @category Phergie
  * @package  Phergie_Plugin_SpellCheck
  * @author   Phergie Development Team <team@phergie.org>
  * @license  http://phergie.org/license New BSD License
@@ -34,7 +34,6 @@
  */
 class Phergie_Plugin_SpellCheck extends Phergie_Plugin_Abstract
 {
-
     /**
      * Spell check dictionary handler
      *
@@ -65,7 +64,7 @@ class Phergie_Plugin_SpellCheck extends Phergie_Plugin_Abstract
         }
 
         $this->plugins->getPlugin('Command');
-       
+
         set_error_handler(array($this, 'loadDictionaryError'));
         $this->pspell = pspell_new($this->getConfig('spellcheck.lang'));
         restore_error_handler();
@@ -86,11 +85,11 @@ class Phergie_Plugin_SpellCheck extends Phergie_Plugin_Abstract
         $target = $this->event->getNick();
 
         $message  = $target . ': The word "' . $word;
-        $message .= '" seems to be spelt correctly.';
+        $message .= '" seems to be spelled correctly.';
         if (!pspell_check($this->pspell, $word)) {
             $suggestions = pspell_suggest($this->pspell, $word);
-           
-            $message  = $target; 
+
+            $message  = $target;
             $message .= ': I could not find any suggestions for "' . $word . '".';
             if (!empty($suggestions)) {
                 $suggestions = array_splice($suggestions, 0, $this->limit);
@@ -98,7 +97,7 @@ class Phergie_Plugin_SpellCheck extends Phergie_Plugin_Abstract
                 $message    .= $word . '": ' . implode(', ', $suggestions) . '.';
             }
         }
-         
+
         $this->doPrivmsg($source, $message);
     }
 
@@ -116,5 +115,4 @@ class Phergie_Plugin_SpellCheck extends Phergie_Plugin_Abstract
     {
         $this->fail($errstr);
     }
-
 }
diff --git a/plugins/Irc/extlib/phergie/Phergie/Plugin/TerryChay.php b/plugins/Irc/extlib/phergie/Phergie/Plugin/TerryChay.php
index 611dfc9ef1..246cfc3986 100644
--- a/plugins/Irc/extlib/phergie/Phergie/Plugin/TerryChay.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/TerryChay.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Phergie 
+ * Phergie
  *
  * PHP version 5
  *
@@ -11,7 +11,7 @@
  * It is also available through the world-wide-web at this URL:
  * http://phergie.org/license
  *
- * @category  Phergie 
+ * @category  Phergie
  * @package   Phergie_Plugin_TerryChay
  * @author    Phergie Development Team <team@phergie.org>
  * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
@@ -21,9 +21,9 @@
 
 /**
  * Parses incoming messages for the words "Terry Chay" or tychay and responds
- * with a random Terry fact retrieved from the Chayism web service. 
+ * with a random Terry fact retrieved from the Chayism web service.
  *
- * @category Phergie 
+ * @category Phergie
  * @package  Phergie_Plugin_TerryChay
  * @author   Phergie Development Team <team@phergie.org>
  * @license  http://phergie.org/license New BSD License
@@ -53,21 +53,25 @@ class Phergie_Plugin_TerryChay extends Phergie_Plugin_Abstract
      */
     public function onLoad()
     {
-        $this->http = $this->getPluginHandler()->getPlugin('Http');
+        $this->getPluginHandler()->getPlugin('Http');
     }
 
     /**
      * Fetches a chayism.
      *
-     * @return string|bool Fetched chayism or FALSE if the operation failed 
+     * @return string|bool Fetched chayism or FALSE if the operation failed
      */
     public function getChayism()
     {
-        return $this->http->get(self::URL)->getContent();
+        return $this
+            ->getPluginHandler()
+            ->getPlugin('Http')
+            ->get(self::URL)
+            ->getContent();
     }
 
     /**
-     * Parses incoming messages for "Terry Chay" and related variations and 
+     * Parses incoming messages for "Terry Chay" and related variations and
      * responds with a chayism.
      *
      * @return void
@@ -77,33 +81,14 @@ class Phergie_Plugin_TerryChay extends Phergie_Plugin_Abstract
         $event = $this->getEvent();
         $source = $event->getSource();
         $message = $event->getText();
-        $pattern 
-            = '{^(' . preg_quote($this->getConfig('command.prefix')) . 
+        $pattern
+            = '{^(' . preg_quote($this->getConfig('command.prefix')) .
             '\s*)?.*(terry\s+chay|tychay)}ix';
 
-        if (preg_match($pattern, $message)
-            && $fact = $this->getChayism()
-        ) {
-            $this->doPrivmsg($source, 'Fact: ' . $fact);
-        }
-    }
-
-    /**
-     * Parses incoming CTCP request for "Terry Chay" and related variations 
-     * and responds with a chayism.
-     *
-     * @return void
-     */
-    public function onCtcp()
-    {
-        $event = $this->getEvent();
-        $source = $event->getSource();
-        $ctcp = $event->getArgument(1);
-
-        if (preg_match('({terry[\s_+-]*chay}|tychay)ix', $ctcp)
-            && $fact = $this->getChayism()
-        ) {
-            $this->doCtcpReply($source, 'TERRYCHAY', $fact);
+        if (preg_match($pattern, $message)) {
+            if($fact = $this->getChayism()) {
+                $this->doPrivmsg($source, 'Fact: ' . $fact);
+            }
         }
     }
 }
diff --git a/plugins/Irc/extlib/phergie/Tests/Phergie/ConnectionTest.php b/plugins/Irc/extlib/phergie/Tests/Phergie/ConnectionTest.php
new file mode 100644
index 0000000000..ba94cd0ea6
--- /dev/null
+++ b/plugins/Irc/extlib/phergie/Tests/Phergie/ConnectionTest.php
@@ -0,0 +1,262 @@
+<?php
+/**
+ * Phergie
+ *
+ * PHP version 5
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.
+ * It is also available through the world-wide-web at this URL:
+ * http://phergie.org/license
+ *
+ * @category  Phergie
+ * @package   Phergie_Tests
+ * @author    Phergie Development Team <team@phergie.org>
+ * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
+ * @license   http://phergie.org/license New BSD License
+ * @link      http://pear.phergie.org/package/Phergie_Tests
+ */
+
+/**
+ * Unit test suite for Pherge_Connection.
+ *
+ * @category Phergie
+ * @package  Phergie_Tests
+ * @author   Phergie Development Team <team@phergie.org>
+ * @license  http://phergie.org/license New BSD License
+ * @link     http://pear.phergie.org/package/Phergie_Tests
+ */
+class Phergie_ConnectionTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * Associative array containing an option-to-value mapping
+     *
+     * @var array
+     */
+    private $options = array(
+        'host' => 'example.com',
+        'port' => 4080,
+        'transport' => 'udp',
+        'encoding' => 'ASCII',
+        'nick' => 'MyNick',
+        'username' => 'MyUsername',
+        'realname' => 'MyRealName',
+        'password' => 'MyPassword',
+    );
+
+    /**
+     * Data provider for testGetOptionReturnsDefault().
+     *
+     * @return array Enumerated array of enumerated arrays each containing a
+     *               set of parameters for a single call to
+     *               testGetOptionReturnsDefault()
+     */
+    public function dataProviderTestGetOptionReturnsDefault()
+    {
+        return array(
+            array('transport', 'tcp'),
+            array('encoding', 'ISO-8859-1'),
+            array('port', 6667),
+            array('password', null),
+        );
+    }
+
+    /**
+     * Tests that a default values are used for some options.
+     *
+     * @param string $option Name of the option with a default value
+     * @param mixed  $value  Default value of the option
+     *
+     * @return void
+     * @dataProvider dataProviderTestGetOptionReturnsDefault
+     */
+    public function testGetOptionReturnsDefault($option, $value)
+    {
+        $connection = new Phergie_Connection;
+        $this->assertEquals($value, $connection->{'get' . ucfirst($option)}());
+    }
+
+    /**
+     * Tests that a default encoding is used if one isn't specified.
+     *
+     * @return void
+     */
+    public function testGetEncodingReturnsDefault()
+    {
+        $connection = new Phergie_Connection;
+        $this->assertEquals('ISO-8859-1', $connection->getEncoding());
+    }
+
+    /**
+     * Tests that options can be set via the constructor.
+     *
+     * @return void
+     */
+    public function testSetOptionsViaConstructor()
+    {
+        $connection = new Phergie_Connection($this->options);
+        foreach ($this->options as $key => $value) {
+            $this->assertEquals($value, $connection->{'get' . ucfirst($key)}());
+        }
+    }
+
+    /**
+     * Data provider for testGetHostmaskMissingDataGeneratesException().
+     *
+     * @return array Enumerated array of enumerated arrays each containing a
+     *               set of parameters for a single call to
+     *               testGetHostmaskMissingDataGeneratesException()
+     */
+    public function dataProviderTestGetHostmaskMissingDataGeneratesException()
+    {
+        return array(
+            array(null, $this->options['username'], $this->options['host']),
+            array($this->options['nick'], null, $this->options['host']),
+            array($this->options['nick'], $this->options['username'], null),
+        );
+    }
+
+    /**
+     * Tests that attempting to retrieve a hostmask without option values
+     * for all of its constituents generates an exception.
+     *
+     * @param string $nick     Bot nick
+     * @param string $username Bot username
+     * @param string $host     Server hostname
+     *
+     * @return void
+     * @dataProvider dataProviderTestGetHostmaskMissingDataGeneratesException
+     */
+    public function testGetHostmaskMissingDataGeneratesException($nick, $username, $host)
+    {
+        $options = array(
+            'nick' => $nick,
+            'username' => $username,
+            'host' => $host,
+        );
+
+        $connection = new Phergie_Connection($options);
+
+        try {
+            $hostmask = $connection->getHostmask();
+            $this->fail('Expected exception was not thrown');
+        } catch (Phergie_Connection_Exception $e) {
+            return;
+        } catch (Exception $e) {
+            $this->fail('Unexpected exception was thrown');
+        }
+    }
+
+    /**
+     * Tests that attempting to retrieve a hostmask with all required
+     * options is successful.
+     *
+     * @return void
+     */
+    public function testGetHostmaskWithValidData()
+    {
+        $options = array(
+            'nick' => 'MyNick',
+            'username' => 'MyUsername',
+            'host' => 'example.com'
+        );
+
+        $connection = new Phergie_Connection($options);
+        $hostmask = $connection->getHostmask();
+        $this->assertType('Phergie_Hostmask', $hostmask);
+    }
+
+    /**
+     * Data provider for testGetRequiredOptionsWithoutValuesSet().
+     *
+     * @return array Enumerated array of enumerated arrays each containing a
+     *               set of parameters for a single call to
+     *               testGetRequiredOptionsWithoutValuesSet()
+     */
+    public function dataProviderTestGetRequiredOptionsWithoutValuesSet()
+    {
+        return array(
+            array('host'),
+            array('nick'),
+            array('username'),
+            array('realname'),
+        );
+    }
+
+    /**
+     * Tests that attempting to retrieve values of required options when no
+     * values are set results in an exception.
+     *
+     * @param string $option Option name
+     *
+     * @return void
+     * @dataProvider dataProviderTestGetRequiredOptionsWithoutValuesSet
+     */
+    public function testGetRequiredOptionsWithoutValuesSet($option)
+    {
+        try {
+            $connection = new Phergie_Connection;
+            $value = $connection->{'get' . ucfirst($option)}();
+            $this->fail('Expected exception was not thrown');
+        } catch (Phergie_Connection_Exception $e) {
+            return;
+        } catch (Exception $e) {
+            $this->fail('Unexpected exception was thrown');
+        }
+    }
+
+    /**
+     * Tests that attempting to set an invalid value for the transport
+     * results in an exception.
+     *
+     * @return void
+     */
+    public function testSetTransportWithInvalidValue()
+    {
+        $connection = new Phergie_Connection;
+        try {
+            $connection->setTransport('blah');
+            $this->fail('Expected exception was not thrown');
+        } catch (Phergie_Connection_Exception $e) {
+            return;
+        } catch (Exception $e) {
+            $this->fail('Unexpected exception was thrown');
+        }
+    }
+
+    /**
+     * Tests that attempting to set an invalid value for the encoding
+     * results in an exception.
+     *
+     * @return void
+     */
+    public function testSetEncodingWithInvalidValue()
+    {
+        $connection = new Phergie_Connection;
+        try {
+            $connection->setEncoding('blah');
+            $this->fail('Expected exception was not thrown');
+        } catch (Phergie_Connection_Exception $e) {
+            return;
+        } catch (Exception $e) {
+            $this->fail('Unexpected exception was thrown');
+        }
+    }
+
+    /**
+     * Tests that options can be set collectively after the connection is
+     * instantiated.
+     *
+     * @return void
+     */
+    public function testSetOptions()
+    {
+        $connection = new Phergie_Connection;
+        $connection->setOptions($this->options);
+        foreach ($this->options as $key => $value) {
+            $this->assertEquals($value, $connection->{'get' . ucfirst($key)}());
+        }
+    }
+}
diff --git a/plugins/Irc/extlib/phergie/Tests/Phergie/Plugin/HandlerTest.php b/plugins/Irc/extlib/phergie/Tests/Phergie/Plugin/HandlerTest.php
index dcf52a65a1..9ecdd327ae 100644
--- a/plugins/Irc/extlib/phergie/Tests/Phergie/Plugin/HandlerTest.php
+++ b/plugins/Irc/extlib/phergie/Tests/Phergie/Plugin/HandlerTest.php
@@ -108,6 +108,77 @@ class Phergie_Plugin_HandlerTest extends PHPUnit_Framework_TestCase
         );
     }
 
+    /**
+     * Tests that a default iterator is returned if none is explicitly set.
+     *
+     * @return void
+     */
+    public function testGetIteratorReturnsDefault()
+    {
+        $this->assertType(
+            'Phergie_Plugin_Iterator',
+            $this->handler->getIterator()
+        );
+    }
+
+    /**
+     * Tests the ability to change the handler's iterator class when a valid
+     * class is specified.
+     *
+     * @return void
+     */
+    public function testSetIteratorClassWithValidClass()
+    {
+        eval('
+            class DummyIterator extends FilterIterator {
+                public function accept() {
+                    return true;
+                }
+            }
+        ');
+
+        $this->handler->setIteratorClass('DummyIterator');
+
+        $this->assertType(
+            'DummyIterator',
+            $this->handler->getIterator()
+        );
+    }
+
+    /**
+     * Tests that a failure occurs when a nonexistent iterator class is
+     * specified.
+     *
+     * @return void
+     */
+    public function testSetIteratorClassWithNonexistentClass()
+    {
+        try {
+            $this->handler->setIteratorClass('FooIterator');
+            $this->fail('Expected exception was not thrown');
+        } catch (Phergie_Plugin_Exception $e) {
+            return;
+        }
+        $this->fail('Unexpected exception was thrown');
+    }
+
+    /**
+     * Tests that a failure occurs when a class that is not a subclass of
+     * FilterIterator is specified.
+     *
+     * @return void
+     */
+    public function testSetIteratorClassWithNonFilterIteratorClass()
+    {
+        try {
+            $this->handler->setIteratorClass('ArrayIterator');
+            $this->fail('Expected exception was not thrown');
+        } catch (Phergie_Plugin_Exception $e) {
+            return;
+        }
+        $this->fail('Unexpected exception was thrown');
+    }
+
     /**
      * Tests countability of the plugin handler.
      *
@@ -714,23 +785,53 @@ class Phergie_Plugin_HandlerTest extends PHPUnit_Framework_TestCase
     }
 
     /**
-     * Tests the plugin receiving and using a predefined iterator instance.
+     * Tests that multiple plugin iterators can be used concurrently.
      *
-     * @depends testGetPlugins
      * @return void
      */
-    public function testSetIterator()
+    public function testUseMultiplePluginIteratorsConcurrently()
     {
-        $plugin = $this->getMockPlugin('TestPlugin');
-        $this->handler->addPlugin($plugin);
-        $plugins = $this->handler->getPlugins();
-        $iterator = new ArrayIterator($plugins);
-        $this->handler->setIterator($iterator);
-        $this->assertSame($this->handler->getIterator(), $iterator);
-        $iterated = array();
-        foreach ($this->handler as $plugin) {
-            $iterated[strtolower($plugin->getName())] = $plugin;
-        }
-        $this->assertEquals($iterated, $plugins);
+        $plugin1 = $this->getMockPlugin('TestPlugin1');
+        $this->handler->addPlugin($plugin1);
+
+        $plugin2 = $this->getMockPlugin('TestPlugin2');
+        $this->handler->addPlugin($plugin2);
+
+        $iterator1 = $this->handler->getIterator();
+        $iterator1->next();
+        $this->assertSame($plugin2, $iterator1->current());
+
+        $iterator2 = $this->handler->getIterator();
+        $this->assertSame($plugin1, $iterator2->current());
+    }
+
+    /**
+     * Tests adding plugin paths via configuration.
+     *
+     * @return void
+     */
+    public function testAddPluginPathsViaConfiguration()
+    {
+        $dir = dirname(__FILE__);
+        $prefix = 'Phergie_Plugin_';
+        $paths = array($dir => $prefix);
+        $this->config
+            ->expects($this->any())
+            ->method('offsetExists')
+            ->will($this->returnValue(true));
+        $this->config
+            ->expects($this->any())
+            ->method('offsetGet')
+            ->will($this->returnValue($paths));
+
+        // Reinitialize the handler so the configuration change takes effect
+        // within the constructor
+        $this->handler = new Phergie_Plugin_Handler(
+            $this->config,
+            $this->events
+        );
+
+        $this->handler->setAutoload(true);
+        $this->handler->getPlugin('Mock');
     }
 }
diff --git a/plugins/Irc/extlib/phergie/Tests/Phergie/Plugin/KarmaTest.php b/plugins/Irc/extlib/phergie/Tests/Phergie/Plugin/KarmaTest.php
new file mode 100644
index 0000000000..6b72316743
--- /dev/null
+++ b/plugins/Irc/extlib/phergie/Tests/Phergie/Plugin/KarmaTest.php
@@ -0,0 +1,335 @@
+<?php
+/**
+ * Phergie
+ *
+ * PHP version 5
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.
+ * It is also available through the world-wide-web at this URL:
+ * http://phergie.org/license
+ *
+ * @category  Phergie
+ * @package   Phergie_Tests
+ * @author    Phergie Development Team <team@phergie.org>
+ * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
+ * @license   http://phergie.org/license New BSD License
+ * @link      http://pear.phergie.org/package/Phergie_Tests
+ */
+
+/**
+ * Unit test suite for Pherge_Plugin_Karma.
+ *
+ * @category Phergie
+ * @package  Phergie_Tests
+ * @author   Phergie Development Team <team@phergie.org>
+ * @license  http://phergie.org/license New BSD License
+ * @link     http://pear.phergie.org/package/Phergie_Tests
+ */
+class Phergie_Plugin_KarmaTest extends Phergie_Plugin_TestCase
+{
+    /**
+     * Skips tests if the SQLite PDO driver is not available.
+     *
+     * @return void
+     */
+    public function setUp()
+    {
+        if (!extension_loaded('PDO') || !extension_loaded('pdo_sqlite')) {
+            $this->markTestSkipped('PDO or pdo_sqlite extension is required');
+        }
+
+        parent::setUp();
+    }
+
+    /**
+     * Configures the plugin to use a temporary copy of the database.
+     *
+     * @return PDO Connection to the temporary database
+     */
+    private function createMockDatabase()
+    {
+        $dbPath = $this->getPluginsPath('Karma/karma.db');
+        $db = $this->getMockDatabase($dbPath);
+        $this->plugin->setDb($db);
+        return $db;
+    }
+
+    /**
+     * Tests the requirement of the Command plugin.
+     *
+     * @return void
+     */
+    public function testRequiresCommandPlugin()
+    {
+        $this->assertRequiresPlugin('Command');
+        $this->plugin->onLoad();
+    }
+
+    /**
+     * Initiates a karma event with a specified term.
+     *
+     * @param string $term Karma term
+     *
+     * @return Phergie_Event_Request Initiated mock event
+     */
+    private function initiateKarmaEvent($term)
+    {
+        $args = array(
+            'receiver' => $this->source,
+            'text' => 'karma ' . $term
+        );
+        $event = $this->getMockEvent('privmsg', $args);
+        $this->plugin->setEvent($event);
+        return $event;
+    }
+
+    /**
+     * Checks for an expected karma response.
+     *
+     * @param Phergie_Event_Request $event    Event containing the karma
+     *                                        request
+     * @param string                $term     Karma term
+     * @param string                $response Portion of the response
+     *                                        message following the term
+     *                                        from the original event
+     *
+     * @return void
+     */
+    private function checkForKarmaResponse($event, $term, $response)
+    {
+        $text = $event->getNick() . ': ' . $response;
+        $this->assertEmitsEvent('privmsg', array($event->getSource(), $text));
+        $this->plugin->onCommandKarma($term);
+    }
+
+    /**
+     * Tests that a default database is used when none is specified.
+     *
+     * @return void
+     */
+    public function testGetDb()
+    {
+        $db = $this->plugin->getDb();
+        $this->assertType('PDO', $db);
+    }
+
+    /**
+     * Tests specifying a custom database for the plugin to use.
+     *
+     * @return void
+     */
+    public function testSetDb()
+    {
+        $db = $this->createMockDatabase();
+        $this->assertSame($db, $this->plugin->getDb());
+    }
+
+    /**
+     * Tests that issuing the karma command with an unknown term returns a
+     * neutral rating.
+     *
+     * @return void
+     */
+    public function testKarmaCommandOnUnknownTerm()
+    {
+        $term = 'foo';
+        $this->createMockDatabase();
+        $event = $this->initiateKarmaEvent($term);
+        $this->checkForKarmaResponse($event, $term, $term . ' has neutral karma.');
+    }
+
+    /**
+     * Tests that issuing the karma command with the term "me" returns the
+     * the karma rating for the initiating user.
+     *
+     * @return void
+     */
+    public function testKarmaCommandOnUser()
+    {
+        $term = 'me';
+        $this->createMockDatabase();
+        $event = $this->initiateKarmaEvent($term);
+        $this->checkForKarmaResponse($event, $term, 'You have neutral karma.');
+    }
+
+    /**
+     * Tests that issuing the karma command with a term that has a fixed
+     * karma rating results in that rating being returned.
+     *
+     * @return void
+     */
+    public function testKarmaCommandWithFixedKarmaTerm()
+    {
+        $term = 'phergie';
+        $this->createMockDatabase();
+        $event = $this->initiateKarmaEvent($term);
+        $this->checkForKarmaResponse($event, $term, 'phergie has karma of awesome.');
+    }
+
+    /**
+     * Supporting method that tests the result of a karma term rating change.
+     *
+     * @param string $term      Karma term for which the rating is being
+     *                          changed
+     * @param string $operation ++ or --
+     * @param int    $karma     Expected karma rating after the change is
+     *                          applied
+     */
+    private function checkForKarmaRatingChange($term, $operation, $karma)
+    {
+        $args = array(
+            'receiver' => $this->source,
+            'text' => $term . $operation
+        );
+        $event = $this->getMockEvent('privmsg', $args);
+        $this->plugin->setEvent($event);
+        $this->plugin->onPrivmsg();
+        $event = $this->initiateKarmaEvent($term);
+        $this->checkForKarmaResponse($event, $term, $term . ' has karma of ' . $karma . '.');
+    }
+
+    /**
+     * Tests incrementing the karma rating of a new term.
+     *
+     * @return void
+     */
+    public function testIncrementingKarmaRating()
+    {
+        $this->createMockDatabase();
+        $this->checkForKarmaRatingChange('foo', '++', 1);
+    }
+
+    /**
+     * Tests decrementing the karma rating of a new term.
+     *
+     * @return void
+     */
+    public function testDecrementingKarmaRating()
+    {
+        $this->createMockDatabase();
+        $this->checkForKarmaRatingChange('foo', '--', -1);
+    }
+
+    /**
+     * Tests modifying the karma rating of an existing term.
+     *
+     * @return void
+     */
+    public function testChangingExistingKarmaRating()
+    {
+        $term = 'foo';
+        $this->createMockDatabase();
+        $this->checkForKarmaRatingChange($term, '++', 1);
+        $this->checkForKarmaRatingChange($term, '++', 2);
+    }
+
+    /**
+     * Tests resetting the karma rating of an existing term to 0.
+     *
+     * @return void
+     */
+    public function testResettingExistingKarmaRating()
+    {
+        $term = 'foo';
+        $this->createMockDatabase();
+        $this->checkForKarmaRatingChange($term, '++', 1);
+        $this->plugin->onCommandReincarnate($term);
+        $event = $this->initiateKarmaEvent($term);
+        $this->checkForKarmaResponse($event, $term, $term . ' has neutral karma.');
+    }
+
+    /**
+     * Data provider for testKarmaComparisons().
+     *
+     * @return array Enumerated array of enumerated arrays each containing a
+     *               set of parameter values for a single call to
+     *               testKarmaComparisons()
+     */
+    public function dataProviderTestKarmaComparisons()
+    {
+        $term1 = 'foo';
+        $term2 = 'bar';
+
+        $positive = 'True that.';
+        $negative = 'No sir, not at all.';
+
+        return array(
+            array($term1, $term2, 1, 0, '>', $positive),
+            array($term1, $term2, 0, 1, '>', $negative),
+            array($term1, $term2, 1, 1, '>', $negative),
+            array($term1, $term2, 1, 0, '<', $negative),
+            array($term1, $term2, 0, 1, '<', $positive),
+            array($term1, $term2, 1, 1, '<', $negative),
+            array($term1, 'phergie', 1, 0, '>', $positive),
+            array('phergie', $term2, 0, 1, '<', $positive),
+            array($term1, 'everything', 0, 0, '>', $positive),
+            array('everything', $term2, 0, 0, '>', $positive),
+        );
+    }
+
+    /**
+     * Tests comparing the karma ratings of two terms.
+     *
+     * @param string $term1    First term
+     * @param string $term2    Second term
+     * @param int    $karma1   Karma rating of the first time, 0 or 1
+     * @param int    $karma2   Karma rating of the second term, 0 or 1
+     * @param string $operator Comparison operator, > or <
+     * @param string $response Response to check for
+     *
+     * @return void
+     * @dataProvider dataProviderTestKarmaComparisons
+     */
+    public function testKarmaComparisons($term1, $term2, $karma1, $karma2,
+        $operator, $response
+    ) {
+        $db = $this->createMockDatabase();
+
+        // Reduce answer tables to expected response
+        $stmt = $db->prepare('DELETE FROM positive_answers WHERE answer != ?');
+        $stmt->execute(array($response));
+        $stmt = $db->prepare('DELETE FROM negative_answers WHERE answer != ?');
+        $stmt->execute(array($response));
+
+        if ($karma1) {
+            $this->checkForKarmaRatingChange($term1, '++', 1);
+        }
+
+        if ($karma2) {
+            $this->checkForKarmaRatingChange($term2, '++', 1);
+        }
+
+        $args = array(
+            'receiver' => $this->source,
+            'text' => $term1 . ' ' . $operator . ' ' . $term2
+        );
+        $event = $this->getMockEvent('privmsg', $args);
+        $this->plugin->setEvent($event);
+
+        // Test lack of a response for terms with fixed karma ratings
+        if ($term1 == 'phergie' || $term2 == 'phergie') {
+            $callback = 'assertDoesNotEmitEvent';
+        } else {
+            $callback = 'assertEmitsEvent';
+        }
+
+        $this->$callback('privmsg', array($event->getSource(), $response));
+        $this->plugin->onPrivmsg();
+
+        // Test for karma changes when one term is "everything"
+        if ($term1 == 'everything' || $term2 == 'everything') {
+            if ($term1 == 'everything') {
+                $term = $term2;
+                $karma = ($operator == '>') ? -1 : 1;
+            } else {
+                $term = $term1;
+                $karma = ($operator == '>') ? 1 : -1;
+            }
+            $event = $this->initiateKarmaEvent($term);
+            $this->checkForKarmaResponse($event, $term, $term . ' has karma of ' . $karma . '.');
+        }
+    }
+}
diff --git a/plugins/Irc/extlib/phergie/Tests/Phergie/Plugin/PingTest.php b/plugins/Irc/extlib/phergie/Tests/Phergie/Plugin/PingTest.php
index b9c2dde3d4..ac30d46ffe 100644
--- a/plugins/Irc/extlib/phergie/Tests/Phergie/Plugin/PingTest.php
+++ b/plugins/Irc/extlib/phergie/Tests/Phergie/Plugin/PingTest.php
@@ -12,15 +12,13 @@
  * http://phergie.org/license
  *
  * @category  Phergie
- * @package   Phergie
+ * @package   Phergie_Tests
  * @author    Phergie Development Team <team@phergie.org>
  * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
  * @license   http://phergie.org/license New BSD License
- * @link      http://pear.phergie.org/package/Phergie
+ * @link      http://pear.phergie.org/package/Phergie_Tests
  */
 
-require_once(dirname(__FILE__) . '/TestCase.php');
-
 /**
  * Unit test suite for Pherge_Plugin_Ping.
  *
@@ -28,148 +26,139 @@ require_once(dirname(__FILE__) . '/TestCase.php');
  * @package  Phergie_Tests
  * @author   Phergie Development Team <team@phergie.org>
  * @license  http://phergie.org/license New BSD License
- * @link     http://pear.phergie.org/package/Phergie
+ * @link     http://pear.phergie.org/package/Phergie_Tests
  */
 class Phergie_Plugin_PingTest extends Phergie_Plugin_TestCase
 {
-    protected $config = array('ping.ping'  => 10,
-                              'ping.event' => 300);
-    
     /**
-     * Sets up the fixture, for example, opens a network connection.
-     * This method is called before a test is executed.
-     */
-    protected function setUp()
-    {
-        $this->setPlugin(new Phergie_Plugin_Ping);
-    }
-
-    /**
-     * Test the lastEvent setter and getter
-     */
-    public function testSetGetLastEvent()
-    {
-        $expected = rand(100000,200000);
-        $this->plugin->setLastEvent($expected);
-        $this->assertEquals($expected,
-                            $this->plugin->getLastEvent(),
-                            'Assert that the last event was set and gotten ' .
-                            'correctly');
-    }
-
-    /**
-     * Test the lastPing setter and getter
-     */
-    public function testSetGetLastPing()
-    {
-
-        $expected = rand(100000,200000);
-        $this->plugin->setLastPing($expected);
-        $this->assertEquals($expected,
-                            $this->plugin->getLastPing(),
-                            'Assert that the last ping was set and gotten ' .
-                            'correctly');
-    }
-
-    /**
-     * Tests the onConnect hook
+     * Tests that the last ping and event are initialized on connection to
+     * the server.
+     *
+     * @return void
      */
     public function testOnConnect()
     {
-        $time = time() - 1;
-        // We need to make sure time() is going to be creater next time it is called
-        
         $this->plugin->onConnect();
-        $this->assertNull($this->plugin->getLastPing(), 
-                          'onConnect should set last ping to null');
-        $this->assertGreaterThan($time,
-                                 $this->plugin->getLastEvent(),
-                                 'onConnect should update lastEvent with the ' .
-                                 'current timestamp');
-        $this->assertLessThan($time + 2,
-                              $this->plugin->getLastEvent(),
-                              'onConnect should update lastEvent with the ' .
-                              'current timestamp');
+
+        $expected = time();
+        $actual = $this->plugin->getLastEvent();
+        $this->assertEquals($expected, $actual);
+
+        $expected = null;
+        $actual = $this->plugin->getLastPing();
+        $this->assertEquals($expected, $actual);
     }
 
     /**
-     * Test that the preEvent method updates the lastEvent with the current time
+     * Tests that the last event is reset when an event occurs.
+     *
+     * @return void
      */
     public function testPreEvent()
     {
-        $time = time() -1;
         $this->plugin->preEvent();
-        $this->assertGreaterThan($time,
-                                 $this->plugin->getLastEvent(),
-                                 'Last event time was set properly on preEvent');
-        $this->assertLessThan($time +2,
-                              $this->plugin->getLastEvent(),
-                              'Last Event time was set properly on preEvent');
+
+        $expected = time();
+        $actual = $this->plugin->getLastEvent();
+        $this->assertEquals($expected, $actual);
     }
 
     /**
-     * @todo Implement testOnPingResponse().
+     * Tests that the last ping is reset when a ping is received.
+     *
+     * @return void
      */
     public function testOnPingResponse()
     {
-        $this->plugin->setLastPing(time());
         $this->plugin->onPingResponse();
-        $this->assertNull($this->plugin->getLastPing(),
-                          'Last ping time should be null after onPingResponse');
 
+        $expected = null;
+        $actual = $this->plugin->getLastPing();
+        $this->assertEquals($expected, $actual);
     }
 
     /**
-     * Test that the plugin issues a quit when the ping threashold
-     * has been exceeded
+     * Tests that the test suite is able to manipulate the value of the last
+     * event.
+     *
+     * @return void
      */
-    public function testOnTickExceededPingThresholdQuits()
+    public function testSetLastEvent()
     {
-        $this->plugin->setLastPing(1);
-        $this->plugin->onTick();
-        $this->assertHasEvent(Phergie_Event_Command::TYPE_QUIT);
-    }
-    
-    /**
-     * Test that the plugin issues a quit when the ping threashold
-     * has been exceeded
-     */
-    public function testOnTickPingWithinThresholdDoesNotQuits()
-    {
-        $this->plugin->setLastPing(time());
-        $this->plugin->onTick();
-        $this->assertDoesNotHaveEvent(Phergie_Event_Command::TYPE_QUIT);
+        $expected = time() + 1;
+        $this->plugin->setLastEvent($expected);
+        $actual = $this->plugin->getLastEvent();
+        $this->assertEquals($expected, $actual);
+
+        $this->plugin->setLastEvent();
+        $expected = time();
+        $actual = $this->plugin->getLastEvent();
+        $this->assertEquals($expected, $actual);
+
+        try {
+            $this->plugin->setLastEvent('foo');
+            $this->fail('Expected exception was not thrown');
+        } catch (Exception $e) { }
     }
 
     /**
-     * Test that a ping is emitted when the event threashold is exceeded
+     * Tests that the test suite is able to manipulate the value of the last
+     * ping.
+     *
+     * @return void
      */
-    public function testPingEmittedAfterThresholdExceeded()
+    public function testSetLastPing()
     {
-        $this->plugin->setLastEvent(time() - $this->config['ping.event'] - 1);
-        $this->plugin->onTick();
-        $this->assertHasEvent(Phergie_Event_Command::TYPE_PING);
-        $events = $this->getResponseEvents(Phergie_Event_Command::TYPE_PING);
-        foreach ($events as $event) {
-            $this->assertEventEmitter($event,
-                                      $this->plugin,
-                    'Assert that the event was emitted by the tested plugin');
-        }
+        $expected = time() + 1;
+        $this->plugin->setLastPing($expected);
+        $actual = $this->plugin->getLastPing();
+        $this->assertEquals($expected, $actual);
+
+        $this->plugin->setLastPing();
+        $expected = time();
+        $actual = $this->plugin->getLastPing();
+        $this->assertEquals($expected, $actual);
+
+        try {
+            $this->plugin->setLastPing('foo');
+            $this->fail('Expected exception was not thrown');
+        } catch (Exception $e) { }
     }
 
     /**
-     * Test that no ping is emitted when the event thresthold is not exceeded
+     * Tests that a ping event is sent after the appropriate time period has
+     * lapsed since receiving an event.
+     *
+     * @depends testSetLastEvent
+     * @return void
      */
-    public function testNoPingEmittedWhenThresholdNotExceeded()
+    public function testPing()
     {
-        $this->plugin->setLastEvent(time() - $this->config['ping.event'] +1);
+        $pingEvent = 10;
+        $this->setConfig('ping.event', $pingEvent);
+        $lastEvent = time() - ($pingEvent + 1);
+        $this->plugin->setLastEvent($lastEvent);
+        $expected = time();
+        $this->assertEmitsEvent('ping', array($this->nick, $expected));
         $this->plugin->onTick();
-        $this->assertDoesNotHaveEvent(Phergie_Event_Command::TYPE_PING);
+        $actual = $this->plugin->getLastPing();
+        $this->assertEquals($expected, $actual);
     }
 
-    public function tearDown()
+    /**
+     * Tests that a quit event is sent after the appropriate time period has
+     * lapsed since sending a ping event.
+     *
+     * @depends testPing
+     * @return void
+     */
+    public function testQuit()
     {
-        $this->handler->clearEvents();
+        $pingPing = 10;
+        $this->setConfig('ping.ping', $pingPing);
+        $lastPing = time() - ($pingPing + 1);
+        $this->plugin->setLastPing($lastPing);
+        $this->assertEmitsEvent('quit');
+        $this->plugin->onTick();
     }
-
-}
\ No newline at end of file
+}
diff --git a/plugins/Irc/extlib/phergie/Tests/Phergie/Plugin/PongTest.php b/plugins/Irc/extlib/phergie/Tests/Phergie/Plugin/PongTest.php
index a8bc8fd05f..e8351fef24 100644
--- a/plugins/Irc/extlib/phergie/Tests/Phergie/Plugin/PongTest.php
+++ b/plugins/Irc/extlib/phergie/Tests/Phergie/Plugin/PongTest.php
@@ -12,15 +12,13 @@
  * http://phergie.org/license
  *
  * @category  Phergie
- * @package   Phergie
+ * @package   Phergie_Tests
  * @author    Phergie Development Team <team@phergie.org>
  * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
  * @license   http://phergie.org/license New BSD License
- * @link      http://pear.phergie.org/package/Phergie
+ * @link      http://pear.phergie.org/package/Phergie_Tests
  */
 
-require_once(dirname(__FILE__) . '/TestCase.php');
-
 /**
  * Unit test suite for Pherge_Plugin_Pong.
  *
@@ -28,47 +26,21 @@ require_once(dirname(__FILE__) . '/TestCase.php');
  * @package  Phergie_Tests
  * @author   Phergie Development Team <team@phergie.org>
  * @license  http://phergie.org/license New BSD License
- * @link     http://pear.phergie.org/package/Phergie
+ * @link     http://pear.phergie.org/package/Phergie_Tests
  */
 class Phergie_Plugin_PongTest extends Phergie_Plugin_TestCase
 {
     /**
-     * Sets up the fixture, for example, opens a network connection.
-     * This method is called before a test is executed.
-     */
-    protected function setUp()
-    {
-        $this->setPlugin(new Phergie_Plugin_Pong);
-    }
-
-    /**
-     * Test that when a ping is received, a Phergie_Event_Command::TYPE_PONG
-     * is set to the handler
+     * Test that a pong event is sent when a ping event is received.
      *
-     * @event Phergie_Event_Command::TYPE_PING
+     * @return void
      */
-    public function testOnPing()
+    public function testPong()
     {
+        $expected = 'irc.freenode.net';
+        $event = $this->getMockEvent('ping', array($expected));
+        $this->plugin->setEvent($event);
+        $this->assertEmitsEvent('pong', array($expected));
         $this->plugin->onPing();
-        $this->assertHasEvent(Phergie_Event_Command::TYPE_PONG);
     }
-
-    /**
-     * Test that when a ping is received, a Phergie_Event_Command::TYPE_PONG
-     * is set to the handler
-     *
-     * @event Phergie_Event_Command::TYPE_PING
-     */
-    public function testOnPingResponseArguement()
-    {
-        $this->plugin->onPing();
-        $this->assertHasEvent(Phergie_Event_Command::TYPE_PONG);
-        $events = $this->getResponseEvents(Phergie_Event_Command::TYPE_PONG);
-        $this->assertTrue(count($events) === 1, 'Assert that only one pong is emitted');
-        $this->assertEventEmitter(current($events),
-                                  $this->plugin,
-                                  'Assert that the tested plugin emitted the event');
-
-    }
-
 }
diff --git a/plugins/Irc/extlib/phergie/Tests/Phergie/Plugin/SpellCheckTest.php b/plugins/Irc/extlib/phergie/Tests/Phergie/Plugin/SpellCheckTest.php
index 8ed9f0d36d..369a0c6444 100644
--- a/plugins/Irc/extlib/phergie/Tests/Phergie/Plugin/SpellCheckTest.php
+++ b/plugins/Irc/extlib/phergie/Tests/Phergie/Plugin/SpellCheckTest.php
@@ -12,15 +12,13 @@
  * http://phergie.org/license
  *
  * @category  Phergie
- * @package   Phergie
+ * @package   Phergie_Tests
  * @author    Phergie Development Team <team@phergie.org>
  * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
  * @license   http://phergie.org/license New BSD License
- * @link      http://pear.phergie.org/package/Phergie
+ * @link      http://pear.phergie.org/package/Phergie_Tests
  */
 
-require_once dirname(__FILE__) . '/TestCase.php';
-
 /**
  * Unit test suite for Pherge_Plugin_SpellCheck.
  *
@@ -28,178 +26,141 @@ require_once dirname(__FILE__) . '/TestCase.php';
  * @package  Phergie_Tests
  * @author   Phergie Development Team <team@phergie.org>
  * @license  http://phergie.org/license New BSD License
- * @link     http://pear.phergie.org/package/Phergie
+ * @link     http://pear.phergie.org/package/Phergie_Tests
  */
 class Phergie_Plugin_SpellCheckTest extends Phergie_Plugin_TestCase
 {
-
     /**
-     * Current SpellCheck plugin instance
+     * Checks for the pspell extension.
      *
-     * @var Phergie_Plugin_SpellCheck
-     */
-    protected $spell;
-
-    /**
-     * Sets up the fixture, for example, opens a network connection.
-     * This method is called before a test is executed.
-     * 
      * @return void
      */
-    protected function setUp()
+    public function setUp()
     {
-        $this->config = array('spellcheck.lang' => 'en');
+        parent::setUp();
 
-        $this->spell = new Phergie_Plugin_SpellCheck();
-        $this->setPlugin(new Phergie_Plugin_Command());
-        
-        $config = $this->plugin->getConfig();
-        
-        $handler = new Phergie_Plugin_Handler($config, $this->handler);
-        $this->plugin->setPluginHandler($handler);
-        
-        $handler->addPlugin($this->plugin);
-        $handler->addPlugin($this->spell);
-
-        $this->spell->setEventHandler($this->handler);
-        $this->spell->setConnection($this->connection);
-    }
-
-    /**
-     * @event Phergie_Event_Request::privmsg
-     * @eventArg #zftalk
-     * @eventArg spell
-     */
-    public function testSpell()
-    {
-        $this->spell->onLoad();
-        
-        $this->copyEvent();
-        $this->plugin->onPrivMsg();
-        $this->assertDoesNotHaveEvent(Phergie_Event_Command::TYPE_PRIVMSG);
-    }
-
-    /**
-     * @event Phergie_Event_Request::privmsg
-     * @eventArg #phergie
-     * @eventArg spell test
-     */
-    public function testSpellTest()
-    {
-        $this->spell->onLoad();
-        
-        $this->copyEvent();
-        $this->plugin->onPrivMsg();
-
-        $events = $this->getResponseEvents(Phergie_Event_Command::TYPE_PRIVMSG);
-        
-        $this->assertEquals(1, count($events));
-        foreach ($events as $event) {
-            $args = $event->getArguments();
-            
-            $this->assertEquals('#phergie', $args[0]);
-            
-            $this->assertContains('CheckSpellUser:', $args[1]);
-            $this->assertContains('test', $args[1]);
-            $this->assertContains('correct', $args[1]);
-        }            
-    }
-
-    /**
-     * @event Phergie_Event_Request::privmsg
-     * @eventArg #phergie
-     * @eventArg spell testz
-     */
-    public function testSpellTestz()
-    {
-        $this->spell->onLoad();
-        
-        $this->copyEvent();
-        $this->plugin->onPrivMsg();
-        
-        $events = $this->getResponseEvents(Phergie_Event_Command::TYPE_PRIVMSG);
-        
-        $this->assertEquals(1, count($events));
-        foreach ($events as $event) {
-            $args = $event->getArguments();
-            
-            $this->assertEquals('#phergie', $args[0]);
-            
-            $this->assertContains('CheckSpellUser:', $args[1]);
-            $this->assertRegExp('/([a-z]+, ){4}/', $args[1]);
-            $this->assertContains('testz', $args[1]);
-            $this->assertContains('test,', $args[1]);
+        if (!extension_loaded('pspell')) {
+            $this->markTestSkipped('pspell extension not available');
         }
     }
 
     /**
-     * @event Phergie_Event_Request::privmsg
-     * @eventArg #phergie
-     * @eventArg spell testz
-     */
-    public function testSpellMoreSuggestions()
-    {
-        $config = $this->spell->getConfig();
-        
-        $this->copyEvent();
-        $config['spellcheck.limit'] = 6;
-        
-        $this->spell->onLoad();
-        $this->plugin->onPrivMsg();
-        
-        $events = $this->getResponseEvents(Phergie_Event_Command::TYPE_PRIVMSG);
-        
-        $this->assertEquals(1, count($events));
-        foreach ($events as $event) {
-            $args = $event->getArguments();
-            
-            $this->assertEquals('#phergie', $args[0]);
-            
-            $this->assertContains('CheckSpellUser:', $args[1]);
-            $this->assertRegExp('/([a-z]+, ){5}/', $args[1]);
-            $this->assertContains('testz', $args[1]);
-            $this->assertContains('test,', $args[1]);
-        }
-    }
-
-    /**
-     * @event Phergie_Event_Request::privmsg
-     * @eventArg #phergie
-     * @eventArg spell qwertyuiopasdfghjklzxcvbnm
-     */
-    public function testSpellNoSuggestions()
-    {
-        $this->spell->onLoad();
-        
-        $this->copyEvent();
-        $this->plugin->onPrivMsg();
-        
-        $events = $this->getResponseEvents(Phergie_Event_Command::TYPE_PRIVMSG);
-        
-        $this->assertEquals(1, count($events));
-        foreach ($events as $event) {
-            $args = $event->getArguments();
-            
-            $this->assertEquals('#phergie', $args[0]);
-            
-            $this->assertContains('CheckSpellUser:', $args[1]);
-            $this->assertContains('find any suggestions', $args[1]);
-        }
-    }
-    
-    /**
-     * Copy event from command to spell plugin
-     * 
+     * Tests for the plugin failing to load when the language setting is not
+     * specified.
+     *
      * @return void
      */
-    protected function copyEvent()
+    public function testLanguageSettingNotSet()
     {
-        $hostmask = Phergie_Hostmask::fromString('CheckSpellUser!test@testing.org');
-
-        $event = $this->plugin->getEvent();
-        $event->setHostmask($hostmask);
-
-        $this->spell->setEvent($event);
+        try {
+            $this->plugin->onLoad();
+            $this->fail('Expected exception was not thrown');
+        } catch (Phergie_Plugin_Exception $e) {
+            return;
+        }
+        $this->fail('Unexpected exception was thrown');
     }
 
+    /**
+     * Tests for the plugin requiring the Command plugin as a dependency.
+     *
+     * @return void
+     */
+    public function testRequiresCommandPlugin()
+    {
+        $this->setConfig('spellcheck.lang', 'en');
+        $this->assertRequiresPlugin('Command');
+        $this->plugin->onLoad();
+    }
+
+    /**
+     * Tests for the plugin failing to load because of a dictionary error.
+     *
+     * @return void
+     */
+    public function testLoadDictionaryError()
+    {
+        $this->setConfig('spellcheck.lang', 'foo');
+        try {
+            $this->plugin->onLoad();
+            $this->fail('Expected exception not thrown');
+        } catch (Phergie_Plugin_Exception $e) {
+            return;
+        }
+        $this->fail('Unexpected exception was thrown');
+    }
+
+    /**
+     * Initializes a spell check event.
+     *
+     * @param string $word Word to be checked
+     *
+     * @return void
+     */
+    private function initializeSpellCheckEvent($word)
+    {
+        $this->setConfig('spellcheck.lang', 'en');
+        $this->plugin->onLoad();
+        $args = array(
+            'receiver' => $this->source,
+            'text' => 'spell ' . $word
+        );
+        $event = $this->getMockEvent('privmsg', $args);
+        $this->plugin->setEvent($event);
+    }
+
+    /**
+     * Checks for a specified response to a spell check event.
+     *
+     * @param string $word     Work being checked
+     * @param string $response Expected response
+     *
+     * @return void
+     */
+    private function checkForSpellCheckResponse($word, $response)
+    {
+        $this->assertEmitsEvent('privmsg', array($this->source, $response));
+        $this->plugin->onCommandSpell($word);
+    }
+
+    /**
+     * Tests for the plugin returning a response for a correctly spelled word.
+     *
+     * @return void
+     */
+    public function testRespondsForCorrectlySpelledWord()
+    {
+        $word = 'test';
+        $this->initializeSpellCheckEvent($word);
+        $response = $this->nick . ': The word "' . $word . '" seems to be spelled correctly.';
+        $this->checkForSpellCheckResponse($word, $response);
+    }
+
+    /**
+     * Tests for the plugin returning a response when it can't find any
+     * suggestions for a word.
+     *
+     * @return void
+     */
+    public function testRespondsWithoutSuggestions()
+    {
+        $word = 'kjlfljlkjljkljlj';
+        $this->initializeSpellCheckEvent($word);
+        $response = $this->nick . ': I could not find any suggestions for "' . $word . '".';
+        $this->checkForSpellCheckResponse($word, $response);
+    }
+
+    /**
+     * Tests for the plugin returning a response when it is able to find
+     * suggestions for a word.
+     *
+     * @return void
+     */
+    public function testRespondsWithSuggestions()
+    {
+        $word = 'teh';
+        $this->initializeSpellCheckEvent($word);
+        $response = $this->nick . ': Suggestions for "' . $word . '": the, Te, tech, Th, eh.';
+        $this->checkForSpellCheckResponse($word, $response);
+    }
 }
diff --git a/plugins/Irc/extlib/phergie/Tests/Phergie/Plugin/TerryChayTest.php b/plugins/Irc/extlib/phergie/Tests/Phergie/Plugin/TerryChayTest.php
index e76020b6b3..e58ac6f290 100644
--- a/plugins/Irc/extlib/phergie/Tests/Phergie/Plugin/TerryChayTest.php
+++ b/plugins/Irc/extlib/phergie/Tests/Phergie/Plugin/TerryChayTest.php
@@ -12,15 +12,13 @@
  * http://phergie.org/license
  *
  * @category  Phergie
- * @package   Phergie
+ * @package   Phergie_Tests
  * @author    Phergie Development Team <team@phergie.org>
  * @copyright 2008-2010 Phergie Development Team (http://phergie.org)
  * @license   http://phergie.org/license New BSD License
- * @link      http://pear.phergie.org/package/Phergie
+ * @link      http://pear.phergie.org/package/Phergie_Tests
  */
 
-require_once(dirname(__FILE__) . '/TestCase.php');
-
 /**
  * Unit test suite for Pherge_Plugin_TerryChay.
  *
@@ -28,72 +26,110 @@ require_once(dirname(__FILE__) . '/TestCase.php');
  * @package  Phergie_Tests
  * @author   Phergie Development Team <team@phergie.org>
  * @license  http://phergie.org/license New BSD License
- * @link     http://pear.phergie.org/package/Phergie
+ * @link     http://pear.phergie.org/package/Phergie_Tests
  */
 class Phergie_Plugin_TerryChayTest extends Phergie_Plugin_TestCase
 {
     /**
-     * Sets up the fixture, for example, opens a network connection.
-     * This method is called before a test is executed.
+     * Chayism used as a consistent response when related events are
+     * triggered
+     *
+     * @var string
      */
-    protected function setUp()
+    private $chayism = 'Terry Chay doesn\'t need a framework; he already knows everyone\'s code';
+
+    /**
+     * Configures the mock plugin handler to return a mock Http plugin with
+     * a mock response object populated with predetermined content.
+     *
+     * @return void
+     */
+    public function setUpHttpClient()
     {
-        $this->setPlugin(new Phergie_Plugin_TerryChay());
-        $config = new Phergie_Config();
-        $handler = new Phergie_Plugin_Handler($config, $this->handler);
-        $this->plugin->setPluginHandler($handler);
-        $handler->addPlugin($this->plugin);
-        $handler->addPlugin(new Phergie_Plugin_Http($config));
-        $this->plugin->setConfig($config);
-        $this->connection->setNick('phergie');
+        $response = $this->getMock('Phergie_Plugin_Http_Response');
+        $response
+            ->expects($this->any())
+            ->method('getContent')
+            ->will($this->returnValue($this->chayism));
+
+        $plugin = $this->getMock('Phergie_Plugin_Http');
+        $plugin
+            ->expects($this->any())
+            ->method('get')
+            ->will($this->returnValue($response));
+
+        $this->getMockPluginHandler()
+            ->expects($this->any())
+            ->method('getPlugin')
+            ->with('Http')
+            ->will($this->returnValue($plugin));
+    }
+
+    /**
+     * Tests that the plugin requires the Http plugin as a dependency.
+     *
+     * @return void
+     */
+    public function testRequiresHttpPlugin()
+    {
+        $this->assertRequiresPlugin('Http');
         $this->plugin->onLoad();
     }
 
     /**
-     * @event Phergie_Event_Request::privmsg
-     * @eventArg #zftalk
-     * @eventArg tychay
+     * Data provider for testPrivmsgTriggerReturnsChayism().
+     *
+     * @return array Enumerated array of enumerated arrays each containing
+     *               a set of parameters for a single call to
+     *               testPrivmsgTriggerReturnsChayism()
      */
-    public function testWithTyChay()
+    public function dataProviderTestPrivmsgTriggerReturnsChayism()
     {
-        $this->plugin->onPrivMsg();
-        $this->assertHasEvent(Phergie_Event_Command::TYPE_PRIVMSG);
+        return array(
+            array('terry chay'),
+            array('terry  chay'),
+            array('tychay'),
+            array('!tychay'),
+            array('! tychay'),
+            array('foo tychay bar'),
+        );
     }
 
     /**
-     * @event Phergie_Event_Request::privmsg
-     * @eventArg #zftalk
-     * @eventArg terrychay
+     * Tests that appropriate triggers result in a response with a Chayism.
+     *
+     * @return void
+     * @dataProvider dataProviderTestPrivmsgTriggerReturnsChayism
      */
-    public function testWithTerryChay()
+    public function testPrivmsgTriggerReturnsChayism($trigger)
     {
-        $this->plugin->onPrivMsg();
-        $this->assertDoesNotHaveEvent(Phergie_Event_Command::TYPE_PRIVMSG,
-                              'string "terrychay" should not invoke a response');
-    }
-    
-    /**
-     * @event Phergie_Event_Request::privmsg
-     * @eventArg #zftalk
-     * @eventArg terry chay
-     */
-    public function testWithTerry_Chay()
-    {
-        $this->plugin->onPrivMsg();
-        $this->assertHasEvent(Phergie_Event_Command::TYPE_PRIVMSG,
-                              'string "terry chay" should invoke a response');
+        $this->setConfig('command.prefix', '!');
+        $this->setUpHttpClient();
+        $args = array(
+            'receiver' => $this->source,
+            'text' => $trigger
+        );
+        $event = $this->getMockEvent('privmsg', $args);
+        $this->plugin->setEvent($event);
+        $this->assertEmitsEvent('privmsg', array($this->source, 'Fact: ' . $this->chayism));
+        $this->plugin->onPrivmsg();
     }
 
     /**
-     * @event Phergie_Event_Request::privmsg
-     * @eventArg #zftalk
-     * @eventArg Elazar is not Mr. Chay
+     * Tests that lack of an appropriate trigger results in no response with
+     * a Chayism.
+     *
+     * @return void
      */
-    public function testWithNoTyChay()
+    public function testNoPrivmsgTriggerDoesNotReturnChayism()
     {
-        $this->plugin->onPrivMsg();
-        $this->assertDoesNotHaveEvent(Phergie_Event_Command::TYPE_PRIVMSG,
-                                      'Failed asserting that elazar is not ' .
-                                      'tychay');
+        $args = array(
+            'receiver' => $this->source,
+            'text' => 'foo bar baz'
+        );
+        $event = $this->getMockEvent('privmsg', $args);
+        $this->plugin->setEvent($event);
+        $this->assertDoesNotEmitEvent('privmsg', array($this->source, 'Fact: ' . $this->chayism));
+        $this->plugin->onPrivmsg();
     }
-}
\ No newline at end of file
+}
diff --git a/plugins/Irc/extlib/phergie/Tests/Phergie/Plugin/TestCase.php b/plugins/Irc/extlib/phergie/Tests/Phergie/Plugin/TestCase.php
index 36b81d6fae..941e7cb410 100644
--- a/plugins/Irc/extlib/phergie/Tests/Phergie/Plugin/TestCase.php
+++ b/plugins/Irc/extlib/phergie/Tests/Phergie/Plugin/TestCase.php
@@ -20,7 +20,7 @@
  */
 
 /**
- * Unit test suite for Pherge_Plugin classes
+ * Unit test suite for plugin classes.
  *
  * @category Phergie
  * @package  Phergie_Tests
@@ -31,177 +31,405 @@
 abstract class Phergie_Plugin_TestCase extends PHPUnit_Framework_TestCase
 {
     /**
-     * @var Phergie_Event_Handler
+     * Mock configuration
+     *
+     * @var Phergie_Config
      */
-    protected $handler;
+    protected $config;
 
     /**
+     * Associative array for configuration setting values, accessed by the
+     * mock configuration object using a callback
+     *
+     * @var array
+     */
+    protected $settings = array();
+
+    /**
+     * Mock connection
+     *
      * @var Phergie_Connection
      */
     protected $connection;
 
     /**
-     * @var array
+     * Mock event handler
+     *
+     * @var Phergie_Event_Handler
      */
-    protected $eventArgs;
+    protected $events;
 
     /**
+     * Mock plugin handler
+     *
+     * @var Phergie_Plugin_Handler
+     */
+    protected $plugins;
+
+    /**
+     * Plugin instance being tested
+     *
      * @var Phergie_Plugin_Abstract
      */
     protected $plugin;
 
     /**
-     * @var array
-     */
-    protected $config = array();
-
-    /**
-     * Constructs a test case with the given name.
+     * Full name of the plugin class being tested, may be explicitly
+     * specified in subclasses but is otherwise automatically derived from
+     * the test case class name
      *
-     * @param  string $name
-     * @param  array  $data
-     * @param  string $dataName
+     * @var string
      */
-    public function __construct($name = NULL, array $data = array(), $dataName = '')
-    {
-        parent::__construct($name, $data, $dataName);
-        $this->connection = new Phergie_Connection();
-        $this->handler    = new Phergie_Event_Handler();
-    }
+    protected $pluginClass;
 
     /**
-     * Assert that a given event type exists in the event handler
-     * @param string $event
-     * @param string $message
-     */
-    public function assertHasEvent($event, $message = null)
-    {
-        self::assertTrue($this->handler->hasEventOfType($event), $message);
-    }
-
-    /**
-     * Assert that a given event type DOES NOT exist in the event handler
-     * @param string $event
-     * @param string $message
-     */
-    public function assertDoesNotHaveEvent($event, $message = null)
-    {
-        self::assertFalse($this->handler->hasEventOfType($event), $message);
-    }
-
-    /**
-     * Assert that the emitter of the given command event was the given
-     * plugin
+     * User nick used in any events requiring one
      *
-     * @param Phergie_Event_Command   $event
-     * @param Phergie_Plugin_Abstract $plugin
-     * @param string                  $message
+     * @var string
      */
-    public function assertEventEmitter(Phergie_Event_Command $event,
-                                       Phergie_Plugin_Abstract $plugin,
-                                       $message = null)
-    {
-        $this->assertSame($plugin, $event->getPlugin(), $message);
-    }
+    protected $nick = 'nick';
 
     /**
-     * Gets the events added to the handler by the plugin
-     * @param string $type
-     * @return array | null
+     * Event source used in any events requiring one
+     *
+     * @var string
      */
-    public function getResponseEvents($type = null)
+    protected $source = '#channel';
+
+    /**
+     * Initializes instance properties.
+     *
+     * @return void
+     */
+    public function setUp()
     {
-        if (is_string($type) && strlen($type) > 0) {
-            return $this->handler->getEventsOfType($type);
+        if (empty($this->pluginClass)) {
+            $this->pluginClass = preg_replace('/Test$/', '', get_class($this));
         }
-        return $this->handler->getEvents();
-    }
 
-    /**
-     * Sets the event for the test
-     * @param array $event
-     * @param array $eventArgs
-     */
-    public function setEvent(array $event, array $eventArgs = null)
-    {
-        $eventClass = 'Phergie_Event_Request';
-        if (is_array($event)) {
-            $eventClass = $event[0];
-            $eventType  = $event[1];
-        } else {
-            throw new InvalidArgumentException("Invalid value for \$event");
+        if (empty($this->plugin)) {
+            $this->plugin = new $this->pluginClass;
         }
-        $event = new $eventClass();
-        $event->setType($eventType);
-        $event->setArguments($eventArgs);
-        $this->plugin->setEvent($event);
-        $this->eventArgs = $eventArgs;
+
+        $this->plugin->setConfig($this->getMockConfig());
+        $this->plugin->setConnection($this->getMockConnection());
+        $this->plugin->setEventHandler($this->getMockEventHandler());
+        $this->plugin->setPluginHandler($this->getMockPluginHandler());
     }
 
     /**
-     * Sets the plugin to be tested
-     * If a plugin requries config for testing, an array placed in
-     * $this->config will be parsed into a Phergie_Config object and
-     * attached to the plugin
+     * Destroys all initialized instance properties.
+     *
+     * @return void
      */
-    protected function setPlugin(Phergie_Plugin_Abstract $plugin)
+    public function tearDown()
     {
-        $this->plugin = $plugin;
-        $this->plugin->setEventHandler($this->handler);
-        $this->plugin->setConnection($this->connection);
-        $this->connection->setNick('test');
-        if (!empty($this->config)) {
-            $config = new Phergie_Config();
-            foreach ($this->config as $configKey => $configValue) {
-                $config[$configKey] = $configValue;
-            }
-            $plugin->setConfig($config);
+        unset(
+            $this->plugins,
+            $this->events,
+            $this->connection,
+            $this->config,
+            $this->plugin
+        );
+    }
+
+    /**
+     * Returns a mock configuration object.
+     *
+     * @return Phergie_Config
+     */
+    protected function getMockConfig()
+    {
+        if (empty($this->config)) {
+            $this->config = $this->getMock('Phergie_Config', array('offsetExists', 'offsetGet'));
+            $this->config
+                ->expects($this->any())
+                ->method('offsetExists')
+                ->will($this->returnCallback(array($this, 'configOffsetExists')));
+            $this->config
+                ->expects($this->any())
+                ->method('offsetGet')
+                ->will($this->returnCallback(array($this, 'configOffsetGet')));
         }
+        return $this->config;
     }
 
     /**
-     * Overrides the runTest method to add additional annotations
-     * @return PHPUnit_Framework_TestResult
+     * Returns whether a specific configuration setting has a value. Only
+     * intended for use by this class, but must be public for PHPUnit to
+     * call them.
+     *
+     * @param string $name Name of the setting
+     *
+     * @return boolean TRUE if the setting has a value, FALSE otherwise
      */
-    protected function runTest()
+    public function configOffsetExists($name)
     {
-        if (null === $this->plugin) {
-            throw new RuntimeException(
-                    'Tests cannot be run before plugin is set'
+        return isset($this->settings[$name]);
+    }
+
+    /**
+     * Returns the value of a specific configuration setting. Only intended
+     * for use by this class, but must be public for PHPUnit to call them.
+     *
+     * @param string $name Name of the setting
+     *
+     * @return mixed Value of the setting
+     */
+    public function configOffsetGet($name)
+    {
+        return $this->settings[$name];
+    }
+
+    /**
+     * Returns a mock connection object.
+     *
+     * @return Phergie_Connection
+     */
+    protected function getMockConnection()
+    {
+        if (empty($this->connection)) {
+            $this->connection = $this->getMock('Phergie_Connection');
+            $this->connection
+                ->expects($this->any())
+                ->method('getNick')
+                ->will($this->returnValue($this->nick));
+        }
+        return $this->connection;
+    }
+
+    /**
+     * Returns a mock event handler object.
+     *
+     * @return Phergie_Event_Handler
+     */
+    protected function getMockEventHandler()
+    {
+        if (empty($this->events)) {
+            $this->events = $this->getMock('Phergie_Event_Handler', array('addEvent'));
+        }
+        return $this->events;
+    }
+
+    /**
+     * Returns a mock plugin handler object.
+     *
+     * @return Phergie_Plugin_Handler
+     */
+    protected function getMockPluginHandler()
+    {
+        if (empty($this->plugins)) {
+            $config = $this->getMockConfig();
+            $events = $this->getMockEventHandler();
+            $this->plugins = $this->getMock(
+                'Phergie_Plugin_Handler',
+                array(), // mock everything
+                array($config, $events)
             );
         }
-        
-        // Clean the event handler... important!
-        $this->handler->clearEvents();
-
-        $info      = $this->getAnnotations();
-        $event     = null;
-        $eventArgs = array();
-        if (isset($info['method']['event']) && isset($info['method']['event'][0])) {
-            if (!is_string($info['method']['event'][0])) {
-                throw new InvalidArgumentException(
-                        'Only one event may be specified'
-                );
-            }
-            $event = $info['method']['event'][0];
-
-            if (stristr($event, '::')) {
-                $event = explode('::', $event);
-            }
-        }
-        if (isset($info['method']['eventArg'])) {
-            $eventArgs = $info['method']['eventArg'];
-        }
-        if (null !== $event) {
-            $this->setEvent($event, $eventArgs);
-        }
-
-        $testResult = parent::runTest();
-
-        // Clean the event handler again... just incase this time.
-        $this->handler->clearEvents();
-
-        return $testResult;
+        return $this->plugins;
     }
 
+    /**
+     * Returns a mock event object.
+     *
+     * @param string $type   Event type
+     * @param array  $args   Optional associative array of event arguments
+     * @param string $nick   Optional user nick to associate with the event
+     * @param string $source Optional user nick or channel name to associate
+     *        with the event as its source
+     *
+     * @return Phergie_Event_Request
+     */
+    protected function getMockEvent($type, array $args = array(),
+        $nick = null, $source = null
+    ) {
+        $methods = array('getNick', 'getSource');
+        foreach (array_keys($args) as $arg) {
+            if (is_int($arg) || ctype_digit($arg)) {
+                $methods[] = 'getArgument';
+            } else {
+                $methods[] = 'get' . ucfirst($arg);
+            }
+        }
+
+        $event = $this->getMock(
+            'Phergie_Event_Request',
+            $methods
+        );
+
+        $nick = $nick ? $nick : $this->nick;
+        $event
+            ->expects($this->any())
+            ->method('getNick')
+            ->will($this->returnValue($nick));
+
+        $source = $source ? $source : $this->source;
+        $event
+            ->expects($this->any())
+            ->method('getSource')
+            ->will($this->returnValue($source));
+
+        foreach ($args as $key => $value) {
+            if (is_int($key) || ctype_digit($key)) {
+                $event
+                    ->expects($this->any())
+                    ->method('getArgument')
+                    ->with($key)
+                    ->will($this->returnValue($value));
+            } else {
+                $event
+                    ->expects($this->any())
+                    ->method('get' . ucfirst($key))
+                    ->will($this->returnValue($value));
+            }
+        }
+
+        return $event;
+    }
+
+    /**
+     * Sets the value of a configuration setting.
+     *
+     * @param string $setting Name of the setting
+     * @param mixed  $value   Value for the setting
+     *
+     * @return void
+     */
+    protected function setConfig($setting, $value)
+    {
+        $this->settings[$setting] = $value;
+    }
+
+    /**
+     * Returns the absolute path to the Phergie/Plugin directory. Useful in
+     * conjunction with getMockDatabase().
+     *
+     * @param string $subpath Optional path to append to the directory path
+     *
+     * @return string Directory path
+     */
+    protected function getPluginsPath($subpath = null)
+    {
+        $path = realpath(dirname(__FILE__) . '/../../../Phergie/Plugin');
+        if (!empty($subpath)) {
+            $path .= '/' . ltrim($subpath, '/');
+        }
+        return $path;
+    }
+
+    /**
+     * Modifies the event handler to include an expectation of an event
+     * being added by the plugin being tested. Note that this must be called
+     * BEFORE executing the plugin code intended to initiate the event.
+     *
+     * @param string $type Event type
+     * @param array  $args Optional enumerated array of event arguments
+     *
+     * @return void
+     */
+    protected function assertEmitsEvent($type, array $args = array())
+    {
+        $this->events
+            ->expects($this->at(0))
+            ->method('addEvent')
+            ->with($this->plugin, $type, $args);
+    }
+
+    /**
+     * Modifies the event handler to include an expectation of an event NOT
+     * being added by the plugin being tested. Note that this must be called
+     * BEFORE executing plugin code that may initiate the event.
+     *
+     * @param string $type Event type
+     * @param array  $args Optional enumerated array of event arguments
+     *
+     * @return void
+     */
+    protected function assertDoesNotEmitEvent($type, array $args = array())
+    {
+        // Ugly hack to get around an issue in PHPUnit
+        // @link http://github.com/sebastianbergmann/phpunit-mock-objects/issues/issue/5#issue/5/comment/343524
+        $callback = create_function(
+            '$plugin, $type, $args',
+            'if (get_class($plugin) == "' . $this->pluginClass . '"
+            && $type == "' . $type . '"
+            && $args == "' . var_export($args, true) . '") {
+                trigger_error("Instance of ' . $this->pluginClass
+                . ' unexpectedly emitted event of type ' . $type
+                . '", E_USER_ERROR);
+            }'
+        );
+
+        $this->events
+            ->expects($this->any())
+            ->method('addEvent')
+            ->will($this->returnCallback($callback));
+    }
+
+    /**
+     * Modifies the plugin handler to include an expectation of a plugin
+     * being retrieved, indicating a dependency. Note that this must be
+     * called BEFORE executing the plugin code that may load that plugin
+     * dependency, which is usually located in onLoad().
+     *
+     * @param string $name Short name of the plugin required as a dependency
+     *
+     * @return void
+     */
+    public function assertRequiresPlugin($name)
+    {
+        $this->plugins
+            ->expects($this->atLeastOnce())
+            ->method('getPlugin')
+            ->with($name);
+    }
+
+    /**
+     * Creates an in-memory copy of a specified SQLite database file and
+     * returns a connection to it.
+     *
+     * @param string $path Path to the SQLite file to copy
+     *
+     * @return PDO Connection to the database copy
+     */
+    public function getMockDatabase($path)
+    {
+        $original = new PDO('sqlite:' . $path);
+        $copy = new PDO('sqlite::memory:');
+
+        $result = $original->query('SELECT sql FROM sqlite_master');
+        while ($sql = $result->fetchColumn()) {
+            $copy->exec($sql);
+        }
+
+        $tables = array();
+        $result = $original->query('SELECT name FROM sqlite_master WHERE type = "table"');
+        while ($table = $result->fetchColumn()) {
+            $tables[] = $table;
+        }
+
+        foreach ($tables as $table) {
+            $result = $original->query('SELECT * FROM ' . $table);
+            $insert = null;
+            $copy->beginTransaction();
+            while ($row = $result->fetch(PDO::FETCH_ASSOC)) {
+                $columns = array_keys($row);
+                if (empty($insert)) {
+                    $insert = $copy->prepare(
+                        'INSERT INTO "' . $table . '" (' .
+                        '"' . implode('", "', $columns) . '"' .
+                        ') VALUES (' .
+                        ':' . implode(', :', $columns) .
+                        ')'
+                    );
+                }
+                $insert->execute($row);
+            }
+            $copy->commit();
+            unset($insert);
+        }
+
+        return $copy;
+    }
 }

From 14414d5f00b7bca221a829911fef5db423d7fc17 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Fri, 13 Aug 2010 17:10:01 -0700
Subject: [PATCH 170/655] starting redoing core schema defs in variant of
 drupal format (can switch it to any way we like once done, if prefer to use a
 different syntax based on what we're using now for plugins)

---
 db/core.php | 887 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 887 insertions(+)
 create mode 100644 db/core.php

diff --git a/db/core.php b/db/core.php
new file mode 100644
index 0000000000..681c026105
--- /dev/null
+++ b/db/core.php
@@ -0,0 +1,887 @@
+<?php
+
+/* local and remote users have profiles */
+
+$schema['profile'] = array(
+    'fields' => array(
+        'id' => array('type' => 'serial', 'not null' => true, 'description' => 'unique identifier'),
+        'nickname' => array('type' => 'varchar', 'length' => 64, 'not null' => true, 'description' => 'nickname or username'),
+        'fullname' => array('type' => 'varchar', 'length' => 255, 'description' => 'display name'),
+        'profileurl' => array('type' => 'varchar', 'length' => 255, 'description' => 'URL, cached so we dont regenerate'),
+        'homepage' => array('type' => 'varchar', 'length' => 255, 'description' => 'identifying URL'),
+        'bio' => array('type' => 'text', 'description' => 'descriptive biography'),
+        'location' => array('type' => 'varchar', 'length' => 255, 'description' => 'physical location'),
+        'lat' => array('type' => 'decimal', 'length' => '10,7', 'description' => 'latitude'),
+        'lon' => array('type' => 'decimal', 'length => '10,7', 'description' => 'longitude'),
+        'location_id' => array('type' => 'int', 'description' => 'location id if possible'),
+        'location_ns' => array('type' => 'int', 'description' => 'namespace for location'),
+
+        'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
+        'modified' => array('type' => 'timestamp', 'description' => 'date this record was modified'),
+    ),
+    'primary key' => array('id'),
+    'indexes' => array(
+        'profile_nickname_idx' => array('nickname'),
+        'FULLTEXT' => array('nickname', 'fullname', 'location', 'bio', 'homepage') // ??
+    ),
+// Any way to specify that this table needs to be myisam if using the fulltext?
+);
+
+$schema['avatar'] = array(
+    'fields' => array(
+        'profile_id' => array('type' => 'int', 'not null' => true, 'description' => 'foreign key to profile table',
+        'original' => array('type' => 'boolean', 'default' => false, 'description' => 'uploaded by user or generated?'),
+        'width' => array('type' => 'int', 'not null' => true, 'description' => 'image width'),
+        'height' => array('type' => 'int', 'not null' => true, 'description' => 'image height'),
+        'mediatype' => array('type' => 'varchar', 'length' => 32, 'not null' => true, 'description' => 'file type'),
+        'filename' => array('type' => 'varchar', 'length' => 255, 'description' => 'local filename, if local'),
+        'url' => array('type' => 'varchar', 'length' => 255, 'description' => 'avatar location'),
+        'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
+        'modified' => array('type' => 'timestamp', 'description' => 'date this record was modified'),
+    ),
+    'primary key' => array('profile_id', 'width', 'height'),
+    'unique keys' => array(
+        'avatar_url_idx' => array('url'),
+    ),
+    'foreign keys' => array(
+        'profile_id' => array('profile' => 'id'),
+    ),
+    'indexes' => array(
+        'avatar_profile_id_idx' => array('profile_id'),
+    ),
+);
+
+$schema['sms_carrier'] = array(
+    'fields' => array(
+        'id' => array('type' => 'int', 'description' => 'primary key for SMS carrier'),
+        'name' => array('type' => 'varchar', 'length' => 64, 'description' => 'name of the carrier'),
+        'email_pattern' => array('type' => 'varchar', 'length' => 255, 'not null' => true, 'description' => 'sprintf pattern for making an email address from a phone number'),
+        'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
+        'modified' => array('type' => 'timestamp', 'description' => 'date this record was modified'),
+    ),
+    'primary key' => array('id'),
+    'unique keys' => array(
+        'sms_carrier_name_idx' => array('name'),
+    ),
+);
+
+$schema['user'] = array(
+    'description' => 'local users',
+    'fields' => array(
+        'id' => array('type' => 'int', 'description' => 'foreign key to profile table'),
+        'nickname' => array('type' => 'varchar', 'length' => 64, 'description' => 'nickname or username, duped in profile'),
+        'password' => array('type' => 'varchar', 'length' => 255, 'description' => 'salted password, can be null for OpenID users'),
+        'email' => array('type' => 'varchar', 'length' => 255, 'description' => 'email address for password recovery etc.'),
+        'incomingemail' => array('type' => 'varchar', 'length' => 255, 'description' => 'email address for post-by-email'),
+        'emailnotifysub' => array('type' => 'bool', 'default' => 1, 'description' => 'Notify by email of subscriptions'),
+        'emailnotifyfav' => array('type' => 'bool', 'default' => 1, 'description' => 'Notify by email of favorites'),
+        'emailnotifynudge' => array('type' => 'bool', 'default' => 1, 'description' => 'Notify by email of nudges'),
+        'emailnotifymsg' => array('type' => 'bool', 'default' => 1, 'description' => 'Notify by email of direct messages'),
+        'emailnotifyattn' => array('type' => 'bool', 'default' => 1, 'description' => 'Notify by email of @-replies'),
+        'emailmicroid' => array('type' => 'bool', 'default' => 1, 'description' => 'whether to publish email microid'),
+        'language' => array('type' => 'varchar', 'length' => 50, 'description' => 'preferred language'),
+        'timezone' => array('type' => 'varchar', 'length' => 50, 'description' => 'timezone'),
+        'emailpost' => array('type' => 'bool', 'default' => 1, 'description' => 'Post by email'),
+        'sms' => array('type' => 'varchar', 'length' => 64, 'description' => 'sms phone number'),
+        'carrier' => array('type' => 'int', 'description' => 'foreign key to sms_carrier'),
+        'smsnotify' => array('type' => 'bool', 'default' => 0, 'description' => 'whether to send notices to SMS'),
+        'smsreplies' => array('type' => 'bool', 'default' => 0, 'description' => 'whether to send notices to SMS on replies'),
+        'smsemail' => array('type' => 'varchar', 'length' => 255, 'description' => 'built from sms and carrier'),
+        'uri' => array('type' => 'varchar', 'length' => 255, 'description' => 'universally unique identifier, usually a tag URI'),
+        'autosubscribe' => array('type' => 'bool', 'default' => 0, 'description' => 'automatically subscribe to users who subscribe to us'),
+        'urlshorteningservice' => array('type' => 'varchar', 'length' => 50, default 'ur1.ca' 'description' => 'service to use for auto-shortening URLs'),
+        'inboxed' => array('type' => 'bool', 'default' => 0, 'description' => 'has an inbox been created for this user?'),
+        'design_id' => array('type' => 'int', 'description' => 'id of a design'),
+        'viewdesigns' => array('type' => 'bool', 'default' => 1, 'description' => 'whether to view user-provided designs'),
+
+        'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
+        'modified' => array('type' => 'timestamp', 'description' => 'date this record was modified'),
+    ),
+    'primary key' => array('id'),
+    'unique keys' => array(
+        'user_name_idx' => array('name'),
+        'user_email_idx' => array('email'),
+        'user_incomingemail_idx' => array('incomingemail'),
+        'user_sms_idx' => array('sms'),
+        'user_uri_idx' => array('uri'),
+    ),
+    'foreign keys' => array(
+        'id' => array('profile' => 'id'),
+        'carrier' => array('sms_carrier' => 'id'),
+        'design_id' => array('desgin' => 'id'),
+    ),
+    'indexes' => array(
+        'user_smsemail_idx' => array('smsemail'),
+    ),
+);
+
+$schema['remote_profile'] = array(
+    'description' => 'remote people (OMB)',
+    'fields' => array(
+        'id' => array('type' => 'int', 'description' => 'foreign key to profile table'),
+        'uri' => array('type' => 'varchar', 'length' => 255, 'description' => 'universally unique identifier, usually a tag URI'),
+        'postnoticeurl' => array('type' => 'varchar', 'length' => 255, 'description' => 'URL we use for posting notices'),
+        'updateprofileurl' => array('type' => 'varchar', 'length' => 255, 'description' => 'URL we use for updates to this profile'),
+        'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
+        'modified' => array('type' => 'timestamp', 'description' => 'date this record was modified'),
+    ),
+    'primary key' => array('id'),
+    'unique keys' => array(
+        'remote_profile_uri_idx' => array('uri'),
+    ),
+    'foreign keys' => array(
+        'id' => array('profile' => 'id'),
+    ),
+);
+
+$schema['subscription'] = array(
+    'fields' => array(
+        'subscriber' => array('type' => 'int', 'not null' => true, 'description' => 'profile listening'),
+        'subscribed' => array('type' => 'int', 'not null' => true, 'description' => 'profile being listened to'),
+        'jabber' => array('type' => 'bool', 'default' => 1, 'description' => 'deliver jabber messages'),
+        'sms' => array('type' => 'bool', 'default' => 1, 'description' => 'deliver sms messages'),
+        'token' => array('type' => 'varchar', 'length' => 255, 'description' => 'authorization token'),
+        'secret' => array('type' => 'varchar', 'length' => 255, 'description' => 'token secret'),
+        'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
+        'modified' => array('type' => 'timestamp', 'description' => 'date this record was modified'),
+    ),
+    'primary key' => array('subscriber', 'subscribed'),
+    'indexes' => array(
+        'subscription_subscriber_idx' => array('subscriber', 'created'),
+        'subscription_subscribed_idx' => array('subscribed', 'created'),
+        'subscription_token_idx' => array('token'),
+    ),
+);
+
+$schema['notice'] = array(
+    'fields' => array(
+        'id' => array('type' => 'serial', 'description' => 'unique identifier'),
+        'profile_id' => array('type' => 'int', 'not null' => true, 'description' => 'who made the update'),
+        'uri' => array('type' => 'varchar', 'length' => 255, 'description' => 'universally unique identifier, usually a tag URI'),
+        'content' => array('type' => 'text', 'description' => 'update content'),
+        'rendered' => array('type' => 'text', 'description' => 'HTML version of the content'),
+        'url' => array('type' => 'varchar', 'length' => 255, 'description' => 'URL of any attachment (image, video, bookmark, whatever)'),
+        'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
+        'modified' => array('type' => 'timestamp', 'description' => 'date this record was modified'),
+        'reply_to' => array('type' => 'int', 'description' => 'notice replied to (usually a guess)'),
+        'is_local' => array('type' => 'bool', 'default' => 0, 'description' => 'notice was generated by a user'),
+        'source' => array('type' => 'varchar', 'length' => 32, 'description' => 'source of comment, like "web", "im", or "clientname"'),
+        'conversation' => array('type' => 'int', 'description' => 'id of root notice in this conversation'),
+        'lat' => array('type' => 'numeric', 'precision' => 10, 'scale' => 7, 'description' => 'latitude'),
+        'lon' => array('type' => 'numeric', 'precision' => 10, 'scale' => 7, 'description' => 'longitude'),
+        'location_id' => array('type' => 'int', 'description' => 'location id if possible'),
+        'location_ns' => array('type' => 'int', 'description' => 'namespace for location'),
+        'repeat_of' => array('type' => 'int', 'description' => 'notice this is a repeat of'),
+    ),
+    'primary key' => array('id'),
+    'unique keys' => array(
+        'notice_uri_idx' => array('uri'),
+    ),
+    'foreign keys' => array(
+        'profile_id' => array('profile' => 'id'),
+        'reply_to' => array('notice', 'id'),
+        'conversation' => array('conversation', 'id'), # note... used to refer to notice.id
+        'repeat_of' => array('notice', 'id'), # @fixme: what about repeats of deleted notices?
+    ),
+    'indexes' => array(
+        'notice_profile_id_idx' => array('profile_id,created,id'),
+        'notice_conversation_idx' => array('conversation'),
+        'notice_created_idx' => array('created'),
+        'notice_replyto_idx' => array('reply_to'),
+        'notice_repeatof_idx' => array('repeat_of'),
+        'FULLTEXT' => array('content'),
+    ),
+);
+
+$schema['notice_source'] = array(
+    'fields' => array(
+        'code' => array('type' => 'varchar', 'length' => 32, 'not null' => true, 'description' => 'source code'),
+        'name' => array('type' => 'varchar', 'length' => 255, 'not null' => true, 'description' => 'name of the source'),
+        'url' => array('type' => 'varchar', 'length' => 255, 'not null' => true, 'description' => 'url to link to'),
+        'notice_id' => array('type' => 'int', 'not null' => true, 'description' => 'date this record was created'),
+        'modified' => array('type' => 'timestamp', 'description' => 'date this record was modified'),
+    ),
+    'primary key' => array('code'),
+);
+
+$schema['reply'] = array(
+    'fields' => array(
+        'notice_id' => array('type' => 'int', 'not null' => true, 'description' => 'notice that is the reply'),
+        'profile_id' => array('type' => 'int', 'not null' => true, 'description' => 'profile replied to'),
+        'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
+        'replied_id' => array('type' => 'int', 'description' => 'notice replied to (not used, see notice.reply_to)'),
+    ),
+    'primary key' => array('notice_id', 'profile_id'),
+    'foreign keys' => array(
+        'notice_id' => array('notice' => 'id'),
+        'profile_id' => array('profile' => 'id'),
+    ),
+    'indexes' => array(
+        'reply_notice_id_idx' => array('notice_id'),
+        'reply_profile_id_idx' => array('profile_id'),
+        'reply_replied_id_idx' => array('replied_id'),
+    ),
+);
+
+$schema['fave'] = array(
+    'fields' => array(
+        'notice_id' => array('type' => 'int', 'not null' => true, 'description' => 'notice that is the favorite'),
+        'user_id' => array('type' => 'int', 'not null' => true, 'description' => 'user who likes this notice'),
+        'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
+    ),
+    'primary key' => array('notice_id', 'user_id'),
+    'foreign keys' => array(
+        'notice_id' => array('notice', 'id'),
+        'user_id' => array('profile', 'id'), // note: formerly referenced notice.id, but we can now record remote users' favorites
+    ),
+    'indexes' => array(
+        'fave_notice_id_idx' => array('notice_id'),
+        'fave_user_id_idx' => array('user_id', 'modified'),
+        'fave_modified_idx' => array('modified'),
+    ),
+);
+
+/* tables for OAuth */
+
+$schema['consumer'] = array(
+    'description' => 'OAuth consumer record',
+    'fields' => array(
+        'consumer_key' => array('type' => 'varchar', 'length' => 255, 'description' => 'unique identifier, root URL'),
+        'consumer_secret' => array('type' => 'varchar', 'length' => 255, 'not null' => true, 'description' => 'secret value'),
+        'seed' => array('type' => 'char', 'length' => 32, 'not null' => true, 'description' => 'seed for new tokens by this consumer'),
+
+        'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
+        'modified' => array('type' => 'timestamp', 'description' => 'date this record was modified'),
+    ),
+    'primary key' => array('consumer_key'),
+);
+
+$schema['token'] = array(
+    'description' => 'OAuth token record',
+    'fields' => array(
+        'consumer_key' => array('type' => 'varchar', 'length' => 255, 'not null' => true, 'description' => 'unique identifier, root URL'),
+        'tok' => array('type' => 'char', 'length' => 32, 'not null' => true, 'description' => 'identifying value'),
+        'secret' => array('type' => 'char', 'length' => 32, 'not null' => true, 'description' => 'secret value'),
+        'type' => array('type' => 'bool', 'not null' => true, 'default' => 0, 'description' => 'request or access'),
+        'state' => array('type' => 'bool', 'default' => 0, 'description' => 'for requests, 0 = initial, 1 = authorized, 2 = used'),
+        'verifier' => array('type' => 'varchar', 'length' => 255, 'description' => 'verifier string for OAuth 1.0a'),
+        'verified_callback' => array('type' => 'varchar', 'length' => 255, 'description' => 'verified callback URL for OAuth 1.0a'),
+
+        'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
+        'modified' => array('type' => 'timestamp', 'description' => 'date this record was modified'),
+    ),
+    'primary key' => array('consumer_key', 'tok'),
+    'foreign keys' => array(
+        'consumer_key' => array('consumer' => 'consumer_key'),
+    ),
+);
+
+$schema['nonce'] = array(
+    'description' => 'OAuth nonce record',
+    'fields' => array(
+        'consumer_key' => array('type' => 'varchar', 'length' => 255, 'not null' => true, 'description' => 'unique identifier, root URL'),
+        'tok' => array('type' => 'char', 'length' => 32, 'description' => 'buggy old value, ignored'),
+        'nonce' => array('type' => 'char', 'length' => 32, 'not null' => true, 'description' => 'nonce'),
+        'ts' => array('type' => 'datetime', 'not null' => true, 'description' => 'timestamp sent'),
+
+        'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
+        'modified' => array('type' => 'timestamp', 'description' => 'date this record was modified'),
+    ),
+    'primary key' => array('consumer_key', 'ts', 'nonce'),
+);
+
+$schema['oauth_application'] = array(
+    'description' => 'OAuth application registration record',
+    'fields' => array(
+        'id' => array('type' => 'serial', 'description' => 'unique identifier'),
+        'owner' => array('type' => 'int', 'not null' => true, 'description' => 'owner of the application'),
+        'consumer_key' => array('type' => 'varchar', 'length' => 255, 'not null' => true, 'description' => 'application consumer key',
+        'name' => array('type' => 'varchar', 'length' => 255, 'not null' => true, 'description' => 'name of the application'),
+        'description' => array('type' => 'varchar', 'length' => 255, 'description' => 'description of the application'),
+        'icon' => array('type' => 'varchar', 'length' => 255, 'not null' => true, 'description' => 'application icon'),
+        'source_url' => array('type' => 'varchar', 'length' => 255, 'description' => 'application homepage - used for source link'),
+        'organization' => array('type' => 'varchar', 'length' => 255, 'description' => 'name of the organization running the application'),
+        'homepage' => array('type' => 'varchar', 'length' => 255, 'description' => 'homepage for the organization'),
+        'callback_url' => array('type' => 'varchar', 'length' => 255, 'description' => 'url to redirect to after authentication'),
+        'type' => array('type' => 'bool', 'default' => 0, 'description' => 'type of app, 1 = browser, 2 = desktop'),
+        'access_type' => array('type' => 'bool', 'default' => 0, 'description' => 'default access type, bit 1 = read, bit 2 = write'),
+        'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
+        'modified' => array('type' => 'timestamp', comment 'date this record was modified'),
+    ),
+    'primary key' => array('id'),
+    'unique keys' => array(
+        'oauth_application_name_idx' => array('name'), // in the long run, we should perhaps not force these unique, and use another source id
+    ),
+    'foreign keys' => array(
+        'owner' => array('profile' => 'id'), // Are remote users allowed to create oauth application records?
+        'consumer_key' => array('consumer' => 'consumer_key'),
+    ),
+);
+
+$schema['oauth_application_user'] = array(
+    'fields' => array(
+        'profile_id' => array('type' => 'int', 'not null' => true, 'description' => 'user of the application'),
+        'application_id' => array('type' => 'int', 'not null' => true, 'description' => 'id of the application'),
+        'access_type' => array('type' => 'int', 'size' => 'tiny', 'default' => 0, 'description' => 'access type, bit 1 = read, bit 2 = write'),
+        'token' => array('type' => 'varchar', 'length' => 255, 'description' => 'request or access token'),
+        'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
+        'modified' => array('type' => 'timestamp', 'description' => 'date this record was modified'),
+    ),
+    'primary key' => array('profile_id', 'application_id'),
+    'foreign keys' => array(
+        'profile_id' => array('profile' => 'id'),
+        'application_id' => array('oauth_application' => 'id'),
+    ),
+);
+
+/* These are used by JanRain OpenID library */
+
+$schema['oid_associations'] = array(
+    'fields' => array(
+        'server_url' => array('type' => 'blob'),
+        'handle' => array('type' => 'varchar', 'length' => 255, character set latin1,
+        'secret' => array('type' => 'blob'),
+        'issued' => array('type' => 'int'),
+        'lifetime' => array('type' => 'int'),
+        'assoc_type' => array('type' => 'varchar', 'length' => 64),
+    ),
+    'primary key' => array(array('server_url', 255), 'handle'),
+);
+
+$schema['oid_nonces'] = array(
+    'fields' => array(
+        'server_url' => array('type' => 'varchar', 'length' => 2047),
+        'timestamp' => array('type' => 'int'),
+        'salt' => array('type' => 'char', 'length' => 40),
+    ),
+    'unique keys' => array(
+        'oid_nonces_server_url_type_idx' => array('server_url', 255), 'timestamp', 'salt'),
+    ),
+);
+
+$schema['confirm_address'] = array(
+    'fields' => array(
+        'code' => array('type' => 'varchar', 'length' => 32, 'not null' => true, 'description' => 'good random code'),
+        'user_id' => array('type' => 'int', 'not null' => true, 'description' => 'user who requested confirmation' references user (id),
+        'address' => array('type' => 'varchar', 'length' => 255, 'not null' => true, 'description' => 'address (email, xmpp, SMS, etc.)'),
+        'address_extra' => array('type' => 'varchar', 'length' => 255, 'not null' => true, 'description' => 'carrier ID, for SMS'),
+        'address_type' => array('type' => 'varchar', 'length' => 8, 'not null' => true, 'description' => 'address type ("email", "xmpp", "sms")'),
+        'claimed' => array('type' => 'datetime', 'description' => 'date this was claimed for queueing'),
+        'sent' => array('type' => 'datetime', 'description' => 'date this was sent for queueing'),
+        'modified' => array('type' => 'timestamp', 'description' => 'date this record was modified'),
+    ),
+    'primary key' => array('code'),
+);
+
+$schema['remember_me'] = array(
+    'fields' => array(
+        'code' => array('type' => 'varchar', 'length' => 32, 'not null' => true, 'description' => 'good random code'),
+        'user_id' => array('type' => 'int', 'not null' => true, 'description' => 'user who is logged in' references user (id),
+        'modified' => array('type' => 'timestamp', 'description' => 'date this record was modified',
+    ),
+    'primary key' => array('code'),
+);
+
+$schema['queue_item'] = array(
+    'fields' => array(
+        'id' => array('type' => 'serial', 'description' => 'unique identifier'),
+        'frame' => array('type' => 'blob', 'not null' => true, 'description' => 'data: object reference or opaque string'),
+        'transport' => array('type' => 'varchar', 'length' => 8, 'not null' => true, 'description' => 'queue for what? "email", "xmpp", "sms", "irc", ...'),
+        'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
+        'claimed' => array('type' => 'datetime', 'description' => 'date this item was claimed'),
+    ),
+    'primary key' => array('id'),
+    'indexes' => array(
+        'queue_item_created_idx' => array('created'),
+    ),
+);
+
+/* Hash tags */
+$schema['notice_tag'] = array(
+    'fields' => array(
+        'tag' => array('type' => 'varchar', 'length' => 64, 'not null' => true, 'description' => 'hash tag associated with this notice'),
+        'notice_id' => array('type' => 'int', 'not null' => true, 'description' => 'notice tagged' references notice (id),
+        'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
+    ),
+    'primary key' => array('tag', 'notice_id'),
+    'indexes' => array(
+        'notice_tag_created_idx' => array('created'),
+        'notice_tag_notice_id_idx' => array('notice_id'),
+    ),
+);
+
+/* Synching with foreign services */
+
+$schema['foreign_service'] = array(
+    'fields' => array(
+        'id' => array('type' => 'int', 'not null' => true, 'description' => 'numeric key for service'),
+        'name' => array('type' => 'varchar', 'length' => 32, 'not null' => true, 'description' => 'name of the service'),
+        'description' => array('type' => 'varchar', 'length' => 255, 'description' => 'description'),
+        'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
+        'modified' => array('type' => 'timestamp', 'description' => 'date this record was modified',
+    ),
+    'primary key' => array('id'),
+    'unique keys' => array(
+        'foreign_service_name_idx' => 'name',
+    ),
+);
+
+$schema['foreign_user'] = array(
+    'fields' => array(
+        'id' => array('type' => 'bigint', 'not null' => true, 'description' => 'unique numeric key on foreign service'),
+        'service' => array('type' => 'int', 'not null' => true, 'description' => 'foreign key to service' references foreign_service(id),
+        'uri' => array('type' => 'varchar', 'length' => 255, 'not null' => true, 'description' => 'identifying URI'),
+        'nickname' => array('type' => 'varchar', 'length' => 255, 'description' => 'nickname on foreign service'),
+        'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
+        'modified' => array('type' => 'timestamp', 'description' => 'date this record was modified'),
+    ),
+    'primary key' => array('id', 'service'),
+    'unique keys' => array(
+        'foreign_user_uri_idx' => 'uri',
+    ),
+);
+
+$schema['foreign_link'] = array(
+    'fields' => array(
+        'user_id' => array('type' => 'int', 'description' => 'link to user on this system, if exists' references user (id),
+        'foreign_id' => array('type' => 'int', 'size' => 'big', 'unsigned' => true, 'description' => 'link to user on foreign service, if exists' references foreign_user(id),
+        'service' => array('type' => 'int', 'not null' => true, 'description' => 'foreign key to service' references foreign_service(id),
+        'credentials' => array('type' => 'varchar', 'length' => 255, 'description' => 'authc credentials, typically a password'),
+        'noticesync' => array('type' => 'int', 'size' => 'tiny', 'not null' => true, 'default' => 1, 'description' => 'notice synchronization, bit 1 = sync outgoing, bit 2 = sync incoming, bit 3 = filter local replies'),
+        'friendsync' => array('type' => 'int', 'size' => 'tiny', 'not null' => true, 'default' => 2 'description' => 'friend synchronization, bit 1 = sync outgoing, bit 2 = sync incoming'),
+        'profilesync' => array('type' => 'int', 'size' => 'tiny', 'not null' => true, 'default' => 1, 'description' => 'profile synchronization, bit 1 = sync outgoing, bit 2 = sync incoming'),
+        'last_noticesync' => array('type' => 'datetime', 'description' => 'last time notices were imported'),
+        'last_friendsync' => array('type' => 'datetime', 'description' => 'last time friends were imported'),
+        'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
+        'modified' => array('type' => 'timestamp', 'description' => 'date this record was modified'),
+    ),
+    'primary key' => array('user_id', 'foreign_id', 'service'),
+    'indexes' => array(
+        'foreign_user_user_id_idx' => array('user_id'),
+    ),
+);
+
+$schema['foreign_subscription'] = array(
+    'fields' => array(
+        'service', 'type' => 'int', 'not null' => true, 'description' => 'service where relationship happens' references foreign_service(id),
+        'subscriber', 'type' => 'int', 'not null' => true, 'description' => 'subscriber on foreign service' references foreign_user (id),
+        'subscribed', 'type' => 'int', 'not null' => true, 'description' => 'subscribed user' references foreign_user (id),
+        'created', 'type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
+    ),
+    'primary key' => array('service', 'subscriber', 'subscribed'),
+    'indexes' => array(
+        'foreign_subscription_subscriber_idx' => array('subscriber'),
+        'foreign_subscription_subscribed_idx' => array('subscribed'),
+    ),
+);
+
+$schema['invitation'] = array(
+    'fields' => array(
+        'code', 'type' => 'varchar', 'length' => 32, 'not null' => true, 'description' => 'random code for an invitation'),
+        'user_id', 'type' => 'int', 'not null' => true, 'description' => 'who sent the invitation' references user (id),
+        'address', 'type' => 'varchar', 'length' => 255, 'not null' => true, 'description' => 'invitation sent to'),
+        'address_type', 'type' => 'varchar', 'length' => 8, 'not null' => true, 'description' => 'address type ("email", "xmpp", "sms")'),
+        'created', 'type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
+    ),
+    'primary key' => array('code'),
+    'indexes' => array(
+        'invitation_address_idx' => ('address', 'address_type'),
+        'invitation_user_id_idx' => ('user_id'),
+    ),
+);
+
+$schema['message'] = array(
+    'fields' => array(
+        'id' => array('type' => 'serial', 'description' => 'unique identifier'),
+        'uri' => array('type' => 'varchar', 'length' => 255, 'description' => 'universally unique identifier'),
+        'from_profile' => array('type' => 'int', 'not null' => true, 'description' => 'who the message is from' references profile (id),
+        'to_profile' => array('type' => 'int', 'not null' => true, 'description' => 'who the message is to' references profile (id),
+        'content' => array('type' => 'text', 'description' => 'message content'),
+        'rendered' => array('type' => 'text', 'description' => 'HTML version of the content'),
+        'url' => array('type' => 'varchar', 'length' => 255, 'description' => 'URL of any attachment (image, video, bookmark, whatever)'),
+        'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
+        'modified' => array('type' => 'timestamp', 'description' => 'date this record was modified'),
+        'source' => array('type' => 'varchar', 'length' => 32, 'description' => 'source of comment, like "web", "im", or "clientname"'),
+
+    'primary key' => array('id'),
+    'unique key' => array(
+        'message_uri_idx' => array('uri'),
+    ),
+    'indexes' => array(
+        // @fixme these are really terrible indexes, since you can only sort on one of them at a time.
+        // looks like we really need a (to_profile, created) for inbox and a (from_profile, created) for outbox
+        'message_from_idx' => array('from_profile'),
+        'message_to_idx' => array('to_profile'),
+        'message_created_idx' => array('created'),
+    ),
+);
+
+$schema['notice_inbox'] = array(
+    'fields' => array(
+        'user_id' => array('type' => 'int', 'not null' => true, 'description' => 'user receiving the message' references user (id),
+        'notice_id' => array('type' => 'int', 'not null' => true, 'description' => 'notice received' references notice (id),
+        'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date the notice was created'),
+        'source' => array('type' => 'bool', 'default' => 1, 'description' => 'reason it is in the inbox, 1=subscription'),
+    ),
+    'primary key' => array('user_id', 'notice_id'),
+    'indexes' => array(
+        'notice_inbox_notice_id_idx' => ('notice_id'),
+    ),
+);
+
+$schema['profile_tag'] = array(
+    'fields' => array(
+        'tagger' => array('type' => 'int', 'not null' => true, 'description' => 'user making the tag' references user (id),
+        'tagged' => array('type' => 'int', 'not null' => true, 'description' => 'profile tagged' references profile (id),
+        'tag' => array('type' => 'varchar', 'length' => 64, 'not null' => true, 'description' => 'hash tag associated with this notice'),
+        'modified' => array('type' => 'timestamp', 'description' => 'date the tag was added'),
+    ),
+    'primary key' => array('tagger', 'tagged', 'tag'),
+    'indexes' => array(
+        'profile_tag_modified_idx' => array('modified'),
+        'profile_tag_tagger_tag_idx' => array('tagger', 'tag'),
+        'profile_tag_tagged_idx' => array('tagged'),
+    ),
+);
+
+$schema['profile_block'] = array(
+    'fields' => array(
+        'blocker' => array('type' => 'int', 'not null' => true, 'description' => 'user making the block' references user (id),
+        'blocked' => array('type' => 'int', 'not null' => true, 'description' => 'profile that is blocked' references profile (id),
+        'modified' => array('type' => 'timestamp', 'description' => 'date of blocking'),
+    ),
+    'primary key' => array('blocker', 'blocked'),
+);
+
+$schema['user_group'] = array(
+    'fields' => array(
+        'id' => array('type' => 'serial', 'description' => 'unique identifier'),
+
+        'nickname' => array('type' => 'varchar', 'length' => 64, 'description' => 'nickname for addressing'),
+        'fullname' => array('type' => 'varchar', 'length' => 255, 'description' => 'display name'),
+        'homepage' => array('type' => 'varchar', 'length' => 255, 'description' => 'URL, cached so we dont regenerate'),
+        'description' => array('type' => 'text', 'description' => 'group description'),
+        'location' => array('type' => 'varchar', 'length' => 255, 'description' => 'related physical location, if any'),
+
+        'original_logo' => array('type' => 'varchar', 'length' => 255, 'description' => 'original size logo'),
+        'homepage_logo' => array('type' => 'varchar', 'length' => 255, 'description' => 'homepage (profile) size logo'),
+        'stream_logo' => array('type' => 'varchar', 'length' => 255, 'description' => 'stream-sized logo'),
+        'mini_logo' => array('type' => 'varchar', 'length' => 255, 'description' => 'mini logo'),
+        'design_id' => array('type' => 'int', 'description' => 'id of a design' references design(id),
+
+        'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
+        'modified' => array('type' => 'timestamp', 'description' => 'date this record was modified'),
+
+        'uri' => array('type' => 'varchar', 'length' => 255, 'description' => 'universal identifier'),
+        'mainpage' => array('type' => 'varchar', 'length' => 255, 'description' => 'page for group info to link to'),
+    ),
+    'primary key' => array('id'),
+    'unique key' => array(
+        'user_uri_idx' => array('uri'),
+    ),
+    'indexes' => array(
+        'user_group_nickname_idx' => array('nickname'),
+    ),
+);
+
+$schema['group_member'] = array(
+    'fields' => array(
+        'group_id' => array('type' => 'int', 'not null' => true, 'description' => 'foreign key to user_group' references user_group (id),
+        'profile_id' => array('type' => 'int', 'not null' => true, 'description' => 'foreign key to profile table' references profile (id),
+        'is_admin' => array('type' => 'boolean', 'default' => false, 'description' => 'is this user an admin?'),
+
+        'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
+        'modified' => array('type' => 'timestamp', 'description' => 'date this record was modified'),
+    ),
+    'primary key' => array('group_id', 'profile_id'),
+    'indexes' => array(
+        // @fixme probably we want a (profile_id, created) index here?
+        'group_member_profile_id_idx' => array('profile_id'),
+        'group_member_created_idx' => array('created'),
+    ),
+);
+
+$schema['related_group'] = array(
+    'fields' => array(
+        'group_id' => array('type' => 'int', 'not null' => true, 'description' => 'foreign key to user_group' references user_group (id),
+        'related_group_id' => array('type' => 'int', 'not null' => true, 'description' => 'foreign key to user_group' references user_group (id),
+
+        'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
+    ),
+    'primary key' => array('group_id', 'related_group_id'),
+);
+
+$schema['group_inbox'] = array(
+    'fields' => array(
+        'group_id' => array('type' => 'int', 'not null' => true, 'description' => 'group receiving the message' references user_group (id),
+        'notice_id' => array('type' => 'int', 'not null' => true, 'description' => 'notice received' references notice (id),
+        'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date the notice was created'),
+    ),
+    'primary key' => array('group_id', 'notice_id'),
+    'indexes' => array(
+        'group_inbox_created_idx' => array('created'),
+        'group_inbox_notice_id_idx' => array('notice_id'),
+    ),
+);
+
+$schema['file'] = array(
+    'fields' => array(
+        'id' => array('type' => 'serial'),
+        'url' => array('type' => 'varchar', 'length' => 255, 'description' => 'destination URL after following redirections'),
+        'mimetype' => array('type' => 'varchar', 'length' => 50, 'description' => 'mime type of resource'),
+        'size' => array('type' => 'int', 'description' => 'size of resource when available'),
+        'title' => array('type' => 'varchar', 'length' => 255, 'description' => 'title of resource when available'),
+        'date' => array('type' => 'int', 'description' => 'date of resource according to http query'),
+        'protected' => array('type' => 'int', 'description' => 'true when URL is private (needs login)'),
+        'filename' => array('type' => 'varchar', 'length' => 255, 'description' => 'if a local file, name of the file'),
+
+        'modified' => array('type' => 'timestamp', 'description' => 'date this record was modified'),
+    ),
+    'primary key' => array('id'),
+    'unique keys' => array(
+        'file_url_idx' => array('url'),
+    ),
+);
+
+$schema['file_oembed'] = array(
+    'fields' => array(
+        'file_id' => array('type' => 'int', 'description' => 'oEmbed for that URL/file' references file (id),
+        'version' => array('type' => 'varchar', 'length' => 20, 'description' => 'oEmbed spec. version'),
+        'type' => array('type' => 'varchar', 'length' => 20, 'description' => 'oEmbed type: photo, video, link, rich'),
+        'mimetype' => array('type' => 'varchar', 'length' => 50, 'description' => 'mime type of resource'),
+        'provider' => array('type' => 'varchar', 'length' => 50, 'description' => 'name of this oEmbed provider'),
+        'provider_url' => array('type' => 'varchar', 'length' => 255, 'description' => 'URL of this oEmbed provider'),
+        'width' => array('type' => 'int', 'description' => 'width of oEmbed resource when available'),
+        'height' => array('type' => 'int', 'description' => 'height of oEmbed resource when available'),
+        'html' => array('type' => 'text', 'description' => 'html representation of this oEmbed resource when applicable'),
+        'title' => array('type' => 'varchar', 'length' => 255, 'description' => 'title of oEmbed resource when available'),
+        'author_name' => array('type' => 'varchar', 'length' => 50, 'description' => 'author name for this oEmbed resource'),
+        'author_url' => array('type' => 'varchar', 'length' => 255, 'description' => 'author URL for this oEmbed resource'),
+        'url' => array('type' => 'varchar', 'length' => 255, 'description' => 'URL for this oEmbed resource when applicable (photo, link)'),
+        'modified' => array('type' => 'timestamp', 'description' => 'date this record was modified'
+    ),
+    'primary key' => array('file_id'),
+);
+
+$schema['file_redirection'] = array(
+    'fields' => array(
+        'url' => array('type' => 'varchar', 'length' => 255, 'description' => 'short URL (or any other kind of redirect) for file (id)'),
+        'file_id' => array('type' => 'int', 'description' => 'short URL for what URL/file' references file (id),
+        'redirections' => array('type' => 'int', 'description' => 'redirect count'),
+        'httpcode' => array('type' => 'int', 'description' => 'HTTP status code (20x, 30x, etc.)'),
+        'modified' => array('type' => 'timestamp', 'description' => 'date this record was modified'
+    ),
+    'primary key' => array('url'),
+);
+
+$schema['file_thumbnail'] = array(
+    'fields' => array(
+        'file_id' => array('type' => 'int',  'description' => 'thumbnail for what URL/file' references file (id),
+        'url' => array('type' => 'varchar', 'length' => 255, 'description' => 'URL of thumbnail'),
+        'width' => array('type' => 'int', 'description' => 'width of thumbnail'),
+        'height' => array('type' => 'int', 'description' => 'height of thumbnail'),
+        'modified' => array('type' => 'timestamp', 'description' => 'date this record was modified'),
+    'primary key' => array('file_id'),
+    'unique keys' => array(
+        'file_thumbnail_url_idx' => array('url'),
+    ),
+);
+
+$schema['file_to_post'] = array(
+    'fields' => array(
+        'file_id' => array('type' => 'int', 'description' => 'id of URL/file' references file (id),
+        'post_id' => array('type' => 'int', 'description' => 'id of the notice it belongs to' references notice (id),
+        'modified' => array('type' => 'timestamp', 'description' => 'date this record was modified'),
+    ),
+    'primary key' => array('file_id', 'post_id'),
+    'indexes' => array(
+        'post_id_idx' => array('post_id'),
+    ),
+);
+
+$schema['design'] = array(
+    'fields' => array(
+        'id' => array('type' => 'serial', 'description' => 'design ID'),
+        'backgroundcolor' => array('type' => 'int', 'description' => 'main background color'),
+        'contentcolor' => array('type' => 'int', 'description' => 'content area background color'),
+        'sidebarcolor' => array('type' => 'int', 'description' => 'sidebar background color'),
+        'textcolor' => array('type' => 'int', 'description' => 'text color'),
+        'linkcolor' => array('type' => 'int', 'description' => 'link color'),
+        'backgroundimage' => array('type' => 'varchar', 'length' => 255, 'description' => 'background image, if any'),
+        'disposition' => array('type' => 'int', 'size' => 'tiny', 'default' => 1, 'description' => 'bit 1 = hide background image, bit 2 = display background image, bit 4 = tile background image'
+    ),
+    'primary key' => array('id'),
+);
+
+$schema['group_block'] = array(
+    'fields' => array(
+        'group_id' => array('type' => 'int', 'not null' => true, 'description' => 'group profile is blocked from' references user_group (id),
+        'blocked' => array('type' => 'int', 'not null' => true, 'description' => 'profile that is blocked' references profile (id),
+        'blocker' => array('type' => 'int', 'not null' => true, 'description' => 'user making the block' references user (id),
+        'modified' => array('type' => 'timestamp', 'description' => 'date of blocking'),
+    ),
+    'primary key' => array('group_id', 'blocked'),
+);
+
+$schema['group_alias'] = array(
+    'fields' => array(
+        'alias' => array('type' => 'varchar', 'length' => 64, 'description' => 'additional nickname for the group'),
+        'group_id' => array('type' => 'int 'not null' => true, 'description' => 'group profile is blocked from' references user_group (id),
+        'modified' => array('type' => 'timestamp 'description' => 'date alias was created'),
+    'primary key' => array('alias'),
+    'indexes' => array(
+        'group_alias_group_id_idx' => array('group_id'),
+    ),
+);
+
+$schema['session'] = array(
+    'fields' => array(
+        'id' => array('type' => 'varchar', 'length' => 32, primary key 'description' => 'session ID'),
+        'session_data' => array('type' => 'text', 'description' => 'session data'),
+        'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
+        'modified' => array('type' => 'timestamp', 'description' => 'date this record was modified'),
+
+    'indexes' => array(
+    index session_modified_idx (modified)
+
+);
+
+$schema['deleted_notice'] = array(
+    'fields' => array(
+        'id' => array('type' => 'int', primary key 'description' => 'identity of notice'),
+        'profile_id' => array('type' => 'int', 'not null' => true, 'description' => 'author of the notice'),
+        'uri' => array('type' => 'varchar', 'length' => 255, unique key 'description' => 'universally unique identifier, usually a tag URI'),
+        'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date the notice record was created'),
+        'deleted' => array('type' => 'datetime', 'not null' => true, 'description' => 'date the notice record was created'),
+
+    'indexes' => array(
+    index deleted_notice_profile_id_idx (profile_id)
+
+);
+
+$schema['config'] = array(
+    'fields' => array(
+        'section' => array('type' => 'varchar', 'length' => 32, 'description' => 'configuration section'),
+        'setting' => array('type' => 'varchar', 'length' => 32, 'description' => 'configuration setting'),
+        'value' => array('type' => 'varchar', 'length' => 255, 'description' => 'configuration value'),
+
+    'primary key' => array(section, setting)
+
+);
+
+$schema['profile_role'] = array(
+    'fields' => array(
+        'profile_id' => array('type' => 'int', 'not null' => true, 'description' => 'account having the role' references profile (id),
+        'role   ', 'type' => 'varchar', 'length' => 32, 'not null' => true, 'description' => 'string representing the role'),
+        'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date the role was granted'),
+
+    'primary key' => array(profile_id, role)
+
+);
+
+$schema['location_namespace'] = array(
+    'fields' => array(
+        'id' => array('type' => 'int', primary key 'description' => 'identity for this namespace'),
+        'description' => array('type' => 'varchar', 'length' => 255, 'description' => 'description of the namespace'),
+        'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date the record was created'),
+        'modified' => array('type' => 'timestamp', 'description' => 'date this record was modified'
+
+);
+
+$schema['login_token'] = array(
+    'fields' => array(
+        'user_id' => array('type' => 'int', 'not null' => true, 'description' => 'user owning this token' references user (id),
+        'token' => array('type' => 'char', 'length' => 32, 'not null' => true, 'description' => 'token useable for logging in'),
+        'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
+        'modified' => array('type' => 'timestamp', 'description' => 'date this record was modified'),
+
+    'primary key' => array(user_id)
+);
+
+$schema['user_location_prefs'] = array(
+    'fields' => array(
+        'user_id' => array('type' => 'int', 'not null' => true, 'description' => 'user who has the preference' references user (id),
+        'share_location' => array('type' => 'bool', 'default' => 1, 'description' => 'Whether to share location data'),
+        'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
+        'modified' => array('type' => 'timestamp', 'description' => 'date this record was modified'),
+    ),
+    'primary key' => array(user_id)
+);
+
+$schema['inbox'] = array(
+    'fields' => array(
+        'user_id' => array('type' => 'int', 'not null' => true, 'description' => 'user receiving the notice' references user (id),
+        'notice_ids' => array('type' => 'blob', 'description' => 'packed list of notice ids'),
+    ),
+    'primary key' => array(user_id)
+
+);
+
+// @fixme possibly swap this for a more general prefs table?
+$schema['user_im_prefs'] = array(
+    'fields' => array(
+        'user_id' => array('type' => 'int', 'not null' => true, 'description' => 'user',
+        'screenname' => array('type' => 'varchar', 'length' => 255, 'not null' => true, 'description' => 'screenname on this service'),
+        'transport' => array('type' => 'varchar', 'length' => 255, 'not null' => true, 'description' => 'transport (ex xmpp, aim)'),
+        'notify' => array('type' => 'bool', 'not null' => true, 'default' => 0, 'description' => 'Notify when a new notice is sent'),
+        'replies' => array('type' => 'bool', 'not null' => true, 'default' => 0, 'description' => 'Send replies  from people not subscribed to'),
+        'microid' => array('type' => 'bool', 'not null' => true, 'default' => 1, 'description' => 'Publish a MicroID'),
+        'updatefrompresence' => array('type' => 'bool', 'not null' => true, 'default' => 0, 'description' => 'Send replies  from people not subscribed to.'),
+        'created' => array('type' => 'timestamp', 'not null' => true, DEFAULT CURRENT_TIMESTAMP 'description' => 'date this record was created'),
+        'modified' => array('type' => 'timestamp', 'description' => 'date this record was modified'),
+
+    'primary key' => array('user_id', 'transport'),
+    'unique keys' => array(
+        'transport_screenname_key' => array('transport', 'screenname'),
+    ),
+    'foreign keys' => array(
+        'user_id' => array('user' => 'id'),
+    ),
+);
+
+$schema['conversation'] = array(
+    'fields' => array(
+        'id' => array('type' => 'serial', 'description' => 'unique identifier'),
+        'uri' => array('type' => 'varchar', 'length' => 225, 'description' => 'URI of the conversation'),
+        'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
+        'modified' => array('type' => 'timestamp', 'description' => 'date this record was modified'
+    ),
+    'primary key' => array('id'),
+    'unique keys' => array(
+        'conversation_uri_idx' => array('uri'),
+    ),
+);
+
+$schema['local_group'] = array(
+    'description' => 'Record for a user group on the local site, with some additional info not in user_group',
+    'fields' => array(
+        'group_id' => array('type' => 'int', 'description' => 'group represented'),
+        'nickname' => array('type' => 'varchar', 'length' => 64, 'description' => 'group represented'),
+
+        'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
+        'modified' => array('type' => 'timestamp', 'description' => 'date this record was modified'
+    ),
+    'primary key' => array('group_id'),
+    'foreign keys' => array(
+        'group_id' => array('user_group' => 'id'),
+    ),
+    'unique keys' => array(
+        'local_group_nickname_idx' => array('nickname'),
+    ),
+);
+
+$schema['user_urlshortener_prefs'] = array(
+    'fields' => array(
+        'user_id' => array('type' => 'int', 'not null' => true, 'description' => 'user'),
+        'urlshorteningservice' => array('type' => 'varchar', 'length' => 50, 'default' => 'ur1.ca', 'description' => 'service to use for auto-shortening URLs'),
+        'maxurllength' => array('type' => 'int', 'not null' => true, 'description' => 'urls greater than this length will be shortened, 0 = always, null = never'),
+        'maxnoticelength' => array('type' => 'int', 'not null' => true, 'description' => 'notices with content greater than this value will have all urls shortened, 0 = always, null = never'),
+        
+        'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
+        'modified' => array('type' => 'timestamp', 'description' => 'date this record was modified'),
+
+   'primary key' => array('user_id'),
+   'foreign keys' => array(
+        'user_id' => array('user' => 'id'),
+   ),
+);

From 6dbeea566d1cc8edccefd0e47c1d467021622937 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Fri, 13 Aug 2010 17:32:25 -0700
Subject: [PATCH 171/655] work in progress

---
 db/core.php | 104 +++++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 78 insertions(+), 26 deletions(-)

diff --git a/db/core.php b/db/core.php
index 681c026105..1391f5dbbf 100644
--- a/db/core.php
+++ b/db/core.php
@@ -1,8 +1,27 @@
 <?php
 
-/* local and remote users have profiles */
+/**
+
+Some notes...
+
+drupal docs don't list a bool type, but it might be nice to use rather than 'tinyint'
+note however that we use bitfields and things as well in tinyints
+
+decimal <-> numeric
+
+timestamps... how to specify?
+fulltext indexes?
+got one or two things wanting a custom charset setting on a field?
+
+foreign keys are kinda funky...
+    those specified in inline syntax (as all in the original .sql) are NEVER ENFORCED on mysql
+    those made with an explicit 'foreign key' WITHIN INNODB and IF there's a proper index, do get enforced
+    double-check what we've been doing on postgres?
+
+*/
 
 $schema['profile'] = array(
+    'description' => 'local and remote users have profiles',
     'fields' => array(
         'id' => array('type' => 'serial', 'not null' => true, 'description' => 'unique identifier'),
         'nickname' => array('type' => 'varchar', 'length' => 64, 'not null' => true, 'description' => 'nickname or username'),
@@ -11,8 +30,8 @@ $schema['profile'] = array(
         'homepage' => array('type' => 'varchar', 'length' => 255, 'description' => 'identifying URL'),
         'bio' => array('type' => 'text', 'description' => 'descriptive biography'),
         'location' => array('type' => 'varchar', 'length' => 255, 'description' => 'physical location'),
-        'lat' => array('type' => 'decimal', 'length' => '10,7', 'description' => 'latitude'),
-        'lon' => array('type' => 'decimal', 'length => '10,7', 'description' => 'longitude'),
+        'lat' => array('type' => 'numeric', 'precision' => 10, 'scale' => 7, 'description' => 'latitude'),
+        'lon' => array('type' => 'numeric', 'precision' => 10, 'scale' => 7, 'description' => 'longitude'),
         'location_id' => array('type' => 'int', 'description' => 'location id if possible'),
         'location_ns' => array('type' => 'int', 'description' => 'namespace for location'),
 
@@ -89,7 +108,7 @@ $schema['user'] = array(
         'smsemail' => array('type' => 'varchar', 'length' => 255, 'description' => 'built from sms and carrier'),
         'uri' => array('type' => 'varchar', 'length' => 255, 'description' => 'universally unique identifier, usually a tag URI'),
         'autosubscribe' => array('type' => 'bool', 'default' => 0, 'description' => 'automatically subscribe to users who subscribe to us'),
-        'urlshorteningservice' => array('type' => 'varchar', 'length' => 50, default 'ur1.ca' 'description' => 'service to use for auto-shortening URLs'),
+        'urlshorteningservice' => array('type' => 'varchar', 'length' => 50, 'default' => 'ur1.ca', 'description' => 'service to use for auto-shortening URLs'),
         'inboxed' => array('type' => 'bool', 'default' => 0, 'description' => 'has an inbox been created for this user?'),
         'design_id' => array('type' => 'int', 'description' => 'id of a design'),
         'viewdesigns' => array('type' => 'bool', 'default' => 1, 'description' => 'whether to view user-provided designs'),
@@ -339,7 +358,7 @@ $schema['oauth_application_user'] = array(
 $schema['oid_associations'] = array(
     'fields' => array(
         'server_url' => array('type' => 'blob'),
-        'handle' => array('type' => 'varchar', 'length' => 255, character set latin1,
+        'handle' => array('type' => 'varchar', 'length' => 255), // character set latin1,
         'secret' => array('type' => 'blob'),
         'issued' => array('type' => 'int'),
         'lifetime' => array('type' => 'int'),
@@ -362,7 +381,7 @@ $schema['oid_nonces'] = array(
 $schema['confirm_address'] = array(
     'fields' => array(
         'code' => array('type' => 'varchar', 'length' => 32, 'not null' => true, 'description' => 'good random code'),
-        'user_id' => array('type' => 'int', 'not null' => true, 'description' => 'user who requested confirmation' references user (id),
+        'user_id' => array('type' => 'int', 'not null' => true, 'description' => 'user who requested confirmation'),
         'address' => array('type' => 'varchar', 'length' => 255, 'not null' => true, 'description' => 'address (email, xmpp, SMS, etc.)'),
         'address_extra' => array('type' => 'varchar', 'length' => 255, 'not null' => true, 'description' => 'carrier ID, for SMS'),
         'address_type' => array('type' => 'varchar', 'length' => 8, 'not null' => true, 'description' => 'address type ("email", "xmpp", "sms")'),
@@ -371,22 +390,28 @@ $schema['confirm_address'] = array(
         'modified' => array('type' => 'timestamp', 'description' => 'date this record was modified'),
     ),
     'primary key' => array('code'),
+    'foreign keys' => array(
+        'user_id' => array('user' => 'id'),
+    ),
 );
 
 $schema['remember_me'] = array(
     'fields' => array(
         'code' => array('type' => 'varchar', 'length' => 32, 'not null' => true, 'description' => 'good random code'),
-        'user_id' => array('type' => 'int', 'not null' => true, 'description' => 'user who is logged in' references user (id),
-        'modified' => array('type' => 'timestamp', 'description' => 'date this record was modified',
+        'user_id' => array('type' => 'int', 'not null' => true, 'description' => 'user who is logged in'),
+        'modified' => array('type' => 'timestamp', 'description' => 'date this record was modified'),
     ),
     'primary key' => array('code'),
+    'foreign keys' => array(
+        'user_id' => array('user' => 'id'),
+    ),
 );
 
 $schema['queue_item'] = array(
     'fields' => array(
         'id' => array('type' => 'serial', 'description' => 'unique identifier'),
         'frame' => array('type' => 'blob', 'not null' => true, 'description' => 'data: object reference or opaque string'),
-        'transport' => array('type' => 'varchar', 'length' => 8, 'not null' => true, 'description' => 'queue for what? "email", "xmpp", "sms", "irc", ...'),
+        'transport' => array('type' => 'varchar', 'length' => 8, 'not null' => true, 'description' => 'queue for what? "email", "xmpp", "sms", "irc", ...'), // @fixme 8 chars is too short; bump up.
         'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
         'claimed' => array('type' => 'datetime', 'description' => 'date this item was claimed'),
     ),
@@ -396,14 +421,17 @@ $schema['queue_item'] = array(
     ),
 );
 
-/* Hash tags */
 $schema['notice_tag'] = array(
+    'description' => 'Hash tags',
     'fields' => array(
         'tag' => array('type' => 'varchar', 'length' => 64, 'not null' => true, 'description' => 'hash tag associated with this notice'),
-        'notice_id' => array('type' => 'int', 'not null' => true, 'description' => 'notice tagged' references notice (id),
+        'notice_id' => array('type' => 'int', 'not null' => true, 'description' => 'notice tagged'),
         'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
     ),
     'primary key' => array('tag', 'notice_id'),
+    'foreign keys' => array(
+        'notice_id' => array('notice' => 'id'),
+    ),
     'indexes' => array(
         'notice_tag_created_idx' => array('created'),
         'notice_tag_notice_id_idx' => array('notice_id'),
@@ -429,13 +457,16 @@ $schema['foreign_service'] = array(
 $schema['foreign_user'] = array(
     'fields' => array(
         'id' => array('type' => 'bigint', 'not null' => true, 'description' => 'unique numeric key on foreign service'),
-        'service' => array('type' => 'int', 'not null' => true, 'description' => 'foreign key to service' references foreign_service(id),
+        'service' => array('type' => 'int', 'not null' => true, 'description' => 'foreign key to service'),
         'uri' => array('type' => 'varchar', 'length' => 255, 'not null' => true, 'description' => 'identifying URI'),
         'nickname' => array('type' => 'varchar', 'length' => 255, 'description' => 'nickname on foreign service'),
         'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
         'modified' => array('type' => 'timestamp', 'description' => 'date this record was modified'),
     ),
     'primary key' => array('id', 'service'),
+    'foreign keys' => array(
+        'service' => array('foreign_service' => 'id'),
+    ),
     'unique keys' => array(
         'foreign_user_uri_idx' => 'uri',
     ),
@@ -443,9 +474,9 @@ $schema['foreign_user'] = array(
 
 $schema['foreign_link'] = array(
     'fields' => array(
-        'user_id' => array('type' => 'int', 'description' => 'link to user on this system, if exists' references user (id),
+        'user_id' => array('type' => 'int', 'description' => 'link to user on this system, if exists'),
         'foreign_id' => array('type' => 'int', 'size' => 'big', 'unsigned' => true, 'description' => 'link to user on foreign service, if exists' references foreign_user(id),
-        'service' => array('type' => 'int', 'not null' => true, 'description' => 'foreign key to service' references foreign_service(id),
+        'service' => array('type' => 'int', 'not null' => true, 'description' => 'foreign key to service'),
         'credentials' => array('type' => 'varchar', 'length' => 255, 'description' => 'authc credentials, typically a password'),
         'noticesync' => array('type' => 'int', 'size' => 'tiny', 'not null' => true, 'default' => 1, 'description' => 'notice synchronization, bit 1 = sync outgoing, bit 2 = sync incoming, bit 3 = filter local replies'),
         'friendsync' => array('type' => 'int', 'size' => 'tiny', 'not null' => true, 'default' => 2 'description' => 'friend synchronization, bit 1 = sync outgoing, bit 2 = sync incoming'),
@@ -456,6 +487,10 @@ $schema['foreign_link'] = array(
         'modified' => array('type' => 'timestamp', 'description' => 'date this record was modified'),
     ),
     'primary key' => array('user_id', 'foreign_id', 'service'),
+    'foreign keys' => array(
+        'user_id' => array('user' => 'id'),
+        'service' => array('foreign_service' => 'id'),
+    ),
     'indexes' => array(
         'foreign_user_user_id_idx' => array('user_id'),
     ),
@@ -463,12 +498,17 @@ $schema['foreign_link'] = array(
 
 $schema['foreign_subscription'] = array(
     'fields' => array(
-        'service', 'type' => 'int', 'not null' => true, 'description' => 'service where relationship happens' references foreign_service(id),
-        'subscriber', 'type' => 'int', 'not null' => true, 'description' => 'subscriber on foreign service' references foreign_user (id),
-        'subscribed', 'type' => 'int', 'not null' => true, 'description' => 'subscribed user' references foreign_user (id),
+        'service', 'type' => 'int', 'not null' => true, 'description' => 'service where relationship happens'),
+        'subscriber', 'type' => 'int', 'not null' => true, 'description' => 'subscriber on foreign service'),
+        'subscribed', 'type' => 'int', 'not null' => true, 'description' => 'subscribed user'),
         'created', 'type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
     ),
     'primary key' => array('service', 'subscriber', 'subscribed'),
+    'foreign keys' => array(
+        'service' => array('foreign_service' => 'id'),
+        'subscriber' => array('foreign_user' => 'id'),
+        'subscribed' => array('foreign_user' => 'id'),
+    ),
     'indexes' => array(
         'foreign_subscription_subscriber_idx' => array('subscriber'),
         'foreign_subscription_subscribed_idx' => array('subscribed'),
@@ -478,15 +518,18 @@ $schema['foreign_subscription'] = array(
 $schema['invitation'] = array(
     'fields' => array(
         'code', 'type' => 'varchar', 'length' => 32, 'not null' => true, 'description' => 'random code for an invitation'),
-        'user_id', 'type' => 'int', 'not null' => true, 'description' => 'who sent the invitation' references user (id),
+        'user_id', 'type' => 'int', 'not null' => true, 'description' => 'who sent the invitation',
         'address', 'type' => 'varchar', 'length' => 255, 'not null' => true, 'description' => 'invitation sent to'),
         'address_type', 'type' => 'varchar', 'length' => 8, 'not null' => true, 'description' => 'address type ("email", "xmpp", "sms")'),
         'created', 'type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
     ),
     'primary key' => array('code'),
+    'foreign keys' => array(
+        'user_id' => array('user' => 'id'),
+    ),
     'indexes' => array(
-        'invitation_address_idx' => ('address', 'address_type'),
-        'invitation_user_id_idx' => ('user_id'),
+        'invitation_address_idx' => array('address', 'address_type'),
+        'invitation_user_id_idx' => array('user_id'),
     ),
 );
 
@@ -494,19 +537,23 @@ $schema['message'] = array(
     'fields' => array(
         'id' => array('type' => 'serial', 'description' => 'unique identifier'),
         'uri' => array('type' => 'varchar', 'length' => 255, 'description' => 'universally unique identifier'),
-        'from_profile' => array('type' => 'int', 'not null' => true, 'description' => 'who the message is from' references profile (id),
-        'to_profile' => array('type' => 'int', 'not null' => true, 'description' => 'who the message is to' references profile (id),
+        'from_profile' => array('type' => 'int', 'not null' => true, 'description' => 'who the message is from'),
+        'to_profile' => array('type' => 'int', 'not null' => true, 'description' => 'who the message is to'),
         'content' => array('type' => 'text', 'description' => 'message content'),
         'rendered' => array('type' => 'text', 'description' => 'HTML version of the content'),
         'url' => array('type' => 'varchar', 'length' => 255, 'description' => 'URL of any attachment (image, video, bookmark, whatever)'),
         'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
         'modified' => array('type' => 'timestamp', 'description' => 'date this record was modified'),
         'source' => array('type' => 'varchar', 'length' => 32, 'description' => 'source of comment, like "web", "im", or "clientname"'),
-
+    ),
     'primary key' => array('id'),
     'unique key' => array(
         'message_uri_idx' => array('uri'),
     ),
+    'foreign keys' => array(
+        'from_profile' => array('profile' => 'id'),
+        'to_profile' => array('profile' => 'id'),
+    ),
     'indexes' => array(
         // @fixme these are really terrible indexes, since you can only sort on one of them at a time.
         // looks like we really need a (to_profile, created) for inbox and a (from_profile, created) for outbox
@@ -517,15 +564,20 @@ $schema['message'] = array(
 );
 
 $schema['notice_inbox'] = array(
+    'description' => 'Obsolete; old entries here are converted to packed entries in the inbox table since 0.9',
     'fields' => array(
-        'user_id' => array('type' => 'int', 'not null' => true, 'description' => 'user receiving the message' references user (id),
-        'notice_id' => array('type' => 'int', 'not null' => true, 'description' => 'notice received' references notice (id),
+        'user_id' => array('type' => 'int', 'not null' => true, 'description' => 'user receiving the message'),
+        'notice_id' => array('type' => 'int', 'not null' => true, 'description' => 'notice received'),
         'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date the notice was created'),
         'source' => array('type' => 'bool', 'default' => 1, 'description' => 'reason it is in the inbox, 1=subscription'),
     ),
     'primary key' => array('user_id', 'notice_id'),
+    'foreign keys' => array(
+        'user_id' => array('user' => 'id'),
+        'notice_id' => array('notice' => 'id'),
+    ),
     'indexes' => array(
-        'notice_inbox_notice_id_idx' => ('notice_id'),
+        'notice_inbox_notice_id_idx' => array('notice_id'),
     ),
 );
 

From 7a604365eb89b186eb0cf466cedf5a3d7569edc4 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Mon, 16 Aug 2010 12:39:20 -0700
Subject: [PATCH 172/655] Syntax fixes to defs file

---
 db/core.php | 222 +++++++++++++++++++++++++++++++++-------------------
 1 file changed, 143 insertions(+), 79 deletions(-)

diff --git a/db/core.php b/db/core.php
index 1391f5dbbf..802d7158c1 100644
--- a/db/core.php
+++ b/db/core.php
@@ -48,7 +48,7 @@ $schema['profile'] = array(
 
 $schema['avatar'] = array(
     'fields' => array(
-        'profile_id' => array('type' => 'int', 'not null' => true, 'description' => 'foreign key to profile table',
+        'profile_id' => array('type' => 'int', 'not null' => true, 'description' => 'foreign key to profile table'),
         'original' => array('type' => 'boolean', 'default' => false, 'description' => 'uploaded by user or generated?'),
         'width' => array('type' => 'int', 'not null' => true, 'description' => 'image width'),
         'height' => array('type' => 'int', 'not null' => true, 'description' => 'image height'),
@@ -314,7 +314,7 @@ $schema['oauth_application'] = array(
     'fields' => array(
         'id' => array('type' => 'serial', 'description' => 'unique identifier'),
         'owner' => array('type' => 'int', 'not null' => true, 'description' => 'owner of the application'),
-        'consumer_key' => array('type' => 'varchar', 'length' => 255, 'not null' => true, 'description' => 'application consumer key',
+        'consumer_key' => array('type' => 'varchar', 'length' => 255, 'not null' => true, 'description' => 'application consumer key'),
         'name' => array('type' => 'varchar', 'length' => 255, 'not null' => true, 'description' => 'name of the application'),
         'description' => array('type' => 'varchar', 'length' => 255, 'description' => 'description of the application'),
         'icon' => array('type' => 'varchar', 'length' => 255, 'not null' => true, 'description' => 'application icon'),
@@ -325,7 +325,7 @@ $schema['oauth_application'] = array(
         'type' => array('type' => 'bool', 'default' => 0, 'description' => 'type of app, 1 = browser, 2 = desktop'),
         'access_type' => array('type' => 'bool', 'default' => 0, 'description' => 'default access type, bit 1 = read, bit 2 = write'),
         'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
-        'modified' => array('type' => 'timestamp', comment 'date this record was modified'),
+        'modified' => array('type' => 'timestamp', 'description' => 'date this record was modified'),
     ),
     'primary key' => array('id'),
     'unique keys' => array(
@@ -374,7 +374,7 @@ $schema['oid_nonces'] = array(
         'salt' => array('type' => 'char', 'length' => 40),
     ),
     'unique keys' => array(
-        'oid_nonces_server_url_type_idx' => array('server_url', 255), 'timestamp', 'salt'),
+        'oid_nonces_server_url_type_idx' => array(array('server_url', 255), 'timestamp', 'salt'),
     ),
 );
 
@@ -446,11 +446,11 @@ $schema['foreign_service'] = array(
         'name' => array('type' => 'varchar', 'length' => 32, 'not null' => true, 'description' => 'name of the service'),
         'description' => array('type' => 'varchar', 'length' => 255, 'description' => 'description'),
         'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
-        'modified' => array('type' => 'timestamp', 'description' => 'date this record was modified',
+        'modified' => array('type' => 'timestamp', 'description' => 'date this record was modified'),
     ),
     'primary key' => array('id'),
     'unique keys' => array(
-        'foreign_service_name_idx' => 'name',
+        'foreign_service_name_idx' => array('name'),
     ),
 );
 
@@ -468,18 +468,18 @@ $schema['foreign_user'] = array(
         'service' => array('foreign_service' => 'id'),
     ),
     'unique keys' => array(
-        'foreign_user_uri_idx' => 'uri',
+        'foreign_user_uri_idx' => array('uri'),
     ),
 );
 
 $schema['foreign_link'] = array(
     'fields' => array(
         'user_id' => array('type' => 'int', 'description' => 'link to user on this system, if exists'),
-        'foreign_id' => array('type' => 'int', 'size' => 'big', 'unsigned' => true, 'description' => 'link to user on foreign service, if exists' references foreign_user(id),
+        'foreign_id' => array('type' => 'int', 'size' => 'big', 'unsigned' => true, 'description' => 'link to user on foreign service, if exists'),
         'service' => array('type' => 'int', 'not null' => true, 'description' => 'foreign key to service'),
         'credentials' => array('type' => 'varchar', 'length' => 255, 'description' => 'authc credentials, typically a password'),
         'noticesync' => array('type' => 'int', 'size' => 'tiny', 'not null' => true, 'default' => 1, 'description' => 'notice synchronization, bit 1 = sync outgoing, bit 2 = sync incoming, bit 3 = filter local replies'),
-        'friendsync' => array('type' => 'int', 'size' => 'tiny', 'not null' => true, 'default' => 2 'description' => 'friend synchronization, bit 1 = sync outgoing, bit 2 = sync incoming'),
+        'friendsync' => array('type' => 'int', 'size' => 'tiny', 'not null' => true, 'default' => 2, 'description' => 'friend synchronization, bit 1 = sync outgoing, bit 2 = sync incoming'),
         'profilesync' => array('type' => 'int', 'size' => 'tiny', 'not null' => true, 'default' => 1, 'description' => 'profile synchronization, bit 1 = sync outgoing, bit 2 = sync incoming'),
         'last_noticesync' => array('type' => 'datetime', 'description' => 'last time notices were imported'),
         'last_friendsync' => array('type' => 'datetime', 'description' => 'last time friends were imported'),
@@ -489,6 +489,7 @@ $schema['foreign_link'] = array(
     'primary key' => array('user_id', 'foreign_id', 'service'),
     'foreign keys' => array(
         'user_id' => array('user' => 'id'),
+        'foreign_id' => array('foreign_user' => 'id'),
         'service' => array('foreign_service' => 'id'),
     ),
     'indexes' => array(
@@ -498,10 +499,10 @@ $schema['foreign_link'] = array(
 
 $schema['foreign_subscription'] = array(
     'fields' => array(
-        'service', 'type' => 'int', 'not null' => true, 'description' => 'service where relationship happens'),
-        'subscriber', 'type' => 'int', 'not null' => true, 'description' => 'subscriber on foreign service'),
-        'subscribed', 'type' => 'int', 'not null' => true, 'description' => 'subscribed user'),
-        'created', 'type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
+        'service' => array('type' => 'int', 'not null' => true, 'description' => 'service where relationship happens'),
+        'subscriber' => array('type' => 'int', 'not null' => true, 'description' => 'subscriber on foreign service'),
+        'subscribed' => array('type' => 'int', 'not null' => true, 'description' => 'subscribed user'),
+        'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
     ),
     'primary key' => array('service', 'subscriber', 'subscribed'),
     'foreign keys' => array(
@@ -517,11 +518,11 @@ $schema['foreign_subscription'] = array(
 
 $schema['invitation'] = array(
     'fields' => array(
-        'code', 'type' => 'varchar', 'length' => 32, 'not null' => true, 'description' => 'random code for an invitation'),
-        'user_id', 'type' => 'int', 'not null' => true, 'description' => 'who sent the invitation',
-        'address', 'type' => 'varchar', 'length' => 255, 'not null' => true, 'description' => 'invitation sent to'),
-        'address_type', 'type' => 'varchar', 'length' => 8, 'not null' => true, 'description' => 'address type ("email", "xmpp", "sms")'),
-        'created', 'type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
+        'code' => array('type' => 'varchar', 'length' => 32, 'not null' => true, 'description' => 'random code for an invitation'),
+        'user_id' => array('type' => 'int', 'not null' => true, 'description' => 'who sent the invitation'),
+        'address' => array('type' => 'varchar', 'length' => 255, 'not null' => true, 'description' => 'invitation sent to'),
+        'address_type' => array('type' => 'varchar', 'length' => 8, 'not null' => true, 'description' => 'address type ("email", "xmpp", "sms")'),
+        'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
     ),
     'primary key' => array('code'),
     'foreign keys' => array(
@@ -583,12 +584,16 @@ $schema['notice_inbox'] = array(
 
 $schema['profile_tag'] = array(
     'fields' => array(
-        'tagger' => array('type' => 'int', 'not null' => true, 'description' => 'user making the tag' references user (id),
-        'tagged' => array('type' => 'int', 'not null' => true, 'description' => 'profile tagged' references profile (id),
+        'tagger' => array('type' => 'int', 'not null' => true, 'description' => 'user making the tag'),
+        'tagged' => array('type' => 'int', 'not null' => true, 'description' => 'profile tagged'),
         'tag' => array('type' => 'varchar', 'length' => 64, 'not null' => true, 'description' => 'hash tag associated with this notice'),
         'modified' => array('type' => 'timestamp', 'description' => 'date the tag was added'),
     ),
     'primary key' => array('tagger', 'tagged', 'tag'),
+    'foreign keys' => array(
+        'tagger' => array('user' => 'id'),
+        'tagged' => array('profile' => 'id'),
+    ),
     'indexes' => array(
         'profile_tag_modified_idx' => array('modified'),
         'profile_tag_tagger_tag_idx' => array('tagger', 'tag'),
@@ -598,10 +603,14 @@ $schema['profile_tag'] = array(
 
 $schema['profile_block'] = array(
     'fields' => array(
-        'blocker' => array('type' => 'int', 'not null' => true, 'description' => 'user making the block' references user (id),
-        'blocked' => array('type' => 'int', 'not null' => true, 'description' => 'profile that is blocked' references profile (id),
+        'blocker' => array('type' => 'int', 'not null' => true, 'description' => 'user making the block'),
+        'blocked' => array('type' => 'int', 'not null' => true, 'description' => 'profile that is blocked'),
         'modified' => array('type' => 'timestamp', 'description' => 'date of blocking'),
     ),
+    'foreign keys' => array(
+        'blocker' => array('user' => 'id'),
+        'blocked' => array('profile' => 'id'),
+    ),
     'primary key' => array('blocker', 'blocked'),
 );
 
@@ -619,7 +628,7 @@ $schema['user_group'] = array(
         'homepage_logo' => array('type' => 'varchar', 'length' => 255, 'description' => 'homepage (profile) size logo'),
         'stream_logo' => array('type' => 'varchar', 'length' => 255, 'description' => 'stream-sized logo'),
         'mini_logo' => array('type' => 'varchar', 'length' => 255, 'description' => 'mini logo'),
-        'design_id' => array('type' => 'int', 'description' => 'id of a design' references design(id),
+        'design_id' => array('type' => 'int', 'description' => 'id of a design'),
 
         'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
         'modified' => array('type' => 'timestamp', 'description' => 'date this record was modified'),
@@ -631,6 +640,9 @@ $schema['user_group'] = array(
     'unique key' => array(
         'user_uri_idx' => array('uri'),
     ),
+    'foreign keys' => array(
+        'design_id' => array('design' => 'id'),
+    ),
     'indexes' => array(
         'user_group_nickname_idx' => array('nickname'),
     ),
@@ -638,14 +650,18 @@ $schema['user_group'] = array(
 
 $schema['group_member'] = array(
     'fields' => array(
-        'group_id' => array('type' => 'int', 'not null' => true, 'description' => 'foreign key to user_group' references user_group (id),
-        'profile_id' => array('type' => 'int', 'not null' => true, 'description' => 'foreign key to profile table' references profile (id),
+        'group_id' => array('type' => 'int', 'not null' => true, 'description' => 'foreign key to user_group'),
+        'profile_id' => array('type' => 'int', 'not null' => true, 'description' => 'foreign key to profile table'),
         'is_admin' => array('type' => 'boolean', 'default' => false, 'description' => 'is this user an admin?'),
 
         'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
         'modified' => array('type' => 'timestamp', 'description' => 'date this record was modified'),
     ),
     'primary key' => array('group_id', 'profile_id'),
+    'foreign keys' => array(
+        'group_id' => array('user_group' => 'id'),
+        'profile_id' => array('profile' => 'id'),
+    ),
     'indexes' => array(
         // @fixme probably we want a (profile_id, created) index here?
         'group_member_profile_id_idx' => array('profile_id'),
@@ -654,22 +670,32 @@ $schema['group_member'] = array(
 );
 
 $schema['related_group'] = array(
+    // @fixme description for related_group?
     'fields' => array(
-        'group_id' => array('type' => 'int', 'not null' => true, 'description' => 'foreign key to user_group' references user_group (id),
-        'related_group_id' => array('type' => 'int', 'not null' => true, 'description' => 'foreign key to user_group' references user_group (id),
+        'group_id' => array('type' => 'int', 'not null' => true, 'description' => 'foreign key to user_group'),
+        'related_group_id' => array('type' => 'int', 'not null' => true, 'description' => 'foreign key to user_group'),
 
         'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
     ),
     'primary key' => array('group_id', 'related_group_id'),
+    'foreign keys' => array(
+        'group_id' => array('user_group' => 'id'),
+        'related_group_id' => array('user_group' => 'id'),
+    ),
 );
 
 $schema['group_inbox'] = array(
+    'description' => 'Many-many table listing notices posted to a given group, or which groups a given notice was posted to.',
     'fields' => array(
-        'group_id' => array('type' => 'int', 'not null' => true, 'description' => 'group receiving the message' references user_group (id),
-        'notice_id' => array('type' => 'int', 'not null' => true, 'description' => 'notice received' references notice (id),
+        'group_id' => array('type' => 'int', 'not null' => true, 'description' => 'group receiving the message'),
+        'notice_id' => array('type' => 'int', 'not null' => true, 'description' => 'notice received'),
         'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date the notice was created'),
     ),
     'primary key' => array('group_id', 'notice_id'),
+    'foreign keys' => array(
+        'group_id' => array('user_group' => 'id'),
+        'notice_id' => array('notice' => 'id'),
+    ),
     'indexes' => array(
         'group_inbox_created_idx' => array('created'),
         'group_inbox_notice_id_idx' => array('notice_id'),
@@ -697,7 +723,7 @@ $schema['file'] = array(
 
 $schema['file_oembed'] = array(
     'fields' => array(
-        'file_id' => array('type' => 'int', 'description' => 'oEmbed for that URL/file' references file (id),
+        'file_id' => array('type' => 'int', 'description' => 'oEmbed for that URL/file'),
         'version' => array('type' => 'varchar', 'length' => 20, 'description' => 'oEmbed spec. version'),
         'type' => array('type' => 'varchar', 'length' => 20, 'description' => 'oEmbed type: photo, video, link, rich'),
         'mimetype' => array('type' => 'varchar', 'length' => 50, 'description' => 'mime type of resource'),
@@ -710,30 +736,40 @@ $schema['file_oembed'] = array(
         'author_name' => array('type' => 'varchar', 'length' => 50, 'description' => 'author name for this oEmbed resource'),
         'author_url' => array('type' => 'varchar', 'length' => 255, 'description' => 'author URL for this oEmbed resource'),
         'url' => array('type' => 'varchar', 'length' => 255, 'description' => 'URL for this oEmbed resource when applicable (photo, link)'),
-        'modified' => array('type' => 'timestamp', 'description' => 'date this record was modified'
+        'modified' => array('type' => 'timestamp', 'description' => 'date this record was modified'),
     ),
     'primary key' => array('file_id'),
+    'foreign keys' => array(
+         'file_id' => array('file' => 'id'),
+    ),
 );
 
 $schema['file_redirection'] = array(
     'fields' => array(
         'url' => array('type' => 'varchar', 'length' => 255, 'description' => 'short URL (or any other kind of redirect) for file (id)'),
-        'file_id' => array('type' => 'int', 'description' => 'short URL for what URL/file' references file (id),
+        'file_id' => array('type' => 'int', 'description' => 'short URL for what URL/file'),
         'redirections' => array('type' => 'int', 'description' => 'redirect count'),
         'httpcode' => array('type' => 'int', 'description' => 'HTTP status code (20x, 30x, etc.)'),
-        'modified' => array('type' => 'timestamp', 'description' => 'date this record was modified'
+        'modified' => array('type' => 'timestamp', 'description' => 'date this record was modified'),
     ),
     'primary key' => array('url'),
+    'foreign keys' => array(
+         'file_id' => array('file' => 'id'),
+    ),
 );
 
 $schema['file_thumbnail'] = array(
     'fields' => array(
-        'file_id' => array('type' => 'int',  'description' => 'thumbnail for what URL/file' references file (id),
+        'file_id' => array('type' => 'int',  'description' => 'thumbnail for what URL/file'),
         'url' => array('type' => 'varchar', 'length' => 255, 'description' => 'URL of thumbnail'),
         'width' => array('type' => 'int', 'description' => 'width of thumbnail'),
         'height' => array('type' => 'int', 'description' => 'height of thumbnail'),
         'modified' => array('type' => 'timestamp', 'description' => 'date this record was modified'),
+    ),
     'primary key' => array('file_id'),
+    'foreign keys' => array(
+        'file_id' => array('file' => 'id'),
+    ),
     'unique keys' => array(
         'file_thumbnail_url_idx' => array('url'),
     ),
@@ -741,11 +777,15 @@ $schema['file_thumbnail'] = array(
 
 $schema['file_to_post'] = array(
     'fields' => array(
-        'file_id' => array('type' => 'int', 'description' => 'id of URL/file' references file (id),
-        'post_id' => array('type' => 'int', 'description' => 'id of the notice it belongs to' references notice (id),
+        'file_id' => array('type' => 'int', 'description' => 'id of URL/file'),
+        'post_id' => array('type' => 'int', 'description' => 'id of the notice it belongs to'),
         'modified' => array('type' => 'timestamp', 'description' => 'date this record was modified'),
     ),
     'primary key' => array('file_id', 'post_id'),
+    'foreign keys' => array(
+        'file_id' => array('file' => 'id'),
+        'post_id' => array('notice' => 'id'),
+    ),
     'indexes' => array(
         'post_id_idx' => array('post_id'),
     ),
@@ -760,27 +800,36 @@ $schema['design'] = array(
         'textcolor' => array('type' => 'int', 'description' => 'text color'),
         'linkcolor' => array('type' => 'int', 'description' => 'link color'),
         'backgroundimage' => array('type' => 'varchar', 'length' => 255, 'description' => 'background image, if any'),
-        'disposition' => array('type' => 'int', 'size' => 'tiny', 'default' => 1, 'description' => 'bit 1 = hide background image, bit 2 = display background image, bit 4 = tile background image'
+        'disposition' => array('type' => 'int', 'size' => 'tiny', 'default' => 1, 'description' => 'bit 1 = hide background image, bit 2 = display background image, bit 4 = tile background image'),
     ),
     'primary key' => array('id'),
 );
 
 $schema['group_block'] = array(
     'fields' => array(
-        'group_id' => array('type' => 'int', 'not null' => true, 'description' => 'group profile is blocked from' references user_group (id),
-        'blocked' => array('type' => 'int', 'not null' => true, 'description' => 'profile that is blocked' references profile (id),
-        'blocker' => array('type' => 'int', 'not null' => true, 'description' => 'user making the block' references user (id),
+        'group_id' => array('type' => 'int', 'not null' => true, 'description' => 'group profile is blocked from'),
+        'blocked' => array('type' => 'int', 'not null' => true, 'description' => 'profile that is blocked'),
+        'blocker' => array('type' => 'int', 'not null' => true, 'description' => 'user making the block'),
         'modified' => array('type' => 'timestamp', 'description' => 'date of blocking'),
     ),
     'primary key' => array('group_id', 'blocked'),
+    'foreign keys' => array(
+        'group_id' => array('user_group' => 'id'),
+        'blocked' => array('profile' => 'id'),
+        'blocker' => array('user' => 'id'),
+    ),
 );
 
 $schema['group_alias'] = array(
     'fields' => array(
         'alias' => array('type' => 'varchar', 'length' => 64, 'description' => 'additional nickname for the group'),
-        'group_id' => array('type' => 'int 'not null' => true, 'description' => 'group profile is blocked from' references user_group (id),
-        'modified' => array('type' => 'timestamp 'description' => 'date alias was created'),
+        'group_id' => array('type' => 'int', 'not null' => true, 'description' => 'group profile is blocked from'),
+        'modified' => array('type' => 'timestamp', 'description' => 'date alias was created'),
+    ),
     'primary key' => array('alias'),
+    'foreign keys' => array(
+        'group_id' => array('user_group' => 'id'),
+    ),
     'indexes' => array(
         'group_alias_group_id_idx' => array('group_id'),
     ),
@@ -788,27 +837,32 @@ $schema['group_alias'] = array(
 
 $schema['session'] = array(
     'fields' => array(
-        'id' => array('type' => 'varchar', 'length' => 32, primary key 'description' => 'session ID'),
+        'id' => array('type' => 'varchar', 'length' => 32, 'description' => 'session ID'),
         'session_data' => array('type' => 'text', 'description' => 'session data'),
         'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
         'modified' => array('type' => 'timestamp', 'description' => 'date this record was modified'),
-
+    ),
+    'primary key' => array('id'),
     'indexes' => array(
-    index session_modified_idx (modified)
-
+        'session_modified_idx' => array('modified'),
+    ),
 );
 
 $schema['deleted_notice'] = array(
     'fields' => array(
-        'id' => array('type' => 'int', primary key 'description' => 'identity of notice'),
+        'id' => array('type' => 'int', 'description' => 'identity of notice'),
         'profile_id' => array('type' => 'int', 'not null' => true, 'description' => 'author of the notice'),
-        'uri' => array('type' => 'varchar', 'length' => 255, unique key 'description' => 'universally unique identifier, usually a tag URI'),
+        'uri' => array('type' => 'varchar', 'length' => 255, 'description' => 'universally unique identifier, usually a tag URI'),
         'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date the notice record was created'),
         'deleted' => array('type' => 'datetime', 'not null' => true, 'description' => 'date the notice record was created'),
-
+    ),
+    'primary key' => array('id'),
+    'unique keys' => array(
+        'deleted_notice_uri_idx' => array('uri'),
+    ),
     'indexes' => array(
-    index deleted_notice_profile_id_idx (profile_id)
-
+        'deleted_notice_profile_id_idx' => array('profile_id'),
+    ),
 );
 
 $schema['config'] = array(
@@ -816,72 +870,82 @@ $schema['config'] = array(
         'section' => array('type' => 'varchar', 'length' => 32, 'description' => 'configuration section'),
         'setting' => array('type' => 'varchar', 'length' => 32, 'description' => 'configuration setting'),
         'value' => array('type' => 'varchar', 'length' => 255, 'description' => 'configuration value'),
-
-    'primary key' => array(section, setting)
-
+    ),
+    'primary key' => array('section', 'setting'),
 );
 
 $schema['profile_role'] = array(
     'fields' => array(
-        'profile_id' => array('type' => 'int', 'not null' => true, 'description' => 'account having the role' references profile (id),
-        'role   ', 'type' => 'varchar', 'length' => 32, 'not null' => true, 'description' => 'string representing the role'),
+        'profile_id' => array('type' => 'int', 'not null' => true, 'description' => 'account having the role'),
+        'role' => array('type' => 'varchar', 'length' => 32, 'not null' => true, 'description' => 'string representing the role'),
         'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date the role was granted'),
-
-    'primary key' => array(profile_id, role)
-
+    ),
+    'primary key' => array('profile_id', 'role'),
+    'foreign keys' => array(
+        'profile_id' => array('profile' => 'id'),
+    ),
 );
 
 $schema['location_namespace'] = array(
     'fields' => array(
-        'id' => array('type' => 'int', primary key 'description' => 'identity for this namespace'),
+        'id' => array('type' => 'int', 'description' => 'identity for this namespace'),
         'description' => array('type' => 'varchar', 'length' => 255, 'description' => 'description of the namespace'),
         'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date the record was created'),
-        'modified' => array('type' => 'timestamp', 'description' => 'date this record was modified'
-
+        'modified' => array('type' => 'timestamp', 'description' => 'date this record was modified'),
+    ),
+    'primary key' => array('id'),
 );
 
 $schema['login_token'] = array(
     'fields' => array(
-        'user_id' => array('type' => 'int', 'not null' => true, 'description' => 'user owning this token' references user (id),
+        'user_id' => array('type' => 'int', 'not null' => true, 'description' => 'user owning this token'),
         'token' => array('type' => 'char', 'length' => 32, 'not null' => true, 'description' => 'token useable for logging in'),
         'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
         'modified' => array('type' => 'timestamp', 'description' => 'date this record was modified'),
-
-    'primary key' => array(user_id)
+    ),
+    'primary key' => array('user_id'),
+    'foreign keys' => array(
+        'user_id' => array('user' => 'id'),
+    ),
 );
 
 $schema['user_location_prefs'] = array(
     'fields' => array(
-        'user_id' => array('type' => 'int', 'not null' => true, 'description' => 'user who has the preference' references user (id),
+        'user_id' => array('type' => 'int', 'not null' => true, 'description' => 'user who has the preference'),
         'share_location' => array('type' => 'bool', 'default' => 1, 'description' => 'Whether to share location data'),
         'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
         'modified' => array('type' => 'timestamp', 'description' => 'date this record was modified'),
     ),
-    'primary key' => array(user_id)
+    'primary key' => array(user_id),
+    'foreign keys' => array(
+        'user_id' => array('user' => 'id'),
+    ),
 );
 
 $schema['inbox'] = array(
     'fields' => array(
-        'user_id' => array('type' => 'int', 'not null' => true, 'description' => 'user receiving the notice' references user (id),
+        'user_id' => array('type' => 'int', 'not null' => true, 'description' => 'user receiving the notice'),
         'notice_ids' => array('type' => 'blob', 'description' => 'packed list of notice ids'),
     ),
-    'primary key' => array(user_id)
-
+    'primary key' => array('user_id'),
+    'foreign keys' => array(
+        'user_id' => array('user' => 'id'),
+    ),
 );
 
 // @fixme possibly swap this for a more general prefs table?
 $schema['user_im_prefs'] = array(
     'fields' => array(
-        'user_id' => array('type' => 'int', 'not null' => true, 'description' => 'user',
+        'user_id' => array('type' => 'int', 'not null' => true, 'description' => 'user'),
         'screenname' => array('type' => 'varchar', 'length' => 255, 'not null' => true, 'description' => 'screenname on this service'),
         'transport' => array('type' => 'varchar', 'length' => 255, 'not null' => true, 'description' => 'transport (ex xmpp, aim)'),
         'notify' => array('type' => 'bool', 'not null' => true, 'default' => 0, 'description' => 'Notify when a new notice is sent'),
         'replies' => array('type' => 'bool', 'not null' => true, 'default' => 0, 'description' => 'Send replies  from people not subscribed to'),
         'microid' => array('type' => 'bool', 'not null' => true, 'default' => 1, 'description' => 'Publish a MicroID'),
         'updatefrompresence' => array('type' => 'bool', 'not null' => true, 'default' => 0, 'description' => 'Send replies  from people not subscribed to.'),
-        'created' => array('type' => 'timestamp', 'not null' => true, DEFAULT CURRENT_TIMESTAMP 'description' => 'date this record was created'),
+        'created' => array('type' => 'timestamp', 'not null' => true, 'default' => 'CURRENT_TIMESTAMP', 'description' => 'date this record was created'), // @fixme will that default work?
         'modified' => array('type' => 'timestamp', 'description' => 'date this record was modified'),
-
+    ),
     'primary key' => array('user_id', 'transport'),
     'unique keys' => array(
         'transport_screenname_key' => array('transport', 'screenname'),
@@ -896,7 +960,7 @@ $schema['conversation'] = array(
         'id' => array('type' => 'serial', 'description' => 'unique identifier'),
         'uri' => array('type' => 'varchar', 'length' => 225, 'description' => 'URI of the conversation'),
         'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
-        'modified' => array('type' => 'timestamp', 'description' => 'date this record was modified'
+        'modified' => array('type' => 'timestamp', 'description' => 'date this record was modified'),
     ),
     'primary key' => array('id'),
     'unique keys' => array(
@@ -911,7 +975,7 @@ $schema['local_group'] = array(
         'nickname' => array('type' => 'varchar', 'length' => 64, 'description' => 'group represented'),
 
         'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
-        'modified' => array('type' => 'timestamp', 'description' => 'date this record was modified'
+        'modified' => array('type' => 'timestamp', 'description' => 'date this record was modified'),
     ),
     'primary key' => array('group_id'),
     'foreign keys' => array(
@@ -931,9 +995,9 @@ $schema['user_urlshortener_prefs'] = array(
         
         'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
         'modified' => array('type' => 'timestamp', 'description' => 'date this record was modified'),
-
-   'primary key' => array('user_id'),
-   'foreign keys' => array(
+    ),
+    'primary key' => array('user_id'),
+    'foreign keys' => array(
         'user_id' => array('user' => 'id'),
-   ),
+    ),
 );

From aff54d8efb9c984fb5c10b8dda0fab88727d97e5 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Mon, 16 Aug 2010 14:02:31 -0700
Subject: [PATCH 173/655] Managed_DataObject initial sketches (pulling
 Drupal-style schema def into the data that DB_DataObject and
 Memcached_DataObject use; not yet functional. Converted OStatus_profile for
 demo.)

---
 classes/Managed_DataObject.php              | 156 ++++++++++++++++++++
 db/core.php                                 |   2 +-
 plugins/OStatus/classes/Ostatus_profile.php |  90 +++--------
 3 files changed, 181 insertions(+), 67 deletions(-)
 create mode 100644 classes/Managed_DataObject.php

diff --git a/classes/Managed_DataObject.php b/classes/Managed_DataObject.php
new file mode 100644
index 0000000000..3bc99c2eba
--- /dev/null
+++ b/classes/Managed_DataObject.php
@@ -0,0 +1,156 @@
+<?php
+/*
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2010, StatusNet, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * Wrapper for Memcached_DataObject which knows its own schema definition.
+ * Builds its own damn settings from a schema definition.
+ *
+ * @author brion
+ */
+class Managed_DataObject extends Memcached_DataObject
+{
+    /**
+     * The One True Thingy that must be defined and declared.
+     */
+    public static abstract function schemaDef();
+
+    /**
+     * get/set an associative array of table columns
+     *
+     * @access public
+     * @return array (associative)
+     */
+    function table()
+    {
+        $table = self::schemaDef();
+        return array_map(array($this, 'columnBitmap'), $table['fields']);
+    }
+
+    /**
+     * get/set an  array of table primary keys
+     *
+     * Key info is pulled from the table definition array.
+     * 
+     * @access private
+     * @return array
+     */
+    function keys()
+    {
+        return array_keys($this->keyTypes());
+    }
+
+    /**
+     * Get a sequence key
+     *
+     * Returns the first serial column defined in the table, if any.
+     *
+     * @access private
+     * @return array (column,use_native,sequence_name)
+     */
+
+    function sequenceKey()
+    {
+        $table = self::schemaDef();
+        foreach ($table['fields'] as $name => $column) {
+            if ($column['type'] == 'serial') {
+                // We have a serial/autoincrement column.
+                // Declare it to be a native sequence!
+                return array($name, true, false);
+            }
+        }
+
+        // No sequence key on this table.
+        return array(false, false, false);
+    }
+
+    /**
+     * Return key definitions for DB_DataObject and Memcache_DataObject.
+     *
+     * DB_DataObject needs to know about keys that the table has; this function
+     * defines them.
+     *
+     * @return array key definitions
+     */
+
+    function keyTypes()
+    {
+        $keys = array();
+        $table = self::schemaDef();
+
+        if (!empty($table['unique keys'])) {
+            foreach ($table['unique keys'] as $idx => $fields) {
+                foreach ($fields as $name) {
+                    $keys[$name] = 'U';
+                }
+            }
+        }
+
+        if (!empty($table['primary key'])) {
+            foreach ($table['primary key'] as $name) {
+                $keys[$name] = 'K';
+            }
+        }
+        return $keys;
+    }
+
+    /**
+     * Build the appropriate DB_DataObject bitfield map for this field.
+     *
+     * @param array $column
+     * @return int
+     */
+    function columnBitmap($column)
+    {
+        $type = 0;
+
+        switch ($column['type']) {
+        case 'int':
+        case 'serial':
+        case 'numeric':
+            // Doesn't need quoting.
+            $type |= DB_DATAOBJECT_INT;
+            break;
+        default:
+            // Value needs quoting in SQL literal statements.
+            $type |= DB_DATAOBJECT_STR;
+        }
+
+        switch ($column['type']) {
+        case 'blob':
+            $type |= DB_DATAOBJECT_BLOB;
+            break;
+        case 'text':
+            $type |= DB_DATAOBJECT_TXT;
+            break;
+        case 'datetime':
+            $type |= DB_DATAOBJECT_DATE;
+            $type |= DB_DATAOBJECT_TIME;
+            break;
+        case 'timestamp':
+            $type |= DB_DATAOBJECT_MYSQLTIMESTAMP;
+            break;
+        }
+
+        if (!empty($column['not null'])) {
+            $type |= DB_DATAOBJECT_NOTNULL;
+        }
+
+        return $type;
+    }
+}
\ No newline at end of file
diff --git a/db/core.php b/db/core.php
index 802d7158c1..04c53a5853 100644
--- a/db/core.php
+++ b/db/core.php
@@ -942,7 +942,7 @@ $schema['user_im_prefs'] = array(
         'notify' => array('type' => 'bool', 'not null' => true, 'default' => 0, 'description' => 'Notify when a new notice is sent'),
         'replies' => array('type' => 'bool', 'not null' => true, 'default' => 0, 'description' => 'Send replies  from people not subscribed to'),
         'microid' => array('type' => 'bool', 'not null' => true, 'default' => 1, 'description' => 'Publish a MicroID'),
-        'updatefrompresence' => array('type' => 'bool', 'not null' => true, 'default' => 0, 'description' => 'Send replies  from people not subscribed to.'),
+        'updatefrompresence' => array('type' => 'bool', 'not null' => true, 'default' => 0, 'description' => 'Send replies from people not subscribed to.'),
         'created' => array('type' => 'timestamp', 'not null' => true, 'default' => 'CURRENT_TIMESTAMP', 'description' => 'date this record was created'), // @fixme will that default work?
         'modified' => array('type' => 'timestamp', 'description' => 'date this record was modified'),
     ),
diff --git a/plugins/OStatus/classes/Ostatus_profile.php b/plugins/OStatus/classes/Ostatus_profile.php
index 8f8eb773f8..176066ef6b 100644
--- a/plugins/OStatus/classes/Ostatus_profile.php
+++ b/plugins/OStatus/classes/Ostatus_profile.php
@@ -22,7 +22,7 @@
  * @maintainer Brion Vibber <brion@status.net>
  */
 
-class Ostatus_profile extends Memcached_DataObject
+class Ostatus_profile extends Managed_DataObject
 {
     public $__table = 'ostatus_profile';
 
@@ -44,77 +44,35 @@ class Ostatus_profile extends Memcached_DataObject
     }
 
     /**
-     * return table definition for DB_DataObject
-     *
-     * DB_DataObject needs to know something about the table to manipulate
-     * instances. This method provides all the DB_DataObject needs to know.
+     * Return table definition for Schema setup and DB_DataObject usage.
      *
      * @return array array of column definitions
      */
 
-    function table()
-    {
-        return array('uri' => DB_DATAOBJECT_STR + DB_DATAOBJECT_NOTNULL,
-                     'profile_id' => DB_DATAOBJECT_INT,
-                     'group_id' => DB_DATAOBJECT_INT,
-                     'feeduri' => DB_DATAOBJECT_STR,
-                     'salmonuri' =>  DB_DATAOBJECT_STR,
-                     'avatar' =>  DB_DATAOBJECT_STR,
-                     'created' => DB_DATAOBJECT_STR + DB_DATAOBJECT_DATE + DB_DATAOBJECT_TIME + DB_DATAOBJECT_NOTNULL,
-                     'modified' => DB_DATAOBJECT_STR + DB_DATAOBJECT_DATE + DB_DATAOBJECT_TIME + DB_DATAOBJECT_NOTNULL);
-    }
-
     static function schemaDef()
     {
-        return array(new ColumnDef('uri', 'varchar',
-                                   255, false, 'PRI'),
-                     new ColumnDef('profile_id', 'integer',
-                                   null, true, 'UNI'),
-                     new ColumnDef('group_id', 'integer',
-                                   null, true, 'UNI'),
-                     new ColumnDef('feeduri', 'varchar',
-                                   255, true, 'UNI'),
-                     new ColumnDef('salmonuri', 'text',
-                                   null, true),
-                     new ColumnDef('avatar', 'text',
-                                   null, true),
-                     new ColumnDef('created', 'datetime',
-                                   null, false),
-                     new ColumnDef('modified', 'datetime',
-                                   null, false));
-    }
-
-    /**
-     * return key definitions for DB_DataObject
-     *
-     * DB_DataObject needs to know about keys that the table has; this function
-     * defines them.
-     *
-     * @return array key definitions
-     */
-
-    function keys()
-    {
-        return array_keys($this->keyTypes());
-    }
-
-    /**
-     * return key definitions for Memcached_DataObject
-     *
-     * Our caching system uses the same key definitions, but uses a different
-     * method to get them.
-     *
-     * @return array key definitions
-     */
-
-    function keyTypes()
-    {
-        return array('uri' => 'K', 'profile_id' => 'U', 'group_id' => 'U', 'feeduri' => 'U');
-    }
-
-    function sequenceKey()
-    {
-        return array(false, false, false);
+        return array(
+            'fields' => array(
+                'uri' => array('type' => 'varchar', 'length' => 255, 'not null' => true),
+                'profile_id' => array('type' => 'integer'),
+                'group_id' => array('type' => 'integer'),
+                'feeduri' => array('type' => 'varchar', 'length' => 255),
+                'salmonuri' => array('type' => 'varchar', 'length' => 255),
+                'avatar' => array('type' => 'text'),
+                'created' => array('type' => 'datetime', 'not null' => true),
+                'modified' => array('type' => 'datetime', 'not null' => true),
+            ),
+            'primary key' => array('uri'),
+            'unique keys' => array(
+                'ostatus_profile_profile_id_idx' => array('profile_id'),
+                'ostatus_profile_group_id_idx' => array('group_id'),
+                'ostatus_profile_feeduri_idx' => array('feeduri'),
+            ),
+            'foreign keys' => array(
+                'profile_id' => array('profile' => 'id'),
+                'group_id' => array('user_group' => 'id'),
+            ),
+        );
     }
 
     /**

From eaa4ded053ca3d4a3d46ccbb0cf585d0608dd9c0 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Mon, 16 Aug 2010 15:14:16 -0700
Subject: [PATCH 174/655] first pass at columndef->drupal-style array converter
 (need to handle some more things probably; untested)

---
 classes/Managed_DataObject.php |  4 +-
 lib/schema.php                 | 70 ++++++++++++++++++++++++++++++++++
 2 files changed, 72 insertions(+), 2 deletions(-)

diff --git a/classes/Managed_DataObject.php b/classes/Managed_DataObject.php
index 3bc99c2eba..31aa7c3593 100644
--- a/classes/Managed_DataObject.php
+++ b/classes/Managed_DataObject.php
@@ -21,9 +21,9 @@
  * Wrapper for Memcached_DataObject which knows its own schema definition.
  * Builds its own damn settings from a schema definition.
  *
- * @author brion
+ * @author Brion Vibber <brion@status.net>
  */
-class Managed_DataObject extends Memcached_DataObject
+abstract class Managed_DataObject extends Memcached_DataObject
 {
     /**
      * The One True Thingy that must be defined and declared.
diff --git a/lib/schema.php b/lib/schema.php
index e5def514e3..9ebef8aa26 100644
--- a/lib/schema.php
+++ b/lib/schema.php
@@ -41,6 +41,7 @@ if (!defined('STATUSNET')) {
  * @category Database
  * @package  StatusNet
  * @author   Evan Prodromou <evan@status.net>
+ * @author   Brion Vibber <brion@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
@@ -491,6 +492,75 @@ class Schema
 
         return $sql;
     }
+
+    /**
+     * Convert an old-style set of ColumnDef objects into the current
+     * Drupal-style schema definition array, for backwards compatibility
+     * with plugins written for 0.9.x.
+     *
+     * @param string $tableName
+     * @param array $defs
+     * @return array
+     */
+    function oldToNew($tableName, $defs)
+    {
+        $table = array();
+        $prefixes = array(
+            'tiny',
+            'small',
+            'medium',
+            'big',
+        );
+        foreach ($defs as $cd) {
+            $cd->addToTableDef($table);
+            $column = array();
+            $column['type'] = $cd->type;
+            foreach ($prefixes as $prefix) {
+                if (substr($cd->type, 0, strlen($prefix)) == $prefix) {
+                    $column['type'] = substr($cd->type, strlen($prefix));
+                    $column['size'] = $prefix;
+                    break;
+                }
+            }
+
+            if ($cd->size) {
+                if ($cd->type == 'varchar' || $cd->type == 'char') {
+                    $column['length'] = $cd->size;
+                }
+            }
+            if (!$cd->nullable) {
+                $column['not null'] = true;
+            }
+            if ($cd->autoincrement) {
+                $column['type'] = 'serial';
+            }
+            if ($cd->default) {
+                $column['default'] = $cd->default;
+            }
+            $table['fields'][$cd->name] = $column;
+
+            if ($cd->key == 'PRI') {
+                // If multiple columns are defined as primary key,
+                // we'll pile them on in sequence.
+                if (!isset($table['primary key'])) {
+                    $table['primary key'] = array();
+                }
+                $table['primary key'][] = $cd->name;
+            } else if ($cd->key == 'MUL') {
+                // Individual multiple-value indexes are only per-column
+                // using the old ColumnDef syntax.
+                $idx = "{$tableName}_{$cd->name}_idx";
+                $table['indexes'][$idx] = array($cd->name);
+            } else if ($cd->key == 'UNI') {
+                // Individual unique-value indexes are only per-column
+                // using the old ColumnDef syntax.
+                $idx = "{$tableName}_{$cd->name}_idx";
+                $table['unique keys'][$idx] = array($cd->name);
+            }
+        }
+
+        return $table;
+    }
 }
 
 class SchemaTableMissingException extends Exception

From 1a7d830fff04a9c16b259caf0633cb18fb74fe01 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Mon, 16 Aug 2010 15:28:00 -0700
Subject: [PATCH 175/655] prettify code

---
 classes/Managed_DataObject.php | 51 ++++++++++++++++------------------
 1 file changed, 24 insertions(+), 27 deletions(-)

diff --git a/classes/Managed_DataObject.php b/classes/Managed_DataObject.php
index 31aa7c3593..162c3c81f0 100644
--- a/classes/Managed_DataObject.php
+++ b/classes/Managed_DataObject.php
@@ -117,40 +117,37 @@ abstract class Managed_DataObject extends Memcached_DataObject
      */
     function columnBitmap($column)
     {
-        $type = 0;
+        $type = $column['type'];
 
-        switch ($column['type']) {
-        case 'int':
-        case 'serial':
-        case 'numeric':
-            // Doesn't need quoting.
-            $type |= DB_DATAOBJECT_INT;
-            break;
-        default:
-            // Value needs quoting in SQL literal statements.
-            $type |= DB_DATAOBJECT_STR;
+        // For quoting style...
+        $intTypes = array('int',
+                          'integer',
+                          'float',
+                          'serial',
+                          'numeric');
+        if (in_array($type, $intTypes)) {
+            $style = DB_DATAOBJECT_INT;
+        } else {
+            $style = DB_DATAOBJECT_STR;
         }
 
-        switch ($column['type']) {
-        case 'blob':
-            $type |= DB_DATAOBJECT_BLOB;
-            break;
-        case 'text':
-            $type |= DB_DATAOBJECT_TXT;
-            break;
-        case 'datetime':
-            $type |= DB_DATAOBJECT_DATE;
-            $type |= DB_DATAOBJECT_TIME;
-            break;
-        case 'timestamp':
-            $type |= DB_DATAOBJECT_MYSQLTIMESTAMP;
-            break;
+        // Data type formatting style...
+        $formatStyles = array('blob' => DB_DATAOBJECT_BLOB,
+                              'text' => DB_DATAOBJECT_TXT,
+                              'date' => DB_DATAOBJECT_DATE,
+                              'time' => DB_DATAOBJECT_TIME,
+                              'datetime' => DB_DATAOBJECT_DATE | DB_DATAOBJECT_TIME,
+                              'timestamp' => DB_DATAOBJECT_MYSQLTIMESTAMP);
+
+        if (isset($formatStyles[$type])) {
+            $style |= $formatStyles[$type];
         }
 
+        // Nullable?
         if (!empty($column['not null'])) {
-            $type |= DB_DATAOBJECT_NOTNULL;
+            $style |= DB_DATAOBJECT_NOTNULL;
         }
 
-        return $type;
+        return $style;
     }
 }
\ No newline at end of file

From 033a7570133d4183c2e162859e9b85fe7df3e40b Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Mon, 16 Aug 2010 16:31:18 -0700
Subject: [PATCH 176/655] More schema work in progress... removing duped code
 from schema child classes, rebuilding things a bit more (incomplete;
 non-working state)

---
 lib/mysqlschema.php | 287 ++++++++------------------------------------
 lib/pgsqlschema.php | 269 ++++++++---------------------------------
 lib/schema.php      |  70 +++++++----
 3 files changed, 145 insertions(+), 481 deletions(-)

diff --git a/lib/mysqlschema.php b/lib/mysqlschema.php
index f9552c1dcd..b84883c034 100644
--- a/lib/mysqlschema.php
+++ b/lib/mysqlschema.php
@@ -167,31 +167,6 @@ class MysqlSchema extends Schema
         }
     }
 
-    /**
-     * Gets a ColumnDef object for a single column.
-     *
-     * Throws an exception if the table is not found.
-     *
-     * @param string $table  name of the table
-     * @param string $column name of the column
-     *
-     * @return ColumnDef definition of the column or null
-     *                   if not found.
-     */
-
-    public function getColumnDef($table, $column)
-    {
-        $td = $this->getTableDef($table);
-
-        foreach ($td->columns as $cd) {
-            if ($cd->name == $column) {
-                return $cd;
-            }
-        }
-
-        return null;
-    }
-
     /**
      * Creates a table with the given names and columns.
      *
@@ -289,156 +264,6 @@ class MysqlSchema extends Schema
         return "{$tableName}_{$columnName}_idx";
     }
 
-    /**
-     * Drops a table from the schema
-     *
-     * Throws an exception if the table is not found.
-     *
-     * @param string $name Name of the table to drop
-     *
-     * @return boolean success flag
-     */
-
-    public function dropTable($name)
-    {
-        $res = $this->conn->query("DROP TABLE $name");
-
-        if (PEAR::isError($res)) {
-            throw new Exception($res->getMessage());
-        }
-
-        return true;
-    }
-
-    /**
-     * Adds an index to a table.
-     *
-     * If no name is provided, a name will be made up based
-     * on the table name and column names.
-     *
-     * Throws an exception on database error, esp. if the table
-     * does not exist.
-     *
-     * @param string $table       Name of the table
-     * @param array  $columnNames Name of columns to index
-     * @param string $name        (Optional) name of the index
-     *
-     * @return boolean success flag
-     */
-
-    public function createIndex($table, $columnNames, $name=null)
-    {
-        if (!is_array($columnNames)) {
-            $columnNames = array($columnNames);
-        }
-
-        if (empty($name)) {
-            $name = "{$table}_".implode("_", $columnNames)."_idx";
-        }
-
-        $res = $this->conn->query("ALTER TABLE $table ".
-                                   "ADD INDEX $name (".
-                                   implode(",", $columnNames).")");
-
-        if (PEAR::isError($res)) {
-            throw new Exception($res->getMessage());
-        }
-
-        return true;
-    }
-
-    /**
-     * Drops a named index from a table.
-     *
-     * @param string $table name of the table the index is on.
-     * @param string $name  name of the index
-     *
-     * @return boolean success flag
-     */
-
-    public function dropIndex($table, $name)
-    {
-        $res = $this->conn->query("ALTER TABLE $table DROP INDEX $name");
-
-        if (PEAR::isError($res)) {
-            throw new Exception($res->getMessage());
-        }
-
-        return true;
-    }
-
-    /**
-     * Adds a column to a table
-     *
-     * @param string    $table     name of the table
-     * @param ColumnDef $columndef Definition of the new
-     *                             column.
-     *
-     * @return boolean success flag
-     */
-
-    public function addColumn($table, $columndef)
-    {
-        $sql = "ALTER TABLE $table ADD COLUMN " . $this->_columnSql($columndef);
-
-        $res = $this->conn->query($sql);
-
-        if (PEAR::isError($res)) {
-            throw new Exception($res->getMessage());
-        }
-
-        return true;
-    }
-
-    /**
-     * Modifies a column in the schema.
-     *
-     * The name must match an existing column and table.
-     *
-     * @param string    $table     name of the table
-     * @param ColumnDef $columndef new definition of the column.
-     *
-     * @return boolean success flag
-     */
-
-    public function modifyColumn($table, $columndef)
-    {
-        $sql = "ALTER TABLE $table MODIFY COLUMN " .
-          $this->_columnSql($columndef);
-
-        $res = $this->conn->query($sql);
-
-        if (PEAR::isError($res)) {
-            throw new Exception($res->getMessage());
-        }
-
-        return true;
-    }
-
-    /**
-     * Drops a column from a table
-     *
-     * The name must match an existing column.
-     *
-     * @param string $table      name of the table
-     * @param string $columnName name of the column to drop
-     *
-     * @return boolean success flag
-     */
-
-    public function dropColumn($table, $columnName)
-    {
-        $sql = "ALTER TABLE $table DROP COLUMN $columnName";
-
-        $res = $this->conn->query($sql);
-
-        if (PEAR::isError($res)) {
-            throw new Exception($res->getMessage());
-        }
-
-        return true;
-    }
-
     /**
      * Ensures that a table exists with the given
      * name and the given column definitions.
@@ -589,44 +414,12 @@ class MysqlSchema extends Schema
     }
 
     /**
-     * Returns the array of names from an array of
-     * ColumnDef objects.
-     *
-     * @param array $cds array of ColumnDef objects
-     *
-     * @return array strings for name values
+     * Is this column a string type?
      */
-
-    private function _names($cds)
+    private function _isString(array $cd)
     {
-        $names = array();
-
-        foreach ($cds as $cd) {
-            $names[] = $cd->name;
-        }
-
-        return $names;
-    }
-
-    /**
-     * Get a ColumnDef from an array matching
-     * name.
-     *
-     * @param array  $cds  Array of ColumnDef objects
-     * @param string $name Name of the column
-     *
-     * @return ColumnDef matching item or null if no match.
-     */
-
-    private function _byName($cds, $name)
-    {
-        foreach ($cds as $cd) {
-            if ($cd->name == $name) {
-                return $cd;
-            }
-        }
-
-        return null;
+        $strings = array('char', 'varchar', 'text');
+        return in_array(strtolower($cd['type']), $strings);
     }
 
     /**
@@ -641,43 +434,61 @@ class MysqlSchema extends Schema
      * @return string correct SQL for that column
      */
 
-    private function _columnSql($cd)
+    function columnSql(array $cd)
     {
-        $sql = "{$cd->name} ";
+        $line = array();
+        $line[] = parent::_columnSql($cd);
 
-        if (!empty($cd->size)) {
-            $sql .= "{$cd->type}({$cd->size}) ";
-        } else {
-            $sql .= "{$cd->type} ";
+        if ($cd['type'] == 'serial') {
+            $line[] = 'auto_increment';
         }
 
-        if ($this->_isString($cd)) {
-            $sql .= " CHARACTER SET utf8 ";
+        if (!empty($cd['extra'])) {
+            $line[] = $cd['extra']; // hisss boooo
         }
 
-        if (!empty($cd->default)) {
-            $sql .= "default {$cd->default} ";
-        } else {
-            $sql .= ($cd->nullable) ? "null " : "not null ";
-        }
-        
-        if (!empty($cd->auto_increment)) {
-            $sql .= " auto_increment ";
+        if (!empty($cd['description'])) {
+            $line[] = 'comment';
+            $line[] = $this->quote($cd['description']);
         }
 
-        if (!empty($cd->extra)) {
-            $sql .= "{$cd->extra} ";
-        }
-
-        return $sql;
+        return implode(' ', $line);
     }
 
-    /**
-     * Is this column a string type?
-     */
-    private function _isString(ColumnDef $cd)
+    function mapType($column)
     {
-        $strings = array('char', 'varchar', 'text');
-        return in_array(strtolower($cd->type), $strings);
+        $map = array('serial' => 'int',
+                     'integer' => 'int',
+                     'numeric' => 'decimal');
+        
+        $type = $column['type'];
+        if (isset($map[$type])) {
+            $type = $map[$type];
+        }
+
+        if (!empty($column['size'])) {
+            $size = $column['size'];
+            if ($type == 'int' &&
+                       in_array($size, array('tiny', 'small', 'medium', 'big'))) {
+                $type = $size . $type;
+            } else if (in_array($type, array('blob', 'text')) &&
+                       in_array($size, array('tiny', 'medium', 'long'))) {
+                $type = $size . $type;
+            }
+        }
+
+        return $type;
+    }
+
+    function typeAndSize($column)
+    {
+        if ($column['type'] == 'enum') {
+            $vals = array_map(array($this, 'quote'), $column['enum']);
+            return 'enum(' . implode(',', $vals) . ')';
+        } else if ($this->_isString($column)) {
+            return parent::typeAndSize($column) . ' CHARSET utf8';
+        } else {
+            return parent::typeAndSize($column);
+        }
     }
 }
diff --git a/lib/pgsqlschema.php b/lib/pgsqlschema.php
index 272f7eff68..2d0f609836 100644
--- a/lib/pgsqlschema.php
+++ b/lib/pgsqlschema.php
@@ -103,31 +103,6 @@ class PgsqlSchema extends Schema
         return $td;
     }
 
-    /**
-     * Gets a ColumnDef object for a single column.
-     *
-     * Throws an exception if the table is not found.
-     *
-     * @param string $table  name of the table
-     * @param string $column name of the column
-     *
-     * @return ColumnDef definition of the column or null
-     *                   if not found.
-     */
-
-    public function getColumnDef($table, $column)
-    {
-        $td = $this->getTableDef($table);
-
-        foreach ($td->columns as $cd) {
-            if ($cd->name == $column) {
-                return $cd;
-            }
-        }
-
-        return null;
-    }
-
     /**
      * Creates a table with the given names and columns.
      *
@@ -192,27 +167,6 @@ class PgsqlSchema extends Schema
         return true;
     }
 
-    /**
-     * Drops a table from the schema
-     *
-     * Throws an exception if the table is not found.
-     *
-     * @param string $name Name of the table to drop
-     *
-     * @return boolean success flag
-     */
-
-    public function dropTable($name)
-    {
-        $res = $this->conn->query("DROP TABLE $name");
-
-        if (PEAR::isError($res)) {
-            throw new Exception($res->getMessage());
-        }
-
-        return true;
-    }
-
     /**
      * Translate the (mostly) mysql-ish column types into somethings more standard
      * @param string column type
@@ -229,86 +183,6 @@ class PgsqlSchema extends Schema
       return $type;
     }
 
-    /**
-     * Adds an index to a table.
-     *
-     * If no name is provided, a name will be made up based
-     * on the table name and column names.
-     *
-     * Throws an exception on database error, esp. if the table
-     * does not exist.
-     *
-     * @param string $table       Name of the table
-     * @param array  $columnNames Name of columns to index
-     * @param string $name        (Optional) name of the index
-     *
-     * @return boolean success flag
-     */
-
-    public function createIndex($table, $columnNames, $name=null)
-    {
-        if (!is_array($columnNames)) {
-            $columnNames = array($columnNames);
-        }
-
-        if (empty($name)) {
-            $name = "$table_".implode("_", $columnNames)."_idx";
-        }
-
-        $res = $this->conn->query("ALTER TABLE $table ".
-                                   "ADD INDEX $name (".
-                                   implode(",", $columnNames).")");
-
-        if (PEAR::isError($res)) {
-            throw new Exception($res->getMessage());
-        }
-
-        return true;
-    }
-
-    /**
-     * Drops a named index from a table.
-     *
-     * @param string $table name of the table the index is on.
-     * @param string $name  name of the index
-     *
-     * @return boolean success flag
-     */
-
-    public function dropIndex($table, $name)
-    {
-        $res = $this->conn->query("ALTER TABLE $table DROP INDEX $name");
-
-        if (PEAR::isError($res)) {
-            throw new Exception($res->getMessage());
-        }
-
-        return true;
-    }
-
-    /**
-     * Adds a column to a table
-     *
-     * @param string    $table     name of the table
-     * @param ColumnDef $columndef Definition of the new
-     *                             column.
-     *
-     * @return boolean success flag
-     */
-
-    public function addColumn($table, $columndef)
-    {
-        $sql = "ALTER TABLE $table ADD COLUMN " . $this->_columnSql($columndef);
-
-        $res = $this->conn->query($sql);
-
-        if (PEAR::isError($res)) {
-            throw new Exception($res->getMessage());
-        }
-
-        return true;
-    }
-
     /**
      * Modifies a column in the schema.
      *
@@ -334,29 +208,6 @@ class PgsqlSchema extends Schema
         return true;
     }
 
-    /**
-     * Drops a column from a table
-     *
-     * The name must match an existing column.
-     *
-     * @param string $table      name of the table
-     * @param string $columnName name of the column to drop
-     *
-     * @return boolean success flag
-     */
-
-    public function dropColumn($table, $columnName)
-    {
-        $sql = "ALTER TABLE $table DROP COLUMN $columnName";
-
-        $res = $this->conn->query($sql);
-
-        if (PEAR::isError($res)) {
-            throw new Exception($res->getMessage());
-        }
-
-        return true;
-    }
 
     /**
      * Ensures that a table exists with the given
@@ -444,47 +295,6 @@ class PgsqlSchema extends Schema
         return true;
     }
 
-    /**
-     * Returns the array of names from an array of
-     * ColumnDef objects.
-     *
-     * @param array $cds array of ColumnDef objects
-     *
-     * @return array strings for name values
-     */
-
-    private function _names($cds)
-    {
-        $names = array();
-
-        foreach ($cds as $cd) {
-            $names[] = $cd->name;
-        }
-
-        return $names;
-    }
-
-    /**
-     * Get a ColumnDef from an array matching
-     * name.
-     *
-     * @param array  $cds  Array of ColumnDef objects
-     * @param string $name Name of the column
-     *
-     * @return ColumnDef matching item or null if no match.
-     */
-
-    private function _byName($cds, $name)
-    {
-        foreach ($cds as $cd) {
-            if ($cd->name == $name) {
-                return $cd;
-            }
-        }
-
-        return null;
-    }
-
     /**
      * Return the proper SQL for creating or
      * altering a column.
@@ -492,41 +302,62 @@ class PgsqlSchema extends Schema
      * Appropriate for use in CREATE TABLE or
      * ALTER TABLE statements.
      *
-     * @param ColumnDef $cd column to create
+     * @param string $tableName
+     * @param array $tableDef
+     * @param string $columnName
+     * @param array $cd column to create
      *
      * @return string correct SQL for that column
      */
-    private function _columnSql($cd)
+
+    function columnSql($name, array $cd)
     {
-        $sql = "{$cd->name} ";
-        $type = $this->_columnTypeTranslation($cd->type);
+        $line = array();
+        $line[] = parent::_columnSql($cd);
 
-        //handle those mysql enum fields that postgres doesn't support
-        if (preg_match('!^enum!', $type)) {
-          $allowed_values = preg_replace('!^enum!', '', $type);
-          $sql .= " text check ({$cd->name} in $allowed_values)";
-          return $sql;
-        }
-        if (!empty($cd->auto_increment)) {
-	    $type = "bigserial"; // FIXME: creates the wrong name for the sequence for some internal sequence-lookup function, so better fix this to do the real 'create sequence' dance.
+        if ($table['foreign keys'][$name]) {
+            foreach ($table['foreign keys'][$name] as $foreignTable => $foreignColumn) {
+                $line[] = 'references';
+                $line[] = $this->quoteId($foreignTable);
+                $line[] = '(' . $this->quoteId($foreignColumn) . ')';
+            }
         }
 
-        if (!empty($cd->size)) {
-            $sql .= "{$type}({$cd->size}) ";
-        } else {
-            $sql .= "{$type} ";
-        }
-
-        if (!empty($cd->default)) {
-            $sql .= "default {$cd->default} ";
-        } else {
-            $sql .= ($cd->nullable) ? "null " : "not null ";
-        }
-
-//         if (!empty($cd->extra)) {
-//             $sql .= "{$cd->extra} ";
-//         }
-
-        return $sql;
+        return implode(' ', $line);
     }
+
+    function mapType($column)
+    {
+        $map = array('serial' => 'bigserial', // FIXME: creates the wrong name for the sequence for some internal sequence-lookup function, so better fix this to do the real 'create sequence' dance.
+                     'numeric' => 'decimal',
+                     'datetime' => 'timestamp',
+                     'blob' => 'bytea');
+
+        $type = $column['type'];
+        if (isset($map[$type])) {
+            $type = $map[$type];
+        }
+
+        if (!empty($column['size'])) {
+            $size = $column['size'];
+            if ($type == 'integer' &&
+                       in_array($size, array('small', 'big'))) {
+                $type = $size . 'int';
+            }
+        }
+
+        return $type;
+    }
+
+    // @fixme need name... :P
+    function typeAndSize($column)
+    {
+        if ($column['type'] == 'enum') {
+            $vals = array_map(array($this, 'quote'), $column['enum']);
+            return "text check ($name in " . implode(',', $vals) . ')';
+        } else {
+            return parent::typeAndSize($column);
+        }
+    }
+
 }
diff --git a/lib/schema.php b/lib/schema.php
index 9ebef8aa26..d20bced4a7 100644
--- a/lib/schema.php
+++ b/lib/schema.php
@@ -224,7 +224,7 @@ class Schema
         }
 
         if (empty($name)) {
-            $name = "$table_".implode("_", $columnNames)."_idx";
+            $name = "{$table}_".implode("_", $columnNames)."_idx";
         }
 
         $res = $this->conn->query("ALTER TABLE $table ".
@@ -422,7 +422,7 @@ class Schema
      * @return array strings for name values
      */
 
-    private function _names($cds)
+    protected function _names($cds)
     {
         $names = array();
 
@@ -443,7 +443,7 @@ class Schema
      * @return ColumnDef matching item or null if no match.
      */
 
-    private function _byName($cds, $name)
+    protected function _byName($cds, $name)
     {
         foreach ($cds as $cd) {
             if ($cd->name == $name) {
@@ -466,31 +466,53 @@ class Schema
      * @return string correct SQL for that column
      */
 
-    private function _columnSql($cd)
+    function columnSql(array $cd)
     {
-        $sql = "{$cd->name} ";
+        $line = array();
+        $line[] = $this->typeAndSize();
 
-        if (!empty($cd->size)) {
-            $sql .= "{$cd->type}({$cd->size}) ";
+        if (isset($cd['default'])) {
+            $line[] = 'default';
+            $line[] = $this->quoted($cd['default']);
+        } else if (!empty($cd['not null'])) {
+            // Can't have both not null AND default!
+            $line[] = 'not null';
+        }
+
+        return implode(' ', $line);
+    }
+
+    /**
+     *
+     * @param string $column canonical type name in defs
+     * @return string native DB type name
+     */
+    function mapType($column)
+    {
+        return $column;
+    }
+
+    function typeAndSize($column)
+    {
+        $type = $this->mapType($column);
+        $lengths = array();
+
+        if ($column['type'] == 'numeric') {
+            if (isset($column['precision'])) {
+                $lengths[] = $column['precision'];
+                if (isset($column['scale'])) {
+                    $lengths[] = $column['scale'];
+                }
+            }
+        } else if (isset($column['length'])) {
+            $lengths[] = $column['length'];
+        }
+
+        if ($lengths) {
+            return $type . '(' . implode(',', $lengths) . ')';
         } else {
-            $sql .= "{$cd->type} ";
+            return $type;
         }
-
-        if (!empty($cd->default)) {
-            $sql .= "default {$cd->default} ";
-        } else {
-            $sql .= ($cd->nullable) ? "null " : "not null ";
-        }
-
-        if (!empty($cd->auto_increment)) {
-            $sql .= " auto_increment ";
-        }
-
-        if (!empty($cd->extra)) {
-            $sql .= "{$cd->extra} ";
-        }
-
-        return $sql;
     }
 
     /**

From bbcc76e7e7a375cff7fd7c3584f03326f2241f05 Mon Sep 17 00:00:00 2001
From: Craig Andrews <candrews@integralblue.com>
Date: Wed, 18 Aug 2010 12:42:32 -0400
Subject: [PATCH 177/655] Remove .svn subversion control files

---
 .../extlib/phpmsnclass/soap/.svn/all-wcprops  |  23 -
 .../Msn/extlib/phpmsnclass/soap/.svn/entries  | 130 ---
 .../text-base/msnab_datatypes.xsd.svn-base    | 832 ------------------
 .../text-base/msnab_servicetypes.xsd.svn-base | 567 ------------
 .../msnab_sharingservice.wsdl.svn-base        | 532 -----------
 5 files changed, 2084 deletions(-)
 delete mode 100644 plugins/Msn/extlib/phpmsnclass/soap/.svn/all-wcprops
 delete mode 100644 plugins/Msn/extlib/phpmsnclass/soap/.svn/entries
 delete mode 100644 plugins/Msn/extlib/phpmsnclass/soap/.svn/text-base/msnab_datatypes.xsd.svn-base
 delete mode 100644 plugins/Msn/extlib/phpmsnclass/soap/.svn/text-base/msnab_servicetypes.xsd.svn-base
 delete mode 100644 plugins/Msn/extlib/phpmsnclass/soap/.svn/text-base/msnab_sharingservice.wsdl.svn-base

diff --git a/plugins/Msn/extlib/phpmsnclass/soap/.svn/all-wcprops b/plugins/Msn/extlib/phpmsnclass/soap/.svn/all-wcprops
deleted file mode 100644
index 0e73537c01..0000000000
--- a/plugins/Msn/extlib/phpmsnclass/soap/.svn/all-wcprops
+++ /dev/null
@@ -1,23 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 41
-/svn/!svn/ver/39/trunk/phpmsnclassv2/soap
-END
-msnab_servicetypes.xsd
-K 25
-svn:wc:ra_dav:version-url
-V 64
-/svn/!svn/ver/39/trunk/phpmsnclassv2/soap/msnab_servicetypes.xsd
-END
-msnab_sharingservice.wsdl
-K 25
-svn:wc:ra_dav:version-url
-V 67
-/svn/!svn/ver/39/trunk/phpmsnclassv2/soap/msnab_sharingservice.wsdl
-END
-msnab_datatypes.xsd
-K 25
-svn:wc:ra_dav:version-url
-V 61
-/svn/!svn/ver/39/trunk/phpmsnclassv2/soap/msnab_datatypes.xsd
-END
diff --git a/plugins/Msn/extlib/phpmsnclass/soap/.svn/entries b/plugins/Msn/extlib/phpmsnclass/soap/.svn/entries
deleted file mode 100644
index 062f5cb1de..0000000000
--- a/plugins/Msn/extlib/phpmsnclass/soap/.svn/entries
+++ /dev/null
@@ -1,130 +0,0 @@
-10
-
-dir
-46
-http://phpmsnclass.googlecode.com/svn/trunk/phpmsnclassv2/soap
-http://phpmsnclass.googlecode.com/svn
-
-
-
-2009-07-27T06:16:08.380493Z
-39
-ricky@ez2.us
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-d71849f3-712d-0410-a681-1795f7bea18a
-
-msnab_servicetypes.xsd
-file
-
-
-
-
-2010-06-08T18:29:30.506015Z
-096c0222d82879fa2b4bd47fa45f4aaf
-2009-07-27T06:16:08.380493Z
-39
-ricky@ez2.us
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-27903
-
-msnab_sharingservice.wsdl
-file
-
-
-
-
-2010-06-08T18:29:30.506015Z
-40f2d65d6cf6245c064defb02bd62705
-2009-07-27T06:16:08.380493Z
-39
-ricky@ez2.us
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-27625
-
-msnab_datatypes.xsd
-file
-
-
-
-
-2010-06-08T18:29:30.506015Z
-6a376c90de444594c1c75970586f99f8
-2009-07-27T06:16:08.380493Z
-39
-ricky@ez2.us
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-42170
-
diff --git a/plugins/Msn/extlib/phpmsnclass/soap/.svn/text-base/msnab_datatypes.xsd.svn-base b/plugins/Msn/extlib/phpmsnclass/soap/.svn/text-base/msnab_datatypes.xsd.svn-base
deleted file mode 100644
index 46fc23f911..0000000000
--- a/plugins/Msn/extlib/phpmsnclass/soap/.svn/text-base/msnab_datatypes.xsd.svn-base
+++ /dev/null
@@ -1,832 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- edited with XMLSpy v2008 sp1 (http://www.altova.com) by wp (freezingsoft) -->
-<xsd:schema xmlns:msnab="http://www.msn.com/webservices/AddressBook" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" targetNamespace="http://www.msn.com/webservices/AddressBook" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0">
-    <xsd:complexType name="abInfoType">
-        <xsd:sequence>
-            <xsd:element name="name" type="xsd:string" minOccurs="0"/>
-            <xsd:element name="ownerPuid" type="xsd:string"/>
-            <xsd:element name="OwnerCID" type="xsd:integer" minOccurs="0"/>
-            <xsd:element name="ownerEmail" type="xsd:string"/>
-            <xsd:element name="fDefault" type="xsd:boolean"/>
-            <xsd:element name="joinedNamespace" type="xsd:boolean" minOccurs="0"/>
-            <xsd:element name="IsBot" type="xsd:boolean" minOccurs="0"/>
-            <xsd:element name="IsParentManaged" type="xsd:boolean" minOccurs="0"/>
-            <xsd:element name="SubscribeExternalPartner" type="xsd:boolean" minOccurs="0"/>
-            <xsd:element name="NotifyExternalPartner" type="xsd:boolean" minOccurs="0"/>
-            <xsd:element name="AddressBookType" type="xsd:string" minOccurs="0"/>
-            <xsd:element name="MessengerApplicationServiceCreated" type="xsd:boolean" minOccurs="0"/>
-            <xsd:element name="IsBetaMigrated" type="xsd:boolean" minOccurs="0"/>
-        </xsd:sequence>
-    </xsd:complexType>
-    <xsd:complexType name="HandleType">
-        <xsd:sequence>
-            <xsd:element name="Id" type="xsd:integer"/>
-            <xsd:element name="Type" type="xsd:string" default="Messenger"/>
-            <xsd:element name="ForeignId" type="xsd:string"/>
-        </xsd:sequence>
-    </xsd:complexType>
-    <xsd:complexType name="ServiceType">
-        <xsd:sequence>
-            <xsd:element name="Memberships" minOccurs="0">
-                <xsd:complexType>
-                    <xsd:sequence>
-                        <xsd:element name="Membership" type="msnab:Membership" minOccurs="0" maxOccurs="unbounded"/>
-                    </xsd:sequence>
-                </xsd:complexType>
-            </xsd:element>
-            <xsd:element name="Info" type="msnab:InfoType"/>
-            <xsd:element name="Changes" type="xsd:string"/>
-            <xsd:element name="LastChange" type="xsd:dateTime" default="0001-01-01T00:00:00"/>
-            <xsd:element name="Deleted" type="xsd:boolean" default="false"/>
-        </xsd:sequence>
-    </xsd:complexType>
-    <xsd:complexType name="Membership">
-        <xsd:sequence>
-            <xsd:element name="MemberRole" type="xsd:string"/>
-            <xsd:element name="Members">
-                <xsd:complexType>
-                    <xsd:sequence>
-                        <xsd:element name="Member" type="msnab:BaseMember" minOccurs="0" maxOccurs="unbounded"/>
-                    </xsd:sequence>
-                </xsd:complexType>
-            </xsd:element>
-            <xsd:element name="MembershipIsComplete" type="xsd:boolean" minOccurs="0"/>
-        </xsd:sequence>
-    </xsd:complexType>
-    <xsd:complexType name="BaseMember">
-        <xsd:sequence>
-            <xsd:element name="MembershipId" type="xsd:positiveInteger" minOccurs="0"/>
-            <xsd:element name="Type" type="xsd:string"/>
-            <xsd:element name="Location" minOccurs="0">
-                <xsd:complexType>
-                    <xsd:sequence>
-                        <xsd:element name="Id" type="msnab:Guid"/>
-                        <xsd:element name="IsPassportNameHidden" type="xsd:boolean"/>
-                        <xsd:element name="CID" type="xsd:long"/>
-                    </xsd:sequence>
-                </xsd:complexType>
-            </xsd:element>
-            <xsd:element name="DisplayName" type="xsd:string" minOccurs="0"/>
-            <xsd:element name="State" type="msnab:MemberState"/>
-            <xsd:element name="Annotations" minOccurs="0">
-                <xsd:complexType>
-                    <xsd:sequence>
-                        <xsd:element name="Annotation" type="msnab:Annotation" minOccurs="0" maxOccurs="unbounded"/>
-                    </xsd:sequence>
-                </xsd:complexType>
-            </xsd:element>
-            <xsd:element name="Deleted" type="xsd:boolean" default="false" minOccurs="0"/>
-            <xsd:element name="LastChanged" type="xsd:dateTime" minOccurs="0"/>
-            <xsd:element name="JoinedDate" type="xsd:dateTime" minOccurs="0"/>
-            <xsd:element name="ExpirationDate" type="xsd:dateTime" minOccurs="0"/>
-            <xsd:element name="Changes" type="xsd:string" minOccurs="0"/>
-        </xsd:sequence>
-    </xsd:complexType>
-    <xsd:complexType name="CircleMember" mixed="false">
-        <xsd:complexContent mixed="false">
-            <xsd:extension base="msnab:BaseMember">
-                <xsd:sequence>
-                    <xsd:element name="CircleId" type="msnab:Guid"/>
-                </xsd:sequence>
-            </xsd:extension>
-        </xsd:complexContent>
-    </xsd:complexType>
-    <xsd:complexType name="PassportMember" mixed="false">
-        <xsd:complexContent mixed="false">
-            <xsd:extension base="msnab:BaseMember">
-                <xsd:sequence>
-                    <xsd:element name="PassportName" type="xsd:string"/>
-                    <xsd:element name="IsPassportNameHidden" type="xsd:boolean" minOccurs="0"/>
-                    <xsd:element name="PassportId" type="xsd:int" minOccurs="0"/>
-                    <xsd:element name="CID" type="xsd:long" minOccurs="0"/>
-                    <xsd:element name="PassportChanges" type="xsd:string" minOccurs="0"/>
-                </xsd:sequence>
-            </xsd:extension>
-        </xsd:complexContent>
-    </xsd:complexType>
-    <xsd:complexType name="EmailMember" mixed="false">
-        <xsd:complexContent mixed="false">
-            <xsd:extension base="msnab:BaseMember">
-                <xsd:sequence>
-                    <xsd:element name="Email" type="xsd:string"/>
-                </xsd:sequence>
-            </xsd:extension>
-        </xsd:complexContent>
-    </xsd:complexType>
-    <xsd:complexType name="PhoneMember" mixed="false">
-        <xsd:complexContent mixed="false">
-            <xsd:extension base="msnab:BaseMember">
-                <xsd:sequence>
-                    <xsd:element name="PhoneNumber" type="xsd:string"/>
-                </xsd:sequence>
-            </xsd:extension>
-        </xsd:complexContent>
-    </xsd:complexType>
-    <xsd:complexType name="RoleMember" mixed="false">
-        <xsd:complexContent mixed="false">
-            <xsd:extension base="msnab:BaseMember">
-                <xsd:sequence>
-                    <xsd:element name="Id" type="xsd:string"/>
-                    <xsd:element name="DefiningService">
-                        <xsd:complexType>
-                            <xsd:sequence>
-                                <xsd:element name="Id" type="xsd:integer"/>
-                                <xsd:element name="Type" type="xsd:string"/>
-                                <xsd:element name="ForeignId" type="xsd:string"/>
-                            </xsd:sequence>
-                        </xsd:complexType>
-                    </xsd:element>
-                    <xsd:element name="MaxRoleRecursionDepth" type="xsd:integer"/>
-                    <xsd:element name="MaxDegreesSeparation" type="xsd:integer"/>
-                </xsd:sequence>
-            </xsd:extension>
-        </xsd:complexContent>
-    </xsd:complexType>
-    <xsd:complexType name="ServiceMember" mixed="false">
-        <xsd:complexContent mixed="false">
-            <xsd:extension base="msnab:BaseMember">
-                <xsd:sequence>
-                    <xsd:element name="Service" type="msnab:HandleType"/>
-                </xsd:sequence>
-            </xsd:extension>
-        </xsd:complexContent>
-    </xsd:complexType>
-    <xsd:complexType name="DomainMember" mixed="false">
-        <xsd:complexContent mixed="false">
-            <xsd:extension base="msnab:BaseMember">
-                <xsd:sequence>
-                    <xsd:element name="DomainName" type="xsd:string"/>
-                </xsd:sequence>
-            </xsd:extension>
-        </xsd:complexContent>
-    </xsd:complexType>
-    <xsd:complexType name="EveryoneMember" mixed="false">
-        <xsd:complexContent mixed="false">
-            <xsd:extension base="msnab:BaseMember"/>
-        </xsd:complexContent>
-    </xsd:complexType>
-    <xsd:complexType name="GroupMember" mixed="false">
-        <xsd:complexContent mixed="false">
-            <xsd:extension base="msnab:BaseMember">
-                <xsd:sequence>
-                    <xsd:element name="Id" type="msnab:Guid"/>
-                </xsd:sequence>
-            </xsd:extension>
-        </xsd:complexContent>
-    </xsd:complexType>
-    <xsd:simpleType name="Guid">
-        <xsd:restriction base="xsd:string">
-            <xsd:pattern value="[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}"/>
-        </xsd:restriction>
-    </xsd:simpleType>
-    <xsd:element name="MemberType">
-        <xsd:simpleType>
-            <xsd:restriction base="xsd:string">
-                <xsd:enumeration value="Allow"/>
-            </xsd:restriction>
-        </xsd:simpleType>
-    </xsd:element>
-    <xsd:simpleType name="MemberState">
-        <xsd:restriction base="xsd:string">
-            <xsd:enumeration value="Accepted"/>
-            <xsd:enumeration value="Pending"/>
-        </xsd:restriction>
-    </xsd:simpleType>
-    <xsd:complexType name="Annotation">
-        <xsd:sequence>
-            <xsd:element name="Name" type="xsd:string"/>
-            <xsd:element name="Value" type="xsd:string" minOccurs="0"/>
-        </xsd:sequence>
-    </xsd:complexType>
-    <xsd:complexType name="ContactType">
-        <xsd:sequence>
-            <xsd:element name="contactId" type="msnab:Guid" minOccurs="0"/>
-            <xsd:element name="contactInfo" type="msnab:contactInfoType" minOccurs="0"/>
-            <xsd:element name="propertiesChanged" type="xsd:string" minOccurs="0">
-                <xsd:annotation>
-                    <xsd:documentation>
-            A space (ASCII #32) separated list of properties that
-            have changed as part of an update request. The property
-            names don't always match the name of the associated
-            element.
-          </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
-            <xsd:element name="fDeleted" type="xsd:boolean" minOccurs="0"/>
-            <xsd:element name="lastChange" type="xsd:dateTime" minOccurs="0"/>
-            <xsd:element name="CreateDate" type="xsd:dateTime" minOccurs="0"/>
-            <xsd:element name="LastModifiedBy" type="xsd:integer" minOccurs="0"/>
-            <xsd:element name="CreatedBy" type="xsd:integer" minOccurs="0"/>
-        </xsd:sequence>
-    </xsd:complexType>
-    <xsd:complexType name="ContactIdType">
-        <xsd:sequence>
-            <xsd:element name="contactId" type="msnab:Guid" minOccurs="0"/>
-        </xsd:sequence>
-    </xsd:complexType>
-    <xsd:complexType name="contactInfoType">
-        <xsd:sequence>
-            <xsd:element name="emails" minOccurs="0">
-                <xsd:complexType>
-                    <xsd:sequence>
-                        <xsd:element name="ContactEmail" type="msnab:contactEmailType" maxOccurs="unbounded"/>
-                    </xsd:sequence>
-                </xsd:complexType>
-            </xsd:element>
-            <xsd:element name="phones" minOccurs="0">
-                <xsd:complexType>
-                    <xsd:sequence>
-                        <xsd:element name="ContactPhone" type="msnab:contactPhoneType" maxOccurs="unbounded"/>
-                    </xsd:sequence>
-                </xsd:complexType>
-            </xsd:element>
-            <xsd:element name="locations" minOccurs="0">
-                <xsd:complexType>
-                    <xsd:sequence>
-                        <xsd:element name="ContactLocation" type="msnab:contactLocationType" maxOccurs="unbounded"/>
-                    </xsd:sequence>
-                </xsd:complexType>
-            </xsd:element>
-            <xsd:element name="webSites" minOccurs="0">
-                <xsd:complexType>
-                    <xsd:sequence>
-                        <xsd:element name="ContactWebSite" type="msnab:contactWebSiteType" maxOccurs="unbounded"/>
-                    </xsd:sequence>
-                </xsd:complexType>
-            </xsd:element>
-            <xsd:element name="annotations" minOccurs="0">
-                <xsd:complexType>
-                    <xsd:sequence>
-                        <xsd:element name="Annotation" type="msnab:Annotation" maxOccurs="unbounded"/>
-                    </xsd:sequence>
-                </xsd:complexType>
-            </xsd:element>
-            <xsd:element name="groupIds" minOccurs="0">
-                <xsd:complexType>
-                    <xsd:sequence>
-                        <xsd:element name="guid" type="msnab:Guid" maxOccurs="unbounded"/>
-                    </xsd:sequence>
-                </xsd:complexType>
-            </xsd:element>
-            <xsd:element name="groupIdsDeleted" minOccurs="0">
-                <xsd:complexType>
-                    <xsd:sequence>
-                        <xsd:element name="guid" type="msnab:Guid" maxOccurs="unbounded"/>
-                    </xsd:sequence>
-                </xsd:complexType>
-            </xsd:element>
-            <xsd:element name="contactType" type="xsd:string" minOccurs="0"/>
-            <xsd:element name="quickName" type="xsd:string" minOccurs="0"/>
-            <xsd:element name="firstName" type="xsd:string" minOccurs="0"/>
-            <xsd:element name="MiddleName" type="xsd:string" minOccurs="0"/>
-            <xsd:element name="lastName" type="xsd:string" minOccurs="0"/>
-            <xsd:element name="Suffix" type="xsd:string" minOccurs="0"/>
-            <xsd:element name="NameTitle" type="xsd:string" minOccurs="0"/>
-            <xsd:element name="passportName" type="xsd:string" minOccurs="0"/>
-            <xsd:element name="IsPassportNameHidden" type="xsd:boolean" minOccurs="0"/>
-            <xsd:element name="displayName" type="xsd:string" minOccurs="0"/>
-            <xsd:element name="puid" type="xsd:long" minOccurs="0"/>
-            <xsd:element name="CID" type="xsd:long" minOccurs="0"/>
-            <xsd:element name="BrandIdList" type="xsd:anyType" minOccurs="0"/>
-            <xsd:element name="comment" type="xsd:string" minOccurs="0"/>
-            <xsd:element name="IsNotMobileVisible" type="xsd:boolean" minOccurs="0"/>
-            <xsd:element name="isMobileIMEnabled" type="xsd:boolean" minOccurs="0"/>
-            <xsd:element name="isMessengerUser" type="xsd:boolean" minOccurs="0"/>
-            <xsd:element name="isFavorite" type="xsd:boolean" minOccurs="0"/>
-            <xsd:element name="isSmtp" type="xsd:boolean" minOccurs="0"/>
-            <xsd:element name="hasSpace" type="xsd:boolean" minOccurs="0">
-                <xsd:annotation>
-                    <xsd:documentation>
-            Indicates whether the contact has a Windows Live
-            Space or not.
-          </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
-            <xsd:element name="spotWatchState" type="xsd:string" minOccurs="0"/>
-            <xsd:element name="birthdate" type="xsd:dateTime" minOccurs="0"/>
-            <xsd:element name="primaryEmailType" type="msnab:ContactEmailTypeType" minOccurs="0"/>
-            <xsd:element name="PrimaryLocation" type="msnab:ContactLocationTypeType" minOccurs="0"/>
-            <xsd:element name="PrimaryPhone" type="msnab:ContactPhoneTypeType" minOccurs="0"/>
-            <xsd:element name="IsPrivate" type="xsd:boolean" minOccurs="0"/>
-            <xsd:element name="Anniversary" type="xsd:string" minOccurs="0">
-                <xsd:annotation>
-                    <xsd:documentation>
-            Seen is YYYY/MM/DD format.
-          </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
-            <xsd:element name="Gender" type="xsd:string" minOccurs="0"/>
-            <xsd:element name="TimeZone" type="xsd:string" minOccurs="0"/>
-            <xsd:element name="NetworkInfoList" minOccurs="0">
-                <xsd:complexType>
-                    <xsd:sequence>
-                        <xsd:element name="NetworkInfo" type="msnab:NetworkInfoType" minOccurs="0" maxOccurs="unbounded"/>
-                    </xsd:sequence>
-                </xsd:complexType>
-            </xsd:element>
-            <xsd:element name="PublicDisplayName" type="xsd:string" minOccurs="0"/>
-            <xsd:element name="IsAutoUpdateDisabled" type="xsd:boolean" minOccurs="0"/>
-            <xsd:element name="MessengerMemberInfo" type="msnab:MessengerMemberInfo" minOccurs="0"/>
-            <xsd:element name="PropertiesChanged" type="xsd:anyType" minOccurs="0"/>
-        </xsd:sequence>
-    </xsd:complexType>
-    <xsd:complexType name="contactEmailType">
-        <xsd:sequence>
-            <xsd:element name="contactEmailType" type="msnab:ContactEmailTypeType"/>
-            <xsd:element name="email" type="xsd:string"/>
-            <xsd:element name="isMessengerEnabled" type="xsd:boolean"/>
-            <xsd:element name="Capability" type="xsd:integer"/>
-            <xsd:element name="MessengerEnabledExternally" type="xsd:boolean"/>
-            <xsd:element name="propertiesChanged" type="xsd:string"/>
-        </xsd:sequence>
-    </xsd:complexType>
-    <xsd:simpleType name="ContactEmailTypeType">
-        <xsd:restriction base="xsd:string">
-            <xsd:enumeration value="ContactEmailPersonal"/>
-            <xsd:enumeration value="ContactEmailBusiness"/>
-            <xsd:enumeration value="ContactEmailOther"/>
-            <xsd:enumeration value="ContactEmailMessenger"/>
-            <xsd:enumeration value="Messenger2"/>
-            <xsd:enumeration value="Messenger3"/>
-            <xsd:enumeration value="Messenger4"/>
-            <xsd:enumeration value="Passport"/>
-        </xsd:restriction>
-    </xsd:simpleType>
-    <xsd:complexType name="contactPhoneType">
-        <xsd:sequence>
-            <xsd:element name="contactPhoneType" type="msnab:ContactPhoneTypeType"/>
-            <xsd:element name="number" type="xsd:string"/>
-            <xsd:element name="isMessengerEnabled" type="xsd:boolean"/>
-            <xsd:element name="propertiesChanged" type="xsd:string"/>
-        </xsd:sequence>
-    </xsd:complexType>
-    <xsd:simpleType name="ContactPhoneTypeType">
-        <xsd:restriction base="xsd:string">
-            <xsd:enumeration value="ContactPhonePersonal"/>
-            <xsd:enumeration value="ContactPhoneBusiness"/>
-            <xsd:enumeration value="ContactPhoneMobile"/>
-            <xsd:enumeration value="ContactPhonePager"/>
-            <xsd:enumeration value="ContactPhoneOther"/>
-            <xsd:enumeration value="ContactPhoneFax"/>
-            <xsd:enumeration value="Personal2"/>
-            <xsd:enumeration value="Business2"/>
-            <xsd:enumeration value="BusinessFax"/>
-            <xsd:enumeration value="BusinessMobile"/>
-        </xsd:restriction>
-    </xsd:simpleType>
-    <xsd:complexType name="contactLocationType">
-        <xsd:sequence>
-            <xsd:element name="contactLocationType" type="msnab:ContactLocationTypeType"/>
-            <xsd:element name="name" type="xsd:string" minOccurs="0"/>
-            <xsd:element name="street" type="xsd:string"/>
-            <xsd:element name="city" type="xsd:string"/>
-            <xsd:element name="state" type="xsd:string"/>
-            <xsd:element name="country" type="xsd:string"/>
-            <xsd:element name="postalCode" type="xsd:string"/>
-            <xsd:element name="Department" type="xsd:string" minOccurs="0"/>
-            <xsd:element name="Changes" type="xsd:string"/>
-        </xsd:sequence>
-    </xsd:complexType>
-    <xsd:simpleType name="ContactLocationTypeType">
-        <xsd:restriction base="xsd:string">
-            <xsd:enumeration value="ContactLocationPersonal"/>
-            <xsd:enumeration value="ContactLocationBusiness"/>
-        </xsd:restriction>
-    </xsd:simpleType>
-    <xsd:complexType name="contactWebSiteType">
-        <xsd:sequence>
-            <xsd:element name="contactWebSiteType" type="msnab:ContactWebSiteTypeType"/>
-            <xsd:element name="webURL" type="xsd:string"/>
-        </xsd:sequence>
-    </xsd:complexType>
-    <xsd:simpleType name="ContactWebSiteTypeType">
-        <xsd:restriction base="xsd:string">
-            <xsd:enumeration value="ContactWebSitePersonal"/>
-            <xsd:enumeration value="ContactWebSiteBusiness"/>
-        </xsd:restriction>
-    </xsd:simpleType>
-    <xsd:complexType name="GroupType">
-        <xsd:sequence>
-            <xsd:element name="groupId" type="msnab:Guid"/>
-            <xsd:element name="groupInfo" type="msnab:groupInfoType"/>
-            <xsd:element name="propertiesChanged" type="xsd:string">
-                <xsd:annotation>
-                    <xsd:documentation>
-            A space (ASCII #32) separated list of properties that
-            have changed as part of an update request. The property
-            names don't always match the name of the associated
-            element.
-          </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
-            <xsd:element name="fDeleted" type="xsd:boolean" minOccurs="0"/>
-            <xsd:element name="lastChange" type="xsd:dateTime" minOccurs="0"/>
-        </xsd:sequence>
-    </xsd:complexType>
-    <xsd:complexType name="groupInfoType">
-        <xsd:sequence>
-            <xsd:element name="annotations" minOccurs="0">
-                <xsd:complexType>
-                    <xsd:sequence>
-                        <xsd:element name="Annotation" type="msnab:Annotation" minOccurs="0" maxOccurs="unbounded"/>
-                    </xsd:sequence>
-                </xsd:complexType>
-            </xsd:element>
-            <xsd:element name="groupType" type="msnab:Guid" default="C8529CE2-6EAD-434d-881F-341E17DB3FF8" minOccurs="0"/>
-            <xsd:element name="name" type="xsd:string" minOccurs="0"/>
-            <xsd:element name="IsNotMobileVisible" type="xsd:boolean" minOccurs="0"/>
-            <xsd:element name="IsPrivate" type="xsd:boolean" minOccurs="0"/>
-            <xsd:element name="IsFavorite" type="xsd:boolean" minOccurs="0"/>
-            <xsd:element name="fMessenger" type="xsd:boolean" minOccurs="0"/>
-        </xsd:sequence>
-    </xsd:complexType>
-    <xsd:complexType name="groupFilterType">
-        <xsd:sequence>
-            <xsd:element name="groupIds">
-                <xsd:complexType>
-                    <xsd:sequence>
-                        <xsd:element name="guid" type="msnab:Guid" minOccurs="0" maxOccurs="unbounded"/>
-                    </xsd:sequence>
-                </xsd:complexType>
-            </xsd:element>
-        </xsd:sequence>
-    </xsd:complexType>
-    <xsd:element name="InvalidPassportUser">
-        <xsd:complexType>
-            <xsd:sequence>
-                <xsd:element name="errorcode" type="xsd:string"/>
-                <xsd:element name="errorstring" type="xsd:string"/>
-                <xsd:element name="additionalDetails">
-                    <xsd:complexType>
-                        <xsd:sequence>
-                            <xsd:element name="originalExceptionErrorMessage" type="xsd:string"/>
-                        </xsd:sequence>
-                    </xsd:complexType>
-                </xsd:element>
-            </xsd:sequence>
-        </xsd:complexType>
-    </xsd:element>
-    <xsd:complexType name="MessengerMemberInfo">
-        <xsd:sequence>
-            <xsd:element name="PendingAnnotations" minOccurs="0">
-                <xsd:complexType>
-                    <xsd:sequence>
-                        <xsd:element name="Annotation" type="msnab:Annotation" maxOccurs="unbounded"/>
-                    </xsd:sequence>
-                </xsd:complexType>
-            </xsd:element>
-            <xsd:element name="DisplayName" type="xsd:string" minOccurs="0"/>
-        </xsd:sequence>
-    </xsd:complexType>
-    <xsd:complexType name="InfoType">
-        <xsd:sequence>
-            <xsd:element name="Handle" type="msnab:HandleType"/>
-            <xsd:element name="DisplayName" type="xsd:string" minOccurs="0"/>
-            <xsd:element name="InverseRequired" type="xsd:boolean" default="false"/>
-            <xsd:element name="AuthorizationCriteria" type="xsd:string" minOccurs="0"/>
-            <xsd:element name="RSSUrl" type="xsd:anyURI" minOccurs="0"/>
-            <xsd:element name="IsBot" type="xsd:boolean" default="false"/>
-        </xsd:sequence>
-    </xsd:complexType>
-    <xsd:complexType name="NotificationDataType">
-        <xsd:sequence>
-            <xsd:element name="StoreService" type="msnab:ServiceType"/>
-            <xsd:element name="Status" type="xsd:string"/>
-            <xsd:element name="LastChanged" type="xsd:dateTime"/>
-            <xsd:element name="Gleam" type="xsd:boolean" default="false"/>
-            <xsd:element name="InstanceId" type="xsd:string" default="0"/>
-        </xsd:sequence>
-    </xsd:complexType>
-    <xsd:complexType name="BaseDynamicItemType">
-        <xsd:sequence>
-            <xsd:element name="Type" type="xsd:string"/>
-            <xsd:element name="Deleted" type="xsd:boolean" minOccurs="0"/>
-            <xsd:element name="LastChanged" type="xsd:dateTime" minOccurs="0"/>
-            <xsd:element name="Notifications" minOccurs="0">
-                <xsd:complexType>
-                    <xsd:sequence>
-                        <xsd:element name="NotificationData" type="msnab:NotificationDataType" maxOccurs="unbounded"/>
-                    </xsd:sequence>
-                </xsd:complexType>
-            </xsd:element>
-            <xsd:element name="Changes" type="xsd:string"/>
-        </xsd:sequence>
-    </xsd:complexType>
-    <xsd:complexType name="CircleDynamicItem" mixed="false">
-        <xsd:complexContent mixed="false">
-            <xsd:extension base="msnab:BaseDynamicItemType">
-                <xsd:sequence>
-                    <xsd:element name="Id" type="xsd:string"/>
-                </xsd:sequence>
-            </xsd:extension>
-        </xsd:complexContent>
-    </xsd:complexType>
-    <xsd:complexType name="PassportDynamicItem" block="" mixed="false">
-        <xsd:complexContent mixed="false">
-            <xsd:extension base="msnab:BaseDynamicItemType">
-                <xsd:sequence>
-                    <xsd:element name="CID" type="xsd:string" minOccurs="0"/>
-                    <xsd:element name="PassportName" type="xsd:string"/>
-                    <xsd:element name="PassportId" type="xsd:string" minOccurs="0"/>
-                    <xsd:element name="SpaceStatus" type="xsd:string"/>
-                    <xsd:element name="SpaceLastChanged" type="xsd:dateTime" minOccurs="0"/>
-                    <xsd:element name="SpaceLastViewed" type="xsd:dateTime" minOccurs="0"/>
-                    <xsd:element name="SpaceGleam" type="xsd:boolean" minOccurs="0"/>
-                    <xsd:element name="ProfileLastChanged" type="xsd:dateTime" minOccurs="0"/>
-                    <xsd:element name="ProfileLastView" type="xsd:dateTime" minOccurs="0"/>
-                    <xsd:element name="ProfileStatus" type="xsd:string"/>
-                    <xsd:element name="ProfileGleam" type="xsd:boolean" minOccurs="0"/>
-                    <xsd:element name="ContactProfileStatus" type="xsd:string"/>
-                    <xsd:element name="ContactProfileLastChanged" type="xsd:dateTime" minOccurs="0"/>
-                    <xsd:element name="ContactProfileLastViewed" type="xsd:dateTime" minOccurs="0"/>
-                    <xsd:element name="LiveContactLastChanged" type="xsd:dateTime" minOccurs="0"/>
-                </xsd:sequence>
-            </xsd:extension>
-        </xsd:complexContent>
-    </xsd:complexType>
-    <xsd:complexType name="abType">
-        <xsd:sequence>
-            <xsd:element name="abId" type="msnab:Guid"/>
-            <xsd:element name="abInfo" type="msnab:abInfoType"/>
-            <xsd:element name="lastChange" type="xsd:dateTime"/>
-            <xsd:element name="DynamicItemLastChanged" type="xsd:dateTime"/>
-            <xsd:element name="RecentActivityItemLastChanged" type="xsd:dateTime"/>
-            <xsd:element name="createDate" type="xsd:dateTime"/>
-            <xsd:element name="propertiesChanged" type="xsd:anyType"/>
-        </xsd:sequence>
-    </xsd:complexType>
-    <xsd:complexType name="CircleResultType">
-        <xsd:sequence>
-            <xsd:element name="Circles" minOccurs="0">
-                <xsd:complexType>
-                    <xsd:sequence>
-                        <xsd:element name="CircleInverseInfo" type="msnab:CircleInverseInfoType" maxOccurs="unbounded"/>
-                    </xsd:sequence>
-                </xsd:complexType>
-            </xsd:element>
-            <xsd:element name="CircleTicket" type="xsd:string"/>
-        </xsd:sequence>
-    </xsd:complexType>
-    <xsd:complexType name="NetworkInfoType">
-        <xsd:sequence>
-            <xsd:element name="DomainId" type="xsd:int" minOccurs="0"/>
-            <xsd:element name="DomainTag" type="xsd:string" minOccurs="0"/>
-            <xsd:element name="UserTileURL" type="xsd:string" minOccurs="0"/>
-            <xsd:element name="ProfileURL" type="xsd:string" minOccurs="0"/>
-            <xsd:element name="DisplayName" type="xsd:string" minOccurs="0"/>
-            <xsd:element name="RelationshipType" type="xsd:int" minOccurs="0"/>
-            <xsd:element name="RelationshipState" type="xsd:int" minOccurs="0"/>
-            <xsd:element name="RelationshipStateDate" type="xsd:string" minOccurs="0"/>
-            <xsd:element name="RelationshipRole" type="xsd:int" minOccurs="0"/>
-            <xsd:element name="NDRCount" type="xsd:int" minOccurs="0"/>
-            <xsd:element name="InviterCID" type="xsd:long" minOccurs="0"/>
-            <xsd:element name="CreateDate" type="xsd:dateTime" minOccurs="0"/>
-            <xsd:element name="LastChanged" type="xsd:dateTime" minOccurs="0"/>
-            <xsd:element name="PropertiesChanged" type="xsd:anyType" minOccurs="0"/>
-        </xsd:sequence>
-    </xsd:complexType>
-    <xsd:complexType name="ContactFilterType">
-        <xsd:sequence>
-            <xsd:element name="IncludeHiddenContacts" type="xsd:boolean"/>
-        </xsd:sequence>
-    </xsd:complexType>
-    <xsd:complexType name="filterOptionsType">
-        <xsd:sequence>
-            <xsd:element name="DeltasOnly" type="xsd:boolean"/>
-            <xsd:element name="LastChanged" type="xsd:dateTime" minOccurs="0"/>
-            <xsd:element name="ContactFilter" type="msnab:ContactFilterType"/>
-        </xsd:sequence>
-    </xsd:complexType>
-    <xsd:complexType name="entityHandle">
-        <xsd:sequence>
-            <xsd:element name="Cid" type="xsd:long"/>
-        </xsd:sequence>
-    </xsd:complexType>
-    <xsd:complexType name="NotationType">
-        <xsd:sequence>
-            <xsd:element name="Name" type="xsd:string"/>
-            <xsd:element name="Value" type="xsd:string"/>
-        </xsd:sequence>
-    </xsd:complexType>
-    <xsd:complexType name="ListTemplateVariableItemType">
-        <xsd:sequence>
-            <xsd:element name="Values">
-                <xsd:complexType>
-                    <xsd:sequence>
-                        <xsd:element name="Value" type="msnab:SimpleTemplateVariableBaseType" maxOccurs="unbounded"/>
-                    </xsd:sequence>
-                </xsd:complexType>
-            </xsd:element>
-        </xsd:sequence>
-    </xsd:complexType>
-    <xsd:complexType name="TemplateVariableBaseType">
-        <xsd:sequence>
-            <xsd:element name="Name" type="xsd:string"/>
-        </xsd:sequence>
-    </xsd:complexType>
-    <xsd:complexType name="SimpleTemplateVariableBaseType">
-        <xsd:complexContent>
-            <xsd:extension base="msnab:TemplateVariableBaseType">
-                <xsd:sequence>
-                    <xsd:element name="Value" type="xsd:string"/>
-                </xsd:sequence>
-            </xsd:extension>
-        </xsd:complexContent>
-    </xsd:complexType>
-    <xsd:complexType name="PublisherIdTemplateVariable">
-        <xsd:complexContent>
-            <xsd:extension base="msnab:TemplateVariableBaseType">
-                <xsd:sequence>
-                    <xsd:element name="Id" type="xsd:string"/>
-                    <xsd:element name="NameHint" type="xsd:string" minOccurs="0"/>
-                </xsd:sequence>
-            </xsd:extension>
-        </xsd:complexContent>
-    </xsd:complexType>
-    <xsd:complexType name="TargetIdTemplateVariable">
-        <xsd:complexContent>
-            <xsd:extension base="msnab:PublisherIdTemplateVariable">
-                <xsd:sequence>
-                    <xsd:element name="IdOwner" type="xsd:string"/>
-                </xsd:sequence>
-            </xsd:extension>
-        </xsd:complexContent>
-    </xsd:complexType>
-    <xsd:complexType name="TextTemplateVariable">
-        <xsd:complexContent>
-            <xsd:extension base="msnab:SimpleTemplateVariableBaseType"/>
-        </xsd:complexContent>
-    </xsd:complexType>
-    <xsd:complexType name="HlinkTemplateVariable">
-        <xsd:complexContent>
-            <xsd:extension base="msnab:SimpleTemplateVariableBaseType">
-                <xsd:sequence>
-                    <xsd:element name="Text" type="xsd:string"/>
-                    <xsd:element name="Notations">
-                        <xsd:complexType>
-                            <xsd:sequence>
-                                <xsd:element name="Notation" type="msnab:NotationType" maxOccurs="unbounded"/>
-                            </xsd:sequence>
-                        </xsd:complexType>
-                    </xsd:element>
-                </xsd:sequence>
-            </xsd:extension>
-        </xsd:complexContent>
-    </xsd:complexType>
-    <xsd:complexType name="ListTemplateVariable">
-        <xsd:complexContent>
-            <xsd:extension base="msnab:TemplateVariableBaseType">
-                <xsd:sequence>
-                    <xsd:element name="Items">
-                        <xsd:complexType>
-                            <xsd:sequence>
-                                <xsd:element name="ListTemplateVariableItem" type="msnab:ListTemplateVariableItemType" maxOccurs="unbounded"/>
-                            </xsd:sequence>
-                        </xsd:complexType>
-                    </xsd:element>
-                </xsd:sequence>
-            </xsd:extension>
-        </xsd:complexContent>
-    </xsd:complexType>
-    <xsd:complexType name="ImageTemplateVariable">
-        <xsd:complexContent>
-            <xsd:extension base="msnab:SimpleTemplateVariableBaseType">
-                <xsd:sequence>
-                    <xsd:element name="Href" type="xsd:anyURI"/>
-                    <xsd:element name="Notations">
-                        <xsd:complexType>
-                            <xsd:sequence>
-                                <xsd:element name="Notation" type="msnab:NotationType" maxOccurs="unbounded"/>
-                            </xsd:sequence>
-                        </xsd:complexType>
-                    </xsd:element>
-                </xsd:sequence>
-            </xsd:extension>
-        </xsd:complexContent>
-    </xsd:complexType>
-    <xsd:complexType name="ActivityDetailsType">
-        <xsd:sequence>
-            <xsd:element name="OwnerCID" type="xsd:string"/>
-            <xsd:element name="ObjectId" type="xsd:string"/>
-            <xsd:element name="ApplicationId" type="xsd:string"/>
-            <xsd:element name="ChangeType" type="xsd:string"/>
-            <xsd:element name="PublishDate" type="xsd:dateTime"/>
-            <xsd:element name="TemplateVariables">
-                <xsd:complexType>
-                    <xsd:sequence>
-                        <xsd:element name="TemplateVariable" type="msnab:TemplateVariableBaseType" maxOccurs="unbounded"/>
-                    </xsd:sequence>
-                </xsd:complexType>
-            </xsd:element>
-        </xsd:sequence>
-    </xsd:complexType>
-    <xsd:complexType name="RecentActivityTemplateType">
-        <xsd:sequence>
-            <xsd:element name="Cardinality" type="xsd:string"/>
-            <xsd:element name="Data" type="xsd:string"/>
-            <xsd:element name="Title" type="xsd:string"/>
-        </xsd:sequence>
-    </xsd:complexType>
-    <xsd:complexType name="RequestedLocalesType">
-        <xsd:sequence>
-            <xsd:element name="string" type="xsd:string" maxOccurs="unbounded"/>
-        </xsd:sequence>
-    </xsd:complexType>
-    <xsd:complexType name="RecentActivityTemplateContainerType">
-        <xsd:sequence>
-            <xsd:element name="ApplicationId" type="xsd:string"/>
-            <xsd:element name="ApplicationName" type="xsd:string"/>
-            <xsd:element name="ChangeType" type="xsd:integer"/>
-            <xsd:element name="Locale" type="xsd:string"/>
-            <xsd:element name="RequestedLocales" type="msnab:RequestedLocalesType"/>
-            <xsd:element name="TemplateRevision" type="xsd:integer"/>
-            <xsd:element name="Templates">
-                <xsd:complexType>
-                    <xsd:sequence>
-                        <xsd:element name="RecentActivityTemplate" type="msnab:RecentActivityTemplateType" maxOccurs="unbounded"/>
-                    </xsd:sequence>
-                </xsd:complexType>
-            </xsd:element>
-            <xsd:element name="CollapseCondition" type="msnab:CollapseConditionType" minOccurs="0"/>
-        </xsd:sequence>
-    </xsd:complexType>
-    <xsd:complexType name="CollapseConditionType">
-        <xsd:sequence>
-            <xsd:element name="string" type="xsd:string" maxOccurs="unbounded"/>
-        </xsd:sequence>
-    </xsd:complexType>
-    <xsd:complexType name="CirclePersonalMembershipType">
-        <xsd:sequence>
-            <xsd:element name="Role" type="xsd:string"/>
-            <xsd:element name="State" type="xsd:string"/>
-        </xsd:sequence>
-    </xsd:complexType>
-    <xsd:complexType name="abHandleType">
-        <xsd:sequence>
-            <xsd:element name="ABId" type="xsd:string"/>
-            <xsd:element name="Puid" type="xsd:long"/>
-            <xsd:element name="Cid" type="xsd:long"/>
-        </xsd:sequence>
-    </xsd:complexType>
-    <xsd:complexType name="contactHandleType">
-        <xsd:sequence>
-            <xsd:element name="Email" type="xsd:string"/>
-            <xsd:element name="Puid" type="xsd:long"/>
-            <xsd:element name="Cid" type="xsd:long"/>
-            <xsd:element name="CircleId" type="xsd:string"/>
-        </xsd:sequence>
-    </xsd:complexType>
-    <xsd:complexType name="MembershipInfoType">
-        <xsd:sequence>
-            <xsd:element name="CirclePersonalMembership" type="msnab:CirclePersonalMembershipType"/>
-        </xsd:sequence>
-    </xsd:complexType>
-    <xsd:complexType name="PersonalInfoType">
-        <xsd:sequence>
-            <xsd:element name="MembershipInfo" type="msnab:MembershipInfoType"/>
-            <xsd:element name="Name" type="xsd:string"/>
-            <xsd:element name="IsNotMobileVisible" type="xsd:boolean"/>
-            <xsd:element name="IsFavorite" type="xsd:boolean"/>
-            <xsd:element name="IsFamily" type="xsd:boolean"/>
-            <xsd:element name="Changes" type="xsd:anyType"/>
-        </xsd:sequence>
-    </xsd:complexType>
-    <xsd:complexType name="ContentInfoType">
-        <xsd:sequence>
-            <xsd:element name="Domain" type="xsd:int"/>
-            <xsd:element name="HostedDomain" type="xsd:string"/>
-            <xsd:element name="Type" type="xsd:int"/>
-            <xsd:element name="MembershipAccess" type="xsd:int"/>
-            <xsd:element name="IsPresenceEnabled" type="xsd:boolean"/>
-            <xsd:element name="RequestMembershipOption" type="xsd:int"/>
-            <xsd:element name="DisplayName" type="xsd:string"/>
-            <xsd:element name="ProfileLastUpdated" type="xsd:dateTime" minOccurs="0"/>
-            <xsd:element name="Changes" type="xsd:anyType" minOccurs="0"/>
-            <xsd:element name="CreateDate" type="xsd:dateTime" minOccurs="0"/>
-            <xsd:element name="LastChanged" type="xsd:dateTime" minOccurs="0"/>
-        </xsd:sequence>
-    </xsd:complexType>
-    <xsd:complexType name="ContentHandleType">
-        <xsd:sequence>
-            <xsd:element name="Id" type="xsd:string"/>
-        </xsd:sequence>
-    </xsd:complexType>
-    <xsd:complexType name="ContentType">
-        <xsd:sequence>
-            <xsd:element name="Handle" type="msnab:ContentHandleType"/>
-            <xsd:element name="Info" type="msnab:ContentInfoType"/>
-        </xsd:sequence>
-    </xsd:complexType>
-    <xsd:complexType name="CircleInverseInfoType">
-        <xsd:sequence>
-            <xsd:element name="Content" type="msnab:ContentType"/>
-            <xsd:element name="PersonalInfo" type="msnab:PersonalInfoType"/>
-            <xsd:element name="Deleted" type="xsd:boolean"/>
-        </xsd:sequence>
-    </xsd:complexType>
-    <xsd:complexType name="callerInfoType">
-        <xsd:sequence>
-            <xsd:element name="PublicDisplayName" type="xsd:string"/>
-        </xsd:sequence>
-    </xsd:complexType>
-</xsd:schema>
diff --git a/plugins/Msn/extlib/phpmsnclass/soap/.svn/text-base/msnab_servicetypes.xsd.svn-base b/plugins/Msn/extlib/phpmsnclass/soap/.svn/text-base/msnab_servicetypes.xsd.svn-base
deleted file mode 100644
index 3fa9798b62..0000000000
--- a/plugins/Msn/extlib/phpmsnclass/soap/.svn/text-base/msnab_servicetypes.xsd.svn-base
+++ /dev/null
@@ -1,567 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- edited with XMLSpy v2008 sp1 (http://www.altova.com) by wp (freezingsoft) -->
-<xsd:schema xmlns:msnab="http://www.msn.com/webservices/AddressBook" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.msn.com/webservices/AddressBook" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0">
-    <xsd:include schemaLocation="msnab_datatypes.xsd"/>
-    <xsd:element name="ABApplicationHeader">
-        <xsd:complexType>
-            <xsd:sequence>
-                <xsd:element name="ApplicationId" type="msnab:Guid" fixed="09607671-1C32-421F-A6A6-CBFAA51AB5F4"/>
-                <xsd:element name="IsMigration" type="xsd:boolean" default="false"/>
-                <xsd:element name="PartnerScenario" type="xsd:string" default="Initial"/>
-                <xsd:element name="CacheKey" type="xsd:token" minOccurs="0"/>
-                <xsd:element name="BrandId" type="xsd:string" minOccurs="0"/>
-            </xsd:sequence>
-        </xsd:complexType>
-    </xsd:element>
-    <xsd:element name="ABAuthHeader">
-        <xsd:complexType>
-            <xsd:sequence>
-                <xsd:element name="ManagedGroupRequest" type="xsd:boolean" default="false"/>
-                <xsd:element name="TicketToken" type="xsd:string"/>
-            </xsd:sequence>
-        </xsd:complexType>
-    </xsd:element>
-    <xsd:element name="ServiceHeader">
-        <xsd:complexType>
-            <xsd:sequence>
-                <xsd:element name="Version" type="xsd:token"/>
-                <xsd:element name="CacheKey" type="xsd:token" minOccurs="0"/>
-                <xsd:element name="CacheKeyChanged" type="xsd:boolean" minOccurs="0"/>
-                <xsd:element name="PreferredHostName" type="xsd:string" minOccurs="0"/>
-                <xsd:element name="SessionId" type="msnab:Guid" minOccurs="0"/>
-            </xsd:sequence>
-        </xsd:complexType>
-    </xsd:element>
-    <xsd:element name="FindMembership" type="msnab:FindMembershipRequestType"/>
-    <xsd:complexType name="FindMembershipRequestType">
-        <xsd:sequence>
-            <xsd:element name="serviceFilter">
-                <xsd:complexType>
-                    <xsd:sequence>
-                        <xsd:element name="Types">
-                            <xsd:complexType>
-                                <xsd:sequence>
-                                    <xsd:element name="ServiceType" type="xsd:string" maxOccurs="unbounded"/>
-                                </xsd:sequence>
-                            </xsd:complexType>
-                        </xsd:element>
-                    </xsd:sequence>
-                </xsd:complexType>
-            </xsd:element>
-            <xsd:element name="View" type="xsd:string" minOccurs="0"/>
-            <xsd:element name="deltasOnly" type="xsd:boolean" default="false" minOccurs="0"/>
-            <xsd:element name="lastChange" type="xsd:dateTime" default="0001-01-01T00:00:00.0000000-08:00" minOccurs="0"/>
-        </xsd:sequence>
-    </xsd:complexType>
-    <xsd:complexType name="FindMembershipResultType">
-        <xsd:sequence>
-            <xsd:element name="Services">
-                <xsd:complexType>
-                    <xsd:sequence>
-                        <xsd:element name="Service" type="msnab:ServiceType" minOccurs="0" maxOccurs="unbounded"/>
-                    </xsd:sequence>
-                </xsd:complexType>
-            </xsd:element>
-            <xsd:element name="OwnerNamespace">
-                <xsd:complexType>
-                    <xsd:sequence>
-                        <xsd:element name="Info">
-                            <xsd:complexType>
-                                <xsd:sequence>
-                                    <xsd:element name="Handle">
-                                        <xsd:complexType>
-                                            <xsd:sequence>
-                                                <xsd:element name="Id" type="xsd:string"/>
-                                                <xsd:element name="IsPassportNameHidden" type="xsd:boolean"/>
-                                                <xsd:element name="CID" type="xsd:integer"/>
-                                            </xsd:sequence>
-                                        </xsd:complexType>
-                                    </xsd:element>
-                                    <xsd:element name="CreatorPuid" type="xsd:integer"/>
-                                    <xsd:element name="CreatorCID" type="xsd:integer"/>
-                                    <xsd:element name="CreatorPassportName" type="xsd:string"/>
-                                    <xsd:element name="CircleAttributes">
-                                        <xsd:complexType>
-                                            <xsd:sequence>
-                                                <xsd:element name="IsPresenceEnabled" type="xsd:boolean"/>
-                                                <xsd:element name="IsEvent" type="xsd:boolean" minOccurs="0"/>
-                                                <xsd:element name="Domain" type="xsd:string"/>
-                                            </xsd:sequence>
-                                        </xsd:complexType>
-                                    </xsd:element>
-                                    <xsd:element name="MessengerApplicationServiceCreated" type="xsd:boolean" minOccurs="0"/>
-                                </xsd:sequence>
-                            </xsd:complexType>
-                        </xsd:element>
-                        <xsd:element name="Changes" type="xsd:string"/>
-                        <xsd:element name="CreateDate" type="xsd:dateTime"/>
-                        <xsd:element name="LastChange" type="xsd:dateTime"/>
-                    </xsd:sequence>
-                </xsd:complexType>
-            </xsd:element>
-        </xsd:sequence>
-    </xsd:complexType>
-    <xsd:element name="FindMembershipResponse">
-        <xsd:complexType>
-            <xsd:sequence>
-                <xsd:element name="FindMembershipResult" type="msnab:FindMembershipResultType"/>
-            </xsd:sequence>
-        </xsd:complexType>
-    </xsd:element>
-    <xsd:element name="ABFindAll" type="msnab:ABFindAllRequestType"/>
-    <xsd:complexType name="ABFindAllRequestType">
-        <xsd:sequence>
-            <xsd:element name="abId" type="msnab:Guid" fixed="00000000-0000-0000-0000-000000000000"/>
-            <xsd:element name="abView" type="xsd:string" minOccurs="0"/>
-            <xsd:element name="deltasOnly" type="xsd:boolean" default="false" minOccurs="0"/>
-            <xsd:element name="lastChange" type="xsd:dateTime" default="0001-01-01T00:00:00.0000000-08:00" minOccurs="0"/>
-            <xsd:element name="dynamicItemView" type="xsd:string" fixed="Gleam" minOccurs="0"/>
-            <xsd:element name="dynamicItemLastChange" type="xsd:dateTime" default="0001-01-01T00:00:00.0000000-08:00" minOccurs="0"/>
-        </xsd:sequence>
-    </xsd:complexType>
-    <xsd:complexType name="ABFindAllResultType">
-        <xsd:sequence>
-            <xsd:element name="groups" minOccurs="0">
-                <xsd:complexType>
-                    <xsd:sequence>
-                        <xsd:element name="Group" type="msnab:GroupType" maxOccurs="unbounded"/>
-                    </xsd:sequence>
-                </xsd:complexType>
-            </xsd:element>
-            <xsd:element name="contacts">
-                <xsd:complexType>
-                    <xsd:sequence>
-                        <xsd:element name="Contact" type="msnab:ContactType" minOccurs="0" maxOccurs="unbounded"/>
-                    </xsd:sequence>
-                </xsd:complexType>
-            </xsd:element>
-            <xsd:element name="DynamicItems" minOccurs="0">
-                <xsd:complexType>
-                    <xsd:sequence>
-                        <xsd:element name="DynamicItem" type="msnab:BaseDynamicItemType" minOccurs="0" maxOccurs="unbounded"/>
-                    </xsd:sequence>
-                </xsd:complexType>
-            </xsd:element>
-            <xsd:element name="CircleResult">
-                <xsd:complexType>
-                    <xsd:sequence>
-                        <xsd:element name="CircleTicket" type="xsd:string"/>
-                    </xsd:sequence>
-                </xsd:complexType>
-            </xsd:element>
-            <xsd:element name="ab">
-                <xsd:complexType>
-                    <xsd:sequence>
-                        <xsd:element name="abId" type="msnab:Guid"/>
-                        <xsd:element name="abInfo" type="msnab:abInfoType"/>
-                        <xsd:element name="lastChange" type="xsd:dateTime"/>
-                        <xsd:element name="DynamicItemLastChanged" type="xsd:dateTime"/>
-                        <xsd:element name="RecentActivityItemLastChanged" type="xsd:dateTime"/>
-                        <xsd:element name="createDate" type="xsd:dateTime"/>
-                        <xsd:element name="propertiesChanged" type="xsd:string"/>
-                    </xsd:sequence>
-                </xsd:complexType>
-            </xsd:element>
-        </xsd:sequence>
-    </xsd:complexType>
-    <xsd:element name="ABFindAllResponse">
-        <xsd:complexType>
-            <xsd:sequence>
-                <xsd:element name="ABFindAllResult" type="msnab:ABFindAllResultType"/>
-            </xsd:sequence>
-        </xsd:complexType>
-    </xsd:element>
-    <xsd:element name="ABContactAdd" type="msnab:ABContactAddRequestType"/>
-    <xsd:complexType name="ABContactAddRequestType">
-        <xsd:sequence>
-            <xsd:element name="abId" type="msnab:Guid" fixed="00000000-0000-0000-0000-000000000000"/>
-            <xsd:element name="contacts">
-                <xsd:complexType>
-                    <xsd:sequence>
-                        <xsd:element name="Contact" type="msnab:ContactType" minOccurs="0" maxOccurs="unbounded"/>
-                    </xsd:sequence>
-                </xsd:complexType>
-            </xsd:element>
-            <xsd:element name="options" minOccurs="0">
-                <xsd:complexType>
-                    <xsd:sequence>
-                        <xsd:element name="EnableAllowListManagement" type="xsd:boolean"/>
-                    </xsd:sequence>
-                </xsd:complexType>
-            </xsd:element>
-        </xsd:sequence>
-    </xsd:complexType>
-    <xsd:complexType name="ABContactAddResultType">
-        <xsd:sequence>
-            <xsd:element name="guid" type="msnab:Guid"/>
-        </xsd:sequence>
-    </xsd:complexType>
-    <xsd:element name="ABContactAddResponse">
-        <xsd:complexType>
-            <xsd:sequence>
-                <xsd:element name="ABContactAddResult" type="msnab:ABContactAddResultType" minOccurs="0"/>
-            </xsd:sequence>
-        </xsd:complexType>
-    </xsd:element>
-    <xsd:element name="ABContactDelete" type="msnab:ABContactDeleteRequestType"/>
-    <xsd:complexType name="ABContactDeleteRequestType">
-        <xsd:sequence>
-            <xsd:element name="abId" type="msnab:Guid" fixed="00000000-0000-0000-0000-000000000000"/>
-            <xsd:element name="contacts">
-                <xsd:complexType>
-                    <xsd:sequence>
-                        <xsd:element name="Contact" type="msnab:ContactIdType" minOccurs="0" maxOccurs="unbounded"/>
-                    </xsd:sequence>
-                </xsd:complexType>
-            </xsd:element>
-        </xsd:sequence>
-    </xsd:complexType>
-    <xsd:element name="ABContactDeleteResponse"/>
-    <xsd:element name="ABGroupContactAdd" type="msnab:ABGroupContactAddRequestType"/>
-    <xsd:complexType name="ABGroupContactAddRequestType">
-        <xsd:sequence>
-            <xsd:element name="abId" type="msnab:Guid" fixed="00000000-0000-0000-0000-000000000000"/>
-            <xsd:element name="groupFilter" type="msnab:groupFilterType"/>
-            <xsd:element name="contacts">
-                <xsd:complexType>
-                    <xsd:sequence>
-                        <xsd:element name="Contact" type="msnab:ContactType" minOccurs="0" maxOccurs="unbounded"/>
-                    </xsd:sequence>
-                </xsd:complexType>
-            </xsd:element>
-            <xsd:element name="groupContactAddOptions" minOccurs="0">
-                <xsd:complexType>
-                    <xsd:sequence>
-                        <xsd:element name="fGenerateMissingQuickName" type="xsd:boolean" minOccurs="0"/>
-                        <xsd:element name="EnableAllowListManagement" type="xsd:boolean" minOccurs="0"/>
-                    </xsd:sequence>
-                </xsd:complexType>
-            </xsd:element>
-        </xsd:sequence>
-    </xsd:complexType>
-    <xsd:complexType name="ABGroupContactAddResultType">
-        <xsd:sequence>
-            <xsd:element name="guid" type="msnab:Guid"/>
-        </xsd:sequence>
-    </xsd:complexType>
-    <xsd:element name="ABGroupContactAddResponse">
-        <xsd:complexType>
-            <xsd:sequence>
-                <xsd:element name="ABGroupContactAddResult" type="msnab:ABGroupContactAddResultType" minOccurs="0"/>
-            </xsd:sequence>
-        </xsd:complexType>
-    </xsd:element>
-    <xsd:element name="ABGroupAdd" type="msnab:ABGroupAddRequestType"/>
-    <xsd:complexType name="ABGroupAddRequestType">
-        <xsd:sequence>
-            <xsd:element name="abId" type="msnab:Guid" fixed="00000000-0000-0000-0000-000000000000"/>
-            <xsd:element name="groupAddOptions">
-                <xsd:complexType>
-                    <xsd:sequence>
-                        <xsd:element name="fRenameOnMsgrConflict" type="xsd:boolean" minOccurs="0"/>
-                    </xsd:sequence>
-                </xsd:complexType>
-            </xsd:element>
-            <xsd:element name="groupInfo">
-                <xsd:complexType>
-                    <xsd:sequence>
-                        <xsd:element name="GroupInfo" type="msnab:groupInfoType"/>
-                    </xsd:sequence>
-                </xsd:complexType>
-            </xsd:element>
-        </xsd:sequence>
-    </xsd:complexType>
-    <xsd:complexType name="ABGroupAddResultType">
-        <xsd:sequence>
-            <xsd:element name="guid" type="msnab:Guid"/>
-        </xsd:sequence>
-    </xsd:complexType>
-    <xsd:element name="ABGroupAddResponse">
-        <xsd:complexType>
-            <xsd:sequence>
-                <xsd:element name="ABGroupAddResult" type="msnab:ABGroupAddResultType" minOccurs="0"/>
-            </xsd:sequence>
-        </xsd:complexType>
-    </xsd:element>
-    <xsd:element name="ABGroupUpdate" type="msnab:ABGroupUpdateRequestType"/>
-    <xsd:complexType name="ABGroupUpdateRequestType">
-        <xsd:sequence>
-            <xsd:element name="abId" type="msnab:Guid" fixed="00000000-0000-0000-0000-000000000000"/>
-            <xsd:element name="groups">
-                <xsd:complexType>
-                    <xsd:sequence>
-                        <xsd:element name="Group" type="msnab:GroupType" minOccurs="0" maxOccurs="unbounded"/>
-                    </xsd:sequence>
-                </xsd:complexType>
-            </xsd:element>
-        </xsd:sequence>
-    </xsd:complexType>
-    <xsd:element name="ABGroupUpdateResponse">
-        <xsd:complexType/>
-    </xsd:element>
-    <xsd:element name="ABGroupDelete" type="msnab:ABGroupDeleteRequestType"/>
-    <xsd:complexType name="ABGroupDeleteRequestType">
-        <xsd:sequence>
-            <xsd:element name="abId" type="msnab:Guid" fixed="00000000-0000-0000-0000-000000000000"/>
-            <xsd:element name="groupFilter" type="msnab:groupFilterType"/>
-        </xsd:sequence>
-    </xsd:complexType>
-    <xsd:element name="ABGroupDeleteResponse">
-        <xsd:complexType/>
-    </xsd:element>
-    <xsd:element name="ABContactUpdate" type="msnab:ABContactUpdateRequestType"/>
-    <xsd:complexType name="ABContactUpdateRequestType">
-        <xsd:sequence>
-            <xsd:element name="abId" type="msnab:Guid" fixed="00000000-0000-0000-0000-000000000000"/>
-            <xsd:element name="contacts">
-                <xsd:complexType>
-                    <xsd:sequence>
-                        <xsd:element name="Contact" type="msnab:ContactType" minOccurs="0" maxOccurs="unbounded"/>
-                    </xsd:sequence>
-                </xsd:complexType>
-            </xsd:element>
-        </xsd:sequence>
-    </xsd:complexType>
-    <xsd:element name="ABContactUpdateResponse">
-        <xsd:complexType/>
-    </xsd:element>
-    <xsd:element name="ABGroupContactDelete" type="msnab:ABGroupContactDeleteRequestType"/>
-    <xsd:complexType name="ABGroupContactDeleteRequestType">
-        <xsd:sequence>
-            <xsd:element name="abId" type="msnab:Guid" fixed="00000000-0000-0000-0000-000000000000"/>
-            <xsd:element name="contacts">
-                <xsd:complexType>
-                    <xsd:sequence>
-                        <xsd:element name="Contact" type="msnab:ContactType" minOccurs="0" maxOccurs="unbounded"/>
-                    </xsd:sequence>
-                </xsd:complexType>
-            </xsd:element>
-            <xsd:element name="groupFilter" type="msnab:groupFilterType"/>
-        </xsd:sequence>
-    </xsd:complexType>
-    <xsd:element name="ABGroupContactDeleteResponse">
-        <xsd:complexType/>
-    </xsd:element>
-    <xsd:element name="AddMember" type="msnab:AddMemberRequestType"/>
-    <xsd:complexType name="AddMemberRequestType">
-        <xsd:sequence>
-            <xsd:element name="serviceHandle" type="msnab:HandleType"/>
-            <xsd:element name="memberships">
-                <xsd:complexType>
-                    <xsd:sequence>
-                        <xsd:element name="Membership" type="msnab:Membership" minOccurs="0" maxOccurs="unbounded"/>
-                    </xsd:sequence>
-                </xsd:complexType>
-            </xsd:element>
-        </xsd:sequence>
-    </xsd:complexType>
-    <xsd:element name="AddMemberResponse">
-        <xsd:complexType/>
-    </xsd:element>
-    <xsd:element name="DeleteMember" type="msnab:DeleteMemberRequestType"/>
-    <xsd:complexType name="DeleteMemberRequestType">
-        <xsd:sequence>
-            <xsd:element name="serviceHandle" type="msnab:HandleType"/>
-            <xsd:element name="memberships">
-                <xsd:complexType>
-                    <xsd:sequence>
-                        <xsd:element name="Membership" type="msnab:Membership" minOccurs="0" maxOccurs="unbounded"/>
-                    </xsd:sequence>
-                </xsd:complexType>
-            </xsd:element>
-            <xsd:element name="nsHandle" type="msnab:ContentHandleType" minOccurs="0"/>
-        </xsd:sequence>
-    </xsd:complexType>
-    <xsd:element name="DeleteMemberResponse">
-        <xsd:complexType/>
-    </xsd:element>
-    <xsd:complexType name="ABAddResponseType">
-        <xsd:sequence>
-            <xsd:element name="ABAddResult" type="xsd:string"/>
-        </xsd:sequence>
-    </xsd:complexType>
-    <xsd:element name="ABAddResponse" type="msnab:ABAddResponseType"/>
-    <xsd:element name="ABAdd" type="msnab:ABAddRequestType"/>
-    <xsd:complexType name="ABAddRequestType">
-        <xsd:sequence>
-            <xsd:element name="abInfo" type="msnab:abInfoType"/>
-        </xsd:sequence>
-    </xsd:complexType>
-    <xsd:complexType name="UpdateDynamicItemRequestType">
-        <xsd:sequence>
-            <xsd:element name="abId" type="xsd:string"/>
-            <xsd:element name="dynamicItems">
-                <xsd:complexType>
-                    <xsd:sequence>
-                        <xsd:element name="DynamicItem" type="msnab:BaseDynamicItemType" maxOccurs="unbounded"/>
-                    </xsd:sequence>
-                </xsd:complexType>
-            </xsd:element>
-        </xsd:sequence>
-    </xsd:complexType>
-    <xsd:element name="UpdateDynamicItem" type="msnab:UpdateDynamicItemRequestType"/>
-    <xsd:element name="UpdateDynamicItemResponse"/>
-    <xsd:element name="ABFindContactsPaged" type="msnab:ABFindContactsPagedRequestType"/>
-    <xsd:complexType name="ABFindContactsPagedRequestType">
-        <xsd:sequence>
-            <xsd:element name="filterOptions" type="msnab:filterOptionsType"/>
-            <xsd:element name="abView" type="xsd:string"/>
-            <xsd:element name="extendedContent" type="xsd:string"/>
-        </xsd:sequence>
-    </xsd:complexType>
-    <xsd:complexType name="ABFindContactsPagedResultType">
-        <xsd:sequence>
-            <xsd:element name="Groups" minOccurs="0">
-                <xsd:complexType>
-                    <xsd:sequence>
-                        <xsd:element name="Group" type="msnab:GroupType" maxOccurs="unbounded"/>
-                    </xsd:sequence>
-                </xsd:complexType>
-            </xsd:element>
-            <xsd:element name="Contacts">
-                <xsd:complexType>
-                    <xsd:sequence>
-                        <xsd:element name="Contact" type="msnab:ContactType" minOccurs="0" maxOccurs="unbounded"/>
-                    </xsd:sequence>
-                </xsd:complexType>
-            </xsd:element>
-            <xsd:element name="CircleResult" type="msnab:CircleResultType"/>
-            <xsd:element name="Ab">
-                <xsd:complexType>
-                    <xsd:sequence>
-                        <xsd:element name="abId" type="msnab:Guid"/>
-                        <xsd:element name="abInfo" type="msnab:abInfoType"/>
-                        <xsd:element name="lastChange" type="xsd:dateTime"/>
-                        <xsd:element name="DynamicItemLastChanged" type="xsd:dateTime"/>
-                        <xsd:element name="RecentActivityItemLastChanged" type="xsd:dateTime"/>
-                        <xsd:element name="createDate" type="xsd:dateTime"/>
-                        <xsd:element name="propertiesChanged" type="xsd:string"/>
-                    </xsd:sequence>
-                </xsd:complexType>
-            </xsd:element>
-        </xsd:sequence>
-    </xsd:complexType>
-    <xsd:element name="ABFindContactsPagedResponse">
-        <xsd:complexType>
-            <xsd:sequence>
-                <xsd:element name="ABFindContactsPagedResult" type="msnab:ABFindContactsPagedResultType"/>
-            </xsd:sequence>
-        </xsd:complexType>
-    </xsd:element>
-    <xsd:element name="WNApplicationHeader">
-        <xsd:complexType>
-            <xsd:sequence>
-                <xsd:element name="ApplicationId" type="msnab:Guid"/>
-            </xsd:sequence>
-        </xsd:complexType>
-    </xsd:element>
-    <xsd:element name="WNAuthHeader">
-        <xsd:complexType>
-            <xsd:sequence>
-                <xsd:element name="TicketToken" type="xsd:string"/>
-            </xsd:sequence>
-        </xsd:complexType>
-    </xsd:element>
-    <xsd:element name="WNServiceHeader">
-        <xsd:complexType>
-            <xsd:sequence>
-                <xsd:element name="Version" type="xsd:token"/>
-                <xsd:element name="CacheKey" type="xsd:token" minOccurs="0"/>
-                <xsd:element name="CacheKeyChanged" type="xsd:boolean" minOccurs="0"/>
-                <xsd:element name="PreferredHostName" type="xsd:string" minOccurs="0"/>
-            </xsd:sequence>
-        </xsd:complexType>
-    </xsd:element>
-    <xsd:element name="GetContactsRecentActivity" type="msnab:GetContactsRecentActivityRequestType"/>
-    <xsd:complexType name="GetContactsRecentActivityRequestType">
-        <xsd:sequence>
-            <xsd:element name="entityHandle" type="msnab:entityHandle"/>
-            <xsd:element name="locales">
-                <xsd:complexType>
-                    <xsd:sequence>
-                        <xsd:element name="string" type="xsd:string" maxOccurs="unbounded"/>
-                    </xsd:sequence>
-                </xsd:complexType>
-            </xsd:element>
-            <xsd:element name="count" type="xsd:int"/>
-        </xsd:sequence>
-    </xsd:complexType>
-    <xsd:element name="GetContactsRecentActivityResponse">
-        <xsd:complexType>
-            <xsd:sequence>
-                <xsd:element name="GetContactsRecentActivityResult" type="msnab:GetContactsRecentActivityResultType"/>
-            </xsd:sequence>
-        </xsd:complexType>
-    </xsd:element>
-    <xsd:complexType name="GetContactsRecentActivityResultType">
-        <xsd:sequence>
-            <xsd:element name="Activities">
-                <xsd:complexType>
-                    <xsd:sequence>
-                        <xsd:element name="ActivityDetails" type="msnab:ActivityDetailsType" maxOccurs="unbounded"/>
-                    </xsd:sequence>
-                </xsd:complexType>
-            </xsd:element>
-            <xsd:element name="Templates">
-                <xsd:complexType>
-                    <xsd:sequence>
-                        <xsd:element name="RecentActivityTemplateContainer" type="msnab:RecentActivityTemplateContainerType" maxOccurs="unbounded"/>
-                    </xsd:sequence>
-                </xsd:complexType>
-            </xsd:element>
-            <xsd:element name="FeedUrl" type="xsd:anyURI"/>
-        </xsd:sequence>
-    </xsd:complexType>
-    <xsd:element name="ManageWLConnection" type="msnab:ManageWLConnectionRequestType"/>
-    <xsd:complexType name="ManageWLConnectionRequestType">
-        <xsd:sequence>
-            <xsd:element name="abHandle" type="msnab:abHandleType"/>
-            <xsd:element name="contactId" type="xsd:string"/>
-            <xsd:element name="connection" type="xsd:boolean"/>
-            <xsd:element name="presence" type="xsd:boolean"/>
-            <xsd:element name="action" type="xsd:integer"/>
-            <xsd:element name="relationshipType" type="xsd:int"/>
-            <xsd:element name="relationshipRole" type="xsd:int"/>
-        </xsd:sequence>
-    </xsd:complexType>
-    <xsd:element name="ManageWLConnectionResponse">
-        <xsd:complexType>
-            <xsd:sequence>
-                <xsd:element name="ManageWLConnectionResult" type="msnab:ContactType"/>
-            </xsd:sequence>
-        </xsd:complexType>
-    </xsd:element>
-    <xsd:element name="CreateContact" type="msnab:CreateContactType"/>
-    <xsd:complexType name="CreateContactType">
-        <xsd:sequence>
-            <xsd:element name="abHandle" type="msnab:abHandleType"/>
-            <xsd:element name="contactHandle" type="msnab:contactHandleType"/>
-        </xsd:sequence>
-    </xsd:complexType>
-    <xsd:element name="CreateContactResponse">
-        <xsd:complexType>
-            <xsd:sequence>
-                <xsd:element name="CreateContactResult" type="msnab:ContactType"/>
-            </xsd:sequence>
-        </xsd:complexType>
-    </xsd:element>
-    <xsd:element name="CreateCircle" type="msnab:CreateCircleRequestType"/>
-    <xsd:complexType name="CreateCircleRequestType">
-        <xsd:sequence>
-            <xsd:element name="properties" type="msnab:ContentInfoType"/>
-            <xsd:element name="callerInfo" type="msnab:callerInfoType"/>
-        </xsd:sequence>
-    </xsd:complexType>
-    <xsd:complexType name="CreateCircleResponseType">
-        <xsd:sequence>
-            <xsd:element name="Id" type="msnab:Guid"/>
-        </xsd:sequence>
-    </xsd:complexType>
-    <xsd:element name="CreateCircleResponse">
-        <xsd:complexType>
-            <xsd:sequence>
-                <xsd:element name="CreateCircleResult" type="msnab:CreateCircleResponseType"/>
-            </xsd:sequence>
-        </xsd:complexType>
-    </xsd:element>
-</xsd:schema>
diff --git a/plugins/Msn/extlib/phpmsnclass/soap/.svn/text-base/msnab_sharingservice.wsdl.svn-base b/plugins/Msn/extlib/phpmsnclass/soap/.svn/text-base/msnab_sharingservice.wsdl.svn-base
deleted file mode 100644
index 7ec87f90c9..0000000000
--- a/plugins/Msn/extlib/phpmsnclass/soap/.svn/text-base/msnab_sharingservice.wsdl.svn-base
+++ /dev/null
@@ -1,532 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- edited with XMLSpy v2008 sp1 (http://www.altova.com) by wp (freezingsoft) -->
-<definitions xmlns:msnab="http://www.msn.com/webservices/AddressBook" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:ns="http://www.w3.org/2001/XMLSchema" xmlns:ns1="http://schemas.xmlsoap.org/soap/encoding/" xmlns="http://schemas.xmlsoap.org/wsdl/" targetNamespace="http://www.msn.com/webservices/AddressBook">
-    <types>
-        <ns:schema xmlns="http://www.w3.org/2001/XMLSchema">
-            <ns:import schemaLocation="msnab_servicetypes.xsd" namespace="http://www.msn.com/webservices/AddressBook"/>
-        </ns:schema>
-    </types>
-    <message name="ABHeader">
-        <part name="ApplicationHeader" element="msnab:ABApplicationHeader"/>
-        <part name="AuthHeader" element="msnab:ABAuthHeader"/>
-    </message>
-    <message name="FindMembershipMessage">
-        <part name="FindMembershipRequest" element="msnab:FindMembership"/>
-    </message>
-    <message name="ABFindAllMessage">
-        <part name="ABFindAllRequest" element="msnab:ABFindAll"/>
-    </message>
-    <message name="ABContactAddMessage">
-        <part name="ABContactAddRequest" element="msnab:ABContactAdd"/>
-    </message>
-    <message name="ABContactDeleteMessage">
-        <part name="ABContactDeleteRequest" element="msnab:ABContactDelete"/>
-    </message>
-    <message name="ABGroupContactAddMessage">
-        <part name="ABGroupContactAddRequest" element="msnab:ABGroupContactAdd"/>
-    </message>
-    <message name="ABGroupAddMessage">
-        <part name="ABGroupAddRequest" element="msnab:ABGroupAdd"/>
-    </message>
-    <message name="ABGroupUpdateMessage">
-        <part name="ABGroupUpdateRequest" element="msnab:ABGroupUpdate"/>
-    </message>
-    <message name="ABGroupDeleteMessage">
-        <part name="ABGroupDeleteRequest" element="msnab:ABGroupDelete"/>
-    </message>
-    <message name="ABGroupContactDeleteMessage">
-        <part name="ABGroupContactDeleteRequest" element="msnab:ABGroupContactDelete"/>
-    </message>
-    <message name="ABContactUpdateMessage">
-        <part name="ABContactUpdateRequest" element="msnab:ABContactUpdate"/>
-    </message>
-    <message name="AddMemberMessage">
-        <part name="AddMemberRequest" element="msnab:AddMember"/>
-    </message>
-    <message name="DeleteMemberMessage">
-        <part name="DeleteMemberRequest" element="msnab:DeleteMember"/>
-    </message>
-    <message name="ServiceHeader">
-        <part name="ServiceHeader" element="msnab:ServiceHeader"/>
-    </message>
-    <message name="FindMembershipResponseMessage">
-        <part name="FindMembershipResponse" element="msnab:FindMembershipResponse"/>
-    </message>
-    <message name="ABFindAllResponseMessage">
-        <part name="ABFindAllResponse" element="msnab:ABFindAllResponse"/>
-    </message>
-    <message name="ABContactAddResponseMessage">
-        <part name="ABContactAddResponse" element="msnab:ABContactAddResponse"/>
-    </message>
-    <message name="ABContactDeleteResponseMessage">
-        <part name="ABContactDeleteResponse" element="msnab:ABContactDeleteResponse"/>
-    </message>
-    <message name="ABGroupContactAddResponseMessage">
-        <part name="ABGroupContactAddResponse" element="msnab:ABGroupContactAddResponse"/>
-    </message>
-    <message name="ABGroupAddResponseMessage">
-        <part name="ABGroupAddResponse" element="msnab:ABGroupAddResponse"/>
-    </message>
-    <message name="ABGroupUpdateResponseMessage">
-        <part name="ABGroupUpdateResponse" element="msnab:ABGroupUpdateResponse"/>
-    </message>
-    <message name="ABGroupDeleteResponseMessage">
-        <part name="ABGroupDeleteResponse" element="msnab:ABGroupDeleteResponse"/>
-    </message>
-    <message name="ABGroupContactDeleteResponseMessage">
-        <part name="ABGroupContactDeleteResponse" element="msnab:ABGroupContactDeleteResponse"/>
-    </message>
-    <message name="ABContactUpdateResponseMessage">
-        <part name="ABContactUpdateResponse" element="msnab:ABContactUpdateResponse"/>
-    </message>
-    <message name="AddMemberResponseMessage">
-        <part name="AddMemberResponse" element="msnab:AddMemberResponse"/>
-    </message>
-    <message name="DeleteMemberResponseMessage">
-        <part name="DeleteMemberResponse" element="msnab:DeleteMemberResponse"/>
-    </message>
-    <message name="InvalidPassportUserMessage">
-        <part name="fault" element="msnab:InvalidPassportUser"/>
-    </message>
-    <message name="ABAddMessage">
-        <part name="ABAddRequest" element="msnab:ABAdd"/>
-    </message>
-    <message name="ABAddResponseMessage">
-        <part name="ABAddResponse" element="msnab:ABAddResponse"/>
-    </message>
-    <message name="UpdateDynamicItemMessage">
-        <part name="UpdateDynamicItem" element="msnab:UpdateDynamicItem"/>
-    </message>
-    <message name="UpdateDynamicItemResponseMessage">
-        <part name="UpdateDynamicItemResponse" element="msnab:UpdateDynamicItemResponse"/>
-    </message>
-    <message name="ABFindContactsPagedMessage">
-        <part name="ABFindContactsPagedRequest" element="msnab:ABFindContactsPaged"/>
-    </message>
-    <message name="ABFindContactsPagedResponseMessage">
-        <part name="ABFindContactsPagedResponse" element="msnab:ABFindContactsPagedResponse"/>
-    </message>
-    <message name="GetContactsRecentActivityMessage">
-        <part name="GetContactsRecentActivityRequest" element="msnab:GetContactsRecentActivity"/>
-    </message>
-    <message name="GetContactsRecentActivityResponseMessage">
-        <part name="GetContactsRecentActivityResponse" element="msnab:GetContactsRecentActivityResponse"/>
-    </message>
-    <message name="WNHeader">
-        <part name="WNApplicationHeader" element="msnab:WNApplicationHeader"/>
-        <part name="WNAuthHeader" element="msnab:WNAuthHeader"/>
-        <part name="WNServiceHeader" element="msnab:WNServiceHeader"/>
-    </message>
-    <message name="CreateCircleMessage">
-        <part name="CreateCircleRequest" element="msnab:CreateCircle"/>
-    </message>
-    <message name="CreateCircleResponseMessage">
-        <part name="CreateCircleResponse" element="msnab:CreateCircleResponse"/>
-    </message>
-    <message name="CreateContactMessage">
-        <part name="CreateContactRequest" element="msnab:CreateContact"/>
-    </message>
-    <message name="CreateContactResponseMessage">
-        <part name="CreateContactResponse" element="msnab:CreateContactResponse"/>
-    </message>
-    <message name="ManageWLConnectionMessage">
-        <part name="ManageWLConnection" element="msnab:ManageWLConnection"/>
-    </message>
-    <message name="ManageWLConnectionResponseMessage">
-        <part name="ManageWLConnectionResponse" element="msnab:ManageWLConnectionResponse"/>
-    </message>
-    <portType name="SharingServicePortType">
-        <operation name="FindMembership">
-            <input message="msnab:FindMembershipMessage"/>
-            <output message="msnab:FindMembershipResponseMessage"/>
-        </operation>
-        <operation name="AddMember">
-            <input message="msnab:AddMemberMessage"/>
-            <output message="msnab:AddMemberResponseMessage"/>
-        </operation>
-        <operation name="DeleteMember">
-            <input message="msnab:DeleteMemberMessage"/>
-            <output message="msnab:DeleteMemberResponseMessage"/>
-        </operation>
-        <operation name="CreateCircle">
-            <input message="msnab:CreateCircleMessage"/>
-            <output message="msnab:CreateCircleResponseMessage"/>
-        </operation>
-    </portType>
-    <portType name="ABServicePortType">
-        <operation name="ABFindAll">
-            <input message="msnab:ABFindAllMessage"/>
-            <output message="msnab:ABFindAllResponseMessage"/>
-        </operation>
-        <operation name="ABContactAdd">
-            <input message="msnab:ABContactAddMessage"/>
-            <output message="msnab:ABContactAddResponseMessage"/>
-            <fault name="InvalidPassportUserException" message="msnab:InvalidPassportUserMessage"/>
-        </operation>
-        <operation name="ABContactDelete">
-            <input message="msnab:ABContactDeleteMessage"/>
-            <output message="msnab:ABContactDeleteResponseMessage"/>
-            <fault name="InvalidPassportUserException" message="msnab:InvalidPassportUserMessage"/>
-        </operation>
-        <operation name="ABGroupContactAdd">
-            <input message="msnab:ABGroupContactAddMessage"/>
-            <output message="msnab:ABGroupContactAddResponseMessage"/>
-            <fault name="InvalidPassportUserException" message="msnab:InvalidPassportUserMessage"/>
-        </operation>
-        <operation name="ABGroupAdd">
-            <input message="msnab:ABGroupAddMessage"/>
-            <output message="msnab:ABGroupAddResponseMessage"/>
-        </operation>
-        <operation name="ABGroupUpdate">
-            <input message="msnab:ABGroupUpdateMessage"/>
-            <output message="msnab:ABGroupUpdateResponseMessage"/>
-        </operation>
-        <operation name="ABGroupDelete">
-            <input message="msnab:ABGroupDeleteMessage"/>
-            <output message="msnab:ABGroupDeleteResponseMessage"/>
-        </operation>
-        <operation name="ABGroupContactDelete">
-            <input message="msnab:ABGroupContactDeleteMessage"/>
-            <output message="msnab:ABGroupContactDeleteResponseMessage"/>
-        </operation>
-        <operation name="ABContactUpdate">
-            <input message="msnab:ABContactUpdateMessage"/>
-            <output message="msnab:ABContactUpdateResponseMessage"/>
-        </operation>
-        <operation name="ABAdd">
-            <input message="msnab:ABAddMessage"/>
-            <output message="msnab:ABAddResponseMessage"/>
-        </operation>
-        <operation name="UpdateDynamicItem">
-            <input message="msnab:UpdateDynamicItemMessage"/>
-            <output message="msnab:UpdateDynamicItemResponseMessage"/>
-        </operation>
-        <operation name="ABFindContactsPaged">
-            <input message="msnab:ABFindContactsPagedMessage"/>
-            <output message="msnab:ABFindContactsPagedResponseMessage"/>
-        </operation>
-        <operation name="CreateContact">
-            <input message="msnab:CreateContactMessage"/>
-            <output message="msnab:CreateContactResponseMessage"/>
-        </operation>
-        <operation name="ManageWLConnection">
-            <input message="msnab:ManageWLConnectionMessage"/>
-            <output message="msnab:ManageWLConnectionResponseMessage"/>
-        </operation>
-    </portType>
-    <portType name="WhatsUpServicePortType">
-        <operation name="GetContactsRecentActivity">
-            <input message="msnab:GetContactsRecentActivityMessage"/>
-            <output message="msnab:GetContactsRecentActivityResponseMessage"/>
-        </operation>
-    </portType>
-    <binding name="SharingServiceBinding" type="msnab:SharingServicePortType">
-        <soap:binding transport="http://schemas.xmlsoap.org/soap/http"/>
-        <operation name="FindMembership">
-            <soap:operation soapAction="http://www.msn.com/webservices/AddressBook/FindMembership"/>
-            <input>
-                <soap:header message="msnab:ABHeader" part="ApplicationHeader" use="literal"/>
-                <soap:header message="msnab:ABHeader" part="AuthHeader" use="literal"/>
-                <soap:body use="literal"/>
-            </input>
-            <output>
-                <soap:header message="msnab:ServiceHeader" part="ServiceHeader" use="literal"/>
-                <soap:body use="literal"/>
-            </output>
-        </operation>
-        <operation name="AddMember">
-            <soap:operation soapAction="http://www.msn.com/webservices/AddressBook/AddMember"/>
-            <input>
-                <soap:header message="msnab:ABHeader" part="ApplicationHeader" use="literal"/>
-                <soap:header message="msnab:ABHeader" part="AuthHeader" use="literal"/>
-                <soap:body use="literal"/>
-            </input>
-            <output>
-                <soap:header message="msnab:ServiceHeader" part="ServiceHeader" use="literal"/>
-                <soap:body use="literal"/>
-            </output>
-        </operation>
-        <operation name="DeleteMember">
-            <soap:operation soapAction="http://www.msn.com/webservices/AddressBook/DeleteMember"/>
-            <input>
-                <soap:header message="msnab:ABHeader" part="ApplicationHeader" use="literal"/>
-                <soap:header message="msnab:ABHeader" part="AuthHeader" use="literal"/>
-                <soap:body use="literal"/>
-            </input>
-            <output>
-                <soap:header message="msnab:ServiceHeader" part="ServiceHeader" use="literal"/>
-                <soap:body use="literal"/>
-            </output>
-        </operation>
-        <operation name="CreateCircle">
-            <soap:operation soapAction="http://www.msn.com/webservices/AddressBook/CreateCircle"/>
-            <input>
-                <soap:body use="literal"/>
-                <soap:header message="msnab:ABHeader" part="ApplicationHeader" use="literal"/>
-                <soap:header message="msnab:ABHeader" part="AuthHeader" use="literal"/>
-            </input>
-            <output>
-                <soap:body use="literal"/>
-                <soap:header message="msnab:ServiceHeader" part="ServiceHeader" use="literal"/>
-            </output>
-        </operation>
-    </binding>
-    <binding name="ABServiceBinding" type="msnab:ABServicePortType">
-        <soap:binding transport="http://schemas.xmlsoap.org/soap/http"/>
-        <operation name="ABFindAll">
-            <soap:operation soapAction="http://www.msn.com/webservices/AddressBook/ABFindAll"/>
-            <input>
-                <soap:header message="msnab:ABHeader" part="ApplicationHeader" use="literal"/>
-                <soap:header message="msnab:ABHeader" part="AuthHeader" use="literal"/>
-                <soap:body use="literal"/>
-            </input>
-            <output>
-                <soap:header message="msnab:ServiceHeader" part="ServiceHeader" use="literal"/>
-                <soap:body use="literal"/>
-            </output>
-        </operation>
-        <operation name="ABContactAdd">
-            <soap:operation soapAction="http://www.msn.com/webservices/AddressBook/ABContactAdd"/>
-            <input>
-                <soap:header message="msnab:ABHeader" part="ApplicationHeader" use="literal"/>
-                <soap:header message="msnab:ABHeader" part="AuthHeader" use="literal"/>
-                <soap:body use="literal"/>
-            </input>
-            <output>
-                <soap:header message="msnab:ServiceHeader" part="ServiceHeader" use="literal"/>
-                <soap:body use="literal"/>
-            </output>
-            <fault name="InvalidPassportUserException">
-                <soap:fault name="InvalidPassportUserException" use="literal"/>
-            </fault>
-        </operation>
-        <operation name="ABContactDelete">
-            <soap:operation soapAction="http://www.msn.com/webservices/AddressBook/ABContactDelete"/>
-            <input>
-                <soap:header message="msnab:ABHeader" part="ApplicationHeader" use="literal"/>
-                <soap:header message="msnab:ABHeader" part="AuthHeader" use="literal"/>
-                <soap:body use="literal"/>
-            </input>
-            <output>
-                <soap:header message="msnab:ServiceHeader" part="ServiceHeader" use="literal"/>
-                <soap:body use="literal"/>
-            </output>
-            <fault name="InvalidPassportUserException">
-                <soap:fault name="InvalidPassportUserException" use="literal"/>
-            </fault>
-        </operation>
-        <operation name="ABGroupContactAdd">
-            <soap:operation soapAction="http://www.msn.com/webservices/AddressBook/ABGroupContactAdd"/>
-            <input>
-                <soap:header message="msnab:ABHeader" part="ApplicationHeader" use="literal"/>
-                <soap:header message="msnab:ABHeader" part="AuthHeader" use="literal"/>
-                <soap:body use="literal"/>
-            </input>
-            <output>
-                <soap:header message="msnab:ServiceHeader" part="ServiceHeader" use="literal"/>
-                <soap:body use="literal"/>
-            </output>
-            <fault name="InvalidPassportUserException">
-                <soap:fault name="InvalidPassportUserException" use="literal"/>
-            </fault>
-        </operation>
-        <operation name="ABGroupAdd">
-            <soap:operation soapAction="http://www.msn.com/webservices/AddressBook/ABGroupAdd"/>
-            <input>
-                <soap:header message="msnab:ABHeader" part="ApplicationHeader" use="literal"/>
-                <soap:header message="msnab:ABHeader" part="AuthHeader" use="literal"/>
-                <soap:body use="literal"/>
-            </input>
-            <output>
-                <soap:header message="msnab:ServiceHeader" part="ServiceHeader" use="literal"/>
-                <soap:body use="literal"/>
-            </output>
-        </operation>
-        <operation name="ABGroupUpdate">
-            <soap:operation soapAction="http://www.msn.com/webservices/AddressBook/ABGroupUpdate"/>
-            <input>
-                <soap:header message="msnab:ABHeader" part="ApplicationHeader" use="literal"/>
-                <soap:header message="msnab:ABHeader" part="AuthHeader" use="literal"/>
-                <soap:body use="literal"/>
-            </input>
-            <output>
-                <soap:header message="msnab:ServiceHeader" part="ServiceHeader" use="literal"/>
-                <soap:body use="literal"/>
-            </output>
-        </operation>
-        <operation name="ABGroupDelete">
-            <soap:operation soapAction="http://www.msn.com/webservices/AddressBook/ABGroupDelete"/>
-            <input>
-                <soap:header message="msnab:ABHeader" part="ApplicationHeader" use="literal"/>
-                <soap:header message="msnab:ABHeader" part="AuthHeader" use="literal"/>
-                <soap:body use="literal"/>
-            </input>
-            <output>
-                <soap:header message="msnab:ServiceHeader" part="ServiceHeader" use="literal"/>
-                <soap:body use="literal"/>
-            </output>
-        </operation>
-        <operation name="ABGroupContactDelete">
-            <soap:operation soapAction="http://www.msn.com/webservices/AddressBook/ABGroupContactDelete"/>
-            <input>
-                <soap:header message="msnab:ABHeader" part="ApplicationHeader" use="literal"/>
-                <soap:header message="msnab:ABHeader" part="AuthHeader" use="literal"/>
-                <soap:body use="literal"/>
-            </input>
-            <output>
-                <soap:header message="msnab:ServiceHeader" part="ServiceHeader" use="literal"/>
-                <soap:body use="literal"/>
-            </output>
-        </operation>
-        <operation name="ABContactUpdate">
-            <soap:operation soapAction="http://www.msn.com/webservices/AddressBook/ABContactUpdate"/>
-            <input>
-                <soap:header message="msnab:ABHeader" part="ApplicationHeader" use="literal"/>
-                <soap:header message="msnab:ABHeader" part="AuthHeader" use="literal"/>
-                <soap:body use="literal"/>
-            </input>
-            <output>
-                <soap:header message="msnab:ServiceHeader" part="ServiceHeader" use="literal"/>
-                <soap:body use="literal"/>
-            </output>
-        </operation>
-        <operation name="ABAdd">
-            <soap:operation soapAction="http://www.msn.com/webservices/AddressBook/ABAdd"/>
-            <input>
-                <soap:body use="literal"/>
-                <soap:header message="msnab:ABHeader" part="ApplicationHeader" use="literal"/>
-                <soap:header message="msnab:ABHeader" part="AuthHeader" use="literal"/>
-            </input>
-            <output>
-                <soap:body use="literal"/>
-                <soap:header message="msnab:ServiceHeader" part="ServiceHeader" use="literal"/>
-            </output>
-        </operation>
-        <operation name="UpdateDynamicItem">
-            <soap:operation soapAction="http://www.msn.com/webservices/AddressBook/UpdateDynamicItem"/>
-            <input>
-                <soap:body use="literal"/>
-                <soap:header message="msnab:ABHeader" part="ApplicationHeader" use="literal"/>
-                <soap:header message="msnab:ABHeader" part="AuthHeader" use="literal"/>
-            </input>
-            <output>
-                <soap:body use="literal"/>
-                <soap:header message="msnab:ServiceHeader" part="ServiceHeader" use="literal"/>
-            </output>
-        </operation>
-        <operation name="ABFindContactsPaged">
-            <soap:operation soapAction="http://www.msn.com/webservices/AddressBook/ABFindContactsPaged"/>
-            <input>
-                <soap:body use="literal"/>
-                <soap:header message="msnab:ABHeader" part="ApplicationHeader" use="literal"/>
-                <soap:header message="msnab:ABHeader" part="AuthHeader" use="literal"/>
-            </input>
-            <output>
-                <soap:body use="literal"/>
-                <soap:header message="msnab:ServiceHeader" part="ServiceHeader" use="literal"/>
-            </output>
-        </operation>
-        <operation name="CreateContact">
-            <soap:operation soapAction="http://www.msn.com/webservices/AddressBook/CreateContact"/>
-            <input>
-                <soap:body use="literal"/>
-                <soap:header message="msnab:ABHeader" part="ApplicationHeader" use="literal"/>
-                <soap:header message="msnab:ABHeader" part="AuthHeader" use="literal"/>
-            </input>
-            <output>
-                <soap:body use="literal"/>
-                <soap:header message="msnab:ServiceHeader" part="ServiceHeader" use="literal"/>
-            </output>
-        </operation>
-        <operation name="ManageWLConnection">
-            <soap:operation soapAction="http://www.msn.com/webservices/AddressBook/ManageWLConnection"/>
-            <input>
-                <soap:body use="literal"/>
-                <soap:header message="msnab:ABHeader" part="ApplicationHeader" use="literal"/>
-                <soap:header message="msnab:ABHeader" part="AuthHeader" use="literal"/>
-            </input>
-            <output>
-                <soap:body use="literal"/>
-                <soap:header message="msnab:ServiceHeader" part="ServiceHeader" use="literal"/>
-            </output>
-        </operation>
-    </binding>
-    <binding name="WhatsUpServiceBinding" type="msnab:WhatsUpServicePortType">
-        <soap:binding transport="http://schemas.xmlsoap.org/soap/http"/>
-        <operation name="GetContactsRecentActivity">
-            <soap:operation soapAction="http://www.msn.com/webservices/AddressBook/GetContactsRecentActivity"/>
-            <input>
-                <soap:body use="literal"/>
-                <soap:header message="msnab:WNHeader" part="WNApplicationHeader" use="literal"/>
-                <soap:header message="msnab:WNHeader" part="WNAuthHeader" use="literal"/>
-            </input>
-            <output>
-                <soap:body use="literal"/>
-                <soap:header message="msnab:WNHeader" part="WNServiceHeader" use="literal"/>
-            </output>
-        </operation>
-    </binding>
-    <service name="SharingService">
-        <port name="FindMembershipPort" binding="msnab:SharingServiceBinding">
-            <soap:address location="https://contacts.msn.com/abservice/SharingService.asmx"/>
-        </port>
-        <port name="AddMemberPort" binding="msnab:SharingServiceBinding">
-            <soap:address location="https://contacts.msn.com/abservice/SharingService.asmx"/>
-        </port>
-        <port name="DeleteMemberPort" binding="msnab:SharingServiceBinding">
-            <soap:address location="https://contacts.msn.com/abservice/SharingService.asmx"/>
-        </port>
-        <port name="CreateCirclePort" binding="msnab:SharingServiceBinding">
-            <soap:address location="https://contacts.msn.com/abservice/SharingService.asmx"/>
-        </port>
-    </service>
-    <service name="ABService">
-        <port name="ABFindAllPort" binding="msnab:ABServiceBinding">
-            <soap:address location="https://contacts.msn.com/abservice/abservice.asmx"/>
-        </port>
-        <port name="ABContactAddPort" binding="msnab:ABServiceBinding">
-            <soap:address location="https://contacts.msn.com/abservice/abservice.asmx"/>
-        </port>
-        <port name="ABContactDeletePort" binding="msnab:ABServiceBinding">
-            <soap:address location="https://contacts.msn.com/abservice/abservice.asmx"/>
-        </port>
-        <port name="ABGroupContactAddPort" binding="msnab:ABServiceBinding">
-            <soap:address location="https://contacts.msn.com/abservice/abservice.asmx"/>
-        </port>
-        <port name="ABGroupAddPort" binding="msnab:ABServiceBinding">
-            <soap:address location="https://contacts.msn.com/abservice/abservice.asmx"/>
-        </port>
-        <port name="ABGroupUpdatePort" binding="msnab:ABServiceBinding">
-            <soap:address location="https://contacts.msn.com/abservice/abservice.asmx"/>
-        </port>
-        <port name="ABGroupDeletePort" binding="msnab:ABServiceBinding">
-            <soap:address location="https://contacts.msn.com/abservice/abservice.asmx"/>
-        </port>
-        <port name="ABGroupContactDeletePort" binding="msnab:ABServiceBinding">
-            <soap:address location="https://contacts.msn.com/abservice/abservice.asmx"/>
-        </port>
-        <port name="ABContactUpdatePort" binding="msnab:ABServiceBinding">
-            <soap:address location="https://contacts.msn.com/abservice/abservice.asmx"/>
-        </port>
-        <port name="ABAddPort" binding="msnab:ABServiceBinding">
-            <soap:address location="https://contacts.msn.com/abservice/abservice.asmx"/>
-        </port>
-        <port name="UpdateDynamicItemPort" binding="msnab:ABServiceBinding">
-            <soap:address location="https://contacts.msn.com/abservice/abservice.asmx"/>
-        </port>
-        <port name="ABFindContactsPagedPort" binding="msnab:ABServiceBinding">
-            <soap:address location="https://contacts.msn.com/abservice/abservice.asmx"/>
-        </port>
-        <port name="CreateContactPort" binding="msnab:ABServiceBinding">
-            <soap:address location="https://contacts.msn.com/abservice/abservice.asmx"/>
-        </port>
-        <port name="ManageWLConnectionPort" binding="msnab:ABServiceBinding">
-            <soap:address location="https://contacts.msn.com/abservice/abservice.asmx"/>
-        </port>
-    </service>
-    <service name="WhatsUpService">
-        <port name="GetContactsRecentActivityPort" binding="msnab:WhatsUpServiceBinding">
-            <soap:address location="http://sup.live.com/whatsnew/whatsnewservice.asmx"/>
-        </port>
-    </service>
-</definitions>

From 79a81e5d5409575df47bde4dc0ad2880b40aefa5 Mon Sep 17 00:00:00 2001
From: Luke Fitzgerald <lw.fitzgerald@googlemail.com>
Date: Wed, 18 Aug 2010 10:27:03 -0700
Subject: [PATCH 178/655] Removed old code accidently left in ($data)

---
 plugins/Msn/msnmanager.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/Msn/msnmanager.php b/plugins/Msn/msnmanager.php
index 8f434dad99..bdae9f2b6f 100644
--- a/plugins/Msn/msnmanager.php
+++ b/plugins/Msn/msnmanager.php
@@ -193,11 +193,11 @@ class MsnManager extends ImManager {
     * @return void
     */
     protected function requeue_waiting_messages() {
-        $wm = Msn_waiting_message::top($data['to']);
+        $wm = Msn_waiting_message::top();
         while ($wm != NULL) {
             $this->plugin->send_message($wm->screenname, $wm->message);
             $wm->delete();
-            $wm = Msn_waiting_message::top($data['to']);
+            $wm = Msn_waiting_message::top();
         }
     }
 

From ab89df00942fe853ba47f123de1884c708ff0645 Mon Sep 17 00:00:00 2001
From: Craig Andrews <candrews@integralblue.com>
Date: Wed, 18 Aug 2010 13:33:52 -0400
Subject: [PATCH 179/655] Use mhash from Compat if mhash isn't available

---
 plugins/Msn/MsnPlugin.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/plugins/Msn/MsnPlugin.php b/plugins/Msn/MsnPlugin.php
index 9db3f7763b..9e0b76d327 100644
--- a/plugins/Msn/MsnPlugin.php
+++ b/plugins/Msn/MsnPlugin.php
@@ -192,6 +192,9 @@ class MsnPlugin extends ImPlugin {
         if (!isset($this->nickname)) {
             throw new Exception("Must specify a nickname");
         }
+        if (!function_exists('mhash')) {
+            require_once(INSTALLDIR.'/plugins/Msn/extlib/compat/mhash.php');
+        }
 
         return true;
     }

From f5e4fc12e023d5414c7c9e7b02990d81d3b18c20 Mon Sep 17 00:00:00 2001
From: Craig Andrews <candrews@integralblue.com>
Date: Wed, 18 Aug 2010 13:34:32 -0400
Subject: [PATCH 180/655] include mhash from php compat

---
 plugins/Msn/extlib/compat/mhash.php | 115 ++++++++++++++++++++++++++++
 1 file changed, 115 insertions(+)
 create mode 100644 plugins/Msn/extlib/compat/mhash.php

diff --git a/plugins/Msn/extlib/compat/mhash.php b/plugins/Msn/extlib/compat/mhash.php
new file mode 100644
index 0000000000..128c68ee12
--- /dev/null
+++ b/plugins/Msn/extlib/compat/mhash.php
@@ -0,0 +1,115 @@
+<?php
+// +----------------------------------------------------------------------+
+// | PHP Version 4                                                        |
+// +----------------------------------------------------------------------+
+// | Copyright (c) 1997-2004 The PHP Group                                |
+// +----------------------------------------------------------------------+
+// | This source file is subject to version 3.0 of the PHP license,       |
+// | that is bundled with this package in the file LICENSE, and is        |
+// | available at through the world-wide-web at                           |
+// | http://www.php.net/license/3_0.txt.                                  |
+// | If you did not receive a copy of the PHP license and are unable to   |
+// | obtain it through the world-wide-web, please send a note to          |
+// | license@php.net so we can mail you a copy immediately.               |
+// +----------------------------------------------------------------------+
+// | Authors: Aidan Lister <aidan@php.net>                                |
+// +----------------------------------------------------------------------+
+//
+// $Id: mhash.php,v 1.1 2005/05/10 07:56:44 aidan Exp $
+
+
+if (!defined('MHASH_CRC32')) {
+    define('MHASH_CRC32', 0);
+}
+
+if (!defined('MHASH_MD5')) {
+    define('MHASH_MD5', 1);
+}
+
+if (!defined('MHASH_SHA1')) {
+    define('MHASH_SHA1', 2);
+}
+
+if (!defined('MHASH_HAVAL256')) {
+    define('MHASH_HAVAL256', 3);
+}
+
+if (!defined('MHASH_RIPEMD160')) {
+    define('MHASH_RIPEMD160', 5);
+}
+
+if (!defined('MHASH_TIGER')) {
+    define('MHASH_TIGER', 7);
+}
+
+if (!defined('MHASH_GOST')) {
+    define('MHASH_GOST', 8);
+}
+
+if (!defined('MHASH_CRC32B')) {
+    define('MHASH_CRC32B', 9);
+}
+
+if (!defined('MHASH_HAVAL192')) {
+    define('MHASH_HAVAL192', 11);
+}
+
+if (!defined('MHASH_HAVAL160')) {
+    define('MHASH_HAVAL160', 12);
+}
+
+if (!defined('MHASH_HAVAL128')) {
+    define('MHASH_HAVAL128', 13);
+}
+
+if (!defined('MHASH_TIGER128')) {
+    define('MHASH_TIGER128', 14);
+}
+
+if (!defined('MHASH_TIGER160')) {
+    define('MHASH_TIGER160', 15);
+}
+
+if (!defined('MHASH_MD4')) {
+    define('MHASH_MD4', 16);
+}
+
+if (!defined('MHASH_SHA256')) {
+    define('MHASH_SHA256', 17);
+}
+
+if (!defined('MHASH_ADLER32')) {
+    define('MHASH_ADLER32', 18);
+}
+
+
+/**
+ * Replace mhash()
+ *
+ * @category    PHP
+ * @package     PHP_Compat
+ * @link        http://php.net/function.mhash
+ * @author      Aidan Lister <aidan@php.net>
+ * @version     $Revision: 1.1 $
+ * @since       PHP 4.1.0
+ * @require     PHP 4.0.0 (user_error)
+ */
+if (!function_exists('mhash')) {
+    function mhash($hashtype, $data, $key = '')    
+    {
+        switch ($hashtype) {
+            case MHASH_MD5:
+                $key = str_pad((strlen($key) > 64 ? pack("H*", md5($key)) : $key), 64, chr(0x00));
+                $k_opad = $key ^ (str_pad('', 64, chr(0x5c)));
+                $k_ipad = $key ^ (str_pad('', 64, chr(0x36)));
+                return pack("H*", md5($k_opad . pack("H*", md5($k_ipad .  $data))));
+
+            default:
+                return false;
+
+            break;
+        }
+    }
+}
+
+?>

From 05712ae62be4de279fc3108e0dbaeee7a3c36150 Mon Sep 17 00:00:00 2001
From: Craig Andrews <candrews@integralblue.com>
Date: Wed, 18 Aug 2010 13:37:38 -0400
Subject: [PATCH 181/655] reconnect failed doesn't include a parameter in its
 invocation

---
 plugins/Msn/msnmanager.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/plugins/Msn/msnmanager.php b/plugins/Msn/msnmanager.php
index bdae9f2b6f..bd6f6e1fc9 100644
--- a/plugins/Msn/msnmanager.php
+++ b/plugins/Msn/msnmanager.php
@@ -204,10 +204,9 @@ class MsnManager extends ImManager {
     /**
     * Called by callback to log failure during connect
     *
-    * @param void $data Not used (there to keep callback happy)
     * @return void
     */
-    public function handle_connect_failed($data) {
+    public function handle_connect_failed() {
         common_log(LOG_NOTICE, 'MSN connect failed, retrying');
     }
 

From 6c02c665f2eb38a86b61b8bd89a96e039a023552 Mon Sep 17 00:00:00 2001
From: Craig Andrews <candrews@integralblue.com>
Date: Wed, 18 Aug 2010 14:07:40 -0400
Subject: [PATCH 182/655] Use hash if available

---
 plugins/Msn/MsnPlugin.php                    |   3 -
 plugins/Msn/extlib/compat/mhash.php          | 115 -------------------
 plugins/Msn/extlib/phpmsnclass/msn.class.php |  43 +++++--
 plugins/Msn/msnmanager.php                   |   5 +-
 4 files changed, 38 insertions(+), 128 deletions(-)
 delete mode 100644 plugins/Msn/extlib/compat/mhash.php

diff --git a/plugins/Msn/MsnPlugin.php b/plugins/Msn/MsnPlugin.php
index 9e0b76d327..9db3f7763b 100644
--- a/plugins/Msn/MsnPlugin.php
+++ b/plugins/Msn/MsnPlugin.php
@@ -192,9 +192,6 @@ class MsnPlugin extends ImPlugin {
         if (!isset($this->nickname)) {
             throw new Exception("Must specify a nickname");
         }
-        if (!function_exists('mhash')) {
-            require_once(INSTALLDIR.'/plugins/Msn/extlib/compat/mhash.php');
-        }
 
         return true;
     }
diff --git a/plugins/Msn/extlib/compat/mhash.php b/plugins/Msn/extlib/compat/mhash.php
deleted file mode 100644
index 128c68ee12..0000000000
--- a/plugins/Msn/extlib/compat/mhash.php
+++ /dev/null
@@ -1,115 +0,0 @@
-<?php
-// +----------------------------------------------------------------------+
-// | PHP Version 4                                                        |
-// +----------------------------------------------------------------------+
-// | Copyright (c) 1997-2004 The PHP Group                                |
-// +----------------------------------------------------------------------+
-// | This source file is subject to version 3.0 of the PHP license,       |
-// | that is bundled with this package in the file LICENSE, and is        |
-// | available at through the world-wide-web at                           |
-// | http://www.php.net/license/3_0.txt.                                  |
-// | If you did not receive a copy of the PHP license and are unable to   |
-// | obtain it through the world-wide-web, please send a note to          |
-// | license@php.net so we can mail you a copy immediately.               |
-// +----------------------------------------------------------------------+
-// | Authors: Aidan Lister <aidan@php.net>                                |
-// +----------------------------------------------------------------------+
-//
-// $Id: mhash.php,v 1.1 2005/05/10 07:56:44 aidan Exp $
-
-
-if (!defined('MHASH_CRC32')) {
-    define('MHASH_CRC32', 0);
-}
-
-if (!defined('MHASH_MD5')) {
-    define('MHASH_MD5', 1);
-}
-
-if (!defined('MHASH_SHA1')) {
-    define('MHASH_SHA1', 2);
-}
-
-if (!defined('MHASH_HAVAL256')) {
-    define('MHASH_HAVAL256', 3);
-}
-
-if (!defined('MHASH_RIPEMD160')) {
-    define('MHASH_RIPEMD160', 5);
-}
-
-if (!defined('MHASH_TIGER')) {
-    define('MHASH_TIGER', 7);
-}
-
-if (!defined('MHASH_GOST')) {
-    define('MHASH_GOST', 8);
-}
-
-if (!defined('MHASH_CRC32B')) {
-    define('MHASH_CRC32B', 9);
-}
-
-if (!defined('MHASH_HAVAL192')) {
-    define('MHASH_HAVAL192', 11);
-}
-
-if (!defined('MHASH_HAVAL160')) {
-    define('MHASH_HAVAL160', 12);
-}
-
-if (!defined('MHASH_HAVAL128')) {
-    define('MHASH_HAVAL128', 13);
-}
-
-if (!defined('MHASH_TIGER128')) {
-    define('MHASH_TIGER128', 14);
-}
-
-if (!defined('MHASH_TIGER160')) {
-    define('MHASH_TIGER160', 15);
-}
-
-if (!defined('MHASH_MD4')) {
-    define('MHASH_MD4', 16);
-}
-
-if (!defined('MHASH_SHA256')) {
-    define('MHASH_SHA256', 17);
-}
-
-if (!defined('MHASH_ADLER32')) {
-    define('MHASH_ADLER32', 18);
-}
-
-
-/**
- * Replace mhash()
- *
- * @category    PHP
- * @package     PHP_Compat
- * @link        http://php.net/function.mhash
- * @author      Aidan Lister <aidan@php.net>
- * @version     $Revision: 1.1 $
- * @since       PHP 4.1.0
- * @require     PHP 4.0.0 (user_error)
- */
-if (!function_exists('mhash')) {
-    function mhash($hashtype, $data, $key = '')    
-    {
-        switch ($hashtype) {
-            case MHASH_MD5:
-                $key = str_pad((strlen($key) > 64 ? pack("H*", md5($key)) : $key), 64, chr(0x00));
-                $k_opad = $key ^ (str_pad('', 64, chr(0x5c)));
-                $k_ipad = $key ^ (str_pad('', 64, chr(0x36)));
-                return pack("H*", md5($k_opad . pack("H*", md5($k_ipad .  $data))));
-
-            default:
-                return false;
-
-            break;
-        }
-    }
-}
-
-?>
diff --git a/plugins/Msn/extlib/phpmsnclass/msn.class.php b/plugins/Msn/extlib/phpmsnclass/msn.class.php
index 9abdce1b61..996c5571c2 100644
--- a/plugins/Msn/extlib/phpmsnclass/msn.class.php
+++ b/plugins/Msn/extlib/phpmsnclass/msn.class.php
@@ -12,7 +12,7 @@ Documentation on the MSN protocol can be found at: http://msnpiki.msnfanatic.com
 This class uses MSNP15.
 
 In addition to PHP5, the additional php modules required are:
-curl pcre mhash mcrypt bcmath
+curl pcre mcrypt bcmath
 
 */
 
@@ -156,7 +156,6 @@ class MSN {
         // Check support
         if (!function_exists('curl_init')) throw new Exception("curl module not found!\n");
         if (!function_exists('preg_match')) throw new Exception("pcre module not found!\n");
-        if (!function_exists('mhash')) throw new Exception("mhash module not found!\n");
         if (!function_exists('mcrypt_cbc')) throw new Exception("mcrypt module not found!\n");
         if (!function_exists('bcmod')) throw new Exception("bcmath module not found!\n");
 
@@ -486,7 +485,7 @@ class MSN {
         if(!empty($message)) {
             $this->debug_message($message);
         }
-        $this->callHandler('ConnectFailed');
+        $this->callHandler('ConnectFailed', $message);
         $this->NSRetryWait($this->retry_wait);
     }
 
@@ -2651,10 +2650,10 @@ X-OIM-Sequence-Num: 1
      */
 
     private function derive_key($key, $magic) {
-        $hash1 = mhash(MHASH_SHA1, $magic, $key);
-        $hash2 = mhash(MHASH_SHA1, $hash1.$magic, $key);
-        $hash3 = mhash(MHASH_SHA1, $hash1, $key);
-        $hash4 = mhash(MHASH_SHA1, $hash3.$magic, $key);
+        $hash1 = $this->mhash_sha1($magic, $key);
+        $hash2 = $this->mhash_sha1($hash1.$magic, $key);
+        $hash3 = $this->mhash_sha1($hash1, $key);
+        $hash4 = $this->mhash_sha1($hash3.$magic, $key);
         return $hash2.substr($hash4, 0, 4);
     }
 
@@ -2664,7 +2663,7 @@ X-OIM-Sequence-Num: 1
         $key3 = $this->derive_key($key1, 'WS-SecureConversationSESSION KEY ENCRYPTION');
 
         // get hash of challenge using key2
-        $hash = mhash(MHASH_SHA1, $challenge, $key2);
+        $hash = $this->mhash_sha1($challenge, $key2);
 
         // get 8 bytes random data
         $iv = substr(base64_encode(rand(1000,9999).rand(1000,9999)), 2, 8);
@@ -3180,4 +3179,32 @@ X-OIM-Sequence-Num: 1
         $buf .= "$h_str $a_str\n";
         return $buf;
     }
+
+    function mhash_sha1($data, $key)
+    {
+        if (extension_loaded("mhash"))
+            return mhash(MHASH_SHA1, $data, $key);
+
+        if (function_exists("hash_hmac"))
+            return hash_hmac('sha1', $data, $key, true);
+
+        // RFC 2104 HMAC implementation for php. Hacked by Lance Rushing
+        $b = 64;
+        if (strlen($key) > $b)
+            $key = pack("H*", sha1($key));
+        $key = str_pad($key, $b, chr(0x00));
+        $ipad = str_pad("", $b, chr(0x36));
+        $opad = str_pad("", $b, chr(0x5c));
+        $k_ipad = $key ^ $ipad ;
+        $k_opad = $key ^ $opad;
+
+        $sha1_value = sha1($k_opad . pack("H*", sha1($k_ipad . $data)));
+
+        $hash_data = '';
+        $str = join('',explode('\x', $sha1_value));
+        $len = strlen($str);
+        for ($i = 0; $i < $len; $i += 2)
+            $hash_data .= chr(hexdec(substr($str, $i, 2)));
+        return $hash_data;
+    }
 }
diff --git a/plugins/Msn/msnmanager.php b/plugins/Msn/msnmanager.php
index bd6f6e1fc9..09efa32fae 100644
--- a/plugins/Msn/msnmanager.php
+++ b/plugins/Msn/msnmanager.php
@@ -204,10 +204,11 @@ class MsnManager extends ImManager {
     /**
     * Called by callback to log failure during connect
     *
+    * @param string $message error message reported
     * @return void
     */
-    public function handle_connect_failed() {
-        common_log(LOG_NOTICE, 'MSN connect failed, retrying');
+    public function handle_connect_failed($message) {
+        common_log(LOG_NOTICE, 'MSN connect failed, retrying: ' . $message);
     }
 
     /**

From 6b4607f0736a2a750881f89a42822925ce53ff16 Mon Sep 17 00:00:00 2001
From: Craig Andrews <candrews@integralblue.com>
Date: Mon, 30 Aug 2010 16:53:32 -0400
Subject: [PATCH 183/655] Upgrade from CAS 1.1.0RC6 to 1.1.2

---
 plugins/CasAuthentication/extlib/CAS.php      | 1393 ++++++++---------
 .../extlib/CAS/PGTStorage/pgt-db.php          |   28 +
 .../extlib/CAS/PGTStorage/pgt-file.php        |   27 +
 .../extlib/CAS/PGTStorage/pgt-main.php        |   27 +
 .../CasAuthentication/extlib/CAS/client.php   |  865 +++++-----
 5 files changed, 1243 insertions(+), 1097 deletions(-)

diff --git a/plugins/CasAuthentication/extlib/CAS.php b/plugins/CasAuthentication/extlib/CAS.php
index e754374198..62a6175794 100644
--- a/plugins/CasAuthentication/extlib/CAS.php
+++ b/plugins/CasAuthentication/extlib/CAS.php
@@ -1,20 +1,46 @@
 <?php
 
-// commented in 0.4.22-RC2 for Sylvain Derosiaux
-// error_reporting(E_ALL ^ E_NOTICE);
+/*
+ * Copyright © 2003-2010, The ESUP-Portail consortium & the JA-SIG Collaborative.
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 
+ *     * Redistributions of source code must retain the above copyright notice,
+ *       this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright notice,
+ *       this list of conditions and the following disclaimer in the documentation
+ *       and/or other materials provided with the distribution.
+ *     * Neither the name of the ESUP-Portail consortium & the JA-SIG
+ *       Collaborative nor the names of its contributors may be used to endorse or
+ *       promote products derived from this software without specific prior
+ *       written permission.
+
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 
 //
 // hack by Vangelis Haniotakis to handle the absence of $_SERVER['REQUEST_URI'] in IIS
 //
 if (!$_SERVER['REQUEST_URI']) {
-	$_SERVER['REQUEST_URI'] = $_SERVER['SCRIPT_NAME'].'?'.$_SERVER['QUERY_STRING'];
+	$_SERVER['REQUEST_URI'] = $_SERVER['SCRIPT_NAME'] . '?' . $_SERVER['QUERY_STRING'];
 }
 
 //
 // another one by Vangelis Haniotakis also to make phpCAS work with PHP5
 //
-if (version_compare(PHP_VERSION,'5','>=')) {
-	require_once(dirname(__FILE__).'/CAS/domxml-php4-to-php5.php');
+if (version_compare(PHP_VERSION, '5', '>=') && !(function_exists('domxml_new_doc'))) {
+	require_once (dirname(__FILE__) . '/CAS/domxml-php4-to-php5.php');
 }
 
 /**
@@ -35,24 +61,24 @@ if (version_compare(PHP_VERSION,'5','>=')) {
 /**
  * phpCAS version. accessible for the user by phpCAS::getVersion().
  */
-define('PHPCAS_VERSION','1.1.0RC6');
+define('PHPCAS_VERSION', '1.1.2');
 
 // ------------------------------------------------------------------------
 //  CAS VERSIONS
 // ------------------------------------------------------------------------
- /**
-  * @addtogroup public
-  * @{
-  */
+/**
+ * @addtogroup public
+ * @{
+ */
 
 /**
  * CAS version 1.0
  */
-define("CAS_VERSION_1_0",'1.0');
+define("CAS_VERSION_1_0", '1.0');
 /*!
  * CAS version 2.0
  */
-define("CAS_VERSION_2_0",'2.0');
+define("CAS_VERSION_2_0", '2.0');
 
 // ------------------------------------------------------------------------
 //  SAML defines
@@ -71,143 +97,141 @@ define("SAML_XML_HEADER", '<?xml version="1.0" encoding="UTF-8"?>');
 /**
  * SOAP envelope for SAML POST
  */
-define ("SAML_SOAP_ENV", '<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"><SOAP-ENV:Header/>');
+define("SAML_SOAP_ENV", '<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"><SOAP-ENV:Header/>');
 
 /**
  * SOAP body for SAML POST
  */
-define ("SAML_SOAP_BODY", '<SOAP-ENV:Body>');
+define("SAML_SOAP_BODY", '<SOAP-ENV:Body>');
 
 /**
  * SAMLP request
  */
-define ("SAMLP_REQUEST", '<samlp:Request xmlns:samlp="urn:oasis:names:tc:SAML:1.0:protocol"  MajorVersion="1" MinorVersion="1" RequestID="_192.168.16.51.1024506224022" IssueInstant="2002-06-19T17:03:44.022Z">');
-define ("SAMLP_REQUEST_CLOSE", '</samlp:Request>');
+define("SAMLP_REQUEST", '<samlp:Request xmlns:samlp="urn:oasis:names:tc:SAML:1.0:protocol"  MajorVersion="1" MinorVersion="1" RequestID="_192.168.16.51.1024506224022" IssueInstant="2002-06-19T17:03:44.022Z">');
+define("SAMLP_REQUEST_CLOSE", '</samlp:Request>');
 
 /**
  * SAMLP artifact tag (for the ticket)
  */
-define ("SAML_ASSERTION_ARTIFACT", '<samlp:AssertionArtifact>');
+define("SAML_ASSERTION_ARTIFACT", '<samlp:AssertionArtifact>');
 
 /**
  * SAMLP close
  */
-define ("SAML_ASSERTION_ARTIFACT_CLOSE", '</samlp:AssertionArtifact>');
+define("SAML_ASSERTION_ARTIFACT_CLOSE", '</samlp:AssertionArtifact>');
 
 /**
  * SOAP body close
  */
-define ("SAML_SOAP_BODY_CLOSE", '</SOAP-ENV:Body>');
+define("SAML_SOAP_BODY_CLOSE", '</SOAP-ENV:Body>');
 
 /**
  * SOAP envelope close
  */
-define ("SAML_SOAP_ENV_CLOSE", '</SOAP-ENV:Envelope>');
+define("SAML_SOAP_ENV_CLOSE", '</SOAP-ENV:Envelope>');
 
 /**
  * SAML Attributes
  */
 define("SAML_ATTRIBUTES", 'SAMLATTRIBS');
 
-
-
 /** @} */
- /**
-  * @addtogroup publicPGTStorage
-  * @{
-  */
+/**
+ * @addtogroup publicPGTStorage
+ * @{
+ */
 // ------------------------------------------------------------------------
 //  FILE PGT STORAGE
 // ------------------------------------------------------------------------
- /**
-  * Default path used when storing PGT's to file
-  */
-define("CAS_PGT_STORAGE_FILE_DEFAULT_PATH",'/tmp');
+/**
+ * Default path used when storing PGT's to file
+ */
+define("CAS_PGT_STORAGE_FILE_DEFAULT_PATH", '/tmp');
 /**
  * phpCAS::setPGTStorageFile()'s 2nd parameter to write plain text files
  */
-define("CAS_PGT_STORAGE_FILE_FORMAT_PLAIN",'plain');
+define("CAS_PGT_STORAGE_FILE_FORMAT_PLAIN", 'plain');
 /**
  * phpCAS::setPGTStorageFile()'s 2nd parameter to write xml files
  */
-define("CAS_PGT_STORAGE_FILE_FORMAT_XML",'xml');
+define("CAS_PGT_STORAGE_FILE_FORMAT_XML", 'xml');
 /**
  * Default format used when storing PGT's to file
  */
-define("CAS_PGT_STORAGE_FILE_DEFAULT_FORMAT",CAS_PGT_STORAGE_FILE_FORMAT_PLAIN);
+define("CAS_PGT_STORAGE_FILE_DEFAULT_FORMAT", CAS_PGT_STORAGE_FILE_FORMAT_PLAIN);
 // ------------------------------------------------------------------------
 //  DATABASE PGT STORAGE
 // ------------------------------------------------------------------------
- /**
-  * default database type when storing PGT's to database
-  */
-define("CAS_PGT_STORAGE_DB_DEFAULT_DATABASE_TYPE",'mysql');
+/**
+ * default database type when storing PGT's to database
+ */
+define("CAS_PGT_STORAGE_DB_DEFAULT_DATABASE_TYPE", 'mysql');
 /**
  * default host when storing PGT's to database
  */
-define("CAS_PGT_STORAGE_DB_DEFAULT_HOSTNAME",'localhost');
+define("CAS_PGT_STORAGE_DB_DEFAULT_HOSTNAME", 'localhost');
 /**
  * default port when storing PGT's to database
  */
-define("CAS_PGT_STORAGE_DB_DEFAULT_PORT",'');
+define("CAS_PGT_STORAGE_DB_DEFAULT_PORT", '');
 /**
  * default database when storing PGT's to database
  */
-define("CAS_PGT_STORAGE_DB_DEFAULT_DATABASE",'phpCAS');
+define("CAS_PGT_STORAGE_DB_DEFAULT_DATABASE", 'phpCAS');
 /**
  * default table when storing PGT's to database
  */
-define("CAS_PGT_STORAGE_DB_DEFAULT_TABLE",'pgt');
+define("CAS_PGT_STORAGE_DB_DEFAULT_TABLE", 'pgt');
 
 /** @} */
 // ------------------------------------------------------------------------
 // SERVICE ACCESS ERRORS
 // ------------------------------------------------------------------------
- /**
-  * @addtogroup publicServices
-  * @{
-  */
+/**
+ * @addtogroup publicServices
+ * @{
+ */
 
 /**
  * phpCAS::service() error code on success
  */
-define("PHPCAS_SERVICE_OK",0);
+define("PHPCAS_SERVICE_OK", 0);
 /**
  * phpCAS::service() error code when the PT could not retrieve because
  * the CAS server did not respond.
  */
-define("PHPCAS_SERVICE_PT_NO_SERVER_RESPONSE",1);
+define("PHPCAS_SERVICE_PT_NO_SERVER_RESPONSE", 1);
 /**
  * phpCAS::service() error code when the PT could not retrieve because
  * the response of the CAS server was ill-formed.
  */
-define("PHPCAS_SERVICE_PT_BAD_SERVER_RESPONSE",2);
+define("PHPCAS_SERVICE_PT_BAD_SERVER_RESPONSE", 2);
 /**
  * phpCAS::service() error code when the PT could not retrieve because
  * the CAS server did not want to.
  */
-define("PHPCAS_SERVICE_PT_FAILURE",3);
+define("PHPCAS_SERVICE_PT_FAILURE", 3);
 /**
  * phpCAS::service() error code when the service was not available.
  */
-define("PHPCAS_SERVICE_NOT AVAILABLE",4);
+define("PHPCAS_SERVICE_NOT AVAILABLE", 4);
 
 /** @} */
 // ------------------------------------------------------------------------
 //  LANGUAGES
 // ------------------------------------------------------------------------
- /**
-  * @addtogroup publicLang
-  * @{
-  */
+/**
+ * @addtogroup publicLang
+ * @{
+ */
 
-define("PHPCAS_LANG_ENGLISH",    'english');
-define("PHPCAS_LANG_FRENCH",     'french');
-define("PHPCAS_LANG_GREEK",      'greek');
-define("PHPCAS_LANG_GERMAN",     'german');
-define("PHPCAS_LANG_JAPANESE",   'japanese');
-define("PHPCAS_LANG_SPANISH",    'spanish');
-define("PHPCAS_LANG_CATALAN",    'catalan');
+define("PHPCAS_LANG_ENGLISH", 'english');
+define("PHPCAS_LANG_FRENCH", 'french');
+define("PHPCAS_LANG_GREEK", 'greek');
+define("PHPCAS_LANG_GERMAN", 'german');
+define("PHPCAS_LANG_JAPANESE", 'japanese');
+define("PHPCAS_LANG_SPANISH", 'spanish');
+define("PHPCAS_LANG_CATALAN", 'catalan');
 
 /** @} */
 
@@ -225,31 +249,31 @@ define("PHPCAS_LANG_DEFAULT", PHPCAS_LANG_ENGLISH);
 // ------------------------------------------------------------------------
 //  DEBUG
 // ------------------------------------------------------------------------
- /**
-  * @addtogroup publicDebug
-  * @{
-  */
+/**
+ * @addtogroup publicDebug
+ * @{
+ */
 
 /**
  * The default directory for the debug file under Unix.
  */
-define('DEFAULT_DEBUG_DIR','/tmp/');
+define('DEFAULT_DEBUG_DIR', '/tmp/');
 
 /** @} */
 // ------------------------------------------------------------------------
 //  MISC
 // ------------------------------------------------------------------------
- /**
-  * @addtogroup internalMisc
-  * @{
-  */
+/**
+ * @addtogroup internalMisc
+ * @{
+ */
 
 /**
  * This global variable is used by the interface class phpCAS.
  *
  * @hideinitializer
  */
-$GLOBALS['PHPCAS_CLIENT']  = null;
+$GLOBALS['PHPCAS_CLIENT'] = null;
 
 /**
  * This global variable is used to store where the initializer is called from 
@@ -257,10 +281,12 @@ $GLOBALS['PHPCAS_CLIENT']  = null;
  *
  * @hideinitializer
  */
-$GLOBALS['PHPCAS_INIT_CALL'] = array('done' => FALSE,
+$GLOBALS['PHPCAS_INIT_CALL'] = array (
+	'done' => FALSE,
 	'file' => '?',
 	'line' => -1,
-	'method' => '?');
+	'method' => '?'
+);
 
 /**
  * This global variable is used to store where the method checking
@@ -268,20 +294,24 @@ $GLOBALS['PHPCAS_INIT_CALL'] = array('done' => FALSE,
  *
  * @hideinitializer
  */
-$GLOBALS['PHPCAS_AUTH_CHECK_CALL'] = array('done' => FALSE,
+$GLOBALS['PHPCAS_AUTH_CHECK_CALL'] = array (
+	'done' => FALSE,
 	'file' => '?',
 	'line' => -1,
 	'method' => '?',
-	'result' => FALSE);
+	'result' => FALSE
+);
 
 /**
  * This global variable is used to store phpCAS debug mode.
  *
  * @hideinitializer
  */
-$GLOBALS['PHPCAS_DEBUG']  = array('filename' => FALSE,
+$GLOBALS['PHPCAS_DEBUG'] = array (
+	'filename' => FALSE,
 	'indent' => 0,
-	'unique_id' => '');
+	'unique_id' => ''
+);
 
 /** @} */
 
@@ -290,7 +320,7 @@ $GLOBALS['PHPCAS_DEBUG']  = array('filename' => FALSE,
 // ########################################################################
 
 // include client class
-include_once(dirname(__FILE__).'/CAS/client.php');
+include_once (dirname(__FILE__) . '/CAS/client.php');
 
 // ########################################################################
 //  INTERFACE CLASS
@@ -308,20 +338,17 @@ include_once(dirname(__FILE__).'/CAS/client.php');
  * at the end of CAS/client.php).
  */
 
+class phpCAS {
 
-
-class phpCAS
-{
-	
 	// ########################################################################
 	//  INITIALIZATION
 	// ########################################################################
-	
+
 	/**
 	 * @addtogroup publicInit
 	 * @{
 	 */
-	
+
 	/**
 	 * phpCAS client initializer.
 	 * @note Only one of the phpCAS::client() and phpCAS::proxy functions should be
@@ -336,43 +363,41 @@ class phpCAS
 	 *
 	 * @return a newly created CASClient object
 	 */
-	function client($server_version,
-					$server_hostname,
-					$server_port,
-					$server_uri,
-					$start_session = true)
-		{
+	function client($server_version, $server_hostname, $server_port, $server_uri, $start_session = true) {
 		global $PHPCAS_CLIENT, $PHPCAS_INIT_CALL;
-		
-		phpCAS::traceBegin();
-		if ( is_object($PHPCAS_CLIENT) ) {
-			phpCAS::error($PHPCAS_INIT_CALL['method'].'() has already been called (at '.$PHPCAS_INIT_CALL['file'].':'.$PHPCAS_INIT_CALL['line'].')');
+
+		phpCAS :: traceBegin();
+		if (is_object($PHPCAS_CLIENT)) {
+			phpCAS :: error($PHPCAS_INIT_CALL['method'] . '() has already been called (at ' . $PHPCAS_INIT_CALL['file'] . ':' . $PHPCAS_INIT_CALL['line'] . ')');
 		}
-		if ( gettype($server_version) != 'string' ) {
-			phpCAS::error('type mismatched for parameter $server_version (should be `string\')');
+		if (gettype($server_version) != 'string') {
+			phpCAS :: error('type mismatched for parameter $server_version (should be `string\')');
 		}
-		if ( gettype($server_hostname) != 'string' ) {
-			phpCAS::error('type mismatched for parameter $server_hostname (should be `string\')');
+		if (gettype($server_hostname) != 'string') {
+			phpCAS :: error('type mismatched for parameter $server_hostname (should be `string\')');
 		}
-		if ( gettype($server_port) != 'integer' ) {
-			phpCAS::error('type mismatched for parameter $server_port (should be `integer\')');
+		if (gettype($server_port) != 'integer') {
+			phpCAS :: error('type mismatched for parameter $server_port (should be `integer\')');
 		}
-		if ( gettype($server_uri) != 'string' ) {
-			phpCAS::error('type mismatched for parameter $server_uri (should be `string\')');
+		if (gettype($server_uri) != 'string') {
+			phpCAS :: error('type mismatched for parameter $server_uri (should be `string\')');
 		}
-		
+
 		// store where the initializer is called from
-		$dbg = phpCAS::backtrace();
-		$PHPCAS_INIT_CALL = array('done' => TRUE,
+		$dbg = phpCAS :: backtrace();
+		$PHPCAS_INIT_CALL = array (
+			'done' => TRUE,
 			'file' => $dbg[0]['file'],
 			'line' => $dbg[0]['line'],
-			'method' => __CLASS__.'::'.__FUNCTION__);
-		
+			'method' => __CLASS__ . '::' . __FUNCTION__
+		);
+
 		// initialize the global object $PHPCAS_CLIENT
-		$PHPCAS_CLIENT = new CASClient($server_version,FALSE/*proxy*/,$server_hostname,$server_port,$server_uri,$start_session);
-		phpCAS::traceEnd();
-		}
-	
+		$PHPCAS_CLIENT = new CASClient($server_version, FALSE /*proxy*/
+		, $server_hostname, $server_port, $server_uri, $start_session);
+		phpCAS :: traceEnd();
+	}
+
 	/**
 	 * phpCAS proxy initializer.
 	 * @note Only one of the phpCAS::client() and phpCAS::proxy functions should be
@@ -387,110 +412,107 @@ class phpCAS
 	 *
 	 * @return a newly created CASClient object
 	 */
-	function proxy($server_version,
-				   $server_hostname,
-				   $server_port,
-				   $server_uri,
-				   $start_session = true)
-		{
+	function proxy($server_version, $server_hostname, $server_port, $server_uri, $start_session = true) {
 		global $PHPCAS_CLIENT, $PHPCAS_INIT_CALL;
-		
-		phpCAS::traceBegin();
-		if ( is_object($PHPCAS_CLIENT) ) {
-			phpCAS::error($PHPCAS_INIT_CALL['method'].'() has already been called (at '.$PHPCAS_INIT_CALL['file'].':'.$PHPCAS_INIT_CALL['line'].')');
+
+		phpCAS :: traceBegin();
+		if (is_object($PHPCAS_CLIENT)) {
+			phpCAS :: error($PHPCAS_INIT_CALL['method'] . '() has already been called (at ' . $PHPCAS_INIT_CALL['file'] . ':' . $PHPCAS_INIT_CALL['line'] . ')');
 		}
-		if ( gettype($server_version) != 'string' ) {
-			phpCAS::error('type mismatched for parameter $server_version (should be `string\')');
+		if (gettype($server_version) != 'string') {
+			phpCAS :: error('type mismatched for parameter $server_version (should be `string\')');
 		}
-		if ( gettype($server_hostname) != 'string' ) {
-			phpCAS::error('type mismatched for parameter $server_hostname (should be `string\')');
+		if (gettype($server_hostname) != 'string') {
+			phpCAS :: error('type mismatched for parameter $server_hostname (should be `string\')');
 		}
-		if ( gettype($server_port) != 'integer' ) {
-			phpCAS::error('type mismatched for parameter $server_port (should be `integer\')');
+		if (gettype($server_port) != 'integer') {
+			phpCAS :: error('type mismatched for parameter $server_port (should be `integer\')');
 		}
-		if ( gettype($server_uri) != 'string' ) {
-			phpCAS::error('type mismatched for parameter $server_uri (should be `string\')');
+		if (gettype($server_uri) != 'string') {
+			phpCAS :: error('type mismatched for parameter $server_uri (should be `string\')');
 		}
-		
+
 		// store where the initialzer is called from
-		$dbg = phpCAS::backtrace();
-		$PHPCAS_INIT_CALL = array('done' => TRUE,
+		$dbg = phpCAS :: backtrace();
+		$PHPCAS_INIT_CALL = array (
+			'done' => TRUE,
 			'file' => $dbg[0]['file'],
 			'line' => $dbg[0]['line'],
-			'method' => __CLASS__.'::'.__FUNCTION__);
-		
+			'method' => __CLASS__ . '::' . __FUNCTION__
+		);
+
 		// initialize the global object $PHPCAS_CLIENT
-		$PHPCAS_CLIENT = new CASClient($server_version,TRUE/*proxy*/,$server_hostname,$server_port,$server_uri,$start_session);
-		phpCAS::traceEnd();
-		}
-	
+		$PHPCAS_CLIENT = new CASClient($server_version, TRUE /*proxy*/
+		, $server_hostname, $server_port, $server_uri, $start_session);
+		phpCAS :: traceEnd();
+	}
+
 	/** @} */
 	// ########################################################################
 	//  DEBUGGING
 	// ########################################################################
-	
+
 	/**
 	 * @addtogroup publicDebug
 	 * @{
 	 */
-	
+
 	/**
 	 * Set/unset debug mode
 	 *
 	 * @param $filename the name of the file used for logging, or FALSE to stop debugging.
 	 */
-	function setDebug($filename='')
-		{
+	function setDebug($filename = '') {
 		global $PHPCAS_DEBUG;
-		
-		if ( $filename != FALSE && gettype($filename) != 'string' ) {
-			phpCAS::error('type mismatched for parameter $dbg (should be FALSE or the name of the log file)');
+
+		if ($filename != FALSE && gettype($filename) != 'string') {
+			phpCAS :: error('type mismatched for parameter $dbg (should be FALSE or the name of the log file)');
 		}
-		
-		if ( empty($filename) ) {
-			if ( preg_match('/^Win.*/',getenv('OS')) ) {
-				if ( isset($_ENV['TMP']) ) {
-					$debugDir = $_ENV['TMP'].'/';
-				} else if ( isset($_ENV['TEMP']) ) {
-					$debugDir = $_ENV['TEMP'].'/';
-				} else {
-					$debugDir = '';
-				}
+
+		if (empty ($filename)) {
+			if (preg_match('/^Win.*/', getenv('OS'))) {
+				if (isset ($_ENV['TMP'])) {
+					$debugDir = $_ENV['TMP'] . '/';
+				} else
+					if (isset ($_ENV['TEMP'])) {
+						$debugDir = $_ENV['TEMP'] . '/';
+					} else {
+						$debugDir = '';
+					}
 			} else {
 				$debugDir = DEFAULT_DEBUG_DIR;
 			}
 			$filename = $debugDir . 'phpCAS.log';
 		}
-		
-		if ( empty($PHPCAS_DEBUG['unique_id']) ) {
-			$PHPCAS_DEBUG['unique_id'] = substr(strtoupper(md5(uniqid(''))),0,4);
+
+		if (empty ($PHPCAS_DEBUG['unique_id'])) {
+			$PHPCAS_DEBUG['unique_id'] = substr(strtoupper(md5(uniqid(''))), 0, 4);
 		}
-		
+
 		$PHPCAS_DEBUG['filename'] = $filename;
-		
-		phpCAS::trace('START ******************');
-		}
-	
+
+		phpCAS :: trace('START phpCAS-' . PHPCAS_VERSION . ' ******************');
+	}
+
 	/** @} */
 	/**
 	 * @addtogroup internalDebug
 	 * @{
 	 */
-	
+
 	/**
 	 * This method is a wrapper for debug_backtrace() that is not available 
 	 * in all PHP versions (>= 4.3.0 only)
 	 */
-	function backtrace()
-		{
-		if ( function_exists('debug_backtrace') ) {
+	function backtrace() {
+		if (function_exists('debug_backtrace')) {
 			return debug_backtrace();
 		} else {
 			// poor man's hack ... but it does work ...
-			return array();
+			return array ();
 		}
-		}
-	
+	}
+
 	/**
 	 * Logs a string in debug mode.
 	 *
@@ -498,20 +520,19 @@ class phpCAS
 	 *
 	 * @private
 	 */
-	function log($str)
-		{
+	function log($str) {
 		$indent_str = ".";
 		global $PHPCAS_DEBUG;
-		
-		if ( $PHPCAS_DEBUG['filename'] ) {
-			for ($i=0;$i<$PHPCAS_DEBUG['indent'];$i++) {
+
+		if ($PHPCAS_DEBUG['filename']) {
+			for ($i = 0; $i < $PHPCAS_DEBUG['indent']; $i++) {
 				$indent_str .= '|    ';
 			}
-			error_log($PHPCAS_DEBUG['unique_id'].' '.$indent_str.$str."\n",3,$PHPCAS_DEBUG['filename']);
+			error_log($PHPCAS_DEBUG['unique_id'] . ' ' . $indent_str . $str . "\n", 3, $PHPCAS_DEBUG['filename']);
 		}
-		
-		}
-	
+
+	}
+
 	/**
 	 * This method is used by interface methods to print an error and where the function
 	 * was originally called from.
@@ -520,16 +541,15 @@ class phpCAS
 	 *
 	 * @private
 	 */
-	function error($msg)
-		{
-		$dbg = phpCAS::backtrace();
+	function error($msg) {
+		$dbg = phpCAS :: backtrace();
 		$function = '?';
 		$file = '?';
 		$line = '?';
-		if ( is_array($dbg) ) {
-			for ( $i=1; $i<sizeof($dbg); $i++) {
-				if ( is_array($dbg[$i]) ) {
-					if ( $dbg[$i]['class'] == __CLASS__ ) {
+		if (is_array($dbg)) {
+			for ($i = 1; $i < sizeof($dbg); $i++) {
+				if (is_array($dbg[$i])) {
+					if ($dbg[$i]['class'] == __CLASS__) {
 						$function = $dbg[$i]['function'];
 						$file = $dbg[$i]['file'];
 						$line = $dbg[$i]['line'];
@@ -537,77 +557,73 @@ class phpCAS
 				}
 			}
 		}
-		echo "<br />\n<b>phpCAS error</b>: <font color=\"FF0000\"><b>".__CLASS__."::".$function.'(): '.htmlentities($msg)."</b></font> in <b>".$file."</b> on line <b>".$line."</b><br />\n";
-		phpCAS::trace($msg);
-		phpCAS::traceExit();
-		exit();
-		}
-	
+		echo "<br />\n<b>phpCAS error</b>: <font color=\"FF0000\"><b>" . __CLASS__ . "::" . $function . '(): ' . htmlentities($msg) . "</b></font> in <b>" . $file . "</b> on line <b>" . $line . "</b><br />\n";
+		phpCAS :: trace($msg);
+		phpCAS :: traceExit();
+		exit ();
+	}
+
 	/**
 	 * This method is used to log something in debug mode.
 	 */
-	function trace($str)
-		{
-		$dbg = phpCAS::backtrace();
-		phpCAS::log($str.' ['.basename($dbg[1]['file']).':'.$dbg[1]['line'].']');
-		}
-	
+	function trace($str) {
+		$dbg = phpCAS :: backtrace();
+		phpCAS :: log($str . ' [' . basename($dbg[1]['file']) . ':' . $dbg[1]['line'] . ']');
+	}
+
 	/**
 	 * This method is used to indicate the start of the execution of a function in debug mode.
 	 */
-	function traceBegin()
-		{
+	function traceBegin() {
 		global $PHPCAS_DEBUG;
-		
-		$dbg = phpCAS::backtrace();
+
+		$dbg = phpCAS :: backtrace();
 		$str = '=> ';
-		if ( !empty($dbg[2]['class']) ) {
-			$str .= $dbg[2]['class'].'::';
+		if (!empty ($dbg[2]['class'])) {
+			$str .= $dbg[2]['class'] . '::';
 		}
-		$str .= $dbg[2]['function'].'(';      
-		if ( is_array($dbg[2]['args']) ) {
+		$str .= $dbg[2]['function'] . '(';
+		if (is_array($dbg[2]['args'])) {
 			foreach ($dbg[2]['args'] as $index => $arg) {
-				if ( $index != 0 ) {
+				if ($index != 0) {
 					$str .= ', ';
 				}
-				$str .= str_replace("\n","",var_export($arg,TRUE));
+				$str .= str_replace("\n", "", var_export($arg, TRUE));
 			}
 		}
-		$str .= ') ['.basename($dbg[2]['file']).':'.$dbg[2]['line'].']';
-		phpCAS::log($str);
-		$PHPCAS_DEBUG['indent'] ++;
-		}
-	
+		$str .= ') [' . basename($dbg[2]['file']) . ':' . $dbg[2]['line'] . ']';
+		phpCAS :: log($str);
+		$PHPCAS_DEBUG['indent']++;
+	}
+
 	/**
 	 * This method is used to indicate the end of the execution of a function in debug mode.
 	 *
 	 * @param $res the result of the function
 	 */
-	function traceEnd($res='')
-		{
+	function traceEnd($res = '') {
 		global $PHPCAS_DEBUG;
-		
-		$PHPCAS_DEBUG['indent'] --;
-		$dbg = phpCAS::backtrace();
+
+		$PHPCAS_DEBUG['indent']--;
+		$dbg = phpCAS :: backtrace();
 		$str = '';
-		$str .= '<= '.str_replace("\n","",var_export($res,TRUE));
-		phpCAS::log($str);
-		}
-	
+		$str .= '<= ' . str_replace("\n", "", var_export($res, TRUE));
+		phpCAS :: log($str);
+	}
+
 	/**
 	 * This method is used to indicate the end of the execution of the program
 	 */
-	function traceExit()
-		{
+	function traceExit() {
 		global $PHPCAS_DEBUG;
-		
-		phpCAS::log('exit()');
-		while ( $PHPCAS_DEBUG['indent'] > 0 ) {
-			phpCAS::log('-');
-			$PHPCAS_DEBUG['indent'] --;
+
+		phpCAS :: log('exit()');
+		while ($PHPCAS_DEBUG['indent'] > 0) {
+			phpCAS :: log('-');
+			$PHPCAS_DEBUG['indent']--;
 		}
-		}
-	
+	}
+
 	/** @} */
 	// ########################################################################
 	//  INTERNATIONALIZATION
@@ -616,7 +632,7 @@ class phpCAS
 	 * @addtogroup publicLang
 	 * @{
 	 */
-	
+
 	/**
 	 * This method is used to set the language used by phpCAS. 
 	 * @note Can be called only once.
@@ -625,18 +641,17 @@ class phpCAS
 	 *
 	 * @sa PHPCAS_LANG_FRENCH, PHPCAS_LANG_ENGLISH
 	 */
-	function setLang($lang)
-		{
+	function setLang($lang) {
 		global $PHPCAS_CLIENT;
-		if ( !is_object($PHPCAS_CLIENT) ) {
-			phpCAS::error('this method should not be called before '.__CLASS__.'::client() or '.__CLASS__.'::proxy()');
+		if (!is_object($PHPCAS_CLIENT)) {
+			phpCAS :: error('this method should not be called before ' . __CLASS__ . '::client() or ' . __CLASS__ . '::proxy()');
 		}
-		if ( gettype($lang) != 'string' ) {
-			phpCAS::error('type mismatched for parameter $lang (should be `string\')');
+		if (gettype($lang) != 'string') {
+			phpCAS :: error('type mismatched for parameter $lang (should be `string\')');
 		}
 		$PHPCAS_CLIENT->setLang($lang);
-		}
-	
+	}
+
 	/** @} */
 	// ########################################################################
 	//  VERSION
@@ -645,17 +660,16 @@ class phpCAS
 	 * @addtogroup public
 	 * @{
 	 */
-	
+
 	/**
 	 * This method returns the phpCAS version.
 	 *
 	 * @return the phpCAS version.
 	 */
-	function getVersion()
-		{
+	function getVersion() {
 		return PHPCAS_VERSION;
-		}
-	
+	}
+
 	/** @} */
 	// ########################################################################
 	//  HTML OUTPUT
@@ -664,41 +678,39 @@ class phpCAS
 	 * @addtogroup publicOutput
 	 * @{
 	 */
-	
+
 	/**
 	 * This method sets the HTML header used for all outputs.
 	 *
 	 * @param $header the HTML header.
 	 */
-	function setHTMLHeader($header)
-		{
+	function setHTMLHeader($header) {
 		global $PHPCAS_CLIENT;
-		if ( !is_object($PHPCAS_CLIENT) ) {
-			phpCAS::error('this method should not be called before '.__CLASS__.'::client() or '.__CLASS__.'::proxy()');
+		if (!is_object($PHPCAS_CLIENT)) {
+			phpCAS :: error('this method should not be called before ' . __CLASS__ . '::client() or ' . __CLASS__ . '::proxy()');
 		}
-		if ( gettype($header) != 'string' ) {
-			phpCAS::error('type mismatched for parameter $header (should be `string\')');
+		if (gettype($header) != 'string') {
+			phpCAS :: error('type mismatched for parameter $header (should be `string\')');
 		}
 		$PHPCAS_CLIENT->setHTMLHeader($header);
-		}
-	
+	}
+
 	/**
 	 * This method sets the HTML footer used for all outputs.
 	 *
 	 * @param $footer the HTML footer.
 	 */
-	function setHTMLFooter($footer)
-		{
+	function setHTMLFooter($footer) {
 		global $PHPCAS_CLIENT;
-		if ( !is_object($PHPCAS_CLIENT) ) {
-			phpCAS::error('this method should not be called before '.__CLASS__.'::client() or '.__CLASS__.'::proxy()');
+		if (!is_object($PHPCAS_CLIENT)) {
+			phpCAS :: error('this method should not be called before ' . __CLASS__ . '::client() or ' . __CLASS__ . '::proxy()');
 		}
-		if ( gettype($footer) != 'string' ) {
-			phpCAS::error('type mismatched for parameter $footer (should be `string\')');
+		if (gettype($footer) != 'string') {
+			phpCAS :: error('type mismatched for parameter $footer (should be `string\')');
 		}
 		$PHPCAS_CLIENT->setHTMLFooter($footer);
-		}
-	
+	}
+
 	/** @} */
 	// ########################################################################
 	//  PGT STORAGE
@@ -707,7 +719,7 @@ class phpCAS
 	 * @addtogroup publicPGTStorage
 	 * @{
 	 */
-	
+
 	/**
 	 * This method is used to tell phpCAS to store the response of the
 	 * CAS server to PGT requests onto the filesystem. 
@@ -715,31 +727,29 @@ class phpCAS
 	 * @param $format the format used to store the PGT's (`plain' and `xml' allowed)
 	 * @param $path the path where the PGT's should be stored
 	 */
-	function setPGTStorageFile($format='',
-		$path='')
-		{
-		global $PHPCAS_CLIENT,$PHPCAS_AUTH_CHECK_CALL;
-		
-		phpCAS::traceBegin();
-		if ( !is_object($PHPCAS_CLIENT) ) {
-			phpCAS::error('this method should only be called after '.__CLASS__.'::proxy()');
+	function setPGTStorageFile($format = '', $path = '') {
+		global $PHPCAS_CLIENT, $PHPCAS_AUTH_CHECK_CALL;
+
+		phpCAS :: traceBegin();
+		if (!is_object($PHPCAS_CLIENT)) {
+			phpCAS :: error('this method should only be called after ' . __CLASS__ . '::proxy()');
 		}
-		if ( !$PHPCAS_CLIENT->isProxy() ) {
-			phpCAS::error('this method should only be called after '.__CLASS__.'::proxy()');
+		if (!$PHPCAS_CLIENT->isProxy()) {
+			phpCAS :: error('this method should only be called after ' . __CLASS__ . '::proxy()');
 		}
-		if ( $PHPCAS_AUTH_CHECK_CALL['done'] ) {
-			phpCAS::error('this method should only be called before '.$PHPCAS_AUTH_CHECK_CALL['method'].'() (called at '.$PHPCAS_AUTH_CHECK_CALL['file'].':'.$PHPCAS_AUTH_CHECK_CALL['line'].')');
+		if ($PHPCAS_AUTH_CHECK_CALL['done']) {
+			phpCAS :: error('this method should only be called before ' . $PHPCAS_AUTH_CHECK_CALL['method'] . '() (called at ' . $PHPCAS_AUTH_CHECK_CALL['file'] . ':' . $PHPCAS_AUTH_CHECK_CALL['line'] . ')');
 		}
-		if ( gettype($format) != 'string' ) {
-			phpCAS::error('type mismatched for parameter $format (should be `string\')');
+		if (gettype($format) != 'string') {
+			phpCAS :: error('type mismatched for parameter $format (should be `string\')');
 		}
-		if ( gettype($path) != 'string' ) {
-			phpCAS::error('type mismatched for parameter $format (should be `string\')');
+		if (gettype($path) != 'string') {
+			phpCAS :: error('type mismatched for parameter $format (should be `string\')');
 		}
-		$PHPCAS_CLIENT->setPGTStorageFile($format,$path);
-		phpCAS::traceEnd();
-		}
-	
+		$PHPCAS_CLIENT->setPGTStorageFile($format, $path);
+		phpCAS :: traceEnd();
+	}
+
 	/**
 	 * This method is used to tell phpCAS to store the response of the
 	 * CAS server to PGT requests into a database. 
@@ -755,51 +765,44 @@ class phpCAS
 	 * @param $database the name of the database
 	 * @param $table the name of the table storing the data
 	 */
-	function setPGTStorageDB($user,
-							 $password,
-							 $database_type='',
-								 $hostname='',
-									 $port=0,
-										 $database='',
-											 $table='')
-		{
-		global $PHPCAS_CLIENT,$PHPCAS_AUTH_CHECK_CALL;
-		
-		phpCAS::traceBegin();
-		if ( !is_object($PHPCAS_CLIENT) ) {
-			phpCAS::error('this method should only be called after '.__CLASS__.'::proxy()');
+	function setPGTStorageDB($user, $password, $database_type = '', $hostname = '', $port = 0, $database = '', $table = '') {
+		global $PHPCAS_CLIENT, $PHPCAS_AUTH_CHECK_CALL;
+
+		phpCAS :: traceBegin();
+		if (!is_object($PHPCAS_CLIENT)) {
+			phpCAS :: error('this method should only be called after ' . __CLASS__ . '::proxy()');
 		}
-		if ( !$PHPCAS_CLIENT->isProxy() ) {
-			phpCAS::error('this method should only be called after '.__CLASS__.'::proxy()');
+		if (!$PHPCAS_CLIENT->isProxy()) {
+			phpCAS :: error('this method should only be called after ' . __CLASS__ . '::proxy()');
 		}
-		if ( $PHPCAS_AUTH_CHECK_CALL['done'] ) {
-			phpCAS::error('this method should only be called before '.$PHPCAS_AUTH_CHECK_CALL['method'].'() (called at '.$PHPCAS_AUTH_CHECK_CALL['file'].':'.$PHPCAS_AUTH_CHECK_CALL['line'].')');
+		if ($PHPCAS_AUTH_CHECK_CALL['done']) {
+			phpCAS :: error('this method should only be called before ' . $PHPCAS_AUTH_CHECK_CALL['method'] . '() (called at ' . $PHPCAS_AUTH_CHECK_CALL['file'] . ':' . $PHPCAS_AUTH_CHECK_CALL['line'] . ')');
 		}
-		if ( gettype($user) != 'string' ) {
-			phpCAS::error('type mismatched for parameter $user (should be `string\')');
+		if (gettype($user) != 'string') {
+			phpCAS :: error('type mismatched for parameter $user (should be `string\')');
 		}
-		if ( gettype($password) != 'string' ) {
-			phpCAS::error('type mismatched for parameter $password (should be `string\')');
+		if (gettype($password) != 'string') {
+			phpCAS :: error('type mismatched for parameter $password (should be `string\')');
 		}
-		if ( gettype($database_type) != 'string' ) {
-			phpCAS::error('type mismatched for parameter $database_type (should be `string\')');
+		if (gettype($database_type) != 'string') {
+			phpCAS :: error('type mismatched for parameter $database_type (should be `string\')');
 		}
-		if ( gettype($hostname) != 'string' ) {
-			phpCAS::error('type mismatched for parameter $hostname (should be `string\')');
+		if (gettype($hostname) != 'string') {
+			phpCAS :: error('type mismatched for parameter $hostname (should be `string\')');
 		}
-		if ( gettype($port) != 'integer' ) {
-			phpCAS::error('type mismatched for parameter $port (should be `integer\')');
+		if (gettype($port) != 'integer') {
+			phpCAS :: error('type mismatched for parameter $port (should be `integer\')');
 		}
-		if ( gettype($database) != 'string' ) {
-			phpCAS::error('type mismatched for parameter $database (should be `string\')');
+		if (gettype($database) != 'string') {
+			phpCAS :: error('type mismatched for parameter $database (should be `string\')');
 		}
-		if ( gettype($table) != 'string' ) {
-			phpCAS::error('type mismatched for parameter $table (should be `string\')');
+		if (gettype($table) != 'string') {
+			phpCAS :: error('type mismatched for parameter $table (should be `string\')');
 		}
-		$PHPCAS_CLIENT->setPGTStorageDB($user,$password,$database_type,$hostname,$port,$database,$table);
-		phpCAS::traceEnd();
-		}
-	
+		$PHPCAS_CLIENT->setPGTStorageDB($user, $password, $database_type, $hostname, $port, $database, $table);
+		phpCAS :: traceEnd();
+	}
+
 	/** @} */
 	// ########################################################################
 	// ACCESS TO EXTERNAL SERVICES
@@ -808,7 +811,7 @@ class phpCAS
 	 * @addtogroup publicServices
 	 * @{
 	 */
-	
+
 	/**
 	 * This method is used to access an HTTP[S] service.
 	 * 
@@ -822,33 +825,32 @@ class phpCAS
 	 * @return TRUE on success, FALSE otherwise (in this later case, $err_code
 	 * gives the reason why it failed and $output contains an error message).
 	 */
-	function serviceWeb($url,&$err_code,&$output)
-		{
+	function serviceWeb($url, & $err_code, & $output) {
 		global $PHPCAS_CLIENT, $PHPCAS_AUTH_CHECK_CALL;
-		
-		phpCAS::traceBegin();
-		if ( !is_object($PHPCAS_CLIENT) ) {
-			phpCAS::error('this method should only be called after '.__CLASS__.'::proxy()');
+
+		phpCAS :: traceBegin();
+		if (!is_object($PHPCAS_CLIENT)) {
+			phpCAS :: error('this method should only be called after ' . __CLASS__ . '::proxy()');
 		}
-		if ( !$PHPCAS_CLIENT->isProxy() ) {
-			phpCAS::error('this method should only be called after '.__CLASS__.'::proxy()');
+		if (!$PHPCAS_CLIENT->isProxy()) {
+			phpCAS :: error('this method should only be called after ' . __CLASS__ . '::proxy()');
 		}
-		if ( !$PHPCAS_AUTH_CHECK_CALL['done'] ) {
-			phpCAS::error('this method should only be called after the programmer is sure the user has been authenticated (by calling '.__CLASS__.'::checkAuthentication() or '.__CLASS__.'::forceAuthentication()');
+		if (!$PHPCAS_AUTH_CHECK_CALL['done']) {
+			phpCAS :: error('this method should only be called after the programmer is sure the user has been authenticated (by calling ' . __CLASS__ . '::checkAuthentication() or ' . __CLASS__ . '::forceAuthentication()');
 		}
-		if ( !$PHPCAS_AUTH_CHECK_CALL['result'] ) {
-			phpCAS::error('authentication was checked (by '.$PHPCAS_AUTH_CHECK_CALL['method'].'() at '.$PHPCAS_AUTH_CHECK_CALL['file'].':'.$PHPCAS_AUTH_CHECK_CALL['line'].') but the method returned FALSE');
+		if (!$PHPCAS_AUTH_CHECK_CALL['result']) {
+			phpCAS :: error('authentication was checked (by ' . $PHPCAS_AUTH_CHECK_CALL['method'] . '() at ' . $PHPCAS_AUTH_CHECK_CALL['file'] . ':' . $PHPCAS_AUTH_CHECK_CALL['line'] . ') but the method returned FALSE');
 		}
-		if ( gettype($url) != 'string' ) {
-			phpCAS::error('type mismatched for parameter $url (should be `string\')');
+		if (gettype($url) != 'string') {
+			phpCAS :: error('type mismatched for parameter $url (should be `string\')');
 		}
-		
-		$res = $PHPCAS_CLIENT->serviceWeb($url,$err_code,$output);
-		
-		phpCAS::traceEnd($res);
+
+		$res = $PHPCAS_CLIENT->serviceWeb($url, $err_code, $output);
+
+		phpCAS :: traceEnd($res);
 		return $res;
-		}
-	
+	}
+
 	/**
 	 * This method is used to access an IMAP/POP3/NNTP service.
 	 * 
@@ -866,37 +868,36 @@ class phpCAS
 	 * @return an IMAP stream on success, FALSE otherwise (in this later case, $err_code
 	 * gives the reason why it failed and $err_msg contains an error message).
 	 */
-	function serviceMail($url,$service,$flags,&$err_code,&$err_msg,&$pt)
-		{
+	function serviceMail($url, $service, $flags, & $err_code, & $err_msg, & $pt) {
 		global $PHPCAS_CLIENT, $PHPCAS_AUTH_CHECK_CALL;
-		
-		phpCAS::traceBegin();
-		if ( !is_object($PHPCAS_CLIENT) ) {
-			phpCAS::error('this method should only be called after '.__CLASS__.'::proxy()');
+
+		phpCAS :: traceBegin();
+		if (!is_object($PHPCAS_CLIENT)) {
+			phpCAS :: error('this method should only be called after ' . __CLASS__ . '::proxy()');
 		}
-		if ( !$PHPCAS_CLIENT->isProxy() ) {
-			phpCAS::error('this method should only be called after '.__CLASS__.'::proxy()');
+		if (!$PHPCAS_CLIENT->isProxy()) {
+			phpCAS :: error('this method should only be called after ' . __CLASS__ . '::proxy()');
 		}
-		if ( !$PHPCAS_AUTH_CHECK_CALL['done'] ) {
-			phpCAS::error('this method should only be called after the programmer is sure the user has been authenticated (by calling '.__CLASS__.'::checkAuthentication() or '.__CLASS__.'::forceAuthentication()');
+		if (!$PHPCAS_AUTH_CHECK_CALL['done']) {
+			phpCAS :: error('this method should only be called after the programmer is sure the user has been authenticated (by calling ' . __CLASS__ . '::checkAuthentication() or ' . __CLASS__ . '::forceAuthentication()');
 		}
-		if ( !$PHPCAS_AUTH_CHECK_CALL['result'] ) {
-			phpCAS::error('authentication was checked (by '.$PHPCAS_AUTH_CHECK_CALL['method'].'() at '.$PHPCAS_AUTH_CHECK_CALL['file'].':'.$PHPCAS_AUTH_CHECK_CALL['line'].') but the method returned FALSE');
+		if (!$PHPCAS_AUTH_CHECK_CALL['result']) {
+			phpCAS :: error('authentication was checked (by ' . $PHPCAS_AUTH_CHECK_CALL['method'] . '() at ' . $PHPCAS_AUTH_CHECK_CALL['file'] . ':' . $PHPCAS_AUTH_CHECK_CALL['line'] . ') but the method returned FALSE');
 		}
-		if ( gettype($url) != 'string' ) {
-			phpCAS::error('type mismatched for parameter $url (should be `string\')');
+		if (gettype($url) != 'string') {
+			phpCAS :: error('type mismatched for parameter $url (should be `string\')');
 		}
-		
-		if ( gettype($flags) != 'integer' ) {
-			phpCAS::error('type mismatched for parameter $flags (should be `integer\')');
+
+		if (gettype($flags) != 'integer') {
+			phpCAS :: error('type mismatched for parameter $flags (should be `integer\')');
 		}
-		
-		$res = $PHPCAS_CLIENT->serviceMail($url,$service,$flags,$err_code,$err_msg,$pt);
-		
-		phpCAS::traceEnd($res);
+
+		$res = $PHPCAS_CLIENT->serviceMail($url, $service, $flags, $err_code, $err_msg, $pt);
+
+		phpCAS :: traceEnd($res);
 		return $res;
-		}
-	
+	}
+
 	/** @} */
 	// ########################################################################
 	//  AUTHENTICATION
@@ -905,7 +906,7 @@ class phpCAS
 	 * @addtogroup publicAuth
 	 * @{
 	 */
-	
+
 	/**
 	 * Set the times authentication will be cached before really accessing the CAS server in gateway mode: 
 	 * - -1: check only once, and then never again (until you pree login)
@@ -914,150 +915,156 @@ class phpCAS
 	 *
 	 * @param $n an integer.
 	 */
-	function setCacheTimesForAuthRecheck($n)
-		{
+	function setCacheTimesForAuthRecheck($n) {
 		global $PHPCAS_CLIENT;
-		if ( !is_object($PHPCAS_CLIENT) ) {
-			phpCAS::error('this method should not be called before '.__CLASS__.'::client() or '.__CLASS__.'::proxy()');
+		if (!is_object($PHPCAS_CLIENT)) {
+			phpCAS :: error('this method should not be called before ' . __CLASS__ . '::client() or ' . __CLASS__ . '::proxy()');
 		}
-		if ( gettype($n) != 'integer' ) {
-			phpCAS::error('type mismatched for parameter $header (should be `string\')');
+		if (gettype($n) != 'integer') {
+			phpCAS :: error('type mismatched for parameter $header (should be `string\')');
 		}
 		$PHPCAS_CLIENT->setCacheTimesForAuthRecheck($n);
-		}
-	
+	}
+
 	/**
 	 * This method is called to check if the user is authenticated (use the gateway feature).
 	 * @return TRUE when the user is authenticated; otherwise FALSE.
 	 */
-	function checkAuthentication()
-		{
+	function checkAuthentication() {
 		global $PHPCAS_CLIENT, $PHPCAS_AUTH_CHECK_CALL;
-		
-		phpCAS::traceBegin();
-		if ( !is_object($PHPCAS_CLIENT) ) {
-			phpCAS::error('this method should not be called before '.__CLASS__.'::client() or '.__CLASS__.'::proxy()');
+
+		phpCAS :: traceBegin();
+		if (!is_object($PHPCAS_CLIENT)) {
+			phpCAS :: error('this method should not be called before ' . __CLASS__ . '::client() or ' . __CLASS__ . '::proxy()');
 		}
-		
+
 		$auth = $PHPCAS_CLIENT->checkAuthentication();
-		
+
 		// store where the authentication has been checked and the result
-		$dbg = phpCAS::backtrace();
-		$PHPCAS_AUTH_CHECK_CALL = array('done' => TRUE,
+		$dbg = phpCAS :: backtrace();
+		$PHPCAS_AUTH_CHECK_CALL = array (
+			'done' => TRUE,
 			'file' => $dbg[0]['file'],
 			'line' => $dbg[0]['line'],
-			'method' => __CLASS__.'::'.__FUNCTION__,
-			'result' => $auth );
-		phpCAS::traceEnd($auth);
-		return $auth; 
-		}
+			'method' => __CLASS__ . '::' . __FUNCTION__,
+			'result' => $auth
+		);
+		phpCAS :: traceEnd($auth);
+		return $auth;
+	}
 
 	/**
 	 * This method is called to force authentication if the user was not already 
 	 * authenticated. If the user is not authenticated, halt by redirecting to 
 	 * the CAS server.
 	 */
-	function forceAuthentication()
-		{
+	function forceAuthentication() {
 		global $PHPCAS_CLIENT, $PHPCAS_AUTH_CHECK_CALL;
-		
-		phpCAS::traceBegin();
-		if ( !is_object($PHPCAS_CLIENT) ) {
-			phpCAS::error('this method should not be called before '.__CLASS__.'::client() or '.__CLASS__.'::proxy()');
+
+		phpCAS :: traceBegin();
+		if (!is_object($PHPCAS_CLIENT)) {
+			phpCAS :: error('this method should not be called before ' . __CLASS__ . '::client() or ' . __CLASS__ . '::proxy()');
 		}
-		
+
 		$auth = $PHPCAS_CLIENT->forceAuthentication();
-		
+
 		// store where the authentication has been checked and the result
-		$dbg = phpCAS::backtrace();
-		$PHPCAS_AUTH_CHECK_CALL = array('done' => TRUE,
+		$dbg = phpCAS :: backtrace();
+		$PHPCAS_AUTH_CHECK_CALL = array (
+			'done' => TRUE,
 			'file' => $dbg[0]['file'],
 			'line' => $dbg[0]['line'],
-			'method' => __CLASS__.'::'.__FUNCTION__,
-			'result' => $auth );
-		
-		if ( !$auth ) {
-			phpCAS::trace('user is not authenticated, redirecting to the CAS server');
+			'method' => __CLASS__ . '::' . __FUNCTION__,
+			'result' => $auth
+		);
+
+		if (!$auth) {
+			phpCAS :: trace('user is not authenticated, redirecting to the CAS server');
 			$PHPCAS_CLIENT->forceAuthentication();
 		} else {
-			phpCAS::trace('no need to authenticate (user `'.phpCAS::getUser().'\' is already authenticated)');
+			phpCAS :: trace('no need to authenticate (user `' . phpCAS :: getUser() . '\' is already authenticated)');
 		}
-		
-		phpCAS::traceEnd();
-		return $auth; 
-		}
-	
+
+		phpCAS :: traceEnd();
+		return $auth;
+	}
+
 	/**
 	 * This method is called to renew the authentication.
 	 **/
 	function renewAuthentication() {
 		global $PHPCAS_CLIENT, $PHPCAS_AUTH_CHECK_CALL;
-		
-		phpCAS::traceBegin();
-		if ( !is_object($PHPCAS_CLIENT) ) {
-			phpCAS::error('this method should not be called before'.__CLASS__.'::client() or '.__CLASS__.'::proxy()');
+
+		phpCAS :: traceBegin();
+		if (!is_object($PHPCAS_CLIENT)) {
+			phpCAS :: error('this method should not be called before' . __CLASS__ . '::client() or ' . __CLASS__ . '::proxy()');
 		}
-		
+
 		// store where the authentication has been checked and the result
-		$dbg = phpCAS::backtrace();
-		$PHPCAS_AUTH_CHECK_CALL = array('done' => TRUE, 'file' => $dbg[0]['file'], 'line' => $dbg[0]['line'], 'method' => __CLASS__.'::'.__FUNCTION__, 'result' => $auth );
-		
+		$dbg = phpCAS :: backtrace();
+		$PHPCAS_AUTH_CHECK_CALL = array (
+			'done' => TRUE,
+			'file' => $dbg[0]['file'],
+			'line' => $dbg[0]['line'],
+			'method' => __CLASS__ . '::' . __FUNCTION__,
+			'result' => $auth
+		);
+
 		$PHPCAS_CLIENT->renewAuthentication();
-		phpCAS::traceEnd();
+		phpCAS :: traceEnd();
 	}
 
 	/**
 	 * This method has been left from version 0.4.1 for compatibility reasons.
 	 */
-	function authenticate()
-		{
-		phpCAS::error('this method is deprecated. You should use '.__CLASS__.'::forceAuthentication() instead');
-		}
-	
+	function authenticate() {
+		phpCAS :: error('this method is deprecated. You should use ' . __CLASS__ . '::forceAuthentication() instead');
+	}
+
 	/**
 	 * This method is called to check if the user is authenticated (previously or by
 	 * tickets given in the URL).
 	 *
 	 * @return TRUE when the user is authenticated.
 	 */
-	function isAuthenticated()
-		{
+	function isAuthenticated() {
 		global $PHPCAS_CLIENT, $PHPCAS_AUTH_CHECK_CALL;
-		
-		phpCAS::traceBegin();
-		if ( !is_object($PHPCAS_CLIENT) ) {
-			phpCAS::error('this method should not be called before '.__CLASS__.'::client() or '.__CLASS__.'::proxy()');
+
+		phpCAS :: traceBegin();
+		if (!is_object($PHPCAS_CLIENT)) {
+			phpCAS :: error('this method should not be called before ' . __CLASS__ . '::client() or ' . __CLASS__ . '::proxy()');
 		}
-		
+
 		// call the isAuthenticated method of the global $PHPCAS_CLIENT object
 		$auth = $PHPCAS_CLIENT->isAuthenticated();
-		
+
 		// store where the authentication has been checked and the result
-		$dbg = phpCAS::backtrace();
-		$PHPCAS_AUTH_CHECK_CALL = array('done' => TRUE,
+		$dbg = phpCAS :: backtrace();
+		$PHPCAS_AUTH_CHECK_CALL = array (
+			'done' => TRUE,
 			'file' => $dbg[0]['file'],
 			'line' => $dbg[0]['line'],
-			'method' => __CLASS__.'::'.__FUNCTION__,
-			'result' => $auth );
-		phpCAS::traceEnd($auth);
+			'method' => __CLASS__ . '::' . __FUNCTION__,
+			'result' => $auth
+		);
+		phpCAS :: traceEnd($auth);
 		return $auth;
-		}
-	
+	}
+
 	/**
 	 * Checks whether authenticated based on $_SESSION. Useful to avoid
 	 * server calls.
 	 * @return true if authenticated, false otherwise.
 	 * @since 0.4.22 by Brendan Arnold
 	 */
-	function isSessionAuthenticated ()
-		{
+	function isSessionAuthenticated() {
 		global $PHPCAS_CLIENT;
-		if ( !is_object($PHPCAS_CLIENT) ) {
-			phpCAS::error('this method should not be called before '.__CLASS__.'::client() or '.__CLASS__.'::proxy()');
+		if (!is_object($PHPCAS_CLIENT)) {
+			phpCAS :: error('this method should not be called before ' . __CLASS__ . '::client() or ' . __CLASS__ . '::proxy()');
 		}
-		return($PHPCAS_CLIENT->isSessionAuthenticated());
-		}
-	
+		return ($PHPCAS_CLIENT->isSessionAuthenticated());
+	}
+
 	/**
 	 * This method returns the CAS user's login name.
 	 * @warning should not be called only after phpCAS::forceAuthentication()
@@ -1065,21 +1072,20 @@ class phpCAS
 	 *
 	 * @return the login name of the authenticated user
 	 */
-	function getUser()
-		{
+	function getUser() {
 		global $PHPCAS_CLIENT, $PHPCAS_AUTH_CHECK_CALL;
-		if ( !is_object($PHPCAS_CLIENT) ) {
-			phpCAS::error('this method should not be called before '.__CLASS__.'::client() or '.__CLASS__.'::proxy()');
+		if (!is_object($PHPCAS_CLIENT)) {
+			phpCAS :: error('this method should not be called before ' . __CLASS__ . '::client() or ' . __CLASS__ . '::proxy()');
 		}
-		if ( !$PHPCAS_AUTH_CHECK_CALL['done'] ) {
-			phpCAS::error('this method should only be called after '.__CLASS__.'::forceAuthentication() or '.__CLASS__.'::isAuthenticated()');
+		if (!$PHPCAS_AUTH_CHECK_CALL['done']) {
+			phpCAS :: error('this method should only be called after ' . __CLASS__ . '::forceAuthentication() or ' . __CLASS__ . '::isAuthenticated()');
 		}
-		if ( !$PHPCAS_AUTH_CHECK_CALL['result'] ) {
-			phpCAS::error('authentication was checked (by '.$PHPCAS_AUTH_CHECK_CALL['method'].'() at '.$PHPCAS_AUTH_CHECK_CALL['file'].':'.$PHPCAS_AUTH_CHECK_CALL['line'].') but the method returned FALSE');
+		if (!$PHPCAS_AUTH_CHECK_CALL['result']) {
+			phpCAS :: error('authentication was checked (by ' . $PHPCAS_AUTH_CHECK_CALL['method'] . '() at ' . $PHPCAS_AUTH_CHECK_CALL['file'] . ':' . $PHPCAS_AUTH_CHECK_CALL['line'] . ') but the method returned FALSE');
 		}
 		return $PHPCAS_CLIENT->getUser();
-		}
-	
+	}
+
 	/**
 	 * This method returns the CAS user's login name.
 	 * @warning should not be called only after phpCAS::forceAuthentication()
@@ -1087,169 +1093,160 @@ class phpCAS
 	 *
 	 * @return the login name of the authenticated user
 	 */
-	function getAttributes()
-		{
+	function getAttributes() {
 		global $PHPCAS_CLIENT, $PHPCAS_AUTH_CHECK_CALL;
-		if ( !is_object($PHPCAS_CLIENT) ) {
-			phpCAS::error('this method should not be called before '.__CLASS__.'::client() or '.__CLASS__.'::proxy()');
+		if (!is_object($PHPCAS_CLIENT)) {
+			phpCAS :: error('this method should not be called before ' . __CLASS__ . '::client() or ' . __CLASS__ . '::proxy()');
 		}
-		if ( !$PHPCAS_AUTH_CHECK_CALL['done'] ) {
-			phpCAS::error('this method should only be called after '.__CLASS__.'::forceAuthentication() or '.__CLASS__.'::isAuthenticated()');
+		if (!$PHPCAS_AUTH_CHECK_CALL['done']) {
+			phpCAS :: error('this method should only be called after ' . __CLASS__ . '::forceAuthentication() or ' . __CLASS__ . '::isAuthenticated()');
 		}
-		if ( !$PHPCAS_AUTH_CHECK_CALL['result'] ) {
-			phpCAS::error('authentication was checked (by '.$PHPCAS_AUTH_CHECK_CALL['method'].'() at '.$PHPCAS_AUTH_CHECK_CALL['file'].':'.$PHPCAS_AUTH_CHECK_CALL['line'].') but the method returned FALSE');
+		if (!$PHPCAS_AUTH_CHECK_CALL['result']) {
+			phpCAS :: error('authentication was checked (by ' . $PHPCAS_AUTH_CHECK_CALL['method'] . '() at ' . $PHPCAS_AUTH_CHECK_CALL['file'] . ':' . $PHPCAS_AUTH_CHECK_CALL['line'] . ') but the method returned FALSE');
 		}
 		return $PHPCAS_CLIENT->getAttributes();
+	}
+	/**
+	 * Handle logout requests.
+	 */
+	function handleLogoutRequests($check_client = true, $allowed_clients = false) {
+		global $PHPCAS_CLIENT;
+		if (!is_object($PHPCAS_CLIENT)) {
+			phpCAS :: error('this method should not be called before ' . __CLASS__ . '::client() or ' . __CLASS__ . '::proxy()');
 		}
-    /**
-     * Handle logout requests.
-     */
-    function handleLogoutRequests($check_client=true, $allowed_clients=false)
-        {
-            global $PHPCAS_CLIENT;
-            if ( !is_object($PHPCAS_CLIENT) ) {
-                phpCAS::error('this method should not be called before '.__CLASS__.'::client() or '.__CLASS__.'::proxy()');
-            }
-            return($PHPCAS_CLIENT->handleLogoutRequests($check_client, $allowed_clients));
-        }
-   
+		return ($PHPCAS_CLIENT->handleLogoutRequests($check_client, $allowed_clients));
+	}
+
 	/**
 	 * This method returns the URL to be used to login.
 	 * or phpCAS::isAuthenticated().
 	 *
 	 * @return the login name of the authenticated user
 	 */
-	function getServerLoginURL()
-		{
+	function getServerLoginURL() {
 		global $PHPCAS_CLIENT;
-		if ( !is_object($PHPCAS_CLIENT) ) {
-			phpCAS::error('this method should not be called before '.__CLASS__.'::client() or '.__CLASS__.'::proxy()');
+		if (!is_object($PHPCAS_CLIENT)) {
+			phpCAS :: error('this method should not be called before ' . __CLASS__ . '::client() or ' . __CLASS__ . '::proxy()');
 		}
 		return $PHPCAS_CLIENT->getServerLoginURL();
-		}
-	
+	}
+
 	/**
 	 * Set the login URL of the CAS server.
 	 * @param $url the login URL
 	 * @since 0.4.21 by Wyman Chan
 	 */
-	function setServerLoginURL($url='')
-		{
+	function setServerLoginURL($url = '') {
 		global $PHPCAS_CLIENT;
-		phpCAS::traceBegin();
-		if ( !is_object($PHPCAS_CLIENT) ) {
-			phpCAS::error('this method should only be called after
-				'.__CLASS__.'::client()');
+		phpCAS :: traceBegin();
+		if (!is_object($PHPCAS_CLIENT)) {
+			phpCAS :: error('this method should only be called after
+							' . __CLASS__ . '::client()');
 		}
-		if ( gettype($url) != 'string' ) {
-			phpCAS::error('type mismatched for parameter $url (should be
-			`string\')');
+		if (gettype($url) != 'string') {
+			phpCAS :: error('type mismatched for parameter $url (should be
+						`string\')');
 		}
 		$PHPCAS_CLIENT->setServerLoginURL($url);
-		phpCAS::traceEnd();
-		}
-		
-		
+		phpCAS :: traceEnd();
+	}
+
 	/**
 	 * Set the serviceValidate URL of the CAS server.
+	 * Used only in CAS 1.0 validations
 	 * @param $url the serviceValidate URL
 	 * @since 1.1.0 by Joachim Fritschi
 	 */
-	function setServerServiceValidateURL($url='')
-		{
+	function setServerServiceValidateURL($url = '') {
 		global $PHPCAS_CLIENT;
-		phpCAS::traceBegin();
-		if ( !is_object($PHPCAS_CLIENT) ) {
-			phpCAS::error('this method should only be called after
-				'.__CLASS__.'::client()');
+		phpCAS :: traceBegin();
+		if (!is_object($PHPCAS_CLIENT)) {
+			phpCAS :: error('this method should only be called after
+							' . __CLASS__ . '::client()');
 		}
-		if ( gettype($url) != 'string' ) {
-			phpCAS::error('type mismatched for parameter $url (should be
-			`string\')');
+		if (gettype($url) != 'string') {
+			phpCAS :: error('type mismatched for parameter $url (should be
+						`string\')');
 		}
 		$PHPCAS_CLIENT->setServerServiceValidateURL($url);
-		phpCAS::traceEnd();
-		}
-		
-		
-	 /**
+		phpCAS :: traceEnd();
+	}
+
+	/**
 	 * Set the proxyValidate URL of the CAS server.
+	 * Used for all CAS 2.0 validations
 	 * @param $url the proxyValidate URL
 	 * @since 1.1.0 by Joachim Fritschi
 	 */
-	function setServerProxyValidateURL($url='')
-		{
+	function setServerProxyValidateURL($url = '') {
 		global $PHPCAS_CLIENT;
-		phpCAS::traceBegin();
-		if ( !is_object($PHPCAS_CLIENT) ) {
-			phpCAS::error('this method should only be called after
-				'.__CLASS__.'::client()');
+		phpCAS :: traceBegin();
+		if (!is_object($PHPCAS_CLIENT)) {
+			phpCAS :: error('this method should only be called after
+							' . __CLASS__ . '::client()');
 		}
-		if ( gettype($url) != 'string' ) {
-			phpCAS::error('type mismatched for parameter $url (should be
-			`string\')');
+		if (gettype($url) != 'string') {
+			phpCAS :: error('type mismatched for parameter $url (should be
+						`string\')');
 		}
 		$PHPCAS_CLIENT->setServerProxyValidateURL($url);
-		phpCAS::traceEnd();
-		}
-		
-     /**
+		phpCAS :: traceEnd();
+	}
+
+	/**
 	 * Set the samlValidate URL of the CAS server.
 	 * @param $url the samlValidate URL
 	 * @since 1.1.0 by Joachim Fritschi
 	 */
-	function setServerSamlValidateURL($url='')
-		{
+	function setServerSamlValidateURL($url = '') {
 		global $PHPCAS_CLIENT;
-		phpCAS::traceBegin();
-		if ( !is_object($PHPCAS_CLIENT) ) {
-			phpCAS::error('this method should only be called after
-				'.__CLASS__.'::client()');
+		phpCAS :: traceBegin();
+		if (!is_object($PHPCAS_CLIENT)) {
+			phpCAS :: error('this method should only be called after
+							' . __CLASS__ . '::client()');
 		}
-		if ( gettype($url) != 'string' ) {
-			phpCAS::error('type mismatched for parameter $url (should be
-			`string\')');
+		if (gettype($url) != 'string') {
+			phpCAS :: error('type mismatched for parameter $url (should be
+						`string\')');
 		}
 		$PHPCAS_CLIENT->setServerSamlValidateURL($url);
-		phpCAS::traceEnd();
-		}			
-	
+		phpCAS :: traceEnd();
+	}
+
 	/**
 	 * This method returns the URL to be used to login.
 	 * or phpCAS::isAuthenticated().
 	 *
 	 * @return the login name of the authenticated user
 	 */
-	function getServerLogoutURL()
-		{
+	function getServerLogoutURL() {
 		global $PHPCAS_CLIENT;
-		if ( !is_object($PHPCAS_CLIENT) ) {
-			phpCAS::error('this method should not be called before '.__CLASS__.'::client() or '.__CLASS__.'::proxy()');
+		if (!is_object($PHPCAS_CLIENT)) {
+			phpCAS :: error('this method should not be called before ' . __CLASS__ . '::client() or ' . __CLASS__ . '::proxy()');
 		}
 		return $PHPCAS_CLIENT->getServerLogoutURL();
-		}
-	
+	}
+
 	/**
 	 * Set the logout URL of the CAS server.
 	 * @param $url the logout URL
 	 * @since 0.4.21 by Wyman Chan
 	 */
-	function setServerLogoutURL($url='')
-		{
+	function setServerLogoutURL($url = '') {
 		global $PHPCAS_CLIENT;
-		phpCAS::traceBegin();
-		if ( !is_object($PHPCAS_CLIENT) ) {
-			phpCAS::error('this method should only be called after
-				'.__CLASS__.'::client()');
+		phpCAS :: traceBegin();
+		if (!is_object($PHPCAS_CLIENT)) {
+			phpCAS :: error('this method should only be called after
+							' . __CLASS__ . '::client()');
 		}
-		if ( gettype($url) != 'string' ) {
-			phpCAS::error('type mismatched for parameter $url (should be
-			`string\')');
+		if (gettype($url) != 'string') {
+			phpCAS :: error('type mismatched for parameter $url (should be
+						`string\')');
 		}
 		$PHPCAS_CLIENT->setServerLogoutURL($url);
-		phpCAS::traceEnd();
-		}
-	
+		phpCAS :: traceEnd();
+	}
+
 	/**
 	 * This method is used to logout from CAS.
 	 * @params $params an array that contains the optional url and service parameters that will be passed to the CAS server
@@ -1257,66 +1254,70 @@ class phpCAS
 	 */
 	function logout($params = "") {
 		global $PHPCAS_CLIENT;
-		phpCAS::traceBegin();
+		phpCAS :: traceBegin();
 		if (!is_object($PHPCAS_CLIENT)) {
-			phpCAS::error('this method should only be called after '.__CLASS__.'::client() or'.__CLASS__.'::proxy()');
+			phpCAS :: error('this method should only be called after ' . __CLASS__ . '::client() or' . __CLASS__ . '::proxy()');
 		}
-		$parsedParams = array();
+		$parsedParams = array ();
 		if ($params != "") {
 			if (is_string($params)) {
-				phpCAS::error('method `phpCAS::logout($url)\' is now deprecated, use `phpCAS::logoutWithUrl($url)\' instead');
+				phpCAS :: error('method `phpCAS::logout($url)\' is now deprecated, use `phpCAS::logoutWithUrl($url)\' instead');
 			}
 			if (!is_array($params)) {
-				phpCAS::error('type mismatched for parameter $params (should be `array\')');
+				phpCAS :: error('type mismatched for parameter $params (should be `array\')');
 			}
 			foreach ($params as $key => $value) {
 				if ($key != "service" && $key != "url") {
-					phpCAS::error('only `url\' and `service\' parameters are allowed for method `phpCAS::logout($params)\'');
+					phpCAS :: error('only `url\' and `service\' parameters are allowed for method `phpCAS::logout($params)\'');
 				}
 				$parsedParams[$key] = $value;
 			}
 		}
 		$PHPCAS_CLIENT->logout($parsedParams);
 		// never reached
-		phpCAS::traceEnd();
+		phpCAS :: traceEnd();
 	}
-	
+
 	/**
 	 * This method is used to logout from CAS. Halts by redirecting to the CAS server.
 	 * @param $service a URL that will be transmitted to the CAS server
 	 */
 	function logoutWithRedirectService($service) {
 		global $PHPCAS_CLIENT;
-		phpCAS::traceBegin();
-		if ( !is_object($PHPCAS_CLIENT) ) {
-			phpCAS::error('this method should only be called after '.__CLASS__.'::client() or'.__CLASS__.'::proxy()');
+		phpCAS :: traceBegin();
+		if (!is_object($PHPCAS_CLIENT)) {
+			phpCAS :: error('this method should only be called after ' . __CLASS__ . '::client() or' . __CLASS__ . '::proxy()');
 		}
 		if (!is_string($service)) {
-			phpCAS::error('type mismatched for parameter $service (should be `string\')');
+			phpCAS :: error('type mismatched for parameter $service (should be `string\')');
 		}
-		$PHPCAS_CLIENT->logout(array("service" => $service));
+		$PHPCAS_CLIENT->logout(array (
+			"service" => $service
+		));
 		// never reached
-		phpCAS::traceEnd();
+		phpCAS :: traceEnd();
 	}
-	
+
 	/**
 	 * This method is used to logout from CAS. Halts by redirecting to the CAS server.
 	 * @param $url a URL that will be transmitted to the CAS server
 	 */
 	function logoutWithUrl($url) {
 		global $PHPCAS_CLIENT;
-		phpCAS::traceBegin();
-		if ( !is_object($PHPCAS_CLIENT) ) {
-			phpCAS::error('this method should only be called after '.__CLASS__.'::client() or'.__CLASS__.'::proxy()');
+		phpCAS :: traceBegin();
+		if (!is_object($PHPCAS_CLIENT)) {
+			phpCAS :: error('this method should only be called after ' . __CLASS__ . '::client() or' . __CLASS__ . '::proxy()');
 		}
 		if (!is_string($url)) {
-			phpCAS::error('type mismatched for parameter $url (should be `string\')');
+			phpCAS :: error('type mismatched for parameter $url (should be `string\')');
 		}
-		$PHPCAS_CLIENT->logout(array("url" => $url));
+		$PHPCAS_CLIENT->logout(array (
+			"url" => $url
+		));
 		// never reached
-		phpCAS::traceEnd();
+		phpCAS :: traceEnd();
 	}
-	
+
 	/**
 	 * This method is used to logout from CAS. Halts by redirecting to the CAS server.
 	 * @param $service a URL that will be transmitted to the CAS server
@@ -1324,161 +1325,156 @@ class phpCAS
 	 */
 	function logoutWithRedirectServiceAndUrl($service, $url) {
 		global $PHPCAS_CLIENT;
-		phpCAS::traceBegin();
-		if ( !is_object($PHPCAS_CLIENT) ) {
-			phpCAS::error('this method should only be called after '.__CLASS__.'::client() or'.__CLASS__.'::proxy()');
+		phpCAS :: traceBegin();
+		if (!is_object($PHPCAS_CLIENT)) {
+			phpCAS :: error('this method should only be called after ' . __CLASS__ . '::client() or' . __CLASS__ . '::proxy()');
 		}
 		if (!is_string($service)) {
-			phpCAS::error('type mismatched for parameter $service (should be `string\')');
+			phpCAS :: error('type mismatched for parameter $service (should be `string\')');
 		}
 		if (!is_string($url)) {
-			phpCAS::error('type mismatched for parameter $url (should be `string\')');
+			phpCAS :: error('type mismatched for parameter $url (should be `string\')');
 		}
-		$PHPCAS_CLIENT->logout(array("service" => $service, "url" => $url));
+		$PHPCAS_CLIENT->logout(array (
+			"service" => $service,
+			"url" => $url
+		));
 		// never reached
-		phpCAS::traceEnd();
+		phpCAS :: traceEnd();
 	}
-	
+
 	/**
 	 * Set the fixed URL that will be used by the CAS server to transmit the PGT.
 	 * When this method is not called, a phpCAS script uses its own URL for the callback.
 	 *
 	 * @param $url the URL
 	 */
-	function setFixedCallbackURL($url='')
-		{
+	function setFixedCallbackURL($url = '') {
 		global $PHPCAS_CLIENT;
-		phpCAS::traceBegin();
-		if ( !is_object($PHPCAS_CLIENT) ) {
-			phpCAS::error('this method should only be called after '.__CLASS__.'::proxy()');
+		phpCAS :: traceBegin();
+		if (!is_object($PHPCAS_CLIENT)) {
+			phpCAS :: error('this method should only be called after ' . __CLASS__ . '::proxy()');
 		}
-		if ( !$PHPCAS_CLIENT->isProxy() ) {
-			phpCAS::error('this method should only be called after '.__CLASS__.'::proxy()');
+		if (!$PHPCAS_CLIENT->isProxy()) {
+			phpCAS :: error('this method should only be called after ' . __CLASS__ . '::proxy()');
 		}
-		if ( gettype($url) != 'string' ) {
-			phpCAS::error('type mismatched for parameter $url (should be `string\')');
+		if (gettype($url) != 'string') {
+			phpCAS :: error('type mismatched for parameter $url (should be `string\')');
 		}
 		$PHPCAS_CLIENT->setCallbackURL($url);
-		phpCAS::traceEnd();
-		}
-	
+		phpCAS :: traceEnd();
+	}
+
 	/**
 	 * Set the fixed URL that will be set as the CAS service parameter. When this
 	 * method is not called, a phpCAS script uses its own URL.
 	 *
 	 * @param $url the URL
 	 */
-	function setFixedServiceURL($url)
-		{
+	function setFixedServiceURL($url) {
 		global $PHPCAS_CLIENT;
-		phpCAS::traceBegin();
-		if ( !is_object($PHPCAS_CLIENT) ) {
-			phpCAS::error('this method should only be called after '.__CLASS__.'::proxy()');
-		}  
-		if ( gettype($url) != 'string' ) {
-			phpCAS::error('type mismatched for parameter $url (should be `string\')');
+		phpCAS :: traceBegin();
+		if (!is_object($PHPCAS_CLIENT)) {
+			phpCAS :: error('this method should only be called after ' . __CLASS__ . '::proxy()');
+		}
+		if (gettype($url) != 'string') {
+			phpCAS :: error('type mismatched for parameter $url (should be `string\')');
 		}
 		$PHPCAS_CLIENT->setURL($url);
-		phpCAS::traceEnd();
-		}
-	
+		phpCAS :: traceEnd();
+	}
+
 	/**
 	 * Get the URL that is set as the CAS service parameter.
 	 */
-	function getServiceURL()
-		{
+	function getServiceURL() {
 		global $PHPCAS_CLIENT;
-		if ( !is_object($PHPCAS_CLIENT) ) {
-			phpCAS::error('this method should only be called after '.__CLASS__.'::proxy()');
-		}  
-		return($PHPCAS_CLIENT->getURL());
+		if (!is_object($PHPCAS_CLIENT)) {
+			phpCAS :: error('this method should only be called after ' . __CLASS__ . '::proxy()');
 		}
-	
+		return ($PHPCAS_CLIENT->getURL());
+	}
+
 	/**
 	 * Retrieve a Proxy Ticket from the CAS server.
 	 */
-	function retrievePT($target_service,&$err_code,&$err_msg)
-		{
+	function retrievePT($target_service, & $err_code, & $err_msg) {
 		global $PHPCAS_CLIENT;
-		if ( !is_object($PHPCAS_CLIENT) ) {
-			phpCAS::error('this method should only be called after '.__CLASS__.'::proxy()');
-		}  
-		if ( gettype($target_service) != 'string' ) {
-			phpCAS::error('type mismatched for parameter $target_service(should be `string\')');
+		if (!is_object($PHPCAS_CLIENT)) {
+			phpCAS :: error('this method should only be called after ' . __CLASS__ . '::proxy()');
 		}
-		return($PHPCAS_CLIENT->retrievePT($target_service,$err_code,$err_msg));
+		if (gettype($target_service) != 'string') {
+			phpCAS :: error('type mismatched for parameter $target_service(should be `string\')');
 		}
-	
+		return ($PHPCAS_CLIENT->retrievePT($target_service, $err_code, $err_msg));
+	}
+
 	/**
 	 * Set the certificate of the CAS server.
 	 *
 	 * @param $cert the PEM certificate
 	 */
-	function setCasServerCert($cert)
-		{
+	function setCasServerCert($cert) {
 		global $PHPCAS_CLIENT;
-		phpCAS::traceBegin();
-		if ( !is_object($PHPCAS_CLIENT) ) {
-			phpCAS::error('this method should only be called after '.__CLASS__.'::client() or'.__CLASS__.'::proxy()');
-		}  
-		if ( gettype($cert) != 'string' ) {
-			phpCAS::error('type mismatched for parameter $cert (should be `string\')');
+		phpCAS :: traceBegin();
+		if (!is_object($PHPCAS_CLIENT)) {
+			phpCAS :: error('this method should only be called after ' . __CLASS__ . '::client() or' . __CLASS__ . '::proxy()');
+		}
+		if (gettype($cert) != 'string') {
+			phpCAS :: error('type mismatched for parameter $cert (should be `string\')');
 		}
 		$PHPCAS_CLIENT->setCasServerCert($cert);
-		phpCAS::traceEnd();
-		}
-	
+		phpCAS :: traceEnd();
+	}
+
 	/**
 	 * Set the certificate of the CAS server CA.
 	 *
 	 * @param $cert the CA certificate
 	 */
-	function setCasServerCACert($cert)
-		{
+	function setCasServerCACert($cert) {
 		global $PHPCAS_CLIENT;
-		phpCAS::traceBegin();
-		if ( !is_object($PHPCAS_CLIENT) ) {
-			phpCAS::error('this method should only be called after '.__CLASS__.'::client() or'.__CLASS__.'::proxy()');
-		}  
-		if ( gettype($cert) != 'string' ) {
-			phpCAS::error('type mismatched for parameter $cert (should be `string\')');
+		phpCAS :: traceBegin();
+		if (!is_object($PHPCAS_CLIENT)) {
+			phpCAS :: error('this method should only be called after ' . __CLASS__ . '::client() or' . __CLASS__ . '::proxy()');
+		}
+		if (gettype($cert) != 'string') {
+			phpCAS :: error('type mismatched for parameter $cert (should be `string\')');
 		}
 		$PHPCAS_CLIENT->setCasServerCACert($cert);
-		phpCAS::traceEnd();
-		}
-	
+		phpCAS :: traceEnd();
+	}
+
 	/**
 	 * Set no SSL validation for the CAS server.
 	 */
-	function setNoCasServerValidation()
-		{
+	function setNoCasServerValidation() {
 		global $PHPCAS_CLIENT;
-		phpCAS::traceBegin();
-		if ( !is_object($PHPCAS_CLIENT) ) {
-			phpCAS::error('this method should only be called after '.__CLASS__.'::client() or'.__CLASS__.'::proxy()');
-		}  
+		phpCAS :: traceBegin();
+		if (!is_object($PHPCAS_CLIENT)) {
+			phpCAS :: error('this method should only be called after ' . __CLASS__ . '::client() or' . __CLASS__ . '::proxy()');
+		}
 		$PHPCAS_CLIENT->setNoCasServerValidation();
-		phpCAS::traceEnd();
-		}
-	
+		phpCAS :: traceEnd();
+	}
+
 	/** @} */
-	
-  /**
-   * Change CURL options.
-   * CURL is used to connect through HTTPS to CAS server
-   * @param $key the option key
-   * @param $value the value to set
-   */
-   function setExtraCurlOption($key, $value)
-		{
-		  global $PHPCAS_CLIENT;
-		  phpCAS::traceBegin();
-		  if ( !is_object($PHPCAS_CLIENT) ) {
-		  	phpCAS::error('this method should only be called after '.__CLASS__.'::client() or'.__CLASS__.'::proxy()');
-		  }  
-		  $PHPCAS_CLIENT->setExtraCurlOption($key, $value);
-		  phpCAS::traceEnd();
+
+	/**
+	 * Change CURL options.
+	 * CURL is used to connect through HTTPS to CAS server
+	 * @param $key the option key
+	 * @param $value the value to set
+	 */
+	function setExtraCurlOption($key, $value) {
+		global $PHPCAS_CLIENT;
+		phpCAS :: traceBegin();
+		if (!is_object($PHPCAS_CLIENT)) {
+			phpCAS :: error('this method should only be called after ' . __CLASS__ . '::client() or' . __CLASS__ . '::proxy()');
 		}
+		$PHPCAS_CLIENT->setExtraCurlOption($key, $value);
+		phpCAS :: traceEnd();
+	}
 
 }
 
@@ -1525,7 +1521,6 @@ class phpCAS
 /** @defgroup publicDebug Debugging
  *  @ingroup public */
 
-
 /** @defgroup internal Implementation */
 
 /** @defgroup internalAuthentication Authentication
@@ -1579,37 +1574,37 @@ class phpCAS
 /**
  * @example example_simple.php
  */
- /**
-  * @example example_proxy.php
-  */
-  /**
-   * @example example_proxy2.php
-   */
-   /**
-    * @example example_lang.php
-    */
-    /**
-     * @example example_html.php
-     */
-     /**
-      * @example example_file.php
-      */
-      /**
-       * @example example_db.php
-       */
-       /**
-        * @example example_service.php
-        */
-        /**
-         * @example example_session_proxy.php
-         */
-         /**
-          * @example example_session_service.php
-          */
-          /**
-           * @example example_gateway.php
-           */
-
-
-
+/**
+ * @example example_proxy.php
+ */
+/**
+ * @example example_proxy2.php
+ */
+/**
+ * @example example_lang.php
+ */
+/**
+ * @example example_html.php
+ */
+/**
+ * @example example_file.php
+ */
+/**
+ * @example example_db.php
+ */
+/**
+ * @example example_service.php
+ */
+/**
+ * @example example_session_proxy.php
+ */
+/**
+ * @example example_session_service.php
+ */
+/**
+ * @example example_gateway.php
+ */
+/**
+ * @example example_custom_urls.php
+ */
 ?>
diff --git a/plugins/CasAuthentication/extlib/CAS/PGTStorage/pgt-db.php b/plugins/CasAuthentication/extlib/CAS/PGTStorage/pgt-db.php
index 5a589e4b28..1e316b6f6a 100644
--- a/plugins/CasAuthentication/extlib/CAS/PGTStorage/pgt-db.php
+++ b/plugins/CasAuthentication/extlib/CAS/PGTStorage/pgt-db.php
@@ -1,4 +1,32 @@
 <?php
+/*
+ * Copyright © 2003-2010, The ESUP-Portail consortium & the JA-SIG Collaborative.
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 
+ *     * Redistributions of source code must retain the above copyright notice,
+ *       this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright notice,
+ *       this list of conditions and the following disclaimer in the documentation
+ *       and/or other materials provided with the distribution.
+ *     * Neither the name of the ESUP-Portail consortium & the JA-SIG
+ *       Collaborative nor the names of its contributors may be used to endorse or
+ *       promote products derived from this software without specific prior
+ *       written permission.
+
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 
 /**
  * @file CAS/PGTStorage/pgt-db.php
diff --git a/plugins/CasAuthentication/extlib/CAS/PGTStorage/pgt-file.php b/plugins/CasAuthentication/extlib/CAS/PGTStorage/pgt-file.php
index bc07485b8f..983e557c57 100644
--- a/plugins/CasAuthentication/extlib/CAS/PGTStorage/pgt-file.php
+++ b/plugins/CasAuthentication/extlib/CAS/PGTStorage/pgt-file.php
@@ -1,5 +1,32 @@
 <?php
+/*
+ * Copyright © 2003-2010, The ESUP-Portail consortium & the JA-SIG Collaborative.
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 
+ *     * Redistributions of source code must retain the above copyright notice,
+ *       this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright notice,
+ *       this list of conditions and the following disclaimer in the documentation
+ *       and/or other materials provided with the distribution.
+ *     * Neither the name of the ESUP-Portail consortium & the JA-SIG
+ *       Collaborative nor the names of its contributors may be used to endorse or
+ *       promote products derived from this software without specific prior
+ *       written permission.
 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 /**
  * @file CAS/PGTStorage/pgt-file.php
  * Basic class for PGT file storage
diff --git a/plugins/CasAuthentication/extlib/CAS/PGTStorage/pgt-main.php b/plugins/CasAuthentication/extlib/CAS/PGTStorage/pgt-main.php
index cd9b499671..cf4c4ed0f2 100644
--- a/plugins/CasAuthentication/extlib/CAS/PGTStorage/pgt-main.php
+++ b/plugins/CasAuthentication/extlib/CAS/PGTStorage/pgt-main.php
@@ -1,5 +1,32 @@
 <?php
+/*
+ * Copyright © 2003-2010, The ESUP-Portail consortium & the JA-SIG Collaborative.
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 
+ *     * Redistributions of source code must retain the above copyright notice,
+ *       this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright notice,
+ *       this list of conditions and the following disclaimer in the documentation
+ *       and/or other materials provided with the distribution.
+ *     * Neither the name of the ESUP-Portail consortium & the JA-SIG
+ *       Collaborative nor the names of its contributors may be used to endorse or
+ *       promote products derived from this software without specific prior
+ *       written permission.
 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 /**
  * @file CAS/PGTStorage/pgt-main.php
  * Basic class for PGT storage
diff --git a/plugins/CasAuthentication/extlib/CAS/client.php b/plugins/CasAuthentication/extlib/CAS/client.php
index ad5a23f839..d38c24d361 100644
--- a/plugins/CasAuthentication/extlib/CAS/client.php
+++ b/plugins/CasAuthentication/extlib/CAS/client.php
@@ -1,5 +1,34 @@
 <?php
 
+/*
+ * Copyright © 2003-2010, The ESUP-Portail consortium & the JA-SIG Collaborative.
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 
+ *     * Redistributions of source code must retain the above copyright notice,
+ *       this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright notice,
+ *       this list of conditions and the following disclaimer in the documentation
+ *       and/or other materials provided with the distribution.
+ *     * Neither the name of the ESUP-Portail consortium & the JA-SIG
+ *       Collaborative nor the names of its contributors may be used to endorse or
+ *       promote products derived from this software without specific prior
+ *       written permission.
+
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
 /**
  * @file CAS/client.php
  * Main class of the phpCAS library
@@ -351,8 +380,8 @@ class CASClient
 		{
 		return $this->_server['login_url'] = $url;
 		}
-		
-		
+	
+	
 	/**
 	 * This method sets the serviceValidate URL of the CAS server.
 	 * @param $url the serviceValidate URL
@@ -363,8 +392,8 @@ class CASClient
 		{
 		return $this->_server['service_validate_url'] = $url;
 		}
-		
-		
+	
+	
 	/**
 	 * This method sets the proxyValidate URL of the CAS server.
 	 * @param $url the proxyValidate URL
@@ -375,8 +404,8 @@ class CASClient
 		{
 		return $this->_server['proxy_validate_url'] = $url;
 		}
-		
-		
+	
+	
 	/**
 	 * This method sets the samlValidate URL of the CAS server.
 	 * @param $url the samlValidate URL
@@ -387,7 +416,7 @@ class CASClient
 		{
 		return $this->_server['saml_validate_url'] = $url;
 		}
-			
+	
 	
 	/**
 	 * This method is used to retrieve the service validating URL of the CAS server.
@@ -411,24 +440,24 @@ class CASClient
 		return $this->_server['service_validate_url'].'?service='.urlencode($this->getURL()); 
 		}
 	/**
-	* This method is used to retrieve the SAML validating URL of the CAS server.
-	* @return a URL.
-	* @private
-	*/
+	 * This method is used to retrieve the SAML validating URL of the CAS server.
+	 * @return a URL.
+	 * @private
+	 */
 	function getServerSamlValidateURL()
-	{
-	phpCAS::traceBegin();
-	// the URL is build only when needed
-	if ( empty($this->_server['saml_validate_url']) ) {
-		switch ($this->getServerVersion()) {
-		case SAML_VERSION_1_1:
-			$this->_server['saml_validate_url'] = $this->getServerBaseURL().'samlValidate';
-			break;
+		{
+		phpCAS::traceBegin();
+		// the URL is build only when needed
+		if ( empty($this->_server['saml_validate_url']) ) {
+			switch ($this->getServerVersion()) {
+				case SAML_VERSION_1_1:
+					$this->_server['saml_validate_url'] = $this->getServerBaseURL().'samlValidate';
+					break;
 			}
-	}
-	phpCAS::traceEnd($this->_server['saml_validate_url'].'?TARGET='.urlencode($this->getURL()));
-	return $this->_server['saml_validate_url'].'?TARGET='.urlencode($this->getURL());
-	}
+		}
+		phpCAS::traceEnd($this->_server['saml_validate_url'].'?TARGET='.urlencode($this->getURL()));
+		return $this->_server['saml_validate_url'].'?TARGET='.urlencode($this->getURL());
+		}
 	/**
 	 * This method is used to retrieve the proxy validating URL of the CAS server.
 	 * @return a URL.
@@ -496,20 +525,20 @@ class CASClient
 		{
 		return $this->_server['logout_url'] = $url;
 		}
-
+	
 	/**
 	 * An array to store extra curl options.
 	 */	
 	var $_curl_options = array();
-
+	
 	/**
 	 * This method is used to set additional user curl options.
 	 */
 	function setExtraCurlOption($key, $value)
-	{
+		{
 		$this->_curl_options[$key] = $value;
-	}
- 
+		}
+	
 	/**
 	 * This method checks to see if the request is secured via HTTPS
 	 * @return true if https, false otherwise
@@ -556,45 +585,21 @@ class CASClient
 		if (version_compare(PHP_VERSION,'5','>=') && ini_get('zend.ze1_compatibility_mode')) {
 			phpCAS::error('phpCAS cannot support zend.ze1_compatibility_mode. Sorry.');
 		}
-		// skip Session Handling for logout requests and if don't want it'
-		if ($start_session && !$this->isLogoutRequest()) {
-			phpCAS::trace("Starting session handling");
-			// Check for Tickets from the CAS server
-			if (empty($_GET['ticket'])){
-				phpCAS::trace("No ticket found");
-				// only create a session if necessary
-				if (!isset($_SESSION)) {
-					phpCAS::trace("No session found, creating new session");
-					session_start();
-				}
-			}else{
-				phpCAS::trace("Ticket found");
-				// We have to copy any old data before renaming the session
-				if (isset($_SESSION)) {
-					phpCAS::trace("Old active session found, saving old data and destroying session");
-					$old_session = $_SESSION;
-					session_destroy();	
-				}else{
-					session_start();
-					phpCAS::trace("Starting possible old session to copy variables");
-					$old_session = $_SESSION;
-					session_destroy();	
-				}
-				// set up a new session, of name based on the ticket
-				$session_id = preg_replace('/[^\w]/','',$_GET['ticket']);
-				phpCAS::LOG("Session ID: " . $session_id);
-				session_id($session_id);
-				session_start();
-				// restore old session vars
-				if(isset($old_session)){
-					phpCAS::trace("Restoring old session vars");
-					$_SESSION = $old_session;
-				}
-			}
-		}else{
-			phpCAS::trace("Skipping session creation");
-		}
+		$this->_start_session = $start_session;
 
+		if ($this->_start_session && session_id())
+		{
+			phpCAS :: error("Another session was started before phpcas. Either disable the session" .
+				" handling for phpcas in the client() call or modify your application to leave" .
+				" session handling to phpcas");			
+		}
+		// skip Session Handling for logout requests and if don't want it'
+		if ($start_session && !$this->isLogoutRequest())
+		{
+			phpCAS :: trace("Starting a new session");
+			session_start();
+		}
+		
 		
 		// are we in proxy mode ?
 		$this->_proxy = $proxy;
@@ -667,12 +672,8 @@ class CASClient
 					}
 					break;
 				case CAS_VERSION_2_0: // check for a Service or Proxy Ticket
-					if (preg_match('/^ST-/', $ticket)) {
-						phpCAS::trace('ST \'' . $ticket . '\' found');
-						$this->setST($ticket);
-						unset ($_GET['ticket']);
-					} else if (preg_match('/^PT-/', $ticket)) {
-						phpCAS::trace('PT \'' . $ticket . '\' found');
+					if( preg_match('/^[SP]T-/',$ticket) ) {
+						phpCAS::trace('ST or PT \''.$ticket.'\' found');
 						$this->setPT($ticket);
 						unset($_GET['ticket']);
 					} else if ( !empty($ticket) ) {
@@ -682,9 +683,9 @@ class CASClient
 					break;
 				case SAML_VERSION_1_1: // SAML just does Service Tickets
 					if( preg_match('/^[SP]T-/',$ticket) ) {
-					phpCAS::trace('SA \''.$ticket.'\' found');
-					$this->setSA($ticket);
-					unset($_GET['ticket']);
+						phpCAS::trace('SA \''.$ticket.'\' found');
+						$this->setSA($ticket);
+						unset($_GET['ticket']);
 					} else if ( !empty($ticket) ) {
 						//ill-formed ticket, halt
 						phpCAS::error('ill-formed ticket found in the URL (ticket=`'.htmlentities($ticket).'\')');
@@ -697,6 +698,57 @@ class CASClient
 	
 	/** @} */
 	
+	// XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+	// XX                                                                    XX
+	// XX                           Session Handling                         XX
+	// XX                                                                    XX
+	// XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+
+	/**
+	* A variable to whether phpcas will use its own session handling. Default = true
+	* @hideinitializer
+	* @private
+	*/
+	var $_start_session = true;
+
+	function setStartSession($session)
+	{
+		$this->_start_session = session;
+	}
+
+	function getStartSession($session)
+	{
+		$this->_start_session = session;
+	}
+
+		/**
+	 * Renaming the session 
+	 */
+	function renameSession($ticket)
+	{
+		phpCAS::traceBegin();
+		if($this->_start_session){
+			if (!empty ($this->_user))
+			{
+				$old_session = $_SESSION;
+				session_destroy();
+				// set up a new session, of name based on the ticket
+				$session_id = preg_replace('/[^\w]/', '', $ticket);
+				phpCAS :: trace("Session ID: ".$session_id);
+				session_id($session_id);
+				session_start();
+				phpCAS :: trace("Restoring old session vars");
+				$_SESSION = $old_session;
+			} else
+			{
+				phpCAS :: error('Session should only be renamed after successfull authentication');
+			}
+		}else{
+			phpCAS :: trace("Skipping session rename since phpCAS is not handling the session.");			
+		}
+		phpCAS::traceEnd();		
+	}	
+	
 	// XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 	// XX                                                                    XX
 	// XX                           AUTHENTICATION                           XX
@@ -743,8 +795,8 @@ class CASClient
 		}
 		return $this->_user;
 		}
-
-
+	
+	
 	
 	/***********************************************************************************************************************
 	 * Atrributes section
@@ -760,23 +812,23 @@ class CASClient
 	 * @private
 	 */	
 	var $_attributes = array();
-
+	
 	function setAttributes($attributes)	
 		{ $this->_attributes = $attributes; }
-		
+	
 	function getAttributes() {
 		if ( empty($this->_user) ) { // if no user is set, there shouldn't be any attributes also...
 			phpCAS::error('this method should be used only after '.__CLASS__.'::forceAuthentication() or '.__CLASS__.'::isAuthenticated()');
 		}
 		return $this->_attributes;
 	}
-		
+	
 	function hasAttributes()
 		{ return !empty($this->_attributes); }
-		
+	
 	function hasAttribute($key)
 		{ return (is_array($this->_attributes) && array_key_exists($key, $this->_attributes)); }
-		
+	
 	function getAttribute($key)	{
 		if($this->hasAttribute($key)) {
 			return $this->_attributes[$key];
@@ -802,7 +854,7 @@ class CASClient
 		}
 		phpCAS::traceEnd();
 	}
-
+	
 	/**
 	 * This method is called to be sure that the user is authenticated. When not 
 	 * authenticated, halt by redirecting to the CAS server; otherwise return TRUE.
@@ -914,66 +966,73 @@ class CASClient
 	 */
 	function isAuthenticated()
 		{
-			phpCAS::traceBegin();
-			$res = FALSE;
-			$validate_url = '';
-
-			if ( $this->wasPreviouslyAuthenticated() ) {
+		phpCAS::traceBegin();
+		$res = FALSE;
+		$validate_url = '';
+		
+		if ( $this->wasPreviouslyAuthenticated() ) {
+			if($this->hasST() || $this->hasPT() || $this->hasSA()){
+				// User has a additional ticket but was already authenticated
+				phpCAS::trace('ticket was present and will be discarded, use renewAuthenticate()');
+				header('Location: '.$this->getURL());
+				phpCAS::log( "Prepare redirect to remove ticket: ".$this->getURL() );
+			}else{
 				// the user has already (previously during the session) been
 				// authenticated, nothing to be done.
 				phpCAS::trace('user was already authenticated, no need to look for tickets');
+			}
+			$res = TRUE;
+		}
+		else {
+			if ( $this->hasST() ) {
+				// if a Service Ticket was given, validate it
+				phpCAS::trace('ST `'.$this->getST().'\' is present');
+				$this->validateST($validate_url,$text_response,$tree_response); // if it fails, it halts
+				phpCAS::trace('ST `'.$this->getST().'\' was validated');
+				if ( $this->isProxy() ) {
+					$this->validatePGT($validate_url,$text_response,$tree_response); // idem
+					phpCAS::trace('PGT `'.$this->getPGT().'\' was validated');
+					$_SESSION['phpCAS']['pgt'] = $this->getPGT();
+				}
+				$_SESSION['phpCAS']['user'] = $this->getUser();
+				$res = TRUE;
+			}
+			elseif ( $this->hasPT() ) {
+				// if a Proxy Ticket was given, validate it
+				phpCAS::trace('PT `'.$this->getPT().'\' is present');
+				$this->validatePT($validate_url,$text_response,$tree_response); // note: if it fails, it halts
+				phpCAS::trace('PT `'.$this->getPT().'\' was validated');
+				if ( $this->isProxy() ) {
+					$this->validatePGT($validate_url,$text_response,$tree_response); // idem
+					phpCAS::trace('PGT `'.$this->getPGT().'\' was validated');
+					$_SESSION['phpCAS']['pgt'] = $this->getPGT();
+				}
+				$_SESSION['phpCAS']['user'] = $this->getUser();
+				$res = TRUE;
+			}
+			elseif ( $this->hasSA() ) {
+				// if we have a SAML ticket, validate it.
+				phpCAS::trace('SA `'.$this->getSA().'\' is present');
+				$this->validateSA($validate_url,$text_response,$tree_response); // if it fails, it halts
+				phpCAS::trace('SA `'.$this->getSA().'\' was validated');
+				$_SESSION['phpCAS']['user'] = $this->getUser();
+				$_SESSION['phpCAS']['attributes'] = $this->getAttributes();
 				$res = TRUE;
 			}
 			else {
-				if ( $this->hasST() ) {
-					// if a Service Ticket was given, validate it
-					phpCAS::trace('ST `'.$this->getST().'\' is present');
-					$this->validateST($validate_url,$text_response,$tree_response); // if it fails, it halts
-					phpCAS::trace('ST `'.$this->getST().'\' was validated');
-					if ( $this->isProxy() ) {
-						$this->validatePGT($validate_url,$text_response,$tree_response); // idem
-						phpCAS::trace('PGT `'.$this->getPGT().'\' was validated');
-						$_SESSION['phpCAS']['pgt'] = $this->getPGT();
-					}
-					$_SESSION['phpCAS']['user'] = $this->getUser();
-					$res = TRUE;
-				}
-				elseif ( $this->hasPT() ) {
-					// if a Proxy Ticket was given, validate it
-					phpCAS::trace('PT `'.$this->getPT().'\' is present');
-					$this->validatePT($validate_url,$text_response,$tree_response); // note: if it fails, it halts
-					phpCAS::trace('PT `'.$this->getPT().'\' was validated');
-					if ( $this->isProxy() ) {
-						$this->validatePGT($validate_url,$text_response,$tree_response); // idem
-						phpCAS::trace('PGT `'.$this->getPGT().'\' was validated');
-						$_SESSION['phpCAS']['pgt'] = $this->getPGT();
-					}
-					$_SESSION['phpCAS']['user'] = $this->getUser();
-					$res = TRUE;
-				}
-				elseif ( $this->hasSA() ) {
-					// if we have a SAML ticket, validate it.
-					phpCAS::trace('SA `'.$this->getSA().'\' is present');
-					$this->validateSA($validate_url,$text_response,$tree_response); // if it fails, it halts
-					phpCAS::trace('SA `'.$this->getSA().'\' was validated');
-					$_SESSION['phpCAS']['user'] = $this->getUser();
-					$_SESSION['phpCAS']['attributes'] = $this->getAttributes();
-					$res = TRUE;
-				}
-				else {
-					// no ticket given, not authenticated
-					phpCAS::trace('no ticket found');
-				}
-				if ($res) {
-					// if called with a ticket parameter, we need to redirect to the app without the ticket so that CAS-ification is transparent to the browser (for later POSTS)
-					// most of the checks and errors should have been made now, so we're safe for redirect without masking error messages.
-					header('Location: '.$this->getURL());
-					phpCAS::log( "Prepare redirect to : ".$this->getURL() );
-				}
+				// no ticket given, not authenticated
+				phpCAS::trace('no ticket found');
 			}
-
-			phpCAS::traceEnd($res);
-			return $res;
+			if ($res) {
+				// if called with a ticket parameter, we need to redirect to the app without the ticket so that CAS-ification is transparent to the browser (for later POSTS)
+				// most of the checks and errors should have been made now, so we're safe for redirect without masking error messages.
+				header('Location: '.$this->getURL());
+				phpCAS::log( "Prepare redirect to : ".$this->getURL() );
+			}
+		}
+		
+		phpCAS::traceEnd($res);
+		return $res;
 		}
 	
 	/**
@@ -1071,30 +1130,7 @@ class CASClient
 		phpCAS::traceExit();
 		exit();
 	}
-
-//	/**
-//	 * This method is used to logout from CAS.
-//	 * @param $url a URL that will be transmitted to the CAS server (to come back to when logged out)
-//	 * @public
-//	 */
-//	function logout($url = "") {
-//		phpCAS::traceBegin();
-//		$cas_url = $this->getServerLogoutURL();
-//		// v0.4.14 sebastien.gougeon at univ-rennes1.fr
-//		// header('Location: '.$cas_url);
-//		if ( $url != "" ) {
-//			// Adam Moore 1.0.0RC2
-//			$url = '?service=' . $url . '&url=' . $url;
-//		}
-//		header('Location: '.$cas_url . $url);
-//		session_unset();
-//		session_destroy();
-//		$this->printHTMLHeader($this->getString(CAS_STR_LOGOUT));
-//		printf('<p>'.$this->getString(CAS_STR_SHOULD_HAVE_BEEN_REDIRECTED).'</p>',$cas_url);
-//		$this->printHTMLFooter();
-//		phpCAS::traceExit();
-//		exit();
-//	}
+	
 	
 	/**
 	 * This method is used to logout from CAS.
@@ -1114,7 +1150,7 @@ class CASClient
 		}
 		header('Location: '.$cas_url);
 		phpCAS::log( "Prepare redirect to : ".$cas_url );
- 
+		
 		session_unset();
 		session_destroy();
 		
@@ -1156,6 +1192,9 @@ class CASClient
 			phpCAS::traceEnd();
 			return;
 		}
+		if(!$this->_start_session){
+			phpCAS::log("phpCAS can't handle logout requests if it does not manage the session.");
+		}
 		phpCAS::log("Logout requested");
 		phpCAS::log("SAML REQUEST: ".$_POST['logoutRequest']);
 		if ($check_client) {
@@ -1177,7 +1216,7 @@ class CASClient
 			}
 			if (!$allowed) {
 				phpCAS::error("Unauthorized logout request from client '".$client."'");
-			    printf("Unauthorized!");
+				printf("Unauthorized!");
 				phpCAS::traceExit();
 				exit();
 			}
@@ -1191,8 +1230,13 @@ class CASClient
 		phpCAS::log("Ticket to logout: ".$ticket2logout);
 		$session_id = preg_replace('/[^\w]/','',$ticket2logout);
 		phpCAS::log("Session id: ".$session_id);
-
-		// fix New session ID
+		
+		// destroy a possible application session created before phpcas
+		if(session_id()){
+			session_unset();
+			session_destroy();
+		}
+		// fix session ID
 		session_id($session_id);
 		$_COOKIE[session_name()]=$session_id;
 		$_GET[session_name()]=$session_id;
@@ -1200,8 +1244,8 @@ class CASClient
 		// Overwrite session
 		session_start();	
 		session_unset();
-	    session_destroy();
-	    printf("Disconnected!");
+		session_destroy();
+		printf("Disconnected!");
 		phpCAS::traceExit();
 		exit();
 	}
@@ -1322,7 +1366,7 @@ class CASClient
 	 * This method is used to validate a ST; halt on failure, and sets $validate_url,
 	 * $text_reponse and $tree_response on success. These parameters are used later
 	 * by CASClient::validatePGT() for CAS proxies.
-	 * 
+	 * Used for all CAS 1.0 validations
 	 * @param $validate_url the URL of the request to the CAS server.
 	 * @param $text_response the response of the CAS server, as is (XML text).
 	 * @param $tree_response the response of the CAS server, as a DOM XML tree.
@@ -1338,7 +1382,7 @@ class CASClient
 		$validate_url = $this->getServerServiceValidateURL().'&ticket='.$this->getST();
 		if ( $this->isProxy() ) {
 			// pass the callback url for CAS proxies
-			$validate_url .= '&pgtUrl='.$this->getCallbackURL();
+			$validate_url .= '&pgtUrl='.urlencode($this->getCallbackURL());
 		}
 		
 		// open and read the URL
@@ -1434,156 +1478,160 @@ class CASClient
 				}
 				break;
 		}
-		
+		$this->renameSession($this->getST());
 		// at this step, ST has been validated and $this->_user has been set,
 		phpCAS::traceEnd(TRUE);
 		return TRUE;
 		}
-
- // ########################################################################
- //  SAML VALIDATION
- // ########################################################################
-   /**
-    * @addtogroup internalBasic
-    * @{
-    */
-
-   /**
-    * This method is used to validate a SAML TICKET; halt on failure, and sets $validate_url,
-    * $text_reponse and $tree_response on success. These parameters are used later
-    * by CASClient::validatePGT() for CAS proxies.
-    *
-    * @param $validate_url the URL of the request to the CAS server.
-    * @param $text_response the response of the CAS server, as is (XML text).
-    * @param $tree_response the response of the CAS server, as a DOM XML tree.
-    *
-    * @return bool TRUE when successfull, halt otherwise by calling CASClient::authError().
-    *
-    * @private
-    */
-   function validateSA($validate_url,&$text_response,&$tree_response)
-     {
-       phpCAS::traceBegin();
-
-       // build the URL to validate the ticket
-       $validate_url = $this->getServerSamlValidateURL();
-
-       // open and read the URL
-       if ( !$this->readURL($validate_url,''/*cookies*/,$headers,$text_response,$err_msg) ) {
-           phpCAS::trace('could not open URL \''.$validate_url.'\' to validate ('.$err_msg.')');
-           $this->authError('SA not validated', $validate_url, TRUE/*$no_response*/);
-       }
-
-       phpCAS::trace('server version: '.$this->getServerVersion());
-
-       // analyze the result depending on the version
-       switch ($this->getServerVersion()) {
-       case SAML_VERSION_1_1:
-
-     // read the response of the CAS server into a DOM object
-       if ( !($dom = domxml_open_mem($text_response))) {
-         phpCAS::trace('domxml_open_mem() failed');
-         $this->authError('SA not validated',
-                      $validate_url,
-                      FALSE/*$no_response*/,
-                      TRUE/*$bad_response*/,
-                      $text_response);
-       }
-       // read the root node of the XML tree
-       if ( !($tree_response = $dom->document_element()) ) {
-         phpCAS::trace('document_element() failed');
-         $this->authError('SA not validated',
-                      $validate_url,
-                      FALSE/*$no_response*/,
-                      TRUE/*$bad_response*/,
-                      $text_response);
-       }
-       // insure that tag name is 'Envelope'
-       if ( $tree_response->node_name() != 'Envelope' ) {
-         phpCAS::trace('bad XML root node (should be `Envelope\' instead of `'.$tree_response->node_name().'\'');
-         $this->authError('SA not validated',
-                      $validate_url,
-                      FALSE/*$no_response*/,
-                      TRUE/*$bad_response*/,
-                      $text_response);
-       }
-     // check for the NameIdentifier tag in the SAML response
-       if ( sizeof($success_elements = $tree_response->get_elements_by_tagname("NameIdentifier")) != 0) {
-       phpCAS::trace('NameIdentifier found');
-         $user = trim($success_elements[0]->get_content());
-         phpCAS::trace('user = `'.$user.'`');
-         $this->setUser($user);
-       $this->setSessionAttributes($text_response);
-       } else {
-         phpCAS::trace('no <NameIdentifier> tag found in SAML payload');
-         $this->authError('SA not validated',
-                      $validate_url,
-                      FALSE/*$no_response*/,
-                      TRUE/*$bad_response*/,
-                      $text_response);
-       }
-       break;
-       }
-
-       // at this step, ST has been validated and $this->_user has been set,
-       phpCAS::traceEnd(TRUE);
-       return TRUE;
-     }
-
-   /**
-    * This method will parse the DOM and pull out the attributes from the SAML
-    * payload and put them into an array, then put the array into the session.
-    *
-    * @param $text_response the SAML payload.
-    * @return bool TRUE when successfull, halt otherwise by calling CASClient::authError().
-    *
-    * @private
-    */
- function setSessionAttributes($text_response)
- {
-           phpCAS::traceBegin();
-
-           $result = FALSE;
-
-           if (isset($_SESSION[SAML_ATTRIBUTES])) {
-             phpCAS::trace("session attrs already set.");  //testbml - do we care?
-           }
-
-           $attr_array = array();
-
-                if (($dom = domxml_open_mem($text_response))) {
-                   $xPath = $dom->xpath_new_context();
-                   $xPath->xpath_register_ns('samlp', 'urn:oasis:names:tc:SAML:1.0:protocol');
-                   $xPath->xpath_register_ns('saml', 'urn:oasis:names:tc:SAML:1.0:assertion');
-                   $nodelist = $xPath->xpath_eval("//saml:Attribute");
-                   $attrs = $nodelist->nodeset;
-                   phpCAS::trace($text_response);
-                  foreach($attrs as $attr){
-                      $xres = $xPath->xpath_eval("saml:AttributeValue", $attr);
-                      $name = $attr->get_attribute("AttributeName");
-                      $value_array = array();
-                      foreach($xres->nodeset as $node){
-                          $value_array[] = $node->get_content();
-                         
-                      }
-                      phpCAS::trace("* " . $name . "=" . $value_array);
-                      $attr_array[$name] = $value_array;
-                   }
-                   $_SESSION[SAML_ATTRIBUTES] = $attr_array;
-		   // UGent addition...
-		   foreach($attr_array as $attr_key => $attr_value) {
-		      if(count($attr_value) > 1) {
-			$this->_attributes[$attr_key] = $attr_value;
-		      }
-		      else {
-			$this->_attributes[$attr_key] = $attr_value[0];
-		      }
-		   }
-                   $result = TRUE;
-                }
-       phpCAS::traceEnd($result);
-       return $result;
- }
+	
+	// ########################################################################
+	//  SAML VALIDATION
+	// ########################################################################
+	/**
+	 * @addtogroup internalBasic
+	 * @{
+	 */
+	
+	/**
+	 * This method is used to validate a SAML TICKET; halt on failure, and sets $validate_url,
+	 * $text_reponse and $tree_response on success. These parameters are used later
+	 * by CASClient::validatePGT() for CAS proxies.
+	 *
+	 * @param $validate_url the URL of the request to the CAS server.
+	 * @param $text_response the response of the CAS server, as is (XML text).
+	 * @param $tree_response the response of the CAS server, as a DOM XML tree.
+	 *
+	 * @return bool TRUE when successfull, halt otherwise by calling CASClient::authError().
+	 *
+	 * @private
+	 */
+	function validateSA($validate_url,&$text_response,&$tree_response)
+		{
+		phpCAS::traceBegin();
+		
+		// build the URL to validate the ticket
+		$validate_url = $this->getServerSamlValidateURL();
+		
+		// open and read the URL
+		if ( !$this->readURL($validate_url,''/*cookies*/,$headers,$text_response,$err_msg) ) {
+			phpCAS::trace('could not open URL \''.$validate_url.'\' to validate ('.$err_msg.')');
+			$this->authError('SA not validated', $validate_url, TRUE/*$no_response*/);
+		}
+		
+		phpCAS::trace('server version: '.$this->getServerVersion());
+		
+		// analyze the result depending on the version
+		switch ($this->getServerVersion()) {
+			case SAML_VERSION_1_1:
+				
+				// read the response of the CAS server into a DOM object
+				if ( !($dom = domxml_open_mem($text_response))) {
+					phpCAS::trace('domxml_open_mem() failed');
+					$this->authError('SA not validated',
+						$validate_url,
+						FALSE/*$no_response*/,
+						TRUE/*$bad_response*/,
+						$text_response);
+				}
+				// read the root node of the XML tree
+				if ( !($tree_response = $dom->document_element()) ) {
+					phpCAS::trace('document_element() failed');
+					$this->authError('SA not validated',
+						$validate_url,
+						FALSE/*$no_response*/,
+						TRUE/*$bad_response*/,
+						$text_response);
+				}
+				// insure that tag name is 'Envelope'
+				if ( $tree_response->node_name() != 'Envelope' ) {
+					phpCAS::trace('bad XML root node (should be `Envelope\' instead of `'.$tree_response->node_name().'\'');
+					$this->authError('SA not validated',
+						$validate_url,
+						FALSE/*$no_response*/,
+						TRUE/*$bad_response*/,
+						$text_response);
+				}
+				// check for the NameIdentifier tag in the SAML response
+				if ( sizeof($success_elements = $tree_response->get_elements_by_tagname("NameIdentifier")) != 0) {
+					phpCAS::trace('NameIdentifier found');
+					$user = trim($success_elements[0]->get_content());
+					phpCAS::trace('user = `'.$user.'`');
+					$this->setUser($user);
+					$this->setSessionAttributes($text_response);
+				} else {
+					phpCAS::trace('no <NameIdentifier> tag found in SAML payload');
+					$this->authError('SA not validated',
+						$validate_url,
+						FALSE/*$no_response*/,
+						TRUE/*$bad_response*/,
+						$text_response);
+				}
+				break;
+		}
+		$this->renameSession($this->getSA());
+		// at this step, ST has been validated and $this->_user has been set,
+		phpCAS::traceEnd(TRUE);
+		return TRUE;
+		}
+	
+	/**
+	 * This method will parse the DOM and pull out the attributes from the SAML
+	 * payload and put them into an array, then put the array into the session.
+	 *
+	 * @param $text_response the SAML payload.
+	 * @return bool TRUE when successfull and FALSE if no attributes a found
+	 *
+	 * @private
+	 */
+	function setSessionAttributes($text_response)
+		{
+		phpCAS::traceBegin();
+		
+		$result = FALSE;
+		
+		if (isset($_SESSION[SAML_ATTRIBUTES])) {
+			phpCAS::trace("session attrs already set.");  //testbml - do we care?
+		}
+		
+		$attr_array = array();
+		
+		if (($dom = domxml_open_mem($text_response))) {
+			$xPath = $dom->xpath_new_context();
+			$xPath->xpath_register_ns('samlp', 'urn:oasis:names:tc:SAML:1.0:protocol');
+			$xPath->xpath_register_ns('saml', 'urn:oasis:names:tc:SAML:1.0:assertion');
+			$nodelist = $xPath->xpath_eval("//saml:Attribute");
+			if($nodelist){
+				$attrs = $nodelist->nodeset;
+				foreach($attrs as $attr){
+					$xres = $xPath->xpath_eval("saml:AttributeValue", $attr);
+					$name = $attr->get_attribute("AttributeName");
+					$value_array = array();
+					foreach($xres->nodeset as $node){
+						$value_array[] = $node->get_content();
+					}
+					$attr_array[$name] = $value_array;
+				}
+				$_SESSION[SAML_ATTRIBUTES] = $attr_array;
+				// UGent addition...
+				foreach($attr_array as $attr_key => $attr_value) {
+					if(count($attr_value) > 1) {
+						$this->_attributes[$attr_key] = $attr_value;
+						phpCAS::trace("* " . $attr_key . "=" . $attr_value);
+					}
+					else {
+						$this->_attributes[$attr_key] = $attr_value[0];
+						phpCAS::trace("* " . $attr_key . "=" . $attr_value[0]);
+					}
+				}
+				$result = TRUE;
+			}else{
+				phpCAS::trace("SAML Attributes are empty");
+				$result = FALSE;
+			}
+		}
+		phpCAS::traceEnd($result);
+		return $result;
+		}
 	
 	/** @} */
 	
@@ -2118,7 +2166,7 @@ class CASClient
 				curl_setopt($ch, $key, $value);
 			}
 		}
-
+		
 		if ($this->_cas_server_cert == '' && $this->_cas_server_ca_cert == '' && !$this->_no_cas_server_validation) {
 			phpCAS::error('one of the methods phpCAS::setCasServerCert(), phpCAS::setCasServerCACert() or phpCAS::setNoCasServerValidation() must be called.');
 		}
@@ -2150,21 +2198,21 @@ class CASClient
 		if ( is_array($cookies) ) {
 			curl_setopt($ch,CURLOPT_COOKIE,implode(';',$cookies));
 		}
-                // add extra stuff if SAML
-                if ($this->hasSA()) {
-                        $more_headers = array ("soapaction: http://www.oasis-open.org/committees/security",
-                                               "cache-control: no-cache",
-                                               "pragma: no-cache",
-                                               "accept: text/xml",
-                                               "connection: keep-alive",
-                                               "content-type: text/xml");
-
-                       curl_setopt($ch, CURLOPT_HTTPHEADER, $more_headers);
-                       curl_setopt($ch, CURLOPT_POST, 1);
-                       $data = $this->buildSAMLPayload();
-                       //phpCAS::trace('SAML Payload: '.print_r($data, TRUE));
-                       curl_setopt($ch, CURLOPT_POSTFIELDS, $data);
-                }
+		// add extra stuff if SAML
+		if ($this->hasSA()) {
+			$more_headers = array ("soapaction: http://www.oasis-open.org/committees/security",
+				"cache-control: no-cache",
+				"pragma: no-cache",
+				"accept: text/xml",
+				"connection: keep-alive",
+			"content-type: text/xml");
+			
+			curl_setopt($ch, CURLOPT_HTTPHEADER, $more_headers);
+			curl_setopt($ch, CURLOPT_POST, 1);
+			$data = $this->buildSAMLPayload();
+			//phpCAS::trace('SAML Payload: '.print_r($data, TRUE));
+			curl_setopt($ch, CURLOPT_POSTFIELDS, $data);
+		}
 		// perform the query
 		$buf = curl_exec ($ch);
 		//phpCAS::trace('CURL: Call completed. Response body is: \''.$buf.'\'');
@@ -2185,39 +2233,39 @@ class CASClient
 		
 		phpCAS::traceEnd($res);
 		return $res;
-	}
-
-        /**
-        * This method is used to build the SAML POST body sent to /samlValidate URL.
-        *
-        * @return the SOAP-encased SAMLP artifact (the ticket).
-        *
-        * @private
-        */
-        function buildSAMLPayload()
-        {
-        phpCAS::traceBegin();
-
-        //get the ticket
-        $sa = $this->getSA();
-        //phpCAS::trace("SA: ".$sa);
-
-        $body=SAML_SOAP_ENV.SAML_SOAP_BODY.SAMLP_REQUEST.SAML_ASSERTION_ARTIFACT.$sa.SAML_ASSERTION_ARTIFACT_CLOSE.SAMLP_REQUEST_CLOSE.SAML_SOAP_BODY_CLOSE.SAML_SOAP_ENV_CLOSE;
-
-        phpCAS::traceEnd($body);
-        return ($body);
-        }
-
+		}
+	
+	/**
+	 * This method is used to build the SAML POST body sent to /samlValidate URL.
+	 *
+	 * @return the SOAP-encased SAMLP artifact (the ticket).
+	 *
+	 * @private
+	 */
+	function buildSAMLPayload()
+		{
+		phpCAS::traceBegin();
+		
+		//get the ticket
+		$sa = $this->getSA();
+		//phpCAS::trace("SA: ".$sa);
+		
+		$body=SAML_SOAP_ENV.SAML_SOAP_BODY.SAMLP_REQUEST.SAML_ASSERTION_ARTIFACT.$sa.SAML_ASSERTION_ARTIFACT_CLOSE.SAMLP_REQUEST_CLOSE.SAML_SOAP_BODY_CLOSE.SAML_SOAP_ENV_CLOSE;
+		
+		phpCAS::traceEnd($body);
+		return ($body);
+		}
+	
 	/**
 	 * This method is the callback used by readURL method to request HTTP headers.
 	 */
 	var $_curl_headers = array();
 	function _curl_read_headers($ch, $header)
-	{
+		{
 		$this->_curl_headers[] = $header;
 		return strlen($header);
-	}
-
+		}
+	
 	/**
 	 * This method is used to access an HTTP[S] service.
 	 * 
@@ -2236,6 +2284,7 @@ class CASClient
 	function serviceWeb($url,&$err_code,&$output)
 		{
 		phpCAS::traceBegin();
+		$cookies = array();
 		// at first retrieve a PT
 		$pt = $this->retrievePT($url,$err_code,$output);
 		
@@ -2248,7 +2297,8 @@ class CASClient
 			$res = FALSE;
 		} else {
 			// add cookies if necessary
-			if ( is_array($_SESSION['phpCAS']['services'][$url]['cookies']) ) {
+			if ( isset($_SESSION['phpCAS']['services'][$url]['cookies']) && 
+					is_array($_SESSION['phpCAS']['services'][$url]['cookies']) ) {
 				foreach ( $_SESSION['phpCAS']['services'][$url]['cookies'] as $name => $val ) { 
 					$cookies[] = $name.'='.$val;
 				}
@@ -2400,29 +2450,29 @@ class CASClient
 	function hasPT()
 		{ return !empty($this->_pt); }
 	/**
-       * This method returns the SAML Ticket provided in the URL of the request.
-       * @return The SAML ticket.
-       * @private
-       */
-       function getSA()
-       { return 'ST'.substr($this->_sa, 2); }
-
-       /**
-       * This method stores the SAML Ticket.
-       * @param $sa The SAML Ticket.
-       * @private
-       */
-       function setSA($sa)
-       { $this->_sa = $sa; }
-
-       /**
-       * This method tells if a SAML Ticket was stored.
-       * @return TRUE if a SAML Ticket has been stored.
-       * @private
-       */
-       function hasSA()
-       { return !empty($this->_sa); }
-
+	 * This method returns the SAML Ticket provided in the URL of the request.
+	 * @return The SAML ticket.
+	 * @private
+	 */
+	function getSA()
+		{ return 'ST'.substr($this->_sa, 2); }
+	
+	/**
+	 * This method stores the SAML Ticket.
+	 * @param $sa The SAML Ticket.
+	 * @private
+	 */
+	function setSA($sa)
+		{ $this->_sa = $sa; }
+	
+	/**
+	 * This method tells if a SAML Ticket was stored.
+	 * @return TRUE if a SAML Ticket has been stored.
+	 * @private
+	 */
+	function hasSA()
+		{ return !empty($this->_sa); }
+	
 	/** @} */
 	// ########################################################################
 	//  PT VALIDATION
@@ -2433,8 +2483,8 @@ class CASClient
 	 */  
 	
 	/**
-	 * This method is used to validate a PT; halt on failure
-	 * 
+	 * This method is used to validate a ST or PT; halt on failure
+	 * Used for all CAS 2.0 validations
 	 * @return bool TRUE when successfull, halt otherwise by calling CASClient::authError().
 	 *
 	 * @private
@@ -2447,7 +2497,7 @@ class CASClient
 		
 		if ( $this->isProxy() ) {
 			// pass the callback url for CAS proxies
-			$validate_url .= '&pgtUrl='.$this->getCallbackURL();
+			$validate_url .= '&pgtUrl='.urlencode($this->getCallbackURL());
 		}
 		
 		// open and read the URL
@@ -2514,6 +2564,7 @@ class CASClient
 				$text_response);
 		}
 		
+		$this->renameSession($this->getPT());
 		// at this step, PT has been validated and $this->_user has been set,
 		
 		phpCAS::traceEnd(TRUE);
@@ -2586,25 +2637,43 @@ class CASClient
 				}
 			}
 			
-			$php_is_for_sissies = split("\?", $_SERVER['REQUEST_URI'], 2);
-			$final_uri .= $php_is_for_sissies[0];
-			if(sizeof($php_is_for_sissies) > 1){
-				$cgi_params = '?' . $php_is_for_sissies[1];
-			} else {
-				$cgi_params = '?';
+			$request_uri	= explode('?', $_SERVER['REQUEST_URI'], 2);
+			$final_uri		.= $request_uri[0];
+			
+			if (isset($request_uri[1]) && $request_uri[1])
+			{
+				$query_string	= $this->removeParameterFromQueryString('ticket', $request_uri[1]);
+				
+				// If the query string still has anything left, append it to the final URI
+				if ($query_string !== '')
+					$final_uri	.= "?$query_string";
+				
 			}
-			// remove the ticket if present in the CGI parameters
-			$cgi_params = preg_replace('/&ticket=[^&]*/','',$cgi_params);
-			$cgi_params = preg_replace('/\?ticket=[^&;]*/','?',$cgi_params);
-			$cgi_params = preg_replace('/\?%26/','?',$cgi_params);
-			$cgi_params = preg_replace('/\?&/','?',$cgi_params);
-			$cgi_params = preg_replace('/\?$/','',$cgi_params);
-			$final_uri .= $cgi_params;
+			
+			phpCAS::trace("Final URI: $final_uri");
 			$this->setURL($final_uri);
 		}
 		phpCAS::traceEnd($this->_url);
 		return $this->_url;
-		}
+	}
+	
+
+		
+	/**
+	 * Removes a parameter from a query string
+	 * 
+	 * @param string $parameterName 
+	 * @param string $queryString
+	 * @return string
+	 *
+	 * @link http://stackoverflow.com/questions/1842681/regular-expression-to-remove-one-parameter-from-query-string
+	 */
+	function removeParameterFromQueryString($parameterName, $queryString)
+	{
+		$parameterName	= preg_quote($parameterName);
+		return preg_replace("/&$parameterName(=[^&]*)?|^$parameterName(=[^&]*)?&?/", '', $queryString);
+	}
+
 	
 	/**
 	 * This method sets the URL of the current request 
@@ -2641,7 +2710,7 @@ class CASClient
 		phpCAS::traceBegin();
 		
 		$this->printHTMLHeader($this->getString(CAS_STR_AUTHENTICATION_FAILED));
-		printf($this->getString(CAS_STR_YOU_WERE_NOT_AUTHENTICATED),$this->getURL(),$_SERVER['SERVER_ADMIN']);
+		printf($this->getString(CAS_STR_YOU_WERE_NOT_AUTHENTICATED),htmlentities($this->getURL()),$_SERVER['SERVER_ADMIN']);
 		phpCAS::trace('CAS URL: '.$cas_url);
 		phpCAS::trace('Authentication failure: '.$failure);
 		if ( $no_response ) {

From 6df8230488f3c4035ac2c3385631978b5a746fbc Mon Sep 17 00:00:00 2001
From: Craig Andrews <candrews@integralblue.com>
Date: Mon, 30 Aug 2010 17:08:12 -0400
Subject: [PATCH 184/655] Leave session handling to StatusNet - disable
 phpCAS's handling.

---
 plugins/CasAuthentication/caslogin.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/CasAuthentication/caslogin.php b/plugins/CasAuthentication/caslogin.php
index a66774dc17..be69673810 100644
--- a/plugins/CasAuthentication/caslogin.php
+++ b/plugins/CasAuthentication/caslogin.php
@@ -28,7 +28,7 @@ class CasloginAction extends Action
             $this->clientError(_m('Already logged in.'));
         } else {
             global $casSettings;
-            phpCAS::client(CAS_VERSION_2_0,$casSettings['server'],$casSettings['port'],$casSettings['path']);
+            phpCAS::client(CAS_VERSION_2_0,$casSettings['server'],$casSettings['port'],$casSettings['path'],false);
             phpCAS::setNoCasServerValidation();
             phpCAS::handleLogoutRequests();
             phpCAS::forceAuthentication();

From 6f540f963b6b9c5355b3fc89c9b14146d90d6a6e Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Thu, 2 Sep 2010 15:06:47 -0700
Subject: [PATCH 185/655] Switch default, identica themes from @import to
 theme.ini include key; doesn't make much difference for internal core themes
 but it'll provide cut-n-pasters with a better example. :)

---
 theme/default/css/display.css  | 2 --
 theme/default/theme.ini        | 1 +
 theme/identica/css/display.css | 2 --
 theme/identica/theme.ini       | 1 +
 4 files changed, 2 insertions(+), 4 deletions(-)
 create mode 100644 theme/default/theme.ini
 create mode 100644 theme/identica/theme.ini

diff --git a/theme/default/css/display.css b/theme/default/css/display.css
index 9a1dabb515..92b40690c7 100644
--- a/theme/default/css/display.css
+++ b/theme/default/css/display.css
@@ -7,8 +7,6 @@
  * @link      http://status.net/
  */
 
-@import url(../../base/css/display.css);
-
 @media screen, projection, tv {
 body,
 a:active {
diff --git a/theme/default/theme.ini b/theme/default/theme.ini
new file mode 100644
index 0000000000..33d0b67978
--- /dev/null
+++ b/theme/default/theme.ini
@@ -0,0 +1 @@
+include=base
diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index d7f150bcb0..09b459999d 100644
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -7,8 +7,6 @@
  * @link      http://status.net/
  */
 
-@import url(../../base/css/display.css);
-
 @media screen, projection, tv {
 body,
 a:active {
diff --git a/theme/identica/theme.ini b/theme/identica/theme.ini
new file mode 100644
index 0000000000..33d0b67978
--- /dev/null
+++ b/theme/identica/theme.ini
@@ -0,0 +1 @@
+include=base

From 6a848bcc8ac37066f7c4941132195d2d67d3b376 Mon Sep 17 00:00:00 2001
From: Craig Andrews <candrews@integralblue.com>
Date: Tue, 31 Aug 2010 00:01:55 -0400
Subject: [PATCH 186/655] send_message -> sendMessage

---
 lib/imchannel.php                      | 4 ++--
 lib/implugin.php                       | 8 ++++----
 plugins/Aim/AimPlugin.php              | 2 +-
 plugins/Irc/ChannelResponseChannel.php | 2 +-
 plugins/Irc/IrcPlugin.php              | 4 ++--
 plugins/Irc/ircmanager.php             | 2 +-
 plugins/Msn/MsnPlugin.php              | 2 +-
 plugins/Msn/msnmanager.php             | 6 +++---
 plugins/Xmpp/XmppPlugin.php            | 2 +-
 9 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/lib/imchannel.php b/lib/imchannel.php
index 12354ce4b0..a052299905 100644
--- a/lib/imchannel.php
+++ b/lib/imchannel.php
@@ -47,7 +47,7 @@ class IMChannel extends Channel
     function output($user, $text)
     {
         $text = '['.common_config('site', 'name') . '] ' . $text;
-        $this->imPlugin->send_message($this->imPlugin->get_screenname($user), $text);
+        $this->imPlugin->sendMessage($this->imPlugin->get_screenname($user), $text);
     }
 
     function error($user, $text)
@@ -56,7 +56,7 @@ class IMChannel extends Channel
 
         $screenname = $this->imPlugin->get_screenname($user);
         if($screenname){
-            $this->imPlugin->send_message($screenname, $text);
+            $this->imPlugin->sendMessage($screenname, $text);
             return true;
         }else{
             common_log(LOG_ERR,
diff --git a/lib/implugin.php b/lib/implugin.php
index dafb8a416b..cbf10d3911 100644
--- a/lib/implugin.php
+++ b/lib/implugin.php
@@ -88,7 +88,7 @@ abstract class ImPlugin extends Plugin
      */
     function send_notice($screenname, $notice)
     {
-        return $this->send_message($screenname, $this->format_notice($notice));
+        return $this->sendMessage($screenname, $this->format_notice($notice));
     }
 
     /**
@@ -101,7 +101,7 @@ abstract class ImPlugin extends Plugin
      *
      * @return boolean success value
      */
-    abstract function send_message($screenname, $body);
+    abstract function sendMessage($screenname, $body);
 
     /**
      * receive a raw message
@@ -249,7 +249,7 @@ abstract class ImPlugin extends Plugin
     protected function send_from_site($screenname, $msg)
     {
         $text = '['.common_config('site', 'name') . '] ' . $msg;
-        $this->send_message($screenname, $text);
+        $this->sendMessage($screenname, $text);
     }
 
     /**
@@ -271,7 +271,7 @@ abstract class ImPlugin extends Plugin
           'or if you didn\'t request this confirmation, just ignore this message.'),
           $user->nickname, common_config('site', 'name'), $this->getDisplayName(), common_local_url('confirmaddress', array('code' => $code)));
 
-        return $this->send_message($screenname, $body);
+        return $this->sendMessage($screenname, $body);
     }
 
     /**
diff --git a/plugins/Aim/AimPlugin.php b/plugins/Aim/AimPlugin.php
index 30da1dbc79..b90842c0a9 100644
--- a/plugins/Aim/AimPlugin.php
+++ b/plugins/Aim/AimPlugin.php
@@ -119,7 +119,7 @@ class AimPlugin extends ImPlugin
         return 'aim:' . $screenname;    
     }
 
-    function send_message($screenname, $body)
+    function sendMessage($screenname, $body)
     {
         $this->fake_aim->sendIm($screenname, $body);
 	    $this->enqueue_outgoing_raw($this->fake_aim->would_be_sent);
diff --git a/plugins/Irc/ChannelResponseChannel.php b/plugins/Irc/ChannelResponseChannel.php
index d29a1da029..9d50b914ab 100644
--- a/plugins/Irc/ChannelResponseChannel.php
+++ b/plugins/Irc/ChannelResponseChannel.php
@@ -56,6 +56,6 @@ class ChannelResponseChannel extends IMChannel {
     */
     public function output($user, $text) {
         $text = $user->nickname.': ['.common_config('site', 'name') . '] ' . $text;
-        $this->imPlugin->send_message($this->ircChannel, $text);
+        $this->imPlugin->sendMessage($this->ircChannel, $text);
     }
 }
\ No newline at end of file
diff --git a/plugins/Irc/IrcPlugin.php b/plugins/Irc/IrcPlugin.php
index c555580c38..38c87f74dd 100644
--- a/plugins/Irc/IrcPlugin.php
+++ b/plugins/Irc/IrcPlugin.php
@@ -189,7 +189,7 @@ class IrcPlugin extends ImPlugin {
      * @param string $body Text to send
      * @return boolean true on success
      */
-    public function send_message($screenname, $body) {
+    public function sendMessage($screenname, $body) {
         $lines = explode("\n", $body);
         foreach ($lines as $line) {
             $this->fake_irc->doPrivmsg($screenname, $line);
@@ -301,7 +301,7 @@ class IrcPlugin extends ImPlugin {
         if ($this->regcheck && !$checked) {
             return $this->checked_send_confirmation_code($screenname, $code, $user);
         } else {
-            return $this->send_message($screenname, $body);
+            return $this->sendMessage($screenname, $body);
         }
     }
 
diff --git a/plugins/Irc/ircmanager.php b/plugins/Irc/ircmanager.php
index f036ef3091..292c98b2b0 100644
--- a/plugins/Irc/ircmanager.php
+++ b/plugins/Irc/ircmanager.php
@@ -231,7 +231,7 @@ class IrcManager extends ImManager {
                 // Send message
                 $this->plugin->send_confirmation_code($screenname, $nickdata['code'], $nickdata['user'], true);
             } else {
-                $this->plugin->send_message($screenname, _m('Your nickname is not registered so IRC connectivity cannot be enabled'));
+                $this->plugin->sendMessage($screenname, _m('Your nickname is not registered so IRC connectivity cannot be enabled'));
 
                 $confirm = new Confirm_address();
 
diff --git a/plugins/Msn/MsnPlugin.php b/plugins/Msn/MsnPlugin.php
index 9db3f7763b..ca30153b25 100644
--- a/plugins/Msn/MsnPlugin.php
+++ b/plugins/Msn/MsnPlugin.php
@@ -161,7 +161,7 @@ class MsnPlugin extends ImPlugin {
      * @param string $body Text to send
      * @return boolean success value
      */
-    public function send_message($screenname, $body) {
+    public function sendMessage($screenname, $body) {
         $this->enqueue_outgoing_raw(array('to' => $screenname, 'message' => $body));
         return true;
     }
diff --git a/plugins/Msn/msnmanager.php b/plugins/Msn/msnmanager.php
index 09efa32fae..0827cb591d 100644
--- a/plugins/Msn/msnmanager.php
+++ b/plugins/Msn/msnmanager.php
@@ -175,10 +175,10 @@ class MsnManager extends ImManager {
         $wm = Msn_waiting_message::top($data['to']);
         while ($wm != NULL) {
             if ($sessionFailed) {
-                $this->plugin->send_message($wm->screenname, $wm->message);
+                $this->plugin->sendMessage($wm->screenname, $wm->message);
                 $sessionFailed = true;
             } elseif (!$this->conn->sendMessage($wm->screenname, $wm->message, $ignore)) {
-                $this->plugin->send_message($wm->screenname, $wm->message);
+                $this->plugin->sendMessage($wm->screenname, $wm->message);
             }
 
             $wm->delete();
@@ -195,7 +195,7 @@ class MsnManager extends ImManager {
     protected function requeue_waiting_messages() {
         $wm = Msn_waiting_message::top();
         while ($wm != NULL) {
-            $this->plugin->send_message($wm->screenname, $wm->message);
+            $this->plugin->sendMessage($wm->screenname, $wm->message);
             $wm->delete();
             $wm = Msn_waiting_message::top();
         }
diff --git a/plugins/Xmpp/XmppPlugin.php b/plugins/Xmpp/XmppPlugin.php
index 66468b5f25..e62b92cb53 100644
--- a/plugins/Xmpp/XmppPlugin.php
+++ b/plugins/Xmpp/XmppPlugin.php
@@ -311,7 +311,7 @@ class XmppPlugin extends ImPlugin
         return 'xmpp:' . $screenname;    
     }
 
-    function send_message($screenname, $body)
+    function sendMessage($screenname, $body)
     {
         $this->queuedConnection()->message($screenname, $body, 'chat');
     }

From 80176b0b2c9615b6df319392ee53fbccc1347045 Mon Sep 17 00:00:00 2001
From: Craig Andrews <candrews@integralblue.com>
Date: Tue, 31 Aug 2010 00:02:50 -0400
Subject: [PATCH 187/655] send_notice -> sendNotice

---
 lib/implugin.php            | 6 +++---
 plugins/Xmpp/XmppPlugin.php | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/implugin.php b/lib/implugin.php
index cbf10d3911..19624095db 100644
--- a/lib/implugin.php
+++ b/lib/implugin.php
@@ -86,7 +86,7 @@ abstract class ImPlugin extends Plugin
      *
      * @return boolean success value
      */
-    function send_notice($screenname, $notice)
+    function sendNotice($screenname, $notice)
     {
         return $this->sendMessage($screenname, $this->format_notice($notice));
     }
@@ -298,7 +298,7 @@ abstract class ImPlugin extends Plugin
                        'Sending notice ' . $notice->id .
                        ' to public listener ' . $screenname,
                        __FILE__);
-            $this->send_notice($screenname, $notice);
+            $this->sendNotice($screenname, $notice);
         }
 
         return true;
@@ -356,7 +356,7 @@ abstract class ImPlugin extends Plugin
             common_log(LOG_INFO,
                        'Sending notice ' . $notice->id . ' to ' . $user_im_prefs->screenname,
                        __FILE__);
-            $this->send_notice($user_im_prefs->screenname, $notice);
+            $this->sendNotice($user_im_prefs->screenname, $notice);
             $user_im_prefs->free();
         }
 
diff --git a/plugins/Xmpp/XmppPlugin.php b/plugins/Xmpp/XmppPlugin.php
index e62b92cb53..4b57037f51 100644
--- a/plugins/Xmpp/XmppPlugin.php
+++ b/plugins/Xmpp/XmppPlugin.php
@@ -316,7 +316,7 @@ class XmppPlugin extends ImPlugin
         $this->queuedConnection()->message($screenname, $body, 'chat');
     }
 
-    function send_notice($screenname, $notice)
+    function sendNotice($screenname, $notice)
     {
         $msg   = $this->format_notice($notice);
         $entry = $this->format_entry($notice);

From 764e0ab962018f41db6549393e98a64a7fe12a04 Mon Sep 17 00:00:00 2001
From: Craig Andrews <candrews@integralblue.com>
Date: Tue, 31 Aug 2010 00:03:37 -0400
Subject: [PATCH 188/655] receive_raw_message -> receiveRawMessage

---
 lib/implugin.php               | 2 +-
 lib/imreceiverqueuehandler.php | 2 +-
 plugins/Aim/AimPlugin.php      | 2 +-
 plugins/Irc/IrcPlugin.php      | 2 +-
 plugins/Msn/MsnPlugin.php      | 2 +-
 plugins/Xmpp/XmppPlugin.php    | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/implugin.php b/lib/implugin.php
index 19624095db..8cbf7d33ed 100644
--- a/lib/implugin.php
+++ b/lib/implugin.php
@@ -117,7 +117,7 @@ abstract class ImPlugin extends Plugin
      *
      * @return boolean true if processing completed, false for temporary failures
      */
-    abstract function receive_raw_message($data);
+    abstract function receiveRawMessage($data);
 
     /**
      * get the screenname of the daemon that sends and receives message for this service
diff --git a/lib/imreceiverqueuehandler.php b/lib/imreceiverqueuehandler.php
index 269c7db918..aa4a663b7a 100644
--- a/lib/imreceiverqueuehandler.php
+++ b/lib/imreceiverqueuehandler.php
@@ -37,6 +37,6 @@ class ImReceiverQueueHandler extends QueueHandler
      */
     function handle($data)
     {
-        return $this->plugin->receive_raw_message($data);
+        return $this->plugin->receiveRawMessage($data);
     }
 }
diff --git a/plugins/Aim/AimPlugin.php b/plugins/Aim/AimPlugin.php
index b90842c0a9..1d06a8bda6 100644
--- a/plugins/Aim/AimPlugin.php
+++ b/plugins/Aim/AimPlugin.php
@@ -131,7 +131,7 @@ class AimPlugin extends ImPlugin
      *
      * @return true if processing completed, false if message should be reprocessed
      */
-    function receive_raw_message($message)
+    function receiveRawMessage($message)
     {
         $info=Aim::getMessageInfo($message);
         $from = $info['from'];
diff --git a/plugins/Irc/IrcPlugin.php b/plugins/Irc/IrcPlugin.php
index 38c87f74dd..5434c4e7d0 100644
--- a/plugins/Irc/IrcPlugin.php
+++ b/plugins/Irc/IrcPlugin.php
@@ -203,7 +203,7 @@ class IrcPlugin extends ImPlugin {
      *
      * @return boolean true if processing completed, false if message should be reprocessed
      */
-    public function receive_raw_message($data) {
+    public function receiveRawMessage($data) {
         if (strpos($data['source'], '#') === 0) {
             $message = $data['message'];
             $parts = explode(' ', $message, 2);
diff --git a/plugins/Msn/MsnPlugin.php b/plugins/Msn/MsnPlugin.php
index ca30153b25..a112a2070c 100644
--- a/plugins/Msn/MsnPlugin.php
+++ b/plugins/Msn/MsnPlugin.php
@@ -172,7 +172,7 @@ class MsnPlugin extends ImPlugin {
      * @param array $data Data
      * @return true if processing completed, false if message should be reprocessed
      */
-    public function receive_raw_message($data) {
+    public function receiveRawMessage($data) {
         $this->handle_incoming($data['sender'], $data['message']);
         return true;
     }
diff --git a/plugins/Xmpp/XmppPlugin.php b/plugins/Xmpp/XmppPlugin.php
index 4b57037f51..2cdc3272df 100644
--- a/plugins/Xmpp/XmppPlugin.php
+++ b/plugins/Xmpp/XmppPlugin.php
@@ -364,7 +364,7 @@ class XmppPlugin extends ImPlugin
         return $html . ' ' . $entry;
     }
 
-    function receive_raw_message($pl)
+    function receiveRawMessage($pl)
     {
         $from = $this->normalize($pl['from']);
 

From b05ab5fc85b320430be9cfe10bf76701c75fc903 Mon Sep 17 00:00:00 2001
From: Craig Andrews <candrews@integralblue.com>
Date: Tue, 31 Aug 2010 00:04:16 -0400
Subject: [PATCH 189/655] daemon_screenname -> daemonScreenname

---
 actions/imsettings.php       | 2 +-
 lib/implugin.php             | 4 ++--
 plugins/Aim/AimPlugin.php    | 2 +-
 plugins/Irc/IrcPlugin.php    | 2 +-
 plugins/Msn/MsnPlugin.php    | 2 +-
 plugins/Xmpp/XmppPlugin.php  | 2 +-
 plugins/Xmpp/xmppmanager.php | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/actions/imsettings.php b/actions/imsettings.php
index 662b1063e7..1b1bc0dc0d 100644
--- a/actions/imsettings.php
+++ b/actions/imsettings.php
@@ -133,7 +133,7 @@ class ImsettingsAction extends ConnectSettingsAction
                                              'message with further instructions. '.
                                              '(Did you add %s to your buddy list?)'),
                                              $transport_info['display'],
-                                             $transport_info['daemon_screenname']));
+                                             $transport_info['daemonScreenname']));
                     $this->hidden('screenname', $confirm->address);
                     // TRANS: Button label to cancel an IM address confirmation procedure.
                     $this->submit('cancel', _m('BUTTON','Cancel'));
diff --git a/lib/implugin.php b/lib/implugin.php
index 8cbf7d33ed..8a208221af 100644
--- a/lib/implugin.php
+++ b/lib/implugin.php
@@ -124,7 +124,7 @@ abstract class ImPlugin extends Plugin
      *
      * @return string screenname of this plugin
      */
-    abstract function daemon_screenname();
+    abstract function daemonScreenname();
 
     /**
      * get the microid uri of a given screenname
@@ -599,7 +599,7 @@ abstract class ImPlugin extends Plugin
     {
         $transports[$this->transport] = array(
             'display' => $this->getDisplayName(),
-            'daemon_screenname' => $this->daemon_screenname());
+            'daemonScreenname' => $this->daemonScreenname());
     }
 
     function onSendImConfirmationCode($transport, $screenname, $code, $user)
diff --git a/plugins/Aim/AimPlugin.php b/plugins/Aim/AimPlugin.php
index 1d06a8bda6..231dc0b271 100644
--- a/plugins/Aim/AimPlugin.php
+++ b/plugins/Aim/AimPlugin.php
@@ -66,7 +66,7 @@ class AimPlugin extends ImPlugin
         return strtolower($screenname);
     }
 
-    function daemon_screenname()
+    function daemonScreenname()
     {
         return $this->user;
     }
diff --git a/plugins/Irc/IrcPlugin.php b/plugins/Irc/IrcPlugin.php
index 5434c4e7d0..bebd0eaf3a 100644
--- a/plugins/Irc/IrcPlugin.php
+++ b/plugins/Irc/IrcPlugin.php
@@ -95,7 +95,7 @@ class IrcPlugin extends ImPlugin {
      *
      * @return string Screenname
      */
-    public function daemon_screenname() {
+    public function daemonScreenname() {
         return $this->nick;
     }
 
diff --git a/plugins/Msn/MsnPlugin.php b/plugins/Msn/MsnPlugin.php
index a112a2070c..68e57fa09e 100644
--- a/plugins/Msn/MsnPlugin.php
+++ b/plugins/Msn/MsnPlugin.php
@@ -78,7 +78,7 @@ class MsnPlugin extends ImPlugin {
      *
      * @return string Screenname
      */
-    public function daemon_screenname() {
+    public function daemonScreenname() {
         return $this->user;
     }
 
diff --git a/plugins/Xmpp/XmppPlugin.php b/plugins/Xmpp/XmppPlugin.php
index 2cdc3272df..321496e7de 100644
--- a/plugins/Xmpp/XmppPlugin.php
+++ b/plugins/Xmpp/XmppPlugin.php
@@ -254,7 +254,7 @@ class XmppPlugin extends ImPlugin
         return false;
     }
 
-    function daemon_screenname()
+    function daemonScreenname()
     {
         $ret = $this->user . '@' . $this->server;
         if($this->resource)
diff --git a/plugins/Xmpp/xmppmanager.php b/plugins/Xmpp/xmppmanager.php
index 87d8186684..c9cb49dd19 100644
--- a/plugins/Xmpp/xmppmanager.php
+++ b/plugins/Xmpp/xmppmanager.php
@@ -184,7 +184,7 @@ class XmppManager extends ImManager
         }
 
         common_log(LOG_DEBUG, "Sending ping #{$this->pingid}");
-		$this->conn->send("<iq from='{" . $this->plugin->daemon_screenname() . "}' to='{$this->plugin->server}' id='ping_{$this->pingid}' type='get'><ping xmlns='urn:xmpp:ping'/></iq>");
+		$this->conn->send("<iq from='{" . $this->plugin->daemonScreenname() . "}' to='{$this->plugin->server}' id='ping_{$this->pingid}' type='get'><ping xmlns='urn:xmpp:ping'/></iq>");
         $this->lastping = $now;
         return true;
     }

From e7a026091c97c2a9675987492c315ea3a6e09fff Mon Sep 17 00:00:00 2001
From: Craig Andrews <candrews@integralblue.com>
Date: Tue, 31 Aug 2010 00:05:03 -0400
Subject: [PATCH 190/655] enqueue_outgoing_raw -> enqueueOutgoingRaw

---
 lib/immanager.php            | 2 +-
 lib/implugin.php             | 6 +++---
 plugins/Aim/AimPlugin.php    | 2 +-
 plugins/Irc/IrcPlugin.php    | 4 ++--
 plugins/Msn/MsnPlugin.php    | 2 +-
 plugins/Xmpp/Queued_XMPP.php | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/lib/immanager.php b/lib/immanager.php
index da80b74b7f..9563a53262 100644
--- a/lib/immanager.php
+++ b/lib/immanager.php
@@ -31,7 +31,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
  * 2) override handleInput() with what to do when data is waiting on
  *    one of the sockets
  * 3) override idle($timeout) to do keepalives (if necessary)
- * 4) implement send_raw_message() to send raw data that ImPlugin::enqueue_outgoing_raw
+ * 4) implement send_raw_message() to send raw data that ImPlugin::enqueueOutgoingRaw
  *      enqueued
  */
 
diff --git a/lib/implugin.php b/lib/implugin.php
index 8a208221af..32aed28edf 100644
--- a/lib/implugin.php
+++ b/lib/implugin.php
@@ -79,7 +79,7 @@ abstract class ImPlugin extends Plugin
     /**
      * send a single notice to a given screenname
      * The implementation should put raw data, ready to send, into the outgoing
-     *   queue using enqueue_outgoing_raw()
+     *   queue using enqueueOutgoingRaw()
      *
      * @param string $screenname screenname to send to
      * @param Notice $notice notice to send
@@ -94,7 +94,7 @@ abstract class ImPlugin extends Plugin
     /**
      * send a message (text) to a given screenname
      * The implementation should put raw data, ready to send, into the outgoing
-     *   queue using enqueue_outgoing_raw()
+     *   queue using enqueueOutgoingRaw()
      *
      * @param string $screenname screenname to send to
      * @param Notice $body text to send
@@ -144,7 +144,7 @@ abstract class ImPlugin extends Plugin
      *
      * @param object $data
      */
-    function enqueue_outgoing_raw($data)
+    function enqueueOutgoingRaw($data)
     {
         $qm = QueueManager::get();
         $qm->enqueue($data, $this->transport . '-out');
diff --git a/plugins/Aim/AimPlugin.php b/plugins/Aim/AimPlugin.php
index 231dc0b271..3f394a7404 100644
--- a/plugins/Aim/AimPlugin.php
+++ b/plugins/Aim/AimPlugin.php
@@ -122,7 +122,7 @@ class AimPlugin extends ImPlugin
     function sendMessage($screenname, $body)
     {
         $this->fake_aim->sendIm($screenname, $body);
-	    $this->enqueue_outgoing_raw($this->fake_aim->would_be_sent);
+	    $this->enqueueOutgoingRaw($this->fake_aim->would_be_sent);
         return true;
     }
 
diff --git a/plugins/Irc/IrcPlugin.php b/plugins/Irc/IrcPlugin.php
index bebd0eaf3a..87cd8f72cf 100644
--- a/plugins/Irc/IrcPlugin.php
+++ b/plugins/Irc/IrcPlugin.php
@@ -193,7 +193,7 @@ class IrcPlugin extends ImPlugin {
         $lines = explode("\n", $body);
         foreach ($lines as $line) {
             $this->fake_irc->doPrivmsg($screenname, $line);
-            $this->enqueue_outgoing_raw(array('type' => 'message', 'prioritise' => 0, 'data' => $this->fake_irc->would_be_sent));
+            $this->enqueueOutgoingRaw(array('type' => 'message', 'prioritise' => 0, 'data' => $this->fake_irc->would_be_sent));
         }
         return true;
     }
@@ -316,7 +316,7 @@ class IrcPlugin extends ImPlugin {
     */
     public function checked_send_confirmation_code($screenname, $code, $user) {
         $this->fake_irc->doPrivmsg('NickServ', 'INFO '.$screenname);
-        $this->enqueue_outgoing_raw(
+        $this->enqueueOutgoingRaw(
             array(
                 'type' => 'nickcheck',
                 'prioritise' => 1,
diff --git a/plugins/Msn/MsnPlugin.php b/plugins/Msn/MsnPlugin.php
index 68e57fa09e..9912021d75 100644
--- a/plugins/Msn/MsnPlugin.php
+++ b/plugins/Msn/MsnPlugin.php
@@ -162,7 +162,7 @@ class MsnPlugin extends ImPlugin {
      * @return boolean success value
      */
     public function sendMessage($screenname, $body) {
-        $this->enqueue_outgoing_raw(array('to' => $screenname, 'message' => $body));
+        $this->enqueueOutgoingRaw(array('to' => $screenname, 'message' => $body));
         return true;
     }
 
diff --git a/plugins/Xmpp/Queued_XMPP.php b/plugins/Xmpp/Queued_XMPP.php
index 73eff22467..24f542805b 100644
--- a/plugins/Xmpp/Queued_XMPP.php
+++ b/plugins/Xmpp/Queued_XMPP.php
@@ -79,7 +79,7 @@ class Queued_XMPP extends XMPPHP_XMPP
      */
     public function send($msg, $timeout=NULL)
     {
-        $this->plugin->enqueue_outgoing_raw($msg);
+        $this->plugin->enqueueOutgoingRaw($msg);
     }
 
     //@{

From f038eacca47a436da11e36ee24e700020c1b60df Mon Sep 17 00:00:00 2001
From: Craig Andrews <candrews@integralblue.com>
Date: Tue, 31 Aug 2010 00:05:40 -0400
Subject: [PATCH 191/655] enqueue_incoming_raw -> enqueueIncomingRaw

---
 lib/implugin.php             | 2 +-
 plugins/Aim/aimmanager.php   | 2 +-
 plugins/Irc/ircmanager.php   | 2 +-
 plugins/Msn/msnmanager.php   | 2 +-
 plugins/Xmpp/xmppmanager.php | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/implugin.php b/lib/implugin.php
index 32aed28edf..9dedcf579f 100644
--- a/lib/implugin.php
+++ b/lib/implugin.php
@@ -155,7 +155,7 @@ abstract class ImPlugin extends Plugin
      *
      * @param object $data
      */
-    function enqueue_incoming_raw($data)
+    function enqueueIncomingRaw($data)
     {
         $qm = QueueManager::get();
         $qm->enqueue($data, $this->transport . '-in');
diff --git a/plugins/Aim/aimmanager.php b/plugins/Aim/aimmanager.php
index d9b7421fb2..8ff7ab7e70 100644
--- a/plugins/Aim/aimmanager.php
+++ b/plugins/Aim/aimmanager.php
@@ -84,7 +84,7 @@ class AimManager extends ImManager
 
     function handle_aim_message($data)
     {
-        $this->plugin->enqueue_incoming_raw($data);
+        $this->plugin->enqueueIncomingRaw($data);
         return true;
     }
 
diff --git a/plugins/Irc/ircmanager.php b/plugins/Irc/ircmanager.php
index 292c98b2b0..9ffe1865e1 100644
--- a/plugins/Irc/ircmanager.php
+++ b/plugins/Irc/ircmanager.php
@@ -209,7 +209,7 @@ class IrcManager extends ImManager {
     * @return boolean
     */
     public function handle_irc_message($data) {
-        $this->plugin->enqueue_incoming_raw($data);
+        $this->plugin->enqueueIncomingRaw($data);
         return true;
     }
 
diff --git a/plugins/Msn/msnmanager.php b/plugins/Msn/msnmanager.php
index 0827cb591d..a8996ecafa 100644
--- a/plugins/Msn/msnmanager.php
+++ b/plugins/Msn/msnmanager.php
@@ -161,7 +161,7 @@ class MsnManager extends ImManager {
     * @return boolean
     */
     public function handle_msn_message($data) {
-        $this->plugin->enqueue_incoming_raw($data);
+        $this->plugin->enqueueIncomingRaw($data);
         return true;
     }
 
diff --git a/plugins/Xmpp/xmppmanager.php b/plugins/Xmpp/xmppmanager.php
index c9cb49dd19..1a4e9546d8 100644
--- a/plugins/Xmpp/xmppmanager.php
+++ b/plugins/Xmpp/xmppmanager.php
@@ -191,7 +191,7 @@ class XmppManager extends ImManager
 
     function handle_xmpp_message(&$pl)
     {
-        $this->plugin->enqueue_incoming_raw($pl);
+        $this->plugin->enqueueIncomingRaw($pl);
         return true;
     }
 

From 8263ae601b4fe5cc1326436a451cda8f796e935b Mon Sep 17 00:00:00 2001
From: Craig Andrews <candrews@integralblue.com>
Date: Tue, 31 Aug 2010 00:06:26 -0400
Subject: [PATCH 192/655] get_user_im_prefs_from_screenname ->
 getUserImPrefsFromScreenname

---
 lib/implugin.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/implugin.php b/lib/implugin.php
index 9dedcf579f..a84cc9e92e 100644
--- a/lib/implugin.php
+++ b/lib/implugin.php
@@ -170,7 +170,7 @@ abstract class ImPlugin extends Plugin
      */
     function get_user($screenname)
     {
-        $user_im_prefs = $this->get_user_im_prefs_from_screenname($screenname);
+        $user_im_prefs = $this->getUserImPrefsFromScreenname($screenname);
         if($user_im_prefs){
             $user = User::staticGet('id', $user_im_prefs->user_id);
             $user_im_prefs->free();
@@ -188,7 +188,7 @@ abstract class ImPlugin extends Plugin
      *
      * @return User_im_prefs user_im_prefs
      */
-    function get_user_im_prefs_from_screenname($screenname)
+    function getUserImPrefsFromScreenname($screenname)
     {
         $user_im_prefs = User_im_prefs::pkeyGet(
             array('transport' => $this->transport,

From b4d02650dffc83b6c60cf5e30dcf93ac483b89aa Mon Sep 17 00:00:00 2001
From: Craig Andrews <candrews@integralblue.com>
Date: Tue, 31 Aug 2010 00:07:09 -0400
Subject: [PATCH 193/655] get_user_im_prefs_from_user -> getUserImPrefsFromUser

---
 lib/implugin.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/implugin.php b/lib/implugin.php
index a84cc9e92e..385a1092de 100644
--- a/lib/implugin.php
+++ b/lib/implugin.php
@@ -210,7 +210,7 @@ abstract class ImPlugin extends Plugin
      */
     function get_screenname($user)
     {
-        $user_im_prefs = $this->get_user_im_prefs_from_user($user);
+        $user_im_prefs = $this->getUserImPrefsFromUser($user);
         if ($user_im_prefs) {
             return $user_im_prefs->screenname;
         } else {
@@ -226,7 +226,7 @@ abstract class ImPlugin extends Plugin
      *
      * @return User_im_prefs user_im_prefs of that user
      */
-    function get_user_im_prefs_from_user($user)
+    function getUserImPrefsFromUser($user)
     {
         $user_im_prefs = User_im_prefs::pkeyGet(
             array('transport' => $this->transport,
@@ -329,7 +329,7 @@ abstract class ImPlugin extends Plugin
                 // either not a local user, or just not found
                 continue;
             }
-            $user_im_prefs = $this->get_user_im_prefs_from_user($user);
+            $user_im_prefs = $this->getUserImPrefsFromUser($user);
             if(!$user_im_prefs || !$user_im_prefs->notify){
                 continue;
             }

From 1eccd2a4bd16ec03527407faa5b87982ab212852 Mon Sep 17 00:00:00 2001
From: Craig Andrews <candrews@integralblue.com>
Date: Tue, 31 Aug 2010 00:07:52 -0400
Subject: [PATCH 194/655] send_from_site -> sendFromSite

---
 lib/implugin.php          | 8 ++++----
 plugins/Irc/IrcPlugin.php | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/implugin.php b/lib/implugin.php
index 385a1092de..65dc559f93 100644
--- a/lib/implugin.php
+++ b/lib/implugin.php
@@ -246,7 +246,7 @@ abstract class ImPlugin extends Plugin
      *
      * @param boolean success
      */
-    protected function send_from_site($screenname, $msg)
+    protected function sendFromSite($screenname, $msg)
     {
         $text = '['.common_config('site', 'name') . '] ' . $msg;
         $this->sendMessage($screenname, $text);
@@ -444,7 +444,7 @@ abstract class ImPlugin extends Plugin
         $_cur = $user;
 
         if (!$user) {
-            $this->send_from_site($from, 'Unknown user; go to ' .
+            $this->sendFromSite($from, 'Unknown user; go to ' .
                              common_local_url('imsettings') .
                              ' to add your address to your account');
             common_log(LOG_WARNING, 'Message from unknown user ' . $from);
@@ -486,7 +486,7 @@ abstract class ImPlugin extends Plugin
         $body = trim(strip_tags($body));
         $content_shortened = common_shorten_links($body);
         if (Notice::contentTooLong($content_shortened)) {
-          $this->send_from_site($screenname, sprintf(_('Message too long - maximum is %1$d characters, you sent %2$d.'),
+          $this->sendFromSite($screenname, sprintf(_('Message too long - maximum is %1$d characters, you sent %2$d.'),
                                           Notice::maxContent(),
                                           mb_strlen($content_shortened)));
           return;
@@ -496,7 +496,7 @@ abstract class ImPlugin extends Plugin
             $notice = Notice::saveNew($user->id, $content_shortened, $this->transport);
         } catch (Exception $e) {
             common_log(LOG_ERR, $e->getMessage());
-            $this->send_from_site($from, $e->getMessage());
+            $this->sendFromSite($from, $e->getMessage());
             return;
         }
 
diff --git a/plugins/Irc/IrcPlugin.php b/plugins/Irc/IrcPlugin.php
index 87cd8f72cf..f6aa09d5f2 100644
--- a/plugins/Irc/IrcPlugin.php
+++ b/plugins/Irc/IrcPlugin.php
@@ -235,7 +235,7 @@ class IrcPlugin extends ImPlugin {
         $_cur = $user;
 
         if (!$user) {
-            $this->send_from_site($nick, 'Unknown user; go to ' .
+            $this->sendFromSite($nick, 'Unknown user; go to ' .
                              common_local_url('imsettings') .
                              ' to add your address to your account');
             common_log(LOG_WARNING, 'Message from unknown user ' . $nick);

From a70cceadddef24dd7ca79e5809bdfc8c263d105f Mon Sep 17 00:00:00 2001
From: Craig Andrews <candrews@integralblue.com>
Date: Tue, 31 Aug 2010 00:08:28 -0400
Subject: [PATCH 195/655] send_confirmation_code -> sendConfirmationCode

---
 lib/implugin.php           | 4 ++--
 plugins/Irc/IrcPlugin.php  | 6 +++---
 plugins/Irc/ircmanager.php | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/implugin.php b/lib/implugin.php
index 65dc559f93..84e0777b6d 100644
--- a/lib/implugin.php
+++ b/lib/implugin.php
@@ -261,7 +261,7 @@ abstract class ImPlugin extends Plugin
      *
      * @return boolean success value
      */
-    function send_confirmation_code($screenname, $code, $user)
+    function sendConfirmationCode($screenname, $code, $user)
     {
         $body = sprintf(_('User "%s" on %s has said that your %s screenname belongs to them. ' .
           'If that\'s true, you can confirm by clicking on this URL: ' .
@@ -606,7 +606,7 @@ abstract class ImPlugin extends Plugin
     {
         if($transport == $this->transport)
         {
-            $this->send_confirmation_code($screenname, $code, $user);
+            $this->sendConfirmationCode($screenname, $code, $user);
             return false;
         }
     }
diff --git a/plugins/Irc/IrcPlugin.php b/plugins/Irc/IrcPlugin.php
index f6aa09d5f2..a5a343e02d 100644
--- a/plugins/Irc/IrcPlugin.php
+++ b/plugins/Irc/IrcPlugin.php
@@ -289,7 +289,7 @@ class IrcPlugin extends ImPlugin {
      * @param User $user user sending to
      * @return boolean success value
      */
-    public function send_confirmation_code($screenname, $code, $user, $checked = false) {
+    public function sendConfirmationCode($screenname, $code, $user, $checked = false) {
         $body = sprintf(_('User "%s" on %s has said that your %s screenname belongs to them. ' .
           'If that\'s true, you can confirm by clicking on this URL: ' .
           '%s' .
@@ -299,7 +299,7 @@ class IrcPlugin extends ImPlugin {
           $user->nickname, common_config('site', 'name'), $this->getDisplayName(), common_local_url('confirmaddress', array('code' => $code)));
 
         if ($this->regcheck && !$checked) {
-            return $this->checked_send_confirmation_code($screenname, $code, $user);
+            return $this->checked_sendConfirmationCode($screenname, $code, $user);
         } else {
             return $this->sendMessage($screenname, $body);
         }
@@ -314,7 +314,7 @@ class IrcPlugin extends ImPlugin {
     * @param User $user User sending to
     * @return boolean true on succes
     */
-    public function checked_send_confirmation_code($screenname, $code, $user) {
+    public function checked_sendConfirmationCode($screenname, $code, $user) {
         $this->fake_irc->doPrivmsg('NickServ', 'INFO '.$screenname);
         $this->enqueueOutgoingRaw(
             array(
diff --git a/plugins/Irc/ircmanager.php b/plugins/Irc/ircmanager.php
index 9ffe1865e1..6066293311 100644
--- a/plugins/Irc/ircmanager.php
+++ b/plugins/Irc/ircmanager.php
@@ -229,7 +229,7 @@ class IrcManager extends ImManager {
         if (isset($this->regChecksLookup[$usernick])) {
             if ($data['registered']) {
                 // Send message
-                $this->plugin->send_confirmation_code($screenname, $nickdata['code'], $nickdata['user'], true);
+                $this->plugin->sendConfirmationCode($screenname, $nickdata['code'], $nickdata['user'], true);
             } else {
                 $this->plugin->sendMessage($screenname, _m('Your nickname is not registered so IRC connectivity cannot be enabled'));
 

From 671b0f4cd99b330dc0fef1627f112dc765ff07b3 Mon Sep 17 00:00:00 2001
From: Craig Andrews <candrews@integralblue.com>
Date: Tue, 31 Aug 2010 00:09:29 -0400
Subject: [PATCH 196/655] format_notice -> formatNotice

---
 lib/implugin.php            | 4 ++--
 plugins/Xmpp/XmppPlugin.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/implugin.php b/lib/implugin.php
index 84e0777b6d..97b3788e3a 100644
--- a/lib/implugin.php
+++ b/lib/implugin.php
@@ -88,7 +88,7 @@ abstract class ImPlugin extends Plugin
      */
     function sendNotice($screenname, $notice)
     {
-        return $this->sendMessage($screenname, $this->format_notice($notice));
+        return $this->sendMessage($screenname, $this->formatNotice($notice));
     }
 
     /**
@@ -371,7 +371,7 @@ abstract class ImPlugin extends Plugin
      * @return string plain-text version of the notice, with user nickname prefixed
      */
 
-    function format_notice($notice)
+    function formatNotice($notice)
     {
         $profile = $notice->getProfile();
         return $profile->nickname . ': ' . $notice->content . ' [' . $notice->id . ']';
diff --git a/plugins/Xmpp/XmppPlugin.php b/plugins/Xmpp/XmppPlugin.php
index 321496e7de..10141b08d5 100644
--- a/plugins/Xmpp/XmppPlugin.php
+++ b/plugins/Xmpp/XmppPlugin.php
@@ -318,7 +318,7 @@ class XmppPlugin extends ImPlugin
 
     function sendNotice($screenname, $notice)
     {
-        $msg   = $this->format_notice($notice);
+        $msg   = $this->formatNotice($notice);
         $entry = $this->format_entry($notice);
         
         $this->queuedConnection()->message($screenname, $msg, 'chat', null, $entry);

From 463e9c10d1c41b324ada5d6d14c079a11460f581 Mon Sep 17 00:00:00 2001
From: Craig Andrews <candrews@integralblue.com>
Date: Tue, 31 Aug 2010 00:11:22 -0400
Subject: [PATCH 197/655] handle_command -> handleCommand

---
 lib/implugin.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/implugin.php b/lib/implugin.php
index 97b3788e3a..25c3e96f97 100644
--- a/lib/implugin.php
+++ b/lib/implugin.php
@@ -384,7 +384,7 @@ abstract class ImPlugin extends Plugin
      * @param string $body message text
      * @return boolean true if the message was a command and was executed, false if it was not a command
      */
-    protected function handle_command($user, $body)
+    protected function handleCommand($user, $body)
     {
         $inter = new CommandInterpreter();
         $cmd = $inter->handle_command($user, $body);
@@ -450,7 +450,7 @@ abstract class ImPlugin extends Plugin
             common_log(LOG_WARNING, 'Message from unknown user ' . $from);
             return;
         }
-        if ($this->handle_command($user, $notice_text)) {
+        if ($this->handleCommand($user, $notice_text)) {
             common_log(LOG_INFO, "Command message by $from handled.");
             return;
         } else if ($this->is_autoreply($notice_text)) {

From a3725de47b63da2e8b8cbc7e47b4b6e9d3fa142f Mon Sep 17 00:00:00 2001
From: Craig Andrews <candrews@integralblue.com>
Date: Tue, 31 Aug 2010 00:11:57 -0400
Subject: [PATCH 198/655] handle_incoming -> handleIncoming

---
 lib/implugin.php            | 4 ++--
 plugins/Aim/AimPlugin.php   | 2 +-
 plugins/Irc/IrcPlugin.php   | 4 ++--
 plugins/Msn/MsnPlugin.php   | 2 +-
 plugins/Xmpp/XmppPlugin.php | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/implugin.php b/lib/implugin.php
index 25c3e96f97..67b93047f1 100644
--- a/lib/implugin.php
+++ b/lib/implugin.php
@@ -106,7 +106,7 @@ abstract class ImPlugin extends Plugin
     /**
      * receive a raw message
      * Raw IM data is taken from the incoming queue, and passed to this function.
-     * It should parse the raw message and call handle_incoming()
+     * It should parse the raw message and call handleIncoming()
      * 
      * Returning false may CAUSE REPROCESSING OF THE QUEUE ITEM, and should
      * be used for temporary failures only. For permanent failures such as
@@ -436,7 +436,7 @@ abstract class ImPlugin extends Plugin
      *
      * @param boolean success
      */
-    protected function handle_incoming($from, $notice_text)
+    protected function handleIncoming($from, $notice_text)
     {
         $user = $this->get_user($from);
         // For common_current_user to work
diff --git a/plugins/Aim/AimPlugin.php b/plugins/Aim/AimPlugin.php
index 3f394a7404..225d92ad6a 100644
--- a/plugins/Aim/AimPlugin.php
+++ b/plugins/Aim/AimPlugin.php
@@ -138,7 +138,7 @@ class AimPlugin extends ImPlugin
         $user = $this->get_user($from);
         $notice_text = $info['message'];
 
-        $this->handle_incoming($from, $notice_text);
+        $this->handleIncoming($from, $notice_text);
 
         return true;
     }
diff --git a/plugins/Irc/IrcPlugin.php b/plugins/Irc/IrcPlugin.php
index a5a343e02d..3e73c198cb 100644
--- a/plugins/Irc/IrcPlugin.php
+++ b/plugins/Irc/IrcPlugin.php
@@ -211,10 +211,10 @@ class IrcPlugin extends ImPlugin {
             if (in_array($command, $this->whiteList)) {
                 $this->handle_channel_incoming($data['sender'], $data['source'], $message);
             } else {
-                $this->handle_incoming($data['sender'], $message);
+                $this->handleIncoming($data['sender'], $message);
             }
         } else {
-            $this->handle_incoming($data['sender'], $data['message']);
+            $this->handleIncoming($data['sender'], $data['message']);
         }
         return true;
     }
diff --git a/plugins/Msn/MsnPlugin.php b/plugins/Msn/MsnPlugin.php
index 9912021d75..187486eedc 100644
--- a/plugins/Msn/MsnPlugin.php
+++ b/plugins/Msn/MsnPlugin.php
@@ -173,7 +173,7 @@ class MsnPlugin extends ImPlugin {
      * @return true if processing completed, false if message should be reprocessed
      */
     public function receiveRawMessage($data) {
-        $this->handle_incoming($data['sender'], $data['message']);
+        $this->handleIncoming($data['sender'], $data['message']);
         return true;
     }
 
diff --git a/plugins/Xmpp/XmppPlugin.php b/plugins/Xmpp/XmppPlugin.php
index 10141b08d5..2002541782 100644
--- a/plugins/Xmpp/XmppPlugin.php
+++ b/plugins/Xmpp/XmppPlugin.php
@@ -378,7 +378,7 @@ class XmppPlugin extends ImPlugin
             return;
         }
 
-        $this->handle_incoming($from, $pl['body']);
+        $this->handleIncoming($from, $pl['body']);
         
         return true;
     }

From 054111bb545f3fc008f80eb54bfb706d15c57e01 Mon Sep 17 00:00:00 2001
From: Craig Andrews <candrews@integralblue.com>
Date: Tue, 31 Aug 2010 00:13:17 -0400
Subject: [PATCH 199/655] add_notice -> addNotice

---
 lib/implugin.php          | 4 ++--
 plugins/Irc/IrcPlugin.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/implugin.php b/lib/implugin.php
index 67b93047f1..b1b918fea5 100644
--- a/lib/implugin.php
+++ b/lib/implugin.php
@@ -463,7 +463,7 @@ abstract class ImPlugin extends Plugin
 
             common_log(LOG_INFO, 'Posting a notice from ' . $user->nickname);
 
-            $this->add_notice($from, $user, $notice_text);
+            $this->addNotice($from, $user, $notice_text);
         }
 
         $user->free();
@@ -481,7 +481,7 @@ abstract class ImPlugin extends Plugin
      *
      * @param boolean success
      */
-    protected function add_notice($screenname, $user, $body)
+    protected function addNotice($screenname, $user, $body)
     {
         $body = trim(strip_tags($body));
         $content_shortened = common_shorten_links($body);
diff --git a/plugins/Irc/IrcPlugin.php b/plugins/Irc/IrcPlugin.php
index 3e73c198cb..b688e6140b 100644
--- a/plugins/Irc/IrcPlugin.php
+++ b/plugins/Irc/IrcPlugin.php
@@ -252,7 +252,7 @@ class IrcPlugin extends ImPlugin {
             return;
         } else {
             common_log(LOG_INFO, 'Posting a notice from ' . $user->nickname);
-            $this->add_notice($nick, $user, $notice_text);
+            $this->addNotice($nick, $user, $notice_text);
         }
 
         $user->free();

From 9ccf65a3116c925b30c5c5d9b8926b26546c9694 Mon Sep 17 00:00:00 2001
From: Craig Andrews <candrews@integralblue.com>
Date: Tue, 31 Aug 2010 00:14:47 -0400
Subject: [PATCH 200/655] get_user -> getUser

---
 lib/implugin.php          | 4 ++--
 plugins/Aim/AimPlugin.php | 2 +-
 plugins/Irc/IrcPlugin.php | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/implugin.php b/lib/implugin.php
index b1b918fea5..a6a30b042f 100644
--- a/lib/implugin.php
+++ b/lib/implugin.php
@@ -168,7 +168,7 @@ abstract class ImPlugin extends Plugin
      *
      * @return User user
      */
-    function get_user($screenname)
+    function getUser($screenname)
     {
         $user_im_prefs = $this->getUserImPrefsFromScreenname($screenname);
         if($user_im_prefs){
@@ -438,7 +438,7 @@ abstract class ImPlugin extends Plugin
      */
     protected function handleIncoming($from, $notice_text)
     {
-        $user = $this->get_user($from);
+        $user = $this->getUser($from);
         // For common_current_user to work
         global $_cur;
         $_cur = $user;
diff --git a/plugins/Aim/AimPlugin.php b/plugins/Aim/AimPlugin.php
index 225d92ad6a..3a1799a2d8 100644
--- a/plugins/Aim/AimPlugin.php
+++ b/plugins/Aim/AimPlugin.php
@@ -135,7 +135,7 @@ class AimPlugin extends ImPlugin
     {
         $info=Aim::getMessageInfo($message);
         $from = $info['from'];
-        $user = $this->get_user($from);
+        $user = $this->getUser($from);
         $notice_text = $info['message'];
 
         $this->handleIncoming($from, $notice_text);
diff --git a/plugins/Irc/IrcPlugin.php b/plugins/Irc/IrcPlugin.php
index b688e6140b..55645d92fd 100644
--- a/plugins/Irc/IrcPlugin.php
+++ b/plugins/Irc/IrcPlugin.php
@@ -229,7 +229,7 @@ class IrcPlugin extends ImPlugin {
      * @param boolean true on success
      */
     protected function handle_channel_incoming($nick, $channel, $notice_text) {
-        $user = $this->get_user($nick);
+        $user = $this->getUser($nick);
         // For common_current_user to work
         global $_cur;
         $_cur = $user;

From 00e21d4a6f8b24bf4418df0385cf74b2de5e77bc Mon Sep 17 00:00:00 2001
From: Craig Andrews <candrews@integralblue.com>
Date: Tue, 31 Aug 2010 00:16:47 -0400
Subject: [PATCH 201/655] broadcast_notice -> broadcastNotice

---
 lib/implugin.php       | 2 +-
 lib/imqueuehandler.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/implugin.php b/lib/implugin.php
index a6a30b042f..25a6614c6a 100644
--- a/lib/implugin.php
+++ b/lib/implugin.php
@@ -318,7 +318,7 @@ abstract class ImPlugin extends Plugin
      * @return boolean success flag
      */
 
-    function broadcast_notice($notice)
+    function broadcastNotice($notice)
     {
 
         $ni = $notice->whoGets();
diff --git a/lib/imqueuehandler.php b/lib/imqueuehandler.php
index b42d8e7c0b..9c48c7093c 100644
--- a/lib/imqueuehandler.php
+++ b/lib/imqueuehandler.php
@@ -37,7 +37,7 @@ class ImQueueHandler extends QueueHandler
      */
     function handle($notice)
     {
-        $this->plugin->broadcast_notice($notice);
+        $this->plugin->broadcastNotice($notice);
         if ($notice->is_local == Notice::LOCAL_PUBLIC ||
             $notice->is_local == Notice::LOCAL_NONPUBLIC) {
             $this->plugin->public_notice($notice);

From cce92e394b228087ce9aeab24ab857bb617ba3fb Mon Sep 17 00:00:00 2001
From: Craig Andrews <candrews@integralblue.com>
Date: Tue, 31 Aug 2010 00:17:23 -0400
Subject: [PATCH 202/655] public_notice -> publicNotice

---
 lib/implugin.php       | 2 +-
 lib/imqueuehandler.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/implugin.php b/lib/implugin.php
index 25a6614c6a..9fad46c41f 100644
--- a/lib/implugin.php
+++ b/lib/implugin.php
@@ -285,7 +285,7 @@ abstract class ImPlugin extends Plugin
      * @return boolean success flag
      */
 
-    function public_notice($notice)
+    function publicNotice($notice)
     {
         // Now, users who want everything
 
diff --git a/lib/imqueuehandler.php b/lib/imqueuehandler.php
index 9c48c7093c..9c35890c62 100644
--- a/lib/imqueuehandler.php
+++ b/lib/imqueuehandler.php
@@ -40,7 +40,7 @@ class ImQueueHandler extends QueueHandler
         $this->plugin->broadcastNotice($notice);
         if ($notice->is_local == Notice::LOCAL_PUBLIC ||
             $notice->is_local == Notice::LOCAL_NONPUBLIC) {
-            $this->plugin->public_notice($notice);
+            $this->plugin->publicNotice($notice);
         }
         return true;
     }

From d68914e4f3a5844c19396a94e3ae41895a36e9a2 Mon Sep 17 00:00:00 2001
From: Craig Andrews <candrews@integralblue.com>
Date: Tue, 31 Aug 2010 00:20:05 -0400
Subject: [PATCH 203/655] is_autoreply -> isAutoreply

---
 lib/implugin.php          | 4 ++--
 plugins/Irc/IrcPlugin.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/implugin.php b/lib/implugin.php
index 9fad46c41f..f08fef6cd6 100644
--- a/lib/implugin.php
+++ b/lib/implugin.php
@@ -402,7 +402,7 @@ abstract class ImPlugin extends Plugin
      * @param string $txt message text
      * @return boolean true if autoreply
      */
-    protected function is_autoreply($txt)
+    protected function isAutoreply($txt)
     {
         if (preg_match('/[\[\(]?[Aa]uto[-\s]?[Rr]e(ply|sponse)[\]\)]/', $txt)) {
             return true;
@@ -453,7 +453,7 @@ abstract class ImPlugin extends Plugin
         if ($this->handleCommand($user, $notice_text)) {
             common_log(LOG_INFO, "Command message by $from handled.");
             return;
-        } else if ($this->is_autoreply($notice_text)) {
+        } else if ($this->isAutoreply($notice_text)) {
             common_log(LOG_INFO, 'Ignoring auto reply from ' . $from);
             return;
         } else if ($this->is_otr($notice_text)) {
diff --git a/plugins/Irc/IrcPlugin.php b/plugins/Irc/IrcPlugin.php
index 55645d92fd..dc077eeabb 100644
--- a/plugins/Irc/IrcPlugin.php
+++ b/plugins/Irc/IrcPlugin.php
@@ -244,7 +244,7 @@ class IrcPlugin extends ImPlugin {
         if ($this->handle_channel_command($user, $channel, $notice_text)) {
             common_log(LOG_INFO, "Command message by $nick handled.");
             return;
-        } else if ($this->is_autoreply($notice_text)) {
+        } else if ($this->isAutoreply($notice_text)) {
             common_log(LOG_INFO, 'Ignoring auto reply from ' . $nick);
             return;
         } else if ($this->is_otr($notice_text)) {

From c54ef9b8b646c244a679527ff886ba3abfc92c61 Mon Sep 17 00:00:00 2001
From: Craig Andrews <candrews@integralblue.com>
Date: Tue, 31 Aug 2010 00:21:51 -0400
Subject: [PATCH 204/655] is_otr -> isOtr

---
 lib/implugin.php          | 4 ++--
 plugins/Irc/IrcPlugin.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/implugin.php b/lib/implugin.php
index f08fef6cd6..f4504f5253 100644
--- a/lib/implugin.php
+++ b/lib/implugin.php
@@ -418,7 +418,7 @@ abstract class ImPlugin extends Plugin
      * @param string $txt message text
      * @return boolean true if OTR
      */
-    protected function is_otr($txt)
+    protected function isOtr($txt)
     {
         if (preg_match('/^\?OTR/', $txt)) {
             return true;
@@ -456,7 +456,7 @@ abstract class ImPlugin extends Plugin
         } else if ($this->isAutoreply($notice_text)) {
             common_log(LOG_INFO, 'Ignoring auto reply from ' . $from);
             return;
-        } else if ($this->is_otr($notice_text)) {
+        } else if ($this->isOtr($notice_text)) {
             common_log(LOG_INFO, 'Ignoring OTR from ' . $from);
             return;
         } else {
diff --git a/plugins/Irc/IrcPlugin.php b/plugins/Irc/IrcPlugin.php
index dc077eeabb..7a53e5cbf5 100644
--- a/plugins/Irc/IrcPlugin.php
+++ b/plugins/Irc/IrcPlugin.php
@@ -247,7 +247,7 @@ class IrcPlugin extends ImPlugin {
         } else if ($this->isAutoreply($notice_text)) {
             common_log(LOG_INFO, 'Ignoring auto reply from ' . $nick);
             return;
-        } else if ($this->is_otr($notice_text)) {
+        } else if ($this->isOtr($notice_text)) {
             common_log(LOG_INFO, 'Ignoring OTR from ' . $nick);
             return;
         } else {

From 44f1b943016cb1a75153768838622c348238aaa1 Mon Sep 17 00:00:00 2001
From: Craig Andrews <candrews@integralblue.com>
Date: Fri, 3 Sep 2010 17:46:42 -0400
Subject: [PATCH 205/655] get_screenname -> getScreenname

---
 lib/imchannel.php | 4 ++--
 lib/implugin.php  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/imchannel.php b/lib/imchannel.php
index a052299905..18ba3f55f0 100644
--- a/lib/imchannel.php
+++ b/lib/imchannel.php
@@ -47,14 +47,14 @@ class IMChannel extends Channel
     function output($user, $text)
     {
         $text = '['.common_config('site', 'name') . '] ' . $text;
-        $this->imPlugin->sendMessage($this->imPlugin->get_screenname($user), $text);
+        $this->imPlugin->sendMessage($this->imPlugin->getScreenname($user), $text);
     }
 
     function error($user, $text)
     {
         $text = '['.common_config('site', 'name') . '] ' . $text;
 
-        $screenname = $this->imPlugin->get_screenname($user);
+        $screenname = $this->imPlugin->getScreenname($user);
         if($screenname){
             $this->imPlugin->sendMessage($screenname, $text);
             return true;
diff --git a/lib/implugin.php b/lib/implugin.php
index f4504f5253..72d1456f4d 100644
--- a/lib/implugin.php
+++ b/lib/implugin.php
@@ -208,7 +208,7 @@ abstract class ImPlugin extends Plugin
      *
      * @return string screenname of that user
      */
-    function get_screenname($user)
+    function getScreenname($user)
     {
         $user_im_prefs = $this->getUserImPrefsFromUser($user);
         if ($user_im_prefs) {

From f7c46effa21e6ea04b8d7cbb81501009b9f534ce Mon Sep 17 00:00:00 2001
From: Craig Andrews <candrews@integralblue.com>
Date: Fri, 3 Sep 2010 17:49:13 -0400
Subject: [PATCH 206/655] set_notify -> setNotify

---
 lib/channel.php   | 6 +++---
 lib/imchannel.php | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/channel.php b/lib/channel.php
index e83960ac54..5b38a4b6ae 100644
--- a/lib/channel.php
+++ b/lib/channel.php
@@ -155,12 +155,12 @@ class MailChannel extends Channel
 
     function on($user)
     {
-        return $this->set_notify($user, 1);
+        return $this->setNotify($user, 1);
     }
 
     function off($user)
     {
-        return $this->set_notify($user, 0);
+        return $this->setNotify($user, 0);
     }
 
     function output($user, $text)
@@ -185,7 +185,7 @@ class MailChannel extends Channel
         return mail_send(array($this->addr), $headers, $text);
     }
 
-    function set_notify($user, $value)
+    function setNotify($user, $value)
     {
         $orig = clone($user);
         $user->smsnotify = $value;
diff --git a/lib/imchannel.php b/lib/imchannel.php
index 18ba3f55f0..61355a429c 100644
--- a/lib/imchannel.php
+++ b/lib/imchannel.php
@@ -36,12 +36,12 @@ class IMChannel extends Channel
 
     function on($user)
     {
-        return $this->set_notify($user, 1);
+        return $this->setNotify($user, 1);
     }
 
     function off($user)
     {
-        return $this->set_notify($user, 0);
+        return $this->setNotify($user, 0);
     }
 
     function output($user, $text)
@@ -66,7 +66,7 @@ class IMChannel extends Channel
         }
     }
 
-    function set_notify($user, $notify)
+    function setNotify($user, $notify)
     {
         $user_im_prefs = new User_im_prefs();
         $user_im_prefs->transport = $this->imPlugin->transport;

From 6fe2429c4191bd4b7de8c7a512dfbf78571ddbaf Mon Sep 17 00:00:00 2001
From: Craig Andrews <candrews@integralblue.com>
Date: Sun, 5 Sep 2010 17:31:46 -0400
Subject: [PATCH 207/655] Fix syntax error

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

diff --git a/plugins/OStatus/lib/discovery.php b/plugins/OStatus/lib/discovery.php
index ed22b452f1..04c6727207 100644
--- a/plugins/OStatus/lib/discovery.php
+++ b/plugins/OStatus/lib/discovery.php
@@ -107,7 +107,7 @@ class Discovery
         }
 
         // @todo Needs i18n.
-        throw new Exception('Unable to find services for '. $id '.');
+        throw new Exception('Unable to find services for '. $id . '.');
     }
 
     public static function getService($links, $service) {

From 8f81762d68ede590e53b929c77602f0e2db0ddc2 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Mon, 6 Sep 2010 09:56:45 -0400
Subject: [PATCH 208/655] common_memcache() => Cache::instance()

---
 actions/getfile.php               |  2 +-
 classes/Memcached_DataObject.php  |  2 +-
 classes/Notice.php                |  6 +++---
 classes/Profile.php               | 16 ++++++++--------
 classes/User.php                  |  4 ++--
 lib/spawningdaemon.php            |  2 +-
 lib/stompqueuemanager.php         |  2 +-
 lib/util.php                      | 24 +++++++++---------------
 plugins/GeonamesPlugin.php        |  4 ++--
 plugins/LdapCommon/LdapCommon.php |  2 +-
 plugins/Minify/MinifyPlugin.php   |  4 ++--
 plugins/Minify/minify.php         |  2 +-
 scripts/clearcache.php            |  2 +-
 scripts/fixup_inboxes.php         |  2 +-
 scripts/showcache.php             |  2 +-
 scripts/uncache_users.php         |  2 +-
 16 files changed, 36 insertions(+), 42 deletions(-)

diff --git a/actions/getfile.php b/actions/getfile.php
index 9cbe8e1d99..17cca13f4c 100644
--- a/actions/getfile.php
+++ b/actions/getfile.php
@@ -129,7 +129,7 @@ class GetfileAction extends Action
             return null;
         }
 
-        $cache = common_memcache();
+        $cache = Cache::instance();
         if($cache) {
             $key = common_cache_key('attachments:etag:' . $this->path);
             $etag = $cache->get($key);
diff --git a/classes/Memcached_DataObject.php b/classes/Memcached_DataObject.php
index 0f1ed04892..0c46ef2b41 100644
--- a/classes/Memcached_DataObject.php
+++ b/classes/Memcached_DataObject.php
@@ -124,7 +124,7 @@ class Memcached_DataObject extends Safe_DataObject
     }
 
     static function memcache() {
-        return common_memcache();
+        return Cache::instance();
     }
 
     static function cacheKey($cls, $k, $v) {
diff --git a/classes/Notice.php b/classes/Notice.php
index 14477b1b53..066e7a584f 100644
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -591,7 +591,7 @@ class Notice extends Memcached_DataObject
 
     function getStreamByIds($ids)
     {
-        $cache = common_memcache();
+        $cache = Cache::instance();
 
         if (!empty($cache)) {
             $notices = array();
@@ -1585,7 +1585,7 @@ class Notice extends Memcached_DataObject
 
     function stream($fn, $args, $cachekey, $offset=0, $limit=20, $since_id=0, $max_id=0)
     {
-        $cache = common_memcache();
+        $cache = Cache::instance();
 
         if (empty($cache) ||
             $since_id != 0 || $max_id != 0 ||
@@ -1777,7 +1777,7 @@ class Notice extends Memcached_DataObject
 
     function repeatStream($limit=100)
     {
-        $cache = common_memcache();
+        $cache = Cache::instance();
 
         if (empty($cache)) {
             $ids = $this->_repeatStreamDirect($limit);
diff --git a/classes/Profile.php b/classes/Profile.php
index 8f86795504..19564408c8 100644
--- a/classes/Profile.php
+++ b/classes/Profile.php
@@ -429,7 +429,7 @@ class Profile extends Memcached_DataObject
 
     function subscriptionCount()
     {
-        $c = common_memcache();
+        $c = Cache::instance();
 
         if (!empty($c)) {
             $cnt = $c->get(common_cache_key('profile:subscription_count:'.$this->id));
@@ -454,7 +454,7 @@ class Profile extends Memcached_DataObject
 
     function subscriberCount()
     {
-        $c = common_memcache();
+        $c = Cache::instance();
         if (!empty($c)) {
             $cnt = $c->get(common_cache_key('profile:subscriber_count:'.$this->id));
             if (is_integer($cnt)) {
@@ -476,7 +476,7 @@ class Profile extends Memcached_DataObject
 
     function faveCount()
     {
-        $c = common_memcache();
+        $c = Cache::instance();
         if (!empty($c)) {
             $cnt = $c->get(common_cache_key('profile:fave_count:'.$this->id));
             if (is_integer($cnt)) {
@@ -497,7 +497,7 @@ class Profile extends Memcached_DataObject
 
     function noticeCount()
     {
-        $c = common_memcache();
+        $c = Cache::instance();
 
         if (!empty($c)) {
             $cnt = $c->get(common_cache_key('profile:notice_count:'.$this->id));
@@ -519,7 +519,7 @@ class Profile extends Memcached_DataObject
 
     function blowSubscriberCount()
     {
-        $c = common_memcache();
+        $c = Cache::instance();
         if (!empty($c)) {
             $c->delete(common_cache_key('profile:subscriber_count:'.$this->id));
         }
@@ -527,7 +527,7 @@ class Profile extends Memcached_DataObject
 
     function blowSubscriptionCount()
     {
-        $c = common_memcache();
+        $c = Cache::instance();
         if (!empty($c)) {
             $c->delete(common_cache_key('profile:subscription_count:'.$this->id));
         }
@@ -535,7 +535,7 @@ class Profile extends Memcached_DataObject
 
     function blowFaveCount()
     {
-        $c = common_memcache();
+        $c = Cache::instance();
         if (!empty($c)) {
             $c->delete(common_cache_key('profile:fave_count:'.$this->id));
         }
@@ -543,7 +543,7 @@ class Profile extends Memcached_DataObject
 
     function blowNoticeCount()
     {
-        $c = common_memcache();
+        $c = Cache::instance();
         if (!empty($c)) {
             $c->delete(common_cache_key('profile:notice_count:'.$this->id));
         }
diff --git a/classes/User.php b/classes/User.php
index 70e09c1dc4..36db226125 100644
--- a/classes/User.php
+++ b/classes/User.php
@@ -388,7 +388,7 @@ class User extends Memcached_DataObject
 
     function hasFave($notice)
     {
-        $cache = common_memcache();
+        $cache = Cache::instance();
 
         // XXX: Kind of a hack.
 
@@ -487,7 +487,7 @@ class User extends Memcached_DataObject
 
     function blowFavesCache()
     {
-        $cache = common_memcache();
+        $cache = Cache::instance();
         if ($cache) {
             // Faves don't happen chronologically, so we need to blow
             // ;last cache, too
diff --git a/lib/spawningdaemon.php b/lib/spawningdaemon.php
index 2f9f6e32e3..ea09b6fb2f 100644
--- a/lib/spawningdaemon.php
+++ b/lib/spawningdaemon.php
@@ -204,7 +204,7 @@ abstract class SpawningDaemon extends Daemon
 
         // Reconnect main memcached, or threads will stomp on
         // each other and corrupt their requests.
-        $cache = common_memcache();
+        $cache = Cache::instance();
         if ($cache) {
             $cache->reconnect();
         }
diff --git a/lib/stompqueuemanager.php b/lib/stompqueuemanager.php
index fc98c77d40..1d9a5ad207 100644
--- a/lib/stompqueuemanager.php
+++ b/lib/stompqueuemanager.php
@@ -578,7 +578,7 @@ class StompQueueManager extends QueueManager
     function incDeliveryCount($msgId)
     {
 	    $count = 0;
-	    $cache = common_memcache();
+	    $cache = Cache::instance();
 	    if ($cache) {
 		    $key = 'statusnet:stomp:message-retries:' . $msgId;
 		    $count = $cache->increment($key);
diff --git a/lib/util.php b/lib/util.php
index b7d3c80ca9..d56c9124d2 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -37,7 +37,7 @@ function common_user_error($msg, $code=400)
 /**
  * This should only be used at setup; processes switching languages
  * to send text to other users should use common_switch_locale().
- * 
+ *
  * @param string $language Locale language code (optional; empty uses
  *                         current user's preference or site default)
  * @return mixed success
@@ -61,10 +61,10 @@ function common_init_locale($language=null)
 /**
  * Initialize locale and charset settings and gettext with our message catalog,
  * using the current user's language preference or the site default.
- * 
+ *
  * This should generally only be run at framework initialization; code switching
  * languages at runtime should call common_switch_language().
- * 
+ *
  * @access private
  */
 function common_init_language()
@@ -142,7 +142,6 @@ function common_switch_locale($language=null)
     textdomain("statusnet");
 }
 
-
 function common_timezone()
 {
     if (common_logged_in()) {
@@ -1361,13 +1360,13 @@ function common_mtrand($bytes)
 /**
  * Record the given URL as the return destination for a future
  * form submission, to be read by common_get_returnto().
- * 
+ *
  * @param string $url
- * 
+ *
  * @fixme as a session-global setting, this can allow multiple forms
  * to conflict and overwrite each others' returnto destinations if
  * the user has multiple tabs or windows open.
- * 
+ *
  * Should refactor to index with a token or otherwise only pass the
  * data along its intended path.
  */
@@ -1380,13 +1379,13 @@ function common_set_returnto($url)
 /**
  * Fetch a return-destination URL previously recorded by
  * common_set_returnto().
- * 
+ *
  * @return mixed URL string or null
- * 
+ *
  * @fixme as a session-global setting, this can allow multiple forms
  * to conflict and overwrite each others' returnto destinations if
  * the user has multiple tabs or windows open.
- * 
+ *
  * Should refactor to index with a token or otherwise only pass the
  * data along its intended path.
  */
@@ -1809,11 +1808,6 @@ function common_keyize($str)
     return Cache::keyize($str);
 }
 
-function common_memcache()
-{
-    return Cache::instance();
-}
-
 function common_license_terms($uri)
 {
     if(preg_match('/creativecommons.org\/licenses\/([^\/]+)/', $uri, $matches)) {
diff --git a/plugins/GeonamesPlugin.php b/plugins/GeonamesPlugin.php
index 3815a31fa6..c81fb46771 100644
--- a/plugins/GeonamesPlugin.php
+++ b/plugins/GeonamesPlugin.php
@@ -384,7 +384,7 @@ class GeonamesPlugin extends Plugin
 
     function getCache($attrs)
     {
-        $c = common_memcache();
+        $c = Cache::instance();
 
         if (empty($c)) {
             return null;
@@ -399,7 +399,7 @@ class GeonamesPlugin extends Plugin
 
     function setCache($attrs, $loc)
     {
-        $c = common_memcache();
+        $c = Cache::instance();
 
         if (empty($c)) {
             return null;
diff --git a/plugins/LdapCommon/LdapCommon.php b/plugins/LdapCommon/LdapCommon.php
index 1f1647a753..f53660a4c4 100644
--- a/plugins/LdapCommon/LdapCommon.php
+++ b/plugins/LdapCommon/LdapCommon.php
@@ -126,7 +126,7 @@ class LdapCommon
                 }
                 throw new Exception('Could not connect to LDAP server: '.$err->getMessage());
             }
-            $c = common_memcache();
+            $c = Cache::instance();
             if (!empty($c)) {
                 $cacheObj = new MemcacheSchemaCache(
                     array('c'=>$c,
diff --git a/plugins/Minify/MinifyPlugin.php b/plugins/Minify/MinifyPlugin.php
index 13010e75a1..5071fd5a1f 100644
--- a/plugins/Minify/MinifyPlugin.php
+++ b/plugins/Minify/MinifyPlugin.php
@@ -119,7 +119,7 @@ class MinifyPlugin extends Plugin
     function onStartInlineScriptElement($action,&$code,&$type)
     {
         if($this->minifyInlineJs && $type=='text/javascript'){
-            $c = common_memcache();
+            $c = Cache::instance();
             if (!empty($c)) {
                 $cacheKey = common_cache_key(self::cacheKey . ':' . crc32($code));
                 $out = $c->get($cacheKey);
@@ -139,7 +139,7 @@ class MinifyPlugin extends Plugin
     function onStartStyleElement($action,&$code,&$type,&$media)
     {
         if($this->minifyInlineCss && $type=='text/css'){
-            $c = common_memcache();
+            $c = Cache::instance();
             if (!empty($c)) {
                 $cacheKey = common_cache_key(self::cacheKey . ':' . crc32($code));
                 $out = $c->get($cacheKey);
diff --git a/plugins/Minify/minify.php b/plugins/Minify/minify.php
index 64727f5e7e..3e8f86f83b 100644
--- a/plugins/Minify/minify.php
+++ b/plugins/Minify/minify.php
@@ -74,7 +74,7 @@ class MinifyAction extends Action
     {
         parent::handle($args);
         
-        $c = common_memcache();
+        $c = Cache::instance();
         if (!empty($c)) {
             $cacheKey = common_cache_key(MinifyPlugin::cacheKey . ':' . $this->file . '?v=' . empty($this->v)?'':$this->v);
             $out = $c->get($cacheKey);
diff --git a/scripts/clearcache.php b/scripts/clearcache.php
index 0fb75daa03..8f54bc9acc 100644
--- a/scripts/clearcache.php
+++ b/scripts/clearcache.php
@@ -55,7 +55,7 @@ if (!empty($karg)) {
 
 print "Clearing key '$k'...";
 
-$c = common_memcache();
+$c = Cache::instance();
 
 if (empty($c)) {
     die("Can't initialize cache object!\n");
diff --git a/scripts/fixup_inboxes.php b/scripts/fixup_inboxes.php
index d55a538853..7397d75d8e 100755
--- a/scripts/fixup_inboxes.php
+++ b/scripts/fixup_inboxes.php
@@ -46,7 +46,7 @@ if ($start_at) {
 }
 
 $cnt = $user->find();
-$cache = common_memcache();
+$cache = Cache::instance();
 
 while ($user->fetch()) {
     common_log(LOG_INFO, 'Updating inbox for user ' . $user->id);
diff --git a/scripts/showcache.php b/scripts/showcache.php
index 93b57a484b..953ad1a776 100644
--- a/scripts/showcache.php
+++ b/scripts/showcache.php
@@ -55,7 +55,7 @@ if (!empty($karg)) {
 
 print "Checking key '$k'...\n";
 
-$c = common_memcache();
+$c = Cache::instance();
 
 if (empty($c)) {
     die("Can't initialize cache object!\n");
diff --git a/scripts/uncache_users.php b/scripts/uncache_users.php
index 5a1d330307..d8c0a025bc 100644
--- a/scripts/uncache_users.php
+++ b/scripts/uncache_users.php
@@ -34,7 +34,7 @@ common_log(LOG_INFO, 'Updating user inboxes.');
 
 $ids = file($id_file);
 
-$memc = common_memcache();
+$memc = Cache::instance();
 
 foreach ($ids as $id) {
 

From c2de44a53042a30a1bf8e7e9384d2641c2004313 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Mon, 6 Sep 2010 09:59:08 -0400
Subject: [PATCH 209/655] remove NOOP function common_broadcast_notice()

---
 lib/implugin.php | 11 +++--------
 lib/util.php     |  5 -----
 2 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/lib/implugin.php b/lib/implugin.php
index 72d1456f4d..2811e7d644 100644
--- a/lib/implugin.php
+++ b/lib/implugin.php
@@ -59,7 +59,6 @@ abstract class ImPlugin extends Plugin
      */
     abstract function normalize($screenname);
 
-
     /**
      * validate (ensure the validity of) a screenname
      *
@@ -107,7 +106,7 @@ abstract class ImPlugin extends Plugin
      * receive a raw message
      * Raw IM data is taken from the incoming queue, and passed to this function.
      * It should parse the raw message and call handleIncoming()
-     * 
+     *
      * Returning false may CAUSE REPROCESSING OF THE QUEUE ITEM, and should
      * be used for temporary failures only. For permanent failures such as
      * unrecognized addresses, return true to indicate your processing has
@@ -135,7 +134,7 @@ abstract class ImPlugin extends Plugin
      */
     function microiduri($screenname)
     {
-        return $this->transport . ':' . $screenname;    
+        return $this->transport . ':' . $screenname;
     }
     //========================UTILITY FUNCTIONS USEFUL TO IMPLEMENTATIONS - MISC ========================\
 
@@ -180,7 +179,6 @@ abstract class ImPlugin extends Plugin
         }
     }
 
-
     /**
      * given a screenname, get the User_im_prefs object for this transport
      *
@@ -200,7 +198,6 @@ abstract class ImPlugin extends Plugin
         }
     }
 
-
     /**
      * given a User, get their screenname
      *
@@ -218,7 +215,6 @@ abstract class ImPlugin extends Plugin
         }
     }
 
-
     /**
      * given a User, get their User_im_prefs
      *
@@ -500,7 +496,6 @@ abstract class ImPlugin extends Plugin
             return;
         }
 
-        common_broadcast_notice($notice);
         common_log(LOG_INFO,
                    'Added notice ' . $notice->id . ' from user ' . $user->nickname);
         $notice->free();
@@ -508,7 +503,7 @@ abstract class ImPlugin extends Plugin
     }
 
     //========================EVENT HANDLERS========================\
-    
+
     /**
      * Register notice queue handler
      *
diff --git a/lib/util.php b/lib/util.php
index d56c9124d2..a5e29a7818 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -1251,11 +1251,6 @@ function common_redirect($url, $code=307)
     exit;
 }
 
-function common_broadcast_notice($notice, $remote=false)
-{
-    // DO NOTHING!
-}
-
 // Stick the notice on the queue
 
 function common_enqueue_notice($notice)

From e42d2124a319e72f949fa354cc75252f32a5a6c5 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Mon, 6 Sep 2010 10:03:51 -0400
Subject: [PATCH 210/655] common_keyize() -> Cache::keyize()

---
 classes/Memcached_DataObject.php | 2 +-
 classes/Notice.php               | 8 ++++----
 classes/Notice_tag.php           | 6 +++---
 lib/cache.php                    | 2 +-
 lib/util.php                     | 5 -----
 plugins/GeonamesPlugin.php       | 2 +-
 6 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/classes/Memcached_DataObject.php b/classes/Memcached_DataObject.php
index 0c46ef2b41..1c5245b7a2 100644
--- a/classes/Memcached_DataObject.php
+++ b/classes/Memcached_DataObject.php
@@ -302,7 +302,7 @@ class Memcached_DataObject extends Safe_DataObject
             $inst->query($qry);
             return $inst;
         }
-        $key_part = common_keyize($cls).':'.md5($qry);
+        $key_part = Cache::keyize($cls).':'.md5($qry);
         $ckey = common_cache_key($key_part);
         $stored = $c->get($ckey);
 
diff --git a/classes/Notice.php b/classes/Notice.php
index 066e7a584f..7ca1605095 100644
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -1941,10 +1941,10 @@ class Notice extends Memcached_DataObject
 
         if ($tag->find()) {
             while ($tag->fetch()) {
-                self::blow('profile:notice_ids_tagged:%d:%s', $this->profile_id, common_keyize($tag->tag));
-                self::blow('profile:notice_ids_tagged:%d:%s;last', $this->profile_id, common_keyize($tag->tag));
-                self::blow('notice_tag:notice_ids:%s', common_keyize($tag->tag));
-                self::blow('notice_tag:notice_ids:%s;last', common_keyize($tag->tag));
+                self::blow('profile:notice_ids_tagged:%d:%s', $this->profile_id, Cache::keyize($tag->tag));
+                self::blow('profile:notice_ids_tagged:%d:%s;last', $this->profile_id, Cache::keyize($tag->tag));
+                self::blow('notice_tag:notice_ids:%s', Cache::keyize($tag->tag));
+                self::blow('notice_tag:notice_ids:%s;last', Cache::keyize($tag->tag));
                 $tag->delete();
             }
         }
diff --git a/classes/Notice_tag.php b/classes/Notice_tag.php
index a5d0716a71..9ade36c34a 100644
--- a/classes/Notice_tag.php
+++ b/classes/Notice_tag.php
@@ -40,7 +40,7 @@ class Notice_tag extends Memcached_DataObject
 
         $ids = Notice::stream(array('Notice_tag', '_streamDirect'),
                               array($tag),
-                              'notice_tag:notice_ids:' . common_keyize($tag),
+                              'notice_tag:notice_ids:' . Cache::keyize($tag),
                               $offset, $limit);
 
         return Notice::getStreamByIds($ids);
@@ -82,9 +82,9 @@ class Notice_tag extends Memcached_DataObject
 
     function blowCache($blowLast=false)
     {
-        self::blow('notice_tag:notice_ids:%s', common_keyize($this->tag));
+        self::blow('notice_tag:notice_ids:%s', Cache::keyize($this->tag));
         if ($blowLast) {
-            self::blow('notice_tag:notice_ids:%s;last', common_keyize($this->tag));
+            self::blow('notice_tag:notice_ids:%s;last', Cache::keyize($this->tag));
         }
     }
 
diff --git a/lib/cache.php b/lib/cache.php
index c09a1dd9f2..17cc5f0472 100644
--- a/lib/cache.php
+++ b/lib/cache.php
@@ -83,7 +83,7 @@ class Cache
         $base_key = common_config('cache', 'base');
 
         if (empty($base_key)) {
-            $base_key = common_keyize(common_config('site', 'name'));
+            $base_key = self::keyize(common_config('site', 'name'));
         }
 
         return 'statusnet:' . $base_key . ':' . $extra;
diff --git a/lib/util.php b/lib/util.php
index a5e29a7818..f1ca009b4e 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -1798,11 +1798,6 @@ function common_cache_key($extra)
     return Cache::key($extra);
 }
 
-function common_keyize($str)
-{
-    return Cache::keyize($str);
-}
-
 function common_license_terms($uri)
 {
     if(preg_match('/creativecommons.org\/licenses\/([^\/]+)/', $uri, $matches)) {
diff --git a/plugins/GeonamesPlugin.php b/plugins/GeonamesPlugin.php
index c81fb46771..dd882715ba 100644
--- a/plugins/GeonamesPlugin.php
+++ b/plugins/GeonamesPlugin.php
@@ -416,7 +416,7 @@ class GeonamesPlugin extends Plugin
     {
         $key = 'geonames:' .
                implode(',', array_keys($attrs)) . ':'.
-               common_keyize(implode(',', array_values($attrs)));
+               Cache::keyize(implode(',', array_values($attrs)));
         if ($this->cachePrefix) {
             return $this->cachePrefix . ':' . $key;
         } else {

From a319b40c97c2fd6527eeb81d7d2f2d703756ef80 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Mon, 6 Sep 2010 10:07:43 -0400
Subject: [PATCH 211/655] common_cache_key() -> Cache::key()

---
 actions/getfile.php               |  2 +-
 classes/Config.php                |  6 +++---
 classes/Memcached_DataObject.php  | 10 +++++-----
 classes/Notice.php                | 10 +++++-----
 classes/Profile.php               | 24 ++++++++++++------------
 classes/User.php                  |  8 ++++----
 lib/util.php                      |  5 -----
 plugins/GeonamesPlugin.php        |  2 +-
 plugins/LdapCommon/LdapCommon.php |  2 +-
 plugins/Minify/MinifyPlugin.php   |  4 ++--
 plugins/Minify/minify.php         |  2 +-
 scripts/clearcache.php            |  2 +-
 scripts/fixup_inboxes.php         |  2 +-
 scripts/showcache.php             |  2 +-
 scripts/uncache_users.php         |  4 ++--
 15 files changed, 40 insertions(+), 45 deletions(-)

diff --git a/actions/getfile.php b/actions/getfile.php
index 17cca13f4c..a45506ce2a 100644
--- a/actions/getfile.php
+++ b/actions/getfile.php
@@ -131,7 +131,7 @@ class GetfileAction extends Action
 
         $cache = Cache::instance();
         if($cache) {
-            $key = common_cache_key('attachments:etag:' . $this->path);
+            $key = Cache::key('attachments:etag:' . $this->path);
             $etag = $cache->get($key);
             if($etag === false) {
                 $etag = crc32(file_get_contents($this->path));
diff --git a/classes/Config.php b/classes/Config.php
index 43b99587fa..e14730438e 100644
--- a/classes/Config.php
+++ b/classes/Config.php
@@ -58,7 +58,7 @@ class Config extends Memcached_DataObject
         $c = self::memcache();
 
         if (!empty($c)) {
-            $settings = $c->get(common_cache_key(self::settingsKey));
+            $settings = $c->get(Cache::key(self::settingsKey));
             if ($settings !== false) {
                 return $settings;
             }
@@ -77,7 +77,7 @@ class Config extends Memcached_DataObject
         $config->free();
 
         if (!empty($c)) {
-            $c->set(common_cache_key(self::settingsKey), $settings);
+            $c->set(Cache::key(self::settingsKey), $settings);
         }
 
         return $settings;
@@ -154,7 +154,7 @@ class Config extends Memcached_DataObject
         $c = self::memcache();
 
         if (!empty($c)) {
-            $c->delete(common_cache_key(self::settingsKey));
+            $c->delete(Cache::key(self::settingsKey));
         }
     }
 }
diff --git a/classes/Memcached_DataObject.php b/classes/Memcached_DataObject.php
index 1c5245b7a2..6feb59c341 100644
--- a/classes/Memcached_DataObject.php
+++ b/classes/Memcached_DataObject.php
@@ -134,7 +134,7 @@ class Memcached_DataObject extends Safe_DataObject
                 str_replace("\n", " ", $e->getTraceAsString()));
         }
         $vstr = self::valueString($v);
-        return common_cache_key(strtolower($cls).':'.$k.':'.$vstr);
+        return Cache::key(strtolower($cls).':'.$k.':'.$vstr);
     }
 
     static function getcached($cls, $k, $v) {
@@ -303,7 +303,7 @@ class Memcached_DataObject extends Safe_DataObject
             return $inst;
         }
         $key_part = Cache::keyize($cls).':'.md5($qry);
-        $ckey = common_cache_key($key_part);
+        $ckey = Cache::key($key_part);
         $stored = $c->get($ckey);
 
         if ($stored !== false) {
@@ -550,7 +550,7 @@ class Memcached_DataObject extends Safe_DataObject
 
         $keyPart = vsprintf($format, $args);
 
-        $cacheKey = common_cache_key($keyPart);
+        $cacheKey = Cache::key($keyPart);
 
         return $c->delete($cacheKey);
     }
@@ -592,7 +592,7 @@ class Memcached_DataObject extends Safe_DataObject
             return false;
         }
 
-        $cacheKey = common_cache_key($keyPart);
+        $cacheKey = Cache::key($keyPart);
 
         return $c->get($cacheKey);
     }
@@ -605,7 +605,7 @@ class Memcached_DataObject extends Safe_DataObject
             return false;
         }
 
-        $cacheKey = common_cache_key($keyPart);
+        $cacheKey = Cache::key($keyPart);
 
         return $c->set($cacheKey, $value, $flag, $expiry);
     }
diff --git a/classes/Notice.php b/classes/Notice.php
index 7ca1605095..e3d1e85cb1 100644
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -759,7 +759,7 @@ class Notice extends Memcached_DataObject
         $c = self::memcache();
 
         if (!empty($c)) {
-            $ni = $c->get(common_cache_key('notice:who_gets:'.$this->id));
+            $ni = $c->get(Cache::key('notice:who_gets:'.$this->id));
             if ($ni !== false) {
                 return $ni;
             }
@@ -811,7 +811,7 @@ class Notice extends Memcached_DataObject
 
         if (!empty($c)) {
             // XXX: pack this data better
-            $c->set(common_cache_key('notice:who_gets:'.$this->id), $ni);
+            $c->set(Cache::key('notice:who_gets:'.$this->id), $ni);
         }
 
         return $ni;
@@ -1595,7 +1595,7 @@ class Notice extends Memcached_DataObject
                                                                       $max_id)));
         }
 
-        $idkey = common_cache_key($cachekey);
+        $idkey = Cache::key($cachekey);
 
         $idstr = $cache->get($idkey);
 
@@ -1782,12 +1782,12 @@ class Notice extends Memcached_DataObject
         if (empty($cache)) {
             $ids = $this->_repeatStreamDirect($limit);
         } else {
-            $idstr = $cache->get(common_cache_key('notice:repeats:'.$this->id));
+            $idstr = $cache->get(Cache::key('notice:repeats:'.$this->id));
             if ($idstr !== false) {
                 $ids = explode(',', $idstr);
             } else {
                 $ids = $this->_repeatStreamDirect(100);
-                $cache->set(common_cache_key('notice:repeats:'.$this->id), implode(',', $ids));
+                $cache->set(Cache::key('notice:repeats:'.$this->id), implode(',', $ids));
             }
             if ($limit < 100) {
                 // We do a max of 100, so slice down to limit
diff --git a/classes/Profile.php b/classes/Profile.php
index 19564408c8..230b3aa3a0 100644
--- a/classes/Profile.php
+++ b/classes/Profile.php
@@ -432,7 +432,7 @@ class Profile extends Memcached_DataObject
         $c = Cache::instance();
 
         if (!empty($c)) {
-            $cnt = $c->get(common_cache_key('profile:subscription_count:'.$this->id));
+            $cnt = $c->get(Cache::key('profile:subscription_count:'.$this->id));
             if (is_integer($cnt)) {
                 return (int) $cnt;
             }
@@ -446,7 +446,7 @@ class Profile extends Memcached_DataObject
         $cnt = ($cnt > 0) ? $cnt - 1 : $cnt;
 
         if (!empty($c)) {
-            $c->set(common_cache_key('profile:subscription_count:'.$this->id), $cnt);
+            $c->set(Cache::key('profile:subscription_count:'.$this->id), $cnt);
         }
 
         return $cnt;
@@ -456,7 +456,7 @@ class Profile extends Memcached_DataObject
     {
         $c = Cache::instance();
         if (!empty($c)) {
-            $cnt = $c->get(common_cache_key('profile:subscriber_count:'.$this->id));
+            $cnt = $c->get(Cache::key('profile:subscriber_count:'.$this->id));
             if (is_integer($cnt)) {
                 return (int) $cnt;
             }
@@ -468,7 +468,7 @@ class Profile extends Memcached_DataObject
         $cnt = (int) $sub->count('distinct subscriber');
 
         if (!empty($c)) {
-            $c->set(common_cache_key('profile:subscriber_count:'.$this->id), $cnt);
+            $c->set(Cache::key('profile:subscriber_count:'.$this->id), $cnt);
         }
 
         return $cnt;
@@ -478,7 +478,7 @@ class Profile extends Memcached_DataObject
     {
         $c = Cache::instance();
         if (!empty($c)) {
-            $cnt = $c->get(common_cache_key('profile:fave_count:'.$this->id));
+            $cnt = $c->get(Cache::key('profile:fave_count:'.$this->id));
             if (is_integer($cnt)) {
                 return (int) $cnt;
             }
@@ -489,7 +489,7 @@ class Profile extends Memcached_DataObject
         $cnt = (int) $faves->count('distinct notice_id');
 
         if (!empty($c)) {
-            $c->set(common_cache_key('profile:fave_count:'.$this->id), $cnt);
+            $c->set(Cache::key('profile:fave_count:'.$this->id), $cnt);
         }
 
         return $cnt;
@@ -500,7 +500,7 @@ class Profile extends Memcached_DataObject
         $c = Cache::instance();
 
         if (!empty($c)) {
-            $cnt = $c->get(common_cache_key('profile:notice_count:'.$this->id));
+            $cnt = $c->get(Cache::key('profile:notice_count:'.$this->id));
             if (is_integer($cnt)) {
                 return (int) $cnt;
             }
@@ -511,7 +511,7 @@ class Profile extends Memcached_DataObject
         $cnt = (int) $notices->count('distinct id');
 
         if (!empty($c)) {
-            $c->set(common_cache_key('profile:notice_count:'.$this->id), $cnt);
+            $c->set(Cache::key('profile:notice_count:'.$this->id), $cnt);
         }
 
         return $cnt;
@@ -521,7 +521,7 @@ class Profile extends Memcached_DataObject
     {
         $c = Cache::instance();
         if (!empty($c)) {
-            $c->delete(common_cache_key('profile:subscriber_count:'.$this->id));
+            $c->delete(Cache::key('profile:subscriber_count:'.$this->id));
         }
     }
 
@@ -529,7 +529,7 @@ class Profile extends Memcached_DataObject
     {
         $c = Cache::instance();
         if (!empty($c)) {
-            $c->delete(common_cache_key('profile:subscription_count:'.$this->id));
+            $c->delete(Cache::key('profile:subscription_count:'.$this->id));
         }
     }
 
@@ -537,7 +537,7 @@ class Profile extends Memcached_DataObject
     {
         $c = Cache::instance();
         if (!empty($c)) {
-            $c->delete(common_cache_key('profile:fave_count:'.$this->id));
+            $c->delete(Cache::key('profile:fave_count:'.$this->id));
         }
     }
 
@@ -545,7 +545,7 @@ class Profile extends Memcached_DataObject
     {
         $c = Cache::instance();
         if (!empty($c)) {
-            $c->delete(common_cache_key('profile:notice_count:'.$this->id));
+            $c->delete(Cache::key('profile:notice_count:'.$this->id));
         }
     }
 
diff --git a/classes/User.php b/classes/User.php
index 36db226125..c15ddc9dc5 100644
--- a/classes/User.php
+++ b/classes/User.php
@@ -491,10 +491,10 @@ class User extends Memcached_DataObject
         if ($cache) {
             // Faves don't happen chronologically, so we need to blow
             // ;last cache, too
-            $cache->delete(common_cache_key('fave:ids_by_user:'.$this->id));
-            $cache->delete(common_cache_key('fave:ids_by_user:'.$this->id.';last'));
-            $cache->delete(common_cache_key('fave:ids_by_user_own:'.$this->id));
-            $cache->delete(common_cache_key('fave:ids_by_user_own:'.$this->id.';last'));
+            $cache->delete(Cache::key('fave:ids_by_user:'.$this->id));
+            $cache->delete(Cache::key('fave:ids_by_user:'.$this->id.';last'));
+            $cache->delete(Cache::key('fave:ids_by_user_own:'.$this->id));
+            $cache->delete(Cache::key('fave:ids_by_user_own:'.$this->id.';last'));
         }
         $profile = $this->getProfile();
         $profile->blowFaveCount();
diff --git a/lib/util.php b/lib/util.php
index f1ca009b4e..20c9144d47 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -1793,11 +1793,6 @@ function common_session_token()
     return $_SESSION['token'];
 }
 
-function common_cache_key($extra)
-{
-    return Cache::key($extra);
-}
-
 function common_license_terms($uri)
 {
     if(preg_match('/creativecommons.org\/licenses\/([^\/]+)/', $uri, $matches)) {
diff --git a/plugins/GeonamesPlugin.php b/plugins/GeonamesPlugin.php
index dd882715ba..b64ebdba9d 100644
--- a/plugins/GeonamesPlugin.php
+++ b/plugins/GeonamesPlugin.php
@@ -420,7 +420,7 @@ class GeonamesPlugin extends Plugin
         if ($this->cachePrefix) {
             return $this->cachePrefix . ':' . $key;
         } else {
-            return common_cache_key($key);
+            return Cache::key($key);
         }
     }
 
diff --git a/plugins/LdapCommon/LdapCommon.php b/plugins/LdapCommon/LdapCommon.php
index f53660a4c4..d583e30857 100644
--- a/plugins/LdapCommon/LdapCommon.php
+++ b/plugins/LdapCommon/LdapCommon.php
@@ -130,7 +130,7 @@ class LdapCommon
             if (!empty($c)) {
                 $cacheObj = new MemcacheSchemaCache(
                     array('c'=>$c,
-                       'cacheKey' => common_cache_key('ldap_schema:' . $config_id)));
+                       'cacheKey' => Cache::key('ldap_schema:' . $config_id)));
                 $ldap->registerSchemaCache($cacheObj);
             }
             self::$ldap_connections[$config_id] = $ldap;
diff --git a/plugins/Minify/MinifyPlugin.php b/plugins/Minify/MinifyPlugin.php
index 5071fd5a1f..afe6edf5fd 100644
--- a/plugins/Minify/MinifyPlugin.php
+++ b/plugins/Minify/MinifyPlugin.php
@@ -121,7 +121,7 @@ class MinifyPlugin extends Plugin
         if($this->minifyInlineJs && $type=='text/javascript'){
             $c = Cache::instance();
             if (!empty($c)) {
-                $cacheKey = common_cache_key(self::cacheKey . ':' . crc32($code));
+                $cacheKey = Cache::key(self::cacheKey . ':' . crc32($code));
                 $out = $c->get($cacheKey);
             }
             if(empty($out)) {
@@ -141,7 +141,7 @@ class MinifyPlugin extends Plugin
         if($this->minifyInlineCss && $type=='text/css'){
             $c = Cache::instance();
             if (!empty($c)) {
-                $cacheKey = common_cache_key(self::cacheKey . ':' . crc32($code));
+                $cacheKey = Cache::key(self::cacheKey . ':' . crc32($code));
                 $out = $c->get($cacheKey);
             }
             if(empty($out)) {
diff --git a/plugins/Minify/minify.php b/plugins/Minify/minify.php
index 3e8f86f83b..bac1df8e2d 100644
--- a/plugins/Minify/minify.php
+++ b/plugins/Minify/minify.php
@@ -76,7 +76,7 @@ class MinifyAction extends Action
         
         $c = Cache::instance();
         if (!empty($c)) {
-            $cacheKey = common_cache_key(MinifyPlugin::cacheKey . ':' . $this->file . '?v=' . empty($this->v)?'':$this->v);
+            $cacheKey = Cache::key(MinifyPlugin::cacheKey . ':' . $this->file . '?v=' . empty($this->v)?'':$this->v);
             $out = $c->get($cacheKey);
         }
         if(empty($out)) {
diff --git a/scripts/clearcache.php b/scripts/clearcache.php
index 8f54bc9acc..c67d6275d8 100644
--- a/scripts/clearcache.php
+++ b/scripts/clearcache.php
@@ -38,7 +38,7 @@ require_once INSTALLDIR.'/scripts/commandline.inc';
 $karg = get_option_value('k', 'key');
 
 if (!empty($karg)) {
-    $k = common_cache_key($karg);
+    $k = Cache::key($karg);
 } else {
     $table = get_option_value('t', 'table');
     if (empty($table)) {
diff --git a/scripts/fixup_inboxes.php b/scripts/fixup_inboxes.php
index 7397d75d8e..c6e4fd0717 100755
--- a/scripts/fixup_inboxes.php
+++ b/scripts/fixup_inboxes.php
@@ -76,6 +76,6 @@ while ($user->fetch()) {
     $inbox->free();
     unset($inbox);
     if ($cache) {
-        $cache->delete(common_cache_key('user:notices_with_friends:' . $user->id));
+        $cache->delete(Cache::key('user:notices_with_friends:' . $user->id));
     }
 }
diff --git a/scripts/showcache.php b/scripts/showcache.php
index 953ad1a776..8ef08467d6 100644
--- a/scripts/showcache.php
+++ b/scripts/showcache.php
@@ -38,7 +38,7 @@ require_once INSTALLDIR.'/scripts/commandline.inc';
 $karg = get_option_value('k');
 
 if (!empty($karg)) {
-    $k = common_cache_key($karg);
+    $k = Cache::key($karg);
 } else {
     $table = get_option_value('t');
     if (empty($table)) {
diff --git a/scripts/uncache_users.php b/scripts/uncache_users.php
index d8c0a025bc..eb7e398023 100644
--- a/scripts/uncache_users.php
+++ b/scripts/uncache_users.php
@@ -47,6 +47,6 @@ foreach ($ids as $id) {
 
     $user->decache();
 
-    $memc->delete(common_cache_key('user:notices_with_friends:'. $user->id));
-    $memc->delete(common_cache_key('user:notices_with_friends:'. $user->id . ';last'));
+    $memc->delete(Cache::key('user:notices_with_friends:'. $user->id));
+    $memc->delete(Cache::key('user:notices_with_friends:'. $user->id . ';last'));
 }

From 3dd734b2c3ea49c55467cfbfd4b3a5fb38456e87 Mon Sep 17 00:00:00 2001
From: Craig Andrews <candrews@integralblue.com>
Date: Sun, 5 Sep 2010 17:35:43 -0400
Subject: [PATCH 212/655] Remove CSRF protection from username/password login
 and from OpenID login.

---
 actions/login.php              | 20 +-------------------
 plugins/OpenID/openidlogin.php |  9 ---------
 2 files changed, 1 insertion(+), 28 deletions(-)

diff --git a/actions/login.php b/actions/login.php
index d3e4312f71..07c601a4db 100644
--- a/actions/login.php
+++ b/actions/login.php
@@ -118,27 +118,10 @@ class LoginAction extends Action
      * @return void
      */
 
-    function checkLogin($user_id=null, $token=null)
+    function checkLogin($user_id=null)
     {
         // XXX: login throttle
 
-        // CSRF protection - token set in NoticeForm
-        $token = $this->trimmed('token');
-        if (!$token || $token != common_session_token()) {
-	    $st = common_session_token();
-	    if (empty($token)) {
-		common_log(LOG_WARNING, 'No token provided by client.');
-	    } else if (empty($st)) {
-		common_log(LOG_WARNING, 'No session token stored.');
-	    } else {
-		common_log(LOG_WARNING, 'Token = ' . $token . ' and session token = ' . $st);
-	    }
-
-            $this->clientError(_('There was a problem with your session token. '.
-                                 'Try again, please.'));
-            return;
-        }
-
         $nickname = $this->trimmed('nickname');
         $password = $this->arg('password');
 
@@ -261,7 +244,6 @@ class LoginAction extends Action
         $this->elementEnd('li');
         $this->elementEnd('ul');
         $this->submit('submit', _('Login'));
-        $this->hidden('token', common_session_token());
         $this->elementEnd('fieldset');
         $this->elementEnd('form');
         $this->elementStart('p');
diff --git a/plugins/OpenID/openidlogin.php b/plugins/OpenID/openidlogin.php
index 20d6e070cd..f3a5c88479 100644
--- a/plugins/OpenID/openidlogin.php
+++ b/plugins/OpenID/openidlogin.php
@@ -42,14 +42,6 @@ class OpenidloginAction extends Action
 
             oid_assert_allowed($openid_url);
 
-            # CSRF protection
-            $token = $this->trimmed('token');
-            if (!$token || $token != common_session_token()) {
-                // TRANS: Message given when there is a problem with the user's session token.
-                $this->showForm(_m('There was a problem with your session token. Try again, please.'), $openid_url);
-                return;
-            }
-
             $rememberme = $this->boolean('rememberme');
 
             common_ensure_session();
@@ -136,7 +128,6 @@ class OpenidloginAction extends Action
         $this->elementStart('fieldset');
         // TRANS: OpenID plugin logon form legend.
         $this->element('legend', null, _m('OpenID login'));
-        $this->hidden('token', common_session_token());
 
         $this->elementStart('ul', 'form_data');
         $this->elementStart('li');

From 8d54809c3561bf56afcdb401ef3c009e9a180cbc Mon Sep 17 00:00:00 2001
From: Craig Andrews <candrews@integralblue.com>
Date: Sun, 5 Sep 2010 17:43:29 -0400
Subject: [PATCH 213/655] move xrd and hostmeta out of the OStatus plugin and
 into core add event for setting up hostmeta, and use them in the OStatus
 plugin

---
 EVENTS.txt                                    |  8 ++++++-
 .../OStatus/actions => actions}/hostmeta.php  | 23 ++++++++++++++-----
 index.php                                     |  2 +-
 lib/router.php                                |  2 ++
 {plugins/OStatus/lib => lib}/xrd.php          |  0
 plugins/OStatus/OStatusPlugin.php             | 10 ++++++--
 6 files changed, 35 insertions(+), 10 deletions(-)
 rename {plugins/OStatus/actions => actions}/hostmeta.php (75%)
 rename {plugins/OStatus/lib => lib}/xrd.php (100%)

diff --git a/EVENTS.txt b/EVENTS.txt
index 17e7d62b60..8b7448d675 100644
--- a/EVENTS.txt
+++ b/EVENTS.txt
@@ -551,6 +551,12 @@ EndPublicXRDS: End XRDS output (right before the closing XRDS tag)
 - $action: the current action
 - &$xrdsoutputter - XRDSOutputter object to write to
 
+StartHostMetaLinks: Start /.well-known/host-meta links
+- &links: array containing the links elements to be written
+
+EndHostMetaLinks: End /.well-known/host-meta links
+- &links: array containing the links elements to be written
+
 StartCheckPassword: Check a username/password
 - $nickname: The nickname to check
 - $password: The password to check
@@ -1095,4 +1101,4 @@ StartShowPageTitle: when beginning to show the page title <h1>
 - $action: action being shown
 
 EndShowPageTitle: when done showing the page title <h1>
-- $action: action being shown
\ No newline at end of file
+- $action: action being shown
diff --git a/plugins/OStatus/actions/hostmeta.php b/actions/hostmeta.php
similarity index 75%
rename from plugins/OStatus/actions/hostmeta.php
rename to actions/hostmeta.php
index 8ca07f9165..be73665f29 100644
--- a/plugins/OStatus/actions/hostmeta.php
+++ b/actions/hostmeta.php
@@ -18,8 +18,10 @@
  */
 
 /**
- * @package OStatusPlugin
+ * @category Action
+ * @package  StatusNet
  * @maintainer James Walker <james@status.net>
+ * @author   Craig Andrews <candrews@integralblue.com>
  */
 
 if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
@@ -27,19 +29,28 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 class HostMetaAction extends Action
 {
 
+    /**
+     * Is read only?
+     *
+     * @return boolean true
+     */
+    function isReadOnly()
+    {
+        return true;
+    }
+
     function handle()
     {
         parent::handle();
 
         $domain = common_config('site', 'server');
-        $url = common_local_url('userxrd');
-        $url.= '?uri={uri}';
 
         $xrd = new XRD();
         $xrd->host = $domain;
-        $xrd->links[] = array('rel' => Discovery::LRDD_REL,
-                              'template' => $url,
-                              'title' => array('Resource Descriptor'));
+
+        if(Event::handle('StartHostMetaLinks', array(&$xrd->links))) {
+            Event::handle('EndHostMetaLinks', array(&$xrd->links));
+        }
 
         header('Content-type: application/xrd+xml');
         print $xrd->toXML();
diff --git a/index.php b/index.php
index 3efe5c8e49..21e222e3b8 100644
--- a/index.php
+++ b/index.php
@@ -204,7 +204,7 @@ function checkMirror($action_obj, $args)
 
 function isLoginAction($action)
 {
-    static $loginActions =  array('login', 'recoverpassword', 'api', 'doc', 'register', 'publicxrds', 'otp', 'opensearch', 'rsd');
+    static $loginActions =  array('login', 'recoverpassword', 'api', 'doc', 'register', 'publicxrds', 'otp', 'opensearch', 'rsd', 'hostmeta');
 
     $login = null;
 
diff --git a/lib/router.php b/lib/router.php
index ca3c2e880c..86dd116c8d 100644
--- a/lib/router.php
+++ b/lib/router.php
@@ -151,6 +151,8 @@ class Router
 
             $m->connect('main/xrds',
                         array('action' => 'publicxrds'));
+            $m->connect('.well-known/host-meta',
+                        array('action' => 'hostmeta'));
 
             // these take a code
 
diff --git a/plugins/OStatus/lib/xrd.php b/lib/xrd.php
similarity index 100%
rename from plugins/OStatus/lib/xrd.php
rename to lib/xrd.php
diff --git a/plugins/OStatus/OStatusPlugin.php b/plugins/OStatus/OStatusPlugin.php
index 77bc9872b4..dd15099542 100644
--- a/plugins/OStatus/OStatusPlugin.php
+++ b/plugins/OStatus/OStatusPlugin.php
@@ -50,8 +50,6 @@ class OStatusPlugin extends Plugin
     function onRouterInitialized($m)
     {
         // Discovery actions
-        $m->connect('.well-known/host-meta',
-                    array('action' => 'hostmeta'));
         $m->connect('main/xrd',
                     array('action' => 'userxrd'));
         $m->connect('main/ownerxrd',
@@ -1012,4 +1010,12 @@ class OStatusPlugin extends Plugin
 
         return true;
     }
+
+    function onStartHostMetaLinks(&$links) {
+        $url = common_local_url('userxrd');
+        $url.= '?uri={uri}';
+        $links[] = array('rel' => Discovery::LRDD_REL,
+                              'template' => $url,
+                              'title' => array('Resource Descriptor'));
+    }
 }

From 6f95ccd37de1f7e2063206e87c93cbe06097eae7 Mon Sep 17 00:00:00 2001
From: Craig Andrews <candrews@integralblue.com>
Date: Sun, 5 Sep 2010 18:03:31 -0400
Subject: [PATCH 214/655] Create Account Manager plugin implementing the
 Account Management specification Add Account Manager support to the OpenID
 plugin

---
 ...AccountManagementControlDocumentAction.php |  98 +++++++++++++++
 .../AccountManagementSessionStatusAction.php  |  73 +++++++++++
 .../AccountManager/AccountManagerPlugin.php   | 115 ++++++++++++++++++
 plugins/AccountManager/README                 |  16 +++
 plugins/OpenID/OpenIDPlugin.php               |  22 ++++
 5 files changed, 324 insertions(+)
 create mode 100644 plugins/AccountManager/AccountManagementControlDocumentAction.php
 create mode 100644 plugins/AccountManager/AccountManagementSessionStatusAction.php
 create mode 100644 plugins/AccountManager/AccountManagerPlugin.php
 create mode 100644 plugins/AccountManager/README

diff --git a/plugins/AccountManager/AccountManagementControlDocumentAction.php b/plugins/AccountManager/AccountManagementControlDocumentAction.php
new file mode 100644
index 0000000000..3fcea5af42
--- /dev/null
+++ b/plugins/AccountManager/AccountManagementControlDocumentAction.php
@@ -0,0 +1,98 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Implements the JSON Account Management endpoint
+ *
+ * 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  AccountManager
+ * @package   StatusNet
+ * @author    Craig Andrews <candrews@integralblue.com>
+ * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
+/**
+ * Implements the JSON Account Management endpoint
+ *
+ * @category AccountManager
+ * @package  StatusNet
+ * @author   ECraig Andrews <candrews@integralblue.com>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://status.net/
+ */
+
+class AccountManagementControlDocumentAction extends Action
+{
+    /**
+     * handle the action
+     *
+     * @param array $args unused.
+     *
+     * @return void
+     */
+
+    function handle($args)
+    {
+        parent::handle($args);
+
+        header('Content-Type: application/json; charset=utf-8');
+
+        $amcd = array();
+
+        if(Event::handle('StartAccountManagementControlDocument', array(&$amcd))) {
+
+            $amcd['version'] = 1;
+            $amcd['sessionstatus'] = array(
+                'method' => 'GET',
+                'path' => common_local_url('AccountManagementSessionStatus')
+            );
+            $amcd['auth-methods'] = array(
+                'username-password-form' => array(
+                    'connect' => array(
+                        'method' => 'POST',
+                        'path' => common_local_url('login'),
+                        'params' => array(
+                            'username' => 'nickname',
+                            'password' => 'password'
+                        )
+                    ),
+                    'disconnect' => array(
+                        'method' => 'GET',
+                        'path' => common_local_url('logout')
+                    )
+                )
+            );
+
+            Event::handle('EndAccountManagementControlDocument', array(&$amcd));
+        }
+        
+        print json_encode($amcd);
+
+        return true;
+    }
+
+    function isReadOnly()
+    {
+        return true;
+    }
+}
diff --git a/plugins/AccountManager/AccountManagementSessionStatusAction.php b/plugins/AccountManager/AccountManagementSessionStatusAction.php
new file mode 100644
index 0000000000..48b6034ff6
--- /dev/null
+++ b/plugins/AccountManager/AccountManagementSessionStatusAction.php
@@ -0,0 +1,73 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Implements the session status Account Management endpoint
+ *
+ * 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  AccountManager
+ * @package   StatusNet
+ * @author    Craig Andrews <candrews@integralblue.com>
+ * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
+/**
+ * Implements the session status Account Management endpoint
+ *
+ * @category AccountManager
+ * @package  StatusNet
+ * @author   ECraig Andrews <candrews@integralblue.com>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://status.net/
+ */
+
+class AccountManagementSessionStatusAction extends Action
+{
+    /**
+     * handle the action
+     *
+     * @param array $args unused.
+     *
+     * @return void
+     */
+
+    function handle($args)
+    {
+        parent::handle($args);
+
+        $cur = common_current_user();
+        if(empty($cur)) {
+            print 'none';
+        } else {
+            //TODO it seems " should be escaped in the name and id, but the spec doesn't seem to indicate how to do that
+            print 'active; name="' . $cur->nickname . '"; id="' . $cur->nickname . '"';
+        }
+
+        return true;
+    }
+
+    function isReadOnly()
+    {
+        return true;
+    }
+}
diff --git a/plugins/AccountManager/AccountManagerPlugin.php b/plugins/AccountManager/AccountManagerPlugin.php
new file mode 100644
index 0000000000..52dd64a24b
--- /dev/null
+++ b/plugins/AccountManager/AccountManagerPlugin.php
@@ -0,0 +1,115 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Plugin to implement the Account Manager specification
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Plugin
+ * @package   StatusNet
+ * @author    Craig Andrews <candrews@integralblue.com>
+ * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org
+ * @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);
+}
+
+class AccountManagerPlugin extends Plugin
+{
+
+    const AM_REL = 'acct-mgmt';
+
+    function __construct()
+    {
+        parent::__construct();
+    }
+
+    function onAutoload($cls)
+    {
+        switch ($cls)
+        {
+         case 'AccountManagementControlDocumentAction':
+            require_once(INSTALLDIR.'/plugins/AccountManager/AccountManagementControlDocumentAction.php');
+            return false;
+         case 'AccountManagementSessionStatusAction':
+            require_once(INSTALLDIR.'/plugins/AccountManager/AccountManagementSessionStatusAction.php');
+            return false;
+        }
+    }
+
+    /**
+     * Hook for RouterInitialized event.
+     *
+     * @param Net_URL_Mapper $m path-to-action mapper
+     * @return boolean hook return
+     */
+    function onRouterInitialized($m)
+    {
+        // Discovery actions
+        $m->connect('main/amcd.json',
+                    array('action' => 'AccountManagementControlDocument'));
+        $m->connect('main/amsessionstatus',
+                    array('action' => 'AccountManagementSessionStatus'));
+        return true;
+    }
+
+    function onStartHostMetaLinks(&$links) {
+        $links[] = array('rel' => AccountManagerPlugin::AM_REL,
+                              'href' =>  common_local_url('AccountManagementControlDocument'));
+    }
+
+    function onStartShowHTML($action)
+    {
+        //Account management discovery link
+        header('Link: <'.common_local_url('AccountManagementControlDocument').'>; rel="'. AccountManagerPlugin::AM_REL.'"; type="application/json"');
+
+        //Account management login status
+        $cur = common_current_user();
+        if(empty($cur)) {
+            header('X-Account-Management-Status: none');
+        } else {
+            //TODO it seems " should be escaped in the name and id, but the spec doesn't seem to indicate how to do that
+            header('X-Account-Management-Status: active; name="' . $cur->nickname . '"; id="' . $cur->nickname . '"');
+        }
+    }
+
+    function onLoginAction($action, &$login) {
+        switch ($action) 
+        {
+         case 'AccountManagementControlDocument':
+            $login = true;
+            return false;
+         default:
+            return true;
+        }
+
+    }
+
+    function onPluginVersion(&$versions)
+    {
+        $versions[] = array('name' => 'AccountManager',
+                            'version' => STATUSNET_VERSION,
+                            'author' => 'Craig Andrews',
+                            'homepage' => 'http://status.net/wiki/Plugin:AccountManager',
+                            'rawdescription' =>
+                            _m('The Account Manager plugin implements the Account Manager specification.'));
+        return true;
+    }
+}
diff --git a/plugins/AccountManager/README b/plugins/AccountManager/README
new file mode 100644
index 0000000000..a0715927b3
--- /dev/null
+++ b/plugins/AccountManager/README
@@ -0,0 +1,16 @@
+The Account Manager plugin implements the Account Manager specification to "allow a server to describe an account-based user identification process in terms that a user-agent can understand."
+
+See https://wiki.mozilla.org/Labs/Weave/Identity/Account_Manager/Spec/Latest
+
+Installation
+============
+add "addPlugin('accountManager');"
+to the bottom of your config.php
+
+Settings
+========
+none
+
+Example
+=======
+addPlugin('accountManager');
diff --git a/plugins/OpenID/OpenIDPlugin.php b/plugins/OpenID/OpenIDPlugin.php
index 7d6a5dc000..e58440fc10 100644
--- a/plugins/OpenID/OpenIDPlugin.php
+++ b/plugins/OpenID/OpenIDPlugin.php
@@ -630,6 +630,28 @@ class OpenIDPlugin extends Plugin
         return true;
     }
 
+    /**
+     * Add OpenID information to the Account Management Control Document
+     * Event supplied by the Account Manager plugin
+     *
+     * @param array &$amcd Array that expresses the AMCD
+     *
+     * @return boolean hook value
+     */
+
+    function onEndAccountManagementControlDocument(&$amcd)
+    {
+        $amcd['auth-methods']['openid'] = array(
+            'connect' => array(
+                'method' => 'POST',
+                'path' => common_local_url('openidlogin'),
+                'params' => array(
+                    'identity' => 'openid_url'
+                )
+            )
+        );
+    }
+
     /**
      * Add our version information to output
      *

From fca7ea664ba4d860dd3a3c798873b4638cd0138d Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Sat, 11 Sep 2010 16:16:38 -0400
Subject: [PATCH 215/655] move view designs setting to user design tab

---
 actions/othersettings.php      |  7 ---
 actions/userdesignsettings.php | 79 +++++++++++++++++++++++++++++++++-
 lib/designform.php             | 22 +++++-----
 lib/designsettings.php         | 12 +++---
 4 files changed, 94 insertions(+), 26 deletions(-)

diff --git a/actions/othersettings.php b/actions/othersettings.php
index 8d6e004047..3f2d8df6b4 100644
--- a/actions/othersettings.php
+++ b/actions/othersettings.php
@@ -134,10 +134,6 @@ class OthersettingsAction extends AccountSettingsAction
                      $this->arg('maxnoticelength') : User_urlshortener_prefs::maxNoticeLength($user),
                      _('URLs in notices longer than this will be shortened.'));
         $this->elementEnd('li');
-        $this->elementStart('li');
-        $this->checkbox('viewdesigns', _('View profile designs'),
-                         -                        $user->viewdesigns, _('Show or hide profile designs.'));
-        $this->elementEnd('li');
         $this->elementEnd('ul');
         $this->submit('save', _('Save'));
         $this->elementEnd('fieldset');
@@ -170,8 +166,6 @@ class OthersettingsAction extends AccountSettingsAction
             return;
         }
 
-        $viewdesigns = $this->boolean('viewdesigns');
-
         $maxurllength = $this->trimmed('maxurllength');
 
         if (!Validate::number($maxurllength, array('min' => 0))) {
@@ -193,7 +187,6 @@ class OthersettingsAction extends AccountSettingsAction
         $original = clone($user);
 
         $user->urlshorteningservice = $urlshorteningservice;
-        $user->viewdesigns          = $viewdesigns;
 
         $result = $user->update($original);
 
diff --git a/actions/userdesignsettings.php b/actions/userdesignsettings.php
index 1cf8780006..e6caea3a1b 100644
--- a/actions/userdesignsettings.php
+++ b/actions/userdesignsettings.php
@@ -120,6 +120,20 @@ class UserDesignSettingsAction extends DesignSettingsAction
         $this->showDesignForm($design);
     }
 
+    /**
+     * Shows the design settings form
+     *
+     * @param Design $design a working design to show
+     *
+     * @return nothing
+     */
+
+    function showDesignForm($design)
+    {
+        $form = new UserDesignForm($this, $design, $this->submitaction);
+        $form->show();
+    }
+
     /**
      * Save or update the user's design settings
      *
@@ -128,6 +142,8 @@ class UserDesignSettingsAction extends DesignSettingsAction
 
     function saveDesign()
     {
+        $this->saveDesignPreferences();
+
         foreach ($this->args as $key => $val) {
             if (preg_match('/(#ho|ho)Td.*g/i', $val)) {
                 $this->sethd();
@@ -164,7 +180,8 @@ class UserDesignSettingsAction extends DesignSettingsAction
             $tile = true;
         }
 
-        $user   = common_current_user();
+        $user = common_current_user();
+
         $design = $user->getDesign();
 
         if (!empty($design)) {
@@ -282,4 +299,64 @@ class UserDesignSettingsAction extends DesignSettingsAction
         $this->showForm(_('Enjoy your hotdog!'), true);
     }
 
+    function saveDesignPreferences()
+    {
+        $viewdesigns = $this->boolean('viewdesigns');
+
+        $user = common_current_user();
+
+        $original = clone($user);
+
+        $user->viewdesigns = $viewdesigns;
+
+        $result = $user->update($original);
+
+        if ($result === false) {
+            common_log_db_error($user, 'UPDATE', __FILE__);
+            throw new ServerException(_('Couldn\'t update user.'));
+        }
+    }
+}
+
+class UserDesignForm extends DesignForm
+{
+    function __construct($out, $design, $actionurl)
+    {
+        parent::__construct($out, $design, $actionurl);
+    }
+
+    /**
+     * Legend of the Form
+     *
+     * @return void
+     */
+    function formLegend()
+    {
+        $this->out->element('legend', null, _('Design settings'));
+    }
+
+    /**
+     * Data elements of the form
+     *
+     * @return void
+     */
+
+    function formData()
+    {
+        $user = common_current_user();
+
+        $this->out->elementStart('ul', 'form_data');
+        $this->out->elementStart('li');
+        $this->out->checkbox('viewdesigns', _('View profile designs'),
+                         -                        $user->viewdesigns, _('Show or hide profile designs.'));
+        $this->out->elementEnd('li');
+        $this->out->elementEnd('ul');
+
+        $this->out->elementEnd('fieldset');
+
+        $this->out->elementStart('fieldset');
+        $this->out->element('legend', null, _('Background file'));
+
+        parent::formData();
+    }
 }
diff --git a/lib/designform.php b/lib/designform.php
index 89e7f6ce8b..4163cfc1a6 100644
--- a/lib/designform.php
+++ b/lib/designform.php
@@ -160,13 +160,13 @@ class DesignForm extends Form
                                            'value' => ImageFile::maxFileSizeInt()));
         $this->out->elementEnd('li');
 
-        if (!empty($design->backgroundimage)) {
+        if (!empty($this->design->backgroundimage)) {
 
             $this->out->elementStart('li', array('id' =>
                                                  'design_background-image_onoff'));
 
             $this->out->element('img', array('src' =>
-                                             Design::url($design->backgroundimage)));
+                                             Design::url($this->design->backgroundimage)));
 
             $attrs = array('name' => 'design_background-image_onoff',
                            'type' => 'radio',
@@ -174,7 +174,7 @@ class DesignForm extends Form
                            'class' => 'radio',
                            'value' => 'on');
 
-            if ($design->disposition & BACKGROUND_ON) {
+            if ($this->design->disposition & BACKGROUND_ON) {
                 $attrs['checked'] = 'checked';
             }
 
@@ -190,7 +190,7 @@ class DesignForm extends Form
                            'class' => 'radio',
                            'value' => 'off');
 
-            if ($design->disposition & BACKGROUND_OFF) {
+            if ($this->design->disposition & BACKGROUND_OFF) {
                 $attrs['checked'] = 'checked';
             }
 
@@ -205,7 +205,7 @@ class DesignForm extends Form
             $this->out->elementStart('li');
             $this->out->checkbox('design_background-image_repeat',
                                  _('Tile background image'),
-                                 ($design->disposition & BACKGROUND_TILE) ? true : false);
+                                 ($this->design->disposition & BACKGROUND_TILE) ? true : false);
             $this->out->elementEnd('li');
         }
 
@@ -218,7 +218,7 @@ class DesignForm extends Form
 
         try {
 
-            $bgcolor = new WebColor($design->backgroundcolor);
+            $bgcolor = new WebColor($this->design->backgroundcolor);
 
             $this->out->elementStart('li');
             $this->out->element('label', array('for' => 'swatch-1'), _('Background'));
@@ -231,7 +231,7 @@ class DesignForm extends Form
                                                'value' => ''));
             $this->out->elementEnd('li');
 
-            $ccolor = new WebColor($design->contentcolor);
+            $ccolor = new WebColor($this->design->contentcolor);
 
             $this->out->elementStart('li');
             $this->out->element('label', array('for' => 'swatch-2'), _('Content'));
@@ -244,7 +244,7 @@ class DesignForm extends Form
                                                'value' => ''));
             $this->out->elementEnd('li');
 
-            $sbcolor = new WebColor($design->sidebarcolor);
+            $sbcolor = new WebColor($this->design->sidebarcolor);
 
             $this->out->elementStart('li');
             $this->out->element('label', array('for' => 'swatch-3'), _('Sidebar'));
@@ -257,7 +257,7 @@ class DesignForm extends Form
                                                'value' => ''));
             $this->out->elementEnd('li');
 
-            $tcolor = new WebColor($design->textcolor);
+            $tcolor = new WebColor($this->design->textcolor);
 
             $this->out->elementStart('li');
             $this->out->element('label', array('for' => 'swatch-4'), _('Text'));
@@ -270,7 +270,7 @@ class DesignForm extends Form
                                                'value' => ''));
             $this->out->elementEnd('li');
 
-            $lcolor = new WebColor($design->linkcolor);
+            $lcolor = new WebColor($this->design->linkcolor);
 
             $this->out->elementStart('li');
             $this->out->element('label', array('for' => 'swatch-5'), _('Links'));
@@ -284,7 +284,7 @@ class DesignForm extends Form
             $this->out->elementEnd('li');
 
         } catch (WebColorException $e) {
-            common_log(LOG_ERR, 'Bad color values in design ID: ' .$design->id);
+            common_log(LOG_ERR, 'Bad color values in design ID: ' .$this->design->id);
         }
 
         $this->out->elementEnd('ul');
diff --git a/lib/designsettings.php b/lib/designsettings.php
index 98ef8256cd..58578f1886 100644
--- a/lib/designsettings.php
+++ b/lib/designsettings.php
@@ -174,28 +174,26 @@ class DesignSettingsAction extends AccountSettingsAction
 
     function saveBackgroundImage($design)
     {
-
         // Now that we have a Design ID we can add a file to the design.
         // XXX: This is an additional DB hit, but figured having the image
         // associated with the Design rather than the User was worth
         // it. -- Zach
 
-        if ($_FILES['design_background-image_file']['error'] ==
-            UPLOAD_ERR_OK) {
+        if (array_key_exists('design_background-image_file', $_FILES) &&
+          $_FILES['design_background-image_file']['error'] == UPLOAD_ERR_OK) {
 
             $filepath = null;
 
             try {
-                $imagefile =
-                    ImageFile::fromUpload('design_background-image_file');
+                $imagefile = ImageFile::fromUpload('design_background-image_file');
             } catch (Exception $e) {
                 $this->showForm($e->getMessage());
                 return;
             }
 
             $filename = Design::filename($design->id,
-                image_type_to_extension($imagefile->type),
-                    common_timestamp());
+                                         image_type_to_extension($imagefile->type),
+                                         common_timestamp());
 
             $filepath = Design::path($filename);
 

From 76c0e3169b317137704ae094dec7bf955fe96a13 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Sat, 11 Sep 2010 16:22:03 -0400
Subject: [PATCH 216/655] move othersettings to urlsettings

---
 actions/{othersettings.php => urlsettings.php} | 6 +++---
 lib/accountsettingsaction.php                  | 8 ++++----
 lib/router.php                                 | 2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)
 rename actions/{othersettings.php => urlsettings.php} (97%)

diff --git a/actions/othersettings.php b/actions/urlsettings.php
similarity index 97%
rename from actions/othersettings.php
rename to actions/urlsettings.php
index 3f2d8df6b4..dd191a807b 100644
--- a/actions/othersettings.php
+++ b/actions/urlsettings.php
@@ -47,7 +47,7 @@ require_once INSTALLDIR.'/lib/accountsettingsaction.php';
  * @link     http://status.net/
  */
 
-class OthersettingsAction extends AccountSettingsAction
+class UrlsettingsAction extends AccountSettingsAction
 {
     /**
      * Title of the page
@@ -57,7 +57,7 @@ class OthersettingsAction extends AccountSettingsAction
 
     function title()
     {
-        return _('Other settings');
+        return _('URL settings');
     }
 
     /**
@@ -93,7 +93,7 @@ class OthersettingsAction extends AccountSettingsAction
                                           'id' => 'form_settings_other',
                                           'class' => 'form_settings',
                                           'action' =>
-                                          common_local_url('othersettings')));
+                                          common_local_url('urlsettings')));
         $this->elementStart('fieldset');
         $this->hidden('token', common_session_token());
         $this->elementStart('ul', 'form_data');
diff --git a/lib/accountsettingsaction.php b/lib/accountsettingsaction.php
index 57740f8b85..819f749f73 100644
--- a/lib/accountsettingsaction.php
+++ b/lib/accountsettingsaction.php
@@ -139,12 +139,12 @@ class AccountSettingsNav extends Widget
                 $this->showMenuItem('userdesignsettings',_('Design'),$title);
                 Event::handle('EndAccountSettingsDesignMenuItem', array($this, &$menu));
             }
-            if(Event::handle('StartAccountSettingsOtherMenuItem', array($this, &$menu))){
+            if(Event::handle('StartAccountSettingsUrlMenuItem', array($this, &$menu))){
                 // TRANS: Link title attribute in user account settings menu.
-                $title = _('Other options');
+                $title = _('URL shortener settings');
                 // TRANS: Link description in user account settings menu.
-                $this->showMenuItem('othersettings',_('Other'),$title);
-                Event::handle('EndAccountSettingsOtherMenuItem', array($this, &$menu));
+                $this->showMenuItem('urlsettings',_('URL'),$title);
+                Event::handle('EndAccountSettingsUrlMenuItem', array($this, &$menu));
             }
 
             Event::handle('EndAccountSettingsNav', array(&$this->action));
diff --git a/lib/router.php b/lib/router.php
index 86dd116c8d..30f6c8cdc9 100644
--- a/lib/router.php
+++ b/lib/router.php
@@ -172,7 +172,7 @@ class Router
             // settings
 
             foreach (array('profile', 'avatar', 'password', 'im', 'oauthconnections',
-                           'oauthapps', 'email', 'sms', 'userdesign', 'other') as $s) {
+                           'oauthapps', 'email', 'sms', 'userdesign', 'url') as $s) {
                 $m->connect('settings/'.$s, array('action' => $s.'settings'));
             }
 

From 76788d97902081800355c25d39a2b527bb282ea7 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Sat, 11 Sep 2010 16:23:41 -0400
Subject: [PATCH 217/655] note what 0 means for shorteners

---
 actions/urlsettings.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/actions/urlsettings.php b/actions/urlsettings.php
index dd191a807b..ddf8daa2ae 100644
--- a/actions/urlsettings.php
+++ b/actions/urlsettings.php
@@ -125,14 +125,14 @@ class UrlsettingsAction extends AccountSettingsAction
                      _('URL longer than'),
                      (!is_null($this->arg('maxurllength'))) ?
                      $this->arg('maxurllength') : User_urlshortener_prefs::maxUrlLength($user),
-                     _('URLs longer than this will be shortened.'));
+                     _('URLs longer than this will be shortened, 0 means always shorten.'));
         $this->elementEnd('li');
         $this->elementStart('li');
         $this->input('maxnoticelength',
                      _('Text longer than'),
                      (!is_null($this->arg('maxnoticelength'))) ?
                      $this->arg('maxnoticelength') : User_urlshortener_prefs::maxNoticeLength($user),
-                     _('URLs in notices longer than this will be shortened.'));
+                     _('URLs in notices longer than this will be shortened, 0 means always shorten.'));
         $this->elementEnd('li');
         $this->elementEnd('ul');
         $this->submit('save', _('Save'));

From 2db8aa3ec3f6804f8f16efe754aafb149f4035c9 Mon Sep 17 00:00:00 2001
From: Craig Andrews <candrews@integralblue.com>
Date: Tue, 21 Sep 2010 18:04:28 -0400
Subject: [PATCH 218/655] Do not allow blank passwords when authenticating
 against LDAP.

---
 plugins/LdapCommon/LdapCommon.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/plugins/LdapCommon/LdapCommon.php b/plugins/LdapCommon/LdapCommon.php
index d583e30857..09ff54bad9 100644
--- a/plugins/LdapCommon/LdapCommon.php
+++ b/plugins/LdapCommon/LdapCommon.php
@@ -144,6 +144,12 @@ class LdapCommon
         if(!$entry){
             return false;
         }else{
+            if(empty($password)) {
+                //NET_LDAP2 will do an anonymous bind if bindpw is not set / empty string
+                //which causes all login attempts that involve a blank password to appear
+                //to succeed. Which is obviously not good.
+                return false;
+            }
             $config = $this->get_ldap_config();
             $config['binddn']=$entry->dn();
             $config['bindpw']=$password;

From a249bf2b1623b1b25304cc012d28e400460e705f Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Wed, 6 Oct 2010 17:21:04 -0700
Subject: [PATCH 219/655] Add .mo files to gitignore

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index d84e5e7424..bf491ec3c2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,3 +26,4 @@ lac08.log
 php.log
 .DS_Store
 nbproject
+*.mo

From 6df4ed697cfe2489f2909980a2b7b6da7365e6d7 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Wed, 6 Oct 2010 18:28:19 -0700
Subject: [PATCH 220/655] quickie script to test schema fetch

---
 scripts/dumpschema.php | 45 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100644 scripts/dumpschema.php

diff --git a/scripts/dumpschema.php b/scripts/dumpschema.php
new file mode 100644
index 0000000000..567eadfb20
--- /dev/null
+++ b/scripts/dumpschema.php
@@ -0,0 +1,45 @@
+#!/usr/bin/env php
+<?php
+/*
+ * StatusNet - a distributed open-source microblogging tool
+ * Copyright (C) 2008, 2009, StatusNet, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
+
+$helptext = <<<END_OF_CHECKSCHEMA_HELP
+Attempt to pull a schema definition for a given table.
+
+END_OF_CHECKSCHEMA_HELP;
+
+require_once INSTALLDIR.'/scripts/commandline.inc';
+
+function dumpTable($tableName)
+{
+    echo "$tableName\n";
+    $schema = Schema::get();
+    $def = $schema->getTableDef($tableName);
+    var_export($def);
+    echo "\n";
+}
+
+if (count($args)) {
+    foreach ($args as $tableName) {
+        dumpTable($tableName);
+    }
+} else {
+    show_help($helptext);
+}
\ No newline at end of file

From a680e1798c356a7be8183153cf5058be1c6dcd8a Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Wed, 6 Oct 2010 18:28:32 -0700
Subject: [PATCH 221/655] Work in progress on fetching table defs from existing
 tables in new format -- unfinished

---
 lib/mysqlschema.php | 134 +++++++++++++++++++++++++++++++++++---------
 1 file changed, 107 insertions(+), 27 deletions(-)

diff --git a/lib/mysqlschema.php b/lib/mysqlschema.php
index b84883c034..60c432cd67 100644
--- a/lib/mysqlschema.php
+++ b/lib/mysqlschema.php
@@ -81,7 +81,8 @@ class MysqlSchema extends Schema
     public function getTableDef($name)
     {
         $query = "SELECT * FROM INFORMATION_SCHEMA.COLUMNS " .
-                 "WHERE TABLE_SCHEMA='%s' AND TABLE_NAME='%s'";
+                 "WHERE TABLE_SCHEMA='%s' AND TABLE_NAME='%s' " .
+                 "ORDER BY ORDINAL_POSITION";
         $schema = $this->conn->dsn['database'];
         $sql = sprintf($query, $schema, $name);
         $res = $this->conn->query($sql);
@@ -98,45 +99,124 @@ class MysqlSchema extends Schema
 
         $td->name    = $name;
         $td->columns = array();
+        $def = array();
 
         $row = array();
 
         while ($res->fetchInto($row, DB_FETCHMODE_ASSOC)) {
 
-            $cd = new ColumnDef();
+            $name = $row['COLUMN_NAME'];
+            $field = array();
 
-            $cd->name = $row['COLUMN_NAME'];
-
-            $packed = $row['COLUMN_TYPE'];
-
-            if (preg_match('/^(\w+)\((\d+)\)$/', $packed, $match)) {
-                $cd->type = $match[1];
-                $cd->size = $match[2];
-            } else {
-                $cd->type = $packed;
+            if ($row['DATA_TYPE'] !== null) {
+                $field['type'] = $row['DATA_TYPE'];
+            }
+            if ($row['CHARACTER_MAXIMUM_LENGTH'] !== null) {
+                $field['length'] = intval($row['CHARACTER_MAXIMUM_LENGTH']);
+            }
+            if ($row['NUMERIC_PRECISION'] !== null) {
+                $field['precision'] = intval($row['NUMERIC_PRECISION']);
+            }
+            if ($row['NUMERIC_SCALE'] !== null) {
+                $field['scale'] = intval($row['NUMERIC_SCALE']);
+            }
+            if ($row['IS_NULLABLE'] == 'NO') {
+                $field['not null'] = true;
+            }
+            if ($row['COLUMN_DEFAULT'] !== null) {
+                $field['default'] = $row['COLUMN_DEFAULT'];
+            }
+            /*
+            if ($row['COLUMN_KEY'] == 'PRI') {
+                if (isset($def['primary keys'])) {
+                    $def['primary keys'][] = $name;
+                } else {
+                    $def['primary keys'][] = array($name);
+                }
+            } else if ($row['COLUMN_KEY'] == 'MUL') {
+                // @fixme
+            } else if ($row['COLUMN_KEY'] == 'UNI') {
+                // @fixme
+            }
+            */
+            if ($row['COLUMN_COMMENT'] !== null) {
+                $field['description'] = $row['COLUMN_COMMENT'];
             }
 
-            $cd->nullable = ($row['IS_NULLABLE'] == 'YES') ? true : false;
-            $cd->key      = $row['COLUMN_KEY'];
-            $cd->default  = $row['COLUMN_DEFAULT'];
-            $cd->extra    = $row['EXTRA'];
-
-            // Autoincrement is stuck into the extra column.
-            // Pull it out so we don't accidentally mod it every time...
-            $extra = preg_replace('/(^|\s)auto_increment(\s|$)/i', '$1$2', $cd->extra);
-            if ($extra != $cd->extra) {
-                $cd->extra = trim($extra);
-                $cd->auto_increment = true;
+            // $row['EXTRA'] may contain 'autoincrement'
+            // ^ type=serial?
+            // $row['EXTRA'] may contain 'on update CURRENT_TIMESTAMP'
+            // ^ ...... how to specify?
+            // these seem to be the only values in curent use
+            
+            if ($row['CHARACTER_SET_NAME'] !== null) {
+                // @fixme check against defaults?
+                //$def['charset'] = $row['CHARACTER_SET_NAME'];
+                //$def['collate']  = $row['COLLATION_NAME'];
             }
 
-            // mysql extensions -- not (yet) used by base class
-            $cd->charset  = $row['CHARACTER_SET_NAME'];
-            $cd->collate  = $row['COLLATION_NAME'];
-
-            $td->columns[] = $cd;
+            $def['fields'][$name] = $field;
         }
         $res->free();
 
+
+        /*
+        BLURRRRRRF
+        we need to first pull the list/types of keys
+
+        we could get those and the columns like this:
+        // this works but is insanely slow!
+        SELECT CONSTRAINT_NAME AS keyName,
+        (SELECT GROUP_CONCAT(COLUMN_NAME)
+            FROM INFORMATION_SCHEMA.KEY_COLUMN_USAGE AS keyColumns
+            WHERE keyColumns.TABLE_SCHEMA=keyDefs.TABLE_SCHEMA
+              AND keyColumns.TABLE_NAME=keyDefs.TABLE_NAME
+              AND keyColumns.CONSTRAINT_NAME=keyDefs.CONSTRAINT_NAME
+            ORDER BY ORDINAL_POSITION)
+        FROM INFORMATION_SCHEMA.TABLE_CONSTRAINTS AS keyDefs
+        WHERE TABLE_SCHEMA='mublog'
+          AND TABLE_NAME='subscription'
+        ORDER BY TABLE_NAME, CONSTRAINT_NAME;
+
+        However MySQL's query optimizer is crap here and it does something
+        insane. ;) Using constants is faster, but won't let us do bulk
+        fetches. So... maybe go ahead and fetch each table separately.
+         */
+
+        // Now fetch the key info...
+        $query = "SELECT * FROM INFORMATION_SCHEMA.KEY_COLUMN_USAGE " .
+                 "WHERE TABLE_SCHEMA='%s' AND TABLE_NAME='%s' " .
+                 "ORDER BY CONSTRAINT_NAME,ORDINAL_POSITION";
+        $schema = $this->conn->dsn['database'];
+        $sql = sprintf($query, $schema, $name);
+        $res = $this->conn->query($sql);
+
+        if (PEAR::isError($res)) {
+            throw new Exception($res->getMessage());
+        }
+        if ($res->numRows() == 0) {
+            $res->free();
+            throw new SchemaTableMissingException("No such table: $name");
+        }
+        $row = array();
+
+        while ($res->fetchInto($row, DB_FETCHMODE_ASSOC)) {
+            $keyName = $row['CONSTRAINT_NAME'];
+            $colName = $row['COLUMN_NAME'];
+            // @fixme what about prefixes?
+            if ($keyName == 'PRIMARY') {
+                if (!isset($def['primary key'])) {
+                    $def['primary key'] = array();
+                }
+                $def['primary key'][] = $colName;
+            } else {
+                if (!isset($def['indexes'][$keyName])) {
+                    $def['indexes'][$keyName] = array();
+                }
+                $def['indexes'][$keyName][] = $colName;
+            }
+        }
+        $res->free();
         return $td;
     }
 

From 1f4b168e69c49931be086c9b6519fab64773c2e1 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Thu, 7 Oct 2010 14:21:06 -0700
Subject: [PATCH 222/655] tweak for Managed_DataObject table defs

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

diff --git a/classes/Managed_DataObject.php b/classes/Managed_DataObject.php
index 162c3c81f0..35d52c5120 100644
--- a/classes/Managed_DataObject.php
+++ b/classes/Managed_DataObject.php
@@ -38,7 +38,9 @@ abstract class Managed_DataObject extends Memcached_DataObject
      */
     function table()
     {
-        $table = self::schemaDef();
+        // Hack for PHP 5.2 not supporting late static binding
+        //$table = static::schemaDef();
+        $table = call_user_func(array(get_class($this), 'schemaDef'));
         return array_map(array($this, 'columnBitmap'), $table['fields']);
     }
 

From 63c4cb3f36c5136a92f0f60ae10dad716b5f425b Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Thu, 7 Oct 2010 15:14:10 -0700
Subject: [PATCH 223/655] Finish patching up the index fetching in new schema
 stuff for mysql

---
 db/core.php         |   5 +-
 lib/mysqlschema.php | 206 ++++++++++++++++++++++----------------------
 2 files changed, 107 insertions(+), 104 deletions(-)

diff --git a/db/core.php b/db/core.php
index 04c53a5853..1633187b4b 100644
--- a/db/core.php
+++ b/db/core.php
@@ -41,9 +41,10 @@ $schema['profile'] = array(
     'primary key' => array('id'),
     'indexes' => array(
         'profile_nickname_idx' => array('nickname'),
-        'FULLTEXT' => array('nickname', 'fullname', 'location', 'bio', 'homepage') // ??
     ),
-// Any way to specify that this table needs to be myisam if using the fulltext?
+    'fulltext indexes' => array(
+        'content' => array('nickname', 'fullname', 'location', 'bio', 'homepage') // ??
+    ),
 );
 
 $schema['avatar'] = array(
diff --git a/lib/mysqlschema.php b/lib/mysqlschema.php
index 60c432cd67..9ff7932364 100644
--- a/lib/mysqlschema.php
+++ b/lib/mysqlschema.php
@@ -72,38 +72,24 @@ class MysqlSchema extends Schema
      *
      * Throws an exception if the table is not found.
      *
-     * @param string $name Name of the table to get
+     * @param string $table Name of the table to get
      *
      * @return TableDef tabledef for that table.
      * @throws SchemaTableMissingException
      */
 
-    public function getTableDef($name)
+    public function getTableDef($table)
     {
-        $query = "SELECT * FROM INFORMATION_SCHEMA.COLUMNS " .
-                 "WHERE TABLE_SCHEMA='%s' AND TABLE_NAME='%s' " .
-                 "ORDER BY ORDINAL_POSITION";
-        $schema = $this->conn->dsn['database'];
-        $sql = sprintf($query, $schema, $name);
-        $res = $this->conn->query($sql);
-
-        if (PEAR::isError($res)) {
-            throw new Exception($res->getMessage());
-        }
-        if ($res->numRows() == 0) {
-            $res->free();
-            throw new SchemaTableMissingException("No such table: $name");
-        }
-
-        $td = new TableDef();
-
-        $td->name    = $name;
-        $td->columns = array();
         $def = array();
+        $hasKeys = false;
 
-        $row = array();
+        // Pull column data from INFORMATION_SCHEMA
+        $columns = $this->fetchMetaInfo($table, 'COLUMNS', 'ORDINAL_POSITION');
+        if (count($columns) == 0) {
+            throw new SchemaTableMissingException("No such table: $table");
+        }
 
-        while ($res->fetchInto($row, DB_FETCHMODE_ASSOC)) {
+        foreach ($columns as $row) {
 
             $name = $row['COLUMN_NAME'];
             $field = array();
@@ -126,19 +112,10 @@ class MysqlSchema extends Schema
             if ($row['COLUMN_DEFAULT'] !== null) {
                 $field['default'] = $row['COLUMN_DEFAULT'];
             }
-            /*
-            if ($row['COLUMN_KEY'] == 'PRI') {
-                if (isset($def['primary keys'])) {
-                    $def['primary keys'][] = $name;
-                } else {
-                    $def['primary keys'][] = array($name);
-                }
-            } else if ($row['COLUMN_KEY'] == 'MUL') {
-                // @fixme
-            } else if ($row['COLUMN_KEY'] == 'UNI') {
-                // @fixme
+            if ($row['COLUMN_KEY'] !== null) {
+                // We'll need to look up key info...
+                $hasKeys = true;
             }
-            */
             if ($row['COLUMN_COMMENT'] !== null) {
                 $field['description'] = $row['COLUMN_COMMENT'];
             }
@@ -157,67 +134,47 @@ class MysqlSchema extends Schema
 
             $def['fields'][$name] = $field;
         }
-        $res->free();
 
+        if ($hasKeys) {
+            // INFORMATION_SCHEMA's CONSTRAINTS and KEY_COLUMN_USAGE tables give
+            // good info on primary and unique keys but don't list ANY info on
+            // multi-value keys, which is lame-o. Sigh.
+            //
+            // Let's go old school and use SHOW INDEX :D
+            //
+            $keyInfo = $this->fetchIndexInfo($table);
+            $keys = array();
+            foreach ($keyInfo as $row) {
+                $name = $row['Key_name'];
+                $column = $row['Column_name'];
 
-        /*
-        BLURRRRRRF
-        we need to first pull the list/types of keys
-
-        we could get those and the columns like this:
-        // this works but is insanely slow!
-        SELECT CONSTRAINT_NAME AS keyName,
-        (SELECT GROUP_CONCAT(COLUMN_NAME)
-            FROM INFORMATION_SCHEMA.KEY_COLUMN_USAGE AS keyColumns
-            WHERE keyColumns.TABLE_SCHEMA=keyDefs.TABLE_SCHEMA
-              AND keyColumns.TABLE_NAME=keyDefs.TABLE_NAME
-              AND keyColumns.CONSTRAINT_NAME=keyDefs.CONSTRAINT_NAME
-            ORDER BY ORDINAL_POSITION)
-        FROM INFORMATION_SCHEMA.TABLE_CONSTRAINTS AS keyDefs
-        WHERE TABLE_SCHEMA='mublog'
-          AND TABLE_NAME='subscription'
-        ORDER BY TABLE_NAME, CONSTRAINT_NAME;
-
-        However MySQL's query optimizer is crap here and it does something
-        insane. ;) Using constants is faster, but won't let us do bulk
-        fetches. So... maybe go ahead and fetch each table separately.
-         */
-
-        // Now fetch the key info...
-        $query = "SELECT * FROM INFORMATION_SCHEMA.KEY_COLUMN_USAGE " .
-                 "WHERE TABLE_SCHEMA='%s' AND TABLE_NAME='%s' " .
-                 "ORDER BY CONSTRAINT_NAME,ORDINAL_POSITION";
-        $schema = $this->conn->dsn['database'];
-        $sql = sprintf($query, $schema, $name);
-        $res = $this->conn->query($sql);
-
-        if (PEAR::isError($res)) {
-            throw new Exception($res->getMessage());
-        }
-        if ($res->numRows() == 0) {
-            $res->free();
-            throw new SchemaTableMissingException("No such table: $name");
-        }
-        $row = array();
-
-        while ($res->fetchInto($row, DB_FETCHMODE_ASSOC)) {
-            $keyName = $row['CONSTRAINT_NAME'];
-            $colName = $row['COLUMN_NAME'];
-            // @fixme what about prefixes?
-            if ($keyName == 'PRIMARY') {
-                if (!isset($def['primary key'])) {
-                    $def['primary key'] = array();
+                if (!isset($keys[$name])) {
+                    $keys[$name] = array();
                 }
-                $def['primary key'][] = $colName;
-            } else {
-                if (!isset($def['indexes'][$keyName])) {
-                    $def['indexes'][$keyName] = array();
+                $keys[$name][] = $column;
+
+                if ($name == 'PRIMARY') {
+                    $type = 'primary key';
+                } else if ($row['Non_unique'] == 0) {
+                    $type = 'unique keys';
+                } else if ($row['Index_type'] == 'FULLTEXT') {
+                    $type = 'fulltext indexes';
+                } else {
+                    $type = 'indexes';
+                }
+                $keyTypes[$name] = $type;
+            }
+
+            foreach ($keyTypes as $name => $type) {
+                if ($type == 'primary key') {
+                    // there can be only one
+                    $def[$type] = $keys[$name];
+                } else {
+                    $def[$type][$name] = $keys[$name];
                 }
-                $def['indexes'][$keyName][] = $colName;
             }
         }
-        $res->free();
-        return $td;
+        return $def;
     }
 
     /**
@@ -230,23 +187,68 @@ class MysqlSchema extends Schema
 
     function getTableProperties($table, $props)
     {
-        $query = "SELECT %s FROM INFORMATION_SCHEMA.TABLES " .
-                 "WHERE TABLE_SCHEMA='%s' AND TABLE_NAME='%s'";
-        $schema = $this->conn->dsn['database'];
-        $sql = sprintf($query, implode(',', $props), $schema, $table);
-        $res = $this->conn->query($sql);
-
-        $row = array();
-        $ok = $res->fetchInto($row, DB_FETCHMODE_ASSOC);
-        $res->free();
-        
-        if ($ok) {
-            return $row;
+        $data = $this->fetchMetaInfo($table, 'TABLES');
+        if ($data) {
+            return $data[0];
         } else {
             throw new SchemaTableMissingException("No such table: $table");
         }
     }
 
+    /**
+     * Pull some INFORMATION.SCHEMA data for the given table.
+     *
+     * @param string $table
+     * @return array of arrays
+     */
+    function fetchMetaInfo($table, $infoTable, $orderBy=null)
+    {
+        $query = "SELECT * FROM INFORMATION_SCHEMA.%s " .
+                 "WHERE TABLE_SCHEMA='%s' AND TABLE_NAME='%s'";
+        $schema = $this->conn->dsn['database'];
+        $sql = sprintf($query, $infoTable, $schema, $table);
+        if ($orderBy) {
+            $sql .= ' ORDER BY ' . $orderBy;
+        }
+        return $this->fetchQueryData($sql);
+    }
+
+    /**
+     * Pull 'SHOW INDEX' data for the given table.
+     *
+     * @param string $table
+     * @return array of arrays
+     */
+    function fetchIndexInfo($table)
+    {
+        $query = "SHOW INDEX FROM `%s`";
+        $sql = sprintf($query, $table);
+        return $this->fetchQueryData($sql);
+    }
+
+    /**
+     * Pull info from the query into a fun-fun array of dooooom
+     *
+     * @param string $sql
+     * @return array of arrays
+     */
+    protected function fetchQueryData($sql)
+    {
+        $res = $this->conn->query($sql);
+        if (PEAR::isError($res)) {
+            throw new Exception($res->getMessage());
+        }
+
+        $out = array();
+        $row = array();
+        while ($res->fetchInto($row, DB_FETCHMODE_ASSOC)) {
+            $out[] = $row;
+        }
+        $res->free();
+
+        return $out;
+    }
+
     /**
      * Creates a table with the given names and columns.
      *

From fcef2aaab752db9441c1976b5ce98d55d240e489 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Thu, 7 Oct 2010 15:48:38 -0700
Subject: [PATCH 224/655] Pretty up the table dumper :D

---
 scripts/dumpschema.php | 48 ++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 46 insertions(+), 2 deletions(-)

diff --git a/scripts/dumpschema.php b/scripts/dumpschema.php
index 567eadfb20..5a0fd0bdbb 100644
--- a/scripts/dumpschema.php
+++ b/scripts/dumpschema.php
@@ -27,12 +27,56 @@ END_OF_CHECKSCHEMA_HELP;
 
 require_once INSTALLDIR.'/scripts/commandline.inc';
 
+function indentOptions($indent)
+{
+    $cutoff = 3;
+    if ($indent < $cutoff) {
+        $space = str_repeat(' ', $indent * 4);
+        $sep = ",";
+        $lf = "\n";
+        $endspace = "$lf" . str_repeat(' ', ($indent - 1) * 4);
+    } else {
+        $space = '';
+        $sep = ", ";
+        $lf = '';
+        $endspace = '';
+    }
+    if ($indent - 1 < $cutoff) {
+    }
+    return array($space, $sep, $lf, $endspace);
+}
+
+function prettyDumpArray($arr, $key=null, $indent=0)
+{
+    list($space, $sep, $lf, $endspace) = indentOptions($indent);
+    list($inspace, $insep, $inlf, $inendspace) = indentOptions($indent + 1);
+
+    print "{$space}";
+    if (!is_numeric($key)) {
+        print "'$key' => ";
+    }
+    if (is_array($arr)) {
+        print "array({$inlf}";
+        $n = 0;
+        foreach ($arr as $key => $row) {
+            $n++;
+            prettyDumpArray($row, $key, $indent + 1);
+            if ($n < count($arr)) {
+                print "$insep$inlf";
+            }
+        }
+        // hack!
+        print "{$inendspace})";
+    } else {
+        print var_export($arr, true);
+    }
+}
+
 function dumpTable($tableName)
 {
-    echo "$tableName\n";
     $schema = Schema::get();
     $def = $schema->getTableDef($tableName);
-    var_export($def);
+    prettyDumpArray($def, $tableName);
     echo "\n";
 }
 

From 312b87ea79659b168bdc9569b735253d77994530 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Thu, 7 Oct 2010 16:23:36 -0700
Subject: [PATCH 225/655] output tweak hack for primary keys on single line

---
 db/core.php            |  2 +-
 scripts/dumpschema.php | 11 +++++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/db/core.php b/db/core.php
index 1633187b4b..940ad5d07f 100644
--- a/db/core.php
+++ b/db/core.php
@@ -457,7 +457,7 @@ $schema['foreign_service'] = array(
 
 $schema['foreign_user'] = array(
     'fields' => array(
-        'id' => array('type' => 'bigint', 'not null' => true, 'description' => 'unique numeric key on foreign service'),
+        'id' => array('type' => 'int', 'size' => 'big', 'not null' => true, 'description' => 'unique numeric key on foreign service'),
         'service' => array('type' => 'int', 'not null' => true, 'description' => 'foreign key to service'),
         'uri' => array('type' => 'varchar', 'length' => 255, 'not null' => true, 'description' => 'identifying URI'),
         'nickname' => array('type' => 'varchar', 'length' => 255, 'description' => 'nickname on foreign service'),
diff --git a/scripts/dumpschema.php b/scripts/dumpschema.php
index 5a0fd0bdbb..8b5277517f 100644
--- a/scripts/dumpschema.php
+++ b/scripts/dumpschema.php
@@ -48,8 +48,15 @@ function indentOptions($indent)
 
 function prettyDumpArray($arr, $key=null, $indent=0)
 {
+    // hack
+    if ($key == 'primary key') {
+        $subIndent = $indent + 2;
+    } else {
+        $subIndent = $indent + 1;
+    }
+
     list($space, $sep, $lf, $endspace) = indentOptions($indent);
-    list($inspace, $insep, $inlf, $inendspace) = indentOptions($indent + 1);
+    list($inspace, $insep, $inlf, $inendspace) = indentOptions($subIndent);
 
     print "{$space}";
     if (!is_numeric($key)) {
@@ -60,7 +67,7 @@ function prettyDumpArray($arr, $key=null, $indent=0)
         $n = 0;
         foreach ($arr as $key => $row) {
             $n++;
-            prettyDumpArray($row, $key, $indent + 1);
+            prettyDumpArray($row, $key, $subIndent);
             if ($n < count($arr)) {
                 print "$insep$inlf";
             }

From 82e9a2eee8ca7b71f6ab81f6c787997e01b75492 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Thu, 7 Oct 2010 16:49:15 -0700
Subject: [PATCH 226/655] Add --diff option to dumpschema.php to run a (quickie
 text) diff betwen the theoretical and detected schemas for the given tables

---
 scripts/dumpschema.php | 50 ++++++++++++++++++++++++++++++++++++++----
 1 file changed, 46 insertions(+), 4 deletions(-)

diff --git a/scripts/dumpschema.php b/scripts/dumpschema.php
index 8b5277517f..642aedf5f2 100644
--- a/scripts/dumpschema.php
+++ b/scripts/dumpschema.php
@@ -25,6 +25,7 @@ Attempt to pull a schema definition for a given table.
 
 END_OF_CHECKSCHEMA_HELP;
 
+$longoptions = array('diff');
 require_once INSTALLDIR.'/scripts/commandline.inc';
 
 function indentOptions($indent)
@@ -79,17 +80,58 @@ function prettyDumpArray($arr, $key=null, $indent=0)
     }
 }
 
-function dumpTable($tableName)
+function getCoreSchema($tableName)
 {
-    $schema = Schema::get();
-    $def = $schema->getTableDef($tableName);
+    $schema = array();
+    include INSTALLDIR . '/db/core.php';
+    return $schema[$tableName];
+}
+
+function dumpTable($tableName, $live)
+{
+    if ($live) {
+        $schema = Schema::get();
+        $def = $schema->getTableDef($tableName);
+    } else {
+        // hack
+        $def = getCoreSchema($tableName);
+    }
     prettyDumpArray($def, $tableName);
     echo "\n";
 }
 
+function showDiff($a, $b)
+{
+    $fnameA = tempnam(sys_get_temp_dir(), 'diff-a');
+    file_put_contents($fnameA, $a);
+
+    $fnameB = tempnam(sys_get_temp_dir(), 'diff-b');
+    file_put_contents($fnameB, $b);
+
+    $cmd = sprintf('diff -U 100 %s %s',
+            escapeshellarg($fnameA),
+            escapeshellarg($fnameB));
+    passthru($cmd);
+
+    unlink($fnameA);
+    unlink($fnameB);
+}
+
 if (count($args)) {
     foreach ($args as $tableName) {
-        dumpTable($tableName);
+        if (have_option('diff')) {
+            ob_start();
+            dumpTable($tableName, false);
+            $defined = ob_get_clean();
+
+            ob_start();
+            dumpTable($tableName, true);
+            $detected = ob_get_clean();
+
+            showDiff($defined, $detected);
+        } else {
+            dumpTable($tableName, true);
+        }
     }
 } else {
     show_help($helptext);

From 14e4f50f2999e0bf160ec90a5b26b29b48fcf776 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Thu, 7 Oct 2010 16:49:49 -0700
Subject: [PATCH 227/655] Some cleanup on detecting types

---
 lib/mysqlschema.php | 61 ++++++++++++++++++++++++++++++++++++++-------
 lib/schema.php      |  7 ++++++
 2 files changed, 59 insertions(+), 9 deletions(-)

diff --git a/lib/mysqlschema.php b/lib/mysqlschema.php
index 9ff7932364..d3b463c103 100644
--- a/lib/mysqlschema.php
+++ b/lib/mysqlschema.php
@@ -94,23 +94,37 @@ class MysqlSchema extends Schema
             $name = $row['COLUMN_NAME'];
             $field = array();
 
-            if ($row['DATA_TYPE'] !== null) {
-                $field['type'] = $row['DATA_TYPE'];
+            // warning -- 'unsigned' attr on numbers isn't given in DATA_TYPE and friends.
+            // It is stuck in on COLUMN_TYPE though (eg 'bigint(20) unsigned')
+            list($type, $size) = $this->reverseMapType($row['DATA_TYPE']);
+            $field['type'] = $type;
+            if ($size !== null) {
+                $field['size'] = $size;
             }
-            if ($row['CHARACTER_MAXIMUM_LENGTH'] !== null) {
-                $field['length'] = intval($row['CHARACTER_MAXIMUM_LENGTH']);
+
+            if ($type == 'char' || $type == 'varchar') {
+                if ($row['CHARACTER_MAXIMUM_LENGTH'] !== null) {
+                    $field['length'] = intval($row['CHARACTER_MAXIMUM_LENGTH']);
+                }
             }
-            if ($row['NUMERIC_PRECISION'] !== null) {
-                $field['precision'] = intval($row['NUMERIC_PRECISION']);
-            }
-            if ($row['NUMERIC_SCALE'] !== null) {
-                $field['scale'] = intval($row['NUMERIC_SCALE']);
+            if ($type == 'numeric') {
+                // Other int types may report these values, but they're irrelevant.
+                // Just ignore them!
+                if ($row['NUMERIC_PRECISION'] !== null) {
+                    $field['precision'] = intval($row['NUMERIC_PRECISION']);
+                }
+                if ($row['NUMERIC_SCALE'] !== null) {
+                    $field['scale'] = intval($row['NUMERIC_SCALE']);
+                }
             }
             if ($row['IS_NULLABLE'] == 'NO') {
                 $field['not null'] = true;
             }
             if ($row['COLUMN_DEFAULT'] !== null) {
                 $field['default'] = $row['COLUMN_DEFAULT'];
+                if ($this->isNumericType($type)) {
+                    $field['default'] = intval($field['default']);
+                }
             }
             if ($row['COLUMN_KEY'] !== null) {
                 // We'll need to look up key info...
@@ -562,6 +576,35 @@ class MysqlSchema extends Schema
         return $type;
     }
 
+    /**
+     * Map a MySQL native type back to an independent type + size
+     *
+     * @param string $type
+     * @return array ($type, $size) -- $size may be null
+     */
+    protected function reverseMapType($type)
+    {
+        $type = strtolower($type);
+        $map = array(
+            'decimal' => array('numeric', null),
+            'tinyint' => array('int', 'tiny'),
+            'smallint' => array('int', 'small'),
+            'mediumint' => array('int', 'medium'),
+            'bigint' => array('int', 'big'),
+            'tinyblob' => array('blob', 'tiny'),
+            'mediumblob' => array('blob', 'medium'),
+            'longblob' => array('blob', 'long'),
+            'tinytext' => array('text', 'tiny'),
+            'mediumtext' => array('text', 'medium'),
+            'longtext' => array('text', 'long'),
+        );
+        if (isset($map[$type])) {
+            return $map[$type];
+        } else {
+            return array($type, null);
+        }
+    }
+
     function typeAndSize($column)
     {
         if ($column['type'] == 'enum') {
diff --git a/lib/schema.php b/lib/schema.php
index d20bced4a7..5868627ed7 100644
--- a/lib/schema.php
+++ b/lib/schema.php
@@ -583,6 +583,13 @@ class Schema
 
         return $table;
     }
+
+    function isNumericType($type)
+    {
+        $type = strtolower($type);
+        $known = array('int', 'serial', 'numeric');
+        return in_array($type, $known);
+    }
 }
 
 class SchemaTableMissingException extends Exception

From 443be8a99c52b05b6a3c6acdbdc944b537faeff6 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Thu, 7 Oct 2010 17:00:40 -0700
Subject: [PATCH 228/655] some more cleanup on table defs

---
 db/core.php            | 64 ++++++++++++++++++++++--------------------
 scripts/dumpschema.php |  4 +--
 2 files changed, 35 insertions(+), 33 deletions(-)

diff --git a/db/core.php b/db/core.php
index 940ad5d07f..47b15d8f67 100644
--- a/db/core.php
+++ b/db/core.php
@@ -43,14 +43,14 @@ $schema['profile'] = array(
         'profile_nickname_idx' => array('nickname'),
     ),
     'fulltext indexes' => array(
-        'content' => array('nickname', 'fullname', 'location', 'bio', 'homepage') // ??
+        'nickname' => array('nickname', 'fullname', 'location', 'bio', 'homepage')
     ),
 );
 
 $schema['avatar'] = array(
     'fields' => array(
         'profile_id' => array('type' => 'int', 'not null' => true, 'description' => 'foreign key to profile table'),
-        'original' => array('type' => 'boolean', 'default' => false, 'description' => 'uploaded by user or generated?'),
+        'original' => array('type' => 'int', 'size' => 'tiny', 'default' => 0, 'description' => 'uploaded by user or generated?'),
         'width' => array('type' => 'int', 'not null' => true, 'description' => 'image width'),
         'height' => array('type' => 'int', 'not null' => true, 'description' => 'image height'),
         'mediatype' => array('type' => 'varchar', 'length' => 32, 'not null' => true, 'description' => 'file type'),
@@ -93,26 +93,26 @@ $schema['user'] = array(
         'password' => array('type' => 'varchar', 'length' => 255, 'description' => 'salted password, can be null for OpenID users'),
         'email' => array('type' => 'varchar', 'length' => 255, 'description' => 'email address for password recovery etc.'),
         'incomingemail' => array('type' => 'varchar', 'length' => 255, 'description' => 'email address for post-by-email'),
-        'emailnotifysub' => array('type' => 'bool', 'default' => 1, 'description' => 'Notify by email of subscriptions'),
-        'emailnotifyfav' => array('type' => 'bool', 'default' => 1, 'description' => 'Notify by email of favorites'),
-        'emailnotifynudge' => array('type' => 'bool', 'default' => 1, 'description' => 'Notify by email of nudges'),
-        'emailnotifymsg' => array('type' => 'bool', 'default' => 1, 'description' => 'Notify by email of direct messages'),
-        'emailnotifyattn' => array('type' => 'bool', 'default' => 1, 'description' => 'Notify by email of @-replies'),
-        'emailmicroid' => array('type' => 'bool', 'default' => 1, 'description' => 'whether to publish email microid'),
+        'emailnotifysub' => array('type' => 'int', 'size' => 'tiny', 'default' => 1, 'description' => 'Notify by email of subscriptions'),
+        'emailnotifyfav' => array('type' => 'int', 'size' => 'tiny', 'default' => 1, 'description' => 'Notify by email of favorites'),
+        'emailnotifynudge' => array('type' => 'int', 'size' => 'tiny', 'default' => 1, 'description' => 'Notify by email of nudges'),
+        'emailnotifymsg' => array('type' => 'int', 'size' => 'tiny', 'default' => 1, 'description' => 'Notify by email of direct messages'),
+        'emailnotifyattn' => array('type' => 'int', 'size' => 'tiny', 'default' => 1, 'description' => 'Notify by email of @-replies'),
+        'emailmicroid' => array('type' => 'int', 'size' => 'tiny', 'default' => 1, 'description' => 'whether to publish email microid'),
         'language' => array('type' => 'varchar', 'length' => 50, 'description' => 'preferred language'),
         'timezone' => array('type' => 'varchar', 'length' => 50, 'description' => 'timezone'),
-        'emailpost' => array('type' => 'bool', 'default' => 1, 'description' => 'Post by email'),
+        'emailpost' => array('type' => 'int', 'size' => 'tiny', 'default' => 1, 'description' => 'Post by email'),
         'sms' => array('type' => 'varchar', 'length' => 64, 'description' => 'sms phone number'),
         'carrier' => array('type' => 'int', 'description' => 'foreign key to sms_carrier'),
-        'smsnotify' => array('type' => 'bool', 'default' => 0, 'description' => 'whether to send notices to SMS'),
-        'smsreplies' => array('type' => 'bool', 'default' => 0, 'description' => 'whether to send notices to SMS on replies'),
+        'smsnotify' => array('type' => 'int', 'size' => 'tiny', 'default' => 0, 'description' => 'whether to send notices to SMS'),
+        'smsreplies' => array('type' => 'int', 'size' => 'tiny', 'default' => 0, 'description' => 'whether to send notices to SMS on replies'),
         'smsemail' => array('type' => 'varchar', 'length' => 255, 'description' => 'built from sms and carrier'),
         'uri' => array('type' => 'varchar', 'length' => 255, 'description' => 'universally unique identifier, usually a tag URI'),
-        'autosubscribe' => array('type' => 'bool', 'default' => 0, 'description' => 'automatically subscribe to users who subscribe to us'),
+        'autosubscribe' => array('type' => 'int', 'size' => 'tiny', 'default' => 0, 'description' => 'automatically subscribe to users who subscribe to us'),
         'urlshorteningservice' => array('type' => 'varchar', 'length' => 50, 'default' => 'ur1.ca', 'description' => 'service to use for auto-shortening URLs'),
-        'inboxed' => array('type' => 'bool', 'default' => 0, 'description' => 'has an inbox been created for this user?'),
+        'inboxed' => array('type' => 'int', 'size' => 'tiny', 'default' => 0, 'description' => 'has an inbox been created for this user?'),
         'design_id' => array('type' => 'int', 'description' => 'id of a design'),
-        'viewdesigns' => array('type' => 'bool', 'default' => 1, 'description' => 'whether to view user-provided designs'),
+        'viewdesigns' => array('type' => 'int', 'size' => 'tiny', 'default' => 1, 'description' => 'whether to view user-provided designs'),
 
         'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
         'modified' => array('type' => 'timestamp', 'description' => 'date this record was modified'),
@@ -158,8 +158,8 @@ $schema['subscription'] = array(
     'fields' => array(
         'subscriber' => array('type' => 'int', 'not null' => true, 'description' => 'profile listening'),
         'subscribed' => array('type' => 'int', 'not null' => true, 'description' => 'profile being listened to'),
-        'jabber' => array('type' => 'bool', 'default' => 1, 'description' => 'deliver jabber messages'),
-        'sms' => array('type' => 'bool', 'default' => 1, 'description' => 'deliver sms messages'),
+        'jabber' => array('type' => 'int', 'size' => 'tiny', 'default' => 1, 'description' => 'deliver jabber messages'),
+        'sms' => array('type' => 'int', 'size' => 'tiny', 'default' => 1, 'description' => 'deliver sms messages'),
         'token' => array('type' => 'varchar', 'length' => 255, 'description' => 'authorization token'),
         'secret' => array('type' => 'varchar', 'length' => 255, 'description' => 'token secret'),
         'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
@@ -184,7 +184,7 @@ $schema['notice'] = array(
         'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
         'modified' => array('type' => 'timestamp', 'description' => 'date this record was modified'),
         'reply_to' => array('type' => 'int', 'description' => 'notice replied to (usually a guess)'),
-        'is_local' => array('type' => 'bool', 'default' => 0, 'description' => 'notice was generated by a user'),
+        'is_local' => array('type' => 'int', 'size' => 'tiny', 'default' => 0, 'description' => 'notice was generated by a user'),
         'source' => array('type' => 'varchar', 'length' => 32, 'description' => 'source of comment, like "web", "im", or "clientname"'),
         'conversation' => array('type' => 'int', 'description' => 'id of root notice in this conversation'),
         'lat' => array('type' => 'numeric', 'precision' => 10, 'scale' => 7, 'description' => 'latitude'),
@@ -204,13 +204,15 @@ $schema['notice'] = array(
         'repeat_of' => array('notice', 'id'), # @fixme: what about repeats of deleted notices?
     ),
     'indexes' => array(
-        'notice_profile_id_idx' => array('profile_id,created,id'),
+        'notice_profile_id_idx' => array('profile_id', 'created', 'id'),
         'notice_conversation_idx' => array('conversation'),
         'notice_created_idx' => array('created'),
         'notice_replyto_idx' => array('reply_to'),
         'notice_repeatof_idx' => array('repeat_of'),
-        'FULLTEXT' => array('content'),
     ),
+    'fulltext indexes' => array(
+        'content' => array('content'),
+    )
 );
 
 $schema['notice_source'] = array(
@@ -282,8 +284,8 @@ $schema['token'] = array(
         'consumer_key' => array('type' => 'varchar', 'length' => 255, 'not null' => true, 'description' => 'unique identifier, root URL'),
         'tok' => array('type' => 'char', 'length' => 32, 'not null' => true, 'description' => 'identifying value'),
         'secret' => array('type' => 'char', 'length' => 32, 'not null' => true, 'description' => 'secret value'),
-        'type' => array('type' => 'bool', 'not null' => true, 'default' => 0, 'description' => 'request or access'),
-        'state' => array('type' => 'bool', 'default' => 0, 'description' => 'for requests, 0 = initial, 1 = authorized, 2 = used'),
+        'type' => array('type' => 'int', 'size' => 'tiny', 'not null' => true, 'default' => 0, 'description' => 'request or access'),
+        'state' => array('type' => 'int', 'size' => 'tiny', 'default' => 0, 'description' => 'for requests, 0 = initial, 1 = authorized, 2 = used'),
         'verifier' => array('type' => 'varchar', 'length' => 255, 'description' => 'verifier string for OAuth 1.0a'),
         'verified_callback' => array('type' => 'varchar', 'length' => 255, 'description' => 'verified callback URL for OAuth 1.0a'),
 
@@ -323,8 +325,8 @@ $schema['oauth_application'] = array(
         'organization' => array('type' => 'varchar', 'length' => 255, 'description' => 'name of the organization running the application'),
         'homepage' => array('type' => 'varchar', 'length' => 255, 'description' => 'homepage for the organization'),
         'callback_url' => array('type' => 'varchar', 'length' => 255, 'description' => 'url to redirect to after authentication'),
-        'type' => array('type' => 'bool', 'default' => 0, 'description' => 'type of app, 1 = browser, 2 = desktop'),
-        'access_type' => array('type' => 'bool', 'default' => 0, 'description' => 'default access type, bit 1 = read, bit 2 = write'),
+        'type' => array('type' => 'int', 'size' => 'tiny', 'default' => 0, 'description' => 'type of app, 1 = browser, 2 = desktop'),
+        'access_type' => array('type' => 'int', 'size' => 'tiny', 'default' => 0, 'description' => 'default access type, bit 1 = read, bit 2 = write'),
         'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
         'modified' => array('type' => 'timestamp', 'description' => 'date this record was modified'),
     ),
@@ -571,7 +573,7 @@ $schema['notice_inbox'] = array(
         'user_id' => array('type' => 'int', 'not null' => true, 'description' => 'user receiving the message'),
         'notice_id' => array('type' => 'int', 'not null' => true, 'description' => 'notice received'),
         'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date the notice was created'),
-        'source' => array('type' => 'bool', 'default' => 1, 'description' => 'reason it is in the inbox, 1=subscription'),
+        'source' => array('type' => 'int', 'size' => 'tiny', 'default' => 1, 'description' => 'reason it is in the inbox, 1=subscription'),
     ),
     'primary key' => array('user_id', 'notice_id'),
     'foreign keys' => array(
@@ -653,7 +655,7 @@ $schema['group_member'] = array(
     'fields' => array(
         'group_id' => array('type' => 'int', 'not null' => true, 'description' => 'foreign key to user_group'),
         'profile_id' => array('type' => 'int', 'not null' => true, 'description' => 'foreign key to profile table'),
-        'is_admin' => array('type' => 'boolean', 'default' => false, 'description' => 'is this user an admin?'),
+        'is_admin' => array('type' => 'int', 'size' => 'tiny', 'default' => 0, 'description' => 'is this user an admin?'),
 
         'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
         'modified' => array('type' => 'timestamp', 'description' => 'date this record was modified'),
@@ -913,11 +915,11 @@ $schema['login_token'] = array(
 $schema['user_location_prefs'] = array(
     'fields' => array(
         'user_id' => array('type' => 'int', 'not null' => true, 'description' => 'user who has the preference'),
-        'share_location' => array('type' => 'bool', 'default' => 1, 'description' => 'Whether to share location data'),
+        'share_location' => array('type' => 'int', 'size' => 'tiny', 'default' => 1, 'description' => 'Whether to share location data'),
         'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
         'modified' => array('type' => 'timestamp', 'description' => 'date this record was modified'),
     ),
-    'primary key' => array(user_id),
+    'primary key' => array('user_id'),
     'foreign keys' => array(
         'user_id' => array('user' => 'id'),
     ),
@@ -940,10 +942,10 @@ $schema['user_im_prefs'] = array(
         'user_id' => array('type' => 'int', 'not null' => true, 'description' => 'user'),
         'screenname' => array('type' => 'varchar', 'length' => 255, 'not null' => true, 'description' => 'screenname on this service'),
         'transport' => array('type' => 'varchar', 'length' => 255, 'not null' => true, 'description' => 'transport (ex xmpp, aim)'),
-        'notify' => array('type' => 'bool', 'not null' => true, 'default' => 0, 'description' => 'Notify when a new notice is sent'),
-        'replies' => array('type' => 'bool', 'not null' => true, 'default' => 0, 'description' => 'Send replies  from people not subscribed to'),
-        'microid' => array('type' => 'bool', 'not null' => true, 'default' => 1, 'description' => 'Publish a MicroID'),
-        'updatefrompresence' => array('type' => 'bool', 'not null' => true, 'default' => 0, 'description' => 'Send replies from people not subscribed to.'),
+        'notify' => array('type' => 'int', 'size' => 'tiny', 'not null' => true, 'default' => 0, 'description' => 'Notify when a new notice is sent'),
+        'replies' => array('type' => 'int', 'size' => 'tiny', 'not null' => true, 'default' => 0, 'description' => 'Send replies  from people not subscribed to'),
+        'microid' => array('type' => 'int', 'size' => 'tiny', 'not null' => true, 'default' => 1, 'description' => 'Publish a MicroID'),
+        'updatefrompresence' => array('type' => 'int', 'size' => 'tiny', 'not null' => true, 'default' => 0, 'description' => 'Send replies from people not subscribed to.'),
         'created' => array('type' => 'timestamp', 'not null' => true, 'default' => 'CURRENT_TIMESTAMP', 'description' => 'date this record was created'), // @fixme will that default work?
         'modified' => array('type' => 'timestamp', 'description' => 'date this record was modified'),
     ),
diff --git a/scripts/dumpschema.php b/scripts/dumpschema.php
index 642aedf5f2..818a4d5eae 100644
--- a/scripts/dumpschema.php
+++ b/scripts/dumpschema.php
@@ -102,10 +102,10 @@ function dumpTable($tableName, $live)
 
 function showDiff($a, $b)
 {
-    $fnameA = tempnam(sys_get_temp_dir(), 'diff-a');
+    $fnameA = tempnam(sys_get_temp_dir(), 'defined-diff-a');
     file_put_contents($fnameA, $a);
 
-    $fnameB = tempnam(sys_get_temp_dir(), 'diff-b');
+    $fnameB = tempnam(sys_get_temp_dir(), 'detected-diff-b');
     file_put_contents($fnameB, $b);
 
     $cmd = sprintf('diff -U 100 %s %s',

From cc69ede1eeeb6c122b820367b07a56395a481557 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Thu, 7 Oct 2010 17:01:14 -0700
Subject: [PATCH 229/655] stop str_repeat from whinging about being run with
 repeat value of 0. :P

---
 scripts/dumpschema.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/dumpschema.php b/scripts/dumpschema.php
index 818a4d5eae..20812fe5b8 100644
--- a/scripts/dumpschema.php
+++ b/scripts/dumpschema.php
@@ -32,10 +32,10 @@ function indentOptions($indent)
 {
     $cutoff = 3;
     if ($indent < $cutoff) {
-        $space = str_repeat(' ', $indent * 4);
+        $space = $indent ? str_repeat(' ', $indent * 4) : '';
         $sep = ",";
         $lf = "\n";
-        $endspace = "$lf" . str_repeat(' ', ($indent - 1) * 4);
+        $endspace = "$lf" . ($indent ? str_repeat(' ', ($indent - 1) * 4) : '');
     } else {
         $space = '';
         $sep = ", ";

From 3c979ec5068ed342fe4fed66c7310923c770793e Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Thu, 7 Oct 2010 17:02:42 -0700
Subject: [PATCH 230/655] Add --all option on dumpschema.php to check all core
 tables

---
 scripts/dumpschema.php | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/scripts/dumpschema.php b/scripts/dumpschema.php
index 20812fe5b8..fd44399a9c 100644
--- a/scripts/dumpschema.php
+++ b/scripts/dumpschema.php
@@ -25,7 +25,7 @@ Attempt to pull a schema definition for a given table.
 
 END_OF_CHECKSCHEMA_HELP;
 
-$longoptions = array('diff');
+$longoptions = array('diff', 'all');
 require_once INSTALLDIR.'/scripts/commandline.inc';
 
 function indentOptions($indent)
@@ -87,6 +87,13 @@ function getCoreSchema($tableName)
     return $schema[$tableName];
 }
 
+function getCoreTables()
+{
+    $schema = array();
+    include INSTALLDIR . '/db/core.php';
+    return array_keys($schema);
+}
+
 function dumpTable($tableName, $live)
 {
     if ($live) {
@@ -117,6 +124,10 @@ function showDiff($a, $b)
     unlink($fnameB);
 }
 
+if (have_option('all')) {
+    $args = getCoreTables();
+}
+
 if (count($args)) {
     foreach ($args as $tableName) {
         if (have_option('diff')) {

From 85156fcbed81b8e3e9d7ca4d3755df5c6c5b44a2 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Thu, 7 Oct 2010 17:22:36 -0700
Subject: [PATCH 231/655] Fix detection of auto_increment fields in MySQL (sets
 them as 'serial' type)

---
 lib/mysqlschema.php | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/lib/mysqlschema.php b/lib/mysqlschema.php
index d3b463c103..e4d91ffa07 100644
--- a/lib/mysqlschema.php
+++ b/lib/mysqlschema.php
@@ -134,12 +134,15 @@ class MysqlSchema extends Schema
                 $field['description'] = $row['COLUMN_COMMENT'];
             }
 
-            // $row['EXTRA'] may contain 'autoincrement'
-            // ^ type=serial?
-            // $row['EXTRA'] may contain 'on update CURRENT_TIMESTAMP'
-            // ^ ...... how to specify?
-            // these seem to be the only values in curent use
-            
+            $extra = $row['EXTRA'];
+            if ($extra) {
+                if (preg_match('/(^|\s)auto_increment(\s|$)/i', $extra)) {
+                    $field['type'] = 'serial';
+                }
+                // $row['EXTRA'] may contain 'on update CURRENT_TIMESTAMP'
+                // ^ ...... how to specify?
+            }
+
             if ($row['CHARACTER_SET_NAME'] !== null) {
                 // @fixme check against defaults?
                 //$def['charset'] = $row['CHARACTER_SET_NAME'];

From efa8ff82f4a364f6ba183a683431e9d83652cd9f Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Thu, 7 Oct 2010 17:31:56 -0700
Subject: [PATCH 232/655] fix up some more 'not null's and such

---
 db/core.php         | 56 ++++++++++++++++++++++-----------------------
 lib/mysqlschema.php |  2 +-
 2 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/db/core.php b/db/core.php
index 47b15d8f67..0ea0bc7614 100644
--- a/db/core.php
+++ b/db/core.php
@@ -73,7 +73,7 @@ $schema['avatar'] = array(
 
 $schema['sms_carrier'] = array(
     'fields' => array(
-        'id' => array('type' => 'int', 'description' => 'primary key for SMS carrier'),
+        'id' => array('type' => 'int', 'not null' => true, 'description' => 'primary key for SMS carrier'),
         'name' => array('type' => 'varchar', 'length' => 64, 'description' => 'name of the carrier'),
         'email_pattern' => array('type' => 'varchar', 'length' => 255, 'not null' => true, 'description' => 'sprintf pattern for making an email address from a phone number'),
         'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
@@ -88,7 +88,7 @@ $schema['sms_carrier'] = array(
 $schema['user'] = array(
     'description' => 'local users',
     'fields' => array(
-        'id' => array('type' => 'int', 'description' => 'foreign key to profile table'),
+        'id' => array('type' => 'int', 'not null' => true, 'description' => 'foreign key to profile table'),
         'nickname' => array('type' => 'varchar', 'length' => 64, 'description' => 'nickname or username, duped in profile'),
         'password' => array('type' => 'varchar', 'length' => 255, 'description' => 'salted password, can be null for OpenID users'),
         'email' => array('type' => 'varchar', 'length' => 255, 'description' => 'email address for password recovery etc.'),
@@ -138,7 +138,7 @@ $schema['user'] = array(
 $schema['remote_profile'] = array(
     'description' => 'remote people (OMB)',
     'fields' => array(
-        'id' => array('type' => 'int', 'description' => 'foreign key to profile table'),
+        'id' => array('type' => 'int', 'not null' => true, 'description' => 'foreign key to profile table'),
         'uri' => array('type' => 'varchar', 'length' => 255, 'description' => 'universally unique identifier, usually a tag URI'),
         'postnoticeurl' => array('type' => 'varchar', 'length' => 255, 'description' => 'URL we use for posting notices'),
         'updateprofileurl' => array('type' => 'varchar', 'length' => 255, 'description' => 'URL we use for updates to this profile'),
@@ -175,7 +175,7 @@ $schema['subscription'] = array(
 
 $schema['notice'] = array(
     'fields' => array(
-        'id' => array('type' => 'serial', 'description' => 'unique identifier'),
+        'id' => array('type' => 'serial', 'not null' => true, 'description' => 'unique identifier'),
         'profile_id' => array('type' => 'int', 'not null' => true, 'description' => 'who made the update'),
         'uri' => array('type' => 'varchar', 'length' => 255, 'description' => 'universally unique identifier, usually a tag URI'),
         'content' => array('type' => 'text', 'description' => 'update content'),
@@ -268,7 +268,7 @@ $schema['fave'] = array(
 $schema['consumer'] = array(
     'description' => 'OAuth consumer record',
     'fields' => array(
-        'consumer_key' => array('type' => 'varchar', 'length' => 255, 'description' => 'unique identifier, root URL'),
+        'consumer_key' => array('type' => 'varchar', 'length' => 255, 'not null' => true, 'description' => 'unique identifier, root URL'),
         'consumer_secret' => array('type' => 'varchar', 'length' => 255, 'not null' => true, 'description' => 'secret value'),
         'seed' => array('type' => 'char', 'length' => 32, 'not null' => true, 'description' => 'seed for new tokens by this consumer'),
 
@@ -315,7 +315,7 @@ $schema['nonce'] = array(
 $schema['oauth_application'] = array(
     'description' => 'OAuth application registration record',
     'fields' => array(
-        'id' => array('type' => 'serial', 'description' => 'unique identifier'),
+        'id' => array('type' => 'serial', 'not null' => true, 'description' => 'unique identifier'),
         'owner' => array('type' => 'int', 'not null' => true, 'description' => 'owner of the application'),
         'consumer_key' => array('type' => 'varchar', 'length' => 255, 'not null' => true, 'description' => 'application consumer key'),
         'name' => array('type' => 'varchar', 'length' => 255, 'not null' => true, 'description' => 'name of the application'),
@@ -360,8 +360,8 @@ $schema['oauth_application_user'] = array(
 
 $schema['oid_associations'] = array(
     'fields' => array(
-        'server_url' => array('type' => 'blob'),
-        'handle' => array('type' => 'varchar', 'length' => 255), // character set latin1,
+        'server_url' => array('type' => 'blob', 'not null' => true),
+        'handle' => array('type' => 'varchar', 'length' => 255, 'not null' => true, 'default' => ''), // character set latin1,
         'secret' => array('type' => 'blob'),
         'issued' => array('type' => 'int'),
         'lifetime' => array('type' => 'int'),
@@ -412,7 +412,7 @@ $schema['remember_me'] = array(
 
 $schema['queue_item'] = array(
     'fields' => array(
-        'id' => array('type' => 'serial', 'description' => 'unique identifier'),
+        'id' => array('type' => 'serial', 'not null' => true, 'description' => 'unique identifier'),
         'frame' => array('type' => 'blob', 'not null' => true, 'description' => 'data: object reference or opaque string'),
         'transport' => array('type' => 'varchar', 'length' => 8, 'not null' => true, 'description' => 'queue for what? "email", "xmpp", "sms", "irc", ...'), // @fixme 8 chars is too short; bump up.
         'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
@@ -477,8 +477,8 @@ $schema['foreign_user'] = array(
 
 $schema['foreign_link'] = array(
     'fields' => array(
-        'user_id' => array('type' => 'int', 'description' => 'link to user on this system, if exists'),
-        'foreign_id' => array('type' => 'int', 'size' => 'big', 'unsigned' => true, 'description' => 'link to user on foreign service, if exists'),
+        'user_id' => array('type' => 'int', 'not null' => true, 'description' => 'link to user on this system, if exists'),
+        'foreign_id' => array('type' => 'int', 'size' => 'big', 'unsigned' => true, 'not null' => true, 'description' => 'link to user on foreign service, if exists'),
         'service' => array('type' => 'int', 'not null' => true, 'description' => 'foreign key to service'),
         'credentials' => array('type' => 'varchar', 'length' => 255, 'description' => 'authc credentials, typically a password'),
         'noticesync' => array('type' => 'int', 'size' => 'tiny', 'not null' => true, 'default' => 1, 'description' => 'notice synchronization, bit 1 = sync outgoing, bit 2 = sync incoming, bit 3 = filter local replies'),
@@ -539,7 +539,7 @@ $schema['invitation'] = array(
 
 $schema['message'] = array(
     'fields' => array(
-        'id' => array('type' => 'serial', 'description' => 'unique identifier'),
+        'id' => array('type' => 'serial', 'not null' => true, 'description' => 'unique identifier'),
         'uri' => array('type' => 'varchar', 'length' => 255, 'description' => 'universally unique identifier'),
         'from_profile' => array('type' => 'int', 'not null' => true, 'description' => 'who the message is from'),
         'to_profile' => array('type' => 'int', 'not null' => true, 'description' => 'who the message is to'),
@@ -619,7 +619,7 @@ $schema['profile_block'] = array(
 
 $schema['user_group'] = array(
     'fields' => array(
-        'id' => array('type' => 'serial', 'description' => 'unique identifier'),
+        'id' => array('type' => 'serial', 'not null' => true, 'description' => 'unique identifier'),
 
         'nickname' => array('type' => 'varchar', 'length' => 64, 'description' => 'nickname for addressing'),
         'fullname' => array('type' => 'varchar', 'length' => 255, 'description' => 'display name'),
@@ -707,7 +707,7 @@ $schema['group_inbox'] = array(
 
 $schema['file'] = array(
     'fields' => array(
-        'id' => array('type' => 'serial'),
+        'id' => array('type' => 'serial', 'not null' => true),
         'url' => array('type' => 'varchar', 'length' => 255, 'description' => 'destination URL after following redirections'),
         'mimetype' => array('type' => 'varchar', 'length' => 50, 'description' => 'mime type of resource'),
         'size' => array('type' => 'int', 'description' => 'size of resource when available'),
@@ -726,7 +726,7 @@ $schema['file'] = array(
 
 $schema['file_oembed'] = array(
     'fields' => array(
-        'file_id' => array('type' => 'int', 'description' => 'oEmbed for that URL/file'),
+        'file_id' => array('type' => 'int', 'not null' => true, 'description' => 'oEmbed for that URL/file'),
         'version' => array('type' => 'varchar', 'length' => 20, 'description' => 'oEmbed spec. version'),
         'type' => array('type' => 'varchar', 'length' => 20, 'description' => 'oEmbed type: photo, video, link, rich'),
         'mimetype' => array('type' => 'varchar', 'length' => 50, 'description' => 'mime type of resource'),
@@ -749,7 +749,7 @@ $schema['file_oembed'] = array(
 
 $schema['file_redirection'] = array(
     'fields' => array(
-        'url' => array('type' => 'varchar', 'length' => 255, 'description' => 'short URL (or any other kind of redirect) for file (id)'),
+        'url' => array('type' => 'varchar', 'length' => 255, 'not null' => true, 'description' => 'short URL (or any other kind of redirect) for file (id)'),
         'file_id' => array('type' => 'int', 'description' => 'short URL for what URL/file'),
         'redirections' => array('type' => 'int', 'description' => 'redirect count'),
         'httpcode' => array('type' => 'int', 'description' => 'HTTP status code (20x, 30x, etc.)'),
@@ -763,7 +763,7 @@ $schema['file_redirection'] = array(
 
 $schema['file_thumbnail'] = array(
     'fields' => array(
-        'file_id' => array('type' => 'int',  'description' => 'thumbnail for what URL/file'),
+        'file_id' => array('type' => 'int', 'not null' => true, 'description' => 'thumbnail for what URL/file'),
         'url' => array('type' => 'varchar', 'length' => 255, 'description' => 'URL of thumbnail'),
         'width' => array('type' => 'int', 'description' => 'width of thumbnail'),
         'height' => array('type' => 'int', 'description' => 'height of thumbnail'),
@@ -780,8 +780,8 @@ $schema['file_thumbnail'] = array(
 
 $schema['file_to_post'] = array(
     'fields' => array(
-        'file_id' => array('type' => 'int', 'description' => 'id of URL/file'),
-        'post_id' => array('type' => 'int', 'description' => 'id of the notice it belongs to'),
+        'file_id' => array('type' => 'int', 'not null' => true, 'description' => 'id of URL/file'),
+        'post_id' => array('type' => 'int', 'not null' => true, 'description' => 'id of the notice it belongs to'),
         'modified' => array('type' => 'timestamp', 'description' => 'date this record was modified'),
     ),
     'primary key' => array('file_id', 'post_id'),
@@ -796,7 +796,7 @@ $schema['file_to_post'] = array(
 
 $schema['design'] = array(
     'fields' => array(
-        'id' => array('type' => 'serial', 'description' => 'design ID'),
+        'id' => array('type' => 'serial', 'not null' => true, 'description' => 'design ID'),
         'backgroundcolor' => array('type' => 'int', 'description' => 'main background color'),
         'contentcolor' => array('type' => 'int', 'description' => 'content area background color'),
         'sidebarcolor' => array('type' => 'int', 'description' => 'sidebar background color'),
@@ -825,7 +825,7 @@ $schema['group_block'] = array(
 
 $schema['group_alias'] = array(
     'fields' => array(
-        'alias' => array('type' => 'varchar', 'length' => 64, 'description' => 'additional nickname for the group'),
+        'alias' => array('type' => 'varchar', 'length' => 64, 'not null' => true, 'description' => 'additional nickname for the group'),
         'group_id' => array('type' => 'int', 'not null' => true, 'description' => 'group profile is blocked from'),
         'modified' => array('type' => 'timestamp', 'description' => 'date alias was created'),
     ),
@@ -840,7 +840,7 @@ $schema['group_alias'] = array(
 
 $schema['session'] = array(
     'fields' => array(
-        'id' => array('type' => 'varchar', 'length' => 32, 'description' => 'session ID'),
+        'id' => array('type' => 'varchar', 'length' => 32, 'not null' => true, 'description' => 'session ID'),
         'session_data' => array('type' => 'text', 'description' => 'session data'),
         'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
         'modified' => array('type' => 'timestamp', 'description' => 'date this record was modified'),
@@ -853,7 +853,7 @@ $schema['session'] = array(
 
 $schema['deleted_notice'] = array(
     'fields' => array(
-        'id' => array('type' => 'int', 'description' => 'identity of notice'),
+        'id' => array('type' => 'int', 'not null' => true, 'description' => 'identity of notice'),
         'profile_id' => array('type' => 'int', 'not null' => true, 'description' => 'author of the notice'),
         'uri' => array('type' => 'varchar', 'length' => 255, 'description' => 'universally unique identifier, usually a tag URI'),
         'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date the notice record was created'),
@@ -870,8 +870,8 @@ $schema['deleted_notice'] = array(
 
 $schema['config'] = array(
     'fields' => array(
-        'section' => array('type' => 'varchar', 'length' => 32, 'description' => 'configuration section'),
-        'setting' => array('type' => 'varchar', 'length' => 32, 'description' => 'configuration setting'),
+        'section' => array('type' => 'varchar', 'length' => 32, 'not null' => true, 'description' => 'configuration section'),
+        'setting' => array('type' => 'varchar', 'length' => 32, 'not null' => true, 'description' => 'configuration setting'),
         'value' => array('type' => 'varchar', 'length' => 255, 'description' => 'configuration value'),
     ),
     'primary key' => array('section', 'setting'),
@@ -891,7 +891,7 @@ $schema['profile_role'] = array(
 
 $schema['location_namespace'] = array(
     'fields' => array(
-        'id' => array('type' => 'int', 'description' => 'identity for this namespace'),
+        'id' => array('type' => 'int', 'not null' => true, 'description' => 'identity for this namespace'),
         'description' => array('type' => 'varchar', 'length' => 255, 'description' => 'description of the namespace'),
         'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date the record was created'),
         'modified' => array('type' => 'timestamp', 'description' => 'date this record was modified'),
@@ -960,7 +960,7 @@ $schema['user_im_prefs'] = array(
 
 $schema['conversation'] = array(
     'fields' => array(
-        'id' => array('type' => 'serial', 'description' => 'unique identifier'),
+        'id' => array('type' => 'serial', 'not null' => true, 'description' => 'unique identifier'),
         'uri' => array('type' => 'varchar', 'length' => 225, 'description' => 'URI of the conversation'),
         'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
         'modified' => array('type' => 'timestamp', 'description' => 'date this record was modified'),
@@ -974,7 +974,7 @@ $schema['conversation'] = array(
 $schema['local_group'] = array(
     'description' => 'Record for a user group on the local site, with some additional info not in user_group',
     'fields' => array(
-        'group_id' => array('type' => 'int', 'description' => 'group represented'),
+        'group_id' => array('type' => 'int', 'not null' => true, 'description' => 'group represented'),
         'nickname' => array('type' => 'varchar', 'length' => 64, 'description' => 'group represented'),
 
         'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
diff --git a/lib/mysqlschema.php b/lib/mysqlschema.php
index e4d91ffa07..696b2b8d2a 100644
--- a/lib/mysqlschema.php
+++ b/lib/mysqlschema.php
@@ -130,7 +130,7 @@ class MysqlSchema extends Schema
                 // We'll need to look up key info...
                 $hasKeys = true;
             }
-            if ($row['COLUMN_COMMENT'] !== null) {
+            if ($row['COLUMN_COMMENT'] !== null && $row['COLUMN_COMMENT'] != '') {
                 $field['description'] = $row['COLUMN_COMMENT'];
             }
 

From 2e475ceab05c92014e428fe6db6bc79badaad9ca Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Thu, 7 Oct 2010 18:33:02 -0700
Subject: [PATCH 233/655] Some more poking at schema stuff, on the road towards
 a more portable table-modification with the new schema bits

---
 lib/mysqlschema.php |  25 ---------
 lib/pgsqlschema.php | 130 +++++++++++++++-----------------------------
 lib/schema.php      | 117 +++++++++++++++++++++++++++++++++------
 3 files changed, 144 insertions(+), 128 deletions(-)

diff --git a/lib/mysqlschema.php b/lib/mysqlschema.php
index 696b2b8d2a..0a5545286b 100644
--- a/lib/mysqlschema.php
+++ b/lib/mysqlschema.php
@@ -322,31 +322,6 @@ class MysqlSchema extends Schema
         return true;
     }
 
-    /**
-     * Look over a list of column definitions and list up which
-     * indices will be present
-     */
-    private function _indexList(array $columns)
-    {
-        $list = array('uniques' => array(),
-                      'primary' => array(),
-                      'indices' => array());
-        foreach ($columns as $cd) {
-            switch ($cd->key) {
-            case 'UNI':
-                $list['uniques'][] = $cd->name;
-                break;
-            case 'PRI':
-                $list['primary'][] = $cd->name;
-                break;
-            case 'MUL':
-                $list['indices'][] = $cd->name;
-                break;
-            }
-        }
-        return $list;
-    }
-
     /**
      * Get the unique index key name for a given column on this table
      */
diff --git a/lib/pgsqlschema.php b/lib/pgsqlschema.php
index 2d0f609836..585d05d615 100644
--- a/lib/pgsqlschema.php
+++ b/lib/pgsqlschema.php
@@ -208,93 +208,6 @@ class PgsqlSchema extends Schema
         return true;
     }
 
-
-    /**
-     * Ensures that a table exists with the given
-     * name and the given column definitions.
-     *
-     * If the table does not yet exist, it will
-     * create the table. If it does exist, it will
-     * alter the table to match the column definitions.
-     *
-     * @param string $tableName name of the table
-     * @param array  $columns   array of ColumnDef
-     *                          objects for the table
-     *
-     * @return boolean success flag
-     */
-
-    public function ensureTable($tableName, $columns)
-    {
-        // XXX: DB engine portability -> toilet
-
-        try {
-            $td = $this->getTableDef($tableName);
-            
-        } catch (Exception $e) {
-            if (preg_match('/no such table/', $e->getMessage())) {
-                return $this->createTable($tableName, $columns);
-            } else {
-                throw $e;
-            }
-        }
-
-        $cur = $this->_names($td->columns);
-        $new = $this->_names($columns);
-
-        $toadd  = array_diff($new, $cur);
-        $todrop = array_diff($cur, $new);
-        $same   = array_intersect($new, $cur);
-        $tomod  = array();
-        foreach ($same as $m) {
-            $curCol = $this->_byName($td->columns, $m);
-            $newCol = $this->_byName($columns, $m);
-            
-
-            if (!$newCol->equals($curCol)) {
-            // BIG GIANT TODO!
-            // stop it detecting different types and trying to modify on every page request
-//                 $tomod[] = $newCol->name;
-            }
-        }
-        if (count($toadd) + count($todrop) + count($tomod) == 0) {
-            // nothing to do
-            return true;
-        }
-
-        // For efficiency, we want this all in one
-        // query, instead of using our methods.
-
-        $phrase = array();
-
-        foreach ($toadd as $columnName) {
-            $cd = $this->_byName($columns, $columnName);
-
-            $phrase[] = 'ADD COLUMN ' . $this->_columnSql($cd);
-        }
-
-        foreach ($todrop as $columnName) {
-            $phrase[] = 'DROP COLUMN ' . $columnName;
-        }
-
-        foreach ($tomod as $columnName) {
-            $cd = $this->_byName($columns, $columnName);
-
-	/* brute force */
-            $phrase[] = 'DROP COLUMN ' . $columnName;
-            $phrase[] = 'ADD COLUMN ' . $this->_columnSql($cd);
-        }
-
-        $sql = 'ALTER TABLE ' . $tableName . ' ' . implode(', ', $phrase);
-        $res = $this->conn->query($sql);
-
-        if (PEAR::isError($res)) {
-            throw new Exception($res->getMessage());
-        }
-
-        return true;
-    }
-
     /**
      * Return the proper SQL for creating or
      * altering a column.
@@ -326,6 +239,49 @@ class PgsqlSchema extends Schema
         return implode(' ', $line);
     }
 
+    /**
+     * Append phrase(s) to an array of partial ALTER TABLE chunks in order
+     * to alter the given column from its old state to a new one.
+     *
+     * @param array $phrase
+     * @param string $columnName
+     * @param array $old previous column definition as found in DB
+     * @param array $cd current column definition
+     */
+    function appendAlterModifyColumn(array &$phrase, $columnName, array $old, array $cd)
+    {
+        $prefix = 'ALTER COLUMN ' . $this->quoteIdentifier($columnName) . ' ';
+
+        $oldType = $this->mapType($old);
+        $newType = $this->mapType($cd);
+        if ($oldType != $newType) {
+            $phrase[] .= $prefix . 'TYPE ' . $newType;
+        }
+
+        if (!empty($old['not null']) && empty($cd['not null'])) {
+            $phrase[] .= $prefix . 'DROP NOT NULL';
+        } else if (empty($old['not null']) && !empty($cd['not null'])) {
+            $phrase[] .= $prefix . 'SET NOT NULL';
+        }
+
+        if (isset($old['default']) && !isset($cd['default'])) {
+            $phrase[] . $prefix . 'DROP DEFAULT';
+        } else if (!isset($old['default']) && isset($cd['default'])) {
+            $phrase[] . $prefix . 'SET DEFAULT ' . $this->quoteDefaultValue($cd);
+        }
+    }
+
+    /**
+     * Quote a db/table/column identifier if necessary.
+     *
+     * @param string $name
+     * @return string
+     */
+    function quoteIdentifier($name)
+    {
+        return '"' . $name . '"';
+    }
+
     function mapType($column)
     {
         $map = array('serial' => 'bigserial', // FIXME: creates the wrong name for the sequence for some internal sequence-lookup function, so better fix this to do the real 'create sequence' dance.
diff --git a/lib/schema.php b/lib/schema.php
index 5868627ed7..60d3324ad6 100644
--- a/lib/schema.php
+++ b/lib/schema.php
@@ -345,12 +345,12 @@ class Schema
      * @return boolean success flag
      */
 
-    public function ensureTable($tableName, $columns)
+    public function ensureTable($tableName, $def)
     {
         // XXX: DB engine portability -> toilet
 
         try {
-            $td = $this->getTableDef($tableName);
+            $old = $this->getTableDef($tableName);
         } catch (Exception $e) {
             if (preg_match('/no such table/', $e->getMessage())) {
                 return $this->createTable($tableName, $columns);
@@ -359,20 +359,22 @@ class Schema
             }
         }
 
-        $cur = $this->_names($td->columns);
-        $new = $this->_names($columns);
+        $cur = array_keys($old['fields']);
+        $new = array_keys($def['fields']);
 
         $toadd  = array_diff($new, $cur);
         $todrop = array_diff($cur, $new);
         $same   = array_intersect($new, $cur);
         $tomod  = array();
 
-        foreach ($same as $m) {
-            $curCol = $this->_byName($td->columns, $m);
-            $newCol = $this->_byName($columns, $m);
+        // Find which fields have actually changed definition
+        // in a way that we need to tweak them for this DB type.
+        foreach ($same as $name) {
+            $curCol = $old['fields'][$name];
+            $newCol = $cur['fields'][$name];
 
-            if (!$newCol->equals($curCol)) {
-                $tomod[] = $newCol->name;
+            if (!$this->columnsEqual($curCol, $newCol)) {
+                $tomod[] = $name;
             }
         }
 
@@ -387,19 +389,18 @@ class Schema
         $phrase = array();
 
         foreach ($toadd as $columnName) {
-            $cd = $this->_byName($columns, $columnName);
-
-            $phrase[] = 'ADD COLUMN ' . $this->_columnSql($cd);
+            $this->appendAlterAddColumn($phrase, $columnName,
+                    $def['fields'][$columnName]);
         }
 
         foreach ($todrop as $columnName) {
-            $phrase[] = 'DROP COLUMN ' . $columnName;
+            $this->appendAlterModifyColumn($phrase, $columnName,
+                    $old['fields'][$columnName],
+                    $def['fields'][$columnName]);
         }
 
         foreach ($tomod as $columnName) {
-            $cd = $this->_byName($columns, $columnName);
-
-            $phrase[] = 'MODIFY COLUMN ' . $this->_columnSql($cd);
+            $this->appendAlterDropColumn($phrase, $columnName);
         }
 
         $sql = 'ALTER TABLE ' . $tableName . ' ' . implode(', ', $phrase);
@@ -413,6 +414,90 @@ class Schema
         return true;
     }
 
+    /**
+     * Append phrase(s) to an array of partial ALTER TABLE chunks in order
+     * to add the given column definition to the table.
+     *
+     * @param array $phrase
+     * @param string $columnName
+     * @param array $cd 
+     */
+    function appendAlterAddColumn(array &$phrase, $columnName, array $cd)
+    {
+        $phrase[] = 'ADD COLUMN ' .
+                    $this->quoteIdentifier($columnName) .
+                    ' ' .
+                    $this->columnSql($cd);
+    }
+
+    /**
+     * Append phrase(s) to an array of partial ALTER TABLE chunks in order
+     * to alter the given column from its old state to a new one.
+     *
+     * @param array $phrase
+     * @param string $columnName
+     * @param array $old previous column definition as found in DB
+     * @param array $cd current column definition
+     */
+    function appendAlterModifyColumn(array &$phrase, $columnName, array $old, array $cd)
+    {
+        $phrase[] = 'MODIFY COLUMN ' .
+                    $this->quoteIdentifier($columnName) .
+                    ' ' .
+                    $this->columnSql($cd);
+    }
+
+    /**
+     * Append phrase(s) to an array of partial ALTER TABLE chunks in order
+     * to drop the given column definition from the table.
+     *
+     * @param array $phrase
+     * @param string $columnName
+     */
+    function appendAlterDropColumn(array &$phrase, $columnName)
+    {
+        $phrase[] = 'DROP COLUMN ' . $this->quoteIdentifier($columnName);
+    }
+
+    /**
+     * Quote a db/table/column identifier if necessary.
+     *
+     * @param string $name
+     * @return string
+     */
+    function quoteIdentifier($name)
+    {
+        return $name;
+    }
+
+    function quoteDefaultValue($cd)
+    {
+        if ($cd['type'] == 'datetime' && $cd['default'] == 'CURRENT_TIMESTAMP') {
+            return $cd['default'];
+        } else {
+            return $this->quoteValue($cd['default']);
+        }
+    }
+
+    function quoteValue($val)
+    {
+        return $this->conn->escape($val);
+    }
+
+    /**
+     * Check if two column definitions are equivalent.
+     * The default implementation checks _everything_ but in many cases
+     * you may be able to discard a bunch of equivalencies.
+     *
+     * @param array $a
+     * @param array $b
+     * @return boolean
+     */
+    function columnsEqual(array $a, array $b)
+    {
+        return !array_diff_assoc($a, $b) && !array_diff_assoc($b, $a);
+    }
+
     /**
      * Returns the array of names from an array of
      * ColumnDef objects.

From 2d0807bc1c72c1351f57d7f65386ad7be9d19e83 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Fri, 8 Oct 2010 16:36:32 -0700
Subject: [PATCH 234/655] Starting on adapting postgresql schema class to look
 stuff up in the new drupalish format... Fetching basic column data and unique
 indexes. Still needs detail work, multi-value indexes, foreign keys, and
 distinguishing the primary key. Since we don't get comments and such, for
 cleaner comparisons we should probably do a filtering on supported features.

---
 lib/mysqlschema.php |  23 --------
 lib/pgsqlschema.php | 137 +++++++++++++++++++++++++++++++++-----------
 lib/schema.php      |  35 +++++++++++
 3 files changed, 138 insertions(+), 57 deletions(-)

diff --git a/lib/mysqlschema.php b/lib/mysqlschema.php
index 696b2b8d2a..98e276a408 100644
--- a/lib/mysqlschema.php
+++ b/lib/mysqlschema.php
@@ -243,29 +243,6 @@ class MysqlSchema extends Schema
         return $this->fetchQueryData($sql);
     }
 
-    /**
-     * Pull info from the query into a fun-fun array of dooooom
-     *
-     * @param string $sql
-     * @return array of arrays
-     */
-    protected function fetchQueryData($sql)
-    {
-        $res = $this->conn->query($sql);
-        if (PEAR::isError($res)) {
-            throw new Exception($res->getMessage());
-        }
-
-        $out = array();
-        $row = array();
-        while ($res->fetchInto($row, DB_FETCHMODE_ASSOC)) {
-            $out[] = $row;
-        }
-        $res->free();
-
-        return $out;
-    }
-
     /**
      * Creates a table with the given names and columns.
      *
diff --git a/lib/pgsqlschema.php b/lib/pgsqlschema.php
index 2d0f609836..1c6d12b944 100644
--- a/lib/pgsqlschema.php
+++ b/lib/pgsqlschema.php
@@ -42,6 +42,7 @@ if (!defined('STATUSNET')) {
  * @package  StatusNet
  * @author   Evan Prodromou <evan@status.net>
  * @author   Brenda Wallace <shiny@cpan.org>
+ * @author   Brion Vibber <brion@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
@@ -50,57 +51,104 @@ class PgsqlSchema extends Schema
 {
 
     /**
-     * Returns a TableDef object for the table
+     * Returns a table definition array for the table
      * in the schema with the given name.
      *
      * Throws an exception if the table is not found.
      *
-     * @param string $name Name of the table to get
+     * @param string $table Name of the table to get
      *
-     * @return TableDef tabledef for that table.
+     * @return array tabledef for that table.
      */
 
-    public function getTableDef($name)
+    public function getTableDef($table)
     {
-        $res = $this->conn->query("SELECT *, column_default as default, is_nullable as Null,
-        udt_name as Type, column_name AS Field from INFORMATION_SCHEMA.COLUMNS where table_name = '$name'");
+        $def = array();
+        $hasKeys = false;
 
-        if (PEAR::isError($res)) {
-            throw new Exception($res->getMessage());
+        // Pull column data from INFORMATION_SCHEMA
+        $columns = $this->fetchMetaInfo($table, 'columns', 'ordinal_position');
+        if (count($columns) == 0) {
+            throw new SchemaTableMissingException("No such table: $table");
         }
 
-        $td = new TableDef();
+        foreach ($columns as $row) {
 
-        $td->name    = $name;
-        $td->columns = array();
+            $name = $row['column_name'];
+            $field = array();
 
-        if ($res->numRows() == 0 ) {
-          throw new Exception('no such table'); //pretend to be the msyql error. yeah, this sucks.
-        }
-        $row = array();
-
-        while ($res->fetchInto($row, DB_FETCHMODE_ASSOC)) {
-            $cd = new ColumnDef();
-
-            $cd->name = $row['field'];
-
-            $packed = $row['type'];
-
-            if (preg_match('/^(\w+)\((\d+)\)$/', $packed, $match)) {
-                $cd->type = $match[1];
-                $cd->size = $match[2];
-            } else {
-                $cd->type = $packed;
+            // ??
+            list($type, $size) = $this->reverseMapType($row['udt_name']);
+            $field['type'] = $type;
+            if ($size !== null) {
+                $field['size'] = $size;
             }
 
-            $cd->nullable = ($row['null'] == 'YES') ? true : false;
-            $cd->key      = $row['Key'];
-            $cd->default  = $row['default'];
-            $cd->extra    = $row['Extra'];
+            if ($type == 'char' || $type == 'varchar') {
+                if ($row['character_maximum_length'] !== null) {
+                    $field['length'] = intval($row['character_maximum_length']);
+                }
+            }
+            if ($type == 'numeric') {
+                // Other int types may report these values, but they're irrelevant.
+                // Just ignore them!
+                if ($row['numeric_precision'] !== null) {
+                    $field['precision'] = intval($row['numeric_precision']);
+                }
+                if ($row['numeric_scale'] !== null) {
+                    $field['scale'] = intval($row['numeric_scale']);
+                }
+            }
+            if ($row['is_nullable'] == 'NO') {
+                $field['not null'] = true;
+            }
+            if ($row['column_default'] !== null) {
+                $field['default'] = $row['column_default'];
+                if ($this->isNumericType($type)) {
+                    $field['default'] = intval($field['default']);
+                }
+            }
 
-            $td->columns[] = $cd;
+            $def['fields'][$name] = $field;
         }
-        return $td;
+
+        // Pull constraint data from INFORMATION_SCHEMA
+        // @fixme also find multi-val indexes
+        // @fixme distinguish the primary key
+        // @fixme pull foreign key references
+        $keyColumns = $this->fetchMetaInfo($table, 'key_column_usage', 'constraint_name,ordinal_position');
+        $keys = array();
+
+        foreach ($keyColumns as $row) {
+            $keyName = $row['constraint_name'];
+            $keyCol = $row['column_name'];
+            if (!isset($keys[$keyName])) {
+                $keys[$keyName] = array();
+            }
+            $keys[$keyName][] = $keyCol;
+        }
+
+        foreach ($keys as $keyName => $cols) {
+            $def['unique indexes'][$keyName] = $cols;
+        }
+        return $def;
+    }
+
+    /**
+     * Pull some INFORMATION.SCHEMA data for the given table.
+     *
+     * @param string $table
+     * @return array of arrays
+     */
+    function fetchMetaInfo($table, $infoTable, $orderBy=null)
+    {
+        $query = "SELECT * FROM information_schema.%s " .
+                 "WHERE table_name='%s'";
+        $sql = sprintf($query, $infoTable, $table);
+        if ($orderBy) {
+            $sql .= ' ORDER BY ' . $orderBy;
+        }
+        return $this->fetchQueryData($sql);
     }
 
     /**
@@ -360,4 +408,25 @@ class PgsqlSchema extends Schema
         }
     }
 
+    /**
+     * Map a native type back to an independent type + size
+     *
+     * @param string $type
+     * @return array ($type, $size) -- $size may be null
+     */
+    protected function reverseMapType($type)
+    {
+        $type = strtolower($type);
+        $map = array(
+            'int4' => array('int', null),
+            'int8' => array('int', 'big'),
+            'bytea' => array('blob', null),
+        );
+        if (isset($map[$type])) {
+            return $map[$type];
+        } else {
+            return array($type, null);
+        }
+    }
+
 }
diff --git a/lib/schema.php b/lib/schema.php
index 5868627ed7..5085ab6fe5 100644
--- a/lib/schema.php
+++ b/lib/schema.php
@@ -515,6 +515,17 @@ class Schema
         }
     }
 
+    /**
+     * Map a native type back to an independent type + size
+     *
+     * @param string $type
+     * @return array ($type, $size) -- $size may be null
+     */
+    protected function reverseMapType($type)
+    {
+        return array($type, null);
+    }
+
     /**
      * Convert an old-style set of ColumnDef objects into the current
      * Drupal-style schema definition array, for backwards compatibility
@@ -590,6 +601,30 @@ class Schema
         $known = array('int', 'serial', 'numeric');
         return in_array($type, $known);
     }
+
+    /**
+     * Pull info from the query into a fun-fun array of dooooom
+     *
+     * @param string $sql
+     * @return array of arrays
+     */
+    protected function fetchQueryData($sql)
+    {
+        $res = $this->conn->query($sql);
+        if (PEAR::isError($res)) {
+            throw new Exception($res->getMessage());
+        }
+
+        $out = array();
+        $row = array();
+        while ($res->fetchInto($row, DB_FETCHMODE_ASSOC)) {
+            $out[] = $row;
+        }
+        $res->free();
+
+        return $out;
+    }
+
 }
 
 class SchemaTableMissingException extends Exception

From f85511c28f38d8d4a4016e8036d41778286cdb22 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Mon, 11 Oct 2010 13:05:44 -0700
Subject: [PATCH 235/655] quick syntax fix

---
 lib/pgsqlschema.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/pgsqlschema.php b/lib/pgsqlschema.php
index f09f41d51a..27f004cea6 100644
--- a/lib/pgsqlschema.php
+++ b/lib/pgsqlschema.php
@@ -303,19 +303,19 @@ class PgsqlSchema extends Schema
         $oldType = $this->mapType($old);
         $newType = $this->mapType($cd);
         if ($oldType != $newType) {
-            $phrase[] .= $prefix . 'TYPE ' . $newType;
+            $phrase[] = $prefix . 'TYPE ' . $newType;
         }
 
         if (!empty($old['not null']) && empty($cd['not null'])) {
-            $phrase[] .= $prefix . 'DROP NOT NULL';
+            $phrase[] = $prefix . 'DROP NOT NULL';
         } else if (empty($old['not null']) && !empty($cd['not null'])) {
-            $phrase[] .= $prefix . 'SET NOT NULL';
+            $phrase[] = $prefix . 'SET NOT NULL';
         }
 
         if (isset($old['default']) && !isset($cd['default'])) {
-            $phrase[] . $prefix . 'DROP DEFAULT';
+            $phrase[] = $prefix . 'DROP DEFAULT';
         } else if (!isset($old['default']) && isset($cd['default'])) {
-            $phrase[] . $prefix . 'SET DEFAULT ' . $this->quoteDefaultValue($cd);
+            $phrase[] = $prefix . 'SET DEFAULT ' . $this->quoteDefaultValue($cd);
         }
     }
 

From 5434f431769faa4378be61eec6e736ee3e1dba0b Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Mon, 11 Oct 2010 14:15:02 -0700
Subject: [PATCH 236/655] Now pulling non-primary/unique index data for PG as
 well... need to sort out conflicts with the other data and make foreign
 references work right :D

---
 lib/pgsqlschema.php | 68 ++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 67 insertions(+), 1 deletion(-)

diff --git a/lib/pgsqlschema.php b/lib/pgsqlschema.php
index 27f004cea6..4e24da7501 100644
--- a/lib/pgsqlschema.php
+++ b/lib/pgsqlschema.php
@@ -72,9 +72,14 @@ class PgsqlSchema extends Schema
             throw new SchemaTableMissingException("No such table: $table");
         }
 
+        // We'll need to match up fields by ordinal reference
+        $orderedFields = array();
+
         foreach ($columns as $row) {
 
             $name = $row['column_name'];
+            $orderedFields[$row['ordinal_position']] = $name;
+
             $field = array();
 
             // ??
@@ -112,6 +117,38 @@ class PgsqlSchema extends Schema
             $def['fields'][$name] = $field;
         }
 
+        // Pulling index info from pg_class & pg_index
+        // This can provide us basic info on primary, unique, and multi-val keys
+        // But... it doesn't list plain constraints or foreign key constraints. :P
+        $indexInfo = $this->getIndexInfo($table);
+        foreach ($indexInfo as $row) {
+            $keyName = $row['key_name'];
+
+            // Dig the column references out!
+            $cols = array();
+            $colPositions = explode(' ', $row['indkey']);
+            foreach ($colPositions as $ord) {
+                // ordinal_position from above is 1-based
+                // but values in indkey are 0-based
+                if ($ord == 0) {
+                    $cols[] = 'FUNCTION'; // @fixme
+                } else {
+                    $cols[] = $orderedFields[$ord];
+                }
+            }
+
+            // @fixme foreign keys?
+            // @fixme prefixes?
+            // @fixme funky stuff like fulltext?
+            if ($row['indisprimary'] == 't') {
+                $def['primary key'] = $cols;
+            } else if ($row['indisunique'] == 't') {
+                $def['unique keys'][$keyName] = $cols;
+            } else {
+                $def['indexes'][$keyName] = $cols;
+            }
+        }
+
         // Pull constraint data from INFORMATION_SCHEMA
         // @fixme also find multi-val indexes
         // @fixme distinguish the primary key
@@ -120,6 +157,7 @@ class PgsqlSchema extends Schema
         $keys = array();
 
         foreach ($keyColumns as $row) {
+            var_dump($row);
             $keyName = $row['constraint_name'];
             $keyCol = $row['column_name'];
             if (!isset($keys[$keyName])) {
@@ -129,7 +167,18 @@ class PgsqlSchema extends Schema
         }
 
         foreach ($keys as $keyName => $cols) {
-            $def['unique indexes'][$keyName] = $cols;
+            // hack -- is this reliable?
+            if ($keyName == "{$table}_pkey") {
+                $def['xprimary key'] = $cols;
+            } else if (preg_match("/^{$table}_(.*)_fkey$/", $keyName, $matches)) {
+                $keys = array_keys($cols);
+                if (count($cols) == 1 && $cols[$keys[0]] == $keyName) {
+                    $def['foreign keys'][$keyname][$matches[1]] = $keys[0];
+                }
+                $def['foreign keys'][$keyName][$matches[1]] = $cols;
+            } else {
+                $def['xunique indexes'][$keyName] = $cols;
+            }
         }
         return $def;
     }
@@ -152,6 +201,23 @@ class PgsqlSchema extends Schema
     }
 
     /**
+     * Pull some PG-specific index info
+     * @param string $table
+     * @return array of arrays
+     */
+    function getIndexInfo($table)
+    {
+        $query = 'SELECT ' .
+                 '(SELECT relname FROM pg_class WHERE oid=indexrelid) AS key_name, ' .
+                 '* FROM pg_index ' .
+                 'WHERE indrelid=(SELECT oid FROM pg_class WHERE relname=\'%s\') ' .
+                 'ORDER BY indrelid, indexrelid';
+        $sql = sprintf($query, $table);
+        return $this->fetchQueryData($sql);
+    }
+
+    /**
+     *
      * Creates a table with the given names and columns.
      *
      * @param string $name    Name of the table

From d0dbedf3bb27dc87a53677a6eefdb0dd8e49e148 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Mon, 11 Oct 2010 15:40:51 -0700
Subject: [PATCH 237/655] PgsqlSchema can now pull primary, unique,
 mutli-value, *and* foreign keys :D

---
 lib/pgsqlschema.php | 100 ++++++++++++++++++++++++++++++++------------
 1 file changed, 73 insertions(+), 27 deletions(-)

diff --git a/lib/pgsqlschema.php b/lib/pgsqlschema.php
index 4e24da7501..73797a90c3 100644
--- a/lib/pgsqlschema.php
+++ b/lib/pgsqlschema.php
@@ -118,18 +118,20 @@ class PgsqlSchema extends Schema
         }
 
         // Pulling index info from pg_class & pg_index
-        // This can provide us basic info on primary, unique, and multi-val keys
-        // But... it doesn't list plain constraints or foreign key constraints. :P
+        // This can give us primary & unique key info, but not foreign key constraints
+        // so we exclude them and pick them up later.
         $indexInfo = $this->getIndexInfo($table);
         foreach ($indexInfo as $row) {
             $keyName = $row['key_name'];
 
             // Dig the column references out!
+            //
+            // These are inconvenient arrays with partial references to the
+            // pg_att table, but since we've already fetched up the column
+            // info on the current table, we can look those up locally.
             $cols = array();
             $colPositions = explode(' ', $row['indkey']);
             foreach ($colPositions as $ord) {
-                // ordinal_position from above is 1-based
-                // but values in indkey are 0-based
                 if ($ord == 0) {
                     $cols[] = 'FUNCTION'; // @fixme
                 } else {
@@ -137,27 +139,15 @@ class PgsqlSchema extends Schema
                 }
             }
 
-            // @fixme foreign keys?
-            // @fixme prefixes?
-            // @fixme funky stuff like fulltext?
-            if ($row['indisprimary'] == 't') {
-                $def['primary key'] = $cols;
-            } else if ($row['indisunique'] == 't') {
-                $def['unique keys'][$keyName] = $cols;
-            } else {
-                $def['indexes'][$keyName] = $cols;
-            }
+            $def['indexes'][$keyName] = $cols;
         }
 
-        // Pull constraint data from INFORMATION_SCHEMA
-        // @fixme also find multi-val indexes
-        // @fixme distinguish the primary key
-        // @fixme pull foreign key references
+        // Pull constraint data from INFORMATION_SCHEMA:
+        // Primary key, unique keys, foreign keys
         $keyColumns = $this->fetchMetaInfo($table, 'key_column_usage', 'constraint_name,ordinal_position');
         $keys = array();
 
         foreach ($keyColumns as $row) {
-            var_dump($row);
             $keyName = $row['constraint_name'];
             $keyCol = $row['column_name'];
             if (!isset($keys[$keyName])) {
@@ -167,17 +157,15 @@ class PgsqlSchema extends Schema
         }
 
         foreach ($keys as $keyName => $cols) {
-            // hack -- is this reliable?
+            // name hack -- is this reliable?
             if ($keyName == "{$table}_pkey") {
-                $def['xprimary key'] = $cols;
+                $def['primary key'] = $cols;
             } else if (preg_match("/^{$table}_(.*)_fkey$/", $keyName, $matches)) {
-                $keys = array_keys($cols);
-                if (count($cols) == 1 && $cols[$keys[0]] == $keyName) {
-                    $def['foreign keys'][$keyname][$matches[1]] = $keys[0];
-                }
-                $def['foreign keys'][$keyName][$matches[1]] = $cols;
+                $fkey = $this->getForeignKeyInfo($table, $keyName);
+                $colMap = array_combine($cols, $fkey['col_names']);
+                $def['foreign keys'][$keyName] = array($fkey['table_name'], $colMap);
             } else {
-                $def['xunique indexes'][$keyName] = $cols;
+                $def['unique keys'][$keyName] = $cols;
             }
         }
         return $def;
@@ -211,11 +199,69 @@ class PgsqlSchema extends Schema
                  '(SELECT relname FROM pg_class WHERE oid=indexrelid) AS key_name, ' .
                  '* FROM pg_index ' .
                  'WHERE indrelid=(SELECT oid FROM pg_class WHERE relname=\'%s\') ' .
+                 'AND indisprimary=\'f\' AND indisunique=\'f\' ' .
                  'ORDER BY indrelid, indexrelid';
         $sql = sprintf($query, $table);
         return $this->fetchQueryData($sql);
     }
 
+    /**
+     * Column names from the foreign table can be resolved with a call to getTableColumnNames()
+     * @param <type> $table
+     * @return array array of rows with keys: fkey_name, table_name, table_id, col_names (array of strings)
+     */
+    function getForeignKeyInfo($table, $constraint_name)
+    {
+        // In a sane world, it'd be easier to query the column names directly.
+        // But it's pretty hard to work with arrays such as col_indexes in direct SQL here.
+        $query = 'SELECT ' .
+                 '(SELECT relname FROM pg_class WHERE oid=confrelid) AS table_name, ' .
+                 'confrelid AS table_id, ' .
+                 '(SELECT indkey FROM pg_index WHERE indexrelid=conindid) AS col_indexes ' .
+                 'FROM pg_constraint ' .
+                 'WHERE conrelid=(SELECT oid FROM pg_class WHERE relname=\'%s\') ' .
+                 'AND conname=\'%s\' ' .
+                 'AND contype=\'f\'';
+        $sql = sprintf($query, $table, $constraint_name);
+        $data = $this->fetchQueryData($sql);
+        if (count($data) < 1) {
+            throw new Exception("Could not find foreign key " . $constraint_name . " on table " . $table);
+        }
+
+        $row = $data[0];
+        return array(
+            'table_name' => $row['table_name'],
+            'col_names' => $this->getTableColumnNames($row['table_id'], $row['col_indexes'])
+        );
+    }
+
+    /**
+     *
+     * @param int $table_id
+     * @param array $col_indexes
+     * @return array of strings
+     */
+    function getTableColumnNames($table_id, $col_indexes)
+    {
+        $indexes = array_map('intval', explode(' ', $col_indexes));
+        $query = 'SELECT attnum AS col_index, attname AS col_name ' .
+                 'FROM pg_attribute where attrelid=%d ' .
+                 'AND attnum IN (%s)';
+        $sql = sprintf($query, $table_id, implode(',', $indexes));
+        $data = $this->fetchQueryData($sql);
+
+        $byId = array();
+        foreach ($data as $row) {
+            $byId[$row['col_index']] = $row['col_name'];
+        }
+
+        $out = array();
+        foreach ($indexes as $id) {
+            $out[] = $byId[$id];
+        }
+        return $out;
+    }
+
     /**
      *
      * Creates a table with the given names and columns.

From 9364e446b1edf34c01202828ebb1e7eaf04b3871 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Mon, 11 Oct 2010 19:10:51 -0700
Subject: [PATCH 238/655] Start reworking things to build create table stuff
 (can view via dumpschema.php --build)

---
 lib/mysqlschema.php    |  56 ++---------
 lib/pgsqlschema.php    | 103 ++-------------------
 lib/schema.php         | 205 ++++++++++++++++++++++++++++++++---------
 scripts/dumpschema.php |  18 +++-
 4 files changed, 191 insertions(+), 191 deletions(-)

diff --git a/lib/mysqlschema.php b/lib/mysqlschema.php
index 9ccd502b53..a2ca835d93 100644
--- a/lib/mysqlschema.php
+++ b/lib/mysqlschema.php
@@ -244,59 +244,15 @@ class MysqlSchema extends Schema
     }
 
     /**
-     * Creates a table with the given names and columns.
+     * Close out a 'create table' SQL statement.
      *
-     * @param string $name    Name of the table
-     * @param array  $columns Array of ColumnDef objects
-     *                        for new table.
-     *
-     * @return boolean success flag
+     * @param array $sql
+     * @param string $name
+     * @param array $def
      */
-
-    public function createTable($name, $columns)
+    function appendCreateTableEnd(array &$sql, $name, array $def)
     {
-        $uniques = array();
-        $primary = array();
-        $indices = array();
-
-        $sql = "CREATE TABLE $name (\n";
-
-        for ($i = 0; $i < count($columns); $i++) {
-
-            $cd =& $columns[$i];
-
-            if ($i > 0) {
-                $sql .= ",\n";
-            }
-
-            $sql .= $this->_columnSql($cd);
-        }
-
-        $idx = $this->_indexList($columns);
-
-        if ($idx['primary']) {
-            $sql .= ",\nconstraint primary key (" . implode(',', $idx['primary']) . ")";
-        }
-
-        foreach ($idx['uniques'] as $u) {
-            $key = $this->_uniqueKey($name, $u);
-            $sql .= ",\nunique index $key ($u)";
-        }
-
-        foreach ($idx['indices'] as $i) {
-            $key = $this->_key($name, $i);
-            $sql .= ",\nindex $key ($i)";
-        }
-
-        $sql .= ") ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin; ";
-
-        $res = $this->conn->query($sql);
-
-        if (PEAR::isError($res)) {
-            throw new Exception($res->getMessage());
-        }
-
-        return true;
+        $sql[] = ") ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin";
     }
 
     /**
diff --git a/lib/pgsqlschema.php b/lib/pgsqlschema.php
index 73797a90c3..a8ce21b384 100644
--- a/lib/pgsqlschema.php
+++ b/lib/pgsqlschema.php
@@ -262,71 +262,6 @@ class PgsqlSchema extends Schema
         return $out;
     }
 
-    /**
-     *
-     * Creates a table with the given names and columns.
-     *
-     * @param string $name    Name of the table
-     * @param array  $columns Array of ColumnDef objects
-     *                        for new table.
-     *
-     * @return boolean success flag
-     */
-
-    public function createTable($name, $columns)
-    {
-        $uniques = array();
-        $primary = array();
-        $indices = array();
-	$onupdate = array();
-
-        $sql = "CREATE TABLE $name (\n";
-
-        for ($i = 0; $i < count($columns); $i++) {
-
-            $cd =& $columns[$i];
-
-            if ($i > 0) {
-                $sql .= ",\n";
-            }
-
-            $sql .= $this->_columnSql($cd);
-            switch ($cd->key) {
-            case 'UNI':
-                $uniques[] = $cd->name;
-                break;
-            case 'PRI':
-                $primary[] = $cd->name;
-                break;
-            case 'MUL':
-                $indices[] = $cd->name;
-                break;
-            }
-        }
-
-        if (count($primary) > 0) { // it really should be...
-            $sql .= ",\n PRIMARY KEY (" . implode(',', $primary) . ")";
-        }
-
-        $sql .= "); ";
-
-
-        foreach ($uniques as $u) {
-            $sql .= "\n CREATE index {$name}_{$u}_idx ON {$name} ($u); ";
-        }
-
-        foreach ($indices as $i) {
-            $sql .= "CREATE index {$name}_{$i}_idx ON {$name} ($i)";
-        }
-        $res = $this->conn->query($sql);
-
-        if (PEAR::isError($res)) {
-            throw new Exception($res->getMessage(). ' SQL was '. $sql);
-        }
-
-        return true;
-    }
-
     /**
      * Translate the (mostly) mysql-ish column types into somethings more standard
      * @param string column type
@@ -343,31 +278,6 @@ class PgsqlSchema extends Schema
       return $type;
     }
 
-    /**
-     * Modifies a column in the schema.
-     *
-     * The name must match an existing column and table.
-     *
-     * @param string    $table     name of the table
-     * @param ColumnDef $columndef new definition of the column.
-     *
-     * @return boolean success flag
-     */
-
-    public function modifyColumn($table, $columndef)
-    {
-        $sql = "ALTER TABLE $table ALTER COLUMN TYPE " .
-          $this->_columnSql($columndef);
-
-        $res = $this->conn->query($sql);
-
-        if (PEAR::isError($res)) {
-            throw new Exception($res->getMessage());
-        }
-
-        return true;
-    }
-
     /**
      * Return the proper SQL for creating or
      * altering a column.
@@ -375,26 +285,25 @@ class PgsqlSchema extends Schema
      * Appropriate for use in CREATE TABLE or
      * ALTER TABLE statements.
      *
-     * @param string $tableName
-     * @param array $tableDef
-     * @param string $columnName
      * @param array $cd column to create
      *
      * @return string correct SQL for that column
      */
 
-    function columnSql($name, array $cd)
+    function columnSql(array $cd)
     {
         $line = array();
-        $line[] = parent::_columnSql($cd);
+        $line[] = parent::columnSql($cd);
 
+        /*
         if ($table['foreign keys'][$name]) {
             foreach ($table['foreign keys'][$name] as $foreignTable => $foreignColumn) {
                 $line[] = 'references';
-                $line[] = $this->quoteId($foreignTable);
-                $line[] = '(' . $this->quoteId($foreignColumn) . ')';
+                $line[] = $this->quoteIdentifier($foreignTable);
+                $line[] = '(' . $this->quoteIdentifier($foreignColumn) . ')';
             }
         }
+        */
 
         return implode(' ', $line);
     }
diff --git a/lib/schema.php b/lib/schema.php
index 40a9fb505d..6c6a3e56f0 100644
--- a/lib/schema.php
+++ b/lib/schema.php
@@ -128,56 +128,133 @@ class Schema
 
     public function createTable($name, $columns)
     {
-        $uniques = array();
-        $primary = array();
-        $indices = array();
+        $statements = $this->buildCreateTable($tableName, $def);
+        return $this->runSqlSet($statements);
+    }
 
-        $sql = "CREATE TABLE $name (\n";
+    /**
+     * Build a set of SQL statements to create a table with the given
+     * name and columns.
+     *
+     * @param string $name    Name of the table
+     * @param array  $def     Table definition array
+     *
+     * @return boolean success flag
+     */
+    public function buildCreateTable($name, $def)
+    {
+        $sql = array();
 
-        for ($i = 0; $i < count($columns); $i++) {
+        foreach ($def['fields'] as $col => $colDef) {
+            $this->appendColumnDef($sql, $col, $colDef);
+        }
 
-            $cd =& $columns[$i];
+        // Primary and unique keys are constraints, so go within
+        // the CREATE TABLE statement normally.
+        if (!empty($def['primary key'])) {
+            $this->appendPrimaryKeyDef($sql, $def['primary key']);
+        }
 
-            if ($i > 0) {
-                $sql .= ",\n";
-            }
-
-            $sql .= $this->_columnSql($cd);
-
-            switch ($cd->key) {
-            case 'UNI':
-                $uniques[] = $cd->name;
-                break;
-            case 'PRI':
-                $primary[] = $cd->name;
-                break;
-            case 'MUL':
-                $indices[] = $cd->name;
-                break;
+        if (!empty($def['unique keys'])) {
+            foreach ($def['unique keys'] as $col => $colDef) {
+                $this->appendUniqueKeyDef($sql, $col, $colDef);
             }
         }
 
-        if (count($primary) > 0) { // it really should be...
-            $sql .= ",\nconstraint primary key (" . implode(',', $primary) . ")";
+        // Multi-value indexes are advisory and for best portability
+        // should be created as separate statements.
+        $statements = array();
+        $statements[] = $this->startCreateTable($name, $def) . "\n" .
+                        implode($sql, ",\n") . "\n" .
+                        $this->endCreateTable($name, $def);
+        if (!empty($def['indexes'])) {
+            foreach ($def['indexes'] as $col => $colDef) {
+                $this->appendCreateIndex($statements, $table, $col, $colDef);
+            }
         }
 
-        foreach ($uniques as $u) {
-            $sql .= ",\nunique index {$name}_{$u}_idx ($u)";
-        }
+        return $statements;
+    }
 
-        foreach ($indices as $i) {
-            $sql .= ",\nindex {$name}_{$i}_idx ($i)";
-        }
+    /**
+     * Set up a 'create table' SQL statement.
+     *
+     * @param string $name table name
+     * @param array $def table definition
+     * @param $string
+     */
+    function startCreateTable($name, array $def)
+    {
+        return 'CREATE TABLE ' . $this->quoteIdentifier($name)  . ' (';
+    }
 
-        $sql .= "); ";
+    /**
+     * Close out a 'create table' SQL statement.
+     *
+     * @param string $name table name
+     * @param array $def table definition
+     * @return string
+     */
+    function endCreateTable($name, array $def)
+    {
+        return ')';
+    }
 
-        $res = $this->conn->query($sql);
+    /**
+     * Append an SQL fragment with a column definition in a CREATE TABLE statement.
+     *
+     * @param array $sql
+     * @param string $name
+     * @param array $def
+     */
+    function appendColumnDef(array &$sql, $name, array $def)
+    {
+        $sql[] = "$name " . $this->columnSql($def);
+    }
 
-        if (PEAR::isError($res)) {
-            throw new Exception($res->getMessage());
-        }
+    /**
+     * Append an SQL fragment with a constraint definition for a primary
+     * key in a CREATE TABLE statement.
+     *
+     * @param array $sql
+     * @param array $def
+     */
+    function appendPrimaryKeyDef(array &$sql, array $def)
+    {
+        $sql[] = "PRIMARY KEY " . $this->buildIndexList($def);
+    }
 
-        return true;
+    /**
+     * Append an SQL fragment with a constraint definition for a primary
+     * key in a CREATE TABLE statement.
+     *
+     * @param array $sql
+     * @param string $name
+     * @param array $def
+     */
+    function appendUniqueKeyDef(array &$sql, $name, array $def)
+    {
+        $sql[] = "UNIQUE $key " . $this->buildIndexList($def);
+    }
+
+    /**
+     * Append an SQL statement with an index definition for an advisory
+     * index over one or more columns on a table.
+     *
+     * @param array $statements
+     * @param string $table
+     * @param string $name
+     * @param array $def
+     */
+    function appendCreateIndex(array &$statements, $table, $name, array $def)
+    {
+        $statements[] = "CREATE INDEX $name ON $table " . $this->buildIndexList($def);
+    }
+
+    function buildIndexList(array $def)
+    {
+        // @fixme
+        return '(' . implode(',', array_map(array($this, 'quoteIdentifier'), $def)) . ')';
     }
 
     /**
@@ -339,21 +416,63 @@ class Schema
      * alter the table to match the column definitions.
      *
      * @param string $tableName name of the table
-     * @param array  $columns   array of ColumnDef
-     *                          objects for the table
+     * @param array  $def       Table definition array
      *
      * @return boolean success flag
      */
 
     public function ensureTable($tableName, $def)
     {
-        // XXX: DB engine portability -> toilet
+        $statements = $this->buildEnsureTable($tableName, $def);
+        return $this->runSqlSet($statements);
+    }
 
+    /**
+     * Run a given set of SQL commands on the connection in sequence.
+     * Empty input is ok.
+     *
+     * @fixme if multiple statements, wrap in a transaction?
+     * @param array $statements
+     * @return boolean success flag
+     */
+    function runSqlSet(array $statements)
+    {
+        $ok = true;
+        foreach ($statements as $sql) {
+            $res = $this->conn->query($sql);
+
+            if (PEAR::isError($res)) {
+                throw new Exception($res->getMessage());
+            }
+        }
+        return $ok;
+    }
+
+    /**
+     * Check a table's status, and if needed build a set
+     * of SQL statements which change it to be consistent
+     * with the given table definition.
+     *
+     * If the table does not yet exist, statements will
+     * be returned to create the table. If it does exist,
+     * statements will be returned to alter the table to
+     * match the column definitions.
+     *
+     * @param string $tableName name of the table
+     * @param array  $columns   array of ColumnDef
+     *                          objects for the table
+     *
+     * @return array of SQL statements
+     */
+
+    function buildEnsureTable($tableName, $def)
+    {
         try {
             $old = $this->getTableDef($tableName);
         } catch (Exception $e) {
+            // @fixme this is a terrible check :D
             if (preg_match('/no such table/', $e->getMessage())) {
-                return $this->createTable($tableName, $columns);
+                return $this->buildCreateTable($tableName, $def);
             } else {
                 throw $e;
             }
@@ -481,7 +600,7 @@ class Schema
 
     function quoteValue($val)
     {
-        return $this->conn->escape($val);
+        return $this->conn->escapeSimple($val); // ??
     }
 
     /**
@@ -554,11 +673,11 @@ class Schema
     function columnSql(array $cd)
     {
         $line = array();
-        $line[] = $this->typeAndSize();
+        $line[] = $this->typeAndSize($cd);
 
         if (isset($cd['default'])) {
             $line[] = 'default';
-            $line[] = $this->quoted($cd['default']);
+            $line[] = $this->quoteDefaultValue($cd);
         } else if (!empty($cd['not null'])) {
             // Can't have both not null AND default!
             $line[] = 'not null';
diff --git a/scripts/dumpschema.php b/scripts/dumpschema.php
index fd44399a9c..c0bf84f7c4 100644
--- a/scripts/dumpschema.php
+++ b/scripts/dumpschema.php
@@ -25,7 +25,7 @@ Attempt to pull a schema definition for a given table.
 
 END_OF_CHECKSCHEMA_HELP;
 
-$longoptions = array('diff', 'all');
+$longoptions = array('diff', 'all', 'build');
 require_once INSTALLDIR.'/scripts/commandline.inc';
 
 function indentOptions($indent)
@@ -104,6 +104,20 @@ function dumpTable($tableName, $live)
         $def = getCoreSchema($tableName);
     }
     prettyDumpArray($def, $tableName);
+}
+
+function dumpBuildTable($tableName)
+{
+    echo "-- \n";
+    echo "-- $tableName\n";
+    echo "-- \n";
+
+    $schema = Schema::get();
+    $def = getCoreSchema($tableName);
+    $sql = $schema->buildCreateTable($tableName, $def);
+    $sql[] = '';
+
+    echo implode(";\n", $sql);
     echo "\n";
 }
 
@@ -140,6 +154,8 @@ if (count($args)) {
             $detected = ob_get_clean();
 
             showDiff($defined, $detected);
+        } else if (have_option('build')) {
+            dumpBuildTable($tableName);
         } else {
             dumpTable($tableName, true);
         }

From 7723d15cd0a8dd0526c1ddf4b8b34a0891f04ff1 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Mon, 11 Oct 2010 19:14:33 -0700
Subject: [PATCH 239/655] tweak for mysql

---
 lib/mysqlschema.php | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/lib/mysqlschema.php b/lib/mysqlschema.php
index a2ca835d93..688bea3e2b 100644
--- a/lib/mysqlschema.php
+++ b/lib/mysqlschema.php
@@ -444,19 +444,15 @@ class MysqlSchema extends Schema
     function columnSql(array $cd)
     {
         $line = array();
-        $line[] = parent::_columnSql($cd);
+        $line[] = parent::columnSql($cd);
 
         if ($cd['type'] == 'serial') {
             $line[] = 'auto_increment';
         }
 
-        if (!empty($cd['extra'])) {
-            $line[] = $cd['extra']; // hisss boooo
-        }
-
         if (!empty($cd['description'])) {
             $line[] = 'comment';
-            $line[] = $this->quote($cd['description']);
+            $line[] = $this->quoteValue($cd['description']);
         }
 
         return implode(' ', $line);

From 9cb42c8e45b9adf33872a7c5b116795c768b3b49 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Mon, 11 Oct 2010 19:17:21 -0700
Subject: [PATCH 240/655] tweak for strings

---
 lib/schema.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/schema.php b/lib/schema.php
index 6c6a3e56f0..4eafb4df24 100644
--- a/lib/schema.php
+++ b/lib/schema.php
@@ -600,7 +600,11 @@ class Schema
 
     function quoteValue($val)
     {
-        return $this->conn->escapeSimple($val); // ??
+        if (is_int($val) || is_float($val) || is_double($val)) {
+            return strval($val);
+        } else {
+            return '"' . $this->conn->escapeSimple($val) . '"';
+        }
     }
 
     /**

From 2c9f877ab5b79f4a0734149f3769bfa0ddf4dd4d Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Mon, 11 Oct 2010 19:18:47 -0700
Subject: [PATCH 241/655] fix for index gen

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

diff --git a/lib/schema.php b/lib/schema.php
index 4eafb4df24..acc9412841 100644
--- a/lib/schema.php
+++ b/lib/schema.php
@@ -169,7 +169,7 @@ class Schema
                         $this->endCreateTable($name, $def);
         if (!empty($def['indexes'])) {
             foreach ($def['indexes'] as $col => $colDef) {
-                $this->appendCreateIndex($statements, $table, $col, $colDef);
+                $this->appendCreateIndex($statements, $name, $col, $colDef);
             }
         }
 

From 72cba8865065f5f11c9487615c161cecb16e7db6 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Mon, 11 Oct 2010 19:28:02 -0700
Subject: [PATCH 242/655] fix for column prefixes in table/index building

---
 db/core.php    |  2 +-
 lib/schema.php | 11 ++++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/db/core.php b/db/core.php
index 0ea0bc7614..f3461243fa 100644
--- a/db/core.php
+++ b/db/core.php
@@ -119,7 +119,7 @@ $schema['user'] = array(
     ),
     'primary key' => array('id'),
     'unique keys' => array(
-        'user_name_idx' => array('name'),
+        'user_nickname_idx' => array('nickname'),
         'user_email_idx' => array('email'),
         'user_incomingemail_idx' => array('incomingemail'),
         'user_sms_idx' => array('sms'),
diff --git a/lib/schema.php b/lib/schema.php
index acc9412841..f6543a21b1 100644
--- a/lib/schema.php
+++ b/lib/schema.php
@@ -254,7 +254,16 @@ class Schema
     function buildIndexList(array $def)
     {
         // @fixme
-        return '(' . implode(',', array_map(array($this, 'quoteIdentifier'), $def)) . ')';
+        return '(' . implode(',', array_map(array($this, 'buildIndexItem'), $def)) . ')';
+    }
+
+    function buildIndexItem($def)
+    {
+        if (is_array($def)) {
+            list($name, $size) = $def;
+            return $this->quoteIdentifier($name) . '(' . intval($size) . ')';
+        }
+        return $this->quoteIdentifier($def);
     }
 
     /**

From 621233e1ad6956cfb543042a1493a04b243e92ca Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Tue, 12 Oct 2010 17:58:26 -0700
Subject: [PATCH 243/655] some of the ensureTable stuff partially working

---
 lib/schema.php         | 93 +++++++++++++++++++++++++++++-------------
 scripts/dumpschema.php | 25 +++++++++++-
 2 files changed, 88 insertions(+), 30 deletions(-)

diff --git a/lib/schema.php b/lib/schema.php
index f6543a21b1..04bd2d1d94 100644
--- a/lib/schema.php
+++ b/lib/schema.php
@@ -234,7 +234,7 @@ class Schema
      */
     function appendUniqueKeyDef(array &$sql, $name, array $def)
     {
-        $sql[] = "UNIQUE $key " . $this->buildIndexList($def);
+        $sql[] = "UNIQUE $name " . $this->buildIndexList($def);
     }
 
     /**
@@ -487,59 +487,81 @@ class Schema
             }
         }
 
-        $cur = array_keys($old['fields']);
-        $new = array_keys($def['fields']);
-
-        $toadd  = array_diff($new, $cur);
-        $todrop = array_diff($cur, $new);
-        $same   = array_intersect($new, $cur);
-        $tomod  = array();
-
-        // Find which fields have actually changed definition
-        // in a way that we need to tweak them for this DB type.
-        foreach ($same as $name) {
-            $curCol = $old['fields'][$name];
-            $newCol = $cur['fields'][$name];
-
-            if (!$this->columnsEqual($curCol, $newCol)) {
-                $tomod[] = $name;
-            }
-        }
+        // @fixme check if not present
+        $fields = $this->diffArrays($old['fields'], $def['fields'], array($this, 'columnsEqual'));
+        $uniques = $this->diffArrays($old['unique keys'], $def['unique keys']);
+        $indexes = $this->diffArrays($old['indexes'], $def['indexes']);
 
+        /*
         if (count($toadd) + count($todrop) + count($tomod) == 0) {
             // nothing to do
             return true;
         }
+         */
 
         // For efficiency, we want this all in one
         // query, instead of using our methods.
 
         $phrase = array();
 
-        foreach ($toadd as $columnName) {
+        foreach ($uniques['del'] + $uniques['mod'] as $keyName) {
+            $this->appendAlterDropUnique($phrase, $keyName);
+        }
+
+        foreach ($fields['add'] as $columnName) {
             $this->appendAlterAddColumn($phrase, $columnName,
                     $def['fields'][$columnName]);
         }
 
-        foreach ($todrop as $columnName) {
+        foreach ($fields['mod'] as $columnName) {
             $this->appendAlterModifyColumn($phrase, $columnName,
                     $old['fields'][$columnName],
                     $def['fields'][$columnName]);
         }
 
-        foreach ($tomod as $columnName) {
+        foreach ($fields['del'] as $columnName) {
             $this->appendAlterDropColumn($phrase, $columnName);
         }
 
-        $sql = 'ALTER TABLE ' . $tableName . ' ' . implode(', ', $phrase);
-
-        $res = $this->conn->query($sql);
-
-        if (PEAR::isError($res)) {
-            throw new Exception($res->getMessage());
+        foreach ($uniques['mod'] + $uniques['add'] as $keyName) {
+            $this->appendAlterAddUnique($phrase, $keyName, $def['unique keys'][$keyName]);
         }
 
-        return true;
+        $sql = 'ALTER TABLE ' . $tableName . ' ' . implode(",\n", $phrase);
+
+        return array($sql);
+    }
+
+    function diffArrays($old, $new, $compareCallback=null)
+    {
+
+        $oldKeys = array_keys($old ? $old : array());
+        $newKeys = array_keys($new ? $new : array());
+
+        $toadd  = array_diff($newKeys, $oldKeys);
+        $todrop = array_diff($oldKeys, $newKeys);
+        $same   = array_intersect($newKeys, $oldKeys);
+        $tomod  = array();
+        $tokeep = array();
+
+        // Find which fields have actually changed definition
+        // in a way that we need to tweak them for this DB type.
+        foreach ($same as $name) {
+            if ($compareCallback) {
+                $same = call_user_func($compareCallback, $old[$name], $new[$name]);
+            } else {
+                $same = ($old[$name] != $new[$name]);
+            }
+            if ($same) {
+                $tokeep[] = $name;
+                continue;
+            }
+            $tomod[] = $name;
+        }
+        return array('add' => $toadd,
+                     'del' => $todrop,
+                     'mod' => $tomod,
+                     'keep' => $tokeep);
     }
 
     /**
@@ -587,6 +609,19 @@ class Schema
         $phrase[] = 'DROP COLUMN ' . $this->quoteIdentifier($columnName);
     }
 
+    function appendAlterAddUnique(array &$phrase, $keyName, array $def)
+    {
+        $sql = array();
+        $sql[] = 'ADD';
+        $this->appendUniqueKeyDef($sql, $keyName, $def);
+        $phrase[] = implode(' ', $sql);'ADD CONSTRAINT ' . $keyName;
+    }
+
+    function appendAlterDropUnique(array &$phrase, $keyName)
+    {
+        $phrase[] = 'DROP CONSTRAINT ' . $keyName;
+    }
+
     /**
      * Quote a db/table/column identifier if necessary.
      *
diff --git a/scripts/dumpschema.php b/scripts/dumpschema.php
index c0bf84f7c4..3c23636383 100644
--- a/scripts/dumpschema.php
+++ b/scripts/dumpschema.php
@@ -23,9 +23,15 @@ define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
 $helptext = <<<END_OF_CHECKSCHEMA_HELP
 Attempt to pull a schema definition for a given table.
 
+  --all     run over all defined core tables
+  --diff    do a raw text diff between the expected and live table defs
+  --update  dump SQL that would be run to update or create this table
+  --build   dump SQL that would be run to create this table fresh
+
+
 END_OF_CHECKSCHEMA_HELP;
 
-$longoptions = array('diff', 'all', 'build');
+$longoptions = array('diff', 'all', 'build', 'update');
 require_once INSTALLDIR.'/scripts/commandline.inc';
 
 function indentOptions($indent)
@@ -121,6 +127,21 @@ function dumpBuildTable($tableName)
     echo "\n";
 }
 
+function dumpEnsureTable($tableName)
+{
+    echo "-- \n";
+    echo "-- $tableName\n";
+    echo "-- \n";
+
+    $schema = Schema::get();
+    $def = getCoreSchema($tableName);
+    $sql = $schema->buildEnsureTable($tableName, $def);
+    $sql[] = '';
+
+    echo implode(";\n", $sql);
+    echo "\n";
+}
+
 function showDiff($a, $b)
 {
     $fnameA = tempnam(sys_get_temp_dir(), 'defined-diff-a');
@@ -156,6 +177,8 @@ if (count($args)) {
             showDiff($defined, $detected);
         } else if (have_option('build')) {
             dumpBuildTable($tableName);
+        } else if (have_option('update')) {
+            dumpEnsureTable($tableName);
         } else {
             dumpTable($tableName, true);
         }

From f79dbaf9a76c10969dbc45fd43a0bb26f5f64ed4 Mon Sep 17 00:00:00 2001
From: Craig Andrews <candrews@integralblue.com>
Date: Tue, 12 Oct 2010 23:36:33 -0400
Subject: [PATCH 244/655] Add a doc page that links to the StatusNet wiki API
 page Add a redirect action that merely redirects to another action Redirect
 /api to /doc/api so users don't get the "lame" "No such user" error message

---
 actions/redirect.php | 71 ++++++++++++++++++++++++++++++++++++++++++++
 doc-src/api          |  6 ++++
 doc-src/help         |  1 +
 lib/router.php       |  5 ++++
 4 files changed, 83 insertions(+)
 create mode 100644 actions/redirect.php
 create mode 100644 doc-src/api

diff --git a/actions/redirect.php b/actions/redirect.php
new file mode 100644
index 0000000000..9cb03708db
--- /dev/null
+++ b/actions/redirect.php
@@ -0,0 +1,71 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Site access administration panel
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category Action
+ * @package   StatusNet
+ * @author    Craig Andrews <candrews@integralblue.com>
+ * @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')) {
+    exit(1);
+}
+
+/**
+ * Administer site access settings
+ *
+ * @category Action
+ * @package  StatusNet
+ * @author   Craig Andrews <candrews@integralblue.com>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://status.net/
+ */
+
+class RedirectAction extends Action
+{
+    /**
+     * These pages are read-only.
+     *
+     * @param array $args unused.
+     *
+     * @return boolean read-only flag (false)
+     */
+
+    function isReadOnly($args)
+    {
+        return true;
+    }
+
+    /**
+     * Handle a request
+     *
+     * @param array $args array of arguments
+     *
+     * @return nothing
+     */
+    function handle($args)
+    {
+        common_redirect(common_local_url($this->arg('nextAction'), $this->arg('args')));
+    }
+}
+
diff --git a/doc-src/api b/doc-src/api
new file mode 100644
index 0000000000..5c8815bddd
--- /dev/null
+++ b/doc-src/api
@@ -0,0 +1,6 @@
+<!-- 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%% provides an API that applications can use to interact with it.
+More information about this API can be found on the [StatusNet Wiki](http://status.net/wiki/API).
diff --git a/doc-src/help b/doc-src/help
index 024d473780..6d12b4cd76 100644
--- a/doc-src/help
+++ b/doc-src/help
@@ -35,3 +35,4 @@ Here are some documents that you might find helpful in understanding
 * [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
diff --git a/lib/router.php b/lib/router.php
index eebe2beea6..54d3d0f68b 100644
--- a/lib/router.php
+++ b/lib/router.php
@@ -322,6 +322,11 @@ class Router
 
             // statuses API
 
+            $m->connect('api',
+                        array('action' => 'Redirect',
+                              'nextAction' => 'doc',
+                              'args' => array('title' => 'api')));
+
             $m->connect('api/statuses/public_timeline.:format',
                         array('action' => 'ApiTimelinePublic',
                               'format' => '(xml|json|rss|atom)'));

From 229c7726344714187dad2641879cb9c4211cc85d Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Wed, 13 Oct 2010 16:04:28 -0700
Subject: [PATCH 245/655] Filter table definitions to scrub out unsupported
 features before trying to alter a table. This lets us skip those where we end
 up trying to change unsupported features.

---
 lib/mysqlschema.php    | 16 ++++++++++++++++
 lib/pgsqlschema.php    | 25 +++++++++++++++++++++++++
 lib/schema.php         | 28 +++++++++++++++++++++++-----
 scripts/dumpschema.php | 16 +++++++++-------
 4 files changed, 73 insertions(+), 12 deletions(-)

diff --git a/lib/mysqlschema.php b/lib/mysqlschema.php
index 688bea3e2b..eeabae8cd3 100644
--- a/lib/mysqlschema.php
+++ b/lib/mysqlschema.php
@@ -523,4 +523,20 @@ class MysqlSchema extends Schema
             return parent::typeAndSize($column);
         }
     }
+
+    /**
+     * Filter the given table definition array to match features available
+     * in this database.
+     *
+     * This lets us strip out unsupported things like comments, foreign keys,
+     * or type variants that we wouldn't get back from getTableDef().
+     *
+     * @param array $tableDef
+     */
+    function filterDef(array $tableDef)
+    {
+        // @fixme add foreign-key support for MySQL
+        unset($tableDef['foreign keys']);
+        return $tableDef;
+    }
 }
diff --git a/lib/pgsqlschema.php b/lib/pgsqlschema.php
index a8ce21b384..e8711a6f85 100644
--- a/lib/pgsqlschema.php
+++ b/lib/pgsqlschema.php
@@ -406,4 +406,29 @@ class PgsqlSchema extends Schema
         }
     }
 
+    /**
+     * Filter the given table definition array to match features available
+     * in this database.
+     *
+     * This lets us strip out unsupported things like comments, foreign keys,
+     * or type variants that we wouldn't get back from getTableDef().
+     *
+     * @param array $tableDef
+     */
+    function filterDef(array $tableDef)
+    {
+        foreach (array_keys($tableDef['fields']) as $name => &$col) {
+            // No convenient support for field descriptions
+            unset($col['description']);
+
+            if (isset($col['size'])) {
+                // Don't distinguish between tinyint and int.
+                if ($col['size'] == 'tiny' && $col['type'] == 'int') {
+                    unset($col['size']);
+                }
+            }
+        }
+        return $tableDef;
+    }
+
 }
diff --git a/lib/schema.php b/lib/schema.php
index 04bd2d1d94..da43c0559a 100644
--- a/lib/schema.php
+++ b/lib/schema.php
@@ -143,6 +143,7 @@ class Schema
      */
     public function buildCreateTable($name, $def)
     {
+        $def = $this->filterDef($def);
         $sql = array();
 
         foreach ($def['fields'] as $col => $colDef) {
@@ -487,17 +488,19 @@ class Schema
             }
         }
 
+        $old = $this->filterDef($old);
+        $def = $this->filterDef($def);
+
         // @fixme check if not present
         $fields = $this->diffArrays($old['fields'], $def['fields'], array($this, 'columnsEqual'));
         $uniques = $this->diffArrays($old['unique keys'], $def['unique keys']);
         $indexes = $this->diffArrays($old['indexes'], $def['indexes']);
 
-        /*
-        if (count($toadd) + count($todrop) + count($tomod) == 0) {
+        $total = $fields['count'] + $uniques['count'] + $indexes['count'];
+        if ($total == 0) {
             // nothing to do
-            return true;
+            return array();
         }
-         */
 
         // For efficiency, we want this all in one
         // query, instead of using our methods.
@@ -561,7 +564,8 @@ class Schema
         return array('add' => $toadd,
                      'del' => $todrop,
                      'mod' => $tomod,
-                     'keep' => $tokeep);
+                     'keep' => $tokeep,
+                     'count' => count($toadd) + count($todrop) + count($tomod));
     }
 
     /**
@@ -847,6 +851,20 @@ class Schema
         return $table;
     }
 
+    /**
+     * Filter the given table definition array to match features available
+     * in this database.
+     *
+     * This lets us strip out unsupported things like comments, foreign keys,
+     * or type variants that we wouldn't get back from getTableDef().
+     *
+     * @param array $tableDef
+     */
+    function filterDef(array $tableDef)
+    {
+        return $tableDef;
+    }
+
     function isNumericType($type)
     {
         $type = strtolower($type);
diff --git a/scripts/dumpschema.php b/scripts/dumpschema.php
index 3c23636383..fcf2430d80 100644
--- a/scripts/dumpschema.php
+++ b/scripts/dumpschema.php
@@ -129,17 +129,19 @@ function dumpBuildTable($tableName)
 
 function dumpEnsureTable($tableName)
 {
-    echo "-- \n";
-    echo "-- $tableName\n";
-    echo "-- \n";
-
     $schema = Schema::get();
     $def = getCoreSchema($tableName);
     $sql = $schema->buildEnsureTable($tableName, $def);
-    $sql[] = '';
 
-    echo implode(";\n", $sql);
-    echo "\n";
+    if ($sql) {
+        echo "-- \n";
+        echo "-- $tableName\n";
+        echo "-- \n";
+
+        $sql[] = '';
+        echo implode(";\n", $sql);
+        echo "\n";
+    }
 }
 
 function showDiff($a, $b)

From c0bb3062f63638601a9855df93cdaef963ef628e Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Wed, 13 Oct 2010 16:11:02 -0700
Subject: [PATCH 246/655] suppress notices for non-present sections

---
 lib/schema.php | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/lib/schema.php b/lib/schema.php
index da43c0559a..f42226bad3 100644
--- a/lib/schema.php
+++ b/lib/schema.php
@@ -492,9 +492,9 @@ class Schema
         $def = $this->filterDef($def);
 
         // @fixme check if not present
-        $fields = $this->diffArrays($old['fields'], $def['fields'], array($this, 'columnsEqual'));
-        $uniques = $this->diffArrays($old['unique keys'], $def['unique keys']);
-        $indexes = $this->diffArrays($old['indexes'], $def['indexes']);
+        $fields = $this->diffArrays($old, $def, 'fields', array($this, 'columnsEqual'));
+        $uniques = $this->diffArrays($old, $def, 'unique keys');
+        $indexes = $this->diffArrays($old, $def, 'indexes');
 
         $total = $fields['count'] + $uniques['count'] + $indexes['count'];
         if ($total == 0) {
@@ -535,11 +535,13 @@ class Schema
         return array($sql);
     }
 
-    function diffArrays($old, $new, $compareCallback=null)
+    function diffArrays($oldDef, $newDef, $section, $compareCallback=null)
     {
+        $old = isset($oldDef[$section]) ? $oldDef[$section] : array();
+        $new = isset($newDef[$section]) ? $newDef[$section] : array();
 
-        $oldKeys = array_keys($old ? $old : array());
-        $newKeys = array_keys($new ? $new : array());
+        $oldKeys = array_keys($old);
+        $newKeys = array_keys($new);
 
         $toadd  = array_diff($newKeys, $oldKeys);
         $todrop = array_diff($oldKeys, $newKeys);

From 0de3661d57c3e41212df1e95b76ddde596647a83 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Wed, 13 Oct 2010 16:21:24 -0700
Subject: [PATCH 247/655] Fix for PG filtering

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

diff --git a/lib/pgsqlschema.php b/lib/pgsqlschema.php
index e8711a6f85..4fde80b55a 100644
--- a/lib/pgsqlschema.php
+++ b/lib/pgsqlschema.php
@@ -417,7 +417,7 @@ class PgsqlSchema extends Schema
      */
     function filterDef(array $tableDef)
     {
-        foreach (array_keys($tableDef['fields']) as $name => &$col) {
+        foreach ($tableDef['fields'] as $name => &$col) {
             // No convenient support for field descriptions
             unset($col['description']);
 

From 4f4b0a26128ebee13439ea1ce5f0063b502e301e Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Wed, 13 Oct 2010 16:56:49 -0700
Subject: [PATCH 248/655] logic fix in diffing :D

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

diff --git a/lib/schema.php b/lib/schema.php
index f42226bad3..2793906a46 100644
--- a/lib/schema.php
+++ b/lib/schema.php
@@ -555,7 +555,7 @@ class Schema
             if ($compareCallback) {
                 $same = call_user_func($compareCallback, $old[$name], $new[$name]);
             } else {
-                $same = ($old[$name] != $new[$name]);
+                $same = ($old[$name] == $new[$name]);
             }
             if ($same) {
                 $tokeep[] = $name;

From a421dd934aeb4a1064608bdeca44b5b5986e7358 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Wed, 13 Oct 2010 16:58:28 -0700
Subject: [PATCH 249/655] Nicer diff display for schema dump

---
 scripts/dumpschema.php | 82 ++++++++++++++++++++++++++++++------------
 1 file changed, 60 insertions(+), 22 deletions(-)

diff --git a/scripts/dumpschema.php b/scripts/dumpschema.php
index fcf2430d80..cab02d910e 100644
--- a/scripts/dumpschema.php
+++ b/scripts/dumpschema.php
@@ -24,14 +24,15 @@ $helptext = <<<END_OF_CHECKSCHEMA_HELP
 Attempt to pull a schema definition for a given table.
 
   --all     run over all defined core tables
-  --diff    do a raw text diff between the expected and live table defs
+  --diff    show differences between the expected and live table defs
+  --raw     skip compatibility filtering for diffs
   --update  dump SQL that would be run to update or create this table
   --build   dump SQL that would be run to create this table fresh
 
 
 END_OF_CHECKSCHEMA_HELP;
 
-$longoptions = array('diff', 'all', 'build', 'update');
+$longoptions = array('diff', 'all', 'build', 'update', 'raw');
 require_once INSTALLDIR.'/scripts/commandline.inc';
 
 function indentOptions($indent)
@@ -110,6 +111,7 @@ function dumpTable($tableName, $live)
         $def = getCoreSchema($tableName);
     }
     prettyDumpArray($def, $tableName);
+    print "\n";
 }
 
 function dumpBuildTable($tableName)
@@ -144,21 +146,65 @@ function dumpEnsureTable($tableName)
     }
 }
 
-function showDiff($a, $b)
+function dumpDiff($tableName, $filter)
 {
-    $fnameA = tempnam(sys_get_temp_dir(), 'defined-diff-a');
-    file_put_contents($fnameA, $a);
+    $schema = Schema::get();
+    $def = getCoreSchema($tableName);
+    try {
+        $old = $schema->getTableDef($tableName);
+    } catch (Exception $e) {
+        // @fixme this is a terrible check :D
+        if (preg_match('/no such table/', $e->getMessage())) {
+            return dumpTable($tableName, false);
+        } else {
+            throw $e;
+        }
+    }
 
-    $fnameB = tempnam(sys_get_temp_dir(), 'detected-diff-b');
-    file_put_contents($fnameB, $b);
+    if ($filter) {
+        $old = $schema->filterDef($old);
+        $def = $schema->filterDef($def);
+    }
 
-    $cmd = sprintf('diff -U 100 %s %s',
-            escapeshellarg($fnameA),
-            escapeshellarg($fnameB));
-    passthru($cmd);
+    // @hack
+    $old = tweakPrimaryKey($old);
+    $def = tweakPrimaryKey($def);
 
-    unlink($fnameA);
-    unlink($fnameB);
+    $sections = array_unique(array_merge(array_keys($old), array_keys($def)));
+    $final = array();
+    foreach ($sections as $section) {
+        if ($section == 'fields') {
+            // this shouldn't be needed maybe... wait what?
+        }
+        $diff = $schema->diffArrays($old, $def, $section, $compare);
+        $chunks = array('del', 'mod', 'add');
+        foreach ($chunks as $chunk) {
+            if ($diff[$chunk]) {
+                foreach ($diff[$chunk] as $key) {
+                    if ($chunk == 'del') {
+                        $final[$section]["DEL $key"] = $old[$section][$key];
+                    } else if ($chunk == 'add') {
+                        $final[$section]["ADD $key"] = $def[$section][$key];
+                    } else if ($chunk == 'mod') {
+                        $final[$section]["OLD $key"] = $old[$section][$key];
+                        $final[$section]["NEW $key"] = $def[$section][$key];
+                    }
+                }
+            }
+        }
+    }
+
+    prettyDumpArray($final, $tableName);
+    print "\n";
+}
+
+function tweakPrimaryKey($def)
+{
+    if (isset($def['primary key'])) {
+        $def['primary keys'] = array('primary key' => $def['primary key']);
+        unset($def['primary key']);
+    }
+    return $def;
 }
 
 if (have_option('all')) {
@@ -168,15 +214,7 @@ if (have_option('all')) {
 if (count($args)) {
     foreach ($args as $tableName) {
         if (have_option('diff')) {
-            ob_start();
-            dumpTable($tableName, false);
-            $defined = ob_get_clean();
-
-            ob_start();
-            dumpTable($tableName, true);
-            $detected = ob_get_clean();
-
-            showDiff($defined, $detected);
+            dumpDiff($tableName, !have_option('raw'));
         } else if (have_option('build')) {
             dumpBuildTable($tableName);
         } else if (have_option('update')) {

From d84923470fd06cfde60e887c7e2f649e015dd6bb Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Wed, 13 Oct 2010 17:35:18 -0700
Subject: [PATCH 250/655] fix bug with --diff on missing table

---
 scripts/dumpschema.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/dumpschema.php b/scripts/dumpschema.php
index cab02d910e..b8d034d2a6 100644
--- a/scripts/dumpschema.php
+++ b/scripts/dumpschema.php
@@ -154,7 +154,7 @@ function dumpDiff($tableName, $filter)
         $old = $schema->getTableDef($tableName);
     } catch (Exception $e) {
         // @fixme this is a terrible check :D
-        if (preg_match('/no such table/', $e->getMessage())) {
+        if (preg_match('/no such table/i', $e->getMessage())) {
             return dumpTable($tableName, false);
         } else {
             throw $e;

From 71ed82ed9656618873dde4e41314de29158e5fe9 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Wed, 13 Oct 2010 17:35:39 -0700
Subject: [PATCH 251/655] Cleanup unique & foreign key defs

---
 db/core.php | 165 ++++++++++++++++++++++++++--------------------------
 1 file changed, 83 insertions(+), 82 deletions(-)

diff --git a/db/core.php b/db/core.php
index f3461243fa..c0def7ce5a 100644
--- a/db/core.php
+++ b/db/core.php
@@ -61,10 +61,10 @@ $schema['avatar'] = array(
     ),
     'primary key' => array('profile_id', 'width', 'height'),
     'unique keys' => array(
-        'avatar_url_idx' => array('url'),
+        'avatar_url_key' => array('url'),
     ),
     'foreign keys' => array(
-        'profile_id' => array('profile' => 'id'),
+        'avatar_profile_id_fkey' => array('profile', array('profile_id' => 'id')),
     ),
     'indexes' => array(
         'avatar_profile_id_idx' => array('profile_id'),
@@ -81,7 +81,7 @@ $schema['sms_carrier'] = array(
     ),
     'primary key' => array('id'),
     'unique keys' => array(
-        'sms_carrier_name_idx' => array('name'),
+        'sms_carrier_name_key' => array('name'),
     ),
 );
 
@@ -119,16 +119,16 @@ $schema['user'] = array(
     ),
     'primary key' => array('id'),
     'unique keys' => array(
-        'user_nickname_idx' => array('nickname'),
-        'user_email_idx' => array('email'),
-        'user_incomingemail_idx' => array('incomingemail'),
-        'user_sms_idx' => array('sms'),
-        'user_uri_idx' => array('uri'),
+        'user_nickname_key' => array('nickname'),
+        'user_email_key' => array('email'),
+        'user_incomingemail_key' => array('incomingemail'),
+        'user_sms_key' => array('sms'),
+        'user_uri_key' => array('uri'),
     ),
     'foreign keys' => array(
-        'id' => array('profile' => 'id'),
-        'carrier' => array('sms_carrier' => 'id'),
-        'design_id' => array('desgin' => 'id'),
+        'user_id_fkey' => array('profile', array('id' => 'id')),
+        'user_carrier_fkey' => array('sms_carrier', array('carrier' => 'id')),
+        'user_design_id_fkey' => array('design', array('design_id' => 'id')),
     ),
     'indexes' => array(
         'user_smsemail_idx' => array('smsemail'),
@@ -147,10 +147,10 @@ $schema['remote_profile'] = array(
     ),
     'primary key' => array('id'),
     'unique keys' => array(
-        'remote_profile_uri_idx' => array('uri'),
+        'remote_profile_uri_key' => array('uri'),
     ),
     'foreign keys' => array(
-        'id' => array('profile' => 'id'),
+        'remote_profile_id_fkey' => array('profile', array('id' => 'id')),
     ),
 );
 
@@ -195,13 +195,13 @@ $schema['notice'] = array(
     ),
     'primary key' => array('id'),
     'unique keys' => array(
-        'notice_uri_idx' => array('uri'),
+        'notice_uri_key' => array('uri'),
     ),
     'foreign keys' => array(
-        'profile_id' => array('profile' => 'id'),
-        'reply_to' => array('notice', 'id'),
-        'conversation' => array('conversation', 'id'), # note... used to refer to notice.id
-        'repeat_of' => array('notice', 'id'), # @fixme: what about repeats of deleted notices?
+        'notice_profile_id_fkey' => array('profile', array('profile_id' => 'id')),
+        'notice_reply_to_fkey' => array('notice', array('reply_to' => 'id')),
+        'notice_conversation_fkey' => array('conversation', array('conversation' => 'id')), # note... used to refer to notice.id
+        'notice_repeat_of_fkey' => array('notice', array('repeat_of' => 'id')), # @fixme: what about repeats of deleted notices?
     ),
     'indexes' => array(
         'notice_profile_id_idx' => array('profile_id', 'created', 'id'),
@@ -235,8 +235,8 @@ $schema['reply'] = array(
     ),
     'primary key' => array('notice_id', 'profile_id'),
     'foreign keys' => array(
-        'notice_id' => array('notice' => 'id'),
-        'profile_id' => array('profile' => 'id'),
+        'reply_notice_id_fkey' => array('notice', array('notice_id' => 'id')),
+        'reply_profile_id_fkey' => array('profile', array('profile_id' => 'id')),
     ),
     'indexes' => array(
         'reply_notice_id_idx' => array('notice_id'),
@@ -253,8 +253,8 @@ $schema['fave'] = array(
     ),
     'primary key' => array('notice_id', 'user_id'),
     'foreign keys' => array(
-        'notice_id' => array('notice', 'id'),
-        'user_id' => array('profile', 'id'), // note: formerly referenced notice.id, but we can now record remote users' favorites
+        'fave_notice_id_fkey' => array('notice', array('notice_id' => 'id')),
+        'fave_user_id_fkey' => array('profile', array('user_id' => 'id')), // note: formerly referenced notice.id, but we can now record remote users' favorites
     ),
     'indexes' => array(
         'fave_notice_id_idx' => array('notice_id'),
@@ -294,7 +294,7 @@ $schema['token'] = array(
     ),
     'primary key' => array('consumer_key', 'tok'),
     'foreign keys' => array(
-        'consumer_key' => array('consumer' => 'consumer_key'),
+        'token_consumer_key_fkey' => array('consumer', array('consumer_key'=> 'consumer_key')),
     ),
 );
 
@@ -332,11 +332,11 @@ $schema['oauth_application'] = array(
     ),
     'primary key' => array('id'),
     'unique keys' => array(
-        'oauth_application_name_idx' => array('name'), // in the long run, we should perhaps not force these unique, and use another source id
+        'oauth_application_name_key' => array('name'), // in the long run, we should perhaps not force these unique, and use another source id
     ),
     'foreign keys' => array(
-        'owner' => array('profile' => 'id'), // Are remote users allowed to create oauth application records?
-        'consumer_key' => array('consumer' => 'consumer_key'),
+        'oauth_application_owner_fkey' => array('profile', array('owner' => 'id')), // Are remote users allowed to create oauth application records?
+        'oauth_application_consumer_key_fkey' => array('consumer', array('consumer_key' => 'consumer_key')),
     ),
 );
 
@@ -351,8 +351,8 @@ $schema['oauth_application_user'] = array(
     ),
     'primary key' => array('profile_id', 'application_id'),
     'foreign keys' => array(
-        'profile_id' => array('profile' => 'id'),
-        'application_id' => array('oauth_application' => 'id'),
+        'oauth_application_user_profile_id_fkey' => array('profile', array('profile_id' => 'id')),
+        'oauth_application_user_application_id_fkey' => array('oauth_application', array('application_id' => 'id')),
     ),
 );
 
@@ -377,7 +377,7 @@ $schema['oid_nonces'] = array(
         'salt' => array('type' => 'char', 'length' => 40),
     ),
     'unique keys' => array(
-        'oid_nonces_server_url_type_idx' => array(array('server_url', 255), 'timestamp', 'salt'),
+        'oid_nonces_server_url_timestamp_salt_key' => array(array('server_url', 255), 'timestamp', 'salt'),
     ),
 );
 
@@ -394,7 +394,7 @@ $schema['confirm_address'] = array(
     ),
     'primary key' => array('code'),
     'foreign keys' => array(
-        'user_id' => array('user' => 'id'),
+        'confirm_address_user_id_fkey' => array('user', array('user_id' => 'id')),
     ),
 );
 
@@ -406,7 +406,7 @@ $schema['remember_me'] = array(
     ),
     'primary key' => array('code'),
     'foreign keys' => array(
-        'user_id' => array('user' => 'id'),
+        'remember_me_user_id_fkey' => array('user', array('user_id' => 'id')),
     ),
 );
 
@@ -433,7 +433,7 @@ $schema['notice_tag'] = array(
     ),
     'primary key' => array('tag', 'notice_id'),
     'foreign keys' => array(
-        'notice_id' => array('notice' => 'id'),
+        'notice_tag_notice_id_fkey' => array('notice', array('notice_id' => 'id')),
     ),
     'indexes' => array(
         'notice_tag_created_idx' => array('created'),
@@ -453,7 +453,7 @@ $schema['foreign_service'] = array(
     ),
     'primary key' => array('id'),
     'unique keys' => array(
-        'foreign_service_name_idx' => array('name'),
+        'foreign_service_name_key' => array('name'),
     ),
 );
 
@@ -468,10 +468,11 @@ $schema['foreign_user'] = array(
     ),
     'primary key' => array('id', 'service'),
     'foreign keys' => array(
-        'service' => array('foreign_service' => 'id'),
+        'foreign_user_service_fkey' => array('foreign_service', array('service' => 'id')),
     ),
     'unique keys' => array(
-        'foreign_user_uri_idx' => array('uri'),
+        'foreign_user_id_key' => array('id'),
+        'foreign_user_uri_key' => array('uri'),
     ),
 );
 
@@ -491,9 +492,9 @@ $schema['foreign_link'] = array(
     ),
     'primary key' => array('user_id', 'foreign_id', 'service'),
     'foreign keys' => array(
-        'user_id' => array('user' => 'id'),
-        'foreign_id' => array('foreign_user' => 'id'),
-        'service' => array('foreign_service' => 'id'),
+        'foreign_link_user_id_fkey' => array('user', array('user_id' => 'id')),
+        'foreign_link_foreign_id_fkey' => array('foreign_user', array('foreign_id' => 'id')),
+        'foreign_link_service_fkey' => array('foreign_service', array('service' => 'id')),
     ),
     'indexes' => array(
         'foreign_user_user_id_idx' => array('user_id'),
@@ -509,9 +510,9 @@ $schema['foreign_subscription'] = array(
     ),
     'primary key' => array('service', 'subscriber', 'subscribed'),
     'foreign keys' => array(
-        'service' => array('foreign_service' => 'id'),
-        'subscriber' => array('foreign_user' => 'id'),
-        'subscribed' => array('foreign_user' => 'id'),
+        'foreign_subscription_service_fkey' => array('foreign_service', array('service' => 'id')),
+        'foreign_subscription_subscriber_fkey' => array('foreign_user', array('subscriber' => 'id')),
+        'foreign_subscription_subscribed_fkey' => array('foreign_user', array('subscribed' => 'id')),
     ),
     'indexes' => array(
         'foreign_subscription_subscriber_idx' => array('subscriber'),
@@ -529,7 +530,7 @@ $schema['invitation'] = array(
     ),
     'primary key' => array('code'),
     'foreign keys' => array(
-        'user_id' => array('user' => 'id'),
+        'invitation_user_id_fkey' => array('user', array('user_id' => 'id')),
     ),
     'indexes' => array(
         'invitation_address_idx' => array('address', 'address_type'),
@@ -551,12 +552,12 @@ $schema['message'] = array(
         'source' => array('type' => 'varchar', 'length' => 32, 'description' => 'source of comment, like "web", "im", or "clientname"'),
     ),
     'primary key' => array('id'),
-    'unique key' => array(
-        'message_uri_idx' => array('uri'),
+    'unique keys' => array(
+        'message_uri_key' => array('uri'),
     ),
     'foreign keys' => array(
-        'from_profile' => array('profile' => 'id'),
-        'to_profile' => array('profile' => 'id'),
+        'message_from_profile_fkey' => array('profile', array('from_profile' => 'id')),
+        'message_to_profile_fkey' => array('profile', array('to_profile' => 'id')),
     ),
     'indexes' => array(
         // @fixme these are really terrible indexes, since you can only sort on one of them at a time.
@@ -577,8 +578,8 @@ $schema['notice_inbox'] = array(
     ),
     'primary key' => array('user_id', 'notice_id'),
     'foreign keys' => array(
-        'user_id' => array('user' => 'id'),
-        'notice_id' => array('notice' => 'id'),
+        'notice_inbox_user_id_fkey' => array('user', array('user_id' => 'id')),
+        'notice_inbox_notice_id_fkey' => array('notice', array('notice_id' => 'id')),
     ),
     'indexes' => array(
         'notice_inbox_notice_id_idx' => array('notice_id'),
@@ -594,8 +595,8 @@ $schema['profile_tag'] = array(
     ),
     'primary key' => array('tagger', 'tagged', 'tag'),
     'foreign keys' => array(
-        'tagger' => array('user' => 'id'),
-        'tagged' => array('profile' => 'id'),
+        'profile_tag_tagger_fkey' => array('user', array('tagger' => 'id')),
+        'profile_tag_tagged_fkey' => array('profile', array('tagged' => 'id')),
     ),
     'indexes' => array(
         'profile_tag_modified_idx' => array('modified'),
@@ -611,8 +612,8 @@ $schema['profile_block'] = array(
         'modified' => array('type' => 'timestamp', 'description' => 'date of blocking'),
     ),
     'foreign keys' => array(
-        'blocker' => array('user' => 'id'),
-        'blocked' => array('profile' => 'id'),
+        'profile_block_blocker_fkey' => array('user', array('blocker' => 'id')),
+        'profile_block_blocked_fkey' => array('profile', array('blocked' => 'id')),
     ),
     'primary key' => array('blocker', 'blocked'),
 );
@@ -640,11 +641,11 @@ $schema['user_group'] = array(
         'mainpage' => array('type' => 'varchar', 'length' => 255, 'description' => 'page for group info to link to'),
     ),
     'primary key' => array('id'),
-    'unique key' => array(
-        'user_uri_idx' => array('uri'),
+    'unique keys' => array(
+        'user_uri_key' => array('uri'),
     ),
     'foreign keys' => array(
-        'design_id' => array('design' => 'id'),
+        'user_group_design_id_fkey' => array('design', array('design_id' => 'id')),
     ),
     'indexes' => array(
         'user_group_nickname_idx' => array('nickname'),
@@ -662,8 +663,8 @@ $schema['group_member'] = array(
     ),
     'primary key' => array('group_id', 'profile_id'),
     'foreign keys' => array(
-        'group_id' => array('user_group' => 'id'),
-        'profile_id' => array('profile' => 'id'),
+        'group_member_group_id_fkey' => array('user_group', array('group_id' => 'id')),
+        'group_member_profile_id_fkey' => array('profile', array('profile_id' => 'id')),
     ),
     'indexes' => array(
         // @fixme probably we want a (profile_id, created) index here?
@@ -682,8 +683,8 @@ $schema['related_group'] = array(
     ),
     'primary key' => array('group_id', 'related_group_id'),
     'foreign keys' => array(
-        'group_id' => array('user_group' => 'id'),
-        'related_group_id' => array('user_group' => 'id'),
+        'related_group_group_id_fkey' => array('user_group', array('group_id' => 'id')),
+        'related_group_related_group_id_fkey' => array('user_group', array('related_group_id' => 'id')),
     ),
 );
 
@@ -696,8 +697,8 @@ $schema['group_inbox'] = array(
     ),
     'primary key' => array('group_id', 'notice_id'),
     'foreign keys' => array(
-        'group_id' => array('user_group' => 'id'),
-        'notice_id' => array('notice' => 'id'),
+        'group_inbox_group_id_fkey' => array('user_group', array('group_id' => 'id')),
+        'group_inbox_notice_id_fkey' => array('notice', array('notice_id' => 'id')),
     ),
     'indexes' => array(
         'group_inbox_created_idx' => array('created'),
@@ -720,7 +721,7 @@ $schema['file'] = array(
     ),
     'primary key' => array('id'),
     'unique keys' => array(
-        'file_url_idx' => array('url'),
+        'file_url_key' => array('url'),
     ),
 );
 
@@ -743,7 +744,7 @@ $schema['file_oembed'] = array(
     ),
     'primary key' => array('file_id'),
     'foreign keys' => array(
-         'file_id' => array('file' => 'id'),
+         'file_oembed_file_id_fkey' => array('file', array('file_id' => 'id')),
     ),
 );
 
@@ -757,7 +758,7 @@ $schema['file_redirection'] = array(
     ),
     'primary key' => array('url'),
     'foreign keys' => array(
-         'file_id' => array('file' => 'id'),
+         'file_redirection_file_id_fkey' => array('file' => array('file_id' => 'id')),
     ),
 );
 
@@ -771,10 +772,10 @@ $schema['file_thumbnail'] = array(
     ),
     'primary key' => array('file_id'),
     'foreign keys' => array(
-        'file_id' => array('file' => 'id'),
+        'file_thumbnail_file_id_fkey' => array('file', array('file_id' => 'id')),
     ),
     'unique keys' => array(
-        'file_thumbnail_url_idx' => array('url'),
+        'file_thumbnail_url_key' => array('url'),
     ),
 );
 
@@ -786,8 +787,8 @@ $schema['file_to_post'] = array(
     ),
     'primary key' => array('file_id', 'post_id'),
     'foreign keys' => array(
-        'file_id' => array('file' => 'id'),
-        'post_id' => array('notice' => 'id'),
+        'file_to_post_file_id_fkey' => array('file', array('file_id' => 'id')),
+        'file_to_post_post_id_fkey' => array('notice', array('post_id' => 'id')),
     ),
     'indexes' => array(
         'post_id_idx' => array('post_id'),
@@ -817,9 +818,9 @@ $schema['group_block'] = array(
     ),
     'primary key' => array('group_id', 'blocked'),
     'foreign keys' => array(
-        'group_id' => array('user_group' => 'id'),
-        'blocked' => array('profile' => 'id'),
-        'blocker' => array('user' => 'id'),
+        'group_block_group_id_fkey' => array('user_group', array('group_id' => 'id')),
+        'group_block_blocked_fkey' => array('profile', array('blocked' => 'id')),
+        'group_block_blocker_fkey' => array('user', array('blocker' => 'id')),
     ),
 );
 
@@ -831,7 +832,7 @@ $schema['group_alias'] = array(
     ),
     'primary key' => array('alias'),
     'foreign keys' => array(
-        'group_id' => array('user_group' => 'id'),
+        'group_alias_group_id_fkey' => array('user_group', array('group_id' => 'id')),
     ),
     'indexes' => array(
         'group_alias_group_id_idx' => array('group_id'),
@@ -861,7 +862,7 @@ $schema['deleted_notice'] = array(
     ),
     'primary key' => array('id'),
     'unique keys' => array(
-        'deleted_notice_uri_idx' => array('uri'),
+        'deleted_notice_uri_key' => array('uri'),
     ),
     'indexes' => array(
         'deleted_notice_profile_id_idx' => array('profile_id'),
@@ -885,7 +886,7 @@ $schema['profile_role'] = array(
     ),
     'primary key' => array('profile_id', 'role'),
     'foreign keys' => array(
-        'profile_id' => array('profile' => 'id'),
+        'profile_role_profile_id_fkey' => array('profile', array('profile_id' => 'id')),
     ),
 );
 
@@ -908,7 +909,7 @@ $schema['login_token'] = array(
     ),
     'primary key' => array('user_id'),
     'foreign keys' => array(
-        'user_id' => array('user' => 'id'),
+        'login_token_user_id_fkey' => array('user', array('user_id' => 'id')),
     ),
 );
 
@@ -921,7 +922,7 @@ $schema['user_location_prefs'] = array(
     ),
     'primary key' => array('user_id'),
     'foreign keys' => array(
-        'user_id' => array('user' => 'id'),
+        'user_location_prefs_user_id_fkey' => array('user', array('user_id' => 'id')),
     ),
 );
 
@@ -932,7 +933,7 @@ $schema['inbox'] = array(
     ),
     'primary key' => array('user_id'),
     'foreign keys' => array(
-        'user_id' => array('user' => 'id'),
+        'inbox_user_id_fkey' => array('user', array('user_id' => 'id')),
     ),
 );
 
@@ -954,7 +955,7 @@ $schema['user_im_prefs'] = array(
         'transport_screenname_key' => array('transport', 'screenname'),
     ),
     'foreign keys' => array(
-        'user_id' => array('user' => 'id'),
+        'user_im_prefs_user_id_fkey' => array('user', array('user_id' => 'id')),
     ),
 );
 
@@ -967,7 +968,7 @@ $schema['conversation'] = array(
     ),
     'primary key' => array('id'),
     'unique keys' => array(
-        'conversation_uri_idx' => array('uri'),
+        'conversation_uri_key' => array('uri'),
     ),
 );
 
@@ -982,10 +983,10 @@ $schema['local_group'] = array(
     ),
     'primary key' => array('group_id'),
     'foreign keys' => array(
-        'group_id' => array('user_group' => 'id'),
+        'local_group_group_id_fkey' => array('user_group', array('group_id' => 'id')),
     ),
     'unique keys' => array(
-        'local_group_nickname_idx' => array('nickname'),
+        'local_group_nickname_key' => array('nickname'),
     ),
 );
 
@@ -1001,6 +1002,6 @@ $schema['user_urlshortener_prefs'] = array(
     ),
     'primary key' => array('user_id'),
     'foreign keys' => array(
-        'user_id' => array('user' => 'id'),
+        'user_urlshortener_prefs_user_id_fkey' => array('user', array('user_id' => 'id')),
     ),
 );

From a7d98435f649da268f728825e64eb673c451e242 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Fri, 15 Oct 2010 11:26:06 -0700
Subject: [PATCH 252/655] Tweak DB query logging to also log queries that fail;
 the exceptions we get are often not very descriptive like "No such table"
 without saying which table. :)

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

diff --git a/classes/Memcached_DataObject.php b/classes/Memcached_DataObject.php
index 8ffb46cc52..27bb5d3c9d 100644
--- a/classes/Memcached_DataObject.php
+++ b/classes/Memcached_DataObject.php
@@ -338,13 +338,27 @@ class Memcached_DataObject extends Safe_DataObject
         }
 
         $start = microtime(true);
-        $result = parent::_query($string);
+        $fail = false;
+        try {
+            $result = parent::_query($string);
+        } catch (Exception $e) {
+            $fail = $e;
+        }
         $delta = microtime(true) - $start;
 
         $limit = common_config('db', 'log_slow_queries');
         if (($limit > 0 && $delta >= $limit) || common_config('db', 'log_queries')) {
             $clean = $this->sanitizeQuery($string);
-            common_log(LOG_DEBUG, sprintf("DB query (%0.3fs): %s", $delta, $clean));
+            if ($fail) {
+                $msg = sprintf("FAILED DB query (%0.3fs): %s - %s", $delta, $fail->getMessage(), $clean);
+            } else {
+                $msg = sprintf("DB query (%0.3fs): %s", $delta, $clean);
+            }
+            common_log(LOG_DEBUG, $msg);
+        }
+
+        if ($fail) {
+            throw $fail;
         }
         return $result;
     }

From a335dcbcbb7d7197a50aa929045b342e48013123 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Fri, 15 Oct 2010 12:20:10 -0700
Subject: [PATCH 253/655] Update installer to use new Schema code to create the
 core tables instead of db/statusnet.sql or db/statusnet_pg.sql

---
 lib/installer.php | 198 +++++++++++++++++-----------------------------
 1 file changed, 71 insertions(+), 127 deletions(-)

diff --git a/lib/installer.php b/lib/installer.php
index c046eadea3..e89c914e11 100644
--- a/lib/installer.php
+++ b/lib/installer.php
@@ -53,12 +53,12 @@ abstract class Installer
         'mysql' => array(
             'name' => 'MySQL',
             'check_module' => 'mysqli',
-            'installer' => 'mysql_db_installer',
+            'scheme' => 'mysqli', // DSN prefix for PEAR::DB
         ),
         'pgsql' => array(
             'name' => 'PostgreSQL',
             'check_module' => 'pgsql',
-            'installer' => 'pgsql_db_installer',
+            'scheme' => 'pgsql', // DSN prefix for PEAR::DB
         ),
     );
 
@@ -254,6 +254,7 @@ abstract class Installer
      * Set up the database with the appropriate function for the selected type...
      * Saves database info into $this->db.
      * 
+     * @fixme escape things in the connection string in case we have a funny pass etc
      * @return mixed array of database connection params on success, false on failure
      */
     function setupDatabase()
@@ -261,119 +262,41 @@ abstract class Installer
         if ($this->db) {
             throw new Exception("Bad order of operations: DB already set up.");
         }
-        $method = self::$dbModules[$this->dbtype]['installer'];
-        $db = call_user_func(array($this, $method),
-                             $this->host,
-                             $this->database,
-                             $this->username,
-                             $this->password);
-        $this->db = $db;
-        return $this->db;
-    }
-
-    /**
-     * Set up a database on PostgreSQL.
-     * Will output status updates during the operation.
-     * 
-     * @param string $host
-     * @param string $database
-     * @param string $username
-     * @param string $password
-     * @return mixed array of database connection params on success, false on failure
-     * 
-     * @fixme escape things in the connection string in case we have a funny pass etc
-     */
-    function Pgsql_Db_installer($host, $database, $username, $password)
-    {
-        $connstring = "dbname=$database host=$host user=$username";
-
-        //No password would mean trust authentication used.
-        if (!empty($password)) {
-            $connstring .= " password=$password";
-        }
         $this->updateStatus("Starting installation...");
+
+        if (empty($password)) {
+            $auth = '';
+        } else {
+            $auth = ":$this->password";
+        }
+        $scheme = self::$dbModules[$this->dbtype]['scheme'];
+
         $this->updateStatus("Checking database...");
-        $conn = pg_connect($connstring);
-
-        if ($conn ===false) {
-            $this->updateStatus("Failed to connect to database: $connstring");
+        $conn = $this->connectDatabase($dsn);
+        if (DB::isError($conn)) {
+            $this->updateStatus("Database connection error: " . $conn->getMessage(), true);
             return false;
         }
 
-        //ensure database encoding is UTF8
-        $record = pg_fetch_object(pg_query($conn, 'SHOW server_encoding'));
-        if ($record->server_encoding != 'UTF8') {
-            $this->updateStatus("StatusNet requires UTF8 character encoding. Your database is ". htmlentities($record->server_encoding));
-            return false;
-        }
-
-        $this->updateStatus("Running database script...");
-        //wrap in transaction;
-        pg_query($conn, 'BEGIN');
-        $res = $this->runDbScript('statusnet_pg.sql', $conn, 'pgsql');
-
-        if ($res === false) {
-            $this->updateStatus("Can't run database script.", true);
-            return false;
-        }
-        foreach (array('sms_carrier' => 'SMS carrier',
-                    'notice_source' => 'notice source',
-                    'foreign_services' => 'foreign service')
-              as $scr => $name) {
-            $this->updateStatus(sprintf("Adding %s data to database...", $name));
-            $res = $this->runDbScript($scr.'.sql', $conn, 'pgsql');
-            if ($res === false) {
-                $this->updateStatus(sprintf("Can't run %s script.", $name), true);
+        // ensure database encoding is UTF8
+        if ($this->dbtype == 'mysql') {
+            // @fixme utf8m4 support for mysql 5.5?
+            // Force the comms charset to utf8 for sanity
+            $conn->execute('SET names utf8');
+        } else if ($this->dbtype == 'pgsql') {
+            $record = $conn->getRow('SHOW server_encoding');
+            if ($record->server_encoding != 'UTF8') {
+                $this->updateStatus("StatusNet requires UTF8 character encoding. Your database is ". htmlentities($record->server_encoding));
                 return false;
             }
         }
-        pg_query($conn, 'COMMIT');
 
-        if (empty($password)) {
-            $sqlUrl = "pgsql://$username@$host/$database";
-        } else {
-            $sqlUrl = "pgsql://$username:$password@$host/$database";
-        }
-
-        $db = array('type' => 'pgsql', 'database' => $sqlUrl);
-
-        return $db;
-    }
-
-    /**
-     * Set up a database on MySQL.
-     * Will output status updates during the operation.
-     * 
-     * @param string $host
-     * @param string $database
-     * @param string $username
-     * @param string $password
-     * @return mixed array of database connection params on success, false on failure
-     * 
-     * @fixme escape things in the connection string in case we have a funny pass etc
-     */
-    function Mysql_Db_installer($host, $database, $username, $password)
-    {
-        $this->updateStatus("Starting installation...");
-        $this->updateStatus("Checking database...");
-
-        $conn = mysqli_init();
-        if (!$conn->real_connect($host, $username, $password)) {
-            $this->updateStatus("Can't connect to server '$host' as '$username'.", true);
-            return false;
-        }
-        $this->updateStatus("Changing to database...");
-        if (!$conn->select_db($database)) {
-            $this->updateStatus("Can't change to database.", true);
+        $res = $this->updateStatus("Creating database tables...");
+        if (!$this->createCoreTables($conn)) {
+            $this->updateStatus("Error creating tables.", true);
             return false;
         }
 
-        $this->updateStatus("Running database script...");
-        $res = $this->runDbScript('statusnet.sql', $conn);
-        if ($res === false) {
-            $this->updateStatus("Can't run database script.", true);
-            return false;
-        }
         foreach (array('sms_carrier' => 'SMS carrier',
                     'notice_source' => 'notice source',
                     'foreign_services' => 'foreign service')
@@ -386,11 +309,48 @@ abstract class Installer
             }
         }
 
-        $sqlUrl = "mysqli://$username:$password@$host/$database";
-        $db = array('type' => 'mysql', 'database' => $sqlUrl);
+        $db = array('type' => $this->dbtype, 'database' => $dsn);
         return $db;
     }
 
+    /**
+     * Open a connection to the database.
+     *
+     * @param <type> $dsn
+     * @return <type> 
+     */
+    function connectDatabase($dsn)
+    {
+        require_once 'DB.php';
+        return DB::connect($dsn);
+    }
+
+    /**
+     * Create core tables on the given database connection.
+     *
+     * @param DB_common $conn
+     */
+    function createCoreTables(DB_common $conn)
+    {
+        $schema = Schema::get($conn);
+        $tableDefs = $this->getCoreSchema();
+        foreach ($tableDefs as $name => $def) {
+            $schema->ensureTable($name, $def);
+        }
+    }
+
+    /**
+     * Fetch the core table schema definitions.
+     *
+     * @return array of table names => table def arrays
+     */
+    function getCoreSchema()
+    {
+        $schema = array();
+        include INSTALLDIR . '/db/core.php';
+        return $schema;
+    }
+
     /**
      * Write a stock configuration file.
      *
@@ -431,13 +391,12 @@ abstract class Installer
     /**
      * Install schema into the database
      *
-     * @param string $filename location of database schema file
-     * @param dbconn $conn     connection to database
-     * @param string $type     type of database, currently mysql or pgsql
+     * @param string    $filename location of database schema file
+     * @param DB_common $conn     connection to database
      *
      * @return boolean - indicating success or failure
      */
-    function runDbScript($filename, $conn, $type = 'mysqli')
+    function runDbScript($filename, DB_common $conn)
     {
         $sql = trim(file_get_contents(INSTALLDIR . '/db/' . $filename));
         $stmts = explode(';', $sql);
@@ -446,24 +405,9 @@ abstract class Installer
             if (!mb_strlen($stmt)) {
                 continue;
             }
-            // FIXME: use PEAR::DB or PDO instead of our own switch
-            switch ($type) {
-            case 'mysqli':
-                $res = $conn->query($stmt);
-                if ($res === false) {
-                    $error = $conn->error;
-                }
-                break;
-            case 'pgsql':
-                $res = pg_query($conn, $stmt);
-                if ($res === false) {
-                    $error = pg_last_error();
-                }
-                break;
-            default:
-                $this->updateStatus("runDbScript() error: unknown database type ". $type ." provided.");
-            }
-            if ($res === false) {
+            $res = $conn->execute($stmt);
+            if (DB::isError($res)) {
+                $error = $result->getMessage();
                 $this->updateStatus("ERROR ($error) for SQL '$stmt'");
                 return $res;
             }

From 201efe6b62f57a479f4d24dca7142f5dff7b0f59 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Fri, 15 Oct 2010 13:33:26 -0700
Subject: [PATCH 254/655] Split the core-setup bits of common.php out to
 framework.php (better ideas?) so we can easily set up our framework to run
 Schema setup before we have a core database to load a live config from.

---
 lib/common.php    | 128 ++---------------------------------------
 lib/framework.php | 143 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 148 insertions(+), 123 deletions(-)
 create mode 100644 lib/framework.php

diff --git a/lib/common.php b/lib/common.php
index 2a11ab722d..de12f342ba 100644
--- a/lib/common.php
+++ b/lib/common.php
@@ -1,7 +1,7 @@
 <?php
 /*
  * StatusNet - the distributed open-source microblogging tool
- * Copyright (C) 2008, 2009, StatusNet, Inc.
+ * Copyright (C) 2008-2010, StatusNet, Inc.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -19,131 +19,13 @@
 
 if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
+// @fixme shouldn't this be in index.php instead?
 //exit with 200 response, if this is checking fancy from the installer
 if (isset($_REQUEST['p']) && $_REQUEST['p'] == 'check-fancy') {  exit; }
 
-define('STATUSNET_VERSION', '0.9.5');
-define('LACONICA_VERSION', STATUSNET_VERSION); // compatibility
-
-define('STATUSNET_CODENAME', 'What\'s The Frequency, Kenneth?');
-
-define('AVATAR_PROFILE_SIZE', 96);
-define('AVATAR_STREAM_SIZE', 48);
-define('AVATAR_MINI_SIZE', 24);
-
-define('NOTICES_PER_PAGE', 20);
-define('PROFILES_PER_PAGE', 20);
-
-define('FOREIGN_NOTICE_SEND', 1);
-define('FOREIGN_NOTICE_RECV', 2);
-define('FOREIGN_NOTICE_SEND_REPLY', 4);
-
-define('FOREIGN_FRIEND_SEND', 1);
-define('FOREIGN_FRIEND_RECV', 2);
-
-define('NOTICE_INBOX_SOURCE_SUB', 1);
-define('NOTICE_INBOX_SOURCE_GROUP', 2);
-define('NOTICE_INBOX_SOURCE_REPLY', 3);
-define('NOTICE_INBOX_SOURCE_FORWARD', 4);
-define('NOTICE_INBOX_SOURCE_GATEWAY', -1);
-
-# append our extlib dir as the last-resort place to find libs
-
-set_include_path(get_include_path() . PATH_SEPARATOR . INSTALLDIR . '/extlib/');
-
-// To protect against upstream libraries which haven't updated
-// for PHP 5.3 where dl() function may not be present...
-if (!function_exists('dl')) {
-    // function_exists() returns false for things in disable_functions,
-    // but they still exist and we'll die if we try to redefine them.
-    //
-    // Fortunately trying to call the disabled one will only trigger
-    // a warning, not a fatal, so it's safe to leave it for our case.
-    // Callers will be suppressing warnings anyway.
-    $disabled = array_filter(array_map('trim', explode(',', ini_get('disable_functions'))));
-    if (!in_array('dl', $disabled)) {
-        function dl($library) {
-            return false;
-        }
-    }
-}
-
-# global configuration object
-
-require_once('PEAR.php');
-require_once('PEAR/Exception.php');
-require_once('DB/DataObject.php');
-require_once('DB/DataObject/Cast.php'); # for dates
-
-require_once(INSTALLDIR.'/lib/language.php');
-
-// This gets included before the config file, so that admin code and plugins
-// can use it
-
-require_once(INSTALLDIR.'/lib/event.php');
-require_once(INSTALLDIR.'/lib/plugin.php');
-
-function addPlugin($name, $attrs = null)
-{
-    return StatusNet::addPlugin($name, $attrs);
-}
-
-function _have_config()
-{
-    return StatusNet::haveConfig();
-}
-
-function __autoload($cls)
-{
-    if (file_exists(INSTALLDIR.'/classes/' . $cls . '.php')) {
-        require_once(INSTALLDIR.'/classes/' . $cls . '.php');
-    } else if (file_exists(INSTALLDIR.'/lib/' . strtolower($cls) . '.php')) {
-        require_once(INSTALLDIR.'/lib/' . strtolower($cls) . '.php');
-    } else if (mb_substr($cls, -6) == 'Action' &&
-               file_exists(INSTALLDIR.'/actions/' . strtolower(mb_substr($cls, 0, -6)) . '.php')) {
-        require_once(INSTALLDIR.'/actions/' . strtolower(mb_substr($cls, 0, -6)) . '.php');
-    } else if ($cls == 'OAuthRequest') {
-        require_once('OAuth.php');
-    } else {
-        Event::handle('Autoload', array(&$cls));
-    }
-}
-
-// XXX: how many of these could be auto-loaded on use?
-// XXX: note that these files should not use config options
-// at compile time since DB config options are not yet loaded.
-
-require_once 'Validate.php';
-require_once 'markdown.php';
-
-// XXX: other formats here
-
-define('NICKNAME_FMT', VALIDATE_NUM.VALIDATE_ALPHA_LOWER);
-
-require_once INSTALLDIR.'/lib/util.php';
-require_once INSTALLDIR.'/lib/action.php';
-require_once INSTALLDIR.'/lib/mail.php';
-require_once INSTALLDIR.'/lib/subs.php';
-
-require_once INSTALLDIR.'/lib/clientexception.php';
-require_once INSTALLDIR.'/lib/serverexception.php';
-
-
-//set PEAR error handling to use regular PHP exceptions
-function PEAR_ErrorToPEAR_Exception($err)
-{
-    //DB_DataObject throws error when an empty set would be returned
-    //That behavior is weird, and not how the rest of StatusNet works.
-    //So just ignore those errors.
-    if ($err->getCode() == DB_DATAOBJECT_ERROR_NODATA) {
-        return;
-    }
-    if ($err->getCode()) {
-        throw new PEAR_Exception($err->getMessage(), $err->getCode());
-    }
-    throw new PEAR_Exception($err->getMessage());
-}
-PEAR::setErrorHandling(PEAR_ERROR_CALLBACK, 'PEAR_ErrorToPEAR_Exception');
+// All the fun stuff to actually initialize StatusNet's framework code,
+// without loading up a site configuration.
+require_once INSTALLDIR . '/framework.php';
 
 try {
     StatusNet::init(@$server, @$path, @$conffile);
diff --git a/lib/framework.php b/lib/framework.php
new file mode 100644
index 0000000000..3667393398
--- /dev/null
+++ b/lib/framework.php
@@ -0,0 +1,143 @@
+<?php
+/*
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2008-2010, StatusNet, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
+
+define('STATUSNET_VERSION', '0.9.5');
+define('LACONICA_VERSION', STATUSNET_VERSION); // compatibility
+
+define('STATUSNET_CODENAME', 'What\'s The Frequency, Kenneth?');
+
+define('AVATAR_PROFILE_SIZE', 96);
+define('AVATAR_STREAM_SIZE', 48);
+define('AVATAR_MINI_SIZE', 24);
+
+define('NOTICES_PER_PAGE', 20);
+define('PROFILES_PER_PAGE', 20);
+
+define('FOREIGN_NOTICE_SEND', 1);
+define('FOREIGN_NOTICE_RECV', 2);
+define('FOREIGN_NOTICE_SEND_REPLY', 4);
+
+define('FOREIGN_FRIEND_SEND', 1);
+define('FOREIGN_FRIEND_RECV', 2);
+
+define('NOTICE_INBOX_SOURCE_SUB', 1);
+define('NOTICE_INBOX_SOURCE_GROUP', 2);
+define('NOTICE_INBOX_SOURCE_REPLY', 3);
+define('NOTICE_INBOX_SOURCE_FORWARD', 4);
+define('NOTICE_INBOX_SOURCE_GATEWAY', -1);
+
+# append our extlib dir as the last-resort place to find libs
+
+set_include_path(get_include_path() . PATH_SEPARATOR . INSTALLDIR . '/extlib/');
+
+// To protect against upstream libraries which haven't updated
+// for PHP 5.3 where dl() function may not be present...
+if (!function_exists('dl')) {
+    // function_exists() returns false for things in disable_functions,
+    // but they still exist and we'll die if we try to redefine them.
+    //
+    // Fortunately trying to call the disabled one will only trigger
+    // a warning, not a fatal, so it's safe to leave it for our case.
+    // Callers will be suppressing warnings anyway.
+    $disabled = array_filter(array_map('trim', explode(',', ini_get('disable_functions'))));
+    if (!in_array('dl', $disabled)) {
+        function dl($library) {
+            return false;
+        }
+    }
+}
+
+# global configuration object
+
+require_once('PEAR.php');
+require_once('PEAR/Exception.php');
+require_once('DB/DataObject.php');
+require_once('DB/DataObject/Cast.php'); # for dates
+
+require_once(INSTALLDIR.'/lib/language.php');
+
+// This gets included before the config file, so that admin code and plugins
+// can use it
+
+require_once(INSTALLDIR.'/lib/event.php');
+require_once(INSTALLDIR.'/lib/plugin.php');
+
+function addPlugin($name, $attrs = null)
+{
+    return StatusNet::addPlugin($name, $attrs);
+}
+
+function _have_config()
+{
+    return StatusNet::haveConfig();
+}
+
+function __autoload($cls)
+{
+    if (file_exists(INSTALLDIR.'/classes/' . $cls . '.php')) {
+        require_once(INSTALLDIR.'/classes/' . $cls . '.php');
+    } else if (file_exists(INSTALLDIR.'/lib/' . strtolower($cls) . '.php')) {
+        require_once(INSTALLDIR.'/lib/' . strtolower($cls) . '.php');
+    } else if (mb_substr($cls, -6) == 'Action' &&
+               file_exists(INSTALLDIR.'/actions/' . strtolower(mb_substr($cls, 0, -6)) . '.php')) {
+        require_once(INSTALLDIR.'/actions/' . strtolower(mb_substr($cls, 0, -6)) . '.php');
+    } else if ($cls == 'OAuthRequest') {
+        require_once('OAuth.php');
+    } else {
+        Event::handle('Autoload', array(&$cls));
+    }
+}
+
+// XXX: how many of these could be auto-loaded on use?
+// XXX: note that these files should not use config options
+// at compile time since DB config options are not yet loaded.
+
+require_once 'Validate.php';
+require_once 'markdown.php';
+
+// XXX: other formats here
+
+define('NICKNAME_FMT', VALIDATE_NUM.VALIDATE_ALPHA_LOWER);
+
+require_once INSTALLDIR.'/lib/util.php';
+require_once INSTALLDIR.'/lib/action.php';
+require_once INSTALLDIR.'/lib/mail.php';
+require_once INSTALLDIR.'/lib/subs.php';
+
+require_once INSTALLDIR.'/lib/clientexception.php';
+require_once INSTALLDIR.'/lib/serverexception.php';
+
+
+//set PEAR error handling to use regular PHP exceptions
+function PEAR_ErrorToPEAR_Exception($err)
+{
+    //DB_DataObject throws error when an empty set would be returned
+    //That behavior is weird, and not how the rest of StatusNet works.
+    //So just ignore those errors.
+    if ($err->getCode() == DB_DATAOBJECT_ERROR_NODATA) {
+        return;
+    }
+    if ($err->getCode()) {
+        throw new PEAR_Exception($err->getMessage(), $err->getCode());
+    }
+    throw new PEAR_Exception($err->getMessage());
+}
+PEAR::setErrorHandling(PEAR_ERROR_CALLBACK, 'PEAR_ErrorToPEAR_Exception');

From dcf0acd5035e41d573e1f74c6804781ebb174d44 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Fri, 15 Oct 2010 13:34:35 -0700
Subject: [PATCH 255/655] Make StatusNet::initDefaults() public so we can call
 it from the installer.

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

diff --git a/lib/statusnet.php b/lib/statusnet.php
index 3d018f4e21..6cabd3842e 100644
--- a/lib/statusnet.php
+++ b/lib/statusnet.php
@@ -245,7 +245,7 @@ class StatusNet
      * Establish default configuration based on given or default server and path
      * Sets global $_server, $_path, and $config
      */
-    protected static function initDefaults($server, $path)
+    public static function initDefaults($server, $path)
     {
         global $_server, $_path, $config;
 

From 77300f94a3948dce222e92512d0257beebccf2f8 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Fri, 15 Oct 2010 13:34:54 -0700
Subject: [PATCH 256/655] fix typo on params on Schema->createTable()

---
 lib/schema.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/lib/schema.php b/lib/schema.php
index 2793906a46..b5e452a6e8 100644
--- a/lib/schema.php
+++ b/lib/schema.php
@@ -119,14 +119,13 @@ class Schema
     /**
      * Creates a table with the given names and columns.
      *
-     * @param string $name    Name of the table
-     * @param array  $columns Array of ColumnDef objects
-     *                        for new table.
+     * @param string $tableName    Name of the table
+     * @param array  $def          Table definition array listing fields and indexes.
      *
      * @return boolean success flag
      */
 
-    public function createTable($name, $columns)
+    public function createTable($tableName, $def)
     {
         $statements = $this->buildCreateTable($tableName, $def);
         return $this->runSqlSet($statements);

From 90c35dc541b7c2d3ebaa790ce2c0359635652e5a Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Fri, 15 Oct 2010 13:47:38 -0700
Subject: [PATCH 257/655] Cleanup on making the schema work for installer (not
 quite there yet)

---
 lib/installer.php   | 33 ++++++++++++++++++++++++---------
 lib/mysqlschema.php |  8 ++++----
 lib/schema.php      | 12 +++++-------
 3 files changed, 33 insertions(+), 20 deletions(-)

diff --git a/lib/installer.php b/lib/installer.php
index e89c914e11..5cc3eccdde 100644
--- a/lib/installer.php
+++ b/lib/installer.php
@@ -264,25 +264,23 @@ abstract class Installer
         }
         $this->updateStatus("Starting installation...");
 
-        if (empty($password)) {
+        if (empty($this->password)) {
             $auth = '';
         } else {
             $auth = ":$this->password";
         }
         $scheme = self::$dbModules[$this->dbtype]['scheme'];
+        $dsn = "{$scheme}://{$this->username}{$auth}@{$this->host}/{$this->database}";
 
         $this->updateStatus("Checking database...");
         $conn = $this->connectDatabase($dsn);
-        if (DB::isError($conn)) {
-            $this->updateStatus("Database connection error: " . $conn->getMessage(), true);
-            return false;
-        }
 
         // ensure database encoding is UTF8
         if ($this->dbtype == 'mysql') {
             // @fixme utf8m4 support for mysql 5.5?
             // Force the comms charset to utf8 for sanity
-            $conn->execute('SET names utf8');
+            // This doesn't currently work. :P
+            //$conn->executes('set names utf8');
         } else if ($this->dbtype == 'pgsql') {
             $record = $conn->getRow('SHOW server_encoding');
             if ($record->server_encoding != 'UTF8') {
@@ -321,6 +319,8 @@ abstract class Installer
      */
     function connectDatabase($dsn)
     {
+        // @fixme move this someplace more sensible
+        //set_include_path(INSTALLDIR . '/extlib' . PATH_SEPARATOR . get_include_path());
         require_once 'DB.php';
         return DB::connect($dsn);
     }
@@ -335,6 +335,9 @@ abstract class Installer
         $schema = Schema::get($conn);
         $tableDefs = $this->getCoreSchema();
         foreach ($tableDefs as $name => $def) {
+            if (defined('DEBUG_INSTALLER')) {
+                echo " $name ";
+            }
             $schema->ensureTable($name, $def);
         }
     }
@@ -471,10 +474,22 @@ abstract class Installer
      */
     function doInstall()
     {
-        $this->db = $this->setupDatabase();
+        $this->updateStatus("Initializing...");
+        ini_set('display_errors', 1);
+        error_reporting(E_ALL);
+        define('STATUSNET', 1);
+        require_once INSTALLDIR . '/lib/framework.php';
+        StatusNet::initDefaults($this->server, $this->path);
 
-        if (!$this->db) {
-            // database connection failed, do not move on to create config file.
+        try {
+            $this->db = $this->setupDatabase();
+            if (!$this->db) {
+                // database connection failed, do not move on to create config file.
+                return false;
+            }
+        } catch (Exception $e) {
+            // Lower-level DB error!
+            $this->updateStatus("Database error: " . $e->getMessage(), true);
             return false;
         }
 
diff --git a/lib/mysqlschema.php b/lib/mysqlschema.php
index eeabae8cd3..400a7ee598 100644
--- a/lib/mysqlschema.php
+++ b/lib/mysqlschema.php
@@ -246,13 +246,13 @@ class MysqlSchema extends Schema
     /**
      * Close out a 'create table' SQL statement.
      *
-     * @param array $sql
      * @param string $name
      * @param array $def
+     * @return string;
      */
-    function appendCreateTableEnd(array &$sql, $name, array $def)
+    function endCreateTable($name, array $def)
     {
-        $sql[] = ") ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin";
+        return ") ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin";
     }
 
     /**
@@ -286,7 +286,7 @@ class MysqlSchema extends Schema
      * @return boolean success flag
      */
 
-    public function ensureTable($tableName, $columns)
+    public function oldensureTable($tableName, $columns)
     {
         // XXX: DB engine portability -> toilet
 
diff --git a/lib/schema.php b/lib/schema.php
index b5e452a6e8..c9a0fb4347 100644
--- a/lib/schema.php
+++ b/lib/schema.php
@@ -448,6 +448,9 @@ class Schema
     {
         $ok = true;
         foreach ($statements as $sql) {
+            if (defined('DEBUG_INSTALLER')) {
+                echo "<tt>" . htmlspecialchars($sql) . "</tt><br/>\n";
+            }
             $res = $this->conn->query($sql);
 
             if (PEAR::isError($res)) {
@@ -478,13 +481,8 @@ class Schema
     {
         try {
             $old = $this->getTableDef($tableName);
-        } catch (Exception $e) {
-            // @fixme this is a terrible check :D
-            if (preg_match('/no such table/', $e->getMessage())) {
-                return $this->buildCreateTable($tableName, $def);
-            } else {
-                throw $e;
-            }
+        } catch (SchemaTableMissingException $e) {
+            return $this->buildCreateTable($tableName, $def);
         }
 
         $old = $this->filterDef($old);

From 3dd4157f2601d15dbcfc77162de53347864ba96e Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Fri, 15 Oct 2010 14:49:05 -0700
Subject: [PATCH 258/655] tweak copyright headers on installer

---
 lib/installer.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/installer.php b/lib/installer.php
index 5cc3eccdde..a5588fbed6 100644
--- a/lib/installer.php
+++ b/lib/installer.php
@@ -2,7 +2,7 @@
 
 /**
  * StatusNet - the distributed open-source microblogging tool
- * Copyright (C) 2009, StatusNet, Inc.
+ * Copyright (C) 2009-2010, StatusNet, Inc.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -32,9 +32,10 @@
  * @author   Sarven Capadisli <csarven@status.net>
  * @author   Tom Adams <tom@holizz.com>
  * @author   Zach Copley <zach@status.net>
+ * @copyright 2009-2010 StatusNet, Inc http://status.net
  * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org
  * @license  GNU Affero General Public License http://www.gnu.org/licenses/
- * @version  0.9.x
+ * @version  1.0.x
  * @link     http://status.net
  */
 

From 1a2170914e44e6fda66078895556f1ebb99d1cf5 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Fri, 15 Oct 2010 15:01:43 -0700
Subject: [PATCH 259/655] woops wrong path

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

diff --git a/lib/common.php b/lib/common.php
index de12f342ba..0d60657a35 100644
--- a/lib/common.php
+++ b/lib/common.php
@@ -25,7 +25,7 @@ if (isset($_REQUEST['p']) && $_REQUEST['p'] == 'check-fancy') {  exit; }
 
 // All the fun stuff to actually initialize StatusNet's framework code,
 // without loading up a site configuration.
-require_once INSTALLDIR . '/framework.php';
+require_once INSTALLDIR . '/lib/framework.php';
 
 try {
     StatusNet::init(@$server, @$path, @$conffile);

From fa50ab2a947219bbf9ef5069c8c40d6c7b02406f Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Fri, 15 Oct 2010 15:01:55 -0700
Subject: [PATCH 260/655] fix notice on non-https views

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

diff --git a/lib/statusnet.php b/lib/statusnet.php
index 6cabd3842e..d94d856c9a 100644
--- a/lib/statusnet.php
+++ b/lib/statusnet.php
@@ -396,7 +396,7 @@ class StatusNet
     static function isHTTPS()
     {
         // There are some exceptions to this; add them here!
-        return $_SERVER['HTTPS'];
+        return !empty($_SERVER['HTTPS']);
     }
 }
 

From e0cb6d6f7fdda97cb6ed262f79706392e315c055 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Fri, 15 Oct 2010 15:01:55 -0700
Subject: [PATCH 261/655] fix notice on non-https views

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

diff --git a/lib/statusnet.php b/lib/statusnet.php
index 3d018f4e21..2e2359c287 100644
--- a/lib/statusnet.php
+++ b/lib/statusnet.php
@@ -396,7 +396,7 @@ class StatusNet
     static function isHTTPS()
     {
         // There are some exceptions to this; add them here!
-        return $_SERVER['HTTPS'];
+        return !empty($_SERVER['HTTPS']);
     }
 }
 

From eb93bdbb038e8e22ee2bbcb84dbe3967672c48cf Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Fri, 15 Oct 2010 16:32:37 -0700
Subject: [PATCH 262/655] some more tweaking to do the mappings during
 filterDef; not totally sure I like it

---
 db/core.php            |  6 +++---
 lib/mysqlschema.php    | 23 ++++++++++++++++++++---
 lib/pgsqlschema.php    |  4 ++++
 lib/schema.php         | 24 ++++++++++++++++--------
 scripts/dumpschema.php |  2 +-
 5 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/db/core.php b/db/core.php
index c0def7ce5a..c0be6c97ae 100644
--- a/db/core.php
+++ b/db/core.php
@@ -182,7 +182,7 @@ $schema['notice'] = array(
         'rendered' => array('type' => 'text', 'description' => 'HTML version of the content'),
         'url' => array('type' => 'varchar', 'length' => 255, 'description' => 'URL of any attachment (image, video, bookmark, whatever)'),
         'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
-        'modified' => array('type' => 'timestamp', 'description' => 'date this record was modified'),
+        'modified' => array('type' => 'datetime', 'not null' => true, 'default' => 'CURRENT_TIMESTAMP', 'description' => 'date this record was modified'),
         'reply_to' => array('type' => 'int', 'description' => 'notice replied to (usually a guess)'),
         'is_local' => array('type' => 'int', 'size' => 'tiny', 'default' => 0, 'description' => 'notice was generated by a user'),
         'source' => array('type' => 'varchar', 'length' => 32, 'description' => 'source of comment, like "web", "im", or "clientname"'),
@@ -871,8 +871,8 @@ $schema['deleted_notice'] = array(
 
 $schema['config'] = array(
     'fields' => array(
-        'section' => array('type' => 'varchar', 'length' => 32, 'not null' => true, 'description' => 'configuration section'),
-        'setting' => array('type' => 'varchar', 'length' => 32, 'not null' => true, 'description' => 'configuration setting'),
+        'section' => array('type' => 'varchar', 'length' => 32, 'not null' => true, 'default' => '', 'description' => 'configuration section'),
+        'setting' => array('type' => 'varchar', 'length' => 32, 'not null' => true, 'default' => '', 'description' => 'configuration setting'),
         'value' => array('type' => 'varchar', 'length' => 255, 'description' => 'configuration value'),
     ),
     'primary key' => array('section', 'setting'),
diff --git a/lib/mysqlschema.php b/lib/mysqlschema.php
index 400a7ee598..25f0e52f16 100644
--- a/lib/mysqlschema.php
+++ b/lib/mysqlschema.php
@@ -96,18 +96,21 @@ class MysqlSchema extends Schema
 
             // warning -- 'unsigned' attr on numbers isn't given in DATA_TYPE and friends.
             // It is stuck in on COLUMN_TYPE though (eg 'bigint(20) unsigned')
+            /*
             list($type, $size) = $this->reverseMapType($row['DATA_TYPE']);
             $field['type'] = $type;
             if ($size !== null) {
                 $field['size'] = $size;
             }
+             */
+            $field['type'] = $type = $row['DATA_TYPE'];
 
             if ($type == 'char' || $type == 'varchar') {
                 if ($row['CHARACTER_MAXIMUM_LENGTH'] !== null) {
                     $field['length'] = intval($row['CHARACTER_MAXIMUM_LENGTH']);
                 }
             }
-            if ($type == 'numeric') {
+            if ($type == 'decimal') {
                 // Other int types may report these values, but they're irrelevant.
                 // Just ignore them!
                 if ($row['NUMERIC_PRECISION'] !== null) {
@@ -137,7 +140,7 @@ class MysqlSchema extends Schema
             $extra = $row['EXTRA'];
             if ($extra) {
                 if (preg_match('/(^|\s)auto_increment(\s|$)/i', $extra)) {
-                    $field['type'] = 'serial';
+                    $field['auto_increment'] = true;
                 }
                 // $row['EXTRA'] may contain 'on update CURRENT_TIMESTAMP'
                 // ^ ...... how to specify?
@@ -446,7 +449,8 @@ class MysqlSchema extends Schema
         $line = array();
         $line[] = parent::columnSql($cd);
 
-        if ($cd['type'] == 'serial') {
+        // This'll have been added from our transform of 'serial' type
+        if (!empty($cd['auto_increment'])) {
             $line[] = 'auto_increment';
         }
 
@@ -489,6 +493,7 @@ class MysqlSchema extends Schema
      * @param string $type
      * @return array ($type, $size) -- $size may be null
      */
+    /*
     protected function reverseMapType($type)
     {
         $type = strtolower($type);
@@ -511,6 +516,7 @@ class MysqlSchema extends Schema
             return array($type, null);
         }
     }
+     */
 
     function typeAndSize($column)
     {
@@ -535,6 +541,17 @@ class MysqlSchema extends Schema
      */
     function filterDef(array $tableDef)
     {
+        foreach ($tableDef['fields'] as $name => &$col) {
+            if ($col['type'] == 'serial') {
+                $col['type'] = 'int';
+                $col['auto_increment'] = true;
+            }
+            if ($col['type'] == 'datetime' && isset($col['default']) && $col['default'] == 'CURRENT_TIMESTAMP') {
+                $col['type'] = 'timestamp';
+            }
+            $col['type'] = $this->mapType($col);
+            unset($col['size']);
+        }
         // @fixme add foreign-key support for MySQL
         unset($tableDef['foreign keys']);
         return $tableDef;
diff --git a/lib/pgsqlschema.php b/lib/pgsqlschema.php
index 4fde80b55a..ca1853494b 100644
--- a/lib/pgsqlschema.php
+++ b/lib/pgsqlschema.php
@@ -421,12 +421,16 @@ class PgsqlSchema extends Schema
             // No convenient support for field descriptions
             unset($col['description']);
 
+            /*
             if (isset($col['size'])) {
                 // Don't distinguish between tinyint and int.
                 if ($col['size'] == 'tiny' && $col['type'] == 'int') {
                     unset($col['size']);
                 }
             }
+             */
+            $col['type'] = $this->mapType($col);
+            unset($col['size']);
         }
         return $tableDef;
     }
diff --git a/lib/schema.php b/lib/schema.php
index c9a0fb4347..16fb502253 100644
--- a/lib/schema.php
+++ b/lib/schema.php
@@ -485,7 +485,7 @@ class Schema
             return $this->buildCreateTable($tableName, $def);
         }
 
-        $old = $this->filterDef($old);
+        //$old = $this->filterDef($old);
         $def = $this->filterDef($def);
 
         // @fixme check if not present
@@ -749,15 +749,17 @@ class Schema
 
     function typeAndSize($column)
     {
-        $type = $this->mapType($column);
+        //$type = $this->mapType($column);
+        $type = $column['type'];
+        if (isset($column['size'])) {
+            $type = $column['size'] . $type;
+        }
         $lengths = array();
 
-        if ($column['type'] == 'numeric') {
-            if (isset($column['precision'])) {
-                $lengths[] = $column['precision'];
-                if (isset($column['scale'])) {
-                    $lengths[] = $column['scale'];
-                }
+        if (isset($column['precision'])) {
+            $lengths[] = $column['precision'];
+            if (isset($column['scale'])) {
+                $lengths[] = $column['scale'];
             }
         } else if (isset($column['length'])) {
             $lengths[] = $column['length'];
@@ -778,6 +780,12 @@ class Schema
      */
     protected function reverseMapType($type)
     {
+        $sizes = array('tiny', 'small', 'medium', 'big');
+        foreach ($sizes as $prefix) {
+            if (substr($type, 0, strlen($prefix)) == $prefix) {
+                return array(substr($type, strlen($prefix)), $prefix);
+            }
+        }
         return array($type, null);
     }
 
diff --git a/scripts/dumpschema.php b/scripts/dumpschema.php
index b8d034d2a6..c1b0ff4e06 100644
--- a/scripts/dumpschema.php
+++ b/scripts/dumpschema.php
@@ -162,7 +162,7 @@ function dumpDiff($tableName, $filter)
     }
 
     if ($filter) {
-        $old = $schema->filterDef($old);
+        //$old = $schema->filterDef($old);
         $def = $schema->filterDef($def);
     }
 

From 54bac12eb9a9a4d8b028f406751ee067278b68f0 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Mon, 18 Oct 2010 17:08:23 -0700
Subject: [PATCH 263/655] Normalize the 'modified' vs 'created' field
 definitions to not-null timestamps. We can't rely on database DEFAULT or ON
 UPDATE values, since they don't play well with our insert-time caching.

---
 db/core.php | 126 ++++++++++++++++++++++++++++------------------------
 1 file changed, 67 insertions(+), 59 deletions(-)

diff --git a/db/core.php b/db/core.php
index c0be6c97ae..32f29c7151 100644
--- a/db/core.php
+++ b/db/core.php
@@ -1,24 +1,32 @@
 <?php
 
 /**
-
-Some notes...
-
-drupal docs don't list a bool type, but it might be nice to use rather than 'tinyint'
-note however that we use bitfields and things as well in tinyints
-
-decimal <-> numeric
-
-timestamps... how to specify?
-fulltext indexes?
-got one or two things wanting a custom charset setting on a field?
-
-foreign keys are kinda funky...
-    those specified in inline syntax (as all in the original .sql) are NEVER ENFORCED on mysql
-    those made with an explicit 'foreign key' WITHIN INNODB and IF there's a proper index, do get enforced
-    double-check what we've been doing on postgres?
-
-*/
+ *
+ * Some notes...
+ *
+ * Drupal docs don't list a bool type, but it might be nice to use rather than 'tinyint'
+ * Note however that we use bitfields and things as well in tinyints, and PG's
+ * "bool" type isn't 100% compatible with 0/1 checks. Just keeping tinyints. :)
+ *
+ * decimal <-> numeric
+ *
+ * MySQL 'timestamp' columns were formerly used for 'modified' files for their
+ * auto-updating properties. This didn't play well with changes to cache usage
+ * in 0.9.x, as we don't know the timestamp value at INSERT time and never
+ * have a chance to load it up again before caching.
+ *
+ * Current code should be setting 'created' and 'modified' fields explicitly;
+ * this also avoids mismatches between server and client timezone settings.
+ *
+ *
+ * fulltext indexes?
+ * got one or two things wanting a custom charset setting on a field?
+ *
+ * foreign keys are kinda funky...
+ *     those specified in inline syntax (as all in the original .sql) are NEVER ENFORCED on mysql
+ *     those made with an explicit 'foreign key' WITHIN INNODB and IF there's a proper index, do get enforced
+ *     double-check what we've been doing on postgres?
+ */
 
 $schema['profile'] = array(
     'description' => 'local and remote users have profiles',
@@ -36,7 +44,7 @@ $schema['profile'] = array(
         'location_ns' => array('type' => 'int', 'description' => 'namespace for location'),
 
         'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
-        'modified' => array('type' => 'timestamp', 'description' => 'date this record was modified'),
+        'modified' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was modified'),
     ),
     'primary key' => array('id'),
     'indexes' => array(
@@ -57,7 +65,7 @@ $schema['avatar'] = array(
         'filename' => array('type' => 'varchar', 'length' => 255, 'description' => 'local filename, if local'),
         'url' => array('type' => 'varchar', 'length' => 255, 'description' => 'avatar location'),
         'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
-        'modified' => array('type' => 'timestamp', 'description' => 'date this record was modified'),
+        'modified' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was modified'),
     ),
     'primary key' => array('profile_id', 'width', 'height'),
     'unique keys' => array(
@@ -77,7 +85,7 @@ $schema['sms_carrier'] = array(
         'name' => array('type' => 'varchar', 'length' => 64, 'description' => 'name of the carrier'),
         'email_pattern' => array('type' => 'varchar', 'length' => 255, 'not null' => true, 'description' => 'sprintf pattern for making an email address from a phone number'),
         'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
-        'modified' => array('type' => 'timestamp', 'description' => 'date this record was modified'),
+        'modified' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was modified'),
     ),
     'primary key' => array('id'),
     'unique keys' => array(
@@ -115,7 +123,7 @@ $schema['user'] = array(
         'viewdesigns' => array('type' => 'int', 'size' => 'tiny', 'default' => 1, 'description' => 'whether to view user-provided designs'),
 
         'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
-        'modified' => array('type' => 'timestamp', 'description' => 'date this record was modified'),
+        'modified' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was modified'),
     ),
     'primary key' => array('id'),
     'unique keys' => array(
@@ -143,7 +151,7 @@ $schema['remote_profile'] = array(
         'postnoticeurl' => array('type' => 'varchar', 'length' => 255, 'description' => 'URL we use for posting notices'),
         'updateprofileurl' => array('type' => 'varchar', 'length' => 255, 'description' => 'URL we use for updates to this profile'),
         'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
-        'modified' => array('type' => 'timestamp', 'description' => 'date this record was modified'),
+        'modified' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was modified'),
     ),
     'primary key' => array('id'),
     'unique keys' => array(
@@ -163,7 +171,7 @@ $schema['subscription'] = array(
         'token' => array('type' => 'varchar', 'length' => 255, 'description' => 'authorization token'),
         'secret' => array('type' => 'varchar', 'length' => 255, 'description' => 'token secret'),
         'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
-        'modified' => array('type' => 'timestamp', 'description' => 'date this record was modified'),
+        'modified' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was modified'),
     ),
     'primary key' => array('subscriber', 'subscribed'),
     'indexes' => array(
@@ -182,7 +190,7 @@ $schema['notice'] = array(
         'rendered' => array('type' => 'text', 'description' => 'HTML version of the content'),
         'url' => array('type' => 'varchar', 'length' => 255, 'description' => 'URL of any attachment (image, video, bookmark, whatever)'),
         'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
-        'modified' => array('type' => 'datetime', 'not null' => true, 'default' => 'CURRENT_TIMESTAMP', 'description' => 'date this record was modified'),
+        'modified' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was modified'),
         'reply_to' => array('type' => 'int', 'description' => 'notice replied to (usually a guess)'),
         'is_local' => array('type' => 'int', 'size' => 'tiny', 'default' => 0, 'description' => 'notice was generated by a user'),
         'source' => array('type' => 'varchar', 'length' => 32, 'description' => 'source of comment, like "web", "im", or "clientname"'),
@@ -221,7 +229,7 @@ $schema['notice_source'] = array(
         'name' => array('type' => 'varchar', 'length' => 255, 'not null' => true, 'description' => 'name of the source'),
         'url' => array('type' => 'varchar', 'length' => 255, 'not null' => true, 'description' => 'url to link to'),
         'notice_id' => array('type' => 'int', 'not null' => true, 'description' => 'date this record was created'),
-        'modified' => array('type' => 'timestamp', 'description' => 'date this record was modified'),
+        'modified' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was modified'),
     ),
     'primary key' => array('code'),
 );
@@ -230,7 +238,7 @@ $schema['reply'] = array(
     'fields' => array(
         'notice_id' => array('type' => 'int', 'not null' => true, 'description' => 'notice that is the reply'),
         'profile_id' => array('type' => 'int', 'not null' => true, 'description' => 'profile replied to'),
-        'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
+        'modified' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was modified'),
         'replied_id' => array('type' => 'int', 'description' => 'notice replied to (not used, see notice.reply_to)'),
     ),
     'primary key' => array('notice_id', 'profile_id'),
@@ -249,7 +257,7 @@ $schema['fave'] = array(
     'fields' => array(
         'notice_id' => array('type' => 'int', 'not null' => true, 'description' => 'notice that is the favorite'),
         'user_id' => array('type' => 'int', 'not null' => true, 'description' => 'user who likes this notice'),
-        'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
+        'modified' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was modified'),
     ),
     'primary key' => array('notice_id', 'user_id'),
     'foreign keys' => array(
@@ -273,7 +281,7 @@ $schema['consumer'] = array(
         'seed' => array('type' => 'char', 'length' => 32, 'not null' => true, 'description' => 'seed for new tokens by this consumer'),
 
         'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
-        'modified' => array('type' => 'timestamp', 'description' => 'date this record was modified'),
+        'modified' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was modified'),
     ),
     'primary key' => array('consumer_key'),
 );
@@ -290,7 +298,7 @@ $schema['token'] = array(
         'verified_callback' => array('type' => 'varchar', 'length' => 255, 'description' => 'verified callback URL for OAuth 1.0a'),
 
         'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
-        'modified' => array('type' => 'timestamp', 'description' => 'date this record was modified'),
+        'modified' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was modified'),
     ),
     'primary key' => array('consumer_key', 'tok'),
     'foreign keys' => array(
@@ -307,7 +315,7 @@ $schema['nonce'] = array(
         'ts' => array('type' => 'datetime', 'not null' => true, 'description' => 'timestamp sent'),
 
         'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
-        'modified' => array('type' => 'timestamp', 'description' => 'date this record was modified'),
+        'modified' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was modified'),
     ),
     'primary key' => array('consumer_key', 'ts', 'nonce'),
 );
@@ -328,7 +336,7 @@ $schema['oauth_application'] = array(
         'type' => array('type' => 'int', 'size' => 'tiny', 'default' => 0, 'description' => 'type of app, 1 = browser, 2 = desktop'),
         'access_type' => array('type' => 'int', 'size' => 'tiny', 'default' => 0, 'description' => 'default access type, bit 1 = read, bit 2 = write'),
         'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
-        'modified' => array('type' => 'timestamp', 'description' => 'date this record was modified'),
+        'modified' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was modified'),
     ),
     'primary key' => array('id'),
     'unique keys' => array(
@@ -347,7 +355,7 @@ $schema['oauth_application_user'] = array(
         'access_type' => array('type' => 'int', 'size' => 'tiny', 'default' => 0, 'description' => 'access type, bit 1 = read, bit 2 = write'),
         'token' => array('type' => 'varchar', 'length' => 255, 'description' => 'request or access token'),
         'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
-        'modified' => array('type' => 'timestamp', 'description' => 'date this record was modified'),
+        'modified' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was modified'),
     ),
     'primary key' => array('profile_id', 'application_id'),
     'foreign keys' => array(
@@ -390,7 +398,7 @@ $schema['confirm_address'] = array(
         'address_type' => array('type' => 'varchar', 'length' => 8, 'not null' => true, 'description' => 'address type ("email", "xmpp", "sms")'),
         'claimed' => array('type' => 'datetime', 'description' => 'date this was claimed for queueing'),
         'sent' => array('type' => 'datetime', 'description' => 'date this was sent for queueing'),
-        'modified' => array('type' => 'timestamp', 'description' => 'date this record was modified'),
+        'modified' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was modified'),
     ),
     'primary key' => array('code'),
     'foreign keys' => array(
@@ -402,7 +410,7 @@ $schema['remember_me'] = array(
     'fields' => array(
         'code' => array('type' => 'varchar', 'length' => 32, 'not null' => true, 'description' => 'good random code'),
         'user_id' => array('type' => 'int', 'not null' => true, 'description' => 'user who is logged in'),
-        'modified' => array('type' => 'timestamp', 'description' => 'date this record was modified'),
+        'modified' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was modified'),
     ),
     'primary key' => array('code'),
     'foreign keys' => array(
@@ -449,7 +457,7 @@ $schema['foreign_service'] = array(
         'name' => array('type' => 'varchar', 'length' => 32, 'not null' => true, 'description' => 'name of the service'),
         'description' => array('type' => 'varchar', 'length' => 255, 'description' => 'description'),
         'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
-        'modified' => array('type' => 'timestamp', 'description' => 'date this record was modified'),
+        'modified' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was modified'),
     ),
     'primary key' => array('id'),
     'unique keys' => array(
@@ -464,7 +472,7 @@ $schema['foreign_user'] = array(
         'uri' => array('type' => 'varchar', 'length' => 255, 'not null' => true, 'description' => 'identifying URI'),
         'nickname' => array('type' => 'varchar', 'length' => 255, 'description' => 'nickname on foreign service'),
         'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
-        'modified' => array('type' => 'timestamp', 'description' => 'date this record was modified'),
+        'modified' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was modified'),
     ),
     'primary key' => array('id', 'service'),
     'foreign keys' => array(
@@ -488,7 +496,7 @@ $schema['foreign_link'] = array(
         'last_noticesync' => array('type' => 'datetime', 'description' => 'last time notices were imported'),
         'last_friendsync' => array('type' => 'datetime', 'description' => 'last time friends were imported'),
         'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
-        'modified' => array('type' => 'timestamp', 'description' => 'date this record was modified'),
+        'modified' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was modified'),
     ),
     'primary key' => array('user_id', 'foreign_id', 'service'),
     'foreign keys' => array(
@@ -548,7 +556,7 @@ $schema['message'] = array(
         'rendered' => array('type' => 'text', 'description' => 'HTML version of the content'),
         'url' => array('type' => 'varchar', 'length' => 255, 'description' => 'URL of any attachment (image, video, bookmark, whatever)'),
         'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
-        'modified' => array('type' => 'timestamp', 'description' => 'date this record was modified'),
+        'modified' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was modified'),
         'source' => array('type' => 'varchar', 'length' => 32, 'description' => 'source of comment, like "web", "im", or "clientname"'),
     ),
     'primary key' => array('id'),
@@ -591,7 +599,7 @@ $schema['profile_tag'] = array(
         'tagger' => array('type' => 'int', 'not null' => true, 'description' => 'user making the tag'),
         'tagged' => array('type' => 'int', 'not null' => true, 'description' => 'profile tagged'),
         'tag' => array('type' => 'varchar', 'length' => 64, 'not null' => true, 'description' => 'hash tag associated with this notice'),
-        'modified' => array('type' => 'timestamp', 'description' => 'date the tag was added'),
+        'modified' => array('type' => 'datetime', 'not null' => true, 'description' => 'date the tag was added'),
     ),
     'primary key' => array('tagger', 'tagged', 'tag'),
     'foreign keys' => array(
@@ -609,7 +617,7 @@ $schema['profile_block'] = array(
     'fields' => array(
         'blocker' => array('type' => 'int', 'not null' => true, 'description' => 'user making the block'),
         'blocked' => array('type' => 'int', 'not null' => true, 'description' => 'profile that is blocked'),
-        'modified' => array('type' => 'timestamp', 'description' => 'date of blocking'),
+        'modified' => array('type' => 'datetime', 'not null' => true, 'description' => 'date of blocking'),
     ),
     'foreign keys' => array(
         'profile_block_blocker_fkey' => array('user', array('blocker' => 'id')),
@@ -635,7 +643,7 @@ $schema['user_group'] = array(
         'design_id' => array('type' => 'int', 'description' => 'id of a design'),
 
         'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
-        'modified' => array('type' => 'timestamp', 'description' => 'date this record was modified'),
+        'modified' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was modified'),
 
         'uri' => array('type' => 'varchar', 'length' => 255, 'description' => 'universal identifier'),
         'mainpage' => array('type' => 'varchar', 'length' => 255, 'description' => 'page for group info to link to'),
@@ -659,7 +667,7 @@ $schema['group_member'] = array(
         'is_admin' => array('type' => 'int', 'size' => 'tiny', 'default' => 0, 'description' => 'is this user an admin?'),
 
         'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
-        'modified' => array('type' => 'timestamp', 'description' => 'date this record was modified'),
+        'modified' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was modified'),
     ),
     'primary key' => array('group_id', 'profile_id'),
     'foreign keys' => array(
@@ -717,7 +725,7 @@ $schema['file'] = array(
         'protected' => array('type' => 'int', 'description' => 'true when URL is private (needs login)'),
         'filename' => array('type' => 'varchar', 'length' => 255, 'description' => 'if a local file, name of the file'),
 
-        'modified' => array('type' => 'timestamp', 'description' => 'date this record was modified'),
+        'modified' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was modified'),
     ),
     'primary key' => array('id'),
     'unique keys' => array(
@@ -740,7 +748,7 @@ $schema['file_oembed'] = array(
         'author_name' => array('type' => 'varchar', 'length' => 50, 'description' => 'author name for this oEmbed resource'),
         'author_url' => array('type' => 'varchar', 'length' => 255, 'description' => 'author URL for this oEmbed resource'),
         'url' => array('type' => 'varchar', 'length' => 255, 'description' => 'URL for this oEmbed resource when applicable (photo, link)'),
-        'modified' => array('type' => 'timestamp', 'description' => 'date this record was modified'),
+        'modified' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was modified'),
     ),
     'primary key' => array('file_id'),
     'foreign keys' => array(
@@ -754,7 +762,7 @@ $schema['file_redirection'] = array(
         'file_id' => array('type' => 'int', 'description' => 'short URL for what URL/file'),
         'redirections' => array('type' => 'int', 'description' => 'redirect count'),
         'httpcode' => array('type' => 'int', 'description' => 'HTTP status code (20x, 30x, etc.)'),
-        'modified' => array('type' => 'timestamp', 'description' => 'date this record was modified'),
+        'modified' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was modified'),
     ),
     'primary key' => array('url'),
     'foreign keys' => array(
@@ -768,7 +776,7 @@ $schema['file_thumbnail'] = array(
         'url' => array('type' => 'varchar', 'length' => 255, 'description' => 'URL of thumbnail'),
         'width' => array('type' => 'int', 'description' => 'width of thumbnail'),
         'height' => array('type' => 'int', 'description' => 'height of thumbnail'),
-        'modified' => array('type' => 'timestamp', 'description' => 'date this record was modified'),
+        'modified' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was modified'),
     ),
     'primary key' => array('file_id'),
     'foreign keys' => array(
@@ -783,7 +791,7 @@ $schema['file_to_post'] = array(
     'fields' => array(
         'file_id' => array('type' => 'int', 'not null' => true, 'description' => 'id of URL/file'),
         'post_id' => array('type' => 'int', 'not null' => true, 'description' => 'id of the notice it belongs to'),
-        'modified' => array('type' => 'timestamp', 'description' => 'date this record was modified'),
+        'modified' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was modified'),
     ),
     'primary key' => array('file_id', 'post_id'),
     'foreign keys' => array(
@@ -814,7 +822,7 @@ $schema['group_block'] = array(
         'group_id' => array('type' => 'int', 'not null' => true, 'description' => 'group profile is blocked from'),
         'blocked' => array('type' => 'int', 'not null' => true, 'description' => 'profile that is blocked'),
         'blocker' => array('type' => 'int', 'not null' => true, 'description' => 'user making the block'),
-        'modified' => array('type' => 'timestamp', 'description' => 'date of blocking'),
+        'modified' => array('type' => 'datetime', 'not null' => true, 'description' => 'date of blocking'),
     ),
     'primary key' => array('group_id', 'blocked'),
     'foreign keys' => array(
@@ -828,7 +836,7 @@ $schema['group_alias'] = array(
     'fields' => array(
         'alias' => array('type' => 'varchar', 'length' => 64, 'not null' => true, 'description' => 'additional nickname for the group'),
         'group_id' => array('type' => 'int', 'not null' => true, 'description' => 'group profile is blocked from'),
-        'modified' => array('type' => 'timestamp', 'description' => 'date alias was created'),
+        'modified' => array('type' => 'datetime', 'not null' => true, 'description' => 'date alias was created'),
     ),
     'primary key' => array('alias'),
     'foreign keys' => array(
@@ -844,7 +852,7 @@ $schema['session'] = array(
         'id' => array('type' => 'varchar', 'length' => 32, 'not null' => true, 'description' => 'session ID'),
         'session_data' => array('type' => 'text', 'description' => 'session data'),
         'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
-        'modified' => array('type' => 'timestamp', 'description' => 'date this record was modified'),
+        'modified' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was modified'),
     ),
     'primary key' => array('id'),
     'indexes' => array(
@@ -895,7 +903,7 @@ $schema['location_namespace'] = array(
         'id' => array('type' => 'int', 'not null' => true, 'description' => 'identity for this namespace'),
         'description' => array('type' => 'varchar', 'length' => 255, 'description' => 'description of the namespace'),
         'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date the record was created'),
-        'modified' => array('type' => 'timestamp', 'description' => 'date this record was modified'),
+        'modified' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was modified'),
     ),
     'primary key' => array('id'),
 );
@@ -905,7 +913,7 @@ $schema['login_token'] = array(
         'user_id' => array('type' => 'int', 'not null' => true, 'description' => 'user owning this token'),
         'token' => array('type' => 'char', 'length' => 32, 'not null' => true, 'description' => 'token useable for logging in'),
         'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
-        'modified' => array('type' => 'timestamp', 'description' => 'date this record was modified'),
+        'modified' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was modified'),
     ),
     'primary key' => array('user_id'),
     'foreign keys' => array(
@@ -918,7 +926,7 @@ $schema['user_location_prefs'] = array(
         'user_id' => array('type' => 'int', 'not null' => true, 'description' => 'user who has the preference'),
         'share_location' => array('type' => 'int', 'size' => 'tiny', 'default' => 1, 'description' => 'Whether to share location data'),
         'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
-        'modified' => array('type' => 'timestamp', 'description' => 'date this record was modified'),
+        'modified' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was modified'),
     ),
     'primary key' => array('user_id'),
     'foreign keys' => array(
@@ -947,8 +955,8 @@ $schema['user_im_prefs'] = array(
         'replies' => array('type' => 'int', 'size' => 'tiny', 'not null' => true, 'default' => 0, 'description' => 'Send replies  from people not subscribed to'),
         'microid' => array('type' => 'int', 'size' => 'tiny', 'not null' => true, 'default' => 1, 'description' => 'Publish a MicroID'),
         'updatefrompresence' => array('type' => 'int', 'size' => 'tiny', 'not null' => true, 'default' => 0, 'description' => 'Send replies from people not subscribed to.'),
-        'created' => array('type' => 'timestamp', 'not null' => true, 'default' => 'CURRENT_TIMESTAMP', 'description' => 'date this record was created'), // @fixme will that default work?
-        'modified' => array('type' => 'timestamp', 'description' => 'date this record was modified'),
+        'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
+        'modified' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was modified'),
     ),
     'primary key' => array('user_id', 'transport'),
     'unique keys' => array(
@@ -964,7 +972,7 @@ $schema['conversation'] = array(
         'id' => array('type' => 'serial', 'not null' => true, 'description' => 'unique identifier'),
         'uri' => array('type' => 'varchar', 'length' => 225, 'description' => 'URI of the conversation'),
         'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
-        'modified' => array('type' => 'timestamp', 'description' => 'date this record was modified'),
+        'modified' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was modified'),
     ),
     'primary key' => array('id'),
     'unique keys' => array(
@@ -979,7 +987,7 @@ $schema['local_group'] = array(
         'nickname' => array('type' => 'varchar', 'length' => 64, 'description' => 'group represented'),
 
         'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
-        'modified' => array('type' => 'timestamp', 'description' => 'date this record was modified'),
+        'modified' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was modified'),
     ),
     'primary key' => array('group_id'),
     'foreign keys' => array(
@@ -998,7 +1006,7 @@ $schema['user_urlshortener_prefs'] = array(
         'maxnoticelength' => array('type' => 'int', 'not null' => true, 'description' => 'notices with content greater than this value will have all urls shortened, 0 = always, null = never'),
         
         'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
-        'modified' => array('type' => 'timestamp', 'description' => 'date this record was modified'),
+        'modified' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was modified'),
     ),
     'primary key' => array('user_id'),
     'foreign keys' => array(

From e44f1fe989f95e915229664891053bddb7aef356 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Mon, 18 Oct 2010 17:15:51 -0700
Subject: [PATCH 264/655] PG tweak

---
 lib/pgsqlschema.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/pgsqlschema.php b/lib/pgsqlschema.php
index ca1853494b..0ffbcfc480 100644
--- a/lib/pgsqlschema.php
+++ b/lib/pgsqlschema.php
@@ -83,11 +83,14 @@ class PgsqlSchema extends Schema
             $field = array();
 
             // ??
+            /*
             list($type, $size) = $this->reverseMapType($row['udt_name']);
             $field['type'] = $type;
             if ($size !== null) {
                 $field['size'] = $size;
             }
+             */
+            $field['type'] = $row['udt_name'];
 
             if ($type == 'char' || $type == 'varchar') {
                 if ($row['character_maximum_length'] !== null) {
@@ -365,7 +368,7 @@ class PgsqlSchema extends Schema
 
         if (!empty($column['size'])) {
             $size = $column['size'];
-            if ($type == 'integer' &&
+            if ($type == 'int' &&
                        in_array($size, array('small', 'big'))) {
                 $type = $size . 'int';
             }

From a923ef971912e7d095cd4cae335abb9095930ecb Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Mon, 18 Oct 2010 17:21:12 -0700
Subject: [PATCH 265/655] Drop reverseTypeMap from schemas; we're now doing the
 forward-mapping on the canonical def before comparing

---
 lib/mysqlschema.php | 38 --------------------------------------
 lib/pgsqlschema.php | 44 +++++++++-----------------------------------
 lib/schema.php      | 17 -----------------
 3 files changed, 9 insertions(+), 90 deletions(-)

diff --git a/lib/mysqlschema.php b/lib/mysqlschema.php
index 25f0e52f16..9785deb661 100644
--- a/lib/mysqlschema.php
+++ b/lib/mysqlschema.php
@@ -96,13 +96,6 @@ class MysqlSchema extends Schema
 
             // warning -- 'unsigned' attr on numbers isn't given in DATA_TYPE and friends.
             // It is stuck in on COLUMN_TYPE though (eg 'bigint(20) unsigned')
-            /*
-            list($type, $size) = $this->reverseMapType($row['DATA_TYPE']);
-            $field['type'] = $type;
-            if ($size !== null) {
-                $field['size'] = $size;
-            }
-             */
             $field['type'] = $type = $row['DATA_TYPE'];
 
             if ($type == 'char' || $type == 'varchar') {
@@ -487,37 +480,6 @@ class MysqlSchema extends Schema
         return $type;
     }
 
-    /**
-     * Map a MySQL native type back to an independent type + size
-     *
-     * @param string $type
-     * @return array ($type, $size) -- $size may be null
-     */
-    /*
-    protected function reverseMapType($type)
-    {
-        $type = strtolower($type);
-        $map = array(
-            'decimal' => array('numeric', null),
-            'tinyint' => array('int', 'tiny'),
-            'smallint' => array('int', 'small'),
-            'mediumint' => array('int', 'medium'),
-            'bigint' => array('int', 'big'),
-            'tinyblob' => array('blob', 'tiny'),
-            'mediumblob' => array('blob', 'medium'),
-            'longblob' => array('blob', 'long'),
-            'tinytext' => array('text', 'tiny'),
-            'mediumtext' => array('text', 'medium'),
-            'longtext' => array('text', 'long'),
-        );
-        if (isset($map[$type])) {
-            return $map[$type];
-        } else {
-            return array($type, null);
-        }
-    }
-     */
-
     function typeAndSize($column)
     {
         if ($column['type'] == 'enum') {
diff --git a/lib/pgsqlschema.php b/lib/pgsqlschema.php
index 0ffbcfc480..e5442467c4 100644
--- a/lib/pgsqlschema.php
+++ b/lib/pgsqlschema.php
@@ -81,15 +81,6 @@ class PgsqlSchema extends Schema
             $orderedFields[$row['ordinal_position']] = $name;
 
             $field = array();
-
-            // ??
-            /*
-            list($type, $size) = $this->reverseMapType($row['udt_name']);
-            $field['type'] = $type;
-            if ($size !== null) {
-                $field['size'] = $size;
-            }
-             */
             $field['type'] = $row['udt_name'];
 
             if ($type == 'char' || $type == 'varchar') {
@@ -366,12 +357,16 @@ class PgsqlSchema extends Schema
             $type = $map[$type];
         }
 
-        if (!empty($column['size'])) {
-            $size = $column['size'];
-            if ($type == 'int' &&
-                       in_array($size, array('small', 'big'))) {
-                $type = $size . 'int';
+        if ($type == 'int') {
+            if (!empty($column['size'])) {
+                $size = $column['size'];
+                if ($size == 'small') {
+                    return 'int2';
+                } else if ($size == 'big') {
+                    return 'int8';
+                }
             }
+            return 'int4';
         }
 
         return $type;
@@ -388,27 +383,6 @@ class PgsqlSchema extends Schema
         }
     }
 
-    /**
-     * Map a native type back to an independent type + size
-     *
-     * @param string $type
-     * @return array ($type, $size) -- $size may be null
-     */
-    protected function reverseMapType($type)
-    {
-        $type = strtolower($type);
-        $map = array(
-            'int4' => array('int', null),
-            'int8' => array('int', 'big'),
-            'bytea' => array('blob', null),
-        );
-        if (isset($map[$type])) {
-            return $map[$type];
-        } else {
-            return array($type, null);
-        }
-    }
-
     /**
      * Filter the given table definition array to match features available
      * in this database.
diff --git a/lib/schema.php b/lib/schema.php
index 16fb502253..9f2899ba8c 100644
--- a/lib/schema.php
+++ b/lib/schema.php
@@ -772,23 +772,6 @@ class Schema
         }
     }
 
-    /**
-     * Map a native type back to an independent type + size
-     *
-     * @param string $type
-     * @return array ($type, $size) -- $size may be null
-     */
-    protected function reverseMapType($type)
-    {
-        $sizes = array('tiny', 'small', 'medium', 'big');
-        foreach ($sizes as $prefix) {
-            if (substr($type, 0, strlen($prefix)) == $prefix) {
-                return array(substr($type, strlen($prefix)), $prefix);
-            }
-        }
-        return array($type, null);
-    }
-
     /**
      * Convert an old-style set of ColumnDef objects into the current
      * Drupal-style schema definition array, for backwards compatibility

From 4aa6c4e49f9c4a41fa72d841370886a8f49c06f4 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Mon, 18 Oct 2010 17:44:41 -0700
Subject: [PATCH 266/655] MySQL schema: fix dropping unique indexes, add
 support for changing table properties back from old code.

---
 lib/mysqlschema.php | 154 ++++++--------------------------------------
 lib/schema.php      |  18 ++++--
 2 files changed, 32 insertions(+), 140 deletions(-)

diff --git a/lib/mysqlschema.php b/lib/mysqlschema.php
index 9785deb661..b21008518b 100644
--- a/lib/mysqlschema.php
+++ b/lib/mysqlschema.php
@@ -245,6 +245,9 @@ class MysqlSchema extends Schema
      * @param string $name
      * @param array $def
      * @return string;
+     *
+     * @fixme ENGINE may need to be set differently in some cases,
+     * such as to support fulltext index.
      */
     function endCreateTable($name, array $def)
     {
@@ -267,153 +270,36 @@ class MysqlSchema extends Schema
         return "{$tableName}_{$columnName}_idx";
     }
 
+
     /**
-     * Ensures that a table exists with the given
-     * name and the given column definitions.
+     * MySQL doesn't take 'DROP CONSTRAINT', need to treat unique keys as
+     * if they were indexes here.
      *
-     * If the table does not yet exist, it will
-     * create the table. If it does exist, it will
-     * alter the table to match the column definitions.
-     *
-     * @param string $tableName name of the table
-     * @param array  $columns   array of ColumnDef
-     *                          objects for the table
-     *
-     * @return boolean success flag
+     * @param array $phrase
+     * @param <type> $keyName MySQL
      */
-
-    public function oldensureTable($tableName, $columns)
+    function appendAlterDropUnique(array &$phrase, $keyName)
     {
-        // XXX: DB engine portability -> toilet
-
-        try {
-            $td = $this->getTableDef($tableName);
-        } catch (SchemaTableMissingException $e) {
-            return $this->createTable($tableName, $columns);
-        }
-
-        $cur = $this->_names($td->columns);
-        $new = $this->_names($columns);
-
-        $dropIndex  = array();
-        $toadd      = array_diff($new, $cur);
-        $todrop     = array_diff($cur, $new);
-        $same       = array_intersect($new, $cur);
-        $tomod      = array();
-        $addIndex   = array();
-        $tableProps = array();
-
-        foreach ($same as $m) {
-            $curCol = $this->_byName($td->columns, $m);
-            $newCol = $this->_byName($columns, $m);
-
-            if (!$newCol->equals($curCol)) {
-                $tomod[] = $newCol->name;
-                continue;
-            }
-
-            // Earlier versions may have accidentally left tables at default
-            // charsets which might be latin1 or other freakish things.
-            if ($this->_isString($curCol)) {
-                if ($curCol->charset != 'utf8') {
-                    $tomod[] = $newCol->name;
-                    continue;
-                }
-            }
-        }
-
-        // Find any indices we have to change...
-        $curIdx = $this->_indexList($td->columns);
-        $newIdx = $this->_indexList($columns);
-
-        if ($curIdx['primary'] != $newIdx['primary']) {
-            if ($curIdx['primary']) {
-                $dropIndex[] = 'drop primary key';
-            }
-            if ($newIdx['primary']) {
-                $keys = implode(',', $newIdx['primary']);
-                $addIndex[] = "add constraint primary key ($keys)";
-            }
-        }
-
-        $dropUnique = array_diff($curIdx['uniques'], $newIdx['uniques']);
-        $addUnique = array_diff($newIdx['uniques'], $curIdx['uniques']);
-        foreach ($dropUnique as $columnName) {
-            $dropIndex[] = 'drop key ' . $this->_uniqueKey($tableName, $columnName);
-        }
-        foreach ($addUnique as $columnName) {
-            $addIndex[] = 'add constraint unique key ' . $this->_uniqueKey($tableName, $columnName) . " ($columnName)";;
-        }
-
-        $dropMultiple = array_diff($curIdx['indices'], $newIdx['indices']);
-        $addMultiple = array_diff($newIdx['indices'], $curIdx['indices']);
-        foreach ($dropMultiple as $columnName) {
-            $dropIndex[] = 'drop key ' . $this->_key($tableName, $columnName);
-        }
-        foreach ($addMultiple as $columnName) {
-            $addIndex[] = 'add key ' . $this->_key($tableName, $columnName) . " ($columnName)";
-        }
+        $phrase[] = 'DROP INDEX ' . $keyName;
+    }
 
+    /**
+     * Throw some table metadata onto the ALTER TABLE if we have a mismatch
+     * in expected type, collation.
+     */
+    function appendAlterExtras(array &$phrase, $tableName)
+    {
         // Check for table properties: make sure we're using a sane
         // engine type and charset/collation.
         // @fixme make the default engine configurable?
         $oldProps = $this->getTableProperties($tableName, array('ENGINE', 'TABLE_COLLATION'));
         if (strtolower($oldProps['ENGINE']) != 'innodb') {
-            $tableProps['ENGINE'] = 'InnoDB';
+            $phrase[] = 'ENGINE=InnoDB';
         }
         if (strtolower($oldProps['TABLE_COLLATION']) != 'utf8_bin') {
-            $tableProps['DEFAULT CHARSET'] = 'utf8';
-            $tableProps['COLLATE'] = 'utf8_bin';
+            $phrase[] = 'DEFAULT CHARSET=utf8';
+            $phrase[] = 'COLLATE=utf8_bin';
         }
-
-        if (count($dropIndex) + count($toadd) + count($todrop) + count($tomod) + count($addIndex) + count($tableProps) == 0) {
-            // nothing to do
-            return true;
-        }
-
-        // For efficiency, we want this all in one
-        // query, instead of using our methods.
-
-        $phrase = array();
-
-        foreach ($dropIndex as $indexSql) {
-            $phrase[] = $indexSql;
-        }
-
-        foreach ($toadd as $columnName) {
-            $cd = $this->_byName($columns, $columnName);
-
-            $phrase[] = 'ADD COLUMN ' . $this->_columnSql($cd);
-        }
-
-        foreach ($todrop as $columnName) {
-            $phrase[] = 'DROP COLUMN ' . $columnName;
-        }
-
-        foreach ($tomod as $columnName) {
-            $cd = $this->_byName($columns, $columnName);
-
-            $phrase[] = 'MODIFY COLUMN ' . $this->_columnSql($cd);
-        }
-
-        foreach ($addIndex as $indexSql) {
-            $phrase[] = $indexSql;
-        }
-
-        foreach ($tableProps as $key => $val) {
-            $phrase[] = "$key=$val";
-        }
-
-        $sql = 'ALTER TABLE ' . $tableName . ' ' . implode(', ', $phrase);
-
-        common_log(LOG_DEBUG, __METHOD__ . ': ' . $sql);
-        $res = $this->conn->query($sql);
-
-        if (PEAR::isError($res)) {
-            throw new Exception($res->getMessage());
-        }
-
-        return true;
     }
 
     /**
diff --git a/lib/schema.php b/lib/schema.php
index 9f2899ba8c..4feb11a879 100644
--- a/lib/schema.php
+++ b/lib/schema.php
@@ -493,12 +493,6 @@ class Schema
         $uniques = $this->diffArrays($old, $def, 'unique keys');
         $indexes = $this->diffArrays($old, $def, 'indexes');
 
-        $total = $fields['count'] + $uniques['count'] + $indexes['count'];
-        if ($total == 0) {
-            // nothing to do
-            return array();
-        }
-
         // For efficiency, we want this all in one
         // query, instead of using our methods.
 
@@ -527,6 +521,13 @@ class Schema
             $this->appendAlterAddUnique($phrase, $keyName, $def['unique keys'][$keyName]);
         }
 
+        $this->appendAlterExtras($phrase, $tableName);
+
+        if (count($phrase) == 0) {
+            // nothing to do
+            return array();
+        }
+
         $sql = 'ALTER TABLE ' . $tableName . ' ' . implode(",\n", $phrase);
 
         return array($sql);
@@ -625,6 +626,11 @@ class Schema
         $phrase[] = 'DROP CONSTRAINT ' . $keyName;
     }
 
+    function appendAlterExtras(array &$phrase, $tableName)
+    {
+        // no-op
+    }
+
     /**
      * Quote a db/table/column identifier if necessary.
      *

From a053871ddc6c2e9d395efa928d0546efffd52856 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Mon, 18 Oct 2010 17:49:08 -0700
Subject: [PATCH 267/655] update -> create on dumpschema options, easier for me
 to remember

---
 scripts/dumpschema.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/dumpschema.php b/scripts/dumpschema.php
index c1b0ff4e06..613364487a 100644
--- a/scripts/dumpschema.php
+++ b/scripts/dumpschema.php
@@ -26,13 +26,13 @@ Attempt to pull a schema definition for a given table.
   --all     run over all defined core tables
   --diff    show differences between the expected and live table defs
   --raw     skip compatibility filtering for diffs
-  --update  dump SQL that would be run to update or create this table
+  --create  dump SQL that would be run to update or create this table
   --build   dump SQL that would be run to create this table fresh
 
 
 END_OF_CHECKSCHEMA_HELP;
 
-$longoptions = array('diff', 'all', 'build', 'update', 'raw');
+$longoptions = array('diff', 'all', 'create', 'update', 'raw');
 require_once INSTALLDIR.'/scripts/commandline.inc';
 
 function indentOptions($indent)
@@ -215,7 +215,7 @@ if (count($args)) {
     foreach ($args as $tableName) {
         if (have_option('diff')) {
             dumpDiff($tableName, !have_option('raw'));
-        } else if (have_option('build')) {
+        } else if (have_option('create')) {
             dumpBuildTable($tableName);
         } else if (have_option('update')) {
             dumpEnsureTable($tableName);

From ebe9972df6c0e20df9ff5d2a6439da1d16c28965 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Mon, 18 Oct 2010 18:07:25 -0700
Subject: [PATCH 268/655] tweak unique constraint setup

---
 lib/schema.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/schema.php b/lib/schema.php
index 4feb11a879..391f0f1fdf 100644
--- a/lib/schema.php
+++ b/lib/schema.php
@@ -234,7 +234,7 @@ class Schema
      */
     function appendUniqueKeyDef(array &$sql, $name, array $def)
     {
-        $sql[] = "UNIQUE $name " . $this->buildIndexList($def);
+        $sql[] = "CONSTRAINT $name UNIQUE " . $this->buildIndexList($def);
     }
 
     /**
@@ -618,7 +618,7 @@ class Schema
         $sql = array();
         $sql[] = 'ADD';
         $this->appendUniqueKeyDef($sql, $keyName, $def);
-        $phrase[] = implode(' ', $sql);'ADD CONSTRAINT ' . $keyName;
+        $phrase[] = implode(' ', $sql);
     }
 
     function appendAlterDropUnique(array &$phrase, $keyName)

From b865ded7ffca54534dac858f20eada3882af9d04 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Mon, 18 Oct 2010 18:15:58 -0700
Subject: [PATCH 269/655] Quoting fixes for postgres

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

diff --git a/lib/pgsqlschema.php b/lib/pgsqlschema.php
index e5442467c4..aa7f6733b0 100644
--- a/lib/pgsqlschema.php
+++ b/lib/pgsqlschema.php
@@ -342,7 +342,7 @@ class PgsqlSchema extends Schema
      */
     function quoteIdentifier($name)
     {
-        return '"' . $name . '"';
+        return $this->conn->quoteIdentifier($name);
     }
 
     function mapType($column)

From d3f8a880a91c134ae2aefc18efc47923bccf3fd2 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Mon, 18 Oct 2010 18:16:07 -0700
Subject: [PATCH 270/655] Fix misnamed unique constraint

---
 db/core.php    | 2 +-
 lib/schema.php | 6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/db/core.php b/db/core.php
index 32f29c7151..3fcc9b8fa1 100644
--- a/db/core.php
+++ b/db/core.php
@@ -650,7 +650,7 @@ $schema['user_group'] = array(
     ),
     'primary key' => array('id'),
     'unique keys' => array(
-        'user_uri_key' => array('uri'),
+        'user_group_uri_key' => array('uri'),
     ),
     'foreign keys' => array(
         'user_group_design_id_fkey' => array('design', array('design_id' => 'id')),
diff --git a/lib/schema.php b/lib/schema.php
index 391f0f1fdf..6e9643b677 100644
--- a/lib/schema.php
+++ b/lib/schema.php
@@ -653,11 +653,7 @@ class Schema
 
     function quoteValue($val)
     {
-        if (is_int($val) || is_float($val) || is_double($val)) {
-            return strval($val);
-        } else {
-            return '"' . $this->conn->escapeSimple($val) . '"';
-        }
+        return $this->conn->quoteSmart($val);
     }
 
     /**

From 53cf39c97a712c9b0a890d60e3291f1e98f17b92 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Mon, 18 Oct 2010 18:26:11 -0700
Subject: [PATCH 271/655] strip column prefix lengths from key defs on pg

---
 lib/pgsqlschema.php | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/lib/pgsqlschema.php b/lib/pgsqlschema.php
index aa7f6733b0..599f7ffca2 100644
--- a/lib/pgsqlschema.php
+++ b/lib/pgsqlschema.php
@@ -409,7 +409,33 @@ class PgsqlSchema extends Schema
             $col['type'] = $this->mapType($col);
             unset($col['size']);
         }
+        if (!empty($tableDef['primary key'])) {
+            $tableDef['primary key'] = $this->filterKeyDef($tableDef['primary key']);
+        }
+        if (!empty($tableDef['unique keys'])) {
+            foreach ($tableDef['unique keys'] as $i => $def) {
+                $tableDef['unique keys'][$i] = $this->filterKeyDef($def);
+            }
+        }
         return $tableDef;
     }
 
+    /**
+     * Filter the given key/index definition to match features available
+     * in this database.
+     *
+     * @param array $def
+     * @return array
+     */
+    function filterKeyDef(array $def)
+    {
+        // PostgreSQL doesn't like prefix lengths specified on keys...?
+        foreach ($def as $i => $item)
+        {
+            if (is_array($item)) {
+                $def[$i] = $item[0];
+            }
+        }
+        return $def;
+    }
 }

From b635c75639f5119d89a7f228155466a80d7ba185 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Tue, 19 Oct 2010 11:24:33 -0700
Subject: [PATCH 272/655] Fix unique & foreign constraints on foreign_* tables.
 Reference info copied from old schema wasn't correctly taking into account
 that (id, service) must be treated together as a unit to identify a
 foreign_user uniquely.

---
 db/core.php | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/db/core.php b/db/core.php
index 3fcc9b8fa1..9be793ffb8 100644
--- a/db/core.php
+++ b/db/core.php
@@ -479,7 +479,6 @@ $schema['foreign_user'] = array(
         'foreign_user_service_fkey' => array('foreign_service', array('service' => 'id')),
     ),
     'unique keys' => array(
-        'foreign_user_id_key' => array('id'),
         'foreign_user_uri_key' => array('uri'),
     ),
 );
@@ -501,7 +500,7 @@ $schema['foreign_link'] = array(
     'primary key' => array('user_id', 'foreign_id', 'service'),
     'foreign keys' => array(
         'foreign_link_user_id_fkey' => array('user', array('user_id' => 'id')),
-        'foreign_link_foreign_id_fkey' => array('foreign_user', array('foreign_id' => 'id')),
+        'foreign_link_foreign_id_fkey' => array('foreign_user', array('foreign_id' => 'id', 'service' => 'service')),
         'foreign_link_service_fkey' => array('foreign_service', array('service' => 'id')),
     ),
     'indexes' => array(
@@ -519,12 +518,12 @@ $schema['foreign_subscription'] = array(
     'primary key' => array('service', 'subscriber', 'subscribed'),
     'foreign keys' => array(
         'foreign_subscription_service_fkey' => array('foreign_service', array('service' => 'id')),
-        'foreign_subscription_subscriber_fkey' => array('foreign_user', array('subscriber' => 'id')),
-        'foreign_subscription_subscribed_fkey' => array('foreign_user', array('subscribed' => 'id')),
+        'foreign_subscription_subscriber_fkey' => array('foreign_user', array('subscriber' => 'id', 'service' => 'service')),
+        'foreign_subscription_subscribed_fkey' => array('foreign_user', array('subscribed' => 'id', 'service' => 'service')),
     ),
     'indexes' => array(
-        'foreign_subscription_subscriber_idx' => array('subscriber'),
-        'foreign_subscription_subscribed_idx' => array('subscribed'),
+        'foreign_subscription_subscriber_idx' => array('service', 'subscriber'),
+        'foreign_subscription_subscribed_idx' => array('service', 'subscribed'),
     ),
 );
 

From 7751d455de464f29988de6c5a3128f9ca8357403 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Tue, 19 Oct 2010 12:08:59 -0700
Subject: [PATCH 273/655] Initial foreign key setup support

---
 db/core.php    |  4 +--
 lib/schema.php | 93 ++++++++++++++++++++++++++++++++++++++++++++------
 2 files changed, 84 insertions(+), 13 deletions(-)

diff --git a/db/core.php b/db/core.php
index 9be793ffb8..ebf873504f 100644
--- a/db/core.php
+++ b/db/core.php
@@ -511,8 +511,8 @@ $schema['foreign_link'] = array(
 $schema['foreign_subscription'] = array(
     'fields' => array(
         'service' => array('type' => 'int', 'not null' => true, 'description' => 'service where relationship happens'),
-        'subscriber' => array('type' => 'int', 'not null' => true, 'description' => 'subscriber on foreign service'),
-        'subscribed' => array('type' => 'int', 'not null' => true, 'description' => 'subscribed user'),
+        'subscriber' => array('type' => 'int', 'size' => 'big', 'not null' => true, 'description' => 'subscriber on foreign service'),
+        'subscribed' => array('type' => 'int', 'size' => 'big', 'not null' => true, 'description' => 'subscribed user'),
         'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
     ),
     'primary key' => array('service', 'subscriber', 'subscribed'),
diff --git a/lib/schema.php b/lib/schema.php
index 6e9643b677..c32e6b5230 100644
--- a/lib/schema.php
+++ b/lib/schema.php
@@ -149,7 +149,7 @@ class Schema
             $this->appendColumnDef($sql, $col, $colDef);
         }
 
-        // Primary and unique keys are constraints, so go within
+        // Primary, unique, and foreign keys are constraints, so go within
         // the CREATE TABLE statement normally.
         if (!empty($def['primary key'])) {
             $this->appendPrimaryKeyDef($sql, $def['primary key']);
@@ -161,6 +161,12 @@ class Schema
             }
         }
 
+        if (!empty($def['foreign keys'])) {
+            foreach ($def['foreign keys'] as $keyName => $keyDef) {
+                $this->appendForeignKeyDef($sql, $keyName, $keyDef);
+            }
+        }
+
         // Multi-value indexes are advisory and for best portability
         // should be created as separate statements.
         $statements = array();
@@ -225,7 +231,7 @@ class Schema
     }
 
     /**
-     * Append an SQL fragment with a constraint definition for a primary
+     * Append an SQL fragment with a constraint definition for a unique
      * key in a CREATE TABLE statement.
      *
      * @param array $sql
@@ -237,6 +243,27 @@ class Schema
         $sql[] = "CONSTRAINT $name UNIQUE " . $this->buildIndexList($def);
     }
 
+    /**
+     * Append an SQL fragment with a constraint definition for a foreign
+     * key in a CREATE TABLE statement.
+     *
+     * @param array $sql
+     * @param string $name
+     * @param array $def
+     */
+    function appendForeignKeyDef(array &$sql, $name, array $def)
+    {
+        list($refTable, $map) = $def;
+        $srcCols = array_keys($map);
+        $refCols = array_values($map);
+        $sql[] = "CONSTRAINT $name FOREIGN KEY " .
+                 $this->buildIndexList($srcCols) .
+                 " REFERENCES " .
+                 $this->quoteIdentifier($refTable) .
+                 " " .
+                 $this->buildIndexList($refCols);
+    }
+
     /**
      * Append an SQL statement with an index definition for an advisory
      * index over one or more columns on a table.
@@ -251,6 +278,19 @@ class Schema
         $statements[] = "CREATE INDEX $name ON $table " . $this->buildIndexList($def);
     }
 
+    /**
+     * Append an SQL statement to drop an index from a table.
+     *
+     * @param array $statements
+     * @param string $table
+     * @param string $name
+     * @param array $def
+     */
+    function appendDropIndex(array &$statements, $table, $name)
+    {
+        $statements[] = "DROP INDEX $name ON " . $this->quoteIdentifier($table);
+    }
+
     function buildIndexList(array $def)
     {
         // @fixme
@@ -485,19 +525,30 @@ class Schema
             return $this->buildCreateTable($tableName, $def);
         }
 
-        //$old = $this->filterDef($old);
+        // Filter the DB-independent table definition to match the current
+        // database engine's features and limitations.
         $def = $this->filterDef($def);
 
-        // @fixme check if not present
+        $statements = array();
         $fields = $this->diffArrays($old, $def, 'fields', array($this, 'columnsEqual'));
         $uniques = $this->diffArrays($old, $def, 'unique keys');
         $indexes = $this->diffArrays($old, $def, 'indexes');
+        $foreign = $this->diffArrays($old, $def, 'foreign keys');
+
+        // Drop any obsolete or modified indexes ahead...
+        foreach ($indexes['del'] + $indexes['mod'] as $indexName) {
+            $this->appendDropIndex($statements, $tableName, $indexName);
+        }
 
         // For efficiency, we want this all in one
         // query, instead of using our methods.
 
         $phrase = array();
 
+        foreach ($foreign['del'] + $foreign['mod'] as $keyName) {
+            $this->appendAlterDropForeign($phrase, $keyName);
+        }
+
         foreach ($uniques['del'] + $uniques['mod'] as $keyName) {
             $this->appendAlterDropUnique($phrase, $keyName);
         }
@@ -521,16 +572,23 @@ class Schema
             $this->appendAlterAddUnique($phrase, $keyName, $def['unique keys'][$keyName]);
         }
 
-        $this->appendAlterExtras($phrase, $tableName);
-
-        if (count($phrase) == 0) {
-            // nothing to do
-            return array();
+        foreach ($foreign['mod'] + $foreign['add'] as $keyName) {
+            $this->appendAlterAddForeign($phrase, $keyName, $def['foreign keys'][$keyName]);
         }
 
-        $sql = 'ALTER TABLE ' . $tableName . ' ' . implode(",\n", $phrase);
+        $this->appendAlterExtras($phrase, $tableName);
 
-        return array($sql);
+        if (count($phrase) > 0) {
+            $sql = 'ALTER TABLE ' . $tableName . ' ' . implode(",\n", $phrase);
+            $statements[] = $sql;
+        }
+
+        // Now create any indexes...
+        foreach ($indexes['mod'] + $indexes['add'] as $indexName) {
+            $this->appendCreateIndex($statements, $tableName, $indexName, $def['indexes'][$indexName]);
+        }
+
+        return $statements;
     }
 
     function diffArrays($oldDef, $newDef, $section, $compareCallback=null)
@@ -621,11 +679,24 @@ class Schema
         $phrase[] = implode(' ', $sql);
     }
 
+    function appendAlterAddForeign(array &$phrase, $keyName, array $def)
+    {
+        $sql = array();
+        $sql[] = 'ADD';
+        $this->appendForeignKeyDef($sql, $keyName, $def);
+        $phrase[] = implode(' ', $sql);
+    }
+
     function appendAlterDropUnique(array &$phrase, $keyName)
     {
         $phrase[] = 'DROP CONSTRAINT ' . $keyName;
     }
 
+    function appendAlterDropForeign(array &$phrase, $keyName)
+    {
+        $phrase[] = 'DROP FOREIGN KEY ' . $keyName;
+    }
+
     function appendAlterExtras(array &$phrase, $tableName)
     {
         // no-op

From e07254d15b96e6c312543a15725bef4de1c2d8f2 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Tue, 19 Oct 2010 12:11:49 -0700
Subject: [PATCH 274/655] $config['db']['mysql_foreign_keys'] option to
 experimentally enable foreign keys on MySQL. (Would only work on InnoDB
 tables, may explode, etc)

---
 lib/default.php     | 3 ++-
 lib/mysqlschema.php | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/lib/default.php b/lib/default.php
index a1dac7b5e1..26b872da4b 100644
--- a/lib/default.php
+++ b/lib/default.php
@@ -75,7 +75,8 @@ $default =
               'schemacheck' => 'runtime', // 'runtime' or 'script'
               'annotate_queries' => false, // true to add caller comments to queries, eg /* POST Notice::saveNew */
               'log_queries' => false, // true to log all DB queries
-              'log_slow_queries' => 0), // if set, log queries taking over N seconds
+              'log_slow_queries' => 0, // if set, log queries taking over N seconds
+              'mysql_foreign_keys' => false), // if set, enables experimental foreign key support on MySQL
         'syslog' =>
         array('appname' => 'statusnet', # for syslog
               'priority' => 'debug', # XXX: currently ignored
diff --git a/lib/mysqlschema.php b/lib/mysqlschema.php
index b21008518b..937c20ea8b 100644
--- a/lib/mysqlschema.php
+++ b/lib/mysqlschema.php
@@ -400,8 +400,9 @@ class MysqlSchema extends Schema
             $col['type'] = $this->mapType($col);
             unset($col['size']);
         }
-        // @fixme add foreign-key support for MySQL
-        unset($tableDef['foreign keys']);
+        if (!common_config('db', 'mysql_foreign_keys')) {
+            unset($tableDef['foreign keys']);
+        }
         return $tableDef;
     }
 }

From aeb1c23a2f2ad276e1051b81ae2b5c844e86c322 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Tue, 19 Oct 2010 12:23:49 -0700
Subject: [PATCH 275/655] fix index drop on pg

---
 lib/pgsqlschema.php | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/lib/pgsqlschema.php b/lib/pgsqlschema.php
index 599f7ffca2..d50e35f660 100644
--- a/lib/pgsqlschema.php
+++ b/lib/pgsqlschema.php
@@ -334,6 +334,20 @@ class PgsqlSchema extends Schema
         }
     }
 
+    /**
+     * Append an SQL statement to drop an index from a table.
+     * Note that in PostgreSQL, index names are DB-unique.
+     *
+     * @param array $statements
+     * @param string $table
+     * @param string $name
+     * @param array $def
+     */
+    function appendDropIndex(array &$statements, $table, $name)
+    {
+        $statements[] = "DROP INDEX $name";
+    }
+
     /**
      * Quote a db/table/column identifier if necessary.
      *

From 4f7eae8702be28a081db05feb26366a1f83bfd90 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Tue, 19 Oct 2010 15:37:17 -0700
Subject: [PATCH 276/655] Add stub schema_version table

---
 classes/Schema_version.php | 22 ++++++++++++++++++++++
 classes/statusnet.ini      |  8 ++++++++
 db/core.php                | 10 ++++++++++
 3 files changed, 40 insertions(+)
 create mode 100644 classes/Schema_version.php

diff --git a/classes/Schema_version.php b/classes/Schema_version.php
new file mode 100644
index 0000000000..6b464c6d1d
--- /dev/null
+++ b/classes/Schema_version.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Table Definition for schema_version
+ */
+
+class Schema_version extends Memcached_DataObject
+{
+    ###START_AUTOCODE
+    /* the code below is auto generated do not remove the above tag */
+
+    public $__table = 'schema_version';      // table name
+    public $table_name;                      // varchar(64)  primary_key not_null
+    public $checksum;                        // varchar(64)  not_null
+    public $modified;                        // datetime()   not_null
+
+    /* Static get */
+    function staticGet($k,$v=null)
+    { return Memcached_DataObject::staticGet('Schema_version',$k,$v); }
+
+    /* the code above is auto generated do not remove the tag below */
+    ###END_AUTOCODE
+}
diff --git a/classes/statusnet.ini b/classes/statusnet.ini
index b57d862263..920e0157db 100644
--- a/classes/statusnet.ini
+++ b/classes/statusnet.ini
@@ -497,6 +497,14 @@ replied_id = 1
 notice_id = K
 profile_id = K
 
+[schema_version]
+table_name = 130
+checksum = 130
+modified = 384
+
+[schema_version__keys]
+table_name = K
+
 [session]
 id = 130
 session_data = 34
diff --git a/db/core.php b/db/core.php
index ebf873504f..eb90ca85fd 100644
--- a/db/core.php
+++ b/db/core.php
@@ -1012,3 +1012,13 @@ $schema['user_urlshortener_prefs'] = array(
         'user_urlshortener_prefs_user_id_fkey' => array('user', array('user_id' => 'id')),
     ),
 );
+
+$schema['schema_version'] = array(
+    'description' => 'To avoid checking database structure all the time, we store a checksum of the expected schema info for each table here. If it has not changed since the last time we checked the table, we can leave it as is.',
+    'fields' => array(
+        'table_name' => array('type' => 'varchar', 'length' => '64', 'not null' => true, 'description' => 'Table name'),
+        'checksum' => array('type' => 'varchar', 'length' => '64', 'not null' => true, 'description' => 'Checksum of schema array; a mismatch indicates we should check the table more thoroughly.'),
+        'modified' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was modified'),
+    ),
+    'primary key' => array('table_name'),
+);

From 8b0ba03a2e924fc56440719af1d7564e562ba9c9 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Tue, 19 Oct 2010 17:07:37 -0700
Subject: [PATCH 277/655] Starting to encapsulate some of the schema_version
 checksum / updater logic

---
 lib/schema.php         |  34 ++++++++++--
 lib/schemaupdater.php  | 117 +++++++++++++++++++++++++++++++++++++++++
 scripts/dumpschema.php |  23 +++++++-
 3 files changed, 169 insertions(+), 5 deletions(-)
 create mode 100644 lib/schemaupdater.php

diff --git a/lib/schema.php b/lib/schema.php
index c32e6b5230..20bd95f28a 100644
--- a/lib/schema.php
+++ b/lib/schema.php
@@ -142,6 +142,7 @@ class Schema
      */
     public function buildCreateTable($name, $def)
     {
+        $def = $this->validateDef($name, $def);
         $def = $this->filterDef($def);
         $sql = array();
 
@@ -517,7 +518,7 @@ class Schema
      * @return array of SQL statements
      */
 
-    function buildEnsureTable($tableName, $def)
+    function buildEnsureTable($tableName, array $def)
     {
         try {
             $old = $this->getTableDef($tableName);
@@ -527,6 +528,7 @@ class Schema
 
         // Filter the DB-independent table definition to match the current
         // database engine's features and limitations.
+        $def = $this->validateDef($tableName, $def);
         $def = $this->filterDef($def);
 
         $statements = array();
@@ -851,10 +853,10 @@ class Schema
      * with plugins written for 0.9.x.
      *
      * @param string $tableName
-     * @param array $defs
+     * @param array $defs: array of ColumnDef objects
      * @return array
      */
-    function oldToNew($tableName, $defs)
+    protected function oldToNew($tableName, array $defs)
     {
         $table = array();
         $prefixes = array(
@@ -864,7 +866,6 @@ class Schema
             'big',
         );
         foreach ($defs as $cd) {
-            $cd->addToTableDef($table);
             $column = array();
             $column['type'] = $cd->type;
             foreach ($prefixes as $prefix) {
@@ -928,6 +929,31 @@ class Schema
         return $tableDef;
     }
 
+    /**
+     * Validate a table definition array, checking for basic structure.
+     *
+     * If necessary, converts from an old-style array of ColumnDef objects.
+     *
+     * @param string $tableName
+     * @param array $def: table definition array
+     * @return array validated table definition array
+     *
+     * @throws Exception on wildly invalid input
+     */
+    function validateDef($tableName, array $def)
+    {
+        if (count($defs) && $defs[0] instanceof ColumnDef) {
+            $def = $this->oldToNew($tableName, $defs);
+        }
+
+        // A few quick checks :D
+        if (!isset($def['fields'])) {
+            throw new Exceptioni("Invalid table definition for $tableName: no fields.");
+        }
+
+        return $def;
+    }
+
     function isNumericType($type)
     {
         $type = strtolower($type);
diff --git a/lib/schemaupdater.php b/lib/schemaupdater.php
new file mode 100644
index 0000000000..b872b0d578
--- /dev/null
+++ b/lib/schemaupdater.php
@@ -0,0 +1,117 @@
+<?php
+
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Database schema utilities
+ *
+ * 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  Database
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2009 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
+class SchemaUpdater
+{
+    public function __construct($schema)
+    {
+        $this->schema = $schema;
+        $this->conn = $conn;
+        $this->checksums = $this->getChecksums();
+    }
+
+    /**
+     * @param array $tableDefs
+     * @fixme handle tables that belong on different database servers...?
+     */
+    public function checkTables(array $tableDefs)
+    {
+        $checksums = $this->checksums;
+        foreach ($tableDefs as $table => $def) {
+            $checksum = $this->tableChecksum($def);
+            if (empty($checksums[$table])) {
+                common_log(LOG_DEBUG, "No previous schema_version for $table: updating to $checksum");
+            } else if ($checksums[$table] == $checksum) {
+                common_log(LOG_DEBUG, "Last schema_version for $table up to date: $checksum");
+                continue;
+            } else {
+                common_log(LOG_DEBUG, "Last schema_version for $table is {$checksums[$table]}: updating to $checksum");
+            }
+            $this->conn->query('BEGIN');
+            $this->schema->ensureTable($table, $def);
+            $this->saveChecksum($table, $checksum);
+            $this->conn->commit();
+        }
+    }
+
+    /**
+     * Calculate a checksum for this table definition array.
+     *
+     * @param array $def
+     * @return string
+     */
+    public function checksum(array $def)
+    {
+        $flat = serialize($def);
+        return sha1($flat);
+    }
+
+    /**
+     * Pull all known table checksums into an array for easy lookup.
+     *
+     * @return array: associative array of table names to checksum strings
+     */
+    protected function getChecksums()
+    {
+        $checksums = array();
+
+        $sv = new Schema_version();
+        $sv->find();
+        while ($sv->fetch()) {
+            $checksums[$sv->table_name] = $sv->checksum;
+        }
+
+        return $checksums;
+    }
+
+    /**
+     * Save or update current available checksums.
+     *
+     * @param string $table
+     * @param string $checksum
+     */
+    protected function saveChecksum($table, $checksum)
+    {
+        $sv = new Schema_version();
+        $sv->table_name = $table;
+        $sv->checksum = $checksum;
+        $sv->modified = common_sql_now();
+        if (isset($this->checksums[$table])) {
+            $sv->update();
+        } else {
+            $sv->insert();
+        }
+        $this->checksums[$table] = $checksum;
+    }
+}
diff --git a/scripts/dumpschema.php b/scripts/dumpschema.php
index 613364487a..2b238f0066 100644
--- a/scripts/dumpschema.php
+++ b/scripts/dumpschema.php
@@ -28,11 +28,12 @@ Attempt to pull a schema definition for a given table.
   --raw     skip compatibility filtering for diffs
   --create  dump SQL that would be run to update or create this table
   --build   dump SQL that would be run to create this table fresh
+  --checksum just output checksums from the source schema defs
 
 
 END_OF_CHECKSCHEMA_HELP;
 
-$longoptions = array('diff', 'all', 'create', 'update', 'raw');
+$longoptions = array('diff', 'all', 'create', 'update', 'raw', 'checksum');
 require_once INSTALLDIR.'/scripts/commandline.inc';
 
 function indentOptions($indent)
@@ -207,6 +208,24 @@ function tweakPrimaryKey($def)
     return $def;
 }
 
+function dumpChecksum($tableName)
+{
+    $schema = Schema::get();
+    $def = getCoreSchema($tableName);
+
+    $updater = new SchemaUpdater($schema);
+    $checksum = $updater->checksum($def);
+    $old = @$updater->checksums[$tableName];
+
+    if ($old == $checksum) {
+        echo "OK  $checksum $tableName\n";
+    } else if (!$old) {
+        echo "NEW $checksum $tableName\n";
+    } else {
+        echo "MOD $checksum $tableName (was $old)\n";
+    }
+}
+
 if (have_option('all')) {
     $args = getCoreTables();
 }
@@ -219,6 +238,8 @@ if (count($args)) {
             dumpBuildTable($tableName);
         } else if (have_option('update')) {
             dumpEnsureTable($tableName);
+        } else if (have_option('checksum')) {
+            dumpChecksum($tableName);
         } else {
             dumpTable($tableName, true);
         }

From 3b6f738ab73b7f77dd09ac21dd9446876776fc04 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Tue, 19 Oct 2010 17:25:56 -0700
Subject: [PATCH 278/655] Convert SamplePlugin to new-style table defs, tweak
 some stuff to test basic checkschema

---
 lib/schema.php                              | 11 +++++++----
 plugins/OStatus/classes/Ostatus_profile.php |  4 ++--
 plugins/Sample/SamplePlugin.php             | 17 ++++++++++++++---
 3 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/lib/schema.php b/lib/schema.php
index 20bd95f28a..e4b7f416cd 100644
--- a/lib/schema.php
+++ b/lib/schema.php
@@ -254,6 +254,9 @@ class Schema
      */
     function appendForeignKeyDef(array &$sql, $name, array $def)
     {
+        if (count($def) != 2) {
+            throw new Exception("Invalid foreign key def for $name: " . var_export($def, true));
+        }
         list($refTable, $map) = $def;
         $srcCols = array_keys($map);
         $refCols = array_values($map);
@@ -884,7 +887,7 @@ class Schema
             if (!$cd->nullable) {
                 $column['not null'] = true;
             }
-            if ($cd->autoincrement) {
+            if ($cd->auto_increment) {
                 $column['type'] = 'serial';
             }
             if ($cd->default) {
@@ -942,13 +945,13 @@ class Schema
      */
     function validateDef($tableName, array $def)
     {
-        if (count($defs) && $defs[0] instanceof ColumnDef) {
-            $def = $this->oldToNew($tableName, $defs);
+        if (count($def) && $def[0] instanceof ColumnDef) {
+            $def = $this->oldToNew($tableName, $def);
         }
 
         // A few quick checks :D
         if (!isset($def['fields'])) {
-            throw new Exceptioni("Invalid table definition for $tableName: no fields.");
+            throw new Exception("Invalid table definition for $tableName: no fields.");
         }
 
         return $def;
diff --git a/plugins/OStatus/classes/Ostatus_profile.php b/plugins/OStatus/classes/Ostatus_profile.php
index 572b5ea071..4ba0a6c85d 100644
--- a/plugins/OStatus/classes/Ostatus_profile.php
+++ b/plugins/OStatus/classes/Ostatus_profile.php
@@ -73,8 +73,8 @@ class Ostatus_profile extends Managed_DataObject
                 'ostatus_profile_feeduri_idx' => array('feeduri'),
             ),
             'foreign keys' => array(
-                'profile_id' => array('profile' => 'id'),
-                'group_id' => array('user_group' => 'id'),
+                'ostatus_profile_profile_id_fkey' => array('profile', array('profile_id' => 'id')),
+                'ostatus_profile_group_id_fkey' => array('user_group', array('group_id' => 'id')),
             ),
         );
     }
diff --git a/plugins/Sample/SamplePlugin.php b/plugins/Sample/SamplePlugin.php
index ef69121a99..a0d1140f37 100644
--- a/plugins/Sample/SamplePlugin.php
+++ b/plugins/Sample/SamplePlugin.php
@@ -172,9 +172,20 @@ class SamplePlugin extends Plugin
         // For storing user-submitted flags on profiles
 
         $schema->ensureTable('user_greeting_count',
-                             array(new ColumnDef('user_id', 'integer', null,
-                                                 true, 'PRI'),
-                                   new ColumnDef('greeting_count', 'integer')));
+            array(
+                'fields' => array(
+                    'user_id' => array('type' => 'int', 'not null' => true),
+                    'greeting_count' => array('type' => 'int'),
+                ),
+                'primary key' => array('user_id'),
+                'foreign keys' => array(
+                    // Not all databases will support foreign keys, but even
+                    // when not enforced it's helpful to include these definitions
+                    // as documentation.
+                    'user_greeting_count_user_id_fkey' => array('user', array('user_id' => 'id')),
+                ),
+            )
+        );
 
         return true;
     }

From 90c87553ee7566593529199374215ae80bb3e209 Mon Sep 17 00:00:00 2001
From: Craig Andrews <candrews@integralblue.com>
Date: Wed, 20 Oct 2010 20:22:34 -0400
Subject: [PATCH 279/655] Redirect to https when making an http request for a
 sensitive action

---
 actions/login.php    | 22 ----------------------
 actions/register.php |  7 -------
 index.php            |  8 ++++++++
 3 files changed, 8 insertions(+), 29 deletions(-)

diff --git a/actions/login.php b/actions/login.php
index 07c601a4db..103df7ee5a 100644
--- a/actions/login.php
+++ b/actions/login.php
@@ -62,28 +62,6 @@ class LoginAction extends Action
         return false;
     }
 
-    /**
-     * Prepare page to run
-     *
-     *
-     * @param $args
-     * @return string title
-     */
-
-    function prepare($args)
-    {
-        parent::prepare($args);
-
-        // @todo this check should really be in index.php for all sensitive actions
-        $ssl = common_config('site', 'ssl');
-        if (empty($_SERVER['HTTPS']) && ($ssl == 'always' || $ssl == 'sometimes')) {
-            common_redirect(common_local_url('login'));
-            // exit
-        }
-
-        return true;
-    }
-
     /**
      * Handle input, produce output
      *
diff --git a/actions/register.php b/actions/register.php
index 7307bc689b..9b8161e082 100644
--- a/actions/register.php
+++ b/actions/register.php
@@ -74,13 +74,6 @@ class RegisterAction extends Action
         parent::prepare($args);
         $this->code = $this->trimmed('code');
 
-        // @todo this check should really be in index.php for all sensitive actions
-        $ssl = common_config('site', 'ssl');
-        if (empty($_SERVER['HTTPS']) && ($ssl == 'always' || $ssl == 'sometimes')) {
-            common_redirect(common_local_url('register'));
-            // exit
-        }
-
         if (empty($this->code)) {
             common_ensure_session();
             if (array_key_exists('invitecode', $_SESSION)) {
diff --git a/index.php b/index.php
index 21e222e3b8..5a08aa0782 100644
--- a/index.php
+++ b/index.php
@@ -283,6 +283,14 @@ function main()
         return;
     }
 
+    $site_ssl = common_config('site', 'ssl');
+
+    // If the request is HTTP and it should be HTTPS...
+    if ($site_ssl != 'never' && !StatusNet::isHTTPS() && common_is_sensitive($args['action'])) {
+        common_redirect(common_local_url($args['action'], $args));
+        return;
+    }
+
     $args = array_merge($args, $_REQUEST);
 
     Event::handle('ArgsInitialize', array(&$args));

From 5476ffa9443e728510ae1006896b663989cb01da Mon Sep 17 00:00:00 2001
From: Craig Andrews <candrews@integralblue.com>
Date: Tue, 26 Oct 2010 23:46:18 -0400
Subject: [PATCH 280/655] add StrictTransportSecurity plugin

---
 plugins/StrictTransportSecurity/README        | 21 +++++++
 .../StrictTransportSecurityPlugin.php         | 62 +++++++++++++++++++
 2 files changed, 83 insertions(+)
 create mode 100644 plugins/StrictTransportSecurity/README
 create mode 100644 plugins/StrictTransportSecurity/StrictTransportSecurityPlugin.php

diff --git a/plugins/StrictTransportSecurity/README b/plugins/StrictTransportSecurity/README
new file mode 100644
index 0000000000..66f03e95ea
--- /dev/null
+++ b/plugins/StrictTransportSecurity/README
@@ -0,0 +1,21 @@
+The Strict Transport Security plugin implements the Strict Transport Security header, improving the security of HTTPS only sites.
+See http://lists.w3.org/Archives/Public/www-archive/2009Sep/att-0051/draft-hodges-strict-transport-sec-05.plain.html for the specification.
+
+Installation
+============
+add "addPlugin('strictTransportSecurity');"
+to the bottom of your config.php
+
+The plugin will not do anything unless:
+$config['site']['ssl'] is set to 'always'
+$config['site']['path'] is either not set, empty, or '/'
+
+Settings
+========
+max_age (15552000): sets how long to remember the forced HTTPS (seconds) (15552000 seconds is 180 days)
+includeSubDomains (false): if set, then STS will apply to all the sub-domains too.
+
+Example
+=======
+addPlugin('strictTransportSecurity');
+
diff --git a/plugins/StrictTransportSecurity/StrictTransportSecurityPlugin.php b/plugins/StrictTransportSecurity/StrictTransportSecurityPlugin.php
new file mode 100644
index 0000000000..004a627929
--- /dev/null
+++ b/plugins/StrictTransportSecurity/StrictTransportSecurityPlugin.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Plugin to enable Single Sign On via CAS (Central Authentication Service)
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Plugin
+ * @package   StatusNet
+ * @author    Craig Andrews <candrews@integralblue.com>
+ * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org
+ * @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);
+}
+
+class StrictTransportSecurityPlugin extends Plugin
+{
+    public $max_age = 15552000;
+    public $includeSubDomains = false;
+
+    function __construct()
+    {
+        parent::__construct();
+    }
+
+    function onArgsInitialize($args)
+    {
+        $path = common_config('site', 'path');
+        if(common_config('site', 'ssl') == 'always' && ($path == '/' || ! $path )) {
+            header('Strict-Transport-Security: max-age=' . $this->max_age . + ($this->includeSubDomains?'; includeSubDomains':''));
+        }
+    }
+
+    function onPluginVersion(&$versions)
+    {
+        $versions[] = array('name' => 'StrictTransportSecurity',
+                            'version' => STATUSNET_VERSION,
+                            'author' => 'Craig Andrews',
+                            'homepage' => 'http://status.net/wiki/Plugin:StrictTransportSecurity',
+                            'rawdescription' =>
+                            _m('The Strict Transport Security plugin implements the Strict Transport Security header, improving the security of HTTPS only sites.'));
+        return true;
+    }
+}

From bc6a61dc89a2af2e874f83d1e876d0d0b65b4e26 Mon Sep 17 00:00:00 2001
From: Craig Andrews <candrews@integralblue.com>
Date: Tue, 26 Oct 2010 23:56:59 -0400
Subject: [PATCH 281/655] Use https for gravatars

No reason not to use https, and doing so prevents mixed content warnings when the avatars are used on https pages.
---
 plugins/Gravatar/GravatarPlugin.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/Gravatar/GravatarPlugin.php b/plugins/Gravatar/GravatarPlugin.php
index dd8ff72176..5fcc79fd51 100644
--- a/plugins/Gravatar/GravatarPlugin.php
+++ b/plugins/Gravatar/GravatarPlugin.php
@@ -183,7 +183,7 @@ class GravatarPlugin extends Plugin
 
     function gravatar_url($email, $size)
     {
-        $url = "http://www.gravatar.com/avatar.php?gravatar_id=".
+        $url = "https://secure.gravatar.com/avatar.php?gravatar_id=".
                 md5(strtolower($email)).
                 "&default=".urlencode(Avatar::defaultImage($size)).
                 "&size=".$size;

From 9f9126e5245173b06719638e434b19f6973661b4 Mon Sep 17 00:00:00 2001
From: Craig Andrews <candrews@integralblue.com>
Date: Wed, 27 Oct 2010 00:09:43 -0400
Subject: [PATCH 282/655] Load MS Virtual Earth javascript over https when
 browsing in https

---
 plugins/Mapstraction/MapstractionPlugin.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/Mapstraction/MapstractionPlugin.php b/plugins/Mapstraction/MapstractionPlugin.php
index c4ba6464ea..08465e0a77 100644
--- a/plugins/Mapstraction/MapstractionPlugin.php
+++ b/plugins/Mapstraction/MapstractionPlugin.php
@@ -125,7 +125,7 @@ class MapstractionPlugin extends Plugin
                                     urlencode($this->apikey)));
             break;
         case 'microsoft':
-            $action->script('http://dev.virtualearth.net/mapcontrol/mapcontrol.ashx?v=6');
+            $action->script((StatusNet::isHTTPS()?'https':'http') + '://dev.virtualearth.net/mapcontrol/mapcontrol.ashx?v=6');
             break;
         case 'openlayers':
             // XXX: is this not nice...?

From 255ba42ef120a3ee0ac21c0c639730d8317b7e79 Mon Sep 17 00:00:00 2001
From: Craig Andrews <candrews@integralblue.com>
Date: Wed, 27 Oct 2010 00:11:55 -0400
Subject: [PATCH 283/655] use library function to determine if https should be
 used for recaptcha

---
 plugins/Recaptcha/RecaptchaPlugin.php | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/plugins/Recaptcha/RecaptchaPlugin.php b/plugins/Recaptcha/RecaptchaPlugin.php
index 08557cbd84..5a33e7132e 100644
--- a/plugins/Recaptcha/RecaptchaPlugin.php
+++ b/plugins/Recaptcha/RecaptchaPlugin.php
@@ -51,15 +51,6 @@ class RecaptchaPlugin extends Plugin
         }
     }
 
-    function checkssl()
-    {
-        if(common_config('site', 'ssl') === 'sometimes' || common_config('site', 'ssl') === 'always') {
-            return true;
-        }
-        return false;
-    }
-
-
     function onEndRegistrationFormData($action)
     {
         $action->elementStart('li');
@@ -79,7 +70,7 @@ class RecaptchaPlugin extends Plugin
     {
         if (isset($action->recaptchaPluginNeedsOutput) && $action->recaptchaPluginNeedsOutput) {
             // Load the AJAX API
-            if ($this->checkssl()) {
+            if (StatusNet::isHTTPS()) {
                 $url = "https://api-secure.recaptcha.net/js/recaptcha_ajax.js";
             } else {
                 $url = "http://api.recaptcha.net/js/recaptcha_ajax.js";
@@ -120,4 +111,4 @@ class RecaptchaPlugin extends Plugin
                                'captcha to the registration page.'));
         return true;
     }
-}
\ No newline at end of file
+}

From 1851933c344307fdbd864489bf6f1a42bf6a6096 Mon Sep 17 00:00:00 2001
From: Craig Andrews <candrews@integralblue.com>
Date: Wed, 27 Oct 2010 10:12:35 -0400
Subject: [PATCH 284/655] Enable Strict Transport Security plugin by default

---
 lib/default.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/default.php b/lib/default.php
index a1dac7b5e1..e41d5c6862 100644
--- a/lib/default.php
+++ b/lib/default.php
@@ -301,6 +301,7 @@ $default =
                                  'WikiHashtags' => null,
                                  'RSSCloud' => null,
                                  'ClientSideShorten' => null,
+                                 'StrictTransportSecurity' => null,
                                  'OpenID' => null),
               'locale_path' => false, // Set to a path to use *instead of* each plugin's own locale subdirectories
               ),

From 1daa1bfa39c392375c8e60120b803e5633142a6f Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Fri, 29 Oct 2010 14:49:05 -0700
Subject: [PATCH 285/655] fix notice

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

diff --git a/lib/schema.php b/lib/schema.php
index e4b7f416cd..d62db87935 100644
--- a/lib/schema.php
+++ b/lib/schema.php
@@ -945,7 +945,7 @@ class Schema
      */
     function validateDef($tableName, array $def)
     {
-        if (count($def) && $def[0] instanceof ColumnDef) {
+        if (isset($def[0]) && $def[0] instanceof ColumnDef) {
             $def = $this->oldToNew($tableName, $def);
         }
 

From ac2447c395da8f2b544b187eb26217a90bb3016a Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Fri, 29 Oct 2010 14:58:52 -0700
Subject: [PATCH 286/655] tweak

---
 lib/schemaupdater.php | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/lib/schemaupdater.php b/lib/schemaupdater.php
index b872b0d578..9577bceebf 100644
--- a/lib/schemaupdater.php
+++ b/lib/schemaupdater.php
@@ -42,13 +42,21 @@ class SchemaUpdater
     }
 
     /**
-     * @param array $tableDefs
+     * @param string $tableName
+     * @param array $tableDef
+     */
+    public function register($tableName, array $tableDef)
+    {
+        $this->tables[$tableName] = $tableDef;
+    }
+
+    /**
      * @fixme handle tables that belong on different database servers...?
      */
-    public function checkTables(array $tableDefs)
+    public function checkTables()
     {
         $checksums = $this->checksums;
-        foreach ($tableDefs as $table => $def) {
+        foreach ($this->tables as $table => $def) {
             $checksum = $this->tableChecksum($def);
             if (empty($checksums[$table])) {
                 common_log(LOG_DEBUG, "No previous schema_version for $table: updating to $checksum");

From 9ced8af8dc924d511ff3263654c92705352d4018 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Fri, 29 Oct 2010 15:11:41 -0700
Subject: [PATCH 287/655] fix notices in dumpschema

---
 scripts/dumpschema.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/scripts/dumpschema.php b/scripts/dumpschema.php
index 2b238f0066..9c5e3cf8b3 100644
--- a/scripts/dumpschema.php
+++ b/scripts/dumpschema.php
@@ -177,7 +177,7 @@ function dumpDiff($tableName, $filter)
         if ($section == 'fields') {
             // this shouldn't be needed maybe... wait what?
         }
-        $diff = $schema->diffArrays($old, $def, $section, $compare);
+        $diff = $schema->diffArrays($old, $def, $section);
         $chunks = array('del', 'mod', 'add');
         foreach ($chunks as $chunk) {
             if ($diff[$chunk]) {
@@ -205,6 +205,10 @@ function tweakPrimaryKey($def)
         $def['primary keys'] = array('primary key' => $def['primary key']);
         unset($def['primary key']);
     }
+    if (isset($def['description'])) {
+        $def['descriptions'] = array('description' => $def['description']);
+        unset($def['description']);
+    }
     return $def;
 }
 

From 345b7d33b8f641f23157fb7d73740f24169b46f9 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Fri, 29 Oct 2010 15:28:48 -0700
Subject: [PATCH 288/655] some sorta vaguely working bits

---
 db/core.php             | 85 +++++++++++++++++++++--------------------
 lib/mysqlschema.php     | 29 ++++++++++----
 lib/schema.php          |  4 +-
 lib/schemaupdater.php   | 11 +++---
 scripts/checkschema.php | 14 +++++++
 5 files changed, 87 insertions(+), 56 deletions(-)

diff --git a/db/core.php b/db/core.php
index eb90ca85fd..695a3e3aa0 100644
--- a/db/core.php
+++ b/db/core.php
@@ -13,7 +13,8 @@
  * MySQL 'timestamp' columns were formerly used for 'modified' files for their
  * auto-updating properties. This didn't play well with changes to cache usage
  * in 0.9.x, as we don't know the timestamp value at INSERT time and never
- * have a chance to load it up again before caching.
+ * have a chance to load it up again before caching. For now I'm leaving them
+ * in, but we may want to clean them up later.
  *
  * Current code should be setting 'created' and 'modified' fields explicitly;
  * this also avoids mismatches between server and client timezone settings.
@@ -44,7 +45,7 @@ $schema['profile'] = array(
         'location_ns' => array('type' => 'int', 'description' => 'namespace for location'),
 
         'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
-        'modified' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was modified'),
+        'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
     ),
     'primary key' => array('id'),
     'indexes' => array(
@@ -65,7 +66,7 @@ $schema['avatar'] = array(
         'filename' => array('type' => 'varchar', 'length' => 255, 'description' => 'local filename, if local'),
         'url' => array('type' => 'varchar', 'length' => 255, 'description' => 'avatar location'),
         'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
-        'modified' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was modified'),
+        'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
     ),
     'primary key' => array('profile_id', 'width', 'height'),
     'unique keys' => array(
@@ -85,7 +86,7 @@ $schema['sms_carrier'] = array(
         'name' => array('type' => 'varchar', 'length' => 64, 'description' => 'name of the carrier'),
         'email_pattern' => array('type' => 'varchar', 'length' => 255, 'not null' => true, 'description' => 'sprintf pattern for making an email address from a phone number'),
         'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
-        'modified' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was modified'),
+        'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
     ),
     'primary key' => array('id'),
     'unique keys' => array(
@@ -123,7 +124,7 @@ $schema['user'] = array(
         'viewdesigns' => array('type' => 'int', 'size' => 'tiny', 'default' => 1, 'description' => 'whether to view user-provided designs'),
 
         'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
-        'modified' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was modified'),
+        'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
     ),
     'primary key' => array('id'),
     'unique keys' => array(
@@ -151,7 +152,7 @@ $schema['remote_profile'] = array(
         'postnoticeurl' => array('type' => 'varchar', 'length' => 255, 'description' => 'URL we use for posting notices'),
         'updateprofileurl' => array('type' => 'varchar', 'length' => 255, 'description' => 'URL we use for updates to this profile'),
         'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
-        'modified' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was modified'),
+        'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
     ),
     'primary key' => array('id'),
     'unique keys' => array(
@@ -171,7 +172,7 @@ $schema['subscription'] = array(
         'token' => array('type' => 'varchar', 'length' => 255, 'description' => 'authorization token'),
         'secret' => array('type' => 'varchar', 'length' => 255, 'description' => 'token secret'),
         'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
-        'modified' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was modified'),
+        'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
     ),
     'primary key' => array('subscriber', 'subscribed'),
     'indexes' => array(
@@ -190,7 +191,7 @@ $schema['notice'] = array(
         'rendered' => array('type' => 'text', 'description' => 'HTML version of the content'),
         'url' => array('type' => 'varchar', 'length' => 255, 'description' => 'URL of any attachment (image, video, bookmark, whatever)'),
         'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
-        'modified' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was modified'),
+        'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
         'reply_to' => array('type' => 'int', 'description' => 'notice replied to (usually a guess)'),
         'is_local' => array('type' => 'int', 'size' => 'tiny', 'default' => 0, 'description' => 'notice was generated by a user'),
         'source' => array('type' => 'varchar', 'length' => 32, 'description' => 'source of comment, like "web", "im", or "clientname"'),
@@ -229,7 +230,7 @@ $schema['notice_source'] = array(
         'name' => array('type' => 'varchar', 'length' => 255, 'not null' => true, 'description' => 'name of the source'),
         'url' => array('type' => 'varchar', 'length' => 255, 'not null' => true, 'description' => 'url to link to'),
         'notice_id' => array('type' => 'int', 'not null' => true, 'description' => 'date this record was created'),
-        'modified' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was modified'),
+        'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
     ),
     'primary key' => array('code'),
 );
@@ -238,7 +239,7 @@ $schema['reply'] = array(
     'fields' => array(
         'notice_id' => array('type' => 'int', 'not null' => true, 'description' => 'notice that is the reply'),
         'profile_id' => array('type' => 'int', 'not null' => true, 'description' => 'profile replied to'),
-        'modified' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was modified'),
+        'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
         'replied_id' => array('type' => 'int', 'description' => 'notice replied to (not used, see notice.reply_to)'),
     ),
     'primary key' => array('notice_id', 'profile_id'),
@@ -257,7 +258,7 @@ $schema['fave'] = array(
     'fields' => array(
         'notice_id' => array('type' => 'int', 'not null' => true, 'description' => 'notice that is the favorite'),
         'user_id' => array('type' => 'int', 'not null' => true, 'description' => 'user who likes this notice'),
-        'modified' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was modified'),
+        'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
     ),
     'primary key' => array('notice_id', 'user_id'),
     'foreign keys' => array(
@@ -281,7 +282,7 @@ $schema['consumer'] = array(
         'seed' => array('type' => 'char', 'length' => 32, 'not null' => true, 'description' => 'seed for new tokens by this consumer'),
 
         'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
-        'modified' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was modified'),
+        'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
     ),
     'primary key' => array('consumer_key'),
 );
@@ -298,7 +299,7 @@ $schema['token'] = array(
         'verified_callback' => array('type' => 'varchar', 'length' => 255, 'description' => 'verified callback URL for OAuth 1.0a'),
 
         'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
-        'modified' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was modified'),
+        'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
     ),
     'primary key' => array('consumer_key', 'tok'),
     'foreign keys' => array(
@@ -315,7 +316,7 @@ $schema['nonce'] = array(
         'ts' => array('type' => 'datetime', 'not null' => true, 'description' => 'timestamp sent'),
 
         'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
-        'modified' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was modified'),
+        'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
     ),
     'primary key' => array('consumer_key', 'ts', 'nonce'),
 );
@@ -336,7 +337,7 @@ $schema['oauth_application'] = array(
         'type' => array('type' => 'int', 'size' => 'tiny', 'default' => 0, 'description' => 'type of app, 1 = browser, 2 = desktop'),
         'access_type' => array('type' => 'int', 'size' => 'tiny', 'default' => 0, 'description' => 'default access type, bit 1 = read, bit 2 = write'),
         'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
-        'modified' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was modified'),
+        'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
     ),
     'primary key' => array('id'),
     'unique keys' => array(
@@ -355,7 +356,7 @@ $schema['oauth_application_user'] = array(
         'access_type' => array('type' => 'int', 'size' => 'tiny', 'default' => 0, 'description' => 'access type, bit 1 = read, bit 2 = write'),
         'token' => array('type' => 'varchar', 'length' => 255, 'description' => 'request or access token'),
         'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
-        'modified' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was modified'),
+        'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
     ),
     'primary key' => array('profile_id', 'application_id'),
     'foreign keys' => array(
@@ -398,7 +399,7 @@ $schema['confirm_address'] = array(
         'address_type' => array('type' => 'varchar', 'length' => 8, 'not null' => true, 'description' => 'address type ("email", "xmpp", "sms")'),
         'claimed' => array('type' => 'datetime', 'description' => 'date this was claimed for queueing'),
         'sent' => array('type' => 'datetime', 'description' => 'date this was sent for queueing'),
-        'modified' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was modified'),
+        'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
     ),
     'primary key' => array('code'),
     'foreign keys' => array(
@@ -410,7 +411,7 @@ $schema['remember_me'] = array(
     'fields' => array(
         'code' => array('type' => 'varchar', 'length' => 32, 'not null' => true, 'description' => 'good random code'),
         'user_id' => array('type' => 'int', 'not null' => true, 'description' => 'user who is logged in'),
-        'modified' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was modified'),
+        'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
     ),
     'primary key' => array('code'),
     'foreign keys' => array(
@@ -457,7 +458,7 @@ $schema['foreign_service'] = array(
         'name' => array('type' => 'varchar', 'length' => 32, 'not null' => true, 'description' => 'name of the service'),
         'description' => array('type' => 'varchar', 'length' => 255, 'description' => 'description'),
         'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
-        'modified' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was modified'),
+        'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
     ),
     'primary key' => array('id'),
     'unique keys' => array(
@@ -472,7 +473,7 @@ $schema['foreign_user'] = array(
         'uri' => array('type' => 'varchar', 'length' => 255, 'not null' => true, 'description' => 'identifying URI'),
         'nickname' => array('type' => 'varchar', 'length' => 255, 'description' => 'nickname on foreign service'),
         'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
-        'modified' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was modified'),
+        'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
     ),
     'primary key' => array('id', 'service'),
     'foreign keys' => array(
@@ -495,7 +496,7 @@ $schema['foreign_link'] = array(
         'last_noticesync' => array('type' => 'datetime', 'description' => 'last time notices were imported'),
         'last_friendsync' => array('type' => 'datetime', 'description' => 'last time friends were imported'),
         'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
-        'modified' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was modified'),
+        'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
     ),
     'primary key' => array('user_id', 'foreign_id', 'service'),
     'foreign keys' => array(
@@ -555,7 +556,7 @@ $schema['message'] = array(
         'rendered' => array('type' => 'text', 'description' => 'HTML version of the content'),
         'url' => array('type' => 'varchar', 'length' => 255, 'description' => 'URL of any attachment (image, video, bookmark, whatever)'),
         'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
-        'modified' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was modified'),
+        'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
         'source' => array('type' => 'varchar', 'length' => 32, 'description' => 'source of comment, like "web", "im", or "clientname"'),
     ),
     'primary key' => array('id'),
@@ -598,7 +599,7 @@ $schema['profile_tag'] = array(
         'tagger' => array('type' => 'int', 'not null' => true, 'description' => 'user making the tag'),
         'tagged' => array('type' => 'int', 'not null' => true, 'description' => 'profile tagged'),
         'tag' => array('type' => 'varchar', 'length' => 64, 'not null' => true, 'description' => 'hash tag associated with this notice'),
-        'modified' => array('type' => 'datetime', 'not null' => true, 'description' => 'date the tag was added'),
+        'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date the tag was added'),
     ),
     'primary key' => array('tagger', 'tagged', 'tag'),
     'foreign keys' => array(
@@ -616,7 +617,7 @@ $schema['profile_block'] = array(
     'fields' => array(
         'blocker' => array('type' => 'int', 'not null' => true, 'description' => 'user making the block'),
         'blocked' => array('type' => 'int', 'not null' => true, 'description' => 'profile that is blocked'),
-        'modified' => array('type' => 'datetime', 'not null' => true, 'description' => 'date of blocking'),
+        'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date of blocking'),
     ),
     'foreign keys' => array(
         'profile_block_blocker_fkey' => array('user', array('blocker' => 'id')),
@@ -642,7 +643,7 @@ $schema['user_group'] = array(
         'design_id' => array('type' => 'int', 'description' => 'id of a design'),
 
         'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
-        'modified' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was modified'),
+        'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
 
         'uri' => array('type' => 'varchar', 'length' => 255, 'description' => 'universal identifier'),
         'mainpage' => array('type' => 'varchar', 'length' => 255, 'description' => 'page for group info to link to'),
@@ -666,7 +667,7 @@ $schema['group_member'] = array(
         'is_admin' => array('type' => 'int', 'size' => 'tiny', 'default' => 0, 'description' => 'is this user an admin?'),
 
         'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
-        'modified' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was modified'),
+        'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
     ),
     'primary key' => array('group_id', 'profile_id'),
     'foreign keys' => array(
@@ -724,7 +725,7 @@ $schema['file'] = array(
         'protected' => array('type' => 'int', 'description' => 'true when URL is private (needs login)'),
         'filename' => array('type' => 'varchar', 'length' => 255, 'description' => 'if a local file, name of the file'),
 
-        'modified' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was modified'),
+        'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
     ),
     'primary key' => array('id'),
     'unique keys' => array(
@@ -747,7 +748,7 @@ $schema['file_oembed'] = array(
         'author_name' => array('type' => 'varchar', 'length' => 50, 'description' => 'author name for this oEmbed resource'),
         'author_url' => array('type' => 'varchar', 'length' => 255, 'description' => 'author URL for this oEmbed resource'),
         'url' => array('type' => 'varchar', 'length' => 255, 'description' => 'URL for this oEmbed resource when applicable (photo, link)'),
-        'modified' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was modified'),
+        'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
     ),
     'primary key' => array('file_id'),
     'foreign keys' => array(
@@ -761,7 +762,7 @@ $schema['file_redirection'] = array(
         'file_id' => array('type' => 'int', 'description' => 'short URL for what URL/file'),
         'redirections' => array('type' => 'int', 'description' => 'redirect count'),
         'httpcode' => array('type' => 'int', 'description' => 'HTTP status code (20x, 30x, etc.)'),
-        'modified' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was modified'),
+        'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
     ),
     'primary key' => array('url'),
     'foreign keys' => array(
@@ -775,7 +776,7 @@ $schema['file_thumbnail'] = array(
         'url' => array('type' => 'varchar', 'length' => 255, 'description' => 'URL of thumbnail'),
         'width' => array('type' => 'int', 'description' => 'width of thumbnail'),
         'height' => array('type' => 'int', 'description' => 'height of thumbnail'),
-        'modified' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was modified'),
+        'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
     ),
     'primary key' => array('file_id'),
     'foreign keys' => array(
@@ -790,7 +791,7 @@ $schema['file_to_post'] = array(
     'fields' => array(
         'file_id' => array('type' => 'int', 'not null' => true, 'description' => 'id of URL/file'),
         'post_id' => array('type' => 'int', 'not null' => true, 'description' => 'id of the notice it belongs to'),
-        'modified' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was modified'),
+        'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
     ),
     'primary key' => array('file_id', 'post_id'),
     'foreign keys' => array(
@@ -821,7 +822,7 @@ $schema['group_block'] = array(
         'group_id' => array('type' => 'int', 'not null' => true, 'description' => 'group profile is blocked from'),
         'blocked' => array('type' => 'int', 'not null' => true, 'description' => 'profile that is blocked'),
         'blocker' => array('type' => 'int', 'not null' => true, 'description' => 'user making the block'),
-        'modified' => array('type' => 'datetime', 'not null' => true, 'description' => 'date of blocking'),
+        'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date of blocking'),
     ),
     'primary key' => array('group_id', 'blocked'),
     'foreign keys' => array(
@@ -835,7 +836,7 @@ $schema['group_alias'] = array(
     'fields' => array(
         'alias' => array('type' => 'varchar', 'length' => 64, 'not null' => true, 'description' => 'additional nickname for the group'),
         'group_id' => array('type' => 'int', 'not null' => true, 'description' => 'group profile is blocked from'),
-        'modified' => array('type' => 'datetime', 'not null' => true, 'description' => 'date alias was created'),
+        'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date alias was created'),
     ),
     'primary key' => array('alias'),
     'foreign keys' => array(
@@ -851,7 +852,7 @@ $schema['session'] = array(
         'id' => array('type' => 'varchar', 'length' => 32, 'not null' => true, 'description' => 'session ID'),
         'session_data' => array('type' => 'text', 'description' => 'session data'),
         'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
-        'modified' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was modified'),
+        'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
     ),
     'primary key' => array('id'),
     'indexes' => array(
@@ -902,7 +903,7 @@ $schema['location_namespace'] = array(
         'id' => array('type' => 'int', 'not null' => true, 'description' => 'identity for this namespace'),
         'description' => array('type' => 'varchar', 'length' => 255, 'description' => 'description of the namespace'),
         'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date the record was created'),
-        'modified' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was modified'),
+        'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
     ),
     'primary key' => array('id'),
 );
@@ -912,7 +913,7 @@ $schema['login_token'] = array(
         'user_id' => array('type' => 'int', 'not null' => true, 'description' => 'user owning this token'),
         'token' => array('type' => 'char', 'length' => 32, 'not null' => true, 'description' => 'token useable for logging in'),
         'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
-        'modified' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was modified'),
+        'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
     ),
     'primary key' => array('user_id'),
     'foreign keys' => array(
@@ -925,7 +926,7 @@ $schema['user_location_prefs'] = array(
         'user_id' => array('type' => 'int', 'not null' => true, 'description' => 'user who has the preference'),
         'share_location' => array('type' => 'int', 'size' => 'tiny', 'default' => 1, 'description' => 'Whether to share location data'),
         'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
-        'modified' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was modified'),
+        'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
     ),
     'primary key' => array('user_id'),
     'foreign keys' => array(
@@ -955,7 +956,7 @@ $schema['user_im_prefs'] = array(
         'microid' => array('type' => 'int', 'size' => 'tiny', 'not null' => true, 'default' => 1, 'description' => 'Publish a MicroID'),
         'updatefrompresence' => array('type' => 'int', 'size' => 'tiny', 'not null' => true, 'default' => 0, 'description' => 'Send replies from people not subscribed to.'),
         'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
-        'modified' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was modified'),
+        'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
     ),
     'primary key' => array('user_id', 'transport'),
     'unique keys' => array(
@@ -971,7 +972,7 @@ $schema['conversation'] = array(
         'id' => array('type' => 'serial', 'not null' => true, 'description' => 'unique identifier'),
         'uri' => array('type' => 'varchar', 'length' => 225, 'description' => 'URI of the conversation'),
         'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
-        'modified' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was modified'),
+        'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
     ),
     'primary key' => array('id'),
     'unique keys' => array(
@@ -986,7 +987,7 @@ $schema['local_group'] = array(
         'nickname' => array('type' => 'varchar', 'length' => 64, 'description' => 'group represented'),
 
         'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
-        'modified' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was modified'),
+        'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
     ),
     'primary key' => array('group_id'),
     'foreign keys' => array(
@@ -1005,7 +1006,7 @@ $schema['user_urlshortener_prefs'] = array(
         'maxnoticelength' => array('type' => 'int', 'not null' => true, 'description' => 'notices with content greater than this value will have all urls shortened, 0 = always, null = never'),
         
         'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
-        'modified' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was modified'),
+        'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
     ),
     'primary key' => array('user_id'),
     'foreign keys' => array(
@@ -1018,7 +1019,7 @@ $schema['schema_version'] = array(
     'fields' => array(
         'table_name' => array('type' => 'varchar', 'length' => '64', 'not null' => true, 'description' => 'Table name'),
         'checksum' => array('type' => 'varchar', 'length' => '64', 'not null' => true, 'description' => 'Checksum of schema array; a mismatch indicates we should check the table more thoroughly.'),
-        'modified' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was modified'),
+        'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
     ),
     'primary key' => array('table_name'),
 );
diff --git a/lib/mysqlschema.php b/lib/mysqlschema.php
index 937c20ea8b..153b79ccd9 100644
--- a/lib/mysqlschema.php
+++ b/lib/mysqlschema.php
@@ -117,9 +117,14 @@ class MysqlSchema extends Schema
                 $field['not null'] = true;
             }
             if ($row['COLUMN_DEFAULT'] !== null) {
-                $field['default'] = $row['COLUMN_DEFAULT'];
-                if ($this->isNumericType($type)) {
-                    $field['default'] = intval($field['default']);
+                // Hack for timestamp cols
+                if ($type == 'timestamp' && $row['COLUMN_DEFAULT'] == 'CURRENT_TIMESTAMP') {
+                    // skip
+                } else {
+                    $field['default'] = $row['COLUMN_DEFAULT'];
+                    if ($this->isNumericType($type)) {
+                        $field['default'] = intval($field['default']);
+                    }
                 }
             }
             if ($row['COLUMN_KEY'] !== null) {
@@ -251,7 +256,16 @@ class MysqlSchema extends Schema
      */
     function endCreateTable($name, array $def)
     {
-        return ") ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin";
+        $engine = $this->preferredEngine($def);
+        return ") ENGINE=$engine CHARACTER SET utf8 COLLATE utf8_bin";
+    }
+    
+    function preferredEngine($def)
+    {
+        if (!empty($def['fulltext indexes'])) {
+            return 'MyISAM';
+        }
+        return 'InnoDB';
     }
 
     /**
@@ -287,14 +301,15 @@ class MysqlSchema extends Schema
      * Throw some table metadata onto the ALTER TABLE if we have a mismatch
      * in expected type, collation.
      */
-    function appendAlterExtras(array &$phrase, $tableName)
+    function appendAlterExtras(array &$phrase, $tableName, array $def)
     {
         // Check for table properties: make sure we're using a sane
         // engine type and charset/collation.
         // @fixme make the default engine configurable?
         $oldProps = $this->getTableProperties($tableName, array('ENGINE', 'TABLE_COLLATION'));
-        if (strtolower($oldProps['ENGINE']) != 'innodb') {
-            $phrase[] = 'ENGINE=InnoDB';
+        $engine = $this->preferredEngine($def);
+        if (strtolower($oldProps['ENGINE']) != strtolower($engine)) {
+            $phrase[] = "ENGINE=$engine";
         }
         if (strtolower($oldProps['TABLE_COLLATION']) != 'utf8_bin') {
             $phrase[] = 'DEFAULT CHARSET=utf8';
diff --git a/lib/schema.php b/lib/schema.php
index d62db87935..671af8a210 100644
--- a/lib/schema.php
+++ b/lib/schema.php
@@ -581,7 +581,7 @@ class Schema
             $this->appendAlterAddForeign($phrase, $keyName, $def['foreign keys'][$keyName]);
         }
 
-        $this->appendAlterExtras($phrase, $tableName);
+        $this->appendAlterExtras($phrase, $tableName, $def);
 
         if (count($phrase) > 0) {
             $sql = 'ALTER TABLE ' . $tableName . ' ' . implode(",\n", $phrase);
@@ -702,7 +702,7 @@ class Schema
         $phrase[] = 'DROP FOREIGN KEY ' . $keyName;
     }
 
-    function appendAlterExtras(array &$phrase, $tableName)
+    function appendAlterExtras(array &$phrase, $tableName, array $def)
     {
         // no-op
     }
diff --git a/lib/schemaupdater.php b/lib/schemaupdater.php
index 9577bceebf..64f7c596d4 100644
--- a/lib/schemaupdater.php
+++ b/lib/schemaupdater.php
@@ -37,7 +37,6 @@ class SchemaUpdater
     public function __construct($schema)
     {
         $this->schema = $schema;
-        $this->conn = $conn;
         $this->checksums = $this->getChecksums();
     }
 
@@ -51,13 +50,15 @@ class SchemaUpdater
     }
 
     /**
+     * Go ping em!
+     *
      * @fixme handle tables that belong on different database servers...?
      */
-    public function checkTables()
+    public function checkSchema()
     {
         $checksums = $this->checksums;
         foreach ($this->tables as $table => $def) {
-            $checksum = $this->tableChecksum($def);
+            $checksum = $this->checksum($def);
             if (empty($checksums[$table])) {
                 common_log(LOG_DEBUG, "No previous schema_version for $table: updating to $checksum");
             } else if ($checksums[$table] == $checksum) {
@@ -66,10 +67,10 @@ class SchemaUpdater
             } else {
                 common_log(LOG_DEBUG, "Last schema_version for $table is {$checksums[$table]}: updating to $checksum");
             }
-            $this->conn->query('BEGIN');
+            //$this->conn->query('BEGIN');
             $this->schema->ensureTable($table, $def);
             $this->saveChecksum($table, $checksum);
-            $this->conn->commit();
+            //$this->conn->commit();
         }
     }
 
diff --git a/scripts/checkschema.php b/scripts/checkschema.php
index bf52abe154..73fd74302c 100755
--- a/scripts/checkschema.php
+++ b/scripts/checkschema.php
@@ -27,4 +27,18 @@ END_OF_CHECKSCHEMA_HELP;
 
 require_once INSTALLDIR.'/scripts/commandline.inc';
 
+function tableDefs()
+{
+	$schema = array();
+	require INSTALLDIR.'/db/core.php';
+	return $schema;
+}
+
+$schema = Schema::get();
+$schemaUpdater = new SchemaUpdater($schema);
+foreach (tableDefs() as $table => $def) {
+	$schemaUpdater->register($table, $def);
+}
+$schemaUpdater->checkSchema();
+
 Event::handle('CheckSchema');

From 283d56bed338ca2a6852a1ae50cf8d5ded4c9fef Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Fri, 29 Oct 2010 15:36:42 -0700
Subject: [PATCH 289/655] tweak RSSCloud plugin to use new schema layout (but
 still the old event); the timestamp bits were confusing things

---
 plugins/RSSCloud/RSSCloudPlugin.php | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/plugins/RSSCloud/RSSCloudPlugin.php b/plugins/RSSCloud/RSSCloudPlugin.php
index bba0be515d..7d9c39a67d 100644
--- a/plugins/RSSCloud/RSSCloudPlugin.php
+++ b/plugins/RSSCloud/RSSCloudPlugin.php
@@ -209,19 +209,16 @@ class RSSCloudPlugin extends Plugin
     {
         $schema = Schema::get();
         $schema->ensureTable('rsscloud_subscription',
-                             array(new ColumnDef('subscribed', 'integer',
-                                                 null, false, 'PRI'),
-                                   new ColumnDef('url', 'varchar',
-                                                 '255', false, 'PRI'),
-                                   new ColumnDef('failures', 'integer',
-                                                 null, false, null, 0),
-                                   new ColumnDef('created', 'datetime',
-                                                 null, false),
-                                   new ColumnDef('modified', 'timestamp',
-                                                 null, false, null,
-                                                 'CURRENT_TIMESTAMP',
-                                                 'on update CURRENT_TIMESTAMP')
-                                   ));
+            array(
+                'fields' => array(
+                    'subscribed' => array('type' => 'int', 'not null' => true),
+                    'url' => array('type' => 'varchar', 'length' => '255', 'not null' => true),
+                    'failures' => array('type' => 'int', 'not null' => true, 'default' => 0),
+                    'created' => array('type' => 'datetime', 'not null' => true),
+                    'modified' => array('type' => 'timestamp', 'not null' => true),
+                ),
+                'primary key' => array('subscribed', 'url'),
+            ));
          return true;
     }
 

From f5019ac5aac229b9ac118a905703c675688e4ed0 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Fri, 29 Oct 2010 16:26:45 -0700
Subject: [PATCH 290/655] tweaks for the installer whee

---
 db/core.php         |  1 +
 lib/installer.php   | 13 ++++++-------
 lib/mysqlschema.php |  9 ++++++++-
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/db/core.php b/db/core.php
index 695a3e3aa0..29aa917c1f 100644
--- a/db/core.php
+++ b/db/core.php
@@ -230,6 +230,7 @@ $schema['notice_source'] = array(
         'name' => array('type' => 'varchar', 'length' => 255, 'not null' => true, 'description' => 'name of the source'),
         'url' => array('type' => 'varchar', 'length' => 255, 'not null' => true, 'description' => 'url to link to'),
         'notice_id' => array('type' => 'int', 'not null' => true, 'description' => 'date this record was created'),
+        'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
         'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
     ),
     'primary key' => array('code'),
diff --git a/lib/installer.php b/lib/installer.php
index 441f726606..ad1989f4eb 100644
--- a/lib/installer.php
+++ b/lib/installer.php
@@ -341,6 +341,7 @@ abstract class Installer
             }
             $schema->ensureTable($name, $def);
         }
+        return true;
     }
 
     /**
@@ -441,11 +442,12 @@ abstract class Installer
             if (!mb_strlen($stmt)) {
                 continue;
             }
-            $res = $conn->execute($stmt);
-            if (DB::isError($res)) {
-                $error = $result->getMessage();
+            try {
+                $res = $conn->simpleQuery($stmt);
+            } catch (Exception $e) {
+                $error = $e->getMessage();
                 $this->updateStatus("ERROR ($error) for SQL '$stmt'");
-                return $res;
+                return false;
             }
         }
         return true;
@@ -458,9 +460,6 @@ abstract class Installer
      */
     function registerInitialUser()
     {
-        define('STATUSNET', true);
-        define('LACONICA', true); // compatibility
-
         require_once INSTALLDIR . '/lib/common.php';
 
         $data = array('nickname' => $this->adminNick,
diff --git a/lib/mysqlschema.php b/lib/mysqlschema.php
index 153b79ccd9..a2581e6d81 100644
--- a/lib/mysqlschema.php
+++ b/lib/mysqlschema.php
@@ -387,7 +387,14 @@ class MysqlSchema extends Schema
             $vals = array_map(array($this, 'quote'), $column['enum']);
             return 'enum(' . implode(',', $vals) . ')';
         } else if ($this->_isString($column)) {
-            return parent::typeAndSize($column) . ' CHARSET utf8';
+            $col = parent::typeAndSize($column);
+            if (!empty($column['charset'])) {
+                $col .= ' CHARSET ' . $column['charset'];
+            }
+            if (!empty($column['collate'])) {
+                $col .= ' COLLATE ' . $column['collate'];
+            }
+            return $col;
         } else {
             return parent::typeAndSize($column);
         }

From 96521f38d2f6db7a85e17f2f7f6e4eabeaa06cf8 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Fri, 29 Oct 2010 16:31:25 -0700
Subject: [PATCH 291/655] Fix for changed cache functions in code merged up
 from 0.9.x

---
 classes/Profile.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/classes/Profile.php b/classes/Profile.php
index e05b8bf27b..23042fa43a 100644
--- a/classes/Profile.php
+++ b/classes/Profile.php
@@ -553,14 +553,14 @@ class Profile extends Memcached_DataObject
 
     function blowFavesCache()
     {
-        $cache = common_memcache();
+        $cache = Cache::instance();
         if ($cache) {
             // Faves don't happen chronologically, so we need to blow
             // ;last cache, too
-            $cache->delete(common_cache_key('fave:ids_by_user:'.$this->id));
-            $cache->delete(common_cache_key('fave:ids_by_user:'.$this->id.';last'));
-            $cache->delete(common_cache_key('fave:ids_by_user_own:'.$this->id));
-            $cache->delete(common_cache_key('fave:ids_by_user_own:'.$this->id.';last'));
+            $cache->delete(Cache::key('fave:ids_by_user:'.$this->id));
+            $cache->delete(Cache::key('fave:ids_by_user:'.$this->id.';last'));
+            $cache->delete(Cache::key('fave:ids_by_user_own:'.$this->id));
+            $cache->delete(Cache::key('fave:ids_by_user_own:'.$this->id.';last'));
         }
         $this->blowFaveCount();
     }

From 692ef9c3309bde60346beb32386ff17157e0a5e2 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Mon, 1 Nov 2010 13:27:44 -0700
Subject: [PATCH 292/655] Include fulltext indexes in MySQL table create

---
 lib/mysqlschema.php | 14 ++++++++++++++
 lib/schema.php      | 25 +++++++++++++++++++++++--
 2 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/lib/mysqlschema.php b/lib/mysqlschema.php
index a2581e6d81..c3d3501c74 100644
--- a/lib/mysqlschema.php
+++ b/lib/mysqlschema.php
@@ -244,6 +244,20 @@ class MysqlSchema extends Schema
         return $this->fetchQueryData($sql);
     }
 
+    /**
+     * Append an SQL statement with an index definition for a full-text search
+     * index over one or more columns on a table.
+     *
+     * @param array $statements
+     * @param string $table
+     * @param string $name
+     * @param array $def
+     */
+    function appendCreateFulltextIndex(array &$statements, $table, $name, array $def)
+    {
+        $statements[] = "CREATE FULLTEXT INDEX $name ON $table " . $this->buildIndexList($def);
+    }
+
     /**
      * Close out a 'create table' SQL statement.
      *
diff --git a/lib/schema.php b/lib/schema.php
index 671af8a210..2e27955881 100644
--- a/lib/schema.php
+++ b/lib/schema.php
@@ -168,17 +168,24 @@ class Schema
             }
         }
 
-        // Multi-value indexes are advisory and for best portability
-        // should be created as separate statements.
+        // Wrap the CREATE TABLE around the main body chunks...
         $statements = array();
         $statements[] = $this->startCreateTable($name, $def) . "\n" .
                         implode($sql, ",\n") . "\n" .
                         $this->endCreateTable($name, $def);
+
+        // Multi-value indexes are advisory and for best portability
+        // should be created as separate statements.
         if (!empty($def['indexes'])) {
             foreach ($def['indexes'] as $col => $colDef) {
                 $this->appendCreateIndex($statements, $name, $col, $colDef);
             }
         }
+        if (!empty($def['fulltext indexes'])) {
+            foreach ($def['fulltext indexes'] as $col => $colDef) {
+                $this->appendCreateFulltextIndex($statements, $name, $col, $colDef);
+            }
+        }
 
         return $statements;
     }
@@ -282,6 +289,20 @@ class Schema
         $statements[] = "CREATE INDEX $name ON $table " . $this->buildIndexList($def);
     }
 
+    /**
+     * Append an SQL statement with an index definition for a full-text search
+     * index over one or more columns on a table.
+     *
+     * @param array $statements
+     * @param string $table
+     * @param string $name
+     * @param array $def
+     */
+    function appendCreateFulltextIndex(array &$statements, $table, $name, array $def)
+    {
+        throw new Exception("Fulltext index not supported in this database");
+    }
+
     /**
      * Append an SQL statement to drop an index from a table.
      *

From 62d47011482373b77ac6715d507ab8913b9280fc Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Mon, 1 Nov 2010 14:31:32 -0700
Subject: [PATCH 293/655] fix a couple bugs in Managed_DataObject

---
 classes/Managed_DataObject.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/classes/Managed_DataObject.php b/classes/Managed_DataObject.php
index 35d52c5120..7990d7f408 100644
--- a/classes/Managed_DataObject.php
+++ b/classes/Managed_DataObject.php
@@ -68,7 +68,7 @@ abstract class Managed_DataObject extends Memcached_DataObject
 
     function sequenceKey()
     {
-        $table = self::schemaDef();
+        $table = call_user_func(array(get_class($this), 'schemaDef'));
         foreach ($table['fields'] as $name => $column) {
             if ($column['type'] == 'serial') {
                 // We have a serial/autoincrement column.
@@ -92,8 +92,7 @@ abstract class Managed_DataObject extends Memcached_DataObject
 
     function keyTypes()
     {
-        $keys = array();
-        $table = self::schemaDef();
+        $table = call_user_func(array(get_class($this), 'schemaDef'));
 
         if (!empty($table['unique keys'])) {
             foreach ($table['unique keys'] as $idx => $fields) {

From ca75adf408e9e554e22d4d0355fc50836025da44 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Wed, 12 Jan 2011 18:14:57 -0500
Subject: [PATCH 294/655] Update version number and codename

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

diff --git a/lib/framework.php b/lib/framework.php
index 70987e086c..350a1c268d 100644
--- a/lib/framework.php
+++ b/lib/framework.php
@@ -19,10 +19,13 @@
 
 if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
-define('STATUSNET_VERSION', '0.9.6');
+define('STATUSNET_BASE_VERSION', '1.0.0');
+define('STATUSNET_LIFECYCLE', 'dev'); // 'dev', 'alpha[0-9]+', 'beta[0-9]+', 'rc[0-9]+', 'release'
+define('STATUSNET_VERSION', STATUSNET_BASE_VERSION . STATUSNET_LIFECYCLE);
+
 define('LACONICA_VERSION', STATUSNET_VERSION); // compatibility
 
-define('STATUSNET_CODENAME', 'Man on the Moon');
+define('STATUSNET_CODENAME', 'The Sounds of Science');
 
 define('AVATAR_PROFILE_SIZE', 96);
 define('AVATAR_STREAM_SIZE', 48);

From 5c25364141eca62ea99c4f81d55ab592273db518 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Fri, 14 Jan 2011 15:36:06 -0500
Subject: [PATCH 295/655] remove extraneous <dl> and <dt> tags

---
 actions/publictagcloud.php             |  6 +-
 actions/showapplication.php            | 67 +++++++---------------
 actions/showgroup.php                  | 69 +++++-----------------
 actions/tagother.php                   | 43 ++++----------
 actions/userauthorization.php          | 53 +++++------------
 lib/action.php                         | 48 +++-------------
 lib/attachmentlist.php                 | 23 +-------
 lib/galleryaction.php                  |  7 +--
 lib/messageform.php                    |  7 +--
 lib/noticeform.php                     |  7 +--
 lib/profileaction.php                  | 29 +++-------
 lib/searchaction.php                   |  8 +--
 lib/subscriptionlist.php               |  8 +--
 lib/userprofile.php                    | 79 ++++++++++----------------
 plugins/OStatus/actions/ostatussub.php | 44 ++++----------
 15 files changed, 130 insertions(+), 368 deletions(-)

diff --git a/actions/publictagcloud.php b/actions/publictagcloud.php
index 57821d428e..f6f1d31625 100644
--- a/actions/publictagcloud.php
+++ b/actions/publictagcloud.php
@@ -142,9 +142,6 @@ class PublictagcloudAction extends Action
 
             ksort($tw);
 
-            $this->elementStart('dl');
-            $this->element('dt', null, _('Tag cloud'));
-            $this->elementStart('dd');
             $this->elementStart('ul', 'tags xoxo tag-cloud');
             foreach ($tw as $tag => $weight) {
                 if ($sum) {
@@ -155,8 +152,7 @@ class PublictagcloudAction extends Action
                 $this->showTag($tag, $weight, $weightedSum);
             }
             $this->elementEnd('ul');
-            $this->elementEnd('dd');
-            $this->elementEnd('dl');
+
             $this->elementEnd('div');
         } else {
             $this->showEmptyList();
diff --git a/actions/showapplication.php b/actions/showapplication.php
index 10aaff538f..b9e3b32914 100644
--- a/actions/showapplication.php
+++ b/actions/showapplication.php
@@ -155,42 +155,24 @@ class ShowApplicationAction extends OwnerDesignAction
 
         $this->elementStart('div', 'entity_profile vcard');
         $this->element('h2', null, _('Application profile'));
-        $this->elementStart('dl', 'entity_depiction');
-        $this->element('dt', null, _('Icon'));
-        $this->elementStart('dd');
         if (!empty($this->application->icon)) {
             $this->element('img', array('src' => $this->application->icon,
-                                        'class' => 'photo logo'));
+                                        'class' => 'photo logo entity_depiction'));
         }
-        $this->elementEnd('dd');
-        $this->elementEnd('dl');
 
-        $this->elementStart('dl', 'entity_fn');
-        $this->element('dt', null, _('Name'));
-        $this->elementStart('dd');
         $this->element('a', array('href' =>  $this->application->source_url,
-                                  'class' => 'url fn'),
+                                  'class' => 'url fn entity_fn'),
                             $this->application->name);
-        $this->elementEnd('dd');
-        $this->elementEnd('dl');
 
-        $this->elementStart('dl', 'entity_org');
-        $this->element('dt', null, _('Organization'));
-        $this->elementStart('dd');
         $this->element('a', array('href' =>  $this->application->homepage,
-                                  'class' => 'url'),
+                                  'class' => 'url entity_org'),
                             $this->application->organization);
-        $this->elementEnd('dd');
-        $this->elementEnd('dl');
 
-        $this->elementStart('dl', 'entity_note');
-        $this->element('dt', null, _('Description'));
-        $this->element('dd', 'note', $this->application->description);
-        $this->elementEnd('dl');
+        $this->element('div',
+                       'note entity_note',
+                       $this->application->description);
 
-        $this->elementStart('dl', 'entity_statistics');
-        $this->element('dt', null, _('Statistics'));
-        $this->elementStart('dd');
+        $this->elementStart('div', 'entity_statistics');
         $defaultAccess = ($this->application->access_type & Oauth_application::$writeAccess)
             ? 'read-write' : 'read-only';
         $profile = Profile::staticGet($this->application->owner);
@@ -205,8 +187,8 @@ class ShowApplicationAction extends OwnerDesignAction
               $defaultAccess,
               $userCnt
             ));
-        $this->elementEnd('dd');
-        $this->elementEnd('dl');
+        $this->elementEnd('div');
+
         $this->elementEnd('div');
 
         $this->elementStart('div', 'entity_actions');
@@ -259,30 +241,21 @@ class ShowApplicationAction extends OwnerDesignAction
 
         $this->elementStart('div', 'entity_data');
         $this->element('h2', null, _('Application info'));
-        $this->elementStart('dl', 'entity_consumer_key');
-        $this->element('dt', null, _('Consumer key'));
-        $this->element('dd', null, $consumer->consumer_key);
-        $this->elementEnd('dl');
+        $this->element('div',
+                       'entity_consumer_key',
+                       $consumer->consumer_key);
 
-        $this->elementStart('dl', 'entity_consumer_secret');
-        $this->element('dt', null, _('Consumer secret'));
-        $this->element('dd', null, $consumer->consumer_secret);
-        $this->elementEnd('dl');
+        $this->element('div',
+                       'entity_consumer_secret',
+                       $consumer->consumer_secret);
 
-        $this->elementStart('dl', 'entity_request_token_url');
-        $this->element('dt', null, _('Request token URL'));
-        $this->element('dd', null, common_local_url('ApiOauthRequestToken'));
-        $this->elementEnd('dl');
+        $this->element('div',
+                       'entity_request_token_url',
+                       common_local_url('ApiOauthRequestToken'));
 
-        $this->elementStart('dl', 'entity_access_token_url');
-        $this->element('dt', null, _('Access token URL'));
-        $this->element('dd', null, common_local_url('ApiOauthAccessToken'));
-        $this->elementEnd('dl');
+        $this->element('div', 'entity_access_token_url', common_local_url('ApiOauthAccessToken'));
 
-        $this->elementStart('dl', 'entity_authorize_url');
-        $this->element('dt', null, _('Authorize URL'));
-        $this->element('dd', null, common_local_url('ApiOauthAuthorize'));
-        $this->elementEnd('dl');
+        $this->element('div', 'entity_authorize_url', common_local_url('ApiOauthAuthorize'));
 
         $this->element('p', 'note',
             _('Note: We support HMAC-SHA1 signatures. We do not support the plaintext signature method.'));
diff --git a/actions/showgroup.php b/actions/showgroup.php
index f38cd420ac..a895f81b84 100644
--- a/actions/showgroup.php
+++ b/actions/showgroup.php
@@ -216,83 +216,47 @@ class ShowgroupAction extends GroupDesignAction
         $this->elementStart('div', array('id' => 'i',
                                          'class' => 'entity_profile vcard author'));
 
-        // TRANS: Group profile header (h2). Text hidden by default.
-        $this->element('h2', null, _('Group profile'));
-
-        $this->elementStart('dl', 'entity_depiction');
-        // TRANS: Label for group avatar (dt). Text hidden by default.
-        $this->element('dt', null, _('Avatar'));
-        $this->elementStart('dd');
-
         $logo = ($this->group->homepage_logo) ?
           $this->group->homepage_logo : User_group::defaultLogo(AVATAR_PROFILE_SIZE);
 
         $this->element('img', array('src' => $logo,
-                                    'class' => 'photo avatar',
+                                    'class' => 'photo avatar entity_depiction',
                                     'width' => AVATAR_PROFILE_SIZE,
                                     'height' => AVATAR_PROFILE_SIZE,
                                     'alt' => $this->group->nickname));
-        $this->elementEnd('dd');
-        $this->elementEnd('dl');
 
-        $this->elementStart('dl', 'entity_nickname');
-        // TRANS: Label for group nickname (dt). Text hidden by default.
-        $this->element('dt', null, _('Nickname'));
-        $this->elementStart('dd');
-        $hasFN = ($this->group->fullname) ? 'nickname url uid' : 'fn org nickname url uid';
+        $hasFN = ($this->group->fullname) ? 'entity_nickname nickname url uid' :
+            'entity_nickname fn org nickname url uid';
         $this->element('a', array('href' => $this->group->homeUrl(),
                                   'rel' => 'me', 'class' => $hasFN),
                             $this->group->nickname);
-        $this->elementEnd('dd');
-        $this->elementEnd('dl');
 
         if ($this->group->fullname) {
-            $this->elementStart('dl', 'entity_fn');
-            // TRANS: Label for full group name (dt). Text hidden by default.
-            $this->element('dt', null, _('Full name'));
-            $this->elementStart('dd');
-            $this->element('span', 'fn org', $this->group->fullname);
-            $this->elementEnd('dd');
-            $this->elementEnd('dl');
+            $this->element('div', 'entity_fn fn org', $this->group->fullname);
         }
 
         if ($this->group->location) {
-            $this->elementStart('dl', 'entity_location');
-            // TRANS: Label for group location (dt). Text hidden by default.
-            $this->element('dt', null, _('Location'));
-            $this->element('dd', 'label', $this->group->location);
-            $this->elementEnd('dl');
+            $this->element('div', 'entity_location label', $this->group->location);
         }
 
         if ($this->group->homepage) {
-            $this->elementStart('dl', 'entity_url');
-            // TRANS: Label for group URL (dt). Text hidden by default.
-            $this->element('dt', null, _('URL'));
-            $this->elementStart('dd');
             $this->element('a', array('href' => $this->group->homepage,
-                                      'rel' => 'me', 'class' => 'url'),
+                                      'rel' => 'me',
+                                      'class' => 'url entity_url'),
                            $this->group->homepage);
-            $this->elementEnd('dd');
-            $this->elementEnd('dl');
         }
 
         if ($this->group->description) {
-            $this->elementStart('dl', 'entity_note');
-            // TRANS: Label for group description or group note (dt). Text hidden by default.
-            $this->element('dt', null, _('Note'));
-            $this->element('dd', 'note', $this->group->description);
-            $this->elementEnd('dl');
+            $this->element('div', 'note entity_note', $this->group->description);
         }
 
         if (common_config('group', 'maxaliases') > 0) {
             $aliases = $this->group->getAliases();
 
             if (!empty($aliases)) {
-                $this->elementStart('dl', 'entity_aliases');
-                // TRANS: Label for group aliases (dt). Text hidden by default.
-                $this->element('dt', null, _('Aliases'));
-                $this->element('dd', 'aliases', implode(' ', $aliases));
-                $this->elementEnd('dl');
+                $this->element('div',
+                               'aliases entity_aliases',
+                               implode(' ', $aliases));
             }
         }
 
@@ -447,15 +411,10 @@ class ShowgroupAction extends GroupDesignAction
         // TRANS: Header for group statistics on a group page (h2).
         $this->element('h2', null, _('Statistics'));
 
-        $this->elementStart('dl', 'entity_created');
-        // @todo FIXME: i18n issue. This label gets a colon added from somewhere. Should be part of the message.
-        // TRANS: Label for creation date in statistics on group page.
-        $this->element('dt', null, _m('LABEL','Created'));
-        $this->element('dd', null, date('j M Y',
-                                                 strtotime($this->group->created)));
         $this->elementEnd('dl');
-
-        $this->elementStart('dl', 'entity_members');
+        $this->element('dt', null, _m('LABEL','Created'));
+        $this->element('dd', 'entity_created', date('j M Y',
+                                                 strtotime($this->group->created)));
         // @todo FIXME: i18n issue. This label gets a colon added from somewhere. Should be part of the message.
         // TRANS: Label for member count in statistics on group page.
         $this->element('dt', null, _m('LABEL','Members'));
diff --git a/actions/tagother.php b/actions/tagother.php
index 735d876da2..258c13bdcc 100644
--- a/actions/tagother.php
+++ b/actions/tagother.php
@@ -77,58 +77,37 @@ class TagotherAction extends Action
         $this->element('h2', null, _('User profile'));
 
         $avatar = $this->profile->getAvatar(AVATAR_PROFILE_SIZE);
-        $this->elementStart('dl', 'entity_depiction');
-        $this->element('dt', null, _('Photo'));
-        $this->elementStart('dd');
         $this->element('img', array('src' => ($avatar) ? $avatar->displayUrl() : Avatar::defaultImage(AVATAR_PROFILE_SIZE),
-                                    'class' => 'photo avatar',
+                                    'class' => 'photo avatar entity_depiction',
                                     'width' => AVATAR_PROFILE_SIZE,
                                     'height' => AVATAR_PROFILE_SIZE,
                                     'alt' =>
                                     ($this->profile->fullname) ? $this->profile->fullname :
                                     $this->profile->nickname));
-        $this->elementEnd('dd');
-        $this->elementEnd('dl');
 
-        $this->elementStart('dl', 'entity_nickname');
-        $this->element('dt', null, _('Nickname'));
-        $this->elementStart('dd');
         $this->element('a', array('href' => $this->profile->profileurl,
-                                  'class' => 'nickname'),
+                                  'class' => 'entity_nickname nickname'),
                        $this->profile->nickname);
-        $this->elementEnd('dd');
-        $this->elementEnd('dl');
 
         if ($this->profile->fullname) {
-            $this->elementStart('dl', 'entity_fn');
-            $this->element('dt', null, _('Full name'));
-            $this->elementStart('dd');
-            $this->element('span', 'fn', $this->profile->fullname);
-            $this->elementEnd('dd');
-            $this->elementEnd('dl');
+            $this->element('div', 'fn entity_fn', $this->profile->fullname);
         }
+
         if ($this->profile->location) {
-            $this->elementStart('dl', 'entity_location');
-            $this->element('dt', null, _('Location'));
-            $this->element('dd', 'label', $this->profile->location);
-            $this->elementEnd('dl');
+            $this->element('div', 'label entity_location', $this->profile->location);
         }
+
         if ($this->profile->homepage) {
-            $this->elementStart('dl', 'entity_url');
-            $this->element('dt', null, _('URL'));
-            $this->elementStart('dd');
             $this->element('a', array('href' => $this->profile->homepage,
-                                      'rel' => 'me', 'class' => 'url'),
+                                      'rel' => 'me',
+                                      'class' => 'url entity_url'),
                            $this->profile->homepage);
-            $this->elementEnd('dd');
-            $this->elementEnd('dl');
         }
+
         if ($this->profile->bio) {
-            $this->elementStart('dl', 'entity_note');
-            $this->element('dt', null, _('Note'));
-            $this->element('dd', 'note', $this->profile->bio);
-            $this->elementEnd('dl');
+            $this->element('div', 'note entity_note', $this->profile->bio);
         }
+
         $this->elementEnd('div');
 
         $this->elementStart('form', array('method' => 'post',
diff --git a/actions/userauthorization.php b/actions/userauthorization.php
index e896ff96ca..d460308c16 100644
--- a/actions/userauthorization.php
+++ b/actions/userauthorization.php
@@ -128,79 +128,56 @@ class UserauthorizationAction extends Action
         $avatar   = $params->getAvatarURL();
 
         $this->elementStart('div', 'entity_profile vcard');
-        $this->elementStart('dl', 'entity_depiction');
-        $this->element('dt', null, _('Photo'));
-        $this->elementStart('dd');
+
         if ($avatar) {
             $this->element('img', array('src' => $avatar,
-                                        'class' => 'photo avatar',
+                                        'class' => 'photo avatar entity_depiction',
                                         'width' => AVATAR_PROFILE_SIZE,
                                         'height' => AVATAR_PROFILE_SIZE,
                                         'alt' => $nickname));
         }
-        $this->elementEnd('dd');
-        $this->elementEnd('dl');
 
-        $this->elementStart('dl', 'entity_nickname');
-        $this->element('dt', null, _('Nickname'));
-        $this->elementStart('dd');
+        $this->element('div', 'entity_nickname', _('Nickname'));
+
         $hasFN = ($fullname !== '') ? 'nickname' : 'fn nickname';
+
+        // XXX: why are these raw() instead of escaped...?
+
         $this->elementStart('a', array('href' => $profile,
                                        'class' => 'url '.$hasFN));
         $this->raw($nickname);
         $this->elementEnd('a');
-        $this->elementEnd('dd');
-        $this->elementEnd('dl');
 
         if (!is_null($fullname)) {
-            $this->elementStart('dl', 'entity_fn');
-            $this->elementStart('dd');
-            $this->elementStart('span', 'fn');
+            $this->elementStart('div', 'fn entity_fn');
             $this->raw($fullname);
-            $this->elementEnd('span');
-            $this->elementEnd('dd');
-            $this->elementEnd('dl');
+            $this->elementEnd('div');
         }
+
         if (!is_null($location)) {
-            $this->elementStart('dl', 'entity_location');
-            $this->element('dt', null, _('Location'));
-            $this->elementStart('dd', 'label');
+            $this->elementStart('div', 'label entity_location');
             $this->raw($location);
-            $this->elementEnd('dd');
-            $this->elementEnd('dl');
         }
 
         if (!is_null($homepage)) {
-            $this->elementStart('dl', 'entity_url');
-            $this->element('dt', null, _('URL'));
-            $this->elementStart('dd');
             $this->elementStart('a', array('href' => $homepage,
-                                                'class' => 'url'));
+                                           'class' => 'url entity_url'));
             $this->raw($homepage);
             $this->elementEnd('a');
-            $this->elementEnd('dd');
-            $this->elementEnd('dl');
         }
 
         if (!is_null($bio)) {
-            $this->elementStart('dl', 'entity_note');
-            $this->element('dt', null, _('Note'));
-            $this->elementStart('dd', 'note');
+            $this->elementStart('div', 'note entity_note');
             $this->raw($bio);
             $this->elementEnd('dd');
-            $this->elementEnd('dl');
         }
 
         if (!is_null($license)) {
-            $this->elementStart('dl', 'entity_license');
-            $this->element('dt', null, _('License'));
-            $this->elementStart('dd', 'license');
             $this->element('a', array('href' => $license,
-                                      'class' => 'license'),
+                                      'class' => 'license entity_license'),
                            $license);
-            $this->elementEnd('dd');
-            $this->elementEnd('dl');
         }
+
         $this->elementEnd('div');
 
         $this->elementStart('div', 'entity_actions');
diff --git a/lib/action.php b/lib/action.php
index 0e5d7ae361..095c410b11 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -526,11 +526,7 @@ class Action extends HTMLOutputter // lawsuit
     function showPrimaryNav()
     {
         $user = common_current_user();
-        $this->elementStart('dl', array('id' => 'site_nav_global_primary'));
-        // TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-        $this->element('dt', null, _('Primary site navigation'));
-        $this->elementStart('dd');
-        $this->elementStart('ul', array('class' => 'nav'));
+        $this->elementStart('ul', array('class' => 'nav site_nav_global_primary'));
         if (Event::handle('StartPrimaryNav', array($this))) {
             if ($user) {
                 // TRANS: Tooltip for main menu option "Personal"
@@ -600,8 +596,6 @@ class Action extends HTMLOutputter // lawsuit
             Event::handle('EndPrimaryNav', array($this));
         }
         $this->elementEnd('ul');
-        $this->elementEnd('dd');
-        $this->elementEnd('dl');
     }
 
     /**
@@ -614,14 +608,10 @@ class Action extends HTMLOutputter // lawsuit
         // Revist. Should probably do an hAtom pattern here
         $text = common_config('site', 'notice');
         if ($text) {
-            $this->elementStart('dl', array('id' => 'site_notice',
+            $this->elementStart('div', array('id' => 'site_notice',
                                             'class' => 'system_notice'));
-            // TRANS: DT element for site notice. String is hidden in default CSS.
-            $this->element('dt', null, _('Site notice'));
-            $this->elementStart('dd', null);
             $this->raw($text);
-            $this->elementEnd('dd');
-            $this->elementEnd('dl');
+            $this->elementEnd('div');
         }
     }
 
@@ -682,13 +672,7 @@ class Action extends HTMLOutputter // lawsuit
      */
     function showLocalNavBlock()
     {
-        $this->elementStart('dl', array('id' => 'site_nav_local_views'));
-        // TRANS: DT element for local views block. String is hidden in default CSS.
-        $this->element('dt', null, _('Local views'));
-        $this->elementStart('dd');
         $this->showLocalNav();
-        $this->elementEnd('dd');
-        $this->elementEnd('dl');
     }
 
     /**
@@ -751,17 +735,13 @@ class Action extends HTMLOutputter // lawsuit
 
         if ($dclass != 'Action' || Event::hasHandler('StartShowPageNotice')) {
 
-            $this->elementStart('dl', array('id' => 'page_notice',
+            $this->elementStart('div', array('id' => 'page_notice',
                                             'class' => 'system_notice'));
-            // TRANS: DT element for page notice. String is hidden in default CSS.
-            $this->element('dt', null, _('Page notice'));
-            $this->elementStart('dd');
             if (Event::handle('StartShowPageNotice', array($this))) {
                 $this->showPageNotice();
                 Event::handle('EndShowPageNotice', array($this));
             }
-            $this->elementEnd('dd');
-            $this->elementEnd('dl');
+            $this->elementEnd('div');
         }
     }
 
@@ -853,11 +833,7 @@ class Action extends HTMLOutputter // lawsuit
      */
     function showSecondaryNav()
     {
-        $this->elementStart('dl', array('id' => 'site_nav_global_secondary'));
-        // TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-        $this->element('dt', null, _('Secondary site navigation'));
-        $this->elementStart('dd', null);
-        $this->elementStart('ul', array('class' => 'nav'));
+        $this->elementStart('ul', array('class' => 'nav site_nav_global_secondary'));
         if (Event::handle('StartSecondaryNav', array($this))) {
             $this->menuItem(common_local_url('doc', array('title' => 'help')),
                             // TRANS: Secondary navigation menu option leading to help on StatusNet.
@@ -893,8 +869,6 @@ class Action extends HTMLOutputter // lawsuit
             Event::handle('EndSecondaryNav', array($this));
         }
         $this->elementEnd('ul');
-        $this->elementEnd('dd');
-        $this->elementEnd('dl');
     }
 
     /**
@@ -904,10 +878,8 @@ class Action extends HTMLOutputter // lawsuit
      */
     function showLicenses()
     {
-        $this->elementStart('dl', array('id' => 'licenses'));
         $this->showStatusNetLicense();
         $this->showContentLicense();
-        $this->elementEnd('dl');
     }
 
     /**
@@ -1335,11 +1307,7 @@ class Action extends HTMLOutputter // lawsuit
     {
         // Does a little before-after block for next/prev page
         if ($have_before || $have_after) {
-            $this->elementStart('dl', 'pagination');
-            // TRANS: DT element for pagination (previous/next, etc.).
-            $this->element('dt', null, _('Pagination'));
-            $this->elementStart('dd', null);
-            $this->elementStart('ul', array('class' => 'nav'));
+            $this->elementStart('ul', array('class' => 'nav pagination'));
         }
         if ($have_before) {
             $pargs   = array('page' => $page-1);
@@ -1363,8 +1331,6 @@ class Action extends HTMLOutputter // lawsuit
         }
         if ($have_before || $have_after) {
             $this->elementEnd('ul');
-            $this->elementEnd('dd');
-            $this->elementEnd('dl');
         }
     }
 
diff --git a/lib/attachmentlist.php b/lib/attachmentlist.php
index 7e536925bf..80f8cdb680 100644
--- a/lib/attachmentlist.php
+++ b/lib/attachmentlist.php
@@ -93,19 +93,12 @@ class AttachmentList extends Widget
 
     function showListStart()
     {
-        $this->out->elementStart('dl', array('id' =>'attachments',
-                                             'class' => 'entry-content'));
-        // TRANS: DT element label in attachment list.
-        $this->out->element('dt', null, _('Attachments'));
-        $this->out->elementStart('dd');
-        $this->out->elementStart('ol', array('class' => 'attachments'));
+        $this->out->elementStart('ol', array('class' => 'attachments entry-content'));
     }
 
     function showListEnd()
     {
-        $this->out->elementEnd('dd');
         $this->out->elementEnd('ol');
-        $this->out->elementEnd('dl');
     }
 
     /**
@@ -289,32 +282,22 @@ class Attachment extends AttachmentListItem
             $this->out->elementStart('div', array('id' => 'oembed_info',
                                                   'class' => 'entry-content'));
             if (!empty($this->oembed->author_name)) {
-                $this->out->elementStart('dl', 'vcard author');
-                // TRANS: DT element label in attachment list item.
-                $this->out->element('dt', null, _('Author'));
-                $this->out->elementStart('dd', 'fn');
+                $this->out->elementStart('div', 'fn vcard author');
                 if (empty($this->oembed->author_url)) {
                     $this->out->text($this->oembed->author_name);
                 } else {
                     $this->out->element('a', array('href' => $this->oembed->author_url,
                                                    'class' => 'url'), $this->oembed->author_name);
                 }
-                $this->out->elementEnd('dd');
-                $this->out->elementEnd('dl');
             }
             if (!empty($this->oembed->provider)) {
-                $this->out->elementStart('dl', 'vcard');
-                // TRANS: DT element label in attachment list item.
-                $this->out->element('dt', null, _('Provider'));
-                $this->out->elementStart('dd', 'fn');
+                $this->out->elementStart('div', 'fn vcard');
                 if (empty($this->oembed->provider_url)) {
                     $this->out->text($this->oembed->provider);
                 } else {
                     $this->out->element('a', array('href' => $this->oembed->provider_url,
                                                    'class' => 'url'), $this->oembed->provider);
                 }
-                $this->out->elementEnd('dd');
-                $this->out->elementEnd('dl');
             }
             $this->out->elementEnd('div');
         }
diff --git a/lib/galleryaction.php b/lib/galleryaction.php
index 31e36803a7..b8edbbb7ba 100644
--- a/lib/galleryaction.php
+++ b/lib/galleryaction.php
@@ -117,9 +117,6 @@ class GalleryAction extends OwnerDesignAction
             $content[$t] = $t;
         }
         if ($tags) {
-            $this->elementStart('dl', array('id'=>'filter_tags'));
-            $this->element('dt', null, _('Filter tags'));
-            $this->elementStart('dd');
             $this->elementStart('ul');
             $this->elementStart('li', array('id' => 'filter_tags_all',
                                              'class' => 'child_1'));
@@ -133,7 +130,7 @@ class GalleryAction extends OwnerDesignAction
             $this->elementStart('li', array('id'=>'filter_tags_item'));
             $this->elementStart('form', array('name' => 'bytag',
                                                'id' => 'form_filter_bytag',
-                                               'action' => common_path('?action=' . $this->trimmed('action')),
+                                              'action' => common_path('?action=' . $this->trimmed('action')),
                                                'method' => 'post'));
             $this->elementStart('fieldset');
             $this->element('legend', null, _('Select tag to filter'));
@@ -145,8 +142,6 @@ class GalleryAction extends OwnerDesignAction
             $this->elementEnd('form');
             $this->elementEnd('li');
             $this->elementEnd('ul');
-            $this->elementEnd('dd');
-            $this->elementEnd('dl');
         }
     }
 
diff --git a/lib/messageform.php b/lib/messageform.php
index 9d3f955a81..7f21f7ecd0 100644
--- a/lib/messageform.php
+++ b/lib/messageform.php
@@ -162,11 +162,10 @@ class MessageForm extends Form
         $contentLimit = Message::maxContent();
 
         if ($contentLimit > 0) {
-            $this->out->elementStart('dl', 'form_note');
-            $this->out->element('dt', null, _('Available characters'));
-            $this->out->element('dd', array('id' => 'notice_text-count'),
+            $this->out->element('span',
+                                array('id' => 'notice_text-count',
+                                      'class' => 'form_note'),
                                 $contentLimit);
-            $this->out->elementEnd('dl');
         }
     }
 
diff --git a/lib/noticeform.php b/lib/noticeform.php
index 5140663569..432316adc9 100644
--- a/lib/noticeform.php
+++ b/lib/noticeform.php
@@ -182,11 +182,10 @@ class NoticeForm extends Form
             $contentLimit = Notice::maxContent();
 
             if ($contentLimit > 0) {
-                $this->out->elementStart('dl', 'form_note');
-                $this->out->element('dt', null, _('Available characters'));
-                $this->out->element('dd', array('id' => 'notice_text-count'),
+                $this->out->element('span', 
+                                    array('id' => 'notice_text-count',
+                                          'class' => 'form_note'),
                                     $contentLimit);
-                $this->out->elementEnd('dl');
             }
 
             if (common_config('attachments', 'uploads')) {
diff --git a/lib/profileaction.php b/lib/profileaction.php
index 4bfc4d48d9..9ba8261229 100644
--- a/lib/profileaction.php
+++ b/lib/profileaction.php
@@ -187,53 +187,42 @@ class ProfileAction extends OwnerDesignAction
         $this->element('h2', null, _('Statistics'));
 
         // Other stats...?
-        $this->elementStart('dl', 'entity_user-id');
+        $this->elementStart('dl');
         $this->element('dt', null, _('User ID'));
-        $this->element('dd', null, $this->profile->id);
-        $this->elementEnd('dl');
+        $this->element('dd', 'entity_user-id', $this->profile->id);
 
-        $this->elementStart('dl', 'entity_member-since');
         $this->element('dt', null, _('Member since'));
-        $this->element('dd', null, date('j M Y',
+        $this->element('dd', 'entity_member-since', date('j M Y',
                                         strtotime($this->profile->created)));
-        $this->elementEnd('dl');
 
-        $this->elementStart('dl', 'entity_subscriptions');
         $this->elementStart('dt');
         $this->element('a', array('href' => common_local_url('subscriptions',
                                                              array('nickname' => $this->profile->nickname))),
                        _('Subscriptions'));
         $this->elementEnd('dt');
-        $this->element('dd', null, $subs_count);
-        $this->elementEnd('dl');
+        $this->element('dd', 'entity_subscriptions', $subs_count);
 
-        $this->elementStart('dl', 'entity_subscribers');
         $this->elementStart('dt');
         $this->element('a', array('href' => common_local_url('subscribers',
                                                              array('nickname' => $this->profile->nickname))),
                        _('Subscribers'));
         $this->elementEnd('dt');
-        $this->element('dd', 'subscribers', $subbed_count);
-        $this->elementEnd('dl');
+        $this->element('dd', 'subscribers entity_subscribers', $subbed_count);
 
-        $this->elementStart('dl', 'entity_groups');
         $this->elementStart('dt');
         $this->element('a', array('href' => common_local_url('usergroups',
                                                              array('nickname' => $this->profile->nickname))),
                        _('Groups'));
         $this->elementEnd('dt');
-        $this->element('dd', 'groups', $group_count);
-        $this->elementEnd('dl');
+        $this->element('dd', 'groups entity_groups', $group_count);
 
-        $this->elementStart('dl', 'entity_notices');
         $this->element('dt', null, _('Notices'));
-        $this->element('dd', null, $notice_count);
-        $this->elementEnd('dl');
+        $this->element('dd', 'entity_notices', $notice_count);
 
-        $this->elementStart('dl', 'entity_daily_notices');
         // TRANS: Average count of posts made per day since account registration
         $this->element('dt', null, _('Daily average'));
-        $this->element('dd', null, $daily_count);
+        $this->element('dd', 'entity_daily_notices', $daily_count);
+
         $this->elementEnd('dl');
 
         $this->elementEnd('div');
diff --git a/lib/searchaction.php b/lib/searchaction.php
index 6d7f46cd6e..67d0bcdeb8 100644
--- a/lib/searchaction.php
+++ b/lib/searchaction.php
@@ -165,12 +165,10 @@ You can also try your search on other engines:
 E_O_T
 ), $qe, $qe, $qe, $qe, $qe);
         }
-        $this->elementStart('dl', array('id' => 'help_search', 'class' => 'help'));
-        // TRANS: Definition list item with instructions on how to get (better) search results.
-        $this->element('dt', null, _('Search help'));
-        $this->elementStart('dd', 'instructions');
+        $this->elementStart('div', 'help instructions');
         $this->raw(common_markup_to_html($message));
-        $this->elementEnd('dd');
+        $this->elementEnd('div');
+
         $this->elementEnd('div');
     }
 }
diff --git a/lib/subscriptionlist.php b/lib/subscriptionlist.php
index fc8f33f2ec..3ca4603948 100644
--- a/lib/subscriptionlist.php
+++ b/lib/subscriptionlist.php
@@ -98,8 +98,6 @@ class SubscriptionListItem extends ProfileListItem
     {
         $tags = Profile_tag::getTags($this->owner->id, $this->profile->id);
 
-        $this->out->elementStart('dl', 'entity_tags');
-        $this->out->elementStart('dt');
         if ($this->isOwn()) {
             $this->out->element('a', array('href' => common_local_url('tagother',
                                                                       array('id' => $this->profile->id))),
@@ -107,10 +105,8 @@ class SubscriptionListItem extends ProfileListItem
         } else {
             $this->out->text(_('Tags'));
         }
-        $this->out->elementEnd('dt');
-        $this->out->elementStart('dd');
         if ($tags) {
-            $this->out->elementStart('ul', 'tags xoxo');
+            $this->out->elementStart('ul', 'tags xoxo entity_tags');
             foreach ($tags as $tag) {
                 $this->out->elementStart('li');
                 // Avoid space by using raw output.
@@ -126,7 +122,5 @@ class SubscriptionListItem extends ProfileListItem
         } else {
             $this->out->text(_('(None)'));
         }
-        $this->out->elementEnd('dd');
-        $this->out->elementEnd('dl');
     }
 }
diff --git a/lib/userprofile.php b/lib/userprofile.php
index 2813f735ea..71b54682af 100644
--- a/lib/userprofile.php
+++ b/lib/userprofile.php
@@ -103,26 +103,21 @@ class UserProfile extends Widget
                 $avatar = $this->profile->getAvatar(73);
             }
 
-            $this->out->elementStart('dl', 'entity_depiction');
-            $this->out->element('dt', null, _('Photo'));
-            $this->out->elementStart('dd');
-            $this->out->element('img', array('src' => ($avatar) ? $avatar->displayUrl() : Avatar::defaultImage(AVATAR_PROFILE_SIZE),
-                                        'class' => 'photo avatar',
-                                        'width' => AVATAR_PROFILE_SIZE,
-                                        'height' => AVATAR_PROFILE_SIZE,
-                                        'alt' => $this->profile->nickname));
-            $this->out->elementEnd('dd');
-
+            $this->out->element('img', 
+                                array('src' => ($avatar) ? $avatar->displayUrl() : Avatar::defaultImage(AVATAR_PROFILE_SIZE),
+                                      'class' => 'photo avatar entity_depiction',
+                                      'width' => AVATAR_PROFILE_SIZE,
+                                      'height' => AVATAR_PROFILE_SIZE,
+                                      'alt' => $this->profile->nickname));
+            
             $cur = common_current_user();
+
             if ($cur && $cur->id == $this->profile->id) {
-                $this->out->elementStart('dd');
                 $this->out->element('a', array('href' => common_local_url('avatarsettings')), _('Edit Avatar'));
-                $this->out->elementEnd('dd');
             }
 
-            $this->out->elementEnd('dl');
-
-            Event::handle('EndProfilePageAvatar', array($this->out, $this->profile));
+            Event::handle('EndProfilePageAvatar',
+                          array($this->out, $this->profile));
         }
     }
 
@@ -130,15 +125,12 @@ class UserProfile extends Widget
     {
         if (Event::handle('StartProfilePageNickname', array($this->out, $this->profile))) {
 
-            $this->out->elementStart('dl', 'entity_nickname');
-            $this->out->element('dt', null, _('Nickname'));
-            $this->out->elementStart('dd');
-            $hasFN = ($this->profile->fullname) ? 'nickname url uid' : 'fn nickname url uid';
-            $this->out->element('a', array('href' => $this->profile->profileurl,
-                                      'rel' => 'me', 'class' => $hasFN),
+            $hasFN = ($this->profile->fullname) ? 'entity_nickname nickname url uid' : 'entity_nickname fn nickname url uid';
+            $this->out->element('a',
+                                array('href' => $this->profile->profileurl,
+                                      'rel' => 'me',
+                                      'class' => $hasFN),
                            $this->profile->nickname);
-            $this->out->elementEnd('dd');
-            $this->out->elementEnd('dl');
 
             Event::handle('EndProfilePageNickname', array($this->out, $this->profile));
         }
@@ -148,12 +140,9 @@ class UserProfile extends Widget
     {
         if (Event::handle('StartProfilePageFullName', array($this->out, $this->profile))) {
             if ($this->profile->fullname) {
-                $this->out->elementStart('dl', 'entity_fn');
-                $this->out->element('dt', null, _('Full name'));
-                $this->out->elementStart('dd');
-                $this->out->element('span', 'fn', $this->profile->fullname);
-                $this->out->elementEnd('dd');
-                $this->out->elementEnd('dl');
+                $this->out->element('span',
+                                    'entity_fn fn',
+                                    $this->profile->fullname);
             }
             Event::handle('EndProfilePageFullName', array($this->out, $this->profile));
         }
@@ -163,10 +152,9 @@ class UserProfile extends Widget
     {
         if (Event::handle('StartProfilePageLocation', array($this->out, $this->profile))) {
             if ($this->profile->location) {
-                $this->out->elementStart('dl', 'entity_location');
-                $this->out->element('dt', null, _('Location'));
-                $this->out->element('dd', 'label', $this->profile->location);
-                $this->out->elementEnd('dl');
+                $this->out->element('span',
+                                    'entity_location label',
+                                    $this->profile->location);
             }
             Event::handle('EndProfilePageLocation', array($this->out, $this->profile));
         }
@@ -176,14 +164,11 @@ class UserProfile extends Widget
     {
         if (Event::handle('StartProfilePageHomepage', array($this->out, $this->profile))) {
             if ($this->profile->homepage) {
-                $this->out->elementStart('dl', 'entity_url');
-                $this->out->element('dt', null, _('URL'));
-                $this->out->elementStart('dd');
-                $this->out->element('a', array('href' => $this->profile->homepage,
-                                          'rel' => 'me', 'class' => 'url'),
+                $this->out->element('a',
+                                    array('href' => $this->profile->homepage,
+                                          'rel' => 'me',
+                                          'class' => 'url entity_url'),
                                $this->profile->homepage);
-                $this->out->elementEnd('dd');
-                $this->out->elementEnd('dl');
             }
             Event::handle('EndProfilePageHomepage', array($this->out, $this->profile));
         }
@@ -193,10 +178,9 @@ class UserProfile extends Widget
     {
         if (Event::handle('StartProfilePageBio', array($this->out, $this->profile))) {
             if ($this->profile->bio) {
-                $this->out->elementStart('dl', 'entity_note');
-                $this->out->element('dt', null, _('Note'));
-                $this->out->element('dd', 'note', $this->profile->bio);
-                $this->out->elementEnd('dl');
+                $this->out->element('div',
+                                    'note entity_note',
+                                    $this->profile->bio);
             }
             Event::handle('EndProfilePageBio', array($this->out, $this->profile));
         }
@@ -208,10 +192,7 @@ class UserProfile extends Widget
             $tags = Profile_tag::getTags($this->profile->id, $this->profile->id);
 
             if (count($tags) > 0) {
-                $this->out->elementStart('dl', 'entity_tags');
-                $this->out->element('dt', null, _('Tags'));
-                $this->out->elementStart('dd');
-                $this->out->elementStart('ul', 'tags xoxo');
+                $this->out->elementStart('ul', 'tags xoxo entity_tags');
                 foreach ($tags as $tag) {
                     $this->out->elementStart('li');
                     // Avoid space by using raw output.
@@ -222,8 +203,6 @@ class UserProfile extends Widget
                     $this->out->elementEnd('li');
                 }
                 $this->out->elementEnd('ul');
-                $this->out->elementEnd('dd');
-                $this->out->elementEnd('dl');
             }
             Event::handle('EndProfilePageProfileTags', array($this->out, $this->profile));
         }
diff --git a/plugins/OStatus/actions/ostatussub.php b/plugins/OStatus/actions/ostatussub.php
index a293fda5db..5ca7ce7674 100644
--- a/plugins/OStatus/actions/ostatussub.php
+++ b/plugins/OStatus/actions/ostatussub.php
@@ -163,65 +163,41 @@ class OStatusSubAction extends Action
         }
 
         $this->elementStart('div', 'entity_profile vcard');
-        $this->elementStart('dl', 'entity_depiction');
-        $this->element('dt', null, _m('Photo'));
-        $this->elementStart('dd');
         $this->element('img', array('src' => $avatar,
-                                    'class' => 'photo avatar',
+                                    'class' => 'photo avatar entity_depiction',
                                     'width' => AVATAR_PROFILE_SIZE,
                                     'height' => AVATAR_PROFILE_SIZE,
                                     'alt' => $nickname));
-        $this->elementEnd('dd');
-        $this->elementEnd('dl');
 
-        $this->elementStart('dl', 'entity_nickname');
-        $this->element('dt', null, _m('Nickname'));
-        $this->elementStart('dd');
-        $hasFN = ($fullname !== '') ? 'nickname' : 'fn nickname';
+        $hasFN = ($fullname !== '') ? 'nickname' : 'fn nickname entity_nickname';
         $this->elementStart('a', array('href' => $profile,
                                        'class' => 'url '.$hasFN));
         $this->raw($nickname);
         $this->elementEnd('a');
-        $this->elementEnd('dd');
-        $this->elementEnd('dl');
 
         if (!is_null($fullname)) {
-            $this->elementStart('dl', 'entity_fn');
-            $this->elementStart('dd');
-            $this->elementStart('span', 'fn');
+            $this->elementStart('div', 'fn entity_fn');
             $this->raw($fullname);
-            $this->elementEnd('span');
-            $this->elementEnd('dd');
-            $this->elementEnd('dl');
+            $this->elementEnd('div');
         }
+
         if (!is_null($location)) {
-            $this->elementStart('dl', 'entity_location');
-            $this->element('dt', null, _m('Location'));
-            $this->elementStart('dd', 'label');
+            $this->elementStart('div', 'label entity_location');
             $this->raw($location);
-            $this->elementEnd('dd');
-            $this->elementEnd('dl');
+            $this->elementEnd('div');
         }
 
         if (!is_null($homepage)) {
-            $this->elementStart('dl', 'entity_url');
-            $this->element('dt', null, _m('URL'));
-            $this->elementStart('dd');
             $this->elementStart('a', array('href' => $homepage,
-                                                'class' => 'url'));
+                                           'class' => 'url entity_url'));
             $this->raw($homepage);
             $this->elementEnd('a');
-            $this->elementEnd('dd');
-            $this->elementEnd('dl');
         }
 
         if (!is_null($note)) {
-            $this->elementStart('dl', 'entity_note');
-            $this->element('dt', null, _m('Note'));
-            $this->elementStart('dd', 'note');
+            $this->elementStart('div', 'note entity_note');
             $this->raw($note);
-            $this->elementEnd('dd');
-            $this->elementEnd('dl');
+            $this->elementEnd('div');
         }
         $this->elementEnd('div');
     }

From bbaf9d7f425b7b59f6e910a757c318ea2a420369 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Fri, 14 Jan 2011 15:53:02 -0500
Subject: [PATCH 296/655] some fixes for new no-dl layout

---
 lib/action.php             | 13 ++++++++++---
 theme/base/css/display.css |  6 ++++--
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/lib/action.php b/lib/action.php
index 095c410b11..96618c6083 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -526,7 +526,8 @@ class Action extends HTMLOutputter // lawsuit
     function showPrimaryNav()
     {
         $user = common_current_user();
-        $this->elementStart('ul', array('class' => 'nav site_nav_global_primary'));
+        $this->elementStart('ul', array('class' => 'nav',
+                                        'id' => 'site_nav_global_primary'));
         if (Event::handle('StartPrimaryNav', array($this))) {
             if ($user) {
                 // TRANS: Tooltip for main menu option "Personal"
@@ -672,7 +673,11 @@ class Action extends HTMLOutputter // lawsuit
      */
     function showLocalNavBlock()
     {
+        // Need to have this ID for CSS; I'm too lazy to add it to
+        // all menus
+        $this->elementStart('div', array('id' => 'site_nav_local_views'));
         $this->showLocalNav();
+        $this->elementEnd('div');
     }
 
     /**
@@ -833,7 +838,8 @@ class Action extends HTMLOutputter // lawsuit
      */
     function showSecondaryNav()
     {
-        $this->elementStart('ul', array('class' => 'nav site_nav_global_secondary'));
+        $this->elementStart('ul', array('class' => 'nav',
+                                        'id' => 'site_nav_global_secondary'));
         if (Event::handle('StartSecondaryNav', array($this))) {
             $this->menuItem(common_local_url('doc', array('title' => 'help')),
                             // TRANS: Secondary navigation menu option leading to help on StatusNet.
@@ -1307,7 +1313,8 @@ class Action extends HTMLOutputter // lawsuit
     {
         // Does a little before-after block for next/prev page
         if ($have_before || $have_after) {
-            $this->elementStart('ul', array('class' => 'nav pagination'));
+            $this->elementStart('ul', array('class' => 'nav',
+                                            'id' => 'pagination'));
         }
         if ($have_before) {
             $pargs   = array('page' => $page-1);
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 8c364febce..d35a8a706e 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -421,7 +421,7 @@ display:none;
 margin-bottom:11px;
 }
 
-#site_nav_global_secondary ul li {
+#site_nav_global_secondary li {
 display:inline;
 margin-right:18px;
 }
@@ -874,7 +874,9 @@ text-transform:uppercase;
 font-size:1em;
 }
 
-#entity_statistics dt,
+#entity_statistics dt {
+margin-right:11px;
+}
 #entity_statistics dd {
 display:inline;
 margin-right:11px;

From 39cf147a77f2d53bd53885716c44b7e4951d0e45 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Fri, 14 Jan 2011 15:56:25 -0500
Subject: [PATCH 297/655] remove dt/dd pairs for license blocks

---
 lib/action.php | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/lib/action.php b/lib/action.php
index 96618c6083..c01a686904 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -895,9 +895,6 @@ class Action extends HTMLOutputter // lawsuit
      */
     function showStatusNetLicense()
     {
-        // TRANS: DT element for StatusNet software license.
-        $this->element('dt', array('id' => 'site_statusnet_license'), _('StatusNet software license'));
-        $this->elementStart('dd', null);
         if (common_config('site', 'broughtby')) {
             // TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
             // TRANS: Text between [] is a link description, text between () is the link itself.
@@ -916,7 +913,6 @@ class Action extends HTMLOutputter // lawsuit
         $instr .= sprintf(_('It runs the [StatusNet](http://status.net/) microblogging software, version %s, available under the [GNU Affero General Public License](http://www.fsf.org/licensing/licenses/agpl-3.0.html).'), STATUSNET_VERSION);
         $output = common_markup_to_html($instr);
         $this->raw($output);
-        $this->elementEnd('dd');
         // do it
     }
 
@@ -928,10 +924,6 @@ class Action extends HTMLOutputter // lawsuit
     function showContentLicense()
     {
         if (Event::handle('StartShowContentLicense', array($this))) {
-            // TRANS: DT element for StatusNet site content license.
-            $this->element('dt', array('id' => 'site_content_license'), _('Site content license'));
-            $this->elementStart('dd', array('id' => 'site_content_license_cc'));
-
             switch (common_config('license', 'type')) {
             case 'private':
                 // TRANS: Content license displayed when license is set to 'private'.
@@ -992,7 +984,6 @@ class Action extends HTMLOutputter // lawsuit
                 break;
             }
 
-            $this->elementEnd('dd');
             Event::handle('EndShowContentLicense', array($this));
         }
     }

From ade2d04cb30cd249794f53a2a92e1c601073402c Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Tue, 18 Jan 2011 15:58:28 -0800
Subject: [PATCH 298/655] Work in progress on helper wizard for feed mirror
 discovery/setup

---
 plugins/SubMirror/actions/mirrorsettings.php  |   2 +
 .../SubMirror/images/providers/facebook.png   | Bin 0 -> 958 bytes
 plugins/SubMirror/images/providers/feed.png   | Bin 0 -> 2434 bytes
 .../SubMirror/images/providers/linkedin.png   | Bin 0 -> 2100 bytes
 .../SubMirror/images/providers/statusnet.png  | Bin 0 -> 6168 bytes
 .../SubMirror/images/providers/twitter.png    | Bin 0 -> 1192 bytes
 .../SubMirror/images/providers/wordpress.png  | Bin 0 -> 4861 bytes
 plugins/SubMirror/lib/addmirrorwizard.php     | 155 ++++++++++++++++++
 8 files changed, 157 insertions(+)
 create mode 100644 plugins/SubMirror/images/providers/facebook.png
 create mode 100644 plugins/SubMirror/images/providers/feed.png
 create mode 100644 plugins/SubMirror/images/providers/linkedin.png
 create mode 100644 plugins/SubMirror/images/providers/statusnet.png
 create mode 100644 plugins/SubMirror/images/providers/twitter.png
 create mode 100644 plugins/SubMirror/images/providers/wordpress.png
 create mode 100644 plugins/SubMirror/lib/addmirrorwizard.php

diff --git a/plugins/SubMirror/actions/mirrorsettings.php b/plugins/SubMirror/actions/mirrorsettings.php
index 20e1807b3d..195946c884 100644
--- a/plugins/SubMirror/actions/mirrorsettings.php
+++ b/plugins/SubMirror/actions/mirrorsettings.php
@@ -88,6 +88,8 @@ class MirrorSettingsAction extends AccountSettingsAction
 
     function showAddFeedForm()
     {
+        $form = new AddMirrorWizard($this);
+        $form->show();
         $form = new AddMirrorForm($this);
         $form->show();
     }
diff --git a/plugins/SubMirror/images/providers/facebook.png b/plugins/SubMirror/images/providers/facebook.png
new file mode 100644
index 0000000000000000000000000000000000000000..13a53aa63cfb8204e93237a364f795717c16f58d
GIT binary patch
literal 958
zcmV;v13~<WP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2ipM>
z7brL%Yf~uz00TZrL_t(&-tC%OPZL2D$NxLKy=)6>DNtxd35bM*i!mZz5>1H4G{z?r
z)F&SOD1HW?eI@aYgs6#8qY0+*fp`N!K<=ed+NIs=?Dzl?3tNgxp{siy_spJ|-`R6!
z&de+~G&0scH1ht@VlvwcfQK`L#v)Q;Al@~|b9GmS7n9iw00^8TM9yhVb4!^%vgLV4
z%3?CxOB@t7cES@lTpSM|9A)Pm0Iyeo-zUH;@Zfn4gm7RCuq+0~7))wmJ*&cEtg-+^
zzXy?U5NA4~IM;a`Elo8DhXSY)y)aA*IYo!AoA|bz!Gnj-v6fLP2OuPg=<jRA?Hipq
z84ZCDt}rus0>5u_Xo81_N8l?bgrq7z?!>!stG@#^lIW}?7I=bd7h7@ta@+m~UnKUA
z1fZ!=!lkp#h}Ku{`yEZEV0%CuY6x|<HJ~{bvej7@LuNyTs+k1?o}N#`Fs;e}h(;uY
zkJ*RL^!yrLCT6gd%z|3m02x_DUezlDASim__jzo+|M=+#JbC>Es%AQGCDsfR3oF^*
z9(=_BsG0#vt^czYasmF?YP9u47+t3u;1RZc)OIp#+t%k5aP@o(PTA-U)55bilgO*a
z;R5uuH{$-?K2!&NCEEu4UJS&$ZFL!0#oMvDq5u^iLb^%!EQcx{Kvj*Rn;Ay{<P-zU
zaxj2NEwH1Qg;v%!@b2RR#9wNk=2!>~b=5XA4aMZ_cgQ(ymu_Mv1>G<YAK>%UD%RHX
zAY}U^-@Dmk3!rEwhF^?hVkWgqC+D=HGf-Ip(pd%RY~e<{*v6bvirIxUK20UvQo;pr
z0bBqVzy<j84NXAw6fFG*EuznU-Q+j|soIa)P@tp@MKh3BjNJen04eB4T}`lT00Gf!
z`<y2nYC{1;>!p%5Qt2EN#rRp^ZM%d62;t!Il<&%H=P`OgDDY%oeG|fMdYidP>;kv|
z1xd^pAm?=;C6}$USBV)cEN6B-*9?mBud7I{=S$j<^LoK4g#dtJ>$YCrP_dCy%LcHL
zl5J-q2Ed{W46LM$9S0Oth()Bt*3TYx4GvT&V+EHNe=D(wlpq7~uEAJD8U<t2F@euO
gV-aa|Al^0j1G`^69s)#pY5)KL07*qoM6N<$f*wVehX4Qo

literal 0
HcmV?d00001

diff --git a/plugins/SubMirror/images/providers/feed.png b/plugins/SubMirror/images/providers/feed.png
new file mode 100644
index 0000000000000000000000000000000000000000..bd1da4f9142d71816e84f7b26bcd5a29596fd1d5
GIT binary patch
literal 2434
zcmV-|34Qj7P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00006VoOIv0RI60
z0RN!9r;`8x00(qQO+^RU2N4r2B2iI1&Hw-jBuPX;RA_<CntgCwRT+n$bMD#QY&L0<
z=Ch?uOVhNJmQq4nsTI?pRgn)tWw2T-Vj08{M5zNhIy&Px4pv2FbO3RnP+*v$Q<M>;
zsDvV8rwy^Rjde&$8%Uea=4<n@clX|N{3DxWH+ydqQVM<lxp&XJ=iKML=RLpooSO)I
z?7-%t4MK?Pfek>JRI0?!_iUJUoDQH3s5QpyUbC~S*2_;!Y^cAfXthTCIy`IE<$0wg
zWET_=2n8{&#uziwVPY?jMo&MVwoG4vF#;zZXRy16zV;4=`ug`;!rWc;L|2{faBplb
z{+bmEK3KM-G8oCv$3ERlyng^UZX*C81wtgR5)dQT(RRcc-V2eu0z!gR7_u-jLjUPr
z+TUu7yYcvKmp;+?SVjPE+*EvXC=z*e-bE{L2ZtGI>jJIE2K->*lkFq77-6ABF1Bsa
za<~C|Xz=FMk9Y1E3t<0O3fBa~*{?6SWMv@H-H&~`cPzXQ8-DD!0M|r_*&$BUznO6D
z*k!ACcGXJ&Ddn%qDk}ndD0a@m14uJSFz8aYWO2YC?gtPDHWzKk&dYnH{Gt`~H8x{h
z_nd?`8jLn*Bhjja=KmbR9*9;eA;k50r6t(ieV*_Io42Ei$}x#yj6I0ka}u}fIBs_{
zZfgU?2R|@)qXE}Nm;v%iOKI(oUat_;WET_=JK65}=B-)9sJR#5X-4C;9>sa54yW-|
zoKuI+D!g$`@_v{|em=smL18Ehgn|s(37@p_W*>Q?M9p1}n!6k>+k)<Sm&AWxAb$8c
z7(RWL;6b}_RBi|abEQ<O*l3Lq#xv*Ni^+odgx23i?$$q(b;b9Pd2`MJ{K!>ckV=)v
z5pQq!nFIlV3KF>Z2C}#8BDnqz2!`KRc%uylGxE|#M!^$a$Qi(=np6a;HWU8xGgynN
z-#>V5#vd_y<0q9)%bO%l)Zw%qMGtn*C=QWRO7JuH5vaZwp@L@&Z(K-D04n(iU!5QN
z$M4b>qYUR_6`hYNuR@hyikepiDm1M?tYz0BOP1rj{C&*8sTsqk&VU+!P17q<#*X5)
z9!9qvCVpTCGMr0b=|<FrS7Xh&XzJN0tVDh8A>5a~i|KBh5xmjk<E5m~%&IE!0TM@c
z6MJ?mvE8@hzPo?wAi{;HtNwr}y?93O+BF!H8o-%u36l5vR6X(M?<D@>HcYg2@+blk
z)W+>Fd+B?JpO`|)_2dZ_`RtF71?OSnLztd-aC=UmPrZrhZT2lvy7^z&r|JlN^e(Jr
z*ZBt#%pq{){n)#<VtU@4HhgLdrK|z(w<-%4pysX0c(xhn#A*6F?$PJb-N!O@-nDUF
zyARWL5Ow*zpt5|@DWBj~za;kb&FI9?^x(%QV1kT#%z~eZoMHm2Hj%aIDYCA806BM+
zr_SqRdvIR76YPH9v1GwQ0yXzc8{WGPOqS<Un4G_s&~*<I_~cKKk;0VmlFHS21m~}}
zL#)?#jKH!h2`s;QTJR(Hsg;<S!>5|Hcq4%?K8dwpeMXVe-N#A%Z5uc--~L$}z73&*
zDd96`U=oFSuO_ncP@mq8b@AqmBIUL<5P$h6q$P1`-*6t`nr}@BZ#>t4PYOA2ze=Lv
zFSsprnBku3hJm%_n^<e_$k2JG=@k<7Py6-^t-2OjvUE~-pGxdK3yJzC)7q`V3S>nM
zYT31joYG0dkSjJJhk9}9A5YWy*lWMXDqo8%TI?BocJ<fk-MP&d-stf;oKl4*>b&lG
z8~2SrVLx*t&b|l0j!qhcTKf&;!kYBFP9zxK^9%e^DYUExRZ`&(ugzH3>8X&{VZ^m@
z4?RWvnJ=JQ_DvFkAaKPGAZKn`kxIN%PrTtJpDvQ{x=mBUrv)(MGi-bSch5HT5&ygv
z!5o4fIzPPk5z@+Pie;_*6v&__yw7It3=ZIE-2D&W9^By@gj#qRs-ikg=bet@*hgzU
z{be|p(1q2W@ZK^yU3e8rwr3tjoc#}>Pwe##BDDTij4RUC!|;J!zW!M&Kj8_VF#}>W
z2tRmfp;q2V@Jr7Ux}}!jEw!kPKS$)3kHL?ohP~&<m}r|PkX5n-wP;<M&fAUq(9zT0
z0aSiuMDr)W8{@T=nB>g|YJP}XcNb#Tc}bEWazQofnnxf%MJ-%|v4@EN`(giCSb0r)
zk#aS$hJSkc%A5iMb1F08lR>2i-~(@!ufwXm(wiojgY~g{GWPTFh8J)<n>@P&mR5tx
zN-I)!(*gg0&%Y!C-m?<><-Dxe=sP%oELj2BrRh5FYT^gIb6cn&f%2-fB4s!FpW;;6
zq6~PSt%Q%-WY3;7006R!GY%t(w_e4sPz4rVnx-ypv<J7p%iFhPVJ5tn3i(RqfcJtN
zH-qjunQ@YGdpmGi|L565l~!aFDW|j9+qYzX2E4}%2yb{H&`mE)itje>!;N-%9!8v#
z4W50h!uc5$*6C{T_RY!9gg2vrAhqLk8ZAIb&mv_y4x<k~>N&WHwlTctXP)pzgL~Q=
zN=6DYDy)tTdHZHXGT;pYVM(;(bSR+JiN}joKmiHQFJ?~N9}(?Gv6kO}n7wG^+tBgX
zvG+ZO9_sUi*RH`G>_HEE93{1zQDNO^H+pD-Z!%Sc3Zd=TSSkf_g1EK~hEt;MrsCh0
zRW81B_M99n6ZNdHGx}~b#eUwe!g?*(u{WO#D0g8IZZJVx)3M)3DcRN6-i{FwjIhpm
zc%dwE=FO(RqXSE_TUPDp+&kPKeXYN%2Q6~XX?TFViV_C<dKvDI)>iH4+&lXBfxFt9
zjwNi{!Znd|7CyJUkYHh$w#KG}w)hStWpwq<u6ieK-`aAxftVe_VHU=Sa|T{0N&W?M
z2+zx-<<JovJF#``W1R;X&-M|k`)ctPrGgKaE?FGREh<1H1~7?XbRz!2!y^bpf@Brt
zk~42MgMGcUz10|Z;?AvWc6K~I%AE1xB>B%C+rzVRH{_L;63Nd;g|m`RHe>QOHnXX7
zoFaY3qb>D!<|bpjQAmjlNSv6>U~eyd?d=TrM{6<W?$tZH>Qj69e)*~2Qv7jk_&l0w
z1aqWPlYfGEpG`YXJBC&v#4AFY=c;yedY+X250H6G$)NE5&Hw-a07*qoM6N<$f@%i6
A82|tP

literal 0
HcmV?d00001

diff --git a/plugins/SubMirror/images/providers/linkedin.png b/plugins/SubMirror/images/providers/linkedin.png
new file mode 100644
index 0000000000000000000000000000000000000000..82103d1f3f17839c6fe0bd90222d4f94c351feb5
GIT binary patch
literal 2100
zcmV-42+Q}0P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2ipM>
z7b+hAP_$M600*>5L_t(&-qo7lZyZ+@$3OSZ><_PZZ6|TOwezED(xy#NLJ0~gAfN;x
z0YVi}e!jp965<7k9}<56LPCfK9zg0-fl5U@@KlKhP-zsYln_NBO+}luP8<>^O=552
zU;A_Bp2Ne;uGhOWYsUqgTxlM>bI;8A&N=7%J@;N4bKqmvmd3wW`o!0N_Q;-Hk7lfL
zKaYk(FU|b>jrz$Kf8f_DCyf80FMsLKv)}#gH;(Nqjpyxs?K}ohxL$R<@VB?-@4Wn*
z&zrFy{qgGeKK<mLhYB8zP<Rl=P{!k(g@E7x`Q)Gc$@0!ULsq#{4|q^UJrqWLWqi-R
zBfeFk76_smg(zugPZ;lmObSG?*0X*fN-c~5Bsi{ss$$G44vX1RAO<BAa3bnEQEGup
z1fW3HTE+@KrL2cjSf~dqHA6%dvqdP3fxs!E;5&tS*bhJzN_n57yGJ;-dz5l9M<Bw?
zojR{wxyyyQ6#^$1vo$FciXte!s8SCF?E;_*Ip1=0YJ@MmugtcgOy}OzNS>X;S!(AT
zZ{A+nvKj~_jzB0vBXny3h{DcdmXAEVZH@Eov42N_!;>X0&R1D(hFG&TMJ%fLqR{M$
zKpRFW=P@;!Pkex94dr5%j5X8)hj0J?c@&DGQ4J`qP&$scfiy$GNqSomh|+XID=wz3
z01!n$l%_bkYgiO!mm0i1U*)O2V|~WWP?(;tQK_{EL~vUIAgWbgfR>ZB0Ehs*^wupV
zidpt;FLXKYICX7-lQR|WHi9kFwony;h=qCq00d4rae1D4;Q06>+nE~4({jRv+bg_s
zxx$6H6`bgn=~+|*aS^wi_5n}>&3eFJrsp_wW0BFEj}xU*Z?V)2QH>S(Jq(R2&uk)&
zp+wfcsuDUy6S&HWQV$%9jj(gy0G<Kg+Ex0D=Q>r;WY+TH$s$VN6h*N%(sI>^2#hgg
ztif(T9lHQTFV~(H!ZWZvpP`iV`iz~z-FiT^<>I1OM)E#m`3#=vZ$}mzA$RKmfhfhS
z#|NfHI5bhDT+EU24Aqw7-Q^}1=c>FNYfHu&%m5&r6jF`;=pG_UA?Ndz!;?I7sN83~
z(h7O*)K&g^X&zCf83>;_Fu}Ku?qaM*_(YW#&d&1OsjED_ZwKG};BKCrEK$n&<a~=Y
z1}91*6c!r+=iXi759e-h_WB}%rbeSp@xG$C9v*B*q+HB$aH7~}ywC_KWqq8BxVYt%
z(VWj?<HL*(XZxNtob~zCqvQPib5F2qB+pRBOLVGS%(7=}h{tve^UGIfcxAdmh$J?R
zP86$g3WYrt>{R0`rTF6eZ83@FN>ch`3>+?(_}Y<4_HQo?ObcTSg^b6M$r9f_wwKw(
zCU4waiqg{b(`cq$1KQ)MiXtw#AlJ-^^H4%Xg~a&=`0V35$$EC6^WDR@mJdHX#wYh}
zXL@dhTHx?{Y*iGsU?FlM=|WRO0IJbLq-%Zx0%HvMjEB9)ektQwp4vOc#BdgIlIWj_
zYJfGJXgftzbx;60E45Xy8{_V43w35HH8Q^C!1yrbQZ9A=;}b=uMsi%PR1wiNYY$Zj
zox?{X)>+FO9S_q1XwNkWtSU>*ke|Lh&F{`!W2q718N<PHi60-|&$EXgN=&cuLYB!=
z9?uw@DyHit7DH{Nifz+o@71dfNlvxrwQC^_Xv-<j|Kl3JI5ADV<;Z&m-@?CcF7c~Z
zXL$X_QtI}}wjm!A3uTgjR${hUdqvDL2!LoeTSZEm0)cwqc=4at@%(5rz-iPlVw5X)
zYn+)~Ol7cq*6Yw_w~wK=l{i+`z7!IW0sCAM+lj8W0%_yMa+Aw<YIw%tWVMJy4J%FI
z)^ao6`RGq0&logzy89I_&T_x4mc2@>q(?wwknJn_oaqQE)fTl@2x{n7i>M0_sx21@
zlV?)NqR&SRrrk>Px~lCBp#e^5H~p>ywiODYXkwovs)Qn`5!7zd=&E9kH6}5IG<IIr
zDPl*owXq&!b<(m&P*o#)S&yy(K~XhbDHQ2|9ca0(4y?}80VZkpdY>`SIAx9>DRKYT
z-T0zpgY%PEO*j08uC#9dYTDgs|8qJ{rEz;l$h!D{18S^EE3yqJK5bV_|9Z|R1;9o>
z&}Qb|O8`^{&-GK2bK}w7ocC<PHsK4{b)DNVlJ~T_-&FXlwNVOfGPw7UK!bQ_llH0%
z6^8gPoa*WS*gjq1vYAX=#0dc~kh%!TSR1X7x@y2TCiSc!>)ADWvG&78TP|rE#GOTb
zFDYtA2a?B1D4e`hiF%M8fQ?Xi^VagJf?C7*o69_Z`YOe&-?yfmo~x#B6034{c9CDd
zb|o<#PG4Q1;nL6V3_pBHleo(oLn&h!_Pm5nR9Orhb+_6x6?~78jP2j8GthKGrRn;e
zh&#}NXBkb|saOsjEA8$7?hrd==h)D!pLPf(sw_4gi@5Yt2Gc(5Gt@#yEpX|noRlJQ
zt6U8o)nLGT+KYqaRw8we<KDI_%_dJS;}5VITLojezyCF2;P8wQTg;kk4<v|CI9MJz
zZ=WtyzVD$`tp5OcZ}Cic=c|Xd{lt6!M~`0|Z{9wCWuf^5LnGsWcVGMNq&X(br;itI
ee`h@7{{A1$=pzLde(B)=0000<MNUMnLSTZUl<$22

literal 0
HcmV?d00001

diff --git a/plugins/SubMirror/images/providers/statusnet.png b/plugins/SubMirror/images/providers/statusnet.png
new file mode 100644
index 0000000000000000000000000000000000000000..6edca21697f41f0e4094114237f23b439a56bd76
GIT binary patch
literal 6168
zcmV+z80Y7SP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm000V4X+uL$P-t&-
zZ*ypGa3D!TLm+T+Z)Rz1WdHzp+MQEpR8#2|J@?-9LQ9B%luK_?6$l_wLW_VDktQl3
z2@pz%A)(n7QNa;KMFbnjpojyGj)066Q7jCK3fKqaA)=0hqlk*i`{8?|Yu3E?=FR@K
z*FNX0^PRKL2fzpnmPj*EHGmAMLLL#|gU7_i;p8qrfeIvW01ybXWFd3?BLM*Temp!Y
zBESc}00DT@3kU$fO`E_l9Ebl8>Oz@Z0f2-7z;ux~O9+4z06=<<LZ$#fMgf4Gm?l#I
zpacM5%VT2W08lLeU?+d((*S^-_?deF09%wH6#<};03Z`(h(rKrI{>WDR*FRcSTFz-
zW=q650N5=6FiBTtNC2?60Km==3$g$R3;-}uh=nNt1bYBr$Ri_o0EC$U6h`t_Jn<{8
z5a%iY0C<_QJh>z}MS)ugEpZ1|S1ukX&Pf+56gFW3VVXcL!g-k)GJ!M?;PcD?0HBc-
z5#WRK{dmp}uFlRjj<yb8E$Y7p{~}^y<NoE(t8hR70O53g(f%wivl@Uq27qn;q9yJG
zXkH7Tb@z*AvJXJD0HEpGSMzZAemp!yp^&-R+2!Qq*h<7gTVcvqeg0>{U%*%WZ25jX
z{P*?XzTzZ-GF^d31o+^>%=Ap99M6&ogks$0k4OBs3;+Bb(;~!4V!2o<6ys46agIcq
zjPo+3B8fthDa9qy|77CdEc*jK-!%ZRYCZvbku9iQV*~a}ClFY4z~c7+0P?$U!PF=S
z1Au6Q;m>#f??3%Vpd|o+W=WE9003S@Bra6Svp>fO002awfhw>;8}z{#EWidF!3EsG
z3;bX<ghC|5!a@*23S@vBa$qT}f<h>U&9EIRU@z1_9W=mEXoiz;4lcq~xDGvV5BgyU
zp1~-*fe8db$Osc*A=-!mVv1NJjtCc-h4>-CNCXm#Bp}I%6j35eku^v$Qi@a{RY)E3
zJ#qp$hg?Rwkvqr$GJ^buyhkyVfwECO)C{#lxu`c9ghrwZ&}4KmnvWKso6vH!8a<3Q
zq36)6Xb;+tK10Vaz~~qUGsJ8#F2=(`u{bOVlVi)VBCHIn#u~6ztOL7=^<&SmcLWlF
zMZgI*1b0FpVIDz9SWH+>*hr`#93(Um+6gxa1B6k+CnA%mOSC4s5&6UzVlpv@SV$}*
z))J2sFA#f(L&P^E5{W}HC%KRUNwK6<(h|}}(r!{C=`5+6G)NjFlgZj-YqAG9lq?`C
z$c5yc<iq4M<QwE6@>>d>VnA`E_*3F2Qp##d8RZb=H01_mm@+|Cqnc9PsG(F5HIG_C
zt)aG3uTh7n6Et<2In9F>NlT@zqLtGcXcuVrX|L#Xx)I%#9!{6gSJKPrN9dR61N3(c
z4Tcqi$B1Vr8Jidf7-t!G7_XR2rWw<V8OKyGH!<s&=a~<gZ&g?-wkmuTk;)2{N|h#+
z8!9hUsj8-`-l_{#^Hs}KkEvc$eXd4TGgITK3DlOWRjQp(>r)$3XQ?}=hpK0&Z&W{|
zep&sA23f;Q!%st`QJ}G3<GjWo3u76xcq}1n4XcKAfi=V?vCY|hb}GA={T;iDJ*ugp
zIYTo_Ggq@x^OR;k2jiG=_?&c33Fj!Mm-Bv#-W2aC;wc-ZG)%cMWn62jmY0@Tt4OO+
zt4Hg-Hm>cbou<7-yIK2z4nfCCCtN2-XOGSWo##{8Q{ATurxr~;I`ytDs%xbip}RzP
zziy}Qn4Z2~fSycmr`~zJ=lUFdFa1>gZThG6M+{g7vkW8#+YHVaJjFF}Z#*3@$J_By
zLtVo_L#1JrVVB{Ak-5=4qt!-@Mh}c>#$4kh<88)m#-k<%CLtzEP3leVno>=<rYWX7
zOgl`+&CJcB&DNPUn>{htGUuD;o7bD)w_sX$S}eAxwzy?UvgBH(S?;#HZiQMoS*2K2
zT3xe7t(~nU*1N5{rxB;QPLocnp4Ml>u<^FZwyC!nu;thW+pe~4wtZn|Vi#w(#jeBd
zlf9FDx_yoPJqHbk*$%56S{;6Kv~m<WRyy9A&YbQ)eZ};a=`Uwk&k)bpGvl@s%PGWZ
zol~3BM`ssjxpRZ_h>M9!g3B(KJ}#RZ#@)!h<Vtk)ab4kh()FF2vzx;0sN1jZHtuQe
zhuojcG@mJ+Su=Cc!^lJ6QRUG;3!jxRYu~JXPeV_EXSL@eFJmu}SFP8ux21Qg_hIiB
zKK4FxpW{B`JU8Al-dSJFH^8^Zx64n%Z=PR;-$Q>R|78Dq|Iq-afF%KE1Brn_fm;Im
z_<DRHzm7jT+hz8$+3i7$pt(U6L63s1g5|-jA!x|#kgXy2=a|ls&S?&XP=4sv&<A1W
zVT;3l3@3$$g;$0@j&O)r8qqPAHFwe6Lv!Cm`b3sQ-kWDJPdTqGN;N7zsxE3g+Bdp1
zx<AG)W?9VDSe;l&Y)c$DE-J1zZfw5a{O$9H;+^6P<9ipFFUVbRd7;k2^o6GusV)*M
zI+j38h)y_^@IeqNs1}SR@)LI@jtY6g9l~cKFVQy9h}c71DjrVqNGeTwlI)SZHF+e(
zGo>u$xr8UFki1L{Ox>G0o)(&RAZ;=|I=wN2l97;cLaHH6leTB-XXa*h%dBOEvi`+x
zi?=Txl?TadvyiL>SuF~-LZ;|cS}4~l2eM~nS7yJ>iOM;atDY;(?aZ^v+mJV$@1Ote
z62cPUlD4IWOIIx&SmwQ~YB{nzae3Pc;}r!fhE@iwJh+OsDs9zItL;~pu715HdQEGA
zUct(O!L<Qv>kCy1<%NCg+}G`0PgpNm-?d@-hMgNe6^V+j6x$b<6@S<$+<4_1hi}Ti
zncS4LsjI}fWY1>OX6feMEuLErma3QLmkw?X+1j)X-&VBk_4Y;EFPF_I+q;9dL%E~B
zJh;4Nr^(LEJ3myURP<E(R5tF?-L+xY_-@he8+*L=H0;&eTfF!EKFPk@RRL8^)n?UY
z`$_w=_dl+Qs_FQa`)ysVPHl1R#{<#>{Rblsw%57T)g973R8o)DE9*xN#~;4_o$q%o
z4K@u`jhx2fBXC4{<mvYb-}fF3I@)%Od#vFH(;s#nXB{tULYnfLMw?Tb`&(jLx=+kL
z(bnqTdi+P*9}k=~JXv{4^Hj-c+UbJRlV|eJjGdL8eSR+a++f?HwtMGe&fjVeZ|}Mg
zbm7uP|BL54ygSZZ^0;*JvfJeoSGZT2uR33C>U8Qn{*%*B$Ge=nny$HAYq{=vy|sI0
z_vss+H_qMky?OB#|JK!>IX&II^LlUh#rO5!7TtbwC;iULyV-Xq?ybB}ykGP{?LpZ?
z-G|jbTmIbG@7#ZCz;~eY(cDM(28Dyq{*m>M4?_iynUBkc4TkHUI6gT!;y-fz>HMcd
z&t%Ugo)`Y2{>!cx7B7DI)$7;J(U{Spm-3gBzioV_{p!H$8L!*M!p0uH$#^p{Ui4P`
z?ZJ24cOCDe-w#jZd?0@)|7iKK^;6KN`;!@ylm7$*nDhK&GcDTy000JJOGiWi{{a60
z|De66lK=n!32;bRa{vGf6951U69E94oEQKA00(qQO+^RW0TLH4E~Nf&zW@LYN=ZaP
zRA}DST5D`v$94W@=05htCAp;d5Gjg!P?Rl;k}XSiWwlO4*^QIfaElsk8ny+BB0(C!
zNsy)m{iA;Zlm+^uNRzfnfFym$MGGWp{Agm!rYyt{#f~k}lpLE6OBO{^;&PYV_uj|M
zoc`G5@{*w_+LF-r0)sny@9xa^opa{Au)zQGi{0n~14F$4ApwRS09^n!0f+%G0C)iM
z0OkN(0x)rWaIEluhQPp3?_mIc0^o2*^Uj9t?Rz7wja{L-aDyR)$vo-kTrurmS-9v<
z&WsdOxhrW9dx0_f?(xC#cmG!i3=H+wb0&_&!u5lRc-wt<@9M|?oktJ}N07=-B2&DK
zlDi0{BsjMbv768o>qerk8}o~^I5Y7Q&Ruv-XNvPbE;;$X1Mt@I!Ljl!ConM7D*)Ud
zw(CBBSI^Op_ieu?7Oyj~P#nix?mc9RGf+xFYXT9V3AH&9AefCrtQ+l(x1%Al1*yye
z&Q6|6jbA?VBTsq%#DJ0GgJZXbz`#(iMMR%(Y25M`1IGs2!(o@bclBxHO0)2!15E&F
z{0ex~<^U~`0fQx?NYr)Xw$6S`U7gfFdHr85c+!0Wzz>fPj_I39U|^^>W(w=8w{N|7
z@b~+_XkJ=)0TWlBhtdjKR{#<LS}jXkYg&G;gU>5O36;5Ngt4#tAy_<)pS<yJ+2rEP
zmo=#;j}MM{8zmsF1HKu+*N*Ic<SR!HJY<Z`{RgJfrz@ZW;7Jn*SeE|M^T5!$I>*v`
zf>b`H)9->vVfU6pp<HqC!E7n*?mO0eW^_0$Z-~IaP_GTpSATQg?>+uo_xz6e_Vo9#
zP`p@^;tKGDnz?wMM5!#{xDrwVf*TOr0Kh>3%`6iEGNpO=s*D3Wj+)8E>4QZlpX}>z
zIy*X?rt1+fuE~rW{d>B9?Mn|H`d$0<`+tLin_3gRlp1A6VlnF}$1ydB4bzB~IODF?
zGQ23=Fj$Ff8@xUm5e8?F<U<8biwJX>DQHEwZ_h*ZCrAEkFjGvw0bt}Koq>U&-tI)a
z?Zh8G@aH}A<&(IYJzq0{<pT@k3Jw+)rEHDg;qB=@qIYiIPwk0qEF6l38JHl_UZI@z
zrc)DoV)`sU|G~>VQ=GCJ<8=az;7TX3ZiUe1h8~a-7`gD;uqWL|uNU~l8sIsAZ#;PS
zz{eUIJX}ou3`Dfjo(Z@zpGP{y+{b?X3Hgb8{?yvN<&d3-x7ns)TMUc?0AozpX4u+P
z-(m0Syvx|P<9=p{X!)(NS46~)a?7;fOMk`MMK_10cst5&sk`9ha-+lPS2s-HGk?7c
zjIkqajopKP(EoV!?9}(+`o$H}SBfw<Un1!wN?&>GyK?uIgE7kpamLuX9*r@^LRLid
zbnLggT5r#se&=~%88$bBV7^)=p_GO%eRL#tu$lA+JNEV`o*o@eXRfs_U$u!Pxbg5K
zhd<Z!e(HG?oK(f_1xzQCbtuHQd5=H(O{=YOYu!hQo_BN~PJHfDf2)0;yC#dm5~1Zi
z0OZPxkjg`QV^=$XPYn$9vJDXc(A3q^d$g-{yO_9oq6U6xc)mh%p7bO4enGW1b{RL4
z!}N6QxBKrJ(DT`pst<3fc&Q~VXu_53WwbPOh6Fc`0*G&r0Nc8?^|rob;S4<At+=|X
zyVHtrc{Yo_ZT;EXyYCG##&0MQ<Xo`(_B?Dh)^(IJ`7FX_T_ErgN?rlJ^jOr69|F+4
zAp#*Q^1$Zi?dH{N#d`(QfU+aux~BWvN4^kVI;1yxnTBmX_8VW4$?O$riEu>=SdP?r
zHwViMZ3b}L#t4{^BXyA|icUHJzM|HA!NHw79#D<3mhjEY=X*Nttlw1Ml~YQAGf|B%
zl|4&d5e7FIWBl-S2@DMNLI`t@WpVh*h1QkafIv{1P%KM*=gxkOn|yK3`CUCnxi1w2
zGb%Brss*VO2moh%??yCWan4%}!63C?0lyTq6oE*1tqon)ttbn-+xEbhE}0^Ps@$r<
zQbTJE09!UfAjTOtIA_pGuSmd@CJ1J^LKy5;5NM3G3Z<0h%vc6b1Vsd;6^O3wg^bl{
z1qE~XK#0FdCG@og$p8?m+J7Y=5CBEG@?rxTC}`4BX{sy~2wngnm1imK-x3Ckg*o5g
zCYM@)h?Y}wO^{lHfWmbN5Rt33npcv*nOR$)B7Fv8%1&ixy<0)x;+6Acn-S*vmFf<G
zoJ%SRBAUG}fhV6Bhtl$wp41TBUQr$b3?a+pZ;ij`-)!(&D?Kv#5;KJbPkObwf<TpX
zpd|o$cSCW&@k*~2OC?0?=9(0U2&4(Ia2RLbf5Fa`($38!Fg|@IpUTe07&jr6th&%j
z#Rnp2k_6DJ8zpdJCUrq>ZrHb6F;x$<WeRZa*-yXrozl$$?@L$y;N`y;?Ty=vqFaDp
z@i@x~q$UulB!IU!m<#EPm*#$XzB6$EoY}QApb1b~qpi7#{bKy5@%JvjStKI5LDQkv
z-g(B$=9A%uXd4y^=@lhv<tS((^4|cE+-NeFo=T3rG(CS&?dg1QRRu->BQ)08;;C1^
z$y3>x@{JIfoPE1|^6Y=|jzo{Rl%7PTCRhfqHK4WQ0(uxgZlme6tF(Ofsng$D*wgiK
zL_^KX3j*+!k5I^Bx$?CAji<h-7xHt(j{<&T`fTpo&;F%|T5)^6kVLkeS>gLDCZs@A
zP6GJpdcC3*71`);8hyu_rwZlF-O*6Po-LbtFuO1YRXxZAKxu_oIL1m&-Woph1GTBX
z(`k&g2-C3E%}|Mm3Qk77a{j5@zrOIb$mWI}ma8PYnw_n6E3l+(5C|SX?#}^yeRMdz
z@tSyaI8A-Wnn#kE>4*Ea-{0W+Ipj*I<-U&wd?gVLMPZw^IWl>QPtJ_`j#pHMFubrG
zlY$#&O{IQ0e>pj(-WWTfp8Lf=)4LzM9%^mqHuG))SF<y<CRnYDhou~h0Vulw{(W@#
z+Me$kRTWKSit}H7dGwhlKXK1MWU=rq6r4<;LenU^c?fPI5wAB(PSSk-&F?AK_lR>t
zhOFq-s2#ToPDVLiv7UkPs9n#RVyz-#*JFC|5=vfqMcS~s8CJ1wqlMt_2XN{`HMT~F
z)7aae_+UOe6D7jIL%TjH=CT*y`sEdyNUc!vOVE&rhZ}iQT?-Fe5rZ=p(@KUzW;mLN
zwTVQug-g<WCNqU}ejc8Z%ie~TJ9RbiRLi?;2LIyT{-#&XU8Bi$&CcBDa9Z{qYd$wU
zKiRCbzH@iyK~{2eD7pESNgh>9s^}Jwb2D)KGJNgBS3b&q8H=SflDR9$losGiS-}?Q
z&QSoou7R(4MGp92jQ)FcI9>YCz0uL(bg}PP^QmNJ+AcZ8LkD*Db4?nVQfkGf%dU?g
zm4qj~+VGWx)_MhCO;qzXLDRvSGL~(CdS-MuJ^i5xR7tpd`x8G~$S0jk$%(x^?favN
zSQ|=ieg(K-7kY(h1UuD1QwavFn%%F}I3yGBt-fPTKVHiliAVnU&(O2`4vfDuf>0=2
z1+-F+qr+*nbzl5-Eu8aH$?*oQsB=?Yr&%A_1kMdeB_Xw3(Xd^8Uv{T});_d$p~(kG
z)iU0->kS6L+o84k;klCw3jiR5fNk55QbP3ZKZx@`KLyeXzV9(9m8fclSMLIV7(bn1
z=T4?CG;B6rEMxI}sxaG|Ev8!{W*p6R9cTzQ!{inOGr*VtX9ApY7+gSb0Y(hIbRcB`
zQk7<;=X_my&T+s`G3K@~=Ep1g5UYqV0AvyQ;@nH=69707LCQ+^owc>K!}mQ_DwUY$
zd0Z*A1fExa%~y%1;vS-cKk(TtM`I1<XN1A~qM>*^8j6JtVOanZniTVuPoD2dPdbk0
zmkUa%DW@QhkDN&T=;GO2d1<ZYu8?);(boH73G>s2Ar3JfY63!G#ssT;MT2NzDm_#F
z<a7TpHBn6r6aZrN^$pB*UGDonS4tWH%xZiPfx!Z4$BKw6OvZK}Zrs$eEwUqACprv^
zC%9lyFmMo*RyyxHG?$xqCr3}FC-W)a4+w&-s#RHEe^Y12?%2JNdh;GDY#$Vc)d84{
z$aTDO@voly$4lSNr+v3dKrzEGxKc_G(GqwIfL*<dDw)+9shM=ZcLe7w@NBJuny(`9
zD+i#l-L~6yM4Gzx#t$^MhdwP#zDrB_;>7Ej&%XKW{2TxufL;Q$1l|S^st&vQ+z6Zr
zzG@>{g9O$A&(;7QBoka`$xM94;eYIpI{F&h?cNJ-<-R|1B9&Z^K)8Ch1Lnj7ro;l9
zEp4dR0e?LLY?a0+KtNW3x&Ryi<?7w5zSD+b7|>di)><tw4oF3<@<?m>y0tX07J((w
zYz-n<C5ROor~-Baz}3?CjBq$YzVB<__n1=33jklsboe?pj%&rzb(%`oGRGhR70`rV
z{j944MqOQu9LLe+GT?b0DWxc&h1ITfEvbFf(sHde)*_(;WP+b7>9lE@06<bIEu|!_
qwI(9Aj;h(s{I|<G=11#{+VwxqvW{GLOX;@&0000<MNUMnLSTY5`N22<

literal 0
HcmV?d00001

diff --git a/plugins/SubMirror/images/providers/twitter.png b/plugins/SubMirror/images/providers/twitter.png
new file mode 100644
index 0000000000000000000000000000000000000000..41dabc883ec0c7665054e75380f7ecaac23191e3
GIT binary patch
literal 1192
zcmV;Z1XufsP)<h;3K|Lk000e1NJLTq001xm001xu0ssI2*kEqZ00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2ipM>
z7cBy$5PseO00byWL_t(o!|j;OYg|<r#^3jxbLY;TWRgiUnQ_vziH!=~G@-31Qt3t)
zRf@Exo464d7F@a0h4>FBh)@WKBEf}L5kIPKsv-zt6m2CGHBH(y>7@DSgv{r?Gw0)V
zp{X(L+`02ntuSYM;hf(+?|Yu-IR}Xd?xexs4jXNtHc%Vr{|clDG|^1SY{>d_PTU3*
zn$DZE>pJbxO2r)R5w4-Jq}UZ^{|(U3Idf`JUMmv;bPKrTntf3g;n;$bWh9kNeH)%G
zn^&$>mdZo`3?RhNW{?bFByek>kC%P0qRy<T$Kv8pjP0<{VSwoOqXk7T%~mcH&CQ<%
z!+3JQ8i}$H!^VN8^ZLb$l?p*j!2T|Npo<;o;=LADYn{)p>o=~-vbptaVFqJKF_sh^
zzUA}lp&^HjM%fQJv!USYb^YCjPK4B>z5HlgbcpSf<`jIDQPpSwz%%gvva%3QB)L_6
zpZsbY6*!&}yTf>6#s!bwN~>oscptB-wF;RnyZcMt{93Hha20|NSLK{bjqA{GgpJ>2
zrR;zF(7J+&Mfvhv`J+``(gXm~!08ngr2lgYCYPkoQK@n4zs%_OmR0tqwG6;)iLSWv
zT;4oCXk9FsxsnO43%?ij-cH^KP`{0yA+O3>l3*&UUz?}AhT!sG0KVNYdm@Y@5P>A%
z2=-=Ip?`#}7<zYEonBV5r9rpXg8RF8Cr1s$03Yw;H*_3pX6mw`sjQh?k_%qz)Az80
zPxo5~yP4QjxZ2iXGu$6#CMDjvrdq{>0D}%5jf;^e69^Rpf<w?90)S7~)Wo7xx8Zsc
z;c&QzA5VxOht*-Oqn&Jb7%#akBZ_i36yrO?I1*(8HtXQQtYhn#cg@>rIp<PQQ$aTi
zbS%N2+ZC$Y%eEg^f_cxpc~$<DGo}d|25@SxeQ%WjP)A~92%e_%`KD+9;DK&7?6B5E
z*qFe+5Mp!P^Hj>mTekoebnWUTZG2%UG@cSwbiY<SMK}@{Lk<Qq*Svyrd98h+IO0GU
zGqS3g)Re*F31RzYw7;8L6Mb=Ar_1I@T=WWzaA2FoAp%8I&@ktk$tC$)ks46Kl#Q?6
zXZMBbNsOMMGpqWOH8mW;Jr3)$u!G~DDCsiI6wOS@G+=57FdAjg4p{dDh}PSWy)^WF
zR=>U=a|$d3fnWeMK{Mw1a1TGZQzSx&0nWoMbchJ13wmNv&U@61T_8Xrgij{Kv1A>W
zt*XM9k#shrzgbt8U233%`)zzE#va)r?skyXBNTp0t%=qp{Fv3Bt?5}e=nZW!j87!Q
z!7diJ&|-CKRv_!pM3-Hf%9`_ey;>n@Km%#|OIkRhh0t%~z9@UJn-4iny%%6zkDf$O
z(6ph*GvI0<fKCn$hnT?Nm*rLhwcm%@Ky9ElP#fsqAAbO?-vkTHZ+V#j0000<MNUMn
GLSTaTWHICb

literal 0
HcmV?d00001

diff --git a/plugins/SubMirror/images/providers/wordpress.png b/plugins/SubMirror/images/providers/wordpress.png
new file mode 100644
index 0000000000000000000000000000000000000000..dfafc75a2f12a4be25ab5a8e2341ebd2f85f6382
GIT binary patch
literal 4861
zcmV<Z5(4dsP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2ipM>
z7c2x+XzHo}01|ykL_t(&-o09RkX%Q3|8>9j=00|JcJ`WGox74(l66_OEZg!KY!f30
z;H1EWBd%am5C|a^5<(Rr5GcR~s$wu_5{|-v!3G;2NH&&`Z5c^k>p-hrX;<27cIUol
z-n^^3^T&HTtI@0=7?W4^)x3UhzV7e$_1E9g{Rm!z>wTa98eO&h+JNl#_$lCJYPrYj
z^YsEGB!rMCrK+K88G|D(d;L|;xmr%lRle}<I}Bad|ERIat7Tldb_j3#{C6U*_O7jx
zENykm@^+s~8g6sTtAk#5$Sn~n6Mzta3Bce2b;Ht&bz{D)v$L9MowOJmvDC`3`0+zi
z-~0Fntp7IvZ~N!ZczbSm^Sg-4`&PF^hSx{DJ?q-Na&JI^-zC9C31mtjIlXfLj0>1t
zK(hpLbqnXqx){r-#jIw|aLYWva>;Lg<*pmXgb;rk05{zGukiT&^2%#&y<Pa)zADSo
zitGA(xP47K+C2&u2VNXrKrA%?5JH*;Bmhh<Fp{d_@yQ~xx@8be{j!mo{^Hb;gPDWh
zzVEdI(AU3`?Ec(Cn}{d)!Oo!X?c2J1fm_$Kqc7-&;2b60Lbh%pT{DoVn#k)6HIqYU
z90Gts3A{2z*d?LMub|hjAmUZf=~Lj62y{!}&_V_KXUcrGsE(+$@@J)7{MjFW@U7K9
z8o(R=@jn!0`>l7HlIx>a^@TRSaVSDJMExKD7RnlqCaahz=t$R1)GPr4fD!@%+x{14
zMF>C$0R})JK!-=hijW)IyZzYM>4PFsq-!Sj&zA7m*=(_{Y5(o2X20~vJ-5xjY5=eQ
z*q2<=@HOvMiSo(2hC4g|YEv(KGKIw$9v#o%xw#6e7KadkL;;CXP)Bg$bWMnjKsaW_
zg}ok_u<sR0Fx2kB-J81+3wmHOj&nr~pMGJ+EY<3dONIFlJn^BwNd3V8Zu#IR6>0Mg
z?{Nph_usvxC$wi>7YxQRmagDiCzF^i8;}TrL<uOdwZ8aE2m!sQcOd}oAhEarhchEw
zfN?;UfV+mfaNC*=gxoTwiyH1bJd5dU>2Z;pzh~b^?pzjxwA{m;Z@NqNUiap^C9nU!
zzuD3kzI|;JoN+vMCWUXFNMNp_LvR5BTa!WvaKXU@2j>Ee+xN`5w>XEz7#Qa;*<#xv
z=e=PuoJd!YtZ29_;zwW5jlp&=PUp1s8B1C_eDj_|lfV3N`S${#gka;}-~YxUT=&0s
zd#v*f>$)Kkfp3h=;^FZ$3YrNn1R%IAI0OXe;6gaWZ2%5g7v8hxcT8|FW`h)hV|}{^
zcMNu7Wt$fYrReY|xIF5|f!X3<MM&<AyKa1O;<?B4O9B|ac@M7m&}WCLO5nab20MrE
zy>b<}5cuZH)A-@(6bxnyEjYLBncEuY4j5Z7yUqDU!ZygB2}{_&+-b-BGQRk_VGMTo
zA=4$>3wva2=?O^BOyxHiL>_Ms_)aBHzp|w8CiRCqrMlv~dpPR9>fWnX!(<Fkj4$A4
zXHu}Z1&do?+yWEK7DO;GVZq|edB<Qe3l_6rI%IJMi?O9PW3afx&zbYy!UwKgiJ)6v
zc0I0X^Wkk9dxNsa_pz>xJ7O2UYvLH(dBaxj^ZxCf!@Y9IB_UC+<5%Z1@XG{kZUtUN
zM!+Q@<W^9(IF6^vU_!tpQC!&*2BidL-GXK@7>vW@0+bLal)xoZ_!J32myC4Hz}b8a
zmJ=t4;Mm&Jc1dq2Q-a&qcH;1C?((>`@)KUK_x<&Hoi+IhLWq3pgHP?dtS@ror*7Fq
zJc<M^1Psd_1dcnjT_g}MsrbZ!aZHu!xU9pEukYDro0sEp$fEyroSlFjBM1o2X3O~K
zuf|Z;E!z|s$KH2dgRsYSNf1H^?43yAb1$B?x+}@uKmVt9{-$XSyy=S%-BOhOpZL40
z*OHa({)Ug0oxDb-1SVrRGMB~kGg&-$K8=&<3K$ot7$%B!0}EvpTnG$=eNB8aC4k^~
zW+I8B^Eo^{nZ#641#{MpfIv^cjp1l$S>aXFg2@GjB7QtKnW9z5N>4}IFXv7kwI~2w
z^VWB|HE-x0YeH^p@9RL#a6C<m7J#QGQ~2u9^VoYn1KqM9ID=|hc=&W2UpjmapFA)I
z&0?(qhY<YiY!VNS%-~SG0E1c10%qWX;YX+DkX4sYtt)jMFV18jQ;PTPSOwJ*J3F^t
zGu&9jz1QA4ShK_xcWqq(i2w)Br*Jk?wzYEsd1Q*MJz-D++tUbcM^tXRP$4*y)jD2|
z=UR9vA$ZIB9tgo2UW+$8mcVSWhDT4w9hch7Ych_5Qz_JR6FUbw5es`)YO?35?*0Kn
zJw89tB+sURi}qc=rU$xd;icIOet2Tq5lS>NO+pB+>F<Dx0zxp`ojN{TaNBhXA@J<^
z)Uq>p<EkhEE(vhl?1lU$<JdQuz?p2T;&jWxXsU?WVhs`{xVpc?%RsK!`JR99)7|g5
zM`na>*wz<mgAhno>X^(`v2P-Q`~_3G*jZo5hfUEC1Ydl{AsRDaYjrGJ!Ca}<B8VbM
z*cEFB<Dy~vSX7V@n9A3%|9l#ZH-k@AHOv-km?_$QZt4z0QIxHw+aIQZ6@z{TvTj{8
zNC6;S)38vfqh>NZGm&T!0s!7J+~>3xleEQb(@xkD<vK=Fr50X7fSs`p$b>YqQ_(0Q
zY(P(+S%7L<O?+dS5=_Q1mMVe^flj|05x-|h)9PVrfO-M4Vj%2?5CZ9H9YxIqA;6R4
z^Dr52EpApu(dJPu>GG;3!?8rMWib-~YdZqy3wf4xlR^m0mFpNy7Mq@r%ohMcFp;Z3
z2*B@>5%zh*3Pg-f#Zw+r(>ntS1s4MGlIr+<f|P3Dx5;9wCMm_uYoZVY5FjAbCP4r}
z?E9mMB8qjRg||20!P@o!2qlezK@b3h0)&7_1jmwv#{Wxo4aZYufWR>!4v$1ZER!T_
zY&9*EYKp09AutBcII@KbSY3lKOcd%mMi%ldHVFXNuZ+T_NVedx1qZdGoFD}8s)iG(
zQVU<eC1Z1U7>Z;I3`*^wN9}tMf^<!9X#e0;8kM>Zt{KQ?ZL^diz%&iHs@6$`;F2s+
z7bOIobJS`YSXG5tszA*YFmh%Nxr*u}Zc8q1MVlY1+x(6Yjy4Iki4q7xpkE>$?C5QS
zN0A$Rf>H=)d~TQ^mIcNbblt#XFHgcMmSI(@s8?#RECxydS)w3>_+)VIfL&Uoji@CA
zPRwNxFI3R(YYy{anP5->PGt+W79|@1v8x({-3qpLg}_)Vh}B^)`Y1y-Q-EO1A>PpX
zz?Ob6#xR!1V>(*`7A=6nsXZ1w7X$^s4U6fPlOp?E%^6`?Gx5^-<T61`!iH!NF3SX~
zsj$j5SfvWgLK#N3hz&joUI|DRD`1Q@kq`o}Umb;2*T4<4A-r9W0NYnY!G*wy`7DZc
zqw&roOQ3|nV%*Nr7^_jinNijBl5Sdn5Qqdk7w(3D5P~O8&VX~#0%A)nf_9&~walXg
z+xk1<lO=rT&^Yont%djI^?e8|lRgi$`O)7VK)J5tWIPAmS_0P@@PG>r&9tBz7KEXu
zC^*+ks+P$+3nv!#H8!Lcueo9kN2Xe5VMRv(t0Tb{Av*mYtnY3^wp_!Lr{frz$+Yl>
zy>48)s;fy^0s`9xIw4bnOj*TfqS(~$sz?w*09D;YzNQJYoS&vltJMVOv*(=Lr!(M1
zhu`BYN}C9!c<AV4(;{A6FSiZHY!7q+^@V*H>I&h>(K%Fg3nQ}`7#3>*ant&kovAu}
zibSz>AOeXJj3)9(RJ6uB0br;r3_ze%H;^q?GemZ!s5)^>1+&haTF6_A)6^ICwP^MD
zLIE@RO3U+ItGf}pD5!0AqV4|46gYrWi6RmuwS{+GR|x%WfkwM0<g>NRIi5YU&@?+9
zMZ&tSHb4k06spKo)w2++MAgaTmN50Pk(o?hGc9xlJQ#|GL7l*|NV+BP{A8*{i$RZq
z8wY!q{tJSehI%oUDk52_gAjtrY#FnKY71|>&y7ue?G3(I*pFD)hfJx4k$9nL{8b%6
z3^;Yl$Xphtrk~K0GertO7}@#Xs-`*r^yr+O?X8N!>y|+XZ4d+SN<4@1MbQ-i{(M6W
z5|uy*MJ(*Wy6!NJ&E-%v7zm-T1i^D>TJtKeBH{Ahc6bySl0>n-D~ym^!Q-QIFgY4y
zQ$jJ^6Gm^y3suwc(p07_EaR2ZZ=R}C0Lbq9!7SIcmwtR~2C89V`#=QiqM;@YfDoL|
z*D#f<v<R{~62j_800IPeZdrw*s$(=&f+f)4Jv5y`MQa6rS$7B#zX!4;Vf#P_s=9$^
z&!(Ej^|@r+Jk$$CqS!Y+k7QY$F|zYV0B{Nbyk0Ttv*SOQDXP{B=hN`HWZbiB5R_6U
z1+yt#)iIhXf?t$ccohjd1|smt6t`~}z(PsI*=)6mx1d>g=FCFNI#|^az>0Q1d<w;;
z-gcZ?C?HWans|4vh+u2117%gicSmNxboJN8!%v^Pa9f3E9{>6=qm+N-7pLb%scv9%
zUkCOK$3Q6saYzt~m!@*iE!IdaIOmWl!KU6Yu3HmDz%64mQAECOHTV|kN5^NJy`Uvh
zB#LWSMRDEgE_f9QN9OV{orDpTBH)tnk()Mv5`w43=8>xEdiCTB-_qyLX%}y7G3xe?
zTU~4RbcKB3wUGeUMEv+|vW%>1G^R6C({amS7uvkdsf9!c)<yz|2Hg0@;d4k<jTRHE
z7!2F{+Rzj7Ht}|NUFZsUKq<i^r{WFXfJ?@Qcdx_7o;FP9EBK$IGb}MPbzkby2Ob4r
zwd~BXN}(vN-t5kp@~&MgBT9GBgNWaa<B1aLmc6IKKp;_I=Ril35Pp}0XuyMbp@MIZ
z#O?IuA^^5f60W?6*XNcI4Y)C$D&rU9DQK2}A`$Ev?!}ug?+51sKRiB*Llf~Avj=|q
zFGgy%u<Xv9S;`vf<cWtSli3$Of8dM&fL$vhxOeB8rJzO#o)}9)GucI(PZX2@Pn}7@
z<YHOj0fN)%3R2~IOQAymjHXH`>I@(RSH#-z?j5V)ktH0SPUErBg;Xsu_vPA|k;J7p
zcZERx{K<-E#qdH#3hu6&qW$uoAcng_=nZ->maamx1ehQg2z#(L;%{QFX$J0pVG0@(
zAP(4zNoN8Zx&r7AH=B`WGJNNiITSSuSI5Hm_$|ZmDH4v)=ke(Sll4k2{a|kY!{0a3
zbK39QUKiC<FV6ecY+8sj&((rRp>+{I)<^9@<K;T?bqf|3xPDa!C|OFJj>HRidNS9j
z=$0d$2}J!aZ0QL#@t(_8@Qbq<yz#Pbynojkcx4GM$Mg8l-^{Q?BKh6Y(Y^OqP8`hr
zpUwvWu<Gf<6LM@QK5e?Mu2~{<Reu}$LtgBNg;6yuoXxA)(i1|bQztOS@RQLLCJL%;
z5aiON8Vr9n*a^2RHEMwU=Q6l$s0+8P>$ZiT%i$|W=GgS~^tbZQ|LjxcBYP8QIyU^>
z007Qdb?nHb+`m44R(I_f%hki%dV-|O@5b&`5v*<V!eAUdK{tdDNL6+G{7f3TI=iI#
zEK*Uku)Q~g-r!OyzM(sWSjawNdUhg(FC3at(}{)u${+aYrz^(~BrYYU^gB=Zm}OOt
z|9Zj`8#<j9-q^{k*6UUzxhLSlK-i0(3j~<V*RX%OfQrHG8h05I&R%Oz(2ZWd3&YW+
zM2>Ne@k|xpKe2#^PQ+)b+2jL-gO7f>eEdM_wKyl1J74$LYyFp9`L0N8;O-6GZQXYa
zMaYi65L^<45CUc0!udiS3l$ynWgU6VglaNyA>fuM!fqMe0T*H+54!v=^aNZ8xfKY(
zF;}eP$;liJ&zJOgBE7E~pZr>O@AsZJGx6GTX7lP!>LnSHFXRhvziDfD=j;F7)82K<
zP`ih`ePa|?_qRD|#|4{JPFdX;gj{gQO$Y?%h?i9SWGsVU&s9;Y*E8z56aSXk`~64E
zd?G7Mga4^MHIM)Vd;apnyM1f7+(kV8t<iv|Z(DCDxGCx<eL**TiUhYzArazyD<NPq
z0nKE{sRkzUbsSGtjLCd0Z5sMHGnaTW`N#tg8>yKjfIsN#k5~P%2LRdC)gNrX{>~v+
zSO0d&;~%Cj&pNNyyE5!^M}2NrK#^q^A%Mjg(+sm-(ab_s)#goIofMijZk2N<tEXQ&
zS$g@IG=wmIpSir&0G9folH?!U;&sP{!qn{vgHS(&@B;9_-uW;<XdMu$V61HBlcnmZ
jLlv&oEazL0SAG32@vmvV;y|1C00000NkvXXu0mjf$+j{t

literal 0
HcmV?d00001

diff --git a/plugins/SubMirror/lib/addmirrorwizard.php b/plugins/SubMirror/lib/addmirrorwizard.php
new file mode 100644
index 0000000000..1ac8aa1388
--- /dev/null
+++ b/plugins/SubMirror/lib/addmirrorwizard.php
@@ -0,0 +1,155 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @package   StatusNet
+ * @copyright 2010-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/
+ */
+
+if (!defined('STATUSNET') && !defined('LACONICA')) {
+    exit(1);
+}
+
+class AddMirrorWizard extends Form
+{
+    /**
+     * Name of the form
+     *
+     * Sub-classes should overload this with the name of their form.
+     *
+     * @return void
+     */
+    function formLegend()
+    {
+    }
+
+    /**
+     * Visible or invisible data elements
+     *
+     * Display the form fields that make up the data of the form.
+     * Sub-classes should overload this to show their data.
+     *
+     * @return void
+     */
+    function formData()
+    {
+        $this->out->elementStart('fieldset');
+
+        $providers = $this->providers();
+        $this->showProviders($providers);
+
+        $this->out->elementEnd('fieldset');
+    }
+
+    function providers()
+    {
+        return array(
+            array(
+                'id' => 'statusnet',
+                'name' => _m('StatusNet'),
+            ),
+            array(
+                'id' => 'twitter',
+                'name' => _m('Twitter'),
+            ),
+            array(
+                'id' => 'wordpress',
+                'name' => _m('WordPress'),
+            ),
+            array(
+                'id' => 'linkedin',
+                'name' => _m('LinkedIn'),
+            ),
+            array(
+                'id' => 'feed',
+                'name' => _m('RSS or Atom feed'),
+            ),
+        );
+    }
+
+    function showProviders(array $providers)
+    {
+        $out = $this->out;
+
+        $out->elementStart('table', array('width' => '100%'));
+        foreach ($providers as $provider) {
+            $icon = common_path('plugins/SubMirror/images/providers/' . $provider['id'] . '.png');
+            $out->elementStart('tr');
+
+            $out->elementStart('td', array('style' => 'text-align: right; vertical-align: middle'));
+            $out->element('img', array('src' => $icon));
+            $out->elementEnd('td');
+
+            $out->elementStart('td', array('style' => 'text-align: left; vertical-align: middle'));
+            $out->text($provider['name']);
+            $out->elementEnd('td');
+
+            $out->elementEnd('tr');
+        }
+        $out->elementEnd('table');
+    }
+
+    /**
+     * Buttons for form actions
+     *
+     * Submit and cancel buttons (or whatever)
+     * Sub-classes should overload this to show their own buttons.
+     *
+     * @return void
+     */
+    function formActions()
+    {
+    }
+
+    /**
+     * ID of the form
+     *
+     * Should be unique on the page. Sub-classes should overload this
+     * to show their own IDs.
+     *
+     * @return string ID of the form
+     */
+    function id()
+    {
+        return 'add-mirror-wizard';
+    }
+
+    /**
+     * Action of the form.
+     *
+     * URL to post to. Should be overloaded by subclasses to give
+     * somewhere to post to.
+     *
+     * @return string URL to post to
+     */
+    function action()
+    {
+        return common_local_url('addmirror');
+    }
+
+    /**
+     * Class of the form.
+     *
+     * @return string the form's class
+     */
+    function formClass()
+    {
+        return 'form_settings';
+    }
+}

From aa901bb61cd7bf3fc38d55f5b041abb0b766bcb6 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Tue, 18 Jan 2011 18:01:57 -0800
Subject: [PATCH 299/655] Work in progress: AJAXy interface for grabbing feed
 subscription helper detail forms.

Currently they all show the regular subform. :)
---
 plugins/SubMirror/SubMirrorPlugin.php        |  3 +
 plugins/SubMirror/actions/mirrorsettings.php | 64 +++++++++++++++++---
 plugins/SubMirror/css/mirrorsettings.css     | 17 ++++++
 plugins/SubMirror/js/mirrorsettings.js       | 45 ++++++++++++++
 plugins/SubMirror/lib/addmirrorwizard.php    | 18 +++---
 5 files changed, 131 insertions(+), 16 deletions(-)
 create mode 100644 plugins/SubMirror/css/mirrorsettings.css
 create mode 100644 plugins/SubMirror/js/mirrorsettings.js

diff --git a/plugins/SubMirror/SubMirrorPlugin.php b/plugins/SubMirror/SubMirrorPlugin.php
index 38a4c40d48..a9cb2315b4 100644
--- a/plugins/SubMirror/SubMirrorPlugin.php
+++ b/plugins/SubMirror/SubMirrorPlugin.php
@@ -35,6 +35,9 @@ class SubMirrorPlugin extends Plugin
     {
         $m->connect('settings/mirror',
                     array('action' => 'mirrorsettings'));
+        $m->connect('settings/mirror/add/:provider',
+                    array('action' => 'mirrorsettings'),
+                    array('provider' => '[A-Za-z0-9_-]+'));
         $m->connect('settings/mirror/add',
                     array('action' => 'addmirror'));
         $m->connect('settings/mirror/edit',
diff --git a/plugins/SubMirror/actions/mirrorsettings.php b/plugins/SubMirror/actions/mirrorsettings.php
index 195946c884..114b8b40fe 100644
--- a/plugins/SubMirror/actions/mirrorsettings.php
+++ b/plugins/SubMirror/actions/mirrorsettings.php
@@ -65,18 +65,30 @@ class MirrorSettingsAction extends AccountSettingsAction
     function showContent()
     {
         $user = common_current_user();
+        $provider = $this->trimmed('provider');
+        if ($provider) {
+            $this->showAddFeedForm($provider);
+        } else {
+            $this->elementStart('div', array('id' => 'add-mirror'));
+            $this->showAddWizard();
+            $this->elementEnd('div');
 
-        $this->showAddFeedForm();
-
-        $mirror = new SubMirror();
-        $mirror->subscriber = $user->id;
-        if ($mirror->find()) {
-            while ($mirror->fetch()) {
-                $this->showFeedForm($mirror);
+            $mirror = new SubMirror();
+            $mirror->subscriber = $user->id;
+            if ($mirror->find()) {
+                while ($mirror->fetch()) {
+                    $this->showFeedForm($mirror);
+                }
             }
         }
     }
 
+    function showAddWizard()
+    {
+        $form = new AddMirrorWizard($this);
+        $form->show();
+    }
+
     function showFeedForm($mirror)
     {
         $profile = Profile::staticGet('id', $mirror->subscribed);
@@ -88,12 +100,34 @@ class MirrorSettingsAction extends AccountSettingsAction
 
     function showAddFeedForm()
     {
-        $form = new AddMirrorWizard($this);
-        $form->show();
         $form = new AddMirrorForm($this);
         $form->show();
     }
 
+    /**
+     *
+     * @param array $args
+     *
+     * @todo move the ajax display handling to common code
+     */
+    function handle($args)
+    {
+        if ($this->boolean('ajax')) {
+            header('Content-Type: text/html;charset=utf-8');
+            $this->elementStart('html');
+            $this->elementStart('head');
+            $this->element('title', null, _('Provider add'));
+            $this->elementEnd('head');
+            $this->elementStart('body');
+
+            $this->showAddFeedForm();
+
+            $this->elementEnd('body');
+            $this->elementEnd('html');
+        } else {
+            return parent::handle($args);
+        }
+    }
     /**
      * Handle a POST request
      *
@@ -110,4 +144,16 @@ class MirrorSettingsAction extends AccountSettingsAction
         $nav = new SubGroupNav($this, common_current_user());
         $nav->show();
     }
+
+    function showScripts()
+    {
+        parent::showScripts();
+        $this->script('plugins/SubMirror/js/mirrorsettings.js');
+    }
+
+    function showStylesheets()
+    {
+        parent::showStylesheets();
+        $this->cssLink('plugins/SubMirror/css/mirrorsettings.css');
+    }
 }
diff --git a/plugins/SubMirror/css/mirrorsettings.css b/plugins/SubMirror/css/mirrorsettings.css
new file mode 100644
index 0000000000..d17c794f40
--- /dev/null
+++ b/plugins/SubMirror/css/mirrorsettings.css
@@ -0,0 +1,17 @@
+/* undo insane stuff from core styles */
+#add-mirror-wizard img {
+    display: inline;
+}
+
+/* we need #something to override most of the #content crap */
+
+#add-mirror-wizard .provider-list table {
+    width: 100%;
+}
+
+#add-mirror-wizard .provider-heading img {
+    vertical-align: middle;
+}
+#add-mirror-wizard .provider-heading {
+    cursor: pointer;
+}
diff --git a/plugins/SubMirror/js/mirrorsettings.js b/plugins/SubMirror/js/mirrorsettings.js
new file mode 100644
index 0000000000..e772af3dea
--- /dev/null
+++ b/plugins/SubMirror/js/mirrorsettings.js
@@ -0,0 +1,45 @@
+$(function() {
+    /**
+     * Append 'ajax=1' parameter onto URL.
+     */
+    function ajaxize(url) {
+        if (url.indexOf('?') == '-1') {
+            return url + '?ajax=1';
+        } else {
+            return url + '&ajax=1';
+        }
+    }
+
+    var addMirror = $('#add-mirror');
+    var wizard = $('#add-mirror-wizard');
+    if (wizard.length > 0) {
+        var list = wizard.find('.provider-list');
+        var providers = list.find('.provider-heading');
+        providers.click(function(event) {
+            console.log(this);
+            var targetUrl = $(this).find('a').attr('href');
+            if (targetUrl) {
+                // Make sure we don't accidentally follow the direct link
+                event.preventDefault();
+
+                var node = this;
+                function showNew() {
+                    var detail = $('<div class="provider-detail" style="display: none"></div>').insertAfter(node);
+                    detail.load(ajaxize(targetUrl), function(responseText, testStatus, xhr) {
+                        detail.slideDown();
+                    });
+                }
+
+                var old = addMirror.find('.provider-detail');
+                if (old.length) {
+                    old.slideUp(function() {
+                        old.remove();
+                        showNew();
+                    });
+                } else {
+                    showNew();
+                }
+            }
+        });
+    }
+});
\ No newline at end of file
diff --git a/plugins/SubMirror/lib/addmirrorwizard.php b/plugins/SubMirror/lib/addmirrorwizard.php
index 1ac8aa1388..0994819b41 100644
--- a/plugins/SubMirror/lib/addmirrorwizard.php
+++ b/plugins/SubMirror/lib/addmirrorwizard.php
@@ -87,22 +87,26 @@ class AddMirrorWizard extends Form
     {
         $out = $this->out;
 
-        $out->elementStart('table', array('width' => '100%'));
+        $out->elementStart('div', 'provider-list');
+        $out->element('h2', null, _m('Select a feed provider'));
+        $out->elementStart('table');
         foreach ($providers as $provider) {
             $icon = common_path('plugins/SubMirror/images/providers/' . $provider['id'] . '.png');
-            $out->elementStart('tr');
+            $targetUrl = common_local_url('mirrorsettings', array('provider' => $provider['id']));
 
-            $out->elementStart('td', array('style' => 'text-align: right; vertical-align: middle'));
+            $out->elementStart('tr', array('class' => 'provider'));
+            $out->elementStart('td');
+
+            $out->elementStart('div', 'provider-heading');
             $out->element('img', array('src' => $icon));
-            $out->elementEnd('td');
+            $out->element('a', array('href' => $targetUrl), $provider['name']);
+            $out->elementEnd('div');
 
-            $out->elementStart('td', array('style' => 'text-align: left; vertical-align: middle'));
-            $out->text($provider['name']);
             $out->elementEnd('td');
-
             $out->elementEnd('tr');
         }
         $out->elementEnd('table');
+        $out->elementEnd('div');
     }
 
     /**

From b1897e019021af1128540bbde4682538ac0a0dc5 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Tue, 18 Jan 2011 18:13:24 -0800
Subject: [PATCH 300/655] viz cleanup on AddMirrorWizard

---
 plugins/SubMirror/css/mirrorsettings.css  | 9 +++++++++
 plugins/SubMirror/js/mirrorsettings.js    | 6 ++++--
 plugins/SubMirror/lib/addmirrorwizard.php | 8 ++++----
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/plugins/SubMirror/css/mirrorsettings.css b/plugins/SubMirror/css/mirrorsettings.css
index d17c794f40..c91bb73b6b 100644
--- a/plugins/SubMirror/css/mirrorsettings.css
+++ b/plugins/SubMirror/css/mirrorsettings.css
@@ -5,6 +5,11 @@
 
 /* we need #something to override most of the #content crap */
 
+#add-mirror-wizard {
+    margin-left: 20px;
+    margin-right: 20px;
+}
+
 #add-mirror-wizard .provider-list table {
     width: 100%;
 }
@@ -15,3 +20,7 @@
 #add-mirror-wizard .provider-heading {
     cursor: pointer;
 }
+#add-mirror-wizard .provider-detail fieldset {
+    margin-top: 8px; /* hack */
+    margin-bottom: 8px; /* hack */
+}
\ No newline at end of file
diff --git a/plugins/SubMirror/js/mirrorsettings.js b/plugins/SubMirror/js/mirrorsettings.js
index e772af3dea..a27abe7ad5 100644
--- a/plugins/SubMirror/js/mirrorsettings.js
+++ b/plugins/SubMirror/js/mirrorsettings.js
@@ -26,13 +26,15 @@ $(function() {
                 function showNew() {
                     var detail = $('<div class="provider-detail" style="display: none"></div>').insertAfter(node);
                     detail.load(ajaxize(targetUrl), function(responseText, testStatus, xhr) {
-                        detail.slideDown();
+                        detail.slideDown('fast', function() {
+                            detail.find('input[type="text"]').focus();
+                        });
                     });
                 }
 
                 var old = addMirror.find('.provider-detail');
                 if (old.length) {
-                    old.slideUp(function() {
+                    old.slideUp('fast', function() {
                         old.remove();
                         showNew();
                     });
diff --git a/plugins/SubMirror/lib/addmirrorwizard.php b/plugins/SubMirror/lib/addmirrorwizard.php
index 0994819b41..7a63f8366b 100644
--- a/plugins/SubMirror/lib/addmirrorwizard.php
+++ b/plugins/SubMirror/lib/addmirrorwizard.php
@@ -26,7 +26,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
-class AddMirrorWizard extends Form
+class AddMirrorWizard extends Widget
 {
     /**
      * Name of the form
@@ -47,14 +47,14 @@ class AddMirrorWizard extends Form
      *
      * @return void
      */
-    function formData()
+    function show()
     {
-        $this->out->elementStart('fieldset');
+        $this->out->elementStart('div', array('id' => 'add-mirror-wizard'));
 
         $providers = $this->providers();
         $this->showProviders($providers);
 
-        $this->out->elementEnd('fieldset');
+        $this->out->elementEnd('div');
     }
 
     function providers()

From e53793edf40f3839c3d8f2dcf02da8584226e68b Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Sun, 23 Jan 2011 10:18:35 -0500
Subject: [PATCH 301/655] make 'admin' a safe user name

'admin' is a pretty common username that people try when installing;
it was blacklisted because all of our admin panels were at /admin/*,
which would conflict with the admin user's namespace.

Changed the location of all admin panels to /panel/*, blacklisted the
nickname 'panel', and allowed 'admin'. Tested with a fresh install;
seems to work great.
---
 lib/installer.php                             |  2 +-
 lib/router.php                                | 24 +++++++++----------
 plugins/Adsense/AdsensePlugin.php             |  2 +-
 plugins/BitlyUrl/BitlyUrlPlugin.php           |  2 +-
 plugins/Blacklist/BlacklistPlugin.php         |  2 +-
 plugins/Facebook/FacebookPlugin.php           |  2 +-
 .../FacebookBridge/FacebookBridgePlugin.php   |  2 +-
 plugins/OpenID/OpenIDPlugin.php               |  2 +-
 plugins/OpenX/OpenXPlugin.php                 |  2 +-
 plugins/Sitemap/SitemapPlugin.php             |  2 +-
 plugins/TwitterBridge/TwitterBridgePlugin.php |  2 +-
 plugins/UserFlag/UserFlagPlugin.php           |  2 +-
 plugins/YammerImport/YammerImportPlugin.php   |  4 ++--
 13 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/lib/installer.php b/lib/installer.php
index ad1989f4eb..1add65ba81 100644
--- a/lib/installer.php
+++ b/lib/installer.php
@@ -236,7 +236,7 @@ abstract class Installer
         }
         // @fixme hardcoded list; should use User::allowed_nickname()
         // if/when it's safe to have loaded the infrastructure here
-        $blacklist = array('main', 'admin', 'twitter', 'settings', 'rsd.xml', 'favorited', 'featured', 'favoritedrss', 'featuredrss', 'rss', 'getfile', 'api', 'groups', 'group', 'peopletag', 'tag', 'user', 'message', 'conversation', 'bookmarklet', 'notice', 'attachment', 'search', 'index.php', 'doc', 'opensearch', 'robots.txt', 'xd_receiver.html', 'facebook');
+        $blacklist = array('main', 'panel', 'twitter', 'settings', 'rsd.xml', 'favorited', 'featured', 'favoritedrss', 'featuredrss', 'rss', 'getfile', 'api', 'groups', 'group', 'peopletag', 'tag', 'user', 'message', 'conversation', 'bookmarklet', 'notice', 'attachment', 'search', 'index.php', 'doc', 'opensearch', 'robots.txt', 'xd_receiver.html', 'facebook');
         if (in_array($this->adminNick, $blacklist)) {
             $this->updateStatus('The user nickname "' . htmlspecialchars($this->adminNick) .
                          '" is reserved.', true);
diff --git a/lib/router.php b/lib/router.php
index b969829492..99d8aeb043 100644
--- a/lib/router.php
+++ b/lib/router.php
@@ -791,21 +791,21 @@ class Router
 
             // Admin
 
-            $m->connect('admin/site', array('action' => 'siteadminpanel'));
-            $m->connect('admin/design', array('action' => 'designadminpanel'));
-            $m->connect('admin/user', array('action' => 'useradminpanel'));
-	        $m->connect('admin/access', array('action' => 'accessadminpanel'));
-            $m->connect('admin/paths', array('action' => 'pathsadminpanel'));
-            $m->connect('admin/sessions', array('action' => 'sessionsadminpanel'));
-            $m->connect('admin/sitenotice', array('action' => 'sitenoticeadminpanel'));
-            $m->connect('admin/snapshot', array('action' => 'snapshotadminpanel'));
-            $m->connect('admin/license', array('action' => 'licenseadminpanel'));
+            $m->connect('panel/site', array('action' => 'siteadminpanel'));
+            $m->connect('panel/design', array('action' => 'designadminpanel'));
+            $m->connect('panel/user', array('action' => 'useradminpanel'));
+	        $m->connect('panel/access', array('action' => 'accessadminpanel'));
+            $m->connect('panel/paths', array('action' => 'pathsadminpanel'));
+            $m->connect('panel/sessions', array('action' => 'sessionsadminpanel'));
+            $m->connect('panel/sitenotice', array('action' => 'sitenoticeadminpanel'));
+            $m->connect('panel/snapshot', array('action' => 'snapshotadminpanel'));
+            $m->connect('panel/license', array('action' => 'licenseadminpanel'));
 
-            $m->connect('admin/plugins', array('action' => 'pluginsadminpanel'));
-            $m->connect('admin/plugins/enable/:plugin',
+            $m->connect('panel/plugins', array('action' => 'pluginsadminpanel'));
+            $m->connect('panel/plugins/enable/:plugin',
                         array('action' => 'pluginenable'),
                         array('plugin' => '[A-Za-z0-9_]+'));
-            $m->connect('admin/plugins/disable/:plugin',
+            $m->connect('panel/plugins/disable/:plugin',
                         array('action' => 'plugindisable'),
                         array('plugin' => '[A-Za-z0-9_]+'));
 
diff --git a/plugins/Adsense/AdsensePlugin.php b/plugins/Adsense/AdsensePlugin.php
index 1965f95eab..fec033331a 100644
--- a/plugins/Adsense/AdsensePlugin.php
+++ b/plugins/Adsense/AdsensePlugin.php
@@ -168,7 +168,7 @@ class AdsensePlugin extends UAPPlugin
 
     function onRouterInitialized($m)
     {
-        $m->connect('admin/adsense',
+        $m->connect('panel/adsense',
                     array('action' => 'adsenseadminpanel'));
 
         return true;
diff --git a/plugins/BitlyUrl/BitlyUrlPlugin.php b/plugins/BitlyUrl/BitlyUrlPlugin.php
index 532e66fbc7..8e8bf8d46e 100644
--- a/plugins/BitlyUrl/BitlyUrlPlugin.php
+++ b/plugins/BitlyUrl/BitlyUrlPlugin.php
@@ -184,7 +184,7 @@ class BitlyUrlPlugin extends UrlShortenerPlugin
      */
     function onRouterInitialized($m)
     {
-        $m->connect('admin/bitly',
+        $m->connect('panel/bitly',
                     array('action' => 'bitlyadminpanel'));
         return true;
     }
diff --git a/plugins/Blacklist/BlacklistPlugin.php b/plugins/Blacklist/BlacklistPlugin.php
index 15545f03cb..855263b5e0 100644
--- a/plugins/Blacklist/BlacklistPlugin.php
+++ b/plugins/Blacklist/BlacklistPlugin.php
@@ -297,7 +297,7 @@ class BlacklistPlugin extends Plugin
      */
     function onRouterInitialized($m)
     {
-        $m->connect('admin/blacklist', array('action' => 'blacklistadminpanel'));
+        $m->connect('panel/blacklist', array('action' => 'blacklistadminpanel'));
         return true;
     }
 
diff --git a/plugins/Facebook/FacebookPlugin.php b/plugins/Facebook/FacebookPlugin.php
index 798009817c..14af21b516 100644
--- a/plugins/Facebook/FacebookPlugin.php
+++ b/plugins/Facebook/FacebookPlugin.php
@@ -105,7 +105,7 @@ class FacebookPlugin extends Plugin
      */
     function onStartInitializeRouter($m)
     {
-        $m->connect('admin/facebook', array('action' => 'facebookadminpanel'));
+        $m->connect('panel/facebook', array('action' => 'facebookadminpanel'));
 
         if (self::hasKeys()) {
             // Facebook App stuff
diff --git a/plugins/FacebookBridge/FacebookBridgePlugin.php b/plugins/FacebookBridge/FacebookBridgePlugin.php
index 8b5d05e983..c6ff9bf74d 100644
--- a/plugins/FacebookBridge/FacebookBridgePlugin.php
+++ b/plugins/FacebookBridge/FacebookBridgePlugin.php
@@ -154,7 +154,7 @@ class FacebookBridgePlugin extends Plugin
     function onRouterInitialized($m)
     {
         // Always add the admin panel route
-        $m->connect('admin/facebook', array('action' => 'facebookadminpanel'));
+        $m->connect('panel/facebook', array('action' => 'facebookadminpanel'));
 
         // Only add these routes if an application has been setup on
         // Facebook for the plugin to use.
diff --git a/plugins/OpenID/OpenIDPlugin.php b/plugins/OpenID/OpenIDPlugin.php
index d1a6786fa8..97a685c004 100644
--- a/plugins/OpenID/OpenIDPlugin.php
+++ b/plugins/OpenID/OpenIDPlugin.php
@@ -80,7 +80,7 @@ class OpenIDPlugin extends Plugin
         $m->connect('index.php?action=finishaddopenid',
                     array('action' => 'finishaddopenid'));
         $m->connect('main/openidserver', array('action' => 'openidserver'));
-        $m->connect('admin/openid', array('action' => 'openidadminpanel'));
+        $m->connect('panel/openid', array('action' => 'openidadminpanel'));
 
         return true;
     }
diff --git a/plugins/OpenX/OpenXPlugin.php b/plugins/OpenX/OpenXPlugin.php
index 5d3bb2306c..acc904381a 100644
--- a/plugins/OpenX/OpenXPlugin.php
+++ b/plugins/OpenX/OpenXPlugin.php
@@ -175,7 +175,7 @@ ENDOFSCRIPT;
 
     function onRouterInitialized($m)
     {
-        $m->connect('admin/openx',
+        $m->connect('panel/openx',
                     array('action' => 'openxadminpanel'));
 
         return true;
diff --git a/plugins/Sitemap/SitemapPlugin.php b/plugins/Sitemap/SitemapPlugin.php
index 6a77f81231..36041cfc9a 100644
--- a/plugins/Sitemap/SitemapPlugin.php
+++ b/plugins/Sitemap/SitemapPlugin.php
@@ -122,7 +122,7 @@ class SitemapPlugin extends Plugin
                           'day' => '[0123][0-9]',
                           'index' => '[1-9][0-9]*'));
 
-        $m->connect('admin/sitemap',
+        $m->connect('panel/sitemap',
                     array('action' => 'sitemapadminpanel'));
 
         return true;
diff --git a/plugins/TwitterBridge/TwitterBridgePlugin.php b/plugins/TwitterBridge/TwitterBridgePlugin.php
index b2dce6f1c0..6df48eff3b 100644
--- a/plugins/TwitterBridge/TwitterBridgePlugin.php
+++ b/plugins/TwitterBridge/TwitterBridgePlugin.php
@@ -111,7 +111,7 @@ class TwitterBridgePlugin extends Plugin
      */
     function onRouterInitialized($m)
     {
-        $m->connect('admin/twitter', array('action' => 'twitteradminpanel'));
+        $m->connect('panel/twitter', array('action' => 'twitteradminpanel'));
 
         if (self::hasKeys()) {
             $m->connect(
diff --git a/plugins/UserFlag/UserFlagPlugin.php b/plugins/UserFlag/UserFlagPlugin.php
index fc7698841e..801dc6cc69 100644
--- a/plugins/UserFlag/UserFlagPlugin.php
+++ b/plugins/UserFlag/UserFlagPlugin.php
@@ -85,7 +85,7 @@ class UserFlagPlugin extends Plugin
     {
         $m->connect('main/flag/profile', array('action' => 'flagprofile'));
         $m->connect('main/flag/clear', array('action' => 'clearflag'));
-        $m->connect('admin/profile/flag', array('action' => 'adminprofileflag'));
+        $m->connect('panel/profile/flag', array('action' => 'adminprofileflag'));
         return true;
     }
 
diff --git a/plugins/YammerImport/YammerImportPlugin.php b/plugins/YammerImport/YammerImportPlugin.php
index 2ce5af21b0..41d8d08a66 100644
--- a/plugins/YammerImport/YammerImportPlugin.php
+++ b/plugins/YammerImport/YammerImportPlugin.php
@@ -34,9 +34,9 @@ class YammerImportPlugin extends Plugin
      */
     function onRouterInitialized($m)
     {
-        $m->connect('admin/yammer',
+        $m->connect('panel/yammer',
                     array('action' => 'yammeradminpanel'));
-        $m->connect('admin/yammer/auth',
+        $m->connect('panel/yammer/auth',
                     array('action' => 'yammerauth'));
         return true;
     }

From 7699bb3dba1ec4cab9e322ab01aeec80ca8e55df Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Sun, 23 Jan 2011 10:26:28 -0500
Subject: [PATCH 302/655] document that nickname 'panel' no longer allowed

---
 README | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/README b/README
index aa5532a8ec..a6db6d9c24 100644
--- a/README
+++ b/README
@@ -737,6 +737,12 @@ statusnet.ini (since this is the recommended database name). If you
 have a line in your config.php pointing to the old name, you'll need
 to update it.
 
+NOTE: the 1.0.0 version of StatusNet changed the URLs for all admin
+panels from /admin/* to /panel/*. This now allows the (popular)
+username 'admin', but blocks the considerably less popular username
+'panel'. If you have an existing user named 'panel', you should rename
+them before upgrading.
+
 Notice inboxes
 --------------
 

From 592e2be5e1534c954c834fac65958d32bf0d874f Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Sun, 23 Jan 2011 12:35:35 -0500
Subject: [PATCH 303/655] Make new menu the default menu

There's a new menu layout in this version of the software. It was
implemented as a plugin in 0.9.x to avoid clashes with existing themes,
but we're going to break that compatibility in this version, so we're just going for it.

This change involved moving all the changes in NewMenuPlugin into the
default code that was calling it. In addition, since
accountsettingsaction and connectsettingsaction differed only by menu,
I removed them, changed all references to them to the settingsmenu, and moved
the combined nav to its own class.

Let's put that episode behind us.

The CSS shim that was loaded by NewMenuPlugin for certain themes and certain actions
was removed.
---
 actions/avatarsettings.php                    |   4 +-
 actions/emailsettings.php                     |   4 +-
 actions/grouplogo.php                         |   2 +-
 actions/imsettings.php                        |   2 +-
 actions/oauthappssettings.php                 |   3 -
 actions/oauthconnectionssettings.php          |   4 +-
 actions/passwordsettings.php                  |   4 +-
 actions/profilesettings.php                   |   4 +-
 actions/showstream.php                        |   2 +-
 actions/smssettings.php                       |   4 +-
 actions/urlsettings.php                       |   4 +-
 lib/accountsettingsaction.php                 | 159 --------
 lib/action.php                                | 112 +++--
 lib/connectsettingsaction.php                 | 139 -------
 lib/designsettings.php                        |   6 +-
 lib/personalgroupnav.php                      |  47 +--
 lib/settingsaction.php                        |  13 +
 lib/settingsnav.php                           | 132 ++++++
 lib/subgroupnav.php                           |   6 +
 plugins/Facebook/FBConnectSettings.php        |   2 +-
 plugins/Facebook/FacebookPlugin.php           |   4 +-
 .../actions/facebooksettings.php              |   2 +-
 plugins/NewMenu/NewMenuPlugin.php             | 385 +-----------------
 plugins/NewMenu/newmenu.css                   |  47 ---
 plugins/OpenID/openidsettings.php             |   2 +-
 plugins/SubMirror/actions/mirrorsettings.php  |   2 +-
 plugins/TwitterBridge/twittersettings.php     |   2 +-
 theme/base/css/display.css                    |  49 +++
 28 files changed, 303 insertions(+), 843 deletions(-)
 delete mode 100644 lib/accountsettingsaction.php
 delete mode 100644 lib/connectsettingsaction.php
 create mode 100644 lib/settingsnav.php
 delete mode 100644 plugins/NewMenu/newmenu.css

diff --git a/actions/avatarsettings.php b/actions/avatarsettings.php
index 375420c5c9..7b671d9e32 100644
--- a/actions/avatarsettings.php
+++ b/actions/avatarsettings.php
@@ -32,7 +32,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
-require_once INSTALLDIR.'/lib/accountsettingsaction.php';
+
 
 define('MAX_ORIGINAL', 480);
 
@@ -49,7 +49,7 @@ define('MAX_ORIGINAL', 480);
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
-class AvatarsettingsAction extends AccountSettingsAction
+class AvatarsettingsAction extends SettingsAction
 {
     var $mode = null;
     var $imagefile = null;
diff --git a/actions/emailsettings.php b/actions/emailsettings.php
index 4a7dc1b871..41c12f2a04 100644
--- a/actions/emailsettings.php
+++ b/actions/emailsettings.php
@@ -32,7 +32,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
-require_once INSTALLDIR.'/lib/accountsettingsaction.php';
+
 
 /**
  * Settings for email
@@ -47,7 +47,7 @@ require_once INSTALLDIR.'/lib/accountsettingsaction.php';
  * @see      Widget
  */
 
-class EmailsettingsAction extends AccountSettingsAction
+class EmailsettingsAction extends SettingsAction
 {
     /**
      * Title of the page
diff --git a/actions/grouplogo.php b/actions/grouplogo.php
index f414a23cc3..69840485e0 100644
--- a/actions/grouplogo.php
+++ b/actions/grouplogo.php
@@ -32,7 +32,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
-require_once INSTALLDIR.'/lib/accountsettingsaction.php';
+
 
 define('MAX_ORIGINAL', 480);
 
diff --git a/actions/imsettings.php b/actions/imsettings.php
index 1b1bc0dc0d..76fb2285c3 100644
--- a/actions/imsettings.php
+++ b/actions/imsettings.php
@@ -43,7 +43,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
  * @see      SettingsAction
  */
 
-class ImsettingsAction extends ConnectSettingsAction
+class ImsettingsAction extends SettingsAction
 {
     /**
      * Title of the page
diff --git a/actions/oauthappssettings.php b/actions/oauthappssettings.php
index c98c90dbf8..3a8fc98966 100644
--- a/actions/oauthappssettings.php
+++ b/actions/oauthappssettings.php
@@ -31,9 +31,6 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/settingsaction.php';
-require_once INSTALLDIR . '/lib/applicationlist.php';
-
 /**
  * Show a user's registered OAuth applications
  *
diff --git a/actions/oauthconnectionssettings.php b/actions/oauthconnectionssettings.php
index cdb73203f0..c173a32230 100644
--- a/actions/oauthconnectionssettings.php
+++ b/actions/oauthconnectionssettings.php
@@ -31,8 +31,6 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/connectsettingsaction.php';
-require_once INSTALLDIR . '/lib/applicationlist.php';
 require_once INSTALLDIR . '/lib/apioauthstore.php';
 
 /**
@@ -46,7 +44,7 @@ require_once INSTALLDIR . '/lib/apioauthstore.php';
  *
  * @see      SettingsAction
  */
-class OauthconnectionssettingsAction extends ConnectSettingsAction
+class OauthconnectionssettingsAction extends SettingsAction
 {
     var $page        = null;
     var $oauth_token = null;
diff --git a/actions/passwordsettings.php b/actions/passwordsettings.php
index 3bb8e3bb9f..c9bd200bd8 100644
--- a/actions/passwordsettings.php
+++ b/actions/passwordsettings.php
@@ -32,7 +32,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
-require_once INSTALLDIR.'/lib/accountsettingsaction.php';
+
 
 /**
  * Change password
@@ -45,7 +45,7 @@ require_once INSTALLDIR.'/lib/accountsettingsaction.php';
  * @link     http://status.net/
  */
 
-class PasswordsettingsAction extends AccountSettingsAction
+class PasswordsettingsAction extends SettingsAction
 {
     /**
      * Title of the page
diff --git a/actions/profilesettings.php b/actions/profilesettings.php
index 19fbdbd293..1334644e9c 100644
--- a/actions/profilesettings.php
+++ b/actions/profilesettings.php
@@ -33,7 +33,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
-require_once INSTALLDIR.'/lib/accountsettingsaction.php';
+
 
 /**
  * Change profile settings
@@ -47,7 +47,7 @@ require_once INSTALLDIR.'/lib/accountsettingsaction.php';
  * @link     http://status.net/
  */
 
-class ProfilesettingsAction extends AccountSettingsAction
+class ProfilesettingsAction extends SettingsAction
 {
     /**
      * Title of the page
diff --git a/actions/showstream.php b/actions/showstream.php
index 14f629b6a8..1688677d84 100644
--- a/actions/showstream.php
+++ b/actions/showstream.php
@@ -106,7 +106,7 @@ class ShowstreamAction extends ProfileAction
 
     function showLocalNav()
     {
-        $nav = new PersonalGroupNav($this);
+        $nav = new SubGroupNav($this, $this->user);
         $nav->show();
     }
 
diff --git a/actions/smssettings.php b/actions/smssettings.php
index 6af1872a0e..217db27888 100644
--- a/actions/smssettings.php
+++ b/actions/smssettings.php
@@ -31,8 +31,6 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
-require_once INSTALLDIR.'/lib/connectsettingsaction.php';
-
 /**
  * Settings for SMS
  *
@@ -45,7 +43,7 @@ require_once INSTALLDIR.'/lib/connectsettingsaction.php';
  * @see      SettingsAction
  */
 
-class SmssettingsAction extends ConnectSettingsAction
+class SmssettingsAction extends SettingsAction
 {
     /**
      * Title of the page
diff --git a/actions/urlsettings.php b/actions/urlsettings.php
index 7b2fc3f554..f8780a7e86 100644
--- a/actions/urlsettings.php
+++ b/actions/urlsettings.php
@@ -32,7 +32,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
-require_once INSTALLDIR.'/lib/accountsettingsaction.php';
+
 
 /**
  * Miscellaneous settings actions
@@ -47,7 +47,7 @@ require_once INSTALLDIR.'/lib/accountsettingsaction.php';
  * @link     http://status.net/
  */
 
-class UrlsettingsAction extends AccountSettingsAction
+class UrlsettingsAction extends SettingsAction
 {
     /**
      * Title of the page
diff --git a/lib/accountsettingsaction.php b/lib/accountsettingsaction.php
deleted file mode 100644
index 2c519e4abd..0000000000
--- a/lib/accountsettingsaction.php
+++ /dev/null
@@ -1,159 +0,0 @@
-<?php
-/**
- * StatusNet, the distributed open-source microblogging tool
- *
- * Base class for account settings actions
- *
- * 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  Settings
- * @package   StatusNet
- * @author    Evan Prodromou <evan@status.net>
- * @copyright 2008-2009 StatusNet, Inc.
- * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://status.net/
- */
-
-if (!defined('STATUSNET') && !defined('LACONICA')) {
-    exit(1);
-}
-
-require_once INSTALLDIR.'/lib/settingsaction.php';
-
-/**
- * Base class for account settings actions
- *
- * @category Settings
- * @package  StatusNet
- * @author   Evan Prodromou <evan@status.net>
- * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://status.net/
- *
- * @see      Widget
- */
-class AccountSettingsAction extends SettingsAction
-{
-    /**
-     * Show the local navigation menu
-     *
-     * This is the same for all settings, so we show it here.
-     *
-     * @return void
-     */
-    function showLocalNav()
-    {
-        $menu = new AccountSettingsNav($this);
-        $menu->show();
-    }
-}
-
-/**
- * A widget for showing the settings group local nav menu
- *
- * @category Widget
- * @package  StatusNet
- * @author   Evan Prodromou <evan@status.net>
- * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://status.net/
- *
- * @see      HTMLOutputter
- */
-class AccountSettingsNav extends Widget
-{
-    var $action = null;
-
-    /**
-     * Construction
-     *
-     * @param Action $action current action, used for output
-     */
-    function __construct($action=null)
-    {
-        parent::__construct($action);
-        $this->action = $action;
-    }
-
-    /**
-     * Show the menu
-     *
-     * @return void
-     */
-    function show()
-    {
-        $action_name = $this->action->trimmed('action');
-        $this->action->elementStart('ul', array('class' => 'nav'));
-
-        if (Event::handle('StartAccountSettingsNav', array(&$this->action))) {
-            $user = common_current_user();
-
-            if(Event::handle('StartAccountSettingsProfileMenuItem', array($this, &$menu))){
-                // TRANS: Link title attribute in user account settings menu.
-                $title = _('Change your profile settings');
-                // TRANS: Link description in user account settings menu.
-                $this->showMenuItem('profilesettings',_('Profile'),$title);
-                Event::handle('EndAccountSettingsProfileMenuItem', array($this, &$menu));
-            }
-            if(Event::handle('StartAccountSettingsAvatarMenuItem', array($this, &$menu))){
-                // TRANS: Link title attribute in user account settings menu.
-                $title = _('Upload an avatar');
-                // TRANS: Link description in user account settings menu.
-                $this->showMenuItem('avatarsettings',_('Avatar'),$title);
-                Event::handle('EndAccountSettingsAvatarMenuItem', array($this, &$menu));
-            }
-            if(Event::handle('StartAccountSettingsPasswordMenuItem', array($this, &$menu))){
-                // TRANS: Link title attribute in user account settings menu.
-                $title = _('Change your password');
-                // TRANS: Link description in user account settings menu.
-                $this->showMenuItem('passwordsettings',_('Password'),$title);
-                Event::handle('EndAccountSettingsPasswordMenuItem', array($this, &$menu));
-            }
-            if(Event::handle('StartAccountSettingsEmailMenuItem', array($this, &$menu))){
-                // TRANS: Link title attribute in user account settings menu.
-                $title = _('Change email handling');
-                // TRANS: Link description in user account settings menu.
-                $this->showMenuItem('emailsettings',_('Email'),$title);
-                Event::handle('EndAccountSettingsEmailMenuItem', array($this, &$menu));
-            }
-            if(Event::handle('StartAccountSettingsDesignMenuItem', array($this, &$menu))){
-                // TRANS: Link title attribute in user account settings menu.
-                $title = _('Design your profile');
-                // TRANS: Link description in user account settings menu.
-                $this->showMenuItem('userdesignsettings',_('Design'),$title);
-                Event::handle('EndAccountSettingsDesignMenuItem', array($this, &$menu));
-            }
-            if(Event::handle('StartAccountSettingsUrlMenuItem', array($this, &$menu))){
-                // TRANS: Link title attribute in user account settings menu.
-                $title = _('URL shortener settings');
-                // TRANS: Link description in user account settings menu.
-                $this->showMenuItem('urlsettings',_('URL'),$title);
-                Event::handle('EndAccountSettingsUrlMenuItem', array($this, &$menu));
-            }
-
-            Event::handle('EndAccountSettingsNav', array(&$this->action));
-        }
-
-        $this->action->elementEnd('ul');
-    }
-
-    function showMenuItem($menuaction, $desc1, $desc2)
-    {
-        $action_name = $this->action->trimmed('action');
-        $this->action->menuItem(common_local_url($menuaction),
-            $desc1,
-            $desc2,
-            $action_name === $menuaction);
-    }
-}
diff --git a/lib/action.php b/lib/action.php
index c01a686904..c8f77f79bd 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -476,9 +476,13 @@ class Action extends HTMLOutputter // lawsuit
                 $user = User::singleUser();
                 $url = common_local_url('showstream',
                                         array('nickname' => $user->nickname));
+            } else if (common_logged_in()) {
+                $cur = common_current_user();
+                $url = common_local_url('all', array('nickname' => $cur->nickname));
             } else {
                 $url = common_local_url('public');
             }
+
             $this->elementStart('a', array('class' => 'url home bookmark',
                                            'href' => $url));
 
@@ -513,7 +517,8 @@ class Action extends HTMLOutputter // lawsuit
             $this->text(' ');
             $this->element('span', array('class' => 'fn org'), common_config('site', 'name'));
             $this->elementEnd('a');
-            Event::handle('EndAddressData', array($this));
+
+            Event::handle('EndAddressData', array($action));
         }
         $this->elementEnd('address');
     }
@@ -529,71 +534,62 @@ class Action extends HTMLOutputter // lawsuit
         $this->elementStart('ul', array('class' => 'nav',
                                         'id' => 'site_nav_global_primary'));
         if (Event::handle('StartPrimaryNav', array($this))) {
-            if ($user) {
-                // TRANS: Tooltip for main menu option "Personal"
-                $tooltip = _m('TOOLTIP', 'Personal profile and friends timeline');
-                $this->menuItem(common_local_url('all', array('nickname' => $user->nickname)),
-                                // TRANS: Main menu option when logged in for access to personal profile and friends timeline
-                                _m('MENU', 'Personal'), $tooltip, false, 'nav_home');
-                // TRANS: Tooltip for main menu option "Account"
-                $tooltip = _m('TOOLTIP', 'Change your email, avatar, password, profile');
+            if (!empty($user)) {
+                $this->menuItem(common_local_url('all', 
+                                                 array('nickname' => $user->nickname)),
+                                _m('Home'),
+                                _m('Friends timeline'),
+                                false,
+                                'nav_home');
+                $this->menuItem(common_local_url('showstream', 
+                                                 array('nickname' => $user->nickname)),
+                                _m('Profile'),
+                                _m('Your profile'),
+                                false,
+                                'nav_profile');
+                $this->menuItem(common_local_url('public'),
+                                _m('Public'),
+                                _m('Everyone on this site'),
+                                false,
+                                'nav_public');
                 $this->menuItem(common_local_url('profilesettings'),
-                                // TRANS: Main menu option when logged in for access to user settings
-                                _('Account'), $tooltip, false, 'nav_account');
-                // TRANS: Tooltip for main menu option "Services"
-                $tooltip = _m('TOOLTIP', 'Connect to services');
-                $this->menuItem(common_local_url('oauthconnectionssettings'),
-                                // TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-                                _('Connect'), $tooltip, false, 'nav_connect');
+                                _m('Settings'),
+                                _m('Change your personal settings'),
+                                false,
+                                'nav_account');
                 if ($user->hasRight(Right::CONFIGURESITE)) {
-                    // TRANS: Tooltip for menu option "Admin"
-                    $tooltip = _m('TOOLTIP', 'Change site configuration');
                     $this->menuItem(common_local_url('siteadminpanel'),
-                                    // TRANS: Main menu option when logged in and site admin for access to site configuration
-                                    _m('MENU', 'Admin'), $tooltip, false, 'nav_admin');
+                                    _m('Admin'), 
+                                    _m('Site configuration'),
+                                    false,
+                                    'nav_admin');
                 }
-                if (common_config('invite', 'enabled')) {
-                    // TRANS: Tooltip for main menu option "Invite"
-                    $tooltip = _m('TOOLTIP', 'Invite friends and colleagues to join you on %s');
-                    $this->menuItem(common_local_url('invite'),
-                                    // TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-                                    _m('MENU', 'Invite'),
-                                    sprintf($tooltip,
-                                            common_config('site', 'name')),
-                                    false, 'nav_invitecontact');
-                }
-                // TRANS: Tooltip for main menu option "Logout"
-                $tooltip = _m('TOOLTIP', 'Logout from the site');
                 $this->menuItem(common_local_url('logout'),
-                                // TRANS: Main menu option when logged in to log out the current user
-                                _m('MENU', 'Logout'), $tooltip, false, 'nav_logout');
-            }
-            else {
-                if (!common_config('site', 'closed') && !common_config('site', 'inviteonly')) {
-                    // TRANS: Tooltip for main menu option "Register"
-                    $tooltip = _m('TOOLTIP', 'Create an account');
-                    $this->menuItem(common_local_url('register'),
-                                    // TRANS: Main menu option when not logged in to register a new account
-                                    _m('MENU', 'Register'), $tooltip, false, 'nav_register');
-                }
-                // TRANS: Tooltip for main menu option "Login"
-                $tooltip = _m('TOOLTIP', 'Login to the site');
+                                _m('Logout'), 
+                                _m('Logout from the site'),
+                                false,
+                                'nav_logout');
+            } else {
+                $this->menuItem(common_local_url('public'),
+                                _m('Public'),
+                                _m('Everyone on this site'),
+                                false,
+                                'nav_public');
                 $this->menuItem(common_local_url('login'),
-                                // TRANS: Main menu option when not logged in to log in
-                                _m('MENU', 'Login'), $tooltip, false, 'nav_login');
+                                _m('Login'), 
+                                _m('Login to the site'),
+                                false,
+                                'nav_login');
             }
-            // TRANS: Tooltip for main menu option "Help"
-            $tooltip = _m('TOOLTIP', 'Help me!');
-            $this->menuItem(common_local_url('doc', array('title' => 'help')),
-                            // TRANS: Main menu option for help on the StatusNet site
-                            _m('MENU', 'Help'), $tooltip, false, 'nav_help');
-            if ($user || !common_config('site', 'private')) {
-                // TRANS: Tooltip for main menu option "Search"
-                $tooltip = _m('TOOLTIP', 'Search for people or text');
-                $this->menuItem(common_local_url('peoplesearch'),
-                                // TRANS: Main menu option when logged in or when the StatusNet instance is not private
-                                _m('MENU', 'Search'), $tooltip, false, 'nav_search');
+
+            if (!empty($user) || !common_config('site', 'private')) {
+                $this->menuItem(common_local_url('noticesearch'),
+                                _m('Search'),
+                                _m('Search the site'),
+                                false,
+                                'nav_search');
             }
+
             Event::handle('EndPrimaryNav', array($this));
         }
         $this->elementEnd('ul');
diff --git a/lib/connectsettingsaction.php b/lib/connectsettingsaction.php
deleted file mode 100644
index 0f64fee8ce..0000000000
--- a/lib/connectsettingsaction.php
+++ /dev/null
@@ -1,139 +0,0 @@
-<?php
-/**
- * StatusNet, the distributed open-source microblogging tool
- *
- * Base class for connection settings actions
- *
- * 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  Settings
- * @package   StatusNet
- * @author    Evan Prodromou <evan@status.net>
- * @copyright 2008-2009 StatusNet, Inc.
- * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://status.net/
- */
-
-if (!defined('STATUSNET') && !defined('LACONICA')) {
-    exit(1);
-}
-
-require_once INSTALLDIR.'/lib/settingsaction.php';
-
-/**
- * Base class for connection settings actions
- *
- * @category Settings
- * @package  StatusNet
- * @author   Evan Prodromou <evan@status.net>
- * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://status.net/
- *
- * @see      Widget
- */
-class ConnectSettingsAction extends SettingsAction
-{
-    /**
-     * Show the local navigation menu
-     *
-     * This is the same for all settings, so we show it here.
-     *
-     * @return void
-     */
-    function showLocalNav()
-    {
-        $menu = new ConnectSettingsNav($this);
-        $menu->show();
-    }
-}
-
-/**
- * A widget for showing the connect group local nav menu
- *
- * @category Widget
- * @package  StatusNet
- * @author   Evan Prodromou <evan@status.net>
- * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://status.net/
- *
- * @see      HTMLOutputter
- */
-class ConnectSettingsNav extends Widget
-{
-    var $action = null;
-
-    /**
-     * Construction
-     *
-     * @param Action $action current action, used for output
-     */
-    function __construct($action=null)
-    {
-        parent::__construct($action);
-        $this->action = $action;
-    }
-
-    /**
-     * Show the menu
-     *
-     * @return void
-     */
-    function show()
-    {
-        $action_name = $this->action->trimmed('action');
-        $this->action->elementStart('ul', array('class' => 'nav'));
-
-        if (Event::handle('StartConnectSettingsNav', array(&$this->action))) {
-
-            # action => array('prompt', 'title')
-            $menu = array();
-            $transports = array();
-            Event::handle('GetImTransports', array(&$transports));
-            if ($transports) {
-                $menu['imsettings'] =
-                  // TRANS: Menu item for Instant Messaging settings.
-                  array(_m('MENU','IM'),
-                        // TRANS: Tooltip for Instant Messaging menu item.
-                        _('Updates by instant messenger (IM)'));
-            }
-            if (common_config('sms', 'enabled')) {
-                $menu['smssettings'] =
-                  // TRANS: Menu item for Short Message Service settings.
-                  array(_m('MENU','SMS'),
-                        // TRANS: Tooltip for Short Message Service menu item.
-                        _('Updates by SMS'));
-            }
-
-            $menu['oauthconnectionssettings'] = array(
-                // TRANS: Menu item for OuAth connection settings.
-                _m('MENU','Connections'),
-                // TRANS: Tooltip for connected applications (Connections through OAuth) menu item.
-                _('Authorized connected applications')
-            );
-
-            foreach ($menu as $menuaction => $menudesc) {
-                $this->action->menuItem(common_local_url($menuaction),
-                        $menudesc[0],
-                        $menudesc[1],
-                        $action_name === $menuaction);
-            }
-
-            Event::handle('EndConnectSettingsNav', array(&$this->action));
-        }
-
-        $this->action->elementEnd('ul');
-    }
-}
diff --git a/lib/designsettings.php b/lib/designsettings.php
index d0601c5530..eb3a5908e6 100644
--- a/lib/designsettings.php
+++ b/lib/designsettings.php
@@ -32,9 +32,6 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/accountsettingsaction.php';
-require_once INSTALLDIR . '/lib/webcolor.php';
-
 /**
  * Base class for setting a user or group design
  *
@@ -48,7 +45,8 @@ require_once INSTALLDIR . '/lib/webcolor.php';
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
-class DesignSettingsAction extends AccountSettingsAction
+
+class DesignSettingsAction extends SettingsAction
 {
     var $submitaction = null;
 
diff --git a/lib/personalgroupnav.php b/lib/personalgroupnav.php
index 1f543b8974..f57de8e240 100644
--- a/lib/personalgroupnav.php
+++ b/lib/personalgroupnav.php
@@ -79,7 +79,7 @@ class PersonalGroupNav extends Widget
     {
         $user = null;
 
-	// FIXME: we should probably pass this in
+        // FIXME: we should probably pass this in
 
         $action = $this->action->trimmed('action');
         $nickname = $this->action->trimmed('nickname');
@@ -98,25 +98,20 @@ class PersonalGroupNav extends Widget
 
         if (Event::handle('StartPersonalGroupNav', array($this))) {
             $this->out->menuItem(common_local_url('all', array('nickname' =>
-                                                           $nickname)),
-                             _('Personal'),
-                             sprintf(_('%s and friends'), $name),
-                             $action == 'all', 'nav_timeline_personal');
+                                                               $nickname)),
+                                 _('Home'),
+                                 sprintf(_('%s and friends'), $name),
+                                 $action == 'all', 'nav_timeline_personal');
             $this->out->menuItem(common_local_url('replies', array('nickname' =>
-                                                                  $nickname)),
-                             _('Replies'),
-                             sprintf(_('Replies to %s'), $name),
-                             $action == 'replies', 'nav_timeline_replies');
-            $this->out->menuItem(common_local_url('showstream', array('nickname' =>
-                                                                  $nickname)),
-                             _('Profile'),
-                             $name,
-                             $action == 'showstream', 'nav_profile');
+                                                                   $nickname)),
+                                 _('Replies'),
+                                 sprintf(_('Replies to %s'), $name),
+                                 $action == 'replies', 'nav_timeline_replies');
             $this->out->menuItem(common_local_url('showfavorites', array('nickname' =>
-                                                                  $nickname)),
-                             _('Favorites'),
-                             sprintf(_('%s\'s favorite notices'), ($user_profile) ? $name : _('User')),
-                             $action == 'showfavorites', 'nav_timeline_favorites');
+                                                                         $nickname)),
+                                 _('Favorites'),
+                                 sprintf(_('%s\'s favorite notices'), ($user_profile) ? $name : _('User')),
+                                 $action == 'showfavorites', 'nav_timeline_favorites');
 
             $cur = common_current_user();
 
@@ -124,15 +119,15 @@ class PersonalGroupNav extends Widget
                 !common_config('singleuser', 'enabled')) {
 
                 $this->out->menuItem(common_local_url('inbox', array('nickname' =>
-                                                                         $nickname)),
-                                 _('Inbox'),
-                                 _('Your incoming messages'),
-                                 $action == 'inbox');
+                                                                     $nickname)),
+                                     _('Inbox'),
+                                     _('Your incoming messages'),
+                                     $action == 'inbox');
                 $this->out->menuItem(common_local_url('outbox', array('nickname' =>
-                                                                         $nickname)),
-                                 _('Outbox'),
-                                 _('Your sent messages'),
-                                 $action == 'outbox');
+                                                                      $nickname)),
+                                     _('Outbox'),
+                                     _('Your sent messages'),
+                                     $action == 'outbox');
             }
             Event::handle('EndPersonalGroupNav', array($this));
         }
diff --git a/lib/settingsaction.php b/lib/settingsaction.php
index c3669868d4..8c00054dcb 100644
--- a/lib/settingsaction.php
+++ b/lib/settingsaction.php
@@ -150,4 +150,17 @@ class SettingsAction extends CurrentUserDesignAction
         return '';
     }
 
+    /**
+     * Show the local navigation menu
+     *
+     * This is the same for all settings, so we show it here.
+     *
+     * @return void
+     */
+
+    function showLocalNav()
+    {
+        $menu = new SettingsNav($this);
+        $menu->show();
+    }
 }
diff --git a/lib/settingsnav.php b/lib/settingsnav.php
new file mode 100644
index 0000000000..a73f73f86a
--- /dev/null
+++ b/lib/settingsnav.php
@@ -0,0 +1,132 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2010, StatusNet, Inc.
+ *
+ * Settings menu
+ * 
+ * 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  Widget
+ * @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);
+}
+
+/**
+ * A widget for showing the settings group local nav menu
+ *
+ * @category Widget
+ * @package  StatusNet
+ * @author   Evan Prodromou <evan@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://status.net/
+ *
+ * @see      HTMLOutputter
+ */
+
+class SettingsNav extends Widget
+{
+    var $action = null;
+
+    /**
+     * Construction
+     *
+     * @param Action $action current action, used for output
+     */
+    function __construct($action=null)
+    {
+        parent::__construct($action);
+        $this->action = $action;
+    }
+
+    /**
+     * Show the menu
+     *
+     * @return void
+     */
+
+    function show()
+    {
+        $actionName = $this->action->trimmed('action');
+        $this->action->elementStart('ul', array('class' => 'nav'));
+
+        if (Event::handle('StartAccountSettingsNav', array(&$this->action))) {
+            $this->action->menuItem(common_local_url('profilesettings'),
+                                    _('Profile'),
+                                    _('Change your profile settings'),
+                                    $actionName == 'profilesettings');
+
+            $this->action->menuItem(common_local_url('avatarsettings'),
+                                    _('Avatar'),
+                                    _('Upload an avatar'),
+                                    $actionName == 'avatarsettings');
+
+            $this->action->menuItem(common_local_url('passwordsettings'),
+                                    _('Password'),
+                                    _('Change your password'),
+                                    $actionName == 'passwordsettings');
+
+            $this->action->menuItem(common_local_url('emailsettings'),
+                                    _('Email'),
+                                    _('Change email handling'),
+                                    $actionName == 'emailsettings');
+
+            $this->action->menuItem(common_local_url('userdesignsettings'),
+                                    _('Design'),
+                                    _('Design your profile'),
+                                    $actionName == 'userdesignsettings');
+
+            $this->action->menuItem(common_local_url('urlsettings'),
+                                    _('URL'),
+                                    _('URL shorteners'),
+                                    $actionName == 'urlsettings');
+
+            Event::handle('EndAccountSettingsNav', array(&$this->action));
+        
+            if (common_config('xmpp', 'enabled')) {
+                $this->action->menuItem(common_local_url('imsettings'),
+                                        _m('IM'),
+                                        _('Updates by instant messenger (IM)'),
+                                        $actionName == 'imsettings');
+            }
+
+            if (common_config('sms', 'enabled')) {
+                $this->action->menuItem(common_local_url('smssettings'),
+                                        _m('SMS'),
+                                        _('Updates by SMS'),
+                                        $actionName == 'smssettings');
+            }
+
+            $this->action->menuItem(common_local_url('oauthconnectionssettings'),
+                                    _('Connections'),
+                                    _('Authorized connected applications'),
+                                    $actionName == 'oauthconnectionsettings');
+
+            Event::handle('EndConnectSettingsNav', array(&$this->action));
+        }
+
+        $this->action->elementEnd('ul');
+    }
+}
diff --git a/lib/subgroupnav.php b/lib/subgroupnav.php
index 2748b59e18..be3ba27480 100644
--- a/lib/subgroupnav.php
+++ b/lib/subgroupnav.php
@@ -76,6 +76,12 @@ class SubGroupNav extends Widget
 
         if (Event::handle('StartSubGroupNav', array($this))) {
 
+            $this->out->menuItem(common_local_url('showstream', array('nickname' =>
+                                                                      $this->user->nickname)),
+                                 _('Profile'),
+                                 (empty($profile)) ? $this->user->nickname : $profile->getBestName(),
+                                 $action == 'showstream',
+                                 'nav_profile');
             $this->out->menuItem(common_local_url('subscriptions',
                                                   array('nickname' =>
                                                         $this->user->nickname)),
diff --git a/plugins/Facebook/FBConnectSettings.php b/plugins/Facebook/FBConnectSettings.php
index 701994d0d0..4043f666fa 100644
--- a/plugins/Facebook/FBConnectSettings.php
+++ b/plugins/Facebook/FBConnectSettings.php
@@ -42,7 +42,7 @@ require_once INSTALLDIR.'/lib/connectsettingsaction.php';
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
-class FBConnectSettingsAction extends ConnectSettingsAction
+class FBSettingsAction extends ConnectSettingsAction
 {
     /**
      * Title of the page
diff --git a/plugins/Facebook/FacebookPlugin.php b/plugins/Facebook/FacebookPlugin.php
index 14af21b516..da55c8a6e2 100644
--- a/plugins/Facebook/FacebookPlugin.php
+++ b/plugins/Facebook/FacebookPlugin.php
@@ -150,7 +150,7 @@ class FacebookPlugin extends Plugin
             return false;
         case 'FBConnectAuthAction':
         case 'FBConnectLoginAction':
-        case 'FBConnectSettingsAction':
+        case 'FBSettingsAction':
         case 'FBC_XDReceiverAction':
             include_once INSTALLDIR . '/plugins/Facebook/' .
               mb_substr($cls, 0, -6) . '.php';
@@ -357,7 +357,7 @@ class FacebookPlugin extends Plugin
         // List of actions that require FB stuff
         $needy = array('FBConnectLoginAction',
                        'FBConnectauthAction',
-                       'FBConnectSettingsAction');
+                       'FBSettingsAction');
 
         if (in_array(get_class($action), $needy)) {
             return true;
diff --git a/plugins/FacebookBridge/actions/facebooksettings.php b/plugins/FacebookBridge/actions/facebooksettings.php
index 6576e20411..b9526c1269 100644
--- a/plugins/FacebookBridge/actions/facebooksettings.php
+++ b/plugins/FacebookBridge/actions/facebooksettings.php
@@ -41,7 +41,7 @@ if (!defined('STATUSNET')) {
  *
  * @see      SettingsAction
  */
-class FacebooksettingsAction extends ConnectSettingsAction {
+class FacebooksettingsAction extends SettingsAction {
     private $facebook; // Facebook PHP-SDK client obj
     private $flink;
     private $user;
diff --git a/plugins/NewMenu/NewMenuPlugin.php b/plugins/NewMenu/NewMenuPlugin.php
index cdcea5cd92..4f0843e26c 100644
--- a/plugins/NewMenu/NewMenuPlugin.php
+++ b/plugins/NewMenu/NewMenuPlugin.php
@@ -22,7 +22,6 @@
  *
  * @category  Sample
  * @package   StatusNet
- * @author    Brion Vibber <brionv@status.net>
  * @author    Evan Prodromou <evan@status.net>
  * @copyright 2010 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
@@ -43,393 +42,17 @@ if (!defined('STATUSNET')) {
  *
  * @category  NewMenu
  * @package   StatusNet
- * @author    Brion Vibber <brionv@status.net>
  * @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 NewMenuPlugin extends Plugin
 {
-    public $loadCSS = false;
-
-    /**
-     * Load related modules when needed
-     *
-     * @param string $cls Name of the class to be loaded
-     *
-     * @return boolean hook value; true means continue processing, false means stop.
-     */
-
-    function onAutoload($cls)
+    function __construct()
     {
-        $dir = dirname(__FILE__);
-
-        switch ($cls)
-        {
-        case 'HelloAction':
-            include_once $dir . '/' . strtolower(mb_substr($cls, 0, -6)) . '.php';
-            return false;
-        case 'User_greeting_count':
-            include_once $dir . '/'.$cls.'.php';
-            return false;
-        default:
-            return true;
-        }
-    }
-
-    /**
-     * Modify the default menu
-     *
-     * @param Action $action The current action handler. Use this to
-     *                       do any output.
-     *
-     * @return boolean hook value; true means continue processing, false means stop.
-     *
-     * @see Action
-     */
-
-    function onStartPrimaryNav($action)
-    {
-        $user = common_current_user();
-
-        if (!empty($user)) {
-            $action->menuItem(common_local_url('all', 
-                                               array('nickname' => $user->nickname)),
-                              _m('Home'),
-                              _m('Friends timeline'),
-                              false,
-                              'nav_home');
-            $action->menuItem(common_local_url('showstream', 
-                                               array('nickname' => $user->nickname)),
-                              _m('Profile'),
-                              _m('Your profile'),
-                              false,
-                              'nav_profile');
-            $action->menuItem(common_local_url('public'),
-                              _m('Public'),
-                              _m('Everyone on this site'),
-                              false,
-                              'nav_public');
-            $action->menuItem(common_local_url('profilesettings'),
-                              _m('Settings'),
-                              _m('Change your personal settings'),
-                              false,
-                              'nav_account');
-            if ($user->hasRight(Right::CONFIGURESITE)) {
-                $action->menuItem(common_local_url('siteadminpanel'),
-                                  _m('Admin'), 
-                                  _m('Site configuration'),
-                                  false,
-                                  'nav_admin');
-            }
-            $action->menuItem(common_local_url('logout'),
-                              _m('Logout'), 
-                              _m('Logout from the site'),
-                              false,
-                              'nav_logout');
-        } else {
-            $action->menuItem(common_local_url('public'),
-                              _m('Public'),
-                              _m('Everyone on this site'),
-                              false,
-                              'nav_public');
-            $action->menuItem(common_local_url('login'),
-                              _m('Login'), 
-                              _m('Login to the site'),
-                              false,
-                              'nav_login');
-        }
-
-        if (!empty($user) || !common_config('site', 'private')) {
-            $action->menuItem(common_local_url('noticesearch'),
-                              _m('Search'),
-                              _m('Search the site'),
-                              false,
-                              'nav_search');
-        }
-
-        Event::handle('EndPrimaryNav', array($action));
-
-        return false;
-    }
-
-    function onStartPersonalGroupNav($menu)
-    {
-        $user = null;
-
-        // FIXME: we should probably pass this in
-
-        $action = $menu->action->trimmed('action');
-        $nickname = $menu->action->trimmed('nickname');
-
-        if ($nickname) {
-            $user = User::staticGet('nickname', $nickname);
-            $user_profile = $user->getProfile();
-            $name = $user_profile->getBestName();
-        } else {
-            // @fixme can this happen? is this valid?
-            $user_profile = false;
-            $name = $nickname;
-        }
-
-        $menu->out->menuItem(common_local_url('all', array('nickname' =>
-                                                           $nickname)),
-                             _('Home'),
-                             sprintf(_('%s and friends'), $name),
-                             $action == 'all', 'nav_timeline_personal');
-        $menu->out->menuItem(common_local_url('replies', array('nickname' =>
-                                                               $nickname)),
-                             _('Replies'),
-                             sprintf(_('Replies to %s'), $name),
-                             $action == 'replies', 'nav_timeline_replies');
-        $menu->out->menuItem(common_local_url('showfavorites', array('nickname' =>
-                                                                     $nickname)),
-                             _('Favorites'),
-                             sprintf(_('%s\'s favorite notices'), ($user_profile) ? $name : _('User')),
-                             $action == 'showfavorites', 'nav_timeline_favorites');
-
-        $cur = common_current_user();
-
-        if ($cur && $cur->id == $user->id &&
-            !common_config('singleuser', 'enabled')) {
-
-            $menu->out->menuItem(common_local_url('inbox', array('nickname' =>
-                                                                 $nickname)),
-                                 _('Inbox'),
-                                 _('Your incoming messages'),
-                                 $action == 'inbox');
-            $menu->out->menuItem(common_local_url('outbox', array('nickname' =>
-                                                                  $nickname)),
-                                 _('Outbox'),
-                                 _('Your sent messages'),
-                                 $action == 'outbox');
-        }
-        Event::handle('EndPersonalGroupNav', array($menu));
-        return false;
-    }
-
-    function onStartSubGroupNav($menu)
-    {
-        $cur = common_current_user();
-        $action = $menu->action->trimmed('action');
-
-        $profile = $menu->user->getProfile();
-
-        $menu->out->menuItem(common_local_url('showstream', array('nickname' =>
-                                                                  $menu->user->nickname)),
-                             _('Profile'),
-                             (empty($profile)) ? $menu->user->nickname : $profile->getBestName(),
-                             $action == 'showstream',
-                             'nav_profile');
-        $menu->out->menuItem(common_local_url('subscriptions',
-                                              array('nickname' =>
-                                                    $menu->user->nickname)),
-                             _('Subscriptions'),
-                             sprintf(_('People %s subscribes to'),
-                                     $menu->user->nickname),
-                             $action == 'subscriptions',
-                             'nav_subscriptions');
-        $menu->out->menuItem(common_local_url('subscribers',
-                                              array('nickname' =>
-                                                    $menu->user->nickname)),
-                             _('Subscribers'),
-                             sprintf(_('People subscribed to %s'),
-                                     $menu->user->nickname),
-                             $action == 'subscribers',
-                             'nav_subscribers');
-        $menu->out->menuItem(common_local_url('usergroups',
-                                              array('nickname' =>
-                                                    $menu->user->nickname)),
-                             _('Groups'),
-                             sprintf(_('Groups %s is a member of'),
-                                     $menu->user->nickname),
-                             $action == 'usergroups',
-                             'nav_usergroups');
-        if (common_config('invite', 'enabled') && !is_null($cur) && $menu->user->id === $cur->id) {
-            $menu->out->menuItem(common_local_url('invite'),
-                                 _('Invite'),
-                                 sprintf(_('Invite friends and colleagues to join you on %s'),
-                                         common_config('site', 'name')),
-                                 $action == 'invite',
-                                 'nav_invite');
-        }
-
-        Event::handle('EndSubGroupNav', array($menu));
-        return false;
-    }
-
-    function onStartShowLocalNavBlock($action)
-    {
-        $actionName = $action->trimmed('action');
-        
-        if ($actionName == 'showstream') {
-            $action->elementStart('dl', array('id' => 'site_nav_local_views'));
-            // TRANS: DT element for local views block. String is hidden in default CSS.
-            $action->element('dt', null, _('Local views'));
-            $action->elementStart('dd');
-            $nav = new SubGroupNav($action, $action->user);
-            $nav->show();
-            $action->elementEnd('dd');
-            $action->elementEnd('dl');
-            Event::handle('EndShowLocalNavBlock', array($action));
-            return false;
-        }
-
-        return true;
-    }
-
-    function onStartAccountSettingsNav(&$action)
-    {
-        $this->_settingsMenu($action);
-        return false;
-    }
-
-    function onStartConnectSettingsNav(&$action)
-    {
-        $this->_settingsMenu($action);
-        return false;
-    }
-
-    private function _settingsMenu(&$action)
-    {
-        $actionName = $action->trimmed('action');
-
-        $action->menuItem(common_local_url('profilesettings'),
-                          _('Profile'),
-                          _('Change your profile settings'),
-                          $actionName == 'profilesettings');
-
-        $action->menuItem(common_local_url('avatarsettings'),
-                          _('Avatar'),
-                          _('Upload an avatar'),
-                          $actionName == 'avatarsettings');
-
-        $action->menuItem(common_local_url('passwordsettings'),
-                          _('Password'),
-                          _('Change your password'),
-                          $actionName == 'passwordsettings');
-
-        $action->menuItem(common_local_url('emailsettings'),
-                          _('Email'),
-                          _('Change email handling'),
-                          $actionName == 'emailsettings');
-
-        $action->menuItem(common_local_url('userdesignsettings'),
-                          _('Design'),
-                          _('Design your profile'),
-                          $actionName == 'userdesignsettings');
-
-        $action->menuItem(common_local_url('othersettings'),
-                          _('Other'),
-                          _('Other options'),
-                          $actionName == 'othersettings');
-
-        Event::handle('EndAccountSettingsNav', array(&$action));
-        
-        if (common_config('xmpp', 'enabled')) {
-            $action->menuItem(common_local_url('imsettings'),
-                              _m('IM'),
-                              _('Updates by instant messenger (IM)'),
-                              $actionName == 'imsettings');
-        }
-
-        if (common_config('sms', 'enabled')) {
-            $action->menuItem(common_local_url('smssettings'),
-                              _m('SMS'),
-                              _('Updates by SMS'),
-                              $actionName == 'smssettings');
-        }
-
-        $action->menuItem(common_local_url('oauthconnectionssettings'),
-                          _('Connections'),
-                          _('Authorized connected applications'),
-                          $actionName == 'oauthconnectionsettings');
-
-        Event::handle('EndConnectSettingsNav', array(&$action));
-    }
-
-    function onEndShowStyles($action)
-    {
-        if (($this->showCSS ||
-             in_array(common_config('site', 'theme'),
-                      array('default', 'identica', 'h4ck3r'))) &&
-            ($action instanceof AccountSettingsAction ||
-             $action instanceof ConnectSettingsAction)) {
-            $action->cssLink(common_path('plugins/NewMenu/newmenu.css'));
-        }
-        return true;
-    }
-
-    function onStartAddressData($action)
-    {
-        if (common_config('singleuser', 'enabled')) {
-            $user = User::singleUser();
-            $url = common_local_url('showstream',
-                                    array('nickname' => $user->nickname));
-        } else if (common_logged_in()) {
-            $cur = common_current_user();
-            $url = common_local_url('all', array('nickname' => $cur->nickname));
-        } else {
-            $url = common_local_url('public');
-        }
-
-        $action->elementStart('a', array('class' => 'url home bookmark',
-                                         'href' => $url));
-
-        if (StatusNet::isHTTPS()) {
-            $logoUrl = common_config('site', 'ssllogo');
-            if (empty($logoUrl)) {
-                // if logo is an uploaded file, try to fall back to HTTPS file URL
-                $httpUrl = common_config('site', 'logo');
-                if (!empty($httpUrl)) {
-                    $f = File::staticGet('url', $httpUrl);
-                    if (!empty($f) && !empty($f->filename)) {
-                        // this will handle the HTTPS case
-                        $logoUrl = File::url($f->filename);
-                    }
-                }
-            }
-        } else {
-            $logoUrl = common_config('site', 'logo');
-        }
-
-        if (empty($logoUrl) && file_exists(Theme::file('logo.png'))) {
-            // This should handle the HTTPS case internally
-            $logoUrl = Theme::path('logo.png');
-        }
-
-        if (!empty($logoUrl)) {
-            $action->element('img', array('class' => 'logo photo',
-                                          'src' => $logoUrl,
-                                          'alt' => common_config('site', 'name')));
-        }
-
-        $action->text(' ');
-        $action->element('span', array('class' => 'fn org'), common_config('site', 'name'));
-        $action->elementEnd('a');
-
-        Event::handle('EndAddressData', array($action));
-        return false;
-    }
-
-    /**
-     * Return version information for this plugin
-     *
-     * @param array &$versions Version info; add to this array
-     *
-     * @return boolean hook value
-     */
-
-    function onPluginVersion(&$versions)
-    {
-        $versions[] = array('name' => 'NewMenu',
-                            'version' => STATUSNET_VERSION,
-                            'author' => 'Evan Prodromou',
-                            'homepage' => 'http://status.net/wiki/Plugin:NewMenu',
-                            'description' =>
-                            _m('A preview of the new menu '.
-                               'layout in StatusNet 1.0.'));
-        return true;
+        // NOOP! No hooks, no nothin'.
+        return;
     }
 }
diff --git a/plugins/NewMenu/newmenu.css b/plugins/NewMenu/newmenu.css
deleted file mode 100644
index f700fdcc45..0000000000
--- a/plugins/NewMenu/newmenu.css
+++ /dev/null
@@ -1,47 +0,0 @@
-body[id$=settings] #site_nav_local_views {
-position:relative;
-z-index:9;
-float:right;
-margin-right:10.65%;
-width:22.25%;
-}
-body[id$=settings] #site_nav_local_views li {
-width:100%;
-margin-right:0;
-margin-bottom:7px;
-}
-body[id$=settings] #site_nav_local_views a {
-display:block;
-width:80%;
-padding-right:10%;
-padding-left:10%;
-border-radius-toprleft:0;
--moz-border-radius-topleft:0;
--webkit-border-top-left-radius:0;
-border-radius-topright:4px;
--moz-border-radius-topright:4px;
--webkit-border-top-right-radius:4px;
-border-radius-bottomright:4px;
--moz-border-radius-bottomright:4px;
--webkit-border-bottom-right-radius:4px;
-}
-body[id$=settings] #site_nav_local_views li.current {
-box-shadow:none;
--moz-box-shadow:none;
--webkit-box-shadow:none;
-}
-
-body[id$=settings] #content {
-border-radius-topleft:7px;
-border-radius-topright:7px;
--moz-border-radius-topleft:7px;
--moz-border-radius-topright:7px;
--webkit-border-top-left-radius:7px;
--webkit-border-top-right-radius:7px;
-border-radius-topright:0;
--moz-border-radius-topright:0;
--webkit-border-top-right-radius:0;
-}
-body[id$=settings] #aside_primary {
-display:none;
-}
diff --git a/plugins/OpenID/openidsettings.php b/plugins/OpenID/openidsettings.php
index b7d5bd084d..1eb6aadb8c 100644
--- a/plugins/OpenID/openidsettings.php
+++ b/plugins/OpenID/openidsettings.php
@@ -45,7 +45,7 @@ require_once INSTALLDIR.'/plugins/OpenID/openid.php';
  * @link     http://status.net/
  */
 
-class OpenidsettingsAction extends AccountSettingsAction
+class OpenidsettingsAction extends SettingsAction
 {
     /**
      * Title of the page
diff --git a/plugins/SubMirror/actions/mirrorsettings.php b/plugins/SubMirror/actions/mirrorsettings.php
index a828b26feb..5151574c56 100644
--- a/plugins/SubMirror/actions/mirrorsettings.php
+++ b/plugins/SubMirror/actions/mirrorsettings.php
@@ -29,7 +29,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
-class MirrorSettingsAction extends AccountSettingsAction
+class MirrorSettingsAction extends SettingsAction
 {
     /**
      * Title of the page
diff --git a/plugins/TwitterBridge/twittersettings.php b/plugins/TwitterBridge/twittersettings.php
index c169172b00..da421cb37a 100644
--- a/plugins/TwitterBridge/twittersettings.php
+++ b/plugins/TwitterBridge/twittersettings.php
@@ -45,7 +45,7 @@ require_once INSTALLDIR . '/plugins/TwitterBridge/twitter.php';
  *
  * @see      SettingsAction
  */
-class TwittersettingsAction extends ConnectSettingsAction
+class TwittersettingsAction extends SettingsAction
 {
     /**
      * Title of the page
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index d35a8a706e..383b9c6ec2 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -94,6 +94,55 @@ list-style-type:none;
 form label.submit {
 display:none;
 }
+
+body[id$=settings] #site_nav_local_views {
+position:relative;
+z-index:9;
+float:right;
+margin-right:10.65%;
+width:22.25%;
+}
+body[id$=settings] #site_nav_local_views li {
+width:100%;
+margin-right:0;
+margin-bottom:7px;
+}
+body[id$=settings] #site_nav_local_views a {
+display:block;
+width:80%;
+padding-right:10%;
+padding-left:10%;
+border-radius-toprleft:0;
+-moz-border-radius-topleft:0;
+-webkit-border-top-left-radius:0;
+border-radius-topright:4px;
+-moz-border-radius-topright:4px;
+-webkit-border-top-right-radius:4px;
+border-radius-bottomright:4px;
+-moz-border-radius-bottomright:4px;
+-webkit-border-bottom-right-radius:4px;
+}
+body[id$=settings] #site_nav_local_views li.current {
+box-shadow:none;
+-moz-box-shadow:none;
+-webkit-box-shadow:none;
+}
+
+body[id$=settings] #content {
+border-radius-topleft:7px;
+border-radius-topright:7px;
+-moz-border-radius-topleft:7px;
+-moz-border-radius-topright:7px;
+-webkit-border-top-left-radius:7px;
+-webkit-border-top-right-radius:7px;
+border-radius-topright:0;
+-moz-border-radius-topright:0;
+-webkit-border-top-right-radius:0;
+}
+body[id$=settings] #aside_primary {
+display:none;
+}
+
 .form_settings {
 clear:both;
 }

From ba2128f2d1b52adc20cbe7f64750fcc7a8f95256 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Sun, 23 Jan 2011 13:07:47 -0500
Subject: [PATCH 304/655] make nav look right-ish in shiny

---
 theme/shiny/css/display.css | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/theme/shiny/css/display.css b/theme/shiny/css/display.css
index 758d462ba0..a2ed37e104 100644
--- a/theme/shiny/css/display.css
+++ b/theme/shiny/css/display.css
@@ -104,25 +104,22 @@ h6 {font-size: 1em;}
 	letter-spacing: 0.1em;
 	font-size: 0.8em;
 	background: url(../images/global_bg.png) repeat-x top left;
+    float: right;
     position: absolute;
     width: 893px;
     top: -20px;
     left: 0;
     margin-left: -21px; 
+    text-transform: uppercase;
+    padding-right: 10px;
 }
 
-#site_nav_global_primary ul.nav {
-	float: right;
-	text-transform: uppercase;
-	padding-right: 10px;
-}
-
-#site_nav_global_primary ul.nav li {
+#site_nav_global_primary li {
     margin-right: 0px;
     margin-left: 0px;
 }
 
-#site_nav_global_primary ul.nav a {
+#site_nav_global_primary a {
 	padding: 4px 8px;
 	line-height: 1.8em;
 	border-radius: 4px;
@@ -134,7 +131,7 @@ h6 {font-size: 1em;}
     border-left: 1px solid transparent;
 }
 
-#site_nav_global_primary ul.nav a:hover {
+#site_nav_global_primary a:hover {
 	color: #fff;
 	background-color: #000;
 	border-bottom: 1px solid #666;

From 570c7b63a2c0506e4876e27cd9ab56c16ce60b6c Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Sun, 23 Jan 2011 16:49:12 -0500
Subject: [PATCH 305/655] Add internal URL shortener

---
 actions/redirecturl.php | 144 ++++++++++++++++++++++++++++++++++++++++
 actions/urlsettings.php |  21 +++---
 lib/default.php         |  12 +---
 lib/router.php          |   6 ++
 lib/util.php            |  18 ++++-
 5 files changed, 179 insertions(+), 22 deletions(-)
 create mode 100644 actions/redirecturl.php

diff --git a/actions/redirecturl.php b/actions/redirecturl.php
new file mode 100644
index 0000000000..0a959b074f
--- /dev/null
+++ b/actions/redirecturl.php
@@ -0,0 +1,144 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2010, StatusNet, Inc.
+ *
+ * Redirect to the given URL
+ * 
+ * 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  URL
+ * @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);
+}
+
+/**
+ * Redirect to a given URL
+ *
+ * This is our internal low-budget URL-shortener
+ *
+ * @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 RedirecturlAction extends Action
+{
+    protected $id   = null;
+    protected $file = null;
+
+    /**
+     * For initializing members of the class.
+     *
+     * @param array $argarray misc. arguments
+     *
+     * @return boolean true
+     */
+
+    function prepare($argarray)
+    {
+        parent::prepare($argarray);
+
+        $this->id = $this->trimmed('id');
+        
+        if (empty($this->id)) {
+            throw new ClientException(_('No id parameter'));
+        }
+
+        $this->file = File::staticGet('id', $this->id);
+        
+        if (empty($this->file)) {
+            throw new ClientException(sprintf(_('No such file "%d"'),
+                                              $this->id),
+                                      404);
+        }
+
+        return true;
+    }
+
+    /**
+     * Handler method
+     *
+     * @param array $argarray is ignored since it's now passed in in prepare()
+     *
+     * @return void
+     */
+
+    function handle($argarray=null)
+    {
+        common_redirect($this->file->url, 307);
+        return;
+    }
+
+    /**
+     * Return true if read only.
+     *
+     * MAY override
+     *
+     * @param array $args other arguments
+     *
+     * @return boolean is read only action?
+     */
+
+    function isReadOnly($args)
+    {
+        return true;
+    }
+
+    /**
+     * Return last modified, if applicable.
+     *
+     * MAY override
+     *
+     * @return string last modified http header
+     */
+
+    function lastModified()
+    {
+        // For comparison with If-Last-Modified
+        // If not applicable, return null
+
+        return strtotime($this->file->modified);
+    }
+
+    /**
+     * Return etag, if applicable.
+     *
+     * MAY override
+     *
+     * @return string etag http header
+     */
+
+    function etag()
+    {
+        return 'W/"' . implode(':', array($this->arg('action'),
+                                          common_user_cache_hash(),
+                                          common_language(),
+                                          $this->file->id)) . '"';
+    }
+}
diff --git a/actions/urlsettings.php b/actions/urlsettings.php
index f8780a7e86..140e28c999 100644
--- a/actions/urlsettings.php
+++ b/actions/urlsettings.php
@@ -99,23 +99,28 @@ class UrlsettingsAction extends SettingsAction
         $this->hidden('token', common_session_token());
         $this->elementStart('ul', 'form_data');
 
-        $shorteners = array(_('[none]') => array('freeService' => false));
-
         Event::handle('GetUrlShorteners', array(&$shorteners));
 
         $services = array();
-        foreach($shorteners as $name=>$value)
+
+        foreach ($shorteners as $name => $value)
         {
-            $services[$name]=$name;
-            if($value['freeService']){
+            $services[$name] = $name;
+            if ($value['freeService']) {
                 // TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
                 // TRANS: user's profile settings. This message has one space at the beginning. Use your
                 // TRANS: language's word separator here if it has one (most likely a single space).
-                $services[$name].=_(' (free service)');
+                $services[$name] .= _(' (free service)');
             }
         }
-        if($services)
-        {
+
+        // Include default values
+
+        $services['none']     = _('[none]');
+        $services['internal'] = _('[internal]');
+
+        if ($services) {
+
             asort($services);
 
             $this->elementStart('li');
diff --git a/lib/default.php b/lib/default.php
index 9528d9cf8b..186ac263c9 100644
--- a/lib/default.php
+++ b/lib/default.php
@@ -295,17 +295,7 @@ $default =
         'logincommand' =>
         array('disabled' => true),
         'plugins' =>
-        array('default' => array('LilUrl' => array('shortenerName'=>'ur1.ca',
-                                                   'freeService' => true,
-                                                   'serviceUrl'=>'http://ur1.ca/'),
-                                 'PtitUrl' => array('shortenerName' => 'ptiturl.com',
-                                                    'serviceUrl' => 'http://ptiturl.com/?creer=oui&action=Reduire&url=%1$s'),
-                                 'SimpleUrl' => array(array('shortenerName' => 'is.gd', 'serviceUrl' => 'http://is.gd/api.php?longurl=%1$s'),
-                                                      array('shortenerName' => 'snipr.com', 'serviceUrl' => 'http://snipr.com/site/snip?r=simple&link=%1$s'),
-                                                      array('shortenerName' => 'metamark.net', 'serviceUrl' => 'http://metamark.net/api/rest/simple?long_url=%1$s'),
-                                                      array('shortenerName' => 'tinyurl.com', 'serviceUrl' => 'http://tinyurl.com/api-create.php?url=%1$s')),
-                                 'TightUrl' => array('shortenerName' => '2tu.us', 'freeService' => true,'serviceUrl'=>'http://2tu.us/?save=y&url=%1$s'),
-                                 'Geonames' => null,
+        array('default' => array('Geonames' => null,
                                  'Mapstraction' => null,
                                  'OStatus' => null,
                                  'WikiHashtags' => null,
diff --git a/lib/router.php b/lib/router.php
index 99d8aeb043..10e5291588 100644
--- a/lib/router.php
+++ b/lib/router.php
@@ -974,6 +974,12 @@ class Router
                         array('action' => 'AtomPubMembershipFeed'),
                         array('profile' => '[0-9]+'));
 
+            // URL shortening
+
+            $m->connect('url/:id',
+                        array('action' => 'redirecturl',
+                              'id' => '[0-9]+'));
+
             // user stuff
 
             Event::handle('RouterInitialized', array($m));
diff --git a/lib/util.php b/lib/util.php
index 3d4adcf4bf..4aec05275c 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -2073,6 +2073,7 @@ function common_shorten_url($long_url, User $user=null, $force = false)
     common_debug("maxUrlLength = $maxUrlLength");
 
     // $force forces shortening even if it's not strictly needed
+    // I doubt URL shortening is ever 'strictly' needed. - ESP
 
     if (mb_strlen($long_url) < $maxUrlLength && !$force) {
         common_debug("Skipped shortening URL.");
@@ -2083,9 +2084,20 @@ function common_shorten_url($long_url, User $user=null, $force = false)
 
     common_debug("Shortener name = '$shortenerName'");
 
-    if (Event::handle('StartShortenUrl', array($long_url, $shortenerName, &$shortenedUrl))) {
-        //URL wasn't shortened, so return the long url
-        return $long_url;
+    if (Event::handle('StartShortenUrl', 
+                      array($long_url, $shortenerName, &$shortenedUrl))) {
+        if ($shortenerName == 'internal') {
+            $f = File::processNew($long_url);
+            if (empty($f)) {
+                return $long_url;
+            } else {
+                $shortenedUrl = common_local_url('redirecturl',
+                                                 array('id' => $f->id));
+                return $shortenedUrl;
+            }
+        } else {
+            return $long_url;
+        }
     } else {
         //URL was shortened, so return the result
         return trim($shortenedUrl);

From debf4dacf10c5cf3e395f77aa9f5ba71edba1776 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Sun, 23 Jan 2011 16:51:18 -0500
Subject: [PATCH 306/655] change default urlshortener from ur1.ca to internal

---
 db/core.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/db/core.php b/db/core.php
index 29aa917c1f..55d724b505 100644
--- a/db/core.php
+++ b/db/core.php
@@ -118,7 +118,7 @@ $schema['user'] = array(
         'smsemail' => array('type' => 'varchar', 'length' => 255, 'description' => 'built from sms and carrier'),
         'uri' => array('type' => 'varchar', 'length' => 255, 'description' => 'universally unique identifier, usually a tag URI'),
         'autosubscribe' => array('type' => 'int', 'size' => 'tiny', 'default' => 0, 'description' => 'automatically subscribe to users who subscribe to us'),
-        'urlshorteningservice' => array('type' => 'varchar', 'length' => 50, 'default' => 'ur1.ca', 'description' => 'service to use for auto-shortening URLs'),
+        'urlshorteningservice' => array('type' => 'varchar', 'length' => 50, 'default' => 'internal', 'description' => 'service to use for auto-shortening URLs'),
         'inboxed' => array('type' => 'int', 'size' => 'tiny', 'default' => 0, 'description' => 'has an inbox been created for this user?'),
         'design_id' => array('type' => 'int', 'description' => 'id of a design'),
         'viewdesigns' => array('type' => 'int', 'size' => 'tiny', 'default' => 1, 'description' => 'whether to view user-provided designs'),
@@ -1002,7 +1002,7 @@ $schema['local_group'] = array(
 $schema['user_urlshortener_prefs'] = array(
     'fields' => array(
         'user_id' => array('type' => 'int', 'not null' => true, 'description' => 'user'),
-        'urlshorteningservice' => array('type' => 'varchar', 'length' => 50, 'default' => 'ur1.ca', 'description' => 'service to use for auto-shortening URLs'),
+        'urlshorteningservice' => array('type' => 'varchar', 'length' => 50, 'default' => 'internal', 'description' => 'service to use for auto-shortening URLs'),
         'maxurllength' => array('type' => 'int', 'not null' => true, 'description' => 'urls greater than this length will be shortened, 0 = always, null = never'),
         'maxnoticelength' => array('type' => 'int', 'not null' => true, 'description' => 'notices with content greater than this value will have all urls shortened, 0 = always, null = never'),
         

From 836f4ea6ea8c261f1ac47fd0bfe709a16ef3b20f Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Mon, 28 Feb 2011 11:02:38 -0800
Subject: [PATCH 307/655] fix - Notice: Undefined variable: action in
 /Library/WebServer/Documents/mublog/lib/action.php on line 521

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

diff --git a/lib/action.php b/lib/action.php
index c8f77f79bd..31288a5e7b 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -518,7 +518,7 @@ class Action extends HTMLOutputter // lawsuit
             $this->element('span', array('class' => 'fn org'), common_config('site', 'name'));
             $this->elementEnd('a');
 
-            Event::handle('EndAddressData', array($action));
+            Event::handle('EndAddressData', array($this));
         }
         $this->elementEnd('address');
     }

From 8cdf8cf33e8b98d8d49dc03777dd5c39fb28c4d6 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Mon, 28 Feb 2011 11:19:47 -0800
Subject: [PATCH 308/655] Fix for schema_version checksum table when checking
 schemas before the table's been added. :)

---
 lib/schemaupdater.php | 40 ++++++++++++++++++++++++++++------------
 1 file changed, 28 insertions(+), 12 deletions(-)

diff --git a/lib/schemaupdater.php b/lib/schemaupdater.php
index 64f7c596d4..1960a06930 100644
--- a/lib/schemaupdater.php
+++ b/lib/schemaupdater.php
@@ -95,11 +95,20 @@ class SchemaUpdater
     {
         $checksums = array();
 
-        $sv = new Schema_version();
-        $sv->find();
-        while ($sv->fetch()) {
-            $checksums[$sv->table_name] = $sv->checksum;
+        PEAR::pushErrorHandling(PEAR_ERROR_EXCEPTION);
+        try {
+            $sv = new Schema_version();
+            $sv->find();
+            while ($sv->fetch()) {
+                $checksums[$sv->table_name] = $sv->checksum;
+            }
+
+            return $checksums;
+        } catch (Exception $e) {
+            // no dice!
+            common_log(LOG_DEBUG, "Possibly schema_version table doesn't exist yet.");
         }
+        PEAR::popErrorHandling();
 
         return $checksums;
     }
@@ -112,15 +121,22 @@ class SchemaUpdater
      */
     protected function saveChecksum($table, $checksum)
     {
-        $sv = new Schema_version();
-        $sv->table_name = $table;
-        $sv->checksum = $checksum;
-        $sv->modified = common_sql_now();
-        if (isset($this->checksums[$table])) {
-            $sv->update();
-        } else {
-            $sv->insert();
+        PEAR::pushErrorHandling(PEAR_ERROR_EXCEPTION);
+        try {
+            $sv = new Schema_version();
+            $sv->table_name = $table;
+            $sv->checksum = $checksum;
+            $sv->modified = common_sql_now();
+            if (isset($this->checksums[$table])) {
+                $sv->update();
+            } else {
+                $sv->insert();
+            }
+        } catch (Exception $e) {
+            // no dice!
+            common_log(LOG_DEBUG, "Possibly schema_version table doesn't exist yet.");
         }
+        PEAR::popErrorHandling();
         $this->checksums[$table] = $checksum;
     }
 }

From d806907b817c78034047d6c6ed31f9d087d4ba4c Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Mon, 28 Feb 2011 11:53:48 -0800
Subject: [PATCH 309/655] Initial test threaded convo view inline on public,
 all timelines

---
 actions/all.php            |   2 +-
 actions/public.php         |   2 +-
 lib/threadednoticelist.php | 175 +++++++++++++++++++++++++++++++++++++
 3 files changed, 177 insertions(+), 2 deletions(-)
 create mode 100644 lib/threadednoticelist.php

diff --git a/actions/all.php b/actions/all.php
index dc08592faf..12397b4b18 100644
--- a/actions/all.php
+++ b/actions/all.php
@@ -163,7 +163,7 @@ class AllAction extends ProfileAction
     function showContent()
     {
         if (Event::handle('StartShowAllContent', array($this))) {
-            $nl = new NoticeList($this->notice, $this);
+            $nl = new ThreadedNoticeList($this->notice, $this);
 
             $cnt = $nl->show();
 
diff --git a/actions/public.php b/actions/public.php
index 5fc547feaf..727c76d528 100644
--- a/actions/public.php
+++ b/actions/public.php
@@ -212,7 +212,7 @@ class PublicAction extends Action
 
     function showContent()
     {
-        $nl = new NoticeList($this->notice, $this);
+        $nl = new ThreadedNoticeList($this->notice, $this);
 
         $cnt = $nl->show();
 
diff --git a/lib/threadednoticelist.php b/lib/threadednoticelist.php
new file mode 100644
index 0000000000..1af778721d
--- /dev/null
+++ b/lib/threadednoticelist.php
@@ -0,0 +1,175 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * widget for displaying a list of 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  UI
+ * @package   StatusNet
+ * @author    Brion Vibber <brion@status.net>
+ * @copyright 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/
+ */
+
+if (!defined('STATUSNET') && !defined('LACONICA')) {
+    exit(1);
+}
+
+/**
+ * widget for displaying a list of notices
+ *
+ * There are a number of actions that display a list of notices, in
+ * reverse chronological order. This widget abstracts out most of the
+ * code for UI for notice lists. It's overridden to hide some
+ * data for e.g. the profile page.
+ *
+ * @category UI
+ * @package  StatusNet
+ * @author   Evan Prodromou <evan@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://status.net/
+ * @see      Notice
+ * @see      NoticeListItem
+ * @see      ProfileNoticeList
+ */
+
+class ThreadedNoticeList extends NoticeList
+{
+    /**
+     * show the list of notices
+     *
+     * "Uses up" the stream by looping through it. So, probably can't
+     * be called twice on the same list.
+     *
+     * @return int count of notices listed.
+     */
+
+    function show()
+    {
+        $this->out->elementStart('div', array('id' =>'notices_primary'));
+        $this->out->element('h2', null, _('Notices'));
+        $this->out->elementStart('ol', array('class' => 'notices xoxo'));
+
+        $cnt = 0;
+        $conversations = array();
+        while ($this->notice->fetch() && $cnt <= NOTICES_PER_PAGE) {
+            $convo = $this->notice->conversation;
+            if (!empty($conversations[$convo])) {
+                // Seen this convo already -- skip!
+                continue;
+            }
+            $conversations[$convo] = true;
+
+            // Get the convo's root notice
+            // @fixme stream goes in wrong direction, this needs sane caching
+            //$notice = Notice::conversationStream($convo, 0, 1);
+            //$notice->fetch();
+            $notice = new Notice();
+            $notice->conversation = $this->notice->conversation;
+            $notice->orderBy('CREATED');
+            $notice->limit(1);
+            $notice->find(true);
+
+            $cnt++;
+
+            if ($cnt > NOTICES_PER_PAGE) {
+                break;
+            }
+
+            try {
+                $item = $this->newListItem($notice);
+                $item->show();
+            } catch (Exception $e) {
+                // we log exceptions and continue
+                common_log(LOG_ERR, $e->getMessage());
+                continue;
+            }
+        }
+
+        $this->out->elementEnd('ol');
+        $this->out->elementEnd('div');
+
+        return $cnt;
+    }
+
+    /**
+     * returns a new list item for the current notice
+     *
+     * Recipe (factory?) method; overridden by sub-classes to give
+     * a different list item class.
+     *
+     * @param Notice $notice the current notice
+     *
+     * @return NoticeListItem a list item for displaying the notice
+     */
+
+    function newListItem($notice)
+    {
+        return new ThreadedNoticeListItem($notice, $this->out);
+    }
+}
+
+/**
+ * widget for displaying a single notice
+ *
+ * This widget has the core smarts for showing a single notice: what to display,
+ * where, and under which circumstances. Its key method is show(); this is a recipe
+ * that calls all the other show*() methods to build up a single notice. The
+ * ProfileNoticeListItem subclass, for example, overrides showAuthor() to skip
+ * author info (since that's implicit by the data in the page).
+ *
+ * @category UI
+ * @package  StatusNet
+ * @author   Evan Prodromou <evan@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://status.net/
+ * @see      NoticeList
+ * @see      ProfileNoticeListItem
+ */
+
+class ThreadedNoticeListItem extends NoticeListItem
+{
+    /**
+     * finish the notice
+     *
+     * Close the last elements in the notice list item
+     *
+     * @return void
+     */
+
+    function showEnd()
+    {
+        $notice = Notice::conversationStream($this->notice->conversation);
+
+        $this->out->elementStart('ul', 'notices threaded-notices xoxo');
+        while ($notice->fetch()) {
+            if ($notice->id == $this->notice->id) {
+                // Skip!
+                continue;
+            }
+            $this->out->elementStart('li');
+            $item = new NoticeListItem($notice, $this->out);
+            $item->show();
+            $this->out->elementEnd('li');
+        }
+        $this->out->elementEnd('ul');
+
+        parent::showEnd();
+    }
+}

From 31bf2cd6b9ca51eb7c09bbe9e6e1e5a271144005 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Mon, 28 Feb 2011 11:59:37 -0800
Subject: [PATCH 310/655] quick hack -- switch order on inline convo view
 (comments in forward chron)

---
 lib/threadednoticelist.php | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/lib/threadednoticelist.php b/lib/threadednoticelist.php
index 1af778721d..3a6e5e76c4 100644
--- a/lib/threadednoticelist.php
+++ b/lib/threadednoticelist.php
@@ -156,19 +156,25 @@ class ThreadedNoticeListItem extends NoticeListItem
     function showEnd()
     {
         $notice = Notice::conversationStream($this->notice->conversation);
-
-        $this->out->elementStart('ul', 'notices threaded-notices xoxo');
+        $notices = array();
         while ($notice->fetch()) {
             if ($notice->id == $this->notice->id) {
                 // Skip!
                 continue;
             }
-            $this->out->elementStart('li');
-            $item = new NoticeListItem($notice, $this->out);
-            $item->show();
-            $this->out->elementEnd('li');
+            $notices[] = clone($notice); // *grumble* inefficient as hell
+        }
+
+        if ($notices) {
+            $this->out->elementStart('ul', 'notices threaded-notices xoxo');
+            foreach (array_reverse($notices) as $notice) {
+                $this->out->elementStart('li');
+                $item = new NoticeListItem($notice, $this->out);
+                $item->show();
+                $this->out->elementEnd('li');
+            }
+            $this->out->elementEnd('ul');
         }
-        $this->out->elementEnd('ul');
 
         parent::showEnd();
     }

From 2c03dd569c4c0ff45b0f98de490a9de540c9b2b5 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Mon, 28 Feb 2011 12:20:47 -0800
Subject: [PATCH 311/655] visual tweaks for convo view

---
 lib/noticelist.php         |  7 ++++++-
 lib/threadednoticelist.php | 23 ++++++++++++++++++++---
 theme/base/css/display.css | 12 ++++++++++++
 3 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/lib/noticelist.php b/lib/noticelist.php
index 7b2fbb1e7c..8c07f904c8 100644
--- a/lib/noticelist.php
+++ b/lib/noticelist.php
@@ -329,7 +329,7 @@ class NoticeListItem extends Widget
 
     function showAvatar()
     {
-	$avatar_size = AVATAR_STREAM_SIZE;
+        $avatar_size = $this->avatarSize();
 
         $avatar = $this->profile->getAvatar($avatar_size);
 
@@ -345,6 +345,11 @@ class NoticeListItem extends Widget
                                          $this->profile->nickname));
     }
 
+    function avatarSize()
+    {
+        return AVATAR_STREAM_SIZE;
+    }
+
     /**
      * show the nickname of the author
      *
diff --git a/lib/threadednoticelist.php b/lib/threadednoticelist.php
index 3a6e5e76c4..933a051f38 100644
--- a/lib/threadednoticelist.php
+++ b/lib/threadednoticelist.php
@@ -168,10 +168,8 @@ class ThreadedNoticeListItem extends NoticeListItem
         if ($notices) {
             $this->out->elementStart('ul', 'notices threaded-notices xoxo');
             foreach (array_reverse($notices) as $notice) {
-                $this->out->elementStart('li');
-                $item = new NoticeListItem($notice, $this->out);
+                $item = new ThreadedNoticeListSubItem($notice, $this->out);
                 $item->show();
-                $this->out->elementEnd('li');
             }
             $this->out->elementEnd('ul');
         }
@@ -179,3 +177,22 @@ class ThreadedNoticeListItem extends NoticeListItem
         parent::showEnd();
     }
 }
+
+class ThreadedNoticeListSubItem extends NoticeListItem
+{
+
+    function avatarSize()
+    {
+        return AVATAR_STREAM_SIZE; // @fixme would like something in between
+    }
+
+    function showNoticeLocation()
+    {
+        //
+    }
+
+    function showNoticeSource()
+    {
+        //
+    }
+}
\ No newline at end of file
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 383b9c6ec2..817de209ba 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -1109,6 +1109,18 @@ border-top-width:1px;
 border-top-style:solid;
 }
 
+/* Threaded notices sublist */
+#content .notices .threaded-notices {
+    margin-left: 10%;
+    width: 90%;
+
+    background: #e4e8f1;
+}
+#content .threaded-notices .notice .author .photo {
+    left: 8px;
+    width: 32px;
+    height: 32px;
+}
 /* NOTICES */
 #notices_primary {
 float:left;

From babdc430f93a5efb17db4df0518f690d81f758d7 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Mon, 28 Feb 2011 12:22:21 -0800
Subject: [PATCH 312/655] Switch Twitter bridge settings page to be a
 ProfileSettingsAction, as ConnectSettingsAction is gone

---
 plugins/TwitterBridge/twittersettings.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/plugins/TwitterBridge/twittersettings.php b/plugins/TwitterBridge/twittersettings.php
index da421cb37a..763a586079 100644
--- a/plugins/TwitterBridge/twittersettings.php
+++ b/plugins/TwitterBridge/twittersettings.php
@@ -31,7 +31,6 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/connectsettingsaction.php';
 require_once INSTALLDIR . '/plugins/TwitterBridge/twitter.php';
 
 /**
@@ -45,7 +44,7 @@ require_once INSTALLDIR . '/plugins/TwitterBridge/twitter.php';
  *
  * @see      SettingsAction
  */
-class TwittersettingsAction extends SettingsAction
+class TwittersettingsAction extends ProfileSettingsAction
 {
     /**
      * Title of the page

From 2370208540e3669218910b77f538412d6eb1660e Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Mon, 28 Feb 2011 12:41:03 -0800
Subject: [PATCH 313/655] quickie inline reply posting form

---
 lib/threadednoticelist.php | 48 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)

diff --git a/lib/threadednoticelist.php b/lib/threadednoticelist.php
index 933a051f38..871a0eb068 100644
--- a/lib/threadednoticelist.php
+++ b/lib/threadednoticelist.php
@@ -171,6 +171,10 @@ class ThreadedNoticeListItem extends NoticeListItem
                 $item = new ThreadedNoticeListSubItem($notice, $this->out);
                 $item->show();
             }
+            if (common_current_user()) {
+                $item = new ThreadedNoticeListReplyItem($this->notice, $this->out);
+                $item->show();
+            }
             $this->out->elementEnd('ul');
         }
 
@@ -195,4 +199,48 @@ class ThreadedNoticeListSubItem extends NoticeListItem
     {
         //
     }
+}
+
+/**
+ * Show a mini inline posting form for replies.
+ */
+class ThreadedNoticeListReplyItem extends NoticeListItem
+{
+
+    /**
+     * recipe function for displaying a single notice.
+     *
+     * This uses all the other methods to correctly display a notice. Override
+     * it or one of the others to fine-tune the output.
+     *
+     * @return void
+     */
+
+    function show()
+    {
+        $this->showStart();
+        $this->showMiniForm();
+        $this->showEnd();
+    }
+
+    function showMiniForm()
+    {
+        $replyToId = $this->notice->id;
+        $id = 'replyto-notice-' + $replyToId;
+        $url = common_local_url('newnotice');
+
+        // @fixme replace this with an ajax-friendly form pair?
+        $this->out->elementStart('form',
+                                 array('id' => $id,
+                                       'class' => 'replyform',
+                                       'method' => 'post',
+                                       'action' => $url));
+        $this->out->hidden('token', common_session_token());
+        $this->out->hidden("$id-inreplyto", $replyToId, "inreplyto");
+        $this->out->element('textarea', array('name' => 'status_textarea'));
+        $this->out->elementStart('div', array('class' => 'controls'));
+        $this->out->submit("$id-submit", _m('Send reply'));
+        $this->out->elementEnd('div');
+        $this->out->elementEnd('form');
+    }
 }
\ No newline at end of file

From fb9418b99d656d3b68d3d2c50bead8cb577067b3 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Mon, 28 Feb 2011 12:50:26 -0800
Subject: [PATCH 314/655] some quick visual tweaks

---
 lib/threadednoticelist.php | 15 +++++++++++++++
 theme/base/css/display.css | 11 +++++++++++
 2 files changed, 26 insertions(+)

diff --git a/lib/threadednoticelist.php b/lib/threadednoticelist.php
index 871a0eb068..2d3746edef 100644
--- a/lib/threadednoticelist.php
+++ b/lib/threadednoticelist.php
@@ -223,6 +223,21 @@ class ThreadedNoticeListReplyItem extends NoticeListItem
         $this->showEnd();
     }
 
+    /**
+     * start a single notice.
+     *
+     * @return void
+     */
+
+    function showStart()
+    {
+        if (Event::handle('StartOpenNoticeListItemElement', array($this))) {
+            $id = (empty($this->repeat)) ? $this->notice->id : $this->repeat->id;
+            $this->out->elementStart('li', array('class' => 'notice-reply',
+                                                 'id' => 'notice-reply-' . $id));
+        }
+    }
+
     function showMiniForm()
     {
         $replyToId = $this->notice->id;
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 817de209ba..74f5bb3e30 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -1121,6 +1121,17 @@ border-top-style:solid;
     width: 32px;
     height: 32px;
 }
+.threaded-notices .notice-reply {
+    margin: 8px;
+}
+.threaded-notices .notice-reply textarea {
+    margin-left: 0;
+    width: 95%;
+}
+.threaded-notices .notice-reply input.submit {
+    text-align: right;
+}
+
 /* NOTICES */
 #notices_primary {
 float:left;

From e89bffc3f1aa9e4186dbd32d6e3de13ccbe4f400 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Mon, 28 Feb 2011 15:38:54 -0800
Subject: [PATCH 315/655] Work in progress: setting up inline reply mini-form
 in js

---
 js/util.js                 | 124 ++++++++++++++++++++++++++++++++++++-
 js/util.min.js             |   2 +-
 lib/action.php             |   3 +
 lib/threadednoticelist.php |   5 +-
 4 files changed, 129 insertions(+), 5 deletions(-)

diff --git a/js/util.js b/js/util.js
index eace1778e2..a893993624 100644
--- a/js/util.js
+++ b/js/util.js
@@ -553,14 +553,88 @@ var SN = { // StatusNet
          * @access private
          */
         NoticeReplyTo: function(notice) {
-            notice.find('.notice_reply').live('click', function() {
+            notice.find('.notice_reply').live('click', function(e) {
+                e.preventDefault();
                 var nickname = ($('.author .nickname', notice).length > 0) ? $($('.author .nickname', notice)[0]) : $('.author .nickname.uid');
-                SN.U.NoticeReplySet(nickname.text(), $($('.notice_id', notice)[0]).text());
+                /* SN.U.NoticeReplySet(nickname.text(), $($('.notice_id', notice)[0]).text()); */
+                var id = $($('.notice_id', notice)[0]).text();
+                SN.U.NoticeInlineReplyTrigger(id, '@' + nickname.text());
                 return false;
             });
         },
 
         /**
+         * Open up a notice's 
+         * @param {String} id: notice ID
+         * @param {String} initialText
+         */
+        NoticeInlineReplyTrigger: function(id, initialText) {
+            // Find the notice we're replying to...
+            var notice = $('#notice-' + id), parentNotice = notice;
+
+            // Find the threaded replies view we'll be adding to...
+            var list = notice.closest('.notices');
+            if (list.hasClass('threaded-notices')) {
+                // We're replying to a reply; use reply form on the end of this list.
+                // We'll add our form at the end of this; grab the root notice.
+                parentNotice = list.closest('notice');
+            } else {
+                // We're replying to a parent notice; pull its threaded list
+                // and we'll add on the end of it. Will add if needed.
+                list = $('ul.threaded-notices', notice);
+                if (list.length == 0) {
+                    list = $('<ul class="notices threaded-notices xoxo"></ul>');
+                    notice.append(list);
+                }
+            }
+
+            // See if the form's already open...
+            var replyForm = $('.notice-reply-form', list);
+            if (replyForm.length == 0) {
+                // Create the reply form entry at the end
+                var replyItem = $('li.notice-reply', list);
+                if (replyItem.length == 0) {
+                    replyItem = $('<li class="notice-reply">' +
+                                      '<form class="notice-reply-form" method="post">' +
+                                          '<textarea name="status_textarea"></textarea>' +
+                                          '<div class="controls">' +
+                                          '<input type="hidden" name="token">' +
+                                          '<input type="hidden" name="inreplyto">' +
+                                          '<input type="submit" class="submit">' +
+                                      '</div>' +
+                                      '</form>' +
+                                  '</li>');
+                    replyForm = replyItem.find('form');
+                    replyForm.attr('src', '/mublog/newnotice'); // @fixme
+                    replyForm.find('input[type="submit"]').val(SN.msg('reply_submit'));
+                    if (initialText) {
+                        replyForm.find('textarea').val(initialText + ' ');
+                    }
+                    list.append(replyItem);
+                }
+            }
+
+            // Override...?
+            replyForm.find('input[name=inreplyto]').val(id);
+
+            // Set focus...
+            var text = replyForm.find('textarea');
+            if (text.length == 0) {
+                throw "No textarea";
+            }
+            if (initialText) {
+                var replyto = initialText + ' ';
+                text.val(replyto + text.val().replace(RegExp(replyto, 'i'), ''));
+            }
+            text.focus();
+            if (text[0].setSelectionRange) {
+                var len = text.val().length;
+                text[0].setSelectionRange(len,len);
+            }
+        },
+
+        /**
+         * FIXME OBSOLETE?
          * Updates the new notice posting form with bits for replying to the
          * given user. Adds replyto parameter to the form, and a "@foo" to the
          * text area.
@@ -598,6 +672,51 @@ var SN = { // StatusNet
             $('.form_disfavor').live('click', function() { SN.U.FormXHR($(this)); return false; });
         },
 
+        /**
+         * Setup function -- DOES NOT apply immediately.
+         *
+         * Sets up event handlers for favor/disfavor forms to submit via XHR.
+         * Uses 'live' rather than 'bind', so applies to future as well as present items.
+         */
+        NoticeInlineReplySetup: function() {
+            $('')
+            $('.replyform').live('submit', function(event) {
+                //SN.U.FormXHR($(this));
+                var form = $(this);
+                $.ajax({
+                    type: 'POST',
+                    dataType: 'xml',
+                    url: SN.U.RewriteAjaxAction(form.attr('action')),
+                    data: form.serialize() + '&ajax=1',
+                    beforeSend: function(xhr) {
+                        form
+                            .addClass(SN.C.S.Processing)
+                            .find('.submit')
+                                .addClass(SN.C.S.Disabled)
+                                .attr(SN.C.S.Disabled, SN.C.S.Disabled)
+                                .end()
+                            .find('textarea')
+                                .addClass(SN.C.S.Disabled)
+                                .attr(SN.C.S.Disabled, SN.C.S.Disabled);
+                    },
+                    error: function (xhr, textStatus, errorThrown) {
+                        alert(errorThrown || textStatus);
+                    },
+                    success: function(data, textStatus) {
+                        if (typeof($('form', data)[0]) != 'undefined') {
+                            form_new = document._importNode($('form', data)[0], true);
+                            form.replaceWith(form_new);
+                        }
+                        else {
+                            form.replaceWith(document._importNode($('p', data)[0], true));
+                        }
+                    }
+                });
+                event.preventDefault();
+                return false;
+            });
+        },
+
         /**
          * Setup function -- DOES NOT trigger actions immediately.
          *
@@ -1174,6 +1293,7 @@ var SN = { // StatusNet
                 SN.U.NoticeFavor();
                 SN.U.NoticeRepeat();
                 SN.U.NoticeReply();
+                SN.U.NoticeInlineReplySetup();
             }
 
             SN.U.NoticeAttachments();
diff --git a/js/util.min.js b/js/util.min.js
index 854d1d5b0d..ff50ddc066 100644
--- a/js/util.min.js
+++ b/js/util.min.js
@@ -1 +1 @@
-var SN={C:{I:{CounterBlackout:false,MaxLength:140,PatternUsername:/^[0-9a-zA-Z\-_.]*$/,HTTP20x30x:[200,201,202,203,204,205,206,300,301,302,303,304,305,306,307]},S:{Disabled:"disabled",Warning:"warning",Error:"error",Success:"success",Processing:"processing",CommandResult:"command_result",FormNotice:"form_notice",NoticeDataText:"notice_data-text",NoticeTextCount:"notice_text-count",NoticeInReplyTo:"notice_in-reply-to",NoticeDataAttach:"notice_data-attach",NoticeDataAttachSelected:"notice_data-attach_selected",NoticeActionSubmit:"notice_action-submit",NoticeLat:"notice_data-lat",NoticeLon:"notice_data-lon",NoticeLocationId:"notice_data-location_id",NoticeLocationNs:"notice_data-location_ns",NoticeGeoName:"notice_data-geo_name",NoticeDataGeo:"notice_data-geo",NoticeDataGeoCookie:"NoticeDataGeo",NoticeDataGeoSelected:"notice_data-geo_selected",StatusNetInstance:"StatusNetInstance"}},messages:{},msg:function(a){if(typeof SN.messages[a]=="undefined"){return"["+a+"]"}else{return SN.messages[a]}},U:{FormNoticeEnhancements:function(b){if(jQuery.data(b[0],"ElementData")===undefined){MaxLength=b.find("#"+SN.C.S.NoticeTextCount).text();if(typeof(MaxLength)=="undefined"){MaxLength=SN.C.I.MaxLength}jQuery.data(b[0],"ElementData",{MaxLength:MaxLength});SN.U.Counter(b);NDT=b.find("#"+SN.C.S.NoticeDataText);NDT.bind("keyup",function(c){SN.U.Counter(b)});var a=function(c){window.setTimeout(function(){SN.U.Counter(b)},50)};NDT.bind("cut",a).bind("paste",a);NDT.bind("keydown",function(c){SN.U.SubmitOnReturn(c,b)})}else{b.find("#"+SN.C.S.NoticeTextCount).text(jQuery.data(b[0],"ElementData").MaxLength)}if($("body")[0].id!="conversation"&&window.location.hash.length===0&&$(window).scrollTop()==0){b.find("textarea").focus()}},SubmitOnReturn:function(b,a){if(b.keyCode==13||b.keyCode==10){a.submit();b.preventDefault();b.stopPropagation();$("#"+a[0].id+" #"+SN.C.S.NoticeDataText).blur();$("body").focus();return false}return true},Counter:function(d){SN.C.I.FormNoticeCurrent=d;var b=jQuery.data(d[0],"ElementData").MaxLength;if(b<=0){return}var c=b-SN.U.CharacterCount(d);var a=d.find("#"+SN.C.S.NoticeTextCount);if(c.toString()!=a.text()){if(!SN.C.I.CounterBlackout||c===0){if(a.text()!=String(c)){a.text(c)}if(c<0){d.addClass(SN.C.S.Warning)}else{d.removeClass(SN.C.S.Warning)}if(!SN.C.I.CounterBlackout){SN.C.I.CounterBlackout=true;SN.C.I.FormNoticeCurrent=d;window.setTimeout("SN.U.ClearCounterBlackout(SN.C.I.FormNoticeCurrent);",500)}}}},CharacterCount:function(a){return a.find("#"+SN.C.S.NoticeDataText).val().length},ClearCounterBlackout:function(a){SN.C.I.CounterBlackout=false;SN.U.Counter(a)},RewriteAjaxAction:function(a){if(document.location.protocol=="https:"&&a.substr(0,5)=="http:"){return a.replace(/^http:\/\/[^:\/]+/,"https://"+document.location.host)}else{return a}},FormXHR:function(a){$.ajax({type:"POST",dataType:"xml",url:SN.U.RewriteAjaxAction(a.attr("action")),data:a.serialize()+"&ajax=1",beforeSend:function(b){a.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(c,d,b){alert(b||d)},success:function(b,c){if(typeof($("form",b)[0])!="undefined"){form_new=document._importNode($("form",b)[0],true);a.replaceWith(form_new)}else{a.replaceWith(document._importNode($("p",b)[0],true))}}})},FormNoticeXHR:function(b){SN.C.I.NoticeDataGeo={};b.append('<input type="hidden" name="ajax" value="1"/>');b.attr("action",SN.U.RewriteAjaxAction(b.attr("action")));var c=function(d,e){b.append($('<p class="form_response"></p>').addClass(d).text(e))};var a=function(){b.find(".form_response").remove()};b.ajaxForm({dataType:"xml",timeout:"60000",beforeSend:function(d){if(b.find("#"+SN.C.S.NoticeDataText)[0].value.length===0){b.addClass(SN.C.S.Warning);return false}b.addClass(SN.C.S.Processing).find("#"+SN.C.S.NoticeActionSubmit).addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled);SN.C.I.NoticeDataGeo.NLat=$("#"+SN.C.S.NoticeLat).val();SN.C.I.NoticeDataGeo.NLon=$("#"+SN.C.S.NoticeLon).val();SN.C.I.NoticeDataGeo.NLNS=$("#"+SN.C.S.NoticeLocationNs).val();SN.C.I.NoticeDataGeo.NLID=$("#"+SN.C.S.NoticeLocationId).val();SN.C.I.NoticeDataGeo.NDG=$("#"+SN.C.S.NoticeDataGeo).attr("checked");cookieValue=$.cookie(SN.C.S.NoticeDataGeoCookie);if(cookieValue!==null&&cookieValue!="disabled"){cookieValue=JSON.parse(cookieValue);SN.C.I.NoticeDataGeo.NLat=$("#"+SN.C.S.NoticeLat).val(cookieValue.NLat).val();SN.C.I.NoticeDataGeo.NLon=$("#"+SN.C.S.NoticeLon).val(cookieValue.NLon).val();if($("#"+SN.C.S.NoticeLocationNs).val(cookieValue.NLNS)){SN.C.I.NoticeDataGeo.NLNS=$("#"+SN.C.S.NoticeLocationNs).val(cookieValue.NLNS).val();SN.C.I.NoticeDataGeo.NLID=$("#"+SN.C.S.NoticeLocationId).val(cookieValue.NLID).val()}}if(cookieValue=="disabled"){SN.C.I.NoticeDataGeo.NDG=$("#"+SN.C.S.NoticeDataGeo).attr("checked",false).attr("checked")}else{SN.C.I.NoticeDataGeo.NDG=$("#"+SN.C.S.NoticeDataGeo).attr("checked",true).attr("checked")}return true},error:function(f,g,e){b.removeClass(SN.C.S.Processing).find("#"+SN.C.S.NoticeActionSubmit).removeClass(SN.C.S.Disabled).removeAttr(SN.C.S.Disabled,SN.C.S.Disabled);a();if(g=="timeout"){c("error","Sorry! We had trouble sending your notice. The servers are overloaded. Please try again, and contact the site administrator if this problem persists.")}else{var d=SN.U.GetResponseXML(f);if($("."+SN.C.S.Error,d).length>0){b.append(document._importNode($("."+SN.C.S.Error,d)[0],true))}else{if(parseInt(f.status)===0||jQuery.inArray(parseInt(f.status),SN.C.I.HTTP20x30x)>=0){b.resetForm().find("#"+SN.C.S.NoticeDataAttachSelected).remove();SN.U.FormNoticeEnhancements(b)}else{c("error","(Sorry! We had trouble sending your notice ("+f.status+" "+f.statusText+"). Please report the problem to the site administrator if this happens again.")}}}},success:function(i,k){a();var e=$("#"+SN.C.S.Error,i);if(e.length>0){c("error",e.text())}else{if($("body")[0].id=="bookmarklet"){self.close()}var d=$("#"+SN.C.S.CommandResult,i);if(d.length>0){c("success",d.text())}else{var h=document._importNode($("li",i)[0],true);var j=$("#notices_primary .notices");if(j.length>0&&SN.U.belongsOnTimeline(h)){if($("#"+h.id).length===0){var f=$("#"+SN.C.S.NoticeInReplyTo).val();var g="#notices_primary #notice-"+f;if($("body")[0].id=="conversation"){if(f.length>0&&$(g+" .notices").length<1){$(g).append('<ul class="notices"></ul>')}$($(g+" .notices")[0]).append(h)}else{j.prepend(h)}$("#"+h.id).css({display:"none"}).fadeIn(2500);SN.U.NoticeWithAttachment($("#"+h.id));SN.U.NoticeReplyTo($("#"+h.id))}}else{c("success",$("title",i).text())}}b.resetForm();b.find("#"+SN.C.S.NoticeInReplyTo).val("");b.find("#"+SN.C.S.NoticeDataAttachSelected).remove();SN.U.FormNoticeEnhancements(b)}},complete:function(d,e){b.removeClass(SN.C.S.Processing).find("#"+SN.C.S.NoticeActionSubmit).removeAttr(SN.C.S.Disabled).removeClass(SN.C.S.Disabled);$("#"+SN.C.S.NoticeLat).val(SN.C.I.NoticeDataGeo.NLat);$("#"+SN.C.S.NoticeLon).val(SN.C.I.NoticeDataGeo.NLon);if($("#"+SN.C.S.NoticeLocationNs)){$("#"+SN.C.S.NoticeLocationNs).val(SN.C.I.NoticeDataGeo.NLNS);$("#"+SN.C.S.NoticeLocationId).val(SN.C.I.NoticeDataGeo.NLID)}$("#"+SN.C.S.NoticeDataGeo).attr("checked",SN.C.I.NoticeDataGeo.NDG)}})},GetResponseXML:function(b){try{return b.responseXML}catch(a){return(new DOMParser()).parseFromString(b.responseText,"text/xml")}},NoticeReply:function(){if($("#"+SN.C.S.NoticeDataText).length>0&&$("#content .notice_reply").length>0){$("#content .notice").each(function(){SN.U.NoticeReplyTo($(this))})}},NoticeReplyTo:function(a){a.find(".notice_reply").live("click",function(){var b=($(".author .nickname",a).length>0)?$($(".author .nickname",a)[0]):$(".author .nickname.uid");SN.U.NoticeReplySet(b.text(),$($(".notice_id",a)[0]).text());return false})},NoticeReplySet:function(b,d){if(b.match(SN.C.I.PatternUsername)){var c=$("#"+SN.C.S.NoticeDataText);if(c.length>0){replyto="@"+b+" ";c.val(replyto+c.val().replace(RegExp(replyto,"i"),""));$("#"+SN.C.S.FormNotice+" #"+SN.C.S.NoticeInReplyTo).val(d);c[0].focus();if(c[0].setSelectionRange){var a=c.val().length;c[0].setSelectionRange(a,a)}}}},NoticeFavor:function(){$(".form_favor").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_disfavor").live("click",function(){SN.U.FormXHR($(this));return false})},NoticeRepeat:function(){$(".form_repeat").live("click",function(a){a.preventDefault();SN.U.NoticeRepeatConfirmation($(this));return false})},NoticeRepeatConfirmation:function(a){var c=a.find(".submit");var b=c.clone();b.addClass("submit_dialogbox").removeClass("submit");a.append(b);b.bind("click",function(){SN.U.FormXHR(a);return false});c.hide();a.addClass("dialogbox").append('<button class="close">&#215;</button>').closest(".notice-options").addClass("opaque");a.find("button.close").click(function(){$(this).remove();a.removeClass("dialogbox").closest(".notice-options").removeClass("opaque");a.find(".submit_dialogbox").remove();a.find(".submit").show();return false})},NoticeAttachments:function(){$(".notice a.attachment").each(function(){SN.U.NoticeWithAttachment($(this).closest(".notice"))})},NoticeWithAttachment:function(b){if(b.find(".attachment").length===0){return}var a=b.find(".attachment.more");if(a.length>0){$(a[0]).click(function(){var c=$(this);c.addClass(SN.C.S.Processing);$.get(c.attr("href")+"/ajax",null,function(d){c.parent(".entry-content").html($(d).find("#attachment_view .entry-content").html())});return false}).attr("title",SN.msg("showmore_tooltip"))}},NoticeDataAttach:function(){NDA=$("#"+SN.C.S.NoticeDataAttach);NDA.change(function(){S='<div id="'+SN.C.S.NoticeDataAttachSelected+'" class="'+SN.C.S.Success+'"><code>'+$(this).val()+'</code> <button class="close">&#215;</button></div>';NDAS=$("#"+SN.C.S.NoticeDataAttachSelected);if(NDAS.length>0){NDAS.replaceWith(S)}else{$("#"+SN.C.S.FormNotice).append(S)}$("#"+SN.C.S.NoticeDataAttachSelected+" button").click(function(){$("#"+SN.C.S.NoticeDataAttachSelected).remove();NDA.val("");return false});if(typeof this.files=="object"){for(var a=0;a<this.files.length;a++){SN.U.PreviewAttach(this.files[a])}}})},PreviewAttach:function(c){var d=c.type+" "+Math.round(c.size/1024)+"KB";var e=true;var g;if(typeof window.createObjectURL!="undefined"){g=function(h,i){i(window.createObjectURL(h))}}else{if(typeof window.FileReader!="undefined"){g=function(i,j){var h=new FileReader();h.onload=function(k){j(h.result)};h.readAsDataURL(i)}}else{e=false}}var a=["image/png","image/jpeg","image/gif","image/svg+xml"];if($.inArray(c.type,a)==-1){e=false}var f=8*1024*1024;if(c.size>f){e=false}if(e){g(c,function(i){var h=$("<img>").attr("title",d).attr("alt",d).attr("src",i).attr("style","height: 120px");$("#"+SN.C.S.NoticeDataAttachSelected).append(h)})}else{var b=$("<div></div>").text(d);$("#"+SN.C.S.NoticeDataAttachSelected).append(b)}},NoticeLocationAttach:function(){var c=$("#"+SN.C.S.NoticeLat).val();var h=$("#"+SN.C.S.NoticeLon).val();var d=$("#"+SN.C.S.NoticeLocationNs).val();var i=$("#"+SN.C.S.NoticeLocationId).val();var a=$("#"+SN.C.S.NoticeGeoName).text();var b=$("#"+SN.C.S.NoticeDataGeo);function e(){$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",jQuery.trim($("label[for="+SN.C.S.NoticeDataGeo+"]").text())).removeClass("checked");$("#"+SN.C.S.NoticeLat).val("");$("#"+SN.C.S.NoticeLon).val("");$("#"+SN.C.S.NoticeLocationNs).val("");$("#"+SN.C.S.NoticeLocationId).val("");$("#"+SN.C.S.NoticeDataGeo).attr("checked",false);$.cookie(SN.C.S.NoticeDataGeoCookie,"disabled",{path:"/"})}function j(k,l){$.getJSON(k,l,function(m){var n,o;if(typeof(m.location_ns)!="undefined"){$("#"+SN.C.S.NoticeLocationNs).val(m.location_ns);n=m.location_ns}if(typeof(m.location_id)!="undefined"){$("#"+SN.C.S.NoticeLocationId).val(m.location_id);o=m.location_id}if(typeof(m.name)=="undefined"){NLN_text=l.lat+";"+l.lon}else{NLN_text=m.name}$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",NoticeDataGeo_text.ShareDisable+" ("+NLN_text+")");$("#"+SN.C.S.NoticeLat).val(l.lat);$("#"+SN.C.S.NoticeLon).val(l.lon);$("#"+SN.C.S.NoticeLocationNs).val(n);$("#"+SN.C.S.NoticeLocationId).val(o);$("#"+SN.C.S.NoticeDataGeo).attr("checked",true);var p={NLat:l.lat,NLon:l.lon,NLNS:n,NLID:o,NLN:NLN_text,NLNU:m.url,NDG:true};$.cookie(SN.C.S.NoticeDataGeoCookie,JSON.stringify(p),{path:"/"})})}if(b.length>0){if($.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){b.attr("checked",false)}else{b.attr("checked",true)}var f=$("#notice_data-geo_wrap");var g=f.attr("title");f.removeAttr("title");$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",jQuery.trim($("label[for="+SN.C.S.NoticeDataGeo+"]").text()));b.change(function(){if($("#"+SN.C.S.NoticeDataGeo).attr("checked")===true||$.cookie(SN.C.S.NoticeDataGeoCookie)===null){$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",NoticeDataGeo_text.ShareDisable).addClass("checked");if($.cookie(SN.C.S.NoticeDataGeoCookie)===null||$.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){if(navigator.geolocation){navigator.geolocation.getCurrentPosition(function(m){$("#"+SN.C.S.NoticeLat).val(m.coords.latitude);$("#"+SN.C.S.NoticeLon).val(m.coords.longitude);var n={lat:m.coords.latitude,lon:m.coords.longitude,token:$("#token").val()};j(g,n)},function(m){switch(m.code){case m.PERMISSION_DENIED:e();break;case m.TIMEOUT:$("#"+SN.C.S.NoticeDataGeo).attr("checked",false);break}},{timeout:10000})}else{if(c.length>0&&h.length>0){var k={lat:c,lon:h,token:$("#token").val()};j(g,k)}else{e();$("#"+SN.C.S.NoticeDataGeo).remove();$("label[for="+SN.C.S.NoticeDataGeo+"]").remove()}}}else{var l=JSON.parse($.cookie(SN.C.S.NoticeDataGeoCookie));$("#"+SN.C.S.NoticeLat).val(l.NLat);$("#"+SN.C.S.NoticeLon).val(l.NLon);$("#"+SN.C.S.NoticeLocationNs).val(l.NLNS);$("#"+SN.C.S.NoticeLocationId).val(l.NLID);$("#"+SN.C.S.NoticeDataGeo).attr("checked",l.NDG);$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",NoticeDataGeo_text.ShareDisable+" ("+l.NLN+")").addClass("checked")}}else{e()}}).change()}},NewDirectMessage:function(){NDM=$(".entity_send-a-message a");NDM.attr({href:NDM.attr("href")+"&ajax=1"});NDM.bind("click",function(){var a=$(".entity_send-a-message form");if(a.length===0){$(this).addClass(SN.C.S.Processing);$.get(NDM.attr("href"),null,function(b){$(".entity_send-a-message").append(document._importNode($("form",b)[0],true));a=$(".entity_send-a-message .form_notice");SN.U.FormNoticeXHR(a);SN.U.FormNoticeEnhancements(a);a.append('<button class="close">&#215;</button>');$(".entity_send-a-message button").click(function(){a.hide();return false});NDM.removeClass(SN.C.S.Processing)})}else{a.show();$(".entity_send-a-message textarea").focus()}return false})},GetFullYear:function(c,d,a){var b=new Date();b.setFullYear(c,d,a);return b},StatusNetInstance:{Set:function(b){var a=SN.U.StatusNetInstance.Get();if(a!==null){b=$.extend(a,b)}$.cookie(SN.C.S.StatusNetInstance,JSON.stringify(b),{path:"/",expires:SN.U.GetFullYear(2029,0,1)})},Get:function(){var a=$.cookie(SN.C.S.StatusNetInstance);if(a!==null){return JSON.parse(a)}return null},Delete:function(){$.cookie(SN.C.S.StatusNetInstance,null)}},belongsOnTimeline:function(b){var a=$("body").attr("id");if(a=="public"){return true}var c=$("#nav_profile a").attr("href");if(c){var d=$(b).find(".entry-title .author a.url").attr("href");if(d==c){if(a=="all"||a=="showstream"){return true}}}return false}},Init:{NoticeForm:function(){if($("body.user_in").length>0){SN.U.NoticeLocationAttach();$("."+SN.C.S.FormNotice).each(function(){SN.U.FormNoticeXHR($(this));SN.U.FormNoticeEnhancements($(this))});SN.U.NoticeDataAttach()}},Notices:function(){if($("body.user_in").length>0){SN.U.NoticeFavor();SN.U.NoticeRepeat();SN.U.NoticeReply()}SN.U.NoticeAttachments()},EntityActions:function(){if($("body.user_in").length>0){$(".form_user_subscribe").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_user_unsubscribe").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_group_join").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_group_leave").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_user_nudge").live("click",function(){SN.U.FormXHR($(this));return false});SN.U.NewDirectMessage()}},Login:function(){if(SN.U.StatusNetInstance.Get()!==null){var a=SN.U.StatusNetInstance.Get().Nickname;if(a!==null){$("#form_login #nickname").val(a)}}$("#form_login").bind("submit",function(){SN.U.StatusNetInstance.Set({Nickname:$("#form_login #nickname").val()});return true})}}};$(document).ready(function(){if($("."+SN.C.S.FormNotice).length>0){SN.Init.NoticeForm()}if($("#content .notices").length>0){SN.Init.Notices()}if($("#content .entity_actions").length>0){SN.Init.EntityActions()}if($("#form_login").length>0){SN.Init.Login()}});if(!document.ELEMENT_NODE){document.ELEMENT_NODE=1;document.ATTRIBUTE_NODE=2;document.TEXT_NODE=3;document.CDATA_SECTION_NODE=4;document.ENTITY_REFERENCE_NODE=5;document.ENTITY_NODE=6;document.PROCESSING_INSTRUCTION_NODE=7;document.COMMENT_NODE=8;document.DOCUMENT_NODE=9;document.DOCUMENT_TYPE_NODE=10;document.DOCUMENT_FRAGMENT_NODE=11;document.NOTATION_NODE=12}document._importNode=function(e,a){switch(e.nodeType){case document.ELEMENT_NODE:var d=document.createElement(e.nodeName);if(e.attributes&&e.attributes.length>0){for(var c=0,b=e.attributes.length;c<b;){if(e.attributes[c].nodeName=="class"){d.className=e.getAttribute(e.attributes[c++].nodeName)}else{d.setAttribute(e.attributes[c].nodeName,e.getAttribute(e.attributes[c++].nodeName))}}}if(a&&e.childNodes&&e.childNodes.length>0){for(var c=0,b=e.childNodes.length;c<b;){d.appendChild(document._importNode(e.childNodes[c++],a))}}return d;break;case document.TEXT_NODE:case document.CDATA_SECTION_NODE:case document.COMMENT_NODE:return document.createTextNode(e.nodeValue);break}};if(typeof navigator.geolocation=="undefined"||navigator.geolocation.shim){(function(){(function(){if(window.google&&google.gears){return}var c=null;if(typeof GearsFactory!="undefined"){c=new GearsFactory()}else{try{c=new ActiveXObject("Gears.Factory");if(c.getBuildInfo().indexOf("ie_mobile")!=-1){c.privateSetGlobalObject(this)}}catch(d){if((typeof navigator.mimeTypes!="undefined")&&navigator.mimeTypes["application/x-googlegears"]){c=document.createElement("object");c.style.display="none";c.width=0;c.height=0;c.type="application/x-googlegears";document.documentElement.appendChild(c)}}}if(!c){return}if(!window.google){google={}}if(!google.gears){google.gears={factory:c}}})();var a=(function(){var d=google.gears.factory.create("beta.geolocation");var c=function(f,e){return function(g){f(g);e.lastPosition=g}};return{shim:true,type:"Gears",lastPosition:null,getCurrentPosition:function(e,g,h){var f=this;var i=c(e,f);d.getCurrentPosition(i,g,h)},watchPosition:function(e,f,g){d.watchPosition(e,f,g)},clearWatch:function(e){d.clearWatch(e)},getPermission:function(g,e,f){d.getPermission(g,e,f)}}});var b=(function(){var i=false;var e=function(){if(!d()&&!i){i=true;var j=document.createElement("script");j.src=(document.location.protocol=="https:"?"https://":"http://")+"www.google.com/jsapi?callback=_google_loader_apiLoaded";j.type="text/javascript";document.getElementsByTagName("body")[0].appendChild(j)}};var c=[];var h=function(j){c.push(j)};var f=function(){if(d()){while(c.length>0){var j=c.pop();j()}}};window._google_loader_apiLoaded=function(){f()};var d=function(){return(window.google&&google.loader)};var g=function(j){if(d()){return true}h(j);e();return false};e();return{shim:true,type:"ClientLocation",lastPosition:null,getCurrentPosition:function(k,n,o){var m=this;if(!g(function(){m.getCurrentPosition(k,n,o)})){return}if(google.loader.ClientLocation){var l=google.loader.ClientLocation;var j={coords:{latitude:l.latitude,longitude:l.longitude,altitude:null,accuracy:43000,altitudeAccuracy:null,heading:null,speed:null},address:{city:l.address.city,country:l.address.country,country_code:l.address.country_code,region:l.address.region},timestamp:new Date()};k(j);this.lastPosition=j}else{if(n==="function"){n({code:3,message:"Using the Google ClientLocation API and it is not able to calculate a location."})}}},watchPosition:function(j,l,m){this.getCurrentPosition(j,l,m);var k=this;var n=setInterval(function(){k.getCurrentPosition(j,l,m)},10000);return n},clearWatch:function(j){clearInterval(j)},getPermission:function(l,j,k){return true}}});navigator.geolocation=(window.google&&google.gears)?a():b()})()};
\ No newline at end of file
+var SN={C:{I:{CounterBlackout:false,MaxLength:140,PatternUsername:/^[0-9a-zA-Z\-_.]*$/,HTTP20x30x:[200,201,202,203,204,205,206,300,301,302,303,304,305,306,307]},S:{Disabled:"disabled",Warning:"warning",Error:"error",Success:"success",Processing:"processing",CommandResult:"command_result",FormNotice:"form_notice",NoticeDataText:"notice_data-text",NoticeTextCount:"notice_text-count",NoticeInReplyTo:"notice_in-reply-to",NoticeDataAttach:"notice_data-attach",NoticeDataAttachSelected:"notice_data-attach_selected",NoticeActionSubmit:"notice_action-submit",NoticeLat:"notice_data-lat",NoticeLon:"notice_data-lon",NoticeLocationId:"notice_data-location_id",NoticeLocationNs:"notice_data-location_ns",NoticeGeoName:"notice_data-geo_name",NoticeDataGeo:"notice_data-geo",NoticeDataGeoCookie:"NoticeDataGeo",NoticeDataGeoSelected:"notice_data-geo_selected",StatusNetInstance:"StatusNetInstance"}},messages:{},msg:function(a){if(typeof SN.messages[a]=="undefined"){return"["+a+"]"}else{return SN.messages[a]}},U:{FormNoticeEnhancements:function(b){if(jQuery.data(b[0],"ElementData")===undefined){MaxLength=b.find("#"+SN.C.S.NoticeTextCount).text();if(typeof(MaxLength)=="undefined"){MaxLength=SN.C.I.MaxLength}jQuery.data(b[0],"ElementData",{MaxLength:MaxLength});SN.U.Counter(b);NDT=b.find("#"+SN.C.S.NoticeDataText);NDT.bind("keyup",function(c){SN.U.Counter(b)});var a=function(c){window.setTimeout(function(){SN.U.Counter(b)},50)};NDT.bind("cut",a).bind("paste",a);NDT.bind("keydown",function(c){SN.U.SubmitOnReturn(c,b)})}else{b.find("#"+SN.C.S.NoticeTextCount).text(jQuery.data(b[0],"ElementData").MaxLength)}if($("body")[0].id!="conversation"&&window.location.hash.length===0&&$(window).scrollTop()==0){b.find("textarea").focus()}},SubmitOnReturn:function(b,a){if(b.keyCode==13||b.keyCode==10){a.submit();b.preventDefault();b.stopPropagation();$("#"+a[0].id+" #"+SN.C.S.NoticeDataText).blur();$("body").focus();return false}return true},Counter:function(d){SN.C.I.FormNoticeCurrent=d;var b=jQuery.data(d[0],"ElementData").MaxLength;if(b<=0){return}var c=b-SN.U.CharacterCount(d);var a=d.find("#"+SN.C.S.NoticeTextCount);if(c.toString()!=a.text()){if(!SN.C.I.CounterBlackout||c===0){if(a.text()!=String(c)){a.text(c)}if(c<0){d.addClass(SN.C.S.Warning)}else{d.removeClass(SN.C.S.Warning)}if(!SN.C.I.CounterBlackout){SN.C.I.CounterBlackout=true;SN.C.I.FormNoticeCurrent=d;window.setTimeout("SN.U.ClearCounterBlackout(SN.C.I.FormNoticeCurrent);",500)}}}},CharacterCount:function(a){return a.find("#"+SN.C.S.NoticeDataText).val().length},ClearCounterBlackout:function(a){SN.C.I.CounterBlackout=false;SN.U.Counter(a)},RewriteAjaxAction:function(a){if(document.location.protocol=="https:"&&a.substr(0,5)=="http:"){return a.replace(/^http:\/\/[^:\/]+/,"https://"+document.location.host)}else{return a}},FormXHR:function(a){$.ajax({type:"POST",dataType:"xml",url:SN.U.RewriteAjaxAction(a.attr("action")),data:a.serialize()+"&ajax=1",beforeSend:function(b){a.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(c,d,b){alert(b||d)},success:function(b,c){if(typeof($("form",b)[0])!="undefined"){form_new=document._importNode($("form",b)[0],true);a.replaceWith(form_new)}else{a.replaceWith(document._importNode($("p",b)[0],true))}}})},FormNoticeXHR:function(b){SN.C.I.NoticeDataGeo={};b.append('<input type="hidden" name="ajax" value="1"/>');b.attr("action",SN.U.RewriteAjaxAction(b.attr("action")));var c=function(d,e){b.append($('<p class="form_response"></p>').addClass(d).text(e))};var a=function(){b.find(".form_response").remove()};b.ajaxForm({dataType:"xml",timeout:"60000",beforeSend:function(d){if(b.find("#"+SN.C.S.NoticeDataText)[0].value.length===0){b.addClass(SN.C.S.Warning);return false}b.addClass(SN.C.S.Processing).find("#"+SN.C.S.NoticeActionSubmit).addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled);SN.C.I.NoticeDataGeo.NLat=$("#"+SN.C.S.NoticeLat).val();SN.C.I.NoticeDataGeo.NLon=$("#"+SN.C.S.NoticeLon).val();SN.C.I.NoticeDataGeo.NLNS=$("#"+SN.C.S.NoticeLocationNs).val();SN.C.I.NoticeDataGeo.NLID=$("#"+SN.C.S.NoticeLocationId).val();SN.C.I.NoticeDataGeo.NDG=$("#"+SN.C.S.NoticeDataGeo).attr("checked");cookieValue=$.cookie(SN.C.S.NoticeDataGeoCookie);if(cookieValue!==null&&cookieValue!="disabled"){cookieValue=JSON.parse(cookieValue);SN.C.I.NoticeDataGeo.NLat=$("#"+SN.C.S.NoticeLat).val(cookieValue.NLat).val();SN.C.I.NoticeDataGeo.NLon=$("#"+SN.C.S.NoticeLon).val(cookieValue.NLon).val();if($("#"+SN.C.S.NoticeLocationNs).val(cookieValue.NLNS)){SN.C.I.NoticeDataGeo.NLNS=$("#"+SN.C.S.NoticeLocationNs).val(cookieValue.NLNS).val();SN.C.I.NoticeDataGeo.NLID=$("#"+SN.C.S.NoticeLocationId).val(cookieValue.NLID).val()}}if(cookieValue=="disabled"){SN.C.I.NoticeDataGeo.NDG=$("#"+SN.C.S.NoticeDataGeo).attr("checked",false).attr("checked")}else{SN.C.I.NoticeDataGeo.NDG=$("#"+SN.C.S.NoticeDataGeo).attr("checked",true).attr("checked")}return true},error:function(f,g,e){b.removeClass(SN.C.S.Processing).find("#"+SN.C.S.NoticeActionSubmit).removeClass(SN.C.S.Disabled).removeAttr(SN.C.S.Disabled,SN.C.S.Disabled);a();if(g=="timeout"){c("error","Sorry! We had trouble sending your notice. The servers are overloaded. Please try again, and contact the site administrator if this problem persists.")}else{var d=SN.U.GetResponseXML(f);if($("."+SN.C.S.Error,d).length>0){b.append(document._importNode($("."+SN.C.S.Error,d)[0],true))}else{if(parseInt(f.status)===0||jQuery.inArray(parseInt(f.status),SN.C.I.HTTP20x30x)>=0){b.resetForm().find("#"+SN.C.S.NoticeDataAttachSelected).remove();SN.U.FormNoticeEnhancements(b)}else{c("error","(Sorry! We had trouble sending your notice ("+f.status+" "+f.statusText+"). Please report the problem to the site administrator if this happens again.")}}}},success:function(i,k){a();var e=$("#"+SN.C.S.Error,i);if(e.length>0){c("error",e.text())}else{if($("body")[0].id=="bookmarklet"){self.close()}var d=$("#"+SN.C.S.CommandResult,i);if(d.length>0){c("success",d.text())}else{var h=document._importNode($("li",i)[0],true);var j=$("#notices_primary .notices");if(j.length>0&&SN.U.belongsOnTimeline(h)){if($("#"+h.id).length===0){var f=$("#"+SN.C.S.NoticeInReplyTo).val();var g="#notices_primary #notice-"+f;if($("body")[0].id=="conversation"){if(f.length>0&&$(g+" .notices").length<1){$(g).append('<ul class="notices"></ul>')}$($(g+" .notices")[0]).append(h)}else{j.prepend(h)}$("#"+h.id).css({display:"none"}).fadeIn(2500);SN.U.NoticeWithAttachment($("#"+h.id));SN.U.NoticeReplyTo($("#"+h.id))}}else{c("success",$("title",i).text())}}b.resetForm();b.find("#"+SN.C.S.NoticeInReplyTo).val("");b.find("#"+SN.C.S.NoticeDataAttachSelected).remove();SN.U.FormNoticeEnhancements(b)}},complete:function(d,e){b.removeClass(SN.C.S.Processing).find("#"+SN.C.S.NoticeActionSubmit).removeAttr(SN.C.S.Disabled).removeClass(SN.C.S.Disabled);$("#"+SN.C.S.NoticeLat).val(SN.C.I.NoticeDataGeo.NLat);$("#"+SN.C.S.NoticeLon).val(SN.C.I.NoticeDataGeo.NLon);if($("#"+SN.C.S.NoticeLocationNs)){$("#"+SN.C.S.NoticeLocationNs).val(SN.C.I.NoticeDataGeo.NLNS);$("#"+SN.C.S.NoticeLocationId).val(SN.C.I.NoticeDataGeo.NLID)}$("#"+SN.C.S.NoticeDataGeo).attr("checked",SN.C.I.NoticeDataGeo.NDG)}})},GetResponseXML:function(b){try{return b.responseXML}catch(a){return(new DOMParser()).parseFromString(b.responseText,"text/xml")}},NoticeReply:function(){if($("#"+SN.C.S.NoticeDataText).length>0&&$("#content .notice_reply").length>0){$("#content .notice").each(function(){SN.U.NoticeReplyTo($(this))})}},NoticeReplyTo:function(a){a.find(".notice_reply").live("click",function(c){c.preventDefault();var b=($(".author .nickname",a).length>0)?$($(".author .nickname",a)[0]):$(".author .nickname.uid");var d=$($(".notice_id",a)[0]).text();SN.U.NoticeInlineReplyTrigger(d,"@"+b.text());return false})},NoticeInlineReplyTrigger:function(b,h){var g=$("#notice-"+b),c=g;var e=g.closest(".notices");if(e.hasClass("threaded-notices")){c=e.closest("notice")}else{e=$("ul.threaded-notices",g);if(e.length==0){e=$('<ul class="notices threaded-notices xoxo"></ul>');g.append(e)}}var j=$(".notice-reply-form",e);if(j.length==0){var f=$("li.notice-reply",e);if(f.length==0){f=$('<li class="notice-reply"><form class="notice-reply-form" method="post"><textarea name="status_textarea"></textarea><div class="controls"><input type="hidden" name="token"><input type="hidden" name="inreplyto"><input type="submit" class="submit"></div></form></li>');j=f.find("form");j.attr("src","/mublog/newnotice");j.find('input[type="submit"]').val(SN.msg("reply_submit"));if(h){j.find("textarea").val(h+" ")}e.append(f)}}j.find("input[name=inreplyto]").val(b);var i=j.find("textarea");if(i.length==0){throw"No textarea"}if(h){var a=h+" ";i.val(a+i.val().replace(RegExp(a,"i"),""))}i.focus();if(i[0].setSelectionRange){var d=i.val().length;i[0].setSelectionRange(d,d)}},NoticeReplySet:function(b,d){if(b.match(SN.C.I.PatternUsername)){var c=$("#"+SN.C.S.NoticeDataText);if(c.length>0){replyto="@"+b+" ";c.val(replyto+c.val().replace(RegExp(replyto,"i"),""));$("#"+SN.C.S.FormNotice+" #"+SN.C.S.NoticeInReplyTo).val(d);c[0].focus();if(c[0].setSelectionRange){var a=c.val().length;c[0].setSelectionRange(a,a)}}}},NoticeFavor:function(){$(".form_favor").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_disfavor").live("click",function(){SN.U.FormXHR($(this));return false})},NoticeInlineReplySetup:function(){$("");$(".replyform").live("submit",function(b){var a=$(this);$.ajax({type:"POST",dataType:"xml",url:SN.U.RewriteAjaxAction(a.attr("action")),data:a.serialize()+"&ajax=1",beforeSend:function(c){a.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled).end().find("textarea").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(d,e,c){alert(c||e)},success:function(c,d){if(typeof($("form",c)[0])!="undefined"){form_new=document._importNode($("form",c)[0],true);a.replaceWith(form_new)}else{a.replaceWith(document._importNode($("p",c)[0],true))}}});b.preventDefault();return false})},NoticeRepeat:function(){$(".form_repeat").live("click",function(a){a.preventDefault();SN.U.NoticeRepeatConfirmation($(this));return false})},NoticeRepeatConfirmation:function(a){var c=a.find(".submit");var b=c.clone();b.addClass("submit_dialogbox").removeClass("submit");a.append(b);b.bind("click",function(){SN.U.FormXHR(a);return false});c.hide();a.addClass("dialogbox").append('<button class="close">&#215;</button>').closest(".notice-options").addClass("opaque");a.find("button.close").click(function(){$(this).remove();a.removeClass("dialogbox").closest(".notice-options").removeClass("opaque");a.find(".submit_dialogbox").remove();a.find(".submit").show();return false})},NoticeAttachments:function(){$(".notice a.attachment").each(function(){SN.U.NoticeWithAttachment($(this).closest(".notice"))})},NoticeWithAttachment:function(b){if(b.find(".attachment").length===0){return}var a=b.find(".attachment.more");if(a.length>0){$(a[0]).click(function(){var c=$(this);c.addClass(SN.C.S.Processing);$.get(c.attr("href")+"/ajax",null,function(d){c.parent(".entry-content").html($(d).find("#attachment_view .entry-content").html())});return false}).attr("title",SN.msg("showmore_tooltip"))}},NoticeDataAttach:function(){NDA=$("#"+SN.C.S.NoticeDataAttach);NDA.change(function(){S='<div id="'+SN.C.S.NoticeDataAttachSelected+'" class="'+SN.C.S.Success+'"><code>'+$(this).val()+'</code> <button class="close">&#215;</button></div>';NDAS=$("#"+SN.C.S.NoticeDataAttachSelected);if(NDAS.length>0){NDAS.replaceWith(S)}else{$("#"+SN.C.S.FormNotice).append(S)}$("#"+SN.C.S.NoticeDataAttachSelected+" button").click(function(){$("#"+SN.C.S.NoticeDataAttachSelected).remove();NDA.val("");return false});if(typeof this.files=="object"){for(var a=0;a<this.files.length;a++){SN.U.PreviewAttach(this.files[a])}}})},PreviewAttach:function(c){var d=c.type+" "+Math.round(c.size/1024)+"KB";var e=true;var g;if(typeof window.createObjectURL!="undefined"){g=function(h,i){i(window.createObjectURL(h))}}else{if(typeof window.FileReader!="undefined"){g=function(i,j){var h=new FileReader();h.onload=function(k){j(h.result)};h.readAsDataURL(i)}}else{e=false}}var a=["image/png","image/jpeg","image/gif","image/svg+xml"];if($.inArray(c.type,a)==-1){e=false}var f=8*1024*1024;if(c.size>f){e=false}if(e){g(c,function(i){var h=$("<img>").attr("title",d).attr("alt",d).attr("src",i).attr("style","height: 120px");$("#"+SN.C.S.NoticeDataAttachSelected).append(h)})}else{var b=$("<div></div>").text(d);$("#"+SN.C.S.NoticeDataAttachSelected).append(b)}},NoticeLocationAttach:function(){var c=$("#"+SN.C.S.NoticeLat).val();var h=$("#"+SN.C.S.NoticeLon).val();var d=$("#"+SN.C.S.NoticeLocationNs).val();var i=$("#"+SN.C.S.NoticeLocationId).val();var a=$("#"+SN.C.S.NoticeGeoName).text();var b=$("#"+SN.C.S.NoticeDataGeo);function e(){$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",jQuery.trim($("label[for="+SN.C.S.NoticeDataGeo+"]").text())).removeClass("checked");$("#"+SN.C.S.NoticeLat).val("");$("#"+SN.C.S.NoticeLon).val("");$("#"+SN.C.S.NoticeLocationNs).val("");$("#"+SN.C.S.NoticeLocationId).val("");$("#"+SN.C.S.NoticeDataGeo).attr("checked",false);$.cookie(SN.C.S.NoticeDataGeoCookie,"disabled",{path:"/"})}function j(k,l){$.getJSON(k,l,function(m){var n,o;if(typeof(m.location_ns)!="undefined"){$("#"+SN.C.S.NoticeLocationNs).val(m.location_ns);n=m.location_ns}if(typeof(m.location_id)!="undefined"){$("#"+SN.C.S.NoticeLocationId).val(m.location_id);o=m.location_id}if(typeof(m.name)=="undefined"){NLN_text=l.lat+";"+l.lon}else{NLN_text=m.name}$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",NoticeDataGeo_text.ShareDisable+" ("+NLN_text+")");$("#"+SN.C.S.NoticeLat).val(l.lat);$("#"+SN.C.S.NoticeLon).val(l.lon);$("#"+SN.C.S.NoticeLocationNs).val(n);$("#"+SN.C.S.NoticeLocationId).val(o);$("#"+SN.C.S.NoticeDataGeo).attr("checked",true);var p={NLat:l.lat,NLon:l.lon,NLNS:n,NLID:o,NLN:NLN_text,NLNU:m.url,NDG:true};$.cookie(SN.C.S.NoticeDataGeoCookie,JSON.stringify(p),{path:"/"})})}if(b.length>0){if($.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){b.attr("checked",false)}else{b.attr("checked",true)}var f=$("#notice_data-geo_wrap");var g=f.attr("title");f.removeAttr("title");$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",jQuery.trim($("label[for="+SN.C.S.NoticeDataGeo+"]").text()));b.change(function(){if($("#"+SN.C.S.NoticeDataGeo).attr("checked")===true||$.cookie(SN.C.S.NoticeDataGeoCookie)===null){$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",NoticeDataGeo_text.ShareDisable).addClass("checked");if($.cookie(SN.C.S.NoticeDataGeoCookie)===null||$.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){if(navigator.geolocation){navigator.geolocation.getCurrentPosition(function(m){$("#"+SN.C.S.NoticeLat).val(m.coords.latitude);$("#"+SN.C.S.NoticeLon).val(m.coords.longitude);var n={lat:m.coords.latitude,lon:m.coords.longitude,token:$("#token").val()};j(g,n)},function(m){switch(m.code){case m.PERMISSION_DENIED:e();break;case m.TIMEOUT:$("#"+SN.C.S.NoticeDataGeo).attr("checked",false);break}},{timeout:10000})}else{if(c.length>0&&h.length>0){var k={lat:c,lon:h,token:$("#token").val()};j(g,k)}else{e();$("#"+SN.C.S.NoticeDataGeo).remove();$("label[for="+SN.C.S.NoticeDataGeo+"]").remove()}}}else{var l=JSON.parse($.cookie(SN.C.S.NoticeDataGeoCookie));$("#"+SN.C.S.NoticeLat).val(l.NLat);$("#"+SN.C.S.NoticeLon).val(l.NLon);$("#"+SN.C.S.NoticeLocationNs).val(l.NLNS);$("#"+SN.C.S.NoticeLocationId).val(l.NLID);$("#"+SN.C.S.NoticeDataGeo).attr("checked",l.NDG);$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",NoticeDataGeo_text.ShareDisable+" ("+l.NLN+")").addClass("checked")}}else{e()}}).change()}},NewDirectMessage:function(){NDM=$(".entity_send-a-message a");NDM.attr({href:NDM.attr("href")+"&ajax=1"});NDM.bind("click",function(){var a=$(".entity_send-a-message form");if(a.length===0){$(this).addClass(SN.C.S.Processing);$.get(NDM.attr("href"),null,function(b){$(".entity_send-a-message").append(document._importNode($("form",b)[0],true));a=$(".entity_send-a-message .form_notice");SN.U.FormNoticeXHR(a);SN.U.FormNoticeEnhancements(a);a.append('<button class="close">&#215;</button>');$(".entity_send-a-message button").click(function(){a.hide();return false});NDM.removeClass(SN.C.S.Processing)})}else{a.show();$(".entity_send-a-message textarea").focus()}return false})},GetFullYear:function(c,d,a){var b=new Date();b.setFullYear(c,d,a);return b},StatusNetInstance:{Set:function(b){var a=SN.U.StatusNetInstance.Get();if(a!==null){b=$.extend(a,b)}$.cookie(SN.C.S.StatusNetInstance,JSON.stringify(b),{path:"/",expires:SN.U.GetFullYear(2029,0,1)})},Get:function(){var a=$.cookie(SN.C.S.StatusNetInstance);if(a!==null){return JSON.parse(a)}return null},Delete:function(){$.cookie(SN.C.S.StatusNetInstance,null)}},belongsOnTimeline:function(b){var a=$("body").attr("id");if(a=="public"){return true}var c=$("#nav_profile a").attr("href");if(c){var d=$(b).find(".entry-title .author a.url").attr("href");if(d==c){if(a=="all"||a=="showstream"){return true}}}return false}},Init:{NoticeForm:function(){if($("body.user_in").length>0){SN.U.NoticeLocationAttach();$("."+SN.C.S.FormNotice).each(function(){SN.U.FormNoticeXHR($(this));SN.U.FormNoticeEnhancements($(this))});SN.U.NoticeDataAttach()}},Notices:function(){if($("body.user_in").length>0){SN.U.NoticeFavor();SN.U.NoticeRepeat();SN.U.NoticeReply();SN.U.NoticeInlineReplySetup()}SN.U.NoticeAttachments()},EntityActions:function(){if($("body.user_in").length>0){$(".form_user_subscribe").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_user_unsubscribe").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_group_join").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_group_leave").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_user_nudge").live("click",function(){SN.U.FormXHR($(this));return false});SN.U.NewDirectMessage()}},Login:function(){if(SN.U.StatusNetInstance.Get()!==null){var a=SN.U.StatusNetInstance.Get().Nickname;if(a!==null){$("#form_login #nickname").val(a)}}$("#form_login").bind("submit",function(){SN.U.StatusNetInstance.Set({Nickname:$("#form_login #nickname").val()});return true})}}};$(document).ready(function(){if($("."+SN.C.S.FormNotice).length>0){SN.Init.NoticeForm()}if($("#content .notices").length>0){SN.Init.Notices()}if($("#content .entity_actions").length>0){SN.Init.EntityActions()}if($("#form_login").length>0){SN.Init.Login()}});if(!document.ELEMENT_NODE){document.ELEMENT_NODE=1;document.ATTRIBUTE_NODE=2;document.TEXT_NODE=3;document.CDATA_SECTION_NODE=4;document.ENTITY_REFERENCE_NODE=5;document.ENTITY_NODE=6;document.PROCESSING_INSTRUCTION_NODE=7;document.COMMENT_NODE=8;document.DOCUMENT_NODE=9;document.DOCUMENT_TYPE_NODE=10;document.DOCUMENT_FRAGMENT_NODE=11;document.NOTATION_NODE=12}document._importNode=function(e,a){switch(e.nodeType){case document.ELEMENT_NODE:var d=document.createElement(e.nodeName);if(e.attributes&&e.attributes.length>0){for(var c=0,b=e.attributes.length;c<b;){if(e.attributes[c].nodeName=="class"){d.className=e.getAttribute(e.attributes[c++].nodeName)}else{d.setAttribute(e.attributes[c].nodeName,e.getAttribute(e.attributes[c++].nodeName))}}}if(a&&e.childNodes&&e.childNodes.length>0){for(var c=0,b=e.childNodes.length;c<b;){d.appendChild(document._importNode(e.childNodes[c++],a))}}return d;break;case document.TEXT_NODE:case document.CDATA_SECTION_NODE:case document.COMMENT_NODE:return document.createTextNode(e.nodeValue);break}};if(typeof navigator.geolocation=="undefined"||navigator.geolocation.shim){(function(){(function(){if(window.google&&google.gears){return}var c=null;if(typeof GearsFactory!="undefined"){c=new GearsFactory()}else{try{c=new ActiveXObject("Gears.Factory");if(c.getBuildInfo().indexOf("ie_mobile")!=-1){c.privateSetGlobalObject(this)}}catch(d){if((typeof navigator.mimeTypes!="undefined")&&navigator.mimeTypes["application/x-googlegears"]){c=document.createElement("object");c.style.display="none";c.width=0;c.height=0;c.type="application/x-googlegears";document.documentElement.appendChild(c)}}}if(!c){return}if(!window.google){google={}}if(!google.gears){google.gears={factory:c}}})();var a=(function(){var d=google.gears.factory.create("beta.geolocation");var c=function(f,e){return function(g){f(g);e.lastPosition=g}};return{shim:true,type:"Gears",lastPosition:null,getCurrentPosition:function(e,g,h){var f=this;var i=c(e,f);d.getCurrentPosition(i,g,h)},watchPosition:function(e,f,g){d.watchPosition(e,f,g)},clearWatch:function(e){d.clearWatch(e)},getPermission:function(g,e,f){d.getPermission(g,e,f)}}});var b=(function(){var i=false;var e=function(){if(!d()&&!i){i=true;var j=document.createElement("script");j.src=(document.location.protocol=="https:"?"https://":"http://")+"www.google.com/jsapi?callback=_google_loader_apiLoaded";j.type="text/javascript";document.getElementsByTagName("body")[0].appendChild(j)}};var c=[];var h=function(j){c.push(j)};var f=function(){if(d()){while(c.length>0){var j=c.pop();j()}}};window._google_loader_apiLoaded=function(){f()};var d=function(){return(window.google&&google.loader)};var g=function(j){if(d()){return true}h(j);e();return false};e();return{shim:true,type:"ClientLocation",lastPosition:null,getCurrentPosition:function(k,n,o){var m=this;if(!g(function(){m.getCurrentPosition(k,n,o)})){return}if(google.loader.ClientLocation){var l=google.loader.ClientLocation;var j={coords:{latitude:l.latitude,longitude:l.longitude,altitude:null,accuracy:43000,altitudeAccuracy:null,heading:null,speed:null},address:{city:l.address.city,country:l.address.country,country_code:l.address.country_code,region:l.address.region},timestamp:new Date()};k(j);this.lastPosition=j}else{if(n==="function"){n({code:3,message:"Using the Google ClientLocation API and it is not able to calculate a location."})}}},watchPosition:function(j,l,m){this.getCurrentPosition(j,l,m);var k=this;var n=setInterval(function(){k.getCurrentPosition(j,l,m)},10000);return n},clearWatch:function(j){clearInterval(j)},getPermission:function(l,j,k){return true}}});navigator.geolocation=(window.google&&google.gears)?a():b()})()};
\ No newline at end of file
diff --git a/lib/action.php b/lib/action.php
index 31288a5e7b..22daf70d8a 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -311,6 +311,9 @@ class Action extends HTMLOutputter // lawsuit
             // TRANS: Localized tooltip for '...' expansion button on overlong remote messages.
             $messages['showmore_tooltip'] = _m('TOOLTIP', 'Show more');
 
+            // TRANS: Inline reply form submit button: submits a reply comment.
+            $messages['reply_submit'] = _m('BUTTON', 'Comment');
+
             $messages = array_merge($messages, $this->getScriptMessages());
 	    
 	    Event::handle('EndScriptMessages', array($this, &$messages));
diff --git a/lib/threadednoticelist.php b/lib/threadednoticelist.php
index 2d3746edef..d95a187980 100644
--- a/lib/threadednoticelist.php
+++ b/lib/threadednoticelist.php
@@ -233,8 +233,7 @@ class ThreadedNoticeListReplyItem extends NoticeListItem
     {
         if (Event::handle('StartOpenNoticeListItemElement', array($this))) {
             $id = (empty($this->repeat)) ? $this->notice->id : $this->repeat->id;
-            $this->out->elementStart('li', array('class' => 'notice-reply',
-                                                 'id' => 'notice-reply-' . $id));
+            $this->out->elementStart('li', array('class' => 'notice-reply-placeholder'));
         }
     }
 
@@ -245,6 +244,7 @@ class ThreadedNoticeListReplyItem extends NoticeListItem
         $url = common_local_url('newnotice');
 
         // @fixme replace this with an ajax-friendly form pair?
+        /*
         $this->out->elementStart('form',
                                  array('id' => $id,
                                        'class' => 'replyform',
@@ -257,5 +257,6 @@ class ThreadedNoticeListReplyItem extends NoticeListItem
         $this->out->submit("$id-submit", _m('Send reply'));
         $this->out->elementEnd('div');
         $this->out->elementEnd('form');
+         */
     }
 }
\ No newline at end of file

From 3b456b4ffe0b1da8a378630574988a9d7a75f9bd Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Mon, 28 Feb 2011 15:40:43 -0800
Subject: [PATCH 316/655] Paging fix for threaded notice lists

---
 lib/threadednoticelist.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/threadednoticelist.php b/lib/threadednoticelist.php
index d95a187980..c1c4b4f36a 100644
--- a/lib/threadednoticelist.php
+++ b/lib/threadednoticelist.php
@@ -69,6 +69,12 @@ class ThreadedNoticeList extends NoticeList
         $cnt = 0;
         $conversations = array();
         while ($this->notice->fetch() && $cnt <= NOTICES_PER_PAGE) {
+            $cnt++;
+
+            if ($cnt > NOTICES_PER_PAGE) {
+                break;
+            }
+
             $convo = $this->notice->conversation;
             if (!empty($conversations[$convo])) {
                 // Seen this convo already -- skip!
@@ -86,12 +92,6 @@ class ThreadedNoticeList extends NoticeList
             $notice->limit(1);
             $notice->find(true);
 
-            $cnt++;
-
-            if ($cnt > NOTICES_PER_PAGE) {
-                break;
-            }
-
             try {
                 $item = $this->newListItem($notice);
                 $item->show();

From f3ffc8bc46ebe5f2329bdf54fa28d4832c3a02f9 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Mon, 28 Feb 2011 15:51:46 -0800
Subject: [PATCH 317/655] Missed a couple of conflicts

---
 actions/imsettings.php | 5 -----
 lib/userprofile.php    | 8 --------
 2 files changed, 13 deletions(-)

diff --git a/actions/imsettings.php b/actions/imsettings.php
index 4680b3292b..f45848a13d 100644
--- a/actions/imsettings.php
+++ b/actions/imsettings.php
@@ -207,12 +207,7 @@ class ImsettingsAction extends SettingsAction
      *
      * @return Confirm_address address object for this user
      */
-<<<<<<< HEAD
-
     function getConfirmation($transport)
-=======
-    function getConfirmation()
->>>>>>> 0.9.x
     {
         $user = common_current_user();
 
diff --git a/lib/userprofile.php b/lib/userprofile.php
index 444bb08121..0b7efb22fc 100644
--- a/lib/userprofile.php
+++ b/lib/userprofile.php
@@ -192,15 +192,7 @@ class UserProfile extends Widget
             $tags = Profile_tag::getTags($this->profile->id, $this->profile->id);
 
             if (count($tags) > 0) {
-<<<<<<< HEAD
                 $this->out->elementStart('ul', 'tags xoxo entity_tags');
-=======
-                $this->out->elementStart('dl', 'entity_tags');
-                // TRANS: DT for tags in a profile.
-                $this->out->element('dt', null, _('Tags'));
-                $this->out->elementStart('dd');
-                $this->out->elementStart('ul', 'tags xoxo');
->>>>>>> 0.9.x
                 foreach ($tags as $tag) {
                     $this->out->elementStart('li');
                     // Avoid space by using raw output.

From 62712b794abd15d979f57935709d63ea9e65108a Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Mon, 28 Feb 2011 16:13:16 -0800
Subject: [PATCH 318/655] More interactive magic for inline replies:
 placeholder at the end of list

---
 js/util.js                 | 22 +++++++++++++++++++++-
 js/util.min.js             |  2 +-
 lib/action.php             |  3 +++
 theme/base/css/display.css | 10 ++++++++--
 4 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/js/util.js b/js/util.js
index a893993624..40fffa5d99 100644
--- a/js/util.js
+++ b/js/util.js
@@ -591,6 +591,9 @@ var SN = { // StatusNet
             // See if the form's already open...
             var replyForm = $('.notice-reply-form', list);
             if (replyForm.length == 0) {
+                // Remove placeholder if any
+                $('li.notice-reply-placeholder').remove();
+
                 // Create the reply form entry at the end
                 var replyItem = $('li.notice-reply', list);
                 if (replyItem.length == 0) {
@@ -672,6 +675,19 @@ var SN = { // StatusNet
             $('.form_disfavor').live('click', function() { SN.U.FormXHR($(this)); return false; });
         },
 
+        NoticeInlineReplyPlaceholder: function(notice) {
+            var id = $($('.notice_id', notice)[0]).text();
+            var list = notice.find('ul.threaded-notices');
+            var placeholder = $('<li class="notice-reply-placeholder">' +
+                                    '<input class="placeholder">' +
+                                '</li>');
+            placeholder.click(function() {
+                SN.U.NoticeInlineReplyTrigger(id);
+            });
+            placeholder.find('input').val(SN.msg('reply_comment'));
+            list.append(placeholder);
+        },
+
         /**
          * Setup function -- DOES NOT apply immediately.
          *
@@ -679,7 +695,11 @@ var SN = { // StatusNet
          * Uses 'live' rather than 'bind', so applies to future as well as present items.
          */
         NoticeInlineReplySetup: function() {
-            $('')
+            $('.threaded-notices').each(function() {
+                var list = $(this);
+                var notice = list.closest('.notice');
+                SN.U.NoticeInlineReplyPlaceholder(notice);
+            });
             $('.replyform').live('submit', function(event) {
                 //SN.U.FormXHR($(this));
                 var form = $(this);
diff --git a/js/util.min.js b/js/util.min.js
index ff50ddc066..56baf287e4 100644
--- a/js/util.min.js
+++ b/js/util.min.js
@@ -1 +1 @@
-var SN={C:{I:{CounterBlackout:false,MaxLength:140,PatternUsername:/^[0-9a-zA-Z\-_.]*$/,HTTP20x30x:[200,201,202,203,204,205,206,300,301,302,303,304,305,306,307]},S:{Disabled:"disabled",Warning:"warning",Error:"error",Success:"success",Processing:"processing",CommandResult:"command_result",FormNotice:"form_notice",NoticeDataText:"notice_data-text",NoticeTextCount:"notice_text-count",NoticeInReplyTo:"notice_in-reply-to",NoticeDataAttach:"notice_data-attach",NoticeDataAttachSelected:"notice_data-attach_selected",NoticeActionSubmit:"notice_action-submit",NoticeLat:"notice_data-lat",NoticeLon:"notice_data-lon",NoticeLocationId:"notice_data-location_id",NoticeLocationNs:"notice_data-location_ns",NoticeGeoName:"notice_data-geo_name",NoticeDataGeo:"notice_data-geo",NoticeDataGeoCookie:"NoticeDataGeo",NoticeDataGeoSelected:"notice_data-geo_selected",StatusNetInstance:"StatusNetInstance"}},messages:{},msg:function(a){if(typeof SN.messages[a]=="undefined"){return"["+a+"]"}else{return SN.messages[a]}},U:{FormNoticeEnhancements:function(b){if(jQuery.data(b[0],"ElementData")===undefined){MaxLength=b.find("#"+SN.C.S.NoticeTextCount).text();if(typeof(MaxLength)=="undefined"){MaxLength=SN.C.I.MaxLength}jQuery.data(b[0],"ElementData",{MaxLength:MaxLength});SN.U.Counter(b);NDT=b.find("#"+SN.C.S.NoticeDataText);NDT.bind("keyup",function(c){SN.U.Counter(b)});var a=function(c){window.setTimeout(function(){SN.U.Counter(b)},50)};NDT.bind("cut",a).bind("paste",a);NDT.bind("keydown",function(c){SN.U.SubmitOnReturn(c,b)})}else{b.find("#"+SN.C.S.NoticeTextCount).text(jQuery.data(b[0],"ElementData").MaxLength)}if($("body")[0].id!="conversation"&&window.location.hash.length===0&&$(window).scrollTop()==0){b.find("textarea").focus()}},SubmitOnReturn:function(b,a){if(b.keyCode==13||b.keyCode==10){a.submit();b.preventDefault();b.stopPropagation();$("#"+a[0].id+" #"+SN.C.S.NoticeDataText).blur();$("body").focus();return false}return true},Counter:function(d){SN.C.I.FormNoticeCurrent=d;var b=jQuery.data(d[0],"ElementData").MaxLength;if(b<=0){return}var c=b-SN.U.CharacterCount(d);var a=d.find("#"+SN.C.S.NoticeTextCount);if(c.toString()!=a.text()){if(!SN.C.I.CounterBlackout||c===0){if(a.text()!=String(c)){a.text(c)}if(c<0){d.addClass(SN.C.S.Warning)}else{d.removeClass(SN.C.S.Warning)}if(!SN.C.I.CounterBlackout){SN.C.I.CounterBlackout=true;SN.C.I.FormNoticeCurrent=d;window.setTimeout("SN.U.ClearCounterBlackout(SN.C.I.FormNoticeCurrent);",500)}}}},CharacterCount:function(a){return a.find("#"+SN.C.S.NoticeDataText).val().length},ClearCounterBlackout:function(a){SN.C.I.CounterBlackout=false;SN.U.Counter(a)},RewriteAjaxAction:function(a){if(document.location.protocol=="https:"&&a.substr(0,5)=="http:"){return a.replace(/^http:\/\/[^:\/]+/,"https://"+document.location.host)}else{return a}},FormXHR:function(a){$.ajax({type:"POST",dataType:"xml",url:SN.U.RewriteAjaxAction(a.attr("action")),data:a.serialize()+"&ajax=1",beforeSend:function(b){a.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(c,d,b){alert(b||d)},success:function(b,c){if(typeof($("form",b)[0])!="undefined"){form_new=document._importNode($("form",b)[0],true);a.replaceWith(form_new)}else{a.replaceWith(document._importNode($("p",b)[0],true))}}})},FormNoticeXHR:function(b){SN.C.I.NoticeDataGeo={};b.append('<input type="hidden" name="ajax" value="1"/>');b.attr("action",SN.U.RewriteAjaxAction(b.attr("action")));var c=function(d,e){b.append($('<p class="form_response"></p>').addClass(d).text(e))};var a=function(){b.find(".form_response").remove()};b.ajaxForm({dataType:"xml",timeout:"60000",beforeSend:function(d){if(b.find("#"+SN.C.S.NoticeDataText)[0].value.length===0){b.addClass(SN.C.S.Warning);return false}b.addClass(SN.C.S.Processing).find("#"+SN.C.S.NoticeActionSubmit).addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled);SN.C.I.NoticeDataGeo.NLat=$("#"+SN.C.S.NoticeLat).val();SN.C.I.NoticeDataGeo.NLon=$("#"+SN.C.S.NoticeLon).val();SN.C.I.NoticeDataGeo.NLNS=$("#"+SN.C.S.NoticeLocationNs).val();SN.C.I.NoticeDataGeo.NLID=$("#"+SN.C.S.NoticeLocationId).val();SN.C.I.NoticeDataGeo.NDG=$("#"+SN.C.S.NoticeDataGeo).attr("checked");cookieValue=$.cookie(SN.C.S.NoticeDataGeoCookie);if(cookieValue!==null&&cookieValue!="disabled"){cookieValue=JSON.parse(cookieValue);SN.C.I.NoticeDataGeo.NLat=$("#"+SN.C.S.NoticeLat).val(cookieValue.NLat).val();SN.C.I.NoticeDataGeo.NLon=$("#"+SN.C.S.NoticeLon).val(cookieValue.NLon).val();if($("#"+SN.C.S.NoticeLocationNs).val(cookieValue.NLNS)){SN.C.I.NoticeDataGeo.NLNS=$("#"+SN.C.S.NoticeLocationNs).val(cookieValue.NLNS).val();SN.C.I.NoticeDataGeo.NLID=$("#"+SN.C.S.NoticeLocationId).val(cookieValue.NLID).val()}}if(cookieValue=="disabled"){SN.C.I.NoticeDataGeo.NDG=$("#"+SN.C.S.NoticeDataGeo).attr("checked",false).attr("checked")}else{SN.C.I.NoticeDataGeo.NDG=$("#"+SN.C.S.NoticeDataGeo).attr("checked",true).attr("checked")}return true},error:function(f,g,e){b.removeClass(SN.C.S.Processing).find("#"+SN.C.S.NoticeActionSubmit).removeClass(SN.C.S.Disabled).removeAttr(SN.C.S.Disabled,SN.C.S.Disabled);a();if(g=="timeout"){c("error","Sorry! We had trouble sending your notice. The servers are overloaded. Please try again, and contact the site administrator if this problem persists.")}else{var d=SN.U.GetResponseXML(f);if($("."+SN.C.S.Error,d).length>0){b.append(document._importNode($("."+SN.C.S.Error,d)[0],true))}else{if(parseInt(f.status)===0||jQuery.inArray(parseInt(f.status),SN.C.I.HTTP20x30x)>=0){b.resetForm().find("#"+SN.C.S.NoticeDataAttachSelected).remove();SN.U.FormNoticeEnhancements(b)}else{c("error","(Sorry! We had trouble sending your notice ("+f.status+" "+f.statusText+"). Please report the problem to the site administrator if this happens again.")}}}},success:function(i,k){a();var e=$("#"+SN.C.S.Error,i);if(e.length>0){c("error",e.text())}else{if($("body")[0].id=="bookmarklet"){self.close()}var d=$("#"+SN.C.S.CommandResult,i);if(d.length>0){c("success",d.text())}else{var h=document._importNode($("li",i)[0],true);var j=$("#notices_primary .notices");if(j.length>0&&SN.U.belongsOnTimeline(h)){if($("#"+h.id).length===0){var f=$("#"+SN.C.S.NoticeInReplyTo).val();var g="#notices_primary #notice-"+f;if($("body")[0].id=="conversation"){if(f.length>0&&$(g+" .notices").length<1){$(g).append('<ul class="notices"></ul>')}$($(g+" .notices")[0]).append(h)}else{j.prepend(h)}$("#"+h.id).css({display:"none"}).fadeIn(2500);SN.U.NoticeWithAttachment($("#"+h.id));SN.U.NoticeReplyTo($("#"+h.id))}}else{c("success",$("title",i).text())}}b.resetForm();b.find("#"+SN.C.S.NoticeInReplyTo).val("");b.find("#"+SN.C.S.NoticeDataAttachSelected).remove();SN.U.FormNoticeEnhancements(b)}},complete:function(d,e){b.removeClass(SN.C.S.Processing).find("#"+SN.C.S.NoticeActionSubmit).removeAttr(SN.C.S.Disabled).removeClass(SN.C.S.Disabled);$("#"+SN.C.S.NoticeLat).val(SN.C.I.NoticeDataGeo.NLat);$("#"+SN.C.S.NoticeLon).val(SN.C.I.NoticeDataGeo.NLon);if($("#"+SN.C.S.NoticeLocationNs)){$("#"+SN.C.S.NoticeLocationNs).val(SN.C.I.NoticeDataGeo.NLNS);$("#"+SN.C.S.NoticeLocationId).val(SN.C.I.NoticeDataGeo.NLID)}$("#"+SN.C.S.NoticeDataGeo).attr("checked",SN.C.I.NoticeDataGeo.NDG)}})},GetResponseXML:function(b){try{return b.responseXML}catch(a){return(new DOMParser()).parseFromString(b.responseText,"text/xml")}},NoticeReply:function(){if($("#"+SN.C.S.NoticeDataText).length>0&&$("#content .notice_reply").length>0){$("#content .notice").each(function(){SN.U.NoticeReplyTo($(this))})}},NoticeReplyTo:function(a){a.find(".notice_reply").live("click",function(c){c.preventDefault();var b=($(".author .nickname",a).length>0)?$($(".author .nickname",a)[0]):$(".author .nickname.uid");var d=$($(".notice_id",a)[0]).text();SN.U.NoticeInlineReplyTrigger(d,"@"+b.text());return false})},NoticeInlineReplyTrigger:function(b,h){var g=$("#notice-"+b),c=g;var e=g.closest(".notices");if(e.hasClass("threaded-notices")){c=e.closest("notice")}else{e=$("ul.threaded-notices",g);if(e.length==0){e=$('<ul class="notices threaded-notices xoxo"></ul>');g.append(e)}}var j=$(".notice-reply-form",e);if(j.length==0){var f=$("li.notice-reply",e);if(f.length==0){f=$('<li class="notice-reply"><form class="notice-reply-form" method="post"><textarea name="status_textarea"></textarea><div class="controls"><input type="hidden" name="token"><input type="hidden" name="inreplyto"><input type="submit" class="submit"></div></form></li>');j=f.find("form");j.attr("src","/mublog/newnotice");j.find('input[type="submit"]').val(SN.msg("reply_submit"));if(h){j.find("textarea").val(h+" ")}e.append(f)}}j.find("input[name=inreplyto]").val(b);var i=j.find("textarea");if(i.length==0){throw"No textarea"}if(h){var a=h+" ";i.val(a+i.val().replace(RegExp(a,"i"),""))}i.focus();if(i[0].setSelectionRange){var d=i.val().length;i[0].setSelectionRange(d,d)}},NoticeReplySet:function(b,d){if(b.match(SN.C.I.PatternUsername)){var c=$("#"+SN.C.S.NoticeDataText);if(c.length>0){replyto="@"+b+" ";c.val(replyto+c.val().replace(RegExp(replyto,"i"),""));$("#"+SN.C.S.FormNotice+" #"+SN.C.S.NoticeInReplyTo).val(d);c[0].focus();if(c[0].setSelectionRange){var a=c.val().length;c[0].setSelectionRange(a,a)}}}},NoticeFavor:function(){$(".form_favor").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_disfavor").live("click",function(){SN.U.FormXHR($(this));return false})},NoticeInlineReplySetup:function(){$("");$(".replyform").live("submit",function(b){var a=$(this);$.ajax({type:"POST",dataType:"xml",url:SN.U.RewriteAjaxAction(a.attr("action")),data:a.serialize()+"&ajax=1",beforeSend:function(c){a.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled).end().find("textarea").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(d,e,c){alert(c||e)},success:function(c,d){if(typeof($("form",c)[0])!="undefined"){form_new=document._importNode($("form",c)[0],true);a.replaceWith(form_new)}else{a.replaceWith(document._importNode($("p",c)[0],true))}}});b.preventDefault();return false})},NoticeRepeat:function(){$(".form_repeat").live("click",function(a){a.preventDefault();SN.U.NoticeRepeatConfirmation($(this));return false})},NoticeRepeatConfirmation:function(a){var c=a.find(".submit");var b=c.clone();b.addClass("submit_dialogbox").removeClass("submit");a.append(b);b.bind("click",function(){SN.U.FormXHR(a);return false});c.hide();a.addClass("dialogbox").append('<button class="close">&#215;</button>').closest(".notice-options").addClass("opaque");a.find("button.close").click(function(){$(this).remove();a.removeClass("dialogbox").closest(".notice-options").removeClass("opaque");a.find(".submit_dialogbox").remove();a.find(".submit").show();return false})},NoticeAttachments:function(){$(".notice a.attachment").each(function(){SN.U.NoticeWithAttachment($(this).closest(".notice"))})},NoticeWithAttachment:function(b){if(b.find(".attachment").length===0){return}var a=b.find(".attachment.more");if(a.length>0){$(a[0]).click(function(){var c=$(this);c.addClass(SN.C.S.Processing);$.get(c.attr("href")+"/ajax",null,function(d){c.parent(".entry-content").html($(d).find("#attachment_view .entry-content").html())});return false}).attr("title",SN.msg("showmore_tooltip"))}},NoticeDataAttach:function(){NDA=$("#"+SN.C.S.NoticeDataAttach);NDA.change(function(){S='<div id="'+SN.C.S.NoticeDataAttachSelected+'" class="'+SN.C.S.Success+'"><code>'+$(this).val()+'</code> <button class="close">&#215;</button></div>';NDAS=$("#"+SN.C.S.NoticeDataAttachSelected);if(NDAS.length>0){NDAS.replaceWith(S)}else{$("#"+SN.C.S.FormNotice).append(S)}$("#"+SN.C.S.NoticeDataAttachSelected+" button").click(function(){$("#"+SN.C.S.NoticeDataAttachSelected).remove();NDA.val("");return false});if(typeof this.files=="object"){for(var a=0;a<this.files.length;a++){SN.U.PreviewAttach(this.files[a])}}})},PreviewAttach:function(c){var d=c.type+" "+Math.round(c.size/1024)+"KB";var e=true;var g;if(typeof window.createObjectURL!="undefined"){g=function(h,i){i(window.createObjectURL(h))}}else{if(typeof window.FileReader!="undefined"){g=function(i,j){var h=new FileReader();h.onload=function(k){j(h.result)};h.readAsDataURL(i)}}else{e=false}}var a=["image/png","image/jpeg","image/gif","image/svg+xml"];if($.inArray(c.type,a)==-1){e=false}var f=8*1024*1024;if(c.size>f){e=false}if(e){g(c,function(i){var h=$("<img>").attr("title",d).attr("alt",d).attr("src",i).attr("style","height: 120px");$("#"+SN.C.S.NoticeDataAttachSelected).append(h)})}else{var b=$("<div></div>").text(d);$("#"+SN.C.S.NoticeDataAttachSelected).append(b)}},NoticeLocationAttach:function(){var c=$("#"+SN.C.S.NoticeLat).val();var h=$("#"+SN.C.S.NoticeLon).val();var d=$("#"+SN.C.S.NoticeLocationNs).val();var i=$("#"+SN.C.S.NoticeLocationId).val();var a=$("#"+SN.C.S.NoticeGeoName).text();var b=$("#"+SN.C.S.NoticeDataGeo);function e(){$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",jQuery.trim($("label[for="+SN.C.S.NoticeDataGeo+"]").text())).removeClass("checked");$("#"+SN.C.S.NoticeLat).val("");$("#"+SN.C.S.NoticeLon).val("");$("#"+SN.C.S.NoticeLocationNs).val("");$("#"+SN.C.S.NoticeLocationId).val("");$("#"+SN.C.S.NoticeDataGeo).attr("checked",false);$.cookie(SN.C.S.NoticeDataGeoCookie,"disabled",{path:"/"})}function j(k,l){$.getJSON(k,l,function(m){var n,o;if(typeof(m.location_ns)!="undefined"){$("#"+SN.C.S.NoticeLocationNs).val(m.location_ns);n=m.location_ns}if(typeof(m.location_id)!="undefined"){$("#"+SN.C.S.NoticeLocationId).val(m.location_id);o=m.location_id}if(typeof(m.name)=="undefined"){NLN_text=l.lat+";"+l.lon}else{NLN_text=m.name}$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",NoticeDataGeo_text.ShareDisable+" ("+NLN_text+")");$("#"+SN.C.S.NoticeLat).val(l.lat);$("#"+SN.C.S.NoticeLon).val(l.lon);$("#"+SN.C.S.NoticeLocationNs).val(n);$("#"+SN.C.S.NoticeLocationId).val(o);$("#"+SN.C.S.NoticeDataGeo).attr("checked",true);var p={NLat:l.lat,NLon:l.lon,NLNS:n,NLID:o,NLN:NLN_text,NLNU:m.url,NDG:true};$.cookie(SN.C.S.NoticeDataGeoCookie,JSON.stringify(p),{path:"/"})})}if(b.length>0){if($.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){b.attr("checked",false)}else{b.attr("checked",true)}var f=$("#notice_data-geo_wrap");var g=f.attr("title");f.removeAttr("title");$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",jQuery.trim($("label[for="+SN.C.S.NoticeDataGeo+"]").text()));b.change(function(){if($("#"+SN.C.S.NoticeDataGeo).attr("checked")===true||$.cookie(SN.C.S.NoticeDataGeoCookie)===null){$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",NoticeDataGeo_text.ShareDisable).addClass("checked");if($.cookie(SN.C.S.NoticeDataGeoCookie)===null||$.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){if(navigator.geolocation){navigator.geolocation.getCurrentPosition(function(m){$("#"+SN.C.S.NoticeLat).val(m.coords.latitude);$("#"+SN.C.S.NoticeLon).val(m.coords.longitude);var n={lat:m.coords.latitude,lon:m.coords.longitude,token:$("#token").val()};j(g,n)},function(m){switch(m.code){case m.PERMISSION_DENIED:e();break;case m.TIMEOUT:$("#"+SN.C.S.NoticeDataGeo).attr("checked",false);break}},{timeout:10000})}else{if(c.length>0&&h.length>0){var k={lat:c,lon:h,token:$("#token").val()};j(g,k)}else{e();$("#"+SN.C.S.NoticeDataGeo).remove();$("label[for="+SN.C.S.NoticeDataGeo+"]").remove()}}}else{var l=JSON.parse($.cookie(SN.C.S.NoticeDataGeoCookie));$("#"+SN.C.S.NoticeLat).val(l.NLat);$("#"+SN.C.S.NoticeLon).val(l.NLon);$("#"+SN.C.S.NoticeLocationNs).val(l.NLNS);$("#"+SN.C.S.NoticeLocationId).val(l.NLID);$("#"+SN.C.S.NoticeDataGeo).attr("checked",l.NDG);$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",NoticeDataGeo_text.ShareDisable+" ("+l.NLN+")").addClass("checked")}}else{e()}}).change()}},NewDirectMessage:function(){NDM=$(".entity_send-a-message a");NDM.attr({href:NDM.attr("href")+"&ajax=1"});NDM.bind("click",function(){var a=$(".entity_send-a-message form");if(a.length===0){$(this).addClass(SN.C.S.Processing);$.get(NDM.attr("href"),null,function(b){$(".entity_send-a-message").append(document._importNode($("form",b)[0],true));a=$(".entity_send-a-message .form_notice");SN.U.FormNoticeXHR(a);SN.U.FormNoticeEnhancements(a);a.append('<button class="close">&#215;</button>');$(".entity_send-a-message button").click(function(){a.hide();return false});NDM.removeClass(SN.C.S.Processing)})}else{a.show();$(".entity_send-a-message textarea").focus()}return false})},GetFullYear:function(c,d,a){var b=new Date();b.setFullYear(c,d,a);return b},StatusNetInstance:{Set:function(b){var a=SN.U.StatusNetInstance.Get();if(a!==null){b=$.extend(a,b)}$.cookie(SN.C.S.StatusNetInstance,JSON.stringify(b),{path:"/",expires:SN.U.GetFullYear(2029,0,1)})},Get:function(){var a=$.cookie(SN.C.S.StatusNetInstance);if(a!==null){return JSON.parse(a)}return null},Delete:function(){$.cookie(SN.C.S.StatusNetInstance,null)}},belongsOnTimeline:function(b){var a=$("body").attr("id");if(a=="public"){return true}var c=$("#nav_profile a").attr("href");if(c){var d=$(b).find(".entry-title .author a.url").attr("href");if(d==c){if(a=="all"||a=="showstream"){return true}}}return false}},Init:{NoticeForm:function(){if($("body.user_in").length>0){SN.U.NoticeLocationAttach();$("."+SN.C.S.FormNotice).each(function(){SN.U.FormNoticeXHR($(this));SN.U.FormNoticeEnhancements($(this))});SN.U.NoticeDataAttach()}},Notices:function(){if($("body.user_in").length>0){SN.U.NoticeFavor();SN.U.NoticeRepeat();SN.U.NoticeReply();SN.U.NoticeInlineReplySetup()}SN.U.NoticeAttachments()},EntityActions:function(){if($("body.user_in").length>0){$(".form_user_subscribe").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_user_unsubscribe").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_group_join").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_group_leave").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_user_nudge").live("click",function(){SN.U.FormXHR($(this));return false});SN.U.NewDirectMessage()}},Login:function(){if(SN.U.StatusNetInstance.Get()!==null){var a=SN.U.StatusNetInstance.Get().Nickname;if(a!==null){$("#form_login #nickname").val(a)}}$("#form_login").bind("submit",function(){SN.U.StatusNetInstance.Set({Nickname:$("#form_login #nickname").val()});return true})}}};$(document).ready(function(){if($("."+SN.C.S.FormNotice).length>0){SN.Init.NoticeForm()}if($("#content .notices").length>0){SN.Init.Notices()}if($("#content .entity_actions").length>0){SN.Init.EntityActions()}if($("#form_login").length>0){SN.Init.Login()}});if(!document.ELEMENT_NODE){document.ELEMENT_NODE=1;document.ATTRIBUTE_NODE=2;document.TEXT_NODE=3;document.CDATA_SECTION_NODE=4;document.ENTITY_REFERENCE_NODE=5;document.ENTITY_NODE=6;document.PROCESSING_INSTRUCTION_NODE=7;document.COMMENT_NODE=8;document.DOCUMENT_NODE=9;document.DOCUMENT_TYPE_NODE=10;document.DOCUMENT_FRAGMENT_NODE=11;document.NOTATION_NODE=12}document._importNode=function(e,a){switch(e.nodeType){case document.ELEMENT_NODE:var d=document.createElement(e.nodeName);if(e.attributes&&e.attributes.length>0){for(var c=0,b=e.attributes.length;c<b;){if(e.attributes[c].nodeName=="class"){d.className=e.getAttribute(e.attributes[c++].nodeName)}else{d.setAttribute(e.attributes[c].nodeName,e.getAttribute(e.attributes[c++].nodeName))}}}if(a&&e.childNodes&&e.childNodes.length>0){for(var c=0,b=e.childNodes.length;c<b;){d.appendChild(document._importNode(e.childNodes[c++],a))}}return d;break;case document.TEXT_NODE:case document.CDATA_SECTION_NODE:case document.COMMENT_NODE:return document.createTextNode(e.nodeValue);break}};if(typeof navigator.geolocation=="undefined"||navigator.geolocation.shim){(function(){(function(){if(window.google&&google.gears){return}var c=null;if(typeof GearsFactory!="undefined"){c=new GearsFactory()}else{try{c=new ActiveXObject("Gears.Factory");if(c.getBuildInfo().indexOf("ie_mobile")!=-1){c.privateSetGlobalObject(this)}}catch(d){if((typeof navigator.mimeTypes!="undefined")&&navigator.mimeTypes["application/x-googlegears"]){c=document.createElement("object");c.style.display="none";c.width=0;c.height=0;c.type="application/x-googlegears";document.documentElement.appendChild(c)}}}if(!c){return}if(!window.google){google={}}if(!google.gears){google.gears={factory:c}}})();var a=(function(){var d=google.gears.factory.create("beta.geolocation");var c=function(f,e){return function(g){f(g);e.lastPosition=g}};return{shim:true,type:"Gears",lastPosition:null,getCurrentPosition:function(e,g,h){var f=this;var i=c(e,f);d.getCurrentPosition(i,g,h)},watchPosition:function(e,f,g){d.watchPosition(e,f,g)},clearWatch:function(e){d.clearWatch(e)},getPermission:function(g,e,f){d.getPermission(g,e,f)}}});var b=(function(){var i=false;var e=function(){if(!d()&&!i){i=true;var j=document.createElement("script");j.src=(document.location.protocol=="https:"?"https://":"http://")+"www.google.com/jsapi?callback=_google_loader_apiLoaded";j.type="text/javascript";document.getElementsByTagName("body")[0].appendChild(j)}};var c=[];var h=function(j){c.push(j)};var f=function(){if(d()){while(c.length>0){var j=c.pop();j()}}};window._google_loader_apiLoaded=function(){f()};var d=function(){return(window.google&&google.loader)};var g=function(j){if(d()){return true}h(j);e();return false};e();return{shim:true,type:"ClientLocation",lastPosition:null,getCurrentPosition:function(k,n,o){var m=this;if(!g(function(){m.getCurrentPosition(k,n,o)})){return}if(google.loader.ClientLocation){var l=google.loader.ClientLocation;var j={coords:{latitude:l.latitude,longitude:l.longitude,altitude:null,accuracy:43000,altitudeAccuracy:null,heading:null,speed:null},address:{city:l.address.city,country:l.address.country,country_code:l.address.country_code,region:l.address.region},timestamp:new Date()};k(j);this.lastPosition=j}else{if(n==="function"){n({code:3,message:"Using the Google ClientLocation API and it is not able to calculate a location."})}}},watchPosition:function(j,l,m){this.getCurrentPosition(j,l,m);var k=this;var n=setInterval(function(){k.getCurrentPosition(j,l,m)},10000);return n},clearWatch:function(j){clearInterval(j)},getPermission:function(l,j,k){return true}}});navigator.geolocation=(window.google&&google.gears)?a():b()})()};
\ No newline at end of file
+var SN={C:{I:{CounterBlackout:false,MaxLength:140,PatternUsername:/^[0-9a-zA-Z\-_.]*$/,HTTP20x30x:[200,201,202,203,204,205,206,300,301,302,303,304,305,306,307]},S:{Disabled:"disabled",Warning:"warning",Error:"error",Success:"success",Processing:"processing",CommandResult:"command_result",FormNotice:"form_notice",NoticeDataText:"notice_data-text",NoticeTextCount:"notice_text-count",NoticeInReplyTo:"notice_in-reply-to",NoticeDataAttach:"notice_data-attach",NoticeDataAttachSelected:"notice_data-attach_selected",NoticeActionSubmit:"notice_action-submit",NoticeLat:"notice_data-lat",NoticeLon:"notice_data-lon",NoticeLocationId:"notice_data-location_id",NoticeLocationNs:"notice_data-location_ns",NoticeGeoName:"notice_data-geo_name",NoticeDataGeo:"notice_data-geo",NoticeDataGeoCookie:"NoticeDataGeo",NoticeDataGeoSelected:"notice_data-geo_selected",StatusNetInstance:"StatusNetInstance"}},messages:{},msg:function(a){if(typeof SN.messages[a]=="undefined"){return"["+a+"]"}else{return SN.messages[a]}},U:{FormNoticeEnhancements:function(b){if(jQuery.data(b[0],"ElementData")===undefined){MaxLength=b.find("#"+SN.C.S.NoticeTextCount).text();if(typeof(MaxLength)=="undefined"){MaxLength=SN.C.I.MaxLength}jQuery.data(b[0],"ElementData",{MaxLength:MaxLength});SN.U.Counter(b);NDT=b.find("#"+SN.C.S.NoticeDataText);NDT.bind("keyup",function(c){SN.U.Counter(b)});var a=function(c){window.setTimeout(function(){SN.U.Counter(b)},50)};NDT.bind("cut",a).bind("paste",a);NDT.bind("keydown",function(c){SN.U.SubmitOnReturn(c,b)})}else{b.find("#"+SN.C.S.NoticeTextCount).text(jQuery.data(b[0],"ElementData").MaxLength)}if($("body")[0].id!="conversation"&&window.location.hash.length===0&&$(window).scrollTop()==0){b.find("textarea").focus()}},SubmitOnReturn:function(b,a){if(b.keyCode==13||b.keyCode==10){a.submit();b.preventDefault();b.stopPropagation();$("#"+a[0].id+" #"+SN.C.S.NoticeDataText).blur();$("body").focus();return false}return true},Counter:function(d){SN.C.I.FormNoticeCurrent=d;var b=jQuery.data(d[0],"ElementData").MaxLength;if(b<=0){return}var c=b-SN.U.CharacterCount(d);var a=d.find("#"+SN.C.S.NoticeTextCount);if(c.toString()!=a.text()){if(!SN.C.I.CounterBlackout||c===0){if(a.text()!=String(c)){a.text(c)}if(c<0){d.addClass(SN.C.S.Warning)}else{d.removeClass(SN.C.S.Warning)}if(!SN.C.I.CounterBlackout){SN.C.I.CounterBlackout=true;SN.C.I.FormNoticeCurrent=d;window.setTimeout("SN.U.ClearCounterBlackout(SN.C.I.FormNoticeCurrent);",500)}}}},CharacterCount:function(a){return a.find("#"+SN.C.S.NoticeDataText).val().length},ClearCounterBlackout:function(a){SN.C.I.CounterBlackout=false;SN.U.Counter(a)},RewriteAjaxAction:function(a){if(document.location.protocol=="https:"&&a.substr(0,5)=="http:"){return a.replace(/^http:\/\/[^:\/]+/,"https://"+document.location.host)}else{return a}},FormXHR:function(a){$.ajax({type:"POST",dataType:"xml",url:SN.U.RewriteAjaxAction(a.attr("action")),data:a.serialize()+"&ajax=1",beforeSend:function(b){a.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(c,d,b){alert(b||d)},success:function(b,c){if(typeof($("form",b)[0])!="undefined"){form_new=document._importNode($("form",b)[0],true);a.replaceWith(form_new)}else{a.replaceWith(document._importNode($("p",b)[0],true))}}})},FormNoticeXHR:function(b){SN.C.I.NoticeDataGeo={};b.append('<input type="hidden" name="ajax" value="1"/>');b.attr("action",SN.U.RewriteAjaxAction(b.attr("action")));var c=function(d,e){b.append($('<p class="form_response"></p>').addClass(d).text(e))};var a=function(){b.find(".form_response").remove()};b.ajaxForm({dataType:"xml",timeout:"60000",beforeSend:function(d){if(b.find("#"+SN.C.S.NoticeDataText)[0].value.length===0){b.addClass(SN.C.S.Warning);return false}b.addClass(SN.C.S.Processing).find("#"+SN.C.S.NoticeActionSubmit).addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled);SN.C.I.NoticeDataGeo.NLat=$("#"+SN.C.S.NoticeLat).val();SN.C.I.NoticeDataGeo.NLon=$("#"+SN.C.S.NoticeLon).val();SN.C.I.NoticeDataGeo.NLNS=$("#"+SN.C.S.NoticeLocationNs).val();SN.C.I.NoticeDataGeo.NLID=$("#"+SN.C.S.NoticeLocationId).val();SN.C.I.NoticeDataGeo.NDG=$("#"+SN.C.S.NoticeDataGeo).attr("checked");cookieValue=$.cookie(SN.C.S.NoticeDataGeoCookie);if(cookieValue!==null&&cookieValue!="disabled"){cookieValue=JSON.parse(cookieValue);SN.C.I.NoticeDataGeo.NLat=$("#"+SN.C.S.NoticeLat).val(cookieValue.NLat).val();SN.C.I.NoticeDataGeo.NLon=$("#"+SN.C.S.NoticeLon).val(cookieValue.NLon).val();if($("#"+SN.C.S.NoticeLocationNs).val(cookieValue.NLNS)){SN.C.I.NoticeDataGeo.NLNS=$("#"+SN.C.S.NoticeLocationNs).val(cookieValue.NLNS).val();SN.C.I.NoticeDataGeo.NLID=$("#"+SN.C.S.NoticeLocationId).val(cookieValue.NLID).val()}}if(cookieValue=="disabled"){SN.C.I.NoticeDataGeo.NDG=$("#"+SN.C.S.NoticeDataGeo).attr("checked",false).attr("checked")}else{SN.C.I.NoticeDataGeo.NDG=$("#"+SN.C.S.NoticeDataGeo).attr("checked",true).attr("checked")}return true},error:function(f,g,e){b.removeClass(SN.C.S.Processing).find("#"+SN.C.S.NoticeActionSubmit).removeClass(SN.C.S.Disabled).removeAttr(SN.C.S.Disabled,SN.C.S.Disabled);a();if(g=="timeout"){c("error","Sorry! We had trouble sending your notice. The servers are overloaded. Please try again, and contact the site administrator if this problem persists.")}else{var d=SN.U.GetResponseXML(f);if($("."+SN.C.S.Error,d).length>0){b.append(document._importNode($("."+SN.C.S.Error,d)[0],true))}else{if(parseInt(f.status)===0||jQuery.inArray(parseInt(f.status),SN.C.I.HTTP20x30x)>=0){b.resetForm().find("#"+SN.C.S.NoticeDataAttachSelected).remove();SN.U.FormNoticeEnhancements(b)}else{c("error","(Sorry! We had trouble sending your notice ("+f.status+" "+f.statusText+"). Please report the problem to the site administrator if this happens again.")}}}},success:function(i,k){a();var e=$("#"+SN.C.S.Error,i);if(e.length>0){c("error",e.text())}else{if($("body")[0].id=="bookmarklet"){self.close()}var d=$("#"+SN.C.S.CommandResult,i);if(d.length>0){c("success",d.text())}else{var h=document._importNode($("li",i)[0],true);var j=$("#notices_primary .notices");if(j.length>0&&SN.U.belongsOnTimeline(h)){if($("#"+h.id).length===0){var f=$("#"+SN.C.S.NoticeInReplyTo).val();var g="#notices_primary #notice-"+f;if($("body")[0].id=="conversation"){if(f.length>0&&$(g+" .notices").length<1){$(g).append('<ul class="notices"></ul>')}$($(g+" .notices")[0]).append(h)}else{j.prepend(h)}$("#"+h.id).css({display:"none"}).fadeIn(2500);SN.U.NoticeWithAttachment($("#"+h.id));SN.U.NoticeReplyTo($("#"+h.id))}}else{c("success",$("title",i).text())}}b.resetForm();b.find("#"+SN.C.S.NoticeInReplyTo).val("");b.find("#"+SN.C.S.NoticeDataAttachSelected).remove();SN.U.FormNoticeEnhancements(b)}},complete:function(d,e){b.removeClass(SN.C.S.Processing).find("#"+SN.C.S.NoticeActionSubmit).removeAttr(SN.C.S.Disabled).removeClass(SN.C.S.Disabled);$("#"+SN.C.S.NoticeLat).val(SN.C.I.NoticeDataGeo.NLat);$("#"+SN.C.S.NoticeLon).val(SN.C.I.NoticeDataGeo.NLon);if($("#"+SN.C.S.NoticeLocationNs)){$("#"+SN.C.S.NoticeLocationNs).val(SN.C.I.NoticeDataGeo.NLNS);$("#"+SN.C.S.NoticeLocationId).val(SN.C.I.NoticeDataGeo.NLID)}$("#"+SN.C.S.NoticeDataGeo).attr("checked",SN.C.I.NoticeDataGeo.NDG)}})},GetResponseXML:function(b){try{return b.responseXML}catch(a){return(new DOMParser()).parseFromString(b.responseText,"text/xml")}},NoticeReply:function(){if($("#"+SN.C.S.NoticeDataText).length>0&&$("#content .notice_reply").length>0){$("#content .notice").each(function(){SN.U.NoticeReplyTo($(this))})}},NoticeReplyTo:function(a){a.find(".notice_reply").live("click",function(c){c.preventDefault();var b=($(".author .nickname",a).length>0)?$($(".author .nickname",a)[0]):$(".author .nickname.uid");var d=$($(".notice_id",a)[0]).text();SN.U.NoticeInlineReplyTrigger(d,"@"+b.text());return false})},NoticeInlineReplyTrigger:function(b,h){var g=$("#notice-"+b),c=g;var e=g.closest(".notices");if(e.hasClass("threaded-notices")){c=e.closest("notice")}else{e=$("ul.threaded-notices",g);if(e.length==0){e=$('<ul class="notices threaded-notices xoxo"></ul>');g.append(e)}}var j=$(".notice-reply-form",e);if(j.length==0){$("li.notice-reply-placeholder").remove();var f=$("li.notice-reply",e);if(f.length==0){f=$('<li class="notice-reply"><form class="notice-reply-form" method="post"><textarea name="status_textarea"></textarea><div class="controls"><input type="hidden" name="token"><input type="hidden" name="inreplyto"><input type="submit" class="submit"></div></form></li>');j=f.find("form");j.attr("src","/mublog/newnotice");j.find('input[type="submit"]').val(SN.msg("reply_submit"));if(h){j.find("textarea").val(h+" ")}e.append(f)}}j.find("input[name=inreplyto]").val(b);var i=j.find("textarea");if(i.length==0){throw"No textarea"}if(h){var a=h+" ";i.val(a+i.val().replace(RegExp(a,"i"),""))}i.focus();if(i[0].setSelectionRange){var d=i.val().length;i[0].setSelectionRange(d,d)}},NoticeReplySet:function(b,d){if(b.match(SN.C.I.PatternUsername)){var c=$("#"+SN.C.S.NoticeDataText);if(c.length>0){replyto="@"+b+" ";c.val(replyto+c.val().replace(RegExp(replyto,"i"),""));$("#"+SN.C.S.FormNotice+" #"+SN.C.S.NoticeInReplyTo).val(d);c[0].focus();if(c[0].setSelectionRange){var a=c.val().length;c[0].setSelectionRange(a,a)}}}},NoticeFavor:function(){$(".form_favor").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_disfavor").live("click",function(){SN.U.FormXHR($(this));return false})},NoticeInlineReplyPlaceholder:function(b){var d=$($(".notice_id",b)[0]).text();var a=b.find("ul.threaded-notices");var c=$('<li class="notice-reply-placeholder"><input class="placeholder"></li>');c.click(function(){SN.U.NoticeInlineReplyTrigger(d)});c.find("input").val(SN.msg("reply_comment"));a.append(c)},NoticeInlineReplySetup:function(){$(".threaded-notices").each(function(){var b=$(this);var a=b.closest(".notice");SN.U.NoticeInlineReplyPlaceholder(a)});$(".replyform").live("submit",function(b){var a=$(this);$.ajax({type:"POST",dataType:"xml",url:SN.U.RewriteAjaxAction(a.attr("action")),data:a.serialize()+"&ajax=1",beforeSend:function(c){a.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled).end().find("textarea").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(d,e,c){alert(c||e)},success:function(c,d){if(typeof($("form",c)[0])!="undefined"){form_new=document._importNode($("form",c)[0],true);a.replaceWith(form_new)}else{a.replaceWith(document._importNode($("p",c)[0],true))}}});b.preventDefault();return false})},NoticeRepeat:function(){$(".form_repeat").live("click",function(a){a.preventDefault();SN.U.NoticeRepeatConfirmation($(this));return false})},NoticeRepeatConfirmation:function(a){var c=a.find(".submit");var b=c.clone();b.addClass("submit_dialogbox").removeClass("submit");a.append(b);b.bind("click",function(){SN.U.FormXHR(a);return false});c.hide();a.addClass("dialogbox").append('<button class="close">&#215;</button>').closest(".notice-options").addClass("opaque");a.find("button.close").click(function(){$(this).remove();a.removeClass("dialogbox").closest(".notice-options").removeClass("opaque");a.find(".submit_dialogbox").remove();a.find(".submit").show();return false})},NoticeAttachments:function(){$(".notice a.attachment").each(function(){SN.U.NoticeWithAttachment($(this).closest(".notice"))})},NoticeWithAttachment:function(b){if(b.find(".attachment").length===0){return}var a=b.find(".attachment.more");if(a.length>0){$(a[0]).click(function(){var c=$(this);c.addClass(SN.C.S.Processing);$.get(c.attr("href")+"/ajax",null,function(d){c.parent(".entry-content").html($(d).find("#attachment_view .entry-content").html())});return false}).attr("title",SN.msg("showmore_tooltip"))}},NoticeDataAttach:function(){NDA=$("#"+SN.C.S.NoticeDataAttach);NDA.change(function(){S='<div id="'+SN.C.S.NoticeDataAttachSelected+'" class="'+SN.C.S.Success+'"><code>'+$(this).val()+'</code> <button class="close">&#215;</button></div>';NDAS=$("#"+SN.C.S.NoticeDataAttachSelected);if(NDAS.length>0){NDAS.replaceWith(S)}else{$("#"+SN.C.S.FormNotice).append(S)}$("#"+SN.C.S.NoticeDataAttachSelected+" button").click(function(){$("#"+SN.C.S.NoticeDataAttachSelected).remove();NDA.val("");return false});if(typeof this.files=="object"){for(var a=0;a<this.files.length;a++){SN.U.PreviewAttach(this.files[a])}}})},PreviewAttach:function(c){var d=c.type+" "+Math.round(c.size/1024)+"KB";var e=true;var g;if(typeof window.createObjectURL!="undefined"){g=function(h,i){i(window.createObjectURL(h))}}else{if(typeof window.FileReader!="undefined"){g=function(i,j){var h=new FileReader();h.onload=function(k){j(h.result)};h.readAsDataURL(i)}}else{e=false}}var a=["image/png","image/jpeg","image/gif","image/svg+xml"];if($.inArray(c.type,a)==-1){e=false}var f=8*1024*1024;if(c.size>f){e=false}if(e){g(c,function(i){var h=$("<img>").attr("title",d).attr("alt",d).attr("src",i).attr("style","height: 120px");$("#"+SN.C.S.NoticeDataAttachSelected).append(h)})}else{var b=$("<div></div>").text(d);$("#"+SN.C.S.NoticeDataAttachSelected).append(b)}},NoticeLocationAttach:function(){var c=$("#"+SN.C.S.NoticeLat).val();var h=$("#"+SN.C.S.NoticeLon).val();var d=$("#"+SN.C.S.NoticeLocationNs).val();var i=$("#"+SN.C.S.NoticeLocationId).val();var a=$("#"+SN.C.S.NoticeGeoName).text();var b=$("#"+SN.C.S.NoticeDataGeo);function e(){$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",jQuery.trim($("label[for="+SN.C.S.NoticeDataGeo+"]").text())).removeClass("checked");$("#"+SN.C.S.NoticeLat).val("");$("#"+SN.C.S.NoticeLon).val("");$("#"+SN.C.S.NoticeLocationNs).val("");$("#"+SN.C.S.NoticeLocationId).val("");$("#"+SN.C.S.NoticeDataGeo).attr("checked",false);$.cookie(SN.C.S.NoticeDataGeoCookie,"disabled",{path:"/"})}function j(k,l){$.getJSON(k,l,function(m){var n,o;if(typeof(m.location_ns)!="undefined"){$("#"+SN.C.S.NoticeLocationNs).val(m.location_ns);n=m.location_ns}if(typeof(m.location_id)!="undefined"){$("#"+SN.C.S.NoticeLocationId).val(m.location_id);o=m.location_id}if(typeof(m.name)=="undefined"){NLN_text=l.lat+";"+l.lon}else{NLN_text=m.name}$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",NoticeDataGeo_text.ShareDisable+" ("+NLN_text+")");$("#"+SN.C.S.NoticeLat).val(l.lat);$("#"+SN.C.S.NoticeLon).val(l.lon);$("#"+SN.C.S.NoticeLocationNs).val(n);$("#"+SN.C.S.NoticeLocationId).val(o);$("#"+SN.C.S.NoticeDataGeo).attr("checked",true);var p={NLat:l.lat,NLon:l.lon,NLNS:n,NLID:o,NLN:NLN_text,NLNU:m.url,NDG:true};$.cookie(SN.C.S.NoticeDataGeoCookie,JSON.stringify(p),{path:"/"})})}if(b.length>0){if($.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){b.attr("checked",false)}else{b.attr("checked",true)}var f=$("#notice_data-geo_wrap");var g=f.attr("title");f.removeAttr("title");$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",jQuery.trim($("label[for="+SN.C.S.NoticeDataGeo+"]").text()));b.change(function(){if($("#"+SN.C.S.NoticeDataGeo).attr("checked")===true||$.cookie(SN.C.S.NoticeDataGeoCookie)===null){$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",NoticeDataGeo_text.ShareDisable).addClass("checked");if($.cookie(SN.C.S.NoticeDataGeoCookie)===null||$.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){if(navigator.geolocation){navigator.geolocation.getCurrentPosition(function(m){$("#"+SN.C.S.NoticeLat).val(m.coords.latitude);$("#"+SN.C.S.NoticeLon).val(m.coords.longitude);var n={lat:m.coords.latitude,lon:m.coords.longitude,token:$("#token").val()};j(g,n)},function(m){switch(m.code){case m.PERMISSION_DENIED:e();break;case m.TIMEOUT:$("#"+SN.C.S.NoticeDataGeo).attr("checked",false);break}},{timeout:10000})}else{if(c.length>0&&h.length>0){var k={lat:c,lon:h,token:$("#token").val()};j(g,k)}else{e();$("#"+SN.C.S.NoticeDataGeo).remove();$("label[for="+SN.C.S.NoticeDataGeo+"]").remove()}}}else{var l=JSON.parse($.cookie(SN.C.S.NoticeDataGeoCookie));$("#"+SN.C.S.NoticeLat).val(l.NLat);$("#"+SN.C.S.NoticeLon).val(l.NLon);$("#"+SN.C.S.NoticeLocationNs).val(l.NLNS);$("#"+SN.C.S.NoticeLocationId).val(l.NLID);$("#"+SN.C.S.NoticeDataGeo).attr("checked",l.NDG);$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",NoticeDataGeo_text.ShareDisable+" ("+l.NLN+")").addClass("checked")}}else{e()}}).change()}},NewDirectMessage:function(){NDM=$(".entity_send-a-message a");NDM.attr({href:NDM.attr("href")+"&ajax=1"});NDM.bind("click",function(){var a=$(".entity_send-a-message form");if(a.length===0){$(this).addClass(SN.C.S.Processing);$.get(NDM.attr("href"),null,function(b){$(".entity_send-a-message").append(document._importNode($("form",b)[0],true));a=$(".entity_send-a-message .form_notice");SN.U.FormNoticeXHR(a);SN.U.FormNoticeEnhancements(a);a.append('<button class="close">&#215;</button>');$(".entity_send-a-message button").click(function(){a.hide();return false});NDM.removeClass(SN.C.S.Processing)})}else{a.show();$(".entity_send-a-message textarea").focus()}return false})},GetFullYear:function(c,d,a){var b=new Date();b.setFullYear(c,d,a);return b},StatusNetInstance:{Set:function(b){var a=SN.U.StatusNetInstance.Get();if(a!==null){b=$.extend(a,b)}$.cookie(SN.C.S.StatusNetInstance,JSON.stringify(b),{path:"/",expires:SN.U.GetFullYear(2029,0,1)})},Get:function(){var a=$.cookie(SN.C.S.StatusNetInstance);if(a!==null){return JSON.parse(a)}return null},Delete:function(){$.cookie(SN.C.S.StatusNetInstance,null)}},belongsOnTimeline:function(b){var a=$("body").attr("id");if(a=="public"){return true}var c=$("#nav_profile a").attr("href");if(c){var d=$(b).find(".entry-title .author a.url").attr("href");if(d==c){if(a=="all"||a=="showstream"){return true}}}return false}},Init:{NoticeForm:function(){if($("body.user_in").length>0){SN.U.NoticeLocationAttach();$("."+SN.C.S.FormNotice).each(function(){SN.U.FormNoticeXHR($(this));SN.U.FormNoticeEnhancements($(this))});SN.U.NoticeDataAttach()}},Notices:function(){if($("body.user_in").length>0){SN.U.NoticeFavor();SN.U.NoticeRepeat();SN.U.NoticeReply();SN.U.NoticeInlineReplySetup()}SN.U.NoticeAttachments()},EntityActions:function(){if($("body.user_in").length>0){$(".form_user_subscribe").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_user_unsubscribe").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_group_join").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_group_leave").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_user_nudge").live("click",function(){SN.U.FormXHR($(this));return false});SN.U.NewDirectMessage()}},Login:function(){if(SN.U.StatusNetInstance.Get()!==null){var a=SN.U.StatusNetInstance.Get().Nickname;if(a!==null){$("#form_login #nickname").val(a)}}$("#form_login").bind("submit",function(){SN.U.StatusNetInstance.Set({Nickname:$("#form_login #nickname").val()});return true})}}};$(document).ready(function(){if($("."+SN.C.S.FormNotice).length>0){SN.Init.NoticeForm()}if($("#content .notices").length>0){SN.Init.Notices()}if($("#content .entity_actions").length>0){SN.Init.EntityActions()}if($("#form_login").length>0){SN.Init.Login()}});if(!document.ELEMENT_NODE){document.ELEMENT_NODE=1;document.ATTRIBUTE_NODE=2;document.TEXT_NODE=3;document.CDATA_SECTION_NODE=4;document.ENTITY_REFERENCE_NODE=5;document.ENTITY_NODE=6;document.PROCESSING_INSTRUCTION_NODE=7;document.COMMENT_NODE=8;document.DOCUMENT_NODE=9;document.DOCUMENT_TYPE_NODE=10;document.DOCUMENT_FRAGMENT_NODE=11;document.NOTATION_NODE=12}document._importNode=function(e,a){switch(e.nodeType){case document.ELEMENT_NODE:var d=document.createElement(e.nodeName);if(e.attributes&&e.attributes.length>0){for(var c=0,b=e.attributes.length;c<b;){if(e.attributes[c].nodeName=="class"){d.className=e.getAttribute(e.attributes[c++].nodeName)}else{d.setAttribute(e.attributes[c].nodeName,e.getAttribute(e.attributes[c++].nodeName))}}}if(a&&e.childNodes&&e.childNodes.length>0){for(var c=0,b=e.childNodes.length;c<b;){d.appendChild(document._importNode(e.childNodes[c++],a))}}return d;break;case document.TEXT_NODE:case document.CDATA_SECTION_NODE:case document.COMMENT_NODE:return document.createTextNode(e.nodeValue);break}};if(typeof navigator.geolocation=="undefined"||navigator.geolocation.shim){(function(){(function(){if(window.google&&google.gears){return}var c=null;if(typeof GearsFactory!="undefined"){c=new GearsFactory()}else{try{c=new ActiveXObject("Gears.Factory");if(c.getBuildInfo().indexOf("ie_mobile")!=-1){c.privateSetGlobalObject(this)}}catch(d){if((typeof navigator.mimeTypes!="undefined")&&navigator.mimeTypes["application/x-googlegears"]){c=document.createElement("object");c.style.display="none";c.width=0;c.height=0;c.type="application/x-googlegears";document.documentElement.appendChild(c)}}}if(!c){return}if(!window.google){google={}}if(!google.gears){google.gears={factory:c}}})();var a=(function(){var d=google.gears.factory.create("beta.geolocation");var c=function(f,e){return function(g){f(g);e.lastPosition=g}};return{shim:true,type:"Gears",lastPosition:null,getCurrentPosition:function(e,g,h){var f=this;var i=c(e,f);d.getCurrentPosition(i,g,h)},watchPosition:function(e,f,g){d.watchPosition(e,f,g)},clearWatch:function(e){d.clearWatch(e)},getPermission:function(g,e,f){d.getPermission(g,e,f)}}});var b=(function(){var i=false;var e=function(){if(!d()&&!i){i=true;var j=document.createElement("script");j.src=(document.location.protocol=="https:"?"https://":"http://")+"www.google.com/jsapi?callback=_google_loader_apiLoaded";j.type="text/javascript";document.getElementsByTagName("body")[0].appendChild(j)}};var c=[];var h=function(j){c.push(j)};var f=function(){if(d()){while(c.length>0){var j=c.pop();j()}}};window._google_loader_apiLoaded=function(){f()};var d=function(){return(window.google&&google.loader)};var g=function(j){if(d()){return true}h(j);e();return false};e();return{shim:true,type:"ClientLocation",lastPosition:null,getCurrentPosition:function(k,n,o){var m=this;if(!g(function(){m.getCurrentPosition(k,n,o)})){return}if(google.loader.ClientLocation){var l=google.loader.ClientLocation;var j={coords:{latitude:l.latitude,longitude:l.longitude,altitude:null,accuracy:43000,altitudeAccuracy:null,heading:null,speed:null},address:{city:l.address.city,country:l.address.country,country_code:l.address.country_code,region:l.address.region},timestamp:new Date()};k(j);this.lastPosition=j}else{if(n==="function"){n({code:3,message:"Using the Google ClientLocation API and it is not able to calculate a location."})}}},watchPosition:function(j,l,m){this.getCurrentPosition(j,l,m);var k=this;var n=setInterval(function(){k.getCurrentPosition(j,l,m)},10000);return n},clearWatch:function(j){clearInterval(j)},getPermission:function(l,j,k){return true}}});navigator.geolocation=(window.google&&google.gears)?a():b()})()};
\ No newline at end of file
diff --git a/lib/action.php b/lib/action.php
index 22daf70d8a..7631d80fe0 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -314,6 +314,9 @@ class Action extends HTMLOutputter // lawsuit
             // TRANS: Inline reply form submit button: submits a reply comment.
             $messages['reply_submit'] = _m('BUTTON', 'Comment');
 
+            // TRANS: Placeholder text for inline reply form. Clicking in this box will turn it into a mini notice form.
+            $messages['reply_comment'] = _m('Add a comment...');
+
             $messages = array_merge($messages, $this->getScriptMessages());
 	    
 	    Event::handle('EndScriptMessages', array($this, &$messages));
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 74f5bb3e30..22f135abb8 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -1124,11 +1124,17 @@ border-top-style:solid;
 .threaded-notices .notice-reply {
     margin: 8px;
 }
-.threaded-notices .notice-reply textarea {
+.threaded-notices .notice-reply textarea,
+.threaded-notices .notice-reply-placeholder input.placeholder {
     margin-left: 0;
     width: 95%;
 }
-.threaded-notices .notice-reply input.submit {
+.threaded-notices .notice-reply-placeholder input.placeholder {
+    color: gray;
+    margin-left: 8px; /* ?? */
+    margin-bottom: 8px;
+}
+.threaded-notices .notice-reply .controls {
     text-align: right;
 }
 

From f109d15c28d30edd8b01cd223ee08d98b8f0e13c Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Mon, 28 Feb 2011 16:24:51 -0800
Subject: [PATCH 319/655] avoid hardcoding action & session token; pull them
 from the main posting form for now

---
 js/util.js     | 8 ++++----
 js/util.min.js | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/js/util.js b/js/util.js
index 19992646e4..f5c909a617 100644
--- a/js/util.js
+++ b/js/util.js
@@ -607,12 +607,12 @@ var SN = { // StatusNet
                                       '</div>' +
                                       '</form>' +
                                   '</li>');
+
+                    var baseForm = $('#form_notice');
                     replyForm = replyItem.find('form');
-                    replyForm.attr('src', '/mublog/newnotice'); // @fixme
+                    replyForm.attr('action', baseForm.attr('action'));
+                    replyForm.find('input[name="token"]').val(baseForm.find('input[name=token]').val());
                     replyForm.find('input[type="submit"]').val(SN.msg('reply_submit'));
-                    if (initialText) {
-                        replyForm.find('textarea').val(initialText + ' ');
-                    }
                     list.append(replyItem);
                 }
             }
diff --git a/js/util.min.js b/js/util.min.js
index d1cdf7acee..1b35871f64 100644
--- a/js/util.min.js
+++ b/js/util.min.js
@@ -1 +1 @@
-var SN={C:{I:{CounterBlackout:false,MaxLength:140,PatternUsername:/^[0-9a-zA-Z\-_.]*$/,HTTP20x30x:[200,201,202,203,204,205,206,300,301,302,303,304,305,306,307]},S:{Disabled:"disabled",Warning:"warning",Error:"error",Success:"success",Processing:"processing",CommandResult:"command_result",FormNotice:"form_notice",NoticeDataText:"notice_data-text",NoticeTextCount:"notice_text-count",NoticeInReplyTo:"notice_in-reply-to",NoticeDataAttach:"notice_data-attach",NoticeDataAttachSelected:"notice_data-attach_selected",NoticeActionSubmit:"notice_action-submit",NoticeLat:"notice_data-lat",NoticeLon:"notice_data-lon",NoticeLocationId:"notice_data-location_id",NoticeLocationNs:"notice_data-location_ns",NoticeGeoName:"notice_data-geo_name",NoticeDataGeo:"notice_data-geo",NoticeDataGeoCookie:"NoticeDataGeo",NoticeDataGeoSelected:"notice_data-geo_selected",StatusNetInstance:"StatusNetInstance"}},messages:{},msg:function(a){if(typeof SN.messages[a]=="undefined"){return"["+a+"]"}else{return SN.messages[a]}},U:{FormNoticeEnhancements:function(b){if(jQuery.data(b[0],"ElementData")===undefined){MaxLength=b.find("#"+SN.C.S.NoticeTextCount).text();if(typeof(MaxLength)=="undefined"){MaxLength=SN.C.I.MaxLength}jQuery.data(b[0],"ElementData",{MaxLength:MaxLength});SN.U.Counter(b);NDT=b.find("#"+SN.C.S.NoticeDataText);NDT.bind("keyup",function(c){SN.U.Counter(b)});var a=function(c){window.setTimeout(function(){SN.U.Counter(b)},50)};NDT.bind("cut",a).bind("paste",a);NDT.bind("keydown",function(c){SN.U.SubmitOnReturn(c,b)})}else{b.find("#"+SN.C.S.NoticeTextCount).text(jQuery.data(b[0],"ElementData").MaxLength)}if($("body")[0].id!="conversation"&&window.location.hash.length===0&&$(window).scrollTop()==0){b.find("textarea").focus()}},SubmitOnReturn:function(b,a){if(b.keyCode==13||b.keyCode==10){a.submit();b.preventDefault();b.stopPropagation();$("#"+a[0].id+" #"+SN.C.S.NoticeDataText).blur();$("body").focus();return false}return true},Counter:function(d){SN.C.I.FormNoticeCurrent=d;var b=jQuery.data(d[0],"ElementData").MaxLength;if(b<=0){return}var c=b-SN.U.CharacterCount(d);var a=d.find("#"+SN.C.S.NoticeTextCount);if(c.toString()!=a.text()){if(!SN.C.I.CounterBlackout||c===0){if(a.text()!=String(c)){a.text(c)}if(c<0){d.addClass(SN.C.S.Warning)}else{d.removeClass(SN.C.S.Warning)}if(!SN.C.I.CounterBlackout){SN.C.I.CounterBlackout=true;SN.C.I.FormNoticeCurrent=d;window.setTimeout("SN.U.ClearCounterBlackout(SN.C.I.FormNoticeCurrent);",500)}}}},CharacterCount:function(a){return a.find("#"+SN.C.S.NoticeDataText).val().length},ClearCounterBlackout:function(a){SN.C.I.CounterBlackout=false;SN.U.Counter(a)},RewriteAjaxAction:function(a){if(document.location.protocol=="https:"&&a.substr(0,5)=="http:"){return a.replace(/^http:\/\/[^:\/]+/,"https://"+document.location.host)}else{return a}},FormXHR:function(a){$.ajax({type:"POST",dataType:"xml",url:SN.U.RewriteAjaxAction(a.attr("action")),data:a.serialize()+"&ajax=1",beforeSend:function(b){a.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(c,d,b){alert(b||d)},success:function(b,c){if(typeof($("form",b)[0])!="undefined"){form_new=document._importNode($("form",b)[0],true);a.replaceWith(form_new)}else{a.replaceWith(document._importNode($("p",b)[0],true))}}})},FormNoticeXHR:function(b){SN.C.I.NoticeDataGeo={};b.append('<input type="hidden" name="ajax" value="1"/>');b.attr("action",SN.U.RewriteAjaxAction(b.attr("action")));var c=function(d,e){b.append($('<p class="form_response"></p>').addClass(d).text(e))};var a=function(){b.find(".form_response").remove()};b.ajaxForm({dataType:"xml",timeout:"60000",beforeSend:function(d){if(b.find("#"+SN.C.S.NoticeDataText)[0].value.length===0){b.addClass(SN.C.S.Warning);return false}b.addClass(SN.C.S.Processing).find("#"+SN.C.S.NoticeActionSubmit).addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled);SN.C.I.NoticeDataGeo.NLat=$("#"+SN.C.S.NoticeLat).val();SN.C.I.NoticeDataGeo.NLon=$("#"+SN.C.S.NoticeLon).val();SN.C.I.NoticeDataGeo.NLNS=$("#"+SN.C.S.NoticeLocationNs).val();SN.C.I.NoticeDataGeo.NLID=$("#"+SN.C.S.NoticeLocationId).val();SN.C.I.NoticeDataGeo.NDG=$("#"+SN.C.S.NoticeDataGeo).attr("checked");cookieValue=$.cookie(SN.C.S.NoticeDataGeoCookie);if(cookieValue!==null&&cookieValue!="disabled"){cookieValue=JSON.parse(cookieValue);SN.C.I.NoticeDataGeo.NLat=$("#"+SN.C.S.NoticeLat).val(cookieValue.NLat).val();SN.C.I.NoticeDataGeo.NLon=$("#"+SN.C.S.NoticeLon).val(cookieValue.NLon).val();if($("#"+SN.C.S.NoticeLocationNs).val(cookieValue.NLNS)){SN.C.I.NoticeDataGeo.NLNS=$("#"+SN.C.S.NoticeLocationNs).val(cookieValue.NLNS).val();SN.C.I.NoticeDataGeo.NLID=$("#"+SN.C.S.NoticeLocationId).val(cookieValue.NLID).val()}}if(cookieValue=="disabled"){SN.C.I.NoticeDataGeo.NDG=$("#"+SN.C.S.NoticeDataGeo).attr("checked",false).attr("checked")}else{SN.C.I.NoticeDataGeo.NDG=$("#"+SN.C.S.NoticeDataGeo).attr("checked",true).attr("checked")}return true},error:function(f,g,e){b.removeClass(SN.C.S.Processing).find("#"+SN.C.S.NoticeActionSubmit).removeClass(SN.C.S.Disabled).removeAttr(SN.C.S.Disabled,SN.C.S.Disabled);a();if(g=="timeout"){c("error","Sorry! We had trouble sending your notice. The servers are overloaded. Please try again, and contact the site administrator if this problem persists.")}else{var d=SN.U.GetResponseXML(f);if($("."+SN.C.S.Error,d).length>0){b.append(document._importNode($("."+SN.C.S.Error,d)[0],true))}else{if(parseInt(f.status)===0||jQuery.inArray(parseInt(f.status),SN.C.I.HTTP20x30x)>=0){b.resetForm().find("#"+SN.C.S.NoticeDataAttachSelected).remove();SN.U.FormNoticeEnhancements(b)}else{c("error","(Sorry! We had trouble sending your notice ("+f.status+" "+f.statusText+"). Please report the problem to the site administrator if this happens again.")}}}},success:function(i,k){a();var e=$("#"+SN.C.S.Error,i);if(e.length>0){c("error",e.text())}else{if($("body")[0].id=="bookmarklet"){self.close()}var d=$("#"+SN.C.S.CommandResult,i);if(d.length>0){c("success",d.text())}else{var h=document._importNode($("li",i)[0],true);var j=$("#notices_primary .notices");if(j.length>0&&SN.U.belongsOnTimeline(h)){if($("#"+h.id).length===0){var f=$("#"+SN.C.S.NoticeInReplyTo).val();var g="#notices_primary #notice-"+f;if($("body")[0].id=="conversation"){if(f.length>0&&$(g+" .notices").length<1){$(g).append('<ul class="notices"></ul>')}$($(g+" .notices")[0]).append(h)}else{j.prepend(h)}$("#"+h.id).css({display:"none"}).fadeIn(2500);SN.U.NoticeWithAttachment($("#"+h.id));SN.U.NoticeReplyTo($("#"+h.id))}}else{c("success",$("title",i).text())}}b.resetForm();b.find("#"+SN.C.S.NoticeInReplyTo).val("");b.find("#"+SN.C.S.NoticeDataAttachSelected).remove();SN.U.FormNoticeEnhancements(b)}},complete:function(d,e){b.removeClass(SN.C.S.Processing).find("#"+SN.C.S.NoticeActionSubmit).removeAttr(SN.C.S.Disabled).removeClass(SN.C.S.Disabled);$("#"+SN.C.S.NoticeLat).val(SN.C.I.NoticeDataGeo.NLat);$("#"+SN.C.S.NoticeLon).val(SN.C.I.NoticeDataGeo.NLon);if($("#"+SN.C.S.NoticeLocationNs)){$("#"+SN.C.S.NoticeLocationNs).val(SN.C.I.NoticeDataGeo.NLNS);$("#"+SN.C.S.NoticeLocationId).val(SN.C.I.NoticeDataGeo.NLID)}$("#"+SN.C.S.NoticeDataGeo).attr("checked",SN.C.I.NoticeDataGeo.NDG)}})},GetResponseXML:function(b){try{return b.responseXML}catch(a){return(new DOMParser()).parseFromString(b.responseText,"text/xml")}},NoticeReply:function(){if($("#"+SN.C.S.NoticeDataText).length>0&&$("#content .notice_reply").length>0){$("#content .notice").each(function(){SN.U.NoticeReplyTo($(this))})}},NoticeReplyTo:function(a){a.find(".notice_reply").live("click",function(c){c.preventDefault();var b=($(".author .nickname",a).length>0)?$($(".author .nickname",a)[0]):$(".author .nickname.uid");var d=$($(".notice_id",a)[0]).text();SN.U.NoticeInlineReplyTrigger(d,"@"+b.text());return false})},NoticeInlineReplyTrigger:function(b,h){var g=$("#notice-"+b),c=g;var e=g.closest(".notices");if(e.hasClass("threaded-notices")){c=e.closest("notice")}else{e=$("ul.threaded-notices",g);if(e.length==0){e=$('<ul class="notices threaded-notices xoxo"></ul>');g.append(e)}}var j=$(".notice-reply-form",e);if(j.length==0){$("li.notice-reply-placeholder").remove();var f=$("li.notice-reply",e);if(f.length==0){f=$('<li class="notice-reply"><form class="notice-reply-form" method="post"><textarea name="status_textarea"></textarea><div class="controls"><input type="hidden" name="token"><input type="hidden" name="inreplyto"><input type="submit" class="submit"></div></form></li>');j=f.find("form");j.attr("src","/mublog/newnotice");j.find('input[type="submit"]').val(SN.msg("reply_submit"));if(h){j.find("textarea").val(h+" ")}e.append(f)}}j.find("input[name=inreplyto]").val(b);var i=j.find("textarea");if(i.length==0){throw"No textarea"}if(h){var a=h+" ";i.val(a+i.val().replace(RegExp(a,"i"),""))}i.focus();if(i[0].setSelectionRange){var d=i.val().length;i[0].setSelectionRange(d,d)}},NoticeReplySet:function(b,d){if(b.match(SN.C.I.PatternUsername)){var c=$("#"+SN.C.S.NoticeDataText);if(c.length>0){replyto="@"+b+" ";c.val(replyto+c.val().replace(RegExp(replyto,"i"),""));$("#"+SN.C.S.FormNotice+" #"+SN.C.S.NoticeInReplyTo).val(d);c[0].focus();if(c[0].setSelectionRange){var a=c.val().length;c[0].setSelectionRange(a,a)}}}},NoticeFavor:function(){$(".form_favor").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_disfavor").live("click",function(){SN.U.FormXHR($(this));return false})},NoticeInlineReplyPlaceholder:function(b){var d=$($(".notice_id",b)[0]).text();var a=b.find("ul.threaded-notices");var c=$('<li class="notice-reply-placeholder"><input class="placeholder"></li>');c.click(function(){SN.U.NoticeInlineReplyTrigger(d)});c.find("input").val(SN.msg("reply_comment"));a.append(c)},NoticeInlineReplySetup:function(){$(".threaded-notices").each(function(){var b=$(this);var a=b.closest(".notice");SN.U.NoticeInlineReplyPlaceholder(a)});$(".replyform").live("submit",function(b){var a=$(this);$.ajax({type:"POST",dataType:"xml",url:SN.U.RewriteAjaxAction(a.attr("action")),data:a.serialize()+"&ajax=1",beforeSend:function(c){a.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled).end().find("textarea").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(d,e,c){alert(c||e)},success:function(c,d){if(typeof($("form",c)[0])!="undefined"){form_new=document._importNode($("form",c)[0],true);a.replaceWith(form_new)}else{a.replaceWith(document._importNode($("p",c)[0],true))}}});b.preventDefault();return false})},NoticeRepeat:function(){$(".form_repeat").live("click",function(a){a.preventDefault();SN.U.NoticeRepeatConfirmation($(this));return false})},NoticeRepeatConfirmation:function(a){var c=a.find(".submit");var b=c.clone();b.addClass("submit_dialogbox").removeClass("submit");a.append(b);b.bind("click",function(){SN.U.FormXHR(a);return false});c.hide();a.addClass("dialogbox").append('<button class="close">&#215;</button>').closest(".notice-options").addClass("opaque");a.find("button.close").click(function(){$(this).remove();a.removeClass("dialogbox").closest(".notice-options").removeClass("opaque");a.find(".submit_dialogbox").remove();a.find(".submit").show();return false})},NoticeAttachments:function(){$(".notice a.attachment").each(function(){SN.U.NoticeWithAttachment($(this).closest(".notice"))})},NoticeWithAttachment:function(b){if(b.find(".attachment").length===0){return}var a=b.find(".attachment.more");if(a.length>0){$(a[0]).click(function(){var c=$(this);c.addClass(SN.C.S.Processing);$.get(c.attr("href")+"/ajax",null,function(d){c.parent(".entry-content").html($(d).find("#attachment_view .entry-content").html())});return false}).attr("title",SN.msg("showmore_tooltip"))}},NoticeDataAttach:function(){NDA=$("#"+SN.C.S.NoticeDataAttach);NDA.change(function(c){var a=$(this).val();if(!a){$("#"+SN.C.S.NoticeDataAttachSelected).remove();return false}S='<div id="'+SN.C.S.NoticeDataAttachSelected+'" class="'+SN.C.S.Success+'"><code>'+a+'</code> <button class="close">&#215;</button></div>';NDAS=$("#"+SN.C.S.NoticeDataAttachSelected);if(NDAS.length>0){NDAS.replaceWith(S)}else{$("#"+SN.C.S.FormNotice).append(S)}$("#"+SN.C.S.NoticeDataAttachSelected+" button").click(function(){$("#"+SN.C.S.NoticeDataAttachSelected).remove();NDA.val("");return false});if(typeof this.files=="object"){for(var b=0;b<this.files.length;b++){SN.U.PreviewAttach(this.files[b])}}})},maxFileSize:function(b){var a=$(b).find("input[name=MAX_FILE_SIZE]").attr("value");if(a){return parseInt(a)}else{return 0}},PreviewAttach:function(c){var d=c.type+" "+Math.round(c.size/1024)+"KB";var e=true;var g;if(typeof window.createObjectURL!="undefined"){g=function(h,i){i(window.createObjectURL(h))}}else{if(typeof window.FileReader!="undefined"){g=function(i,j){var h=new FileReader();h.onload=function(k){j(h.result)};h.readAsDataURL(i)}}else{e=false}}var a=["image/png","image/jpeg","image/gif","image/svg+xml"];if($.inArray(c.type,a)==-1){e=false}var f=8*1024*1024;if(c.size>f){e=false}if(e){g(c,function(i){var h=$("<img>").attr("title",d).attr("alt",d).attr("src",i).attr("style","height: 120px");$("#"+SN.C.S.NoticeDataAttachSelected).append(h)})}else{var b=$("<div></div>").text(d);$("#"+SN.C.S.NoticeDataAttachSelected).append(b)}},NoticeLocationAttach:function(){var c=$("#"+SN.C.S.NoticeLat).val();var h=$("#"+SN.C.S.NoticeLon).val();var d=$("#"+SN.C.S.NoticeLocationNs).val();var i=$("#"+SN.C.S.NoticeLocationId).val();var a=$("#"+SN.C.S.NoticeGeoName).text();var b=$("#"+SN.C.S.NoticeDataGeo);function e(){$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",jQuery.trim($("label[for="+SN.C.S.NoticeDataGeo+"]").text())).removeClass("checked");$("#"+SN.C.S.NoticeLat).val("");$("#"+SN.C.S.NoticeLon).val("");$("#"+SN.C.S.NoticeLocationNs).val("");$("#"+SN.C.S.NoticeLocationId).val("");$("#"+SN.C.S.NoticeDataGeo).attr("checked",false);$.cookie(SN.C.S.NoticeDataGeoCookie,"disabled",{path:"/"})}function j(k,l){$.getJSON(k,l,function(m){var n,o;if(typeof(m.location_ns)!="undefined"){$("#"+SN.C.S.NoticeLocationNs).val(m.location_ns);n=m.location_ns}if(typeof(m.location_id)!="undefined"){$("#"+SN.C.S.NoticeLocationId).val(m.location_id);o=m.location_id}if(typeof(m.name)=="undefined"){NLN_text=l.lat+";"+l.lon}else{NLN_text=m.name}$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",NoticeDataGeo_text.ShareDisable+" ("+NLN_text+")");$("#"+SN.C.S.NoticeLat).val(l.lat);$("#"+SN.C.S.NoticeLon).val(l.lon);$("#"+SN.C.S.NoticeLocationNs).val(n);$("#"+SN.C.S.NoticeLocationId).val(o);$("#"+SN.C.S.NoticeDataGeo).attr("checked",true);var p={NLat:l.lat,NLon:l.lon,NLNS:n,NLID:o,NLN:NLN_text,NLNU:m.url,NDG:true};$.cookie(SN.C.S.NoticeDataGeoCookie,JSON.stringify(p),{path:"/"})})}if(b.length>0){if($.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){b.attr("checked",false)}else{b.attr("checked",true)}var f=$("#notice_data-geo_wrap");var g=f.attr("title");f.removeAttr("title");$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",jQuery.trim($("label[for="+SN.C.S.NoticeDataGeo+"]").text()));b.change(function(){if($("#"+SN.C.S.NoticeDataGeo).attr("checked")===true||$.cookie(SN.C.S.NoticeDataGeoCookie)===null){$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",NoticeDataGeo_text.ShareDisable).addClass("checked");if($.cookie(SN.C.S.NoticeDataGeoCookie)===null||$.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){if(navigator.geolocation){navigator.geolocation.getCurrentPosition(function(m){$("#"+SN.C.S.NoticeLat).val(m.coords.latitude);$("#"+SN.C.S.NoticeLon).val(m.coords.longitude);var n={lat:m.coords.latitude,lon:m.coords.longitude,token:$("#token").val()};j(g,n)},function(m){switch(m.code){case m.PERMISSION_DENIED:e();break;case m.TIMEOUT:$("#"+SN.C.S.NoticeDataGeo).attr("checked",false);break}},{timeout:10000})}else{if(c.length>0&&h.length>0){var k={lat:c,lon:h,token:$("#token").val()};j(g,k)}else{e();$("#"+SN.C.S.NoticeDataGeo).remove();$("label[for="+SN.C.S.NoticeDataGeo+"]").remove()}}}else{var l=JSON.parse($.cookie(SN.C.S.NoticeDataGeoCookie));$("#"+SN.C.S.NoticeLat).val(l.NLat);$("#"+SN.C.S.NoticeLon).val(l.NLon);$("#"+SN.C.S.NoticeLocationNs).val(l.NLNS);$("#"+SN.C.S.NoticeLocationId).val(l.NLID);$("#"+SN.C.S.NoticeDataGeo).attr("checked",l.NDG);$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",NoticeDataGeo_text.ShareDisable+" ("+l.NLN+")").addClass("checked")}}else{e()}}).change()}},NewDirectMessage:function(){NDM=$(".entity_send-a-message a");NDM.attr({href:NDM.attr("href")+"&ajax=1"});NDM.bind("click",function(){var a=$(".entity_send-a-message form");if(a.length===0){$(this).addClass(SN.C.S.Processing);$.get(NDM.attr("href"),null,function(b){$(".entity_send-a-message").append(document._importNode($("form",b)[0],true));a=$(".entity_send-a-message .form_notice");SN.U.FormNoticeXHR(a);SN.U.FormNoticeEnhancements(a);a.append('<button class="close">&#215;</button>');$(".entity_send-a-message button").click(function(){a.hide();return false});NDM.removeClass(SN.C.S.Processing)})}else{a.show();$(".entity_send-a-message textarea").focus()}return false})},GetFullYear:function(c,d,a){var b=new Date();b.setFullYear(c,d,a);return b},StatusNetInstance:{Set:function(b){var a=SN.U.StatusNetInstance.Get();if(a!==null){b=$.extend(a,b)}$.cookie(SN.C.S.StatusNetInstance,JSON.stringify(b),{path:"/",expires:SN.U.GetFullYear(2029,0,1)})},Get:function(){var a=$.cookie(SN.C.S.StatusNetInstance);if(a!==null){return JSON.parse(a)}return null},Delete:function(){$.cookie(SN.C.S.StatusNetInstance,null)}},belongsOnTimeline:function(b){var a=$("body").attr("id");if(a=="public"){return true}var c=$("#nav_profile a").attr("href");if(c){var d=$(b).find(".entry-title .author a.url").attr("href");if(d==c){if(a=="all"||a=="showstream"){return true}}}return false}},Init:{NoticeForm:function(){if($("body.user_in").length>0){SN.U.NoticeLocationAttach();$("."+SN.C.S.FormNotice).each(function(){SN.U.FormNoticeXHR($(this));SN.U.FormNoticeEnhancements($(this))});SN.U.NoticeDataAttach()}},Notices:function(){if($("body.user_in").length>0){SN.U.NoticeFavor();SN.U.NoticeRepeat();SN.U.NoticeReply();SN.U.NoticeInlineReplySetup()}SN.U.NoticeAttachments()},EntityActions:function(){if($("body.user_in").length>0){$(".form_user_subscribe").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_user_unsubscribe").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_group_join").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_group_leave").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_user_nudge").live("click",function(){SN.U.FormXHR($(this));return false});SN.U.NewDirectMessage()}},Login:function(){if(SN.U.StatusNetInstance.Get()!==null){var a=SN.U.StatusNetInstance.Get().Nickname;if(a!==null){$("#form_login #nickname").val(a)}}$("#form_login").bind("submit",function(){SN.U.StatusNetInstance.Set({Nickname:$("#form_login #nickname").val()});return true})},UploadForms:function(){$("input[type=file]").change(function(d){if(typeof this.files=="object"&&this.files.length>0){var c=0;for(var b=0;b<this.files.length;b++){c+=this.files[b].size}var a=SN.U.maxFileSize($(this.form));if(a>0&&c>a){var e="File too large: maximum upload size is %d bytes.";alert(e.replace("%d",a));$(this).val("");d.preventDefault();return false}}})}}};$(document).ready(function(){SN.Init.UploadForms();if($("."+SN.C.S.FormNotice).length>0){SN.Init.NoticeForm()}if($("#content .notices").length>0){SN.Init.Notices()}if($("#content .entity_actions").length>0){SN.Init.EntityActions()}if($("#form_login").length>0){SN.Init.Login()}});if(!document.ELEMENT_NODE){document.ELEMENT_NODE=1;document.ATTRIBUTE_NODE=2;document.TEXT_NODE=3;document.CDATA_SECTION_NODE=4;document.ENTITY_REFERENCE_NODE=5;document.ENTITY_NODE=6;document.PROCESSING_INSTRUCTION_NODE=7;document.COMMENT_NODE=8;document.DOCUMENT_NODE=9;document.DOCUMENT_TYPE_NODE=10;document.DOCUMENT_FRAGMENT_NODE=11;document.NOTATION_NODE=12}document._importNode=function(e,a){switch(e.nodeType){case document.ELEMENT_NODE:var d=document.createElement(e.nodeName);if(e.attributes&&e.attributes.length>0){for(var c=0,b=e.attributes.length;c<b;){if(e.attributes[c].nodeName=="class"){d.className=e.getAttribute(e.attributes[c++].nodeName)}else{d.setAttribute(e.attributes[c].nodeName,e.getAttribute(e.attributes[c++].nodeName))}}}if(a&&e.childNodes&&e.childNodes.length>0){for(var c=0,b=e.childNodes.length;c<b;){d.appendChild(document._importNode(e.childNodes[c++],a))}}return d;break;case document.TEXT_NODE:case document.CDATA_SECTION_NODE:case document.COMMENT_NODE:return document.createTextNode(e.nodeValue);break}};if(typeof navigator.geolocation=="undefined"||navigator.geolocation.shim){(function(){(function(){if(window.google&&google.gears){return}var c=null;if(typeof GearsFactory!="undefined"){c=new GearsFactory()}else{try{c=new ActiveXObject("Gears.Factory");if(c.getBuildInfo().indexOf("ie_mobile")!=-1){c.privateSetGlobalObject(this)}}catch(d){if((typeof navigator.mimeTypes!="undefined")&&navigator.mimeTypes["application/x-googlegears"]){c=document.createElement("object");c.style.display="none";c.width=0;c.height=0;c.type="application/x-googlegears";document.documentElement.appendChild(c)}}}if(!c){return}if(!window.google){google={}}if(!google.gears){google.gears={factory:c}}})();var a=(function(){var d=google.gears.factory.create("beta.geolocation");var c=function(f,e){return function(g){f(g);e.lastPosition=g}};return{shim:true,type:"Gears",lastPosition:null,getCurrentPosition:function(e,g,h){var f=this;var i=c(e,f);d.getCurrentPosition(i,g,h)},watchPosition:function(e,f,g){d.watchPosition(e,f,g)},clearWatch:function(e){d.clearWatch(e)},getPermission:function(g,e,f){d.getPermission(g,e,f)}}});var b=(function(){var i=false;var e=function(){if(!d()&&!i){i=true;var j=document.createElement("script");j.src=(document.location.protocol=="https:"?"https://":"http://")+"www.google.com/jsapi?callback=_google_loader_apiLoaded";j.type="text/javascript";document.getElementsByTagName("body")[0].appendChild(j)}};var c=[];var h=function(j){c.push(j)};var f=function(){if(d()){while(c.length>0){var j=c.pop();j()}}};window._google_loader_apiLoaded=function(){f()};var d=function(){return(window.google&&google.loader)};var g=function(j){if(d()){return true}h(j);e();return false};e();return{shim:true,type:"ClientLocation",lastPosition:null,getCurrentPosition:function(k,n,o){var m=this;if(!g(function(){m.getCurrentPosition(k,n,o)})){return}if(google.loader.ClientLocation){var l=google.loader.ClientLocation;var j={coords:{latitude:l.latitude,longitude:l.longitude,altitude:null,accuracy:43000,altitudeAccuracy:null,heading:null,speed:null},address:{city:l.address.city,country:l.address.country,country_code:l.address.country_code,region:l.address.region},timestamp:new Date()};k(j);this.lastPosition=j}else{if(n==="function"){n({code:3,message:"Using the Google ClientLocation API and it is not able to calculate a location."})}}},watchPosition:function(j,l,m){this.getCurrentPosition(j,l,m);var k=this;var n=setInterval(function(){k.getCurrentPosition(j,l,m)},10000);return n},clearWatch:function(j){clearInterval(j)},getPermission:function(l,j,k){return true}}});navigator.geolocation=(window.google&&google.gears)?a():b()})()};
\ No newline at end of file
+var SN={C:{I:{CounterBlackout:false,MaxLength:140,PatternUsername:/^[0-9a-zA-Z\-_.]*$/,HTTP20x30x:[200,201,202,203,204,205,206,300,301,302,303,304,305,306,307]},S:{Disabled:"disabled",Warning:"warning",Error:"error",Success:"success",Processing:"processing",CommandResult:"command_result",FormNotice:"form_notice",NoticeDataText:"notice_data-text",NoticeTextCount:"notice_text-count",NoticeInReplyTo:"notice_in-reply-to",NoticeDataAttach:"notice_data-attach",NoticeDataAttachSelected:"notice_data-attach_selected",NoticeActionSubmit:"notice_action-submit",NoticeLat:"notice_data-lat",NoticeLon:"notice_data-lon",NoticeLocationId:"notice_data-location_id",NoticeLocationNs:"notice_data-location_ns",NoticeGeoName:"notice_data-geo_name",NoticeDataGeo:"notice_data-geo",NoticeDataGeoCookie:"NoticeDataGeo",NoticeDataGeoSelected:"notice_data-geo_selected",StatusNetInstance:"StatusNetInstance"}},messages:{},msg:function(a){if(typeof SN.messages[a]=="undefined"){return"["+a+"]"}else{return SN.messages[a]}},U:{FormNoticeEnhancements:function(b){if(jQuery.data(b[0],"ElementData")===undefined){MaxLength=b.find("#"+SN.C.S.NoticeTextCount).text();if(typeof(MaxLength)=="undefined"){MaxLength=SN.C.I.MaxLength}jQuery.data(b[0],"ElementData",{MaxLength:MaxLength});SN.U.Counter(b);NDT=b.find("#"+SN.C.S.NoticeDataText);NDT.bind("keyup",function(c){SN.U.Counter(b)});var a=function(c){window.setTimeout(function(){SN.U.Counter(b)},50)};NDT.bind("cut",a).bind("paste",a);NDT.bind("keydown",function(c){SN.U.SubmitOnReturn(c,b)})}else{b.find("#"+SN.C.S.NoticeTextCount).text(jQuery.data(b[0],"ElementData").MaxLength)}if($("body")[0].id!="conversation"&&window.location.hash.length===0&&$(window).scrollTop()==0){b.find("textarea").focus()}},SubmitOnReturn:function(b,a){if(b.keyCode==13||b.keyCode==10){a.submit();b.preventDefault();b.stopPropagation();$("#"+a[0].id+" #"+SN.C.S.NoticeDataText).blur();$("body").focus();return false}return true},Counter:function(d){SN.C.I.FormNoticeCurrent=d;var b=jQuery.data(d[0],"ElementData").MaxLength;if(b<=0){return}var c=b-SN.U.CharacterCount(d);var a=d.find("#"+SN.C.S.NoticeTextCount);if(c.toString()!=a.text()){if(!SN.C.I.CounterBlackout||c===0){if(a.text()!=String(c)){a.text(c)}if(c<0){d.addClass(SN.C.S.Warning)}else{d.removeClass(SN.C.S.Warning)}if(!SN.C.I.CounterBlackout){SN.C.I.CounterBlackout=true;SN.C.I.FormNoticeCurrent=d;window.setTimeout("SN.U.ClearCounterBlackout(SN.C.I.FormNoticeCurrent);",500)}}}},CharacterCount:function(a){return a.find("#"+SN.C.S.NoticeDataText).val().length},ClearCounterBlackout:function(a){SN.C.I.CounterBlackout=false;SN.U.Counter(a)},RewriteAjaxAction:function(a){if(document.location.protocol=="https:"&&a.substr(0,5)=="http:"){return a.replace(/^http:\/\/[^:\/]+/,"https://"+document.location.host)}else{return a}},FormXHR:function(a){$.ajax({type:"POST",dataType:"xml",url:SN.U.RewriteAjaxAction(a.attr("action")),data:a.serialize()+"&ajax=1",beforeSend:function(b){a.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(c,d,b){alert(b||d)},success:function(b,c){if(typeof($("form",b)[0])!="undefined"){form_new=document._importNode($("form",b)[0],true);a.replaceWith(form_new)}else{a.replaceWith(document._importNode($("p",b)[0],true))}}})},FormNoticeXHR:function(b){SN.C.I.NoticeDataGeo={};b.append('<input type="hidden" name="ajax" value="1"/>');b.attr("action",SN.U.RewriteAjaxAction(b.attr("action")));var c=function(d,e){b.append($('<p class="form_response"></p>').addClass(d).text(e))};var a=function(){b.find(".form_response").remove()};b.ajaxForm({dataType:"xml",timeout:"60000",beforeSend:function(d){if(b.find("#"+SN.C.S.NoticeDataText)[0].value.length===0){b.addClass(SN.C.S.Warning);return false}b.addClass(SN.C.S.Processing).find("#"+SN.C.S.NoticeActionSubmit).addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled);SN.C.I.NoticeDataGeo.NLat=$("#"+SN.C.S.NoticeLat).val();SN.C.I.NoticeDataGeo.NLon=$("#"+SN.C.S.NoticeLon).val();SN.C.I.NoticeDataGeo.NLNS=$("#"+SN.C.S.NoticeLocationNs).val();SN.C.I.NoticeDataGeo.NLID=$("#"+SN.C.S.NoticeLocationId).val();SN.C.I.NoticeDataGeo.NDG=$("#"+SN.C.S.NoticeDataGeo).attr("checked");cookieValue=$.cookie(SN.C.S.NoticeDataGeoCookie);if(cookieValue!==null&&cookieValue!="disabled"){cookieValue=JSON.parse(cookieValue);SN.C.I.NoticeDataGeo.NLat=$("#"+SN.C.S.NoticeLat).val(cookieValue.NLat).val();SN.C.I.NoticeDataGeo.NLon=$("#"+SN.C.S.NoticeLon).val(cookieValue.NLon).val();if($("#"+SN.C.S.NoticeLocationNs).val(cookieValue.NLNS)){SN.C.I.NoticeDataGeo.NLNS=$("#"+SN.C.S.NoticeLocationNs).val(cookieValue.NLNS).val();SN.C.I.NoticeDataGeo.NLID=$("#"+SN.C.S.NoticeLocationId).val(cookieValue.NLID).val()}}if(cookieValue=="disabled"){SN.C.I.NoticeDataGeo.NDG=$("#"+SN.C.S.NoticeDataGeo).attr("checked",false).attr("checked")}else{SN.C.I.NoticeDataGeo.NDG=$("#"+SN.C.S.NoticeDataGeo).attr("checked",true).attr("checked")}return true},error:function(f,g,e){b.removeClass(SN.C.S.Processing).find("#"+SN.C.S.NoticeActionSubmit).removeClass(SN.C.S.Disabled).removeAttr(SN.C.S.Disabled,SN.C.S.Disabled);a();if(g=="timeout"){c("error","Sorry! We had trouble sending your notice. The servers are overloaded. Please try again, and contact the site administrator if this problem persists.")}else{var d=SN.U.GetResponseXML(f);if($("."+SN.C.S.Error,d).length>0){b.append(document._importNode($("."+SN.C.S.Error,d)[0],true))}else{if(parseInt(f.status)===0||jQuery.inArray(parseInt(f.status),SN.C.I.HTTP20x30x)>=0){b.resetForm().find("#"+SN.C.S.NoticeDataAttachSelected).remove();SN.U.FormNoticeEnhancements(b)}else{c("error","(Sorry! We had trouble sending your notice ("+f.status+" "+f.statusText+"). Please report the problem to the site administrator if this happens again.")}}}},success:function(i,k){a();var e=$("#"+SN.C.S.Error,i);if(e.length>0){c("error",e.text())}else{if($("body")[0].id=="bookmarklet"){self.close()}var d=$("#"+SN.C.S.CommandResult,i);if(d.length>0){c("success",d.text())}else{var h=document._importNode($("li",i)[0],true);var j=$("#notices_primary .notices");if(j.length>0&&SN.U.belongsOnTimeline(h)){if($("#"+h.id).length===0){var f=$("#"+SN.C.S.NoticeInReplyTo).val();var g="#notices_primary #notice-"+f;if($("body")[0].id=="conversation"){if(f.length>0&&$(g+" .notices").length<1){$(g).append('<ul class="notices"></ul>')}$($(g+" .notices")[0]).append(h)}else{j.prepend(h)}$("#"+h.id).css({display:"none"}).fadeIn(2500);SN.U.NoticeWithAttachment($("#"+h.id));SN.U.NoticeReplyTo($("#"+h.id))}}else{c("success",$("title",i).text())}}b.resetForm();b.find("#"+SN.C.S.NoticeInReplyTo).val("");b.find("#"+SN.C.S.NoticeDataAttachSelected).remove();SN.U.FormNoticeEnhancements(b)}},complete:function(d,e){b.removeClass(SN.C.S.Processing).find("#"+SN.C.S.NoticeActionSubmit).removeAttr(SN.C.S.Disabled).removeClass(SN.C.S.Disabled);$("#"+SN.C.S.NoticeLat).val(SN.C.I.NoticeDataGeo.NLat);$("#"+SN.C.S.NoticeLon).val(SN.C.I.NoticeDataGeo.NLon);if($("#"+SN.C.S.NoticeLocationNs)){$("#"+SN.C.S.NoticeLocationNs).val(SN.C.I.NoticeDataGeo.NLNS);$("#"+SN.C.S.NoticeLocationId).val(SN.C.I.NoticeDataGeo.NLID)}$("#"+SN.C.S.NoticeDataGeo).attr("checked",SN.C.I.NoticeDataGeo.NDG)}})},GetResponseXML:function(b){try{return b.responseXML}catch(a){return(new DOMParser()).parseFromString(b.responseText,"text/xml")}},NoticeReply:function(){if($("#"+SN.C.S.NoticeDataText).length>0&&$("#content .notice_reply").length>0){$("#content .notice").each(function(){SN.U.NoticeReplyTo($(this))})}},NoticeReplyTo:function(a){a.find(".notice_reply").live("click",function(c){c.preventDefault();var b=($(".author .nickname",a).length>0)?$($(".author .nickname",a)[0]):$(".author .nickname.uid");var d=$($(".notice_id",a)[0]).text();SN.U.NoticeInlineReplyTrigger(d,"@"+b.text());return false})},NoticeInlineReplyTrigger:function(c,i){var h=$("#notice-"+c),d=h;var f=h.closest(".notices");if(f.hasClass("threaded-notices")){d=f.closest("notice")}else{f=$("ul.threaded-notices",h);if(f.length==0){f=$('<ul class="notices threaded-notices xoxo"></ul>');h.append(f)}}var k=$(".notice-reply-form",f);if(k.length==0){$("li.notice-reply-placeholder").remove();var g=$("li.notice-reply",f);if(g.length==0){g=$('<li class="notice-reply"><form class="notice-reply-form" method="post"><textarea name="status_textarea"></textarea><div class="controls"><input type="hidden" name="token"><input type="hidden" name="inreplyto"><input type="submit" class="submit"></div></form></li>');var b=$("#form_notice");k=g.find("form");k.attr("action",b.attr("action"));k.find('input[name="token"]').val(b.find("input[name=token]").val());k.find('input[type="submit"]').val(SN.msg("reply_submit"));f.append(g)}}k.find("input[name=inreplyto]").val(c);var j=k.find("textarea");if(j.length==0){throw"No textarea"}if(i){var a=i+" ";j.val(a+j.val().replace(RegExp(a,"i"),""))}j.focus();if(j[0].setSelectionRange){var e=j.val().length;j[0].setSelectionRange(e,e)}},NoticeReplySet:function(b,d){if(b.match(SN.C.I.PatternUsername)){var c=$("#"+SN.C.S.NoticeDataText);if(c.length>0){replyto="@"+b+" ";c.val(replyto+c.val().replace(RegExp(replyto,"i"),""));$("#"+SN.C.S.FormNotice+" #"+SN.C.S.NoticeInReplyTo).val(d);c[0].focus();if(c[0].setSelectionRange){var a=c.val().length;c[0].setSelectionRange(a,a)}}}},NoticeFavor:function(){$(".form_favor").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_disfavor").live("click",function(){SN.U.FormXHR($(this));return false})},NoticeInlineReplyPlaceholder:function(b){var d=$($(".notice_id",b)[0]).text();var a=b.find("ul.threaded-notices");var c=$('<li class="notice-reply-placeholder"><input class="placeholder"></li>');c.click(function(){SN.U.NoticeInlineReplyTrigger(d)});c.find("input").val(SN.msg("reply_comment"));a.append(c)},NoticeInlineReplySetup:function(){$(".threaded-notices").each(function(){var b=$(this);var a=b.closest(".notice");SN.U.NoticeInlineReplyPlaceholder(a)});$(".replyform").live("submit",function(b){var a=$(this);$.ajax({type:"POST",dataType:"xml",url:SN.U.RewriteAjaxAction(a.attr("action")),data:a.serialize()+"&ajax=1",beforeSend:function(c){a.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled).end().find("textarea").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(d,e,c){alert(c||e)},success:function(c,d){if(typeof($("form",c)[0])!="undefined"){form_new=document._importNode($("form",c)[0],true);a.replaceWith(form_new)}else{a.replaceWith(document._importNode($("p",c)[0],true))}}});b.preventDefault();return false})},NoticeRepeat:function(){$(".form_repeat").live("click",function(a){a.preventDefault();SN.U.NoticeRepeatConfirmation($(this));return false})},NoticeRepeatConfirmation:function(a){var c=a.find(".submit");var b=c.clone();b.addClass("submit_dialogbox").removeClass("submit");a.append(b);b.bind("click",function(){SN.U.FormXHR(a);return false});c.hide();a.addClass("dialogbox").append('<button class="close">&#215;</button>').closest(".notice-options").addClass("opaque");a.find("button.close").click(function(){$(this).remove();a.removeClass("dialogbox").closest(".notice-options").removeClass("opaque");a.find(".submit_dialogbox").remove();a.find(".submit").show();return false})},NoticeAttachments:function(){$(".notice a.attachment").each(function(){SN.U.NoticeWithAttachment($(this).closest(".notice"))})},NoticeWithAttachment:function(b){if(b.find(".attachment").length===0){return}var a=b.find(".attachment.more");if(a.length>0){$(a[0]).click(function(){var c=$(this);c.addClass(SN.C.S.Processing);$.get(c.attr("href")+"/ajax",null,function(d){c.parent(".entry-content").html($(d).find("#attachment_view .entry-content").html())});return false}).attr("title",SN.msg("showmore_tooltip"))}},NoticeDataAttach:function(){NDA=$("#"+SN.C.S.NoticeDataAttach);NDA.change(function(c){var a=$(this).val();if(!a){$("#"+SN.C.S.NoticeDataAttachSelected).remove();return false}S='<div id="'+SN.C.S.NoticeDataAttachSelected+'" class="'+SN.C.S.Success+'"><code>'+a+'</code> <button class="close">&#215;</button></div>';NDAS=$("#"+SN.C.S.NoticeDataAttachSelected);if(NDAS.length>0){NDAS.replaceWith(S)}else{$("#"+SN.C.S.FormNotice).append(S)}$("#"+SN.C.S.NoticeDataAttachSelected+" button").click(function(){$("#"+SN.C.S.NoticeDataAttachSelected).remove();NDA.val("");return false});if(typeof this.files=="object"){for(var b=0;b<this.files.length;b++){SN.U.PreviewAttach(this.files[b])}}})},maxFileSize:function(b){var a=$(b).find("input[name=MAX_FILE_SIZE]").attr("value");if(a){return parseInt(a)}else{return 0}},PreviewAttach:function(c){var d=c.type+" "+Math.round(c.size/1024)+"KB";var e=true;var g;if(typeof window.createObjectURL!="undefined"){g=function(h,i){i(window.createObjectURL(h))}}else{if(typeof window.FileReader!="undefined"){g=function(i,j){var h=new FileReader();h.onload=function(k){j(h.result)};h.readAsDataURL(i)}}else{e=false}}var a=["image/png","image/jpeg","image/gif","image/svg+xml"];if($.inArray(c.type,a)==-1){e=false}var f=8*1024*1024;if(c.size>f){e=false}if(e){g(c,function(i){var h=$("<img>").attr("title",d).attr("alt",d).attr("src",i).attr("style","height: 120px");$("#"+SN.C.S.NoticeDataAttachSelected).append(h)})}else{var b=$("<div></div>").text(d);$("#"+SN.C.S.NoticeDataAttachSelected).append(b)}},NoticeLocationAttach:function(){var c=$("#"+SN.C.S.NoticeLat).val();var h=$("#"+SN.C.S.NoticeLon).val();var d=$("#"+SN.C.S.NoticeLocationNs).val();var i=$("#"+SN.C.S.NoticeLocationId).val();var a=$("#"+SN.C.S.NoticeGeoName).text();var b=$("#"+SN.C.S.NoticeDataGeo);function e(){$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",jQuery.trim($("label[for="+SN.C.S.NoticeDataGeo+"]").text())).removeClass("checked");$("#"+SN.C.S.NoticeLat).val("");$("#"+SN.C.S.NoticeLon).val("");$("#"+SN.C.S.NoticeLocationNs).val("");$("#"+SN.C.S.NoticeLocationId).val("");$("#"+SN.C.S.NoticeDataGeo).attr("checked",false);$.cookie(SN.C.S.NoticeDataGeoCookie,"disabled",{path:"/"})}function j(k,l){$.getJSON(k,l,function(m){var n,o;if(typeof(m.location_ns)!="undefined"){$("#"+SN.C.S.NoticeLocationNs).val(m.location_ns);n=m.location_ns}if(typeof(m.location_id)!="undefined"){$("#"+SN.C.S.NoticeLocationId).val(m.location_id);o=m.location_id}if(typeof(m.name)=="undefined"){NLN_text=l.lat+";"+l.lon}else{NLN_text=m.name}$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",NoticeDataGeo_text.ShareDisable+" ("+NLN_text+")");$("#"+SN.C.S.NoticeLat).val(l.lat);$("#"+SN.C.S.NoticeLon).val(l.lon);$("#"+SN.C.S.NoticeLocationNs).val(n);$("#"+SN.C.S.NoticeLocationId).val(o);$("#"+SN.C.S.NoticeDataGeo).attr("checked",true);var p={NLat:l.lat,NLon:l.lon,NLNS:n,NLID:o,NLN:NLN_text,NLNU:m.url,NDG:true};$.cookie(SN.C.S.NoticeDataGeoCookie,JSON.stringify(p),{path:"/"})})}if(b.length>0){if($.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){b.attr("checked",false)}else{b.attr("checked",true)}var f=$("#notice_data-geo_wrap");var g=f.attr("title");f.removeAttr("title");$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",jQuery.trim($("label[for="+SN.C.S.NoticeDataGeo+"]").text()));b.change(function(){if($("#"+SN.C.S.NoticeDataGeo).attr("checked")===true||$.cookie(SN.C.S.NoticeDataGeoCookie)===null){$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",NoticeDataGeo_text.ShareDisable).addClass("checked");if($.cookie(SN.C.S.NoticeDataGeoCookie)===null||$.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){if(navigator.geolocation){navigator.geolocation.getCurrentPosition(function(m){$("#"+SN.C.S.NoticeLat).val(m.coords.latitude);$("#"+SN.C.S.NoticeLon).val(m.coords.longitude);var n={lat:m.coords.latitude,lon:m.coords.longitude,token:$("#token").val()};j(g,n)},function(m){switch(m.code){case m.PERMISSION_DENIED:e();break;case m.TIMEOUT:$("#"+SN.C.S.NoticeDataGeo).attr("checked",false);break}},{timeout:10000})}else{if(c.length>0&&h.length>0){var k={lat:c,lon:h,token:$("#token").val()};j(g,k)}else{e();$("#"+SN.C.S.NoticeDataGeo).remove();$("label[for="+SN.C.S.NoticeDataGeo+"]").remove()}}}else{var l=JSON.parse($.cookie(SN.C.S.NoticeDataGeoCookie));$("#"+SN.C.S.NoticeLat).val(l.NLat);$("#"+SN.C.S.NoticeLon).val(l.NLon);$("#"+SN.C.S.NoticeLocationNs).val(l.NLNS);$("#"+SN.C.S.NoticeLocationId).val(l.NLID);$("#"+SN.C.S.NoticeDataGeo).attr("checked",l.NDG);$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",NoticeDataGeo_text.ShareDisable+" ("+l.NLN+")").addClass("checked")}}else{e()}}).change()}},NewDirectMessage:function(){NDM=$(".entity_send-a-message a");NDM.attr({href:NDM.attr("href")+"&ajax=1"});NDM.bind("click",function(){var a=$(".entity_send-a-message form");if(a.length===0){$(this).addClass(SN.C.S.Processing);$.get(NDM.attr("href"),null,function(b){$(".entity_send-a-message").append(document._importNode($("form",b)[0],true));a=$(".entity_send-a-message .form_notice");SN.U.FormNoticeXHR(a);SN.U.FormNoticeEnhancements(a);a.append('<button class="close">&#215;</button>');$(".entity_send-a-message button").click(function(){a.hide();return false});NDM.removeClass(SN.C.S.Processing)})}else{a.show();$(".entity_send-a-message textarea").focus()}return false})},GetFullYear:function(c,d,a){var b=new Date();b.setFullYear(c,d,a);return b},StatusNetInstance:{Set:function(b){var a=SN.U.StatusNetInstance.Get();if(a!==null){b=$.extend(a,b)}$.cookie(SN.C.S.StatusNetInstance,JSON.stringify(b),{path:"/",expires:SN.U.GetFullYear(2029,0,1)})},Get:function(){var a=$.cookie(SN.C.S.StatusNetInstance);if(a!==null){return JSON.parse(a)}return null},Delete:function(){$.cookie(SN.C.S.StatusNetInstance,null)}},belongsOnTimeline:function(b){var a=$("body").attr("id");if(a=="public"){return true}var c=$("#nav_profile a").attr("href");if(c){var d=$(b).find(".entry-title .author a.url").attr("href");if(d==c){if(a=="all"||a=="showstream"){return true}}}return false}},Init:{NoticeForm:function(){if($("body.user_in").length>0){SN.U.NoticeLocationAttach();$("."+SN.C.S.FormNotice).each(function(){SN.U.FormNoticeXHR($(this));SN.U.FormNoticeEnhancements($(this))});SN.U.NoticeDataAttach()}},Notices:function(){if($("body.user_in").length>0){SN.U.NoticeFavor();SN.U.NoticeRepeat();SN.U.NoticeReply();SN.U.NoticeInlineReplySetup()}SN.U.NoticeAttachments()},EntityActions:function(){if($("body.user_in").length>0){$(".form_user_subscribe").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_user_unsubscribe").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_group_join").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_group_leave").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_user_nudge").live("click",function(){SN.U.FormXHR($(this));return false});SN.U.NewDirectMessage()}},Login:function(){if(SN.U.StatusNetInstance.Get()!==null){var a=SN.U.StatusNetInstance.Get().Nickname;if(a!==null){$("#form_login #nickname").val(a)}}$("#form_login").bind("submit",function(){SN.U.StatusNetInstance.Set({Nickname:$("#form_login #nickname").val()});return true})},UploadForms:function(){$("input[type=file]").change(function(d){if(typeof this.files=="object"&&this.files.length>0){var c=0;for(var b=0;b<this.files.length;b++){c+=this.files[b].size}var a=SN.U.maxFileSize($(this.form));if(a>0&&c>a){var e="File too large: maximum upload size is %d bytes.";alert(e.replace("%d",a));$(this).val("");d.preventDefault();return false}}})}}};$(document).ready(function(){SN.Init.UploadForms();if($("."+SN.C.S.FormNotice).length>0){SN.Init.NoticeForm()}if($("#content .notices").length>0){SN.Init.Notices()}if($("#content .entity_actions").length>0){SN.Init.EntityActions()}if($("#form_login").length>0){SN.Init.Login()}});if(!document.ELEMENT_NODE){document.ELEMENT_NODE=1;document.ATTRIBUTE_NODE=2;document.TEXT_NODE=3;document.CDATA_SECTION_NODE=4;document.ENTITY_REFERENCE_NODE=5;document.ENTITY_NODE=6;document.PROCESSING_INSTRUCTION_NODE=7;document.COMMENT_NODE=8;document.DOCUMENT_NODE=9;document.DOCUMENT_TYPE_NODE=10;document.DOCUMENT_FRAGMENT_NODE=11;document.NOTATION_NODE=12}document._importNode=function(e,a){switch(e.nodeType){case document.ELEMENT_NODE:var d=document.createElement(e.nodeName);if(e.attributes&&e.attributes.length>0){for(var c=0,b=e.attributes.length;c<b;){if(e.attributes[c].nodeName=="class"){d.className=e.getAttribute(e.attributes[c++].nodeName)}else{d.setAttribute(e.attributes[c].nodeName,e.getAttribute(e.attributes[c++].nodeName))}}}if(a&&e.childNodes&&e.childNodes.length>0){for(var c=0,b=e.childNodes.length;c<b;){d.appendChild(document._importNode(e.childNodes[c++],a))}}return d;break;case document.TEXT_NODE:case document.CDATA_SECTION_NODE:case document.COMMENT_NODE:return document.createTextNode(e.nodeValue);break}};if(typeof navigator.geolocation=="undefined"||navigator.geolocation.shim){(function(){(function(){if(window.google&&google.gears){return}var c=null;if(typeof GearsFactory!="undefined"){c=new GearsFactory()}else{try{c=new ActiveXObject("Gears.Factory");if(c.getBuildInfo().indexOf("ie_mobile")!=-1){c.privateSetGlobalObject(this)}}catch(d){if((typeof navigator.mimeTypes!="undefined")&&navigator.mimeTypes["application/x-googlegears"]){c=document.createElement("object");c.style.display="none";c.width=0;c.height=0;c.type="application/x-googlegears";document.documentElement.appendChild(c)}}}if(!c){return}if(!window.google){google={}}if(!google.gears){google.gears={factory:c}}})();var a=(function(){var d=google.gears.factory.create("beta.geolocation");var c=function(f,e){return function(g){f(g);e.lastPosition=g}};return{shim:true,type:"Gears",lastPosition:null,getCurrentPosition:function(e,g,h){var f=this;var i=c(e,f);d.getCurrentPosition(i,g,h)},watchPosition:function(e,f,g){d.watchPosition(e,f,g)},clearWatch:function(e){d.clearWatch(e)},getPermission:function(g,e,f){d.getPermission(g,e,f)}}});var b=(function(){var i=false;var e=function(){if(!d()&&!i){i=true;var j=document.createElement("script");j.src=(document.location.protocol=="https:"?"https://":"http://")+"www.google.com/jsapi?callback=_google_loader_apiLoaded";j.type="text/javascript";document.getElementsByTagName("body")[0].appendChild(j)}};var c=[];var h=function(j){c.push(j)};var f=function(){if(d()){while(c.length>0){var j=c.pop();j()}}};window._google_loader_apiLoaded=function(){f()};var d=function(){return(window.google&&google.loader)};var g=function(j){if(d()){return true}h(j);e();return false};e();return{shim:true,type:"ClientLocation",lastPosition:null,getCurrentPosition:function(k,n,o){var m=this;if(!g(function(){m.getCurrentPosition(k,n,o)})){return}if(google.loader.ClientLocation){var l=google.loader.ClientLocation;var j={coords:{latitude:l.latitude,longitude:l.longitude,altitude:null,accuracy:43000,altitudeAccuracy:null,heading:null,speed:null},address:{city:l.address.city,country:l.address.country,country_code:l.address.country_code,region:l.address.region},timestamp:new Date()};k(j);this.lastPosition=j}else{if(n==="function"){n({code:3,message:"Using the Google ClientLocation API and it is not able to calculate a location."})}}},watchPosition:function(j,l,m){this.getCurrentPosition(j,l,m);var k=this;var n=setInterval(function(){k.getCurrentPosition(j,l,m)},10000);return n},clearWatch:function(j){clearInterval(j)},getPermission:function(l,j,k){return true}}});navigator.geolocation=(window.google&&google.gears)?a():b()})()};
\ No newline at end of file

From d01648248e68e8dcd9c585ce9b361d6f450526b9 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Mon, 28 Feb 2011 16:38:44 -0800
Subject: [PATCH 320/655] Inline replies now do ajaxy submit. Neat! Not 100%
 perfect though

---
 js/util.js     | 71 +++++++++++++++++++++++++-------------------------
 js/util.min.js |  2 +-
 2 files changed, 37 insertions(+), 36 deletions(-)

diff --git a/js/util.js b/js/util.js
index f5c909a617..8b1901101b 100644
--- a/js/util.js
+++ b/js/util.js
@@ -614,6 +614,42 @@ var SN = { // StatusNet
                     replyForm.find('input[name="token"]').val(baseForm.find('input[name=token]').val());
                     replyForm.find('input[type="submit"]').val(SN.msg('reply_submit'));
                     list.append(replyItem);
+
+                    replyForm.submit(function(event) {
+                        var form = replyForm;
+                        $.ajax({
+                            type: 'POST',
+                            dataType: 'xml',
+                            url: SN.U.RewriteAjaxAction(form.attr('action')),
+                            data: form.serialize() + '&ajax=1',
+                            beforeSend: function(xhr) {
+                                form
+                                    .addClass(SN.C.S.Processing)
+                                    .find('.submit')
+                                        .addClass(SN.C.S.Disabled)
+                                        .attr(SN.C.S.Disabled, SN.C.S.Disabled)
+                                        .end()
+                                    .find('textarea')
+                                        .addClass(SN.C.S.Disabled)
+                                        .attr(SN.C.S.Disabled, SN.C.S.Disabled);
+                            },
+                            error: function (xhr, textStatus, errorThrown) {
+                                alert(errorThrown || textStatus);
+                            },
+                            success: function(data, textStatus) {
+                                var orig_li = $('li', data)[0];
+                                if (orig_li) {
+                                    var li = document._importNode(orig_li, true);
+                                    replyItem.replaceWith(li);
+                                    SN.U.NoticeInlineReplyPlaceholder(parentNotice);
+                                } else {
+                                    console.log('confused!', data);
+                                }
+                            }
+                        });
+                        event.preventDefault();
+                        return false;
+                    });
                 }
             }
 
@@ -700,41 +736,6 @@ var SN = { // StatusNet
                 var notice = list.closest('.notice');
                 SN.U.NoticeInlineReplyPlaceholder(notice);
             });
-            $('.replyform').live('submit', function(event) {
-                //SN.U.FormXHR($(this));
-                var form = $(this);
-                $.ajax({
-                    type: 'POST',
-                    dataType: 'xml',
-                    url: SN.U.RewriteAjaxAction(form.attr('action')),
-                    data: form.serialize() + '&ajax=1',
-                    beforeSend: function(xhr) {
-                        form
-                            .addClass(SN.C.S.Processing)
-                            .find('.submit')
-                                .addClass(SN.C.S.Disabled)
-                                .attr(SN.C.S.Disabled, SN.C.S.Disabled)
-                                .end()
-                            .find('textarea')
-                                .addClass(SN.C.S.Disabled)
-                                .attr(SN.C.S.Disabled, SN.C.S.Disabled);
-                    },
-                    error: function (xhr, textStatus, errorThrown) {
-                        alert(errorThrown || textStatus);
-                    },
-                    success: function(data, textStatus) {
-                        if (typeof($('form', data)[0]) != 'undefined') {
-                            form_new = document._importNode($('form', data)[0], true);
-                            form.replaceWith(form_new);
-                        }
-                        else {
-                            form.replaceWith(document._importNode($('p', data)[0], true));
-                        }
-                    }
-                });
-                event.preventDefault();
-                return false;
-            });
         },
 
         /**
diff --git a/js/util.min.js b/js/util.min.js
index 1b35871f64..fe095f5601 100644
--- a/js/util.min.js
+++ b/js/util.min.js
@@ -1 +1 @@
-var SN={C:{I:{CounterBlackout:false,MaxLength:140,PatternUsername:/^[0-9a-zA-Z\-_.]*$/,HTTP20x30x:[200,201,202,203,204,205,206,300,301,302,303,304,305,306,307]},S:{Disabled:"disabled",Warning:"warning",Error:"error",Success:"success",Processing:"processing",CommandResult:"command_result",FormNotice:"form_notice",NoticeDataText:"notice_data-text",NoticeTextCount:"notice_text-count",NoticeInReplyTo:"notice_in-reply-to",NoticeDataAttach:"notice_data-attach",NoticeDataAttachSelected:"notice_data-attach_selected",NoticeActionSubmit:"notice_action-submit",NoticeLat:"notice_data-lat",NoticeLon:"notice_data-lon",NoticeLocationId:"notice_data-location_id",NoticeLocationNs:"notice_data-location_ns",NoticeGeoName:"notice_data-geo_name",NoticeDataGeo:"notice_data-geo",NoticeDataGeoCookie:"NoticeDataGeo",NoticeDataGeoSelected:"notice_data-geo_selected",StatusNetInstance:"StatusNetInstance"}},messages:{},msg:function(a){if(typeof SN.messages[a]=="undefined"){return"["+a+"]"}else{return SN.messages[a]}},U:{FormNoticeEnhancements:function(b){if(jQuery.data(b[0],"ElementData")===undefined){MaxLength=b.find("#"+SN.C.S.NoticeTextCount).text();if(typeof(MaxLength)=="undefined"){MaxLength=SN.C.I.MaxLength}jQuery.data(b[0],"ElementData",{MaxLength:MaxLength});SN.U.Counter(b);NDT=b.find("#"+SN.C.S.NoticeDataText);NDT.bind("keyup",function(c){SN.U.Counter(b)});var a=function(c){window.setTimeout(function(){SN.U.Counter(b)},50)};NDT.bind("cut",a).bind("paste",a);NDT.bind("keydown",function(c){SN.U.SubmitOnReturn(c,b)})}else{b.find("#"+SN.C.S.NoticeTextCount).text(jQuery.data(b[0],"ElementData").MaxLength)}if($("body")[0].id!="conversation"&&window.location.hash.length===0&&$(window).scrollTop()==0){b.find("textarea").focus()}},SubmitOnReturn:function(b,a){if(b.keyCode==13||b.keyCode==10){a.submit();b.preventDefault();b.stopPropagation();$("#"+a[0].id+" #"+SN.C.S.NoticeDataText).blur();$("body").focus();return false}return true},Counter:function(d){SN.C.I.FormNoticeCurrent=d;var b=jQuery.data(d[0],"ElementData").MaxLength;if(b<=0){return}var c=b-SN.U.CharacterCount(d);var a=d.find("#"+SN.C.S.NoticeTextCount);if(c.toString()!=a.text()){if(!SN.C.I.CounterBlackout||c===0){if(a.text()!=String(c)){a.text(c)}if(c<0){d.addClass(SN.C.S.Warning)}else{d.removeClass(SN.C.S.Warning)}if(!SN.C.I.CounterBlackout){SN.C.I.CounterBlackout=true;SN.C.I.FormNoticeCurrent=d;window.setTimeout("SN.U.ClearCounterBlackout(SN.C.I.FormNoticeCurrent);",500)}}}},CharacterCount:function(a){return a.find("#"+SN.C.S.NoticeDataText).val().length},ClearCounterBlackout:function(a){SN.C.I.CounterBlackout=false;SN.U.Counter(a)},RewriteAjaxAction:function(a){if(document.location.protocol=="https:"&&a.substr(0,5)=="http:"){return a.replace(/^http:\/\/[^:\/]+/,"https://"+document.location.host)}else{return a}},FormXHR:function(a){$.ajax({type:"POST",dataType:"xml",url:SN.U.RewriteAjaxAction(a.attr("action")),data:a.serialize()+"&ajax=1",beforeSend:function(b){a.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(c,d,b){alert(b||d)},success:function(b,c){if(typeof($("form",b)[0])!="undefined"){form_new=document._importNode($("form",b)[0],true);a.replaceWith(form_new)}else{a.replaceWith(document._importNode($("p",b)[0],true))}}})},FormNoticeXHR:function(b){SN.C.I.NoticeDataGeo={};b.append('<input type="hidden" name="ajax" value="1"/>');b.attr("action",SN.U.RewriteAjaxAction(b.attr("action")));var c=function(d,e){b.append($('<p class="form_response"></p>').addClass(d).text(e))};var a=function(){b.find(".form_response").remove()};b.ajaxForm({dataType:"xml",timeout:"60000",beforeSend:function(d){if(b.find("#"+SN.C.S.NoticeDataText)[0].value.length===0){b.addClass(SN.C.S.Warning);return false}b.addClass(SN.C.S.Processing).find("#"+SN.C.S.NoticeActionSubmit).addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled);SN.C.I.NoticeDataGeo.NLat=$("#"+SN.C.S.NoticeLat).val();SN.C.I.NoticeDataGeo.NLon=$("#"+SN.C.S.NoticeLon).val();SN.C.I.NoticeDataGeo.NLNS=$("#"+SN.C.S.NoticeLocationNs).val();SN.C.I.NoticeDataGeo.NLID=$("#"+SN.C.S.NoticeLocationId).val();SN.C.I.NoticeDataGeo.NDG=$("#"+SN.C.S.NoticeDataGeo).attr("checked");cookieValue=$.cookie(SN.C.S.NoticeDataGeoCookie);if(cookieValue!==null&&cookieValue!="disabled"){cookieValue=JSON.parse(cookieValue);SN.C.I.NoticeDataGeo.NLat=$("#"+SN.C.S.NoticeLat).val(cookieValue.NLat).val();SN.C.I.NoticeDataGeo.NLon=$("#"+SN.C.S.NoticeLon).val(cookieValue.NLon).val();if($("#"+SN.C.S.NoticeLocationNs).val(cookieValue.NLNS)){SN.C.I.NoticeDataGeo.NLNS=$("#"+SN.C.S.NoticeLocationNs).val(cookieValue.NLNS).val();SN.C.I.NoticeDataGeo.NLID=$("#"+SN.C.S.NoticeLocationId).val(cookieValue.NLID).val()}}if(cookieValue=="disabled"){SN.C.I.NoticeDataGeo.NDG=$("#"+SN.C.S.NoticeDataGeo).attr("checked",false).attr("checked")}else{SN.C.I.NoticeDataGeo.NDG=$("#"+SN.C.S.NoticeDataGeo).attr("checked",true).attr("checked")}return true},error:function(f,g,e){b.removeClass(SN.C.S.Processing).find("#"+SN.C.S.NoticeActionSubmit).removeClass(SN.C.S.Disabled).removeAttr(SN.C.S.Disabled,SN.C.S.Disabled);a();if(g=="timeout"){c("error","Sorry! We had trouble sending your notice. The servers are overloaded. Please try again, and contact the site administrator if this problem persists.")}else{var d=SN.U.GetResponseXML(f);if($("."+SN.C.S.Error,d).length>0){b.append(document._importNode($("."+SN.C.S.Error,d)[0],true))}else{if(parseInt(f.status)===0||jQuery.inArray(parseInt(f.status),SN.C.I.HTTP20x30x)>=0){b.resetForm().find("#"+SN.C.S.NoticeDataAttachSelected).remove();SN.U.FormNoticeEnhancements(b)}else{c("error","(Sorry! We had trouble sending your notice ("+f.status+" "+f.statusText+"). Please report the problem to the site administrator if this happens again.")}}}},success:function(i,k){a();var e=$("#"+SN.C.S.Error,i);if(e.length>0){c("error",e.text())}else{if($("body")[0].id=="bookmarklet"){self.close()}var d=$("#"+SN.C.S.CommandResult,i);if(d.length>0){c("success",d.text())}else{var h=document._importNode($("li",i)[0],true);var j=$("#notices_primary .notices");if(j.length>0&&SN.U.belongsOnTimeline(h)){if($("#"+h.id).length===0){var f=$("#"+SN.C.S.NoticeInReplyTo).val();var g="#notices_primary #notice-"+f;if($("body")[0].id=="conversation"){if(f.length>0&&$(g+" .notices").length<1){$(g).append('<ul class="notices"></ul>')}$($(g+" .notices")[0]).append(h)}else{j.prepend(h)}$("#"+h.id).css({display:"none"}).fadeIn(2500);SN.U.NoticeWithAttachment($("#"+h.id));SN.U.NoticeReplyTo($("#"+h.id))}}else{c("success",$("title",i).text())}}b.resetForm();b.find("#"+SN.C.S.NoticeInReplyTo).val("");b.find("#"+SN.C.S.NoticeDataAttachSelected).remove();SN.U.FormNoticeEnhancements(b)}},complete:function(d,e){b.removeClass(SN.C.S.Processing).find("#"+SN.C.S.NoticeActionSubmit).removeAttr(SN.C.S.Disabled).removeClass(SN.C.S.Disabled);$("#"+SN.C.S.NoticeLat).val(SN.C.I.NoticeDataGeo.NLat);$("#"+SN.C.S.NoticeLon).val(SN.C.I.NoticeDataGeo.NLon);if($("#"+SN.C.S.NoticeLocationNs)){$("#"+SN.C.S.NoticeLocationNs).val(SN.C.I.NoticeDataGeo.NLNS);$("#"+SN.C.S.NoticeLocationId).val(SN.C.I.NoticeDataGeo.NLID)}$("#"+SN.C.S.NoticeDataGeo).attr("checked",SN.C.I.NoticeDataGeo.NDG)}})},GetResponseXML:function(b){try{return b.responseXML}catch(a){return(new DOMParser()).parseFromString(b.responseText,"text/xml")}},NoticeReply:function(){if($("#"+SN.C.S.NoticeDataText).length>0&&$("#content .notice_reply").length>0){$("#content .notice").each(function(){SN.U.NoticeReplyTo($(this))})}},NoticeReplyTo:function(a){a.find(".notice_reply").live("click",function(c){c.preventDefault();var b=($(".author .nickname",a).length>0)?$($(".author .nickname",a)[0]):$(".author .nickname.uid");var d=$($(".notice_id",a)[0]).text();SN.U.NoticeInlineReplyTrigger(d,"@"+b.text());return false})},NoticeInlineReplyTrigger:function(c,i){var h=$("#notice-"+c),d=h;var f=h.closest(".notices");if(f.hasClass("threaded-notices")){d=f.closest("notice")}else{f=$("ul.threaded-notices",h);if(f.length==0){f=$('<ul class="notices threaded-notices xoxo"></ul>');h.append(f)}}var k=$(".notice-reply-form",f);if(k.length==0){$("li.notice-reply-placeholder").remove();var g=$("li.notice-reply",f);if(g.length==0){g=$('<li class="notice-reply"><form class="notice-reply-form" method="post"><textarea name="status_textarea"></textarea><div class="controls"><input type="hidden" name="token"><input type="hidden" name="inreplyto"><input type="submit" class="submit"></div></form></li>');var b=$("#form_notice");k=g.find("form");k.attr("action",b.attr("action"));k.find('input[name="token"]').val(b.find("input[name=token]").val());k.find('input[type="submit"]').val(SN.msg("reply_submit"));f.append(g)}}k.find("input[name=inreplyto]").val(c);var j=k.find("textarea");if(j.length==0){throw"No textarea"}if(i){var a=i+" ";j.val(a+j.val().replace(RegExp(a,"i"),""))}j.focus();if(j[0].setSelectionRange){var e=j.val().length;j[0].setSelectionRange(e,e)}},NoticeReplySet:function(b,d){if(b.match(SN.C.I.PatternUsername)){var c=$("#"+SN.C.S.NoticeDataText);if(c.length>0){replyto="@"+b+" ";c.val(replyto+c.val().replace(RegExp(replyto,"i"),""));$("#"+SN.C.S.FormNotice+" #"+SN.C.S.NoticeInReplyTo).val(d);c[0].focus();if(c[0].setSelectionRange){var a=c.val().length;c[0].setSelectionRange(a,a)}}}},NoticeFavor:function(){$(".form_favor").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_disfavor").live("click",function(){SN.U.FormXHR($(this));return false})},NoticeInlineReplyPlaceholder:function(b){var d=$($(".notice_id",b)[0]).text();var a=b.find("ul.threaded-notices");var c=$('<li class="notice-reply-placeholder"><input class="placeholder"></li>');c.click(function(){SN.U.NoticeInlineReplyTrigger(d)});c.find("input").val(SN.msg("reply_comment"));a.append(c)},NoticeInlineReplySetup:function(){$(".threaded-notices").each(function(){var b=$(this);var a=b.closest(".notice");SN.U.NoticeInlineReplyPlaceholder(a)});$(".replyform").live("submit",function(b){var a=$(this);$.ajax({type:"POST",dataType:"xml",url:SN.U.RewriteAjaxAction(a.attr("action")),data:a.serialize()+"&ajax=1",beforeSend:function(c){a.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled).end().find("textarea").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(d,e,c){alert(c||e)},success:function(c,d){if(typeof($("form",c)[0])!="undefined"){form_new=document._importNode($("form",c)[0],true);a.replaceWith(form_new)}else{a.replaceWith(document._importNode($("p",c)[0],true))}}});b.preventDefault();return false})},NoticeRepeat:function(){$(".form_repeat").live("click",function(a){a.preventDefault();SN.U.NoticeRepeatConfirmation($(this));return false})},NoticeRepeatConfirmation:function(a){var c=a.find(".submit");var b=c.clone();b.addClass("submit_dialogbox").removeClass("submit");a.append(b);b.bind("click",function(){SN.U.FormXHR(a);return false});c.hide();a.addClass("dialogbox").append('<button class="close">&#215;</button>').closest(".notice-options").addClass("opaque");a.find("button.close").click(function(){$(this).remove();a.removeClass("dialogbox").closest(".notice-options").removeClass("opaque");a.find(".submit_dialogbox").remove();a.find(".submit").show();return false})},NoticeAttachments:function(){$(".notice a.attachment").each(function(){SN.U.NoticeWithAttachment($(this).closest(".notice"))})},NoticeWithAttachment:function(b){if(b.find(".attachment").length===0){return}var a=b.find(".attachment.more");if(a.length>0){$(a[0]).click(function(){var c=$(this);c.addClass(SN.C.S.Processing);$.get(c.attr("href")+"/ajax",null,function(d){c.parent(".entry-content").html($(d).find("#attachment_view .entry-content").html())});return false}).attr("title",SN.msg("showmore_tooltip"))}},NoticeDataAttach:function(){NDA=$("#"+SN.C.S.NoticeDataAttach);NDA.change(function(c){var a=$(this).val();if(!a){$("#"+SN.C.S.NoticeDataAttachSelected).remove();return false}S='<div id="'+SN.C.S.NoticeDataAttachSelected+'" class="'+SN.C.S.Success+'"><code>'+a+'</code> <button class="close">&#215;</button></div>';NDAS=$("#"+SN.C.S.NoticeDataAttachSelected);if(NDAS.length>0){NDAS.replaceWith(S)}else{$("#"+SN.C.S.FormNotice).append(S)}$("#"+SN.C.S.NoticeDataAttachSelected+" button").click(function(){$("#"+SN.C.S.NoticeDataAttachSelected).remove();NDA.val("");return false});if(typeof this.files=="object"){for(var b=0;b<this.files.length;b++){SN.U.PreviewAttach(this.files[b])}}})},maxFileSize:function(b){var a=$(b).find("input[name=MAX_FILE_SIZE]").attr("value");if(a){return parseInt(a)}else{return 0}},PreviewAttach:function(c){var d=c.type+" "+Math.round(c.size/1024)+"KB";var e=true;var g;if(typeof window.createObjectURL!="undefined"){g=function(h,i){i(window.createObjectURL(h))}}else{if(typeof window.FileReader!="undefined"){g=function(i,j){var h=new FileReader();h.onload=function(k){j(h.result)};h.readAsDataURL(i)}}else{e=false}}var a=["image/png","image/jpeg","image/gif","image/svg+xml"];if($.inArray(c.type,a)==-1){e=false}var f=8*1024*1024;if(c.size>f){e=false}if(e){g(c,function(i){var h=$("<img>").attr("title",d).attr("alt",d).attr("src",i).attr("style","height: 120px");$("#"+SN.C.S.NoticeDataAttachSelected).append(h)})}else{var b=$("<div></div>").text(d);$("#"+SN.C.S.NoticeDataAttachSelected).append(b)}},NoticeLocationAttach:function(){var c=$("#"+SN.C.S.NoticeLat).val();var h=$("#"+SN.C.S.NoticeLon).val();var d=$("#"+SN.C.S.NoticeLocationNs).val();var i=$("#"+SN.C.S.NoticeLocationId).val();var a=$("#"+SN.C.S.NoticeGeoName).text();var b=$("#"+SN.C.S.NoticeDataGeo);function e(){$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",jQuery.trim($("label[for="+SN.C.S.NoticeDataGeo+"]").text())).removeClass("checked");$("#"+SN.C.S.NoticeLat).val("");$("#"+SN.C.S.NoticeLon).val("");$("#"+SN.C.S.NoticeLocationNs).val("");$("#"+SN.C.S.NoticeLocationId).val("");$("#"+SN.C.S.NoticeDataGeo).attr("checked",false);$.cookie(SN.C.S.NoticeDataGeoCookie,"disabled",{path:"/"})}function j(k,l){$.getJSON(k,l,function(m){var n,o;if(typeof(m.location_ns)!="undefined"){$("#"+SN.C.S.NoticeLocationNs).val(m.location_ns);n=m.location_ns}if(typeof(m.location_id)!="undefined"){$("#"+SN.C.S.NoticeLocationId).val(m.location_id);o=m.location_id}if(typeof(m.name)=="undefined"){NLN_text=l.lat+";"+l.lon}else{NLN_text=m.name}$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",NoticeDataGeo_text.ShareDisable+" ("+NLN_text+")");$("#"+SN.C.S.NoticeLat).val(l.lat);$("#"+SN.C.S.NoticeLon).val(l.lon);$("#"+SN.C.S.NoticeLocationNs).val(n);$("#"+SN.C.S.NoticeLocationId).val(o);$("#"+SN.C.S.NoticeDataGeo).attr("checked",true);var p={NLat:l.lat,NLon:l.lon,NLNS:n,NLID:o,NLN:NLN_text,NLNU:m.url,NDG:true};$.cookie(SN.C.S.NoticeDataGeoCookie,JSON.stringify(p),{path:"/"})})}if(b.length>0){if($.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){b.attr("checked",false)}else{b.attr("checked",true)}var f=$("#notice_data-geo_wrap");var g=f.attr("title");f.removeAttr("title");$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",jQuery.trim($("label[for="+SN.C.S.NoticeDataGeo+"]").text()));b.change(function(){if($("#"+SN.C.S.NoticeDataGeo).attr("checked")===true||$.cookie(SN.C.S.NoticeDataGeoCookie)===null){$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",NoticeDataGeo_text.ShareDisable).addClass("checked");if($.cookie(SN.C.S.NoticeDataGeoCookie)===null||$.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){if(navigator.geolocation){navigator.geolocation.getCurrentPosition(function(m){$("#"+SN.C.S.NoticeLat).val(m.coords.latitude);$("#"+SN.C.S.NoticeLon).val(m.coords.longitude);var n={lat:m.coords.latitude,lon:m.coords.longitude,token:$("#token").val()};j(g,n)},function(m){switch(m.code){case m.PERMISSION_DENIED:e();break;case m.TIMEOUT:$("#"+SN.C.S.NoticeDataGeo).attr("checked",false);break}},{timeout:10000})}else{if(c.length>0&&h.length>0){var k={lat:c,lon:h,token:$("#token").val()};j(g,k)}else{e();$("#"+SN.C.S.NoticeDataGeo).remove();$("label[for="+SN.C.S.NoticeDataGeo+"]").remove()}}}else{var l=JSON.parse($.cookie(SN.C.S.NoticeDataGeoCookie));$("#"+SN.C.S.NoticeLat).val(l.NLat);$("#"+SN.C.S.NoticeLon).val(l.NLon);$("#"+SN.C.S.NoticeLocationNs).val(l.NLNS);$("#"+SN.C.S.NoticeLocationId).val(l.NLID);$("#"+SN.C.S.NoticeDataGeo).attr("checked",l.NDG);$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",NoticeDataGeo_text.ShareDisable+" ("+l.NLN+")").addClass("checked")}}else{e()}}).change()}},NewDirectMessage:function(){NDM=$(".entity_send-a-message a");NDM.attr({href:NDM.attr("href")+"&ajax=1"});NDM.bind("click",function(){var a=$(".entity_send-a-message form");if(a.length===0){$(this).addClass(SN.C.S.Processing);$.get(NDM.attr("href"),null,function(b){$(".entity_send-a-message").append(document._importNode($("form",b)[0],true));a=$(".entity_send-a-message .form_notice");SN.U.FormNoticeXHR(a);SN.U.FormNoticeEnhancements(a);a.append('<button class="close">&#215;</button>');$(".entity_send-a-message button").click(function(){a.hide();return false});NDM.removeClass(SN.C.S.Processing)})}else{a.show();$(".entity_send-a-message textarea").focus()}return false})},GetFullYear:function(c,d,a){var b=new Date();b.setFullYear(c,d,a);return b},StatusNetInstance:{Set:function(b){var a=SN.U.StatusNetInstance.Get();if(a!==null){b=$.extend(a,b)}$.cookie(SN.C.S.StatusNetInstance,JSON.stringify(b),{path:"/",expires:SN.U.GetFullYear(2029,0,1)})},Get:function(){var a=$.cookie(SN.C.S.StatusNetInstance);if(a!==null){return JSON.parse(a)}return null},Delete:function(){$.cookie(SN.C.S.StatusNetInstance,null)}},belongsOnTimeline:function(b){var a=$("body").attr("id");if(a=="public"){return true}var c=$("#nav_profile a").attr("href");if(c){var d=$(b).find(".entry-title .author a.url").attr("href");if(d==c){if(a=="all"||a=="showstream"){return true}}}return false}},Init:{NoticeForm:function(){if($("body.user_in").length>0){SN.U.NoticeLocationAttach();$("."+SN.C.S.FormNotice).each(function(){SN.U.FormNoticeXHR($(this));SN.U.FormNoticeEnhancements($(this))});SN.U.NoticeDataAttach()}},Notices:function(){if($("body.user_in").length>0){SN.U.NoticeFavor();SN.U.NoticeRepeat();SN.U.NoticeReply();SN.U.NoticeInlineReplySetup()}SN.U.NoticeAttachments()},EntityActions:function(){if($("body.user_in").length>0){$(".form_user_subscribe").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_user_unsubscribe").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_group_join").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_group_leave").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_user_nudge").live("click",function(){SN.U.FormXHR($(this));return false});SN.U.NewDirectMessage()}},Login:function(){if(SN.U.StatusNetInstance.Get()!==null){var a=SN.U.StatusNetInstance.Get().Nickname;if(a!==null){$("#form_login #nickname").val(a)}}$("#form_login").bind("submit",function(){SN.U.StatusNetInstance.Set({Nickname:$("#form_login #nickname").val()});return true})},UploadForms:function(){$("input[type=file]").change(function(d){if(typeof this.files=="object"&&this.files.length>0){var c=0;for(var b=0;b<this.files.length;b++){c+=this.files[b].size}var a=SN.U.maxFileSize($(this.form));if(a>0&&c>a){var e="File too large: maximum upload size is %d bytes.";alert(e.replace("%d",a));$(this).val("");d.preventDefault();return false}}})}}};$(document).ready(function(){SN.Init.UploadForms();if($("."+SN.C.S.FormNotice).length>0){SN.Init.NoticeForm()}if($("#content .notices").length>0){SN.Init.Notices()}if($("#content .entity_actions").length>0){SN.Init.EntityActions()}if($("#form_login").length>0){SN.Init.Login()}});if(!document.ELEMENT_NODE){document.ELEMENT_NODE=1;document.ATTRIBUTE_NODE=2;document.TEXT_NODE=3;document.CDATA_SECTION_NODE=4;document.ENTITY_REFERENCE_NODE=5;document.ENTITY_NODE=6;document.PROCESSING_INSTRUCTION_NODE=7;document.COMMENT_NODE=8;document.DOCUMENT_NODE=9;document.DOCUMENT_TYPE_NODE=10;document.DOCUMENT_FRAGMENT_NODE=11;document.NOTATION_NODE=12}document._importNode=function(e,a){switch(e.nodeType){case document.ELEMENT_NODE:var d=document.createElement(e.nodeName);if(e.attributes&&e.attributes.length>0){for(var c=0,b=e.attributes.length;c<b;){if(e.attributes[c].nodeName=="class"){d.className=e.getAttribute(e.attributes[c++].nodeName)}else{d.setAttribute(e.attributes[c].nodeName,e.getAttribute(e.attributes[c++].nodeName))}}}if(a&&e.childNodes&&e.childNodes.length>0){for(var c=0,b=e.childNodes.length;c<b;){d.appendChild(document._importNode(e.childNodes[c++],a))}}return d;break;case document.TEXT_NODE:case document.CDATA_SECTION_NODE:case document.COMMENT_NODE:return document.createTextNode(e.nodeValue);break}};if(typeof navigator.geolocation=="undefined"||navigator.geolocation.shim){(function(){(function(){if(window.google&&google.gears){return}var c=null;if(typeof GearsFactory!="undefined"){c=new GearsFactory()}else{try{c=new ActiveXObject("Gears.Factory");if(c.getBuildInfo().indexOf("ie_mobile")!=-1){c.privateSetGlobalObject(this)}}catch(d){if((typeof navigator.mimeTypes!="undefined")&&navigator.mimeTypes["application/x-googlegears"]){c=document.createElement("object");c.style.display="none";c.width=0;c.height=0;c.type="application/x-googlegears";document.documentElement.appendChild(c)}}}if(!c){return}if(!window.google){google={}}if(!google.gears){google.gears={factory:c}}})();var a=(function(){var d=google.gears.factory.create("beta.geolocation");var c=function(f,e){return function(g){f(g);e.lastPosition=g}};return{shim:true,type:"Gears",lastPosition:null,getCurrentPosition:function(e,g,h){var f=this;var i=c(e,f);d.getCurrentPosition(i,g,h)},watchPosition:function(e,f,g){d.watchPosition(e,f,g)},clearWatch:function(e){d.clearWatch(e)},getPermission:function(g,e,f){d.getPermission(g,e,f)}}});var b=(function(){var i=false;var e=function(){if(!d()&&!i){i=true;var j=document.createElement("script");j.src=(document.location.protocol=="https:"?"https://":"http://")+"www.google.com/jsapi?callback=_google_loader_apiLoaded";j.type="text/javascript";document.getElementsByTagName("body")[0].appendChild(j)}};var c=[];var h=function(j){c.push(j)};var f=function(){if(d()){while(c.length>0){var j=c.pop();j()}}};window._google_loader_apiLoaded=function(){f()};var d=function(){return(window.google&&google.loader)};var g=function(j){if(d()){return true}h(j);e();return false};e();return{shim:true,type:"ClientLocation",lastPosition:null,getCurrentPosition:function(k,n,o){var m=this;if(!g(function(){m.getCurrentPosition(k,n,o)})){return}if(google.loader.ClientLocation){var l=google.loader.ClientLocation;var j={coords:{latitude:l.latitude,longitude:l.longitude,altitude:null,accuracy:43000,altitudeAccuracy:null,heading:null,speed:null},address:{city:l.address.city,country:l.address.country,country_code:l.address.country_code,region:l.address.region},timestamp:new Date()};k(j);this.lastPosition=j}else{if(n==="function"){n({code:3,message:"Using the Google ClientLocation API and it is not able to calculate a location."})}}},watchPosition:function(j,l,m){this.getCurrentPosition(j,l,m);var k=this;var n=setInterval(function(){k.getCurrentPosition(j,l,m)},10000);return n},clearWatch:function(j){clearInterval(j)},getPermission:function(l,j,k){return true}}});navigator.geolocation=(window.google&&google.gears)?a():b()})()};
\ No newline at end of file
+var SN={C:{I:{CounterBlackout:false,MaxLength:140,PatternUsername:/^[0-9a-zA-Z\-_.]*$/,HTTP20x30x:[200,201,202,203,204,205,206,300,301,302,303,304,305,306,307]},S:{Disabled:"disabled",Warning:"warning",Error:"error",Success:"success",Processing:"processing",CommandResult:"command_result",FormNotice:"form_notice",NoticeDataText:"notice_data-text",NoticeTextCount:"notice_text-count",NoticeInReplyTo:"notice_in-reply-to",NoticeDataAttach:"notice_data-attach",NoticeDataAttachSelected:"notice_data-attach_selected",NoticeActionSubmit:"notice_action-submit",NoticeLat:"notice_data-lat",NoticeLon:"notice_data-lon",NoticeLocationId:"notice_data-location_id",NoticeLocationNs:"notice_data-location_ns",NoticeGeoName:"notice_data-geo_name",NoticeDataGeo:"notice_data-geo",NoticeDataGeoCookie:"NoticeDataGeo",NoticeDataGeoSelected:"notice_data-geo_selected",StatusNetInstance:"StatusNetInstance"}},messages:{},msg:function(a){if(typeof SN.messages[a]=="undefined"){return"["+a+"]"}else{return SN.messages[a]}},U:{FormNoticeEnhancements:function(b){if(jQuery.data(b[0],"ElementData")===undefined){MaxLength=b.find("#"+SN.C.S.NoticeTextCount).text();if(typeof(MaxLength)=="undefined"){MaxLength=SN.C.I.MaxLength}jQuery.data(b[0],"ElementData",{MaxLength:MaxLength});SN.U.Counter(b);NDT=b.find("#"+SN.C.S.NoticeDataText);NDT.bind("keyup",function(c){SN.U.Counter(b)});var a=function(c){window.setTimeout(function(){SN.U.Counter(b)},50)};NDT.bind("cut",a).bind("paste",a);NDT.bind("keydown",function(c){SN.U.SubmitOnReturn(c,b)})}else{b.find("#"+SN.C.S.NoticeTextCount).text(jQuery.data(b[0],"ElementData").MaxLength)}if($("body")[0].id!="conversation"&&window.location.hash.length===0&&$(window).scrollTop()==0){b.find("textarea").focus()}},SubmitOnReturn:function(b,a){if(b.keyCode==13||b.keyCode==10){a.submit();b.preventDefault();b.stopPropagation();$("#"+a[0].id+" #"+SN.C.S.NoticeDataText).blur();$("body").focus();return false}return true},Counter:function(d){SN.C.I.FormNoticeCurrent=d;var b=jQuery.data(d[0],"ElementData").MaxLength;if(b<=0){return}var c=b-SN.U.CharacterCount(d);var a=d.find("#"+SN.C.S.NoticeTextCount);if(c.toString()!=a.text()){if(!SN.C.I.CounterBlackout||c===0){if(a.text()!=String(c)){a.text(c)}if(c<0){d.addClass(SN.C.S.Warning)}else{d.removeClass(SN.C.S.Warning)}if(!SN.C.I.CounterBlackout){SN.C.I.CounterBlackout=true;SN.C.I.FormNoticeCurrent=d;window.setTimeout("SN.U.ClearCounterBlackout(SN.C.I.FormNoticeCurrent);",500)}}}},CharacterCount:function(a){return a.find("#"+SN.C.S.NoticeDataText).val().length},ClearCounterBlackout:function(a){SN.C.I.CounterBlackout=false;SN.U.Counter(a)},RewriteAjaxAction:function(a){if(document.location.protocol=="https:"&&a.substr(0,5)=="http:"){return a.replace(/^http:\/\/[^:\/]+/,"https://"+document.location.host)}else{return a}},FormXHR:function(a){$.ajax({type:"POST",dataType:"xml",url:SN.U.RewriteAjaxAction(a.attr("action")),data:a.serialize()+"&ajax=1",beforeSend:function(b){a.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(c,d,b){alert(b||d)},success:function(b,c){if(typeof($("form",b)[0])!="undefined"){form_new=document._importNode($("form",b)[0],true);a.replaceWith(form_new)}else{a.replaceWith(document._importNode($("p",b)[0],true))}}})},FormNoticeXHR:function(b){SN.C.I.NoticeDataGeo={};b.append('<input type="hidden" name="ajax" value="1"/>');b.attr("action",SN.U.RewriteAjaxAction(b.attr("action")));var c=function(d,e){b.append($('<p class="form_response"></p>').addClass(d).text(e))};var a=function(){b.find(".form_response").remove()};b.ajaxForm({dataType:"xml",timeout:"60000",beforeSend:function(d){if(b.find("#"+SN.C.S.NoticeDataText)[0].value.length===0){b.addClass(SN.C.S.Warning);return false}b.addClass(SN.C.S.Processing).find("#"+SN.C.S.NoticeActionSubmit).addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled);SN.C.I.NoticeDataGeo.NLat=$("#"+SN.C.S.NoticeLat).val();SN.C.I.NoticeDataGeo.NLon=$("#"+SN.C.S.NoticeLon).val();SN.C.I.NoticeDataGeo.NLNS=$("#"+SN.C.S.NoticeLocationNs).val();SN.C.I.NoticeDataGeo.NLID=$("#"+SN.C.S.NoticeLocationId).val();SN.C.I.NoticeDataGeo.NDG=$("#"+SN.C.S.NoticeDataGeo).attr("checked");cookieValue=$.cookie(SN.C.S.NoticeDataGeoCookie);if(cookieValue!==null&&cookieValue!="disabled"){cookieValue=JSON.parse(cookieValue);SN.C.I.NoticeDataGeo.NLat=$("#"+SN.C.S.NoticeLat).val(cookieValue.NLat).val();SN.C.I.NoticeDataGeo.NLon=$("#"+SN.C.S.NoticeLon).val(cookieValue.NLon).val();if($("#"+SN.C.S.NoticeLocationNs).val(cookieValue.NLNS)){SN.C.I.NoticeDataGeo.NLNS=$("#"+SN.C.S.NoticeLocationNs).val(cookieValue.NLNS).val();SN.C.I.NoticeDataGeo.NLID=$("#"+SN.C.S.NoticeLocationId).val(cookieValue.NLID).val()}}if(cookieValue=="disabled"){SN.C.I.NoticeDataGeo.NDG=$("#"+SN.C.S.NoticeDataGeo).attr("checked",false).attr("checked")}else{SN.C.I.NoticeDataGeo.NDG=$("#"+SN.C.S.NoticeDataGeo).attr("checked",true).attr("checked")}return true},error:function(f,g,e){b.removeClass(SN.C.S.Processing).find("#"+SN.C.S.NoticeActionSubmit).removeClass(SN.C.S.Disabled).removeAttr(SN.C.S.Disabled,SN.C.S.Disabled);a();if(g=="timeout"){c("error","Sorry! We had trouble sending your notice. The servers are overloaded. Please try again, and contact the site administrator if this problem persists.")}else{var d=SN.U.GetResponseXML(f);if($("."+SN.C.S.Error,d).length>0){b.append(document._importNode($("."+SN.C.S.Error,d)[0],true))}else{if(parseInt(f.status)===0||jQuery.inArray(parseInt(f.status),SN.C.I.HTTP20x30x)>=0){b.resetForm().find("#"+SN.C.S.NoticeDataAttachSelected).remove();SN.U.FormNoticeEnhancements(b)}else{c("error","(Sorry! We had trouble sending your notice ("+f.status+" "+f.statusText+"). Please report the problem to the site administrator if this happens again.")}}}},success:function(i,k){a();var e=$("#"+SN.C.S.Error,i);if(e.length>0){c("error",e.text())}else{if($("body")[0].id=="bookmarklet"){self.close()}var d=$("#"+SN.C.S.CommandResult,i);if(d.length>0){c("success",d.text())}else{var h=document._importNode($("li",i)[0],true);var j=$("#notices_primary .notices");if(j.length>0&&SN.U.belongsOnTimeline(h)){if($("#"+h.id).length===0){var f=$("#"+SN.C.S.NoticeInReplyTo).val();var g="#notices_primary #notice-"+f;if($("body")[0].id=="conversation"){if(f.length>0&&$(g+" .notices").length<1){$(g).append('<ul class="notices"></ul>')}$($(g+" .notices")[0]).append(h)}else{j.prepend(h)}$("#"+h.id).css({display:"none"}).fadeIn(2500);SN.U.NoticeWithAttachment($("#"+h.id));SN.U.NoticeReplyTo($("#"+h.id))}}else{c("success",$("title",i).text())}}b.resetForm();b.find("#"+SN.C.S.NoticeInReplyTo).val("");b.find("#"+SN.C.S.NoticeDataAttachSelected).remove();SN.U.FormNoticeEnhancements(b)}},complete:function(d,e){b.removeClass(SN.C.S.Processing).find("#"+SN.C.S.NoticeActionSubmit).removeAttr(SN.C.S.Disabled).removeClass(SN.C.S.Disabled);$("#"+SN.C.S.NoticeLat).val(SN.C.I.NoticeDataGeo.NLat);$("#"+SN.C.S.NoticeLon).val(SN.C.I.NoticeDataGeo.NLon);if($("#"+SN.C.S.NoticeLocationNs)){$("#"+SN.C.S.NoticeLocationNs).val(SN.C.I.NoticeDataGeo.NLNS);$("#"+SN.C.S.NoticeLocationId).val(SN.C.I.NoticeDataGeo.NLID)}$("#"+SN.C.S.NoticeDataGeo).attr("checked",SN.C.I.NoticeDataGeo.NDG)}})},GetResponseXML:function(b){try{return b.responseXML}catch(a){return(new DOMParser()).parseFromString(b.responseText,"text/xml")}},NoticeReply:function(){if($("#"+SN.C.S.NoticeDataText).length>0&&$("#content .notice_reply").length>0){$("#content .notice").each(function(){SN.U.NoticeReplyTo($(this))})}},NoticeReplyTo:function(a){a.find(".notice_reply").live("click",function(c){c.preventDefault();var b=($(".author .nickname",a).length>0)?$($(".author .nickname",a)[0]):$(".author .nickname.uid");var d=$($(".notice_id",a)[0]).text();SN.U.NoticeInlineReplyTrigger(d,"@"+b.text());return false})},NoticeInlineReplyTrigger:function(c,i){var h=$("#notice-"+c),d=h;var f=h.closest(".notices");if(f.hasClass("threaded-notices")){d=f.closest("notice")}else{f=$("ul.threaded-notices",h);if(f.length==0){f=$('<ul class="notices threaded-notices xoxo"></ul>');h.append(f)}}var k=$(".notice-reply-form",f);if(k.length==0){$("li.notice-reply-placeholder").remove();var g=$("li.notice-reply",f);if(g.length==0){g=$('<li class="notice-reply"><form class="notice-reply-form" method="post"><textarea name="status_textarea"></textarea><div class="controls"><input type="hidden" name="token"><input type="hidden" name="inreplyto"><input type="submit" class="submit"></div></form></li>');var b=$("#form_notice");k=g.find("form");k.attr("action",b.attr("action"));k.find('input[name="token"]').val(b.find("input[name=token]").val());k.find('input[type="submit"]').val(SN.msg("reply_submit"));f.append(g);k.submit(function(m){var l=k;$.ajax({type:"POST",dataType:"xml",url:SN.U.RewriteAjaxAction(l.attr("action")),data:l.serialize()+"&ajax=1",beforeSend:function(n){l.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled).end().find("textarea").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(o,p,n){alert(n||p)},success:function(p,q){var o=$("li",p)[0];if(o){var n=document._importNode(o,true);g.replaceWith(n);SN.U.NoticeInlineReplyPlaceholder(d)}else{console.log("confused!",p)}}});m.preventDefault();return false})}}k.find("input[name=inreplyto]").val(c);var j=k.find("textarea");if(j.length==0){throw"No textarea"}if(i){var a=i+" ";j.val(a+j.val().replace(RegExp(a,"i"),""))}j.focus();if(j[0].setSelectionRange){var e=j.val().length;j[0].setSelectionRange(e,e)}},NoticeReplySet:function(b,d){if(b.match(SN.C.I.PatternUsername)){var c=$("#"+SN.C.S.NoticeDataText);if(c.length>0){replyto="@"+b+" ";c.val(replyto+c.val().replace(RegExp(replyto,"i"),""));$("#"+SN.C.S.FormNotice+" #"+SN.C.S.NoticeInReplyTo).val(d);c[0].focus();if(c[0].setSelectionRange){var a=c.val().length;c[0].setSelectionRange(a,a)}}}},NoticeFavor:function(){$(".form_favor").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_disfavor").live("click",function(){SN.U.FormXHR($(this));return false})},NoticeInlineReplyPlaceholder:function(b){var d=$($(".notice_id",b)[0]).text();var a=b.find("ul.threaded-notices");var c=$('<li class="notice-reply-placeholder"><input class="placeholder"></li>');c.click(function(){SN.U.NoticeInlineReplyTrigger(d)});c.find("input").val(SN.msg("reply_comment"));a.append(c)},NoticeInlineReplySetup:function(){$(".threaded-notices").each(function(){var b=$(this);var a=b.closest(".notice");SN.U.NoticeInlineReplyPlaceholder(a)})},NoticeRepeat:function(){$(".form_repeat").live("click",function(a){a.preventDefault();SN.U.NoticeRepeatConfirmation($(this));return false})},NoticeRepeatConfirmation:function(a){var c=a.find(".submit");var b=c.clone();b.addClass("submit_dialogbox").removeClass("submit");a.append(b);b.bind("click",function(){SN.U.FormXHR(a);return false});c.hide();a.addClass("dialogbox").append('<button class="close">&#215;</button>').closest(".notice-options").addClass("opaque");a.find("button.close").click(function(){$(this).remove();a.removeClass("dialogbox").closest(".notice-options").removeClass("opaque");a.find(".submit_dialogbox").remove();a.find(".submit").show();return false})},NoticeAttachments:function(){$(".notice a.attachment").each(function(){SN.U.NoticeWithAttachment($(this).closest(".notice"))})},NoticeWithAttachment:function(b){if(b.find(".attachment").length===0){return}var a=b.find(".attachment.more");if(a.length>0){$(a[0]).click(function(){var c=$(this);c.addClass(SN.C.S.Processing);$.get(c.attr("href")+"/ajax",null,function(d){c.parent(".entry-content").html($(d).find("#attachment_view .entry-content").html())});return false}).attr("title",SN.msg("showmore_tooltip"))}},NoticeDataAttach:function(){NDA=$("#"+SN.C.S.NoticeDataAttach);NDA.change(function(c){var a=$(this).val();if(!a){$("#"+SN.C.S.NoticeDataAttachSelected).remove();return false}S='<div id="'+SN.C.S.NoticeDataAttachSelected+'" class="'+SN.C.S.Success+'"><code>'+a+'</code> <button class="close">&#215;</button></div>';NDAS=$("#"+SN.C.S.NoticeDataAttachSelected);if(NDAS.length>0){NDAS.replaceWith(S)}else{$("#"+SN.C.S.FormNotice).append(S)}$("#"+SN.C.S.NoticeDataAttachSelected+" button").click(function(){$("#"+SN.C.S.NoticeDataAttachSelected).remove();NDA.val("");return false});if(typeof this.files=="object"){for(var b=0;b<this.files.length;b++){SN.U.PreviewAttach(this.files[b])}}})},maxFileSize:function(b){var a=$(b).find("input[name=MAX_FILE_SIZE]").attr("value");if(a){return parseInt(a)}else{return 0}},PreviewAttach:function(c){var d=c.type+" "+Math.round(c.size/1024)+"KB";var e=true;var g;if(typeof window.createObjectURL!="undefined"){g=function(h,i){i(window.createObjectURL(h))}}else{if(typeof window.FileReader!="undefined"){g=function(i,j){var h=new FileReader();h.onload=function(k){j(h.result)};h.readAsDataURL(i)}}else{e=false}}var a=["image/png","image/jpeg","image/gif","image/svg+xml"];if($.inArray(c.type,a)==-1){e=false}var f=8*1024*1024;if(c.size>f){e=false}if(e){g(c,function(i){var h=$("<img>").attr("title",d).attr("alt",d).attr("src",i).attr("style","height: 120px");$("#"+SN.C.S.NoticeDataAttachSelected).append(h)})}else{var b=$("<div></div>").text(d);$("#"+SN.C.S.NoticeDataAttachSelected).append(b)}},NoticeLocationAttach:function(){var c=$("#"+SN.C.S.NoticeLat).val();var h=$("#"+SN.C.S.NoticeLon).val();var d=$("#"+SN.C.S.NoticeLocationNs).val();var i=$("#"+SN.C.S.NoticeLocationId).val();var a=$("#"+SN.C.S.NoticeGeoName).text();var b=$("#"+SN.C.S.NoticeDataGeo);function e(){$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",jQuery.trim($("label[for="+SN.C.S.NoticeDataGeo+"]").text())).removeClass("checked");$("#"+SN.C.S.NoticeLat).val("");$("#"+SN.C.S.NoticeLon).val("");$("#"+SN.C.S.NoticeLocationNs).val("");$("#"+SN.C.S.NoticeLocationId).val("");$("#"+SN.C.S.NoticeDataGeo).attr("checked",false);$.cookie(SN.C.S.NoticeDataGeoCookie,"disabled",{path:"/"})}function j(k,l){$.getJSON(k,l,function(m){var n,o;if(typeof(m.location_ns)!="undefined"){$("#"+SN.C.S.NoticeLocationNs).val(m.location_ns);n=m.location_ns}if(typeof(m.location_id)!="undefined"){$("#"+SN.C.S.NoticeLocationId).val(m.location_id);o=m.location_id}if(typeof(m.name)=="undefined"){NLN_text=l.lat+";"+l.lon}else{NLN_text=m.name}$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",NoticeDataGeo_text.ShareDisable+" ("+NLN_text+")");$("#"+SN.C.S.NoticeLat).val(l.lat);$("#"+SN.C.S.NoticeLon).val(l.lon);$("#"+SN.C.S.NoticeLocationNs).val(n);$("#"+SN.C.S.NoticeLocationId).val(o);$("#"+SN.C.S.NoticeDataGeo).attr("checked",true);var p={NLat:l.lat,NLon:l.lon,NLNS:n,NLID:o,NLN:NLN_text,NLNU:m.url,NDG:true};$.cookie(SN.C.S.NoticeDataGeoCookie,JSON.stringify(p),{path:"/"})})}if(b.length>0){if($.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){b.attr("checked",false)}else{b.attr("checked",true)}var f=$("#notice_data-geo_wrap");var g=f.attr("title");f.removeAttr("title");$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",jQuery.trim($("label[for="+SN.C.S.NoticeDataGeo+"]").text()));b.change(function(){if($("#"+SN.C.S.NoticeDataGeo).attr("checked")===true||$.cookie(SN.C.S.NoticeDataGeoCookie)===null){$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",NoticeDataGeo_text.ShareDisable).addClass("checked");if($.cookie(SN.C.S.NoticeDataGeoCookie)===null||$.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){if(navigator.geolocation){navigator.geolocation.getCurrentPosition(function(m){$("#"+SN.C.S.NoticeLat).val(m.coords.latitude);$("#"+SN.C.S.NoticeLon).val(m.coords.longitude);var n={lat:m.coords.latitude,lon:m.coords.longitude,token:$("#token").val()};j(g,n)},function(m){switch(m.code){case m.PERMISSION_DENIED:e();break;case m.TIMEOUT:$("#"+SN.C.S.NoticeDataGeo).attr("checked",false);break}},{timeout:10000})}else{if(c.length>0&&h.length>0){var k={lat:c,lon:h,token:$("#token").val()};j(g,k)}else{e();$("#"+SN.C.S.NoticeDataGeo).remove();$("label[for="+SN.C.S.NoticeDataGeo+"]").remove()}}}else{var l=JSON.parse($.cookie(SN.C.S.NoticeDataGeoCookie));$("#"+SN.C.S.NoticeLat).val(l.NLat);$("#"+SN.C.S.NoticeLon).val(l.NLon);$("#"+SN.C.S.NoticeLocationNs).val(l.NLNS);$("#"+SN.C.S.NoticeLocationId).val(l.NLID);$("#"+SN.C.S.NoticeDataGeo).attr("checked",l.NDG);$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",NoticeDataGeo_text.ShareDisable+" ("+l.NLN+")").addClass("checked")}}else{e()}}).change()}},NewDirectMessage:function(){NDM=$(".entity_send-a-message a");NDM.attr({href:NDM.attr("href")+"&ajax=1"});NDM.bind("click",function(){var a=$(".entity_send-a-message form");if(a.length===0){$(this).addClass(SN.C.S.Processing);$.get(NDM.attr("href"),null,function(b){$(".entity_send-a-message").append(document._importNode($("form",b)[0],true));a=$(".entity_send-a-message .form_notice");SN.U.FormNoticeXHR(a);SN.U.FormNoticeEnhancements(a);a.append('<button class="close">&#215;</button>');$(".entity_send-a-message button").click(function(){a.hide();return false});NDM.removeClass(SN.C.S.Processing)})}else{a.show();$(".entity_send-a-message textarea").focus()}return false})},GetFullYear:function(c,d,a){var b=new Date();b.setFullYear(c,d,a);return b},StatusNetInstance:{Set:function(b){var a=SN.U.StatusNetInstance.Get();if(a!==null){b=$.extend(a,b)}$.cookie(SN.C.S.StatusNetInstance,JSON.stringify(b),{path:"/",expires:SN.U.GetFullYear(2029,0,1)})},Get:function(){var a=$.cookie(SN.C.S.StatusNetInstance);if(a!==null){return JSON.parse(a)}return null},Delete:function(){$.cookie(SN.C.S.StatusNetInstance,null)}},belongsOnTimeline:function(b){var a=$("body").attr("id");if(a=="public"){return true}var c=$("#nav_profile a").attr("href");if(c){var d=$(b).find(".entry-title .author a.url").attr("href");if(d==c){if(a=="all"||a=="showstream"){return true}}}return false}},Init:{NoticeForm:function(){if($("body.user_in").length>0){SN.U.NoticeLocationAttach();$("."+SN.C.S.FormNotice).each(function(){SN.U.FormNoticeXHR($(this));SN.U.FormNoticeEnhancements($(this))});SN.U.NoticeDataAttach()}},Notices:function(){if($("body.user_in").length>0){SN.U.NoticeFavor();SN.U.NoticeRepeat();SN.U.NoticeReply();SN.U.NoticeInlineReplySetup()}SN.U.NoticeAttachments()},EntityActions:function(){if($("body.user_in").length>0){$(".form_user_subscribe").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_user_unsubscribe").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_group_join").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_group_leave").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_user_nudge").live("click",function(){SN.U.FormXHR($(this));return false});SN.U.NewDirectMessage()}},Login:function(){if(SN.U.StatusNetInstance.Get()!==null){var a=SN.U.StatusNetInstance.Get().Nickname;if(a!==null){$("#form_login #nickname").val(a)}}$("#form_login").bind("submit",function(){SN.U.StatusNetInstance.Set({Nickname:$("#form_login #nickname").val()});return true})},UploadForms:function(){$("input[type=file]").change(function(d){if(typeof this.files=="object"&&this.files.length>0){var c=0;for(var b=0;b<this.files.length;b++){c+=this.files[b].size}var a=SN.U.maxFileSize($(this.form));if(a>0&&c>a){var e="File too large: maximum upload size is %d bytes.";alert(e.replace("%d",a));$(this).val("");d.preventDefault();return false}}})}}};$(document).ready(function(){SN.Init.UploadForms();if($("."+SN.C.S.FormNotice).length>0){SN.Init.NoticeForm()}if($("#content .notices").length>0){SN.Init.Notices()}if($("#content .entity_actions").length>0){SN.Init.EntityActions()}if($("#form_login").length>0){SN.Init.Login()}});if(!document.ELEMENT_NODE){document.ELEMENT_NODE=1;document.ATTRIBUTE_NODE=2;document.TEXT_NODE=3;document.CDATA_SECTION_NODE=4;document.ENTITY_REFERENCE_NODE=5;document.ENTITY_NODE=6;document.PROCESSING_INSTRUCTION_NODE=7;document.COMMENT_NODE=8;document.DOCUMENT_NODE=9;document.DOCUMENT_TYPE_NODE=10;document.DOCUMENT_FRAGMENT_NODE=11;document.NOTATION_NODE=12}document._importNode=function(e,a){switch(e.nodeType){case document.ELEMENT_NODE:var d=document.createElement(e.nodeName);if(e.attributes&&e.attributes.length>0){for(var c=0,b=e.attributes.length;c<b;){if(e.attributes[c].nodeName=="class"){d.className=e.getAttribute(e.attributes[c++].nodeName)}else{d.setAttribute(e.attributes[c].nodeName,e.getAttribute(e.attributes[c++].nodeName))}}}if(a&&e.childNodes&&e.childNodes.length>0){for(var c=0,b=e.childNodes.length;c<b;){d.appendChild(document._importNode(e.childNodes[c++],a))}}return d;break;case document.TEXT_NODE:case document.CDATA_SECTION_NODE:case document.COMMENT_NODE:return document.createTextNode(e.nodeValue);break}};if(typeof navigator.geolocation=="undefined"||navigator.geolocation.shim){(function(){(function(){if(window.google&&google.gears){return}var c=null;if(typeof GearsFactory!="undefined"){c=new GearsFactory()}else{try{c=new ActiveXObject("Gears.Factory");if(c.getBuildInfo().indexOf("ie_mobile")!=-1){c.privateSetGlobalObject(this)}}catch(d){if((typeof navigator.mimeTypes!="undefined")&&navigator.mimeTypes["application/x-googlegears"]){c=document.createElement("object");c.style.display="none";c.width=0;c.height=0;c.type="application/x-googlegears";document.documentElement.appendChild(c)}}}if(!c){return}if(!window.google){google={}}if(!google.gears){google.gears={factory:c}}})();var a=(function(){var d=google.gears.factory.create("beta.geolocation");var c=function(f,e){return function(g){f(g);e.lastPosition=g}};return{shim:true,type:"Gears",lastPosition:null,getCurrentPosition:function(e,g,h){var f=this;var i=c(e,f);d.getCurrentPosition(i,g,h)},watchPosition:function(e,f,g){d.watchPosition(e,f,g)},clearWatch:function(e){d.clearWatch(e)},getPermission:function(g,e,f){d.getPermission(g,e,f)}}});var b=(function(){var i=false;var e=function(){if(!d()&&!i){i=true;var j=document.createElement("script");j.src=(document.location.protocol=="https:"?"https://":"http://")+"www.google.com/jsapi?callback=_google_loader_apiLoaded";j.type="text/javascript";document.getElementsByTagName("body")[0].appendChild(j)}};var c=[];var h=function(j){c.push(j)};var f=function(){if(d()){while(c.length>0){var j=c.pop();j()}}};window._google_loader_apiLoaded=function(){f()};var d=function(){return(window.google&&google.loader)};var g=function(j){if(d()){return true}h(j);e();return false};e();return{shim:true,type:"ClientLocation",lastPosition:null,getCurrentPosition:function(k,n,o){var m=this;if(!g(function(){m.getCurrentPosition(k,n,o)})){return}if(google.loader.ClientLocation){var l=google.loader.ClientLocation;var j={coords:{latitude:l.latitude,longitude:l.longitude,altitude:null,accuracy:43000,altitudeAccuracy:null,heading:null,speed:null},address:{city:l.address.city,country:l.address.country,country_code:l.address.country_code,region:l.address.region},timestamp:new Date()};k(j);this.lastPosition=j}else{if(n==="function"){n({code:3,message:"Using the Google ClientLocation API and it is not able to calculate a location."})}}},watchPosition:function(j,l,m){this.getCurrentPosition(j,l,m);var k=this;var n=setInterval(function(){k.getCurrentPosition(j,l,m)},10000);return n},clearWatch:function(j){clearInterval(j)},getPermission:function(l,j,k){return true}}});navigator.geolocation=(window.google&&google.gears)?a():b()})()};
\ No newline at end of file

From 407cc851cc3a7ad19d4e7dfc8747ca385c5915d8 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Mon, 28 Feb 2011 17:13:54 -0800
Subject: [PATCH 321/655] Collapse long threaded displays with a link to the
 convo view (todo: turn it into an ajax loader for inline expansion)

---
 lib/threadednoticelist.php | 38 +++++++++++++++++++++++++++-----------
 theme/base/css/display.css |  4 +++-
 2 files changed, 30 insertions(+), 12 deletions(-)

diff --git a/lib/threadednoticelist.php b/lib/threadednoticelist.php
index c1c4b4f36a..42b85bd132 100644
--- a/lib/threadednoticelist.php
+++ b/lib/threadednoticelist.php
@@ -145,6 +145,8 @@ class ThreadedNoticeList extends NoticeList
 
 class ThreadedNoticeListItem extends NoticeListItem
 {
+    const INITIAL_ITEMS = 3;
+
     /**
      * finish the notice
      *
@@ -155,24 +157,32 @@ class ThreadedNoticeListItem extends NoticeListItem
 
     function showEnd()
     {
-        $notice = Notice::conversationStream($this->notice->conversation);
+        $notice = Notice::conversationStream($this->notice->conversation, 0, self::INITIAL_ITEMS + 2);
         $notices = array();
+        $cnt = 0;
+        $moreCutoff = null;
         while ($notice->fetch()) {
             if ($notice->id == $this->notice->id) {
                 // Skip!
                 continue;
             }
+            $cnt++;
+            if ($cnt > self::INITIAL_ITEMS) {
+                // boo-yah
+                $moreCutoff = clone($notice);
+                break;
+            }
             $notices[] = clone($notice); // *grumble* inefficient as hell
         }
 
         if ($notices) {
             $this->out->elementStart('ul', 'notices threaded-notices xoxo');
-            foreach (array_reverse($notices) as $notice) {
-                $item = new ThreadedNoticeListSubItem($notice, $this->out);
+            if ($moreCutoff) {
+                $item = new ThreadedNoticeListMoreItem($moreCutoff, $this->out);
                 $item->show();
             }
-            if (common_current_user()) {
-                $item = new ThreadedNoticeListReplyItem($this->notice, $this->out);
+            foreach (array_reverse($notices) as $notice) {
+                $item = new ThreadedNoticeListSubItem($notice, $this->out);
                 $item->show();
             }
             $this->out->elementEnd('ul');
@@ -202,9 +212,9 @@ class ThreadedNoticeListSubItem extends NoticeListItem
 }
 
 /**
- * Show a mini inline posting form for replies.
+ * Placeholder for loading more replies...
  */
-class ThreadedNoticeListReplyItem extends NoticeListItem
+class ThreadedNoticeListMoreItem extends NoticeListItem
 {
 
     /**
@@ -233,15 +243,21 @@ class ThreadedNoticeListReplyItem extends NoticeListItem
     {
         if (Event::handle('StartOpenNoticeListItemElement', array($this))) {
             $id = (empty($this->repeat)) ? $this->notice->id : $this->repeat->id;
-            $this->out->elementStart('li', array('class' => 'notice-reply-placeholder'));
+            $this->out->elementStart('li', array('class' => 'notice-reply-comments'));
         }
     }
 
     function showMiniForm()
     {
-        $replyToId = $this->notice->id;
-        $id = 'replyto-notice-' + $replyToId;
-        $url = common_local_url('newnotice');
+        $id = $this->notice->conversation;
+        $url = common_local_url('conversation', array('id' => $id)) . '#notice-' . $this->notice->id;
+
+        $notice = new Notice();
+        $notice->conversation = $id;
+        $n = $notice->count() - 1;
+        $msg = sprintf(_m('Show all %d comment', 'Show all %d comments', $n), $n);
+
+        $this->out->element('a', array('href' => $url), $msg);
 
         // @fixme replace this with an ajax-friendly form pair?
         /*
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index dabf929a72..98345a0726 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -1133,7 +1133,9 @@ border-top-style:solid;
 .threaded-notices .notice-reply .controls {
     text-align: right;
 }
-
+.threaded-notices .notice-reply-comments {
+    margin: 8px;
+}
 /* NOTICES */
 #notices_primary {
 float:left;

From 082ddf365ee5a6f4f726a96257c6f51fc06360e7 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Mon, 28 Feb 2011 17:23:01 -0800
Subject: [PATCH 322/655] Cut repeats out of the magic handling

---
 lib/threadednoticelist.php | 54 ++++++++++++++++++++------------------
 1 file changed, 28 insertions(+), 26 deletions(-)

diff --git a/lib/threadednoticelist.php b/lib/threadednoticelist.php
index 42b85bd132..a3e5f62a59 100644
--- a/lib/threadednoticelist.php
+++ b/lib/threadednoticelist.php
@@ -157,35 +157,37 @@ class ThreadedNoticeListItem extends NoticeListItem
 
     function showEnd()
     {
-        $notice = Notice::conversationStream($this->notice->conversation, 0, self::INITIAL_ITEMS + 2);
-        $notices = array();
-        $cnt = 0;
-        $moreCutoff = null;
-        while ($notice->fetch()) {
-            if ($notice->id == $this->notice->id) {
-                // Skip!
-                continue;
+        if (!$this->repeat) {
+            $notice = Notice::conversationStream($this->notice->conversation, 0, self::INITIAL_ITEMS + 2);
+            $notices = array();
+            $cnt = 0;
+            $moreCutoff = null;
+            while ($notice->fetch()) {
+                if ($notice->id == $this->notice->id) {
+                    // Skip!
+                    continue;
+                }
+                $cnt++;
+                if ($cnt > self::INITIAL_ITEMS) {
+                    // boo-yah
+                    $moreCutoff = clone($notice);
+                    break;
+                }
+                $notices[] = clone($notice); // *grumble* inefficient as hell
             }
-            $cnt++;
-            if ($cnt > self::INITIAL_ITEMS) {
-                // boo-yah
-                $moreCutoff = clone($notice);
-                break;
-            }
-            $notices[] = clone($notice); // *grumble* inefficient as hell
-        }
 
-        if ($notices) {
-            $this->out->elementStart('ul', 'notices threaded-notices xoxo');
-            if ($moreCutoff) {
-                $item = new ThreadedNoticeListMoreItem($moreCutoff, $this->out);
-                $item->show();
+            if ($notices) {
+                $this->out->elementStart('ul', 'notices threaded-notices xoxo');
+                if ($moreCutoff) {
+                    $item = new ThreadedNoticeListMoreItem($moreCutoff, $this->out);
+                    $item->show();
+                }
+                foreach (array_reverse($notices) as $notice) {
+                    $item = new ThreadedNoticeListSubItem($notice, $this->out);
+                    $item->show();
+                }
+                $this->out->elementEnd('ul');
             }
-            foreach (array_reverse($notices) as $notice) {
-                $item = new ThreadedNoticeListSubItem($notice, $this->out);
-                $item->show();
-            }
-            $this->out->elementEnd('ul');
         }
 
         parent::showEnd();

From c8d6a77d8ae64d527838ed6691e6eabff4aa12e2 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Tue, 1 Mar 2011 05:45:38 -0500
Subject: [PATCH 323/655] common superclass for menu widgets

---
 lib/menu.php | 84 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 84 insertions(+)
 create mode 100644 lib/menu.php

diff --git a/lib/menu.php b/lib/menu.php
new file mode 100644
index 0000000000..b9791d2359
--- /dev/null
+++ b/lib/menu.php
@@ -0,0 +1,84 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2011, StatusNet, Inc.
+ *
+ * Menu widget
+ * 
+ * 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  Widget
+ * @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);
+}
+
+/**
+ * Superclass for menus
+ *
+ * @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 Menu extends Widget
+{
+    var $action     = null;
+    var $actionName = null;
+    /**
+     * Construction
+     *
+     * @param Action $action current action, used for output
+     */
+    function __construct($action=null)
+    {
+        parent::__construct($action);
+
+        $this->action     = $action;
+        $this->actionName = $action->trimmed('action');
+    }
+
+    function item($actionName, $args, $label, $description, $id=null)
+    {
+        if (empty($id)) {
+            $id = $this->menuItemID($actionName);
+        }
+
+        $url = common_local_url($actionName, $args);
+
+        $this->out->menuItem($url,
+                             $label,
+                             $description,
+                             $actionName == $this->actionName,
+                             $id);
+    }
+
+    function menuItemID($actionName)
+    {
+        return sprintf('nav_%s', $actionName);
+    }
+}

From 903053caec99da4443fa10f045f83239634b1a58 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Tue, 1 Mar 2011 05:46:03 -0500
Subject: [PATCH 324/655] primary and secondary nav use menu superclass

---
 lib/action.php       | 104 ++------------------------------------
 lib/primarynav.php   | 116 +++++++++++++++++++++++++++++++++++++++++++
 lib/secondarynav.php |  90 +++++++++++++++++++++++++++++++++
 3 files changed, 210 insertions(+), 100 deletions(-)
 create mode 100644 lib/primarynav.php
 create mode 100644 lib/secondarynav.php

diff --git a/lib/action.php b/lib/action.php
index 3ef9ffa3c8..54bea7c931 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -543,69 +543,8 @@ class Action extends HTMLOutputter // lawsuit
      */
     function showPrimaryNav()
     {
-        $user = common_current_user();
-        $this->elementStart('ul', array('class' => 'nav',
-                                        'id' => 'site_nav_global_primary'));
-        if (Event::handle('StartPrimaryNav', array($this))) {
-            if (!empty($user)) {
-                $this->menuItem(common_local_url('all', 
-                                                 array('nickname' => $user->nickname)),
-                                _m('Home'),
-                                _m('Friends timeline'),
-                                false,
-                                'nav_home');
-                $this->menuItem(common_local_url('showstream', 
-                                                 array('nickname' => $user->nickname)),
-                                _m('Profile'),
-                                _m('Your profile'),
-                                false,
-                                'nav_profile');
-                $this->menuItem(common_local_url('public'),
-                                _m('Public'),
-                                _m('Everyone on this site'),
-                                false,
-                                'nav_public');
-                $this->menuItem(common_local_url('profilesettings'),
-                                _m('Settings'),
-                                _m('Change your personal settings'),
-                                false,
-                                'nav_account');
-                if ($user->hasRight(Right::CONFIGURESITE)) {
-                    $this->menuItem(common_local_url('siteadminpanel'),
-                                    _m('Admin'), 
-                                    _m('Site configuration'),
-                                    false,
-                                    'nav_admin');
-                }
-                $this->menuItem(common_local_url('logout'),
-                                _m('Logout'), 
-                                _m('Logout from the site'),
-                                false,
-                                'nav_logout');
-            } else {
-                $this->menuItem(common_local_url('public'),
-                                _m('Public'),
-                                _m('Everyone on this site'),
-                                false,
-                                'nav_public');
-                $this->menuItem(common_local_url('login'),
-                                _m('Login'), 
-                                _m('Login to the site'),
-                                false,
-                                'nav_login');
-            }
-
-            if (!empty($user) || !common_config('site', 'private')) {
-                $this->menuItem(common_local_url('noticesearch'),
-                                _m('Search'),
-                                _m('Search the site'),
-                                false,
-                                'nav_search');
-            }
-
-            Event::handle('EndPrimaryNav', array($this));
-        }
-        $this->elementEnd('ul');
+        $pn = new PrimaryNav($this);
+        $pn->show();
     }
 
     /**
@@ -850,43 +789,8 @@ class Action extends HTMLOutputter // lawsuit
      */
     function showSecondaryNav()
     {
-        $this->elementStart('ul', array('class' => 'nav',
-                                        'id' => 'site_nav_global_secondary'));
-        if (Event::handle('StartSecondaryNav', array($this))) {
-            $this->menuItem(common_local_url('doc', array('title' => 'help')),
-                            // TRANS: Secondary navigation menu option leading to help on StatusNet.
-                            _('Help'));
-            $this->menuItem(common_local_url('doc', array('title' => 'about')),
-                            // TRANS: Secondary navigation menu option leading to text about StatusNet site.
-                            _('About'));
-            $this->menuItem(common_local_url('doc', array('title' => 'faq')),
-                            // TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-                            _('FAQ'));
-            $bb = common_config('site', 'broughtby');
-            if (!empty($bb)) {
-                $this->menuItem(common_local_url('doc', array('title' => 'tos')),
-                                // TRANS: Secondary navigation menu option leading to Terms of Service.
-                                _('TOS'));
-            }
-            $this->menuItem(common_local_url('doc', array('title' => 'privacy')),
-                            // TRANS: Secondary navigation menu option leading to privacy policy.
-                            _('Privacy'));
-            $this->menuItem(common_local_url('doc', array('title' => 'source')),
-                            // TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-                            _('Source'));
-            $this->menuItem(common_local_url('version'),
-                            // TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-                            _('Version'));
-            $this->menuItem(common_local_url('doc', array('title' => 'contact')),
-                            // TRANS: Secondary navigation menu option leading to e-mail contact information on the
-                            // TRANS: StatusNet site, where to report bugs, ...
-                            _('Contact'));
-            $this->menuItem(common_local_url('doc', array('title' => 'badge')),
-                            // TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-                            _('Badge'));
-            Event::handle('EndSecondaryNav', array($this));
-        }
-        $this->elementEnd('ul');
+        $sn = new SecondaryNav($this);
+        $sn->show();
     }
 
     /**
diff --git a/lib/primarynav.php b/lib/primarynav.php
new file mode 100644
index 0000000000..01517d9429
--- /dev/null
+++ b/lib/primarynav.php
@@ -0,0 +1,116 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2011, StatusNet, Inc.
+ *
+ * Primary nav, show on all pages
+ * 
+ * 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);
+}
+
+/**
+ * Primary, top-level menu
+ *
+ * @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 PrimaryNav extends Menu
+{
+    function show()
+    {
+        $user = common_current_user();
+        $this->action->elementStart('ul', array('class' => 'nav',
+                                        'id' => 'site_nav_global_primary'));
+        if (Event::handle('StartPrimaryNav', array($this->action))) {
+            if (!empty($user)) {
+                $this->action->menuItem(common_local_url('all', 
+                                                 array('nickname' => $user->nickname)),
+                                _m('Home'),
+                                _m('Friends timeline'),
+                                false,
+                                'nav_home');
+                $this->action->menuItem(common_local_url('showstream', 
+                                                 array('nickname' => $user->nickname)),
+                                _m('Profile'),
+                                _m('Your profile'),
+                                false,
+                                'nav_profile');
+                $this->action->menuItem(common_local_url('public'),
+                                _m('Public'),
+                                _m('Everyone on this site'),
+                                false,
+                                'nav_public');
+                $this->action->menuItem(common_local_url('profilesettings'),
+                                _m('Settings'),
+                                _m('Change your personal settings'),
+                                false,
+                                'nav_account');
+                if ($user->hasRight(Right::CONFIGURESITE)) {
+                    $this->action->menuItem(common_local_url('siteadminpanel'),
+                                    _m('Admin'), 
+                                    _m('Site configuration'),
+                                    false,
+                                    'nav_admin');
+                }
+                $this->action->menuItem(common_local_url('logout'),
+                                _m('Logout'), 
+                                _m('Logout from the site'),
+                                false,
+                                'nav_logout');
+            } else {
+                $this->action->menuItem(common_local_url('public'),
+                                _m('Public'),
+                                _m('Everyone on this site'),
+                                false,
+                                'nav_public');
+                $this->action->menuItem(common_local_url('login'),
+                                _m('Login'), 
+                                _m('Login to the site'),
+                                false,
+                                'nav_login');
+            }
+
+            if (!empty($user) || !common_config('site', 'private')) {
+                $this->action->menuItem(common_local_url('noticesearch'),
+                                _m('Search'),
+                                _m('Search the site'),
+                                false,
+                                'nav_search');
+            }
+
+            Event::handle('EndPrimaryNav', array($this->action));
+        }
+        $this->action->elementEnd('ul');
+    }
+}
diff --git a/lib/secondarynav.php b/lib/secondarynav.php
new file mode 100644
index 0000000000..542de51ac1
--- /dev/null
+++ b/lib/secondarynav.php
@@ -0,0 +1,90 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2011, StatusNet, Inc.
+ *
+ * Secondary menu, shown at foot of all pages
+ * 
+ * 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  Cache
+ * @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);
+}
+
+/**
+ * Secondary menu, shown at the bottom of all pages
+ *
+ * @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 SecondaryNav extends Menu
+{
+    function show()
+    {
+        $this->out->elementStart('ul', array('class' => 'nav',
+                                             'id' => 'site_nav_global_secondary'));
+        if (Event::handle('StartSecondaryNav', array($this->action))) {
+            $this->out->menuItem(common_local_url('doc', array('title' => 'help')),
+                                 // TRANS: Secondary navigation menu option leading to help on StatusNet.
+                                 _('Help'));
+            $this->out->menuItem(common_local_url('doc', array('title' => 'about')),
+                                 // TRANS: Secondary navigation menu option leading to text about StatusNet site.
+                                 _('About'));
+            $this->out->menuItem(common_local_url('doc', array('title' => 'faq')),
+                                 // TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
+                                 _('FAQ'));
+            $bb = common_config('site', 'broughtby');
+            if (!empty($bb)) {
+                $this->out->menuItem(common_local_url('doc', array('title' => 'tos')),
+                                     // TRANS: Secondary navigation menu option leading to Terms of Service.
+                                     _('TOS'));
+            }
+            $this->out->menuItem(common_local_url('doc', array('title' => 'privacy')),
+                                 // TRANS: Secondary navigation menu option leading to privacy policy.
+                                 _('Privacy'));
+            $this->out->menuItem(common_local_url('doc', array('title' => 'source')),
+                                 // TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
+                                 _('Source'));
+            $this->out->menuItem(common_local_url('version'),
+                                 // TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
+                                 _('Version'));
+            $this->out->menuItem(common_local_url('doc', array('title' => 'contact')),
+                                 // TRANS: Secondary navigation menu option leading to e-mail contact information on the
+                                 // TRANS: StatusNet site, where to report bugs, ...
+                                 _('Contact'));
+            $this->out->menuItem(common_local_url('doc', array('title' => 'badge')),
+                                 // TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
+                                 _('Badge'));
+            Event::handle('EndSecondaryNav', array($this->action));
+        }
+        $this->out->elementEnd('ul');
+    }
+}
\ No newline at end of file

From d6d3dfda81ce60cb511f69a9d890d68e67ebd7d8 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Tue, 1 Mar 2011 05:51:00 -0500
Subject: [PATCH 325/655] AdminPanelNav has own module, uses Menu

---
 lib/adminpanelnav.php | 148 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 148 insertions(+)
 create mode 100644 lib/adminpanelnav.php

diff --git a/lib/adminpanelnav.php b/lib/adminpanelnav.php
new file mode 100644
index 0000000000..ceedf6ceac
--- /dev/null
+++ b/lib/adminpanelnav.php
@@ -0,0 +1,148 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2011, StatusNet, Inc.
+ *
+ * Menu for admin panels
+ * 
+ * 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);
+}
+
+/**
+ * Menu for admin panels
+ *
+ * @category Output
+ * @package  StatusNet
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Sarven Capadisli <csarven@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 AdminPanelNav extends Menu
+{
+    /**
+     * Show the menu
+     *
+     * @return void
+     */
+    function show()
+    {
+        $action_name = $this->action->trimmed('action');
+
+        $this->action->elementStart('ul', array('class' => 'nav'));
+
+        if (Event::handle('StartAdminPanelNav', array($this))) {
+
+            if (AdminPanelAction::canAdmin('site')) {
+                // TRANS: Menu item title/tooltip
+                $menu_title = _('Basic site configuration');
+                // TRANS: Menu item for site administration
+                $this->out->menuItem(common_local_url('siteadminpanel'), _m('MENU', 'Site'),
+                                     $menu_title, $action_name == 'siteadminpanel', 'nav_site_admin_panel');
+            }
+
+            if (AdminPanelAction::canAdmin('design')) {
+                // TRANS: Menu item title/tooltip
+                $menu_title = _('Design configuration');
+                // TRANS: Menu item for site administration
+                $this->out->menuItem(common_local_url('designadminpanel'), _m('MENU', 'Design'),
+                                     $menu_title, $action_name == 'designadminpanel', 'nav_design_admin_panel');
+            }
+
+            if (AdminPanelAction::canAdmin('user')) {
+                // TRANS: Menu item title/tooltip
+                $menu_title = _('User configuration');
+                // TRANS: Menu item for site administration
+                $this->out->menuItem(common_local_url('useradminpanel'), _('User'),
+                                     $menu_title, $action_name == 'useradminpanel', 'nav_user_admin_panel');
+            }
+
+            if (AdminPanelAction::canAdmin('access')) {
+                // TRANS: Menu item title/tooltip
+                $menu_title = _('Access configuration');
+                // TRANS: Menu item for site administration
+                $this->out->menuItem(common_local_url('accessadminpanel'), _('Access'),
+                                     $menu_title, $action_name == 'accessadminpanel', 'nav_access_admin_panel');
+            }
+
+            if (AdminPanelAction::canAdmin('paths')) {
+                // TRANS: Menu item title/tooltip
+                $menu_title = _('Paths configuration');
+                // TRANS: Menu item for site administration
+                $this->out->menuItem(common_local_url('pathsadminpanel'), _('Paths'),
+                                    $menu_title, $action_name == 'pathsadminpanel', 'nav_paths_admin_panel');
+            }
+
+            if (AdminPanelAction::canAdmin('sessions')) {
+                // TRANS: Menu item title/tooltip
+                $menu_title = _('Sessions configuration');
+                // TRANS: Menu item for site administration
+                $this->out->menuItem(common_local_url('sessionsadminpanel'), _('Sessions'),
+                                     $menu_title, $action_name == 'sessionsadminpanel', 'nav_sessions_admin_panel');
+            }
+
+            if (AdminPanelAction::canAdmin('sitenotice')) {
+                // TRANS: Menu item title/tooltip
+                $menu_title = _('Edit site notice');
+                // TRANS: Menu item for site administration
+                $this->out->menuItem(common_local_url('sitenoticeadminpanel'), _('Site notice'),
+                                     $menu_title, $action_name == 'sitenoticeadminpanel', 'nav_sitenotice_admin_panel');
+            }
+
+            if (AdminPanelAction::canAdmin('snapshot')) {
+                // TRANS: Menu item title/tooltip
+                $menu_title = _('Snapshots configuration');
+                // TRANS: Menu item for site administration
+                $this->out->menuItem(common_local_url('snapshotadminpanel'), _('Snapshots'),
+                                     $menu_title, $action_name == 'snapshotadminpanel', 'nav_snapshot_admin_panel');
+            }
+
+            if (AdminPanelAction::canAdmin('license')) {
+                // TRANS: Menu item title/tooltip
+                $menu_title = _('Set site license');
+                // TRANS: Menu item for site administration
+                $this->out->menuItem(common_local_url('licenseadminpanel'), _('License'),
+                                     $menu_title, $action_name == 'licenseadminpanel', 'nav_license_admin_panel');
+            }
+
+            if (AdminPanelAction::canAdmin('plugins')) {
+                // TRANS: Menu item title/tooltip
+                $menu_title = _('Plugins configuration');
+                // TRANS: Menu item for site administration
+                $this->out->menuItem(common_local_url('pluginsadminpanel'), _('Plugins'),
+                                     $menu_title, $action_name == 'pluginsadminpanel', 'nav_design_admin_panel');
+            }
+
+            Event::handle('EndAdminPanelNav', array($this));
+        }
+        $this->action->elementEnd('ul');
+    }
+}

From a64c6c501555bc70ef617ecb8c4a21b6e1f91518 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Tue, 1 Mar 2011 06:00:03 -0500
Subject: [PATCH 326/655] all nav menus use menu superclass

---
 lib/groupnav.php         |  4 +---
 lib/logingroupnav.php    | 15 +--------------
 lib/personalgroupnav.php | 37 ++++++++-----------------------------
 lib/publicgroupnav.php   | 16 +---------------
 lib/searchgroupnav.php   | 12 ++++--------
 lib/settingsnav.php      | 19 +++----------------
 lib/subgroupnav.php      |  6 ++----
 7 files changed, 20 insertions(+), 89 deletions(-)

diff --git a/lib/groupnav.php b/lib/groupnav.php
index ee988d0a98..a2dd6eac00 100644
--- a/lib/groupnav.php
+++ b/lib/groupnav.php
@@ -49,9 +49,8 @@ require_once INSTALLDIR.'/lib/widget.php';
  * @see      HTMLOutputter
  */
 
-class GroupNav extends Widget
+class GroupNav extends Menu
 {
-    var $action = null;
     var $group = null;
 
     /**
@@ -63,7 +62,6 @@ class GroupNav extends Widget
     function __construct($action=null, $group=null)
     {
         parent::__construct($action);
-        $this->action = $action;
         $this->group = $group;
     }
 
diff --git a/lib/logingroupnav.php b/lib/logingroupnav.php
index a309e7320f..3c67f76322 100644
--- a/lib/logingroupnav.php
+++ b/lib/logingroupnav.php
@@ -44,21 +44,8 @@ require_once INSTALLDIR.'/lib/widget.php';
  *
  * @see      Widget
  */
-class LoginGroupNav extends Widget
+class LoginGroupNav extends Menu
 {
-    var $action = null;
-
-    /**
-     * Construction
-     *
-     * @param Action $action current action, used for output
-     */
-    function __construct($action=null)
-    {
-        parent::__construct($action);
-        $this->action = $action;
-    }
-
     /**
      * Show the menu
      *
diff --git a/lib/personalgroupnav.php b/lib/personalgroupnav.php
index 72d0893af7..d72a865677 100644
--- a/lib/personalgroupnav.php
+++ b/lib/personalgroupnav.php
@@ -2,7 +2,7 @@
 /**
  * StatusNet, the distributed open-source microblogging tool
  *
- * Base class for all actions (~views)
+ * Menu for personal group of actions
  *
  * PHP version 5
  *
@@ -19,11 +19,11 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
- * @category  Action
+ * @category  Menu
  * @package   StatusNet
  * @author    Evan Prodromou <evan@status.net>
  * @author    Sarven Capadisli <csarven@status.net>
- * @copyright 2008 StatusNet, Inc.
+ * @copyright 2008-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/
  */
@@ -32,41 +32,20 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
-require_once INSTALLDIR.'/lib/widget.php';
-
 /**
- * Base class for all actions
+ * Menu for personal group of actions
  *
- * This is the base class for all actions in the package. An action is
- * more or less a "view" in an MVC framework.
- *
- * Actions are responsible for extracting and validating parameters; using
- * model classes to read and write to the database; and doing ouput.
- *
- * @category Output
+ * @category Menu
  * @package  StatusNet
  * @author   Evan Prodromou <evan@status.net>
  * @author   Sarven Capadisli <csarven@status.net>
+ * @copyright 2008-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/
- *
- * @see      HTMLOutputter
  */
-class PersonalGroupNav extends Widget
+
+class PersonalGroupNav extends Menu
 {
-    var $action = null;
-
-    /**
-     * Construction
-     *
-     * @param Action $action current action, used for output
-     */
-    function __construct($action=null)
-    {
-        parent::__construct($action);
-        $this->action = $action;
-    }
-
     /**
      * Show the menu
      *
diff --git a/lib/publicgroupnav.php b/lib/publicgroupnav.php
index ae9cbdebb4..bd2ad53124 100644
--- a/lib/publicgroupnav.php
+++ b/lib/publicgroupnav.php
@@ -46,22 +46,8 @@ require_once INSTALLDIR.'/lib/widget.php';
  * @see      Widget
  */
 
-class PublicGroupNav extends Widget
+class PublicGroupNav extends Menu
 {
-    var $action = null;
-
-    /**
-     * Construction
-     *
-     * @param Action $action current action, used for output
-     */
-
-    function __construct($action=null)
-    {
-        parent::__construct($action);
-        $this->action = $action;
-    }
-
     /**
      * Show the menu
      *
diff --git a/lib/searchgroupnav.php b/lib/searchgroupnav.php
index e843dc096c..cfe8fde353 100644
--- a/lib/searchgroupnav.php
+++ b/lib/searchgroupnav.php
@@ -2,7 +2,7 @@
 /**
  * StatusNet, the distributed open-source microblogging tool
  *
- * Menu for search actions
+ * Menu for search group of actions
  *
  * PHP version 5
  *
@@ -22,7 +22,7 @@
  * @category  Menu
  * @package   StatusNet
  * @author    Evan Prodromou <evan@status.net>
- * @copyright 2008 StatusNet, Inc.
+ * @copyright 2008-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/
  */
@@ -31,12 +31,10 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
-require_once INSTALLDIR.'/lib/widget.php';
-
 /**
  * Menu for public group of actions
  *
- * @category Output
+ * @category Menu
  * @package  StatusNet
  * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
@@ -45,9 +43,8 @@ require_once INSTALLDIR.'/lib/widget.php';
  * @see      Widget
  */
 
-class SearchGroupNav extends Widget
+class SearchGroupNav extends Menu
 {
-    var $action = null;
     var $q = null;
 
     /**
@@ -59,7 +56,6 @@ class SearchGroupNav extends Widget
     function __construct($action=null, $q = null)
     {
         parent::__construct($action);
-        $this->action = $action;
         $this->q = $q;
     }
 
diff --git a/lib/settingsnav.php b/lib/settingsnav.php
index a73f73f86a..697e7ee46b 100644
--- a/lib/settingsnav.php
+++ b/lib/settingsnav.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * StatusNet - the distributed open-source microblogging tool
- * Copyright (C) 2010, StatusNet, Inc.
+ * Copyright (C) 2010,2011, StatusNet, Inc.
  *
  * Settings menu
  * 
@@ -23,7 +23,7 @@
  * @category  Widget
  * @package   StatusNet
  * @author    Evan Prodromou <evan@status.net>
- * @copyright 2010 StatusNet, Inc.
+ * @copyright 2010,2011 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
  * @link      http://status.net/
  */
@@ -46,21 +46,8 @@ if (!defined('STATUSNET')) {
  * @see      HTMLOutputter
  */
 
-class SettingsNav extends Widget
+class SettingsNav extends Menu
 {
-    var $action = null;
-
-    /**
-     * Construction
-     *
-     * @param Action $action current action, used for output
-     */
-    function __construct($action=null)
-    {
-        parent::__construct($action);
-        $this->action = $action;
-    }
-
     /**
      * Show the menu
      *
diff --git a/lib/subgroupnav.php b/lib/subgroupnav.php
index be3ba27480..ee4b0a8dff 100644
--- a/lib/subgroupnav.php
+++ b/lib/subgroupnav.php
@@ -22,7 +22,7 @@
  * @category  Subs
  * @package   StatusNet
  * @author    Evan Prodromou <evan@status.net>
- * @copyright 2008-2009 StatusNet, Inc.
+ * @copyright 2008-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/
  */
@@ -43,9 +43,8 @@ require_once INSTALLDIR.'/lib/widget.php';
  * @link     http://status.net/
  */
 
-class SubGroupNav extends Widget
+class SubGroupNav extends Menu
 {
-    var $action = null;
     var $user = null;
 
     /**
@@ -57,7 +56,6 @@ class SubGroupNav extends Widget
     function __construct($action=null, $user=null)
     {
         parent::__construct($action);
-        $this->action = $action;
         $this->user = $user;
     }
 

From d8cbc20a792ed8b04d7257186e571e926a5280ac Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Tue, 1 Mar 2011 06:29:24 -0500
Subject: [PATCH 327/655] method to show submenus

---
 lib/menu.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/lib/menu.php b/lib/menu.php
index b9791d2359..7947b4d7e4 100644
--- a/lib/menu.php
+++ b/lib/menu.php
@@ -81,4 +81,12 @@ class Menu extends Widget
     {
         return sprintf('nav_%s', $actionName);
     }
+
+    function submenu($label, $menu)
+    {
+        $this->action->elementStart('li');
+        $this->action->text($label);
+        $menu->show();
+        $this->action->elementEnd('li');
+    }
 }

From dba2aaa59fece223141809d2f1cdf506c479a8f2 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Tue, 1 Mar 2011 06:30:27 -0500
Subject: [PATCH 328/655] new mega-menu for default local navigation

---
 lib/defaultlocalnav.php | 69 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 69 insertions(+)
 create mode 100644 lib/defaultlocalnav.php

diff --git a/lib/defaultlocalnav.php b/lib/defaultlocalnav.php
new file mode 100644
index 0000000000..93eaf73393
--- /dev/null
+++ b/lib/defaultlocalnav.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2011, StatusNet, Inc.
+ *
+ * Default local nav
+ * 
+ * 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);
+}
+
+/**
+ * Default menu
+ *
+ * @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/
+ */
+
+class DefaultLocalNav extends Menu
+{
+    function show()
+    {
+        $this->action->elementStart('ul', array('id' => 'nav_local_default'));
+
+        $user = common_current_user();
+
+        if (!empty($user)) {
+            $pn = new PersonalGroupNav($this->action, $user);
+            $this->submenu(_m('Home'), $pn);
+
+            $sn = new SubGroupNav($this->action, $user);
+            $this->submenu(_m('Profile'), $sn);
+        }
+
+        $bn = new PublicGroupNav($this->action);
+        $this->submenu(_('Public'), $bn);
+
+        $this->action->elementEnd('ul');
+    }
+}

From 7d77bdcc483a223eaa4eef152f6d060c2465499c Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Tue, 1 Mar 2011 06:30:51 -0500
Subject: [PATCH 329/655] move top-level navigation to default local navigation

---
 lib/action.php     |  3 ++-
 lib/primarynav.php | 23 +----------------------
 2 files changed, 3 insertions(+), 23 deletions(-)

diff --git a/lib/action.php b/lib/action.php
index 54bea7c931..9a6a160e3f 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -637,7 +637,8 @@ class Action extends HTMLOutputter // lawsuit
      */
     function showLocalNav()
     {
-        // does nothing by default
+        $nav = new DefaultLocalNav($this);
+        $nav->show();
     }
 
     /**
diff --git a/lib/primarynav.php b/lib/primarynav.php
index 01517d9429..296328d8bd 100644
--- a/lib/primarynav.php
+++ b/lib/primarynav.php
@@ -54,23 +54,6 @@ class PrimaryNav extends Menu
                                         'id' => 'site_nav_global_primary'));
         if (Event::handle('StartPrimaryNav', array($this->action))) {
             if (!empty($user)) {
-                $this->action->menuItem(common_local_url('all', 
-                                                 array('nickname' => $user->nickname)),
-                                _m('Home'),
-                                _m('Friends timeline'),
-                                false,
-                                'nav_home');
-                $this->action->menuItem(common_local_url('showstream', 
-                                                 array('nickname' => $user->nickname)),
-                                _m('Profile'),
-                                _m('Your profile'),
-                                false,
-                                'nav_profile');
-                $this->action->menuItem(common_local_url('public'),
-                                _m('Public'),
-                                _m('Everyone on this site'),
-                                false,
-                                'nav_public');
                 $this->action->menuItem(common_local_url('profilesettings'),
                                 _m('Settings'),
                                 _m('Change your personal settings'),
@@ -89,11 +72,6 @@ class PrimaryNav extends Menu
                                 false,
                                 'nav_logout');
             } else {
-                $this->action->menuItem(common_local_url('public'),
-                                _m('Public'),
-                                _m('Everyone on this site'),
-                                false,
-                                'nav_public');
                 $this->action->menuItem(common_local_url('login'),
                                 _m('Login'), 
                                 _m('Login to the site'),
@@ -111,6 +89,7 @@ class PrimaryNav extends Menu
 
             Event::handle('EndPrimaryNav', array($this->action));
         }
+
         $this->action->elementEnd('ul');
     }
 }

From 0e1a22142304c720e2fa6e65f97c135d1f4268e4 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Tue, 1 Mar 2011 15:52:46 -0500
Subject: [PATCH 330/655] add object menu to actions, default empty

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

diff --git a/lib/action.php b/lib/action.php
index 9a6a160e3f..5917d31b36 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -607,6 +607,10 @@ class Action extends HTMLOutputter // lawsuit
             $this->showContentBlock();
             Event::handle('EndShowContentBlock', array($this));
         }
+        if (Event::handle('StartShowObjectNavBlock', array($this))) {
+            $this->showObjectNavBlock();
+            Event::handle('EndShowObjectNavBlock', array($this));
+        }
         if (Event::handle('StartShowAside', array($this))) {
             $this->showAside();
             Event::handle('EndShowAside', array($this));
@@ -641,6 +645,32 @@ class Action extends HTMLOutputter // lawsuit
         $nav->show();
     }
 
+    /**
+     * Show menu for an object (group, profile)
+     *
+     * @return nothing
+     */
+    function showObjectNavBlock()
+    {
+        // Need to have this ID for CSS; I'm too lazy to add it to
+        // all menus
+        $this->elementStart('div', array('id' => 'site_nav_object'));
+        $this->showObjectNav();
+        $this->elementEnd('div');
+    }
+
+    /**
+     * Show object navigation.
+     *
+     * If there are things to do with this object, show it here.
+     *
+     * @return nothing
+     */
+    function showObjectNav()
+    {
+        /* Nothing here. */
+    }
+
     /**
      * Show content block.
      *

From 805d14577d8a7e87d2dcea66aa5d22d801987fa5 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Tue, 1 Mar 2011 15:54:32 -0500
Subject: [PATCH 331/655] subscriber actions show the profile menu in object
 area

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

diff --git a/lib/galleryaction.php b/lib/galleryaction.php
index b8edbbb7ba..107134a09b 100644
--- a/lib/galleryaction.php
+++ b/lib/galleryaction.php
@@ -94,7 +94,7 @@ class GalleryAction extends OwnerDesignAction
         $this->showPage();
     }
 
-    function showLocalNav()
+    function showObjectNav()
     {
         $nav = new SubGroupNav($this, $this->user);
         $nav->show();

From c925a4d181c13ec5fc5669a23ea95ce6c3659e13 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Tue, 1 Mar 2011 15:54:43 -0500
Subject: [PATCH 332/655] search actions show the search menu in object area

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

diff --git a/lib/searchaction.php b/lib/searchaction.php
index 67d0bcdeb8..73c287eef3 100644
--- a/lib/searchaction.php
+++ b/lib/searchaction.php
@@ -70,7 +70,7 @@ class SearchAction extends Action
      * @return void
      * @see SearchGroupNav
      */
-    function showLocalNav()
+    function showObjectNav()
     {
         $nav = new SearchGroupNav($this, $this->trimmed('q'));
         $nav->show();

From 8c03e8b0b3ef76146fc55cbf2e49ce2a35905806 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Tue, 1 Mar 2011 15:59:01 -0500
Subject: [PATCH 333/655] use default local nav for allaction

---
 actions/all.php | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/actions/all.php b/actions/all.php
index dc08592faf..896c63c7d9 100644
--- a/actions/all.php
+++ b/actions/all.php
@@ -127,12 +127,6 @@ class AllAction extends ProfileAction
         );
     }
 
-    function showLocalNav()
-    {
-        $nav = new PersonalGroupNav($this);
-        $nav->show();
-    }
-
     function showEmptyListMessage()
     {
         // TRANS: Empty list message. %s is a user nickname.

From 64ab7b7d07aea1c2082a946d3ea899ac47e92adc Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Tue, 1 Mar 2011 16:00:07 -0500
Subject: [PATCH 334/655] use default local nav for public action

---
 actions/public.php | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/actions/public.php b/actions/public.php
index 5fc547feaf..cbc753d900 100644
--- a/actions/public.php
+++ b/actions/public.php
@@ -168,21 +168,6 @@ class PublicAction extends Action
                               _('Public Stream Feed (Atom)')));
     }
 
-    /**
-     * Show tabset for this page
-     *
-     * Uses the PublicGroupNav widget
-     *
-     * @return void
-     * @see PublicGroupNav
-     */
-
-    function showLocalNav()
-    {
-        $nav = new PublicGroupNav($this);
-        $nav->show();
-    }
-
     function showEmptyList()
     {
         $message = _('This is the public timeline for %%site.name%% but no one has posted anything yet.') . ' ';

From 0fef2cb66d5e19524a6bb253baff48045bf2f84c Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Tue, 1 Mar 2011 16:04:36 -0500
Subject: [PATCH 335/655] personal group nav uses current user

---
 lib/defaultlocalnav.php  |  2 +-
 lib/personalgroupnav.php | 21 +++++++--------------
 2 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/lib/defaultlocalnav.php b/lib/defaultlocalnav.php
index 93eaf73393..b42d3a804c 100644
--- a/lib/defaultlocalnav.php
+++ b/lib/defaultlocalnav.php
@@ -54,7 +54,7 @@ class DefaultLocalNav extends Menu
         $user = common_current_user();
 
         if (!empty($user)) {
-            $pn = new PersonalGroupNav($this->action, $user);
+            $pn = new PersonalGroupNav($this->action);
             $this->submenu(_m('Home'), $pn);
 
             $sn = new SubGroupNav($this->action, $user);
diff --git a/lib/personalgroupnav.php b/lib/personalgroupnav.php
index d72a865677..6a31358596 100644
--- a/lib/personalgroupnav.php
+++ b/lib/personalgroupnav.php
@@ -53,23 +53,16 @@ class PersonalGroupNav extends Menu
      */
     function show()
     {
-        $user = null;
+        $user         = common_current_user();
 
-        // FIXME: we should probably pass this in
-
-        $action = $this->action->trimmed('action');
-        $nickname = $this->action->trimmed('nickname');
-
-        if ($nickname) {
-            $user = User::staticGet('nickname', $nickname);
-            $user_profile = $user->getProfile();
-            $name = $user_profile->getBestName();
-        } else {
-            // @fixme can this happen? is this valid?
-            $user_profile = false;
-            $name = $nickname;
+        if (empty($user)) {
+            throw new ServerException('Do not show personal group nav with no current user.');
         }
 
+        $user_profile = $user->getProfile();
+        $nickname     = $user->nickname;
+        $name         = $user_profile->getBestName();
+
         $this->out->elementStart('ul', array('class' => 'nav'));
 
         if (Event::handle('StartPersonalGroupNav', array($this))) {

From 3377bc2ccff0cb83b1022a8f2d1d4c921bc6287c Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Tue, 1 Mar 2011 16:06:29 -0500
Subject: [PATCH 336/655] RepliesAction uses default local nav

---
 actions/replies.php | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/actions/replies.php b/actions/replies.php
index 8f2fc6c7f3..fd178175d2 100644
--- a/actions/replies.php
+++ b/actions/replies.php
@@ -160,18 +160,6 @@ class RepliesAction extends OwnerDesignAction
                                     $this->user->nickname)));
     }
 
-    /**
-     * show the personal group nav
-     *
-     * @return void
-     */
-
-    function showLocalNav()
-    {
-        $nav = new PersonalGroupNav($this);
-        $nav->show();
-    }
-
     /**
      * Show the content
      *

From efdc85224adedeae8dab0c1ada5f8f117b076f2f Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Tue, 1 Mar 2011 16:07:27 -0500
Subject: [PATCH 337/655] user groups show subgroupnav in object menu area

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

diff --git a/actions/usergroups.php b/actions/usergroups.php
index 6606e76cdb..cf904bc929 100644
--- a/actions/usergroups.php
+++ b/actions/usergroups.php
@@ -112,7 +112,7 @@ class UsergroupsAction extends OwnerDesignAction
         $this->showPage();
     }
 
-    function showLocalNav()
+    function showObjectNav()
     {
         $nav = new SubGroupNav($this, $this->user);
         $nav->show();

From 85320a7561013f84b9d562b91c7647c59a21b814 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Tue, 1 Mar 2011 16:08:49 -0500
Subject: [PATCH 338/655] show object nav for blocked users in a group

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

diff --git a/actions/blockedfromgroup.php b/actions/blockedfromgroup.php
index 6ff572c05d..dd916b170a 100644
--- a/actions/blockedfromgroup.php
+++ b/actions/blockedfromgroup.php
@@ -122,7 +122,7 @@ class BlockedfromgroupAction extends GroupDesignAction
                        _('A list of the users blocked from joining this group.'));
     }
 
-    function showLocalNav()
+    function showObjectNav()
     {
         $nav = new GroupNav($this, $this->group);
         $nav->show();

From 737eb371f83c1059e80cb2d9d907f735283d6e94 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Tue, 1 Mar 2011 16:09:35 -0500
Subject: [PATCH 339/655] show full local nav in public tag cloud

---
 actions/publictagcloud.php | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/actions/publictagcloud.php b/actions/publictagcloud.php
index f6f1d31625..1432ca66a8 100644
--- a/actions/publictagcloud.php
+++ b/actions/publictagcloud.php
@@ -92,12 +92,6 @@ class PublictagcloudAction extends Action
         $this->elementEnd('div');
     }
 
-    function showLocalNav()
-    {
-        $nav = new PublicGroupNav($this);
-        $nav->show();
-    }
-
     function handle($args)
     {
         parent::handle($args);

From 4561caec1037a84d4b7dbd010e7b5a9b2464a0b7 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Tue, 1 Mar 2011 16:10:40 -0500
Subject: [PATCH 340/655] show default local nav in group edit

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

diff --git a/actions/editgroup.php b/actions/editgroup.php
index 0e04170051..08a75da12c 100644
--- a/actions/editgroup.php
+++ b/actions/editgroup.php
@@ -139,7 +139,7 @@ class EditgroupAction extends GroupDesignAction
         $this->showPage();
     }
 
-    function showLocalNav()
+    function showObjectNav()
     {
         $nav = new GroupNav($this, $this->group);
         $nav->show();

From 3c683ad7b54a1cc5decfe8c312b1580113c8eb31 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Tue, 1 Mar 2011 16:11:19 -0500
Subject: [PATCH 341/655] default local nav in popular notices

---
 actions/favorited.php | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/actions/favorited.php b/actions/favorited.php
index c137cf424f..17c2a58c94 100644
--- a/actions/favorited.php
+++ b/actions/favorited.php
@@ -163,19 +163,6 @@ class FavoritedAction extends Action
         $this->elementEnd('div');
     }
 
-    /**
-     * Local navigation
-     *
-     * This page is part of the public group, so show that.
-     *
-     * @return void
-     */
-    function showLocalNav()
-    {
-        $nav = new PublicGroupNav($this);
-        $nav->show();
-    }
-
     /**
      * Content area
      *

From 0850c66a21dac58919ba4e3a8739602dce68b029 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Tue, 1 Mar 2011 16:11:59 -0500
Subject: [PATCH 342/655] default local nav in featured user list

---
 actions/featured.php | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/actions/featured.php b/actions/featured.php
index 9a7f128b57..394cfe6a8b 100644
--- a/actions/featured.php
+++ b/actions/featured.php
@@ -90,12 +90,6 @@ class FeaturedAction extends Action
         $this->elementEnd('div');
     }
 
-    function showLocalNav()
-    {
-        $nav = new PublicGroupNav($this);
-        $nav->show();
-    }
-
     function getInstructions()
     {
         // TRANS: Description on page displaying featured users.

From 4903c92dcec6d1ea0b7174efd6c15c261606077f Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Tue, 1 Mar 2011 16:15:03 -0500
Subject: [PATCH 343/655] show defaultlocalnav in groupdesignsettings

---
 actions/groupdesignsettings.php | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/actions/groupdesignsettings.php b/actions/groupdesignsettings.php
index 3ef5e20e44..798064d16c 100644
--- a/actions/groupdesignsettings.php
+++ b/actions/groupdesignsettings.php
@@ -163,12 +163,22 @@ class GroupDesignSettingsAction extends DesignSettingsAction
      *
      * @return nothing
      */
-    function showLocalNav()
+    function showObjectNav()
     {
         $nav = new GroupNav($this, $this->group);
         $nav->show();
     }
 
+    /**
+     * Override to show default nav stuff
+     *
+     * @return nothing
+     */
+    function showLocalNav()
+    {
+        Action::showLocalNav();
+    }
+
     /**
      * Get the design we want to edit
      *

From 0c877860b51412d54ee876f15f4cdad18a8db274 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Tue, 1 Mar 2011 16:17:01 -0500
Subject: [PATCH 344/655] show defaultlocalnav in grouplogo

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

diff --git a/actions/grouplogo.php b/actions/grouplogo.php
index d490cd9875..db0d40ff0c 100644
--- a/actions/grouplogo.php
+++ b/actions/grouplogo.php
@@ -458,7 +458,7 @@ class GrouplogoAction extends GroupDesignAction
         $this->autofocus('avatarfile');
     }
 
-    function showLocalNav()
+    function showObjectNav()
     {
         $nav = new GroupNav($this, $this->group);
         $nav->show();

From f29274cd0d44079a602d23607b62616488068709 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Tue, 1 Mar 2011 16:17:42 -0500
Subject: [PATCH 345/655] show defaultlocalnav in groupmembers

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

diff --git a/actions/groupmembers.php b/actions/groupmembers.php
index 7b1512dfab..e280fd1fd1 100644
--- a/actions/groupmembers.php
+++ b/actions/groupmembers.php
@@ -125,7 +125,7 @@ class GroupmembersAction extends GroupDesignAction
                        _('A list of the users in this group.'));
     }
 
-    function showLocalNav()
+    function showObjectNav()
     {
         $nav = new GroupNav($this, $this->group);
         $nav->show();

From 6ee77f1302014167fdcccb46b7ea76b368234b41 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Tue, 1 Mar 2011 16:18:33 -0500
Subject: [PATCH 346/655] defaultlocalnav in groups

---
 actions/groups.php | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/actions/groups.php b/actions/groups.php
index 958c5921bf..d1bc8d9458 100644
--- a/actions/groups.php
+++ b/actions/groups.php
@@ -80,12 +80,6 @@ class GroupsAction extends Action
         $this->showPage();
     }
 
-    function showLocalNav()
-    {
-        $nav = new PublicGroupNav($this);
-        $nav->show();
-    }
-
     function showPageNotice()
     {
         $notice =

From 55fa14baec295669f3546a35eeb34bb15a841fc8 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Tue, 1 Mar 2011 16:20:14 -0500
Subject: [PATCH 347/655] object menu in inviteaction

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

diff --git a/actions/invite.php b/actions/invite.php
index a2a0e0714a..c64ff8adda 100644
--- a/actions/invite.php
+++ b/actions/invite.php
@@ -289,7 +289,7 @@ class InviteAction extends CurrentUserDesignAction
         mail_send($recipients, $headers, $body);
     }
 
-    function showLocalNav()
+    function showObjectNav()
     {
         $nav = new SubGroupNav($this, common_current_user());
         $nav->show();

From 374253f0f751e2d0a81035853d5f577c64b07aba Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Tue, 1 Mar 2011 16:21:22 -0500
Subject: [PATCH 348/655] defaultlocalnav for favorites

---
 actions/showfavorites.php | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/actions/showfavorites.php b/actions/showfavorites.php
index eda2cf38eb..67ee914a91 100644
--- a/actions/showfavorites.php
+++ b/actions/showfavorites.php
@@ -189,17 +189,6 @@ class ShowfavoritesAction extends OwnerDesignAction
                                       $this->user->nickname)));
     }
 
-    /**
-     * show the personal group nav
-     *
-     * @return void
-     */
-    function showLocalNav()
-    {
-        $nav = new PersonalGroupNav($this);
-        $nav->show();
-    }
-
     function showEmptyListMessage()
     {
         if (common_logged_in()) {

From a1a0382d26fdd444bb574081649406980cae383b Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Tue, 1 Mar 2011 16:22:19 -0500
Subject: [PATCH 349/655] object menu on showgroup

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

diff --git a/actions/showgroup.php b/actions/showgroup.php
index 21256294f3..397ca30505 100644
--- a/actions/showgroup.php
+++ b/actions/showgroup.php
@@ -167,7 +167,7 @@ class ShowgroupAction extends GroupDesignAction
      *
      * @return void
      */
-    function showLocalNav()
+    function showObjectNav()
     {
         $nav = new GroupNav($this, $this->group);
         $nav->show();

From 64a1c9e3761639c30e5fe33fed9d2cfde201e0bb Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Tue, 1 Mar 2011 16:23:19 -0500
Subject: [PATCH 350/655] object menu for user profile

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

diff --git a/actions/showstream.php b/actions/showstream.php
index 0fd1c2c29f..afde49ecea 100644
--- a/actions/showstream.php
+++ b/actions/showstream.php
@@ -104,7 +104,7 @@ class ShowstreamAction extends ProfileAction
         $this->showNotices();
     }
 
-    function showLocalNav()
+    function showObjectNav()
     {
         $nav = new SubGroupNav($this, $this->user);
         $nav->show();

From 35ce314bfb376b87c8b59410f59f96683640f958 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Tue, 1 Mar 2011 13:30:38 -0800
Subject: [PATCH 351/655] Hide context entries in threaded lists; it's
 redundant (and if there's more than a few messages, we have the context link
 still :D) Also hides them via CSS for new ajax additions

---
 lib/threadednoticelist.php | 10 ++++++++++
 theme/base/css/display.css |  5 +++++
 2 files changed, 15 insertions(+)

diff --git a/lib/threadednoticelist.php b/lib/threadednoticelist.php
index a3e5f62a59..1298f179f9 100644
--- a/lib/threadednoticelist.php
+++ b/lib/threadednoticelist.php
@@ -147,6 +147,11 @@ class ThreadedNoticeListItem extends NoticeListItem
 {
     const INITIAL_ITEMS = 3;
 
+    function showContext()
+    {
+        // Silence!
+    }
+
     /**
      * finish the notice
      *
@@ -211,6 +216,11 @@ class ThreadedNoticeListSubItem extends NoticeListItem
     {
         //
     }
+
+    function showContext()
+    {
+        //
+    }
 }
 
 /**
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 98345a0726..456d7be4b0 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -1136,6 +1136,11 @@ border-top-style:solid;
 .threaded-notices .notice-reply-comments {
     margin: 8px;
 }
+.threaded-notices .response,
+.threaded-notices .source {
+    /* Hide these for ajax/realtime sourced notices */
+    display: none;
+}
 /* NOTICES */
 #notices_primary {
 float:left;

From c4b53b4aefe5a7d69ce912d0908e55aae8768f35 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Tue, 1 Mar 2011 16:35:25 -0500
Subject: [PATCH 352/655] don't show full profile menu all the time

---
 lib/defaultlocalnav.php  | 3 ---
 lib/personalgroupnav.php | 6 ++++++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/lib/defaultlocalnav.php b/lib/defaultlocalnav.php
index b42d3a804c..7af3c9673f 100644
--- a/lib/defaultlocalnav.php
+++ b/lib/defaultlocalnav.php
@@ -56,9 +56,6 @@ class DefaultLocalNav extends Menu
         if (!empty($user)) {
             $pn = new PersonalGroupNav($this->action);
             $this->submenu(_m('Home'), $pn);
-
-            $sn = new SubGroupNav($this->action, $user);
-            $this->submenu(_m('Profile'), $sn);
         }
 
         $bn = new PublicGroupNav($this->action);
diff --git a/lib/personalgroupnav.php b/lib/personalgroupnav.php
index 6a31358596..e428e92e63 100644
--- a/lib/personalgroupnav.php
+++ b/lib/personalgroupnav.php
@@ -71,6 +71,12 @@ class PersonalGroupNav extends Menu
                                  _('Home'),
                                  sprintf(_('%s and friends'), $name),
                                  $action == 'all', 'nav_timeline_personal');
+            $this->out->menuItem(common_local_url('showstream', array('nickname' =>
+                                                                      $this->user->nickname)),
+                                 _('Profile'),
+                                 (empty($profile)) ? $this->user->nickname : $profile->getBestName(),
+                                 $action == 'showstream',
+                                 'nav_profile');
             $this->out->menuItem(common_local_url('replies', array('nickname' =>
                                                                    $nickname)),
                                  _('Replies'),

From 815a9a0c3e634be678aec1dce80a2364f7bd3897 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Tue, 1 Mar 2011 16:37:21 -0500
Subject: [PATCH 353/655] fixup link to your profile

---
 lib/personalgroupnav.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/personalgroupnav.php b/lib/personalgroupnav.php
index e428e92e63..348195a99d 100644
--- a/lib/personalgroupnav.php
+++ b/lib/personalgroupnav.php
@@ -72,9 +72,9 @@ class PersonalGroupNav extends Menu
                                  sprintf(_('%s and friends'), $name),
                                  $action == 'all', 'nav_timeline_personal');
             $this->out->menuItem(common_local_url('showstream', array('nickname' =>
-                                                                      $this->user->nickname)),
+                                                                      $nickname)),
                                  _('Profile'),
-                                 (empty($profile)) ? $this->user->nickname : $profile->getBestName(),
+                                 _('Your profile'),
                                  $action == 'showstream',
                                  'nav_profile');
             $this->out->menuItem(common_local_url('replies', array('nickname' =>

From 5bbcededa752133b2e607e8309d381df67f6a250 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Tue, 1 Mar 2011 16:48:20 -0500
Subject: [PATCH 354/655] move inbox/outbox to object menu

---
 lib/mailbox.php          |  6 ++++
 lib/mailboxmenu.php      | 70 ++++++++++++++++++++++++++++++++++++++++
 lib/personalgroupnav.php |  8 ++---
 3 files changed, 78 insertions(+), 6 deletions(-)
 create mode 100644 lib/mailboxmenu.php

diff --git a/lib/mailbox.php b/lib/mailbox.php
index 7faeb7dba3..cb56eb5904 100644
--- a/lib/mailbox.php
+++ b/lib/mailbox.php
@@ -168,4 +168,10 @@ class MailboxAction extends CurrentUserDesignAction
     {
          return true;
     }
+
+    function showObjectNav()
+    {
+        $mm = new MailboxMenu($this);
+        $mm->show();
+    }
 }
diff --git a/lib/mailboxmenu.php b/lib/mailboxmenu.php
new file mode 100644
index 0000000000..d2d3607dce
--- /dev/null
+++ b/lib/mailboxmenu.php
@@ -0,0 +1,70 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2011, StatusNet, Inc.
+ *
+ * Private mailboxes menu
+ * 
+ * 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  Cache
+ * @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);
+}
+
+/**
+ * Menu of existing mailboxes
+ *
+ * @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 MailboxMenu extends Menu
+{
+    function show()
+    {
+        $cur = common_current_user();
+        $nickname = $cur->nickname;
+
+        $this->out->elementStart('ul', array('class' => 'nav'));
+
+        $this->item('inbox',
+                    array('nickname' => $nickname),
+                    _('Inbox'),
+                    _('Your incoming messages'));
+
+        $this->item('outbox',
+                    array('nickname' => $nickname),
+                    _('Outbox'),
+                    _('Your sent messages'));
+
+        $this->out->elementEnd('ul');
+    }
+
+}
diff --git a/lib/personalgroupnav.php b/lib/personalgroupnav.php
index 348195a99d..9d78857c6d 100644
--- a/lib/personalgroupnav.php
+++ b/lib/personalgroupnav.php
@@ -95,15 +95,11 @@ class PersonalGroupNav extends Menu
 
                 $this->out->menuItem(common_local_url('inbox', array('nickname' =>
                                                                      $nickname)),
-                                     _('Inbox'),
+                                     _('Messages'),
                                      _('Your incoming messages'),
                                      $action == 'inbox');
-                $this->out->menuItem(common_local_url('outbox', array('nickname' =>
-                                                                      $nickname)),
-                                     _('Outbox'),
-                                     _('Your sent messages'),
-                                     $action == 'outbox');
             }
+
             Event::handle('EndPersonalGroupNav', array($this));
         }
         $this->out->elementEnd('ul');

From c0dcd73379509210b890295af0f9fd05c98b280c Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Tue, 1 Mar 2011 13:49:13 -0800
Subject: [PATCH 355/655] Inline replies: fix replies on repeats, placeholder
 re-add when replying to a reply

---
 js/util.js     | 20 +++++++++-----------
 js/util.min.js |  2 +-
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/js/util.js b/js/util.js
index 8b1901101b..d7f6861585 100644
--- a/js/util.js
+++ b/js/util.js
@@ -557,27 +557,28 @@ var SN = { // StatusNet
                 e.preventDefault();
                 var nickname = ($('.author .nickname', notice).length > 0) ? $($('.author .nickname', notice)[0]) : $('.author .nickname.uid');
                 /* SN.U.NoticeReplySet(nickname.text(), $($('.notice_id', notice)[0]).text()); */
-                var id = $($('.notice_id', notice)[0]).text();
-                SN.U.NoticeInlineReplyTrigger(id, '@' + nickname.text());
+                SN.U.NoticeInlineReplyTrigger(notice, '@' + nickname.text());
                 return false;
             });
         },
 
         /**
-         * Open up a notice's 
-         * @param {String} id: notice ID
+         * Open up a notice's inline reply box.
+         *
+         * @param {jQuery} notice: jQuery object containing one notice
          * @param {String} initialText
          */
-        NoticeInlineReplyTrigger: function(id, initialText) {
+        NoticeInlineReplyTrigger: function(notice, initialText) {
             // Find the notice we're replying to...
-            var notice = $('#notice-' + id), parentNotice = notice;
+            var id = $($('.notice_id', notice)[0]).text();
+            var parentNotice = notice;
 
             // Find the threaded replies view we'll be adding to...
             var list = notice.closest('.notices');
             if (list.hasClass('threaded-notices')) {
                 // We're replying to a reply; use reply form on the end of this list.
                 // We'll add our form at the end of this; grab the root notice.
-                parentNotice = list.closest('notice');
+                parentNotice = list.closest('.notice');
             } else {
                 // We're replying to a parent notice; pull its threaded list
                 // and we'll add on the end of it. Will add if needed.
@@ -642,8 +643,6 @@ var SN = { // StatusNet
                                     var li = document._importNode(orig_li, true);
                                     replyItem.replaceWith(li);
                                     SN.U.NoticeInlineReplyPlaceholder(parentNotice);
-                                } else {
-                                    console.log('confused!', data);
                                 }
                             }
                         });
@@ -712,13 +711,12 @@ var SN = { // StatusNet
         },
 
         NoticeInlineReplyPlaceholder: function(notice) {
-            var id = $($('.notice_id', notice)[0]).text();
             var list = notice.find('ul.threaded-notices');
             var placeholder = $('<li class="notice-reply-placeholder">' +
                                     '<input class="placeholder">' +
                                 '</li>');
             placeholder.click(function() {
-                SN.U.NoticeInlineReplyTrigger(id);
+                SN.U.NoticeInlineReplyTrigger(notice);
             });
             placeholder.find('input').val(SN.msg('reply_comment'));
             list.append(placeholder);
diff --git a/js/util.min.js b/js/util.min.js
index fe095f5601..1fd7bcc234 100644
--- a/js/util.min.js
+++ b/js/util.min.js
@@ -1 +1 @@
-var SN={C:{I:{CounterBlackout:false,MaxLength:140,PatternUsername:/^[0-9a-zA-Z\-_.]*$/,HTTP20x30x:[200,201,202,203,204,205,206,300,301,302,303,304,305,306,307]},S:{Disabled:"disabled",Warning:"warning",Error:"error",Success:"success",Processing:"processing",CommandResult:"command_result",FormNotice:"form_notice",NoticeDataText:"notice_data-text",NoticeTextCount:"notice_text-count",NoticeInReplyTo:"notice_in-reply-to",NoticeDataAttach:"notice_data-attach",NoticeDataAttachSelected:"notice_data-attach_selected",NoticeActionSubmit:"notice_action-submit",NoticeLat:"notice_data-lat",NoticeLon:"notice_data-lon",NoticeLocationId:"notice_data-location_id",NoticeLocationNs:"notice_data-location_ns",NoticeGeoName:"notice_data-geo_name",NoticeDataGeo:"notice_data-geo",NoticeDataGeoCookie:"NoticeDataGeo",NoticeDataGeoSelected:"notice_data-geo_selected",StatusNetInstance:"StatusNetInstance"}},messages:{},msg:function(a){if(typeof SN.messages[a]=="undefined"){return"["+a+"]"}else{return SN.messages[a]}},U:{FormNoticeEnhancements:function(b){if(jQuery.data(b[0],"ElementData")===undefined){MaxLength=b.find("#"+SN.C.S.NoticeTextCount).text();if(typeof(MaxLength)=="undefined"){MaxLength=SN.C.I.MaxLength}jQuery.data(b[0],"ElementData",{MaxLength:MaxLength});SN.U.Counter(b);NDT=b.find("#"+SN.C.S.NoticeDataText);NDT.bind("keyup",function(c){SN.U.Counter(b)});var a=function(c){window.setTimeout(function(){SN.U.Counter(b)},50)};NDT.bind("cut",a).bind("paste",a);NDT.bind("keydown",function(c){SN.U.SubmitOnReturn(c,b)})}else{b.find("#"+SN.C.S.NoticeTextCount).text(jQuery.data(b[0],"ElementData").MaxLength)}if($("body")[0].id!="conversation"&&window.location.hash.length===0&&$(window).scrollTop()==0){b.find("textarea").focus()}},SubmitOnReturn:function(b,a){if(b.keyCode==13||b.keyCode==10){a.submit();b.preventDefault();b.stopPropagation();$("#"+a[0].id+" #"+SN.C.S.NoticeDataText).blur();$("body").focus();return false}return true},Counter:function(d){SN.C.I.FormNoticeCurrent=d;var b=jQuery.data(d[0],"ElementData").MaxLength;if(b<=0){return}var c=b-SN.U.CharacterCount(d);var a=d.find("#"+SN.C.S.NoticeTextCount);if(c.toString()!=a.text()){if(!SN.C.I.CounterBlackout||c===0){if(a.text()!=String(c)){a.text(c)}if(c<0){d.addClass(SN.C.S.Warning)}else{d.removeClass(SN.C.S.Warning)}if(!SN.C.I.CounterBlackout){SN.C.I.CounterBlackout=true;SN.C.I.FormNoticeCurrent=d;window.setTimeout("SN.U.ClearCounterBlackout(SN.C.I.FormNoticeCurrent);",500)}}}},CharacterCount:function(a){return a.find("#"+SN.C.S.NoticeDataText).val().length},ClearCounterBlackout:function(a){SN.C.I.CounterBlackout=false;SN.U.Counter(a)},RewriteAjaxAction:function(a){if(document.location.protocol=="https:"&&a.substr(0,5)=="http:"){return a.replace(/^http:\/\/[^:\/]+/,"https://"+document.location.host)}else{return a}},FormXHR:function(a){$.ajax({type:"POST",dataType:"xml",url:SN.U.RewriteAjaxAction(a.attr("action")),data:a.serialize()+"&ajax=1",beforeSend:function(b){a.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(c,d,b){alert(b||d)},success:function(b,c){if(typeof($("form",b)[0])!="undefined"){form_new=document._importNode($("form",b)[0],true);a.replaceWith(form_new)}else{a.replaceWith(document._importNode($("p",b)[0],true))}}})},FormNoticeXHR:function(b){SN.C.I.NoticeDataGeo={};b.append('<input type="hidden" name="ajax" value="1"/>');b.attr("action",SN.U.RewriteAjaxAction(b.attr("action")));var c=function(d,e){b.append($('<p class="form_response"></p>').addClass(d).text(e))};var a=function(){b.find(".form_response").remove()};b.ajaxForm({dataType:"xml",timeout:"60000",beforeSend:function(d){if(b.find("#"+SN.C.S.NoticeDataText)[0].value.length===0){b.addClass(SN.C.S.Warning);return false}b.addClass(SN.C.S.Processing).find("#"+SN.C.S.NoticeActionSubmit).addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled);SN.C.I.NoticeDataGeo.NLat=$("#"+SN.C.S.NoticeLat).val();SN.C.I.NoticeDataGeo.NLon=$("#"+SN.C.S.NoticeLon).val();SN.C.I.NoticeDataGeo.NLNS=$("#"+SN.C.S.NoticeLocationNs).val();SN.C.I.NoticeDataGeo.NLID=$("#"+SN.C.S.NoticeLocationId).val();SN.C.I.NoticeDataGeo.NDG=$("#"+SN.C.S.NoticeDataGeo).attr("checked");cookieValue=$.cookie(SN.C.S.NoticeDataGeoCookie);if(cookieValue!==null&&cookieValue!="disabled"){cookieValue=JSON.parse(cookieValue);SN.C.I.NoticeDataGeo.NLat=$("#"+SN.C.S.NoticeLat).val(cookieValue.NLat).val();SN.C.I.NoticeDataGeo.NLon=$("#"+SN.C.S.NoticeLon).val(cookieValue.NLon).val();if($("#"+SN.C.S.NoticeLocationNs).val(cookieValue.NLNS)){SN.C.I.NoticeDataGeo.NLNS=$("#"+SN.C.S.NoticeLocationNs).val(cookieValue.NLNS).val();SN.C.I.NoticeDataGeo.NLID=$("#"+SN.C.S.NoticeLocationId).val(cookieValue.NLID).val()}}if(cookieValue=="disabled"){SN.C.I.NoticeDataGeo.NDG=$("#"+SN.C.S.NoticeDataGeo).attr("checked",false).attr("checked")}else{SN.C.I.NoticeDataGeo.NDG=$("#"+SN.C.S.NoticeDataGeo).attr("checked",true).attr("checked")}return true},error:function(f,g,e){b.removeClass(SN.C.S.Processing).find("#"+SN.C.S.NoticeActionSubmit).removeClass(SN.C.S.Disabled).removeAttr(SN.C.S.Disabled,SN.C.S.Disabled);a();if(g=="timeout"){c("error","Sorry! We had trouble sending your notice. The servers are overloaded. Please try again, and contact the site administrator if this problem persists.")}else{var d=SN.U.GetResponseXML(f);if($("."+SN.C.S.Error,d).length>0){b.append(document._importNode($("."+SN.C.S.Error,d)[0],true))}else{if(parseInt(f.status)===0||jQuery.inArray(parseInt(f.status),SN.C.I.HTTP20x30x)>=0){b.resetForm().find("#"+SN.C.S.NoticeDataAttachSelected).remove();SN.U.FormNoticeEnhancements(b)}else{c("error","(Sorry! We had trouble sending your notice ("+f.status+" "+f.statusText+"). Please report the problem to the site administrator if this happens again.")}}}},success:function(i,k){a();var e=$("#"+SN.C.S.Error,i);if(e.length>0){c("error",e.text())}else{if($("body")[0].id=="bookmarklet"){self.close()}var d=$("#"+SN.C.S.CommandResult,i);if(d.length>0){c("success",d.text())}else{var h=document._importNode($("li",i)[0],true);var j=$("#notices_primary .notices");if(j.length>0&&SN.U.belongsOnTimeline(h)){if($("#"+h.id).length===0){var f=$("#"+SN.C.S.NoticeInReplyTo).val();var g="#notices_primary #notice-"+f;if($("body")[0].id=="conversation"){if(f.length>0&&$(g+" .notices").length<1){$(g).append('<ul class="notices"></ul>')}$($(g+" .notices")[0]).append(h)}else{j.prepend(h)}$("#"+h.id).css({display:"none"}).fadeIn(2500);SN.U.NoticeWithAttachment($("#"+h.id));SN.U.NoticeReplyTo($("#"+h.id))}}else{c("success",$("title",i).text())}}b.resetForm();b.find("#"+SN.C.S.NoticeInReplyTo).val("");b.find("#"+SN.C.S.NoticeDataAttachSelected).remove();SN.U.FormNoticeEnhancements(b)}},complete:function(d,e){b.removeClass(SN.C.S.Processing).find("#"+SN.C.S.NoticeActionSubmit).removeAttr(SN.C.S.Disabled).removeClass(SN.C.S.Disabled);$("#"+SN.C.S.NoticeLat).val(SN.C.I.NoticeDataGeo.NLat);$("#"+SN.C.S.NoticeLon).val(SN.C.I.NoticeDataGeo.NLon);if($("#"+SN.C.S.NoticeLocationNs)){$("#"+SN.C.S.NoticeLocationNs).val(SN.C.I.NoticeDataGeo.NLNS);$("#"+SN.C.S.NoticeLocationId).val(SN.C.I.NoticeDataGeo.NLID)}$("#"+SN.C.S.NoticeDataGeo).attr("checked",SN.C.I.NoticeDataGeo.NDG)}})},GetResponseXML:function(b){try{return b.responseXML}catch(a){return(new DOMParser()).parseFromString(b.responseText,"text/xml")}},NoticeReply:function(){if($("#"+SN.C.S.NoticeDataText).length>0&&$("#content .notice_reply").length>0){$("#content .notice").each(function(){SN.U.NoticeReplyTo($(this))})}},NoticeReplyTo:function(a){a.find(".notice_reply").live("click",function(c){c.preventDefault();var b=($(".author .nickname",a).length>0)?$($(".author .nickname",a)[0]):$(".author .nickname.uid");var d=$($(".notice_id",a)[0]).text();SN.U.NoticeInlineReplyTrigger(d,"@"+b.text());return false})},NoticeInlineReplyTrigger:function(c,i){var h=$("#notice-"+c),d=h;var f=h.closest(".notices");if(f.hasClass("threaded-notices")){d=f.closest("notice")}else{f=$("ul.threaded-notices",h);if(f.length==0){f=$('<ul class="notices threaded-notices xoxo"></ul>');h.append(f)}}var k=$(".notice-reply-form",f);if(k.length==0){$("li.notice-reply-placeholder").remove();var g=$("li.notice-reply",f);if(g.length==0){g=$('<li class="notice-reply"><form class="notice-reply-form" method="post"><textarea name="status_textarea"></textarea><div class="controls"><input type="hidden" name="token"><input type="hidden" name="inreplyto"><input type="submit" class="submit"></div></form></li>');var b=$("#form_notice");k=g.find("form");k.attr("action",b.attr("action"));k.find('input[name="token"]').val(b.find("input[name=token]").val());k.find('input[type="submit"]').val(SN.msg("reply_submit"));f.append(g);k.submit(function(m){var l=k;$.ajax({type:"POST",dataType:"xml",url:SN.U.RewriteAjaxAction(l.attr("action")),data:l.serialize()+"&ajax=1",beforeSend:function(n){l.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled).end().find("textarea").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(o,p,n){alert(n||p)},success:function(p,q){var o=$("li",p)[0];if(o){var n=document._importNode(o,true);g.replaceWith(n);SN.U.NoticeInlineReplyPlaceholder(d)}else{console.log("confused!",p)}}});m.preventDefault();return false})}}k.find("input[name=inreplyto]").val(c);var j=k.find("textarea");if(j.length==0){throw"No textarea"}if(i){var a=i+" ";j.val(a+j.val().replace(RegExp(a,"i"),""))}j.focus();if(j[0].setSelectionRange){var e=j.val().length;j[0].setSelectionRange(e,e)}},NoticeReplySet:function(b,d){if(b.match(SN.C.I.PatternUsername)){var c=$("#"+SN.C.S.NoticeDataText);if(c.length>0){replyto="@"+b+" ";c.val(replyto+c.val().replace(RegExp(replyto,"i"),""));$("#"+SN.C.S.FormNotice+" #"+SN.C.S.NoticeInReplyTo).val(d);c[0].focus();if(c[0].setSelectionRange){var a=c.val().length;c[0].setSelectionRange(a,a)}}}},NoticeFavor:function(){$(".form_favor").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_disfavor").live("click",function(){SN.U.FormXHR($(this));return false})},NoticeInlineReplyPlaceholder:function(b){var d=$($(".notice_id",b)[0]).text();var a=b.find("ul.threaded-notices");var c=$('<li class="notice-reply-placeholder"><input class="placeholder"></li>');c.click(function(){SN.U.NoticeInlineReplyTrigger(d)});c.find("input").val(SN.msg("reply_comment"));a.append(c)},NoticeInlineReplySetup:function(){$(".threaded-notices").each(function(){var b=$(this);var a=b.closest(".notice");SN.U.NoticeInlineReplyPlaceholder(a)})},NoticeRepeat:function(){$(".form_repeat").live("click",function(a){a.preventDefault();SN.U.NoticeRepeatConfirmation($(this));return false})},NoticeRepeatConfirmation:function(a){var c=a.find(".submit");var b=c.clone();b.addClass("submit_dialogbox").removeClass("submit");a.append(b);b.bind("click",function(){SN.U.FormXHR(a);return false});c.hide();a.addClass("dialogbox").append('<button class="close">&#215;</button>').closest(".notice-options").addClass("opaque");a.find("button.close").click(function(){$(this).remove();a.removeClass("dialogbox").closest(".notice-options").removeClass("opaque");a.find(".submit_dialogbox").remove();a.find(".submit").show();return false})},NoticeAttachments:function(){$(".notice a.attachment").each(function(){SN.U.NoticeWithAttachment($(this).closest(".notice"))})},NoticeWithAttachment:function(b){if(b.find(".attachment").length===0){return}var a=b.find(".attachment.more");if(a.length>0){$(a[0]).click(function(){var c=$(this);c.addClass(SN.C.S.Processing);$.get(c.attr("href")+"/ajax",null,function(d){c.parent(".entry-content").html($(d).find("#attachment_view .entry-content").html())});return false}).attr("title",SN.msg("showmore_tooltip"))}},NoticeDataAttach:function(){NDA=$("#"+SN.C.S.NoticeDataAttach);NDA.change(function(c){var a=$(this).val();if(!a){$("#"+SN.C.S.NoticeDataAttachSelected).remove();return false}S='<div id="'+SN.C.S.NoticeDataAttachSelected+'" class="'+SN.C.S.Success+'"><code>'+a+'</code> <button class="close">&#215;</button></div>';NDAS=$("#"+SN.C.S.NoticeDataAttachSelected);if(NDAS.length>0){NDAS.replaceWith(S)}else{$("#"+SN.C.S.FormNotice).append(S)}$("#"+SN.C.S.NoticeDataAttachSelected+" button").click(function(){$("#"+SN.C.S.NoticeDataAttachSelected).remove();NDA.val("");return false});if(typeof this.files=="object"){for(var b=0;b<this.files.length;b++){SN.U.PreviewAttach(this.files[b])}}})},maxFileSize:function(b){var a=$(b).find("input[name=MAX_FILE_SIZE]").attr("value");if(a){return parseInt(a)}else{return 0}},PreviewAttach:function(c){var d=c.type+" "+Math.round(c.size/1024)+"KB";var e=true;var g;if(typeof window.createObjectURL!="undefined"){g=function(h,i){i(window.createObjectURL(h))}}else{if(typeof window.FileReader!="undefined"){g=function(i,j){var h=new FileReader();h.onload=function(k){j(h.result)};h.readAsDataURL(i)}}else{e=false}}var a=["image/png","image/jpeg","image/gif","image/svg+xml"];if($.inArray(c.type,a)==-1){e=false}var f=8*1024*1024;if(c.size>f){e=false}if(e){g(c,function(i){var h=$("<img>").attr("title",d).attr("alt",d).attr("src",i).attr("style","height: 120px");$("#"+SN.C.S.NoticeDataAttachSelected).append(h)})}else{var b=$("<div></div>").text(d);$("#"+SN.C.S.NoticeDataAttachSelected).append(b)}},NoticeLocationAttach:function(){var c=$("#"+SN.C.S.NoticeLat).val();var h=$("#"+SN.C.S.NoticeLon).val();var d=$("#"+SN.C.S.NoticeLocationNs).val();var i=$("#"+SN.C.S.NoticeLocationId).val();var a=$("#"+SN.C.S.NoticeGeoName).text();var b=$("#"+SN.C.S.NoticeDataGeo);function e(){$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",jQuery.trim($("label[for="+SN.C.S.NoticeDataGeo+"]").text())).removeClass("checked");$("#"+SN.C.S.NoticeLat).val("");$("#"+SN.C.S.NoticeLon).val("");$("#"+SN.C.S.NoticeLocationNs).val("");$("#"+SN.C.S.NoticeLocationId).val("");$("#"+SN.C.S.NoticeDataGeo).attr("checked",false);$.cookie(SN.C.S.NoticeDataGeoCookie,"disabled",{path:"/"})}function j(k,l){$.getJSON(k,l,function(m){var n,o;if(typeof(m.location_ns)!="undefined"){$("#"+SN.C.S.NoticeLocationNs).val(m.location_ns);n=m.location_ns}if(typeof(m.location_id)!="undefined"){$("#"+SN.C.S.NoticeLocationId).val(m.location_id);o=m.location_id}if(typeof(m.name)=="undefined"){NLN_text=l.lat+";"+l.lon}else{NLN_text=m.name}$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",NoticeDataGeo_text.ShareDisable+" ("+NLN_text+")");$("#"+SN.C.S.NoticeLat).val(l.lat);$("#"+SN.C.S.NoticeLon).val(l.lon);$("#"+SN.C.S.NoticeLocationNs).val(n);$("#"+SN.C.S.NoticeLocationId).val(o);$("#"+SN.C.S.NoticeDataGeo).attr("checked",true);var p={NLat:l.lat,NLon:l.lon,NLNS:n,NLID:o,NLN:NLN_text,NLNU:m.url,NDG:true};$.cookie(SN.C.S.NoticeDataGeoCookie,JSON.stringify(p),{path:"/"})})}if(b.length>0){if($.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){b.attr("checked",false)}else{b.attr("checked",true)}var f=$("#notice_data-geo_wrap");var g=f.attr("title");f.removeAttr("title");$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",jQuery.trim($("label[for="+SN.C.S.NoticeDataGeo+"]").text()));b.change(function(){if($("#"+SN.C.S.NoticeDataGeo).attr("checked")===true||$.cookie(SN.C.S.NoticeDataGeoCookie)===null){$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",NoticeDataGeo_text.ShareDisable).addClass("checked");if($.cookie(SN.C.S.NoticeDataGeoCookie)===null||$.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){if(navigator.geolocation){navigator.geolocation.getCurrentPosition(function(m){$("#"+SN.C.S.NoticeLat).val(m.coords.latitude);$("#"+SN.C.S.NoticeLon).val(m.coords.longitude);var n={lat:m.coords.latitude,lon:m.coords.longitude,token:$("#token").val()};j(g,n)},function(m){switch(m.code){case m.PERMISSION_DENIED:e();break;case m.TIMEOUT:$("#"+SN.C.S.NoticeDataGeo).attr("checked",false);break}},{timeout:10000})}else{if(c.length>0&&h.length>0){var k={lat:c,lon:h,token:$("#token").val()};j(g,k)}else{e();$("#"+SN.C.S.NoticeDataGeo).remove();$("label[for="+SN.C.S.NoticeDataGeo+"]").remove()}}}else{var l=JSON.parse($.cookie(SN.C.S.NoticeDataGeoCookie));$("#"+SN.C.S.NoticeLat).val(l.NLat);$("#"+SN.C.S.NoticeLon).val(l.NLon);$("#"+SN.C.S.NoticeLocationNs).val(l.NLNS);$("#"+SN.C.S.NoticeLocationId).val(l.NLID);$("#"+SN.C.S.NoticeDataGeo).attr("checked",l.NDG);$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",NoticeDataGeo_text.ShareDisable+" ("+l.NLN+")").addClass("checked")}}else{e()}}).change()}},NewDirectMessage:function(){NDM=$(".entity_send-a-message a");NDM.attr({href:NDM.attr("href")+"&ajax=1"});NDM.bind("click",function(){var a=$(".entity_send-a-message form");if(a.length===0){$(this).addClass(SN.C.S.Processing);$.get(NDM.attr("href"),null,function(b){$(".entity_send-a-message").append(document._importNode($("form",b)[0],true));a=$(".entity_send-a-message .form_notice");SN.U.FormNoticeXHR(a);SN.U.FormNoticeEnhancements(a);a.append('<button class="close">&#215;</button>');$(".entity_send-a-message button").click(function(){a.hide();return false});NDM.removeClass(SN.C.S.Processing)})}else{a.show();$(".entity_send-a-message textarea").focus()}return false})},GetFullYear:function(c,d,a){var b=new Date();b.setFullYear(c,d,a);return b},StatusNetInstance:{Set:function(b){var a=SN.U.StatusNetInstance.Get();if(a!==null){b=$.extend(a,b)}$.cookie(SN.C.S.StatusNetInstance,JSON.stringify(b),{path:"/",expires:SN.U.GetFullYear(2029,0,1)})},Get:function(){var a=$.cookie(SN.C.S.StatusNetInstance);if(a!==null){return JSON.parse(a)}return null},Delete:function(){$.cookie(SN.C.S.StatusNetInstance,null)}},belongsOnTimeline:function(b){var a=$("body").attr("id");if(a=="public"){return true}var c=$("#nav_profile a").attr("href");if(c){var d=$(b).find(".entry-title .author a.url").attr("href");if(d==c){if(a=="all"||a=="showstream"){return true}}}return false}},Init:{NoticeForm:function(){if($("body.user_in").length>0){SN.U.NoticeLocationAttach();$("."+SN.C.S.FormNotice).each(function(){SN.U.FormNoticeXHR($(this));SN.U.FormNoticeEnhancements($(this))});SN.U.NoticeDataAttach()}},Notices:function(){if($("body.user_in").length>0){SN.U.NoticeFavor();SN.U.NoticeRepeat();SN.U.NoticeReply();SN.U.NoticeInlineReplySetup()}SN.U.NoticeAttachments()},EntityActions:function(){if($("body.user_in").length>0){$(".form_user_subscribe").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_user_unsubscribe").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_group_join").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_group_leave").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_user_nudge").live("click",function(){SN.U.FormXHR($(this));return false});SN.U.NewDirectMessage()}},Login:function(){if(SN.U.StatusNetInstance.Get()!==null){var a=SN.U.StatusNetInstance.Get().Nickname;if(a!==null){$("#form_login #nickname").val(a)}}$("#form_login").bind("submit",function(){SN.U.StatusNetInstance.Set({Nickname:$("#form_login #nickname").val()});return true})},UploadForms:function(){$("input[type=file]").change(function(d){if(typeof this.files=="object"&&this.files.length>0){var c=0;for(var b=0;b<this.files.length;b++){c+=this.files[b].size}var a=SN.U.maxFileSize($(this.form));if(a>0&&c>a){var e="File too large: maximum upload size is %d bytes.";alert(e.replace("%d",a));$(this).val("");d.preventDefault();return false}}})}}};$(document).ready(function(){SN.Init.UploadForms();if($("."+SN.C.S.FormNotice).length>0){SN.Init.NoticeForm()}if($("#content .notices").length>0){SN.Init.Notices()}if($("#content .entity_actions").length>0){SN.Init.EntityActions()}if($("#form_login").length>0){SN.Init.Login()}});if(!document.ELEMENT_NODE){document.ELEMENT_NODE=1;document.ATTRIBUTE_NODE=2;document.TEXT_NODE=3;document.CDATA_SECTION_NODE=4;document.ENTITY_REFERENCE_NODE=5;document.ENTITY_NODE=6;document.PROCESSING_INSTRUCTION_NODE=7;document.COMMENT_NODE=8;document.DOCUMENT_NODE=9;document.DOCUMENT_TYPE_NODE=10;document.DOCUMENT_FRAGMENT_NODE=11;document.NOTATION_NODE=12}document._importNode=function(e,a){switch(e.nodeType){case document.ELEMENT_NODE:var d=document.createElement(e.nodeName);if(e.attributes&&e.attributes.length>0){for(var c=0,b=e.attributes.length;c<b;){if(e.attributes[c].nodeName=="class"){d.className=e.getAttribute(e.attributes[c++].nodeName)}else{d.setAttribute(e.attributes[c].nodeName,e.getAttribute(e.attributes[c++].nodeName))}}}if(a&&e.childNodes&&e.childNodes.length>0){for(var c=0,b=e.childNodes.length;c<b;){d.appendChild(document._importNode(e.childNodes[c++],a))}}return d;break;case document.TEXT_NODE:case document.CDATA_SECTION_NODE:case document.COMMENT_NODE:return document.createTextNode(e.nodeValue);break}};if(typeof navigator.geolocation=="undefined"||navigator.geolocation.shim){(function(){(function(){if(window.google&&google.gears){return}var c=null;if(typeof GearsFactory!="undefined"){c=new GearsFactory()}else{try{c=new ActiveXObject("Gears.Factory");if(c.getBuildInfo().indexOf("ie_mobile")!=-1){c.privateSetGlobalObject(this)}}catch(d){if((typeof navigator.mimeTypes!="undefined")&&navigator.mimeTypes["application/x-googlegears"]){c=document.createElement("object");c.style.display="none";c.width=0;c.height=0;c.type="application/x-googlegears";document.documentElement.appendChild(c)}}}if(!c){return}if(!window.google){google={}}if(!google.gears){google.gears={factory:c}}})();var a=(function(){var d=google.gears.factory.create("beta.geolocation");var c=function(f,e){return function(g){f(g);e.lastPosition=g}};return{shim:true,type:"Gears",lastPosition:null,getCurrentPosition:function(e,g,h){var f=this;var i=c(e,f);d.getCurrentPosition(i,g,h)},watchPosition:function(e,f,g){d.watchPosition(e,f,g)},clearWatch:function(e){d.clearWatch(e)},getPermission:function(g,e,f){d.getPermission(g,e,f)}}});var b=(function(){var i=false;var e=function(){if(!d()&&!i){i=true;var j=document.createElement("script");j.src=(document.location.protocol=="https:"?"https://":"http://")+"www.google.com/jsapi?callback=_google_loader_apiLoaded";j.type="text/javascript";document.getElementsByTagName("body")[0].appendChild(j)}};var c=[];var h=function(j){c.push(j)};var f=function(){if(d()){while(c.length>0){var j=c.pop();j()}}};window._google_loader_apiLoaded=function(){f()};var d=function(){return(window.google&&google.loader)};var g=function(j){if(d()){return true}h(j);e();return false};e();return{shim:true,type:"ClientLocation",lastPosition:null,getCurrentPosition:function(k,n,o){var m=this;if(!g(function(){m.getCurrentPosition(k,n,o)})){return}if(google.loader.ClientLocation){var l=google.loader.ClientLocation;var j={coords:{latitude:l.latitude,longitude:l.longitude,altitude:null,accuracy:43000,altitudeAccuracy:null,heading:null,speed:null},address:{city:l.address.city,country:l.address.country,country_code:l.address.country_code,region:l.address.region},timestamp:new Date()};k(j);this.lastPosition=j}else{if(n==="function"){n({code:3,message:"Using the Google ClientLocation API and it is not able to calculate a location."})}}},watchPosition:function(j,l,m){this.getCurrentPosition(j,l,m);var k=this;var n=setInterval(function(){k.getCurrentPosition(j,l,m)},10000);return n},clearWatch:function(j){clearInterval(j)},getPermission:function(l,j,k){return true}}});navigator.geolocation=(window.google&&google.gears)?a():b()})()};
\ No newline at end of file
+var SN={C:{I:{CounterBlackout:false,MaxLength:140,PatternUsername:/^[0-9a-zA-Z\-_.]*$/,HTTP20x30x:[200,201,202,203,204,205,206,300,301,302,303,304,305,306,307]},S:{Disabled:"disabled",Warning:"warning",Error:"error",Success:"success",Processing:"processing",CommandResult:"command_result",FormNotice:"form_notice",NoticeDataText:"notice_data-text",NoticeTextCount:"notice_text-count",NoticeInReplyTo:"notice_in-reply-to",NoticeDataAttach:"notice_data-attach",NoticeDataAttachSelected:"notice_data-attach_selected",NoticeActionSubmit:"notice_action-submit",NoticeLat:"notice_data-lat",NoticeLon:"notice_data-lon",NoticeLocationId:"notice_data-location_id",NoticeLocationNs:"notice_data-location_ns",NoticeGeoName:"notice_data-geo_name",NoticeDataGeo:"notice_data-geo",NoticeDataGeoCookie:"NoticeDataGeo",NoticeDataGeoSelected:"notice_data-geo_selected",StatusNetInstance:"StatusNetInstance"}},messages:{},msg:function(a){if(typeof SN.messages[a]=="undefined"){return"["+a+"]"}else{return SN.messages[a]}},U:{FormNoticeEnhancements:function(b){if(jQuery.data(b[0],"ElementData")===undefined){MaxLength=b.find("#"+SN.C.S.NoticeTextCount).text();if(typeof(MaxLength)=="undefined"){MaxLength=SN.C.I.MaxLength}jQuery.data(b[0],"ElementData",{MaxLength:MaxLength});SN.U.Counter(b);NDT=b.find("#"+SN.C.S.NoticeDataText);NDT.bind("keyup",function(c){SN.U.Counter(b)});var a=function(c){window.setTimeout(function(){SN.U.Counter(b)},50)};NDT.bind("cut",a).bind("paste",a);NDT.bind("keydown",function(c){SN.U.SubmitOnReturn(c,b)})}else{b.find("#"+SN.C.S.NoticeTextCount).text(jQuery.data(b[0],"ElementData").MaxLength)}if($("body")[0].id!="conversation"&&window.location.hash.length===0&&$(window).scrollTop()==0){b.find("textarea").focus()}},SubmitOnReturn:function(b,a){if(b.keyCode==13||b.keyCode==10){a.submit();b.preventDefault();b.stopPropagation();$("#"+a[0].id+" #"+SN.C.S.NoticeDataText).blur();$("body").focus();return false}return true},Counter:function(d){SN.C.I.FormNoticeCurrent=d;var b=jQuery.data(d[0],"ElementData").MaxLength;if(b<=0){return}var c=b-SN.U.CharacterCount(d);var a=d.find("#"+SN.C.S.NoticeTextCount);if(c.toString()!=a.text()){if(!SN.C.I.CounterBlackout||c===0){if(a.text()!=String(c)){a.text(c)}if(c<0){d.addClass(SN.C.S.Warning)}else{d.removeClass(SN.C.S.Warning)}if(!SN.C.I.CounterBlackout){SN.C.I.CounterBlackout=true;SN.C.I.FormNoticeCurrent=d;window.setTimeout("SN.U.ClearCounterBlackout(SN.C.I.FormNoticeCurrent);",500)}}}},CharacterCount:function(a){return a.find("#"+SN.C.S.NoticeDataText).val().length},ClearCounterBlackout:function(a){SN.C.I.CounterBlackout=false;SN.U.Counter(a)},RewriteAjaxAction:function(a){if(document.location.protocol=="https:"&&a.substr(0,5)=="http:"){return a.replace(/^http:\/\/[^:\/]+/,"https://"+document.location.host)}else{return a}},FormXHR:function(a){$.ajax({type:"POST",dataType:"xml",url:SN.U.RewriteAjaxAction(a.attr("action")),data:a.serialize()+"&ajax=1",beforeSend:function(b){a.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(c,d,b){alert(b||d)},success:function(b,c){if(typeof($("form",b)[0])!="undefined"){form_new=document._importNode($("form",b)[0],true);a.replaceWith(form_new)}else{a.replaceWith(document._importNode($("p",b)[0],true))}}})},FormNoticeXHR:function(b){SN.C.I.NoticeDataGeo={};b.append('<input type="hidden" name="ajax" value="1"/>');b.attr("action",SN.U.RewriteAjaxAction(b.attr("action")));var c=function(d,e){b.append($('<p class="form_response"></p>').addClass(d).text(e))};var a=function(){b.find(".form_response").remove()};b.ajaxForm({dataType:"xml",timeout:"60000",beforeSend:function(d){if(b.find("#"+SN.C.S.NoticeDataText)[0].value.length===0){b.addClass(SN.C.S.Warning);return false}b.addClass(SN.C.S.Processing).find("#"+SN.C.S.NoticeActionSubmit).addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled);SN.C.I.NoticeDataGeo.NLat=$("#"+SN.C.S.NoticeLat).val();SN.C.I.NoticeDataGeo.NLon=$("#"+SN.C.S.NoticeLon).val();SN.C.I.NoticeDataGeo.NLNS=$("#"+SN.C.S.NoticeLocationNs).val();SN.C.I.NoticeDataGeo.NLID=$("#"+SN.C.S.NoticeLocationId).val();SN.C.I.NoticeDataGeo.NDG=$("#"+SN.C.S.NoticeDataGeo).attr("checked");cookieValue=$.cookie(SN.C.S.NoticeDataGeoCookie);if(cookieValue!==null&&cookieValue!="disabled"){cookieValue=JSON.parse(cookieValue);SN.C.I.NoticeDataGeo.NLat=$("#"+SN.C.S.NoticeLat).val(cookieValue.NLat).val();SN.C.I.NoticeDataGeo.NLon=$("#"+SN.C.S.NoticeLon).val(cookieValue.NLon).val();if($("#"+SN.C.S.NoticeLocationNs).val(cookieValue.NLNS)){SN.C.I.NoticeDataGeo.NLNS=$("#"+SN.C.S.NoticeLocationNs).val(cookieValue.NLNS).val();SN.C.I.NoticeDataGeo.NLID=$("#"+SN.C.S.NoticeLocationId).val(cookieValue.NLID).val()}}if(cookieValue=="disabled"){SN.C.I.NoticeDataGeo.NDG=$("#"+SN.C.S.NoticeDataGeo).attr("checked",false).attr("checked")}else{SN.C.I.NoticeDataGeo.NDG=$("#"+SN.C.S.NoticeDataGeo).attr("checked",true).attr("checked")}return true},error:function(f,g,e){b.removeClass(SN.C.S.Processing).find("#"+SN.C.S.NoticeActionSubmit).removeClass(SN.C.S.Disabled).removeAttr(SN.C.S.Disabled,SN.C.S.Disabled);a();if(g=="timeout"){c("error","Sorry! We had trouble sending your notice. The servers are overloaded. Please try again, and contact the site administrator if this problem persists.")}else{var d=SN.U.GetResponseXML(f);if($("."+SN.C.S.Error,d).length>0){b.append(document._importNode($("."+SN.C.S.Error,d)[0],true))}else{if(parseInt(f.status)===0||jQuery.inArray(parseInt(f.status),SN.C.I.HTTP20x30x)>=0){b.resetForm().find("#"+SN.C.S.NoticeDataAttachSelected).remove();SN.U.FormNoticeEnhancements(b)}else{c("error","(Sorry! We had trouble sending your notice ("+f.status+" "+f.statusText+"). Please report the problem to the site administrator if this happens again.")}}}},success:function(i,k){a();var e=$("#"+SN.C.S.Error,i);if(e.length>0){c("error",e.text())}else{if($("body")[0].id=="bookmarklet"){self.close()}var d=$("#"+SN.C.S.CommandResult,i);if(d.length>0){c("success",d.text())}else{var h=document._importNode($("li",i)[0],true);var j=$("#notices_primary .notices");if(j.length>0&&SN.U.belongsOnTimeline(h)){if($("#"+h.id).length===0){var f=$("#"+SN.C.S.NoticeInReplyTo).val();var g="#notices_primary #notice-"+f;if($("body")[0].id=="conversation"){if(f.length>0&&$(g+" .notices").length<1){$(g).append('<ul class="notices"></ul>')}$($(g+" .notices")[0]).append(h)}else{j.prepend(h)}$("#"+h.id).css({display:"none"}).fadeIn(2500);SN.U.NoticeWithAttachment($("#"+h.id));SN.U.NoticeReplyTo($("#"+h.id))}}else{c("success",$("title",i).text())}}b.resetForm();b.find("#"+SN.C.S.NoticeInReplyTo).val("");b.find("#"+SN.C.S.NoticeDataAttachSelected).remove();SN.U.FormNoticeEnhancements(b)}},complete:function(d,e){b.removeClass(SN.C.S.Processing).find("#"+SN.C.S.NoticeActionSubmit).removeAttr(SN.C.S.Disabled).removeClass(SN.C.S.Disabled);$("#"+SN.C.S.NoticeLat).val(SN.C.I.NoticeDataGeo.NLat);$("#"+SN.C.S.NoticeLon).val(SN.C.I.NoticeDataGeo.NLon);if($("#"+SN.C.S.NoticeLocationNs)){$("#"+SN.C.S.NoticeLocationNs).val(SN.C.I.NoticeDataGeo.NLNS);$("#"+SN.C.S.NoticeLocationId).val(SN.C.I.NoticeDataGeo.NLID)}$("#"+SN.C.S.NoticeDataGeo).attr("checked",SN.C.I.NoticeDataGeo.NDG)}})},GetResponseXML:function(b){try{return b.responseXML}catch(a){return(new DOMParser()).parseFromString(b.responseText,"text/xml")}},NoticeReply:function(){if($("#"+SN.C.S.NoticeDataText).length>0&&$("#content .notice_reply").length>0){$("#content .notice").each(function(){SN.U.NoticeReplyTo($(this))})}},NoticeReplyTo:function(a){a.find(".notice_reply").live("click",function(c){c.preventDefault();var b=($(".author .nickname",a).length>0)?$($(".author .nickname",a)[0]):$(".author .nickname.uid");SN.U.NoticeInlineReplyTrigger(a,"@"+b.text());return false})},NoticeInlineReplyTrigger:function(h,i){var c=$($(".notice_id",h)[0]).text();var d=h;var f=h.closest(".notices");if(f.hasClass("threaded-notices")){d=f.closest(".notice")}else{f=$("ul.threaded-notices",h);if(f.length==0){f=$('<ul class="notices threaded-notices xoxo"></ul>');h.append(f)}}var k=$(".notice-reply-form",f);if(k.length==0){$("li.notice-reply-placeholder").remove();var g=$("li.notice-reply",f);if(g.length==0){g=$('<li class="notice-reply"><form class="notice-reply-form" method="post"><textarea name="status_textarea"></textarea><div class="controls"><input type="hidden" name="token"><input type="hidden" name="inreplyto"><input type="submit" class="submit"></div></form></li>');var b=$("#form_notice");k=g.find("form");k.attr("action",b.attr("action"));k.find('input[name="token"]').val(b.find("input[name=token]").val());k.find('input[type="submit"]').val(SN.msg("reply_submit"));f.append(g);k.submit(function(m){var l=k;$.ajax({type:"POST",dataType:"xml",url:SN.U.RewriteAjaxAction(l.attr("action")),data:l.serialize()+"&ajax=1",beforeSend:function(n){l.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled).end().find("textarea").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(o,p,n){alert(n||p)},success:function(p,q){var o=$("li",p)[0];if(o){var n=document._importNode(o,true);g.replaceWith(n);SN.U.NoticeInlineReplyPlaceholder(d)}}});m.preventDefault();return false})}}k.find("input[name=inreplyto]").val(c);var j=k.find("textarea");if(j.length==0){throw"No textarea"}if(i){var a=i+" ";j.val(a+j.val().replace(RegExp(a,"i"),""))}j.focus();if(j[0].setSelectionRange){var e=j.val().length;j[0].setSelectionRange(e,e)}},NoticeReplySet:function(b,d){if(b.match(SN.C.I.PatternUsername)){var c=$("#"+SN.C.S.NoticeDataText);if(c.length>0){replyto="@"+b+" ";c.val(replyto+c.val().replace(RegExp(replyto,"i"),""));$("#"+SN.C.S.FormNotice+" #"+SN.C.S.NoticeInReplyTo).val(d);c[0].focus();if(c[0].setSelectionRange){var a=c.val().length;c[0].setSelectionRange(a,a)}}}},NoticeFavor:function(){$(".form_favor").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_disfavor").live("click",function(){SN.U.FormXHR($(this));return false})},NoticeInlineReplyPlaceholder:function(b){var a=b.find("ul.threaded-notices");var c=$('<li class="notice-reply-placeholder"><input class="placeholder"></li>');c.click(function(){SN.U.NoticeInlineReplyTrigger(b)});c.find("input").val(SN.msg("reply_comment"));a.append(c)},NoticeInlineReplySetup:function(){$(".threaded-notices").each(function(){var b=$(this);var a=b.closest(".notice");SN.U.NoticeInlineReplyPlaceholder(a)})},NoticeRepeat:function(){$(".form_repeat").live("click",function(a){a.preventDefault();SN.U.NoticeRepeatConfirmation($(this));return false})},NoticeRepeatConfirmation:function(a){var c=a.find(".submit");var b=c.clone();b.addClass("submit_dialogbox").removeClass("submit");a.append(b);b.bind("click",function(){SN.U.FormXHR(a);return false});c.hide();a.addClass("dialogbox").append('<button class="close">&#215;</button>').closest(".notice-options").addClass("opaque");a.find("button.close").click(function(){$(this).remove();a.removeClass("dialogbox").closest(".notice-options").removeClass("opaque");a.find(".submit_dialogbox").remove();a.find(".submit").show();return false})},NoticeAttachments:function(){$(".notice a.attachment").each(function(){SN.U.NoticeWithAttachment($(this).closest(".notice"))})},NoticeWithAttachment:function(b){if(b.find(".attachment").length===0){return}var a=b.find(".attachment.more");if(a.length>0){$(a[0]).click(function(){var c=$(this);c.addClass(SN.C.S.Processing);$.get(c.attr("href")+"/ajax",null,function(d){c.parent(".entry-content").html($(d).find("#attachment_view .entry-content").html())});return false}).attr("title",SN.msg("showmore_tooltip"))}},NoticeDataAttach:function(){NDA=$("#"+SN.C.S.NoticeDataAttach);NDA.change(function(c){var a=$(this).val();if(!a){$("#"+SN.C.S.NoticeDataAttachSelected).remove();return false}S='<div id="'+SN.C.S.NoticeDataAttachSelected+'" class="'+SN.C.S.Success+'"><code>'+a+'</code> <button class="close">&#215;</button></div>';NDAS=$("#"+SN.C.S.NoticeDataAttachSelected);if(NDAS.length>0){NDAS.replaceWith(S)}else{$("#"+SN.C.S.FormNotice).append(S)}$("#"+SN.C.S.NoticeDataAttachSelected+" button").click(function(){$("#"+SN.C.S.NoticeDataAttachSelected).remove();NDA.val("");return false});if(typeof this.files=="object"){for(var b=0;b<this.files.length;b++){SN.U.PreviewAttach(this.files[b])}}})},maxFileSize:function(b){var a=$(b).find("input[name=MAX_FILE_SIZE]").attr("value");if(a){return parseInt(a)}else{return 0}},PreviewAttach:function(c){var d=c.type+" "+Math.round(c.size/1024)+"KB";var e=true;var g;if(typeof window.createObjectURL!="undefined"){g=function(h,i){i(window.createObjectURL(h))}}else{if(typeof window.FileReader!="undefined"){g=function(i,j){var h=new FileReader();h.onload=function(k){j(h.result)};h.readAsDataURL(i)}}else{e=false}}var a=["image/png","image/jpeg","image/gif","image/svg+xml"];if($.inArray(c.type,a)==-1){e=false}var f=8*1024*1024;if(c.size>f){e=false}if(e){g(c,function(i){var h=$("<img>").attr("title",d).attr("alt",d).attr("src",i).attr("style","height: 120px");$("#"+SN.C.S.NoticeDataAttachSelected).append(h)})}else{var b=$("<div></div>").text(d);$("#"+SN.C.S.NoticeDataAttachSelected).append(b)}},NoticeLocationAttach:function(){var c=$("#"+SN.C.S.NoticeLat).val();var h=$("#"+SN.C.S.NoticeLon).val();var d=$("#"+SN.C.S.NoticeLocationNs).val();var i=$("#"+SN.C.S.NoticeLocationId).val();var a=$("#"+SN.C.S.NoticeGeoName).text();var b=$("#"+SN.C.S.NoticeDataGeo);function e(){$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",jQuery.trim($("label[for="+SN.C.S.NoticeDataGeo+"]").text())).removeClass("checked");$("#"+SN.C.S.NoticeLat).val("");$("#"+SN.C.S.NoticeLon).val("");$("#"+SN.C.S.NoticeLocationNs).val("");$("#"+SN.C.S.NoticeLocationId).val("");$("#"+SN.C.S.NoticeDataGeo).attr("checked",false);$.cookie(SN.C.S.NoticeDataGeoCookie,"disabled",{path:"/"})}function j(k,l){$.getJSON(k,l,function(m){var n,o;if(typeof(m.location_ns)!="undefined"){$("#"+SN.C.S.NoticeLocationNs).val(m.location_ns);n=m.location_ns}if(typeof(m.location_id)!="undefined"){$("#"+SN.C.S.NoticeLocationId).val(m.location_id);o=m.location_id}if(typeof(m.name)=="undefined"){NLN_text=l.lat+";"+l.lon}else{NLN_text=m.name}$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",NoticeDataGeo_text.ShareDisable+" ("+NLN_text+")");$("#"+SN.C.S.NoticeLat).val(l.lat);$("#"+SN.C.S.NoticeLon).val(l.lon);$("#"+SN.C.S.NoticeLocationNs).val(n);$("#"+SN.C.S.NoticeLocationId).val(o);$("#"+SN.C.S.NoticeDataGeo).attr("checked",true);var p={NLat:l.lat,NLon:l.lon,NLNS:n,NLID:o,NLN:NLN_text,NLNU:m.url,NDG:true};$.cookie(SN.C.S.NoticeDataGeoCookie,JSON.stringify(p),{path:"/"})})}if(b.length>0){if($.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){b.attr("checked",false)}else{b.attr("checked",true)}var f=$("#notice_data-geo_wrap");var g=f.attr("title");f.removeAttr("title");$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",jQuery.trim($("label[for="+SN.C.S.NoticeDataGeo+"]").text()));b.change(function(){if($("#"+SN.C.S.NoticeDataGeo).attr("checked")===true||$.cookie(SN.C.S.NoticeDataGeoCookie)===null){$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",NoticeDataGeo_text.ShareDisable).addClass("checked");if($.cookie(SN.C.S.NoticeDataGeoCookie)===null||$.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){if(navigator.geolocation){navigator.geolocation.getCurrentPosition(function(m){$("#"+SN.C.S.NoticeLat).val(m.coords.latitude);$("#"+SN.C.S.NoticeLon).val(m.coords.longitude);var n={lat:m.coords.latitude,lon:m.coords.longitude,token:$("#token").val()};j(g,n)},function(m){switch(m.code){case m.PERMISSION_DENIED:e();break;case m.TIMEOUT:$("#"+SN.C.S.NoticeDataGeo).attr("checked",false);break}},{timeout:10000})}else{if(c.length>0&&h.length>0){var k={lat:c,lon:h,token:$("#token").val()};j(g,k)}else{e();$("#"+SN.C.S.NoticeDataGeo).remove();$("label[for="+SN.C.S.NoticeDataGeo+"]").remove()}}}else{var l=JSON.parse($.cookie(SN.C.S.NoticeDataGeoCookie));$("#"+SN.C.S.NoticeLat).val(l.NLat);$("#"+SN.C.S.NoticeLon).val(l.NLon);$("#"+SN.C.S.NoticeLocationNs).val(l.NLNS);$("#"+SN.C.S.NoticeLocationId).val(l.NLID);$("#"+SN.C.S.NoticeDataGeo).attr("checked",l.NDG);$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",NoticeDataGeo_text.ShareDisable+" ("+l.NLN+")").addClass("checked")}}else{e()}}).change()}},NewDirectMessage:function(){NDM=$(".entity_send-a-message a");NDM.attr({href:NDM.attr("href")+"&ajax=1"});NDM.bind("click",function(){var a=$(".entity_send-a-message form");if(a.length===0){$(this).addClass(SN.C.S.Processing);$.get(NDM.attr("href"),null,function(b){$(".entity_send-a-message").append(document._importNode($("form",b)[0],true));a=$(".entity_send-a-message .form_notice");SN.U.FormNoticeXHR(a);SN.U.FormNoticeEnhancements(a);a.append('<button class="close">&#215;</button>');$(".entity_send-a-message button").click(function(){a.hide();return false});NDM.removeClass(SN.C.S.Processing)})}else{a.show();$(".entity_send-a-message textarea").focus()}return false})},GetFullYear:function(c,d,a){var b=new Date();b.setFullYear(c,d,a);return b},StatusNetInstance:{Set:function(b){var a=SN.U.StatusNetInstance.Get();if(a!==null){b=$.extend(a,b)}$.cookie(SN.C.S.StatusNetInstance,JSON.stringify(b),{path:"/",expires:SN.U.GetFullYear(2029,0,1)})},Get:function(){var a=$.cookie(SN.C.S.StatusNetInstance);if(a!==null){return JSON.parse(a)}return null},Delete:function(){$.cookie(SN.C.S.StatusNetInstance,null)}},belongsOnTimeline:function(b){var a=$("body").attr("id");if(a=="public"){return true}var c=$("#nav_profile a").attr("href");if(c){var d=$(b).find(".entry-title .author a.url").attr("href");if(d==c){if(a=="all"||a=="showstream"){return true}}}return false}},Init:{NoticeForm:function(){if($("body.user_in").length>0){SN.U.NoticeLocationAttach();$("."+SN.C.S.FormNotice).each(function(){SN.U.FormNoticeXHR($(this));SN.U.FormNoticeEnhancements($(this))});SN.U.NoticeDataAttach()}},Notices:function(){if($("body.user_in").length>0){SN.U.NoticeFavor();SN.U.NoticeRepeat();SN.U.NoticeReply();SN.U.NoticeInlineReplySetup()}SN.U.NoticeAttachments()},EntityActions:function(){if($("body.user_in").length>0){$(".form_user_subscribe").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_user_unsubscribe").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_group_join").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_group_leave").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_user_nudge").live("click",function(){SN.U.FormXHR($(this));return false});SN.U.NewDirectMessage()}},Login:function(){if(SN.U.StatusNetInstance.Get()!==null){var a=SN.U.StatusNetInstance.Get().Nickname;if(a!==null){$("#form_login #nickname").val(a)}}$("#form_login").bind("submit",function(){SN.U.StatusNetInstance.Set({Nickname:$("#form_login #nickname").val()});return true})},UploadForms:function(){$("input[type=file]").change(function(d){if(typeof this.files=="object"&&this.files.length>0){var c=0;for(var b=0;b<this.files.length;b++){c+=this.files[b].size}var a=SN.U.maxFileSize($(this.form));if(a>0&&c>a){var e="File too large: maximum upload size is %d bytes.";alert(e.replace("%d",a));$(this).val("");d.preventDefault();return false}}})}}};$(document).ready(function(){SN.Init.UploadForms();if($("."+SN.C.S.FormNotice).length>0){SN.Init.NoticeForm()}if($("#content .notices").length>0){SN.Init.Notices()}if($("#content .entity_actions").length>0){SN.Init.EntityActions()}if($("#form_login").length>0){SN.Init.Login()}});if(!document.ELEMENT_NODE){document.ELEMENT_NODE=1;document.ATTRIBUTE_NODE=2;document.TEXT_NODE=3;document.CDATA_SECTION_NODE=4;document.ENTITY_REFERENCE_NODE=5;document.ENTITY_NODE=6;document.PROCESSING_INSTRUCTION_NODE=7;document.COMMENT_NODE=8;document.DOCUMENT_NODE=9;document.DOCUMENT_TYPE_NODE=10;document.DOCUMENT_FRAGMENT_NODE=11;document.NOTATION_NODE=12}document._importNode=function(e,a){switch(e.nodeType){case document.ELEMENT_NODE:var d=document.createElement(e.nodeName);if(e.attributes&&e.attributes.length>0){for(var c=0,b=e.attributes.length;c<b;){if(e.attributes[c].nodeName=="class"){d.className=e.getAttribute(e.attributes[c++].nodeName)}else{d.setAttribute(e.attributes[c].nodeName,e.getAttribute(e.attributes[c++].nodeName))}}}if(a&&e.childNodes&&e.childNodes.length>0){for(var c=0,b=e.childNodes.length;c<b;){d.appendChild(document._importNode(e.childNodes[c++],a))}}return d;break;case document.TEXT_NODE:case document.CDATA_SECTION_NODE:case document.COMMENT_NODE:return document.createTextNode(e.nodeValue);break}};if(typeof navigator.geolocation=="undefined"||navigator.geolocation.shim){(function(){(function(){if(window.google&&google.gears){return}var c=null;if(typeof GearsFactory!="undefined"){c=new GearsFactory()}else{try{c=new ActiveXObject("Gears.Factory");if(c.getBuildInfo().indexOf("ie_mobile")!=-1){c.privateSetGlobalObject(this)}}catch(d){if((typeof navigator.mimeTypes!="undefined")&&navigator.mimeTypes["application/x-googlegears"]){c=document.createElement("object");c.style.display="none";c.width=0;c.height=0;c.type="application/x-googlegears";document.documentElement.appendChild(c)}}}if(!c){return}if(!window.google){google={}}if(!google.gears){google.gears={factory:c}}})();var a=(function(){var d=google.gears.factory.create("beta.geolocation");var c=function(f,e){return function(g){f(g);e.lastPosition=g}};return{shim:true,type:"Gears",lastPosition:null,getCurrentPosition:function(e,g,h){var f=this;var i=c(e,f);d.getCurrentPosition(i,g,h)},watchPosition:function(e,f,g){d.watchPosition(e,f,g)},clearWatch:function(e){d.clearWatch(e)},getPermission:function(g,e,f){d.getPermission(g,e,f)}}});var b=(function(){var i=false;var e=function(){if(!d()&&!i){i=true;var j=document.createElement("script");j.src=(document.location.protocol=="https:"?"https://":"http://")+"www.google.com/jsapi?callback=_google_loader_apiLoaded";j.type="text/javascript";document.getElementsByTagName("body")[0].appendChild(j)}};var c=[];var h=function(j){c.push(j)};var f=function(){if(d()){while(c.length>0){var j=c.pop();j()}}};window._google_loader_apiLoaded=function(){f()};var d=function(){return(window.google&&google.loader)};var g=function(j){if(d()){return true}h(j);e();return false};e();return{shim:true,type:"ClientLocation",lastPosition:null,getCurrentPosition:function(k,n,o){var m=this;if(!g(function(){m.getCurrentPosition(k,n,o)})){return}if(google.loader.ClientLocation){var l=google.loader.ClientLocation;var j={coords:{latitude:l.latitude,longitude:l.longitude,altitude:null,accuracy:43000,altitudeAccuracy:null,heading:null,speed:null},address:{city:l.address.city,country:l.address.country,country_code:l.address.country_code,region:l.address.region},timestamp:new Date()};k(j);this.lastPosition=j}else{if(n==="function"){n({code:3,message:"Using the Google ClientLocation API and it is not able to calculate a location."})}}},watchPosition:function(j,l,m){this.getCurrentPosition(j,l,m);var k=this;var n=setInterval(function(){k.getCurrentPosition(j,l,m)},10000);return n},clearWatch:function(j){clearInterval(j)},getPermission:function(l,j,k){return true}}});navigator.geolocation=(window.google&&google.gears)?a():b()})()};
\ No newline at end of file

From e6c972ebcb1a42e315f6b9df9f88b0e15687c3aa Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Tue, 1 Mar 2011 14:24:06 -0800
Subject: [PATCH 356/655] Inline replies: drop the box if tabbing out and no
 text

---
 js/util.js     | 15 +++++++++++++--
 js/util.min.js |  2 +-
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/js/util.js b/js/util.js
index d7f6861585..b2e28f2753 100644
--- a/js/util.js
+++ b/js/util.js
@@ -616,6 +616,15 @@ var SN = { // StatusNet
                     replyForm.find('input[type="submit"]').val(SN.msg('reply_submit'));
                     list.append(replyItem);
 
+                    replyForm.find('textarea').blur(function() {
+                        var textarea = $(this);
+                        var txt = $.trim(textarea.val());
+                        if (txt == '' || txt == textarea.data('initialText')) {
+                            // Nothing to say? Begone!
+                            replyItem.remove();
+                            SN.U.NoticeInlineReplyPlaceholder(parentNotice);
+                        }
+                    });
                     replyForm.submit(function(event) {
                         var form = replyForm;
                         $.ajax({
@@ -660,10 +669,12 @@ var SN = { // StatusNet
             if (text.length == 0) {
                 throw "No textarea";
             }
+            var replyto = '';
             if (initialText) {
-                var replyto = initialText + ' ';
-                text.val(replyto + text.val().replace(RegExp(replyto, 'i'), ''));
+                replyto = initialText + ' ';
             }
+            text.val(replyto + text.val().replace(RegExp(replyto, 'i'), ''));
+            text.data('initialText', $.trim(initialText + ''));
             text.focus();
             if (text[0].setSelectionRange) {
                 var len = text.val().length;
diff --git a/js/util.min.js b/js/util.min.js
index 1fd7bcc234..e2966321c0 100644
--- a/js/util.min.js
+++ b/js/util.min.js
@@ -1 +1 @@
-var SN={C:{I:{CounterBlackout:false,MaxLength:140,PatternUsername:/^[0-9a-zA-Z\-_.]*$/,HTTP20x30x:[200,201,202,203,204,205,206,300,301,302,303,304,305,306,307]},S:{Disabled:"disabled",Warning:"warning",Error:"error",Success:"success",Processing:"processing",CommandResult:"command_result",FormNotice:"form_notice",NoticeDataText:"notice_data-text",NoticeTextCount:"notice_text-count",NoticeInReplyTo:"notice_in-reply-to",NoticeDataAttach:"notice_data-attach",NoticeDataAttachSelected:"notice_data-attach_selected",NoticeActionSubmit:"notice_action-submit",NoticeLat:"notice_data-lat",NoticeLon:"notice_data-lon",NoticeLocationId:"notice_data-location_id",NoticeLocationNs:"notice_data-location_ns",NoticeGeoName:"notice_data-geo_name",NoticeDataGeo:"notice_data-geo",NoticeDataGeoCookie:"NoticeDataGeo",NoticeDataGeoSelected:"notice_data-geo_selected",StatusNetInstance:"StatusNetInstance"}},messages:{},msg:function(a){if(typeof SN.messages[a]=="undefined"){return"["+a+"]"}else{return SN.messages[a]}},U:{FormNoticeEnhancements:function(b){if(jQuery.data(b[0],"ElementData")===undefined){MaxLength=b.find("#"+SN.C.S.NoticeTextCount).text();if(typeof(MaxLength)=="undefined"){MaxLength=SN.C.I.MaxLength}jQuery.data(b[0],"ElementData",{MaxLength:MaxLength});SN.U.Counter(b);NDT=b.find("#"+SN.C.S.NoticeDataText);NDT.bind("keyup",function(c){SN.U.Counter(b)});var a=function(c){window.setTimeout(function(){SN.U.Counter(b)},50)};NDT.bind("cut",a).bind("paste",a);NDT.bind("keydown",function(c){SN.U.SubmitOnReturn(c,b)})}else{b.find("#"+SN.C.S.NoticeTextCount).text(jQuery.data(b[0],"ElementData").MaxLength)}if($("body")[0].id!="conversation"&&window.location.hash.length===0&&$(window).scrollTop()==0){b.find("textarea").focus()}},SubmitOnReturn:function(b,a){if(b.keyCode==13||b.keyCode==10){a.submit();b.preventDefault();b.stopPropagation();$("#"+a[0].id+" #"+SN.C.S.NoticeDataText).blur();$("body").focus();return false}return true},Counter:function(d){SN.C.I.FormNoticeCurrent=d;var b=jQuery.data(d[0],"ElementData").MaxLength;if(b<=0){return}var c=b-SN.U.CharacterCount(d);var a=d.find("#"+SN.C.S.NoticeTextCount);if(c.toString()!=a.text()){if(!SN.C.I.CounterBlackout||c===0){if(a.text()!=String(c)){a.text(c)}if(c<0){d.addClass(SN.C.S.Warning)}else{d.removeClass(SN.C.S.Warning)}if(!SN.C.I.CounterBlackout){SN.C.I.CounterBlackout=true;SN.C.I.FormNoticeCurrent=d;window.setTimeout("SN.U.ClearCounterBlackout(SN.C.I.FormNoticeCurrent);",500)}}}},CharacterCount:function(a){return a.find("#"+SN.C.S.NoticeDataText).val().length},ClearCounterBlackout:function(a){SN.C.I.CounterBlackout=false;SN.U.Counter(a)},RewriteAjaxAction:function(a){if(document.location.protocol=="https:"&&a.substr(0,5)=="http:"){return a.replace(/^http:\/\/[^:\/]+/,"https://"+document.location.host)}else{return a}},FormXHR:function(a){$.ajax({type:"POST",dataType:"xml",url:SN.U.RewriteAjaxAction(a.attr("action")),data:a.serialize()+"&ajax=1",beforeSend:function(b){a.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(c,d,b){alert(b||d)},success:function(b,c){if(typeof($("form",b)[0])!="undefined"){form_new=document._importNode($("form",b)[0],true);a.replaceWith(form_new)}else{a.replaceWith(document._importNode($("p",b)[0],true))}}})},FormNoticeXHR:function(b){SN.C.I.NoticeDataGeo={};b.append('<input type="hidden" name="ajax" value="1"/>');b.attr("action",SN.U.RewriteAjaxAction(b.attr("action")));var c=function(d,e){b.append($('<p class="form_response"></p>').addClass(d).text(e))};var a=function(){b.find(".form_response").remove()};b.ajaxForm({dataType:"xml",timeout:"60000",beforeSend:function(d){if(b.find("#"+SN.C.S.NoticeDataText)[0].value.length===0){b.addClass(SN.C.S.Warning);return false}b.addClass(SN.C.S.Processing).find("#"+SN.C.S.NoticeActionSubmit).addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled);SN.C.I.NoticeDataGeo.NLat=$("#"+SN.C.S.NoticeLat).val();SN.C.I.NoticeDataGeo.NLon=$("#"+SN.C.S.NoticeLon).val();SN.C.I.NoticeDataGeo.NLNS=$("#"+SN.C.S.NoticeLocationNs).val();SN.C.I.NoticeDataGeo.NLID=$("#"+SN.C.S.NoticeLocationId).val();SN.C.I.NoticeDataGeo.NDG=$("#"+SN.C.S.NoticeDataGeo).attr("checked");cookieValue=$.cookie(SN.C.S.NoticeDataGeoCookie);if(cookieValue!==null&&cookieValue!="disabled"){cookieValue=JSON.parse(cookieValue);SN.C.I.NoticeDataGeo.NLat=$("#"+SN.C.S.NoticeLat).val(cookieValue.NLat).val();SN.C.I.NoticeDataGeo.NLon=$("#"+SN.C.S.NoticeLon).val(cookieValue.NLon).val();if($("#"+SN.C.S.NoticeLocationNs).val(cookieValue.NLNS)){SN.C.I.NoticeDataGeo.NLNS=$("#"+SN.C.S.NoticeLocationNs).val(cookieValue.NLNS).val();SN.C.I.NoticeDataGeo.NLID=$("#"+SN.C.S.NoticeLocationId).val(cookieValue.NLID).val()}}if(cookieValue=="disabled"){SN.C.I.NoticeDataGeo.NDG=$("#"+SN.C.S.NoticeDataGeo).attr("checked",false).attr("checked")}else{SN.C.I.NoticeDataGeo.NDG=$("#"+SN.C.S.NoticeDataGeo).attr("checked",true).attr("checked")}return true},error:function(f,g,e){b.removeClass(SN.C.S.Processing).find("#"+SN.C.S.NoticeActionSubmit).removeClass(SN.C.S.Disabled).removeAttr(SN.C.S.Disabled,SN.C.S.Disabled);a();if(g=="timeout"){c("error","Sorry! We had trouble sending your notice. The servers are overloaded. Please try again, and contact the site administrator if this problem persists.")}else{var d=SN.U.GetResponseXML(f);if($("."+SN.C.S.Error,d).length>0){b.append(document._importNode($("."+SN.C.S.Error,d)[0],true))}else{if(parseInt(f.status)===0||jQuery.inArray(parseInt(f.status),SN.C.I.HTTP20x30x)>=0){b.resetForm().find("#"+SN.C.S.NoticeDataAttachSelected).remove();SN.U.FormNoticeEnhancements(b)}else{c("error","(Sorry! We had trouble sending your notice ("+f.status+" "+f.statusText+"). Please report the problem to the site administrator if this happens again.")}}}},success:function(i,k){a();var e=$("#"+SN.C.S.Error,i);if(e.length>0){c("error",e.text())}else{if($("body")[0].id=="bookmarklet"){self.close()}var d=$("#"+SN.C.S.CommandResult,i);if(d.length>0){c("success",d.text())}else{var h=document._importNode($("li",i)[0],true);var j=$("#notices_primary .notices");if(j.length>0&&SN.U.belongsOnTimeline(h)){if($("#"+h.id).length===0){var f=$("#"+SN.C.S.NoticeInReplyTo).val();var g="#notices_primary #notice-"+f;if($("body")[0].id=="conversation"){if(f.length>0&&$(g+" .notices").length<1){$(g).append('<ul class="notices"></ul>')}$($(g+" .notices")[0]).append(h)}else{j.prepend(h)}$("#"+h.id).css({display:"none"}).fadeIn(2500);SN.U.NoticeWithAttachment($("#"+h.id));SN.U.NoticeReplyTo($("#"+h.id))}}else{c("success",$("title",i).text())}}b.resetForm();b.find("#"+SN.C.S.NoticeInReplyTo).val("");b.find("#"+SN.C.S.NoticeDataAttachSelected).remove();SN.U.FormNoticeEnhancements(b)}},complete:function(d,e){b.removeClass(SN.C.S.Processing).find("#"+SN.C.S.NoticeActionSubmit).removeAttr(SN.C.S.Disabled).removeClass(SN.C.S.Disabled);$("#"+SN.C.S.NoticeLat).val(SN.C.I.NoticeDataGeo.NLat);$("#"+SN.C.S.NoticeLon).val(SN.C.I.NoticeDataGeo.NLon);if($("#"+SN.C.S.NoticeLocationNs)){$("#"+SN.C.S.NoticeLocationNs).val(SN.C.I.NoticeDataGeo.NLNS);$("#"+SN.C.S.NoticeLocationId).val(SN.C.I.NoticeDataGeo.NLID)}$("#"+SN.C.S.NoticeDataGeo).attr("checked",SN.C.I.NoticeDataGeo.NDG)}})},GetResponseXML:function(b){try{return b.responseXML}catch(a){return(new DOMParser()).parseFromString(b.responseText,"text/xml")}},NoticeReply:function(){if($("#"+SN.C.S.NoticeDataText).length>0&&$("#content .notice_reply").length>0){$("#content .notice").each(function(){SN.U.NoticeReplyTo($(this))})}},NoticeReplyTo:function(a){a.find(".notice_reply").live("click",function(c){c.preventDefault();var b=($(".author .nickname",a).length>0)?$($(".author .nickname",a)[0]):$(".author .nickname.uid");SN.U.NoticeInlineReplyTrigger(a,"@"+b.text());return false})},NoticeInlineReplyTrigger:function(h,i){var c=$($(".notice_id",h)[0]).text();var d=h;var f=h.closest(".notices");if(f.hasClass("threaded-notices")){d=f.closest(".notice")}else{f=$("ul.threaded-notices",h);if(f.length==0){f=$('<ul class="notices threaded-notices xoxo"></ul>');h.append(f)}}var k=$(".notice-reply-form",f);if(k.length==0){$("li.notice-reply-placeholder").remove();var g=$("li.notice-reply",f);if(g.length==0){g=$('<li class="notice-reply"><form class="notice-reply-form" method="post"><textarea name="status_textarea"></textarea><div class="controls"><input type="hidden" name="token"><input type="hidden" name="inreplyto"><input type="submit" class="submit"></div></form></li>');var b=$("#form_notice");k=g.find("form");k.attr("action",b.attr("action"));k.find('input[name="token"]').val(b.find("input[name=token]").val());k.find('input[type="submit"]').val(SN.msg("reply_submit"));f.append(g);k.submit(function(m){var l=k;$.ajax({type:"POST",dataType:"xml",url:SN.U.RewriteAjaxAction(l.attr("action")),data:l.serialize()+"&ajax=1",beforeSend:function(n){l.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled).end().find("textarea").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(o,p,n){alert(n||p)},success:function(p,q){var o=$("li",p)[0];if(o){var n=document._importNode(o,true);g.replaceWith(n);SN.U.NoticeInlineReplyPlaceholder(d)}}});m.preventDefault();return false})}}k.find("input[name=inreplyto]").val(c);var j=k.find("textarea");if(j.length==0){throw"No textarea"}if(i){var a=i+" ";j.val(a+j.val().replace(RegExp(a,"i"),""))}j.focus();if(j[0].setSelectionRange){var e=j.val().length;j[0].setSelectionRange(e,e)}},NoticeReplySet:function(b,d){if(b.match(SN.C.I.PatternUsername)){var c=$("#"+SN.C.S.NoticeDataText);if(c.length>0){replyto="@"+b+" ";c.val(replyto+c.val().replace(RegExp(replyto,"i"),""));$("#"+SN.C.S.FormNotice+" #"+SN.C.S.NoticeInReplyTo).val(d);c[0].focus();if(c[0].setSelectionRange){var a=c.val().length;c[0].setSelectionRange(a,a)}}}},NoticeFavor:function(){$(".form_favor").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_disfavor").live("click",function(){SN.U.FormXHR($(this));return false})},NoticeInlineReplyPlaceholder:function(b){var a=b.find("ul.threaded-notices");var c=$('<li class="notice-reply-placeholder"><input class="placeholder"></li>');c.click(function(){SN.U.NoticeInlineReplyTrigger(b)});c.find("input").val(SN.msg("reply_comment"));a.append(c)},NoticeInlineReplySetup:function(){$(".threaded-notices").each(function(){var b=$(this);var a=b.closest(".notice");SN.U.NoticeInlineReplyPlaceholder(a)})},NoticeRepeat:function(){$(".form_repeat").live("click",function(a){a.preventDefault();SN.U.NoticeRepeatConfirmation($(this));return false})},NoticeRepeatConfirmation:function(a){var c=a.find(".submit");var b=c.clone();b.addClass("submit_dialogbox").removeClass("submit");a.append(b);b.bind("click",function(){SN.U.FormXHR(a);return false});c.hide();a.addClass("dialogbox").append('<button class="close">&#215;</button>').closest(".notice-options").addClass("opaque");a.find("button.close").click(function(){$(this).remove();a.removeClass("dialogbox").closest(".notice-options").removeClass("opaque");a.find(".submit_dialogbox").remove();a.find(".submit").show();return false})},NoticeAttachments:function(){$(".notice a.attachment").each(function(){SN.U.NoticeWithAttachment($(this).closest(".notice"))})},NoticeWithAttachment:function(b){if(b.find(".attachment").length===0){return}var a=b.find(".attachment.more");if(a.length>0){$(a[0]).click(function(){var c=$(this);c.addClass(SN.C.S.Processing);$.get(c.attr("href")+"/ajax",null,function(d){c.parent(".entry-content").html($(d).find("#attachment_view .entry-content").html())});return false}).attr("title",SN.msg("showmore_tooltip"))}},NoticeDataAttach:function(){NDA=$("#"+SN.C.S.NoticeDataAttach);NDA.change(function(c){var a=$(this).val();if(!a){$("#"+SN.C.S.NoticeDataAttachSelected).remove();return false}S='<div id="'+SN.C.S.NoticeDataAttachSelected+'" class="'+SN.C.S.Success+'"><code>'+a+'</code> <button class="close">&#215;</button></div>';NDAS=$("#"+SN.C.S.NoticeDataAttachSelected);if(NDAS.length>0){NDAS.replaceWith(S)}else{$("#"+SN.C.S.FormNotice).append(S)}$("#"+SN.C.S.NoticeDataAttachSelected+" button").click(function(){$("#"+SN.C.S.NoticeDataAttachSelected).remove();NDA.val("");return false});if(typeof this.files=="object"){for(var b=0;b<this.files.length;b++){SN.U.PreviewAttach(this.files[b])}}})},maxFileSize:function(b){var a=$(b).find("input[name=MAX_FILE_SIZE]").attr("value");if(a){return parseInt(a)}else{return 0}},PreviewAttach:function(c){var d=c.type+" "+Math.round(c.size/1024)+"KB";var e=true;var g;if(typeof window.createObjectURL!="undefined"){g=function(h,i){i(window.createObjectURL(h))}}else{if(typeof window.FileReader!="undefined"){g=function(i,j){var h=new FileReader();h.onload=function(k){j(h.result)};h.readAsDataURL(i)}}else{e=false}}var a=["image/png","image/jpeg","image/gif","image/svg+xml"];if($.inArray(c.type,a)==-1){e=false}var f=8*1024*1024;if(c.size>f){e=false}if(e){g(c,function(i){var h=$("<img>").attr("title",d).attr("alt",d).attr("src",i).attr("style","height: 120px");$("#"+SN.C.S.NoticeDataAttachSelected).append(h)})}else{var b=$("<div></div>").text(d);$("#"+SN.C.S.NoticeDataAttachSelected).append(b)}},NoticeLocationAttach:function(){var c=$("#"+SN.C.S.NoticeLat).val();var h=$("#"+SN.C.S.NoticeLon).val();var d=$("#"+SN.C.S.NoticeLocationNs).val();var i=$("#"+SN.C.S.NoticeLocationId).val();var a=$("#"+SN.C.S.NoticeGeoName).text();var b=$("#"+SN.C.S.NoticeDataGeo);function e(){$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",jQuery.trim($("label[for="+SN.C.S.NoticeDataGeo+"]").text())).removeClass("checked");$("#"+SN.C.S.NoticeLat).val("");$("#"+SN.C.S.NoticeLon).val("");$("#"+SN.C.S.NoticeLocationNs).val("");$("#"+SN.C.S.NoticeLocationId).val("");$("#"+SN.C.S.NoticeDataGeo).attr("checked",false);$.cookie(SN.C.S.NoticeDataGeoCookie,"disabled",{path:"/"})}function j(k,l){$.getJSON(k,l,function(m){var n,o;if(typeof(m.location_ns)!="undefined"){$("#"+SN.C.S.NoticeLocationNs).val(m.location_ns);n=m.location_ns}if(typeof(m.location_id)!="undefined"){$("#"+SN.C.S.NoticeLocationId).val(m.location_id);o=m.location_id}if(typeof(m.name)=="undefined"){NLN_text=l.lat+";"+l.lon}else{NLN_text=m.name}$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",NoticeDataGeo_text.ShareDisable+" ("+NLN_text+")");$("#"+SN.C.S.NoticeLat).val(l.lat);$("#"+SN.C.S.NoticeLon).val(l.lon);$("#"+SN.C.S.NoticeLocationNs).val(n);$("#"+SN.C.S.NoticeLocationId).val(o);$("#"+SN.C.S.NoticeDataGeo).attr("checked",true);var p={NLat:l.lat,NLon:l.lon,NLNS:n,NLID:o,NLN:NLN_text,NLNU:m.url,NDG:true};$.cookie(SN.C.S.NoticeDataGeoCookie,JSON.stringify(p),{path:"/"})})}if(b.length>0){if($.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){b.attr("checked",false)}else{b.attr("checked",true)}var f=$("#notice_data-geo_wrap");var g=f.attr("title");f.removeAttr("title");$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",jQuery.trim($("label[for="+SN.C.S.NoticeDataGeo+"]").text()));b.change(function(){if($("#"+SN.C.S.NoticeDataGeo).attr("checked")===true||$.cookie(SN.C.S.NoticeDataGeoCookie)===null){$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",NoticeDataGeo_text.ShareDisable).addClass("checked");if($.cookie(SN.C.S.NoticeDataGeoCookie)===null||$.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){if(navigator.geolocation){navigator.geolocation.getCurrentPosition(function(m){$("#"+SN.C.S.NoticeLat).val(m.coords.latitude);$("#"+SN.C.S.NoticeLon).val(m.coords.longitude);var n={lat:m.coords.latitude,lon:m.coords.longitude,token:$("#token").val()};j(g,n)},function(m){switch(m.code){case m.PERMISSION_DENIED:e();break;case m.TIMEOUT:$("#"+SN.C.S.NoticeDataGeo).attr("checked",false);break}},{timeout:10000})}else{if(c.length>0&&h.length>0){var k={lat:c,lon:h,token:$("#token").val()};j(g,k)}else{e();$("#"+SN.C.S.NoticeDataGeo).remove();$("label[for="+SN.C.S.NoticeDataGeo+"]").remove()}}}else{var l=JSON.parse($.cookie(SN.C.S.NoticeDataGeoCookie));$("#"+SN.C.S.NoticeLat).val(l.NLat);$("#"+SN.C.S.NoticeLon).val(l.NLon);$("#"+SN.C.S.NoticeLocationNs).val(l.NLNS);$("#"+SN.C.S.NoticeLocationId).val(l.NLID);$("#"+SN.C.S.NoticeDataGeo).attr("checked",l.NDG);$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",NoticeDataGeo_text.ShareDisable+" ("+l.NLN+")").addClass("checked")}}else{e()}}).change()}},NewDirectMessage:function(){NDM=$(".entity_send-a-message a");NDM.attr({href:NDM.attr("href")+"&ajax=1"});NDM.bind("click",function(){var a=$(".entity_send-a-message form");if(a.length===0){$(this).addClass(SN.C.S.Processing);$.get(NDM.attr("href"),null,function(b){$(".entity_send-a-message").append(document._importNode($("form",b)[0],true));a=$(".entity_send-a-message .form_notice");SN.U.FormNoticeXHR(a);SN.U.FormNoticeEnhancements(a);a.append('<button class="close">&#215;</button>');$(".entity_send-a-message button").click(function(){a.hide();return false});NDM.removeClass(SN.C.S.Processing)})}else{a.show();$(".entity_send-a-message textarea").focus()}return false})},GetFullYear:function(c,d,a){var b=new Date();b.setFullYear(c,d,a);return b},StatusNetInstance:{Set:function(b){var a=SN.U.StatusNetInstance.Get();if(a!==null){b=$.extend(a,b)}$.cookie(SN.C.S.StatusNetInstance,JSON.stringify(b),{path:"/",expires:SN.U.GetFullYear(2029,0,1)})},Get:function(){var a=$.cookie(SN.C.S.StatusNetInstance);if(a!==null){return JSON.parse(a)}return null},Delete:function(){$.cookie(SN.C.S.StatusNetInstance,null)}},belongsOnTimeline:function(b){var a=$("body").attr("id");if(a=="public"){return true}var c=$("#nav_profile a").attr("href");if(c){var d=$(b).find(".entry-title .author a.url").attr("href");if(d==c){if(a=="all"||a=="showstream"){return true}}}return false}},Init:{NoticeForm:function(){if($("body.user_in").length>0){SN.U.NoticeLocationAttach();$("."+SN.C.S.FormNotice).each(function(){SN.U.FormNoticeXHR($(this));SN.U.FormNoticeEnhancements($(this))});SN.U.NoticeDataAttach()}},Notices:function(){if($("body.user_in").length>0){SN.U.NoticeFavor();SN.U.NoticeRepeat();SN.U.NoticeReply();SN.U.NoticeInlineReplySetup()}SN.U.NoticeAttachments()},EntityActions:function(){if($("body.user_in").length>0){$(".form_user_subscribe").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_user_unsubscribe").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_group_join").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_group_leave").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_user_nudge").live("click",function(){SN.U.FormXHR($(this));return false});SN.U.NewDirectMessage()}},Login:function(){if(SN.U.StatusNetInstance.Get()!==null){var a=SN.U.StatusNetInstance.Get().Nickname;if(a!==null){$("#form_login #nickname").val(a)}}$("#form_login").bind("submit",function(){SN.U.StatusNetInstance.Set({Nickname:$("#form_login #nickname").val()});return true})},UploadForms:function(){$("input[type=file]").change(function(d){if(typeof this.files=="object"&&this.files.length>0){var c=0;for(var b=0;b<this.files.length;b++){c+=this.files[b].size}var a=SN.U.maxFileSize($(this.form));if(a>0&&c>a){var e="File too large: maximum upload size is %d bytes.";alert(e.replace("%d",a));$(this).val("");d.preventDefault();return false}}})}}};$(document).ready(function(){SN.Init.UploadForms();if($("."+SN.C.S.FormNotice).length>0){SN.Init.NoticeForm()}if($("#content .notices").length>0){SN.Init.Notices()}if($("#content .entity_actions").length>0){SN.Init.EntityActions()}if($("#form_login").length>0){SN.Init.Login()}});if(!document.ELEMENT_NODE){document.ELEMENT_NODE=1;document.ATTRIBUTE_NODE=2;document.TEXT_NODE=3;document.CDATA_SECTION_NODE=4;document.ENTITY_REFERENCE_NODE=5;document.ENTITY_NODE=6;document.PROCESSING_INSTRUCTION_NODE=7;document.COMMENT_NODE=8;document.DOCUMENT_NODE=9;document.DOCUMENT_TYPE_NODE=10;document.DOCUMENT_FRAGMENT_NODE=11;document.NOTATION_NODE=12}document._importNode=function(e,a){switch(e.nodeType){case document.ELEMENT_NODE:var d=document.createElement(e.nodeName);if(e.attributes&&e.attributes.length>0){for(var c=0,b=e.attributes.length;c<b;){if(e.attributes[c].nodeName=="class"){d.className=e.getAttribute(e.attributes[c++].nodeName)}else{d.setAttribute(e.attributes[c].nodeName,e.getAttribute(e.attributes[c++].nodeName))}}}if(a&&e.childNodes&&e.childNodes.length>0){for(var c=0,b=e.childNodes.length;c<b;){d.appendChild(document._importNode(e.childNodes[c++],a))}}return d;break;case document.TEXT_NODE:case document.CDATA_SECTION_NODE:case document.COMMENT_NODE:return document.createTextNode(e.nodeValue);break}};if(typeof navigator.geolocation=="undefined"||navigator.geolocation.shim){(function(){(function(){if(window.google&&google.gears){return}var c=null;if(typeof GearsFactory!="undefined"){c=new GearsFactory()}else{try{c=new ActiveXObject("Gears.Factory");if(c.getBuildInfo().indexOf("ie_mobile")!=-1){c.privateSetGlobalObject(this)}}catch(d){if((typeof navigator.mimeTypes!="undefined")&&navigator.mimeTypes["application/x-googlegears"]){c=document.createElement("object");c.style.display="none";c.width=0;c.height=0;c.type="application/x-googlegears";document.documentElement.appendChild(c)}}}if(!c){return}if(!window.google){google={}}if(!google.gears){google.gears={factory:c}}})();var a=(function(){var d=google.gears.factory.create("beta.geolocation");var c=function(f,e){return function(g){f(g);e.lastPosition=g}};return{shim:true,type:"Gears",lastPosition:null,getCurrentPosition:function(e,g,h){var f=this;var i=c(e,f);d.getCurrentPosition(i,g,h)},watchPosition:function(e,f,g){d.watchPosition(e,f,g)},clearWatch:function(e){d.clearWatch(e)},getPermission:function(g,e,f){d.getPermission(g,e,f)}}});var b=(function(){var i=false;var e=function(){if(!d()&&!i){i=true;var j=document.createElement("script");j.src=(document.location.protocol=="https:"?"https://":"http://")+"www.google.com/jsapi?callback=_google_loader_apiLoaded";j.type="text/javascript";document.getElementsByTagName("body")[0].appendChild(j)}};var c=[];var h=function(j){c.push(j)};var f=function(){if(d()){while(c.length>0){var j=c.pop();j()}}};window._google_loader_apiLoaded=function(){f()};var d=function(){return(window.google&&google.loader)};var g=function(j){if(d()){return true}h(j);e();return false};e();return{shim:true,type:"ClientLocation",lastPosition:null,getCurrentPosition:function(k,n,o){var m=this;if(!g(function(){m.getCurrentPosition(k,n,o)})){return}if(google.loader.ClientLocation){var l=google.loader.ClientLocation;var j={coords:{latitude:l.latitude,longitude:l.longitude,altitude:null,accuracy:43000,altitudeAccuracy:null,heading:null,speed:null},address:{city:l.address.city,country:l.address.country,country_code:l.address.country_code,region:l.address.region},timestamp:new Date()};k(j);this.lastPosition=j}else{if(n==="function"){n({code:3,message:"Using the Google ClientLocation API and it is not able to calculate a location."})}}},watchPosition:function(j,l,m){this.getCurrentPosition(j,l,m);var k=this;var n=setInterval(function(){k.getCurrentPosition(j,l,m)},10000);return n},clearWatch:function(j){clearInterval(j)},getPermission:function(l,j,k){return true}}});navigator.geolocation=(window.google&&google.gears)?a():b()})()};
\ No newline at end of file
+var SN={C:{I:{CounterBlackout:false,MaxLength:140,PatternUsername:/^[0-9a-zA-Z\-_.]*$/,HTTP20x30x:[200,201,202,203,204,205,206,300,301,302,303,304,305,306,307]},S:{Disabled:"disabled",Warning:"warning",Error:"error",Success:"success",Processing:"processing",CommandResult:"command_result",FormNotice:"form_notice",NoticeDataText:"notice_data-text",NoticeTextCount:"notice_text-count",NoticeInReplyTo:"notice_in-reply-to",NoticeDataAttach:"notice_data-attach",NoticeDataAttachSelected:"notice_data-attach_selected",NoticeActionSubmit:"notice_action-submit",NoticeLat:"notice_data-lat",NoticeLon:"notice_data-lon",NoticeLocationId:"notice_data-location_id",NoticeLocationNs:"notice_data-location_ns",NoticeGeoName:"notice_data-geo_name",NoticeDataGeo:"notice_data-geo",NoticeDataGeoCookie:"NoticeDataGeo",NoticeDataGeoSelected:"notice_data-geo_selected",StatusNetInstance:"StatusNetInstance"}},messages:{},msg:function(a){if(typeof SN.messages[a]=="undefined"){return"["+a+"]"}else{return SN.messages[a]}},U:{FormNoticeEnhancements:function(b){if(jQuery.data(b[0],"ElementData")===undefined){MaxLength=b.find("#"+SN.C.S.NoticeTextCount).text();if(typeof(MaxLength)=="undefined"){MaxLength=SN.C.I.MaxLength}jQuery.data(b[0],"ElementData",{MaxLength:MaxLength});SN.U.Counter(b);NDT=b.find("#"+SN.C.S.NoticeDataText);NDT.bind("keyup",function(c){SN.U.Counter(b)});var a=function(c){window.setTimeout(function(){SN.U.Counter(b)},50)};NDT.bind("cut",a).bind("paste",a);NDT.bind("keydown",function(c){SN.U.SubmitOnReturn(c,b)})}else{b.find("#"+SN.C.S.NoticeTextCount).text(jQuery.data(b[0],"ElementData").MaxLength)}if($("body")[0].id!="conversation"&&window.location.hash.length===0&&$(window).scrollTop()==0){b.find("textarea").focus()}},SubmitOnReturn:function(b,a){if(b.keyCode==13||b.keyCode==10){a.submit();b.preventDefault();b.stopPropagation();$("#"+a[0].id+" #"+SN.C.S.NoticeDataText).blur();$("body").focus();return false}return true},Counter:function(d){SN.C.I.FormNoticeCurrent=d;var b=jQuery.data(d[0],"ElementData").MaxLength;if(b<=0){return}var c=b-SN.U.CharacterCount(d);var a=d.find("#"+SN.C.S.NoticeTextCount);if(c.toString()!=a.text()){if(!SN.C.I.CounterBlackout||c===0){if(a.text()!=String(c)){a.text(c)}if(c<0){d.addClass(SN.C.S.Warning)}else{d.removeClass(SN.C.S.Warning)}if(!SN.C.I.CounterBlackout){SN.C.I.CounterBlackout=true;SN.C.I.FormNoticeCurrent=d;window.setTimeout("SN.U.ClearCounterBlackout(SN.C.I.FormNoticeCurrent);",500)}}}},CharacterCount:function(a){return a.find("#"+SN.C.S.NoticeDataText).val().length},ClearCounterBlackout:function(a){SN.C.I.CounterBlackout=false;SN.U.Counter(a)},RewriteAjaxAction:function(a){if(document.location.protocol=="https:"&&a.substr(0,5)=="http:"){return a.replace(/^http:\/\/[^:\/]+/,"https://"+document.location.host)}else{return a}},FormXHR:function(a){$.ajax({type:"POST",dataType:"xml",url:SN.U.RewriteAjaxAction(a.attr("action")),data:a.serialize()+"&ajax=1",beforeSend:function(b){a.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(c,d,b){alert(b||d)},success:function(b,c){if(typeof($("form",b)[0])!="undefined"){form_new=document._importNode($("form",b)[0],true);a.replaceWith(form_new)}else{a.replaceWith(document._importNode($("p",b)[0],true))}}})},FormNoticeXHR:function(b){SN.C.I.NoticeDataGeo={};b.append('<input type="hidden" name="ajax" value="1"/>');b.attr("action",SN.U.RewriteAjaxAction(b.attr("action")));var c=function(d,e){b.append($('<p class="form_response"></p>').addClass(d).text(e))};var a=function(){b.find(".form_response").remove()};b.ajaxForm({dataType:"xml",timeout:"60000",beforeSend:function(d){if(b.find("#"+SN.C.S.NoticeDataText)[0].value.length===0){b.addClass(SN.C.S.Warning);return false}b.addClass(SN.C.S.Processing).find("#"+SN.C.S.NoticeActionSubmit).addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled);SN.C.I.NoticeDataGeo.NLat=$("#"+SN.C.S.NoticeLat).val();SN.C.I.NoticeDataGeo.NLon=$("#"+SN.C.S.NoticeLon).val();SN.C.I.NoticeDataGeo.NLNS=$("#"+SN.C.S.NoticeLocationNs).val();SN.C.I.NoticeDataGeo.NLID=$("#"+SN.C.S.NoticeLocationId).val();SN.C.I.NoticeDataGeo.NDG=$("#"+SN.C.S.NoticeDataGeo).attr("checked");cookieValue=$.cookie(SN.C.S.NoticeDataGeoCookie);if(cookieValue!==null&&cookieValue!="disabled"){cookieValue=JSON.parse(cookieValue);SN.C.I.NoticeDataGeo.NLat=$("#"+SN.C.S.NoticeLat).val(cookieValue.NLat).val();SN.C.I.NoticeDataGeo.NLon=$("#"+SN.C.S.NoticeLon).val(cookieValue.NLon).val();if($("#"+SN.C.S.NoticeLocationNs).val(cookieValue.NLNS)){SN.C.I.NoticeDataGeo.NLNS=$("#"+SN.C.S.NoticeLocationNs).val(cookieValue.NLNS).val();SN.C.I.NoticeDataGeo.NLID=$("#"+SN.C.S.NoticeLocationId).val(cookieValue.NLID).val()}}if(cookieValue=="disabled"){SN.C.I.NoticeDataGeo.NDG=$("#"+SN.C.S.NoticeDataGeo).attr("checked",false).attr("checked")}else{SN.C.I.NoticeDataGeo.NDG=$("#"+SN.C.S.NoticeDataGeo).attr("checked",true).attr("checked")}return true},error:function(f,g,e){b.removeClass(SN.C.S.Processing).find("#"+SN.C.S.NoticeActionSubmit).removeClass(SN.C.S.Disabled).removeAttr(SN.C.S.Disabled,SN.C.S.Disabled);a();if(g=="timeout"){c("error","Sorry! We had trouble sending your notice. The servers are overloaded. Please try again, and contact the site administrator if this problem persists.")}else{var d=SN.U.GetResponseXML(f);if($("."+SN.C.S.Error,d).length>0){b.append(document._importNode($("."+SN.C.S.Error,d)[0],true))}else{if(parseInt(f.status)===0||jQuery.inArray(parseInt(f.status),SN.C.I.HTTP20x30x)>=0){b.resetForm().find("#"+SN.C.S.NoticeDataAttachSelected).remove();SN.U.FormNoticeEnhancements(b)}else{c("error","(Sorry! We had trouble sending your notice ("+f.status+" "+f.statusText+"). Please report the problem to the site administrator if this happens again.")}}}},success:function(i,k){a();var e=$("#"+SN.C.S.Error,i);if(e.length>0){c("error",e.text())}else{if($("body")[0].id=="bookmarklet"){self.close()}var d=$("#"+SN.C.S.CommandResult,i);if(d.length>0){c("success",d.text())}else{var h=document._importNode($("li",i)[0],true);var j=$("#notices_primary .notices");if(j.length>0&&SN.U.belongsOnTimeline(h)){if($("#"+h.id).length===0){var f=$("#"+SN.C.S.NoticeInReplyTo).val();var g="#notices_primary #notice-"+f;if($("body")[0].id=="conversation"){if(f.length>0&&$(g+" .notices").length<1){$(g).append('<ul class="notices"></ul>')}$($(g+" .notices")[0]).append(h)}else{j.prepend(h)}$("#"+h.id).css({display:"none"}).fadeIn(2500);SN.U.NoticeWithAttachment($("#"+h.id));SN.U.NoticeReplyTo($("#"+h.id))}}else{c("success",$("title",i).text())}}b.resetForm();b.find("#"+SN.C.S.NoticeInReplyTo).val("");b.find("#"+SN.C.S.NoticeDataAttachSelected).remove();SN.U.FormNoticeEnhancements(b)}},complete:function(d,e){b.removeClass(SN.C.S.Processing).find("#"+SN.C.S.NoticeActionSubmit).removeAttr(SN.C.S.Disabled).removeClass(SN.C.S.Disabled);$("#"+SN.C.S.NoticeLat).val(SN.C.I.NoticeDataGeo.NLat);$("#"+SN.C.S.NoticeLon).val(SN.C.I.NoticeDataGeo.NLon);if($("#"+SN.C.S.NoticeLocationNs)){$("#"+SN.C.S.NoticeLocationNs).val(SN.C.I.NoticeDataGeo.NLNS);$("#"+SN.C.S.NoticeLocationId).val(SN.C.I.NoticeDataGeo.NLID)}$("#"+SN.C.S.NoticeDataGeo).attr("checked",SN.C.I.NoticeDataGeo.NDG)}})},GetResponseXML:function(b){try{return b.responseXML}catch(a){return(new DOMParser()).parseFromString(b.responseText,"text/xml")}},NoticeReply:function(){if($("#"+SN.C.S.NoticeDataText).length>0&&$("#content .notice_reply").length>0){$("#content .notice").each(function(){SN.U.NoticeReplyTo($(this))})}},NoticeReplyTo:function(a){a.find(".notice_reply").live("click",function(c){c.preventDefault();var b=($(".author .nickname",a).length>0)?$($(".author .nickname",a)[0]):$(".author .nickname.uid");SN.U.NoticeInlineReplyTrigger(a,"@"+b.text());return false})},NoticeInlineReplyTrigger:function(h,i){var c=$($(".notice_id",h)[0]).text();var d=h;var f=h.closest(".notices");if(f.hasClass("threaded-notices")){d=f.closest(".notice")}else{f=$("ul.threaded-notices",h);if(f.length==0){f=$('<ul class="notices threaded-notices xoxo"></ul>');h.append(f)}}var k=$(".notice-reply-form",f);if(k.length==0){$("li.notice-reply-placeholder").remove();var g=$("li.notice-reply",f);if(g.length==0){g=$('<li class="notice-reply"><form class="notice-reply-form" method="post"><textarea name="status_textarea"></textarea><div class="controls"><input type="hidden" name="token"><input type="hidden" name="inreplyto"><input type="submit" class="submit"></div></form></li>');var b=$("#form_notice");k=g.find("form");k.attr("action",b.attr("action"));k.find('input[name="token"]').val(b.find("input[name=token]").val());k.find('input[type="submit"]').val(SN.msg("reply_submit"));f.append(g);k.find("textarea").blur(function(){var m=$(this);var l=$.trim(m.val());if(l==""||l==m.data("initialText")){g.remove();SN.U.NoticeInlineReplyPlaceholder(d)}});k.submit(function(m){var l=k;$.ajax({type:"POST",dataType:"xml",url:SN.U.RewriteAjaxAction(l.attr("action")),data:l.serialize()+"&ajax=1",beforeSend:function(n){l.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled).end().find("textarea").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(o,p,n){alert(n||p)},success:function(p,q){var o=$("li",p)[0];if(o){var n=document._importNode(o,true);g.replaceWith(n);SN.U.NoticeInlineReplyPlaceholder(d)}}});m.preventDefault();return false})}}k.find("input[name=inreplyto]").val(c);var j=k.find("textarea");if(j.length==0){throw"No textarea"}var a="";if(i){a=i+" "}j.val(a+j.val().replace(RegExp(a,"i"),""));j.data("initialText",$.trim(i+""));j.focus();if(j[0].setSelectionRange){var e=j.val().length;j[0].setSelectionRange(e,e)}},NoticeReplySet:function(b,d){if(b.match(SN.C.I.PatternUsername)){var c=$("#"+SN.C.S.NoticeDataText);if(c.length>0){replyto="@"+b+" ";c.val(replyto+c.val().replace(RegExp(replyto,"i"),""));$("#"+SN.C.S.FormNotice+" #"+SN.C.S.NoticeInReplyTo).val(d);c[0].focus();if(c[0].setSelectionRange){var a=c.val().length;c[0].setSelectionRange(a,a)}}}},NoticeFavor:function(){$(".form_favor").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_disfavor").live("click",function(){SN.U.FormXHR($(this));return false})},NoticeInlineReplyPlaceholder:function(b){var a=b.find("ul.threaded-notices");var c=$('<li class="notice-reply-placeholder"><input class="placeholder"></li>');c.click(function(){SN.U.NoticeInlineReplyTrigger(b)});c.find("input").val(SN.msg("reply_comment"));a.append(c)},NoticeInlineReplySetup:function(){$(".threaded-notices").each(function(){var b=$(this);var a=b.closest(".notice");SN.U.NoticeInlineReplyPlaceholder(a)})},NoticeRepeat:function(){$(".form_repeat").live("click",function(a){a.preventDefault();SN.U.NoticeRepeatConfirmation($(this));return false})},NoticeRepeatConfirmation:function(a){var c=a.find(".submit");var b=c.clone();b.addClass("submit_dialogbox").removeClass("submit");a.append(b);b.bind("click",function(){SN.U.FormXHR(a);return false});c.hide();a.addClass("dialogbox").append('<button class="close">&#215;</button>').closest(".notice-options").addClass("opaque");a.find("button.close").click(function(){$(this).remove();a.removeClass("dialogbox").closest(".notice-options").removeClass("opaque");a.find(".submit_dialogbox").remove();a.find(".submit").show();return false})},NoticeAttachments:function(){$(".notice a.attachment").each(function(){SN.U.NoticeWithAttachment($(this).closest(".notice"))})},NoticeWithAttachment:function(b){if(b.find(".attachment").length===0){return}var a=b.find(".attachment.more");if(a.length>0){$(a[0]).click(function(){var c=$(this);c.addClass(SN.C.S.Processing);$.get(c.attr("href")+"/ajax",null,function(d){c.parent(".entry-content").html($(d).find("#attachment_view .entry-content").html())});return false}).attr("title",SN.msg("showmore_tooltip"))}},NoticeDataAttach:function(){NDA=$("#"+SN.C.S.NoticeDataAttach);NDA.change(function(c){var a=$(this).val();if(!a){$("#"+SN.C.S.NoticeDataAttachSelected).remove();return false}S='<div id="'+SN.C.S.NoticeDataAttachSelected+'" class="'+SN.C.S.Success+'"><code>'+a+'</code> <button class="close">&#215;</button></div>';NDAS=$("#"+SN.C.S.NoticeDataAttachSelected);if(NDAS.length>0){NDAS.replaceWith(S)}else{$("#"+SN.C.S.FormNotice).append(S)}$("#"+SN.C.S.NoticeDataAttachSelected+" button").click(function(){$("#"+SN.C.S.NoticeDataAttachSelected).remove();NDA.val("");return false});if(typeof this.files=="object"){for(var b=0;b<this.files.length;b++){SN.U.PreviewAttach(this.files[b])}}})},maxFileSize:function(b){var a=$(b).find("input[name=MAX_FILE_SIZE]").attr("value");if(a){return parseInt(a)}else{return 0}},PreviewAttach:function(c){var d=c.type+" "+Math.round(c.size/1024)+"KB";var e=true;var g;if(typeof window.createObjectURL!="undefined"){g=function(h,i){i(window.createObjectURL(h))}}else{if(typeof window.FileReader!="undefined"){g=function(i,j){var h=new FileReader();h.onload=function(k){j(h.result)};h.readAsDataURL(i)}}else{e=false}}var a=["image/png","image/jpeg","image/gif","image/svg+xml"];if($.inArray(c.type,a)==-1){e=false}var f=8*1024*1024;if(c.size>f){e=false}if(e){g(c,function(i){var h=$("<img>").attr("title",d).attr("alt",d).attr("src",i).attr("style","height: 120px");$("#"+SN.C.S.NoticeDataAttachSelected).append(h)})}else{var b=$("<div></div>").text(d);$("#"+SN.C.S.NoticeDataAttachSelected).append(b)}},NoticeLocationAttach:function(){var c=$("#"+SN.C.S.NoticeLat).val();var h=$("#"+SN.C.S.NoticeLon).val();var d=$("#"+SN.C.S.NoticeLocationNs).val();var i=$("#"+SN.C.S.NoticeLocationId).val();var a=$("#"+SN.C.S.NoticeGeoName).text();var b=$("#"+SN.C.S.NoticeDataGeo);function e(){$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",jQuery.trim($("label[for="+SN.C.S.NoticeDataGeo+"]").text())).removeClass("checked");$("#"+SN.C.S.NoticeLat).val("");$("#"+SN.C.S.NoticeLon).val("");$("#"+SN.C.S.NoticeLocationNs).val("");$("#"+SN.C.S.NoticeLocationId).val("");$("#"+SN.C.S.NoticeDataGeo).attr("checked",false);$.cookie(SN.C.S.NoticeDataGeoCookie,"disabled",{path:"/"})}function j(k,l){$.getJSON(k,l,function(m){var n,o;if(typeof(m.location_ns)!="undefined"){$("#"+SN.C.S.NoticeLocationNs).val(m.location_ns);n=m.location_ns}if(typeof(m.location_id)!="undefined"){$("#"+SN.C.S.NoticeLocationId).val(m.location_id);o=m.location_id}if(typeof(m.name)=="undefined"){NLN_text=l.lat+";"+l.lon}else{NLN_text=m.name}$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",NoticeDataGeo_text.ShareDisable+" ("+NLN_text+")");$("#"+SN.C.S.NoticeLat).val(l.lat);$("#"+SN.C.S.NoticeLon).val(l.lon);$("#"+SN.C.S.NoticeLocationNs).val(n);$("#"+SN.C.S.NoticeLocationId).val(o);$("#"+SN.C.S.NoticeDataGeo).attr("checked",true);var p={NLat:l.lat,NLon:l.lon,NLNS:n,NLID:o,NLN:NLN_text,NLNU:m.url,NDG:true};$.cookie(SN.C.S.NoticeDataGeoCookie,JSON.stringify(p),{path:"/"})})}if(b.length>0){if($.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){b.attr("checked",false)}else{b.attr("checked",true)}var f=$("#notice_data-geo_wrap");var g=f.attr("title");f.removeAttr("title");$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",jQuery.trim($("label[for="+SN.C.S.NoticeDataGeo+"]").text()));b.change(function(){if($("#"+SN.C.S.NoticeDataGeo).attr("checked")===true||$.cookie(SN.C.S.NoticeDataGeoCookie)===null){$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",NoticeDataGeo_text.ShareDisable).addClass("checked");if($.cookie(SN.C.S.NoticeDataGeoCookie)===null||$.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){if(navigator.geolocation){navigator.geolocation.getCurrentPosition(function(m){$("#"+SN.C.S.NoticeLat).val(m.coords.latitude);$("#"+SN.C.S.NoticeLon).val(m.coords.longitude);var n={lat:m.coords.latitude,lon:m.coords.longitude,token:$("#token").val()};j(g,n)},function(m){switch(m.code){case m.PERMISSION_DENIED:e();break;case m.TIMEOUT:$("#"+SN.C.S.NoticeDataGeo).attr("checked",false);break}},{timeout:10000})}else{if(c.length>0&&h.length>0){var k={lat:c,lon:h,token:$("#token").val()};j(g,k)}else{e();$("#"+SN.C.S.NoticeDataGeo).remove();$("label[for="+SN.C.S.NoticeDataGeo+"]").remove()}}}else{var l=JSON.parse($.cookie(SN.C.S.NoticeDataGeoCookie));$("#"+SN.C.S.NoticeLat).val(l.NLat);$("#"+SN.C.S.NoticeLon).val(l.NLon);$("#"+SN.C.S.NoticeLocationNs).val(l.NLNS);$("#"+SN.C.S.NoticeLocationId).val(l.NLID);$("#"+SN.C.S.NoticeDataGeo).attr("checked",l.NDG);$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",NoticeDataGeo_text.ShareDisable+" ("+l.NLN+")").addClass("checked")}}else{e()}}).change()}},NewDirectMessage:function(){NDM=$(".entity_send-a-message a");NDM.attr({href:NDM.attr("href")+"&ajax=1"});NDM.bind("click",function(){var a=$(".entity_send-a-message form");if(a.length===0){$(this).addClass(SN.C.S.Processing);$.get(NDM.attr("href"),null,function(b){$(".entity_send-a-message").append(document._importNode($("form",b)[0],true));a=$(".entity_send-a-message .form_notice");SN.U.FormNoticeXHR(a);SN.U.FormNoticeEnhancements(a);a.append('<button class="close">&#215;</button>');$(".entity_send-a-message button").click(function(){a.hide();return false});NDM.removeClass(SN.C.S.Processing)})}else{a.show();$(".entity_send-a-message textarea").focus()}return false})},GetFullYear:function(c,d,a){var b=new Date();b.setFullYear(c,d,a);return b},StatusNetInstance:{Set:function(b){var a=SN.U.StatusNetInstance.Get();if(a!==null){b=$.extend(a,b)}$.cookie(SN.C.S.StatusNetInstance,JSON.stringify(b),{path:"/",expires:SN.U.GetFullYear(2029,0,1)})},Get:function(){var a=$.cookie(SN.C.S.StatusNetInstance);if(a!==null){return JSON.parse(a)}return null},Delete:function(){$.cookie(SN.C.S.StatusNetInstance,null)}},belongsOnTimeline:function(b){var a=$("body").attr("id");if(a=="public"){return true}var c=$("#nav_profile a").attr("href");if(c){var d=$(b).find(".entry-title .author a.url").attr("href");if(d==c){if(a=="all"||a=="showstream"){return true}}}return false}},Init:{NoticeForm:function(){if($("body.user_in").length>0){SN.U.NoticeLocationAttach();$("."+SN.C.S.FormNotice).each(function(){SN.U.FormNoticeXHR($(this));SN.U.FormNoticeEnhancements($(this))});SN.U.NoticeDataAttach()}},Notices:function(){if($("body.user_in").length>0){SN.U.NoticeFavor();SN.U.NoticeRepeat();SN.U.NoticeReply();SN.U.NoticeInlineReplySetup()}SN.U.NoticeAttachments()},EntityActions:function(){if($("body.user_in").length>0){$(".form_user_subscribe").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_user_unsubscribe").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_group_join").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_group_leave").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_user_nudge").live("click",function(){SN.U.FormXHR($(this));return false});SN.U.NewDirectMessage()}},Login:function(){if(SN.U.StatusNetInstance.Get()!==null){var a=SN.U.StatusNetInstance.Get().Nickname;if(a!==null){$("#form_login #nickname").val(a)}}$("#form_login").bind("submit",function(){SN.U.StatusNetInstance.Set({Nickname:$("#form_login #nickname").val()});return true})},UploadForms:function(){$("input[type=file]").change(function(d){if(typeof this.files=="object"&&this.files.length>0){var c=0;for(var b=0;b<this.files.length;b++){c+=this.files[b].size}var a=SN.U.maxFileSize($(this.form));if(a>0&&c>a){var e="File too large: maximum upload size is %d bytes.";alert(e.replace("%d",a));$(this).val("");d.preventDefault();return false}}})}}};$(document).ready(function(){SN.Init.UploadForms();if($("."+SN.C.S.FormNotice).length>0){SN.Init.NoticeForm()}if($("#content .notices").length>0){SN.Init.Notices()}if($("#content .entity_actions").length>0){SN.Init.EntityActions()}if($("#form_login").length>0){SN.Init.Login()}});if(!document.ELEMENT_NODE){document.ELEMENT_NODE=1;document.ATTRIBUTE_NODE=2;document.TEXT_NODE=3;document.CDATA_SECTION_NODE=4;document.ENTITY_REFERENCE_NODE=5;document.ENTITY_NODE=6;document.PROCESSING_INSTRUCTION_NODE=7;document.COMMENT_NODE=8;document.DOCUMENT_NODE=9;document.DOCUMENT_TYPE_NODE=10;document.DOCUMENT_FRAGMENT_NODE=11;document.NOTATION_NODE=12}document._importNode=function(e,a){switch(e.nodeType){case document.ELEMENT_NODE:var d=document.createElement(e.nodeName);if(e.attributes&&e.attributes.length>0){for(var c=0,b=e.attributes.length;c<b;){if(e.attributes[c].nodeName=="class"){d.className=e.getAttribute(e.attributes[c++].nodeName)}else{d.setAttribute(e.attributes[c].nodeName,e.getAttribute(e.attributes[c++].nodeName))}}}if(a&&e.childNodes&&e.childNodes.length>0){for(var c=0,b=e.childNodes.length;c<b;){d.appendChild(document._importNode(e.childNodes[c++],a))}}return d;break;case document.TEXT_NODE:case document.CDATA_SECTION_NODE:case document.COMMENT_NODE:return document.createTextNode(e.nodeValue);break}};if(typeof navigator.geolocation=="undefined"||navigator.geolocation.shim){(function(){(function(){if(window.google&&google.gears){return}var c=null;if(typeof GearsFactory!="undefined"){c=new GearsFactory()}else{try{c=new ActiveXObject("Gears.Factory");if(c.getBuildInfo().indexOf("ie_mobile")!=-1){c.privateSetGlobalObject(this)}}catch(d){if((typeof navigator.mimeTypes!="undefined")&&navigator.mimeTypes["application/x-googlegears"]){c=document.createElement("object");c.style.display="none";c.width=0;c.height=0;c.type="application/x-googlegears";document.documentElement.appendChild(c)}}}if(!c){return}if(!window.google){google={}}if(!google.gears){google.gears={factory:c}}})();var a=(function(){var d=google.gears.factory.create("beta.geolocation");var c=function(f,e){return function(g){f(g);e.lastPosition=g}};return{shim:true,type:"Gears",lastPosition:null,getCurrentPosition:function(e,g,h){var f=this;var i=c(e,f);d.getCurrentPosition(i,g,h)},watchPosition:function(e,f,g){d.watchPosition(e,f,g)},clearWatch:function(e){d.clearWatch(e)},getPermission:function(g,e,f){d.getPermission(g,e,f)}}});var b=(function(){var i=false;var e=function(){if(!d()&&!i){i=true;var j=document.createElement("script");j.src=(document.location.protocol=="https:"?"https://":"http://")+"www.google.com/jsapi?callback=_google_loader_apiLoaded";j.type="text/javascript";document.getElementsByTagName("body")[0].appendChild(j)}};var c=[];var h=function(j){c.push(j)};var f=function(){if(d()){while(c.length>0){var j=c.pop();j()}}};window._google_loader_apiLoaded=function(){f()};var d=function(){return(window.google&&google.loader)};var g=function(j){if(d()){return true}h(j);e();return false};e();return{shim:true,type:"ClientLocation",lastPosition:null,getCurrentPosition:function(k,n,o){var m=this;if(!g(function(){m.getCurrentPosition(k,n,o)})){return}if(google.loader.ClientLocation){var l=google.loader.ClientLocation;var j={coords:{latitude:l.latitude,longitude:l.longitude,altitude:null,accuracy:43000,altitudeAccuracy:null,heading:null,speed:null},address:{city:l.address.city,country:l.address.country,country_code:l.address.country_code,region:l.address.region},timestamp:new Date()};k(j);this.lastPosition=j}else{if(n==="function"){n({code:3,message:"Using the Google ClientLocation API and it is not able to calculate a location."})}}},watchPosition:function(j,l,m){this.getCurrentPosition(j,l,m);var k=this;var n=setInterval(function(){k.getCurrentPosition(j,l,m)},10000);return n},clearWatch:function(j){clearInterval(j)},getPermission:function(l,j,k){return true}}});navigator.geolocation=(window.google&&google.gears)?a():b()})()};
\ No newline at end of file

From db4ab2cd92974092e77cea8dcfa477a9e6399e67 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Tue, 1 Mar 2011 14:26:11 -0800
Subject: [PATCH 357/655] When canceling out of inline reply field and there
 are no other replies, drop the section

---
 js/util.js     | 6 +++++-
 js/util.min.js | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/js/util.js b/js/util.js
index b2e28f2753..b78d5deca7 100644
--- a/js/util.js
+++ b/js/util.js
@@ -622,7 +622,11 @@ var SN = { // StatusNet
                         if (txt == '' || txt == textarea.data('initialText')) {
                             // Nothing to say? Begone!
                             replyItem.remove();
-                            SN.U.NoticeInlineReplyPlaceholder(parentNotice);
+                            if (list.find('li').length > 0) {
+                                SN.U.NoticeInlineReplyPlaceholder(parentNotice);
+                            } else {
+                                list.remove();
+                            }
                         }
                     });
                     replyForm.submit(function(event) {
diff --git a/js/util.min.js b/js/util.min.js
index e2966321c0..0ba253e6db 100644
--- a/js/util.min.js
+++ b/js/util.min.js
@@ -1 +1 @@
-var SN={C:{I:{CounterBlackout:false,MaxLength:140,PatternUsername:/^[0-9a-zA-Z\-_.]*$/,HTTP20x30x:[200,201,202,203,204,205,206,300,301,302,303,304,305,306,307]},S:{Disabled:"disabled",Warning:"warning",Error:"error",Success:"success",Processing:"processing",CommandResult:"command_result",FormNotice:"form_notice",NoticeDataText:"notice_data-text",NoticeTextCount:"notice_text-count",NoticeInReplyTo:"notice_in-reply-to",NoticeDataAttach:"notice_data-attach",NoticeDataAttachSelected:"notice_data-attach_selected",NoticeActionSubmit:"notice_action-submit",NoticeLat:"notice_data-lat",NoticeLon:"notice_data-lon",NoticeLocationId:"notice_data-location_id",NoticeLocationNs:"notice_data-location_ns",NoticeGeoName:"notice_data-geo_name",NoticeDataGeo:"notice_data-geo",NoticeDataGeoCookie:"NoticeDataGeo",NoticeDataGeoSelected:"notice_data-geo_selected",StatusNetInstance:"StatusNetInstance"}},messages:{},msg:function(a){if(typeof SN.messages[a]=="undefined"){return"["+a+"]"}else{return SN.messages[a]}},U:{FormNoticeEnhancements:function(b){if(jQuery.data(b[0],"ElementData")===undefined){MaxLength=b.find("#"+SN.C.S.NoticeTextCount).text();if(typeof(MaxLength)=="undefined"){MaxLength=SN.C.I.MaxLength}jQuery.data(b[0],"ElementData",{MaxLength:MaxLength});SN.U.Counter(b);NDT=b.find("#"+SN.C.S.NoticeDataText);NDT.bind("keyup",function(c){SN.U.Counter(b)});var a=function(c){window.setTimeout(function(){SN.U.Counter(b)},50)};NDT.bind("cut",a).bind("paste",a);NDT.bind("keydown",function(c){SN.U.SubmitOnReturn(c,b)})}else{b.find("#"+SN.C.S.NoticeTextCount).text(jQuery.data(b[0],"ElementData").MaxLength)}if($("body")[0].id!="conversation"&&window.location.hash.length===0&&$(window).scrollTop()==0){b.find("textarea").focus()}},SubmitOnReturn:function(b,a){if(b.keyCode==13||b.keyCode==10){a.submit();b.preventDefault();b.stopPropagation();$("#"+a[0].id+" #"+SN.C.S.NoticeDataText).blur();$("body").focus();return false}return true},Counter:function(d){SN.C.I.FormNoticeCurrent=d;var b=jQuery.data(d[0],"ElementData").MaxLength;if(b<=0){return}var c=b-SN.U.CharacterCount(d);var a=d.find("#"+SN.C.S.NoticeTextCount);if(c.toString()!=a.text()){if(!SN.C.I.CounterBlackout||c===0){if(a.text()!=String(c)){a.text(c)}if(c<0){d.addClass(SN.C.S.Warning)}else{d.removeClass(SN.C.S.Warning)}if(!SN.C.I.CounterBlackout){SN.C.I.CounterBlackout=true;SN.C.I.FormNoticeCurrent=d;window.setTimeout("SN.U.ClearCounterBlackout(SN.C.I.FormNoticeCurrent);",500)}}}},CharacterCount:function(a){return a.find("#"+SN.C.S.NoticeDataText).val().length},ClearCounterBlackout:function(a){SN.C.I.CounterBlackout=false;SN.U.Counter(a)},RewriteAjaxAction:function(a){if(document.location.protocol=="https:"&&a.substr(0,5)=="http:"){return a.replace(/^http:\/\/[^:\/]+/,"https://"+document.location.host)}else{return a}},FormXHR:function(a){$.ajax({type:"POST",dataType:"xml",url:SN.U.RewriteAjaxAction(a.attr("action")),data:a.serialize()+"&ajax=1",beforeSend:function(b){a.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(c,d,b){alert(b||d)},success:function(b,c){if(typeof($("form",b)[0])!="undefined"){form_new=document._importNode($("form",b)[0],true);a.replaceWith(form_new)}else{a.replaceWith(document._importNode($("p",b)[0],true))}}})},FormNoticeXHR:function(b){SN.C.I.NoticeDataGeo={};b.append('<input type="hidden" name="ajax" value="1"/>');b.attr("action",SN.U.RewriteAjaxAction(b.attr("action")));var c=function(d,e){b.append($('<p class="form_response"></p>').addClass(d).text(e))};var a=function(){b.find(".form_response").remove()};b.ajaxForm({dataType:"xml",timeout:"60000",beforeSend:function(d){if(b.find("#"+SN.C.S.NoticeDataText)[0].value.length===0){b.addClass(SN.C.S.Warning);return false}b.addClass(SN.C.S.Processing).find("#"+SN.C.S.NoticeActionSubmit).addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled);SN.C.I.NoticeDataGeo.NLat=$("#"+SN.C.S.NoticeLat).val();SN.C.I.NoticeDataGeo.NLon=$("#"+SN.C.S.NoticeLon).val();SN.C.I.NoticeDataGeo.NLNS=$("#"+SN.C.S.NoticeLocationNs).val();SN.C.I.NoticeDataGeo.NLID=$("#"+SN.C.S.NoticeLocationId).val();SN.C.I.NoticeDataGeo.NDG=$("#"+SN.C.S.NoticeDataGeo).attr("checked");cookieValue=$.cookie(SN.C.S.NoticeDataGeoCookie);if(cookieValue!==null&&cookieValue!="disabled"){cookieValue=JSON.parse(cookieValue);SN.C.I.NoticeDataGeo.NLat=$("#"+SN.C.S.NoticeLat).val(cookieValue.NLat).val();SN.C.I.NoticeDataGeo.NLon=$("#"+SN.C.S.NoticeLon).val(cookieValue.NLon).val();if($("#"+SN.C.S.NoticeLocationNs).val(cookieValue.NLNS)){SN.C.I.NoticeDataGeo.NLNS=$("#"+SN.C.S.NoticeLocationNs).val(cookieValue.NLNS).val();SN.C.I.NoticeDataGeo.NLID=$("#"+SN.C.S.NoticeLocationId).val(cookieValue.NLID).val()}}if(cookieValue=="disabled"){SN.C.I.NoticeDataGeo.NDG=$("#"+SN.C.S.NoticeDataGeo).attr("checked",false).attr("checked")}else{SN.C.I.NoticeDataGeo.NDG=$("#"+SN.C.S.NoticeDataGeo).attr("checked",true).attr("checked")}return true},error:function(f,g,e){b.removeClass(SN.C.S.Processing).find("#"+SN.C.S.NoticeActionSubmit).removeClass(SN.C.S.Disabled).removeAttr(SN.C.S.Disabled,SN.C.S.Disabled);a();if(g=="timeout"){c("error","Sorry! We had trouble sending your notice. The servers are overloaded. Please try again, and contact the site administrator if this problem persists.")}else{var d=SN.U.GetResponseXML(f);if($("."+SN.C.S.Error,d).length>0){b.append(document._importNode($("."+SN.C.S.Error,d)[0],true))}else{if(parseInt(f.status)===0||jQuery.inArray(parseInt(f.status),SN.C.I.HTTP20x30x)>=0){b.resetForm().find("#"+SN.C.S.NoticeDataAttachSelected).remove();SN.U.FormNoticeEnhancements(b)}else{c("error","(Sorry! We had trouble sending your notice ("+f.status+" "+f.statusText+"). Please report the problem to the site administrator if this happens again.")}}}},success:function(i,k){a();var e=$("#"+SN.C.S.Error,i);if(e.length>0){c("error",e.text())}else{if($("body")[0].id=="bookmarklet"){self.close()}var d=$("#"+SN.C.S.CommandResult,i);if(d.length>0){c("success",d.text())}else{var h=document._importNode($("li",i)[0],true);var j=$("#notices_primary .notices");if(j.length>0&&SN.U.belongsOnTimeline(h)){if($("#"+h.id).length===0){var f=$("#"+SN.C.S.NoticeInReplyTo).val();var g="#notices_primary #notice-"+f;if($("body")[0].id=="conversation"){if(f.length>0&&$(g+" .notices").length<1){$(g).append('<ul class="notices"></ul>')}$($(g+" .notices")[0]).append(h)}else{j.prepend(h)}$("#"+h.id).css({display:"none"}).fadeIn(2500);SN.U.NoticeWithAttachment($("#"+h.id));SN.U.NoticeReplyTo($("#"+h.id))}}else{c("success",$("title",i).text())}}b.resetForm();b.find("#"+SN.C.S.NoticeInReplyTo).val("");b.find("#"+SN.C.S.NoticeDataAttachSelected).remove();SN.U.FormNoticeEnhancements(b)}},complete:function(d,e){b.removeClass(SN.C.S.Processing).find("#"+SN.C.S.NoticeActionSubmit).removeAttr(SN.C.S.Disabled).removeClass(SN.C.S.Disabled);$("#"+SN.C.S.NoticeLat).val(SN.C.I.NoticeDataGeo.NLat);$("#"+SN.C.S.NoticeLon).val(SN.C.I.NoticeDataGeo.NLon);if($("#"+SN.C.S.NoticeLocationNs)){$("#"+SN.C.S.NoticeLocationNs).val(SN.C.I.NoticeDataGeo.NLNS);$("#"+SN.C.S.NoticeLocationId).val(SN.C.I.NoticeDataGeo.NLID)}$("#"+SN.C.S.NoticeDataGeo).attr("checked",SN.C.I.NoticeDataGeo.NDG)}})},GetResponseXML:function(b){try{return b.responseXML}catch(a){return(new DOMParser()).parseFromString(b.responseText,"text/xml")}},NoticeReply:function(){if($("#"+SN.C.S.NoticeDataText).length>0&&$("#content .notice_reply").length>0){$("#content .notice").each(function(){SN.U.NoticeReplyTo($(this))})}},NoticeReplyTo:function(a){a.find(".notice_reply").live("click",function(c){c.preventDefault();var b=($(".author .nickname",a).length>0)?$($(".author .nickname",a)[0]):$(".author .nickname.uid");SN.U.NoticeInlineReplyTrigger(a,"@"+b.text());return false})},NoticeInlineReplyTrigger:function(h,i){var c=$($(".notice_id",h)[0]).text();var d=h;var f=h.closest(".notices");if(f.hasClass("threaded-notices")){d=f.closest(".notice")}else{f=$("ul.threaded-notices",h);if(f.length==0){f=$('<ul class="notices threaded-notices xoxo"></ul>');h.append(f)}}var k=$(".notice-reply-form",f);if(k.length==0){$("li.notice-reply-placeholder").remove();var g=$("li.notice-reply",f);if(g.length==0){g=$('<li class="notice-reply"><form class="notice-reply-form" method="post"><textarea name="status_textarea"></textarea><div class="controls"><input type="hidden" name="token"><input type="hidden" name="inreplyto"><input type="submit" class="submit"></div></form></li>');var b=$("#form_notice");k=g.find("form");k.attr("action",b.attr("action"));k.find('input[name="token"]').val(b.find("input[name=token]").val());k.find('input[type="submit"]').val(SN.msg("reply_submit"));f.append(g);k.find("textarea").blur(function(){var m=$(this);var l=$.trim(m.val());if(l==""||l==m.data("initialText")){g.remove();SN.U.NoticeInlineReplyPlaceholder(d)}});k.submit(function(m){var l=k;$.ajax({type:"POST",dataType:"xml",url:SN.U.RewriteAjaxAction(l.attr("action")),data:l.serialize()+"&ajax=1",beforeSend:function(n){l.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled).end().find("textarea").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(o,p,n){alert(n||p)},success:function(p,q){var o=$("li",p)[0];if(o){var n=document._importNode(o,true);g.replaceWith(n);SN.U.NoticeInlineReplyPlaceholder(d)}}});m.preventDefault();return false})}}k.find("input[name=inreplyto]").val(c);var j=k.find("textarea");if(j.length==0){throw"No textarea"}var a="";if(i){a=i+" "}j.val(a+j.val().replace(RegExp(a,"i"),""));j.data("initialText",$.trim(i+""));j.focus();if(j[0].setSelectionRange){var e=j.val().length;j[0].setSelectionRange(e,e)}},NoticeReplySet:function(b,d){if(b.match(SN.C.I.PatternUsername)){var c=$("#"+SN.C.S.NoticeDataText);if(c.length>0){replyto="@"+b+" ";c.val(replyto+c.val().replace(RegExp(replyto,"i"),""));$("#"+SN.C.S.FormNotice+" #"+SN.C.S.NoticeInReplyTo).val(d);c[0].focus();if(c[0].setSelectionRange){var a=c.val().length;c[0].setSelectionRange(a,a)}}}},NoticeFavor:function(){$(".form_favor").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_disfavor").live("click",function(){SN.U.FormXHR($(this));return false})},NoticeInlineReplyPlaceholder:function(b){var a=b.find("ul.threaded-notices");var c=$('<li class="notice-reply-placeholder"><input class="placeholder"></li>');c.click(function(){SN.U.NoticeInlineReplyTrigger(b)});c.find("input").val(SN.msg("reply_comment"));a.append(c)},NoticeInlineReplySetup:function(){$(".threaded-notices").each(function(){var b=$(this);var a=b.closest(".notice");SN.U.NoticeInlineReplyPlaceholder(a)})},NoticeRepeat:function(){$(".form_repeat").live("click",function(a){a.preventDefault();SN.U.NoticeRepeatConfirmation($(this));return false})},NoticeRepeatConfirmation:function(a){var c=a.find(".submit");var b=c.clone();b.addClass("submit_dialogbox").removeClass("submit");a.append(b);b.bind("click",function(){SN.U.FormXHR(a);return false});c.hide();a.addClass("dialogbox").append('<button class="close">&#215;</button>').closest(".notice-options").addClass("opaque");a.find("button.close").click(function(){$(this).remove();a.removeClass("dialogbox").closest(".notice-options").removeClass("opaque");a.find(".submit_dialogbox").remove();a.find(".submit").show();return false})},NoticeAttachments:function(){$(".notice a.attachment").each(function(){SN.U.NoticeWithAttachment($(this).closest(".notice"))})},NoticeWithAttachment:function(b){if(b.find(".attachment").length===0){return}var a=b.find(".attachment.more");if(a.length>0){$(a[0]).click(function(){var c=$(this);c.addClass(SN.C.S.Processing);$.get(c.attr("href")+"/ajax",null,function(d){c.parent(".entry-content").html($(d).find("#attachment_view .entry-content").html())});return false}).attr("title",SN.msg("showmore_tooltip"))}},NoticeDataAttach:function(){NDA=$("#"+SN.C.S.NoticeDataAttach);NDA.change(function(c){var a=$(this).val();if(!a){$("#"+SN.C.S.NoticeDataAttachSelected).remove();return false}S='<div id="'+SN.C.S.NoticeDataAttachSelected+'" class="'+SN.C.S.Success+'"><code>'+a+'</code> <button class="close">&#215;</button></div>';NDAS=$("#"+SN.C.S.NoticeDataAttachSelected);if(NDAS.length>0){NDAS.replaceWith(S)}else{$("#"+SN.C.S.FormNotice).append(S)}$("#"+SN.C.S.NoticeDataAttachSelected+" button").click(function(){$("#"+SN.C.S.NoticeDataAttachSelected).remove();NDA.val("");return false});if(typeof this.files=="object"){for(var b=0;b<this.files.length;b++){SN.U.PreviewAttach(this.files[b])}}})},maxFileSize:function(b){var a=$(b).find("input[name=MAX_FILE_SIZE]").attr("value");if(a){return parseInt(a)}else{return 0}},PreviewAttach:function(c){var d=c.type+" "+Math.round(c.size/1024)+"KB";var e=true;var g;if(typeof window.createObjectURL!="undefined"){g=function(h,i){i(window.createObjectURL(h))}}else{if(typeof window.FileReader!="undefined"){g=function(i,j){var h=new FileReader();h.onload=function(k){j(h.result)};h.readAsDataURL(i)}}else{e=false}}var a=["image/png","image/jpeg","image/gif","image/svg+xml"];if($.inArray(c.type,a)==-1){e=false}var f=8*1024*1024;if(c.size>f){e=false}if(e){g(c,function(i){var h=$("<img>").attr("title",d).attr("alt",d).attr("src",i).attr("style","height: 120px");$("#"+SN.C.S.NoticeDataAttachSelected).append(h)})}else{var b=$("<div></div>").text(d);$("#"+SN.C.S.NoticeDataAttachSelected).append(b)}},NoticeLocationAttach:function(){var c=$("#"+SN.C.S.NoticeLat).val();var h=$("#"+SN.C.S.NoticeLon).val();var d=$("#"+SN.C.S.NoticeLocationNs).val();var i=$("#"+SN.C.S.NoticeLocationId).val();var a=$("#"+SN.C.S.NoticeGeoName).text();var b=$("#"+SN.C.S.NoticeDataGeo);function e(){$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",jQuery.trim($("label[for="+SN.C.S.NoticeDataGeo+"]").text())).removeClass("checked");$("#"+SN.C.S.NoticeLat).val("");$("#"+SN.C.S.NoticeLon).val("");$("#"+SN.C.S.NoticeLocationNs).val("");$("#"+SN.C.S.NoticeLocationId).val("");$("#"+SN.C.S.NoticeDataGeo).attr("checked",false);$.cookie(SN.C.S.NoticeDataGeoCookie,"disabled",{path:"/"})}function j(k,l){$.getJSON(k,l,function(m){var n,o;if(typeof(m.location_ns)!="undefined"){$("#"+SN.C.S.NoticeLocationNs).val(m.location_ns);n=m.location_ns}if(typeof(m.location_id)!="undefined"){$("#"+SN.C.S.NoticeLocationId).val(m.location_id);o=m.location_id}if(typeof(m.name)=="undefined"){NLN_text=l.lat+";"+l.lon}else{NLN_text=m.name}$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",NoticeDataGeo_text.ShareDisable+" ("+NLN_text+")");$("#"+SN.C.S.NoticeLat).val(l.lat);$("#"+SN.C.S.NoticeLon).val(l.lon);$("#"+SN.C.S.NoticeLocationNs).val(n);$("#"+SN.C.S.NoticeLocationId).val(o);$("#"+SN.C.S.NoticeDataGeo).attr("checked",true);var p={NLat:l.lat,NLon:l.lon,NLNS:n,NLID:o,NLN:NLN_text,NLNU:m.url,NDG:true};$.cookie(SN.C.S.NoticeDataGeoCookie,JSON.stringify(p),{path:"/"})})}if(b.length>0){if($.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){b.attr("checked",false)}else{b.attr("checked",true)}var f=$("#notice_data-geo_wrap");var g=f.attr("title");f.removeAttr("title");$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",jQuery.trim($("label[for="+SN.C.S.NoticeDataGeo+"]").text()));b.change(function(){if($("#"+SN.C.S.NoticeDataGeo).attr("checked")===true||$.cookie(SN.C.S.NoticeDataGeoCookie)===null){$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",NoticeDataGeo_text.ShareDisable).addClass("checked");if($.cookie(SN.C.S.NoticeDataGeoCookie)===null||$.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){if(navigator.geolocation){navigator.geolocation.getCurrentPosition(function(m){$("#"+SN.C.S.NoticeLat).val(m.coords.latitude);$("#"+SN.C.S.NoticeLon).val(m.coords.longitude);var n={lat:m.coords.latitude,lon:m.coords.longitude,token:$("#token").val()};j(g,n)},function(m){switch(m.code){case m.PERMISSION_DENIED:e();break;case m.TIMEOUT:$("#"+SN.C.S.NoticeDataGeo).attr("checked",false);break}},{timeout:10000})}else{if(c.length>0&&h.length>0){var k={lat:c,lon:h,token:$("#token").val()};j(g,k)}else{e();$("#"+SN.C.S.NoticeDataGeo).remove();$("label[for="+SN.C.S.NoticeDataGeo+"]").remove()}}}else{var l=JSON.parse($.cookie(SN.C.S.NoticeDataGeoCookie));$("#"+SN.C.S.NoticeLat).val(l.NLat);$("#"+SN.C.S.NoticeLon).val(l.NLon);$("#"+SN.C.S.NoticeLocationNs).val(l.NLNS);$("#"+SN.C.S.NoticeLocationId).val(l.NLID);$("#"+SN.C.S.NoticeDataGeo).attr("checked",l.NDG);$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",NoticeDataGeo_text.ShareDisable+" ("+l.NLN+")").addClass("checked")}}else{e()}}).change()}},NewDirectMessage:function(){NDM=$(".entity_send-a-message a");NDM.attr({href:NDM.attr("href")+"&ajax=1"});NDM.bind("click",function(){var a=$(".entity_send-a-message form");if(a.length===0){$(this).addClass(SN.C.S.Processing);$.get(NDM.attr("href"),null,function(b){$(".entity_send-a-message").append(document._importNode($("form",b)[0],true));a=$(".entity_send-a-message .form_notice");SN.U.FormNoticeXHR(a);SN.U.FormNoticeEnhancements(a);a.append('<button class="close">&#215;</button>');$(".entity_send-a-message button").click(function(){a.hide();return false});NDM.removeClass(SN.C.S.Processing)})}else{a.show();$(".entity_send-a-message textarea").focus()}return false})},GetFullYear:function(c,d,a){var b=new Date();b.setFullYear(c,d,a);return b},StatusNetInstance:{Set:function(b){var a=SN.U.StatusNetInstance.Get();if(a!==null){b=$.extend(a,b)}$.cookie(SN.C.S.StatusNetInstance,JSON.stringify(b),{path:"/",expires:SN.U.GetFullYear(2029,0,1)})},Get:function(){var a=$.cookie(SN.C.S.StatusNetInstance);if(a!==null){return JSON.parse(a)}return null},Delete:function(){$.cookie(SN.C.S.StatusNetInstance,null)}},belongsOnTimeline:function(b){var a=$("body").attr("id");if(a=="public"){return true}var c=$("#nav_profile a").attr("href");if(c){var d=$(b).find(".entry-title .author a.url").attr("href");if(d==c){if(a=="all"||a=="showstream"){return true}}}return false}},Init:{NoticeForm:function(){if($("body.user_in").length>0){SN.U.NoticeLocationAttach();$("."+SN.C.S.FormNotice).each(function(){SN.U.FormNoticeXHR($(this));SN.U.FormNoticeEnhancements($(this))});SN.U.NoticeDataAttach()}},Notices:function(){if($("body.user_in").length>0){SN.U.NoticeFavor();SN.U.NoticeRepeat();SN.U.NoticeReply();SN.U.NoticeInlineReplySetup()}SN.U.NoticeAttachments()},EntityActions:function(){if($("body.user_in").length>0){$(".form_user_subscribe").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_user_unsubscribe").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_group_join").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_group_leave").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_user_nudge").live("click",function(){SN.U.FormXHR($(this));return false});SN.U.NewDirectMessage()}},Login:function(){if(SN.U.StatusNetInstance.Get()!==null){var a=SN.U.StatusNetInstance.Get().Nickname;if(a!==null){$("#form_login #nickname").val(a)}}$("#form_login").bind("submit",function(){SN.U.StatusNetInstance.Set({Nickname:$("#form_login #nickname").val()});return true})},UploadForms:function(){$("input[type=file]").change(function(d){if(typeof this.files=="object"&&this.files.length>0){var c=0;for(var b=0;b<this.files.length;b++){c+=this.files[b].size}var a=SN.U.maxFileSize($(this.form));if(a>0&&c>a){var e="File too large: maximum upload size is %d bytes.";alert(e.replace("%d",a));$(this).val("");d.preventDefault();return false}}})}}};$(document).ready(function(){SN.Init.UploadForms();if($("."+SN.C.S.FormNotice).length>0){SN.Init.NoticeForm()}if($("#content .notices").length>0){SN.Init.Notices()}if($("#content .entity_actions").length>0){SN.Init.EntityActions()}if($("#form_login").length>0){SN.Init.Login()}});if(!document.ELEMENT_NODE){document.ELEMENT_NODE=1;document.ATTRIBUTE_NODE=2;document.TEXT_NODE=3;document.CDATA_SECTION_NODE=4;document.ENTITY_REFERENCE_NODE=5;document.ENTITY_NODE=6;document.PROCESSING_INSTRUCTION_NODE=7;document.COMMENT_NODE=8;document.DOCUMENT_NODE=9;document.DOCUMENT_TYPE_NODE=10;document.DOCUMENT_FRAGMENT_NODE=11;document.NOTATION_NODE=12}document._importNode=function(e,a){switch(e.nodeType){case document.ELEMENT_NODE:var d=document.createElement(e.nodeName);if(e.attributes&&e.attributes.length>0){for(var c=0,b=e.attributes.length;c<b;){if(e.attributes[c].nodeName=="class"){d.className=e.getAttribute(e.attributes[c++].nodeName)}else{d.setAttribute(e.attributes[c].nodeName,e.getAttribute(e.attributes[c++].nodeName))}}}if(a&&e.childNodes&&e.childNodes.length>0){for(var c=0,b=e.childNodes.length;c<b;){d.appendChild(document._importNode(e.childNodes[c++],a))}}return d;break;case document.TEXT_NODE:case document.CDATA_SECTION_NODE:case document.COMMENT_NODE:return document.createTextNode(e.nodeValue);break}};if(typeof navigator.geolocation=="undefined"||navigator.geolocation.shim){(function(){(function(){if(window.google&&google.gears){return}var c=null;if(typeof GearsFactory!="undefined"){c=new GearsFactory()}else{try{c=new ActiveXObject("Gears.Factory");if(c.getBuildInfo().indexOf("ie_mobile")!=-1){c.privateSetGlobalObject(this)}}catch(d){if((typeof navigator.mimeTypes!="undefined")&&navigator.mimeTypes["application/x-googlegears"]){c=document.createElement("object");c.style.display="none";c.width=0;c.height=0;c.type="application/x-googlegears";document.documentElement.appendChild(c)}}}if(!c){return}if(!window.google){google={}}if(!google.gears){google.gears={factory:c}}})();var a=(function(){var d=google.gears.factory.create("beta.geolocation");var c=function(f,e){return function(g){f(g);e.lastPosition=g}};return{shim:true,type:"Gears",lastPosition:null,getCurrentPosition:function(e,g,h){var f=this;var i=c(e,f);d.getCurrentPosition(i,g,h)},watchPosition:function(e,f,g){d.watchPosition(e,f,g)},clearWatch:function(e){d.clearWatch(e)},getPermission:function(g,e,f){d.getPermission(g,e,f)}}});var b=(function(){var i=false;var e=function(){if(!d()&&!i){i=true;var j=document.createElement("script");j.src=(document.location.protocol=="https:"?"https://":"http://")+"www.google.com/jsapi?callback=_google_loader_apiLoaded";j.type="text/javascript";document.getElementsByTagName("body")[0].appendChild(j)}};var c=[];var h=function(j){c.push(j)};var f=function(){if(d()){while(c.length>0){var j=c.pop();j()}}};window._google_loader_apiLoaded=function(){f()};var d=function(){return(window.google&&google.loader)};var g=function(j){if(d()){return true}h(j);e();return false};e();return{shim:true,type:"ClientLocation",lastPosition:null,getCurrentPosition:function(k,n,o){var m=this;if(!g(function(){m.getCurrentPosition(k,n,o)})){return}if(google.loader.ClientLocation){var l=google.loader.ClientLocation;var j={coords:{latitude:l.latitude,longitude:l.longitude,altitude:null,accuracy:43000,altitudeAccuracy:null,heading:null,speed:null},address:{city:l.address.city,country:l.address.country,country_code:l.address.country_code,region:l.address.region},timestamp:new Date()};k(j);this.lastPosition=j}else{if(n==="function"){n({code:3,message:"Using the Google ClientLocation API and it is not able to calculate a location."})}}},watchPosition:function(j,l,m){this.getCurrentPosition(j,l,m);var k=this;var n=setInterval(function(){k.getCurrentPosition(j,l,m)},10000);return n},clearWatch:function(j){clearInterval(j)},getPermission:function(l,j,k){return true}}});navigator.geolocation=(window.google&&google.gears)?a():b()})()};
\ No newline at end of file
+var SN={C:{I:{CounterBlackout:false,MaxLength:140,PatternUsername:/^[0-9a-zA-Z\-_.]*$/,HTTP20x30x:[200,201,202,203,204,205,206,300,301,302,303,304,305,306,307]},S:{Disabled:"disabled",Warning:"warning",Error:"error",Success:"success",Processing:"processing",CommandResult:"command_result",FormNotice:"form_notice",NoticeDataText:"notice_data-text",NoticeTextCount:"notice_text-count",NoticeInReplyTo:"notice_in-reply-to",NoticeDataAttach:"notice_data-attach",NoticeDataAttachSelected:"notice_data-attach_selected",NoticeActionSubmit:"notice_action-submit",NoticeLat:"notice_data-lat",NoticeLon:"notice_data-lon",NoticeLocationId:"notice_data-location_id",NoticeLocationNs:"notice_data-location_ns",NoticeGeoName:"notice_data-geo_name",NoticeDataGeo:"notice_data-geo",NoticeDataGeoCookie:"NoticeDataGeo",NoticeDataGeoSelected:"notice_data-geo_selected",StatusNetInstance:"StatusNetInstance"}},messages:{},msg:function(a){if(typeof SN.messages[a]=="undefined"){return"["+a+"]"}else{return SN.messages[a]}},U:{FormNoticeEnhancements:function(b){if(jQuery.data(b[0],"ElementData")===undefined){MaxLength=b.find("#"+SN.C.S.NoticeTextCount).text();if(typeof(MaxLength)=="undefined"){MaxLength=SN.C.I.MaxLength}jQuery.data(b[0],"ElementData",{MaxLength:MaxLength});SN.U.Counter(b);NDT=b.find("#"+SN.C.S.NoticeDataText);NDT.bind("keyup",function(c){SN.U.Counter(b)});var a=function(c){window.setTimeout(function(){SN.U.Counter(b)},50)};NDT.bind("cut",a).bind("paste",a);NDT.bind("keydown",function(c){SN.U.SubmitOnReturn(c,b)})}else{b.find("#"+SN.C.S.NoticeTextCount).text(jQuery.data(b[0],"ElementData").MaxLength)}if($("body")[0].id!="conversation"&&window.location.hash.length===0&&$(window).scrollTop()==0){b.find("textarea").focus()}},SubmitOnReturn:function(b,a){if(b.keyCode==13||b.keyCode==10){a.submit();b.preventDefault();b.stopPropagation();$("#"+a[0].id+" #"+SN.C.S.NoticeDataText).blur();$("body").focus();return false}return true},Counter:function(d){SN.C.I.FormNoticeCurrent=d;var b=jQuery.data(d[0],"ElementData").MaxLength;if(b<=0){return}var c=b-SN.U.CharacterCount(d);var a=d.find("#"+SN.C.S.NoticeTextCount);if(c.toString()!=a.text()){if(!SN.C.I.CounterBlackout||c===0){if(a.text()!=String(c)){a.text(c)}if(c<0){d.addClass(SN.C.S.Warning)}else{d.removeClass(SN.C.S.Warning)}if(!SN.C.I.CounterBlackout){SN.C.I.CounterBlackout=true;SN.C.I.FormNoticeCurrent=d;window.setTimeout("SN.U.ClearCounterBlackout(SN.C.I.FormNoticeCurrent);",500)}}}},CharacterCount:function(a){return a.find("#"+SN.C.S.NoticeDataText).val().length},ClearCounterBlackout:function(a){SN.C.I.CounterBlackout=false;SN.U.Counter(a)},RewriteAjaxAction:function(a){if(document.location.protocol=="https:"&&a.substr(0,5)=="http:"){return a.replace(/^http:\/\/[^:\/]+/,"https://"+document.location.host)}else{return a}},FormXHR:function(a){$.ajax({type:"POST",dataType:"xml",url:SN.U.RewriteAjaxAction(a.attr("action")),data:a.serialize()+"&ajax=1",beforeSend:function(b){a.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(c,d,b){alert(b||d)},success:function(b,c){if(typeof($("form",b)[0])!="undefined"){form_new=document._importNode($("form",b)[0],true);a.replaceWith(form_new)}else{a.replaceWith(document._importNode($("p",b)[0],true))}}})},FormNoticeXHR:function(b){SN.C.I.NoticeDataGeo={};b.append('<input type="hidden" name="ajax" value="1"/>');b.attr("action",SN.U.RewriteAjaxAction(b.attr("action")));var c=function(d,e){b.append($('<p class="form_response"></p>').addClass(d).text(e))};var a=function(){b.find(".form_response").remove()};b.ajaxForm({dataType:"xml",timeout:"60000",beforeSend:function(d){if(b.find("#"+SN.C.S.NoticeDataText)[0].value.length===0){b.addClass(SN.C.S.Warning);return false}b.addClass(SN.C.S.Processing).find("#"+SN.C.S.NoticeActionSubmit).addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled);SN.C.I.NoticeDataGeo.NLat=$("#"+SN.C.S.NoticeLat).val();SN.C.I.NoticeDataGeo.NLon=$("#"+SN.C.S.NoticeLon).val();SN.C.I.NoticeDataGeo.NLNS=$("#"+SN.C.S.NoticeLocationNs).val();SN.C.I.NoticeDataGeo.NLID=$("#"+SN.C.S.NoticeLocationId).val();SN.C.I.NoticeDataGeo.NDG=$("#"+SN.C.S.NoticeDataGeo).attr("checked");cookieValue=$.cookie(SN.C.S.NoticeDataGeoCookie);if(cookieValue!==null&&cookieValue!="disabled"){cookieValue=JSON.parse(cookieValue);SN.C.I.NoticeDataGeo.NLat=$("#"+SN.C.S.NoticeLat).val(cookieValue.NLat).val();SN.C.I.NoticeDataGeo.NLon=$("#"+SN.C.S.NoticeLon).val(cookieValue.NLon).val();if($("#"+SN.C.S.NoticeLocationNs).val(cookieValue.NLNS)){SN.C.I.NoticeDataGeo.NLNS=$("#"+SN.C.S.NoticeLocationNs).val(cookieValue.NLNS).val();SN.C.I.NoticeDataGeo.NLID=$("#"+SN.C.S.NoticeLocationId).val(cookieValue.NLID).val()}}if(cookieValue=="disabled"){SN.C.I.NoticeDataGeo.NDG=$("#"+SN.C.S.NoticeDataGeo).attr("checked",false).attr("checked")}else{SN.C.I.NoticeDataGeo.NDG=$("#"+SN.C.S.NoticeDataGeo).attr("checked",true).attr("checked")}return true},error:function(f,g,e){b.removeClass(SN.C.S.Processing).find("#"+SN.C.S.NoticeActionSubmit).removeClass(SN.C.S.Disabled).removeAttr(SN.C.S.Disabled,SN.C.S.Disabled);a();if(g=="timeout"){c("error","Sorry! We had trouble sending your notice. The servers are overloaded. Please try again, and contact the site administrator if this problem persists.")}else{var d=SN.U.GetResponseXML(f);if($("."+SN.C.S.Error,d).length>0){b.append(document._importNode($("."+SN.C.S.Error,d)[0],true))}else{if(parseInt(f.status)===0||jQuery.inArray(parseInt(f.status),SN.C.I.HTTP20x30x)>=0){b.resetForm().find("#"+SN.C.S.NoticeDataAttachSelected).remove();SN.U.FormNoticeEnhancements(b)}else{c("error","(Sorry! We had trouble sending your notice ("+f.status+" "+f.statusText+"). Please report the problem to the site administrator if this happens again.")}}}},success:function(i,k){a();var e=$("#"+SN.C.S.Error,i);if(e.length>0){c("error",e.text())}else{if($("body")[0].id=="bookmarklet"){self.close()}var d=$("#"+SN.C.S.CommandResult,i);if(d.length>0){c("success",d.text())}else{var h=document._importNode($("li",i)[0],true);var j=$("#notices_primary .notices");if(j.length>0&&SN.U.belongsOnTimeline(h)){if($("#"+h.id).length===0){var f=$("#"+SN.C.S.NoticeInReplyTo).val();var g="#notices_primary #notice-"+f;if($("body")[0].id=="conversation"){if(f.length>0&&$(g+" .notices").length<1){$(g).append('<ul class="notices"></ul>')}$($(g+" .notices")[0]).append(h)}else{j.prepend(h)}$("#"+h.id).css({display:"none"}).fadeIn(2500);SN.U.NoticeWithAttachment($("#"+h.id));SN.U.NoticeReplyTo($("#"+h.id))}}else{c("success",$("title",i).text())}}b.resetForm();b.find("#"+SN.C.S.NoticeInReplyTo).val("");b.find("#"+SN.C.S.NoticeDataAttachSelected).remove();SN.U.FormNoticeEnhancements(b)}},complete:function(d,e){b.removeClass(SN.C.S.Processing).find("#"+SN.C.S.NoticeActionSubmit).removeAttr(SN.C.S.Disabled).removeClass(SN.C.S.Disabled);$("#"+SN.C.S.NoticeLat).val(SN.C.I.NoticeDataGeo.NLat);$("#"+SN.C.S.NoticeLon).val(SN.C.I.NoticeDataGeo.NLon);if($("#"+SN.C.S.NoticeLocationNs)){$("#"+SN.C.S.NoticeLocationNs).val(SN.C.I.NoticeDataGeo.NLNS);$("#"+SN.C.S.NoticeLocationId).val(SN.C.I.NoticeDataGeo.NLID)}$("#"+SN.C.S.NoticeDataGeo).attr("checked",SN.C.I.NoticeDataGeo.NDG)}})},GetResponseXML:function(b){try{return b.responseXML}catch(a){return(new DOMParser()).parseFromString(b.responseText,"text/xml")}},NoticeReply:function(){if($("#"+SN.C.S.NoticeDataText).length>0&&$("#content .notice_reply").length>0){$("#content .notice").each(function(){SN.U.NoticeReplyTo($(this))})}},NoticeReplyTo:function(a){a.find(".notice_reply").live("click",function(c){c.preventDefault();var b=($(".author .nickname",a).length>0)?$($(".author .nickname",a)[0]):$(".author .nickname.uid");SN.U.NoticeInlineReplyTrigger(a,"@"+b.text());return false})},NoticeInlineReplyTrigger:function(h,i){var c=$($(".notice_id",h)[0]).text();var d=h;var f=h.closest(".notices");if(f.hasClass("threaded-notices")){d=f.closest(".notice")}else{f=$("ul.threaded-notices",h);if(f.length==0){f=$('<ul class="notices threaded-notices xoxo"></ul>');h.append(f)}}var k=$(".notice-reply-form",f);if(k.length==0){$("li.notice-reply-placeholder").remove();var g=$("li.notice-reply",f);if(g.length==0){g=$('<li class="notice-reply"><form class="notice-reply-form" method="post"><textarea name="status_textarea"></textarea><div class="controls"><input type="hidden" name="token"><input type="hidden" name="inreplyto"><input type="submit" class="submit"></div></form></li>');var b=$("#form_notice");k=g.find("form");k.attr("action",b.attr("action"));k.find('input[name="token"]').val(b.find("input[name=token]").val());k.find('input[type="submit"]').val(SN.msg("reply_submit"));f.append(g);k.find("textarea").blur(function(){var m=$(this);var l=$.trim(m.val());if(l==""||l==m.data("initialText")){g.remove();if(f.find("li").length>0){SN.U.NoticeInlineReplyPlaceholder(d)}else{f.remove()}}});k.submit(function(m){var l=k;$.ajax({type:"POST",dataType:"xml",url:SN.U.RewriteAjaxAction(l.attr("action")),data:l.serialize()+"&ajax=1",beforeSend:function(n){l.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled).end().find("textarea").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(o,p,n){alert(n||p)},success:function(p,q){var o=$("li",p)[0];if(o){var n=document._importNode(o,true);g.replaceWith(n);SN.U.NoticeInlineReplyPlaceholder(d)}}});m.preventDefault();return false})}}k.find("input[name=inreplyto]").val(c);var j=k.find("textarea");if(j.length==0){throw"No textarea"}var a="";if(i){a=i+" "}j.val(a+j.val().replace(RegExp(a,"i"),""));j.data("initialText",$.trim(i+""));j.focus();if(j[0].setSelectionRange){var e=j.val().length;j[0].setSelectionRange(e,e)}},NoticeReplySet:function(b,d){if(b.match(SN.C.I.PatternUsername)){var c=$("#"+SN.C.S.NoticeDataText);if(c.length>0){replyto="@"+b+" ";c.val(replyto+c.val().replace(RegExp(replyto,"i"),""));$("#"+SN.C.S.FormNotice+" #"+SN.C.S.NoticeInReplyTo).val(d);c[0].focus();if(c[0].setSelectionRange){var a=c.val().length;c[0].setSelectionRange(a,a)}}}},NoticeFavor:function(){$(".form_favor").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_disfavor").live("click",function(){SN.U.FormXHR($(this));return false})},NoticeInlineReplyPlaceholder:function(b){var a=b.find("ul.threaded-notices");var c=$('<li class="notice-reply-placeholder"><input class="placeholder"></li>');c.click(function(){SN.U.NoticeInlineReplyTrigger(b)});c.find("input").val(SN.msg("reply_comment"));a.append(c)},NoticeInlineReplySetup:function(){$(".threaded-notices").each(function(){var b=$(this);var a=b.closest(".notice");SN.U.NoticeInlineReplyPlaceholder(a)})},NoticeRepeat:function(){$(".form_repeat").live("click",function(a){a.preventDefault();SN.U.NoticeRepeatConfirmation($(this));return false})},NoticeRepeatConfirmation:function(a){var c=a.find(".submit");var b=c.clone();b.addClass("submit_dialogbox").removeClass("submit");a.append(b);b.bind("click",function(){SN.U.FormXHR(a);return false});c.hide();a.addClass("dialogbox").append('<button class="close">&#215;</button>').closest(".notice-options").addClass("opaque");a.find("button.close").click(function(){$(this).remove();a.removeClass("dialogbox").closest(".notice-options").removeClass("opaque");a.find(".submit_dialogbox").remove();a.find(".submit").show();return false})},NoticeAttachments:function(){$(".notice a.attachment").each(function(){SN.U.NoticeWithAttachment($(this).closest(".notice"))})},NoticeWithAttachment:function(b){if(b.find(".attachment").length===0){return}var a=b.find(".attachment.more");if(a.length>0){$(a[0]).click(function(){var c=$(this);c.addClass(SN.C.S.Processing);$.get(c.attr("href")+"/ajax",null,function(d){c.parent(".entry-content").html($(d).find("#attachment_view .entry-content").html())});return false}).attr("title",SN.msg("showmore_tooltip"))}},NoticeDataAttach:function(){NDA=$("#"+SN.C.S.NoticeDataAttach);NDA.change(function(c){var a=$(this).val();if(!a){$("#"+SN.C.S.NoticeDataAttachSelected).remove();return false}S='<div id="'+SN.C.S.NoticeDataAttachSelected+'" class="'+SN.C.S.Success+'"><code>'+a+'</code> <button class="close">&#215;</button></div>';NDAS=$("#"+SN.C.S.NoticeDataAttachSelected);if(NDAS.length>0){NDAS.replaceWith(S)}else{$("#"+SN.C.S.FormNotice).append(S)}$("#"+SN.C.S.NoticeDataAttachSelected+" button").click(function(){$("#"+SN.C.S.NoticeDataAttachSelected).remove();NDA.val("");return false});if(typeof this.files=="object"){for(var b=0;b<this.files.length;b++){SN.U.PreviewAttach(this.files[b])}}})},maxFileSize:function(b){var a=$(b).find("input[name=MAX_FILE_SIZE]").attr("value");if(a){return parseInt(a)}else{return 0}},PreviewAttach:function(c){var d=c.type+" "+Math.round(c.size/1024)+"KB";var e=true;var g;if(typeof window.createObjectURL!="undefined"){g=function(h,i){i(window.createObjectURL(h))}}else{if(typeof window.FileReader!="undefined"){g=function(i,j){var h=new FileReader();h.onload=function(k){j(h.result)};h.readAsDataURL(i)}}else{e=false}}var a=["image/png","image/jpeg","image/gif","image/svg+xml"];if($.inArray(c.type,a)==-1){e=false}var f=8*1024*1024;if(c.size>f){e=false}if(e){g(c,function(i){var h=$("<img>").attr("title",d).attr("alt",d).attr("src",i).attr("style","height: 120px");$("#"+SN.C.S.NoticeDataAttachSelected).append(h)})}else{var b=$("<div></div>").text(d);$("#"+SN.C.S.NoticeDataAttachSelected).append(b)}},NoticeLocationAttach:function(){var c=$("#"+SN.C.S.NoticeLat).val();var h=$("#"+SN.C.S.NoticeLon).val();var d=$("#"+SN.C.S.NoticeLocationNs).val();var i=$("#"+SN.C.S.NoticeLocationId).val();var a=$("#"+SN.C.S.NoticeGeoName).text();var b=$("#"+SN.C.S.NoticeDataGeo);function e(){$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",jQuery.trim($("label[for="+SN.C.S.NoticeDataGeo+"]").text())).removeClass("checked");$("#"+SN.C.S.NoticeLat).val("");$("#"+SN.C.S.NoticeLon).val("");$("#"+SN.C.S.NoticeLocationNs).val("");$("#"+SN.C.S.NoticeLocationId).val("");$("#"+SN.C.S.NoticeDataGeo).attr("checked",false);$.cookie(SN.C.S.NoticeDataGeoCookie,"disabled",{path:"/"})}function j(k,l){$.getJSON(k,l,function(m){var n,o;if(typeof(m.location_ns)!="undefined"){$("#"+SN.C.S.NoticeLocationNs).val(m.location_ns);n=m.location_ns}if(typeof(m.location_id)!="undefined"){$("#"+SN.C.S.NoticeLocationId).val(m.location_id);o=m.location_id}if(typeof(m.name)=="undefined"){NLN_text=l.lat+";"+l.lon}else{NLN_text=m.name}$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",NoticeDataGeo_text.ShareDisable+" ("+NLN_text+")");$("#"+SN.C.S.NoticeLat).val(l.lat);$("#"+SN.C.S.NoticeLon).val(l.lon);$("#"+SN.C.S.NoticeLocationNs).val(n);$("#"+SN.C.S.NoticeLocationId).val(o);$("#"+SN.C.S.NoticeDataGeo).attr("checked",true);var p={NLat:l.lat,NLon:l.lon,NLNS:n,NLID:o,NLN:NLN_text,NLNU:m.url,NDG:true};$.cookie(SN.C.S.NoticeDataGeoCookie,JSON.stringify(p),{path:"/"})})}if(b.length>0){if($.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){b.attr("checked",false)}else{b.attr("checked",true)}var f=$("#notice_data-geo_wrap");var g=f.attr("title");f.removeAttr("title");$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",jQuery.trim($("label[for="+SN.C.S.NoticeDataGeo+"]").text()));b.change(function(){if($("#"+SN.C.S.NoticeDataGeo).attr("checked")===true||$.cookie(SN.C.S.NoticeDataGeoCookie)===null){$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",NoticeDataGeo_text.ShareDisable).addClass("checked");if($.cookie(SN.C.S.NoticeDataGeoCookie)===null||$.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){if(navigator.geolocation){navigator.geolocation.getCurrentPosition(function(m){$("#"+SN.C.S.NoticeLat).val(m.coords.latitude);$("#"+SN.C.S.NoticeLon).val(m.coords.longitude);var n={lat:m.coords.latitude,lon:m.coords.longitude,token:$("#token").val()};j(g,n)},function(m){switch(m.code){case m.PERMISSION_DENIED:e();break;case m.TIMEOUT:$("#"+SN.C.S.NoticeDataGeo).attr("checked",false);break}},{timeout:10000})}else{if(c.length>0&&h.length>0){var k={lat:c,lon:h,token:$("#token").val()};j(g,k)}else{e();$("#"+SN.C.S.NoticeDataGeo).remove();$("label[for="+SN.C.S.NoticeDataGeo+"]").remove()}}}else{var l=JSON.parse($.cookie(SN.C.S.NoticeDataGeoCookie));$("#"+SN.C.S.NoticeLat).val(l.NLat);$("#"+SN.C.S.NoticeLon).val(l.NLon);$("#"+SN.C.S.NoticeLocationNs).val(l.NLNS);$("#"+SN.C.S.NoticeLocationId).val(l.NLID);$("#"+SN.C.S.NoticeDataGeo).attr("checked",l.NDG);$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",NoticeDataGeo_text.ShareDisable+" ("+l.NLN+")").addClass("checked")}}else{e()}}).change()}},NewDirectMessage:function(){NDM=$(".entity_send-a-message a");NDM.attr({href:NDM.attr("href")+"&ajax=1"});NDM.bind("click",function(){var a=$(".entity_send-a-message form");if(a.length===0){$(this).addClass(SN.C.S.Processing);$.get(NDM.attr("href"),null,function(b){$(".entity_send-a-message").append(document._importNode($("form",b)[0],true));a=$(".entity_send-a-message .form_notice");SN.U.FormNoticeXHR(a);SN.U.FormNoticeEnhancements(a);a.append('<button class="close">&#215;</button>');$(".entity_send-a-message button").click(function(){a.hide();return false});NDM.removeClass(SN.C.S.Processing)})}else{a.show();$(".entity_send-a-message textarea").focus()}return false})},GetFullYear:function(c,d,a){var b=new Date();b.setFullYear(c,d,a);return b},StatusNetInstance:{Set:function(b){var a=SN.U.StatusNetInstance.Get();if(a!==null){b=$.extend(a,b)}$.cookie(SN.C.S.StatusNetInstance,JSON.stringify(b),{path:"/",expires:SN.U.GetFullYear(2029,0,1)})},Get:function(){var a=$.cookie(SN.C.S.StatusNetInstance);if(a!==null){return JSON.parse(a)}return null},Delete:function(){$.cookie(SN.C.S.StatusNetInstance,null)}},belongsOnTimeline:function(b){var a=$("body").attr("id");if(a=="public"){return true}var c=$("#nav_profile a").attr("href");if(c){var d=$(b).find(".entry-title .author a.url").attr("href");if(d==c){if(a=="all"||a=="showstream"){return true}}}return false}},Init:{NoticeForm:function(){if($("body.user_in").length>0){SN.U.NoticeLocationAttach();$("."+SN.C.S.FormNotice).each(function(){SN.U.FormNoticeXHR($(this));SN.U.FormNoticeEnhancements($(this))});SN.U.NoticeDataAttach()}},Notices:function(){if($("body.user_in").length>0){SN.U.NoticeFavor();SN.U.NoticeRepeat();SN.U.NoticeReply();SN.U.NoticeInlineReplySetup()}SN.U.NoticeAttachments()},EntityActions:function(){if($("body.user_in").length>0){$(".form_user_subscribe").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_user_unsubscribe").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_group_join").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_group_leave").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_user_nudge").live("click",function(){SN.U.FormXHR($(this));return false});SN.U.NewDirectMessage()}},Login:function(){if(SN.U.StatusNetInstance.Get()!==null){var a=SN.U.StatusNetInstance.Get().Nickname;if(a!==null){$("#form_login #nickname").val(a)}}$("#form_login").bind("submit",function(){SN.U.StatusNetInstance.Set({Nickname:$("#form_login #nickname").val()});return true})},UploadForms:function(){$("input[type=file]").change(function(d){if(typeof this.files=="object"&&this.files.length>0){var c=0;for(var b=0;b<this.files.length;b++){c+=this.files[b].size}var a=SN.U.maxFileSize($(this.form));if(a>0&&c>a){var e="File too large: maximum upload size is %d bytes.";alert(e.replace("%d",a));$(this).val("");d.preventDefault();return false}}})}}};$(document).ready(function(){SN.Init.UploadForms();if($("."+SN.C.S.FormNotice).length>0){SN.Init.NoticeForm()}if($("#content .notices").length>0){SN.Init.Notices()}if($("#content .entity_actions").length>0){SN.Init.EntityActions()}if($("#form_login").length>0){SN.Init.Login()}});if(!document.ELEMENT_NODE){document.ELEMENT_NODE=1;document.ATTRIBUTE_NODE=2;document.TEXT_NODE=3;document.CDATA_SECTION_NODE=4;document.ENTITY_REFERENCE_NODE=5;document.ENTITY_NODE=6;document.PROCESSING_INSTRUCTION_NODE=7;document.COMMENT_NODE=8;document.DOCUMENT_NODE=9;document.DOCUMENT_TYPE_NODE=10;document.DOCUMENT_FRAGMENT_NODE=11;document.NOTATION_NODE=12}document._importNode=function(e,a){switch(e.nodeType){case document.ELEMENT_NODE:var d=document.createElement(e.nodeName);if(e.attributes&&e.attributes.length>0){for(var c=0,b=e.attributes.length;c<b;){if(e.attributes[c].nodeName=="class"){d.className=e.getAttribute(e.attributes[c++].nodeName)}else{d.setAttribute(e.attributes[c].nodeName,e.getAttribute(e.attributes[c++].nodeName))}}}if(a&&e.childNodes&&e.childNodes.length>0){for(var c=0,b=e.childNodes.length;c<b;){d.appendChild(document._importNode(e.childNodes[c++],a))}}return d;break;case document.TEXT_NODE:case document.CDATA_SECTION_NODE:case document.COMMENT_NODE:return document.createTextNode(e.nodeValue);break}};if(typeof navigator.geolocation=="undefined"||navigator.geolocation.shim){(function(){(function(){if(window.google&&google.gears){return}var c=null;if(typeof GearsFactory!="undefined"){c=new GearsFactory()}else{try{c=new ActiveXObject("Gears.Factory");if(c.getBuildInfo().indexOf("ie_mobile")!=-1){c.privateSetGlobalObject(this)}}catch(d){if((typeof navigator.mimeTypes!="undefined")&&navigator.mimeTypes["application/x-googlegears"]){c=document.createElement("object");c.style.display="none";c.width=0;c.height=0;c.type="application/x-googlegears";document.documentElement.appendChild(c)}}}if(!c){return}if(!window.google){google={}}if(!google.gears){google.gears={factory:c}}})();var a=(function(){var d=google.gears.factory.create("beta.geolocation");var c=function(f,e){return function(g){f(g);e.lastPosition=g}};return{shim:true,type:"Gears",lastPosition:null,getCurrentPosition:function(e,g,h){var f=this;var i=c(e,f);d.getCurrentPosition(i,g,h)},watchPosition:function(e,f,g){d.watchPosition(e,f,g)},clearWatch:function(e){d.clearWatch(e)},getPermission:function(g,e,f){d.getPermission(g,e,f)}}});var b=(function(){var i=false;var e=function(){if(!d()&&!i){i=true;var j=document.createElement("script");j.src=(document.location.protocol=="https:"?"https://":"http://")+"www.google.com/jsapi?callback=_google_loader_apiLoaded";j.type="text/javascript";document.getElementsByTagName("body")[0].appendChild(j)}};var c=[];var h=function(j){c.push(j)};var f=function(){if(d()){while(c.length>0){var j=c.pop();j()}}};window._google_loader_apiLoaded=function(){f()};var d=function(){return(window.google&&google.loader)};var g=function(j){if(d()){return true}h(j);e();return false};e();return{shim:true,type:"ClientLocation",lastPosition:null,getCurrentPosition:function(k,n,o){var m=this;if(!g(function(){m.getCurrentPosition(k,n,o)})){return}if(google.loader.ClientLocation){var l=google.loader.ClientLocation;var j={coords:{latitude:l.latitude,longitude:l.longitude,altitude:null,accuracy:43000,altitudeAccuracy:null,heading:null,speed:null},address:{city:l.address.city,country:l.address.country,country_code:l.address.country_code,region:l.address.region},timestamp:new Date()};k(j);this.lastPosition=j}else{if(n==="function"){n({code:3,message:"Using the Google ClientLocation API and it is not able to calculate a location."})}}},watchPosition:function(j,l,m){this.getCurrentPosition(j,l,m);var k=this;var n=setInterval(function(){k.getCurrentPosition(j,l,m)},10000);return n},clearWatch:function(j){clearInterval(j)},getPermission:function(l,j,k){return true}}});navigator.geolocation=(window.google&&google.gears)?a():b()})()};
\ No newline at end of file

From a7005f39754e1cd2df6684162d5cb325ca3aea31 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Tue, 1 Mar 2011 15:16:39 -0800
Subject: [PATCH 358/655] Alternate Inbox streaming function optimized for
 threaded paging (for /all stream, while things using the existing API inbox
 methods won't be affected)

---
 actions/all.php   |  4 +--
 classes/Inbox.php | 64 +++++++++++++++++++++++++++++++++++++++++++++++
 classes/User.php  | 10 ++++++++
 3 files changed, 76 insertions(+), 2 deletions(-)

diff --git a/actions/all.php b/actions/all.php
index 12397b4b18..2936df4599 100644
--- a/actions/all.php
+++ b/actions/all.php
@@ -58,9 +58,9 @@ class AllAction extends ProfileAction
         $cur = common_current_user();
 
         if (!empty($cur) && $cur->id == $this->user->id) {
-            $this->notice = $this->user->noticeInbox(($this->page-1)*NOTICES_PER_PAGE, NOTICES_PER_PAGE + 1);
+            $this->notice = $this->user->noticeInboxThreaded(($this->page-1)*NOTICES_PER_PAGE, NOTICES_PER_PAGE + 1);
         } else {
-            $this->notice = $this->user->noticesWithFriends(($this->page-1)*NOTICES_PER_PAGE, NOTICES_PER_PAGE + 1);
+            $this->notice = $this->user->noticesWithFriendsThreaded(($this->page-1)*NOTICES_PER_PAGE, NOTICES_PER_PAGE + 1);
         }
 
         if ($this->page > 1 && $this->notice->N == 0) {
diff --git a/classes/Inbox.php b/classes/Inbox.php
index a1ab6215fd..f0f626a24e 100644
--- a/classes/Inbox.php
+++ b/classes/Inbox.php
@@ -197,6 +197,70 @@ class Inbox extends Memcached_DataObject
         return $ids;
     }
 
+    /**
+     * Wrapper for Inbox::stream() and Notice::getStreamByIds() returning
+     * additional items up to the limit if we were short due to deleted
+     * notices still being listed in the inbox.
+     *
+     * This is meant to assist threaded views, and optimizes paging for
+     * threadness. Not ideal for very late pages, as we have to bump about
+     * through all previous items.
+     *
+     * Should avoid duplicates in paging, though.
+     *
+     * @param int $user_id
+     * @param int $offset skip past the most recent N notices (after since_id checks)
+     * @param int $limit
+     * @param mixed $since_id return only notices after but not including this id
+     * @param mixed $max_id return only notices up to and including this id
+     * @param mixed $own ignored?
+     * @return array of Notice objects
+     *
+     * @todo consider repacking the inbox when this happens?
+     * @fixme reimplement $own if we need it?
+     */
+    function streamNoticesThreaded($user_id, $offset, $limit, $since_id, $max_id, $own=false)
+    {
+        // So what we want is:
+        // * slurp in the beginning of the notice list
+        // * filter out deleted notices
+        // * replace any reply notices with their conversation roots
+        // * filter out any duplicate conversations
+        // * return $limit notices after skipping $offset from the most recent
+
+        $ids = self::stream($user_id, 0, self::MAX_NOTICES, $since_id, $max_id, $own);
+
+        // Do a bulk lookup for the first $limit items
+        // Fast path when nothing's deleted.
+        $firstChunk = array_slice($ids, 0, $offset + $limit);
+        $notices = Notice::getStreamByIds($firstChunk);
+
+        assert($notices instanceof ArrayWrapper);
+        $items = $notices->_items;
+
+        // Extract the latest non-deleted item in each convo
+        $noticeByConvo = array();
+        foreach ($items as $notice) {
+            if (empty($noticeByConvo[$notice->conversation])) {
+                $noticeByConvo[$notice->conversation] = $notice;
+            }
+        }
+
+        $wanted = count($firstChunk); // raw entry count in the inbox up to our $limit
+        // There were deleted notices, we'll need to look for more.
+        $remainder = array_slice($ids, $limit);
+
+        for ($i = $offset + $limit; count($noticeByConvo) < $wanted && $i < count($ids); $i++) {
+            $notice = Notice::staticGet($ids[$i]);
+            if ($notice && empty($noticeByConvo[$notice->conversation])) {
+                $noticeByConvo[$notice->conversation] = $notice;
+            }
+        }
+
+        $slice = array_slice($noticeByConvo, $offset, $limit, false);
+        return new ArrayWrapper($slice);
+    }
+
     /**
      * Wrapper for Inbox::stream() and Notice::getStreamByIds() returning
      * additional items up to the limit if we were short due to deleted
diff --git a/classes/User.php b/classes/User.php
index 962714aa4d..970e167a3b 100644
--- a/classes/User.php
+++ b/classes/User.php
@@ -471,11 +471,21 @@ class User extends Memcached_DataObject
         return Inbox::streamNotices($this->id, $offset, $limit, $since_id, $before_id, false);
     }
 
+    function noticesWithFriendsThreaded($offset=0, $limit=NOTICES_PER_PAGE, $since_id=0, $before_id=0)
+    {
+        return Inbox::streamNoticesThreaded($this->id, $offset, $limit, $since_id, $before_id, false);
+    }
+
     function noticeInbox($offset=0, $limit=NOTICES_PER_PAGE, $since_id=0, $before_id=0)
     {
         return Inbox::streamNotices($this->id, $offset, $limit, $since_id, $before_id, true);
     }
 
+    function noticeInboxThreaded($offset=0, $limit=NOTICES_PER_PAGE, $since_id=0, $before_id=0)
+    {
+        return Inbox::streamNoticesThreaded($this->id, $offset, $limit, $since_id, $before_id, true);
+    }
+
     function friendsTimeline($offset=0, $limit=NOTICES_PER_PAGE, $since_id=0, $before_id=0)
     {
         return Inbox::streamNotices($this->id, $offset, $limit, $since_id, $before_id, false);

From c6521db620a63cfda0e717e558caf4ea221129a9 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Tue, 1 Mar 2011 15:24:44 -0800
Subject: [PATCH 359/655] Fix for timeline insert on primary AJAX post: only
 insert on the first, primary timeline. Don't insert on sub-timelines for
 replies!

---
 js/util.js     | 2 +-
 js/util.min.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/js/util.js b/js/util.js
index b78d5deca7..4868519228 100644
--- a/js/util.js
+++ b/js/util.js
@@ -450,7 +450,7 @@ var SN = { // StatusNet
                         else {
                             // New notice post was successful. If on our timeline, show it!
                             var notice = document._importNode($('li', data)[0], true);
-                            var notices = $('#notices_primary .notices');
+                            var notices = $('#notices_primary .notices:first');
                             if (notices.length > 0 && SN.U.belongsOnTimeline(notice)) {
                                 if ($('#'+notice.id).length === 0) {
                                     var notice_irt_value = $('#'+SN.C.S.NoticeInReplyTo).val();
diff --git a/js/util.min.js b/js/util.min.js
index 0ba253e6db..88736d1e8a 100644
--- a/js/util.min.js
+++ b/js/util.min.js
@@ -1 +1 @@
-var SN={C:{I:{CounterBlackout:false,MaxLength:140,PatternUsername:/^[0-9a-zA-Z\-_.]*$/,HTTP20x30x:[200,201,202,203,204,205,206,300,301,302,303,304,305,306,307]},S:{Disabled:"disabled",Warning:"warning",Error:"error",Success:"success",Processing:"processing",CommandResult:"command_result",FormNotice:"form_notice",NoticeDataText:"notice_data-text",NoticeTextCount:"notice_text-count",NoticeInReplyTo:"notice_in-reply-to",NoticeDataAttach:"notice_data-attach",NoticeDataAttachSelected:"notice_data-attach_selected",NoticeActionSubmit:"notice_action-submit",NoticeLat:"notice_data-lat",NoticeLon:"notice_data-lon",NoticeLocationId:"notice_data-location_id",NoticeLocationNs:"notice_data-location_ns",NoticeGeoName:"notice_data-geo_name",NoticeDataGeo:"notice_data-geo",NoticeDataGeoCookie:"NoticeDataGeo",NoticeDataGeoSelected:"notice_data-geo_selected",StatusNetInstance:"StatusNetInstance"}},messages:{},msg:function(a){if(typeof SN.messages[a]=="undefined"){return"["+a+"]"}else{return SN.messages[a]}},U:{FormNoticeEnhancements:function(b){if(jQuery.data(b[0],"ElementData")===undefined){MaxLength=b.find("#"+SN.C.S.NoticeTextCount).text();if(typeof(MaxLength)=="undefined"){MaxLength=SN.C.I.MaxLength}jQuery.data(b[0],"ElementData",{MaxLength:MaxLength});SN.U.Counter(b);NDT=b.find("#"+SN.C.S.NoticeDataText);NDT.bind("keyup",function(c){SN.U.Counter(b)});var a=function(c){window.setTimeout(function(){SN.U.Counter(b)},50)};NDT.bind("cut",a).bind("paste",a);NDT.bind("keydown",function(c){SN.U.SubmitOnReturn(c,b)})}else{b.find("#"+SN.C.S.NoticeTextCount).text(jQuery.data(b[0],"ElementData").MaxLength)}if($("body")[0].id!="conversation"&&window.location.hash.length===0&&$(window).scrollTop()==0){b.find("textarea").focus()}},SubmitOnReturn:function(b,a){if(b.keyCode==13||b.keyCode==10){a.submit();b.preventDefault();b.stopPropagation();$("#"+a[0].id+" #"+SN.C.S.NoticeDataText).blur();$("body").focus();return false}return true},Counter:function(d){SN.C.I.FormNoticeCurrent=d;var b=jQuery.data(d[0],"ElementData").MaxLength;if(b<=0){return}var c=b-SN.U.CharacterCount(d);var a=d.find("#"+SN.C.S.NoticeTextCount);if(c.toString()!=a.text()){if(!SN.C.I.CounterBlackout||c===0){if(a.text()!=String(c)){a.text(c)}if(c<0){d.addClass(SN.C.S.Warning)}else{d.removeClass(SN.C.S.Warning)}if(!SN.C.I.CounterBlackout){SN.C.I.CounterBlackout=true;SN.C.I.FormNoticeCurrent=d;window.setTimeout("SN.U.ClearCounterBlackout(SN.C.I.FormNoticeCurrent);",500)}}}},CharacterCount:function(a){return a.find("#"+SN.C.S.NoticeDataText).val().length},ClearCounterBlackout:function(a){SN.C.I.CounterBlackout=false;SN.U.Counter(a)},RewriteAjaxAction:function(a){if(document.location.protocol=="https:"&&a.substr(0,5)=="http:"){return a.replace(/^http:\/\/[^:\/]+/,"https://"+document.location.host)}else{return a}},FormXHR:function(a){$.ajax({type:"POST",dataType:"xml",url:SN.U.RewriteAjaxAction(a.attr("action")),data:a.serialize()+"&ajax=1",beforeSend:function(b){a.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(c,d,b){alert(b||d)},success:function(b,c){if(typeof($("form",b)[0])!="undefined"){form_new=document._importNode($("form",b)[0],true);a.replaceWith(form_new)}else{a.replaceWith(document._importNode($("p",b)[0],true))}}})},FormNoticeXHR:function(b){SN.C.I.NoticeDataGeo={};b.append('<input type="hidden" name="ajax" value="1"/>');b.attr("action",SN.U.RewriteAjaxAction(b.attr("action")));var c=function(d,e){b.append($('<p class="form_response"></p>').addClass(d).text(e))};var a=function(){b.find(".form_response").remove()};b.ajaxForm({dataType:"xml",timeout:"60000",beforeSend:function(d){if(b.find("#"+SN.C.S.NoticeDataText)[0].value.length===0){b.addClass(SN.C.S.Warning);return false}b.addClass(SN.C.S.Processing).find("#"+SN.C.S.NoticeActionSubmit).addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled);SN.C.I.NoticeDataGeo.NLat=$("#"+SN.C.S.NoticeLat).val();SN.C.I.NoticeDataGeo.NLon=$("#"+SN.C.S.NoticeLon).val();SN.C.I.NoticeDataGeo.NLNS=$("#"+SN.C.S.NoticeLocationNs).val();SN.C.I.NoticeDataGeo.NLID=$("#"+SN.C.S.NoticeLocationId).val();SN.C.I.NoticeDataGeo.NDG=$("#"+SN.C.S.NoticeDataGeo).attr("checked");cookieValue=$.cookie(SN.C.S.NoticeDataGeoCookie);if(cookieValue!==null&&cookieValue!="disabled"){cookieValue=JSON.parse(cookieValue);SN.C.I.NoticeDataGeo.NLat=$("#"+SN.C.S.NoticeLat).val(cookieValue.NLat).val();SN.C.I.NoticeDataGeo.NLon=$("#"+SN.C.S.NoticeLon).val(cookieValue.NLon).val();if($("#"+SN.C.S.NoticeLocationNs).val(cookieValue.NLNS)){SN.C.I.NoticeDataGeo.NLNS=$("#"+SN.C.S.NoticeLocationNs).val(cookieValue.NLNS).val();SN.C.I.NoticeDataGeo.NLID=$("#"+SN.C.S.NoticeLocationId).val(cookieValue.NLID).val()}}if(cookieValue=="disabled"){SN.C.I.NoticeDataGeo.NDG=$("#"+SN.C.S.NoticeDataGeo).attr("checked",false).attr("checked")}else{SN.C.I.NoticeDataGeo.NDG=$("#"+SN.C.S.NoticeDataGeo).attr("checked",true).attr("checked")}return true},error:function(f,g,e){b.removeClass(SN.C.S.Processing).find("#"+SN.C.S.NoticeActionSubmit).removeClass(SN.C.S.Disabled).removeAttr(SN.C.S.Disabled,SN.C.S.Disabled);a();if(g=="timeout"){c("error","Sorry! We had trouble sending your notice. The servers are overloaded. Please try again, and contact the site administrator if this problem persists.")}else{var d=SN.U.GetResponseXML(f);if($("."+SN.C.S.Error,d).length>0){b.append(document._importNode($("."+SN.C.S.Error,d)[0],true))}else{if(parseInt(f.status)===0||jQuery.inArray(parseInt(f.status),SN.C.I.HTTP20x30x)>=0){b.resetForm().find("#"+SN.C.S.NoticeDataAttachSelected).remove();SN.U.FormNoticeEnhancements(b)}else{c("error","(Sorry! We had trouble sending your notice ("+f.status+" "+f.statusText+"). Please report the problem to the site administrator if this happens again.")}}}},success:function(i,k){a();var e=$("#"+SN.C.S.Error,i);if(e.length>0){c("error",e.text())}else{if($("body")[0].id=="bookmarklet"){self.close()}var d=$("#"+SN.C.S.CommandResult,i);if(d.length>0){c("success",d.text())}else{var h=document._importNode($("li",i)[0],true);var j=$("#notices_primary .notices");if(j.length>0&&SN.U.belongsOnTimeline(h)){if($("#"+h.id).length===0){var f=$("#"+SN.C.S.NoticeInReplyTo).val();var g="#notices_primary #notice-"+f;if($("body")[0].id=="conversation"){if(f.length>0&&$(g+" .notices").length<1){$(g).append('<ul class="notices"></ul>')}$($(g+" .notices")[0]).append(h)}else{j.prepend(h)}$("#"+h.id).css({display:"none"}).fadeIn(2500);SN.U.NoticeWithAttachment($("#"+h.id));SN.U.NoticeReplyTo($("#"+h.id))}}else{c("success",$("title",i).text())}}b.resetForm();b.find("#"+SN.C.S.NoticeInReplyTo).val("");b.find("#"+SN.C.S.NoticeDataAttachSelected).remove();SN.U.FormNoticeEnhancements(b)}},complete:function(d,e){b.removeClass(SN.C.S.Processing).find("#"+SN.C.S.NoticeActionSubmit).removeAttr(SN.C.S.Disabled).removeClass(SN.C.S.Disabled);$("#"+SN.C.S.NoticeLat).val(SN.C.I.NoticeDataGeo.NLat);$("#"+SN.C.S.NoticeLon).val(SN.C.I.NoticeDataGeo.NLon);if($("#"+SN.C.S.NoticeLocationNs)){$("#"+SN.C.S.NoticeLocationNs).val(SN.C.I.NoticeDataGeo.NLNS);$("#"+SN.C.S.NoticeLocationId).val(SN.C.I.NoticeDataGeo.NLID)}$("#"+SN.C.S.NoticeDataGeo).attr("checked",SN.C.I.NoticeDataGeo.NDG)}})},GetResponseXML:function(b){try{return b.responseXML}catch(a){return(new DOMParser()).parseFromString(b.responseText,"text/xml")}},NoticeReply:function(){if($("#"+SN.C.S.NoticeDataText).length>0&&$("#content .notice_reply").length>0){$("#content .notice").each(function(){SN.U.NoticeReplyTo($(this))})}},NoticeReplyTo:function(a){a.find(".notice_reply").live("click",function(c){c.preventDefault();var b=($(".author .nickname",a).length>0)?$($(".author .nickname",a)[0]):$(".author .nickname.uid");SN.U.NoticeInlineReplyTrigger(a,"@"+b.text());return false})},NoticeInlineReplyTrigger:function(h,i){var c=$($(".notice_id",h)[0]).text();var d=h;var f=h.closest(".notices");if(f.hasClass("threaded-notices")){d=f.closest(".notice")}else{f=$("ul.threaded-notices",h);if(f.length==0){f=$('<ul class="notices threaded-notices xoxo"></ul>');h.append(f)}}var k=$(".notice-reply-form",f);if(k.length==0){$("li.notice-reply-placeholder").remove();var g=$("li.notice-reply",f);if(g.length==0){g=$('<li class="notice-reply"><form class="notice-reply-form" method="post"><textarea name="status_textarea"></textarea><div class="controls"><input type="hidden" name="token"><input type="hidden" name="inreplyto"><input type="submit" class="submit"></div></form></li>');var b=$("#form_notice");k=g.find("form");k.attr("action",b.attr("action"));k.find('input[name="token"]').val(b.find("input[name=token]").val());k.find('input[type="submit"]').val(SN.msg("reply_submit"));f.append(g);k.find("textarea").blur(function(){var m=$(this);var l=$.trim(m.val());if(l==""||l==m.data("initialText")){g.remove();if(f.find("li").length>0){SN.U.NoticeInlineReplyPlaceholder(d)}else{f.remove()}}});k.submit(function(m){var l=k;$.ajax({type:"POST",dataType:"xml",url:SN.U.RewriteAjaxAction(l.attr("action")),data:l.serialize()+"&ajax=1",beforeSend:function(n){l.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled).end().find("textarea").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(o,p,n){alert(n||p)},success:function(p,q){var o=$("li",p)[0];if(o){var n=document._importNode(o,true);g.replaceWith(n);SN.U.NoticeInlineReplyPlaceholder(d)}}});m.preventDefault();return false})}}k.find("input[name=inreplyto]").val(c);var j=k.find("textarea");if(j.length==0){throw"No textarea"}var a="";if(i){a=i+" "}j.val(a+j.val().replace(RegExp(a,"i"),""));j.data("initialText",$.trim(i+""));j.focus();if(j[0].setSelectionRange){var e=j.val().length;j[0].setSelectionRange(e,e)}},NoticeReplySet:function(b,d){if(b.match(SN.C.I.PatternUsername)){var c=$("#"+SN.C.S.NoticeDataText);if(c.length>0){replyto="@"+b+" ";c.val(replyto+c.val().replace(RegExp(replyto,"i"),""));$("#"+SN.C.S.FormNotice+" #"+SN.C.S.NoticeInReplyTo).val(d);c[0].focus();if(c[0].setSelectionRange){var a=c.val().length;c[0].setSelectionRange(a,a)}}}},NoticeFavor:function(){$(".form_favor").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_disfavor").live("click",function(){SN.U.FormXHR($(this));return false})},NoticeInlineReplyPlaceholder:function(b){var a=b.find("ul.threaded-notices");var c=$('<li class="notice-reply-placeholder"><input class="placeholder"></li>');c.click(function(){SN.U.NoticeInlineReplyTrigger(b)});c.find("input").val(SN.msg("reply_comment"));a.append(c)},NoticeInlineReplySetup:function(){$(".threaded-notices").each(function(){var b=$(this);var a=b.closest(".notice");SN.U.NoticeInlineReplyPlaceholder(a)})},NoticeRepeat:function(){$(".form_repeat").live("click",function(a){a.preventDefault();SN.U.NoticeRepeatConfirmation($(this));return false})},NoticeRepeatConfirmation:function(a){var c=a.find(".submit");var b=c.clone();b.addClass("submit_dialogbox").removeClass("submit");a.append(b);b.bind("click",function(){SN.U.FormXHR(a);return false});c.hide();a.addClass("dialogbox").append('<button class="close">&#215;</button>').closest(".notice-options").addClass("opaque");a.find("button.close").click(function(){$(this).remove();a.removeClass("dialogbox").closest(".notice-options").removeClass("opaque");a.find(".submit_dialogbox").remove();a.find(".submit").show();return false})},NoticeAttachments:function(){$(".notice a.attachment").each(function(){SN.U.NoticeWithAttachment($(this).closest(".notice"))})},NoticeWithAttachment:function(b){if(b.find(".attachment").length===0){return}var a=b.find(".attachment.more");if(a.length>0){$(a[0]).click(function(){var c=$(this);c.addClass(SN.C.S.Processing);$.get(c.attr("href")+"/ajax",null,function(d){c.parent(".entry-content").html($(d).find("#attachment_view .entry-content").html())});return false}).attr("title",SN.msg("showmore_tooltip"))}},NoticeDataAttach:function(){NDA=$("#"+SN.C.S.NoticeDataAttach);NDA.change(function(c){var a=$(this).val();if(!a){$("#"+SN.C.S.NoticeDataAttachSelected).remove();return false}S='<div id="'+SN.C.S.NoticeDataAttachSelected+'" class="'+SN.C.S.Success+'"><code>'+a+'</code> <button class="close">&#215;</button></div>';NDAS=$("#"+SN.C.S.NoticeDataAttachSelected);if(NDAS.length>0){NDAS.replaceWith(S)}else{$("#"+SN.C.S.FormNotice).append(S)}$("#"+SN.C.S.NoticeDataAttachSelected+" button").click(function(){$("#"+SN.C.S.NoticeDataAttachSelected).remove();NDA.val("");return false});if(typeof this.files=="object"){for(var b=0;b<this.files.length;b++){SN.U.PreviewAttach(this.files[b])}}})},maxFileSize:function(b){var a=$(b).find("input[name=MAX_FILE_SIZE]").attr("value");if(a){return parseInt(a)}else{return 0}},PreviewAttach:function(c){var d=c.type+" "+Math.round(c.size/1024)+"KB";var e=true;var g;if(typeof window.createObjectURL!="undefined"){g=function(h,i){i(window.createObjectURL(h))}}else{if(typeof window.FileReader!="undefined"){g=function(i,j){var h=new FileReader();h.onload=function(k){j(h.result)};h.readAsDataURL(i)}}else{e=false}}var a=["image/png","image/jpeg","image/gif","image/svg+xml"];if($.inArray(c.type,a)==-1){e=false}var f=8*1024*1024;if(c.size>f){e=false}if(e){g(c,function(i){var h=$("<img>").attr("title",d).attr("alt",d).attr("src",i).attr("style","height: 120px");$("#"+SN.C.S.NoticeDataAttachSelected).append(h)})}else{var b=$("<div></div>").text(d);$("#"+SN.C.S.NoticeDataAttachSelected).append(b)}},NoticeLocationAttach:function(){var c=$("#"+SN.C.S.NoticeLat).val();var h=$("#"+SN.C.S.NoticeLon).val();var d=$("#"+SN.C.S.NoticeLocationNs).val();var i=$("#"+SN.C.S.NoticeLocationId).val();var a=$("#"+SN.C.S.NoticeGeoName).text();var b=$("#"+SN.C.S.NoticeDataGeo);function e(){$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",jQuery.trim($("label[for="+SN.C.S.NoticeDataGeo+"]").text())).removeClass("checked");$("#"+SN.C.S.NoticeLat).val("");$("#"+SN.C.S.NoticeLon).val("");$("#"+SN.C.S.NoticeLocationNs).val("");$("#"+SN.C.S.NoticeLocationId).val("");$("#"+SN.C.S.NoticeDataGeo).attr("checked",false);$.cookie(SN.C.S.NoticeDataGeoCookie,"disabled",{path:"/"})}function j(k,l){$.getJSON(k,l,function(m){var n,o;if(typeof(m.location_ns)!="undefined"){$("#"+SN.C.S.NoticeLocationNs).val(m.location_ns);n=m.location_ns}if(typeof(m.location_id)!="undefined"){$("#"+SN.C.S.NoticeLocationId).val(m.location_id);o=m.location_id}if(typeof(m.name)=="undefined"){NLN_text=l.lat+";"+l.lon}else{NLN_text=m.name}$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",NoticeDataGeo_text.ShareDisable+" ("+NLN_text+")");$("#"+SN.C.S.NoticeLat).val(l.lat);$("#"+SN.C.S.NoticeLon).val(l.lon);$("#"+SN.C.S.NoticeLocationNs).val(n);$("#"+SN.C.S.NoticeLocationId).val(o);$("#"+SN.C.S.NoticeDataGeo).attr("checked",true);var p={NLat:l.lat,NLon:l.lon,NLNS:n,NLID:o,NLN:NLN_text,NLNU:m.url,NDG:true};$.cookie(SN.C.S.NoticeDataGeoCookie,JSON.stringify(p),{path:"/"})})}if(b.length>0){if($.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){b.attr("checked",false)}else{b.attr("checked",true)}var f=$("#notice_data-geo_wrap");var g=f.attr("title");f.removeAttr("title");$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",jQuery.trim($("label[for="+SN.C.S.NoticeDataGeo+"]").text()));b.change(function(){if($("#"+SN.C.S.NoticeDataGeo).attr("checked")===true||$.cookie(SN.C.S.NoticeDataGeoCookie)===null){$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",NoticeDataGeo_text.ShareDisable).addClass("checked");if($.cookie(SN.C.S.NoticeDataGeoCookie)===null||$.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){if(navigator.geolocation){navigator.geolocation.getCurrentPosition(function(m){$("#"+SN.C.S.NoticeLat).val(m.coords.latitude);$("#"+SN.C.S.NoticeLon).val(m.coords.longitude);var n={lat:m.coords.latitude,lon:m.coords.longitude,token:$("#token").val()};j(g,n)},function(m){switch(m.code){case m.PERMISSION_DENIED:e();break;case m.TIMEOUT:$("#"+SN.C.S.NoticeDataGeo).attr("checked",false);break}},{timeout:10000})}else{if(c.length>0&&h.length>0){var k={lat:c,lon:h,token:$("#token").val()};j(g,k)}else{e();$("#"+SN.C.S.NoticeDataGeo).remove();$("label[for="+SN.C.S.NoticeDataGeo+"]").remove()}}}else{var l=JSON.parse($.cookie(SN.C.S.NoticeDataGeoCookie));$("#"+SN.C.S.NoticeLat).val(l.NLat);$("#"+SN.C.S.NoticeLon).val(l.NLon);$("#"+SN.C.S.NoticeLocationNs).val(l.NLNS);$("#"+SN.C.S.NoticeLocationId).val(l.NLID);$("#"+SN.C.S.NoticeDataGeo).attr("checked",l.NDG);$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",NoticeDataGeo_text.ShareDisable+" ("+l.NLN+")").addClass("checked")}}else{e()}}).change()}},NewDirectMessage:function(){NDM=$(".entity_send-a-message a");NDM.attr({href:NDM.attr("href")+"&ajax=1"});NDM.bind("click",function(){var a=$(".entity_send-a-message form");if(a.length===0){$(this).addClass(SN.C.S.Processing);$.get(NDM.attr("href"),null,function(b){$(".entity_send-a-message").append(document._importNode($("form",b)[0],true));a=$(".entity_send-a-message .form_notice");SN.U.FormNoticeXHR(a);SN.U.FormNoticeEnhancements(a);a.append('<button class="close">&#215;</button>');$(".entity_send-a-message button").click(function(){a.hide();return false});NDM.removeClass(SN.C.S.Processing)})}else{a.show();$(".entity_send-a-message textarea").focus()}return false})},GetFullYear:function(c,d,a){var b=new Date();b.setFullYear(c,d,a);return b},StatusNetInstance:{Set:function(b){var a=SN.U.StatusNetInstance.Get();if(a!==null){b=$.extend(a,b)}$.cookie(SN.C.S.StatusNetInstance,JSON.stringify(b),{path:"/",expires:SN.U.GetFullYear(2029,0,1)})},Get:function(){var a=$.cookie(SN.C.S.StatusNetInstance);if(a!==null){return JSON.parse(a)}return null},Delete:function(){$.cookie(SN.C.S.StatusNetInstance,null)}},belongsOnTimeline:function(b){var a=$("body").attr("id");if(a=="public"){return true}var c=$("#nav_profile a").attr("href");if(c){var d=$(b).find(".entry-title .author a.url").attr("href");if(d==c){if(a=="all"||a=="showstream"){return true}}}return false}},Init:{NoticeForm:function(){if($("body.user_in").length>0){SN.U.NoticeLocationAttach();$("."+SN.C.S.FormNotice).each(function(){SN.U.FormNoticeXHR($(this));SN.U.FormNoticeEnhancements($(this))});SN.U.NoticeDataAttach()}},Notices:function(){if($("body.user_in").length>0){SN.U.NoticeFavor();SN.U.NoticeRepeat();SN.U.NoticeReply();SN.U.NoticeInlineReplySetup()}SN.U.NoticeAttachments()},EntityActions:function(){if($("body.user_in").length>0){$(".form_user_subscribe").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_user_unsubscribe").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_group_join").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_group_leave").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_user_nudge").live("click",function(){SN.U.FormXHR($(this));return false});SN.U.NewDirectMessage()}},Login:function(){if(SN.U.StatusNetInstance.Get()!==null){var a=SN.U.StatusNetInstance.Get().Nickname;if(a!==null){$("#form_login #nickname").val(a)}}$("#form_login").bind("submit",function(){SN.U.StatusNetInstance.Set({Nickname:$("#form_login #nickname").val()});return true})},UploadForms:function(){$("input[type=file]").change(function(d){if(typeof this.files=="object"&&this.files.length>0){var c=0;for(var b=0;b<this.files.length;b++){c+=this.files[b].size}var a=SN.U.maxFileSize($(this.form));if(a>0&&c>a){var e="File too large: maximum upload size is %d bytes.";alert(e.replace("%d",a));$(this).val("");d.preventDefault();return false}}})}}};$(document).ready(function(){SN.Init.UploadForms();if($("."+SN.C.S.FormNotice).length>0){SN.Init.NoticeForm()}if($("#content .notices").length>0){SN.Init.Notices()}if($("#content .entity_actions").length>0){SN.Init.EntityActions()}if($("#form_login").length>0){SN.Init.Login()}});if(!document.ELEMENT_NODE){document.ELEMENT_NODE=1;document.ATTRIBUTE_NODE=2;document.TEXT_NODE=3;document.CDATA_SECTION_NODE=4;document.ENTITY_REFERENCE_NODE=5;document.ENTITY_NODE=6;document.PROCESSING_INSTRUCTION_NODE=7;document.COMMENT_NODE=8;document.DOCUMENT_NODE=9;document.DOCUMENT_TYPE_NODE=10;document.DOCUMENT_FRAGMENT_NODE=11;document.NOTATION_NODE=12}document._importNode=function(e,a){switch(e.nodeType){case document.ELEMENT_NODE:var d=document.createElement(e.nodeName);if(e.attributes&&e.attributes.length>0){for(var c=0,b=e.attributes.length;c<b;){if(e.attributes[c].nodeName=="class"){d.className=e.getAttribute(e.attributes[c++].nodeName)}else{d.setAttribute(e.attributes[c].nodeName,e.getAttribute(e.attributes[c++].nodeName))}}}if(a&&e.childNodes&&e.childNodes.length>0){for(var c=0,b=e.childNodes.length;c<b;){d.appendChild(document._importNode(e.childNodes[c++],a))}}return d;break;case document.TEXT_NODE:case document.CDATA_SECTION_NODE:case document.COMMENT_NODE:return document.createTextNode(e.nodeValue);break}};if(typeof navigator.geolocation=="undefined"||navigator.geolocation.shim){(function(){(function(){if(window.google&&google.gears){return}var c=null;if(typeof GearsFactory!="undefined"){c=new GearsFactory()}else{try{c=new ActiveXObject("Gears.Factory");if(c.getBuildInfo().indexOf("ie_mobile")!=-1){c.privateSetGlobalObject(this)}}catch(d){if((typeof navigator.mimeTypes!="undefined")&&navigator.mimeTypes["application/x-googlegears"]){c=document.createElement("object");c.style.display="none";c.width=0;c.height=0;c.type="application/x-googlegears";document.documentElement.appendChild(c)}}}if(!c){return}if(!window.google){google={}}if(!google.gears){google.gears={factory:c}}})();var a=(function(){var d=google.gears.factory.create("beta.geolocation");var c=function(f,e){return function(g){f(g);e.lastPosition=g}};return{shim:true,type:"Gears",lastPosition:null,getCurrentPosition:function(e,g,h){var f=this;var i=c(e,f);d.getCurrentPosition(i,g,h)},watchPosition:function(e,f,g){d.watchPosition(e,f,g)},clearWatch:function(e){d.clearWatch(e)},getPermission:function(g,e,f){d.getPermission(g,e,f)}}});var b=(function(){var i=false;var e=function(){if(!d()&&!i){i=true;var j=document.createElement("script");j.src=(document.location.protocol=="https:"?"https://":"http://")+"www.google.com/jsapi?callback=_google_loader_apiLoaded";j.type="text/javascript";document.getElementsByTagName("body")[0].appendChild(j)}};var c=[];var h=function(j){c.push(j)};var f=function(){if(d()){while(c.length>0){var j=c.pop();j()}}};window._google_loader_apiLoaded=function(){f()};var d=function(){return(window.google&&google.loader)};var g=function(j){if(d()){return true}h(j);e();return false};e();return{shim:true,type:"ClientLocation",lastPosition:null,getCurrentPosition:function(k,n,o){var m=this;if(!g(function(){m.getCurrentPosition(k,n,o)})){return}if(google.loader.ClientLocation){var l=google.loader.ClientLocation;var j={coords:{latitude:l.latitude,longitude:l.longitude,altitude:null,accuracy:43000,altitudeAccuracy:null,heading:null,speed:null},address:{city:l.address.city,country:l.address.country,country_code:l.address.country_code,region:l.address.region},timestamp:new Date()};k(j);this.lastPosition=j}else{if(n==="function"){n({code:3,message:"Using the Google ClientLocation API and it is not able to calculate a location."})}}},watchPosition:function(j,l,m){this.getCurrentPosition(j,l,m);var k=this;var n=setInterval(function(){k.getCurrentPosition(j,l,m)},10000);return n},clearWatch:function(j){clearInterval(j)},getPermission:function(l,j,k){return true}}});navigator.geolocation=(window.google&&google.gears)?a():b()})()};
\ No newline at end of file
+var SN={C:{I:{CounterBlackout:false,MaxLength:140,PatternUsername:/^[0-9a-zA-Z\-_.]*$/,HTTP20x30x:[200,201,202,203,204,205,206,300,301,302,303,304,305,306,307]},S:{Disabled:"disabled",Warning:"warning",Error:"error",Success:"success",Processing:"processing",CommandResult:"command_result",FormNotice:"form_notice",NoticeDataText:"notice_data-text",NoticeTextCount:"notice_text-count",NoticeInReplyTo:"notice_in-reply-to",NoticeDataAttach:"notice_data-attach",NoticeDataAttachSelected:"notice_data-attach_selected",NoticeActionSubmit:"notice_action-submit",NoticeLat:"notice_data-lat",NoticeLon:"notice_data-lon",NoticeLocationId:"notice_data-location_id",NoticeLocationNs:"notice_data-location_ns",NoticeGeoName:"notice_data-geo_name",NoticeDataGeo:"notice_data-geo",NoticeDataGeoCookie:"NoticeDataGeo",NoticeDataGeoSelected:"notice_data-geo_selected",StatusNetInstance:"StatusNetInstance"}},messages:{},msg:function(a){if(typeof SN.messages[a]=="undefined"){return"["+a+"]"}else{return SN.messages[a]}},U:{FormNoticeEnhancements:function(b){if(jQuery.data(b[0],"ElementData")===undefined){MaxLength=b.find("#"+SN.C.S.NoticeTextCount).text();if(typeof(MaxLength)=="undefined"){MaxLength=SN.C.I.MaxLength}jQuery.data(b[0],"ElementData",{MaxLength:MaxLength});SN.U.Counter(b);NDT=b.find("#"+SN.C.S.NoticeDataText);NDT.bind("keyup",function(c){SN.U.Counter(b)});var a=function(c){window.setTimeout(function(){SN.U.Counter(b)},50)};NDT.bind("cut",a).bind("paste",a);NDT.bind("keydown",function(c){SN.U.SubmitOnReturn(c,b)})}else{b.find("#"+SN.C.S.NoticeTextCount).text(jQuery.data(b[0],"ElementData").MaxLength)}if($("body")[0].id!="conversation"&&window.location.hash.length===0&&$(window).scrollTop()==0){b.find("textarea").focus()}},SubmitOnReturn:function(b,a){if(b.keyCode==13||b.keyCode==10){a.submit();b.preventDefault();b.stopPropagation();$("#"+a[0].id+" #"+SN.C.S.NoticeDataText).blur();$("body").focus();return false}return true},Counter:function(d){SN.C.I.FormNoticeCurrent=d;var b=jQuery.data(d[0],"ElementData").MaxLength;if(b<=0){return}var c=b-SN.U.CharacterCount(d);var a=d.find("#"+SN.C.S.NoticeTextCount);if(c.toString()!=a.text()){if(!SN.C.I.CounterBlackout||c===0){if(a.text()!=String(c)){a.text(c)}if(c<0){d.addClass(SN.C.S.Warning)}else{d.removeClass(SN.C.S.Warning)}if(!SN.C.I.CounterBlackout){SN.C.I.CounterBlackout=true;SN.C.I.FormNoticeCurrent=d;window.setTimeout("SN.U.ClearCounterBlackout(SN.C.I.FormNoticeCurrent);",500)}}}},CharacterCount:function(a){return a.find("#"+SN.C.S.NoticeDataText).val().length},ClearCounterBlackout:function(a){SN.C.I.CounterBlackout=false;SN.U.Counter(a)},RewriteAjaxAction:function(a){if(document.location.protocol=="https:"&&a.substr(0,5)=="http:"){return a.replace(/^http:\/\/[^:\/]+/,"https://"+document.location.host)}else{return a}},FormXHR:function(a){$.ajax({type:"POST",dataType:"xml",url:SN.U.RewriteAjaxAction(a.attr("action")),data:a.serialize()+"&ajax=1",beforeSend:function(b){a.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(c,d,b){alert(b||d)},success:function(b,c){if(typeof($("form",b)[0])!="undefined"){form_new=document._importNode($("form",b)[0],true);a.replaceWith(form_new)}else{a.replaceWith(document._importNode($("p",b)[0],true))}}})},FormNoticeXHR:function(b){SN.C.I.NoticeDataGeo={};b.append('<input type="hidden" name="ajax" value="1"/>');b.attr("action",SN.U.RewriteAjaxAction(b.attr("action")));var c=function(d,e){b.append($('<p class="form_response"></p>').addClass(d).text(e))};var a=function(){b.find(".form_response").remove()};b.ajaxForm({dataType:"xml",timeout:"60000",beforeSend:function(d){if(b.find("#"+SN.C.S.NoticeDataText)[0].value.length===0){b.addClass(SN.C.S.Warning);return false}b.addClass(SN.C.S.Processing).find("#"+SN.C.S.NoticeActionSubmit).addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled);SN.C.I.NoticeDataGeo.NLat=$("#"+SN.C.S.NoticeLat).val();SN.C.I.NoticeDataGeo.NLon=$("#"+SN.C.S.NoticeLon).val();SN.C.I.NoticeDataGeo.NLNS=$("#"+SN.C.S.NoticeLocationNs).val();SN.C.I.NoticeDataGeo.NLID=$("#"+SN.C.S.NoticeLocationId).val();SN.C.I.NoticeDataGeo.NDG=$("#"+SN.C.S.NoticeDataGeo).attr("checked");cookieValue=$.cookie(SN.C.S.NoticeDataGeoCookie);if(cookieValue!==null&&cookieValue!="disabled"){cookieValue=JSON.parse(cookieValue);SN.C.I.NoticeDataGeo.NLat=$("#"+SN.C.S.NoticeLat).val(cookieValue.NLat).val();SN.C.I.NoticeDataGeo.NLon=$("#"+SN.C.S.NoticeLon).val(cookieValue.NLon).val();if($("#"+SN.C.S.NoticeLocationNs).val(cookieValue.NLNS)){SN.C.I.NoticeDataGeo.NLNS=$("#"+SN.C.S.NoticeLocationNs).val(cookieValue.NLNS).val();SN.C.I.NoticeDataGeo.NLID=$("#"+SN.C.S.NoticeLocationId).val(cookieValue.NLID).val()}}if(cookieValue=="disabled"){SN.C.I.NoticeDataGeo.NDG=$("#"+SN.C.S.NoticeDataGeo).attr("checked",false).attr("checked")}else{SN.C.I.NoticeDataGeo.NDG=$("#"+SN.C.S.NoticeDataGeo).attr("checked",true).attr("checked")}return true},error:function(f,g,e){b.removeClass(SN.C.S.Processing).find("#"+SN.C.S.NoticeActionSubmit).removeClass(SN.C.S.Disabled).removeAttr(SN.C.S.Disabled,SN.C.S.Disabled);a();if(g=="timeout"){c("error","Sorry! We had trouble sending your notice. The servers are overloaded. Please try again, and contact the site administrator if this problem persists.")}else{var d=SN.U.GetResponseXML(f);if($("."+SN.C.S.Error,d).length>0){b.append(document._importNode($("."+SN.C.S.Error,d)[0],true))}else{if(parseInt(f.status)===0||jQuery.inArray(parseInt(f.status),SN.C.I.HTTP20x30x)>=0){b.resetForm().find("#"+SN.C.S.NoticeDataAttachSelected).remove();SN.U.FormNoticeEnhancements(b)}else{c("error","(Sorry! We had trouble sending your notice ("+f.status+" "+f.statusText+"). Please report the problem to the site administrator if this happens again.")}}}},success:function(i,k){a();var e=$("#"+SN.C.S.Error,i);if(e.length>0){c("error",e.text())}else{if($("body")[0].id=="bookmarklet"){self.close()}var d=$("#"+SN.C.S.CommandResult,i);if(d.length>0){c("success",d.text())}else{var h=document._importNode($("li",i)[0],true);var j=$("#notices_primary .notices:first");if(j.length>0&&SN.U.belongsOnTimeline(h)){if($("#"+h.id).length===0){var f=$("#"+SN.C.S.NoticeInReplyTo).val();var g="#notices_primary #notice-"+f;if($("body")[0].id=="conversation"){if(f.length>0&&$(g+" .notices").length<1){$(g).append('<ul class="notices"></ul>')}$($(g+" .notices")[0]).append(h)}else{j.prepend(h)}$("#"+h.id).css({display:"none"}).fadeIn(2500);SN.U.NoticeWithAttachment($("#"+h.id));SN.U.NoticeReplyTo($("#"+h.id))}}else{c("success",$("title",i).text())}}b.resetForm();b.find("#"+SN.C.S.NoticeInReplyTo).val("");b.find("#"+SN.C.S.NoticeDataAttachSelected).remove();SN.U.FormNoticeEnhancements(b)}},complete:function(d,e){b.removeClass(SN.C.S.Processing).find("#"+SN.C.S.NoticeActionSubmit).removeAttr(SN.C.S.Disabled).removeClass(SN.C.S.Disabled);$("#"+SN.C.S.NoticeLat).val(SN.C.I.NoticeDataGeo.NLat);$("#"+SN.C.S.NoticeLon).val(SN.C.I.NoticeDataGeo.NLon);if($("#"+SN.C.S.NoticeLocationNs)){$("#"+SN.C.S.NoticeLocationNs).val(SN.C.I.NoticeDataGeo.NLNS);$("#"+SN.C.S.NoticeLocationId).val(SN.C.I.NoticeDataGeo.NLID)}$("#"+SN.C.S.NoticeDataGeo).attr("checked",SN.C.I.NoticeDataGeo.NDG)}})},GetResponseXML:function(b){try{return b.responseXML}catch(a){return(new DOMParser()).parseFromString(b.responseText,"text/xml")}},NoticeReply:function(){if($("#"+SN.C.S.NoticeDataText).length>0&&$("#content .notice_reply").length>0){$("#content .notice").each(function(){SN.U.NoticeReplyTo($(this))})}},NoticeReplyTo:function(a){a.find(".notice_reply").live("click",function(c){c.preventDefault();var b=($(".author .nickname",a).length>0)?$($(".author .nickname",a)[0]):$(".author .nickname.uid");SN.U.NoticeInlineReplyTrigger(a,"@"+b.text());return false})},NoticeInlineReplyTrigger:function(h,i){var c=$($(".notice_id",h)[0]).text();var d=h;var f=h.closest(".notices");if(f.hasClass("threaded-notices")){d=f.closest(".notice")}else{f=$("ul.threaded-notices",h);if(f.length==0){f=$('<ul class="notices threaded-notices xoxo"></ul>');h.append(f)}}var k=$(".notice-reply-form",f);if(k.length==0){$("li.notice-reply-placeholder").remove();var g=$("li.notice-reply",f);if(g.length==0){g=$('<li class="notice-reply"><form class="notice-reply-form" method="post"><textarea name="status_textarea"></textarea><div class="controls"><input type="hidden" name="token"><input type="hidden" name="inreplyto"><input type="submit" class="submit"></div></form></li>');var b=$("#form_notice");k=g.find("form");k.attr("action",b.attr("action"));k.find('input[name="token"]').val(b.find("input[name=token]").val());k.find('input[type="submit"]').val(SN.msg("reply_submit"));f.append(g);k.find("textarea").blur(function(){var m=$(this);var l=$.trim(m.val());if(l==""||l==m.data("initialText")){g.remove();if(f.find("li").length>0){SN.U.NoticeInlineReplyPlaceholder(d)}else{f.remove()}}});k.submit(function(m){var l=k;$.ajax({type:"POST",dataType:"xml",url:SN.U.RewriteAjaxAction(l.attr("action")),data:l.serialize()+"&ajax=1",beforeSend:function(n){l.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled).end().find("textarea").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(o,p,n){alert(n||p)},success:function(p,q){var o=$("li",p)[0];if(o){var n=document._importNode(o,true);g.replaceWith(n);SN.U.NoticeInlineReplyPlaceholder(d)}}});m.preventDefault();return false})}}k.find("input[name=inreplyto]").val(c);var j=k.find("textarea");if(j.length==0){throw"No textarea"}var a="";if(i){a=i+" "}j.val(a+j.val().replace(RegExp(a,"i"),""));j.data("initialText",$.trim(i+""));j.focus();if(j[0].setSelectionRange){var e=j.val().length;j[0].setSelectionRange(e,e)}},NoticeReplySet:function(b,d){if(b.match(SN.C.I.PatternUsername)){var c=$("#"+SN.C.S.NoticeDataText);if(c.length>0){replyto="@"+b+" ";c.val(replyto+c.val().replace(RegExp(replyto,"i"),""));$("#"+SN.C.S.FormNotice+" #"+SN.C.S.NoticeInReplyTo).val(d);c[0].focus();if(c[0].setSelectionRange){var a=c.val().length;c[0].setSelectionRange(a,a)}}}},NoticeFavor:function(){$(".form_favor").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_disfavor").live("click",function(){SN.U.FormXHR($(this));return false})},NoticeInlineReplyPlaceholder:function(b){var a=b.find("ul.threaded-notices");var c=$('<li class="notice-reply-placeholder"><input class="placeholder"></li>');c.click(function(){SN.U.NoticeInlineReplyTrigger(b)});c.find("input").val(SN.msg("reply_comment"));a.append(c)},NoticeInlineReplySetup:function(){$(".threaded-notices").each(function(){var b=$(this);var a=b.closest(".notice");SN.U.NoticeInlineReplyPlaceholder(a)})},NoticeRepeat:function(){$(".form_repeat").live("click",function(a){a.preventDefault();SN.U.NoticeRepeatConfirmation($(this));return false})},NoticeRepeatConfirmation:function(a){var c=a.find(".submit");var b=c.clone();b.addClass("submit_dialogbox").removeClass("submit");a.append(b);b.bind("click",function(){SN.U.FormXHR(a);return false});c.hide();a.addClass("dialogbox").append('<button class="close">&#215;</button>').closest(".notice-options").addClass("opaque");a.find("button.close").click(function(){$(this).remove();a.removeClass("dialogbox").closest(".notice-options").removeClass("opaque");a.find(".submit_dialogbox").remove();a.find(".submit").show();return false})},NoticeAttachments:function(){$(".notice a.attachment").each(function(){SN.U.NoticeWithAttachment($(this).closest(".notice"))})},NoticeWithAttachment:function(b){if(b.find(".attachment").length===0){return}var a=b.find(".attachment.more");if(a.length>0){$(a[0]).click(function(){var c=$(this);c.addClass(SN.C.S.Processing);$.get(c.attr("href")+"/ajax",null,function(d){c.parent(".entry-content").html($(d).find("#attachment_view .entry-content").html())});return false}).attr("title",SN.msg("showmore_tooltip"))}},NoticeDataAttach:function(){NDA=$("#"+SN.C.S.NoticeDataAttach);NDA.change(function(c){var a=$(this).val();if(!a){$("#"+SN.C.S.NoticeDataAttachSelected).remove();return false}S='<div id="'+SN.C.S.NoticeDataAttachSelected+'" class="'+SN.C.S.Success+'"><code>'+a+'</code> <button class="close">&#215;</button></div>';NDAS=$("#"+SN.C.S.NoticeDataAttachSelected);if(NDAS.length>0){NDAS.replaceWith(S)}else{$("#"+SN.C.S.FormNotice).append(S)}$("#"+SN.C.S.NoticeDataAttachSelected+" button").click(function(){$("#"+SN.C.S.NoticeDataAttachSelected).remove();NDA.val("");return false});if(typeof this.files=="object"){for(var b=0;b<this.files.length;b++){SN.U.PreviewAttach(this.files[b])}}})},maxFileSize:function(b){var a=$(b).find("input[name=MAX_FILE_SIZE]").attr("value");if(a){return parseInt(a)}else{return 0}},PreviewAttach:function(c){var d=c.type+" "+Math.round(c.size/1024)+"KB";var e=true;var g;if(typeof window.createObjectURL!="undefined"){g=function(h,i){i(window.createObjectURL(h))}}else{if(typeof window.FileReader!="undefined"){g=function(i,j){var h=new FileReader();h.onload=function(k){j(h.result)};h.readAsDataURL(i)}}else{e=false}}var a=["image/png","image/jpeg","image/gif","image/svg+xml"];if($.inArray(c.type,a)==-1){e=false}var f=8*1024*1024;if(c.size>f){e=false}if(e){g(c,function(i){var h=$("<img>").attr("title",d).attr("alt",d).attr("src",i).attr("style","height: 120px");$("#"+SN.C.S.NoticeDataAttachSelected).append(h)})}else{var b=$("<div></div>").text(d);$("#"+SN.C.S.NoticeDataAttachSelected).append(b)}},NoticeLocationAttach:function(){var c=$("#"+SN.C.S.NoticeLat).val();var h=$("#"+SN.C.S.NoticeLon).val();var d=$("#"+SN.C.S.NoticeLocationNs).val();var i=$("#"+SN.C.S.NoticeLocationId).val();var a=$("#"+SN.C.S.NoticeGeoName).text();var b=$("#"+SN.C.S.NoticeDataGeo);function e(){$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",jQuery.trim($("label[for="+SN.C.S.NoticeDataGeo+"]").text())).removeClass("checked");$("#"+SN.C.S.NoticeLat).val("");$("#"+SN.C.S.NoticeLon).val("");$("#"+SN.C.S.NoticeLocationNs).val("");$("#"+SN.C.S.NoticeLocationId).val("");$("#"+SN.C.S.NoticeDataGeo).attr("checked",false);$.cookie(SN.C.S.NoticeDataGeoCookie,"disabled",{path:"/"})}function j(k,l){$.getJSON(k,l,function(m){var n,o;if(typeof(m.location_ns)!="undefined"){$("#"+SN.C.S.NoticeLocationNs).val(m.location_ns);n=m.location_ns}if(typeof(m.location_id)!="undefined"){$("#"+SN.C.S.NoticeLocationId).val(m.location_id);o=m.location_id}if(typeof(m.name)=="undefined"){NLN_text=l.lat+";"+l.lon}else{NLN_text=m.name}$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",NoticeDataGeo_text.ShareDisable+" ("+NLN_text+")");$("#"+SN.C.S.NoticeLat).val(l.lat);$("#"+SN.C.S.NoticeLon).val(l.lon);$("#"+SN.C.S.NoticeLocationNs).val(n);$("#"+SN.C.S.NoticeLocationId).val(o);$("#"+SN.C.S.NoticeDataGeo).attr("checked",true);var p={NLat:l.lat,NLon:l.lon,NLNS:n,NLID:o,NLN:NLN_text,NLNU:m.url,NDG:true};$.cookie(SN.C.S.NoticeDataGeoCookie,JSON.stringify(p),{path:"/"})})}if(b.length>0){if($.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){b.attr("checked",false)}else{b.attr("checked",true)}var f=$("#notice_data-geo_wrap");var g=f.attr("title");f.removeAttr("title");$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",jQuery.trim($("label[for="+SN.C.S.NoticeDataGeo+"]").text()));b.change(function(){if($("#"+SN.C.S.NoticeDataGeo).attr("checked")===true||$.cookie(SN.C.S.NoticeDataGeoCookie)===null){$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",NoticeDataGeo_text.ShareDisable).addClass("checked");if($.cookie(SN.C.S.NoticeDataGeoCookie)===null||$.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){if(navigator.geolocation){navigator.geolocation.getCurrentPosition(function(m){$("#"+SN.C.S.NoticeLat).val(m.coords.latitude);$("#"+SN.C.S.NoticeLon).val(m.coords.longitude);var n={lat:m.coords.latitude,lon:m.coords.longitude,token:$("#token").val()};j(g,n)},function(m){switch(m.code){case m.PERMISSION_DENIED:e();break;case m.TIMEOUT:$("#"+SN.C.S.NoticeDataGeo).attr("checked",false);break}},{timeout:10000})}else{if(c.length>0&&h.length>0){var k={lat:c,lon:h,token:$("#token").val()};j(g,k)}else{e();$("#"+SN.C.S.NoticeDataGeo).remove();$("label[for="+SN.C.S.NoticeDataGeo+"]").remove()}}}else{var l=JSON.parse($.cookie(SN.C.S.NoticeDataGeoCookie));$("#"+SN.C.S.NoticeLat).val(l.NLat);$("#"+SN.C.S.NoticeLon).val(l.NLon);$("#"+SN.C.S.NoticeLocationNs).val(l.NLNS);$("#"+SN.C.S.NoticeLocationId).val(l.NLID);$("#"+SN.C.S.NoticeDataGeo).attr("checked",l.NDG);$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",NoticeDataGeo_text.ShareDisable+" ("+l.NLN+")").addClass("checked")}}else{e()}}).change()}},NewDirectMessage:function(){NDM=$(".entity_send-a-message a");NDM.attr({href:NDM.attr("href")+"&ajax=1"});NDM.bind("click",function(){var a=$(".entity_send-a-message form");if(a.length===0){$(this).addClass(SN.C.S.Processing);$.get(NDM.attr("href"),null,function(b){$(".entity_send-a-message").append(document._importNode($("form",b)[0],true));a=$(".entity_send-a-message .form_notice");SN.U.FormNoticeXHR(a);SN.U.FormNoticeEnhancements(a);a.append('<button class="close">&#215;</button>');$(".entity_send-a-message button").click(function(){a.hide();return false});NDM.removeClass(SN.C.S.Processing)})}else{a.show();$(".entity_send-a-message textarea").focus()}return false})},GetFullYear:function(c,d,a){var b=new Date();b.setFullYear(c,d,a);return b},StatusNetInstance:{Set:function(b){var a=SN.U.StatusNetInstance.Get();if(a!==null){b=$.extend(a,b)}$.cookie(SN.C.S.StatusNetInstance,JSON.stringify(b),{path:"/",expires:SN.U.GetFullYear(2029,0,1)})},Get:function(){var a=$.cookie(SN.C.S.StatusNetInstance);if(a!==null){return JSON.parse(a)}return null},Delete:function(){$.cookie(SN.C.S.StatusNetInstance,null)}},belongsOnTimeline:function(b){var a=$("body").attr("id");if(a=="public"){return true}var c=$("#nav_profile a").attr("href");if(c){var d=$(b).find(".entry-title .author a.url").attr("href");if(d==c){if(a=="all"||a=="showstream"){return true}}}return false}},Init:{NoticeForm:function(){if($("body.user_in").length>0){SN.U.NoticeLocationAttach();$("."+SN.C.S.FormNotice).each(function(){SN.U.FormNoticeXHR($(this));SN.U.FormNoticeEnhancements($(this))});SN.U.NoticeDataAttach()}},Notices:function(){if($("body.user_in").length>0){SN.U.NoticeFavor();SN.U.NoticeRepeat();SN.U.NoticeReply();SN.U.NoticeInlineReplySetup()}SN.U.NoticeAttachments()},EntityActions:function(){if($("body.user_in").length>0){$(".form_user_subscribe").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_user_unsubscribe").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_group_join").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_group_leave").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_user_nudge").live("click",function(){SN.U.FormXHR($(this));return false});SN.U.NewDirectMessage()}},Login:function(){if(SN.U.StatusNetInstance.Get()!==null){var a=SN.U.StatusNetInstance.Get().Nickname;if(a!==null){$("#form_login #nickname").val(a)}}$("#form_login").bind("submit",function(){SN.U.StatusNetInstance.Set({Nickname:$("#form_login #nickname").val()});return true})},UploadForms:function(){$("input[type=file]").change(function(d){if(typeof this.files=="object"&&this.files.length>0){var c=0;for(var b=0;b<this.files.length;b++){c+=this.files[b].size}var a=SN.U.maxFileSize($(this.form));if(a>0&&c>a){var e="File too large: maximum upload size is %d bytes.";alert(e.replace("%d",a));$(this).val("");d.preventDefault();return false}}})}}};$(document).ready(function(){SN.Init.UploadForms();if($("."+SN.C.S.FormNotice).length>0){SN.Init.NoticeForm()}if($("#content .notices").length>0){SN.Init.Notices()}if($("#content .entity_actions").length>0){SN.Init.EntityActions()}if($("#form_login").length>0){SN.Init.Login()}});if(!document.ELEMENT_NODE){document.ELEMENT_NODE=1;document.ATTRIBUTE_NODE=2;document.TEXT_NODE=3;document.CDATA_SECTION_NODE=4;document.ENTITY_REFERENCE_NODE=5;document.ENTITY_NODE=6;document.PROCESSING_INSTRUCTION_NODE=7;document.COMMENT_NODE=8;document.DOCUMENT_NODE=9;document.DOCUMENT_TYPE_NODE=10;document.DOCUMENT_FRAGMENT_NODE=11;document.NOTATION_NODE=12}document._importNode=function(e,a){switch(e.nodeType){case document.ELEMENT_NODE:var d=document.createElement(e.nodeName);if(e.attributes&&e.attributes.length>0){for(var c=0,b=e.attributes.length;c<b;){if(e.attributes[c].nodeName=="class"){d.className=e.getAttribute(e.attributes[c++].nodeName)}else{d.setAttribute(e.attributes[c].nodeName,e.getAttribute(e.attributes[c++].nodeName))}}}if(a&&e.childNodes&&e.childNodes.length>0){for(var c=0,b=e.childNodes.length;c<b;){d.appendChild(document._importNode(e.childNodes[c++],a))}}return d;break;case document.TEXT_NODE:case document.CDATA_SECTION_NODE:case document.COMMENT_NODE:return document.createTextNode(e.nodeValue);break}};if(typeof navigator.geolocation=="undefined"||navigator.geolocation.shim){(function(){(function(){if(window.google&&google.gears){return}var c=null;if(typeof GearsFactory!="undefined"){c=new GearsFactory()}else{try{c=new ActiveXObject("Gears.Factory");if(c.getBuildInfo().indexOf("ie_mobile")!=-1){c.privateSetGlobalObject(this)}}catch(d){if((typeof navigator.mimeTypes!="undefined")&&navigator.mimeTypes["application/x-googlegears"]){c=document.createElement("object");c.style.display="none";c.width=0;c.height=0;c.type="application/x-googlegears";document.documentElement.appendChild(c)}}}if(!c){return}if(!window.google){google={}}if(!google.gears){google.gears={factory:c}}})();var a=(function(){var d=google.gears.factory.create("beta.geolocation");var c=function(f,e){return function(g){f(g);e.lastPosition=g}};return{shim:true,type:"Gears",lastPosition:null,getCurrentPosition:function(e,g,h){var f=this;var i=c(e,f);d.getCurrentPosition(i,g,h)},watchPosition:function(e,f,g){d.watchPosition(e,f,g)},clearWatch:function(e){d.clearWatch(e)},getPermission:function(g,e,f){d.getPermission(g,e,f)}}});var b=(function(){var i=false;var e=function(){if(!d()&&!i){i=true;var j=document.createElement("script");j.src=(document.location.protocol=="https:"?"https://":"http://")+"www.google.com/jsapi?callback=_google_loader_apiLoaded";j.type="text/javascript";document.getElementsByTagName("body")[0].appendChild(j)}};var c=[];var h=function(j){c.push(j)};var f=function(){if(d()){while(c.length>0){var j=c.pop();j()}}};window._google_loader_apiLoaded=function(){f()};var d=function(){return(window.google&&google.loader)};var g=function(j){if(d()){return true}h(j);e();return false};e();return{shim:true,type:"ClientLocation",lastPosition:null,getCurrentPosition:function(k,n,o){var m=this;if(!g(function(){m.getCurrentPosition(k,n,o)})){return}if(google.loader.ClientLocation){var l=google.loader.ClientLocation;var j={coords:{latitude:l.latitude,longitude:l.longitude,altitude:null,accuracy:43000,altitudeAccuracy:null,heading:null,speed:null},address:{city:l.address.city,country:l.address.country,country_code:l.address.country_code,region:l.address.region},timestamp:new Date()};k(j);this.lastPosition=j}else{if(n==="function"){n({code:3,message:"Using the Google ClientLocation API and it is not able to calculate a location."})}}},watchPosition:function(j,l,m){this.getCurrentPosition(j,l,m);var k=this;var n=setInterval(function(){k.getCurrentPosition(j,l,m)},10000);return n},clearWatch:function(j){clearInterval(j)},getPermission:function(l,j,k){return true}}});navigator.geolocation=(window.google&&google.gears)?a():b()})()};
\ No newline at end of file

From 2fb81487881083034308e89da210fe630363b5bc Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Tue, 1 Mar 2011 15:25:06 -0800
Subject: [PATCH 360/655] Fix missing variable initialization

---
 actions/urlsettings.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/actions/urlsettings.php b/actions/urlsettings.php
index 807f9492c7..7661086aae 100644
--- a/actions/urlsettings.php
+++ b/actions/urlsettings.php
@@ -99,6 +99,8 @@ class UrlsettingsAction extends SettingsAction
         $this->hidden('token', common_session_token());
         $this->elementStart('ul', 'form_data');
 
+        $shorteners = array();
+
         Event::handle('GetUrlShorteners', array(&$shorteners));
 
         $services = array();

From 5bf0c9f610d2fe7852ffafbcd51436c9e057b0a7 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Tue, 1 Mar 2011 15:31:06 -0800
Subject: [PATCH 361/655] Fix mising require_once (now required here because of
 rearranging)

---
 actions/oauthconnectionssettings.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/actions/oauthconnectionssettings.php b/actions/oauthconnectionssettings.php
index b2e6f713a9..bcef773ac6 100644
--- a/actions/oauthconnectionssettings.php
+++ b/actions/oauthconnectionssettings.php
@@ -31,6 +31,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
+require_once INSTALLDIR . '/lib/applicationlist.php';
 require_once INSTALLDIR . '/lib/apioauthstore.php';
 
 /**

From dfbbeb67c8752452d74bae89a8c60fd2e0780554 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Tue, 1 Mar 2011 15:33:10 -0800
Subject: [PATCH 362/655] Makefile for Realtime's min.js

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

diff --git a/plugins/Realtime/Makefile b/plugins/Realtime/Makefile
new file mode 100644
index 0000000000..ebbe01dd3e
--- /dev/null
+++ b/plugins/Realtime/Makefile
@@ -0,0 +1,9 @@
+.fake: all clean
+
+all: realtimeupdate.min.js
+
+clean:
+	rm -f realtimeupdate.min.js
+
+realtimeupdate.min.js: realtimeupdate.js
+	yui-compressor realtimeupdate.js > realtimeupdate.min.js

From 5d6b9936c2444749f6e34854d9103364c5d8f33e Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Tue, 1 Mar 2011 15:45:44 -0800
Subject: [PATCH 363/655] Partial update of Realtime for threaded view; can now
 place replies into the proper subtimeline if it's already present, but not if
 it wasn't shown yet.

---
 plugins/Realtime/realtimeupdate.js     | 32 +++++++++++++++++++++++---
 plugins/Realtime/realtimeupdate.min.js |  2 +-
 2 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/plugins/Realtime/realtimeupdate.js b/plugins/Realtime/realtimeupdate.js
index 21938ee1d2..e83cb515d5 100644
--- a/plugins/Realtime/realtimeupdate.js
+++ b/plugins/Realtime/realtimeupdate.js
@@ -166,9 +166,35 @@ RealtimeUpdate = {
         var noticeItem = RealtimeUpdate.makeNoticeItem(data);
         var noticeItemID = $(noticeItem).attr('id');
 
-        $("#notices_primary .notices").prepend(noticeItem);
-        $("#notices_primary .notice:first").css({display:"none"});
-        $("#notices_primary .notice:first").fadeIn(1000);
+        var list = $("#notices_primary .notices:first")
+        var prepend = true;
+
+        var threaded = true;
+        if (threaded && data.in_reply_to_status_id) {
+            // aho!
+            var parent = $('#notice-' + data.in_reply_to_status_id);
+            if (parent.length > 0) {
+                list = parent.find('.threaded-notices');
+                if (list.length == 0) {
+                    list = $('<ul class="notices threaded-notices xoxo"></ul>');
+                    parent.append(list);
+                }
+                prepend = false;
+            }
+        }
+
+        var newNotice = $(noticeItem);
+        if (prepend) {
+            list.prepend(newNotice);
+        } else {
+            var placeholder = list.find('li.notice-reply-placeholder')
+            if (placeholder) {
+                newNotice.insertBefore(placeholder)
+            } else {
+                newNotice.appendTo(list);
+            }
+        }
+        newNotice.css({display:"none"}).fadeIn(1000);
 
         SN.U.NoticeReplyTo($('#'+noticeItemID));
         SN.U.NoticeWithAttachment($('#'+noticeItemID));
diff --git a/plugins/Realtime/realtimeupdate.min.js b/plugins/Realtime/realtimeupdate.min.js
index 60a4b446e8..8f61f67bb7 100644
--- a/plugins/Realtime/realtimeupdate.min.js
+++ b/plugins/Realtime/realtimeupdate.min.js
@@ -1 +1 @@
-RealtimeUpdate={_userid:0,_replyurl:"",_favorurl:"",_repeaturl:"",_deleteurl:"",_updatecounter:0,_maxnotices:50,_windowhasfocus:true,_documenttitle:"",_paused:false,_queuedNotices:[],init:function(c,b,d,e,a){RealtimeUpdate._userid=c;RealtimeUpdate._replyurl=b;RealtimeUpdate._favorurl=d;RealtimeUpdate._repeaturl=e;RealtimeUpdate._deleteurl=a;RealtimeUpdate._documenttitle=document.title;$(window).bind("focus",function(){RealtimeUpdate._windowhasfocus=true;RealtimeUpdate._updatecounter=0;RealtimeUpdate.removeWindowCounter()});$(window).bind("blur",function(){$("#notices_primary .notice").removeClass("mark-top");$("#notices_primary .notice:first").addClass("mark-top");RealtimeUpdate._windowhasfocus=false;return false})},receive:function(a){if(RealtimeUpdate.isNoticeVisible(a.id)){return}if(RealtimeUpdate._paused===false){RealtimeUpdate.purgeLastNoticeItem();RealtimeUpdate.insertNoticeItem(a)}else{RealtimeUpdate._queuedNotices.push(a);RealtimeUpdate.updateQueuedCounter()}RealtimeUpdate.updateWindowCounter()},insertNoticeItem:function(a){if(RealtimeUpdate.isNoticeVisible(a.id)){return}var b=RealtimeUpdate.makeNoticeItem(a);var c=$(b).attr("id");$("#notices_primary .notices").prepend(b);$("#notices_primary .notice:first").css({display:"none"});$("#notices_primary .notice:first").fadeIn(1000);SN.U.NoticeReplyTo($("#"+c));SN.U.NoticeWithAttachment($("#"+c))},isNoticeVisible:function(a){return($("#notice-"+a).length>0)},purgeLastNoticeItem:function(){if($("#notices_primary .notice").length>RealtimeUpdate._maxnotices){$("#notices_primary .notice:last").remove()}},updateWindowCounter:function(){if(RealtimeUpdate._windowhasfocus===false){RealtimeUpdate._updatecounter+=1;document.title="("+RealtimeUpdate._updatecounter+") "+RealtimeUpdate._documenttitle}},removeWindowCounter:function(){document.title=RealtimeUpdate._documenttitle},makeNoticeItem:function(c){if(c.hasOwnProperty("retweeted_status")){original=c.retweeted_status;repeat=c;c=original;unique=repeat.id;responsible=repeat.user}else{original=null;repeat=null;unique=c.id;responsible=c.user}user=c.user;html=c.html.replace(/&lt;/g,"<").replace(/&gt;/g,">").replace(/&quot;/g,'"').replace(/&amp;/g,"&");source=c.source.replace(/&lt;/g,"<").replace(/&gt;/g,">").replace(/&quot;/g,'"').replace(/&amp;/g,"&");ni='<li class="hentry notice" id="notice-'+unique+'"><div class="entry-title"><span class="vcard author"><a href="'+user.profile_url+'" class="url" title="'+user.name+'"><img src="'+user.profile_image_url+'" class="avatar photo" width="48" height="48" alt="'+user.screen_name+'"/><span class="nickname fn">'+user.screen_name+'</span></a></span><p class="entry-content">'+html+'</p></div><div class="entry-content"><a class="timestamp" rel="bookmark" href="'+c.url+'" ><abbr class="published" title="'+c.created_at+'">a few seconds ago</abbr></a> <span class="source">from <span class="device">'+source+"</span></span>";if(c.conversation_url){ni=ni+' <a class="response" href="'+c.conversation_url+'">in context</a>'}if(repeat){ru=repeat.user;ni=ni+'<span class="repeat vcard">Repeated by <a href="'+ru.profile_url+'" class="url"><span class="nickname">'+ru.screen_name+"</span></a></span>"}ni=ni+"</div>";ni=ni+'<div class="notice-options">';if(RealtimeUpdate._userid!=0){var a=$("form#form_notice fieldset input#token");var b=a.val();ni=ni+RealtimeUpdate.makeFavoriteForm(c.id,b);ni=ni+RealtimeUpdate.makeReplyLink(c.id,c.user["screen_name"]);if(RealtimeUpdate._userid==responsible.id){ni=ni+RealtimeUpdate.makeDeleteLink(c.id)}else{if(RealtimeUpdate._userid!=user.id){ni=ni+RealtimeUpdate.makeRepeatForm(c.id,b)}}}ni=ni+"</div>";ni=ni+"</li>";return ni},makeFavoriteForm:function(c,b){var a;a='<form id="favor-'+c+'" class="form_favor" method="post" action="'+RealtimeUpdate._favorurl+'"><fieldset><legend>Favor this notice</legend><input name="token-'+c+'" type="hidden" id="token-'+c+'" value="'+b+'"/><input name="notice" type="hidden" id="notice-n'+c+'" value="'+c+'"/><input type="submit" id="favor-submit-'+c+'" name="favor-submit-'+c+'" class="submit" value="Favor" title="Favor this notice"/></fieldset></form>';return a},makeReplyLink:function(c,a){var b;b='<a class="notice_reply" href="'+RealtimeUpdate._replyurl+"?replyto="+a+'" title="Reply to this notice">Reply <span class="notice_id">'+c+"</span></a>";return b},makeRepeatForm:function(c,b){var a;a='<form id="repeat-'+c+'" class="form_repeat" method="post" action="'+RealtimeUpdate._repeaturl+'"><fieldset><legend>Repeat this notice?</legend><input name="token-'+c+'" type="hidden" id="token-'+c+'" value="'+b+'"/><input name="notice" type="hidden" id="notice-'+c+'" value="'+c+'"/><input type="submit" id="repeat-submit-'+c+'" name="repeat-submit-'+c+'" class="submit" value="Yes" title="Repeat this notice"/></fieldset></form>';return a},makeDeleteLink:function(c){var b,a;a=RealtimeUpdate._deleteurl.replace("0000000000",c);b='<a class="notice_delete" href="'+a+'" title="Delete this notice">Delete</a>';return b},initActions:function(a,b,c){$("#notices_primary").prepend('<ul id="realtime_actions"><li id="realtime_playpause"></li><li id="realtime_timeline"></li></ul>');RealtimeUpdate._pluginPath=c;RealtimeUpdate.initPlayPause();RealtimeUpdate.initAddPopup(a,b,RealtimeUpdate._pluginPath)},initPlayPause:function(){if(typeof(localStorage)=="undefined"){RealtimeUpdate.showPause()}else{if(localStorage.getItem("RealtimeUpdate_paused")==="true"){RealtimeUpdate.showPlay()}else{RealtimeUpdate.showPause()}}},showPause:function(){RealtimeUpdate.setPause(false);RealtimeUpdate.showQueuedNotices();RealtimeUpdate.addNoticesHover();$("#realtime_playpause").remove();$("#realtime_actions").prepend('<li id="realtime_playpause"><button id="realtime_pause" class="pause"></button></li>');$("#realtime_pause").text(SN.msg("realtime_pause")).attr("title",SN.msg("realtime_pause_tooltip")).bind("click",function(){RealtimeUpdate.removeNoticesHover();RealtimeUpdate.showPlay();return false})},showPlay:function(){RealtimeUpdate.setPause(true);$("#realtime_playpause").remove();$("#realtime_actions").prepend('<li id="realtime_playpause"><span id="queued_counter"></span> <button id="realtime_play" class="play"></button></li>');$("#realtime_play").text(SN.msg("realtime_play")).attr("title",SN.msg("realtime_play_tooltip")).bind("click",function(){RealtimeUpdate.showPause();return false})},setPause:function(a){RealtimeUpdate._paused=a;if(typeof(localStorage)!="undefined"){localStorage.setItem("RealtimeUpdate_paused",RealtimeUpdate._paused)}},showQueuedNotices:function(){$.each(RealtimeUpdate._queuedNotices,function(a,b){RealtimeUpdate.insertNoticeItem(b)});RealtimeUpdate._queuedNotices=[];RealtimeUpdate.removeQueuedCounter()},updateQueuedCounter:function(){$("#realtime_playpause #queued_counter").html("("+RealtimeUpdate._queuedNotices.length+")")},removeQueuedCounter:function(){$("#realtime_playpause #queued_counter").empty()},addNoticesHover:function(){$("#notices_primary .notices").hover(function(){if(RealtimeUpdate._paused===false){RealtimeUpdate.showPlay()}},function(){if(RealtimeUpdate._paused===true){RealtimeUpdate.showPause()}})},removeNoticesHover:function(){$("#notices_primary .notices").unbind()},initAddPopup:function(a,b,c){$("#realtime_timeline").append('<button id="realtime_popup"></button>');$("#realtime_popup").text(SN.msg("realtime_popup")).attr("title",SN.msg("realtime_popup_tooltip")).bind("click",function(){window.open(a,"","toolbar=no,resizable=yes,scrollbars=yes,status=no,menubar=no,personalbar=no,location=no,width=500,height=550");return false})},initPopupWindow:function(){$(".notices .entry-title a, .notices .entry-content a").bind("click",function(){window.open(this.href,"");return false});$("#showstream .entity_profile").css({width:"69%"})}};
\ No newline at end of file
+RealtimeUpdate={_userid:0,_replyurl:"",_favorurl:"",_repeaturl:"",_deleteurl:"",_updatecounter:0,_maxnotices:50,_windowhasfocus:true,_documenttitle:"",_paused:false,_queuedNotices:[],init:function(c,b,d,e,a){RealtimeUpdate._userid=c;RealtimeUpdate._replyurl=b;RealtimeUpdate._favorurl=d;RealtimeUpdate._repeaturl=e;RealtimeUpdate._deleteurl=a;RealtimeUpdate._documenttitle=document.title;$(window).bind("focus",function(){RealtimeUpdate._windowhasfocus=true;RealtimeUpdate._updatecounter=0;RealtimeUpdate.removeWindowCounter()});$(window).bind("blur",function(){$("#notices_primary .notice").removeClass("mark-top");$("#notices_primary .notice:first").addClass("mark-top");RealtimeUpdate._windowhasfocus=false;return false})},receive:function(a){if(RealtimeUpdate.isNoticeVisible(a.id)){return}if(RealtimeUpdate._paused===false){RealtimeUpdate.purgeLastNoticeItem();RealtimeUpdate.insertNoticeItem(a)}else{RealtimeUpdate._queuedNotices.push(a);RealtimeUpdate.updateQueuedCounter()}RealtimeUpdate.updateWindowCounter()},insertNoticeItem:function(b){if(RealtimeUpdate.isNoticeVisible(b.id)){return}var a=RealtimeUpdate.makeNoticeItem(b);var c=$(a).attr("id");var d=$("#notices_primary .notices:first");var i=true;var e=true;if(e&&b.in_reply_to_status_id){var g=$("#notice-"+b.in_reply_to_status_id);if(g.length>0){d=g.find(".threaded-notices");if(d.length==0){d=$('<ul class="notices threaded-notices xoxo"></ul>');g.append(d)}i=false}}var h=$(a);if(i){d.prepend(h)}else{var f=d.find("li.notice-reply-placeholder");if(f){h.insertBefore(f)}else{h.appendTo(d)}}h.css({display:"none"}).fadeIn(1000);SN.U.NoticeReplyTo($("#"+c));SN.U.NoticeWithAttachment($("#"+c))},isNoticeVisible:function(a){return($("#notice-"+a).length>0)},purgeLastNoticeItem:function(){if($("#notices_primary .notice").length>RealtimeUpdate._maxnotices){$("#notices_primary .notice:last").remove()}},updateWindowCounter:function(){if(RealtimeUpdate._windowhasfocus===false){RealtimeUpdate._updatecounter+=1;document.title="("+RealtimeUpdate._updatecounter+") "+RealtimeUpdate._documenttitle}},removeWindowCounter:function(){document.title=RealtimeUpdate._documenttitle},makeNoticeItem:function(c){if(c.hasOwnProperty("retweeted_status")){original=c.retweeted_status;repeat=c;c=original;unique=repeat.id;responsible=repeat.user}else{original=null;repeat=null;unique=c.id;responsible=c.user}user=c.user;html=c.html.replace(/&lt;/g,"<").replace(/&gt;/g,">").replace(/&quot;/g,'"').replace(/&amp;/g,"&");source=c.source.replace(/&lt;/g,"<").replace(/&gt;/g,">").replace(/&quot;/g,'"').replace(/&amp;/g,"&");ni='<li class="hentry notice" id="notice-'+unique+'"><div class="entry-title"><span class="vcard author"><a href="'+user.profile_url+'" class="url" title="'+user.name+'"><img src="'+user.profile_image_url+'" class="avatar photo" width="48" height="48" alt="'+user.screen_name+'"/><span class="nickname fn">'+user.screen_name+'</span></a></span><p class="entry-content">'+html+'</p></div><div class="entry-content"><a class="timestamp" rel="bookmark" href="'+c.url+'" ><abbr class="published" title="'+c.created_at+'">a few seconds ago</abbr></a> <span class="source">from <span class="device">'+source+"</span></span>";if(c.conversation_url){ni=ni+' <a class="response" href="'+c.conversation_url+'">in context</a>'}if(repeat){ru=repeat.user;ni=ni+'<span class="repeat vcard">Repeated by <a href="'+ru.profile_url+'" class="url"><span class="nickname">'+ru.screen_name+"</span></a></span>"}ni=ni+"</div>";ni=ni+'<div class="notice-options">';if(RealtimeUpdate._userid!=0){var a=$("form#form_notice fieldset input#token");var b=a.val();ni=ni+RealtimeUpdate.makeFavoriteForm(c.id,b);ni=ni+RealtimeUpdate.makeReplyLink(c.id,c.user["screen_name"]);if(RealtimeUpdate._userid==responsible.id){ni=ni+RealtimeUpdate.makeDeleteLink(c.id)}else{if(RealtimeUpdate._userid!=user.id){ni=ni+RealtimeUpdate.makeRepeatForm(c.id,b)}}}ni=ni+"</div>";ni=ni+"</li>";return ni},makeFavoriteForm:function(c,b){var a;a='<form id="favor-'+c+'" class="form_favor" method="post" action="'+RealtimeUpdate._favorurl+'"><fieldset><legend>Favor this notice</legend><input name="token-'+c+'" type="hidden" id="token-'+c+'" value="'+b+'"/><input name="notice" type="hidden" id="notice-n'+c+'" value="'+c+'"/><input type="submit" id="favor-submit-'+c+'" name="favor-submit-'+c+'" class="submit" value="Favor" title="Favor this notice"/></fieldset></form>';return a},makeReplyLink:function(c,a){var b;b='<a class="notice_reply" href="'+RealtimeUpdate._replyurl+"?replyto="+a+'" title="Reply to this notice">Reply <span class="notice_id">'+c+"</span></a>";return b},makeRepeatForm:function(c,b){var a;a='<form id="repeat-'+c+'" class="form_repeat" method="post" action="'+RealtimeUpdate._repeaturl+'"><fieldset><legend>Repeat this notice?</legend><input name="token-'+c+'" type="hidden" id="token-'+c+'" value="'+b+'"/><input name="notice" type="hidden" id="notice-'+c+'" value="'+c+'"/><input type="submit" id="repeat-submit-'+c+'" name="repeat-submit-'+c+'" class="submit" value="Yes" title="Repeat this notice"/></fieldset></form>';return a},makeDeleteLink:function(c){var b,a;a=RealtimeUpdate._deleteurl.replace("0000000000",c);b='<a class="notice_delete" href="'+a+'" title="Delete this notice">Delete</a>';return b},initActions:function(a,b,c){$("#notices_primary").prepend('<ul id="realtime_actions"><li id="realtime_playpause"></li><li id="realtime_timeline"></li></ul>');RealtimeUpdate._pluginPath=c;RealtimeUpdate.initPlayPause();RealtimeUpdate.initAddPopup(a,b,RealtimeUpdate._pluginPath)},initPlayPause:function(){if(typeof(localStorage)=="undefined"){RealtimeUpdate.showPause()}else{if(localStorage.getItem("RealtimeUpdate_paused")==="true"){RealtimeUpdate.showPlay()}else{RealtimeUpdate.showPause()}}},showPause:function(){RealtimeUpdate.setPause(false);RealtimeUpdate.showQueuedNotices();RealtimeUpdate.addNoticesHover();$("#realtime_playpause").remove();$("#realtime_actions").prepend('<li id="realtime_playpause"><button id="realtime_pause" class="pause"></button></li>');$("#realtime_pause").text(SN.msg("realtime_pause")).attr("title",SN.msg("realtime_pause_tooltip")).bind("click",function(){RealtimeUpdate.removeNoticesHover();RealtimeUpdate.showPlay();return false})},showPlay:function(){RealtimeUpdate.setPause(true);$("#realtime_playpause").remove();$("#realtime_actions").prepend('<li id="realtime_playpause"><span id="queued_counter"></span> <button id="realtime_play" class="play"></button></li>');$("#realtime_play").text(SN.msg("realtime_play")).attr("title",SN.msg("realtime_play_tooltip")).bind("click",function(){RealtimeUpdate.showPause();return false})},setPause:function(a){RealtimeUpdate._paused=a;if(typeof(localStorage)!="undefined"){localStorage.setItem("RealtimeUpdate_paused",RealtimeUpdate._paused)}},showQueuedNotices:function(){$.each(RealtimeUpdate._queuedNotices,function(a,b){RealtimeUpdate.insertNoticeItem(b)});RealtimeUpdate._queuedNotices=[];RealtimeUpdate.removeQueuedCounter()},updateQueuedCounter:function(){$("#realtime_playpause #queued_counter").html("("+RealtimeUpdate._queuedNotices.length+")")},removeQueuedCounter:function(){$("#realtime_playpause #queued_counter").empty()},addNoticesHover:function(){$("#notices_primary .notices").hover(function(){if(RealtimeUpdate._paused===false){RealtimeUpdate.showPlay()}},function(){if(RealtimeUpdate._paused===true){RealtimeUpdate.showPause()}})},removeNoticesHover:function(){$("#notices_primary .notices").unbind()},initAddPopup:function(a,b,c){$("#realtime_timeline").append('<button id="realtime_popup"></button>');$("#realtime_popup").text(SN.msg("realtime_popup")).attr("title",SN.msg("realtime_popup_tooltip")).bind("click",function(){window.open(a,"","toolbar=no,resizable=yes,scrollbars=yes,status=no,menubar=no,personalbar=no,location=no,width=500,height=550");return false})},initPopupWindow:function(){$(".notices .entry-title a, .notices .entry-content a").bind("click",function(){window.open(this.href,"");return false});$("#showstream .entity_profile").css({width:"69%"})}};
\ No newline at end of file

From 9fd2ee86f34d5a3f6ac5a42fe2aa747ff32889e8 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Tue, 1 Mar 2011 16:04:11 -0800
Subject: [PATCH 364/655] Inline reply work for threaded lists in realtime

---
 js/util.js                             |  9 +++++++--
 js/util.min.js                         |  2 +-
 plugins/Realtime/realtimeupdate.js     | 13 +++++++++++--
 plugins/Realtime/realtimeupdate.min.js |  2 +-
 4 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/js/util.js b/js/util.js
index 4868519228..e64472b986 100644
--- a/js/util.js
+++ b/js/util.js
@@ -654,8 +654,13 @@ var SN = { // StatusNet
                                 var orig_li = $('li', data)[0];
                                 if (orig_li) {
                                     var li = document._importNode(orig_li, true);
-                                    replyItem.replaceWith(li);
-                                    SN.U.NoticeInlineReplyPlaceholder(parentNotice);
+                                    if ($("#notice-"+id).length == 0) {
+                                        replyItem.replaceWith(li);
+                                        SN.U.NoticeInlineReplyPlaceholder(parentNotice);
+                                    } else {
+                                        // Realtime came through before us...
+                                        replyItem.remove();
+                                    }
                                 }
                             }
                         });
diff --git a/js/util.min.js b/js/util.min.js
index 88736d1e8a..c47f3ba3db 100644
--- a/js/util.min.js
+++ b/js/util.min.js
@@ -1 +1 @@
-var SN={C:{I:{CounterBlackout:false,MaxLength:140,PatternUsername:/^[0-9a-zA-Z\-_.]*$/,HTTP20x30x:[200,201,202,203,204,205,206,300,301,302,303,304,305,306,307]},S:{Disabled:"disabled",Warning:"warning",Error:"error",Success:"success",Processing:"processing",CommandResult:"command_result",FormNotice:"form_notice",NoticeDataText:"notice_data-text",NoticeTextCount:"notice_text-count",NoticeInReplyTo:"notice_in-reply-to",NoticeDataAttach:"notice_data-attach",NoticeDataAttachSelected:"notice_data-attach_selected",NoticeActionSubmit:"notice_action-submit",NoticeLat:"notice_data-lat",NoticeLon:"notice_data-lon",NoticeLocationId:"notice_data-location_id",NoticeLocationNs:"notice_data-location_ns",NoticeGeoName:"notice_data-geo_name",NoticeDataGeo:"notice_data-geo",NoticeDataGeoCookie:"NoticeDataGeo",NoticeDataGeoSelected:"notice_data-geo_selected",StatusNetInstance:"StatusNetInstance"}},messages:{},msg:function(a){if(typeof SN.messages[a]=="undefined"){return"["+a+"]"}else{return SN.messages[a]}},U:{FormNoticeEnhancements:function(b){if(jQuery.data(b[0],"ElementData")===undefined){MaxLength=b.find("#"+SN.C.S.NoticeTextCount).text();if(typeof(MaxLength)=="undefined"){MaxLength=SN.C.I.MaxLength}jQuery.data(b[0],"ElementData",{MaxLength:MaxLength});SN.U.Counter(b);NDT=b.find("#"+SN.C.S.NoticeDataText);NDT.bind("keyup",function(c){SN.U.Counter(b)});var a=function(c){window.setTimeout(function(){SN.U.Counter(b)},50)};NDT.bind("cut",a).bind("paste",a);NDT.bind("keydown",function(c){SN.U.SubmitOnReturn(c,b)})}else{b.find("#"+SN.C.S.NoticeTextCount).text(jQuery.data(b[0],"ElementData").MaxLength)}if($("body")[0].id!="conversation"&&window.location.hash.length===0&&$(window).scrollTop()==0){b.find("textarea").focus()}},SubmitOnReturn:function(b,a){if(b.keyCode==13||b.keyCode==10){a.submit();b.preventDefault();b.stopPropagation();$("#"+a[0].id+" #"+SN.C.S.NoticeDataText).blur();$("body").focus();return false}return true},Counter:function(d){SN.C.I.FormNoticeCurrent=d;var b=jQuery.data(d[0],"ElementData").MaxLength;if(b<=0){return}var c=b-SN.U.CharacterCount(d);var a=d.find("#"+SN.C.S.NoticeTextCount);if(c.toString()!=a.text()){if(!SN.C.I.CounterBlackout||c===0){if(a.text()!=String(c)){a.text(c)}if(c<0){d.addClass(SN.C.S.Warning)}else{d.removeClass(SN.C.S.Warning)}if(!SN.C.I.CounterBlackout){SN.C.I.CounterBlackout=true;SN.C.I.FormNoticeCurrent=d;window.setTimeout("SN.U.ClearCounterBlackout(SN.C.I.FormNoticeCurrent);",500)}}}},CharacterCount:function(a){return a.find("#"+SN.C.S.NoticeDataText).val().length},ClearCounterBlackout:function(a){SN.C.I.CounterBlackout=false;SN.U.Counter(a)},RewriteAjaxAction:function(a){if(document.location.protocol=="https:"&&a.substr(0,5)=="http:"){return a.replace(/^http:\/\/[^:\/]+/,"https://"+document.location.host)}else{return a}},FormXHR:function(a){$.ajax({type:"POST",dataType:"xml",url:SN.U.RewriteAjaxAction(a.attr("action")),data:a.serialize()+"&ajax=1",beforeSend:function(b){a.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(c,d,b){alert(b||d)},success:function(b,c){if(typeof($("form",b)[0])!="undefined"){form_new=document._importNode($("form",b)[0],true);a.replaceWith(form_new)}else{a.replaceWith(document._importNode($("p",b)[0],true))}}})},FormNoticeXHR:function(b){SN.C.I.NoticeDataGeo={};b.append('<input type="hidden" name="ajax" value="1"/>');b.attr("action",SN.U.RewriteAjaxAction(b.attr("action")));var c=function(d,e){b.append($('<p class="form_response"></p>').addClass(d).text(e))};var a=function(){b.find(".form_response").remove()};b.ajaxForm({dataType:"xml",timeout:"60000",beforeSend:function(d){if(b.find("#"+SN.C.S.NoticeDataText)[0].value.length===0){b.addClass(SN.C.S.Warning);return false}b.addClass(SN.C.S.Processing).find("#"+SN.C.S.NoticeActionSubmit).addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled);SN.C.I.NoticeDataGeo.NLat=$("#"+SN.C.S.NoticeLat).val();SN.C.I.NoticeDataGeo.NLon=$("#"+SN.C.S.NoticeLon).val();SN.C.I.NoticeDataGeo.NLNS=$("#"+SN.C.S.NoticeLocationNs).val();SN.C.I.NoticeDataGeo.NLID=$("#"+SN.C.S.NoticeLocationId).val();SN.C.I.NoticeDataGeo.NDG=$("#"+SN.C.S.NoticeDataGeo).attr("checked");cookieValue=$.cookie(SN.C.S.NoticeDataGeoCookie);if(cookieValue!==null&&cookieValue!="disabled"){cookieValue=JSON.parse(cookieValue);SN.C.I.NoticeDataGeo.NLat=$("#"+SN.C.S.NoticeLat).val(cookieValue.NLat).val();SN.C.I.NoticeDataGeo.NLon=$("#"+SN.C.S.NoticeLon).val(cookieValue.NLon).val();if($("#"+SN.C.S.NoticeLocationNs).val(cookieValue.NLNS)){SN.C.I.NoticeDataGeo.NLNS=$("#"+SN.C.S.NoticeLocationNs).val(cookieValue.NLNS).val();SN.C.I.NoticeDataGeo.NLID=$("#"+SN.C.S.NoticeLocationId).val(cookieValue.NLID).val()}}if(cookieValue=="disabled"){SN.C.I.NoticeDataGeo.NDG=$("#"+SN.C.S.NoticeDataGeo).attr("checked",false).attr("checked")}else{SN.C.I.NoticeDataGeo.NDG=$("#"+SN.C.S.NoticeDataGeo).attr("checked",true).attr("checked")}return true},error:function(f,g,e){b.removeClass(SN.C.S.Processing).find("#"+SN.C.S.NoticeActionSubmit).removeClass(SN.C.S.Disabled).removeAttr(SN.C.S.Disabled,SN.C.S.Disabled);a();if(g=="timeout"){c("error","Sorry! We had trouble sending your notice. The servers are overloaded. Please try again, and contact the site administrator if this problem persists.")}else{var d=SN.U.GetResponseXML(f);if($("."+SN.C.S.Error,d).length>0){b.append(document._importNode($("."+SN.C.S.Error,d)[0],true))}else{if(parseInt(f.status)===0||jQuery.inArray(parseInt(f.status),SN.C.I.HTTP20x30x)>=0){b.resetForm().find("#"+SN.C.S.NoticeDataAttachSelected).remove();SN.U.FormNoticeEnhancements(b)}else{c("error","(Sorry! We had trouble sending your notice ("+f.status+" "+f.statusText+"). Please report the problem to the site administrator if this happens again.")}}}},success:function(i,k){a();var e=$("#"+SN.C.S.Error,i);if(e.length>0){c("error",e.text())}else{if($("body")[0].id=="bookmarklet"){self.close()}var d=$("#"+SN.C.S.CommandResult,i);if(d.length>0){c("success",d.text())}else{var h=document._importNode($("li",i)[0],true);var j=$("#notices_primary .notices:first");if(j.length>0&&SN.U.belongsOnTimeline(h)){if($("#"+h.id).length===0){var f=$("#"+SN.C.S.NoticeInReplyTo).val();var g="#notices_primary #notice-"+f;if($("body")[0].id=="conversation"){if(f.length>0&&$(g+" .notices").length<1){$(g).append('<ul class="notices"></ul>')}$($(g+" .notices")[0]).append(h)}else{j.prepend(h)}$("#"+h.id).css({display:"none"}).fadeIn(2500);SN.U.NoticeWithAttachment($("#"+h.id));SN.U.NoticeReplyTo($("#"+h.id))}}else{c("success",$("title",i).text())}}b.resetForm();b.find("#"+SN.C.S.NoticeInReplyTo).val("");b.find("#"+SN.C.S.NoticeDataAttachSelected).remove();SN.U.FormNoticeEnhancements(b)}},complete:function(d,e){b.removeClass(SN.C.S.Processing).find("#"+SN.C.S.NoticeActionSubmit).removeAttr(SN.C.S.Disabled).removeClass(SN.C.S.Disabled);$("#"+SN.C.S.NoticeLat).val(SN.C.I.NoticeDataGeo.NLat);$("#"+SN.C.S.NoticeLon).val(SN.C.I.NoticeDataGeo.NLon);if($("#"+SN.C.S.NoticeLocationNs)){$("#"+SN.C.S.NoticeLocationNs).val(SN.C.I.NoticeDataGeo.NLNS);$("#"+SN.C.S.NoticeLocationId).val(SN.C.I.NoticeDataGeo.NLID)}$("#"+SN.C.S.NoticeDataGeo).attr("checked",SN.C.I.NoticeDataGeo.NDG)}})},GetResponseXML:function(b){try{return b.responseXML}catch(a){return(new DOMParser()).parseFromString(b.responseText,"text/xml")}},NoticeReply:function(){if($("#"+SN.C.S.NoticeDataText).length>0&&$("#content .notice_reply").length>0){$("#content .notice").each(function(){SN.U.NoticeReplyTo($(this))})}},NoticeReplyTo:function(a){a.find(".notice_reply").live("click",function(c){c.preventDefault();var b=($(".author .nickname",a).length>0)?$($(".author .nickname",a)[0]):$(".author .nickname.uid");SN.U.NoticeInlineReplyTrigger(a,"@"+b.text());return false})},NoticeInlineReplyTrigger:function(h,i){var c=$($(".notice_id",h)[0]).text();var d=h;var f=h.closest(".notices");if(f.hasClass("threaded-notices")){d=f.closest(".notice")}else{f=$("ul.threaded-notices",h);if(f.length==0){f=$('<ul class="notices threaded-notices xoxo"></ul>');h.append(f)}}var k=$(".notice-reply-form",f);if(k.length==0){$("li.notice-reply-placeholder").remove();var g=$("li.notice-reply",f);if(g.length==0){g=$('<li class="notice-reply"><form class="notice-reply-form" method="post"><textarea name="status_textarea"></textarea><div class="controls"><input type="hidden" name="token"><input type="hidden" name="inreplyto"><input type="submit" class="submit"></div></form></li>');var b=$("#form_notice");k=g.find("form");k.attr("action",b.attr("action"));k.find('input[name="token"]').val(b.find("input[name=token]").val());k.find('input[type="submit"]').val(SN.msg("reply_submit"));f.append(g);k.find("textarea").blur(function(){var m=$(this);var l=$.trim(m.val());if(l==""||l==m.data("initialText")){g.remove();if(f.find("li").length>0){SN.U.NoticeInlineReplyPlaceholder(d)}else{f.remove()}}});k.submit(function(m){var l=k;$.ajax({type:"POST",dataType:"xml",url:SN.U.RewriteAjaxAction(l.attr("action")),data:l.serialize()+"&ajax=1",beforeSend:function(n){l.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled).end().find("textarea").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(o,p,n){alert(n||p)},success:function(p,q){var o=$("li",p)[0];if(o){var n=document._importNode(o,true);g.replaceWith(n);SN.U.NoticeInlineReplyPlaceholder(d)}}});m.preventDefault();return false})}}k.find("input[name=inreplyto]").val(c);var j=k.find("textarea");if(j.length==0){throw"No textarea"}var a="";if(i){a=i+" "}j.val(a+j.val().replace(RegExp(a,"i"),""));j.data("initialText",$.trim(i+""));j.focus();if(j[0].setSelectionRange){var e=j.val().length;j[0].setSelectionRange(e,e)}},NoticeReplySet:function(b,d){if(b.match(SN.C.I.PatternUsername)){var c=$("#"+SN.C.S.NoticeDataText);if(c.length>0){replyto="@"+b+" ";c.val(replyto+c.val().replace(RegExp(replyto,"i"),""));$("#"+SN.C.S.FormNotice+" #"+SN.C.S.NoticeInReplyTo).val(d);c[0].focus();if(c[0].setSelectionRange){var a=c.val().length;c[0].setSelectionRange(a,a)}}}},NoticeFavor:function(){$(".form_favor").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_disfavor").live("click",function(){SN.U.FormXHR($(this));return false})},NoticeInlineReplyPlaceholder:function(b){var a=b.find("ul.threaded-notices");var c=$('<li class="notice-reply-placeholder"><input class="placeholder"></li>');c.click(function(){SN.U.NoticeInlineReplyTrigger(b)});c.find("input").val(SN.msg("reply_comment"));a.append(c)},NoticeInlineReplySetup:function(){$(".threaded-notices").each(function(){var b=$(this);var a=b.closest(".notice");SN.U.NoticeInlineReplyPlaceholder(a)})},NoticeRepeat:function(){$(".form_repeat").live("click",function(a){a.preventDefault();SN.U.NoticeRepeatConfirmation($(this));return false})},NoticeRepeatConfirmation:function(a){var c=a.find(".submit");var b=c.clone();b.addClass("submit_dialogbox").removeClass("submit");a.append(b);b.bind("click",function(){SN.U.FormXHR(a);return false});c.hide();a.addClass("dialogbox").append('<button class="close">&#215;</button>').closest(".notice-options").addClass("opaque");a.find("button.close").click(function(){$(this).remove();a.removeClass("dialogbox").closest(".notice-options").removeClass("opaque");a.find(".submit_dialogbox").remove();a.find(".submit").show();return false})},NoticeAttachments:function(){$(".notice a.attachment").each(function(){SN.U.NoticeWithAttachment($(this).closest(".notice"))})},NoticeWithAttachment:function(b){if(b.find(".attachment").length===0){return}var a=b.find(".attachment.more");if(a.length>0){$(a[0]).click(function(){var c=$(this);c.addClass(SN.C.S.Processing);$.get(c.attr("href")+"/ajax",null,function(d){c.parent(".entry-content").html($(d).find("#attachment_view .entry-content").html())});return false}).attr("title",SN.msg("showmore_tooltip"))}},NoticeDataAttach:function(){NDA=$("#"+SN.C.S.NoticeDataAttach);NDA.change(function(c){var a=$(this).val();if(!a){$("#"+SN.C.S.NoticeDataAttachSelected).remove();return false}S='<div id="'+SN.C.S.NoticeDataAttachSelected+'" class="'+SN.C.S.Success+'"><code>'+a+'</code> <button class="close">&#215;</button></div>';NDAS=$("#"+SN.C.S.NoticeDataAttachSelected);if(NDAS.length>0){NDAS.replaceWith(S)}else{$("#"+SN.C.S.FormNotice).append(S)}$("#"+SN.C.S.NoticeDataAttachSelected+" button").click(function(){$("#"+SN.C.S.NoticeDataAttachSelected).remove();NDA.val("");return false});if(typeof this.files=="object"){for(var b=0;b<this.files.length;b++){SN.U.PreviewAttach(this.files[b])}}})},maxFileSize:function(b){var a=$(b).find("input[name=MAX_FILE_SIZE]").attr("value");if(a){return parseInt(a)}else{return 0}},PreviewAttach:function(c){var d=c.type+" "+Math.round(c.size/1024)+"KB";var e=true;var g;if(typeof window.createObjectURL!="undefined"){g=function(h,i){i(window.createObjectURL(h))}}else{if(typeof window.FileReader!="undefined"){g=function(i,j){var h=new FileReader();h.onload=function(k){j(h.result)};h.readAsDataURL(i)}}else{e=false}}var a=["image/png","image/jpeg","image/gif","image/svg+xml"];if($.inArray(c.type,a)==-1){e=false}var f=8*1024*1024;if(c.size>f){e=false}if(e){g(c,function(i){var h=$("<img>").attr("title",d).attr("alt",d).attr("src",i).attr("style","height: 120px");$("#"+SN.C.S.NoticeDataAttachSelected).append(h)})}else{var b=$("<div></div>").text(d);$("#"+SN.C.S.NoticeDataAttachSelected).append(b)}},NoticeLocationAttach:function(){var c=$("#"+SN.C.S.NoticeLat).val();var h=$("#"+SN.C.S.NoticeLon).val();var d=$("#"+SN.C.S.NoticeLocationNs).val();var i=$("#"+SN.C.S.NoticeLocationId).val();var a=$("#"+SN.C.S.NoticeGeoName).text();var b=$("#"+SN.C.S.NoticeDataGeo);function e(){$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",jQuery.trim($("label[for="+SN.C.S.NoticeDataGeo+"]").text())).removeClass("checked");$("#"+SN.C.S.NoticeLat).val("");$("#"+SN.C.S.NoticeLon).val("");$("#"+SN.C.S.NoticeLocationNs).val("");$("#"+SN.C.S.NoticeLocationId).val("");$("#"+SN.C.S.NoticeDataGeo).attr("checked",false);$.cookie(SN.C.S.NoticeDataGeoCookie,"disabled",{path:"/"})}function j(k,l){$.getJSON(k,l,function(m){var n,o;if(typeof(m.location_ns)!="undefined"){$("#"+SN.C.S.NoticeLocationNs).val(m.location_ns);n=m.location_ns}if(typeof(m.location_id)!="undefined"){$("#"+SN.C.S.NoticeLocationId).val(m.location_id);o=m.location_id}if(typeof(m.name)=="undefined"){NLN_text=l.lat+";"+l.lon}else{NLN_text=m.name}$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",NoticeDataGeo_text.ShareDisable+" ("+NLN_text+")");$("#"+SN.C.S.NoticeLat).val(l.lat);$("#"+SN.C.S.NoticeLon).val(l.lon);$("#"+SN.C.S.NoticeLocationNs).val(n);$("#"+SN.C.S.NoticeLocationId).val(o);$("#"+SN.C.S.NoticeDataGeo).attr("checked",true);var p={NLat:l.lat,NLon:l.lon,NLNS:n,NLID:o,NLN:NLN_text,NLNU:m.url,NDG:true};$.cookie(SN.C.S.NoticeDataGeoCookie,JSON.stringify(p),{path:"/"})})}if(b.length>0){if($.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){b.attr("checked",false)}else{b.attr("checked",true)}var f=$("#notice_data-geo_wrap");var g=f.attr("title");f.removeAttr("title");$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",jQuery.trim($("label[for="+SN.C.S.NoticeDataGeo+"]").text()));b.change(function(){if($("#"+SN.C.S.NoticeDataGeo).attr("checked")===true||$.cookie(SN.C.S.NoticeDataGeoCookie)===null){$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",NoticeDataGeo_text.ShareDisable).addClass("checked");if($.cookie(SN.C.S.NoticeDataGeoCookie)===null||$.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){if(navigator.geolocation){navigator.geolocation.getCurrentPosition(function(m){$("#"+SN.C.S.NoticeLat).val(m.coords.latitude);$("#"+SN.C.S.NoticeLon).val(m.coords.longitude);var n={lat:m.coords.latitude,lon:m.coords.longitude,token:$("#token").val()};j(g,n)},function(m){switch(m.code){case m.PERMISSION_DENIED:e();break;case m.TIMEOUT:$("#"+SN.C.S.NoticeDataGeo).attr("checked",false);break}},{timeout:10000})}else{if(c.length>0&&h.length>0){var k={lat:c,lon:h,token:$("#token").val()};j(g,k)}else{e();$("#"+SN.C.S.NoticeDataGeo).remove();$("label[for="+SN.C.S.NoticeDataGeo+"]").remove()}}}else{var l=JSON.parse($.cookie(SN.C.S.NoticeDataGeoCookie));$("#"+SN.C.S.NoticeLat).val(l.NLat);$("#"+SN.C.S.NoticeLon).val(l.NLon);$("#"+SN.C.S.NoticeLocationNs).val(l.NLNS);$("#"+SN.C.S.NoticeLocationId).val(l.NLID);$("#"+SN.C.S.NoticeDataGeo).attr("checked",l.NDG);$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",NoticeDataGeo_text.ShareDisable+" ("+l.NLN+")").addClass("checked")}}else{e()}}).change()}},NewDirectMessage:function(){NDM=$(".entity_send-a-message a");NDM.attr({href:NDM.attr("href")+"&ajax=1"});NDM.bind("click",function(){var a=$(".entity_send-a-message form");if(a.length===0){$(this).addClass(SN.C.S.Processing);$.get(NDM.attr("href"),null,function(b){$(".entity_send-a-message").append(document._importNode($("form",b)[0],true));a=$(".entity_send-a-message .form_notice");SN.U.FormNoticeXHR(a);SN.U.FormNoticeEnhancements(a);a.append('<button class="close">&#215;</button>');$(".entity_send-a-message button").click(function(){a.hide();return false});NDM.removeClass(SN.C.S.Processing)})}else{a.show();$(".entity_send-a-message textarea").focus()}return false})},GetFullYear:function(c,d,a){var b=new Date();b.setFullYear(c,d,a);return b},StatusNetInstance:{Set:function(b){var a=SN.U.StatusNetInstance.Get();if(a!==null){b=$.extend(a,b)}$.cookie(SN.C.S.StatusNetInstance,JSON.stringify(b),{path:"/",expires:SN.U.GetFullYear(2029,0,1)})},Get:function(){var a=$.cookie(SN.C.S.StatusNetInstance);if(a!==null){return JSON.parse(a)}return null},Delete:function(){$.cookie(SN.C.S.StatusNetInstance,null)}},belongsOnTimeline:function(b){var a=$("body").attr("id");if(a=="public"){return true}var c=$("#nav_profile a").attr("href");if(c){var d=$(b).find(".entry-title .author a.url").attr("href");if(d==c){if(a=="all"||a=="showstream"){return true}}}return false}},Init:{NoticeForm:function(){if($("body.user_in").length>0){SN.U.NoticeLocationAttach();$("."+SN.C.S.FormNotice).each(function(){SN.U.FormNoticeXHR($(this));SN.U.FormNoticeEnhancements($(this))});SN.U.NoticeDataAttach()}},Notices:function(){if($("body.user_in").length>0){SN.U.NoticeFavor();SN.U.NoticeRepeat();SN.U.NoticeReply();SN.U.NoticeInlineReplySetup()}SN.U.NoticeAttachments()},EntityActions:function(){if($("body.user_in").length>0){$(".form_user_subscribe").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_user_unsubscribe").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_group_join").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_group_leave").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_user_nudge").live("click",function(){SN.U.FormXHR($(this));return false});SN.U.NewDirectMessage()}},Login:function(){if(SN.U.StatusNetInstance.Get()!==null){var a=SN.U.StatusNetInstance.Get().Nickname;if(a!==null){$("#form_login #nickname").val(a)}}$("#form_login").bind("submit",function(){SN.U.StatusNetInstance.Set({Nickname:$("#form_login #nickname").val()});return true})},UploadForms:function(){$("input[type=file]").change(function(d){if(typeof this.files=="object"&&this.files.length>0){var c=0;for(var b=0;b<this.files.length;b++){c+=this.files[b].size}var a=SN.U.maxFileSize($(this.form));if(a>0&&c>a){var e="File too large: maximum upload size is %d bytes.";alert(e.replace("%d",a));$(this).val("");d.preventDefault();return false}}})}}};$(document).ready(function(){SN.Init.UploadForms();if($("."+SN.C.S.FormNotice).length>0){SN.Init.NoticeForm()}if($("#content .notices").length>0){SN.Init.Notices()}if($("#content .entity_actions").length>0){SN.Init.EntityActions()}if($("#form_login").length>0){SN.Init.Login()}});if(!document.ELEMENT_NODE){document.ELEMENT_NODE=1;document.ATTRIBUTE_NODE=2;document.TEXT_NODE=3;document.CDATA_SECTION_NODE=4;document.ENTITY_REFERENCE_NODE=5;document.ENTITY_NODE=6;document.PROCESSING_INSTRUCTION_NODE=7;document.COMMENT_NODE=8;document.DOCUMENT_NODE=9;document.DOCUMENT_TYPE_NODE=10;document.DOCUMENT_FRAGMENT_NODE=11;document.NOTATION_NODE=12}document._importNode=function(e,a){switch(e.nodeType){case document.ELEMENT_NODE:var d=document.createElement(e.nodeName);if(e.attributes&&e.attributes.length>0){for(var c=0,b=e.attributes.length;c<b;){if(e.attributes[c].nodeName=="class"){d.className=e.getAttribute(e.attributes[c++].nodeName)}else{d.setAttribute(e.attributes[c].nodeName,e.getAttribute(e.attributes[c++].nodeName))}}}if(a&&e.childNodes&&e.childNodes.length>0){for(var c=0,b=e.childNodes.length;c<b;){d.appendChild(document._importNode(e.childNodes[c++],a))}}return d;break;case document.TEXT_NODE:case document.CDATA_SECTION_NODE:case document.COMMENT_NODE:return document.createTextNode(e.nodeValue);break}};if(typeof navigator.geolocation=="undefined"||navigator.geolocation.shim){(function(){(function(){if(window.google&&google.gears){return}var c=null;if(typeof GearsFactory!="undefined"){c=new GearsFactory()}else{try{c=new ActiveXObject("Gears.Factory");if(c.getBuildInfo().indexOf("ie_mobile")!=-1){c.privateSetGlobalObject(this)}}catch(d){if((typeof navigator.mimeTypes!="undefined")&&navigator.mimeTypes["application/x-googlegears"]){c=document.createElement("object");c.style.display="none";c.width=0;c.height=0;c.type="application/x-googlegears";document.documentElement.appendChild(c)}}}if(!c){return}if(!window.google){google={}}if(!google.gears){google.gears={factory:c}}})();var a=(function(){var d=google.gears.factory.create("beta.geolocation");var c=function(f,e){return function(g){f(g);e.lastPosition=g}};return{shim:true,type:"Gears",lastPosition:null,getCurrentPosition:function(e,g,h){var f=this;var i=c(e,f);d.getCurrentPosition(i,g,h)},watchPosition:function(e,f,g){d.watchPosition(e,f,g)},clearWatch:function(e){d.clearWatch(e)},getPermission:function(g,e,f){d.getPermission(g,e,f)}}});var b=(function(){var i=false;var e=function(){if(!d()&&!i){i=true;var j=document.createElement("script");j.src=(document.location.protocol=="https:"?"https://":"http://")+"www.google.com/jsapi?callback=_google_loader_apiLoaded";j.type="text/javascript";document.getElementsByTagName("body")[0].appendChild(j)}};var c=[];var h=function(j){c.push(j)};var f=function(){if(d()){while(c.length>0){var j=c.pop();j()}}};window._google_loader_apiLoaded=function(){f()};var d=function(){return(window.google&&google.loader)};var g=function(j){if(d()){return true}h(j);e();return false};e();return{shim:true,type:"ClientLocation",lastPosition:null,getCurrentPosition:function(k,n,o){var m=this;if(!g(function(){m.getCurrentPosition(k,n,o)})){return}if(google.loader.ClientLocation){var l=google.loader.ClientLocation;var j={coords:{latitude:l.latitude,longitude:l.longitude,altitude:null,accuracy:43000,altitudeAccuracy:null,heading:null,speed:null},address:{city:l.address.city,country:l.address.country,country_code:l.address.country_code,region:l.address.region},timestamp:new Date()};k(j);this.lastPosition=j}else{if(n==="function"){n({code:3,message:"Using the Google ClientLocation API and it is not able to calculate a location."})}}},watchPosition:function(j,l,m){this.getCurrentPosition(j,l,m);var k=this;var n=setInterval(function(){k.getCurrentPosition(j,l,m)},10000);return n},clearWatch:function(j){clearInterval(j)},getPermission:function(l,j,k){return true}}});navigator.geolocation=(window.google&&google.gears)?a():b()})()};
\ No newline at end of file
+var SN={C:{I:{CounterBlackout:false,MaxLength:140,PatternUsername:/^[0-9a-zA-Z\-_.]*$/,HTTP20x30x:[200,201,202,203,204,205,206,300,301,302,303,304,305,306,307]},S:{Disabled:"disabled",Warning:"warning",Error:"error",Success:"success",Processing:"processing",CommandResult:"command_result",FormNotice:"form_notice",NoticeDataText:"notice_data-text",NoticeTextCount:"notice_text-count",NoticeInReplyTo:"notice_in-reply-to",NoticeDataAttach:"notice_data-attach",NoticeDataAttachSelected:"notice_data-attach_selected",NoticeActionSubmit:"notice_action-submit",NoticeLat:"notice_data-lat",NoticeLon:"notice_data-lon",NoticeLocationId:"notice_data-location_id",NoticeLocationNs:"notice_data-location_ns",NoticeGeoName:"notice_data-geo_name",NoticeDataGeo:"notice_data-geo",NoticeDataGeoCookie:"NoticeDataGeo",NoticeDataGeoSelected:"notice_data-geo_selected",StatusNetInstance:"StatusNetInstance"}},messages:{},msg:function(a){if(typeof SN.messages[a]=="undefined"){return"["+a+"]"}else{return SN.messages[a]}},U:{FormNoticeEnhancements:function(b){if(jQuery.data(b[0],"ElementData")===undefined){MaxLength=b.find("#"+SN.C.S.NoticeTextCount).text();if(typeof(MaxLength)=="undefined"){MaxLength=SN.C.I.MaxLength}jQuery.data(b[0],"ElementData",{MaxLength:MaxLength});SN.U.Counter(b);NDT=b.find("#"+SN.C.S.NoticeDataText);NDT.bind("keyup",function(c){SN.U.Counter(b)});var a=function(c){window.setTimeout(function(){SN.U.Counter(b)},50)};NDT.bind("cut",a).bind("paste",a);NDT.bind("keydown",function(c){SN.U.SubmitOnReturn(c,b)})}else{b.find("#"+SN.C.S.NoticeTextCount).text(jQuery.data(b[0],"ElementData").MaxLength)}if($("body")[0].id!="conversation"&&window.location.hash.length===0&&$(window).scrollTop()==0){b.find("textarea").focus()}},SubmitOnReturn:function(b,a){if(b.keyCode==13||b.keyCode==10){a.submit();b.preventDefault();b.stopPropagation();$("#"+a[0].id+" #"+SN.C.S.NoticeDataText).blur();$("body").focus();return false}return true},Counter:function(d){SN.C.I.FormNoticeCurrent=d;var b=jQuery.data(d[0],"ElementData").MaxLength;if(b<=0){return}var c=b-SN.U.CharacterCount(d);var a=d.find("#"+SN.C.S.NoticeTextCount);if(c.toString()!=a.text()){if(!SN.C.I.CounterBlackout||c===0){if(a.text()!=String(c)){a.text(c)}if(c<0){d.addClass(SN.C.S.Warning)}else{d.removeClass(SN.C.S.Warning)}if(!SN.C.I.CounterBlackout){SN.C.I.CounterBlackout=true;SN.C.I.FormNoticeCurrent=d;window.setTimeout("SN.U.ClearCounterBlackout(SN.C.I.FormNoticeCurrent);",500)}}}},CharacterCount:function(a){return a.find("#"+SN.C.S.NoticeDataText).val().length},ClearCounterBlackout:function(a){SN.C.I.CounterBlackout=false;SN.U.Counter(a)},RewriteAjaxAction:function(a){if(document.location.protocol=="https:"&&a.substr(0,5)=="http:"){return a.replace(/^http:\/\/[^:\/]+/,"https://"+document.location.host)}else{return a}},FormXHR:function(a){$.ajax({type:"POST",dataType:"xml",url:SN.U.RewriteAjaxAction(a.attr("action")),data:a.serialize()+"&ajax=1",beforeSend:function(b){a.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(c,d,b){alert(b||d)},success:function(b,c){if(typeof($("form",b)[0])!="undefined"){form_new=document._importNode($("form",b)[0],true);a.replaceWith(form_new)}else{a.replaceWith(document._importNode($("p",b)[0],true))}}})},FormNoticeXHR:function(b){SN.C.I.NoticeDataGeo={};b.append('<input type="hidden" name="ajax" value="1"/>');b.attr("action",SN.U.RewriteAjaxAction(b.attr("action")));var c=function(d,e){b.append($('<p class="form_response"></p>').addClass(d).text(e))};var a=function(){b.find(".form_response").remove()};b.ajaxForm({dataType:"xml",timeout:"60000",beforeSend:function(d){if(b.find("#"+SN.C.S.NoticeDataText)[0].value.length===0){b.addClass(SN.C.S.Warning);return false}b.addClass(SN.C.S.Processing).find("#"+SN.C.S.NoticeActionSubmit).addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled);SN.C.I.NoticeDataGeo.NLat=$("#"+SN.C.S.NoticeLat).val();SN.C.I.NoticeDataGeo.NLon=$("#"+SN.C.S.NoticeLon).val();SN.C.I.NoticeDataGeo.NLNS=$("#"+SN.C.S.NoticeLocationNs).val();SN.C.I.NoticeDataGeo.NLID=$("#"+SN.C.S.NoticeLocationId).val();SN.C.I.NoticeDataGeo.NDG=$("#"+SN.C.S.NoticeDataGeo).attr("checked");cookieValue=$.cookie(SN.C.S.NoticeDataGeoCookie);if(cookieValue!==null&&cookieValue!="disabled"){cookieValue=JSON.parse(cookieValue);SN.C.I.NoticeDataGeo.NLat=$("#"+SN.C.S.NoticeLat).val(cookieValue.NLat).val();SN.C.I.NoticeDataGeo.NLon=$("#"+SN.C.S.NoticeLon).val(cookieValue.NLon).val();if($("#"+SN.C.S.NoticeLocationNs).val(cookieValue.NLNS)){SN.C.I.NoticeDataGeo.NLNS=$("#"+SN.C.S.NoticeLocationNs).val(cookieValue.NLNS).val();SN.C.I.NoticeDataGeo.NLID=$("#"+SN.C.S.NoticeLocationId).val(cookieValue.NLID).val()}}if(cookieValue=="disabled"){SN.C.I.NoticeDataGeo.NDG=$("#"+SN.C.S.NoticeDataGeo).attr("checked",false).attr("checked")}else{SN.C.I.NoticeDataGeo.NDG=$("#"+SN.C.S.NoticeDataGeo).attr("checked",true).attr("checked")}return true},error:function(f,g,e){b.removeClass(SN.C.S.Processing).find("#"+SN.C.S.NoticeActionSubmit).removeClass(SN.C.S.Disabled).removeAttr(SN.C.S.Disabled,SN.C.S.Disabled);a();if(g=="timeout"){c("error","Sorry! We had trouble sending your notice. The servers are overloaded. Please try again, and contact the site administrator if this problem persists.")}else{var d=SN.U.GetResponseXML(f);if($("."+SN.C.S.Error,d).length>0){b.append(document._importNode($("."+SN.C.S.Error,d)[0],true))}else{if(parseInt(f.status)===0||jQuery.inArray(parseInt(f.status),SN.C.I.HTTP20x30x)>=0){b.resetForm().find("#"+SN.C.S.NoticeDataAttachSelected).remove();SN.U.FormNoticeEnhancements(b)}else{c("error","(Sorry! We had trouble sending your notice ("+f.status+" "+f.statusText+"). Please report the problem to the site administrator if this happens again.")}}}},success:function(i,k){a();var e=$("#"+SN.C.S.Error,i);if(e.length>0){c("error",e.text())}else{if($("body")[0].id=="bookmarklet"){self.close()}var d=$("#"+SN.C.S.CommandResult,i);if(d.length>0){c("success",d.text())}else{var h=document._importNode($("li",i)[0],true);var j=$("#notices_primary .notices:first");if(j.length>0&&SN.U.belongsOnTimeline(h)){if($("#"+h.id).length===0){var f=$("#"+SN.C.S.NoticeInReplyTo).val();var g="#notices_primary #notice-"+f;if($("body")[0].id=="conversation"){if(f.length>0&&$(g+" .notices").length<1){$(g).append('<ul class="notices"></ul>')}$($(g+" .notices")[0]).append(h)}else{j.prepend(h)}$("#"+h.id).css({display:"none"}).fadeIn(2500);SN.U.NoticeWithAttachment($("#"+h.id));SN.U.NoticeReplyTo($("#"+h.id))}}else{c("success",$("title",i).text())}}b.resetForm();b.find("#"+SN.C.S.NoticeInReplyTo).val("");b.find("#"+SN.C.S.NoticeDataAttachSelected).remove();SN.U.FormNoticeEnhancements(b)}},complete:function(d,e){b.removeClass(SN.C.S.Processing).find("#"+SN.C.S.NoticeActionSubmit).removeAttr(SN.C.S.Disabled).removeClass(SN.C.S.Disabled);$("#"+SN.C.S.NoticeLat).val(SN.C.I.NoticeDataGeo.NLat);$("#"+SN.C.S.NoticeLon).val(SN.C.I.NoticeDataGeo.NLon);if($("#"+SN.C.S.NoticeLocationNs)){$("#"+SN.C.S.NoticeLocationNs).val(SN.C.I.NoticeDataGeo.NLNS);$("#"+SN.C.S.NoticeLocationId).val(SN.C.I.NoticeDataGeo.NLID)}$("#"+SN.C.S.NoticeDataGeo).attr("checked",SN.C.I.NoticeDataGeo.NDG)}})},GetResponseXML:function(b){try{return b.responseXML}catch(a){return(new DOMParser()).parseFromString(b.responseText,"text/xml")}},NoticeReply:function(){if($("#"+SN.C.S.NoticeDataText).length>0&&$("#content .notice_reply").length>0){$("#content .notice").each(function(){SN.U.NoticeReplyTo($(this))})}},NoticeReplyTo:function(a){a.find(".notice_reply").live("click",function(c){c.preventDefault();var b=($(".author .nickname",a).length>0)?$($(".author .nickname",a)[0]):$(".author .nickname.uid");SN.U.NoticeInlineReplyTrigger(a,"@"+b.text());return false})},NoticeInlineReplyTrigger:function(h,i){var c=$($(".notice_id",h)[0]).text();var d=h;var f=h.closest(".notices");if(f.hasClass("threaded-notices")){d=f.closest(".notice")}else{f=$("ul.threaded-notices",h);if(f.length==0){f=$('<ul class="notices threaded-notices xoxo"></ul>');h.append(f)}}var k=$(".notice-reply-form",f);if(k.length==0){$("li.notice-reply-placeholder").remove();var g=$("li.notice-reply",f);if(g.length==0){g=$('<li class="notice-reply"><form class="notice-reply-form" method="post"><textarea name="status_textarea"></textarea><div class="controls"><input type="hidden" name="token"><input type="hidden" name="inreplyto"><input type="submit" class="submit"></div></form></li>');var b=$("#form_notice");k=g.find("form");k.attr("action",b.attr("action"));k.find('input[name="token"]').val(b.find("input[name=token]").val());k.find('input[type="submit"]').val(SN.msg("reply_submit"));f.append(g);k.find("textarea").blur(function(){var m=$(this);var l=$.trim(m.val());if(l==""||l==m.data("initialText")){g.remove();if(f.find("li").length>0){SN.U.NoticeInlineReplyPlaceholder(d)}else{f.remove()}}});k.submit(function(m){var l=k;$.ajax({type:"POST",dataType:"xml",url:SN.U.RewriteAjaxAction(l.attr("action")),data:l.serialize()+"&ajax=1",beforeSend:function(n){l.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled).end().find("textarea").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(o,p,n){alert(n||p)},success:function(p,q){var o=$("li",p)[0];if(o){var n=document._importNode(o,true);if($("#notice-"+c).length==0){g.replaceWith(n);SN.U.NoticeInlineReplyPlaceholder(d)}else{g.remove()}}}});m.preventDefault();return false})}}k.find("input[name=inreplyto]").val(c);var j=k.find("textarea");if(j.length==0){throw"No textarea"}var a="";if(i){a=i+" "}j.val(a+j.val().replace(RegExp(a,"i"),""));j.data("initialText",$.trim(i+""));j.focus();if(j[0].setSelectionRange){var e=j.val().length;j[0].setSelectionRange(e,e)}},NoticeReplySet:function(b,d){if(b.match(SN.C.I.PatternUsername)){var c=$("#"+SN.C.S.NoticeDataText);if(c.length>0){replyto="@"+b+" ";c.val(replyto+c.val().replace(RegExp(replyto,"i"),""));$("#"+SN.C.S.FormNotice+" #"+SN.C.S.NoticeInReplyTo).val(d);c[0].focus();if(c[0].setSelectionRange){var a=c.val().length;c[0].setSelectionRange(a,a)}}}},NoticeFavor:function(){$(".form_favor").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_disfavor").live("click",function(){SN.U.FormXHR($(this));return false})},NoticeInlineReplyPlaceholder:function(b){var a=b.find("ul.threaded-notices");var c=$('<li class="notice-reply-placeholder"><input class="placeholder"></li>');c.click(function(){SN.U.NoticeInlineReplyTrigger(b)});c.find("input").val(SN.msg("reply_comment"));a.append(c)},NoticeInlineReplySetup:function(){$(".threaded-notices").each(function(){var b=$(this);var a=b.closest(".notice");SN.U.NoticeInlineReplyPlaceholder(a)})},NoticeRepeat:function(){$(".form_repeat").live("click",function(a){a.preventDefault();SN.U.NoticeRepeatConfirmation($(this));return false})},NoticeRepeatConfirmation:function(a){var c=a.find(".submit");var b=c.clone();b.addClass("submit_dialogbox").removeClass("submit");a.append(b);b.bind("click",function(){SN.U.FormXHR(a);return false});c.hide();a.addClass("dialogbox").append('<button class="close">&#215;</button>').closest(".notice-options").addClass("opaque");a.find("button.close").click(function(){$(this).remove();a.removeClass("dialogbox").closest(".notice-options").removeClass("opaque");a.find(".submit_dialogbox").remove();a.find(".submit").show();return false})},NoticeAttachments:function(){$(".notice a.attachment").each(function(){SN.U.NoticeWithAttachment($(this).closest(".notice"))})},NoticeWithAttachment:function(b){if(b.find(".attachment").length===0){return}var a=b.find(".attachment.more");if(a.length>0){$(a[0]).click(function(){var c=$(this);c.addClass(SN.C.S.Processing);$.get(c.attr("href")+"/ajax",null,function(d){c.parent(".entry-content").html($(d).find("#attachment_view .entry-content").html())});return false}).attr("title",SN.msg("showmore_tooltip"))}},NoticeDataAttach:function(){NDA=$("#"+SN.C.S.NoticeDataAttach);NDA.change(function(c){var a=$(this).val();if(!a){$("#"+SN.C.S.NoticeDataAttachSelected).remove();return false}S='<div id="'+SN.C.S.NoticeDataAttachSelected+'" class="'+SN.C.S.Success+'"><code>'+a+'</code> <button class="close">&#215;</button></div>';NDAS=$("#"+SN.C.S.NoticeDataAttachSelected);if(NDAS.length>0){NDAS.replaceWith(S)}else{$("#"+SN.C.S.FormNotice).append(S)}$("#"+SN.C.S.NoticeDataAttachSelected+" button").click(function(){$("#"+SN.C.S.NoticeDataAttachSelected).remove();NDA.val("");return false});if(typeof this.files=="object"){for(var b=0;b<this.files.length;b++){SN.U.PreviewAttach(this.files[b])}}})},maxFileSize:function(b){var a=$(b).find("input[name=MAX_FILE_SIZE]").attr("value");if(a){return parseInt(a)}else{return 0}},PreviewAttach:function(c){var d=c.type+" "+Math.round(c.size/1024)+"KB";var e=true;var g;if(typeof window.createObjectURL!="undefined"){g=function(h,i){i(window.createObjectURL(h))}}else{if(typeof window.FileReader!="undefined"){g=function(i,j){var h=new FileReader();h.onload=function(k){j(h.result)};h.readAsDataURL(i)}}else{e=false}}var a=["image/png","image/jpeg","image/gif","image/svg+xml"];if($.inArray(c.type,a)==-1){e=false}var f=8*1024*1024;if(c.size>f){e=false}if(e){g(c,function(i){var h=$("<img>").attr("title",d).attr("alt",d).attr("src",i).attr("style","height: 120px");$("#"+SN.C.S.NoticeDataAttachSelected).append(h)})}else{var b=$("<div></div>").text(d);$("#"+SN.C.S.NoticeDataAttachSelected).append(b)}},NoticeLocationAttach:function(){var c=$("#"+SN.C.S.NoticeLat).val();var h=$("#"+SN.C.S.NoticeLon).val();var d=$("#"+SN.C.S.NoticeLocationNs).val();var i=$("#"+SN.C.S.NoticeLocationId).val();var a=$("#"+SN.C.S.NoticeGeoName).text();var b=$("#"+SN.C.S.NoticeDataGeo);function e(){$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",jQuery.trim($("label[for="+SN.C.S.NoticeDataGeo+"]").text())).removeClass("checked");$("#"+SN.C.S.NoticeLat).val("");$("#"+SN.C.S.NoticeLon).val("");$("#"+SN.C.S.NoticeLocationNs).val("");$("#"+SN.C.S.NoticeLocationId).val("");$("#"+SN.C.S.NoticeDataGeo).attr("checked",false);$.cookie(SN.C.S.NoticeDataGeoCookie,"disabled",{path:"/"})}function j(k,l){$.getJSON(k,l,function(m){var n,o;if(typeof(m.location_ns)!="undefined"){$("#"+SN.C.S.NoticeLocationNs).val(m.location_ns);n=m.location_ns}if(typeof(m.location_id)!="undefined"){$("#"+SN.C.S.NoticeLocationId).val(m.location_id);o=m.location_id}if(typeof(m.name)=="undefined"){NLN_text=l.lat+";"+l.lon}else{NLN_text=m.name}$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",NoticeDataGeo_text.ShareDisable+" ("+NLN_text+")");$("#"+SN.C.S.NoticeLat).val(l.lat);$("#"+SN.C.S.NoticeLon).val(l.lon);$("#"+SN.C.S.NoticeLocationNs).val(n);$("#"+SN.C.S.NoticeLocationId).val(o);$("#"+SN.C.S.NoticeDataGeo).attr("checked",true);var p={NLat:l.lat,NLon:l.lon,NLNS:n,NLID:o,NLN:NLN_text,NLNU:m.url,NDG:true};$.cookie(SN.C.S.NoticeDataGeoCookie,JSON.stringify(p),{path:"/"})})}if(b.length>0){if($.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){b.attr("checked",false)}else{b.attr("checked",true)}var f=$("#notice_data-geo_wrap");var g=f.attr("title");f.removeAttr("title");$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",jQuery.trim($("label[for="+SN.C.S.NoticeDataGeo+"]").text()));b.change(function(){if($("#"+SN.C.S.NoticeDataGeo).attr("checked")===true||$.cookie(SN.C.S.NoticeDataGeoCookie)===null){$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",NoticeDataGeo_text.ShareDisable).addClass("checked");if($.cookie(SN.C.S.NoticeDataGeoCookie)===null||$.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){if(navigator.geolocation){navigator.geolocation.getCurrentPosition(function(m){$("#"+SN.C.S.NoticeLat).val(m.coords.latitude);$("#"+SN.C.S.NoticeLon).val(m.coords.longitude);var n={lat:m.coords.latitude,lon:m.coords.longitude,token:$("#token").val()};j(g,n)},function(m){switch(m.code){case m.PERMISSION_DENIED:e();break;case m.TIMEOUT:$("#"+SN.C.S.NoticeDataGeo).attr("checked",false);break}},{timeout:10000})}else{if(c.length>0&&h.length>0){var k={lat:c,lon:h,token:$("#token").val()};j(g,k)}else{e();$("#"+SN.C.S.NoticeDataGeo).remove();$("label[for="+SN.C.S.NoticeDataGeo+"]").remove()}}}else{var l=JSON.parse($.cookie(SN.C.S.NoticeDataGeoCookie));$("#"+SN.C.S.NoticeLat).val(l.NLat);$("#"+SN.C.S.NoticeLon).val(l.NLon);$("#"+SN.C.S.NoticeLocationNs).val(l.NLNS);$("#"+SN.C.S.NoticeLocationId).val(l.NLID);$("#"+SN.C.S.NoticeDataGeo).attr("checked",l.NDG);$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",NoticeDataGeo_text.ShareDisable+" ("+l.NLN+")").addClass("checked")}}else{e()}}).change()}},NewDirectMessage:function(){NDM=$(".entity_send-a-message a");NDM.attr({href:NDM.attr("href")+"&ajax=1"});NDM.bind("click",function(){var a=$(".entity_send-a-message form");if(a.length===0){$(this).addClass(SN.C.S.Processing);$.get(NDM.attr("href"),null,function(b){$(".entity_send-a-message").append(document._importNode($("form",b)[0],true));a=$(".entity_send-a-message .form_notice");SN.U.FormNoticeXHR(a);SN.U.FormNoticeEnhancements(a);a.append('<button class="close">&#215;</button>');$(".entity_send-a-message button").click(function(){a.hide();return false});NDM.removeClass(SN.C.S.Processing)})}else{a.show();$(".entity_send-a-message textarea").focus()}return false})},GetFullYear:function(c,d,a){var b=new Date();b.setFullYear(c,d,a);return b},StatusNetInstance:{Set:function(b){var a=SN.U.StatusNetInstance.Get();if(a!==null){b=$.extend(a,b)}$.cookie(SN.C.S.StatusNetInstance,JSON.stringify(b),{path:"/",expires:SN.U.GetFullYear(2029,0,1)})},Get:function(){var a=$.cookie(SN.C.S.StatusNetInstance);if(a!==null){return JSON.parse(a)}return null},Delete:function(){$.cookie(SN.C.S.StatusNetInstance,null)}},belongsOnTimeline:function(b){var a=$("body").attr("id");if(a=="public"){return true}var c=$("#nav_profile a").attr("href");if(c){var d=$(b).find(".entry-title .author a.url").attr("href");if(d==c){if(a=="all"||a=="showstream"){return true}}}return false}},Init:{NoticeForm:function(){if($("body.user_in").length>0){SN.U.NoticeLocationAttach();$("."+SN.C.S.FormNotice).each(function(){SN.U.FormNoticeXHR($(this));SN.U.FormNoticeEnhancements($(this))});SN.U.NoticeDataAttach()}},Notices:function(){if($("body.user_in").length>0){SN.U.NoticeFavor();SN.U.NoticeRepeat();SN.U.NoticeReply();SN.U.NoticeInlineReplySetup()}SN.U.NoticeAttachments()},EntityActions:function(){if($("body.user_in").length>0){$(".form_user_subscribe").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_user_unsubscribe").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_group_join").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_group_leave").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_user_nudge").live("click",function(){SN.U.FormXHR($(this));return false});SN.U.NewDirectMessage()}},Login:function(){if(SN.U.StatusNetInstance.Get()!==null){var a=SN.U.StatusNetInstance.Get().Nickname;if(a!==null){$("#form_login #nickname").val(a)}}$("#form_login").bind("submit",function(){SN.U.StatusNetInstance.Set({Nickname:$("#form_login #nickname").val()});return true})},UploadForms:function(){$("input[type=file]").change(function(d){if(typeof this.files=="object"&&this.files.length>0){var c=0;for(var b=0;b<this.files.length;b++){c+=this.files[b].size}var a=SN.U.maxFileSize($(this.form));if(a>0&&c>a){var e="File too large: maximum upload size is %d bytes.";alert(e.replace("%d",a));$(this).val("");d.preventDefault();return false}}})}}};$(document).ready(function(){SN.Init.UploadForms();if($("."+SN.C.S.FormNotice).length>0){SN.Init.NoticeForm()}if($("#content .notices").length>0){SN.Init.Notices()}if($("#content .entity_actions").length>0){SN.Init.EntityActions()}if($("#form_login").length>0){SN.Init.Login()}});if(!document.ELEMENT_NODE){document.ELEMENT_NODE=1;document.ATTRIBUTE_NODE=2;document.TEXT_NODE=3;document.CDATA_SECTION_NODE=4;document.ENTITY_REFERENCE_NODE=5;document.ENTITY_NODE=6;document.PROCESSING_INSTRUCTION_NODE=7;document.COMMENT_NODE=8;document.DOCUMENT_NODE=9;document.DOCUMENT_TYPE_NODE=10;document.DOCUMENT_FRAGMENT_NODE=11;document.NOTATION_NODE=12}document._importNode=function(e,a){switch(e.nodeType){case document.ELEMENT_NODE:var d=document.createElement(e.nodeName);if(e.attributes&&e.attributes.length>0){for(var c=0,b=e.attributes.length;c<b;){if(e.attributes[c].nodeName=="class"){d.className=e.getAttribute(e.attributes[c++].nodeName)}else{d.setAttribute(e.attributes[c].nodeName,e.getAttribute(e.attributes[c++].nodeName))}}}if(a&&e.childNodes&&e.childNodes.length>0){for(var c=0,b=e.childNodes.length;c<b;){d.appendChild(document._importNode(e.childNodes[c++],a))}}return d;break;case document.TEXT_NODE:case document.CDATA_SECTION_NODE:case document.COMMENT_NODE:return document.createTextNode(e.nodeValue);break}};if(typeof navigator.geolocation=="undefined"||navigator.geolocation.shim){(function(){(function(){if(window.google&&google.gears){return}var c=null;if(typeof GearsFactory!="undefined"){c=new GearsFactory()}else{try{c=new ActiveXObject("Gears.Factory");if(c.getBuildInfo().indexOf("ie_mobile")!=-1){c.privateSetGlobalObject(this)}}catch(d){if((typeof navigator.mimeTypes!="undefined")&&navigator.mimeTypes["application/x-googlegears"]){c=document.createElement("object");c.style.display="none";c.width=0;c.height=0;c.type="application/x-googlegears";document.documentElement.appendChild(c)}}}if(!c){return}if(!window.google){google={}}if(!google.gears){google.gears={factory:c}}})();var a=(function(){var d=google.gears.factory.create("beta.geolocation");var c=function(f,e){return function(g){f(g);e.lastPosition=g}};return{shim:true,type:"Gears",lastPosition:null,getCurrentPosition:function(e,g,h){var f=this;var i=c(e,f);d.getCurrentPosition(i,g,h)},watchPosition:function(e,f,g){d.watchPosition(e,f,g)},clearWatch:function(e){d.clearWatch(e)},getPermission:function(g,e,f){d.getPermission(g,e,f)}}});var b=(function(){var i=false;var e=function(){if(!d()&&!i){i=true;var j=document.createElement("script");j.src=(document.location.protocol=="https:"?"https://":"http://")+"www.google.com/jsapi?callback=_google_loader_apiLoaded";j.type="text/javascript";document.getElementsByTagName("body")[0].appendChild(j)}};var c=[];var h=function(j){c.push(j)};var f=function(){if(d()){while(c.length>0){var j=c.pop();j()}}};window._google_loader_apiLoaded=function(){f()};var d=function(){return(window.google&&google.loader)};var g=function(j){if(d()){return true}h(j);e();return false};e();return{shim:true,type:"ClientLocation",lastPosition:null,getCurrentPosition:function(k,n,o){var m=this;if(!g(function(){m.getCurrentPosition(k,n,o)})){return}if(google.loader.ClientLocation){var l=google.loader.ClientLocation;var j={coords:{latitude:l.latitude,longitude:l.longitude,altitude:null,accuracy:43000,altitudeAccuracy:null,heading:null,speed:null},address:{city:l.address.city,country:l.address.country,country_code:l.address.country_code,region:l.address.region},timestamp:new Date()};k(j);this.lastPosition=j}else{if(n==="function"){n({code:3,message:"Using the Google ClientLocation API and it is not able to calculate a location."})}}},watchPosition:function(j,l,m){this.getCurrentPosition(j,l,m);var k=this;var n=setInterval(function(){k.getCurrentPosition(j,l,m)},10000);return n},clearWatch:function(j){clearInterval(j)},getPermission:function(l,j,k){return true}}});navigator.geolocation=(window.google&&google.gears)?a():b()})()};
\ No newline at end of file
diff --git a/plugins/Realtime/realtimeupdate.js b/plugins/Realtime/realtimeupdate.js
index e83cb515d5..4befb05771 100644
--- a/plugins/Realtime/realtimeupdate.js
+++ b/plugins/Realtime/realtimeupdate.js
@@ -173,7 +173,15 @@ RealtimeUpdate = {
         if (threaded && data.in_reply_to_status_id) {
             // aho!
             var parent = $('#notice-' + data.in_reply_to_status_id);
-            if (parent.length > 0) {
+            if (parent.length == 0) {
+                // @todo fetch the original, insert it, and finish the rest
+            } else {
+                // Check the parent notice to make sure it's not a reply itself.
+                // If so, use it's parent as the parent.
+                var parentList = parent.closest('.notices');
+                if (parentList.hasClass('threaded-notices')) {
+                    parent = parentList.closest('.notice');
+                }
                 list = parent.find('.threaded-notices');
                 if (list.length == 0) {
                     list = $('<ul class="notices threaded-notices xoxo"></ul>');
@@ -188,10 +196,11 @@ RealtimeUpdate = {
             list.prepend(newNotice);
         } else {
             var placeholder = list.find('li.notice-reply-placeholder')
-            if (placeholder) {
+            if (placeholder.length > 0) {
                 newNotice.insertBefore(placeholder)
             } else {
                 newNotice.appendTo(list);
+                SN.U.NoticeInlineReplyPlaceholder(parent);
             }
         }
         newNotice.css({display:"none"}).fadeIn(1000);
diff --git a/plugins/Realtime/realtimeupdate.min.js b/plugins/Realtime/realtimeupdate.min.js
index 8f61f67bb7..549bc77596 100644
--- a/plugins/Realtime/realtimeupdate.min.js
+++ b/plugins/Realtime/realtimeupdate.min.js
@@ -1 +1 @@
-RealtimeUpdate={_userid:0,_replyurl:"",_favorurl:"",_repeaturl:"",_deleteurl:"",_updatecounter:0,_maxnotices:50,_windowhasfocus:true,_documenttitle:"",_paused:false,_queuedNotices:[],init:function(c,b,d,e,a){RealtimeUpdate._userid=c;RealtimeUpdate._replyurl=b;RealtimeUpdate._favorurl=d;RealtimeUpdate._repeaturl=e;RealtimeUpdate._deleteurl=a;RealtimeUpdate._documenttitle=document.title;$(window).bind("focus",function(){RealtimeUpdate._windowhasfocus=true;RealtimeUpdate._updatecounter=0;RealtimeUpdate.removeWindowCounter()});$(window).bind("blur",function(){$("#notices_primary .notice").removeClass("mark-top");$("#notices_primary .notice:first").addClass("mark-top");RealtimeUpdate._windowhasfocus=false;return false})},receive:function(a){if(RealtimeUpdate.isNoticeVisible(a.id)){return}if(RealtimeUpdate._paused===false){RealtimeUpdate.purgeLastNoticeItem();RealtimeUpdate.insertNoticeItem(a)}else{RealtimeUpdate._queuedNotices.push(a);RealtimeUpdate.updateQueuedCounter()}RealtimeUpdate.updateWindowCounter()},insertNoticeItem:function(b){if(RealtimeUpdate.isNoticeVisible(b.id)){return}var a=RealtimeUpdate.makeNoticeItem(b);var c=$(a).attr("id");var d=$("#notices_primary .notices:first");var i=true;var e=true;if(e&&b.in_reply_to_status_id){var g=$("#notice-"+b.in_reply_to_status_id);if(g.length>0){d=g.find(".threaded-notices");if(d.length==0){d=$('<ul class="notices threaded-notices xoxo"></ul>');g.append(d)}i=false}}var h=$(a);if(i){d.prepend(h)}else{var f=d.find("li.notice-reply-placeholder");if(f){h.insertBefore(f)}else{h.appendTo(d)}}h.css({display:"none"}).fadeIn(1000);SN.U.NoticeReplyTo($("#"+c));SN.U.NoticeWithAttachment($("#"+c))},isNoticeVisible:function(a){return($("#notice-"+a).length>0)},purgeLastNoticeItem:function(){if($("#notices_primary .notice").length>RealtimeUpdate._maxnotices){$("#notices_primary .notice:last").remove()}},updateWindowCounter:function(){if(RealtimeUpdate._windowhasfocus===false){RealtimeUpdate._updatecounter+=1;document.title="("+RealtimeUpdate._updatecounter+") "+RealtimeUpdate._documenttitle}},removeWindowCounter:function(){document.title=RealtimeUpdate._documenttitle},makeNoticeItem:function(c){if(c.hasOwnProperty("retweeted_status")){original=c.retweeted_status;repeat=c;c=original;unique=repeat.id;responsible=repeat.user}else{original=null;repeat=null;unique=c.id;responsible=c.user}user=c.user;html=c.html.replace(/&lt;/g,"<").replace(/&gt;/g,">").replace(/&quot;/g,'"').replace(/&amp;/g,"&");source=c.source.replace(/&lt;/g,"<").replace(/&gt;/g,">").replace(/&quot;/g,'"').replace(/&amp;/g,"&");ni='<li class="hentry notice" id="notice-'+unique+'"><div class="entry-title"><span class="vcard author"><a href="'+user.profile_url+'" class="url" title="'+user.name+'"><img src="'+user.profile_image_url+'" class="avatar photo" width="48" height="48" alt="'+user.screen_name+'"/><span class="nickname fn">'+user.screen_name+'</span></a></span><p class="entry-content">'+html+'</p></div><div class="entry-content"><a class="timestamp" rel="bookmark" href="'+c.url+'" ><abbr class="published" title="'+c.created_at+'">a few seconds ago</abbr></a> <span class="source">from <span class="device">'+source+"</span></span>";if(c.conversation_url){ni=ni+' <a class="response" href="'+c.conversation_url+'">in context</a>'}if(repeat){ru=repeat.user;ni=ni+'<span class="repeat vcard">Repeated by <a href="'+ru.profile_url+'" class="url"><span class="nickname">'+ru.screen_name+"</span></a></span>"}ni=ni+"</div>";ni=ni+'<div class="notice-options">';if(RealtimeUpdate._userid!=0){var a=$("form#form_notice fieldset input#token");var b=a.val();ni=ni+RealtimeUpdate.makeFavoriteForm(c.id,b);ni=ni+RealtimeUpdate.makeReplyLink(c.id,c.user["screen_name"]);if(RealtimeUpdate._userid==responsible.id){ni=ni+RealtimeUpdate.makeDeleteLink(c.id)}else{if(RealtimeUpdate._userid!=user.id){ni=ni+RealtimeUpdate.makeRepeatForm(c.id,b)}}}ni=ni+"</div>";ni=ni+"</li>";return ni},makeFavoriteForm:function(c,b){var a;a='<form id="favor-'+c+'" class="form_favor" method="post" action="'+RealtimeUpdate._favorurl+'"><fieldset><legend>Favor this notice</legend><input name="token-'+c+'" type="hidden" id="token-'+c+'" value="'+b+'"/><input name="notice" type="hidden" id="notice-n'+c+'" value="'+c+'"/><input type="submit" id="favor-submit-'+c+'" name="favor-submit-'+c+'" class="submit" value="Favor" title="Favor this notice"/></fieldset></form>';return a},makeReplyLink:function(c,a){var b;b='<a class="notice_reply" href="'+RealtimeUpdate._replyurl+"?replyto="+a+'" title="Reply to this notice">Reply <span class="notice_id">'+c+"</span></a>";return b},makeRepeatForm:function(c,b){var a;a='<form id="repeat-'+c+'" class="form_repeat" method="post" action="'+RealtimeUpdate._repeaturl+'"><fieldset><legend>Repeat this notice?</legend><input name="token-'+c+'" type="hidden" id="token-'+c+'" value="'+b+'"/><input name="notice" type="hidden" id="notice-'+c+'" value="'+c+'"/><input type="submit" id="repeat-submit-'+c+'" name="repeat-submit-'+c+'" class="submit" value="Yes" title="Repeat this notice"/></fieldset></form>';return a},makeDeleteLink:function(c){var b,a;a=RealtimeUpdate._deleteurl.replace("0000000000",c);b='<a class="notice_delete" href="'+a+'" title="Delete this notice">Delete</a>';return b},initActions:function(a,b,c){$("#notices_primary").prepend('<ul id="realtime_actions"><li id="realtime_playpause"></li><li id="realtime_timeline"></li></ul>');RealtimeUpdate._pluginPath=c;RealtimeUpdate.initPlayPause();RealtimeUpdate.initAddPopup(a,b,RealtimeUpdate._pluginPath)},initPlayPause:function(){if(typeof(localStorage)=="undefined"){RealtimeUpdate.showPause()}else{if(localStorage.getItem("RealtimeUpdate_paused")==="true"){RealtimeUpdate.showPlay()}else{RealtimeUpdate.showPause()}}},showPause:function(){RealtimeUpdate.setPause(false);RealtimeUpdate.showQueuedNotices();RealtimeUpdate.addNoticesHover();$("#realtime_playpause").remove();$("#realtime_actions").prepend('<li id="realtime_playpause"><button id="realtime_pause" class="pause"></button></li>');$("#realtime_pause").text(SN.msg("realtime_pause")).attr("title",SN.msg("realtime_pause_tooltip")).bind("click",function(){RealtimeUpdate.removeNoticesHover();RealtimeUpdate.showPlay();return false})},showPlay:function(){RealtimeUpdate.setPause(true);$("#realtime_playpause").remove();$("#realtime_actions").prepend('<li id="realtime_playpause"><span id="queued_counter"></span> <button id="realtime_play" class="play"></button></li>');$("#realtime_play").text(SN.msg("realtime_play")).attr("title",SN.msg("realtime_play_tooltip")).bind("click",function(){RealtimeUpdate.showPause();return false})},setPause:function(a){RealtimeUpdate._paused=a;if(typeof(localStorage)!="undefined"){localStorage.setItem("RealtimeUpdate_paused",RealtimeUpdate._paused)}},showQueuedNotices:function(){$.each(RealtimeUpdate._queuedNotices,function(a,b){RealtimeUpdate.insertNoticeItem(b)});RealtimeUpdate._queuedNotices=[];RealtimeUpdate.removeQueuedCounter()},updateQueuedCounter:function(){$("#realtime_playpause #queued_counter").html("("+RealtimeUpdate._queuedNotices.length+")")},removeQueuedCounter:function(){$("#realtime_playpause #queued_counter").empty()},addNoticesHover:function(){$("#notices_primary .notices").hover(function(){if(RealtimeUpdate._paused===false){RealtimeUpdate.showPlay()}},function(){if(RealtimeUpdate._paused===true){RealtimeUpdate.showPause()}})},removeNoticesHover:function(){$("#notices_primary .notices").unbind()},initAddPopup:function(a,b,c){$("#realtime_timeline").append('<button id="realtime_popup"></button>');$("#realtime_popup").text(SN.msg("realtime_popup")).attr("title",SN.msg("realtime_popup_tooltip")).bind("click",function(){window.open(a,"","toolbar=no,resizable=yes,scrollbars=yes,status=no,menubar=no,personalbar=no,location=no,width=500,height=550");return false})},initPopupWindow:function(){$(".notices .entry-title a, .notices .entry-content a").bind("click",function(){window.open(this.href,"");return false});$("#showstream .entity_profile").css({width:"69%"})}};
\ No newline at end of file
+RealtimeUpdate={_userid:0,_replyurl:"",_favorurl:"",_repeaturl:"",_deleteurl:"",_updatecounter:0,_maxnotices:50,_windowhasfocus:true,_documenttitle:"",_paused:false,_queuedNotices:[],init:function(c,b,d,e,a){RealtimeUpdate._userid=c;RealtimeUpdate._replyurl=b;RealtimeUpdate._favorurl=d;RealtimeUpdate._repeaturl=e;RealtimeUpdate._deleteurl=a;RealtimeUpdate._documenttitle=document.title;$(window).bind("focus",function(){RealtimeUpdate._windowhasfocus=true;RealtimeUpdate._updatecounter=0;RealtimeUpdate.removeWindowCounter()});$(window).bind("blur",function(){$("#notices_primary .notice").removeClass("mark-top");$("#notices_primary .notice:first").addClass("mark-top");RealtimeUpdate._windowhasfocus=false;return false})},receive:function(a){if(RealtimeUpdate.isNoticeVisible(a.id)){return}if(RealtimeUpdate._paused===false){RealtimeUpdate.purgeLastNoticeItem();RealtimeUpdate.insertNoticeItem(a)}else{RealtimeUpdate._queuedNotices.push(a);RealtimeUpdate.updateQueuedCounter()}RealtimeUpdate.updateWindowCounter()},insertNoticeItem:function(b){if(RealtimeUpdate.isNoticeVisible(b.id)){return}var a=RealtimeUpdate.makeNoticeItem(b);var c=$(a).attr("id");var d=$("#notices_primary .notices:first");var j=true;var e=true;if(e&&b.in_reply_to_status_id){var g=$("#notice-"+b.in_reply_to_status_id);if(g.length==0){}else{var h=g.closest(".notices");if(h.hasClass("threaded-notices")){g=h.closest(".notice")}d=g.find(".threaded-notices");if(d.length==0){d=$('<ul class="notices threaded-notices xoxo"></ul>');g.append(d)}j=false}}var i=$(a);if(j){d.prepend(i)}else{var f=d.find("li.notice-reply-placeholder");if(f.length>0){i.insertBefore(f)}else{i.appendTo(d);SN.U.NoticeInlineReplyPlaceholder(g)}}i.css({display:"none"}).fadeIn(1000);SN.U.NoticeReplyTo($("#"+c));SN.U.NoticeWithAttachment($("#"+c))},isNoticeVisible:function(a){return($("#notice-"+a).length>0)},purgeLastNoticeItem:function(){if($("#notices_primary .notice").length>RealtimeUpdate._maxnotices){$("#notices_primary .notice:last").remove()}},updateWindowCounter:function(){if(RealtimeUpdate._windowhasfocus===false){RealtimeUpdate._updatecounter+=1;document.title="("+RealtimeUpdate._updatecounter+") "+RealtimeUpdate._documenttitle}},removeWindowCounter:function(){document.title=RealtimeUpdate._documenttitle},makeNoticeItem:function(c){if(c.hasOwnProperty("retweeted_status")){original=c.retweeted_status;repeat=c;c=original;unique=repeat.id;responsible=repeat.user}else{original=null;repeat=null;unique=c.id;responsible=c.user}user=c.user;html=c.html.replace(/&lt;/g,"<").replace(/&gt;/g,">").replace(/&quot;/g,'"').replace(/&amp;/g,"&");source=c.source.replace(/&lt;/g,"<").replace(/&gt;/g,">").replace(/&quot;/g,'"').replace(/&amp;/g,"&");ni='<li class="hentry notice" id="notice-'+unique+'"><div class="entry-title"><span class="vcard author"><a href="'+user.profile_url+'" class="url" title="'+user.name+'"><img src="'+user.profile_image_url+'" class="avatar photo" width="48" height="48" alt="'+user.screen_name+'"/><span class="nickname fn">'+user.screen_name+'</span></a></span><p class="entry-content">'+html+'</p></div><div class="entry-content"><a class="timestamp" rel="bookmark" href="'+c.url+'" ><abbr class="published" title="'+c.created_at+'">a few seconds ago</abbr></a> <span class="source">from <span class="device">'+source+"</span></span>";if(c.conversation_url){ni=ni+' <a class="response" href="'+c.conversation_url+'">in context</a>'}if(repeat){ru=repeat.user;ni=ni+'<span class="repeat vcard">Repeated by <a href="'+ru.profile_url+'" class="url"><span class="nickname">'+ru.screen_name+"</span></a></span>"}ni=ni+"</div>";ni=ni+'<div class="notice-options">';if(RealtimeUpdate._userid!=0){var a=$("form#form_notice fieldset input#token");var b=a.val();ni=ni+RealtimeUpdate.makeFavoriteForm(c.id,b);ni=ni+RealtimeUpdate.makeReplyLink(c.id,c.user["screen_name"]);if(RealtimeUpdate._userid==responsible.id){ni=ni+RealtimeUpdate.makeDeleteLink(c.id)}else{if(RealtimeUpdate._userid!=user.id){ni=ni+RealtimeUpdate.makeRepeatForm(c.id,b)}}}ni=ni+"</div>";ni=ni+"</li>";return ni},makeFavoriteForm:function(c,b){var a;a='<form id="favor-'+c+'" class="form_favor" method="post" action="'+RealtimeUpdate._favorurl+'"><fieldset><legend>Favor this notice</legend><input name="token-'+c+'" type="hidden" id="token-'+c+'" value="'+b+'"/><input name="notice" type="hidden" id="notice-n'+c+'" value="'+c+'"/><input type="submit" id="favor-submit-'+c+'" name="favor-submit-'+c+'" class="submit" value="Favor" title="Favor this notice"/></fieldset></form>';return a},makeReplyLink:function(c,a){var b;b='<a class="notice_reply" href="'+RealtimeUpdate._replyurl+"?replyto="+a+'" title="Reply to this notice">Reply <span class="notice_id">'+c+"</span></a>";return b},makeRepeatForm:function(c,b){var a;a='<form id="repeat-'+c+'" class="form_repeat" method="post" action="'+RealtimeUpdate._repeaturl+'"><fieldset><legend>Repeat this notice?</legend><input name="token-'+c+'" type="hidden" id="token-'+c+'" value="'+b+'"/><input name="notice" type="hidden" id="notice-'+c+'" value="'+c+'"/><input type="submit" id="repeat-submit-'+c+'" name="repeat-submit-'+c+'" class="submit" value="Yes" title="Repeat this notice"/></fieldset></form>';return a},makeDeleteLink:function(c){var b,a;a=RealtimeUpdate._deleteurl.replace("0000000000",c);b='<a class="notice_delete" href="'+a+'" title="Delete this notice">Delete</a>';return b},initActions:function(a,b,c){$("#notices_primary").prepend('<ul id="realtime_actions"><li id="realtime_playpause"></li><li id="realtime_timeline"></li></ul>');RealtimeUpdate._pluginPath=c;RealtimeUpdate.initPlayPause();RealtimeUpdate.initAddPopup(a,b,RealtimeUpdate._pluginPath)},initPlayPause:function(){if(typeof(localStorage)=="undefined"){RealtimeUpdate.showPause()}else{if(localStorage.getItem("RealtimeUpdate_paused")==="true"){RealtimeUpdate.showPlay()}else{RealtimeUpdate.showPause()}}},showPause:function(){RealtimeUpdate.setPause(false);RealtimeUpdate.showQueuedNotices();RealtimeUpdate.addNoticesHover();$("#realtime_playpause").remove();$("#realtime_actions").prepend('<li id="realtime_playpause"><button id="realtime_pause" class="pause"></button></li>');$("#realtime_pause").text(SN.msg("realtime_pause")).attr("title",SN.msg("realtime_pause_tooltip")).bind("click",function(){RealtimeUpdate.removeNoticesHover();RealtimeUpdate.showPlay();return false})},showPlay:function(){RealtimeUpdate.setPause(true);$("#realtime_playpause").remove();$("#realtime_actions").prepend('<li id="realtime_playpause"><span id="queued_counter"></span> <button id="realtime_play" class="play"></button></li>');$("#realtime_play").text(SN.msg("realtime_play")).attr("title",SN.msg("realtime_play_tooltip")).bind("click",function(){RealtimeUpdate.showPause();return false})},setPause:function(a){RealtimeUpdate._paused=a;if(typeof(localStorage)!="undefined"){localStorage.setItem("RealtimeUpdate_paused",RealtimeUpdate._paused)}},showQueuedNotices:function(){$.each(RealtimeUpdate._queuedNotices,function(a,b){RealtimeUpdate.insertNoticeItem(b)});RealtimeUpdate._queuedNotices=[];RealtimeUpdate.removeQueuedCounter()},updateQueuedCounter:function(){$("#realtime_playpause #queued_counter").html("("+RealtimeUpdate._queuedNotices.length+")")},removeQueuedCounter:function(){$("#realtime_playpause #queued_counter").empty()},addNoticesHover:function(){$("#notices_primary .notices").hover(function(){if(RealtimeUpdate._paused===false){RealtimeUpdate.showPlay()}},function(){if(RealtimeUpdate._paused===true){RealtimeUpdate.showPause()}})},removeNoticesHover:function(){$("#notices_primary .notices").unbind()},initAddPopup:function(a,b,c){$("#realtime_timeline").append('<button id="realtime_popup"></button>');$("#realtime_popup").text(SN.msg("realtime_popup")).attr("title",SN.msg("realtime_popup_tooltip")).bind("click",function(){window.open(a,"","toolbar=no,resizable=yes,scrollbars=yes,status=no,menubar=no,personalbar=no,location=no,width=500,height=550");return false})},initPopupWindow:function(){$(".notices .entry-title a, .notices .entry-content a").bind("click",function(){window.open(this.href,"");return false});$("#showstream .entity_profile").css({width:"69%"})}};
\ No newline at end of file

From 764d069ccd370ae34d9499a027ae571355d69558 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Tue, 1 Mar 2011 16:08:37 -0800
Subject: [PATCH 365/655] Clean up threaded notices vs replies classes, and
 fixed realtime's threaded behavior to only run on threaded lists

---
 js/util.js                             | 10 +++++-----
 js/util.min.js                         |  2 +-
 lib/threadednoticelist.php             |  4 ++--
 plugins/Realtime/realtimeupdate.js     |  8 ++++----
 plugins/Realtime/realtimeupdate.min.js |  2 +-
 theme/base/css/display.css             | 20 ++++++++++----------
 6 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/js/util.js b/js/util.js
index e64472b986..d007281223 100644
--- a/js/util.js
+++ b/js/util.js
@@ -575,16 +575,16 @@ var SN = { // StatusNet
 
             // Find the threaded replies view we'll be adding to...
             var list = notice.closest('.notices');
-            if (list.hasClass('threaded-notices')) {
+            if (list.hasClass('threaded-replies')) {
                 // We're replying to a reply; use reply form on the end of this list.
                 // We'll add our form at the end of this; grab the root notice.
                 parentNotice = list.closest('.notice');
             } else {
                 // We're replying to a parent notice; pull its threaded list
                 // and we'll add on the end of it. Will add if needed.
-                list = $('ul.threaded-notices', notice);
+                list = $('ul.threaded-replies', notice);
                 if (list.length == 0) {
-                    list = $('<ul class="notices threaded-notices xoxo"></ul>');
+                    list = $('<ul class="notices threaded-replies xoxo"></ul>');
                     notice.append(list);
                 }
             }
@@ -731,7 +731,7 @@ var SN = { // StatusNet
         },
 
         NoticeInlineReplyPlaceholder: function(notice) {
-            var list = notice.find('ul.threaded-notices');
+            var list = notice.find('ul.threaded-replies');
             var placeholder = $('<li class="notice-reply-placeholder">' +
                                     '<input class="placeholder">' +
                                 '</li>');
@@ -749,7 +749,7 @@ var SN = { // StatusNet
          * Uses 'live' rather than 'bind', so applies to future as well as present items.
          */
         NoticeInlineReplySetup: function() {
-            $('.threaded-notices').each(function() {
+            $('.threaded-replies').each(function() {
                 var list = $(this);
                 var notice = list.closest('.notice');
                 SN.U.NoticeInlineReplyPlaceholder(notice);
diff --git a/js/util.min.js b/js/util.min.js
index c47f3ba3db..7b1410159e 100644
--- a/js/util.min.js
+++ b/js/util.min.js
@@ -1 +1 @@
-var SN={C:{I:{CounterBlackout:false,MaxLength:140,PatternUsername:/^[0-9a-zA-Z\-_.]*$/,HTTP20x30x:[200,201,202,203,204,205,206,300,301,302,303,304,305,306,307]},S:{Disabled:"disabled",Warning:"warning",Error:"error",Success:"success",Processing:"processing",CommandResult:"command_result",FormNotice:"form_notice",NoticeDataText:"notice_data-text",NoticeTextCount:"notice_text-count",NoticeInReplyTo:"notice_in-reply-to",NoticeDataAttach:"notice_data-attach",NoticeDataAttachSelected:"notice_data-attach_selected",NoticeActionSubmit:"notice_action-submit",NoticeLat:"notice_data-lat",NoticeLon:"notice_data-lon",NoticeLocationId:"notice_data-location_id",NoticeLocationNs:"notice_data-location_ns",NoticeGeoName:"notice_data-geo_name",NoticeDataGeo:"notice_data-geo",NoticeDataGeoCookie:"NoticeDataGeo",NoticeDataGeoSelected:"notice_data-geo_selected",StatusNetInstance:"StatusNetInstance"}},messages:{},msg:function(a){if(typeof SN.messages[a]=="undefined"){return"["+a+"]"}else{return SN.messages[a]}},U:{FormNoticeEnhancements:function(b){if(jQuery.data(b[0],"ElementData")===undefined){MaxLength=b.find("#"+SN.C.S.NoticeTextCount).text();if(typeof(MaxLength)=="undefined"){MaxLength=SN.C.I.MaxLength}jQuery.data(b[0],"ElementData",{MaxLength:MaxLength});SN.U.Counter(b);NDT=b.find("#"+SN.C.S.NoticeDataText);NDT.bind("keyup",function(c){SN.U.Counter(b)});var a=function(c){window.setTimeout(function(){SN.U.Counter(b)},50)};NDT.bind("cut",a).bind("paste",a);NDT.bind("keydown",function(c){SN.U.SubmitOnReturn(c,b)})}else{b.find("#"+SN.C.S.NoticeTextCount).text(jQuery.data(b[0],"ElementData").MaxLength)}if($("body")[0].id!="conversation"&&window.location.hash.length===0&&$(window).scrollTop()==0){b.find("textarea").focus()}},SubmitOnReturn:function(b,a){if(b.keyCode==13||b.keyCode==10){a.submit();b.preventDefault();b.stopPropagation();$("#"+a[0].id+" #"+SN.C.S.NoticeDataText).blur();$("body").focus();return false}return true},Counter:function(d){SN.C.I.FormNoticeCurrent=d;var b=jQuery.data(d[0],"ElementData").MaxLength;if(b<=0){return}var c=b-SN.U.CharacterCount(d);var a=d.find("#"+SN.C.S.NoticeTextCount);if(c.toString()!=a.text()){if(!SN.C.I.CounterBlackout||c===0){if(a.text()!=String(c)){a.text(c)}if(c<0){d.addClass(SN.C.S.Warning)}else{d.removeClass(SN.C.S.Warning)}if(!SN.C.I.CounterBlackout){SN.C.I.CounterBlackout=true;SN.C.I.FormNoticeCurrent=d;window.setTimeout("SN.U.ClearCounterBlackout(SN.C.I.FormNoticeCurrent);",500)}}}},CharacterCount:function(a){return a.find("#"+SN.C.S.NoticeDataText).val().length},ClearCounterBlackout:function(a){SN.C.I.CounterBlackout=false;SN.U.Counter(a)},RewriteAjaxAction:function(a){if(document.location.protocol=="https:"&&a.substr(0,5)=="http:"){return a.replace(/^http:\/\/[^:\/]+/,"https://"+document.location.host)}else{return a}},FormXHR:function(a){$.ajax({type:"POST",dataType:"xml",url:SN.U.RewriteAjaxAction(a.attr("action")),data:a.serialize()+"&ajax=1",beforeSend:function(b){a.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(c,d,b){alert(b||d)},success:function(b,c){if(typeof($("form",b)[0])!="undefined"){form_new=document._importNode($("form",b)[0],true);a.replaceWith(form_new)}else{a.replaceWith(document._importNode($("p",b)[0],true))}}})},FormNoticeXHR:function(b){SN.C.I.NoticeDataGeo={};b.append('<input type="hidden" name="ajax" value="1"/>');b.attr("action",SN.U.RewriteAjaxAction(b.attr("action")));var c=function(d,e){b.append($('<p class="form_response"></p>').addClass(d).text(e))};var a=function(){b.find(".form_response").remove()};b.ajaxForm({dataType:"xml",timeout:"60000",beforeSend:function(d){if(b.find("#"+SN.C.S.NoticeDataText)[0].value.length===0){b.addClass(SN.C.S.Warning);return false}b.addClass(SN.C.S.Processing).find("#"+SN.C.S.NoticeActionSubmit).addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled);SN.C.I.NoticeDataGeo.NLat=$("#"+SN.C.S.NoticeLat).val();SN.C.I.NoticeDataGeo.NLon=$("#"+SN.C.S.NoticeLon).val();SN.C.I.NoticeDataGeo.NLNS=$("#"+SN.C.S.NoticeLocationNs).val();SN.C.I.NoticeDataGeo.NLID=$("#"+SN.C.S.NoticeLocationId).val();SN.C.I.NoticeDataGeo.NDG=$("#"+SN.C.S.NoticeDataGeo).attr("checked");cookieValue=$.cookie(SN.C.S.NoticeDataGeoCookie);if(cookieValue!==null&&cookieValue!="disabled"){cookieValue=JSON.parse(cookieValue);SN.C.I.NoticeDataGeo.NLat=$("#"+SN.C.S.NoticeLat).val(cookieValue.NLat).val();SN.C.I.NoticeDataGeo.NLon=$("#"+SN.C.S.NoticeLon).val(cookieValue.NLon).val();if($("#"+SN.C.S.NoticeLocationNs).val(cookieValue.NLNS)){SN.C.I.NoticeDataGeo.NLNS=$("#"+SN.C.S.NoticeLocationNs).val(cookieValue.NLNS).val();SN.C.I.NoticeDataGeo.NLID=$("#"+SN.C.S.NoticeLocationId).val(cookieValue.NLID).val()}}if(cookieValue=="disabled"){SN.C.I.NoticeDataGeo.NDG=$("#"+SN.C.S.NoticeDataGeo).attr("checked",false).attr("checked")}else{SN.C.I.NoticeDataGeo.NDG=$("#"+SN.C.S.NoticeDataGeo).attr("checked",true).attr("checked")}return true},error:function(f,g,e){b.removeClass(SN.C.S.Processing).find("#"+SN.C.S.NoticeActionSubmit).removeClass(SN.C.S.Disabled).removeAttr(SN.C.S.Disabled,SN.C.S.Disabled);a();if(g=="timeout"){c("error","Sorry! We had trouble sending your notice. The servers are overloaded. Please try again, and contact the site administrator if this problem persists.")}else{var d=SN.U.GetResponseXML(f);if($("."+SN.C.S.Error,d).length>0){b.append(document._importNode($("."+SN.C.S.Error,d)[0],true))}else{if(parseInt(f.status)===0||jQuery.inArray(parseInt(f.status),SN.C.I.HTTP20x30x)>=0){b.resetForm().find("#"+SN.C.S.NoticeDataAttachSelected).remove();SN.U.FormNoticeEnhancements(b)}else{c("error","(Sorry! We had trouble sending your notice ("+f.status+" "+f.statusText+"). Please report the problem to the site administrator if this happens again.")}}}},success:function(i,k){a();var e=$("#"+SN.C.S.Error,i);if(e.length>0){c("error",e.text())}else{if($("body")[0].id=="bookmarklet"){self.close()}var d=$("#"+SN.C.S.CommandResult,i);if(d.length>0){c("success",d.text())}else{var h=document._importNode($("li",i)[0],true);var j=$("#notices_primary .notices:first");if(j.length>0&&SN.U.belongsOnTimeline(h)){if($("#"+h.id).length===0){var f=$("#"+SN.C.S.NoticeInReplyTo).val();var g="#notices_primary #notice-"+f;if($("body")[0].id=="conversation"){if(f.length>0&&$(g+" .notices").length<1){$(g).append('<ul class="notices"></ul>')}$($(g+" .notices")[0]).append(h)}else{j.prepend(h)}$("#"+h.id).css({display:"none"}).fadeIn(2500);SN.U.NoticeWithAttachment($("#"+h.id));SN.U.NoticeReplyTo($("#"+h.id))}}else{c("success",$("title",i).text())}}b.resetForm();b.find("#"+SN.C.S.NoticeInReplyTo).val("");b.find("#"+SN.C.S.NoticeDataAttachSelected).remove();SN.U.FormNoticeEnhancements(b)}},complete:function(d,e){b.removeClass(SN.C.S.Processing).find("#"+SN.C.S.NoticeActionSubmit).removeAttr(SN.C.S.Disabled).removeClass(SN.C.S.Disabled);$("#"+SN.C.S.NoticeLat).val(SN.C.I.NoticeDataGeo.NLat);$("#"+SN.C.S.NoticeLon).val(SN.C.I.NoticeDataGeo.NLon);if($("#"+SN.C.S.NoticeLocationNs)){$("#"+SN.C.S.NoticeLocationNs).val(SN.C.I.NoticeDataGeo.NLNS);$("#"+SN.C.S.NoticeLocationId).val(SN.C.I.NoticeDataGeo.NLID)}$("#"+SN.C.S.NoticeDataGeo).attr("checked",SN.C.I.NoticeDataGeo.NDG)}})},GetResponseXML:function(b){try{return b.responseXML}catch(a){return(new DOMParser()).parseFromString(b.responseText,"text/xml")}},NoticeReply:function(){if($("#"+SN.C.S.NoticeDataText).length>0&&$("#content .notice_reply").length>0){$("#content .notice").each(function(){SN.U.NoticeReplyTo($(this))})}},NoticeReplyTo:function(a){a.find(".notice_reply").live("click",function(c){c.preventDefault();var b=($(".author .nickname",a).length>0)?$($(".author .nickname",a)[0]):$(".author .nickname.uid");SN.U.NoticeInlineReplyTrigger(a,"@"+b.text());return false})},NoticeInlineReplyTrigger:function(h,i){var c=$($(".notice_id",h)[0]).text();var d=h;var f=h.closest(".notices");if(f.hasClass("threaded-notices")){d=f.closest(".notice")}else{f=$("ul.threaded-notices",h);if(f.length==0){f=$('<ul class="notices threaded-notices xoxo"></ul>');h.append(f)}}var k=$(".notice-reply-form",f);if(k.length==0){$("li.notice-reply-placeholder").remove();var g=$("li.notice-reply",f);if(g.length==0){g=$('<li class="notice-reply"><form class="notice-reply-form" method="post"><textarea name="status_textarea"></textarea><div class="controls"><input type="hidden" name="token"><input type="hidden" name="inreplyto"><input type="submit" class="submit"></div></form></li>');var b=$("#form_notice");k=g.find("form");k.attr("action",b.attr("action"));k.find('input[name="token"]').val(b.find("input[name=token]").val());k.find('input[type="submit"]').val(SN.msg("reply_submit"));f.append(g);k.find("textarea").blur(function(){var m=$(this);var l=$.trim(m.val());if(l==""||l==m.data("initialText")){g.remove();if(f.find("li").length>0){SN.U.NoticeInlineReplyPlaceholder(d)}else{f.remove()}}});k.submit(function(m){var l=k;$.ajax({type:"POST",dataType:"xml",url:SN.U.RewriteAjaxAction(l.attr("action")),data:l.serialize()+"&ajax=1",beforeSend:function(n){l.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled).end().find("textarea").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(o,p,n){alert(n||p)},success:function(p,q){var o=$("li",p)[0];if(o){var n=document._importNode(o,true);if($("#notice-"+c).length==0){g.replaceWith(n);SN.U.NoticeInlineReplyPlaceholder(d)}else{g.remove()}}}});m.preventDefault();return false})}}k.find("input[name=inreplyto]").val(c);var j=k.find("textarea");if(j.length==0){throw"No textarea"}var a="";if(i){a=i+" "}j.val(a+j.val().replace(RegExp(a,"i"),""));j.data("initialText",$.trim(i+""));j.focus();if(j[0].setSelectionRange){var e=j.val().length;j[0].setSelectionRange(e,e)}},NoticeReplySet:function(b,d){if(b.match(SN.C.I.PatternUsername)){var c=$("#"+SN.C.S.NoticeDataText);if(c.length>0){replyto="@"+b+" ";c.val(replyto+c.val().replace(RegExp(replyto,"i"),""));$("#"+SN.C.S.FormNotice+" #"+SN.C.S.NoticeInReplyTo).val(d);c[0].focus();if(c[0].setSelectionRange){var a=c.val().length;c[0].setSelectionRange(a,a)}}}},NoticeFavor:function(){$(".form_favor").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_disfavor").live("click",function(){SN.U.FormXHR($(this));return false})},NoticeInlineReplyPlaceholder:function(b){var a=b.find("ul.threaded-notices");var c=$('<li class="notice-reply-placeholder"><input class="placeholder"></li>');c.click(function(){SN.U.NoticeInlineReplyTrigger(b)});c.find("input").val(SN.msg("reply_comment"));a.append(c)},NoticeInlineReplySetup:function(){$(".threaded-notices").each(function(){var b=$(this);var a=b.closest(".notice");SN.U.NoticeInlineReplyPlaceholder(a)})},NoticeRepeat:function(){$(".form_repeat").live("click",function(a){a.preventDefault();SN.U.NoticeRepeatConfirmation($(this));return false})},NoticeRepeatConfirmation:function(a){var c=a.find(".submit");var b=c.clone();b.addClass("submit_dialogbox").removeClass("submit");a.append(b);b.bind("click",function(){SN.U.FormXHR(a);return false});c.hide();a.addClass("dialogbox").append('<button class="close">&#215;</button>').closest(".notice-options").addClass("opaque");a.find("button.close").click(function(){$(this).remove();a.removeClass("dialogbox").closest(".notice-options").removeClass("opaque");a.find(".submit_dialogbox").remove();a.find(".submit").show();return false})},NoticeAttachments:function(){$(".notice a.attachment").each(function(){SN.U.NoticeWithAttachment($(this).closest(".notice"))})},NoticeWithAttachment:function(b){if(b.find(".attachment").length===0){return}var a=b.find(".attachment.more");if(a.length>0){$(a[0]).click(function(){var c=$(this);c.addClass(SN.C.S.Processing);$.get(c.attr("href")+"/ajax",null,function(d){c.parent(".entry-content").html($(d).find("#attachment_view .entry-content").html())});return false}).attr("title",SN.msg("showmore_tooltip"))}},NoticeDataAttach:function(){NDA=$("#"+SN.C.S.NoticeDataAttach);NDA.change(function(c){var a=$(this).val();if(!a){$("#"+SN.C.S.NoticeDataAttachSelected).remove();return false}S='<div id="'+SN.C.S.NoticeDataAttachSelected+'" class="'+SN.C.S.Success+'"><code>'+a+'</code> <button class="close">&#215;</button></div>';NDAS=$("#"+SN.C.S.NoticeDataAttachSelected);if(NDAS.length>0){NDAS.replaceWith(S)}else{$("#"+SN.C.S.FormNotice).append(S)}$("#"+SN.C.S.NoticeDataAttachSelected+" button").click(function(){$("#"+SN.C.S.NoticeDataAttachSelected).remove();NDA.val("");return false});if(typeof this.files=="object"){for(var b=0;b<this.files.length;b++){SN.U.PreviewAttach(this.files[b])}}})},maxFileSize:function(b){var a=$(b).find("input[name=MAX_FILE_SIZE]").attr("value");if(a){return parseInt(a)}else{return 0}},PreviewAttach:function(c){var d=c.type+" "+Math.round(c.size/1024)+"KB";var e=true;var g;if(typeof window.createObjectURL!="undefined"){g=function(h,i){i(window.createObjectURL(h))}}else{if(typeof window.FileReader!="undefined"){g=function(i,j){var h=new FileReader();h.onload=function(k){j(h.result)};h.readAsDataURL(i)}}else{e=false}}var a=["image/png","image/jpeg","image/gif","image/svg+xml"];if($.inArray(c.type,a)==-1){e=false}var f=8*1024*1024;if(c.size>f){e=false}if(e){g(c,function(i){var h=$("<img>").attr("title",d).attr("alt",d).attr("src",i).attr("style","height: 120px");$("#"+SN.C.S.NoticeDataAttachSelected).append(h)})}else{var b=$("<div></div>").text(d);$("#"+SN.C.S.NoticeDataAttachSelected).append(b)}},NoticeLocationAttach:function(){var c=$("#"+SN.C.S.NoticeLat).val();var h=$("#"+SN.C.S.NoticeLon).val();var d=$("#"+SN.C.S.NoticeLocationNs).val();var i=$("#"+SN.C.S.NoticeLocationId).val();var a=$("#"+SN.C.S.NoticeGeoName).text();var b=$("#"+SN.C.S.NoticeDataGeo);function e(){$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",jQuery.trim($("label[for="+SN.C.S.NoticeDataGeo+"]").text())).removeClass("checked");$("#"+SN.C.S.NoticeLat).val("");$("#"+SN.C.S.NoticeLon).val("");$("#"+SN.C.S.NoticeLocationNs).val("");$("#"+SN.C.S.NoticeLocationId).val("");$("#"+SN.C.S.NoticeDataGeo).attr("checked",false);$.cookie(SN.C.S.NoticeDataGeoCookie,"disabled",{path:"/"})}function j(k,l){$.getJSON(k,l,function(m){var n,o;if(typeof(m.location_ns)!="undefined"){$("#"+SN.C.S.NoticeLocationNs).val(m.location_ns);n=m.location_ns}if(typeof(m.location_id)!="undefined"){$("#"+SN.C.S.NoticeLocationId).val(m.location_id);o=m.location_id}if(typeof(m.name)=="undefined"){NLN_text=l.lat+";"+l.lon}else{NLN_text=m.name}$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",NoticeDataGeo_text.ShareDisable+" ("+NLN_text+")");$("#"+SN.C.S.NoticeLat).val(l.lat);$("#"+SN.C.S.NoticeLon).val(l.lon);$("#"+SN.C.S.NoticeLocationNs).val(n);$("#"+SN.C.S.NoticeLocationId).val(o);$("#"+SN.C.S.NoticeDataGeo).attr("checked",true);var p={NLat:l.lat,NLon:l.lon,NLNS:n,NLID:o,NLN:NLN_text,NLNU:m.url,NDG:true};$.cookie(SN.C.S.NoticeDataGeoCookie,JSON.stringify(p),{path:"/"})})}if(b.length>0){if($.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){b.attr("checked",false)}else{b.attr("checked",true)}var f=$("#notice_data-geo_wrap");var g=f.attr("title");f.removeAttr("title");$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",jQuery.trim($("label[for="+SN.C.S.NoticeDataGeo+"]").text()));b.change(function(){if($("#"+SN.C.S.NoticeDataGeo).attr("checked")===true||$.cookie(SN.C.S.NoticeDataGeoCookie)===null){$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",NoticeDataGeo_text.ShareDisable).addClass("checked");if($.cookie(SN.C.S.NoticeDataGeoCookie)===null||$.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){if(navigator.geolocation){navigator.geolocation.getCurrentPosition(function(m){$("#"+SN.C.S.NoticeLat).val(m.coords.latitude);$("#"+SN.C.S.NoticeLon).val(m.coords.longitude);var n={lat:m.coords.latitude,lon:m.coords.longitude,token:$("#token").val()};j(g,n)},function(m){switch(m.code){case m.PERMISSION_DENIED:e();break;case m.TIMEOUT:$("#"+SN.C.S.NoticeDataGeo).attr("checked",false);break}},{timeout:10000})}else{if(c.length>0&&h.length>0){var k={lat:c,lon:h,token:$("#token").val()};j(g,k)}else{e();$("#"+SN.C.S.NoticeDataGeo).remove();$("label[for="+SN.C.S.NoticeDataGeo+"]").remove()}}}else{var l=JSON.parse($.cookie(SN.C.S.NoticeDataGeoCookie));$("#"+SN.C.S.NoticeLat).val(l.NLat);$("#"+SN.C.S.NoticeLon).val(l.NLon);$("#"+SN.C.S.NoticeLocationNs).val(l.NLNS);$("#"+SN.C.S.NoticeLocationId).val(l.NLID);$("#"+SN.C.S.NoticeDataGeo).attr("checked",l.NDG);$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",NoticeDataGeo_text.ShareDisable+" ("+l.NLN+")").addClass("checked")}}else{e()}}).change()}},NewDirectMessage:function(){NDM=$(".entity_send-a-message a");NDM.attr({href:NDM.attr("href")+"&ajax=1"});NDM.bind("click",function(){var a=$(".entity_send-a-message form");if(a.length===0){$(this).addClass(SN.C.S.Processing);$.get(NDM.attr("href"),null,function(b){$(".entity_send-a-message").append(document._importNode($("form",b)[0],true));a=$(".entity_send-a-message .form_notice");SN.U.FormNoticeXHR(a);SN.U.FormNoticeEnhancements(a);a.append('<button class="close">&#215;</button>');$(".entity_send-a-message button").click(function(){a.hide();return false});NDM.removeClass(SN.C.S.Processing)})}else{a.show();$(".entity_send-a-message textarea").focus()}return false})},GetFullYear:function(c,d,a){var b=new Date();b.setFullYear(c,d,a);return b},StatusNetInstance:{Set:function(b){var a=SN.U.StatusNetInstance.Get();if(a!==null){b=$.extend(a,b)}$.cookie(SN.C.S.StatusNetInstance,JSON.stringify(b),{path:"/",expires:SN.U.GetFullYear(2029,0,1)})},Get:function(){var a=$.cookie(SN.C.S.StatusNetInstance);if(a!==null){return JSON.parse(a)}return null},Delete:function(){$.cookie(SN.C.S.StatusNetInstance,null)}},belongsOnTimeline:function(b){var a=$("body").attr("id");if(a=="public"){return true}var c=$("#nav_profile a").attr("href");if(c){var d=$(b).find(".entry-title .author a.url").attr("href");if(d==c){if(a=="all"||a=="showstream"){return true}}}return false}},Init:{NoticeForm:function(){if($("body.user_in").length>0){SN.U.NoticeLocationAttach();$("."+SN.C.S.FormNotice).each(function(){SN.U.FormNoticeXHR($(this));SN.U.FormNoticeEnhancements($(this))});SN.U.NoticeDataAttach()}},Notices:function(){if($("body.user_in").length>0){SN.U.NoticeFavor();SN.U.NoticeRepeat();SN.U.NoticeReply();SN.U.NoticeInlineReplySetup()}SN.U.NoticeAttachments()},EntityActions:function(){if($("body.user_in").length>0){$(".form_user_subscribe").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_user_unsubscribe").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_group_join").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_group_leave").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_user_nudge").live("click",function(){SN.U.FormXHR($(this));return false});SN.U.NewDirectMessage()}},Login:function(){if(SN.U.StatusNetInstance.Get()!==null){var a=SN.U.StatusNetInstance.Get().Nickname;if(a!==null){$("#form_login #nickname").val(a)}}$("#form_login").bind("submit",function(){SN.U.StatusNetInstance.Set({Nickname:$("#form_login #nickname").val()});return true})},UploadForms:function(){$("input[type=file]").change(function(d){if(typeof this.files=="object"&&this.files.length>0){var c=0;for(var b=0;b<this.files.length;b++){c+=this.files[b].size}var a=SN.U.maxFileSize($(this.form));if(a>0&&c>a){var e="File too large: maximum upload size is %d bytes.";alert(e.replace("%d",a));$(this).val("");d.preventDefault();return false}}})}}};$(document).ready(function(){SN.Init.UploadForms();if($("."+SN.C.S.FormNotice).length>0){SN.Init.NoticeForm()}if($("#content .notices").length>0){SN.Init.Notices()}if($("#content .entity_actions").length>0){SN.Init.EntityActions()}if($("#form_login").length>0){SN.Init.Login()}});if(!document.ELEMENT_NODE){document.ELEMENT_NODE=1;document.ATTRIBUTE_NODE=2;document.TEXT_NODE=3;document.CDATA_SECTION_NODE=4;document.ENTITY_REFERENCE_NODE=5;document.ENTITY_NODE=6;document.PROCESSING_INSTRUCTION_NODE=7;document.COMMENT_NODE=8;document.DOCUMENT_NODE=9;document.DOCUMENT_TYPE_NODE=10;document.DOCUMENT_FRAGMENT_NODE=11;document.NOTATION_NODE=12}document._importNode=function(e,a){switch(e.nodeType){case document.ELEMENT_NODE:var d=document.createElement(e.nodeName);if(e.attributes&&e.attributes.length>0){for(var c=0,b=e.attributes.length;c<b;){if(e.attributes[c].nodeName=="class"){d.className=e.getAttribute(e.attributes[c++].nodeName)}else{d.setAttribute(e.attributes[c].nodeName,e.getAttribute(e.attributes[c++].nodeName))}}}if(a&&e.childNodes&&e.childNodes.length>0){for(var c=0,b=e.childNodes.length;c<b;){d.appendChild(document._importNode(e.childNodes[c++],a))}}return d;break;case document.TEXT_NODE:case document.CDATA_SECTION_NODE:case document.COMMENT_NODE:return document.createTextNode(e.nodeValue);break}};if(typeof navigator.geolocation=="undefined"||navigator.geolocation.shim){(function(){(function(){if(window.google&&google.gears){return}var c=null;if(typeof GearsFactory!="undefined"){c=new GearsFactory()}else{try{c=new ActiveXObject("Gears.Factory");if(c.getBuildInfo().indexOf("ie_mobile")!=-1){c.privateSetGlobalObject(this)}}catch(d){if((typeof navigator.mimeTypes!="undefined")&&navigator.mimeTypes["application/x-googlegears"]){c=document.createElement("object");c.style.display="none";c.width=0;c.height=0;c.type="application/x-googlegears";document.documentElement.appendChild(c)}}}if(!c){return}if(!window.google){google={}}if(!google.gears){google.gears={factory:c}}})();var a=(function(){var d=google.gears.factory.create("beta.geolocation");var c=function(f,e){return function(g){f(g);e.lastPosition=g}};return{shim:true,type:"Gears",lastPosition:null,getCurrentPosition:function(e,g,h){var f=this;var i=c(e,f);d.getCurrentPosition(i,g,h)},watchPosition:function(e,f,g){d.watchPosition(e,f,g)},clearWatch:function(e){d.clearWatch(e)},getPermission:function(g,e,f){d.getPermission(g,e,f)}}});var b=(function(){var i=false;var e=function(){if(!d()&&!i){i=true;var j=document.createElement("script");j.src=(document.location.protocol=="https:"?"https://":"http://")+"www.google.com/jsapi?callback=_google_loader_apiLoaded";j.type="text/javascript";document.getElementsByTagName("body")[0].appendChild(j)}};var c=[];var h=function(j){c.push(j)};var f=function(){if(d()){while(c.length>0){var j=c.pop();j()}}};window._google_loader_apiLoaded=function(){f()};var d=function(){return(window.google&&google.loader)};var g=function(j){if(d()){return true}h(j);e();return false};e();return{shim:true,type:"ClientLocation",lastPosition:null,getCurrentPosition:function(k,n,o){var m=this;if(!g(function(){m.getCurrentPosition(k,n,o)})){return}if(google.loader.ClientLocation){var l=google.loader.ClientLocation;var j={coords:{latitude:l.latitude,longitude:l.longitude,altitude:null,accuracy:43000,altitudeAccuracy:null,heading:null,speed:null},address:{city:l.address.city,country:l.address.country,country_code:l.address.country_code,region:l.address.region},timestamp:new Date()};k(j);this.lastPosition=j}else{if(n==="function"){n({code:3,message:"Using the Google ClientLocation API and it is not able to calculate a location."})}}},watchPosition:function(j,l,m){this.getCurrentPosition(j,l,m);var k=this;var n=setInterval(function(){k.getCurrentPosition(j,l,m)},10000);return n},clearWatch:function(j){clearInterval(j)},getPermission:function(l,j,k){return true}}});navigator.geolocation=(window.google&&google.gears)?a():b()})()};
\ No newline at end of file
+var SN={C:{I:{CounterBlackout:false,MaxLength:140,PatternUsername:/^[0-9a-zA-Z\-_.]*$/,HTTP20x30x:[200,201,202,203,204,205,206,300,301,302,303,304,305,306,307]},S:{Disabled:"disabled",Warning:"warning",Error:"error",Success:"success",Processing:"processing",CommandResult:"command_result",FormNotice:"form_notice",NoticeDataText:"notice_data-text",NoticeTextCount:"notice_text-count",NoticeInReplyTo:"notice_in-reply-to",NoticeDataAttach:"notice_data-attach",NoticeDataAttachSelected:"notice_data-attach_selected",NoticeActionSubmit:"notice_action-submit",NoticeLat:"notice_data-lat",NoticeLon:"notice_data-lon",NoticeLocationId:"notice_data-location_id",NoticeLocationNs:"notice_data-location_ns",NoticeGeoName:"notice_data-geo_name",NoticeDataGeo:"notice_data-geo",NoticeDataGeoCookie:"NoticeDataGeo",NoticeDataGeoSelected:"notice_data-geo_selected",StatusNetInstance:"StatusNetInstance"}},messages:{},msg:function(a){if(typeof SN.messages[a]=="undefined"){return"["+a+"]"}else{return SN.messages[a]}},U:{FormNoticeEnhancements:function(b){if(jQuery.data(b[0],"ElementData")===undefined){MaxLength=b.find("#"+SN.C.S.NoticeTextCount).text();if(typeof(MaxLength)=="undefined"){MaxLength=SN.C.I.MaxLength}jQuery.data(b[0],"ElementData",{MaxLength:MaxLength});SN.U.Counter(b);NDT=b.find("#"+SN.C.S.NoticeDataText);NDT.bind("keyup",function(c){SN.U.Counter(b)});var a=function(c){window.setTimeout(function(){SN.U.Counter(b)},50)};NDT.bind("cut",a).bind("paste",a);NDT.bind("keydown",function(c){SN.U.SubmitOnReturn(c,b)})}else{b.find("#"+SN.C.S.NoticeTextCount).text(jQuery.data(b[0],"ElementData").MaxLength)}if($("body")[0].id!="conversation"&&window.location.hash.length===0&&$(window).scrollTop()==0){b.find("textarea").focus()}},SubmitOnReturn:function(b,a){if(b.keyCode==13||b.keyCode==10){a.submit();b.preventDefault();b.stopPropagation();$("#"+a[0].id+" #"+SN.C.S.NoticeDataText).blur();$("body").focus();return false}return true},Counter:function(d){SN.C.I.FormNoticeCurrent=d;var b=jQuery.data(d[0],"ElementData").MaxLength;if(b<=0){return}var c=b-SN.U.CharacterCount(d);var a=d.find("#"+SN.C.S.NoticeTextCount);if(c.toString()!=a.text()){if(!SN.C.I.CounterBlackout||c===0){if(a.text()!=String(c)){a.text(c)}if(c<0){d.addClass(SN.C.S.Warning)}else{d.removeClass(SN.C.S.Warning)}if(!SN.C.I.CounterBlackout){SN.C.I.CounterBlackout=true;SN.C.I.FormNoticeCurrent=d;window.setTimeout("SN.U.ClearCounterBlackout(SN.C.I.FormNoticeCurrent);",500)}}}},CharacterCount:function(a){return a.find("#"+SN.C.S.NoticeDataText).val().length},ClearCounterBlackout:function(a){SN.C.I.CounterBlackout=false;SN.U.Counter(a)},RewriteAjaxAction:function(a){if(document.location.protocol=="https:"&&a.substr(0,5)=="http:"){return a.replace(/^http:\/\/[^:\/]+/,"https://"+document.location.host)}else{return a}},FormXHR:function(a){$.ajax({type:"POST",dataType:"xml",url:SN.U.RewriteAjaxAction(a.attr("action")),data:a.serialize()+"&ajax=1",beforeSend:function(b){a.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(c,d,b){alert(b||d)},success:function(b,c){if(typeof($("form",b)[0])!="undefined"){form_new=document._importNode($("form",b)[0],true);a.replaceWith(form_new)}else{a.replaceWith(document._importNode($("p",b)[0],true))}}})},FormNoticeXHR:function(b){SN.C.I.NoticeDataGeo={};b.append('<input type="hidden" name="ajax" value="1"/>');b.attr("action",SN.U.RewriteAjaxAction(b.attr("action")));var c=function(d,e){b.append($('<p class="form_response"></p>').addClass(d).text(e))};var a=function(){b.find(".form_response").remove()};b.ajaxForm({dataType:"xml",timeout:"60000",beforeSend:function(d){if(b.find("#"+SN.C.S.NoticeDataText)[0].value.length===0){b.addClass(SN.C.S.Warning);return false}b.addClass(SN.C.S.Processing).find("#"+SN.C.S.NoticeActionSubmit).addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled);SN.C.I.NoticeDataGeo.NLat=$("#"+SN.C.S.NoticeLat).val();SN.C.I.NoticeDataGeo.NLon=$("#"+SN.C.S.NoticeLon).val();SN.C.I.NoticeDataGeo.NLNS=$("#"+SN.C.S.NoticeLocationNs).val();SN.C.I.NoticeDataGeo.NLID=$("#"+SN.C.S.NoticeLocationId).val();SN.C.I.NoticeDataGeo.NDG=$("#"+SN.C.S.NoticeDataGeo).attr("checked");cookieValue=$.cookie(SN.C.S.NoticeDataGeoCookie);if(cookieValue!==null&&cookieValue!="disabled"){cookieValue=JSON.parse(cookieValue);SN.C.I.NoticeDataGeo.NLat=$("#"+SN.C.S.NoticeLat).val(cookieValue.NLat).val();SN.C.I.NoticeDataGeo.NLon=$("#"+SN.C.S.NoticeLon).val(cookieValue.NLon).val();if($("#"+SN.C.S.NoticeLocationNs).val(cookieValue.NLNS)){SN.C.I.NoticeDataGeo.NLNS=$("#"+SN.C.S.NoticeLocationNs).val(cookieValue.NLNS).val();SN.C.I.NoticeDataGeo.NLID=$("#"+SN.C.S.NoticeLocationId).val(cookieValue.NLID).val()}}if(cookieValue=="disabled"){SN.C.I.NoticeDataGeo.NDG=$("#"+SN.C.S.NoticeDataGeo).attr("checked",false).attr("checked")}else{SN.C.I.NoticeDataGeo.NDG=$("#"+SN.C.S.NoticeDataGeo).attr("checked",true).attr("checked")}return true},error:function(f,g,e){b.removeClass(SN.C.S.Processing).find("#"+SN.C.S.NoticeActionSubmit).removeClass(SN.C.S.Disabled).removeAttr(SN.C.S.Disabled,SN.C.S.Disabled);a();if(g=="timeout"){c("error","Sorry! We had trouble sending your notice. The servers are overloaded. Please try again, and contact the site administrator if this problem persists.")}else{var d=SN.U.GetResponseXML(f);if($("."+SN.C.S.Error,d).length>0){b.append(document._importNode($("."+SN.C.S.Error,d)[0],true))}else{if(parseInt(f.status)===0||jQuery.inArray(parseInt(f.status),SN.C.I.HTTP20x30x)>=0){b.resetForm().find("#"+SN.C.S.NoticeDataAttachSelected).remove();SN.U.FormNoticeEnhancements(b)}else{c("error","(Sorry! We had trouble sending your notice ("+f.status+" "+f.statusText+"). Please report the problem to the site administrator if this happens again.")}}}},success:function(i,k){a();var e=$("#"+SN.C.S.Error,i);if(e.length>0){c("error",e.text())}else{if($("body")[0].id=="bookmarklet"){self.close()}var d=$("#"+SN.C.S.CommandResult,i);if(d.length>0){c("success",d.text())}else{var h=document._importNode($("li",i)[0],true);var j=$("#notices_primary .notices:first");if(j.length>0&&SN.U.belongsOnTimeline(h)){if($("#"+h.id).length===0){var f=$("#"+SN.C.S.NoticeInReplyTo).val();var g="#notices_primary #notice-"+f;if($("body")[0].id=="conversation"){if(f.length>0&&$(g+" .notices").length<1){$(g).append('<ul class="notices"></ul>')}$($(g+" .notices")[0]).append(h)}else{j.prepend(h)}$("#"+h.id).css({display:"none"}).fadeIn(2500);SN.U.NoticeWithAttachment($("#"+h.id));SN.U.NoticeReplyTo($("#"+h.id))}}else{c("success",$("title",i).text())}}b.resetForm();b.find("#"+SN.C.S.NoticeInReplyTo).val("");b.find("#"+SN.C.S.NoticeDataAttachSelected).remove();SN.U.FormNoticeEnhancements(b)}},complete:function(d,e){b.removeClass(SN.C.S.Processing).find("#"+SN.C.S.NoticeActionSubmit).removeAttr(SN.C.S.Disabled).removeClass(SN.C.S.Disabled);$("#"+SN.C.S.NoticeLat).val(SN.C.I.NoticeDataGeo.NLat);$("#"+SN.C.S.NoticeLon).val(SN.C.I.NoticeDataGeo.NLon);if($("#"+SN.C.S.NoticeLocationNs)){$("#"+SN.C.S.NoticeLocationNs).val(SN.C.I.NoticeDataGeo.NLNS);$("#"+SN.C.S.NoticeLocationId).val(SN.C.I.NoticeDataGeo.NLID)}$("#"+SN.C.S.NoticeDataGeo).attr("checked",SN.C.I.NoticeDataGeo.NDG)}})},GetResponseXML:function(b){try{return b.responseXML}catch(a){return(new DOMParser()).parseFromString(b.responseText,"text/xml")}},NoticeReply:function(){if($("#"+SN.C.S.NoticeDataText).length>0&&$("#content .notice_reply").length>0){$("#content .notice").each(function(){SN.U.NoticeReplyTo($(this))})}},NoticeReplyTo:function(a){a.find(".notice_reply").live("click",function(c){c.preventDefault();var b=($(".author .nickname",a).length>0)?$($(".author .nickname",a)[0]):$(".author .nickname.uid");SN.U.NoticeInlineReplyTrigger(a,"@"+b.text());return false})},NoticeInlineReplyTrigger:function(h,i){var c=$($(".notice_id",h)[0]).text();var d=h;var f=h.closest(".notices");if(f.hasClass("threaded-replies")){d=f.closest(".notice")}else{f=$("ul.threaded-replies",h);if(f.length==0){f=$('<ul class="notices threaded-replies xoxo"></ul>');h.append(f)}}var k=$(".notice-reply-form",f);if(k.length==0){$("li.notice-reply-placeholder").remove();var g=$("li.notice-reply",f);if(g.length==0){g=$('<li class="notice-reply"><form class="notice-reply-form" method="post"><textarea name="status_textarea"></textarea><div class="controls"><input type="hidden" name="token"><input type="hidden" name="inreplyto"><input type="submit" class="submit"></div></form></li>');var b=$("#form_notice");k=g.find("form");k.attr("action",b.attr("action"));k.find('input[name="token"]').val(b.find("input[name=token]").val());k.find('input[type="submit"]').val(SN.msg("reply_submit"));f.append(g);k.find("textarea").blur(function(){var m=$(this);var l=$.trim(m.val());if(l==""||l==m.data("initialText")){g.remove();if(f.find("li").length>0){SN.U.NoticeInlineReplyPlaceholder(d)}else{f.remove()}}});k.submit(function(m){var l=k;$.ajax({type:"POST",dataType:"xml",url:SN.U.RewriteAjaxAction(l.attr("action")),data:l.serialize()+"&ajax=1",beforeSend:function(n){l.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled).end().find("textarea").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(o,p,n){alert(n||p)},success:function(p,q){var o=$("li",p)[0];if(o){var n=document._importNode(o,true);if($("#notice-"+c).length==0){g.replaceWith(n);SN.U.NoticeInlineReplyPlaceholder(d)}else{g.remove()}}}});m.preventDefault();return false})}}k.find("input[name=inreplyto]").val(c);var j=k.find("textarea");if(j.length==0){throw"No textarea"}var a="";if(i){a=i+" "}j.val(a+j.val().replace(RegExp(a,"i"),""));j.data("initialText",$.trim(i+""));j.focus();if(j[0].setSelectionRange){var e=j.val().length;j[0].setSelectionRange(e,e)}},NoticeReplySet:function(b,d){if(b.match(SN.C.I.PatternUsername)){var c=$("#"+SN.C.S.NoticeDataText);if(c.length>0){replyto="@"+b+" ";c.val(replyto+c.val().replace(RegExp(replyto,"i"),""));$("#"+SN.C.S.FormNotice+" #"+SN.C.S.NoticeInReplyTo).val(d);c[0].focus();if(c[0].setSelectionRange){var a=c.val().length;c[0].setSelectionRange(a,a)}}}},NoticeFavor:function(){$(".form_favor").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_disfavor").live("click",function(){SN.U.FormXHR($(this));return false})},NoticeInlineReplyPlaceholder:function(b){var a=b.find("ul.threaded-replies");var c=$('<li class="notice-reply-placeholder"><input class="placeholder"></li>');c.click(function(){SN.U.NoticeInlineReplyTrigger(b)});c.find("input").val(SN.msg("reply_comment"));a.append(c)},NoticeInlineReplySetup:function(){$(".threaded-replies").each(function(){var b=$(this);var a=b.closest(".notice");SN.U.NoticeInlineReplyPlaceholder(a)})},NoticeRepeat:function(){$(".form_repeat").live("click",function(a){a.preventDefault();SN.U.NoticeRepeatConfirmation($(this));return false})},NoticeRepeatConfirmation:function(a){var c=a.find(".submit");var b=c.clone();b.addClass("submit_dialogbox").removeClass("submit");a.append(b);b.bind("click",function(){SN.U.FormXHR(a);return false});c.hide();a.addClass("dialogbox").append('<button class="close">&#215;</button>').closest(".notice-options").addClass("opaque");a.find("button.close").click(function(){$(this).remove();a.removeClass("dialogbox").closest(".notice-options").removeClass("opaque");a.find(".submit_dialogbox").remove();a.find(".submit").show();return false})},NoticeAttachments:function(){$(".notice a.attachment").each(function(){SN.U.NoticeWithAttachment($(this).closest(".notice"))})},NoticeWithAttachment:function(b){if(b.find(".attachment").length===0){return}var a=b.find(".attachment.more");if(a.length>0){$(a[0]).click(function(){var c=$(this);c.addClass(SN.C.S.Processing);$.get(c.attr("href")+"/ajax",null,function(d){c.parent(".entry-content").html($(d).find("#attachment_view .entry-content").html())});return false}).attr("title",SN.msg("showmore_tooltip"))}},NoticeDataAttach:function(){NDA=$("#"+SN.C.S.NoticeDataAttach);NDA.change(function(c){var a=$(this).val();if(!a){$("#"+SN.C.S.NoticeDataAttachSelected).remove();return false}S='<div id="'+SN.C.S.NoticeDataAttachSelected+'" class="'+SN.C.S.Success+'"><code>'+a+'</code> <button class="close">&#215;</button></div>';NDAS=$("#"+SN.C.S.NoticeDataAttachSelected);if(NDAS.length>0){NDAS.replaceWith(S)}else{$("#"+SN.C.S.FormNotice).append(S)}$("#"+SN.C.S.NoticeDataAttachSelected+" button").click(function(){$("#"+SN.C.S.NoticeDataAttachSelected).remove();NDA.val("");return false});if(typeof this.files=="object"){for(var b=0;b<this.files.length;b++){SN.U.PreviewAttach(this.files[b])}}})},maxFileSize:function(b){var a=$(b).find("input[name=MAX_FILE_SIZE]").attr("value");if(a){return parseInt(a)}else{return 0}},PreviewAttach:function(c){var d=c.type+" "+Math.round(c.size/1024)+"KB";var e=true;var g;if(typeof window.createObjectURL!="undefined"){g=function(h,i){i(window.createObjectURL(h))}}else{if(typeof window.FileReader!="undefined"){g=function(i,j){var h=new FileReader();h.onload=function(k){j(h.result)};h.readAsDataURL(i)}}else{e=false}}var a=["image/png","image/jpeg","image/gif","image/svg+xml"];if($.inArray(c.type,a)==-1){e=false}var f=8*1024*1024;if(c.size>f){e=false}if(e){g(c,function(i){var h=$("<img>").attr("title",d).attr("alt",d).attr("src",i).attr("style","height: 120px");$("#"+SN.C.S.NoticeDataAttachSelected).append(h)})}else{var b=$("<div></div>").text(d);$("#"+SN.C.S.NoticeDataAttachSelected).append(b)}},NoticeLocationAttach:function(){var c=$("#"+SN.C.S.NoticeLat).val();var h=$("#"+SN.C.S.NoticeLon).val();var d=$("#"+SN.C.S.NoticeLocationNs).val();var i=$("#"+SN.C.S.NoticeLocationId).val();var a=$("#"+SN.C.S.NoticeGeoName).text();var b=$("#"+SN.C.S.NoticeDataGeo);function e(){$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",jQuery.trim($("label[for="+SN.C.S.NoticeDataGeo+"]").text())).removeClass("checked");$("#"+SN.C.S.NoticeLat).val("");$("#"+SN.C.S.NoticeLon).val("");$("#"+SN.C.S.NoticeLocationNs).val("");$("#"+SN.C.S.NoticeLocationId).val("");$("#"+SN.C.S.NoticeDataGeo).attr("checked",false);$.cookie(SN.C.S.NoticeDataGeoCookie,"disabled",{path:"/"})}function j(k,l){$.getJSON(k,l,function(m){var n,o;if(typeof(m.location_ns)!="undefined"){$("#"+SN.C.S.NoticeLocationNs).val(m.location_ns);n=m.location_ns}if(typeof(m.location_id)!="undefined"){$("#"+SN.C.S.NoticeLocationId).val(m.location_id);o=m.location_id}if(typeof(m.name)=="undefined"){NLN_text=l.lat+";"+l.lon}else{NLN_text=m.name}$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",NoticeDataGeo_text.ShareDisable+" ("+NLN_text+")");$("#"+SN.C.S.NoticeLat).val(l.lat);$("#"+SN.C.S.NoticeLon).val(l.lon);$("#"+SN.C.S.NoticeLocationNs).val(n);$("#"+SN.C.S.NoticeLocationId).val(o);$("#"+SN.C.S.NoticeDataGeo).attr("checked",true);var p={NLat:l.lat,NLon:l.lon,NLNS:n,NLID:o,NLN:NLN_text,NLNU:m.url,NDG:true};$.cookie(SN.C.S.NoticeDataGeoCookie,JSON.stringify(p),{path:"/"})})}if(b.length>0){if($.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){b.attr("checked",false)}else{b.attr("checked",true)}var f=$("#notice_data-geo_wrap");var g=f.attr("title");f.removeAttr("title");$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",jQuery.trim($("label[for="+SN.C.S.NoticeDataGeo+"]").text()));b.change(function(){if($("#"+SN.C.S.NoticeDataGeo).attr("checked")===true||$.cookie(SN.C.S.NoticeDataGeoCookie)===null){$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",NoticeDataGeo_text.ShareDisable).addClass("checked");if($.cookie(SN.C.S.NoticeDataGeoCookie)===null||$.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){if(navigator.geolocation){navigator.geolocation.getCurrentPosition(function(m){$("#"+SN.C.S.NoticeLat).val(m.coords.latitude);$("#"+SN.C.S.NoticeLon).val(m.coords.longitude);var n={lat:m.coords.latitude,lon:m.coords.longitude,token:$("#token").val()};j(g,n)},function(m){switch(m.code){case m.PERMISSION_DENIED:e();break;case m.TIMEOUT:$("#"+SN.C.S.NoticeDataGeo).attr("checked",false);break}},{timeout:10000})}else{if(c.length>0&&h.length>0){var k={lat:c,lon:h,token:$("#token").val()};j(g,k)}else{e();$("#"+SN.C.S.NoticeDataGeo).remove();$("label[for="+SN.C.S.NoticeDataGeo+"]").remove()}}}else{var l=JSON.parse($.cookie(SN.C.S.NoticeDataGeoCookie));$("#"+SN.C.S.NoticeLat).val(l.NLat);$("#"+SN.C.S.NoticeLon).val(l.NLon);$("#"+SN.C.S.NoticeLocationNs).val(l.NLNS);$("#"+SN.C.S.NoticeLocationId).val(l.NLID);$("#"+SN.C.S.NoticeDataGeo).attr("checked",l.NDG);$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",NoticeDataGeo_text.ShareDisable+" ("+l.NLN+")").addClass("checked")}}else{e()}}).change()}},NewDirectMessage:function(){NDM=$(".entity_send-a-message a");NDM.attr({href:NDM.attr("href")+"&ajax=1"});NDM.bind("click",function(){var a=$(".entity_send-a-message form");if(a.length===0){$(this).addClass(SN.C.S.Processing);$.get(NDM.attr("href"),null,function(b){$(".entity_send-a-message").append(document._importNode($("form",b)[0],true));a=$(".entity_send-a-message .form_notice");SN.U.FormNoticeXHR(a);SN.U.FormNoticeEnhancements(a);a.append('<button class="close">&#215;</button>');$(".entity_send-a-message button").click(function(){a.hide();return false});NDM.removeClass(SN.C.S.Processing)})}else{a.show();$(".entity_send-a-message textarea").focus()}return false})},GetFullYear:function(c,d,a){var b=new Date();b.setFullYear(c,d,a);return b},StatusNetInstance:{Set:function(b){var a=SN.U.StatusNetInstance.Get();if(a!==null){b=$.extend(a,b)}$.cookie(SN.C.S.StatusNetInstance,JSON.stringify(b),{path:"/",expires:SN.U.GetFullYear(2029,0,1)})},Get:function(){var a=$.cookie(SN.C.S.StatusNetInstance);if(a!==null){return JSON.parse(a)}return null},Delete:function(){$.cookie(SN.C.S.StatusNetInstance,null)}},belongsOnTimeline:function(b){var a=$("body").attr("id");if(a=="public"){return true}var c=$("#nav_profile a").attr("href");if(c){var d=$(b).find(".entry-title .author a.url").attr("href");if(d==c){if(a=="all"||a=="showstream"){return true}}}return false}},Init:{NoticeForm:function(){if($("body.user_in").length>0){SN.U.NoticeLocationAttach();$("."+SN.C.S.FormNotice).each(function(){SN.U.FormNoticeXHR($(this));SN.U.FormNoticeEnhancements($(this))});SN.U.NoticeDataAttach()}},Notices:function(){if($("body.user_in").length>0){SN.U.NoticeFavor();SN.U.NoticeRepeat();SN.U.NoticeReply();SN.U.NoticeInlineReplySetup()}SN.U.NoticeAttachments()},EntityActions:function(){if($("body.user_in").length>0){$(".form_user_subscribe").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_user_unsubscribe").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_group_join").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_group_leave").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_user_nudge").live("click",function(){SN.U.FormXHR($(this));return false});SN.U.NewDirectMessage()}},Login:function(){if(SN.U.StatusNetInstance.Get()!==null){var a=SN.U.StatusNetInstance.Get().Nickname;if(a!==null){$("#form_login #nickname").val(a)}}$("#form_login").bind("submit",function(){SN.U.StatusNetInstance.Set({Nickname:$("#form_login #nickname").val()});return true})},UploadForms:function(){$("input[type=file]").change(function(d){if(typeof this.files=="object"&&this.files.length>0){var c=0;for(var b=0;b<this.files.length;b++){c+=this.files[b].size}var a=SN.U.maxFileSize($(this.form));if(a>0&&c>a){var e="File too large: maximum upload size is %d bytes.";alert(e.replace("%d",a));$(this).val("");d.preventDefault();return false}}})}}};$(document).ready(function(){SN.Init.UploadForms();if($("."+SN.C.S.FormNotice).length>0){SN.Init.NoticeForm()}if($("#content .notices").length>0){SN.Init.Notices()}if($("#content .entity_actions").length>0){SN.Init.EntityActions()}if($("#form_login").length>0){SN.Init.Login()}});if(!document.ELEMENT_NODE){document.ELEMENT_NODE=1;document.ATTRIBUTE_NODE=2;document.TEXT_NODE=3;document.CDATA_SECTION_NODE=4;document.ENTITY_REFERENCE_NODE=5;document.ENTITY_NODE=6;document.PROCESSING_INSTRUCTION_NODE=7;document.COMMENT_NODE=8;document.DOCUMENT_NODE=9;document.DOCUMENT_TYPE_NODE=10;document.DOCUMENT_FRAGMENT_NODE=11;document.NOTATION_NODE=12}document._importNode=function(e,a){switch(e.nodeType){case document.ELEMENT_NODE:var d=document.createElement(e.nodeName);if(e.attributes&&e.attributes.length>0){for(var c=0,b=e.attributes.length;c<b;){if(e.attributes[c].nodeName=="class"){d.className=e.getAttribute(e.attributes[c++].nodeName)}else{d.setAttribute(e.attributes[c].nodeName,e.getAttribute(e.attributes[c++].nodeName))}}}if(a&&e.childNodes&&e.childNodes.length>0){for(var c=0,b=e.childNodes.length;c<b;){d.appendChild(document._importNode(e.childNodes[c++],a))}}return d;break;case document.TEXT_NODE:case document.CDATA_SECTION_NODE:case document.COMMENT_NODE:return document.createTextNode(e.nodeValue);break}};if(typeof navigator.geolocation=="undefined"||navigator.geolocation.shim){(function(){(function(){if(window.google&&google.gears){return}var c=null;if(typeof GearsFactory!="undefined"){c=new GearsFactory()}else{try{c=new ActiveXObject("Gears.Factory");if(c.getBuildInfo().indexOf("ie_mobile")!=-1){c.privateSetGlobalObject(this)}}catch(d){if((typeof navigator.mimeTypes!="undefined")&&navigator.mimeTypes["application/x-googlegears"]){c=document.createElement("object");c.style.display="none";c.width=0;c.height=0;c.type="application/x-googlegears";document.documentElement.appendChild(c)}}}if(!c){return}if(!window.google){google={}}if(!google.gears){google.gears={factory:c}}})();var a=(function(){var d=google.gears.factory.create("beta.geolocation");var c=function(f,e){return function(g){f(g);e.lastPosition=g}};return{shim:true,type:"Gears",lastPosition:null,getCurrentPosition:function(e,g,h){var f=this;var i=c(e,f);d.getCurrentPosition(i,g,h)},watchPosition:function(e,f,g){d.watchPosition(e,f,g)},clearWatch:function(e){d.clearWatch(e)},getPermission:function(g,e,f){d.getPermission(g,e,f)}}});var b=(function(){var i=false;var e=function(){if(!d()&&!i){i=true;var j=document.createElement("script");j.src=(document.location.protocol=="https:"?"https://":"http://")+"www.google.com/jsapi?callback=_google_loader_apiLoaded";j.type="text/javascript";document.getElementsByTagName("body")[0].appendChild(j)}};var c=[];var h=function(j){c.push(j)};var f=function(){if(d()){while(c.length>0){var j=c.pop();j()}}};window._google_loader_apiLoaded=function(){f()};var d=function(){return(window.google&&google.loader)};var g=function(j){if(d()){return true}h(j);e();return false};e();return{shim:true,type:"ClientLocation",lastPosition:null,getCurrentPosition:function(k,n,o){var m=this;if(!g(function(){m.getCurrentPosition(k,n,o)})){return}if(google.loader.ClientLocation){var l=google.loader.ClientLocation;var j={coords:{latitude:l.latitude,longitude:l.longitude,altitude:null,accuracy:43000,altitudeAccuracy:null,heading:null,speed:null},address:{city:l.address.city,country:l.address.country,country_code:l.address.country_code,region:l.address.region},timestamp:new Date()};k(j);this.lastPosition=j}else{if(n==="function"){n({code:3,message:"Using the Google ClientLocation API and it is not able to calculate a location."})}}},watchPosition:function(j,l,m){this.getCurrentPosition(j,l,m);var k=this;var n=setInterval(function(){k.getCurrentPosition(j,l,m)},10000);return n},clearWatch:function(j){clearInterval(j)},getPermission:function(l,j,k){return true}}});navigator.geolocation=(window.google&&google.gears)?a():b()})()};
\ No newline at end of file
diff --git a/lib/threadednoticelist.php b/lib/threadednoticelist.php
index 1298f179f9..645f15438f 100644
--- a/lib/threadednoticelist.php
+++ b/lib/threadednoticelist.php
@@ -64,7 +64,7 @@ class ThreadedNoticeList extends NoticeList
     {
         $this->out->elementStart('div', array('id' =>'notices_primary'));
         $this->out->element('h2', null, _('Notices'));
-        $this->out->elementStart('ol', array('class' => 'notices xoxo'));
+        $this->out->elementStart('ol', array('class' => 'notices threaded-notices xoxo'));
 
         $cnt = 0;
         $conversations = array();
@@ -182,7 +182,7 @@ class ThreadedNoticeListItem extends NoticeListItem
             }
 
             if ($notices) {
-                $this->out->elementStart('ul', 'notices threaded-notices xoxo');
+                $this->out->elementStart('ul', 'notices threaded-replies xoxo');
                 if ($moreCutoff) {
                     $item = new ThreadedNoticeListMoreItem($moreCutoff, $this->out);
                     $item->show();
diff --git a/plugins/Realtime/realtimeupdate.js b/plugins/Realtime/realtimeupdate.js
index 4befb05771..e615895cab 100644
--- a/plugins/Realtime/realtimeupdate.js
+++ b/plugins/Realtime/realtimeupdate.js
@@ -169,7 +169,7 @@ RealtimeUpdate = {
         var list = $("#notices_primary .notices:first")
         var prepend = true;
 
-        var threaded = true;
+        var threaded = list.hasClass('threaded-notices');
         if (threaded && data.in_reply_to_status_id) {
             // aho!
             var parent = $('#notice-' + data.in_reply_to_status_id);
@@ -179,12 +179,12 @@ RealtimeUpdate = {
                 // Check the parent notice to make sure it's not a reply itself.
                 // If so, use it's parent as the parent.
                 var parentList = parent.closest('.notices');
-                if (parentList.hasClass('threaded-notices')) {
+                if (parentList.hasClass('threaded-replies')) {
                     parent = parentList.closest('.notice');
                 }
-                list = parent.find('.threaded-notices');
+                list = parent.find('.threaded-replies');
                 if (list.length == 0) {
-                    list = $('<ul class="notices threaded-notices xoxo"></ul>');
+                    list = $('<ul class="notices threaded-replies xoxo"></ul>');
                     parent.append(list);
                 }
                 prepend = false;
diff --git a/plugins/Realtime/realtimeupdate.min.js b/plugins/Realtime/realtimeupdate.min.js
index 549bc77596..931de982ef 100644
--- a/plugins/Realtime/realtimeupdate.min.js
+++ b/plugins/Realtime/realtimeupdate.min.js
@@ -1 +1 @@
-RealtimeUpdate={_userid:0,_replyurl:"",_favorurl:"",_repeaturl:"",_deleteurl:"",_updatecounter:0,_maxnotices:50,_windowhasfocus:true,_documenttitle:"",_paused:false,_queuedNotices:[],init:function(c,b,d,e,a){RealtimeUpdate._userid=c;RealtimeUpdate._replyurl=b;RealtimeUpdate._favorurl=d;RealtimeUpdate._repeaturl=e;RealtimeUpdate._deleteurl=a;RealtimeUpdate._documenttitle=document.title;$(window).bind("focus",function(){RealtimeUpdate._windowhasfocus=true;RealtimeUpdate._updatecounter=0;RealtimeUpdate.removeWindowCounter()});$(window).bind("blur",function(){$("#notices_primary .notice").removeClass("mark-top");$("#notices_primary .notice:first").addClass("mark-top");RealtimeUpdate._windowhasfocus=false;return false})},receive:function(a){if(RealtimeUpdate.isNoticeVisible(a.id)){return}if(RealtimeUpdate._paused===false){RealtimeUpdate.purgeLastNoticeItem();RealtimeUpdate.insertNoticeItem(a)}else{RealtimeUpdate._queuedNotices.push(a);RealtimeUpdate.updateQueuedCounter()}RealtimeUpdate.updateWindowCounter()},insertNoticeItem:function(b){if(RealtimeUpdate.isNoticeVisible(b.id)){return}var a=RealtimeUpdate.makeNoticeItem(b);var c=$(a).attr("id");var d=$("#notices_primary .notices:first");var j=true;var e=true;if(e&&b.in_reply_to_status_id){var g=$("#notice-"+b.in_reply_to_status_id);if(g.length==0){}else{var h=g.closest(".notices");if(h.hasClass("threaded-notices")){g=h.closest(".notice")}d=g.find(".threaded-notices");if(d.length==0){d=$('<ul class="notices threaded-notices xoxo"></ul>');g.append(d)}j=false}}var i=$(a);if(j){d.prepend(i)}else{var f=d.find("li.notice-reply-placeholder");if(f.length>0){i.insertBefore(f)}else{i.appendTo(d);SN.U.NoticeInlineReplyPlaceholder(g)}}i.css({display:"none"}).fadeIn(1000);SN.U.NoticeReplyTo($("#"+c));SN.U.NoticeWithAttachment($("#"+c))},isNoticeVisible:function(a){return($("#notice-"+a).length>0)},purgeLastNoticeItem:function(){if($("#notices_primary .notice").length>RealtimeUpdate._maxnotices){$("#notices_primary .notice:last").remove()}},updateWindowCounter:function(){if(RealtimeUpdate._windowhasfocus===false){RealtimeUpdate._updatecounter+=1;document.title="("+RealtimeUpdate._updatecounter+") "+RealtimeUpdate._documenttitle}},removeWindowCounter:function(){document.title=RealtimeUpdate._documenttitle},makeNoticeItem:function(c){if(c.hasOwnProperty("retweeted_status")){original=c.retweeted_status;repeat=c;c=original;unique=repeat.id;responsible=repeat.user}else{original=null;repeat=null;unique=c.id;responsible=c.user}user=c.user;html=c.html.replace(/&lt;/g,"<").replace(/&gt;/g,">").replace(/&quot;/g,'"').replace(/&amp;/g,"&");source=c.source.replace(/&lt;/g,"<").replace(/&gt;/g,">").replace(/&quot;/g,'"').replace(/&amp;/g,"&");ni='<li class="hentry notice" id="notice-'+unique+'"><div class="entry-title"><span class="vcard author"><a href="'+user.profile_url+'" class="url" title="'+user.name+'"><img src="'+user.profile_image_url+'" class="avatar photo" width="48" height="48" alt="'+user.screen_name+'"/><span class="nickname fn">'+user.screen_name+'</span></a></span><p class="entry-content">'+html+'</p></div><div class="entry-content"><a class="timestamp" rel="bookmark" href="'+c.url+'" ><abbr class="published" title="'+c.created_at+'">a few seconds ago</abbr></a> <span class="source">from <span class="device">'+source+"</span></span>";if(c.conversation_url){ni=ni+' <a class="response" href="'+c.conversation_url+'">in context</a>'}if(repeat){ru=repeat.user;ni=ni+'<span class="repeat vcard">Repeated by <a href="'+ru.profile_url+'" class="url"><span class="nickname">'+ru.screen_name+"</span></a></span>"}ni=ni+"</div>";ni=ni+'<div class="notice-options">';if(RealtimeUpdate._userid!=0){var a=$("form#form_notice fieldset input#token");var b=a.val();ni=ni+RealtimeUpdate.makeFavoriteForm(c.id,b);ni=ni+RealtimeUpdate.makeReplyLink(c.id,c.user["screen_name"]);if(RealtimeUpdate._userid==responsible.id){ni=ni+RealtimeUpdate.makeDeleteLink(c.id)}else{if(RealtimeUpdate._userid!=user.id){ni=ni+RealtimeUpdate.makeRepeatForm(c.id,b)}}}ni=ni+"</div>";ni=ni+"</li>";return ni},makeFavoriteForm:function(c,b){var a;a='<form id="favor-'+c+'" class="form_favor" method="post" action="'+RealtimeUpdate._favorurl+'"><fieldset><legend>Favor this notice</legend><input name="token-'+c+'" type="hidden" id="token-'+c+'" value="'+b+'"/><input name="notice" type="hidden" id="notice-n'+c+'" value="'+c+'"/><input type="submit" id="favor-submit-'+c+'" name="favor-submit-'+c+'" class="submit" value="Favor" title="Favor this notice"/></fieldset></form>';return a},makeReplyLink:function(c,a){var b;b='<a class="notice_reply" href="'+RealtimeUpdate._replyurl+"?replyto="+a+'" title="Reply to this notice">Reply <span class="notice_id">'+c+"</span></a>";return b},makeRepeatForm:function(c,b){var a;a='<form id="repeat-'+c+'" class="form_repeat" method="post" action="'+RealtimeUpdate._repeaturl+'"><fieldset><legend>Repeat this notice?</legend><input name="token-'+c+'" type="hidden" id="token-'+c+'" value="'+b+'"/><input name="notice" type="hidden" id="notice-'+c+'" value="'+c+'"/><input type="submit" id="repeat-submit-'+c+'" name="repeat-submit-'+c+'" class="submit" value="Yes" title="Repeat this notice"/></fieldset></form>';return a},makeDeleteLink:function(c){var b,a;a=RealtimeUpdate._deleteurl.replace("0000000000",c);b='<a class="notice_delete" href="'+a+'" title="Delete this notice">Delete</a>';return b},initActions:function(a,b,c){$("#notices_primary").prepend('<ul id="realtime_actions"><li id="realtime_playpause"></li><li id="realtime_timeline"></li></ul>');RealtimeUpdate._pluginPath=c;RealtimeUpdate.initPlayPause();RealtimeUpdate.initAddPopup(a,b,RealtimeUpdate._pluginPath)},initPlayPause:function(){if(typeof(localStorage)=="undefined"){RealtimeUpdate.showPause()}else{if(localStorage.getItem("RealtimeUpdate_paused")==="true"){RealtimeUpdate.showPlay()}else{RealtimeUpdate.showPause()}}},showPause:function(){RealtimeUpdate.setPause(false);RealtimeUpdate.showQueuedNotices();RealtimeUpdate.addNoticesHover();$("#realtime_playpause").remove();$("#realtime_actions").prepend('<li id="realtime_playpause"><button id="realtime_pause" class="pause"></button></li>');$("#realtime_pause").text(SN.msg("realtime_pause")).attr("title",SN.msg("realtime_pause_tooltip")).bind("click",function(){RealtimeUpdate.removeNoticesHover();RealtimeUpdate.showPlay();return false})},showPlay:function(){RealtimeUpdate.setPause(true);$("#realtime_playpause").remove();$("#realtime_actions").prepend('<li id="realtime_playpause"><span id="queued_counter"></span> <button id="realtime_play" class="play"></button></li>');$("#realtime_play").text(SN.msg("realtime_play")).attr("title",SN.msg("realtime_play_tooltip")).bind("click",function(){RealtimeUpdate.showPause();return false})},setPause:function(a){RealtimeUpdate._paused=a;if(typeof(localStorage)!="undefined"){localStorage.setItem("RealtimeUpdate_paused",RealtimeUpdate._paused)}},showQueuedNotices:function(){$.each(RealtimeUpdate._queuedNotices,function(a,b){RealtimeUpdate.insertNoticeItem(b)});RealtimeUpdate._queuedNotices=[];RealtimeUpdate.removeQueuedCounter()},updateQueuedCounter:function(){$("#realtime_playpause #queued_counter").html("("+RealtimeUpdate._queuedNotices.length+")")},removeQueuedCounter:function(){$("#realtime_playpause #queued_counter").empty()},addNoticesHover:function(){$("#notices_primary .notices").hover(function(){if(RealtimeUpdate._paused===false){RealtimeUpdate.showPlay()}},function(){if(RealtimeUpdate._paused===true){RealtimeUpdate.showPause()}})},removeNoticesHover:function(){$("#notices_primary .notices").unbind()},initAddPopup:function(a,b,c){$("#realtime_timeline").append('<button id="realtime_popup"></button>');$("#realtime_popup").text(SN.msg("realtime_popup")).attr("title",SN.msg("realtime_popup_tooltip")).bind("click",function(){window.open(a,"","toolbar=no,resizable=yes,scrollbars=yes,status=no,menubar=no,personalbar=no,location=no,width=500,height=550");return false})},initPopupWindow:function(){$(".notices .entry-title a, .notices .entry-content a").bind("click",function(){window.open(this.href,"");return false});$("#showstream .entity_profile").css({width:"69%"})}};
\ No newline at end of file
+RealtimeUpdate={_userid:0,_replyurl:"",_favorurl:"",_repeaturl:"",_deleteurl:"",_updatecounter:0,_maxnotices:50,_windowhasfocus:true,_documenttitle:"",_paused:false,_queuedNotices:[],init:function(c,b,d,e,a){RealtimeUpdate._userid=c;RealtimeUpdate._replyurl=b;RealtimeUpdate._favorurl=d;RealtimeUpdate._repeaturl=e;RealtimeUpdate._deleteurl=a;RealtimeUpdate._documenttitle=document.title;$(window).bind("focus",function(){RealtimeUpdate._windowhasfocus=true;RealtimeUpdate._updatecounter=0;RealtimeUpdate.removeWindowCounter()});$(window).bind("blur",function(){$("#notices_primary .notice").removeClass("mark-top");$("#notices_primary .notice:first").addClass("mark-top");RealtimeUpdate._windowhasfocus=false;return false})},receive:function(a){if(RealtimeUpdate.isNoticeVisible(a.id)){return}if(RealtimeUpdate._paused===false){RealtimeUpdate.purgeLastNoticeItem();RealtimeUpdate.insertNoticeItem(a)}else{RealtimeUpdate._queuedNotices.push(a);RealtimeUpdate.updateQueuedCounter()}RealtimeUpdate.updateWindowCounter()},insertNoticeItem:function(b){if(RealtimeUpdate.isNoticeVisible(b.id)){return}var a=RealtimeUpdate.makeNoticeItem(b);var c=$(a).attr("id");var d=$("#notices_primary .notices:first");var j=true;var e=d.hasClass("threaded-notices");if(e&&b.in_reply_to_status_id){var g=$("#notice-"+b.in_reply_to_status_id);if(g.length==0){}else{var h=g.closest(".notices");if(h.hasClass("threaded-replies")){g=h.closest(".notice")}d=g.find(".threaded-replies");if(d.length==0){d=$('<ul class="notices threaded-replies xoxo"></ul>');g.append(d)}j=false}}var i=$(a);if(j){d.prepend(i)}else{var f=d.find("li.notice-reply-placeholder");if(f.length>0){i.insertBefore(f)}else{i.appendTo(d);SN.U.NoticeInlineReplyPlaceholder(g)}}i.css({display:"none"}).fadeIn(1000);SN.U.NoticeReplyTo($("#"+c));SN.U.NoticeWithAttachment($("#"+c))},isNoticeVisible:function(a){return($("#notice-"+a).length>0)},purgeLastNoticeItem:function(){if($("#notices_primary .notice").length>RealtimeUpdate._maxnotices){$("#notices_primary .notice:last").remove()}},updateWindowCounter:function(){if(RealtimeUpdate._windowhasfocus===false){RealtimeUpdate._updatecounter+=1;document.title="("+RealtimeUpdate._updatecounter+") "+RealtimeUpdate._documenttitle}},removeWindowCounter:function(){document.title=RealtimeUpdate._documenttitle},makeNoticeItem:function(c){if(c.hasOwnProperty("retweeted_status")){original=c.retweeted_status;repeat=c;c=original;unique=repeat.id;responsible=repeat.user}else{original=null;repeat=null;unique=c.id;responsible=c.user}user=c.user;html=c.html.replace(/&lt;/g,"<").replace(/&gt;/g,">").replace(/&quot;/g,'"').replace(/&amp;/g,"&");source=c.source.replace(/&lt;/g,"<").replace(/&gt;/g,">").replace(/&quot;/g,'"').replace(/&amp;/g,"&");ni='<li class="hentry notice" id="notice-'+unique+'"><div class="entry-title"><span class="vcard author"><a href="'+user.profile_url+'" class="url" title="'+user.name+'"><img src="'+user.profile_image_url+'" class="avatar photo" width="48" height="48" alt="'+user.screen_name+'"/><span class="nickname fn">'+user.screen_name+'</span></a></span><p class="entry-content">'+html+'</p></div><div class="entry-content"><a class="timestamp" rel="bookmark" href="'+c.url+'" ><abbr class="published" title="'+c.created_at+'">a few seconds ago</abbr></a> <span class="source">from <span class="device">'+source+"</span></span>";if(c.conversation_url){ni=ni+' <a class="response" href="'+c.conversation_url+'">in context</a>'}if(repeat){ru=repeat.user;ni=ni+'<span class="repeat vcard">Repeated by <a href="'+ru.profile_url+'" class="url"><span class="nickname">'+ru.screen_name+"</span></a></span>"}ni=ni+"</div>";ni=ni+'<div class="notice-options">';if(RealtimeUpdate._userid!=0){var a=$("form#form_notice fieldset input#token");var b=a.val();ni=ni+RealtimeUpdate.makeFavoriteForm(c.id,b);ni=ni+RealtimeUpdate.makeReplyLink(c.id,c.user["screen_name"]);if(RealtimeUpdate._userid==responsible.id){ni=ni+RealtimeUpdate.makeDeleteLink(c.id)}else{if(RealtimeUpdate._userid!=user.id){ni=ni+RealtimeUpdate.makeRepeatForm(c.id,b)}}}ni=ni+"</div>";ni=ni+"</li>";return ni},makeFavoriteForm:function(c,b){var a;a='<form id="favor-'+c+'" class="form_favor" method="post" action="'+RealtimeUpdate._favorurl+'"><fieldset><legend>Favor this notice</legend><input name="token-'+c+'" type="hidden" id="token-'+c+'" value="'+b+'"/><input name="notice" type="hidden" id="notice-n'+c+'" value="'+c+'"/><input type="submit" id="favor-submit-'+c+'" name="favor-submit-'+c+'" class="submit" value="Favor" title="Favor this notice"/></fieldset></form>';return a},makeReplyLink:function(c,a){var b;b='<a class="notice_reply" href="'+RealtimeUpdate._replyurl+"?replyto="+a+'" title="Reply to this notice">Reply <span class="notice_id">'+c+"</span></a>";return b},makeRepeatForm:function(c,b){var a;a='<form id="repeat-'+c+'" class="form_repeat" method="post" action="'+RealtimeUpdate._repeaturl+'"><fieldset><legend>Repeat this notice?</legend><input name="token-'+c+'" type="hidden" id="token-'+c+'" value="'+b+'"/><input name="notice" type="hidden" id="notice-'+c+'" value="'+c+'"/><input type="submit" id="repeat-submit-'+c+'" name="repeat-submit-'+c+'" class="submit" value="Yes" title="Repeat this notice"/></fieldset></form>';return a},makeDeleteLink:function(c){var b,a;a=RealtimeUpdate._deleteurl.replace("0000000000",c);b='<a class="notice_delete" href="'+a+'" title="Delete this notice">Delete</a>';return b},initActions:function(a,b,c){$("#notices_primary").prepend('<ul id="realtime_actions"><li id="realtime_playpause"></li><li id="realtime_timeline"></li></ul>');RealtimeUpdate._pluginPath=c;RealtimeUpdate.initPlayPause();RealtimeUpdate.initAddPopup(a,b,RealtimeUpdate._pluginPath)},initPlayPause:function(){if(typeof(localStorage)=="undefined"){RealtimeUpdate.showPause()}else{if(localStorage.getItem("RealtimeUpdate_paused")==="true"){RealtimeUpdate.showPlay()}else{RealtimeUpdate.showPause()}}},showPause:function(){RealtimeUpdate.setPause(false);RealtimeUpdate.showQueuedNotices();RealtimeUpdate.addNoticesHover();$("#realtime_playpause").remove();$("#realtime_actions").prepend('<li id="realtime_playpause"><button id="realtime_pause" class="pause"></button></li>');$("#realtime_pause").text(SN.msg("realtime_pause")).attr("title",SN.msg("realtime_pause_tooltip")).bind("click",function(){RealtimeUpdate.removeNoticesHover();RealtimeUpdate.showPlay();return false})},showPlay:function(){RealtimeUpdate.setPause(true);$("#realtime_playpause").remove();$("#realtime_actions").prepend('<li id="realtime_playpause"><span id="queued_counter"></span> <button id="realtime_play" class="play"></button></li>');$("#realtime_play").text(SN.msg("realtime_play")).attr("title",SN.msg("realtime_play_tooltip")).bind("click",function(){RealtimeUpdate.showPause();return false})},setPause:function(a){RealtimeUpdate._paused=a;if(typeof(localStorage)!="undefined"){localStorage.setItem("RealtimeUpdate_paused",RealtimeUpdate._paused)}},showQueuedNotices:function(){$.each(RealtimeUpdate._queuedNotices,function(a,b){RealtimeUpdate.insertNoticeItem(b)});RealtimeUpdate._queuedNotices=[];RealtimeUpdate.removeQueuedCounter()},updateQueuedCounter:function(){$("#realtime_playpause #queued_counter").html("("+RealtimeUpdate._queuedNotices.length+")")},removeQueuedCounter:function(){$("#realtime_playpause #queued_counter").empty()},addNoticesHover:function(){$("#notices_primary .notices").hover(function(){if(RealtimeUpdate._paused===false){RealtimeUpdate.showPlay()}},function(){if(RealtimeUpdate._paused===true){RealtimeUpdate.showPause()}})},removeNoticesHover:function(){$("#notices_primary .notices").unbind()},initAddPopup:function(a,b,c){$("#realtime_timeline").append('<button id="realtime_popup"></button>');$("#realtime_popup").text(SN.msg("realtime_popup")).attr("title",SN.msg("realtime_popup_tooltip")).bind("click",function(){window.open(a,"","toolbar=no,resizable=yes,scrollbars=yes,status=no,menubar=no,personalbar=no,location=no,width=500,height=550");return false})},initPopupWindow:function(){$(".notices .entry-title a, .notices .entry-content a").bind("click",function(){window.open(this.href,"");return false});$("#showstream .entity_profile").css({width:"69%"})}};
\ No newline at end of file
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 456d7be4b0..3306b8add3 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -1106,38 +1106,38 @@ border-top-style:solid;
 }
 
 /* Threaded notices sublist */
-#content .notices .threaded-notices {
+#content .notices .threaded-replies {
     margin-left: 10%;
     width: 90%;
 
     background: #e4e8f1;
 }
-#content .threaded-notices .notice .author .photo {
+#content .threaded-replies .notice .author .photo {
     left: 8px;
     width: 32px;
     height: 32px;
 }
-.threaded-notices .notice-reply {
+.threaded-replies .notice-reply {
     margin: 8px;
 }
-.threaded-notices .notice-reply textarea,
-.threaded-notices .notice-reply-placeholder input.placeholder {
+.threaded-replies .notice-reply textarea,
+.threaded-replies .notice-reply-placeholder input.placeholder {
     margin-left: 0;
     width: 95%;
 }
-.threaded-notices .notice-reply-placeholder input.placeholder {
+.threaded-replies .notice-reply-placeholder input.placeholder {
     color: gray;
     margin-left: 8px; /* ?? */
     margin-bottom: 8px;
 }
-.threaded-notices .notice-reply .controls {
+.threaded-replies .notice-reply .controls {
     text-align: right;
 }
-.threaded-notices .notice-reply-comments {
+.threaded-replies .notice-reply-comments {
     margin: 8px;
 }
-.threaded-notices .response,
-.threaded-notices .source {
+.threaded-replies .response,
+.threaded-replies .source {
     /* Hide these for ajax/realtime sourced notices */
     display: none;
 }

From 018b11a883bee0a76bd08a1033fc3de5085da10c Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Tue, 1 Mar 2011 16:29:00 -0800
Subject: [PATCH 366/655] Fix for realtime vs threaded reply fix

---
 js/util.js     | 3 ++-
 js/util.min.js | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/js/util.js b/js/util.js
index d007281223..fce2fd775d 100644
--- a/js/util.js
+++ b/js/util.js
@@ -654,7 +654,8 @@ var SN = { // StatusNet
                                 var orig_li = $('li', data)[0];
                                 if (orig_li) {
                                     var li = document._importNode(orig_li, true);
-                                    if ($("#notice-"+id).length == 0) {
+                                    var id = $(li).attr('id');
+                                    if ($("#"+id).length == 0) {
                                         replyItem.replaceWith(li);
                                         SN.U.NoticeInlineReplyPlaceholder(parentNotice);
                                     } else {
diff --git a/js/util.min.js b/js/util.min.js
index 7b1410159e..053f5b655b 100644
--- a/js/util.min.js
+++ b/js/util.min.js
@@ -1 +1 @@
-var SN={C:{I:{CounterBlackout:false,MaxLength:140,PatternUsername:/^[0-9a-zA-Z\-_.]*$/,HTTP20x30x:[200,201,202,203,204,205,206,300,301,302,303,304,305,306,307]},S:{Disabled:"disabled",Warning:"warning",Error:"error",Success:"success",Processing:"processing",CommandResult:"command_result",FormNotice:"form_notice",NoticeDataText:"notice_data-text",NoticeTextCount:"notice_text-count",NoticeInReplyTo:"notice_in-reply-to",NoticeDataAttach:"notice_data-attach",NoticeDataAttachSelected:"notice_data-attach_selected",NoticeActionSubmit:"notice_action-submit",NoticeLat:"notice_data-lat",NoticeLon:"notice_data-lon",NoticeLocationId:"notice_data-location_id",NoticeLocationNs:"notice_data-location_ns",NoticeGeoName:"notice_data-geo_name",NoticeDataGeo:"notice_data-geo",NoticeDataGeoCookie:"NoticeDataGeo",NoticeDataGeoSelected:"notice_data-geo_selected",StatusNetInstance:"StatusNetInstance"}},messages:{},msg:function(a){if(typeof SN.messages[a]=="undefined"){return"["+a+"]"}else{return SN.messages[a]}},U:{FormNoticeEnhancements:function(b){if(jQuery.data(b[0],"ElementData")===undefined){MaxLength=b.find("#"+SN.C.S.NoticeTextCount).text();if(typeof(MaxLength)=="undefined"){MaxLength=SN.C.I.MaxLength}jQuery.data(b[0],"ElementData",{MaxLength:MaxLength});SN.U.Counter(b);NDT=b.find("#"+SN.C.S.NoticeDataText);NDT.bind("keyup",function(c){SN.U.Counter(b)});var a=function(c){window.setTimeout(function(){SN.U.Counter(b)},50)};NDT.bind("cut",a).bind("paste",a);NDT.bind("keydown",function(c){SN.U.SubmitOnReturn(c,b)})}else{b.find("#"+SN.C.S.NoticeTextCount).text(jQuery.data(b[0],"ElementData").MaxLength)}if($("body")[0].id!="conversation"&&window.location.hash.length===0&&$(window).scrollTop()==0){b.find("textarea").focus()}},SubmitOnReturn:function(b,a){if(b.keyCode==13||b.keyCode==10){a.submit();b.preventDefault();b.stopPropagation();$("#"+a[0].id+" #"+SN.C.S.NoticeDataText).blur();$("body").focus();return false}return true},Counter:function(d){SN.C.I.FormNoticeCurrent=d;var b=jQuery.data(d[0],"ElementData").MaxLength;if(b<=0){return}var c=b-SN.U.CharacterCount(d);var a=d.find("#"+SN.C.S.NoticeTextCount);if(c.toString()!=a.text()){if(!SN.C.I.CounterBlackout||c===0){if(a.text()!=String(c)){a.text(c)}if(c<0){d.addClass(SN.C.S.Warning)}else{d.removeClass(SN.C.S.Warning)}if(!SN.C.I.CounterBlackout){SN.C.I.CounterBlackout=true;SN.C.I.FormNoticeCurrent=d;window.setTimeout("SN.U.ClearCounterBlackout(SN.C.I.FormNoticeCurrent);",500)}}}},CharacterCount:function(a){return a.find("#"+SN.C.S.NoticeDataText).val().length},ClearCounterBlackout:function(a){SN.C.I.CounterBlackout=false;SN.U.Counter(a)},RewriteAjaxAction:function(a){if(document.location.protocol=="https:"&&a.substr(0,5)=="http:"){return a.replace(/^http:\/\/[^:\/]+/,"https://"+document.location.host)}else{return a}},FormXHR:function(a){$.ajax({type:"POST",dataType:"xml",url:SN.U.RewriteAjaxAction(a.attr("action")),data:a.serialize()+"&ajax=1",beforeSend:function(b){a.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(c,d,b){alert(b||d)},success:function(b,c){if(typeof($("form",b)[0])!="undefined"){form_new=document._importNode($("form",b)[0],true);a.replaceWith(form_new)}else{a.replaceWith(document._importNode($("p",b)[0],true))}}})},FormNoticeXHR:function(b){SN.C.I.NoticeDataGeo={};b.append('<input type="hidden" name="ajax" value="1"/>');b.attr("action",SN.U.RewriteAjaxAction(b.attr("action")));var c=function(d,e){b.append($('<p class="form_response"></p>').addClass(d).text(e))};var a=function(){b.find(".form_response").remove()};b.ajaxForm({dataType:"xml",timeout:"60000",beforeSend:function(d){if(b.find("#"+SN.C.S.NoticeDataText)[0].value.length===0){b.addClass(SN.C.S.Warning);return false}b.addClass(SN.C.S.Processing).find("#"+SN.C.S.NoticeActionSubmit).addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled);SN.C.I.NoticeDataGeo.NLat=$("#"+SN.C.S.NoticeLat).val();SN.C.I.NoticeDataGeo.NLon=$("#"+SN.C.S.NoticeLon).val();SN.C.I.NoticeDataGeo.NLNS=$("#"+SN.C.S.NoticeLocationNs).val();SN.C.I.NoticeDataGeo.NLID=$("#"+SN.C.S.NoticeLocationId).val();SN.C.I.NoticeDataGeo.NDG=$("#"+SN.C.S.NoticeDataGeo).attr("checked");cookieValue=$.cookie(SN.C.S.NoticeDataGeoCookie);if(cookieValue!==null&&cookieValue!="disabled"){cookieValue=JSON.parse(cookieValue);SN.C.I.NoticeDataGeo.NLat=$("#"+SN.C.S.NoticeLat).val(cookieValue.NLat).val();SN.C.I.NoticeDataGeo.NLon=$("#"+SN.C.S.NoticeLon).val(cookieValue.NLon).val();if($("#"+SN.C.S.NoticeLocationNs).val(cookieValue.NLNS)){SN.C.I.NoticeDataGeo.NLNS=$("#"+SN.C.S.NoticeLocationNs).val(cookieValue.NLNS).val();SN.C.I.NoticeDataGeo.NLID=$("#"+SN.C.S.NoticeLocationId).val(cookieValue.NLID).val()}}if(cookieValue=="disabled"){SN.C.I.NoticeDataGeo.NDG=$("#"+SN.C.S.NoticeDataGeo).attr("checked",false).attr("checked")}else{SN.C.I.NoticeDataGeo.NDG=$("#"+SN.C.S.NoticeDataGeo).attr("checked",true).attr("checked")}return true},error:function(f,g,e){b.removeClass(SN.C.S.Processing).find("#"+SN.C.S.NoticeActionSubmit).removeClass(SN.C.S.Disabled).removeAttr(SN.C.S.Disabled,SN.C.S.Disabled);a();if(g=="timeout"){c("error","Sorry! We had trouble sending your notice. The servers are overloaded. Please try again, and contact the site administrator if this problem persists.")}else{var d=SN.U.GetResponseXML(f);if($("."+SN.C.S.Error,d).length>0){b.append(document._importNode($("."+SN.C.S.Error,d)[0],true))}else{if(parseInt(f.status)===0||jQuery.inArray(parseInt(f.status),SN.C.I.HTTP20x30x)>=0){b.resetForm().find("#"+SN.C.S.NoticeDataAttachSelected).remove();SN.U.FormNoticeEnhancements(b)}else{c("error","(Sorry! We had trouble sending your notice ("+f.status+" "+f.statusText+"). Please report the problem to the site administrator if this happens again.")}}}},success:function(i,k){a();var e=$("#"+SN.C.S.Error,i);if(e.length>0){c("error",e.text())}else{if($("body")[0].id=="bookmarklet"){self.close()}var d=$("#"+SN.C.S.CommandResult,i);if(d.length>0){c("success",d.text())}else{var h=document._importNode($("li",i)[0],true);var j=$("#notices_primary .notices:first");if(j.length>0&&SN.U.belongsOnTimeline(h)){if($("#"+h.id).length===0){var f=$("#"+SN.C.S.NoticeInReplyTo).val();var g="#notices_primary #notice-"+f;if($("body")[0].id=="conversation"){if(f.length>0&&$(g+" .notices").length<1){$(g).append('<ul class="notices"></ul>')}$($(g+" .notices")[0]).append(h)}else{j.prepend(h)}$("#"+h.id).css({display:"none"}).fadeIn(2500);SN.U.NoticeWithAttachment($("#"+h.id));SN.U.NoticeReplyTo($("#"+h.id))}}else{c("success",$("title",i).text())}}b.resetForm();b.find("#"+SN.C.S.NoticeInReplyTo).val("");b.find("#"+SN.C.S.NoticeDataAttachSelected).remove();SN.U.FormNoticeEnhancements(b)}},complete:function(d,e){b.removeClass(SN.C.S.Processing).find("#"+SN.C.S.NoticeActionSubmit).removeAttr(SN.C.S.Disabled).removeClass(SN.C.S.Disabled);$("#"+SN.C.S.NoticeLat).val(SN.C.I.NoticeDataGeo.NLat);$("#"+SN.C.S.NoticeLon).val(SN.C.I.NoticeDataGeo.NLon);if($("#"+SN.C.S.NoticeLocationNs)){$("#"+SN.C.S.NoticeLocationNs).val(SN.C.I.NoticeDataGeo.NLNS);$("#"+SN.C.S.NoticeLocationId).val(SN.C.I.NoticeDataGeo.NLID)}$("#"+SN.C.S.NoticeDataGeo).attr("checked",SN.C.I.NoticeDataGeo.NDG)}})},GetResponseXML:function(b){try{return b.responseXML}catch(a){return(new DOMParser()).parseFromString(b.responseText,"text/xml")}},NoticeReply:function(){if($("#"+SN.C.S.NoticeDataText).length>0&&$("#content .notice_reply").length>0){$("#content .notice").each(function(){SN.U.NoticeReplyTo($(this))})}},NoticeReplyTo:function(a){a.find(".notice_reply").live("click",function(c){c.preventDefault();var b=($(".author .nickname",a).length>0)?$($(".author .nickname",a)[0]):$(".author .nickname.uid");SN.U.NoticeInlineReplyTrigger(a,"@"+b.text());return false})},NoticeInlineReplyTrigger:function(h,i){var c=$($(".notice_id",h)[0]).text();var d=h;var f=h.closest(".notices");if(f.hasClass("threaded-replies")){d=f.closest(".notice")}else{f=$("ul.threaded-replies",h);if(f.length==0){f=$('<ul class="notices threaded-replies xoxo"></ul>');h.append(f)}}var k=$(".notice-reply-form",f);if(k.length==0){$("li.notice-reply-placeholder").remove();var g=$("li.notice-reply",f);if(g.length==0){g=$('<li class="notice-reply"><form class="notice-reply-form" method="post"><textarea name="status_textarea"></textarea><div class="controls"><input type="hidden" name="token"><input type="hidden" name="inreplyto"><input type="submit" class="submit"></div></form></li>');var b=$("#form_notice");k=g.find("form");k.attr("action",b.attr("action"));k.find('input[name="token"]').val(b.find("input[name=token]").val());k.find('input[type="submit"]').val(SN.msg("reply_submit"));f.append(g);k.find("textarea").blur(function(){var m=$(this);var l=$.trim(m.val());if(l==""||l==m.data("initialText")){g.remove();if(f.find("li").length>0){SN.U.NoticeInlineReplyPlaceholder(d)}else{f.remove()}}});k.submit(function(m){var l=k;$.ajax({type:"POST",dataType:"xml",url:SN.U.RewriteAjaxAction(l.attr("action")),data:l.serialize()+"&ajax=1",beforeSend:function(n){l.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled).end().find("textarea").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(o,p,n){alert(n||p)},success:function(p,q){var o=$("li",p)[0];if(o){var n=document._importNode(o,true);if($("#notice-"+c).length==0){g.replaceWith(n);SN.U.NoticeInlineReplyPlaceholder(d)}else{g.remove()}}}});m.preventDefault();return false})}}k.find("input[name=inreplyto]").val(c);var j=k.find("textarea");if(j.length==0){throw"No textarea"}var a="";if(i){a=i+" "}j.val(a+j.val().replace(RegExp(a,"i"),""));j.data("initialText",$.trim(i+""));j.focus();if(j[0].setSelectionRange){var e=j.val().length;j[0].setSelectionRange(e,e)}},NoticeReplySet:function(b,d){if(b.match(SN.C.I.PatternUsername)){var c=$("#"+SN.C.S.NoticeDataText);if(c.length>0){replyto="@"+b+" ";c.val(replyto+c.val().replace(RegExp(replyto,"i"),""));$("#"+SN.C.S.FormNotice+" #"+SN.C.S.NoticeInReplyTo).val(d);c[0].focus();if(c[0].setSelectionRange){var a=c.val().length;c[0].setSelectionRange(a,a)}}}},NoticeFavor:function(){$(".form_favor").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_disfavor").live("click",function(){SN.U.FormXHR($(this));return false})},NoticeInlineReplyPlaceholder:function(b){var a=b.find("ul.threaded-replies");var c=$('<li class="notice-reply-placeholder"><input class="placeholder"></li>');c.click(function(){SN.U.NoticeInlineReplyTrigger(b)});c.find("input").val(SN.msg("reply_comment"));a.append(c)},NoticeInlineReplySetup:function(){$(".threaded-replies").each(function(){var b=$(this);var a=b.closest(".notice");SN.U.NoticeInlineReplyPlaceholder(a)})},NoticeRepeat:function(){$(".form_repeat").live("click",function(a){a.preventDefault();SN.U.NoticeRepeatConfirmation($(this));return false})},NoticeRepeatConfirmation:function(a){var c=a.find(".submit");var b=c.clone();b.addClass("submit_dialogbox").removeClass("submit");a.append(b);b.bind("click",function(){SN.U.FormXHR(a);return false});c.hide();a.addClass("dialogbox").append('<button class="close">&#215;</button>').closest(".notice-options").addClass("opaque");a.find("button.close").click(function(){$(this).remove();a.removeClass("dialogbox").closest(".notice-options").removeClass("opaque");a.find(".submit_dialogbox").remove();a.find(".submit").show();return false})},NoticeAttachments:function(){$(".notice a.attachment").each(function(){SN.U.NoticeWithAttachment($(this).closest(".notice"))})},NoticeWithAttachment:function(b){if(b.find(".attachment").length===0){return}var a=b.find(".attachment.more");if(a.length>0){$(a[0]).click(function(){var c=$(this);c.addClass(SN.C.S.Processing);$.get(c.attr("href")+"/ajax",null,function(d){c.parent(".entry-content").html($(d).find("#attachment_view .entry-content").html())});return false}).attr("title",SN.msg("showmore_tooltip"))}},NoticeDataAttach:function(){NDA=$("#"+SN.C.S.NoticeDataAttach);NDA.change(function(c){var a=$(this).val();if(!a){$("#"+SN.C.S.NoticeDataAttachSelected).remove();return false}S='<div id="'+SN.C.S.NoticeDataAttachSelected+'" class="'+SN.C.S.Success+'"><code>'+a+'</code> <button class="close">&#215;</button></div>';NDAS=$("#"+SN.C.S.NoticeDataAttachSelected);if(NDAS.length>0){NDAS.replaceWith(S)}else{$("#"+SN.C.S.FormNotice).append(S)}$("#"+SN.C.S.NoticeDataAttachSelected+" button").click(function(){$("#"+SN.C.S.NoticeDataAttachSelected).remove();NDA.val("");return false});if(typeof this.files=="object"){for(var b=0;b<this.files.length;b++){SN.U.PreviewAttach(this.files[b])}}})},maxFileSize:function(b){var a=$(b).find("input[name=MAX_FILE_SIZE]").attr("value");if(a){return parseInt(a)}else{return 0}},PreviewAttach:function(c){var d=c.type+" "+Math.round(c.size/1024)+"KB";var e=true;var g;if(typeof window.createObjectURL!="undefined"){g=function(h,i){i(window.createObjectURL(h))}}else{if(typeof window.FileReader!="undefined"){g=function(i,j){var h=new FileReader();h.onload=function(k){j(h.result)};h.readAsDataURL(i)}}else{e=false}}var a=["image/png","image/jpeg","image/gif","image/svg+xml"];if($.inArray(c.type,a)==-1){e=false}var f=8*1024*1024;if(c.size>f){e=false}if(e){g(c,function(i){var h=$("<img>").attr("title",d).attr("alt",d).attr("src",i).attr("style","height: 120px");$("#"+SN.C.S.NoticeDataAttachSelected).append(h)})}else{var b=$("<div></div>").text(d);$("#"+SN.C.S.NoticeDataAttachSelected).append(b)}},NoticeLocationAttach:function(){var c=$("#"+SN.C.S.NoticeLat).val();var h=$("#"+SN.C.S.NoticeLon).val();var d=$("#"+SN.C.S.NoticeLocationNs).val();var i=$("#"+SN.C.S.NoticeLocationId).val();var a=$("#"+SN.C.S.NoticeGeoName).text();var b=$("#"+SN.C.S.NoticeDataGeo);function e(){$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",jQuery.trim($("label[for="+SN.C.S.NoticeDataGeo+"]").text())).removeClass("checked");$("#"+SN.C.S.NoticeLat).val("");$("#"+SN.C.S.NoticeLon).val("");$("#"+SN.C.S.NoticeLocationNs).val("");$("#"+SN.C.S.NoticeLocationId).val("");$("#"+SN.C.S.NoticeDataGeo).attr("checked",false);$.cookie(SN.C.S.NoticeDataGeoCookie,"disabled",{path:"/"})}function j(k,l){$.getJSON(k,l,function(m){var n,o;if(typeof(m.location_ns)!="undefined"){$("#"+SN.C.S.NoticeLocationNs).val(m.location_ns);n=m.location_ns}if(typeof(m.location_id)!="undefined"){$("#"+SN.C.S.NoticeLocationId).val(m.location_id);o=m.location_id}if(typeof(m.name)=="undefined"){NLN_text=l.lat+";"+l.lon}else{NLN_text=m.name}$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",NoticeDataGeo_text.ShareDisable+" ("+NLN_text+")");$("#"+SN.C.S.NoticeLat).val(l.lat);$("#"+SN.C.S.NoticeLon).val(l.lon);$("#"+SN.C.S.NoticeLocationNs).val(n);$("#"+SN.C.S.NoticeLocationId).val(o);$("#"+SN.C.S.NoticeDataGeo).attr("checked",true);var p={NLat:l.lat,NLon:l.lon,NLNS:n,NLID:o,NLN:NLN_text,NLNU:m.url,NDG:true};$.cookie(SN.C.S.NoticeDataGeoCookie,JSON.stringify(p),{path:"/"})})}if(b.length>0){if($.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){b.attr("checked",false)}else{b.attr("checked",true)}var f=$("#notice_data-geo_wrap");var g=f.attr("title");f.removeAttr("title");$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",jQuery.trim($("label[for="+SN.C.S.NoticeDataGeo+"]").text()));b.change(function(){if($("#"+SN.C.S.NoticeDataGeo).attr("checked")===true||$.cookie(SN.C.S.NoticeDataGeoCookie)===null){$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",NoticeDataGeo_text.ShareDisable).addClass("checked");if($.cookie(SN.C.S.NoticeDataGeoCookie)===null||$.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){if(navigator.geolocation){navigator.geolocation.getCurrentPosition(function(m){$("#"+SN.C.S.NoticeLat).val(m.coords.latitude);$("#"+SN.C.S.NoticeLon).val(m.coords.longitude);var n={lat:m.coords.latitude,lon:m.coords.longitude,token:$("#token").val()};j(g,n)},function(m){switch(m.code){case m.PERMISSION_DENIED:e();break;case m.TIMEOUT:$("#"+SN.C.S.NoticeDataGeo).attr("checked",false);break}},{timeout:10000})}else{if(c.length>0&&h.length>0){var k={lat:c,lon:h,token:$("#token").val()};j(g,k)}else{e();$("#"+SN.C.S.NoticeDataGeo).remove();$("label[for="+SN.C.S.NoticeDataGeo+"]").remove()}}}else{var l=JSON.parse($.cookie(SN.C.S.NoticeDataGeoCookie));$("#"+SN.C.S.NoticeLat).val(l.NLat);$("#"+SN.C.S.NoticeLon).val(l.NLon);$("#"+SN.C.S.NoticeLocationNs).val(l.NLNS);$("#"+SN.C.S.NoticeLocationId).val(l.NLID);$("#"+SN.C.S.NoticeDataGeo).attr("checked",l.NDG);$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",NoticeDataGeo_text.ShareDisable+" ("+l.NLN+")").addClass("checked")}}else{e()}}).change()}},NewDirectMessage:function(){NDM=$(".entity_send-a-message a");NDM.attr({href:NDM.attr("href")+"&ajax=1"});NDM.bind("click",function(){var a=$(".entity_send-a-message form");if(a.length===0){$(this).addClass(SN.C.S.Processing);$.get(NDM.attr("href"),null,function(b){$(".entity_send-a-message").append(document._importNode($("form",b)[0],true));a=$(".entity_send-a-message .form_notice");SN.U.FormNoticeXHR(a);SN.U.FormNoticeEnhancements(a);a.append('<button class="close">&#215;</button>');$(".entity_send-a-message button").click(function(){a.hide();return false});NDM.removeClass(SN.C.S.Processing)})}else{a.show();$(".entity_send-a-message textarea").focus()}return false})},GetFullYear:function(c,d,a){var b=new Date();b.setFullYear(c,d,a);return b},StatusNetInstance:{Set:function(b){var a=SN.U.StatusNetInstance.Get();if(a!==null){b=$.extend(a,b)}$.cookie(SN.C.S.StatusNetInstance,JSON.stringify(b),{path:"/",expires:SN.U.GetFullYear(2029,0,1)})},Get:function(){var a=$.cookie(SN.C.S.StatusNetInstance);if(a!==null){return JSON.parse(a)}return null},Delete:function(){$.cookie(SN.C.S.StatusNetInstance,null)}},belongsOnTimeline:function(b){var a=$("body").attr("id");if(a=="public"){return true}var c=$("#nav_profile a").attr("href");if(c){var d=$(b).find(".entry-title .author a.url").attr("href");if(d==c){if(a=="all"||a=="showstream"){return true}}}return false}},Init:{NoticeForm:function(){if($("body.user_in").length>0){SN.U.NoticeLocationAttach();$("."+SN.C.S.FormNotice).each(function(){SN.U.FormNoticeXHR($(this));SN.U.FormNoticeEnhancements($(this))});SN.U.NoticeDataAttach()}},Notices:function(){if($("body.user_in").length>0){SN.U.NoticeFavor();SN.U.NoticeRepeat();SN.U.NoticeReply();SN.U.NoticeInlineReplySetup()}SN.U.NoticeAttachments()},EntityActions:function(){if($("body.user_in").length>0){$(".form_user_subscribe").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_user_unsubscribe").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_group_join").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_group_leave").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_user_nudge").live("click",function(){SN.U.FormXHR($(this));return false});SN.U.NewDirectMessage()}},Login:function(){if(SN.U.StatusNetInstance.Get()!==null){var a=SN.U.StatusNetInstance.Get().Nickname;if(a!==null){$("#form_login #nickname").val(a)}}$("#form_login").bind("submit",function(){SN.U.StatusNetInstance.Set({Nickname:$("#form_login #nickname").val()});return true})},UploadForms:function(){$("input[type=file]").change(function(d){if(typeof this.files=="object"&&this.files.length>0){var c=0;for(var b=0;b<this.files.length;b++){c+=this.files[b].size}var a=SN.U.maxFileSize($(this.form));if(a>0&&c>a){var e="File too large: maximum upload size is %d bytes.";alert(e.replace("%d",a));$(this).val("");d.preventDefault();return false}}})}}};$(document).ready(function(){SN.Init.UploadForms();if($("."+SN.C.S.FormNotice).length>0){SN.Init.NoticeForm()}if($("#content .notices").length>0){SN.Init.Notices()}if($("#content .entity_actions").length>0){SN.Init.EntityActions()}if($("#form_login").length>0){SN.Init.Login()}});if(!document.ELEMENT_NODE){document.ELEMENT_NODE=1;document.ATTRIBUTE_NODE=2;document.TEXT_NODE=3;document.CDATA_SECTION_NODE=4;document.ENTITY_REFERENCE_NODE=5;document.ENTITY_NODE=6;document.PROCESSING_INSTRUCTION_NODE=7;document.COMMENT_NODE=8;document.DOCUMENT_NODE=9;document.DOCUMENT_TYPE_NODE=10;document.DOCUMENT_FRAGMENT_NODE=11;document.NOTATION_NODE=12}document._importNode=function(e,a){switch(e.nodeType){case document.ELEMENT_NODE:var d=document.createElement(e.nodeName);if(e.attributes&&e.attributes.length>0){for(var c=0,b=e.attributes.length;c<b;){if(e.attributes[c].nodeName=="class"){d.className=e.getAttribute(e.attributes[c++].nodeName)}else{d.setAttribute(e.attributes[c].nodeName,e.getAttribute(e.attributes[c++].nodeName))}}}if(a&&e.childNodes&&e.childNodes.length>0){for(var c=0,b=e.childNodes.length;c<b;){d.appendChild(document._importNode(e.childNodes[c++],a))}}return d;break;case document.TEXT_NODE:case document.CDATA_SECTION_NODE:case document.COMMENT_NODE:return document.createTextNode(e.nodeValue);break}};if(typeof navigator.geolocation=="undefined"||navigator.geolocation.shim){(function(){(function(){if(window.google&&google.gears){return}var c=null;if(typeof GearsFactory!="undefined"){c=new GearsFactory()}else{try{c=new ActiveXObject("Gears.Factory");if(c.getBuildInfo().indexOf("ie_mobile")!=-1){c.privateSetGlobalObject(this)}}catch(d){if((typeof navigator.mimeTypes!="undefined")&&navigator.mimeTypes["application/x-googlegears"]){c=document.createElement("object");c.style.display="none";c.width=0;c.height=0;c.type="application/x-googlegears";document.documentElement.appendChild(c)}}}if(!c){return}if(!window.google){google={}}if(!google.gears){google.gears={factory:c}}})();var a=(function(){var d=google.gears.factory.create("beta.geolocation");var c=function(f,e){return function(g){f(g);e.lastPosition=g}};return{shim:true,type:"Gears",lastPosition:null,getCurrentPosition:function(e,g,h){var f=this;var i=c(e,f);d.getCurrentPosition(i,g,h)},watchPosition:function(e,f,g){d.watchPosition(e,f,g)},clearWatch:function(e){d.clearWatch(e)},getPermission:function(g,e,f){d.getPermission(g,e,f)}}});var b=(function(){var i=false;var e=function(){if(!d()&&!i){i=true;var j=document.createElement("script");j.src=(document.location.protocol=="https:"?"https://":"http://")+"www.google.com/jsapi?callback=_google_loader_apiLoaded";j.type="text/javascript";document.getElementsByTagName("body")[0].appendChild(j)}};var c=[];var h=function(j){c.push(j)};var f=function(){if(d()){while(c.length>0){var j=c.pop();j()}}};window._google_loader_apiLoaded=function(){f()};var d=function(){return(window.google&&google.loader)};var g=function(j){if(d()){return true}h(j);e();return false};e();return{shim:true,type:"ClientLocation",lastPosition:null,getCurrentPosition:function(k,n,o){var m=this;if(!g(function(){m.getCurrentPosition(k,n,o)})){return}if(google.loader.ClientLocation){var l=google.loader.ClientLocation;var j={coords:{latitude:l.latitude,longitude:l.longitude,altitude:null,accuracy:43000,altitudeAccuracy:null,heading:null,speed:null},address:{city:l.address.city,country:l.address.country,country_code:l.address.country_code,region:l.address.region},timestamp:new Date()};k(j);this.lastPosition=j}else{if(n==="function"){n({code:3,message:"Using the Google ClientLocation API and it is not able to calculate a location."})}}},watchPosition:function(j,l,m){this.getCurrentPosition(j,l,m);var k=this;var n=setInterval(function(){k.getCurrentPosition(j,l,m)},10000);return n},clearWatch:function(j){clearInterval(j)},getPermission:function(l,j,k){return true}}});navigator.geolocation=(window.google&&google.gears)?a():b()})()};
\ No newline at end of file
+var SN={C:{I:{CounterBlackout:false,MaxLength:140,PatternUsername:/^[0-9a-zA-Z\-_.]*$/,HTTP20x30x:[200,201,202,203,204,205,206,300,301,302,303,304,305,306,307]},S:{Disabled:"disabled",Warning:"warning",Error:"error",Success:"success",Processing:"processing",CommandResult:"command_result",FormNotice:"form_notice",NoticeDataText:"notice_data-text",NoticeTextCount:"notice_text-count",NoticeInReplyTo:"notice_in-reply-to",NoticeDataAttach:"notice_data-attach",NoticeDataAttachSelected:"notice_data-attach_selected",NoticeActionSubmit:"notice_action-submit",NoticeLat:"notice_data-lat",NoticeLon:"notice_data-lon",NoticeLocationId:"notice_data-location_id",NoticeLocationNs:"notice_data-location_ns",NoticeGeoName:"notice_data-geo_name",NoticeDataGeo:"notice_data-geo",NoticeDataGeoCookie:"NoticeDataGeo",NoticeDataGeoSelected:"notice_data-geo_selected",StatusNetInstance:"StatusNetInstance"}},messages:{},msg:function(a){if(typeof SN.messages[a]=="undefined"){return"["+a+"]"}else{return SN.messages[a]}},U:{FormNoticeEnhancements:function(b){if(jQuery.data(b[0],"ElementData")===undefined){MaxLength=b.find("#"+SN.C.S.NoticeTextCount).text();if(typeof(MaxLength)=="undefined"){MaxLength=SN.C.I.MaxLength}jQuery.data(b[0],"ElementData",{MaxLength:MaxLength});SN.U.Counter(b);NDT=b.find("#"+SN.C.S.NoticeDataText);NDT.bind("keyup",function(c){SN.U.Counter(b)});var a=function(c){window.setTimeout(function(){SN.U.Counter(b)},50)};NDT.bind("cut",a).bind("paste",a);NDT.bind("keydown",function(c){SN.U.SubmitOnReturn(c,b)})}else{b.find("#"+SN.C.S.NoticeTextCount).text(jQuery.data(b[0],"ElementData").MaxLength)}if($("body")[0].id!="conversation"&&window.location.hash.length===0&&$(window).scrollTop()==0){b.find("textarea").focus()}},SubmitOnReturn:function(b,a){if(b.keyCode==13||b.keyCode==10){a.submit();b.preventDefault();b.stopPropagation();$("#"+a[0].id+" #"+SN.C.S.NoticeDataText).blur();$("body").focus();return false}return true},Counter:function(d){SN.C.I.FormNoticeCurrent=d;var b=jQuery.data(d[0],"ElementData").MaxLength;if(b<=0){return}var c=b-SN.U.CharacterCount(d);var a=d.find("#"+SN.C.S.NoticeTextCount);if(c.toString()!=a.text()){if(!SN.C.I.CounterBlackout||c===0){if(a.text()!=String(c)){a.text(c)}if(c<0){d.addClass(SN.C.S.Warning)}else{d.removeClass(SN.C.S.Warning)}if(!SN.C.I.CounterBlackout){SN.C.I.CounterBlackout=true;SN.C.I.FormNoticeCurrent=d;window.setTimeout("SN.U.ClearCounterBlackout(SN.C.I.FormNoticeCurrent);",500)}}}},CharacterCount:function(a){return a.find("#"+SN.C.S.NoticeDataText).val().length},ClearCounterBlackout:function(a){SN.C.I.CounterBlackout=false;SN.U.Counter(a)},RewriteAjaxAction:function(a){if(document.location.protocol=="https:"&&a.substr(0,5)=="http:"){return a.replace(/^http:\/\/[^:\/]+/,"https://"+document.location.host)}else{return a}},FormXHR:function(a){$.ajax({type:"POST",dataType:"xml",url:SN.U.RewriteAjaxAction(a.attr("action")),data:a.serialize()+"&ajax=1",beforeSend:function(b){a.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(c,d,b){alert(b||d)},success:function(b,c){if(typeof($("form",b)[0])!="undefined"){form_new=document._importNode($("form",b)[0],true);a.replaceWith(form_new)}else{a.replaceWith(document._importNode($("p",b)[0],true))}}})},FormNoticeXHR:function(b){SN.C.I.NoticeDataGeo={};b.append('<input type="hidden" name="ajax" value="1"/>');b.attr("action",SN.U.RewriteAjaxAction(b.attr("action")));var c=function(d,e){b.append($('<p class="form_response"></p>').addClass(d).text(e))};var a=function(){b.find(".form_response").remove()};b.ajaxForm({dataType:"xml",timeout:"60000",beforeSend:function(d){if(b.find("#"+SN.C.S.NoticeDataText)[0].value.length===0){b.addClass(SN.C.S.Warning);return false}b.addClass(SN.C.S.Processing).find("#"+SN.C.S.NoticeActionSubmit).addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled);SN.C.I.NoticeDataGeo.NLat=$("#"+SN.C.S.NoticeLat).val();SN.C.I.NoticeDataGeo.NLon=$("#"+SN.C.S.NoticeLon).val();SN.C.I.NoticeDataGeo.NLNS=$("#"+SN.C.S.NoticeLocationNs).val();SN.C.I.NoticeDataGeo.NLID=$("#"+SN.C.S.NoticeLocationId).val();SN.C.I.NoticeDataGeo.NDG=$("#"+SN.C.S.NoticeDataGeo).attr("checked");cookieValue=$.cookie(SN.C.S.NoticeDataGeoCookie);if(cookieValue!==null&&cookieValue!="disabled"){cookieValue=JSON.parse(cookieValue);SN.C.I.NoticeDataGeo.NLat=$("#"+SN.C.S.NoticeLat).val(cookieValue.NLat).val();SN.C.I.NoticeDataGeo.NLon=$("#"+SN.C.S.NoticeLon).val(cookieValue.NLon).val();if($("#"+SN.C.S.NoticeLocationNs).val(cookieValue.NLNS)){SN.C.I.NoticeDataGeo.NLNS=$("#"+SN.C.S.NoticeLocationNs).val(cookieValue.NLNS).val();SN.C.I.NoticeDataGeo.NLID=$("#"+SN.C.S.NoticeLocationId).val(cookieValue.NLID).val()}}if(cookieValue=="disabled"){SN.C.I.NoticeDataGeo.NDG=$("#"+SN.C.S.NoticeDataGeo).attr("checked",false).attr("checked")}else{SN.C.I.NoticeDataGeo.NDG=$("#"+SN.C.S.NoticeDataGeo).attr("checked",true).attr("checked")}return true},error:function(f,g,e){b.removeClass(SN.C.S.Processing).find("#"+SN.C.S.NoticeActionSubmit).removeClass(SN.C.S.Disabled).removeAttr(SN.C.S.Disabled,SN.C.S.Disabled);a();if(g=="timeout"){c("error","Sorry! We had trouble sending your notice. The servers are overloaded. Please try again, and contact the site administrator if this problem persists.")}else{var d=SN.U.GetResponseXML(f);if($("."+SN.C.S.Error,d).length>0){b.append(document._importNode($("."+SN.C.S.Error,d)[0],true))}else{if(parseInt(f.status)===0||jQuery.inArray(parseInt(f.status),SN.C.I.HTTP20x30x)>=0){b.resetForm().find("#"+SN.C.S.NoticeDataAttachSelected).remove();SN.U.FormNoticeEnhancements(b)}else{c("error","(Sorry! We had trouble sending your notice ("+f.status+" "+f.statusText+"). Please report the problem to the site administrator if this happens again.")}}}},success:function(i,k){a();var e=$("#"+SN.C.S.Error,i);if(e.length>0){c("error",e.text())}else{if($("body")[0].id=="bookmarklet"){self.close()}var d=$("#"+SN.C.S.CommandResult,i);if(d.length>0){c("success",d.text())}else{var h=document._importNode($("li",i)[0],true);var j=$("#notices_primary .notices:first");if(j.length>0&&SN.U.belongsOnTimeline(h)){if($("#"+h.id).length===0){var f=$("#"+SN.C.S.NoticeInReplyTo).val();var g="#notices_primary #notice-"+f;if($("body")[0].id=="conversation"){if(f.length>0&&$(g+" .notices").length<1){$(g).append('<ul class="notices"></ul>')}$($(g+" .notices")[0]).append(h)}else{j.prepend(h)}$("#"+h.id).css({display:"none"}).fadeIn(2500);SN.U.NoticeWithAttachment($("#"+h.id));SN.U.NoticeReplyTo($("#"+h.id))}}else{c("success",$("title",i).text())}}b.resetForm();b.find("#"+SN.C.S.NoticeInReplyTo).val("");b.find("#"+SN.C.S.NoticeDataAttachSelected).remove();SN.U.FormNoticeEnhancements(b)}},complete:function(d,e){b.removeClass(SN.C.S.Processing).find("#"+SN.C.S.NoticeActionSubmit).removeAttr(SN.C.S.Disabled).removeClass(SN.C.S.Disabled);$("#"+SN.C.S.NoticeLat).val(SN.C.I.NoticeDataGeo.NLat);$("#"+SN.C.S.NoticeLon).val(SN.C.I.NoticeDataGeo.NLon);if($("#"+SN.C.S.NoticeLocationNs)){$("#"+SN.C.S.NoticeLocationNs).val(SN.C.I.NoticeDataGeo.NLNS);$("#"+SN.C.S.NoticeLocationId).val(SN.C.I.NoticeDataGeo.NLID)}$("#"+SN.C.S.NoticeDataGeo).attr("checked",SN.C.I.NoticeDataGeo.NDG)}})},GetResponseXML:function(b){try{return b.responseXML}catch(a){return(new DOMParser()).parseFromString(b.responseText,"text/xml")}},NoticeReply:function(){if($("#"+SN.C.S.NoticeDataText).length>0&&$("#content .notice_reply").length>0){$("#content .notice").each(function(){SN.U.NoticeReplyTo($(this))})}},NoticeReplyTo:function(a){a.find(".notice_reply").live("click",function(c){c.preventDefault();var b=($(".author .nickname",a).length>0)?$($(".author .nickname",a)[0]):$(".author .nickname.uid");SN.U.NoticeInlineReplyTrigger(a,"@"+b.text());return false})},NoticeInlineReplyTrigger:function(h,i){var c=$($(".notice_id",h)[0]).text();var d=h;var f=h.closest(".notices");if(f.hasClass("threaded-replies")){d=f.closest(".notice")}else{f=$("ul.threaded-replies",h);if(f.length==0){f=$('<ul class="notices threaded-replies xoxo"></ul>');h.append(f)}}var k=$(".notice-reply-form",f);if(k.length==0){$("li.notice-reply-placeholder").remove();var g=$("li.notice-reply",f);if(g.length==0){g=$('<li class="notice-reply"><form class="notice-reply-form" method="post"><textarea name="status_textarea"></textarea><div class="controls"><input type="hidden" name="token"><input type="hidden" name="inreplyto"><input type="submit" class="submit"></div></form></li>');var b=$("#form_notice");k=g.find("form");k.attr("action",b.attr("action"));k.find('input[name="token"]').val(b.find("input[name=token]").val());k.find('input[type="submit"]').val(SN.msg("reply_submit"));f.append(g);k.find("textarea").blur(function(){var m=$(this);var l=$.trim(m.val());if(l==""||l==m.data("initialText")){g.remove();if(f.find("li").length>0){SN.U.NoticeInlineReplyPlaceholder(d)}else{f.remove()}}});k.submit(function(m){var l=k;$.ajax({type:"POST",dataType:"xml",url:SN.U.RewriteAjaxAction(l.attr("action")),data:l.serialize()+"&ajax=1",beforeSend:function(n){l.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled).end().find("textarea").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(o,p,n){alert(n||p)},success:function(p,r){var o=$("li",p)[0];if(o){var n=document._importNode(o,true);var q=$(n).attr("id");if($("#"+q).length==0){g.replaceWith(n);SN.U.NoticeInlineReplyPlaceholder(d)}else{g.remove()}}}});m.preventDefault();return false})}}k.find("input[name=inreplyto]").val(c);var j=k.find("textarea");if(j.length==0){throw"No textarea"}var a="";if(i){a=i+" "}j.val(a+j.val().replace(RegExp(a,"i"),""));j.data("initialText",$.trim(i+""));j.focus();if(j[0].setSelectionRange){var e=j.val().length;j[0].setSelectionRange(e,e)}},NoticeReplySet:function(b,d){if(b.match(SN.C.I.PatternUsername)){var c=$("#"+SN.C.S.NoticeDataText);if(c.length>0){replyto="@"+b+" ";c.val(replyto+c.val().replace(RegExp(replyto,"i"),""));$("#"+SN.C.S.FormNotice+" #"+SN.C.S.NoticeInReplyTo).val(d);c[0].focus();if(c[0].setSelectionRange){var a=c.val().length;c[0].setSelectionRange(a,a)}}}},NoticeFavor:function(){$(".form_favor").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_disfavor").live("click",function(){SN.U.FormXHR($(this));return false})},NoticeInlineReplyPlaceholder:function(b){var a=b.find("ul.threaded-replies");var c=$('<li class="notice-reply-placeholder"><input class="placeholder"></li>');c.click(function(){SN.U.NoticeInlineReplyTrigger(b)});c.find("input").val(SN.msg("reply_comment"));a.append(c)},NoticeInlineReplySetup:function(){$(".threaded-replies").each(function(){var b=$(this);var a=b.closest(".notice");SN.U.NoticeInlineReplyPlaceholder(a)})},NoticeRepeat:function(){$(".form_repeat").live("click",function(a){a.preventDefault();SN.U.NoticeRepeatConfirmation($(this));return false})},NoticeRepeatConfirmation:function(a){var c=a.find(".submit");var b=c.clone();b.addClass("submit_dialogbox").removeClass("submit");a.append(b);b.bind("click",function(){SN.U.FormXHR(a);return false});c.hide();a.addClass("dialogbox").append('<button class="close">&#215;</button>').closest(".notice-options").addClass("opaque");a.find("button.close").click(function(){$(this).remove();a.removeClass("dialogbox").closest(".notice-options").removeClass("opaque");a.find(".submit_dialogbox").remove();a.find(".submit").show();return false})},NoticeAttachments:function(){$(".notice a.attachment").each(function(){SN.U.NoticeWithAttachment($(this).closest(".notice"))})},NoticeWithAttachment:function(b){if(b.find(".attachment").length===0){return}var a=b.find(".attachment.more");if(a.length>0){$(a[0]).click(function(){var c=$(this);c.addClass(SN.C.S.Processing);$.get(c.attr("href")+"/ajax",null,function(d){c.parent(".entry-content").html($(d).find("#attachment_view .entry-content").html())});return false}).attr("title",SN.msg("showmore_tooltip"))}},NoticeDataAttach:function(){NDA=$("#"+SN.C.S.NoticeDataAttach);NDA.change(function(c){var a=$(this).val();if(!a){$("#"+SN.C.S.NoticeDataAttachSelected).remove();return false}S='<div id="'+SN.C.S.NoticeDataAttachSelected+'" class="'+SN.C.S.Success+'"><code>'+a+'</code> <button class="close">&#215;</button></div>';NDAS=$("#"+SN.C.S.NoticeDataAttachSelected);if(NDAS.length>0){NDAS.replaceWith(S)}else{$("#"+SN.C.S.FormNotice).append(S)}$("#"+SN.C.S.NoticeDataAttachSelected+" button").click(function(){$("#"+SN.C.S.NoticeDataAttachSelected).remove();NDA.val("");return false});if(typeof this.files=="object"){for(var b=0;b<this.files.length;b++){SN.U.PreviewAttach(this.files[b])}}})},maxFileSize:function(b){var a=$(b).find("input[name=MAX_FILE_SIZE]").attr("value");if(a){return parseInt(a)}else{return 0}},PreviewAttach:function(c){var d=c.type+" "+Math.round(c.size/1024)+"KB";var e=true;var g;if(typeof window.createObjectURL!="undefined"){g=function(h,i){i(window.createObjectURL(h))}}else{if(typeof window.FileReader!="undefined"){g=function(i,j){var h=new FileReader();h.onload=function(k){j(h.result)};h.readAsDataURL(i)}}else{e=false}}var a=["image/png","image/jpeg","image/gif","image/svg+xml"];if($.inArray(c.type,a)==-1){e=false}var f=8*1024*1024;if(c.size>f){e=false}if(e){g(c,function(i){var h=$("<img>").attr("title",d).attr("alt",d).attr("src",i).attr("style","height: 120px");$("#"+SN.C.S.NoticeDataAttachSelected).append(h)})}else{var b=$("<div></div>").text(d);$("#"+SN.C.S.NoticeDataAttachSelected).append(b)}},NoticeLocationAttach:function(){var c=$("#"+SN.C.S.NoticeLat).val();var h=$("#"+SN.C.S.NoticeLon).val();var d=$("#"+SN.C.S.NoticeLocationNs).val();var i=$("#"+SN.C.S.NoticeLocationId).val();var a=$("#"+SN.C.S.NoticeGeoName).text();var b=$("#"+SN.C.S.NoticeDataGeo);function e(){$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",jQuery.trim($("label[for="+SN.C.S.NoticeDataGeo+"]").text())).removeClass("checked");$("#"+SN.C.S.NoticeLat).val("");$("#"+SN.C.S.NoticeLon).val("");$("#"+SN.C.S.NoticeLocationNs).val("");$("#"+SN.C.S.NoticeLocationId).val("");$("#"+SN.C.S.NoticeDataGeo).attr("checked",false);$.cookie(SN.C.S.NoticeDataGeoCookie,"disabled",{path:"/"})}function j(k,l){$.getJSON(k,l,function(m){var n,o;if(typeof(m.location_ns)!="undefined"){$("#"+SN.C.S.NoticeLocationNs).val(m.location_ns);n=m.location_ns}if(typeof(m.location_id)!="undefined"){$("#"+SN.C.S.NoticeLocationId).val(m.location_id);o=m.location_id}if(typeof(m.name)=="undefined"){NLN_text=l.lat+";"+l.lon}else{NLN_text=m.name}$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",NoticeDataGeo_text.ShareDisable+" ("+NLN_text+")");$("#"+SN.C.S.NoticeLat).val(l.lat);$("#"+SN.C.S.NoticeLon).val(l.lon);$("#"+SN.C.S.NoticeLocationNs).val(n);$("#"+SN.C.S.NoticeLocationId).val(o);$("#"+SN.C.S.NoticeDataGeo).attr("checked",true);var p={NLat:l.lat,NLon:l.lon,NLNS:n,NLID:o,NLN:NLN_text,NLNU:m.url,NDG:true};$.cookie(SN.C.S.NoticeDataGeoCookie,JSON.stringify(p),{path:"/"})})}if(b.length>0){if($.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){b.attr("checked",false)}else{b.attr("checked",true)}var f=$("#notice_data-geo_wrap");var g=f.attr("title");f.removeAttr("title");$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",jQuery.trim($("label[for="+SN.C.S.NoticeDataGeo+"]").text()));b.change(function(){if($("#"+SN.C.S.NoticeDataGeo).attr("checked")===true||$.cookie(SN.C.S.NoticeDataGeoCookie)===null){$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",NoticeDataGeo_text.ShareDisable).addClass("checked");if($.cookie(SN.C.S.NoticeDataGeoCookie)===null||$.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){if(navigator.geolocation){navigator.geolocation.getCurrentPosition(function(m){$("#"+SN.C.S.NoticeLat).val(m.coords.latitude);$("#"+SN.C.S.NoticeLon).val(m.coords.longitude);var n={lat:m.coords.latitude,lon:m.coords.longitude,token:$("#token").val()};j(g,n)},function(m){switch(m.code){case m.PERMISSION_DENIED:e();break;case m.TIMEOUT:$("#"+SN.C.S.NoticeDataGeo).attr("checked",false);break}},{timeout:10000})}else{if(c.length>0&&h.length>0){var k={lat:c,lon:h,token:$("#token").val()};j(g,k)}else{e();$("#"+SN.C.S.NoticeDataGeo).remove();$("label[for="+SN.C.S.NoticeDataGeo+"]").remove()}}}else{var l=JSON.parse($.cookie(SN.C.S.NoticeDataGeoCookie));$("#"+SN.C.S.NoticeLat).val(l.NLat);$("#"+SN.C.S.NoticeLon).val(l.NLon);$("#"+SN.C.S.NoticeLocationNs).val(l.NLNS);$("#"+SN.C.S.NoticeLocationId).val(l.NLID);$("#"+SN.C.S.NoticeDataGeo).attr("checked",l.NDG);$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",NoticeDataGeo_text.ShareDisable+" ("+l.NLN+")").addClass("checked")}}else{e()}}).change()}},NewDirectMessage:function(){NDM=$(".entity_send-a-message a");NDM.attr({href:NDM.attr("href")+"&ajax=1"});NDM.bind("click",function(){var a=$(".entity_send-a-message form");if(a.length===0){$(this).addClass(SN.C.S.Processing);$.get(NDM.attr("href"),null,function(b){$(".entity_send-a-message").append(document._importNode($("form",b)[0],true));a=$(".entity_send-a-message .form_notice");SN.U.FormNoticeXHR(a);SN.U.FormNoticeEnhancements(a);a.append('<button class="close">&#215;</button>');$(".entity_send-a-message button").click(function(){a.hide();return false});NDM.removeClass(SN.C.S.Processing)})}else{a.show();$(".entity_send-a-message textarea").focus()}return false})},GetFullYear:function(c,d,a){var b=new Date();b.setFullYear(c,d,a);return b},StatusNetInstance:{Set:function(b){var a=SN.U.StatusNetInstance.Get();if(a!==null){b=$.extend(a,b)}$.cookie(SN.C.S.StatusNetInstance,JSON.stringify(b),{path:"/",expires:SN.U.GetFullYear(2029,0,1)})},Get:function(){var a=$.cookie(SN.C.S.StatusNetInstance);if(a!==null){return JSON.parse(a)}return null},Delete:function(){$.cookie(SN.C.S.StatusNetInstance,null)}},belongsOnTimeline:function(b){var a=$("body").attr("id");if(a=="public"){return true}var c=$("#nav_profile a").attr("href");if(c){var d=$(b).find(".entry-title .author a.url").attr("href");if(d==c){if(a=="all"||a=="showstream"){return true}}}return false}},Init:{NoticeForm:function(){if($("body.user_in").length>0){SN.U.NoticeLocationAttach();$("."+SN.C.S.FormNotice).each(function(){SN.U.FormNoticeXHR($(this));SN.U.FormNoticeEnhancements($(this))});SN.U.NoticeDataAttach()}},Notices:function(){if($("body.user_in").length>0){SN.U.NoticeFavor();SN.U.NoticeRepeat();SN.U.NoticeReply();SN.U.NoticeInlineReplySetup()}SN.U.NoticeAttachments()},EntityActions:function(){if($("body.user_in").length>0){$(".form_user_subscribe").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_user_unsubscribe").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_group_join").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_group_leave").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_user_nudge").live("click",function(){SN.U.FormXHR($(this));return false});SN.U.NewDirectMessage()}},Login:function(){if(SN.U.StatusNetInstance.Get()!==null){var a=SN.U.StatusNetInstance.Get().Nickname;if(a!==null){$("#form_login #nickname").val(a)}}$("#form_login").bind("submit",function(){SN.U.StatusNetInstance.Set({Nickname:$("#form_login #nickname").val()});return true})},UploadForms:function(){$("input[type=file]").change(function(d){if(typeof this.files=="object"&&this.files.length>0){var c=0;for(var b=0;b<this.files.length;b++){c+=this.files[b].size}var a=SN.U.maxFileSize($(this.form));if(a>0&&c>a){var e="File too large: maximum upload size is %d bytes.";alert(e.replace("%d",a));$(this).val("");d.preventDefault();return false}}})}}};$(document).ready(function(){SN.Init.UploadForms();if($("."+SN.C.S.FormNotice).length>0){SN.Init.NoticeForm()}if($("#content .notices").length>0){SN.Init.Notices()}if($("#content .entity_actions").length>0){SN.Init.EntityActions()}if($("#form_login").length>0){SN.Init.Login()}});if(!document.ELEMENT_NODE){document.ELEMENT_NODE=1;document.ATTRIBUTE_NODE=2;document.TEXT_NODE=3;document.CDATA_SECTION_NODE=4;document.ENTITY_REFERENCE_NODE=5;document.ENTITY_NODE=6;document.PROCESSING_INSTRUCTION_NODE=7;document.COMMENT_NODE=8;document.DOCUMENT_NODE=9;document.DOCUMENT_TYPE_NODE=10;document.DOCUMENT_FRAGMENT_NODE=11;document.NOTATION_NODE=12}document._importNode=function(e,a){switch(e.nodeType){case document.ELEMENT_NODE:var d=document.createElement(e.nodeName);if(e.attributes&&e.attributes.length>0){for(var c=0,b=e.attributes.length;c<b;){if(e.attributes[c].nodeName=="class"){d.className=e.getAttribute(e.attributes[c++].nodeName)}else{d.setAttribute(e.attributes[c].nodeName,e.getAttribute(e.attributes[c++].nodeName))}}}if(a&&e.childNodes&&e.childNodes.length>0){for(var c=0,b=e.childNodes.length;c<b;){d.appendChild(document._importNode(e.childNodes[c++],a))}}return d;break;case document.TEXT_NODE:case document.CDATA_SECTION_NODE:case document.COMMENT_NODE:return document.createTextNode(e.nodeValue);break}};if(typeof navigator.geolocation=="undefined"||navigator.geolocation.shim){(function(){(function(){if(window.google&&google.gears){return}var c=null;if(typeof GearsFactory!="undefined"){c=new GearsFactory()}else{try{c=new ActiveXObject("Gears.Factory");if(c.getBuildInfo().indexOf("ie_mobile")!=-1){c.privateSetGlobalObject(this)}}catch(d){if((typeof navigator.mimeTypes!="undefined")&&navigator.mimeTypes["application/x-googlegears"]){c=document.createElement("object");c.style.display="none";c.width=0;c.height=0;c.type="application/x-googlegears";document.documentElement.appendChild(c)}}}if(!c){return}if(!window.google){google={}}if(!google.gears){google.gears={factory:c}}})();var a=(function(){var d=google.gears.factory.create("beta.geolocation");var c=function(f,e){return function(g){f(g);e.lastPosition=g}};return{shim:true,type:"Gears",lastPosition:null,getCurrentPosition:function(e,g,h){var f=this;var i=c(e,f);d.getCurrentPosition(i,g,h)},watchPosition:function(e,f,g){d.watchPosition(e,f,g)},clearWatch:function(e){d.clearWatch(e)},getPermission:function(g,e,f){d.getPermission(g,e,f)}}});var b=(function(){var i=false;var e=function(){if(!d()&&!i){i=true;var j=document.createElement("script");j.src=(document.location.protocol=="https:"?"https://":"http://")+"www.google.com/jsapi?callback=_google_loader_apiLoaded";j.type="text/javascript";document.getElementsByTagName("body")[0].appendChild(j)}};var c=[];var h=function(j){c.push(j)};var f=function(){if(d()){while(c.length>0){var j=c.pop();j()}}};window._google_loader_apiLoaded=function(){f()};var d=function(){return(window.google&&google.loader)};var g=function(j){if(d()){return true}h(j);e();return false};e();return{shim:true,type:"ClientLocation",lastPosition:null,getCurrentPosition:function(k,n,o){var m=this;if(!g(function(){m.getCurrentPosition(k,n,o)})){return}if(google.loader.ClientLocation){var l=google.loader.ClientLocation;var j={coords:{latitude:l.latitude,longitude:l.longitude,altitude:null,accuracy:43000,altitudeAccuracy:null,heading:null,speed:null},address:{city:l.address.city,country:l.address.country,country_code:l.address.country_code,region:l.address.region},timestamp:new Date()};k(j);this.lastPosition=j}else{if(n==="function"){n({code:3,message:"Using the Google ClientLocation API and it is not able to calculate a location."})}}},watchPosition:function(j,l,m){this.getCurrentPosition(j,l,m);var k=this;var n=setInterval(function(){k.getCurrentPosition(j,l,m)},10000);return n},clearWatch:function(j){clearInterval(j)},getPermission:function(l,j,k){return true}}});navigator.geolocation=(window.google&&google.gears)?a():b()})()};
\ No newline at end of file

From 8cacecb6dc8f5e467c0782dccc413789c698dd43 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Tue, 1 Mar 2011 16:29:11 -0800
Subject: [PATCH 367/655] Use threaded replies in group inbox view

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

diff --git a/actions/showgroup.php b/actions/showgroup.php
index 21256294f3..a38945c131 100644
--- a/actions/showgroup.php
+++ b/actions/showgroup.php
@@ -195,7 +195,7 @@ class ShowgroupAction extends GroupDesignAction
         $notice = $this->group->getNotices(($this->page-1)*NOTICES_PER_PAGE,
                                            NOTICES_PER_PAGE + 1);
 
-        $nl = new NoticeList($notice, $this);
+        $nl = new ThreadedNoticeList($notice, $this);
         $cnt = $nl->show();
 
         $this->pagination($this->page > 1,

From d09aa9c94728a3e4369dfb7b171b7e52e59b1234 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Tue, 1 Mar 2011 17:01:35 -0800
Subject: [PATCH 368/655] Workaround for bug causing fatal error during
 favoriting; Profile::getCurrentNotice() was returning an ArrayList instead of
 a Notice directly due to pulling through Profile::getNotices(). This caused
 failure in Fave::addNew() which specifies it wants a Notice. Caused failure
 of the 'fav' IM command.

---
 classes/Profile.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/classes/Profile.php b/classes/Profile.php
index 2ad302ccb8..88edf5cbb3 100644
--- a/classes/Profile.php
+++ b/classes/Profile.php
@@ -186,6 +186,10 @@ class Profile extends Memcached_DataObject
         $notice = $this->getNotices(0, 1);
 
         if ($notice->fetch()) {
+            if ($notice instanceof ArrayWrapper) {
+                // hack for things trying to work with single notices
+                return $notice->_items[0];
+            }
             return $notice;
         } else {
             return null;

From e42db528e2f0b26efcc1fcf779b9d3c34d7f5661 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Tue, 1 Mar 2011 17:09:41 -0800
Subject: [PATCH 369/655] More fixes for 'fav' IM command: don't die with a
 fatal error if the notice has already been favored, and don't spew a warning
 when checking for user ID match.

---
 lib/command.php | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/lib/command.php b/lib/command.php
index 852d0a8f7c..39fb283dd8 100644
--- a/lib/command.php
+++ b/lib/command.php
@@ -287,6 +287,18 @@ class FavCommand extends Command
     function handle($channel)
     {
         $notice = $this->getNotice($this->other);
+
+        $fave            = new Fave();
+        $fave->user_id   = $this->user->id;
+        $fave->notice_id = $notice->id;
+        $fave->find();
+
+        if ($fave->fetch()) {
+            // TRANS: Error message text shown when a favorite could not be set because it has already been favorited.
+            $channel->error($this->user, _('Could not create favorite: already favorited.'));
+            return;
+        }
+
         $fave = Fave::addNew($this->user->getProfile(), $notice);
 
         if (!$fave) {
@@ -300,7 +312,7 @@ class FavCommand extends Command
 
         $other = User::staticGet('id', $notice->profile_id);
 
-        if ($other && $other->id != $user->id) {
+        if ($other && $other->id != $this->user->id) {
             if ($other->email && $other->emailnotifyfav) {
                 mail_notify_fave($other, $this->user, $notice);
             }

From cb49ea88d33d51ce5a7bec3c90bbea7e0cb33890 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Tue, 1 Mar 2011 19:35:20 -0800
Subject: [PATCH 370/655] Initial go at a site directory plugin

---
 plugins/Directory/DirectoryPlugin.php       | 159 +++++++++++++
 plugins/Directory/actions/userdirectory.php | 241 ++++++++++++++++++++
 plugins/Directory/lib/alphanav.php          | 107 +++++++++
 3 files changed, 507 insertions(+)
 create mode 100644 plugins/Directory/DirectoryPlugin.php
 create mode 100644 plugins/Directory/actions/userdirectory.php
 create mode 100644 plugins/Directory/lib/alphanav.php

diff --git a/plugins/Directory/DirectoryPlugin.php b/plugins/Directory/DirectoryPlugin.php
new file mode 100644
index 0000000000..0ff2ea76bf
--- /dev/null
+++ b/plugins/Directory/DirectoryPlugin.php
@@ -0,0 +1,159 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2011, StatusNet, Inc.
+ *
+ * Adds a user directory
+ *
+ * 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  Plugin
+ * @package   StatusNet
+ * @author    Zach Copely <zach@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')) {
+    exit(1);
+}
+
+/**
+ * Directory plugin main class
+ *
+ * @category  Plugin
+ * @package   StatusNet
+ * @author    Zach Copley <zach@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 DirectoryPlugin extends Plugin
+{
+    /**
+     * Initializer for this plugin
+     *
+     * @return boolean hook value; true means continue processing,
+     *         false means stop.
+     */
+    function initialize()
+    {
+        return true;
+    }
+
+    /**
+     * Cleanup for this plugin.
+     *
+     * @return boolean hook value; true means continue processing,
+     *         false means stop.
+     */
+    function cleanup()
+    {
+        return true;
+    }
+
+    /**
+     * Load related modules when needed
+     *
+     * @param string $cls Name of the class to be loaded
+     *
+     * @return boolean hook value; true means continue processing,
+     *         false means stop.
+     */
+    function onAutoload($cls)
+    {
+        $dir = dirname(__FILE__);
+
+        // common_debug("class = $cls");
+
+        switch ($cls)
+        {
+        case 'UserdirectoryAction':
+            include_once $dir
+                . '/actions/' . strtolower(mb_substr($cls, 0, -6)) . '.php';
+            return false;
+        case 'AlphaNav':
+            include_once $dir
+                . '/lib/' . strtolower($cls) . '.php';
+            return false;
+        default:
+            return true;
+        }
+    }
+
+    /**
+     * Map URLs to actions
+     *
+     * @param Net_URL_Mapper $m path-to-action mapper
+     *
+     * @return boolean hook value; true means continue processing,
+     *         false means stop.
+     */
+    function onRouterInitialized($m)
+    {
+        $m->connect(
+            'main/directory',
+            array('action' => 'userdirectory')
+        );
+
+        return true;
+    }
+
+    /**
+     * Modify the public local nav to add a link to the user directory
+     *
+     * @param Action $action The current action handler. Use this to
+     *                       do any output.
+     *
+     * @return boolean hook value; true means continue processing,
+     *         false means stop.
+     *
+     * @see Action
+     */
+    function onEndPublicGroupNav($nav)
+    {
+        // XXX: Maybe this should go under search instead?
+
+        $actionName = $nav->action->trimmed('action');
+
+        $nav->out->menuItem(
+            common_local_url('userdirectory'),
+            _('Directory'),
+            _('User Directory'),
+            $actionName == 'userdirectory',
+            'nav_directory'
+        );
+
+        return true;
+    }
+
+    /*
+     * Version info
+     */
+    function onPluginVersion(&$versions)
+    {
+        $versions[] = array(
+            'name' => 'Directory',
+            'version' => STATUSNET_VERSION,
+            'author' => 'Zach Copley',
+            'homepage' => 'http://status.net/wiki/Plugin:Directory',
+            'rawdescription' => _m('Add a user directory.')
+        );
+
+        return true;
+    }
+}
diff --git a/plugins/Directory/actions/userdirectory.php b/plugins/Directory/actions/userdirectory.php
new file mode 100644
index 0000000000..e4c8f673ed
--- /dev/null
+++ b/plugins/Directory/actions/userdirectory.php
@@ -0,0 +1,241 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Output a user directory
+ *
+ * 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  Public
+ * @package   StatusNet
+ * @author    Zach Copley <zach@status.net>
+ * @copyright 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/
+ */
+
+if (!defined('STATUSNET'))
+{
+    exit(1);
+}
+
+require_once INSTALLDIR . '/lib/publicgroupnav.php';
+
+/**
+ * User directory
+ *
+ * @category Personal
+ * @package  StatusNet
+ * @author   Zach Copley <zach@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://status.net/
+ */
+class UserdirectoryAction extends Action
+{
+    /* Page we're on */
+    protected $page   = null;
+
+    /* What to filter the search results by */
+    protected $filter = null;
+
+    /**
+     * Title of the page
+     *
+     * @return string Title of the page
+     */
+    function title()
+    {
+        // @fixme: This looks kinda gross
+
+        if ($this->filter == 'All') {
+            if ($this->page != 1) {
+                return(sprintf(_m('All users, page %d'), $this->page));
+            }
+            return _m('All users');
+        }
+
+        if ($this->page == 1) {
+            return sprintf(
+                _m('Users with nicknames beginning with %s'),
+                $this->filter
+            );
+        } else {
+            return sprintf(
+                _m('Users with nicknames starting with %s, page %d'),
+                $this->filter,
+                $this->page
+            );
+        }
+    }
+
+    /**
+     * Instructions for use
+     *
+     * @return instructions for use
+     */
+    function getInstructions()
+    {
+        return _('User directory');
+    }
+
+    /**
+     * Is this page read-only?
+     *
+     * @return boolean true
+     */
+    function isReadOnly($args)
+    {
+        return true;
+    }
+
+    /**
+     * Take arguments for running
+     *
+     * @param array $args $_REQUEST args
+     *
+     * @return boolean success flag
+     *
+     * @todo move queries from showContent() to here
+     */
+    function prepare($args)
+    {
+        parent::prepare($args);
+
+        $this->page   = ($this->arg('page')) ? ($this->arg('page') + 0) : 1;
+        $this->filter = $this->arg('filter') ? $this->arg('filter') : 'All';
+        common_set_returnto($this->selfUrl());
+
+        return true;
+    }
+
+    /**
+     * Handle request
+     *
+     * Shows the page
+     *
+     * @param array $args $_REQUEST args; handled in prepare()
+     *
+     * @return void
+     */
+    function handle($args)
+    {
+        parent::handle($args);
+        $this->showPage();
+    }
+
+    /**
+     * Show the page notice
+     *
+     * Shows instructions for the page
+     *
+     * @return void
+     */
+    function showPageNotice()
+    {
+        $instr  = $this->getInstructions();
+        $output = common_markup_to_html($instr);
+
+        $this->elementStart('div', 'instructions');
+        $this->raw($output);
+        $this->elementEnd('div');
+    }
+
+    /**
+     * Local navigation
+     *
+     * This page is part of the public group, so show that.
+     *
+     * @return void
+     */
+    function showLocalNav()
+    {
+        $nav = new PublicGroupNav($this);
+        $nav->show();
+    }
+
+    /**
+     * Content area
+     *
+     * Shows the list of popular notices
+     *
+     * @return void
+     */
+    function showContent()
+    {
+        // XXX Need search bar
+
+        $alphaNav = new AlphaNav($this, true, array('All'));
+        $alphaNav->show();
+
+        // XXX Maybe use a more specialized version of ProfileList here
+
+        $profile = $this->getUsers();
+        $cnt     = 0;
+
+        if (!empty($profile)) {
+            $profileList = new SubscriptionList(
+                $profile,
+                common_current_user(),
+                $this
+            );
+
+            $cnt = $profileList->show();
+
+            if (0 == $cnt) {
+                $this->showEmptyListMessage();
+            }
+        }
+
+        $this->pagination($this->page > 1, $cnt > PROFILES_PER_PAGE,
+                          $this->page, 'userdirectory',
+                          array('filter' => $this->filter));
+
+    }
+
+    /*
+     * Get users filtered by the current filter and page
+     */
+    function getUsers()
+    {
+        $offset = ($this->page-1) * PROFILES_PER_PAGE;
+        $limit =  PROFILES_PER_PAGE + 1;
+
+        $profile = new Profile();
+
+        if ($this->filter != 'All') {
+            $profile->whereAdd(
+                sprintf('LEFT(UPPER(nickname), 1) = \'%s\'', $this->filter)
+            );
+        }
+        $profile->orderBy('created DESC, nickname');
+        $profile->find();
+
+        return $profile;
+    }
+
+    /**
+     * Show a nice message when there's no search results
+     */
+    function showEmptyListMessage()
+    {
+        $message = sprintf(_m('No users starting with %s'), $this->filter);
+
+        $this->elementStart('div', 'guide');
+        $this->raw(common_markup_to_html($message));
+        $this->elementEnd('div');
+    }
+
+}
diff --git a/plugins/Directory/lib/alphanav.php b/plugins/Directory/lib/alphanav.php
new file mode 100644
index 0000000000..228237bfed
--- /dev/null
+++ b/plugins/Directory/lib/alphanav.php
@@ -0,0 +1,107 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Widget to display an alphabet menu
+ *
+ * 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    Zach Copley <zach@status.net>
+ * @copyright 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/
+ */
+
+if (!defined('STATUSNET') && !defined('LACONICA')) {
+    exit(1);
+}
+
+/**
+ * Outputs a fancy alphabet letter navigation menu
+ *
+ * @category Widget
+ * @package  StatusNet
+ * @author   Zach Copley <zach@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://status.net/
+ *
+ * @see      HTMLOutputter
+ */
+
+class AlphaNav extends Widget
+{
+    protected $action  = null;
+    protected $filters = array();
+
+    /**
+     * Prepare the widget for use
+     *
+     * @param Action  $action  the current action
+     * @param boolean $numbers whether to output 0..9
+     * @param Array   $prepend array of filters to prepend
+     * @param Array   $append  array of filters to append
+     */
+    function __construct(
+            $action  = null,
+            $numbers = false,
+            $prepend = false,
+            $append  = false
+    )
+    {
+        parent::__construct($action);
+
+        $this->action  = $action;
+
+        if ($prepend) {
+            $this->filters = array_merge($prepend, $this->filters);
+        }
+
+        if ($numbers) {
+            $this->filters = array_merge($this->filters, range(0, 9));
+        }
+
+        if ($append) {
+            $this->filters = array_merge($this->filters, $append);
+        }
+
+        $this->filters = array_merge($this->filters, range('A', 'Z'));
+    }
+
+    /**
+     * Show the widget
+     *
+     * Emit the HTML for the widget, using the configured outputter.
+     *
+     * @return void
+     */
+
+    function show()
+    {
+        $actionName = $this->action->trimmed('action');
+
+        foreach ($this->filters as $filter) {
+            $href = common_local_url(
+                $actionName,
+                null,
+                array('filter' => $filter)
+            );
+            $this->action->element('a', array('href' => $href), $filter);
+        }
+    }
+
+}

From d55a831d970616b9f07e1ceee457f4e61665f3fb Mon Sep 17 00:00:00 2001
From: Siebrand Mazeland <s.mazeland@xs4all.nl>
Date: Thu, 3 Mar 2011 01:42:54 +0100
Subject: [PATCH 371/655] Update translator documentation.

---
 actions/tag.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/actions/tag.php b/actions/tag.php
index 7c6f99d92b..944cda1f4a 100644
--- a/actions/tag.php
+++ b/actions/tag.php
@@ -64,8 +64,12 @@ class TagAction extends Action
     function title()
     {
         if ($this->page == 1) {
+            // TRANS: Title for first page of notices with tags.
+            // TRANS: %s is the tag.
             return sprintf(_('Notices tagged with %s'), $this->tag);
         } else {
+            // TRANS: Title for all but the first page of notices with tags.
+            // TRANS: %1$s is the tag, %2$d is the page number.
             return sprintf(_('Notices tagged with %1$s, page %2$d'),
                            $this->tag,
                            $this->page);

From 53db4c2b85b27db85c8d29f059fe893f5c0b3745 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Wed, 2 Mar 2011 22:09:11 -0500
Subject: [PATCH 372/655] move notice form to content block

---
 lib/action.php | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/lib/action.php b/lib/action.php
index 5917d31b36..dc95b030d2 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -464,14 +464,7 @@ class Action extends HTMLOutputter // lawsuit
 
             Event::handle('EndShowSiteNotice', array($this));
         }
-        if (common_logged_in()) {
-            if (Event::handle('StartShowNoticeForm', array($this))) {
-                $this->showNoticeForm();
-                Event::handle('EndShowNoticeForm', array($this));
-            }
-        } else {
-            $this->showAnonymousMessage();
-        }
+
         $this->elementEnd('div');
     }
 
@@ -679,6 +672,12 @@ class Action extends HTMLOutputter // lawsuit
     function showContentBlock()
     {
         $this->elementStart('div', array('id' => 'content'));
+        if (common_logged_in()) {
+            if (Event::handle('StartShowNoticeForm', array($this))) {
+                $this->showNoticeForm();
+                Event::handle('EndShowNoticeForm', array($this));
+            }
+        }
         if (Event::handle('StartShowPageTitle', array($this))) {
             $this->showPageTitle();
             Event::handle('EndShowPageTitle', array($this));

From 85610d0881b9b40171100e4b913f3ff86305db8c Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Wed, 2 Mar 2011 22:09:26 -0500
Subject: [PATCH 373/655] no notice form on settings pages

---
 lib/settingsaction.php | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/lib/settingsaction.php b/lib/settingsaction.php
index 8c00054dcb..dc60137ab4 100644
--- a/lib/settingsaction.php
+++ b/lib/settingsaction.php
@@ -163,4 +163,15 @@ class SettingsAction extends CurrentUserDesignAction
         $menu = new SettingsNav($this);
         $menu->show();
     }
+
+    /**
+     * Show notice form.
+     *
+     * @return nothing
+     */
+
+    function showNoticeForm()
+    {
+        return;
+    }
 }

From 3b186e1bae91ae0030c8eeb58fdfbc114dfd0b84 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Wed, 2 Mar 2011 20:21:15 -0800
Subject: [PATCH 374/655] * Fix pagination * Add some more elements for styling
 * Add initial CSS

---
 plugins/Directory/DirectoryPlugin.php       | 40 +++++++++++++++++----
 plugins/Directory/actions/userdirectory.php | 39 ++++++++++++++------
 plugins/Directory/css/directory.css         | 34 ++++++++++++++++++
 plugins/Directory/lib/alphanav.php          | 37 ++++++++++++++++---
 4 files changed, 129 insertions(+), 21 deletions(-)
 create mode 100644 plugins/Directory/css/directory.css

diff --git a/plugins/Directory/DirectoryPlugin.php b/plugins/Directory/DirectoryPlugin.php
index 0ff2ea76bf..aaa33a1ec1 100644
--- a/plugins/Directory/DirectoryPlugin.php
+++ b/plugins/Directory/DirectoryPlugin.php
@@ -44,6 +44,9 @@ if (!defined('STATUSNET')) {
  */
 class DirectoryPlugin extends Plugin
 {
+
+    private $dir = null;
+
     /**
      * Initializer for this plugin
      *
@@ -52,6 +55,7 @@ class DirectoryPlugin extends Plugin
      */
     function initialize()
     {
+        $this->dir = dirname(__FILE__);
         return true;
     }
 
@@ -76,18 +80,16 @@ class DirectoryPlugin extends Plugin
      */
     function onAutoload($cls)
     {
-        $dir = dirname(__FILE__);
-
         // common_debug("class = $cls");
 
         switch ($cls)
         {
         case 'UserdirectoryAction':
-            include_once $dir
+            include_once $this->dir
                 . '/actions/' . strtolower(mb_substr($cls, 0, -6)) . '.php';
             return false;
         case 'AlphaNav':
-            include_once $dir
+            include_once $this->dir
                 . '/lib/' . strtolower($cls) . '.php';
             return false;
         default:
@@ -106,10 +108,36 @@ class DirectoryPlugin extends Plugin
     function onRouterInitialized($m)
     {
         $m->connect(
-            'main/directory',
-            array('action' => 'userdirectory')
+            'directory/users/:filter',
+            array('action' => 'userdirectory'),
+            array('filter' => '[0-9a-zA-Z_]{1,64}')
         );
 
+        $m->connect(
+            'directory/users',
+            array('action' => 'userdirectory'),
+            array('filter' => 'all')
+        );
+
+        return true;
+    }
+
+    /**
+     * Link in a styelsheet for the onboarding actions
+     *
+     * @param Action $action Action being shown
+     *
+     * @return boolean hook flag
+     */
+    function onEndShowStatusNetStyles($action)
+    {
+        if (in_array(
+            $action->trimmed('action'),
+            array('userdirectory'))
+        ) {
+            $action->cssLink($this->path('css/directory.css'));
+        }
+
         return true;
     }
 
diff --git a/plugins/Directory/actions/userdirectory.php b/plugins/Directory/actions/userdirectory.php
index e4c8f673ed..7e9f20c369 100644
--- a/plugins/Directory/actions/userdirectory.php
+++ b/plugins/Directory/actions/userdirectory.php
@@ -45,10 +45,14 @@ require_once INSTALLDIR . '/lib/publicgroupnav.php';
  */
 class UserdirectoryAction extends Action
 {
-    /* Page we're on */
+    /**
+     * @var $page       integer  the page we're on
+     */
     protected $page   = null;
 
-    /* What to filter the search results by */
+    /**
+     * @var $filter     string    what to filter the search results by
+     */
     protected $filter = null;
 
     /**
@@ -60,7 +64,7 @@ class UserdirectoryAction extends Action
     {
         // @fixme: This looks kinda gross
 
-        if ($this->filter == 'All') {
+        if ($this->filter == 'all') {
             if ($this->page != 1) {
                 return(sprintf(_m('All users, page %d'), $this->page));
             }
@@ -115,7 +119,7 @@ class UserdirectoryAction extends Action
         parent::prepare($args);
 
         $this->page   = ($this->arg('page')) ? ($this->arg('page') + 0) : 1;
-        $this->filter = $this->arg('filter') ? $this->arg('filter') : 'All';
+        $this->filter = $this->arg('filter') ? $this->arg('filter') : 'all';
         common_set_returnto($this->selfUrl());
 
         return true;
@@ -177,6 +181,8 @@ class UserdirectoryAction extends Action
     {
         // XXX Need search bar
 
+        $this->elementStart('div', array('id' => 'user_directory'));
+
         $alphaNav = new AlphaNav($this, true, array('All'));
         $alphaNav->show();
 
@@ -199,9 +205,15 @@ class UserdirectoryAction extends Action
             }
         }
 
-        $this->pagination($this->page > 1, $cnt > PROFILES_PER_PAGE,
-                          $this->page, 'userdirectory',
-                          array('filter' => $this->filter));
+        $this->pagination(
+            $this->page > 1,
+            $cnt > PROFILES_PER_PAGE,
+            $this->page,
+            'userdirectory',
+            array('filter' => $this->filter)
+        );
+
+        $this->elementEnd('div');
 
     }
 
@@ -210,17 +222,22 @@ class UserdirectoryAction extends Action
      */
     function getUsers()
     {
-        $offset = ($this->page-1) * PROFILES_PER_PAGE;
-        $limit =  PROFILES_PER_PAGE + 1;
+        $offset = ($this->page - 1) * PROFILES_PER_PAGE;
+        $limit  =  PROFILES_PER_PAGE + 1;
 
         $profile = new Profile();
 
-        if ($this->filter != 'All') {
+        // XXX Any chance of SQL injection here?
+
+        if ($this->filter != 'all') {
             $profile->whereAdd(
-                sprintf('LEFT(UPPER(nickname), 1) = \'%s\'', $this->filter)
+                sprintf('LEFT(lower(nickname), 1) = \'%s\'', $this->filter)
             );
         }
+
         $profile->orderBy('created DESC, nickname');
+        $profile->limit($limit, $offset);
+
         $profile->find();
 
         return $profile;
diff --git a/plugins/Directory/css/directory.css b/plugins/Directory/css/directory.css
new file mode 100644
index 0000000000..3778525a84
--- /dev/null
+++ b/plugins/Directory/css/directory.css
@@ -0,0 +1,34 @@
+/* CSS file for the Directory plugin */
+
+div#user_directory div.alpha_nav {
+    overflow: hidden;
+    width: 100%;
+    text-align: center;
+}
+
+/* XXX: this needs serious CSS foo */
+div#user_directory div.alpha_nav > a {
+    border-left: 1px solid #000;
+    padding-left: 2px;
+}
+div#user_directory div.alpha_nav > a.first {
+    border-left: none;
+}
+
+div#user_directory div.alpha_nav a:link {
+    text-decoration: none;
+}
+
+div#user_directory div.alpha_nav a:visited {
+    text-decoration: none;
+}
+div#user_directory div.alpha_nav a:active {
+    text-decoration: none;
+}
+div#user_directory div.alpha_nav a:hover {
+    text-decoration: underline; color: blue;
+}
+
+div#user_directory div.alpha_nav a.current {
+    background-color:#9BB43E;
+}
diff --git a/plugins/Directory/lib/alphanav.php b/plugins/Directory/lib/alphanav.php
index 228237bfed..6829f3d2c3 100644
--- a/plugins/Directory/lib/alphanav.php
+++ b/plugins/Directory/lib/alphanav.php
@@ -94,14 +94,43 @@ class AlphaNav extends Widget
     {
         $actionName = $this->action->trimmed('action');
 
-        foreach ($this->filters as $filter) {
+        $this->action->elementStart('div', array('class' => 'alpha_nav'));
+
+        for ($i = 0, $size = sizeof($this->filters); $i < $size; $i++) {
+
+            $filter = $this->filters[$i];
+            $classes = '';
+
+            // Add some classes for styling
+            if ($i == 0) {
+                $classes .= 'first '; // first filter in the list
+            } elseif ($i == $size - 1) {
+                $classes .= 'last ';  // last filter in the list
+            }
+
             $href = common_local_url(
                 $actionName,
-                null,
-                array('filter' => $filter)
+                array('filter' => strtolower($filter))
             );
-            $this->action->element('a', array('href' => $href), $filter);
+
+            $params  = array('href' => $href);
+            $current = $this->action->arg('filter');
+
+            // Highlight the selected filter. If there is no selected
+            // filter, highlight the first filter in the list
+            if (empty($current) && $i == 0
+                || $current === strtolower($filter)) {
+                $classes .= 'current ';
+            }
+
+            if (!empty($classes)) {
+                $params['class'] = trim($classes);
+            }
+
+            $this->action->element('a', $params, $filter);
         }
+
+        $this->action->elementEnd('div');
     }
 
 }

From 0210b765ad59ed108fb0f4b2a53ea8deca8deab3 Mon Sep 17 00:00:00 2001
From: Siebrand Mazeland <s.mazeland@xs4all.nl>
Date: Thu, 3 Mar 2011 18:21:17 +0100
Subject: [PATCH 375/655] Localisation updates from http://translatewiki.net.

Looks like some documentation patches from 0.9.x didn't make it into 1.0.x (see statusnet.pot diff). Have to check with Brion what went wrong there.
---
 locale/ar/LC_MESSAGES/statusnet.po            | 934 ++++++++--------
 locale/arz/LC_MESSAGES/statusnet.po           | 930 ++++++++--------
 locale/bg/LC_MESSAGES/statusnet.po            | 933 ++++++++--------
 locale/br/LC_MESSAGES/statusnet.po            | 937 ++++++++--------
 locale/ca/LC_MESSAGES/statusnet.po            | 983 ++++++++---------
 locale/cs/LC_MESSAGES/statusnet.po            | 933 ++++++++--------
 locale/de/LC_MESSAGES/statusnet.po            | 939 ++++++++--------
 locale/en_GB/LC_MESSAGES/statusnet.po         | 941 ++++++++---------
 locale/eo/LC_MESSAGES/statusnet.po            | 934 ++++++++--------
 locale/es/LC_MESSAGES/statusnet.po            | 937 ++++++++--------
 locale/fa/LC_MESSAGES/statusnet.po            | 931 ++++++++--------
 locale/fi/LC_MESSAGES/statusnet.po            | 998 ++++++++----------
 locale/fr/LC_MESSAGES/statusnet.po            | 938 ++++++++--------
 locale/fur/LC_MESSAGES/statusnet.po           | 978 ++++++++---------
 locale/gl/LC_MESSAGES/statusnet.po            | 939 ++++++++--------
 locale/hsb/LC_MESSAGES/statusnet.po           | 971 ++++++++---------
 locale/hu/LC_MESSAGES/statusnet.po            | 947 ++++++++---------
 locale/ia/LC_MESSAGES/statusnet.po            | 985 ++++++++---------
 locale/it/LC_MESSAGES/statusnet.po            | 935 ++++++++--------
 locale/ja/LC_MESSAGES/statusnet.po            | 935 ++++++++--------
 locale/ka/LC_MESSAGES/statusnet.po            | 935 ++++++++--------
 locale/ko/LC_MESSAGES/statusnet.po            | 934 ++++++++--------
 locale/mk/LC_MESSAGES/statusnet.po            | 988 ++++++++---------
 locale/ml/LC_MESSAGES/statusnet.po            | 962 ++++++++---------
 locale/nb/LC_MESSAGES/statusnet.po            | 935 ++++++++--------
 locale/nl/LC_MESSAGES/statusnet.po            | 984 ++++++++---------
 locale/nn/LC_MESSAGES/statusnet.po            | 924 ++++++++--------
 locale/pl/LC_MESSAGES/statusnet.po            | 935 ++++++++--------
 locale/pt/LC_MESSAGES/statusnet.po            | 938 ++++++++--------
 locale/pt_BR/LC_MESSAGES/statusnet.po         | 935 ++++++++--------
 locale/ru/LC_MESSAGES/statusnet.po            | 934 ++++++++--------
 locale/statusnet.pot                          | 838 ++++++---------
 locale/sv/LC_MESSAGES/statusnet.po            | 937 ++++++++--------
 locale/te/LC_MESSAGES/statusnet.po            | 932 ++++++++--------
 locale/tr/LC_MESSAGES/statusnet.po            | 936 ++++++++--------
 locale/uk/LC_MESSAGES/statusnet.po            | 981 ++++++++---------
 locale/zh_CN/LC_MESSAGES/statusnet.po         | 986 ++++++++---------
 .../locale/pt/LC_MESSAGES/Awesomeness.po      |  30 +
 .../locale/pt/LC_MESSAGES/EmailSummary.po     |  26 +
 .../FacebookBridge/locale/FacebookBridge.pot  |  18 +-
 .../locale/br/LC_MESSAGES/FacebookBridge.po   |  24 +-
 .../locale/ca/LC_MESSAGES/FacebookBridge.po   |  24 +-
 .../locale/de/LC_MESSAGES/FacebookBridge.po   |  24 +-
 .../locale/ia/LC_MESSAGES/FacebookBridge.po   |  24 +-
 .../locale/mk/LC_MESSAGES/FacebookBridge.po   |  24 +-
 .../locale/nl/LC_MESSAGES/FacebookBridge.po   |  24 +-
 .../locale/uk/LC_MESSAGES/FacebookBridge.po   |  24 +-
 .../zh_CN/LC_MESSAGES/FacebookBridge.po       |  24 +-
 .../locale/pt/LC_MESSAGES/FollowEveryone.po   |  28 +
 plugins/Imap/locale/zh_CN/LC_MESSAGES/Imap.po |  11 +-
 .../locale/pt/LC_MESSAGES/InProcessCache.po   |  26 +
 .../pt/LC_MESSAGES/LdapAuthentication.po      |  30 +
 .../pt/LC_MESSAGES/LdapAuthorization.po       |  30 +
 .../locale/fur/LC_MESSAGES/Mapstraction.po    |  66 ++
 .../MobileProfile/locale/MobileProfile.pot    |  40 +-
 .../locale/bg/LC_MESSAGES/MobileProfile.po    |  46 +-
 .../locale/br/LC_MESSAGES/MobileProfile.po    |  46 +-
 .../locale/ce/LC_MESSAGES/MobileProfile.po    |  46 +-
 .../locale/de/LC_MESSAGES/MobileProfile.po    |  46 +-
 .../locale/fr/LC_MESSAGES/MobileProfile.po    |  46 +-
 .../locale/gl/LC_MESSAGES/MobileProfile.po    |  46 +-
 .../locale/ia/LC_MESSAGES/MobileProfile.po    |  46 +-
 .../locale/mk/LC_MESSAGES/MobileProfile.po    |  46 +-
 .../locale/nb/LC_MESSAGES/MobileProfile.po    |  46 +-
 .../locale/nl/LC_MESSAGES/MobileProfile.po    |  46 +-
 .../locale/ps/LC_MESSAGES/MobileProfile.po    |  46 +-
 .../locale/ru/LC_MESSAGES/MobileProfile.po    |  46 +-
 .../locale/ta/LC_MESSAGES/MobileProfile.po    |  46 +-
 .../locale/te/LC_MESSAGES/MobileProfile.po    |  46 +-
 .../locale/tl/LC_MESSAGES/MobileProfile.po    |  46 +-
 .../locale/uk/LC_MESSAGES/MobileProfile.po    |  46 +-
 .../locale/zh_CN/LC_MESSAGES/MobileProfile.po |  53 +-
 .../pt/LC_MESSAGES/OpenExternalLinkTarget.po  |  28 +
 .../locale/pt/LC_MESSAGES/PiwikAnalytics.po   |  30 +
 .../locale/pt/LC_MESSAGES/PostDebug.po        |  26 +
 .../locale/fur/LC_MESSAGES/Recaptcha.po       |  38 +
 .../locale/RequireValidatedEmail.pot          |   8 +-
 .../de/LC_MESSAGES/RequireValidatedEmail.po   |  14 +-
 .../fr/LC_MESSAGES/RequireValidatedEmail.po   |  14 +-
 .../ia/LC_MESSAGES/RequireValidatedEmail.po   |  14 +-
 .../mk/LC_MESSAGES/RequireValidatedEmail.po   |  14 +-
 .../nl/LC_MESSAGES/RequireValidatedEmail.po   |  14 +-
 .../tl/LC_MESSAGES/RequireValidatedEmail.po   |  14 +-
 .../uk/LC_MESSAGES/RequireValidatedEmail.po   |  14 +-
 .../locale/pt/LC_MESSAGES/SQLProfile.po       |  26 +
 .../locale/uk/LC_MESSAGES/SubMirror.po        |  10 +-
 .../pt/LC_MESSAGES/SubscriptionThrottle.po    |  26 +
 .../locale/pt/LC_MESSAGES/TightUrl.po         |  27 +
 .../TinyMCE/locale/pt/LC_MESSAGES/TinyMCE.po  |  26 +
 .../locale/pt/LC_MESSAGES/WikiHashtags.po     |  30 +
 .../XCache/locale/pt/LC_MESSAGES/XCache.po    |  30 +
 91 files changed, 17138 insertions(+), 19523 deletions(-)
 create mode 100644 plugins/Awesomeness/locale/pt/LC_MESSAGES/Awesomeness.po
 create mode 100644 plugins/EmailSummary/locale/pt/LC_MESSAGES/EmailSummary.po
 create mode 100644 plugins/FollowEveryone/locale/pt/LC_MESSAGES/FollowEveryone.po
 create mode 100644 plugins/InProcessCache/locale/pt/LC_MESSAGES/InProcessCache.po
 create mode 100644 plugins/LdapAuthentication/locale/pt/LC_MESSAGES/LdapAuthentication.po
 create mode 100644 plugins/LdapAuthorization/locale/pt/LC_MESSAGES/LdapAuthorization.po
 create mode 100644 plugins/Mapstraction/locale/fur/LC_MESSAGES/Mapstraction.po
 create mode 100644 plugins/OpenExternalLinkTarget/locale/pt/LC_MESSAGES/OpenExternalLinkTarget.po
 create mode 100644 plugins/PiwikAnalytics/locale/pt/LC_MESSAGES/PiwikAnalytics.po
 create mode 100644 plugins/PostDebug/locale/pt/LC_MESSAGES/PostDebug.po
 create mode 100644 plugins/Recaptcha/locale/fur/LC_MESSAGES/Recaptcha.po
 create mode 100644 plugins/SQLProfile/locale/pt/LC_MESSAGES/SQLProfile.po
 create mode 100644 plugins/SubscriptionThrottle/locale/pt/LC_MESSAGES/SubscriptionThrottle.po
 create mode 100644 plugins/TightUrl/locale/pt/LC_MESSAGES/TightUrl.po
 create mode 100644 plugins/TinyMCE/locale/pt/LC_MESSAGES/TinyMCE.po
 create mode 100644 plugins/WikiHashtags/locale/pt/LC_MESSAGES/WikiHashtags.po
 create mode 100644 plugins/XCache/locale/pt/LC_MESSAGES/XCache.po

diff --git a/locale/ar/LC_MESSAGES/statusnet.po b/locale/ar/LC_MESSAGES/statusnet.po
index eb9802fc22..b0a3b8577f 100644
--- a/locale/ar/LC_MESSAGES/statusnet.po
+++ b/locale/ar/LC_MESSAGES/statusnet.po
@@ -12,19 +12,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-24 10:32+0000\n"
-"PO-Revision-Date: 2011-02-24 10:36:00+0000\n"
+"POT-Creation-Date: 2011-03-03 15:58+0000\n"
+"PO-Revision-Date: 2011-03-03 16:00:08+0000\n"
 "Language-Team: Arabic <http://translatewiki.net/wiki/Portal:ar>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r82712); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ar\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=6; plural=(n == 0) ? 0 : ( (n == 1) ? 1 : ( (n == "
 "2) ? 2 : ( (n%100 >= 3 && n%100 <= 10) ? 3 : ( (n%100 >= 11 && n%100 <= "
 "99) ? 4 : 5 ) ) ) );\n"
-"X-POT-Import-Date: 2011-02-17 11:39:54+0000\n"
+"X-POT-Import-Date: 2011-02-25 23:49:23+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -136,11 +136,7 @@ msgstr "لا صفحة كهذه."
 #. 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 use "one time password login" without using an existing user.
-#. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
-#. TRANS: Client error displayed trying to find a user by ID for a non-existing ID.
-#. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when calling a profile action without specifying a user.
 #: actions/all.php:80 actions/allrss.php:69
@@ -158,12 +154,12 @@ msgstr "لا صفحة كهذه."
 #: actions/apitimelinementions.php:77 actions/apitimelineuser.php:79
 #: actions/avatarbynickname.php:79 actions/favoritesrss.php:72
 #: actions/foaf.php:42 actions/foaf.php:61 actions/hcard.php:67
-#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:78
+#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
 #: actions/remotesubscribe.php:144 actions/remotesubscribe.php:153
-#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:113
-#: actions/showfavorites.php:106 actions/userbyid.php:75
+#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
+#: actions/showfavorites.php:106 actions/userbyid.php:74
 #: actions/usergroups.php:93 actions/userrss.php:40 actions/userxrd.php:59
-#: actions/xrds.php:71 lib/command.php:497 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:509 lib/galleryaction.php:59
 #: lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "لا مستخدم كهذا."
@@ -287,7 +283,7 @@ msgstr "الإشعارات التي فضلها %1$s في %2$s!"
 #: actions/apigrouplistall.php:120 actions/apigroupmembership.php:105
 #: actions/apigroupshow.php:114 actions/apihelptest.php:84
 #: actions/apistatusesdestroy.php:101 actions/apistatusesretweets.php:110
-#: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:138
+#: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:139
 #: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
 #: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:268
 #: actions/apitimelinegroup.php:147 actions/apitimelinehome.php:173
@@ -520,7 +516,7 @@ msgstr "لم يُعثر على المستخدم المستلم."
 
 #. TRANS: Client error displayed trying to direct message another user who's not a friend (403).
 #: actions/apidirectmessagenew.php:144
-msgid "Cannot send direct messages to users who aren't your friend."
+msgid "Can't send direct messages to users who aren't your friend."
 msgstr ""
 
 #. TRANS: Client error displayed trying to direct message self (403).
@@ -545,7 +541,7 @@ msgstr "هذه الحالة مفضلة بالفعل."
 #. TRANS: Client error displayed when marking a notice as favourite fails.
 #. TRANS: Server error displayed when trying to mark a notice as favorite fails in the database.
 #. TRANS: Error message text shown when a favorite could not be set.
-#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:294
+#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:306
 msgid "Could not create favorite."
 msgstr "تعذّر إنشاء مفضلة."
 
@@ -603,7 +599,7 @@ msgstr "تعذّر إيجاد المستخدم الهدف."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:191
 #: actions/newgroup.php:137 actions/profilesettings.php:273
-#: actions/register.php:206
+#: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "الاسم المستعار مستخدم بالفعل. جرّب اسمًا آخرًا."
 
@@ -613,7 +609,7 @@ msgstr "الاسم المستعار مستخدم بالفعل. جرّب اسمً
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:195
 #: actions/newgroup.php:141 actions/profilesettings.php:243
-#: actions/register.php:208
+#: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "ليس اسمًا مستعارًا صحيحًا."
 
@@ -626,7 +622,7 @@ msgstr "ليس اسمًا مستعارًا صحيحًا."
 #: actions/apigroupcreate.php:181 actions/editapplication.php:235
 #: actions/editgroup.php:202 actions/newapplication.php:221
 #: actions/newgroup.php:148 actions/profilesettings.php:248
-#: actions/register.php:215
+#: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "الصفحة الرئيسية ليست عنونًا صالحًا."
 
@@ -636,7 +632,7 @@ msgstr "الصفحة الرئيسية ليست عنونًا صالحًا."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:191 actions/editgroup.php:206
 #: actions/newgroup.php:152 actions/profilesettings.php:252
-#: actions/register.php:218
+#: actions/register.php:226
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "الاسم الكامل طويل جدًا (الحد الأقصى 255 حرفًا)."
 
@@ -668,7 +664,7 @@ msgstr[5] "المنظمة طويلة جدا (الأقصى %d حرفا)."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:215 actions/editgroup.php:218
 #: actions/newgroup.php:164 actions/profilesettings.php:265
-#: actions/register.php:227
+#: actions/register.php:235
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
 msgstr "المنظمة طويلة جدا (الأقصى 255 حرفا)."
@@ -729,7 +725,7 @@ msgstr "المجموعة غير موجودة."
 #. TRANS: Server error displayed when trying to join a group the user is already a member of.
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:333
+#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:345
 #, fuzzy
 msgid "You are already a member of that group."
 msgstr "أنت بالفعل عضو في هذه المجموعة"
@@ -737,7 +733,7 @@ msgstr "أنت بالفعل عضو في هذه المجموعة"
 #. TRANS: Server error displayed when trying to join a group the user is blocked from joining.
 #. 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.
-#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:338
+#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:350
 #, fuzzy
 msgid "You have been blocked from that group by the admin."
 msgstr "لم تمنع هذا المستخدم."
@@ -748,7 +744,7 @@ msgstr "لم تمنع هذا المستخدم."
 #. TRANS: %1$s is the joining user's nickname, $2$s is the group nickname for which the join failed.
 #. TRANS: Message given having failed to add a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:350
+#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:362
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "لم يمكن ضم المستخدم %1$s إلى المجموعة %2$s."
@@ -765,7 +761,7 @@ msgstr "لست عضوًا في هذه المجموعة"
 #. TRANS: Message given having failed to remove a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
 #: actions/apigroupleave.php:127 actions/leavegroup.php:133
-#: lib/command.php:398
+#: lib/command.php:410
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
 msgstr "لم يمكن إزالة المستخدم %1$s من المجموعة %2$s."
@@ -829,21 +825,20 @@ msgstr "لا تملك تصريحًا."
 #. TRANS: Form validation error message.
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
-#. TRANS: Client error displayed when the session token is not okay.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
 #: actions/deletenotice.php:177 actions/disfavor.php:75
 #: actions/emailsettings.php:291 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:65 actions/grouplogo.php:321
 #: actions/groupunblock.php:65 actions/imsettings.php:224
-#: actions/invite.php:60 actions/login.php:131 actions/makeadmin.php:66
+#: actions/invite.php:60 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
-#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:136
-#: actions/othersettings.php:155 actions/passwordsettings.php:137
+#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
+#: actions/othersettings.php:155 actions/passwordsettings.php:138
 #: actions/profilesettings.php:217 actions/recoverpassword.php:383
-#: actions/register.php:164 actions/remotesubscribe.php:76
+#: actions/register.php:172 actions/remotesubscribe.php:76
 #: actions/repeat.php:82 actions/smssettings.php:250 actions/subedit.php:40
-#: actions/subscribe.php:87 actions/tagother.php:166
-#: actions/unsubscribe.php:69 actions/userauthorization.php:53
+#: actions/subscribe.php:86 actions/tagother.php:166
+#: actions/unsubscribe.php:69 actions/userauthorization.php:52
 #: lib/designsettings.php:310
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
@@ -875,7 +870,7 @@ msgstr "خطأ في قاعدة البيانات أثناء حذف مستخدم 
 #: actions/designadminpanel.php:100 actions/editapplication.php:144
 #: actions/emailsettings.php:310 actions/grouplogo.php:332
 #: actions/imsettings.php:239 actions/newapplication.php:124
-#: actions/oauthconnectionssettings.php:145 actions/recoverpassword.php:46
+#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
 #: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
 msgstr ""
@@ -920,20 +915,19 @@ msgstr "الحساب"
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group nickname (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT for nick name in a profile.
-#: actions/apioauthauthorize.php:459 actions/login.php:242
-#: actions/profilesettings.php:106 actions/register.php:418
+#: actions/apioauthauthorize.php:459 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:432
 #: actions/showgroup.php:243 actions/tagother.php:94
-#: actions/userauthorization.php:152 lib/groupeditform.php:145
+#: actions/userauthorization.php:145 lib/groupeditform.php:145
 #: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "الاسم المستعار"
 
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:463 actions/login.php:245
-#: actions/register.php:422 lib/accountsettingsaction.php:120
+#: actions/apioauthauthorize.php:463 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:120
 msgid "Password"
 msgstr "كلمة السر"
 
@@ -1028,13 +1022,13 @@ msgstr "لا إشعار كهذا."
 
 #. TRANS: Client error displayed trying to repeat an own notice through the API.
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:537
+#: actions/apistatusesretweet.php:83 lib/command.php:549
 msgid "Cannot repeat your own notice."
 msgstr "لا يمكنك تكرار ملحوظتك الخاصة."
 
 #. TRANS: Client error displayed trying to re-repeat a notice through the API.
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:92 lib/command.php:543
+#: actions/apistatusesretweet.php:92 lib/command.php:555
 msgid "Already repeated that notice."
 msgstr "كرر بالفعل هذه الملاحظة."
 
@@ -1057,7 +1051,7 @@ msgstr "لم يتم العثور على وسيلة API."
 #. TRANS: %s is the requested output format.
 #: actions/apistatusesshow.php:144
 #, fuzzy, php-format
-msgid "Unsupported format: %s."
+msgid "Unsupported format: %s"
 msgstr "نسق غير مدعوم."
 
 #. TRANS: Client error displayed requesting a deleted status.
@@ -1170,14 +1164,13 @@ msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr ""
 
 #. TRANS: Title for site timeline. %s is the StatusNet sitename.
-#. TRANS: Public RSS feed title. %s is the StatusNet site name.
 #: actions/apitimelinepublic.php:193 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "مسار %s الزمني العام"
 
 #. TRANS: Subtitle for site timeline. %s is the StatusNet sitename.
-#: actions/apitimelinepublic.php:199
+#: actions/apitimelinepublic.php:199 actions/publicrss.php:105
 #, php-format
 msgid "%s updates from everyone!"
 msgstr ""
@@ -1244,26 +1237,25 @@ msgid "Atom post must be an Atom entry."
 msgstr ""
 
 #. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
-#: actions/apitimelineuser.php:334
+#: actions/apitimelineuser.php:335
 msgid "Can only handle POST activities."
 msgstr ""
 
 #. TRANS: Client error displayed when using an unsupported activity object type.
 #. TRANS: %s is the unsupported activity object type.
-#: actions/apitimelineuser.php:345
+#: actions/apitimelineuser.php:346
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
 #. TRANS: %d is the notice ID (number).
-#: actions/apitimelineuser.php:379
+#: actions/apitimelineuser.php:380
 #, fuzzy, php-format
 msgid "No content for notice %d."
 msgstr "ابحث عن محتويات في الإشعارات"
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#. TRANS: %s is the notice URI.
 #: actions/apitimelineuser.php:408
 #, fuzzy, php-format
 msgid "Notice with URI \"%s\" already exists."
@@ -1282,10 +1274,9 @@ msgstr "لم يُعثرعلى المستخدم."
 
 #. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
 #. TRANS: Client exception.
-#. TRANS: Client error displayed trying to subscribe to a non-existing profile.
 #: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
 #: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
-#: actions/subscribe.php:110
+#: actions/subscribe.php:107
 msgid "No such profile."
 msgstr "لا ملف كهذا."
 
@@ -1421,7 +1412,7 @@ msgstr "تعذّر حذف المفضلة."
 #: actions/joingroup.php:95 actions/leavegroup.php:82
 #: actions/leavegroup.php:95 actions/makeadmin.php:86
 #: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:380
+#: lib/command.php:392
 msgid "No such group."
 msgstr "لا مجموعة كهذه."
 
@@ -1432,7 +1423,7 @@ msgid "Not a member."
 msgstr "جميع الأعضاء"
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
-#: actions/atompubshowmembership.php:150
+#: actions/atompubshowmembership.php:151
 #, fuzzy
 msgid "Cannot delete someone else's membership."
 msgstr "تعذّر حفظ الاشتراك."
@@ -1537,11 +1528,9 @@ msgstr "بإمكانك رفع أفتارك الشخصي. أقصى حجم للم
 
 #. TRANS: Server error displayed in avatar upload page when no matching profile can be found for a user.
 #. TRANS: Server error displayed coming across a request from a user without a profile.
-#. TRANS: Server error displayed when trying to authorise a remote subscription request
-#. TRANS: while the user has no profile.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
 #: actions/grouplogo.php:184 actions/remotesubscribe.php:190
-#: actions/userauthorization.php:75 actions/userrss.php:108
+#: actions/userauthorization.php:72 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr "المستخدم بدون ملف مطابق."
 
@@ -1599,10 +1588,10 @@ msgstr "مجموعات"
 msgid "No file uploaded."
 msgstr "لم يُرفع ملف."
 
-#. TRANS: Avatar upload form instruction after uploading a file.
+#. TRANS: Avatar upload form unstruction after uploading a file.
 #: actions/avatarsettings.php:345
 #, fuzzy
-msgid "Pick a square area of the image to be your avatar."
+msgid "Pick a square area of the image to be your avatar"
 msgstr "اختر منطقة مربعة من الصورة لتكون صورة أفتارك."
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
@@ -1644,7 +1633,7 @@ msgid "You may not backup your account."
 msgstr ""
 
 #. TRANS: Information displayed on the backup account page.
-#: actions/backupaccount.php:225
+#: actions/backupaccount.php:227
 msgid ""
 "You can backup your account data in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format. This is an experimental feature and provides "
@@ -1654,15 +1643,15 @@ msgid ""
 msgstr ""
 
 #. TRANS: Submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:248
+#: actions/backupaccount.php:250
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Backup"
 msgstr "الخلفية"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:252
-msgid "Backup your account."
+#: actions/backupaccount.php:254
+msgid "Backup your account"
 msgstr ""
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
@@ -1703,7 +1692,7 @@ msgstr "لا"
 #. TRANS: Submit button title for 'No' when blocking a user.
 #: actions/block.php:158
 #, fuzzy
-msgid "Do not block this user."
+msgid "Do not block this user"
 msgstr "لا تمنع هذا المستخدم"
 
 #. TRANS: Button label on the user block form.
@@ -1720,9 +1709,9 @@ msgid "Yes"
 msgstr "نعم"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:165
-#, fuzzy
-msgid "Block this user."
+#. TRANS: Description of the form to block a user.
+#: actions/block.php:165 lib/blockform.php:79
+msgid "Block this user"
 msgstr "امنع هذا المستخدم"
 
 #. TRANS: Server error displayed when blocking a user fails.
@@ -1888,7 +1877,7 @@ msgstr ""
 #. TRANS: Field label for delete account confirmation entry.
 #. TRANS: Field label for password reset form where the password has to be typed again.
 #: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:262 actions/register.php:426
+#: actions/recoverpassword.php:262 actions/register.php:440
 msgid "Confirm"
 msgstr "أكّد"
 
@@ -1918,14 +1907,14 @@ msgstr "لم يوجد التطبيق."
 #. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
 #: actions/deleteapplication.php:79 actions/editapplication.php:78
-#: actions/showapplication.php:90
+#: actions/showapplication.php:94
 msgid "You are not the owner of this application."
 msgstr "أنت لست مالك هذا التطبيق."
 
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
-#: actions/newapplication.php:112 actions/showapplication.php:113
-#: lib/action.php:1422
+#: actions/newapplication.php:112 actions/showapplication.php:118
+#: lib/action.php:1425
 msgid "There was a problem with your session token."
 msgstr ""
 
@@ -1946,13 +1935,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting an application.
 #: actions/deleteapplication.php:161
 #, fuzzy
-msgid "Do not delete this application."
+msgid "Do not delete this application"
 msgstr "لا تحذف هذا التطبيق"
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
 #: actions/deleteapplication.php:167
 #, fuzzy
-msgid "Delete this application."
+msgid "Delete this application"
 msgstr "احذف هذا التطبيق"
 
 #. TRANS: Client error when trying to delete group while not logged in.
@@ -2008,13 +1997,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting a group.
 #: actions/deletegroup.php:224
 #, fuzzy
-msgid "Do not delete this group."
+msgid "Do not delete this group"
 msgstr "لا تحذف هذا الإشعار"
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
 #: actions/deletegroup.php:231
 #, fuzzy
-msgid "Delete this group."
+msgid "Delete this group"
 msgstr "احذف هذا المستخدم"
 
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
@@ -2022,15 +2011,13 @@ msgstr "احذف هذا المستخدم"
 #. TRANS: Client error displayed when trying to mark a notice as favorite without being logged in.
 #. TRANS: Client error displayed trying to block a user from a group while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
-#. TRANS: Client error displayed trying to log out when not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
-#. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
 #. TRANS: Client error displayed when trying to change user options while not logged in.
 #: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
-#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:70
+#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
-#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:98
+#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
 #: lib/adminpanelaction.php:71 lib/profileformaction.php:63
 #: lib/settingsaction.php:72
@@ -2058,13 +2045,12 @@ msgstr "أمتأكد من أنك تريد حذف هذا الإشعار؟"
 #. TRANS: Submit button title for 'No' when deleting a notice.
 #: actions/deletenotice.php:159
 #, fuzzy
-msgid "Do not delete this notice."
+msgid "Do not delete this notice"
 msgstr "لا تحذف هذا الإشعار"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:166
-#, fuzzy
-msgid "Delete this notice."
+#: actions/deletenotice.php:166 lib/noticelist.php:673
+msgid "Delete this notice"
 msgstr "احذف هذا الإشعار"
 
 #. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
@@ -2099,13 +2085,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting a user.
 #: actions/deleteuser.php:158
 #, fuzzy
-msgid "Do not delete this user."
+msgid "Do not delete this user"
 msgstr "لا تحذف هذا الإشعار"
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
-#: actions/deleteuser.php:165
-#, fuzzy
-msgid "Delete this user."
+#. TRANS: Description of form for deleting a user.
+#: actions/deleteuser.php:165 lib/deleteuserform.php:75
+msgid "Delete this user"
 msgstr "احذف هذا المستخدم"
 
 #. TRANS: Message used as title for design settings for the site.
@@ -2272,21 +2258,21 @@ msgid "Use defaults"
 msgstr "استخدم المبدئيات"
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:720
-#, fuzzy
-msgid "Restore default designs."
+#. TRANS: Title for button on profile design page to reset all colour settings to default.
+#: actions/designadminpanel.php:720 lib/designsettings.php:259
+msgid "Restore default designs"
 msgstr "استعد التصميمات المبدئية"
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:728
-#, fuzzy
-msgid "Reset back to default."
+#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
+#: actions/designadminpanel.php:728 lib/designsettings.php:267
+msgid "Reset back to default"
 msgstr "ارجع إلى المبدئي"
 
 #. TRANS: Title for button for saving theme settings.
-#: actions/designadminpanel.php:736
-#, fuzzy
-msgid "Save design."
+#. TRANS: Title for button on profile design page to save settings.
+#: actions/designadminpanel.php:736 lib/designsettings.php:272
+msgid "Save design"
 msgstr "احفظ التصميم"
 
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
@@ -2318,7 +2304,7 @@ msgid "You must be logged in to edit an application."
 msgstr "يجب أن تكون مسجل الدخول لتعدل تطبيقا."
 
 #. TRANS: Client error displayed trying to edit an application that does not exist.
-#: actions/editapplication.php:83 actions/showapplication.php:83
+#: actions/editapplication.php:83 actions/showapplication.php:87
 msgid "No such application."
 msgstr "لا تطبيق كهذا."
 
@@ -2600,7 +2586,7 @@ msgid "Cannot normalize that email address."
 msgstr "عنوان البريد الإلكتروني المُؤكد الحالي."
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:393 actions/register.php:204
+#: actions/emailsettings.php:393 actions/register.php:212
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "ليس عنوان بريد صالح."
@@ -2675,23 +2661,20 @@ msgstr "لا عنوان بريد إلكتروني وارد."
 
 #. 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.
 #: actions/emailsettings.php:530 actions/emailsettings.php:554
-#: actions/smssettings.php:566 actions/smssettings.php:591
+#: actions/smssettings.php:565 actions/smssettings.php:588
 #, fuzzy
 msgid "Could not update user record."
 msgstr "تعذّر تحديث سجل المستخدم."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
-#. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:534 actions/smssettings.php:570
+#: actions/emailsettings.php:534 actions/smssettings.php:568
 #, fuzzy
 msgid "Incoming email address removed."
 msgstr "لا عنوان بريد إلكتروني وارد."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
-#. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:558 actions/smssettings.php:595
+#: actions/emailsettings.php:558 actions/smssettings.php:591
 #, fuzzy
 msgid "New incoming email address added."
 msgstr "لا عنوان بريد إلكتروني وارد."
@@ -2704,7 +2687,7 @@ msgstr "هذا الإشعار مفضلة مسبقًا!"
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
 #: actions/favor.php:95
 #, fuzzy
-msgid "Disfavor favorite."
+msgid "Disfavor favorite"
 msgstr "ألغِ تفضيل المفضلة"
 
 #. TRANS: Page title for first page of favorited notices.
@@ -2940,13 +2923,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
 #: actions/groupblock.php:191
 #, fuzzy
-msgid "Do not block this user from this group."
+msgid "Do not block this user from this group"
 msgstr "لا تمنع هذا المستخدم من هذه المجموعة"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
 #: actions/groupblock.php:198
 #, fuzzy
-msgid "Block this user from this group."
+msgid "Block this user from this group"
 msgstr "امنع هذا المستخدم من هذه المجموعة"
 
 #. TRANS: Server error displayed when trying to block a user from a group fails because of an application error.
@@ -2955,7 +2938,6 @@ msgid "Database error blocking user from group."
 msgstr "خطأ في قاعدة البيانات أثناء منع المستخدم من المجموعة."
 
 #. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
-#. TRANS: Client error displayed trying to find a user by ID without providing an ID.
 #: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr "لا هوية."
@@ -3141,10 +3123,8 @@ msgid "Group search"
 msgstr "بحث في المجموعات"
 
 #. TRANS: Text on page where groups can be searched if no results were found for a query.
-#. TRANS: Text for notice search results is the query had no results.
-#. TRANS: Message on the "People search" page where a query has no results.
-#: actions/groupsearch.php:82 actions/noticesearch.php:122
-#: actions/peoplesearch.php:87
+#: actions/groupsearch.php:82 actions/noticesearch.php:117
+#: actions/peoplesearch.php:83
 msgid "No results."
 msgstr "لا نتائج."
 
@@ -3177,7 +3157,6 @@ msgid "User is not blocked from group."
 msgstr "المستخدم ليس ممنوعًا من المجموعة."
 
 #. TRANS: Server error displayed when unblocking a user from a group fails because of an unknown error.
-#. TRANS: Server error displayed when removing a user block.
 #: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "خطأ أثناء منع الحجب."
@@ -3263,8 +3242,7 @@ msgid "Publish a MicroID for my Jabber/Google Talk address."
 msgstr "انشر هوية مصغّرة لعنوان بريدي الإلكتروني."
 
 #. TRANS: Confirmation message for successful Instant Messaging preferences save.
-#. TRANS: Confirmation message after saving preferences.
-#: actions/imsettings.php:283 actions/othersettings.php:193
+#: actions/imsettings.php:283 actions/othersettings.php:192
 msgid "Preferences saved."
 msgstr "حُفِظت التفضيلات."
 
@@ -3535,7 +3513,7 @@ msgstr "يجب أن تلج لتغادر مجموعة."
 
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
-#: actions/leavegroup.php:103 lib/command.php:386
+#: actions/leavegroup.php:103 lib/command.php:398
 msgid "You are not a member of that group."
 msgstr "لست عضوا في تلك المجموعة."
 
@@ -3658,53 +3636,51 @@ msgstr "أرسل"
 msgid "Save license settings"
 msgstr ""
 
-#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
-#: actions/login.php:97 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
 msgid "Already logged in."
 msgstr "والج بالفعل."
 
-#: actions/login.php:142
+#: actions/login.php:148
 msgid "Incorrect username or password."
 msgstr "اسم المستخدم أو كلمة السر غير صحيحان."
 
-#. TRANS: Server error displayed when a user object could not be created trying to login using "one time password login".
-#: actions/login.php:148 actions/otp.php:127
+#: actions/login.php:154 actions/otp.php:120
 msgid "Error setting user. You are probably not authorized."
 msgstr "خطأ أثناء ضبط المستخدم. لست مُصرحًا على الأرجح."
 
-#: actions/login.php:202 actions/login.php:253
+#: actions/login.php:210 actions/login.php:263
 msgid "Login"
 msgstr "لُج"
 
-#: actions/login.php:239
+#: actions/login.php:249
 msgid "Login to site"
 msgstr "لُج إلى الموقع"
 
-#: actions/login.php:248 actions/register.php:476
+#: actions/login.php:258 actions/register.php:490
 msgid "Remember me"
 msgstr "تذكّرني"
 
-#: actions/login.php:249 actions/register.php:478
+#: actions/login.php:259 actions/register.php:492
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "لُج تلقائيًا في المستقبل؛ هذا الخيار ليس مُعدًا للحواسيب المشتركة!"
 
-#: actions/login.php:259
+#: actions/login.php:269
 msgid "Lost or forgotten password?"
 msgstr "أنسيت كلمة السر؟"
 
-#: actions/login.php:277
+#: actions/login.php:288
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
 msgstr ""
 "لأسباب أمنية، من فضلك أعد إدخال اسم مستخدمك وكلمة سرك قبل تغيير إعداداتك."
 
-#: actions/login.php:281
+#: actions/login.php:292
 #, fuzzy
 msgid "Login with your username and password."
 msgstr "لُج باسم مستخدم وكلمة سر"
 
-#: actions/login.php:284
+#: actions/login.php:295
 #, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -3785,14 +3761,14 @@ msgid "New message"
 msgstr "رسالة جديدة"
 
 #. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
-#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:501
+#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:513
 msgid "You can't send a message to this user."
 msgstr "لا يمكنك إرسال رسائل إلى هذا المستخدم."
 
 #. TRANS: Command exception text shown when trying to send a direct message to another user without content.
 #. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
-#: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:478
-#: lib/command.php:581
+#: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:490
+#: lib/command.php:593
 msgid "No content!"
 msgstr "لا محتوى!"
 
@@ -3801,7 +3777,7 @@ msgid "No recipient specified."
 msgstr "لا مستلم حُدّد."
 
 #. TRANS: Error text shown when trying to send a direct message to self.
-#: actions/newmessage.php:167 lib/command.php:505
+#: actions/newmessage.php:167 lib/command.php:517
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr "لا ترسل رسالة إلى نفسك، قلها لنفسك في سرك بدلًا من ذلك."
@@ -3812,7 +3788,7 @@ msgstr "أُرسلت الرسالة"
 
 #. TRANS: Message given have sent a direct message to another user.
 #. TRANS: %s is the name of the other user.
-#: actions/newmessage.php:188 lib/command.php:513
+#: actions/newmessage.php:188 lib/command.php:525
 #, php-format
 msgid "Direct message to %s sent."
 msgstr "رسالة مباشرة ل%s تم إرسالها."
@@ -3829,9 +3805,7 @@ msgstr "إشعار جديد"
 msgid "Notice posted"
 msgstr "أُرسل الإشعار"
 
-#. TRANS: Instructions for Notice search page.
-#. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/noticesearch.php:69
+#: actions/noticesearch.php:68
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -3840,47 +3814,37 @@ msgstr ""
 "ابحث عن إشعارات على %%site.name%% عبر محتوياتها. افصل عبارات البحث بمسافات؛ "
 "ويجب أن تتكون هذه العبارات من 3 أحرف أو أكثر."
 
-#. TRANS: Title of the page where users can search for notices.
-#: actions/noticesearch.php:80
+#: actions/noticesearch.php:78
 msgid "Text search"
 msgstr "بحث في النصوص"
 
-#. TRANS: Test in RSS notice search.
-#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearch.php:95
+#: actions/noticesearch.php:91
 #, php-format
 msgid "Search results for \"%1$s\" on %2$s"
 msgstr "نتائج البحث ل\"%1$s\" على %2$s"
 
-#. TRANS: Text for logged in users making a query for notices without results.
-#. TRANS: This message contains a Markdown link.
-#: actions/noticesearch.php:128
+#: actions/noticesearch.php:121
 #, php-format
 msgid ""
 "Be the first to [post on this topic](%%%%action.newnotice%%%%?"
 "status_textarea=%s)!"
 msgstr ""
 
-#. TRANS: Text for not logged in users making a query for notices without results.
-#. TRANS: This message contains Markdown links.
-#: actions/noticesearch.php:133
+#: actions/noticesearch.php:124
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and be the first to "
 "[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
 msgstr ""
 
-#. TRANS: RSS notice search feed title. %s is the query.
-#: actions/noticesearchrss.php:95
+#: actions/noticesearchrss.php:96
 #, php-format
 msgid "Updates with \"%s\""
 msgstr ""
 
-#. TRANS: RSS notice search feed description.
-#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearchrss.php:99
+#: actions/noticesearchrss.php:98
 #, fuzzy, php-format
-msgid "Updates matching search term \"%1$s\" on %2$s."
+msgid "Updates matching search term \"%1$s\" on %2$s!"
 msgstr "الإشعارات التي فضلها %1$s في %2$s!"
 
 #: actions/nudge.php:85
@@ -3919,31 +3883,31 @@ msgid "You have not registered any applications yet."
 msgstr "يجب أن تكون مسجل الدخول لتسجل تطبيقا."
 
 #. TRANS: Title for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:70
+#: actions/oauthconnectionssettings.php:71
 #, fuzzy
 msgid "Connected applications"
 msgstr "احذف هذا التطبيق"
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:81
+#: actions/oauthconnectionssettings.php:83
 msgid "The following connections exist for your account."
 msgstr ""
 
 #. TRANS: Client error when trying to revoke access for an application while not being a user of it.
-#: actions/oauthconnectionssettings.php:166
+#: actions/oauthconnectionssettings.php:168
 msgid "You are not a user of that application."
 msgstr "لست مستخدما لهذا التطبيق."
 
 #. TRANS: Client error when revoking access has failed for some reason.
 #. TRANS: %s is the application ID revoking access failed for.
-#: actions/oauthconnectionssettings.php:181
+#: actions/oauthconnectionssettings.php:183
 #, fuzzy, php-format
 msgid "Unable to revoke access for application: %s."
 msgstr "استخدم هذا النموذج لتعدل تطبيقك."
 
 #. TRANS: Success message after revoking access for an application.
 #. TRANS: %1$s is the application name, %2$s is the first part of the user token.
-#: actions/oauthconnectionssettings.php:200
+#: actions/oauthconnectionssettings.php:202
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -3951,30 +3915,20 @@ msgid ""
 msgstr ""
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:211
+#: actions/oauthconnectionssettings.php:213
 msgid "You have not authorized any applications to use your account."
 msgstr ""
 
 #. TRANS: Note for developers in the OAuth connection settings form.
 #. TRANS: This message contains a Markdown link. Do not separate "](".
 #. TRANS: %s is the URL to the OAuth settings.
-#: actions/oauthconnectionssettings.php:231
+#: actions/oauthconnectionssettings.php:233
 #, php-format
 msgid ""
 "Are you a developer? [Register an OAuth client application](%s) to use with "
 "this instance of StatusNet."
 msgstr ""
 
-#: actions/oembed.php:64
-#, fuzzy, php-format
-msgid "\"%s\" not found."
-msgstr "لم يُعثرعلى المستخدم."
-
-#: actions/oembed.php:76
-#, fuzzy, php-format
-msgid "Notice %s not found."
-msgstr "لم يتم العثور على وسيلة API."
-
 #: actions/oembed.php:80 actions/shownotice.php:100
 #, fuzzy
 msgid "Notice has no profile."
@@ -3985,16 +3939,6 @@ msgstr "ليس للمستخدم ملف شخصي."
 msgid "%1$s's status on %2$s"
 msgstr "حالة %1$s في يوم %2$s"
 
-#: actions/oembed.php:95
-#, fuzzy, php-format
-msgid "Attachment %s not found."
-msgstr "لم يُعثر على المستخدم المستلم."
-
-#: actions/oembed.php:136
-#, php-format
-msgid "\"%s\" not supported for oembed requests."
-msgstr ""
-
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
 #: actions/oembed.php:168
 #, fuzzy, php-format
@@ -4013,12 +3957,11 @@ msgstr ""
 msgid "Not a supported data format."
 msgstr "ليس نسق بيانات مدعوم."
 
-#. TRANS: ShortName in the OpenSearch interface when trying to find users.
 #: actions/opensearch.php:64
 msgid "People Search"
 msgstr "بحث في الأشخاص"
 
-#: actions/opensearch.php:68
+#: actions/opensearch.php:67
 msgid "Notice Search"
 msgstr "بحث الإشعارات"
 
@@ -4066,46 +4009,37 @@ msgstr "أظهر أو أخفِ تصاميم الملفات الشخصية."
 msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr "الاسم الكامل طويل جدا (الأقصى 255 حرفًا)"
 
-#. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
-#: actions/otp.php:70
+#: actions/otp.php:69
 msgid "No user ID specified."
 msgstr "لا هوية مستخدم محددة."
 
-#. TRANS: Client error displayed trying to use "one time password login" without specifying a login token.
-#: actions/otp.php:86
+#: actions/otp.php:83
 msgid "No login token specified."
 msgstr "لا محتوى دخول محدد."
 
-#. TRANS: Client error displayed trying to use "one time password login" without requesting a login token.
-#: actions/otp.php:94
+#: actions/otp.php:90
 msgid "No login token requested."
 msgstr "لا طلب استيثاق."
 
-#. TRANS: Client error displayed trying to use "one time password login" while specifying an invalid login token.
-#: actions/otp.php:100
+#: actions/otp.php:95
 msgid "Invalid login token specified."
 msgstr "توكن دخول غير صحيح محدد."
 
-#. TRANS: Client error displayed trying to use "one time password login" while specifying an expired login token.
-#: actions/otp.php:110
+#: actions/otp.php:104
 msgid "Login token expired."
 msgstr "توكن الدخول انتهى."
 
-#. TRANS: Title for outbox for any but the fist page.
-#. TRANS: %1$s is the user nickname, %2$d is the page number.
-#: actions/outbox.php:57
+#: actions/outbox.php:58
 #, php-format
 msgid "Outbox for %1$s - page %2$d"
 msgstr "صندوق %1$s الصادر - صفحة %2$d"
 
-#. TRANS: Title for first page of outbox.
 #: actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
 msgstr "صندوق %s الصادر"
 
-#. TRANS: Instructions for outbox.
-#: actions/outbox.php:103
+#: actions/outbox.php:104
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr "هذا صندوق بريدك الصادر، والذي يسرد الرسائل الخاصة التي أرسلتها."
 
@@ -4131,45 +4065,43 @@ msgstr "كلمة السر القديمة"
 msgid "New password"
 msgstr "كلمة السر الجديدة"
 
-#: actions/passwordsettings.php:109 actions/register.php:423
+#: actions/passwordsettings.php:109
 #, fuzzy
-msgid "6 or more characters."
+msgid "6 or more characters"
 msgstr "6 أحرف أو أكثر"
 
-#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:264
-#: actions/register.php:427
+#: actions/passwordsettings.php:113
 #, fuzzy
-msgid "Same as password above."
+msgid "Same as password above"
 msgstr "نفس كلمة السر أعلاه"
 
 #: actions/passwordsettings.php:117
 msgid "Change"
 msgstr "غيّر"
 
-#: actions/passwordsettings.php:153 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:238
 msgid "Password must be 6 or more characters."
 msgstr "يجب أن تكون كلمة السر 6 حروف أو أكثر."
 
-#: actions/passwordsettings.php:156 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:241
 msgid "Passwords don't match."
 msgstr "كلمتا السر غير متطابقتين."
 
-#: actions/passwordsettings.php:164
+#: actions/passwordsettings.php:165
 msgid "Incorrect old password"
 msgstr "كلمة السر القديمة غير صحيحة"
 
-#: actions/passwordsettings.php:180
+#: actions/passwordsettings.php:181
 msgid "Error saving user; invalid."
 msgstr "خطأ أثناء حفظ المستخدم؛ غير صالح."
 
-#. TRANS: Reset password form validation error message.
-#: actions/passwordsettings.php:185 actions/recoverpassword.php:418
+#: actions/passwordsettings.php:186
 #, fuzzy
-msgid "Cannot save new password."
+msgid "Can't save new password."
 msgstr "تعذّر حفظ كلمة السر الجديدة."
 
-#: actions/passwordsettings.php:191
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
 msgid "Password saved."
 msgstr "حُفظت كلمة السر."
 
@@ -4460,9 +4392,7 @@ msgstr ""
 msgid "Save paths"
 msgstr "احفظ المسارات"
 
-#. TRANS: Instructions for the "People search" page.
-#. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/peoplesearch.php:54
+#: actions/peoplesearch.php:52
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
@@ -4471,8 +4401,7 @@ msgstr ""
 "ابحث عن أشخاص على %%site.name%% بدلالة الاسم أو الموقع أو الاهتمامات. افصل "
 "عبارات البحث بمسافات؛ ويجب أن تتكون تلك العبارات من 3 أحرف أو أكثر."
 
-#. TRANS: Title of a page where users can search for other users.
-#: actions/peoplesearch.php:61
+#: actions/peoplesearch.php:58
 msgid "People search"
 msgstr "بحث في الأشخاص"
 
@@ -4512,7 +4441,7 @@ msgid "Profile information"
 msgstr "معلومات الملف الشخصي"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109 actions/register.php:419
+#: actions/profilesettings.php:109 actions/register.php:433
 #, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr "1-64 حرفًا إنجليزيًا أو رقمًا بدون نقاط أو مسافات"
@@ -4520,7 +4449,7 @@ msgstr "1-64 حرفًا إنجليزيًا أو رقمًا بدون نقاط أ
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for full group name (dt). Text hidden by default.
 #. TRANS: DT for full name in a profile.
-#: actions/profilesettings.php:113 actions/register.php:441
+#: actions/profilesettings.php:113 actions/register.php:455
 #: actions/showgroup.php:255 actions/tagother.php:104
 #: lib/groupeditform.php:150 lib/userprofile.php:156
 msgid "Full name"
@@ -4528,13 +4457,13 @@ msgstr "الاسم الكامل"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:118 actions/register.php:446
+#: actions/profilesettings.php:118 actions/register.php:460
 #: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "الصفحة الرئيسية"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:121 actions/register.php:448
+#: actions/profilesettings.php:121
 #, fuzzy
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr "مسار صفحتك الرئيسية أو مدونتك أو ملفك الشخصي على موقع آخر"
@@ -4542,7 +4471,7 @@ msgstr "مسار صفحتك الرئيسية أو مدونتك أو ملفك ا
 #. TRANS: Tooltip for field label in form for profile settings. Plural
 #. TRANS: is decided by the number of characters available for the
 #. TRANS: biography (%d).
-#: actions/profilesettings.php:129 actions/register.php:457
+#: actions/profilesettings.php:129 actions/register.php:471
 #, fuzzy, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4554,29 +4483,28 @@ msgstr[4] "تكلم عن نفسك واهتمامتك في %d حرف"
 msgstr[5] "تكلم عن نفسك واهتمامتك في %d حرف"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:135 actions/register.php:462
+#: actions/profilesettings.php:135 actions/register.php:476
 msgid "Describe yourself and your interests"
 msgstr "صِف نفسك واهتماماتك"
 
 #. TRANS: Text area label in form for profile settings where users can provide.
 #. TRANS: their biography.
-#: actions/profilesettings.php:139 actions/register.php:464
+#: actions/profilesettings.php:139 actions/register.php:478
 msgid "Bio"
 msgstr "السيرة"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group location (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT for location in a profile.
-#: actions/profilesettings.php:145 actions/register.php:469
+#: actions/profilesettings.php:145 actions/register.php:483
 #: actions/showgroup.php:265 actions/tagother.php:112
-#: actions/userauthorization.php:174 lib/groupeditform.php:173
+#: actions/userauthorization.php:166 lib/groupeditform.php:173
 #: lib/userprofile.php:172
 msgid "Location"
 msgstr "الموقع"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148
+#: actions/profilesettings.php:148 actions/register.php:485
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "مكان تواجدك، على سبيل المثال \"المدينة، الولاية (أو المنطقة)، الدولة\""
 
@@ -4597,8 +4525,7 @@ msgstr "الوسوم"
 #: actions/profilesettings.php:164
 #, fuzzy
 msgid ""
-"Tags for yourself (letters, numbers, -, ., and _), comma- or space- "
-"separated."
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr ""
 "سِم نفسك (حروف وأرقام و \"-\" و \".\" و \"_\")، افصلها بفاصلة (',') أو مسافة."
 
@@ -4610,7 +4537,7 @@ msgstr "اللغة"
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
 #: actions/profilesettings.php:171
 #, fuzzy
-msgid "Preferred language."
+msgid "Preferred language"
 msgstr "اللغة المفضلة"
 
 #. TRANS: Dropdownlist label in form for profile settings.
@@ -4627,13 +4554,13 @@ msgstr "ما المنطقة الزمنية التي تتواجد فيها عاد
 #: actions/profilesettings.php:189
 #, fuzzy
 msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)."
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr "اشترك تلقائيًا بأي شخص يشترك بي (يفضل أن يستخدم لغير البشر)"
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Plural form is used based on the maximum number of allowed
 #. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:258 actions/register.php:221
+#: actions/profilesettings.php:258 actions/register.php:229
 #, fuzzy, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4657,9 +4584,9 @@ msgstr "الاسم طويل جدا (الأقصى 255 حرفا)."
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:291
-#, fuzzy, php-format
-msgid "Invalid tag: \"%s\"."
+#: actions/profilesettings.php:291 actions/tagother.php:178
+#, php-format
+msgid "Invalid tag: \"%s\""
 msgstr "وسم غير صالح: \"%s\""
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
@@ -4764,12 +4691,6 @@ msgstr ""
 "هنا %%site.name%%، خدمة [التدوين المُصغّر](http://en.wikipedia.org/wiki/Micro-"
 "blogging) المبنية على البرنامج الحر [StatusNet](http://status.net/)."
 
-#. TRANS: Public RSS feed description. %s is the StatusNet site name.
-#: actions/publicrss.php:106
-#, php-format
-msgid "%s updates from everyone."
-msgstr ""
-
 #. TRANS: Title for public tag cloud.
 #: actions/publictagcloud.php:57
 msgid "Public tag cloud"
@@ -4902,12 +4823,6 @@ msgstr "استعد كلمة السر"
 msgid "Password recovery requested"
 msgstr "طُلبت استعادة كلمة السر"
 
-#. TRANS: Title for password recovery page in password saved mode.
-#: actions/recoverpassword.php:229
-#, fuzzy
-msgid "Password saved"
-msgstr "حُفظت كلمة السر."
-
 #. TRANS: Title for password recovery page when an unknown action has been specified.
 #: actions/recoverpassword.php:232
 msgid "Unknown action"
@@ -4919,6 +4834,12 @@ msgstr "إجراء غير معروف"
 msgid "6 or more characters, and do not forget it!"
 msgstr "6 أحرف أو أكثر"
 
+#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#: actions/recoverpassword.php:264 actions/register.php:441
+#, fuzzy
+msgid "Same as password above."
+msgstr "نفس كلمة السر أعلاه"
+
 #. TRANS: Button text for password reset form.
 #. TRANS: Button text on profile design page to reset all colour settings to default without saving.
 #: actions/recoverpassword.php:268 lib/designsettings.php:264
@@ -4973,8 +4894,14 @@ msgstr "يجب أن تكون كلمة السر 6 محارف أو أكثر."
 msgid "Password and confirmation do not match."
 msgstr "كلمتا السر غير متطابقتين."
 
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:418
+#, fuzzy
+msgid "Cannot save new password."
+msgstr "تعذّر حفظ كلمة السر الجديدة."
+
 #. TRANS: Server error displayed when something does wrong with the user object during password reset.
-#: actions/recoverpassword.php:426 actions/register.php:248
+#: actions/recoverpassword.php:426 actions/register.php:256
 msgid "Error setting user."
 msgstr "خطأ أثناء ضبط المستخدم."
 
@@ -4983,96 +4910,101 @@ msgstr "خطأ أثناء ضبط المستخدم."
 msgid "New password successfully saved. You are now logged in."
 msgstr "حُفظت كلمة السر الجديدة بنجاح. أنت الآن والج."
 
-#: actions/register.php:87 actions/register.php:188 actions/register.php:399
+#: actions/register.php:92 actions/register.php:196 actions/register.php:413
 msgid "Sorry, only invited people can register."
 msgstr "عذرًا، الأشخاص المدعوون وحدهم يستطيعون التسجيل."
 
-#: actions/register.php:94
+#: actions/register.php:99
 msgid "Sorry, invalid invitation code."
 msgstr "عذرا، رمز دعوة غير صالح."
 
-#: actions/register.php:113
+#: actions/register.php:119
 msgid "Registration successful"
 msgstr "نجح التسجيل"
 
-#: actions/register.php:115 actions/register.php:497
+#: actions/register.php:121 actions/register.php:511
 msgid "Register"
 msgstr "سجّل"
 
-#: actions/register.php:135
+#: actions/register.php:142
 msgid "Registration not allowed."
 msgstr "لا يُسمح بالتسجيل."
 
-#: actions/register.php:201
+#: actions/register.php:209
 #, fuzzy
-msgid "You cannot register if you don't agree to the license."
+msgid "You can't register if you don't agree to the license."
 msgstr "لا يمكنك تكرار ملاحظتك الشخصية."
 
-#: actions/register.php:210
+#: actions/register.php:218
 msgid "Email address already exists."
 msgstr "عنوان البريد الإلكتروني موجود مسبقًا."
 
-#: actions/register.php:243 actions/register.php:265
+#: actions/register.php:251 actions/register.php:273
 msgid "Invalid username or password."
 msgstr "اسم مستخدم أو كلمة سر غير صالحة."
 
-#: actions/register.php:340
+#: actions/register.php:351
 msgid ""
 "With this form you can create a new account. You can then post notices and "
-"link up to friends and colleagues."
+"link up to friends and colleagues. "
 msgstr ""
 
+#: actions/register.php:437
+#, fuzzy
+msgid "6 or more characters."
+msgstr "6 أحرف أو أكثر"
+
 #. TRANS: Link description in user account settings menu.
-#: actions/register.php:431 actions/register.php:435
+#: actions/register.php:445 actions/register.php:449
 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
 msgid "Email"
 msgstr "البريد الإلكتروني"
 
-#: actions/register.php:432 actions/register.php:436
+#: actions/register.php:446 actions/register.php:450
 #, fuzzy
-msgid "Used only for updates, announcements, and password recovery."
+msgid "Used only for updates, announcements, and password recovery"
 msgstr "لا يُستخدم إلا عند التحديثات، والتعميمات، ولاستعادة كلمة السر"
 
-#: actions/register.php:443
+#: actions/register.php:457
 #, fuzzy
-msgid "Longer name, preferably your \"real\" name."
+msgid "Longer name, preferably your \"real\" name"
 msgstr "اسم أطول. يُفضَّل استخدام اسمك الحقيقي"
 
-#: actions/register.php:471
+#: actions/register.php:462
 #, fuzzy
-msgid "Where you are, like \"City, State (or Region), Country\"."
-msgstr "مكان تواجدك، على سبيل المثال \"المدينة، الولاية (أو المنطقة)، الدولة\""
+msgid "URL of your homepage, blog, or profile on another site"
+msgstr "مسار صفحتك الرئيسية أو مدونتك أو ملفك الشخصي على موقع آخر"
 
-#: actions/register.php:510
+#: actions/register.php:523
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
 msgstr ""
 
-#: actions/register.php:520
+#: actions/register.php:533
 #, php-format
 msgid "My text and files are copyright by %1$s."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:524
+#: actions/register.php:537
 msgid "My text and files remain under my own copyright."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:527
+#: actions/register.php:540
 msgid "All rights reserved."
 msgstr "جميع الحقوق محفوظة."
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:532
+#: actions/register.php:545
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
 "email address, IM address, and phone number."
 msgstr ""
 
-#: actions/register.php:573
+#: actions/register.php:588
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -5091,7 +5023,7 @@ msgid ""
 "Thanks for signing up and we hope you enjoy using this service."
 msgstr ""
 
-#: actions/register.php:597
+#: actions/register.php:612
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5118,7 +5050,7 @@ msgid "User nickname"
 msgstr "اسم المستخدم المستعار"
 
 #: actions/remotesubscribe.php:129
-msgid "Nickname of the user you want to follow."
+msgid "Nickname of the user you want to follow"
 msgstr ""
 
 #: actions/remotesubscribe.php:132
@@ -5126,7 +5058,7 @@ msgid "Profile URL"
 msgstr "مسار الملف الشخصي"
 
 #: actions/remotesubscribe.php:133
-msgid "URL of your profile on another compatible microblogging service."
+msgid "URL of your profile on another compatible microblogging service"
 msgstr ""
 
 #. TRANS: Link text for link that will subscribe to a remote profile.
@@ -5137,7 +5069,7 @@ msgstr "اشترك"
 
 #: actions/remotesubscribe.php:158
 #, fuzzy
-msgid "Invalid profile URL (bad format)."
+msgid "Invalid profile URL (bad format)"
 msgstr "حجم غير صالح."
 
 #: actions/remotesubscribe.php:167
@@ -5179,7 +5111,6 @@ msgstr "مكرر"
 msgid "Repeated!"
 msgstr "مكرر!"
 
-#. TRANS: RSS reply feed title. %s is a user nickname.
 #. TRANS: Tooltip for personal group navigation menu option when logged in for viewing @-replies.
 #: actions/replies.php:126 actions/repliesrss.php:68
 #: lib/personalgroupnav.php:109
@@ -5228,11 +5159,9 @@ msgid ""
 "newnotice%%%%?status_textarea=%3$s)."
 msgstr ""
 
-#. TRANS: RSS reply feed description.
-#. TRANS: %1$s is a user nickname, %2$s is the StatusNet site name.
-#: actions/repliesrss.php:74
+#: actions/repliesrss.php:72
 #, fuzzy, php-format
-msgid "Replies to %1$s on %2$s."
+msgid "Replies to %1$s on %2$s!"
 msgstr "الردود على %1$s، الصفحة %2$d"
 
 #. TRANS: Client exception displayed when trying to restore an account while not logged in.
@@ -5332,7 +5261,7 @@ msgstr "لا يمكنك سحب أدوار المستخدمين على هذا ا
 msgid "User doesn't have this role."
 msgstr "ليس للمستخدم هذا الدور."
 
-#: actions/rsd.php:142 actions/version.php:159
+#: actions/rsd.php:146 actions/version.php:159
 msgid "StatusNet"
 msgstr "ستاتس نت"
 
@@ -5377,95 +5306,95 @@ msgstr "مكّن تنقيح مُخرجات الجلسة."
 msgid "Save site settings"
 msgstr "اذف إعدادت الموقع"
 
-#: actions/showapplication.php:78
+#: actions/showapplication.php:82
 msgid "You must be logged in to view an application."
 msgstr "يجب أن تكون مسجل الدخول لرؤية تطبيق."
 
-#: actions/showapplication.php:151
+#: actions/showapplication.php:157
 #, fuzzy
 msgid "Application profile"
 msgstr "معلومات التطبيق"
 
 #. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:153 lib/applicationeditform.php:177
+#: actions/showapplication.php:159 lib/applicationeditform.php:177
 msgid "Icon"
 msgstr "أيقونة"
 
 #. TRANS: Form input field label for application name.
-#: actions/showapplication.php:163 actions/version.php:197
+#: actions/showapplication.php:169 actions/version.php:197
 #: lib/applicationeditform.php:190
 msgid "Name"
 msgstr "الاسم"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:172 lib/applicationeditform.php:227
+#: actions/showapplication.php:178 lib/applicationeditform.php:227
 msgid "Organization"
 msgstr "المنظمة"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:181 actions/version.php:200
+#: actions/showapplication.php:187 actions/version.php:200
 #: lib/applicationeditform.php:208 lib/groupeditform.php:168
 msgid "Description"
 msgstr "الوصف"
 
 #. TRANS: Header for group statistics on a group page (h2).
 #. TRANS: H2 text for user statistics.
-#: actions/showapplication.php:186 actions/showgroup.php:460
+#: actions/showapplication.php:192 actions/showgroup.php:460
 #: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "إحصاءات"
 
-#: actions/showapplication.php:197
+#: actions/showapplication.php:203
 #, php-format
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr ""
 
-#: actions/showapplication.php:207
+#: actions/showapplication.php:213
 #, fuzzy
 msgid "Application actions"
 msgstr "معلومات التطبيق"
 
-#: actions/showapplication.php:230
+#: actions/showapplication.php:236
 msgid "Reset key & secret"
 msgstr ""
 
 #. TRANS: Title of form for deleting a user.
-#: actions/showapplication.php:246 lib/deletegroupform.php:121
+#: actions/showapplication.php:252 lib/deletegroupform.php:121
 #: lib/deleteuserform.php:64 lib/noticelist.php:673
 msgid "Delete"
 msgstr "احذف"
 
-#: actions/showapplication.php:255
+#: actions/showapplication.php:261
 msgid "Application info"
 msgstr "معلومات التطبيق"
 
-#: actions/showapplication.php:257
+#: actions/showapplication.php:263
 msgid "Consumer key"
 msgstr ""
 
-#: actions/showapplication.php:262
+#: actions/showapplication.php:268
 msgid "Consumer secret"
 msgstr ""
 
-#: actions/showapplication.php:267
+#: actions/showapplication.php:273
 msgid "Request token URL"
 msgstr ""
 
-#: actions/showapplication.php:272
+#: actions/showapplication.php:278
 msgid "Access token URL"
 msgstr ""
 
-#: actions/showapplication.php:277
+#: actions/showapplication.php:283
 msgid "Authorize URL"
 msgstr "اسمح بالمسار"
 
-#: actions/showapplication.php:282
+#: actions/showapplication.php:288
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
 msgstr ""
 
-#: actions/showapplication.php:302
+#: actions/showapplication.php:309
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr "أمتأكد من أنك تريد إعادة ضبط مفتاح المستهلك وكلمة سره؟"
 
@@ -5555,18 +5484,16 @@ msgid "Group profile"
 msgstr "ملف المجموعة الشخصي"
 
 #. TRANS: Label for group URL (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT for URL in a profile.
 #: actions/showgroup.php:273 actions/tagother.php:118
-#: actions/userauthorization.php:184 lib/userprofile.php:186
+#: actions/userauthorization.php:175 lib/userprofile.php:186
 msgid "URL"
 msgstr "مسار"
 
 #. TRANS: Label for group description or group note (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page where bio is displayed.
 #. TRANS: DT for note in a profile.
 #: actions/showgroup.php:285 actions/tagother.php:128
-#: actions/userauthorization.php:197 lib/userprofile.php:204
+#: actions/userauthorization.php:187 lib/userprofile.php:204
 msgid "Note"
 msgstr "ملاحظة"
 
@@ -5713,7 +5640,7 @@ msgid "%1$s tagged %2$s"
 msgstr "%1$s، الصفحة %2$d"
 
 #. TRANS: Page title showing tagged notices in one user's stream.
-#. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
+#. TRANS: %1$s is the username, %2$s is the hash tag, %1$d is the page number.
 #: actions/showstream.php:74
 #, fuzzy, php-format
 msgid "%1$s tagged %2$s, page %3$d"
@@ -5958,7 +5885,7 @@ msgstr "نص إشعار عام للموقع (255 حرف كحد أقصى؛ يسم
 #. TRANS: Title for button to save site notice in admin panel.
 #: actions/sitenoticeadminpanel.php:201
 #, fuzzy
-msgid "Save site notice."
+msgid "Save site notice"
 msgstr "احفظ إشعار الموقع"
 
 #. TRANS: Title for SMS settings.
@@ -6019,7 +5946,7 @@ msgstr "رقم هاتف SMS"
 #. TRANS: SMS phone number input field instructions in SMS settings form.
 #: actions/smssettings.php:152
 #, fuzzy
-msgid "Phone number, no punctuation or spaces, with area code."
+msgid "Phone number, no punctuation or spaces, with area code"
 msgstr "رقم الهاتف بدون شرطات أو مسافات مع رمز المنطقة"
 
 #. TRANS: Form legend for SMS preferences form.
@@ -6191,19 +6118,15 @@ msgstr "لست مُشتركًا بأي أحد."
 msgid "Could not save subscription."
 msgstr "تعذّر حفظ الاشتراك."
 
-#. TRANS: Client error displayed trying to perform any request method other than POST.
-#. TRANS: Do not translate POST.
 #: actions/subscribe.php:77
 msgid "This action only accepts POST requests."
 msgstr "هذا الإجراء يقبل طلبات POST فقط."
 
-#. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
-#: actions/subscribe.php:121
+#: actions/subscribe.php:117
 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
 msgstr ""
 
-#. TRANS: Page title when subscription succeeded.
-#: actions/subscribe.php:149
+#: actions/subscribe.php:145
 msgid "Subscribed"
 msgstr "مُشترك"
 
@@ -6353,9 +6276,8 @@ msgstr "الوسوم"
 msgid "User profile"
 msgstr "ملف المستخدم الشخصي"
 
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT element in area for user avatar.
-#: actions/tagother.php:81 actions/userauthorization.php:138
+#: actions/tagother.php:81 actions/userauthorization.php:132
 #: lib/userprofile.php:108
 msgid "Photo"
 msgstr "صورة"
@@ -6372,11 +6294,6 @@ msgid ""
 msgstr ""
 "سِم نفسك (حروف وأرقام و \"-\" و \".\" و \"_\")، افصلها بفاصلة (',') أو مسافة."
 
-#: actions/tagother.php:178
-#, php-format
-msgid "Invalid tag: \"%s\""
-msgstr "وسم غير صالح: \"%s\""
-
 #: actions/tagother.php:193
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
@@ -6391,7 +6308,6 @@ msgstr "استخدم هذا النموذج لتعدل تطبيقك."
 msgid "No such tag."
 msgstr "لا وسم كهذا."
 
-#. TRANS: Client error displayed when trying to unblock a non-blocked user.
 #: actions/unblock.php:59
 msgid "You haven't blocked that user."
 msgstr "لم تمنع هذا المستخدم."
@@ -6413,7 +6329,7 @@ msgstr "لا طلب استيثاق."
 msgid "Unsubscribed"
 msgstr "غير مشترك"
 
-#: actions/updateprofile.php:64
+#: actions/updateprofile.php:64 actions/userauthorization.php:337
 #, php-format
 msgid ""
 "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
@@ -6445,7 +6361,7 @@ msgstr "رسالة ترحيب غير صالحة. أقصى طول هو 255 حرف
 #. TRANS: users in user admin panel. %1$s is the invalid nickname.
 #: actions/useradminpanel.php:166
 #, php-format
-msgid "Invalid default subscripton: \"%1$s\" is not a user."
+msgid "Invalid default subscripton: '%1$s' is not a user."
 msgstr ""
 
 #. TRANS: Link description in user account settings menu.
@@ -6507,145 +6423,110 @@ msgstr "اسمح للمستخدمين بدعوة مستخدمين جدد."
 #. TRANS: Title for button to save user settings in user admin panel.
 #: actions/useradminpanel.php:302
 #, fuzzy
-msgid "Save user settings."
+msgid "Save user settings"
 msgstr "احفظ إعدادات المستخدم"
 
-#. TRANS: Page title.
-#: actions/userauthorization.php:109
+#: actions/userauthorization.php:105
 #, fuzzy
 msgid "Authorize subscription"
 msgstr "جميع الاشتراكات"
 
-#. TRANS: Page notice on "Auhtorize subscription" page.
-#: actions/userauthorization.php:115
+#: actions/userauthorization.php:110
 #, fuzzy
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
 "user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
-"click \"Reject\"."
+"click “Reject”."
 msgstr ""
 "يُرجى التحقق من هذه التفاصيل للتأكد من أنك تريد الاستماع لإشعارات هذا "
 "المستخدم. إذا لم تطلب للتو الاستماع لإشعارات شخص ما فانقر \"ارفض\"."
 
-#. TRANS: DT element on Authorise Subscription page where license is displayed.
 #. TRANS: Menu item for site administration
-#: actions/userauthorization.php:207 actions/version.php:167
+#: actions/userauthorization.php:196 actions/version.php:167
 #: lib/adminpanelaction.php:403
 msgid "License"
 msgstr "الرخصة"
 
-#. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:229
+#: actions/userauthorization.php:217
 #, fuzzy
-msgctxt "BUTTON"
 msgid "Accept"
 msgstr "اقبل"
 
-#. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:231
-#, fuzzy
-msgid "Subscribe to this user."
+#: actions/userauthorization.php:218 lib/subscribeform.php:115
+#: lib/subscribeform.php:139
+msgid "Subscribe to this user"
 msgstr "اشترك بهذا المستخدم"
 
-#. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:233
+#: actions/userauthorization.php:219
 #, fuzzy
-msgctxt "BUTTON"
 msgid "Reject"
 msgstr "ارفض"
 
-#. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:235
+#: actions/userauthorization.php:220
 #, fuzzy
-msgid "Reject this subscription."
+msgid "Reject this subscription"
 msgstr "ارفض هذا الاشتراك"
 
-#. TRANS: Client error displayed for an empty authorisation request.
-#: actions/userauthorization.php:248
+#: actions/userauthorization.php:232
 msgid "No authorization request!"
 msgstr "لا طلب استيثاق!"
 
-#. TRANS: Accept message header from Authorise subscription page.
-#: actions/userauthorization.php:271
+#: actions/userauthorization.php:254
 #, fuzzy
 msgid "Subscription authorized"
 msgstr "رُفض الاشتراك"
 
-#: actions/userauthorization.php:274
+#: actions/userauthorization.php:256
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to authorize the "
 "subscription. Your subscription token is:"
 msgstr ""
 
-#. TRANS: Reject message header from Authorise subscription page.
-#: actions/userauthorization.php:285
+#: actions/userauthorization.php:266
 msgid "Subscription rejected"
 msgstr "رُفض الاشتراك"
 
-#: actions/userauthorization.php:288
+#: actions/userauthorization.php:268
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to fully reject the "
 "subscription."
 msgstr ""
 
-#. TRANS: Exception thrown when no valid user is found for an authorisation request.
-#. TRANS: %s is a listener URI.
-#: actions/userauthorization.php:325
+#: actions/userauthorization.php:303
 #, php-format
-msgid "Listener URI \"%s\" not found here."
+msgid "Listener URI ‘%s’ not found here."
 msgstr ""
 
-#. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:332
+#: actions/userauthorization.php:308
 #, fuzzy, php-format
-msgid "Listenee URI \"%s\" is too long."
+msgid "Listenee URI ‘%s’ is too long."
 msgstr "المسار المصدر طويل جدًا."
 
-#. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:340
-#, php-format
-msgid "Listenee URI \"%s\" is a local user."
-msgstr ""
-
-#. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
-#. TRANS: %s is a profile URL.
-#: actions/userauthorization.php:358
-#, php-format
-msgid "Profile URL \"%s\" is for a local user."
-msgstr ""
-
-#. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
-#. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
-#: actions/userauthorization.php:368
-#, php-format
-msgid ""
-"Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
-"\"."
-msgstr ""
-
-#. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:378
+#: actions/userauthorization.php:314
 #, fuzzy, php-format
-msgid "Avatar URL \"%s\" is not valid."
+msgid "Listenee URI ‘%s’ is a local user."
+msgstr "المسار المصدر طويل جدًا."
+
+#: actions/userauthorization.php:329
+#, php-format
+msgid "Profile URL ‘%s’ is for a local user."
+msgstr ""
+
+#: actions/userauthorization.php:345
+#, fuzzy, php-format
+msgid "Avatar URL ‘%s’ is not valid."
 msgstr "مسار المصدر ليس صحيحا."
 
-#. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:385
+#: actions/userauthorization.php:350
 #, fuzzy, php-format
-msgid "Cannot read avatar URL \"%s\"."
+msgid "Can’t read avatar URL ‘%s’."
 msgstr "تعذر قراءة رابط الأفتار ‘%s’."
 
-#. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:392
+#: actions/userauthorization.php:355
 #, php-format
-msgid "Wrong image type for avatar URL \"%s\"."
+msgid "Wrong image type for avatar URL ‘%s’."
 msgstr ""
 
 #. TRANS: Page title for profile design page.
@@ -6744,7 +6625,7 @@ msgid "Plugins"
 msgstr "الملحقات"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:898
+#: actions/version.php:198 lib/action.php:901
 msgid "Version"
 msgstr "النسخة"
 
@@ -6960,14 +6841,14 @@ msgstr "مشكلة أثناء حفظ الإشعار."
 
 #. TRANS: Server exception thrown when a reply cannot be saved.
 #. TRANS: %1$d is a notice ID, %2$d is the ID of the mentioned user.
-#: classes/Notice.php:1142
+#: classes/Notice.php:1144
 #, fuzzy, php-format
 msgid "Could not save reply for %1$d, %2$d."
 msgstr "تعذر تحديث المجموعة المحلية."
 
 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1661
+#: classes/Notice.php:1663
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
@@ -6981,14 +6862,14 @@ msgstr "%1$s (%2$s)"
 
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:775
+#: classes/Profile.php:779
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:784
+#: classes/Profile.php:788
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -7308,54 +7189,54 @@ msgid "Page notice"
 msgstr "إشعار الصفحة"
 
 #. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:871
+#: lib/action.php:874
 #, fuzzy
 msgid "Secondary site navigation"
 msgstr "ضبط الموقع الأساسي"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:877
+#: lib/action.php:880
 msgid "Help"
 msgstr "مساعدة"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:880
+#: lib/action.php:883
 msgid "About"
 msgstr "عن"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:883
+#: lib/action.php:886
 msgid "FAQ"
 msgstr "الأسئلة المكررة"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:888
+#: lib/action.php:891
 msgid "TOS"
 msgstr "الشروط"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:892
+#: lib/action.php:895
 msgid "Privacy"
 msgstr "خصوصية"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:895
+#: lib/action.php:898
 msgid "Source"
 msgstr "المصدر"
 
 #. TRANS: Secondary navigation menu option leading to e-mail contact information on the
 #. TRANS: StatusNet site, where to report bugs, ...
-#: lib/action.php:902
+#: lib/action.php:905
 msgid "Contact"
 msgstr "اتصل"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:905
+#: lib/action.php:908
 msgid "Badge"
 msgstr "الجسر"
 
 #. TRANS: DT element for StatusNet software license.
-#: lib/action.php:934
+#: lib/action.php:937
 msgid "StatusNet software license"
 msgstr "رخصة برنامج StatusNet"
 
@@ -7363,7 +7244,7 @@ msgstr "رخصة برنامج StatusNet"
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:941
+#: lib/action.php:944
 #, fuzzy, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7373,7 +7254,7 @@ msgstr ""
 "broughtbyurl%%). "
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:944
+#: lib/action.php:947
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr ""
@@ -7382,7 +7263,7 @@ msgstr ""
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:951
+#: lib/action.php:954
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7394,51 +7275,51 @@ msgstr ""
 "agpl-3.0.html)."
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:967
+#: lib/action.php:970
 msgid "Site content license"
 msgstr "رخصة محتوى الموقع"
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:974
+#: lib/action.php:977
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:981
+#: lib/action.php:984
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:985
+#: lib/action.php:988
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:1017
+#: lib/action.php:1020
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
 
 #. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1353
+#: lib/action.php:1356
 #, fuzzy
 msgid "Pagination"
 msgstr "تسجيل"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1364
+#: lib/action.php:1367
 msgid "After"
 msgstr "بعد"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1374
+#: lib/action.php:1377
 msgid "Before"
 msgstr "قبل"
 
@@ -7639,23 +7520,19 @@ msgstr ""
 msgid "No application for that consumer key."
 msgstr ""
 
-#: lib/apiauth.php:202 lib/apiauth.php:284
-msgid "Not allowed to use API."
-msgstr ""
-
 #. TRANS: OAuth exception given when an incorrect access token was given for a user.
-#: lib/apiauth.php:225
+#: lib/apiauth.php:219
 msgid "Bad access token."
 msgstr ""
 
 #. TRANS: OAuth exception given when no user was found for a given token (no token was found).
-#: lib/apiauth.php:230
+#: lib/apiauth.php:224
 msgid "No user for that token."
 msgstr ""
 
 #. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel".
 #. TRANS: Client error thrown when authentication fails.
-#: lib/apiauth.php:272 lib/apiauth.php:302
+#: lib/apiauth.php:266 lib/apiauth.php:293
 msgid "Could not authenticate you."
 msgstr ""
 
@@ -7868,11 +7745,6 @@ msgstr "تغيير كلمة السر غير مسموح به"
 msgid "Block"
 msgstr "امنع"
 
-#. TRANS: Description of the form to block a user.
-#: lib/blockform.php:79
-msgid "Block this user"
-msgstr "امنع هذا المستخدم"
-
 #. TRANS: Title for command results.
 #: lib/channel.php:160 lib/channel.php:181
 msgid "Command results"
@@ -7902,7 +7774,7 @@ msgstr "لا ملف بهذه الهوية."
 
 #. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
 #. TRANS: Error text shown when a last user notice is requested and it does not exist.
-#: lib/command.php:99 lib/command.php:630
+#: lib/command.php:99 lib/command.php:642
 #, fuzzy
 msgid "User has no last notice."
 msgstr "ليس للمستخدم إشعار أخير"
@@ -7954,36 +7826,42 @@ msgstr ""
 "المشتركون: %2$s\n"
 "الإشعارات: %3$s"
 
+#. TRANS: Error message text shown when a favorite could not be set because it has already been favorited.
+#: lib/command.php:298
+#, fuzzy
+msgid "Could not create favorite: already favorited."
+msgstr "تعذّر إنشاء مفضلة."
+
 #. TRANS: Text shown when a notice has been marked as favourite successfully.
-#: lib/command.php:312
+#: lib/command.php:324
 #, fuzzy
 msgid "Notice marked as fave."
 msgstr "هذا الإشعار مفضلة مسبقًا!"
 
 #. TRANS: Message given having added a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:357
+#: lib/command.php:369
 #, php-format
 msgid "%1$s joined group %2$s."
 msgstr ""
 
 #. TRANS: Message given having removed a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:405
+#: lib/command.php:417
 #, php-format
 msgid "%1$s left group %2$s."
 msgstr ""
 
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: lib/command.php:426
+#: lib/command.php:438
 #, fuzzy, php-format
 msgctxt "WHOIS"
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
 
 #. TRANS: Whois output. %s is the full name of the queried user.
-#: lib/command.php:430
+#: lib/command.php:442
 #, php-format
 msgid "Fullname: %s"
 msgstr "الاسم الكامل: %s"
@@ -7991,7 +7869,7 @@ msgstr "الاسم الكامل: %s"
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a location.
-#: lib/command.php:434 lib/mail.php:270
+#: lib/command.php:446 lib/mail.php:270
 #, php-format
 msgid "Location: %s"
 msgstr "الموقع: %s"
@@ -7999,20 +7877,20 @@ msgstr "الموقع: %s"
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a homepage.
-#: lib/command.php:438 lib/mail.php:274
+#: lib/command.php:450 lib/mail.php:274
 #, php-format
 msgid "Homepage: %s"
 msgstr "الصفحة الرئيسية: %s"
 
 #. TRANS: Whois output. %s is the bio information of the queried user.
-#: lib/command.php:442
+#: lib/command.php:454
 #, php-format
 msgid "About: %s"
 msgstr "عن: %s"
 
 #. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).
 #. TRANS: %s is a remote profile.
-#: lib/command.php:471
+#: lib/command.php:483
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
@@ -8021,7 +7899,7 @@ msgstr ""
 
 #. TRANS: Message given if content is too long. %1$sd is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:488
+#: lib/command.php:500
 #, fuzzy, php-format
 msgid "Message too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
@@ -8033,26 +7911,26 @@ msgstr[4] "هذه طويلة جدًا. أطول حجم للإشعار %d  حرف
 msgstr[5] "هذه طويلة جدًا. أطول حجم للإشعار %d  حرفًا."
 
 #. TRANS: Error text shown sending a direct message fails with an unknown reason.
-#: lib/command.php:516
+#: lib/command.php:528
 #, fuzzy
 msgid "Error sending direct message."
 msgstr "أنت ممنوع من إرسال رسائل مباشرة."
 
 #. TRANS: Message given having repeated a notice from another user.
 #. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:553
+#: lib/command.php:565
 #, fuzzy, php-format
 msgid "Notice from %s repeated."
 msgstr "الإشعار من %s مكرر"
 
 #. TRANS: Error text shown when repeating a notice fails with an unknown reason.
-#: lib/command.php:556
+#: lib/command.php:568
 msgid "Error repeating notice."
 msgstr "خطأ تكرار الإشعار."
 
 #. TRANS: Message given if content of a notice for a reply is too long. %1$d is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:591
+#: lib/command.php:603
 #, fuzzy, php-format
 msgid "Notice too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Notice too long - maximum is %1$d characters, you sent %2$d."
@@ -8065,100 +7943,100 @@ msgstr[5] "هذه طويلة جدًا. أطول حجم للإشعار %d  حرف
 
 #. TRANS: Text shown having sent a reply to a notice successfully.
 #. TRANS: %s is the nickname of the user of the notice the reply was sent to.
-#: lib/command.php:604
+#: lib/command.php:616
 #, fuzzy, php-format
 msgid "Reply to %s sent."
 msgstr "رُد على رسالة %s"
 
 #. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
-#: lib/command.php:607
+#: lib/command.php:619
 msgid "Error saving notice."
 msgstr "خطأ أثناء حفظ الإشعار."
 
 #. TRANS: Error text shown when no username was provided when issuing a subscribe command.
-#: lib/command.php:654
+#: lib/command.php:666
 msgid "Specify the name of the user to subscribe to."
 msgstr ""
 
 #. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
-#: lib/command.php:663
+#: lib/command.php:675
 msgid "Can't subscribe to OMB profiles by command."
 msgstr ""
 
 #. TRANS: Text shown after having subscribed to another user successfully.
 #. TRANS: %s is the name of the user the subscription was requested for.
-#: lib/command.php:671
+#: lib/command.php:683
 #, php-format
 msgid "Subscribed to %s."
 msgstr ""
 
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.
-#: lib/command.php:692 lib/command.php:803
+#: lib/command.php:704 lib/command.php:815
 msgid "Specify the name of the user to unsubscribe from."
 msgstr ""
 
 #. TRANS: Text shown after having unsubscribed from another user successfully.
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:703
+#: lib/command.php:715
 #, php-format
 msgid "Unsubscribed from %s."
 msgstr ""
 
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
-#: lib/command.php:723 lib/command.php:749
+#: lib/command.php:735 lib/command.php:761
 msgid "Command not yet implemented."
 msgstr "الأمر لم يُجهزّ بعد."
 
 #. TRANS: Text shown when issuing the command "off" successfully.
-#: lib/command.php:727
+#: lib/command.php:739
 msgid "Notification off."
 msgstr "الإشعار مُطفأ."
 
 #. TRANS: Error text shown when the command "off" fails for an unknown reason.
-#: lib/command.php:730
+#: lib/command.php:742
 msgid "Can't turn off notification."
 msgstr "تعذّر إطفاء الإشعارات."
 
 #. TRANS: Text shown when issuing the command "on" successfully.
-#: lib/command.php:753
+#: lib/command.php:765
 msgid "Notification on."
 msgstr "الإشعار يعمل."
 
 #. TRANS: Error text shown when the command "on" fails for an unknown reason.
-#: lib/command.php:756
+#: lib/command.php:768
 msgid "Can't turn on notification."
 msgstr "تعذّر تشغيل الإشعار."
 
 #. TRANS: Error text shown when issuing the login command while login is disabled.
-#: lib/command.php:770
+#: lib/command.php:782
 msgid "Login command is disabled."
 msgstr ""
 
 #. TRANS: Text shown after issuing the login command successfully.
 #. TRANS: %s is a logon link..
-#: lib/command.php:783
+#: lib/command.php:795
 #, php-format
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
 
 #. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:812
+#: lib/command.php:824
 #, php-format
 msgid "Unsubscribed %s."
 msgstr ""
 
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
-#: lib/command.php:830
+#: lib/command.php:842
 msgid "You are not subscribed to anyone."
 msgstr "لست مُشتركًا بأي أحد."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
-#: lib/command.php:835
+#: lib/command.php:847
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "لست مشتركًا بأحد."
@@ -8170,14 +8048,14 @@ msgstr[5] ""
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user
 #. TRANS: (followers) without having any subscribers.
-#: lib/command.php:857
+#: lib/command.php:869
 msgid "No one is subscribed to you."
 msgstr "لا أحد مشترك بك."
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
-#: lib/command.php:862
+#: lib/command.php:874
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "لا أحد مشترك بك."
@@ -8189,14 +8067,14 @@ msgstr[5] ""
 
 #. TRANS: Text shown after requesting groups a user is subscribed to without having
 #. TRANS: any group subscriptions.
-#: lib/command.php:884
+#: lib/command.php:896
 msgid "You are not a member of any groups."
 msgstr "لست عضوًا في أي مجموعة."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
-#: lib/command.php:889
+#: lib/command.php:901
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "لست عضوًا في أي مجموعة."
@@ -8207,7 +8085,7 @@ msgstr[4] ""
 msgstr[5] ""
 
 #. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-#: lib/command.php:904
+#: lib/command.php:916
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -8351,11 +8229,6 @@ msgstr "تطبيقات OAuth"
 msgid "Database error"
 msgstr "خطأ قاعدة بيانات"
 
-#. TRANS: Description of form for deleting a user.
-#: lib/deleteuserform.php:75
-msgid "Delete this user"
-msgstr "احذف هذا المستخدم"
-
 #. TRANS: Label in form on profile design page.
 #. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
 #: lib/designsettings.php:108
@@ -8392,21 +8265,6 @@ msgstr "تغيير الألوان"
 msgid "Use defaults"
 msgstr "استخدم المبدئيات"
 
-#. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: lib/designsettings.php:259
-msgid "Restore default designs"
-msgstr "استعد التصميمات المبدئية"
-
-#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: lib/designsettings.php:267
-msgid "Reset back to default"
-msgstr "ارجع إلى المبدئي"
-
-#. TRANS: Title for button on profile design page to save settings.
-#: lib/designsettings.php:272
-msgid "Save design"
-msgstr "احفظ التصميم"
-
 #. TRANS: Error message displayed if design settings could not be saved.
 #. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
 #: lib/designsettings.php:405 lib/designsettings.php:427
@@ -9232,10 +9090,6 @@ msgstr "رُد على هذا الإشعار"
 msgid "Reply"
 msgstr "رُد"
 
-#: lib/noticelist.php:673
-msgid "Delete this notice"
-msgstr "احذف هذا الإشعار"
-
 #: lib/noticelist.php:691
 msgid "Notice repeated"
 msgstr "الإشعار مكرر"
@@ -9518,10 +9372,6 @@ msgstr "ادعُ"
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "ادعُ أصدقائك وزملائك للانضمام إليك في %s"
 
-#: lib/subscribeform.php:115 lib/subscribeform.php:139
-msgid "Subscribe to this user"
-msgstr "اشترك بهذا المستخدم"
-
 #: lib/subscriberspeopleselftagcloudsection.php:48
 #: lib/subscriptionspeopleselftagcloudsection.php:48
 msgid "People Tagcloud as self-tagged"
@@ -9697,23 +9547,18 @@ msgctxt "role"
 msgid "Moderator"
 msgstr "مراقب"
 
-#: lib/util.php:305
-#, fuzzy
-msgid "Not allowed to log in."
-msgstr "لست والجًا."
-
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1309
+#: lib/util.php:1306
 msgid "a few seconds ago"
 msgstr "قبل لحظات قليلة"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1312
+#: lib/util.php:1309
 msgid "about a minute ago"
 msgstr "قبل دقيقة تقريبًا"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1316
+#: lib/util.php:1313
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
@@ -9725,12 +9570,12 @@ msgstr[4] ""
 msgstr[5] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1319
+#: lib/util.php:1316
 msgid "about an hour ago"
 msgstr "قبل ساعة تقريبًا"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1323
+#: lib/util.php:1320
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
@@ -9742,12 +9587,12 @@ msgstr[4] ""
 msgstr[5] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1326
+#: lib/util.php:1323
 msgid "about a day ago"
 msgstr "قبل يوم تقريبا"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1330
+#: lib/util.php:1327
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
@@ -9759,12 +9604,12 @@ msgstr[4] ""
 msgstr[5] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1333
+#: lib/util.php:1330
 msgid "about a month ago"
 msgstr "قبل شهر تقريبًا"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1337
+#: lib/util.php:1334
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
@@ -9776,7 +9621,7 @@ msgstr[4] ""
 msgstr[5] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1340
+#: lib/util.php:1337
 msgid "about a year ago"
 msgstr "قبل سنة تقريبًا"
 
@@ -9822,3 +9667,64 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#, fuzzy
+#~ msgid "Block this user."
+#~ msgstr "امنع هذا المستخدم"
+
+#, fuzzy
+#~ msgid "Delete this notice."
+#~ msgstr "احذف هذا الإشعار"
+
+#, fuzzy
+#~ msgid "Delete this user."
+#~ msgstr "احذف هذا المستخدم"
+
+#, fuzzy
+#~ msgid "Restore default designs."
+#~ msgstr "استعد التصميمات المبدئية"
+
+#, fuzzy
+#~ msgid "Reset back to default."
+#~ msgstr "ارجع إلى المبدئي"
+
+#, fuzzy
+#~ msgid "Save design."
+#~ msgstr "احفظ التصميم"
+
+#, fuzzy
+#~ msgid "Disfavor favorite."
+#~ msgstr "ألغِ تفضيل المفضلة"
+
+#, fuzzy
+#~ msgid "\"%s\" not found."
+#~ msgstr "لم يُعثرعلى المستخدم."
+
+#, fuzzy
+#~ msgid "Notice %s not found."
+#~ msgstr "لم يتم العثور على وسيلة API."
+
+#, fuzzy
+#~ msgid "Attachment %s not found."
+#~ msgstr "لم يُعثر على المستخدم المستلم."
+
+#, fuzzy
+#~ msgid "Invalid tag: \"%s\"."
+#~ msgstr "وسم غير صالح: \"%s\""
+
+#, fuzzy
+#~ msgid "Password saved"
+#~ msgstr "حُفظت كلمة السر."
+
+#, fuzzy
+#~ msgid "Where you are, like \"City, State (or Region), Country\"."
+#~ msgstr ""
+#~ "مكان تواجدك، على سبيل المثال \"المدينة، الولاية (أو المنطقة)، الدولة\""
+
+#, fuzzy
+#~ msgid "Subscribe to this user."
+#~ msgstr "اشترك بهذا المستخدم"
+
+#, fuzzy
+#~ msgid "Not allowed to log in."
+#~ msgstr "لست والجًا."
diff --git a/locale/arz/LC_MESSAGES/statusnet.po b/locale/arz/LC_MESSAGES/statusnet.po
index 7c8cbf473e..a56cbf60e3 100644
--- a/locale/arz/LC_MESSAGES/statusnet.po
+++ b/locale/arz/LC_MESSAGES/statusnet.po
@@ -11,19 +11,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-24 10:32+0000\n"
-"PO-Revision-Date: 2011-02-24 10:36:04+0000\n"
+"POT-Creation-Date: 2011-03-03 15:58+0000\n"
+"PO-Revision-Date: 2011-03-03 16:00:10+0000\n"
 "Language-Team: Egyptian Spoken Arabic <http://translatewiki.net/wiki/Portal:"
 "arz>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r82712); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: arz\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=6; plural= n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
 "&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
-"X-POT-Import-Date: 2011-02-17 11:39:54+0000\n"
+"X-POT-Import-Date: 2011-02-25 23:49:23+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -139,11 +139,7 @@ msgstr "لا وسم كهذا."
 #. 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 use "one time password login" without using an existing user.
-#. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
-#. TRANS: Client error displayed trying to find a user by ID for a non-existing ID.
-#. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when calling a profile action without specifying a user.
 #: actions/all.php:80 actions/allrss.php:69
@@ -161,12 +157,12 @@ msgstr "لا وسم كهذا."
 #: actions/apitimelinementions.php:77 actions/apitimelineuser.php:79
 #: actions/avatarbynickname.php:79 actions/favoritesrss.php:72
 #: actions/foaf.php:42 actions/foaf.php:61 actions/hcard.php:67
-#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:78
+#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
 #: actions/remotesubscribe.php:144 actions/remotesubscribe.php:153
-#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:113
-#: actions/showfavorites.php:106 actions/userbyid.php:75
+#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
+#: actions/showfavorites.php:106 actions/userbyid.php:74
 #: actions/usergroups.php:93 actions/userrss.php:40 actions/userxrd.php:59
-#: actions/xrds.php:71 lib/command.php:497 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:509 lib/galleryaction.php:59
 #: lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "لا مستخدم كهذا."
@@ -290,7 +286,7 @@ msgstr "%1$s و الصحاب, صفحه %2$d"
 #: actions/apigrouplistall.php:120 actions/apigroupmembership.php:105
 #: actions/apigroupshow.php:114 actions/apihelptest.php:84
 #: actions/apistatusesdestroy.php:101 actions/apistatusesretweets.php:110
-#: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:138
+#: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:139
 #: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
 #: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:268
 #: actions/apitimelinegroup.php:147 actions/apitimelinehome.php:173
@@ -524,7 +520,7 @@ msgstr "لم يُعثر على المستخدم المستلم."
 
 #. TRANS: Client error displayed trying to direct message another user who's not a friend (403).
 #: actions/apidirectmessagenew.php:144
-msgid "Cannot send direct messages to users who aren't your friend."
+msgid "Can't send direct messages to users who aren't your friend."
 msgstr ""
 
 #. TRANS: Client error displayed trying to direct message self (403).
@@ -550,7 +546,7 @@ msgstr "الحاله دى موجوده فعلا فى التفضيلات."
 #. TRANS: Client error displayed when marking a notice as favourite fails.
 #. TRANS: Server error displayed when trying to mark a notice as favorite fails in the database.
 #. TRANS: Error message text shown when a favorite could not be set.
-#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:294
+#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:306
 msgid "Could not create favorite."
 msgstr "تعذّر إنشاء مفضله."
 
@@ -611,7 +607,7 @@ msgstr "تعذّر إيجاد المستخدم الهدف."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:191
 #: actions/newgroup.php:137 actions/profilesettings.php:273
-#: actions/register.php:206
+#: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr ""
 
@@ -621,7 +617,7 @@ msgstr ""
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:195
 #: actions/newgroup.php:141 actions/profilesettings.php:243
-#: actions/register.php:208
+#: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "ليس اسمًا مستعارًا صحيحًا."
 
@@ -634,7 +630,7 @@ msgstr "ليس اسمًا مستعارًا صحيحًا."
 #: actions/apigroupcreate.php:181 actions/editapplication.php:235
 #: actions/editgroup.php:202 actions/newapplication.php:221
 #: actions/newgroup.php:148 actions/profilesettings.php:248
-#: actions/register.php:215
+#: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "الصفحه الرئيسيه ليست عنونًا صالحًا."
 
@@ -644,7 +640,7 @@ msgstr "الصفحه الرئيسيه ليست عنونًا صالحًا."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:191 actions/editgroup.php:206
 #: actions/newgroup.php:152 actions/profilesettings.php:252
-#: actions/register.php:218
+#: actions/register.php:226
 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "الاسم الكامل طويل جدا (الأقصى 255 حرفًا)"
@@ -677,7 +673,7 @@ msgstr[5] "المنظمه طويله جدا (اكتر حاجه %d رمز)."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:215 actions/editgroup.php:218
 #: actions/newgroup.php:164 actions/profilesettings.php:265
-#: actions/register.php:227
+#: actions/register.php:235
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
 msgstr "المنظمه طويله جدا (اكتر حاجه 255 رمز)."
@@ -738,7 +734,7 @@ msgstr "لم يوجد."
 #. TRANS: Server error displayed when trying to join a group the user is already a member of.
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:333
+#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:345
 #, fuzzy
 msgid "You are already a member of that group."
 msgstr "انت اصلا عضو فى الجروپ ده"
@@ -746,7 +742,7 @@ msgstr "انت اصلا عضو فى الجروپ ده"
 #. TRANS: Server error displayed when trying to join a group the user is blocked from joining.
 #. 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.
-#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:338
+#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:350
 #, fuzzy
 msgid "You have been blocked from that group by the admin."
 msgstr "لم تمنع هذا المستخدم."
@@ -757,7 +753,7 @@ msgstr "لم تمنع هذا المستخدم."
 #. TRANS: %1$s is the joining user's nickname, $2$s is the group nickname for which the join failed.
 #. TRANS: Message given having failed to add a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:350
+#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:362
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "ما نفعش يضم %1$s للجروپ %2$s."
@@ -775,7 +771,7 @@ msgstr "لست عضوا فى تلك المجموعه."
 #. TRANS: Message given having failed to remove a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
 #: actions/apigroupleave.php:127 actions/leavegroup.php:133
-#: lib/command.php:398
+#: lib/command.php:410
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
 msgstr "ما نفعش يتشال اليوزر %1$s من الجروپ %2$s."
@@ -839,21 +835,20 @@ msgstr "لا تملك تصريحًا."
 #. TRANS: Form validation error message.
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
-#. TRANS: Client error displayed when the session token is not okay.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
 #: actions/deletenotice.php:177 actions/disfavor.php:75
 #: actions/emailsettings.php:291 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:65 actions/grouplogo.php:321
 #: actions/groupunblock.php:65 actions/imsettings.php:224
-#: actions/invite.php:60 actions/login.php:131 actions/makeadmin.php:66
+#: actions/invite.php:60 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
-#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:136
-#: actions/othersettings.php:155 actions/passwordsettings.php:137
+#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
+#: actions/othersettings.php:155 actions/passwordsettings.php:138
 #: actions/profilesettings.php:217 actions/recoverpassword.php:383
-#: actions/register.php:164 actions/remotesubscribe.php:76
+#: actions/register.php:172 actions/remotesubscribe.php:76
 #: actions/repeat.php:82 actions/smssettings.php:250 actions/subedit.php:40
-#: actions/subscribe.php:87 actions/tagother.php:166
-#: actions/unsubscribe.php:69 actions/userauthorization.php:53
+#: actions/subscribe.php:86 actions/tagother.php:166
+#: actions/unsubscribe.php:69 actions/userauthorization.php:52
 #: lib/designsettings.php:310
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
@@ -885,7 +880,7 @@ msgstr "خطأ قاعده البيانات أثناء إدخال المستخد
 #: actions/designadminpanel.php:100 actions/editapplication.php:144
 #: actions/emailsettings.php:310 actions/grouplogo.php:332
 #: actions/imsettings.php:239 actions/newapplication.php:124
-#: actions/oauthconnectionssettings.php:145 actions/recoverpassword.php:46
+#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
 #: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
 msgstr ""
@@ -931,20 +926,19 @@ msgstr "الحساب"
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group nickname (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT for nick name in a profile.
-#: actions/apioauthauthorize.php:459 actions/login.php:242
-#: actions/profilesettings.php:106 actions/register.php:418
+#: actions/apioauthauthorize.php:459 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:432
 #: actions/showgroup.php:243 actions/tagother.php:94
-#: actions/userauthorization.php:152 lib/groupeditform.php:145
+#: actions/userauthorization.php:145 lib/groupeditform.php:145
 #: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "الاسم المستعار"
 
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:463 actions/login.php:245
-#: actions/register.php:422 lib/accountsettingsaction.php:120
+#: actions/apioauthauthorize.php:463 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:120
 msgid "Password"
 msgstr "كلمه السر"
 
@@ -1041,13 +1035,13 @@ msgstr "لا إشعار كهذا."
 
 #. TRANS: Client error displayed trying to repeat an own notice through the API.
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:537
+#: actions/apistatusesretweet.php:83 lib/command.php:549
 msgid "Cannot repeat your own notice."
 msgstr "مش نافعه تتكرر الملاحظتك بتاعتك."
 
 #. TRANS: Client error displayed trying to re-repeat a notice through the API.
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:92 lib/command.php:543
+#: actions/apistatusesretweet.php:92 lib/command.php:555
 msgid "Already repeated that notice."
 msgstr "الملاحظه اتكررت فعلا."
 
@@ -1070,7 +1064,7 @@ msgstr "الـ API method مش موجوده."
 #. TRANS: %s is the requested output format.
 #: actions/apistatusesshow.php:144
 #, fuzzy, php-format
-msgid "Unsupported format: %s."
+msgid "Unsupported format: %s"
 msgstr "نسق غير مدعوم."
 
 #. TRANS: Client error displayed requesting a deleted status.
@@ -1184,14 +1178,13 @@ msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr ""
 
 #. TRANS: Title for site timeline. %s is the StatusNet sitename.
-#. TRANS: Public RSS feed title. %s is the StatusNet site name.
 #: actions/apitimelinepublic.php:193 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "مسار %s الزمنى العام"
 
 #. TRANS: Subtitle for site timeline. %s is the StatusNet sitename.
-#: actions/apitimelinepublic.php:199
+#: actions/apitimelinepublic.php:199 actions/publicrss.php:105
 #, php-format
 msgid "%s updates from everyone!"
 msgstr ""
@@ -1258,26 +1251,25 @@ msgid "Atom post must be an Atom entry."
 msgstr ""
 
 #. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
-#: actions/apitimelineuser.php:334
+#: actions/apitimelineuser.php:335
 msgid "Can only handle POST activities."
 msgstr ""
 
 #. TRANS: Client error displayed when using an unsupported activity object type.
 #. TRANS: %s is the unsupported activity object type.
-#: actions/apitimelineuser.php:345
+#: actions/apitimelineuser.php:346
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
 #. TRANS: %d is the notice ID (number).
-#: actions/apitimelineuser.php:379
+#: actions/apitimelineuser.php:380
 #, fuzzy, php-format
 msgid "No content for notice %d."
 msgstr "ابحث عن محتويات فى الإشعارات"
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#. TRANS: %s is the notice URI.
 #: actions/apitimelineuser.php:408
 #, fuzzy, php-format
 msgid "Notice with URI \"%s\" already exists."
@@ -1297,10 +1289,9 @@ msgstr "الـ API method مش موجوده."
 
 #. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
 #. TRANS: Client exception.
-#. TRANS: Client error displayed trying to subscribe to a non-existing profile.
 #: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
 #: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
-#: actions/subscribe.php:110
+#: actions/subscribe.php:107
 #, fuzzy
 msgid "No such profile."
 msgstr "لا ملف كهذا."
@@ -1437,7 +1428,7 @@ msgstr "تعذّر حذف المفضله."
 #: actions/joingroup.php:95 actions/leavegroup.php:82
 #: actions/leavegroup.php:95 actions/makeadmin.php:86
 #: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:380
+#: lib/command.php:392
 msgid "No such group."
 msgstr "لا مجموعه كهذه."
 
@@ -1448,7 +1439,7 @@ msgid "Not a member."
 msgstr "جميع الأعضاء"
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
-#: actions/atompubshowmembership.php:150
+#: actions/atompubshowmembership.php:151
 #, fuzzy
 msgid "Cannot delete someone else's membership."
 msgstr "تعذّر حفظ الاشتراك."
@@ -1553,11 +1544,9 @@ msgstr "تستطيع رفع صورتك الشخصيه. أقصى حجم للمل
 
 #. TRANS: Server error displayed in avatar upload page when no matching profile can be found for a user.
 #. TRANS: Server error displayed coming across a request from a user without a profile.
-#. TRANS: Server error displayed when trying to authorise a remote subscription request
-#. TRANS: while the user has no profile.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
 #: actions/grouplogo.php:184 actions/remotesubscribe.php:190
-#: actions/userauthorization.php:75 actions/userrss.php:108
+#: actions/userauthorization.php:72 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr "يوزر من-غير پروفايل زيّه."
 
@@ -1616,9 +1605,9 @@ msgstr "مجموعات"
 msgid "No file uploaded."
 msgstr "لا ملف شخصى مُحدّد."
 
-#. TRANS: Avatar upload form instruction after uploading a file.
+#. TRANS: Avatar upload form unstruction after uploading a file.
 #: actions/avatarsettings.php:345
-msgid "Pick a square area of the image to be your avatar."
+msgid "Pick a square area of the image to be your avatar"
 msgstr ""
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
@@ -1660,7 +1649,7 @@ msgid "You may not backup your account."
 msgstr ""
 
 #. TRANS: Information displayed on the backup account page.
-#: actions/backupaccount.php:225
+#: actions/backupaccount.php:227
 msgid ""
 "You can backup your account data in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format. This is an experimental feature and provides "
@@ -1670,15 +1659,15 @@ msgid ""
 msgstr ""
 
 #. TRANS: Submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:248
+#: actions/backupaccount.php:250
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Backup"
 msgstr "الخلفية"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:252
-msgid "Backup your account."
+#: actions/backupaccount.php:254
+msgid "Backup your account"
 msgstr ""
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
@@ -1717,7 +1706,7 @@ msgstr "ملاحظة"
 #. TRANS: Submit button title for 'No' when blocking a user.
 #: actions/block.php:158
 #, fuzzy
-msgid "Do not block this user."
+msgid "Do not block this user"
 msgstr "لا تمنع هذا المستخدم"
 
 #. TRANS: Button label on the user block form.
@@ -1735,9 +1724,9 @@ msgid "Yes"
 msgstr "نعم"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:165
-#, fuzzy
-msgid "Block this user."
+#. TRANS: Description of the form to block a user.
+#: actions/block.php:165 lib/blockform.php:79
+msgid "Block this user"
 msgstr "امنع هذا المستخدم"
 
 #. TRANS: Server error displayed when blocking a user fails.
@@ -1904,7 +1893,7 @@ msgstr ""
 #. TRANS: Field label for delete account confirmation entry.
 #. TRANS: Field label for password reset form where the password has to be typed again.
 #: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:262 actions/register.php:426
+#: actions/recoverpassword.php:262 actions/register.php:440
 msgid "Confirm"
 msgstr "أكّد"
 
@@ -1935,14 +1924,14 @@ msgstr "لم يوجد رمز التأكيد."
 #. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
 #: actions/deleteapplication.php:79 actions/editapplication.php:78
-#: actions/showapplication.php:90
+#: actions/showapplication.php:94
 msgid "You are not the owner of this application."
 msgstr "انت مش بتملك الapplication دى."
 
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
-#: actions/newapplication.php:112 actions/showapplication.php:113
-#: lib/action.php:1422
+#: actions/newapplication.php:112 actions/showapplication.php:118
+#: lib/action.php:1425
 msgid "There was a problem with your session token."
 msgstr ""
 
@@ -1963,13 +1952,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting an application.
 #: actions/deleteapplication.php:161
 #, fuzzy
-msgid "Do not delete this application."
+msgid "Do not delete this application"
 msgstr "لا تحذف هذا الإشعار"
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
 #: actions/deleteapplication.php:167
 #, fuzzy
-msgid "Delete this application."
+msgid "Delete this application"
 msgstr "احذف هذا الإشعار"
 
 #. TRANS: Client error when trying to delete group while not logged in.
@@ -2025,13 +2014,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting a group.
 #: actions/deletegroup.php:224
 #, fuzzy
-msgid "Do not delete this group."
+msgid "Do not delete this group"
 msgstr "لا تحذف هذا الإشعار"
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
 #: actions/deletegroup.php:231
 #, fuzzy
-msgid "Delete this group."
+msgid "Delete this group"
 msgstr "احذف هذا المستخدم"
 
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
@@ -2039,15 +2028,13 @@ msgstr "احذف هذا المستخدم"
 #. TRANS: Client error displayed when trying to mark a notice as favorite without being logged in.
 #. TRANS: Client error displayed trying to block a user from a group while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
-#. TRANS: Client error displayed trying to log out when not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
-#. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
 #. TRANS: Client error displayed when trying to change user options while not logged in.
 #: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
-#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:70
+#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
-#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:98
+#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
 #: lib/adminpanelaction.php:71 lib/profileformaction.php:63
 #: lib/settingsaction.php:72
@@ -2075,13 +2062,12 @@ msgstr "أمتأكد من أنك تريد حذف هذا الإشعار؟"
 #. TRANS: Submit button title for 'No' when deleting a notice.
 #: actions/deletenotice.php:159
 #, fuzzy
-msgid "Do not delete this notice."
+msgid "Do not delete this notice"
 msgstr "لا تحذف هذا الإشعار"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:166
-#, fuzzy
-msgid "Delete this notice."
+#: actions/deletenotice.php:166 lib/noticelist.php:673
+msgid "Delete this notice"
 msgstr "احذف هذا الإشعار"
 
 #. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
@@ -2116,13 +2102,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting a user.
 #: actions/deleteuser.php:158
 #, fuzzy
-msgid "Do not delete this user."
+msgid "Do not delete this user"
 msgstr "لا تحذف هذا الإشعار"
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
-#: actions/deleteuser.php:165
-#, fuzzy
-msgid "Delete this user."
+#. TRANS: Description of form for deleting a user.
+#: actions/deleteuser.php:165 lib/deleteuserform.php:75
+msgid "Delete this user"
 msgstr "احذف هذا المستخدم"
 
 #. TRANS: Message used as title for design settings for the site.
@@ -2290,21 +2276,21 @@ msgid "Use defaults"
 msgstr "استخدم المبدئيات"
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:720
-#, fuzzy
-msgid "Restore default designs."
+#. TRANS: Title for button on profile design page to reset all colour settings to default.
+#: actions/designadminpanel.php:720 lib/designsettings.php:259
+msgid "Restore default designs"
 msgstr "استعد التصميمات المبدئية"
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:728
-#, fuzzy
-msgid "Reset back to default."
+#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
+#: actions/designadminpanel.php:728 lib/designsettings.php:267
+msgid "Reset back to default"
 msgstr "ارجع إلى المبدئي"
 
 #. TRANS: Title for button for saving theme settings.
-#: actions/designadminpanel.php:736
-#, fuzzy
-msgid "Save design."
+#. TRANS: Title for button on profile design page to save settings.
+#: actions/designadminpanel.php:736 lib/designsettings.php:272
+msgid "Save design"
 msgstr "احفظ التصميم"
 
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
@@ -2337,7 +2323,7 @@ msgid "You must be logged in to edit an application."
 msgstr "لازم يكون متسجل دخولك علشان تعدّل application."
 
 #. TRANS: Client error displayed trying to edit an application that does not exist.
-#: actions/editapplication.php:83 actions/showapplication.php:83
+#: actions/editapplication.php:83 actions/showapplication.php:87
 msgid "No such application."
 msgstr "ما فيش application زى كده."
 
@@ -2625,7 +2611,7 @@ msgid "Cannot normalize that email address."
 msgstr "عنوان البريد الإلكترونى المُؤكد الحالى."
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:393 actions/register.php:204
+#: actions/emailsettings.php:393 actions/register.php:212
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "ليس عنوان بريد صالح."
@@ -2702,23 +2688,20 @@ msgstr "لا عنوان بريد إلكترونى."
 
 #. 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.
 #: actions/emailsettings.php:530 actions/emailsettings.php:554
-#: actions/smssettings.php:566 actions/smssettings.php:591
+#: actions/smssettings.php:565 actions/smssettings.php:588
 #, fuzzy
 msgid "Could not update user record."
 msgstr "تعذّر تحديث المستخدم."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
-#. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:534 actions/smssettings.php:570
+#: actions/emailsettings.php:534 actions/smssettings.php:568
 #, fuzzy
 msgid "Incoming email address removed."
 msgstr "لا عنوان بريد إلكترونى."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
-#. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:558 actions/smssettings.php:595
+#: actions/emailsettings.php:558 actions/smssettings.php:591
 #, fuzzy
 msgid "New incoming email address added."
 msgstr "لا عنوان بريد إلكترونى."
@@ -2731,7 +2714,7 @@ msgstr "هذا الإشعار مفضله مسبقًا!"
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
 #: actions/favor.php:95
 #, fuzzy
-msgid "Disfavor favorite."
+msgid "Disfavor favorite"
 msgstr "ألغِ تفضيل المفضلة"
 
 #. TRANS: Page title for first page of favorited notices.
@@ -2971,13 +2954,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
 #: actions/groupblock.php:191
 #, fuzzy
-msgid "Do not block this user from this group."
+msgid "Do not block this user from this group"
 msgstr "لا تمنع هذا المستخدم من هذه المجموعة"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
 #: actions/groupblock.php:198
 #, fuzzy
-msgid "Block this user from this group."
+msgid "Block this user from this group"
 msgstr "امنع هذا المستخدم من هذه المجموعة"
 
 #. TRANS: Server error displayed when trying to block a user from a group fails because of an application error.
@@ -2986,7 +2969,6 @@ msgid "Database error blocking user from group."
 msgstr "خطأ فى قاعده البيانات أثناء منع المستخدم من المجموعه."
 
 #. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
-#. TRANS: Client error displayed trying to find a user by ID without providing an ID.
 #: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr "لا هويه."
@@ -3167,10 +3149,8 @@ msgid "Group search"
 msgstr "بحث فى المجموعات"
 
 #. TRANS: Text on page where groups can be searched if no results were found for a query.
-#. TRANS: Text for notice search results is the query had no results.
-#. TRANS: Message on the "People search" page where a query has no results.
-#: actions/groupsearch.php:82 actions/noticesearch.php:122
-#: actions/peoplesearch.php:87
+#: actions/groupsearch.php:82 actions/noticesearch.php:117
+#: actions/peoplesearch.php:83
 msgid "No results."
 msgstr "لا نتائج."
 
@@ -3203,7 +3183,6 @@ msgid "User is not blocked from group."
 msgstr "المستخدم ليس ممنوعًا من المجموعه."
 
 #. TRANS: Server error displayed when unblocking a user from a group fails because of an unknown error.
-#. TRANS: Server error displayed when removing a user block.
 #: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "خطأ أثناء منع الحجب."
@@ -3289,8 +3268,7 @@ msgid "Publish a MicroID for my Jabber/Google Talk address."
 msgstr "هذا ليس عنوان بريدك الإلكترونى."
 
 #. TRANS: Confirmation message for successful Instant Messaging preferences save.
-#. TRANS: Confirmation message after saving preferences.
-#: actions/imsettings.php:283 actions/othersettings.php:193
+#: actions/imsettings.php:283 actions/othersettings.php:192
 msgid "Preferences saved."
 msgstr "حُفِظت التفضيلات."
 
@@ -3566,7 +3544,7 @@ msgstr "يجب أن تكون والجًا لتنشئ مجموعه."
 
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
-#: actions/leavegroup.php:103 lib/command.php:386
+#: actions/leavegroup.php:103 lib/command.php:398
 msgid "You are not a member of that group."
 msgstr "لست عضوا فى تلك المجموعه."
 
@@ -3689,52 +3667,50 @@ msgstr "أرسل"
 msgid "Save license settings"
 msgstr ""
 
-#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
-#: actions/login.php:97 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
 msgid "Already logged in."
 msgstr "والج بالفعل."
 
-#: actions/login.php:142
+#: actions/login.php:148
 msgid "Incorrect username or password."
 msgstr "اسم المستخدم أو كلمه السر غير صحيحان."
 
-#. TRANS: Server error displayed when a user object could not be created trying to login using "one time password login".
-#: actions/login.php:148 actions/otp.php:127
+#: actions/login.php:154 actions/otp.php:120
 msgid "Error setting user. You are probably not authorized."
 msgstr "خطأ أثناء ضبط المستخدم. لست مُصرحًا على الأرجح."
 
-#: actions/login.php:202 actions/login.php:253
+#: actions/login.php:210 actions/login.php:263
 msgid "Login"
 msgstr "لُج"
 
-#: actions/login.php:239
+#: actions/login.php:249
 msgid "Login to site"
 msgstr "لُج إلى الموقع"
 
-#: actions/login.php:248 actions/register.php:476
+#: actions/login.php:258 actions/register.php:490
 msgid "Remember me"
 msgstr "تذكّرني"
 
-#: actions/login.php:249 actions/register.php:478
+#: actions/login.php:259 actions/register.php:492
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 
-#: actions/login.php:259
+#: actions/login.php:269
 msgid "Lost or forgotten password?"
 msgstr "أنسيت كلمه السر؟"
 
-#: actions/login.php:277
+#: actions/login.php:288
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
 msgstr ""
 
-#: actions/login.php:281
+#: actions/login.php:292
 #, fuzzy
 msgid "Login with your username and password."
 msgstr "اسم المستخدم أو كلمه السر غير صحيحان."
 
-#: actions/login.php:284
+#: actions/login.php:295
 #, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -3816,15 +3792,15 @@ msgid "New message"
 msgstr "رساله جديدة"
 
 #. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
-#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:501
+#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:513
 #, fuzzy
 msgid "You can't send a message to this user."
 msgstr "أرسل رساله مباشره إلى هذا المستخدم"
 
 #. TRANS: Command exception text shown when trying to send a direct message to another user without content.
 #. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
-#: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:478
-#: lib/command.php:581
+#: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:490
+#: lib/command.php:593
 msgid "No content!"
 msgstr "لا محتوى!"
 
@@ -3833,7 +3809,7 @@ msgid "No recipient specified."
 msgstr "لا مستلم حُدّد."
 
 #. TRANS: Error text shown when trying to send a direct message to self.
-#: actions/newmessage.php:167 lib/command.php:505
+#: actions/newmessage.php:167 lib/command.php:517
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
@@ -3844,7 +3820,7 @@ msgstr "أُرسلت الرسالة"
 
 #. TRANS: Message given have sent a direct message to another user.
 #. TRANS: %s is the name of the other user.
-#: actions/newmessage.php:188 lib/command.php:513
+#: actions/newmessage.php:188 lib/command.php:525
 #, php-format
 msgid "Direct message to %s sent."
 msgstr "رساله مباشره اتبعتت لـ%s."
@@ -3861,56 +3837,44 @@ msgstr "إشعار جديد"
 msgid "Notice posted"
 msgstr "أُرسل الإشعار"
 
-#. TRANS: Instructions for Notice search page.
-#. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/noticesearch.php:69
+#: actions/noticesearch.php:68
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
 "by spaces; they must be 3 characters or more."
 msgstr ""
 
-#. TRANS: Title of the page where users can search for notices.
-#: actions/noticesearch.php:80
+#: actions/noticesearch.php:78
 msgid "Text search"
 msgstr "بحث فى النصوص"
 
-#. TRANS: Test in RSS notice search.
-#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearch.php:95
+#: actions/noticesearch.php:91
 #, php-format
 msgid "Search results for \"%1$s\" on %2$s"
 msgstr "نتايج التدوير لـ\"%1$s\" على %2$s"
 
-#. TRANS: Text for logged in users making a query for notices without results.
-#. TRANS: This message contains a Markdown link.
-#: actions/noticesearch.php:128
+#: actions/noticesearch.php:121
 #, php-format
 msgid ""
 "Be the first to [post on this topic](%%%%action.newnotice%%%%?"
 "status_textarea=%s)!"
 msgstr ""
 
-#. TRANS: Text for not logged in users making a query for notices without results.
-#. TRANS: This message contains Markdown links.
-#: actions/noticesearch.php:133
+#: actions/noticesearch.php:124
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and be the first to "
 "[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
 msgstr ""
 
-#. TRANS: RSS notice search feed title. %s is the query.
-#: actions/noticesearchrss.php:95
+#: actions/noticesearchrss.php:96
 #, php-format
 msgid "Updates with \"%s\""
 msgstr ""
 
-#. TRANS: RSS notice search feed description.
-#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearchrss.php:99
+#: actions/noticesearchrss.php:98
 #, fuzzy, php-format
-msgid "Updates matching search term \"%1$s\" on %2$s."
+msgid "Updates matching search term \"%1$s\" on %2$s!"
 msgstr "الإشعارات الموسومه ب%s"
 
 #: actions/nudge.php:85
@@ -3949,31 +3913,31 @@ msgid "You have not registered any applications yet."
 msgstr "لازم تكون مسجل دخوللك علشان تسجل application."
 
 #. TRANS: Title for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:70
+#: actions/oauthconnectionssettings.php:71
 #, fuzzy
 msgid "Connected applications"
 msgstr "مش ممكن إنشاء الapplication."
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:81
+#: actions/oauthconnectionssettings.php:83
 msgid "The following connections exist for your account."
 msgstr ""
 
 #. TRANS: Client error when trying to revoke access for an application while not being a user of it.
-#: actions/oauthconnectionssettings.php:166
+#: actions/oauthconnectionssettings.php:168
 msgid "You are not a user of that application."
 msgstr "انت مش يوزر للapplication دى."
 
 #. TRANS: Client error when revoking access has failed for some reason.
 #. TRANS: %s is the application ID revoking access failed for.
-#: actions/oauthconnectionssettings.php:181
+#: actions/oauthconnectionssettings.php:183
 #, fuzzy, php-format
 msgid "Unable to revoke access for application: %s."
 msgstr "استعمل الفورمه دى علشان تعدّل الapplication بتاعتك."
 
 #. TRANS: Success message after revoking access for an application.
 #. TRANS: %1$s is the application name, %2$s is the first part of the user token.
-#: actions/oauthconnectionssettings.php:200
+#: actions/oauthconnectionssettings.php:202
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -3981,30 +3945,20 @@ msgid ""
 msgstr ""
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:211
+#: actions/oauthconnectionssettings.php:213
 msgid "You have not authorized any applications to use your account."
 msgstr ""
 
 #. TRANS: Note for developers in the OAuth connection settings form.
 #. TRANS: This message contains a Markdown link. Do not separate "](".
 #. TRANS: %s is the URL to the OAuth settings.
-#: actions/oauthconnectionssettings.php:231
+#: actions/oauthconnectionssettings.php:233
 #, php-format
 msgid ""
 "Are you a developer? [Register an OAuth client application](%s) to use with "
 "this instance of StatusNet."
 msgstr ""
 
-#: actions/oembed.php:64
-#, fuzzy, php-format
-msgid "\"%s\" not found."
-msgstr "الـ API method مش موجوده."
-
-#: actions/oembed.php:76
-#, fuzzy, php-format
-msgid "Notice %s not found."
-msgstr "الـ API method مش موجوده."
-
 #: actions/oembed.php:80 actions/shownotice.php:100
 #, fuzzy
 msgid "Notice has no profile."
@@ -4015,16 +3969,6 @@ msgstr "ليس للمستخدم ملف شخصى."
 msgid "%1$s's status on %2$s"
 msgstr "%1$s ساب جروپ %2$s"
 
-#: actions/oembed.php:95
-#, fuzzy, php-format
-msgid "Attachment %s not found."
-msgstr "لم يُعثر على المستخدم المستلم."
-
-#: actions/oembed.php:136
-#, php-format
-msgid "\"%s\" not supported for oembed requests."
-msgstr ""
-
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
 #: actions/oembed.php:168
 #, fuzzy, php-format
@@ -4043,12 +3987,11 @@ msgstr ""
 msgid "Not a supported data format."
 msgstr " مش نظام بيانات مدعوم."
 
-#. TRANS: ShortName in the OpenSearch interface when trying to find users.
 #: actions/opensearch.php:64
 msgid "People Search"
 msgstr "تدوير فى الأشخاص"
 
-#: actions/opensearch.php:68
+#: actions/opensearch.php:67
 msgid "Notice Search"
 msgstr "بحث الإشعارات"
 
@@ -4096,46 +4039,37 @@ msgstr "أظهر أو أخفِ تصاميم الملفات الشخصيه."
 msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr "الاسم الكامل طويل جدا (الأقصى 255 حرفًا)"
 
-#. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
-#: actions/otp.php:70
+#: actions/otp.php:69
 msgid "No user ID specified."
 msgstr "ما فيش ID متحدد لليوزر."
 
-#. TRANS: Client error displayed trying to use "one time password login" without specifying a login token.
-#: actions/otp.php:86
+#: actions/otp.php:83
 msgid "No login token specified."
 msgstr "ما فيش امارة دخول متحدده."
 
-#. TRANS: Client error displayed trying to use "one time password login" without requesting a login token.
-#: actions/otp.php:94
+#: actions/otp.php:90
 msgid "No login token requested."
 msgstr "ما فيش طلب تسجيل دخول مطلوب."
 
-#. TRANS: Client error displayed trying to use "one time password login" while specifying an invalid login token.
-#: actions/otp.php:100
+#: actions/otp.php:95
 msgid "Invalid login token specified."
 msgstr "امارة تسجيل الدخول اللى اتحطت مش موجوده."
 
-#. TRANS: Client error displayed trying to use "one time password login" while specifying an expired login token.
-#: actions/otp.php:110
+#: actions/otp.php:104
 msgid "Login token expired."
 msgstr "تاريخ صلاحية الاماره خلص."
 
-#. TRANS: Title for outbox for any but the fist page.
-#. TRANS: %1$s is the user nickname, %2$d is the page number.
-#: actions/outbox.php:57
+#: actions/outbox.php:58
 #, php-format
 msgid "Outbox for %1$s - page %2$d"
 msgstr ""
 
-#. TRANS: Title for first page of outbox.
 #: actions/outbox.php:61
 #, fuzzy, php-format
 msgid "Outbox for %s"
 msgstr "صندوق الصادر"
 
-#. TRANS: Instructions for outbox.
-#: actions/outbox.php:103
+#: actions/outbox.php:104
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr ""
 
@@ -4161,45 +4095,43 @@ msgstr "كلمه السر القديمة"
 msgid "New password"
 msgstr "كلمه سر جديدة"
 
-#: actions/passwordsettings.php:109 actions/register.php:423
+#: actions/passwordsettings.php:109
 #, fuzzy
-msgid "6 or more characters."
+msgid "6 or more characters"
 msgstr "6 حروف أو أكثر. مطلوب."
 
-#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:264
-#: actions/register.php:427
+#: actions/passwordsettings.php:113
 #, fuzzy
-msgid "Same as password above."
+msgid "Same as password above"
 msgstr "نفس كلمه السر أعلاه"
 
 #: actions/passwordsettings.php:117
 msgid "Change"
 msgstr "غيّر"
 
-#: actions/passwordsettings.php:153 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:238
 msgid "Password must be 6 or more characters."
 msgstr "يجب أن تكون كلمه السر 6 حروف أو أكثر."
 
-#: actions/passwordsettings.php:156 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:241
 msgid "Passwords don't match."
 msgstr "كلمتا السر غير متطابقتين."
 
-#: actions/passwordsettings.php:164
+#: actions/passwordsettings.php:165
 msgid "Incorrect old password"
 msgstr "كلمه السر القديمه غير صحيحة"
 
-#: actions/passwordsettings.php:180
+#: actions/passwordsettings.php:181
 msgid "Error saving user; invalid."
 msgstr "خطأ أثناء حفظ المستخدم؛ غير صالح."
 
-#. TRANS: Reset password form validation error message.
-#: actions/passwordsettings.php:185 actions/recoverpassword.php:418
+#: actions/passwordsettings.php:186
 #, fuzzy
-msgid "Cannot save new password."
+msgid "Can't save new password."
 msgstr "تعذّر حفظ كلمه السر الجديده."
 
-#: actions/passwordsettings.php:191
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
 msgid "Password saved."
 msgstr "حُفظت كلمه السر."
 
@@ -4490,17 +4422,14 @@ msgstr ""
 msgid "Save paths"
 msgstr "احفظ المسارات"
 
-#. TRANS: Instructions for the "People search" page.
-#. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/peoplesearch.php:54
+#: actions/peoplesearch.php:52
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
 "Separate the terms by spaces; they must be 3 characters or more."
 msgstr ""
 
-#. TRANS: Title of a page where users can search for other users.
-#: actions/peoplesearch.php:61
+#: actions/peoplesearch.php:58
 msgid "People search"
 msgstr "بحث فى الأشخاص"
 
@@ -4540,14 +4469,14 @@ msgid "Profile information"
 msgstr "معلومات الملف الشخصي"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109 actions/register.php:419
+#: actions/profilesettings.php:109 actions/register.php:433
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr ""
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for full group name (dt). Text hidden by default.
 #. TRANS: DT for full name in a profile.
-#: actions/profilesettings.php:113 actions/register.php:441
+#: actions/profilesettings.php:113 actions/register.php:455
 #: actions/showgroup.php:255 actions/tagother.php:104
 #: lib/groupeditform.php:150 lib/userprofile.php:156
 msgid "Full name"
@@ -4555,20 +4484,20 @@ msgstr "الاسم الكامل"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:118 actions/register.php:446
+#: actions/profilesettings.php:118 actions/register.php:460
 #: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "الصفحه الرئيسية"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:121 actions/register.php:448
+#: actions/profilesettings.php:121
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr ""
 
 #. TRANS: Tooltip for field label in form for profile settings. Plural
 #. TRANS: is decided by the number of characters available for the
 #. TRANS: biography (%d).
-#: actions/profilesettings.php:129 actions/register.php:457
+#: actions/profilesettings.php:129 actions/register.php:471
 #, fuzzy, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4580,29 +4509,28 @@ msgstr[4] "صِف نفسك واهتماماتك"
 msgstr[5] "صِف نفسك واهتماماتك"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:135 actions/register.php:462
+#: actions/profilesettings.php:135 actions/register.php:476
 msgid "Describe yourself and your interests"
 msgstr "صِف نفسك واهتماماتك"
 
 #. TRANS: Text area label in form for profile settings where users can provide.
 #. TRANS: their biography.
-#: actions/profilesettings.php:139 actions/register.php:464
+#: actions/profilesettings.php:139 actions/register.php:478
 msgid "Bio"
 msgstr "السيرة"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group location (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT for location in a profile.
-#: actions/profilesettings.php:145 actions/register.php:469
+#: actions/profilesettings.php:145 actions/register.php:483
 #: actions/showgroup.php:265 actions/tagother.php:112
-#: actions/userauthorization.php:174 lib/groupeditform.php:173
+#: actions/userauthorization.php:166 lib/groupeditform.php:173
 #: lib/userprofile.php:172
 msgid "Location"
 msgstr "الموقع"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148
+#: actions/profilesettings.php:148 actions/register.php:485
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr ""
 
@@ -4622,8 +4550,7 @@ msgstr "الوسوم"
 #. TRANS: Tooltip for field label in form for profile settings.
 #: actions/profilesettings.php:164
 msgid ""
-"Tags for yourself (letters, numbers, -, ., and _), comma- or space- "
-"separated."
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr ""
 
 #. TRANS: Dropdownlist label in form for profile settings.
@@ -4634,7 +4561,7 @@ msgstr "اللغة"
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
 #: actions/profilesettings.php:171
 #, fuzzy
-msgid "Preferred language."
+msgid "Preferred language"
 msgstr "اللغه المفضلة"
 
 #. TRANS: Dropdownlist label in form for profile settings.
@@ -4651,13 +4578,13 @@ msgstr "ما المنطقه الزمنيه التى تتواجد فيها عاد
 #: actions/profilesettings.php:189
 #, fuzzy
 msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)."
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr "أشرك المستخدمين الجدد بهذا المستخدم تلقائيًا."
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Plural form is used based on the maximum number of allowed
 #. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:258 actions/register.php:221
+#: actions/profilesettings.php:258 actions/register.php:229
 #, fuzzy, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4681,9 +4608,9 @@ msgstr "الاسم طويل جدا (اكتر حاجه 255 رمز)."
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:291
-#, fuzzy, php-format
-msgid "Invalid tag: \"%s\"."
+#: actions/profilesettings.php:291 actions/tagother.php:178
+#, php-format
+msgid "Invalid tag: \"%s\""
 msgstr "وسم غير صالح: \"%s\""
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
@@ -4788,12 +4715,6 @@ msgstr ""
 "هنا %%site.name%%، خدمه [التدوين المُصغّر](http://en.wikipedia.org/wiki/Micro-"
 "blogging) المبنيه على البرنامج الحر [StatusNet](http://status.net/)."
 
-#. TRANS: Public RSS feed description. %s is the StatusNet site name.
-#: actions/publicrss.php:106
-#, php-format
-msgid "%s updates from everyone."
-msgstr ""
-
 #. TRANS: Title for public tag cloud.
 #: actions/publictagcloud.php:57
 msgid "Public tag cloud"
@@ -4926,12 +4847,6 @@ msgstr "استعد كلمه السر"
 msgid "Password recovery requested"
 msgstr "طُلبت استعاده كلمه السر"
 
-#. TRANS: Title for password recovery page in password saved mode.
-#: actions/recoverpassword.php:229
-#, fuzzy
-msgid "Password saved"
-msgstr "حُفظت كلمه السر."
-
 #. TRANS: Title for password recovery page when an unknown action has been specified.
 #: actions/recoverpassword.php:232
 msgid "Unknown action"
@@ -4943,6 +4858,12 @@ msgstr "إجراء غير معروف"
 msgid "6 or more characters, and do not forget it!"
 msgstr "6 حروف أو أكثر. مطلوب."
 
+#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#: actions/recoverpassword.php:264 actions/register.php:441
+#, fuzzy
+msgid "Same as password above."
+msgstr "نفس كلمه السر أعلاه"
+
 #. TRANS: Button text for password reset form.
 #. TRANS: Button text on profile design page to reset all colour settings to default without saving.
 #: actions/recoverpassword.php:268 lib/designsettings.php:264
@@ -4998,8 +4919,14 @@ msgstr "يجب أن تكون كلمه السر 6 محارف أو أكثر."
 msgid "Password and confirmation do not match."
 msgstr "كلمتا السر غير متطابقتين."
 
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:418
+#, fuzzy
+msgid "Cannot save new password."
+msgstr "تعذّر حفظ كلمه السر الجديده."
+
 #. TRANS: Server error displayed when something does wrong with the user object during password reset.
-#: actions/recoverpassword.php:426 actions/register.php:248
+#: actions/recoverpassword.php:426 actions/register.php:256
 msgid "Error setting user."
 msgstr "خطأ أثناء ضبط المستخدم."
 
@@ -5008,93 +4935,99 @@ msgstr "خطأ أثناء ضبط المستخدم."
 msgid "New password successfully saved. You are now logged in."
 msgstr ""
 
-#: actions/register.php:87 actions/register.php:188 actions/register.php:399
+#: actions/register.php:92 actions/register.php:196 actions/register.php:413
 msgid "Sorry, only invited people can register."
 msgstr "عذرًا، الأشخاص المدعوون وحدهم يستطيعون التسجيل."
 
-#: actions/register.php:94
+#: actions/register.php:99
 msgid "Sorry, invalid invitation code."
 msgstr "عذرا، رمز دعوه غير صالح."
 
-#: actions/register.php:113
+#: actions/register.php:119
 msgid "Registration successful"
 msgstr "نجح التسجيل"
 
-#: actions/register.php:115 actions/register.php:497
+#: actions/register.php:121 actions/register.php:511
 msgid "Register"
 msgstr "سجّل"
 
-#: actions/register.php:135
+#: actions/register.php:142
 msgid "Registration not allowed."
 msgstr "لا يُسمح بالتسجيل."
 
-#: actions/register.php:201
+#: actions/register.php:209
 #, fuzzy
-msgid "You cannot register if you don't agree to the license."
+msgid "You can't register if you don't agree to the license."
 msgstr "ما ينفعش تكرر الملاحظه بتاعتك."
 
-#: actions/register.php:210
+#: actions/register.php:218
 msgid "Email address already exists."
 msgstr "عنوان البريد الإلكترونى موجود مسبقًا."
 
-#: actions/register.php:243 actions/register.php:265
+#: actions/register.php:251 actions/register.php:273
 msgid "Invalid username or password."
 msgstr "اسم مستخدم أو كلمه سر غير صالحه."
 
-#: actions/register.php:340
+#: actions/register.php:351
 msgid ""
 "With this form you can create a new account. You can then post notices and "
-"link up to friends and colleagues."
+"link up to friends and colleagues. "
 msgstr ""
 
+#: actions/register.php:437
+#, fuzzy
+msgid "6 or more characters."
+msgstr "6 حروف أو أكثر. مطلوب."
+
 #. TRANS: Link description in user account settings menu.
-#: actions/register.php:431 actions/register.php:435
+#: actions/register.php:445 actions/register.php:449
 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
 msgid "Email"
 msgstr "البريد الإلكتروني"
 
-#: actions/register.php:432 actions/register.php:436
-msgid "Used only for updates, announcements, and password recovery."
+#: actions/register.php:446 actions/register.php:450
+msgid "Used only for updates, announcements, and password recovery"
 msgstr ""
 
-#: actions/register.php:443
-msgid "Longer name, preferably your \"real\" name."
+#: actions/register.php:457
+msgid "Longer name, preferably your \"real\" name"
 msgstr ""
 
-#: actions/register.php:471
-msgid "Where you are, like \"City, State (or Region), Country\"."
-msgstr ""
+#: actions/register.php:462
+#, fuzzy
+msgid "URL of your homepage, blog, or profile on another site"
+msgstr "انت مش بتملك الapplication دى."
 
-#: actions/register.php:510
+#: actions/register.php:523
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
 msgstr ""
 
-#: actions/register.php:520
+#: actions/register.php:533
 #, php-format
 msgid "My text and files are copyright by %1$s."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:524
+#: actions/register.php:537
 msgid "My text and files remain under my own copyright."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:527
+#: actions/register.php:540
 msgid "All rights reserved."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:532
+#: actions/register.php:545
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
 "email address, IM address, and phone number."
 msgstr ""
 
-#: actions/register.php:573
+#: actions/register.php:588
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -5113,7 +5046,7 @@ msgid ""
 "Thanks for signing up and we hope you enjoy using this service."
 msgstr ""
 
-#: actions/register.php:597
+#: actions/register.php:612
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5140,7 +5073,7 @@ msgid "User nickname"
 msgstr "اسم المستخدم المستعار"
 
 #: actions/remotesubscribe.php:129
-msgid "Nickname of the user you want to follow."
+msgid "Nickname of the user you want to follow"
 msgstr ""
 
 #: actions/remotesubscribe.php:132
@@ -5148,7 +5081,7 @@ msgid "Profile URL"
 msgstr "مسار الملف الشخصي"
 
 #: actions/remotesubscribe.php:133
-msgid "URL of your profile on another compatible microblogging service."
+msgid "URL of your profile on another compatible microblogging service"
 msgstr ""
 
 #. TRANS: Link text for link that will subscribe to a remote profile.
@@ -5159,7 +5092,7 @@ msgstr "اشترك"
 
 #: actions/remotesubscribe.php:158
 #, fuzzy
-msgid "Invalid profile URL (bad format)."
+msgid "Invalid profile URL (bad format)"
 msgstr "حجم غير صالح."
 
 #: actions/remotesubscribe.php:167
@@ -5201,7 +5134,6 @@ msgstr "مكرر"
 msgid "Repeated!"
 msgstr "مكرر!"
 
-#. TRANS: RSS reply feed title. %s is a user nickname.
 #. TRANS: Tooltip for personal group navigation menu option when logged in for viewing @-replies.
 #: actions/replies.php:126 actions/repliesrss.php:68
 #: lib/personalgroupnav.php:109
@@ -5250,11 +5182,9 @@ msgid ""
 "newnotice%%%%?status_textarea=%3$s)."
 msgstr ""
 
-#. TRANS: RSS reply feed description.
-#. TRANS: %1$s is a user nickname, %2$s is the StatusNet site name.
-#: actions/repliesrss.php:74
+#: actions/repliesrss.php:72
 #, fuzzy, php-format
-msgid "Replies to %1$s on %2$s."
+msgid "Replies to %1$s on %2$s!"
 msgstr "أهلا بكم فى %1$s يا @%2$s!"
 
 #. TRANS: Client exception displayed when trying to restore an account while not logged in.
@@ -5356,7 +5286,7 @@ msgstr "لا يمكنك إسكات المستخدمين على هذا الموق
 msgid "User doesn't have this role."
 msgstr "يوزر من-غير پروفايل زيّه."
 
-#: actions/rsd.php:142 actions/version.php:159
+#: actions/rsd.php:146 actions/version.php:159
 msgid "StatusNet"
 msgstr "StatusNet"
 
@@ -5401,95 +5331,95 @@ msgstr "مكّن تنقيح مُخرجات الجلسه."
 msgid "Save site settings"
 msgstr "اذف إعدادت الموقع"
 
-#: actions/showapplication.php:78
+#: actions/showapplication.php:82
 msgid "You must be logged in to view an application."
 msgstr "لازم تكون مسجل دخولك علشان تشوف اى application."
 
-#: actions/showapplication.php:151
+#: actions/showapplication.php:157
 msgid "Application profile"
 msgstr ""
 
 #. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:153 lib/applicationeditform.php:177
+#: actions/showapplication.php:159 lib/applicationeditform.php:177
 msgid "Icon"
 msgstr ""
 
 #. TRANS: Form input field label for application name.
-#: actions/showapplication.php:163 actions/version.php:197
+#: actions/showapplication.php:169 actions/version.php:197
 #: lib/applicationeditform.php:190
 msgid "Name"
 msgstr "الاسم"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:172 lib/applicationeditform.php:227
+#: actions/showapplication.php:178 lib/applicationeditform.php:227
 msgid "Organization"
 msgstr "المنظمه"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:181 actions/version.php:200
+#: actions/showapplication.php:187 actions/version.php:200
 #: lib/applicationeditform.php:208 lib/groupeditform.php:168
 msgid "Description"
 msgstr "الوصف"
 
 #. TRANS: Header for group statistics on a group page (h2).
 #. TRANS: H2 text for user statistics.
-#: actions/showapplication.php:186 actions/showgroup.php:460
+#: actions/showapplication.php:192 actions/showgroup.php:460
 #: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "إحصاءات"
 
-#: actions/showapplication.php:197
+#: actions/showapplication.php:203
 #, php-format
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr ""
 
-#: actions/showapplication.php:207
+#: actions/showapplication.php:213
 #, fuzzy
 msgid "Application actions"
 msgstr "OAuth applications"
 
-#: actions/showapplication.php:230
+#: actions/showapplication.php:236
 msgid "Reset key & secret"
 msgstr ""
 
 #. TRANS: Title of form for deleting a user.
-#: actions/showapplication.php:246 lib/deletegroupform.php:121
+#: actions/showapplication.php:252 lib/deletegroupform.php:121
 #: lib/deleteuserform.php:64 lib/noticelist.php:673
 msgid "Delete"
 msgstr "احذف"
 
-#: actions/showapplication.php:255
+#: actions/showapplication.php:261
 #, fuzzy
 msgid "Application info"
 msgstr "OAuth applications"
 
-#: actions/showapplication.php:257
+#: actions/showapplication.php:263
 msgid "Consumer key"
 msgstr ""
 
-#: actions/showapplication.php:262
+#: actions/showapplication.php:268
 msgid "Consumer secret"
 msgstr ""
 
-#: actions/showapplication.php:267
+#: actions/showapplication.php:273
 msgid "Request token URL"
 msgstr ""
 
-#: actions/showapplication.php:272
+#: actions/showapplication.php:278
 msgid "Access token URL"
 msgstr ""
 
-#: actions/showapplication.php:277
+#: actions/showapplication.php:283
 msgid "Authorize URL"
 msgstr "اسمح للURL"
 
-#: actions/showapplication.php:282
+#: actions/showapplication.php:288
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
 msgstr ""
 
-#: actions/showapplication.php:302
+#: actions/showapplication.php:309
 #, fuzzy
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr "أمتأكد من أنك تريد حذف هذا الإشعار؟"
@@ -5580,18 +5510,16 @@ msgid "Group profile"
 msgstr "ملف المجموعه الشخصي"
 
 #. TRANS: Label for group URL (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT for URL in a profile.
 #: actions/showgroup.php:273 actions/tagother.php:118
-#: actions/userauthorization.php:184 lib/userprofile.php:186
+#: actions/userauthorization.php:175 lib/userprofile.php:186
 msgid "URL"
 msgstr "مسار"
 
 #. TRANS: Label for group description or group note (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page where bio is displayed.
 #. TRANS: DT for note in a profile.
 #: actions/showgroup.php:285 actions/tagother.php:128
-#: actions/userauthorization.php:197 lib/userprofile.php:204
+#: actions/userauthorization.php:187 lib/userprofile.php:204
 msgid "Note"
 msgstr "ملاحظة"
 
@@ -5736,7 +5664,7 @@ msgid "%1$s tagged %2$s"
 msgstr "%1$s و الصحاب, صفحه %2$d"
 
 #. TRANS: Page title showing tagged notices in one user's stream.
-#. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
+#. TRANS: %1$s is the username, %2$s is the hash tag, %1$d is the page number.
 #: actions/showstream.php:74
 #, fuzzy, php-format
 msgid "%1$s tagged %2$s, page %3$d"
@@ -5982,7 +5910,7 @@ msgstr ""
 #. TRANS: Title for button to save site notice in admin panel.
 #: actions/sitenoticeadminpanel.php:201
 #, fuzzy
-msgid "Save site notice."
+msgid "Save site notice"
 msgstr "إشعار الموقع"
 
 #. TRANS: Title for SMS settings.
@@ -6044,7 +5972,7 @@ msgstr "نمرة تليفون الـSMS"
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
 #: actions/smssettings.php:152
-msgid "Phone number, no punctuation or spaces, with area code."
+msgid "Phone number, no punctuation or spaces, with area code"
 msgstr ""
 
 #. TRANS: Form legend for SMS preferences form.
@@ -6216,19 +6144,15 @@ msgstr "لست مُشتركًا بأى أحد."
 msgid "Could not save subscription."
 msgstr "تعذّر حفظ الاشتراك."
 
-#. TRANS: Client error displayed trying to perform any request method other than POST.
-#. TRANS: Do not translate POST.
 #: actions/subscribe.php:77
 msgid "This action only accepts POST requests."
 msgstr ""
 
-#. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
-#: actions/subscribe.php:121
+#: actions/subscribe.php:117
 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
 msgstr ""
 
-#. TRANS: Page title when subscription succeeded.
-#: actions/subscribe.php:149
+#: actions/subscribe.php:145
 msgid "Subscribed"
 msgstr "مُشترك"
 
@@ -6378,9 +6302,8 @@ msgstr "الوسوم"
 msgid "User profile"
 msgstr "ملف المستخدم الشخصي"
 
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT element in area for user avatar.
-#: actions/tagother.php:81 actions/userauthorization.php:138
+#: actions/tagother.php:81 actions/userauthorization.php:132
 #: lib/userprofile.php:108
 msgid "Photo"
 msgstr "صورة"
@@ -6395,11 +6318,6 @@ msgid ""
 "separated"
 msgstr ""
 
-#: actions/tagother.php:178
-#, php-format
-msgid "Invalid tag: \"%s\""
-msgstr "وسم غير صالح: \"%s\""
-
 #: actions/tagother.php:193
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
@@ -6414,7 +6332,6 @@ msgstr "استعمل الفورمه دى علشان تعدّل الapplication 
 msgid "No such tag."
 msgstr "لا وسم كهذا."
 
-#. TRANS: Client error displayed when trying to unblock a non-blocked user.
 #: actions/unblock.php:59
 msgid "You haven't blocked that user."
 msgstr "لم تمنع هذا المستخدم."
@@ -6437,7 +6354,7 @@ msgstr "ما فيش طلب تسجيل دخول مطلوب."
 msgid "Unsubscribed"
 msgstr "ألغِ الاشتراك"
 
-#: actions/updateprofile.php:64
+#: actions/updateprofile.php:64 actions/userauthorization.php:337
 #, php-format
 msgid ""
 "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
@@ -6470,7 +6387,7 @@ msgstr "رساله ترحيب غير صالحه. أقصى طول هو 255 حرف
 #. TRANS: users in user admin panel. %1$s is the invalid nickname.
 #: actions/useradminpanel.php:166
 #, php-format
-msgid "Invalid default subscripton: \"%1$s\" is not a user."
+msgid "Invalid default subscripton: '%1$s' is not a user."
 msgstr ""
 
 #. TRANS: Link description in user account settings menu.
@@ -6532,142 +6449,107 @@ msgstr ""
 #. TRANS: Title for button to save user settings in user admin panel.
 #: actions/useradminpanel.php:302
 #, fuzzy
-msgid "Save user settings."
+msgid "Save user settings"
 msgstr "اذف إعدادت الموقع"
 
-#. TRANS: Page title.
-#: actions/userauthorization.php:109
+#: actions/userauthorization.php:105
 #, fuzzy
 msgid "Authorize subscription"
 msgstr "جميع الاشتراكات"
 
-#. TRANS: Page notice on "Auhtorize subscription" page.
-#: actions/userauthorization.php:115
+#: actions/userauthorization.php:110
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
 "user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
-"click \"Reject\"."
+"click “Reject”."
 msgstr ""
 
-#. TRANS: DT element on Authorise Subscription page where license is displayed.
 #. TRANS: Menu item for site administration
-#: actions/userauthorization.php:207 actions/version.php:167
+#: actions/userauthorization.php:196 actions/version.php:167
 #: lib/adminpanelaction.php:403
 msgid "License"
 msgstr "الرخصة"
 
-#. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:229
+#: actions/userauthorization.php:217
 #, fuzzy
-msgctxt "BUTTON"
 msgid "Accept"
 msgstr "اقبل"
 
-#. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:231
-#, fuzzy
-msgid "Subscribe to this user."
+#: actions/userauthorization.php:218 lib/subscribeform.php:115
+#: lib/subscribeform.php:139
+msgid "Subscribe to this user"
 msgstr "اشترك بهذا المستخدم"
 
-#. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:233
+#: actions/userauthorization.php:219
 #, fuzzy
-msgctxt "BUTTON"
 msgid "Reject"
 msgstr "ارفض"
 
-#. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:235
+#: actions/userauthorization.php:220
 #, fuzzy
-msgid "Reject this subscription."
+msgid "Reject this subscription"
 msgstr "ارفض هذا الاشتراك"
 
-#. TRANS: Client error displayed for an empty authorisation request.
-#: actions/userauthorization.php:248
+#: actions/userauthorization.php:232
 msgid "No authorization request!"
 msgstr "لا طلب استيثاق!"
 
-#. TRANS: Accept message header from Authorise subscription page.
-#: actions/userauthorization.php:271
+#: actions/userauthorization.php:254
 #, fuzzy
 msgid "Subscription authorized"
 msgstr "رُفض الاشتراك"
 
-#: actions/userauthorization.php:274
+#: actions/userauthorization.php:256
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to authorize the "
 "subscription. Your subscription token is:"
 msgstr ""
 
-#. TRANS: Reject message header from Authorise subscription page.
-#: actions/userauthorization.php:285
+#: actions/userauthorization.php:266
 msgid "Subscription rejected"
 msgstr "رُفض الاشتراك"
 
-#: actions/userauthorization.php:288
+#: actions/userauthorization.php:268
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to fully reject the "
 "subscription."
 msgstr ""
 
-#. TRANS: Exception thrown when no valid user is found for an authorisation request.
-#. TRANS: %s is a listener URI.
-#: actions/userauthorization.php:325
+#: actions/userauthorization.php:303
 #, php-format
-msgid "Listener URI \"%s\" not found here."
+msgid "Listener URI ‘%s’ not found here."
 msgstr ""
 
-#. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:332
+#: actions/userauthorization.php:308
 #, fuzzy, php-format
-msgid "Listenee URI \"%s\" is too long."
+msgid "Listenee URI ‘%s’ is too long."
 msgstr "الSource URL مش مظبوط."
 
-#. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:340
-#, php-format
-msgid "Listenee URI \"%s\" is a local user."
-msgstr ""
-
-#. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
-#. TRANS: %s is a profile URL.
-#: actions/userauthorization.php:358
-#, php-format
-msgid "Profile URL \"%s\" is for a local user."
-msgstr ""
-
-#. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
-#. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
-#: actions/userauthorization.php:368
-#, php-format
-msgid ""
-"Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
-"\"."
-msgstr ""
-
-#. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:378
+#: actions/userauthorization.php:314
 #, fuzzy, php-format
-msgid "Avatar URL \"%s\" is not valid."
+msgid "Listenee URI ‘%s’ is a local user."
 msgstr "الSource URL مش مظبوط."
 
-#. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:385
+#: actions/userauthorization.php:329
 #, php-format
-msgid "Cannot read avatar URL \"%s\"."
+msgid "Profile URL ‘%s’ is for a local user."
 msgstr ""
 
-#. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:392
+#: actions/userauthorization.php:345
+#, fuzzy, php-format
+msgid "Avatar URL ‘%s’ is not valid."
+msgstr "الSource URL مش مظبوط."
+
+#: actions/userauthorization.php:350
 #, php-format
-msgid "Wrong image type for avatar URL \"%s\"."
+msgid "Can’t read avatar URL ‘%s’."
+msgstr ""
+
+#: actions/userauthorization.php:355
+#, php-format
+msgid "Wrong image type for avatar URL ‘%s’."
 msgstr ""
 
 #. TRANS: Page title for profile design page.
@@ -6762,7 +6644,7 @@ msgid "Plugins"
 msgstr ""
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:898
+#: actions/version.php:198 lib/action.php:901
 msgid "Version"
 msgstr "النسخه"
 
@@ -6979,14 +6861,14 @@ msgstr "مشكله أثناء حفظ الإشعار."
 
 #. TRANS: Server exception thrown when a reply cannot be saved.
 #. TRANS: %1$d is a notice ID, %2$d is the ID of the mentioned user.
-#: classes/Notice.php:1142
+#: classes/Notice.php:1144
 #, fuzzy, php-format
 msgid "Could not save reply for %1$d, %2$d."
 msgstr "تعذّر حفظ الاشتراك."
 
 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1661
+#: classes/Notice.php:1663
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "آر تى @%1$s %2$s"
@@ -7000,14 +6882,14 @@ msgstr "%1$s (%2$s)"
 
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:775
+#: classes/Profile.php:779
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:784
+#: classes/Profile.php:788
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -7339,55 +7221,55 @@ msgid "Page notice"
 msgstr "إشعار الصفحة"
 
 #. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:871
+#: lib/action.php:874
 #, fuzzy
 msgid "Secondary site navigation"
 msgstr "ضبط الموقع الأساسي"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:877
+#: lib/action.php:880
 msgid "Help"
 msgstr "مساعدة"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:880
+#: lib/action.php:883
 msgid "About"
 msgstr "عن"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:883
+#: lib/action.php:886
 msgid "FAQ"
 msgstr "الأسئله المكررة"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:888
+#: lib/action.php:891
 msgid "TOS"
 msgstr "الشروط"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:892
+#: lib/action.php:895
 msgid "Privacy"
 msgstr "خصوصية"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:895
+#: lib/action.php:898
 msgid "Source"
 msgstr "المصدر"
 
 #. TRANS: Secondary navigation menu option leading to e-mail contact information on the
 #. TRANS: StatusNet site, where to report bugs, ...
-#: lib/action.php:902
+#: lib/action.php:905
 msgid "Contact"
 msgstr "اتصل"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:905
+#: lib/action.php:908
 #, fuzzy
 msgid "Badge"
 msgstr "نبّه"
 
 #. TRANS: DT element for StatusNet software license.
-#: lib/action.php:934
+#: lib/action.php:937
 #, fuzzy
 msgid "StatusNet software license"
 msgstr "رخصه محتوى الموقع"
@@ -7396,7 +7278,7 @@ msgstr "رخصه محتوى الموقع"
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:941
+#: lib/action.php:944
 #, fuzzy, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7406,7 +7288,7 @@ msgstr ""
 "broughtbyurl%%). "
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:944
+#: lib/action.php:947
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr ""
@@ -7415,7 +7297,7 @@ msgstr ""
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:951
+#: lib/action.php:954
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7427,51 +7309,51 @@ msgstr ""
 "agpl-3.0.html)."
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:967
+#: lib/action.php:970
 msgid "Site content license"
 msgstr "رخصه محتوى الموقع"
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:974
+#: lib/action.php:977
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:981
+#: lib/action.php:984
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:985
+#: lib/action.php:988
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:1017
+#: lib/action.php:1020
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
 
 #. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1353
+#: lib/action.php:1356
 #, fuzzy
 msgid "Pagination"
 msgstr "المنظمه"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1364
+#: lib/action.php:1367
 msgid "After"
 msgstr "بعد"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1374
+#: lib/action.php:1377
 msgid "Before"
 msgstr "قبل"
 
@@ -7678,23 +7560,19 @@ msgstr ""
 msgid "No application for that consumer key."
 msgstr ""
 
-#: lib/apiauth.php:202 lib/apiauth.php:284
-msgid "Not allowed to use API."
-msgstr ""
-
 #. TRANS: OAuth exception given when an incorrect access token was given for a user.
-#: lib/apiauth.php:225
+#: lib/apiauth.php:219
 msgid "Bad access token."
 msgstr ""
 
 #. TRANS: OAuth exception given when no user was found for a given token (no token was found).
-#: lib/apiauth.php:230
+#: lib/apiauth.php:224
 msgid "No user for that token."
 msgstr ""
 
 #. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel".
 #. TRANS: Client error thrown when authentication fails.
-#: lib/apiauth.php:272 lib/apiauth.php:302
+#: lib/apiauth.php:266 lib/apiauth.php:293
 msgid "Could not authenticate you."
 msgstr ""
 
@@ -7909,11 +7787,6 @@ msgstr "تغيير الپاسوورد مش مسموح"
 msgid "Block"
 msgstr "امنع"
 
-#. TRANS: Description of the form to block a user.
-#: lib/blockform.php:79
-msgid "Block this user"
-msgstr "امنع هذا المستخدم"
-
 #. TRANS: Title for command results.
 #: lib/channel.php:160 lib/channel.php:181
 msgid "Command results"
@@ -7943,7 +7816,7 @@ msgstr "لا ملف بهذه الهويه."
 
 #. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
 #. TRANS: Error text shown when a last user notice is requested and it does not exist.
-#: lib/command.php:99 lib/command.php:630
+#: lib/command.php:99 lib/command.php:642
 #, fuzzy
 msgid "User has no last notice."
 msgstr "ليس للمستخدم إشعار أخير"
@@ -7994,36 +7867,42 @@ msgstr ""
 "المشتركون: %2$s\n"
 "الإشعارات: %3$s"
 
+#. TRANS: Error message text shown when a favorite could not be set because it has already been favorited.
+#: lib/command.php:298
+#, fuzzy
+msgid "Could not create favorite: already favorited."
+msgstr "تعذّر إنشاء مفضله."
+
 #. TRANS: Text shown when a notice has been marked as favourite successfully.
-#: lib/command.php:312
+#: lib/command.php:324
 #, fuzzy
 msgid "Notice marked as fave."
 msgstr "هذا الإشعار مفضله مسبقًا!"
 
 #. TRANS: Message given having added a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:357
+#: lib/command.php:369
 #, php-format
 msgid "%1$s joined group %2$s."
 msgstr ""
 
 #. TRANS: Message given having removed a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:405
+#: lib/command.php:417
 #, php-format
 msgid "%1$s left group %2$s."
 msgstr ""
 
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: lib/command.php:426
+#: lib/command.php:438
 #, fuzzy, php-format
 msgctxt "WHOIS"
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
 
 #. TRANS: Whois output. %s is the full name of the queried user.
-#: lib/command.php:430
+#: lib/command.php:442
 #, php-format
 msgid "Fullname: %s"
 msgstr "الاسم الكامل: %s"
@@ -8031,7 +7910,7 @@ msgstr "الاسم الكامل: %s"
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a location.
-#: lib/command.php:434 lib/mail.php:270
+#: lib/command.php:446 lib/mail.php:270
 #, php-format
 msgid "Location: %s"
 msgstr "الموقع: %s"
@@ -8039,20 +7918,20 @@ msgstr "الموقع: %s"
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a homepage.
-#: lib/command.php:438 lib/mail.php:274
+#: lib/command.php:450 lib/mail.php:274
 #, php-format
 msgid "Homepage: %s"
 msgstr "الصفحه الرئيسية: %s"
 
 #. TRANS: Whois output. %s is the bio information of the queried user.
-#: lib/command.php:442
+#: lib/command.php:454
 #, php-format
 msgid "About: %s"
 msgstr "عن: %s"
 
 #. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).
 #. TRANS: %s is a remote profile.
-#: lib/command.php:471
+#: lib/command.php:483
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
@@ -8061,7 +7940,7 @@ msgstr ""
 
 #. TRANS: Message given if content is too long. %1$sd is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:488
+#: lib/command.php:500
 #, fuzzy, php-format
 msgid "Message too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
@@ -8073,26 +7952,26 @@ msgstr[4] "هذا الملف كبير جدًا. إن أقصى حجم للملف
 msgstr[5] "هذا الملف كبير جدًا. إن أقصى حجم للملفات هو %d."
 
 #. TRANS: Error text shown sending a direct message fails with an unknown reason.
-#: lib/command.php:516
+#: lib/command.php:528
 #, fuzzy
 msgid "Error sending direct message."
 msgstr "أنت ممنوع من إرسال رسائل مباشره."
 
 #. TRANS: Message given having repeated a notice from another user.
 #. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:553
+#: lib/command.php:565
 #, fuzzy, php-format
 msgid "Notice from %s repeated."
 msgstr "الإشعار من %s مكرر"
 
 #. TRANS: Error text shown when repeating a notice fails with an unknown reason.
-#: lib/command.php:556
+#: lib/command.php:568
 msgid "Error repeating notice."
 msgstr "خطأ تكرار الإشعار."
 
 #. TRANS: Message given if content of a notice for a reply is too long. %1$d is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:591
+#: lib/command.php:603
 #, fuzzy, php-format
 msgid "Notice too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Notice too long - maximum is %1$d characters, you sent %2$d."
@@ -8105,104 +7984,104 @@ msgstr[5] "هذا الملف كبير جدًا. إن أقصى حجم للملف
 
 #. TRANS: Text shown having sent a reply to a notice successfully.
 #. TRANS: %s is the nickname of the user of the notice the reply was sent to.
-#: lib/command.php:604
+#: lib/command.php:616
 #, fuzzy, php-format
 msgid "Reply to %s sent."
 msgstr "رُد على رساله %s"
 
 #. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
-#: lib/command.php:607
+#: lib/command.php:619
 msgid "Error saving notice."
 msgstr "خطأ أثناء حفظ الإشعار."
 
 #. TRANS: Error text shown when no username was provided when issuing a subscribe command.
-#: lib/command.php:654
+#: lib/command.php:666
 msgid "Specify the name of the user to subscribe to."
 msgstr ""
 
 #. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
-#: lib/command.php:663
+#: lib/command.php:675
 msgid "Can't subscribe to OMB profiles by command."
 msgstr ""
 
 #. TRANS: Text shown after having subscribed to another user successfully.
 #. TRANS: %s is the name of the user the subscription was requested for.
-#: lib/command.php:671
+#: lib/command.php:683
 #, php-format
 msgid "Subscribed to %s."
 msgstr ""
 
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.
-#: lib/command.php:692 lib/command.php:803
+#: lib/command.php:704 lib/command.php:815
 msgid "Specify the name of the user to unsubscribe from."
 msgstr ""
 
 #. TRANS: Text shown after having unsubscribed from another user successfully.
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:703
+#: lib/command.php:715
 #, php-format
 msgid "Unsubscribed from %s."
 msgstr ""
 
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
-#: lib/command.php:723 lib/command.php:749
+#: lib/command.php:735 lib/command.php:761
 #, fuzzy
 msgid "Command not yet implemented."
 msgstr "اكتمل الأمر"
 
 #. TRANS: Text shown when issuing the command "off" successfully.
-#: lib/command.php:727
+#: lib/command.php:739
 #, fuzzy
 msgid "Notification off."
 msgstr "لا رمز تأكيد."
 
 #. TRANS: Error text shown when the command "off" fails for an unknown reason.
-#: lib/command.php:730
+#: lib/command.php:742
 msgid "Can't turn off notification."
 msgstr ""
 
 #. TRANS: Text shown when issuing the command "on" successfully.
-#: lib/command.php:753
+#: lib/command.php:765
 #, fuzzy
 msgid "Notification on."
 msgstr "لا رمز تأكيد."
 
 #. TRANS: Error text shown when the command "on" fails for an unknown reason.
-#: lib/command.php:756
+#: lib/command.php:768
 #, fuzzy
 msgid "Can't turn on notification."
 msgstr "مش نافعه تتكرر الملاحظتك بتاعتك."
 
 #. TRANS: Error text shown when issuing the login command while login is disabled.
-#: lib/command.php:770
+#: lib/command.php:782
 msgid "Login command is disabled."
 msgstr ""
 
 #. TRANS: Text shown after issuing the login command successfully.
 #. TRANS: %s is a logon link..
-#: lib/command.php:783
+#: lib/command.php:795
 #, php-format
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
 
 #. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:812
+#: lib/command.php:824
 #, php-format
 msgid "Unsubscribed %s."
 msgstr ""
 
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
-#: lib/command.php:830
+#: lib/command.php:842
 msgid "You are not subscribed to anyone."
 msgstr "لست مُشتركًا بأى أحد."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
-#: lib/command.php:835
+#: lib/command.php:847
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "لست مشتركًا بأحد."
@@ -8214,14 +8093,14 @@ msgstr[5] ""
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user
 #. TRANS: (followers) without having any subscribers.
-#: lib/command.php:857
+#: lib/command.php:869
 msgid "No one is subscribed to you."
 msgstr "لا أحد مشترك بك."
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
-#: lib/command.php:862
+#: lib/command.php:874
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "لا أحد مشترك بك."
@@ -8233,14 +8112,14 @@ msgstr[5] ""
 
 #. TRANS: Text shown after requesting groups a user is subscribed to without having
 #. TRANS: any group subscriptions.
-#: lib/command.php:884
+#: lib/command.php:896
 msgid "You are not a member of any groups."
 msgstr "لست عضوًا فى أى مجموعه."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
-#: lib/command.php:889
+#: lib/command.php:901
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "لست عضوًا فى أى مجموعه."
@@ -8251,7 +8130,7 @@ msgstr[4] ""
 msgstr[5] ""
 
 #. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-#: lib/command.php:904
+#: lib/command.php:916
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -8357,11 +8236,6 @@ msgstr "OAuth applications"
 msgid "Database error"
 msgstr "خطأ قاعده بيانات"
 
-#. TRANS: Description of form for deleting a user.
-#: lib/deleteuserform.php:75
-msgid "Delete this user"
-msgstr "احذف هذا المستخدم"
-
 #. TRANS: Label in form on profile design page.
 #. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
 #: lib/designsettings.php:108
@@ -8398,21 +8272,6 @@ msgstr "تغيير الألوان"
 msgid "Use defaults"
 msgstr "استخدم المبدئيات"
 
-#. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: lib/designsettings.php:259
-msgid "Restore default designs"
-msgstr "استعد التصميمات المبدئية"
-
-#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: lib/designsettings.php:267
-msgid "Reset back to default"
-msgstr "ارجع إلى المبدئي"
-
-#. TRANS: Title for button on profile design page to save settings.
-#: lib/designsettings.php:272
-msgid "Save design"
-msgstr "احفظ التصميم"
-
 #. TRANS: Error message displayed if design settings could not be saved.
 #. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
 #: lib/designsettings.php:405 lib/designsettings.php:427
@@ -9217,10 +9076,6 @@ msgstr "رُد على هذا الإشعار"
 msgid "Reply"
 msgstr "رُد"
 
-#: lib/noticelist.php:673
-msgid "Delete this notice"
-msgstr "احذف هذا الإشعار"
-
 #: lib/noticelist.php:691
 msgid "Notice repeated"
 msgstr "الإشعار مكرر"
@@ -9504,10 +9359,6 @@ msgstr "ادعُ"
 msgid "Invite friends and colleagues to join you on %s"
 msgstr ""
 
-#: lib/subscribeform.php:115 lib/subscribeform.php:139
-msgid "Subscribe to this user"
-msgstr "اشترك بهذا المستخدم"
-
 #: lib/subscriberspeopleselftagcloudsection.php:48
 #: lib/subscriptionspeopleselftagcloudsection.php:48
 msgid "People Tagcloud as self-tagged"
@@ -9685,23 +9536,18 @@ msgctxt "role"
 msgid "Moderator"
 msgstr ""
 
-#: lib/util.php:305
-#, fuzzy
-msgid "Not allowed to log in."
-msgstr "لست والجًا."
-
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1309
+#: lib/util.php:1306
 msgid "a few seconds ago"
 msgstr "قبل لحظات قليلة"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1312
+#: lib/util.php:1309
 msgid "about a minute ago"
 msgstr "قبل دقيقه تقريبًا"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1316
+#: lib/util.php:1313
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
@@ -9713,12 +9559,12 @@ msgstr[4] ""
 msgstr[5] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1319
+#: lib/util.php:1316
 msgid "about an hour ago"
 msgstr "قبل ساعه تقريبًا"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1323
+#: lib/util.php:1320
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
@@ -9730,12 +9576,12 @@ msgstr[4] ""
 msgstr[5] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1326
+#: lib/util.php:1323
 msgid "about a day ago"
 msgstr "قبل يوم تقريبا"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1330
+#: lib/util.php:1327
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
@@ -9747,12 +9593,12 @@ msgstr[4] ""
 msgstr[5] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1333
+#: lib/util.php:1330
 msgid "about a month ago"
 msgstr "قبل شهر تقريبًا"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1337
+#: lib/util.php:1334
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
@@ -9764,7 +9610,7 @@ msgstr[4] ""
 msgstr[5] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1340
+#: lib/util.php:1337
 msgid "about a year ago"
 msgstr "قبل سنه تقريبًا"
 
@@ -9810,3 +9656,59 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#, fuzzy
+#~ msgid "Block this user."
+#~ msgstr "امنع هذا المستخدم"
+
+#, fuzzy
+#~ msgid "Delete this notice."
+#~ msgstr "احذف هذا الإشعار"
+
+#, fuzzy
+#~ msgid "Delete this user."
+#~ msgstr "احذف هذا المستخدم"
+
+#, fuzzy
+#~ msgid "Restore default designs."
+#~ msgstr "استعد التصميمات المبدئية"
+
+#, fuzzy
+#~ msgid "Reset back to default."
+#~ msgstr "ارجع إلى المبدئي"
+
+#, fuzzy
+#~ msgid "Save design."
+#~ msgstr "احفظ التصميم"
+
+#, fuzzy
+#~ msgid "Disfavor favorite."
+#~ msgstr "ألغِ تفضيل المفضلة"
+
+#, fuzzy
+#~ msgid "\"%s\" not found."
+#~ msgstr "الـ API method مش موجوده."
+
+#, fuzzy
+#~ msgid "Notice %s not found."
+#~ msgstr "الـ API method مش موجوده."
+
+#, fuzzy
+#~ msgid "Attachment %s not found."
+#~ msgstr "لم يُعثر على المستخدم المستلم."
+
+#, fuzzy
+#~ msgid "Invalid tag: \"%s\"."
+#~ msgstr "وسم غير صالح: \"%s\""
+
+#, fuzzy
+#~ msgid "Password saved"
+#~ msgstr "حُفظت كلمه السر."
+
+#, fuzzy
+#~ msgid "Subscribe to this user."
+#~ msgstr "اشترك بهذا المستخدم"
+
+#, fuzzy
+#~ msgid "Not allowed to log in."
+#~ msgstr "لست والجًا."
diff --git a/locale/bg/LC_MESSAGES/statusnet.po b/locale/bg/LC_MESSAGES/statusnet.po
index 426ad4e95b..5076133331 100644
--- a/locale/bg/LC_MESSAGES/statusnet.po
+++ b/locale/bg/LC_MESSAGES/statusnet.po
@@ -1,6 +1,7 @@
 # Translation of StatusNet - Core to Bulgarian (Български)
 # Exported from translatewiki.net
 #
+# Author: AVRS
 # Author: DCLXVI
 # Author: Turin
 # --
@@ -10,17 +11,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-24 10:32+0000\n"
-"PO-Revision-Date: 2011-02-24 10:36:09+0000\n"
+"POT-Creation-Date: 2011-03-03 15:58+0000\n"
+"PO-Revision-Date: 2011-03-03 16:00:11+0000\n"
 "Language-Team: Bulgarian <http://translatewiki.net/wiki/Portal:bg>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r82712); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: bg\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-02-17 11:39:54+0000\n"
+"X-POT-Import-Date: 2011-02-25 23:49:23+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -132,11 +133,7 @@ msgstr "Няма такака страница."
 #. 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 use "one time password login" without using an existing user.
-#. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
-#. TRANS: Client error displayed trying to find a user by ID for a non-existing ID.
-#. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when calling a profile action without specifying a user.
 #: actions/all.php:80 actions/allrss.php:69
@@ -154,12 +151,12 @@ msgstr "Няма такака страница."
 #: actions/apitimelinementions.php:77 actions/apitimelineuser.php:79
 #: actions/avatarbynickname.php:79 actions/favoritesrss.php:72
 #: actions/foaf.php:42 actions/foaf.php:61 actions/hcard.php:67
-#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:78
+#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
 #: actions/remotesubscribe.php:144 actions/remotesubscribe.php:153
-#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:113
-#: actions/showfavorites.php:106 actions/userbyid.php:75
+#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
+#: actions/showfavorites.php:106 actions/userbyid.php:74
 #: actions/usergroups.php:93 actions/userrss.php:40 actions/userxrd.php:59
-#: actions/xrds.php:71 lib/command.php:497 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:509 lib/galleryaction.php:59
 #: lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Няма такъв потребител"
@@ -281,7 +278,7 @@ msgstr "Бележки от %1$s и приятели в %2$s."
 #: actions/apigrouplistall.php:120 actions/apigroupmembership.php:105
 #: actions/apigroupshow.php:114 actions/apihelptest.php:84
 #: actions/apistatusesdestroy.php:101 actions/apistatusesretweets.php:110
-#: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:138
+#: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:139
 #: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
 #: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:268
 #: actions/apitimelinegroup.php:147 actions/apitimelinehome.php:173
@@ -509,7 +506,7 @@ msgstr "Получателят не е открит"
 #. TRANS: Client error displayed trying to direct message another user who's not a friend (403).
 #: actions/apidirectmessagenew.php:144
 #, fuzzy
-msgid "Cannot send direct messages to users who aren't your friend."
+msgid "Can't send direct messages to users who aren't your friend."
 msgstr ""
 "Не може да изпращате преки съобщения до хора, които не са в списъка ви с "
 "приятели."
@@ -539,7 +536,7 @@ msgstr "Тази бележка вече е отбелязана като люб
 #. TRANS: Client error displayed when marking a notice as favourite fails.
 #. TRANS: Server error displayed when trying to mark a notice as favorite fails in the database.
 #. TRANS: Error message text shown when a favorite could not be set.
-#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:294
+#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:306
 msgid "Could not create favorite."
 msgstr "Грешка при отбелязване като любима."
 
@@ -598,7 +595,7 @@ msgstr "Целевият потребител не беше открит."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:191
 #: actions/newgroup.php:137 actions/profilesettings.php:273
-#: actions/register.php:206
+#: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "Опитайте друг псевдоним, този вече е зает."
 
@@ -608,7 +605,7 @@ msgstr "Опитайте друг псевдоним, този вече е за
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:195
 #: actions/newgroup.php:141 actions/profilesettings.php:243
-#: actions/register.php:208
+#: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "Неправилен псевдоним."
 
@@ -621,7 +618,7 @@ msgstr "Неправилен псевдоним."
 #: actions/apigroupcreate.php:181 actions/editapplication.php:235
 #: actions/editgroup.php:202 actions/newapplication.php:221
 #: actions/newgroup.php:148 actions/profilesettings.php:248
-#: actions/register.php:215
+#: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "Адресът на личната страница не е правилен URL."
 
@@ -631,7 +628,7 @@ msgstr "Адресът на личната страница не е правил
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:191 actions/editgroup.php:206
 #: actions/newgroup.php:152 actions/profilesettings.php:252
-#: actions/register.php:218
+#: actions/register.php:226
 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "Пълното име е твърде дълго (макс. 255 знака)"
@@ -660,7 +657,7 @@ msgstr[1] "Описанието е твърде дълго (до %d символ
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:215 actions/editgroup.php:218
 #: actions/newgroup.php:164 actions/profilesettings.php:265
-#: actions/register.php:227
+#: actions/register.php:235
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
 msgstr "Името на местоположението е твърде дълго (макс. 255 знака)."
@@ -717,14 +714,14 @@ msgstr "Групата не е открита."
 #. TRANS: Server error displayed when trying to join a group the user is already a member of.
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:333
+#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:345
 msgid "You are already a member of that group."
 msgstr "Вече членувате в тази група."
 
 #. TRANS: Server error displayed when trying to join a group the user is blocked from joining.
 #. 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.
-#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:338
+#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:350
 #, fuzzy
 msgid "You have been blocked from that group by the admin."
 msgstr "Не сте блокирали този потребител."
@@ -735,7 +732,7 @@ msgstr "Не сте блокирали този потребител."
 #. TRANS: %1$s is the joining user's nickname, $2$s is the group nickname for which the join failed.
 #. TRANS: Message given having failed to add a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:350
+#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:362
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "Грешка при обновяване на групата."
@@ -752,7 +749,7 @@ msgstr "Не членувате в тази група."
 #. TRANS: Message given having failed to remove a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
 #: actions/apigroupleave.php:127 actions/leavegroup.php:133
-#: lib/command.php:398
+#: lib/command.php:410
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
 msgstr "Грешка при създаване на групата."
@@ -816,21 +813,20 @@ msgstr "Не сте абонирани за никого."
 #. TRANS: Form validation error message.
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
-#. TRANS: Client error displayed when the session token is not okay.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
 #: actions/deletenotice.php:177 actions/disfavor.php:75
 #: actions/emailsettings.php:291 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:65 actions/grouplogo.php:321
 #: actions/groupunblock.php:65 actions/imsettings.php:224
-#: actions/invite.php:60 actions/login.php:131 actions/makeadmin.php:66
+#: actions/invite.php:60 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
-#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:136
-#: actions/othersettings.php:155 actions/passwordsettings.php:137
+#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
+#: actions/othersettings.php:155 actions/passwordsettings.php:138
 #: actions/profilesettings.php:217 actions/recoverpassword.php:383
-#: actions/register.php:164 actions/remotesubscribe.php:76
+#: actions/register.php:172 actions/remotesubscribe.php:76
 #: actions/repeat.php:82 actions/smssettings.php:250 actions/subedit.php:40
-#: actions/subscribe.php:87 actions/tagother.php:166
-#: actions/unsubscribe.php:69 actions/userauthorization.php:53
+#: actions/subscribe.php:86 actions/tagother.php:166
+#: actions/unsubscribe.php:69 actions/userauthorization.php:52
 #: lib/designsettings.php:310
 msgid "There was a problem with your session token. Try again, please."
 msgstr "Имаше проблем със сесията ви в сайта. Моля, опитайте отново!"
@@ -862,7 +858,7 @@ msgstr "Грешка в базата от данни — отговор при 
 #: actions/designadminpanel.php:100 actions/editapplication.php:144
 #: actions/emailsettings.php:310 actions/grouplogo.php:332
 #: actions/imsettings.php:239 actions/newapplication.php:124
-#: actions/oauthconnectionssettings.php:145 actions/recoverpassword.php:46
+#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
 #: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
 msgstr "Неочаквано изпращане на форма."
@@ -908,20 +904,19 @@ msgstr "Сметка"
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group nickname (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT for nick name in a profile.
-#: actions/apioauthauthorize.php:459 actions/login.php:242
-#: actions/profilesettings.php:106 actions/register.php:418
+#: actions/apioauthauthorize.php:459 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:432
 #: actions/showgroup.php:243 actions/tagother.php:94
-#: actions/userauthorization.php:152 lib/groupeditform.php:145
+#: actions/userauthorization.php:145 lib/groupeditform.php:145
 #: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "Псевдоним"
 
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:463 actions/login.php:245
-#: actions/register.php:422 lib/accountsettingsaction.php:120
+#: actions/apioauthauthorize.php:463 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:120
 msgid "Password"
 msgstr "Парола"
 
@@ -1015,13 +1010,13 @@ msgstr "Няма такава бележка."
 
 #. TRANS: Client error displayed trying to repeat an own notice through the API.
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:537
+#: actions/apistatusesretweet.php:83 lib/command.php:549
 msgid "Cannot repeat your own notice."
 msgstr "Не можете да повтаряте собствени бележки."
 
 #. TRANS: Client error displayed trying to re-repeat a notice through the API.
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:92 lib/command.php:543
+#: actions/apistatusesretweet.php:92 lib/command.php:555
 msgid "Already repeated that notice."
 msgstr "Вече сте повторили тази бележка."
 
@@ -1044,7 +1039,7 @@ msgstr "Не е открит методът в API."
 #. TRANS: %s is the requested output format.
 #: actions/apistatusesshow.php:144
 #, fuzzy, php-format
-msgid "Unsupported format: %s."
+msgid "Unsupported format: %s"
 msgstr "Неподдържан формат."
 
 #. TRANS: Client error displayed requesting a deleted status.
@@ -1149,14 +1144,13 @@ msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr "%1$s реплики на съобщения от %2$s / %3$s."
 
 #. TRANS: Title for site timeline. %s is the StatusNet sitename.
-#. TRANS: Public RSS feed title. %s is the StatusNet site name.
 #: actions/apitimelinepublic.php:193 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "Общ поток на %s"
 
 #. TRANS: Subtitle for site timeline. %s is the StatusNet sitename.
-#: actions/apitimelinepublic.php:199
+#: actions/apitimelinepublic.php:199 actions/publicrss.php:105
 #, php-format
 msgid "%s updates from everyone!"
 msgstr ""
@@ -1223,26 +1217,25 @@ msgid "Atom post must be an Atom entry."
 msgstr ""
 
 #. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
-#: actions/apitimelineuser.php:334
+#: actions/apitimelineuser.php:335
 msgid "Can only handle POST activities."
 msgstr ""
 
 #. TRANS: Client error displayed when using an unsupported activity object type.
 #. TRANS: %s is the unsupported activity object type.
-#: actions/apitimelineuser.php:345
+#: actions/apitimelineuser.php:346
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
 #. TRANS: %d is the notice ID (number).
-#: actions/apitimelineuser.php:379
+#: actions/apitimelineuser.php:380
 #, fuzzy, php-format
 msgid "No content for notice %d."
 msgstr "Търсене в съдържанието на бележките"
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#. TRANS: %s is the notice URI.
 #: actions/apitimelineuser.php:408
 #, fuzzy, php-format
 msgid "Notice with URI \"%s\" already exists."
@@ -1260,10 +1253,9 @@ msgstr "Не е открит методът в API."
 
 #. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
 #. TRANS: Client exception.
-#. TRANS: Client error displayed trying to subscribe to a non-existing profile.
 #: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
 #: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
-#: actions/subscribe.php:110
+#: actions/subscribe.php:107
 msgid "No such profile."
 msgstr "Няма такъв профил."
 
@@ -1399,7 +1391,7 @@ msgstr "Грешка при изтриване на любима бележка.
 #: actions/joingroup.php:95 actions/leavegroup.php:82
 #: actions/leavegroup.php:95 actions/makeadmin.php:86
 #: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:380
+#: lib/command.php:392
 msgid "No such group."
 msgstr "Няма такава група"
 
@@ -1410,7 +1402,7 @@ msgid "Not a member."
 msgstr "Всички членове"
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
-#: actions/atompubshowmembership.php:150
+#: actions/atompubshowmembership.php:151
 #, fuzzy
 msgid "Cannot delete someone else's membership."
 msgstr "Грешка при добавяне на нов абонамент."
@@ -1516,11 +1508,9 @@ msgstr ""
 
 #. TRANS: Server error displayed in avatar upload page when no matching profile can be found for a user.
 #. TRANS: Server error displayed coming across a request from a user without a profile.
-#. TRANS: Server error displayed when trying to authorise a remote subscription request
-#. TRANS: while the user has no profile.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
 #: actions/grouplogo.php:184 actions/remotesubscribe.php:190
-#: actions/userauthorization.php:75 actions/userrss.php:108
+#: actions/userauthorization.php:72 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr "Потребителят няма профил."
 
@@ -1578,10 +1568,10 @@ msgstr "Изрязване"
 msgid "No file uploaded."
 msgstr "Няма качен файл."
 
-#. TRANS: Avatar upload form instruction after uploading a file.
+#. TRANS: Avatar upload form unstruction after uploading a file.
 #: actions/avatarsettings.php:345
 #, fuzzy
-msgid "Pick a square area of the image to be your avatar."
+msgid "Pick a square area of the image to be your avatar"
 msgstr "Изберете квадратна област от изображението за аватар"
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
@@ -1623,7 +1613,7 @@ msgid "You may not backup your account."
 msgstr ""
 
 #. TRANS: Information displayed on the backup account page.
-#: actions/backupaccount.php:225
+#: actions/backupaccount.php:227
 msgid ""
 "You can backup your account data in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format. This is an experimental feature and provides "
@@ -1633,15 +1623,15 @@ msgid ""
 msgstr ""
 
 #. TRANS: Submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:248
+#: actions/backupaccount.php:250
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Backup"
 msgstr "Фон"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:252
-msgid "Backup your account."
+#: actions/backupaccount.php:254
+msgid "Backup your account"
 msgstr ""
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
@@ -1680,7 +1670,7 @@ msgstr "Не"
 #. TRANS: Submit button title for 'No' when blocking a user.
 #: actions/block.php:158
 #, fuzzy
-msgid "Do not block this user."
+msgid "Do not block this user"
 msgstr "Да не се блокира този потребител"
 
 #. TRANS: Button label on the user block form.
@@ -1697,9 +1687,9 @@ msgid "Yes"
 msgstr "Да"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:165
-#, fuzzy
-msgid "Block this user."
+#. TRANS: Description of the form to block a user.
+#: actions/block.php:165 lib/blockform.php:79
+msgid "Block this user"
 msgstr "Блокиране на потребителя"
 
 #. TRANS: Server error displayed when blocking a user fails.
@@ -1865,7 +1855,7 @@ msgstr ""
 #. TRANS: Field label for delete account confirmation entry.
 #. TRANS: Field label for password reset form where the password has to be typed again.
 #: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:262 actions/register.php:426
+#: actions/recoverpassword.php:262 actions/register.php:440
 msgid "Confirm"
 msgstr "Потвърждаване"
 
@@ -1895,14 +1885,14 @@ msgstr "Приложението не е открито."
 #. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
 #: actions/deleteapplication.php:79 actions/editapplication.php:78
-#: actions/showapplication.php:90
+#: actions/showapplication.php:94
 msgid "You are not the owner of this application."
 msgstr "Не сте собственик на това приложение."
 
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
-#: actions/newapplication.php:112 actions/showapplication.php:113
-#: lib/action.php:1422
+#: actions/newapplication.php:112 actions/showapplication.php:118
+#: lib/action.php:1425
 msgid "There was a problem with your session token."
 msgstr "Имаше проблем със сесията ви в сайта."
 
@@ -1923,13 +1913,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting an application.
 #: actions/deleteapplication.php:161
 #, fuzzy
-msgid "Do not delete this application."
+msgid "Do not delete this application"
 msgstr "Да не се изтрива приложението"
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
 #: actions/deleteapplication.php:167
 #, fuzzy
-msgid "Delete this application."
+msgid "Delete this application"
 msgstr "Изтриване на това приложение"
 
 #. TRANS: Client error when trying to delete group while not logged in.
@@ -1985,13 +1975,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting a group.
 #: actions/deletegroup.php:224
 #, fuzzy
-msgid "Do not delete this group."
+msgid "Do not delete this group"
 msgstr "Да не се изтрива бележката"
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
 #: actions/deletegroup.php:231
 #, fuzzy
-msgid "Delete this group."
+msgid "Delete this group"
 msgstr "Изтриване на този потребител"
 
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
@@ -1999,15 +1989,13 @@ msgstr "Изтриване на този потребител"
 #. TRANS: Client error displayed when trying to mark a notice as favorite without being logged in.
 #. TRANS: Client error displayed trying to block a user from a group while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
-#. TRANS: Client error displayed trying to log out when not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
-#. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
 #. TRANS: Client error displayed when trying to change user options while not logged in.
 #: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
-#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:70
+#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
-#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:98
+#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
 #: lib/adminpanelaction.php:71 lib/profileformaction.php:63
 #: lib/settingsaction.php:72
@@ -2035,13 +2023,12 @@ msgstr "Наистина ли искате да изтриете тази бел
 #. TRANS: Submit button title for 'No' when deleting a notice.
 #: actions/deletenotice.php:159
 #, fuzzy
-msgid "Do not delete this notice."
+msgid "Do not delete this notice"
 msgstr "Да не се изтрива бележката"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:166
-#, fuzzy
-msgid "Delete this notice."
+#: actions/deletenotice.php:166 lib/noticelist.php:673
+msgid "Delete this notice"
 msgstr "Изтриване на бележката"
 
 #. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
@@ -2076,13 +2063,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting a user.
 #: actions/deleteuser.php:158
 #, fuzzy
-msgid "Do not delete this user."
+msgid "Do not delete this user"
 msgstr "Да не се изтрива бележката"
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
-#: actions/deleteuser.php:165
-#, fuzzy
-msgid "Delete this user."
+#. TRANS: Description of form for deleting a user.
+#: actions/deleteuser.php:165 lib/deleteuserform.php:75
+msgid "Delete this user"
 msgstr "Изтриване на този потребител"
 
 #. TRANS: Message used as title for design settings for the site.
@@ -2256,20 +2243,22 @@ msgid "Use defaults"
 msgstr ""
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:720
-#, fuzzy
-msgid "Restore default designs."
-msgstr "Грешка при записване настройките за Twitter"
+#. TRANS: Title for button on profile design page to reset all colour settings to default.
+#: actions/designadminpanel.php:720 lib/designsettings.php:259
+msgid "Restore default designs"
+msgstr ""
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:728
-msgid "Reset back to default."
+#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
+#: actions/designadminpanel.php:728 lib/designsettings.php:267
+msgid "Reset back to default"
 msgstr ""
 
 #. TRANS: Title for button for saving theme settings.
-#: actions/designadminpanel.php:736
+#. TRANS: Title for button on profile design page to save settings.
+#: actions/designadminpanel.php:736 lib/designsettings.php:272
 #, fuzzy
-msgid "Save design."
+msgid "Save design"
 msgstr "Запазване настройките на сайта"
 
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
@@ -2302,7 +2291,7 @@ msgid "You must be logged in to edit an application."
 msgstr "За да редактирате приложение, трябва да сте влезли."
 
 #. TRANS: Client error displayed trying to edit an application that does not exist.
-#: actions/editapplication.php:83 actions/showapplication.php:83
+#: actions/editapplication.php:83 actions/showapplication.php:87
 msgid "No such application."
 msgstr "Няма такова приложение."
 
@@ -2593,7 +2582,7 @@ msgid "Cannot normalize that email address."
 msgstr "Грешка при нормализиране адреса на е-пощата"
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:393 actions/register.php:204
+#: actions/emailsettings.php:393 actions/register.php:212
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "Неправилен адрес на е-поща."
@@ -2671,22 +2660,19 @@ msgstr "Няма входящ адрес на е-поща."
 
 #. 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.
 #: actions/emailsettings.php:530 actions/emailsettings.php:554
-#: actions/smssettings.php:566 actions/smssettings.php:591
+#: actions/smssettings.php:565 actions/smssettings.php:588
 #, fuzzy
 msgid "Could not update user record."
 msgstr "Грешка при обновяване записа на потребител."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
-#. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:534 actions/smssettings.php:570
+#: actions/emailsettings.php:534 actions/smssettings.php:568
 msgid "Incoming email address removed."
 msgstr "Входящият адрес на е-поща е премахнат."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
-#. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:558 actions/smssettings.php:595
+#: actions/emailsettings.php:558 actions/smssettings.php:591
 msgid "New incoming email address added."
 msgstr "Добавен е нов входящ адрес на е-поща."
 
@@ -2698,7 +2684,7 @@ msgstr "Тази бележка вече е отбелязана като люб
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
 #: actions/favor.php:95
 #, fuzzy
-msgid "Disfavor favorite."
+msgid "Disfavor favorite"
 msgstr "Добавяне към любимите"
 
 #. TRANS: Page title for first page of favorited notices.
@@ -2937,13 +2923,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
 #: actions/groupblock.php:191
 #, fuzzy
-msgid "Do not block this user from this group."
+msgid "Do not block this user from this group"
 msgstr "Да не се блокира този потребител"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
 #: actions/groupblock.php:198
 #, fuzzy
-msgid "Block this user from this group."
+msgid "Block this user from this group"
 msgstr "Разблокиране на потребителя от групата"
 
 #. TRANS: Server error displayed when trying to block a user from a group fails because of an application error.
@@ -2953,7 +2939,6 @@ msgid "Database error blocking user from group."
 msgstr "Разблокиране на потребителя от групата"
 
 #. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
-#. TRANS: Client error displayed trying to find a user by ID without providing an ID.
 #: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr "Липсва ID."
@@ -3137,10 +3122,8 @@ msgid "Group search"
 msgstr "Търсене на групи"
 
 #. TRANS: Text on page where groups can be searched if no results were found for a query.
-#. TRANS: Text for notice search results is the query had no results.
-#. TRANS: Message on the "People search" page where a query has no results.
-#: actions/groupsearch.php:82 actions/noticesearch.php:122
-#: actions/peoplesearch.php:87
+#: actions/groupsearch.php:82 actions/noticesearch.php:117
+#: actions/peoplesearch.php:83
 msgid "No results."
 msgstr "Няма резултати."
 
@@ -3174,7 +3157,6 @@ msgid "User is not blocked from group."
 msgstr "Потребителят вече е блокиран за групата."
 
 #. TRANS: Server error displayed when unblocking a user from a group fails because of an unknown error.
-#. TRANS: Server error displayed when removing a user block.
 #: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "Грешка при повтаряне на бележката."
@@ -3269,8 +3251,7 @@ msgid "Publish a MicroID for my Jabber/Google Talk address."
 msgstr "Публикуване на MicroID за адреса в Jabber/GTalk."
 
 #. TRANS: Confirmation message for successful Instant Messaging preferences save.
-#. TRANS: Confirmation message after saving preferences.
-#: actions/imsettings.php:283 actions/othersettings.php:193
+#: actions/imsettings.php:283 actions/othersettings.php:192
 msgid "Preferences saved."
 msgstr "Настройките са запазени."
 
@@ -3563,7 +3544,7 @@ msgstr "За напуснете група, трябва да сте влезл
 
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
-#: actions/leavegroup.php:103 lib/command.php:386
+#: actions/leavegroup.php:103 lib/command.php:398
 msgid "You are not a member of that group."
 msgstr "Не членувате в тази група."
 
@@ -3686,42 +3667,40 @@ msgstr "Запазване"
 msgid "Save license settings"
 msgstr ""
 
-#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
-#: actions/login.php:97 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
 msgid "Already logged in."
 msgstr "Вече сте влезли."
 
-#: actions/login.php:142
+#: actions/login.php:148
 msgid "Incorrect username or password."
 msgstr "Грешно име или парола."
 
-#. TRANS: Server error displayed when a user object could not be created trying to login using "one time password login".
-#: actions/login.php:148 actions/otp.php:127
+#: actions/login.php:154 actions/otp.php:120
 #, fuzzy
 msgid "Error setting user. You are probably not authorized."
 msgstr "Забранено."
 
-#: actions/login.php:202 actions/login.php:253
+#: actions/login.php:210 actions/login.php:263
 msgid "Login"
 msgstr "Вход"
 
-#: actions/login.php:239
+#: actions/login.php:249
 msgid "Login to site"
 msgstr "Вход в сайта"
 
-#: actions/login.php:248 actions/register.php:476
+#: actions/login.php:258 actions/register.php:490
 msgid "Remember me"
 msgstr "Запомни ме"
 
-#: actions/login.php:249 actions/register.php:478
+#: actions/login.php:259 actions/register.php:492
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "Автоматично влизане занапред. Да не се ползва на общи компютри!"
 
-#: actions/login.php:259
+#: actions/login.php:269
 msgid "Lost or forgotten password?"
 msgstr "Загубена или забравена парола"
 
-#: actions/login.php:277
+#: actions/login.php:288
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -3729,12 +3708,12 @@ msgstr ""
 "За по-голяма сигурност, моля въведете отново потребителското си име и парола "
 "при промяна на настройките."
 
-#: actions/login.php:281
+#: actions/login.php:292
 #, fuzzy
 msgid "Login with your username and password."
 msgstr "Вход с име и парола"
 
-#: actions/login.php:284
+#: actions/login.php:295
 #, fuzzy, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -3822,14 +3801,14 @@ msgid "New message"
 msgstr "Ново съобщение"
 
 #. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
-#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:501
+#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:513
 msgid "You can't send a message to this user."
 msgstr "Не може да изпращате съобщения до този потребител."
 
 #. TRANS: Command exception text shown when trying to send a direct message to another user without content.
 #. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
-#: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:478
-#: lib/command.php:581
+#: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:490
+#: lib/command.php:593
 msgid "No content!"
 msgstr "Няма съдържание!"
 
@@ -3838,7 +3817,7 @@ msgid "No recipient specified."
 msgstr "Не е указан получател."
 
 #. TRANS: Error text shown when trying to send a direct message to self.
-#: actions/newmessage.php:167 lib/command.php:505
+#: actions/newmessage.php:167 lib/command.php:517
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
@@ -3851,7 +3830,7 @@ msgstr "Съобщението е изпратено"
 
 #. TRANS: Message given have sent a direct message to another user.
 #. TRANS: %s is the name of the other user.
-#: actions/newmessage.php:188 lib/command.php:513
+#: actions/newmessage.php:188 lib/command.php:525
 #, fuzzy, php-format
 msgid "Direct message to %s sent."
 msgstr "Прякото съобщение до %s е изпратено."
@@ -3868,9 +3847,7 @@ msgstr "Нова бележка"
 msgid "Notice posted"
 msgstr "Бележката е публикувана"
 
-#. TRANS: Instructions for Notice search page.
-#. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/noticesearch.php:69
+#: actions/noticesearch.php:68
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -3879,47 +3856,37 @@ msgstr ""
 "Търсене на бележки в %%site.name%% по съдържанието им. Отделяйте фразите за "
 "търсене (трябва да са по-дълги от 3 символа) с интервали."
 
-#. TRANS: Title of the page where users can search for notices.
-#: actions/noticesearch.php:80
+#: actions/noticesearch.php:78
 msgid "Text search"
 msgstr "Търсене на текст"
 
-#. TRANS: Test in RSS notice search.
-#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearch.php:95
+#: actions/noticesearch.php:91
 #, php-format
 msgid "Search results for \"%1$s\" on %2$s"
 msgstr "Съобщение от %1$s в %2$s"
 
-#. TRANS: Text for logged in users making a query for notices without results.
-#. TRANS: This message contains a Markdown link.
-#: actions/noticesearch.php:128
+#: actions/noticesearch.php:121
 #, php-format
 msgid ""
 "Be the first to [post on this topic](%%%%action.newnotice%%%%?"
 "status_textarea=%s)!"
 msgstr ""
 
-#. TRANS: Text for not logged in users making a query for notices without results.
-#. TRANS: This message contains Markdown links.
-#: actions/noticesearch.php:133
+#: actions/noticesearch.php:124
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and be the first to "
 "[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
 msgstr ""
 
-#. TRANS: RSS notice search feed title. %s is the query.
-#: actions/noticesearchrss.php:95
+#: actions/noticesearchrss.php:96
 #, php-format
 msgid "Updates with \"%s\""
 msgstr "Бележки, съдържащи \"%s\""
 
-#. TRANS: RSS notice search feed description.
-#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearchrss.php:99
+#: actions/noticesearchrss.php:98
 #, fuzzy, php-format
-msgid "Updates matching search term \"%1$s\" on %2$s."
+msgid "Updates matching search term \"%1$s\" on %2$s!"
 msgstr "Бележки, съдържащи търсеното \"%1$s\" в %2$s!"
 
 #: actions/nudge.php:85
@@ -3958,31 +3925,31 @@ msgid "You have not registered any applications yet."
 msgstr "Не сте собственик на това приложение."
 
 #. TRANS: Title for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:70
+#: actions/oauthconnectionssettings.php:71
 #, fuzzy
 msgid "Connected applications"
 msgstr "Изтриване на приложението"
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:81
+#: actions/oauthconnectionssettings.php:83
 msgid "The following connections exist for your account."
 msgstr ""
 
 #. TRANS: Client error when trying to revoke access for an application while not being a user of it.
-#: actions/oauthconnectionssettings.php:166
+#: actions/oauthconnectionssettings.php:168
 msgid "You are not a user of that application."
 msgstr "Не сте собственик на това приложение."
 
 #. TRANS: Client error when revoking access has failed for some reason.
 #. TRANS: %s is the application ID revoking access failed for.
-#: actions/oauthconnectionssettings.php:181
+#: actions/oauthconnectionssettings.php:183
 #, fuzzy, php-format
 msgid "Unable to revoke access for application: %s."
 msgstr "Използвайте тази бланка за създаване на нова група."
 
 #. TRANS: Success message after revoking access for an application.
 #. TRANS: %1$s is the application name, %2$s is the first part of the user token.
-#: actions/oauthconnectionssettings.php:200
+#: actions/oauthconnectionssettings.php:202
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -3990,30 +3957,20 @@ msgid ""
 msgstr ""
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:211
+#: actions/oauthconnectionssettings.php:213
 msgid "You have not authorized any applications to use your account."
 msgstr ""
 
 #. TRANS: Note for developers in the OAuth connection settings form.
 #. TRANS: This message contains a Markdown link. Do not separate "](".
 #. TRANS: %s is the URL to the OAuth settings.
-#: actions/oauthconnectionssettings.php:231
+#: actions/oauthconnectionssettings.php:233
 #, php-format
 msgid ""
 "Are you a developer? [Register an OAuth client application](%s) to use with "
 "this instance of StatusNet."
 msgstr ""
 
-#: actions/oembed.php:64
-#, fuzzy, php-format
-msgid "\"%s\" not found."
-msgstr "Не е открит методът в API."
-
-#: actions/oembed.php:76
-#, fuzzy, php-format
-msgid "Notice %s not found."
-msgstr "Не е открит методът в API."
-
 #: actions/oembed.php:80 actions/shownotice.php:100
 msgid "Notice has no profile."
 msgstr "Потребителят няма профил."
@@ -4023,16 +3980,6 @@ msgstr "Потребителят няма профил."
 msgid "%1$s's status on %2$s"
 msgstr "Бележка на %1$s от %2$s"
 
-#: actions/oembed.php:95
-#, fuzzy, php-format
-msgid "Attachment %s not found."
-msgstr "Получателят не е открит"
-
-#: actions/oembed.php:136
-#, php-format
-msgid "\"%s\" not supported for oembed requests."
-msgstr ""
-
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
 #: actions/oembed.php:168
 #, fuzzy, php-format
@@ -4051,12 +3998,11 @@ msgstr ""
 msgid "Not a supported data format."
 msgstr "Неподдържан формат на данните"
 
-#. TRANS: ShortName in the OpenSearch interface when trying to find users.
 #: actions/opensearch.php:64
 msgid "People Search"
 msgstr "Търсене на хора"
 
-#: actions/opensearch.php:68
+#: actions/opensearch.php:67
 msgid "Notice Search"
 msgstr "Търсене на бележки"
 
@@ -4076,7 +4022,7 @@ msgstr "Управление на различни други настройки
 #. TRANS: here if it has one (most likely a single space).
 #: actions/othersettings.php:113
 msgid " (free service)"
-msgstr " (безплатна услуга)"
+msgstr " (свободна услуга)"
 
 #. TRANS: Label for dropdown with URL shortener services.
 #: actions/othersettings.php:122
@@ -4104,48 +4050,39 @@ msgstr ""
 msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr "Услугата за съкращаване е твърде дълга (може да е до 50 знака)."
 
-#. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
-#: actions/otp.php:70
+#: actions/otp.php:69
 #, fuzzy
 msgid "No user ID specified."
 msgstr "Не е указана група."
 
-#. TRANS: Client error displayed trying to use "one time password login" without specifying a login token.
-#: actions/otp.php:86
+#: actions/otp.php:83
 #, fuzzy
 msgid "No login token specified."
 msgstr "Не е указана бележка."
 
-#. TRANS: Client error displayed trying to use "one time password login" without requesting a login token.
-#: actions/otp.php:94
+#: actions/otp.php:90
 msgid "No login token requested."
 msgstr "Няма заявка за одобрение."
 
-#. TRANS: Client error displayed trying to use "one time password login" while specifying an invalid login token.
-#: actions/otp.php:100
+#: actions/otp.php:95
 msgid "Invalid login token specified."
 msgstr "Не е указана бележка."
 
-#. TRANS: Client error displayed trying to use "one time password login" while specifying an expired login token.
-#: actions/otp.php:110
+#: actions/otp.php:104
 msgid "Login token expired."
 msgstr "Вход в сайта"
 
-#. TRANS: Title for outbox for any but the fist page.
-#. TRANS: %1$s is the user nickname, %2$d is the page number.
-#: actions/outbox.php:57
+#: actions/outbox.php:58
 #, php-format
 msgid "Outbox for %1$s - page %2$d"
 msgstr "%1$s, страница %2$d"
 
-#. TRANS: Title for first page of outbox.
 #: actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
 msgstr "Изходяща кутия за %s"
 
-#. TRANS: Instructions for outbox.
-#: actions/outbox.php:103
+#: actions/outbox.php:104
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr "Това е изходящата ви кутия с лични съобщения до други потребители."
 
@@ -4172,45 +4109,43 @@ msgstr "Стара парола"
 msgid "New password"
 msgstr "Нова парола"
 
-#: actions/passwordsettings.php:109 actions/register.php:423
+#: actions/passwordsettings.php:109
 #, fuzzy
-msgid "6 or more characters."
+msgid "6 or more characters"
 msgstr "6 или повече знака"
 
-#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:264
-#: actions/register.php:427
+#: actions/passwordsettings.php:113
 #, fuzzy
-msgid "Same as password above."
+msgid "Same as password above"
 msgstr "Също като паролата по-горе"
 
 #: actions/passwordsettings.php:117
 msgid "Change"
 msgstr "Промяна"
 
-#: actions/passwordsettings.php:153 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:238
 msgid "Password must be 6 or more characters."
 msgstr "Паролата трябва да е 6 или повече знака."
 
-#: actions/passwordsettings.php:156 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:241
 msgid "Passwords don't match."
 msgstr "Паролите не съвпадат."
 
-#: actions/passwordsettings.php:164
+#: actions/passwordsettings.php:165
 msgid "Incorrect old password"
 msgstr "Грешна стара парола"
 
-#: actions/passwordsettings.php:180
+#: actions/passwordsettings.php:181
 msgid "Error saving user; invalid."
 msgstr "Грешка при запазване на потребител — невалидност."
 
-#. TRANS: Reset password form validation error message.
-#: actions/passwordsettings.php:185 actions/recoverpassword.php:418
+#: actions/passwordsettings.php:186
 #, fuzzy
-msgid "Cannot save new password."
+msgid "Can't save new password."
 msgstr "Грешка при запазване на новата парола."
 
-#: actions/passwordsettings.php:191
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
 msgid "Password saved."
 msgstr "Паролата е записана."
 
@@ -4497,9 +4432,7 @@ msgstr ""
 msgid "Save paths"
 msgstr "Запазване на пътищата"
 
-#. TRANS: Instructions for the "People search" page.
-#. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/peoplesearch.php:54
+#: actions/peoplesearch.php:52
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
@@ -4508,8 +4441,7 @@ msgstr ""
 "Търсене на хора в %%site.name%% по техните име, място или интереси. "
 "Отделяйте фразите за "
 
-#. TRANS: Title of a page where users can search for other users.
-#: actions/peoplesearch.php:61
+#: actions/peoplesearch.php:58
 msgid "People search"
 msgstr "Търсене на хора"
 
@@ -4549,7 +4481,7 @@ msgid "Profile information"
 msgstr "Данни на профила"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109 actions/register.php:419
+#: actions/profilesettings.php:109 actions/register.php:433
 #, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr "От 1 до 64 малки букви или цифри, без пунктоация и интервали"
@@ -4557,7 +4489,7 @@ msgstr "От 1 до 64 малки букви или цифри, без пунк
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for full group name (dt). Text hidden by default.
 #. TRANS: DT for full name in a profile.
-#: actions/profilesettings.php:113 actions/register.php:441
+#: actions/profilesettings.php:113 actions/register.php:455
 #: actions/showgroup.php:255 actions/tagother.php:104
 #: lib/groupeditform.php:150 lib/userprofile.php:156
 msgid "Full name"
@@ -4565,13 +4497,13 @@ msgstr "Пълно име"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:118 actions/register.php:446
+#: actions/profilesettings.php:118 actions/register.php:460
 #: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "Лична страница"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:121 actions/register.php:448
+#: actions/profilesettings.php:121
 #, fuzzy
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr "Адрес на личната ви страница, блог или профил в друг сайт"
@@ -4579,7 +4511,7 @@ msgstr "Адрес на личната ви страница, блог или п
 #. TRANS: Tooltip for field label in form for profile settings. Plural
 #. TRANS: is decided by the number of characters available for the
 #. TRANS: biography (%d).
-#: actions/profilesettings.php:129 actions/register.php:457
+#: actions/profilesettings.php:129 actions/register.php:471
 #, fuzzy, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4587,29 +4519,28 @@ msgstr[0] "Опишете себе си и интересите си в до %d
 msgstr[1] "Опишете себе си и интересите си в до %d букви"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:135 actions/register.php:462
+#: actions/profilesettings.php:135 actions/register.php:476
 msgid "Describe yourself and your interests"
 msgstr "Опишете себе си и интересите си"
 
 #. TRANS: Text area label in form for profile settings where users can provide.
 #. TRANS: their biography.
-#: actions/profilesettings.php:139 actions/register.php:464
+#: actions/profilesettings.php:139 actions/register.php:478
 msgid "Bio"
 msgstr "За мен"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group location (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT for location in a profile.
-#: actions/profilesettings.php:145 actions/register.php:469
+#: actions/profilesettings.php:145 actions/register.php:483
 #: actions/showgroup.php:265 actions/tagother.php:112
-#: actions/userauthorization.php:174 lib/groupeditform.php:173
+#: actions/userauthorization.php:166 lib/groupeditform.php:173
 #: lib/userprofile.php:172
 msgid "Location"
 msgstr "Местоположение"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148
+#: actions/profilesettings.php:148 actions/register.php:485
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Къде се намирате (град, община, държава и т.н.)"
 
@@ -4629,8 +4560,7 @@ msgstr "Етикети"
 #. TRANS: Tooltip for field label in form for profile settings.
 #: actions/profilesettings.php:164
 msgid ""
-"Tags for yourself (letters, numbers, -, ., and _), comma- or space- "
-"separated."
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr ""
 
 #. TRANS: Dropdownlist label in form for profile settings.
@@ -4641,7 +4571,7 @@ msgstr "Език"
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
 #: actions/profilesettings.php:171
 #, fuzzy
-msgid "Preferred language."
+msgid "Preferred language"
 msgstr "Предпочитан език"
 
 #. TRANS: Dropdownlist label in form for profile settings.
@@ -4658,7 +4588,7 @@ msgstr "В кой часови пояс сте обикновено?"
 #: actions/profilesettings.php:189
 #, fuzzy
 msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)."
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr ""
 "Автоматично абониране за всеки, който се абонира за мен (подходящо за "
 "ботове)."
@@ -4666,7 +4596,7 @@ msgstr ""
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Plural form is used based on the maximum number of allowed
 #. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:258 actions/register.php:221
+#: actions/profilesettings.php:258 actions/register.php:229
 #, fuzzy, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4686,9 +4616,9 @@ msgstr "Името на езика е твърде дълго (може да е
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:291
-#, fuzzy, php-format
-msgid "Invalid tag: \"%s\"."
+#: actions/profilesettings.php:291 actions/tagother.php:178
+#, php-format
+msgid "Invalid tag: \"%s\""
 msgstr "Неправилен етикет: \"%s\""
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
@@ -4786,12 +4716,6 @@ msgid ""
 "tool."
 msgstr ""
 
-#. TRANS: Public RSS feed description. %s is the StatusNet site name.
-#: actions/publicrss.php:106
-#, php-format
-msgid "%s updates from everyone."
-msgstr ""
-
 #. TRANS: Title for public tag cloud.
 #: actions/publictagcloud.php:57
 msgid "Public tag cloud"
@@ -4927,12 +4851,6 @@ msgstr "Възстановяване на паролата"
 msgid "Password recovery requested"
 msgstr "Поискано е възстановяване на парола"
 
-#. TRANS: Title for password recovery page in password saved mode.
-#: actions/recoverpassword.php:229
-#, fuzzy
-msgid "Password saved"
-msgstr "Паролата е записана."
-
 #. TRANS: Title for password recovery page when an unknown action has been specified.
 #: actions/recoverpassword.php:232
 msgid "Unknown action"
@@ -4944,6 +4862,12 @@ msgstr "Непознато действие"
 msgid "6 or more characters, and do not forget it!"
 msgstr "6 или повече знака. И не ги забравяйте!"
 
+#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#: actions/recoverpassword.php:264 actions/register.php:441
+#, fuzzy
+msgid "Same as password above."
+msgstr "Също като паролата по-горе"
+
 #. TRANS: Button text for password reset form.
 #. TRANS: Button text on profile design page to reset all colour settings to default without saving.
 #: actions/recoverpassword.php:268 lib/designsettings.php:264
@@ -4997,8 +4921,14 @@ msgstr "Паролата трябва да е от поне 6 знака."
 msgid "Password and confirmation do not match."
 msgstr "Паролата и потвърждението й не съвпадат."
 
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:418
+#, fuzzy
+msgid "Cannot save new password."
+msgstr "Грешка при запазване на новата парола."
+
 #. TRANS: Server error displayed when something does wrong with the user object during password reset.
-#: actions/recoverpassword.php:426 actions/register.php:248
+#: actions/recoverpassword.php:426 actions/register.php:256
 msgid "Error setting user."
 msgstr "Грешка в настройките на потребителя."
 
@@ -5007,97 +4937,102 @@ msgstr "Грешка в настройките на потребителя."
 msgid "New password successfully saved. You are now logged in."
 msgstr "Новата парола е запазена. Влязохте успешно."
 
-#: actions/register.php:87 actions/register.php:188 actions/register.php:399
+#: actions/register.php:92 actions/register.php:196 actions/register.php:413
 msgid "Sorry, only invited people can register."
 msgstr ""
 
-#: actions/register.php:94
+#: actions/register.php:99
 #, fuzzy
 msgid "Sorry, invalid invitation code."
 msgstr "Грешка в кода за потвърждение."
 
-#: actions/register.php:113
+#: actions/register.php:119
 msgid "Registration successful"
 msgstr "Записването е успешно."
 
-#: actions/register.php:115 actions/register.php:497
+#: actions/register.php:121 actions/register.php:511
 msgid "Register"
 msgstr "Регистриране"
 
-#: actions/register.php:135
+#: actions/register.php:142
 msgid "Registration not allowed."
 msgstr "Записването не е позволено."
 
-#: actions/register.php:201
+#: actions/register.php:209
 #, fuzzy
-msgid "You cannot register if you don't agree to the license."
+msgid "You can't register if you don't agree to the license."
 msgstr "Не можете да се регистрате, ако не сте съгласни с  лиценза."
 
-#: actions/register.php:210
+#: actions/register.php:218
 msgid "Email address already exists."
 msgstr "Адресът на е-поща вече се използва."
 
-#: actions/register.php:243 actions/register.php:265
+#: actions/register.php:251 actions/register.php:273
 msgid "Invalid username or password."
 msgstr "Неправилно име или парола."
 
-#: actions/register.php:340
+#: actions/register.php:351
 msgid ""
 "With this form you can create a new account. You can then post notices and "
-"link up to friends and colleagues."
+"link up to friends and colleagues. "
 msgstr ""
 
+#: actions/register.php:437
+#, fuzzy
+msgid "6 or more characters."
+msgstr "6 или повече знака"
+
 #. TRANS: Link description in user account settings menu.
-#: actions/register.php:431 actions/register.php:435
+#: actions/register.php:445 actions/register.php:449
 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
 msgid "Email"
 msgstr "Е-поща"
 
-#: actions/register.php:432 actions/register.php:436
+#: actions/register.php:446 actions/register.php:450
 #, fuzzy
-msgid "Used only for updates, announcements, and password recovery."
+msgid "Used only for updates, announcements, and password recovery"
 msgstr "Използва се само за промени, обяви или възстановяване на паролата"
 
-#: actions/register.php:443
+#: actions/register.php:457
 #, fuzzy
-msgid "Longer name, preferably your \"real\" name."
+msgid "Longer name, preferably your \"real\" name"
 msgstr "По-дълго име, за предпочитане \"истинското\" ви име."
 
-#: actions/register.php:471
+#: actions/register.php:462
 #, fuzzy
-msgid "Where you are, like \"City, State (or Region), Country\"."
-msgstr "Къде се намирате (град, община, държава и т.н.)"
+msgid "URL of your homepage, blog, or profile on another site"
+msgstr "Адрес на личната ви страница, блог или профил в друг сайт"
 
-#: actions/register.php:510
+#: actions/register.php:523
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
 msgstr ""
 
-#: actions/register.php:520
+#: actions/register.php:533
 #, php-format
 msgid "My text and files are copyright by %1$s."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:524
+#: actions/register.php:537
 msgid "My text and files remain under my own copyright."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:527
+#: actions/register.php:540
 msgid "All rights reserved."
 msgstr "Всички права запазени."
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:532
+#: actions/register.php:545
 #, fuzzy, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
 "email address, IM address, and phone number."
 msgstr " освен тези лични данни: парола, е-поща, месинджър, телефон."
 
-#: actions/register.php:573
+#: actions/register.php:588
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -5130,7 +5065,7 @@ msgstr ""
 "Благодарим, че се включихте в сайта и дано ползването на услугата ви носи "
 "само приятни мигове!"
 
-#: actions/register.php:597
+#: actions/register.php:612
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5164,7 +5099,7 @@ msgstr "Потребителски псевдоним"
 
 #: actions/remotesubscribe.php:129
 #, fuzzy
-msgid "Nickname of the user you want to follow."
+msgid "Nickname of the user you want to follow"
 msgstr "Псевдоним на потребител, когото искате да следите"
 
 #: actions/remotesubscribe.php:132
@@ -5173,7 +5108,7 @@ msgstr "Адрес на профила"
 
 #: actions/remotesubscribe.php:133
 #, fuzzy
-msgid "URL of your profile on another compatible microblogging service."
+msgid "URL of your profile on another compatible microblogging service"
 msgstr "Адрес на профила ви в друга, съвместима услуга за микроблогване"
 
 #. TRANS: Link text for link that will subscribe to a remote profile.
@@ -5184,7 +5119,7 @@ msgstr "Абониране"
 
 #: actions/remotesubscribe.php:158
 #, fuzzy
-msgid "Invalid profile URL (bad format)."
+msgid "Invalid profile URL (bad format)"
 msgstr "Неправилен адрес на профил (грешен формат)"
 
 #: actions/remotesubscribe.php:167
@@ -5227,7 +5162,6 @@ msgstr "Повторено"
 msgid "Repeated!"
 msgstr "Повторено!"
 
-#. TRANS: RSS reply feed title. %s is a user nickname.
 #. TRANS: Tooltip for personal group navigation menu option when logged in for viewing @-replies.
 #: actions/replies.php:126 actions/repliesrss.php:68
 #: lib/personalgroupnav.php:109
@@ -5276,11 +5210,9 @@ msgid ""
 "newnotice%%%%?status_textarea=%3$s)."
 msgstr ""
 
-#. TRANS: RSS reply feed description.
-#. TRANS: %1$s is a user nickname, %2$s is the StatusNet site name.
-#: actions/repliesrss.php:74
+#: actions/repliesrss.php:72
 #, fuzzy, php-format
-msgid "Replies to %1$s on %2$s."
+msgid "Replies to %1$s on %2$s!"
 msgstr "Отговори до %1$s в %2$s!"
 
 #. TRANS: Client exception displayed when trying to restore an account while not logged in.
@@ -5382,7 +5314,7 @@ msgstr "Не можете да заглушавате потребители н
 msgid "User doesn't have this role."
 msgstr "Потребител без съответстващ профил"
 
-#: actions/rsd.php:142 actions/version.php:159
+#: actions/rsd.php:146 actions/version.php:159
 msgid "StatusNet"
 msgstr "StatusNet"
 
@@ -5424,95 +5356,95 @@ msgstr ""
 msgid "Save site settings"
 msgstr "Запазване настройките на сайта"
 
-#: actions/showapplication.php:78
+#: actions/showapplication.php:82
 msgid "You must be logged in to view an application."
 msgstr "За прегледате приложение, трябва да сте влезли."
 
-#: actions/showapplication.php:151
+#: actions/showapplication.php:157
 msgid "Application profile"
 msgstr "Профил на приложението"
 
 #. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:153 lib/applicationeditform.php:177
+#: actions/showapplication.php:159 lib/applicationeditform.php:177
 msgid "Icon"
 msgstr "Икона"
 
 #. TRANS: Form input field label for application name.
-#: actions/showapplication.php:163 actions/version.php:197
+#: actions/showapplication.php:169 actions/version.php:197
 #: lib/applicationeditform.php:190
 msgid "Name"
 msgstr "Име"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:172 lib/applicationeditform.php:227
+#: actions/showapplication.php:178 lib/applicationeditform.php:227
 msgid "Organization"
 msgstr "Организация"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:181 actions/version.php:200
+#: actions/showapplication.php:187 actions/version.php:200
 #: lib/applicationeditform.php:208 lib/groupeditform.php:168
 msgid "Description"
 msgstr "Описание"
 
 #. TRANS: Header for group statistics on a group page (h2).
 #. TRANS: H2 text for user statistics.
-#: actions/showapplication.php:186 actions/showgroup.php:460
+#: actions/showapplication.php:192 actions/showgroup.php:460
 #: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "Статистики"
 
-#: actions/showapplication.php:197
+#: actions/showapplication.php:203
 #, php-format
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr ""
 
-#: actions/showapplication.php:207
+#: actions/showapplication.php:213
 #, fuzzy
 msgid "Application actions"
 msgstr "Данни за приложението"
 
-#: actions/showapplication.php:230
+#: actions/showapplication.php:236
 msgid "Reset key & secret"
 msgstr ""
 
 #. TRANS: Title of form for deleting a user.
-#: actions/showapplication.php:246 lib/deletegroupform.php:121
+#: actions/showapplication.php:252 lib/deletegroupform.php:121
 #: lib/deleteuserform.php:64 lib/noticelist.php:673
 msgid "Delete"
 msgstr "Изтриване"
 
-#: actions/showapplication.php:255
+#: actions/showapplication.php:261
 msgid "Application info"
 msgstr "Данни за приложението"
 
-#: actions/showapplication.php:257
+#: actions/showapplication.php:263
 msgid "Consumer key"
 msgstr ""
 
-#: actions/showapplication.php:262
+#: actions/showapplication.php:268
 msgid "Consumer secret"
 msgstr ""
 
-#: actions/showapplication.php:267
+#: actions/showapplication.php:273
 msgid "Request token URL"
 msgstr ""
 
-#: actions/showapplication.php:272
+#: actions/showapplication.php:278
 msgid "Access token URL"
 msgstr ""
 
-#: actions/showapplication.php:277
+#: actions/showapplication.php:283
 #, fuzzy
 msgid "Authorize URL"
 msgstr "Автор"
 
-#: actions/showapplication.php:282
+#: actions/showapplication.php:288
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
 msgstr ""
 
-#: actions/showapplication.php:302
+#: actions/showapplication.php:309
 #, fuzzy
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr "Наистина ли искате да изтриете тази бележка?"
@@ -5598,18 +5530,16 @@ msgid "Group profile"
 msgstr "Профил на групата"
 
 #. TRANS: Label for group URL (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT for URL in a profile.
 #: actions/showgroup.php:273 actions/tagother.php:118
-#: actions/userauthorization.php:184 lib/userprofile.php:186
+#: actions/userauthorization.php:175 lib/userprofile.php:186
 msgid "URL"
 msgstr "URL"
 
 #. TRANS: Label for group description or group note (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page where bio is displayed.
 #. TRANS: DT for note in a profile.
 #: actions/showgroup.php:285 actions/tagother.php:128
-#: actions/userauthorization.php:197 lib/userprofile.php:204
+#: actions/userauthorization.php:187 lib/userprofile.php:204
 msgid "Note"
 msgstr "Бележка"
 
@@ -5748,7 +5678,7 @@ msgid "%1$s tagged %2$s"
 msgstr "%1$s, страница %2$d"
 
 #. TRANS: Page title showing tagged notices in one user's stream.
-#. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
+#. TRANS: %1$s is the username, %2$s is the hash tag, %1$d is the page number.
 #: actions/showstream.php:74
 #, fuzzy, php-format
 msgid "%1$s tagged %2$s, page %3$d"
@@ -5985,7 +5915,7 @@ msgstr ""
 #. TRANS: Title for button to save site notice in admin panel.
 #: actions/sitenoticeadminpanel.php:201
 #, fuzzy
-msgid "Save site notice."
+msgid "Save site notice"
 msgstr "Запазване настройките на сайта"
 
 #. TRANS: Title for SMS settings.
@@ -6046,7 +5976,7 @@ msgstr "Телефонен номер за SMS"
 #. TRANS: SMS phone number input field instructions in SMS settings form.
 #: actions/smssettings.php:152
 #, fuzzy
-msgid "Phone number, no punctuation or spaces, with area code."
+msgid "Phone number, no punctuation or spaces, with area code"
 msgstr "Телефонен номер — с код, без пунктоация и без интервали."
 
 #. TRANS: Form legend for SMS preferences form.
@@ -6219,20 +6149,16 @@ msgstr "Не сте абонирани за този профил"
 msgid "Could not save subscription."
 msgstr "Грешка при добавяне на нов абонамент."
 
-#. TRANS: Client error displayed trying to perform any request method other than POST.
-#. TRANS: Do not translate POST.
 #: actions/subscribe.php:77
 msgid "This action only accepts POST requests."
 msgstr ""
 
-#. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
-#: actions/subscribe.php:121
+#: actions/subscribe.php:117
 #, fuzzy
 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
 msgstr "Не сте абонирани за този профил"
 
-#. TRANS: Page title when subscription succeeded.
-#: actions/subscribe.php:149
+#: actions/subscribe.php:145
 #, fuzzy
 msgid "Subscribed"
 msgstr "Абониране"
@@ -6383,9 +6309,8 @@ msgstr "Етикети"
 msgid "User profile"
 msgstr "Потребителски профил"
 
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT element in area for user avatar.
-#: actions/tagother.php:81 actions/userauthorization.php:138
+#: actions/tagother.php:81 actions/userauthorization.php:132
 #: lib/userprofile.php:108
 msgid "Photo"
 msgstr "Снимка"
@@ -6401,11 +6326,6 @@ msgid ""
 "separated"
 msgstr ""
 
-#: actions/tagother.php:178
-#, php-format
-msgid "Invalid tag: \"%s\""
-msgstr "Неправилен етикет: \"%s\""
-
 #: actions/tagother.php:193
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
@@ -6419,7 +6339,6 @@ msgstr ""
 msgid "No such tag."
 msgstr "Няма такъв етикет."
 
-#. TRANS: Client error displayed when trying to unblock a non-blocked user.
 #: actions/unblock.php:59
 msgid "You haven't blocked that user."
 msgstr "Не сте блокирали този потребител."
@@ -6441,7 +6360,7 @@ msgstr "Не е открит профил с такъв идентификато
 msgid "Unsubscribed"
 msgstr "Отписване"
 
-#: actions/updateprofile.php:64
+#: actions/updateprofile.php:64 actions/userauthorization.php:337
 #, php-format
 msgid ""
 "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
@@ -6472,7 +6391,7 @@ msgstr ""
 #. TRANS: users in user admin panel. %1$s is the invalid nickname.
 #: actions/useradminpanel.php:166
 #, php-format
-msgid "Invalid default subscripton: \"%1$s\" is not a user."
+msgid "Invalid default subscripton: '%1$s' is not a user."
 msgstr ""
 
 #. TRANS: Link description in user account settings menu.
@@ -6540,69 +6459,58 @@ msgstr ""
 #. TRANS: Title for button to save user settings in user admin panel.
 #: actions/useradminpanel.php:302
 #, fuzzy
-msgid "Save user settings."
+msgid "Save user settings"
 msgstr "Запазване настройките на сайта"
 
-#. TRANS: Page title.
-#: actions/userauthorization.php:109
+#: actions/userauthorization.php:105
 msgid "Authorize subscription"
 msgstr "Одобряване на абонамента"
 
-#. TRANS: Page notice on "Auhtorize subscription" page.
-#: actions/userauthorization.php:115
+#: actions/userauthorization.php:110
 #, fuzzy
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
 "user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
-"click \"Reject\"."
+"click “Reject”."
 msgstr ""
 "Проверете тези детайли и се уверете, че искате да се абонирате за бележките "
 "на този потребител. Ако не искате абонамента, натиснете \"Cancel\" (Отказ)."
 
-#. TRANS: DT element on Authorise Subscription page where license is displayed.
 #. TRANS: Menu item for site administration
-#: actions/userauthorization.php:207 actions/version.php:167
+#: actions/userauthorization.php:196 actions/version.php:167
 #: lib/adminpanelaction.php:403
 msgid "License"
 msgstr "Лиценз"
 
-#. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:229
+#: actions/userauthorization.php:217
 #, fuzzy
-msgctxt "BUTTON"
 msgid "Accept"
 msgstr "Приемане"
 
-#. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:231
-#, fuzzy
-msgid "Subscribe to this user."
+#: actions/userauthorization.php:218 lib/subscribeform.php:115
+#: lib/subscribeform.php:139
+msgid "Subscribe to this user"
 msgstr "Абониране за този потребител"
 
-#. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:233
+#: actions/userauthorization.php:219
 #, fuzzy
-msgctxt "BUTTON"
 msgid "Reject"
 msgstr "Охвърляне"
 
-#. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:235
+#: actions/userauthorization.php:220
 #, fuzzy
-msgid "Reject this subscription."
+msgid "Reject this subscription"
 msgstr "Абонаменти на %s"
 
-#. TRANS: Client error displayed for an empty authorisation request.
-#: actions/userauthorization.php:248
+#: actions/userauthorization.php:232
 msgid "No authorization request!"
 msgstr "Няма заявка за одобрение."
 
-#. TRANS: Accept message header from Authorise subscription page.
-#: actions/userauthorization.php:271
+#: actions/userauthorization.php:254
 msgid "Subscription authorized"
 msgstr "Абонаментът е одобрен"
 
-#: actions/userauthorization.php:274
+#: actions/userauthorization.php:256
 #, fuzzy
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
@@ -6612,12 +6520,11 @@ msgstr ""
 "Абонаментът е одобрен, но не е зададен callback URL. За да завършите "
 "одобряването, проверете инструкциите на сайта. Вашият token за абонамент е:"
 
-#. TRANS: Reject message header from Authorise subscription page.
-#: actions/userauthorization.php:285
+#: actions/userauthorization.php:266
 msgid "Subscription rejected"
 msgstr "Абонаментът е отказан"
 
-#: actions/userauthorization.php:288
+#: actions/userauthorization.php:268
 #, fuzzy
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
@@ -6627,62 +6534,39 @@ msgstr ""
 "Абонаментът е отказан, но не е зададен callback URL. За да откажете напълно "
 "абонамента, проверете инструкциите на сайта."
 
-#. TRANS: Exception thrown when no valid user is found for an authorisation request.
-#. TRANS: %s is a listener URI.
-#: actions/userauthorization.php:325
+#: actions/userauthorization.php:303
 #, php-format
-msgid "Listener URI \"%s\" not found here."
+msgid "Listener URI ‘%s’ not found here."
 msgstr ""
 
-#. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:332
+#: actions/userauthorization.php:308
 #, fuzzy, php-format
-msgid "Listenee URI \"%s\" is too long."
+msgid "Listenee URI ‘%s’ is too long."
 msgstr "Изходният адрес е твърде дълъг."
 
-#. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:340
-#, php-format
-msgid "Listenee URI \"%s\" is a local user."
-msgstr ""
-
-#. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
-#. TRANS: %s is a profile URL.
-#: actions/userauthorization.php:358
-#, php-format
-msgid "Profile URL \"%s\" is for a local user."
-msgstr ""
-
-#. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
-#. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
-#: actions/userauthorization.php:368
-#, php-format
-msgid ""
-"Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
-"\"."
-msgstr ""
-
-#. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:378
+#: actions/userauthorization.php:314
 #, fuzzy, php-format
-msgid "Avatar URL \"%s\" is not valid."
+msgid "Listenee URI ‘%s’ is a local user."
+msgstr "Изходният адрес е твърде дълъг."
+
+#: actions/userauthorization.php:329
+#, php-format
+msgid "Profile URL ‘%s’ is for a local user."
+msgstr ""
+
+#: actions/userauthorization.php:345
+#, fuzzy, php-format
+msgid "Avatar URL ‘%s’ is not valid."
 msgstr "Адресът на личната страница не е правилен URL."
 
-#. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:385
+#: actions/userauthorization.php:350
 #, fuzzy, php-format
-msgid "Cannot read avatar URL \"%s\"."
+msgid "Can’t read avatar URL ‘%s’."
 msgstr "Грешка при четене адреса на аватара '%s'"
 
-#. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:392
+#: actions/userauthorization.php:355
 #, fuzzy, php-format
-msgid "Wrong image type for avatar URL \"%s\"."
+msgid "Wrong image type for avatar URL ‘%s’."
 msgstr "Грешен вид изображение за '%s'"
 
 #. TRANS: Page title for profile design page.
@@ -6777,7 +6661,7 @@ msgid "Plugins"
 msgstr "Приставки"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:898
+#: actions/version.php:198 lib/action.php:901
 msgid "Version"
 msgstr "Версия"
 
@@ -6990,14 +6874,14 @@ msgstr "Проблем при записване на бележката."
 
 #. TRANS: Server exception thrown when a reply cannot be saved.
 #. TRANS: %1$d is a notice ID, %2$d is the ID of the mentioned user.
-#: classes/Notice.php:1142
+#: classes/Notice.php:1144
 #, fuzzy, php-format
 msgid "Could not save reply for %1$d, %2$d."
 msgstr "Грешка при запазване на етикетите."
 
 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1661
+#: classes/Notice.php:1663
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
@@ -7011,14 +6895,14 @@ msgstr "%1$s (%2$s)"
 
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:775
+#: classes/Profile.php:779
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:784
+#: classes/Profile.php:788
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -7346,53 +7230,53 @@ msgid "Page notice"
 msgstr "Нова бележка"
 
 #. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:871
+#: lib/action.php:874
 msgid "Secondary site navigation"
 msgstr "Основна настройка на сайта"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:877
+#: lib/action.php:880
 msgid "Help"
 msgstr "Помощ"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:880
+#: lib/action.php:883
 msgid "About"
 msgstr "Относно"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:883
+#: lib/action.php:886
 msgid "FAQ"
 msgstr "Въпроси"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:888
+#: lib/action.php:891
 msgid "TOS"
 msgstr "Условия"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:892
+#: lib/action.php:895
 msgid "Privacy"
 msgstr "Поверителност"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:895
+#: lib/action.php:898
 msgid "Source"
 msgstr "Изходен код"
 
 #. TRANS: Secondary navigation menu option leading to e-mail contact information on the
 #. TRANS: StatusNet site, where to report bugs, ...
-#: lib/action.php:902
+#: lib/action.php:905
 msgid "Contact"
 msgstr "Контакт"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:905
+#: lib/action.php:908
 msgid "Badge"
 msgstr "Табелка"
 
 #. TRANS: DT element for StatusNet software license.
-#: lib/action.php:934
+#: lib/action.php:937
 msgid "StatusNet software license"
 msgstr "Лиценз на програмата StatusNet"
 
@@ -7400,7 +7284,7 @@ msgstr "Лиценз на програмата StatusNet"
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:941
+#: lib/action.php:944
 #, fuzzy, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7410,7 +7294,7 @@ msgstr ""
 "broughtby%%](%%site.broughtbyurl%%). "
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:944
+#: lib/action.php:947
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** е услуга за микроблогване."
@@ -7419,7 +7303,7 @@ msgstr "**%%site.name%%** е услуга за микроблогване."
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:951
+#: lib/action.php:954
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7431,50 +7315,50 @@ msgstr ""
 "licensing/licenses/agpl-3.0.html)."
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:967
+#: lib/action.php:970
 msgid "Site content license"
 msgstr "Лиценз на съдържанието"
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:974
+#: lib/action.php:977
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:981
+#: lib/action.php:984
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:985
+#: lib/action.php:988
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:1017
+#: lib/action.php:1020
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
 
 #. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1353
+#: lib/action.php:1356
 msgid "Pagination"
 msgstr "Страниране"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1364
+#: lib/action.php:1367
 msgid "After"
 msgstr "След"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1374
+#: lib/action.php:1377
 msgid "Before"
 msgstr "Преди"
 
@@ -7681,23 +7565,19 @@ msgstr ""
 msgid "No application for that consumer key."
 msgstr ""
 
-#: lib/apiauth.php:202 lib/apiauth.php:284
-msgid "Not allowed to use API."
-msgstr ""
-
 #. TRANS: OAuth exception given when an incorrect access token was given for a user.
-#: lib/apiauth.php:225
+#: lib/apiauth.php:219
 msgid "Bad access token."
 msgstr ""
 
 #. TRANS: OAuth exception given when no user was found for a given token (no token was found).
-#: lib/apiauth.php:230
+#: lib/apiauth.php:224
 msgid "No user for that token."
 msgstr ""
 
 #. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel".
 #. TRANS: Client error thrown when authentication fails.
-#: lib/apiauth.php:272 lib/apiauth.php:302
+#: lib/apiauth.php:266 lib/apiauth.php:293
 msgid "Could not authenticate you."
 msgstr ""
 
@@ -7910,11 +7790,6 @@ msgstr "Паролата е записана."
 msgid "Block"
 msgstr "Блокиране"
 
-#. TRANS: Description of the form to block a user.
-#: lib/blockform.php:79
-msgid "Block this user"
-msgstr "Блокиране на потребителя"
-
 #. TRANS: Title for command results.
 #: lib/channel.php:160 lib/channel.php:181
 msgid "Command results"
@@ -7944,7 +7819,7 @@ msgstr "Не е открита бележка с такъв идентифика
 
 #. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
 #. TRANS: Error text shown when a last user notice is requested and it does not exist.
-#: lib/command.php:99 lib/command.php:630
+#: lib/command.php:99 lib/command.php:642
 #, fuzzy
 msgid "User has no last notice."
 msgstr "Потребителят няма последна бележка"
@@ -7995,35 +7870,41 @@ msgstr ""
 "Абонати: %2$s\n"
 "Бележки: %3$s"
 
+#. TRANS: Error message text shown when a favorite could not be set because it has already been favorited.
+#: lib/command.php:298
+#, fuzzy
+msgid "Could not create favorite: already favorited."
+msgstr "Грешка при отбелязване като любима."
+
 #. TRANS: Text shown when a notice has been marked as favourite successfully.
-#: lib/command.php:312
+#: lib/command.php:324
 msgid "Notice marked as fave."
 msgstr "Бележката е отбелязана като любима."
 
 #. TRANS: Message given having added a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:357
+#: lib/command.php:369
 #, php-format
 msgid "%1$s joined group %2$s."
 msgstr ""
 
 #. TRANS: Message given having removed a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:405
+#: lib/command.php:417
 #, php-format
 msgid "%1$s left group %2$s."
 msgstr ""
 
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: lib/command.php:426
+#: lib/command.php:438
 #, fuzzy, php-format
 msgctxt "WHOIS"
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
 
 #. TRANS: Whois output. %s is the full name of the queried user.
-#: lib/command.php:430
+#: lib/command.php:442
 #, php-format
 msgid "Fullname: %s"
 msgstr "Пълно име: %s"
@@ -8031,7 +7912,7 @@ msgstr "Пълно име: %s"
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a location.
-#: lib/command.php:434 lib/mail.php:270
+#: lib/command.php:446 lib/mail.php:270
 #, php-format
 msgid "Location: %s"
 msgstr "Местоположение: %s"
@@ -8039,20 +7920,20 @@ msgstr "Местоположение: %s"
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a homepage.
-#: lib/command.php:438 lib/mail.php:274
+#: lib/command.php:450 lib/mail.php:274
 #, php-format
 msgid "Homepage: %s"
 msgstr "Домашна страница: %s"
 
 #. TRANS: Whois output. %s is the bio information of the queried user.
-#: lib/command.php:442
+#: lib/command.php:454
 #, php-format
 msgid "About: %s"
 msgstr "Относно: %s"
 
 #. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).
 #. TRANS: %s is a remote profile.
-#: lib/command.php:471
+#: lib/command.php:483
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
@@ -8061,7 +7942,7 @@ msgstr ""
 
 #. TRANS: Message given if content is too long. %1$sd is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:488
+#: lib/command.php:500
 #, fuzzy, php-format
 msgid "Message too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
@@ -8073,25 +7954,25 @@ msgstr[1] ""
 "$d."
 
 #. TRANS: Error text shown sending a direct message fails with an unknown reason.
-#: lib/command.php:516
+#: lib/command.php:528
 msgid "Error sending direct message."
 msgstr "Грешка при изпращане на прякото съобщение"
 
 #. TRANS: Message given having repeated a notice from another user.
 #. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:553
+#: lib/command.php:565
 #, fuzzy, php-format
 msgid "Notice from %s repeated."
 msgstr "Бележката от %s е повторена"
 
 #. TRANS: Error text shown when repeating a notice fails with an unknown reason.
-#: lib/command.php:556
+#: lib/command.php:568
 msgid "Error repeating notice."
 msgstr "Грешка при повтаряне на бележката."
 
 #. TRANS: Message given if content of a notice for a reply is too long. %1$d is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:591
+#: lib/command.php:603
 #, fuzzy, php-format
 msgid "Notice too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Notice too long - maximum is %1$d characters, you sent %2$d."
@@ -8102,103 +7983,103 @@ msgstr[1] ""
 
 #. TRANS: Text shown having sent a reply to a notice successfully.
 #. TRANS: %s is the nickname of the user of the notice the reply was sent to.
-#: lib/command.php:604
+#: lib/command.php:616
 #, fuzzy, php-format
 msgid "Reply to %s sent."
 msgstr "Отговорът до %s е изпратен"
 
 #. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
-#: lib/command.php:607
+#: lib/command.php:619
 msgid "Error saving notice."
 msgstr "Грешка при записване на бележката."
 
 #. TRANS: Error text shown when no username was provided when issuing a subscribe command.
-#: lib/command.php:654
+#: lib/command.php:666
 #, fuzzy
 msgid "Specify the name of the user to subscribe to."
 msgstr "Уточнете името на потребителя, за когото се абонирате."
 
 #. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
-#: lib/command.php:663
+#: lib/command.php:675
 #, fuzzy
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "Не сте абонирани за този профил"
 
 #. TRANS: Text shown after having subscribed to another user successfully.
 #. TRANS: %s is the name of the user the subscription was requested for.
-#: lib/command.php:671
+#: lib/command.php:683
 #, php-format
 msgid "Subscribed to %s."
 msgstr ""
 
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.
-#: lib/command.php:692 lib/command.php:803
+#: lib/command.php:704 lib/command.php:815
 #, fuzzy
 msgid "Specify the name of the user to unsubscribe from."
 msgstr "Уточнете името на потребителя, от когото се отписвате."
 
 #. TRANS: Text shown after having unsubscribed from another user successfully.
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:703
+#: lib/command.php:715
 #, php-format
 msgid "Unsubscribed from %s."
 msgstr ""
 
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
-#: lib/command.php:723 lib/command.php:749
+#: lib/command.php:735 lib/command.php:761
 msgid "Command not yet implemented."
 msgstr "Командата все още не се поддържа."
 
 #. TRANS: Text shown when issuing the command "off" successfully.
-#: lib/command.php:727
+#: lib/command.php:739
 msgid "Notification off."
 msgstr "Уведомлението е изключено."
 
 #. TRANS: Error text shown when the command "off" fails for an unknown reason.
-#: lib/command.php:730
+#: lib/command.php:742
 msgid "Can't turn off notification."
 msgstr "Грешка при изключване на уведомлението."
 
 #. TRANS: Text shown when issuing the command "on" successfully.
-#: lib/command.php:753
+#: lib/command.php:765
 msgid "Notification on."
 msgstr "Уведомлението е включено."
 
 #. TRANS: Error text shown when the command "on" fails for an unknown reason.
-#: lib/command.php:756
+#: lib/command.php:768
 msgid "Can't turn on notification."
 msgstr "Грешка при включване на уведомлението."
 
 #. TRANS: Error text shown when issuing the login command while login is disabled.
-#: lib/command.php:770
+#: lib/command.php:782
 msgid "Login command is disabled."
 msgstr ""
 
 #. TRANS: Text shown after issuing the login command successfully.
 #. TRANS: %s is a logon link..
-#: lib/command.php:783
+#: lib/command.php:795
 #, php-format
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
 
 #. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:812
+#: lib/command.php:824
 #, php-format
 msgid "Unsubscribed %s."
 msgstr ""
 
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
-#: lib/command.php:830
+#: lib/command.php:842
 msgid "You are not subscribed to anyone."
 msgstr "Не сте абонирани за никого."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
-#: lib/command.php:835
+#: lib/command.php:847
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Вече сте абонирани за следните потребители:"
@@ -8206,14 +8087,14 @@ msgstr[1] "Вече сте абонирани за следните потреб
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user
 #. TRANS: (followers) without having any subscribers.
-#: lib/command.php:857
+#: lib/command.php:869
 msgid "No one is subscribed to you."
 msgstr "Никой не е абониран за вас."
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
-#: lib/command.php:862
+#: lib/command.php:874
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Грешка при абониране на друг потребител за вас."
@@ -8221,21 +8102,21 @@ msgstr[1] "Грешка при абониране на друг потребит
 
 #. TRANS: Text shown after requesting groups a user is subscribed to without having
 #. TRANS: any group subscriptions.
-#: lib/command.php:884
+#: lib/command.php:896
 msgid "You are not a member of any groups."
 msgstr "Не членувате в нито една група."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
-#: lib/command.php:889
+#: lib/command.php:901
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "Не членувате в тази група."
 msgstr[1] "Не членувате в тази група."
 
 #. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-#: lib/command.php:904
+#: lib/command.php:916
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -8343,11 +8224,6 @@ msgstr "Изтриване на приложението"
 msgid "Database error"
 msgstr "Грешка в базата от данни"
 
-#. TRANS: Description of form for deleting a user.
-#: lib/deleteuserform.php:75
-msgid "Delete this user"
-msgstr "Изтриване на този потребител"
-
 #. TRANS: Label in form on profile design page.
 #. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
 #: lib/designsettings.php:108
@@ -8386,22 +8262,6 @@ msgstr "Смяна на цветовете"
 msgid "Use defaults"
 msgstr ""
 
-#. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: lib/designsettings.php:259
-msgid "Restore default designs"
-msgstr ""
-
-#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: lib/designsettings.php:267
-msgid "Reset back to default"
-msgstr ""
-
-#. TRANS: Title for button on profile design page to save settings.
-#: lib/designsettings.php:272
-#, fuzzy
-msgid "Save design"
-msgstr "Запазване настройките на сайта"
-
 #. TRANS: Error message displayed if design settings could not be saved.
 #. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
 #: lib/designsettings.php:405 lib/designsettings.php:427
@@ -9190,10 +9050,6 @@ msgstr "Отговаряне на тази бележка"
 msgid "Reply"
 msgstr "Отговор"
 
-#: lib/noticelist.php:673
-msgid "Delete this notice"
-msgstr "Изтриване на бележката"
-
 #: lib/noticelist.php:691
 msgid "Notice repeated"
 msgstr "Бележката е повторена."
@@ -9478,10 +9334,6 @@ msgstr "Покани"
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Поканете приятели и колеги да се присъединят към вас в %s"
 
-#: lib/subscribeform.php:115 lib/subscribeform.php:139
-msgid "Subscribe to this user"
-msgstr "Абониране за този потребител"
-
 #: lib/subscriberspeopleselftagcloudsection.php:48
 #: lib/subscriptionspeopleselftagcloudsection.php:48
 msgid "People Tagcloud as self-tagged"
@@ -9655,23 +9507,18 @@ msgctxt "role"
 msgid "Moderator"
 msgstr "Модератор"
 
-#: lib/util.php:305
-#, fuzzy
-msgid "Not allowed to log in."
-msgstr "Не сте влезли в системата."
-
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1309
+#: lib/util.php:1306
 msgid "a few seconds ago"
 msgstr "преди няколко секунди"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1312
+#: lib/util.php:1309
 msgid "about a minute ago"
 msgstr "преди около минута"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1316
+#: lib/util.php:1313
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
@@ -9679,12 +9526,12 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1319
+#: lib/util.php:1316
 msgid "about an hour ago"
 msgstr "преди около час"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1323
+#: lib/util.php:1320
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
@@ -9692,12 +9539,12 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1326
+#: lib/util.php:1323
 msgid "about a day ago"
 msgstr "преди около ден"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1330
+#: lib/util.php:1327
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
@@ -9705,12 +9552,12 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1333
+#: lib/util.php:1330
 msgid "about a month ago"
 msgstr "преди около месец"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1337
+#: lib/util.php:1334
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
@@ -9718,7 +9565,7 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1340
+#: lib/util.php:1337
 msgid "about a year ago"
 msgstr "преди около година"
 
@@ -9764,3 +9611,59 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#, fuzzy
+#~ msgid "Block this user."
+#~ msgstr "Блокиране на потребителя"
+
+#, fuzzy
+#~ msgid "Delete this notice."
+#~ msgstr "Изтриване на бележката"
+
+#, fuzzy
+#~ msgid "Delete this user."
+#~ msgstr "Изтриване на този потребител"
+
+#, fuzzy
+#~ msgid "Restore default designs."
+#~ msgstr "Грешка при записване настройките за Twitter"
+
+#, fuzzy
+#~ msgid "Save design."
+#~ msgstr "Запазване настройките на сайта"
+
+#, fuzzy
+#~ msgid "Disfavor favorite."
+#~ msgstr "Добавяне към любимите"
+
+#, fuzzy
+#~ msgid "\"%s\" not found."
+#~ msgstr "Не е открит методът в API."
+
+#, fuzzy
+#~ msgid "Notice %s not found."
+#~ msgstr "Не е открит методът в API."
+
+#, fuzzy
+#~ msgid "Attachment %s not found."
+#~ msgstr "Получателят не е открит"
+
+#, fuzzy
+#~ msgid "Invalid tag: \"%s\"."
+#~ msgstr "Неправилен етикет: \"%s\""
+
+#, fuzzy
+#~ msgid "Password saved"
+#~ msgstr "Паролата е записана."
+
+#, fuzzy
+#~ msgid "Where you are, like \"City, State (or Region), Country\"."
+#~ msgstr "Къде се намирате (град, община, държава и т.н.)"
+
+#, fuzzy
+#~ msgid "Subscribe to this user."
+#~ msgstr "Абониране за този потребител"
+
+#, fuzzy
+#~ msgid "Not allowed to log in."
+#~ msgstr "Не сте влезли в системата."
diff --git a/locale/br/LC_MESSAGES/statusnet.po b/locale/br/LC_MESSAGES/statusnet.po
index 430e05af94..c368616265 100644
--- a/locale/br/LC_MESSAGES/statusnet.po
+++ b/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-02-24 10:32+0000\n"
-"PO-Revision-Date: 2011-02-24 10:36:13+0000\n"
+"POT-Creation-Date: 2011-03-03 15:58+0000\n"
+"PO-Revision-Date: 2011-03-03 16:00:13+0000\n"
 "Language-Team: Breton <http://translatewiki.net/wiki/Portal:br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r82712); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-POT-Import-Date: 2011-02-17 11:39:54+0000\n"
+"X-POT-Import-Date: 2011-02-25 23:49:23+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -135,11 +135,7 @@ msgstr "N'eus ket eus ar bajenn-se."
 #. 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 use "one time password login" without using an existing user.
-#. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
-#. TRANS: Client error displayed trying to find a user by ID for a non-existing ID.
-#. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when calling a profile action without specifying a user.
 #: actions/all.php:80 actions/allrss.php:69
@@ -157,12 +153,12 @@ msgstr "N'eus ket eus ar bajenn-se."
 #: actions/apitimelinementions.php:77 actions/apitimelineuser.php:79
 #: actions/avatarbynickname.php:79 actions/favoritesrss.php:72
 #: actions/foaf.php:42 actions/foaf.php:61 actions/hcard.php:67
-#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:78
+#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
 #: actions/remotesubscribe.php:144 actions/remotesubscribe.php:153
-#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:113
-#: actions/showfavorites.php:106 actions/userbyid.php:75
+#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
+#: actions/showfavorites.php:106 actions/userbyid.php:74
 #: actions/usergroups.php:93 actions/userrss.php:40 actions/userxrd.php:59
-#: actions/xrds.php:71 lib/command.php:497 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:509 lib/galleryaction.php:59
 #: lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "N'eus ket eus an implijer-se."
@@ -290,7 +286,7 @@ msgstr "Hizivadennoù %1$s ha mignoned e %2$s!"
 #: actions/apigrouplistall.php:120 actions/apigroupmembership.php:105
 #: actions/apigroupshow.php:114 actions/apihelptest.php:84
 #: actions/apistatusesdestroy.php:101 actions/apistatusesretweets.php:110
-#: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:138
+#: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:139
 #: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
 #: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:268
 #: actions/apitimelinegroup.php:147 actions/apitimelinehome.php:173
@@ -516,7 +512,7 @@ msgstr "N'eo ket bet kavet ar resever."
 #. TRANS: Client error displayed trying to direct message another user who's not a friend (403).
 #: actions/apidirectmessagenew.php:144
 #, fuzzy
-msgid "Cannot send direct messages to users who aren't your friend."
+msgid "Can't send direct messages to users who aren't your friend."
 msgstr ""
 "Ne c'helloc'h ket kas kemennadennoù personel d'an implijerien n'int ket ho "
 "mignoned."
@@ -545,7 +541,7 @@ msgstr "Ur pennroll eo dija ar c'hemenn-mañ."
 #. TRANS: Client error displayed when marking a notice as favourite fails.
 #. TRANS: Server error displayed when trying to mark a notice as favorite fails in the database.
 #. TRANS: Error message text shown when a favorite could not be set.
-#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:294
+#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:306
 msgid "Could not create favorite."
 msgstr "Diposupl eo krouiñ ar pennroll-mañ."
 
@@ -604,7 +600,7 @@ msgstr "Dibosupl eo kavout an implijer pal."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:191
 #: actions/newgroup.php:137 actions/profilesettings.php:273
-#: actions/register.php:206
+#: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "Implijet eo dija al lesanv-se. Klaskit unan all."
 
@@ -614,7 +610,7 @@ msgstr "Implijet eo dija al lesanv-se. Klaskit unan all."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:195
 #: actions/newgroup.php:141 actions/profilesettings.php:243
-#: actions/register.php:208
+#: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "N'eo ket ul lesanv mat."
 
@@ -627,7 +623,7 @@ msgstr "N'eo ket ul lesanv mat."
 #: actions/apigroupcreate.php:181 actions/editapplication.php:235
 #: actions/editgroup.php:202 actions/newapplication.php:221
 #: actions/newgroup.php:148 actions/profilesettings.php:248
-#: actions/register.php:215
+#: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "N'eo ket chomlec'h al lec'hienn personel un URL reizh."
 
@@ -637,7 +633,7 @@ msgstr "N'eo ket chomlec'h al lec'hienn personel un URL reizh."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:191 actions/editgroup.php:206
 #: actions/newgroup.php:152 actions/profilesettings.php:252
-#: actions/register.php:218
+#: actions/register.php:226
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "Re hir eo an anv klok (255 arouezenn d'ar muiañ)."
 
@@ -665,7 +661,7 @@ msgstr[1] "Re hir eo an deskrivadur (%d arouezenn d'ar muiañ)."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:215 actions/editgroup.php:218
 #: actions/newgroup.php:164 actions/profilesettings.php:265
-#: actions/register.php:227
+#: actions/register.php:235
 msgid "Location is too long (maximum 255 characters)."
 msgstr "Re hir eo al lec'hiadur (255 arouezenn d'ar muiañ)."
 
@@ -721,14 +717,14 @@ msgstr "N'eo ket bet kavet ar strollad."
 #. TRANS: Server error displayed when trying to join a group the user is already a member of.
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:333
+#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:345
 msgid "You are already a member of that group."
 msgstr "Un ezel eus ar strollad-mañ eo dija."
 
 #. TRANS: Server error displayed when trying to join a group the user is blocked from joining.
 #. 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.
-#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:338
+#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:350
 msgid "You have been blocked from that group by the admin."
 msgstr "Stanket oc'h bet eus ar strollad-mañ gant ur merour."
 
@@ -738,7 +734,7 @@ msgstr "Stanket oc'h bet eus ar strollad-mañ gant ur merour."
 #. TRANS: %1$s is the joining user's nickname, $2$s is the group nickname for which the join failed.
 #. TRANS: Message given having failed to add a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:350
+#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:362
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "Dibosupl eo stagañ an implijer %1$s d'ar strollad %2$s."
@@ -755,7 +751,7 @@ msgstr "N'oc'h ket ezel eus ar strollad-mañ."
 #. TRANS: Message given having failed to remove a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
 #: actions/apigroupleave.php:127 actions/leavegroup.php:133
-#: lib/command.php:398
+#: lib/command.php:410
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
 msgstr "Dibosupl eo dilemel an implijer %1$s deus ar strollad %2$s."
@@ -815,21 +811,20 @@ msgstr "Aotreet eo bet ar jedouer reked dija."
 #. TRANS: Form validation error message.
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
-#. TRANS: Client error displayed when the session token is not okay.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
 #: actions/deletenotice.php:177 actions/disfavor.php:75
 #: actions/emailsettings.php:291 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:65 actions/grouplogo.php:321
 #: actions/groupunblock.php:65 actions/imsettings.php:224
-#: actions/invite.php:60 actions/login.php:131 actions/makeadmin.php:66
+#: actions/invite.php:60 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
-#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:136
-#: actions/othersettings.php:155 actions/passwordsettings.php:137
+#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
+#: actions/othersettings.php:155 actions/passwordsettings.php:138
 #: actions/profilesettings.php:217 actions/recoverpassword.php:383
-#: actions/register.php:164 actions/remotesubscribe.php:76
+#: actions/register.php:172 actions/remotesubscribe.php:76
 #: actions/repeat.php:82 actions/smssettings.php:250 actions/subedit.php:40
-#: actions/subscribe.php:87 actions/tagother.php:166
-#: actions/unsubscribe.php:69 actions/userauthorization.php:53
+#: actions/subscribe.php:86 actions/tagother.php:166
+#: actions/unsubscribe.php:69 actions/userauthorization.php:52
 #: lib/designsettings.php:310
 msgid "There was a problem with your session token. Try again, please."
 msgstr "Ur gudenn 'zo bet gant ho jedaouer dalc'h. Mar plij adklaskit."
@@ -862,7 +857,7 @@ msgstr ""
 #: actions/designadminpanel.php:100 actions/editapplication.php:144
 #: actions/emailsettings.php:310 actions/grouplogo.php:332
 #: actions/imsettings.php:239 actions/newapplication.php:124
-#: actions/oauthconnectionssettings.php:145 actions/recoverpassword.php:46
+#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
 #: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
 msgstr "Kinnig ar furmskrid dic'hortoz."
@@ -907,20 +902,19 @@ msgstr "Kont"
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group nickname (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT for nick name in a profile.
-#: actions/apioauthauthorize.php:459 actions/login.php:242
-#: actions/profilesettings.php:106 actions/register.php:418
+#: actions/apioauthauthorize.php:459 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:432
 #: actions/showgroup.php:243 actions/tagother.php:94
-#: actions/userauthorization.php:152 lib/groupeditform.php:145
+#: actions/userauthorization.php:145 lib/groupeditform.php:145
 #: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "Lesanv"
 
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:463 actions/login.php:245
-#: actions/register.php:422 lib/accountsettingsaction.php:120
+#: actions/apioauthauthorize.php:463 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:120
 msgid "Password"
 msgstr "Ger-tremen"
 
@@ -1015,13 +1009,13 @@ msgstr "N'eus ket eus an ali-se."
 
 #. TRANS: Client error displayed trying to repeat an own notice through the API.
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:537
+#: actions/apistatusesretweet.php:83 lib/command.php:549
 msgid "Cannot repeat your own notice."
 msgstr "Ne c'helloc'h ket adlavar ho alioù."
 
 #. TRANS: Client error displayed trying to re-repeat a notice through the API.
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:92 lib/command.php:543
+#: actions/apistatusesretweet.php:92 lib/command.php:555
 msgid "Already repeated that notice."
 msgstr "Kemenn bet adkemeret dija."
 
@@ -1043,7 +1037,7 @@ msgstr "N'eo ket skoret an hentenn HTTP."
 #. TRANS: %s is the requested output format.
 #: actions/apistatusesshow.php:144
 #, fuzzy, php-format
-msgid "Unsupported format: %s."
+msgid "Unsupported format: %s"
 msgstr "Diembreget eo ar furmad : %s"
 
 #. TRANS: Client error displayed requesting a deleted status.
@@ -1147,14 +1141,13 @@ msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr "%1$s statud pennroll da %2$s / %2$s."
 
 #. TRANS: Title for site timeline. %s is the StatusNet sitename.
-#. TRANS: Public RSS feed title. %s is the StatusNet site name.
 #: actions/apitimelinepublic.php:193 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "Oberezhioù publik %s"
 
 #. TRANS: Subtitle for site timeline. %s is the StatusNet sitename.
-#: actions/apitimelinepublic.php:199
+#: actions/apitimelinepublic.php:199 actions/publicrss.php:105
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "%s statud an holl !"
@@ -1221,26 +1214,25 @@ msgid "Atom post must be an Atom entry."
 msgstr ""
 
 #. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
-#: actions/apitimelineuser.php:334
+#: actions/apitimelineuser.php:335
 msgid "Can only handle POST activities."
 msgstr ""
 
 #. TRANS: Client error displayed when using an unsupported activity object type.
 #. TRANS: %s is the unsupported activity object type.
-#: actions/apitimelineuser.php:345
+#: actions/apitimelineuser.php:346
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
 #. TRANS: %d is the notice ID (number).
-#: actions/apitimelineuser.php:379
+#: actions/apitimelineuser.php:380
 #, php-format
 msgid "No content for notice %d."
 msgstr "N'eus danvez ebet evit ar gemennadenn%d."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#. TRANS: %s is the notice URI.
 #: actions/apitimelineuser.php:408
 #, php-format
 msgid "Notice with URI \"%s\" already exists."
@@ -1258,10 +1250,9 @@ msgstr "N'eo ket bet kavet an implijer."
 
 #. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
 #. TRANS: Client exception.
-#. TRANS: Client error displayed trying to subscribe to a non-existing profile.
 #: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
 #: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
-#: actions/subscribe.php:110
+#: actions/subscribe.php:107
 msgid "No such profile."
 msgstr "N'eus ket eus ar profil-se."
 
@@ -1391,7 +1382,7 @@ msgstr "Diposupl eo dilemel pennroll un den all."
 #: actions/joingroup.php:95 actions/leavegroup.php:82
 #: actions/leavegroup.php:95 actions/makeadmin.php:86
 #: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:380
+#: lib/command.php:392
 msgid "No such group."
 msgstr "N'eus ket eus ar strollad-se."
 
@@ -1401,7 +1392,7 @@ msgid "Not a member."
 msgstr "N'eo ket ezel."
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
-#: actions/atompubshowmembership.php:150
+#: actions/atompubshowmembership.php:151
 #, fuzzy
 msgid "Cannot delete someone else's membership."
 msgstr "Dibosupl eo dilemel ar c'houmanant."
@@ -1506,11 +1497,9 @@ msgstr ""
 
 #. TRANS: Server error displayed in avatar upload page when no matching profile can be found for a user.
 #. TRANS: Server error displayed coming across a request from a user without a profile.
-#. TRANS: Server error displayed when trying to authorise a remote subscription request
-#. TRANS: while the user has no profile.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
 #: actions/grouplogo.php:184 actions/remotesubscribe.php:190
-#: actions/userauthorization.php:75 actions/userrss.php:108
+#: actions/userauthorization.php:72 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr "Implijer hep profil klotus."
 
@@ -1565,10 +1554,10 @@ msgstr "Adframmañ"
 msgid "No file uploaded."
 msgstr "N'eus bet enporzhiet restr ebet."
 
-#. TRANS: Avatar upload form instruction after uploading a file.
+#. TRANS: Avatar upload form unstruction after uploading a file.
 #: actions/avatarsettings.php:345
 #, fuzzy
-msgid "Pick a square area of the image to be your avatar."
+msgid "Pick a square area of the image to be your avatar"
 msgstr "Diuzit ur zonenn gant ur stumm karrez evit tremeniñ ho avatar"
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
@@ -1609,7 +1598,7 @@ msgid "You may not backup your account."
 msgstr "Ne c'hallit ket saveteiñ ho kont."
 
 #. TRANS: Information displayed on the backup account page.
-#: actions/backupaccount.php:225
+#: actions/backupaccount.php:227
 msgid ""
 "You can backup your account data in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format. This is an experimental feature and provides "
@@ -1619,15 +1608,15 @@ msgid ""
 msgstr ""
 
 #. TRANS: Submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:248
+#: actions/backupaccount.php:250
 msgctxt "BUTTON"
 msgid "Backup"
 msgstr "Eilenn savete"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:252
+#: actions/backupaccount.php:254
 #, fuzzy
-msgid "Backup your account."
+msgid "Backup your account"
 msgstr "Saveteiñ ho kont"
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
@@ -1666,7 +1655,7 @@ msgstr "Ket"
 #. TRANS: Submit button title for 'No' when blocking a user.
 #: actions/block.php:158
 #, fuzzy
-msgid "Do not block this user."
+msgid "Do not block this user"
 msgstr "Arabat stankañ an implijer-mañ"
 
 #. TRANS: Button label on the user block form.
@@ -1683,9 +1672,9 @@ msgid "Yes"
 msgstr "Ya"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:165
-#, fuzzy
-msgid "Block this user."
+#. TRANS: Description of the form to block a user.
+#: actions/block.php:165 lib/blockform.php:79
+msgid "Block this user"
 msgstr "Stankañ an implijer-mañ"
 
 #. TRANS: Server error displayed when blocking a user fails.
@@ -1845,7 +1834,7 @@ msgstr ""
 #. TRANS: Field label for delete account confirmation entry.
 #. TRANS: Field label for password reset form where the password has to be typed again.
 #: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:262 actions/register.php:426
+#: actions/recoverpassword.php:262 actions/register.php:440
 msgid "Confirm"
 msgstr "Kadarnaat"
 
@@ -1874,14 +1863,14 @@ msgstr "N'eo ket bet kavet ar poellad"
 #. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
 #: actions/deleteapplication.php:79 actions/editapplication.php:78
-#: actions/showapplication.php:90
+#: actions/showapplication.php:94
 msgid "You are not the owner of this application."
 msgstr "N'oc'h ket perc'henn ar poellad-se."
 
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
-#: actions/newapplication.php:112 actions/showapplication.php:113
-#: lib/action.php:1422
+#: actions/newapplication.php:112 actions/showapplication.php:118
+#: lib/action.php:1425
 msgid "There was a problem with your session token."
 msgstr "Ur gudenn 'zo bet gant ho jedaouer dalc'h."
 
@@ -1902,13 +1891,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting an application.
 #: actions/deleteapplication.php:161
 #, fuzzy
-msgid "Do not delete this application."
+msgid "Do not delete this application"
 msgstr "Arabat eo dilemel ar poellad-mañ"
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
 #: actions/deleteapplication.php:167
 #, fuzzy
-msgid "Delete this application."
+msgid "Delete this application"
 msgstr "Dilemel ar poelad-se"
 
 #. TRANS: Client error when trying to delete group while not logged in.
@@ -1960,13 +1949,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting a group.
 #: actions/deletegroup.php:224
 #, fuzzy
-msgid "Do not delete this group."
+msgid "Do not delete this group"
 msgstr "Arabat dilemel ar strollad-mañ"
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
 #: actions/deletegroup.php:231
 #, fuzzy
-msgid "Delete this group."
+msgid "Delete this group"
 msgstr "Dilemel ar strollad-mañ"
 
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
@@ -1974,15 +1963,13 @@ msgstr "Dilemel ar strollad-mañ"
 #. TRANS: Client error displayed when trying to mark a notice as favorite without being logged in.
 #. TRANS: Client error displayed trying to block a user from a group while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
-#. TRANS: Client error displayed trying to log out when not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
-#. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
 #. TRANS: Client error displayed when trying to change user options while not logged in.
 #: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
-#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:70
+#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
-#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:98
+#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
 #: lib/adminpanelaction.php:71 lib/profileformaction.php:63
 #: lib/settingsaction.php:72
@@ -2010,13 +1997,12 @@ msgstr "Ha sur oc'h hoc'h eus c'hoant da zilemel ar c'hemenn-mañ ?"
 #. TRANS: Submit button title for 'No' when deleting a notice.
 #: actions/deletenotice.php:159
 #, fuzzy
-msgid "Do not delete this notice."
+msgid "Do not delete this notice"
 msgstr "Arabat dilemel ar c'hemenn-mañ"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:166
-#, fuzzy
-msgid "Delete this notice."
+#: actions/deletenotice.php:166 lib/noticelist.php:673
+msgid "Delete this notice"
 msgstr "Dilemel ar c'hemenn-mañ"
 
 #. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
@@ -2050,13 +2036,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting a user.
 #: actions/deleteuser.php:158
 #, fuzzy
-msgid "Do not delete this user."
+msgid "Do not delete this user"
 msgstr "Arabat dilemel an implijer-mañ"
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
-#: actions/deleteuser.php:165
-#, fuzzy
-msgid "Delete this user."
+#. TRANS: Description of form for deleting a user.
+#: actions/deleteuser.php:165 lib/deleteuserform.php:75
+msgid "Delete this user"
 msgstr "Diverkañ an implijer-mañ"
 
 #. TRANS: Message used as title for design settings for the site.
@@ -2220,21 +2206,21 @@ msgid "Use defaults"
 msgstr "Implijout an talvoudoù dre ziouer"
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:720
-#, fuzzy
-msgid "Restore default designs."
+#. TRANS: Title for button on profile design page to reset all colour settings to default.
+#: actions/designadminpanel.php:720 lib/designsettings.php:259
+msgid "Restore default designs"
 msgstr "Adlakaat an neuz dre ziouer."
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:728
-#, fuzzy
-msgid "Reset back to default."
+#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
+#: actions/designadminpanel.php:728 lib/designsettings.php:267
+msgid "Reset back to default"
 msgstr "Adlakaat an arventennoù dre ziouer"
 
 #. TRANS: Title for button for saving theme settings.
-#: actions/designadminpanel.php:736
-#, fuzzy
-msgid "Save design."
+#. TRANS: Title for button on profile design page to save settings.
+#: actions/designadminpanel.php:736 lib/designsettings.php:272
+msgid "Save design"
 msgstr "Enrollañ an design"
 
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
@@ -2266,7 +2252,7 @@ msgid "You must be logged in to edit an application."
 msgstr "Ret eo bezañ kevreet evit kemmañ ur poellad."
 
 #. TRANS: Client error displayed trying to edit an application that does not exist.
-#: actions/editapplication.php:83 actions/showapplication.php:83
+#: actions/editapplication.php:83 actions/showapplication.php:87
 msgid "No such application."
 msgstr "N'eus ket eus an arload-mañ."
 
@@ -2548,7 +2534,7 @@ msgid "Cannot normalize that email address."
 msgstr "Diposubl eo implijout an ID Jabber-mañ"
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:393 actions/register.php:204
+#: actions/emailsettings.php:393 actions/register.php:212
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "N'eo ket ur chomlec'h postel reizh."
@@ -2621,21 +2607,18 @@ msgstr "Chomlec'h postel ebet o tont."
 
 #. 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.
 #: actions/emailsettings.php:530 actions/emailsettings.php:554
-#: actions/smssettings.php:566 actions/smssettings.php:591
+#: actions/smssettings.php:565 actions/smssettings.php:588
 msgid "Could not update user record."
 msgstr "Dibosupl hizivaat teuliad an implijer."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
-#. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:534 actions/smssettings.php:570
+#: actions/emailsettings.php:534 actions/smssettings.php:568
 msgid "Incoming email address removed."
 msgstr "Diverket eo bet ar chomlec'h postel o tont tre."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
-#. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:558 actions/smssettings.php:595
+#: actions/emailsettings.php:558 actions/smssettings.php:591
 msgid "New incoming email address added."
 msgstr "Ouzhpennet ez eus bet ur chomlec'h postel nevez o tont tre"
 
@@ -2647,7 +2630,7 @@ msgstr "Ouzhpennet eo bet ar c'hemenn-mañ d'ho pennrolloù dija !"
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
 #: actions/favor.php:95
 #, fuzzy
-msgid "Disfavor favorite."
+msgid "Disfavor favorite"
 msgstr "Tennañ ar pennroll"
 
 #. TRANS: Page title for first page of favorited notices.
@@ -2885,12 +2868,14 @@ msgstr ""
 
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
 #: actions/groupblock.php:191
-msgid "Do not block this user from this group."
+#, fuzzy
+msgid "Do not block this user from this group"
 msgstr "Arabat stankañ an implijer-mañ er strollad-mañ."
 
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
 #: actions/groupblock.php:198
-msgid "Block this user from this group."
+#, fuzzy
+msgid "Block this user from this group"
 msgstr "Stankañ an implijer-mañ er strollad-mañ."
 
 #. TRANS: Server error displayed when trying to block a user from a group fails because of an application error.
@@ -2900,7 +2885,6 @@ msgid "Database error blocking user from group."
 msgstr "Distankañ implijer ar strollad"
 
 #. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
-#. TRANS: Client error displayed trying to find a user by ID without providing an ID.
 #: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr "ID ebet"
@@ -3083,10 +3067,8 @@ msgid "Group search"
 msgstr "Klask strolladoù"
 
 #. TRANS: Text on page where groups can be searched if no results were found for a query.
-#. TRANS: Text for notice search results is the query had no results.
-#. TRANS: Message on the "People search" page where a query has no results.
-#: actions/groupsearch.php:82 actions/noticesearch.php:122
-#: actions/peoplesearch.php:87
+#: actions/groupsearch.php:82 actions/noticesearch.php:117
+#: actions/peoplesearch.php:83
 msgid "No results."
 msgstr "Disoc'h ebet."
 
@@ -3123,7 +3105,6 @@ msgid "User is not blocked from group."
 msgstr "N'eo ket stanket an implijer-mañ eus ar strollad."
 
 #. TRANS: Server error displayed when unblocking a user from a group fails because of an unknown error.
-#. TRANS: Server error displayed when removing a user block.
 #: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "Ur fazi a zo bet e-pad nulladenn ar stankadenn."
@@ -3211,8 +3192,7 @@ msgid "Publish a MicroID for my Jabber/Google Talk address."
 msgstr "Embann ur MicroID evit ma chomlec'h Jabber/GTalk."
 
 #. TRANS: Confirmation message for successful Instant Messaging preferences save.
-#. TRANS: Confirmation message after saving preferences.
-#: actions/imsettings.php:283 actions/othersettings.php:193
+#: actions/imsettings.php:283 actions/othersettings.php:192
 msgid "Preferences saved."
 msgstr "Penndibaboù enrollet"
 
@@ -3476,7 +3456,7 @@ msgstr "Ret eo deoc'h bezañ kevreet evit kuitaat ur strollad"
 
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
-#: actions/leavegroup.php:103 lib/command.php:386
+#: actions/leavegroup.php:103 lib/command.php:398
 msgid "You are not a member of that group."
 msgstr "N'oc'h ket un ezel eus ar strollad-mañ."
 
@@ -3599,45 +3579,43 @@ msgstr "Enrollañ"
 msgid "Save license settings"
 msgstr "Enrollañ arventennoù an aotre-implijout"
 
-#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
-#: actions/login.php:97 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
 msgid "Already logged in."
 msgstr "Kevreet oc'h dija."
 
-#: actions/login.php:142
+#: actions/login.php:148
 msgid "Incorrect username or password."
 msgstr "Anv implijer pe ger-tremen direizh."
 
-#. TRANS: Server error displayed when a user object could not be created trying to login using "one time password login".
-#: actions/login.php:148 actions/otp.php:127
+#: actions/login.php:154 actions/otp.php:120
 msgid "Error setting user. You are probably not authorized."
 msgstr ""
 "Ur fazi 'zo bet e-pad hizivadenn an implijer. Moarvat n'oc'h ket aotreet "
 "evit en ober."
 
-#: actions/login.php:202 actions/login.php:253
+#: actions/login.php:210 actions/login.php:263
 msgid "Login"
 msgstr "Kevreañ"
 
-#: actions/login.php:239
+#: actions/login.php:249
 msgid "Login to site"
 msgstr "Kevreañ d'al lec'hienn"
 
-#: actions/login.php:248 actions/register.php:476
+#: actions/login.php:258 actions/register.php:490
 msgid "Remember me"
 msgstr "Kaout soñj"
 
-#: actions/login.php:249 actions/register.php:478
+#: actions/login.php:259 actions/register.php:492
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 "Digeriñ va dalc'h war-eeun ar wechoù o tont ; arabat en ober war "
 "urzhiataeroù rannet pe publik !"
 
-#: actions/login.php:259
+#: actions/login.php:269
 msgid "Lost or forgotten password?"
 msgstr "Ha kollet ho peus ho ker-tremen ?"
 
-#: actions/login.php:277
+#: actions/login.php:288
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -3645,11 +3623,11 @@ msgstr ""
 "Evit abegoù a surentezh, mar plij adlakait hoc'h anv implijer hag ho ker-"
 "tremen a-benn enrollañ ho penndibaboù."
 
-#: actions/login.php:281
+#: actions/login.php:292
 msgid "Login with your username and password."
 msgstr "Kevreit gant ho anv implijer hag ho ker-tremen."
 
-#: actions/login.php:284
+#: actions/login.php:295
 #, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -3732,14 +3710,14 @@ msgid "New message"
 msgstr "Kemennadenn nevez"
 
 #. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
-#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:501
+#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:513
 msgid "You can't send a message to this user."
 msgstr "Ne c'helloc'h ket kas kemennadennoù d'an implijer-mañ."
 
 #. TRANS: Command exception text shown when trying to send a direct message to another user without content.
 #. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
-#: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:478
-#: lib/command.php:581
+#: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:490
+#: lib/command.php:593
 msgid "No content!"
 msgstr "Goullo eo !"
 
@@ -3748,7 +3726,7 @@ msgid "No recipient specified."
 msgstr "N'ho peus ket lakaet a resever."
 
 #. TRANS: Error text shown when trying to send a direct message to self.
-#: actions/newmessage.php:167 lib/command.php:505
+#: actions/newmessage.php:167 lib/command.php:517
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
@@ -3761,7 +3739,7 @@ msgstr "Kemennadenn kaset"
 
 #. TRANS: Message given have sent a direct message to another user.
 #. TRANS: %s is the name of the other user.
-#: actions/newmessage.php:188 lib/command.php:513
+#: actions/newmessage.php:188 lib/command.php:525
 #, php-format
 msgid "Direct message to %s sent."
 msgstr "Kaset eo bet da %s ar gemennadenn war-eeun."
@@ -3778,9 +3756,7 @@ msgstr "Ali nevez"
 msgid "Notice posted"
 msgstr "Ali embannet"
 
-#. TRANS: Instructions for Notice search page.
-#. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/noticesearch.php:69
+#: actions/noticesearch.php:68
 #, fuzzy, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -3790,30 +3766,23 @@ msgstr ""
 "Dispartiañ termenoù ar c'hlask gant esaouennoù. Ret eo e vefe da nebeutañ 3 "
 "arouezenn."
 
-#. TRANS: Title of the page where users can search for notices.
-#: actions/noticesearch.php:80
+#: actions/noticesearch.php:78
 msgid "Text search"
 msgstr "Klask testennoù"
 
-#. TRANS: Test in RSS notice search.
-#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearch.php:95
+#: actions/noticesearch.php:91
 #, php-format
 msgid "Search results for \"%1$s\" on %2$s"
 msgstr "Disoc'hoù ar c'hlask evit \"%1$s\" e %2$s"
 
-#. TRANS: Text for logged in users making a query for notices without results.
-#. TRANS: This message contains a Markdown link.
-#: actions/noticesearch.php:128
+#: actions/noticesearch.php:121
 #, php-format
 msgid ""
 "Be the first to [post on this topic](%%%%action.newnotice%%%%?"
 "status_textarea=%s)!"
 msgstr ""
 
-#. TRANS: Text for not logged in users making a query for notices without results.
-#. TRANS: This message contains Markdown links.
-#: actions/noticesearch.php:133
+#: actions/noticesearch.php:124
 #, fuzzy, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and be the first to "
@@ -3822,17 +3791,14 @@ msgstr ""
 "Perak ne [groufec'h ket ur gont](%%action.register%%) ha bezañ an hini "
 "gentañ da embann un dra !"
 
-#. TRANS: RSS notice search feed title. %s is the query.
-#: actions/noticesearchrss.php:95
+#: actions/noticesearchrss.php:96
 #, php-format
 msgid "Updates with \"%s\""
 msgstr "Hizivadenn gant \"%s\""
 
-#. TRANS: RSS notice search feed description.
-#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearchrss.php:99
+#: actions/noticesearchrss.php:98
 #, fuzzy, php-format
-msgid "Updates matching search term \"%1$s\" on %2$s."
+msgid "Updates matching search term \"%1$s\" on %2$s!"
 msgstr "Hizivadennoù merket gant %1$s e %2$s !"
 
 #: actions/nudge.php:85
@@ -3871,30 +3837,30 @@ msgid "You have not registered any applications yet."
 msgstr "N'ho peus enrollet poellad ebet evit poent."
 
 #. TRANS: Title for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:70
+#: actions/oauthconnectionssettings.php:71
 msgid "Connected applications"
 msgstr "Poeladoù kevreet."
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:81
+#: actions/oauthconnectionssettings.php:83
 msgid "The following connections exist for your account."
 msgstr ""
 
 #. TRANS: Client error when trying to revoke access for an application while not being a user of it.
-#: actions/oauthconnectionssettings.php:166
+#: actions/oauthconnectionssettings.php:168
 msgid "You are not a user of that application."
 msgstr "N'oc'h ket un implijer eus ar poellad-mañ."
 
 #. TRANS: Client error when revoking access has failed for some reason.
 #. TRANS: %s is the application ID revoking access failed for.
-#: actions/oauthconnectionssettings.php:181
+#: actions/oauthconnectionssettings.php:183
 #, fuzzy, php-format
 msgid "Unable to revoke access for application: %s."
 msgstr "Dibosupl eo nullañ moned ar poellad : "
 
 #. TRANS: Success message after revoking access for an application.
 #. TRANS: %1$s is the application name, %2$s is the first part of the user token.
-#: actions/oauthconnectionssettings.php:200
+#: actions/oauthconnectionssettings.php:202
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -3902,30 +3868,20 @@ msgid ""
 msgstr ""
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:211
+#: actions/oauthconnectionssettings.php:213
 msgid "You have not authorized any applications to use your account."
 msgstr "N'ho peus aotreet poellad ebet da implijout ho kont."
 
 #. TRANS: Note for developers in the OAuth connection settings form.
 #. TRANS: This message contains a Markdown link. Do not separate "](".
 #. TRANS: %s is the URL to the OAuth settings.
-#: actions/oauthconnectionssettings.php:231
+#: actions/oauthconnectionssettings.php:233
 #, php-format
 msgid ""
 "Are you a developer? [Register an OAuth client application](%s) to use with "
 "this instance of StatusNet."
 msgstr ""
 
-#: actions/oembed.php:64
-#, fuzzy, php-format
-msgid "\"%s\" not found."
-msgstr "N'eo ket bet kavet an implijer."
-
-#: actions/oembed.php:76
-#, fuzzy, php-format
-msgid "Notice %s not found."
-msgstr "N'eo ket bet kavet an hentenn API !"
-
 #: actions/oembed.php:80 actions/shownotice.php:100
 msgid "Notice has no profile."
 msgstr "N'en deus ket an ali a profil."
@@ -3935,16 +3891,6 @@ msgstr "N'en deus ket an ali a profil."
 msgid "%1$s's status on %2$s"
 msgstr "Statud %1$s war %2$s"
 
-#: actions/oembed.php:95
-#, fuzzy, php-format
-msgid "Attachment %s not found."
-msgstr "N'eo ket bet kavet ar resever."
-
-#: actions/oembed.php:136
-#, php-format
-msgid "\"%s\" not supported for oembed requests."
-msgstr ""
-
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
 #: actions/oembed.php:168
 #, fuzzy, php-format
@@ -3964,12 +3910,11 @@ msgstr ""
 msgid "Not a supported data format."
 msgstr "Diembreget eo ar furmad-se."
 
-#. TRANS: ShortName in the OpenSearch interface when trying to find users.
 #: actions/opensearch.php:64
 msgid "People Search"
 msgstr "Klask tud"
 
-#: actions/opensearch.php:68
+#: actions/opensearch.php:67
 msgid "Notice Search"
 msgstr "Klask alioù"
 
@@ -4018,50 +3963,41 @@ msgstr "Diskouez pe kuzhat designoù ar profil."
 msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr "Re hir eo ar yezh (255 arouezenn d'ar muiañ)."
 
-#. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
-#: actions/otp.php:70
+#: actions/otp.php:69
 msgid "No user ID specified."
 msgstr "N'eus bet diferet ID implijer ebet."
 
-#. TRANS: Client error displayed trying to use "one time password login" without specifying a login token.
-#: actions/otp.php:86
+#: actions/otp.php:83
 #, fuzzy
 msgid "No login token specified."
 msgstr "N'eus bet diferet ali ebet."
 
-#. TRANS: Client error displayed trying to use "one time password login" without requesting a login token.
-#: actions/otp.php:94
+#: actions/otp.php:90
 #, fuzzy
 msgid "No login token requested."
 msgstr "N'eus profil ID ebet er reked."
 
-#. TRANS: Client error displayed trying to use "one time password login" while specifying an invalid login token.
-#: actions/otp.php:100
+#: actions/otp.php:95
 #, fuzzy
 msgid "Invalid login token specified."
 msgstr "Fichenn direizh."
 
-#. TRANS: Client error displayed trying to use "one time password login" while specifying an expired login token.
-#: actions/otp.php:110
+#: actions/otp.php:104
 #, fuzzy
 msgid "Login token expired."
 msgstr "Kevreañ d'al lec'hienn"
 
-#. TRANS: Title for outbox for any but the fist page.
-#. TRANS: %1$s is the user nickname, %2$d is the page number.
-#: actions/outbox.php:57
+#: actions/outbox.php:58
 #, php-format
 msgid "Outbox for %1$s - page %2$d"
 msgstr "Boest kas %1$s - pajenn %2$d"
 
-#. TRANS: Title for first page of outbox.
 #: actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
 msgstr "Boest kas %s"
 
-#. TRANS: Instructions for outbox.
-#: actions/outbox.php:103
+#: actions/outbox.php:104
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr ""
 
@@ -4087,45 +4023,43 @@ msgstr "Ger-tremen kozh"
 msgid "New password"
 msgstr "Ger-tremen nevez"
 
-#: actions/passwordsettings.php:109 actions/register.php:423
+#: actions/passwordsettings.php:109
 #, fuzzy
-msgid "6 or more characters."
+msgid "6 or more characters"
 msgstr "6 arouezenn pe muioc'h"
 
-#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:264
-#: actions/register.php:427
+#: actions/passwordsettings.php:113
 #, fuzzy
-msgid "Same as password above."
+msgid "Same as password above"
 msgstr "Memestra eget ar ger tremen a-us"
 
 #: actions/passwordsettings.php:117
 msgid "Change"
 msgstr "Kemmañ"
 
-#: actions/passwordsettings.php:153 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:238
 msgid "Password must be 6 or more characters."
 msgstr "Rankout a ra ar ger-tremen bezañ gant 6 arouezenn d'an nebeutañ."
 
-#: actions/passwordsettings.php:156 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:241
 msgid "Passwords don't match."
 msgstr "Ne glot ket ar gerioù-tremen."
 
-#: actions/passwordsettings.php:164
+#: actions/passwordsettings.php:165
 msgid "Incorrect old password"
 msgstr "Ger-termen kozh direizh"
 
-#: actions/passwordsettings.php:180
+#: actions/passwordsettings.php:181
 msgid "Error saving user; invalid."
 msgstr "Ur fazi 'zo bet e-pad enolladenn an implijer ; diwiriek."
 
-#. TRANS: Reset password form validation error message.
-#: actions/passwordsettings.php:185 actions/recoverpassword.php:418
+#: actions/passwordsettings.php:186
 #, fuzzy
-msgid "Cannot save new password."
+msgid "Can't save new password."
 msgstr "Dibosupl eo enrollañ ar ger-tremen nevez."
 
-#: actions/passwordsettings.php:191
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
 msgid "Password saved."
 msgstr "Ger-tremen enrollet."
 
@@ -4411,9 +4345,7 @@ msgstr ""
 msgid "Save paths"
 msgstr "Enrollañ an hentadoù."
 
-#. TRANS: Instructions for the "People search" page.
-#. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/peoplesearch.php:54
+#: actions/peoplesearch.php:52
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
@@ -4423,8 +4355,7 @@ msgstr ""
 "Dispartiañ termenoù ar c'hlask gant esaouennoù. Ret eo e vefe da nebeutañ 3 "
 "arouezenn."
 
-#. TRANS: Title of a page where users can search for other users.
-#: actions/peoplesearch.php:61
+#: actions/peoplesearch.php:58
 msgid "People search"
 msgstr "Klask tud"
 
@@ -4468,7 +4399,7 @@ msgid "Profile information"
 msgstr "Titouroù ar profil"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109 actions/register.php:419
+#: actions/profilesettings.php:109 actions/register.php:433
 #, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr "1 da 64 lizherenn vihan pe sifr, hep poentaouiñ nag esaouenn"
@@ -4476,7 +4407,7 @@ msgstr "1 da 64 lizherenn vihan pe sifr, hep poentaouiñ nag esaouenn"
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for full group name (dt). Text hidden by default.
 #. TRANS: DT for full name in a profile.
-#: actions/profilesettings.php:113 actions/register.php:441
+#: actions/profilesettings.php:113 actions/register.php:455
 #: actions/showgroup.php:255 actions/tagother.php:104
 #: lib/groupeditform.php:150 lib/userprofile.php:156
 msgid "Full name"
@@ -4484,13 +4415,13 @@ msgstr "Anv klok"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:118 actions/register.php:446
+#: actions/profilesettings.php:118 actions/register.php:460
 #: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "Pajenn degemer"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:121 actions/register.php:448
+#: actions/profilesettings.php:121
 #, fuzzy
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr "URL ho pajenn degemer, ho blog, pe ho profil en ul lec'hienn all"
@@ -4498,7 +4429,7 @@ msgstr "URL ho pajenn degemer, ho blog, pe ho profil en ul lec'hienn all"
 #. TRANS: Tooltip for field label in form for profile settings. Plural
 #. TRANS: is decided by the number of characters available for the
 #. TRANS: biography (%d).
-#: actions/profilesettings.php:129 actions/register.php:457
+#: actions/profilesettings.php:129 actions/register.php:471
 #, fuzzy, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4506,29 +4437,28 @@ msgstr[0] "Deskrivit ac'hanoc'h hag ho interestoù, gant %d arouezenn"
 msgstr[1] "Deskrivit ac'hanoc'h hag ho interestoù, gant %d arouezenn"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:135 actions/register.php:462
+#: actions/profilesettings.php:135 actions/register.php:476
 msgid "Describe yourself and your interests"
 msgstr "Deskrivit hoc'h-unan hag ar pezh a zedenn ac'hanoc'h"
 
 #. TRANS: Text area label in form for profile settings where users can provide.
 #. TRANS: their biography.
-#: actions/profilesettings.php:139 actions/register.php:464
+#: actions/profilesettings.php:139 actions/register.php:478
 msgid "Bio"
 msgstr "Buhezskrid"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group location (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT for location in a profile.
-#: actions/profilesettings.php:145 actions/register.php:469
+#: actions/profilesettings.php:145 actions/register.php:483
 #: actions/showgroup.php:265 actions/tagother.php:112
-#: actions/userauthorization.php:174 lib/groupeditform.php:173
+#: actions/userauthorization.php:166 lib/groupeditform.php:173
 #: lib/userprofile.php:172
 msgid "Location"
 msgstr "Lec'hiadur"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148
+#: actions/profilesettings.php:148 actions/register.php:485
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "El lec'h m'emaoc'h, da skouer \"Kêr, Stad (pe Rannvro), Bro\""
 
@@ -4549,8 +4479,7 @@ msgstr "Balizennoù"
 #: actions/profilesettings.php:164
 #, fuzzy
 msgid ""
-"Tags for yourself (letters, numbers, -, ., and _), comma- or space- "
-"separated."
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr ""
 "Merkoù evidoc'h oc'h unan (lizherennoù, sifroù, -, ., ha _), dispartiet gant "
 "virgulennoù pe esaouennoù"
@@ -4563,7 +4492,7 @@ msgstr "Yezh"
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
 #: actions/profilesettings.php:171
 #, fuzzy
-msgid "Preferred language."
+msgid "Preferred language"
 msgstr "Yezh d'ober ganti da gentañ"
 
 #. TRANS: Dropdownlist label in form for profile settings.
@@ -4580,7 +4509,7 @@ msgstr "Pehini eo gwerzhid-eur boaz ?"
 #: actions/profilesettings.php:189
 #, fuzzy
 msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)."
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr ""
 "En em enskrivañ ez emgefre d'an holl re hag en em goumanant din (erbedet "
 "evit an implijerien nann-denel)"
@@ -4588,7 +4517,7 @@ msgstr ""
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Plural form is used based on the maximum number of allowed
 #. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:258 actions/register.php:221
+#: actions/profilesettings.php:258 actions/register.php:229
 #, fuzzy, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4608,9 +4537,9 @@ msgstr "Re hir eo ar yezh (255 arouezenn d'ar muiañ)."
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:291
-#, fuzzy, php-format
-msgid "Invalid tag: \"%s\"."
+#: actions/profilesettings.php:291 actions/tagother.php:178
+#, php-format
+msgid "Invalid tag: \"%s\""
 msgstr "Balizenn direizh : \"%s\""
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
@@ -4715,12 +4644,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: Public RSS feed description. %s is the StatusNet site name.
-#: actions/publicrss.php:106
-#, fuzzy, php-format
-msgid "%s updates from everyone."
-msgstr "%s statud an holl !"
-
 #. TRANS: Title for public tag cloud.
 #: actions/publictagcloud.php:57
 msgid "Public tag cloud"
@@ -4857,12 +4780,6 @@ msgstr "Adtapout ar ger-tremen"
 msgid "Password recovery requested"
 msgstr "Goulennet eo an adtapout gerioù-tremen"
 
-#. TRANS: Title for password recovery page in password saved mode.
-#: actions/recoverpassword.php:229
-#, fuzzy
-msgid "Password saved"
-msgstr "Ger-tremen enrollet."
-
 #. TRANS: Title for password recovery page when an unknown action has been specified.
 #: actions/recoverpassword.php:232
 msgid "Unknown action"
@@ -4874,6 +4791,12 @@ msgstr "Oberiadenn dianav"
 msgid "6 or more characters, and do not forget it!"
 msgstr "6 arouezenn pe muioc'h, ha n'e zisoñjit ket !"
 
+#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#: actions/recoverpassword.php:264 actions/register.php:441
+#, fuzzy
+msgid "Same as password above."
+msgstr "Memestra eget ar ger tremen a-us"
+
 #. TRANS: Button text for password reset form.
 #. TRANS: Button text on profile design page to reset all colour settings to default without saving.
 #: actions/recoverpassword.php:268 lib/designsettings.php:264
@@ -4926,8 +4849,14 @@ msgstr "Rankout a ra ar ger-tremen bezañ 6 arouezenn d'an nebeutañ."
 msgid "Password and confirmation do not match."
 msgstr "Ne glot ket ar ger-tremen gant ar c'hadarnadur."
 
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:418
+#, fuzzy
+msgid "Cannot save new password."
+msgstr "Dibosupl eo enrollañ ar ger-tremen nevez."
+
 #. TRANS: Server error displayed when something does wrong with the user object during password reset.
-#: actions/recoverpassword.php:426 actions/register.php:248
+#: actions/recoverpassword.php:426 actions/register.php:256
 msgid "Error setting user."
 msgstr "Ur fazi 'zo bet e-pad kefluniadur an implijer."
 
@@ -4936,102 +4865,107 @@ msgstr "Ur fazi 'zo bet e-pad kefluniadur an implijer."
 msgid "New password successfully saved. You are now logged in."
 msgstr "Krouet eo bet ar ger-tremen nevez. Kevreet oc'h bremañ."
 
-#: actions/register.php:87 actions/register.php:188 actions/register.php:399
+#: actions/register.php:92 actions/register.php:196 actions/register.php:413
 msgid "Sorry, only invited people can register."
 msgstr ""
 "Digarezit, met n'eus nemet an implijerien bet pedet hag a c'hell en em "
 "enskrivañ."
 
-#: actions/register.php:94
+#: actions/register.php:99
 msgid "Sorry, invalid invitation code."
 msgstr "Digarezit, kod pedadenn direizh."
 
-#: actions/register.php:113
+#: actions/register.php:119
 msgid "Registration successful"
 msgstr "Krouet eo bet ar gont."
 
-#: actions/register.php:115 actions/register.php:497
+#: actions/register.php:121 actions/register.php:511
 msgid "Register"
 msgstr "Krouiñ ur gont"
 
-#: actions/register.php:135
+#: actions/register.php:142
 msgid "Registration not allowed."
 msgstr "N'eo ket aotreet krouiñ kontoù."
 
-#: actions/register.php:201
+#: actions/register.php:209
 #, fuzzy
-msgid "You cannot register if you don't agree to the license."
+msgid "You can't register if you don't agree to the license."
 msgstr ""
 "Rankout a rit bezañ a-du gant termenoù an aotre-implijout evit krouiñ ur "
 "gont."
 
-#: actions/register.php:210
+#: actions/register.php:218
 msgid "Email address already exists."
 msgstr "Implijet eo dija ar chomlec'h postel-se."
 
-#: actions/register.php:243 actions/register.php:265
+#: actions/register.php:251 actions/register.php:273
 msgid "Invalid username or password."
 msgstr "Anv implijer pe ger-tremen direizh."
 
-#: actions/register.php:340
+#: actions/register.php:351
 msgid ""
 "With this form you can create a new account. You can then post notices and "
-"link up to friends and colleagues."
+"link up to friends and colleagues. "
 msgstr ""
 
+#: actions/register.php:437
+#, fuzzy
+msgid "6 or more characters."
+msgstr "6 arouezenn pe muioc'h"
+
 #. TRANS: Link description in user account settings menu.
-#: actions/register.php:431 actions/register.php:435
+#: actions/register.php:445 actions/register.php:449
 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
 msgid "Email"
 msgstr "Postel"
 
-#: actions/register.php:432 actions/register.php:436
+#: actions/register.php:446 actions/register.php:450
 #, fuzzy
-msgid "Used only for updates, announcements, and password recovery."
+msgid "Used only for updates, announcements, and password recovery"
 msgstr ""
 "Implijet hepken evit an hizivadennoù, ar c'hemennoù, pe adtapout gerioù-"
 "tremen"
 
-#: actions/register.php:443
+#: actions/register.php:457
 #, fuzzy
-msgid "Longer name, preferably your \"real\" name."
+msgid "Longer name, preferably your \"real\" name"
 msgstr "Anv hiroc'h, ho anv \"gwir\" a zo gwelloc'h"
 
-#: actions/register.php:471
+#: actions/register.php:462
 #, fuzzy
-msgid "Where you are, like \"City, State (or Region), Country\"."
-msgstr "El lec'h m'emaoc'h, da skouer \"Kêr, Stad (pe Rannvro), Bro\""
+msgid "URL of your homepage, blog, or profile on another site"
+msgstr "URL ho pajenn degemer, ho blog, pe ho profil en ul lec'hienn all"
 
-#: actions/register.php:510
+#: actions/register.php:523
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
 msgstr "Kompren a ran ez eo prevez danvez ha roadennoù %1$s."
 
-#: actions/register.php:520
+#: actions/register.php:533
 #, php-format
 msgid "My text and files are copyright by %1$s."
 msgstr "Ma zestenn ha ma restroù a zo gwarezet dre copyright gant %1$s."
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:524
+#: actions/register.php:537
 msgid "My text and files remain under my own copyright."
 msgstr "Ma zestenn ha ma restroù a chom dindan ma gwirioù oberour."
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:527
+#: actions/register.php:540
 msgid "All rights reserved."
 msgstr "Holl gwrioù miret strizh."
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:532
+#: actions/register.php:545
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
 "email address, IM address, and phone number."
 msgstr ""
 
-#: actions/register.php:573
+#: actions/register.php:588
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -5050,7 +4984,7 @@ msgid ""
 "Thanks for signing up and we hope you enjoy using this service."
 msgstr ""
 
-#: actions/register.php:597
+#: actions/register.php:612
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5080,7 +5014,7 @@ msgstr "Lesanv an implijer"
 
 #: actions/remotesubscribe.php:129
 #, fuzzy
-msgid "Nickname of the user you want to follow."
+msgid "Nickname of the user you want to follow"
 msgstr "Lesanv an implijer ho peus c'hoant heuliañ"
 
 #: actions/remotesubscribe.php:132
@@ -5088,7 +5022,7 @@ msgid "Profile URL"
 msgstr "URL ar profil"
 
 #: actions/remotesubscribe.php:133
-msgid "URL of your profile on another compatible microblogging service."
+msgid "URL of your profile on another compatible microblogging service"
 msgstr ""
 
 #. TRANS: Link text for link that will subscribe to a remote profile.
@@ -5099,7 +5033,7 @@ msgstr "En em enskrivañ"
 
 #: actions/remotesubscribe.php:158
 #, fuzzy
-msgid "Invalid profile URL (bad format)."
+msgid "Invalid profile URL (bad format)"
 msgstr "URL direizh evit ar profil (furmad fall)"
 
 #: actions/remotesubscribe.php:167
@@ -5141,7 +5075,6 @@ msgstr "Adlavaret"
 msgid "Repeated!"
 msgstr "Adlavaret !"
 
-#. TRANS: RSS reply feed title. %s is a user nickname.
 #. TRANS: Tooltip for personal group navigation menu option when logged in for viewing @-replies.
 #: actions/replies.php:126 actions/repliesrss.php:68
 #: lib/personalgroupnav.php:109
@@ -5192,11 +5125,9 @@ msgid ""
 "newnotice%%%%?status_textarea=%3$s)."
 msgstr ""
 
-#. TRANS: RSS reply feed description.
-#. TRANS: %1$s is a user nickname, %2$s is the StatusNet site name.
-#: actions/repliesrss.php:74
+#: actions/repliesrss.php:72
 #, fuzzy, php-format
-msgid "Replies to %1$s on %2$s."
+msgid "Replies to %1$s on %2$s!"
 msgstr "Respontoù da %1$s war %2$s !"
 
 #. TRANS: Client exception displayed when trying to restore an account while not logged in.
@@ -5296,7 +5227,7 @@ msgstr "Ne c'helloc'h ket reiñ rolloù d'an implijerien eus al lec'hienn-mañ."
 msgid "User doesn't have this role."
 msgstr "n'en deus ket an implijer-mañ ar rol-se."
 
-#: actions/rsd.php:142 actions/version.php:159
+#: actions/rsd.php:146 actions/version.php:159
 msgid "StatusNet"
 msgstr "StatusNet"
 
@@ -5339,93 +5270,93 @@ msgstr ""
 msgid "Save site settings"
 msgstr "Enrollañ arventennoù al lec'hienn"
 
-#: actions/showapplication.php:78
+#: actions/showapplication.php:82
 msgid "You must be logged in to view an application."
 msgstr "Rankout a reoc'h bezañ kevreet evit gwelet ur poellad."
 
-#: actions/showapplication.php:151
+#: actions/showapplication.php:157
 msgid "Application profile"
 msgstr "Profil ar poellad"
 
 #. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:153 lib/applicationeditform.php:177
+#: actions/showapplication.php:159 lib/applicationeditform.php:177
 msgid "Icon"
 msgstr "Arlun"
 
 #. TRANS: Form input field label for application name.
-#: actions/showapplication.php:163 actions/version.php:197
+#: actions/showapplication.php:169 actions/version.php:197
 #: lib/applicationeditform.php:190
 msgid "Name"
 msgstr "Anv"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:172 lib/applicationeditform.php:227
+#: actions/showapplication.php:178 lib/applicationeditform.php:227
 msgid "Organization"
 msgstr "Aozadur"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:181 actions/version.php:200
+#: actions/showapplication.php:187 actions/version.php:200
 #: lib/applicationeditform.php:208 lib/groupeditform.php:168
 msgid "Description"
 msgstr "Deskrivadur"
 
 #. TRANS: Header for group statistics on a group page (h2).
 #. TRANS: H2 text for user statistics.
-#: actions/showapplication.php:186 actions/showgroup.php:460
+#: actions/showapplication.php:192 actions/showgroup.php:460
 #: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "Stadegoù"
 
-#: actions/showapplication.php:197
+#: actions/showapplication.php:203
 #, php-format
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr "Krouet gant %1$s - moned %2$s dre ziouer - %3$d implijer"
 
-#: actions/showapplication.php:207
+#: actions/showapplication.php:213
 msgid "Application actions"
 msgstr "Obererezhioù ar poellad"
 
-#: actions/showapplication.php:230
+#: actions/showapplication.php:236
 msgid "Reset key & secret"
 msgstr "Adderaouekaat an alc'hwez hag ar sekred"
 
 #. TRANS: Title of form for deleting a user.
-#: actions/showapplication.php:246 lib/deletegroupform.php:121
+#: actions/showapplication.php:252 lib/deletegroupform.php:121
 #: lib/deleteuserform.php:64 lib/noticelist.php:673
 msgid "Delete"
 msgstr "Diverkañ"
 
-#: actions/showapplication.php:255
+#: actions/showapplication.php:261
 msgid "Application info"
 msgstr "Titouroù ar poelad"
 
-#: actions/showapplication.php:257
+#: actions/showapplication.php:263
 msgid "Consumer key"
 msgstr "Alc'hwez implijer"
 
-#: actions/showapplication.php:262
+#: actions/showapplication.php:268
 msgid "Consumer secret"
 msgstr "Sekred an implijer"
 
-#: actions/showapplication.php:267
+#: actions/showapplication.php:273
 msgid "Request token URL"
 msgstr "URL ar jedouer reked"
 
-#: actions/showapplication.php:272
+#: actions/showapplication.php:278
 msgid "Access token URL"
 msgstr "URL ar jedouer moned"
 
-#: actions/showapplication.php:277
+#: actions/showapplication.php:283
 msgid "Authorize URL"
 msgstr "aotren an URL"
 
-#: actions/showapplication.php:282
+#: actions/showapplication.php:288
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
 msgstr ""
 
-#: actions/showapplication.php:302
+#: actions/showapplication.php:309
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr ""
 "Ha sur oc'h ho peus c'hoant adderaouekaat ho alc'hwez bevezer ha sekred ?"
@@ -5511,18 +5442,16 @@ msgid "Group profile"
 msgstr "Profil ar strollad"
 
 #. TRANS: Label for group URL (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT for URL in a profile.
 #: actions/showgroup.php:273 actions/tagother.php:118
-#: actions/userauthorization.php:184 lib/userprofile.php:186
+#: actions/userauthorization.php:175 lib/userprofile.php:186
 msgid "URL"
 msgstr "URL"
 
 #. TRANS: Label for group description or group note (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page where bio is displayed.
 #. TRANS: DT for note in a profile.
 #: actions/showgroup.php:285 actions/tagother.php:128
-#: actions/userauthorization.php:197 lib/userprofile.php:204
+#: actions/userauthorization.php:187 lib/userprofile.php:204
 msgid "Note"
 msgstr "Notenn"
 
@@ -5664,7 +5593,7 @@ msgid "%1$s tagged %2$s"
 msgstr "%1$s, pajenn %2$d"
 
 #. TRANS: Page title showing tagged notices in one user's stream.
-#. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
+#. TRANS: %1$s is the username, %2$s is the hash tag, %1$d is the page number.
 #: actions/showstream.php:74
 #, fuzzy, php-format
 msgid "%1$s tagged %2$s, page %3$d"
@@ -5909,7 +5838,7 @@ msgstr ""
 #. TRANS: Title for button to save site notice in admin panel.
 #: actions/sitenoticeadminpanel.php:201
 #, fuzzy
-msgid "Save site notice."
+msgid "Save site notice"
 msgstr "Enrollañ ali ul lec'hienn"
 
 #. TRANS: Title for SMS settings.
@@ -5970,7 +5899,7 @@ msgstr "Niverenn bellgomz evit an SMS"
 #. TRANS: SMS phone number input field instructions in SMS settings form.
 #: actions/smssettings.php:152
 #, fuzzy
-msgid "Phone number, no punctuation or spaces, with area code."
+msgid "Phone number, no punctuation or spaces, with area code"
 msgstr "1 da 64 lizherenn vihan pe sifr, hep poentaouiñ nag esaouenn"
 
 #. TRANS: Form legend for SMS preferences form.
@@ -6138,19 +6067,15 @@ msgstr "N'oc'h ket koumanantet d'ar profil-se."
 msgid "Could not save subscription."
 msgstr "Dibosupl eo dilemel ar c'houmanant."
 
-#. TRANS: Client error displayed trying to perform any request method other than POST.
-#. TRANS: Do not translate POST.
 #: actions/subscribe.php:77
 msgid "This action only accepts POST requests."
 msgstr ""
 
-#. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
-#: actions/subscribe.php:121
+#: actions/subscribe.php:117
 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
 msgstr ""
 
-#. TRANS: Page title when subscription succeeded.
-#: actions/subscribe.php:149
+#: actions/subscribe.php:145
 msgid "Subscribed"
 msgstr "Koumanantet"
 
@@ -6305,9 +6230,8 @@ msgstr "Merk %s"
 msgid "User profile"
 msgstr "Profil an implijer"
 
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT element in area for user avatar.
-#: actions/tagother.php:81 actions/userauthorization.php:138
+#: actions/tagother.php:81 actions/userauthorization.php:132
 #: lib/userprofile.php:108
 msgid "Photo"
 msgstr "Skeudenn"
@@ -6324,11 +6248,6 @@ msgstr ""
 "Merkoù evit an implijer-mañ (lizherennoù, sifroù, -, ., ha  _), dispartiet "
 "gant virgulennoù pe gant esaouennoù"
 
-#: actions/tagother.php:178
-#, php-format
-msgid "Invalid tag: \"%s\""
-msgstr "Balizenn direizh : \"%s\""
-
 #: actions/tagother.php:193
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
@@ -6344,7 +6263,6 @@ msgstr "Implijit ar furmskrid-mañ evit kemmañ ho poellad."
 msgid "No such tag."
 msgstr "N'eus ket eus ar bajenn-se."
 
-#. TRANS: Client error displayed when trying to unblock a non-blocked user.
 #: actions/unblock.php:59
 msgid "You haven't blocked that user."
 msgstr "N'ho peus ket stanket an implijer-mañ."
@@ -6367,7 +6285,7 @@ msgstr "N'eus profil ID ebet er reked."
 msgid "Unsubscribed"
 msgstr "Digoumanantet"
 
-#: actions/updateprofile.php:64
+#: actions/updateprofile.php:64 actions/userauthorization.php:337
 #, fuzzy, php-format
 msgid ""
 "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
@@ -6400,7 +6318,7 @@ msgstr ""
 #. TRANS: users in user admin panel. %1$s is the invalid nickname.
 #: actions/useradminpanel.php:166
 #, php-format
-msgid "Invalid default subscripton: \"%1$s\" is not a user."
+msgid "Invalid default subscripton: '%1$s' is not a user."
 msgstr ""
 
 #. TRANS: Link description in user account settings menu.
@@ -6466,142 +6384,105 @@ msgstr "Ma rankomp merañ an dalc'hoù hon unan."
 #. TRANS: Title for button to save user settings in user admin panel.
 #: actions/useradminpanel.php:302
 #, fuzzy
-msgid "Save user settings."
+msgid "Save user settings"
 msgstr "Enrollañ arventennoù an implijer"
 
-#. TRANS: Page title.
-#: actions/userauthorization.php:109
+#: actions/userauthorization.php:105
 msgid "Authorize subscription"
 msgstr "Aotreañ ar c'houmanant"
 
-#. TRANS: Page notice on "Auhtorize subscription" page.
-#: actions/userauthorization.php:115
+#: actions/userauthorization.php:110
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
 "user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
-"click \"Reject\"."
+"click “Reject”."
 msgstr ""
 
-#. TRANS: DT element on Authorise Subscription page where license is displayed.
 #. TRANS: Menu item for site administration
-#: actions/userauthorization.php:207 actions/version.php:167
+#: actions/userauthorization.php:196 actions/version.php:167
 #: lib/adminpanelaction.php:403
 msgid "License"
 msgstr "Aotre implijout"
 
-#. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:229
+#: actions/userauthorization.php:217
 #, fuzzy
-msgctxt "BUTTON"
 msgid "Accept"
 msgstr "Degemer"
 
-#. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:231
-#, fuzzy
-msgid "Subscribe to this user."
+#: actions/userauthorization.php:218 lib/subscribeform.php:115
+#: lib/subscribeform.php:139
+msgid "Subscribe to this user"
 msgstr "En em goumanantiñ d'an implijer-mañ"
 
-#. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:233
+#: actions/userauthorization.php:219
 #, fuzzy
-msgctxt "BUTTON"
 msgid "Reject"
 msgstr "Disteurel"
 
-#. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:235
+#: actions/userauthorization.php:220
 #, fuzzy
-msgid "Reject this subscription."
+msgid "Reject this subscription"
 msgstr "Nac'hañ ar c'houmanant"
 
-#. TRANS: Client error displayed for an empty authorisation request.
-#: actions/userauthorization.php:248
+#: actions/userauthorization.php:232
 msgid "No authorization request!"
 msgstr "Reked aotreañ ebet !"
 
-#. TRANS: Accept message header from Authorise subscription page.
-#: actions/userauthorization.php:271
+#: actions/userauthorization.php:254
 msgid "Subscription authorized"
 msgstr "Koumanant aotreet"
 
-#: actions/userauthorization.php:274
+#: actions/userauthorization.php:256
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to authorize the "
 "subscription. Your subscription token is:"
 msgstr ""
 
-#. TRANS: Reject message header from Authorise subscription page.
-#: actions/userauthorization.php:285
+#: actions/userauthorization.php:266
 msgid "Subscription rejected"
 msgstr "Koumanant bet nac'het"
 
-#: actions/userauthorization.php:288
+#: actions/userauthorization.php:268
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to fully reject the "
 "subscription."
 msgstr ""
 
-#. TRANS: Exception thrown when no valid user is found for an authorisation request.
-#. TRANS: %s is a listener URI.
-#: actions/userauthorization.php:325
+#: actions/userauthorization.php:303
 #, fuzzy, php-format
-msgid "Listener URI \"%s\" not found here."
+msgid "Listener URI ‘%s’ not found here."
 msgstr "N'eo ket bet kavet amañ URI ar selaouer \"%s\"."
 
-#. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:332
+#: actions/userauthorization.php:308
 #, fuzzy, php-format
-msgid "Listenee URI \"%s\" is too long."
+msgid "Listenee URI ‘%s’ is too long."
 msgstr "Re hir eo an URI \"%s\" ez oc'h koumanantet dezhi."
 
-#. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:340
+#: actions/userauthorization.php:314
 #, fuzzy, php-format
-msgid "Listenee URI \"%s\" is a local user."
+msgid "Listenee URI ‘%s’ is a local user."
 msgstr "An URI \"%s\" ez oc'h koumanantet dezhi a zo un implijer lec'hel."
 
-#. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
-#. TRANS: %s is a profile URL.
-#: actions/userauthorization.php:358
+#: actions/userauthorization.php:329
 #, fuzzy, php-format
-msgid "Profile URL \"%s\" is for a local user."
+msgid "Profile URL ‘%s’ is for a local user."
 msgstr "URI ar profil \"%s\" a zo evit un implijer lec'hel."
 
-#. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
-#. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
-#: actions/userauthorization.php:368
+#: actions/userauthorization.php:345
 #, fuzzy, php-format
-msgid ""
-"Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
-"\"."
-msgstr ""
-"Aotre-implijout ar menegoù \"%1$s\" ne ya ket gant aotre-implijout al "
-"lec'hienn \"%2$s\"."
-
-#. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:378
-#, fuzzy, php-format
-msgid "Avatar URL \"%s\" is not valid."
+msgid "Avatar URL ‘%s’ is not valid."
 msgstr "N'eo ket reizh URL an avatar \"%s\"."
 
-#. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:385
+#: actions/userauthorization.php:350
 #, fuzzy, php-format
-msgid "Cannot read avatar URL \"%s\"."
+msgid "Can’t read avatar URL ‘%s’."
 msgstr "Dibosupl eo lenn URL an avatar \"%s\"."
 
-#. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:392
+#: actions/userauthorization.php:355
 #, fuzzy, php-format
-msgid "Wrong image type for avatar URL \"%s\"."
+msgid "Wrong image type for avatar URL ‘%s’."
 msgstr "Seurt skeudenn direizh evit URL an avatar \"%s\"."
 
 #. TRANS: Page title for profile design page.
@@ -6695,7 +6576,7 @@ msgid "Plugins"
 msgstr "Pluginoù"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:898
+#: actions/version.php:198 lib/action.php:901
 msgid "Version"
 msgstr "Stumm"
 
@@ -6899,14 +6780,14 @@ msgstr "Ur gudenn 'zo bet pa veze enrollet boest degemer ar strollad."
 
 #. TRANS: Server exception thrown when a reply cannot be saved.
 #. TRANS: %1$d is a notice ID, %2$d is the ID of the mentioned user.
-#: classes/Notice.php:1142
+#: classes/Notice.php:1144
 #, fuzzy, php-format
 msgid "Could not save reply for %1$d, %2$d."
 msgstr "Dibosupl eo enrollañ titouroù ar strollad lec'hel."
 
 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1661
+#: classes/Notice.php:1663
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
@@ -6920,14 +6801,14 @@ msgstr "%1$s (%2$s)"
 
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:775
+#: classes/Profile.php:779
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:784
+#: classes/Profile.php:788
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -7245,54 +7126,54 @@ msgid "Page notice"
 msgstr "Ali ar bajenn"
 
 #. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:871
+#: lib/action.php:874
 #, fuzzy
 msgid "Secondary site navigation"
 msgstr "Arventennoù diazez al lec'hienn"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:877
+#: lib/action.php:880
 msgid "Help"
 msgstr "Skoazell"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:880
+#: lib/action.php:883
 msgid "About"
 msgstr "Diwar-benn"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:883
+#: lib/action.php:886
 msgid "FAQ"
 msgstr "FAG"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:888
+#: lib/action.php:891
 msgid "TOS"
 msgstr "AIH"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:892
+#: lib/action.php:895
 msgid "Privacy"
 msgstr "Prevezded"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:895
+#: lib/action.php:898
 msgid "Source"
 msgstr "Mammenn"
 
 #. TRANS: Secondary navigation menu option leading to e-mail contact information on the
 #. TRANS: StatusNet site, where to report bugs, ...
-#: lib/action.php:902
+#: lib/action.php:905
 msgid "Contact"
 msgstr "Darempred"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:905
+#: lib/action.php:908
 msgid "Badge"
 msgstr "Badj"
 
 #. TRANS: DT element for StatusNet software license.
-#: lib/action.php:934
+#: lib/action.php:937
 msgid "StatusNet software license"
 msgstr "Aotre-implijout ar meziant StatusNet"
 
@@ -7300,7 +7181,7 @@ msgstr "Aotre-implijout ar meziant StatusNet"
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:941
+#: lib/action.php:944
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7308,7 +7189,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:944
+#: lib/action.php:947
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** a zo ur servij microblogging."
@@ -7317,7 +7198,7 @@ msgstr "**%%site.name%%** a zo ur servij microblogging."
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:951
+#: lib/action.php:954
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7326,50 +7207,50 @@ msgid ""
 msgstr ""
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:967
+#: lib/action.php:970
 msgid "Site content license"
 msgstr "Aotre-implijout diwar-benn danvez al lec'hienn"
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:974
+#: lib/action.php:977
 #, fuzzy, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr "Kompren a ran ez eo prevez danvez ha roadennoù %1$s."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:981
+#: lib/action.php:984
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:985
+#: lib/action.php:988
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:1017
+#: lib/action.php:1020
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
 
 #. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1353
+#: lib/action.php:1356
 msgid "Pagination"
 msgstr "Pajennadur"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1364
+#: lib/action.php:1367
 msgid "After"
 msgstr "War-lerc'h"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1374
+#: lib/action.php:1377
 msgid "Before"
 msgstr "Kent"
 
@@ -7568,23 +7449,19 @@ msgstr ""
 msgid "No application for that consumer key."
 msgstr ""
 
-#: lib/apiauth.php:202 lib/apiauth.php:284
-msgid "Not allowed to use API."
-msgstr ""
-
 #. TRANS: OAuth exception given when an incorrect access token was given for a user.
-#: lib/apiauth.php:225
+#: lib/apiauth.php:219
 msgid "Bad access token."
 msgstr ""
 
 #. TRANS: OAuth exception given when no user was found for a given token (no token was found).
-#: lib/apiauth.php:230
+#: lib/apiauth.php:224
 msgid "No user for that token."
 msgstr ""
 
 #. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel".
 #. TRANS: Client error thrown when authentication fails.
-#: lib/apiauth.php:272 lib/apiauth.php:302
+#: lib/apiauth.php:266 lib/apiauth.php:293
 msgid "Could not authenticate you."
 msgstr ""
 
@@ -7791,11 +7668,6 @@ msgstr "N'eo ket aotreet kemmañ ar ger-tremen"
 msgid "Block"
 msgstr "Stankañ"
 
-#. TRANS: Description of the form to block a user.
-#: lib/blockform.php:79
-msgid "Block this user"
-msgstr "Stankañ an implijer-mañ"
-
 #. TRANS: Title for command results.
 #: lib/channel.php:160 lib/channel.php:181
 msgid "Command results"
@@ -7824,7 +7696,7 @@ msgstr ""
 
 #. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
 #. TRANS: Error text shown when a last user notice is requested and it does not exist.
-#: lib/command.php:99 lib/command.php:630
+#: lib/command.php:99 lib/command.php:642
 msgid "User has no last notice."
 msgstr ""
 
@@ -7875,35 +7747,41 @@ msgstr ""
 "Tud koumanantet : %2$s\n"
 "kemennadennoù : %3$s"
 
+#. TRANS: Error message text shown when a favorite could not be set because it has already been favorited.
+#: lib/command.php:298
+#, fuzzy
+msgid "Could not create favorite: already favorited."
+msgstr "Diposupl eo krouiñ ar pennroll-mañ."
+
 #. TRANS: Text shown when a notice has been marked as favourite successfully.
-#: lib/command.php:312
+#: lib/command.php:324
 msgid "Notice marked as fave."
 msgstr "Kemenn bet ouzhpennet d'ar pennroll."
 
 #. TRANS: Message given having added a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:357
+#: lib/command.php:369
 #, php-format
 msgid "%1$s joined group %2$s."
 msgstr "%1$s a zo bet er strollad %2$s."
 
 #. TRANS: Message given having removed a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:405
+#: lib/command.php:417
 #, php-format
 msgid "%1$s left group %2$s."
 msgstr "%1$s en deus kuitaet ar strollad %2$s."
 
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: lib/command.php:426
+#: lib/command.php:438
 #, php-format
 msgctxt "WHOIS"
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
 
 #. TRANS: Whois output. %s is the full name of the queried user.
-#: lib/command.php:430
+#: lib/command.php:442
 #, php-format
 msgid "Fullname: %s"
 msgstr "Anv klok : %s"
@@ -7911,7 +7789,7 @@ msgstr "Anv klok : %s"
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a location.
-#: lib/command.php:434 lib/mail.php:270
+#: lib/command.php:446 lib/mail.php:270
 #, php-format
 msgid "Location: %s"
 msgstr "Lec'hiadur : %s"
@@ -7919,20 +7797,20 @@ msgstr "Lec'hiadur : %s"
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a homepage.
-#: lib/command.php:438 lib/mail.php:274
+#: lib/command.php:450 lib/mail.php:274
 #, php-format
 msgid "Homepage: %s"
 msgstr "Lec'hienn Web : %s"
 
 #. TRANS: Whois output. %s is the bio information of the queried user.
-#: lib/command.php:442
+#: lib/command.php:454
 #, php-format
 msgid "About: %s"
 msgstr "Diwar-benn : %s"
 
 #. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).
 #. TRANS: %s is a remote profile.
-#: lib/command.php:471
+#: lib/command.php:483
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
@@ -7941,7 +7819,7 @@ msgstr ""
 
 #. TRANS: Message given if content is too long. %1$sd is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:488
+#: lib/command.php:500
 #, fuzzy, php-format
 msgid "Message too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
@@ -7953,26 +7831,26 @@ msgstr[1] ""
 "arouezenn ho peus lakaet."
 
 #. TRANS: Error text shown sending a direct message fails with an unknown reason.
-#: lib/command.php:516
+#: lib/command.php:528
 msgid "Error sending direct message."
 msgstr "Ur gudenn 'zo bet pa veze kaset ho kemennadenn."
 
 #. TRANS: Message given having repeated a notice from another user.
 #. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:553
+#: lib/command.php:565
 #, php-format
 msgid "Notice from %s repeated."
 msgstr ""
 
 #. TRANS: Error text shown when repeating a notice fails with an unknown reason.
-#: lib/command.php:556
+#: lib/command.php:568
 #, fuzzy
 msgid "Error repeating notice."
 msgstr "Fazi en ur hizivaat ar profil a-bell."
 
 #. TRANS: Message given if content of a notice for a reply is too long. %1$d is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:591
+#: lib/command.php:603
 #, fuzzy, php-format
 msgid "Notice too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Notice too long - maximum is %1$d characters, you sent %2$d."
@@ -7985,102 +7863,102 @@ msgstr[1] ""
 
 #. TRANS: Text shown having sent a reply to a notice successfully.
 #. TRANS: %s is the nickname of the user of the notice the reply was sent to.
-#: lib/command.php:604
+#: lib/command.php:616
 #, php-format
 msgid "Reply to %s sent."
 msgstr "Respont kaset da %s."
 
 #. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
-#: lib/command.php:607
+#: lib/command.php:619
 #, fuzzy
 msgid "Error saving notice."
 msgstr "Ur gudenn 'zo bet pa veze enrollet an ali."
 
 #. TRANS: Error text shown when no username was provided when issuing a subscribe command.
-#: lib/command.php:654
+#: lib/command.php:666
 msgid "Specify the name of the user to subscribe to."
 msgstr ""
 
 #. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
-#: lib/command.php:663
+#: lib/command.php:675
 msgid "Can't subscribe to OMB profiles by command."
 msgstr ""
 
 #. TRANS: Text shown after having subscribed to another user successfully.
 #. TRANS: %s is the name of the user the subscription was requested for.
-#: lib/command.php:671
+#: lib/command.php:683
 #, php-format
 msgid "Subscribed to %s."
 msgstr "Koumanantet da %s."
 
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.
-#: lib/command.php:692 lib/command.php:803
+#: lib/command.php:704 lib/command.php:815
 msgid "Specify the name of the user to unsubscribe from."
 msgstr ""
 
 #. TRANS: Text shown after having unsubscribed from another user successfully.
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:703
+#: lib/command.php:715
 #, php-format
 msgid "Unsubscribed from %s."
 msgstr ""
 
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
-#: lib/command.php:723 lib/command.php:749
+#: lib/command.php:735 lib/command.php:761
 #, fuzzy
 msgid "Command not yet implemented."
 msgstr "Digarezit, n'eo ket bet emplementet an urzhiad-mañ c'hoazh."
 
 #. TRANS: Text shown when issuing the command "off" successfully.
-#: lib/command.php:727
+#: lib/command.php:739
 msgid "Notification off."
 msgstr "Kemennoù diweredekaet."
 
 #. TRANS: Error text shown when the command "off" fails for an unknown reason.
-#: lib/command.php:730
+#: lib/command.php:742
 msgid "Can't turn off notification."
 msgstr "Dibosupl eo diweredekaat ar c'hemennoù."
 
 #. TRANS: Text shown when issuing the command "on" successfully.
-#: lib/command.php:753
+#: lib/command.php:765
 msgid "Notification on."
 msgstr "Kemennoù gweredekaet"
 
 #. TRANS: Error text shown when the command "on" fails for an unknown reason.
-#: lib/command.php:756
+#: lib/command.php:768
 msgid "Can't turn on notification."
 msgstr "Dibosupl eo gweredekaat ar c'hemennoù."
 
 #. TRANS: Error text shown when issuing the login command while login is disabled.
-#: lib/command.php:770
+#: lib/command.php:782
 msgid "Login command is disabled."
 msgstr ""
 
 #. TRANS: Text shown after issuing the login command successfully.
 #. TRANS: %s is a logon link..
-#: lib/command.php:783
+#: lib/command.php:795
 #, php-format
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
 
 #. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:812
+#: lib/command.php:824
 #, php-format
 msgid "Unsubscribed %s."
 msgstr "Digoumanatet %s."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
-#: lib/command.php:830
+#: lib/command.php:842
 msgid "You are not subscribed to anyone."
 msgstr "N'oc'h ket koumanantet da zen ebet."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
-#: lib/command.php:835
+#: lib/command.php:847
 #, fuzzy
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
@@ -8089,14 +7967,14 @@ msgstr[1] "You are subscribed to these people:"
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user
 #. TRANS: (followers) without having any subscribers.
-#: lib/command.php:857
+#: lib/command.php:869
 msgid "No one is subscribed to you."
 msgstr "Den n'eo koumanantet deoc'h."
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
-#: lib/command.php:862
+#: lib/command.php:874
 #, fuzzy
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
@@ -8105,14 +7983,14 @@ msgstr[1] "These people are subscribed to you:"
 
 #. TRANS: Text shown after requesting groups a user is subscribed to without having
 #. TRANS: any group subscriptions.
-#: lib/command.php:884
+#: lib/command.php:896
 msgid "You are not a member of any groups."
 msgstr "N'oc'h ezel eus strollad ebet."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
-#: lib/command.php:889
+#: lib/command.php:901
 #, fuzzy
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
@@ -8120,7 +7998,7 @@ msgstr[0] "You are a member of this group:"
 msgstr[1] "You are a member of these groups:"
 
 #. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-#: lib/command.php:904
+#: lib/command.php:916
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -8227,11 +8105,6 @@ msgstr "Poeladoù kevreet."
 msgid "Database error"
 msgstr "Fazi bank roadennoù"
 
-#. TRANS: Description of form for deleting a user.
-#: lib/deleteuserform.php:75
-msgid "Delete this user"
-msgstr "Diverkañ an implijer-mañ"
-
 #. TRANS: Label in form on profile design page.
 #. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
 #: lib/designsettings.php:108
@@ -8266,21 +8139,6 @@ msgstr "Kemmañ al livioù"
 msgid "Use defaults"
 msgstr "Implijout an talvoudoù dre ziouer"
 
-#. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: lib/designsettings.php:259
-msgid "Restore default designs"
-msgstr "Adlakaat an neuz dre ziouer."
-
-#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: lib/designsettings.php:267
-msgid "Reset back to default"
-msgstr "Adlakaat an arventennoù dre ziouer"
-
-#. TRANS: Title for button on profile design page to save settings.
-#: lib/designsettings.php:272
-msgid "Save design"
-msgstr "Enrollañ an design"
-
 #. TRANS: Error message displayed if design settings could not be saved.
 #. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
 #: lib/designsettings.php:405 lib/designsettings.php:427
@@ -9069,10 +8927,6 @@ msgstr "Respont d'ar c'hemenn-mañ"
 msgid "Reply"
 msgstr "Respont"
 
-#: lib/noticelist.php:673
-msgid "Delete this notice"
-msgstr "Dilemel ar c'hemenn-mañ"
-
 #: lib/noticelist.php:691
 msgid "Notice repeated"
 msgstr "Ali adkemeret"
@@ -9358,10 +9212,6 @@ msgstr "Pediñ"
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Pediñ mignoned hag kenseurted da zont ganeoc'h war %s"
 
-#: lib/subscribeform.php:115 lib/subscribeform.php:139
-msgid "Subscribe to this user"
-msgstr "En em goumanantiñ d'an implijer-mañ"
-
 #: lib/subscriberspeopleselftagcloudsection.php:48
 #: lib/subscriptionspeopleselftagcloudsection.php:48
 msgid "People Tagcloud as self-tagged"
@@ -9535,23 +9385,18 @@ msgctxt "role"
 msgid "Moderator"
 msgstr "Habasker"
 
-#: lib/util.php:305
-#, fuzzy
-msgid "Not allowed to log in."
-msgstr "Nann-kevreet."
-
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1309
+#: lib/util.php:1306
 msgid "a few seconds ago"
 msgstr "un nebeud eilennoù zo"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1312
+#: lib/util.php:1309
 msgid "about a minute ago"
 msgstr "1 vunutenn zo well-wazh"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1316
+#: lib/util.php:1313
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
@@ -9559,12 +9404,12 @@ msgstr[0] "tro ur vunutenn zo"
 msgstr[1] "tro %d munutenn zo"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1319
+#: lib/util.php:1316
 msgid "about an hour ago"
 msgstr "1 eurvezh zo well-wazh"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1323
+#: lib/util.php:1320
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
@@ -9572,12 +9417,12 @@ msgstr[0] "tro un eur zo"
 msgstr[1] "tro %d eur zo"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1326
+#: lib/util.php:1323
 msgid "about a day ago"
 msgstr "1 devezh zo well-wazh"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1330
+#: lib/util.php:1327
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
@@ -9585,12 +9430,12 @@ msgstr[0] "tro un devezh zo"
 msgstr[1] "tro %d devezh zo"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1333
+#: lib/util.php:1330
 msgid "about a month ago"
 msgstr "miz zo well-wazh"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1337
+#: lib/util.php:1334
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
@@ -9598,7 +9443,7 @@ msgstr[0] "tro ur miz zo"
 msgstr[1] "tro %d miz zo"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1340
+#: lib/util.php:1337
 msgid "about a year ago"
 msgstr "bloaz zo well-wazh"
 
@@ -9644,3 +9489,75 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#, fuzzy
+#~ msgid "Block this user."
+#~ msgstr "Stankañ an implijer-mañ"
+
+#, fuzzy
+#~ msgid "Delete this notice."
+#~ msgstr "Dilemel ar c'hemenn-mañ"
+
+#, fuzzy
+#~ msgid "Delete this user."
+#~ msgstr "Diverkañ an implijer-mañ"
+
+#, fuzzy
+#~ msgid "Restore default designs."
+#~ msgstr "Adlakaat an neuz dre ziouer."
+
+#, fuzzy
+#~ msgid "Reset back to default."
+#~ msgstr "Adlakaat an arventennoù dre ziouer"
+
+#, fuzzy
+#~ msgid "Save design."
+#~ msgstr "Enrollañ an design"
+
+#, fuzzy
+#~ msgid "Disfavor favorite."
+#~ msgstr "Tennañ ar pennroll"
+
+#, fuzzy
+#~ msgid "\"%s\" not found."
+#~ msgstr "N'eo ket bet kavet an implijer."
+
+#, fuzzy
+#~ msgid "Notice %s not found."
+#~ msgstr "N'eo ket bet kavet an hentenn API !"
+
+#, fuzzy
+#~ msgid "Attachment %s not found."
+#~ msgstr "N'eo ket bet kavet ar resever."
+
+#, fuzzy
+#~ msgid "Invalid tag: \"%s\"."
+#~ msgstr "Balizenn direizh : \"%s\""
+
+#, fuzzy
+#~ msgid "%s updates from everyone."
+#~ msgstr "%s statud an holl !"
+
+#, fuzzy
+#~ msgid "Password saved"
+#~ msgstr "Ger-tremen enrollet."
+
+#, fuzzy
+#~ msgid "Where you are, like \"City, State (or Region), Country\"."
+#~ msgstr "El lec'h m'emaoc'h, da skouer \"Kêr, Stad (pe Rannvro), Bro\""
+
+#, fuzzy
+#~ msgid "Subscribe to this user."
+#~ msgstr "En em goumanantiñ d'an implijer-mañ"
+
+#, fuzzy
+#~ msgid ""
+#~ "Listenee stream license \"%1$s\" is not compatible with site license \"%2"
+#~ "$s\"."
+#~ msgstr ""
+#~ "Aotre-implijout ar menegoù \"%1$s\" ne ya ket gant aotre-implijout al "
+#~ "lec'hienn \"%2$s\"."
+
+#, fuzzy
+#~ msgid "Not allowed to log in."
+#~ msgstr "Nann-kevreet."
diff --git a/locale/ca/LC_MESSAGES/statusnet.po b/locale/ca/LC_MESSAGES/statusnet.po
index afe4de11fa..d96fc08b94 100644
--- a/locale/ca/LC_MESSAGES/statusnet.po
+++ b/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-02-24 10:32+0000\n"
-"PO-Revision-Date: 2011-02-24 10:36:17+0000\n"
+"POT-Creation-Date: 2011-03-03 15:58+0000\n"
+"PO-Revision-Date: 2011-03-03 16:00:16+0000\n"
 "Language-Team: Catalan <http://translatewiki.net/wiki/Portal:ca>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r82712); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ca\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-02-17 11:39:54+0000\n"
+"X-POT-Import-Date: 2011-02-25 23:49:23+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -140,11 +140,7 @@ msgstr "No existeix la pàgina."
 #. 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 use "one time password login" without using an existing user.
-#. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
-#. TRANS: Client error displayed trying to find a user by ID for a non-existing ID.
-#. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when calling a profile action without specifying a user.
 #: actions/all.php:80 actions/allrss.php:69
@@ -162,12 +158,12 @@ msgstr "No existeix la pàgina."
 #: actions/apitimelinementions.php:77 actions/apitimelineuser.php:79
 #: actions/avatarbynickname.php:79 actions/favoritesrss.php:72
 #: actions/foaf.php:42 actions/foaf.php:61 actions/hcard.php:67
-#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:78
+#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
 #: actions/remotesubscribe.php:144 actions/remotesubscribe.php:153
-#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:113
-#: actions/showfavorites.php:106 actions/userbyid.php:75
+#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
+#: actions/showfavorites.php:106 actions/userbyid.php:74
 #: actions/usergroups.php:93 actions/userrss.php:40 actions/userxrd.php:59
-#: actions/xrds.php:71 lib/command.php:497 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:509 lib/galleryaction.php:59
 #: lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "No existeix l'usuari."
@@ -297,7 +293,7 @@ msgstr "Actualitzacions de %1$s i amics a %2$s!"
 #: actions/apigrouplistall.php:120 actions/apigroupmembership.php:105
 #: actions/apigroupshow.php:114 actions/apihelptest.php:84
 #: actions/apistatusesdestroy.php:101 actions/apistatusesretweets.php:110
-#: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:138
+#: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:139
 #: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
 #: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:268
 #: actions/apitimelinegroup.php:147 actions/apitimelinehome.php:173
@@ -529,9 +525,9 @@ msgstr "No s'ha trobat l'usuari destinatari."
 #. TRANS: Client error displayed trying to direct message another user who's not a friend (403).
 #: actions/apidirectmessagenew.php:144
 #, fuzzy
-msgid "Cannot send direct messages to users who aren't your friend."
+msgid "Can't send direct messages to users who aren't your friend."
 msgstr ""
-"No es pot enviar missatges directes a usuaris que no siguin els vostres "
+"No es poden enviar missatges directes a usuaris que no siguin els vostres "
 "amics."
 
 #. TRANS: Client error displayed trying to direct message self (403).
@@ -556,7 +552,7 @@ msgstr "Aquest estat ja és un preferit."
 #. TRANS: Client error displayed when marking a notice as favourite fails.
 #. TRANS: Server error displayed when trying to mark a notice as favorite fails in the database.
 #. TRANS: Error message text shown when a favorite could not be set.
-#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:294
+#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:306
 msgid "Could not create favorite."
 msgstr "No es pot crear el preferit."
 
@@ -614,7 +610,7 @@ msgstr "No s'ha pogut trobar l'usuari de destinació."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:191
 #: actions/newgroup.php:137 actions/profilesettings.php:273
-#: actions/register.php:206
+#: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "Aquest sobrenom ja existeix. Prova un altre. "
 
@@ -624,7 +620,7 @@ msgstr "Aquest sobrenom ja existeix. Prova un altre. "
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:195
 #: actions/newgroup.php:141 actions/profilesettings.php:243
-#: actions/register.php:208
+#: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "Sobrenom no vàlid."
 
@@ -637,7 +633,7 @@ msgstr "Sobrenom no vàlid."
 #: actions/apigroupcreate.php:181 actions/editapplication.php:235
 #: actions/editgroup.php:202 actions/newapplication.php:221
 #: actions/newgroup.php:148 actions/profilesettings.php:248
-#: actions/register.php:215
+#: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "La pàgina personal no és un URL vàlid."
 
@@ -647,7 +643,7 @@ msgstr "La pàgina personal no és un URL vàlid."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:191 actions/editgroup.php:206
 #: actions/newgroup.php:152 actions/profilesettings.php:252
-#: actions/register.php:218
+#: actions/register.php:226
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "El vostre nom sencer és massa llarg (màx. 255 caràcters)."
 
@@ -675,7 +671,7 @@ msgstr[1] "La descripció és massa llarga (màx. %d caràcters)."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:215 actions/editgroup.php:218
 #: actions/newgroup.php:164 actions/profilesettings.php:265
-#: actions/register.php:227
+#: actions/register.php:235
 msgid "Location is too long (maximum 255 characters)."
 msgstr "La localització és massa llarga (màx. 255 caràcters)."
 
@@ -731,14 +727,14 @@ msgstr "No s'ha trobat el grup."
 #. TRANS: Server error displayed when trying to join a group the user is already a member of.
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:333
+#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:345
 msgid "You are already a member of that group."
 msgstr "Ja sou membre del grup."
 
 #. TRANS: Server error displayed when trying to join a group the user is blocked from joining.
 #. 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.
-#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:338
+#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:350
 msgid "You have been blocked from that group by the admin."
 msgstr "L'administrador us ha blocat del grup."
 
@@ -748,7 +744,7 @@ msgstr "L'administrador us ha blocat del grup."
 #. TRANS: %1$s is the joining user's nickname, $2$s is the group nickname for which the join failed.
 #. TRANS: Message given having failed to add a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:350
+#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:362
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "No s'ha pogut afegir l'usuari %1$s al grup %2$s."
@@ -765,7 +761,7 @@ msgstr "No sou un membre del grup."
 #. TRANS: Message given having failed to remove a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
 #: actions/apigroupleave.php:127 actions/leavegroup.php:133
-#: lib/command.php:398
+#: lib/command.php:410
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
 msgstr "No s'ha pogut eliminar l'usuari %1$s del grup %2$s."
@@ -825,21 +821,20 @@ msgstr "El testimoni de sol·licitud ja està autoritzat."
 #. TRANS: Form validation error message.
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
-#. TRANS: Client error displayed when the session token is not okay.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
 #: actions/deletenotice.php:177 actions/disfavor.php:75
 #: actions/emailsettings.php:291 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:65 actions/grouplogo.php:321
 #: actions/groupunblock.php:65 actions/imsettings.php:224
-#: actions/invite.php:60 actions/login.php:131 actions/makeadmin.php:66
+#: actions/invite.php:60 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
-#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:136
-#: actions/othersettings.php:155 actions/passwordsettings.php:137
+#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
+#: actions/othersettings.php:155 actions/passwordsettings.php:138
 #: actions/profilesettings.php:217 actions/recoverpassword.php:383
-#: actions/register.php:164 actions/remotesubscribe.php:76
+#: actions/register.php:172 actions/remotesubscribe.php:76
 #: actions/repeat.php:82 actions/smssettings.php:250 actions/subedit.php:40
-#: actions/subscribe.php:87 actions/tagother.php:166
-#: actions/unsubscribe.php:69 actions/userauthorization.php:53
+#: actions/subscribe.php:86 actions/tagother.php:166
+#: actions/unsubscribe.php:69 actions/userauthorization.php:52
 #: lib/designsettings.php:310
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
@@ -872,7 +867,7 @@ msgstr "Error de la base de dades en inserir l'oauth_token_association."
 #: actions/designadminpanel.php:100 actions/editapplication.php:144
 #: actions/emailsettings.php:310 actions/grouplogo.php:332
 #: actions/imsettings.php:239 actions/newapplication.php:124
-#: actions/oauthconnectionssettings.php:145 actions/recoverpassword.php:46
+#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
 #: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
 msgstr "Enviament de formulari inesperat."
@@ -923,20 +918,19 @@ msgstr "Compte"
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group nickname (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT for nick name in a profile.
-#: actions/apioauthauthorize.php:459 actions/login.php:242
-#: actions/profilesettings.php:106 actions/register.php:418
+#: actions/apioauthauthorize.php:459 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:432
 #: actions/showgroup.php:243 actions/tagother.php:94
-#: actions/userauthorization.php:152 lib/groupeditform.php:145
+#: actions/userauthorization.php:145 lib/groupeditform.php:145
 #: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "Sobrenom"
 
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:463 actions/login.php:245
-#: actions/register.php:422 lib/accountsettingsaction.php:120
+#: actions/apioauthauthorize.php:463 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:120
 msgid "Password"
 msgstr "Contrasenya"
 
@@ -1030,13 +1024,13 @@ msgstr "No existeix aquest avís."
 
 #. TRANS: Client error displayed trying to repeat an own notice through the API.
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:537
+#: actions/apistatusesretweet.php:83 lib/command.php:549
 msgid "Cannot repeat your own notice."
 msgstr "No podeu repetir els vostres propis avisos."
 
 #. TRANS: Client error displayed trying to re-repeat a notice through the API.
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:92 lib/command.php:543
+#: actions/apistatusesretweet.php:92 lib/command.php:555
 msgid "Already repeated that notice."
 msgstr "Avís duplicat."
 
@@ -1058,8 +1052,8 @@ msgstr "El mètode HTTP no està implementat."
 #. TRANS: %s is the requested output format.
 #: actions/apistatusesshow.php:144
 #, fuzzy, php-format
-msgid "Unsupported format: %s."
-msgstr "Format no permès: %s"
+msgid "Unsupported format: %s"
+msgstr "Format no permès: %s."
 
 #. TRANS: Client error displayed requesting a deleted status.
 #: actions/apistatusesshow.php:155
@@ -1163,14 +1157,13 @@ msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr "%1$s actualitzacions que responen a avisos de %2$s / %3$s."
 
 #. TRANS: Title for site timeline. %s is the StatusNet sitename.
-#. TRANS: Public RSS feed title. %s is the StatusNet site name.
 #: actions/apitimelinepublic.php:193 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "%s línia temporal pública"
 
 #. TRANS: Subtitle for site timeline. %s is the StatusNet sitename.
-#: actions/apitimelinepublic.php:199
+#: actions/apitimelinepublic.php:199 actions/publicrss.php:105
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "%s actualitzacions de tothom!"
@@ -1235,26 +1228,25 @@ msgid "Atom post must be an Atom entry."
 msgstr "L'enviament Atom ha de ser una entrada Atom."
 
 #. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
-#: actions/apitimelineuser.php:334
+#: actions/apitimelineuser.php:335
 msgid "Can only handle POST activities."
 msgstr "Només es poden gestionar les activitats POST."
 
 #. TRANS: Client error displayed when using an unsupported activity object type.
 #. TRANS: %s is the unsupported activity object type.
-#: actions/apitimelineuser.php:345
+#: actions/apitimelineuser.php:346
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr "No es pot gestionar l'activitat del tipus d'objecte «%s»"
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
 #. TRANS: %d is the notice ID (number).
-#: actions/apitimelineuser.php:379
+#: actions/apitimelineuser.php:380
 #, php-format
 msgid "No content for notice %d."
 msgstr "No hi ha contingut de l'avís %d"
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#. TRANS: %s is the notice URI.
 #: actions/apitimelineuser.php:408
 #, php-format
 msgid "Notice with URI \"%s\" already exists."
@@ -1272,10 +1264,9 @@ msgstr "No s'ha trobat el mètode API!"
 
 #. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
 #. TRANS: Client exception.
-#. TRANS: Client error displayed trying to subscribe to a non-existing profile.
 #: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
 #: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
-#: actions/subscribe.php:110
+#: actions/subscribe.php:107
 msgid "No such profile."
 msgstr "No existeix el perfil."
 
@@ -1400,7 +1391,7 @@ msgstr "No es pot eliminar què ha preferit algú altre."
 #: actions/joingroup.php:95 actions/leavegroup.php:82
 #: actions/leavegroup.php:95 actions/makeadmin.php:86
 #: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:380
+#: lib/command.php:392
 msgid "No such group."
 msgstr "No s'ha trobat el grup."
 
@@ -1410,7 +1401,7 @@ msgid "Not a member."
 msgstr "No és un membre."
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
-#: actions/atompubshowmembership.php:150
+#: actions/atompubshowmembership.php:151
 msgid "Cannot delete someone else's membership."
 msgstr "No es pot eliminar la pertinència d'algú altre."
 
@@ -1514,11 +1505,9 @@ msgstr ""
 
 #. TRANS: Server error displayed in avatar upload page when no matching profile can be found for a user.
 #. TRANS: Server error displayed coming across a request from a user without a profile.
-#. TRANS: Server error displayed when trying to authorise a remote subscription request
-#. TRANS: while the user has no profile.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
 #: actions/grouplogo.php:184 actions/remotesubscribe.php:190
-#: actions/userauthorization.php:75 actions/userrss.php:108
+#: actions/userauthorization.php:72 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr "L'usuari que no coincideix amb cap perfil"
 
@@ -1573,12 +1562,12 @@ msgstr "Retalla"
 msgid "No file uploaded."
 msgstr "No s'ha carregat cap fitxer."
 
-#. TRANS: Avatar upload form instruction after uploading a file.
+#. TRANS: Avatar upload form unstruction after uploading a file.
 #: actions/avatarsettings.php:345
 #, fuzzy
-msgid "Pick a square area of the image to be your avatar."
+msgid "Pick a square area of the image to be your avatar"
 msgstr ""
-"Selecciona un quadrat de l'àrea de la imatge que vols que sigui el teu "
+"Seleccioneu una àrea quadrada de la imatge que voleu que sigui el vostre "
 "avatar."
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
@@ -1621,7 +1610,7 @@ msgid "You may not backup your account."
 msgstr "No podeu fer una còpia de seguretat del compte."
 
 #. TRANS: Information displayed on the backup account page.
-#: actions/backupaccount.php:225
+#: actions/backupaccount.php:227
 msgid ""
 "You can backup your account data in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format. This is an experimental feature and provides "
@@ -1637,16 +1626,16 @@ msgstr ""
 "directes tampoc es copien."
 
 #. TRANS: Submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:248
+#: actions/backupaccount.php:250
 msgctxt "BUTTON"
 msgid "Backup"
 msgstr "Còpia de seguretat"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:252
+#: actions/backupaccount.php:254
 #, fuzzy
-msgid "Backup your account."
-msgstr "Fes una còpia de seguretat del compte"
+msgid "Backup your account"
+msgstr "Fes una còpia de seguretat del compte."
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
 #: actions/block.php:68
@@ -1687,8 +1676,8 @@ msgstr "No"
 #. TRANS: Submit button title for 'No' when blocking a user.
 #: actions/block.php:158
 #, fuzzy
-msgid "Do not block this user."
-msgstr "No bloquis l'usuari"
+msgid "Do not block this user"
+msgstr "No bloquis l'usuari."
 
 #. TRANS: Button label on the user block form.
 #. TRANS: Button label on the delete application form.
@@ -1704,9 +1693,9 @@ msgid "Yes"
 msgstr "Sí"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:165
-#, fuzzy
-msgid "Block this user."
+#. TRANS: Description of the form to block a user.
+#: actions/block.php:165 lib/blockform.php:79
+msgid "Block this user"
 msgstr "Bloca aquest usuari"
 
 #. TRANS: Server error displayed when blocking a user fails.
@@ -1869,7 +1858,7 @@ msgstr ""
 #. TRANS: Field label for delete account confirmation entry.
 #. TRANS: Field label for password reset form where the password has to be typed again.
 #: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:262 actions/register.php:426
+#: actions/recoverpassword.php:262 actions/register.php:440
 msgid "Confirm"
 msgstr "Confirma"
 
@@ -1898,14 +1887,14 @@ msgstr "No s'ha trobat l'aplicació."
 #. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
 #: actions/deleteapplication.php:79 actions/editapplication.php:78
-#: actions/showapplication.php:90
+#: actions/showapplication.php:94
 msgid "You are not the owner of this application."
 msgstr "No sou el propietari d'aquesta aplicació."
 
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
-#: actions/newapplication.php:112 actions/showapplication.php:113
-#: lib/action.php:1422
+#: actions/newapplication.php:112 actions/showapplication.php:118
+#: lib/action.php:1425
 msgid "There was a problem with your session token."
 msgstr "S'ha produït un problema amb el testimoni de la vostra sessió."
 
@@ -1929,14 +1918,14 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting an application.
 #: actions/deleteapplication.php:161
 #, fuzzy
-msgid "Do not delete this application."
-msgstr "No eliminis l'aplicació"
+msgid "Do not delete this application"
+msgstr "No eliminis l'aplicació."
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
 #: actions/deleteapplication.php:167
 #, fuzzy
-msgid "Delete this application."
-msgstr "Elimina aquesta aplicació"
+msgid "Delete this application"
+msgstr "Elimina l'aplicació."
 
 #. TRANS: Client error when trying to delete group while not logged in.
 #: actions/deletegroup.php:64
@@ -1990,29 +1979,27 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting a group.
 #: actions/deletegroup.php:224
 #, fuzzy
-msgid "Do not delete this group."
-msgstr "No eliminis aquest grup"
+msgid "Do not delete this group"
+msgstr "No eliminis el grup."
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
 #: actions/deletegroup.php:231
 #, fuzzy
-msgid "Delete this group."
-msgstr "Elimina aquest grup"
+msgid "Delete this group"
+msgstr "Elimina el grup."
 
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
 #. TRANS: Client error displayed when trying to remove a favorite while not logged in.
 #. TRANS: Client error displayed when trying to mark a notice as favorite without being logged in.
 #. TRANS: Client error displayed trying to block a user from a group while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
-#. TRANS: Client error displayed trying to log out when not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
-#. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
 #. TRANS: Client error displayed when trying to change user options while not logged in.
 #: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
-#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:70
+#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
-#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:98
+#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
 #: lib/adminpanelaction.php:71 lib/profileformaction.php:63
 #: lib/settingsaction.php:72
@@ -2042,13 +2029,12 @@ msgstr "Esteu segur que voleu eliminar aquest avís?"
 #. TRANS: Submit button title for 'No' when deleting a notice.
 #: actions/deletenotice.php:159
 #, fuzzy
-msgid "Do not delete this notice."
-msgstr "No eliminis aquest avís"
+msgid "Do not delete this notice"
+msgstr "No eliminis l'avís."
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:166
-#, fuzzy
-msgid "Delete this notice."
+#: actions/deletenotice.php:166 lib/noticelist.php:673
+msgid "Delete this notice"
 msgstr "Elimina aquest avís"
 
 #. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
@@ -2084,13 +2070,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting a user.
 #: actions/deleteuser.php:158
 #, fuzzy
-msgid "Do not delete this user."
-msgstr "No eliminis aquest usuari"
+msgid "Do not delete this user"
+msgstr "No eliminis l'usuari."
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
-#: actions/deleteuser.php:165
-#, fuzzy
-msgid "Delete this user."
+#. TRANS: Description of form for deleting a user.
+#: actions/deleteuser.php:165 lib/deleteuserform.php:75
+msgid "Delete this user"
 msgstr "Elimina l'usuari"
 
 #. TRANS: Message used as title for design settings for the site.
@@ -2253,21 +2239,21 @@ msgid "Use defaults"
 msgstr "Utilitza els paràmetres per defecte"
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:720
-#, fuzzy
-msgid "Restore default designs."
+#. TRANS: Title for button on profile design page to reset all colour settings to default.
+#: actions/designadminpanel.php:720 lib/designsettings.php:259
+msgid "Restore default designs"
 msgstr "Restaura els dissenys per defecte"
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:728
-#, fuzzy
-msgid "Reset back to default."
+#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
+#: actions/designadminpanel.php:728 lib/designsettings.php:267
+msgid "Reset back to default"
 msgstr "Torna a restaurar al valor per defecte"
 
 #. TRANS: Title for button for saving theme settings.
-#: actions/designadminpanel.php:736
-#, fuzzy
-msgid "Save design."
+#. TRANS: Title for button on profile design page to save settings.
+#: actions/designadminpanel.php:736 lib/designsettings.php:272
+msgid "Save design"
 msgstr "Desa el disseny"
 
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
@@ -2299,7 +2285,7 @@ msgid "You must be logged in to edit an application."
 msgstr "Heu d'iniciar una sessió per editar una aplicació."
 
 #. TRANS: Client error displayed trying to edit an application that does not exist.
-#: actions/editapplication.php:83 actions/showapplication.php:83
+#: actions/editapplication.php:83 actions/showapplication.php:87
 msgid "No such application."
 msgstr "No hi ha tal aplicació."
 
@@ -2581,7 +2567,7 @@ msgid "Cannot normalize that email address."
 msgstr "No es pot normalitzar l'adreça electrònica."
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:393 actions/register.php:204
+#: actions/emailsettings.php:393 actions/register.php:212
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "Adreça de correu electrònic no vàlida."
@@ -2656,21 +2642,18 @@ msgstr "No hi ha cap direcció de correu electrònic entrant."
 
 #. 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.
 #: actions/emailsettings.php:530 actions/emailsettings.php:554
-#: actions/smssettings.php:566 actions/smssettings.php:591
+#: actions/smssettings.php:565 actions/smssettings.php:588
 msgid "Could not update user record."
 msgstr "No s'ha pogut actualitzar el registre de l'usuari."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
-#. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:534 actions/smssettings.php:570
+#: actions/emailsettings.php:534 actions/smssettings.php:568
 msgid "Incoming email address removed."
 msgstr "Eliminat el correu electrònic entrant."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
-#. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:558 actions/smssettings.php:595
+#: actions/emailsettings.php:558 actions/smssettings.php:591
 msgid "New incoming email address added."
 msgstr "Nou correu electrònic entrant afegit."
 
@@ -2682,7 +2665,7 @@ msgstr "Aquest avís ja és un preferit."
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
 #: actions/favor.php:95
 #, fuzzy
-msgid "Disfavor favorite."
+msgid "Disfavor favorite"
 msgstr "Fes que deixi de ser preferit"
 
 #. TRANS: Page title for first page of favorited notices.
@@ -2923,14 +2906,14 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
 #: actions/groupblock.php:191
 #, fuzzy
-msgid "Do not block this user from this group."
-msgstr "No bloquis l'usuari del grup"
+msgid "Do not block this user from this group"
+msgstr "No bloquis l'usuari del grup."
 
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
 #: actions/groupblock.php:198
 #, fuzzy
-msgid "Block this user from this group."
-msgstr "Bloca l'usuari del grup"
+msgid "Block this user from this group"
+msgstr "Bloca l'usuari del grup."
 
 #. TRANS: Server error displayed when trying to block a user from a group fails because of an application error.
 #: actions/groupblock.php:215
@@ -2938,7 +2921,6 @@ msgid "Database error blocking user from group."
 msgstr "S'ha produït un error en la base de dades en blocar l'usuari del grup."
 
 #. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
-#. TRANS: Client error displayed trying to find a user by ID without providing an ID.
 #: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr "Sense ID."
@@ -3125,10 +3107,8 @@ msgid "Group search"
 msgstr "Cerca de grups"
 
 #. TRANS: Text on page where groups can be searched if no results were found for a query.
-#. TRANS: Text for notice search results is the query had no results.
-#. TRANS: Message on the "People search" page where a query has no results.
-#: actions/groupsearch.php:82 actions/noticesearch.php:122
-#: actions/peoplesearch.php:87
+#: actions/groupsearch.php:82 actions/noticesearch.php:117
+#: actions/peoplesearch.php:83
 msgid "No results."
 msgstr "Cap resultat."
 
@@ -3165,7 +3145,6 @@ msgid "User is not blocked from group."
 msgstr "L'usuari no està blocat del grup."
 
 #. TRANS: Server error displayed when unblocking a user from a group fails because of an unknown error.
-#. TRANS: Server error displayed when removing a user block.
 #: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "S'ha produït un error en eliminar el bloc."
@@ -3258,8 +3237,7 @@ msgid "Publish a MicroID for my Jabber/Google Talk address."
 msgstr "Publica una MicroID per a la meva adreça de Jabber/GTalk."
 
 #. TRANS: Confirmation message for successful Instant Messaging preferences save.
-#. TRANS: Confirmation message after saving preferences.
-#: actions/imsettings.php:283 actions/othersettings.php:193
+#: actions/imsettings.php:283 actions/othersettings.php:192
 msgid "Preferences saved."
 msgstr "S'han desat les preferències."
 
@@ -3547,7 +3525,7 @@ msgstr "Heu d'haver iniciat una sessió per deixar un grup."
 
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
-#: actions/leavegroup.php:103 lib/command.php:386
+#: actions/leavegroup.php:103 lib/command.php:398
 msgid "You are not a member of that group."
 msgstr "No ets membre d'aquest grup."
 
@@ -3672,45 +3650,43 @@ msgstr "Desa"
 msgid "Save license settings"
 msgstr "Desa els paràmetres de la llicència"
 
-#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
-#: actions/login.php:97 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
 msgid "Already logged in."
 msgstr "Ja hi heu iniciat una sessió."
 
-#: actions/login.php:142
+#: actions/login.php:148
 msgid "Incorrect username or password."
 msgstr "Nom d'usuari o contrasenya incorrectes."
 
-#. TRANS: Server error displayed when a user object could not be created trying to login using "one time password login".
-#: actions/login.php:148 actions/otp.php:127
+#: actions/login.php:154 actions/otp.php:120
 msgid "Error setting user. You are probably not authorized."
 msgstr ""
 "S'ha produït un error en definir l'usuari. Probablement no hi esteu "
 "autoritzat."
 
-#: actions/login.php:202 actions/login.php:253
+#: actions/login.php:210 actions/login.php:263
 msgid "Login"
 msgstr "Inici de sessió"
 
-#: actions/login.php:239
+#: actions/login.php:249
 msgid "Login to site"
 msgstr "Accedir al lloc"
 
-#: actions/login.php:248 actions/register.php:476
+#: actions/login.php:258 actions/register.php:490
 msgid "Remember me"
 msgstr "Recorda'm"
 
-#: actions/login.php:249 actions/register.php:478
+#: actions/login.php:259 actions/register.php:492
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 "Inicia la sessió automàticament en el futur; no ho activeu en ordinadors "
 "compartits!"
 
-#: actions/login.php:259
+#: actions/login.php:269
 msgid "Lost or forgotten password?"
 msgstr "Contrasenya oblidada o perduda?"
 
-#: actions/login.php:277
+#: actions/login.php:288
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -3718,11 +3694,11 @@ msgstr ""
 "Per raons de seguretat, torneu a escriure el vostre nom d'usuari i "
 "contrasenya abans de canviar la vostra configuració."
 
-#: actions/login.php:281
+#: actions/login.php:292
 msgid "Login with your username and password."
 msgstr "Inicieu una sessió amb nom d'usuari i contrasenya"
 
-#: actions/login.php:284
+#: actions/login.php:295
 #, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -3803,14 +3779,14 @@ msgid "New message"
 msgstr "Nou missatge"
 
 #. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
-#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:501
+#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:513
 msgid "You can't send a message to this user."
 msgstr "No podeu enviar un misssatge a aquest usuari."
 
 #. TRANS: Command exception text shown when trying to send a direct message to another user without content.
 #. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
-#: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:478
-#: lib/command.php:581
+#: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:490
+#: lib/command.php:593
 msgid "No content!"
 msgstr "Cap contingut!"
 
@@ -3819,7 +3795,7 @@ msgid "No recipient specified."
 msgstr "No has especificat el destinatari."
 
 #. TRANS: Error text shown when trying to send a direct message to self.
-#: actions/newmessage.php:167 lib/command.php:505
+#: actions/newmessage.php:167 lib/command.php:517
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr "No t'enviïs missatges a tu mateix, simplement dir-te això."
@@ -3830,7 +3806,7 @@ msgstr "S'ha enviat el missatge"
 
 #. TRANS: Message given have sent a direct message to another user.
 #. TRANS: %s is the name of the other user.
-#: actions/newmessage.php:188 lib/command.php:513
+#: actions/newmessage.php:188 lib/command.php:525
 #, php-format
 msgid "Direct message to %s sent."
 msgstr "S'ha enviat un missatge directe a %s."
@@ -3847,9 +3823,7 @@ msgstr "Nou avís"
 msgid "Notice posted"
 msgstr "S'ha publicat l'avís"
 
-#. TRANS: Instructions for Notice search page.
-#. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/noticesearch.php:69
+#: actions/noticesearch.php:68
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -3858,21 +3832,16 @@ msgstr ""
 "Troba avisos a %%site.name%% per contingut. Separa els termes de cerca amb "
 "espais; han de ser majors a 3 caràcters."
 
-#. TRANS: Title of the page where users can search for notices.
-#: actions/noticesearch.php:80
+#: actions/noticesearch.php:78
 msgid "Text search"
 msgstr "Cerca de text"
 
-#. TRANS: Test in RSS notice search.
-#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearch.php:95
+#: actions/noticesearch.php:91
 #, php-format
 msgid "Search results for \"%1$s\" on %2$s"
 msgstr "Cerca els resultats de «%s» a %s"
 
-#. TRANS: Text for logged in users making a query for notices without results.
-#. TRANS: This message contains a Markdown link.
-#: actions/noticesearch.php:128
+#: actions/noticesearch.php:121
 #, php-format
 msgid ""
 "Be the first to [post on this topic](%%%%action.newnotice%%%%?"
@@ -3881,9 +3850,7 @@ msgstr ""
 "Sigueu el primer en [enviar sobre aquest tema](%%%%action.newnotice%%%%?"
 "status_textarea=%s)!"
 
-#. TRANS: Text for not logged in users making a query for notices without results.
-#. TRANS: This message contains Markdown links.
-#: actions/noticesearch.php:133
+#: actions/noticesearch.php:124
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and be the first to "
@@ -3892,19 +3859,16 @@ msgstr ""
 "Per què no [registreu un compte](%%%%action.register%%%%) i sou el primer "
 "[en parlar del tema](%%%%action.newnotice%%%%?status_textarea=%s)!"
 
-#. TRANS: RSS notice search feed title. %s is the query.
-#: actions/noticesearchrss.php:95
+#: actions/noticesearchrss.php:96
 #, php-format
 msgid "Updates with \"%s\""
 msgstr "Actualitzacions amb «%s»"
 
-#. TRANS: RSS notice search feed description.
-#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearchrss.php:99
+#: actions/noticesearchrss.php:98
 #, fuzzy, php-format
-msgid "Updates matching search term \"%1$s\" on %2$s."
+msgid "Updates matching search term \"%1$s\" on %2$s!"
 msgstr ""
-"Les actualitzacions que coincideixen amb el terme de cerca «%1$s» el %2$s!"
+"Les actualitzacions que coincideixen amb el terme de cerca «%1$s» el %2$s."
 
 #: actions/nudge.php:85
 msgid ""
@@ -3944,30 +3908,30 @@ msgid "You have not registered any applications yet."
 msgstr "No teniu cap aplicació registrada encara."
 
 #. TRANS: Title for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:70
+#: actions/oauthconnectionssettings.php:71
 msgid "Connected applications"
 msgstr "Aplicacions connectades"
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:81
+#: actions/oauthconnectionssettings.php:83
 msgid "The following connections exist for your account."
 msgstr "Les connexions següents existeixen per al vostre compte."
 
 #. TRANS: Client error when trying to revoke access for an application while not being a user of it.
-#: actions/oauthconnectionssettings.php:166
+#: actions/oauthconnectionssettings.php:168
 msgid "You are not a user of that application."
 msgstr "No sou usuari de l'aplicació."
 
 #. TRANS: Client error when revoking access has failed for some reason.
 #. TRANS: %s is the application ID revoking access failed for.
-#: actions/oauthconnectionssettings.php:181
+#: actions/oauthconnectionssettings.php:183
 #, php-format
 msgid "Unable to revoke access for application: %s."
 msgstr "No s'ha pogut revocar l'accés de l'aplicació: %s"
 
 #. TRANS: Success message after revoking access for an application.
 #. TRANS: %1$s is the application name, %2$s is the first part of the user token.
-#: actions/oauthconnectionssettings.php:200
+#: actions/oauthconnectionssettings.php:202
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -3977,14 +3941,14 @@ msgstr ""
 "2$s."
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:211
+#: actions/oauthconnectionssettings.php:213
 msgid "You have not authorized any applications to use your account."
 msgstr "No heu autoritzat cap aplicació perquè utilitzi el vostre compte."
 
 #. TRANS: Note for developers in the OAuth connection settings form.
 #. TRANS: This message contains a Markdown link. Do not separate "](".
 #. TRANS: %s is the URL to the OAuth settings.
-#: actions/oauthconnectionssettings.php:231
+#: actions/oauthconnectionssettings.php:233
 #, php-format
 msgid ""
 "Are you a developer? [Register an OAuth client application](%s) to use with "
@@ -3993,16 +3957,6 @@ msgstr ""
 "Sou un desenvolupador? [Registreu una aplicació de client OAuth](%s) per "
 "utilitzar-la amb una instància de l'StatusNet."
 
-#: actions/oembed.php:64
-#, fuzzy, php-format
-msgid "\"%s\" not found."
-msgstr "No s'ha trobat el mètode API!"
-
-#: actions/oembed.php:76
-#, fuzzy, php-format
-msgid "Notice %s not found."
-msgstr "No s'ha trobat l'avís pare."
-
 #: actions/oembed.php:80 actions/shownotice.php:100
 msgid "Notice has no profile."
 msgstr "L'avís no té cap perfil."
@@ -4012,16 +3966,6 @@ msgstr "L'avís no té cap perfil."
 msgid "%1$s's status on %2$s"
 msgstr "estat de %1$s a %2$s"
 
-#: actions/oembed.php:95
-#, fuzzy, php-format
-msgid "Attachment %s not found."
-msgstr "No s'ha trobat l'usuari destinatari."
-
-#: actions/oembed.php:136
-#, php-format
-msgid "\"%s\" not supported for oembed requests."
-msgstr ""
-
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
 #: actions/oembed.php:168
 #, php-format
@@ -4040,12 +3984,11 @@ msgstr "Si us plau, només URL %s sobre HTTP pla."
 msgid "Not a supported data format."
 msgstr "Format de data no suportat."
 
-#. TRANS: ShortName in the OpenSearch interface when trying to find users.
 #: actions/opensearch.php:64
 msgid "People Search"
 msgstr "Cerca de gent"
 
-#: actions/opensearch.php:68
+#: actions/opensearch.php:67
 msgid "Notice Search"
 msgstr "Cerca d'avisos"
 
@@ -4065,7 +4008,7 @@ msgstr "Gestiona altres opcions diferents."
 #. TRANS: here if it has one (most likely a single space).
 #: actions/othersettings.php:113
 msgid " (free service)"
-msgstr " (servei gratuït)"
+msgstr " (servei lliure)"
 
 #. TRANS: Label for dropdown with URL shortener services.
 #: actions/othersettings.php:122
@@ -4093,46 +4036,37 @@ msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr ""
 "El servei d'autoescurçament d'URL és massa llarga (màxim 50 caràcters)."
 
-#. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
-#: actions/otp.php:70
+#: actions/otp.php:69
 msgid "No user ID specified."
 msgstr "No s'ha especificat cap ID d'usuari."
 
-#. TRANS: Client error displayed trying to use "one time password login" without specifying a login token.
-#: actions/otp.php:86
+#: actions/otp.php:83
 msgid "No login token specified."
 msgstr "No s'ha especificat cap testimoni d'inici de sessió."
 
-#. TRANS: Client error displayed trying to use "one time password login" without requesting a login token.
-#: actions/otp.php:94
+#: actions/otp.php:90
 msgid "No login token requested."
 msgstr "No s'ha sol·licitat cap testimoni d'inici de sessió."
 
-#. TRANS: Client error displayed trying to use "one time password login" while specifying an invalid login token.
-#: actions/otp.php:100
+#: actions/otp.php:95
 msgid "Invalid login token specified."
 msgstr "No s'ha especificat un testimoni d'inici de sessió vàlid."
 
-#. TRANS: Client error displayed trying to use "one time password login" while specifying an expired login token.
-#: actions/otp.php:110
+#: actions/otp.php:104
 msgid "Login token expired."
 msgstr "El testimoni d'inici de sessió ha vençut."
 
-#. TRANS: Title for outbox for any but the fist page.
-#. TRANS: %1$s is the user nickname, %2$d is the page number.
-#: actions/outbox.php:57
+#: actions/outbox.php:58
 #, php-format
 msgid "Outbox for %1$s - page %2$d"
 msgstr "Safata de sortida de %1$s - pàgina %2$d"
 
-#. TRANS: Title for first page of outbox.
 #: actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
 msgstr "Safata de sortida per %s"
 
-#. TRANS: Instructions for outbox.
-#: actions/outbox.php:103
+#: actions/outbox.php:104
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr ""
 "Aquesta és la teva safata de sortida, que et mostrarà els missatges privats "
@@ -4160,42 +4094,43 @@ msgstr "Antiga contrasenya"
 msgid "New password"
 msgstr "Nova contrasenya"
 
-#: actions/passwordsettings.php:109 actions/register.php:423
-msgid "6 or more characters."
+#: actions/passwordsettings.php:109
+#, fuzzy
+msgid "6 or more characters"
 msgstr "6 o més caràcters."
 
-#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:264
-#: actions/register.php:427
-msgid "Same as password above."
+#: actions/passwordsettings.php:113
+#, fuzzy
+msgid "Same as password above"
 msgstr "Igual que la contrasenya de dalt"
 
 #: actions/passwordsettings.php:117
 msgid "Change"
 msgstr "Canvia"
 
-#: actions/passwordsettings.php:153 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:238
 msgid "Password must be 6 or more characters."
 msgstr "La contrasenya hauria de ser d'entre 6 a més caràcters."
 
-#: actions/passwordsettings.php:156 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:241
 msgid "Passwords don't match."
 msgstr "Les contrasenyes no coincideixen."
 
-#: actions/passwordsettings.php:164
+#: actions/passwordsettings.php:165
 msgid "Incorrect old password"
 msgstr "Contrasenya antiga incorrecta"
 
-#: actions/passwordsettings.php:180
+#: actions/passwordsettings.php:181
 msgid "Error saving user; invalid."
 msgstr "S'ha produït un error en desar l'usuari; no és vàlid."
 
-#. TRANS: Reset password form validation error message.
-#: actions/passwordsettings.php:185 actions/recoverpassword.php:418
-msgid "Cannot save new password."
+#: actions/passwordsettings.php:186
+#, fuzzy
+msgid "Can't save new password."
 msgstr "No es pot desar la nova contrasenya."
 
-#: actions/passwordsettings.php:191
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
 msgid "Password saved."
 msgstr "Contrasenya guardada."
 
@@ -4469,9 +4404,7 @@ msgstr "Servidor on dirigir les sol·licituds SSL."
 msgid "Save paths"
 msgstr "Desa els camins"
 
-#. TRANS: Instructions for the "People search" page.
-#. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/peoplesearch.php:54
+#: actions/peoplesearch.php:52
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
@@ -4480,8 +4413,7 @@ msgstr ""
 "Troba gent a %%site.name%% per nom, ubicació o interessos. Separa els termes "
 "de cerca amb espais; han de ser majors a 3 caràcters."
 
-#. TRANS: Title of a page where users can search for other users.
-#: actions/peoplesearch.php:61
+#: actions/peoplesearch.php:58
 msgid "People search"
 msgstr "Cerca de gent"
 
@@ -4525,7 +4457,7 @@ msgid "Profile information"
 msgstr "Informació del perfil"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109 actions/register.php:419
+#: actions/profilesettings.php:109 actions/register.php:433
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr ""
 "1-64 lletres en minúscula o nombres, sense signes de puntuació o espais."
@@ -4533,7 +4465,7 @@ msgstr ""
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for full group name (dt). Text hidden by default.
 #. TRANS: DT for full name in a profile.
-#: actions/profilesettings.php:113 actions/register.php:441
+#: actions/profilesettings.php:113 actions/register.php:455
 #: actions/showgroup.php:255 actions/tagother.php:104
 #: lib/groupeditform.php:150 lib/userprofile.php:156
 msgid "Full name"
@@ -4541,20 +4473,20 @@ msgstr "Nom complet"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:118 actions/register.php:446
+#: actions/profilesettings.php:118 actions/register.php:460
 #: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "Pàgina personal"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:121 actions/register.php:448
+#: actions/profilesettings.php:121
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr "URL del vostre web, blog o perfil en un altre lloc."
 
 #. TRANS: Tooltip for field label in form for profile settings. Plural
 #. TRANS: is decided by the number of characters available for the
 #. TRANS: biography (%d).
-#: actions/profilesettings.php:129 actions/register.php:457
+#: actions/profilesettings.php:129 actions/register.php:471
 #, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4562,29 +4494,28 @@ msgstr[0] "Descriviu qui sou i els vostres interessos en %d caràcter"
 msgstr[1] "Descriviu qui sou i els vostres interessos en %d caràcters"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:135 actions/register.php:462
+#: actions/profilesettings.php:135 actions/register.php:476
 msgid "Describe yourself and your interests"
 msgstr "Feu una descripció personal i interessos"
 
 #. TRANS: Text area label in form for profile settings where users can provide.
 #. TRANS: their biography.
-#: actions/profilesettings.php:139 actions/register.php:464
+#: actions/profilesettings.php:139 actions/register.php:478
 msgid "Bio"
 msgstr "Biografia"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group location (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT for location in a profile.
-#: actions/profilesettings.php:145 actions/register.php:469
+#: actions/profilesettings.php:145 actions/register.php:483
 #: actions/showgroup.php:265 actions/tagother.php:112
-#: actions/userauthorization.php:174 lib/groupeditform.php:173
+#: actions/userauthorization.php:166 lib/groupeditform.php:173
 #: lib/userprofile.php:172
 msgid "Location"
 msgstr "Ubicació"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148
+#: actions/profilesettings.php:148 actions/register.php:485
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "On us trobeu, per exemple «ciutat, comarca (o illa), país»"
 
@@ -4605,11 +4536,10 @@ msgstr "Etiquetes"
 #: actions/profilesettings.php:164
 #, fuzzy
 msgid ""
-"Tags for yourself (letters, numbers, -, ., and _), comma- or space- "
-"separated."
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr ""
 "Etiquetes pròpies (lletres, nombres, -, ., i _), per comes o separades amb "
-"espais"
+"espais."
 
 #. TRANS: Dropdownlist label in form for profile settings.
 #: actions/profilesettings.php:169
@@ -4619,8 +4549,8 @@ msgstr "Llengua"
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
 #: actions/profilesettings.php:171
 #, fuzzy
-msgid "Preferred language."
-msgstr "Llengua preferida"
+msgid "Preferred language"
+msgstr "Llengua preferida."
 
 #. TRANS: Dropdownlist label in form for profile settings.
 #: actions/profilesettings.php:181
@@ -4636,15 +4566,15 @@ msgstr "En quin fus horari us trobeu normalment?"
 #: actions/profilesettings.php:189
 #, fuzzy
 msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)."
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr ""
-"Subscripció automàtica a qualsevol qui em tingui subscrit (ideal per no-"
+"Subscriu automàticament a qualsevol qui em tingui subscrit (ideal per no-"
 "humans)"
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Plural form is used based on the maximum number of allowed
 #. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:258 actions/register.php:221
+#: actions/profilesettings.php:258 actions/register.php:229
 #, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4663,9 +4593,9 @@ msgstr "La llengua és massa llarga (màxim 50 caràcters)."
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:291
-#, fuzzy, php-format
-msgid "Invalid tag: \"%s\"."
+#: actions/profilesettings.php:291 actions/tagother.php:178
+#, php-format
+msgid "Invalid tag: \"%s\""
 msgstr "L'etiqueta no és vàlida: «%s»"
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
@@ -4770,12 +4700,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: Public RSS feed description. %s is the StatusNet site name.
-#: actions/publicrss.php:106
-#, fuzzy, php-format
-msgid "%s updates from everyone."
-msgstr "%s actualitzacions de tothom!"
-
 #. TRANS: Title for public tag cloud.
 #: actions/publictagcloud.php:57
 msgid "Public tag cloud"
@@ -4914,12 +4838,6 @@ msgstr "Recupera la contrasenya"
 msgid "Password recovery requested"
 msgstr "Recuperació de contrasenya sol·licitada"
 
-#. TRANS: Title for password recovery page in password saved mode.
-#: actions/recoverpassword.php:229
-#, fuzzy
-msgid "Password saved"
-msgstr "Contrasenya guardada."
-
 #. TRANS: Title for password recovery page when an unknown action has been specified.
 #: actions/recoverpassword.php:232
 msgid "Unknown action"
@@ -4930,6 +4848,11 @@ msgstr "Acció desconeguda"
 msgid "6 or more characters, and do not forget it!"
 msgstr "6 o més caràcters, i no ho oblideu!"
 
+#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#: actions/recoverpassword.php:264 actions/register.php:441
+msgid "Same as password above."
+msgstr "Igual que la contrasenya de dalt"
+
 #. TRANS: Button text for password reset form.
 #. TRANS: Button text on profile design page to reset all colour settings to default without saving.
 #: actions/recoverpassword.php:268 lib/designsettings.php:264
@@ -4981,8 +4904,13 @@ msgstr "La contrasenya ha de tenir 6 o més caràcters."
 msgid "Password and confirmation do not match."
 msgstr "La contrasenya i la confirmació no coincideixen."
 
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:418
+msgid "Cannot save new password."
+msgstr "No es pot desar la nova contrasenya."
+
 #. TRANS: Server error displayed when something does wrong with the user object during password reset.
-#: actions/recoverpassword.php:426 actions/register.php:248
+#: actions/recoverpassword.php:426 actions/register.php:256
 msgid "Error setting user."
 msgstr "Error en configurar l'usuari."
 
@@ -4991,94 +4919,98 @@ msgstr "Error en configurar l'usuari."
 msgid "New password successfully saved. You are now logged in."
 msgstr "Nova contrasenya guardada correctament. Has iniciat una sessió."
 
-#: actions/register.php:87 actions/register.php:188 actions/register.php:399
+#: actions/register.php:92 actions/register.php:196 actions/register.php:413
 msgid "Sorry, only invited people can register."
 msgstr "Ho sentim, però només la gent convidada pot registrar-s'hi."
 
-#: actions/register.php:94
+#: actions/register.php:99
 msgid "Sorry, invalid invitation code."
 msgstr "El codi d'invitació no és vàlid."
 
-#: actions/register.php:113
+#: actions/register.php:119
 msgid "Registration successful"
 msgstr "Registre satisfactori"
 
-#: actions/register.php:115 actions/register.php:497
+#: actions/register.php:121 actions/register.php:511
 msgid "Register"
 msgstr "Registre"
 
-#: actions/register.php:135
+#: actions/register.php:142
 msgid "Registration not allowed."
 msgstr "Registre no permès."
 
-#: actions/register.php:201
+#: actions/register.php:209
 #, fuzzy
-msgid "You cannot register if you don't agree to the license."
-msgstr "No pots registrar-te si no estàs d'acord amb la llicència."
+msgid "You can't register if you don't agree to the license."
+msgstr "No podeu registrar-vos-hi si no accepteu la llicència."
 
-#: actions/register.php:210
+#: actions/register.php:218
 msgid "Email address already exists."
 msgstr "L'adreça de correu electrònic ja existeix."
 
-#: actions/register.php:243 actions/register.php:265
+#: actions/register.php:251 actions/register.php:273
 msgid "Invalid username or password."
 msgstr "El nom d'usuari o la contrasenya no són vàlids."
 
-#: actions/register.php:340
+#: actions/register.php:351
 #, fuzzy
 msgid ""
 "With this form you can create a new account. You can then post notices and "
-"link up to friends and colleagues."
+"link up to friends and colleagues. "
 msgstr ""
 "Amb aquest formulari, podeu crear un compte nou. Podeu enviar avisos i "
-"enllaçar a amics i col·legues. "
+"enllaçar a amics i col·legues."
+
+#: actions/register.php:437
+msgid "6 or more characters."
+msgstr "6 o més caràcters."
 
 #. TRANS: Link description in user account settings menu.
-#: actions/register.php:431 actions/register.php:435
+#: actions/register.php:445 actions/register.php:449
 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
 msgid "Email"
 msgstr "Correu electrònic"
 
-#: actions/register.php:432 actions/register.php:436
+#: actions/register.php:446 actions/register.php:450
 #, fuzzy
-msgid "Used only for updates, announcements, and password recovery."
+msgid "Used only for updates, announcements, and password recovery"
 msgstr ""
-"Utilitzat només per a actualitzacions, anuncis i recuperació de contrasenya"
+"Utilitzat només per a actualitzacions, anuncis i recuperació de contrasenya."
 
-#: actions/register.php:443
+#: actions/register.php:457
 #, fuzzy
-msgid "Longer name, preferably your \"real\" name."
-msgstr "Nom llarg, preferiblement el vostre nom «real»"
+msgid "Longer name, preferably your \"real\" name"
+msgstr "Nom més llarg, preferiblement el vostre nom «real»."
 
-#: actions/register.php:471
+#: actions/register.php:462
 #, fuzzy
-msgid "Where you are, like \"City, State (or Region), Country\"."
-msgstr "On us trobeu, per exemple «ciutat, comarca (o illa), país»"
+msgid "URL of your homepage, blog, or profile on another site"
+msgstr "URL del vostre web, blog o perfil en un altre lloc."
 
-#: actions/register.php:510
+#: actions/register.php:523
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
 msgstr ""
 "Entenc que el contingut i les dades de %1$s són privades i confidencials."
 
-#: actions/register.php:520
+#: actions/register.php:533
 #, php-format
 msgid "My text and files are copyright by %1$s."
 msgstr "El meu text i els meus fitxers són copyright de %1$s."
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:524
+#: actions/register.php:537
 msgid "My text and files remain under my own copyright."
 msgstr "El meu text i els meus fitxers es troben sota el meu propi copyright."
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:527
+#: actions/register.php:540
 msgid "All rights reserved."
 msgstr "Tots els drets reservats."
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:532
+#: actions/register.php:545
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -5088,7 +5020,7 @@ msgstr ""
 "les dades privades: contrasenya, adreça de correu electrònic, adreça de "
 "missatgeria instantània i número de telèfon."
 
-#: actions/register.php:573
+#: actions/register.php:588
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -5121,7 +5053,7 @@ msgstr ""
 "\n"
 "Gràcies per registrar-vos-hi i esperem que en gaudiu."
 
-#: actions/register.php:597
+#: actions/register.php:612
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5155,8 +5087,8 @@ msgstr "Sobrenom de l'usuari"
 
 #: actions/remotesubscribe.php:129
 #, fuzzy
-msgid "Nickname of the user you want to follow."
-msgstr "Sobrenom de l'usuari que vols seguir"
+msgid "Nickname of the user you want to follow"
+msgstr "Sobrenom de l'usuari que voleu seguir."
 
 #: actions/remotesubscribe.php:132
 msgid "Profile URL"
@@ -5164,8 +5096,8 @@ msgstr "URL del perfil"
 
 #: actions/remotesubscribe.php:133
 #, fuzzy
-msgid "URL of your profile on another compatible microblogging service."
-msgstr "URL del teu perfil en un altre servei de microblogging compatible"
+msgid "URL of your profile on another compatible microblogging service"
+msgstr "URL del vostre perfil en un altre servei de microblogging compatible."
 
 #. TRANS: Link text for link that will subscribe to a remote profile.
 #: actions/remotesubscribe.php:136 lib/subscribeform.php:139
@@ -5175,8 +5107,8 @@ msgstr "Subscriu-m'hi"
 
 #: actions/remotesubscribe.php:158
 #, fuzzy
-msgid "Invalid profile URL (bad format)."
-msgstr "L'URL del perfil és invàlid (format incorrecte)"
+msgid "Invalid profile URL (bad format)"
+msgstr "L'URL del perfil no és vàlid (format incorrecte)."
 
 #: actions/remotesubscribe.php:167
 msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
@@ -5216,7 +5148,6 @@ msgstr "Repetit"
 msgid "Repeated!"
 msgstr "Repetit!"
 
-#. TRANS: RSS reply feed title. %s is a user nickname.
 #. TRANS: Tooltip for personal group navigation menu option when logged in for viewing @-replies.
 #: actions/replies.php:126 actions/repliesrss.php:68
 #: lib/personalgroupnav.php:109
@@ -5270,12 +5201,10 @@ msgstr ""
 "Sigueu el primer en [enviar sobre aquest tema](%%%%action.newnotice%%%%?"
 "status_textarea=%s)!"
 
-#. TRANS: RSS reply feed description.
-#. TRANS: %1$s is a user nickname, %2$s is the StatusNet site name.
-#: actions/repliesrss.php:74
+#: actions/repliesrss.php:72
 #, fuzzy, php-format
-msgid "Replies to %1$s on %2$s."
-msgstr "Respostes a %1$s el %2$s!"
+msgid "Replies to %1$s on %2$s!"
+msgstr "Respostes a %1$s el %2$s."
 
 #. TRANS: Client exception displayed when trying to restore an account while not logged in.
 #: actions/restoreaccount.php:78
@@ -5378,7 +5307,7 @@ msgstr "No podeu revocar els rols d'usuari en aquest lloc."
 msgid "User doesn't have this role."
 msgstr "L'usuari no té aquest rol."
 
-#: actions/rsd.php:142 actions/version.php:159
+#: actions/rsd.php:146 actions/version.php:159
 msgid "StatusNet"
 msgstr "StatusNet"
 
@@ -5420,87 +5349,87 @@ msgstr "Activa la sortida de depuració per a les sessions."
 msgid "Save site settings"
 msgstr "Desa els paràmetres del lloc"
 
-#: actions/showapplication.php:78
+#: actions/showapplication.php:82
 msgid "You must be logged in to view an application."
 msgstr "Heu d'haver iniciat una sessió per visualitzar una aplicació."
 
-#: actions/showapplication.php:151
+#: actions/showapplication.php:157
 msgid "Application profile"
 msgstr "Perfil de l'aplicació"
 
 #. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:153 lib/applicationeditform.php:177
+#: actions/showapplication.php:159 lib/applicationeditform.php:177
 msgid "Icon"
 msgstr "Icona"
 
 #. TRANS: Form input field label for application name.
-#: actions/showapplication.php:163 actions/version.php:197
+#: actions/showapplication.php:169 actions/version.php:197
 #: lib/applicationeditform.php:190
 msgid "Name"
 msgstr "Nom"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:172 lib/applicationeditform.php:227
+#: actions/showapplication.php:178 lib/applicationeditform.php:227
 msgid "Organization"
 msgstr "Organització"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:181 actions/version.php:200
+#: actions/showapplication.php:187 actions/version.php:200
 #: lib/applicationeditform.php:208 lib/groupeditform.php:168
 msgid "Description"
 msgstr "Descripció"
 
 #. TRANS: Header for group statistics on a group page (h2).
 #. TRANS: H2 text for user statistics.
-#: actions/showapplication.php:186 actions/showgroup.php:460
+#: actions/showapplication.php:192 actions/showgroup.php:460
 #: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "Estadístiques"
 
-#: actions/showapplication.php:197
+#: actions/showapplication.php:203
 #, php-format
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr "Creat per %1$s - %2$s accés per defecte - %3$d usuaris"
 
-#: actions/showapplication.php:207
+#: actions/showapplication.php:213
 msgid "Application actions"
 msgstr "Accions d'aplicació"
 
-#: actions/showapplication.php:230
+#: actions/showapplication.php:236
 msgid "Reset key & secret"
 msgstr "Reinicialitza la clau i la secreta"
 
 #. TRANS: Title of form for deleting a user.
-#: actions/showapplication.php:246 lib/deletegroupform.php:121
+#: actions/showapplication.php:252 lib/deletegroupform.php:121
 #: lib/deleteuserform.php:64 lib/noticelist.php:673
 msgid "Delete"
 msgstr "Elimina"
 
-#: actions/showapplication.php:255
+#: actions/showapplication.php:261
 msgid "Application info"
 msgstr "Informació de l'aplicació"
 
-#: actions/showapplication.php:257
+#: actions/showapplication.php:263
 msgid "Consumer key"
 msgstr "Clau del consumidor"
 
-#: actions/showapplication.php:262
+#: actions/showapplication.php:268
 msgid "Consumer secret"
 msgstr "Secreta del consumidor"
 
-#: actions/showapplication.php:267
+#: actions/showapplication.php:273
 msgid "Request token URL"
 msgstr "Sol·licita l'URL del testimoni"
 
-#: actions/showapplication.php:272
+#: actions/showapplication.php:278
 msgid "Access token URL"
 msgstr "Accedeix a l'URL del testimoni"
 
-#: actions/showapplication.php:277
+#: actions/showapplication.php:283
 msgid "Authorize URL"
 msgstr "Autoritza l'URL"
 
-#: actions/showapplication.php:282
+#: actions/showapplication.php:288
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
@@ -5508,7 +5437,7 @@ msgstr ""
 "Nota: Les signatures HMAC-SHA1 són vàlides; però no es permet el mètode de "
 "signatures en text net."
 
-#: actions/showapplication.php:302
+#: actions/showapplication.php:309
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr ""
 "Esteu segur que voleu reinicialitzar la clau del consumidor i la secreta?"
@@ -5600,18 +5529,16 @@ msgid "Group profile"
 msgstr "Perfil del grup"
 
 #. TRANS: Label for group URL (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT for URL in a profile.
 #: actions/showgroup.php:273 actions/tagother.php:118
-#: actions/userauthorization.php:184 lib/userprofile.php:186
+#: actions/userauthorization.php:175 lib/userprofile.php:186
 msgid "URL"
 msgstr "URL"
 
 #. TRANS: Label for group description or group note (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page where bio is displayed.
 #. TRANS: DT for note in a profile.
 #: actions/showgroup.php:285 actions/tagother.php:128
-#: actions/userauthorization.php:197 lib/userprofile.php:204
+#: actions/userauthorization.php:187 lib/userprofile.php:204
 msgid "Note"
 msgstr "Avisos"
 
@@ -5757,7 +5684,7 @@ msgid "%1$s tagged %2$s"
 msgstr "%1$s etiquetats %2$s"
 
 #. TRANS: Page title showing tagged notices in one user's stream.
-#. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
+#. TRANS: %1$s is the username, %2$s is the hash tag, %1$d is the page number.
 #: actions/showstream.php:74
 #, php-format
 msgid "%1$s tagged %2$s, page %3$d"
@@ -6008,8 +5935,8 @@ msgstr "Text d'avís per a tot el lloc (màxim 255 caràcters; es permet l'HTML)
 #. TRANS: Title for button to save site notice in admin panel.
 #: actions/sitenoticeadminpanel.php:201
 #, fuzzy
-msgid "Save site notice."
-msgstr "Desa l'avís per a tot el lloc"
+msgid "Save site notice"
+msgstr "Desa l'avís per a tot el lloc."
 
 #. TRANS: Title for SMS settings.
 #: actions/smssettings.php:57
@@ -6069,8 +5996,8 @@ msgstr "Número de telèfon per als SMS"
 #. TRANS: SMS phone number input field instructions in SMS settings form.
 #: actions/smssettings.php:152
 #, fuzzy
-msgid "Phone number, no punctuation or spaces, with area code."
-msgstr "Número de telèfon, no puntuació ni espais, en l'àrea del codi"
+msgid "Phone number, no punctuation or spaces, with area code"
+msgstr "Número de telèfon, no puntuació ni espais, en l'àrea del codi."
 
 #. TRANS: Form legend for SMS preferences form.
 #: actions/smssettings.php:191
@@ -6238,19 +6165,15 @@ msgstr "No estàs subscrit a aquest perfil."
 msgid "Could not save subscription."
 msgstr "No s'ha pogut guardar la subscripció."
 
-#. TRANS: Client error displayed trying to perform any request method other than POST.
-#. TRANS: Do not translate POST.
 #: actions/subscribe.php:77
 msgid "This action only accepts POST requests."
 msgstr "Aquesta acció només accepta sol·licituds POST."
 
-#. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
-#: actions/subscribe.php:121
+#: actions/subscribe.php:117
 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
 msgstr "No podeu subscriure-us a un perfil remot OMB 0.1 amb aquesta acció."
 
-#. TRANS: Page title when subscription succeeded.
-#: actions/subscribe.php:149
+#: actions/subscribe.php:145
 msgid "Subscribed"
 msgstr "Subscrit"
 
@@ -6410,9 +6333,8 @@ msgstr "Etiqueta %s"
 msgid "User profile"
 msgstr "Perfil de l'usuari"
 
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT element in area for user avatar.
-#: actions/tagother.php:81 actions/userauthorization.php:138
+#: actions/tagother.php:81 actions/userauthorization.php:132
 #: lib/userprofile.php:108
 msgid "Photo"
 msgstr "Foto"
@@ -6429,11 +6351,6 @@ msgstr ""
 "Etiquetes d'aquest usuari (lletres, nombres,, -, ., i _), comes o separades "
 "amb espais"
 
-#: actions/tagother.php:178
-#, php-format
-msgid "Invalid tag: \"%s\""
-msgstr "L'etiqueta no és vàlida: «%s»"
-
 #: actions/tagother.php:193
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
@@ -6451,7 +6368,6 @@ msgstr ""
 msgid "No such tag."
 msgstr "No existeix aquesta etiqueta."
 
-#. TRANS: Client error displayed when trying to unblock a non-blocked user.
 #: actions/unblock.php:59
 msgid "You haven't blocked that user."
 msgstr "No heu blocat l'usuari."
@@ -6472,7 +6388,7 @@ msgstr "No hi ha cap identificador del perfil en la sol·licitud."
 msgid "Unsubscribed"
 msgstr "No subscrit"
 
-#: actions/updateprofile.php:64
+#: actions/updateprofile.php:64 actions/userauthorization.php:337
 #, php-format
 msgid ""
 "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
@@ -6506,7 +6422,7 @@ msgstr ""
 #. TRANS: users in user admin panel. %1$s is the invalid nickname.
 #: actions/useradminpanel.php:166
 #, fuzzy, php-format
-msgid "Invalid default subscripton: \"%1$s\" is not a user."
+msgid "Invalid default subscripton: '%1$s' is not a user."
 msgstr "La subscripció per defecte no és vàlida: «%1$s» no és cap usuari."
 
 #. TRANS: Link description in user account settings menu.
@@ -6567,70 +6483,59 @@ msgstr "Si es permet als usuaris invitar-ne de nous."
 #. TRANS: Title for button to save user settings in user admin panel.
 #: actions/useradminpanel.php:302
 #, fuzzy
-msgid "Save user settings."
-msgstr "Desa els paràmetres d'usuari"
+msgid "Save user settings"
+msgstr "Desa els paràmetres d'usuari."
 
-#. TRANS: Page title.
-#: actions/userauthorization.php:109
+#: actions/userauthorization.php:105
 msgid "Authorize subscription"
 msgstr "Autoritza la subscripció"
 
-#. TRANS: Page notice on "Auhtorize subscription" page.
-#: actions/userauthorization.php:115
+#: actions/userauthorization.php:110
 #, fuzzy
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
 "user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
-"click \"Reject\"."
+"click “Reject”."
 msgstr ""
 "Si us plau, reviseu aquests detalls per assegurar-vos que voleu subscriure-"
 "us als avisos d'aquest usuari. Si no heu demanat subscriure-us als avisos de "
 "ningú, feu clic a «Rebutja»."
 
-#. TRANS: DT element on Authorise Subscription page where license is displayed.
 #. TRANS: Menu item for site administration
-#: actions/userauthorization.php:207 actions/version.php:167
+#: actions/userauthorization.php:196 actions/version.php:167
 #: lib/adminpanelaction.php:403
 msgid "License"
 msgstr "Llicència"
 
-#. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:229
+#: actions/userauthorization.php:217
 #, fuzzy
-msgctxt "BUTTON"
 msgid "Accept"
 msgstr "Accepta"
 
-#. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:231
-#, fuzzy
-msgid "Subscribe to this user."
+#: actions/userauthorization.php:218 lib/subscribeform.php:115
+#: lib/subscribeform.php:139
+msgid "Subscribe to this user"
 msgstr "Subscriu-me a aquest usuari"
 
-#. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:233
+#: actions/userauthorization.php:219
 #, fuzzy
-msgctxt "BUTTON"
 msgid "Reject"
 msgstr "Rebutja"
 
-#. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:235
+#: actions/userauthorization.php:220
 #, fuzzy
-msgid "Reject this subscription."
+msgid "Reject this subscription"
 msgstr "Rebutja la subscripció"
 
-#. TRANS: Client error displayed for an empty authorisation request.
-#: actions/userauthorization.php:248
+#: actions/userauthorization.php:232
 msgid "No authorization request!"
 msgstr "No és una sol·licitud d'autorització!"
 
-#. TRANS: Accept message header from Authorise subscription page.
-#: actions/userauthorization.php:271
+#: actions/userauthorization.php:254
 msgid "Subscription authorized"
 msgstr "Subscripció autoritzada"
 
-#: actions/userauthorization.php:274
+#: actions/userauthorization.php:256
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to authorize the "
@@ -6640,12 +6545,11 @@ msgstr ""
 "retorn. Reviseu les instruccions del lloc per tal de tenir més detalls de "
 "com autoritzar la subscripció. El vostre testimoni de subscripció és:"
 
-#. TRANS: Reject message header from Authorise subscription page.
-#: actions/userauthorization.php:285
+#: actions/userauthorization.php:266
 msgid "Subscription rejected"
 msgstr "Subscripció rebutjada"
 
-#: actions/userauthorization.php:288
+#: actions/userauthorization.php:268
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to fully reject the "
@@ -6655,64 +6559,39 @@ msgstr ""
 "retorn. Reviseu les instruccions del lloc per tal de tenir més detalls de "
 "com rebutjar la subscripció completament."
 
-#. TRANS: Exception thrown when no valid user is found for an authorisation request.
-#. TRANS: %s is a listener URI.
-#: actions/userauthorization.php:325
+#: actions/userauthorization.php:303
 #, fuzzy, php-format
-msgid "Listener URI \"%s\" not found here."
+msgid "Listener URI ‘%s’ not found here."
 msgstr "No s'hi ha trobat l'URI de qui us escolta, «%s»."
 
-#. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:332
+#: actions/userauthorization.php:308
 #, fuzzy, php-format
-msgid "Listenee URI \"%s\" is too long."
+msgid "Listenee URI ‘%s’ is too long."
 msgstr "L'URI de qui escolteu, «%s», és massa llarga."
 
-#. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:340
+#: actions/userauthorization.php:314
 #, fuzzy, php-format
-msgid "Listenee URI \"%s\" is a local user."
+msgid "Listenee URI ‘%s’ is a local user."
 msgstr "L'URI de qui escolteu, «%s», és un usuari local."
 
-#. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
-#. TRANS: %s is a profile URL.
-#: actions/userauthorization.php:358
+#: actions/userauthorization.php:329
 #, fuzzy, php-format
-msgid "Profile URL \"%s\" is for a local user."
+msgid "Profile URL ‘%s’ is for a local user."
 msgstr "L'URL del perfil «%s» és només per a un usuari local."
 
-#. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
-#. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
-#: actions/userauthorization.php:368
+#: actions/userauthorization.php:345
 #, fuzzy, php-format
-msgid ""
-"Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
-"\"."
-msgstr ""
-"La llicència del flux de qui escolteu, «%1$s», no és compatible amb la "
-"llicència del lloc, «%2$s»."
-
-#. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:378
-#, fuzzy, php-format
-msgid "Avatar URL \"%s\" is not valid."
+msgid "Avatar URL ‘%s’ is not valid."
 msgstr "L'URL de l'avatar «%s» no és vàlid."
 
-#. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:385
+#: actions/userauthorization.php:350
 #, fuzzy, php-format
-msgid "Cannot read avatar URL \"%s\"."
+msgid "Can’t read avatar URL ‘%s’."
 msgstr "No es pot llegir l'URL de l'avatar «%s»."
 
-#. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:392
+#: actions/userauthorization.php:355
 #, fuzzy, php-format
-msgid "Wrong image type for avatar URL \"%s\"."
+msgid "Wrong image type for avatar URL ‘%s’."
 msgstr "Tipus d'imatge incorrecta per a l'URL de l'avatar «%s»."
 
 #. TRANS: Page title for profile design page.
@@ -6820,7 +6699,7 @@ msgid "Plugins"
 msgstr "Connectors"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:898
+#: actions/version.php:198 lib/action.php:901
 msgid "Version"
 msgstr "Versió"
 
@@ -7033,14 +6912,14 @@ msgstr "S'ha produït un problema en desar la safata d'entrada del grup."
 
 #. TRANS: Server exception thrown when a reply cannot be saved.
 #. TRANS: %1$d is a notice ID, %2$d is the ID of the mentioned user.
-#: classes/Notice.php:1142
+#: classes/Notice.php:1144
 #, php-format
 msgid "Could not save reply for %1$d, %2$d."
 msgstr "No s'ha pogut desar la resposta de %1$d, %2$d."
 
 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1661
+#: classes/Notice.php:1663
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
@@ -7054,14 +6933,14 @@ msgstr "%1$s (%2$s)"
 
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:775
+#: classes/Profile.php:779
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr "No es pot revocar el rol «%1$s» de l'usuari #%2$d; no existeix."
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:784
+#: classes/Profile.php:788
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -7380,53 +7259,53 @@ msgid "Page notice"
 msgstr "Avís de pàgina"
 
 #. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:871
+#: lib/action.php:874
 msgid "Secondary site navigation"
 msgstr "Navegació del lloc secundària"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:877
+#: lib/action.php:880
 msgid "Help"
 msgstr "Ajuda"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:880
+#: lib/action.php:883
 msgid "About"
 msgstr "Quant a"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:883
+#: lib/action.php:886
 msgid "FAQ"
 msgstr "Preguntes més freqüents"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:888
+#: lib/action.php:891
 msgid "TOS"
 msgstr "Termes del servei"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:892
+#: lib/action.php:895
 msgid "Privacy"
 msgstr "Privadesa"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:895
+#: lib/action.php:898
 msgid "Source"
 msgstr "Font"
 
 #. TRANS: Secondary navigation menu option leading to e-mail contact information on the
 #. TRANS: StatusNet site, where to report bugs, ...
-#: lib/action.php:902
+#: lib/action.php:905
 msgid "Contact"
 msgstr "Contacte"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:905
+#: lib/action.php:908
 msgid "Badge"
 msgstr "Insígnia"
 
 #. TRANS: DT element for StatusNet software license.
-#: lib/action.php:934
+#: lib/action.php:937
 msgid "StatusNet software license"
 msgstr "Llicència del programari StatusNet"
 
@@ -7434,7 +7313,7 @@ msgstr "Llicència del programari StatusNet"
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:941
+#: lib/action.php:944
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7444,7 +7323,7 @@ msgstr ""
 "site.broughtbyurl%%)."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:944
+#: lib/action.php:947
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** és un servei de microblogging."
@@ -7453,7 +7332,7 @@ msgstr "**%%site.name%%** és un servei de microblogging."
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:951
+#: lib/action.php:954
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7465,27 +7344,27 @@ msgstr ""
 "org/licensing/licenses/agpl-3.0.html)."
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:967
+#: lib/action.php:970
 msgid "Site content license"
 msgstr "Llicència de contingut del lloc"
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:974
+#: lib/action.php:977
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr "El contingut i les dades de %1$s són privades i confidencials."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:981
+#: lib/action.php:984
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
 "El contingut i les dades són copyright de %1$s. Tots els drets reservats."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:985
+#: lib/action.php:988
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 "El contingut i les dades són copyright dels col·laboradors. Tots els drets "
@@ -7493,7 +7372,7 @@ msgstr ""
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:1017
+#: lib/action.php:1020
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
@@ -7501,19 +7380,19 @@ msgstr ""
 "llicència %2$s."
 
 #. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1353
+#: lib/action.php:1356
 msgid "Pagination"
 msgstr "Paginació"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1364
+#: lib/action.php:1367
 msgid "After"
 msgstr "Posteriors"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1374
+#: lib/action.php:1377
 msgid "Before"
 msgstr "Anteriors"
 
@@ -7714,23 +7593,19 @@ msgstr ""
 msgid "No application for that consumer key."
 msgstr "No hi ha cap aplicació per a aquest clau de consumidor."
 
-#: lib/apiauth.php:202 lib/apiauth.php:284
-msgid "Not allowed to use API."
-msgstr ""
-
 #. TRANS: OAuth exception given when an incorrect access token was given for a user.
-#: lib/apiauth.php:225
+#: lib/apiauth.php:219
 msgid "Bad access token."
 msgstr "Testimoni d'accés incorrecte."
 
 #. TRANS: OAuth exception given when no user was found for a given token (no token was found).
-#: lib/apiauth.php:230
+#: lib/apiauth.php:224
 msgid "No user for that token."
 msgstr "No hi ha cap usuari per aquest testimoni."
 
 #. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel".
 #. TRANS: Client error thrown when authentication fails.
-#: lib/apiauth.php:272 lib/apiauth.php:302
+#: lib/apiauth.php:266 lib/apiauth.php:293
 msgid "Could not authenticate you."
 msgstr "No se us ha pogut autenticar."
 
@@ -7933,11 +7808,6 @@ msgstr "No es permet el canvi de contrasenya."
 msgid "Block"
 msgstr "Bloca"
 
-#. TRANS: Description of the form to block a user.
-#: lib/blockform.php:79
-msgid "Block this user"
-msgstr "Bloca aquest usuari"
-
 #. TRANS: Title for command results.
 #: lib/channel.php:160 lib/channel.php:181
 msgid "Command results"
@@ -7965,7 +7835,7 @@ msgstr "No existeix cap avís amb aquest identificador."
 
 #. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
 #. TRANS: Error text shown when a last user notice is requested and it does not exist.
-#: lib/command.php:99 lib/command.php:630
+#: lib/command.php:99 lib/command.php:642
 msgid "User has no last notice."
 msgstr "L'usuari no té un darrer avís."
 
@@ -8015,35 +7885,41 @@ msgstr ""
 "Subscriptors: %2$s\n"
 "Avisos: %3$s"
 
+#. TRANS: Error message text shown when a favorite could not be set because it has already been favorited.
+#: lib/command.php:298
+#, fuzzy
+msgid "Could not create favorite: already favorited."
+msgstr "No es pot crear el preferit."
+
 #. TRANS: Text shown when a notice has been marked as favourite successfully.
-#: lib/command.php:312
+#: lib/command.php:324
 msgid "Notice marked as fave."
 msgstr "L'avís està marcat com a preferit."
 
 #. TRANS: Message given having added a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:357
+#: lib/command.php:369
 #, php-format
 msgid "%1$s joined group %2$s."
 msgstr "%1$s s'ha unit al grup %2$s."
 
 #. TRANS: Message given having removed a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:405
+#: lib/command.php:417
 #, php-format
 msgid "%1$s left group %2$s."
 msgstr "%1$s ha deixat el grup %2$s."
 
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: lib/command.php:426
+#: lib/command.php:438
 #, php-format
 msgctxt "WHOIS"
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
 
 #. TRANS: Whois output. %s is the full name of the queried user.
-#: lib/command.php:430
+#: lib/command.php:442
 #, php-format
 msgid "Fullname: %s"
 msgstr "Nom complet: %s"
@@ -8051,7 +7927,7 @@ msgstr "Nom complet: %s"
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a location.
-#: lib/command.php:434 lib/mail.php:270
+#: lib/command.php:446 lib/mail.php:270
 #, php-format
 msgid "Location: %s"
 msgstr "Localització: %s"
@@ -8059,20 +7935,20 @@ msgstr "Localització: %s"
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a homepage.
-#: lib/command.php:438 lib/mail.php:274
+#: lib/command.php:450 lib/mail.php:274
 #, php-format
 msgid "Homepage: %s"
 msgstr "Pàgina web: %s"
 
 #. TRANS: Whois output. %s is the bio information of the queried user.
-#: lib/command.php:442
+#: lib/command.php:454
 #, php-format
 msgid "About: %s"
 msgstr "Informació personal: %s"
 
 #. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).
 #. TRANS: %s is a remote profile.
-#: lib/command.php:471
+#: lib/command.php:483
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
@@ -8083,7 +7959,7 @@ msgstr ""
 
 #. TRANS: Message given if content is too long. %1$sd is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:488
+#: lib/command.php:500
 #, php-format
 msgid "Message too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
@@ -8093,25 +7969,25 @@ msgstr[1] ""
 "El missatge és massa llarg - el màxim és %1$d caràcters, i n'heu enviat %2$d."
 
 #. TRANS: Error text shown sending a direct message fails with an unknown reason.
-#: lib/command.php:516
+#: lib/command.php:528
 msgid "Error sending direct message."
 msgstr "S'ha produït un error en enviar el missatge directe."
 
 #. TRANS: Message given having repeated a notice from another user.
 #. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:553
+#: lib/command.php:565
 #, php-format
 msgid "Notice from %s repeated."
 msgstr "S'ha repetit l'avís de %s."
 
 #. TRANS: Error text shown when repeating a notice fails with an unknown reason.
-#: lib/command.php:556
+#: lib/command.php:568
 msgid "Error repeating notice."
 msgstr "S'ha produït un error en repetir l'avís."
 
 #. TRANS: Message given if content of a notice for a reply is too long. %1$d is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:591
+#: lib/command.php:603
 #, php-format
 msgid "Notice too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Notice too long - maximum is %1$d characters, you sent %2$d."
@@ -8122,80 +7998,80 @@ msgstr[1] ""
 
 #. TRANS: Text shown having sent a reply to a notice successfully.
 #. TRANS: %s is the nickname of the user of the notice the reply was sent to.
-#: lib/command.php:604
+#: lib/command.php:616
 #, php-format
 msgid "Reply to %s sent."
 msgstr "S'ha enviat la resposta a %s."
 
 #. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
-#: lib/command.php:607
+#: lib/command.php:619
 msgid "Error saving notice."
 msgstr "S'ha produït un error en desar l'avís."
 
 #. TRANS: Error text shown when no username was provided when issuing a subscribe command.
-#: lib/command.php:654
+#: lib/command.php:666
 msgid "Specify the name of the user to subscribe to."
 msgstr "Especifiqueu el nom de l'usuari al qual voleu subscriure-us."
 
 #. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
-#: lib/command.php:663
+#: lib/command.php:675
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "No es pot subscriure a perfils de OMB amb ordres."
 
 #. TRANS: Text shown after having subscribed to another user successfully.
 #. TRANS: %s is the name of the user the subscription was requested for.
-#: lib/command.php:671
+#: lib/command.php:683
 #, php-format
 msgid "Subscribed to %s."
 msgstr "Subscrit a %s."
 
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.
-#: lib/command.php:692 lib/command.php:803
+#: lib/command.php:704 lib/command.php:815
 msgid "Specify the name of the user to unsubscribe from."
 msgstr "Especifiqueu el nom de l'usuari del qui voleu deixar la subscripció."
 
 #. TRANS: Text shown after having unsubscribed from another user successfully.
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:703
+#: lib/command.php:715
 #, php-format
 msgid "Unsubscribed from %s."
 msgstr "S'ha deixat d'estar subscrit a %s."
 
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
-#: lib/command.php:723 lib/command.php:749
+#: lib/command.php:735 lib/command.php:761
 msgid "Command not yet implemented."
 msgstr "Comanda encara no implementada."
 
 #. TRANS: Text shown when issuing the command "off" successfully.
-#: lib/command.php:727
+#: lib/command.php:739
 msgid "Notification off."
 msgstr "Avisos desactivats."
 
 #. TRANS: Error text shown when the command "off" fails for an unknown reason.
-#: lib/command.php:730
+#: lib/command.php:742
 msgid "Can't turn off notification."
 msgstr "No es poden desactivar els avisos."
 
 #. TRANS: Text shown when issuing the command "on" successfully.
-#: lib/command.php:753
+#: lib/command.php:765
 msgid "Notification on."
 msgstr "Avisos activitats."
 
 #. TRANS: Error text shown when the command "on" fails for an unknown reason.
-#: lib/command.php:756
+#: lib/command.php:768
 msgid "Can't turn on notification."
 msgstr "No es poden activar els avisos."
 
 #. TRANS: Error text shown when issuing the login command while login is disabled.
-#: lib/command.php:770
+#: lib/command.php:782
 msgid "Login command is disabled."
 msgstr "L'ordre d'inici de sessió no està habilitada."
 
 #. TRANS: Text shown after issuing the login command successfully.
 #. TRANS: %s is a logon link..
-#: lib/command.php:783
+#: lib/command.php:795
 #, php-format
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
@@ -8204,20 +8080,20 @@ msgstr ""
 
 #. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:812
+#: lib/command.php:824
 #, php-format
 msgid "Unsubscribed %s."
 msgstr "S'ha cancel·lat la subscripció de %s."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
-#: lib/command.php:830
+#: lib/command.php:842
 msgid "You are not subscribed to anyone."
 msgstr "No esteu subscrit a ningú."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
-#: lib/command.php:835
+#: lib/command.php:847
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Ja estàs subscrit a aquests usuaris:"
@@ -8225,14 +8101,14 @@ msgstr[1] "Ja estàs subscrit a aquests usuaris:"
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user
 #. TRANS: (followers) without having any subscribers.
-#: lib/command.php:857
+#: lib/command.php:869
 msgid "No one is subscribed to you."
 msgstr "Ningú no us ha subscrit."
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
-#: lib/command.php:862
+#: lib/command.php:874
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "No pots subscriure a un altre a tu mateix."
@@ -8240,21 +8116,21 @@ msgstr[1] "No pots subscriure a un altre a tu mateix."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to without having
 #. TRANS: any group subscriptions.
-#: lib/command.php:884
+#: lib/command.php:896
 msgid "You are not a member of any groups."
 msgstr "No sou membre de cap grup."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
-#: lib/command.php:889
+#: lib/command.php:901
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "Sou un membre d'aquest grup:"
 msgstr[1] "Sou un membre d'aquests grups:"
 
 #. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-#: lib/command.php:904
+#: lib/command.php:916
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -8393,11 +8269,6 @@ msgstr "Aplicacions de connexió autoritzades"
 msgid "Database error"
 msgstr "Error de la base de dades"
 
-#. TRANS: Description of form for deleting a user.
-#: lib/deleteuserform.php:75
-msgid "Delete this user"
-msgstr "Elimina l'usuari"
-
 #. TRANS: Label in form on profile design page.
 #. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
 #: lib/designsettings.php:108
@@ -8434,21 +8305,6 @@ msgstr "Canvia els colors"
 msgid "Use defaults"
 msgstr "Utilitza els paràmetres per defecte"
 
-#. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: lib/designsettings.php:259
-msgid "Restore default designs"
-msgstr "Restaura els dissenys per defecte"
-
-#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: lib/designsettings.php:267
-msgid "Reset back to default"
-msgstr "Torna a restaurar al valor per defecte"
-
-#. TRANS: Title for button on profile design page to save settings.
-#: lib/designsettings.php:272
-msgid "Save design"
-msgstr "Desa el disseny"
-
 #. TRANS: Error message displayed if design settings could not be saved.
 #. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
 #: lib/designsettings.php:405 lib/designsettings.php:427
@@ -9330,10 +9186,6 @@ msgstr "Respon a aquest avís"
 msgid "Reply"
 msgstr "Respon"
 
-#: lib/noticelist.php:673
-msgid "Delete this notice"
-msgstr "Elimina aquest avís"
-
 #: lib/noticelist.php:691
 msgid "Notice repeated"
 msgstr "Avís repetit"
@@ -9609,10 +9461,6 @@ msgstr "Convida"
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Convida amics i companys perquè participin a %s"
 
-#: lib/subscribeform.php:115 lib/subscribeform.php:139
-msgid "Subscribe to this user"
-msgstr "Subscriu-me a aquest usuari"
-
 #: lib/subscriberspeopleselftagcloudsection.php:48
 #: lib/subscriptionspeopleselftagcloudsection.php:48
 msgid "People Tagcloud as self-tagged"
@@ -9784,23 +9632,18 @@ msgctxt "role"
 msgid "Moderator"
 msgstr "Moderador"
 
-#: lib/util.php:305
-#, fuzzy
-msgid "Not allowed to log in."
-msgstr "No heu iniciat una sessió."
-
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1309
+#: lib/util.php:1306
 msgid "a few seconds ago"
 msgstr "fa pocs segons"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1312
+#: lib/util.php:1309
 msgid "about a minute ago"
 msgstr "fa un minut"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1316
+#: lib/util.php:1313
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
@@ -9808,12 +9651,12 @@ msgstr[0] "aproximadament fa un minut"
 msgstr[1] "aproximadament fa %d minuts"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1319
+#: lib/util.php:1316
 msgid "about an hour ago"
 msgstr "fa una hora"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1323
+#: lib/util.php:1320
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
@@ -9821,12 +9664,12 @@ msgstr[0] "aproximadament fa una hora"
 msgstr[1] "aproximadament fa %d hores"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1326
+#: lib/util.php:1323
 msgid "about a day ago"
 msgstr "fa un dia"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1330
+#: lib/util.php:1327
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
@@ -9834,12 +9677,12 @@ msgstr[0] "aproximadament fa un dia"
 msgstr[1] "aproximadament fa %d dies"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1333
+#: lib/util.php:1330
 msgid "about a month ago"
 msgstr "fa un mes"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1337
+#: lib/util.php:1334
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
@@ -9847,7 +9690,7 @@ msgstr[0] "aproximadament fa un mes"
 msgstr[1] "aproximadament fa %d mesos"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1340
+#: lib/util.php:1337
 msgid "about a year ago"
 msgstr "fa un any"
 
@@ -9890,3 +9733,65 @@ msgstr "L'XML no és vàlid, hi manca l'arrel XRD."
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr "Es recupera la còpia de seguretat del fitxer '%s'."
+
+#~ msgid "Block this user."
+#~ msgstr "Bloca l'usuari."
+
+#~ msgid "Delete this notice."
+#~ msgstr "Elimina l'avís."
+
+#~ msgid "Delete this user."
+#~ msgstr "Elimina l'usuari."
+
+#~ msgid "Restore default designs."
+#~ msgstr "Restaura els dissenys per defecte."
+
+#~ msgid "Reset back to default."
+#~ msgstr "Torna a restaurar els paràmetres per defecte."
+
+#~ msgid "Save design."
+#~ msgstr "Desa el disseny."
+
+#~ msgid "Disfavor favorite."
+#~ msgstr "Fes que deixi de ser preferit."
+
+#~ msgid "\"%s\" not found."
+#~ msgstr "No s'ha trobat «%s»."
+
+#~ msgid "Notice %s not found."
+#~ msgstr "No s'ha trobat l'avís «%s»."
+
+#~ msgid "Attachment %s not found."
+#~ msgstr "No s'ha trobat l'adjunció %s."
+
+#~ msgid "\"%s\" not supported for oembed requests."
+#~ msgstr "No es permet «%s» per a sol·licituds oembed."
+
+#~ msgid "Invalid tag: \"%s\"."
+#~ msgstr "Etiqueta no vàlida: «%s»."
+
+#~ msgid "%s updates from everyone."
+#~ msgstr "%s actualitzacions de tothom."
+
+#~ msgid "Password saved"
+#~ msgstr "Contrasenya desada"
+
+#~ msgid "Where you are, like \"City, State (or Region), Country\"."
+#~ msgstr "On us trobeu, per exemple «ciutat, comarca (o illa), país»."
+
+#~ msgid "Subscribe to this user."
+#~ msgstr "Subscriu-me a aquest usuari"
+
+#, fuzzy
+#~ msgid ""
+#~ "Listenee stream license \"%1$s\" is not compatible with site license \"%2"
+#~ "$s\"."
+#~ msgstr ""
+#~ "La llicència del flux de qui escolteu, «%1$s», no és compatible amb la "
+#~ "llicència del lloc, «%2$s»."
+
+#~ msgid "Not allowed to use API."
+#~ msgstr "No es permet l'ús de l'API."
+
+#~ msgid "Not allowed to log in."
+#~ msgstr "No es permet iniciar una sessió."
diff --git a/locale/cs/LC_MESSAGES/statusnet.po b/locale/cs/LC_MESSAGES/statusnet.po
index 7e092133c9..9d02365b1e 100644
--- a/locale/cs/LC_MESSAGES/statusnet.po
+++ b/locale/cs/LC_MESSAGES/statusnet.po
@@ -11,18 +11,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-24 10:32+0000\n"
-"PO-Revision-Date: 2011-02-24 10:36:19+0000\n"
+"POT-Creation-Date: 2011-03-03 15:58+0000\n"
+"PO-Revision-Date: 2011-03-03 16:00:18+0000\n"
 "Language-Team: Czech <http://translatewiki.net/wiki/Portal:cs>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r82712); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: cs\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=3; plural=(n == 1) ? 0 : ( (n >= 2 && n <= 4) ? 1 : "
 "2 );\n"
-"X-POT-Import-Date: 2011-02-17 11:39:54+0000\n"
+"X-POT-Import-Date: 2011-02-25 23:49:23+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -134,11 +134,7 @@ msgstr "Tady žádná taková stránka není."
 #. 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 use "one time password login" without using an existing user.
-#. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
-#. TRANS: Client error displayed trying to find a user by ID for a non-existing ID.
-#. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when calling a profile action without specifying a user.
 #: actions/all.php:80 actions/allrss.php:69
@@ -156,12 +152,12 @@ msgstr "Tady žádná taková stránka není."
 #: actions/apitimelinementions.php:77 actions/apitimelineuser.php:79
 #: actions/avatarbynickname.php:79 actions/favoritesrss.php:72
 #: actions/foaf.php:42 actions/foaf.php:61 actions/hcard.php:67
-#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:78
+#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
 #: actions/remotesubscribe.php:144 actions/remotesubscribe.php:153
-#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:113
-#: actions/showfavorites.php:106 actions/userbyid.php:75
+#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
+#: actions/showfavorites.php:106 actions/userbyid.php:74
 #: actions/usergroups.php:93 actions/userrss.php:40 actions/userxrd.php:59
-#: actions/xrds.php:71 lib/command.php:497 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:509 lib/galleryaction.php:59
 #: lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Uživatel neexistuje."
@@ -291,7 +287,7 @@ msgstr "Novinky od uživatele %1$s a přátel na %2$s!"
 #: actions/apigrouplistall.php:120 actions/apigroupmembership.php:105
 #: actions/apigroupshow.php:114 actions/apihelptest.php:84
 #: actions/apistatusesdestroy.php:101 actions/apistatusesretweets.php:110
-#: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:138
+#: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:139
 #: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
 #: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:268
 #: actions/apitimelinegroup.php:147 actions/apitimelinehome.php:173
@@ -526,7 +522,7 @@ msgstr "Příjemce nebyl nalezen."
 #. TRANS: Client error displayed trying to direct message another user who's not a friend (403).
 #: actions/apidirectmessagenew.php:144
 #, fuzzy
-msgid "Cannot send direct messages to users who aren't your friend."
+msgid "Can't send direct messages to users who aren't your friend."
 msgstr "Nelze odesílat zprávy uživatelům, kteří nejsou vašimi přáteli."
 
 #. TRANS: Client error displayed trying to direct message self (403).
@@ -552,7 +548,7 @@ msgstr "Tuto hlášku již máte v oblíbených."
 #. TRANS: Client error displayed when marking a notice as favourite fails.
 #. TRANS: Server error displayed when trying to mark a notice as favorite fails in the database.
 #. TRANS: Error message text shown when a favorite could not be set.
-#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:294
+#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:306
 msgid "Could not create favorite."
 msgstr "Nelze vytvořit oblíbenou položku."
 
@@ -611,7 +607,7 @@ msgstr "Nepodařilo se najít cílového uživatele."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:191
 #: actions/newgroup.php:137 actions/profilesettings.php:273
-#: actions/register.php:206
+#: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "Přezdívku již někdo používá. Zkuste jinou."
 
@@ -621,7 +617,7 @@ msgstr "Přezdívku již někdo používá. Zkuste jinou."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:195
 #: actions/newgroup.php:141 actions/profilesettings.php:243
-#: actions/register.php:208
+#: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "Není platnou přezdívkou."
 
@@ -634,7 +630,7 @@ msgstr "Není platnou přezdívkou."
 #: actions/apigroupcreate.php:181 actions/editapplication.php:235
 #: actions/editgroup.php:202 actions/newapplication.php:221
 #: actions/newgroup.php:148 actions/profilesettings.php:248
-#: actions/register.php:215
+#: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "Domovská stránka není platná URL."
 
@@ -644,7 +640,7 @@ msgstr "Domovská stránka není platná URL."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:191 actions/editgroup.php:206
 #: actions/newgroup.php:152 actions/profilesettings.php:252
-#: actions/register.php:218
+#: actions/register.php:226
 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "Celé jméno je moc dlouhé (maximální délka je 255 znaků)."
@@ -674,7 +670,7 @@ msgstr[2] "Popis je příliš dlouhý (maximálně %d znaků)."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:215 actions/editgroup.php:218
 #: actions/newgroup.php:164 actions/profilesettings.php:265
-#: actions/register.php:227
+#: actions/register.php:235
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
 msgstr "Umístění je příliš dlouhé (maximálně 255 znaků)."
@@ -732,14 +728,14 @@ msgstr "Skupina nebyla nalezena."
 #. TRANS: Server error displayed when trying to join a group the user is already a member of.
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:333
+#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:345
 msgid "You are already a member of that group."
 msgstr "Jste již členem této skupiny."
 
 #. TRANS: Server error displayed when trying to join a group the user is blocked from joining.
 #. 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.
-#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:338
+#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:350
 msgid "You have been blocked from that group by the admin."
 msgstr "Z této skupiny jste byl zablokován adminem."
 
@@ -749,7 +745,7 @@ msgstr "Z této skupiny jste byl zablokován adminem."
 #. TRANS: %1$s is the joining user's nickname, $2$s is the group nickname for which the join failed.
 #. TRANS: Message given having failed to add a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:350
+#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:362
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "Nemohu připojit uživatele %1$s do skupiny %2$s."
@@ -766,7 +762,7 @@ msgstr "Nejste členem této skupiny."
 #. TRANS: Message given having failed to remove a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
 #: actions/apigroupleave.php:127 actions/leavegroup.php:133
-#: lib/command.php:398
+#: lib/command.php:410
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
 msgstr "Nelze odebrat uživatele %1$S ze skupiny %2$s."
@@ -829,21 +825,20 @@ msgstr "Nejste autorizován."
 #. TRANS: Form validation error message.
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
-#. TRANS: Client error displayed when the session token is not okay.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
 #: actions/deletenotice.php:177 actions/disfavor.php:75
 #: actions/emailsettings.php:291 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:65 actions/grouplogo.php:321
 #: actions/groupunblock.php:65 actions/imsettings.php:224
-#: actions/invite.php:60 actions/login.php:131 actions/makeadmin.php:66
+#: actions/invite.php:60 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
-#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:136
-#: actions/othersettings.php:155 actions/passwordsettings.php:137
+#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
+#: actions/othersettings.php:155 actions/passwordsettings.php:138
 #: actions/profilesettings.php:217 actions/recoverpassword.php:383
-#: actions/register.php:164 actions/remotesubscribe.php:76
+#: actions/register.php:172 actions/remotesubscribe.php:76
 #: actions/repeat.php:82 actions/smssettings.php:250 actions/subedit.php:40
-#: actions/subscribe.php:87 actions/tagother.php:166
-#: actions/unsubscribe.php:69 actions/userauthorization.php:53
+#: actions/subscribe.php:86 actions/tagother.php:166
+#: actions/unsubscribe.php:69 actions/userauthorization.php:52
 #: lib/designsettings.php:310
 msgid "There was a problem with your session token. Try again, please."
 msgstr "Nastal problém s vaším session tokenem. Zkuste to znovu, prosím."
@@ -875,7 +870,7 @@ msgstr "Chyba databáze při vkládání uživatele aplikace OAuth."
 #: actions/designadminpanel.php:100 actions/editapplication.php:144
 #: actions/emailsettings.php:310 actions/grouplogo.php:332
 #: actions/imsettings.php:239 actions/newapplication.php:124
-#: actions/oauthconnectionssettings.php:145 actions/recoverpassword.php:46
+#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
 #: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
 msgstr "Nečekaný požadavek."
@@ -927,20 +922,19 @@ msgstr "Účet"
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group nickname (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT for nick name in a profile.
-#: actions/apioauthauthorize.php:459 actions/login.php:242
-#: actions/profilesettings.php:106 actions/register.php:418
+#: actions/apioauthauthorize.php:459 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:432
 #: actions/showgroup.php:243 actions/tagother.php:94
-#: actions/userauthorization.php:152 lib/groupeditform.php:145
+#: actions/userauthorization.php:145 lib/groupeditform.php:145
 #: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "Přezdívka"
 
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:463 actions/login.php:245
-#: actions/register.php:422 lib/accountsettingsaction.php:120
+#: actions/apioauthauthorize.php:463 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:120
 msgid "Password"
 msgstr "Heslo"
 
@@ -1035,13 +1029,13 @@ msgstr "Žádné takové oznámení."
 
 #. TRANS: Client error displayed trying to repeat an own notice through the API.
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:537
+#: actions/apistatusesretweet.php:83 lib/command.php:549
 msgid "Cannot repeat your own notice."
 msgstr "Nelze opakovat své vlastní oznámení."
 
 #. TRANS: Client error displayed trying to re-repeat a notice through the API.
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:92 lib/command.php:543
+#: actions/apistatusesretweet.php:92 lib/command.php:555
 msgid "Already repeated that notice."
 msgstr "Již jste zopakoval toto oznámení."
 
@@ -1064,7 +1058,7 @@ msgstr " API metoda nebyla nalezena."
 #. TRANS: %s is the requested output format.
 #: actions/apistatusesshow.php:144
 #, fuzzy, php-format
-msgid "Unsupported format: %s."
+msgid "Unsupported format: %s"
 msgstr "Nepodporovaný formát."
 
 #. TRANS: Client error displayed requesting a deleted status.
@@ -1171,14 +1165,13 @@ msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr "updaty na %1$s odpovídající na updaty od %2$s / %3$s."
 
 #. TRANS: Title for site timeline. %s is the StatusNet sitename.
-#. TRANS: Public RSS feed title. %s is the StatusNet site name.
 #: actions/apitimelinepublic.php:193 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "Veřejná časová osa %s"
 
 #. TRANS: Subtitle for site timeline. %s is the StatusNet sitename.
-#: actions/apitimelinepublic.php:199
+#: actions/apitimelinepublic.php:199 actions/publicrss.php:105
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "Všechny updaty na %s!"
@@ -1245,26 +1238,25 @@ msgid "Atom post must be an Atom entry."
 msgstr ""
 
 #. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
-#: actions/apitimelineuser.php:334
+#: actions/apitimelineuser.php:335
 msgid "Can only handle POST activities."
 msgstr ""
 
 #. TRANS: Client error displayed when using an unsupported activity object type.
 #. TRANS: %s is the unsupported activity object type.
-#: actions/apitimelineuser.php:345
+#: actions/apitimelineuser.php:346
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
 #. TRANS: %d is the notice ID (number).
-#: actions/apitimelineuser.php:379
+#: actions/apitimelineuser.php:380
 #, fuzzy, php-format
 msgid "No content for notice %d."
 msgstr "Najít v obsahu oznámení"
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#. TRANS: %s is the notice URI.
 #: actions/apitimelineuser.php:408
 #, fuzzy, php-format
 msgid "Notice with URI \"%s\" already exists."
@@ -1283,10 +1275,9 @@ msgstr " API metoda nebyla nalezena."
 
 #. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
 #. TRANS: Client exception.
-#. TRANS: Client error displayed trying to subscribe to a non-existing profile.
 #: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
 #: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
-#: actions/subscribe.php:110
+#: actions/subscribe.php:107
 msgid "No such profile."
 msgstr "Žádný takový profil."
 
@@ -1422,7 +1413,7 @@ msgstr "Nelze smazat oblíbenou položku."
 #: actions/joingroup.php:95 actions/leavegroup.php:82
 #: actions/leavegroup.php:95 actions/makeadmin.php:86
 #: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:380
+#: lib/command.php:392
 msgid "No such group."
 msgstr "Žádný takový uživatel."
 
@@ -1433,7 +1424,7 @@ msgid "Not a member."
 msgstr "Všichni členové"
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
-#: actions/atompubshowmembership.php:150
+#: actions/atompubshowmembership.php:151
 #, fuzzy
 msgid "Cannot delete someone else's membership."
 msgstr "Nelze smazat odebírání sebe sama"
@@ -1538,11 +1529,9 @@ msgstr "Můžete nahrát váš osobní avatar. Maximální velikost souboru je %
 
 #. TRANS: Server error displayed in avatar upload page when no matching profile can be found for a user.
 #. TRANS: Server error displayed coming across a request from a user without a profile.
-#. TRANS: Server error displayed when trying to authorise a remote subscription request
-#. TRANS: while the user has no profile.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
 #: actions/grouplogo.php:184 actions/remotesubscribe.php:190
-#: actions/userauthorization.php:75 actions/userrss.php:108
+#: actions/userauthorization.php:72 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr "Uživatel bez odpovídajícího profilu."
 
@@ -1600,10 +1589,10 @@ msgstr "Oříznout"
 msgid "No file uploaded."
 msgstr "žádný soubor nebyl nahrán."
 
-#. TRANS: Avatar upload form instruction after uploading a file.
+#. TRANS: Avatar upload form unstruction after uploading a file.
 #: actions/avatarsettings.php:345
 #, fuzzy
-msgid "Pick a square area of the image to be your avatar."
+msgid "Pick a square area of the image to be your avatar"
 msgstr "Vyberte čtvercovou plochu obrázku, která bude váš avatar"
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
@@ -1645,7 +1634,7 @@ msgid "You may not backup your account."
 msgstr ""
 
 #. TRANS: Information displayed on the backup account page.
-#: actions/backupaccount.php:225
+#: actions/backupaccount.php:227
 msgid ""
 "You can backup your account data in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format. This is an experimental feature and provides "
@@ -1655,15 +1644,15 @@ msgid ""
 msgstr ""
 
 #. TRANS: Submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:248
+#: actions/backupaccount.php:250
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Backup"
 msgstr "Pozadí"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:252
-msgid "Backup your account."
+#: actions/backupaccount.php:254
+msgid "Backup your account"
 msgstr ""
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
@@ -1705,7 +1694,7 @@ msgstr "Poznámka"
 #. TRANS: Submit button title for 'No' when blocking a user.
 #: actions/block.php:158
 #, fuzzy
-msgid "Do not block this user."
+msgid "Do not block this user"
 msgstr "Zablokovat tohoto uživatele"
 
 #. TRANS: Button label on the user block form.
@@ -1722,9 +1711,9 @@ msgid "Yes"
 msgstr "Ano"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:165
-#, fuzzy
-msgid "Block this user."
+#. TRANS: Description of the form to block a user.
+#: actions/block.php:165 lib/blockform.php:79
+msgid "Block this user"
 msgstr "Zablokovat tohoto uživatele"
 
 #. TRANS: Server error displayed when blocking a user fails.
@@ -1889,7 +1878,7 @@ msgstr ""
 #. TRANS: Field label for delete account confirmation entry.
 #. TRANS: Field label for password reset form where the password has to be typed again.
 #: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:262 actions/register.php:426
+#: actions/recoverpassword.php:262 actions/register.php:440
 msgid "Confirm"
 msgstr "Potvrdit"
 
@@ -1919,14 +1908,14 @@ msgstr "Aplikace nebyla nalezena."
 #. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
 #: actions/deleteapplication.php:79 actions/editapplication.php:78
-#: actions/showapplication.php:90
+#: actions/showapplication.php:94
 msgid "You are not the owner of this application."
 msgstr "Nejste vlastníkem této aplikace."
 
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
-#: actions/newapplication.php:112 actions/showapplication.php:113
-#: lib/action.php:1422
+#: actions/newapplication.php:112 actions/showapplication.php:118
+#: lib/action.php:1425
 msgid "There was a problem with your session token."
 msgstr "Nastal problém s vaším session tokenem."
 
@@ -1949,13 +1938,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting an application.
 #: actions/deleteapplication.php:161
 #, fuzzy
-msgid "Do not delete this application."
+msgid "Do not delete this application"
 msgstr "Neodstraňujte tuto aplikaci"
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
 #: actions/deleteapplication.php:167
 #, fuzzy
-msgid "Delete this application."
+msgid "Delete this application"
 msgstr "Odstranit tuto aplikaci"
 
 #. TRANS: Client error when trying to delete group while not logged in.
@@ -2013,13 +2002,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting a group.
 #: actions/deletegroup.php:224
 #, fuzzy
-msgid "Do not delete this group."
+msgid "Do not delete this group"
 msgstr "Neodstraňujte toto oznámení"
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
 #: actions/deletegroup.php:231
 #, fuzzy
-msgid "Delete this group."
+msgid "Delete this group"
 msgstr "Odstranit tohoto uživatele"
 
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
@@ -2027,15 +2016,13 @@ msgstr "Odstranit tohoto uživatele"
 #. TRANS: Client error displayed when trying to mark a notice as favorite without being logged in.
 #. TRANS: Client error displayed trying to block a user from a group while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
-#. TRANS: Client error displayed trying to log out when not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
-#. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
 #. TRANS: Client error displayed when trying to change user options while not logged in.
 #: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
-#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:70
+#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
-#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:98
+#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
 #: lib/adminpanelaction.php:71 lib/profileformaction.php:63
 #: lib/settingsaction.php:72
@@ -2065,13 +2052,12 @@ msgstr "Jste si jisti, že chcete smazat tohoto oznámení?"
 #. TRANS: Submit button title for 'No' when deleting a notice.
 #: actions/deletenotice.php:159
 #, fuzzy
-msgid "Do not delete this notice."
+msgid "Do not delete this notice"
 msgstr "Neodstraňujte toto oznámení"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:166
-#, fuzzy
-msgid "Delete this notice."
+#: actions/deletenotice.php:166 lib/noticelist.php:673
+msgid "Delete this notice"
 msgstr "Odstranit toto oznámení"
 
 #. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
@@ -2108,13 +2094,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting a user.
 #: actions/deleteuser.php:158
 #, fuzzy
-msgid "Do not delete this user."
+msgid "Do not delete this user"
 msgstr "Neodstraňujte toto oznámení"
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
-#: actions/deleteuser.php:165
-#, fuzzy
-msgid "Delete this user."
+#. TRANS: Description of form for deleting a user.
+#: actions/deleteuser.php:165 lib/deleteuserform.php:75
+msgid "Delete this user"
 msgstr "Odstranit tohoto uživatele"
 
 #. TRANS: Message used as title for design settings for the site.
@@ -2281,21 +2267,21 @@ msgid "Use defaults"
 msgstr "Použít výchozí"
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:720
-#, fuzzy
-msgid "Restore default designs."
+#. TRANS: Title for button on profile design page to reset all colour settings to default.
+#: actions/designadminpanel.php:720 lib/designsettings.php:259
+msgid "Restore default designs"
 msgstr "Obnovit výchozí vzhledy"
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:728
-#, fuzzy
-msgid "Reset back to default."
+#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
+#: actions/designadminpanel.php:728 lib/designsettings.php:267
+msgid "Reset back to default"
 msgstr "Reset zpět do výchozího"
 
 #. TRANS: Title for button for saving theme settings.
-#: actions/designadminpanel.php:736
-#, fuzzy
-msgid "Save design."
+#. TRANS: Title for button on profile design page to save settings.
+#: actions/designadminpanel.php:736 lib/designsettings.php:272
+msgid "Save design"
 msgstr "Uložit vzhled"
 
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
@@ -2327,7 +2313,7 @@ msgid "You must be logged in to edit an application."
 msgstr "Pro úpravy aplikace musíte být přihlášen."
 
 #. TRANS: Client error displayed trying to edit an application that does not exist.
-#: actions/editapplication.php:83 actions/showapplication.php:83
+#: actions/editapplication.php:83 actions/showapplication.php:87
 msgid "No such application."
 msgstr "Aplikace neexistuje."
 
@@ -2608,7 +2594,7 @@ msgid "Cannot normalize that email address."
 msgstr "Nepodařilo se normalizovat (kanonizovat) e-mailovou adresu."
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:393 actions/register.php:204
+#: actions/emailsettings.php:393 actions/register.php:212
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "Není platnou mailovou adresou."
@@ -2685,22 +2671,19 @@ msgstr "Nemáte příchozí e-mailovou adresu."
 
 #. 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.
 #: actions/emailsettings.php:530 actions/emailsettings.php:554
-#: actions/smssettings.php:566 actions/smssettings.php:591
+#: actions/smssettings.php:565 actions/smssettings.php:588
 #, fuzzy
 msgid "Could not update user record."
 msgstr "Nelze aktualizovat záznam uživatele."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
-#. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:534 actions/smssettings.php:570
+#: actions/emailsettings.php:534 actions/smssettings.php:568
 msgid "Incoming email address removed."
 msgstr "Příchozí e-mailová adresa odstraněna."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
-#. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:558 actions/smssettings.php:595
+#: actions/emailsettings.php:558 actions/smssettings.php:591
 msgid "New incoming email address added."
 msgstr "Přidána nová příchozí e-mailová adresa."
 
@@ -2712,7 +2695,7 @@ msgstr "Tuto hlášku již máte v oblíbených."
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
 #: actions/favor.php:95
 #, fuzzy
-msgid "Disfavor favorite."
+msgid "Disfavor favorite"
 msgstr "Znemilostnit oblíbenou"
 
 #. TRANS: Page title for first page of favorited notices.
@@ -2953,13 +2936,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
 #: actions/groupblock.php:191
 #, fuzzy
-msgid "Do not block this user from this group."
+msgid "Do not block this user from this group"
 msgstr "Neblokujte tohoto uživatele z této skupiny"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
 #: actions/groupblock.php:198
 #, fuzzy
-msgid "Block this user from this group."
+msgid "Block this user from this group"
 msgstr "Blokovat tohoto uživatele z této skupiny"
 
 #. TRANS: Server error displayed when trying to block a user from a group fails because of an application error.
@@ -2968,7 +2951,6 @@ msgid "Database error blocking user from group."
 msgstr "Chyba databáze při blokování uživatele ze skupiny."
 
 #. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
-#. TRANS: Client error displayed trying to find a user by ID without providing an ID.
 #: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr "Chybí ID."
@@ -3157,10 +3139,8 @@ msgid "Group search"
 msgstr "Hledání skupin"
 
 #. TRANS: Text on page where groups can be searched if no results were found for a query.
-#. TRANS: Text for notice search results is the query had no results.
-#. TRANS: Message on the "People search" page where a query has no results.
-#: actions/groupsearch.php:82 actions/noticesearch.php:122
-#: actions/peoplesearch.php:87
+#: actions/groupsearch.php:82 actions/noticesearch.php:117
+#: actions/peoplesearch.php:83
 msgid "No results."
 msgstr "Žádné výsledky."
 
@@ -3197,7 +3177,6 @@ msgid "User is not blocked from group."
 msgstr "Uživatel není blokován ze skupiny."
 
 #. TRANS: Server error displayed when unblocking a user from a group fails because of an unknown error.
-#. TRANS: Server error displayed when removing a user block.
 #: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "Chyba při odstraňování bloku."
@@ -3293,8 +3272,7 @@ msgid "Publish a MicroID for my Jabber/Google Talk address."
 msgstr "Publikovat MicroID pro mou Jabber / GTalk adresu."
 
 #. TRANS: Confirmation message for successful Instant Messaging preferences save.
-#. TRANS: Confirmation message after saving preferences.
-#: actions/imsettings.php:283 actions/othersettings.php:193
+#: actions/imsettings.php:283 actions/othersettings.php:192
 msgid "Preferences saved."
 msgstr "Nastavení uloženo"
 
@@ -3588,7 +3566,7 @@ msgstr "Musíte být přihlášen abyste mohl opustit skupinu."
 
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
-#: actions/leavegroup.php:103 lib/command.php:386
+#: actions/leavegroup.php:103 lib/command.php:398
 msgid "You are not a member of that group."
 msgstr "Nejste členem této skupiny."
 
@@ -3712,42 +3690,40 @@ msgstr "Uložit"
 msgid "Save license settings"
 msgstr ""
 
-#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
-#: actions/login.php:97 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
 msgid "Already logged in."
 msgstr "Již přihlášen"
 
-#: actions/login.php:142
+#: actions/login.php:148
 msgid "Incorrect username or password."
 msgstr "Neplatné jméno nebo heslo"
 
-#. TRANS: Server error displayed when a user object could not be created trying to login using "one time password login".
-#: actions/login.php:148 actions/otp.php:127
+#: actions/login.php:154 actions/otp.php:120
 msgid "Error setting user. You are probably not authorized."
 msgstr "Chyba při nastavení uživatele. Pravděpodobně nejste autorizován."
 
-#: actions/login.php:202 actions/login.php:253
+#: actions/login.php:210 actions/login.php:263
 msgid "Login"
 msgstr "Přihlásit"
 
-#: actions/login.php:239
+#: actions/login.php:249
 msgid "Login to site"
 msgstr "Přihlásit se na stránky"
 
-#: actions/login.php:248 actions/register.php:476
+#: actions/login.php:258 actions/register.php:490
 msgid "Remember me"
 msgstr "Zapamatuj si mě"
 
-#: actions/login.php:249 actions/register.php:478
+#: actions/login.php:259 actions/register.php:492
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 "Příště automaticky přihlásit; ne pro počítače, které používá více lidí! "
 
-#: actions/login.php:259
+#: actions/login.php:269
 msgid "Lost or forgotten password?"
 msgstr "Ztracené nebo zapomenuté heslo?"
 
-#: actions/login.php:277
+#: actions/login.php:288
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -3755,11 +3731,11 @@ msgstr ""
 "Z bezpečnostních důvodů, prosím zadejte znovu své jméno a heslo než budete "
 "měnit svá nastavení."
 
-#: actions/login.php:281
+#: actions/login.php:292
 msgid "Login with your username and password."
 msgstr "Přihlásit se pomocí svého uživatelského jména a hesla."
 
-#: actions/login.php:284
+#: actions/login.php:295
 #, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -3842,15 +3818,15 @@ msgid "New message"
 msgstr "Nová zpráva"
 
 #. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
-#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:501
+#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:513
 msgid "You can't send a message to this user."
 msgstr ""
 "Nemůžete odesílat zprávy tomuto uživateli. (musíte být vzájemně prihlášení)"
 
 #. TRANS: Command exception text shown when trying to send a direct message to another user without content.
 #. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
-#: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:478
-#: lib/command.php:581
+#: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:490
+#: lib/command.php:593
 msgid "No content!"
 msgstr "Chybí obsah!"
 
@@ -3859,7 +3835,7 @@ msgid "No recipient specified."
 msgstr "Neuveden příjemce."
 
 #. TRANS: Error text shown when trying to send a direct message to self.
-#: actions/newmessage.php:167 lib/command.php:505
+#: actions/newmessage.php:167 lib/command.php:517
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr "Neposílejte si zprávu, potichu si ji pro sebe řekněte."
@@ -3870,7 +3846,7 @@ msgstr "Zpráva odeslána"
 
 #. TRANS: Message given have sent a direct message to another user.
 #. TRANS: %s is the name of the other user.
-#: actions/newmessage.php:188 lib/command.php:513
+#: actions/newmessage.php:188 lib/command.php:525
 #, php-format
 msgid "Direct message to %s sent."
 msgstr "Přímá zpráva pro %s odeslána."
@@ -3887,9 +3863,7 @@ msgstr "Nové sdělení"
 msgid "Notice posted"
 msgstr "Sdělení posláno"
 
-#. TRANS: Instructions for Notice search page.
-#. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/noticesearch.php:69
+#: actions/noticesearch.php:68
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -3898,21 +3872,16 @@ msgstr ""
 "Hledej sdělení na %%site.name%% podle obsahu. Oddělte výrazy mezerami; musí "
 "mít alespoň 3 znaky"
 
-#. TRANS: Title of the page where users can search for notices.
-#: actions/noticesearch.php:80
+#: actions/noticesearch.php:78
 msgid "Text search"
 msgstr "Text vyhledávání"
 
-#. TRANS: Test in RSS notice search.
-#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearch.php:95
+#: actions/noticesearch.php:91
 #, php-format
 msgid "Search results for \"%1$s\" on %2$s"
 msgstr "Výsledky hledání \"%1$s\" na %2$s"
 
-#. TRANS: Text for logged in users making a query for notices without results.
-#. TRANS: This message contains a Markdown link.
-#: actions/noticesearch.php:128
+#: actions/noticesearch.php:121
 #, php-format
 msgid ""
 "Be the first to [post on this topic](%%%%action.newnotice%%%%?"
@@ -3921,9 +3890,7 @@ msgstr ""
 "Buďte první kdo [příspěje](%%%%action.newnotice%%%%?status_textarea=%s) na "
 "toto téma!"
 
-#. TRANS: Text for not logged in users making a query for notices without results.
-#. TRANS: This message contains Markdown links.
-#: actions/noticesearch.php:133
+#: actions/noticesearch.php:124
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and be the first to "
@@ -3932,17 +3899,14 @@ msgstr ""
 "Proč si ne [zaregistrovat účet](%%%%action.register%%%%) a být první, kdo "
 "[příspěje](%%%%action.newnotice %%%%?status_textarea =%s) na toto téma!"
 
-#. TRANS: RSS notice search feed title. %s is the query.
-#: actions/noticesearchrss.php:95
+#: actions/noticesearchrss.php:96
 #, php-format
 msgid "Updates with \"%s\""
 msgstr "Hlášky s \"%s\""
 
-#. TRANS: RSS notice search feed description.
-#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearchrss.php:99
+#: actions/noticesearchrss.php:98
 #, fuzzy, php-format
-msgid "Updates matching search term \"%1$s\" on %2$s."
+msgid "Updates matching search term \"%1$s\" on %2$s!"
 msgstr "Aktualizace odpovídající hledanému výrazu \"%1$s\" na %2$s!"
 
 #: actions/nudge.php:85
@@ -3984,30 +3948,30 @@ msgid "You have not registered any applications yet."
 msgstr "Ještě jste nezaregistrovali žádné aplikace."
 
 #. TRANS: Title for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:70
+#: actions/oauthconnectionssettings.php:71
 msgid "Connected applications"
 msgstr "Propojené aplikace"
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:81
+#: actions/oauthconnectionssettings.php:83
 msgid "The following connections exist for your account."
 msgstr ""
 
 #. TRANS: Client error when trying to revoke access for an application while not being a user of it.
-#: actions/oauthconnectionssettings.php:166
+#: actions/oauthconnectionssettings.php:168
 msgid "You are not a user of that application."
 msgstr "Nejste uživatel této aplikace."
 
 #. TRANS: Client error when revoking access has failed for some reason.
 #. TRANS: %s is the application ID revoking access failed for.
-#: actions/oauthconnectionssettings.php:181
+#: actions/oauthconnectionssettings.php:183
 #, fuzzy, php-format
 msgid "Unable to revoke access for application: %s."
 msgstr "Nelze zrušit přístup aplikace %s."
 
 #. TRANS: Success message after revoking access for an application.
 #. TRANS: %1$s is the application name, %2$s is the first part of the user token.
-#: actions/oauthconnectionssettings.php:200
+#: actions/oauthconnectionssettings.php:202
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -4015,30 +3979,20 @@ msgid ""
 msgstr ""
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:211
+#: actions/oauthconnectionssettings.php:213
 msgid "You have not authorized any applications to use your account."
 msgstr "Žádným aplikacím jste nepovolili používat váš účet."
 
 #. TRANS: Note for developers in the OAuth connection settings form.
 #. TRANS: This message contains a Markdown link. Do not separate "](".
 #. TRANS: %s is the URL to the OAuth settings.
-#: actions/oauthconnectionssettings.php:231
+#: actions/oauthconnectionssettings.php:233
 #, php-format
 msgid ""
 "Are you a developer? [Register an OAuth client application](%s) to use with "
 "this instance of StatusNet."
 msgstr ""
 
-#: actions/oembed.php:64
-#, fuzzy, php-format
-msgid "\"%s\" not found."
-msgstr " API metoda nebyla nalezena."
-
-#: actions/oembed.php:76
-#, fuzzy, php-format
-msgid "Notice %s not found."
-msgstr " API metoda nebyla nalezena."
-
 #: actions/oembed.php:80 actions/shownotice.php:100
 msgid "Notice has no profile."
 msgstr "Uživatel nemá profil."
@@ -4048,16 +4002,6 @@ msgstr "Uživatel nemá profil."
 msgid "%1$s's status on %2$s"
 msgstr "status %1 na %2"
 
-#: actions/oembed.php:95
-#, fuzzy, php-format
-msgid "Attachment %s not found."
-msgstr "Příjemce nebyl nalezen."
-
-#: actions/oembed.php:136
-#, php-format
-msgid "\"%s\" not supported for oembed requests."
-msgstr ""
-
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
 #: actions/oembed.php:168
 #, php-format
@@ -4076,12 +4020,11 @@ msgstr "Only %s URLs over plain HTTP please."
 msgid "Not a supported data format."
 msgstr "Nepodporovaný formát dat."
 
-#. TRANS: ShortName in the OpenSearch interface when trying to find users.
 #: actions/opensearch.php:64
 msgid "People Search"
 msgstr "Hledání lidí"
 
-#: actions/opensearch.php:68
+#: actions/opensearch.php:67
 msgid "Notice Search"
 msgstr "Hledání oznámení"
 
@@ -4129,46 +4072,37 @@ msgstr "Zobrazit nebo skrýt vzhledy profilu."
 msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr "adresa služby zkracování URL je příliš dlouhá (max. 50 znaků)."
 
-#. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
-#: actions/otp.php:70
+#: actions/otp.php:69
 msgid "No user ID specified."
 msgstr "Nebylo zadáno uživatelské ID."
 
-#. TRANS: Client error displayed trying to use "one time password login" without specifying a login token.
-#: actions/otp.php:86
+#: actions/otp.php:83
 msgid "No login token specified."
 msgstr "Přihlašovací token nezadán."
 
-#. TRANS: Client error displayed trying to use "one time password login" without requesting a login token.
-#: actions/otp.php:94
+#: actions/otp.php:90
 msgid "No login token requested."
 msgstr "Nepožadován přihlašovací token."
 
-#. TRANS: Client error displayed trying to use "one time password login" while specifying an invalid login token.
-#: actions/otp.php:100
+#: actions/otp.php:95
 msgid "Invalid login token specified."
 msgstr "Neplatný přihlašovací token."
 
-#. TRANS: Client error displayed trying to use "one time password login" while specifying an expired login token.
-#: actions/otp.php:110
+#: actions/otp.php:104
 msgid "Login token expired."
 msgstr "Přihlašovací token vypršel."
 
-#. TRANS: Title for outbox for any but the fist page.
-#. TRANS: %1$s is the user nickname, %2$d is the page number.
-#: actions/outbox.php:57
+#: actions/outbox.php:58
 #, php-format
 msgid "Outbox for %1$s - page %2$d"
 msgstr "Odeslaná pošta uživatele %1$s - strana %2$d"
 
-#. TRANS: Title for first page of outbox.
 #: actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
 msgstr "Odeslané uživatele %s"
 
-#. TRANS: Instructions for outbox.
-#: actions/outbox.php:103
+#: actions/outbox.php:104
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr ""
 "Toto je váš outbox, který obsahuje seznam soukromých zpráv které jste "
@@ -4196,45 +4130,43 @@ msgstr "Staré heslo"
 msgid "New password"
 msgstr "Nové heslo"
 
-#: actions/passwordsettings.php:109 actions/register.php:423
+#: actions/passwordsettings.php:109
 #, fuzzy
-msgid "6 or more characters."
+msgid "6 or more characters"
 msgstr "6 a více znaků"
 
-#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:264
-#: actions/register.php:427
+#: actions/passwordsettings.php:113
 #, fuzzy
-msgid "Same as password above."
+msgid "Same as password above"
 msgstr "Stejné jako heslo výše"
 
 #: actions/passwordsettings.php:117
 msgid "Change"
 msgstr "Změnit"
 
-#: actions/passwordsettings.php:153 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:238
 msgid "Password must be 6 or more characters."
 msgstr "Heslo musí být alespoň 6 znaků dlouhé"
 
-#: actions/passwordsettings.php:156 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:241
 msgid "Passwords don't match."
 msgstr "Hesla nesouhlasí"
 
-#: actions/passwordsettings.php:164
+#: actions/passwordsettings.php:165
 msgid "Incorrect old password"
 msgstr "Nesprávné staré heslo"
 
-#: actions/passwordsettings.php:180
+#: actions/passwordsettings.php:181
 msgid "Error saving user; invalid."
 msgstr "Chyba při ukládaní uživatele; neplatný."
 
-#. TRANS: Reset password form validation error message.
-#: actions/passwordsettings.php:185 actions/recoverpassword.php:418
+#: actions/passwordsettings.php:186
 #, fuzzy
-msgid "Cannot save new password."
+msgid "Can't save new password."
 msgstr "Nelze uložit nové heslo"
 
-#: actions/passwordsettings.php:191
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
 msgid "Password saved."
 msgstr "Heslo uloženo"
 
@@ -4526,9 +4458,7 @@ msgstr "Server kam směrovat SSL žádosti"
 msgid "Save paths"
 msgstr "Uložit cesty"
 
-#. TRANS: Instructions for the "People search" page.
-#. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/peoplesearch.php:54
+#: actions/peoplesearch.php:52
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
@@ -4537,8 +4467,7 @@ msgstr ""
 "Hledej uživatele na %%site.name%% podle jejich jména, místa, nebo zájmů. "
 "Minimální délka musí být alespoň 3 znaky"
 
-#. TRANS: Title of a page where users can search for other users.
-#: actions/peoplesearch.php:61
+#: actions/peoplesearch.php:58
 msgid "People search"
 msgstr "Hledání lidí"
 
@@ -4580,7 +4509,7 @@ msgid "Profile information"
 msgstr "Nastavené Profilu"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109 actions/register.php:419
+#: actions/profilesettings.php:109 actions/register.php:433
 #, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr "1-64 znaků nebo čísel, bez teček, čárek a mezer"
@@ -4588,7 +4517,7 @@ msgstr "1-64 znaků nebo čísel, bez teček, čárek a mezer"
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for full group name (dt). Text hidden by default.
 #. TRANS: DT for full name in a profile.
-#: actions/profilesettings.php:113 actions/register.php:441
+#: actions/profilesettings.php:113 actions/register.php:455
 #: actions/showgroup.php:255 actions/tagother.php:104
 #: lib/groupeditform.php:150 lib/userprofile.php:156
 msgid "Full name"
@@ -4596,13 +4525,13 @@ msgstr "Celé jméno"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:118 actions/register.php:446
+#: actions/profilesettings.php:118 actions/register.php:460
 #: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "Moje stránky"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:121 actions/register.php:448
+#: actions/profilesettings.php:121
 #, fuzzy
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr "Adresa vašich stránek, blogu nebo profilu na jiných stránkách."
@@ -4610,7 +4539,7 @@ msgstr "Adresa vašich stránek, blogu nebo profilu na jiných stránkách."
 #. TRANS: Tooltip for field label in form for profile settings. Plural
 #. TRANS: is decided by the number of characters available for the
 #. TRANS: biography (%d).
-#: actions/profilesettings.php:129 actions/register.php:457
+#: actions/profilesettings.php:129 actions/register.php:471
 #, fuzzy, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4619,29 +4548,28 @@ msgstr[1] "Popište sebe a své zájmy"
 msgstr[2] "Popište sebe a své zájmy"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:135 actions/register.php:462
+#: actions/profilesettings.php:135 actions/register.php:476
 msgid "Describe yourself and your interests"
 msgstr "Popište sebe a své zájmy"
 
 #. TRANS: Text area label in form for profile settings where users can provide.
 #. TRANS: their biography.
-#: actions/profilesettings.php:139 actions/register.php:464
+#: actions/profilesettings.php:139 actions/register.php:478
 msgid "Bio"
 msgstr "O mě"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group location (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT for location in a profile.
-#: actions/profilesettings.php:145 actions/register.php:469
+#: actions/profilesettings.php:145 actions/register.php:483
 #: actions/showgroup.php:265 actions/tagother.php:112
-#: actions/userauthorization.php:174 lib/groupeditform.php:173
+#: actions/userauthorization.php:166 lib/groupeditform.php:173
 #: lib/userprofile.php:172
 msgid "Location"
 msgstr "Umístění"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148
+#: actions/profilesettings.php:148 actions/register.php:485
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Místo. Město, stát."
 
@@ -4662,8 +4590,7 @@ msgstr "Tagy"
 #: actions/profilesettings.php:164
 #, fuzzy
 msgid ""
-"Tags for yourself (letters, numbers, -, ., and _), comma- or space- "
-"separated."
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr "Otagujte se (písmena, čísla, -, . a _), oddělené čárkami nebo mezerami"
 
 #. TRANS: Dropdownlist label in form for profile settings.
@@ -4674,7 +4601,7 @@ msgstr "Jazyk"
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
 #: actions/profilesettings.php:171
 #, fuzzy
-msgid "Preferred language."
+msgid "Preferred language"
 msgstr "Preferovaný jazyk"
 
 #. TRANS: Dropdownlist label in form for profile settings.
@@ -4691,7 +4618,7 @@ msgstr "V jaké časové zóně se obyčejně nacházíte?"
 #: actions/profilesettings.php:189
 #, fuzzy
 msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)."
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr ""
 "Automaticky se přihlásit k odběru toho kdo se přihlásil ke mně (nejlepší pro "
 "ne-lidi)"
@@ -4699,7 +4626,7 @@ msgstr ""
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Plural form is used based on the maximum number of allowed
 #. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:258 actions/register.php:221
+#: actions/profilesettings.php:258 actions/register.php:229
 #, fuzzy, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4720,9 +4647,9 @@ msgstr "Jazyk je příliš dlouhý (max. 50 znaků)."
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:291
-#, fuzzy, php-format
-msgid "Invalid tag: \"%s\"."
+#: actions/profilesettings.php:291 actions/tagother.php:178
+#, php-format
+msgid "Invalid tag: \"%s\""
 msgstr "Neplatná velikost"
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
@@ -4829,12 +4756,6 @@ msgstr ""
 "faq#mikroblog) služba založená na Free Software nástroji [StatusNet](http://"
 "status.net/)."
 
-#. TRANS: Public RSS feed description. %s is the StatusNet site name.
-#: actions/publicrss.php:106
-#, fuzzy, php-format
-msgid "%s updates from everyone."
-msgstr "Všechny updaty na %s!"
-
 #. TRANS: Title for public tag cloud.
 #: actions/publictagcloud.php:57
 msgid "Public tag cloud"
@@ -4969,12 +4890,6 @@ msgstr "Obnovit heslo"
 msgid "Password recovery requested"
 msgstr "Zažádáno o obnovu hesla"
 
-#. TRANS: Title for password recovery page in password saved mode.
-#: actions/recoverpassword.php:229
-#, fuzzy
-msgid "Password saved"
-msgstr "Heslo uloženo"
-
 #. TRANS: Title for password recovery page when an unknown action has been specified.
 #: actions/recoverpassword.php:232
 msgid "Unknown action"
@@ -4986,6 +4901,12 @@ msgstr "Neznámá akce"
 msgid "6 or more characters, and do not forget it!"
 msgstr "6 a více znaků, a nezapomeňte ho!"
 
+#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#: actions/recoverpassword.php:264 actions/register.php:441
+#, fuzzy
+msgid "Same as password above."
+msgstr "Stejné jako heslo výše"
+
 #. TRANS: Button text for password reset form.
 #. TRANS: Button text on profile design page to reset all colour settings to default without saving.
 #: actions/recoverpassword.php:268 lib/designsettings.php:264
@@ -5039,8 +4960,14 @@ msgstr "Heslo musí být alespoň 6 znaků dlouhé"
 msgid "Password and confirmation do not match."
 msgstr "Heslo a potvrzení nesouhlasí"
 
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:418
+#, fuzzy
+msgid "Cannot save new password."
+msgstr "Nelze uložit nové heslo"
+
 #. TRANS: Server error displayed when something does wrong with the user object during password reset.
-#: actions/recoverpassword.php:426 actions/register.php:248
+#: actions/recoverpassword.php:426 actions/register.php:256
 msgid "Error setting user."
 msgstr "Chyba nastavení uživatele"
 
@@ -5049,92 +4976,97 @@ msgstr "Chyba nastavení uživatele"
 msgid "New password successfully saved. You are now logged in."
 msgstr "Nové heslo bylo uloženo. Nyní jste přihlášen."
 
-#: actions/register.php:87 actions/register.php:188 actions/register.php:399
+#: actions/register.php:92 actions/register.php:196 actions/register.php:413
 msgid "Sorry, only invited people can register."
 msgstr "Litujeme, jen pozvaní se mohou registrovat."
 
-#: actions/register.php:94
+#: actions/register.php:99
 msgid "Sorry, invalid invitation code."
 msgstr "Litujeme, neplatný kód pozvánky."
 
-#: actions/register.php:113
+#: actions/register.php:119
 msgid "Registration successful"
 msgstr "Registrace úspěšná"
 
-#: actions/register.php:115 actions/register.php:497
+#: actions/register.php:121 actions/register.php:511
 msgid "Register"
 msgstr "Registrovat"
 
-#: actions/register.php:135
+#: actions/register.php:142
 msgid "Registration not allowed."
 msgstr "Registrace není povolena."
 
-#: actions/register.php:201
+#: actions/register.php:209
 #, fuzzy
-msgid "You cannot register if you don't agree to the license."
+msgid "You can't register if you don't agree to the license."
 msgstr "Nemůžete se registrovat, pokud nesouhlasíte s licencí."
 
-#: actions/register.php:210
+#: actions/register.php:218
 msgid "Email address already exists."
 msgstr "Emailová adresa již existuje"
 
-#: actions/register.php:243 actions/register.php:265
+#: actions/register.php:251 actions/register.php:273
 msgid "Invalid username or password."
 msgstr "Neplatné jméno nebo heslo"
 
-#: actions/register.php:340
+#: actions/register.php:351
 #, fuzzy
 msgid ""
 "With this form you can create a new account. You can then post notices and "
-"link up to friends and colleagues."
+"link up to friends and colleagues. "
 msgstr ""
 "Pomocí tohoto formuláře můžete vytvořit nový účet. Můžete pak posílat "
 "oznámení a propojit se s přáteli a kolegy. "
 
+#: actions/register.php:437
+#, fuzzy
+msgid "6 or more characters."
+msgstr "6 a více znaků"
+
 #. TRANS: Link description in user account settings menu.
-#: actions/register.php:431 actions/register.php:435
+#: actions/register.php:445 actions/register.php:449
 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
 msgid "Email"
 msgstr "Email"
 
-#: actions/register.php:432 actions/register.php:436
+#: actions/register.php:446 actions/register.php:450
 #, fuzzy
-msgid "Used only for updates, announcements, and password recovery."
+msgid "Used only for updates, announcements, and password recovery"
 msgstr "Použije se pouze pro aktualizace, oznámení a obnovu hesla."
 
-#: actions/register.php:443
+#: actions/register.php:457
 #, fuzzy
-msgid "Longer name, preferably your \"real\" name."
+msgid "Longer name, preferably your \"real\" name"
 msgstr "Delší jméno, nejlépe vaše \"skutečné\" jméno"
 
-#: actions/register.php:471
+#: actions/register.php:462
 #, fuzzy
-msgid "Where you are, like \"City, State (or Region), Country\"."
-msgstr "Místo. Město, stát."
+msgid "URL of your homepage, blog, or profile on another site"
+msgstr "Adresa vašich stránek, blogu nebo profilu na jiných stránkách."
 
-#: actions/register.php:510
+#: actions/register.php:523
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
 msgstr "Chápu, že obsah a data %1$S jsou soukromé a důvěrné."
 
-#: actions/register.php:520
+#: actions/register.php:533
 #, php-format
 msgid "My text and files are copyright by %1$s."
 msgstr "Můj text a soubory jsou copyrightovány %1$s."
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:524
+#: actions/register.php:537
 msgid "My text and files remain under my own copyright."
 msgstr "Můj text a soubory zůstanou pod mým vlastním copyrightem."
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:527
+#: actions/register.php:540
 msgid "All rights reserved."
 msgstr "Všechna práva vyhrazena."
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:532
+#: actions/register.php:545
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -5143,7 +5075,7 @@ msgstr ""
 "Můj text a soubory jsou k dispozici pod %s výjimkou těchto soukromých dat: "
 "heslo, e-mailová adresa, IM adresa a telefonní číslo."
 
-#: actions/register.php:573
+#: actions/register.php:588
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -5176,7 +5108,7 @@ msgstr ""
 "\n"
 "Díky za registraci a doufáme, že se vám používání této služby bude líbít."
 
-#: actions/register.php:597
+#: actions/register.php:612
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5209,7 +5141,7 @@ msgstr "Přezdívka uživatele"
 
 #: actions/remotesubscribe.php:129
 #, fuzzy
-msgid "Nickname of the user you want to follow."
+msgid "Nickname of the user you want to follow"
 msgstr "Přezdívka uživatele, kterého chcete sledovat"
 
 #: actions/remotesubscribe.php:132
@@ -5218,7 +5150,7 @@ msgstr "Adresa Profilu"
 
 #: actions/remotesubscribe.php:133
 #, fuzzy
-msgid "URL of your profile on another compatible microblogging service."
+msgid "URL of your profile on another compatible microblogging service"
 msgstr "Adresa profilu na jiných kompatibilních mikroblozích."
 
 #. TRANS: Link text for link that will subscribe to a remote profile.
@@ -5229,7 +5161,7 @@ msgstr "Odebírat"
 
 #: actions/remotesubscribe.php:158
 #, fuzzy
-msgid "Invalid profile URL (bad format)."
+msgid "Invalid profile URL (bad format)"
 msgstr "Neplatná adresa profilu (špatný formát)"
 
 #: actions/remotesubscribe.php:167
@@ -5273,7 +5205,6 @@ msgstr "Opakované"
 msgid "Repeated!"
 msgstr "Opakované!"
 
-#. TRANS: RSS reply feed title. %s is a user nickname.
 #. TRANS: Tooltip for personal group navigation menu option when logged in for viewing @-replies.
 #: actions/replies.php:126 actions/repliesrss.php:68
 #: lib/personalgroupnav.php:109
@@ -5328,11 +5259,9 @@ msgstr ""
 "Můžete se pokusit uživatele [%1$s postrčit](../%2$s)  nebo [jim něco poslat]"
 "(%%%%action.newnotice%%%%?status_textarea=%3$s)."
 
-#. TRANS: RSS reply feed description.
-#. TRANS: %1$s is a user nickname, %2$s is the StatusNet site name.
-#: actions/repliesrss.php:74
+#: actions/repliesrss.php:72
 #, fuzzy, php-format
-msgid "Replies to %1$s on %2$s."
+msgid "Replies to %1$s on %2$s!"
 msgstr "Odpovědi na %1$s na %2$s!"
 
 #. TRANS: Client exception displayed when trying to restore an account while not logged in.
@@ -5435,7 +5364,7 @@ msgstr "Nemůžete rušit uživatelské role na této stránce."
 msgid "User doesn't have this role."
 msgstr "Uživatel nemá tuto roli."
 
-#: actions/rsd.php:142 actions/version.php:159
+#: actions/rsd.php:146 actions/version.php:159
 msgid "StatusNet"
 msgstr "StatusNet"
 
@@ -5477,94 +5406,94 @@ msgstr "Zapnout výstup pro debugování sessions"
 msgid "Save site settings"
 msgstr "Uložit Nastavení webu"
 
-#: actions/showapplication.php:78
+#: actions/showapplication.php:82
 msgid "You must be logged in to view an application."
 msgstr "Musíte být přihlášeni pro zobrazení aplikace."
 
-#: actions/showapplication.php:151
+#: actions/showapplication.php:157
 msgid "Application profile"
 msgstr "Profil aplikace"
 
 #. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:153 lib/applicationeditform.php:177
+#: actions/showapplication.php:159 lib/applicationeditform.php:177
 msgid "Icon"
 msgstr "Ikona"
 
 #. TRANS: Form input field label for application name.
-#: actions/showapplication.php:163 actions/version.php:197
+#: actions/showapplication.php:169 actions/version.php:197
 #: lib/applicationeditform.php:190
 msgid "Name"
 msgstr "Název"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:172 lib/applicationeditform.php:227
+#: actions/showapplication.php:178 lib/applicationeditform.php:227
 msgid "Organization"
 msgstr "Organizace"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:181 actions/version.php:200
+#: actions/showapplication.php:187 actions/version.php:200
 #: lib/applicationeditform.php:208 lib/groupeditform.php:168
 msgid "Description"
 msgstr "Popis"
 
 #. TRANS: Header for group statistics on a group page (h2).
 #. TRANS: H2 text for user statistics.
-#: actions/showapplication.php:186 actions/showgroup.php:460
+#: actions/showapplication.php:192 actions/showgroup.php:460
 #: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "Statistiky"
 
-#: actions/showapplication.php:197
+#: actions/showapplication.php:203
 #, php-format
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr ""
 "Vytvořil %1$s - s \"%2$s\" přístupem ve výchozím nastavení - %3$d uživatelů"
 
-#: actions/showapplication.php:207
+#: actions/showapplication.php:213
 msgid "Application actions"
 msgstr "Akce aplikace"
 
-#: actions/showapplication.php:230
+#: actions/showapplication.php:236
 msgid "Reset key & secret"
 msgstr "Resetovat klíč a tajemství"
 
 #. TRANS: Title of form for deleting a user.
-#: actions/showapplication.php:246 lib/deletegroupform.php:121
+#: actions/showapplication.php:252 lib/deletegroupform.php:121
 #: lib/deleteuserform.php:64 lib/noticelist.php:673
 msgid "Delete"
 msgstr "Odstranit"
 
-#: actions/showapplication.php:255
+#: actions/showapplication.php:261
 msgid "Application info"
 msgstr "Info o aplikaci"
 
-#: actions/showapplication.php:257
+#: actions/showapplication.php:263
 msgid "Consumer key"
 msgstr "Spotřebitelský klíč"
 
-#: actions/showapplication.php:262
+#: actions/showapplication.php:268
 msgid "Consumer secret"
 msgstr "Spotřebitelské tajemství"
 
-#: actions/showapplication.php:267
+#: actions/showapplication.php:273
 msgid "Request token URL"
 msgstr "Adresa řetězce požadavku"
 
-#: actions/showapplication.php:272
+#: actions/showapplication.php:278
 msgid "Access token URL"
 msgstr "URL Access tokenu"
 
-#: actions/showapplication.php:277
+#: actions/showapplication.php:283
 msgid "Authorize URL"
 msgstr "Authorizační URL"
 
-#: actions/showapplication.php:282
+#: actions/showapplication.php:288
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
 msgstr "Poznámka: podpora HMAC-SHA1 podpisů. Nepodporujeme plaintext."
 
-#: actions/showapplication.php:302
+#: actions/showapplication.php:309
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr ""
 "Jste si jisti, že chcete resetovat svůj spotřebitelský klíč a tajemství?"
@@ -5657,18 +5586,16 @@ msgid "Group profile"
 msgstr "Profil skupiny"
 
 #. TRANS: Label for group URL (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT for URL in a profile.
 #: actions/showgroup.php:273 actions/tagother.php:118
-#: actions/userauthorization.php:184 lib/userprofile.php:186
+#: actions/userauthorization.php:175 lib/userprofile.php:186
 msgid "URL"
 msgstr "URL"
 
 #. TRANS: Label for group description or group note (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page where bio is displayed.
 #. TRANS: DT for note in a profile.
 #: actions/showgroup.php:285 actions/tagother.php:128
-#: actions/userauthorization.php:197 lib/userprofile.php:204
+#: actions/userauthorization.php:187 lib/userprofile.php:204
 msgid "Note"
 msgstr "Poznámka"
 
@@ -5815,7 +5742,7 @@ msgid "%1$s tagged %2$s"
 msgstr "%1$s, strana %2$d"
 
 #. TRANS: Page title showing tagged notices in one user's stream.
-#. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
+#. TRANS: %1$s is the username, %2$s is the hash tag, %1$d is the page number.
 #: actions/showstream.php:74
 #, fuzzy, php-format
 msgid "%1$s tagged %2$s, page %3$d"
@@ -6062,7 +5989,7 @@ msgstr "Celo-webové sdělení (255 znaků max., s HTML)"
 #. TRANS: Title for button to save site notice in admin panel.
 #: actions/sitenoticeadminpanel.php:201
 #, fuzzy
-msgid "Save site notice."
+msgid "Save site notice"
 msgstr "Uložit oznámení stránky"
 
 #. TRANS: Title for SMS settings.
@@ -6121,7 +6048,7 @@ msgstr "SMS telefonní číslo"
 #. TRANS: SMS phone number input field instructions in SMS settings form.
 #: actions/smssettings.php:152
 #, fuzzy
-msgid "Phone number, no punctuation or spaces, with area code."
+msgid "Phone number, no punctuation or spaces, with area code"
 msgstr "Telefonní číslo, Nepoužívej interpunkci nebo mezery, s předčíslím"
 
 #. TRANS: Form legend for SMS preferences form.
@@ -6289,20 +6216,16 @@ msgstr "Nejste přihlášen k tomuto profilu."
 msgid "Could not save subscription."
 msgstr "Nelze uložit odebírání"
 
-#. TRANS: Client error displayed trying to perform any request method other than POST.
-#. TRANS: Do not translate POST.
 #: actions/subscribe.php:77
 msgid "This action only accepts POST requests."
 msgstr "Tato akce přijímá pouze POST požadavky."
 
-#. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
-#: actions/subscribe.php:121
+#: actions/subscribe.php:117
 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
 msgstr ""
 "Touto akcí se nemůžete se přihlásit k odběru vzdáleného OMB 0.1 profilu."
 
-#. TRANS: Page title when subscription succeeded.
-#: actions/subscribe.php:149
+#: actions/subscribe.php:145
 msgid "Subscribed"
 msgstr "Prihlášen"
 
@@ -6462,9 +6385,8 @@ msgstr "Otagujte %s"
 msgid "User profile"
 msgstr "Uživatelský profil"
 
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT element in area for user avatar.
-#: actions/tagother.php:81 actions/userauthorization.php:138
+#: actions/tagother.php:81 actions/userauthorization.php:132
 #: lib/userprofile.php:108
 msgid "Photo"
 msgstr "Fotka"
@@ -6481,11 +6403,6 @@ msgstr ""
 "Tagy pro tohoto uživatele (písmena, číslice, -,., a _), oddělené čárkou nebo "
 "mezerou"
 
-#: actions/tagother.php:178
-#, php-format
-msgid "Invalid tag: \"%s\""
-msgstr "Neplatná velikost"
-
 #: actions/tagother.php:193
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
@@ -6503,7 +6420,6 @@ msgstr ""
 msgid "No such tag."
 msgstr "Žádná taková nálepka."
 
-#. TRANS: Client error displayed when trying to unblock a non-blocked user.
 #: actions/unblock.php:59
 msgid "You haven't blocked that user."
 msgstr "Nemáte zablokováno tohoto uživatele."
@@ -6524,7 +6440,7 @@ msgstr "CHybí ID profilu v žádosti."
 msgid "Unsubscribed"
 msgstr "Odhlášeno"
 
-#: actions/updateprofile.php:64
+#: actions/updateprofile.php:64 actions/userauthorization.php:337
 #, php-format
 msgid ""
 "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
@@ -6557,7 +6473,7 @@ msgstr "Neplatné uvítací text. Max délka je 255 znaků."
 #. TRANS: users in user admin panel. %1$s is the invalid nickname.
 #: actions/useradminpanel.php:166
 #, fuzzy, php-format
-msgid "Invalid default subscripton: \"%1$s\" is not a user."
+msgid "Invalid default subscripton: '%1$s' is not a user."
 msgstr "Neplatné výchozí přihlášení: '%1$s' není uživatel."
 
 #. TRANS: Link description in user account settings menu.
@@ -6619,70 +6535,59 @@ msgstr "Zda chcete uživatelům umožnit pozvat nové uživatele."
 #. TRANS: Title for button to save user settings in user admin panel.
 #: actions/useradminpanel.php:302
 #, fuzzy
-msgid "Save user settings."
+msgid "Save user settings"
 msgstr "Uložit Nastavení webu"
 
-#. TRANS: Page title.
-#: actions/userauthorization.php:109
+#: actions/userauthorization.php:105
 msgid "Authorize subscription"
 msgstr "Autorizujte přihlášení"
 
-#. TRANS: Page notice on "Auhtorize subscription" page.
-#: actions/userauthorization.php:115
+#: actions/userauthorization.php:110
 #, fuzzy
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
 "user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
-"click \"Reject\"."
+"click “Reject”."
 msgstr ""
 "Prosím zkontrolujte tyto detailu, a ujistěte se že opravdu chcete odebírat "
 "sdělení tohoto uživatele. Pokud jste právě nepožádali o přihlášení k tomuto "
 "uživteli, klikněte na \"Zrušit\""
 
-#. TRANS: DT element on Authorise Subscription page where license is displayed.
 #. TRANS: Menu item for site administration
-#: actions/userauthorization.php:207 actions/version.php:167
+#: actions/userauthorization.php:196 actions/version.php:167
 #: lib/adminpanelaction.php:403
 msgid "License"
 msgstr "Licence"
 
-#. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:229
+#: actions/userauthorization.php:217
 #, fuzzy
-msgctxt "BUTTON"
 msgid "Accept"
 msgstr "Přijmout"
 
-#. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:231
-#, fuzzy
-msgid "Subscribe to this user."
+#: actions/userauthorization.php:218 lib/subscribeform.php:115
+#: lib/subscribeform.php:139
+msgid "Subscribe to this user"
 msgstr "Přihlásit se k tomuto uživateli"
 
-#. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:233
+#: actions/userauthorization.php:219
 #, fuzzy
-msgctxt "BUTTON"
 msgid "Reject"
 msgstr "Odmítnout"
 
-#. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:235
+#: actions/userauthorization.php:220
 #, fuzzy
-msgid "Reject this subscription."
+msgid "Reject this subscription"
 msgstr "Odmítnout toto přihlášení"
 
-#. TRANS: Client error displayed for an empty authorisation request.
-#: actions/userauthorization.php:248
+#: actions/userauthorization.php:232
 msgid "No authorization request!"
 msgstr "Žádná žádost o autorizaci!"
 
-#. TRANS: Accept message header from Authorise subscription page.
-#: actions/userauthorization.php:271
+#: actions/userauthorization.php:254
 msgid "Subscription authorized"
 msgstr "Odběr autorizován"
 
-#: actions/userauthorization.php:274
+#: actions/userauthorization.php:256
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to authorize the "
@@ -6692,12 +6597,11 @@ msgstr ""
 "nápovědě jak správně postupovat při autorizování odběru. Váš řetězec odběru "
 "je:"
 
-#. TRANS: Reject message header from Authorise subscription page.
-#: actions/userauthorization.php:285
+#: actions/userauthorization.php:266
 msgid "Subscription rejected"
 msgstr "Odběr odmítnut"
 
-#: actions/userauthorization.php:288
+#: actions/userauthorization.php:268
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to fully reject the "
@@ -6706,63 +6610,39 @@ msgstr ""
 "Odebírání bylo zamítnuto, ale nepřišla žádná callback adresa. Zkontrolujte v "
 "nápovědě jak správně postupovat pro plné zamítnutí odběru."
 
-#. TRANS: Exception thrown when no valid user is found for an authorisation request.
-#. TRANS: %s is a listener URI.
-#: actions/userauthorization.php:325
+#: actions/userauthorization.php:303
 #, fuzzy, php-format
-msgid "Listener URI \"%s\" not found here."
+msgid "Listener URI ‘%s’ not found here."
 msgstr "Naslouchací URI ‘%s’ zde nebyl nalezen."
 
-#. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:332
+#: actions/userauthorization.php:308
 #, fuzzy, php-format
-msgid "Listenee URI \"%s\" is too long."
+msgid "Listenee URI ‘%s’ is too long."
 msgstr "Naslouchací URI ‘%s’ je příliš dlouhý."
 
-#. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:340
+#: actions/userauthorization.php:314
 #, fuzzy, php-format
-msgid "Listenee URI \"%s\" is a local user."
+msgid "Listenee URI ‘%s’ is a local user."
 msgstr "Naslouchací URI ‘%s’ je místní uživatel."
 
-#. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
-#. TRANS: %s is a profile URL.
-#: actions/userauthorization.php:358
+#: actions/userauthorization.php:329
 #, fuzzy, php-format
-msgid "Profile URL \"%s\" is for a local user."
+msgid "Profile URL ‘%s’ is for a local user."
 msgstr "URL profilu '%s' je pro místního uživatele."
 
-#. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
-#. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
-#: actions/userauthorization.php:368
+#: actions/userauthorization.php:345
 #, fuzzy, php-format
-msgid ""
-"Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
-"\"."
-msgstr ""
-"Licence naslouchaného '%1$s' není kompatibilní s licencí stránky '%2$s'."
-
-#. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:378
-#, fuzzy, php-format
-msgid "Avatar URL \"%s\" is not valid."
+msgid "Avatar URL ‘%s’ is not valid."
 msgstr "URL avataru ‘%s’ není platný."
 
-#. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:385
+#: actions/userauthorization.php:350
 #, fuzzy, php-format
-msgid "Cannot read avatar URL \"%s\"."
+msgid "Can’t read avatar URL ‘%s’."
 msgstr "Nelze načíst avatara z URL '%s'"
 
-#. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:392
+#: actions/userauthorization.php:355
 #, fuzzy, php-format
-msgid "Wrong image type for avatar URL \"%s\"."
+msgid "Wrong image type for avatar URL ‘%s’."
 msgstr "Špatný typ obrázku na URL '%s'"
 
 #. TRANS: Page title for profile design page.
@@ -6871,7 +6751,7 @@ msgid "Plugins"
 msgstr "Pluginy"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:898
+#: actions/version.php:198 lib/action.php:901
 msgid "Version"
 msgstr "Verze"
 
@@ -7085,14 +6965,14 @@ msgstr "Problém při ukládání skupinového inboxu"
 
 #. TRANS: Server exception thrown when a reply cannot be saved.
 #. TRANS: %1$d is a notice ID, %2$d is the ID of the mentioned user.
-#: classes/Notice.php:1142
+#: classes/Notice.php:1144
 #, fuzzy, php-format
 msgid "Could not save reply for %1$d, %2$d."
 msgstr "Nelze uložit místní info skupiny."
 
 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1661
+#: classes/Notice.php:1663
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
@@ -7106,14 +6986,14 @@ msgstr "%1$s (%2$s)"
 
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:775
+#: classes/Profile.php:779
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr "Nelze zrušit roli \"%1$s\" pro uživatele #%2$d, neexistuje."
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:784
+#: classes/Profile.php:788
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr "Nelze zrušit roli \"%1$s\" pro uživatele #%2$d, chyba databáze."
@@ -7430,53 +7310,53 @@ msgid "Page notice"
 msgstr "Sdělení stránky"
 
 #. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:871
+#: lib/action.php:874
 msgid "Secondary site navigation"
 msgstr "Sekundární navigace na webu"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:877
+#: lib/action.php:880
 msgid "Help"
 msgstr "Nápověda"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:880
+#: lib/action.php:883
 msgid "About"
 msgstr "O nás"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:883
+#: lib/action.php:886
 msgid "FAQ"
 msgstr "FAQ"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:888
+#: lib/action.php:891
 msgid "TOS"
 msgstr "TOS (pravidla použití služby)"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:892
+#: lib/action.php:895
 msgid "Privacy"
 msgstr "Soukromí"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:895
+#: lib/action.php:898
 msgid "Source"
 msgstr "Zdroj"
 
 #. TRANS: Secondary navigation menu option leading to e-mail contact information on the
 #. TRANS: StatusNet site, where to report bugs, ...
-#: lib/action.php:902
+#: lib/action.php:905
 msgid "Contact"
 msgstr "Kontakt"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:905
+#: lib/action.php:908
 msgid "Badge"
 msgstr "Odznak"
 
 #. TRANS: DT element for StatusNet software license.
-#: lib/action.php:934
+#: lib/action.php:937
 msgid "StatusNet software license"
 msgstr "Licence softwaru StatusNet"
 
@@ -7484,7 +7364,7 @@ msgstr "Licence softwaru StatusNet"
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:941
+#: lib/action.php:944
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7494,7 +7374,7 @@ msgstr ""
 "broughtby%%](%%site.broughtbyurl%%)."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:944
+#: lib/action.php:947
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** je služba mikroblogů."
@@ -7503,7 +7383,7 @@ msgstr "**%%site.name%%** je služba mikroblogů."
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:951
+#: lib/action.php:954
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7515,50 +7395,50 @@ msgstr ""
 "licensing/licenses/agpl-3.0.html)."
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:967
+#: lib/action.php:970
 msgid "Site content license"
 msgstr "Licence k obsahu stránek"
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:974
+#: lib/action.php:977
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr "Obsah a data z %1$S jsou soukromé a důvěrné."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:981
+#: lib/action.php:984
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr "Obsah a data copyright %1$s. Všechna práva vyhrazena."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:985
+#: lib/action.php:988
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr "Obsah a data copyright přispěvatelů. Všechna práva vyhrazena."
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:1017
+#: lib/action.php:1020
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr "Všechen obsah a data %1$s jsou k dispozici v rámci licence %2$s."
 
 #. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1353
+#: lib/action.php:1356
 msgid "Pagination"
 msgstr "Stránkování"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1364
+#: lib/action.php:1367
 msgid "After"
 msgstr "Po"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1374
+#: lib/action.php:1377
 msgid "Before"
 msgstr "Před"
 
@@ -7758,23 +7638,19 @@ msgstr ""
 msgid "No application for that consumer key."
 msgstr ""
 
-#: lib/apiauth.php:202 lib/apiauth.php:284
-msgid "Not allowed to use API."
-msgstr ""
-
 #. TRANS: OAuth exception given when an incorrect access token was given for a user.
-#: lib/apiauth.php:225
+#: lib/apiauth.php:219
 msgid "Bad access token."
 msgstr ""
 
 #. TRANS: OAuth exception given when no user was found for a given token (no token was found).
-#: lib/apiauth.php:230
+#: lib/apiauth.php:224
 msgid "No user for that token."
 msgstr ""
 
 #. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel".
 #. TRANS: Client error thrown when authentication fails.
-#: lib/apiauth.php:272 lib/apiauth.php:302
+#: lib/apiauth.php:266 lib/apiauth.php:293
 msgid "Could not authenticate you."
 msgstr ""
 
@@ -7981,11 +7857,6 @@ msgstr "Změna hesla není povolena"
 msgid "Block"
 msgstr "Blokovat"
 
-#. TRANS: Description of the form to block a user.
-#: lib/blockform.php:79
-msgid "Block this user"
-msgstr "Zablokovat tohoto uživatele"
-
 #. TRANS: Title for command results.
 #: lib/channel.php:160 lib/channel.php:181
 msgid "Command results"
@@ -8014,7 +7885,7 @@ msgstr "Oznámení s tímto id neexistuje."
 
 #. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
 #. TRANS: Error text shown when a last user notice is requested and it does not exist.
-#: lib/command.php:99 lib/command.php:630
+#: lib/command.php:99 lib/command.php:642
 msgid "User has no last notice."
 msgstr "Uživatel nemá žádné poslední oznámení"
 
@@ -8064,35 +7935,41 @@ msgstr ""
 "Odběratelé: %2$s \n"
 "Hlášky: %3$s"
 
+#. TRANS: Error message text shown when a favorite could not be set because it has already been favorited.
+#: lib/command.php:298
+#, fuzzy
+msgid "Could not create favorite: already favorited."
+msgstr "Nelze vytvořit oblíbenou položku."
+
 #. TRANS: Text shown when a notice has been marked as favourite successfully.
-#: lib/command.php:312
+#: lib/command.php:324
 msgid "Notice marked as fave."
 msgstr "Oznámení označené jako oblíbené."
 
 #. TRANS: Message given having added a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:357
+#: lib/command.php:369
 #, php-format
 msgid "%1$s joined group %2$s."
 msgstr "%1$s se připojil(a) ke skupině %2$s."
 
 #. TRANS: Message given having removed a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:405
+#: lib/command.php:417
 #, php-format
 msgid "%1$s left group %2$s."
 msgstr "%1$s opustil(a) skupinu %2$s."
 
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: lib/command.php:426
+#: lib/command.php:438
 #, fuzzy, php-format
 msgctxt "WHOIS"
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
 
 #. TRANS: Whois output. %s is the full name of the queried user.
-#: lib/command.php:430
+#: lib/command.php:442
 #, php-format
 msgid "Fullname: %s"
 msgstr "Celé jméno %s"
@@ -8100,7 +7977,7 @@ msgstr "Celé jméno %s"
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a location.
-#: lib/command.php:434 lib/mail.php:270
+#: lib/command.php:446 lib/mail.php:270
 #, php-format
 msgid "Location: %s"
 msgstr "Poloha: %s"
@@ -8108,20 +7985,20 @@ msgstr "Poloha: %s"
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a homepage.
-#: lib/command.php:438 lib/mail.php:274
+#: lib/command.php:450 lib/mail.php:274
 #, php-format
 msgid "Homepage: %s"
 msgstr "Domovská stránka: %s"
 
 #. TRANS: Whois output. %s is the bio information of the queried user.
-#: lib/command.php:442
+#: lib/command.php:454
 #, php-format
 msgid "About: %s"
 msgstr "O uživateli: %s"
 
 #. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).
 #. TRANS: %s is a remote profile.
-#: lib/command.php:471
+#: lib/command.php:483
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
@@ -8132,7 +8009,7 @@ msgstr ""
 
 #. TRANS: Message given if content is too long. %1$sd is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:488
+#: lib/command.php:500
 #, fuzzy, php-format
 msgid "Message too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
@@ -8141,25 +8018,25 @@ msgstr[1] "Zpráva je příliš dlouhá - maximum je %1$d znaků, poslal jsi %2$
 msgstr[2] "Zpráva je příliš dlouhá - maximum je %1$d znaků, poslal jsi %2$d."
 
 #. TRANS: Error text shown sending a direct message fails with an unknown reason.
-#: lib/command.php:516
+#: lib/command.php:528
 msgid "Error sending direct message."
 msgstr "Chyba při odesílání přímé zprávy."
 
 #. TRANS: Message given having repeated a notice from another user.
 #. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:553
+#: lib/command.php:565
 #, php-format
 msgid "Notice from %s repeated."
 msgstr "Oznámení od %s opakováno."
 
 #. TRANS: Error text shown when repeating a notice fails with an unknown reason.
-#: lib/command.php:556
+#: lib/command.php:568
 msgid "Error repeating notice."
 msgstr "Chyba nastavení uživatele"
 
 #. TRANS: Message given if content of a notice for a reply is too long. %1$d is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:591
+#: lib/command.php:603
 #, fuzzy, php-format
 msgid "Notice too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Notice too long - maximum is %1$d characters, you sent %2$d."
@@ -8169,100 +8046,100 @@ msgstr[2] "Oznámení je příliš dlouhé - maximum je %1$d znaků, poslal jsi
 
 #. TRANS: Text shown having sent a reply to a notice successfully.
 #. TRANS: %s is the nickname of the user of the notice the reply was sent to.
-#: lib/command.php:604
+#: lib/command.php:616
 #, php-format
 msgid "Reply to %s sent."
 msgstr "Odpověď %s odeslána."
 
 #. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
-#: lib/command.php:607
+#: lib/command.php:619
 msgid "Error saving notice."
 msgstr "Problém při ukládání sdělení."
 
 #. TRANS: Error text shown when no username was provided when issuing a subscribe command.
-#: lib/command.php:654
+#: lib/command.php:666
 msgid "Specify the name of the user to subscribe to."
 msgstr "Uveďte jméno uživatele ke kterému se přihlásit."
 
 #. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
-#: lib/command.php:663
+#: lib/command.php:675
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "Nelze se přihlásit k odběru OMB profilů příkazem."
 
 #. TRANS: Text shown after having subscribed to another user successfully.
 #. TRANS: %s is the name of the user the subscription was requested for.
-#: lib/command.php:671
+#: lib/command.php:683
 #, php-format
 msgid "Subscribed to %s."
 msgstr "Přihlášeno k %s."
 
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.
-#: lib/command.php:692 lib/command.php:803
+#: lib/command.php:704 lib/command.php:815
 msgid "Specify the name of the user to unsubscribe from."
 msgstr "Uveďte jméno uživatele od kterého se odhlásit."
 
 #. TRANS: Text shown after having unsubscribed from another user successfully.
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:703
+#: lib/command.php:715
 #, php-format
 msgid "Unsubscribed from %s."
 msgstr "Odhlášeno od %s."
 
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
-#: lib/command.php:723 lib/command.php:749
+#: lib/command.php:735 lib/command.php:761
 msgid "Command not yet implemented."
 msgstr "Příkaz ještě nebyl implementován."
 
 #. TRANS: Text shown when issuing the command "off" successfully.
-#: lib/command.php:727
+#: lib/command.php:739
 msgid "Notification off."
 msgstr "Oznámení vypnuta."
 
 #. TRANS: Error text shown when the command "off" fails for an unknown reason.
-#: lib/command.php:730
+#: lib/command.php:742
 msgid "Can't turn off notification."
 msgstr "Nelze vypnout oznámení."
 
 #. TRANS: Text shown when issuing the command "on" successfully.
-#: lib/command.php:753
+#: lib/command.php:765
 msgid "Notification on."
 msgstr "Oznámení zapnuta."
 
 #. TRANS: Error text shown when the command "on" fails for an unknown reason.
-#: lib/command.php:756
+#: lib/command.php:768
 msgid "Can't turn on notification."
 msgstr "Nelze zapnout oznámení."
 
 #. TRANS: Error text shown when issuing the login command while login is disabled.
-#: lib/command.php:770
+#: lib/command.php:782
 msgid "Login command is disabled."
 msgstr "Příkaz login je vypnut."
 
 #. TRANS: Text shown after issuing the login command successfully.
 #. TRANS: %s is a logon link..
-#: lib/command.php:783
+#: lib/command.php:795
 #, php-format
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr "Tento odkaz je použitelný pouze jednou a je platný pouze 2 minuty: %s."
 
 #. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:812
+#: lib/command.php:824
 #, php-format
 msgid "Unsubscribed %s."
 msgstr "%s odhlášen."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
-#: lib/command.php:830
+#: lib/command.php:842
 msgid "You are not subscribed to anyone."
 msgstr "Nejste přihlášen k nikomu."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
-#: lib/command.php:835
+#: lib/command.php:847
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Jste přihlášeni k této osobě:"
@@ -8271,14 +8148,14 @@ msgstr[2] "Jste přihlášeni k těmto lidem:"
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user
 #. TRANS: (followers) without having any subscribers.
-#: lib/command.php:857
+#: lib/command.php:869
 msgid "No one is subscribed to you."
 msgstr "Nikdo k vám není přihlášen."
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
-#: lib/command.php:862
+#: lib/command.php:874
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Tato osoba je k vám přihlášena:"
@@ -8287,14 +8164,14 @@ msgstr[2] "Tito lidé jsou k vám přihlášeni:"
 
 #. TRANS: Text shown after requesting groups a user is subscribed to without having
 #. TRANS: any group subscriptions.
-#: lib/command.php:884
+#: lib/command.php:896
 msgid "You are not a member of any groups."
 msgstr "Nejste členem žádné skupiny."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
-#: lib/command.php:889
+#: lib/command.php:901
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "Jste členem této skupiny:"
@@ -8302,7 +8179,7 @@ msgstr[1] "Jste členem těchto skupin:"
 msgstr[2] ""
 
 #. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-#: lib/command.php:904
+#: lib/command.php:916
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -8446,11 +8323,6 @@ msgstr "Autorizované propojené aplikace"
 msgid "Database error"
 msgstr "Chyba databáze"
 
-#. TRANS: Description of form for deleting a user.
-#: lib/deleteuserform.php:75
-msgid "Delete this user"
-msgstr "Odstranit tohoto uživatele"
-
 #. TRANS: Label in form on profile design page.
 #. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
 #: lib/designsettings.php:108
@@ -8489,21 +8361,6 @@ msgstr "Změnit barvy"
 msgid "Use defaults"
 msgstr "Použít výchozí"
 
-#. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: lib/designsettings.php:259
-msgid "Restore default designs"
-msgstr "Obnovit výchozí vzhledy"
-
-#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: lib/designsettings.php:267
-msgid "Reset back to default"
-msgstr "Reset zpět do výchozího"
-
-#. TRANS: Title for button on profile design page to save settings.
-#: lib/designsettings.php:272
-msgid "Save design"
-msgstr "Uložit vzhled"
-
 #. TRANS: Error message displayed if design settings could not be saved.
 #. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
 #: lib/designsettings.php:405 lib/designsettings.php:427
@@ -9390,10 +9247,6 @@ msgstr "Odpovědět na toto oznámení"
 msgid "Reply"
 msgstr "Odpovědět"
 
-#: lib/noticelist.php:673
-msgid "Delete this notice"
-msgstr "Odstranit toto oznámení"
-
 #: lib/noticelist.php:691
 msgid "Notice repeated"
 msgstr "Sdělení opakováno"
@@ -9675,10 +9528,6 @@ msgstr "Pozvat"
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Pozvěte přátele a kolegy, aby se k vám připojili na %s"
 
-#: lib/subscribeform.php:115 lib/subscribeform.php:139
-msgid "Subscribe to this user"
-msgstr "Přihlásit se k tomuto uživateli"
-
 #: lib/subscriberspeopleselftagcloudsection.php:48
 #: lib/subscriptionspeopleselftagcloudsection.php:48
 msgid "People Tagcloud as self-tagged"
@@ -9854,23 +9703,18 @@ msgctxt "role"
 msgid "Moderator"
 msgstr "Moderátor"
 
-#: lib/util.php:305
-#, fuzzy
-msgid "Not allowed to log in."
-msgstr "Nejste přihlášen(a)."
-
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1309
+#: lib/util.php:1306
 msgid "a few seconds ago"
 msgstr "před pár sekundami"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1312
+#: lib/util.php:1309
 msgid "about a minute ago"
 msgstr "asi před minutou"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1316
+#: lib/util.php:1313
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
@@ -9879,12 +9723,12 @@ msgstr[1] ""
 msgstr[2] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1319
+#: lib/util.php:1316
 msgid "about an hour ago"
 msgstr "asi před hodinou"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1323
+#: lib/util.php:1320
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
@@ -9893,12 +9737,12 @@ msgstr[1] ""
 msgstr[2] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1326
+#: lib/util.php:1323
 msgid "about a day ago"
 msgstr "asi přede dnem"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1330
+#: lib/util.php:1327
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
@@ -9907,12 +9751,12 @@ msgstr[1] ""
 msgstr[2] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1333
+#: lib/util.php:1330
 msgid "about a month ago"
 msgstr "asi před měsícem"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1337
+#: lib/util.php:1334
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
@@ -9921,7 +9765,7 @@ msgstr[1] ""
 msgstr[2] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1340
+#: lib/util.php:1337
 msgid "about a year ago"
 msgstr "asi před rokem"
 
@@ -9964,3 +9808,74 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#, fuzzy
+#~ msgid "Block this user."
+#~ msgstr "Zablokovat tohoto uživatele"
+
+#, fuzzy
+#~ msgid "Delete this notice."
+#~ msgstr "Odstranit toto oznámení"
+
+#, fuzzy
+#~ msgid "Delete this user."
+#~ msgstr "Odstranit tohoto uživatele"
+
+#, fuzzy
+#~ msgid "Restore default designs."
+#~ msgstr "Obnovit výchozí vzhledy"
+
+#, fuzzy
+#~ msgid "Reset back to default."
+#~ msgstr "Reset zpět do výchozího"
+
+#, fuzzy
+#~ msgid "Save design."
+#~ msgstr "Uložit vzhled"
+
+#, fuzzy
+#~ msgid "Disfavor favorite."
+#~ msgstr "Znemilostnit oblíbenou"
+
+#, fuzzy
+#~ msgid "\"%s\" not found."
+#~ msgstr " API metoda nebyla nalezena."
+
+#, fuzzy
+#~ msgid "Notice %s not found."
+#~ msgstr " API metoda nebyla nalezena."
+
+#, fuzzy
+#~ msgid "Attachment %s not found."
+#~ msgstr "Příjemce nebyl nalezen."
+
+#, fuzzy
+#~ msgid "Invalid tag: \"%s\"."
+#~ msgstr "Neplatná velikost"
+
+#, fuzzy
+#~ msgid "%s updates from everyone."
+#~ msgstr "Všechny updaty na %s!"
+
+#, fuzzy
+#~ msgid "Password saved"
+#~ msgstr "Heslo uloženo"
+
+#, fuzzy
+#~ msgid "Where you are, like \"City, State (or Region), Country\"."
+#~ msgstr "Místo. Město, stát."
+
+#, fuzzy
+#~ msgid "Subscribe to this user."
+#~ msgstr "Přihlásit se k tomuto uživateli"
+
+#, fuzzy
+#~ msgid ""
+#~ "Listenee stream license \"%1$s\" is not compatible with site license \"%2"
+#~ "$s\"."
+#~ msgstr ""
+#~ "Licence naslouchaného '%1$s' není kompatibilní s licencí stránky '%2$s'."
+
+#, fuzzy
+#~ msgid "Not allowed to log in."
+#~ msgstr "Nejste přihlášen(a)."
diff --git a/locale/de/LC_MESSAGES/statusnet.po b/locale/de/LC_MESSAGES/statusnet.po
index c6947219db..06023822e9 100644
--- a/locale/de/LC_MESSAGES/statusnet.po
+++ b/locale/de/LC_MESSAGES/statusnet.po
@@ -20,17 +20,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-24 10:32+0000\n"
-"PO-Revision-Date: 2011-02-24 10:36:22+0000\n"
+"POT-Creation-Date: 2011-03-03 15:58+0000\n"
+"PO-Revision-Date: 2011-03-03 16:00:19+0000\n"
 "Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r82712); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-02-17 11:39:54+0000\n"
+"X-POT-Import-Date: 2011-02-25 23:49:23+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -143,11 +143,7 @@ msgstr "Seite nicht vorhanden"
 #. 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 use "one time password login" without using an existing user.
-#. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
-#. TRANS: Client error displayed trying to find a user by ID for a non-existing ID.
-#. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when calling a profile action without specifying a user.
 #: actions/all.php:80 actions/allrss.php:69
@@ -165,12 +161,12 @@ msgstr "Seite nicht vorhanden"
 #: actions/apitimelinementions.php:77 actions/apitimelineuser.php:79
 #: actions/avatarbynickname.php:79 actions/favoritesrss.php:72
 #: actions/foaf.php:42 actions/foaf.php:61 actions/hcard.php:67
-#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:78
+#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
 #: actions/remotesubscribe.php:144 actions/remotesubscribe.php:153
-#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:113
-#: actions/showfavorites.php:106 actions/userbyid.php:75
+#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
+#: actions/showfavorites.php:106 actions/userbyid.php:74
 #: actions/usergroups.php:93 actions/userrss.php:40 actions/userxrd.php:59
-#: actions/xrds.php:71 lib/command.php:497 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:509 lib/galleryaction.php:59
 #: lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Unbekannter Benutzer."
@@ -300,7 +296,7 @@ msgstr "Aktualisierungen von %1$s und Freunden auf %2$s!"
 #: actions/apigrouplistall.php:120 actions/apigroupmembership.php:105
 #: actions/apigroupshow.php:114 actions/apihelptest.php:84
 #: actions/apistatusesdestroy.php:101 actions/apistatusesretweets.php:110
-#: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:138
+#: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:139
 #: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
 #: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:268
 #: actions/apitimelinegroup.php:147 actions/apitimelinehome.php:173
@@ -534,7 +530,7 @@ msgstr "Empfänger nicht gefunden."
 #. TRANS: Client error displayed trying to direct message another user who's not a friend (403).
 #: actions/apidirectmessagenew.php:144
 #, fuzzy
-msgid "Cannot send direct messages to users who aren't your friend."
+msgid "Can't send direct messages to users who aren't your friend."
 msgstr ""
 "Es können keine direkten Nachrichten an Benutzer geschickt werden mit denen "
 "du nicht befreundet bist."
@@ -562,7 +558,7 @@ msgstr "Diese Nachricht ist bereits ein Favorit!"
 #. TRANS: Client error displayed when marking a notice as favourite fails.
 #. TRANS: Server error displayed when trying to mark a notice as favorite fails in the database.
 #. TRANS: Error message text shown when a favorite could not be set.
-#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:294
+#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:306
 msgid "Could not create favorite."
 msgstr "Konnte keinen Favoriten erstellen."
 
@@ -621,7 +617,7 @@ msgstr "Konnte keine Statusmeldungen finden."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:191
 #: actions/newgroup.php:137 actions/profilesettings.php:273
-#: actions/register.php:206
+#: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "Benutzername wird bereits verwendet. Suche dir einen anderen aus."
 
@@ -631,7 +627,7 @@ msgstr "Benutzername wird bereits verwendet. Suche dir einen anderen aus."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:195
 #: actions/newgroup.php:141 actions/profilesettings.php:243
-#: actions/register.php:208
+#: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "Ungültiger Benutzername."
 
@@ -644,7 +640,7 @@ msgstr "Ungültiger Benutzername."
 #: actions/apigroupcreate.php:181 actions/editapplication.php:235
 #: actions/editgroup.php:202 actions/newapplication.php:221
 #: actions/newgroup.php:148 actions/profilesettings.php:248
-#: actions/register.php:215
+#: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr ""
 "Homepage ist keine gültige URL. URLs müssen ein Präfix wie http enthalten."
@@ -655,7 +651,7 @@ msgstr ""
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:191 actions/editgroup.php:206
 #: actions/newgroup.php:152 actions/profilesettings.php:252
-#: actions/register.php:218
+#: actions/register.php:226
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "Der bürgerliche Name ist zu lang (maximal 255 Zeichen)."
 
@@ -683,7 +679,7 @@ msgstr[1] "Die Beschreibung ist zu lang (max. %d Zeichen)."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:215 actions/editgroup.php:218
 #: actions/newgroup.php:164 actions/profilesettings.php:265
-#: actions/register.php:227
+#: actions/register.php:235
 msgid "Location is too long (maximum 255 characters)."
 msgstr "Der eingegebene Aufenthaltsort ist zu lang (maximal 255 Zeichen)."
 
@@ -739,14 +735,14 @@ msgstr "Gruppe nicht gefunden!"
 #. TRANS: Server error displayed when trying to join a group the user is already a member of.
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:333
+#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:345
 msgid "You are already a member of that group."
 msgstr "Du bist bereits Mitglied dieser Gruppe"
 
 #. TRANS: Server error displayed when trying to join a group the user is blocked from joining.
 #. 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.
-#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:338
+#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:350
 msgid "You have been blocked from that group by the admin."
 msgstr "Der Admin dieser Gruppe hat dich blockiert."
 
@@ -756,7 +752,7 @@ msgstr "Der Admin dieser Gruppe hat dich blockiert."
 #. TRANS: %1$s is the joining user's nickname, $2$s is the group nickname for which the join failed.
 #. TRANS: Message given having failed to add a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:350
+#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:362
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "Konnte Benutzer %1$s nicht der Gruppe %2$s hinzufügen."
@@ -773,7 +769,7 @@ msgstr "Du bist kein Mitglied dieser Gruppe."
 #. TRANS: Message given having failed to remove a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
 #: actions/apigroupleave.php:127 actions/leavegroup.php:133
-#: lib/command.php:398
+#: lib/command.php:410
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
 msgstr "Konnte Benutzer %1$s nicht aus der Gruppe %2$s entfernen."
@@ -833,21 +829,20 @@ msgstr "Anfrage-Token bereits autorisiert."
 #. TRANS: Form validation error message.
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
-#. TRANS: Client error displayed when the session token is not okay.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
 #: actions/deletenotice.php:177 actions/disfavor.php:75
 #: actions/emailsettings.php:291 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:65 actions/grouplogo.php:321
 #: actions/groupunblock.php:65 actions/imsettings.php:224
-#: actions/invite.php:60 actions/login.php:131 actions/makeadmin.php:66
+#: actions/invite.php:60 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
-#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:136
-#: actions/othersettings.php:155 actions/passwordsettings.php:137
+#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
+#: actions/othersettings.php:155 actions/passwordsettings.php:138
 #: actions/profilesettings.php:217 actions/recoverpassword.php:383
-#: actions/register.php:164 actions/remotesubscribe.php:76
+#: actions/register.php:172 actions/remotesubscribe.php:76
 #: actions/repeat.php:82 actions/smssettings.php:250 actions/subedit.php:40
-#: actions/subscribe.php:87 actions/tagother.php:166
-#: actions/unsubscribe.php:69 actions/userauthorization.php:53
+#: actions/subscribe.php:86 actions/tagother.php:166
+#: actions/unsubscribe.php:69 actions/userauthorization.php:52
 #: lib/designsettings.php:310
 msgid "There was a problem with your session token. Try again, please."
 msgstr "Es gab ein Problem mit deinem Sitzungstoken. Bitte versuche es erneut."
@@ -878,7 +873,7 @@ msgstr "Datenbankfehler beim Einfügen von oauth_token_association."
 #: actions/designadminpanel.php:100 actions/editapplication.php:144
 #: actions/emailsettings.php:310 actions/grouplogo.php:332
 #: actions/imsettings.php:239 actions/newapplication.php:124
-#: actions/oauthconnectionssettings.php:145 actions/recoverpassword.php:46
+#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
 #: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
 msgstr "Unerwartete Formulareingabe."
@@ -929,20 +924,19 @@ msgstr "Profil"
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group nickname (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT for nick name in a profile.
-#: actions/apioauthauthorize.php:459 actions/login.php:242
-#: actions/profilesettings.php:106 actions/register.php:418
+#: actions/apioauthauthorize.php:459 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:432
 #: actions/showgroup.php:243 actions/tagother.php:94
-#: actions/userauthorization.php:152 lib/groupeditform.php:145
+#: actions/userauthorization.php:145 lib/groupeditform.php:145
 #: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "Benutzername"
 
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:463 actions/login.php:245
-#: actions/register.php:422 lib/accountsettingsaction.php:120
+#: actions/apioauthauthorize.php:463 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:120
 msgid "Password"
 msgstr "Passwort"
 
@@ -1037,13 +1031,13 @@ msgstr "Unbekannte Nachricht."
 
 #. TRANS: Client error displayed trying to repeat an own notice through the API.
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:537
+#: actions/apistatusesretweet.php:83 lib/command.php:549
 msgid "Cannot repeat your own notice."
 msgstr "Du kannst deine eigenen Nachrichten nicht wiederholen."
 
 #. TRANS: Client error displayed trying to re-repeat a notice through the API.
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:92 lib/command.php:543
+#: actions/apistatusesretweet.php:92 lib/command.php:555
 msgid "Already repeated that notice."
 msgstr "Nachricht bereits wiederholt"
 
@@ -1065,7 +1059,7 @@ msgstr "HTTP-Methode wird nicht unterstützt."
 #. TRANS: %s is the requested output format.
 #: actions/apistatusesshow.php:144
 #, fuzzy, php-format
-msgid "Unsupported format: %s."
+msgid "Unsupported format: %s"
 msgstr "Nicht unterstütztes Bildformat: %s"
 
 #. TRANS: Client error displayed requesting a deleted status.
@@ -1176,14 +1170,13 @@ msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr "Nachrichten von %1$s, die auf Nachrichten von %2$s / %3$s antworten."
 
 #. TRANS: Title for site timeline. %s is the StatusNet sitename.
-#. TRANS: Public RSS feed title. %s is the StatusNet site name.
 #: actions/apitimelinepublic.php:193 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "%s öffentliche Zeitleiste"
 
 #. TRANS: Subtitle for site timeline. %s is the StatusNet sitename.
-#: actions/apitimelinepublic.php:199
+#: actions/apitimelinepublic.php:199 actions/publicrss.php:105
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "%s Nachrichten von allen!"
@@ -1248,26 +1241,25 @@ msgid "Atom post must be an Atom entry."
 msgstr "Atom-Post muss ein Atom-Eintrag sein."
 
 #. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
-#: actions/apitimelineuser.php:334
+#: actions/apitimelineuser.php:335
 msgid "Can only handle POST activities."
 msgstr "Nur POST verwenden"
 
 #. TRANS: Client error displayed when using an unsupported activity object type.
 #. TRANS: %s is the unsupported activity object type.
-#: actions/apitimelineuser.php:345
+#: actions/apitimelineuser.php:346
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
 #. TRANS: %d is the notice ID (number).
-#: actions/apitimelineuser.php:379
+#: actions/apitimelineuser.php:380
 #, php-format
 msgid "No content for notice %d."
 msgstr "Kein Inhalt für Nachricht %d."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#. TRANS: %s is the notice URI.
 #: actions/apitimelineuser.php:408
 #, php-format
 msgid "Notice with URI \"%s\" already exists."
@@ -1285,10 +1277,9 @@ msgstr "API-Methode nicht gefunden."
 
 #. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
 #. TRANS: Client exception.
-#. TRANS: Client error displayed trying to subscribe to a non-existing profile.
 #: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
 #: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
-#: actions/subscribe.php:110
+#: actions/subscribe.php:107
 msgid "No such profile."
 msgstr "Profil nicht gefunden."
 
@@ -1419,7 +1410,7 @@ msgstr "Konnte Favoriten nicht löschen."
 #: actions/joingroup.php:95 actions/leavegroup.php:82
 #: actions/leavegroup.php:95 actions/makeadmin.php:86
 #: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:380
+#: lib/command.php:392
 msgid "No such group."
 msgstr "Keine derartige Gruppe."
 
@@ -1429,7 +1420,7 @@ msgid "Not a member."
 msgstr "Kein Mitglied"
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
-#: actions/atompubshowmembership.php:150
+#: actions/atompubshowmembership.php:151
 #, fuzzy
 msgid "Cannot delete someone else's membership."
 msgstr "Konnte Selbst-Abonnement nicht löschen."
@@ -1535,11 +1526,9 @@ msgstr ""
 
 #. TRANS: Server error displayed in avatar upload page when no matching profile can be found for a user.
 #. TRANS: Server error displayed coming across a request from a user without a profile.
-#. TRANS: Server error displayed when trying to authorise a remote subscription request
-#. TRANS: while the user has no profile.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
 #: actions/grouplogo.php:184 actions/remotesubscribe.php:190
-#: actions/userauthorization.php:75 actions/userrss.php:108
+#: actions/userauthorization.php:72 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr "Benutzer ohne passendes Profil"
 
@@ -1594,10 +1583,10 @@ msgstr "Zuschneiden"
 msgid "No file uploaded."
 msgstr "Keine Datei hoch geladen."
 
-#. TRANS: Avatar upload form instruction after uploading a file.
+#. TRANS: Avatar upload form unstruction after uploading a file.
 #: actions/avatarsettings.php:345
 #, fuzzy
-msgid "Pick a square area of the image to be your avatar."
+msgid "Pick a square area of the image to be your avatar"
 msgstr ""
 "Wähle eine quadratische Fläche aus dem Bild, um dein Avatar zu speichern"
 
@@ -1640,7 +1629,7 @@ msgid "You may not backup your account."
 msgstr ""
 
 #. TRANS: Information displayed on the backup account page.
-#: actions/backupaccount.php:225
+#: actions/backupaccount.php:227
 msgid ""
 "You can backup your account data in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format. This is an experimental feature and provides "
@@ -1650,15 +1639,15 @@ msgid ""
 msgstr ""
 
 #. TRANS: Submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:248
+#: actions/backupaccount.php:250
 msgctxt "BUTTON"
 msgid "Backup"
 msgstr "Backup"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:252
+#: actions/backupaccount.php:254
 #, fuzzy
-msgid "Backup your account."
+msgid "Backup your account"
 msgstr "Backup-Konto"
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
@@ -1700,7 +1689,7 @@ msgstr "Nein"
 #. TRANS: Submit button title for 'No' when blocking a user.
 #: actions/block.php:158
 #, fuzzy
-msgid "Do not block this user."
+msgid "Do not block this user"
 msgstr "Diesen Benutzer freigeben"
 
 #. TRANS: Button label on the user block form.
@@ -1717,9 +1706,10 @@ msgid "Yes"
 msgstr "Ja"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:165
-msgid "Block this user."
-msgstr "Diesen Benutzer blockieren."
+#. TRANS: Description of the form to block a user.
+#: actions/block.php:165 lib/blockform.php:79
+msgid "Block this user"
+msgstr "Diesen Benutzer blockieren"
 
 #. TRANS: Server error displayed when blocking a user fails.
 #: actions/block.php:189
@@ -1878,7 +1868,7 @@ msgstr ""
 #. TRANS: Field label for delete account confirmation entry.
 #. TRANS: Field label for password reset form where the password has to be typed again.
 #: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:262 actions/register.php:426
+#: actions/recoverpassword.php:262 actions/register.php:440
 msgid "Confirm"
 msgstr "Bestätigen"
 
@@ -1908,14 +1898,14 @@ msgstr "Programm nicht gefunden."
 #. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
 #: actions/deleteapplication.php:79 actions/editapplication.php:78
-#: actions/showapplication.php:90
+#: actions/showapplication.php:94
 msgid "You are not the owner of this application."
 msgstr "Du bist Besitzer dieses Programms"
 
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
-#: actions/newapplication.php:112 actions/showapplication.php:113
-#: lib/action.php:1422
+#: actions/newapplication.php:112 actions/showapplication.php:118
+#: lib/action.php:1425
 msgid "There was a problem with your session token."
 msgstr "Es gab ein Problem mit deinem Sessiontoken."
 
@@ -1938,13 +1928,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting an application.
 #: actions/deleteapplication.php:161
 #, fuzzy
-msgid "Do not delete this application."
+msgid "Do not delete this application"
 msgstr "Dieses Programm nicht löschen"
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
 #: actions/deleteapplication.php:167
 #, fuzzy
-msgid "Delete this application."
+msgid "Delete this application"
 msgstr "Programm löschen"
 
 #. TRANS: Client error when trying to delete group while not logged in.
@@ -1999,13 +1989,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting a group.
 #: actions/deletegroup.php:224
 #, fuzzy
-msgid "Do not delete this group."
+msgid "Do not delete this group"
 msgstr "Diese Gruppe nicht löschen"
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
 #: actions/deletegroup.php:231
 #, fuzzy
-msgid "Delete this group."
+msgid "Delete this group"
 msgstr "Diese Gruppe löschen"
 
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
@@ -2013,15 +2003,13 @@ msgstr "Diese Gruppe löschen"
 #. TRANS: Client error displayed when trying to mark a notice as favorite without being logged in.
 #. TRANS: Client error displayed trying to block a user from a group while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
-#. TRANS: Client error displayed trying to log out when not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
-#. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
 #. TRANS: Client error displayed when trying to change user options while not logged in.
 #: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
-#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:70
+#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
-#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:98
+#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
 #: lib/adminpanelaction.php:71 lib/profileformaction.php:63
 #: lib/settingsaction.php:72
@@ -2051,13 +2039,12 @@ msgstr "Bist du sicher, dass du diese Nachricht löschen möchtest?"
 #. TRANS: Submit button title for 'No' when deleting a notice.
 #: actions/deletenotice.php:159
 #, fuzzy
-msgid "Do not delete this notice."
+msgid "Do not delete this notice"
 msgstr "Diese Nachricht nicht löschen"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:166
-#, fuzzy
-msgid "Delete this notice."
+#: actions/deletenotice.php:166 lib/noticelist.php:673
+msgid "Delete this notice"
 msgstr "Nachricht löschen"
 
 #. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
@@ -2093,13 +2080,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting a user.
 #: actions/deleteuser.php:158
 #, fuzzy
-msgid "Do not delete this user."
+msgid "Do not delete this user"
 msgstr "Diesen Benutzer nicht löschen"
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
-#: actions/deleteuser.php:165
-#, fuzzy
-msgid "Delete this user."
+#. TRANS: Description of form for deleting a user.
+#: actions/deleteuser.php:165 lib/deleteuserform.php:75
+msgid "Delete this user"
 msgstr "Diesen Benutzer löschen"
 
 #. TRANS: Message used as title for design settings for the site.
@@ -2264,21 +2251,21 @@ msgid "Use defaults"
 msgstr "Standardeinstellungen benutzen"
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:720
-#, fuzzy
-msgid "Restore default designs."
+#. TRANS: Title for button on profile design page to reset all colour settings to default.
+#: actions/designadminpanel.php:720 lib/designsettings.php:259
+msgid "Restore default designs"
 msgstr "Standard-Design wiederherstellen"
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:728
-#, fuzzy
-msgid "Reset back to default."
+#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
+#: actions/designadminpanel.php:728 lib/designsettings.php:267
+msgid "Reset back to default"
 msgstr "Standard wiederherstellen"
 
 #. TRANS: Title for button for saving theme settings.
-#: actions/designadminpanel.php:736
-#, fuzzy
-msgid "Save design."
+#. TRANS: Title for button on profile design page to save settings.
+#: actions/designadminpanel.php:736 lib/designsettings.php:272
+msgid "Save design"
 msgstr "Design speichern"
 
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
@@ -2310,7 +2297,7 @@ msgid "You must be logged in to edit an application."
 msgstr "Du musst angemeldet sein, um eine Anwendung zu bearbeiten."
 
 #. TRANS: Client error displayed trying to edit an application that does not exist.
-#: actions/editapplication.php:83 actions/showapplication.php:83
+#: actions/editapplication.php:83 actions/showapplication.php:87
 msgid "No such application."
 msgstr "Anwendung nicht bekannt."
 
@@ -2594,7 +2581,7 @@ msgid "Cannot normalize that email address."
 msgstr "Konnte diese E-Mail-Adresse nicht normalisieren"
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:393 actions/register.php:204
+#: actions/emailsettings.php:393 actions/register.php:212
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "Ungültige E-Mail-Adresse."
@@ -2671,22 +2658,19 @@ msgstr "Keine Eingangs-E-Mail-Adresse."
 
 #. 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.
 #: actions/emailsettings.php:530 actions/emailsettings.php:554
-#: actions/smssettings.php:566 actions/smssettings.php:591
+#: actions/smssettings.php:565 actions/smssettings.php:588
 #, fuzzy
 msgid "Could not update user record."
 msgstr "Konnte Benutzereintrag nicht schreiben"
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
-#. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:534 actions/smssettings.php:570
+#: actions/emailsettings.php:534 actions/smssettings.php:568
 msgid "Incoming email address removed."
 msgstr "Eingehende E-Mail-Adresse entfernt"
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
-#. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:558 actions/smssettings.php:595
+#: actions/emailsettings.php:558 actions/smssettings.php:591
 msgid "New incoming email address added."
 msgstr "Neue Eingangs-E-Mail-Adresse hinzugefügt."
 
@@ -2698,7 +2682,7 @@ msgstr "Diese Nachricht ist bereits ein Favorit!"
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
 #: actions/favor.php:95
 #, fuzzy
-msgid "Disfavor favorite."
+msgid "Disfavor favorite"
 msgstr "Aus Favoriten entfernen"
 
 #. TRANS: Page title for first page of favorited notices.
@@ -2940,13 +2924,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
 #: actions/groupblock.php:191
 #, fuzzy
-msgid "Do not block this user from this group."
+msgid "Do not block this user from this group"
 msgstr "Diesen Benutzerzugang nicht für diese Gruppe blockieren."
 
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
 #: actions/groupblock.php:198
 #, fuzzy
-msgid "Block this user from this group."
+msgid "Block this user from this group"
 msgstr "Diesen Benutzer von der Gruppe blockieren"
 
 #. TRANS: Server error displayed when trying to block a user from a group fails because of an application error.
@@ -2956,7 +2940,6 @@ msgstr ""
 "Datenbankfehler beim Versuch den Benutzer aus der Gruppe zu blockieren."
 
 #. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
-#. TRANS: Client error displayed trying to find a user by ID without providing an ID.
 #: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr "Keine ID"
@@ -3145,10 +3128,8 @@ msgid "Group search"
 msgstr "Gruppen-Suche"
 
 #. TRANS: Text on page where groups can be searched if no results were found for a query.
-#. TRANS: Text for notice search results is the query had no results.
-#. TRANS: Message on the "People search" page where a query has no results.
-#: actions/groupsearch.php:82 actions/noticesearch.php:122
-#: actions/peoplesearch.php:87
+#: actions/groupsearch.php:82 actions/noticesearch.php:117
+#: actions/peoplesearch.php:83
 msgid "No results."
 msgstr "Keine Ergebnisse."
 
@@ -3185,7 +3166,6 @@ msgid "User is not blocked from group."
 msgstr "Dieser Benutzer ist nicht von der Gruppe blockiert."
 
 #. TRANS: Server error displayed when unblocking a user from a group fails because of an unknown error.
-#. TRANS: Server error displayed when removing a user block.
 #: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "Fehler beim Freigeben des Benutzers."
@@ -3283,8 +3263,7 @@ msgid "Publish a MicroID for my Jabber/Google Talk address."
 msgstr "MicroID für meine Jabber/GTalk-Adresse veröffentlichen."
 
 #. TRANS: Confirmation message for successful Instant Messaging preferences save.
-#. TRANS: Confirmation message after saving preferences.
-#: actions/imsettings.php:283 actions/othersettings.php:193
+#: actions/imsettings.php:283 actions/othersettings.php:192
 msgid "Preferences saved."
 msgstr "Einstellungen gesichert."
 
@@ -3580,7 +3559,7 @@ msgstr "Du musst angemeldet sein, um aus einer Gruppe auszutreten."
 
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
-#: actions/leavegroup.php:103 lib/command.php:386
+#: actions/leavegroup.php:103 lib/command.php:398
 msgid "You are not a member of that group."
 msgstr "Du bist kein Mitglied dieser Gruppe."
 
@@ -3704,42 +3683,40 @@ msgstr "Speichern"
 msgid "Save license settings"
 msgstr "Lizenz-Einstellungen speichern"
 
-#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
-#: actions/login.php:97 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
 msgid "Already logged in."
 msgstr "Bereits angemeldet."
 
-#: actions/login.php:142
+#: actions/login.php:148
 msgid "Incorrect username or password."
 msgstr "Falscher Benutzername oder Passwort."
 
-#. TRANS: Server error displayed when a user object could not be created trying to login using "one time password login".
-#: actions/login.php:148 actions/otp.php:127
+#: actions/login.php:154 actions/otp.php:120
 msgid "Error setting user. You are probably not authorized."
 msgstr ""
 "Fehler beim Setzen des Benutzers. Du bist vermutlich nicht autorisiert."
 
-#: actions/login.php:202 actions/login.php:253
+#: actions/login.php:210 actions/login.php:263
 msgid "Login"
 msgstr "Anmelden"
 
-#: actions/login.php:239
+#: actions/login.php:249
 msgid "Login to site"
 msgstr "An Seite anmelden"
 
-#: actions/login.php:248 actions/register.php:476
+#: actions/login.php:258 actions/register.php:490
 msgid "Remember me"
 msgstr "Anmeldedaten merken"
 
-#: actions/login.php:249 actions/register.php:478
+#: actions/login.php:259 actions/register.php:492
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "Automatisch anmelden; nicht bei gemeinsam genutzten PCs einsetzen!"
 
-#: actions/login.php:259
+#: actions/login.php:269
 msgid "Lost or forgotten password?"
 msgstr "Passwort vergessen?"
 
-#: actions/login.php:277
+#: actions/login.php:288
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -3747,11 +3724,11 @@ msgstr ""
 "Bitte gebe aus Sicherheitsgründen deinen Benutzernamen und dein Passwort "
 "ein, bevor die Änderungen an deinen Einstellungen übernommen werden."
 
-#: actions/login.php:281
+#: actions/login.php:292
 msgid "Login with your username and password."
 msgstr "Mit Benutzernamen und Passwort anmelden."
 
-#: actions/login.php:284
+#: actions/login.php:295
 #, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -3834,14 +3811,14 @@ msgid "New message"
 msgstr "Neue Nachricht"
 
 #. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
-#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:501
+#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:513
 msgid "You can't send a message to this user."
 msgstr "Du kannst diesem Benutzer keine Nachricht schicken."
 
 #. TRANS: Command exception text shown when trying to send a direct message to another user without content.
 #. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
-#: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:478
-#: lib/command.php:581
+#: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:490
+#: lib/command.php:593
 msgid "No content!"
 msgstr "Kein Inhalt!"
 
@@ -3850,7 +3827,7 @@ msgid "No recipient specified."
 msgstr "Kein Empfänger angegeben."
 
 #. TRANS: Error text shown when trying to send a direct message to self.
-#: actions/newmessage.php:167 lib/command.php:505
+#: actions/newmessage.php:167 lib/command.php:517
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
@@ -3862,7 +3839,7 @@ msgstr "Nachricht gesendet"
 
 #. TRANS: Message given have sent a direct message to another user.
 #. TRANS: %s is the name of the other user.
-#: actions/newmessage.php:188 lib/command.php:513
+#: actions/newmessage.php:188 lib/command.php:525
 #, php-format
 msgid "Direct message to %s sent."
 msgstr "Direkte Nachricht an %s abgeschickt"
@@ -3879,9 +3856,7 @@ msgstr "Neue Nachricht"
 msgid "Notice posted"
 msgstr "Nachricht hinzugefügt"
 
-#. TRANS: Instructions for Notice search page.
-#. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/noticesearch.php:69
+#: actions/noticesearch.php:68
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -3891,21 +3866,16 @@ msgstr ""
 "Suchbegriffe durch Leerzeichen. Ein Suchbegriff muss aus mindestens 3 "
 "Zeichen bestehen."
 
-#. TRANS: Title of the page where users can search for notices.
-#: actions/noticesearch.php:80
+#: actions/noticesearch.php:78
 msgid "Text search"
 msgstr "Volltextsuche"
 
-#. TRANS: Test in RSS notice search.
-#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearch.php:95
+#: actions/noticesearch.php:91
 #, php-format
 msgid "Search results for \"%1$s\" on %2$s"
 msgstr "Suchergebnisse für „%1$s“ auf %2$s"
 
-#. TRANS: Text for logged in users making a query for notices without results.
-#. TRANS: This message contains a Markdown link.
-#: actions/noticesearch.php:128
+#: actions/noticesearch.php:121
 #, php-format
 msgid ""
 "Be the first to [post on this topic](%%%%action.newnotice%%%%?"
@@ -3914,9 +3884,7 @@ msgstr ""
 "Sei der erste der [zu diesem Thema etwas schreibt](%%%%action.newnotice%%%%?"
 "status_textarea=%s)!"
 
-#. TRANS: Text for not logged in users making a query for notices without results.
-#. TRANS: This message contains Markdown links.
-#: actions/noticesearch.php:133
+#: actions/noticesearch.php:124
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and be the first to "
@@ -3926,17 +3894,14 @@ msgstr ""
 "bist der erste der [auf diese Nachricht antwortet](%%%%action.newnotice%%%%?"
 "status_textarea=%s)!"
 
-#. TRANS: RSS notice search feed title. %s is the query.
-#: actions/noticesearchrss.php:95
+#: actions/noticesearchrss.php:96
 #, php-format
 msgid "Updates with \"%s\""
 msgstr "Aktualisierungen mit „%s“"
 
-#. TRANS: RSS notice search feed description.
-#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearchrss.php:99
+#: actions/noticesearchrss.php:98
 #, fuzzy, php-format
-msgid "Updates matching search term \"%1$s\" on %2$s."
+msgid "Updates matching search term \"%1$s\" on %2$s!"
 msgstr "Alle Aktualisierungen, die den Suchbegriff „%s“ enthalten"
 
 #: actions/nudge.php:85
@@ -3977,31 +3942,31 @@ msgid "You have not registered any applications yet."
 msgstr "Du hast noch keine Programme registriert"
 
 #. TRANS: Title for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:70
+#: actions/oauthconnectionssettings.php:71
 msgid "Connected applications"
 msgstr "Verbundene Programme"
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:81
+#: actions/oauthconnectionssettings.php:83
 msgid "The following connections exist for your account."
 msgstr ""
 "Du hast den folgenden Programmen erlaubt, auf dein Benutzerkonto zuzugreifen."
 
 #. TRANS: Client error when trying to revoke access for an application while not being a user of it.
-#: actions/oauthconnectionssettings.php:166
+#: actions/oauthconnectionssettings.php:168
 msgid "You are not a user of that application."
 msgstr "Du bist kein Benutzer dieses Programms."
 
 #. TRANS: Client error when revoking access has failed for some reason.
 #. TRANS: %s is the application ID revoking access failed for.
-#: actions/oauthconnectionssettings.php:181
+#: actions/oauthconnectionssettings.php:183
 #, php-format
 msgid "Unable to revoke access for application: %s."
 msgstr "Kann Zugang dieses Programm nicht entfernen: %s."
 
 #. TRANS: Success message after revoking access for an application.
 #. TRANS: %1$s is the application name, %2$s is the first part of the user token.
-#: actions/oauthconnectionssettings.php:200
+#: actions/oauthconnectionssettings.php:202
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -4010,7 +3975,7 @@ msgstr ""
 "Sie haben den Zugang von %1$s und den Tokem mit %2$s erfolgreich entfernt."
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:211
+#: actions/oauthconnectionssettings.php:213
 msgid "You have not authorized any applications to use your account."
 msgstr ""
 "Du hast noch keinem Programm die Erlaubnis gegeben, dein Profil zu benutzen."
@@ -4018,7 +3983,7 @@ msgstr ""
 #. TRANS: Note for developers in the OAuth connection settings form.
 #. TRANS: This message contains a Markdown link. Do not separate "](".
 #. TRANS: %s is the URL to the OAuth settings.
-#: actions/oauthconnectionssettings.php:231
+#: actions/oauthconnectionssettings.php:233
 #, php-format
 msgid ""
 "Are you a developer? [Register an OAuth client application](%s) to use with "
@@ -4027,16 +3992,6 @@ msgstr ""
 "Sie sind Entwickler? [Registrieren einer OAuth-Client-Anwendung] (%s), um "
 "mit dieser Instanz von StatusNet zu verwenden."
 
-#: actions/oembed.php:64
-#, fuzzy, php-format
-msgid "\"%s\" not found."
-msgstr "API-Methode nicht gefunden."
-
-#: actions/oembed.php:76
-#, fuzzy, php-format
-msgid "Notice %s not found."
-msgstr "API-Methode nicht gefunden."
-
 #: actions/oembed.php:80 actions/shownotice.php:100
 msgid "Notice has no profile."
 msgstr "Nachricht hat kein Profil"
@@ -4046,16 +4001,6 @@ msgstr "Nachricht hat kein Profil"
 msgid "%1$s's status on %2$s"
 msgstr "Status von %1$s auf %2$s"
 
-#: actions/oembed.php:95
-#, fuzzy, php-format
-msgid "Attachment %s not found."
-msgstr "Empfänger nicht gefunden."
-
-#: actions/oembed.php:136
-#, php-format
-msgid "\"%s\" not supported for oembed requests."
-msgstr ""
-
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
 #: actions/oembed.php:168
 #, php-format
@@ -4074,12 +4019,11 @@ msgstr "Bitte nur %s URLs über einfaches HTTP."
 msgid "Not a supported data format."
 msgstr "Kein unterstütztes Datenformat."
 
-#. TRANS: ShortName in the OpenSearch interface when trying to find users.
 #: actions/opensearch.php:64
 msgid "People Search"
 msgstr "Suche nach Benutzern"
 
-#: actions/opensearch.php:68
+#: actions/opensearch.php:67
 msgid "Notice Search"
 msgstr "Nachrichtensuche"
 
@@ -4099,7 +4043,7 @@ msgstr "Verwalte zahlreiche andere Einstellungen."
 #. TRANS: here if it has one (most likely a single space).
 #: actions/othersettings.php:113
 msgid " (free service)"
-msgstr " (kostenloser Dienst)"
+msgstr " (freier Dienst)"
 
 #. TRANS: Label for dropdown with URL shortener services.
 #: actions/othersettings.php:122
@@ -4126,46 +4070,37 @@ msgstr "Profil-Designs anzeigen oder verstecken."
 msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr "URL-Auto-Kürzungs-Dienst ist zu lang (maximal 50 Zeichen)."
 
-#. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
-#: actions/otp.php:70
+#: actions/otp.php:69
 msgid "No user ID specified."
 msgstr "Keine Benutzer-ID angegeben"
 
-#. TRANS: Client error displayed trying to use "one time password login" without specifying a login token.
-#: actions/otp.php:86
+#: actions/otp.php:83
 msgid "No login token specified."
 msgstr "Kein Zugangstoken angegeben."
 
-#. TRANS: Client error displayed trying to use "one time password login" without requesting a login token.
-#: actions/otp.php:94
+#: actions/otp.php:90
 msgid "No login token requested."
 msgstr "Kein Login-Token angefordert."
 
-#. TRANS: Client error displayed trying to use "one time password login" while specifying an invalid login token.
-#: actions/otp.php:100
+#: actions/otp.php:95
 msgid "Invalid login token specified."
 msgstr "Login-Token ungültig oder abgelaufen."
 
-#. TRANS: Client error displayed trying to use "one time password login" while specifying an expired login token.
-#: actions/otp.php:110
+#: actions/otp.php:104
 msgid "Login token expired."
 msgstr "Zugangstoken ist abgelaufen."
 
-#. TRANS: Title for outbox for any but the fist page.
-#. TRANS: %1$s is the user nickname, %2$d is the page number.
-#: actions/outbox.php:57
+#: actions/outbox.php:58
 #, php-format
 msgid "Outbox for %1$s - page %2$d"
 msgstr "Postausgang für %1$s - Seite %2$d"
 
-#. TRANS: Title for first page of outbox.
 #: actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
 msgstr "Postausgang von %s"
 
-#. TRANS: Instructions for outbox.
-#: actions/outbox.php:103
+#: actions/outbox.php:104
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr ""
 "Das hier ist dein Postausgang, er beinhaltet deine gesendeten Nachrichten."
@@ -4192,43 +4127,43 @@ msgstr "Altes Passwort"
 msgid "New password"
 msgstr "Neues Passwort"
 
-#: actions/passwordsettings.php:109 actions/register.php:423
-msgid "6 or more characters."
+#: actions/passwordsettings.php:109
+#, fuzzy
+msgid "6 or more characters"
 msgstr "6 oder mehr Zeichen"
 
-#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:264
-#: actions/register.php:427
-msgid "Same as password above."
+#: actions/passwordsettings.php:113
+#, fuzzy
+msgid "Same as password above"
 msgstr "Gleiches Passwort wie zuvor"
 
 #: actions/passwordsettings.php:117
 msgid "Change"
 msgstr "Ändern"
 
-#: actions/passwordsettings.php:153 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:238
 msgid "Password must be 6 or more characters."
 msgstr "Das Passwort muss aus 6 oder mehr Zeichen bestehen."
 
-#: actions/passwordsettings.php:156 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:241
 msgid "Passwords don't match."
 msgstr "Passwörter stimmen nicht überein."
 
-#: actions/passwordsettings.php:164
+#: actions/passwordsettings.php:165
 msgid "Incorrect old password"
 msgstr "Altes Passwort falsch"
 
-#: actions/passwordsettings.php:180
+#: actions/passwordsettings.php:181
 msgid "Error saving user; invalid."
 msgstr "Fehler beim Speichern des Benutzers, ungültig."
 
-#. TRANS: Reset password form validation error message.
-#: actions/passwordsettings.php:185 actions/recoverpassword.php:418
+#: actions/passwordsettings.php:186
 #, fuzzy
-msgid "Cannot save new password."
+msgid "Can't save new password."
 msgstr "Konnte neues Passwort nicht speichern"
 
-#: actions/passwordsettings.php:191
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
 msgid "Password saved."
 msgstr "Passwort gespeichert."
 
@@ -4502,9 +4437,7 @@ msgstr "Server an den SSL Anfragen gerichtet werden sollen"
 msgid "Save paths"
 msgstr "Speicherpfade"
 
-#. TRANS: Instructions for the "People search" page.
-#. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/peoplesearch.php:54
+#: actions/peoplesearch.php:52
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
@@ -4514,8 +4447,7 @@ msgstr ""
 "Trenne mehrere Suchbegriffe durch Leerzeichen. Ein Suchbegriff muss aus "
 "mindestens 3 Zeichen bestehen."
 
-#. TRANS: Title of a page where users can search for other users.
-#: actions/peoplesearch.php:61
+#: actions/peoplesearch.php:58
 msgid "People search"
 msgstr "Suche nach anderen Benutzern"
 
@@ -4559,14 +4491,14 @@ msgid "Profile information"
 msgstr "Profilinformation"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109 actions/register.php:419
+#: actions/profilesettings.php:109 actions/register.php:433
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr "1-64 Kleinbuchstaben oder Zahlen, keine Satz- oder Leerzeichen."
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for full group name (dt). Text hidden by default.
 #. TRANS: DT for full name in a profile.
-#: actions/profilesettings.php:113 actions/register.php:441
+#: actions/profilesettings.php:113 actions/register.php:455
 #: actions/showgroup.php:255 actions/tagother.php:104
 #: lib/groupeditform.php:150 lib/userprofile.php:156
 msgid "Full name"
@@ -4574,13 +4506,13 @@ msgstr "Bürgerlicher Name"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:118 actions/register.php:446
+#: actions/profilesettings.php:118 actions/register.php:460
 #: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "Homepage"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:121 actions/register.php:448
+#: actions/profilesettings.php:121
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr ""
 "URL deiner Homepage, deines Blogs, oder deines Profils auf einer anderen "
@@ -4589,7 +4521,7 @@ msgstr ""
 #. TRANS: Tooltip for field label in form for profile settings. Plural
 #. TRANS: is decided by the number of characters available for the
 #. TRANS: biography (%d).
-#: actions/profilesettings.php:129 actions/register.php:457
+#: actions/profilesettings.php:129 actions/register.php:471
 #, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4597,29 +4529,28 @@ msgstr[0] "Beschreibe dich selbst und deine Interessen in einem Zeichen"
 msgstr[1] "Beschreibe dich selbst und deine Interessen in %d Zeichen"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:135 actions/register.php:462
+#: actions/profilesettings.php:135 actions/register.php:476
 msgid "Describe yourself and your interests"
 msgstr "Beschreibe dich selbst und deine Interessen"
 
 #. TRANS: Text area label in form for profile settings where users can provide.
 #. TRANS: their biography.
-#: actions/profilesettings.php:139 actions/register.php:464
+#: actions/profilesettings.php:139 actions/register.php:478
 msgid "Bio"
 msgstr "Biografie"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group location (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT for location in a profile.
-#: actions/profilesettings.php:145 actions/register.php:469
+#: actions/profilesettings.php:145 actions/register.php:483
 #: actions/showgroup.php:265 actions/tagother.php:112
-#: actions/userauthorization.php:174 lib/groupeditform.php:173
+#: actions/userauthorization.php:166 lib/groupeditform.php:173
 #: lib/userprofile.php:172
 msgid "Location"
 msgstr "Aufenthaltsort"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148
+#: actions/profilesettings.php:148 actions/register.php:485
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Wo du bist, beispielsweise „Stadt, Region, Land“"
 
@@ -4640,8 +4571,7 @@ msgstr "Tags"
 #: actions/profilesettings.php:164
 #, fuzzy
 msgid ""
-"Tags for yourself (letters, numbers, -, ., and _), comma- or space- "
-"separated."
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr ""
 "Tags über dich selbst (Buchstaben, Zahlen, -, ., und _) durch Kommas oder "
 "Leerzeichen getrennt"
@@ -4654,7 +4584,7 @@ msgstr "Sprache"
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
 #: actions/profilesettings.php:171
 #, fuzzy
-msgid "Preferred language."
+msgid "Preferred language"
 msgstr "Bevorzugte Sprache"
 
 #. TRANS: Dropdownlist label in form for profile settings.
@@ -4671,7 +4601,7 @@ msgstr "In welcher Zeitzone befindest du dich üblicherweise?"
 #: actions/profilesettings.php:189
 #, fuzzy
 msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)."
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr ""
 "Abonniere automatisch alle Kontakte, die mich abonnieren (sinnvoll für Nicht-"
 "Menschen)"
@@ -4679,7 +4609,7 @@ msgstr ""
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Plural form is used based on the maximum number of allowed
 #. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:258 actions/register.php:221
+#: actions/profilesettings.php:258 actions/register.php:229
 #, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4698,9 +4628,9 @@ msgstr "Die eingegebene Sprache ist zu lang (maximal 50 Zeichen)."
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:291
-#, fuzzy, php-format
-msgid "Invalid tag: \"%s\"."
+#: actions/profilesettings.php:291 actions/tagother.php:178
+#, php-format
+msgid "Invalid tag: \"%s\""
 msgstr "Ungültiges Stichwort: „%s“"
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
@@ -4810,12 +4740,6 @@ msgstr ""
 "Mikroblogging)-Dienst basierend auf der freien Software [StatusNet](http://"
 "status.net/)."
 
-#. TRANS: Public RSS feed description. %s is the StatusNet site name.
-#: actions/publicrss.php:106
-#, fuzzy, php-format
-msgid "%s updates from everyone."
-msgstr "%s Nachrichten von allen!"
-
 #. TRANS: Title for public tag cloud.
 #: actions/publictagcloud.php:57
 msgid "Public tag cloud"
@@ -4953,12 +4877,6 @@ msgstr "Stelle Passwort wieder her"
 msgid "Password recovery requested"
 msgstr "Wiederherstellung des Passworts angefordert"
 
-#. TRANS: Title for password recovery page in password saved mode.
-#: actions/recoverpassword.php:229
-#, fuzzy
-msgid "Password saved"
-msgstr "Passwort gespeichert."
-
 #. TRANS: Title for password recovery page when an unknown action has been specified.
 #: actions/recoverpassword.php:232
 msgid "Unknown action"
@@ -4970,6 +4888,11 @@ msgstr "Unbekannter Befehl"
 msgid "6 or more characters, and do not forget it!"
 msgstr "6 oder mehr Zeichen, und nicht vergessen!"
 
+#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#: actions/recoverpassword.php:264 actions/register.php:441
+msgid "Same as password above."
+msgstr "Gleiches Passwort wie zuvor"
+
 #. TRANS: Button text for password reset form.
 #. TRANS: Button text on profile design page to reset all colour settings to default without saving.
 #: actions/recoverpassword.php:268 lib/designsettings.php:264
@@ -5021,8 +4944,14 @@ msgstr "Passwort muss mehr als 6 Zeichen enthalten."
 msgid "Password and confirmation do not match."
 msgstr "Passwort und seine Bestätigung stimmen nicht überein."
 
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:418
+#, fuzzy
+msgid "Cannot save new password."
+msgstr "Konnte neues Passwort nicht speichern"
+
 #. TRANS: Server error displayed when something does wrong with the user object during password reset.
-#: actions/recoverpassword.php:426 actions/register.php:248
+#: actions/recoverpassword.php:426 actions/register.php:256
 msgid "Error setting user."
 msgstr "Fehler bei den Benutzereinstellungen."
 
@@ -5031,96 +4960,102 @@ msgstr "Fehler bei den Benutzereinstellungen."
 msgid "New password successfully saved. You are now logged in."
 msgstr "Neues Passwort erfolgreich gespeichert. Du bist jetzt angemeldet."
 
-#: actions/register.php:87 actions/register.php:188 actions/register.php:399
+#: actions/register.php:92 actions/register.php:196 actions/register.php:413
 msgid "Sorry, only invited people can register."
 msgstr "Es tut uns leid, zum Registrieren benötigst du eine Einladung."
 
-#: actions/register.php:94
+#: actions/register.php:99
 msgid "Sorry, invalid invitation code."
 msgstr "Entschuldigung, ungültiger Einladungscode."
 
-#: actions/register.php:113
+#: actions/register.php:119
 msgid "Registration successful"
 msgstr "Registrierung erfolgreich"
 
-#: actions/register.php:115 actions/register.php:497
+#: actions/register.php:121 actions/register.php:511
 msgid "Register"
 msgstr "Registrieren"
 
-#: actions/register.php:135
+#: actions/register.php:142
 msgid "Registration not allowed."
 msgstr "Registrierung nicht erlaubt."
 
-#: actions/register.php:201
+#: actions/register.php:209
 #, fuzzy
-msgid "You cannot register if you don't agree to the license."
+msgid "You can't register if you don't agree to the license."
 msgstr ""
 "Du kannst dich nicht registrieren, wenn du die Lizenz nicht akzeptierst."
 
-#: actions/register.php:210
+#: actions/register.php:218
 msgid "Email address already exists."
 msgstr "Diese E-Mail-Adresse existiert bereits."
 
-#: actions/register.php:243 actions/register.php:265
+#: actions/register.php:251 actions/register.php:273
 msgid "Invalid username or password."
 msgstr "Benutzername oder Passwort falsch."
 
-#: actions/register.php:340
+#: actions/register.php:351
 #, fuzzy
 msgid ""
 "With this form you can create a new account. You can then post notices and "
-"link up to friends and colleagues."
+"link up to friends and colleagues. "
 msgstr ""
 "Hier kannst du einen neuen Zugang einrichten. Anschließend kannst du "
 "Nachrichten und Links mit deinen Freunden und Kollegen teilen. "
 
+#: actions/register.php:437
+msgid "6 or more characters."
+msgstr "6 oder mehr Zeichen"
+
 #. TRANS: Link description in user account settings menu.
-#: actions/register.php:431 actions/register.php:435
+#: actions/register.php:445 actions/register.php:449
 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
 msgid "Email"
 msgstr "E-Mail"
 
-#: actions/register.php:432 actions/register.php:436
+#: actions/register.php:446 actions/register.php:450
 #, fuzzy
-msgid "Used only for updates, announcements, and password recovery."
+msgid "Used only for updates, announcements, and password recovery"
 msgstr ""
 "Wird nur für Updates, wichtige Mitteilungen und zur "
 "Passwortwiederherstellung verwendet"
 
-#: actions/register.php:443
+#: actions/register.php:457
 #, fuzzy
-msgid "Longer name, preferably your \"real\" name."
+msgid "Longer name, preferably your \"real\" name"
 msgstr "Längerer Name, bevorzugt dein bürgerlicher Name"
 
-#: actions/register.php:471
+#: actions/register.php:462
 #, fuzzy
-msgid "Where you are, like \"City, State (or Region), Country\"."
-msgstr "Wo du bist, beispielsweise „Stadt, Region, Land“"
+msgid "URL of your homepage, blog, or profile on another site"
+msgstr ""
+"URL deiner Homepage, deines Blogs, oder deines Profils auf einer anderen "
+"Website."
 
-#: actions/register.php:510
+#: actions/register.php:523
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
 msgstr ""
 "Mir ist bewusst, dass Inhalte und Daten von %1$s privat und vertraulich sind."
 
-#: actions/register.php:520
+#: actions/register.php:533
 #, php-format
 msgid "My text and files are copyright by %1$s."
 msgstr "Meine Texte und Dateien sind urheberrechtlich geschützt durch %1$s."
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:524
+#: actions/register.php:537
 msgid "My text and files remain under my own copyright."
 msgstr "Meine Texte und Dateien verbleiben unter meinem eigenen Urheberrecht."
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:527
+#: actions/register.php:540
 msgid "All rights reserved."
 msgstr "Alle Rechte vorbehalten."
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:532
+#: actions/register.php:545
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -5129,7 +5064,7 @@ msgstr ""
 "Abgesehen von den folgenden Daten: Passwort, E-Mail-Adresse, IM-Adresse und "
 "Telefonnummer, sind all meine Texte und Dateien unter %s verfügbar."
 
-#: actions/register.php:573
+#: actions/register.php:588
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -5162,7 +5097,7 @@ msgstr ""
 "\n"
 "Danke für deine Anmeldung, wir hoffen, dass dir der Service gefällt."
 
-#: actions/register.php:597
+#: actions/register.php:612
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5196,7 +5131,7 @@ msgstr "Benutzername"
 
 #: actions/remotesubscribe.php:129
 #, fuzzy
-msgid "Nickname of the user you want to follow."
+msgid "Nickname of the user you want to follow"
 msgstr "Name des Benutzers, dem du folgen möchtest"
 
 #: actions/remotesubscribe.php:132
@@ -5205,7 +5140,7 @@ msgstr "Profil-URL"
 
 #: actions/remotesubscribe.php:133
 #, fuzzy
-msgid "URL of your profile on another compatible microblogging service."
+msgid "URL of your profile on another compatible microblogging service"
 msgstr "Profil-URL bei einem anderen kompatiblen Mikrobloggingdienst"
 
 #. TRANS: Link text for link that will subscribe to a remote profile.
@@ -5216,7 +5151,7 @@ msgstr "Abonnieren"
 
 #: actions/remotesubscribe.php:158
 #, fuzzy
-msgid "Invalid profile URL (bad format)."
+msgid "Invalid profile URL (bad format)"
 msgstr "Ungültige Profil-URL (falsches Format)"
 
 #: actions/remotesubscribe.php:167
@@ -5259,7 +5194,6 @@ msgstr "Wiederholt"
 msgid "Repeated!"
 msgstr "Wiederholt!"
 
-#. TRANS: RSS reply feed title. %s is a user nickname.
 #. TRANS: Tooltip for personal group navigation menu option when logged in for viewing @-replies.
 #: actions/replies.php:126 actions/repliesrss.php:68
 #: lib/personalgroupnav.php:109
@@ -5314,11 +5248,9 @@ msgstr ""
 "Du kannst versuchen [%1$s einen Stups zu geben](../%s) oder [ihm etwas "
 "posten](%%%%action.newnotice%%%%?status_textarea=%s)."
 
-#. TRANS: RSS reply feed description.
-#. TRANS: %1$s is a user nickname, %2$s is the StatusNet site name.
-#: actions/repliesrss.php:74
+#: actions/repliesrss.php:72
 #, fuzzy, php-format
-msgid "Replies to %1$s on %2$s."
+msgid "Replies to %1$s on %2$s!"
 msgstr "Antworten an %1$s auf %2$s!"
 
 #. TRANS: Client exception displayed when trying to restore an account while not logged in.
@@ -5421,7 +5353,7 @@ msgstr "Du kannst die Rollen von Benutzern dieser Seite nicht widerrufen."
 msgid "User doesn't have this role."
 msgstr "Benutzer verfügt nicht über diese Rolle."
 
-#: actions/rsd.php:142 actions/version.php:159
+#: actions/rsd.php:146 actions/version.php:159
 msgid "StatusNet"
 msgstr "StatusNet"
 
@@ -5463,87 +5395,87 @@ msgstr "Fehleruntersuchung für Sitzungen aktivieren"
 msgid "Save site settings"
 msgstr "Website-Einstellungen speichern"
 
-#: actions/showapplication.php:78
+#: actions/showapplication.php:82
 msgid "You must be logged in to view an application."
 msgstr "Du musst angemeldet sein, um dieses Programm zu betrachten."
 
-#: actions/showapplication.php:151
+#: actions/showapplication.php:157
 msgid "Application profile"
 msgstr "Anwendungsprofil"
 
 #. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:153 lib/applicationeditform.php:177
+#: actions/showapplication.php:159 lib/applicationeditform.php:177
 msgid "Icon"
 msgstr "Symbol"
 
 #. TRANS: Form input field label for application name.
-#: actions/showapplication.php:163 actions/version.php:197
+#: actions/showapplication.php:169 actions/version.php:197
 #: lib/applicationeditform.php:190
 msgid "Name"
 msgstr "Name"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:172 lib/applicationeditform.php:227
+#: actions/showapplication.php:178 lib/applicationeditform.php:227
 msgid "Organization"
 msgstr "Organisation"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:181 actions/version.php:200
+#: actions/showapplication.php:187 actions/version.php:200
 #: lib/applicationeditform.php:208 lib/groupeditform.php:168
 msgid "Description"
 msgstr "Beschreibung"
 
 #. TRANS: Header for group statistics on a group page (h2).
 #. TRANS: H2 text for user statistics.
-#: actions/showapplication.php:186 actions/showgroup.php:460
+#: actions/showapplication.php:192 actions/showgroup.php:460
 #: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "Statistik"
 
-#: actions/showapplication.php:197
+#: actions/showapplication.php:203
 #, php-format
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr "Erstellt von %1$s - %2$s Standard Zugang - %3$d Benutzer"
 
-#: actions/showapplication.php:207
+#: actions/showapplication.php:213
 msgid "Application actions"
 msgstr "Programmaktionen"
 
-#: actions/showapplication.php:230
+#: actions/showapplication.php:236
 msgid "Reset key & secret"
 msgstr "Schlüssel zurücksetzen"
 
 #. TRANS: Title of form for deleting a user.
-#: actions/showapplication.php:246 lib/deletegroupform.php:121
+#: actions/showapplication.php:252 lib/deletegroupform.php:121
 #: lib/deleteuserform.php:64 lib/noticelist.php:673
 msgid "Delete"
 msgstr "Löschen"
 
-#: actions/showapplication.php:255
+#: actions/showapplication.php:261
 msgid "Application info"
 msgstr "Programminformation"
 
-#: actions/showapplication.php:257
+#: actions/showapplication.php:263
 msgid "Consumer key"
 msgstr "Anwender-Schlüssel"
 
-#: actions/showapplication.php:262
+#: actions/showapplication.php:268
 msgid "Consumer secret"
 msgstr "Anwender-Geheimnis"
 
-#: actions/showapplication.php:267
+#: actions/showapplication.php:273
 msgid "Request token URL"
 msgstr "Anfrage-Token Adresse"
 
-#: actions/showapplication.php:272
+#: actions/showapplication.php:278
 msgid "Access token URL"
 msgstr "Zugriffs-Token-Adresse"
 
-#: actions/showapplication.php:277
+#: actions/showapplication.php:283
 msgid "Authorize URL"
 msgstr "Autorisationadresse"
 
-#: actions/showapplication.php:282
+#: actions/showapplication.php:288
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
@@ -5551,7 +5483,7 @@ msgstr ""
 "Hinweis: Wir unterstützen HMAC-SHA1-Signaturen. Wir unterstützen keine "
 "Klartext-Signaturen."
 
-#: actions/showapplication.php:302
+#: actions/showapplication.php:309
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr "Bist du sicher, dass du den Schlüssel zurücksetzen willst?"
 
@@ -5644,18 +5576,16 @@ msgid "Group profile"
 msgstr "Gruppenprofil"
 
 #. TRANS: Label for group URL (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT for URL in a profile.
 #: actions/showgroup.php:273 actions/tagother.php:118
-#: actions/userauthorization.php:184 lib/userprofile.php:186
+#: actions/userauthorization.php:175 lib/userprofile.php:186
 msgid "URL"
 msgstr "URL"
 
 #. TRANS: Label for group description or group note (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page where bio is displayed.
 #. TRANS: DT for note in a profile.
 #: actions/showgroup.php:285 actions/tagother.php:128
-#: actions/userauthorization.php:197 lib/userprofile.php:204
+#: actions/userauthorization.php:187 lib/userprofile.php:204
 msgid "Note"
 msgstr "Nachricht"
 
@@ -5800,7 +5730,7 @@ msgid "%1$s tagged %2$s"
 msgstr "Von „%1$s“ mit „%2$s“ getaggte Nachrichten"
 
 #. TRANS: Page title showing tagged notices in one user's stream.
-#. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
+#. TRANS: %1$s is the username, %2$s is the hash tag, %1$d is the page number.
 #: actions/showstream.php:74
 #, php-format
 msgid "%1$s tagged %2$s, page %3$d"
@@ -6052,7 +5982,7 @@ msgstr "Systembenachrichtigung (maximal 255 Zeichen; HTML erlaubt)"
 #. TRANS: Title for button to save site notice in admin panel.
 #: actions/sitenoticeadminpanel.php:201
 #, fuzzy
-msgid "Save site notice."
+msgid "Save site notice"
 msgstr "Systemnachricht speichern"
 
 #. TRANS: Title for SMS settings.
@@ -6111,7 +6041,7 @@ msgstr "SMS-Telefonnummer"
 #. TRANS: SMS phone number input field instructions in SMS settings form.
 #: actions/smssettings.php:152
 #, fuzzy
-msgid "Phone number, no punctuation or spaces, with area code."
+msgid "Phone number, no punctuation or spaces, with area code"
 msgstr "Telefonnummer, keine Sonder- oder Leerzeichen mit Vorwahl"
 
 #. TRANS: Form legend for SMS preferences form.
@@ -6281,19 +6211,15 @@ msgstr "Du hast dieses Profil nicht abonniert."
 msgid "Could not save subscription."
 msgstr "Konnte Abonnement nicht erstellen."
 
-#. TRANS: Client error displayed trying to perform any request method other than POST.
-#. TRANS: Do not translate POST.
 #: actions/subscribe.php:77
 msgid "This action only accepts POST requests."
 msgstr "Diese Aktion nimmt nur POST-Requests"
 
-#. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
-#: actions/subscribe.php:121
+#: actions/subscribe.php:117
 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
 msgstr "Du hast dieses OMB 0.1 Profil nicht abonniert."
 
-#. TRANS: Page title when subscription succeeded.
-#: actions/subscribe.php:149
+#: actions/subscribe.php:145
 msgid "Subscribed"
 msgstr "Abonniert"
 
@@ -6452,9 +6378,8 @@ msgstr "Tag „%s“"
 msgid "User profile"
 msgstr "Benutzerprofil"
 
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT element in area for user avatar.
-#: actions/tagother.php:81 actions/userauthorization.php:138
+#: actions/tagother.php:81 actions/userauthorization.php:132
 #: lib/userprofile.php:108
 msgid "Photo"
 msgstr "Foto"
@@ -6471,11 +6396,6 @@ msgstr ""
 "Tags dieses Benutzers (Buchstaben, Nummer, -, ., und _), durch Komma oder "
 "Leerzeichen getrennt"
 
-#: actions/tagother.php:178
-#, php-format
-msgid "Invalid tag: \"%s\""
-msgstr "Ungültiges Stichwort: „%s“"
-
 #: actions/tagother.php:193
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
@@ -6493,7 +6413,6 @@ msgstr ""
 msgid "No such tag."
 msgstr "Tag nicht vorhanden."
 
-#. TRANS: Client error displayed when trying to unblock a non-blocked user.
 #: actions/unblock.php:59
 msgid "You haven't blocked that user."
 msgstr "Du hast diesen Benutzer nicht blockiert."
@@ -6514,7 +6433,7 @@ msgstr "Keine Profil-ID in der Anfrage."
 msgid "Unsubscribed"
 msgstr "Abbestellt"
 
-#: actions/updateprofile.php:64
+#: actions/updateprofile.php:64 actions/userauthorization.php:337
 #, php-format
 msgid ""
 "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
@@ -6547,7 +6466,7 @@ msgstr "Willkommens-Nachricht ungültig. Maximale Länge sind 255 Zeichen."
 #. TRANS: users in user admin panel. %1$s is the invalid nickname.
 #: actions/useradminpanel.php:166
 #, fuzzy, php-format
-msgid "Invalid default subscripton: \"%1$s\" is not a user."
+msgid "Invalid default subscripton: '%1$s' is not a user."
 msgstr "Ungültiges Standard-Abonnement: „%1$s“ ist kein Benutzer."
 
 #. TRANS: Link description in user account settings menu.
@@ -6608,70 +6527,59 @@ msgstr "Ist es Benutzern erlaubt, neue Benutzer einzuladen."
 #. TRANS: Title for button to save user settings in user admin panel.
 #: actions/useradminpanel.php:302
 #, fuzzy
-msgid "Save user settings."
+msgid "Save user settings"
 msgstr "Benutzer-Einstellungen speichern"
 
-#. TRANS: Page title.
-#: actions/userauthorization.php:109
+#: actions/userauthorization.php:105
 msgid "Authorize subscription"
 msgstr "Abonnement bestätigen"
 
-#. TRANS: Page notice on "Auhtorize subscription" page.
-#: actions/userauthorization.php:115
+#: actions/userauthorization.php:110
 #, fuzzy
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
 "user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
-"click \"Reject\"."
+"click “Reject”."
 msgstr ""
 "Bitte überprüfe diese Angaben, um sicher zu gehen, dass du die Nachrichten "
 "dieses Benutzers abonnieren möchtest. Wenn du das nicht wolltest, klicke auf "
 "„Abbrechen“."
 
-#. TRANS: DT element on Authorise Subscription page where license is displayed.
 #. TRANS: Menu item for site administration
-#: actions/userauthorization.php:207 actions/version.php:167
+#: actions/userauthorization.php:196 actions/version.php:167
 #: lib/adminpanelaction.php:403
 msgid "License"
 msgstr "Lizenz"
 
-#. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:229
+#: actions/userauthorization.php:217
 #, fuzzy
-msgctxt "BUTTON"
 msgid "Accept"
 msgstr "Akzeptieren"
 
-#. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:231
-#, fuzzy
-msgid "Subscribe to this user."
+#: actions/userauthorization.php:218 lib/subscribeform.php:115
+#: lib/subscribeform.php:139
+msgid "Subscribe to this user"
 msgstr "Abonniere diesen Benutzer"
 
-#. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:233
+#: actions/userauthorization.php:219
 #, fuzzy
-msgctxt "BUTTON"
 msgid "Reject"
 msgstr "Ablehnen"
 
-#. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:235
+#: actions/userauthorization.php:220
 #, fuzzy
-msgid "Reject this subscription."
+msgid "Reject this subscription"
 msgstr "Abonnement ablehnen"
 
-#. TRANS: Client error displayed for an empty authorisation request.
-#: actions/userauthorization.php:248
+#: actions/userauthorization.php:232
 msgid "No authorization request!"
 msgstr "Keine Bestätigungsanfrage!"
 
-#. TRANS: Accept message header from Authorise subscription page.
-#: actions/userauthorization.php:271
+#: actions/userauthorization.php:254
 msgid "Subscription authorized"
 msgstr "Abonnement autorisiert"
 
-#: actions/userauthorization.php:274
+#: actions/userauthorization.php:256
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to authorize the "
@@ -6681,12 +6589,11 @@ msgstr ""
 "Lies nochmal die Anweisungen auf der Seite wie Abonnements bestätigt werden. "
 "Dein Abonnement-Token ist:"
 
-#. TRANS: Reject message header from Authorise subscription page.
-#: actions/userauthorization.php:285
+#: actions/userauthorization.php:266
 msgid "Subscription rejected"
 msgstr "Abonnement abgelehnt"
 
-#: actions/userauthorization.php:288
+#: actions/userauthorization.php:268
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to fully reject the "
@@ -6696,64 +6603,39 @@ msgstr ""
 "zurückgegeben. Lies nochmal die Anweisungen der Seite, wie Abonnements "
 "vollständig abgelehnt werden. Dein Abonnement-Token ist:"
 
-#. TRANS: Exception thrown when no valid user is found for an authorisation request.
-#. TRANS: %s is a listener URI.
-#: actions/userauthorization.php:325
+#: actions/userauthorization.php:303
 #, fuzzy, php-format
-msgid "Listener URI \"%s\" not found here."
+msgid "Listener URI ‘%s’ not found here."
 msgstr "Eine Listener-URI „%s“ wurde hier nicht gefunden."
 
-#. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:332
+#: actions/userauthorization.php:308
 #, fuzzy, php-format
-msgid "Listenee URI \"%s\" is too long."
+msgid "Listenee URI ‘%s’ is too long."
 msgstr "Die URI „%s“ für den Stream ist zu lang."
 
-#. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:340
+#: actions/userauthorization.php:314
 #, fuzzy, php-format
-msgid "Listenee URI \"%s\" is a local user."
+msgid "Listenee URI ‘%s’ is a local user."
 msgstr "Die URI „%s“ für den Stream ist ein lokaler Benutzer."
 
-#. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
-#. TRANS: %s is a profile URL.
-#: actions/userauthorization.php:358
+#: actions/userauthorization.php:329
 #, fuzzy, php-format
-msgid "Profile URL \"%s\" is for a local user."
+msgid "Profile URL ‘%s’ is for a local user."
 msgstr "Profiladresse „%s“ ist für einen lokalen Benutzer."
 
-#. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
-#. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
-#: actions/userauthorization.php:368
+#: actions/userauthorization.php:345
 #, fuzzy, php-format
-msgid ""
-"Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
-"\"."
-msgstr ""
-"Die Benutzerlizenz „%1$s“ ist nicht kompatibel mit der Lizenz der Seite „%2"
-"$s“."
-
-#. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:378
-#, fuzzy, php-format
-msgid "Avatar URL \"%s\" is not valid."
+msgid "Avatar URL ‘%s’ is not valid."
 msgstr "Avataradresse „%s“ ist nicht gültig."
 
-#. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:385
+#: actions/userauthorization.php:350
 #, fuzzy, php-format
-msgid "Cannot read avatar URL \"%s\"."
+msgid "Can’t read avatar URL ‘%s’."
 msgstr "Konnte Avatar-URL nicht öffnen „%s“"
 
-#. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:392
+#: actions/userauthorization.php:355
 #, fuzzy, php-format
-msgid "Wrong image type for avatar URL \"%s\"."
+msgid "Wrong image type for avatar URL ‘%s’."
 msgstr "Falscher Bildtyp für „%s“"
 
 #. TRANS: Page title for profile design page.
@@ -6862,7 +6744,7 @@ msgid "Plugins"
 msgstr "Erweiterungen"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:898
+#: actions/version.php:198 lib/action.php:901
 msgid "Version"
 msgstr "Version"
 
@@ -7079,14 +6961,14 @@ msgstr "Problem bei Speichern der Nachricht."
 
 #. TRANS: Server exception thrown when a reply cannot be saved.
 #. TRANS: %1$d is a notice ID, %2$d is the ID of the mentioned user.
-#: classes/Notice.php:1142
+#: classes/Notice.php:1144
 #, php-format
 msgid "Could not save reply for %1$d, %2$d."
 msgstr "Konnte Antwort auf %1$d, %2$d nicht speichern."
 
 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1661
+#: classes/Notice.php:1663
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
@@ -7100,7 +6982,7 @@ msgstr "%1$s (%2$s)"
 
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:775
+#: classes/Profile.php:779
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
@@ -7109,7 +6991,7 @@ msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:784
+#: classes/Profile.php:788
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -7428,53 +7310,53 @@ msgid "Page notice"
 msgstr "Neue Nachricht"
 
 #. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:871
+#: lib/action.php:874
 msgid "Secondary site navigation"
 msgstr "Unternavigation"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:877
+#: lib/action.php:880
 msgid "Help"
 msgstr "Hilfe"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:880
+#: lib/action.php:883
 msgid "About"
 msgstr "Über"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:883
+#: lib/action.php:886
 msgid "FAQ"
 msgstr "FAQ"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:888
+#: lib/action.php:891
 msgid "TOS"
 msgstr "AGB"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:892
+#: lib/action.php:895
 msgid "Privacy"
 msgstr "Privatsphäre"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:895
+#: lib/action.php:898
 msgid "Source"
 msgstr "Quellcode"
 
 #. TRANS: Secondary navigation menu option leading to e-mail contact information on the
 #. TRANS: StatusNet site, where to report bugs, ...
-#: lib/action.php:902
+#: lib/action.php:905
 msgid "Contact"
 msgstr "Kontakt"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:905
+#: lib/action.php:908
 msgid "Badge"
 msgstr "Plakette"
 
 #. TRANS: DT element for StatusNet software license.
-#: lib/action.php:934
+#: lib/action.php:937
 msgid "StatusNet software license"
 msgstr "StatusNet-Software-Lizenz"
 
@@ -7482,7 +7364,7 @@ msgstr "StatusNet-Software-Lizenz"
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:941
+#: lib/action.php:944
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7492,7 +7374,7 @@ msgstr ""
 "site.broughtbyurl%%)."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:944
+#: lib/action.php:947
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** ist ein Mikrobloggingdienst."
@@ -7501,7 +7383,7 @@ msgstr "**%%site.name%%** ist ein Mikrobloggingdienst."
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:951
+#: lib/action.php:954
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7513,20 +7395,20 @@ msgstr ""
 "(http://www.fsf.org/licensing/licenses/agpl-3.0.html) erhältlich ist."
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:967
+#: lib/action.php:970
 msgid "Site content license"
 msgstr "StatusNet-Software-Lizenz"
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:974
+#: lib/action.php:977
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr "Inhalte und Daten von %1$s sind privat und vertraulich."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:981
+#: lib/action.php:984
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
@@ -7534,7 +7416,7 @@ msgstr ""
 "vorbehalten."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:985
+#: lib/action.php:988
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 "Urheberrecht von Inhalt und Daten liegt bei den Beteiligten. Alle Rechte "
@@ -7542,25 +7424,25 @@ msgstr ""
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:1017
+#: lib/action.php:1020
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr "Alle Inhalte und Daten von %1$s sind unter der %2$s Lizenz verfügbar."
 
 #. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1353
+#: lib/action.php:1356
 msgid "Pagination"
 msgstr "Seitenerstellung"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1364
+#: lib/action.php:1367
 msgid "After"
 msgstr "Später"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1374
+#: lib/action.php:1377
 msgid "Before"
 msgstr "Vorher"
 
@@ -7758,23 +7640,19 @@ msgstr "API-Ressource erfordert lesen/schreib Zugriff; du hast nur Leserechte."
 msgid "No application for that consumer key."
 msgstr "Kein Programm mit diesem Anwender-Schlüssel."
 
-#: lib/apiauth.php:202 lib/apiauth.php:284
-msgid "Not allowed to use API."
-msgstr ""
-
 #. TRANS: OAuth exception given when an incorrect access token was given for a user.
-#: lib/apiauth.php:225
+#: lib/apiauth.php:219
 msgid "Bad access token."
 msgstr "Schlechter Zugangstoken."
 
 #. TRANS: OAuth exception given when no user was found for a given token (no token was found).
-#: lib/apiauth.php:230
+#: lib/apiauth.php:224
 msgid "No user for that token."
 msgstr "Kein Benutzer mit diesem Token."
 
 #. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel".
 #. TRANS: Client error thrown when authentication fails.
-#: lib/apiauth.php:272 lib/apiauth.php:302
+#: lib/apiauth.php:266 lib/apiauth.php:293
 msgid "Could not authenticate you."
 msgstr "Konnte dich nicht authentifizieren."
 
@@ -7979,11 +7857,6 @@ msgstr "Passwort kann nicht geändert werden."
 msgid "Block"
 msgstr "Blockieren"
 
-#. TRANS: Description of the form to block a user.
-#: lib/blockform.php:79
-msgid "Block this user"
-msgstr "Diesen Benutzer blockieren"
-
 #. TRANS: Title for command results.
 #: lib/channel.php:160 lib/channel.php:181
 msgid "Command results"
@@ -8011,7 +7884,7 @@ msgstr "Nachricht mit dieser ID existiert nicht."
 
 #. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
 #. TRANS: Error text shown when a last user notice is requested and it does not exist.
-#: lib/command.php:99 lib/command.php:630
+#: lib/command.php:99 lib/command.php:642
 msgid "User has no last notice."
 msgstr "Benutzer hat keine letzte Nachricht."
 
@@ -8061,35 +7934,41 @@ msgstr ""
 "Abonnenten: %2$s\n"
 "Mitteilungen: %3$s"
 
+#. TRANS: Error message text shown when a favorite could not be set because it has already been favorited.
+#: lib/command.php:298
+#, fuzzy
+msgid "Could not create favorite: already favorited."
+msgstr "Konnte keinen Favoriten erstellen."
+
 #. TRANS: Text shown when a notice has been marked as favourite successfully.
-#: lib/command.php:312
+#: lib/command.php:324
 msgid "Notice marked as fave."
 msgstr "Nachricht als Favorit markiert."
 
 #. TRANS: Message given having added a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:357
+#: lib/command.php:369
 #, php-format
 msgid "%1$s joined group %2$s."
 msgstr "%1$s ist der Gruppe „%2$s“ beigetreten."
 
 #. TRANS: Message given having removed a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:405
+#: lib/command.php:417
 #, php-format
 msgid "%1$s left group %2$s."
 msgstr "%1$s hat die Gruppe „%2$s“ verlassen."
 
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: lib/command.php:426
+#: lib/command.php:438
 #, php-format
 msgctxt "WHOIS"
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
 
 #. TRANS: Whois output. %s is the full name of the queried user.
-#: lib/command.php:430
+#: lib/command.php:442
 #, php-format
 msgid "Fullname: %s"
 msgstr "Bürgerlicher Name: %s"
@@ -8097,7 +7976,7 @@ msgstr "Bürgerlicher Name: %s"
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a location.
-#: lib/command.php:434 lib/mail.php:270
+#: lib/command.php:446 lib/mail.php:270
 #, php-format
 msgid "Location: %s"
 msgstr "Standort: %s"
@@ -8105,20 +7984,20 @@ msgstr "Standort: %s"
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a homepage.
-#: lib/command.php:438 lib/mail.php:274
+#: lib/command.php:450 lib/mail.php:274
 #, php-format
 msgid "Homepage: %s"
 msgstr "Homepage: %s"
 
 #. TRANS: Whois output. %s is the bio information of the queried user.
-#: lib/command.php:442
+#: lib/command.php:454
 #, php-format
 msgid "About: %s"
 msgstr "Über: %s"
 
 #. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).
 #. TRANS: %s is a remote profile.
-#: lib/command.php:471
+#: lib/command.php:483
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
@@ -8129,7 +8008,7 @@ msgstr ""
 
 #. TRANS: Message given if content is too long. %1$sd is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:488
+#: lib/command.php:500
 #, php-format
 msgid "Message too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
@@ -8139,25 +8018,25 @@ msgstr[1] ""
 "Nachricht zu lang - maximal %1$d Zeichen erlaubt, du hast %2$d gesendet."
 
 #. TRANS: Error text shown sending a direct message fails with an unknown reason.
-#: lib/command.php:516
+#: lib/command.php:528
 msgid "Error sending direct message."
 msgstr "Fehler beim Senden der Nachricht."
 
 #. TRANS: Message given having repeated a notice from another user.
 #. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:553
+#: lib/command.php:565
 #, php-format
 msgid "Notice from %s repeated."
 msgstr "Nachricht von „%s“ wiederholt."
 
 #. TRANS: Error text shown when repeating a notice fails with an unknown reason.
-#: lib/command.php:556
+#: lib/command.php:568
 msgid "Error repeating notice."
 msgstr "Fehler beim Wiederholen der Nachricht."
 
 #. TRANS: Message given if content of a notice for a reply is too long. %1$d is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:591
+#: lib/command.php:603
 #, php-format
 msgid "Notice too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Notice too long - maximum is %1$d characters, you sent %2$d."
@@ -8168,100 +8047,100 @@ msgstr[1] ""
 
 #. TRANS: Text shown having sent a reply to a notice successfully.
 #. TRANS: %s is the nickname of the user of the notice the reply was sent to.
-#: lib/command.php:604
+#: lib/command.php:616
 #, php-format
 msgid "Reply to %s sent."
 msgstr "Antwort an „%s“ gesendet"
 
 #. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
-#: lib/command.php:607
+#: lib/command.php:619
 msgid "Error saving notice."
 msgstr "Problem beim Speichern der Nachricht."
 
 #. TRANS: Error text shown when no username was provided when issuing a subscribe command.
-#: lib/command.php:654
+#: lib/command.php:666
 msgid "Specify the name of the user to subscribe to."
 msgstr "Gib den Namen des Benutzers an, den du abonnieren möchtest."
 
 #. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
-#: lib/command.php:663
+#: lib/command.php:675
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "OMB-Profile können nicht mit einem Kommando abonniert werden."
 
 #. TRANS: Text shown after having subscribed to another user successfully.
 #. TRANS: %s is the name of the user the subscription was requested for.
-#: lib/command.php:671
+#: lib/command.php:683
 #, php-format
 msgid "Subscribed to %s."
 msgstr "%s abboniert."
 
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.
-#: lib/command.php:692 lib/command.php:803
+#: lib/command.php:704 lib/command.php:815
 msgid "Specify the name of the user to unsubscribe from."
 msgstr "Gib den Namen des Benutzers ein, den du nicht mehr abonnieren möchtest"
 
 #. TRANS: Text shown after having unsubscribed from another user successfully.
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:703
+#: lib/command.php:715
 #, php-format
 msgid "Unsubscribed from %s."
 msgstr "%s abbestellt."
 
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
-#: lib/command.php:723 lib/command.php:749
+#: lib/command.php:735 lib/command.php:761
 msgid "Command not yet implemented."
 msgstr "Befehl noch nicht implementiert."
 
 #. TRANS: Text shown when issuing the command "off" successfully.
-#: lib/command.php:727
+#: lib/command.php:739
 msgid "Notification off."
 msgstr "Benachrichtigung deaktiviert."
 
 #. TRANS: Error text shown when the command "off" fails for an unknown reason.
-#: lib/command.php:730
+#: lib/command.php:742
 msgid "Can't turn off notification."
 msgstr "Konnte Benachrichtigung nicht deaktivieren."
 
 #. TRANS: Text shown when issuing the command "on" successfully.
-#: lib/command.php:753
+#: lib/command.php:765
 msgid "Notification on."
 msgstr "Benachrichtigung aktiviert."
 
 #. TRANS: Error text shown when the command "on" fails for an unknown reason.
-#: lib/command.php:756
+#: lib/command.php:768
 msgid "Can't turn on notification."
 msgstr "Konnte Benachrichtigung nicht aktivieren."
 
 #. TRANS: Error text shown when issuing the login command while login is disabled.
-#: lib/command.php:770
+#: lib/command.php:782
 msgid "Login command is disabled."
 msgstr "Die Anmeldung ist deaktiviert."
 
 #. TRANS: Text shown after issuing the login command successfully.
 #. TRANS: %s is a logon link..
-#: lib/command.php:783
+#: lib/command.php:795
 #, php-format
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr "Der Link ist nur einmal und für eine Dauer von 2 Minuten gültig: %s"
 
 #. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:812
+#: lib/command.php:824
 #, php-format
 msgid "Unsubscribed %s."
 msgstr "%s nicht mehr abonniert"
 
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
-#: lib/command.php:830
+#: lib/command.php:842
 msgid "You are not subscribed to anyone."
 msgstr "Du hast niemanden abonniert."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
-#: lib/command.php:835
+#: lib/command.php:847
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Du hast diesen Benutzer bereits abonniert:"
@@ -8269,14 +8148,14 @@ msgstr[1] "Du hast diese Benutzer bereits abonniert:"
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user
 #. TRANS: (followers) without having any subscribers.
-#: lib/command.php:857
+#: lib/command.php:869
 msgid "No one is subscribed to you."
 msgstr "Niemand hat dich abonniert."
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
-#: lib/command.php:862
+#: lib/command.php:874
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Diese Person abonniert dich:"
@@ -8284,21 +8163,21 @@ msgstr[1] "Diese Personen abonnieren dich:"
 
 #. TRANS: Text shown after requesting groups a user is subscribed to without having
 #. TRANS: any group subscriptions.
-#: lib/command.php:884
+#: lib/command.php:896
 msgid "You are not a member of any groups."
 msgstr "Du bist in keiner Gruppe Mitglied."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
-#: lib/command.php:889
+#: lib/command.php:901
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "Du bist Mitglied dieser Gruppe:"
 msgstr[1] "Du bist Mitglied dieser Gruppen:"
 
 #. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-#: lib/command.php:904
+#: lib/command.php:916
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -8437,11 +8316,6 @@ msgstr "Programme mit Zugriffserlaubnis"
 msgid "Database error"
 msgstr "Datenbankfehler."
 
-#. TRANS: Description of form for deleting a user.
-#: lib/deleteuserform.php:75
-msgid "Delete this user"
-msgstr "Diesen Benutzer löschen"
-
 #. TRANS: Label in form on profile design page.
 #. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
 #: lib/designsettings.php:108
@@ -8478,21 +8352,6 @@ msgstr "Farben ändern"
 msgid "Use defaults"
 msgstr "Standardeinstellungen benutzen"
 
-#. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: lib/designsettings.php:259
-msgid "Restore default designs"
-msgstr "Standard-Design wiederherstellen"
-
-#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: lib/designsettings.php:267
-msgid "Reset back to default"
-msgstr "Standard wiederherstellen"
-
-#. TRANS: Title for button on profile design page to save settings.
-#: lib/designsettings.php:272
-msgid "Save design"
-msgstr "Design speichern"
-
 #. TRANS: Error message displayed if design settings could not be saved.
 #. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
 #: lib/designsettings.php:405 lib/designsettings.php:427
@@ -9377,10 +9236,6 @@ msgstr "Auf diese Nachricht antworten"
 msgid "Reply"
 msgstr "Antworten"
 
-#: lib/noticelist.php:673
-msgid "Delete this notice"
-msgstr "Nachricht löschen"
-
 #: lib/noticelist.php:691
 msgid "Notice repeated"
 msgstr "Nachricht wiederholt"
@@ -9660,10 +9515,6 @@ msgstr "Einladen"
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Lade Freunde und Kollegen ein, dir auf „%s“ zu folgen"
 
-#: lib/subscribeform.php:115 lib/subscribeform.php:139
-msgid "Subscribe to this user"
-msgstr "Abonniere diesen Benutzer"
-
 #: lib/subscriberspeopleselftagcloudsection.php:48
 #: lib/subscriptionspeopleselftagcloudsection.php:48
 msgid "People Tagcloud as self-tagged"
@@ -9838,23 +9689,18 @@ msgctxt "role"
 msgid "Moderator"
 msgstr "Moderator"
 
-#: lib/util.php:305
-#, fuzzy
-msgid "Not allowed to log in."
-msgstr "Nicht angemeldet."
-
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1309
+#: lib/util.php:1306
 msgid "a few seconds ago"
 msgstr "vor wenigen Sekunden"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1312
+#: lib/util.php:1309
 msgid "about a minute ago"
 msgstr "vor einer Minute"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1316
+#: lib/util.php:1313
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
@@ -9862,12 +9708,12 @@ msgstr[0] "vor ca. einer Minute"
 msgstr[1] "vor ca. %d Minuten"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1319
+#: lib/util.php:1316
 msgid "about an hour ago"
 msgstr "vor einer Stunde"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1323
+#: lib/util.php:1320
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
@@ -9875,12 +9721,12 @@ msgstr[0] "vor ca. einer Stunde"
 msgstr[1] "vor ca. %d Stunden"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1326
+#: lib/util.php:1323
 msgid "about a day ago"
 msgstr "vor einem Tag"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1330
+#: lib/util.php:1327
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
@@ -9888,12 +9734,12 @@ msgstr[0] "vor ca. einem Tag"
 msgstr[1] "vor ca. %d Tagen"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1333
+#: lib/util.php:1330
 msgid "about a month ago"
 msgstr "vor einem Monat"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1337
+#: lib/util.php:1334
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
@@ -9901,7 +9747,7 @@ msgstr[0] "vor ca. einem Monat"
 msgstr[1] "vor ca. %d Monaten"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1340
+#: lib/util.php:1337
 msgid "about a year ago"
 msgstr "vor ca. einem Jahr"
 
@@ -9946,3 +9792,74 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr "Hole Backup von der Datei „%s“."
+
+#~ msgid "Block this user."
+#~ msgstr "Diesen Benutzer blockieren."
+
+#, fuzzy
+#~ msgid "Delete this notice."
+#~ msgstr "Nachricht löschen"
+
+#, fuzzy
+#~ msgid "Delete this user."
+#~ msgstr "Diesen Benutzer löschen"
+
+#, fuzzy
+#~ msgid "Restore default designs."
+#~ msgstr "Standard-Design wiederherstellen"
+
+#, fuzzy
+#~ msgid "Reset back to default."
+#~ msgstr "Standard wiederherstellen"
+
+#, fuzzy
+#~ msgid "Save design."
+#~ msgstr "Design speichern"
+
+#, fuzzy
+#~ msgid "Disfavor favorite."
+#~ msgstr "Aus Favoriten entfernen"
+
+#, fuzzy
+#~ msgid "\"%s\" not found."
+#~ msgstr "API-Methode nicht gefunden."
+
+#, fuzzy
+#~ msgid "Notice %s not found."
+#~ msgstr "API-Methode nicht gefunden."
+
+#, fuzzy
+#~ msgid "Attachment %s not found."
+#~ msgstr "Empfänger nicht gefunden."
+
+#, fuzzy
+#~ msgid "Invalid tag: \"%s\"."
+#~ msgstr "Ungültiges Stichwort: „%s“"
+
+#, fuzzy
+#~ msgid "%s updates from everyone."
+#~ msgstr "%s Nachrichten von allen!"
+
+#, fuzzy
+#~ msgid "Password saved"
+#~ msgstr "Passwort gespeichert."
+
+#, fuzzy
+#~ msgid "Where you are, like \"City, State (or Region), Country\"."
+#~ msgstr "Wo du bist, beispielsweise „Stadt, Region, Land“"
+
+#, fuzzy
+#~ msgid "Subscribe to this user."
+#~ msgstr "Abonniere diesen Benutzer"
+
+#, fuzzy
+#~ msgid ""
+#~ "Listenee stream license \"%1$s\" is not compatible with site license \"%2"
+#~ "$s\"."
+#~ msgstr ""
+#~ "Die Benutzerlizenz „%1$s“ ist nicht kompatibel mit der Lizenz der Seite „%"
+#~ "2$s“."
+
+#, fuzzy
+#~ msgid "Not allowed to log in."
+#~ msgstr "Nicht angemeldet."
diff --git a/locale/en_GB/LC_MESSAGES/statusnet.po b/locale/en_GB/LC_MESSAGES/statusnet.po
index 55e71e831b..d76f992885 100644
--- a/locale/en_GB/LC_MESSAGES/statusnet.po
+++ b/locale/en_GB/LC_MESSAGES/statusnet.po
@@ -13,17 +13,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-24 10:32+0000\n"
-"PO-Revision-Date: 2011-02-24 10:36:25+0000\n"
+"POT-Creation-Date: 2011-03-03 15:58+0000\n"
+"PO-Revision-Date: 2011-03-03 16:00:21+0000\n"
 "Language-Team: British English <http://translatewiki.net/wiki/Portal:en-gb>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r82712); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: en-gb\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-02-17 11:39:54+0000\n"
+"X-POT-Import-Date: 2011-02-25 23:49:23+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -135,11 +135,7 @@ msgstr "No such page."
 #. 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 use "one time password login" without using an existing user.
-#. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
-#. TRANS: Client error displayed trying to find a user by ID for a non-existing ID.
-#. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when calling a profile action without specifying a user.
 #: actions/all.php:80 actions/allrss.php:69
@@ -157,12 +153,12 @@ msgstr "No such page."
 #: actions/apitimelinementions.php:77 actions/apitimelineuser.php:79
 #: actions/avatarbynickname.php:79 actions/favoritesrss.php:72
 #: actions/foaf.php:42 actions/foaf.php:61 actions/hcard.php:67
-#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:78
+#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
 #: actions/remotesubscribe.php:144 actions/remotesubscribe.php:153
-#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:113
-#: actions/showfavorites.php:106 actions/userbyid.php:75
+#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
+#: actions/showfavorites.php:106 actions/userbyid.php:74
 #: actions/usergroups.php:93 actions/userrss.php:40 actions/userxrd.php:59
-#: actions/xrds.php:71 lib/command.php:497 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:509 lib/galleryaction.php:59
 #: lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "No such user."
@@ -291,7 +287,7 @@ msgstr "Updates from %1$s and friends on %2$s!"
 #: actions/apigrouplistall.php:120 actions/apigroupmembership.php:105
 #: actions/apigroupshow.php:114 actions/apihelptest.php:84
 #: actions/apistatusesdestroy.php:101 actions/apistatusesretweets.php:110
-#: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:138
+#: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:139
 #: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
 #: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:268
 #: actions/apitimelinegroup.php:147 actions/apitimelinehome.php:173
@@ -523,7 +519,7 @@ msgstr "Recipient user not found."
 #. TRANS: Client error displayed trying to direct message another user who's not a friend (403).
 #: actions/apidirectmessagenew.php:144
 #, fuzzy
-msgid "Cannot send direct messages to users who aren't your friend."
+msgid "Can't send direct messages to users who aren't your friend."
 msgstr "Can't send direct messages to users who aren't your friend."
 
 #. TRANS: Client error displayed trying to direct message self (403).
@@ -549,7 +545,7 @@ msgstr "This status is already a favourite."
 #. TRANS: Client error displayed when marking a notice as favourite fails.
 #. TRANS: Server error displayed when trying to mark a notice as favorite fails in the database.
 #. TRANS: Error message text shown when a favorite could not be set.
-#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:294
+#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:306
 msgid "Could not create favorite."
 msgstr "Could not create favourite."
 
@@ -608,7 +604,7 @@ msgstr "Could not find target user."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:191
 #: actions/newgroup.php:137 actions/profilesettings.php:273
-#: actions/register.php:206
+#: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "Nickname already in use. Try another one."
 
@@ -618,7 +614,7 @@ msgstr "Nickname already in use. Try another one."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:195
 #: actions/newgroup.php:141 actions/profilesettings.php:243
-#: actions/register.php:208
+#: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "Not a valid nickname."
 
@@ -631,7 +627,7 @@ msgstr "Not a valid nickname."
 #: actions/apigroupcreate.php:181 actions/editapplication.php:235
 #: actions/editgroup.php:202 actions/newapplication.php:221
 #: actions/newgroup.php:148 actions/profilesettings.php:248
-#: actions/register.php:215
+#: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "Homepage is not a valid URL."
 
@@ -641,7 +637,7 @@ msgstr "Homepage is not a valid URL."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:191 actions/editgroup.php:206
 #: actions/newgroup.php:152 actions/profilesettings.php:252
-#: actions/register.php:218
+#: actions/register.php:226
 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "Full name is too long (max 255 chars)."
@@ -670,7 +666,7 @@ msgstr[1] "Description is too long (max %d chars)"
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:215 actions/editgroup.php:218
 #: actions/newgroup.php:164 actions/profilesettings.php:265
-#: actions/register.php:227
+#: actions/register.php:235
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
 msgstr "Location is too long (max 255 chars)."
@@ -727,14 +723,14 @@ msgstr "Group not found."
 #. TRANS: Server error displayed when trying to join a group the user is already a member of.
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:333
+#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:345
 msgid "You are already a member of that group."
 msgstr "You are already a member of that group."
 
 #. TRANS: Server error displayed when trying to join a group the user is blocked from joining.
 #. 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.
-#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:338
+#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:350
 msgid "You have been blocked from that group by the admin."
 msgstr "You have been blocked from that group by the admin."
 
@@ -744,7 +740,7 @@ msgstr "You have been blocked from that group by the admin."
 #. TRANS: %1$s is the joining user's nickname, $2$s is the group nickname for which the join failed.
 #. TRANS: Message given having failed to add a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:350
+#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:362
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "Could not join user %1$s to group %2$s."
@@ -761,7 +757,7 @@ msgstr "You are not a member of this group."
 #. TRANS: Message given having failed to remove a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
 #: actions/apigroupleave.php:127 actions/leavegroup.php:133
-#: lib/command.php:398
+#: lib/command.php:410
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
 msgstr "Could not remove user %1$s from group %2$s."
@@ -822,21 +818,20 @@ msgstr "You are not authorised."
 #. TRANS: Form validation error message.
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
-#. TRANS: Client error displayed when the session token is not okay.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
 #: actions/deletenotice.php:177 actions/disfavor.php:75
 #: actions/emailsettings.php:291 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:65 actions/grouplogo.php:321
 #: actions/groupunblock.php:65 actions/imsettings.php:224
-#: actions/invite.php:60 actions/login.php:131 actions/makeadmin.php:66
+#: actions/invite.php:60 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
-#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:136
-#: actions/othersettings.php:155 actions/passwordsettings.php:137
+#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
+#: actions/othersettings.php:155 actions/passwordsettings.php:138
 #: actions/profilesettings.php:217 actions/recoverpassword.php:383
-#: actions/register.php:164 actions/remotesubscribe.php:76
+#: actions/register.php:172 actions/remotesubscribe.php:76
 #: actions/repeat.php:82 actions/smssettings.php:250 actions/subedit.php:40
-#: actions/subscribe.php:87 actions/tagother.php:166
-#: actions/unsubscribe.php:69 actions/userauthorization.php:53
+#: actions/subscribe.php:86 actions/tagother.php:166
+#: actions/unsubscribe.php:69 actions/userauthorization.php:52
 #: lib/designsettings.php:310
 msgid "There was a problem with your session token. Try again, please."
 msgstr "There was a problem with your session token. Try again, please."
@@ -868,7 +863,7 @@ msgstr "Database error inserting OAuth application user."
 #: actions/designadminpanel.php:100 actions/editapplication.php:144
 #: actions/emailsettings.php:310 actions/grouplogo.php:332
 #: actions/imsettings.php:239 actions/newapplication.php:124
-#: actions/oauthconnectionssettings.php:145 actions/recoverpassword.php:46
+#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
 #: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
 msgstr "Unexpected form submission."
@@ -920,20 +915,19 @@ msgstr "Account"
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group nickname (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT for nick name in a profile.
-#: actions/apioauthauthorize.php:459 actions/login.php:242
-#: actions/profilesettings.php:106 actions/register.php:418
+#: actions/apioauthauthorize.php:459 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:432
 #: actions/showgroup.php:243 actions/tagother.php:94
-#: actions/userauthorization.php:152 lib/groupeditform.php:145
+#: actions/userauthorization.php:145 lib/groupeditform.php:145
 #: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "Nickname"
 
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:463 actions/login.php:245
-#: actions/register.php:422 lib/accountsettingsaction.php:120
+#: actions/apioauthauthorize.php:463 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:120
 msgid "Password"
 msgstr "Password"
 
@@ -1026,13 +1020,13 @@ msgstr "No such notice."
 
 #. TRANS: Client error displayed trying to repeat an own notice through the API.
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:537
+#: actions/apistatusesretweet.php:83 lib/command.php:549
 msgid "Cannot repeat your own notice."
 msgstr "Cannot repeat your own notice."
 
 #. TRANS: Client error displayed trying to re-repeat a notice through the API.
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:92 lib/command.php:543
+#: actions/apistatusesretweet.php:92 lib/command.php:555
 msgid "Already repeated that notice."
 msgstr "Already repeated that notice."
 
@@ -1055,7 +1049,7 @@ msgstr "API method not found."
 #. TRANS: %s is the requested output format.
 #: actions/apistatusesshow.php:144
 #, fuzzy, php-format
-msgid "Unsupported format: %s."
+msgid "Unsupported format: %s"
 msgstr "Unsupported format."
 
 #. TRANS: Client error displayed requesting a deleted status.
@@ -1160,14 +1154,13 @@ msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr "%1$s updates that reply to updates from %2$s / %3$s."
 
 #. TRANS: Title for site timeline. %s is the StatusNet sitename.
-#. TRANS: Public RSS feed title. %s is the StatusNet site name.
 #: actions/apitimelinepublic.php:193 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "%s public timeline"
 
 #. TRANS: Subtitle for site timeline. %s is the StatusNet sitename.
-#: actions/apitimelinepublic.php:199
+#: actions/apitimelinepublic.php:199 actions/publicrss.php:105
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "%s updates from everyone!"
@@ -1234,26 +1227,25 @@ msgid "Atom post must be an Atom entry."
 msgstr ""
 
 #. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
-#: actions/apitimelineuser.php:334
+#: actions/apitimelineuser.php:335
 msgid "Can only handle POST activities."
 msgstr ""
 
 #. TRANS: Client error displayed when using an unsupported activity object type.
 #. TRANS: %s is the unsupported activity object type.
-#: actions/apitimelineuser.php:345
+#: actions/apitimelineuser.php:346
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
 #. TRANS: %d is the notice ID (number).
-#: actions/apitimelineuser.php:379
+#: actions/apitimelineuser.php:380
 #, fuzzy, php-format
 msgid "No content for notice %d."
 msgstr "Find content of notices"
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#. TRANS: %s is the notice URI.
 #: actions/apitimelineuser.php:408
 #, fuzzy, php-format
 msgid "Notice with URI \"%s\" already exists."
@@ -1271,10 +1263,9 @@ msgstr "API method not found."
 
 #. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
 #. TRANS: Client exception.
-#. TRANS: Client error displayed trying to subscribe to a non-existing profile.
 #: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
 #: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
-#: actions/subscribe.php:110
+#: actions/subscribe.php:107
 msgid "No such profile."
 msgstr "No such profile."
 
@@ -1410,7 +1401,7 @@ msgstr "Could not delete favourite."
 #: actions/joingroup.php:95 actions/leavegroup.php:82
 #: actions/leavegroup.php:95 actions/makeadmin.php:86
 #: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:380
+#: lib/command.php:392
 msgid "No such group."
 msgstr "No such group."
 
@@ -1421,7 +1412,7 @@ msgid "Not a member."
 msgstr "All members"
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
-#: actions/atompubshowmembership.php:150
+#: actions/atompubshowmembership.php:151
 #, fuzzy
 msgid "Cannot delete someone else's membership."
 msgstr "Could not delete self-subscription."
@@ -1526,11 +1517,9 @@ msgstr "You can upload your personal avatar. The maximum file size is %s."
 
 #. TRANS: Server error displayed in avatar upload page when no matching profile can be found for a user.
 #. TRANS: Server error displayed coming across a request from a user without a profile.
-#. TRANS: Server error displayed when trying to authorise a remote subscription request
-#. TRANS: while the user has no profile.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
 #: actions/grouplogo.php:184 actions/remotesubscribe.php:190
-#: actions/userauthorization.php:75 actions/userrss.php:108
+#: actions/userauthorization.php:72 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr "User without matching profile."
 
@@ -1588,10 +1577,10 @@ msgstr "Crop"
 msgid "No file uploaded."
 msgstr "No file uploaded."
 
-#. TRANS: Avatar upload form instruction after uploading a file.
+#. TRANS: Avatar upload form unstruction after uploading a file.
 #: actions/avatarsettings.php:345
 #, fuzzy
-msgid "Pick a square area of the image to be your avatar."
+msgid "Pick a square area of the image to be your avatar"
 msgstr "Pick a square area of the image to be your avatar"
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
@@ -1633,7 +1622,7 @@ msgid "You may not backup your account."
 msgstr ""
 
 #. TRANS: Information displayed on the backup account page.
-#: actions/backupaccount.php:225
+#: actions/backupaccount.php:227
 msgid ""
 "You can backup your account data in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format. This is an experimental feature and provides "
@@ -1643,15 +1632,15 @@ msgid ""
 msgstr ""
 
 #. TRANS: Submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:248
+#: actions/backupaccount.php:250
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Backup"
 msgstr "Background"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:252
-msgid "Backup your account."
+#: actions/backupaccount.php:254
+msgid "Backup your account"
 msgstr ""
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
@@ -1693,7 +1682,7 @@ msgstr "No"
 #. TRANS: Submit button title for 'No' when blocking a user.
 #: actions/block.php:158
 #, fuzzy
-msgid "Do not block this user."
+msgid "Do not block this user"
 msgstr "Do not block this user"
 
 #. TRANS: Button label on the user block form.
@@ -1710,9 +1699,9 @@ msgid "Yes"
 msgstr "Yes"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:165
-#, fuzzy
-msgid "Block this user."
+#. TRANS: Description of the form to block a user.
+#: actions/block.php:165 lib/blockform.php:79
+msgid "Block this user"
 msgstr "Block this user"
 
 #. TRANS: Server error displayed when blocking a user fails.
@@ -1877,7 +1866,7 @@ msgstr ""
 #. TRANS: Field label for delete account confirmation entry.
 #. TRANS: Field label for password reset form where the password has to be typed again.
 #: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:262 actions/register.php:426
+#: actions/recoverpassword.php:262 actions/register.php:440
 msgid "Confirm"
 msgstr "Confirm"
 
@@ -1907,14 +1896,14 @@ msgstr "Application not found."
 #. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
 #: actions/deleteapplication.php:79 actions/editapplication.php:78
-#: actions/showapplication.php:90
+#: actions/showapplication.php:94
 msgid "You are not the owner of this application."
 msgstr "You are not the owner of this application."
 
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
-#: actions/newapplication.php:112 actions/showapplication.php:113
-#: lib/action.php:1422
+#: actions/newapplication.php:112 actions/showapplication.php:118
+#: lib/action.php:1425
 msgid "There was a problem with your session token."
 msgstr "There was a problem with your session token."
 
@@ -1938,13 +1927,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting an application.
 #: actions/deleteapplication.php:161
 #, fuzzy
-msgid "Do not delete this application."
+msgid "Do not delete this application"
 msgstr "Do not delete this application"
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
 #: actions/deleteapplication.php:167
 #, fuzzy
-msgid "Delete this application."
+msgid "Delete this application"
 msgstr "Delete this application"
 
 #. TRANS: Client error when trying to delete group while not logged in.
@@ -1999,13 +1988,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting a group.
 #: actions/deletegroup.php:224
 #, fuzzy
-msgid "Do not delete this group."
+msgid "Do not delete this group"
 msgstr "Do not delete this group"
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
 #: actions/deletegroup.php:231
 #, fuzzy
-msgid "Delete this group."
+msgid "Delete this group"
 msgstr "Delete this group"
 
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
@@ -2013,15 +2002,13 @@ msgstr "Delete this group"
 #. TRANS: Client error displayed when trying to mark a notice as favorite without being logged in.
 #. TRANS: Client error displayed trying to block a user from a group while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
-#. TRANS: Client error displayed trying to log out when not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
-#. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
 #. TRANS: Client error displayed when trying to change user options while not logged in.
 #: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
-#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:70
+#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
-#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:98
+#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
 #: lib/adminpanelaction.php:71 lib/profileformaction.php:63
 #: lib/settingsaction.php:72
@@ -2051,13 +2038,12 @@ msgstr "Are you sure you want to delete this notice?"
 #. TRANS: Submit button title for 'No' when deleting a notice.
 #: actions/deletenotice.php:159
 #, fuzzy
-msgid "Do not delete this notice."
+msgid "Do not delete this notice"
 msgstr "Do not delete this notice"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:166
-#, fuzzy
-msgid "Delete this notice."
+#: actions/deletenotice.php:166 lib/noticelist.php:673
+msgid "Delete this notice"
 msgstr "Delete this notice"
 
 #. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
@@ -2094,13 +2080,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting a user.
 #: actions/deleteuser.php:158
 #, fuzzy
-msgid "Do not delete this user."
+msgid "Do not delete this user"
 msgstr "Do not delete this group"
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
-#: actions/deleteuser.php:165
-#, fuzzy
-msgid "Delete this user."
+#. TRANS: Description of form for deleting a user.
+#: actions/deleteuser.php:165 lib/deleteuserform.php:75
+msgid "Delete this user"
 msgstr "Delete this user"
 
 #. TRANS: Message used as title for design settings for the site.
@@ -2266,21 +2252,21 @@ msgid "Use defaults"
 msgstr "Use defaults"
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:720
-#, fuzzy
-msgid "Restore default designs."
+#. TRANS: Title for button on profile design page to reset all colour settings to default.
+#: actions/designadminpanel.php:720 lib/designsettings.php:259
+msgid "Restore default designs"
 msgstr "Restore default designs"
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:728
-#, fuzzy
-msgid "Reset back to default."
+#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
+#: actions/designadminpanel.php:728 lib/designsettings.php:267
+msgid "Reset back to default"
 msgstr "Reset back to default"
 
 #. TRANS: Title for button for saving theme settings.
-#: actions/designadminpanel.php:736
-#, fuzzy
-msgid "Save design."
+#. TRANS: Title for button on profile design page to save settings.
+#: actions/designadminpanel.php:736 lib/designsettings.php:272
+msgid "Save design"
 msgstr "Save design"
 
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
@@ -2312,7 +2298,7 @@ msgid "You must be logged in to edit an application."
 msgstr "You must be logged in to edit an application."
 
 #. TRANS: Client error displayed trying to edit an application that does not exist.
-#: actions/editapplication.php:83 actions/showapplication.php:83
+#: actions/editapplication.php:83 actions/showapplication.php:87
 msgid "No such application."
 msgstr "No such application."
 
@@ -2593,7 +2579,7 @@ msgid "Cannot normalize that email address."
 msgstr "Cannot normalise that e-mail address"
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:393 actions/register.php:204
+#: actions/emailsettings.php:393 actions/register.php:212
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "Not a valid e-mail address."
@@ -2669,22 +2655,19 @@ msgstr "No incoming e-mail address."
 
 #. 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.
 #: actions/emailsettings.php:530 actions/emailsettings.php:554
-#: actions/smssettings.php:566 actions/smssettings.php:591
+#: actions/smssettings.php:565 actions/smssettings.php:588
 #, fuzzy
 msgid "Could not update user record."
 msgstr "Couldn't update user record."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
-#. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:534 actions/smssettings.php:570
+#: actions/emailsettings.php:534 actions/smssettings.php:568
 msgid "Incoming email address removed."
 msgstr "Incoming e-mail address removed."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
-#. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:558 actions/smssettings.php:595
+#: actions/emailsettings.php:558 actions/smssettings.php:591
 msgid "New incoming email address added."
 msgstr "New incoming e-mail address added."
 
@@ -2696,7 +2679,7 @@ msgstr "This notice is already a favourite!"
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
 #: actions/favor.php:95
 #, fuzzy
-msgid "Disfavor favorite."
+msgid "Disfavor favorite"
 msgstr "Disfavor favourite"
 
 #. TRANS: Page title for first page of favorited notices.
@@ -2937,13 +2920,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
 #: actions/groupblock.php:191
 #, fuzzy
-msgid "Do not block this user from this group."
+msgid "Do not block this user from this group"
 msgstr "Do not block this user from this group"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
 #: actions/groupblock.php:198
 #, fuzzy
-msgid "Block this user from this group."
+msgid "Block this user from this group"
 msgstr "Block this user from this group"
 
 #. TRANS: Server error displayed when trying to block a user from a group fails because of an application error.
@@ -2952,7 +2935,6 @@ msgid "Database error blocking user from group."
 msgstr "Database error blocking user from group."
 
 #. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
-#. TRANS: Client error displayed trying to find a user by ID without providing an ID.
 #: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr "No ID."
@@ -3140,10 +3122,8 @@ msgid "Group search"
 msgstr "Group search"
 
 #. TRANS: Text on page where groups can be searched if no results were found for a query.
-#. TRANS: Text for notice search results is the query had no results.
-#. TRANS: Message on the "People search" page where a query has no results.
-#: actions/groupsearch.php:82 actions/noticesearch.php:122
-#: actions/peoplesearch.php:87
+#: actions/groupsearch.php:82 actions/noticesearch.php:117
+#: actions/peoplesearch.php:83
 msgid "No results."
 msgstr "No results."
 
@@ -3180,7 +3160,6 @@ msgid "User is not blocked from group."
 msgstr "User is not blocked from group."
 
 #. TRANS: Server error displayed when unblocking a user from a group fails because of an unknown error.
-#. TRANS: Server error displayed when removing a user block.
 #: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "Error removing the block."
@@ -3275,8 +3254,7 @@ msgid "Publish a MicroID for my Jabber/Google Talk address."
 msgstr "Publish a MicroID for my Jabber/GTalk address."
 
 #. TRANS: Confirmation message for successful Instant Messaging preferences save.
-#. TRANS: Confirmation message after saving preferences.
-#: actions/imsettings.php:283 actions/othersettings.php:193
+#: actions/imsettings.php:283 actions/othersettings.php:192
 msgid "Preferences saved."
 msgstr "Preferences saved."
 
@@ -3569,7 +3547,7 @@ msgstr "You must be logged in to leave a group."
 
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
-#: actions/leavegroup.php:103 lib/command.php:386
+#: actions/leavegroup.php:103 lib/command.php:398
 msgid "You are not a member of that group."
 msgstr "You are not a member of that group."
 
@@ -3692,41 +3670,39 @@ msgstr "Save"
 msgid "Save license settings"
 msgstr ""
 
-#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
-#: actions/login.php:97 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
 msgid "Already logged in."
 msgstr "Already logged in."
 
-#: actions/login.php:142
+#: actions/login.php:148
 msgid "Incorrect username or password."
 msgstr "Incorrect username or password."
 
-#. TRANS: Server error displayed when a user object could not be created trying to login using "one time password login".
-#: actions/login.php:148 actions/otp.php:127
+#: actions/login.php:154 actions/otp.php:120
 msgid "Error setting user. You are probably not authorized."
 msgstr "Error setting user. You are probably not authorised."
 
-#: actions/login.php:202 actions/login.php:253
+#: actions/login.php:210 actions/login.php:263
 msgid "Login"
 msgstr "Login"
 
-#: actions/login.php:239
+#: actions/login.php:249
 msgid "Login to site"
 msgstr "Login to site"
 
-#: actions/login.php:248 actions/register.php:476
+#: actions/login.php:258 actions/register.php:490
 msgid "Remember me"
 msgstr "Remember me"
 
-#: actions/login.php:249 actions/register.php:478
+#: actions/login.php:259 actions/register.php:492
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "Automatically login in the future; not for shared computers!"
 
-#: actions/login.php:259
+#: actions/login.php:269
 msgid "Lost or forgotten password?"
 msgstr "Lost or forgotten password?"
 
-#: actions/login.php:277
+#: actions/login.php:288
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -3734,11 +3710,11 @@ msgstr ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
 
-#: actions/login.php:281
+#: actions/login.php:292
 msgid "Login with your username and password."
 msgstr "Login with your username and password."
 
-#: actions/login.php:284
+#: actions/login.php:295
 #, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -3821,14 +3797,14 @@ msgid "New message"
 msgstr "New message"
 
 #. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
-#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:501
+#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:513
 msgid "You can't send a message to this user."
 msgstr "You can't send a message to this user."
 
 #. TRANS: Command exception text shown when trying to send a direct message to another user without content.
 #. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
-#: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:478
-#: lib/command.php:581
+#: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:490
+#: lib/command.php:593
 msgid "No content!"
 msgstr "No content!"
 
@@ -3837,7 +3813,7 @@ msgid "No recipient specified."
 msgstr "No recipient specified."
 
 #. TRANS: Error text shown when trying to send a direct message to self.
-#: actions/newmessage.php:167 lib/command.php:505
+#: actions/newmessage.php:167 lib/command.php:517
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
@@ -3849,7 +3825,7 @@ msgstr "Message sent"
 
 #. TRANS: Message given have sent a direct message to another user.
 #. TRANS: %s is the name of the other user.
-#: actions/newmessage.php:188 lib/command.php:513
+#: actions/newmessage.php:188 lib/command.php:525
 #, php-format
 msgid "Direct message to %s sent."
 msgstr "Direct message to %s sent."
@@ -3866,9 +3842,7 @@ msgstr "New notice"
 msgid "Notice posted"
 msgstr "Notice posted"
 
-#. TRANS: Instructions for Notice search page.
-#. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/noticesearch.php:69
+#: actions/noticesearch.php:68
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -3877,21 +3851,16 @@ msgstr ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
 "by spaces; they must be 3 characters or more."
 
-#. TRANS: Title of the page where users can search for notices.
-#: actions/noticesearch.php:80
+#: actions/noticesearch.php:78
 msgid "Text search"
 msgstr "Text search"
 
-#. TRANS: Test in RSS notice search.
-#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearch.php:95
+#: actions/noticesearch.php:91
 #, php-format
 msgid "Search results for \"%1$s\" on %2$s"
 msgstr "Search results for \"%1$s\" on %2$s"
 
-#. TRANS: Text for logged in users making a query for notices without results.
-#. TRANS: This message contains a Markdown link.
-#: actions/noticesearch.php:128
+#: actions/noticesearch.php:121
 #, php-format
 msgid ""
 "Be the first to [post on this topic](%%%%action.newnotice%%%%?"
@@ -3900,9 +3869,7 @@ msgstr ""
 "Be the first to [post on this topic](%%%%action.newnotice%%%%?"
 "status_textarea=%s)!"
 
-#. TRANS: Text for not logged in users making a query for notices without results.
-#. TRANS: This message contains Markdown links.
-#: actions/noticesearch.php:133
+#: actions/noticesearch.php:124
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and be the first to "
@@ -3911,17 +3878,14 @@ msgstr ""
 "Why not [register an account](%%%%action.register%%%%) and be the first to "
 "[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
 
-#. TRANS: RSS notice search feed title. %s is the query.
-#: actions/noticesearchrss.php:95
+#: actions/noticesearchrss.php:96
 #, php-format
 msgid "Updates with \"%s\""
 msgstr "Updates with \"%s\""
 
-#. TRANS: RSS notice search feed description.
-#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearchrss.php:99
+#: actions/noticesearchrss.php:98
 #, fuzzy, php-format
-msgid "Updates matching search term \"%1$s\" on %2$s."
+msgid "Updates matching search term \"%1$s\" on %2$s!"
 msgstr "Updates matching search term \"%1$s\" on %2$s!"
 
 #: actions/nudge.php:85
@@ -3963,30 +3927,30 @@ msgid "You have not registered any applications yet."
 msgstr "You have not registered any applications yet."
 
 #. TRANS: Title for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:70
+#: actions/oauthconnectionssettings.php:71
 msgid "Connected applications"
 msgstr "Connected applications"
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:81
+#: actions/oauthconnectionssettings.php:83
 msgid "The following connections exist for your account."
 msgstr ""
 
 #. TRANS: Client error when trying to revoke access for an application while not being a user of it.
-#: actions/oauthconnectionssettings.php:166
+#: actions/oauthconnectionssettings.php:168
 msgid "You are not a user of that application."
 msgstr "You are not a user of that application."
 
 #. TRANS: Client error when revoking access has failed for some reason.
 #. TRANS: %s is the application ID revoking access failed for.
-#: actions/oauthconnectionssettings.php:181
+#: actions/oauthconnectionssettings.php:183
 #, fuzzy, php-format
 msgid "Unable to revoke access for application: %s."
 msgstr "Use this form to edit your application."
 
 #. TRANS: Success message after revoking access for an application.
 #. TRANS: %1$s is the application name, %2$s is the first part of the user token.
-#: actions/oauthconnectionssettings.php:200
+#: actions/oauthconnectionssettings.php:202
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -3994,30 +3958,20 @@ msgid ""
 msgstr ""
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:211
+#: actions/oauthconnectionssettings.php:213
 msgid "You have not authorized any applications to use your account."
 msgstr "You have not authorised any applications to use your account."
 
 #. TRANS: Note for developers in the OAuth connection settings form.
 #. TRANS: This message contains a Markdown link. Do not separate "](".
 #. TRANS: %s is the URL to the OAuth settings.
-#: actions/oauthconnectionssettings.php:231
+#: actions/oauthconnectionssettings.php:233
 #, php-format
 msgid ""
 "Are you a developer? [Register an OAuth client application](%s) to use with "
 "this instance of StatusNet."
 msgstr ""
 
-#: actions/oembed.php:64
-#, fuzzy, php-format
-msgid "\"%s\" not found."
-msgstr "API method not found."
-
-#: actions/oembed.php:76
-#, fuzzy, php-format
-msgid "Notice %s not found."
-msgstr "API method not found."
-
 #: actions/oembed.php:80 actions/shownotice.php:100
 msgid "Notice has no profile."
 msgstr "Notice has no profile."
@@ -4027,16 +3981,6 @@ msgstr "Notice has no profile."
 msgid "%1$s's status on %2$s"
 msgstr "%1$s's status on %2$s"
 
-#: actions/oembed.php:95
-#, fuzzy, php-format
-msgid "Attachment %s not found."
-msgstr "Recipient user not found."
-
-#: actions/oembed.php:136
-#, php-format
-msgid "\"%s\" not supported for oembed requests."
-msgstr ""
-
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
 #: actions/oembed.php:168
 #, php-format
@@ -4055,12 +3999,11 @@ msgstr ""
 msgid "Not a supported data format."
 msgstr "Not a supported data format."
 
-#. TRANS: ShortName in the OpenSearch interface when trying to find users.
 #: actions/opensearch.php:64
 msgid "People Search"
 msgstr "People Search"
 
-#: actions/opensearch.php:68
+#: actions/opensearch.php:67
 msgid "Notice Search"
 msgstr "Notice Search"
 
@@ -4108,46 +4051,37 @@ msgstr "Show or hide profile designs."
 msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr "URL shortening service is too long (max 50 chars)."
 
-#. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
-#: actions/otp.php:70
+#: actions/otp.php:69
 msgid "No user ID specified."
 msgstr "No user ID specified."
 
-#. TRANS: Client error displayed trying to use "one time password login" without specifying a login token.
-#: actions/otp.php:86
+#: actions/otp.php:83
 msgid "No login token specified."
 msgstr "No login token specified."
 
-#. TRANS: Client error displayed trying to use "one time password login" without requesting a login token.
-#: actions/otp.php:94
+#: actions/otp.php:90
 msgid "No login token requested."
 msgstr "No login token requested."
 
-#. TRANS: Client error displayed trying to use "one time password login" while specifying an invalid login token.
-#: actions/otp.php:100
+#: actions/otp.php:95
 msgid "Invalid login token specified."
 msgstr "Invalid login token specified."
 
-#. TRANS: Client error displayed trying to use "one time password login" while specifying an expired login token.
-#: actions/otp.php:110
+#: actions/otp.php:104
 msgid "Login token expired."
 msgstr "Login token expired."
 
-#. TRANS: Title for outbox for any but the fist page.
-#. TRANS: %1$s is the user nickname, %2$d is the page number.
-#: actions/outbox.php:57
+#: actions/outbox.php:58
 #, php-format
 msgid "Outbox for %1$s - page %2$d"
 msgstr "Outbox for %1$s - page %2$d"
 
-#. TRANS: Title for first page of outbox.
 #: actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
 msgstr "Outbox for %s"
 
-#. TRANS: Instructions for outbox.
-#: actions/outbox.php:103
+#: actions/outbox.php:104
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr "This is your outbox, which lists private messages you have sent."
 
@@ -4173,45 +4107,43 @@ msgstr "Old password"
 msgid "New password"
 msgstr "New password"
 
-#: actions/passwordsettings.php:109 actions/register.php:423
+#: actions/passwordsettings.php:109
 #, fuzzy
-msgid "6 or more characters."
+msgid "6 or more characters"
 msgstr "6 or more characters"
 
-#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:264
-#: actions/register.php:427
+#: actions/passwordsettings.php:113
 #, fuzzy
-msgid "Same as password above."
+msgid "Same as password above"
 msgstr "Same as password above"
 
 #: actions/passwordsettings.php:117
 msgid "Change"
 msgstr "Change"
 
-#: actions/passwordsettings.php:153 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:238
 msgid "Password must be 6 or more characters."
 msgstr "Password must be 6 or more characters."
 
-#: actions/passwordsettings.php:156 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:241
 msgid "Passwords don't match."
 msgstr "Passwords don't match."
 
-#: actions/passwordsettings.php:164
+#: actions/passwordsettings.php:165
 msgid "Incorrect old password"
 msgstr "Incorrect old password"
 
-#: actions/passwordsettings.php:180
+#: actions/passwordsettings.php:181
 msgid "Error saving user; invalid."
 msgstr "Error saving user; invalid."
 
-#. TRANS: Reset password form validation error message.
-#: actions/passwordsettings.php:185 actions/recoverpassword.php:418
+#: actions/passwordsettings.php:186
 #, fuzzy
-msgid "Cannot save new password."
+msgid "Can't save new password."
 msgstr "Can't save new password."
 
-#: actions/passwordsettings.php:191
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
 msgid "Password saved."
 msgstr "Password saved."
 
@@ -4494,9 +4426,7 @@ msgstr ""
 msgid "Save paths"
 msgstr "Save paths"
 
-#. TRANS: Instructions for the "People search" page.
-#. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/peoplesearch.php:54
+#: actions/peoplesearch.php:52
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
@@ -4505,8 +4435,7 @@ msgstr ""
 "Search for people on %%site.name%% by their name, location, or interests. "
 "Separate the terms by spaces; they must be 3 characters or more."
 
-#. TRANS: Title of a page where users can search for other users.
-#: actions/peoplesearch.php:61
+#: actions/peoplesearch.php:58
 msgid "People search"
 msgstr "People search"
 
@@ -4547,7 +4476,7 @@ msgid "Profile information"
 msgstr "Profile information"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109 actions/register.php:419
+#: actions/profilesettings.php:109 actions/register.php:433
 #, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr "1-64 lowercase letters or numbers, no punctuation or spaces"
@@ -4555,7 +4484,7 @@ msgstr "1-64 lowercase letters or numbers, no punctuation or spaces"
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for full group name (dt). Text hidden by default.
 #. TRANS: DT for full name in a profile.
-#: actions/profilesettings.php:113 actions/register.php:441
+#: actions/profilesettings.php:113 actions/register.php:455
 #: actions/showgroup.php:255 actions/tagother.php:104
 #: lib/groupeditform.php:150 lib/userprofile.php:156
 msgid "Full name"
@@ -4563,13 +4492,13 @@ msgstr "Full name"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:118 actions/register.php:446
+#: actions/profilesettings.php:118 actions/register.php:460
 #: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "Homepage"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:121 actions/register.php:448
+#: actions/profilesettings.php:121
 #, fuzzy
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr "URL of your homepage, blog, or profile on another site"
@@ -4577,7 +4506,7 @@ msgstr "URL of your homepage, blog, or profile on another site"
 #. TRANS: Tooltip for field label in form for profile settings. Plural
 #. TRANS: is decided by the number of characters available for the
 #. TRANS: biography (%d).
-#: actions/profilesettings.php:129 actions/register.php:457
+#: actions/profilesettings.php:129 actions/register.php:471
 #, fuzzy, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4585,29 +4514,28 @@ msgstr[0] "Describe yourself and your interests in %d chars"
 msgstr[1] "Describe yourself and your interests in %d chars"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:135 actions/register.php:462
+#: actions/profilesettings.php:135 actions/register.php:476
 msgid "Describe yourself and your interests"
 msgstr "Describe yourself and your interests"
 
 #. TRANS: Text area label in form for profile settings where users can provide.
 #. TRANS: their biography.
-#: actions/profilesettings.php:139 actions/register.php:464
+#: actions/profilesettings.php:139 actions/register.php:478
 msgid "Bio"
 msgstr "Bio"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group location (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT for location in a profile.
-#: actions/profilesettings.php:145 actions/register.php:469
+#: actions/profilesettings.php:145 actions/register.php:483
 #: actions/showgroup.php:265 actions/tagother.php:112
-#: actions/userauthorization.php:174 lib/groupeditform.php:173
+#: actions/userauthorization.php:166 lib/groupeditform.php:173
 #: lib/userprofile.php:172
 msgid "Location"
 msgstr "Location"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148
+#: actions/profilesettings.php:148 actions/register.php:485
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Where you are, like \"City, State (or Region), Country\""
 
@@ -4628,8 +4556,7 @@ msgstr "Tags"
 #: actions/profilesettings.php:164
 #, fuzzy
 msgid ""
-"Tags for yourself (letters, numbers, -, ., and _), comma- or space- "
-"separated."
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 
@@ -4641,7 +4568,7 @@ msgstr "Language"
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
 #: actions/profilesettings.php:171
 #, fuzzy
-msgid "Preferred language."
+msgid "Preferred language"
 msgstr "Preferred language"
 
 #. TRANS: Dropdownlist label in form for profile settings.
@@ -4658,14 +4585,14 @@ msgstr "In which timezone are you?"
 #: actions/profilesettings.php:189
 #, fuzzy
 msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)."
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr ""
 "Automatically subscribe to whoever subscribes to me (best for non-humans)"
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Plural form is used based on the maximum number of allowed
 #. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:258 actions/register.php:221
+#: actions/profilesettings.php:258 actions/register.php:229
 #, fuzzy, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4685,9 +4612,9 @@ msgstr "Language is too long (max 50 chars)."
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:291
-#, fuzzy, php-format
-msgid "Invalid tag: \"%s\"."
+#: actions/profilesettings.php:291 actions/tagother.php:178
+#, php-format
+msgid "Invalid tag: \"%s\""
 msgstr "Invalid tag: \"%s\""
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
@@ -4795,12 +4722,6 @@ msgstr ""
 "blogging) service based on the Free Software [StatusNet](http://status.net/) "
 "tool."
 
-#. TRANS: Public RSS feed description. %s is the StatusNet site name.
-#: actions/publicrss.php:106
-#, fuzzy, php-format
-msgid "%s updates from everyone."
-msgstr "%s updates from everyone!"
-
 #. TRANS: Title for public tag cloud.
 #: actions/publictagcloud.php:57
 msgid "Public tag cloud"
@@ -4936,12 +4857,6 @@ msgstr "Recover password"
 msgid "Password recovery requested"
 msgstr "Password recovery requested"
 
-#. TRANS: Title for password recovery page in password saved mode.
-#: actions/recoverpassword.php:229
-#, fuzzy
-msgid "Password saved"
-msgstr "Password saved."
-
 #. TRANS: Title for password recovery page when an unknown action has been specified.
 #: actions/recoverpassword.php:232
 msgid "Unknown action"
@@ -4953,6 +4868,12 @@ msgstr "Unknown action"
 msgid "6 or more characters, and do not forget it!"
 msgstr "6 or more characters, and don't forget it!"
 
+#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#: actions/recoverpassword.php:264 actions/register.php:441
+#, fuzzy
+msgid "Same as password above."
+msgstr "Same as password above"
+
 #. TRANS: Button text for password reset form.
 #. TRANS: Button text on profile design page to reset all colour settings to default without saving.
 #: actions/recoverpassword.php:268 lib/designsettings.php:264
@@ -5006,8 +4927,14 @@ msgstr "Password must be 6 chars or more."
 msgid "Password and confirmation do not match."
 msgstr "Password and confirmation do not match."
 
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:418
+#, fuzzy
+msgid "Cannot save new password."
+msgstr "Can't save new password."
+
 #. TRANS: Server error displayed when something does wrong with the user object during password reset.
-#: actions/recoverpassword.php:426 actions/register.php:248
+#: actions/recoverpassword.php:426 actions/register.php:256
 msgid "Error setting user."
 msgstr "Error setting user."
 
@@ -5016,89 +4943,94 @@ msgstr "Error setting user."
 msgid "New password successfully saved. You are now logged in."
 msgstr "New password successfully saved. You are now logged in."
 
-#: actions/register.php:87 actions/register.php:188 actions/register.php:399
+#: actions/register.php:92 actions/register.php:196 actions/register.php:413
 msgid "Sorry, only invited people can register."
 msgstr "Sorry, only invited people can register."
 
-#: actions/register.php:94
+#: actions/register.php:99
 msgid "Sorry, invalid invitation code."
 msgstr "Sorry, invalid invitation code."
 
-#: actions/register.php:113
+#: actions/register.php:119
 msgid "Registration successful"
 msgstr "Registration successful"
 
-#: actions/register.php:115 actions/register.php:497
+#: actions/register.php:121 actions/register.php:511
 msgid "Register"
 msgstr "Register"
 
-#: actions/register.php:135
+#: actions/register.php:142
 msgid "Registration not allowed."
 msgstr "Registration not allowed."
 
-#: actions/register.php:201
+#: actions/register.php:209
 #, fuzzy
-msgid "You cannot register if you don't agree to the license."
+msgid "You can't register if you don't agree to the license."
 msgstr "You can't register if you don't agree to the licence."
 
-#: actions/register.php:210
+#: actions/register.php:218
 msgid "Email address already exists."
 msgstr "E-mail address already exists."
 
-#: actions/register.php:243 actions/register.php:265
+#: actions/register.php:251 actions/register.php:273
 msgid "Invalid username or password."
 msgstr "Invalid username or password."
 
-#: actions/register.php:340
+#: actions/register.php:351
 msgid ""
 "With this form you can create a new account. You can then post notices and "
-"link up to friends and colleagues."
+"link up to friends and colleagues. "
 msgstr ""
 
+#: actions/register.php:437
+#, fuzzy
+msgid "6 or more characters."
+msgstr "6 or more characters"
+
 #. TRANS: Link description in user account settings menu.
-#: actions/register.php:431 actions/register.php:435
+#: actions/register.php:445 actions/register.php:449
 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
 msgid "Email"
 msgstr "E-mail"
 
-#: actions/register.php:432 actions/register.php:436
+#: actions/register.php:446 actions/register.php:450
 #, fuzzy
-msgid "Used only for updates, announcements, and password recovery."
+msgid "Used only for updates, announcements, and password recovery"
 msgstr "Used only for updates, announcements, and password recovery"
 
-#: actions/register.php:443
+#: actions/register.php:457
 #, fuzzy
-msgid "Longer name, preferably your \"real\" name."
+msgid "Longer name, preferably your \"real\" name"
 msgstr "Longer name, preferably your \"real\" name"
 
-#: actions/register.php:471
+#: actions/register.php:462
 #, fuzzy
-msgid "Where you are, like \"City, State (or Region), Country\"."
-msgstr "Where you are, like \"City, State (or Region), Country\""
+msgid "URL of your homepage, blog, or profile on another site"
+msgstr "URL of your homepage, blog, or profile on another site"
 
-#: actions/register.php:510
+#: actions/register.php:523
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
 msgstr ""
 
-#: actions/register.php:520
+#: actions/register.php:533
 #, php-format
 msgid "My text and files are copyright by %1$s."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:524
+#: actions/register.php:537
 msgid "My text and files remain under my own copyright."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:527
+#: actions/register.php:540
 msgid "All rights reserved."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:532
+#: actions/register.php:545
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -5107,7 +5039,7 @@ msgstr ""
 "My text and files are available under %s except this private data: password, "
 "email address, IM address, and phone number."
 
-#: actions/register.php:573
+#: actions/register.php:588
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -5140,7 +5072,7 @@ msgstr ""
 "\n"
 "Thanks for signing up and we hope you enjoy using this service."
 
-#: actions/register.php:597
+#: actions/register.php:612
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5173,7 +5105,7 @@ msgstr "User nickname"
 
 #: actions/remotesubscribe.php:129
 #, fuzzy
-msgid "Nickname of the user you want to follow."
+msgid "Nickname of the user you want to follow"
 msgstr "Nickname of the user you want to follow"
 
 #: actions/remotesubscribe.php:132
@@ -5182,7 +5114,7 @@ msgstr "Profile URL"
 
 #: actions/remotesubscribe.php:133
 #, fuzzy
-msgid "URL of your profile on another compatible microblogging service."
+msgid "URL of your profile on another compatible microblogging service"
 msgstr "URL of your profile on another compatible microblogging service"
 
 #. TRANS: Link text for link that will subscribe to a remote profile.
@@ -5193,7 +5125,7 @@ msgstr "Subscribe"
 
 #: actions/remotesubscribe.php:158
 #, fuzzy
-msgid "Invalid profile URL (bad format)."
+msgid "Invalid profile URL (bad format)"
 msgstr "Invalid profile URL (bad format)"
 
 #: actions/remotesubscribe.php:167
@@ -5235,7 +5167,6 @@ msgstr "Repeated"
 msgid "Repeated!"
 msgstr "Repeated!"
 
-#. TRANS: RSS reply feed title. %s is a user nickname.
 #. TRANS: Tooltip for personal group navigation menu option when logged in for viewing @-replies.
 #: actions/replies.php:126 actions/repliesrss.php:68
 #: lib/personalgroupnav.php:109
@@ -5288,11 +5219,9 @@ msgstr ""
 "You can try to [nudge %1$s](../%2$s) or [post something to them](%%%%action."
 "newnotice%%%%?status_textarea=%3$s)."
 
-#. TRANS: RSS reply feed description.
-#. TRANS: %1$s is a user nickname, %2$s is the StatusNet site name.
-#: actions/repliesrss.php:74
+#: actions/repliesrss.php:72
 #, fuzzy, php-format
-msgid "Replies to %1$s on %2$s."
+msgid "Replies to %1$s on %2$s!"
 msgstr "Replies to %1$s on %2$s!"
 
 #. TRANS: Client exception displayed when trying to restore an account while not logged in.
@@ -5392,7 +5321,7 @@ msgstr "You cannot revoke user roles on this site."
 msgid "User doesn't have this role."
 msgstr "User doesn't have this role."
 
-#: actions/rsd.php:142 actions/version.php:159
+#: actions/rsd.php:146 actions/version.php:159
 msgid "StatusNet"
 msgstr "StatusNet"
 
@@ -5434,93 +5363,93 @@ msgstr ""
 msgid "Save site settings"
 msgstr "Save site settings"
 
-#: actions/showapplication.php:78
+#: actions/showapplication.php:82
 msgid "You must be logged in to view an application."
 msgstr "You must be logged in to view an application."
 
-#: actions/showapplication.php:151
+#: actions/showapplication.php:157
 msgid "Application profile"
 msgstr "Application profile"
 
 #. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:153 lib/applicationeditform.php:177
+#: actions/showapplication.php:159 lib/applicationeditform.php:177
 msgid "Icon"
 msgstr ""
 
 #. TRANS: Form input field label for application name.
-#: actions/showapplication.php:163 actions/version.php:197
+#: actions/showapplication.php:169 actions/version.php:197
 #: lib/applicationeditform.php:190
 msgid "Name"
 msgstr "Name"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:172 lib/applicationeditform.php:227
+#: actions/showapplication.php:178 lib/applicationeditform.php:227
 msgid "Organization"
 msgstr "Organization"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:181 actions/version.php:200
+#: actions/showapplication.php:187 actions/version.php:200
 #: lib/applicationeditform.php:208 lib/groupeditform.php:168
 msgid "Description"
 msgstr "Description"
 
 #. TRANS: Header for group statistics on a group page (h2).
 #. TRANS: H2 text for user statistics.
-#: actions/showapplication.php:186 actions/showgroup.php:460
+#: actions/showapplication.php:192 actions/showgroup.php:460
 #: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "Statistics"
 
-#: actions/showapplication.php:197
+#: actions/showapplication.php:203
 #, php-format
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr ""
 
-#: actions/showapplication.php:207
+#: actions/showapplication.php:213
 msgid "Application actions"
 msgstr "Application actions"
 
-#: actions/showapplication.php:230
+#: actions/showapplication.php:236
 msgid "Reset key & secret"
 msgstr ""
 
 #. TRANS: Title of form for deleting a user.
-#: actions/showapplication.php:246 lib/deletegroupform.php:121
+#: actions/showapplication.php:252 lib/deletegroupform.php:121
 #: lib/deleteuserform.php:64 lib/noticelist.php:673
 msgid "Delete"
 msgstr "Delete"
 
-#: actions/showapplication.php:255
+#: actions/showapplication.php:261
 msgid "Application info"
 msgstr "Application information"
 
-#: actions/showapplication.php:257
+#: actions/showapplication.php:263
 msgid "Consumer key"
 msgstr ""
 
-#: actions/showapplication.php:262
+#: actions/showapplication.php:268
 msgid "Consumer secret"
 msgstr ""
 
-#: actions/showapplication.php:267
+#: actions/showapplication.php:273
 msgid "Request token URL"
 msgstr ""
 
-#: actions/showapplication.php:272
+#: actions/showapplication.php:278
 msgid "Access token URL"
 msgstr ""
 
-#: actions/showapplication.php:277
+#: actions/showapplication.php:283
 msgid "Authorize URL"
 msgstr "Authorise URL"
 
-#: actions/showapplication.php:282
+#: actions/showapplication.php:288
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
 msgstr ""
 
-#: actions/showapplication.php:302
+#: actions/showapplication.php:309
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr "Are you sure you want to reset your consumer key and secret?"
 
@@ -5612,18 +5541,16 @@ msgid "Group profile"
 msgstr "Group profile"
 
 #. TRANS: Label for group URL (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT for URL in a profile.
 #: actions/showgroup.php:273 actions/tagother.php:118
-#: actions/userauthorization.php:184 lib/userprofile.php:186
+#: actions/userauthorization.php:175 lib/userprofile.php:186
 msgid "URL"
 msgstr "URL"
 
 #. TRANS: Label for group description or group note (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page where bio is displayed.
 #. TRANS: DT for note in a profile.
 #: actions/showgroup.php:285 actions/tagother.php:128
-#: actions/userauthorization.php:197 lib/userprofile.php:204
+#: actions/userauthorization.php:187 lib/userprofile.php:204
 msgid "Note"
 msgstr "Note"
 
@@ -5770,7 +5697,7 @@ msgid "%1$s tagged %2$s"
 msgstr "%1$s, page %2$d"
 
 #. TRANS: Page title showing tagged notices in one user's stream.
-#. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
+#. TRANS: %1$s is the username, %2$s is the hash tag, %1$d is the page number.
 #: actions/showstream.php:74
 #, fuzzy, php-format
 msgid "%1$s tagged %2$s, page %3$d"
@@ -6012,7 +5939,7 @@ msgstr ""
 #. TRANS: Title for button to save site notice in admin panel.
 #: actions/sitenoticeadminpanel.php:201
 #, fuzzy
-msgid "Save site notice."
+msgid "Save site notice"
 msgstr "Save site notice"
 
 #. TRANS: Title for SMS settings.
@@ -6071,7 +5998,7 @@ msgstr "SMS phone number"
 #. TRANS: SMS phone number input field instructions in SMS settings form.
 #: actions/smssettings.php:152
 #, fuzzy
-msgid "Phone number, no punctuation or spaces, with area code."
+msgid "Phone number, no punctuation or spaces, with area code"
 msgstr "Phone number, no punctuation or spaces, with area code"
 
 #. TRANS: Form legend for SMS preferences form.
@@ -6239,19 +6166,15 @@ msgstr "You are not subscribed to that profile."
 msgid "Could not save subscription."
 msgstr "Could not save subscription."
 
-#. TRANS: Client error displayed trying to perform any request method other than POST.
-#. TRANS: Do not translate POST.
 #: actions/subscribe.php:77
 msgid "This action only accepts POST requests."
 msgstr ""
 
-#. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
-#: actions/subscribe.php:121
+#: actions/subscribe.php:117
 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
 msgstr "You cannot subscribe to an OMB 0.1 remote profile with this action."
 
-#. TRANS: Page title when subscription succeeded.
-#: actions/subscribe.php:149
+#: actions/subscribe.php:145
 msgid "Subscribed"
 msgstr "Subscribed"
 
@@ -6406,9 +6329,8 @@ msgstr "Tag %s"
 msgid "User profile"
 msgstr "User profile"
 
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT element in area for user avatar.
-#: actions/tagother.php:81 actions/userauthorization.php:138
+#: actions/tagother.php:81 actions/userauthorization.php:132
 #: lib/userprofile.php:108
 msgid "Photo"
 msgstr "Photo"
@@ -6425,11 +6347,6 @@ msgstr ""
 "Tags for this user (letters, numbers, -, ., and _), comma- or space- "
 "separated"
 
-#: actions/tagother.php:178
-#, php-format
-msgid "Invalid tag: \"%s\""
-msgstr "Invalid tag: \"%s\""
-
 #: actions/tagother.php:193
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
@@ -6444,7 +6361,6 @@ msgstr "Use this form to add tags to your subscribers or subscriptions."
 msgid "No such tag."
 msgstr "No such tag."
 
-#. TRANS: Client error displayed when trying to unblock a non-blocked user.
 #: actions/unblock.php:59
 msgid "You haven't blocked that user."
 msgstr "You haven't blocked that user."
@@ -6465,7 +6381,7 @@ msgstr "No profile ID in request."
 msgid "Unsubscribed"
 msgstr "Unsubscribed"
 
-#: actions/updateprofile.php:64
+#: actions/updateprofile.php:64 actions/userauthorization.php:337
 #, php-format
 msgid ""
 "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
@@ -6497,7 +6413,7 @@ msgstr ""
 #. TRANS: users in user admin panel. %1$s is the invalid nickname.
 #: actions/useradminpanel.php:166
 #, php-format
-msgid "Invalid default subscripton: \"%1$s\" is not a user."
+msgid "Invalid default subscripton: '%1$s' is not a user."
 msgstr ""
 
 #. TRANS: Link description in user account settings menu.
@@ -6559,70 +6475,59 @@ msgstr ""
 #. TRANS: Title for button to save user settings in user admin panel.
 #: actions/useradminpanel.php:302
 #, fuzzy
-msgid "Save user settings."
+msgid "Save user settings"
 msgstr "Save site settings"
 
-#. TRANS: Page title.
-#: actions/userauthorization.php:109
+#: actions/userauthorization.php:105
 msgid "Authorize subscription"
 msgstr "Authorise subscription"
 
-#. TRANS: Page notice on "Auhtorize subscription" page.
-#: actions/userauthorization.php:115
+#: actions/userauthorization.php:110
 #, fuzzy
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
 "user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
-"click \"Reject\"."
+"click “Reject”."
 msgstr ""
 "Please check these details to make sure that you want to subscribe to this "
 "user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
 "click “Reject”."
 
-#. TRANS: DT element on Authorise Subscription page where license is displayed.
 #. TRANS: Menu item for site administration
-#: actions/userauthorization.php:207 actions/version.php:167
+#: actions/userauthorization.php:196 actions/version.php:167
 #: lib/adminpanelaction.php:403
 msgid "License"
 msgstr "License"
 
-#. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:229
+#: actions/userauthorization.php:217
 #, fuzzy
-msgctxt "BUTTON"
 msgid "Accept"
 msgstr "Accept"
 
-#. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:231
-#, fuzzy
-msgid "Subscribe to this user."
+#: actions/userauthorization.php:218 lib/subscribeform.php:115
+#: lib/subscribeform.php:139
+msgid "Subscribe to this user"
 msgstr "Subscribe to this user"
 
-#. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:233
+#: actions/userauthorization.php:219
 #, fuzzy
-msgctxt "BUTTON"
 msgid "Reject"
 msgstr "Reject"
 
-#. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:235
+#: actions/userauthorization.php:220
 #, fuzzy
-msgid "Reject this subscription."
+msgid "Reject this subscription"
 msgstr "Reject this subscription"
 
-#. TRANS: Client error displayed for an empty authorisation request.
-#: actions/userauthorization.php:248
+#: actions/userauthorization.php:232
 msgid "No authorization request!"
 msgstr "No authorisation request!"
 
-#. TRANS: Accept message header from Authorise subscription page.
-#: actions/userauthorization.php:271
+#: actions/userauthorization.php:254
 msgid "Subscription authorized"
 msgstr "Subscription authorised"
 
-#: actions/userauthorization.php:274
+#: actions/userauthorization.php:256
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to authorize the "
@@ -6632,12 +6537,11 @@ msgstr ""
 "with the site’s instructions for details on how to authorize the "
 "subscription. Your subscription token is:"
 
-#. TRANS: Reject message header from Authorise subscription page.
-#: actions/userauthorization.php:285
+#: actions/userauthorization.php:266
 msgid "Subscription rejected"
 msgstr "Subscription rejected"
 
-#: actions/userauthorization.php:288
+#: actions/userauthorization.php:268
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to fully reject the "
@@ -6647,63 +6551,39 @@ msgstr ""
 "with the site’s instructions for details on how to fully reject the "
 "subscription."
 
-#. TRANS: Exception thrown when no valid user is found for an authorisation request.
-#. TRANS: %s is a listener URI.
-#: actions/userauthorization.php:325
+#: actions/userauthorization.php:303
 #, php-format
-msgid "Listener URI \"%s\" not found here."
+msgid "Listener URI ‘%s’ not found here."
 msgstr ""
 
-#. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:332
+#: actions/userauthorization.php:308
 #, fuzzy, php-format
-msgid "Listenee URI \"%s\" is too long."
+msgid "Listenee URI ‘%s’ is too long."
 msgstr "Source URL is too long."
 
-#. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:340
-#, php-format
-msgid "Listenee URI \"%s\" is a local user."
-msgstr ""
-
-#. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
-#. TRANS: %s is a profile URL.
-#: actions/userauthorization.php:358
-#, php-format
-msgid "Profile URL \"%s\" is for a local user."
-msgstr ""
-
-#. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
-#. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
-#: actions/userauthorization.php:368
+#: actions/userauthorization.php:314
 #, fuzzy, php-format
-msgid ""
-"Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
-"\"."
-msgstr ""
-"Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
+msgid "Listenee URI ‘%s’ is a local user."
+msgstr "Source URL is too long."
 
-#. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:378
+#: actions/userauthorization.php:329
+#, php-format
+msgid "Profile URL ‘%s’ is for a local user."
+msgstr ""
+
+#: actions/userauthorization.php:345
 #, fuzzy, php-format
-msgid "Avatar URL \"%s\" is not valid."
+msgid "Avatar URL ‘%s’ is not valid."
 msgstr "Avatar URL ‘%s’ is not valid."
 
-#. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:385
+#: actions/userauthorization.php:350
 #, fuzzy, php-format
-msgid "Cannot read avatar URL \"%s\"."
+msgid "Can’t read avatar URL ‘%s’."
 msgstr "Can’t read avatar URL ‘%s’."
 
-#. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:392
+#: actions/userauthorization.php:355
 #, fuzzy, php-format
-msgid "Wrong image type for avatar URL \"%s\"."
+msgid "Wrong image type for avatar URL ‘%s’."
 msgstr "Wrong image type for avatar URL ‘%s’."
 
 #. TRANS: Page title for profile design page.
@@ -6809,7 +6689,7 @@ msgid "Plugins"
 msgstr ""
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:898
+#: actions/version.php:198 lib/action.php:901
 msgid "Version"
 msgstr "Version"
 
@@ -7012,14 +6892,14 @@ msgstr "Problem saving group inbox."
 
 #. TRANS: Server exception thrown when a reply cannot be saved.
 #. TRANS: %1$d is a notice ID, %2$d is the ID of the mentioned user.
-#: classes/Notice.php:1142
+#: classes/Notice.php:1144
 #, php-format
 msgid "Could not save reply for %1$d, %2$d."
 msgstr "Could not save reply for %1$d, %2$d."
 
 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1661
+#: classes/Notice.php:1663
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
@@ -7033,14 +6913,14 @@ msgstr "%1$s (%2$s)"
 
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:775
+#: classes/Profile.php:779
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:784
+#: classes/Profile.php:788
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -7357,53 +7237,53 @@ msgid "Page notice"
 msgstr "Page notice"
 
 #. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:871
+#: lib/action.php:874
 msgid "Secondary site navigation"
 msgstr "Secondary site navigation"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:877
+#: lib/action.php:880
 msgid "Help"
 msgstr "Help"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:880
+#: lib/action.php:883
 msgid "About"
 msgstr "About"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:883
+#: lib/action.php:886
 msgid "FAQ"
 msgstr "F.A.Q."
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:888
+#: lib/action.php:891
 msgid "TOS"
 msgstr ""
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:892
+#: lib/action.php:895
 msgid "Privacy"
 msgstr "Privacy"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:895
+#: lib/action.php:898
 msgid "Source"
 msgstr "Source"
 
 #. TRANS: Secondary navigation menu option leading to e-mail contact information on the
 #. TRANS: StatusNet site, where to report bugs, ...
-#: lib/action.php:902
+#: lib/action.php:905
 msgid "Contact"
 msgstr "Contact"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:905
+#: lib/action.php:908
 msgid "Badge"
 msgstr "Badge"
 
 #. TRANS: DT element for StatusNet software license.
-#: lib/action.php:934
+#: lib/action.php:937
 msgid "StatusNet software license"
 msgstr "StatusNet software licence"
 
@@ -7411,7 +7291,7 @@ msgstr "StatusNet software licence"
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:941
+#: lib/action.php:944
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7421,7 +7301,7 @@ msgstr ""
 "broughtby%%](%%site.broughtbyurl%%)."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:944
+#: lib/action.php:947
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** is a microblogging service."
@@ -7430,7 +7310,7 @@ msgstr "**%%site.name%%** is a microblogging service."
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:951
+#: lib/action.php:954
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7442,50 +7322,50 @@ msgstr ""
 "org/licensing/licenses/agpl-3.0.html)."
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:967
+#: lib/action.php:970
 msgid "Site content license"
 msgstr "Site content licence"
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:974
+#: lib/action.php:977
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:981
+#: lib/action.php:984
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:985
+#: lib/action.php:988
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:1017
+#: lib/action.php:1020
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr "All %1$s content and data are available under the %2$s licence."
 
 #. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1353
+#: lib/action.php:1356
 msgid "Pagination"
 msgstr "Pagination"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1364
+#: lib/action.php:1367
 msgid "After"
 msgstr "After"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1374
+#: lib/action.php:1377
 msgid "Before"
 msgstr "Before"
 
@@ -7683,23 +7563,19 @@ msgstr ""
 msgid "No application for that consumer key."
 msgstr ""
 
-#: lib/apiauth.php:202 lib/apiauth.php:284
-msgid "Not allowed to use API."
-msgstr ""
-
 #. TRANS: OAuth exception given when an incorrect access token was given for a user.
-#: lib/apiauth.php:225
+#: lib/apiauth.php:219
 msgid "Bad access token."
 msgstr ""
 
 #. TRANS: OAuth exception given when no user was found for a given token (no token was found).
-#: lib/apiauth.php:230
+#: lib/apiauth.php:224
 msgid "No user for that token."
 msgstr ""
 
 #. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel".
 #. TRANS: Client error thrown when authentication fails.
-#: lib/apiauth.php:272 lib/apiauth.php:302
+#: lib/apiauth.php:266 lib/apiauth.php:293
 msgid "Could not authenticate you."
 msgstr ""
 
@@ -7903,11 +7779,6 @@ msgstr "Password changing is not allowed."
 msgid "Block"
 msgstr "Block"
 
-#. TRANS: Description of the form to block a user.
-#: lib/blockform.php:79
-msgid "Block this user"
-msgstr "Block this user"
-
 #. TRANS: Title for command results.
 #: lib/channel.php:160 lib/channel.php:181
 msgid "Command results"
@@ -7935,7 +7806,7 @@ msgstr "Notice with that id does not exist."
 
 #. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
 #. TRANS: Error text shown when a last user notice is requested and it does not exist.
-#: lib/command.php:99 lib/command.php:630
+#: lib/command.php:99 lib/command.php:642
 msgid "User has no last notice."
 msgstr "User has no last notice."
 
@@ -7982,35 +7853,41 @@ msgid ""
 "Notices: %3$s"
 msgstr ""
 
+#. TRANS: Error message text shown when a favorite could not be set because it has already been favorited.
+#: lib/command.php:298
+#, fuzzy
+msgid "Could not create favorite: already favorited."
+msgstr "Could not create favourite."
+
 #. TRANS: Text shown when a notice has been marked as favourite successfully.
-#: lib/command.php:312
+#: lib/command.php:324
 msgid "Notice marked as fave."
 msgstr "Notice marked as fave."
 
 #. TRANS: Message given having added a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:357
+#: lib/command.php:369
 #, php-format
 msgid "%1$s joined group %2$s."
 msgstr ""
 
 #. TRANS: Message given having removed a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:405
+#: lib/command.php:417
 #, php-format
 msgid "%1$s left group %2$s."
 msgstr ""
 
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: lib/command.php:426
+#: lib/command.php:438
 #, fuzzy, php-format
 msgctxt "WHOIS"
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
 
 #. TRANS: Whois output. %s is the full name of the queried user.
-#: lib/command.php:430
+#: lib/command.php:442
 #, php-format
 msgid "Fullname: %s"
 msgstr "Fullname: %s"
@@ -8018,7 +7895,7 @@ msgstr "Fullname: %s"
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a location.
-#: lib/command.php:434 lib/mail.php:270
+#: lib/command.php:446 lib/mail.php:270
 #, php-format
 msgid "Location: %s"
 msgstr "Location: %s"
@@ -8026,20 +7903,20 @@ msgstr "Location: %s"
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a homepage.
-#: lib/command.php:438 lib/mail.php:274
+#: lib/command.php:450 lib/mail.php:274
 #, php-format
 msgid "Homepage: %s"
 msgstr "Homepage: %s"
 
 #. TRANS: Whois output. %s is the bio information of the queried user.
-#: lib/command.php:442
+#: lib/command.php:454
 #, php-format
 msgid "About: %s"
 msgstr "About: %s"
 
 #. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).
 #. TRANS: %s is a remote profile.
-#: lib/command.php:471
+#: lib/command.php:483
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
@@ -8048,7 +7925,7 @@ msgstr ""
 
 #. TRANS: Message given if content is too long. %1$sd is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:488
+#: lib/command.php:500
 #, fuzzy, php-format
 msgid "Message too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
@@ -8056,25 +7933,25 @@ msgstr[0] "Message too long - maximum is %1$d characters, you sent %2$d."
 msgstr[1] "Message too long - maximum is %1$d characters, you sent %2$d."
 
 #. TRANS: Error text shown sending a direct message fails with an unknown reason.
-#: lib/command.php:516
+#: lib/command.php:528
 msgid "Error sending direct message."
 msgstr "Error sending direct message."
 
 #. TRANS: Message given having repeated a notice from another user.
 #. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:553
+#: lib/command.php:565
 #, php-format
 msgid "Notice from %s repeated."
 msgstr "Notice from %s repeated."
 
 #. TRANS: Error text shown when repeating a notice fails with an unknown reason.
-#: lib/command.php:556
+#: lib/command.php:568
 msgid "Error repeating notice."
 msgstr "Error repeating notice."
 
 #. TRANS: Message given if content of a notice for a reply is too long. %1$d is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:591
+#: lib/command.php:603
 #, fuzzy, php-format
 msgid "Notice too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Notice too long - maximum is %1$d characters, you sent %2$d."
@@ -8083,100 +7960,100 @@ msgstr[1] "Notice too long - maximum is %1$d characters, you sent %2$d."
 
 #. TRANS: Text shown having sent a reply to a notice successfully.
 #. TRANS: %s is the nickname of the user of the notice the reply was sent to.
-#: lib/command.php:604
+#: lib/command.php:616
 #, php-format
 msgid "Reply to %s sent."
 msgstr "Reply to %s sent."
 
 #. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
-#: lib/command.php:607
+#: lib/command.php:619
 msgid "Error saving notice."
 msgstr "Error saving notice."
 
 #. TRANS: Error text shown when no username was provided when issuing a subscribe command.
-#: lib/command.php:654
+#: lib/command.php:666
 msgid "Specify the name of the user to subscribe to."
 msgstr "Specify the name of the user to subscribe to."
 
 #. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
-#: lib/command.php:663
+#: lib/command.php:675
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "Can't subscribe to OMB profiles by command."
 
 #. TRANS: Text shown after having subscribed to another user successfully.
 #. TRANS: %s is the name of the user the subscription was requested for.
-#: lib/command.php:671
+#: lib/command.php:683
 #, php-format
 msgid "Subscribed to %s."
 msgstr ""
 
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.
-#: lib/command.php:692 lib/command.php:803
+#: lib/command.php:704 lib/command.php:815
 msgid "Specify the name of the user to unsubscribe from."
 msgstr "Specify the name of the user to unsubscribe from."
 
 #. TRANS: Text shown after having unsubscribed from another user successfully.
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:703
+#: lib/command.php:715
 #, php-format
 msgid "Unsubscribed from %s."
 msgstr ""
 
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
-#: lib/command.php:723 lib/command.php:749
+#: lib/command.php:735 lib/command.php:761
 msgid "Command not yet implemented."
 msgstr "Command not yet implemented."
 
 #. TRANS: Text shown when issuing the command "off" successfully.
-#: lib/command.php:727
+#: lib/command.php:739
 msgid "Notification off."
 msgstr "Notification off."
 
 #. TRANS: Error text shown when the command "off" fails for an unknown reason.
-#: lib/command.php:730
+#: lib/command.php:742
 msgid "Can't turn off notification."
 msgstr "Can't turn off notification."
 
 #. TRANS: Text shown when issuing the command "on" successfully.
-#: lib/command.php:753
+#: lib/command.php:765
 msgid "Notification on."
 msgstr "Notification on."
 
 #. TRANS: Error text shown when the command "on" fails for an unknown reason.
-#: lib/command.php:756
+#: lib/command.php:768
 msgid "Can't turn on notification."
 msgstr "Can't turn on notification."
 
 #. TRANS: Error text shown when issuing the login command while login is disabled.
-#: lib/command.php:770
+#: lib/command.php:782
 msgid "Login command is disabled."
 msgstr ""
 
 #. TRANS: Text shown after issuing the login command successfully.
 #. TRANS: %s is a logon link..
-#: lib/command.php:783
+#: lib/command.php:795
 #, php-format
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
 
 #. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:812
+#: lib/command.php:824
 #, php-format
 msgid "Unsubscribed %s."
 msgstr ""
 
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
-#: lib/command.php:830
+#: lib/command.php:842
 msgid "You are not subscribed to anyone."
 msgstr "You are not subscribed to anyone."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
-#: lib/command.php:835
+#: lib/command.php:847
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "You are subscribed to this person:"
@@ -8184,14 +8061,14 @@ msgstr[1] "You are subscribed to these people:"
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user
 #. TRANS: (followers) without having any subscribers.
-#: lib/command.php:857
+#: lib/command.php:869
 msgid "No one is subscribed to you."
 msgstr "No one is subscribed to you."
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
-#: lib/command.php:862
+#: lib/command.php:874
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "This person is subscribed to you:"
@@ -8199,21 +8076,21 @@ msgstr[1] "These people are subscribed to you:"
 
 #. TRANS: Text shown after requesting groups a user is subscribed to without having
 #. TRANS: any group subscriptions.
-#: lib/command.php:884
+#: lib/command.php:896
 msgid "You are not a member of any groups."
 msgstr "You are not a member of any groups."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
-#: lib/command.php:889
+#: lib/command.php:901
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "You are a member of this group:"
 msgstr[1] "You are a member of these groups:"
 
 #. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-#: lib/command.php:904
+#: lib/command.php:916
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -8354,11 +8231,6 @@ msgstr "Authorised connected applications"
 msgid "Database error"
 msgstr ""
 
-#. TRANS: Description of form for deleting a user.
-#: lib/deleteuserform.php:75
-msgid "Delete this user"
-msgstr "Delete this user"
-
 #. TRANS: Label in form on profile design page.
 #. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
 #: lib/designsettings.php:108
@@ -8396,21 +8268,6 @@ msgstr "Change colours"
 msgid "Use defaults"
 msgstr "Use defaults"
 
-#. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: lib/designsettings.php:259
-msgid "Restore default designs"
-msgstr "Restore default designs"
-
-#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: lib/designsettings.php:267
-msgid "Reset back to default"
-msgstr "Reset back to default"
-
-#. TRANS: Title for button on profile design page to save settings.
-#: lib/designsettings.php:272
-msgid "Save design"
-msgstr "Save design"
-
 #. TRANS: Error message displayed if design settings could not be saved.
 #. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
 #: lib/designsettings.php:405 lib/designsettings.php:427
@@ -9202,10 +9059,6 @@ msgstr "Reply to this notice"
 msgid "Reply"
 msgstr "Reply"
 
-#: lib/noticelist.php:673
-msgid "Delete this notice"
-msgstr "Delete this notice"
-
 #: lib/noticelist.php:691
 msgid "Notice repeated"
 msgstr "Notice repeated"
@@ -9487,10 +9340,6 @@ msgstr "Invite"
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Invite friends and colleagues to join you on %s"
 
-#: lib/subscribeform.php:115 lib/subscribeform.php:139
-msgid "Subscribe to this user"
-msgstr "Subscribe to this user"
-
 #: lib/subscriberspeopleselftagcloudsection.php:48
 #: lib/subscriptionspeopleselftagcloudsection.php:48
 msgid "People Tagcloud as self-tagged"
@@ -9660,23 +9509,18 @@ msgctxt "role"
 msgid "Moderator"
 msgstr "Moderator"
 
-#: lib/util.php:305
-#, fuzzy
-msgid "Not allowed to log in."
-msgstr "Not logged in."
-
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1309
+#: lib/util.php:1306
 msgid "a few seconds ago"
 msgstr "a few seconds ago"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1312
+#: lib/util.php:1309
 msgid "about a minute ago"
 msgstr "about a minute ago"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1316
+#: lib/util.php:1313
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
@@ -9684,12 +9528,12 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1319
+#: lib/util.php:1316
 msgid "about an hour ago"
 msgstr "about an hour ago"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1323
+#: lib/util.php:1320
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
@@ -9697,12 +9541,12 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1326
+#: lib/util.php:1323
 msgid "about a day ago"
 msgstr "about a day ago"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1330
+#: lib/util.php:1327
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
@@ -9710,12 +9554,12 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1333
+#: lib/util.php:1330
 msgid "about a month ago"
 msgstr "about a month ago"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1337
+#: lib/util.php:1334
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
@@ -9723,7 +9567,7 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1340
+#: lib/util.php:1337
 msgid "about a year ago"
 msgstr "about a year ago"
 
@@ -9765,3 +9609,74 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#, fuzzy
+#~ msgid "Block this user."
+#~ msgstr "Block this user"
+
+#, fuzzy
+#~ msgid "Delete this notice."
+#~ msgstr "Delete this notice"
+
+#, fuzzy
+#~ msgid "Delete this user."
+#~ msgstr "Delete this user"
+
+#, fuzzy
+#~ msgid "Restore default designs."
+#~ msgstr "Restore default designs"
+
+#, fuzzy
+#~ msgid "Reset back to default."
+#~ msgstr "Reset back to default"
+
+#, fuzzy
+#~ msgid "Save design."
+#~ msgstr "Save design"
+
+#, fuzzy
+#~ msgid "Disfavor favorite."
+#~ msgstr "Disfavor favourite"
+
+#, fuzzy
+#~ msgid "\"%s\" not found."
+#~ msgstr "API method not found."
+
+#, fuzzy
+#~ msgid "Notice %s not found."
+#~ msgstr "API method not found."
+
+#, fuzzy
+#~ msgid "Attachment %s not found."
+#~ msgstr "Recipient user not found."
+
+#, fuzzy
+#~ msgid "Invalid tag: \"%s\"."
+#~ msgstr "Invalid tag: \"%s\""
+
+#, fuzzy
+#~ msgid "%s updates from everyone."
+#~ msgstr "%s updates from everyone!"
+
+#, fuzzy
+#~ msgid "Password saved"
+#~ msgstr "Password saved."
+
+#, fuzzy
+#~ msgid "Where you are, like \"City, State (or Region), Country\"."
+#~ msgstr "Where you are, like \"City, State (or Region), Country\""
+
+#, fuzzy
+#~ msgid "Subscribe to this user."
+#~ msgstr "Subscribe to this user"
+
+#, fuzzy
+#~ msgid ""
+#~ "Listenee stream license \"%1$s\" is not compatible with site license \"%2"
+#~ "$s\"."
+#~ msgstr ""
+#~ "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
+
+#, fuzzy
+#~ msgid "Not allowed to log in."
+#~ msgstr "Not logged in."
diff --git a/locale/eo/LC_MESSAGES/statusnet.po b/locale/eo/LC_MESSAGES/statusnet.po
index 2264f654e3..6c88da49f1 100644
--- a/locale/eo/LC_MESSAGES/statusnet.po
+++ b/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-02-24 10:32+0000\n"
-"PO-Revision-Date: 2011-02-24 10:36:28+0000\n"
+"POT-Creation-Date: 2011-03-03 15:58+0000\n"
+"PO-Revision-Date: 2011-03-03 16:00:23+0000\n"
 "Language-Team: Esperanto <http://translatewiki.net/wiki/Portal:eo>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r82712); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: eo\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-02-17 11:39:54+0000\n"
+"X-POT-Import-Date: 2011-02-25 23:49:23+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -139,11 +139,7 @@ msgstr "Ne estas tiu paĝo."
 #. 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 use "one time password login" without using an existing user.
-#. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
-#. TRANS: Client error displayed trying to find a user by ID for a non-existing ID.
-#. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when calling a profile action without specifying a user.
 #: actions/all.php:80 actions/allrss.php:69
@@ -161,12 +157,12 @@ msgstr "Ne estas tiu paĝo."
 #: actions/apitimelinementions.php:77 actions/apitimelineuser.php:79
 #: actions/avatarbynickname.php:79 actions/favoritesrss.php:72
 #: actions/foaf.php:42 actions/foaf.php:61 actions/hcard.php:67
-#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:78
+#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
 #: actions/remotesubscribe.php:144 actions/remotesubscribe.php:153
-#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:113
-#: actions/showfavorites.php:106 actions/userbyid.php:75
+#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
+#: actions/showfavorites.php:106 actions/userbyid.php:74
 #: actions/usergroups.php:93 actions/userrss.php:40 actions/userxrd.php:59
-#: actions/xrds.php:71 lib/command.php:497 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:509 lib/galleryaction.php:59
 #: lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Ne ekzistas tiu uzanto."
@@ -295,7 +291,7 @@ msgstr "Ĝisdatiĝoj de %1$s kaj amikoj ĉe %2$s!"
 #: actions/apigrouplistall.php:120 actions/apigroupmembership.php:105
 #: actions/apigroupshow.php:114 actions/apihelptest.php:84
 #: actions/apistatusesdestroy.php:101 actions/apistatusesretweets.php:110
-#: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:138
+#: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:139
 #: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
 #: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:268
 #: actions/apitimelinegroup.php:147 actions/apitimelinehome.php:173
@@ -528,7 +524,7 @@ msgstr "Ricevonta uzanto ne troviĝas."
 #. TRANS: Client error displayed trying to direct message another user who's not a friend (403).
 #: actions/apidirectmessagenew.php:144
 #, fuzzy
-msgid "Cannot send direct messages to users who aren't your friend."
+msgid "Can't send direct messages to users who aren't your friend."
 msgstr "Vi ne povas sendi rektan mesaĝon al uzanto kiu ne estas via amiko."
 
 #. TRANS: Client error displayed trying to direct message self (403).
@@ -553,7 +549,7 @@ msgstr "Ĉi tiu stato jam estas  ŝatata."
 #. TRANS: Client error displayed when marking a notice as favourite fails.
 #. TRANS: Server error displayed when trying to mark a notice as favorite fails in the database.
 #. TRANS: Error message text shown when a favorite could not be set.
-#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:294
+#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:306
 msgid "Could not create favorite."
 msgstr "Malsukcesis krei ŝataton."
 
@@ -611,7 +607,7 @@ msgstr "Malsukcesis trovi celan uzanton."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:191
 #: actions/newgroup.php:137 actions/profilesettings.php:273
-#: actions/register.php:206
+#: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "La uzantnomo jam uziĝis. Provu ion alian."
 
@@ -621,7 +617,7 @@ msgstr "La uzantnomo jam uziĝis. Provu ion alian."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:195
 #: actions/newgroup.php:141 actions/profilesettings.php:243
-#: actions/register.php:208
+#: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "Ne valida kromnomo."
 
@@ -634,7 +630,7 @@ msgstr "Ne valida kromnomo."
 #: actions/apigroupcreate.php:181 actions/editapplication.php:235
 #: actions/editgroup.php:202 actions/newapplication.php:221
 #: actions/newgroup.php:148 actions/profilesettings.php:248
-#: actions/register.php:215
+#: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "Ĉefpaĝo ne estas valida URL."
 
@@ -644,7 +640,7 @@ msgstr "Ĉefpaĝo ne estas valida URL."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:191 actions/editgroup.php:206
 #: actions/newgroup.php:152 actions/profilesettings.php:252
-#: actions/register.php:218
+#: actions/register.php:226
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "Kompleta nomo tro longas (maksimume 255 signoj)"
 
@@ -672,7 +668,7 @@ msgstr[1] "Priskribo estas tro longa (maksimume %d signoj)."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:215 actions/editgroup.php:218
 #: actions/newgroup.php:164 actions/profilesettings.php:265
-#: actions/register.php:227
+#: actions/register.php:235
 msgid "Location is too long (maximum 255 characters)."
 msgstr "Lokonomo tro longas (maksimume 255 signoj)"
 
@@ -728,14 +724,14 @@ msgstr "Grupo ne troviĝas."
 #. TRANS: Server error displayed when trying to join a group the user is already a member of.
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:333
+#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:345
 msgid "You are already a member of that group."
 msgstr "Vi estas jam grupano."
 
 #. TRANS: Server error displayed when trying to join a group the user is blocked from joining.
 #. 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.
-#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:338
+#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:350
 msgid "You have been blocked from that group by the admin."
 msgstr "La administranto blokis vin de tiu grupo."
 
@@ -745,7 +741,7 @@ msgstr "La administranto blokis vin de tiu grupo."
 #. TRANS: %1$s is the joining user's nickname, $2$s is the group nickname for which the join failed.
 #. TRANS: Message given having failed to add a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:350
+#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:362
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "La uzanto %1$*s ne povas aliĝi al la grupo %2$*s."
@@ -762,7 +758,7 @@ msgstr "Vi ne estas grupano."
 #. TRANS: Message given having failed to remove a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
 #: actions/apigroupleave.php:127 actions/leavegroup.php:133
-#: lib/command.php:398
+#: lib/command.php:410
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
 msgstr "Malsukcesis forigi uzanton %1$s de grupo %2$s."
@@ -822,21 +818,20 @@ msgstr ""
 #. TRANS: Form validation error message.
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
-#. TRANS: Client error displayed when the session token is not okay.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
 #: actions/deletenotice.php:177 actions/disfavor.php:75
 #: actions/emailsettings.php:291 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:65 actions/grouplogo.php:321
 #: actions/groupunblock.php:65 actions/imsettings.php:224
-#: actions/invite.php:60 actions/login.php:131 actions/makeadmin.php:66
+#: actions/invite.php:60 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
-#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:136
-#: actions/othersettings.php:155 actions/passwordsettings.php:137
+#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
+#: actions/othersettings.php:155 actions/passwordsettings.php:138
 #: actions/profilesettings.php:217 actions/recoverpassword.php:383
-#: actions/register.php:164 actions/remotesubscribe.php:76
+#: actions/register.php:172 actions/remotesubscribe.php:76
 #: actions/repeat.php:82 actions/smssettings.php:250 actions/subedit.php:40
-#: actions/subscribe.php:87 actions/tagother.php:166
-#: actions/unsubscribe.php:69 actions/userauthorization.php:53
+#: actions/subscribe.php:86 actions/tagother.php:166
+#: actions/unsubscribe.php:69 actions/userauthorization.php:52
 #: lib/designsettings.php:310
 msgid "There was a problem with your session token. Try again, please."
 msgstr "Estis problemo pri via seanco. Bonvolu provi refoje."
@@ -868,7 +863,7 @@ msgstr "Datumbaza eraro enigi la uzanton de *OAuth-aplikaĵo."
 #: actions/designadminpanel.php:100 actions/editapplication.php:144
 #: actions/emailsettings.php:310 actions/grouplogo.php:332
 #: actions/imsettings.php:239 actions/newapplication.php:124
-#: actions/oauthconnectionssettings.php:145 actions/recoverpassword.php:46
+#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
 #: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
 msgstr "Neatendita formo-sendo."
@@ -919,20 +914,19 @@ msgstr "Konto"
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group nickname (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT for nick name in a profile.
-#: actions/apioauthauthorize.php:459 actions/login.php:242
-#: actions/profilesettings.php:106 actions/register.php:418
+#: actions/apioauthauthorize.php:459 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:432
 #: actions/showgroup.php:243 actions/tagother.php:94
-#: actions/userauthorization.php:152 lib/groupeditform.php:145
+#: actions/userauthorization.php:145 lib/groupeditform.php:145
 #: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "Kromnomo"
 
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:463 actions/login.php:245
-#: actions/register.php:422 lib/accountsettingsaction.php:120
+#: actions/apioauthauthorize.php:463 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:120
 msgid "Password"
 msgstr "Pasvorto"
 
@@ -1027,13 +1021,13 @@ msgstr "Ne estas tiu avizo."
 
 #. TRANS: Client error displayed trying to repeat an own notice through the API.
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:537
+#: actions/apistatusesretweet.php:83 lib/command.php:549
 msgid "Cannot repeat your own notice."
 msgstr "Vi ne povas ripeti vian propran avizon."
 
 #. TRANS: Client error displayed trying to re-repeat a notice through the API.
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:92 lib/command.php:543
+#: actions/apistatusesretweet.php:92 lib/command.php:555
 msgid "Already repeated that notice."
 msgstr "La avizo jam ripetiĝis."
 
@@ -1056,7 +1050,7 @@ msgstr "Metodo de API ne troviĝas."
 #. TRANS: %s is the requested output format.
 #: actions/apistatusesshow.php:144
 #, fuzzy, php-format
-msgid "Unsupported format: %s."
+msgid "Unsupported format: %s"
 msgstr "Formato ne subtenata."
 
 #. TRANS: Client error displayed requesting a deleted status.
@@ -1163,14 +1157,13 @@ msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr "%1$s ĝisdatigoj kiuj respondas al ĝisdatigoj de %2$s / %3$s."
 
 #. TRANS: Title for site timeline. %s is the StatusNet sitename.
-#. TRANS: Public RSS feed title. %s is the StatusNet site name.
 #: actions/apitimelinepublic.php:193 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "%s publika tempstrio"
 
 #. TRANS: Subtitle for site timeline. %s is the StatusNet sitename.
-#: actions/apitimelinepublic.php:199
+#: actions/apitimelinepublic.php:199 actions/publicrss.php:105
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "%s ĝisdatigoj de ĉiuj!"
@@ -1237,26 +1230,25 @@ msgid "Atom post must be an Atom entry."
 msgstr ""
 
 #. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
-#: actions/apitimelineuser.php:334
+#: actions/apitimelineuser.php:335
 msgid "Can only handle POST activities."
 msgstr ""
 
 #. TRANS: Client error displayed when using an unsupported activity object type.
 #. TRANS: %s is the unsupported activity object type.
-#: actions/apitimelineuser.php:345
+#: actions/apitimelineuser.php:346
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
 #. TRANS: %d is the notice ID (number).
-#: actions/apitimelineuser.php:379
+#: actions/apitimelineuser.php:380
 #, fuzzy, php-format
 msgid "No content for notice %d."
 msgstr "Serĉi enhavon ĉe la retejo"
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#. TRANS: %s is the notice URI.
 #: actions/apitimelineuser.php:408
 #, fuzzy, php-format
 msgid "Notice with URI \"%s\" already exists."
@@ -1275,10 +1267,9 @@ msgstr "Metodo de API ne troviĝas."
 
 #. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
 #. TRANS: Client exception.
-#. TRANS: Client error displayed trying to subscribe to a non-existing profile.
 #: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
 #: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
-#: actions/subscribe.php:110
+#: actions/subscribe.php:107
 msgid "No such profile."
 msgstr "Ne ekzistas tia profilo."
 
@@ -1414,7 +1405,7 @@ msgstr "Malsukcesis forigi ŝataton."
 #: actions/joingroup.php:95 actions/leavegroup.php:82
 #: actions/leavegroup.php:95 actions/makeadmin.php:86
 #: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:380
+#: lib/command.php:392
 msgid "No such group."
 msgstr "Ne estas tiu grupo."
 
@@ -1425,7 +1416,7 @@ msgid "Not a member."
 msgstr "Ne estas ano."
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
-#: actions/atompubshowmembership.php:150
+#: actions/atompubshowmembership.php:151
 #, fuzzy
 msgid "Cannot delete someone else's membership."
 msgstr "Ne eblas forigi abonon al vi mem."
@@ -1530,11 +1521,9 @@ msgstr "Vi povas alŝuti vian personan vizaĝbildon. Dosiero-grandlimo estas %s.
 
 #. TRANS: Server error displayed in avatar upload page when no matching profile can be found for a user.
 #. TRANS: Server error displayed coming across a request from a user without a profile.
-#. TRANS: Server error displayed when trying to authorise a remote subscription request
-#. TRANS: while the user has no profile.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
 #: actions/grouplogo.php:184 actions/remotesubscribe.php:190
-#: actions/userauthorization.php:75 actions/userrss.php:108
+#: actions/userauthorization.php:72 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr "Uzanto sen egala profilo."
 
@@ -1592,10 +1581,10 @@ msgstr "Tranĉi"
 msgid "No file uploaded."
 msgstr "Neniu dosiero alŝutiĝas."
 
-#. TRANS: Avatar upload form instruction after uploading a file.
+#. TRANS: Avatar upload form unstruction after uploading a file.
 #: actions/avatarsettings.php:345
 #, fuzzy
-msgid "Pick a square area of the image to be your avatar."
+msgid "Pick a square area of the image to be your avatar"
 msgstr "Elektu kvadratan parton de la bildo kiel via vizaĝbildo"
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
@@ -1637,7 +1626,7 @@ msgid "You may not backup your account."
 msgstr ""
 
 #. TRANS: Information displayed on the backup account page.
-#: actions/backupaccount.php:225
+#: actions/backupaccount.php:227
 msgid ""
 "You can backup your account data in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format. This is an experimental feature and provides "
@@ -1647,15 +1636,15 @@ msgid ""
 msgstr ""
 
 #. TRANS: Submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:248
+#: actions/backupaccount.php:250
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Backup"
 msgstr "Fono"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:252
-msgid "Backup your account."
+#: actions/backupaccount.php:254
+msgid "Backup your account"
 msgstr ""
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
@@ -1696,7 +1685,7 @@ msgstr "Ne"
 #. TRANS: Submit button title for 'No' when blocking a user.
 #: actions/block.php:158
 #, fuzzy
-msgid "Do not block this user."
+msgid "Do not block this user"
 msgstr "Ne bloki la uzanton"
 
 #. TRANS: Button label on the user block form.
@@ -1713,9 +1702,9 @@ msgid "Yes"
 msgstr "Jes"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:165
-#, fuzzy
-msgid "Block this user."
+#. TRANS: Description of the form to block a user.
+#: actions/block.php:165 lib/blockform.php:79
+msgid "Block this user"
 msgstr "Bloki la uzanton"
 
 #. TRANS: Server error displayed when blocking a user fails.
@@ -1880,7 +1869,7 @@ msgstr ""
 #. TRANS: Field label for delete account confirmation entry.
 #. TRANS: Field label for password reset form where the password has to be typed again.
 #: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:262 actions/register.php:426
+#: actions/recoverpassword.php:262 actions/register.php:440
 msgid "Confirm"
 msgstr "Konfirmi"
 
@@ -1910,14 +1899,14 @@ msgstr "Aplikaĵo ne trovita."
 #. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
 #: actions/deleteapplication.php:79 actions/editapplication.php:78
-#: actions/showapplication.php:90
+#: actions/showapplication.php:94
 msgid "You are not the owner of this application."
 msgstr "Vi ne estas la posedanto de ĉi tiu aplikaĵo."
 
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
-#: actions/newapplication.php:112 actions/showapplication.php:113
-#: lib/action.php:1422
+#: actions/newapplication.php:112 actions/showapplication.php:118
+#: lib/action.php:1425
 msgid "There was a problem with your session token."
 msgstr "Problemo okazas pri via seancĵetono."
 
@@ -1940,13 +1929,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting an application.
 #: actions/deleteapplication.php:161
 #, fuzzy
-msgid "Do not delete this application."
+msgid "Do not delete this application"
 msgstr "Ne forigu ĉi tiun aplikaĵon."
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
 #: actions/deleteapplication.php:167
 #, fuzzy
-msgid "Delete this application."
+msgid "Delete this application"
 msgstr "Viŝi ĉi tiun aplikon"
 
 #. TRANS: Client error when trying to delete group while not logged in.
@@ -2004,13 +1993,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting a group.
 #: actions/deletegroup.php:224
 #, fuzzy
-msgid "Do not delete this group."
+msgid "Do not delete this group"
 msgstr "Ne forigi la avizon"
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
 #: actions/deletegroup.php:231
 #, fuzzy
-msgid "Delete this group."
+msgid "Delete this group"
 msgstr "Forigi la uzanton"
 
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
@@ -2018,15 +2007,13 @@ msgstr "Forigi la uzanton"
 #. TRANS: Client error displayed when trying to mark a notice as favorite without being logged in.
 #. TRANS: Client error displayed trying to block a user from a group while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
-#. TRANS: Client error displayed trying to log out when not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
-#. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
 #. TRANS: Client error displayed when trying to change user options while not logged in.
 #: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
-#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:70
+#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
-#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:98
+#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
 #: lib/adminpanelaction.php:71 lib/profileformaction.php:63
 #: lib/settingsaction.php:72
@@ -2055,13 +2042,12 @@ msgstr "Ĉu vi certe volas forigi la avizon?"
 #. TRANS: Submit button title for 'No' when deleting a notice.
 #: actions/deletenotice.php:159
 #, fuzzy
-msgid "Do not delete this notice."
+msgid "Do not delete this notice"
 msgstr "Ne forigi la avizon"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:166
-#, fuzzy
-msgid "Delete this notice."
+#: actions/deletenotice.php:166 lib/noticelist.php:673
+msgid "Delete this notice"
 msgstr "Forigi la avizon"
 
 #. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
@@ -2098,13 +2084,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting a user.
 #: actions/deleteuser.php:158
 #, fuzzy
-msgid "Do not delete this user."
+msgid "Do not delete this user"
 msgstr "Ne forigi la avizon"
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
-#: actions/deleteuser.php:165
-#, fuzzy
-msgid "Delete this user."
+#. TRANS: Description of form for deleting a user.
+#: actions/deleteuser.php:165 lib/deleteuserform.php:75
+msgid "Delete this user"
 msgstr "Forigi la uzanton"
 
 #. TRANS: Message used as title for design settings for the site.
@@ -2270,21 +2256,21 @@ msgid "Use defaults"
 msgstr "Uzu defaŭlton"
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:720
-#, fuzzy
-msgid "Restore default designs."
+#. TRANS: Title for button on profile design page to reset all colour settings to default.
+#: actions/designadminpanel.php:720 lib/designsettings.php:259
+msgid "Restore default designs"
 msgstr "Restaŭri defaŭltajn desegnojn"
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:728
-#, fuzzy
-msgid "Reset back to default."
+#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
+#: actions/designadminpanel.php:728 lib/designsettings.php:267
+msgid "Reset back to default"
 msgstr "Redefaŭltiĝi"
 
 #. TRANS: Title for button for saving theme settings.
-#: actions/designadminpanel.php:736
-#, fuzzy
-msgid "Save design."
+#. TRANS: Title for button on profile design page to save settings.
+#: actions/designadminpanel.php:736 lib/designsettings.php:272
+msgid "Save design"
 msgstr "Savi desegnon"
 
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
@@ -2316,7 +2302,7 @@ msgid "You must be logged in to edit an application."
 msgstr "Ensalutu por redakti la aplikaĵon."
 
 #. TRANS: Client error displayed trying to edit an application that does not exist.
-#: actions/editapplication.php:83 actions/showapplication.php:83
+#: actions/editapplication.php:83 actions/showapplication.php:87
 msgid "No such application."
 msgstr "Ne estas tia aplikaĵo."
 
@@ -2597,7 +2583,7 @@ msgid "Cannot normalize that email address."
 msgstr "Malsukcesis normigi tiun retpoŝtadreson"
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:393 actions/register.php:204
+#: actions/emailsettings.php:393 actions/register.php:212
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "Retpoŝta adreso ne valida"
@@ -2673,22 +2659,19 @@ msgstr "Ne estas alvena retpoŝtadreso"
 
 #. 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.
 #: actions/emailsettings.php:530 actions/emailsettings.php:554
-#: actions/smssettings.php:566 actions/smssettings.php:591
+#: actions/smssettings.php:565 actions/smssettings.php:588
 #, fuzzy
 msgid "Could not update user record."
 msgstr "Malsukcesis ĝisdatigi uzantan informon."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
-#. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:534 actions/smssettings.php:570
+#: actions/emailsettings.php:534 actions/smssettings.php:568
 msgid "Incoming email address removed."
 msgstr "Alvena retpoŝtadreso forigita."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
-#. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:558 actions/smssettings.php:595
+#: actions/emailsettings.php:558 actions/smssettings.php:591
 msgid "New incoming email address added."
 msgstr "Nova alvena retpoŝtadreso aldonita."
 
@@ -2700,7 +2683,7 @@ msgstr "Ĉi tiu avizo jam estas ŝatata."
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
 #: actions/favor.php:95
 #, fuzzy
-msgid "Disfavor favorite."
+msgid "Disfavor favorite"
 msgstr "Malŝati ŝataton."
 
 #. TRANS: Page title for first page of favorited notices.
@@ -2939,13 +2922,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
 #: actions/groupblock.php:191
 #, fuzzy
-msgid "Do not block this user from this group."
+msgid "Do not block this user from this group"
 msgstr "Ne bloki la uzanton de la grupo"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
 #: actions/groupblock.php:198
 #, fuzzy
-msgid "Block this user from this group."
+msgid "Block this user from this group"
 msgstr "Bloki la uzanton de la grupo"
 
 #. TRANS: Server error displayed when trying to block a user from a group fails because of an application error.
@@ -2954,7 +2937,6 @@ msgid "Database error blocking user from group."
 msgstr "Malsukcesis forbari uzanton de la grupo pro datumbaza eraro."
 
 #. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
-#. TRANS: Client error displayed trying to find a user by ID without providing an ID.
 #: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr "Neniu ID."
@@ -3140,10 +3122,8 @@ msgid "Group search"
 msgstr "Grup-serĉo"
 
 #. TRANS: Text on page where groups can be searched if no results were found for a query.
-#. TRANS: Text for notice search results is the query had no results.
-#. TRANS: Message on the "People search" page where a query has no results.
-#: actions/groupsearch.php:82 actions/noticesearch.php:122
-#: actions/peoplesearch.php:87
+#: actions/groupsearch.php:82 actions/noticesearch.php:117
+#: actions/peoplesearch.php:83
 msgid "No results."
 msgstr "Neniu rezulto."
 
@@ -3180,7 +3160,6 @@ msgid "User is not blocked from group."
 msgstr "La uzanto ne estas blokita de grupo."
 
 #. TRANS: Server error displayed when unblocking a user from a group fails because of an unknown error.
-#. TRANS: Server error displayed when removing a user block.
 #: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "Eraro ĉe provo malbloki."
@@ -3275,8 +3254,7 @@ msgid "Publish a MicroID for my Jabber/Google Talk address."
 msgstr "Publikigu MikroID por mia Jabber/GTalk-adreso."
 
 #. TRANS: Confirmation message for successful Instant Messaging preferences save.
-#. TRANS: Confirmation message after saving preferences.
-#: actions/imsettings.php:283 actions/othersettings.php:193
+#: actions/imsettings.php:283 actions/othersettings.php:192
 msgid "Preferences saved."
 msgstr "Prefero konservita."
 
@@ -3566,7 +3544,7 @@ msgstr "Ensalutu por eksaniĝi."
 
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
-#: actions/leavegroup.php:103 lib/command.php:386
+#: actions/leavegroup.php:103 lib/command.php:398
 msgid "You are not a member of that group."
 msgstr "Vi ne estas grupano."
 
@@ -3689,41 +3667,39 @@ msgstr "Konservi"
 msgid "Save license settings"
 msgstr ""
 
-#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
-#: actions/login.php:97 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
 msgid "Already logged in."
 msgstr "Vi jam ensalutis."
 
-#: actions/login.php:142
+#: actions/login.php:148
 msgid "Incorrect username or password."
 msgstr "Malĝusta uzantnomo aŭ pasvorto."
 
-#. TRANS: Server error displayed when a user object could not be created trying to login using "one time password login".
-#: actions/login.php:148 actions/otp.php:127
+#: actions/login.php:154 actions/otp.php:120
 msgid "Error setting user. You are probably not authorized."
 msgstr "Eraras agordi uzanton. Vi verŝajne ne rajtiĝas."
 
-#: actions/login.php:202 actions/login.php:253
+#: actions/login.php:210 actions/login.php:263
 msgid "Login"
 msgstr "Ensaluti"
 
-#: actions/login.php:239
+#: actions/login.php:249
 msgid "Login to site"
 msgstr "Ensaluti al la retejo"
 
-#: actions/login.php:248 actions/register.php:476
+#: actions/login.php:258 actions/register.php:490
 msgid "Remember me"
 msgstr "Memoru min"
 
-#: actions/login.php:249 actions/register.php:478
+#: actions/login.php:259 actions/register.php:492
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "Aŭtomate ensaluti estonte; ne taŭge por komuna komputilo!"
 
-#: actions/login.php:259
+#: actions/login.php:269
 msgid "Lost or forgotten password?"
 msgstr "Ĉi via pasvorto perdiĝas?"
 
-#: actions/login.php:277
+#: actions/login.php:288
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -3731,11 +3707,11 @@ msgstr ""
 "Por sekureca kialo, bonvole re-entajpi vian uzantnomon kaj pasvorton antaŭ "
 "ŝanĝi vian agordon."
 
-#: actions/login.php:281
+#: actions/login.php:292
 msgid "Login with your username and password."
 msgstr "Ensaluti per via uzantnomo kaj pasvorto."
 
-#: actions/login.php:284
+#: actions/login.php:295
 #, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -3817,14 +3793,14 @@ msgid "New message"
 msgstr "Nova mesaĝo"
 
 #. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
-#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:501
+#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:513
 msgid "You can't send a message to this user."
 msgstr "Vi ne povas sendi mesaĝon al la uzanto."
 
 #. TRANS: Command exception text shown when trying to send a direct message to another user without content.
 #. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
-#: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:478
-#: lib/command.php:581
+#: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:490
+#: lib/command.php:593
 msgid "No content!"
 msgstr "Neniu enhavo!"
 
@@ -3833,7 +3809,7 @@ msgid "No recipient specified."
 msgstr "Neniu ricevonto speifiĝas."
 
 #. TRANS: Error text shown when trying to send a direct message to self.
-#: actions/newmessage.php:167 lib/command.php:505
+#: actions/newmessage.php:167 lib/command.php:517
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr "Ne sendu mesaĝon al vi mem! Simple suspiru anstataŭ."
@@ -3844,7 +3820,7 @@ msgstr "Mesaĝo sendita"
 
 #. TRANS: Message given have sent a direct message to another user.
 #. TRANS: %s is the name of the other user.
-#: actions/newmessage.php:188 lib/command.php:513
+#: actions/newmessage.php:188 lib/command.php:525
 #, php-format
 msgid "Direct message to %s sent."
 msgstr "Rekta mesaĝo al %s sendiĝis."
@@ -3861,9 +3837,7 @@ msgstr "Nova avizo"
 msgid "Notice posted"
 msgstr "Avizo afiŝiĝas"
 
-#. TRANS: Instructions for Notice search page.
-#. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/noticesearch.php:69
+#: actions/noticesearch.php:68
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -3872,21 +3846,16 @@ msgstr ""
 "Serĉi avizon ĉe %%site.name%% per ĝia enhavo. Dividu serĉvortojn per spaco; "
 "ili estu almenaŭ 3 literojn longaj."
 
-#. TRANS: Title of the page where users can search for notices.
-#: actions/noticesearch.php:80
+#: actions/noticesearch.php:78
 msgid "Text search"
 msgstr "Teksta serĉado"
 
-#. TRANS: Test in RSS notice search.
-#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearch.php:95
+#: actions/noticesearch.php:91
 #, php-format
 msgid "Search results for \"%1$s\" on %2$s"
 msgstr "Trovito per \"%1$s\" ĉe %2$s"
 
-#. TRANS: Text for logged in users making a query for notices without results.
-#. TRANS: This message contains a Markdown link.
-#: actions/noticesearch.php:128
+#: actions/noticesearch.php:121
 #, php-format
 msgid ""
 "Be the first to [post on this topic](%%%%action.newnotice%%%%?"
@@ -3895,9 +3864,7 @@ msgstr ""
 "Estu la unua [afiŝi pri la temo](%%%%action.newnotice%%%%?status_textarea=%"
 "s)!"
 
-#. TRANS: Text for not logged in users making a query for notices without results.
-#. TRANS: This message contains Markdown links.
-#: actions/noticesearch.php:133
+#: actions/noticesearch.php:124
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and be the first to "
@@ -3906,17 +3873,14 @@ msgstr ""
 "Kial ne [krei konton](%%%%action.register%%%%) kaj esti la unua [afiŝi pri "
 "la temo](%%%%action.newnotice%%%%?status_textarea=%s)!"
 
-#. TRANS: RSS notice search feed title. %s is the query.
-#: actions/noticesearchrss.php:95
+#: actions/noticesearchrss.php:96
 #, php-format
 msgid "Updates with \"%s\""
 msgstr "Ĝisdatiĝo enhavante \"%s\""
 
-#. TRANS: RSS notice search feed description.
-#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearchrss.php:99
+#: actions/noticesearchrss.php:98
 #, fuzzy, php-format
-msgid "Updates matching search term \"%1$s\" on %2$s."
+msgid "Updates matching search term \"%1$s\" on %2$s!"
 msgstr "Ĝisdatiĝo kongruanta al serĉvorto \"%1$s\" ĉe %2$s!"
 
 #: actions/nudge.php:85
@@ -3958,30 +3922,30 @@ msgid "You have not registered any applications yet."
 msgstr "Vi ankoraŭ neniun aplikaĵon registris."
 
 #. TRANS: Title for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:70
+#: actions/oauthconnectionssettings.php:71
 msgid "Connected applications"
 msgstr "Konektita aplikaĵo"
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:81
+#: actions/oauthconnectionssettings.php:83
 msgid "The following connections exist for your account."
 msgstr ""
 
 #. TRANS: Client error when trying to revoke access for an application while not being a user of it.
-#: actions/oauthconnectionssettings.php:166
+#: actions/oauthconnectionssettings.php:168
 msgid "You are not a user of that application."
 msgstr "Mi ne estas uzanto de tiu aplikaĵo."
 
 #. TRANS: Client error when revoking access has failed for some reason.
 #. TRANS: %s is the application ID revoking access failed for.
-#: actions/oauthconnectionssettings.php:181
+#: actions/oauthconnectionssettings.php:183
 #, fuzzy, php-format
 msgid "Unable to revoke access for application: %s."
 msgstr "Maleble revoki aliradon al aplikaĵo: %s."
 
 #. TRANS: Success message after revoking access for an application.
 #. TRANS: %1$s is the application name, %2$s is the first part of the user token.
-#: actions/oauthconnectionssettings.php:200
+#: actions/oauthconnectionssettings.php:202
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -3989,30 +3953,20 @@ msgid ""
 msgstr ""
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:211
+#: actions/oauthconnectionssettings.php:213
 msgid "You have not authorized any applications to use your account."
 msgstr "Vi ne rajtigis iun ajn aplikaĵon uzi vian konton."
 
 #. TRANS: Note for developers in the OAuth connection settings form.
 #. TRANS: This message contains a Markdown link. Do not separate "](".
 #. TRANS: %s is the URL to the OAuth settings.
-#: actions/oauthconnectionssettings.php:231
+#: actions/oauthconnectionssettings.php:233
 #, php-format
 msgid ""
 "Are you a developer? [Register an OAuth client application](%s) to use with "
 "this instance of StatusNet."
 msgstr ""
 
-#: actions/oembed.php:64
-#, fuzzy, php-format
-msgid "\"%s\" not found."
-msgstr "Metodo de API ne troviĝas."
-
-#: actions/oembed.php:76
-#, fuzzy, php-format
-msgid "Notice %s not found."
-msgstr "Metodo de API ne troviĝas."
-
 #: actions/oembed.php:80 actions/shownotice.php:100
 msgid "Notice has no profile."
 msgstr "Avizo sen profilo"
@@ -4022,16 +3976,6 @@ msgstr "Avizo sen profilo"
 msgid "%1$s's status on %2$s"
 msgstr "Stato de %1$s ĉe %2$s"
 
-#: actions/oembed.php:95
-#, fuzzy, php-format
-msgid "Attachment %s not found."
-msgstr "Ricevonta uzanto ne troviĝas."
-
-#: actions/oembed.php:136
-#, php-format
-msgid "\"%s\" not supported for oembed requests."
-msgstr ""
-
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
 #: actions/oembed.php:168
 #, php-format
@@ -4050,12 +3994,11 @@ msgstr "Bonvolu, nur %s-URL per plata HTTP."
 msgid "Not a supported data format."
 msgstr "Datumformato ne subteniĝas."
 
-#. TRANS: ShortName in the OpenSearch interface when trying to find users.
 #: actions/opensearch.php:64
 msgid "People Search"
 msgstr "Homserĉo"
 
-#: actions/opensearch.php:68
+#: actions/opensearch.php:67
 msgid "Notice Search"
 msgstr "Avizoserĉo"
 
@@ -4103,46 +4046,37 @@ msgstr "Montri aŭ kaŝi profilo-desegnon."
 msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr "URL-mallongigado-servo tro longas (maksimume 50 literojn)."
 
-#. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
-#: actions/otp.php:70
+#: actions/otp.php:69
 msgid "No user ID specified."
 msgstr "Neniu uzanto-ID specifiĝas."
 
-#. TRANS: Client error displayed trying to use "one time password login" without specifying a login token.
-#: actions/otp.php:86
+#: actions/otp.php:83
 msgid "No login token specified."
 msgstr "Neniu ensalutado-ĵetono specifiĝas."
 
-#. TRANS: Client error displayed trying to use "one time password login" without requesting a login token.
-#: actions/otp.php:94
+#: actions/otp.php:90
 msgid "No login token requested."
 msgstr "Neniu ensalutad-ĵetono bezoniĝas."
 
-#. TRANS: Client error displayed trying to use "one time password login" while specifying an invalid login token.
-#: actions/otp.php:100
+#: actions/otp.php:95
 msgid "Invalid login token specified."
 msgstr "Specifita ensalutado-ĵetono nevalidas."
 
-#. TRANS: Client error displayed trying to use "one time password login" while specifying an expired login token.
-#: actions/otp.php:110
+#: actions/otp.php:104
 msgid "Login token expired."
 msgstr "Ensalutado-ĵetono eksvalidiĝas."
 
-#. TRANS: Title for outbox for any but the fist page.
-#. TRANS: %1$s is the user nickname, %2$d is the page number.
-#: actions/outbox.php:57
+#: actions/outbox.php:58
 #, php-format
 msgid "Outbox for %1$s - page %2$d"
 msgstr "elirkesto de %1$s - paĝo %2$d"
 
-#. TRANS: Title for first page of outbox.
 #: actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
 msgstr "Elirkesto de %s"
 
-#. TRANS: Instructions for outbox.
-#: actions/outbox.php:103
+#: actions/outbox.php:104
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr ""
 "Tio ĉi estas via elirkesto, kie listiĝas privataj mesaĝoj, kiujn vi sendis."
@@ -4169,45 +4103,43 @@ msgstr "Malnova pasvorto"
 msgid "New password"
 msgstr "Nova pasvorto"
 
-#: actions/passwordsettings.php:109 actions/register.php:423
+#: actions/passwordsettings.php:109
 #, fuzzy
-msgid "6 or more characters."
+msgid "6 or more characters"
 msgstr "6 aŭ pli da literoj"
 
-#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:264
-#: actions/register.php:427
+#: actions/passwordsettings.php:113
 #, fuzzy
-msgid "Same as password above."
+msgid "Same as password above"
 msgstr "Same kiel pasvorto supra"
 
 #: actions/passwordsettings.php:117
 msgid "Change"
 msgstr "Ŝanĝi"
 
-#: actions/passwordsettings.php:153 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:238
 msgid "Password must be 6 or more characters."
 msgstr "Pasvorto devas esti 6-litera aŭ pli longa."
 
-#: actions/passwordsettings.php:156 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:241
 msgid "Passwords don't match."
 msgstr "La pasvortoj diferencas."
 
-#: actions/passwordsettings.php:164
+#: actions/passwordsettings.php:165
 msgid "Incorrect old password"
 msgstr "Neĝusta malnova pasvorto"
 
-#: actions/passwordsettings.php:180
+#: actions/passwordsettings.php:181
 msgid "Error saving user; invalid."
 msgstr "Eraris konservi uzanton: nevalida."
 
-#. TRANS: Reset password form validation error message.
-#: actions/passwordsettings.php:185 actions/recoverpassword.php:418
+#: actions/passwordsettings.php:186
 #, fuzzy
-msgid "Cannot save new password."
+msgid "Can't save new password."
 msgstr "Malsukcesis konservi novan pasvorton."
 
-#: actions/passwordsettings.php:191
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
 msgid "Password saved."
 msgstr "Pasvorto konservitas."
 
@@ -4482,9 +4414,7 @@ msgstr "Servilo, kien direkti \"SSL\"-petojn"
 msgid "Save paths"
 msgstr "Konservu lokigilon"
 
-#. TRANS: Instructions for the "People search" page.
-#. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/peoplesearch.php:54
+#: actions/peoplesearch.php:52
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
@@ -4493,8 +4423,7 @@ msgstr ""
 "Serĉi personon ĉe %%site.name%% per ĝia nomo, loko, aŭ intereso. Dividu "
 "serĉvortojn per spacoj; ili estu almenaŭ 3 literojn longaj."
 
-#. TRANS: Title of a page where users can search for other users.
-#: actions/peoplesearch.php:61
+#: actions/peoplesearch.php:58
 msgid "People search"
 msgstr "Persona serĉado"
 
@@ -4536,7 +4465,7 @@ msgid "Profile information"
 msgstr "Profila informo"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109 actions/register.php:419
+#: actions/profilesettings.php:109 actions/register.php:433
 #, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr "1-64 minusklaj literoj aŭ ciferoj, neniu interpunkcio aŭ spaco"
@@ -4544,7 +4473,7 @@ msgstr "1-64 minusklaj literoj aŭ ciferoj, neniu interpunkcio aŭ spaco"
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for full group name (dt). Text hidden by default.
 #. TRANS: DT for full name in a profile.
-#: actions/profilesettings.php:113 actions/register.php:441
+#: actions/profilesettings.php:113 actions/register.php:455
 #: actions/showgroup.php:255 actions/tagother.php:104
 #: lib/groupeditform.php:150 lib/userprofile.php:156
 msgid "Full name"
@@ -4552,13 +4481,13 @@ msgstr "Plena nomo"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:118 actions/register.php:446
+#: actions/profilesettings.php:118 actions/register.php:460
 #: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "Hejmpaĝo"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:121 actions/register.php:448
+#: actions/profilesettings.php:121
 #, fuzzy
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr "URL de via hejmpaĝo, blogo aŭ profilo ĉe alia retejo"
@@ -4566,7 +4495,7 @@ msgstr "URL de via hejmpaĝo, blogo aŭ profilo ĉe alia retejo"
 #. TRANS: Tooltip for field label in form for profile settings. Plural
 #. TRANS: is decided by the number of characters available for the
 #. TRANS: biography (%d).
-#: actions/profilesettings.php:129 actions/register.php:457
+#: actions/profilesettings.php:129 actions/register.php:471
 #, fuzzy, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4574,29 +4503,28 @@ msgstr[0] "Priskribu vin mem kaj viajn ŝatokupojn per ne pli ol %d signoj"
 msgstr[1] "Priskribu vin mem kaj viajn ŝatokupojn per ne pli ol %d signoj"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:135 actions/register.php:462
+#: actions/profilesettings.php:135 actions/register.php:476
 msgid "Describe yourself and your interests"
 msgstr "Priskribu vin mem kaj viajn ŝatokupojn"
 
 #. TRANS: Text area label in form for profile settings where users can provide.
 #. TRANS: their biography.
-#: actions/profilesettings.php:139 actions/register.php:464
+#: actions/profilesettings.php:139 actions/register.php:478
 msgid "Bio"
 msgstr "Biografio"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group location (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT for location in a profile.
-#: actions/profilesettings.php:145 actions/register.php:469
+#: actions/profilesettings.php:145 actions/register.php:483
 #: actions/showgroup.php:265 actions/tagother.php:112
-#: actions/userauthorization.php:174 lib/groupeditform.php:173
+#: actions/userauthorization.php:166 lib/groupeditform.php:173
 #: lib/userprofile.php:172
 msgid "Location"
 msgstr "Loko"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148
+#: actions/profilesettings.php:148 actions/register.php:485
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Kie vi estas, ekzemple \"Urbo, Ŝtato (aŭ Regiono), Lando\""
 
@@ -4617,8 +4545,7 @@ msgstr "Markiloj"
 #: actions/profilesettings.php:164
 #, fuzzy
 msgid ""
-"Tags for yourself (letters, numbers, -, ., and _), comma- or space- "
-"separated."
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr ""
 "Markiloj por vi mem (literoj, ciferoj, \"-\", \".\", kaj \"_\"), dividite "
 "per komoj aŭ spacoj"
@@ -4631,7 +4558,7 @@ msgstr "Lingvo"
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
 #: actions/profilesettings.php:171
 #, fuzzy
-msgid "Preferred language."
+msgid "Preferred language"
 msgstr "Preferata lingvo"
 
 #. TRANS: Dropdownlist label in form for profile settings.
@@ -4648,13 +4575,13 @@ msgstr "En kiu horzono vi kutime troviĝas?"
 #: actions/profilesettings.php:189
 #, fuzzy
 msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)."
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr "Aŭtomate aboni iun ajn, kiu abonas min (prefereble por ne-homoj)"
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Plural form is used based on the maximum number of allowed
 #. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:258 actions/register.php:221
+#: actions/profilesettings.php:258 actions/register.php:229
 #, fuzzy, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4674,9 +4601,9 @@ msgstr "Lingvo tro longas (maksimume 50 literoj)"
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:291
-#, fuzzy, php-format
-msgid "Invalid tag: \"%s\"."
+#: actions/profilesettings.php:291 actions/tagother.php:178
+#, php-format
+msgid "Invalid tag: \"%s\""
 msgstr "Nevalida markilo: \"%s\""
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
@@ -4783,12 +4710,6 @@ msgstr ""
 "blogging) servo surbaze de libera servila programo [StatusNet](http://status."
 "net/)."
 
-#. TRANS: Public RSS feed description. %s is the StatusNet site name.
-#: actions/publicrss.php:106
-#, fuzzy, php-format
-msgid "%s updates from everyone."
-msgstr "%s ĝisdatigoj de ĉiuj!"
-
 #. TRANS: Title for public tag cloud.
 #: actions/publictagcloud.php:57
 msgid "Public tag cloud"
@@ -4922,12 +4843,6 @@ msgstr "Refari pasvorton"
 msgid "Password recovery requested"
 msgstr "Petiĝas pasvorton rehavado"
 
-#. TRANS: Title for password recovery page in password saved mode.
-#: actions/recoverpassword.php:229
-#, fuzzy
-msgid "Password saved"
-msgstr "Pasvorto konservitas."
-
 #. TRANS: Title for password recovery page when an unknown action has been specified.
 #: actions/recoverpassword.php:232
 msgid "Unknown action"
@@ -4939,6 +4854,12 @@ msgstr "Nekonata ago"
 msgid "6 or more characters, and do not forget it!"
 msgstr "Almenaŭ 6 signoj, kaj ne forgesu ĝin!"
 
+#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#: actions/recoverpassword.php:264 actions/register.php:441
+#, fuzzy
+msgid "Same as password above."
+msgstr "Same kiel pasvorto supra"
+
 #. TRANS: Button text for password reset form.
 #. TRANS: Button text on profile design page to reset all colour settings to default without saving.
 #: actions/recoverpassword.php:268 lib/designsettings.php:264
@@ -4992,8 +4913,14 @@ msgstr "Pasvorto devas enhavi 6 signojn aŭ pli."
 msgid "Password and confirmation do not match."
 msgstr "Pasvorto kaj komfirmo ne kongruas."
 
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:418
+#, fuzzy
+msgid "Cannot save new password."
+msgstr "Malsukcesis konservi novan pasvorton."
+
 #. TRANS: Server error displayed when something does wrong with the user object during password reset.
-#: actions/recoverpassword.php:426 actions/register.php:248
+#: actions/recoverpassword.php:426 actions/register.php:256
 msgid "Error setting user."
 msgstr "Eraris agordi uzanton."
 
@@ -5002,93 +4929,98 @@ msgstr "Eraris agordi uzanton."
 msgid "New password successfully saved. You are now logged in."
 msgstr "Nova pasvorto sukcese konserviĝas. Vi nun estas ensalutinta."
 
-#: actions/register.php:87 actions/register.php:188 actions/register.php:399
+#: actions/register.php:92 actions/register.php:196 actions/register.php:413
 msgid "Sorry, only invited people can register."
 msgstr "Pardonon, nur invito rajtas registri."
 
-#: actions/register.php:94
+#: actions/register.php:99
 msgid "Sorry, invalid invitation code."
 msgstr "Pardonon, nevalida invitkodo."
 
-#: actions/register.php:113
+#: actions/register.php:119
 msgid "Registration successful"
 msgstr "Registriĝo sukcesa"
 
-#: actions/register.php:115 actions/register.php:497
+#: actions/register.php:121 actions/register.php:511
 msgid "Register"
 msgstr "Registri"
 
-#: actions/register.php:135
+#: actions/register.php:142
 msgid "Registration not allowed."
 msgstr "Registriĝo ne permesita."
 
-#: actions/register.php:201
+#: actions/register.php:209
 #, fuzzy
-msgid "You cannot register if you don't agree to the license."
+msgid "You can't register if you don't agree to the license."
 msgstr "Vi ne povas registriĝi, se vi ne konsentas kun la permesilo."
 
-#: actions/register.php:210
+#: actions/register.php:218
 msgid "Email address already exists."
 msgstr "Retpoŝta adreso jam ekzistas."
 
-#: actions/register.php:243 actions/register.php:265
+#: actions/register.php:251 actions/register.php:273
 msgid "Invalid username or password."
 msgstr "Nevalida uzantnomo aŭ pasvorto."
 
-#: actions/register.php:340
+#: actions/register.php:351
 #, fuzzy
 msgid ""
 "With this form you can create a new account. You can then post notices and "
-"link up to friends and colleagues."
+"link up to friends and colleagues. "
 msgstr ""
 "Per tiu ĉi formularo vi povas krei novan konton. Poste povos vi afiŝi avizon "
 "kaj komuniki kun amikoj kaj kolegoj. "
 
+#: actions/register.php:437
+#, fuzzy
+msgid "6 or more characters."
+msgstr "6 aŭ pli da literoj"
+
 #. TRANS: Link description in user account settings menu.
-#: actions/register.php:431 actions/register.php:435
+#: actions/register.php:445 actions/register.php:449
 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
 msgid "Email"
 msgstr "Retpoŝto"
 
-#: actions/register.php:432 actions/register.php:436
+#: actions/register.php:446 actions/register.php:450
 #, fuzzy
-msgid "Used only for updates, announcements, and password recovery."
+msgid "Used only for updates, announcements, and password recovery"
 msgstr "Uzu nur por ĝisdatigo, anonco, kaj rehavi pasvorton."
 
-#: actions/register.php:443
+#: actions/register.php:457
 #, fuzzy
-msgid "Longer name, preferably your \"real\" name."
+msgid "Longer name, preferably your \"real\" name"
 msgstr "Pli longa nomo, prefere via \"vera\" nomo."
 
-#: actions/register.php:471
+#: actions/register.php:462
 #, fuzzy
-msgid "Where you are, like \"City, State (or Region), Country\"."
-msgstr "Kie vi estas, ekzemple \"Urbo, Ŝtato (aŭ Regiono), Lando\""
+msgid "URL of your homepage, blog, or profile on another site"
+msgstr "URL de via hejmpaĝo, blogo aŭ profilo ĉe alia retejo"
 
-#: actions/register.php:510
+#: actions/register.php:523
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
 msgstr ""
 "Mi komprenas ke enhavo kaj datumo de %1$s estas privataj kaj sekretigita."
 
-#: actions/register.php:520
+#: actions/register.php:533
 #, php-format
 msgid "My text and files are copyright by %1$s."
 msgstr "Mia teksto kaj dosiero estas aŭtorrajtigita de %1$s."
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:524
+#: actions/register.php:537
 msgid "My text and files remain under my own copyright."
 msgstr "Mia teksto kaj dosiero restu en mia propra aŭtorrajto."
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:527
+#: actions/register.php:540
 msgid "All rights reserved."
 msgstr "Ĉiuj rajtoj rezervitaj."
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:532
+#: actions/register.php:545
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -5097,7 +5029,7 @@ msgstr ""
 "Mia teksto kaj dosiero estas atingebla per %s  krom jene: pasvorto, "
 "retpoŝtadreso, tujmesaĝilo-adreso, kaj telefonnumero."
 
-#: actions/register.php:573
+#: actions/register.php:588
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -5129,7 +5061,7 @@ msgstr ""
 "\n"
 "Dankon pro registriĝo, kaj ni esperas al vi ĝuon de uzi ĉi servon."
 
-#: actions/register.php:597
+#: actions/register.php:612
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5161,7 +5093,7 @@ msgstr "Uzanta alinomo"
 
 #: actions/remotesubscribe.php:129
 #, fuzzy
-msgid "Nickname of the user you want to follow."
+msgid "Nickname of the user you want to follow"
 msgstr "Alnomo de la uzanto, kiun vi volas aboni."
 
 #: actions/remotesubscribe.php:132
@@ -5170,7 +5102,7 @@ msgstr "Profila URL"
 
 #: actions/remotesubscribe.php:133
 #, fuzzy
-msgid "URL of your profile on another compatible microblogging service."
+msgid "URL of your profile on another compatible microblogging service"
 msgstr "URL de via profilo ĉe alia kongrua mikroblogilo-servo"
 
 #. TRANS: Link text for link that will subscribe to a remote profile.
@@ -5181,7 +5113,7 @@ msgstr "Aboni"
 
 #: actions/remotesubscribe.php:158
 #, fuzzy
-msgid "Invalid profile URL (bad format)."
+msgid "Invalid profile URL (bad format)"
 msgstr "Nevalida profila URL (fuŝa formato)"
 
 #: actions/remotesubscribe.php:167
@@ -5224,7 +5156,6 @@ msgstr "Ripetita"
 msgid "Repeated!"
 msgstr "Ripetita!"
 
-#. TRANS: RSS reply feed title. %s is a user nickname.
 #. TRANS: Tooltip for personal group navigation menu option when logged in for viewing @-replies.
 #: actions/replies.php:126 actions/repliesrss.php:68
 #: lib/personalgroupnav.php:109
@@ -5279,11 +5210,9 @@ msgstr ""
 "Vi povas provi  [puŝeti %1$s](../%2$s) aŭ[afiŝi ion al li](%%%%action."
 "newnotice%%%%?status_textarea=%3$s)."
 
-#. TRANS: RSS reply feed description.
-#. TRANS: %1$s is a user nickname, %2$s is the StatusNet site name.
-#: actions/repliesrss.php:74
+#: actions/repliesrss.php:72
 #, fuzzy, php-format
-msgid "Replies to %1$s on %2$s."
+msgid "Replies to %1$s on %2$s!"
 msgstr "Respondoj al %1$s ĉe %2$s!"
 
 #. TRANS: Client exception displayed when trying to restore an account while not logged in.
@@ -5387,7 +5316,7 @@ msgstr "Vi ne rajtas revoki de uzanto rolon ĉe ĉi tiu retejo."
 msgid "User doesn't have this role."
 msgstr "La uzanto ne havas la rolon."
 
-#: actions/rsd.php:142 actions/version.php:159
+#: actions/rsd.php:146 actions/version.php:159
 msgid "StatusNet"
 msgstr "StatusNet"
 
@@ -5429,87 +5358,87 @@ msgstr "Ŝalti sencimigadan eligon por seanco."
 msgid "Save site settings"
 msgstr "Konservi retejan agordon"
 
-#: actions/showapplication.php:78
+#: actions/showapplication.php:82
 msgid "You must be logged in to view an application."
 msgstr "Ensalutu por vidi la aplikaĵon."
 
-#: actions/showapplication.php:151
+#: actions/showapplication.php:157
 msgid "Application profile"
 msgstr "Aplikaĵa profilo"
 
 #. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:153 lib/applicationeditform.php:177
+#: actions/showapplication.php:159 lib/applicationeditform.php:177
 msgid "Icon"
 msgstr "Bildsimbolo"
 
 #. TRANS: Form input field label for application name.
-#: actions/showapplication.php:163 actions/version.php:197
+#: actions/showapplication.php:169 actions/version.php:197
 #: lib/applicationeditform.php:190
 msgid "Name"
 msgstr "Nomo"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:172 lib/applicationeditform.php:227
+#: actions/showapplication.php:178 lib/applicationeditform.php:227
 msgid "Organization"
 msgstr "Organizaĵo"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:181 actions/version.php:200
+#: actions/showapplication.php:187 actions/version.php:200
 #: lib/applicationeditform.php:208 lib/groupeditform.php:168
 msgid "Description"
 msgstr "Priskribo"
 
 #. TRANS: Header for group statistics on a group page (h2).
 #. TRANS: H2 text for user statistics.
-#: actions/showapplication.php:186 actions/showgroup.php:460
+#: actions/showapplication.php:192 actions/showgroup.php:460
 #: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "Statistiko"
 
-#: actions/showapplication.php:197
+#: actions/showapplication.php:203
 #, php-format
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr "Kreita de %1$s - %2$s defaŭlta aliroj  - %3$d uzantoj"
 
-#: actions/showapplication.php:207
+#: actions/showapplication.php:213
 msgid "Application actions"
 msgstr "Aplikaĵa ago"
 
-#: actions/showapplication.php:230
+#: actions/showapplication.php:236
 msgid "Reset key & secret"
 msgstr "Rekomencigi ŝlosilon & sekreton"
 
 #. TRANS: Title of form for deleting a user.
-#: actions/showapplication.php:246 lib/deletegroupform.php:121
+#: actions/showapplication.php:252 lib/deletegroupform.php:121
 #: lib/deleteuserform.php:64 lib/noticelist.php:673
 msgid "Delete"
 msgstr "Forigi"
 
-#: actions/showapplication.php:255
+#: actions/showapplication.php:261
 msgid "Application info"
 msgstr "Aplikaĵa informo"
 
-#: actions/showapplication.php:257
+#: actions/showapplication.php:263
 msgid "Consumer key"
 msgstr "Konsumanta ŝlosilo"
 
-#: actions/showapplication.php:262
+#: actions/showapplication.php:268
 msgid "Consumer secret"
 msgstr "Konsumanta sekreto"
 
-#: actions/showapplication.php:267
+#: actions/showapplication.php:273
 msgid "Request token URL"
 msgstr "Pet-ĵetona URL"
 
-#: actions/showapplication.php:272
+#: actions/showapplication.php:278
 msgid "Access token URL"
 msgstr "Alir-ĵetona URL"
 
-#: actions/showapplication.php:277
+#: actions/showapplication.php:283
 msgid "Authorize URL"
 msgstr "Rajtigi URL"
 
-#: actions/showapplication.php:282
+#: actions/showapplication.php:288
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
@@ -5517,7 +5446,7 @@ msgstr ""
 "Rimarku: Ni subtenas HMAC-SHA1-subskribo. Ni ne subtenas platteksta "
 "subskribado-metodon."
 
-#: actions/showapplication.php:302
+#: actions/showapplication.php:309
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr "Ĉu vi certe volas rekomencigi vian konsumantan ŝlosilon kaj sekreton?"
 
@@ -5607,18 +5536,16 @@ msgid "Group profile"
 msgstr "Grupa profilo"
 
 #. TRANS: Label for group URL (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT for URL in a profile.
 #: actions/showgroup.php:273 actions/tagother.php:118
-#: actions/userauthorization.php:184 lib/userprofile.php:186
+#: actions/userauthorization.php:175 lib/userprofile.php:186
 msgid "URL"
 msgstr "URL"
 
 #. TRANS: Label for group description or group note (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page where bio is displayed.
 #. TRANS: DT for note in a profile.
 #: actions/showgroup.php:285 actions/tagother.php:128
-#: actions/userauthorization.php:197 lib/userprofile.php:204
+#: actions/userauthorization.php:187 lib/userprofile.php:204
 msgid "Note"
 msgstr "Noto"
 
@@ -5764,7 +5691,7 @@ msgid "%1$s tagged %2$s"
 msgstr "%1$s, paĝo %2$d"
 
 #. TRANS: Page title showing tagged notices in one user's stream.
-#. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
+#. TRANS: %1$s is the username, %2$s is the hash tag, %1$d is the page number.
 #: actions/showstream.php:74
 #, fuzzy, php-format
 msgid "%1$s tagged %2$s, page %3$d"
@@ -6010,7 +5937,7 @@ msgstr "Teksto de reteja anonco (apenaŭ 255 literoj; HTML eblas)"
 #. TRANS: Title for button to save site notice in admin panel.
 #: actions/sitenoticeadminpanel.php:201
 #, fuzzy
-msgid "Save site notice."
+msgid "Save site notice"
 msgstr "Konservi retejan agordon"
 
 #. TRANS: Title for SMS settings.
@@ -6069,7 +5996,7 @@ msgstr "SMM-a telefonnumero"
 #. TRANS: SMS phone number input field instructions in SMS settings form.
 #: actions/smssettings.php:152
 #, fuzzy
-msgid "Phone number, no punctuation or spaces, with area code."
+msgid "Phone number, no punctuation or spaces, with area code"
 msgstr "Telefonnumero, sen interpunkcio aŭ spacoj, kun loka kodo"
 
 #. TRANS: Form legend for SMS preferences form.
@@ -6237,19 +6164,15 @@ msgstr "Vi ne abonis tiun profilon."
 msgid "Could not save subscription."
 msgstr "Malsukcesis konservi abonon."
 
-#. TRANS: Client error displayed trying to perform any request method other than POST.
-#. TRANS: Do not translate POST.
 #: actions/subscribe.php:77
 msgid "This action only accepts POST requests."
 msgstr "La ago akceptas nur POST-an peton."
 
-#. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
-#: actions/subscribe.php:121
+#: actions/subscribe.php:117
 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
 msgstr "Vi ne povas aboni foran  OMB 0.1-an profilon per ĉi tiu ago."
 
-#. TRANS: Page title when subscription succeeded.
-#: actions/subscribe.php:149
+#: actions/subscribe.php:145
 msgid "Subscribed"
 msgstr "Abonita"
 
@@ -6406,9 +6329,8 @@ msgstr "Etikedo %s"
 msgid "User profile"
 msgstr "Uzanta profilo"
 
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT element in area for user avatar.
-#: actions/tagother.php:81 actions/userauthorization.php:138
+#: actions/tagother.php:81 actions/userauthorization.php:132
 #: lib/userprofile.php:108
 msgid "Photo"
 msgstr "Foto"
@@ -6425,11 +6347,6 @@ msgstr ""
 "Etikedoj por ĉi tiuj uzanto (literoj, ciferoj, -, . Kaj _), apartigu per "
 "komo aŭ spaco."
 
-#: actions/tagother.php:178
-#, php-format
-msgid "Invalid tag: \"%s\""
-msgstr "Nevalida markilo: \"%s\""
-
 #: actions/tagother.php:193
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
@@ -6443,7 +6360,6 @@ msgstr "Uzu ĉi tiun formularon por etikedi viajn abonantojn aŭ abonatojn."
 msgid "No such tag."
 msgstr "Ne estas tiu etikedo."
 
-#. TRANS: Client error displayed when trying to unblock a non-blocked user.
 #: actions/unblock.php:59
 msgid "You haven't blocked that user."
 msgstr "Vi ne jam blokis la uzanton."
@@ -6464,7 +6380,7 @@ msgstr "Neniu profila ID petiĝas."
 msgid "Unsubscribed"
 msgstr "Malabonita"
 
-#: actions/updateprofile.php:64
+#: actions/updateprofile.php:64 actions/userauthorization.php:337
 #, php-format
 msgid ""
 "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
@@ -6497,7 +6413,7 @@ msgstr "Nevalida bonvena teksto. La longlimo estas 225 literoj."
 #. TRANS: users in user admin panel. %1$s is the invalid nickname.
 #: actions/useradminpanel.php:166
 #, fuzzy, php-format
-msgid "Invalid default subscripton: \"%1$s\" is not a user."
+msgid "Invalid default subscripton: '%1$s' is not a user."
 msgstr "Nevalida defaŭlta abono: '%1$s' ne estas uzanto."
 
 #. TRANS: Link description in user account settings menu.
@@ -6559,69 +6475,58 @@ msgstr "Ĉu permesi al uzantoj inviti novan uzantojn."
 #. TRANS: Title for button to save user settings in user admin panel.
 #: actions/useradminpanel.php:302
 #, fuzzy
-msgid "Save user settings."
+msgid "Save user settings"
 msgstr "Konservi retejan agordon"
 
-#. TRANS: Page title.
-#: actions/userauthorization.php:109
+#: actions/userauthorization.php:105
 msgid "Authorize subscription"
 msgstr "Rajtigi abonon"
 
-#. TRANS: Page notice on "Auhtorize subscription" page.
-#: actions/userauthorization.php:115
+#: actions/userauthorization.php:110
 #, fuzzy
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
 "user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
-"click \"Reject\"."
+"click “Reject”."
 msgstr ""
 "Bonvolu kontroli la detalojn por certigi ĉu vi deziras aboni la avizoj de ĉi "
 "tiu uzanto. Se ne simple alklaku “Rifuzi\"."
 
-#. TRANS: DT element on Authorise Subscription page where license is displayed.
 #. TRANS: Menu item for site administration
-#: actions/userauthorization.php:207 actions/version.php:167
+#: actions/userauthorization.php:196 actions/version.php:167
 #: lib/adminpanelaction.php:403
 msgid "License"
 msgstr "Licenco"
 
-#. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:229
+#: actions/userauthorization.php:217
 #, fuzzy
-msgctxt "BUTTON"
 msgid "Accept"
 msgstr "Akcepti"
 
-#. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:231
-#, fuzzy
-msgid "Subscribe to this user."
+#: actions/userauthorization.php:218 lib/subscribeform.php:115
+#: lib/subscribeform.php:139
+msgid "Subscribe to this user"
 msgstr "Aboni la uzanton"
 
-#. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:233
+#: actions/userauthorization.php:219
 #, fuzzy
-msgctxt "BUTTON"
 msgid "Reject"
 msgstr "Malakcepti"
 
-#. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:235
+#: actions/userauthorization.php:220
 #, fuzzy
-msgid "Reject this subscription."
+msgid "Reject this subscription"
 msgstr "Rifuzi la abonon"
 
-#. TRANS: Client error displayed for an empty authorisation request.
-#: actions/userauthorization.php:248
+#: actions/userauthorization.php:232
 msgid "No authorization request!"
 msgstr "Ne bezonas permesado!"
 
-#. TRANS: Accept message header from Authorise subscription page.
-#: actions/userauthorization.php:271
+#: actions/userauthorization.php:254
 msgid "Subscription authorized"
 msgstr "Abono permesiĝis"
 
-#: actions/userauthorization.php:274
+#: actions/userauthorization.php:256
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to authorize the "
@@ -6630,12 +6535,11 @@ msgstr ""
 "La abono permesiĝis, sed ne pasiĝis revoka URL. Legu gvidon de la retejo pro "
 "detaloj pri kiel rajtigi abonon. Via abono-ĵetono jenas:"
 
-#. TRANS: Reject message header from Authorise subscription page.
-#: actions/userauthorization.php:285
+#: actions/userauthorization.php:266
 msgid "Subscription rejected"
 msgstr "Abono rifuziĝis"
 
-#: actions/userauthorization.php:288
+#: actions/userauthorization.php:268
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to fully reject the "
@@ -6644,63 +6548,39 @@ msgstr ""
 "La abono rifuziĝis sed ne pasiĝis revoka URL. Legu gvidon de la retejo pro "
 "detaloj pri kiel rajtigi abonon. Via abono-ĵetono jenas:"
 
-#. TRANS: Exception thrown when no valid user is found for an authorisation request.
-#. TRANS: %s is a listener URI.
-#: actions/userauthorization.php:325
+#: actions/userauthorization.php:303
 #, fuzzy, php-format
-msgid "Listener URI \"%s\" not found here."
+msgid "Listener URI ‘%s’ not found here."
 msgstr "URL de aboninto ‘%s’ ne troviĝas tie ĉi."
 
-#. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:332
+#: actions/userauthorization.php:308
 #, fuzzy, php-format
-msgid "Listenee URI \"%s\" is too long."
+msgid "Listenee URI ‘%s’ is too long."
 msgstr "URL de abonito ‘%s’ tro longas."
 
-#. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:340
+#: actions/userauthorization.php:314
 #, fuzzy, php-format
-msgid "Listenee URI \"%s\" is a local user."
+msgid "Listenee URI ‘%s’ is a local user."
 msgstr "URL de abonito ‘%s’ estas de loka uzanto."
 
-#. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
-#. TRANS: %s is a profile URL.
-#: actions/userauthorization.php:358
+#: actions/userauthorization.php:329
 #, fuzzy, php-format
-msgid "Profile URL \"%s\" is for a local user."
+msgid "Profile URL ‘%s’ is for a local user."
 msgstr "Profila URL ‘%s’ estas de loka uzanto."
 
-#. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
-#. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
-#: actions/userauthorization.php:368
+#: actions/userauthorization.php:345
 #, fuzzy, php-format
-msgid ""
-"Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
-"\"."
-msgstr ""
-"Rigardato-flua permesilo \"%1$s\" ne konformas al reteja permesilo \"%2$s\"."
-
-#. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:378
-#, fuzzy, php-format
-msgid "Avatar URL \"%s\" is not valid."
+msgid "Avatar URL ‘%s’ is not valid."
 msgstr "Vizaĝbilda URL ‘%s' ne estas valida."
 
-#. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:385
+#: actions/userauthorization.php:350
 #, fuzzy, php-format
-msgid "Cannot read avatar URL \"%s\"."
+msgid "Can’t read avatar URL ‘%s’."
 msgstr "Malsukcesis legi vizaĝbildan URL ‘%s’."
 
-#. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:392
+#: actions/userauthorization.php:355
 #, fuzzy, php-format
-msgid "Wrong image type for avatar URL \"%s\"."
+msgid "Wrong image type for avatar URL ‘%s’."
 msgstr "Malĝusta bildotipo por vizaĝbilda URL ‘%s'."
 
 #. TRANS: Page title for profile design page.
@@ -6805,7 +6685,7 @@ msgid "Plugins"
 msgstr "Kromprogramo"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:898
+#: actions/version.php:198 lib/action.php:901
 msgid "Version"
 msgstr "Versio"
 
@@ -7012,14 +6892,14 @@ msgstr "Malsukcesis konservi grupan alvenkeston."
 
 #. TRANS: Server exception thrown when a reply cannot be saved.
 #. TRANS: %1$d is a notice ID, %2$d is the ID of the mentioned user.
-#: classes/Notice.php:1142
+#: classes/Notice.php:1144
 #, fuzzy, php-format
 msgid "Could not save reply for %1$d, %2$d."
 msgstr "Malsukcesis lokan grupan informon."
 
 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1661
+#: classes/Notice.php:1663
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
@@ -7033,14 +6913,14 @@ msgstr "%1$s (%2$s)"
 
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:775
+#: classes/Profile.php:779
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr "Malsukcesis revoki rolon \"%1$s\" de uzanto #%2$d; ĝi ne ekzistas."
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:784
+#: classes/Profile.php:788
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr "Malsukcesis revoki rolon \"%1$s\" de uzanto #%2$d; datumbaza eraro."
@@ -7357,53 +7237,53 @@ msgid "Page notice"
 msgstr "Paĝa anonco"
 
 #. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:871
+#: lib/action.php:874
 msgid "Secondary site navigation"
 msgstr "Dua reteja navigado"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:877
+#: lib/action.php:880
 msgid "Help"
 msgstr "Helpo"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:880
+#: lib/action.php:883
 msgid "About"
 msgstr "Enkonduko"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:883
+#: lib/action.php:886
 msgid "FAQ"
 msgstr "Oftaj demandoj"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:888
+#: lib/action.php:891
 msgid "TOS"
 msgstr "Serva Kondiĉo"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:892
+#: lib/action.php:895
 msgid "Privacy"
 msgstr "Privateco"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:895
+#: lib/action.php:898
 msgid "Source"
 msgstr "Fontkodo"
 
 #. TRANS: Secondary navigation menu option leading to e-mail contact information on the
 #. TRANS: StatusNet site, where to report bugs, ...
-#: lib/action.php:902
+#: lib/action.php:905
 msgid "Contact"
 msgstr "Kontakto"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:905
+#: lib/action.php:908
 msgid "Badge"
 msgstr "Insigno"
 
 #. TRANS: DT element for StatusNet software license.
-#: lib/action.php:934
+#: lib/action.php:937
 msgid "StatusNet software license"
 msgstr "Permesilo de la programaro StatusNet"
 
@@ -7411,7 +7291,7 @@ msgstr "Permesilo de la programaro StatusNet"
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:941
+#: lib/action.php:944
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7421,7 +7301,7 @@ msgstr ""
 "site.broughtbyurl%%)."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:944
+#: lib/action.php:947
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** estas mikrobloga servo."
@@ -7430,7 +7310,7 @@ msgstr "**%%site.name%%** estas mikrobloga servo."
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:951
+#: lib/action.php:954
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7442,27 +7322,27 @@ msgstr ""
 "licensing/licenses/agpl-3.0.html)."
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:967
+#: lib/action.php:970
 msgid "Site content license"
 msgstr "Reteja enhava permesilo"
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:974
+#: lib/action.php:977
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr "Enhavo kaj datumo de %1$s estas privata kaj konfidenca."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:981
+#: lib/action.php:984
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
 "Enhava kaj datuma aŭtorrajto apartenas al %1$s. Ĉiuj rajtoj rezervitaj."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:985
+#: lib/action.php:988
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 "Enhava kaj datuma aŭtorrajto apartenas al kontribuintoj. Ĉiuj rajtoj "
@@ -7470,25 +7350,25 @@ msgstr ""
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:1017
+#: lib/action.php:1020
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr "Ĉiuj enhavo kaj datumo ĉe %1$s estas havebla sub permesilo %2$s."
 
 #. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1353
+#: lib/action.php:1356
 msgid "Pagination"
 msgstr "Paĝado"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1364
+#: lib/action.php:1367
 msgid "After"
 msgstr "Poste"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1374
+#: lib/action.php:1377
 msgid "Before"
 msgstr "Antaŭe"
 
@@ -7686,23 +7566,19 @@ msgstr "API-fonto bezonas leg-skriba aliro, sed vi nur rajtas legi."
 msgid "No application for that consumer key."
 msgstr "Ne estas aplikaĵo kun la kosumanta ŝlosilo."
 
-#: lib/apiauth.php:202 lib/apiauth.php:284
-msgid "Not allowed to use API."
-msgstr ""
-
 #. TRANS: OAuth exception given when an incorrect access token was given for a user.
-#: lib/apiauth.php:225
+#: lib/apiauth.php:219
 msgid "Bad access token."
 msgstr "Fuŝa aliro-ĵetono."
 
 #. TRANS: OAuth exception given when no user was found for a given token (no token was found).
-#: lib/apiauth.php:230
+#: lib/apiauth.php:224
 msgid "No user for that token."
 msgstr "Ne estas uzanto kun tiu ĵetono."
 
 #. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel".
 #. TRANS: Client error thrown when authentication fails.
-#: lib/apiauth.php:272 lib/apiauth.php:302
+#: lib/apiauth.php:266 lib/apiauth.php:293
 msgid "Could not authenticate you."
 msgstr "Malsukcesis aŭtentigi vin."
 
@@ -7908,11 +7784,6 @@ msgstr "Ne estas permesita ŝanĝi la pasvorton"
 msgid "Block"
 msgstr "Bloki"
 
-#. TRANS: Description of the form to block a user.
-#: lib/blockform.php:79
-msgid "Block this user"
-msgstr "Bloki la uzanton"
-
 #. TRANS: Title for command results.
 #: lib/channel.php:160 lib/channel.php:181
 msgid "Command results"
@@ -7941,7 +7812,7 @@ msgstr "Avizo kun tiu identigaĵo ne ekzistas."
 
 #. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
 #. TRANS: Error text shown when a last user notice is requested and it does not exist.
-#: lib/command.php:99 lib/command.php:630
+#: lib/command.php:99 lib/command.php:642
 msgid "User has no last notice."
 msgstr "La uzanto ne havas lastan averton."
 
@@ -7991,35 +7862,41 @@ msgstr ""
 "Abonantoj: %2$s\n"
 "Avizoj: %3$s"
 
+#. TRANS: Error message text shown when a favorite could not be set because it has already been favorited.
+#: lib/command.php:298
+#, fuzzy
+msgid "Could not create favorite: already favorited."
+msgstr "Malsukcesis krei ŝataton."
+
 #. TRANS: Text shown when a notice has been marked as favourite successfully.
-#: lib/command.php:312
+#: lib/command.php:324
 msgid "Notice marked as fave."
 msgstr "Avizo ŝatiĝas."
 
 #. TRANS: Message given having added a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:357
+#: lib/command.php:369
 #, php-format
 msgid "%1$s joined group %2$s."
 msgstr "%1$s aniĝis al grupo %2$s."
 
 #. TRANS: Message given having removed a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:405
+#: lib/command.php:417
 #, php-format
 msgid "%1$s left group %2$s."
 msgstr "%1$s foriras de grupo %2$s."
 
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: lib/command.php:426
+#: lib/command.php:438
 #, fuzzy, php-format
 msgctxt "WHOIS"
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
 
 #. TRANS: Whois output. %s is the full name of the queried user.
-#: lib/command.php:430
+#: lib/command.php:442
 #, php-format
 msgid "Fullname: %s"
 msgstr "Plennomo: %s"
@@ -8027,7 +7904,7 @@ msgstr "Plennomo: %s"
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a location.
-#: lib/command.php:434 lib/mail.php:270
+#: lib/command.php:446 lib/mail.php:270
 #, php-format
 msgid "Location: %s"
 msgstr "Loko: %s"
@@ -8035,20 +7912,20 @@ msgstr "Loko: %s"
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a homepage.
-#: lib/command.php:438 lib/mail.php:274
+#: lib/command.php:450 lib/mail.php:274
 #, php-format
 msgid "Homepage: %s"
 msgstr "Hejmpaĝo: %s"
 
 #. TRANS: Whois output. %s is the bio information of the queried user.
-#: lib/command.php:442
+#: lib/command.php:454
 #, php-format
 msgid "About: %s"
 msgstr "Biografio: %s"
 
 #. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).
 #. TRANS: %s is a remote profile.
-#: lib/command.php:471
+#: lib/command.php:483
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
@@ -8059,7 +7936,7 @@ msgstr ""
 
 #. TRANS: Message given if content is too long. %1$sd is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:488
+#: lib/command.php:500
 #, fuzzy, php-format
 msgid "Message too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
@@ -8067,25 +7944,25 @@ msgstr[0] "Mesaĝo tro longas - longlimo estas %1$d, via estas %2$d"
 msgstr[1] "Mesaĝo tro longas - longlimo estas %1$d, via estas %2$d"
 
 #. TRANS: Error text shown sending a direct message fails with an unknown reason.
-#: lib/command.php:516
+#: lib/command.php:528
 msgid "Error sending direct message."
 msgstr "Eraris sendi rektan mesaĝon."
 
 #. TRANS: Message given having repeated a notice from another user.
 #. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:553
+#: lib/command.php:565
 #, php-format
 msgid "Notice from %s repeated."
 msgstr "Avizo de %s ripetiĝas."
 
 #. TRANS: Error text shown when repeating a notice fails with an unknown reason.
-#: lib/command.php:556
+#: lib/command.php:568
 msgid "Error repeating notice."
 msgstr "Eraris ripeti avizon."
 
 #. TRANS: Message given if content of a notice for a reply is too long. %1$d is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:591
+#: lib/command.php:603
 #, fuzzy, php-format
 msgid "Notice too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Notice too long - maximum is %1$d characters, you sent %2$d."
@@ -8098,100 +7975,100 @@ msgstr[1] ""
 
 #. TRANS: Text shown having sent a reply to a notice successfully.
 #. TRANS: %s is the nickname of the user of the notice the reply was sent to.
-#: lib/command.php:604
+#: lib/command.php:616
 #, php-format
 msgid "Reply to %s sent."
 msgstr "Respondo al %s sendiĝas."
 
 #. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
-#: lib/command.php:607
+#: lib/command.php:619
 msgid "Error saving notice."
 msgstr "Eraris sendi avizon."
 
 #. TRANS: Error text shown when no username was provided when issuing a subscribe command.
-#: lib/command.php:654
+#: lib/command.php:666
 msgid "Specify the name of the user to subscribe to."
 msgstr "Specifu nomon de la abonota uzanto."
 
 #. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
-#: lib/command.php:663
+#: lib/command.php:675
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "Malsukcesis aboni OMB-profilon per komando."
 
 #. TRANS: Text shown after having subscribed to another user successfully.
 #. TRANS: %s is the name of the user the subscription was requested for.
-#: lib/command.php:671
+#: lib/command.php:683
 #, php-format
 msgid "Subscribed to %s."
 msgstr "%s abonita"
 
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.
-#: lib/command.php:692 lib/command.php:803
+#: lib/command.php:704 lib/command.php:815
 msgid "Specify the name of the user to unsubscribe from."
 msgstr "Specifu la nomon de uzanto malabonota."
 
 #. TRANS: Text shown after having unsubscribed from another user successfully.
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:703
+#: lib/command.php:715
 #, php-format
 msgid "Unsubscribed from %s."
 msgstr "%s malabonita."
 
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
-#: lib/command.php:723 lib/command.php:749
+#: lib/command.php:735 lib/command.php:761
 msgid "Command not yet implemented."
 msgstr "Komando ankoraŭ ne realigita."
 
 #. TRANS: Text shown when issuing the command "off" successfully.
-#: lib/command.php:727
+#: lib/command.php:739
 msgid "Notification off."
 msgstr "Sciigo for."
 
 #. TRANS: Error text shown when the command "off" fails for an unknown reason.
-#: lib/command.php:730
+#: lib/command.php:742
 msgid "Can't turn off notification."
 msgstr "Malsukcesis malŝalti sciigon."
 
 #. TRANS: Text shown when issuing the command "on" successfully.
-#: lib/command.php:753
+#: lib/command.php:765
 msgid "Notification on."
 msgstr "Sciigo en."
 
 #. TRANS: Error text shown when the command "on" fails for an unknown reason.
-#: lib/command.php:756
+#: lib/command.php:768
 msgid "Can't turn on notification."
 msgstr "Malsukcesis ŝalti sciigon."
 
 #. TRANS: Error text shown when issuing the login command while login is disabled.
-#: lib/command.php:770
+#: lib/command.php:782
 msgid "Login command is disabled."
 msgstr "Ensaluta komando malebliĝas."
 
 #. TRANS: Text shown after issuing the login command successfully.
 #. TRANS: %s is a logon link..
-#: lib/command.php:783
+#: lib/command.php:795
 #, php-format
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr "Ĉi tiu ligilo estas uzebla nur unufoje kaj valida nur 2 minutojn: %s."
 
 #. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:812
+#: lib/command.php:824
 #, php-format
 msgid "Unsubscribed %s."
 msgstr "%s malaboniĝas."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
-#: lib/command.php:830
+#: lib/command.php:842
 msgid "You are not subscribed to anyone."
 msgstr "Vi ne abonas iun ajn."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
-#: lib/command.php:835
+#: lib/command.php:847
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Vi abonas jenan homon:"
@@ -8199,14 +8076,14 @@ msgstr[1] "Vi abonas jenajn homojn:"
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user
 #. TRANS: (followers) without having any subscribers.
-#: lib/command.php:857
+#: lib/command.php:869
 msgid "No one is subscribed to you."
 msgstr "Neniu abonas vin."
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
-#: lib/command.php:862
+#: lib/command.php:874
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "La homo abonas vin:"
@@ -8214,21 +8091,21 @@ msgstr[1] "La homoj abonas vin:"
 
 #. TRANS: Text shown after requesting groups a user is subscribed to without having
 #. TRANS: any group subscriptions.
-#: lib/command.php:884
+#: lib/command.php:896
 msgid "You are not a member of any groups."
 msgstr "Vi ne estas grupano de iu ajn grupo."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
-#: lib/command.php:889
+#: lib/command.php:901
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "Vi estas grupano de jena grupo:"
 msgstr[1] "Vi estas grupano de jenaj grupoj:"
 
 #. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-#: lib/command.php:904
+#: lib/command.php:916
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -8372,11 +8249,6 @@ msgstr "Konektitaj aplikaĵoj rajtigitaj"
 msgid "Database error"
 msgstr "Datumbaza eraro"
 
-#. TRANS: Description of form for deleting a user.
-#: lib/deleteuserform.php:75
-msgid "Delete this user"
-msgstr "Forigi la uzanton"
-
 #. TRANS: Label in form on profile design page.
 #. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
 #: lib/designsettings.php:108
@@ -8414,21 +8286,6 @@ msgstr "Ŝanĝi kolorojn"
 msgid "Use defaults"
 msgstr "Uzu defaŭlton"
 
-#. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: lib/designsettings.php:259
-msgid "Restore default designs"
-msgstr "Restaŭri defaŭltajn desegnojn"
-
-#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: lib/designsettings.php:267
-msgid "Reset back to default"
-msgstr "Redefaŭltiĝi"
-
-#. TRANS: Title for button on profile design page to save settings.
-#: lib/designsettings.php:272
-msgid "Save design"
-msgstr "Savi desegnon"
-
 #. TRANS: Error message displayed if design settings could not be saved.
 #. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
 #: lib/designsettings.php:405 lib/designsettings.php:427
@@ -9311,10 +9168,6 @@ msgstr "Respondi ĉi tiun avizon"
 msgid "Reply"
 msgstr "Respondi"
 
-#: lib/noticelist.php:673
-msgid "Delete this notice"
-msgstr "Forigi la avizon"
-
 #: lib/noticelist.php:691
 msgid "Notice repeated"
 msgstr "Avizo ripetiĝas"
@@ -9597,10 +9450,6 @@ msgstr "Inviti"
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Inviti amikojn kaj kolegojn al %s kun vi"
 
-#: lib/subscribeform.php:115 lib/subscribeform.php:139
-msgid "Subscribe to this user"
-msgstr "Aboni la uzanton"
-
 #: lib/subscriberspeopleselftagcloudsection.php:48
 #: lib/subscriptionspeopleselftagcloudsection.php:48
 msgid "People Tagcloud as self-tagged"
@@ -9774,23 +9623,18 @@ msgctxt "role"
 msgid "Moderator"
 msgstr "Moderanto"
 
-#: lib/util.php:305
-#, fuzzy
-msgid "Not allowed to log in."
-msgstr "Ne konektita."
-
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1309
+#: lib/util.php:1306
 msgid "a few seconds ago"
 msgstr "antaŭ kelkaj sekundoj"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1312
+#: lib/util.php:1309
 msgid "about a minute ago"
 msgstr "antaŭ ĉirkaŭ unu minuto"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1316
+#: lib/util.php:1313
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
@@ -9798,12 +9642,12 @@ msgstr[0] "antaŭ ĉirkaŭ unu minuto"
 msgstr[1] "antaŭ ĉirkaŭ %d minutoj"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1319
+#: lib/util.php:1316
 msgid "about an hour ago"
 msgstr "antaŭ ĉirkaŭ unu horo"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1323
+#: lib/util.php:1320
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
@@ -9811,12 +9655,12 @@ msgstr[0] "antaŭ ĉirkaŭ unu horo"
 msgstr[1] "antaŭ ĉirkaŭ %d horoj"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1326
+#: lib/util.php:1323
 msgid "about a day ago"
 msgstr "antaŭ ĉirkaŭ unu tago"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1330
+#: lib/util.php:1327
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
@@ -9824,12 +9668,12 @@ msgstr[0] "antaŭ ĉirkaŭ unu tago"
 msgstr[1] "antaŭ ĉirkaŭ %d tagoj"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1333
+#: lib/util.php:1330
 msgid "about a month ago"
 msgstr "Antaŭ ĉrikaŭ unu monato"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1337
+#: lib/util.php:1334
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
@@ -9837,7 +9681,7 @@ msgstr[0] "antaŭ ĉirkaŭ unu monato"
 msgstr[1] "antaŭ ĉirkaŭ %d monatoj"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1340
+#: lib/util.php:1337
 msgid "about a year ago"
 msgstr "antaŭ ĉirkaŭ unu jaro"
 
@@ -9879,3 +9723,75 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#, fuzzy
+#~ msgid "Block this user."
+#~ msgstr "Bloki la uzanton"
+
+#, fuzzy
+#~ msgid "Delete this notice."
+#~ msgstr "Forigi la avizon"
+
+#, fuzzy
+#~ msgid "Delete this user."
+#~ msgstr "Forigi la uzanton"
+
+#, fuzzy
+#~ msgid "Restore default designs."
+#~ msgstr "Restaŭri defaŭltajn desegnojn"
+
+#, fuzzy
+#~ msgid "Reset back to default."
+#~ msgstr "Redefaŭltiĝi"
+
+#, fuzzy
+#~ msgid "Save design."
+#~ msgstr "Savi desegnon"
+
+#, fuzzy
+#~ msgid "Disfavor favorite."
+#~ msgstr "Malŝati ŝataton."
+
+#, fuzzy
+#~ msgid "\"%s\" not found."
+#~ msgstr "Metodo de API ne troviĝas."
+
+#, fuzzy
+#~ msgid "Notice %s not found."
+#~ msgstr "Metodo de API ne troviĝas."
+
+#, fuzzy
+#~ msgid "Attachment %s not found."
+#~ msgstr "Ricevonta uzanto ne troviĝas."
+
+#, fuzzy
+#~ msgid "Invalid tag: \"%s\"."
+#~ msgstr "Nevalida markilo: \"%s\""
+
+#, fuzzy
+#~ msgid "%s updates from everyone."
+#~ msgstr "%s ĝisdatigoj de ĉiuj!"
+
+#, fuzzy
+#~ msgid "Password saved"
+#~ msgstr "Pasvorto konservitas."
+
+#, fuzzy
+#~ msgid "Where you are, like \"City, State (or Region), Country\"."
+#~ msgstr "Kie vi estas, ekzemple \"Urbo, Ŝtato (aŭ Regiono), Lando\""
+
+#, fuzzy
+#~ msgid "Subscribe to this user."
+#~ msgstr "Aboni la uzanton"
+
+#, fuzzy
+#~ msgid ""
+#~ "Listenee stream license \"%1$s\" is not compatible with site license \"%2"
+#~ "$s\"."
+#~ msgstr ""
+#~ "Rigardato-flua permesilo \"%1$s\" ne konformas al reteja permesilo \"%2$s"
+#~ "\"."
+
+#, fuzzy
+#~ msgid "Not allowed to log in."
+#~ msgstr "Ne konektita."
diff --git a/locale/es/LC_MESSAGES/statusnet.po b/locale/es/LC_MESSAGES/statusnet.po
index d206fc3145..76a4d50d1d 100644
--- a/locale/es/LC_MESSAGES/statusnet.po
+++ b/locale/es/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-02-24 10:32+0000\n"
-"PO-Revision-Date: 2011-02-24 10:36:31+0000\n"
+"POT-Creation-Date: 2011-03-03 15:58+0000\n"
+"PO-Revision-Date: 2011-03-03 16:00:25+0000\n"
 "Language-Team: Spanish <http://translatewiki.net/wiki/Portal:es>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r82712); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-02-17 11:39:54+0000\n"
+"X-POT-Import-Date: 2011-02-25 23:49:23+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -140,11 +140,7 @@ msgstr "No existe tal página."
 #. 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 use "one time password login" without using an existing user.
-#. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
-#. TRANS: Client error displayed trying to find a user by ID for a non-existing ID.
-#. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when calling a profile action without specifying a user.
 #: actions/all.php:80 actions/allrss.php:69
@@ -162,12 +158,12 @@ msgstr "No existe tal página."
 #: actions/apitimelinementions.php:77 actions/apitimelineuser.php:79
 #: actions/avatarbynickname.php:79 actions/favoritesrss.php:72
 #: actions/foaf.php:42 actions/foaf.php:61 actions/hcard.php:67
-#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:78
+#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
 #: actions/remotesubscribe.php:144 actions/remotesubscribe.php:153
-#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:113
-#: actions/showfavorites.php:106 actions/userbyid.php:75
+#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
+#: actions/showfavorites.php:106 actions/userbyid.php:74
 #: actions/usergroups.php:93 actions/userrss.php:40 actions/userxrd.php:59
-#: actions/xrds.php:71 lib/command.php:497 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:509 lib/galleryaction.php:59
 #: lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "No existe ese usuario."
@@ -297,7 +293,7 @@ msgstr "¡Actualizaciones de %1$s y sus amistades en %2$s!"
 #: actions/apigrouplistall.php:120 actions/apigroupmembership.php:105
 #: actions/apigroupshow.php:114 actions/apihelptest.php:84
 #: actions/apistatusesdestroy.php:101 actions/apistatusesretweets.php:110
-#: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:138
+#: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:139
 #: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
 #: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:268
 #: actions/apitimelinegroup.php:147 actions/apitimelinehome.php:173
@@ -529,7 +525,7 @@ msgstr "No se encuentra usuario receptor."
 #. TRANS: Client error displayed trying to direct message another user who's not a friend (403).
 #: actions/apidirectmessagenew.php:144
 #, fuzzy
-msgid "Cannot send direct messages to users who aren't your friend."
+msgid "Can't send direct messages to users who aren't your friend."
 msgstr "No se puede enviar mensajes directos a usuarios que no son tu amigo."
 
 #. TRANS: Client error displayed trying to direct message self (403).
@@ -555,7 +551,7 @@ msgstr "Este status ya está en favoritos."
 #. TRANS: Client error displayed when marking a notice as favourite fails.
 #. TRANS: Server error displayed when trying to mark a notice as favorite fails in the database.
 #. TRANS: Error message text shown when a favorite could not be set.
-#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:294
+#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:306
 msgid "Could not create favorite."
 msgstr "No se pudo crear favorito."
 
@@ -614,7 +610,7 @@ msgstr "No se pudo encontrar ningún usuario de destino."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:191
 #: actions/newgroup.php:137 actions/profilesettings.php:273
-#: actions/register.php:206
+#: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "El usuario ya existe. Prueba con otro."
 
@@ -624,7 +620,7 @@ msgstr "El usuario ya existe. Prueba con otro."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:195
 #: actions/newgroup.php:141 actions/profilesettings.php:243
-#: actions/register.php:208
+#: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "Usuario inválido"
 
@@ -637,7 +633,7 @@ msgstr "Usuario inválido"
 #: actions/apigroupcreate.php:181 actions/editapplication.php:235
 #: actions/editgroup.php:202 actions/newapplication.php:221
 #: actions/newgroup.php:148 actions/profilesettings.php:248
-#: actions/register.php:215
+#: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "La página de inicio no es un URL válido."
 
@@ -647,7 +643,7 @@ msgstr "La página de inicio no es un URL válido."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:191 actions/editgroup.php:206
 #: actions/newgroup.php:152 actions/profilesettings.php:252
-#: actions/register.php:218
+#: actions/register.php:226
 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "Tu nombre es demasiado largo (max. 255 carac.)"
@@ -676,7 +672,7 @@ msgstr[1] "La descripción es demasiado larga (máx. %d caracteres)."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:215 actions/editgroup.php:218
 #: actions/newgroup.php:164 actions/profilesettings.php:265
-#: actions/register.php:227
+#: actions/register.php:235
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
 msgstr "La ubicación es demasiado larga (máx. 255 caracteres)."
@@ -733,14 +729,14 @@ msgstr "Grupo no encontrado."
 #. TRANS: Server error displayed when trying to join a group the user is already a member of.
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:333
+#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:345
 msgid "You are already a member of that group."
 msgstr "Ya eres miembro de ese grupo"
 
 #. TRANS: Server error displayed when trying to join a group the user is blocked from joining.
 #. 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.
-#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:338
+#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:350
 msgid "You have been blocked from that group by the admin."
 msgstr "Has sido bloqueado de ese grupo por el administrador."
 
@@ -750,7 +746,7 @@ msgstr "Has sido bloqueado de ese grupo por el administrador."
 #. TRANS: %1$s is the joining user's nickname, $2$s is the group nickname for which the join failed.
 #. TRANS: Message given having failed to add a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:350
+#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:362
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "No se pudo unir el usuario %s al grupo %s"
@@ -767,7 +763,7 @@ msgstr "No eres miembro de este grupo."
 #. TRANS: Message given having failed to remove a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
 #: actions/apigroupleave.php:127 actions/leavegroup.php:133
-#: lib/command.php:398
+#: lib/command.php:410
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
 msgstr "No se pudo eliminar al usuario %1$s del grupo %2$s."
@@ -830,21 +826,20 @@ msgstr "No estás autorizado."
 #. TRANS: Form validation error message.
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
-#. TRANS: Client error displayed when the session token is not okay.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
 #: actions/deletenotice.php:177 actions/disfavor.php:75
 #: actions/emailsettings.php:291 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:65 actions/grouplogo.php:321
 #: actions/groupunblock.php:65 actions/imsettings.php:224
-#: actions/invite.php:60 actions/login.php:131 actions/makeadmin.php:66
+#: actions/invite.php:60 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
-#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:136
-#: actions/othersettings.php:155 actions/passwordsettings.php:137
+#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
+#: actions/othersettings.php:155 actions/passwordsettings.php:138
 #: actions/profilesettings.php:217 actions/recoverpassword.php:383
-#: actions/register.php:164 actions/remotesubscribe.php:76
+#: actions/register.php:172 actions/remotesubscribe.php:76
 #: actions/repeat.php:82 actions/smssettings.php:250 actions/subedit.php:40
-#: actions/subscribe.php:87 actions/tagother.php:166
-#: actions/unsubscribe.php:69 actions/userauthorization.php:53
+#: actions/subscribe.php:86 actions/tagother.php:166
+#: actions/unsubscribe.php:69 actions/userauthorization.php:52
 #: lib/designsettings.php:310
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
@@ -877,7 +872,7 @@ msgstr "Error de base de datos al insertar usuario de la aplicación OAuth."
 #: actions/designadminpanel.php:100 actions/editapplication.php:144
 #: actions/emailsettings.php:310 actions/grouplogo.php:332
 #: actions/imsettings.php:239 actions/newapplication.php:124
-#: actions/oauthconnectionssettings.php:145 actions/recoverpassword.php:46
+#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
 #: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
 msgstr "Envío de formulario inesperado."
@@ -928,20 +923,19 @@ msgstr "Cuenta"
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group nickname (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT for nick name in a profile.
-#: actions/apioauthauthorize.php:459 actions/login.php:242
-#: actions/profilesettings.php:106 actions/register.php:418
+#: actions/apioauthauthorize.php:459 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:432
 #: actions/showgroup.php:243 actions/tagother.php:94
-#: actions/userauthorization.php:152 lib/groupeditform.php:145
+#: actions/userauthorization.php:145 lib/groupeditform.php:145
 #: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "Usuario"
 
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:463 actions/login.php:245
-#: actions/register.php:422 lib/accountsettingsaction.php:120
+#: actions/apioauthauthorize.php:463 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:120
 msgid "Password"
 msgstr "Contraseña"
 
@@ -1036,13 +1030,13 @@ msgstr "No existe ese mensaje."
 
 #. TRANS: Client error displayed trying to repeat an own notice through the API.
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:537
+#: actions/apistatusesretweet.php:83 lib/command.php:549
 msgid "Cannot repeat your own notice."
 msgstr "No puedes repetir tus propios mensajes"
 
 #. TRANS: Client error displayed trying to re-repeat a notice through the API.
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:92 lib/command.php:543
+#: actions/apistatusesretweet.php:92 lib/command.php:555
 msgid "Already repeated that notice."
 msgstr "Este mensaje ya se ha repetido."
 
@@ -1065,7 +1059,7 @@ msgstr "Método de API no encontrado."
 #. TRANS: %s is the requested output format.
 #: actions/apistatusesshow.php:144
 #, fuzzy, php-format
-msgid "Unsupported format: %s."
+msgid "Unsupported format: %s"
 msgstr "Formato no soportado."
 
 #. TRANS: Client error displayed requesting a deleted status.
@@ -1172,14 +1166,13 @@ msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr "actualizaciones de %1$s en respuesta a las de %2$s / %3$s"
 
 #. TRANS: Title for site timeline. %s is the StatusNet sitename.
-#. TRANS: Public RSS feed title. %s is the StatusNet site name.
 #: actions/apitimelinepublic.php:193 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "línea temporal pública de %s"
 
 #. TRANS: Subtitle for site timeline. %s is the StatusNet sitename.
-#: actions/apitimelinepublic.php:199
+#: actions/apitimelinepublic.php:199 actions/publicrss.php:105
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "¡Actualizaciones de todos en %s!"
@@ -1246,26 +1239,25 @@ msgid "Atom post must be an Atom entry."
 msgstr "La publicación Atom debe ser una entrada Atom."
 
 #. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
-#: actions/apitimelineuser.php:334
+#: actions/apitimelineuser.php:335
 msgid "Can only handle POST activities."
 msgstr ""
 
 #. TRANS: Client error displayed when using an unsupported activity object type.
 #. TRANS: %s is the unsupported activity object type.
-#: actions/apitimelineuser.php:345
+#: actions/apitimelineuser.php:346
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr "No se puede gestionar actividad del tipo «%s»."
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
 #. TRANS: %d is the notice ID (number).
-#: actions/apitimelineuser.php:379
+#: actions/apitimelineuser.php:380
 #, php-format
 msgid "No content for notice %d."
 msgstr "No hay contenido para el aviso %d."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#. TRANS: %s is the notice URI.
 #: actions/apitimelineuser.php:408
 #, php-format
 msgid "Notice with URI \"%s\" already exists."
@@ -1283,10 +1275,9 @@ msgstr "Método de API no encontrado."
 
 #. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
 #. TRANS: Client exception.
-#. TRANS: Client error displayed trying to subscribe to a non-existing profile.
 #: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
 #: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
-#: actions/subscribe.php:110
+#: actions/subscribe.php:107
 msgid "No such profile."
 msgstr "No existe tal perfil."
 
@@ -1417,7 +1408,7 @@ msgstr "No se pudo borrar favorito."
 #: actions/joingroup.php:95 actions/leavegroup.php:82
 #: actions/leavegroup.php:95 actions/makeadmin.php:86
 #: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:380
+#: lib/command.php:392
 msgid "No such group."
 msgstr "No existe ese grupo."
 
@@ -1428,7 +1419,7 @@ msgid "Not a member."
 msgstr "Todos los miembros"
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
-#: actions/atompubshowmembership.php:150
+#: actions/atompubshowmembership.php:151
 #, fuzzy
 msgid "Cannot delete someone else's membership."
 msgstr "No se pudo eliminar la auto-suscripción."
@@ -1533,11 +1524,9 @@ msgstr "Puedes subir tu imagen personal. El tamaño máximo de archivo es %s."
 
 #. TRANS: Server error displayed in avatar upload page when no matching profile can be found for a user.
 #. TRANS: Server error displayed coming across a request from a user without a profile.
-#. TRANS: Server error displayed when trying to authorise a remote subscription request
-#. TRANS: while the user has no profile.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
 #: actions/grouplogo.php:184 actions/remotesubscribe.php:190
-#: actions/userauthorization.php:75 actions/userrss.php:108
+#: actions/userauthorization.php:72 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr "Usuario sin perfil coincidente."
 
@@ -1593,10 +1582,10 @@ msgstr "Cortar"
 msgid "No file uploaded."
 msgstr "Ningún archivo fue subido."
 
-#. TRANS: Avatar upload form instruction after uploading a file.
+#. TRANS: Avatar upload form unstruction after uploading a file.
 #: actions/avatarsettings.php:345
 #, fuzzy
-msgid "Pick a square area of the image to be your avatar."
+msgid "Pick a square area of the image to be your avatar"
 msgstr "Elige un área cuadrada para que sea tu imagen"
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
@@ -1638,7 +1627,7 @@ msgid "You may not backup your account."
 msgstr ""
 
 #. TRANS: Information displayed on the backup account page.
-#: actions/backupaccount.php:225
+#: actions/backupaccount.php:227
 msgid ""
 "You can backup your account data in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format. This is an experimental feature and provides "
@@ -1648,15 +1637,15 @@ msgid ""
 msgstr ""
 
 #. TRANS: Submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:248
+#: actions/backupaccount.php:250
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Backup"
 msgstr "Fondo"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:252
-msgid "Backup your account."
+#: actions/backupaccount.php:254
+msgid "Backup your account"
 msgstr ""
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
@@ -1698,7 +1687,7 @@ msgstr "No"
 #. TRANS: Submit button title for 'No' when blocking a user.
 #: actions/block.php:158
 #, fuzzy
-msgid "Do not block this user."
+msgid "Do not block this user"
 msgstr "No bloquear a este usuario"
 
 #. TRANS: Button label on the user block form.
@@ -1715,9 +1704,9 @@ msgid "Yes"
 msgstr "Sí"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:165
-#, fuzzy
-msgid "Block this user."
+#. TRANS: Description of the form to block a user.
+#: actions/block.php:165 lib/blockform.php:79
+msgid "Block this user"
 msgstr "Bloquear este usuario."
 
 #. TRANS: Server error displayed when blocking a user fails.
@@ -1885,7 +1874,7 @@ msgstr ""
 #. TRANS: Field label for delete account confirmation entry.
 #. TRANS: Field label for password reset form where the password has to be typed again.
 #: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:262 actions/register.php:426
+#: actions/recoverpassword.php:262 actions/register.php:440
 msgid "Confirm"
 msgstr "Confirmar"
 
@@ -1914,14 +1903,14 @@ msgstr "Aplicación no encontrada."
 #. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
 #: actions/deleteapplication.php:79 actions/editapplication.php:78
-#: actions/showapplication.php:90
+#: actions/showapplication.php:94
 msgid "You are not the owner of this application."
 msgstr "No eres el propietario de esta aplicación."
 
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
-#: actions/newapplication.php:112 actions/showapplication.php:113
-#: lib/action.php:1422
+#: actions/newapplication.php:112 actions/showapplication.php:118
+#: lib/action.php:1425
 msgid "There was a problem with your session token."
 msgstr "Hubo problemas con tu clave de sesión."
 
@@ -1945,13 +1934,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting an application.
 #: actions/deleteapplication.php:161
 #, fuzzy
-msgid "Do not delete this application."
+msgid "Do not delete this application"
 msgstr "No eliminar esta aplicación"
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
 #: actions/deleteapplication.php:167
 #, fuzzy
-msgid "Delete this application."
+msgid "Delete this application"
 msgstr "Borrar esta aplicación"
 
 #. TRANS: Client error when trying to delete group while not logged in.
@@ -2006,13 +1995,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting a group.
 #: actions/deletegroup.php:224
 #, fuzzy
-msgid "Do not delete this group."
+msgid "Do not delete this group"
 msgstr "No eliminar este grupo"
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
 #: actions/deletegroup.php:231
 #, fuzzy
-msgid "Delete this group."
+msgid "Delete this group"
 msgstr "Borrar este grupo"
 
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
@@ -2020,15 +2009,13 @@ msgstr "Borrar este grupo"
 #. TRANS: Client error displayed when trying to mark a notice as favorite without being logged in.
 #. TRANS: Client error displayed trying to block a user from a group while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
-#. TRANS: Client error displayed trying to log out when not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
-#. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
 #. TRANS: Client error displayed when trying to change user options while not logged in.
 #: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
-#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:70
+#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
-#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:98
+#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
 #: lib/adminpanelaction.php:71 lib/profileformaction.php:63
 #: lib/settingsaction.php:72
@@ -2058,13 +2045,12 @@ msgstr "¿Estás seguro de que quieres eliminar este aviso?"
 #. TRANS: Submit button title for 'No' when deleting a notice.
 #: actions/deletenotice.php:159
 #, fuzzy
-msgid "Do not delete this notice."
+msgid "Do not delete this notice"
 msgstr "No eliminar este mensaje"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:166
-#, fuzzy
-msgid "Delete this notice."
+#: actions/deletenotice.php:166 lib/noticelist.php:673
+msgid "Delete this notice"
 msgstr "Borrar este mensaje"
 
 #. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
@@ -2100,13 +2086,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting a user.
 #: actions/deleteuser.php:158
 #, fuzzy
-msgid "Do not delete this user."
+msgid "Do not delete this user"
 msgstr "No eliminar este usuario"
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
-#: actions/deleteuser.php:165
-#, fuzzy
-msgid "Delete this user."
+#. TRANS: Description of form for deleting a user.
+#: actions/deleteuser.php:165 lib/deleteuserform.php:75
+msgid "Delete this user"
 msgstr "Borrar este usuario"
 
 #. TRANS: Message used as title for design settings for the site.
@@ -2270,21 +2256,21 @@ msgid "Use defaults"
 msgstr "Usar los valores predeterminados"
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:720
-#, fuzzy
-msgid "Restore default designs."
+#. TRANS: Title for button on profile design page to reset all colour settings to default.
+#: actions/designadminpanel.php:720 lib/designsettings.php:259
+msgid "Restore default designs"
 msgstr "Restaurar los diseños predeterminados"
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:728
-#, fuzzy
-msgid "Reset back to default."
+#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
+#: actions/designadminpanel.php:728 lib/designsettings.php:267
+msgid "Reset back to default"
 msgstr "Volver a los valores predeterminados"
 
 #. TRANS: Title for button for saving theme settings.
-#: actions/designadminpanel.php:736
-#, fuzzy
-msgid "Save design."
+#. TRANS: Title for button on profile design page to save settings.
+#: actions/designadminpanel.php:736 lib/designsettings.php:272
+msgid "Save design"
 msgstr "Guardar el diseño"
 
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
@@ -2316,7 +2302,7 @@ msgid "You must be logged in to edit an application."
 msgstr "Debes haber iniciado sesión para editar una aplicación."
 
 #. TRANS: Client error displayed trying to edit an application that does not exist.
-#: actions/editapplication.php:83 actions/showapplication.php:83
+#: actions/editapplication.php:83 actions/showapplication.php:87
 msgid "No such application."
 msgstr "No existe tal aplicación."
 
@@ -2600,7 +2586,7 @@ msgid "Cannot normalize that email address."
 msgstr "No se puede normalizar esta dirección de correo electrónico."
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:393 actions/register.php:204
+#: actions/emailsettings.php:393 actions/register.php:212
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "Correo electrónico no válido"
@@ -2677,22 +2663,19 @@ msgstr "No hay dirección de correo entrante."
 
 #. 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.
 #: actions/emailsettings.php:530 actions/emailsettings.php:554
-#: actions/smssettings.php:566 actions/smssettings.php:591
+#: actions/smssettings.php:565 actions/smssettings.php:588
 #, fuzzy
 msgid "Could not update user record."
 msgstr "No se pudo actualizar información de usuario."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
-#. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:534 actions/smssettings.php:570
+#: actions/emailsettings.php:534 actions/smssettings.php:568
 msgid "Incoming email address removed."
 msgstr "Dirección de correo entrante removida."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
-#. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:558 actions/smssettings.php:595
+#: actions/emailsettings.php:558 actions/smssettings.php:591
 msgid "New incoming email address added."
 msgstr "Nueva dirección de correo entrante agregada."
 
@@ -2704,7 +2687,7 @@ msgstr "¡Este mensaje ya está en favoritos!"
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
 #: actions/favor.php:95
 #, fuzzy
-msgid "Disfavor favorite."
+msgid "Disfavor favorite"
 msgstr "Sacar favorito"
 
 #. TRANS: Page title for first page of favorited notices.
@@ -2946,13 +2929,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
 #: actions/groupblock.php:191
 #, fuzzy
-msgid "Do not block this user from this group."
+msgid "Do not block this user from this group"
 msgstr "No bloquear este usuario de este grupo"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
 #: actions/groupblock.php:198
 #, fuzzy
-msgid "Block this user from this group."
+msgid "Block this user from this group"
 msgstr "Bloquear este usuario de este grupo"
 
 #. TRANS: Server error displayed when trying to block a user from a group fails because of an application error.
@@ -2963,7 +2946,6 @@ msgstr ""
 "grupo."
 
 #. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
-#. TRANS: Client error displayed trying to find a user by ID without providing an ID.
 #: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr "Sin ID."
@@ -3152,10 +3134,8 @@ msgid "Group search"
 msgstr "Búsqueda en grupos"
 
 #. TRANS: Text on page where groups can be searched if no results were found for a query.
-#. TRANS: Text for notice search results is the query had no results.
-#. TRANS: Message on the "People search" page where a query has no results.
-#: actions/groupsearch.php:82 actions/noticesearch.php:122
-#: actions/peoplesearch.php:87
+#: actions/groupsearch.php:82 actions/noticesearch.php:117
+#: actions/peoplesearch.php:83
 msgid "No results."
 msgstr "No se obtuvo resultados."
 
@@ -3192,7 +3172,6 @@ msgid "User is not blocked from group."
 msgstr "El usuario no está bloqueado del grupo."
 
 #. TRANS: Server error displayed when unblocking a user from a group fails because of an unknown error.
-#. TRANS: Server error displayed when removing a user block.
 #: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "Se ha producido un error al eliminar el bloque."
@@ -3289,8 +3268,7 @@ msgid "Publish a MicroID for my Jabber/Google Talk address."
 msgstr "Publicar un MicroID para mi cuenta Jabber/GTalk."
 
 #. TRANS: Confirmation message for successful Instant Messaging preferences save.
-#. TRANS: Confirmation message after saving preferences.
-#: actions/imsettings.php:283 actions/othersettings.php:193
+#: actions/imsettings.php:283 actions/othersettings.php:192
 msgid "Preferences saved."
 msgstr "Preferencias guardadas."
 
@@ -3585,7 +3563,7 @@ msgstr "Debes estar conectado para dejar un grupo."
 
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
-#: actions/leavegroup.php:103 lib/command.php:386
+#: actions/leavegroup.php:103 lib/command.php:398
 msgid "You are not a member of that group."
 msgstr "No eres miembro de este grupo."
 
@@ -3708,43 +3686,41 @@ msgstr "Guardar"
 msgid "Save license settings"
 msgstr ""
 
-#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
-#: actions/login.php:97 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
 msgid "Already logged in."
 msgstr "Ya estás conectado."
 
-#: actions/login.php:142
+#: actions/login.php:148
 msgid "Incorrect username or password."
 msgstr "Nombre de usuario o contraseña incorrectos."
 
-#. TRANS: Server error displayed when a user object could not be created trying to login using "one time password login".
-#: actions/login.php:148 actions/otp.php:127
+#: actions/login.php:154 actions/otp.php:120
 msgid "Error setting user. You are probably not authorized."
 msgstr "Error al configurar el usuario. Posiblemente no tengas autorización."
 
-#: actions/login.php:202 actions/login.php:253
+#: actions/login.php:210 actions/login.php:263
 msgid "Login"
 msgstr "Inicio de sesión"
 
-#: actions/login.php:239
+#: actions/login.php:249
 msgid "Login to site"
 msgstr "Ingresar a sitio"
 
-#: actions/login.php:248 actions/register.php:476
+#: actions/login.php:258 actions/register.php:490
 msgid "Remember me"
 msgstr "Recordarme"
 
-#: actions/login.php:249 actions/register.php:478
+#: actions/login.php:259 actions/register.php:492
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 "Iniciar sesión automáticamente en el futuro. ¡No usar en ordenadores "
 "compartidos! "
 
-#: actions/login.php:259
+#: actions/login.php:269
 msgid "Lost or forgotten password?"
 msgstr "¿Contraseña olvidada o perdida?"
 
-#: actions/login.php:277
+#: actions/login.php:288
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -3752,11 +3728,11 @@ msgstr ""
 "Por razones de seguridad, por favor vuelve a escribir tu nombre de usuario y "
 "contraseña antes de cambiar tu configuración."
 
-#: actions/login.php:281
+#: actions/login.php:292
 msgid "Login with your username and password."
 msgstr "Ingresar con tu nombre de usuario y contraseña."
 
-#: actions/login.php:284
+#: actions/login.php:295
 #, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -3841,14 +3817,14 @@ msgid "New message"
 msgstr "Nuevo Mensaje "
 
 #. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
-#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:501
+#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:513
 msgid "You can't send a message to this user."
 msgstr "No puedes enviar mensaje a este usuario."
 
 #. TRANS: Command exception text shown when trying to send a direct message to another user without content.
 #. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
-#: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:478
-#: lib/command.php:581
+#: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:490
+#: lib/command.php:593
 msgid "No content!"
 msgstr "¡Ningún contenido!"
 
@@ -3857,7 +3833,7 @@ msgid "No recipient specified."
 msgstr "No se especificó receptor."
 
 #. TRANS: Error text shown when trying to send a direct message to self.
-#: actions/newmessage.php:167 lib/command.php:505
+#: actions/newmessage.php:167 lib/command.php:517
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr "No te auto envíes un mensaje; dícetelo a ti mismo."
@@ -3868,7 +3844,7 @@ msgstr "Mensaje enviado"
 
 #. TRANS: Message given have sent a direct message to another user.
 #. TRANS: %s is the name of the other user.
-#: actions/newmessage.php:188 lib/command.php:513
+#: actions/newmessage.php:188 lib/command.php:525
 #, php-format
 msgid "Direct message to %s sent."
 msgstr "Se ha enviado un mensaje directo a %s."
@@ -3885,9 +3861,7 @@ msgstr "Nuevo mensaje"
 msgid "Notice posted"
 msgstr "Mensaje publicado"
 
-#. TRANS: Instructions for Notice search page.
-#. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/noticesearch.php:69
+#: actions/noticesearch.php:68
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -3896,21 +3870,16 @@ msgstr ""
 "Buscar mensajes en %%site.name%% por contenido. Separa los términos de "
 "búsqueda con espacios; deben tener una longitud mínima de 3 caracteres."
 
-#. TRANS: Title of the page where users can search for notices.
-#: actions/noticesearch.php:80
+#: actions/noticesearch.php:78
 msgid "Text search"
 msgstr "Búsqueda de texto"
 
-#. TRANS: Test in RSS notice search.
-#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearch.php:95
+#: actions/noticesearch.php:91
 #, php-format
 msgid "Search results for \"%1$s\" on %2$s"
 msgstr "Resultados de la búsqueda de \"%1$s\" en %2$s"
 
-#. TRANS: Text for logged in users making a query for notices without results.
-#. TRANS: This message contains a Markdown link.
-#: actions/noticesearch.php:128
+#: actions/noticesearch.php:121
 #, php-format
 msgid ""
 "Be the first to [post on this topic](%%%%action.newnotice%%%%?"
@@ -3919,9 +3888,7 @@ msgstr ""
 "Sé la primera persona en [publicar algo en este tema](%%%%action.newnotice%%%"
 "%?status_textarea=%s)!"
 
-#. TRANS: Text for not logged in users making a query for notices without results.
-#. TRANS: This message contains Markdown links.
-#: actions/noticesearch.php:133
+#: actions/noticesearch.php:124
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and be the first to "
@@ -3931,17 +3898,14 @@ msgstr ""
 "en la primera persona en [publicar algo en este tema](%%%%action.newnotice%%%"
 "%?status_textarea=%s)?"
 
-#. TRANS: RSS notice search feed title. %s is the query.
-#: actions/noticesearchrss.php:95
+#: actions/noticesearchrss.php:96
 #, php-format
 msgid "Updates with \"%s\""
 msgstr "Actualizaciones con \"%s\""
 
-#. TRANS: RSS notice search feed description.
-#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearchrss.php:99
+#: actions/noticesearchrss.php:98
 #, fuzzy, php-format
-msgid "Updates matching search term \"%1$s\" on %2$s."
+msgid "Updates matching search term \"%1$s\" on %2$s!"
 msgstr ""
 "¡Actualizaciones que contienen el término de búsqueda \"%1$s\" en %2$s!"
 
@@ -3984,30 +3948,30 @@ msgid "You have not registered any applications yet."
 msgstr "Aún no has registrado aplicación alguna."
 
 #. TRANS: Title for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:70
+#: actions/oauthconnectionssettings.php:71
 msgid "Connected applications"
 msgstr "Aplicaciones conectadas"
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:81
+#: actions/oauthconnectionssettings.php:83
 msgid "The following connections exist for your account."
 msgstr ""
 
 #. TRANS: Client error when trying to revoke access for an application while not being a user of it.
-#: actions/oauthconnectionssettings.php:166
+#: actions/oauthconnectionssettings.php:168
 msgid "You are not a user of that application."
 msgstr "No eres un usuario de esa aplicación."
 
 #. TRANS: Client error when revoking access has failed for some reason.
 #. TRANS: %s is the application ID revoking access failed for.
-#: actions/oauthconnectionssettings.php:181
+#: actions/oauthconnectionssettings.php:183
 #, fuzzy, php-format
 msgid "Unable to revoke access for application: %s."
 msgstr "No se puede revocar el acceso para la aplicación: %s."
 
 #. TRANS: Success message after revoking access for an application.
 #. TRANS: %1$s is the application name, %2$s is the first part of the user token.
-#: actions/oauthconnectionssettings.php:200
+#: actions/oauthconnectionssettings.php:202
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -4015,30 +3979,20 @@ msgid ""
 msgstr ""
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:211
+#: actions/oauthconnectionssettings.php:213
 msgid "You have not authorized any applications to use your account."
 msgstr "No has autorizado a ninguna aplicación utilizar tu cuenta."
 
 #. TRANS: Note for developers in the OAuth connection settings form.
 #. TRANS: This message contains a Markdown link. Do not separate "](".
 #. TRANS: %s is the URL to the OAuth settings.
-#: actions/oauthconnectionssettings.php:231
+#: actions/oauthconnectionssettings.php:233
 #, php-format
 msgid ""
 "Are you a developer? [Register an OAuth client application](%s) to use with "
 "this instance of StatusNet."
 msgstr ""
 
-#: actions/oembed.php:64
-#, fuzzy, php-format
-msgid "\"%s\" not found."
-msgstr "Método de API no encontrado."
-
-#: actions/oembed.php:76
-#, fuzzy, php-format
-msgid "Notice %s not found."
-msgstr "Método de API no encontrado."
-
 #: actions/oembed.php:80 actions/shownotice.php:100
 msgid "Notice has no profile."
 msgstr "Mensaje sin perfil."
@@ -4048,16 +4002,6 @@ msgstr "Mensaje sin perfil."
 msgid "%1$s's status on %2$s"
 msgstr "estado de %1$s en %2$s"
 
-#: actions/oembed.php:95
-#, fuzzy, php-format
-msgid "Attachment %s not found."
-msgstr "No se encuentra usuario receptor."
-
-#: actions/oembed.php:136
-#, php-format
-msgid "\"%s\" not supported for oembed requests."
-msgstr ""
-
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
 #: actions/oembed.php:168
 #, php-format
@@ -4076,12 +4020,11 @@ msgstr "Solamente %s URL sobre HTTP simples, por favor."
 msgid "Not a supported data format."
 msgstr "No es un formato de datos compatible."
 
-#. TRANS: ShortName in the OpenSearch interface when trying to find users.
 #: actions/opensearch.php:64
 msgid "People Search"
 msgstr "Búsqueda de gente"
 
-#: actions/opensearch.php:68
+#: actions/opensearch.php:67
 msgid "Notice Search"
 msgstr "Búsqueda de mensajes"
 
@@ -4101,7 +4044,7 @@ msgstr "Manejo de varias opciones adicionales."
 #. TRANS: here if it has one (most likely a single space).
 #: actions/othersettings.php:113
 msgid " (free service)"
-msgstr "  (servicio gratuito)"
+msgstr " (servicio libre)"
 
 #. TRANS: Label for dropdown with URL shortener services.
 #: actions/othersettings.php:122
@@ -4129,46 +4072,37 @@ msgstr "Ocultar o mostrar diseños de perfil."
 msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr "El servicio de acortamiento de URL es muy largo (máx. 50 caracteres)."
 
-#. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
-#: actions/otp.php:70
+#: actions/otp.php:69
 msgid "No user ID specified."
 msgstr "No se ha especificado ID de usuario."
 
-#. TRANS: Client error displayed trying to use "one time password login" without specifying a login token.
-#: actions/otp.php:86
+#: actions/otp.php:83
 msgid "No login token specified."
 msgstr "No se ha especificado un token de acceso."
 
-#. TRANS: Client error displayed trying to use "one time password login" without requesting a login token.
-#: actions/otp.php:94
+#: actions/otp.php:90
 msgid "No login token requested."
 msgstr "Token de acceso solicitado."
 
-#. TRANS: Client error displayed trying to use "one time password login" while specifying an invalid login token.
-#: actions/otp.php:100
+#: actions/otp.php:95
 msgid "Invalid login token specified."
 msgstr "Token de acceso inválido especificado."
 
-#. TRANS: Client error displayed trying to use "one time password login" while specifying an expired login token.
-#: actions/otp.php:110
+#: actions/otp.php:104
 msgid "Login token expired."
 msgstr "Token de acceso caducado."
 
-#. TRANS: Title for outbox for any but the fist page.
-#. TRANS: %1$s is the user nickname, %2$d is the page number.
-#: actions/outbox.php:57
+#: actions/outbox.php:58
 #, php-format
 msgid "Outbox for %1$s - page %2$d"
 msgstr "Bandeja de salida de %1$s - página %2$d"
 
-#. TRANS: Title for first page of outbox.
 #: actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
 msgstr "Bandeja de salida para %s"
 
-#. TRANS: Instructions for outbox.
-#: actions/outbox.php:103
+#: actions/outbox.php:104
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr ""
 "Ésta es tu bandeja de salida, incluye la lista de mensajes privados enviados."
@@ -4195,45 +4129,43 @@ msgstr "Antigua contraseña"
 msgid "New password"
 msgstr "Nueva contraseña"
 
-#: actions/passwordsettings.php:109 actions/register.php:423
+#: actions/passwordsettings.php:109
 #, fuzzy
-msgid "6 or more characters."
+msgid "6 or more characters"
 msgstr "6 o más caracteres"
 
-#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:264
-#: actions/register.php:427
+#: actions/passwordsettings.php:113
 #, fuzzy
-msgid "Same as password above."
+msgid "Same as password above"
 msgstr "Igual a la contraseña de arriba"
 
 #: actions/passwordsettings.php:117
 msgid "Change"
 msgstr "Cambiar"
 
-#: actions/passwordsettings.php:153 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:238
 msgid "Password must be 6 or more characters."
 msgstr "La contraseña debe tener 6 o más caracteres."
 
-#: actions/passwordsettings.php:156 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:241
 msgid "Passwords don't match."
 msgstr "Las contraseñas no coinciden"
 
-#: actions/passwordsettings.php:164
+#: actions/passwordsettings.php:165
 msgid "Incorrect old password"
 msgstr "Contraseña antigua incorrecta."
 
-#: actions/passwordsettings.php:180
+#: actions/passwordsettings.php:181
 msgid "Error saving user; invalid."
 msgstr "Error al guardar el usuario; inválido."
 
-#. TRANS: Reset password form validation error message.
-#: actions/passwordsettings.php:185 actions/recoverpassword.php:418
+#: actions/passwordsettings.php:186
 #, fuzzy
-msgid "Cannot save new password."
+msgid "Can't save new password."
 msgstr "No se puede guardar la nueva contraseña."
 
-#: actions/passwordsettings.php:191
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
 msgid "Password saved."
 msgstr "Se guardó la contraseña."
 
@@ -4525,9 +4457,7 @@ msgstr "Servidor hacia el cual dirigir las solicitudes SSL"
 msgid "Save paths"
 msgstr "Guardar rutas"
 
-#. TRANS: Instructions for the "People search" page.
-#. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/peoplesearch.php:54
+#: actions/peoplesearch.php:52
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
@@ -4536,8 +4466,7 @@ msgstr ""
 "Buscar personas en %%site.name%% por nombre, ubicación o intereses. Separa "
 "los términos con espacios; deben tener una longitud mínima de 3 caracteres."
 
-#. TRANS: Title of a page where users can search for other users.
-#: actions/peoplesearch.php:61
+#: actions/peoplesearch.php:58
 msgid "People search"
 msgstr "Buscador de gente"
 
@@ -4581,7 +4510,7 @@ msgid "Profile information"
 msgstr "Información del perfil"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109 actions/register.php:419
+#: actions/profilesettings.php:109 actions/register.php:433
 #, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr ""
@@ -4590,7 +4519,7 @@ msgstr ""
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for full group name (dt). Text hidden by default.
 #. TRANS: DT for full name in a profile.
-#: actions/profilesettings.php:113 actions/register.php:441
+#: actions/profilesettings.php:113 actions/register.php:455
 #: actions/showgroup.php:255 actions/tagother.php:104
 #: lib/groupeditform.php:150 lib/userprofile.php:156
 msgid "Full name"
@@ -4598,13 +4527,13 @@ msgstr "Nombre completo"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:118 actions/register.php:446
+#: actions/profilesettings.php:118 actions/register.php:460
 #: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "Página de inicio"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:121 actions/register.php:448
+#: actions/profilesettings.php:121
 #, fuzzy
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr "El URL de tu página de inicio, blog o perfil en otro sitio"
@@ -4612,7 +4541,7 @@ msgstr "El URL de tu página de inicio, blog o perfil en otro sitio"
 #. TRANS: Tooltip for field label in form for profile settings. Plural
 #. TRANS: is decided by the number of characters available for the
 #. TRANS: biography (%d).
-#: actions/profilesettings.php:129 actions/register.php:457
+#: actions/profilesettings.php:129 actions/register.php:471
 #, fuzzy, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4620,29 +4549,28 @@ msgstr[0] "Descríbete y cuéntanos tus intereses en %d caracteres"
 msgstr[1] "Descríbete y cuéntanos tus intereses en %d caracteres"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:135 actions/register.php:462
+#: actions/profilesettings.php:135 actions/register.php:476
 msgid "Describe yourself and your interests"
 msgstr "Descríbete y cuéntanos acerca de tus intereses"
 
 #. TRANS: Text area label in form for profile settings where users can provide.
 #. TRANS: their biography.
-#: actions/profilesettings.php:139 actions/register.php:464
+#: actions/profilesettings.php:139 actions/register.php:478
 msgid "Bio"
 msgstr "Biografía"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group location (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT for location in a profile.
-#: actions/profilesettings.php:145 actions/register.php:469
+#: actions/profilesettings.php:145 actions/register.php:483
 #: actions/showgroup.php:265 actions/tagother.php:112
-#: actions/userauthorization.php:174 lib/groupeditform.php:173
+#: actions/userauthorization.php:166 lib/groupeditform.php:173
 #: lib/userprofile.php:172
 msgid "Location"
 msgstr "Ubicación"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148
+#: actions/profilesettings.php:148 actions/register.php:485
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Dónde estás, por ejemplo \"Ciudad, Estado (o Región), País\""
 
@@ -4663,8 +4591,7 @@ msgstr "Etiquetas"
 #: actions/profilesettings.php:164
 #, fuzzy
 msgid ""
-"Tags for yourself (letters, numbers, -, ., and _), comma- or space- "
-"separated."
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr ""
 "Etiquetas para ti (letras, números, -, ., y _), separadas por comas o "
 "espacios"
@@ -4677,7 +4604,7 @@ msgstr "Idioma"
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
 #: actions/profilesettings.php:171
 #, fuzzy
-msgid "Preferred language."
+msgid "Preferred language"
 msgstr "Lenguaje de preferencia"
 
 #. TRANS: Dropdownlist label in form for profile settings.
@@ -4694,7 +4621,7 @@ msgstr "En que zona horaria se encuentra normalmente?"
 #: actions/profilesettings.php:189
 #, fuzzy
 msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)."
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr ""
 "Suscribirse automáticamente a quien quiera que se suscriba a mí (es mejor "
 "para no-humanos)"
@@ -4702,7 +4629,7 @@ msgstr ""
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Plural form is used based on the maximum number of allowed
 #. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:258 actions/register.php:221
+#: actions/profilesettings.php:258 actions/register.php:229
 #, fuzzy, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4722,9 +4649,9 @@ msgstr "Idioma es muy largo ( max 50 car.)"
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:291
-#, fuzzy, php-format
-msgid "Invalid tag: \"%s\"."
+#: actions/profilesettings.php:291 actions/tagother.php:178
+#, php-format
+msgid "Invalid tag: \"%s\""
 msgstr "Etiqueta inválida: \"% s\""
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
@@ -4834,12 +4761,6 @@ msgstr ""
 "org/wiki/Microblogging) basada en la herramienta de software libre  "
 "[StatusNet](http://status.net/) tool."
 
-#. TRANS: Public RSS feed description. %s is the StatusNet site name.
-#: actions/publicrss.php:106
-#, fuzzy, php-format
-msgid "%s updates from everyone."
-msgstr "¡Actualizaciones de todos en %s!"
-
 #. TRANS: Title for public tag cloud.
 #: actions/publictagcloud.php:57
 msgid "Public tag cloud"
@@ -4982,12 +4903,6 @@ msgstr "Recuperar contraseña"
 msgid "Password recovery requested"
 msgstr "Recuperación de contraseña solicitada"
 
-#. TRANS: Title for password recovery page in password saved mode.
-#: actions/recoverpassword.php:229
-#, fuzzy
-msgid "Password saved"
-msgstr "Se guardó la contraseña."
-
 #. TRANS: Title for password recovery page when an unknown action has been specified.
 #: actions/recoverpassword.php:232
 msgid "Unknown action"
@@ -4999,6 +4914,12 @@ msgstr "Acción desconocida"
 msgid "6 or more characters, and do not forget it!"
 msgstr "6 o más caracteres, ¡no te olvides!"
 
+#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#: actions/recoverpassword.php:264 actions/register.php:441
+#, fuzzy
+msgid "Same as password above."
+msgstr "Igual a la contraseña de arriba"
+
 #. TRANS: Button text for password reset form.
 #. TRANS: Button text on profile design page to reset all colour settings to default without saving.
 #: actions/recoverpassword.php:268 lib/designsettings.php:264
@@ -5052,8 +4973,14 @@ msgstr "La contraseña debe tener 6 o más caracteres."
 msgid "Password and confirmation do not match."
 msgstr "La contraseña y la confirmación no coinciden."
 
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:418
+#, fuzzy
+msgid "Cannot save new password."
+msgstr "No se puede guardar la nueva contraseña."
+
 #. TRANS: Server error displayed when something does wrong with the user object during password reset.
-#: actions/recoverpassword.php:426 actions/register.php:248
+#: actions/recoverpassword.php:426 actions/register.php:256
 msgid "Error setting user."
 msgstr "Error al configurar el usuario."
 
@@ -5062,95 +4989,100 @@ msgstr "Error al configurar el usuario."
 msgid "New password successfully saved. You are now logged in."
 msgstr "Nueva contraseña guardada correctamente. Has iniciado una sesión."
 
-#: actions/register.php:87 actions/register.php:188 actions/register.php:399
+#: actions/register.php:92 actions/register.php:196 actions/register.php:413
 msgid "Sorry, only invited people can register."
 msgstr "Disculpa, sólo personas invitadas pueden registrarse."
 
-#: actions/register.php:94
+#: actions/register.php:99
 msgid "Sorry, invalid invitation code."
 msgstr "El código de invitación no es válido."
 
-#: actions/register.php:113
+#: actions/register.php:119
 msgid "Registration successful"
 msgstr "Registro exitoso."
 
-#: actions/register.php:115 actions/register.php:497
+#: actions/register.php:121 actions/register.php:511
 msgid "Register"
 msgstr "Registrarse"
 
-#: actions/register.php:135
+#: actions/register.php:142
 msgid "Registration not allowed."
 msgstr "Registro de usuario no permitido."
 
-#: actions/register.php:201
+#: actions/register.php:209
 #, fuzzy
-msgid "You cannot register if you don't agree to the license."
+msgid "You can't register if you don't agree to the license."
 msgstr "No puedes registrarte si no estás de acuerdo con la licencia."
 
-#: actions/register.php:210
+#: actions/register.php:218
 msgid "Email address already exists."
 msgstr "La dirección de correo electrónico ya existe."
 
-#: actions/register.php:243 actions/register.php:265
+#: actions/register.php:251 actions/register.php:273
 msgid "Invalid username or password."
 msgstr "Usuario o contraseña inválidos."
 
-#: actions/register.php:340
+#: actions/register.php:351
 #, fuzzy
 msgid ""
 "With this form you can create a new account. You can then post notices and "
-"link up to friends and colleagues."
+"link up to friends and colleagues. "
 msgstr ""
 "Con este formulario puedes crear una nueva cuenta. Después podrás publicar "
 "avisos y enviar vínculos de ellos a tus amigos y colegas. "
 
+#: actions/register.php:437
+#, fuzzy
+msgid "6 or more characters."
+msgstr "6 o más caracteres"
+
 #. TRANS: Link description in user account settings menu.
-#: actions/register.php:431 actions/register.php:435
+#: actions/register.php:445 actions/register.php:449
 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
 msgid "Email"
 msgstr "Correo electrónico"
 
-#: actions/register.php:432 actions/register.php:436
+#: actions/register.php:446 actions/register.php:450
 #, fuzzy
-msgid "Used only for updates, announcements, and password recovery."
+msgid "Used only for updates, announcements, and password recovery"
 msgstr ""
 "Se usa sólo para actualizaciones, anuncios y recuperación de contraseñas"
 
-#: actions/register.php:443
+#: actions/register.php:457
 #, fuzzy
-msgid "Longer name, preferably your \"real\" name."
+msgid "Longer name, preferably your \"real\" name"
 msgstr "Nombre más largo, preferiblemente tu nombre \"real\""
 
-#: actions/register.php:471
+#: actions/register.php:462
 #, fuzzy
-msgid "Where you are, like \"City, State (or Region), Country\"."
-msgstr "Dónde estás, por ejemplo \"Ciudad, Estado (o Región), País\""
+msgid "URL of your homepage, blog, or profile on another site"
+msgstr "El URL de tu página de inicio, blog o perfil en otro sitio"
 
-#: actions/register.php:510
+#: actions/register.php:523
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
 msgstr ""
 "Entiendo que el contenido y los datos de %1$s son privados y confidenciales."
 
-#: actions/register.php:520
+#: actions/register.php:533
 #, php-format
 msgid "My text and files are copyright by %1$s."
 msgstr ""
 "Mi texto y archivos est'an protegidos por los derecho de autor de %1$s."
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:524
+#: actions/register.php:537
 msgid "My text and files remain under my own copyright."
 msgstr "Mi texto y archivos permanecen bajo mi propio derecho de autor."
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:527
+#: actions/register.php:540
 msgid "All rights reserved."
 msgstr "Todos los derechos reservados."
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:532
+#: actions/register.php:545
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -5160,7 +5092,7 @@ msgstr ""
 "información privada: contraseña, dirección de correo electrónico, dirección "
 "de mensajería instantánea y número de teléfono."
 
-#: actions/register.php:573
+#: actions/register.php:588
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -5193,7 +5125,7 @@ msgstr ""
 "\n"
 "¡Gracias por apuntarte! Esperamos que disfrutes usando este servicio."
 
-#: actions/register.php:597
+#: actions/register.php:612
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5227,7 +5159,7 @@ msgstr "Usuario"
 
 #: actions/remotesubscribe.php:129
 #, fuzzy
-msgid "Nickname of the user you want to follow."
+msgid "Nickname of the user you want to follow"
 msgstr "Usuario a quien quieres seguir"
 
 #: actions/remotesubscribe.php:132
@@ -5236,7 +5168,7 @@ msgstr "URL del perfil"
 
 #: actions/remotesubscribe.php:133
 #, fuzzy
-msgid "URL of your profile on another compatible microblogging service."
+msgid "URL of your profile on another compatible microblogging service"
 msgstr "El URL de tu perfil en otro servicio de microblogueo compatible"
 
 #. TRANS: Link text for link that will subscribe to a remote profile.
@@ -5247,7 +5179,7 @@ msgstr "Suscribirse"
 
 #: actions/remotesubscribe.php:158
 #, fuzzy
-msgid "Invalid profile URL (bad format)."
+msgid "Invalid profile URL (bad format)"
 msgstr "El URL del perfil es inválido (formato incorrecto)"
 
 #: actions/remotesubscribe.php:167
@@ -5291,7 +5223,6 @@ msgstr "Repetido"
 msgid "Repeated!"
 msgstr "¡Repetido!"
 
-#. TRANS: RSS reply feed title. %s is a user nickname.
 #. TRANS: Tooltip for personal group navigation menu option when logged in for viewing @-replies.
 #: actions/replies.php:126 actions/repliesrss.php:68
 #: lib/personalgroupnav.php:109
@@ -5346,11 +5277,9 @@ msgstr ""
 "Puedes intentar [darle un toque a %1$s](../%2$s) o [publicar algo a su "
 "atención](%%%%action.newnotice%%%%?status_textarea=%3$s)."
 
-#. TRANS: RSS reply feed description.
-#. TRANS: %1$s is a user nickname, %2$s is the StatusNet site name.
-#: actions/repliesrss.php:74
+#: actions/repliesrss.php:72
 #, fuzzy, php-format
-msgid "Replies to %1$s on %2$s."
+msgid "Replies to %1$s on %2$s!"
 msgstr "Respuestas a %1$s en %2$s!"
 
 #. TRANS: Client exception displayed when trying to restore an account while not logged in.
@@ -5453,7 +5382,7 @@ msgstr "No puedes revocar funciones de usuario en este sitio."
 msgid "User doesn't have this role."
 msgstr "El usuario no tiene esta función."
 
-#: actions/rsd.php:142 actions/version.php:159
+#: actions/rsd.php:146 actions/version.php:159
 msgid "StatusNet"
 msgstr "StatusNet"
 
@@ -5495,87 +5424,87 @@ msgstr "Activar la salida de depuración para sesiones."
 msgid "Save site settings"
 msgstr "Guardar la configuración del sitio"
 
-#: actions/showapplication.php:78
+#: actions/showapplication.php:82
 msgid "You must be logged in to view an application."
 msgstr "Tienes que haber iniciado sesión para poder ver aplicaciones."
 
-#: actions/showapplication.php:151
+#: actions/showapplication.php:157
 msgid "Application profile"
 msgstr "Perfil de la aplicación"
 
 #. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:153 lib/applicationeditform.php:177
+#: actions/showapplication.php:159 lib/applicationeditform.php:177
 msgid "Icon"
 msgstr "Icono"
 
 #. TRANS: Form input field label for application name.
-#: actions/showapplication.php:163 actions/version.php:197
+#: actions/showapplication.php:169 actions/version.php:197
 #: lib/applicationeditform.php:190
 msgid "Name"
 msgstr "Nombre"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:172 lib/applicationeditform.php:227
+#: actions/showapplication.php:178 lib/applicationeditform.php:227
 msgid "Organization"
 msgstr "Organización"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:181 actions/version.php:200
+#: actions/showapplication.php:187 actions/version.php:200
 #: lib/applicationeditform.php:208 lib/groupeditform.php:168
 msgid "Description"
 msgstr "Descripción"
 
 #. TRANS: Header for group statistics on a group page (h2).
 #. TRANS: H2 text for user statistics.
-#: actions/showapplication.php:186 actions/showgroup.php:460
+#: actions/showapplication.php:192 actions/showgroup.php:460
 #: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "Estadísticas"
 
-#: actions/showapplication.php:197
+#: actions/showapplication.php:203
 #, php-format
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr "Creado por %1$s - acceso predeterminado %2$s - %3$d usuarios"
 
-#: actions/showapplication.php:207
+#: actions/showapplication.php:213
 msgid "Application actions"
 msgstr "Acciones de la aplicación"
 
-#: actions/showapplication.php:230
+#: actions/showapplication.php:236
 msgid "Reset key & secret"
 msgstr "Reiniciar clave y secreto"
 
 #. TRANS: Title of form for deleting a user.
-#: actions/showapplication.php:246 lib/deletegroupform.php:121
+#: actions/showapplication.php:252 lib/deletegroupform.php:121
 #: lib/deleteuserform.php:64 lib/noticelist.php:673
 msgid "Delete"
 msgstr "Borrar"
 
-#: actions/showapplication.php:255
+#: actions/showapplication.php:261
 msgid "Application info"
 msgstr "Información de la aplicación"
 
-#: actions/showapplication.php:257
+#: actions/showapplication.php:263
 msgid "Consumer key"
 msgstr "Clave del consumidor"
 
-#: actions/showapplication.php:262
+#: actions/showapplication.php:268
 msgid "Consumer secret"
 msgstr "Secreto del consumidor"
 
-#: actions/showapplication.php:267
+#: actions/showapplication.php:273
 msgid "Request token URL"
 msgstr "URL del token de solicitud"
 
-#: actions/showapplication.php:272
+#: actions/showapplication.php:278
 msgid "Access token URL"
 msgstr "URL del token de acceso"
 
-#: actions/showapplication.php:277
+#: actions/showapplication.php:283
 msgid "Authorize URL"
 msgstr "Autorizar URL"
 
-#: actions/showapplication.php:282
+#: actions/showapplication.php:288
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
@@ -5583,7 +5512,7 @@ msgstr ""
 "Nota: Nuestro sistema sólo es compatible con firmas HMAC-SHA1. No son "
 "compatibles las firmas de texto sin formato."
 
-#: actions/showapplication.php:302
+#: actions/showapplication.php:309
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr "¿realmente deseas reiniciar tu clave y secreto de consumidor?"
 
@@ -5675,18 +5604,16 @@ msgid "Group profile"
 msgstr "Perfil del grupo"
 
 #. TRANS: Label for group URL (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT for URL in a profile.
 #: actions/showgroup.php:273 actions/tagother.php:118
-#: actions/userauthorization.php:184 lib/userprofile.php:186
+#: actions/userauthorization.php:175 lib/userprofile.php:186
 msgid "URL"
 msgstr "URL"
 
 #. TRANS: Label for group description or group note (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page where bio is displayed.
 #. TRANS: DT for note in a profile.
 #: actions/showgroup.php:285 actions/tagother.php:128
-#: actions/userauthorization.php:197 lib/userprofile.php:204
+#: actions/userauthorization.php:187 lib/userprofile.php:204
 msgid "Note"
 msgstr "Nota"
 
@@ -5833,7 +5760,7 @@ msgid "%1$s tagged %2$s"
 msgstr "%1$s, página %2$s"
 
 #. TRANS: Page title showing tagged notices in one user's stream.
-#. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
+#. TRANS: %1$s is the username, %2$s is the hash tag, %1$d is the page number.
 #: actions/showstream.php:74
 #, fuzzy, php-format
 msgid "%1$s tagged %2$s, page %3$d"
@@ -6086,7 +6013,7 @@ msgstr ""
 #. TRANS: Title for button to save site notice in admin panel.
 #: actions/sitenoticeadminpanel.php:201
 #, fuzzy
-msgid "Save site notice."
+msgid "Save site notice"
 msgstr "Guardar el mensaje del sitio"
 
 #. TRANS: Title for SMS settings.
@@ -6146,7 +6073,7 @@ msgstr "Número de teléfono de SMS"
 #. TRANS: SMS phone number input field instructions in SMS settings form.
 #: actions/smssettings.php:152
 #, fuzzy
-msgid "Phone number, no punctuation or spaces, with area code."
+msgid "Phone number, no punctuation or spaces, with area code"
 msgstr "Número telefónico, sin puntuación ni espacios, incluya código de área"
 
 #. TRANS: Form legend for SMS preferences form.
@@ -6316,19 +6243,15 @@ msgstr "No te has suscrito a ese perfil."
 msgid "Could not save subscription."
 msgstr "No se ha podido guardar la suscripción."
 
-#. TRANS: Client error displayed trying to perform any request method other than POST.
-#. TRANS: Do not translate POST.
 #: actions/subscribe.php:77
 msgid "This action only accepts POST requests."
 msgstr "Esta acción sólo acepta solicitudes POST."
 
-#. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
-#: actions/subscribe.php:121
+#: actions/subscribe.php:117
 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
 msgstr "No puedes suscribirte a un perfil remoto 0.1 de OMB con esta acción."
 
-#. TRANS: Page title when subscription succeeded.
-#: actions/subscribe.php:149
+#: actions/subscribe.php:145
 msgid "Subscribed"
 msgstr "Suscrito"
 
@@ -6489,9 +6412,8 @@ msgstr "%s etiqueta"
 msgid "User profile"
 msgstr "Perfil de usuario"
 
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT element in area for user avatar.
-#: actions/tagother.php:81 actions/userauthorization.php:138
+#: actions/tagother.php:81 actions/userauthorization.php:132
 #: lib/userprofile.php:108
 msgid "Photo"
 msgstr "Foto"
@@ -6508,11 +6430,6 @@ msgstr ""
 "Etiquetas para este usuario (letras, números, -, ., y _), separadas por "
 "comas o espacios"
 
-#: actions/tagother.php:178
-#, php-format
-msgid "Invalid tag: \"%s\""
-msgstr "Etiqueta inválida: \"% s\""
-
 #: actions/tagother.php:193
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
@@ -6530,7 +6447,6 @@ msgstr ""
 msgid "No such tag."
 msgstr "No existe tal etiqueta."
 
-#. TRANS: Client error displayed when trying to unblock a non-blocked user.
 #: actions/unblock.php:59
 msgid "You haven't blocked that user."
 msgstr "No has bloqueado ese usuario."
@@ -6551,7 +6467,7 @@ msgstr "No hay id de perfil en solicitud."
 msgid "Unsubscribed"
 msgstr "Desuscrito"
 
-#: actions/updateprofile.php:64
+#: actions/updateprofile.php:64 actions/userauthorization.php:337
 #, php-format
 msgid ""
 "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
@@ -6585,7 +6501,7 @@ msgstr "Texto de bienvenida inválido. La longitud máx. es de 255 caracteres."
 #. TRANS: users in user admin panel. %1$s is the invalid nickname.
 #: actions/useradminpanel.php:166
 #, fuzzy, php-format
-msgid "Invalid default subscripton: \"%1$s\" is not a user."
+msgid "Invalid default subscripton: '%1$s' is not a user."
 msgstr "Suscripción predeterminada inválida : '%1$s' no es un usuario"
 
 #. TRANS: Link description in user account settings menu.
@@ -6647,70 +6563,59 @@ msgstr "Si permitir a los usuarios invitar nuevos usuarios."
 #. TRANS: Title for button to save user settings in user admin panel.
 #: actions/useradminpanel.php:302
 #, fuzzy
-msgid "Save user settings."
+msgid "Save user settings"
 msgstr "Guardar la configuración del sitio"
 
-#. TRANS: Page title.
-#: actions/userauthorization.php:109
+#: actions/userauthorization.php:105
 msgid "Authorize subscription"
 msgstr "Autorizar la suscripción"
 
-#. TRANS: Page notice on "Auhtorize subscription" page.
-#: actions/userauthorization.php:115
+#: actions/userauthorization.php:110
 #, fuzzy
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
 "user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
-"click \"Reject\"."
+"click “Reject”."
 msgstr ""
 "Por favor revisa estos detalles para asegurar que deseas suscribirte a los "
 "avisos de este usuario. Si no pediste suscribirte a los avisos de alguien, "
 "haz clic en \"Cancelar\"."
 
-#. TRANS: DT element on Authorise Subscription page where license is displayed.
 #. TRANS: Menu item for site administration
-#: actions/userauthorization.php:207 actions/version.php:167
+#: actions/userauthorization.php:196 actions/version.php:167
 #: lib/adminpanelaction.php:403
 msgid "License"
 msgstr "Licencia"
 
-#. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:229
+#: actions/userauthorization.php:217
 #, fuzzy
-msgctxt "BUTTON"
 msgid "Accept"
 msgstr "Aceptar"
 
-#. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:231
-#, fuzzy
-msgid "Subscribe to this user."
+#: actions/userauthorization.php:218 lib/subscribeform.php:115
+#: lib/subscribeform.php:139
+msgid "Subscribe to this user"
 msgstr "Suscribirse a este usuario"
 
-#. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:233
+#: actions/userauthorization.php:219
 #, fuzzy
-msgctxt "BUTTON"
 msgid "Reject"
 msgstr "Rechazar"
 
-#. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:235
+#: actions/userauthorization.php:220
 #, fuzzy
-msgid "Reject this subscription."
+msgid "Reject this subscription"
 msgstr "Rechazar esta suscripción"
 
-#. TRANS: Client error displayed for an empty authorisation request.
-#: actions/userauthorization.php:248
+#: actions/userauthorization.php:232
 msgid "No authorization request!"
 msgstr "¡Ninguna petición de autorización!"
 
-#. TRANS: Accept message header from Authorise subscription page.
-#: actions/userauthorization.php:271
+#: actions/userauthorization.php:254
 msgid "Subscription authorized"
 msgstr "Suscripción autorizada"
 
-#: actions/userauthorization.php:274
+#: actions/userauthorization.php:256
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to authorize the "
@@ -6720,12 +6625,11 @@ msgstr ""
 "Consulte con las instrucciones del sitio para obtener detalles acerca de "
 "cómo autorizar la suscripción. Tu token de suscripción es:"
 
-#. TRANS: Reject message header from Authorise subscription page.
-#: actions/userauthorization.php:285
+#: actions/userauthorization.php:266
 msgid "Subscription rejected"
 msgstr "Suscripción rechazada"
 
-#: actions/userauthorization.php:288
+#: actions/userauthorization.php:268
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to fully reject the "
@@ -6735,64 +6639,39 @@ msgstr ""
 "de nuevo las instrucciones para saber cómo rechazar la suscripción "
 "completamente."
 
-#. TRANS: Exception thrown when no valid user is found for an authorisation request.
-#. TRANS: %s is a listener URI.
-#: actions/userauthorization.php:325
+#: actions/userauthorization.php:303
 #, fuzzy, php-format
-msgid "Listener URI \"%s\" not found here."
+msgid "Listener URI ‘%s’ not found here."
 msgstr "No se ha encontrado aquí el URI del oyente ‘%s’."
 
-#. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:332
+#: actions/userauthorization.php:308
 #, fuzzy, php-format
-msgid "Listenee URI \"%s\" is too long."
+msgid "Listenee URI ‘%s’ is too long."
 msgstr "El URI ‘%s’ del receptor es muy largo."
 
-#. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:340
+#: actions/userauthorization.php:314
 #, fuzzy, php-format
-msgid "Listenee URI \"%s\" is a local user."
+msgid "Listenee URI ‘%s’ is a local user."
 msgstr "El URI ‘%s’  del receptor es un usuario local."
 
-#. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
-#. TRANS: %s is a profile URL.
-#: actions/userauthorization.php:358
+#: actions/userauthorization.php:329
 #, fuzzy, php-format
-msgid "Profile URL \"%s\" is for a local user."
+msgid "Profile URL ‘%s’ is for a local user."
 msgstr "El URL ‘%s’ de perfil es para un usuario local."
 
-#. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
-#. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
-#: actions/userauthorization.php:368
+#: actions/userauthorization.php:345
 #, fuzzy, php-format
-msgid ""
-"Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
-"\"."
-msgstr ""
-"Licencia de flujo del emisor ‘%1$s’ es incompatible con la licencia del "
-"sitio ‘%2$s’."
-
-#. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:378
-#, fuzzy, php-format
-msgid "Avatar URL \"%s\" is not valid."
+msgid "Avatar URL ‘%s’ is not valid."
 msgstr "La URL ‘%s’ de la imagen no es válida."
 
-#. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:385
+#: actions/userauthorization.php:350
 #, fuzzy, php-format
-msgid "Cannot read avatar URL \"%s\"."
+msgid "Can’t read avatar URL ‘%s’."
 msgstr "No se puede leer la URL de la imagen ‘%s’."
 
-#. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:392
+#: actions/userauthorization.php:355
 #, fuzzy, php-format
-msgid "Wrong image type for avatar URL \"%s\"."
+msgid "Wrong image type for avatar URL ‘%s’."
 msgstr "Tipo de imagen incorrecto para la URL de imagen ‘%s’."
 
 #. TRANS: Page title for profile design page.
@@ -6900,7 +6779,7 @@ msgid "Plugins"
 msgstr "Complementos"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:898
+#: actions/version.php:198 lib/action.php:901
 msgid "Version"
 msgstr "Versión"
 
@@ -7113,14 +6992,14 @@ msgstr "Hubo un problema al guarda la bandeja de entrada del grupo."
 
 #. TRANS: Server exception thrown when a reply cannot be saved.
 #. TRANS: %1$d is a notice ID, %2$d is the ID of the mentioned user.
-#: classes/Notice.php:1142
+#: classes/Notice.php:1144
 #, fuzzy, php-format
 msgid "Could not save reply for %1$d, %2$d."
 msgstr "No se ha podido guardar la información del grupo local."
 
 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1661
+#: classes/Notice.php:1663
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
@@ -7134,14 +7013,14 @@ msgstr "%1$s (%2$s)"
 
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:775
+#: classes/Profile.php:779
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr "No se puede revocar rol \"%1$s\" para usuario #%2$d; no existe."
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:784
+#: classes/Profile.php:788
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -7460,53 +7339,53 @@ msgid "Page notice"
 msgstr "Mensaje de página"
 
 #. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:871
+#: lib/action.php:874
 msgid "Secondary site navigation"
 msgstr "Navegación de sitio secundario"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:877
+#: lib/action.php:880
 msgid "Help"
 msgstr "Ayuda"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:880
+#: lib/action.php:883
 msgid "About"
 msgstr "Acerca de"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:883
+#: lib/action.php:886
 msgid "FAQ"
 msgstr "Preguntas Frecuentes"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:888
+#: lib/action.php:891
 msgid "TOS"
 msgstr "TOS"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:892
+#: lib/action.php:895
 msgid "Privacy"
 msgstr "Privacidad"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:895
+#: lib/action.php:898
 msgid "Source"
 msgstr "Fuente"
 
 #. TRANS: Secondary navigation menu option leading to e-mail contact information on the
 #. TRANS: StatusNet site, where to report bugs, ...
-#: lib/action.php:902
+#: lib/action.php:905
 msgid "Contact"
 msgstr "Ponerse en contacto"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:905
+#: lib/action.php:908
 msgid "Badge"
 msgstr "Insignia"
 
 #. TRANS: DT element for StatusNet software license.
-#: lib/action.php:934
+#: lib/action.php:937
 msgid "StatusNet software license"
 msgstr "Licencia de software de StatusNet"
 
@@ -7514,7 +7393,7 @@ msgstr "Licencia de software de StatusNet"
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:941
+#: lib/action.php:944
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7524,7 +7403,7 @@ msgstr ""
 "[%%site.broughtby%%**](%%site.broughtbyurl%%)."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:944
+#: lib/action.php:947
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** es un servicio de microblogueo."
@@ -7533,7 +7412,7 @@ msgstr "**%%site.name%%** es un servicio de microblogueo."
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:951
+#: lib/action.php:954
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7545,27 +7424,27 @@ msgstr ""
 "licensing/licenses/agpl-3.0.html)."
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:967
+#: lib/action.php:970
 msgid "Site content license"
 msgstr "Licencia de contenido del sitio"
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:974
+#: lib/action.php:977
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr "El contenido y datos de %1$s son privados y confidenciales."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:981
+#: lib/action.php:984
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
 "Copyright del contenido y los datos de%1$s. Todos los derechos reservados."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:985
+#: lib/action.php:988
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 "Derechos de autor de contenido y datos por los colaboradores. Todos los "
@@ -7573,7 +7452,7 @@ msgstr ""
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:1017
+#: lib/action.php:1020
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
@@ -7581,19 +7460,19 @@ msgstr ""
 "$s."
 
 #. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1353
+#: lib/action.php:1356
 msgid "Pagination"
 msgstr "Paginación"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1364
+#: lib/action.php:1367
 msgid "After"
 msgstr "Después"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1374
+#: lib/action.php:1377
 msgid "Before"
 msgstr "Antes"
 
@@ -7795,23 +7674,19 @@ msgstr ""
 msgid "No application for that consumer key."
 msgstr "No hay ninguna aplicación para esa clave de consumidor."
 
-#: lib/apiauth.php:202 lib/apiauth.php:284
-msgid "Not allowed to use API."
-msgstr ""
-
 #. TRANS: OAuth exception given when an incorrect access token was given for a user.
-#: lib/apiauth.php:225
+#: lib/apiauth.php:219
 msgid "Bad access token."
 msgstr "Token de acceso erróneo."
 
 #. TRANS: OAuth exception given when no user was found for a given token (no token was found).
-#: lib/apiauth.php:230
+#: lib/apiauth.php:224
 msgid "No user for that token."
 msgstr "No hay ningún usuario para ese token."
 
 #. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel".
 #. TRANS: Client error thrown when authentication fails.
-#: lib/apiauth.php:272 lib/apiauth.php:302
+#: lib/apiauth.php:266 lib/apiauth.php:293
 msgid "Could not authenticate you."
 msgstr "No ha sido posible autenticarte."
 
@@ -8018,11 +7893,6 @@ msgstr "No está permitido cambiar la contraseña"
 msgid "Block"
 msgstr "Bloquear"
 
-#. TRANS: Description of the form to block a user.
-#: lib/blockform.php:79
-msgid "Block this user"
-msgstr "Bloquear este usuario."
-
 #. TRANS: Title for command results.
 #: lib/channel.php:160 lib/channel.php:181
 msgid "Command results"
@@ -8051,7 +7921,7 @@ msgstr "No existe ningún mensaje con ese ID."
 
 #. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
 #. TRANS: Error text shown when a last user notice is requested and it does not exist.
-#: lib/command.php:99 lib/command.php:630
+#: lib/command.php:99 lib/command.php:642
 msgid "User has no last notice."
 msgstr "El/La usuario/a no tiene ningún último mensaje"
 
@@ -8102,35 +7972,41 @@ msgstr ""
 "Suscriptores: %2$s\n"
 "Avisos: %3$s"
 
+#. TRANS: Error message text shown when a favorite could not be set because it has already been favorited.
+#: lib/command.php:298
+#, fuzzy
+msgid "Could not create favorite: already favorited."
+msgstr "No se pudo crear favorito."
+
 #. TRANS: Text shown when a notice has been marked as favourite successfully.
-#: lib/command.php:312
+#: lib/command.php:324
 msgid "Notice marked as fave."
 msgstr "Mensaje marcado como favorito."
 
 #. TRANS: Message given having added a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:357
+#: lib/command.php:369
 #, php-format
 msgid "%1$s joined group %2$s."
 msgstr "%1$s se unió al grupo %2$s."
 
 #. TRANS: Message given having removed a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:405
+#: lib/command.php:417
 #, php-format
 msgid "%1$s left group %2$s."
 msgstr "%1$s dejo el grupo %2$s."
 
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: lib/command.php:426
+#: lib/command.php:438
 #, fuzzy, php-format
 msgctxt "WHOIS"
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
 
 #. TRANS: Whois output. %s is the full name of the queried user.
-#: lib/command.php:430
+#: lib/command.php:442
 #, php-format
 msgid "Fullname: %s"
 msgstr "Nombre completo: %s"
@@ -8138,7 +8014,7 @@ msgstr "Nombre completo: %s"
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a location.
-#: lib/command.php:434 lib/mail.php:270
+#: lib/command.php:446 lib/mail.php:270
 #, php-format
 msgid "Location: %s"
 msgstr "Lugar: %s"
@@ -8146,20 +8022,20 @@ msgstr "Lugar: %s"
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a homepage.
-#: lib/command.php:438 lib/mail.php:274
+#: lib/command.php:450 lib/mail.php:274
 #, php-format
 msgid "Homepage: %s"
 msgstr "Página de inicio: %s"
 
 #. TRANS: Whois output. %s is the bio information of the queried user.
-#: lib/command.php:442
+#: lib/command.php:454
 #, php-format
 msgid "About: %s"
 msgstr "Sobre: %s"
 
 #. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).
 #. TRANS: %s is a remote profile.
-#: lib/command.php:471
+#: lib/command.php:483
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
@@ -8170,7 +8046,7 @@ msgstr ""
 
 #. TRANS: Message given if content is too long. %1$sd is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:488
+#: lib/command.php:500
 #, fuzzy, php-format
 msgid "Message too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
@@ -8178,25 +8054,25 @@ msgstr[0] "Mensaje muy largo - máximo %1$d caracteres, enviaste %2$d"
 msgstr[1] "Mensaje muy largo - máximo %1$d caracteres, enviaste %2$d"
 
 #. TRANS: Error text shown sending a direct message fails with an unknown reason.
-#: lib/command.php:516
+#: lib/command.php:528
 msgid "Error sending direct message."
 msgstr "Error al enviar mensaje directo."
 
 #. TRANS: Message given having repeated a notice from another user.
 #. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:553
+#: lib/command.php:565
 #, php-format
 msgid "Notice from %s repeated."
 msgstr "Se ha repetido el mensaje de %s."
 
 #. TRANS: Error text shown when repeating a notice fails with an unknown reason.
-#: lib/command.php:556
+#: lib/command.php:568
 msgid "Error repeating notice."
 msgstr "Ha habido un error al repetir el mensaje."
 
 #. TRANS: Message given if content of a notice for a reply is too long. %1$d is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:591
+#: lib/command.php:603
 #, fuzzy, php-format
 msgid "Notice too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Notice too long - maximum is %1$d characters, you sent %2$d."
@@ -8207,80 +8083,80 @@ msgstr[1] ""
 
 #. TRANS: Text shown having sent a reply to a notice successfully.
 #. TRANS: %s is the nickname of the user of the notice the reply was sent to.
-#: lib/command.php:604
+#: lib/command.php:616
 #, php-format
 msgid "Reply to %s sent."
 msgstr "Se ha enviado la respuesta a %s."
 
 #. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
-#: lib/command.php:607
+#: lib/command.php:619
 msgid "Error saving notice."
 msgstr "Error al guardar el mensaje."
 
 #. TRANS: Error text shown when no username was provided when issuing a subscribe command.
-#: lib/command.php:654
+#: lib/command.php:666
 msgid "Specify the name of the user to subscribe to."
 msgstr "Especificar el nombre del usuario al cual se quiere suscribir."
 
 #. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
-#: lib/command.php:663
+#: lib/command.php:675
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "No te puedes suscribir a perfiles de OMB por orden."
 
 #. TRANS: Text shown after having subscribed to another user successfully.
 #. TRANS: %s is the name of the user the subscription was requested for.
-#: lib/command.php:671
+#: lib/command.php:683
 #, php-format
 msgid "Subscribed to %s."
 msgstr "Suscrito a %s."
 
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.
-#: lib/command.php:692 lib/command.php:803
+#: lib/command.php:704 lib/command.php:815
 msgid "Specify the name of the user to unsubscribe from."
 msgstr "Especifica el nombre del usuario del cual cancelar la suscripción."
 
 #. TRANS: Text shown after having unsubscribed from another user successfully.
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:703
+#: lib/command.php:715
 #, php-format
 msgid "Unsubscribed from %s."
 msgstr "Cancelada la suscripción a %s."
 
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
-#: lib/command.php:723 lib/command.php:749
+#: lib/command.php:735 lib/command.php:761
 msgid "Command not yet implemented."
 msgstr "Todavía no se implementa comando."
 
 #. TRANS: Text shown when issuing the command "off" successfully.
-#: lib/command.php:727
+#: lib/command.php:739
 msgid "Notification off."
 msgstr "Notificación no activa."
 
 #. TRANS: Error text shown when the command "off" fails for an unknown reason.
-#: lib/command.php:730
+#: lib/command.php:742
 msgid "Can't turn off notification."
 msgstr "No se puede desactivar notificación."
 
 #. TRANS: Text shown when issuing the command "on" successfully.
-#: lib/command.php:753
+#: lib/command.php:765
 msgid "Notification on."
 msgstr "Notificación activada."
 
 #. TRANS: Error text shown when the command "on" fails for an unknown reason.
-#: lib/command.php:756
+#: lib/command.php:768
 msgid "Can't turn on notification."
 msgstr "No se puede activar notificación."
 
 #. TRANS: Error text shown when issuing the login command while login is disabled.
-#: lib/command.php:770
+#: lib/command.php:782
 msgid "Login command is disabled."
 msgstr "El comando de inicio de sesión está inhabilitado."
 
 #. TRANS: Text shown after issuing the login command successfully.
 #. TRANS: %s is a logon link..
-#: lib/command.php:783
+#: lib/command.php:795
 #, php-format
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
@@ -8289,20 +8165,20 @@ msgstr ""
 
 #. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:812
+#: lib/command.php:824
 #, php-format
 msgid "Unsubscribed %s."
 msgstr "Cancelada la suscripción a %s."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
-#: lib/command.php:830
+#: lib/command.php:842
 msgid "You are not subscribed to anyone."
 msgstr "No estás suscrito a nadie."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
-#: lib/command.php:835
+#: lib/command.php:847
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Ya estás suscrito a estos usuarios:"
@@ -8310,14 +8186,14 @@ msgstr[1] "Ya estás suscrito a estos usuarios:"
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user
 #. TRANS: (followers) without having any subscribers.
-#: lib/command.php:857
+#: lib/command.php:869
 msgid "No one is subscribed to you."
 msgstr "Nadie está suscrito a ti."
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
-#: lib/command.php:862
+#: lib/command.php:874
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "No se pudo suscribir otro a ti."
@@ -8325,21 +8201,21 @@ msgstr[1] "No se pudo suscribir otro a ti."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to without having
 #. TRANS: any group subscriptions.
-#: lib/command.php:884
+#: lib/command.php:896
 msgid "You are not a member of any groups."
 msgstr "No eres miembro de ningún grupo"
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
-#: lib/command.php:889
+#: lib/command.php:901
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "Eres miembro de este grupo:"
 msgstr[1] "Eres miembro de estos grupos:"
 
 #. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-#: lib/command.php:904
+#: lib/command.php:916
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -8483,11 +8359,6 @@ msgstr "Aplicaciones conectadas autorizadas"
 msgid "Database error"
 msgstr "Error de la base de datos"
 
-#. TRANS: Description of form for deleting a user.
-#: lib/deleteuserform.php:75
-msgid "Delete this user"
-msgstr "Borrar este usuario"
-
 #. TRANS: Label in form on profile design page.
 #. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
 #: lib/designsettings.php:108
@@ -8526,21 +8397,6 @@ msgstr "Cambiar colores"
 msgid "Use defaults"
 msgstr "Utilizar los valores predeterminados"
 
-#. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: lib/designsettings.php:259
-msgid "Restore default designs"
-msgstr "Restaurar los diseños predeterminados"
-
-#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: lib/designsettings.php:267
-msgid "Reset back to default"
-msgstr "Volver a los valores predeterminados"
-
-#. TRANS: Title for button on profile design page to save settings.
-#: lib/designsettings.php:272
-msgid "Save design"
-msgstr "Guardar el diseño"
-
 #. TRANS: Error message displayed if design settings could not be saved.
 #. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
 #: lib/designsettings.php:405 lib/designsettings.php:427
@@ -9432,10 +9288,6 @@ msgstr "Responder a este mensaje."
 msgid "Reply"
 msgstr "Responder"
 
-#: lib/noticelist.php:673
-msgid "Delete this notice"
-msgstr "Borrar este mensaje"
-
 #: lib/noticelist.php:691
 msgid "Notice repeated"
 msgstr "Mensaje repetido"
@@ -9717,10 +9569,6 @@ msgstr "Invitar"
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Invita a amigos y colegas a unirse a %s"
 
-#: lib/subscribeform.php:115 lib/subscribeform.php:139
-msgid "Subscribe to this user"
-msgstr "Suscribirse a este usuario"
-
 #: lib/subscriberspeopleselftagcloudsection.php:48
 #: lib/subscriptionspeopleselftagcloudsection.php:48
 msgid "People Tagcloud as self-tagged"
@@ -9896,23 +9744,18 @@ msgctxt "role"
 msgid "Moderator"
 msgstr "Moderador"
 
-#: lib/util.php:305
-#, fuzzy
-msgid "Not allowed to log in."
-msgstr "No conectado."
-
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1309
+#: lib/util.php:1306
 msgid "a few seconds ago"
 msgstr "hace unos segundos"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1312
+#: lib/util.php:1309
 msgid "about a minute ago"
 msgstr "hace un minuto"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1316
+#: lib/util.php:1313
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
@@ -9920,12 +9763,12 @@ msgstr[0] "hace aproximadamente un minuto"
 msgstr[1] "hace aproximadamente %d minutos"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1319
+#: lib/util.php:1316
 msgid "about an hour ago"
 msgstr "hace una hora"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1323
+#: lib/util.php:1320
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
@@ -9933,12 +9776,12 @@ msgstr[0] "hace aproximadamente una hora"
 msgstr[1] "hace aproximadamente %d horas"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1326
+#: lib/util.php:1323
 msgid "about a day ago"
 msgstr "hace un día"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1330
+#: lib/util.php:1327
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
@@ -9946,12 +9789,12 @@ msgstr[0] "hace aproximadamente un día"
 msgstr[1] "hace aproximadamente %d días"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1333
+#: lib/util.php:1330
 msgid "about a month ago"
 msgstr "hace un mes"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1337
+#: lib/util.php:1334
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
@@ -9959,7 +9802,7 @@ msgstr[0] "hace aproximadamente un mes"
 msgstr[1] "hace aproximadamente %d meses"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1340
+#: lib/util.php:1337
 msgid "about a year ago"
 msgstr "hace un año"
 
@@ -10001,3 +9844,75 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#, fuzzy
+#~ msgid "Block this user."
+#~ msgstr "Bloquear este usuario."
+
+#, fuzzy
+#~ msgid "Delete this notice."
+#~ msgstr "Borrar este mensaje"
+
+#, fuzzy
+#~ msgid "Delete this user."
+#~ msgstr "Borrar este usuario"
+
+#, fuzzy
+#~ msgid "Restore default designs."
+#~ msgstr "Restaurar los diseños predeterminados"
+
+#, fuzzy
+#~ msgid "Reset back to default."
+#~ msgstr "Volver a los valores predeterminados"
+
+#, fuzzy
+#~ msgid "Save design."
+#~ msgstr "Guardar el diseño"
+
+#, fuzzy
+#~ msgid "Disfavor favorite."
+#~ msgstr "Sacar favorito"
+
+#, fuzzy
+#~ msgid "\"%s\" not found."
+#~ msgstr "Método de API no encontrado."
+
+#, fuzzy
+#~ msgid "Notice %s not found."
+#~ msgstr "Método de API no encontrado."
+
+#, fuzzy
+#~ msgid "Attachment %s not found."
+#~ msgstr "No se encuentra usuario receptor."
+
+#, fuzzy
+#~ msgid "Invalid tag: \"%s\"."
+#~ msgstr "Etiqueta inválida: \"% s\""
+
+#, fuzzy
+#~ msgid "%s updates from everyone."
+#~ msgstr "¡Actualizaciones de todos en %s!"
+
+#, fuzzy
+#~ msgid "Password saved"
+#~ msgstr "Se guardó la contraseña."
+
+#, fuzzy
+#~ msgid "Where you are, like \"City, State (or Region), Country\"."
+#~ msgstr "Dónde estás, por ejemplo \"Ciudad, Estado (o Región), País\""
+
+#, fuzzy
+#~ msgid "Subscribe to this user."
+#~ msgstr "Suscribirse a este usuario"
+
+#, fuzzy
+#~ msgid ""
+#~ "Listenee stream license \"%1$s\" is not compatible with site license \"%2"
+#~ "$s\"."
+#~ msgstr ""
+#~ "Licencia de flujo del emisor ‘%1$s’ es incompatible con la licencia del "
+#~ "sitio ‘%2$s’."
+
+#, fuzzy
+#~ msgid "Not allowed to log in."
+#~ msgstr "No conectado."
diff --git a/locale/fa/LC_MESSAGES/statusnet.po b/locale/fa/LC_MESSAGES/statusnet.po
index bb9c9d662d..7f3372bc60 100644
--- a/locale/fa/LC_MESSAGES/statusnet.po
+++ b/locale/fa/LC_MESSAGES/statusnet.po
@@ -15,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-24 10:32+0000\n"
-"PO-Revision-Date: 2011-02-24 10:36:33+0000\n"
+"POT-Creation-Date: 2011-03-03 15:58+0000\n"
+"PO-Revision-Date: 2011-03-03 16:00:26+0000\n"
 "Last-Translator: Ahmad Sufi Mahmudi\n"
 "Language-Team: Persian <http://translatewiki.net/wiki/Portal:fa>\n"
 "MIME-Version: 1.0\n"
@@ -25,9 +25,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.18alpha (r82712); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
-"X-POT-Import-Date: 2011-02-17 11:39:54+0000\n"
+"X-POT-Import-Date: 2011-02-25 23:49:23+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -139,11 +139,7 @@ msgstr "چنین صفحه‌ای وجود ندارد."
 #. 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 use "one time password login" without using an existing user.
-#. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
-#. TRANS: Client error displayed trying to find a user by ID for a non-existing ID.
-#. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when calling a profile action without specifying a user.
 #: actions/all.php:80 actions/allrss.php:69
@@ -161,12 +157,12 @@ msgstr "چنین صفحه‌ای وجود ندارد."
 #: actions/apitimelinementions.php:77 actions/apitimelineuser.php:79
 #: actions/avatarbynickname.php:79 actions/favoritesrss.php:72
 #: actions/foaf.php:42 actions/foaf.php:61 actions/hcard.php:67
-#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:78
+#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
 #: actions/remotesubscribe.php:144 actions/remotesubscribe.php:153
-#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:113
-#: actions/showfavorites.php:106 actions/userbyid.php:75
+#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
+#: actions/showfavorites.php:106 actions/userbyid.php:74
 #: actions/usergroups.php:93 actions/userrss.php:40 actions/userxrd.php:59
-#: actions/xrds.php:71 lib/command.php:497 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:509 lib/galleryaction.php:59
 #: lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "چنین کاربری وجود ندارد."
@@ -294,7 +290,7 @@ msgstr "به روز رسانی از %1$s و دوستان در %2$s"
 #: actions/apigrouplistall.php:120 actions/apigroupmembership.php:105
 #: actions/apigroupshow.php:114 actions/apihelptest.php:84
 #: actions/apistatusesdestroy.php:101 actions/apistatusesretweets.php:110
-#: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:138
+#: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:139
 #: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
 #: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:268
 #: actions/apitimelinegroup.php:147 actions/apitimelinehome.php:173
@@ -521,7 +517,7 @@ msgstr "کاربر گیرنده یافت نشد."
 #. TRANS: Client error displayed trying to direct message another user who's not a friend (403).
 #: actions/apidirectmessagenew.php:144
 #, fuzzy
-msgid "Cannot send direct messages to users who aren't your friend."
+msgid "Can't send direct messages to users who aren't your friend."
 msgstr "نمی‌توان پیام مستقیم را به کاربرانی که دوست شما نیستند، فرستاد."
 
 #. TRANS: Client error displayed trying to direct message self (403).
@@ -547,7 +543,7 @@ msgstr "این پیغام را پیش‌تر به برگزیده‌های خود
 #. TRANS: Client error displayed when marking a notice as favourite fails.
 #. TRANS: Server error displayed when trying to mark a notice as favorite fails in the database.
 #. TRANS: Error message text shown when a favorite could not be set.
-#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:294
+#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:306
 msgid "Could not create favorite."
 msgstr "نمی‌توان پیام را برگزید."
 
@@ -606,7 +602,7 @@ msgstr "نمی‌توان کاربر هدف را پیدا کرد."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:191
 #: actions/newgroup.php:137 actions/profilesettings.php:273
-#: actions/register.php:206
+#: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "این لقب در حال حاضر ثبت شده است. لطفا یکی دیگر انتخاب کنید."
 
@@ -616,7 +612,7 @@ msgstr "این لقب در حال حاضر ثبت شده است. لطفا یکی
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:195
 #: actions/newgroup.php:141 actions/profilesettings.php:243
-#: actions/register.php:208
+#: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "لقب نا معتبر."
 
@@ -629,7 +625,7 @@ msgstr "لقب نا معتبر."
 #: actions/apigroupcreate.php:181 actions/editapplication.php:235
 #: actions/editgroup.php:202 actions/newapplication.php:221
 #: actions/newgroup.php:148 actions/profilesettings.php:248
-#: actions/register.php:215
+#: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "صفحهٔ خانگی یک نشانی معتبر نیست."
 
@@ -639,7 +635,7 @@ msgstr "صفحهٔ خانگی یک نشانی معتبر نیست."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:191 actions/editgroup.php:206
 #: actions/newgroup.php:152 actions/profilesettings.php:252
-#: actions/register.php:218
+#: actions/register.php:226
 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "نام کامل خیلی طولانی است (حداکثر ۲۵۵ نویسه)."
@@ -667,7 +663,7 @@ msgstr[0] "توصیف خیلی طولانی است (حداکثر %d نویسه)"
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:215 actions/editgroup.php:218
 #: actions/newgroup.php:164 actions/profilesettings.php:265
-#: actions/register.php:227
+#: actions/register.php:235
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
 msgstr "نام مکان خیلی طولانی است (حداکثر ۲۵۵ نویسه)"
@@ -723,14 +719,14 @@ msgstr "گروه یافت نشد."
 #. TRANS: Server error displayed when trying to join a group the user is already a member of.
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:333
+#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:345
 msgid "You are already a member of that group."
 msgstr "شما از پیش یک عضو این گروه هستید."
 
 #. TRANS: Server error displayed when trying to join a group the user is blocked from joining.
 #. 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.
-#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:338
+#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:350
 msgid "You have been blocked from that group by the admin."
 msgstr "دسترسی شما به گروه توسط مدیر آن محدود شده است."
 
@@ -740,7 +736,7 @@ msgstr "دسترسی شما به گروه توسط مدیر آن محدود شد
 #. TRANS: %1$s is the joining user's nickname, $2$s is the group nickname for which the join failed.
 #. TRANS: Message given having failed to add a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:350
+#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:362
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "نمی‌توان کاربر %1$s را عضو گروه %2$s کرد."
@@ -757,7 +753,7 @@ msgstr "شما یک عضو این گروه نیستید."
 #. TRANS: Message given having failed to remove a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
 #: actions/apigroupleave.php:127 actions/leavegroup.php:133
-#: lib/command.php:398
+#: lib/command.php:410
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
 msgstr "خارج شدن %s از گروه %s نا موفق بود"
@@ -820,21 +816,20 @@ msgstr "شما شناسایی نشده اید."
 #. TRANS: Form validation error message.
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
-#. TRANS: Client error displayed when the session token is not okay.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
 #: actions/deletenotice.php:177 actions/disfavor.php:75
 #: actions/emailsettings.php:291 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:65 actions/grouplogo.php:321
 #: actions/groupunblock.php:65 actions/imsettings.php:224
-#: actions/invite.php:60 actions/login.php:131 actions/makeadmin.php:66
+#: actions/invite.php:60 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
-#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:136
-#: actions/othersettings.php:155 actions/passwordsettings.php:137
+#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
+#: actions/othersettings.php:155 actions/passwordsettings.php:138
 #: actions/profilesettings.php:217 actions/recoverpassword.php:383
-#: actions/register.php:164 actions/remotesubscribe.php:76
+#: actions/register.php:172 actions/remotesubscribe.php:76
 #: actions/repeat.php:82 actions/smssettings.php:250 actions/subedit.php:40
-#: actions/subscribe.php:87 actions/tagother.php:166
-#: actions/unsubscribe.php:69 actions/userauthorization.php:53
+#: actions/subscribe.php:86 actions/tagother.php:166
+#: actions/unsubscribe.php:69 actions/userauthorization.php:52
 #: lib/designsettings.php:310
 msgid "There was a problem with your session token. Try again, please."
 msgstr "مشکلی در دریافت نشست شما وجود دارد. لطفا بعدا سعی کنید."
@@ -866,7 +861,7 @@ msgstr "هنگام افزودن کاربر برنامهٔ OAuth در پایگا
 #: actions/designadminpanel.php:100 actions/editapplication.php:144
 #: actions/emailsettings.php:310 actions/grouplogo.php:332
 #: actions/imsettings.php:239 actions/newapplication.php:124
-#: actions/oauthconnectionssettings.php:145 actions/recoverpassword.php:46
+#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
 #: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
 msgstr "ارسال غیر قابل انتظار فرم."
@@ -920,20 +915,19 @@ msgstr "حساب کاربری"
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group nickname (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT for nick name in a profile.
-#: actions/apioauthauthorize.php:459 actions/login.php:242
-#: actions/profilesettings.php:106 actions/register.php:418
+#: actions/apioauthauthorize.php:459 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:432
 #: actions/showgroup.php:243 actions/tagother.php:94
-#: actions/userauthorization.php:152 lib/groupeditform.php:145
+#: actions/userauthorization.php:145 lib/groupeditform.php:145
 #: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "نام کاربری"
 
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:463 actions/login.php:245
-#: actions/register.php:422 lib/accountsettingsaction.php:120
+#: actions/apioauthauthorize.php:463 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:120
 msgid "Password"
 msgstr "گذرواژه"
 
@@ -1028,13 +1022,13 @@ msgstr "چنین پیامی وجود ندارد."
 
 #. TRANS: Client error displayed trying to repeat an own notice through the API.
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:537
+#: actions/apistatusesretweet.php:83 lib/command.php:549
 msgid "Cannot repeat your own notice."
 msgstr "نمی توانید پیام خود را تکرار کنید."
 
 #. TRANS: Client error displayed trying to re-repeat a notice through the API.
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:92 lib/command.php:543
+#: actions/apistatusesretweet.php:92 lib/command.php:555
 msgid "Already repeated that notice."
 msgstr "قبلا آن پیام تکرار شده است."
 
@@ -1057,7 +1051,7 @@ msgstr "رابط مورد نظر پیدا نشد."
 #. TRANS: %s is the requested output format.
 #: actions/apistatusesshow.php:144
 #, fuzzy, php-format
-msgid "Unsupported format: %s."
+msgid "Unsupported format: %s"
 msgstr "قالب پشتیبانی نشده."
 
 #. TRANS: Client error displayed requesting a deleted status.
@@ -1160,14 +1154,13 @@ msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr "%1$s به روز رسانی هایی که در پاسخ به $2$s / %3$s"
 
 #. TRANS: Title for site timeline. %s is the StatusNet sitename.
-#. TRANS: Public RSS feed title. %s is the StatusNet site name.
 #: actions/apitimelinepublic.php:193 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "%s خط‌زمانی عمومی"
 
 #. TRANS: Subtitle for site timeline. %s is the StatusNet sitename.
-#: actions/apitimelinepublic.php:199
+#: actions/apitimelinepublic.php:199 actions/publicrss.php:105
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "%s به روز رسانی های عموم"
@@ -1234,26 +1227,25 @@ msgid "Atom post must be an Atom entry."
 msgstr ""
 
 #. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
-#: actions/apitimelineuser.php:334
+#: actions/apitimelineuser.php:335
 msgid "Can only handle POST activities."
 msgstr ""
 
 #. TRANS: Client error displayed when using an unsupported activity object type.
 #. TRANS: %s is the unsupported activity object type.
-#: actions/apitimelineuser.php:345
+#: actions/apitimelineuser.php:346
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
 #. TRANS: %d is the notice ID (number).
-#: actions/apitimelineuser.php:379
+#: actions/apitimelineuser.php:380
 #, fuzzy, php-format
 msgid "No content for notice %d."
 msgstr "پیدا کردن محتوای پیام‌ها"
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#. TRANS: %s is the notice URI.
 #: actions/apitimelineuser.php:408
 #, fuzzy, php-format
 msgid "Notice with URI \"%s\" already exists."
@@ -1272,10 +1264,9 @@ msgstr "رابط مورد نظر پیدا نشد."
 
 #. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
 #. TRANS: Client exception.
-#. TRANS: Client error displayed trying to subscribe to a non-existing profile.
 #: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
 #: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
-#: actions/subscribe.php:110
+#: actions/subscribe.php:107
 msgid "No such profile."
 msgstr "چنین نمایه‌ای وجود ندارد."
 
@@ -1411,7 +1402,7 @@ msgstr "نمی‌توان پیام برگزیده را حذف کرد."
 #: actions/joingroup.php:95 actions/leavegroup.php:82
 #: actions/leavegroup.php:95 actions/makeadmin.php:86
 #: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:380
+#: lib/command.php:392
 msgid "No such group."
 msgstr "چنین گروهی وجود ندارد."
 
@@ -1422,7 +1413,7 @@ msgid "Not a member."
 msgstr "همهٔ اعضا"
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
-#: actions/atompubshowmembership.php:150
+#: actions/atompubshowmembership.php:151
 #, fuzzy
 msgid "Cannot delete someone else's membership."
 msgstr "نمی‌توان اشتراک را ذخیره کرد."
@@ -1528,11 +1519,9 @@ msgstr ""
 
 #. TRANS: Server error displayed in avatar upload page when no matching profile can be found for a user.
 #. TRANS: Server error displayed coming across a request from a user without a profile.
-#. TRANS: Server error displayed when trying to authorise a remote subscription request
-#. TRANS: while the user has no profile.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
 #: actions/grouplogo.php:184 actions/remotesubscribe.php:190
-#: actions/userauthorization.php:75 actions/userrss.php:108
+#: actions/userauthorization.php:72 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr "کاربر نمایهٔ تطبیق ندارد."
 
@@ -1590,10 +1579,10 @@ msgstr "برش"
 msgid "No file uploaded."
 msgstr "هیچ پرونده‌ای بارگذاری نشد."
 
-#. TRANS: Avatar upload form instruction after uploading a file.
+#. TRANS: Avatar upload form unstruction after uploading a file.
 #: actions/avatarsettings.php:345
 #, fuzzy
-msgid "Pick a square area of the image to be your avatar."
+msgid "Pick a square area of the image to be your avatar"
 msgstr ""
 "یک مربع از عکس خود را انتخاب کنید تا به عنوان تصویر چهرهٔ شما انتخاب شود."
 
@@ -1636,7 +1625,7 @@ msgid "You may not backup your account."
 msgstr ""
 
 #. TRANS: Information displayed on the backup account page.
-#: actions/backupaccount.php:225
+#: actions/backupaccount.php:227
 msgid ""
 "You can backup your account data in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format. This is an experimental feature and provides "
@@ -1646,15 +1635,15 @@ msgid ""
 msgstr ""
 
 #. TRANS: Submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:248
+#: actions/backupaccount.php:250
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Backup"
 msgstr "پیش‌زمینه"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:252
-msgid "Backup your account."
+#: actions/backupaccount.php:254
+msgid "Backup your account"
 msgstr ""
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
@@ -1697,7 +1686,7 @@ msgstr "خیر"
 #. TRANS: Submit button title for 'No' when blocking a user.
 #: actions/block.php:158
 #, fuzzy
-msgid "Do not block this user."
+msgid "Do not block this user"
 msgstr "کاربر را مسدود نکن"
 
 #. TRANS: Button label on the user block form.
@@ -1714,9 +1703,9 @@ msgid "Yes"
 msgstr "بله"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:165
-#, fuzzy
-msgid "Block this user."
+#. TRANS: Description of the form to block a user.
+#: actions/block.php:165 lib/blockform.php:79
+msgid "Block this user"
 msgstr "کاربر را مسدود کن"
 
 #. TRANS: Server error displayed when blocking a user fails.
@@ -1881,7 +1870,7 @@ msgstr ""
 #. TRANS: Field label for delete account confirmation entry.
 #. TRANS: Field label for password reset form where the password has to be typed again.
 #: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:262 actions/register.php:426
+#: actions/recoverpassword.php:262 actions/register.php:440
 msgid "Confirm"
 msgstr "تایید"
 
@@ -1911,14 +1900,14 @@ msgstr "برنامه یافت نشد."
 #. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
 #: actions/deleteapplication.php:79 actions/editapplication.php:78
-#: actions/showapplication.php:90
+#: actions/showapplication.php:94
 msgid "You are not the owner of this application."
 msgstr "شما مالک این برنامه نیستید."
 
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
-#: actions/newapplication.php:112 actions/showapplication.php:113
-#: lib/action.php:1422
+#: actions/newapplication.php:112 actions/showapplication.php:118
+#: lib/action.php:1425
 msgid "There was a problem with your session token."
 msgstr "یک مشکل با رمز نشست شما وجود داشت."
 
@@ -1942,13 +1931,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting an application.
 #: actions/deleteapplication.php:161
 #, fuzzy
-msgid "Do not delete this application."
+msgid "Do not delete this application"
 msgstr "این برنامه حذف نشود"
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
 #: actions/deleteapplication.php:167
 #, fuzzy
-msgid "Delete this application."
+msgid "Delete this application"
 msgstr "این برنامه حذف شود"
 
 #. TRANS: Client error when trying to delete group while not logged in.
@@ -2006,13 +1995,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting a group.
 #: actions/deletegroup.php:224
 #, fuzzy
-msgid "Do not delete this group."
+msgid "Do not delete this group"
 msgstr "این پیام را پاک نکن"
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
 #: actions/deletegroup.php:231
 #, fuzzy
-msgid "Delete this group."
+msgid "Delete this group"
 msgstr "حذف این کاربر"
 
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
@@ -2020,15 +2009,13 @@ msgstr "حذف این کاربر"
 #. TRANS: Client error displayed when trying to mark a notice as favorite without being logged in.
 #. TRANS: Client error displayed trying to block a user from a group while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
-#. TRANS: Client error displayed trying to log out when not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
-#. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
 #. TRANS: Client error displayed when trying to change user options while not logged in.
 #: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
-#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:70
+#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
-#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:98
+#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
 #: lib/adminpanelaction.php:71 lib/profileformaction.php:63
 #: lib/settingsaction.php:72
@@ -2058,13 +2045,12 @@ msgstr "آیا اطمینان دارید که می‌خواهید این پیا
 #. TRANS: Submit button title for 'No' when deleting a notice.
 #: actions/deletenotice.php:159
 #, fuzzy
-msgid "Do not delete this notice."
+msgid "Do not delete this notice"
 msgstr "این پیام را پاک نکن"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:166
-#, fuzzy
-msgid "Delete this notice."
+#: actions/deletenotice.php:166 lib/noticelist.php:673
+msgid "Delete this notice"
 msgstr "این پیام را پاک کن"
 
 #. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
@@ -2101,13 +2087,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting a user.
 #: actions/deleteuser.php:158
 #, fuzzy
-msgid "Do not delete this user."
+msgid "Do not delete this user"
 msgstr "این پیام را پاک نکن"
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
-#: actions/deleteuser.php:165
-#, fuzzy
-msgid "Delete this user."
+#. TRANS: Description of form for deleting a user.
+#: actions/deleteuser.php:165 lib/deleteuserform.php:75
+msgid "Delete this user"
 msgstr "حذف این کاربر"
 
 #. TRANS: Message used as title for design settings for the site.
@@ -2277,21 +2263,21 @@ msgid "Use defaults"
 msgstr "استفاده‌کردن از پیش‌فرض‌ها"
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:720
-#, fuzzy
-msgid "Restore default designs."
+#. TRANS: Title for button on profile design page to reset all colour settings to default.
+#: actions/designadminpanel.php:720 lib/designsettings.php:259
+msgid "Restore default designs"
 msgstr "بازگرداندن طرح‌های پیش‌فرض"
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:728
-#, fuzzy
-msgid "Reset back to default."
+#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
+#: actions/designadminpanel.php:728 lib/designsettings.php:267
+msgid "Reset back to default"
 msgstr "برگشت به حالت پیش گزیده"
 
 #. TRANS: Title for button for saving theme settings.
-#: actions/designadminpanel.php:736
-#, fuzzy
-msgid "Save design."
+#. TRANS: Title for button on profile design page to save settings.
+#: actions/designadminpanel.php:736 lib/designsettings.php:272
+msgid "Save design"
 msgstr "ذخیره‌کردن طرح"
 
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
@@ -2323,7 +2309,7 @@ msgid "You must be logged in to edit an application."
 msgstr "برای ویرایش یک برنامه باید وارد شده باشید."
 
 #. TRANS: Client error displayed trying to edit an application that does not exist.
-#: actions/editapplication.php:83 actions/showapplication.php:83
+#: actions/editapplication.php:83 actions/showapplication.php:87
 msgid "No such application."
 msgstr "چنین برنامه‌ای وجود ندارد."
 
@@ -2609,7 +2595,7 @@ msgid "Cannot normalize that email address."
 msgstr "نمی‌توان نشانی را قانونی کرد"
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:393 actions/register.php:204
+#: actions/emailsettings.php:393 actions/register.php:212
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "یک نشانی پست الکترونیکی معتبر نیست."
@@ -2685,22 +2671,19 @@ msgstr "هیچ نشانی ورودی وجود ندارد."
 
 #. 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.
 #: actions/emailsettings.php:530 actions/emailsettings.php:554
-#: actions/smssettings.php:566 actions/smssettings.php:591
+#: actions/smssettings.php:565 actions/smssettings.php:588
 #, fuzzy
 msgid "Could not update user record."
 msgstr "نمی‌توان اطلاعات کاربر را به روز کرد."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
-#. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:534 actions/smssettings.php:570
+#: actions/emailsettings.php:534 actions/smssettings.php:568
 msgid "Incoming email address removed."
 msgstr "نشانی ورودی پاک شد."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
-#. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:558 actions/smssettings.php:595
+#: actions/emailsettings.php:558 actions/smssettings.php:591
 msgid "New incoming email address added."
 msgstr "نشانی ورودی جدید اضافه شد."
 
@@ -2712,7 +2695,7 @@ msgstr "این پیام ازقبل برگزیده شده است!"
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
 #: actions/favor.php:95
 #, fuzzy
-msgid "Disfavor favorite."
+msgid "Disfavor favorite"
 msgstr "خارج‌کردن از برگزیده‌ها"
 
 #. TRANS: Page title for first page of favorited notices.
@@ -2954,13 +2937,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
 #: actions/groupblock.php:191
 #, fuzzy
-msgid "Do not block this user from this group."
+msgid "Do not block this user from this group"
 msgstr "دسترسی کاربر به گروه مسدود نشود"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
 #: actions/groupblock.php:198
 #, fuzzy
-msgid "Block this user from this group."
+msgid "Block this user from this group"
 msgstr "دسترسی کاربر به گروه مسدود شود"
 
 #. TRANS: Server error displayed when trying to block a user from a group fails because of an application error.
@@ -2969,7 +2952,6 @@ msgid "Database error blocking user from group."
 msgstr "اشکال پایگاه داده در مسدود کردن کاربر"
 
 #. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
-#. TRANS: Client error displayed trying to find a user by ID without providing an ID.
 #: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr "هیچ ID وجود ندارد."
@@ -3154,10 +3136,8 @@ msgid "Group search"
 msgstr "جست‌وجوی گروه"
 
 #. TRANS: Text on page where groups can be searched if no results were found for a query.
-#. TRANS: Text for notice search results is the query had no results.
-#. TRANS: Message on the "People search" page where a query has no results.
-#: actions/groupsearch.php:82 actions/noticesearch.php:122
-#: actions/peoplesearch.php:87
+#: actions/groupsearch.php:82 actions/noticesearch.php:117
+#: actions/peoplesearch.php:83
 msgid "No results."
 msgstr "نتیجه‌ای وجود ندارد."
 
@@ -3194,7 +3174,6 @@ msgid "User is not blocked from group."
 msgstr "کاربر از گروه منع نشده است."
 
 #. TRANS: Server error displayed when unblocking a user from a group fails because of an unknown error.
-#. TRANS: Server error displayed when removing a user block.
 #: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "اشکال در پاکسازی"
@@ -3288,8 +3267,7 @@ msgid "Publish a MicroID for my Jabber/Google Talk address."
 msgstr "یک شناسهٔ کوچک برای Jabber/Gtalk من منتشر کن."
 
 #. TRANS: Confirmation message for successful Instant Messaging preferences save.
-#. TRANS: Confirmation message after saving preferences.
-#: actions/imsettings.php:283 actions/othersettings.php:193
+#: actions/imsettings.php:283 actions/othersettings.php:192
 msgid "Preferences saved."
 msgstr "تنظیمات ذخیره شد."
 
@@ -3578,7 +3556,7 @@ msgstr "برای ترک یک گروه، شما باید وارد شده باشی
 
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
-#: actions/leavegroup.php:103 lib/command.php:386
+#: actions/leavegroup.php:103 lib/command.php:398
 msgid "You are not a member of that group."
 msgstr "شما یک کاربر این گروه نیستید."
 
@@ -3701,41 +3679,39 @@ msgstr "ذخیره‌کردن"
 msgid "Save license settings"
 msgstr ""
 
-#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
-#: actions/login.php:97 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
 msgid "Already logged in."
 msgstr "قبلا وارد شده"
 
-#: actions/login.php:142
+#: actions/login.php:148
 msgid "Incorrect username or password."
 msgstr "نام کاربری یا گذرواژه نادرست است."
 
-#. TRANS: Server error displayed when a user object could not be created trying to login using "one time password login".
-#: actions/login.php:148 actions/otp.php:127
+#: actions/login.php:154 actions/otp.php:120
 msgid "Error setting user. You are probably not authorized."
 msgstr "خطا در تنظیم کاربر. شما احتمالا اجازهٔ این کار را ندارید."
 
-#: actions/login.php:202 actions/login.php:253
+#: actions/login.php:210 actions/login.php:263
 msgid "Login"
 msgstr "ورود"
 
-#: actions/login.php:239
+#: actions/login.php:249
 msgid "Login to site"
 msgstr "ورود به وب‌گاه"
 
-#: actions/login.php:248 actions/register.php:476
+#: actions/login.php:258 actions/register.php:490
 msgid "Remember me"
 msgstr "مرا به یاد بسپار"
 
-#: actions/login.php:249 actions/register.php:478
+#: actions/login.php:259 actions/register.php:492
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "وارد شدن خودکار. نه برای کامپیوترهای مشترک!"
 
-#: actions/login.php:259
+#: actions/login.php:269
 msgid "Lost or forgotten password?"
 msgstr "گذرواژهٔ خود را گم یا فراموش کرده‌اید؟"
 
-#: actions/login.php:277
+#: actions/login.php:288
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -3743,11 +3719,11 @@ msgstr ""
 "به دلایل امنیتی، لطفا نام کاربری و گذرواژهٔ خود را قبل از تغییر تنظیمات "
 "دوباره وارد نمایید."
 
-#: actions/login.php:281
+#: actions/login.php:292
 msgid "Login with your username and password."
 msgstr "با نام‌کاربری و گذرواژه‌تان وارد شوید."
 
-#: actions/login.php:284
+#: actions/login.php:295
 #, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -3830,14 +3806,14 @@ msgid "New message"
 msgstr "پیام جدید"
 
 #. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
-#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:501
+#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:513
 msgid "You can't send a message to this user."
 msgstr "شما نمی توانید به این کاربر پیام بفرستید."
 
 #. TRANS: Command exception text shown when trying to send a direct message to another user without content.
 #. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
-#: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:478
-#: lib/command.php:581
+#: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:490
+#: lib/command.php:593
 msgid "No content!"
 msgstr "محتوایی وحود ندارد!"
 
@@ -3846,7 +3822,7 @@ msgid "No recipient specified."
 msgstr "هیچ گیرنده ای مشخص نشده"
 
 #. TRANS: Error text shown when trying to send a direct message to self.
-#: actions/newmessage.php:167 lib/command.php:505
+#: actions/newmessage.php:167 lib/command.php:517
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr "یک پیام را به خودتان نفرستید؛ در عوض آن را آهسته برای خود بگویید."
@@ -3857,7 +3833,7 @@ msgstr "پیام فرستاده‌شد"
 
 #. TRANS: Message given have sent a direct message to another user.
 #. TRANS: %s is the name of the other user.
-#: actions/newmessage.php:188 lib/command.php:513
+#: actions/newmessage.php:188 lib/command.php:525
 #, php-format
 msgid "Direct message to %s sent."
 msgstr "پیام مستقیم به %s فرستاده شد."
@@ -3874,9 +3850,7 @@ msgstr "پیام جدید"
 msgid "Notice posted"
 msgstr "پیام فرستاده‌شد."
 
-#. TRANS: Instructions for Notice search page.
-#. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/noticesearch.php:69
+#: actions/noticesearch.php:68
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -3885,21 +3859,16 @@ msgstr ""
 "برای جست‌وجوی پیام‌ها در %%site.name%% از محتوایشان استفاده کنید. عبارت‌ها را "
 "با فاصله جدا کنید؛ آن‌ها باید ۳ نویسه یا بیش‌تر باشند."
 
-#. TRANS: Title of the page where users can search for notices.
-#: actions/noticesearch.php:80
+#: actions/noticesearch.php:78
 msgid "Text search"
 msgstr "جست‌وجوی متن"
 
-#. TRANS: Test in RSS notice search.
-#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearch.php:95
+#: actions/noticesearch.php:91
 #, php-format
 msgid "Search results for \"%1$s\" on %2$s"
 msgstr "پیام از %1$s در %2$s"
 
-#. TRANS: Text for logged in users making a query for notices without results.
-#. TRANS: This message contains a Markdown link.
-#: actions/noticesearch.php:128
+#: actions/noticesearch.php:121
 #, php-format
 msgid ""
 "Be the first to [post on this topic](%%%%action.newnotice%%%%?"
@@ -3908,9 +3877,7 @@ msgstr ""
 "اولین کسی باشید که در [این موضوع](%%%%action.newnotice%%%%?status_textarea=%"
 "s) پیام می‌فرستد."
 
-#. TRANS: Text for not logged in users making a query for notices without results.
-#. TRANS: This message contains Markdown links.
-#: actions/noticesearch.php:133
+#: actions/noticesearch.php:124
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and be the first to "
@@ -3919,17 +3886,14 @@ msgstr ""
 "چرا [ثبت نام](%%%%action.register%%%%) نمی‌کنید و اولین پیام را در [این موضوع]"
 "(%%%%action.newnotice%%%%?status_textarea=%s) نمی‌فرستید!"
 
-#. TRANS: RSS notice search feed title. %s is the query.
-#: actions/noticesearchrss.php:95
+#: actions/noticesearchrss.php:96
 #, php-format
 msgid "Updates with \"%s\""
 msgstr "پیام‌های با %s"
 
-#. TRANS: RSS notice search feed description.
-#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearchrss.php:99
+#: actions/noticesearchrss.php:98
 #, fuzzy, php-format
-msgid "Updates matching search term \"%1$s\" on %2$s."
+msgid "Updates matching search term \"%1$s\" on %2$s!"
 msgstr "پیام‌هایی که با جست‌و‌جوی عبارت »%1$s« در %s یافت شدند."
 
 #: actions/nudge.php:85
@@ -3971,30 +3935,30 @@ msgid "You have not registered any applications yet."
 msgstr "شما هنوز هیچ برنامه‌ای را ثبت نکرده‌اید."
 
 #. TRANS: Title for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:70
+#: actions/oauthconnectionssettings.php:71
 msgid "Connected applications"
 msgstr "برنامه‌های وصل‌شده"
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:81
+#: actions/oauthconnectionssettings.php:83
 msgid "The following connections exist for your account."
 msgstr ""
 
 #. TRANS: Client error when trying to revoke access for an application while not being a user of it.
-#: actions/oauthconnectionssettings.php:166
+#: actions/oauthconnectionssettings.php:168
 msgid "You are not a user of that application."
 msgstr "شما یک کاربر این برنامه نیستید."
 
 #. TRANS: Client error when revoking access has failed for some reason.
 #. TRANS: %s is the application ID revoking access failed for.
-#: actions/oauthconnectionssettings.php:181
+#: actions/oauthconnectionssettings.php:183
 #, fuzzy, php-format
 msgid "Unable to revoke access for application: %s."
 msgstr "نمی‌توان دسترسی را برای برنامهٔ %s لغو کرد."
 
 #. TRANS: Success message after revoking access for an application.
 #. TRANS: %1$s is the application name, %2$s is the first part of the user token.
-#: actions/oauthconnectionssettings.php:200
+#: actions/oauthconnectionssettings.php:202
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -4002,30 +3966,20 @@ msgid ""
 msgstr ""
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:211
+#: actions/oauthconnectionssettings.php:213
 msgid "You have not authorized any applications to use your account."
 msgstr "شما به هیچ برنامه‌ای اجازه نداده‌اید که از حساب‌تان استفاده کند."
 
 #. TRANS: Note for developers in the OAuth connection settings form.
 #. TRANS: This message contains a Markdown link. Do not separate "](".
 #. TRANS: %s is the URL to the OAuth settings.
-#: actions/oauthconnectionssettings.php:231
+#: actions/oauthconnectionssettings.php:233
 #, php-format
 msgid ""
 "Are you a developer? [Register an OAuth client application](%s) to use with "
 "this instance of StatusNet."
 msgstr ""
 
-#: actions/oembed.php:64
-#, fuzzy, php-format
-msgid "\"%s\" not found."
-msgstr "رابط مورد نظر پیدا نشد."
-
-#: actions/oembed.php:76
-#, fuzzy, php-format
-msgid "Notice %s not found."
-msgstr "رابط مورد نظر پیدا نشد."
-
 #: actions/oembed.php:80 actions/shownotice.php:100
 msgid "Notice has no profile."
 msgstr "این پیام نمایه‌ای ندارد."
@@ -4035,16 +3989,6 @@ msgstr "این پیام نمایه‌ای ندارد."
 msgid "%1$s's status on %2$s"
 msgstr "وضعیت %1$s در %2$s"
 
-#: actions/oembed.php:95
-#, fuzzy, php-format
-msgid "Attachment %s not found."
-msgstr "کاربر گیرنده یافت نشد."
-
-#: actions/oembed.php:136
-#, php-format
-msgid "\"%s\" not supported for oembed requests."
-msgstr ""
-
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
 #: actions/oembed.php:168
 #, php-format
@@ -4063,12 +4007,11 @@ msgstr "لطفا تنها از نشانی‌های اینترنتی %s از را
 msgid "Not a supported data format."
 msgstr "یک قالب دادهٔ پشتیبانی‌شده نیست."
 
-#. TRANS: ShortName in the OpenSearch interface when trying to find users.
 #: actions/opensearch.php:64
 msgid "People Search"
 msgstr "جست‌وجوی کاربران"
 
-#: actions/opensearch.php:68
+#: actions/opensearch.php:67
 msgid "Notice Search"
 msgstr "جست‌وجوی پیام‌ها"
 
@@ -4116,46 +4059,37 @@ msgstr "نمایش دادن یا پنهان کردن طراحی‌های نما
 msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr "کوتاه کنندهٔ نشانی بسیار طولانی است (بیش‌تر از ۵۰ حرف)."
 
-#. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
-#: actions/otp.php:70
+#: actions/otp.php:69
 msgid "No user ID specified."
 msgstr "هیچ شناسهٔ کاربری مشخص نشده است."
 
-#. TRANS: Client error displayed trying to use "one time password login" without specifying a login token.
-#: actions/otp.php:86
+#: actions/otp.php:83
 msgid "No login token specified."
 msgstr "هیچ رمز ورودی مشخص نشده است."
 
-#. TRANS: Client error displayed trying to use "one time password login" without requesting a login token.
-#: actions/otp.php:94
+#: actions/otp.php:90
 msgid "No login token requested."
 msgstr "هیچ رمز ورودی درخواست نشده است."
 
-#. TRANS: Client error displayed trying to use "one time password login" while specifying an invalid login token.
-#: actions/otp.php:100
+#: actions/otp.php:95
 msgid "Invalid login token specified."
 msgstr "رمز ورود مشخص شده نامعتبر است."
 
-#. TRANS: Client error displayed trying to use "one time password login" while specifying an expired login token.
-#: actions/otp.php:110
+#: actions/otp.php:104
 msgid "Login token expired."
 msgstr "رمز ورود منسوخ شده است."
 
-#. TRANS: Title for outbox for any but the fist page.
-#. TRANS: %1$s is the user nickname, %2$d is the page number.
-#: actions/outbox.php:57
+#: actions/outbox.php:58
 #, php-format
 msgid "Outbox for %1$s - page %2$d"
 msgstr "صندوق خروجی %1$s - صفحهٔ %2$d"
 
-#. TRANS: Title for first page of outbox.
 #: actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
 msgstr "فرستاده‌های %s"
 
-#. TRANS: Instructions for outbox.
-#: actions/outbox.php:103
+#: actions/outbox.php:104
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr ""
 "این صندوق خروجی شماست، که پیام‌های خصوصی فرستاده شده به وسیلهٔ شما را فهرست "
@@ -4183,45 +4117,43 @@ msgstr "گذرواژهٔ پیشین"
 msgid "New password"
 msgstr "گذرواژهٔ تازه"
 
-#: actions/passwordsettings.php:109 actions/register.php:423
+#: actions/passwordsettings.php:109
 #, fuzzy
-msgid "6 or more characters."
+msgid "6 or more characters"
 msgstr "۶ نویسه یا بیش‌تر"
 
-#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:264
-#: actions/register.php:427
+#: actions/passwordsettings.php:113
 #, fuzzy
-msgid "Same as password above."
+msgid "Same as password above"
 msgstr "مانند گذرواژهٔ بالا"
 
 #: actions/passwordsettings.php:117
 msgid "Change"
 msgstr "تغییر"
 
-#: actions/passwordsettings.php:153 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:238
 msgid "Password must be 6 or more characters."
 msgstr "گذرواژه باید ۶ نویسه یا بیش‌تر باشد."
 
-#: actions/passwordsettings.php:156 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:241
 msgid "Passwords don't match."
 msgstr "گذرواژه‌ها مطابقت ندارند."
 
-#: actions/passwordsettings.php:164
+#: actions/passwordsettings.php:165
 msgid "Incorrect old password"
 msgstr "گذرواژه پیشین اشتباه است"
 
-#: actions/passwordsettings.php:180
+#: actions/passwordsettings.php:181
 msgid "Error saving user; invalid."
 msgstr "هنگام ذخیرهٔ کاربر خطا رخ داد؛ نامعتبر است."
 
-#. TRANS: Reset password form validation error message.
-#: actions/passwordsettings.php:185 actions/recoverpassword.php:418
+#: actions/passwordsettings.php:186
 #, fuzzy
-msgid "Cannot save new password."
+msgid "Can't save new password."
 msgstr "نمی‌توان گذرواژهٔ جدید را ذخیره کرد."
 
-#: actions/passwordsettings.php:191
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
 msgid "Password saved."
 msgstr "گذرواژه ذخیره شد."
 
@@ -4513,9 +4445,7 @@ msgstr "کارگزار برای هدایت درخواست‌های SSL به"
 msgid "Save paths"
 msgstr "نشانی ذخیره سازی"
 
-#. TRANS: Instructions for the "People search" page.
-#. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/peoplesearch.php:54
+#: actions/peoplesearch.php:52
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
@@ -4524,8 +4454,7 @@ msgstr ""
 "برای جست‌وجوی افراد در %%site.name%% از نام، مکان یا توصیف‌شان استفاده کنید. "
 "عبارت‌ها را با فاصله جدا کنید؛ آن‌ها باید ۳ نویسه یا بیش‌تر باشند."
 
-#. TRANS: Title of a page where users can search for other users.
-#: actions/peoplesearch.php:61
+#: actions/peoplesearch.php:58
 msgid "People search"
 msgstr "جست‌وجوی کاربران"
 
@@ -4567,7 +4496,7 @@ msgid "Profile information"
 msgstr "اطلاعات نمایه"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109 actions/register.php:419
+#: actions/profilesettings.php:109 actions/register.php:433
 #, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr "۱-۶۴ کاراکتر کوچک یا اعداد، بدون نقطه گذاری یا فاصله"
@@ -4575,7 +4504,7 @@ msgstr "۱-۶۴ کاراکتر کوچک یا اعداد، بدون نقطه گذ
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for full group name (dt). Text hidden by default.
 #. TRANS: DT for full name in a profile.
-#: actions/profilesettings.php:113 actions/register.php:441
+#: actions/profilesettings.php:113 actions/register.php:455
 #: actions/showgroup.php:255 actions/tagother.php:104
 #: lib/groupeditform.php:150 lib/userprofile.php:156
 msgid "Full name"
@@ -4583,13 +4512,13 @@ msgstr "نام‌کامل"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:118 actions/register.php:446
+#: actions/profilesettings.php:118 actions/register.php:460
 #: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "صفحهٔ خانگی"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:121 actions/register.php:448
+#: actions/profilesettings.php:121
 #, fuzzy
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr "نشانی اینترنتی صفحهٔ خانگی، وبلاگ یا نمایه‌تان در یک وب‌گاه دیگر"
@@ -4597,36 +4526,35 @@ msgstr "نشانی اینترنتی صفحهٔ خانگی، وبلاگ یا نم
 #. TRANS: Tooltip for field label in form for profile settings. Plural
 #. TRANS: is decided by the number of characters available for the
 #. TRANS: biography (%d).
-#: actions/profilesettings.php:129 actions/register.php:457
+#: actions/profilesettings.php:129 actions/register.php:471
 #, fuzzy, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
 msgstr[0] "خودتان و علاقه‌مندی‌هایتان را در %d نویسه توصیف کنید"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:135 actions/register.php:462
+#: actions/profilesettings.php:135 actions/register.php:476
 msgid "Describe yourself and your interests"
 msgstr "خودتان و علاقه‌مندی‌هایتان را توصیف کنید"
 
 #. TRANS: Text area label in form for profile settings where users can provide.
 #. TRANS: their biography.
-#: actions/profilesettings.php:139 actions/register.php:464
+#: actions/profilesettings.php:139 actions/register.php:478
 msgid "Bio"
 msgstr "شرح‌حال"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group location (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT for location in a profile.
-#: actions/profilesettings.php:145 actions/register.php:469
+#: actions/profilesettings.php:145 actions/register.php:483
 #: actions/showgroup.php:265 actions/tagother.php:112
-#: actions/userauthorization.php:174 lib/groupeditform.php:173
+#: actions/userauthorization.php:166 lib/groupeditform.php:173
 #: lib/userprofile.php:172
 msgid "Location"
 msgstr "موقعیت"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148
+#: actions/profilesettings.php:148 actions/register.php:485
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "مکانی که شما در آن هستید، مانند «شهر، ایالت (یا استان)، کشور»"
 
@@ -4647,8 +4575,7 @@ msgstr "برچسب‌ها"
 #: actions/profilesettings.php:164
 #, fuzzy
 msgid ""
-"Tags for yourself (letters, numbers, -, ., and _), comma- or space- "
-"separated."
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr ""
 "برچسب‌ها برای خودتان (حروف، اعداد، -، .، و _) جدا شده با کاما- یا فاصله-"
 
@@ -4660,7 +4587,7 @@ msgstr "زبان"
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
 #: actions/profilesettings.php:171
 #, fuzzy
-msgid "Preferred language."
+msgid "Preferred language"
 msgstr "زبان برگزیده"
 
 #. TRANS: Dropdownlist label in form for profile settings.
@@ -4677,14 +4604,14 @@ msgstr "شما معمولا در کدام منطقهٔ زمانی هستید؟"
 #: actions/profilesettings.php:189
 #, fuzzy
 msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)."
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr ""
 "به صورت خودکار مشترک هر کسی بشو که مشترک من می‌شود (بهترین برای غیر انسان‌ها)"
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Plural form is used based on the maximum number of allowed
 #. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:258 actions/register.php:221
+#: actions/profilesettings.php:258 actions/register.php:229
 #, fuzzy, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4703,9 +4630,9 @@ msgstr "زبان بسیار طولانی است ( حداکثر ۵۰ نویسه)"
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:291
-#, fuzzy, php-format
-msgid "Invalid tag: \"%s\"."
+#: actions/profilesettings.php:291 actions/tagother.php:178
+#, php-format
+msgid "Invalid tag: \"%s\""
 msgstr "نشان نادرست »%s«"
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
@@ -4812,12 +4739,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: Public RSS feed description. %s is the StatusNet site name.
-#: actions/publicrss.php:106
-#, fuzzy, php-format
-msgid "%s updates from everyone."
-msgstr "%s به روز رسانی های عموم"
-
 #. TRANS: Title for public tag cloud.
 #: actions/publictagcloud.php:57
 msgid "Public tag cloud"
@@ -4954,12 +4875,6 @@ msgstr "بازیابی گذرواژه"
 msgid "Password recovery requested"
 msgstr "بازیابی گذرواژه درخواست شد"
 
-#. TRANS: Title for password recovery page in password saved mode.
-#: actions/recoverpassword.php:229
-#, fuzzy
-msgid "Password saved"
-msgstr "گذرواژه ذخیره شد."
-
 #. TRANS: Title for password recovery page when an unknown action has been specified.
 #: actions/recoverpassword.php:232
 msgid "Unknown action"
@@ -4971,6 +4886,12 @@ msgstr "عمل نامعلوم"
 msgid "6 or more characters, and do not forget it!"
 msgstr "۶ نویسه یا بیش‌تر، و این را فراموش نکنید!"
 
+#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#: actions/recoverpassword.php:264 actions/register.php:441
+#, fuzzy
+msgid "Same as password above."
+msgstr "مانند گذرواژهٔ بالا"
+
 #. TRANS: Button text for password reset form.
 #. TRANS: Button text on profile design page to reset all colour settings to default without saving.
 #: actions/recoverpassword.php:268 lib/designsettings.php:264
@@ -5024,8 +4945,14 @@ msgstr "گذرواژه باید ۶ نویسه یا بیش‌تر باشد."
 msgid "Password and confirmation do not match."
 msgstr "گذرواژه و تاییدیهٔ آن با هم تطابق ندارند."
 
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:418
+#, fuzzy
+msgid "Cannot save new password."
+msgstr "نمی‌توان گذرواژهٔ جدید را ذخیره کرد."
+
 #. TRANS: Server error displayed when something does wrong with the user object during password reset.
-#: actions/recoverpassword.php:426 actions/register.php:248
+#: actions/recoverpassword.php:426 actions/register.php:256
 msgid "Error setting user."
 msgstr "هنگام گذاشتن کاربر خطا روی داد."
 
@@ -5034,92 +4961,97 @@ msgstr "هنگام گذاشتن کاربر خطا روی داد."
 msgid "New password successfully saved. You are now logged in."
 msgstr "گذرواژه تازه با موفقیت ذخیره شد. شما اکنون وارد شده‌اید."
 
-#: actions/register.php:87 actions/register.php:188 actions/register.php:399
+#: actions/register.php:92 actions/register.php:196 actions/register.php:413
 msgid "Sorry, only invited people can register."
 msgstr "با عرض معذرت، تنها افراد دعوت شده می توانند ثبت نام کنند."
 
-#: actions/register.php:94
+#: actions/register.php:99
 msgid "Sorry, invalid invitation code."
 msgstr "با عرض تاسف، کد دعوت نا معتبر است."
 
-#: actions/register.php:113
+#: actions/register.php:119
 msgid "Registration successful"
 msgstr "ثبت نام با موفقیت انجام شد."
 
-#: actions/register.php:115 actions/register.php:497
+#: actions/register.php:121 actions/register.php:511
 msgid "Register"
 msgstr "ثبت نام"
 
-#: actions/register.php:135
+#: actions/register.php:142
 msgid "Registration not allowed."
 msgstr "اجازهٔ ثبت‌نام داده نشده است."
 
-#: actions/register.php:201
+#: actions/register.php:209
 #, fuzzy
-msgid "You cannot register if you don't agree to the license."
+msgid "You can't register if you don't agree to the license."
 msgstr "شما نمی توانید ثبت نام کنید اگر با لیسانس( جواز ) موافقت نکنید."
 
-#: actions/register.php:210
+#: actions/register.php:218
 msgid "Email address already exists."
 msgstr "نشانی پست الکترونیکی از قبل وجود دارد."
 
-#: actions/register.php:243 actions/register.php:265
+#: actions/register.php:251 actions/register.php:273
 msgid "Invalid username or password."
 msgstr "نام کاربری یا گذرواژه نا معتبر است."
 
-#: actions/register.php:340
+#: actions/register.php:351
 #, fuzzy
 msgid ""
 "With this form you can create a new account. You can then post notices and "
-"link up to friends and colleagues."
+"link up to friends and colleagues. "
 msgstr ""
 "با این فرم شما می‌توانید یک حساب تازه بسازید. سپس شما می‌توانید پیام بفرستید و "
 "به دوستان و همکارانتان بپیوندید. "
 
+#: actions/register.php:437
+#, fuzzy
+msgid "6 or more characters."
+msgstr "۶ نویسه یا بیش‌تر"
+
 #. TRANS: Link description in user account settings menu.
-#: actions/register.php:431 actions/register.php:435
+#: actions/register.php:445 actions/register.php:449
 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
 msgid "Email"
 msgstr "پست الکترونیکی"
 
-#: actions/register.php:432 actions/register.php:436
+#: actions/register.php:446 actions/register.php:450
 #, fuzzy
-msgid "Used only for updates, announcements, and password recovery."
+msgid "Used only for updates, announcements, and password recovery"
 msgstr "تنها برای به‌هنگام‌سازی‌ها، اعلامیه‌ها و بازیابی گذرواژه به کار می‌رود"
 
-#: actions/register.php:443
+#: actions/register.php:457
 #, fuzzy
-msgid "Longer name, preferably your \"real\" name."
+msgid "Longer name, preferably your \"real\" name"
 msgstr "نام بلند تر، به طور بهتر نام واقعیتان"
 
-#: actions/register.php:471
+#: actions/register.php:462
 #, fuzzy
-msgid "Where you are, like \"City, State (or Region), Country\"."
-msgstr "مکانی که شما در آن هستید، مانند «شهر، ایالت (یا استان)، کشور»"
+msgid "URL of your homepage, blog, or profile on another site"
+msgstr "نشانی اینترنتی صفحهٔ خانگی، وبلاگ یا نمایه‌تان در یک وب‌گاه دیگر"
 
-#: actions/register.php:510
+#: actions/register.php:523
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
 msgstr "من متوجه هستم که محتوا و داده‌های %1$s خصوصی و محرمانه هستند."
 
-#: actions/register.php:520
+#: actions/register.php:533
 #, php-format
 msgid "My text and files are copyright by %1$s."
 msgstr "متن و پرونده‌های من دارای حق تکثیر %1$s هستند."
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:524
+#: actions/register.php:537
 msgid "My text and files remain under my own copyright."
 msgstr "متن و پرونده‌های من زیر حق تکثیر خودم می‌مانند."
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:527
+#: actions/register.php:540
 msgid "All rights reserved."
 msgstr "تمام حقوق محفوظ است."
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:532
+#: actions/register.php:545
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -5128,7 +5060,7 @@ msgstr ""
 "نوشته‌ها و پرونده‌های من به جز داده‌های خصوصی گذرواژه، نشانی پست الکترونیک، "
 "نشانی پیام‌رسان فوری و شماره تلفن زیر مجوز %s هستند."
 
-#: actions/register.php:573
+#: actions/register.php:588
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -5162,7 +5094,7 @@ msgstr ""
 "از این‌که نام‌نویسی کرده‌اید، تشکر می‌کنیم و امیدواریم که از استفاده از این "
 "سرویس لذت ببرید."
 
-#: actions/register.php:597
+#: actions/register.php:612
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5195,7 +5127,7 @@ msgstr "نام کاربری کاربر"
 
 #: actions/remotesubscribe.php:129
 #, fuzzy
-msgid "Nickname of the user you want to follow."
+msgid "Nickname of the user you want to follow"
 msgstr "نام کاربری، کاربری که می خواهید او را دنبال کنید"
 
 #: actions/remotesubscribe.php:132
@@ -5204,7 +5136,7 @@ msgstr "نشانی نمایه"
 
 #: actions/remotesubscribe.php:133
 #, fuzzy
-msgid "URL of your profile on another compatible microblogging service."
+msgid "URL of your profile on another compatible microblogging service"
 msgstr "نشانی اینترنتی نمایهٔ شما در سرویس میکروبلاگینگ سازگار دیگری"
 
 #. TRANS: Link text for link that will subscribe to a remote profile.
@@ -5215,7 +5147,7 @@ msgstr "اشتراک"
 
 #: actions/remotesubscribe.php:158
 #, fuzzy
-msgid "Invalid profile URL (bad format)."
+msgid "Invalid profile URL (bad format)"
 msgstr "نشانی اینترنتی نمایه نامعتبر است (فرمت نامناسب است)"
 
 #: actions/remotesubscribe.php:167
@@ -5259,7 +5191,6 @@ msgstr "تکرار شده"
 msgid "Repeated!"
 msgstr "تکرار شد!"
 
-#. TRANS: RSS reply feed title. %s is a user nickname.
 #. TRANS: Tooltip for personal group navigation menu option when logged in for viewing @-replies.
 #: actions/replies.php:126 actions/repliesrss.php:68
 #: lib/personalgroupnav.php:109
@@ -5312,11 +5243,9 @@ msgstr ""
 "اولین کسی باشید که در [این موضوع](%%%%action.newnotice%%%%?status_textarea=%"
 "s) پیام می‌فرستد."
 
-#. TRANS: RSS reply feed description.
-#. TRANS: %1$s is a user nickname, %2$s is the StatusNet site name.
-#: actions/repliesrss.php:74
+#: actions/repliesrss.php:72
 #, fuzzy, php-format
-msgid "Replies to %1$s on %2$s."
+msgid "Replies to %1$s on %2$s!"
 msgstr "پاسخ‌های به %1$s در %2$s!"
 
 #. TRANS: Client exception displayed when trying to restore an account while not logged in.
@@ -5416,7 +5345,7 @@ msgstr "شما نمی‌توانید نقش‌های کاربری را در ای
 msgid "User doesn't have this role."
 msgstr "کاربر این نقش را ندارد."
 
-#: actions/rsd.php:142 actions/version.php:159
+#: actions/rsd.php:146 actions/version.php:159
 msgid "StatusNet"
 msgstr "StatusNet"
 
@@ -5461,87 +5390,87 @@ msgstr "خروجی اشکال‌زدایی برای نشست‌ها روشن ش
 msgid "Save site settings"
 msgstr "ذخیرهٔ تنظیمات وب‌گاه"
 
-#: actions/showapplication.php:78
+#: actions/showapplication.php:82
 msgid "You must be logged in to view an application."
 msgstr "برای دیدن یک برنامه باید وارد شده باشید."
 
-#: actions/showapplication.php:151
+#: actions/showapplication.php:157
 msgid "Application profile"
 msgstr "نمایهٔ برنامه"
 
 #. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:153 lib/applicationeditform.php:177
+#: actions/showapplication.php:159 lib/applicationeditform.php:177
 msgid "Icon"
 msgstr "شمایل"
 
 #. TRANS: Form input field label for application name.
-#: actions/showapplication.php:163 actions/version.php:197
+#: actions/showapplication.php:169 actions/version.php:197
 #: lib/applicationeditform.php:190
 msgid "Name"
 msgstr "نام"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:172 lib/applicationeditform.php:227
+#: actions/showapplication.php:178 lib/applicationeditform.php:227
 msgid "Organization"
 msgstr "سازمان"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:181 actions/version.php:200
+#: actions/showapplication.php:187 actions/version.php:200
 #: lib/applicationeditform.php:208 lib/groupeditform.php:168
 msgid "Description"
 msgstr "توصیف"
 
 #. TRANS: Header for group statistics on a group page (h2).
 #. TRANS: H2 text for user statistics.
-#: actions/showapplication.php:186 actions/showgroup.php:460
+#: actions/showapplication.php:192 actions/showgroup.php:460
 #: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "آمار"
 
-#: actions/showapplication.php:197
+#: actions/showapplication.php:203
 #, php-format
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr "ساخته شده توسط %1$s - دسترسی %2$s به صورت پیش‌فرض - %3$d کاربر"
 
-#: actions/showapplication.php:207
+#: actions/showapplication.php:213
 msgid "Application actions"
 msgstr "اعمال برنامه"
 
-#: actions/showapplication.php:230
+#: actions/showapplication.php:236
 msgid "Reset key & secret"
 msgstr ""
 
 #. TRANS: Title of form for deleting a user.
-#: actions/showapplication.php:246 lib/deletegroupform.php:121
+#: actions/showapplication.php:252 lib/deletegroupform.php:121
 #: lib/deleteuserform.php:64 lib/noticelist.php:673
 msgid "Delete"
 msgstr "حذف"
 
-#: actions/showapplication.php:255
+#: actions/showapplication.php:261
 msgid "Application info"
 msgstr "اطلاعات برنامه"
 
-#: actions/showapplication.php:257
+#: actions/showapplication.php:263
 msgid "Consumer key"
 msgstr "کلید مصرف‌کننده"
 
-#: actions/showapplication.php:262
+#: actions/showapplication.php:268
 msgid "Consumer secret"
 msgstr "رمز مصرف‌کننده"
 
-#: actions/showapplication.php:267
+#: actions/showapplication.php:273
 msgid "Request token URL"
 msgstr "نشانی اینترنتی شناسهٔ درخواست"
 
-#: actions/showapplication.php:272
+#: actions/showapplication.php:278
 msgid "Access token URL"
 msgstr "نشانی اینترنتی نشانهٔ درخواست"
 
-#: actions/showapplication.php:277
+#: actions/showapplication.php:283
 msgid "Authorize URL"
 msgstr "نشانی اجازه‌دادن"
 
-#: actions/showapplication.php:282
+#: actions/showapplication.php:288
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
@@ -5549,7 +5478,7 @@ msgstr ""
 "توجه: ما امضاهای HMAC-SHA1 را پشتیبانی می‌کنیم. ما روش امضای plaintext را "
 "پشتیبانی نمی‌کنیم."
 
-#: actions/showapplication.php:302
+#: actions/showapplication.php:309
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr "آیا مطمئن هستید که می‌خواهید کلید و رمز خریدار را دوباره تعیین کنید؟"
 
@@ -5641,18 +5570,16 @@ msgid "Group profile"
 msgstr "نمایهٔ گروه"
 
 #. TRANS: Label for group URL (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT for URL in a profile.
 #: actions/showgroup.php:273 actions/tagother.php:118
-#: actions/userauthorization.php:184 lib/userprofile.php:186
+#: actions/userauthorization.php:175 lib/userprofile.php:186
 msgid "URL"
 msgstr "نشانی اینترنتی"
 
 #. TRANS: Label for group description or group note (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page where bio is displayed.
 #. TRANS: DT for note in a profile.
 #: actions/showgroup.php:285 actions/tagother.php:128
-#: actions/userauthorization.php:197 lib/userprofile.php:204
+#: actions/userauthorization.php:187 lib/userprofile.php:204
 msgid "Note"
 msgstr "یادداشت"
 
@@ -5801,7 +5728,7 @@ msgid "%1$s tagged %2$s"
 msgstr "%1$s، صفحهٔ %2$d"
 
 #. TRANS: Page title showing tagged notices in one user's stream.
-#. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
+#. TRANS: %1$s is the username, %2$s is the hash tag, %1$d is the page number.
 #: actions/showstream.php:74
 #, fuzzy, php-format
 msgid "%1$s tagged %2$s, page %3$d"
@@ -6050,7 +5977,7 @@ msgstr "متن پیام عمومی وب‌گاه (حداکثر ۲۵۵ نویسه
 #. TRANS: Title for button to save site notice in admin panel.
 #: actions/sitenoticeadminpanel.php:201
 #, fuzzy
-msgid "Save site notice."
+msgid "Save site notice"
 msgstr "ذخیرهٔ پیام وب‌گاه"
 
 #. TRANS: Title for SMS settings.
@@ -6110,7 +6037,7 @@ msgstr "شمارهٔ تماس پیامک"
 #. TRANS: SMS phone number input field instructions in SMS settings form.
 #: actions/smssettings.php:152
 #, fuzzy
-msgid "Phone number, no punctuation or spaces, with area code."
+msgid "Phone number, no punctuation or spaces, with area code"
 msgstr "شماره تلفن، بدون نشانه گذاری یا فاصله، با کد منطقه"
 
 #. TRANS: Form legend for SMS preferences form.
@@ -6280,19 +6207,15 @@ msgstr "شما مشترک آن نمایه نیستید."
 msgid "Could not save subscription."
 msgstr "نمی‌توان اشتراک را ذخیره کرد."
 
-#. TRANS: Client error displayed trying to perform any request method other than POST.
-#. TRANS: Do not translate POST.
 #: actions/subscribe.php:77
 msgid "This action only accepts POST requests."
 msgstr "این عمل تنها درخواست‌های POST را می‌پذیرد."
 
-#. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
-#: actions/subscribe.php:121
+#: actions/subscribe.php:117
 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
 msgstr "نمی‌توان با این کار مشترک یک نمایهٔ از راه دور OMB 0.1شد."
 
-#. TRANS: Page title when subscription succeeded.
-#: actions/subscribe.php:149
+#: actions/subscribe.php:145
 msgid "Subscribed"
 msgstr "مشترک‌شده"
 
@@ -6454,9 +6377,8 @@ msgstr "برچسب %s"
 msgid "User profile"
 msgstr "نمایهٔ کاربر"
 
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT element in area for user avatar.
-#: actions/tagother.php:81 actions/userauthorization.php:138
+#: actions/tagother.php:81 actions/userauthorization.php:132
 #: lib/userprofile.php:108
 msgid "Photo"
 msgstr "تصویر"
@@ -6472,11 +6394,6 @@ msgid ""
 msgstr ""
 "برچسب‌ها برای این کاربر (حروف، اعداد، -، .، و _)، جدا شده با کاما- یا فاصله-"
 
-#: actions/tagother.php:178
-#, php-format
-msgid "Invalid tag: \"%s\""
-msgstr "نشان نادرست »%s«"
-
 #: actions/tagother.php:193
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
@@ -6492,7 +6409,6 @@ msgstr "از این روش برای افزودن برچسب به مشترک‌ه
 msgid "No such tag."
 msgstr "چنین برچسبی وجود ندارد."
 
-#. TRANS: Client error displayed when trying to unblock a non-blocked user.
 #: actions/unblock.php:59
 msgid "You haven't blocked that user."
 msgstr "شما آن کاربر را مسدود نکرده اید."
@@ -6514,7 +6430,7 @@ msgstr "هیچ شناسهٔ نمایه‌ای درخواست نشده است."
 msgid "Unsubscribed"
 msgstr "لغو اشتراک شده"
 
-#: actions/updateprofile.php:64
+#: actions/updateprofile.php:64 actions/userauthorization.php:337
 #, fuzzy, php-format
 msgid ""
 "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
@@ -6546,7 +6462,7 @@ msgstr "متن خوشامدگویی نامعتبر است. بیشینهٔ طول
 #. TRANS: users in user admin panel. %1$s is the invalid nickname.
 #: actions/useradminpanel.php:166
 #, fuzzy, php-format
-msgid "Invalid default subscripton: \"%1$s\" is not a user."
+msgid "Invalid default subscripton: '%1$s' is not a user."
 msgstr "اشتراک پیش‌فرض نامعتبر است: «%1$s» کاربر نیست."
 
 #. TRANS: Link description in user account settings menu.
@@ -6608,144 +6524,109 @@ msgstr "چنان‌که به کاربران اجازهٔ دعوت‌کردن ک
 #. TRANS: Title for button to save user settings in user admin panel.
 #: actions/useradminpanel.php:302
 #, fuzzy
-msgid "Save user settings."
+msgid "Save user settings"
 msgstr "ذخیرهٔ تنظیمات وب‌گاه"
 
-#. TRANS: Page title.
-#: actions/userauthorization.php:109
+#: actions/userauthorization.php:105
 msgid "Authorize subscription"
 msgstr "تصدیق اشتراک"
 
-#. TRANS: Page notice on "Auhtorize subscription" page.
-#: actions/userauthorization.php:115
+#: actions/userauthorization.php:110
 #, fuzzy
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
 "user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
-"click \"Reject\"."
+"click “Reject”."
 msgstr ""
 "لطفا این جزئیات را برای اطمینان از این‌که می‌خواهید مشترک پیام‌های این کاربر "
 "شوید، بررسی کنید. اگر شما درخواست اشتراک پیام‌های کسی را نداده‌اید، روی «رد "
 "کردن» کلیک کنید."
 
-#. TRANS: DT element on Authorise Subscription page where license is displayed.
 #. TRANS: Menu item for site administration
-#: actions/userauthorization.php:207 actions/version.php:167
+#: actions/userauthorization.php:196 actions/version.php:167
 #: lib/adminpanelaction.php:403
 msgid "License"
 msgstr "مجوز"
 
-#. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:229
+#: actions/userauthorization.php:217
 #, fuzzy
-msgctxt "BUTTON"
 msgid "Accept"
 msgstr "پذیرفتن"
 
-#. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:231
-#, fuzzy
-msgid "Subscribe to this user."
+#: actions/userauthorization.php:218 lib/subscribeform.php:115
+#: lib/subscribeform.php:139
+msgid "Subscribe to this user"
 msgstr "مشترک شدن این کاربر"
 
-#. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:233
+#: actions/userauthorization.php:219
 #, fuzzy
-msgctxt "BUTTON"
 msgid "Reject"
 msgstr "رد کردن"
 
-#. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:235
+#: actions/userauthorization.php:220
 #, fuzzy
-msgid "Reject this subscription."
+msgid "Reject this subscription"
 msgstr "رد کردن این اشتراک"
 
-#. TRANS: Client error displayed for an empty authorisation request.
-#: actions/userauthorization.php:248
+#: actions/userauthorization.php:232
 msgid "No authorization request!"
 msgstr "هیچ درخواست اجازه‌ای وجود ندارد!"
 
-#. TRANS: Accept message header from Authorise subscription page.
-#: actions/userauthorization.php:271
+#: actions/userauthorization.php:254
 msgid "Subscription authorized"
 msgstr "اشتراک تصدیق شد"
 
-#: actions/userauthorization.php:274
+#: actions/userauthorization.php:256
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to authorize the "
 "subscription. Your subscription token is:"
 msgstr ""
 
-#. TRANS: Reject message header from Authorise subscription page.
-#: actions/userauthorization.php:285
+#: actions/userauthorization.php:266
 msgid "Subscription rejected"
 msgstr "اشتراک پذیرفته نشد"
 
-#: actions/userauthorization.php:288
+#: actions/userauthorization.php:268
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to fully reject the "
 "subscription."
 msgstr ""
 
-#. TRANS: Exception thrown when no valid user is found for an authorisation request.
-#. TRANS: %s is a listener URI.
-#: actions/userauthorization.php:325
+#: actions/userauthorization.php:303
 #, fuzzy, php-format
-msgid "Listener URI \"%s\" not found here."
+msgid "Listener URI ‘%s’ not found here."
 msgstr "نشانی تصویر چهره «%s» معتبر نیست."
 
-#. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:332
+#: actions/userauthorization.php:308
 #, fuzzy, php-format
-msgid "Listenee URI \"%s\" is too long."
+msgid "Listenee URI ‘%s’ is too long."
 msgstr "نشانی تصویر چهره «%s» معتبر نیست."
 
-#. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:340
+#: actions/userauthorization.php:314
 #, fuzzy, php-format
-msgid "Listenee URI \"%s\" is a local user."
+msgid "Listenee URI ‘%s’ is a local user."
 msgstr "نشانی اینترنتی نمایهٔ «%s» برای یک کاربر محلی است."
 
-#. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
-#. TRANS: %s is a profile URL.
-#: actions/userauthorization.php:358
+#: actions/userauthorization.php:329
 #, fuzzy, php-format
-msgid "Profile URL \"%s\" is for a local user."
+msgid "Profile URL ‘%s’ is for a local user."
 msgstr "نشانی اینترنتی نمایهٔ «%s» برای یک کاربر محلی است."
 
-#. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
-#. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
-#: actions/userauthorization.php:368
+#: actions/userauthorization.php:345
 #, fuzzy, php-format
-msgid ""
-"Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
-"\"."
-msgstr "مجوز پیام «%1$s» با مجوز وب‌گاه «%2$s» سازگار نیست."
-
-#. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:378
-#, fuzzy, php-format
-msgid "Avatar URL \"%s\" is not valid."
+msgid "Avatar URL ‘%s’ is not valid."
 msgstr "نشانی تصویر چهره «%s» معتبر نیست."
 
-#. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:385
+#: actions/userauthorization.php:350
 #, fuzzy, php-format
-msgid "Cannot read avatar URL \"%s\"."
+msgid "Can’t read avatar URL ‘%s’."
 msgstr "نمی‌توان نشانی اینترنتی چهره را خواند«%s»."
 
-#. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:392
+#: actions/userauthorization.php:355
 #, fuzzy, php-format
-msgid "Wrong image type for avatar URL \"%s\"."
+msgid "Wrong image type for avatar URL ‘%s’."
 msgstr "نوع تصویر برای نشانی اینترنتی چهره نادرست است «%s»."
 
 #. TRANS: Page title for profile design page.
@@ -6852,7 +6733,7 @@ msgid "Plugins"
 msgstr "افزونه‌ها"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:898
+#: actions/version.php:198 lib/action.php:901
 msgid "Version"
 msgstr "نسخه"
 
@@ -7059,14 +6940,14 @@ msgstr "هنگام ذخیرهٔ صندوق ورودی گروه مشکلی رخ 
 
 #. TRANS: Server exception thrown when a reply cannot be saved.
 #. TRANS: %1$d is a notice ID, %2$d is the ID of the mentioned user.
-#: classes/Notice.php:1142
+#: classes/Notice.php:1144
 #, fuzzy, php-format
 msgid "Could not save reply for %1$d, %2$d."
 msgstr "نمی‌توان اطلاعات گروه محلی را ذخیره کرد."
 
 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1661
+#: classes/Notice.php:1663
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
@@ -7080,14 +6961,14 @@ msgstr "%1$s (%2$s)"
 
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:775
+#: classes/Profile.php:779
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr "نمی‌توان نقش «%1$s» را از کاربر  #%2$d گرفت، وجود ندارد."
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:784
+#: classes/Profile.php:788
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -7407,53 +7288,53 @@ msgid "Page notice"
 msgstr "پیام صفحه"
 
 #. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:871
+#: lib/action.php:874
 msgid "Secondary site navigation"
 msgstr "مسیریابی فرعی وب‌گاه"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:877
+#: lib/action.php:880
 msgid "Help"
 msgstr "کمک"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:880
+#: lib/action.php:883
 msgid "About"
 msgstr "دربارهٔ"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:883
+#: lib/action.php:886
 msgid "FAQ"
 msgstr "سوال‌های رایج"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:888
+#: lib/action.php:891
 msgid "TOS"
 msgstr "شرایط سرویس"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:892
+#: lib/action.php:895
 msgid "Privacy"
 msgstr "خصوصی"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:895
+#: lib/action.php:898
 msgid "Source"
 msgstr "منبع"
 
 #. TRANS: Secondary navigation menu option leading to e-mail contact information on the
 #. TRANS: StatusNet site, where to report bugs, ...
-#: lib/action.php:902
+#: lib/action.php:905
 msgid "Contact"
 msgstr "تماس"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:905
+#: lib/action.php:908
 msgid "Badge"
 msgstr "نشان"
 
 #. TRANS: DT element for StatusNet software license.
-#: lib/action.php:934
+#: lib/action.php:937
 msgid "StatusNet software license"
 msgstr "StatusNet مجوز نرم افزار"
 
@@ -7461,7 +7342,7 @@ msgstr "StatusNet مجوز نرم افزار"
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:941
+#: lib/action.php:944
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7471,7 +7352,7 @@ msgstr ""
 "broughtbyurl%%) برای شما راه‌اندازی شده است."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:944
+#: lib/action.php:947
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** یک سرویس میکروبلاگینگ است."
@@ -7480,7 +7361,7 @@ msgstr "**%%site.name%%** یک سرویس میکروبلاگینگ است."
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:951
+#: lib/action.php:954
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7492,50 +7373,50 @@ msgstr ""
 "org/licensing/licenses/agpl-3.0.html) در دسترس است."
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:967
+#: lib/action.php:970
 msgid "Site content license"
 msgstr "مجوز محتویات وب‌گاه"
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:974
+#: lib/action.php:977
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr "محتویات و داده‌های %1$s خصوصی و محرمانه هستند."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:981
+#: lib/action.php:984
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr "حق تکثیر محتوا و داده‌ها با %1$s است. تمام حقوق محفوظ است."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:985
+#: lib/action.php:988
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr "حق تکثیر محتوا و داده‌ها با مشارکت‌کنندگان است. تمام حقوق محفوظ است."
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:1017
+#: lib/action.php:1020
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr "تمام محتویات و داده‌های %1$s زیر مجوز %2$s در دسترس هستند."
 
 #. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1353
+#: lib/action.php:1356
 msgid "Pagination"
 msgstr "صفحه بندى"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1364
+#: lib/action.php:1367
 msgid "After"
 msgstr "پس از"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1374
+#: lib/action.php:1377
 msgid "Before"
 msgstr "قبل از"
 
@@ -7736,23 +7617,19 @@ msgstr ""
 msgid "No application for that consumer key."
 msgstr ""
 
-#: lib/apiauth.php:202 lib/apiauth.php:284
-msgid "Not allowed to use API."
-msgstr ""
-
 #. TRANS: OAuth exception given when an incorrect access token was given for a user.
-#: lib/apiauth.php:225
+#: lib/apiauth.php:219
 msgid "Bad access token."
 msgstr ""
 
 #. TRANS: OAuth exception given when no user was found for a given token (no token was found).
-#: lib/apiauth.php:230
+#: lib/apiauth.php:224
 msgid "No user for that token."
 msgstr ""
 
 #. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel".
 #. TRANS: Client error thrown when authentication fails.
-#: lib/apiauth.php:272 lib/apiauth.php:302
+#: lib/apiauth.php:266 lib/apiauth.php:293
 msgid "Could not authenticate you."
 msgstr ""
 
@@ -7957,11 +7834,6 @@ msgstr "تغییر گذرواژه مجاز نیست"
 msgid "Block"
 msgstr "بازداشتن"
 
-#. TRANS: Description of the form to block a user.
-#: lib/blockform.php:79
-msgid "Block this user"
-msgstr "کاربر را مسدود کن"
-
 #. TRANS: Title for command results.
 #: lib/channel.php:160 lib/channel.php:181
 msgid "Command results"
@@ -7990,7 +7862,7 @@ msgstr "پیامی با آن شناسه وجود ندارد."
 
 #. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
 #. TRANS: Error text shown when a last user notice is requested and it does not exist.
-#: lib/command.php:99 lib/command.php:630
+#: lib/command.php:99 lib/command.php:642
 #, fuzzy
 msgid "User has no last notice."
 msgstr "کاربر آگهی آخر ندارد"
@@ -8041,35 +7913,41 @@ msgstr ""
 "مشترک‌ها: %2$s\n"
 "پیام‌ها: %3$s"
 
+#. TRANS: Error message text shown when a favorite could not be set because it has already been favorited.
+#: lib/command.php:298
+#, fuzzy
+msgid "Could not create favorite: already favorited."
+msgstr "نمی‌توان پیام را برگزید."
+
 #. TRANS: Text shown when a notice has been marked as favourite successfully.
-#: lib/command.php:312
+#: lib/command.php:324
 msgid "Notice marked as fave."
 msgstr "پیام به‌عنوان برگزیده مشخص شد."
 
 #. TRANS: Message given having added a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:357
+#: lib/command.php:369
 #, php-format
 msgid "%1$s joined group %2$s."
 msgstr "%1$s به گروه %2$s پیوست."
 
 #. TRANS: Message given having removed a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:405
+#: lib/command.php:417
 #, php-format
 msgid "%1$s left group %2$s."
 msgstr "%1$s گروه %2$s را ترک کرد."
 
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: lib/command.php:426
+#: lib/command.php:438
 #, fuzzy, php-format
 msgctxt "WHOIS"
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
 
 #. TRANS: Whois output. %s is the full name of the queried user.
-#: lib/command.php:430
+#: lib/command.php:442
 #, php-format
 msgid "Fullname: %s"
 msgstr "نام کامل : %s"
@@ -8077,7 +7955,7 @@ msgstr "نام کامل : %s"
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a location.
-#: lib/command.php:434 lib/mail.php:270
+#: lib/command.php:446 lib/mail.php:270
 #, php-format
 msgid "Location: %s"
 msgstr "موقعیت : %s"
@@ -8085,20 +7963,20 @@ msgstr "موقعیت : %s"
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a homepage.
-#: lib/command.php:438 lib/mail.php:274
+#: lib/command.php:450 lib/mail.php:274
 #, php-format
 msgid "Homepage: %s"
 msgstr "صفحه خانگی : %s"
 
 #. TRANS: Whois output. %s is the bio information of the queried user.
-#: lib/command.php:442
+#: lib/command.php:454
 #, php-format
 msgid "About: %s"
 msgstr "دربارهٔ: %s"
 
 #. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).
 #. TRANS: %s is a remote profile.
-#: lib/command.php:471
+#: lib/command.php:483
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
@@ -8109,7 +7987,7 @@ msgstr ""
 
 #. TRANS: Message given if content is too long. %1$sd is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:488
+#: lib/command.php:500
 #, fuzzy, php-format
 msgid "Message too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
@@ -8118,25 +7996,25 @@ msgstr[0] ""
 "فرستادید."
 
 #. TRANS: Error text shown sending a direct message fails with an unknown reason.
-#: lib/command.php:516
+#: lib/command.php:528
 msgid "Error sending direct message."
 msgstr "خطا در فرستادن پیام مستقیم."
 
 #. TRANS: Message given having repeated a notice from another user.
 #. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:553
+#: lib/command.php:565
 #, php-format
 msgid "Notice from %s repeated."
 msgstr "پیام %s تکرار شد."
 
 #. TRANS: Error text shown when repeating a notice fails with an unknown reason.
-#: lib/command.php:556
+#: lib/command.php:568
 msgid "Error repeating notice."
 msgstr "هنگام تکرار پیام خطایی رخ داد."
 
 #. TRANS: Message given if content of a notice for a reply is too long. %1$d is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:591
+#: lib/command.php:603
 #, fuzzy, php-format
 msgid "Notice too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Notice too long - maximum is %1$d characters, you sent %2$d."
@@ -8146,80 +8024,80 @@ msgstr[0] ""
 
 #. TRANS: Text shown having sent a reply to a notice successfully.
 #. TRANS: %s is the nickname of the user of the notice the reply was sent to.
-#: lib/command.php:604
+#: lib/command.php:616
 #, php-format
 msgid "Reply to %s sent."
 msgstr "پاسخ به %s فرستاده شد."
 
 #. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
-#: lib/command.php:607
+#: lib/command.php:619
 msgid "Error saving notice."
 msgstr "هنگام ذخیرهٔ پیام خطا رخ داد."
 
 #. TRANS: Error text shown when no username was provided when issuing a subscribe command.
-#: lib/command.php:654
+#: lib/command.php:666
 msgid "Specify the name of the user to subscribe to."
 msgstr ""
 
 #. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
-#: lib/command.php:663
+#: lib/command.php:675
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "نمی‌توان با دستور مشترک نمایه‌های OMB شد."
 
 #. TRANS: Text shown after having subscribed to another user successfully.
 #. TRANS: %s is the name of the user the subscription was requested for.
-#: lib/command.php:671
+#: lib/command.php:683
 #, php-format
 msgid "Subscribed to %s."
 msgstr ""
 
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.
-#: lib/command.php:692 lib/command.php:803
+#: lib/command.php:704 lib/command.php:815
 msgid "Specify the name of the user to unsubscribe from."
 msgstr ""
 
 #. TRANS: Text shown after having unsubscribed from another user successfully.
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:703
+#: lib/command.php:715
 #, php-format
 msgid "Unsubscribed from %s."
 msgstr "اشتراک از %s لغو شد."
 
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
-#: lib/command.php:723 lib/command.php:749
+#: lib/command.php:735 lib/command.php:761
 msgid "Command not yet implemented."
 msgstr "دستور هنوز پیاده نشده است."
 
 #. TRANS: Text shown when issuing the command "off" successfully.
-#: lib/command.php:727
+#: lib/command.php:739
 msgid "Notification off."
 msgstr "آگاه‌سازی خاموش شد."
 
 #. TRANS: Error text shown when the command "off" fails for an unknown reason.
-#: lib/command.php:730
+#: lib/command.php:742
 msgid "Can't turn off notification."
 msgstr "ناتوان در خاموش کردن آگاه سازی."
 
 #. TRANS: Text shown when issuing the command "on" successfully.
-#: lib/command.php:753
+#: lib/command.php:765
 msgid "Notification on."
 msgstr "آگاه سازی فعال است."
 
 #. TRANS: Error text shown when the command "on" fails for an unknown reason.
-#: lib/command.php:756
+#: lib/command.php:768
 msgid "Can't turn on notification."
 msgstr "ناتوان در روشن کردن آگاه سازی."
 
 #. TRANS: Error text shown when issuing the login command while login is disabled.
-#: lib/command.php:770
+#: lib/command.php:782
 msgid "Login command is disabled."
 msgstr "فرمان ورود غیرفعال شده است."
 
 #. TRANS: Text shown after issuing the login command successfully.
 #. TRANS: %s is a logon link..
-#: lib/command.php:783
+#: lib/command.php:795
 #, php-format
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
@@ -8227,54 +8105,54 @@ msgstr ""
 
 #. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:812
+#: lib/command.php:824
 #, php-format
 msgid "Unsubscribed %s."
 msgstr "%s لغو اشتراک شد."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
-#: lib/command.php:830
+#: lib/command.php:842
 msgid "You are not subscribed to anyone."
 msgstr "شما مشترک هیچ‌کسی نشده‌اید."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
-#: lib/command.php:835
+#: lib/command.php:847
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "شما مشترک این فرد شده‌اید:"
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user
 #. TRANS: (followers) without having any subscribers.
-#: lib/command.php:857
+#: lib/command.php:869
 msgid "No one is subscribed to you."
 msgstr "هیچ‌کس مشترک شما نشده است."
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
-#: lib/command.php:862
+#: lib/command.php:874
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "این فرد مشترک شما شده است:"
 
 #. TRANS: Text shown after requesting groups a user is subscribed to without having
 #. TRANS: any group subscriptions.
-#: lib/command.php:884
+#: lib/command.php:896
 msgid "You are not a member of any groups."
 msgstr "شما در هیچ گروهی عضو نیستید ."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
-#: lib/command.php:889
+#: lib/command.php:901
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "شما یک عضو این گروه هستید:"
 
 #. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-#: lib/command.php:904
+#: lib/command.php:916
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -8418,11 +8296,6 @@ msgstr "برنامه‌های وصل‌شدهٔ مجاز"
 msgid "Database error"
 msgstr "خطای پایگاه داده"
 
-#. TRANS: Description of form for deleting a user.
-#: lib/deleteuserform.php:75
-msgid "Delete this user"
-msgstr "حذف این کاربر"
-
 #. TRANS: Label in form on profile design page.
 #. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
 #: lib/designsettings.php:108
@@ -8461,21 +8334,6 @@ msgstr "تغییر رنگ‌ها"
 msgid "Use defaults"
 msgstr "استفاده‌کردن از پیش‌فرض‌ها"
 
-#. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: lib/designsettings.php:259
-msgid "Restore default designs"
-msgstr "بازگرداندن طرح‌های پیش‌فرض"
-
-#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: lib/designsettings.php:267
-msgid "Reset back to default"
-msgstr "برگشت به حالت پیش گزیده"
-
-#. TRANS: Title for button on profile design page to save settings.
-#: lib/designsettings.php:272
-msgid "Save design"
-msgstr "ذخیره‌کردن طرح"
-
 #. TRANS: Error message displayed if design settings could not be saved.
 #. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
 #: lib/designsettings.php:405 lib/designsettings.php:427
@@ -9350,10 +9208,6 @@ msgstr "به این پیام پاسخ دهید"
 msgid "Reply"
 msgstr "پاسخ"
 
-#: lib/noticelist.php:673
-msgid "Delete this notice"
-msgstr "این پیام را پاک کن"
-
 #: lib/noticelist.php:691
 msgid "Notice repeated"
 msgstr "پیام تکرار شد"
@@ -9638,10 +9492,6 @@ msgstr "دعوت‌کردن"
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "به شما ملحق شوند  %s دوستان و همکاران را دعوت کنید تا در"
 
-#: lib/subscribeform.php:115 lib/subscribeform.php:139
-msgid "Subscribe to this user"
-msgstr "مشترک شدن این کاربر"
-
 #: lib/subscriberspeopleselftagcloudsection.php:48
 #: lib/subscriptionspeopleselftagcloudsection.php:48
 msgid "People Tagcloud as self-tagged"
@@ -9813,66 +9663,61 @@ msgctxt "role"
 msgid "Moderator"
 msgstr "مدیر"
 
-#: lib/util.php:305
-#, fuzzy
-msgid "Not allowed to log in."
-msgstr "شما به سیستم وارد نشده اید."
-
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1309
+#: lib/util.php:1306
 msgid "a few seconds ago"
 msgstr "چند ثانیه پیش"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1312
+#: lib/util.php:1309
 msgid "about a minute ago"
 msgstr "حدود یک دقیقه پیش"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1316
+#: lib/util.php:1313
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
 msgstr[0] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1319
+#: lib/util.php:1316
 msgid "about an hour ago"
 msgstr "حدود یک ساعت پیش"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1323
+#: lib/util.php:1320
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
 msgstr[0] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1326
+#: lib/util.php:1323
 msgid "about a day ago"
 msgstr "حدود یک روز پیش"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1330
+#: lib/util.php:1327
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
 msgstr[0] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1333
+#: lib/util.php:1330
 msgid "about a month ago"
 msgstr "حدود یک ماه پیش"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1337
+#: lib/util.php:1334
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
 msgstr[0] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1340
+#: lib/util.php:1337
 msgid "about a year ago"
 msgstr "حدود یک سال پیش"
 
@@ -9915,3 +9760,73 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#, fuzzy
+#~ msgid "Block this user."
+#~ msgstr "کاربر را مسدود کن"
+
+#, fuzzy
+#~ msgid "Delete this notice."
+#~ msgstr "این پیام را پاک کن"
+
+#, fuzzy
+#~ msgid "Delete this user."
+#~ msgstr "حذف این کاربر"
+
+#, fuzzy
+#~ msgid "Restore default designs."
+#~ msgstr "بازگرداندن طرح‌های پیش‌فرض"
+
+#, fuzzy
+#~ msgid "Reset back to default."
+#~ msgstr "برگشت به حالت پیش گزیده"
+
+#, fuzzy
+#~ msgid "Save design."
+#~ msgstr "ذخیره‌کردن طرح"
+
+#, fuzzy
+#~ msgid "Disfavor favorite."
+#~ msgstr "خارج‌کردن از برگزیده‌ها"
+
+#, fuzzy
+#~ msgid "\"%s\" not found."
+#~ msgstr "رابط مورد نظر پیدا نشد."
+
+#, fuzzy
+#~ msgid "Notice %s not found."
+#~ msgstr "رابط مورد نظر پیدا نشد."
+
+#, fuzzy
+#~ msgid "Attachment %s not found."
+#~ msgstr "کاربر گیرنده یافت نشد."
+
+#, fuzzy
+#~ msgid "Invalid tag: \"%s\"."
+#~ msgstr "نشان نادرست »%s«"
+
+#, fuzzy
+#~ msgid "%s updates from everyone."
+#~ msgstr "%s به روز رسانی های عموم"
+
+#, fuzzy
+#~ msgid "Password saved"
+#~ msgstr "گذرواژه ذخیره شد."
+
+#, fuzzy
+#~ msgid "Where you are, like \"City, State (or Region), Country\"."
+#~ msgstr "مکانی که شما در آن هستید، مانند «شهر، ایالت (یا استان)، کشور»"
+
+#, fuzzy
+#~ msgid "Subscribe to this user."
+#~ msgstr "مشترک شدن این کاربر"
+
+#, fuzzy
+#~ msgid ""
+#~ "Listenee stream license \"%1$s\" is not compatible with site license \"%2"
+#~ "$s\"."
+#~ msgstr "مجوز پیام «%1$s» با مجوز وب‌گاه «%2$s» سازگار نیست."
+
+#, fuzzy
+#~ msgid "Not allowed to log in."
+#~ msgstr "شما به سیستم وارد نشده اید."
diff --git a/locale/fi/LC_MESSAGES/statusnet.po b/locale/fi/LC_MESSAGES/statusnet.po
index 9fe9dd12da..0fc354c901 100644
--- a/locale/fi/LC_MESSAGES/statusnet.po
+++ b/locale/fi/LC_MESSAGES/statusnet.po
@@ -15,17 +15,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-24 10:32+0000\n"
-"PO-Revision-Date: 2011-02-24 10:36:36+0000\n"
+"POT-Creation-Date: 2011-03-03 15:58+0000\n"
+"PO-Revision-Date: 2011-03-03 16:00:28+0000\n"
 "Language-Team: Finnish <http://translatewiki.net/wiki/Portal:fi>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r82712); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fi\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-02-17 11:39:54+0000\n"
+"X-POT-Import-Date: 2011-02-25 23:49:23+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -46,7 +46,8 @@ msgstr "Rekisteröityminen"
 #. TRANS: Checkbox instructions for admin setting "Private".
 #: actions/accessadminpanel.php:155
 msgid "Prohibit anonymous users (not logged in) from viewing site?"
-msgstr "Estä anonyymejä (sisäänkirjautumattomia) käyttäjiä lukemasta sivustoa?"
+msgstr ""
+"Estetäänkö anonyymejä (sisäänkirjautumattomia) käyttäjiä lukemasta sivustoa?"
 
 #. TRANS: Checkbox label for prohibiting anonymous users from viewing site.
 #: actions/accessadminpanel.php:157
@@ -137,11 +138,7 @@ msgstr "Sivua ei ole."
 #. 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 use "one time password login" without using an existing user.
-#. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
-#. TRANS: Client error displayed trying to find a user by ID for a non-existing ID.
-#. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when calling a profile action without specifying a user.
 #: actions/all.php:80 actions/allrss.php:69
@@ -159,12 +156,12 @@ msgstr "Sivua ei ole."
 #: actions/apitimelinementions.php:77 actions/apitimelineuser.php:79
 #: actions/avatarbynickname.php:79 actions/favoritesrss.php:72
 #: actions/foaf.php:42 actions/foaf.php:61 actions/hcard.php:67
-#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:78
+#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
 #: actions/remotesubscribe.php:144 actions/remotesubscribe.php:153
-#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:113
-#: actions/showfavorites.php:106 actions/userbyid.php:75
+#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
+#: actions/showfavorites.php:106 actions/userbyid.php:74
 #: actions/usergroups.php:93 actions/userrss.php:40 actions/userxrd.php:59
-#: actions/xrds.php:71 lib/command.php:497 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:509 lib/galleryaction.php:59
 #: lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Käyttäjää ei ole."
@@ -292,7 +289,7 @@ msgstr "Käyttäjän %1$s ja kavereiden päivitykset palvelussa %2$s!"
 #: actions/apigrouplistall.php:120 actions/apigroupmembership.php:105
 #: actions/apigroupshow.php:114 actions/apihelptest.php:84
 #: actions/apistatusesdestroy.php:101 actions/apistatusesretweets.php:110
-#: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:138
+#: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:139
 #: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
 #: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:268
 #: actions/apitimelinegroup.php:147 actions/apitimelinehome.php:173
@@ -448,7 +445,7 @@ msgstr "Käyttäjän %s tilaukset"
 #: actions/apiatomservice.php:115 actions/atompubfavoritefeed.php:142
 #, php-format
 msgid "%s favorites"
-msgstr "%s:n suosikit"
+msgstr "Käyttäjän %s suosikit"
 
 #. TRANS: Title for Atom feed with a user's memberships. %s is a user nickname.
 #: actions/apiatomservice.php:126
@@ -518,7 +515,8 @@ msgstr "Vastaanottajaa ei löytynyt."
 
 #. TRANS: Client error displayed trying to direct message another user who's not a friend (403).
 #: actions/apidirectmessagenew.php:144
-msgid "Cannot send direct messages to users who aren't your friend."
+#, fuzzy
+msgid "Can't send direct messages to users who aren't your friend."
 msgstr ""
 "Et voi lähettää suoraa viestiä käyttäjälle, jonka kanssa et ole vielä kaveri."
 
@@ -544,7 +542,7 @@ msgstr "Tämä päivitys on jo suosikki."
 #. TRANS: Client error displayed when marking a notice as favourite fails.
 #. TRANS: Server error displayed when trying to mark a notice as favorite fails in the database.
 #. TRANS: Error message text shown when a favorite could not be set.
-#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:294
+#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:306
 msgid "Could not create favorite."
 msgstr "Ei voitu lisätä suosikiksi."
 
@@ -602,7 +600,7 @@ msgstr "Ei voitu päivittää käyttäjää."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:191
 #: actions/newgroup.php:137 actions/profilesettings.php:273
-#: actions/register.php:206
+#: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "Tunnus on jo käytössä. Yritä toista tunnusta."
 
@@ -612,7 +610,7 @@ msgstr "Tunnus on jo käytössä. Yritä toista tunnusta."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:195
 #: actions/newgroup.php:141 actions/profilesettings.php:243
-#: actions/register.php:208
+#: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "Tuo ei ole kelvollinen tunnus."
 
@@ -625,7 +623,7 @@ msgstr "Tuo ei ole kelvollinen tunnus."
 #: actions/apigroupcreate.php:181 actions/editapplication.php:235
 #: actions/editgroup.php:202 actions/newapplication.php:221
 #: actions/newgroup.php:148 actions/profilesettings.php:248
-#: actions/register.php:215
+#: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "Kotisivun verkko-osoite ei ole toimiva."
 
@@ -635,7 +633,7 @@ msgstr "Kotisivun verkko-osoite ei ole toimiva."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:191 actions/editgroup.php:206
 #: actions/newgroup.php:152 actions/profilesettings.php:252
-#: actions/register.php:218
+#: actions/register.php:226
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "Koko nimi on liian pitkä (max 255 merkkiä)."
 
@@ -663,9 +661,9 @@ msgstr[1] "kuvaus on liian pitkä (max %d merkkiä)."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:215 actions/editgroup.php:218
 #: actions/newgroup.php:164 actions/profilesettings.php:265
-#: actions/register.php:227
+#: actions/register.php:235
 msgid "Location is too long (maximum 255 characters)."
-msgstr "Kotipaikka on liian pitkä (max 255 merkkiä)."
+msgstr "Kotipaikka on liian pitkä (enintään 255 merkkiä)."
 
 #. TRANS: Client error shown when providing too many aliases during group creation.
 #. TRANS: %d is the maximum number of allowed aliases.
@@ -686,7 +684,7 @@ msgstr[1] "Liikaa aliaksia. Maksimimäärä on %d."
 #: actions/apigroupcreate.php:253
 #, php-format
 msgid "Invalid alias: \"%s\"."
-msgstr "Virheellinen alias: \"%s\""
+msgstr "Virheellinen alias: %s"
 
 #. TRANS: Client error displayed when trying to use an alias during group creation that is already in use.
 #. TRANS: %s is the alias that is already in use.
@@ -719,14 +717,14 @@ msgstr "Ei löytynyt."
 #. TRANS: Server error displayed when trying to join a group the user is already a member of.
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:333
+#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:345
 msgid "You are already a member of that group."
 msgstr "Sinä kuulut jo tähän ryhmään."
 
 #. TRANS: Server error displayed when trying to join a group the user is blocked from joining.
 #. 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.
-#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:338
+#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:350
 msgid "You have been blocked from that group by the admin."
 msgstr "Sinut on estetty osallistumasta tähän ryhmään ylläpitäjän toimesta."
 
@@ -736,7 +734,7 @@ msgstr "Sinut on estetty osallistumasta tähän ryhmään ylläpitäjän toimest
 #. TRANS: %1$s is the joining user's nickname, $2$s is the group nickname for which the join failed.
 #. TRANS: Message given having failed to add a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:350
+#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:362
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "Käyttäjä %1$s ei voinut liittyä ryhmään %2$s."
@@ -753,7 +751,7 @@ msgstr "Sinä et kuulu tähän ryhmään."
 #. TRANS: Message given having failed to remove a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
 #: actions/apigroupleave.php:127 actions/leavegroup.php:133
-#: lib/command.php:398
+#: lib/command.php:410
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
 msgstr "Käyttäjä %s ei voinut liittyä ryhmään %s."
@@ -781,7 +779,7 @@ msgstr "Käyttäjän %s ryhmät"
 #: actions/apigrouplistall.php:93
 #, php-format
 msgid "groups on %s"
-msgstr "%s-käyttäjäryhmät"
+msgstr "sivun %s ryhmiä"
 
 #. TRANS: Client error displayed when uploading a media file has failed.
 #: actions/apimediaupload.php:101
@@ -813,21 +811,20 @@ msgstr "Pyyntötunniste on jo hyväksytty."
 #. TRANS: Form validation error message.
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
-#. TRANS: Client error displayed when the session token is not okay.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
 #: actions/deletenotice.php:177 actions/disfavor.php:75
 #: actions/emailsettings.php:291 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:65 actions/grouplogo.php:321
 #: actions/groupunblock.php:65 actions/imsettings.php:224
-#: actions/invite.php:60 actions/login.php:131 actions/makeadmin.php:66
+#: actions/invite.php:60 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
-#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:136
-#: actions/othersettings.php:155 actions/passwordsettings.php:137
+#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
+#: actions/othersettings.php:155 actions/passwordsettings.php:138
 #: actions/profilesettings.php:217 actions/recoverpassword.php:383
-#: actions/register.php:164 actions/remotesubscribe.php:76
+#: actions/register.php:172 actions/remotesubscribe.php:76
 #: actions/repeat.php:82 actions/smssettings.php:250 actions/subedit.php:40
-#: actions/subscribe.php:87 actions/tagother.php:166
-#: actions/unsubscribe.php:69 actions/userauthorization.php:53
+#: actions/subscribe.php:86 actions/tagother.php:166
+#: actions/unsubscribe.php:69 actions/userauthorization.php:52
 #: lib/designsettings.php:310
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
@@ -860,7 +857,7 @@ msgstr "Tietokantavirhe lisättäessä oauth_token_association-arvoa."
 #: actions/designadminpanel.php:100 actions/editapplication.php:144
 #: actions/emailsettings.php:310 actions/grouplogo.php:332
 #: actions/imsettings.php:239 actions/newapplication.php:124
-#: actions/oauthconnectionssettings.php:145 actions/recoverpassword.php:46
+#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
 #: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
 msgstr "Odottamaton lomakkeen lähetys."
@@ -884,9 +881,9 @@ msgid ""
 "account data. You should only give access to your %4$s account to third "
 "parties you trust."
 msgstr ""
-"Sovellus haluaa <strong>%3$s</strong>-käyttöoikeuden %4$s:n "
-"käyttäjätietoihisi. Sinun tulee sallia pääsy %4$s-tilillesi vain sellaisille "
-"kolmansille osapuolille, joihin luotat."
+"Sovellus haluaa <strong>%3$s</strong>-käyttöoikeuden tilin %4$s tietoihin. "
+"Salli pääsy tilillesi %4$s vain sellaisille kolmansille osapuolille, joihin "
+"luotat."
 
 #. TRANS: User notification of external application requesting account access.
 #. TRANS: %1$s is the application name requesting access, %2$s is the organisation behind the application,
@@ -898,10 +895,9 @@ msgid ""
 "the ability to <strong>%3$s</strong> your %4$s account data. You should only "
 "give access to your %4$s account to third parties you trust."
 msgstr ""
-"Sovellus <strong>%1$s</strong> tekijältä <strong>%2$s</strong> haluaa "
-"<strong>%3$s</strong>-käyttöoikeuden %4$s:n käyttäjätietoihisi. Sinun tulee "
-"sallia pääsy %4$s-tilillesi vain sellaisille kolmansille osapuolille, joihin "
-"luotat."
+"Tekijän <strong>%2$s</strong> sovellus <strong>%1$s</strong> haluaa <strong>%"
+"3$s</strong>-käyttöoikeuden tilin %4$s tietoihin. Salli pääsy tilillesi %4$s "
+"vain sellaisille kolmansille osapuolille, joihin luotat."
 
 #. TRANS: Fieldset legend.
 #: actions/apioauthauthorize.php:455
@@ -912,20 +908,19 @@ msgstr "Käyttäjätili"
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group nickname (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT for nick name in a profile.
-#: actions/apioauthauthorize.php:459 actions/login.php:242
-#: actions/profilesettings.php:106 actions/register.php:418
+#: actions/apioauthauthorize.php:459 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:432
 #: actions/showgroup.php:243 actions/tagother.php:94
-#: actions/userauthorization.php:152 lib/groupeditform.php:145
+#: actions/userauthorization.php:145 lib/groupeditform.php:145
 #: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "Tunnus"
 
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:463 actions/login.php:245
-#: actions/register.php:422 lib/accountsettingsaction.php:120
+#: actions/apioauthauthorize.php:463 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:120
 msgid "Password"
 msgstr "Salasana"
 
@@ -963,7 +958,7 @@ msgstr "Hyväksyminen peruttiin."
 #: actions/apioauthauthorize.php:598
 #, php-format
 msgid "The request token %s has been revoked."
-msgstr "Pyyntotunniste %s on nyt mitätöity."
+msgstr "Pyyntötunniste %s on nyt mitätöity."
 
 #. TRANS: Title of the page notifying the user that an anonymous client application was successfully authorized to access the user's account with OAuth.
 #: actions/apioauthauthorize.php:621
@@ -1020,13 +1015,13 @@ msgstr "Päivitystä ei ole."
 
 #. TRANS: Client error displayed trying to repeat an own notice through the API.
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:537
+#: actions/apistatusesretweet.php:83 lib/command.php:549
 msgid "Cannot repeat your own notice."
 msgstr "Et voi lähettää uudelleen omaa viestiäsi."
 
 #. TRANS: Client error displayed trying to re-repeat a notice through the API.
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:92 lib/command.php:543
+#: actions/apistatusesretweet.php:92 lib/command.php:555
 msgid "Already repeated that notice."
 msgstr "Tätä päivitystä ei voi poistaa."
 
@@ -1047,9 +1042,9 @@ msgstr "HTTP-metodia ei tueta."
 #. TRANS: Exception thrown requesting an unsupported notice output format.
 #. TRANS: %s is the requested output format.
 #: actions/apistatusesshow.php:144
-#, php-format
-msgid "Unsupported format: %s."
-msgstr "Formaattia %s ei ole tuettu."
+#, fuzzy, php-format
+msgid "Unsupported format: %s"
+msgstr "Formaatti %s ei ole tuettu."
 
 #. TRANS: Client error displayed requesting a deleted status.
 #: actions/apistatusesshow.php:155
@@ -1152,17 +1147,16 @@ msgstr ""
 "%1$s -päivitykset, jotka on vastauksia käyttäjän %2$s / %3$s päivityksiin."
 
 #. TRANS: Title for site timeline. %s is the StatusNet sitename.
-#. TRANS: Public RSS feed title. %s is the StatusNet site name.
 #: actions/apitimelinepublic.php:193 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "%s julkinen aikajana"
 
 #. TRANS: Subtitle for site timeline. %s is the StatusNet sitename.
-#: actions/apitimelinepublic.php:199
+#: actions/apitimelinepublic.php:199 actions/publicrss.php:105
 #, php-format
 msgid "%s updates from everyone!"
-msgstr "%s päivitykset kaikilta!"
+msgstr "Sivuston %s päivitykset kaikilta!"
 
 #. TRANS: Server error displayed calling unimplemented API method for 'retweeted by me'.
 #: actions/apitimelineretweetedbyme.php:71
@@ -1205,7 +1199,7 @@ msgstr "Vain käyttäjä voi lukea omaa postilaatikkoaan."
 #. TRANS: Client error displayed when using another format than AtomPub.
 #: actions/apitimelineuser.php:304
 msgid "Only accept AtomPub for Atom feeds."
-msgstr "Atom-syötteille tuetaan vain AtomPub-muotoa."
+msgstr "Atom-syötteistä tuetaan vain AtomPub-muotoa."
 
 #. TRANS: Client error displayed attempting to post an empty API notice.
 #: actions/apitimelineuser.php:311
@@ -1225,26 +1219,25 @@ msgid "Atom post must be an Atom entry."
 msgstr "Atom-viestin tulee olla Atom-kohteen muodossa."
 
 #. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
-#: actions/apitimelineuser.php:334
+#: actions/apitimelineuser.php:335
 msgid "Can only handle POST activities."
 msgstr "Vain POST-toiminnot ovat tuettuja."
 
 #. TRANS: Client error displayed when using an unsupported activity object type.
 #. TRANS: %s is the unsupported activity object type.
-#: actions/apitimelineuser.php:345
+#: actions/apitimelineuser.php:346
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr "Toiminto-objektityyppi \"%s\" ei ole tuettu."
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
 #. TRANS: %d is the notice ID (number).
-#: actions/apitimelineuser.php:379
+#: actions/apitimelineuser.php:380
 #, php-format
 msgid "No content for notice %d."
 msgstr "Päivityksen %d sisältö puuttuu."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#. TRANS: %s is the notice URI.
 #: actions/apitimelineuser.php:408
 #, fuzzy, php-format
 msgid "Notice with URI \"%s\" already exists."
@@ -1262,10 +1255,9 @@ msgstr "API-metodia ei löytynyt."
 
 #. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
 #. TRANS: Client exception.
-#. TRANS: Client error displayed trying to subscribe to a non-existing profile.
 #: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
 #: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
-#: actions/subscribe.php:110
+#: actions/subscribe.php:107
 msgid "No such profile."
 msgstr "Profiilia ei löydy."
 
@@ -1392,7 +1384,7 @@ msgstr "Et voi poistaa jonkin toisen käyttäjän suosikkia."
 #: actions/joingroup.php:95 actions/leavegroup.php:82
 #: actions/leavegroup.php:95 actions/makeadmin.php:86
 #: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:380
+#: lib/command.php:392
 msgid "No such group."
 msgstr "Tuota ryhmää ei ole."
 
@@ -1402,7 +1394,7 @@ msgid "Not a member."
 msgstr "Et ole jäsen."
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
-#: actions/atompubshowmembership.php:150
+#: actions/atompubshowmembership.php:151
 #, fuzzy
 msgid "Cannot delete someone else's membership."
 msgstr "Tilausta ei onnistuttu tallentamaan."
@@ -1507,11 +1499,9 @@ msgstr "Voit ladata oman profiilikuvasi. Maksimikoko on %s."
 
 #. TRANS: Server error displayed in avatar upload page when no matching profile can be found for a user.
 #. TRANS: Server error displayed coming across a request from a user without a profile.
-#. TRANS: Server error displayed when trying to authorise a remote subscription request
-#. TRANS: while the user has no profile.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
 #: actions/grouplogo.php:184 actions/remotesubscribe.php:190
-#: actions/userauthorization.php:75 actions/userrss.php:108
+#: actions/userauthorization.php:72 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr "Käyttäjällä ei ole profiilia."
 
@@ -1567,9 +1557,10 @@ msgstr "Rajaa"
 msgid "No file uploaded."
 msgstr "Profiilia ei ole määritelty."
 
-#. TRANS: Avatar upload form instruction after uploading a file.
+#. TRANS: Avatar upload form unstruction after uploading a file.
 #: actions/avatarsettings.php:345
-msgid "Pick a square area of the image to be your avatar."
+#, fuzzy
+msgid "Pick a square area of the image to be your avatar"
 msgstr "Valitse neliön muotoinen alue kuvasta profiilikuvaksi."
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
@@ -1597,7 +1588,7 @@ msgstr "Kuva poistettu."
 #. TRANS: Option in profile settings to create a backup of the account of the currently logged in user.
 #: actions/backupaccount.php:61 actions/profilesettings.php:467
 msgid "Backup account"
-msgstr "Varmuuskopioi tili"
+msgstr "Tilin varmuuskopiointi"
 
 #. TRANS: Client exception thrown when trying to backup an account while not logged in.
 #: actions/backupaccount.php:79
@@ -1610,7 +1601,7 @@ msgid "You may not backup your account."
 msgstr "Et voi varmuuskopioida käyttäjätiliäsi."
 
 #. TRANS: Information displayed on the backup account page.
-#: actions/backupaccount.php:225
+#: actions/backupaccount.php:227
 msgid ""
 "You can backup your account data in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format. This is an experimental feature and provides "
@@ -1620,20 +1611,21 @@ msgid ""
 msgstr ""
 "Voit varmuuskopioida käyttäjätilisi tiedot <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> -muodossa. Tämä on kokeellinen ominaisuus ja kaikkia "
-"tietoja ei voida välttämättä varmuuskopioida; yksityisiä tietoja, kuten "
+"tietoja ei välttämättä voida varmuuskopioida. Yksityisiä tietoja, kuten "
 "sähköposti- ja pikaviestiosoitteita ei voida varmuuskopioida. Myöskään "
 "lähetettyjä tiedostoja ja suoraviestejä ei varmuuskopioida."
 
 #. TRANS: Submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:248
+#: actions/backupaccount.php:250
 msgctxt "BUTTON"
 msgid "Backup"
 msgstr "Varmuuskopioi"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:252
-msgid "Backup your account."
-msgstr "Varmuuskopioi käyttäjätilisi."
+#: actions/backupaccount.php:254
+#, fuzzy
+msgid "Backup your account"
+msgstr "Varmuuskopioi käyttäjätili"
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
 #: actions/block.php:68
@@ -1673,7 +1665,8 @@ msgstr "Ei"
 
 #. TRANS: Submit button title for 'No' when blocking a user.
 #: actions/block.php:158
-msgid "Do not block this user."
+#, fuzzy
+msgid "Do not block this user"
 msgstr "Älä estä tätä käyttäjää."
 
 #. TRANS: Button label on the user block form.
@@ -1690,9 +1683,10 @@ msgid "Yes"
 msgstr "Kyllä"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:165
-msgid "Block this user."
-msgstr "Estä tämä käyttäjä."
+#. TRANS: Description of the form to block a user.
+#: actions/block.php:165 lib/blockform.php:79
+msgid "Block this user"
+msgstr "Estä tämä käyttäjä"
 
 #. TRANS: Server error displayed when blocking a user fails.
 #: actions/block.php:189
@@ -1704,14 +1698,14 @@ msgstr "Käyttäjän estotiedon tallennus epäonnistui."
 #: actions/blockedfromgroup.php:101
 #, php-format
 msgid "%s blocked profiles"
-msgstr "%s:n estetyt profiilit"
+msgstr "Ryhmän %s estetyt profiilit"
 
 #. TRANS: Title for any but the first page with list of users blocked from a group.
 #. TRANS: %1$s is a group nickname, %2$d is a page number.
 #: actions/blockedfromgroup.php:106
 #, php-format
 msgid "%1$s blocked profiles, page %2$d"
-msgstr "%1$s:n estetyt profiilit, sivu %2$d"
+msgstr "Ryhmän %1$s estetyt profiilit, sivu %2$d"
 
 #. TRANS: Instructions for list of users blocked from a group.
 #: actions/blockedfromgroup.php:122
@@ -1855,7 +1849,7 @@ msgstr ""
 #. TRANS: Field label for delete account confirmation entry.
 #. TRANS: Field label for password reset form where the password has to be typed again.
 #: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:262 actions/register.php:426
+#: actions/recoverpassword.php:262 actions/register.php:440
 msgid "Confirm"
 msgstr "Vahvista"
 
@@ -1884,14 +1878,14 @@ msgstr "Vahvistuskoodia ei löytynyt."
 #. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
 #: actions/deleteapplication.php:79 actions/editapplication.php:78
-#: actions/showapplication.php:90
+#: actions/showapplication.php:94
 msgid "You are not the owner of this application."
 msgstr "Et ole tämän sovelluksen omistaja."
 
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
-#: actions/newapplication.php:112 actions/showapplication.php:113
-#: lib/action.php:1422
+#: actions/newapplication.php:112 actions/showapplication.php:118
+#: lib/action.php:1425
 msgid "There was a problem with your session token."
 msgstr "Istuntoavaimesi kanssa oli ongelma."
 
@@ -1914,12 +1908,14 @@ msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting an application.
 #: actions/deleteapplication.php:161
-msgid "Do not delete this application."
+#, fuzzy
+msgid "Do not delete this application"
 msgstr "Älä poista tätä sovellusta."
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
 #: actions/deleteapplication.php:167
-msgid "Delete this application."
+#, fuzzy
+msgid "Delete this application"
 msgstr "Poista tämä sovellus."
 
 #. TRANS: Client error when trying to delete group while not logged in.
@@ -1974,12 +1970,14 @@ msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting a group.
 #: actions/deletegroup.php:224
-msgid "Do not delete this group."
+#, fuzzy
+msgid "Do not delete this group"
 msgstr "Älä poista tätä ryhmää."
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
 #: actions/deletegroup.php:231
-msgid "Delete this group."
+#, fuzzy
+msgid "Delete this group"
 msgstr "Poista tämä ryhmä."
 
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
@@ -1987,15 +1985,13 @@ msgstr "Poista tämä ryhmä."
 #. TRANS: Client error displayed when trying to mark a notice as favorite without being logged in.
 #. TRANS: Client error displayed trying to block a user from a group while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
-#. TRANS: Client error displayed trying to log out when not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
-#. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
 #. TRANS: Client error displayed when trying to change user options while not logged in.
 #: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
-#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:70
+#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
-#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:98
+#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
 #: lib/adminpanelaction.php:71 lib/profileformaction.php:63
 #: lib/settingsaction.php:72
@@ -2024,13 +2020,14 @@ msgstr "Oletko varma että haluat poistaa tämän päivityksen?"
 
 #. TRANS: Submit button title for 'No' when deleting a notice.
 #: actions/deletenotice.php:159
-msgid "Do not delete this notice."
+#, fuzzy
+msgid "Do not delete this notice"
 msgstr "Älä poista tätä päivitystä."
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:166
-msgid "Delete this notice."
-msgstr "Poista tämä päivitys."
+#: actions/deletenotice.php:166 lib/noticelist.php:673
+msgid "Delete this notice"
+msgstr "Poista tämä päivitys"
 
 #. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
 #: actions/deleteuser.php:66
@@ -2065,13 +2062,14 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting a user.
 #: actions/deleteuser.php:158
 #, fuzzy
-msgid "Do not delete this user."
+msgid "Do not delete this user"
 msgstr "Älä poista tätä päivitystä"
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
-#: actions/deleteuser.php:165
-msgid "Delete this user."
-msgstr "Poista tämä käyttäjä."
+#. TRANS: Description of form for deleting a user.
+#: actions/deleteuser.php:165 lib/deleteuserform.php:75
+msgid "Delete this user"
+msgstr "Poista käyttäjä"
 
 #. TRANS: Message used as title for design settings for the site.
 #. TRANS: Link description in user account settings menu.
@@ -2121,7 +2119,7 @@ msgstr "SSL-logo"
 #. TRANS: Fieldset legend for form change StatusNet site's theme.
 #: actions/designadminpanel.php:467
 msgid "Change theme"
-msgstr "Vaihda teema"
+msgstr "Teeman vaihto"
 
 #. TRANS: Field label for dropdown to choose site theme.
 #: actions/designadminpanel.php:485
@@ -2164,7 +2162,7 @@ msgstr "Tausta"
 msgid ""
 "You can upload a background image for the site. The maximum file size is %1"
 "$s."
-msgstr "Voit ladata ryhmälle taustakuvan. Maksimikoko on %1$s."
+msgstr "Voit ladata ryhmälle taustakuvan. Enimmäiskoko on %1$s."
 
 #. TRANS: Used as radio button label to add a background image.
 #: actions/designadminpanel.php:558
@@ -2235,19 +2233,25 @@ msgid "Use defaults"
 msgstr "Käytä oletusasetuksia"
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:720
-msgid "Restore default designs."
-msgstr "Palauta oletusulkonäkö."
+#. TRANS: Title for button on profile design page to reset all colour settings to default.
+#: actions/designadminpanel.php:720 lib/designsettings.php:259
+#, fuzzy
+msgid "Restore default designs"
+msgstr "Käytä oletusasetuksia"
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:728
-msgid "Reset back to default."
-msgstr "Palauta oletusulkoasu."
+#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
+#: actions/designadminpanel.php:728 lib/designsettings.php:267
+#, fuzzy
+msgid "Reset back to default"
+msgstr "Käytä oletusasetuksia"
 
 #. TRANS: Title for button for saving theme settings.
-#: actions/designadminpanel.php:736
-msgid "Save design."
-msgstr "Tallenna ulkoasu."
+#. TRANS: Title for button on profile design page to save settings.
+#: actions/designadminpanel.php:736 lib/designsettings.php:272
+#, fuzzy
+msgid "Save design"
+msgstr "Ryhmän ulkoasu"
 
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
 #: actions/disfavor.php:83
@@ -2280,7 +2284,7 @@ msgstr ""
 "Sinun pitää olla kirjautunut sisään, jotta voit muuttaa ryhmän tietoja."
 
 #. TRANS: Client error displayed trying to edit an application that does not exist.
-#: actions/editapplication.php:83 actions/showapplication.php:83
+#: actions/editapplication.php:83 actions/showapplication.php:87
 msgid "No such application."
 msgstr "Sovellusta ei ole."
 
@@ -2299,13 +2303,13 @@ msgstr "Nimi on pakollinen."
 #. TRANS: Validation error shown when providing too long a name in the "New application" form.
 #: actions/editapplication.php:188 actions/newapplication.php:172
 msgid "Name is too long (maximum 255 characters)."
-msgstr "Nimi on liian pitkä (max 255 merkkiä)."
+msgstr "Nimi on liian pitkä (enintään 255 merkkiä)."
 
 #. TRANS: Validation error shown when providing a name for an application that already exists in the "Edit application" form.
 #. TRANS: Validation error shown when providing a name for an application that already exists in the "New application" form.
 #: actions/editapplication.php:192 actions/newapplication.php:168
 msgid "Name already in use. Try another one."
-msgstr "Nimi on jo käytössä. Yritä jotain muuta nimeä."
+msgstr "Nimi on jo käytössä. Kokeile jotain muuta nimeä."
 
 #. TRANS: Validation error shown when not providing a description in the "Edit application" form.
 #. TRANS: Validation error shown when not providing a description in the "New application" form.
@@ -2316,7 +2320,7 @@ msgstr "Kuvaus on pakollinen."
 #. TRANS: Validation error shown when providing too long a source URL in the "Edit application" form.
 #: actions/editapplication.php:209
 msgid "Source URL is too long."
-msgstr "Lähteen osoite on liian pitkä."
+msgstr "Osoite on liian pitkä."
 
 #. TRANS: Validation error shown when providing an invalid source URL in the "Edit application" form.
 #. TRANS: Validation error shown when providing an invalid source URL in the "New application" form.
@@ -2565,7 +2569,7 @@ msgid "Cannot normalize that email address."
 msgstr "Ei voida normalisoida sähköpostiosoitetta"
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:393 actions/register.php:204
+#: actions/emailsettings.php:393 actions/register.php:212
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "Tuo ei ole kelvollinen sähköpostiosoite."
@@ -2641,21 +2645,18 @@ msgstr "Saapuvan sähköpostin osoitetta ei ole."
 
 #. 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.
 #: actions/emailsettings.php:530 actions/emailsettings.php:554
-#: actions/smssettings.php:566 actions/smssettings.php:591
+#: actions/smssettings.php:565 actions/smssettings.php:588
 msgid "Could not update user record."
 msgstr "Ei voitu päivittää käyttäjätietoja."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
-#. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:534 actions/smssettings.php:570
+#: actions/emailsettings.php:534 actions/smssettings.php:568
 msgid "Incoming email address removed."
 msgstr "Saapuvan sähköpostin osoite poistettu."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
-#. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:558 actions/smssettings.php:595
+#: actions/emailsettings.php:558 actions/smssettings.php:591
 msgid "New incoming email address added."
 msgstr "Uusi saapuvan sähköpostin osoite lisätty."
 
@@ -2666,8 +2667,9 @@ msgstr "Tämä päivitys on jo suosikki!"
 
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
 #: actions/favor.php:95
-msgid "Disfavor favorite."
-msgstr "Poista suosikeista."
+#, fuzzy
+msgid "Disfavor favorite"
+msgstr "Poista suosikeista"
 
 #. TRANS: Page title for first page of favorited notices.
 #. TRANS: Title for favourited notices section.
@@ -2902,12 +2904,14 @@ msgstr ""
 
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
 #: actions/groupblock.php:191
-msgid "Do not block this user from this group."
+#, fuzzy
+msgid "Do not block this user from this group"
 msgstr "Älä estä tätä käyttäjää tästä ryhmästä."
 
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
 #: actions/groupblock.php:198
-msgid "Block this user from this group."
+#, fuzzy
+msgid "Block this user from this group"
 msgstr "Estä tätä käyttäjää osallistumassa tähän ryhmään."
 
 #. TRANS: Server error displayed when trying to block a user from a group fails because of an application error.
@@ -2916,7 +2920,6 @@ msgid "Database error blocking user from group."
 msgstr "Tietokantavirhe estettäessä käyttäjää ryhmästä."
 
 #. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
-#. TRANS: Client error displayed trying to find a user by ID without providing an ID.
 #: actions/groupbyid.php:73 actions/userbyid.php:70
 #, fuzzy
 msgid "No ID."
@@ -3099,10 +3102,8 @@ msgid "Group search"
 msgstr "Ryhmähaku"
 
 #. TRANS: Text on page where groups can be searched if no results were found for a query.
-#. TRANS: Text for notice search results is the query had no results.
-#. TRANS: Message on the "People search" page where a query has no results.
-#: actions/groupsearch.php:82 actions/noticesearch.php:122
-#: actions/peoplesearch.php:87
+#: actions/groupsearch.php:82 actions/noticesearch.php:117
+#: actions/peoplesearch.php:83
 msgid "No results."
 msgstr "Ei tuloksia"
 
@@ -3135,7 +3136,6 @@ msgid "User is not blocked from group."
 msgstr "Käyttäjää ei ole estetty ryhmästä."
 
 #. TRANS: Server error displayed when unblocking a user from a group fails because of an unknown error.
-#. TRANS: Server error displayed when removing a user block.
 #: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "Tapahtui virhe, kun estoa poistettiin."
@@ -3233,8 +3233,7 @@ msgid "Publish a MicroID for my Jabber/Google Talk address."
 msgstr "Julkaise MicroID Jabber/GTalk-osoitteelleni."
 
 #. TRANS: Confirmation message for successful Instant Messaging preferences save.
-#. TRANS: Confirmation message after saving preferences.
-#: actions/imsettings.php:283 actions/othersettings.php:193
+#: actions/imsettings.php:283 actions/othersettings.php:192
 msgid "Preferences saved."
 msgstr "Asetukset tallennettu."
 
@@ -3531,7 +3530,7 @@ msgstr "Sinun pitää olla kirjautunut sisään, jotta voit erota ryhmästä."
 
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
-#: actions/leavegroup.php:103 lib/command.php:386
+#: actions/leavegroup.php:103 lib/command.php:398
 msgid "You are not a member of that group."
 msgstr "Sinä et kuulu tähän ryhmään."
 
@@ -3655,44 +3654,42 @@ msgstr "Tallenna"
 msgid "Save license settings"
 msgstr ""
 
-#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
-#: actions/login.php:97 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
 msgid "Already logged in."
 msgstr "Olet jo kirjautunut sisään."
 
-#: actions/login.php:142
+#: actions/login.php:148
 msgid "Incorrect username or password."
 msgstr "Väärä käyttäjätunnus tai salasana"
 
-#. TRANS: Server error displayed when a user object could not be created trying to login using "one time password login".
-#: actions/login.php:148 actions/otp.php:127
+#: actions/login.php:154 actions/otp.php:120
 #, fuzzy
 msgid "Error setting user. You are probably not authorized."
 msgstr "Sinulla ei ole valtuutusta tähän."
 
-#: actions/login.php:202 actions/login.php:253
+#: actions/login.php:210 actions/login.php:263
 msgid "Login"
 msgstr "Kirjaudu sisään"
 
-#: actions/login.php:239
+#: actions/login.php:249
 msgid "Login to site"
 msgstr "Kirjaudu sisään"
 
-#: actions/login.php:248 actions/register.php:476
+#: actions/login.php:258 actions/register.php:490
 msgid "Remember me"
 msgstr "Muista minut"
 
-#: actions/login.php:249 actions/register.php:478
+#: actions/login.php:259 actions/register.php:492
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 "Kirjaudu sisään automaattisesti tulevaisuudessa; ei tietokoneille joilla "
 "useampi käyttäjä!"
 
-#: actions/login.php:259
+#: actions/login.php:269
 msgid "Lost or forgotten password?"
 msgstr "Oletko hukannut tai unohtanut salasanasi?"
 
-#: actions/login.php:277
+#: actions/login.php:288
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -3700,12 +3697,12 @@ msgstr ""
 "Syötä turvallisuussyistä käyttäjätunnuksesi ja salasanasi uudelleen ennen "
 "asetuksiesi muuttamista."
 
-#: actions/login.php:281
+#: actions/login.php:292
 #, fuzzy
 msgid "Login with your username and password."
 msgstr "Kirjaudu sisään käyttäjätunnuksella ja salasanalla"
 
-#: actions/login.php:284
+#: actions/login.php:295
 #, fuzzy, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -3792,14 +3789,14 @@ msgid "New message"
 msgstr "Uusi viesti"
 
 #. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
-#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:501
+#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:513
 msgid "You can't send a message to this user."
 msgstr "Et voi lähettää viestiä tälle käyttäjälle."
 
 #. TRANS: Command exception text shown when trying to send a direct message to another user without content.
 #. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
-#: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:478
-#: lib/command.php:581
+#: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:490
+#: lib/command.php:593
 msgid "No content!"
 msgstr "Ei sisältöä!"
 
@@ -3808,7 +3805,7 @@ msgid "No recipient specified."
 msgstr "Vastaanottajaa ei ole määritelty."
 
 #. TRANS: Error text shown when trying to send a direct message to self.
-#: actions/newmessage.php:167 lib/command.php:505
+#: actions/newmessage.php:167 lib/command.php:517
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr "Älä lähetä viestiä itsellesi, vaan kuiskaa se vain hiljaa itsellesi."
@@ -3819,7 +3816,7 @@ msgstr "Viesti lähetetty"
 
 #. TRANS: Message given have sent a direct message to another user.
 #. TRANS: %s is the name of the other user.
-#: actions/newmessage.php:188 lib/command.php:513
+#: actions/newmessage.php:188 lib/command.php:525
 #, fuzzy, php-format
 msgid "Direct message to %s sent."
 msgstr "Suora viesti käyttäjälle %s lähetetty"
@@ -3836,9 +3833,7 @@ msgstr "Uusi päivitys"
 msgid "Notice posted"
 msgstr "Päivitys lähetetty"
 
-#. TRANS: Instructions for Notice search page.
-#. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/noticesearch.php:69
+#: actions/noticesearch.php:68
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -3847,21 +3842,16 @@ msgstr ""
 "Hae päivityksiä palvelun %%site.name%% sisällöistä. Erota hakutermit "
 "välilyönnillä; hakutermien pitää olla 3 tai useamman merkin pituisia."
 
-#. TRANS: Title of the page where users can search for notices.
-#: actions/noticesearch.php:80
+#: actions/noticesearch.php:78
 msgid "Text search"
 msgstr "Tekstihaku"
 
-#. TRANS: Test in RSS notice search.
-#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearch.php:95
+#: actions/noticesearch.php:91
 #, php-format
 msgid "Search results for \"%1$s\" on %2$s"
 msgstr "Viesti käyttäjältä %1$s, %2$s"
 
-#. TRANS: Text for logged in users making a query for notices without results.
-#. TRANS: This message contains a Markdown link.
-#: actions/noticesearch.php:128
+#: actions/noticesearch.php:121
 #, php-format
 msgid ""
 "Be the first to [post on this topic](%%%%action.newnotice%%%%?"
@@ -3870,9 +3860,7 @@ msgstr ""
 "Ole ensimmäinen joka [lähettää päivityksen tästä aiheesta](%%%%action."
 "newnotice%%%%?status_textarea=%s)!"
 
-#. TRANS: Text for not logged in users making a query for notices without results.
-#. TRANS: This message contains Markdown links.
-#: actions/noticesearch.php:133
+#: actions/noticesearch.php:124
 #, fuzzy, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and be the first to "
@@ -3881,17 +3869,14 @@ msgstr ""
 "Ole ensimmäinen joka [lähettää päivityksen tästä aiheesta](%%%%action."
 "newnotice%%%%?status_textarea=%s)!"
 
-#. TRANS: RSS notice search feed title. %s is the query.
-#: actions/noticesearchrss.php:95
+#: actions/noticesearchrss.php:96
 #, fuzzy, php-format
 msgid "Updates with \"%s\""
 msgstr "Käyttäjän %1$s päivitykset palvelussa %2$s!"
 
-#. TRANS: RSS notice search feed description.
-#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearchrss.php:99
+#: actions/noticesearchrss.php:98
 #, fuzzy, php-format
-msgid "Updates matching search term \"%1$s\" on %2$s."
+msgid "Updates matching search term \"%1$s\" on %2$s!"
 msgstr "Käyttäjän %1$s päivitykset palvelussa %2$s!"
 
 #: actions/nudge.php:85
@@ -3936,31 +3921,31 @@ msgid "You have not registered any applications yet."
 msgstr ""
 
 #. TRANS: Title for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:70
+#: actions/oauthconnectionssettings.php:71
 msgid "Connected applications"
 msgstr ""
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:81
+#: actions/oauthconnectionssettings.php:83
 msgid "The following connections exist for your account."
 msgstr ""
 
 #. TRANS: Client error when trying to revoke access for an application while not being a user of it.
-#: actions/oauthconnectionssettings.php:166
+#: actions/oauthconnectionssettings.php:168
 #, fuzzy
 msgid "You are not a user of that application."
 msgstr "Sinä et kuulu tähän ryhmään."
 
 #. TRANS: Client error when revoking access has failed for some reason.
 #. TRANS: %s is the application ID revoking access failed for.
-#: actions/oauthconnectionssettings.php:181
+#: actions/oauthconnectionssettings.php:183
 #, fuzzy, php-format
 msgid "Unable to revoke access for application: %s."
 msgstr "Käytä tätä lomaketta muokataksesi ryhmää."
 
 #. TRANS: Success message after revoking access for an application.
 #. TRANS: %1$s is the application name, %2$s is the first part of the user token.
-#: actions/oauthconnectionssettings.php:200
+#: actions/oauthconnectionssettings.php:202
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -3968,30 +3953,20 @@ msgid ""
 msgstr ""
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:211
+#: actions/oauthconnectionssettings.php:213
 msgid "You have not authorized any applications to use your account."
 msgstr ""
 
 #. TRANS: Note for developers in the OAuth connection settings form.
 #. TRANS: This message contains a Markdown link. Do not separate "](".
 #. TRANS: %s is the URL to the OAuth settings.
-#: actions/oauthconnectionssettings.php:231
+#: actions/oauthconnectionssettings.php:233
 #, php-format
 msgid ""
 "Are you a developer? [Register an OAuth client application](%s) to use with "
 "this instance of StatusNet."
 msgstr ""
 
-#: actions/oembed.php:64
-#, fuzzy, php-format
-msgid "\"%s\" not found."
-msgstr "API-metodia ei löytynyt."
-
-#: actions/oembed.php:76
-#, fuzzy, php-format
-msgid "Notice %s not found."
-msgstr "API-metodia ei löytynyt."
-
 #: actions/oembed.php:80 actions/shownotice.php:100
 msgid "Notice has no profile."
 msgstr "Käyttäjällä ei ole profiilia."
@@ -4001,16 +3976,6 @@ msgstr "Käyttäjällä ei ole profiilia."
 msgid "%1$s's status on %2$s"
 msgstr "Käyttäjän %1$s päivitys %2$s"
 
-#: actions/oembed.php:95
-#, fuzzy, php-format
-msgid "Attachment %s not found."
-msgstr "Vastaanottajaa ei löytynyt."
-
-#: actions/oembed.php:136
-#, php-format
-msgid "\"%s\" not supported for oembed requests."
-msgstr ""
-
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
 #: actions/oembed.php:168
 #, fuzzy, php-format
@@ -4029,12 +3994,11 @@ msgstr ""
 msgid "Not a supported data format."
 msgstr "Tuo ei ole tuettu tietomuoto."
 
-#. TRANS: ShortName in the OpenSearch interface when trying to find users.
 #: actions/opensearch.php:64
 msgid "People Search"
 msgstr "Etsi ihmisiä"
 
-#: actions/opensearch.php:68
+#: actions/opensearch.php:67
 msgid "Notice Search"
 msgstr "Etsi Päivityksistä"
 
@@ -4082,50 +4046,41 @@ msgstr "Näytä tai piillota profiilin ulkoasu."
 msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr "URL-lyhennyspalvelun nimi on liian pitkä (max 50 merkkiä)."
 
-#. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
-#: actions/otp.php:70
+#: actions/otp.php:69
 #, fuzzy
 msgid "No user ID specified."
 msgstr "Ryhmää ei ole määritelty."
 
-#. TRANS: Client error displayed trying to use "one time password login" without specifying a login token.
-#: actions/otp.php:86
+#: actions/otp.php:83
 #, fuzzy
 msgid "No login token specified."
 msgstr "Profiilia ei ole määritelty."
 
-#. TRANS: Client error displayed trying to use "one time password login" without requesting a login token.
-#: actions/otp.php:94
+#: actions/otp.php:90
 msgid "No login token requested."
 msgstr "Ei valtuutuspyyntöä!"
 
-#. TRANS: Client error displayed trying to use "one time password login" while specifying an invalid login token.
-#: actions/otp.php:100
+#: actions/otp.php:95
 #, fuzzy
 msgid "Invalid login token specified."
 msgstr "Päivityksen sisältö ei kelpaa"
 
-#. TRANS: Client error displayed trying to use "one time password login" while specifying an expired login token.
-#: actions/otp.php:110
+#: actions/otp.php:104
 #, fuzzy
 msgid "Login token expired."
 msgstr "Kirjaudu sisään"
 
-#. TRANS: Title for outbox for any but the fist page.
-#. TRANS: %1$s is the user nickname, %2$d is the page number.
-#: actions/outbox.php:57
+#: actions/outbox.php:58
 #, fuzzy, php-format
 msgid "Outbox for %1$s - page %2$d"
 msgstr "Käyttäjän %s lähetetyt viestit"
 
-#. TRANS: Title for first page of outbox.
 #: actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
 msgstr "Käyttäjän %s lähetetyt viestit"
 
-#. TRANS: Instructions for outbox.
-#: actions/outbox.php:103
+#: actions/outbox.php:104
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr "Tämä on postilaatikkosi, jossa on lähettämäsi yksityisviestit."
 
@@ -4151,45 +4106,43 @@ msgstr "Vanha salasana"
 msgid "New password"
 msgstr "Uusi salasana"
 
-#: actions/passwordsettings.php:109 actions/register.php:423
+#: actions/passwordsettings.php:109
 #, fuzzy
-msgid "6 or more characters."
+msgid "6 or more characters"
 msgstr "6 tai useampia merkkejä"
 
-#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:264
-#: actions/register.php:427
+#: actions/passwordsettings.php:113
 #, fuzzy
-msgid "Same as password above."
+msgid "Same as password above"
 msgstr "Sama kuin ylläoleva salasana"
 
 #: actions/passwordsettings.php:117
 msgid "Change"
 msgstr "Vaihda"
 
-#: actions/passwordsettings.php:153 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:238
 msgid "Password must be 6 or more characters."
 msgstr "Salasanassa pitää olla 6 tai useampia merkkejä."
 
-#: actions/passwordsettings.php:156 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:241
 msgid "Passwords don't match."
 msgstr "Salasanat eivät täsmää."
 
-#: actions/passwordsettings.php:164
+#: actions/passwordsettings.php:165
 msgid "Incorrect old password"
 msgstr "Väärä vanha salasana"
 
-#: actions/passwordsettings.php:180
+#: actions/passwordsettings.php:181
 msgid "Error saving user; invalid."
 msgstr "Virhe tapahtui käyttäjän tallentamisessa; epäkelpo."
 
-#. TRANS: Reset password form validation error message.
-#: actions/passwordsettings.php:185 actions/recoverpassword.php:418
+#: actions/passwordsettings.php:186
 #, fuzzy
-msgid "Cannot save new password."
+msgid "Can't save new password."
 msgstr "Uutta salasanaa ei voida tallentaa."
 
-#: actions/passwordsettings.php:191
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
 msgid "Password saved."
 msgstr "Salasana tallennettu."
 
@@ -4486,9 +4439,7 @@ msgstr ""
 msgid "Save paths"
 msgstr "Palvelun ilmoitus"
 
-#. TRANS: Instructions for the "People search" page.
-#. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/peoplesearch.php:54
+#: actions/peoplesearch.php:52
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
@@ -4498,8 +4449,7 @@ msgstr ""
 "kiinnostuksen kohteista. Erota hakutermit välilyönnillä; hakutermien pitää "
 "olla 3 tai useamman merkin pituisia."
 
-#. TRANS: Title of a page where users can search for other users.
-#: actions/peoplesearch.php:61
+#: actions/peoplesearch.php:58
 msgid "People search"
 msgstr "Etsi ihmisiä"
 
@@ -4541,7 +4491,7 @@ msgid "Profile information"
 msgstr "Profiilitieto"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109 actions/register.php:419
+#: actions/profilesettings.php:109 actions/register.php:433
 #, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr ""
@@ -4551,7 +4501,7 @@ msgstr ""
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for full group name (dt). Text hidden by default.
 #. TRANS: DT for full name in a profile.
-#: actions/profilesettings.php:113 actions/register.php:441
+#: actions/profilesettings.php:113 actions/register.php:455
 #: actions/showgroup.php:255 actions/tagother.php:104
 #: lib/groupeditform.php:150 lib/userprofile.php:156
 msgid "Full name"
@@ -4559,13 +4509,13 @@ msgstr "Koko nimi"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:118 actions/register.php:446
+#: actions/profilesettings.php:118 actions/register.php:460
 #: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "Kotisivu"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:121 actions/register.php:448
+#: actions/profilesettings.php:121
 #, fuzzy
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr "Kotisivusi, blogisi tai toisella sivustolla olevan profiilisi osoite."
@@ -4573,7 +4523,7 @@ msgstr "Kotisivusi, blogisi tai toisella sivustolla olevan profiilisi osoite."
 #. TRANS: Tooltip for field label in form for profile settings. Plural
 #. TRANS: is decided by the number of characters available for the
 #. TRANS: biography (%d).
-#: actions/profilesettings.php:129 actions/register.php:457
+#: actions/profilesettings.php:129 actions/register.php:471
 #, fuzzy, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4581,29 +4531,28 @@ msgstr[0] "Kuvaile itseäsi ja kiinnostuksen kohteitasi %d merkillä"
 msgstr[1] "Kuvaile itseäsi ja kiinnostuksen kohteitasi %d merkillä"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:135 actions/register.php:462
+#: actions/profilesettings.php:135 actions/register.php:476
 msgid "Describe yourself and your interests"
 msgstr "Kuvaile itseäsi ja kiinnostuksen kohteitasi"
 
 #. TRANS: Text area label in form for profile settings where users can provide.
 #. TRANS: their biography.
-#: actions/profilesettings.php:139 actions/register.php:464
+#: actions/profilesettings.php:139 actions/register.php:478
 msgid "Bio"
 msgstr "Tietoja"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group location (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT for location in a profile.
-#: actions/profilesettings.php:145 actions/register.php:469
+#: actions/profilesettings.php:145 actions/register.php:483
 #: actions/showgroup.php:265 actions/tagother.php:112
-#: actions/userauthorization.php:174 lib/groupeditform.php:173
+#: actions/userauthorization.php:166 lib/groupeditform.php:173
 #: lib/userprofile.php:172
 msgid "Location"
 msgstr "Kotipaikka"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148
+#: actions/profilesettings.php:148 actions/register.php:485
 #, fuzzy
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Olinpaikka kuten \"Kaupunki, Maakunta (tai Lääni), Maa\""
@@ -4625,8 +4574,7 @@ msgstr "Tagit"
 #: actions/profilesettings.php:164
 #, fuzzy
 msgid ""
-"Tags for yourself (letters, numbers, -, ., and _), comma- or space- "
-"separated."
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr ""
 "Kuvaa itseäsi henkilötageilla (sanoja joissa voi olla muita kirjaimia kuin "
 "ääkköset, numeroita, -, ., ja _), pilkulla tai välilyönnillä erotettuna"
@@ -4639,7 +4587,7 @@ msgstr "Kieli"
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
 #: actions/profilesettings.php:171
 #, fuzzy
-msgid "Preferred language."
+msgid "Preferred language"
 msgstr "Ensisijainen kieli"
 
 #. TRANS: Dropdownlist label in form for profile settings.
@@ -4656,7 +4604,7 @@ msgstr "Millä aikavyöhykkeellä olet tavallisesti?"
 #: actions/profilesettings.php:189
 #, fuzzy
 msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)."
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr ""
 "Tilaa automaattisesti kaikki, jotka tilaavat päivitykseni (ei sovi hyvin "
 "ihmiskäyttäjille)"
@@ -4664,7 +4612,7 @@ msgstr ""
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Plural form is used based on the maximum number of allowed
 #. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:258 actions/register.php:221
+#: actions/profilesettings.php:258 actions/register.php:229
 #, fuzzy, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4684,9 +4632,9 @@ msgstr "Kieli on liian pitkä (enintään 50 merkkiä)."
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:291
-#, fuzzy, php-format
-msgid "Invalid tag: \"%s\"."
+#: actions/profilesettings.php:291 actions/tagother.php:178
+#, php-format
+msgid "Invalid tag: \"%s\""
 msgstr "Virheellinen tagi: \"%s\""
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
@@ -4788,12 +4736,6 @@ msgstr ""
 "Tämä on %%site.name%%, [mikroblogaus](http://en.wikipedia.org/wiki/Micro-"
 "blogging)palvelu "
 
-#. TRANS: Public RSS feed description. %s is the StatusNet site name.
-#: actions/publicrss.php:106
-#, fuzzy, php-format
-msgid "%s updates from everyone."
-msgstr "%s päivitykset kaikilta!"
-
 #. TRANS: Title for public tag cloud.
 #: actions/publictagcloud.php:57
 msgid "Public tag cloud"
@@ -4931,12 +4873,6 @@ msgstr "Salasanan palautus"
 msgid "Password recovery requested"
 msgstr "Salasanan palautuspyyntö lähetetty."
 
-#. TRANS: Title for password recovery page in password saved mode.
-#: actions/recoverpassword.php:229
-#, fuzzy
-msgid "Password saved"
-msgstr "Salasana tallennettu."
-
 #. TRANS: Title for password recovery page when an unknown action has been specified.
 #: actions/recoverpassword.php:232
 msgid "Unknown action"
@@ -4948,6 +4884,12 @@ msgstr "Tuntematon toiminto"
 msgid "6 or more characters, and do not forget it!"
 msgstr "6 tai useampia merkkejä äläkä unohda mitä kirjoitit!"
 
+#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#: actions/recoverpassword.php:264 actions/register.php:441
+#, fuzzy
+msgid "Same as password above."
+msgstr "Sama kuin ylläoleva salasana"
+
 #. TRANS: Button text for password reset form.
 #. TRANS: Button text on profile design page to reset all colour settings to default without saving.
 #: actions/recoverpassword.php:268 lib/designsettings.php:264
@@ -5001,8 +4943,14 @@ msgstr "Salasanassa pitää olla 6 tai useampia merkkejä."
 msgid "Password and confirmation do not match."
 msgstr "Salasana ja salasanan vahvistus eivät täsmää."
 
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:418
+#, fuzzy
+msgid "Cannot save new password."
+msgstr "Uutta salasanaa ei voida tallentaa."
+
 #. TRANS: Server error displayed when something does wrong with the user object during password reset.
-#: actions/recoverpassword.php:426 actions/register.php:248
+#: actions/recoverpassword.php:426 actions/register.php:256
 msgid "Error setting user."
 msgstr "Virhe tapahtui käyttäjän asettamisessa."
 
@@ -5012,91 +4960,96 @@ msgid "New password successfully saved. You are now logged in."
 msgstr ""
 "Uusi salasana tallennettiin onnistuneesti. Olet nyt kirjautunut sisään."
 
-#: actions/register.php:87 actions/register.php:188 actions/register.php:399
+#: actions/register.php:92 actions/register.php:196 actions/register.php:413
 msgid "Sorry, only invited people can register."
 msgstr "Valitettavasti vain kutsutut ihmiset voivat rekisteröityä."
 
-#: actions/register.php:94
+#: actions/register.php:99
 msgid "Sorry, invalid invitation code."
 msgstr "Virheellinen kutsukoodin."
 
-#: actions/register.php:113
+#: actions/register.php:119
 msgid "Registration successful"
 msgstr "Rekisteröityminen onnistui"
 
-#: actions/register.php:115 actions/register.php:497
+#: actions/register.php:121 actions/register.php:511
 msgid "Register"
 msgstr "Rekisteröidy"
 
-#: actions/register.php:135
+#: actions/register.php:142
 msgid "Registration not allowed."
 msgstr "Rekisteröityminen ei ole sallittu."
 
-#: actions/register.php:201
+#: actions/register.php:209
 #, fuzzy
-msgid "You cannot register if you don't agree to the license."
+msgid "You can't register if you don't agree to the license."
 msgstr "Et voi rekisteröityä, jos et hyväksy lisenssiehtoja."
 
-#: actions/register.php:210
+#: actions/register.php:218
 msgid "Email address already exists."
 msgstr "Sähköpostiosoite on jo käytössä."
 
-#: actions/register.php:243 actions/register.php:265
+#: actions/register.php:251 actions/register.php:273
 msgid "Invalid username or password."
 msgstr "Käyttäjätunnus tai salasana ei kelpaa."
 
-#: actions/register.php:340
+#: actions/register.php:351
 msgid ""
 "With this form you can create a new account. You can then post notices and "
-"link up to friends and colleagues."
+"link up to friends and colleagues. "
 msgstr ""
 
+#: actions/register.php:437
+#, fuzzy
+msgid "6 or more characters."
+msgstr "6 tai useampia merkkejä"
+
 #. TRANS: Link description in user account settings menu.
-#: actions/register.php:431 actions/register.php:435
+#: actions/register.php:445 actions/register.php:449
 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
 msgid "Email"
 msgstr "Sähköposti"
 
-#: actions/register.php:432 actions/register.php:436
+#: actions/register.php:446 actions/register.php:450
 #, fuzzy
-msgid "Used only for updates, announcements, and password recovery."
+msgid "Used only for updates, announcements, and password recovery"
 msgstr ""
 "Käytetään ainoastaan päivityksien lähettämiseen, ilmoitusasioihin ja "
 "salasanan uudelleen käyttöönottoon."
 
-#: actions/register.php:443
+#: actions/register.php:457
 #, fuzzy
-msgid "Longer name, preferably your \"real\" name."
+msgid "Longer name, preferably your \"real\" name"
 msgstr "Pitempi nimi, mieluiten oikea nimesi"
 
-#: actions/register.php:471
+#: actions/register.php:462
 #, fuzzy
-msgid "Where you are, like \"City, State (or Region), Country\"."
-msgstr "Olinpaikka kuten \"Kaupunki, Maakunta (tai Lääni), Maa\""
+msgid "URL of your homepage, blog, or profile on another site"
+msgstr "Kotisivusi, blogisi tai toisella sivustolla olevan profiilisi osoite."
 
-#: actions/register.php:510
+#: actions/register.php:523
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
 msgstr ""
 
-#: actions/register.php:520
+#: actions/register.php:533
 #, php-format
 msgid "My text and files are copyright by %1$s."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:524
+#: actions/register.php:537
 msgid "My text and files remain under my own copyright."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:527
+#: actions/register.php:540
 msgid "All rights reserved."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:532
+#: actions/register.php:545
 #, fuzzy, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -5105,7 +5058,7 @@ msgstr ""
 "poislukien yksityinen tieto: salasana, sähköpostiosoite, IM-osoite, "
 "puhelinnumero."
 
-#: actions/register.php:573
+#: actions/register.php:588
 #, fuzzy, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -5138,7 +5091,7 @@ msgstr ""
 "\n"
 "Kiitokset rekisteröitymisestäsi ja toivomme että pidät palvelustamme."
 
-#: actions/register.php:597
+#: actions/register.php:612
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5172,7 +5125,7 @@ msgstr "Käyttäjätunnus"
 
 #: actions/remotesubscribe.php:129
 #, fuzzy
-msgid "Nickname of the user you want to follow."
+msgid "Nickname of the user you want to follow"
 msgstr "Käyttäjän, jota haluat seurata, käyttäjätunnus"
 
 #: actions/remotesubscribe.php:132
@@ -5181,7 +5134,7 @@ msgstr "Profiilin URL"
 
 #: actions/remotesubscribe.php:133
 #, fuzzy
-msgid "URL of your profile on another compatible microblogging service."
+msgid "URL of your profile on another compatible microblogging service"
 msgstr "Profiilisi URL-osoite toisessa yhteensopivassa mikroblogauspalvelussa"
 
 #. TRANS: Link text for link that will subscribe to a remote profile.
@@ -5192,7 +5145,7 @@ msgstr "Tilaa"
 
 #: actions/remotesubscribe.php:158
 #, fuzzy
-msgid "Invalid profile URL (bad format)."
+msgid "Invalid profile URL (bad format)"
 msgstr "Profiilin URL-osoite '%s' ei kelpaa (virheellinen muoto)."
 
 #: actions/remotesubscribe.php:167
@@ -5242,7 +5195,6 @@ msgstr "Luotu"
 msgid "Repeated!"
 msgstr "Luotu"
 
-#. TRANS: RSS reply feed title. %s is a user nickname.
 #. TRANS: Tooltip for personal group navigation menu option when logged in for viewing @-replies.
 #: actions/replies.php:126 actions/repliesrss.php:68
 #: lib/personalgroupnav.php:109
@@ -5295,11 +5247,9 @@ msgstr ""
 "Ole ensimmäinen joka [lähettää päivityksen tästä aiheesta](%%%%action."
 "newnotice%%%%?status_textarea=%s)!"
 
-#. TRANS: RSS reply feed description.
-#. TRANS: %1$s is a user nickname, %2$s is the StatusNet site name.
-#: actions/repliesrss.php:74
+#: actions/repliesrss.php:72
 #, fuzzy, php-format
-msgid "Replies to %1$s on %2$s."
+msgid "Replies to %1$s on %2$s!"
 msgstr "Viesti käyttäjälle %1$s, %2$s"
 
 #. TRANS: Client exception displayed when trying to restore an account while not logged in.
@@ -5400,7 +5350,7 @@ msgstr "Päivityksesi tähän palveluun on estetty."
 msgid "User doesn't have this role."
 msgstr "Käyttäjälle ei löydy profiilia"
 
-#: actions/rsd.php:142 actions/version.php:159
+#: actions/rsd.php:146 actions/version.php:159
 #, fuzzy
 msgid "StatusNet"
 msgstr "Päivitys poistettu."
@@ -5446,97 +5396,97 @@ msgstr ""
 msgid "Save site settings"
 msgstr "Profiilikuva-asetukset"
 
-#: actions/showapplication.php:78
+#: actions/showapplication.php:82
 #, fuzzy
 msgid "You must be logged in to view an application."
 msgstr "Sinun pitää olla kirjautunut sisään, jotta voit erota ryhmästä."
 
-#: actions/showapplication.php:151
+#: actions/showapplication.php:157
 #, fuzzy
 msgid "Application profile"
 msgstr "Päivitykselle ei ole profiilia"
 
 #. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:153 lib/applicationeditform.php:177
+#: actions/showapplication.php:159 lib/applicationeditform.php:177
 msgid "Icon"
 msgstr ""
 
 #. TRANS: Form input field label for application name.
-#: actions/showapplication.php:163 actions/version.php:197
+#: actions/showapplication.php:169 actions/version.php:197
 #: lib/applicationeditform.php:190
 #, fuzzy
 msgid "Name"
 msgstr "Tunnus"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:172 lib/applicationeditform.php:227
+#: actions/showapplication.php:178 lib/applicationeditform.php:227
 #, fuzzy
 msgid "Organization"
 msgstr "Sivutus"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:181 actions/version.php:200
+#: actions/showapplication.php:187 actions/version.php:200
 #: lib/applicationeditform.php:208 lib/groupeditform.php:168
 msgid "Description"
 msgstr "Kuvaus"
 
 #. TRANS: Header for group statistics on a group page (h2).
 #. TRANS: H2 text for user statistics.
-#: actions/showapplication.php:186 actions/showgroup.php:460
+#: actions/showapplication.php:192 actions/showgroup.php:460
 #: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "Tilastot"
 
-#: actions/showapplication.php:197
+#: actions/showapplication.php:203
 #, php-format
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr ""
 
-#: actions/showapplication.php:207
+#: actions/showapplication.php:213
 msgid "Application actions"
 msgstr ""
 
-#: actions/showapplication.php:230
+#: actions/showapplication.php:236
 msgid "Reset key & secret"
 msgstr ""
 
 #. TRANS: Title of form for deleting a user.
-#: actions/showapplication.php:246 lib/deletegroupform.php:121
+#: actions/showapplication.php:252 lib/deletegroupform.php:121
 #: lib/deleteuserform.php:64 lib/noticelist.php:673
 msgid "Delete"
 msgstr "Poista"
 
-#: actions/showapplication.php:255
+#: actions/showapplication.php:261
 msgid "Application info"
 msgstr ""
 
-#: actions/showapplication.php:257
+#: actions/showapplication.php:263
 msgid "Consumer key"
 msgstr ""
 
-#: actions/showapplication.php:262
+#: actions/showapplication.php:268
 msgid "Consumer secret"
 msgstr ""
 
-#: actions/showapplication.php:267
+#: actions/showapplication.php:273
 msgid "Request token URL"
 msgstr ""
 
-#: actions/showapplication.php:272
+#: actions/showapplication.php:278
 msgid "Access token URL"
 msgstr ""
 
-#: actions/showapplication.php:277
+#: actions/showapplication.php:283
 msgid "Authorize URL"
 msgstr ""
 
-#: actions/showapplication.php:282
+#: actions/showapplication.php:288
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
 msgstr ""
 
-#: actions/showapplication.php:302
+#: actions/showapplication.php:309
 #, fuzzy
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr "Oletko varma että haluat poistaa tämän päivityksen?"
@@ -5622,18 +5572,16 @@ msgid "Group profile"
 msgstr "Ryhmän profiili"
 
 #. TRANS: Label for group URL (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT for URL in a profile.
 #: actions/showgroup.php:273 actions/tagother.php:118
-#: actions/userauthorization.php:184 lib/userprofile.php:186
+#: actions/userauthorization.php:175 lib/userprofile.php:186
 msgid "URL"
 msgstr "URL"
 
 #. TRANS: Label for group description or group note (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page where bio is displayed.
 #. TRANS: DT for note in a profile.
 #: actions/showgroup.php:285 actions/tagother.php:128
-#: actions/userauthorization.php:197 lib/userprofile.php:204
+#: actions/userauthorization.php:187 lib/userprofile.php:204
 msgid "Note"
 msgstr "Huomaa"
 
@@ -5774,7 +5722,7 @@ msgid "%1$s tagged %2$s"
 msgstr "Ryhmät, sivu %d"
 
 #. TRANS: Page title showing tagged notices in one user's stream.
-#. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
+#. TRANS: %1$s is the username, %2$s is the hash tag, %1$d is the page number.
 #: actions/showstream.php:74
 #, fuzzy, php-format
 msgid "%1$s tagged %2$s, page %3$d"
@@ -6024,7 +5972,7 @@ msgstr ""
 #. TRANS: Title for button to save site notice in admin panel.
 #: actions/sitenoticeadminpanel.php:201
 #, fuzzy
-msgid "Save site notice."
+msgid "Save site notice"
 msgstr "Palvelun ilmoitus"
 
 #. TRANS: Title for SMS settings.
@@ -6085,7 +6033,7 @@ msgstr "Puhelinnumeroa ei ole."
 #. TRANS: SMS phone number input field instructions in SMS settings form.
 #: actions/smssettings.php:152
 #, fuzzy
-msgid "Phone number, no punctuation or spaces, with area code."
+msgid "Phone number, no punctuation or spaces, with area code"
 msgstr "Puhelinnumero, ei välimerkkejä tai välilyöntejä, suuntanumerollinen"
 
 #. TRANS: Form legend for SMS preferences form.
@@ -6257,20 +6205,16 @@ msgstr "Et ole tilannut tämän käyttäjän päivityksiä."
 msgid "Could not save subscription."
 msgstr "Tilausta ei onnistuttu tallentamaan."
 
-#. TRANS: Client error displayed trying to perform any request method other than POST.
-#. TRANS: Do not translate POST.
 #: actions/subscribe.php:77
 msgid "This action only accepts POST requests."
 msgstr ""
 
-#. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
-#: actions/subscribe.php:121
+#: actions/subscribe.php:117
 #, fuzzy
 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
 msgstr "Et ole tilannut tämän käyttäjän päivityksiä."
 
-#. TRANS: Page title when subscription succeeded.
-#: actions/subscribe.php:149
+#: actions/subscribe.php:145
 msgid "Subscribed"
 msgstr "Tilattu"
 
@@ -6421,9 +6365,8 @@ msgstr "Tagi %s"
 msgid "User profile"
 msgstr "Käyttäjän profiili"
 
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT element in area for user avatar.
-#: actions/tagother.php:81 actions/userauthorization.php:138
+#: actions/tagother.php:81 actions/userauthorization.php:132
 #: lib/userprofile.php:108
 msgid "Photo"
 msgstr "Kuva"
@@ -6440,11 +6383,6 @@ msgstr ""
 "Käyttäjän tagit (kirjaimet, numerot, -, ., ja _), pilkulla tai välilyönnillä "
 "erotettuna"
 
-#: actions/tagother.php:178
-#, php-format
-msgid "Invalid tag: \"%s\""
-msgstr "Virheellinen tagi: \"%s\""
-
 #: actions/tagother.php:193
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
@@ -6462,7 +6400,6 @@ msgstr ""
 msgid "No such tag."
 msgstr "Tuota tagia ei ole."
 
-#. TRANS: Client error displayed when trying to unblock a non-blocked user.
 #: actions/unblock.php:59
 msgid "You haven't blocked that user."
 msgstr "Älä estä tätä käyttäjää"
@@ -6485,7 +6422,7 @@ msgstr "Ei profiilia tuolle ID:lle."
 msgid "Unsubscribed"
 msgstr "Tilaus lopetettu"
 
-#: actions/updateprofile.php:64
+#: actions/updateprofile.php:64 actions/userauthorization.php:337
 #, php-format
 msgid ""
 "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
@@ -6517,7 +6454,7 @@ msgstr ""
 #. TRANS: users in user admin panel. %1$s is the invalid nickname.
 #: actions/useradminpanel.php:166
 #, php-format
-msgid "Invalid default subscripton: \"%1$s\" is not a user."
+msgid "Invalid default subscripton: '%1$s' is not a user."
 msgstr ""
 
 #. TRANS: Link description in user account settings menu.
@@ -6586,70 +6523,59 @@ msgstr ""
 #. TRANS: Title for button to save user settings in user admin panel.
 #: actions/useradminpanel.php:302
 #, fuzzy
-msgid "Save user settings."
+msgid "Save user settings"
 msgstr "Profiilikuva-asetukset"
 
-#. TRANS: Page title.
-#: actions/userauthorization.php:109
+#: actions/userauthorization.php:105
 msgid "Authorize subscription"
 msgstr "Valtuuta tilaus"
 
-#. TRANS: Page notice on "Auhtorize subscription" page.
-#: actions/userauthorization.php:115
+#: actions/userauthorization.php:110
 #, fuzzy
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
 "user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
-"click \"Reject\"."
+"click “Reject”."
 msgstr ""
 "Tarkista nämä tiedot varmistaaksesi, että haluat tilata tämän käyttäjän "
 "päivitykset. Jos et valinnut haluavasi tilata jonkin käyttäjän päivityksiä, "
 "paina \"Peruuta\"."
 
-#. TRANS: DT element on Authorise Subscription page where license is displayed.
 #. TRANS: Menu item for site administration
-#: actions/userauthorization.php:207 actions/version.php:167
+#: actions/userauthorization.php:196 actions/version.php:167
 #: lib/adminpanelaction.php:403
 msgid "License"
 msgstr "Lisenssi"
 
-#. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:229
+#: actions/userauthorization.php:217
 #, fuzzy
-msgctxt "BUTTON"
 msgid "Accept"
 msgstr "Hyväksy"
 
-#. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:231
-#, fuzzy
-msgid "Subscribe to this user."
+#: actions/userauthorization.php:218 lib/subscribeform.php:115
+#: lib/subscribeform.php:139
+msgid "Subscribe to this user"
 msgstr "Tilaa tämä käyttäjä"
 
-#. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:233
+#: actions/userauthorization.php:219
 #, fuzzy
-msgctxt "BUTTON"
 msgid "Reject"
 msgstr "Hylkää"
 
-#. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:235
+#: actions/userauthorization.php:220
 #, fuzzy
-msgid "Reject this subscription."
+msgid "Reject this subscription"
 msgstr "Käyttäjän %s tilaukset"
 
-#. TRANS: Client error displayed for an empty authorisation request.
-#: actions/userauthorization.php:248
+#: actions/userauthorization.php:232
 msgid "No authorization request!"
 msgstr "Ei valtuutuspyyntöä!"
 
-#. TRANS: Accept message header from Authorise subscription page.
-#: actions/userauthorization.php:271
+#: actions/userauthorization.php:254
 msgid "Subscription authorized"
 msgstr "Tilaus sallittu"
 
-#: actions/userauthorization.php:274
+#: actions/userauthorization.php:256
 #, fuzzy
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
@@ -6660,12 +6586,11 @@ msgstr ""
 "saatu. Tarkista sivuston ohjeet miten päivityksen tilaus hyväksytään. "
 "Tilauskoodisi on:"
 
-#. TRANS: Reject message header from Authorise subscription page.
-#: actions/userauthorization.php:285
+#: actions/userauthorization.php:266
 msgid "Subscription rejected"
 msgstr "Tilaus hylätty"
 
-#: actions/userauthorization.php:288
+#: actions/userauthorization.php:268
 #, fuzzy
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
@@ -6675,62 +6600,39 @@ msgstr ""
 "Päivityksen tilaus on hylätty, mutta callback-osoitetta palveluun ei ole "
 "saatu. Tarkista sivuston ohjeet miten päivityksen tilaus hylätään kokonaan."
 
-#. TRANS: Exception thrown when no valid user is found for an authorisation request.
-#. TRANS: %s is a listener URI.
-#: actions/userauthorization.php:325
+#: actions/userauthorization.php:303
 #, php-format
-msgid "Listener URI \"%s\" not found here."
+msgid "Listener URI ‘%s’ not found here."
 msgstr ""
 
-#. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:332
+#: actions/userauthorization.php:308
 #, php-format
-msgid "Listenee URI \"%s\" is too long."
+msgid "Listenee URI ‘%s’ is too long."
 msgstr ""
 
-#. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:340
+#: actions/userauthorization.php:314
 #, php-format
-msgid "Listenee URI \"%s\" is a local user."
+msgid "Listenee URI ‘%s’ is a local user."
 msgstr ""
 
-#. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
-#. TRANS: %s is a profile URL.
-#: actions/userauthorization.php:358
+#: actions/userauthorization.php:329
 #, php-format
-msgid "Profile URL \"%s\" is for a local user."
+msgid "Profile URL ‘%s’ is for a local user."
 msgstr ""
 
-#. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
-#. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
-#: actions/userauthorization.php:368
-#, php-format
-msgid ""
-"Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
-"\"."
-msgstr ""
-
-#. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:378
+#: actions/userauthorization.php:345
 #, fuzzy, php-format
-msgid "Avatar URL \"%s\" is not valid."
+msgid "Avatar URL ‘%s’ is not valid."
 msgstr "Kotisivun verkko-osoite ei ole toimiva."
 
-#. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:385
+#: actions/userauthorization.php:350
 #, fuzzy, php-format
-msgid "Cannot read avatar URL \"%s\"."
+msgid "Can’t read avatar URL ‘%s’."
 msgstr "Kuvan URL-osoitetta '%s' ei voi avata."
 
-#. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:392
+#: actions/userauthorization.php:355
 #, fuzzy, php-format
-msgid "Wrong image type for avatar URL \"%s\"."
+msgid "Wrong image type for avatar URL ‘%s’."
 msgstr "Kuvan '%s' tyyppi on väärä"
 
 #. TRANS: Page title for profile design page.
@@ -6825,7 +6727,7 @@ msgid "Plugins"
 msgstr ""
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:898
+#: actions/version.php:198 lib/action.php:901
 #, fuzzy
 msgid "Version"
 msgstr "Omat"
@@ -7038,14 +6940,14 @@ msgstr "Ongelma päivityksen tallentamisessa."
 
 #. TRANS: Server exception thrown when a reply cannot be saved.
 #. TRANS: %1$d is a notice ID, %2$d is the ID of the mentioned user.
-#: classes/Notice.php:1142
+#: classes/Notice.php:1144
 #, fuzzy, php-format
 msgid "Could not save reply for %1$d, %2$d."
 msgstr "Tilausta ei onnistuttu tallentamaan."
 
 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1661
+#: classes/Notice.php:1663
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
@@ -7059,14 +6961,14 @@ msgstr "%1$s (%2$s)"
 
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:775
+#: classes/Profile.php:779
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:784
+#: classes/Profile.php:788
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -7398,54 +7300,54 @@ msgid "Page notice"
 msgstr "Sivuilmoitus"
 
 #. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:871
+#: lib/action.php:874
 msgid "Secondary site navigation"
 msgstr "Toissijainen sivunavigointi"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:877
+#: lib/action.php:880
 msgid "Help"
 msgstr "Ohjeet"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:880
+#: lib/action.php:883
 msgid "About"
 msgstr "Tietoa"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:883
+#: lib/action.php:886
 msgid "FAQ"
 msgstr "UKK"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:888
+#: lib/action.php:891
 msgid "TOS"
 msgstr ""
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:892
+#: lib/action.php:895
 msgid "Privacy"
 msgstr "Yksityisyys"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:895
+#: lib/action.php:898
 msgid "Source"
 msgstr "Lähdekoodi"
 
 #. TRANS: Secondary navigation menu option leading to e-mail contact information on the
 #. TRANS: StatusNet site, where to report bugs, ...
-#: lib/action.php:902
+#: lib/action.php:905
 msgid "Contact"
 msgstr "Ota yhteyttä"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:905
+#: lib/action.php:908
 #, fuzzy
 msgid "Badge"
 msgstr "Tönäise"
 
 #. TRANS: DT element for StatusNet software license.
-#: lib/action.php:934
+#: lib/action.php:937
 msgid "StatusNet software license"
 msgstr "StatusNet-ohjelmiston lisenssi"
 
@@ -7453,7 +7355,7 @@ msgstr "StatusNet-ohjelmiston lisenssi"
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:941
+#: lib/action.php:944
 #, fuzzy, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7463,7 +7365,7 @@ msgstr ""
 "site.broughtbyurl%%). "
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:944
+#: lib/action.php:947
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** on mikroblogipalvelu."
@@ -7472,7 +7374,7 @@ msgstr "**%%site.name%%** on mikroblogipalvelu."
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:951
+#: lib/action.php:954
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7484,51 +7386,51 @@ msgstr ""
 "www.fsf.org/licensing/licenses/agpl-3.0.html)."
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:967
+#: lib/action.php:970
 #, fuzzy
 msgid "Site content license"
 msgstr "StatusNet-ohjelmiston lisenssi"
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:974
+#: lib/action.php:977
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:981
+#: lib/action.php:984
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:985
+#: lib/action.php:988
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:1017
+#: lib/action.php:1020
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
 
 #. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1353
+#: lib/action.php:1356
 msgid "Pagination"
 msgstr "Sivutus"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1364
+#: lib/action.php:1367
 msgid "After"
 msgstr "Myöhemmin"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1374
+#: lib/action.php:1377
 msgid "Before"
 msgstr "Aiemmin"
 
@@ -7741,23 +7643,19 @@ msgstr ""
 msgid "No application for that consumer key."
 msgstr ""
 
-#: lib/apiauth.php:202 lib/apiauth.php:284
-msgid "Not allowed to use API."
-msgstr ""
-
 #. TRANS: OAuth exception given when an incorrect access token was given for a user.
-#: lib/apiauth.php:225
+#: lib/apiauth.php:219
 msgid "Bad access token."
 msgstr ""
 
 #. TRANS: OAuth exception given when no user was found for a given token (no token was found).
-#: lib/apiauth.php:230
+#: lib/apiauth.php:224
 msgid "No user for that token."
 msgstr ""
 
 #. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel".
 #. TRANS: Client error thrown when authentication fails.
-#: lib/apiauth.php:272 lib/apiauth.php:302
+#: lib/apiauth.php:266 lib/apiauth.php:293
 msgid "Could not authenticate you."
 msgstr ""
 
@@ -7970,11 +7868,6 @@ msgstr "Salasanan vaihto"
 msgid "Block"
 msgstr "Estä"
 
-#. TRANS: Description of the form to block a user.
-#: lib/blockform.php:79
-msgid "Block this user"
-msgstr "Estä tämä käyttäjä"
-
 #. TRANS: Title for command results.
 #: lib/channel.php:160 lib/channel.php:181
 msgid "Command results"
@@ -8004,7 +7897,7 @@ msgstr "Ei profiilia tuolla id:llä."
 
 #. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
 #. TRANS: Error text shown when a last user notice is requested and it does not exist.
-#: lib/command.php:99 lib/command.php:630
+#: lib/command.php:99 lib/command.php:642
 #, fuzzy
 msgid "User has no last notice."
 msgstr "Käyttäjällä ei ole viimeistä päivitystä"
@@ -8052,35 +7945,41 @@ msgid ""
 "Notices: %3$s"
 msgstr ""
 
+#. TRANS: Error message text shown when a favorite could not be set because it has already been favorited.
+#: lib/command.php:298
+#, fuzzy
+msgid "Could not create favorite: already favorited."
+msgstr "Ei voitu lisätä suosikiksi."
+
 #. TRANS: Text shown when a notice has been marked as favourite successfully.
-#: lib/command.php:312
+#: lib/command.php:324
 msgid "Notice marked as fave."
 msgstr "Päivitys on merkitty suosikiksi."
 
 #. TRANS: Message given having added a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:357
+#: lib/command.php:369
 #, php-format
 msgid "%1$s joined group %2$s."
 msgstr ""
 
 #. TRANS: Message given having removed a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:405
+#: lib/command.php:417
 #, php-format
 msgid "%1$s left group %2$s."
 msgstr ""
 
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: lib/command.php:426
+#: lib/command.php:438
 #, fuzzy, php-format
 msgctxt "WHOIS"
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
 
 #. TRANS: Whois output. %s is the full name of the queried user.
-#: lib/command.php:430
+#: lib/command.php:442
 #, php-format
 msgid "Fullname: %s"
 msgstr "Koko nimi: %s"
@@ -8088,7 +7987,7 @@ msgstr "Koko nimi: %s"
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a location.
-#: lib/command.php:434 lib/mail.php:270
+#: lib/command.php:446 lib/mail.php:270
 #, php-format
 msgid "Location: %s"
 msgstr "Kotipaikka: %s"
@@ -8096,20 +7995,20 @@ msgstr "Kotipaikka: %s"
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a homepage.
-#: lib/command.php:438 lib/mail.php:274
+#: lib/command.php:450 lib/mail.php:274
 #, php-format
 msgid "Homepage: %s"
 msgstr "Kotisivu: %s"
 
 #. TRANS: Whois output. %s is the bio information of the queried user.
-#: lib/command.php:442
+#: lib/command.php:454
 #, php-format
 msgid "About: %s"
 msgstr "Tietoa: %s"
 
 #. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).
 #. TRANS: %s is a remote profile.
-#: lib/command.php:471
+#: lib/command.php:483
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
@@ -8118,7 +8017,7 @@ msgstr ""
 
 #. TRANS: Message given if content is too long. %1$sd is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:488
+#: lib/command.php:500
 #, fuzzy, php-format
 msgid "Message too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
@@ -8126,25 +8025,25 @@ msgstr[0] "Viesti oli liian pitkä - maksimikoko on 140 merkkiä, lähetit %d"
 msgstr[1] "Viesti oli liian pitkä - maksimikoko on 140 merkkiä, lähetit %d"
 
 #. TRANS: Error text shown sending a direct message fails with an unknown reason.
-#: lib/command.php:516
+#: lib/command.php:528
 msgid "Error sending direct message."
 msgstr "Tapahtui virhe suoran viestin lähetyksessä."
 
 #. TRANS: Message given having repeated a notice from another user.
 #. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:553
+#: lib/command.php:565
 #, fuzzy, php-format
 msgid "Notice from %s repeated."
 msgstr "Päivitys lähetetty"
 
 #. TRANS: Error text shown when repeating a notice fails with an unknown reason.
-#: lib/command.php:556
+#: lib/command.php:568
 msgid "Error repeating notice."
 msgstr "Virhe tapahtui käyttäjän asettamisessa."
 
 #. TRANS: Message given if content of a notice for a reply is too long. %1$d is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:591
+#: lib/command.php:603
 #, fuzzy, php-format
 msgid "Notice too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Notice too long - maximum is %1$d characters, you sent %2$d."
@@ -8153,97 +8052,97 @@ msgstr[1] "Viesti oli liian pitkä - maksimikoko on 140 merkkiä, lähetit %d"
 
 #. TRANS: Text shown having sent a reply to a notice successfully.
 #. TRANS: %s is the nickname of the user of the notice the reply was sent to.
-#: lib/command.php:604
+#: lib/command.php:616
 #, fuzzy, php-format
 msgid "Reply to %s sent."
 msgstr "Vastaa tähän päivitykseen"
 
 #. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
-#: lib/command.php:607
+#: lib/command.php:619
 #, fuzzy
 msgid "Error saving notice."
 msgstr "Ongelma päivityksen tallentamisessa."
 
 #. TRANS: Error text shown when no username was provided when issuing a subscribe command.
-#: lib/command.php:654
+#: lib/command.php:666
 #, fuzzy
 msgid "Specify the name of the user to subscribe to."
 msgstr "Anna käyttäjätunnus, jonka päivitykset haluat tilata"
 
 #. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
-#: lib/command.php:663
+#: lib/command.php:675
 #, fuzzy
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "Et ole tilannut tämän käyttäjän päivityksiä."
 
 #. TRANS: Text shown after having subscribed to another user successfully.
 #. TRANS: %s is the name of the user the subscription was requested for.
-#: lib/command.php:671
+#: lib/command.php:683
 #, php-format
 msgid "Subscribed to %s."
 msgstr ""
 
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.
-#: lib/command.php:692 lib/command.php:803
+#: lib/command.php:704 lib/command.php:815
 #, fuzzy
 msgid "Specify the name of the user to unsubscribe from."
 msgstr "Anna käyttäjätunnus, jonka päivityksien tilauksen haluat lopettaa"
 
 #. TRANS: Text shown after having unsubscribed from another user successfully.
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:703
+#: lib/command.php:715
 #, php-format
 msgid "Unsubscribed from %s."
 msgstr ""
 
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
-#: lib/command.php:723 lib/command.php:749
+#: lib/command.php:735 lib/command.php:761
 msgid "Command not yet implemented."
 msgstr "Komentoa ei ole vielä toteutettu."
 
 #. TRANS: Text shown when issuing the command "off" successfully.
-#: lib/command.php:727
+#: lib/command.php:739
 msgid "Notification off."
 msgstr "Ilmoitukset pois päältä."
 
 #. TRANS: Error text shown when the command "off" fails for an unknown reason.
-#: lib/command.php:730
+#: lib/command.php:742
 msgid "Can't turn off notification."
 msgstr "Ilmoituksia ei voi pistää pois päältä."
 
 #. TRANS: Text shown when issuing the command "on" successfully.
-#: lib/command.php:753
+#: lib/command.php:765
 msgid "Notification on."
 msgstr "Ilmoitukset päällä."
 
 #. TRANS: Error text shown when the command "on" fails for an unknown reason.
-#: lib/command.php:756
+#: lib/command.php:768
 msgid "Can't turn on notification."
 msgstr "Ilmoituksia ei voi pistää päälle."
 
 #. TRANS: Error text shown when issuing the login command while login is disabled.
-#: lib/command.php:770
+#: lib/command.php:782
 msgid "Login command is disabled."
 msgstr ""
 
 #. TRANS: Text shown after issuing the login command successfully.
 #. TRANS: %s is a logon link..
-#: lib/command.php:783
+#: lib/command.php:795
 #, php-format
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
 
 #. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:812
+#: lib/command.php:824
 #, php-format
 msgid "Unsubscribed %s."
 msgstr ""
 
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
-#: lib/command.php:830
+#: lib/command.php:842
 #, fuzzy
 msgid "You are not subscribed to anyone."
 msgstr "Et ole tilannut tämän käyttäjän päivityksiä."
@@ -8251,7 +8150,7 @@ msgstr "Et ole tilannut tämän käyttäjän päivityksiä."
 #. TRANS: Text shown after requesting other users a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
-#: lib/command.php:835
+#: lib/command.php:847
 #, fuzzy
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
@@ -8260,7 +8159,7 @@ msgstr[1] "Olet jos tilannut seuraavien käyttäjien päivitykset:"
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user
 #. TRANS: (followers) without having any subscribers.
-#: lib/command.php:857
+#: lib/command.php:869
 #, fuzzy
 msgid "No one is subscribed to you."
 msgstr "Toista ei voitu asettaa tilaamaan sinua."
@@ -8268,7 +8167,7 @@ msgstr "Toista ei voitu asettaa tilaamaan sinua."
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
-#: lib/command.php:862
+#: lib/command.php:874
 #, fuzzy
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
@@ -8277,7 +8176,7 @@ msgstr[1] "Toista ei voitu asettaa tilaamaan sinua."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to without having
 #. TRANS: any group subscriptions.
-#: lib/command.php:884
+#: lib/command.php:896
 #, fuzzy
 msgid "You are not a member of any groups."
 msgstr "Sinä et kuulu tähän ryhmään."
@@ -8285,14 +8184,14 @@ msgstr "Sinä et kuulu tähän ryhmään."
 #. TRANS: Text shown after requesting groups a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
-#: lib/command.php:889
+#: lib/command.php:901
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "Sinä et kuulu tähän ryhmään."
 msgstr[1] "Sinä et kuulu tähän ryhmään."
 
 #. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-#: lib/command.php:904
+#: lib/command.php:916
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -8399,11 +8298,6 @@ msgstr ""
 msgid "Database error"
 msgstr "Tietokantavirhe"
 
-#. TRANS: Description of form for deleting a user.
-#: lib/deleteuserform.php:75
-msgid "Delete this user"
-msgstr "Poista käyttäjä"
-
 #. TRANS: Label in form on profile design page.
 #. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
 #: lib/designsettings.php:108
@@ -8442,24 +8336,6 @@ msgstr "Vaihda väriä"
 msgid "Use defaults"
 msgstr "Käytä oletusasetuksia"
 
-#. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: lib/designsettings.php:259
-#, fuzzy
-msgid "Restore default designs"
-msgstr "Käytä oletusasetuksia"
-
-#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: lib/designsettings.php:267
-#, fuzzy
-msgid "Reset back to default"
-msgstr "Käytä oletusasetuksia"
-
-#. TRANS: Title for button on profile design page to save settings.
-#: lib/designsettings.php:272
-#, fuzzy
-msgid "Save design"
-msgstr "Ryhmän ulkoasu"
-
 #. TRANS: Error message displayed if design settings could not be saved.
 #. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
 #: lib/designsettings.php:405 lib/designsettings.php:427
@@ -9265,10 +9141,6 @@ msgstr "Vastaa tähän päivitykseen"
 msgid "Reply"
 msgstr "Vastaus"
 
-#: lib/noticelist.php:673
-msgid "Delete this notice"
-msgstr "Poista tämä päivitys"
-
 #: lib/noticelist.php:691
 #, fuzzy
 msgid "Notice repeated"
@@ -9562,10 +9434,6 @@ msgstr "Kutsu"
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Kutsu kavereita ja työkavereita liittymään palveluun %s"
 
-#: lib/subscribeform.php:115 lib/subscribeform.php:139
-msgid "Subscribe to this user"
-msgstr "Tilaa tämä käyttäjä"
-
 #: lib/subscriberspeopleselftagcloudsection.php:48
 #: lib/subscriptionspeopleselftagcloudsection.php:48
 msgid "People Tagcloud as self-tagged"
@@ -9742,23 +9610,18 @@ msgctxt "role"
 msgid "Moderator"
 msgstr ""
 
-#: lib/util.php:305
-#, fuzzy
-msgid "Not allowed to log in."
-msgstr "Et ole kirjautunut sisään."
-
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1309
+#: lib/util.php:1306
 msgid "a few seconds ago"
 msgstr "muutama sekunti sitten"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1312
+#: lib/util.php:1309
 msgid "about a minute ago"
 msgstr "noin minuutti sitten"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1316
+#: lib/util.php:1313
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
@@ -9766,12 +9629,12 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1319
+#: lib/util.php:1316
 msgid "about an hour ago"
 msgstr "noin tunti sitten"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1323
+#: lib/util.php:1320
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
@@ -9779,12 +9642,12 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1326
+#: lib/util.php:1323
 msgid "about a day ago"
 msgstr "noin päivä sitten"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1330
+#: lib/util.php:1327
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
@@ -9792,12 +9655,12 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1333
+#: lib/util.php:1330
 msgid "about a month ago"
 msgstr "noin kuukausi sitten"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1337
+#: lib/util.php:1334
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
@@ -9805,7 +9668,7 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1340
+#: lib/util.php:1337
 msgid "about a year ago"
 msgstr "noin vuosi sitten"
 
@@ -9847,3 +9710,60 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#~ msgid "Block this user."
+#~ msgstr "Estä tämä käyttäjä."
+
+#~ msgid "Delete this notice."
+#~ msgstr "Poista tämä päivitys."
+
+#~ msgid "Delete this user."
+#~ msgstr "Poista tämä käyttäjä."
+
+#~ msgid "Restore default designs."
+#~ msgstr "Palauta oletusulkonäkö."
+
+#~ msgid "Reset back to default."
+#~ msgstr "Palauta oletusulkoasu."
+
+#~ msgid "Save design."
+#~ msgstr "Tallenna ulkoasu."
+
+#~ msgid "Disfavor favorite."
+#~ msgstr "Poista suosikeista."
+
+#, fuzzy
+#~ msgid "\"%s\" not found."
+#~ msgstr "API-metodia ei löytynyt."
+
+#, fuzzy
+#~ msgid "Notice %s not found."
+#~ msgstr "API-metodia ei löytynyt."
+
+#, fuzzy
+#~ msgid "Attachment %s not found."
+#~ msgstr "Vastaanottajaa ei löytynyt."
+
+#, fuzzy
+#~ msgid "Invalid tag: \"%s\"."
+#~ msgstr "Virheellinen tagi: \"%s\""
+
+#, fuzzy
+#~ msgid "%s updates from everyone."
+#~ msgstr "%s päivitykset kaikilta!"
+
+#, fuzzy
+#~ msgid "Password saved"
+#~ msgstr "Salasana tallennettu."
+
+#, fuzzy
+#~ msgid "Where you are, like \"City, State (or Region), Country\"."
+#~ msgstr "Olinpaikka kuten \"Kaupunki, Maakunta (tai Lääni), Maa\""
+
+#, fuzzy
+#~ msgid "Subscribe to this user."
+#~ msgstr "Tilaa tämä käyttäjä"
+
+#, fuzzy
+#~ msgid "Not allowed to log in."
+#~ msgstr "Et ole kirjautunut sisään."
diff --git a/locale/fr/LC_MESSAGES/statusnet.po b/locale/fr/LC_MESSAGES/statusnet.po
index 1efde04401..63f48c3914 100644
--- a/locale/fr/LC_MESSAGES/statusnet.po
+++ b/locale/fr/LC_MESSAGES/statusnet.po
@@ -21,17 +21,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-24 10:32+0000\n"
-"PO-Revision-Date: 2011-02-24 10:36:39+0000\n"
+"POT-Creation-Date: 2011-03-03 15:58+0000\n"
+"PO-Revision-Date: 2011-03-03 16:00:29+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r82712); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-POT-Import-Date: 2011-02-17 11:39:54+0000\n"
+"X-POT-Import-Date: 2011-02-25 23:49:23+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -143,11 +143,7 @@ msgstr "Page non trouvée."
 #. 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 use "one time password login" without using an existing user.
-#. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
-#. TRANS: Client error displayed trying to find a user by ID for a non-existing ID.
-#. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when calling a profile action without specifying a user.
 #: actions/all.php:80 actions/allrss.php:69
@@ -165,12 +161,12 @@ msgstr "Page non trouvée."
 #: actions/apitimelinementions.php:77 actions/apitimelineuser.php:79
 #: actions/avatarbynickname.php:79 actions/favoritesrss.php:72
 #: actions/foaf.php:42 actions/foaf.php:61 actions/hcard.php:67
-#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:78
+#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
 #: actions/remotesubscribe.php:144 actions/remotesubscribe.php:153
-#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:113
-#: actions/showfavorites.php:106 actions/userbyid.php:75
+#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
+#: actions/showfavorites.php:106 actions/userbyid.php:74
 #: actions/usergroups.php:93 actions/userrss.php:40 actions/userxrd.php:59
-#: actions/xrds.php:71 lib/command.php:497 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:509 lib/galleryaction.php:59
 #: lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Utilisateur non trouvé."
@@ -301,7 +297,7 @@ msgstr "Statuts de %1$s et ses amis dans %2$s!"
 #: actions/apigrouplistall.php:120 actions/apigroupmembership.php:105
 #: actions/apigroupshow.php:114 actions/apihelptest.php:84
 #: actions/apistatusesdestroy.php:101 actions/apistatusesretweets.php:110
-#: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:138
+#: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:139
 #: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
 #: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:268
 #: actions/apitimelinegroup.php:147 actions/apitimelinehome.php:173
@@ -533,7 +529,7 @@ msgstr "Destinataire non trouvé."
 #. TRANS: Client error displayed trying to direct message another user who's not a friend (403).
 #: actions/apidirectmessagenew.php:144
 #, fuzzy
-msgid "Cannot send direct messages to users who aren't your friend."
+msgid "Can't send direct messages to users who aren't your friend."
 msgstr ""
 "Vous ne pouvez envoyer des messages personnels qu’aux utilisateurs inscrits "
 "comme amis."
@@ -562,7 +558,7 @@ msgstr "Cet avis est déjà un favori."
 #. TRANS: Client error displayed when marking a notice as favourite fails.
 #. TRANS: Server error displayed when trying to mark a notice as favorite fails in the database.
 #. TRANS: Error message text shown when a favorite could not be set.
-#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:294
+#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:306
 msgid "Could not create favorite."
 msgstr "Impossible de créer le favori."
 
@@ -620,7 +616,7 @@ msgstr "Impossible de trouver l’utilisateur cible."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:191
 #: actions/newgroup.php:137 actions/profilesettings.php:273
-#: actions/register.php:206
+#: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "Pseudo déjà utilisé. Essayez-en un autre."
 
@@ -630,7 +626,7 @@ msgstr "Pseudo déjà utilisé. Essayez-en un autre."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:195
 #: actions/newgroup.php:141 actions/profilesettings.php:243
-#: actions/register.php:208
+#: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "Pseudo invalide."
 
@@ -643,7 +639,7 @@ msgstr "Pseudo invalide."
 #: actions/apigroupcreate.php:181 actions/editapplication.php:235
 #: actions/editgroup.php:202 actions/newapplication.php:221
 #: actions/newgroup.php:148 actions/profilesettings.php:248
-#: actions/register.php:215
+#: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "L’adresse du site personnel n’est pas un URL valide. "
 
@@ -653,7 +649,7 @@ msgstr "L’adresse du site personnel n’est pas un URL valide. "
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:191 actions/editgroup.php:206
 #: actions/newgroup.php:152 actions/profilesettings.php:252
-#: actions/register.php:218
+#: actions/register.php:226
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "Le nom complet est trop long (limité à 255 caractères maximum)."
 
@@ -681,7 +677,7 @@ msgstr[1] "La description est trop longue (limitée à %d caractères maximum)."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:215 actions/editgroup.php:218
 #: actions/newgroup.php:164 actions/profilesettings.php:265
-#: actions/register.php:227
+#: actions/register.php:235
 msgid "Location is too long (maximum 255 characters)."
 msgstr "L’emplacement est trop long (limité à 255 caractères maximum)."
 
@@ -737,14 +733,14 @@ msgstr "Groupe non trouvé."
 #. TRANS: Server error displayed when trying to join a group the user is already a member of.
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:333
+#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:345
 msgid "You are already a member of that group."
 msgstr "Vous êtes déjà membre de ce groupe."
 
 #. TRANS: Server error displayed when trying to join a group the user is blocked from joining.
 #. 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.
-#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:338
+#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:350
 msgid "You have been blocked from that group by the admin."
 msgstr "Vous avez été bloqué de ce groupe par l’administrateur."
 
@@ -754,7 +750,7 @@ msgstr "Vous avez été bloqué de ce groupe par l’administrateur."
 #. TRANS: %1$s is the joining user's nickname, $2$s is the group nickname for which the join failed.
 #. TRANS: Message given having failed to add a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:350
+#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:362
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "Impossible d’inscrire l’utilisateur %1$s au groupe %2$s."
@@ -771,7 +767,7 @@ msgstr "Vous n’êtes pas membre de ce groupe."
 #. TRANS: Message given having failed to remove a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
 #: actions/apigroupleave.php:127 actions/leavegroup.php:133
-#: lib/command.php:398
+#: lib/command.php:410
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
 msgstr "Impossible de retirer l’utilisateur %1$s du groupe %2$s."
@@ -831,21 +827,20 @@ msgstr "Le jeton de requête a déjà été autorisé."
 #. TRANS: Form validation error message.
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
-#. TRANS: Client error displayed when the session token is not okay.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
 #: actions/deletenotice.php:177 actions/disfavor.php:75
 #: actions/emailsettings.php:291 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:65 actions/grouplogo.php:321
 #: actions/groupunblock.php:65 actions/imsettings.php:224
-#: actions/invite.php:60 actions/login.php:131 actions/makeadmin.php:66
+#: actions/invite.php:60 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
-#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:136
-#: actions/othersettings.php:155 actions/passwordsettings.php:137
+#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
+#: actions/othersettings.php:155 actions/passwordsettings.php:138
 #: actions/profilesettings.php:217 actions/recoverpassword.php:383
-#: actions/register.php:164 actions/remotesubscribe.php:76
+#: actions/register.php:172 actions/remotesubscribe.php:76
 #: actions/repeat.php:82 actions/smssettings.php:250 actions/subedit.php:40
-#: actions/subscribe.php:87 actions/tagother.php:166
-#: actions/unsubscribe.php:69 actions/userauthorization.php:53
+#: actions/subscribe.php:86 actions/tagother.php:166
+#: actions/unsubscribe.php:69 actions/userauthorization.php:52
 #: lib/designsettings.php:310
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
@@ -880,7 +875,7 @@ msgstr ""
 #: actions/designadminpanel.php:100 actions/editapplication.php:144
 #: actions/emailsettings.php:310 actions/grouplogo.php:332
 #: actions/imsettings.php:239 actions/newapplication.php:124
-#: actions/oauthconnectionssettings.php:145 actions/recoverpassword.php:46
+#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
 #: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
 msgstr "Soumission de formulaire inattendue."
@@ -933,20 +928,19 @@ msgstr "Compte"
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group nickname (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT for nick name in a profile.
-#: actions/apioauthauthorize.php:459 actions/login.php:242
-#: actions/profilesettings.php:106 actions/register.php:418
+#: actions/apioauthauthorize.php:459 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:432
 #: actions/showgroup.php:243 actions/tagother.php:94
-#: actions/userauthorization.php:152 lib/groupeditform.php:145
+#: actions/userauthorization.php:145 lib/groupeditform.php:145
 #: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "Pseudo"
 
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:463 actions/login.php:245
-#: actions/register.php:422 lib/accountsettingsaction.php:120
+#: actions/apioauthauthorize.php:463 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:120
 msgid "Password"
 msgstr "Mot de passe"
 
@@ -1041,13 +1035,13 @@ msgstr "Avis non trouvé."
 
 #. TRANS: Client error displayed trying to repeat an own notice through the API.
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:537
+#: actions/apistatusesretweet.php:83 lib/command.php:549
 msgid "Cannot repeat your own notice."
 msgstr "Vous ne pouvez pas reprendre votre propre avis."
 
 #. TRANS: Client error displayed trying to re-repeat a notice through the API.
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:92 lib/command.php:543
+#: actions/apistatusesretweet.php:92 lib/command.php:555
 msgid "Already repeated that notice."
 msgstr "Vous avez déjà repris cet avis."
 
@@ -1069,7 +1063,7 @@ msgstr "Méthode HTTP non trouvée !"
 #. TRANS: %s is the requested output format.
 #: actions/apistatusesshow.php:144
 #, fuzzy, php-format
-msgid "Unsupported format: %s."
+msgid "Unsupported format: %s"
 msgstr "Format non supporté : %s"
 
 #. TRANS: Client error displayed requesting a deleted status.
@@ -1178,14 +1172,13 @@ msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr "%1$s statuts en réponses aux statuts de %2$s / %3$s."
 
 #. TRANS: Title for site timeline. %s is the StatusNet sitename.
-#. TRANS: Public RSS feed title. %s is the StatusNet site name.
 #: actions/apitimelinepublic.php:193 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "Activité publique %s"
 
 #. TRANS: Subtitle for site timeline. %s is the StatusNet sitename.
-#: actions/apitimelinepublic.php:199
+#: actions/apitimelinepublic.php:199 actions/publicrss.php:105
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "%s statuts de tout le monde !"
@@ -1252,27 +1245,26 @@ msgid "Atom post must be an Atom entry."
 msgstr "Une publication Atom doit être une entrée « Atom »."
 
 #. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
-#: actions/apitimelineuser.php:334
+#: actions/apitimelineuser.php:335
 #, fuzzy
 msgid "Can only handle POST activities."
 msgstr "Ne peut gérer que les activités de publication."
 
 #. TRANS: Client error displayed when using an unsupported activity object type.
 #. TRANS: %s is the unsupported activity object type.
-#: actions/apitimelineuser.php:345
+#: actions/apitimelineuser.php:346
 #, fuzzy, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr "Ne peut gérer l’objet d’activité de type « %s »"
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
 #. TRANS: %d is the notice ID (number).
-#: actions/apitimelineuser.php:379
+#: actions/apitimelineuser.php:380
 #, fuzzy, php-format
 msgid "No content for notice %d."
 msgstr "Chercher dans le contenu des avis"
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#. TRANS: %s is the notice URI.
 #: actions/apitimelineuser.php:408
 #, php-format
 msgid "Notice with URI \"%s\" already exists."
@@ -1290,10 +1282,9 @@ msgstr "Page non trouvée."
 
 #. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
 #. TRANS: Client exception.
-#. TRANS: Client error displayed trying to subscribe to a non-existing profile.
 #: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
 #: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
-#: actions/subscribe.php:110
+#: actions/subscribe.php:107
 msgid "No such profile."
 msgstr "Profil non-trouvé."
 
@@ -1429,7 +1420,7 @@ msgstr "Impossible de supprimer le favori."
 #: actions/joingroup.php:95 actions/leavegroup.php:82
 #: actions/leavegroup.php:95 actions/makeadmin.php:86
 #: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:380
+#: lib/command.php:392
 msgid "No such group."
 msgstr "Aucun groupe trouvé."
 
@@ -1440,7 +1431,7 @@ msgid "Not a member."
 msgstr "Tous les membres"
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
-#: actions/atompubshowmembership.php:150
+#: actions/atompubshowmembership.php:151
 #, fuzzy
 msgid "Cannot delete someone else's membership."
 msgstr "Impossible de supprimer l’abonnement à soi-même."
@@ -1548,11 +1539,9 @@ msgstr ""
 
 #. TRANS: Server error displayed in avatar upload page when no matching profile can be found for a user.
 #. TRANS: Server error displayed coming across a request from a user without a profile.
-#. TRANS: Server error displayed when trying to authorise a remote subscription request
-#. TRANS: while the user has no profile.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
 #: actions/grouplogo.php:184 actions/remotesubscribe.php:190
-#: actions/userauthorization.php:75 actions/userrss.php:108
+#: actions/userauthorization.php:72 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr "Utilisateur sans profil correspondant."
 
@@ -1607,10 +1596,10 @@ msgstr "Recadrer"
 msgid "No file uploaded."
 msgstr "Aucun fichier n’a été téléversé."
 
-#. TRANS: Avatar upload form instruction after uploading a file.
+#. TRANS: Avatar upload form unstruction after uploading a file.
 #: actions/avatarsettings.php:345
 #, fuzzy
-msgid "Pick a square area of the image to be your avatar."
+msgid "Pick a square area of the image to be your avatar"
 msgstr "Sélectionnez une zone de forme carrée pour définir votre avatar"
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
@@ -1652,7 +1641,7 @@ msgid "You may not backup your account."
 msgstr ""
 
 #. TRANS: Information displayed on the backup account page.
-#: actions/backupaccount.php:225
+#: actions/backupaccount.php:227
 msgid ""
 "You can backup your account data in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format. This is an experimental feature and provides "
@@ -1662,15 +1651,15 @@ msgid ""
 msgstr ""
 
 #. TRANS: Submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:248
+#: actions/backupaccount.php:250
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Backup"
 msgstr "Arrière plan"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:252
-msgid "Backup your account."
+#: actions/backupaccount.php:254
+msgid "Backup your account"
 msgstr ""
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
@@ -1712,7 +1701,7 @@ msgstr "Non"
 #. TRANS: Submit button title for 'No' when blocking a user.
 #: actions/block.php:158
 #, fuzzy
-msgid "Do not block this user."
+msgid "Do not block this user"
 msgstr "Ne pas bloquer cet utilisateur"
 
 #. TRANS: Button label on the user block form.
@@ -1729,9 +1718,9 @@ msgid "Yes"
 msgstr "Oui"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:165
-#, fuzzy
-msgid "Block this user."
+#. TRANS: Description of the form to block a user.
+#: actions/block.php:165 lib/blockform.php:79
+msgid "Block this user"
 msgstr "Bloquer cet utilisateur"
 
 #. TRANS: Server error displayed when blocking a user fails.
@@ -1894,7 +1883,7 @@ msgstr ""
 #. TRANS: Field label for delete account confirmation entry.
 #. TRANS: Field label for password reset form where the password has to be typed again.
 #: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:262 actions/register.php:426
+#: actions/recoverpassword.php:262 actions/register.php:440
 msgid "Confirm"
 msgstr "Confirmer"
 
@@ -1924,14 +1913,14 @@ msgstr "Application non trouvée."
 #. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
 #: actions/deleteapplication.php:79 actions/editapplication.php:78
-#: actions/showapplication.php:90
+#: actions/showapplication.php:94
 msgid "You are not the owner of this application."
 msgstr "Vous n’êtes pas le propriétaire de cette application."
 
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
-#: actions/newapplication.php:112 actions/showapplication.php:113
-#: lib/action.php:1422
+#: actions/newapplication.php:112 actions/showapplication.php:118
+#: lib/action.php:1425
 msgid "There was a problem with your session token."
 msgstr "Un problème est survenu avec votre jeton de session."
 
@@ -1955,13 +1944,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting an application.
 #: actions/deleteapplication.php:161
 #, fuzzy
-msgid "Do not delete this application."
+msgid "Do not delete this application"
 msgstr "Ne pas supprimer cette application"
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
 #: actions/deleteapplication.php:167
 #, fuzzy
-msgid "Delete this application."
+msgid "Delete this application"
 msgstr "Supprimer cette application"
 
 #. TRANS: Client error when trying to delete group while not logged in.
@@ -2017,13 +2006,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting a group.
 #: actions/deletegroup.php:224
 #, fuzzy
-msgid "Do not delete this group."
+msgid "Do not delete this group"
 msgstr "Ne pas supprimer ce groupe"
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
 #: actions/deletegroup.php:231
 #, fuzzy
-msgid "Delete this group."
+msgid "Delete this group"
 msgstr "Supprimer ce groupe"
 
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
@@ -2031,15 +2020,13 @@ msgstr "Supprimer ce groupe"
 #. TRANS: Client error displayed when trying to mark a notice as favorite without being logged in.
 #. TRANS: Client error displayed trying to block a user from a group while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
-#. TRANS: Client error displayed trying to log out when not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
-#. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
 #. TRANS: Client error displayed when trying to change user options while not logged in.
 #: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
-#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:70
+#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
-#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:98
+#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
 #: lib/adminpanelaction.php:71 lib/profileformaction.php:63
 #: lib/settingsaction.php:72
@@ -2069,13 +2056,12 @@ msgstr "Voulez-vous vraiment supprimer cet avis ?"
 #. TRANS: Submit button title for 'No' when deleting a notice.
 #: actions/deletenotice.php:159
 #, fuzzy
-msgid "Do not delete this notice."
+msgid "Do not delete this notice"
 msgstr "Ne pas supprimer cet avis"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:166
-#, fuzzy
-msgid "Delete this notice."
+#: actions/deletenotice.php:166 lib/noticelist.php:673
+msgid "Delete this notice"
 msgstr "Supprimer cet avis"
 
 #. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
@@ -2112,13 +2098,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting a user.
 #: actions/deleteuser.php:158
 #, fuzzy
-msgid "Do not delete this user."
+msgid "Do not delete this user"
 msgstr "Ne pas supprimer ce groupe"
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
-#: actions/deleteuser.php:165
-#, fuzzy
-msgid "Delete this user."
+#. TRANS: Description of form for deleting a user.
+#: actions/deleteuser.php:165 lib/deleteuserform.php:75
+msgid "Delete this user"
 msgstr "Supprimer cet utilisateur"
 
 #. TRANS: Message used as title for design settings for the site.
@@ -2285,21 +2271,21 @@ msgid "Use defaults"
 msgstr "Utiliser les valeurs par défaut"
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:720
-#, fuzzy
-msgid "Restore default designs."
+#. TRANS: Title for button on profile design page to reset all colour settings to default.
+#: actions/designadminpanel.php:720 lib/designsettings.php:259
+msgid "Restore default designs"
 msgstr "Restaurer les conceptions par défaut"
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:728
-#, fuzzy
-msgid "Reset back to default."
+#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
+#: actions/designadminpanel.php:728 lib/designsettings.php:267
+msgid "Reset back to default"
 msgstr "Revenir aux valeurs par défaut"
 
 #. TRANS: Title for button for saving theme settings.
-#: actions/designadminpanel.php:736
-#, fuzzy
-msgid "Save design."
+#. TRANS: Title for button on profile design page to save settings.
+#: actions/designadminpanel.php:736 lib/designsettings.php:272
+msgid "Save design"
 msgstr "Sauvegarder la conception"
 
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
@@ -2331,7 +2317,7 @@ msgid "You must be logged in to edit an application."
 msgstr "Vous devez être connecté pour modifier une application."
 
 #. TRANS: Client error displayed trying to edit an application that does not exist.
-#: actions/editapplication.php:83 actions/showapplication.php:83
+#: actions/editapplication.php:83 actions/showapplication.php:87
 msgid "No such application."
 msgstr "Application non trouvée."
 
@@ -2612,7 +2598,7 @@ msgid "Cannot normalize that email address."
 msgstr "Impossible d’utiliser cette adresse courriel"
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:393 actions/register.php:204
+#: actions/emailsettings.php:393 actions/register.php:212
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "Adresse courriel invalide."
@@ -2688,22 +2674,19 @@ msgstr "Aucune adresse de courriel entrant."
 
 #. 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.
 #: actions/emailsettings.php:530 actions/emailsettings.php:554
-#: actions/smssettings.php:566 actions/smssettings.php:591
+#: actions/smssettings.php:565 actions/smssettings.php:588
 #, fuzzy
 msgid "Could not update user record."
 msgstr "Impossible de mettre à jour le dossier de l’utilisateur."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
-#. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:534 actions/smssettings.php:570
+#: actions/emailsettings.php:534 actions/smssettings.php:568
 msgid "Incoming email address removed."
 msgstr "L’adresse de courriel entrant a été supprimée."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
-#. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:558 actions/smssettings.php:595
+#: actions/emailsettings.php:558 actions/smssettings.php:591
 msgid "New incoming email address added."
 msgstr "Nouvelle adresse de courriel entrant ajoutée."
 
@@ -2715,7 +2698,7 @@ msgstr "Cet avis a déjà été ajouté à vos favoris !"
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
 #: actions/favor.php:95
 #, fuzzy
-msgid "Disfavor favorite."
+msgid "Disfavor favorite"
 msgstr "Retirer ce favori"
 
 #. TRANS: Page title for first page of favorited notices.
@@ -2957,13 +2940,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
 #: actions/groupblock.php:191
 #, fuzzy
-msgid "Do not block this user from this group."
+msgid "Do not block this user from this group"
 msgstr "Ne pas bloquer cet utilisateur pour ce groupe"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
 #: actions/groupblock.php:198
 #, fuzzy
-msgid "Block this user from this group."
+msgid "Block this user from this group"
 msgstr "Bloquer cet utilisateur de de groupe"
 
 #. TRANS: Server error displayed when trying to block a user from a group fails because of an application error.
@@ -2973,7 +2956,6 @@ msgstr ""
 "Erreur de la base de données lors du blocage de l’utilisateur du groupe."
 
 #. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
-#. TRANS: Client error displayed trying to find a user by ID without providing an ID.
 #: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr "Aucun identifiant."
@@ -3164,10 +3146,8 @@ msgid "Group search"
 msgstr "Rechercher des groupes"
 
 #. TRANS: Text on page where groups can be searched if no results were found for a query.
-#. TRANS: Text for notice search results is the query had no results.
-#. TRANS: Message on the "People search" page where a query has no results.
-#: actions/groupsearch.php:82 actions/noticesearch.php:122
-#: actions/peoplesearch.php:87
+#: actions/groupsearch.php:82 actions/noticesearch.php:117
+#: actions/peoplesearch.php:83
 msgid "No results."
 msgstr "Aucun résultat."
 
@@ -3204,7 +3184,6 @@ msgid "User is not blocked from group."
 msgstr "Cet utilisateur n’est pas bloqué du groupe."
 
 #. TRANS: Server error displayed when unblocking a user from a group fails because of an unknown error.
-#. TRANS: Server error displayed when removing a user block.
 #: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "Erreur lors de l’annulation du blocage."
@@ -3304,8 +3283,7 @@ msgid "Publish a MicroID for my Jabber/Google Talk address."
 msgstr "Publier un MicroID pour mon adresse Jabber/GTalk."
 
 #. TRANS: Confirmation message for successful Instant Messaging preferences save.
-#. TRANS: Confirmation message after saving preferences.
-#: actions/imsettings.php:283 actions/othersettings.php:193
+#: actions/imsettings.php:283 actions/othersettings.php:192
 msgid "Preferences saved."
 msgstr "Préférences enregistrées"
 
@@ -3603,7 +3581,7 @@ msgstr "Vous devez ouvrir une session pour quitter un groupe."
 
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
-#: actions/leavegroup.php:103 lib/command.php:386
+#: actions/leavegroup.php:103 lib/command.php:398
 msgid "You are not a member of that group."
 msgstr "Vous n’êtes pas membre de ce groupe."
 
@@ -3727,45 +3705,43 @@ msgstr "Enregistrer"
 msgid "Save license settings"
 msgstr "Enregistrer les paramètres de licence"
 
-#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
-#: actions/login.php:97 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
 msgid "Already logged in."
 msgstr "Déjà connecté."
 
-#: actions/login.php:142
+#: actions/login.php:148
 msgid "Incorrect username or password."
 msgstr "Identifiant ou mot de passe incorrect."
 
-#. TRANS: Server error displayed when a user object could not be created trying to login using "one time password login".
-#: actions/login.php:148 actions/otp.php:127
+#: actions/login.php:154 actions/otp.php:120
 msgid "Error setting user. You are probably not authorized."
 msgstr ""
 "Erreur lors de la mise en place de l’utilisateur. Vous n’y êtes probablement "
 "pas autorisé."
 
-#: actions/login.php:202 actions/login.php:253
+#: actions/login.php:210 actions/login.php:263
 msgid "Login"
 msgstr "Ouvrir une session"
 
-#: actions/login.php:239
+#: actions/login.php:249
 msgid "Login to site"
 msgstr "Ouverture de session"
 
-#: actions/login.php:248 actions/register.php:476
+#: actions/login.php:258 actions/register.php:490
 msgid "Remember me"
 msgstr "Se souvenir de moi"
 
-#: actions/login.php:249 actions/register.php:478
+#: actions/login.php:259 actions/register.php:492
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 "Ouvrir automatiquement ma session à l’avenir (déconseillé pour les "
 "ordinateurs publics ou partagés)"
 
-#: actions/login.php:259
+#: actions/login.php:269
 msgid "Lost or forgotten password?"
 msgstr "Mot de passe perdu ?"
 
-#: actions/login.php:277
+#: actions/login.php:288
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -3773,11 +3749,11 @@ msgstr ""
 "Pour des raisons de sécurité, veuillez entrer à nouveau votre identifiant et "
 "votre mot de passe afin d’enregistrer vos préférences."
 
-#: actions/login.php:281
+#: actions/login.php:292
 msgid "Login with your username and password."
 msgstr "Ouvrez une session avec un identifiant et un mot de passe."
 
-#: actions/login.php:284
+#: actions/login.php:295
 #, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -3863,14 +3839,14 @@ msgid "New message"
 msgstr "Nouveau message"
 
 #. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
-#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:501
+#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:513
 msgid "You can't send a message to this user."
 msgstr "Vous ne pouvez pas envoyer de messages à cet utilisateur."
 
 #. TRANS: Command exception text shown when trying to send a direct message to another user without content.
 #. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
-#: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:478
-#: lib/command.php:581
+#: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:490
+#: lib/command.php:593
 msgid "No content!"
 msgstr "Aucun contenu !"
 
@@ -3879,7 +3855,7 @@ msgid "No recipient specified."
 msgstr "Aucun destinataire n’a été spécifié."
 
 #. TRANS: Error text shown when trying to send a direct message to self.
-#: actions/newmessage.php:167 lib/command.php:505
+#: actions/newmessage.php:167 lib/command.php:517
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
@@ -3891,7 +3867,7 @@ msgstr "Message envoyé"
 
 #. TRANS: Message given have sent a direct message to another user.
 #. TRANS: %s is the name of the other user.
-#: actions/newmessage.php:188 lib/command.php:513
+#: actions/newmessage.php:188 lib/command.php:525
 #, php-format
 msgid "Direct message to %s sent."
 msgstr "Message direct envoyé à %s."
@@ -3908,9 +3884,7 @@ msgstr "Nouvel avis"
 msgid "Notice posted"
 msgstr "Avis publié"
 
-#. TRANS: Instructions for Notice search page.
-#. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/noticesearch.php:69
+#: actions/noticesearch.php:68
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -3919,21 +3893,16 @@ msgstr ""
 "Recherchez les avis %%site.name%% par leur contenu. Séparez les termes de "
 "recherche par des espaces. Ils doivent contenir au moins 3 caractères."
 
-#. TRANS: Title of the page where users can search for notices.
-#: actions/noticesearch.php:80
+#: actions/noticesearch.php:78
 msgid "Text search"
 msgstr "Recherche de texte"
 
-#. TRANS: Test in RSS notice search.
-#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearch.php:95
+#: actions/noticesearch.php:91
 #, php-format
 msgid "Search results for \"%1$s\" on %2$s"
 msgstr "Résultats de la recherche pour « %1$s » sur %2$s"
 
-#. TRANS: Text for logged in users making a query for notices without results.
-#. TRANS: This message contains a Markdown link.
-#: actions/noticesearch.php:128
+#: actions/noticesearch.php:121
 #, php-format
 msgid ""
 "Be the first to [post on this topic](%%%%action.newnotice%%%%?"
@@ -3942,9 +3911,7 @@ msgstr ""
 "Soyez le premier à [poster sur ce sujet](%%%%action.newnotice%%%%?"
 "status_textarea=%s) !"
 
-#. TRANS: Text for not logged in users making a query for notices without results.
-#. TRANS: This message contains Markdown links.
-#: actions/noticesearch.php:133
+#: actions/noticesearch.php:124
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and be the first to "
@@ -3954,17 +3921,14 @@ msgstr ""
 "premier à [poster sur ce sujet](%%%%action.newnotice%%%%?status_textarea=%"
 "s) !"
 
-#. TRANS: RSS notice search feed title. %s is the query.
-#: actions/noticesearchrss.php:95
+#: actions/noticesearchrss.php:96
 #, php-format
 msgid "Updates with \"%s\""
 msgstr "Mises à jour avec « %s »"
 
-#. TRANS: RSS notice search feed description.
-#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearchrss.php:99
+#: actions/noticesearchrss.php:98
 #, fuzzy, php-format
-msgid "Updates matching search term \"%1$s\" on %2$s."
+msgid "Updates matching search term \"%1$s\" on %2$s!"
 msgstr "mises à jour correspondant au(x) terme(s) « %1$s » sur %2$s !"
 
 #: actions/nudge.php:85
@@ -4005,31 +3969,31 @@ msgid "You have not registered any applications yet."
 msgstr "Vous n’avez encore enregistré aucune application."
 
 #. TRANS: Title for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:70
+#: actions/oauthconnectionssettings.php:71
 msgid "Connected applications"
 msgstr "Applications connectées."
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:81
+#: actions/oauthconnectionssettings.php:83
 msgid "The following connections exist for your account."
 msgstr ""
 "Vous avez autorisé les applications suivantes à se connecter à votre compte."
 
 #. TRANS: Client error when trying to revoke access for an application while not being a user of it.
-#: actions/oauthconnectionssettings.php:166
+#: actions/oauthconnectionssettings.php:168
 msgid "You are not a user of that application."
 msgstr "Vous n’êtes pas un utilisateur de cette application."
 
 #. TRANS: Client error when revoking access has failed for some reason.
 #. TRANS: %s is the application ID revoking access failed for.
-#: actions/oauthconnectionssettings.php:181
+#: actions/oauthconnectionssettings.php:183
 #, php-format
 msgid "Unable to revoke access for application: %s."
 msgstr "Impossible de révoquer l’accès par l’application : %s."
 
 #. TRANS: Success message after revoking access for an application.
 #. TRANS: %1$s is the application name, %2$s is the first part of the user token.
-#: actions/oauthconnectionssettings.php:200
+#: actions/oauthconnectionssettings.php:202
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -4039,14 +4003,14 @@ msgstr ""
 "jeton personnel d’accès commençant par %2$s."
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:211
+#: actions/oauthconnectionssettings.php:213
 msgid "You have not authorized any applications to use your account."
 msgstr "Vous n’avez autorisé aucune application à utiliser votre compte."
 
 #. TRANS: Note for developers in the OAuth connection settings form.
 #. TRANS: This message contains a Markdown link. Do not separate "](".
 #. TRANS: %s is the URL to the OAuth settings.
-#: actions/oauthconnectionssettings.php:231
+#: actions/oauthconnectionssettings.php:233
 #, php-format
 msgid ""
 "Are you a developer? [Register an OAuth client application](%s) to use with "
@@ -4055,16 +4019,6 @@ msgstr ""
 "Êtes-vous un développeur ? [Inscrivez une application cliente OAuth](%s) à "
 "utiliser avec cette instance de StatusNet."
 
-#: actions/oembed.php:64
-#, fuzzy, php-format
-msgid "\"%s\" not found."
-msgstr "Page non trouvée."
-
-#: actions/oembed.php:76
-#, fuzzy, php-format
-msgid "Notice %s not found."
-msgstr "L’avis parent correspondant à cette réponse n’a pas été trouvé."
-
 #: actions/oembed.php:80 actions/shownotice.php:100
 msgid "Notice has no profile."
 msgstr "L’avis n’a pas de profil."
@@ -4074,16 +4028,6 @@ msgstr "L’avis n’a pas de profil."
 msgid "%1$s's status on %2$s"
 msgstr "Statut de %1$s sur %2$s"
 
-#: actions/oembed.php:95
-#, fuzzy, php-format
-msgid "Attachment %s not found."
-msgstr "Destinataire non trouvé."
-
-#: actions/oembed.php:136
-#, php-format
-msgid "\"%s\" not supported for oembed requests."
-msgstr ""
-
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
 #: actions/oembed.php:168
 #, php-format
@@ -4102,12 +4046,11 @@ msgstr "Veuillez n'utiliser que des URL HTTP complètes en %s."
 msgid "Not a supported data format."
 msgstr "Format de données non supporté."
 
-#. TRANS: ShortName in the OpenSearch interface when trying to find users.
 #: actions/opensearch.php:64
 msgid "People Search"
 msgstr "Recherche de personnes"
 
-#: actions/opensearch.php:68
+#: actions/opensearch.php:67
 msgid "Notice Search"
 msgstr "Recherche d’avis"
 
@@ -4127,7 +4070,7 @@ msgstr "Autres options à configurer"
 #. TRANS: here if it has one (most likely a single space).
 #: actions/othersettings.php:113
 msgid " (free service)"
-msgstr " (service gratuit)"
+msgstr " (service libre)"
 
 #. TRANS: Label for dropdown with URL shortener services.
 #: actions/othersettings.php:122
@@ -4154,46 +4097,37 @@ msgstr "Afficher ou masquer les paramètres de conception."
 msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr "Le service de réduction d’URL est trop long (50 caractères maximum)."
 
-#. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
-#: actions/otp.php:70
+#: actions/otp.php:69
 msgid "No user ID specified."
 msgstr "Aucun identifiant d’utilisateur n’a été spécifié."
 
-#. TRANS: Client error displayed trying to use "one time password login" without specifying a login token.
-#: actions/otp.php:86
+#: actions/otp.php:83
 msgid "No login token specified."
 msgstr "Aucun jeton d’identification n’a été spécifié."
 
-#. TRANS: Client error displayed trying to use "one time password login" without requesting a login token.
-#: actions/otp.php:94
+#: actions/otp.php:90
 msgid "No login token requested."
 msgstr "Aucun jeton d’identification n’a été demandé."
 
-#. TRANS: Client error displayed trying to use "one time password login" while specifying an invalid login token.
-#: actions/otp.php:100
+#: actions/otp.php:95
 msgid "Invalid login token specified."
 msgstr "Jeton d’identification invalide."
 
-#. TRANS: Client error displayed trying to use "one time password login" while specifying an expired login token.
-#: actions/otp.php:110
+#: actions/otp.php:104
 msgid "Login token expired."
 msgstr "Jeton d’identification périmé."
 
-#. TRANS: Title for outbox for any but the fist page.
-#. TRANS: %1$s is the user nickname, %2$d is the page number.
-#: actions/outbox.php:57
+#: actions/outbox.php:58
 #, php-format
 msgid "Outbox for %1$s - page %2$d"
 msgstr "Boîte d’envoi de %1$s - page %2$d"
 
-#. TRANS: Title for first page of outbox.
 #: actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
 msgstr "Boîte d’envoi de %s"
 
-#. TRANS: Instructions for outbox.
-#: actions/outbox.php:103
+#: actions/outbox.php:104
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr ""
 "Cette boîte d’envoi regroupe les messages personnels que vous avez envoyés."
@@ -4220,45 +4154,43 @@ msgstr "Ancien mot de passe"
 msgid "New password"
 msgstr "Nouveau mot de passe"
 
-#: actions/passwordsettings.php:109 actions/register.php:423
+#: actions/passwordsettings.php:109
 #, fuzzy
-msgid "6 or more characters."
+msgid "6 or more characters"
 msgstr "6 caractères ou plus"
 
-#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:264
-#: actions/register.php:427
+#: actions/passwordsettings.php:113
 #, fuzzy
-msgid "Same as password above."
+msgid "Same as password above"
 msgstr "Identique au mot de passe ci-dessus"
 
 #: actions/passwordsettings.php:117
 msgid "Change"
 msgstr "Modifier"
 
-#: actions/passwordsettings.php:153 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:238
 msgid "Password must be 6 or more characters."
 msgstr "Votre mot de passe doit contenir au moins 6 caractères."
 
-#: actions/passwordsettings.php:156 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:241
 msgid "Passwords don't match."
 msgstr "Les mots de passe ne correspondent pas."
 
-#: actions/passwordsettings.php:164
+#: actions/passwordsettings.php:165
 msgid "Incorrect old password"
 msgstr "Ancien mot de passe incorrect"
 
-#: actions/passwordsettings.php:180
+#: actions/passwordsettings.php:181
 msgid "Error saving user; invalid."
 msgstr "Erreur lors de l’enregistrement de l’utilisateur ; invalide."
 
-#. TRANS: Reset password form validation error message.
-#: actions/passwordsettings.php:185 actions/recoverpassword.php:418
+#: actions/passwordsettings.php:186
 #, fuzzy
-msgid "Cannot save new password."
+msgid "Can't save new password."
 msgstr "Impossible de sauvegarder le nouveau mot de passe."
 
-#: actions/passwordsettings.php:191
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
 msgid "Password saved."
 msgstr "Mot de passe enregistré."
 
@@ -4532,9 +4464,7 @@ msgstr "Serveur vers lequel diriger les requêtes SSL."
 msgid "Save paths"
 msgstr "Enregistrer les chemins."
 
-#. TRANS: Instructions for the "People search" page.
-#. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/peoplesearch.php:54
+#: actions/peoplesearch.php:52
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
@@ -4544,8 +4474,7 @@ msgstr ""
 "ou leurs intérêts. Séparez les termes de recherche par des espaces. Ils "
 "doivent contenir au moins 3 caractères."
 
-#. TRANS: Title of a page where users can search for other users.
-#: actions/peoplesearch.php:61
+#: actions/peoplesearch.php:58
 msgid "People search"
 msgstr "Recherche de personnes"
 
@@ -4589,14 +4518,14 @@ msgid "Profile information"
 msgstr "Information de profil"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109 actions/register.php:419
+#: actions/profilesettings.php:109 actions/register.php:433
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr "1 à 64 lettres minuscules ou chiffres, sans ponctuation ni espaces."
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for full group name (dt). Text hidden by default.
 #. TRANS: DT for full name in a profile.
-#: actions/profilesettings.php:113 actions/register.php:441
+#: actions/profilesettings.php:113 actions/register.php:455
 #: actions/showgroup.php:255 actions/tagother.php:104
 #: lib/groupeditform.php:150 lib/userprofile.php:156
 msgid "Full name"
@@ -4604,13 +4533,13 @@ msgstr "Nom complet"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:118 actions/register.php:446
+#: actions/profilesettings.php:118 actions/register.php:460
 #: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "Site personnel"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:121 actions/register.php:448
+#: actions/profilesettings.php:121
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr ""
 "Adresse URL de votre page personnelle, blogue ou profil sur un autre site."
@@ -4618,7 +4547,7 @@ msgstr ""
 #. TRANS: Tooltip for field label in form for profile settings. Plural
 #. TRANS: is decided by the number of characters available for the
 #. TRANS: biography (%d).
-#: actions/profilesettings.php:129 actions/register.php:457
+#: actions/profilesettings.php:129 actions/register.php:471
 #, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4626,29 +4555,28 @@ msgstr[0] "Décrivez-vous avec vos intérêts en %d caractère"
 msgstr[1] "Décrivez-vous avec vos intérêts en %d caractères"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:135 actions/register.php:462
+#: actions/profilesettings.php:135 actions/register.php:476
 msgid "Describe yourself and your interests"
 msgstr "Décrivez vous et vos interêts"
 
 #. TRANS: Text area label in form for profile settings where users can provide.
 #. TRANS: their biography.
-#: actions/profilesettings.php:139 actions/register.php:464
+#: actions/profilesettings.php:139 actions/register.php:478
 msgid "Bio"
 msgstr "Bio"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group location (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT for location in a profile.
-#: actions/profilesettings.php:145 actions/register.php:469
+#: actions/profilesettings.php:145 actions/register.php:483
 #: actions/showgroup.php:265 actions/tagother.php:112
-#: actions/userauthorization.php:174 lib/groupeditform.php:173
+#: actions/userauthorization.php:166 lib/groupeditform.php:173
 #: lib/userprofile.php:172
 msgid "Location"
 msgstr "Emplacement"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148
+#: actions/profilesettings.php:148 actions/register.php:485
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Indiquez votre emplacement, ex.: « Ville, État (ou région), Pays »"
 
@@ -4669,8 +4597,7 @@ msgstr "Balises"
 #: actions/profilesettings.php:164
 #, fuzzy
 msgid ""
-"Tags for yourself (letters, numbers, -, ., and _), comma- or space- "
-"separated."
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr ""
 "Marques pour vous-même (lettres, chiffres, -, ., et _), séparées par des "
 "virgules ou des espaces"
@@ -4683,7 +4610,7 @@ msgstr "Langue"
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
 #: actions/profilesettings.php:171
 #, fuzzy
-msgid "Preferred language."
+msgid "Preferred language"
 msgstr "Langue préférée"
 
 #. TRANS: Dropdownlist label in form for profile settings.
@@ -4700,7 +4627,7 @@ msgstr "Quel est votre fuseau horaire habituel ?"
 #: actions/profilesettings.php:189
 #, fuzzy
 msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)."
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr ""
 "M’abonner automatiquement à tous ceux qui s’abonnent à moi (recommandé pour "
 "les utilisateurs non-humains)"
@@ -4708,7 +4635,7 @@ msgstr ""
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Plural form is used based on the maximum number of allowed
 #. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:258 actions/register.php:221
+#: actions/profilesettings.php:258 actions/register.php:229
 #, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4727,9 +4654,9 @@ msgstr "La langue est trop longue (limitée à 50 caractères maximum)."
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:291
-#, fuzzy, php-format
-msgid "Invalid tag: \"%s\"."
+#: actions/profilesettings.php:291 actions/tagother.php:178
+#, php-format
+msgid "Invalid tag: \"%s\""
 msgstr "Marque invalide : « %s »"
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
@@ -4838,12 +4765,6 @@ msgstr ""
 "%%site.name%% est un service de [micro-blogging](http://fr.wikipedia.org/"
 "wiki/Microblog) basé sur le logiciel libre [StatusNet](http://status.net/)."
 
-#. TRANS: Public RSS feed description. %s is the StatusNet site name.
-#: actions/publicrss.php:106
-#, fuzzy, php-format
-msgid "%s updates from everyone."
-msgstr "%s statuts de tout le monde !"
-
 #. TRANS: Title for public tag cloud.
 #: actions/publictagcloud.php:57
 msgid "Public tag cloud"
@@ -4983,12 +4904,6 @@ msgstr "Récupérer le mot de passe"
 msgid "Password recovery requested"
 msgstr "Récupération de mot de passe demandée"
 
-#. TRANS: Title for password recovery page in password saved mode.
-#: actions/recoverpassword.php:229
-#, fuzzy
-msgid "Password saved"
-msgstr "Mot de passe enregistré."
-
 #. TRANS: Title for password recovery page when an unknown action has been specified.
 #: actions/recoverpassword.php:232
 msgid "Unknown action"
@@ -5000,6 +4915,12 @@ msgstr "Action inconnue"
 msgid "6 or more characters, and do not forget it!"
 msgstr "6 caractères ou plus, et ne l’oubliez pas !"
 
+#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#: actions/recoverpassword.php:264 actions/register.php:441
+#, fuzzy
+msgid "Same as password above."
+msgstr "Identique au mot de passe ci-dessus"
+
 #. TRANS: Button text for password reset form.
 #. TRANS: Button text on profile design page to reset all colour settings to default without saving.
 #: actions/recoverpassword.php:268 lib/designsettings.php:264
@@ -5051,8 +4972,14 @@ msgstr "Le mot de passe doit contenir au moins 6 caractères."
 msgid "Password and confirmation do not match."
 msgstr "Le mot de passe et sa confirmation ne correspondent pas."
 
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:418
+#, fuzzy
+msgid "Cannot save new password."
+msgstr "Impossible de sauvegarder le nouveau mot de passe."
+
 #. TRANS: Server error displayed when something does wrong with the user object during password reset.
-#: actions/recoverpassword.php:426 actions/register.php:248
+#: actions/recoverpassword.php:426 actions/register.php:256
 msgid "Error setting user."
 msgstr "Erreur lors de la configuration de l’utilisateur."
 
@@ -5062,72 +4989,78 @@ msgid "New password successfully saved. You are now logged in."
 msgstr ""
 "Nouveau mot de passe créé avec succès. Votre session est maintenant ouverte."
 
-#: actions/register.php:87 actions/register.php:188 actions/register.php:399
+#: actions/register.php:92 actions/register.php:196 actions/register.php:413
 msgid "Sorry, only invited people can register."
 msgstr "Désolé ! Seules les personnes invitées peuvent s’inscrire."
 
-#: actions/register.php:94
+#: actions/register.php:99
 msgid "Sorry, invalid invitation code."
 msgstr "Désolé, code d’invitation invalide."
 
-#: actions/register.php:113
+#: actions/register.php:119
 msgid "Registration successful"
 msgstr "Compte créé avec succès"
 
-#: actions/register.php:115 actions/register.php:497
+#: actions/register.php:121 actions/register.php:511
 msgid "Register"
 msgstr "Créer un compte"
 
-#: actions/register.php:135
+#: actions/register.php:142
 msgid "Registration not allowed."
 msgstr "Inscription non autorisée."
 
-#: actions/register.php:201
+#: actions/register.php:209
 #, fuzzy
-msgid "You cannot register if you don't agree to the license."
+msgid "You can't register if you don't agree to the license."
 msgstr "Vous ne pouvez pas vous inscrire si vous n’acceptez pas la licence."
 
-#: actions/register.php:210
+#: actions/register.php:218
 msgid "Email address already exists."
 msgstr "Cette adresse courriel est déjà utilisée."
 
-#: actions/register.php:243 actions/register.php:265
+#: actions/register.php:251 actions/register.php:273
 msgid "Invalid username or password."
 msgstr "Identifiant ou mot de passe incorrect."
 
-#: actions/register.php:340
+#: actions/register.php:351
 #, fuzzy
 msgid ""
 "With this form you can create a new account. You can then post notices and "
-"link up to friends and colleagues."
+"link up to friends and colleagues. "
 msgstr ""
 "Avec ce formulaire vous pouvez créer un nouveau compte. Vous pourrez ensuite "
 "poster des avis and et vous relier à des amis et collègues. "
 
+#: actions/register.php:437
+#, fuzzy
+msgid "6 or more characters."
+msgstr "6 caractères ou plus"
+
 #. TRANS: Link description in user account settings menu.
-#: actions/register.php:431 actions/register.php:435
+#: actions/register.php:445 actions/register.php:449
 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
 msgid "Email"
 msgstr "Courriel"
 
-#: actions/register.php:432 actions/register.php:436
+#: actions/register.php:446 actions/register.php:450
 #, fuzzy
-msgid "Used only for updates, announcements, and password recovery."
+msgid "Used only for updates, announcements, and password recovery"
 msgstr ""
 "Utilisé uniquement pour les mises à jour, les notifications, et la "
 "récupération de mot de passe"
 
-#: actions/register.php:443
+#: actions/register.php:457
 #, fuzzy
-msgid "Longer name, preferably your \"real\" name."
+msgid "Longer name, preferably your \"real\" name"
 msgstr "Nom plus long, votre \"vrai\" nom de préférence"
 
-#: actions/register.php:471
+#: actions/register.php:462
 #, fuzzy
-msgid "Where you are, like \"City, State (or Region), Country\"."
-msgstr "Indiquez votre emplacement, ex.: « Ville, État (ou région), Pays »"
+msgid "URL of your homepage, blog, or profile on another site"
+msgstr ""
+"Adresse URL de votre page personnelle, blogue ou profil sur un autre site."
 
-#: actions/register.php:510
+#: actions/register.php:523
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
@@ -5135,23 +5068,23 @@ msgstr ""
 "Je comprends que le contenu et les données de %1$s sont privés et "
 "confidentiels."
 
-#: actions/register.php:520
+#: actions/register.php:533
 #, php-format
 msgid "My text and files are copyright by %1$s."
 msgstr "Mon texte et les fichiers sont protégés par copyright par %1$s."
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:524
+#: actions/register.php:537
 msgid "My text and files remain under my own copyright."
 msgstr "Mon texte et les fichiers restent sous mon propre droit d'auteur."
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:527
+#: actions/register.php:540
 msgid "All rights reserved."
 msgstr "Tous droits réservés."
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:532
+#: actions/register.php:545
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -5161,7 +5094,7 @@ msgstr ""
 "données personnelles : mot de passe, adresse électronique, adresse de "
 "messagerie instantanée, numéro de téléphone."
 
-#: actions/register.php:573
+#: actions/register.php:588
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -5195,7 +5128,7 @@ msgstr ""
 "Merci pour votre inscription ! Nous vous souhaitons d’apprécier notre "
 "service."
 
-#: actions/register.php:597
+#: actions/register.php:612
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5229,7 +5162,7 @@ msgstr "Pseudo de l’utilisateur"
 
 #: actions/remotesubscribe.php:129
 #, fuzzy
-msgid "Nickname of the user you want to follow."
+msgid "Nickname of the user you want to follow"
 msgstr "Pseudo de l’utilisateur que vous voulez suivre"
 
 #: actions/remotesubscribe.php:132
@@ -5238,7 +5171,7 @@ msgstr "URL du profil"
 
 #: actions/remotesubscribe.php:133
 #, fuzzy
-msgid "URL of your profile on another compatible microblogging service."
+msgid "URL of your profile on another compatible microblogging service"
 msgstr "URL de votre profil sur un autre service de micro-blogging compatible"
 
 #. TRANS: Link text for link that will subscribe to a remote profile.
@@ -5249,7 +5182,7 @@ msgstr "S’abonner"
 
 #: actions/remotesubscribe.php:158
 #, fuzzy
-msgid "Invalid profile URL (bad format)."
+msgid "Invalid profile URL (bad format)"
 msgstr "URL du profil invalide (mauvais format)"
 
 #: actions/remotesubscribe.php:167
@@ -5292,7 +5225,6 @@ msgstr "Repris"
 msgid "Repeated!"
 msgstr "Repris !"
 
-#. TRANS: RSS reply feed title. %s is a user nickname.
 #. TRANS: Tooltip for personal group navigation menu option when logged in for viewing @-replies.
 #: actions/replies.php:126 actions/repliesrss.php:68
 #: lib/personalgroupnav.php:109
@@ -5349,11 +5281,9 @@ msgstr ""
 "quelque chose à son intention](%%%%action.newnotice%%%%?status_textarea=%3"
 "$s)."
 
-#. TRANS: RSS reply feed description.
-#. TRANS: %1$s is a user nickname, %2$s is the StatusNet site name.
-#: actions/repliesrss.php:74
+#: actions/repliesrss.php:72
 #, fuzzy, php-format
-msgid "Replies to %1$s on %2$s."
+msgid "Replies to %1$s on %2$s!"
 msgstr "Réponses à %1$s sur %2$s !"
 
 #. TRANS: Client exception displayed when trying to restore an account while not logged in.
@@ -5455,7 +5385,7 @@ msgstr "Vous ne pouvez pas révoquer les rôles des utilisateurs sur ce site."
 msgid "User doesn't have this role."
 msgstr "L'utilisateur ne possède pas ce rôle."
 
-#: actions/rsd.php:142 actions/version.php:159
+#: actions/rsd.php:146 actions/version.php:159
 msgid "StatusNet"
 msgstr "StatusNet"
 
@@ -5498,87 +5428,87 @@ msgstr "Activer la sortie de déboguage pour les sessions."
 msgid "Save site settings"
 msgstr "Sauvegarder les paramètres du site"
 
-#: actions/showapplication.php:78
+#: actions/showapplication.php:82
 msgid "You must be logged in to view an application."
 msgstr "Vous devez être connecté pour voir une application."
 
-#: actions/showapplication.php:151
+#: actions/showapplication.php:157
 msgid "Application profile"
 msgstr "Profil de l’application"
 
 #. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:153 lib/applicationeditform.php:177
+#: actions/showapplication.php:159 lib/applicationeditform.php:177
 msgid "Icon"
 msgstr "Icône"
 
 #. TRANS: Form input field label for application name.
-#: actions/showapplication.php:163 actions/version.php:197
+#: actions/showapplication.php:169 actions/version.php:197
 #: lib/applicationeditform.php:190
 msgid "Name"
 msgstr "Nom"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:172 lib/applicationeditform.php:227
+#: actions/showapplication.php:178 lib/applicationeditform.php:227
 msgid "Organization"
 msgstr "Organisation"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:181 actions/version.php:200
+#: actions/showapplication.php:187 actions/version.php:200
 #: lib/applicationeditform.php:208 lib/groupeditform.php:168
 msgid "Description"
 msgstr "Description"
 
 #. TRANS: Header for group statistics on a group page (h2).
 #. TRANS: H2 text for user statistics.
-#: actions/showapplication.php:186 actions/showgroup.php:460
+#: actions/showapplication.php:192 actions/showgroup.php:460
 #: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "Statistiques"
 
-#: actions/showapplication.php:197
+#: actions/showapplication.php:203
 #, php-format
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr "Créé par %1$s - accès %2$s par défaut - %3$d utilisateurs"
 
-#: actions/showapplication.php:207
+#: actions/showapplication.php:213
 msgid "Application actions"
 msgstr "Actions de l’application"
 
-#: actions/showapplication.php:230
+#: actions/showapplication.php:236
 msgid "Reset key & secret"
 msgstr "Réinitialiser la clé et le secret"
 
 #. TRANS: Title of form for deleting a user.
-#: actions/showapplication.php:246 lib/deletegroupform.php:121
+#: actions/showapplication.php:252 lib/deletegroupform.php:121
 #: lib/deleteuserform.php:64 lib/noticelist.php:673
 msgid "Delete"
 msgstr "Supprimer"
 
-#: actions/showapplication.php:255
+#: actions/showapplication.php:261
 msgid "Application info"
 msgstr "Informations sur l’application"
 
-#: actions/showapplication.php:257
+#: actions/showapplication.php:263
 msgid "Consumer key"
 msgstr "Clé de l’utilisateur"
 
-#: actions/showapplication.php:262
+#: actions/showapplication.php:268
 msgid "Consumer secret"
 msgstr "Secret de l’utilisateur"
 
-#: actions/showapplication.php:267
+#: actions/showapplication.php:273
 msgid "Request token URL"
 msgstr "URL du jeton de requête"
 
-#: actions/showapplication.php:272
+#: actions/showapplication.php:278
 msgid "Access token URL"
 msgstr "URL du jeton d’accès"
 
-#: actions/showapplication.php:277
+#: actions/showapplication.php:283
 msgid "Authorize URL"
 msgstr "Autoriser l’URL"
 
-#: actions/showapplication.php:282
+#: actions/showapplication.php:288
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
@@ -5586,7 +5516,7 @@ msgstr ""
 "Note : Nous utilisons les signatures HMAC-SHA1. Nous n’utilisons pas la "
 "méthode de signature en texte clair."
 
-#: actions/showapplication.php:302
+#: actions/showapplication.php:309
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr "Voulez-vous vraiment réinitialiser votre clé consommateur et secrète ?"
 
@@ -5679,18 +5609,16 @@ msgid "Group profile"
 msgstr "Profil du groupe"
 
 #. TRANS: Label for group URL (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT for URL in a profile.
 #: actions/showgroup.php:273 actions/tagother.php:118
-#: actions/userauthorization.php:184 lib/userprofile.php:186
+#: actions/userauthorization.php:175 lib/userprofile.php:186
 msgid "URL"
 msgstr "URL"
 
 #. TRANS: Label for group description or group note (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page where bio is displayed.
 #. TRANS: DT for note in a profile.
 #: actions/showgroup.php:285 actions/tagother.php:128
-#: actions/userauthorization.php:197 lib/userprofile.php:204
+#: actions/userauthorization.php:187 lib/userprofile.php:204
 msgid "Note"
 msgstr "Note"
 
@@ -5838,7 +5766,7 @@ msgid "%1$s tagged %2$s"
 msgstr "%1$s a marqué « %2$s »"
 
 #. TRANS: Page title showing tagged notices in one user's stream.
-#. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
+#. TRANS: %1$s is the username, %2$s is the hash tag, %1$d is the page number.
 #: actions/showstream.php:74
 #, php-format
 msgid "%1$s tagged %2$s, page %3$d"
@@ -6092,7 +6020,7 @@ msgstr ""
 #. TRANS: Title for button to save site notice in admin panel.
 #: actions/sitenoticeadminpanel.php:201
 #, fuzzy
-msgid "Save site notice."
+msgid "Save site notice"
 msgstr "Enregistrer l'avis du site"
 
 #. TRANS: Title for SMS settings.
@@ -6153,7 +6081,7 @@ msgstr "Numéro de téléphone pour les SMS"
 #. TRANS: SMS phone number input field instructions in SMS settings form.
 #: actions/smssettings.php:152
 #, fuzzy
-msgid "Phone number, no punctuation or spaces, with area code."
+msgid "Phone number, no punctuation or spaces, with area code"
 msgstr ""
 "Numéro de téléphone, sans ponctuation ni espaces, incluant le code régional"
 
@@ -6324,21 +6252,17 @@ msgstr "Vous n’êtes pas abonné(e) à ce profil."
 msgid "Could not save subscription."
 msgstr "Impossible d’enregistrer l’abonnement."
 
-#. TRANS: Client error displayed trying to perform any request method other than POST.
-#. TRANS: Do not translate POST.
 #: actions/subscribe.php:77
 msgid "This action only accepts POST requests."
 msgstr "Cette action n'accepte que les requêtes de type POST."
 
-#. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
-#: actions/subscribe.php:121
+#: actions/subscribe.php:117
 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
 msgstr ""
 "Vous ne pouvez pas vous abonner  à un profil OMB 0.1 distant par cette "
 "action."
 
-#. TRANS: Page title when subscription succeeded.
-#: actions/subscribe.php:149
+#: actions/subscribe.php:145
 msgid "Subscribed"
 msgstr "Abonné"
 
@@ -6498,9 +6422,8 @@ msgstr "Marque %s"
 msgid "User profile"
 msgstr "Profil de l’utilisateur"
 
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT element in area for user avatar.
-#: actions/tagother.php:81 actions/userauthorization.php:138
+#: actions/tagother.php:81 actions/userauthorization.php:132
 #: lib/userprofile.php:108
 msgid "Photo"
 msgstr "Photo"
@@ -6517,11 +6440,6 @@ msgstr ""
 "Marques pour cet utilisateur (lettres, chiffres, -, ., et _), séparées par "
 "des virgules ou des espaces"
 
-#: actions/tagother.php:178
-#, php-format
-msgid "Invalid tag: \"%s\""
-msgstr "Marque invalide : « %s »"
-
 #: actions/tagother.php:193
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
@@ -6538,7 +6456,6 @@ msgstr ""
 msgid "No such tag."
 msgstr "Cette marque n’existe pas."
 
-#. TRANS: Client error displayed when trying to unblock a non-blocked user.
 #: actions/unblock.php:59
 msgid "You haven't blocked that user."
 msgstr "Vous n’avez pas bloqué cet utilisateur."
@@ -6559,7 +6476,7 @@ msgstr "Aucun identifiant de profil dans la requête."
 msgid "Unsubscribed"
 msgstr "Désabonné"
 
-#: actions/updateprofile.php:64
+#: actions/updateprofile.php:64 actions/userauthorization.php:337
 #, php-format
 msgid ""
 "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
@@ -6592,7 +6509,7 @@ msgstr "Texte de bienvenue invalide. La taille maximale est de 255 caractères."
 #. TRANS: users in user admin panel. %1$s is the invalid nickname.
 #: actions/useradminpanel.php:166
 #, fuzzy, php-format
-msgid "Invalid default subscripton: \"%1$s\" is not a user."
+msgid "Invalid default subscripton: '%1$s' is not a user."
 msgstr "Abonnement par défaut invalide : « %1$s » n’est pas un utilisateur."
 
 #. TRANS: Link description in user account settings menu.
@@ -6655,70 +6572,59 @@ msgstr ""
 #. TRANS: Title for button to save user settings in user admin panel.
 #: actions/useradminpanel.php:302
 #, fuzzy
-msgid "Save user settings."
+msgid "Save user settings"
 msgstr "Sauvegarder les paramètres utilisateur"
 
-#. TRANS: Page title.
-#: actions/userauthorization.php:109
+#: actions/userauthorization.php:105
 msgid "Authorize subscription"
 msgstr "Autoriser l’abonnement"
 
-#. TRANS: Page notice on "Auhtorize subscription" page.
-#: actions/userauthorization.php:115
+#: actions/userauthorization.php:110
 #, fuzzy
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
 "user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
-"click \"Reject\"."
+"click “Reject”."
 msgstr ""
 "Veuillez vérifier ces détails pour vous assurer que vous souhaitez vous "
 "abonner aux avis de cet utilisateur. Si vous n’avez pas demandé à vous "
 "abonner aux avis de quelqu’un, cliquez « Rejeter »."
 
-#. TRANS: DT element on Authorise Subscription page where license is displayed.
 #. TRANS: Menu item for site administration
-#: actions/userauthorization.php:207 actions/version.php:167
+#: actions/userauthorization.php:196 actions/version.php:167
 #: lib/adminpanelaction.php:403
 msgid "License"
 msgstr "Licence"
 
-#. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:229
+#: actions/userauthorization.php:217
 #, fuzzy
-msgctxt "BUTTON"
 msgid "Accept"
 msgstr "Accepter"
 
-#. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:231
-#, fuzzy
-msgid "Subscribe to this user."
+#: actions/userauthorization.php:218 lib/subscribeform.php:115
+#: lib/subscribeform.php:139
+msgid "Subscribe to this user"
 msgstr "S’abonner à cet utilisateur"
 
-#. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:233
+#: actions/userauthorization.php:219
 #, fuzzy
-msgctxt "BUTTON"
 msgid "Reject"
 msgstr "Refuser"
 
-#. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:235
+#: actions/userauthorization.php:220
 #, fuzzy
-msgid "Reject this subscription."
+msgid "Reject this subscription"
 msgstr "Rejeter cet abonnement"
 
-#. TRANS: Client error displayed for an empty authorisation request.
-#: actions/userauthorization.php:248
+#: actions/userauthorization.php:232
 msgid "No authorization request!"
 msgstr "Pas de requête d’autorisation !"
 
-#. TRANS: Accept message header from Authorise subscription page.
-#: actions/userauthorization.php:271
+#: actions/userauthorization.php:254
 msgid "Subscription authorized"
 msgstr "Abonnement autorisé"
 
-#: actions/userauthorization.php:274
+#: actions/userauthorization.php:256
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to authorize the "
@@ -6728,12 +6634,11 @@ msgstr ""
 "Vérifiez les instructions du site pour savoir comment compléter "
 "l’autorisation de l’abonnement. Votre jeton d’abonnement est :"
 
-#. TRANS: Reject message header from Authorise subscription page.
-#: actions/userauthorization.php:285
+#: actions/userauthorization.php:266
 msgid "Subscription rejected"
 msgstr "Abonnement refusé"
 
-#: actions/userauthorization.php:288
+#: actions/userauthorization.php:268
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to fully reject the "
@@ -6743,65 +6648,40 @@ msgstr ""
 "Vérifiez les instructions du site pour savoir comment refuser pleinement "
 "l’abonnement."
 
-#. TRANS: Exception thrown when no valid user is found for an authorisation request.
-#. TRANS: %s is a listener URI.
-#: actions/userauthorization.php:325
+#: actions/userauthorization.php:303
 #, fuzzy, php-format
-msgid "Listener URI \"%s\" not found here."
+msgid "Listener URI ‘%s’ not found here."
 msgstr "L’URI de l’auditeur ‘%s’ n’a pas été trouvée ici."
 
-#. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:332
+#: actions/userauthorization.php:308
 #, fuzzy, php-format
-msgid "Listenee URI \"%s\" is too long."
+msgid "Listenee URI ‘%s’ is too long."
 msgstr "L’URI à laquelle vous vous êtes abonné(e) ‘%s’ est trop longue."
 
-#. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:340
+#: actions/userauthorization.php:314
 #, fuzzy, php-format
-msgid "Listenee URI \"%s\" is a local user."
+msgid "Listenee URI ‘%s’ is a local user."
 msgstr ""
 "L’URI à laquelle vous vous êtes abonné(e) ‘%s’ est un utilisateur local."
 
-#. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
-#. TRANS: %s is a profile URL.
-#: actions/userauthorization.php:358
+#: actions/userauthorization.php:329
 #, fuzzy, php-format
-msgid "Profile URL \"%s\" is for a local user."
+msgid "Profile URL ‘%s’ is for a local user."
 msgstr "L’URL du profil ‘%s’ est pour un utilisateur local."
 
-#. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
-#. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
-#: actions/userauthorization.php:368
+#: actions/userauthorization.php:345
 #, fuzzy, php-format
-msgid ""
-"Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
-"\"."
-msgstr ""
-"La licence du flux auquel vous êtes abonné(e), « %1$s », n’est pas compatible "
-"avec la licence du site « %2$s »."
-
-#. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:378
-#, fuzzy, php-format
-msgid "Avatar URL \"%s\" is not valid."
+msgid "Avatar URL ‘%s’ is not valid."
 msgstr "L’URL de l’avatar ‘%s’ n’est pas valide."
 
-#. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:385
+#: actions/userauthorization.php:350
 #, fuzzy, php-format
-msgid "Cannot read avatar URL \"%s\"."
+msgid "Can’t read avatar URL ‘%s’."
 msgstr "Impossible de lire l’URL de l’avatar « %s »."
 
-#. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:392
+#: actions/userauthorization.php:355
 #, fuzzy, php-format
-msgid "Wrong image type for avatar URL \"%s\"."
+msgid "Wrong image type for avatar URL ‘%s’."
 msgstr "Format d’image invalide pour l’URL de l’avatar « %s »."
 
 #. TRANS: Page title for profile design page.
@@ -6911,7 +6791,7 @@ msgid "Plugins"
 msgstr "Extensions"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:898
+#: actions/version.php:198 lib/action.php:901
 msgid "Version"
 msgstr "Version"
 
@@ -7123,14 +7003,14 @@ msgstr "Problème lors de l’enregistrement de la boîte de réception du group
 
 #. TRANS: Server exception thrown when a reply cannot be saved.
 #. TRANS: %1$d is a notice ID, %2$d is the ID of the mentioned user.
-#: classes/Notice.php:1142
+#: classes/Notice.php:1144
 #, php-format
 msgid "Could not save reply for %1$d, %2$d."
 msgstr "Impossible d’enregistrer la réponse à %1$d, %2$d."
 
 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1661
+#: classes/Notice.php:1663
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
@@ -7144,7 +7024,7 @@ msgstr "%1$s (%2$s)"
 
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:775
+#: classes/Profile.php:779
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
@@ -7153,7 +7033,7 @@ msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:784
+#: classes/Profile.php:788
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -7472,53 +7352,53 @@ msgid "Page notice"
 msgstr "Avis de la page"
 
 #. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:871
+#: lib/action.php:874
 msgid "Secondary site navigation"
 msgstr "Navigation secondaire du site"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:877
+#: lib/action.php:880
 msgid "Help"
 msgstr "Aide"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:880
+#: lib/action.php:883
 msgid "About"
 msgstr "À propos"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:883
+#: lib/action.php:886
 msgid "FAQ"
 msgstr "FAQ"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:888
+#: lib/action.php:891
 msgid "TOS"
 msgstr "CGU"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:892
+#: lib/action.php:895
 msgid "Privacy"
 msgstr "Confidentialité"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:895
+#: lib/action.php:898
 msgid "Source"
 msgstr "Source"
 
 #. TRANS: Secondary navigation menu option leading to e-mail contact information on the
 #. TRANS: StatusNet site, where to report bugs, ...
-#: lib/action.php:902
+#: lib/action.php:905
 msgid "Contact"
 msgstr "Contact"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:905
+#: lib/action.php:908
 msgid "Badge"
 msgstr "Insigne"
 
 #. TRANS: DT element for StatusNet software license.
-#: lib/action.php:934
+#: lib/action.php:937
 msgid "StatusNet software license"
 msgstr "Licence du logiciel StatusNet"
 
@@ -7526,7 +7406,7 @@ msgstr "Licence du logiciel StatusNet"
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:941
+#: lib/action.php:944
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7536,7 +7416,7 @@ msgstr ""
 "%site.broughtby%%](%%site.broughtbyurl%%)."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:944
+#: lib/action.php:947
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** est un service de micro-blogging."
@@ -7545,7 +7425,7 @@ msgstr "**%%site.name%%** est un service de micro-blogging."
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:951
+#: lib/action.php:954
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7557,20 +7437,20 @@ msgstr ""
 "(http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:967
+#: lib/action.php:970
 msgid "Site content license"
 msgstr "Licence du contenu du site"
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:974
+#: lib/action.php:977
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr "Le contenu et les données de %1$s sont privés et confidentiels."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:981
+#: lib/action.php:984
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
@@ -7578,7 +7458,7 @@ msgstr ""
 "réservés."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:985
+#: lib/action.php:988
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 "Le contenu et les données sont sous le droit d’auteur du contributeur. Tous "
@@ -7586,26 +7466,26 @@ msgstr ""
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:1017
+#: lib/action.php:1020
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
 "Tous les contenus %1$s et les données sont disponibles sous la licence %2$s."
 
 #. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1353
+#: lib/action.php:1356
 msgid "Pagination"
 msgstr "Pagination"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1364
+#: lib/action.php:1367
 msgid "After"
 msgstr "Après"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1374
+#: lib/action.php:1377
 msgid "Before"
 msgstr "Avant"
 
@@ -7805,23 +7685,19 @@ msgstr ""
 msgid "No application for that consumer key."
 msgstr "Aucune demande trouvée pour cette clé de consommateur."
 
-#: lib/apiauth.php:202 lib/apiauth.php:284
-msgid "Not allowed to use API."
-msgstr ""
-
 #. TRANS: OAuth exception given when an incorrect access token was given for a user.
-#: lib/apiauth.php:225
+#: lib/apiauth.php:219
 msgid "Bad access token."
 msgstr "Jeton d’accès erroné."
 
 #. TRANS: OAuth exception given when no user was found for a given token (no token was found).
-#: lib/apiauth.php:230
+#: lib/apiauth.php:224
 msgid "No user for that token."
 msgstr "Aucun utilisateur associé à ce jeton."
 
 #. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel".
 #. TRANS: Client error thrown when authentication fails.
-#: lib/apiauth.php:272 lib/apiauth.php:302
+#: lib/apiauth.php:266 lib/apiauth.php:293
 msgid "Could not authenticate you."
 msgstr "Impossible de vous authentifier."
 
@@ -8029,11 +7905,6 @@ msgstr "La modification du mot de passe n’est pas autorisée."
 msgid "Block"
 msgstr "Bloquer"
 
-#. TRANS: Description of the form to block a user.
-#: lib/blockform.php:79
-msgid "Block this user"
-msgstr "Bloquer cet utilisateur"
-
 #. TRANS: Title for command results.
 #: lib/channel.php:160 lib/channel.php:181
 msgid "Command results"
@@ -8061,7 +7932,7 @@ msgstr "Aucun avis avec cet identifiant n’existe."
 
 #. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
 #. TRANS: Error text shown when a last user notice is requested and it does not exist.
-#: lib/command.php:99 lib/command.php:630
+#: lib/command.php:99 lib/command.php:642
 msgid "User has no last notice."
 msgstr "Aucun avis récent pour cet utilisateur."
 
@@ -8111,35 +7982,41 @@ msgstr ""
 "Abonnés : %2$s\n"
 "Messages : %3$s"
 
+#. TRANS: Error message text shown when a favorite could not be set because it has already been favorited.
+#: lib/command.php:298
+#, fuzzy
+msgid "Could not create favorite: already favorited."
+msgstr "Impossible de créer le favori."
+
 #. TRANS: Text shown when a notice has been marked as favourite successfully.
-#: lib/command.php:312
+#: lib/command.php:324
 msgid "Notice marked as fave."
 msgstr "Avis ajouté aux favoris."
 
 #. TRANS: Message given having added a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:357
+#: lib/command.php:369
 #, php-format
 msgid "%1$s joined group %2$s."
 msgstr "%1$s a rejoint le groupe %2$s."
 
 #. TRANS: Message given having removed a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:405
+#: lib/command.php:417
 #, php-format
 msgid "%1$s left group %2$s."
 msgstr "%1$s a quitté le groupe %2$s."
 
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: lib/command.php:426
+#: lib/command.php:438
 #, php-format
 msgctxt "WHOIS"
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
 
 #. TRANS: Whois output. %s is the full name of the queried user.
-#: lib/command.php:430
+#: lib/command.php:442
 #, php-format
 msgid "Fullname: %s"
 msgstr "Nom complet : %s"
@@ -8147,7 +8024,7 @@ msgstr "Nom complet : %s"
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a location.
-#: lib/command.php:434 lib/mail.php:270
+#: lib/command.php:446 lib/mail.php:270
 #, php-format
 msgid "Location: %s"
 msgstr "Emplacement : %s"
@@ -8155,20 +8032,20 @@ msgstr "Emplacement : %s"
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a homepage.
-#: lib/command.php:438 lib/mail.php:274
+#: lib/command.php:450 lib/mail.php:274
 #, php-format
 msgid "Homepage: %s"
 msgstr "Site Web : %s"
 
 #. TRANS: Whois output. %s is the bio information of the queried user.
-#: lib/command.php:442
+#: lib/command.php:454
 #, php-format
 msgid "About: %s"
 msgstr "À propos : %s"
 
 #. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).
 #. TRANS: %s is a remote profile.
-#: lib/command.php:471
+#: lib/command.php:483
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
@@ -8179,7 +8056,7 @@ msgstr ""
 
 #. TRANS: Message given if content is too long. %1$sd is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:488
+#: lib/command.php:500
 #, php-format
 msgid "Message too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
@@ -8191,25 +8068,25 @@ msgstr[1] ""
 "entré %2$d."
 
 #. TRANS: Error text shown sending a direct message fails with an unknown reason.
-#: lib/command.php:516
+#: lib/command.php:528
 msgid "Error sending direct message."
 msgstr "Une erreur est survenue pendant l’envoi de votre message."
 
 #. TRANS: Message given having repeated a notice from another user.
 #. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:553
+#: lib/command.php:565
 #, php-format
 msgid "Notice from %s repeated."
 msgstr "Avis de %s repris."
 
 #. TRANS: Error text shown when repeating a notice fails with an unknown reason.
-#: lib/command.php:556
+#: lib/command.php:568
 msgid "Error repeating notice."
 msgstr "Erreur lors de la reprise de l’avis."
 
 #. TRANS: Message given if content of a notice for a reply is too long. %1$d is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:591
+#: lib/command.php:603
 #, php-format
 msgid "Notice too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Notice too long - maximum is %1$d characters, you sent %2$d."
@@ -8222,81 +8099,81 @@ msgstr[1] ""
 
 #. TRANS: Text shown having sent a reply to a notice successfully.
 #. TRANS: %s is the nickname of the user of the notice the reply was sent to.
-#: lib/command.php:604
+#: lib/command.php:616
 #, php-format
 msgid "Reply to %s sent."
 msgstr "Réponse à %s envoyée."
 
 #. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
-#: lib/command.php:607
+#: lib/command.php:619
 msgid "Error saving notice."
 msgstr "Problème lors de l’enregistrement de l’avis."
 
 #. TRANS: Error text shown when no username was provided when issuing a subscribe command.
-#: lib/command.php:654
+#: lib/command.php:666
 msgid "Specify the name of the user to subscribe to."
 msgstr "Indiquez le nom de l’utilisateur auquel vous souhaitez vous abonner."
 
 #. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
-#: lib/command.php:663
+#: lib/command.php:675
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "Impossible de s'inscrire aux profils OMB par cette commande."
 
 #. TRANS: Text shown after having subscribed to another user successfully.
 #. TRANS: %s is the name of the user the subscription was requested for.
-#: lib/command.php:671
+#: lib/command.php:683
 #, php-format
 msgid "Subscribed to %s."
 msgstr "Abonné à %s."
 
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.
-#: lib/command.php:692 lib/command.php:803
+#: lib/command.php:704 lib/command.php:815
 msgid "Specify the name of the user to unsubscribe from."
 msgstr ""
 "Indiquez le nom de l’utilisateur duquel vous souhaitez vous désabonner."
 
 #. TRANS: Text shown after having unsubscribed from another user successfully.
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:703
+#: lib/command.php:715
 #, php-format
 msgid "Unsubscribed from %s."
 msgstr "Désabonné de %s."
 
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
-#: lib/command.php:723 lib/command.php:749
+#: lib/command.php:735 lib/command.php:761
 msgid "Command not yet implemented."
 msgstr "Cette commande n’a pas encore été implémentée."
 
 #. TRANS: Text shown when issuing the command "off" successfully.
-#: lib/command.php:727
+#: lib/command.php:739
 msgid "Notification off."
 msgstr "Avertissements désactivés."
 
 #. TRANS: Error text shown when the command "off" fails for an unknown reason.
-#: lib/command.php:730
+#: lib/command.php:742
 msgid "Can't turn off notification."
 msgstr "Impossible de désactiver les avertissements."
 
 #. TRANS: Text shown when issuing the command "on" successfully.
-#: lib/command.php:753
+#: lib/command.php:765
 msgid "Notification on."
 msgstr "Avertissements activés."
 
 #. TRANS: Error text shown when the command "on" fails for an unknown reason.
-#: lib/command.php:756
+#: lib/command.php:768
 msgid "Can't turn on notification."
 msgstr "Impossible d’activer les avertissements."
 
 #. TRANS: Error text shown when issuing the login command while login is disabled.
-#: lib/command.php:770
+#: lib/command.php:782
 msgid "Login command is disabled."
 msgstr "La commande d’ouverture de session est désactivée."
 
 #. TRANS: Text shown after issuing the login command successfully.
 #. TRANS: %s is a logon link..
-#: lib/command.php:783
+#: lib/command.php:795
 #, php-format
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
@@ -8305,20 +8182,20 @@ msgstr ""
 
 #. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:812
+#: lib/command.php:824
 #, php-format
 msgid "Unsubscribed %s."
 msgstr "Désabonné de %s."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
-#: lib/command.php:830
+#: lib/command.php:842
 msgid "You are not subscribed to anyone."
 msgstr "Vous n’êtes abonné(e) à personne."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
-#: lib/command.php:835
+#: lib/command.php:847
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Vous êtes abonné à cette personne :"
@@ -8326,14 +8203,14 @@ msgstr[1] "Vous êtes abonné à ces personnes :"
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user
 #. TRANS: (followers) without having any subscribers.
-#: lib/command.php:857
+#: lib/command.php:869
 msgid "No one is subscribed to you."
 msgstr "Personne ne s’est abonné à vous."
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
-#: lib/command.php:862
+#: lib/command.php:874
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Cette personne est abonnée à vous :"
@@ -8341,21 +8218,21 @@ msgstr[1] "Ces personnes sont abonnées à vous :"
 
 #. TRANS: Text shown after requesting groups a user is subscribed to without having
 #. TRANS: any group subscriptions.
-#: lib/command.php:884
+#: lib/command.php:896
 msgid "You are not a member of any groups."
 msgstr "Vous n’êtes membre d’aucun groupe."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
-#: lib/command.php:889
+#: lib/command.php:901
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "Vous êtes membre de ce groupe :"
 msgstr[1] "Vous êtes membre de ces groupes :"
 
 #. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-#: lib/command.php:904
+#: lib/command.php:916
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -8496,11 +8373,6 @@ msgstr "Applications autorisées connectées"
 msgid "Database error"
 msgstr "Erreur de la base de données"
 
-#. TRANS: Description of form for deleting a user.
-#: lib/deleteuserform.php:75
-msgid "Delete this user"
-msgstr "Supprimer cet utilisateur"
-
 #. TRANS: Label in form on profile design page.
 #. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
 #: lib/designsettings.php:108
@@ -8537,21 +8409,6 @@ msgstr "Modifier les couleurs"
 msgid "Use defaults"
 msgstr "Utiliser les valeurs par défaut"
 
-#. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: lib/designsettings.php:259
-msgid "Restore default designs"
-msgstr "Restaurer les conceptions par défaut"
-
-#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: lib/designsettings.php:267
-msgid "Reset back to default"
-msgstr "Revenir aux valeurs par défaut"
-
-#. TRANS: Title for button on profile design page to save settings.
-#: lib/designsettings.php:272
-msgid "Save design"
-msgstr "Sauvegarder la conception"
-
 #. TRANS: Error message displayed if design settings could not be saved.
 #. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
 #: lib/designsettings.php:405 lib/designsettings.php:427
@@ -9442,10 +9299,6 @@ msgstr "Répondre à cet avis"
 msgid "Reply"
 msgstr "Répondre"
 
-#: lib/noticelist.php:673
-msgid "Delete this notice"
-msgstr "Supprimer cet avis"
-
 #: lib/noticelist.php:691
 msgid "Notice repeated"
 msgstr "Avis repris"
@@ -9726,10 +9579,6 @@ msgstr "Inviter"
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Inviter des amis et collègues à vous rejoindre dans %s"
 
-#: lib/subscribeform.php:115 lib/subscribeform.php:139
-msgid "Subscribe to this user"
-msgstr "S’abonner à cet utilisateur"
-
 #: lib/subscriberspeopleselftagcloudsection.php:48
 #: lib/subscriptionspeopleselftagcloudsection.php:48
 msgid "People Tagcloud as self-tagged"
@@ -9907,23 +9756,18 @@ msgctxt "role"
 msgid "Moderator"
 msgstr "Modérateur"
 
-#: lib/util.php:305
-#, fuzzy
-msgid "Not allowed to log in."
-msgstr "Non connecté."
-
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1309
+#: lib/util.php:1306
 msgid "a few seconds ago"
 msgstr "il y a quelques secondes"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1312
+#: lib/util.php:1309
 msgid "about a minute ago"
 msgstr "il y a 1 minute"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1316
+#: lib/util.php:1313
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
@@ -9931,12 +9775,12 @@ msgstr[0] "il y a environ une minute"
 msgstr[1] "il y a environ %d minutes"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1319
+#: lib/util.php:1316
 msgid "about an hour ago"
 msgstr "il y a 1 heure"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1323
+#: lib/util.php:1320
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
@@ -9944,12 +9788,12 @@ msgstr[0] "il y a environ une heure"
 msgstr[1] "il y a environ %d heures"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1326
+#: lib/util.php:1323
 msgid "about a day ago"
 msgstr "il y a 1 jour"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1330
+#: lib/util.php:1327
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
@@ -9957,12 +9801,12 @@ msgstr[0] "il y a environ un jour"
 msgstr[1] "il y a environ %d jours"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1333
+#: lib/util.php:1330
 msgid "about a month ago"
 msgstr "il y a 1 mois"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1337
+#: lib/util.php:1334
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
@@ -9970,7 +9814,7 @@ msgstr[0] "il y a environ un mois"
 msgstr[1] "il y a environ %d mois"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1340
+#: lib/util.php:1337
 msgid "about a year ago"
 msgstr "il y a environ 1 an"
 
@@ -10017,3 +9861,75 @@ msgstr "XML invalide, racine XRD manquante."
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr "Obtention de la sauvegarde depuis le fichier « %s »."
+
+#, fuzzy
+#~ msgid "Block this user."
+#~ msgstr "Bloquer cet utilisateur"
+
+#, fuzzy
+#~ msgid "Delete this notice."
+#~ msgstr "Supprimer cet avis"
+
+#, fuzzy
+#~ msgid "Delete this user."
+#~ msgstr "Supprimer cet utilisateur"
+
+#, fuzzy
+#~ msgid "Restore default designs."
+#~ msgstr "Restaurer les conceptions par défaut"
+
+#, fuzzy
+#~ msgid "Reset back to default."
+#~ msgstr "Revenir aux valeurs par défaut"
+
+#, fuzzy
+#~ msgid "Save design."
+#~ msgstr "Sauvegarder la conception"
+
+#, fuzzy
+#~ msgid "Disfavor favorite."
+#~ msgstr "Retirer ce favori"
+
+#, fuzzy
+#~ msgid "\"%s\" not found."
+#~ msgstr "Page non trouvée."
+
+#, fuzzy
+#~ msgid "Notice %s not found."
+#~ msgstr "L’avis parent correspondant à cette réponse n’a pas été trouvé."
+
+#, fuzzy
+#~ msgid "Attachment %s not found."
+#~ msgstr "Destinataire non trouvé."
+
+#, fuzzy
+#~ msgid "Invalid tag: \"%s\"."
+#~ msgstr "Marque invalide : « %s »"
+
+#, fuzzy
+#~ msgid "%s updates from everyone."
+#~ msgstr "%s statuts de tout le monde !"
+
+#, fuzzy
+#~ msgid "Password saved"
+#~ msgstr "Mot de passe enregistré."
+
+#, fuzzy
+#~ msgid "Where you are, like \"City, State (or Region), Country\"."
+#~ msgstr "Indiquez votre emplacement, ex.: « Ville, État (ou région), Pays »"
+
+#, fuzzy
+#~ msgid "Subscribe to this user."
+#~ msgstr "S’abonner à cet utilisateur"
+
+#, fuzzy
+#~ msgid ""
+#~ "Listenee stream license \"%1$s\" is not compatible with site license \"%2"
+#~ "$s\"."
+#~ msgstr ""
+#~ "La licence du flux auquel vous êtes abonné(e), « %1$s », n’est pas "
+#~ "compatible avec la licence du site « %2$s »."
+
+#, fuzzy
+#~ msgid "Not allowed to log in."
+#~ msgstr "Non connecté."
diff --git a/locale/fur/LC_MESSAGES/statusnet.po b/locale/fur/LC_MESSAGES/statusnet.po
index 4c127f81de..d4c5b35ee2 100644
--- a/locale/fur/LC_MESSAGES/statusnet.po
+++ b/locale/fur/LC_MESSAGES/statusnet.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-24 10:32+0000\n"
-"PO-Revision-Date: 2011-02-24 10:36:43+0000\n"
+"POT-Creation-Date: 2011-03-03 15:58+0000\n"
+"PO-Revision-Date: 2011-03-03 16:00:31+0000\n"
 "Language-Team: Friulian <http://translatewiki.net/wiki/Portal:fur>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-17 11:39:54+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r82712); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-02-25 23:49:23+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fur\n"
 "X-Message-Group: #out-statusnet-core\n"
@@ -131,11 +131,7 @@ msgstr "La pagjine no esist."
 #. 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 use "one time password login" without using an existing user.
-#. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
-#. TRANS: Client error displayed trying to find a user by ID for a non-existing ID.
-#. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when calling a profile action without specifying a user.
 #: actions/all.php:80 actions/allrss.php:69
@@ -153,12 +149,12 @@ msgstr "La pagjine no esist."
 #: actions/apitimelinementions.php:77 actions/apitimelineuser.php:79
 #: actions/avatarbynickname.php:79 actions/favoritesrss.php:72
 #: actions/foaf.php:42 actions/foaf.php:61 actions/hcard.php:67
-#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:78
+#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
 #: actions/remotesubscribe.php:144 actions/remotesubscribe.php:153
-#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:113
-#: actions/showfavorites.php:106 actions/userbyid.php:75
+#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
+#: actions/showfavorites.php:106 actions/userbyid.php:74
 #: actions/usergroups.php:93 actions/userrss.php:40 actions/userxrd.php:59
-#: actions/xrds.php:71 lib/command.php:497 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:509 lib/galleryaction.php:59
 #: lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Utent no cjatât."
@@ -282,7 +278,7 @@ msgstr "Inzornaments di %1$s e dai siei amîs su %2$s!"
 #: actions/apigrouplistall.php:120 actions/apigroupmembership.php:105
 #: actions/apigroupshow.php:114 actions/apihelptest.php:84
 #: actions/apistatusesdestroy.php:101 actions/apistatusesretweets.php:110
-#: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:138
+#: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:139
 #: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
 #: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:268
 #: actions/apitimelinegroup.php:147 actions/apitimelinehome.php:173
@@ -509,7 +505,7 @@ msgstr ""
 
 #. TRANS: Client error displayed trying to direct message another user who's not a friend (403).
 #: actions/apidirectmessagenew.php:144
-msgid "Cannot send direct messages to users who aren't your friend."
+msgid "Can't send direct messages to users who aren't your friend."
 msgstr ""
 
 #. TRANS: Client error displayed trying to direct message self (403).
@@ -534,7 +530,7 @@ msgstr ""
 #. TRANS: Client error displayed when marking a notice as favourite fails.
 #. TRANS: Server error displayed when trying to mark a notice as favorite fails in the database.
 #. TRANS: Error message text shown when a favorite could not be set.
-#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:294
+#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:306
 msgid "Could not create favorite."
 msgstr ""
 
@@ -592,7 +588,7 @@ msgstr ""
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:191
 #: actions/newgroup.php:137 actions/profilesettings.php:273
-#: actions/register.php:206
+#: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "Il sorenon al è za doprât. Provent un altri."
 
@@ -602,7 +598,7 @@ msgstr "Il sorenon al è za doprât. Provent un altri."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:195
 #: actions/newgroup.php:141 actions/profilesettings.php:243
-#: actions/register.php:208
+#: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "Nol è un sorenon valit."
 
@@ -615,7 +611,7 @@ msgstr "Nol è un sorenon valit."
 #: actions/apigroupcreate.php:181 actions/editapplication.php:235
 #: actions/editgroup.php:202 actions/newapplication.php:221
 #: actions/newgroup.php:148 actions/profilesettings.php:248
-#: actions/register.php:215
+#: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "La pagjine web no je une direzion valide."
 
@@ -625,7 +621,7 @@ msgstr "La pagjine web no je une direzion valide."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:191 actions/editgroup.php:206
 #: actions/newgroup.php:152 actions/profilesettings.php:252
-#: actions/register.php:218
+#: actions/register.php:226
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "Il non complet al è masse lunc (max 255 caratars)."
 
@@ -653,7 +649,7 @@ msgstr[1] "La descrizion e je masse lungje (massim %d caratars)."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:215 actions/editgroup.php:218
 #: actions/newgroup.php:164 actions/profilesettings.php:265
-#: actions/register.php:227
+#: actions/register.php:235
 msgid "Location is too long (maximum 255 characters)."
 msgstr "Il lûc al è masse lunc (max 255 caratars)."
 
@@ -709,14 +705,14 @@ msgstr "Grup no cjatât."
 #. TRANS: Server error displayed when trying to join a group the user is already a member of.
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:333
+#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:345
 msgid "You are already a member of that group."
 msgstr "Tu fasis za part di chest grup."
 
 #. TRANS: Server error displayed when trying to join a group the user is blocked from joining.
 #. 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.
-#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:338
+#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:350
 msgid "You have been blocked from that group by the admin."
 msgstr ""
 
@@ -726,7 +722,7 @@ msgstr ""
 #. TRANS: %1$s is the joining user's nickname, $2$s is the group nickname for which the join failed.
 #. TRANS: Message given having failed to add a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:350
+#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:362
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "No si à podût zontâ l'utent %1$s al grup %2$s."
@@ -743,7 +739,7 @@ msgstr "No tu fasis part di chest grup."
 #. TRANS: Message given having failed to remove a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
 #: actions/apigroupleave.php:127 actions/leavegroup.php:133
-#: lib/command.php:398
+#: lib/command.php:410
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
 msgstr ""
@@ -803,21 +799,20 @@ msgstr ""
 #. TRANS: Form validation error message.
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
-#. TRANS: Client error displayed when the session token is not okay.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
 #: actions/deletenotice.php:177 actions/disfavor.php:75
 #: actions/emailsettings.php:291 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:65 actions/grouplogo.php:321
 #: actions/groupunblock.php:65 actions/imsettings.php:224
-#: actions/invite.php:60 actions/login.php:131 actions/makeadmin.php:66
+#: actions/invite.php:60 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
-#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:136
-#: actions/othersettings.php:155 actions/passwordsettings.php:137
+#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
+#: actions/othersettings.php:155 actions/passwordsettings.php:138
 #: actions/profilesettings.php:217 actions/recoverpassword.php:383
-#: actions/register.php:164 actions/remotesubscribe.php:76
+#: actions/register.php:172 actions/remotesubscribe.php:76
 #: actions/repeat.php:82 actions/smssettings.php:250 actions/subedit.php:40
-#: actions/subscribe.php:87 actions/tagother.php:166
-#: actions/unsubscribe.php:69 actions/userauthorization.php:53
+#: actions/subscribe.php:86 actions/tagother.php:166
+#: actions/unsubscribe.php:69 actions/userauthorization.php:52
 #: lib/designsettings.php:310
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
@@ -848,7 +843,7 @@ msgstr ""
 #: actions/designadminpanel.php:100 actions/editapplication.php:144
 #: actions/emailsettings.php:310 actions/grouplogo.php:332
 #: actions/imsettings.php:239 actions/newapplication.php:124
-#: actions/oauthconnectionssettings.php:145 actions/recoverpassword.php:46
+#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
 #: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
 msgstr ""
@@ -893,20 +888,19 @@ msgstr "Identitât"
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group nickname (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT for nick name in a profile.
-#: actions/apioauthauthorize.php:459 actions/login.php:242
-#: actions/profilesettings.php:106 actions/register.php:418
+#: actions/apioauthauthorize.php:459 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:432
 #: actions/showgroup.php:243 actions/tagother.php:94
-#: actions/userauthorization.php:152 lib/groupeditform.php:145
+#: actions/userauthorization.php:145 lib/groupeditform.php:145
 #: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "Sorenon"
 
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:463 actions/login.php:245
-#: actions/register.php:422 lib/accountsettingsaction.php:120
+#: actions/apioauthauthorize.php:463 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:120
 msgid "Password"
 msgstr "Password"
 
@@ -997,13 +991,13 @@ msgstr "L'avîs nol esist."
 
 #. TRANS: Client error displayed trying to repeat an own notice through the API.
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:537
+#: actions/apistatusesretweet.php:83 lib/command.php:549
 msgid "Cannot repeat your own notice."
 msgstr ""
 
 #. TRANS: Client error displayed trying to re-repeat a notice through the API.
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:92 lib/command.php:543
+#: actions/apistatusesretweet.php:92 lib/command.php:555
 msgid "Already repeated that notice."
 msgstr ""
 
@@ -1024,9 +1018,9 @@ msgstr ""
 #. TRANS: Exception thrown requesting an unsupported notice output format.
 #. TRANS: %s is the requested output format.
 #: actions/apistatusesshow.php:144
-#, php-format
-msgid "Unsupported format: %s."
-msgstr ""
+#, fuzzy, php-format
+msgid "Unsupported format: %s"
+msgstr "No tu sês plui sotscrit a %s."
 
 #. TRANS: Client error displayed requesting a deleted status.
 #: actions/apistatusesshow.php:155
@@ -1130,14 +1124,13 @@ msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr "Inzornaments di %1$s che a rispuindin a inzornaments di %2$s / %3$s."
 
 #. TRANS: Title for site timeline. %s is the StatusNet sitename.
-#. TRANS: Public RSS feed title. %s is the StatusNet site name.
 #: actions/apitimelinepublic.php:193 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "Ativitât publiche di %s"
 
 #. TRANS: Subtitle for site timeline. %s is the StatusNet sitename.
-#: actions/apitimelinepublic.php:199
+#: actions/apitimelinepublic.php:199 actions/publicrss.php:105
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "Inzornaments di %s di ducj cuancj!"
@@ -1202,26 +1195,25 @@ msgid "Atom post must be an Atom entry."
 msgstr ""
 
 #. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
-#: actions/apitimelineuser.php:334
+#: actions/apitimelineuser.php:335
 msgid "Can only handle POST activities."
 msgstr ""
 
 #. TRANS: Client error displayed when using an unsupported activity object type.
 #. TRANS: %s is the unsupported activity object type.
-#: actions/apitimelineuser.php:345
+#: actions/apitimelineuser.php:346
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
 #. TRANS: %d is the notice ID (number).
-#: actions/apitimelineuser.php:379
+#: actions/apitimelineuser.php:380
 #, php-format
 msgid "No content for notice %d."
 msgstr ""
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#. TRANS: %s is the notice URI.
 #: actions/apitimelineuser.php:408
 #, php-format
 msgid "Notice with URI \"%s\" already exists."
@@ -1239,10 +1231,9 @@ msgstr "L'utent nol è stât cjatât."
 
 #. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
 #. TRANS: Client exception.
-#. TRANS: Client error displayed trying to subscribe to a non-existing profile.
 #: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
 #: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
-#: actions/subscribe.php:110
+#: actions/subscribe.php:107
 msgid "No such profile."
 msgstr "Il profîl nol esist."
 
@@ -1367,7 +1358,7 @@ msgstr ""
 #: actions/joingroup.php:95 actions/leavegroup.php:82
 #: actions/leavegroup.php:95 actions/makeadmin.php:86
 #: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:380
+#: lib/command.php:392
 msgid "No such group."
 msgstr ""
 
@@ -1377,7 +1368,7 @@ msgid "Not a member."
 msgstr ""
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
-#: actions/atompubshowmembership.php:150
+#: actions/atompubshowmembership.php:151
 msgid "Cannot delete someone else's membership."
 msgstr ""
 
@@ -1481,11 +1472,9 @@ msgstr ""
 
 #. TRANS: Server error displayed in avatar upload page when no matching profile can be found for a user.
 #. TRANS: Server error displayed coming across a request from a user without a profile.
-#. TRANS: Server error displayed when trying to authorise a remote subscription request
-#. TRANS: while the user has no profile.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
 #: actions/grouplogo.php:184 actions/remotesubscribe.php:190
-#: actions/userauthorization.php:75 actions/userrss.php:108
+#: actions/userauthorization.php:72 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr ""
 
@@ -1540,9 +1529,10 @@ msgstr "Taie"
 msgid "No file uploaded."
 msgstr "No si à cjamât nissun file."
 
-#. TRANS: Avatar upload form instruction after uploading a file.
+#. TRANS: Avatar upload form unstruction after uploading a file.
 #: actions/avatarsettings.php:345
-msgid "Pick a square area of the image to be your avatar."
+#, fuzzy
+msgid "Pick a square area of the image to be your avatar"
 msgstr "Cjape une aree retangolâr de figure par doprâle come avatar."
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
@@ -1583,7 +1573,7 @@ msgid "You may not backup your account."
 msgstr ""
 
 #. TRANS: Information displayed on the backup account page.
-#: actions/backupaccount.php:225
+#: actions/backupaccount.php:227
 msgid ""
 "You can backup your account data in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format. This is an experimental feature and provides "
@@ -1593,14 +1583,14 @@ msgid ""
 msgstr ""
 
 #. TRANS: Submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:248
+#: actions/backupaccount.php:250
 msgctxt "BUTTON"
 msgid "Backup"
 msgstr ""
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:252
-msgid "Backup your account."
+#: actions/backupaccount.php:254
+msgid "Backup your account"
 msgstr ""
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
@@ -1638,7 +1628,8 @@ msgstr "No"
 
 #. TRANS: Submit button title for 'No' when blocking a user.
 #: actions/block.php:158
-msgid "Do not block this user."
+#, fuzzy
+msgid "Do not block this user"
 msgstr "No stâ blocâ chest utent"
 
 #. TRANS: Button label on the user block form.
@@ -1655,8 +1646,9 @@ msgid "Yes"
 msgstr "Sì"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:165
-msgid "Block this user."
+#. TRANS: Description of the form to block a user.
+#: actions/block.php:165 lib/blockform.php:79
+msgid "Block this user"
 msgstr "Bloche chest utent"
 
 #. TRANS: Server error displayed when blocking a user fails.
@@ -1815,7 +1807,7 @@ msgstr ""
 #. TRANS: Field label for delete account confirmation entry.
 #. TRANS: Field label for password reset form where the password has to be typed again.
 #: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:262 actions/register.php:426
+#: actions/recoverpassword.php:262 actions/register.php:440
 msgid "Confirm"
 msgstr "Conferme"
 
@@ -1844,14 +1836,14 @@ msgstr ""
 #. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
 #: actions/deleteapplication.php:79 actions/editapplication.php:78
-#: actions/showapplication.php:90
+#: actions/showapplication.php:94
 msgid "You are not the owner of this application."
 msgstr ""
 
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
-#: actions/newapplication.php:112 actions/showapplication.php:113
-#: lib/action.php:1422
+#: actions/newapplication.php:112 actions/showapplication.php:118
+#: lib/action.php:1425
 msgid "There was a problem with your session token."
 msgstr ""
 
@@ -1871,12 +1863,14 @@ msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting an application.
 #: actions/deleteapplication.php:161
-msgid "Do not delete this application."
-msgstr ""
+#, fuzzy
+msgid "Do not delete this application"
+msgstr "Elimine cheste aplicazion"
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
 #: actions/deleteapplication.php:167
-msgid "Delete this application."
+#, fuzzy
+msgid "Delete this application"
 msgstr "Elimine cheste aplicazion"
 
 #. TRANS: Client error when trying to delete group while not logged in.
@@ -1927,12 +1921,14 @@ msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting a group.
 #: actions/deletegroup.php:224
-msgid "Do not delete this group."
-msgstr ""
+#, fuzzy
+msgid "Do not delete this group"
+msgstr "No stâ eliminâ chest utent"
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
 #: actions/deletegroup.php:231
-msgid "Delete this group."
+#, fuzzy
+msgid "Delete this group"
 msgstr "Elimine chest grup."
 
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
@@ -1940,15 +1936,13 @@ msgstr "Elimine chest grup."
 #. TRANS: Client error displayed when trying to mark a notice as favorite without being logged in.
 #. TRANS: Client error displayed trying to block a user from a group while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
-#. TRANS: Client error displayed trying to log out when not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
-#. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
 #. TRANS: Client error displayed when trying to change user options while not logged in.
 #: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
-#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:70
+#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
-#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:98
+#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
 #: lib/adminpanelaction.php:71 lib/profileformaction.php:63
 #: lib/settingsaction.php:72
@@ -1977,12 +1971,13 @@ msgstr "Sêstu sigûr di volê eliminâ chest avîs?"
 
 #. TRANS: Submit button title for 'No' when deleting a notice.
 #: actions/deletenotice.php:159
-msgid "Do not delete this notice."
+#, fuzzy
+msgid "Do not delete this notice"
 msgstr "No stâ eliminâ chest avîs"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:166
-msgid "Delete this notice."
+#: actions/deletenotice.php:166 lib/noticelist.php:673
+msgid "Delete this notice"
 msgstr "Elimine chest avîs"
 
 #. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
@@ -2015,12 +2010,14 @@ msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting a user.
 #: actions/deleteuser.php:158
-msgid "Do not delete this user."
+#, fuzzy
+msgid "Do not delete this user"
 msgstr "No stâ eliminâ chest utent"
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
-#: actions/deleteuser.php:165
-msgid "Delete this user."
+#. TRANS: Description of form for deleting a user.
+#: actions/deleteuser.php:165 lib/deleteuserform.php:75
+msgid "Delete this user"
 msgstr "Elimine chest utent"
 
 #. TRANS: Message used as title for design settings for the site.
@@ -2145,13 +2142,13 @@ msgstr "Cambie i colôrs"
 #. TRANS: Label on profile design page for setting a profile page content colour.
 #: actions/designadminpanel.php:623 lib/designsettings.php:197
 msgid "Content"
-msgstr ""
+msgstr "Contignût"
 
 #. TRANS: Field label for sidebar color selector.
 #. TRANS: Label on profile design page for setting a profile page sidebar colour.
 #: actions/designadminpanel.php:637 lib/designsettings.php:211
 msgid "Sidebar"
-msgstr ""
+msgstr "Bare in bande"
 
 #. TRANS: Field label for text color selector.
 #. TRANS: Label on profile design page for setting a profile page text colour.
@@ -2182,18 +2179,21 @@ msgid "Use defaults"
 msgstr "Dopre i parametris predeterminâts"
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:720
-msgid "Restore default designs."
+#. TRANS: Title for button on profile design page to reset all colour settings to default.
+#: actions/designadminpanel.php:720 lib/designsettings.php:259
+msgid "Restore default designs"
 msgstr ""
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:728
-msgid "Reset back to default."
+#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
+#: actions/designadminpanel.php:728 lib/designsettings.php:267
+msgid "Reset back to default"
 msgstr ""
 
 #. TRANS: Title for button for saving theme settings.
-#: actions/designadminpanel.php:736
-msgid "Save design."
+#. TRANS: Title for button on profile design page to save settings.
+#: actions/designadminpanel.php:736 lib/designsettings.php:272
+msgid "Save design"
 msgstr ""
 
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
@@ -2225,7 +2225,7 @@ msgid "You must be logged in to edit an application."
 msgstr ""
 
 #. TRANS: Client error displayed trying to edit an application that does not exist.
-#: actions/editapplication.php:83 actions/showapplication.php:83
+#: actions/editapplication.php:83 actions/showapplication.php:87
 msgid "No such application."
 msgstr ""
 
@@ -2455,7 +2455,7 @@ msgstr "Gnûf"
 #. TRANS: Form legend for e-mail preferences form.
 #: actions/emailsettings.php:204
 msgid "Email preferences"
-msgstr ""
+msgstr "Preferencis de pueste eletroniche"
 
 #. TRANS: Checkbox label in e-mail preferences form.
 #: actions/emailsettings.php:212
@@ -2503,7 +2503,7 @@ msgid "Cannot normalize that email address."
 msgstr ""
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:393 actions/register.php:204
+#: actions/emailsettings.php:393 actions/register.php:212
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "La direzion di pueste eletroniche no je valide."
@@ -2575,21 +2575,18 @@ msgstr ""
 
 #. 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.
 #: actions/emailsettings.php:530 actions/emailsettings.php:554
-#: actions/smssettings.php:566 actions/smssettings.php:591
+#: actions/smssettings.php:565 actions/smssettings.php:588
 msgid "Could not update user record."
 msgstr ""
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
-#. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:534 actions/smssettings.php:570
+#: actions/emailsettings.php:534 actions/smssettings.php:568
 msgid "Incoming email address removed."
 msgstr ""
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
-#. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:558 actions/smssettings.php:595
+#: actions/emailsettings.php:558 actions/smssettings.php:591
 msgid "New incoming email address added."
 msgstr ""
 
@@ -2600,8 +2597,9 @@ msgstr ""
 
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
 #: actions/favor.php:95
-msgid "Disfavor favorite."
-msgstr ""
+#, fuzzy
+msgid "Disfavor favorite"
+msgstr "Gjave dai preferîts"
 
 #. TRANS: Page title for first page of favorited notices.
 #. TRANS: Title for favourited notices section.
@@ -2832,13 +2830,15 @@ msgstr ""
 
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
 #: actions/groupblock.php:191
-msgid "Do not block this user from this group."
-msgstr ""
+#, fuzzy
+msgid "Do not block this user from this group"
+msgstr "No stâ blocâ chest utent"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
 #: actions/groupblock.php:198
-msgid "Block this user from this group."
-msgstr ""
+#, fuzzy
+msgid "Block this user from this group"
+msgstr "Une liste dai utents in chest grup."
 
 #. TRANS: Server error displayed when trying to block a user from a group fails because of an application error.
 #: actions/groupblock.php:215
@@ -2846,7 +2846,6 @@ msgid "Database error blocking user from group."
 msgstr ""
 
 #. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
-#. TRANS: Client error displayed trying to find a user by ID without providing an ID.
 #: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr ""
@@ -3029,10 +3028,8 @@ msgid "Group search"
 msgstr "Ricercje di grups"
 
 #. TRANS: Text on page where groups can be searched if no results were found for a query.
-#. TRANS: Text for notice search results is the query had no results.
-#. TRANS: Message on the "People search" page where a query has no results.
-#: actions/groupsearch.php:82 actions/noticesearch.php:122
-#: actions/peoplesearch.php:87
+#: actions/groupsearch.php:82 actions/noticesearch.php:117
+#: actions/peoplesearch.php:83
 msgid "No results."
 msgstr "Nissun risultât."
 
@@ -3067,7 +3064,6 @@ msgid "User is not blocked from group."
 msgstr ""
 
 #. TRANS: Server error displayed when unblocking a user from a group fails because of an unknown error.
-#. TRANS: Server error displayed when removing a user block.
 #: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr ""
@@ -3096,7 +3092,7 @@ msgstr ""
 #. TRANS: Field label for Instant Messaging address input in Instant Messaging settings form.
 #: actions/imsettings.php:102 actions/imsettings.php:132
 msgid "IM address"
-msgstr ""
+msgstr "Direzion pai messaçs istantanis"
 
 #: actions/imsettings.php:109
 msgid "Current confirmed Jabber/Google Talk address."
@@ -3150,8 +3146,7 @@ msgid "Publish a MicroID for my Jabber/Google Talk address."
 msgstr ""
 
 #. TRANS: Confirmation message for successful Instant Messaging preferences save.
-#. TRANS: Confirmation message after saving preferences.
-#: actions/imsettings.php:283 actions/othersettings.php:193
+#: actions/imsettings.php:283 actions/othersettings.php:192
 msgid "Preferences saved."
 msgstr "Preferencis salvadis."
 
@@ -3405,7 +3400,7 @@ msgstr ""
 
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
-#: actions/leavegroup.php:103 lib/command.php:386
+#: actions/leavegroup.php:103 lib/command.php:398
 msgid "You are not a member of that group."
 msgstr "No tu fasis part di chest grup."
 
@@ -3527,52 +3522,52 @@ msgstr "Salve"
 msgid "Save license settings"
 msgstr ""
 
-#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
-#: actions/login.php:97 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
 msgid "Already logged in."
 msgstr "Tu sês za jentrât."
 
-#: actions/login.php:142
+#: actions/login.php:148
 msgid "Incorrect username or password."
 msgstr "Il non utent o la password no son juscj."
 
-#. TRANS: Server error displayed when a user object could not be created trying to login using "one time password login".
-#: actions/login.php:148 actions/otp.php:127
+#: actions/login.php:154 actions/otp.php:120
 msgid "Error setting user. You are probably not authorized."
 msgstr ""
 
-#: actions/login.php:202 actions/login.php:253
+#: actions/login.php:210 actions/login.php:263
 msgid "Login"
 msgstr "Jentre"
 
-#: actions/login.php:239
+#: actions/login.php:249
 msgid "Login to site"
 msgstr "Jentre tal sît"
 
-#: actions/login.php:248 actions/register.php:476
+#: actions/login.php:258 actions/register.php:490
 msgid "Remember me"
 msgstr "Visiti di me"
 
-#: actions/login.php:249 actions/register.php:478
+#: actions/login.php:259 actions/register.php:492
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 "Jentre in automatic tal futûr; no stâ doprâlu par ordenadôrs condividûts!"
 
-#: actions/login.php:259
+#: actions/login.php:269
 msgid "Lost or forgotten password?"
-msgstr ""
+msgstr "Password pierdude o dismenteade?"
 
-#: actions/login.php:277
+#: actions/login.php:288
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
 msgstr ""
+"Par motîfs di sigurece, torne par plasê a inserî non utent e password prime "
+"di cambiâ lis tôs impuestazions."
 
-#: actions/login.php:281
+#: actions/login.php:292
 msgid "Login with your username and password."
 msgstr "Jentre cul to non utent e password"
 
-#: actions/login.php:284
+#: actions/login.php:295
 #, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -3653,14 +3648,14 @@ msgid "New message"
 msgstr "Gnûf messaç"
 
 #. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
-#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:501
+#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:513
 msgid "You can't send a message to this user."
 msgstr ""
 
 #. TRANS: Command exception text shown when trying to send a direct message to another user without content.
 #. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
-#: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:478
-#: lib/command.php:581
+#: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:490
+#: lib/command.php:593
 msgid "No content!"
 msgstr ""
 
@@ -3669,7 +3664,7 @@ msgid "No recipient specified."
 msgstr ""
 
 #. TRANS: Error text shown when trying to send a direct message to self.
-#: actions/newmessage.php:167 lib/command.php:505
+#: actions/newmessage.php:167 lib/command.php:517
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
@@ -3680,7 +3675,7 @@ msgstr "Messaç mandât"
 
 #. TRANS: Message given have sent a direct message to another user.
 #. TRANS: %s is the name of the other user.
-#: actions/newmessage.php:188 lib/command.php:513
+#: actions/newmessage.php:188 lib/command.php:525
 #, php-format
 msgid "Direct message to %s sent."
 msgstr "Il messaç diret par %s al stât mandât."
@@ -3697,56 +3692,46 @@ msgstr "Gnûf avîs"
 msgid "Notice posted"
 msgstr "L'avîs al è stât publicât"
 
-#. TRANS: Instructions for Notice search page.
-#. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/noticesearch.php:69
+#: actions/noticesearch.php:68
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
 "by spaces; they must be 3 characters or more."
 msgstr ""
+"Cîr avîs su %%site.name%% par contignût. Divît i tiermins cun spazis; ogni "
+"tiermin al à di sei lunc almancul trê caratars."
 
-#. TRANS: Title of the page where users can search for notices.
-#: actions/noticesearch.php:80
+#: actions/noticesearch.php:78
 msgid "Text search"
 msgstr "Ricercje testuâl"
 
-#. TRANS: Test in RSS notice search.
-#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearch.php:95
+#: actions/noticesearch.php:91
 #, php-format
 msgid "Search results for \"%1$s\" on %2$s"
 msgstr "Risultâts de ricercje di \"%1$s\" su %2$s"
 
-#. TRANS: Text for logged in users making a query for notices without results.
-#. TRANS: This message contains a Markdown link.
-#: actions/noticesearch.php:128
+#: actions/noticesearch.php:121
 #, php-format
 msgid ""
 "Be the first to [post on this topic](%%%%action.newnotice%%%%?"
 "status_textarea=%s)!"
 msgstr ""
 
-#. TRANS: Text for not logged in users making a query for notices without results.
-#. TRANS: This message contains Markdown links.
-#: actions/noticesearch.php:133
+#: actions/noticesearch.php:124
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and be the first to "
 "[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
 msgstr ""
 
-#. TRANS: RSS notice search feed title. %s is the query.
-#: actions/noticesearchrss.php:95
+#: actions/noticesearchrss.php:96
 #, php-format
 msgid "Updates with \"%s\""
 msgstr "Inzornaments cun \"%s\""
 
-#. TRANS: RSS notice search feed description.
-#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearchrss.php:99
+#: actions/noticesearchrss.php:98
 #, fuzzy, php-format
-msgid "Updates matching search term \"%1$s\" on %2$s."
+msgid "Updates matching search term \"%1$s\" on %2$s!"
 msgstr "Inzornaments etichetâts cun %1$s su %2$s!"
 
 #: actions/nudge.php:85
@@ -3785,30 +3770,30 @@ msgid "You have not registered any applications yet."
 msgstr ""
 
 #. TRANS: Title for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:70
+#: actions/oauthconnectionssettings.php:71
 msgid "Connected applications"
 msgstr ""
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:81
+#: actions/oauthconnectionssettings.php:83
 msgid "The following connections exist for your account."
 msgstr ""
 
 #. TRANS: Client error when trying to revoke access for an application while not being a user of it.
-#: actions/oauthconnectionssettings.php:166
+#: actions/oauthconnectionssettings.php:168
 msgid "You are not a user of that application."
 msgstr ""
 
 #. TRANS: Client error when revoking access has failed for some reason.
 #. TRANS: %s is the application ID revoking access failed for.
-#: actions/oauthconnectionssettings.php:181
+#: actions/oauthconnectionssettings.php:183
 #, php-format
 msgid "Unable to revoke access for application: %s."
 msgstr ""
 
 #. TRANS: Success message after revoking access for an application.
 #. TRANS: %1$s is the application name, %2$s is the first part of the user token.
-#: actions/oauthconnectionssettings.php:200
+#: actions/oauthconnectionssettings.php:202
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -3816,30 +3801,20 @@ msgid ""
 msgstr ""
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:211
+#: actions/oauthconnectionssettings.php:213
 msgid "You have not authorized any applications to use your account."
 msgstr ""
 
 #. TRANS: Note for developers in the OAuth connection settings form.
 #. TRANS: This message contains a Markdown link. Do not separate "](".
 #. TRANS: %s is the URL to the OAuth settings.
-#: actions/oauthconnectionssettings.php:231
+#: actions/oauthconnectionssettings.php:233
 #, php-format
 msgid ""
 "Are you a developer? [Register an OAuth client application](%s) to use with "
 "this instance of StatusNet."
 msgstr ""
 
-#: actions/oembed.php:64
-#, php-format
-msgid "\"%s\" not found."
-msgstr ""
-
-#: actions/oembed.php:76
-#, php-format
-msgid "Notice %s not found."
-msgstr ""
-
 #: actions/oembed.php:80 actions/shownotice.php:100
 msgid "Notice has no profile."
 msgstr ""
@@ -3849,16 +3824,6 @@ msgstr ""
 msgid "%1$s's status on %2$s"
 msgstr "Stât di %1$s su %2$s"
 
-#: actions/oembed.php:95
-#, php-format
-msgid "Attachment %s not found."
-msgstr ""
-
-#: actions/oembed.php:136
-#, php-format
-msgid "\"%s\" not supported for oembed requests."
-msgstr ""
-
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
 #: actions/oembed.php:168
 #, php-format
@@ -3877,12 +3842,11 @@ msgstr ""
 msgid "Not a supported data format."
 msgstr ""
 
-#. TRANS: ShortName in the OpenSearch interface when trying to find users.
 #: actions/opensearch.php:64
 msgid "People Search"
 msgstr "Cîr personis"
 
-#: actions/opensearch.php:68
+#: actions/opensearch.php:67
 msgid "Notice Search"
 msgstr ""
 
@@ -3929,46 +3893,37 @@ msgstr ""
 msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr ""
 
-#. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
-#: actions/otp.php:70
+#: actions/otp.php:69
 msgid "No user ID specified."
 msgstr ""
 
-#. TRANS: Client error displayed trying to use "one time password login" without specifying a login token.
-#: actions/otp.php:86
+#: actions/otp.php:83
 msgid "No login token specified."
 msgstr ""
 
-#. TRANS: Client error displayed trying to use "one time password login" without requesting a login token.
-#: actions/otp.php:94
+#: actions/otp.php:90
 msgid "No login token requested."
 msgstr ""
 
-#. TRANS: Client error displayed trying to use "one time password login" while specifying an invalid login token.
-#: actions/otp.php:100
+#: actions/otp.php:95
 msgid "Invalid login token specified."
 msgstr ""
 
-#. TRANS: Client error displayed trying to use "one time password login" while specifying an expired login token.
-#: actions/otp.php:110
+#: actions/otp.php:104
 msgid "Login token expired."
 msgstr ""
 
-#. TRANS: Title for outbox for any but the fist page.
-#. TRANS: %1$s is the user nickname, %2$d is the page number.
-#: actions/outbox.php:57
+#: actions/outbox.php:58
 #, php-format
 msgid "Outbox for %1$s - page %2$d"
 msgstr "Pueste in jessude par %1$s - pagjine %2$d"
 
-#. TRANS: Title for first page of outbox.
 #: actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
 msgstr "Pueste in jessude par %s"
 
-#. TRANS: Instructions for outbox.
-#: actions/outbox.php:103
+#: actions/outbox.php:104
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr ""
 "Cheste e je la tô pueste in jessude, dulà che tu cjatis i messaçs privâts "
@@ -3996,42 +3951,43 @@ msgstr "Vecje password"
 msgid "New password"
 msgstr "Gnove password"
 
-#: actions/passwordsettings.php:109 actions/register.php:423
-msgid "6 or more characters."
+#: actions/passwordsettings.php:109
+#, fuzzy
+msgid "6 or more characters"
 msgstr "6 o plui caratars."
 
-#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:264
-#: actions/register.php:427
-msgid "Same as password above."
+#: actions/passwordsettings.php:113
+#, fuzzy
+msgid "Same as password above"
 msgstr "Compagn che la password parsore"
 
 #: actions/passwordsettings.php:117
 msgid "Change"
 msgstr "Cambie"
 
-#: actions/passwordsettings.php:153 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:238
 msgid "Password must be 6 or more characters."
 msgstr "La password e à di sei di sîs o plui caratars."
 
-#: actions/passwordsettings.php:156 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:241
 msgid "Passwords don't match."
 msgstr "Lis passwords no corispuindin."
 
-#: actions/passwordsettings.php:164
+#: actions/passwordsettings.php:165
 msgid "Incorrect old password"
 msgstr "La vecje password e je sbaliade"
 
-#: actions/passwordsettings.php:180
+#: actions/passwordsettings.php:181
 msgid "Error saving user; invalid."
 msgstr ""
 
-#. TRANS: Reset password form validation error message.
-#: actions/passwordsettings.php:185 actions/recoverpassword.php:418
-msgid "Cannot save new password."
-msgstr ""
+#: actions/passwordsettings.php:186
+#, fuzzy
+msgid "Can't save new password."
+msgstr "Cambie la password"
 
-#: actions/passwordsettings.php:191
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
 msgid "Password saved."
 msgstr "Password salvade"
 
@@ -4305,9 +4261,7 @@ msgstr ""
 msgid "Save paths"
 msgstr ""
 
-#. TRANS: Instructions for the "People search" page.
-#. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/peoplesearch.php:54
+#: actions/peoplesearch.php:52
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
@@ -4316,8 +4270,7 @@ msgstr ""
 "Cîr int su %%site.name%% par non, lûc o interès. Divît i tiermins cun "
 "spazis; ogni tiermin al à di sei lunc almancul trê caratars."
 
-#. TRANS: Title of a page where users can search for other users.
-#: actions/peoplesearch.php:61
+#: actions/peoplesearch.php:58
 msgid "People search"
 msgstr "Cîr personis"
 
@@ -4350,6 +4303,8 @@ msgstr "Impuestazions dal profîl"
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
+"Tu puedis inzornâ il to profîl personâl culì cussì la int e podarà "
+"cognossiti miôr."
 
 #. TRANS: Profile settings form legend.
 #: actions/profilesettings.php:98
@@ -4357,14 +4312,14 @@ msgid "Profile information"
 msgstr "Informazions sul profîl"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109 actions/register.php:419
+#: actions/profilesettings.php:109 actions/register.php:433
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr ""
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for full group name (dt). Text hidden by default.
 #. TRANS: DT for full name in a profile.
-#: actions/profilesettings.php:113 actions/register.php:441
+#: actions/profilesettings.php:113 actions/register.php:455
 #: actions/showgroup.php:255 actions/tagother.php:104
 #: lib/groupeditform.php:150 lib/userprofile.php:156
 msgid "Full name"
@@ -4372,20 +4327,20 @@ msgstr "Non complet"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:118 actions/register.php:446
+#: actions/profilesettings.php:118 actions/register.php:460
 #: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "Pagjine web"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:121 actions/register.php:448
+#: actions/profilesettings.php:121
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr "URL de tô pagjine web, blog o profîl suntun altri sît."
 
 #. TRANS: Tooltip for field label in form for profile settings. Plural
 #. TRANS: is decided by the number of characters available for the
 #. TRANS: biography (%d).
-#: actions/profilesettings.php:129 actions/register.php:457
+#: actions/profilesettings.php:129 actions/register.php:471
 #, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4393,29 +4348,28 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:135 actions/register.php:462
+#: actions/profilesettings.php:135 actions/register.php:476
 msgid "Describe yourself and your interests"
 msgstr "Descrîf te e i tiei interès"
 
 #. TRANS: Text area label in form for profile settings where users can provide.
 #. TRANS: their biography.
-#: actions/profilesettings.php:139 actions/register.php:464
+#: actions/profilesettings.php:139 actions/register.php:478
 msgid "Bio"
 msgstr "Biografie"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group location (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT for location in a profile.
-#: actions/profilesettings.php:145 actions/register.php:469
+#: actions/profilesettings.php:145 actions/register.php:483
 #: actions/showgroup.php:265 actions/tagother.php:112
-#: actions/userauthorization.php:174 lib/groupeditform.php:173
+#: actions/userauthorization.php:166 lib/groupeditform.php:173
 #: lib/userprofile.php:172
 msgid "Location"
 msgstr "Lûc"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148
+#: actions/profilesettings.php:148 actions/register.php:485
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Dulà che tu sês, par esempli \"Citât, Provincie, Stât\""
 
@@ -4435,8 +4389,7 @@ msgstr "Etichetis"
 #. TRANS: Tooltip for field label in form for profile settings.
 #: actions/profilesettings.php:164
 msgid ""
-"Tags for yourself (letters, numbers, -, ., and _), comma- or space- "
-"separated."
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr ""
 
 #. TRANS: Dropdownlist label in form for profile settings.
@@ -4446,7 +4399,8 @@ msgstr "Lenghe"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
 #: actions/profilesettings.php:171
-msgid "Preferred language."
+#, fuzzy
+msgid "Preferred language"
 msgstr "Lenghe preferide"
 
 #. TRANS: Dropdownlist label in form for profile settings.
@@ -4462,13 +4416,13 @@ msgstr "In ce fûs orari ti cjatistu par solit?"
 #. TRANS: Checkbox label in form for profile settings.
 #: actions/profilesettings.php:189
 msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)."
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr ""
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Plural form is used based on the maximum number of allowed
 #. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:258 actions/register.php:221
+#: actions/profilesettings.php:258 actions/register.php:229
 #, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4487,10 +4441,10 @@ msgstr "La lenghe e je masse lungje (max 50 caratars)."
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:291
+#: actions/profilesettings.php:291 actions/tagother.php:178
 #, php-format
-msgid "Invalid tag: \"%s\"."
-msgstr ""
+msgid "Invalid tag: \"%s\""
+msgstr "La etichete no je valide: \"%s\""
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
 #. TRANS: automatically subscribe to any subscriber.
@@ -4591,12 +4545,6 @@ msgstr ""
 "org/wiki/Micro-blogging) basât sul imprest libar [StatusNet](http://status."
 "net/)."
 
-#. TRANS: Public RSS feed description. %s is the StatusNet site name.
-#: actions/publicrss.php:106
-#, fuzzy, php-format
-msgid "%s updates from everyone."
-msgstr "Inzornaments di %s di ducj cuancj!"
-
 #. TRANS: Title for public tag cloud.
 #: actions/publictagcloud.php:57
 msgid "Public tag cloud"
@@ -4727,11 +4675,6 @@ msgstr ""
 msgid "Password recovery requested"
 msgstr ""
 
-#. TRANS: Title for password recovery page in password saved mode.
-#: actions/recoverpassword.php:229
-msgid "Password saved"
-msgstr "Password salvade"
-
 #. TRANS: Title for password recovery page when an unknown action has been specified.
 #: actions/recoverpassword.php:232
 msgid "Unknown action"
@@ -4742,6 +4685,11 @@ msgstr ""
 msgid "6 or more characters, and do not forget it!"
 msgstr ""
 
+#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#: actions/recoverpassword.php:264 actions/register.php:441
+msgid "Same as password above."
+msgstr "Compagn che la password parsore"
+
 #. TRANS: Button text for password reset form.
 #. TRANS: Button text on profile design page to reset all colour settings to default without saving.
 #: actions/recoverpassword.php:268 lib/designsettings.php:264
@@ -4784,109 +4732,119 @@ msgstr ""
 #. TRANS: Reset password form validation error message.
 #: actions/recoverpassword.php:400
 msgid "Password must be 6 characters or more."
-msgstr ""
+msgstr "La password e à di jessi di sîs o plui caratars."
 
 #. TRANS: Reset password form validation error message.
 #: actions/recoverpassword.php:405
 msgid "Password and confirmation do not match."
+msgstr "La password e la conferme no corispuindin."
+
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:418
+msgid "Cannot save new password."
 msgstr ""
 
 #. TRANS: Server error displayed when something does wrong with the user object during password reset.
-#: actions/recoverpassword.php:426 actions/register.php:248
+#: actions/recoverpassword.php:426 actions/register.php:256
 msgid "Error setting user."
 msgstr ""
 
 #. TRANS: Success message for user after password reset.
 #: actions/recoverpassword.php:434
 msgid "New password successfully saved. You are now logged in."
-msgstr ""
+msgstr "La gnove password e je stade salvade cun sucès. Cumò tu sês jentrât."
 
-#: actions/register.php:87 actions/register.php:188 actions/register.php:399
+#: actions/register.php:92 actions/register.php:196 actions/register.php:413
 msgid "Sorry, only invited people can register."
 msgstr ""
 
-#: actions/register.php:94
+#: actions/register.php:99
 msgid "Sorry, invalid invitation code."
 msgstr ""
 
-#: actions/register.php:113
+#: actions/register.php:119
 msgid "Registration successful"
 msgstr "Regjistrât cun sucès"
 
-#: actions/register.php:115 actions/register.php:497
+#: actions/register.php:121 actions/register.php:511
 msgid "Register"
 msgstr "Regjistriti"
 
-#: actions/register.php:135
+#: actions/register.php:142
 msgid "Registration not allowed."
 msgstr ""
 
-#: actions/register.php:201
-msgid "You cannot register if you don't agree to the license."
+#: actions/register.php:209
+msgid "You can't register if you don't agree to the license."
 msgstr ""
 
-#: actions/register.php:210
+#: actions/register.php:218
 msgid "Email address already exists."
 msgstr ""
 
-#: actions/register.php:243 actions/register.php:265
+#: actions/register.php:251 actions/register.php:273
 msgid "Invalid username or password."
 msgstr "Il non utent o la password no son valits."
 
-#: actions/register.php:340
+#: actions/register.php:351
 msgid ""
 "With this form you can create a new account. You can then post notices and "
-"link up to friends and colleagues."
+"link up to friends and colleagues. "
 msgstr ""
 
+#: actions/register.php:437
+msgid "6 or more characters."
+msgstr "6 o plui caratars."
+
 #. TRANS: Link description in user account settings menu.
-#: actions/register.php:431 actions/register.php:435
+#: actions/register.php:445 actions/register.php:449
 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
 msgid "Email"
 msgstr "Pueste eletroniche"
 
-#: actions/register.php:432 actions/register.php:436
-msgid "Used only for updates, announcements, and password recovery."
+#: actions/register.php:446 actions/register.php:450
+msgid "Used only for updates, announcements, and password recovery"
 msgstr ""
 
-#: actions/register.php:443
-msgid "Longer name, preferably your \"real\" name."
+#: actions/register.php:457
+msgid "Longer name, preferably your \"real\" name"
 msgstr ""
 
-#: actions/register.php:471
-msgid "Where you are, like \"City, State (or Region), Country\"."
-msgstr "Dulà che tu sês, par esempli \"Citât, Provincie, Stât\"."
+#: actions/register.php:462
+#, fuzzy
+msgid "URL of your homepage, blog, or profile on another site"
+msgstr "URL de tô pagjine web, blog o profîl suntun altri sît."
 
-#: actions/register.php:510
+#: actions/register.php:523
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
 msgstr ""
 
-#: actions/register.php:520
+#: actions/register.php:533
 #, php-format
 msgid "My text and files are copyright by %1$s."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:524
+#: actions/register.php:537
 msgid "My text and files remain under my own copyright."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:527
+#: actions/register.php:540
 msgid "All rights reserved."
 msgstr "Ducj i dirits riservâts"
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:532
+#: actions/register.php:545
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
 "email address, IM address, and phone number."
 msgstr ""
 
-#: actions/register.php:573
+#: actions/register.php:588
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -4919,11 +4877,13 @@ msgstr ""
 "Graziis par jessiti regjistrât e o sperìn che tu gjoldarâs a doprâ chest "
 "servizi."
 
-#: actions/register.php:597
+#: actions/register.php:612
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
 msgstr ""
+"(Tu varessis di ricevi a moments un messaç di pueste cun istruzions par "
+"confermâ la tô direzion di pueste eletroniche.)"
 
 #: actions/remotesubscribe.php:97
 #, php-format
@@ -4946,7 +4906,8 @@ msgid "User nickname"
 msgstr "Sorenon dal utent"
 
 #: actions/remotesubscribe.php:129
-msgid "Nickname of the user you want to follow."
+#, fuzzy
+msgid "Nickname of the user you want to follow"
 msgstr "Sorenon dal utent che tu vuelis seguî."
 
 #: actions/remotesubscribe.php:132
@@ -4954,7 +4915,7 @@ msgid "Profile URL"
 msgstr "URL dal profîl"
 
 #: actions/remotesubscribe.php:133
-msgid "URL of your profile on another compatible microblogging service."
+msgid "URL of your profile on another compatible microblogging service"
 msgstr ""
 
 #. TRANS: Link text for link that will subscribe to a remote profile.
@@ -4964,7 +4925,7 @@ msgid "Subscribe"
 msgstr "Sotscrivimi"
 
 #: actions/remotesubscribe.php:158
-msgid "Invalid profile URL (bad format)."
+msgid "Invalid profile URL (bad format)"
 msgstr ""
 
 #: actions/remotesubscribe.php:167
@@ -5003,7 +4964,6 @@ msgstr "Ripetût"
 msgid "Repeated!"
 msgstr "Ripetût!"
 
-#. TRANS: RSS reply feed title. %s is a user nickname.
 #. TRANS: Tooltip for personal group navigation menu option when logged in for viewing @-replies.
 #: actions/replies.php:126 actions/repliesrss.php:68
 #: lib/personalgroupnav.php:109
@@ -5052,11 +5012,9 @@ msgid ""
 "newnotice%%%%?status_textarea=%3$s)."
 msgstr ""
 
-#. TRANS: RSS reply feed description.
-#. TRANS: %1$s is a user nickname, %2$s is the StatusNet site name.
-#: actions/repliesrss.php:74
+#: actions/repliesrss.php:72
 #, fuzzy, php-format
-msgid "Replies to %1$s on %2$s."
+msgid "Replies to %1$s on %2$s!"
 msgstr "Rispuestis a %1$s su %2$s!"
 
 #. TRANS: Client exception displayed when trying to restore an account while not logged in.
@@ -5151,7 +5109,7 @@ msgstr ""
 msgid "User doesn't have this role."
 msgstr ""
 
-#: actions/rsd.php:142 actions/version.php:159
+#: actions/rsd.php:146 actions/version.php:159
 msgid "StatusNet"
 msgstr "StatusNet"
 
@@ -5193,93 +5151,93 @@ msgstr ""
 msgid "Save site settings"
 msgstr "Salve lis impuestazions dal sît"
 
-#: actions/showapplication.php:78
+#: actions/showapplication.php:82
 msgid "You must be logged in to view an application."
 msgstr ""
 
-#: actions/showapplication.php:151
+#: actions/showapplication.php:157
 msgid "Application profile"
 msgstr ""
 
 #. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:153 lib/applicationeditform.php:177
+#: actions/showapplication.php:159 lib/applicationeditform.php:177
 msgid "Icon"
 msgstr "Icone"
 
 #. TRANS: Form input field label for application name.
-#: actions/showapplication.php:163 actions/version.php:197
+#: actions/showapplication.php:169 actions/version.php:197
 #: lib/applicationeditform.php:190
 msgid "Name"
 msgstr "Non"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:172 lib/applicationeditform.php:227
+#: actions/showapplication.php:178 lib/applicationeditform.php:227
 msgid "Organization"
 msgstr "Organizazion"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:181 actions/version.php:200
+#: actions/showapplication.php:187 actions/version.php:200
 #: lib/applicationeditform.php:208 lib/groupeditform.php:168
 msgid "Description"
 msgstr "Descrizion"
 
 #. TRANS: Header for group statistics on a group page (h2).
 #. TRANS: H2 text for user statistics.
-#: actions/showapplication.php:186 actions/showgroup.php:460
+#: actions/showapplication.php:192 actions/showgroup.php:460
 #: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "Statistichis"
 
-#: actions/showapplication.php:197
+#: actions/showapplication.php:203
 #, php-format
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr ""
 
-#: actions/showapplication.php:207
+#: actions/showapplication.php:213
 msgid "Application actions"
 msgstr ""
 
-#: actions/showapplication.php:230
+#: actions/showapplication.php:236
 msgid "Reset key & secret"
 msgstr ""
 
 #. TRANS: Title of form for deleting a user.
-#: actions/showapplication.php:246 lib/deletegroupform.php:121
+#: actions/showapplication.php:252 lib/deletegroupform.php:121
 #: lib/deleteuserform.php:64 lib/noticelist.php:673
 msgid "Delete"
 msgstr "Elimine"
 
-#: actions/showapplication.php:255
+#: actions/showapplication.php:261
 msgid "Application info"
 msgstr ""
 
-#: actions/showapplication.php:257
+#: actions/showapplication.php:263
 msgid "Consumer key"
 msgstr ""
 
-#: actions/showapplication.php:262
+#: actions/showapplication.php:268
 msgid "Consumer secret"
 msgstr ""
 
-#: actions/showapplication.php:267
+#: actions/showapplication.php:273
 msgid "Request token URL"
 msgstr ""
 
-#: actions/showapplication.php:272
+#: actions/showapplication.php:278
 msgid "Access token URL"
 msgstr ""
 
-#: actions/showapplication.php:277
+#: actions/showapplication.php:283
 msgid "Authorize URL"
 msgstr ""
 
-#: actions/showapplication.php:282
+#: actions/showapplication.php:288
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
 msgstr ""
 
-#: actions/showapplication.php:302
+#: actions/showapplication.php:309
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr ""
 
@@ -5364,18 +5322,16 @@ msgid "Group profile"
 msgstr "Profîl dal grup"
 
 #. TRANS: Label for group URL (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT for URL in a profile.
 #: actions/showgroup.php:273 actions/tagother.php:118
-#: actions/userauthorization.php:184 lib/userprofile.php:186
+#: actions/userauthorization.php:175 lib/userprofile.php:186
 msgid "URL"
 msgstr "URL"
 
 #. TRANS: Label for group description or group note (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page where bio is displayed.
 #. TRANS: DT for note in a profile.
 #: actions/showgroup.php:285 actions/tagother.php:128
-#: actions/userauthorization.php:197 lib/userprofile.php:204
+#: actions/userauthorization.php:187 lib/userprofile.php:204
 msgid "Note"
 msgstr "Note"
 
@@ -5458,6 +5414,12 @@ msgid ""
 "their life and interests. [Join now](%%%%action.register%%%%) to become part "
 "of this group and many more! ([Read more](%%%%doc.help%%%%))"
 msgstr ""
+"**%s** al è un grup di utents su %%site.name%%, un servizi di [microblogging]"
+"(http://en.wikipedia.org/wiki/Micro-blogging) basât sul imprest libar "
+"[StatusNet](http://status.net/). I siei membris a condividin messaçs curts "
+"su la vite e i lôr interès. [Unissiti cumò](%%action.register%%) par deventâ "
+"part di chest grup e par tantis altris robis! ([Altris informazions](%%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,
@@ -5470,6 +5432,10 @@ msgid ""
 "[StatusNet](http://status.net/) tool. Its members share short messages about "
 "their life and interests. "
 msgstr ""
+"**%s** al è un grup di utents su %%site.name%%, un servizi di [microblogging]"
+"(http://en.wikipedia.org/wiki/Micro-blogging) basât sul imprest libar "
+"[StatusNet](http://status.net/). I siei membris a condividin messaçs curts "
+"su la vite e i lôr interès. "
 
 #. TRANS: Header for list of group administrators on a group page (h2).
 #: actions/showgroup.php:527
@@ -5511,7 +5477,7 @@ msgid "%1$s tagged %2$s"
 msgstr "%1$s cun etichete %2$s"
 
 #. TRANS: Page title showing tagged notices in one user's stream.
-#. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
+#. TRANS: %1$s is the username, %2$s is the hash tag, %1$d is the page number.
 #: actions/showstream.php:74
 #, php-format
 msgid "%1$s tagged %2$s, page %3$d"
@@ -5752,8 +5718,9 @@ msgstr ""
 
 #. TRANS: Title for button to save site notice in admin panel.
 #: actions/sitenoticeadminpanel.php:201
-msgid "Save site notice."
-msgstr ""
+#, fuzzy
+msgid "Save site notice"
+msgstr "Salve lis impuestazions dal sît"
 
 #. TRANS: Title for SMS settings.
 #: actions/smssettings.php:57
@@ -5810,7 +5777,7 @@ msgstr ""
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
 #: actions/smssettings.php:152
-msgid "Phone number, no punctuation or spaces, with area code."
+msgid "Phone number, no punctuation or spaces, with area code"
 msgstr ""
 
 #. TRANS: Form legend for SMS preferences form.
@@ -5971,19 +5938,15 @@ msgstr "No tu sês sotscrit a chest profîl."
 msgid "Could not save subscription."
 msgstr ""
 
-#. TRANS: Client error displayed trying to perform any request method other than POST.
-#. TRANS: Do not translate POST.
 #: actions/subscribe.php:77
 msgid "This action only accepts POST requests."
 msgstr ""
 
-#. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
-#: actions/subscribe.php:121
+#: actions/subscribe.php:117
 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
 msgstr ""
 
-#. TRANS: Page title when subscription succeeded.
-#: actions/subscribe.php:149
+#: actions/subscribe.php:145
 msgid "Subscribed"
 msgstr "Sotscrit"
 
@@ -6135,9 +6098,8 @@ msgstr "Etichete %s"
 msgid "User profile"
 msgstr "Profîl dal utent"
 
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT element in area for user avatar.
-#: actions/tagother.php:81 actions/userauthorization.php:138
+#: actions/tagother.php:81 actions/userauthorization.php:132
 #: lib/userprofile.php:108
 msgid "Photo"
 msgstr "Foto"
@@ -6152,11 +6114,6 @@ msgid ""
 "separated"
 msgstr ""
 
-#: actions/tagother.php:178
-#, php-format
-msgid "Invalid tag: \"%s\""
-msgstr "La etichete no je valide: \"%s\""
-
 #: actions/tagother.php:193
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
@@ -6170,7 +6127,6 @@ msgstr ""
 msgid "No such tag."
 msgstr ""
 
-#. TRANS: Client error displayed when trying to unblock a non-blocked user.
 #: actions/unblock.php:59
 msgid "You haven't blocked that user."
 msgstr ""
@@ -6191,7 +6147,7 @@ msgstr ""
 msgid "Unsubscribed"
 msgstr "No tu sês sotscrit"
 
-#: actions/updateprofile.php:64
+#: actions/updateprofile.php:64 actions/userauthorization.php:337
 #, php-format
 msgid ""
 "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
@@ -6222,7 +6178,7 @@ msgstr ""
 #. TRANS: users in user admin panel. %1$s is the invalid nickname.
 #: actions/useradminpanel.php:166
 #, php-format
-msgid "Invalid default subscripton: \"%1$s\" is not a user."
+msgid "Invalid default subscripton: '%1$s' is not a user."
 msgstr ""
 
 #. TRANS: Link description in user account settings menu.
@@ -6233,7 +6189,7 @@ msgstr "Profîl"
 #. TRANS: Field label in user admin panel for setting the character limit for the bio field.
 #: actions/useradminpanel.php:220
 msgid "Bio Limit"
-msgstr ""
+msgstr "Limit de biografie"
 
 #. TRANS: Tooltip in user admin panel for setting the character limit for the bio field.
 #: actions/useradminpanel.php:222
@@ -6282,136 +6238,106 @@ msgstr ""
 
 #. TRANS: Title for button to save user settings in user admin panel.
 #: actions/useradminpanel.php:302
-msgid "Save user settings."
+#, fuzzy
+msgid "Save user settings"
 msgstr "Salve lis impuestazions dal utent"
 
-#. TRANS: Page title.
-#: actions/userauthorization.php:109
+#: actions/userauthorization.php:105
 msgid "Authorize subscription"
 msgstr "Autorize la sotscrizion"
 
-#. TRANS: Page notice on "Auhtorize subscription" page.
-#: actions/userauthorization.php:115
+#: actions/userauthorization.php:110
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
 "user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
-"click \"Reject\"."
+"click “Reject”."
 msgstr ""
 
-#. TRANS: DT element on Authorise Subscription page where license is displayed.
 #. TRANS: Menu item for site administration
-#: actions/userauthorization.php:207 actions/version.php:167
+#: actions/userauthorization.php:196 actions/version.php:167
 #: lib/adminpanelaction.php:403
 msgid "License"
 msgstr "Licence"
 
-#. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:229
-msgctxt "BUTTON"
+#: actions/userauthorization.php:217
+#, fuzzy
 msgid "Accept"
 msgstr "Acete"
 
-#. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:231
-msgid "Subscribe to this user."
-msgstr "Sotscrivimi a chest utent."
+#: actions/userauthorization.php:218 lib/subscribeform.php:115
+#: lib/subscribeform.php:139
+msgid "Subscribe to this user"
+msgstr "Sotscrivimi a chest utent"
 
-#. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:233
-msgctxt "BUTTON"
+#: actions/userauthorization.php:219
+#, fuzzy
 msgid "Reject"
 msgstr "Refude"
 
-#. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:235
-msgid "Reject this subscription."
+#: actions/userauthorization.php:220
+#, fuzzy
+msgid "Reject this subscription"
 msgstr "Refude la sotscrizion"
 
-#. TRANS: Client error displayed for an empty authorisation request.
-#: actions/userauthorization.php:248
+#: actions/userauthorization.php:232
 msgid "No authorization request!"
 msgstr ""
 
-#. TRANS: Accept message header from Authorise subscription page.
-#: actions/userauthorization.php:271
+#: actions/userauthorization.php:254
 msgid "Subscription authorized"
 msgstr "Sotscrizion autorizade"
 
-#: actions/userauthorization.php:274
+#: actions/userauthorization.php:256
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to authorize the "
 "subscription. Your subscription token is:"
 msgstr ""
 
-#. TRANS: Reject message header from Authorise subscription page.
-#: actions/userauthorization.php:285
+#: actions/userauthorization.php:266
 msgid "Subscription rejected"
 msgstr "Sotscrizion refudade"
 
-#: actions/userauthorization.php:288
+#: actions/userauthorization.php:268
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to fully reject the "
 "subscription."
 msgstr ""
 
-#. TRANS: Exception thrown when no valid user is found for an authorisation request.
-#. TRANS: %s is a listener URI.
-#: actions/userauthorization.php:325
+#: actions/userauthorization.php:303
 #, php-format
-msgid "Listener URI \"%s\" not found here."
+msgid "Listener URI ‘%s’ not found here."
 msgstr ""
 
-#. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:332
+#: actions/userauthorization.php:308
 #, php-format
-msgid "Listenee URI \"%s\" is too long."
+msgid "Listenee URI ‘%s’ is too long."
 msgstr ""
 
-#. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:340
+#: actions/userauthorization.php:314
 #, php-format
-msgid "Listenee URI \"%s\" is a local user."
+msgid "Listenee URI ‘%s’ is a local user."
 msgstr ""
 
-#. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
-#. TRANS: %s is a profile URL.
-#: actions/userauthorization.php:358
+#: actions/userauthorization.php:329
 #, php-format
-msgid "Profile URL \"%s\" is for a local user."
+msgid "Profile URL ‘%s’ is for a local user."
 msgstr ""
 
-#. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
-#. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
-#: actions/userauthorization.php:368
+#: actions/userauthorization.php:345
+#, fuzzy, php-format
+msgid "Avatar URL ‘%s’ is not valid."
+msgstr "La URL sorzint no je valide."
+
+#: actions/userauthorization.php:350
 #, php-format
-msgid ""
-"Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
-"\"."
+msgid "Can’t read avatar URL ‘%s’."
 msgstr ""
 
-#. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:378
+#: actions/userauthorization.php:355
 #, php-format
-msgid "Avatar URL \"%s\" is not valid."
-msgstr ""
-
-#. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:385
-#, php-format
-msgid "Cannot read avatar URL \"%s\"."
-msgstr ""
-
-#. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:392
-#, php-format
-msgid "Wrong image type for avatar URL \"%s\"."
+msgid "Wrong image type for avatar URL ‘%s’."
 msgstr ""
 
 #. TRANS: Page title for profile design page.
@@ -6509,7 +6435,7 @@ msgid "Plugins"
 msgstr ""
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:898
+#: actions/version.php:198 lib/action.php:901
 msgid "Version"
 msgstr "Version"
 
@@ -6709,14 +6635,14 @@ msgstr ""
 
 #. TRANS: Server exception thrown when a reply cannot be saved.
 #. TRANS: %1$d is a notice ID, %2$d is the ID of the mentioned user.
-#: classes/Notice.php:1142
+#: classes/Notice.php:1144
 #, php-format
 msgid "Could not save reply for %1$d, %2$d."
 msgstr ""
 
 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1661
+#: classes/Notice.php:1663
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
@@ -6730,14 +6656,14 @@ msgstr "%1$s (%2$s)"
 
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:775
+#: classes/Profile.php:779
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:784
+#: classes/Profile.php:788
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -6860,7 +6786,7 @@ msgstr ""
 #. TRANS: Link title attribute in user account settings menu.
 #: lib/accountsettingsaction.php:104
 msgid "Change your profile settings"
-msgstr ""
+msgstr "Cambie lis impuestazions dal to profîl"
 
 #. TRANS: Link title attribute in user account settings menu.
 #: lib/accountsettingsaction.php:111
@@ -6875,7 +6801,7 @@ msgstr "Cambie la tô password"
 #. TRANS: Link title attribute in user account settings menu.
 #: lib/accountsettingsaction.php:125
 msgid "Change email handling"
-msgstr ""
+msgstr "Cambie la gjestion de pueste eletroniche"
 
 #. TRANS: Link title attribute in user account settings menu.
 #: lib/accountsettingsaction.php:132
@@ -7054,53 +6980,53 @@ msgid "Page notice"
 msgstr ""
 
 #. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:871
+#: lib/action.php:874
 msgid "Secondary site navigation"
 msgstr ""
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:877
+#: lib/action.php:880
 msgid "Help"
 msgstr "Jutori"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:880
+#: lib/action.php:883
 msgid "About"
 msgstr "Informazions"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:883
+#: lib/action.php:886
 msgid "FAQ"
 msgstr ""
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:888
+#: lib/action.php:891
 msgid "TOS"
 msgstr ""
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:892
+#: lib/action.php:895
 msgid "Privacy"
 msgstr ""
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:895
+#: lib/action.php:898
 msgid "Source"
 msgstr "Sorzint"
 
 #. TRANS: Secondary navigation menu option leading to e-mail contact information on the
 #. TRANS: StatusNet site, where to report bugs, ...
-#: lib/action.php:902
+#: lib/action.php:905
 msgid "Contact"
 msgstr "Contats"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:905
+#: lib/action.php:908
 msgid "Badge"
 msgstr ""
 
 #. TRANS: DT element for StatusNet software license.
-#: lib/action.php:934
+#: lib/action.php:937
 msgid "StatusNet software license"
 msgstr "Licence dal software StatusNet"
 
@@ -7108,7 +7034,7 @@ msgstr "Licence dal software StatusNet"
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:941
+#: lib/action.php:944
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7118,7 +7044,7 @@ msgstr ""
 "broughtby%%](%%site.broughtbyurl%%)."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:944
+#: lib/action.php:947
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** al è un servizi di microblogging."
@@ -7127,7 +7053,7 @@ msgstr "**%%site.name%%** al è un servizi di microblogging."
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:951
+#: lib/action.php:954
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7139,53 +7065,56 @@ msgstr ""
 "fsf.org/licensing/licenses/agpl-3.0.html)."
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:967
+#: lib/action.php:970
 msgid "Site content license"
 msgstr "Licence dal contignût dal sît"
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:974
+#: lib/action.php:977
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
-msgstr ""
+msgstr "I contignûts e i dâts di %1$s a son privâts e confidenziâi."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:981
+#: lib/action.php:984
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
+"I contignûts e i dâts a son copyright di %1$s. Ducj i dirits riservâts."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:985
+#: lib/action.php:988
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
+"I contignûts e i dâts a son copyright dai colaboradôrs Ducj i dirits "
+"riservâts."
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:1017
+#: lib/action.php:1020
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
 "Dut il contignût e i dâts di %1$s a son disponibii sot de licence %2$s."
 
 #. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1353
+#: lib/action.php:1356
 msgid "Pagination"
-msgstr ""
+msgstr "Paginazion"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1364
+#: lib/action.php:1367
 msgid "After"
-msgstr ""
+msgstr "Sucessîfs"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1374
+#: lib/action.php:1377
 msgid "Before"
-msgstr ""
+msgstr "Precedents"
 
 #. TRANS: Client exception thrown when a feed instance is a DOMDocument.
 #: lib/activity.php:125
@@ -7378,23 +7307,19 @@ msgstr ""
 msgid "No application for that consumer key."
 msgstr ""
 
-#: lib/apiauth.php:202 lib/apiauth.php:284
-msgid "Not allowed to use API."
-msgstr ""
-
 #. TRANS: OAuth exception given when an incorrect access token was given for a user.
-#: lib/apiauth.php:225
+#: lib/apiauth.php:219
 msgid "Bad access token."
 msgstr ""
 
 #. TRANS: OAuth exception given when no user was found for a given token (no token was found).
-#: lib/apiauth.php:230
+#: lib/apiauth.php:224
 msgid "No user for that token."
 msgstr ""
 
 #. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel".
 #. TRANS: Client error thrown when authentication fails.
-#: lib/apiauth.php:272 lib/apiauth.php:302
+#: lib/apiauth.php:266 lib/apiauth.php:293
 msgid "Could not authenticate you."
 msgstr ""
 
@@ -7593,11 +7518,6 @@ msgstr ""
 msgid "Block"
 msgstr "Bloche"
 
-#. TRANS: Description of the form to block a user.
-#: lib/blockform.php:79
-msgid "Block this user"
-msgstr "Bloche chest utent"
-
 #. TRANS: Title for command results.
 #: lib/channel.php:160 lib/channel.php:181
 msgid "Command results"
@@ -7625,7 +7545,7 @@ msgstr ""
 
 #. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
 #. TRANS: Error text shown when a last user notice is requested and it does not exist.
-#: lib/command.php:99 lib/command.php:630
+#: lib/command.php:99 lib/command.php:642
 msgid "User has no last notice."
 msgstr ""
 
@@ -7675,35 +7595,40 @@ msgstr ""
 "Sotscritôrs: %2$s\n"
 "Avîs: %3$s"
 
+#. TRANS: Error message text shown when a favorite could not be set because it has already been favorited.
+#: lib/command.php:298
+msgid "Could not create favorite: already favorited."
+msgstr ""
+
 #. TRANS: Text shown when a notice has been marked as favourite successfully.
-#: lib/command.php:312
+#: lib/command.php:324
 msgid "Notice marked as fave."
 msgstr ""
 
 #. TRANS: Message given having added a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:357
+#: lib/command.php:369
 #, php-format
 msgid "%1$s joined group %2$s."
 msgstr "%1$s si à unît al grup %2$s."
 
 #. TRANS: Message given having removed a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:405
+#: lib/command.php:417
 #, php-format
 msgid "%1$s left group %2$s."
 msgstr "%1$s al à lassât il grup %2$s."
 
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: lib/command.php:426
+#: lib/command.php:438
 #, php-format
 msgctxt "WHOIS"
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
 
 #. TRANS: Whois output. %s is the full name of the queried user.
-#: lib/command.php:430
+#: lib/command.php:442
 #, php-format
 msgid "Fullname: %s"
 msgstr "Non complet: %s"
@@ -7711,7 +7636,7 @@ msgstr "Non complet: %s"
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a location.
-#: lib/command.php:434 lib/mail.php:270
+#: lib/command.php:446 lib/mail.php:270
 #, php-format
 msgid "Location: %s"
 msgstr "Lûc: %s"
@@ -7719,20 +7644,20 @@ msgstr "Lûc: %s"
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a homepage.
-#: lib/command.php:438 lib/mail.php:274
+#: lib/command.php:450 lib/mail.php:274
 #, php-format
 msgid "Homepage: %s"
 msgstr "Pagjine web: %s"
 
 #. TRANS: Whois output. %s is the bio information of the queried user.
-#: lib/command.php:442
+#: lib/command.php:454
 #, php-format
 msgid "About: %s"
 msgstr "Informazions: %s"
 
 #. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).
 #. TRANS: %s is a remote profile.
-#: lib/command.php:471
+#: lib/command.php:483
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
@@ -7741,7 +7666,7 @@ msgstr ""
 
 #. TRANS: Message given if content is too long. %1$sd is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:488
+#: lib/command.php:500
 #, php-format
 msgid "Message too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
@@ -7753,25 +7678,25 @@ msgstr[1] ""
 "mandâts %2$d."
 
 #. TRANS: Error text shown sending a direct message fails with an unknown reason.
-#: lib/command.php:516
+#: lib/command.php:528
 msgid "Error sending direct message."
 msgstr ""
 
 #. TRANS: Message given having repeated a notice from another user.
 #. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:553
+#: lib/command.php:565
 #, php-format
 msgid "Notice from %s repeated."
 msgstr "L'avîs di %s al è stât ripetût."
 
 #. TRANS: Error text shown when repeating a notice fails with an unknown reason.
-#: lib/command.php:556
+#: lib/command.php:568
 msgid "Error repeating notice."
 msgstr ""
 
 #. TRANS: Message given if content of a notice for a reply is too long. %1$d is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:591
+#: lib/command.php:603
 #, php-format
 msgid "Notice too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Notice too long - maximum is %1$d characters, you sent %2$d."
@@ -7784,100 +7709,100 @@ msgstr[1] ""
 
 #. TRANS: Text shown having sent a reply to a notice successfully.
 #. TRANS: %s is the nickname of the user of the notice the reply was sent to.
-#: lib/command.php:604
+#: lib/command.php:616
 #, php-format
 msgid "Reply to %s sent."
 msgstr "Rispueste a %s mandade."
 
 #. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
-#: lib/command.php:607
+#: lib/command.php:619
 msgid "Error saving notice."
 msgstr ""
 
 #. TRANS: Error text shown when no username was provided when issuing a subscribe command.
-#: lib/command.php:654
+#: lib/command.php:666
 msgid "Specify the name of the user to subscribe to."
 msgstr ""
 
 #. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
-#: lib/command.php:663
+#: lib/command.php:675
 msgid "Can't subscribe to OMB profiles by command."
 msgstr ""
 
 #. TRANS: Text shown after having subscribed to another user successfully.
 #. TRANS: %s is the name of the user the subscription was requested for.
-#: lib/command.php:671
+#: lib/command.php:683
 #, php-format
 msgid "Subscribed to %s."
 msgstr "Sotscrit a %s."
 
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.
-#: lib/command.php:692 lib/command.php:803
+#: lib/command.php:704 lib/command.php:815
 msgid "Specify the name of the user to unsubscribe from."
 msgstr "Inserìs il non dal utent che no tu vuelis plui sotscrivilu."
 
 #. TRANS: Text shown after having unsubscribed from another user successfully.
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:703
+#: lib/command.php:715
 #, php-format
 msgid "Unsubscribed from %s."
 msgstr "No tu sês plui sotscrit a %s."
 
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
-#: lib/command.php:723 lib/command.php:749
+#: lib/command.php:735 lib/command.php:761
 msgid "Command not yet implemented."
 msgstr ""
 
 #. TRANS: Text shown when issuing the command "off" successfully.
-#: lib/command.php:727
+#: lib/command.php:739
 msgid "Notification off."
 msgstr ""
 
 #. TRANS: Error text shown when the command "off" fails for an unknown reason.
-#: lib/command.php:730
+#: lib/command.php:742
 msgid "Can't turn off notification."
 msgstr ""
 
 #. TRANS: Text shown when issuing the command "on" successfully.
-#: lib/command.php:753
+#: lib/command.php:765
 msgid "Notification on."
 msgstr ""
 
 #. TRANS: Error text shown when the command "on" fails for an unknown reason.
-#: lib/command.php:756
+#: lib/command.php:768
 msgid "Can't turn on notification."
 msgstr ""
 
 #. TRANS: Error text shown when issuing the login command while login is disabled.
-#: lib/command.php:770
+#: lib/command.php:782
 msgid "Login command is disabled."
 msgstr ""
 
 #. TRANS: Text shown after issuing the login command successfully.
 #. TRANS: %s is a logon link..
-#: lib/command.php:783
+#: lib/command.php:795
 #, php-format
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
 
 #. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:812
+#: lib/command.php:824
 #, php-format
 msgid "Unsubscribed %s."
 msgstr ""
 
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
-#: lib/command.php:830
+#: lib/command.php:842
 msgid "You are not subscribed to anyone."
 msgstr "No tu sês sotscrit a nissun."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
-#: lib/command.php:835
+#: lib/command.php:847
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Tu sês sotscrit a cheste persone:"
@@ -7885,14 +7810,14 @@ msgstr[1] "Tu sês sotscrit a chestis personis:"
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user
 #. TRANS: (followers) without having any subscribers.
-#: lib/command.php:857
+#: lib/command.php:869
 msgid "No one is subscribed to you."
 msgstr "No tu âs nissun sotscritôr."
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
-#: lib/command.php:862
+#: lib/command.php:874
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Chest al è il tô sotscritôr:"
@@ -7900,21 +7825,21 @@ msgstr[1] "Chescj a son i tiei sotscritôrs:"
 
 #. TRANS: Text shown after requesting groups a user is subscribed to without having
 #. TRANS: any group subscriptions.
-#: lib/command.php:884
+#: lib/command.php:896
 msgid "You are not a member of any groups."
 msgstr "No tu sês part di nissun grup."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
-#: lib/command.php:889
+#: lib/command.php:901
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "Tu sês un membri di chest grup:"
 msgstr[1] "Tu sês un membri di chescj grups:"
 
 #. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-#: lib/command.php:904
+#: lib/command.php:916
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -8015,11 +7940,6 @@ msgstr ""
 msgid "Database error"
 msgstr "Erôr de base di dâts"
 
-#. TRANS: Description of form for deleting a user.
-#: lib/deleteuserform.php:75
-msgid "Delete this user"
-msgstr "Elimine chest utent"
-
 #. TRANS: Label in form on profile design page.
 #. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
 #: lib/designsettings.php:108
@@ -8054,21 +7974,6 @@ msgstr "Cambie i colôrs"
 msgid "Use defaults"
 msgstr ""
 
-#. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: lib/designsettings.php:259
-msgid "Restore default designs"
-msgstr ""
-
-#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: lib/designsettings.php:267
-msgid "Reset back to default"
-msgstr ""
-
-#. TRANS: Title for button on profile design page to save settings.
-#: lib/designsettings.php:272
-msgid "Save design"
-msgstr ""
-
 #. TRANS: Error message displayed if design settings could not be saved.
 #. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
 #: lib/designsettings.php:405 lib/designsettings.php:427
@@ -8833,10 +8738,6 @@ msgstr "Rispuint a chest avîs"
 msgid "Reply"
 msgstr "Rispuint"
 
-#: lib/noticelist.php:673
-msgid "Delete this notice"
-msgstr "Elimine chest avîs"
-
 #: lib/noticelist.php:691
 msgid "Notice repeated"
 msgstr "Avîs ripetût"
@@ -9101,20 +9002,16 @@ msgstr ""
 #: lib/subgroupnav.php:99
 #, php-format
 msgid "Groups %s is a member of"
-msgstr ""
+msgstr "%s al fâs part di chescj grups"
 
 #: lib/subgroupnav.php:105
 msgid "Invite"
-msgstr ""
+msgstr "Invide"
 
 #: lib/subgroupnav.php:106
 #, php-format
 msgid "Invite friends and colleagues to join you on %s"
-msgstr ""
-
-#: lib/subscribeform.php:115 lib/subscribeform.php:139
-msgid "Subscribe to this user"
-msgstr "Sotscrivimi a chest utent"
+msgstr "Invide amîs e compagns di lavôr a partecipâ a %s"
 
 #: lib/subscriberspeopleselftagcloudsection.php:48
 #: lib/subscriptionspeopleselftagcloudsection.php:48
@@ -9283,23 +9180,18 @@ msgctxt "role"
 msgid "Moderator"
 msgstr "Moderatôr"
 
-#: lib/util.php:305
-#, fuzzy
-msgid "Not allowed to log in."
-msgstr "No tu sês jentrât."
-
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1309
+#: lib/util.php:1306
 msgid "a few seconds ago"
 msgstr "cualchi secont indaûr"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1312
+#: lib/util.php:1309
 msgid "about a minute ago"
 msgstr "cirche un minût indaûr"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1316
+#: lib/util.php:1313
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
@@ -9307,12 +9199,12 @@ msgstr[0] "cirche un minût indaûr"
 msgstr[1] "cirche %d minûts indaûr"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1319
+#: lib/util.php:1316
 msgid "about an hour ago"
 msgstr "cirche une ore indaûr"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1323
+#: lib/util.php:1320
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
@@ -9320,12 +9212,12 @@ msgstr[0] "cirche une ore indaûr"
 msgstr[1] "cirche %d oris indaûr"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1326
+#: lib/util.php:1323
 msgid "about a day ago"
 msgstr "cirche une zornade indaûr"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1330
+#: lib/util.php:1327
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
@@ -9333,12 +9225,12 @@ msgstr[0] "cirche une zornade indaûr"
 msgstr[1] "cirche %d zornadis indaûr"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1333
+#: lib/util.php:1330
 msgid "about a month ago"
 msgstr "cirche un mês indaûr"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1337
+#: lib/util.php:1334
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
@@ -9346,7 +9238,7 @@ msgstr[0] "cirche un mês indaûr"
 msgstr[1] "cirche %d mês indaûr"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1340
+#: lib/util.php:1337
 msgid "about a year ago"
 msgstr "cirche un an indaûr"
 
@@ -9391,3 +9283,29 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#~ msgid "Block this user."
+#~ msgstr "Bloche chest utent"
+
+#~ msgid "Delete this notice."
+#~ msgstr "Elimine chest avîs"
+
+#~ msgid "Delete this user."
+#~ msgstr "Elimine chest utent"
+
+#, fuzzy
+#~ msgid "%s updates from everyone."
+#~ msgstr "Inzornaments di %s di ducj cuancj!"
+
+#~ msgid "Password saved"
+#~ msgstr "Password salvade"
+
+#~ msgid "Where you are, like \"City, State (or Region), Country\"."
+#~ msgstr "Dulà che tu sês, par esempli \"Citât, Provincie, Stât\"."
+
+#~ msgid "Subscribe to this user."
+#~ msgstr "Sotscrivimi a chest utent."
+
+#, fuzzy
+#~ msgid "Not allowed to log in."
+#~ msgstr "No tu sês jentrât."
diff --git a/locale/gl/LC_MESSAGES/statusnet.po b/locale/gl/LC_MESSAGES/statusnet.po
index 2738400467..5710eaca2d 100644
--- a/locale/gl/LC_MESSAGES/statusnet.po
+++ b/locale/gl/LC_MESSAGES/statusnet.po
@@ -3,6 +3,7 @@
 #
 # Author: Brion
 # Author: Gallaecio
+# Author: McDutchie
 # Author: Toliño
 # --
 # This file is distributed under the same license as the StatusNet package.
@@ -11,17 +12,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-24 10:32+0000\n"
-"PO-Revision-Date: 2011-02-24 10:36:44+0000\n"
+"POT-Creation-Date: 2011-03-03 15:58+0000\n"
+"PO-Revision-Date: 2011-03-03 16:00:46+0000\n"
 "Language-Team: Galician <http://translatewiki.net/wiki/Portal:gl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r82712); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: gl\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-02-17 11:39:54+0000\n"
+"X-POT-Import-Date: 2011-02-25 23:49:23+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -133,11 +134,7 @@ msgstr "Esa páxina non existe."
 #. 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 use "one time password login" without using an existing user.
-#. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
-#. TRANS: Client error displayed trying to find a user by ID for a non-existing ID.
-#. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when calling a profile action without specifying a user.
 #: actions/all.php:80 actions/allrss.php:69
@@ -155,12 +152,12 @@ msgstr "Esa páxina non existe."
 #: actions/apitimelinementions.php:77 actions/apitimelineuser.php:79
 #: actions/avatarbynickname.php:79 actions/favoritesrss.php:72
 #: actions/foaf.php:42 actions/foaf.php:61 actions/hcard.php:67
-#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:78
+#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
 #: actions/remotesubscribe.php:144 actions/remotesubscribe.php:153
-#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:113
-#: actions/showfavorites.php:106 actions/userbyid.php:75
+#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
+#: actions/showfavorites.php:106 actions/userbyid.php:74
 #: actions/usergroups.php:93 actions/userrss.php:40 actions/userxrd.php:59
-#: actions/xrds.php:71 lib/command.php:497 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:509 lib/galleryaction.php:59
 #: lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Non existe tal usuario."
@@ -290,7 +287,7 @@ msgstr "Actualizacións de %1$s e amigos en %2$s!"
 #: actions/apigrouplistall.php:120 actions/apigroupmembership.php:105
 #: actions/apigroupshow.php:114 actions/apihelptest.php:84
 #: actions/apistatusesdestroy.php:101 actions/apistatusesretweets.php:110
-#: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:138
+#: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:139
 #: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
 #: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:268
 #: actions/apitimelinegroup.php:147 actions/apitimelinehome.php:173
@@ -524,7 +521,7 @@ msgstr "Non se atopou o destinatario."
 #. TRANS: Client error displayed trying to direct message another user who's not a friend (403).
 #: actions/apidirectmessagenew.php:144
 #, fuzzy
-msgid "Cannot send direct messages to users who aren't your friend."
+msgid "Can't send direct messages to users who aren't your friend."
 msgstr ""
 "Non pode enviar mensaxes directas a usuarios que non sexan amigos seus."
 
@@ -551,7 +548,7 @@ msgstr "Este estado xa é dos favoritos."
 #. TRANS: Client error displayed when marking a notice as favourite fails.
 #. TRANS: Server error displayed when trying to mark a notice as favorite fails in the database.
 #. TRANS: Error message text shown when a favorite could not be set.
-#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:294
+#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:306
 msgid "Could not create favorite."
 msgstr "Non se puido crear o favorito."
 
@@ -610,7 +607,7 @@ msgstr "Non se puido atopar o usuario de destino."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:191
 #: actions/newgroup.php:137 actions/profilesettings.php:273
-#: actions/register.php:206
+#: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "Ese alcume xa está en uso. Probe con outro."
 
@@ -620,7 +617,7 @@ msgstr "Ese alcume xa está en uso. Probe con outro."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:195
 #: actions/newgroup.php:141 actions/profilesettings.php:243
-#: actions/register.php:208
+#: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "O formato do alcume non é correcto."
 
@@ -633,7 +630,7 @@ msgstr "O formato do alcume non é correcto."
 #: actions/apigroupcreate.php:181 actions/editapplication.php:235
 #: actions/editgroup.php:202 actions/newapplication.php:221
 #: actions/newgroup.php:148 actions/profilesettings.php:248
-#: actions/register.php:215
+#: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "O URL da páxina persoal non é correcto."
 
@@ -643,7 +640,7 @@ msgstr "O URL da páxina persoal non é correcto."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:191 actions/editgroup.php:206
 #: actions/newgroup.php:152 actions/profilesettings.php:252
-#: actions/register.php:218
+#: actions/register.php:226
 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "O nome completo é longo de máis (o máximo son 255 caracteres)."
@@ -672,7 +669,7 @@ msgstr[1] "A descrición é longa de máis (o máximo son %d caracteres)."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:215 actions/editgroup.php:218
 #: actions/newgroup.php:164 actions/profilesettings.php:265
-#: actions/register.php:227
+#: actions/register.php:235
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
 msgstr "A localidade é longa de máis (o máximo son 255 caracteres)."
@@ -729,14 +726,14 @@ msgstr "Non se atopou o grupo."
 #. TRANS: Server error displayed when trying to join a group the user is already a member of.
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:333
+#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:345
 msgid "You are already a member of that group."
 msgstr "Xa forma parte dese grupo."
 
 #. TRANS: Server error displayed when trying to join a group the user is blocked from joining.
 #. 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.
-#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:338
+#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:350
 msgid "You have been blocked from that group by the admin."
 msgstr "O administrador bloqueouno nese grupo."
 
@@ -746,7 +743,7 @@ msgstr "O administrador bloqueouno nese grupo."
 #. TRANS: %1$s is the joining user's nickname, $2$s is the group nickname for which the join failed.
 #. TRANS: Message given having failed to add a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:350
+#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:362
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "O usuario %1$s non se puido engadir ao grupo %2$s."
@@ -763,7 +760,7 @@ msgstr "Vostede non pertence a este grupo."
 #. TRANS: Message given having failed to remove a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
 #: actions/apigroupleave.php:127 actions/leavegroup.php:133
-#: lib/command.php:398
+#: lib/command.php:410
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
 msgstr "O usuario %1$s non se puido eliminar do grupo %2$s."
@@ -825,21 +822,20 @@ msgstr "Non está autorizado."
 #. TRANS: Form validation error message.
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
-#. TRANS: Client error displayed when the session token is not okay.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
 #: actions/deletenotice.php:177 actions/disfavor.php:75
 #: actions/emailsettings.php:291 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:65 actions/grouplogo.php:321
 #: actions/groupunblock.php:65 actions/imsettings.php:224
-#: actions/invite.php:60 actions/login.php:131 actions/makeadmin.php:66
+#: actions/invite.php:60 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
-#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:136
-#: actions/othersettings.php:155 actions/passwordsettings.php:137
+#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
+#: actions/othersettings.php:155 actions/passwordsettings.php:138
 #: actions/profilesettings.php:217 actions/recoverpassword.php:383
-#: actions/register.php:164 actions/remotesubscribe.php:76
+#: actions/register.php:172 actions/remotesubscribe.php:76
 #: actions/repeat.php:82 actions/smssettings.php:250 actions/subedit.php:40
-#: actions/subscribe.php:87 actions/tagother.php:166
-#: actions/unsubscribe.php:69 actions/userauthorization.php:53
+#: actions/subscribe.php:86 actions/tagother.php:166
+#: actions/unsubscribe.php:69 actions/userauthorization.php:52
 #: lib/designsettings.php:310
 msgid "There was a problem with your session token. Try again, please."
 msgstr "Houbo un erro co seu pase. Inténteo de novo."
@@ -873,7 +869,7 @@ msgstr ""
 #: actions/designadminpanel.php:100 actions/editapplication.php:144
 #: actions/emailsettings.php:310 actions/grouplogo.php:332
 #: actions/imsettings.php:239 actions/newapplication.php:124
-#: actions/oauthconnectionssettings.php:145 actions/recoverpassword.php:46
+#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
 #: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
 msgstr "Envío de formulario inesperado."
@@ -924,20 +920,19 @@ msgstr "Conta"
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group nickname (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT for nick name in a profile.
-#: actions/apioauthauthorize.php:459 actions/login.php:242
-#: actions/profilesettings.php:106 actions/register.php:418
+#: actions/apioauthauthorize.php:459 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:432
 #: actions/showgroup.php:243 actions/tagother.php:94
-#: actions/userauthorization.php:152 lib/groupeditform.php:145
+#: actions/userauthorization.php:145 lib/groupeditform.php:145
 #: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "Alcume"
 
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:463 actions/login.php:245
-#: actions/register.php:422 lib/accountsettingsaction.php:120
+#: actions/apioauthauthorize.php:463 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:120
 msgid "Password"
 msgstr "Contrasinal"
 
@@ -1029,13 +1024,13 @@ msgstr "Non existe tal nota."
 
 #. TRANS: Client error displayed trying to repeat an own notice through the API.
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:537
+#: actions/apistatusesretweet.php:83 lib/command.php:549
 msgid "Cannot repeat your own notice."
 msgstr "Non pode repetir a súa propia nota."
 
 #. TRANS: Client error displayed trying to re-repeat a notice through the API.
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:92 lib/command.php:543
+#: actions/apistatusesretweet.php:92 lib/command.php:555
 msgid "Already repeated that notice."
 msgstr "Xa repetiu esa nota."
 
@@ -1058,7 +1053,7 @@ msgstr "Non se atopou o método da API."
 #. TRANS: %s is the requested output format.
 #: actions/apistatusesshow.php:144
 #, fuzzy, php-format
-msgid "Unsupported format: %s."
+msgid "Unsupported format: %s"
 msgstr "Formato non soportado."
 
 #. TRANS: Client error displayed requesting a deleted status.
@@ -1167,14 +1162,13 @@ msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr "%1$s actualizacións que responden a actualizacións de %2$s / %3$s."
 
 #. TRANS: Title for site timeline. %s is the StatusNet sitename.
-#. TRANS: Public RSS feed title. %s is the StatusNet site name.
 #: actions/apitimelinepublic.php:193 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "Liña do tempo pública de %s"
 
 #. TRANS: Subtitle for site timeline. %s is the StatusNet sitename.
-#: actions/apitimelinepublic.php:199
+#: actions/apitimelinepublic.php:199 actions/publicrss.php:105
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "%s actualizacións de todos!"
@@ -1241,26 +1235,25 @@ msgid "Atom post must be an Atom entry."
 msgstr ""
 
 #. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
-#: actions/apitimelineuser.php:334
+#: actions/apitimelineuser.php:335
 msgid "Can only handle POST activities."
 msgstr ""
 
 #. TRANS: Client error displayed when using an unsupported activity object type.
 #. TRANS: %s is the unsupported activity object type.
-#: actions/apitimelineuser.php:345
+#: actions/apitimelineuser.php:346
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
 #. TRANS: %d is the notice ID (number).
-#: actions/apitimelineuser.php:379
+#: actions/apitimelineuser.php:380
 #, fuzzy, php-format
 msgid "No content for notice %d."
 msgstr "Buscar nos contidos das notas"
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#. TRANS: %s is the notice URI.
 #: actions/apitimelineuser.php:408
 #, fuzzy, php-format
 msgid "Notice with URI \"%s\" already exists."
@@ -1279,10 +1272,9 @@ msgstr "Non se atopou o método da API."
 
 #. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
 #. TRANS: Client exception.
-#. TRANS: Client error displayed trying to subscribe to a non-existing profile.
 #: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
 #: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
-#: actions/subscribe.php:110
+#: actions/subscribe.php:107
 msgid "No such profile."
 msgstr "Non existe ese perfil."
 
@@ -1418,7 +1410,7 @@ msgstr "Non se puido eliminar o favorito."
 #: actions/joingroup.php:95 actions/leavegroup.php:82
 #: actions/leavegroup.php:95 actions/makeadmin.php:86
 #: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:380
+#: lib/command.php:392
 msgid "No such group."
 msgstr "Non existe tal grupo."
 
@@ -1429,7 +1421,7 @@ msgid "Not a member."
 msgstr "Todos os membros"
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
-#: actions/atompubshowmembership.php:150
+#: actions/atompubshowmembership.php:151
 #, fuzzy
 msgid "Cannot delete someone else's membership."
 msgstr "Non se puido borrar a subscrición a si mesmo."
@@ -1536,11 +1528,9 @@ msgstr ""
 
 #. TRANS: Server error displayed in avatar upload page when no matching profile can be found for a user.
 #. TRANS: Server error displayed coming across a request from a user without a profile.
-#. TRANS: Server error displayed when trying to authorise a remote subscription request
-#. TRANS: while the user has no profile.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
 #: actions/grouplogo.php:184 actions/remotesubscribe.php:190
-#: actions/userauthorization.php:75 actions/userrss.php:108
+#: actions/userauthorization.php:72 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr "O usuario non ten perfil."
 
@@ -1595,10 +1585,10 @@ msgstr "Recortar"
 msgid "No file uploaded."
 msgstr "Non se subiu ficheiro ningún."
 
-#. TRANS: Avatar upload form instruction after uploading a file.
+#. TRANS: Avatar upload form unstruction after uploading a file.
 #: actions/avatarsettings.php:345
 #, fuzzy
-msgid "Pick a square area of the image to be your avatar."
+msgid "Pick a square area of the image to be your avatar"
 msgstr "Escolla unha zona cadrada da imaxe para usala como avatar"
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
@@ -1640,7 +1630,7 @@ msgid "You may not backup your account."
 msgstr ""
 
 #. TRANS: Information displayed on the backup account page.
-#: actions/backupaccount.php:225
+#: actions/backupaccount.php:227
 msgid ""
 "You can backup your account data in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format. This is an experimental feature and provides "
@@ -1650,15 +1640,15 @@ msgid ""
 msgstr ""
 
 #. TRANS: Submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:248
+#: actions/backupaccount.php:250
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Backup"
 msgstr "Fondo"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:252
-msgid "Backup your account."
+#: actions/backupaccount.php:254
+msgid "Backup your account"
 msgstr ""
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
@@ -1700,7 +1690,7 @@ msgstr "Non"
 #. TRANS: Submit button title for 'No' when blocking a user.
 #: actions/block.php:158
 #, fuzzy
-msgid "Do not block this user."
+msgid "Do not block this user"
 msgstr "Non bloquear este usuario"
 
 #. TRANS: Button label on the user block form.
@@ -1717,9 +1707,9 @@ msgid "Yes"
 msgstr "Si"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:165
-#, fuzzy
-msgid "Block this user."
+#. TRANS: Description of the form to block a user.
+#: actions/block.php:165 lib/blockform.php:79
+msgid "Block this user"
 msgstr "Bloquear este usuario"
 
 #. TRANS: Server error displayed when blocking a user fails.
@@ -1883,7 +1873,7 @@ msgstr ""
 #. TRANS: Field label for delete account confirmation entry.
 #. TRANS: Field label for password reset form where the password has to be typed again.
 #: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:262 actions/register.php:426
+#: actions/recoverpassword.php:262 actions/register.php:440
 msgid "Confirm"
 msgstr "Confirmar"
 
@@ -1913,14 +1903,14 @@ msgstr "Non se atopou a aplicación."
 #. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
 #: actions/deleteapplication.php:79 actions/editapplication.php:78
-#: actions/showapplication.php:90
+#: actions/showapplication.php:94
 msgid "You are not the owner of this application."
 msgstr "Non é o dono desa aplicación."
 
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
-#: actions/newapplication.php:112 actions/showapplication.php:113
-#: lib/action.php:1422
+#: actions/newapplication.php:112 actions/showapplication.php:118
+#: lib/action.php:1425
 msgid "There was a problem with your session token."
 msgstr "Houbo un problema co seu pase."
 
@@ -1944,13 +1934,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting an application.
 #: actions/deleteapplication.php:161
 #, fuzzy
-msgid "Do not delete this application."
+msgid "Do not delete this application"
 msgstr "Non borrar a aplicación"
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
 #: actions/deleteapplication.php:167
 #, fuzzy
-msgid "Delete this application."
+msgid "Delete this application"
 msgstr "Borrar a aplicación"
 
 #. TRANS: Client error when trying to delete group while not logged in.
@@ -2007,13 +1997,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting a group.
 #: actions/deletegroup.php:224
 #, fuzzy
-msgid "Do not delete this group."
+msgid "Do not delete this group"
 msgstr "Non borrar esta nota"
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
 #: actions/deletegroup.php:231
 #, fuzzy
-msgid "Delete this group."
+msgid "Delete this group"
 msgstr "Borrar o usuario"
 
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
@@ -2021,15 +2011,13 @@ msgstr "Borrar o usuario"
 #. TRANS: Client error displayed when trying to mark a notice as favorite without being logged in.
 #. TRANS: Client error displayed trying to block a user from a group while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
-#. TRANS: Client error displayed trying to log out when not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
-#. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
 #. TRANS: Client error displayed when trying to change user options while not logged in.
 #: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
-#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:70
+#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
-#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:98
+#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
 #: lib/adminpanelaction.php:71 lib/profileformaction.php:63
 #: lib/settingsaction.php:72
@@ -2059,13 +2047,12 @@ msgstr "Está seguro de querer borrar esta nota?"
 #. TRANS: Submit button title for 'No' when deleting a notice.
 #: actions/deletenotice.php:159
 #, fuzzy
-msgid "Do not delete this notice."
+msgid "Do not delete this notice"
 msgstr "Non borrar esta nota"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:166
-#, fuzzy
-msgid "Delete this notice."
+#: actions/deletenotice.php:166 lib/noticelist.php:673
+msgid "Delete this notice"
 msgstr "Borrar esta nota"
 
 #. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
@@ -2102,13 +2089,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting a user.
 #: actions/deleteuser.php:158
 #, fuzzy
-msgid "Do not delete this user."
+msgid "Do not delete this user"
 msgstr "Non borrar esta nota"
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
-#: actions/deleteuser.php:165
-#, fuzzy
-msgid "Delete this user."
+#. TRANS: Description of form for deleting a user.
+#: actions/deleteuser.php:165 lib/deleteuserform.php:75
+msgid "Delete this user"
 msgstr "Borrar o usuario"
 
 #. TRANS: Message used as title for design settings for the site.
@@ -2277,21 +2264,21 @@ msgid "Use defaults"
 msgstr "Utilizar os valores por defecto"
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:720
-#, fuzzy
-msgid "Restore default designs."
+#. TRANS: Title for button on profile design page to reset all colour settings to default.
+#: actions/designadminpanel.php:720 lib/designsettings.php:259
+msgid "Restore default designs"
 msgstr "Restaurar o deseño por defecto"
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:728
-#, fuzzy
-msgid "Reset back to default."
+#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
+#: actions/designadminpanel.php:728 lib/designsettings.php:267
+msgid "Reset back to default"
 msgstr "Volver ao deseño por defecto"
 
 #. TRANS: Title for button for saving theme settings.
-#: actions/designadminpanel.php:736
-#, fuzzy
-msgid "Save design."
+#. TRANS: Title for button on profile design page to save settings.
+#: actions/designadminpanel.php:736 lib/designsettings.php:272
+msgid "Save design"
 msgstr "Gardar o deseño"
 
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
@@ -2323,7 +2310,7 @@ msgid "You must be logged in to edit an application."
 msgstr "Ten que iniciar sesión para editar unha aplicación."
 
 #. TRANS: Client error displayed trying to edit an application that does not exist.
-#: actions/editapplication.php:83 actions/showapplication.php:83
+#: actions/editapplication.php:83 actions/showapplication.php:87
 msgid "No such application."
 msgstr "Non existe esa aplicación."
 
@@ -2611,7 +2598,7 @@ msgid "Cannot normalize that email address."
 msgstr "Non se pode normalizar ese enderezo de correo electrónico"
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:393 actions/register.php:204
+#: actions/emailsettings.php:393 actions/register.php:212
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "O enderezo de correo electrónico é incorrecto."
@@ -2688,22 +2675,19 @@ msgstr "Non hai ningún enderezo ao que enviar."
 
 #. 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.
 #: actions/emailsettings.php:530 actions/emailsettings.php:554
-#: actions/smssettings.php:566 actions/smssettings.php:591
+#: actions/smssettings.php:565 actions/smssettings.php:588
 #, fuzzy
 msgid "Could not update user record."
 msgstr "Non se puido actualizar o rexistro do usuario."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
-#. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:534 actions/smssettings.php:570
+#: actions/emailsettings.php:534 actions/smssettings.php:568
 msgid "Incoming email address removed."
 msgstr "Borrouse o enderezo de correo electrónico entrante."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
-#. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:558 actions/smssettings.php:595
+#: actions/emailsettings.php:558 actions/smssettings.php:591
 msgid "New incoming email address added."
 msgstr "Engadiuse un novo enderezo de correo electrónico entrante."
 
@@ -2715,7 +2699,7 @@ msgstr "A nota xa é unha das súas favoritas!"
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
 #: actions/favor.php:95
 #, fuzzy
-msgid "Disfavor favorite."
+msgid "Disfavor favorite"
 msgstr "Desmarcar como favorita"
 
 #. TRANS: Page title for first page of favorited notices.
@@ -2955,13 +2939,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
 #: actions/groupblock.php:191
 #, fuzzy
-msgid "Do not block this user from this group."
+msgid "Do not block this user from this group"
 msgstr "Non excluír deste grupo a este usuario"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
 #: actions/groupblock.php:198
 #, fuzzy
-msgid "Block this user from this group."
+msgid "Block this user from this group"
 msgstr "Excluír deste grupo a este usuario"
 
 #. TRANS: Server error displayed when trying to block a user from a group fails because of an application error.
@@ -2970,7 +2954,6 @@ msgid "Database error blocking user from group."
 msgstr "Houbo un erro na base de datos ao excluír do grupo ao usuario."
 
 #. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
-#. TRANS: Client error displayed trying to find a user by ID without providing an ID.
 #: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr "Sen ID."
@@ -3160,10 +3143,8 @@ msgid "Group search"
 msgstr "Busca de grupos"
 
 #. TRANS: Text on page where groups can be searched if no results were found for a query.
-#. TRANS: Text for notice search results is the query had no results.
-#. TRANS: Message on the "People search" page where a query has no results.
-#: actions/groupsearch.php:82 actions/noticesearch.php:122
-#: actions/peoplesearch.php:87
+#: actions/groupsearch.php:82 actions/noticesearch.php:117
+#: actions/peoplesearch.php:83
 msgid "No results."
 msgstr "Non houbo resultados."
 
@@ -3198,7 +3179,6 @@ msgid "User is not blocked from group."
 msgstr "O usuario non está excluído do grupo."
 
 #. TRANS: Server error displayed when unblocking a user from a group fails because of an unknown error.
-#. TRANS: Server error displayed when removing a user block.
 #: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "Houbo un erro ao facer efectiva a readmisión."
@@ -3296,8 +3276,7 @@ msgid "Publish a MicroID for my Jabber/Google Talk address."
 msgstr "Publicar unha MicroID para o meu enderezo de Jabber ou GTalk."
 
 #. TRANS: Confirmation message for successful Instant Messaging preferences save.
-#. TRANS: Confirmation message after saving preferences.
-#: actions/imsettings.php:283 actions/othersettings.php:193
+#: actions/imsettings.php:283 actions/othersettings.php:192
 msgid "Preferences saved."
 msgstr "Gardáronse as preferencias."
 
@@ -3591,7 +3570,7 @@ msgstr "Ten que identificarse para deixar un grupo."
 
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
-#: actions/leavegroup.php:103 lib/command.php:386
+#: actions/leavegroup.php:103 lib/command.php:398
 msgid "You are not a member of that group."
 msgstr "Non pertence a ese grupo."
 
@@ -3716,45 +3695,43 @@ msgstr "Gardar"
 msgid "Save license settings"
 msgstr "Gardar a configuración de licenza"
 
-#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
-#: actions/login.php:97 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
 msgid "Already logged in."
 msgstr "Xa se identificou."
 
-#: actions/login.php:142
+#: actions/login.php:148
 msgid "Incorrect username or password."
 msgstr "Nome de usuario ou contrasinal incorrectos."
 
-#. TRANS: Server error displayed when a user object could not be created trying to login using "one time password login".
-#: actions/login.php:148 actions/otp.php:127
+#: actions/login.php:154 actions/otp.php:120
 msgid "Error setting user. You are probably not authorized."
 msgstr ""
 "Houbo un erro ao configurar o usuario. Probablemente non estea autorizado "
 "para facelo."
 
-#: actions/login.php:202 actions/login.php:253
+#: actions/login.php:210 actions/login.php:263
 msgid "Login"
 msgstr "Identificarse"
 
-#: actions/login.php:239
+#: actions/login.php:249
 msgid "Login to site"
 msgstr "Identificarse no sitio"
 
-#: actions/login.php:248 actions/register.php:476
+#: actions/login.php:258 actions/register.php:490
 msgid "Remember me"
 msgstr "Lembrádeme"
 
-#: actions/login.php:249 actions/register.php:478
+#: actions/login.php:259 actions/register.php:492
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 "Identificarse automaticamente no futuro. Non se aconsella en computadoras "
 "compartidas!"
 
-#: actions/login.php:259
+#: actions/login.php:269
 msgid "Lost or forgotten password?"
 msgstr "Esqueceu ou perdeu o contrasinal?"
 
-#: actions/login.php:277
+#: actions/login.php:288
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -3762,11 +3739,11 @@ msgstr ""
 "Por razóns de seguridade, volva introducir o seu nome de usuario e "
 "contrasinal antes de cambiar a súa configuración."
 
-#: actions/login.php:281
+#: actions/login.php:292
 msgid "Login with your username and password."
 msgstr "Identifíquese co seu nome de usuario e contrasinal."
 
-#: actions/login.php:284
+#: actions/login.php:295
 #, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -3851,14 +3828,14 @@ msgid "New message"
 msgstr "Mensaxe nova"
 
 #. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
-#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:501
+#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:513
 msgid "You can't send a message to this user."
 msgstr "Non pode enviarlle unha mensaxe a este usuario."
 
 #. TRANS: Command exception text shown when trying to send a direct message to another user without content.
 #. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
-#: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:478
-#: lib/command.php:581
+#: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:490
+#: lib/command.php:593
 msgid "No content!"
 msgstr "Non hai contido ningún!"
 
@@ -3867,7 +3844,7 @@ msgid "No recipient specified."
 msgstr "Non se especificou ningún destinatario."
 
 #. TRANS: Error text shown when trying to send a direct message to self.
-#: actions/newmessage.php:167 lib/command.php:505
+#: actions/newmessage.php:167 lib/command.php:517
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr "Non se envíe unha mensaxe, limítese a pensar nela."
@@ -3878,7 +3855,7 @@ msgstr "Enviouse a mensaxe"
 
 #. TRANS: Message given have sent a direct message to another user.
 #. TRANS: %s is the name of the other user.
-#: actions/newmessage.php:188 lib/command.php:513
+#: actions/newmessage.php:188 lib/command.php:525
 #, php-format
 msgid "Direct message to %s sent."
 msgstr "Enviouse a mensaxe directa a %s."
@@ -3895,9 +3872,7 @@ msgstr "Nova nota"
 msgid "Notice posted"
 msgstr "Publicouse a nota"
 
-#. TRANS: Instructions for Notice search page.
-#. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/noticesearch.php:69
+#: actions/noticesearch.php:68
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -3906,21 +3881,16 @@ msgstr ""
 "Buscar notas en %%site.name%% polo seu contido. Separe os termos de busca "
 "con espazos en branco. Teñen que ter tres ou máis caracteres."
 
-#. TRANS: Title of the page where users can search for notices.
-#: actions/noticesearch.php:80
+#: actions/noticesearch.php:78
 msgid "Text search"
 msgstr "Busca de texto"
 
-#. TRANS: Test in RSS notice search.
-#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearch.php:95
+#: actions/noticesearch.php:91
 #, php-format
 msgid "Search results for \"%1$s\" on %2$s"
 msgstr "Resultados da busca de \"%1$s\" en %2$s"
 
-#. TRANS: Text for logged in users making a query for notices without results.
-#. TRANS: This message contains a Markdown link.
-#: actions/noticesearch.php:128
+#: actions/noticesearch.php:121
 #, php-format
 msgid ""
 "Be the first to [post on this topic](%%%%action.newnotice%%%%?"
@@ -3929,9 +3899,7 @@ msgstr ""
 "Sexa o primeiro en [publicar sobre este tema](%%%%action.newnotice%%%%?"
 "status_textarea=%s)!"
 
-#. TRANS: Text for not logged in users making a query for notices without results.
-#. TRANS: This message contains Markdown links.
-#: actions/noticesearch.php:133
+#: actions/noticesearch.php:124
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and be the first to "
@@ -3940,17 +3908,14 @@ msgstr ""
 "Por que non [rexistrar unha conta](%%%%action.register%%%%) e ser o primeiro "
 "en [publicar sobre este tema](%%%%action.newnotice%%%%?status_textarea=%s)?"
 
-#. TRANS: RSS notice search feed title. %s is the query.
-#: actions/noticesearchrss.php:95
+#: actions/noticesearchrss.php:96
 #, php-format
 msgid "Updates with \"%s\""
 msgstr "Actualizacións con \"%s\""
 
-#. TRANS: RSS notice search feed description.
-#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearchrss.php:99
+#: actions/noticesearchrss.php:98
 #, fuzzy, php-format
-msgid "Updates matching search term \"%1$s\" on %2$s."
+msgid "Updates matching search term \"%1$s\" on %2$s!"
 msgstr "Actualizacións que conteñen o termo \"%1$s\" en %2$s!"
 
 #: actions/nudge.php:85
@@ -3992,31 +3957,31 @@ msgid "You have not registered any applications yet."
 msgstr "Aínda non rexistrou ningunha aplicación."
 
 #. TRANS: Title for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:70
+#: actions/oauthconnectionssettings.php:71
 msgid "Connected applications"
 msgstr "Aplicacións conectadas"
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:81
+#: actions/oauthconnectionssettings.php:83
 #, fuzzy
 msgid "The following connections exist for your account."
 msgstr "Permitiulle o acceso á súa conta ás seguintes aplicacións."
 
 #. TRANS: Client error when trying to revoke access for an application while not being a user of it.
-#: actions/oauthconnectionssettings.php:166
+#: actions/oauthconnectionssettings.php:168
 msgid "You are not a user of that application."
 msgstr "Non é usuario desa aplicación."
 
 #. TRANS: Client error when revoking access has failed for some reason.
 #. TRANS: %s is the application ID revoking access failed for.
-#: actions/oauthconnectionssettings.php:181
+#: actions/oauthconnectionssettings.php:183
 #, fuzzy, php-format
 msgid "Unable to revoke access for application: %s."
 msgstr "Non se puido revogar o acceso da aplicación: %s."
 
 #. TRANS: Success message after revoking access for an application.
 #. TRANS: %1$s is the application name, %2$s is the first part of the user token.
-#: actions/oauthconnectionssettings.php:200
+#: actions/oauthconnectionssettings.php:202
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -4024,30 +3989,20 @@ msgid ""
 msgstr ""
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:211
+#: actions/oauthconnectionssettings.php:213
 msgid "You have not authorized any applications to use your account."
 msgstr "Non autorizou o acceso á súa conta para ningunha aplicación."
 
 #. TRANS: Note for developers in the OAuth connection settings form.
 #. TRANS: This message contains a Markdown link. Do not separate "](".
 #. TRANS: %s is the URL to the OAuth settings.
-#: actions/oauthconnectionssettings.php:231
+#: actions/oauthconnectionssettings.php:233
 #, php-format
 msgid ""
 "Are you a developer? [Register an OAuth client application](%s) to use with "
 "this instance of StatusNet."
 msgstr ""
 
-#: actions/oembed.php:64
-#, fuzzy, php-format
-msgid "\"%s\" not found."
-msgstr "Non se atopou o método da API."
-
-#: actions/oembed.php:76
-#, fuzzy, php-format
-msgid "Notice %s not found."
-msgstr "Non se atopou o método da API."
-
 #: actions/oembed.php:80 actions/shownotice.php:100
 msgid "Notice has no profile."
 msgstr "Non hai perfil para a nota."
@@ -4057,16 +4012,6 @@ msgstr "Non hai perfil para a nota."
 msgid "%1$s's status on %2$s"
 msgstr "Estado de %1$s en %2$s"
 
-#: actions/oembed.php:95
-#, fuzzy, php-format
-msgid "Attachment %s not found."
-msgstr "Non se atopou o destinatario."
-
-#: actions/oembed.php:136
-#, php-format
-msgid "\"%s\" not supported for oembed requests."
-msgstr ""
-
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
 #: actions/oembed.php:168
 #, php-format
@@ -4085,12 +4030,11 @@ msgstr "Só %s enderezos URL sobre HTTP simple."
 msgid "Not a supported data format."
 msgstr "Non se soporta ese formato de datos."
 
-#. TRANS: ShortName in the OpenSearch interface when trying to find users.
 #: actions/opensearch.php:64
 msgid "People Search"
 msgstr "Busca de xente"
 
-#: actions/opensearch.php:68
+#: actions/opensearch.php:67
 msgid "Notice Search"
 msgstr "Busca de notas"
 
@@ -4110,7 +4054,7 @@ msgstr "Configure outras tantas opcións."
 #. TRANS: here if it has one (most likely a single space).
 #: actions/othersettings.php:113
 msgid " (free service)"
-msgstr " (servizo gratuíto)"
+msgstr " (servizo libre)"
 
 #. TRANS: Label for dropdown with URL shortener services.
 #: actions/othersettings.php:122
@@ -4140,46 +4084,37 @@ msgstr ""
 "O servizo de abreviación de enderezos URL é longo de máis (o límite está en "
 "50 caracteres)."
 
-#. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
-#: actions/otp.php:70
+#: actions/otp.php:69
 msgid "No user ID specified."
 msgstr "Non se especificou ningunha ID de usuario."
 
-#. TRANS: Client error displayed trying to use "one time password login" without specifying a login token.
-#: actions/otp.php:86
+#: actions/otp.php:83
 msgid "No login token specified."
 msgstr "Non se especificou ningún pase."
 
-#. TRANS: Client error displayed trying to use "one time password login" without requesting a login token.
-#: actions/otp.php:94
+#: actions/otp.php:90
 msgid "No login token requested."
 msgstr "Non se solicitou ningún pase."
 
-#. TRANS: Client error displayed trying to use "one time password login" while specifying an invalid login token.
-#: actions/otp.php:100
+#: actions/otp.php:95
 msgid "Invalid login token specified."
 msgstr "O pase especificado é incorrecto."
 
-#. TRANS: Client error displayed trying to use "one time password login" while specifying an expired login token.
-#: actions/otp.php:110
+#: actions/otp.php:104
 msgid "Login token expired."
 msgstr "O pase caducou."
 
-#. TRANS: Title for outbox for any but the fist page.
-#. TRANS: %1$s is the user nickname, %2$d is the page number.
-#: actions/outbox.php:57
+#: actions/outbox.php:58
 #, php-format
 msgid "Outbox for %1$s - page %2$d"
 msgstr "Caixa de saída de %1$s - páxina %2$d"
 
-#. TRANS: Title for first page of outbox.
 #: actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
 msgstr "Caixa de saída de %s"
 
-#. TRANS: Instructions for outbox.
-#: actions/outbox.php:103
+#: actions/outbox.php:104
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr ""
 "Esta é a súa caixa de saída. Nela lístanse as mensaxes privadas que enviou."
@@ -4206,45 +4141,43 @@ msgstr "Contrasinal anterior"
 msgid "New password"
 msgstr "Novo contrasinal"
 
-#: actions/passwordsettings.php:109 actions/register.php:423
+#: actions/passwordsettings.php:109
 #, fuzzy
-msgid "6 or more characters."
+msgid "6 or more characters"
 msgstr "Seis ou máis caracteres"
 
-#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:264
-#: actions/register.php:427
+#: actions/passwordsettings.php:113
 #, fuzzy
-msgid "Same as password above."
+msgid "Same as password above"
 msgstr "Igual ao contrasinal anterior"
 
 #: actions/passwordsettings.php:117
 msgid "Change"
 msgstr "Cambiar"
 
-#: actions/passwordsettings.php:153 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:238
 msgid "Password must be 6 or more characters."
 msgstr "O contrasinal debe conter seis ou máis caracteres."
 
-#: actions/passwordsettings.php:156 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:241
 msgid "Passwords don't match."
 msgstr "Os contrasinais non coinciden."
 
-#: actions/passwordsettings.php:164
+#: actions/passwordsettings.php:165
 msgid "Incorrect old password"
 msgstr "O contrasinal anterior non é correcto"
 
-#: actions/passwordsettings.php:180
+#: actions/passwordsettings.php:181
 msgid "Error saving user; invalid."
 msgstr "Houbo un erro ao gardar o usuario. Incorrecto."
 
-#. TRANS: Reset password form validation error message.
-#: actions/passwordsettings.php:185 actions/recoverpassword.php:418
+#: actions/passwordsettings.php:186
 #, fuzzy
-msgid "Cannot save new password."
+msgid "Can't save new password."
 msgstr "Non se puido gardar o novo contrasinal."
 
-#: actions/passwordsettings.php:191
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
 msgid "Password saved."
 msgstr "Gardouse o contrasinal."
 
@@ -4531,9 +4464,7 @@ msgstr "Servidor ao que dirixir as solicitudes SSL"
 msgid "Save paths"
 msgstr "Gardar as rutas"
 
-#. TRANS: Instructions for the "People search" page.
-#. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/peoplesearch.php:54
+#: actions/peoplesearch.php:52
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
@@ -4542,8 +4473,7 @@ msgstr ""
 "Buscar xente en %%site.name%% por nome, lugar ou intereses. Separe os termos "
 "con espazos en branco. Teñen que ter tres ou máis caracteres."
 
-#. TRANS: Title of a page where users can search for other users.
-#: actions/peoplesearch.php:61
+#: actions/peoplesearch.php:58
 msgid "People search"
 msgstr "Busca de xente"
 
@@ -4586,7 +4516,7 @@ msgid "Profile information"
 msgstr "Información do perfil"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109 actions/register.php:419
+#: actions/profilesettings.php:109 actions/register.php:433
 #, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr ""
@@ -4596,7 +4526,7 @@ msgstr ""
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for full group name (dt). Text hidden by default.
 #. TRANS: DT for full name in a profile.
-#: actions/profilesettings.php:113 actions/register.php:441
+#: actions/profilesettings.php:113 actions/register.php:455
 #: actions/showgroup.php:255 actions/tagother.php:104
 #: lib/groupeditform.php:150 lib/userprofile.php:156
 msgid "Full name"
@@ -4604,13 +4534,13 @@ msgstr "Nome completo"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:118 actions/register.php:446
+#: actions/profilesettings.php:118 actions/register.php:460
 #: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "Páxina persoal"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:121 actions/register.php:448
+#: actions/profilesettings.php:121
 #, fuzzy
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr "URL da súa páxina persoal, blogue ou perfil noutro sitio"
@@ -4618,7 +4548,7 @@ msgstr "URL da súa páxina persoal, blogue ou perfil noutro sitio"
 #. TRANS: Tooltip for field label in form for profile settings. Plural
 #. TRANS: is decided by the number of characters available for the
 #. TRANS: biography (%d).
-#: actions/profilesettings.php:129 actions/register.php:457
+#: actions/profilesettings.php:129 actions/register.php:471
 #, fuzzy, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4626,29 +4556,28 @@ msgstr[0] "Descríbase a vostede e mailos seus intereses en %d caracteres"
 msgstr[1] "Descríbase a vostede e mailos seus intereses en %d caracteres"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:135 actions/register.php:462
+#: actions/profilesettings.php:135 actions/register.php:476
 msgid "Describe yourself and your interests"
 msgstr "Descríbase a vostede e mailos seus intereses"
 
 #. TRANS: Text area label in form for profile settings where users can provide.
 #. TRANS: their biography.
-#: actions/profilesettings.php:139 actions/register.php:464
+#: actions/profilesettings.php:139 actions/register.php:478
 msgid "Bio"
 msgstr "Biografía"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group location (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT for location in a profile.
-#: actions/profilesettings.php:145 actions/register.php:469
+#: actions/profilesettings.php:145 actions/register.php:483
 #: actions/showgroup.php:265 actions/tagother.php:112
-#: actions/userauthorization.php:174 lib/groupeditform.php:173
+#: actions/userauthorization.php:166 lib/groupeditform.php:173
 #: lib/userprofile.php:172
 msgid "Location"
 msgstr "Lugar"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148
+#: actions/profilesettings.php:148 actions/register.php:485
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Onde está a vivir, coma “localidade, provincia (ou comunidade), país”"
 
@@ -4669,8 +4598,7 @@ msgstr "Etiquetas"
 #: actions/profilesettings.php:164
 #, fuzzy
 msgid ""
-"Tags for yourself (letters, numbers, -, ., and _), comma- or space- "
-"separated."
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr ""
 "Etiquetas para vostede (letras salvo eñes e tiles, números, puntos, guións e "
 "guións baixos), separados por comas ou espazos"
@@ -4683,7 +4611,7 @@ msgstr "Lingua"
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
 #: actions/profilesettings.php:171
 #, fuzzy
-msgid "Preferred language."
+msgid "Preferred language"
 msgstr "Lingua escollida"
 
 #. TRANS: Dropdownlist label in form for profile settings.
@@ -4700,7 +4628,7 @@ msgstr "En que fuso horario adoita estar?"
 #: actions/profilesettings.php:189
 #, fuzzy
 msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)."
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr ""
 "Subscribirse automaticamente a quen se subscriba a min (o mellor para os "
 "bots)"
@@ -4708,7 +4636,7 @@ msgstr ""
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Plural form is used based on the maximum number of allowed
 #. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:258 actions/register.php:221
+#: actions/profilesettings.php:258 actions/register.php:229
 #, fuzzy, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4728,9 +4656,9 @@ msgstr "A lingua é longa de máis (o límite é de 50 caracteres)."
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:291
-#, fuzzy, php-format
-msgid "Invalid tag: \"%s\"."
+#: actions/profilesettings.php:291 actions/tagother.php:178
+#, php-format
+msgid "Invalid tag: \"%s\""
 msgstr "Etiqueta incorrecta: \"%s\""
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
@@ -4840,12 +4768,6 @@ msgstr ""
 "wikipedia.org/wiki/Microblogging) (en inglés) baseado na ferramenta de "
 "software libre [StatusNet](http://status.net/)."
 
-#. TRANS: Public RSS feed description. %s is the StatusNet site name.
-#: actions/publicrss.php:106
-#, fuzzy, php-format
-msgid "%s updates from everyone."
-msgstr "%s actualizacións de todos!"
-
 #. TRANS: Title for public tag cloud.
 #: actions/publictagcloud.php:57
 msgid "Public tag cloud"
@@ -4985,12 +4907,6 @@ msgstr "Recuperar o contrasinal"
 msgid "Password recovery requested"
 msgstr "Solicitouse a recuperación do contrasinal"
 
-#. TRANS: Title for password recovery page in password saved mode.
-#: actions/recoverpassword.php:229
-#, fuzzy
-msgid "Password saved"
-msgstr "Gardouse o contrasinal."
-
 #. TRANS: Title for password recovery page when an unknown action has been specified.
 #: actions/recoverpassword.php:232
 msgid "Unknown action"
@@ -5002,6 +4918,12 @@ msgstr "Non se coñece esa acción"
 msgid "6 or more characters, and do not forget it!"
 msgstr "Seis ou máis caracteres, e non o esqueza!"
 
+#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#: actions/recoverpassword.php:264 actions/register.php:441
+#, fuzzy
+msgid "Same as password above."
+msgstr "Igual ao contrasinal anterior"
+
 #. TRANS: Button text for password reset form.
 #. TRANS: Button text on profile design page to reset all colour settings to default without saving.
 #: actions/recoverpassword.php:268 lib/designsettings.php:264
@@ -5057,8 +4979,14 @@ msgstr "O contrasinal debe ter seis ou máis caracteres."
 msgid "Password and confirmation do not match."
 msgstr "O contrasinal e a confirmación non coinciden."
 
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:418
+#, fuzzy
+msgid "Cannot save new password."
+msgstr "Non se puido gardar o novo contrasinal."
+
 #. TRANS: Server error displayed when something does wrong with the user object during password reset.
-#: actions/recoverpassword.php:426 actions/register.php:248
+#: actions/recoverpassword.php:426 actions/register.php:256
 msgid "Error setting user."
 msgstr "Houbo un erro ao configurar o usuario."
 
@@ -5067,96 +4995,101 @@ msgstr "Houbo un erro ao configurar o usuario."
 msgid "New password successfully saved. You are now logged in."
 msgstr "O novo contrasinal gardouse correctamente. Agora está identificado."
 
-#: actions/register.php:87 actions/register.php:188 actions/register.php:399
+#: actions/register.php:92 actions/register.php:196 actions/register.php:413
 msgid "Sorry, only invited people can register."
 msgstr "Só se pode rexistrar mediante invitación."
 
-#: actions/register.php:94
+#: actions/register.php:99
 msgid "Sorry, invalid invitation code."
 msgstr "O código da invitación é incorrecto."
 
-#: actions/register.php:113
+#: actions/register.php:119
 msgid "Registration successful"
 msgstr "Rexistrouse correctamente"
 
-#: actions/register.php:115 actions/register.php:497
+#: actions/register.php:121 actions/register.php:511
 msgid "Register"
 msgstr "Rexistrarse"
 
-#: actions/register.php:135
+#: actions/register.php:142
 msgid "Registration not allowed."
 msgstr "Non se permite o rexistro."
 
-#: actions/register.php:201
+#: actions/register.php:209
 #, fuzzy
-msgid "You cannot register if you don't agree to the license."
+msgid "You can't register if you don't agree to the license."
 msgstr "Non pode rexistrarse se non acepta a licenza."
 
-#: actions/register.php:210
+#: actions/register.php:218
 msgid "Email address already exists."
 msgstr "O enderezo de correo electrónico xa existe."
 
-#: actions/register.php:243 actions/register.php:265
+#: actions/register.php:251 actions/register.php:273
 msgid "Invalid username or password."
 msgstr "O nome de usuario ou contrasinal non son correctos."
 
-#: actions/register.php:340
+#: actions/register.php:351
 #, fuzzy
 msgid ""
 "With this form you can create a new account. You can then post notices and "
-"link up to friends and colleagues."
+"link up to friends and colleagues. "
 msgstr ""
 "Con este formulario pode crear unha conta nova. Entón poderá publicar notas "
 "e porse en contacto con amigos e compañeiros. "
 
+#: actions/register.php:437
+#, fuzzy
+msgid "6 or more characters."
+msgstr "Seis ou máis caracteres"
+
 #. TRANS: Link description in user account settings menu.
-#: actions/register.php:431 actions/register.php:435
+#: actions/register.php:445 actions/register.php:449
 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
 msgid "Email"
 msgstr "Correo electrónico"
 
-#: actions/register.php:432 actions/register.php:436
+#: actions/register.php:446 actions/register.php:450
 #, fuzzy
-msgid "Used only for updates, announcements, and password recovery."
+msgid "Used only for updates, announcements, and password recovery"
 msgstr ""
 "Só se utiliza para actualizacións, anuncios e recuperación de contrasinais"
 
-#: actions/register.php:443
+#: actions/register.php:457
 #, fuzzy
-msgid "Longer name, preferably your \"real\" name."
+msgid "Longer name, preferably your \"real\" name"
 msgstr "Nome longo, preferiblemente o seu nome \"real\""
 
-#: actions/register.php:471
+#: actions/register.php:462
 #, fuzzy
-msgid "Where you are, like \"City, State (or Region), Country\"."
-msgstr "Onde está a vivir, coma “localidade, provincia (ou comunidade), país”"
+msgid "URL of your homepage, blog, or profile on another site"
+msgstr "URL da súa páxina persoal, blogue ou perfil noutro sitio"
 
-#: actions/register.php:510
+#: actions/register.php:523
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
 msgstr "Entendo que o contido e os datos de %1$s son privados e confidenciais."
 
-#: actions/register.php:520
+#: actions/register.php:533
 #, php-format
 msgid "My text and files are copyright by %1$s."
 msgstr ""
 "Os meus textos e ficheiros están protexidos polos dereitos de autor de %1$s."
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:524
+#: actions/register.php:537
 msgid "My text and files remain under my own copyright."
 msgstr ""
 "Os meus textos e ficheiros están protexidos polos meus propios dereitos de "
 "autor."
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:527
+#: actions/register.php:540
 msgid "All rights reserved."
 msgstr "Todos os dereitos reservados."
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:532
+#: actions/register.php:545
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -5166,7 +5099,7 @@ msgstr ""
 "datos privados: contrasinais, enderezos de correo electrónico e mensaxería "
 "instantánea e números de teléfono."
 
-#: actions/register.php:573
+#: actions/register.php:588
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -5198,7 +5131,7 @@ msgstr ""
 "\n"
 "Grazas por rexistrarse. Esperamos que goce deste servizo."
 
-#: actions/register.php:597
+#: actions/register.php:612
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5232,7 +5165,7 @@ msgstr "Alcume do usuario"
 
 #: actions/remotesubscribe.php:129
 #, fuzzy
-msgid "Nickname of the user you want to follow."
+msgid "Nickname of the user you want to follow"
 msgstr "Alcume do usuario ao que quere seguir"
 
 #: actions/remotesubscribe.php:132
@@ -5241,7 +5174,7 @@ msgstr "URL do perfil"
 
 #: actions/remotesubscribe.php:133
 #, fuzzy
-msgid "URL of your profile on another compatible microblogging service."
+msgid "URL of your profile on another compatible microblogging service"
 msgstr ""
 "URL do seu perfil noutro servizo de mensaxes de blogue curtas compatible"
 
@@ -5253,7 +5186,7 @@ msgstr "Subscribirse"
 
 #: actions/remotesubscribe.php:158
 #, fuzzy
-msgid "Invalid profile URL (bad format)."
+msgid "Invalid profile URL (bad format)"
 msgstr "O enderezo URL do perfil é incorrecto (formato erróneo)"
 
 #: actions/remotesubscribe.php:167
@@ -5297,7 +5230,6 @@ msgstr "Repetida"
 msgid "Repeated!"
 msgstr "Repetida!"
 
-#. TRANS: RSS reply feed title. %s is a user nickname.
 #. TRANS: Tooltip for personal group navigation menu option when logged in for viewing @-replies.
 #: actions/replies.php:126 actions/repliesrss.php:68
 #: lib/personalgroupnav.php:109
@@ -5352,11 +5284,9 @@ msgstr ""
 "Pode probar a [facerlle un aceno a %1$s](../%2$s) ou [publicar algo dirixido "
 "a el ou ela](%%%%action.newnotice%%%%?status_textarea=%3$s)."
 
-#. TRANS: RSS reply feed description.
-#. TRANS: %1$s is a user nickname, %2$s is the StatusNet site name.
-#: actions/repliesrss.php:74
+#: actions/repliesrss.php:72
 #, fuzzy, php-format
-msgid "Replies to %1$s on %2$s."
+msgid "Replies to %1$s on %2$s!"
 msgstr "Respostas a %1$s en %2$s!"
 
 #. TRANS: Client exception displayed when trying to restore an account while not logged in.
@@ -5458,7 +5388,7 @@ msgstr "Non pode revogar os roles dos usuarios neste sitio."
 msgid "User doesn't have this role."
 msgstr "O usuario non ten este rol."
 
-#: actions/rsd.php:142 actions/version.php:159
+#: actions/rsd.php:146 actions/version.php:159
 msgid "StatusNet"
 msgstr "StatusNet"
 
@@ -5500,87 +5430,87 @@ msgstr "Activar a saída de depuración para as sesións."
 msgid "Save site settings"
 msgstr "Gardar a configuración do sitio"
 
-#: actions/showapplication.php:78
+#: actions/showapplication.php:82
 msgid "You must be logged in to view an application."
 msgstr "Debe estar identificado para ver unha aplicación."
 
-#: actions/showapplication.php:151
+#: actions/showapplication.php:157
 msgid "Application profile"
 msgstr "Perfil da aplicación"
 
 #. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:153 lib/applicationeditform.php:177
+#: actions/showapplication.php:159 lib/applicationeditform.php:177
 msgid "Icon"
 msgstr "Icona"
 
 #. TRANS: Form input field label for application name.
-#: actions/showapplication.php:163 actions/version.php:197
+#: actions/showapplication.php:169 actions/version.php:197
 #: lib/applicationeditform.php:190
 msgid "Name"
 msgstr "Nome"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:172 lib/applicationeditform.php:227
+#: actions/showapplication.php:178 lib/applicationeditform.php:227
 msgid "Organization"
 msgstr "Organización"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:181 actions/version.php:200
+#: actions/showapplication.php:187 actions/version.php:200
 #: lib/applicationeditform.php:208 lib/groupeditform.php:168
 msgid "Description"
 msgstr "Descrición"
 
 #. TRANS: Header for group statistics on a group page (h2).
 #. TRANS: H2 text for user statistics.
-#: actions/showapplication.php:186 actions/showgroup.php:460
+#: actions/showapplication.php:192 actions/showgroup.php:460
 #: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "Estatísticas"
 
-#: actions/showapplication.php:197
+#: actions/showapplication.php:203
 #, php-format
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr "Creado por %1$s - acceso %2$s por defecto - %3$d usuarios"
 
-#: actions/showapplication.php:207
+#: actions/showapplication.php:213
 msgid "Application actions"
 msgstr "Accións da aplicación"
 
-#: actions/showapplication.php:230
+#: actions/showapplication.php:236
 msgid "Reset key & secret"
 msgstr "Restablecer o contrasinal ou a pregunta secreta"
 
 #. TRANS: Title of form for deleting a user.
-#: actions/showapplication.php:246 lib/deletegroupform.php:121
+#: actions/showapplication.php:252 lib/deletegroupform.php:121
 #: lib/deleteuserform.php:64 lib/noticelist.php:673
 msgid "Delete"
 msgstr "Borrar"
 
-#: actions/showapplication.php:255
+#: actions/showapplication.php:261
 msgid "Application info"
 msgstr "Información da aplicación"
 
-#: actions/showapplication.php:257
+#: actions/showapplication.php:263
 msgid "Consumer key"
 msgstr "Clave do consumidor"
 
-#: actions/showapplication.php:262
+#: actions/showapplication.php:268
 msgid "Consumer secret"
 msgstr "Pregunta secreta do consumidor"
 
-#: actions/showapplication.php:267
+#: actions/showapplication.php:273
 msgid "Request token URL"
 msgstr "Solicitar un URL de pase"
 
-#: actions/showapplication.php:272
+#: actions/showapplication.php:278
 msgid "Access token URL"
 msgstr "Acceder ao URL do pase"
 
-#: actions/showapplication.php:277
+#: actions/showapplication.php:283
 msgid "Authorize URL"
 msgstr "Autorizar o URL"
 
-#: actions/showapplication.php:282
+#: actions/showapplication.php:288
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
@@ -5588,7 +5518,7 @@ msgstr ""
 "Nota: sopórtanse as sinaturas HMAC-SHA1. Non se soporta o método de asinado "
 "con texto sinxelo."
 
-#: actions/showapplication.php:302
+#: actions/showapplication.php:309
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr ""
 "Seguro que quere restablecer a súa clave e maila súa pregunta secreta de "
@@ -5682,18 +5612,16 @@ msgid "Group profile"
 msgstr "Perfil do grupo"
 
 #. TRANS: Label for group URL (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT for URL in a profile.
 #: actions/showgroup.php:273 actions/tagother.php:118
-#: actions/userauthorization.php:184 lib/userprofile.php:186
+#: actions/userauthorization.php:175 lib/userprofile.php:186
 msgid "URL"
 msgstr "URL"
 
 #. TRANS: Label for group description or group note (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page where bio is displayed.
 #. TRANS: DT for note in a profile.
 #: actions/showgroup.php:285 actions/tagother.php:128
-#: actions/userauthorization.php:197 lib/userprofile.php:204
+#: actions/userauthorization.php:187 lib/userprofile.php:204
 msgid "Note"
 msgstr "Nota"
 
@@ -5841,7 +5769,7 @@ msgid "%1$s tagged %2$s"
 msgstr "%1$s, páxina %2$d"
 
 #. TRANS: Page title showing tagged notices in one user's stream.
-#. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
+#. TRANS: %1$s is the username, %2$s is the hash tag, %1$d is the page number.
 #: actions/showstream.php:74
 #, fuzzy, php-format
 msgid "%1$s tagged %2$s, page %3$d"
@@ -6095,7 +6023,7 @@ msgstr ""
 #. TRANS: Title for button to save site notice in admin panel.
 #: actions/sitenoticeadminpanel.php:201
 #, fuzzy
-msgid "Save site notice."
+msgid "Save site notice"
 msgstr "Gardar a nota do sitio"
 
 #. TRANS: Title for SMS settings.
@@ -6154,7 +6082,7 @@ msgstr "Número de teléfono para os SMS"
 #. TRANS: SMS phone number input field instructions in SMS settings form.
 #: actions/smssettings.php:152
 #, fuzzy
-msgid "Phone number, no punctuation or spaces, with area code."
+msgid "Phone number, no punctuation or spaces, with area code"
 msgstr ""
 "Número de teléfono, sen signos de puntuación nin espazos en branco, co "
 "código da zona"
@@ -6325,19 +6253,15 @@ msgstr "Non está subscrito a ese perfil."
 msgid "Could not save subscription."
 msgstr "Non se puido gardar a subscrición."
 
-#. TRANS: Client error displayed trying to perform any request method other than POST.
-#. TRANS: Do not translate POST.
 #: actions/subscribe.php:77
 msgid "This action only accepts POST requests."
 msgstr "Esta acción só permite solicitudes POST."
 
-#. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
-#: actions/subscribe.php:121
+#: actions/subscribe.php:117
 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
 msgstr "Non se pode subscribir a un perfil remoto OMB 0.1 con esta acción."
 
-#. TRANS: Page title when subscription succeeded.
-#: actions/subscribe.php:149
+#: actions/subscribe.php:145
 msgid "Subscribed"
 msgstr "Subscrito"
 
@@ -6497,9 +6421,8 @@ msgstr "Etiqueta %s"
 msgid "User profile"
 msgstr "Perfil do usuario"
 
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT element in area for user avatar.
-#: actions/tagother.php:81 actions/userauthorization.php:138
+#: actions/tagother.php:81 actions/userauthorization.php:132
 #: lib/userprofile.php:108
 msgid "Photo"
 msgstr "Fotografía"
@@ -6516,11 +6439,6 @@ msgstr ""
 "Etiquetas para este usuario (letras, números, -, ., e _), separadas por "
 "comas ou espazos en branco"
 
-#: actions/tagother.php:178
-#, php-format
-msgid "Invalid tag: \"%s\""
-msgstr "Etiqueta incorrecta: \"%s\""
-
 #: actions/tagother.php:193
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
@@ -6538,7 +6456,6 @@ msgstr ""
 msgid "No such tag."
 msgstr "Esa etiqueta non existe."
 
-#. TRANS: Client error displayed when trying to unblock a non-blocked user.
 #: actions/unblock.php:59
 msgid "You haven't blocked that user."
 msgstr "Non bloqueou a ese usuario."
@@ -6559,7 +6476,7 @@ msgstr "Á solicitude fáltalle o ID do perfil."
 msgid "Unsubscribed"
 msgstr "Cancelouse a subscrición"
 
-#: actions/updateprofile.php:64
+#: actions/updateprofile.php:64 actions/userauthorization.php:337
 #, php-format
 msgid ""
 "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
@@ -6593,7 +6510,7 @@ msgstr "Texto de benvida incorrecto. A extensión máxima é de 255 caracteres."
 #. TRANS: users in user admin panel. %1$s is the invalid nickname.
 #: actions/useradminpanel.php:166
 #, fuzzy, php-format
-msgid "Invalid default subscripton: \"%1$s\" is not a user."
+msgid "Invalid default subscripton: '%1$s' is not a user."
 msgstr "Subscrición por defecto incorrecta. \"%1$s\" non é un usuario."
 
 #. TRANS: Link description in user account settings menu.
@@ -6655,70 +6572,59 @@ msgstr "Permitir ou non que os usuarios poidan invitar a novos usuarios."
 #. TRANS: Title for button to save user settings in user admin panel.
 #: actions/useradminpanel.php:302
 #, fuzzy
-msgid "Save user settings."
+msgid "Save user settings"
 msgstr "Gardar a configuración do usuario"
 
-#. TRANS: Page title.
-#: actions/userauthorization.php:109
+#: actions/userauthorization.php:105
 msgid "Authorize subscription"
 msgstr "Autorizar a subscrición"
 
-#. TRANS: Page notice on "Auhtorize subscription" page.
-#: actions/userauthorization.php:115
+#: actions/userauthorization.php:110
 #, fuzzy
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
 "user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
-"click \"Reject\"."
+"click “Reject”."
 msgstr ""
 "Verifique estes detalles para certificar que quere subscribirse ás notas "
 "deste usuario. Se non pediu a subscrición ás notas de alguén, prema en "
 "\"Rexeitar\"."
 
-#. TRANS: DT element on Authorise Subscription page where license is displayed.
 #. TRANS: Menu item for site administration
-#: actions/userauthorization.php:207 actions/version.php:167
+#: actions/userauthorization.php:196 actions/version.php:167
 #: lib/adminpanelaction.php:403
 msgid "License"
 msgstr "Licenza"
 
-#. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:229
+#: actions/userauthorization.php:217
 #, fuzzy
-msgctxt "BUTTON"
 msgid "Accept"
 msgstr "Aceptar"
 
-#. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:231
-#, fuzzy
-msgid "Subscribe to this user."
+#: actions/userauthorization.php:218 lib/subscribeform.php:115
+#: lib/subscribeform.php:139
+msgid "Subscribe to this user"
 msgstr "Subscribirse a este usuario"
 
-#. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:233
+#: actions/userauthorization.php:219
 #, fuzzy
-msgctxt "BUTTON"
 msgid "Reject"
 msgstr "Rexeitar"
 
-#. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:235
+#: actions/userauthorization.php:220
 #, fuzzy
-msgid "Reject this subscription."
+msgid "Reject this subscription"
 msgstr "Rexeitar esta subscrición"
 
-#. TRANS: Client error displayed for an empty authorisation request.
-#: actions/userauthorization.php:248
+#: actions/userauthorization.php:232
 msgid "No authorization request!"
 msgstr "Non se solicitou a autorización!"
 
-#. TRANS: Accept message header from Authorise subscription page.
-#: actions/userauthorization.php:271
+#: actions/userauthorization.php:254
 msgid "Subscription authorized"
 msgstr "Autorizouse a subscrición"
 
-#: actions/userauthorization.php:274
+#: actions/userauthorization.php:256
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to authorize the "
@@ -6728,12 +6634,11 @@ msgstr ""
 "ás instrucións do sitio para saber máis sobre como autorizar a subscrición. "
 "O pase da súa subscrición é:"
 
-#. TRANS: Reject message header from Authorise subscription page.
-#: actions/userauthorization.php:285
+#: actions/userauthorization.php:266
 msgid "Subscription rejected"
 msgstr "Rexeitouse a subscrición"
 
-#: actions/userauthorization.php:288
+#: actions/userauthorization.php:268
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to fully reject the "
@@ -6743,64 +6648,39 @@ msgstr ""
 "ás instrucións do sitio para obter máis información sobre como rexeitar "
 "completamente a subscrición."
 
-#. TRANS: Exception thrown when no valid user is found for an authorisation request.
-#. TRANS: %s is a listener URI.
-#: actions/userauthorization.php:325
+#: actions/userauthorization.php:303
 #, fuzzy, php-format
-msgid "Listener URI \"%s\" not found here."
+msgid "Listener URI ‘%s’ not found here."
 msgstr "Non se atopou o URI do seguidor, \"%s\", aquí."
 
-#. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:332
+#: actions/userauthorization.php:308
 #, fuzzy, php-format
-msgid "Listenee URI \"%s\" is too long."
+msgid "Listenee URI ‘%s’ is too long."
 msgstr "O URI do seguidor, \"%s\", é longo de máis."
 
-#. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:340
+#: actions/userauthorization.php:314
 #, fuzzy, php-format
-msgid "Listenee URI \"%s\" is a local user."
+msgid "Listenee URI ‘%s’ is a local user."
 msgstr "O URI do seguidor, \"%s\", é dun usuario local."
 
-#. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
-#. TRANS: %s is a profile URL.
-#: actions/userauthorization.php:358
+#: actions/userauthorization.php:329
 #, fuzzy, php-format
-msgid "Profile URL \"%s\" is for a local user."
+msgid "Profile URL ‘%s’ is for a local user."
 msgstr "O URL do perfil, \"%s\", pertence a un usuario local."
 
-#. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
-#. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
-#: actions/userauthorization.php:368
+#: actions/userauthorization.php:345
 #, fuzzy, php-format
-msgid ""
-"Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
-"\"."
-msgstr ""
-"A licenza \"%1$s\" das transmisións da persoa seguida non é compatible coa "
-"licenza deste sitio: \"%2$s\"."
-
-#. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:378
-#, fuzzy, php-format
-msgid "Avatar URL \"%s\" is not valid."
+msgid "Avatar URL ‘%s’ is not valid."
 msgstr "O URL do avatar, \"%s\", é incorrecto."
 
-#. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:385
+#: actions/userauthorization.php:350
 #, fuzzy, php-format
-msgid "Cannot read avatar URL \"%s\"."
+msgid "Can’t read avatar URL ‘%s’."
 msgstr "Non se puido ler o URL do avatar, \"%s\"."
 
-#. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:392
+#: actions/userauthorization.php:355
 #, fuzzy, php-format
-msgid "Wrong image type for avatar URL \"%s\"."
+msgid "Wrong image type for avatar URL ‘%s’."
 msgstr "O tipo de imaxe do URL do avatar, \"%s\", é incorrecto."
 
 #. TRANS: Page title for profile design page.
@@ -6908,7 +6788,7 @@ msgid "Plugins"
 msgstr "Complementos"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:898
+#: actions/version.php:198 lib/action.php:901
 msgid "Version"
 msgstr "Versión"
 
@@ -7119,14 +6999,14 @@ msgstr "Houbo un problema ao gardar a caixa de entrada do grupo."
 
 #. TRANS: Server exception thrown when a reply cannot be saved.
 #. TRANS: %1$d is a notice ID, %2$d is the ID of the mentioned user.
-#: classes/Notice.php:1142
+#: classes/Notice.php:1144
 #, php-format
 msgid "Could not save reply for %1$d, %2$d."
 msgstr "Non se puido gardar a resposta a %1$d, %2$d."
 
 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1661
+#: classes/Notice.php:1663
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
@@ -7140,7 +7020,7 @@ msgstr "%1$s (%2$s)"
 
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:775
+#: classes/Profile.php:779
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
@@ -7148,7 +7028,7 @@ msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:784
+#: classes/Profile.php:788
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -7466,53 +7346,53 @@ msgid "Page notice"
 msgstr "Nota da páxina"
 
 #. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:871
+#: lib/action.php:874
 msgid "Secondary site navigation"
 msgstr "Navegación secundaria do sitio"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:877
+#: lib/action.php:880
 msgid "Help"
 msgstr "Axuda"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:880
+#: lib/action.php:883
 msgid "About"
 msgstr "Acerca de"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:883
+#: lib/action.php:886
 msgid "FAQ"
 msgstr "Preguntas máis frecuentes"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:888
+#: lib/action.php:891
 msgid "TOS"
 msgstr "Condicións do servicio"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:892
+#: lib/action.php:895
 msgid "Privacy"
 msgstr "Protección de datos"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:895
+#: lib/action.php:898
 msgid "Source"
 msgstr "Código fonte"
 
 #. TRANS: Secondary navigation menu option leading to e-mail contact information on the
 #. TRANS: StatusNet site, where to report bugs, ...
-#: lib/action.php:902
+#: lib/action.php:905
 msgid "Contact"
 msgstr "Contacto"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:905
+#: lib/action.php:908
 msgid "Badge"
 msgstr "Insignia"
 
 #. TRANS: DT element for StatusNet software license.
-#: lib/action.php:934
+#: lib/action.php:937
 msgid "StatusNet software license"
 msgstr "Licenza do software StatusNet"
 
@@ -7520,7 +7400,7 @@ msgstr "Licenza do software StatusNet"
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:941
+#: lib/action.php:944
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7530,7 +7410,7 @@ msgstr ""
 "site.broughtby%%](%%site.broughtbyurl%%)."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:944
+#: lib/action.php:947
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** é un servizo de mensaxes de blogue curtas."
@@ -7539,7 +7419,7 @@ msgstr "**%%site.name%%** é un servizo de mensaxes de blogue curtas."
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:951
+#: lib/action.php:954
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7551,20 +7431,20 @@ msgstr ""
 "GNU](http://www.fsf.org/licensing/licenses/agpl-3.0.html) (en inglés)."
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:967
+#: lib/action.php:970
 msgid "Site content license"
 msgstr "Licenza dos contidos do sitio"
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:974
+#: lib/action.php:977
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr "O contido e os datos de %1$s son privados e confidenciais."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:981
+#: lib/action.php:984
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
@@ -7572,7 +7452,7 @@ msgstr ""
 "todos os dereitos."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:985
+#: lib/action.php:988
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 "Os contidos e datos son propiedade intelectual dos colaboradores. Quedan "
@@ -7580,26 +7460,26 @@ msgstr ""
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:1017
+#: lib/action.php:1020
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
 "Todos os contidos e datos de %1$s están dispoñibles baixo a licenza %2$s."
 
 #. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1353
+#: lib/action.php:1356
 msgid "Pagination"
 msgstr "Paxinación"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1364
+#: lib/action.php:1367
 msgid "After"
 msgstr "Posteriores"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1374
+#: lib/action.php:1377
 msgid "Before"
 msgstr "Anteriores"
 
@@ -7800,23 +7680,19 @@ msgstr ""
 msgid "No application for that consumer key."
 msgstr "Non hai ningunha aplicación para esa clave."
 
-#: lib/apiauth.php:202 lib/apiauth.php:284
-msgid "Not allowed to use API."
-msgstr ""
-
 #. TRANS: OAuth exception given when an incorrect access token was given for a user.
-#: lib/apiauth.php:225
+#: lib/apiauth.php:219
 msgid "Bad access token."
 msgstr "Pase de acceso incorrecto."
 
 #. TRANS: OAuth exception given when no user was found for a given token (no token was found).
-#: lib/apiauth.php:230
+#: lib/apiauth.php:224
 msgid "No user for that token."
 msgstr "Non hai ningún usuario para ese pase."
 
 #. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel".
 #. TRANS: Client error thrown when authentication fails.
-#: lib/apiauth.php:272 lib/apiauth.php:302
+#: lib/apiauth.php:266 lib/apiauth.php:293
 msgid "Could not authenticate you."
 msgstr "Non puidemos autenticalo."
 
@@ -8028,11 +7904,6 @@ msgstr "Non se permite cambiar o contrasinal"
 msgid "Block"
 msgstr "Excluír"
 
-#. TRANS: Description of the form to block a user.
-#: lib/blockform.php:79
-msgid "Block this user"
-msgstr "Bloquear este usuario"
-
 #. TRANS: Title for command results.
 #: lib/channel.php:160 lib/channel.php:181
 msgid "Command results"
@@ -8061,7 +7932,7 @@ msgstr "Non hai ningunha nota con esa id."
 
 #. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
 #. TRANS: Error text shown when a last user notice is requested and it does not exist.
-#: lib/command.php:99 lib/command.php:630
+#: lib/command.php:99 lib/command.php:642
 msgid "User has no last notice."
 msgstr "O usuario non ten ningunha última nota."
 
@@ -8111,35 +7982,41 @@ msgstr ""
 "Subscritores: %2$s\n"
 "Notas: %3$s"
 
+#. TRANS: Error message text shown when a favorite could not be set because it has already been favorited.
+#: lib/command.php:298
+#, fuzzy
+msgid "Could not create favorite: already favorited."
+msgstr "Non se puido crear o favorito."
+
 #. TRANS: Text shown when a notice has been marked as favourite successfully.
-#: lib/command.php:312
+#: lib/command.php:324
 msgid "Notice marked as fave."
 msgstr "Marcouse a nota como  favorita."
 
 #. TRANS: Message given having added a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:357
+#: lib/command.php:369
 #, php-format
 msgid "%1$s joined group %2$s."
 msgstr "%1$s uniuse ao grupo %2$s."
 
 #. TRANS: Message given having removed a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:405
+#: lib/command.php:417
 #, php-format
 msgid "%1$s left group %2$s."
 msgstr "%1$s deixou o grupo %2$s."
 
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: lib/command.php:426
+#: lib/command.php:438
 #, fuzzy, php-format
 msgctxt "WHOIS"
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
 
 #. TRANS: Whois output. %s is the full name of the queried user.
-#: lib/command.php:430
+#: lib/command.php:442
 #, php-format
 msgid "Fullname: %s"
 msgstr "Nome completo: %s"
@@ -8147,7 +8024,7 @@ msgstr "Nome completo: %s"
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a location.
-#: lib/command.php:434 lib/mail.php:270
+#: lib/command.php:446 lib/mail.php:270
 #, php-format
 msgid "Location: %s"
 msgstr "Localidade: %s"
@@ -8155,20 +8032,20 @@ msgstr "Localidade: %s"
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a homepage.
-#: lib/command.php:438 lib/mail.php:274
+#: lib/command.php:450 lib/mail.php:274
 #, php-format
 msgid "Homepage: %s"
 msgstr "Sitio web: %s"
 
 #. TRANS: Whois output. %s is the bio information of the queried user.
-#: lib/command.php:442
+#: lib/command.php:454
 #, php-format
 msgid "About: %s"
 msgstr "Acerca de: %s"
 
 #. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).
 #. TRANS: %s is a remote profile.
-#: lib/command.php:471
+#: lib/command.php:483
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
@@ -8179,7 +8056,7 @@ msgstr ""
 
 #. TRANS: Message given if content is too long. %1$sd is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:488
+#: lib/command.php:500
 #, fuzzy, php-format
 msgid "Message too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
@@ -8189,25 +8066,25 @@ msgstr[1] ""
 "A mensaxe é longa de máis, o límite de caracteres é de %1$d, e enviou %2$d."
 
 #. TRANS: Error text shown sending a direct message fails with an unknown reason.
-#: lib/command.php:516
+#: lib/command.php:528
 msgid "Error sending direct message."
 msgstr "Houbo un erro ao enviar a mensaxe directa."
 
 #. TRANS: Message given having repeated a notice from another user.
 #. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:553
+#: lib/command.php:565
 #, php-format
 msgid "Notice from %s repeated."
 msgstr "Repetiuse a nota de %s."
 
 #. TRANS: Error text shown when repeating a notice fails with an unknown reason.
-#: lib/command.php:556
+#: lib/command.php:568
 msgid "Error repeating notice."
 msgstr "Houbo un erro ao repetir a nota."
 
 #. TRANS: Message given if content of a notice for a reply is too long. %1$d is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:591
+#: lib/command.php:603
 #, fuzzy, php-format
 msgid "Notice too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Notice too long - maximum is %1$d characters, you sent %2$d."
@@ -8218,80 +8095,80 @@ msgstr[1] ""
 
 #. TRANS: Text shown having sent a reply to a notice successfully.
 #. TRANS: %s is the nickname of the user of the notice the reply was sent to.
-#: lib/command.php:604
+#: lib/command.php:616
 #, php-format
 msgid "Reply to %s sent."
 msgstr "Enviouse a resposta a %s."
 
 #. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
-#: lib/command.php:607
+#: lib/command.php:619
 msgid "Error saving notice."
 msgstr "Houbo un erro ao gardar a nota."
 
 #. TRANS: Error text shown when no username was provided when issuing a subscribe command.
-#: lib/command.php:654
+#: lib/command.php:666
 msgid "Specify the name of the user to subscribe to."
 msgstr "Introduza o nome do usuario ao que quere subscribirse."
 
 #. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
-#: lib/command.php:663
+#: lib/command.php:675
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "Non se pode subscribir aos perfís OMB cunha orde."
 
 #. TRANS: Text shown after having subscribed to another user successfully.
 #. TRANS: %s is the name of the user the subscription was requested for.
-#: lib/command.php:671
+#: lib/command.php:683
 #, php-format
 msgid "Subscribed to %s."
 msgstr "Subscribiuse a %s."
 
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.
-#: lib/command.php:692 lib/command.php:803
+#: lib/command.php:704 lib/command.php:815
 msgid "Specify the name of the user to unsubscribe from."
 msgstr "Introduza o nome do usuario ao que quer deixar de estar subscrito."
 
 #. TRANS: Text shown after having unsubscribed from another user successfully.
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:703
+#: lib/command.php:715
 #, php-format
 msgid "Unsubscribed from %s."
 msgstr "Cancelou a subscrición a %s."
 
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
-#: lib/command.php:723 lib/command.php:749
+#: lib/command.php:735 lib/command.php:761
 msgid "Command not yet implemented."
 msgstr "Aínda non se integrou esa orde."
 
 #. TRANS: Text shown when issuing the command "off" successfully.
-#: lib/command.php:727
+#: lib/command.php:739
 msgid "Notification off."
 msgstr "Desactivar a notificación."
 
 #. TRANS: Error text shown when the command "off" fails for an unknown reason.
-#: lib/command.php:730
+#: lib/command.php:742
 msgid "Can't turn off notification."
 msgstr "Non se pode desactivar a notificación."
 
 #. TRANS: Text shown when issuing the command "on" successfully.
-#: lib/command.php:753
+#: lib/command.php:765
 msgid "Notification on."
 msgstr "Activar a notificación."
 
 #. TRANS: Error text shown when the command "on" fails for an unknown reason.
-#: lib/command.php:756
+#: lib/command.php:768
 msgid "Can't turn on notification."
 msgstr "Non se pode activar a notificación."
 
 #. TRANS: Error text shown when issuing the login command while login is disabled.
-#: lib/command.php:770
+#: lib/command.php:782
 msgid "Login command is disabled."
 msgstr "A orde de identificación está desactivada."
 
 #. TRANS: Text shown after issuing the login command successfully.
 #. TRANS: %s is a logon link..
-#: lib/command.php:783
+#: lib/command.php:795
 #, php-format
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
@@ -8300,20 +8177,20 @@ msgstr ""
 
 #. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:812
+#: lib/command.php:824
 #, php-format
 msgid "Unsubscribed %s."
 msgstr "Cancelou a subscrición a %s."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
-#: lib/command.php:830
+#: lib/command.php:842
 msgid "You are not subscribed to anyone."
 msgstr "Non está subscrito a ninguén."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
-#: lib/command.php:835
+#: lib/command.php:847
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Vostede está subscrito a esta persoa:"
@@ -8321,14 +8198,14 @@ msgstr[1] "Vostede está subscrito a estas persoas:"
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user
 #. TRANS: (followers) without having any subscribers.
-#: lib/command.php:857
+#: lib/command.php:869
 msgid "No one is subscribed to you."
 msgstr "Non hai ninguén subscrito a vostede."
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
-#: lib/command.php:862
+#: lib/command.php:874
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Esta persoa está subscrita a vostede:"
@@ -8336,21 +8213,21 @@ msgstr[1] "Estas persoas están subscritas a vostede:"
 
 #. TRANS: Text shown after requesting groups a user is subscribed to without having
 #. TRANS: any group subscriptions.
-#: lib/command.php:884
+#: lib/command.php:896
 msgid "You are not a member of any groups."
 msgstr "Non forma parte de ningún grupo."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
-#: lib/command.php:889
+#: lib/command.php:901
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "Vostede pertence a este grupo:"
 msgstr[1] "Vostede pertence a estes grupos:"
 
 #. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-#: lib/command.php:904
+#: lib/command.php:916
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -8494,11 +8371,6 @@ msgstr "Aplicacións conectadas autorizadas"
 msgid "Database error"
 msgstr "Houbo un erro na base de datos"
 
-#. TRANS: Description of form for deleting a user.
-#: lib/deleteuserform.php:75
-msgid "Delete this user"
-msgstr "Borrar o usuario"
-
 #. TRANS: Label in form on profile design page.
 #. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
 #: lib/designsettings.php:108
@@ -8537,21 +8409,6 @@ msgstr "Cambiar as cores"
 msgid "Use defaults"
 msgstr "Utilizar os valores por defecto"
 
-#. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: lib/designsettings.php:259
-msgid "Restore default designs"
-msgstr "Restaurar o deseño por defecto"
-
-#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: lib/designsettings.php:267
-msgid "Reset back to default"
-msgstr "Volver ao deseño por defecto"
-
-#. TRANS: Title for button on profile design page to save settings.
-#: lib/designsettings.php:272
-msgid "Save design"
-msgstr "Gardar o deseño"
-
 #. TRANS: Error message displayed if design settings could not be saved.
 #. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
 #: lib/designsettings.php:405 lib/designsettings.php:427
@@ -9443,10 +9300,6 @@ msgstr "Responder a esta nota"
 msgid "Reply"
 msgstr "Responder"
 
-#: lib/noticelist.php:673
-msgid "Delete this notice"
-msgstr "Borrar esta nota"
-
 #: lib/noticelist.php:691
 msgid "Notice repeated"
 msgstr "Repetiuse a nota"
@@ -9728,10 +9581,6 @@ msgstr "Convidar"
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Convide a amigos e compañeiros a unírselle en %s"
 
-#: lib/subscribeform.php:115 lib/subscribeform.php:139
-msgid "Subscribe to this user"
-msgstr "Subscribirse a este usuario"
-
 #: lib/subscriberspeopleselftagcloudsection.php:48
 #: lib/subscriptionspeopleselftagcloudsection.php:48
 msgid "People Tagcloud as self-tagged"
@@ -9909,23 +9758,18 @@ msgctxt "role"
 msgid "Moderator"
 msgstr "Moderador"
 
-#: lib/util.php:305
-#, fuzzy
-msgid "Not allowed to log in."
-msgstr "Non iniciou sesión."
-
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1309
+#: lib/util.php:1306
 msgid "a few seconds ago"
 msgstr "hai uns segundos"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1312
+#: lib/util.php:1309
 msgid "about a minute ago"
 msgstr "hai como un minuto"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1316
+#: lib/util.php:1313
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
@@ -9933,12 +9777,12 @@ msgstr[0] "hai un minuto"
 msgstr[1] "hai %d minutos"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1319
+#: lib/util.php:1316
 msgid "about an hour ago"
 msgstr "hai como unha hora"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1323
+#: lib/util.php:1320
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
@@ -9946,12 +9790,12 @@ msgstr[0] "hai unha hora"
 msgstr[1] "hai %d horas"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1326
+#: lib/util.php:1323
 msgid "about a day ago"
 msgstr "hai como un día"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1330
+#: lib/util.php:1327
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
@@ -9959,12 +9803,12 @@ msgstr[0] "hai un día"
 msgstr[1] "hai %d días"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1333
+#: lib/util.php:1330
 msgid "about a month ago"
 msgstr "hai como un mes"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1337
+#: lib/util.php:1334
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
@@ -9972,7 +9816,7 @@ msgstr[0] "hai un mes"
 msgstr[1] "hai %d meses"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1340
+#: lib/util.php:1337
 msgid "about a year ago"
 msgstr "hai como un ano"
 
@@ -10016,3 +9860,76 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#, fuzzy
+#~ msgid "Block this user."
+#~ msgstr "Bloquear este usuario"
+
+#, fuzzy
+#~ msgid "Delete this notice."
+#~ msgstr "Borrar esta nota"
+
+#, fuzzy
+#~ msgid "Delete this user."
+#~ msgstr "Borrar o usuario"
+
+#, fuzzy
+#~ msgid "Restore default designs."
+#~ msgstr "Restaurar o deseño por defecto"
+
+#, fuzzy
+#~ msgid "Reset back to default."
+#~ msgstr "Volver ao deseño por defecto"
+
+#, fuzzy
+#~ msgid "Save design."
+#~ msgstr "Gardar o deseño"
+
+#, fuzzy
+#~ msgid "Disfavor favorite."
+#~ msgstr "Desmarcar como favorita"
+
+#, fuzzy
+#~ msgid "\"%s\" not found."
+#~ msgstr "Non se atopou o método da API."
+
+#, fuzzy
+#~ msgid "Notice %s not found."
+#~ msgstr "Non se atopou o método da API."
+
+#, fuzzy
+#~ msgid "Attachment %s not found."
+#~ msgstr "Non se atopou o destinatario."
+
+#, fuzzy
+#~ msgid "Invalid tag: \"%s\"."
+#~ msgstr "Etiqueta incorrecta: \"%s\""
+
+#, fuzzy
+#~ msgid "%s updates from everyone."
+#~ msgstr "%s actualizacións de todos!"
+
+#, fuzzy
+#~ msgid "Password saved"
+#~ msgstr "Gardouse o contrasinal."
+
+#, fuzzy
+#~ msgid "Where you are, like \"City, State (or Region), Country\"."
+#~ msgstr ""
+#~ "Onde está a vivir, coma “localidade, provincia (ou comunidade), país”"
+
+#, fuzzy
+#~ msgid "Subscribe to this user."
+#~ msgstr "Subscribirse a este usuario"
+
+#, fuzzy
+#~ msgid ""
+#~ "Listenee stream license \"%1$s\" is not compatible with site license \"%2"
+#~ "$s\"."
+#~ msgstr ""
+#~ "A licenza \"%1$s\" das transmisións da persoa seguida non é compatible "
+#~ "coa licenza deste sitio: \"%2$s\"."
+
+#, fuzzy
+#~ msgid "Not allowed to log in."
+#~ msgstr "Non iniciou sesión."
diff --git a/locale/hsb/LC_MESSAGES/statusnet.po b/locale/hsb/LC_MESSAGES/statusnet.po
index a520f22168..99e56d8808 100644
--- a/locale/hsb/LC_MESSAGES/statusnet.po
+++ b/locale/hsb/LC_MESSAGES/statusnet.po
@@ -11,18 +11,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-24 10:32+0000\n"
-"PO-Revision-Date: 2011-02-24 10:36:47+0000\n"
+"POT-Creation-Date: 2011-03-03 15:58+0000\n"
+"PO-Revision-Date: 2011-03-03 16:00:48+0000\n"
 "Language-Team: Upper Sorbian <http://translatewiki.net/wiki/Portal:hsb>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r82712); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: hsb\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : (n%100==3 || "
 "n%100==4) ? 2 : 3)\n"
-"X-POT-Import-Date: 2011-02-17 11:39:54+0000\n"
+"X-POT-Import-Date: 2011-02-25 23:49:23+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -134,11 +134,7 @@ msgstr "Strona njeeksistuje."
 #. 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 use "one time password login" without using an existing user.
-#. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
-#. TRANS: Client error displayed trying to find a user by ID for a non-existing ID.
-#. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when calling a profile action without specifying a user.
 #: actions/all.php:80 actions/allrss.php:69
@@ -156,12 +152,12 @@ msgstr "Strona njeeksistuje."
 #: actions/apitimelinementions.php:77 actions/apitimelineuser.php:79
 #: actions/avatarbynickname.php:79 actions/favoritesrss.php:72
 #: actions/foaf.php:42 actions/foaf.php:61 actions/hcard.php:67
-#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:78
+#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
 #: actions/remotesubscribe.php:144 actions/remotesubscribe.php:153
-#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:113
-#: actions/showfavorites.php:106 actions/userbyid.php:75
+#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
+#: actions/showfavorites.php:106 actions/userbyid.php:74
 #: actions/usergroups.php:93 actions/userrss.php:40 actions/userxrd.php:59
-#: actions/xrds.php:71 lib/command.php:497 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:509 lib/galleryaction.php:59
 #: lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Wužiwar njeeksistuje"
@@ -283,7 +279,7 @@ msgstr "Aktualizacije wot %1$s a přećelow na %2$s!"
 #: actions/apigrouplistall.php:120 actions/apigroupmembership.php:105
 #: actions/apigroupshow.php:114 actions/apihelptest.php:84
 #: actions/apistatusesdestroy.php:101 actions/apistatusesretweets.php:110
-#: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:138
+#: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:139
 #: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
 #: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:268
 #: actions/apitimelinegroup.php:147 actions/apitimelinehome.php:173
@@ -514,7 +510,8 @@ msgstr "Přijimowar njenamakany."
 
 #. TRANS: Client error displayed trying to direct message another user who's not a friend (403).
 #: actions/apidirectmessagenew.php:144
-msgid "Cannot send direct messages to users who aren't your friend."
+#, fuzzy
+msgid "Can't send direct messages to users who aren't your friend."
 msgstr ""
 "Njeje móžno, direktne powěsće wužiwarjam pósłać, kotřiž twoji přećeljo "
 "njejsu."
@@ -541,7 +538,7 @@ msgstr "Tutón status je hižo faworit."
 #. TRANS: Client error displayed when marking a notice as favourite fails.
 #. TRANS: Server error displayed when trying to mark a notice as favorite fails in the database.
 #. TRANS: Error message text shown when a favorite could not be set.
-#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:294
+#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:306
 msgid "Could not create favorite."
 msgstr "Faworit njeda so wutworić."
 
@@ -599,7 +596,7 @@ msgstr "Cilowy wužiwar njeda so namakać."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:191
 #: actions/newgroup.php:137 actions/profilesettings.php:273
-#: actions/register.php:206
+#: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "Přimjeno so hižo wužiwa. Spytaj druhe."
 
@@ -609,7 +606,7 @@ msgstr "Přimjeno so hižo wužiwa. Spytaj druhe."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:195
 #: actions/newgroup.php:141 actions/profilesettings.php:243
-#: actions/register.php:208
+#: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "Žane płaćiwe přimjeno."
 
@@ -622,7 +619,7 @@ msgstr "Žane płaćiwe přimjeno."
 #: actions/apigroupcreate.php:181 actions/editapplication.php:235
 #: actions/editgroup.php:202 actions/newapplication.php:221
 #: actions/newgroup.php:148 actions/profilesettings.php:248
-#: actions/register.php:215
+#: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "Startowa strona njeje płaćiwy URL."
 
@@ -632,7 +629,7 @@ msgstr "Startowa strona njeje płaćiwy URL."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:191 actions/editgroup.php:206
 #: actions/newgroup.php:152 actions/profilesettings.php:252
-#: actions/register.php:218
+#: actions/register.php:226
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "Dospołne mjeno je předołho (maks. 255 znamješkow)."
 
@@ -662,7 +659,7 @@ msgstr[3] "Wopisanje je předołho (maks. %d znamješkow)."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:215 actions/editgroup.php:218
 #: actions/newgroup.php:164 actions/profilesettings.php:265
-#: actions/register.php:227
+#: actions/register.php:235
 msgid "Location is too long (maximum 255 characters)."
 msgstr "Městno je předołho (maks. 255 znamješkow)."
 
@@ -720,14 +717,14 @@ msgstr "Skupina njenamakana."
 #. TRANS: Server error displayed when trying to join a group the user is already a member of.
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:333
+#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:345
 msgid "You are already a member of that group."
 msgstr "Sy hižo čłon teje skupiny."
 
 #. TRANS: Server error displayed when trying to join a group the user is blocked from joining.
 #. 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.
-#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:338
+#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:350
 msgid "You have been blocked from that group by the admin."
 msgstr "Administratora tuteje skupiny je će zablokował."
 
@@ -737,7 +734,7 @@ msgstr "Administratora tuteje skupiny je će zablokował."
 #. TRANS: %1$s is the joining user's nickname, $2$s is the group nickname for which the join failed.
 #. TRANS: Message given having failed to add a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:350
+#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:362
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "Njebě móžno wužiwarja %1$s skupinje %2%s přidać."
@@ -754,7 +751,7 @@ msgstr "Njejsy čłon tuteje skupiny."
 #. TRANS: Message given having failed to remove a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
 #: actions/apigroupleave.php:127 actions/leavegroup.php:133
-#: lib/command.php:398
+#: lib/command.php:410
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
 msgstr "Njebě móžno wužiwarja %1$s ze skupiny %2$s wotstronić."
@@ -814,21 +811,20 @@ msgstr "Naprašowanski token hižo awtorizowany."
 #. TRANS: Form validation error message.
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
-#. TRANS: Client error displayed when the session token is not okay.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
 #: actions/deletenotice.php:177 actions/disfavor.php:75
 #: actions/emailsettings.php:291 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:65 actions/grouplogo.php:321
 #: actions/groupunblock.php:65 actions/imsettings.php:224
-#: actions/invite.php:60 actions/login.php:131 actions/makeadmin.php:66
+#: actions/invite.php:60 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
-#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:136
-#: actions/othersettings.php:155 actions/passwordsettings.php:137
+#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
+#: actions/othersettings.php:155 actions/passwordsettings.php:138
 #: actions/profilesettings.php:217 actions/recoverpassword.php:383
-#: actions/register.php:164 actions/remotesubscribe.php:76
+#: actions/register.php:172 actions/remotesubscribe.php:76
 #: actions/repeat.php:82 actions/smssettings.php:250 actions/subedit.php:40
-#: actions/subscribe.php:87 actions/tagother.php:166
-#: actions/unsubscribe.php:69 actions/userauthorization.php:53
+#: actions/subscribe.php:86 actions/tagother.php:166
+#: actions/unsubscribe.php:69 actions/userauthorization.php:52
 #: lib/designsettings.php:310
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
@@ -859,7 +855,7 @@ msgstr "Zmylk datoweje banki při zasunjenju oauth_token_association."
 #: actions/designadminpanel.php:100 actions/editapplication.php:144
 #: actions/emailsettings.php:310 actions/grouplogo.php:332
 #: actions/imsettings.php:239 actions/newapplication.php:124
-#: actions/oauthconnectionssettings.php:145 actions/recoverpassword.php:46
+#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
 #: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
 msgstr "Njewočakowane wotpósłanje formulara."
@@ -904,20 +900,19 @@ msgstr "Konto"
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group nickname (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT for nick name in a profile.
-#: actions/apioauthauthorize.php:459 actions/login.php:242
-#: actions/profilesettings.php:106 actions/register.php:418
+#: actions/apioauthauthorize.php:459 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:432
 #: actions/showgroup.php:243 actions/tagother.php:94
-#: actions/userauthorization.php:152 lib/groupeditform.php:145
+#: actions/userauthorization.php:145 lib/groupeditform.php:145
 #: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "Přimjeno"
 
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:463 actions/login.php:245
-#: actions/register.php:422 lib/accountsettingsaction.php:120
+#: actions/apioauthauthorize.php:463 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:120
 msgid "Password"
 msgstr "Hesło"
 
@@ -1008,13 +1003,13 @@ msgstr "Zdźělenka njeeksistuje."
 
 #. TRANS: Client error displayed trying to repeat an own notice through the API.
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:537
+#: actions/apistatusesretweet.php:83 lib/command.php:549
 msgid "Cannot repeat your own notice."
 msgstr "Njemóžno twoju zdźělenku wospjetować."
 
 #. TRANS: Client error displayed trying to re-repeat a notice through the API.
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:92 lib/command.php:543
+#: actions/apistatusesretweet.php:92 lib/command.php:555
 msgid "Already repeated that notice."
 msgstr "Tuta zdźělenka bu hižo wospjetowana."
 
@@ -1035,8 +1030,8 @@ msgstr "HTTP-metoda so njepodpěruje."
 #. TRANS: Exception thrown requesting an unsupported notice output format.
 #. TRANS: %s is the requested output format.
 #: actions/apistatusesshow.php:144
-#, php-format
-msgid "Unsupported format: %s."
+#, fuzzy, php-format
+msgid "Unsupported format: %s"
 msgstr "Njepodpěrany format: %s."
 
 #. TRANS: Client error displayed requesting a deleted status.
@@ -1143,14 +1138,13 @@ msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr ""
 
 #. TRANS: Title for site timeline. %s is the StatusNet sitename.
-#. TRANS: Public RSS feed title. %s is the StatusNet site name.
 #: actions/apitimelinepublic.php:193 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr ""
 
 #. TRANS: Subtitle for site timeline. %s is the StatusNet sitename.
-#: actions/apitimelinepublic.php:199
+#: actions/apitimelinepublic.php:199 actions/publicrss.php:105
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "%s aktualizacijow wote wšěch!"
@@ -1215,26 +1209,25 @@ msgid "Atom post must be an Atom entry."
 msgstr "Póst za Atom dyrbi  zapisk z Atoma być."
 
 #. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
-#: actions/apitimelineuser.php:334
+#: actions/apitimelineuser.php:335
 msgid "Can only handle POST activities."
 msgstr ""
 
 #. TRANS: Client error displayed when using an unsupported activity object type.
 #. TRANS: %s is the unsupported activity object type.
-#: actions/apitimelineuser.php:345
+#: actions/apitimelineuser.php:346
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
 #. TRANS: %d is the notice ID (number).
-#: actions/apitimelineuser.php:379
+#: actions/apitimelineuser.php:380
 #, php-format
 msgid "No content for notice %d."
 msgstr "Žadyn wobsah za zdźělenku %d."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#. TRANS: %s is the notice URI.
 #: actions/apitimelineuser.php:408
 #, php-format
 msgid "Notice with URI \"%s\" already exists."
@@ -1252,10 +1245,9 @@ msgstr "Wužiwar njenamakany."
 
 #. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
 #. TRANS: Client exception.
-#. TRANS: Client error displayed trying to subscribe to a non-existing profile.
 #: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
 #: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
-#: actions/subscribe.php:110
+#: actions/subscribe.php:107
 msgid "No such profile."
 msgstr "Profil njeeksistuje."
 
@@ -1380,7 +1372,7 @@ msgstr "Faworit druheho njeda so zhašeć."
 #: actions/joingroup.php:95 actions/leavegroup.php:82
 #: actions/leavegroup.php:95 actions/makeadmin.php:86
 #: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:380
+#: lib/command.php:392
 msgid "No such group."
 msgstr "Skupina njeeksistuje."
 
@@ -1390,7 +1382,7 @@ msgid "Not a member."
 msgstr "Njeje čłon."
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
-#: actions/atompubshowmembership.php:150
+#: actions/atompubshowmembership.php:151
 msgid "Cannot delete someone else's membership."
 msgstr "Čłonstwo druheho njeda so zhašeć."
 
@@ -1494,11 +1486,9 @@ msgstr ""
 
 #. TRANS: Server error displayed in avatar upload page when no matching profile can be found for a user.
 #. TRANS: Server error displayed coming across a request from a user without a profile.
-#. TRANS: Server error displayed when trying to authorise a remote subscription request
-#. TRANS: while the user has no profile.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
 #: actions/grouplogo.php:184 actions/remotesubscribe.php:190
-#: actions/userauthorization.php:75 actions/userrss.php:108
+#: actions/userauthorization.php:72 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr "Wužiwar bjez hodźaceho so profila."
 
@@ -1553,9 +1543,9 @@ msgstr "Přirězać"
 msgid "No file uploaded."
 msgstr "Žana dataja nahrata."
 
-#. TRANS: Avatar upload form instruction after uploading a file.
+#. TRANS: Avatar upload form unstruction after uploading a file.
 #: actions/avatarsettings.php:345
-msgid "Pick a square area of the image to be your avatar."
+msgid "Pick a square area of the image to be your avatar"
 msgstr ""
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
@@ -1596,7 +1586,7 @@ msgid "You may not backup your account."
 msgstr "Njesměš swoje konto zawěsćić."
 
 #. TRANS: Information displayed on the backup account page.
-#: actions/backupaccount.php:225
+#: actions/backupaccount.php:227
 msgid ""
 "You can backup your account data in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format. This is an experimental feature and provides "
@@ -1606,14 +1596,15 @@ msgid ""
 msgstr ""
 
 #. TRANS: Submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:248
+#: actions/backupaccount.php:250
 msgctxt "BUTTON"
 msgid "Backup"
 msgstr "Zawěsćenje"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:252
-msgid "Backup your account."
+#: actions/backupaccount.php:254
+#, fuzzy
+msgid "Backup your account"
 msgstr "Twoje konto zawěsćić."
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
@@ -1651,7 +1642,8 @@ msgstr "Ně"
 
 #. TRANS: Submit button title for 'No' when blocking a user.
 #: actions/block.php:158
-msgid "Do not block this user."
+#, fuzzy
+msgid "Do not block this user"
 msgstr "Tutoho wužiwarja njeblokować."
 
 #. TRANS: Button label on the user block form.
@@ -1668,9 +1660,10 @@ msgid "Yes"
 msgstr "Haj"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:165
-msgid "Block this user."
-msgstr "Tutoho wužiwarja blokować."
+#. TRANS: Description of the form to block a user.
+#: actions/block.php:165 lib/blockform.php:79
+msgid "Block this user"
+msgstr "Tutoho wužiwarja blokować"
 
 #. TRANS: Server error displayed when blocking a user fails.
 #: actions/block.php:189
@@ -1830,7 +1823,7 @@ msgstr ""
 #. TRANS: Field label for delete account confirmation entry.
 #. TRANS: Field label for password reset form where the password has to be typed again.
 #: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:262 actions/register.php:426
+#: actions/recoverpassword.php:262 actions/register.php:440
 msgid "Confirm"
 msgstr "Wobkrućić"
 
@@ -1859,14 +1852,14 @@ msgstr "Aplikaciska njenamakana."
 #. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
 #: actions/deleteapplication.php:79 actions/editapplication.php:78
-#: actions/showapplication.php:90
+#: actions/showapplication.php:94
 msgid "You are not the owner of this application."
 msgstr "Njejsy wobsedźer tuteje aplikacije."
 
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
-#: actions/newapplication.php:112 actions/showapplication.php:113
-#: lib/action.php:1422
+#: actions/newapplication.php:112 actions/showapplication.php:118
+#: lib/action.php:1425
 msgid "There was a problem with your session token."
 msgstr ""
 
@@ -1886,12 +1879,14 @@ msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting an application.
 #: actions/deleteapplication.php:161
-msgid "Do not delete this application."
+#, fuzzy
+msgid "Do not delete this application"
 msgstr "Tutu aplikaciju njezhašeć."
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
 #: actions/deleteapplication.php:167
-msgid "Delete this application."
+#, fuzzy
+msgid "Delete this application"
 msgstr "Tutu aplikaciju zhašeć."
 
 #. TRANS: Client error when trying to delete group while not logged in.
@@ -1942,12 +1937,14 @@ msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting a group.
 #: actions/deletegroup.php:224
-msgid "Do not delete this group."
+#, fuzzy
+msgid "Do not delete this group"
 msgstr "Tutu skupinu njezhašeć."
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
 #: actions/deletegroup.php:231
-msgid "Delete this group."
+#, fuzzy
+msgid "Delete this group"
 msgstr "Tutu skupinu zhašeć."
 
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
@@ -1955,15 +1952,13 @@ msgstr "Tutu skupinu zhašeć."
 #. TRANS: Client error displayed when trying to mark a notice as favorite without being logged in.
 #. TRANS: Client error displayed trying to block a user from a group while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
-#. TRANS: Client error displayed trying to log out when not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
-#. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
 #. TRANS: Client error displayed when trying to change user options while not logged in.
 #: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
-#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:70
+#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
-#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:98
+#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
 #: lib/adminpanelaction.php:71 lib/profileformaction.php:63
 #: lib/settingsaction.php:72
@@ -1991,13 +1986,14 @@ msgstr "Chceš woprawdźe tutu zdźělenku wušmórnyć?"
 
 #. TRANS: Submit button title for 'No' when deleting a notice.
 #: actions/deletenotice.php:159
-msgid "Do not delete this notice."
+#, fuzzy
+msgid "Do not delete this notice"
 msgstr "Tutu zdźělenku njezhašeć."
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:166
-msgid "Delete this notice."
-msgstr "Tutu zdźělenku zhašeć."
+#: actions/deletenotice.php:166 lib/noticelist.php:673
+msgid "Delete this notice"
+msgstr "Tutu zdźělenku wušmórnyć"
 
 #. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
 #: actions/deleteuser.php:66
@@ -2029,13 +2025,15 @@ msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting a user.
 #: actions/deleteuser.php:158
-msgid "Do not delete this user."
+#, fuzzy
+msgid "Do not delete this user"
 msgstr "Tutoho wužiwarja njezhašeć."
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
-#: actions/deleteuser.php:165
-msgid "Delete this user."
-msgstr "Tutoho wužiwarja zhašeć"
+#. TRANS: Description of form for deleting a user.
+#: actions/deleteuser.php:165 lib/deleteuserform.php:75
+msgid "Delete this user"
+msgstr "Tutoho wužiwarja wušmórnyć"
 
 #. TRANS: Message used as title for design settings for the site.
 #. TRANS: Link description in user account settings menu.
@@ -2197,19 +2195,22 @@ msgid "Use defaults"
 msgstr "Standardne hódnoty wužiwać"
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:720
-msgid "Restore default designs."
-msgstr "Standardne designy wobnowić."
+#. TRANS: Title for button on profile design page to reset all colour settings to default.
+#: actions/designadminpanel.php:720 lib/designsettings.php:259
+msgid "Restore default designs"
+msgstr "Standardne designy wobnowić"
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:728
-msgid "Reset back to default."
-msgstr "Na standard wróćo stajić."
+#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
+#: actions/designadminpanel.php:728 lib/designsettings.php:267
+msgid "Reset back to default"
+msgstr "Na standard wróćo stajić"
 
 #. TRANS: Title for button for saving theme settings.
-#: actions/designadminpanel.php:736
-msgid "Save design."
-msgstr "Design składować."
+#. TRANS: Title for button on profile design page to save settings.
+#: actions/designadminpanel.php:736 lib/designsettings.php:272
+msgid "Save design"
+msgstr "Design składować"
 
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
 #: actions/disfavor.php:83
@@ -2240,7 +2241,7 @@ msgid "You must be logged in to edit an application."
 msgstr "Dyrbiš přizjewjeny być, zo by skupinu wobdźěłał."
 
 #. TRANS: Client error displayed trying to edit an application that does not exist.
-#: actions/editapplication.php:83 actions/showapplication.php:83
+#: actions/editapplication.php:83 actions/showapplication.php:87
 msgid "No such application."
 msgstr "Aplikacija njeeksistuje."
 
@@ -2516,7 +2517,7 @@ msgid "Cannot normalize that email address."
 msgstr "Tuta e-mejlowa adresa njehodźi so normalizować."
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:393 actions/register.php:204
+#: actions/emailsettings.php:393 actions/register.php:212
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "Njepłaćiwa e-mejlowa adresa."
@@ -2588,21 +2589,18 @@ msgstr "Žana adresa za dochadźace e-mejle."
 
 #. 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.
 #: actions/emailsettings.php:530 actions/emailsettings.php:554
-#: actions/smssettings.php:566 actions/smssettings.php:591
+#: actions/smssettings.php:565 actions/smssettings.php:588
 msgid "Could not update user record."
 msgstr "Datowa sadźba wužiwarja njeda so aktualizować."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
-#. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:534 actions/smssettings.php:570
+#: actions/emailsettings.php:534 actions/smssettings.php:568
 msgid "Incoming email address removed."
 msgstr "Adresa za dochadźaće e-mejle wotstronjena."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
-#. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:558 actions/smssettings.php:595
+#: actions/emailsettings.php:558 actions/smssettings.php:591
 msgid "New incoming email address added."
 msgstr "Nowa adresa za dochadźace e-mejle přidata."
 
@@ -2613,8 +2611,9 @@ msgstr "Tuta zdźělenka je hižo faworit!"
 
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
 #: actions/favor.php:95
-msgid "Disfavor favorite."
-msgstr "Z faworitow wotstronić."
+#, fuzzy
+msgid "Disfavor favorite"
+msgstr "Z faworitow wotstronić"
 
 #. TRANS: Page title for first page of favorited notices.
 #. TRANS: Title for favourited notices section.
@@ -2845,12 +2844,14 @@ msgstr ""
 
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
 #: actions/groupblock.php:191
-msgid "Do not block this user from this group."
+#, fuzzy
+msgid "Do not block this user from this group"
 msgstr "Tutoho wužiwarja za tutu skupinu njeblokować."
 
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
 #: actions/groupblock.php:198
-msgid "Block this user from this group."
+#, fuzzy
+msgid "Block this user from this group"
 msgstr "Tutoho wužiwarja za tutu skupinu blokować."
 
 #. TRANS: Server error displayed when trying to block a user from a group fails because of an application error.
@@ -2859,7 +2860,6 @@ msgid "Database error blocking user from group."
 msgstr "Zmylk datoweje banki blokuje wužiwarja za skupinu."
 
 #. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
-#. TRANS: Client error displayed trying to find a user by ID without providing an ID.
 #: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr "Žadyn ID."
@@ -3037,10 +3037,8 @@ msgid "Group search"
 msgstr "Skupinske pytanje"
 
 #. TRANS: Text on page where groups can be searched if no results were found for a query.
-#. TRANS: Text for notice search results is the query had no results.
-#. TRANS: Message on the "People search" page where a query has no results.
-#: actions/groupsearch.php:82 actions/noticesearch.php:122
-#: actions/peoplesearch.php:87
+#: actions/groupsearch.php:82 actions/noticesearch.php:117
+#: actions/peoplesearch.php:83
 msgid "No results."
 msgstr "Žane wuslědki."
 
@@ -3075,7 +3073,6 @@ msgid "User is not blocked from group."
 msgstr "Wužiwar njeje zablokowany za skupinu."
 
 #. TRANS: Server error displayed when unblocking a user from a group fails because of an unknown error.
-#. TRANS: Server error displayed when removing a user block.
 #: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "Zmylk při wotstronjenju blokowanja."
@@ -3160,8 +3157,7 @@ msgid "Publish a MicroID for my Jabber/Google Talk address."
 msgstr "MicroID za moju adresu Jabber/Google Talk publikować."
 
 #. TRANS: Confirmation message for successful Instant Messaging preferences save.
-#. TRANS: Confirmation message after saving preferences.
-#: actions/imsettings.php:283 actions/othersettings.php:193
+#: actions/imsettings.php:283 actions/othersettings.php:192
 msgid "Preferences saved."
 msgstr "Nastajenja składowane."
 
@@ -3425,7 +3421,7 @@ msgstr "Dyrbiš přizjewjeny być, zo by skupinu wopušćił."
 
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
-#: actions/leavegroup.php:103 lib/command.php:386
+#: actions/leavegroup.php:103 lib/command.php:398
 msgid "You are not a member of that group."
 msgstr "Njejsy čłon teje skupiny."
 
@@ -3547,41 +3543,39 @@ msgstr "Składować"
 msgid "Save license settings"
 msgstr "Licencne nastajenja składować"
 
-#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
-#: actions/login.php:97 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
 msgid "Already logged in."
 msgstr "Hižo přizjewjeny."
 
-#: actions/login.php:142
+#: actions/login.php:148
 msgid "Incorrect username or password."
 msgstr "Wopačne wužiwarske mjeno abo hesło."
 
-#. TRANS: Server error displayed when a user object could not be created trying to login using "one time password login".
-#: actions/login.php:148 actions/otp.php:127
+#: actions/login.php:154 actions/otp.php:120
 msgid "Error setting user. You are probably not authorized."
 msgstr "Zmylk při nastajenju wužiwarja. Snano njejsy awtorizowany."
 
-#: actions/login.php:202 actions/login.php:253
+#: actions/login.php:210 actions/login.php:263
 msgid "Login"
 msgstr "Přizjewić"
 
-#: actions/login.php:239
+#: actions/login.php:249
 msgid "Login to site"
 msgstr "Při sydle přizjewić"
 
-#: actions/login.php:248 actions/register.php:476
+#: actions/login.php:258 actions/register.php:490
 msgid "Remember me"
 msgstr "Składować"
 
-#: actions/login.php:249 actions/register.php:478
+#: actions/login.php:259 actions/register.php:492
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 
-#: actions/login.php:259
+#: actions/login.php:269
 msgid "Lost or forgotten password?"
 msgstr "Hesło zhubjene abo zabyte?"
 
-#: actions/login.php:277
+#: actions/login.php:288
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -3589,11 +3583,11 @@ msgstr ""
 "Prošu zapodaj z přičinow wěstoty swoje wužiwarske mjeno znowa, prjedy hač "
 "změniš swoje nastajenja."
 
-#: actions/login.php:281
+#: actions/login.php:292
 msgid "Login with your username and password."
 msgstr "Přizjewjenje z twojim wužiwarskim mjenom a hesłom."
 
-#: actions/login.php:284
+#: actions/login.php:295
 #, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -3673,14 +3667,14 @@ msgid "New message"
 msgstr "Nowa powěsć"
 
 #. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
-#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:501
+#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:513
 msgid "You can't send a message to this user."
 msgstr "Njemóžeš tutomu wužiwarju powěsć pósłać."
 
 #. TRANS: Command exception text shown when trying to send a direct message to another user without content.
 #. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
-#: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:478
-#: lib/command.php:581
+#: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:490
+#: lib/command.php:593
 msgid "No content!"
 msgstr "Žadyn wobsah!"
 
@@ -3689,7 +3683,7 @@ msgid "No recipient specified."
 msgstr "Žadyn přijimowar podaty."
 
 #. TRANS: Error text shown when trying to send a direct message to self.
-#: actions/newmessage.php:167 lib/command.php:505
+#: actions/newmessage.php:167 lib/command.php:517
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
@@ -3700,7 +3694,7 @@ msgstr "Powěsć pósłana"
 
 #. TRANS: Message given have sent a direct message to another user.
 #. TRANS: %s is the name of the other user.
-#: actions/newmessage.php:188 lib/command.php:513
+#: actions/newmessage.php:188 lib/command.php:525
 #, php-format
 msgid "Direct message to %s sent."
 msgstr "Direktna powěsć do %s pósłana."
@@ -3717,57 +3711,46 @@ msgstr "Nowa zdźělenka"
 msgid "Notice posted"
 msgstr "Zdźělenka wotpósłana"
 
-#. TRANS: Instructions for Notice search page.
-#. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/noticesearch.php:69
+#: actions/noticesearch.php:68
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
 "by spaces; they must be 3 characters or more."
 msgstr ""
 
-#. TRANS: Title of the page where users can search for notices.
-#: actions/noticesearch.php:80
+#: actions/noticesearch.php:78
 msgid "Text search"
 msgstr "Tekstowe pytanje"
 
-#. TRANS: Test in RSS notice search.
-#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearch.php:95
+#: actions/noticesearch.php:91
 #, php-format
 msgid "Search results for \"%1$s\" on %2$s"
 msgstr "Pytanske wuslědki za \"%1$s\" na %2$s"
 
-#. TRANS: Text for logged in users making a query for notices without results.
-#. TRANS: This message contains a Markdown link.
-#: actions/noticesearch.php:128
+#: actions/noticesearch.php:121
 #, php-format
 msgid ""
 "Be the first to [post on this topic](%%%%action.newnotice%%%%?"
 "status_textarea=%s)!"
 msgstr ""
 
-#. TRANS: Text for not logged in users making a query for notices without results.
-#. TRANS: This message contains Markdown links.
-#: actions/noticesearch.php:133
+#: actions/noticesearch.php:124
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and be the first to "
 "[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
 msgstr ""
 
-#. TRANS: RSS notice search feed title. %s is the query.
-#: actions/noticesearchrss.php:95
+#: actions/noticesearchrss.php:96
 #, php-format
 msgid "Updates with \"%s\""
 msgstr "Aktualizacije z \"%s\""
 
-#. TRANS: RSS notice search feed description.
-#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearchrss.php:99
+#: actions/noticesearchrss.php:98
 #, fuzzy, php-format
-msgid "Updates matching search term \"%1$s\" on %2$s."
-msgstr "Aktualizacije, kotrež pytanskemu zapřijeću  %1$s na %2$s wotpowěduja!"
+msgid "Updates matching search term \"%1$s\" on %2$s!"
+msgstr ""
+"Aktualizacije, kotrež pytanskemu zapřijeću \"%1$s\" na \"%2$s\" wotpowěduja."
 
 #: actions/nudge.php:85
 msgid ""
@@ -3805,30 +3788,30 @@ msgid "You have not registered any applications yet."
 msgstr "Hišće njejsy aplikacije zregistrował."
 
 #. TRANS: Title for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:70
+#: actions/oauthconnectionssettings.php:71
 msgid "Connected applications"
 msgstr "Zwjazane aplikacije"
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:81
+#: actions/oauthconnectionssettings.php:83
 msgid "The following connections exist for your account."
 msgstr "Slědowace zwiski za twoje konto eksistuja."
 
 #. TRANS: Client error when trying to revoke access for an application while not being a user of it.
-#: actions/oauthconnectionssettings.php:166
+#: actions/oauthconnectionssettings.php:168
 msgid "You are not a user of that application."
 msgstr "Njejsy wužiwar tuteje aplikacije."
 
 #. TRANS: Client error when revoking access has failed for some reason.
 #. TRANS: %s is the application ID revoking access failed for.
-#: actions/oauthconnectionssettings.php:181
+#: actions/oauthconnectionssettings.php:183
 #, php-format
 msgid "Unable to revoke access for application: %s."
 msgstr "Njemóžno přistup za aplikaciju cofnyć: %s-"
 
 #. TRANS: Success message after revoking access for an application.
 #. TRANS: %1$s is the application name, %2$s is the first part of the user token.
-#: actions/oauthconnectionssettings.php:200
+#: actions/oauthconnectionssettings.php:202
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -3836,30 +3819,20 @@ msgid ""
 msgstr ""
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:211
+#: actions/oauthconnectionssettings.php:213
 msgid "You have not authorized any applications to use your account."
 msgstr "Njejsy aplikacije za wužiwanje wašeho konta awtorizował."
 
 #. TRANS: Note for developers in the OAuth connection settings form.
 #. TRANS: This message contains a Markdown link. Do not separate "](".
 #. TRANS: %s is the URL to the OAuth settings.
-#: actions/oauthconnectionssettings.php:231
+#: actions/oauthconnectionssettings.php:233
 #, php-format
 msgid ""
 "Are you a developer? [Register an OAuth client application](%s) to use with "
 "this instance of StatusNet."
 msgstr ""
 
-#: actions/oembed.php:64
-#, php-format
-msgid "\"%s\" not found."
-msgstr "\"%s\" njenamakany."
-
-#: actions/oembed.php:76
-#, php-format
-msgid "Notice %s not found."
-msgstr "Zdźělenka %s njenamakana."
-
 #: actions/oembed.php:80 actions/shownotice.php:100
 msgid "Notice has no profile."
 msgstr "Zdźělenka nima profil."
@@ -3869,16 +3842,6 @@ msgstr "Zdźělenka nima profil."
 msgid "%1$s's status on %2$s"
 msgstr "Status %1$s na %2$s"
 
-#: actions/oembed.php:95
-#, php-format
-msgid "Attachment %s not found."
-msgstr "Přiwěšk %s njenamakany."
-
-#: actions/oembed.php:136
-#, php-format
-msgid "\"%s\" not supported for oembed requests."
-msgstr ""
-
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
 #: actions/oembed.php:168
 #, php-format
@@ -3897,12 +3860,11 @@ msgstr ""
 msgid "Not a supported data format."
 msgstr "Njeje podpěrany datowy format."
 
-#. TRANS: ShortName in the OpenSearch interface when trying to find users.
 #: actions/opensearch.php:64
 msgid "People Search"
 msgstr "Ludźi pytać"
 
-#: actions/opensearch.php:68
+#: actions/opensearch.php:67
 msgid "Notice Search"
 msgstr "Zdźělenku pytać"
 
@@ -3949,46 +3911,37 @@ msgstr "Profilowe designy pokazać abo schować."
 msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr "Krótšenska słužba za URL je předołha (maks. 50 znamješkow)."
 
-#. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
-#: actions/otp.php:70
+#: actions/otp.php:69
 msgid "No user ID specified."
 msgstr "Žadyn wužiwarski ID podaty."
 
-#. TRANS: Client error displayed trying to use "one time password login" without specifying a login token.
-#: actions/otp.php:86
+#: actions/otp.php:83
 msgid "No login token specified."
 msgstr "Žane přizjewjenske znamješko podate."
 
-#. TRANS: Client error displayed trying to use "one time password login" without requesting a login token.
-#: actions/otp.php:94
+#: actions/otp.php:90
 msgid "No login token requested."
 msgstr "Žadyn přizjewjenski token trěbny."
 
-#. TRANS: Client error displayed trying to use "one time password login" while specifying an invalid login token.
-#: actions/otp.php:100
+#: actions/otp.php:95
 msgid "Invalid login token specified."
 msgstr "Njepłaćiwe přizjewjenske znamješko podate."
 
-#. TRANS: Client error displayed trying to use "one time password login" while specifying an expired login token.
-#: actions/otp.php:110
+#: actions/otp.php:104
 msgid "Login token expired."
 msgstr "Přizjewjenske znamješko spadnjene."
 
-#. TRANS: Title for outbox for any but the fist page.
-#. TRANS: %1$s is the user nickname, %2$d is the page number.
-#: actions/outbox.php:57
+#: actions/outbox.php:58
 #, php-format
 msgid "Outbox for %1$s - page %2$d"
 msgstr "Wuchadny póst za %1$s - strona %2$d"
 
-#. TRANS: Title for first page of outbox.
 #: actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
 msgstr "Wuchadny póst za %s"
 
-#. TRANS: Instructions for outbox.
-#: actions/outbox.php:103
+#: actions/outbox.php:104
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr ""
 "To je twój wuchadny póst, kotryž twoje priwatne powěsće nalistuje, kotrež sy "
@@ -4016,42 +3969,43 @@ msgstr "Stare hesło"
 msgid "New password"
 msgstr "Nowe hesło"
 
-#: actions/passwordsettings.php:109 actions/register.php:423
-msgid "6 or more characters."
+#: actions/passwordsettings.php:109
+#, fuzzy
+msgid "6 or more characters"
 msgstr "6 abo wjace znamješkow."
 
-#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:264
-#: actions/register.php:427
-msgid "Same as password above."
+#: actions/passwordsettings.php:113
+#, fuzzy
+msgid "Same as password above"
 msgstr "Samsne hesło kaž horjeka."
 
 #: actions/passwordsettings.php:117
 msgid "Change"
 msgstr "Změnić"
 
-#: actions/passwordsettings.php:153 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:238
 msgid "Password must be 6 or more characters."
 msgstr "Hesło dyrbi 6 abo wjace znamješkow měć."
 
-#: actions/passwordsettings.php:156 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:241
 msgid "Passwords don't match."
 msgstr "Hesle so njekryjetej."
 
-#: actions/passwordsettings.php:164
+#: actions/passwordsettings.php:165
 msgid "Incorrect old password"
 msgstr "Wopačne stare hesło"
 
-#: actions/passwordsettings.php:180
+#: actions/passwordsettings.php:181
 msgid "Error saving user; invalid."
 msgstr "Zmylk při składowanju wužiwarja; njepłaćiwy."
 
-#. TRANS: Reset password form validation error message.
-#: actions/passwordsettings.php:185 actions/recoverpassword.php:418
-msgid "Cannot save new password."
+#: actions/passwordsettings.php:186
+#, fuzzy
+msgid "Can't save new password."
 msgstr "Nowe hesło njeda so składować."
 
-#: actions/passwordsettings.php:191
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
 msgid "Password saved."
 msgstr "Hesło składowane."
 
@@ -4325,17 +4279,14 @@ msgstr ""
 msgid "Save paths"
 msgstr "Šćežki składować"
 
-#. TRANS: Instructions for the "People search" page.
-#. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/peoplesearch.php:54
+#: actions/peoplesearch.php:52
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
 "Separate the terms by spaces; they must be 3 characters or more."
 msgstr ""
 
-#. TRANS: Title of a page where users can search for other users.
-#: actions/peoplesearch.php:61
+#: actions/peoplesearch.php:58
 msgid "People search"
 msgstr "Za ludźimi pytać"
 
@@ -4377,7 +4328,7 @@ msgid "Profile information"
 msgstr "Profilowe informacije"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109 actions/register.php:419
+#: actions/profilesettings.php:109 actions/register.php:433
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr ""
 "1-64 małopisanych pismikow abo ličbow, žane interpunkciske znamješka abo "
@@ -4386,7 +4337,7 @@ msgstr ""
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for full group name (dt). Text hidden by default.
 #. TRANS: DT for full name in a profile.
-#: actions/profilesettings.php:113 actions/register.php:441
+#: actions/profilesettings.php:113 actions/register.php:455
 #: actions/showgroup.php:255 actions/tagother.php:104
 #: lib/groupeditform.php:150 lib/userprofile.php:156
 msgid "Full name"
@@ -4394,20 +4345,20 @@ msgstr "Dospołne mjeno"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:118 actions/register.php:446
+#: actions/profilesettings.php:118 actions/register.php:460
 #: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "Startowa strona"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:121 actions/register.php:448
+#: actions/profilesettings.php:121
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr "URL twojeje startoweje strony, bloga abo profila na druhim sydle."
 
 #. TRANS: Tooltip for field label in form for profile settings. Plural
 #. TRANS: is decided by the number of characters available for the
 #. TRANS: biography (%d).
-#: actions/profilesettings.php:129 actions/register.php:457
+#: actions/profilesettings.php:129 actions/register.php:471
 #, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4417,29 +4368,28 @@ msgstr[2] "Wopisaj sebje a swoje zajimy z %d znamješkami"
 msgstr[3] "Wopisaj sebje a swoje zajimy z %d znamješkami"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:135 actions/register.php:462
+#: actions/profilesettings.php:135 actions/register.php:476
 msgid "Describe yourself and your interests"
 msgstr "Wopisaj sebje a swoje zajimy"
 
 #. TRANS: Text area label in form for profile settings where users can provide.
 #. TRANS: their biography.
-#: actions/profilesettings.php:139 actions/register.php:464
+#: actions/profilesettings.php:139 actions/register.php:478
 msgid "Bio"
 msgstr "Biografija"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group location (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT for location in a profile.
-#: actions/profilesettings.php:145 actions/register.php:469
+#: actions/profilesettings.php:145 actions/register.php:483
 #: actions/showgroup.php:265 actions/tagother.php:112
-#: actions/userauthorization.php:174 lib/groupeditform.php:173
+#: actions/userauthorization.php:166 lib/groupeditform.php:173
 #: lib/userprofile.php:172
 msgid "Location"
 msgstr "Městno"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148
+#: actions/profilesettings.php:148 actions/register.php:485
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Hdźež sy, na př. \"město, zwjazkowy kraj (abo region) , kraj\""
 
@@ -4459,8 +4409,7 @@ msgstr ""
 #. TRANS: Tooltip for field label in form for profile settings.
 #: actions/profilesettings.php:164
 msgid ""
-"Tags for yourself (letters, numbers, -, ., and _), comma- or space- "
-"separated."
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr ""
 
 #. TRANS: Dropdownlist label in form for profile settings.
@@ -4470,7 +4419,8 @@ msgstr "Rěč"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
 #: actions/profilesettings.php:171
-msgid "Preferred language."
+#, fuzzy
+msgid "Preferred language"
 msgstr "Preferowana rěč."
 
 #. TRANS: Dropdownlist label in form for profile settings.
@@ -4485,15 +4435,16 @@ msgstr "W kotrym časowym pasmje sy zwjetša?"
 
 #. TRANS: Checkbox label in form for profile settings.
 #: actions/profilesettings.php:189
+#, fuzzy
 msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)."
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr ""
 "Awtomatisce kóždeho abonować, kotryž  mje abonuje (najlěpše za \"njeludźi\")."
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Plural form is used based on the maximum number of allowed
 #. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:258 actions/register.php:221
+#: actions/profilesettings.php:258 actions/register.php:229
 #, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4514,10 +4465,10 @@ msgstr "Mjeno rěče je předołhe (maks. 50 znamješkow)."
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:291
+#: actions/profilesettings.php:291 actions/tagother.php:178
 #, php-format
-msgid "Invalid tag: \"%s\"."
-msgstr "Njepłaćiwa taflička: \"%s\"."
+msgid "Invalid tag: \"%s\""
+msgstr "Njepłaćiwa taflička: \"%s\""
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
 #. TRANS: automatically subscribe to any subscriber.
@@ -4611,12 +4562,6 @@ msgid ""
 "tool."
 msgstr ""
 
-#. TRANS: Public RSS feed description. %s is the StatusNet site name.
-#: actions/publicrss.php:106
-#, fuzzy, php-format
-msgid "%s updates from everyone."
-msgstr "%s aktualizacijow wote wšěch!"
-
 #. TRANS: Title for public tag cloud.
 #: actions/publictagcloud.php:57
 msgid "Public tag cloud"
@@ -4748,11 +4693,6 @@ msgstr "Hesło wobnowić"
 msgid "Password recovery requested"
 msgstr "Wobnowjenje hesła požadane"
 
-#. TRANS: Title for password recovery page in password saved mode.
-#: actions/recoverpassword.php:229
-msgid "Password saved"
-msgstr "Hesło składowane"
-
 #. TRANS: Title for password recovery page when an unknown action has been specified.
 #: actions/recoverpassword.php:232
 msgid "Unknown action"
@@ -4763,6 +4703,11 @@ msgstr "Njeznata akcija"
 msgid "6 or more characters, and do not forget it!"
 msgstr "6 abo wjace znamješkow, a njezabudź jo!"
 
+#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#: actions/recoverpassword.php:264 actions/register.php:441
+msgid "Same as password above."
+msgstr "Samsne hesło kaž horjeka."
+
 #. TRANS: Button text for password reset form.
 #. TRANS: Button text on profile design page to reset all colour settings to default without saving.
 #: actions/recoverpassword.php:268 lib/designsettings.php:264
@@ -4813,8 +4758,13 @@ msgstr "Hesło dyrbi 6 znamješkow abo wjace měć."
 msgid "Password and confirmation do not match."
 msgstr "Hesło a jeho wobkrućenje so njekryjetej."
 
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:418
+msgid "Cannot save new password."
+msgstr "Nowe hesło njeda so składować."
+
 #. TRANS: Server error displayed when something does wrong with the user object during password reset.
-#: actions/recoverpassword.php:426 actions/register.php:248
+#: actions/recoverpassword.php:426 actions/register.php:256
 msgid "Error setting user."
 msgstr "Zmylk při nastajenju wužiwarja."
 
@@ -4823,92 +4773,99 @@ msgstr "Zmylk při nastajenju wužiwarja."
 msgid "New password successfully saved. You are now logged in."
 msgstr "Nowe hesło bu wuspěšnje składowane. Sy nětko přizjewjeny."
 
-#: actions/register.php:87 actions/register.php:188 actions/register.php:399
+#: actions/register.php:92 actions/register.php:196 actions/register.php:413
 msgid "Sorry, only invited people can register."
 msgstr "Wodaj, jenož přeprošeni ludźo móžeja so registrować."
 
-#: actions/register.php:94
+#: actions/register.php:99
 msgid "Sorry, invalid invitation code."
 msgstr "Wodaj, njepłaćiwy přeprošenski kod."
 
-#: actions/register.php:113
+#: actions/register.php:119
 msgid "Registration successful"
 msgstr "Registrowanje wuspěšne"
 
-#: actions/register.php:115 actions/register.php:497
+#: actions/register.php:121 actions/register.php:511
 msgid "Register"
 msgstr "Registrować"
 
-#: actions/register.php:135
+#: actions/register.php:142
 msgid "Registration not allowed."
 msgstr "Registracija njedowolena."
 
-#: actions/register.php:201
-msgid "You cannot register if you don't agree to the license."
+#: actions/register.php:209
+#, fuzzy
+msgid "You can't register if you don't agree to the license."
 msgstr "Njemóžeš so registrować, jeli njepřizwoleš do licency."
 
-#: actions/register.php:210
+#: actions/register.php:218
 msgid "Email address already exists."
 msgstr "E-mejlowa adresa hižo eksistuje."
 
-#: actions/register.php:243 actions/register.php:265
+#: actions/register.php:251 actions/register.php:273
 msgid "Invalid username or password."
 msgstr "Njepłaćiwe wužiwarske mjeno abo hesło."
 
-#: actions/register.php:340
+#: actions/register.php:351
 msgid ""
 "With this form you can create a new account. You can then post notices and "
-"link up to friends and colleagues."
+"link up to friends and colleagues. "
 msgstr ""
 
+#: actions/register.php:437
+msgid "6 or more characters."
+msgstr "6 abo wjace znamješkow."
+
 #. TRANS: Link description in user account settings menu.
-#: actions/register.php:431 actions/register.php:435
+#: actions/register.php:445 actions/register.php:449
 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
 msgid "Email"
 msgstr "E-mejl"
 
-#: actions/register.php:432 actions/register.php:436
-msgid "Used only for updates, announcements, and password recovery."
+#: actions/register.php:446 actions/register.php:450
+msgid "Used only for updates, announcements, and password recovery"
 msgstr ""
 
-#: actions/register.php:443
-msgid "Longer name, preferably your \"real\" name."
+#: actions/register.php:457
+#, fuzzy
+msgid "Longer name, preferably your \"real\" name"
 msgstr "Dlěše mjeno, wosebje twoje \"woprawdźite\" mjeno."
 
-#: actions/register.php:471
-msgid "Where you are, like \"City, State (or Region), Country\"."
-msgstr "Hdźež sy, na př. \"město, zwjazkowy kraj (abo region) , kraj\"."
+#: actions/register.php:462
+#, fuzzy
+msgid "URL of your homepage, blog, or profile on another site"
+msgstr "URL twojeje startoweje strony, bloga abo profila na druhim sydle."
 
-#: actions/register.php:510
+#: actions/register.php:523
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
 msgstr "Rozumju, zo wobsah a daty wot %1$s su priwatne a dowěrliwe."
 
-#: actions/register.php:520
+#: actions/register.php:533
 #, php-format
 msgid "My text and files are copyright by %1$s."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:524
+#: actions/register.php:537
 msgid "My text and files remain under my own copyright."
-msgstr ""
+msgstr "Mój tekst a moje dataje wostawaja pod mojim swójskim awtorskim prawom."
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:527
+#: actions/register.php:540
 msgid "All rights reserved."
 msgstr "Wšě prawa wuměnjenjene."
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:532
+#: actions/register.php:545
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
 "email address, IM address, and phone number."
 msgstr ""
 
-#: actions/register.php:573
+#: actions/register.php:588
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -4927,7 +4884,7 @@ msgid ""
 "Thanks for signing up and we hope you enjoy using this service."
 msgstr ""
 
-#: actions/register.php:597
+#: actions/register.php:612
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -4954,7 +4911,8 @@ msgid "User nickname"
 msgstr "Wužiwarske přimjeno"
 
 #: actions/remotesubscribe.php:129
-msgid "Nickname of the user you want to follow."
+#, fuzzy
+msgid "Nickname of the user you want to follow"
 msgstr "Přimjeno wužiwarja, kotremuž chceš slědować."
 
 #: actions/remotesubscribe.php:132
@@ -4962,7 +4920,8 @@ msgid "Profile URL"
 msgstr "URL profila"
 
 #: actions/remotesubscribe.php:133
-msgid "URL of your profile on another compatible microblogging service."
+#, fuzzy
+msgid "URL of your profile on another compatible microblogging service"
 msgstr ""
 "URL twojeho profila při druhej kompatibelnej mikroblogowanskej słužbje."
 
@@ -4973,7 +4932,8 @@ msgid "Subscribe"
 msgstr "Abonować"
 
 #: actions/remotesubscribe.php:158
-msgid "Invalid profile URL (bad format)."
+#, fuzzy
+msgid "Invalid profile URL (bad format)"
 msgstr "Njepłaćiwy profilowy URL (wopačny format)."
 
 #: actions/remotesubscribe.php:167
@@ -5012,7 +4972,6 @@ msgstr "Wospjetowany"
 msgid "Repeated!"
 msgstr "Wospjetowany!"
 
-#. TRANS: RSS reply feed title. %s is a user nickname.
 #. TRANS: Tooltip for personal group navigation menu option when logged in for viewing @-replies.
 #: actions/replies.php:126 actions/repliesrss.php:68
 #: lib/personalgroupnav.php:109
@@ -5061,12 +5020,10 @@ msgid ""
 "newnotice%%%%?status_textarea=%3$s)."
 msgstr ""
 
-#. TRANS: RSS reply feed description.
-#. TRANS: %1$s is a user nickname, %2$s is the StatusNet site name.
-#: actions/repliesrss.php:74
+#: actions/repliesrss.php:72
 #, fuzzy, php-format
-msgid "Replies to %1$s on %2$s."
-msgstr "Wotmołwy na %1$s na %2$s!"
+msgid "Replies to %1$s on %2$s!"
+msgstr "Wotmołwy na %1$s na %2$s."
 
 #. TRANS: Client exception displayed when trying to restore an account while not logged in.
 #: actions/restoreaccount.php:78
@@ -5160,7 +5117,7 @@ msgstr "Njemóžeš wužiwarske róle na tutym sydle wotwołać."
 msgid "User doesn't have this role."
 msgstr "Wužiwar nima tutu rólu."
 
-#: actions/rsd.php:142 actions/version.php:159
+#: actions/rsd.php:146 actions/version.php:159
 msgid "StatusNet"
 msgstr "StatusNet"
 
@@ -5202,93 +5159,93 @@ msgstr ""
 msgid "Save site settings"
 msgstr "Sydłowe nastajenja składować"
 
-#: actions/showapplication.php:78
+#: actions/showapplication.php:82
 msgid "You must be logged in to view an application."
 msgstr "Dyrbiš přizjewjeny być, zo by sej aplikaciju wobhladał."
 
-#: actions/showapplication.php:151
+#: actions/showapplication.php:157
 msgid "Application profile"
 msgstr "Aplikaciski profil"
 
 #. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:153 lib/applicationeditform.php:177
+#: actions/showapplication.php:159 lib/applicationeditform.php:177
 msgid "Icon"
 msgstr "Symbol"
 
 #. TRANS: Form input field label for application name.
-#: actions/showapplication.php:163 actions/version.php:197
+#: actions/showapplication.php:169 actions/version.php:197
 #: lib/applicationeditform.php:190
 msgid "Name"
 msgstr "Mjeno"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:172 lib/applicationeditform.php:227
+#: actions/showapplication.php:178 lib/applicationeditform.php:227
 msgid "Organization"
 msgstr "Organizacija"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:181 actions/version.php:200
+#: actions/showapplication.php:187 actions/version.php:200
 #: lib/applicationeditform.php:208 lib/groupeditform.php:168
 msgid "Description"
 msgstr "Wopisanje"
 
 #. TRANS: Header for group statistics on a group page (h2).
 #. TRANS: H2 text for user statistics.
-#: actions/showapplication.php:186 actions/showgroup.php:460
+#: actions/showapplication.php:192 actions/showgroup.php:460
 #: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "Statistika"
 
-#: actions/showapplication.php:197
+#: actions/showapplication.php:203
 #, php-format
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr ""
 
-#: actions/showapplication.php:207
+#: actions/showapplication.php:213
 msgid "Application actions"
 msgstr "Aplikaciske akcije"
 
-#: actions/showapplication.php:230
+#: actions/showapplication.php:236
 msgid "Reset key & secret"
 msgstr ""
 
 #. TRANS: Title of form for deleting a user.
-#: actions/showapplication.php:246 lib/deletegroupform.php:121
+#: actions/showapplication.php:252 lib/deletegroupform.php:121
 #: lib/deleteuserform.php:64 lib/noticelist.php:673
 msgid "Delete"
 msgstr "Zničić"
 
-#: actions/showapplication.php:255
+#: actions/showapplication.php:261
 msgid "Application info"
 msgstr "Aplikaciske informacije"
 
-#: actions/showapplication.php:257
+#: actions/showapplication.php:263
 msgid "Consumer key"
 msgstr "Kluč přetrjebowarja"
 
-#: actions/showapplication.php:262
+#: actions/showapplication.php:268
 msgid "Consumer secret"
 msgstr "Potajnstwo přetrjebowarja"
 
-#: actions/showapplication.php:267
+#: actions/showapplication.php:273
 msgid "Request token URL"
 msgstr ""
 
-#: actions/showapplication.php:272
+#: actions/showapplication.php:278
 msgid "Access token URL"
 msgstr ""
 
-#: actions/showapplication.php:277
+#: actions/showapplication.php:283
 msgid "Authorize URL"
 msgstr "URL awtorizować"
 
-#: actions/showapplication.php:282
+#: actions/showapplication.php:288
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
 msgstr ""
 
-#: actions/showapplication.php:302
+#: actions/showapplication.php:309
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr "Chceš woprawdźe swój přetrjebowarski kluč a potajny kod wróćo stajić?"
 
@@ -5373,18 +5330,16 @@ msgid "Group profile"
 msgstr "Skupinski profil"
 
 #. TRANS: Label for group URL (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT for URL in a profile.
 #: actions/showgroup.php:273 actions/tagother.php:118
-#: actions/userauthorization.php:184 lib/userprofile.php:186
+#: actions/userauthorization.php:175 lib/userprofile.php:186
 msgid "URL"
 msgstr "URL"
 
 #. TRANS: Label for group description or group note (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page where bio is displayed.
 #. TRANS: DT for note in a profile.
 #: actions/showgroup.php:285 actions/tagother.php:128
-#: actions/userauthorization.php:197 lib/userprofile.php:204
+#: actions/userauthorization.php:187 lib/userprofile.php:204
 msgid "Note"
 msgstr "Přispomnjenka"
 
@@ -5520,7 +5475,7 @@ msgid "%1$s tagged %2$s"
 msgstr "%1$s z %2$s woznamjenjeny"
 
 #. TRANS: Page title showing tagged notices in one user's stream.
-#. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
+#. TRANS: %1$s is the username, %2$s is the hash tag, %1$d is the page number.
 #: actions/showstream.php:74
 #, php-format
 msgid "%1$s tagged %2$s, page %3$d"
@@ -5754,7 +5709,8 @@ msgstr ""
 
 #. TRANS: Title for button to save site notice in admin panel.
 #: actions/sitenoticeadminpanel.php:201
-msgid "Save site notice."
+#, fuzzy
+msgid "Save site notice"
 msgstr "Sydłowu zdźělenku składować."
 
 #. TRANS: Title for SMS settings.
@@ -5812,7 +5768,8 @@ msgstr "SMS telefonowe čisło"
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
 #: actions/smssettings.php:152
-msgid "Phone number, no punctuation or spaces, with area code."
+#, fuzzy
+msgid "Phone number, no punctuation or spaces, with area code"
 msgstr "Telefonowe čisło, bjez interpunkcije abo mjezerow, z předwolenjom."
 
 #. TRANS: Form legend for SMS preferences form.
@@ -5973,19 +5930,15 @@ msgstr "Njejsy tón profil abonował."
 msgid "Could not save subscription."
 msgstr "Abonement njeda so składować."
 
-#. TRANS: Client error displayed trying to perform any request method other than POST.
-#. TRANS: Do not translate POST.
 #: actions/subscribe.php:77
 msgid "This action only accepts POST requests."
 msgstr ""
 
-#. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
-#: actions/subscribe.php:121
+#: actions/subscribe.php:117
 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
 msgstr "Njemóžeš zdaleny profil OMB 0.1 z tutej akciju abonować."
 
-#. TRANS: Page title when subscription succeeded.
-#: actions/subscribe.php:149
+#: actions/subscribe.php:145
 msgid "Subscribed"
 msgstr "Abonowany"
 
@@ -6137,9 +6090,8 @@ msgstr ""
 msgid "User profile"
 msgstr "Wužiwarski profil"
 
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT element in area for user avatar.
-#: actions/tagother.php:81 actions/userauthorization.php:138
+#: actions/tagother.php:81 actions/userauthorization.php:132
 #: lib/userprofile.php:108
 msgid "Photo"
 msgstr "Foto"
@@ -6154,11 +6106,6 @@ msgid ""
 "separated"
 msgstr ""
 
-#: actions/tagother.php:178
-#, php-format
-msgid "Invalid tag: \"%s\""
-msgstr "Njepłaćiwa taflička: \"%s\""
-
 #: actions/tagother.php:193
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
@@ -6173,7 +6120,6 @@ msgstr ""
 msgid "No such tag."
 msgstr "Taflička njeeksistuje."
 
-#. TRANS: Client error displayed when trying to unblock a non-blocked user.
 #: actions/unblock.php:59
 msgid "You haven't blocked that user."
 msgstr "Njejsy toho wužiwarja zablokował."
@@ -6194,7 +6140,7 @@ msgstr "Žadyn profilowy ID w naprašowanju."
 msgid "Unsubscribed"
 msgstr "Wotskazany"
 
-#: actions/updateprofile.php:64
+#: actions/updateprofile.php:64 actions/userauthorization.php:337
 #, php-format
 msgid ""
 "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
@@ -6224,8 +6170,8 @@ msgstr "Njepłaćiwy powitanski tekst. Maksimalna dołhosć je 255 znamješkow."
 #. TRANS: Client error displayed when trying to set a non-existing user as default subscription for new
 #. TRANS: users in user admin panel. %1$s is the invalid nickname.
 #: actions/useradminpanel.php:166
-#, php-format
-msgid "Invalid default subscripton: \"%1$s\" is not a user."
+#, fuzzy, php-format
+msgid "Invalid default subscripton: '%1$s' is not a user."
 msgstr "Njepłaćiwy standardny abonement: \"%1$s\" wužiwar njeje."
 
 #. TRANS: Link description in user account settings menu.
@@ -6285,136 +6231,106 @@ msgstr ""
 
 #. TRANS: Title for button to save user settings in user admin panel.
 #: actions/useradminpanel.php:302
-msgid "Save user settings."
+#, fuzzy
+msgid "Save user settings"
 msgstr "Wužiwarske nastajenja składować."
 
-#. TRANS: Page title.
-#: actions/userauthorization.php:109
+#: actions/userauthorization.php:105
 msgid "Authorize subscription"
 msgstr "Abonement awtorizować"
 
-#. TRANS: Page notice on "Auhtorize subscription" page.
-#: actions/userauthorization.php:115
+#: actions/userauthorization.php:110
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
 "user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
-"click \"Reject\"."
+"click “Reject”."
 msgstr ""
 
-#. TRANS: DT element on Authorise Subscription page where license is displayed.
 #. TRANS: Menu item for site administration
-#: actions/userauthorization.php:207 actions/version.php:167
+#: actions/userauthorization.php:196 actions/version.php:167
 #: lib/adminpanelaction.php:403
 msgid "License"
 msgstr "Licenca"
 
-#. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:229
-msgctxt "BUTTON"
+#: actions/userauthorization.php:217
+#, fuzzy
 msgid "Accept"
 msgstr "Akceptować"
 
-#. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:231
-msgid "Subscribe to this user."
-msgstr "Tutoho wužiwarja abonować."
+#: actions/userauthorization.php:218 lib/subscribeform.php:115
+#: lib/subscribeform.php:139
+msgid "Subscribe to this user"
+msgstr "Tutoho wužiwarja abonować"
 
-#. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:233
-msgctxt "BUTTON"
+#: actions/userauthorization.php:219
+#, fuzzy
 msgid "Reject"
 msgstr "Wotpokazać"
 
-#. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:235
-msgid "Reject this subscription."
+#: actions/userauthorization.php:220
+#, fuzzy
+msgid "Reject this subscription"
 msgstr "Tutón abonement wotpokazać."
 
-#. TRANS: Client error displayed for an empty authorisation request.
-#: actions/userauthorization.php:248
+#: actions/userauthorization.php:232
 msgid "No authorization request!"
 msgstr "Žane awtorizaciske naprašowanje!"
 
-#. TRANS: Accept message header from Authorise subscription page.
-#: actions/userauthorization.php:271
+#: actions/userauthorization.php:254
 msgid "Subscription authorized"
 msgstr "Abonement awtorizowany"
 
-#: actions/userauthorization.php:274
+#: actions/userauthorization.php:256
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to authorize the "
 "subscription. Your subscription token is:"
 msgstr ""
 
-#. TRANS: Reject message header from Authorise subscription page.
-#: actions/userauthorization.php:285
+#: actions/userauthorization.php:266
 msgid "Subscription rejected"
 msgstr "Abonement wotpokazany"
 
-#: actions/userauthorization.php:288
+#: actions/userauthorization.php:268
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to fully reject the "
 "subscription."
 msgstr ""
 
-#. TRANS: Exception thrown when no valid user is found for an authorisation request.
-#. TRANS: %s is a listener URI.
-#: actions/userauthorization.php:325
-#, php-format
-msgid "Listener URI \"%s\" not found here."
+#: actions/userauthorization.php:303
+#, fuzzy, php-format
+msgid "Listener URI ‘%s’ not found here."
 msgstr "URI posłucharja \"%s\" njebu tu namakany."
 
-#. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:332
-#, php-format
-msgid "Listenee URI \"%s\" is too long."
+#: actions/userauthorization.php:308
+#, fuzzy, php-format
+msgid "Listenee URI ‘%s’ is too long."
 msgstr "URI posłucharki \"%s\" je předołhi."
 
-#. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:340
-#, php-format
-msgid "Listenee URI \"%s\" is a local user."
+#: actions/userauthorization.php:314
+#, fuzzy, php-format
+msgid "Listenee URI ‘%s’ is a local user."
 msgstr "URI posłucharki \"%s\" je lokalny wužiwar.."
 
-#. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
-#. TRANS: %s is a profile URL.
-#: actions/userauthorization.php:358
-#, php-format
-msgid "Profile URL \"%s\" is for a local user."
+#: actions/userauthorization.php:329
+#, fuzzy, php-format
+msgid "Profile URL ‘%s’ is for a local user."
 msgstr "Profilowy URL \"%s\" je za lokalneho wužiwarja."
 
-#. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
-#. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
-#: actions/userauthorization.php:368
-#, php-format
-msgid ""
-"Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
-"\"."
-msgstr ""
-
-#. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:378
-#, php-format
-msgid "Avatar URL \"%s\" is not valid."
+#: actions/userauthorization.php:345
+#, fuzzy, php-format
+msgid "Avatar URL ‘%s’ is not valid."
 msgstr "URL awatara \"%s\" njeje płaćiwy."
 
-#. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:385
-#, php-format
-msgid "Cannot read avatar URL \"%s\"."
+#: actions/userauthorization.php:350
+#, fuzzy, php-format
+msgid "Can’t read avatar URL ‘%s’."
 msgstr "Awatarowy URL \"%s\" njeda so čitać."
 
-#. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:392
-#, php-format
-msgid "Wrong image type for avatar URL \"%s\"."
+#: actions/userauthorization.php:355
+#, fuzzy, php-format
+msgid "Wrong image type for avatar URL ‘%s’."
 msgstr "Wopačny wobrazowy typ za awatarowy URL \"%s\"."
 
 #. TRANS: Page title for profile design page.
@@ -6508,7 +6424,7 @@ msgid "Plugins"
 msgstr "Tykače"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:898
+#: actions/version.php:198 lib/action.php:901
 msgid "Version"
 msgstr "Wersija"
 
@@ -6714,14 +6630,14 @@ msgstr ""
 
 #. TRANS: Server exception thrown when a reply cannot be saved.
 #. TRANS: %1$d is a notice ID, %2$d is the ID of the mentioned user.
-#: classes/Notice.php:1142
+#: classes/Notice.php:1144
 #, php-format
 msgid "Could not save reply for %1$d, %2$d."
 msgstr "Wotmołwa za %1$d, %2$d njeda so składować."
 
 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1661
+#: classes/Notice.php:1663
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
@@ -6735,14 +6651,14 @@ msgstr "%1$s (%2$s)"
 
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:775
+#: classes/Profile.php:779
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:784
+#: classes/Profile.php:788
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -7059,53 +6975,53 @@ msgid "Page notice"
 msgstr "Zdźělenka strony"
 
 #. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:871
+#: lib/action.php:874
 msgid "Secondary site navigation"
 msgstr "Sekundarna sydłowa nawigacija"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:877
+#: lib/action.php:880
 msgid "Help"
 msgstr "Pomoc"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:880
+#: lib/action.php:883
 msgid "About"
 msgstr "Wo"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:883
+#: lib/action.php:886
 msgid "FAQ"
 msgstr "Huste prašenja"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:888
+#: lib/action.php:891
 msgid "TOS"
 msgstr "Wužiwarske wuměnjenja"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:892
+#: lib/action.php:895
 msgid "Privacy"
 msgstr "Priwatnosć"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:895
+#: lib/action.php:898
 msgid "Source"
 msgstr "Žórło"
 
 #. TRANS: Secondary navigation menu option leading to e-mail contact information on the
 #. TRANS: StatusNet site, where to report bugs, ...
-#: lib/action.php:902
+#: lib/action.php:905
 msgid "Contact"
 msgstr "Kontakt"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:905
+#: lib/action.php:908
 msgid "Badge"
 msgstr "Plaketa"
 
 #. TRANS: DT element for StatusNet software license.
-#: lib/action.php:934
+#: lib/action.php:937
 msgid "StatusNet software license"
 msgstr "Softwarowa licenca StatusNet"
 
@@ -7113,7 +7029,7 @@ msgstr "Softwarowa licenca StatusNet"
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:941
+#: lib/action.php:944
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7121,7 +7037,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:944
+#: lib/action.php:947
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** je mikroblogowanska słužba."
@@ -7130,7 +7046,7 @@ msgstr "**%%site.name%%** je mikroblogowanska słužba."
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:951
+#: lib/action.php:954
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7139,50 +7055,50 @@ msgid ""
 msgstr ""
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:967
+#: lib/action.php:970
 msgid "Site content license"
 msgstr "Licenca sydłoweho wobsaha"
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:974
+#: lib/action.php:977
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr "Wobsah a daty wot %1$s su priwatne a dowěrliwe."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:981
+#: lib/action.php:984
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:985
+#: lib/action.php:988
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:1017
+#: lib/action.php:1020
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr "Wobsah a daty wot %1$s su pod licencu %2$s."
 
 #. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1353
+#: lib/action.php:1356
 msgid "Pagination"
 msgstr "Paginowanje"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1364
+#: lib/action.php:1367
 msgid "After"
 msgstr "Po"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1374
+#: lib/action.php:1377
 msgid "Before"
 msgstr "Před"
 
@@ -7377,23 +7293,19 @@ msgstr ""
 msgid "No application for that consumer key."
 msgstr "Žana aplikacija za tón kluč přetrjebowarja."
 
-#: lib/apiauth.php:202 lib/apiauth.php:284
-msgid "Not allowed to use API."
-msgstr ""
-
 #. TRANS: OAuth exception given when an incorrect access token was given for a user.
-#: lib/apiauth.php:225
+#: lib/apiauth.php:219
 msgid "Bad access token."
 msgstr ""
 
 #. TRANS: OAuth exception given when no user was found for a given token (no token was found).
-#: lib/apiauth.php:230
+#: lib/apiauth.php:224
 msgid "No user for that token."
 msgstr ""
 
 #. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel".
 #. TRANS: Client error thrown when authentication fails.
-#: lib/apiauth.php:272 lib/apiauth.php:302
+#: lib/apiauth.php:266 lib/apiauth.php:293
 msgid "Could not authenticate you."
 msgstr "Njebě móžno će awtentifikować."
 
@@ -7594,11 +7506,6 @@ msgstr "Změnjenje hesła njeje dowolene."
 msgid "Block"
 msgstr "Blokować"
 
-#. TRANS: Description of the form to block a user.
-#: lib/blockform.php:79
-msgid "Block this user"
-msgstr "Tutoho wužiwarja blokować"
-
 #. TRANS: Title for command results.
 #: lib/channel.php:160 lib/channel.php:181
 msgid "Command results"
@@ -7626,7 +7533,7 @@ msgstr "Zdźělenka z tym ID njeeksistuje."
 
 #. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
 #. TRANS: Error text shown when a last user notice is requested and it does not exist.
-#: lib/command.php:99 lib/command.php:630
+#: lib/command.php:99 lib/command.php:642
 msgid "User has no last notice."
 msgstr "Wužiwar nima poslednju powěsć."
 
@@ -7676,35 +7583,41 @@ msgstr ""
 "Abonenća: %2$s\n"
 "Zdźělenki: %3$s"
 
+#. TRANS: Error message text shown when a favorite could not be set because it has already been favorited.
+#: lib/command.php:298
+#, fuzzy
+msgid "Could not create favorite: already favorited."
+msgstr "Faworit njeda so wutworić."
+
 #. TRANS: Text shown when a notice has been marked as favourite successfully.
-#: lib/command.php:312
+#: lib/command.php:324
 msgid "Notice marked as fave."
 msgstr "Zdźělenka je jako faworit markěrowana."
 
 #. TRANS: Message given having added a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:357
+#: lib/command.php:369
 #, php-format
 msgid "%1$s joined group %2$s."
 msgstr "%1$s je do skupiny %2$s zastupił."
 
 #. TRANS: Message given having removed a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:405
+#: lib/command.php:417
 #, php-format
 msgid "%1$s left group %2$s."
 msgstr "%1$s je skupinu %2$s wopušćił."
 
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: lib/command.php:426
+#: lib/command.php:438
 #, php-format
 msgctxt "WHOIS"
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
 
 #. TRANS: Whois output. %s is the full name of the queried user.
-#: lib/command.php:430
+#: lib/command.php:442
 #, php-format
 msgid "Fullname: %s"
 msgstr "Dospołne mjeno: %s"
@@ -7712,7 +7625,7 @@ msgstr "Dospołne mjeno: %s"
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a location.
-#: lib/command.php:434 lib/mail.php:270
+#: lib/command.php:446 lib/mail.php:270
 #, php-format
 msgid "Location: %s"
 msgstr "Městno: %s"
@@ -7720,20 +7633,20 @@ msgstr "Městno: %s"
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a homepage.
-#: lib/command.php:438 lib/mail.php:274
+#: lib/command.php:450 lib/mail.php:274
 #, php-format
 msgid "Homepage: %s"
 msgstr "Startowa strona: %s"
 
 #. TRANS: Whois output. %s is the bio information of the queried user.
-#: lib/command.php:442
+#: lib/command.php:454
 #, php-format
 msgid "About: %s"
 msgstr "Wo: %s"
 
 #. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).
 #. TRANS: %s is a remote profile.
-#: lib/command.php:471
+#: lib/command.php:483
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
@@ -7742,7 +7655,7 @@ msgstr ""
 
 #. TRANS: Message given if content is too long. %1$sd is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:488
+#: lib/command.php:500
 #, php-format
 msgid "Message too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
@@ -7757,25 +7670,25 @@ msgstr[3] ""
 "pósłał."
 
 #. TRANS: Error text shown sending a direct message fails with an unknown reason.
-#: lib/command.php:516
+#: lib/command.php:528
 msgid "Error sending direct message."
 msgstr "Zmylk při słanju direktneje powěsće,"
 
 #. TRANS: Message given having repeated a notice from another user.
 #. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:553
+#: lib/command.php:565
 #, php-format
 msgid "Notice from %s repeated."
 msgstr "Powěsć wot %s wospjetowana."
 
 #. TRANS: Error text shown when repeating a notice fails with an unknown reason.
-#: lib/command.php:556
+#: lib/command.php:568
 msgid "Error repeating notice."
 msgstr "Zmylk při wospjetowanju zdźělenki"
 
 #. TRANS: Message given if content of a notice for a reply is too long. %1$d is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:591
+#: lib/command.php:603
 #, php-format
 msgid "Notice too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Notice too long - maximum is %1$d characters, you sent %2$d."
@@ -7794,80 +7707,80 @@ msgstr[3] ""
 
 #. TRANS: Text shown having sent a reply to a notice successfully.
 #. TRANS: %s is the nickname of the user of the notice the reply was sent to.
-#: lib/command.php:604
+#: lib/command.php:616
 #, php-format
 msgid "Reply to %s sent."
 msgstr "Wotmołwa na %s pósłana."
 
 #. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
-#: lib/command.php:607
+#: lib/command.php:619
 msgid "Error saving notice."
 msgstr "Zmylk při składowanju powěsće"
 
 #. TRANS: Error text shown when no username was provided when issuing a subscribe command.
-#: lib/command.php:654
+#: lib/command.php:666
 msgid "Specify the name of the user to subscribe to."
 msgstr "Podaj mjeno wužiwarja, kotrehož chceš abonować"
 
 #. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
-#: lib/command.php:663
+#: lib/command.php:675
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "OMB-profile njedadźa so přez přikaz abonować."
 
 #. TRANS: Text shown after having subscribed to another user successfully.
 #. TRANS: %s is the name of the user the subscription was requested for.
-#: lib/command.php:671
+#: lib/command.php:683
 #, php-format
 msgid "Subscribed to %s."
 msgstr "%s abonowany."
 
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.
-#: lib/command.php:692 lib/command.php:803
+#: lib/command.php:704 lib/command.php:815
 msgid "Specify the name of the user to unsubscribe from."
 msgstr "Podaj mjeno wužiwarja, kotrehož chceš wotskazać."
 
 #. TRANS: Text shown after having unsubscribed from another user successfully.
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:703
+#: lib/command.php:715
 #, php-format
 msgid "Unsubscribed from %s."
 msgstr "%s wotskazany."
 
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
-#: lib/command.php:723 lib/command.php:749
+#: lib/command.php:735 lib/command.php:761
 msgid "Command not yet implemented."
 msgstr "Přikaz hišće njeimplementowany."
 
 #. TRANS: Text shown when issuing the command "off" successfully.
-#: lib/command.php:727
+#: lib/command.php:739
 msgid "Notification off."
 msgstr "Zdźělenje znjemóžnjene."
 
 #. TRANS: Error text shown when the command "off" fails for an unknown reason.
-#: lib/command.php:730
+#: lib/command.php:742
 msgid "Can't turn off notification."
 msgstr "Zdźělenje njeda so znjemóžnić."
 
 #. TRANS: Text shown when issuing the command "on" successfully.
-#: lib/command.php:753
+#: lib/command.php:765
 msgid "Notification on."
 msgstr "Zdźělenje zmóžnjene."
 
 #. TRANS: Error text shown when the command "on" fails for an unknown reason.
-#: lib/command.php:756
+#: lib/command.php:768
 msgid "Can't turn on notification."
 msgstr "Zdźělenje njeda so zmóžnić."
 
 #. TRANS: Error text shown when issuing the login command while login is disabled.
-#: lib/command.php:770
+#: lib/command.php:782
 msgid "Login command is disabled."
 msgstr "Přizjewjenski přikaz je znjemóžnjeny."
 
 #. TRANS: Text shown after issuing the login command successfully.
 #. TRANS: %s is a logon link..
-#: lib/command.php:783
+#: lib/command.php:795
 #, php-format
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
@@ -7875,20 +7788,20 @@ msgstr ""
 
 #. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:812
+#: lib/command.php:824
 #, php-format
 msgid "Unsubscribed %s."
 msgstr "%s wotskazany."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
-#: lib/command.php:830
+#: lib/command.php:842
 msgid "You are not subscribed to anyone."
 msgstr "Njejsy nikoho abonował."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
-#: lib/command.php:835
+#: lib/command.php:847
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Sy tutu wosobu abonował:"
@@ -7898,14 +7811,14 @@ msgstr[3] "Sy tute wosoby abonował:"
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user
 #. TRANS: (followers) without having any subscribers.
-#: lib/command.php:857
+#: lib/command.php:869
 msgid "No one is subscribed to you."
 msgstr "Nichtó njeje će abonował."
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
-#: lib/command.php:862
+#: lib/command.php:874
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Tuta wosoba je će abonowała:"
@@ -7915,14 +7828,14 @@ msgstr[3] "Tute wosoby su će abonowali:"
 
 #. TRANS: Text shown after requesting groups a user is subscribed to without having
 #. TRANS: any group subscriptions.
-#: lib/command.php:884
+#: lib/command.php:896
 msgid "You are not a member of any groups."
 msgstr "Njejsy čłon w žanej skupinje."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
-#: lib/command.php:889
+#: lib/command.php:901
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "Sy čłon tuteje skupiny:"
@@ -7931,7 +7844,7 @@ msgstr[2] "Sy čłon tutych skupinow:"
 msgstr[3] "Sy čłon tutych skupinow:"
 
 #. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-#: lib/command.php:904
+#: lib/command.php:916
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -8032,11 +7945,6 @@ msgstr "Awtorizowane zwjazane aplikacije"
 msgid "Database error"
 msgstr "Zmylk w datowej bance"
 
-#. TRANS: Description of form for deleting a user.
-#: lib/deleteuserform.php:75
-msgid "Delete this user"
-msgstr "Tutoho wužiwarja wušmórnyć"
-
 #. TRANS: Label in form on profile design page.
 #. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
 #: lib/designsettings.php:108
@@ -8073,21 +7981,6 @@ msgstr "Barby změnić"
 msgid "Use defaults"
 msgstr "Standardne hódnoty wužiwać"
 
-#. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: lib/designsettings.php:259
-msgid "Restore default designs"
-msgstr "Standardne designy wobnowić"
-
-#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: lib/designsettings.php:267
-msgid "Reset back to default"
-msgstr "Na standard wróćo stajić"
-
-#. TRANS: Title for button on profile design page to save settings.
-#: lib/designsettings.php:272
-msgid "Save design"
-msgstr "Design składować"
-
 #. TRANS: Error message displayed if design settings could not be saved.
 #. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
 #: lib/designsettings.php:405 lib/designsettings.php:427
@@ -8677,6 +8570,9 @@ msgid ""
 "You have no private messages. You can send private message to engage other "
 "users in conversation. People can send you messages for your eyes only."
 msgstr ""
+"Nimaš žane priwatne powěsće. Móžeš priwatnu powěsć pósłać, zo by druhich "
+"wužiwarjow do konwersacije zaplesć. Ludźo móža ći powěsće pósłać, kotrež "
+"jenož ty móžeš widźeć."
 
 #: lib/mailhandler.php:37
 msgid "Could not parse message."
@@ -8878,10 +8774,6 @@ msgstr "Na tutu zdźělenku wotmołwić"
 msgid "Reply"
 msgstr "Wotmołwić"
 
-#: lib/noticelist.php:673
-msgid "Delete this notice"
-msgstr "Tutu zdźělenku wušmórnyć"
-
 #: lib/noticelist.php:691
 msgid "Notice repeated"
 msgstr "Zdźělenka wospjetowana"
@@ -9157,10 +9049,6 @@ msgstr "Přeprosyć"
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Přećelow a kolegow přeprosyć, so tebi na %s  přidružić"
 
-#: lib/subscribeform.php:115 lib/subscribeform.php:139
-msgid "Subscribe to this user"
-msgstr "Tutoho wužiwarja abonować"
-
 #: lib/subscriberspeopleselftagcloudsection.php:48
 #: lib/subscriptionspeopleselftagcloudsection.php:48
 msgid "People Tagcloud as self-tagged"
@@ -9330,23 +9218,18 @@ msgctxt "role"
 msgid "Moderator"
 msgstr "Moderator"
 
-#: lib/util.php:305
-#, fuzzy
-msgid "Not allowed to log in."
-msgstr "Njepřizjewjeny."
-
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1309
+#: lib/util.php:1306
 msgid "a few seconds ago"
 msgstr "před něšto sekundami"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1312
+#: lib/util.php:1309
 msgid "about a minute ago"
 msgstr "před něhdźe jednej mjeńšinu"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1316
+#: lib/util.php:1313
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
@@ -9356,12 +9239,12 @@ msgstr[2] "před něhdźe %d mjeńšinami"
 msgstr[3] "před něhdźe %d mjeńšinami"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1319
+#: lib/util.php:1316
 msgid "about an hour ago"
 msgstr "před něhdźe jednej hodźinu"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1323
+#: lib/util.php:1320
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
@@ -9371,12 +9254,12 @@ msgstr[2] "před něhdźe %d hodźinami"
 msgstr[3] "před něhdźe %d hodźinami"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1326
+#: lib/util.php:1323
 msgid "about a day ago"
 msgstr "před něhdźe jednym dnjom"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1330
+#: lib/util.php:1327
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
@@ -9386,12 +9269,12 @@ msgstr[2] "před něhdźe %d dnjemi"
 msgstr[3] "před něhdźe %d dnjemi"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1333
+#: lib/util.php:1330
 msgid "about a month ago"
 msgstr "před něhdźe jednym měsacom"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1337
+#: lib/util.php:1334
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
@@ -9401,7 +9284,7 @@ msgstr[2] "před něhdźe %d měsacami"
 msgstr[3] "před něhdźe %d měacami"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1340
+#: lib/util.php:1337
 msgid "about a year ago"
 msgstr "před něhdźe jednym lětom"
 
@@ -9450,3 +9333,51 @@ msgstr "Njepłaćiwy XML, korjeń XRD faluje."
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr "Wobstaruje so zawěsćenje z dataje \"%s\"-"
+
+#~ msgid "Block this user."
+#~ msgstr "Tutoho wužiwarja blokować."
+
+#~ msgid "Delete this notice."
+#~ msgstr "Tutu zdźělenku zhašeć."
+
+#~ msgid "Delete this user."
+#~ msgstr "Tutoho wužiwarja zhašeć"
+
+#~ msgid "Restore default designs."
+#~ msgstr "Standardne designy wobnowić."
+
+#~ msgid "Reset back to default."
+#~ msgstr "Na standard wróćo stajić."
+
+#~ msgid "Save design."
+#~ msgstr "Design składować."
+
+#~ msgid "Disfavor favorite."
+#~ msgstr "Z faworitow wotstronić."
+
+#~ msgid "\"%s\" not found."
+#~ msgstr "\"%s\" njenamakany."
+
+#~ msgid "Notice %s not found."
+#~ msgstr "Zdźělenka %s njenamakana."
+
+#~ msgid "Attachment %s not found."
+#~ msgstr "Přiwěšk %s njenamakany."
+
+#~ msgid "Invalid tag: \"%s\"."
+#~ msgstr "Njepłaćiwa taflička: \"%s\"."
+
+#~ msgid "%s updates from everyone."
+#~ msgstr "%s aktualizacijow wote wšěch."
+
+#~ msgid "Password saved"
+#~ msgstr "Hesło składowane"
+
+#~ msgid "Where you are, like \"City, State (or Region), Country\"."
+#~ msgstr "Hdźež sy, na př. \"město, zwjazkowy kraj (abo region) , kraj\"."
+
+#~ msgid "Subscribe to this user."
+#~ msgstr "Tutoho wužiwarja abonować."
+
+#~ msgid "Not allowed to log in."
+#~ msgstr "Přizjewjenje njedowolene."
diff --git a/locale/hu/LC_MESSAGES/statusnet.po b/locale/hu/LC_MESSAGES/statusnet.po
index 52e1be1f26..3470c26e08 100644
--- a/locale/hu/LC_MESSAGES/statusnet.po
+++ b/locale/hu/LC_MESSAGES/statusnet.po
@@ -12,13 +12,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-24 10:32+0000\n"
-"PO-Revision-Date: 2011-02-24 10:36:50+0000\n"
+"POT-Creation-Date: 2011-03-03 15:58+0000\n"
+"PO-Revision-Date: 2011-03-03 16:00:50+0000\n"
 "Language-Team: Hungarian <http://translatewiki.net/wiki/Portal:hu>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-17 11:39:54+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r82712); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-02-25 23:49:23+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: hu\n"
 "X-Message-Group: #out-statusnet-core\n"
@@ -136,11 +136,7 @@ msgstr "Nincs ilyen lap."
 #. 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 use "one time password login" without using an existing user.
-#. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
-#. TRANS: Client error displayed trying to find a user by ID for a non-existing ID.
-#. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when calling a profile action without specifying a user.
 #: actions/all.php:80 actions/allrss.php:69
@@ -158,12 +154,12 @@ msgstr "Nincs ilyen lap."
 #: actions/apitimelinementions.php:77 actions/apitimelineuser.php:79
 #: actions/avatarbynickname.php:79 actions/favoritesrss.php:72
 #: actions/foaf.php:42 actions/foaf.php:61 actions/hcard.php:67
-#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:78
+#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
 #: actions/remotesubscribe.php:144 actions/remotesubscribe.php:153
-#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:113
-#: actions/showfavorites.php:106 actions/userbyid.php:75
+#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
+#: actions/showfavorites.php:106 actions/userbyid.php:74
 #: actions/usergroups.php:93 actions/userrss.php:40 actions/userxrd.php:59
-#: actions/xrds.php:71 lib/command.php:497 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:509 lib/galleryaction.php:59
 #: lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Nincs ilyen felhasználó."
@@ -289,7 +285,7 @@ msgstr "Frissítések %1$s felhasználótól, és barátok a következő oldalon
 #: actions/apigrouplistall.php:120 actions/apigroupmembership.php:105
 #: actions/apigroupshow.php:114 actions/apihelptest.php:84
 #: actions/apistatusesdestroy.php:101 actions/apistatusesretweets.php:110
-#: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:138
+#: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:139
 #: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
 #: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:268
 #: actions/apitimelinegroup.php:147 actions/apitimelinehome.php:173
@@ -519,7 +515,7 @@ msgstr "A címzett felhasználó nem található."
 #. TRANS: Client error displayed trying to direct message another user who's not a friend (403).
 #: actions/apidirectmessagenew.php:144
 #, fuzzy
-msgid "Cannot send direct messages to users who aren't your friend."
+msgid "Can't send direct messages to users who aren't your friend."
 msgstr ""
 "Nem küldhetsz közvetlen üzenetet olyan felhasználóknak, akik nem a barátaid."
 
@@ -546,7 +542,7 @@ msgstr "Ez az állapotjelentés már a kedvenceid között van."
 #. TRANS: Client error displayed when marking a notice as favourite fails.
 #. TRANS: Server error displayed when trying to mark a notice as favorite fails in the database.
 #. TRANS: Error message text shown when a favorite could not be set.
-#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:294
+#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:306
 msgid "Could not create favorite."
 msgstr "Nem sikerült létrehozni a kedvencet."
 
@@ -604,7 +600,7 @@ msgstr "A cél felhasználó nem található."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:191
 #: actions/newgroup.php:137 actions/profilesettings.php:273
-#: actions/register.php:206
+#: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "A becenév már foglalt. Próbálj meg egy másikat."
 
@@ -614,7 +610,7 @@ msgstr "A becenév már foglalt. Próbálj meg egy másikat."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:195
 #: actions/newgroup.php:141 actions/profilesettings.php:243
-#: actions/register.php:208
+#: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "Nem érvényes becenév."
 
@@ -627,7 +623,7 @@ msgstr "Nem érvényes becenév."
 #: actions/apigroupcreate.php:181 actions/editapplication.php:235
 #: actions/editgroup.php:202 actions/newapplication.php:221
 #: actions/newgroup.php:148 actions/profilesettings.php:248
-#: actions/register.php:215
+#: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "A honlap érvénytelen URL-cím."
 
@@ -637,7 +633,7 @@ msgstr "A honlap érvénytelen URL-cím."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:191 actions/editgroup.php:206
 #: actions/newgroup.php:152 actions/profilesettings.php:252
-#: actions/register.php:218
+#: actions/register.php:226
 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "A teljes név túl hosszú (legfeljebb 255 karakter lehet)."
@@ -666,7 +662,7 @@ msgstr[1] "A leírás túl hosszú (legfeljebb %d karakter lehet)."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:215 actions/editgroup.php:218
 #: actions/newgroup.php:164 actions/profilesettings.php:265
-#: actions/register.php:227
+#: actions/register.php:235
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
 msgstr "A hely túl hosszú (legfeljebb 255 karakter lehet)."
@@ -723,14 +719,14 @@ msgstr "A csoport nem található."
 #. TRANS: Server error displayed when trying to join a group the user is already a member of.
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:333
+#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:345
 msgid "You are already a member of that group."
 msgstr "Már tagja vagy ennek a csoportnak."
 
 #. TRANS: Server error displayed when trying to join a group the user is blocked from joining.
 #. 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.
-#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:338
+#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:350
 msgid "You have been blocked from that group by the admin."
 msgstr "Az adminisztrátor blokkolt ebből a csoportból."
 
@@ -740,7 +736,7 @@ msgstr "Az adminisztrátor blokkolt ebből a csoportból."
 #. TRANS: %1$s is the joining user's nickname, $2$s is the group nickname for which the join failed.
 #. TRANS: Message given having failed to add a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:350
+#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:362
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "Nem sikerült %1$s felhasználót hozzáadni a %2$s csoporthoz."
@@ -757,7 +753,7 @@ msgstr "Nem vagy tagja ennek a csoportnak."
 #. TRANS: Message given having failed to remove a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
 #: actions/apigroupleave.php:127 actions/leavegroup.php:133
-#: lib/command.php:398
+#: lib/command.php:410
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
 msgstr "Nem sikerült %1$s felhasználót eltávolítani a %2$s csoportból."
@@ -819,21 +815,20 @@ msgstr "Nincs jogosultságod."
 #. TRANS: Form validation error message.
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
-#. TRANS: Client error displayed when the session token is not okay.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
 #: actions/deletenotice.php:177 actions/disfavor.php:75
 #: actions/emailsettings.php:291 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:65 actions/grouplogo.php:321
 #: actions/groupunblock.php:65 actions/imsettings.php:224
-#: actions/invite.php:60 actions/login.php:131 actions/makeadmin.php:66
+#: actions/invite.php:60 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
-#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:136
-#: actions/othersettings.php:155 actions/passwordsettings.php:137
+#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
+#: actions/othersettings.php:155 actions/passwordsettings.php:138
 #: actions/profilesettings.php:217 actions/recoverpassword.php:383
-#: actions/register.php:164 actions/remotesubscribe.php:76
+#: actions/register.php:172 actions/remotesubscribe.php:76
 #: actions/repeat.php:82 actions/smssettings.php:250 actions/subedit.php:40
-#: actions/subscribe.php:87 actions/tagother.php:166
-#: actions/unsubscribe.php:69 actions/userauthorization.php:53
+#: actions/subscribe.php:86 actions/tagother.php:166
+#: actions/unsubscribe.php:69 actions/userauthorization.php:52
 #: lib/designsettings.php:310
 msgid "There was a problem with your session token. Try again, please."
 msgstr "Probléma volt a munkameneted tokenjével. Kérlek, próbáld újra."
@@ -864,7 +859,7 @@ msgstr ""
 #: actions/designadminpanel.php:100 actions/editapplication.php:144
 #: actions/emailsettings.php:310 actions/grouplogo.php:332
 #: actions/imsettings.php:239 actions/newapplication.php:124
-#: actions/oauthconnectionssettings.php:145 actions/recoverpassword.php:46
+#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
 #: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
 msgstr "Váratlan űrlapbeküldés."
@@ -910,20 +905,19 @@ msgstr "Kontó"
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group nickname (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT for nick name in a profile.
-#: actions/apioauthauthorize.php:459 actions/login.php:242
-#: actions/profilesettings.php:106 actions/register.php:418
+#: actions/apioauthauthorize.php:459 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:432
 #: actions/showgroup.php:243 actions/tagother.php:94
-#: actions/userauthorization.php:152 lib/groupeditform.php:145
+#: actions/userauthorization.php:145 lib/groupeditform.php:145
 #: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "Becenév"
 
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:463 actions/login.php:245
-#: actions/register.php:422 lib/accountsettingsaction.php:120
+#: actions/apioauthauthorize.php:463 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:120
 msgid "Password"
 msgstr "Jelszó"
 
@@ -1017,13 +1011,13 @@ msgstr "Nincs ilyen hír."
 
 #. TRANS: Client error displayed trying to repeat an own notice through the API.
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:537
+#: actions/apistatusesretweet.php:83 lib/command.php:549
 msgid "Cannot repeat your own notice."
 msgstr "Nem ismételheted meg a saját híredet."
 
 #. TRANS: Client error displayed trying to re-repeat a notice through the API.
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:92 lib/command.php:543
+#: actions/apistatusesretweet.php:92 lib/command.php:555
 msgid "Already repeated that notice."
 msgstr "Már megismételted azt a hírt."
 
@@ -1046,7 +1040,7 @@ msgstr "Az API-metódus nem található."
 #. TRANS: %s is the requested output format.
 #: actions/apistatusesshow.php:144
 #, fuzzy, php-format
-msgid "Unsupported format: %s."
+msgid "Unsupported format: %s"
 msgstr "Nem támogatott formátum."
 
 #. TRANS: Client error displayed requesting a deleted status.
@@ -1153,14 +1147,13 @@ msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr ""
 
 #. TRANS: Title for site timeline. %s is the StatusNet sitename.
-#. TRANS: Public RSS feed title. %s is the StatusNet site name.
 #: actions/apitimelinepublic.php:193 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "%s közösségi története"
 
 #. TRANS: Subtitle for site timeline. %s is the StatusNet sitename.
-#: actions/apitimelinepublic.php:199
+#: actions/apitimelinepublic.php:199 actions/publicrss.php:105
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "%s-frissítések mindenki számára!"
@@ -1226,26 +1219,25 @@ msgid "Atom post must be an Atom entry."
 msgstr ""
 
 #. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
-#: actions/apitimelineuser.php:334
+#: actions/apitimelineuser.php:335
 msgid "Can only handle POST activities."
 msgstr ""
 
 #. TRANS: Client error displayed when using an unsupported activity object type.
 #. TRANS: %s is the unsupported activity object type.
-#: actions/apitimelineuser.php:345
+#: actions/apitimelineuser.php:346
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
 #. TRANS: %d is the notice ID (number).
-#: actions/apitimelineuser.php:379
+#: actions/apitimelineuser.php:380
 #, fuzzy, php-format
 msgid "No content for notice %d."
 msgstr "Keressünk a hírek tartalmában"
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#. TRANS: %s is the notice URI.
 #: actions/apitimelineuser.php:408
 #, php-format
 msgid "Notice with URI \"%s\" already exists."
@@ -1264,10 +1256,9 @@ msgstr "Az API-metódus nem található."
 
 #. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
 #. TRANS: Client exception.
-#. TRANS: Client error displayed trying to subscribe to a non-existing profile.
 #: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
 #: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
-#: actions/subscribe.php:110
+#: actions/subscribe.php:107
 msgid "No such profile."
 msgstr "Nincs ilyen profil."
 
@@ -1403,7 +1394,7 @@ msgstr "Nem sikerült törölni a kedvencet."
 #: actions/joingroup.php:95 actions/leavegroup.php:82
 #: actions/leavegroup.php:95 actions/makeadmin.php:86
 #: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:380
+#: lib/command.php:392
 msgid "No such group."
 msgstr "Nincs ilyen csoport."
 
@@ -1414,7 +1405,7 @@ msgid "Not a member."
 msgstr "Összes tag"
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
-#: actions/atompubshowmembership.php:150
+#: actions/atompubshowmembership.php:151
 #, fuzzy
 msgid "Cannot delete someone else's membership."
 msgstr "Nem sikerült törölni a kedvencet."
@@ -1519,11 +1510,9 @@ msgstr "Feltöltheted a személyes avatarodat. A fájl maximális mérete %s leh
 
 #. TRANS: Server error displayed in avatar upload page when no matching profile can be found for a user.
 #. TRANS: Server error displayed coming across a request from a user without a profile.
-#. TRANS: Server error displayed when trying to authorise a remote subscription request
-#. TRANS: while the user has no profile.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
 #: actions/grouplogo.php:184 actions/remotesubscribe.php:190
-#: actions/userauthorization.php:75 actions/userrss.php:108
+#: actions/userauthorization.php:72 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr ""
 
@@ -1581,10 +1570,10 @@ msgstr "Levágás"
 msgid "No file uploaded."
 msgstr "Nincs feltöltve fájl."
 
-#. TRANS: Avatar upload form instruction after uploading a file.
+#. TRANS: Avatar upload form unstruction after uploading a file.
 #: actions/avatarsettings.php:345
 #, fuzzy
-msgid "Pick a square area of the image to be your avatar."
+msgid "Pick a square area of the image to be your avatar"
 msgstr "Válassz ki egy négyzet alakú területet a képből, ami az avatarod lesz"
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
@@ -1626,7 +1615,7 @@ msgid "You may not backup your account."
 msgstr ""
 
 #. TRANS: Information displayed on the backup account page.
-#: actions/backupaccount.php:225
+#: actions/backupaccount.php:227
 msgid ""
 "You can backup your account data in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format. This is an experimental feature and provides "
@@ -1636,15 +1625,15 @@ msgid ""
 msgstr ""
 
 #. TRANS: Submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:248
+#: actions/backupaccount.php:250
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Backup"
 msgstr "Háttér"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:252
-msgid "Backup your account."
+#: actions/backupaccount.php:254
+msgid "Backup your account"
 msgstr ""
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
@@ -1683,7 +1672,7 @@ msgstr "Nem"
 #. TRANS: Submit button title for 'No' when blocking a user.
 #: actions/block.php:158
 #, fuzzy
-msgid "Do not block this user."
+msgid "Do not block this user"
 msgstr "Ne blokkoljuk ezt a felhasználót"
 
 #. TRANS: Button label on the user block form.
@@ -1700,9 +1689,9 @@ msgid "Yes"
 msgstr "Igen"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:165
-#, fuzzy
-msgid "Block this user."
+#. TRANS: Description of the form to block a user.
+#: actions/block.php:165 lib/blockform.php:79
+msgid "Block this user"
 msgstr "Felhasználó blokkolása"
 
 #. TRANS: Server error displayed when blocking a user fails.
@@ -1867,7 +1856,7 @@ msgstr ""
 #. TRANS: Field label for delete account confirmation entry.
 #. TRANS: Field label for password reset form where the password has to be typed again.
 #: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:262 actions/register.php:426
+#: actions/recoverpassword.php:262 actions/register.php:440
 msgid "Confirm"
 msgstr "Megerősítés"
 
@@ -1897,14 +1886,14 @@ msgstr ""
 #. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
 #: actions/deleteapplication.php:79 actions/editapplication.php:78
-#: actions/showapplication.php:90
+#: actions/showapplication.php:94
 msgid "You are not the owner of this application."
 msgstr ""
 
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
-#: actions/newapplication.php:112 actions/showapplication.php:113
-#: lib/action.php:1422
+#: actions/newapplication.php:112 actions/showapplication.php:118
+#: lib/action.php:1425
 msgid "There was a problem with your session token."
 msgstr ""
 
@@ -1925,13 +1914,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting an application.
 #: actions/deleteapplication.php:161
 #, fuzzy
-msgid "Do not delete this application."
+msgid "Do not delete this application"
 msgstr "Ne töröljük ezt a hírt"
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
 #: actions/deleteapplication.php:167
 #, fuzzy
-msgid "Delete this application."
+msgid "Delete this application"
 msgstr "Alkalmazás törlése"
 
 #. TRANS: Client error when trying to delete group while not logged in.
@@ -1989,13 +1978,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting a group.
 #: actions/deletegroup.php:224
 #, fuzzy
-msgid "Do not delete this group."
+msgid "Do not delete this group"
 msgstr "Ne töröljük ezt a hírt"
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
 #: actions/deletegroup.php:231
 #, fuzzy
-msgid "Delete this group."
+msgid "Delete this group"
 msgstr "Töröljük ezt a felhasználót"
 
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
@@ -2003,15 +1992,13 @@ msgstr "Töröljük ezt a felhasználót"
 #. TRANS: Client error displayed when trying to mark a notice as favorite without being logged in.
 #. TRANS: Client error displayed trying to block a user from a group while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
-#. TRANS: Client error displayed trying to log out when not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
-#. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
 #. TRANS: Client error displayed when trying to change user options while not logged in.
 #: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
-#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:70
+#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
-#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:98
+#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
 #: lib/adminpanelaction.php:71 lib/profileformaction.php:63
 #: lib/settingsaction.php:72
@@ -2039,13 +2026,12 @@ msgstr "Biztosan törölni szeretnéd ezt a hírt?"
 #. TRANS: Submit button title for 'No' when deleting a notice.
 #: actions/deletenotice.php:159
 #, fuzzy
-msgid "Do not delete this notice."
+msgid "Do not delete this notice"
 msgstr "Ne töröljük ezt a hírt"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:166
-#, fuzzy
-msgid "Delete this notice."
+#: actions/deletenotice.php:166 lib/noticelist.php:673
+msgid "Delete this notice"
 msgstr "Töröljük ezt a hírt"
 
 #. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
@@ -2082,13 +2068,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting a user.
 #: actions/deleteuser.php:158
 #, fuzzy
-msgid "Do not delete this user."
+msgid "Do not delete this user"
 msgstr "Ne töröljük ezt a hírt"
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
-#: actions/deleteuser.php:165
-#, fuzzy
-msgid "Delete this user."
+#. TRANS: Description of form for deleting a user.
+#: actions/deleteuser.php:165 lib/deleteuserform.php:75
+msgid "Delete this user"
 msgstr "Töröljük ezt a felhasználót"
 
 #. TRANS: Message used as title for design settings for the site.
@@ -2254,21 +2240,21 @@ msgid "Use defaults"
 msgstr "Alapértelmezések használata"
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:720
-#, fuzzy
-msgid "Restore default designs."
-msgstr "Alapértelmezések használata"
+#. TRANS: Title for button on profile design page to reset all colour settings to default.
+#: actions/designadminpanel.php:720 lib/designsettings.php:259
+msgid "Restore default designs"
+msgstr ""
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:728
-#, fuzzy
-msgid "Reset back to default."
+#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
+#: actions/designadminpanel.php:728 lib/designsettings.php:267
+msgid "Reset back to default"
 msgstr "Visszaállítás az alapértelmezettre"
 
 #. TRANS: Title for button for saving theme settings.
-#: actions/designadminpanel.php:736
-#, fuzzy
-msgid "Save design."
+#. TRANS: Title for button on profile design page to save settings.
+#: actions/designadminpanel.php:736 lib/designsettings.php:272
+msgid "Save design"
 msgstr "Design mentése"
 
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
@@ -2300,7 +2286,7 @@ msgid "You must be logged in to edit an application."
 msgstr ""
 
 #. TRANS: Client error displayed trying to edit an application that does not exist.
-#: actions/editapplication.php:83 actions/showapplication.php:83
+#: actions/editapplication.php:83 actions/showapplication.php:87
 msgid "No such application."
 msgstr "Nincs ilyen alkalmazás."
 
@@ -2584,7 +2570,7 @@ msgid "Cannot normalize that email address."
 msgstr "Nem sikerült normalizálni az e-mail címet"
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:393 actions/register.php:204
+#: actions/emailsettings.php:393 actions/register.php:212
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "Érvénytelen email cím."
@@ -2661,22 +2647,19 @@ 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.
 #: actions/emailsettings.php:530 actions/emailsettings.php:554
-#: actions/smssettings.php:566 actions/smssettings.php:591
+#: actions/smssettings.php:565 actions/smssettings.php:588
 #, fuzzy
 msgid "Could not update user record."
 msgstr "Nem sikerült frissíteni a felhasználó rekordját."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
-#. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:534 actions/smssettings.php:570
+#: actions/emailsettings.php:534 actions/smssettings.php:568
 msgid "Incoming email address removed."
 msgstr "A bejövő email címet eltávolítottuk."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
-#. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:558 actions/smssettings.php:595
+#: actions/emailsettings.php:558 actions/smssettings.php:591
 msgid "New incoming email address added."
 msgstr "Új bejövő e-mail cím hozzáadva."
 
@@ -2688,7 +2671,7 @@ msgstr "Ez a hír már a kedvenceid között van!"
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
 #: actions/favor.php:95
 #, fuzzy
-msgid "Disfavor favorite."
+msgid "Disfavor favorite"
 msgstr "Kedvenc eltávolítása"
 
 #. TRANS: Page title for first page of favorited notices.
@@ -2926,13 +2909,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
 #: actions/groupblock.php:191
 #, fuzzy
-msgid "Do not block this user from this group."
+msgid "Do not block this user from this group"
 msgstr "Ne blokkoljuk ezt a felhasználót ebből a csoportból"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
 #: actions/groupblock.php:198
 #, fuzzy
-msgid "Block this user from this group."
+msgid "Block this user from this group"
 msgstr "Felhasználó blokkolása a csoportból"
 
 #. TRANS: Server error displayed when trying to block a user from a group fails because of an application error.
@@ -2942,7 +2925,6 @@ msgstr ""
 "Adatbázishiba történt a felhasználó csoportból történő blokkolása során."
 
 #. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
-#. TRANS: Client error displayed trying to find a user by ID without providing an ID.
 #: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr "Nincs ID."
@@ -3123,10 +3105,8 @@ msgid "Group search"
 msgstr "Csoport-keresés"
 
 #. TRANS: Text on page where groups can be searched if no results were found for a query.
-#. TRANS: Text for notice search results is the query had no results.
-#. TRANS: Message on the "People search" page where a query has no results.
-#: actions/groupsearch.php:82 actions/noticesearch.php:122
-#: actions/peoplesearch.php:87
+#: actions/groupsearch.php:82 actions/noticesearch.php:117
+#: actions/peoplesearch.php:83
 msgid "No results."
 msgstr "Nincs találat."
 
@@ -3161,7 +3141,6 @@ msgid "User is not blocked from group."
 msgstr "A felhasználó nincs blokkolva a csoportból."
 
 #. TRANS: Server error displayed when unblocking a user from a group fails because of an unknown error.
-#. TRANS: Server error displayed when removing a user block.
 #: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "Hiba a blokkolás feloldása közben."
@@ -3249,8 +3228,7 @@ msgid "Publish a MicroID for my Jabber/Google Talk address."
 msgstr "MicroID közzététele az e-mail címemhez."
 
 #. TRANS: Confirmation message for successful Instant Messaging preferences save.
-#. TRANS: Confirmation message after saving preferences.
-#: actions/imsettings.php:283 actions/othersettings.php:193
+#: actions/imsettings.php:283 actions/othersettings.php:192
 msgid "Preferences saved."
 msgstr "Beállítások elmentve."
 
@@ -3514,7 +3492,7 @@ msgstr "Be kell jelentkezned hogy elhagyhass egy csoportot."
 
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
-#: actions/leavegroup.php:103 lib/command.php:386
+#: actions/leavegroup.php:103 lib/command.php:398
 msgid "You are not a member of that group."
 msgstr "Nem vagy tagja annak a csoportnak."
 
@@ -3637,53 +3615,51 @@ msgstr "Mentés"
 msgid "Save license settings"
 msgstr ""
 
-#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
-#: actions/login.php:97 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
 msgid "Already logged in."
 msgstr "Már be vagy jelentkezve."
 
-#: actions/login.php:142
+#: actions/login.php:148
 msgid "Incorrect username or password."
 msgstr "Rossz felhasználónév vagy jelszó."
 
-#. TRANS: Server error displayed when a user object could not be created trying to login using "one time password login".
-#: actions/login.php:148 actions/otp.php:127
+#: actions/login.php:154 actions/otp.php:120
 msgid "Error setting user. You are probably not authorized."
 msgstr ""
 
-#: actions/login.php:202 actions/login.php:253
+#: actions/login.php:210 actions/login.php:263
 msgid "Login"
 msgstr "Bejelentkezés"
 
-#: actions/login.php:239
+#: actions/login.php:249
 msgid "Login to site"
 msgstr "Bejelentkezés az oldalra"
 
-#: actions/login.php:248 actions/register.php:476
+#: actions/login.php:258 actions/register.php:490
 msgid "Remember me"
 msgstr "Emlékezz rám"
 
-#: actions/login.php:249 actions/register.php:478
+#: actions/login.php:259 actions/register.php:492
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 "A jövőben legyen automatikus a bejelentkezés; csak ha egyedül használod a "
 "számítógépet!"
 
-#: actions/login.php:259
+#: actions/login.php:269
 msgid "Lost or forgotten password?"
 msgstr "Elvesztetted vagy elfelejtetted a jelszavad?"
 
-#: actions/login.php:277
+#: actions/login.php:288
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
 msgstr ""
 
-#: actions/login.php:281
+#: actions/login.php:292
 msgid "Login with your username and password."
 msgstr ""
 
-#: actions/login.php:284
+#: actions/login.php:295
 #, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -3765,14 +3741,14 @@ msgid "New message"
 msgstr "Új üzenet"
 
 #. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
-#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:501
+#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:513
 msgid "You can't send a message to this user."
 msgstr "Ennek a felhasználónak nem küldhetsz üzenetet."
 
 #. TRANS: Command exception text shown when trying to send a direct message to another user without content.
 #. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
-#: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:478
-#: lib/command.php:581
+#: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:490
+#: lib/command.php:593
 msgid "No content!"
 msgstr "Nincs tartalom!"
 
@@ -3781,7 +3757,7 @@ msgid "No recipient specified."
 msgstr "Nincs címzett megadva."
 
 #. TRANS: Error text shown when trying to send a direct message to self.
-#: actions/newmessage.php:167 lib/command.php:505
+#: actions/newmessage.php:167 lib/command.php:517
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr "Ne küldj üzenetet magadnak, helyette mondd el halkan."
@@ -3792,7 +3768,7 @@ msgstr "Üzenet elküldve"
 
 #. TRANS: Message given have sent a direct message to another user.
 #. TRANS: %s is the name of the other user.
-#: actions/newmessage.php:188 lib/command.php:513
+#: actions/newmessage.php:188 lib/command.php:525
 #, php-format
 msgid "Direct message to %s sent."
 msgstr "Közvetlen üzenet ment %s részére."
@@ -3809,56 +3785,44 @@ msgstr "Új hír"
 msgid "Notice posted"
 msgstr "Hír elküldve"
 
-#. TRANS: Instructions for Notice search page.
-#. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/noticesearch.php:69
+#: actions/noticesearch.php:68
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
 "by spaces; they must be 3 characters or more."
 msgstr ""
 
-#. TRANS: Title of the page where users can search for notices.
-#: actions/noticesearch.php:80
+#: actions/noticesearch.php:78
 msgid "Text search"
 msgstr "Szöveg keresése"
 
-#. TRANS: Test in RSS notice search.
-#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearch.php:95
+#: actions/noticesearch.php:91
 #, php-format
 msgid "Search results for \"%1$s\" on %2$s"
 msgstr ""
 
-#. TRANS: Text for logged in users making a query for notices without results.
-#. TRANS: This message contains a Markdown link.
-#: actions/noticesearch.php:128
+#: actions/noticesearch.php:121
 #, php-format
 msgid ""
 "Be the first to [post on this topic](%%%%action.newnotice%%%%?"
 "status_textarea=%s)!"
 msgstr ""
 
-#. TRANS: Text for not logged in users making a query for notices without results.
-#. TRANS: This message contains Markdown links.
-#: actions/noticesearch.php:133
+#: actions/noticesearch.php:124
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and be the first to "
 "[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
 msgstr ""
 
-#. TRANS: RSS notice search feed title. %s is the query.
-#: actions/noticesearchrss.php:95
+#: actions/noticesearchrss.php:96
 #, php-format
 msgid "Updates with \"%s\""
 msgstr ""
 
-#. TRANS: RSS notice search feed description.
-#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearchrss.php:99
+#: actions/noticesearchrss.php:98
 #, php-format
-msgid "Updates matching search term \"%1$s\" on %2$s."
+msgid "Updates matching search term \"%1$s\" on %2$s!"
 msgstr ""
 
 #: actions/nudge.php:85
@@ -3897,30 +3861,30 @@ msgid "You have not registered any applications yet."
 msgstr ""
 
 #. TRANS: Title for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:70
+#: actions/oauthconnectionssettings.php:71
 msgid "Connected applications"
 msgstr ""
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:81
+#: actions/oauthconnectionssettings.php:83
 msgid "The following connections exist for your account."
 msgstr ""
 
 #. TRANS: Client error when trying to revoke access for an application while not being a user of it.
-#: actions/oauthconnectionssettings.php:166
+#: actions/oauthconnectionssettings.php:168
 msgid "You are not a user of that application."
 msgstr ""
 
 #. TRANS: Client error when revoking access has failed for some reason.
 #. TRANS: %s is the application ID revoking access failed for.
-#: actions/oauthconnectionssettings.php:181
+#: actions/oauthconnectionssettings.php:183
 #, php-format
 msgid "Unable to revoke access for application: %s."
 msgstr ""
 
 #. TRANS: Success message after revoking access for an application.
 #. TRANS: %1$s is the application name, %2$s is the first part of the user token.
-#: actions/oauthconnectionssettings.php:200
+#: actions/oauthconnectionssettings.php:202
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -3928,30 +3892,20 @@ msgid ""
 msgstr ""
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:211
+#: actions/oauthconnectionssettings.php:213
 msgid "You have not authorized any applications to use your account."
 msgstr ""
 
 #. TRANS: Note for developers in the OAuth connection settings form.
 #. TRANS: This message contains a Markdown link. Do not separate "](".
 #. TRANS: %s is the URL to the OAuth settings.
-#: actions/oauthconnectionssettings.php:231
+#: actions/oauthconnectionssettings.php:233
 #, php-format
 msgid ""
 "Are you a developer? [Register an OAuth client application](%s) to use with "
 "this instance of StatusNet."
 msgstr ""
 
-#: actions/oembed.php:64
-#, fuzzy, php-format
-msgid "\"%s\" not found."
-msgstr "Az API-metódus nem található."
-
-#: actions/oembed.php:76
-#, fuzzy, php-format
-msgid "Notice %s not found."
-msgstr "Az API-metódus nem található."
-
 #: actions/oembed.php:80 actions/shownotice.php:100
 msgid "Notice has no profile."
 msgstr ""
@@ -3961,16 +3915,6 @@ msgstr ""
 msgid "%1$s's status on %2$s"
 msgstr ""
 
-#: actions/oembed.php:95
-#, fuzzy, php-format
-msgid "Attachment %s not found."
-msgstr "A címzett felhasználó nem található."
-
-#: actions/oembed.php:136
-#, php-format
-msgid "\"%s\" not supported for oembed requests."
-msgstr ""
-
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
 #: actions/oembed.php:168
 #, php-format
@@ -3989,12 +3933,11 @@ msgstr ""
 msgid "Not a supported data format."
 msgstr "Nem támogatott adatformátum."
 
-#. TRANS: ShortName in the OpenSearch interface when trying to find users.
 #: actions/opensearch.php:64
 msgid "People Search"
 msgstr "Emberek keresése"
 
-#: actions/opensearch.php:68
+#: actions/opensearch.php:67
 msgid "Notice Search"
 msgstr "Hírek keresése"
 
@@ -4042,46 +3985,37 @@ msgstr ""
 msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr "A nyelv túl hosszú (legfeljebb 50 karakter lehet)."
 
-#. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
-#: actions/otp.php:70
+#: actions/otp.php:69
 msgid "No user ID specified."
 msgstr ""
 
-#. TRANS: Client error displayed trying to use "one time password login" without specifying a login token.
-#: actions/otp.php:86
+#: actions/otp.php:83
 msgid "No login token specified."
 msgstr ""
 
-#. TRANS: Client error displayed trying to use "one time password login" without requesting a login token.
-#: actions/otp.php:94
+#: actions/otp.php:90
 msgid "No login token requested."
 msgstr ""
 
-#. TRANS: Client error displayed trying to use "one time password login" while specifying an invalid login token.
-#: actions/otp.php:100
+#: actions/otp.php:95
 msgid "Invalid login token specified."
 msgstr ""
 
-#. TRANS: Client error displayed trying to use "one time password login" while specifying an expired login token.
-#: actions/otp.php:110
+#: actions/otp.php:104
 msgid "Login token expired."
 msgstr ""
 
-#. TRANS: Title for outbox for any but the fist page.
-#. TRANS: %1$s is the user nickname, %2$d is the page number.
-#: actions/outbox.php:57
+#: actions/outbox.php:58
 #, php-format
 msgid "Outbox for %1$s - page %2$d"
 msgstr "%1$s kimenő postafiókja - %2$d. oldal"
 
-#. TRANS: Title for first page of outbox.
 #: actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
 msgstr "%s kimenő postafiókja"
 
-#. TRANS: Instructions for outbox.
-#: actions/outbox.php:103
+#: actions/outbox.php:104
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr "Ez az elküldött privát üzeneteid postafiókja."
 
@@ -4107,45 +4041,43 @@ msgstr "Régi jelszó"
 msgid "New password"
 msgstr "Új jelszó"
 
-#: actions/passwordsettings.php:109 actions/register.php:423
+#: actions/passwordsettings.php:109
 #, fuzzy
-msgid "6 or more characters."
+msgid "6 or more characters"
 msgstr "6 vagy több karakter"
 
-#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:264
-#: actions/register.php:427
+#: actions/passwordsettings.php:113
 #, fuzzy
-msgid "Same as password above."
+msgid "Same as password above"
 msgstr "Ugyanaz mint a fenti jelszó"
 
 #: actions/passwordsettings.php:117
 msgid "Change"
 msgstr "Változtassunk"
 
-#: actions/passwordsettings.php:153 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:238
 msgid "Password must be 6 or more characters."
 msgstr "A jelszónak legalább 6 karakterből kell állnia."
 
-#: actions/passwordsettings.php:156 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:241
 msgid "Passwords don't match."
 msgstr "A jelszavak nem egyeznek."
 
-#: actions/passwordsettings.php:164
+#: actions/passwordsettings.php:165
 msgid "Incorrect old password"
 msgstr "Érvénytelen a régi jelszó"
 
-#: actions/passwordsettings.php:180
+#: actions/passwordsettings.php:181
 msgid "Error saving user; invalid."
 msgstr "Hiba a felhasználó mentésekor; érvénytelen."
 
-#. TRANS: Reset password form validation error message.
-#: actions/passwordsettings.php:185 actions/recoverpassword.php:418
+#: actions/passwordsettings.php:186
 #, fuzzy
-msgid "Cannot save new password."
+msgid "Can't save new password."
 msgstr "Az új jelszót nem sikerült elmenteni."
 
-#: actions/passwordsettings.php:191
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
 msgid "Password saved."
 msgstr "Jelszó elmentve."
 
@@ -4436,9 +4368,7 @@ msgstr ""
 msgid "Save paths"
 msgstr "Elérési útvonalak mentése"
 
-#. TRANS: Instructions for the "People search" page.
-#. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/peoplesearch.php:54
+#: actions/peoplesearch.php:52
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
@@ -4448,8 +4378,7 @@ msgstr ""
 "érdeklődési körük alapján. A kifejezéseket válaszd el szóközökkel; legalább "
 "3 betűből kell állniuk."
 
-#. TRANS: Title of a page where users can search for other users.
-#: actions/peoplesearch.php:61
+#: actions/peoplesearch.php:58
 msgid "People search"
 msgstr "Emberkereső"
 
@@ -4491,7 +4420,7 @@ msgid "Profile information"
 msgstr "Személyes profil"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109 actions/register.php:419
+#: actions/profilesettings.php:109 actions/register.php:433
 #, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr "1-64 kisbetű vagy számjegy, nem lehet benne írásjel vagy szóköz"
@@ -4499,7 +4428,7 @@ msgstr "1-64 kisbetű vagy számjegy, nem lehet benne írásjel vagy szóköz"
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for full group name (dt). Text hidden by default.
 #. TRANS: DT for full name in a profile.
-#: actions/profilesettings.php:113 actions/register.php:441
+#: actions/profilesettings.php:113 actions/register.php:455
 #: actions/showgroup.php:255 actions/tagother.php:104
 #: lib/groupeditform.php:150 lib/userprofile.php:156
 msgid "Full name"
@@ -4507,13 +4436,13 @@ msgstr "Teljes név"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:118 actions/register.php:446
+#: actions/profilesettings.php:118 actions/register.php:460
 #: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "Honlap"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:121 actions/register.php:448
+#: actions/profilesettings.php:121
 #, fuzzy
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr ""
@@ -4523,7 +4452,7 @@ msgstr ""
 #. TRANS: Tooltip for field label in form for profile settings. Plural
 #. TRANS: is decided by the number of characters available for the
 #. TRANS: biography (%d).
-#: actions/profilesettings.php:129 actions/register.php:457
+#: actions/profilesettings.php:129 actions/register.php:471
 #, fuzzy, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4531,29 +4460,28 @@ msgstr[0] "Jellemezd önmagad és az érdeklődési köröd %d karakterben"
 msgstr[1] "Jellemezd önmagad és az érdeklődési köröd %d karakterben"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:135 actions/register.php:462
+#: actions/profilesettings.php:135 actions/register.php:476
 msgid "Describe yourself and your interests"
 msgstr "Jellemezd önmagad és az érdeklődési köröd"
 
 #. TRANS: Text area label in form for profile settings where users can provide.
 #. TRANS: their biography.
-#: actions/profilesettings.php:139 actions/register.php:464
+#: actions/profilesettings.php:139 actions/register.php:478
 msgid "Bio"
 msgstr "Életrajz"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group location (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT for location in a profile.
-#: actions/profilesettings.php:145 actions/register.php:469
+#: actions/profilesettings.php:145 actions/register.php:483
 #: actions/showgroup.php:265 actions/tagother.php:112
-#: actions/userauthorization.php:174 lib/groupeditform.php:173
+#: actions/userauthorization.php:166 lib/groupeditform.php:173
 #: lib/userprofile.php:172
 msgid "Location"
 msgstr "Helyszín"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148
+#: actions/profilesettings.php:148 actions/register.php:485
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Merre vagy, mint pl. \"Város, Megye, Ország\""
 
@@ -4574,8 +4502,7 @@ msgstr "Címkék"
 #: actions/profilesettings.php:164
 #, fuzzy
 msgid ""
-"Tags for yourself (letters, numbers, -, ., and _), comma- or space- "
-"separated."
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr ""
 "Címkék magadhoz (betűk, számok, -, ., és _), vesszővel vagy szóközzel "
 "elválasztva"
@@ -4588,7 +4515,7 @@ msgstr "Nyelv"
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
 #: actions/profilesettings.php:171
 #, fuzzy
-msgid "Preferred language."
+msgid "Preferred language"
 msgstr "Előnyben részesített nyelv"
 
 #. TRANS: Dropdownlist label in form for profile settings.
@@ -4605,7 +4532,7 @@ msgstr "Általában melyik időzónában vagy?"
 #: actions/profilesettings.php:189
 #, fuzzy
 msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)."
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr ""
 "Automatikusan iratkozzunk fel mindazok híreire, aki feliratkoznak a mieinkre "
 "(nem embereknek való)"
@@ -4613,7 +4540,7 @@ msgstr ""
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Plural form is used based on the maximum number of allowed
 #. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:258 actions/register.php:221
+#: actions/profilesettings.php:258 actions/register.php:229
 #, fuzzy, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4633,9 +4560,9 @@ msgstr "A nyelv túl hosszú (legfeljebb 50 karakter lehet)."
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:291
-#, fuzzy, php-format
-msgid "Invalid tag: \"%s\"."
+#: actions/profilesettings.php:291 actions/tagother.php:178
+#, php-format
+msgid "Invalid tag: \"%s\""
 msgstr "Érvénytelen címke: \"%s\""
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
@@ -4737,12 +4664,6 @@ msgid ""
 "tool."
 msgstr ""
 
-#. TRANS: Public RSS feed description. %s is the StatusNet site name.
-#: actions/publicrss.php:106
-#, fuzzy, php-format
-msgid "%s updates from everyone."
-msgstr "%s-frissítések mindenki számára!"
-
 #. TRANS: Title for public tag cloud.
 #: actions/publictagcloud.php:57
 msgid "Public tag cloud"
@@ -4874,12 +4795,6 @@ msgstr "Elfelejtett jelszó"
 msgid "Password recovery requested"
 msgstr "Jelszó visszaállítás kérvényezve"
 
-#. TRANS: Title for password recovery page in password saved mode.
-#: actions/recoverpassword.php:229
-#, fuzzy
-msgid "Password saved"
-msgstr "Jelszó elmentve."
-
 #. TRANS: Title for password recovery page when an unknown action has been specified.
 #: actions/recoverpassword.php:232
 msgid "Unknown action"
@@ -4891,6 +4806,12 @@ msgstr "Ismeretlen művelet"
 msgid "6 or more characters, and do not forget it!"
 msgstr "6 vagy több karakter, és ne felejtsd el!"
 
+#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#: actions/recoverpassword.php:264 actions/register.php:441
+#, fuzzy
+msgid "Same as password above."
+msgstr "Ugyanaz mint a fenti jelszó"
+
 #. TRANS: Button text for password reset form.
 #. TRANS: Button text on profile design page to reset all colour settings to default without saving.
 #: actions/recoverpassword.php:268 lib/designsettings.php:264
@@ -4942,8 +4863,14 @@ msgstr "A jelszónak legalább 6 karakterből kell állnia."
 msgid "Password and confirmation do not match."
 msgstr "A jelszó és a megerősítése nem egyeznek meg."
 
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:418
+#, fuzzy
+msgid "Cannot save new password."
+msgstr "Az új jelszót nem sikerült elmenteni."
+
 #. TRANS: Server error displayed when something does wrong with the user object during password reset.
-#: actions/recoverpassword.php:426 actions/register.php:248
+#: actions/recoverpassword.php:426 actions/register.php:256
 msgid "Error setting user."
 msgstr "Hiba a felhasználó beállításakor."
 
@@ -4952,98 +4879,105 @@ msgstr "Hiba a felhasználó beállításakor."
 msgid "New password successfully saved. You are now logged in."
 msgstr ""
 
-#: actions/register.php:87 actions/register.php:188 actions/register.php:399
+#: actions/register.php:92 actions/register.php:196 actions/register.php:413
 msgid "Sorry, only invited people can register."
 msgstr "Elnézést, de csak meghívóval lehet regisztrálni."
 
-#: actions/register.php:94
+#: actions/register.php:99
 msgid "Sorry, invalid invitation code."
 msgstr ""
 
-#: actions/register.php:113
+#: actions/register.php:119
 msgid "Registration successful"
 msgstr "A regisztráció sikeres"
 
-#: actions/register.php:115 actions/register.php:497
+#: actions/register.php:121 actions/register.php:511
 msgid "Register"
 msgstr "Regisztráció"
 
-#: actions/register.php:135
+#: actions/register.php:142
 msgid "Registration not allowed."
 msgstr "A regisztráció nem megengedett."
 
-#: actions/register.php:201
+#: actions/register.php:209
 #, fuzzy
-msgid "You cannot register if you don't agree to the license."
+msgid "You can't register if you don't agree to the license."
 msgstr "Nem tudsz regisztrálni ha nem fogadod el a licencet."
 
-#: actions/register.php:210
+#: actions/register.php:218
 msgid "Email address already exists."
 msgstr "Az e-mail cím már létezik."
 
-#: actions/register.php:243 actions/register.php:265
+#: actions/register.php:251 actions/register.php:273
 msgid "Invalid username or password."
 msgstr "Érvénytelen felhasználónév vagy jelszó."
 
-#: actions/register.php:340
+#: actions/register.php:351
 msgid ""
 "With this form you can create a new account. You can then post notices and "
-"link up to friends and colleagues."
+"link up to friends and colleagues. "
 msgstr ""
 
+#: actions/register.php:437
+#, fuzzy
+msgid "6 or more characters."
+msgstr "6 vagy több karakter"
+
 #. TRANS: Link description in user account settings menu.
-#: actions/register.php:431 actions/register.php:435
+#: actions/register.php:445 actions/register.php:449
 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
 msgid "Email"
 msgstr "E-mail"
 
-#: actions/register.php:432 actions/register.php:436
+#: actions/register.php:446 actions/register.php:450
 #, fuzzy
-msgid "Used only for updates, announcements, and password recovery."
+msgid "Used only for updates, announcements, and password recovery"
 msgstr ""
 "Csak frissítéskor, fontos közlemények esetén és jelszóproblémák orvoslására "
 "használjuk"
 
-#: actions/register.php:443
+#: actions/register.php:457
 #, fuzzy
-msgid "Longer name, preferably your \"real\" name."
+msgid "Longer name, preferably your \"real\" name"
 msgstr "Hosszabb név, célszerűen a \"valódi\" neved"
 
-#: actions/register.php:471
+#: actions/register.php:462
 #, fuzzy
-msgid "Where you are, like \"City, State (or Region), Country\"."
-msgstr "Merre vagy, mint pl. \"Város, Megye, Ország\""
+msgid "URL of your homepage, blog, or profile on another site"
+msgstr ""
+"A honlapodhoz, blogodhoz, vagy egy másik webhelyen lévő profilodhoz tartozó "
+"URL"
 
-#: actions/register.php:510
+#: actions/register.php:523
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
 msgstr ""
 
-#: actions/register.php:520
+#: actions/register.php:533
 #, php-format
 msgid "My text and files are copyright by %1$s."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:524
+#: actions/register.php:537
 msgid "My text and files remain under my own copyright."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:527
+#: actions/register.php:540
 msgid "All rights reserved."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:532
+#: actions/register.php:545
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
 "email address, IM address, and phone number."
 msgstr ""
 
-#: actions/register.php:573
+#: actions/register.php:588
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -5062,7 +4996,7 @@ msgid ""
 "Thanks for signing up and we hope you enjoy using this service."
 msgstr ""
 
-#: actions/register.php:597
+#: actions/register.php:612
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5091,7 +5025,7 @@ msgid "User nickname"
 msgstr "Felhasználó beceneve"
 
 #: actions/remotesubscribe.php:129
-msgid "Nickname of the user you want to follow."
+msgid "Nickname of the user you want to follow"
 msgstr ""
 
 #: actions/remotesubscribe.php:132
@@ -5099,7 +5033,7 @@ msgid "Profile URL"
 msgstr "Profil URL"
 
 #: actions/remotesubscribe.php:133
-msgid "URL of your profile on another compatible microblogging service."
+msgid "URL of your profile on another compatible microblogging service"
 msgstr ""
 
 #. TRANS: Link text for link that will subscribe to a remote profile.
@@ -5109,7 +5043,7 @@ msgid "Subscribe"
 msgstr "Kövessük"
 
 #: actions/remotesubscribe.php:158
-msgid "Invalid profile URL (bad format)."
+msgid "Invalid profile URL (bad format)"
 msgstr ""
 
 #: actions/remotesubscribe.php:167
@@ -5151,7 +5085,6 @@ msgstr ""
 msgid "Repeated!"
 msgstr ""
 
-#. TRANS: RSS reply feed title. %s is a user nickname.
 #. TRANS: Tooltip for personal group navigation menu option when logged in for viewing @-replies.
 #: actions/replies.php:126 actions/repliesrss.php:68
 #: lib/personalgroupnav.php:109
@@ -5200,12 +5133,10 @@ msgid ""
 "newnotice%%%%?status_textarea=%3$s)."
 msgstr ""
 
-#. TRANS: RSS reply feed description.
-#. TRANS: %1$s is a user nickname, %2$s is the StatusNet site name.
-#: actions/repliesrss.php:74
-#, php-format
-msgid "Replies to %1$s on %2$s."
-msgstr ""
+#: actions/repliesrss.php:72
+#, fuzzy, php-format
+msgid "Replies to %1$s on %2$s!"
+msgstr "Frissítések %1$s felhasználótól, és barátok a következő oldalon: %2$s!"
 
 #. TRANS: Client exception displayed when trying to restore an account while not logged in.
 #: actions/restoreaccount.php:78
@@ -5304,7 +5235,7 @@ msgstr ""
 msgid "User doesn't have this role."
 msgstr ""
 
-#: actions/rsd.php:142 actions/version.php:159
+#: actions/rsd.php:146 actions/version.php:159
 msgid "StatusNet"
 msgstr "StatusNet"
 
@@ -5346,93 +5277,93 @@ msgstr ""
 msgid "Save site settings"
 msgstr "Mentsük el a webhely beállításait"
 
-#: actions/showapplication.php:78
+#: actions/showapplication.php:82
 msgid "You must be logged in to view an application."
 msgstr ""
 
-#: actions/showapplication.php:151
+#: actions/showapplication.php:157
 msgid "Application profile"
 msgstr ""
 
 #. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:153 lib/applicationeditform.php:177
+#: actions/showapplication.php:159 lib/applicationeditform.php:177
 msgid "Icon"
 msgstr "Ikon"
 
 #. TRANS: Form input field label for application name.
-#: actions/showapplication.php:163 actions/version.php:197
+#: actions/showapplication.php:169 actions/version.php:197
 #: lib/applicationeditform.php:190
 msgid "Name"
 msgstr "Név"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:172 lib/applicationeditform.php:227
+#: actions/showapplication.php:178 lib/applicationeditform.php:227
 msgid "Organization"
 msgstr "Szervezet"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:181 actions/version.php:200
+#: actions/showapplication.php:187 actions/version.php:200
 #: lib/applicationeditform.php:208 lib/groupeditform.php:168
 msgid "Description"
 msgstr "Leírás"
 
 #. TRANS: Header for group statistics on a group page (h2).
 #. TRANS: H2 text for user statistics.
-#: actions/showapplication.php:186 actions/showgroup.php:460
+#: actions/showapplication.php:192 actions/showgroup.php:460
 #: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "Statisztika"
 
-#: actions/showapplication.php:197
+#: actions/showapplication.php:203
 #, php-format
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr ""
 
-#: actions/showapplication.php:207
+#: actions/showapplication.php:213
 msgid "Application actions"
 msgstr ""
 
-#: actions/showapplication.php:230
+#: actions/showapplication.php:236
 msgid "Reset key & secret"
 msgstr ""
 
 #. TRANS: Title of form for deleting a user.
-#: actions/showapplication.php:246 lib/deletegroupform.php:121
+#: actions/showapplication.php:252 lib/deletegroupform.php:121
 #: lib/deleteuserform.php:64 lib/noticelist.php:673
 msgid "Delete"
 msgstr "Törlés"
 
-#: actions/showapplication.php:255
+#: actions/showapplication.php:261
 msgid "Application info"
 msgstr ""
 
-#: actions/showapplication.php:257
+#: actions/showapplication.php:263
 msgid "Consumer key"
 msgstr ""
 
-#: actions/showapplication.php:262
+#: actions/showapplication.php:268
 msgid "Consumer secret"
 msgstr ""
 
-#: actions/showapplication.php:267
+#: actions/showapplication.php:273
 msgid "Request token URL"
 msgstr ""
 
-#: actions/showapplication.php:272
+#: actions/showapplication.php:278
 msgid "Access token URL"
 msgstr ""
 
-#: actions/showapplication.php:277
+#: actions/showapplication.php:283
 msgid "Authorize URL"
 msgstr ""
 
-#: actions/showapplication.php:282
+#: actions/showapplication.php:288
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
 msgstr ""
 
-#: actions/showapplication.php:302
+#: actions/showapplication.php:309
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr ""
 
@@ -5517,18 +5448,16 @@ msgid "Group profile"
 msgstr "Csoportprofil"
 
 #. TRANS: Label for group URL (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT for URL in a profile.
 #: actions/showgroup.php:273 actions/tagother.php:118
-#: actions/userauthorization.php:184 lib/userprofile.php:186
+#: actions/userauthorization.php:175 lib/userprofile.php:186
 msgid "URL"
 msgstr "URL-cím"
 
 #. TRANS: Label for group description or group note (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page where bio is displayed.
 #. TRANS: DT for note in a profile.
 #: actions/showgroup.php:285 actions/tagother.php:128
-#: actions/userauthorization.php:197 lib/userprofile.php:204
+#: actions/userauthorization.php:187 lib/userprofile.php:204
 msgid "Note"
 msgstr "Megjegyzés"
 
@@ -5672,7 +5601,7 @@ msgid "%1$s tagged %2$s"
 msgstr "  %s megcímkézve"
 
 #. TRANS: Page title showing tagged notices in one user's stream.
-#. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
+#. TRANS: %1$s is the username, %2$s is the hash tag, %1$d is the page number.
 #: actions/showstream.php:74
 #, fuzzy, php-format
 msgid "%1$s tagged %2$s, page %3$d"
@@ -5913,7 +5842,7 @@ msgstr ""
 #. TRANS: Title for button to save site notice in admin panel.
 #: actions/sitenoticeadminpanel.php:201
 #, fuzzy
-msgid "Save site notice."
+msgid "Save site notice"
 msgstr "A webhely híre"
 
 #. TRANS: Title for SMS settings.
@@ -5972,7 +5901,7 @@ msgstr "SMS telefonszám"
 #. TRANS: SMS phone number input field instructions in SMS settings form.
 #: actions/smssettings.php:152
 #, fuzzy
-msgid "Phone number, no punctuation or spaces, with area code."
+msgid "Phone number, no punctuation or spaces, with area code"
 msgstr "1-64 kisbetű vagy számjegy, nem lehet benne írásjel vagy szóköz"
 
 #. TRANS: Form legend for SMS preferences form.
@@ -6134,19 +6063,15 @@ msgstr ""
 msgid "Could not save subscription."
 msgstr ""
 
-#. TRANS: Client error displayed trying to perform any request method other than POST.
-#. TRANS: Do not translate POST.
 #: actions/subscribe.php:77
 msgid "This action only accepts POST requests."
 msgstr ""
 
-#. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
-#: actions/subscribe.php:121
+#: actions/subscribe.php:117
 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
 msgstr ""
 
-#. TRANS: Page title when subscription succeeded.
-#: actions/subscribe.php:149
+#: actions/subscribe.php:145
 msgid "Subscribed"
 msgstr "Feliratkozott"
 
@@ -6296,9 +6221,8 @@ msgstr ""
 msgid "User profile"
 msgstr "Felhasználói profil"
 
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT element in area for user avatar.
-#: actions/tagother.php:81 actions/userauthorization.php:138
+#: actions/tagother.php:81 actions/userauthorization.php:132
 #: lib/userprofile.php:108
 msgid "Photo"
 msgstr "Fénykép"
@@ -6313,11 +6237,6 @@ msgid ""
 "separated"
 msgstr ""
 
-#: actions/tagother.php:178
-#, php-format
-msgid "Invalid tag: \"%s\""
-msgstr "Érvénytelen címke: \"%s\""
-
 #: actions/tagother.php:193
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
@@ -6331,7 +6250,6 @@ msgstr ""
 msgid "No such tag."
 msgstr "Nincs ilyen címke."
 
-#. TRANS: Client error displayed when trying to unblock a non-blocked user.
 #: actions/unblock.php:59
 msgid "You haven't blocked that user."
 msgstr ""
@@ -6352,7 +6270,7 @@ msgstr ""
 msgid "Unsubscribed"
 msgstr ""
 
-#: actions/updateprofile.php:64
+#: actions/updateprofile.php:64 actions/userauthorization.php:337
 #, php-format
 msgid ""
 "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
@@ -6384,7 +6302,7 @@ msgstr "Érvénytelen SSL szerver. A maximális hossz 255 karakter."
 #. TRANS: users in user admin panel. %1$s is the invalid nickname.
 #: actions/useradminpanel.php:166
 #, php-format
-msgid "Invalid default subscripton: \"%1$s\" is not a user."
+msgid "Invalid default subscripton: '%1$s' is not a user."
 msgstr ""
 
 #. TRANS: Link description in user account settings menu.
@@ -6446,140 +6364,105 @@ msgstr ""
 #. TRANS: Title for button to save user settings in user admin panel.
 #: actions/useradminpanel.php:302
 #, fuzzy
-msgid "Save user settings."
+msgid "Save user settings"
 msgstr "Mentsük el a webhely beállításait"
 
-#. TRANS: Page title.
-#: actions/userauthorization.php:109
+#: actions/userauthorization.php:105
 msgid "Authorize subscription"
 msgstr "Feliratkozás engedélyezése"
 
-#. TRANS: Page notice on "Auhtorize subscription" page.
-#: actions/userauthorization.php:115
+#: actions/userauthorization.php:110
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
 "user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
-"click \"Reject\"."
+"click “Reject”."
 msgstr ""
 
-#. TRANS: DT element on Authorise Subscription page where license is displayed.
 #. TRANS: Menu item for site administration
-#: actions/userauthorization.php:207 actions/version.php:167
+#: actions/userauthorization.php:196 actions/version.php:167
 #: lib/adminpanelaction.php:403
 msgid "License"
 msgstr "Licenc"
 
-#. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:229
+#: actions/userauthorization.php:217
 #, fuzzy
-msgctxt "BUTTON"
 msgid "Accept"
 msgstr "Elfogadás"
 
-#. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:231
-#, fuzzy
-msgid "Subscribe to this user."
-msgstr "Ezen felhasználók híreire már feliratkoztál:"
+#: actions/userauthorization.php:218 lib/subscribeform.php:115
+#: lib/subscribeform.php:139
+msgid "Subscribe to this user"
+msgstr ""
 
-#. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:233
+#: actions/userauthorization.php:219
 #, fuzzy
-msgctxt "BUTTON"
 msgid "Reject"
 msgstr "Visszautasítás"
 
-#. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:235
+#: actions/userauthorization.php:220
 #, fuzzy
-msgid "Reject this subscription."
+msgid "Reject this subscription"
 msgstr "Feliratkozás engedélyezése"
 
-#. TRANS: Client error displayed for an empty authorisation request.
-#: actions/userauthorization.php:248
+#: actions/userauthorization.php:232
 msgid "No authorization request!"
 msgstr ""
 
-#. TRANS: Accept message header from Authorise subscription page.
-#: actions/userauthorization.php:271
+#: actions/userauthorization.php:254
 msgid "Subscription authorized"
 msgstr ""
 
-#: actions/userauthorization.php:274
+#: actions/userauthorization.php:256
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to authorize the "
 "subscription. Your subscription token is:"
 msgstr ""
 
-#. TRANS: Reject message header from Authorise subscription page.
-#: actions/userauthorization.php:285
+#: actions/userauthorization.php:266
 msgid "Subscription rejected"
 msgstr ""
 
-#: actions/userauthorization.php:288
+#: actions/userauthorization.php:268
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to fully reject the "
 "subscription."
 msgstr ""
 
-#. TRANS: Exception thrown when no valid user is found for an authorisation request.
-#. TRANS: %s is a listener URI.
-#: actions/userauthorization.php:325
+#: actions/userauthorization.php:303
 #, php-format
-msgid "Listener URI \"%s\" not found here."
+msgid "Listener URI ‘%s’ not found here."
 msgstr ""
 
-#. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:332
+#: actions/userauthorization.php:308
 #, fuzzy, php-format
-msgid "Listenee URI \"%s\" is too long."
+msgid "Listenee URI ‘%s’ is too long."
 msgstr "A forrás URL túl hosszú."
 
-#. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:340
+#: actions/userauthorization.php:314
+#, fuzzy, php-format
+msgid "Listenee URI ‘%s’ is a local user."
+msgstr "A forrás URL túl hosszú."
+
+#: actions/userauthorization.php:329
 #, php-format
-msgid "Listenee URI \"%s\" is a local user."
+msgid "Profile URL ‘%s’ is for a local user."
 msgstr ""
 
-#. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
-#. TRANS: %s is a profile URL.
-#: actions/userauthorization.php:358
-#, php-format
-msgid "Profile URL \"%s\" is for a local user."
-msgstr ""
-
-#. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
-#. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
-#: actions/userauthorization.php:368
+#: actions/userauthorization.php:345
 #, fuzzy, php-format
-msgid ""
-"Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
-"\"."
-msgstr "A hír licence ‘%1$s’ nem kompatibilis a webhely licencével ‘%2$s’."
-
-#. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:378
-#, fuzzy, php-format
-msgid "Avatar URL \"%s\" is not valid."
+msgid "Avatar URL ‘%s’ is not valid."
 msgstr "A forrás URL nem érvényes."
 
-#. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:385
+#: actions/userauthorization.php:350
 #, php-format
-msgid "Cannot read avatar URL \"%s\"."
+msgid "Can’t read avatar URL ‘%s’."
 msgstr ""
 
-#. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:392
+#: actions/userauthorization.php:355
 #, php-format
-msgid "Wrong image type for avatar URL \"%s\"."
+msgid "Wrong image type for avatar URL ‘%s’."
 msgstr ""
 
 #. TRANS: Page title for profile design page.
@@ -6673,7 +6556,7 @@ msgid "Plugins"
 msgstr ""
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:898
+#: actions/version.php:198 lib/action.php:901
 msgid "Version"
 msgstr ""
 
@@ -6873,14 +6756,14 @@ msgstr ""
 
 #. TRANS: Server exception thrown when a reply cannot be saved.
 #. TRANS: %1$d is a notice ID, %2$d is the ID of the mentioned user.
-#: classes/Notice.php:1142
+#: classes/Notice.php:1144
 #, fuzzy, php-format
 msgid "Could not save reply for %1$d, %2$d."
 msgstr "Nem sikerült menteni a profilt."
 
 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1661
+#: classes/Notice.php:1663
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr ""
@@ -6894,14 +6777,14 @@ msgstr "%1$s - %2$s"
 
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:775
+#: classes/Profile.php:779
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:784
+#: classes/Profile.php:788
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -7218,53 +7101,53 @@ msgid "Page notice"
 msgstr ""
 
 #. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:871
+#: lib/action.php:874
 msgid "Secondary site navigation"
 msgstr "Másodlagos navigáció"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:877
+#: lib/action.php:880
 msgid "Help"
 msgstr "Súgó"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:880
+#: lib/action.php:883
 msgid "About"
 msgstr "Névjegy"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:883
+#: lib/action.php:886
 msgid "FAQ"
 msgstr "GyIK"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:888
+#: lib/action.php:891
 msgid "TOS"
 msgstr "Felhasználási feltételek"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:892
+#: lib/action.php:895
 msgid "Privacy"
 msgstr ""
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:895
+#: lib/action.php:898
 msgid "Source"
 msgstr "Forrás"
 
 #. TRANS: Secondary navigation menu option leading to e-mail contact information on the
 #. TRANS: StatusNet site, where to report bugs, ...
-#: lib/action.php:902
+#: lib/action.php:905
 msgid "Contact"
 msgstr "Kapcsolat"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:905
+#: lib/action.php:908
 msgid "Badge"
 msgstr ""
 
 #. TRANS: DT element for StatusNet software license.
-#: lib/action.php:934
+#: lib/action.php:937
 msgid "StatusNet software license"
 msgstr "A StatusNet szoftver licence"
 
@@ -7272,7 +7155,7 @@ msgstr "A StatusNet szoftver licence"
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:941
+#: lib/action.php:944
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7280,7 +7163,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:944
+#: lib/action.php:947
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr ""
@@ -7289,7 +7172,7 @@ msgstr ""
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:951
+#: lib/action.php:954
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7298,50 +7181,50 @@ msgid ""
 msgstr ""
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:967
+#: lib/action.php:970
 msgid "Site content license"
 msgstr "A webhely tartalmára vonatkozó licenc"
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:974
+#: lib/action.php:977
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:981
+#: lib/action.php:984
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:985
+#: lib/action.php:988
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:1017
+#: lib/action.php:1020
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
 
 #. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1353
+#: lib/action.php:1356
 msgid "Pagination"
 msgstr ""
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1364
+#: lib/action.php:1367
 msgid "After"
 msgstr "Utána"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1374
+#: lib/action.php:1377
 msgid "Before"
 msgstr "Előtte"
 
@@ -7539,23 +7422,19 @@ msgstr ""
 msgid "No application for that consumer key."
 msgstr ""
 
-#: lib/apiauth.php:202 lib/apiauth.php:284
-msgid "Not allowed to use API."
-msgstr ""
-
 #. TRANS: OAuth exception given when an incorrect access token was given for a user.
-#: lib/apiauth.php:225
+#: lib/apiauth.php:219
 msgid "Bad access token."
 msgstr ""
 
 #. TRANS: OAuth exception given when no user was found for a given token (no token was found).
-#: lib/apiauth.php:230
+#: lib/apiauth.php:224
 msgid "No user for that token."
 msgstr ""
 
 #. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel".
 #. TRANS: Client error thrown when authentication fails.
-#: lib/apiauth.php:272 lib/apiauth.php:302
+#: lib/apiauth.php:266 lib/apiauth.php:293
 msgid "Could not authenticate you."
 msgstr ""
 
@@ -7760,11 +7639,6 @@ msgstr "A jelszó megváltoztatása nem engedélyezett"
 msgid "Block"
 msgstr "Blokkolás"
 
-#. TRANS: Description of the form to block a user.
-#: lib/blockform.php:79
-msgid "Block this user"
-msgstr "Felhasználó blokkolása"
-
 #. TRANS: Title for command results.
 #: lib/channel.php:160 lib/channel.php:181
 msgid "Command results"
@@ -7793,7 +7667,7 @@ msgstr ""
 
 #. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
 #. TRANS: Error text shown when a last user notice is requested and it does not exist.
-#: lib/command.php:99 lib/command.php:630
+#: lib/command.php:99 lib/command.php:642
 msgid "User has no last notice."
 msgstr ""
 
@@ -7843,35 +7717,41 @@ msgstr ""
 "Figyelemmel követik: %2$s\n"
 "Hírek: %3$s"
 
+#. TRANS: Error message text shown when a favorite could not be set because it has already been favorited.
+#: lib/command.php:298
+#, fuzzy
+msgid "Could not create favorite: already favorited."
+msgstr "Nem sikerült létrehozni a kedvencet."
+
 #. TRANS: Text shown when a notice has been marked as favourite successfully.
-#: lib/command.php:312
+#: lib/command.php:324
 msgid "Notice marked as fave."
 msgstr "A hír kedveltként van megjelölve."
 
 #. TRANS: Message given having added a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:357
+#: lib/command.php:369
 #, php-format
 msgid "%1$s joined group %2$s."
 msgstr ""
 
 #. TRANS: Message given having removed a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:405
+#: lib/command.php:417
 #, php-format
 msgid "%1$s left group %2$s."
 msgstr ""
 
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: lib/command.php:426
+#: lib/command.php:438
 #, fuzzy, php-format
 msgctxt "WHOIS"
 msgid "%1$s (%2$s)"
 msgstr "%1$s - %2$s"
 
 #. TRANS: Whois output. %s is the full name of the queried user.
-#: lib/command.php:430
+#: lib/command.php:442
 #, php-format
 msgid "Fullname: %s"
 msgstr "Teljes név: %s"
@@ -7879,7 +7759,7 @@ msgstr "Teljes név: %s"
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a location.
-#: lib/command.php:434 lib/mail.php:270
+#: lib/command.php:446 lib/mail.php:270
 #, php-format
 msgid "Location: %s"
 msgstr "Helyszín: %s"
@@ -7887,20 +7767,20 @@ msgstr "Helyszín: %s"
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a homepage.
-#: lib/command.php:438 lib/mail.php:274
+#: lib/command.php:450 lib/mail.php:274
 #, php-format
 msgid "Homepage: %s"
 msgstr "Honlap: %s"
 
 #. TRANS: Whois output. %s is the bio information of the queried user.
-#: lib/command.php:442
+#: lib/command.php:454
 #, php-format
 msgid "About: %s"
 msgstr ""
 
 #. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).
 #. TRANS: %s is a remote profile.
-#: lib/command.php:471
+#: lib/command.php:483
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
@@ -7909,7 +7789,7 @@ msgstr ""
 
 #. TRANS: Message given if content is too long. %1$sd is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:488
+#: lib/command.php:500
 #, fuzzy, php-format
 msgid "Message too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
@@ -7917,25 +7797,25 @@ msgstr[0] "Az túl hosszú. Egy hír legfeljebb %d karakterből állhat."
 msgstr[1] "Az túl hosszú. Egy hír legfeljebb %d karakterből állhat."
 
 #. TRANS: Error text shown sending a direct message fails with an unknown reason.
-#: lib/command.php:516
+#: lib/command.php:528
 msgid "Error sending direct message."
 msgstr "Hiba a közvetlen üzenet küldése közben."
 
 #. TRANS: Message given having repeated a notice from another user.
 #. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:553
+#: lib/command.php:565
 #, php-format
 msgid "Notice from %s repeated."
 msgstr ""
 
 #. TRANS: Error text shown when repeating a notice fails with an unknown reason.
-#: lib/command.php:556
+#: lib/command.php:568
 msgid "Error repeating notice."
 msgstr "Hiba a hír ismétlésekor."
 
 #. TRANS: Message given if content of a notice for a reply is too long. %1$d is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:591
+#: lib/command.php:603
 #, fuzzy, php-format
 msgid "Notice too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Notice too long - maximum is %1$d characters, you sent %2$d."
@@ -7944,100 +7824,100 @@ msgstr[1] "Az túl hosszú. Egy hír legfeljebb %d karakterből állhat."
 
 #. TRANS: Text shown having sent a reply to a notice successfully.
 #. TRANS: %s is the nickname of the user of the notice the reply was sent to.
-#: lib/command.php:604
+#: lib/command.php:616
 #, php-format
 msgid "Reply to %s sent."
 msgstr ""
 
 #. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
-#: lib/command.php:607
+#: lib/command.php:619
 msgid "Error saving notice."
 msgstr "Hiba a hír elmentésekor."
 
 #. TRANS: Error text shown when no username was provided when issuing a subscribe command.
-#: lib/command.php:654
+#: lib/command.php:666
 msgid "Specify the name of the user to subscribe to."
 msgstr ""
 
 #. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
-#: lib/command.php:663
+#: lib/command.php:675
 msgid "Can't subscribe to OMB profiles by command."
 msgstr ""
 
 #. TRANS: Text shown after having subscribed to another user successfully.
 #. TRANS: %s is the name of the user the subscription was requested for.
-#: lib/command.php:671
+#: lib/command.php:683
 #, php-format
 msgid "Subscribed to %s."
 msgstr ""
 
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.
-#: lib/command.php:692 lib/command.php:803
+#: lib/command.php:704 lib/command.php:815
 msgid "Specify the name of the user to unsubscribe from."
 msgstr ""
 
 #. TRANS: Text shown after having unsubscribed from another user successfully.
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:703
+#: lib/command.php:715
 #, php-format
 msgid "Unsubscribed from %s."
 msgstr ""
 
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
-#: lib/command.php:723 lib/command.php:749
+#: lib/command.php:735 lib/command.php:761
 msgid "Command not yet implemented."
 msgstr ""
 
 #. TRANS: Text shown when issuing the command "off" successfully.
-#: lib/command.php:727
+#: lib/command.php:739
 msgid "Notification off."
 msgstr "Ne legyenek értesítések."
 
 #. TRANS: Error text shown when the command "off" fails for an unknown reason.
-#: lib/command.php:730
+#: lib/command.php:742
 msgid "Can't turn off notification."
 msgstr ""
 
 #. TRANS: Text shown when issuing the command "on" successfully.
-#: lib/command.php:753
+#: lib/command.php:765
 msgid "Notification on."
 msgstr "Legyenek értesítések."
 
 #. TRANS: Error text shown when the command "on" fails for an unknown reason.
-#: lib/command.php:756
+#: lib/command.php:768
 msgid "Can't turn on notification."
 msgstr ""
 
 #. TRANS: Error text shown when issuing the login command while login is disabled.
-#: lib/command.php:770
+#: lib/command.php:782
 msgid "Login command is disabled."
 msgstr ""
 
 #. TRANS: Text shown after issuing the login command successfully.
 #. TRANS: %s is a logon link..
-#: lib/command.php:783
+#: lib/command.php:795
 #, php-format
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
 
 #. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:812
+#: lib/command.php:824
 #, php-format
 msgid "Unsubscribed %s."
 msgstr ""
 
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
-#: lib/command.php:830
+#: lib/command.php:842
 msgid "You are not subscribed to anyone."
 msgstr "Senkinek sem iratkoztál fel a híreire."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
-#: lib/command.php:835
+#: lib/command.php:847
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Ezen személy híreire iratkoztál fel:"
@@ -8045,14 +7925,14 @@ msgstr[1] "Ezen emberek híreire iratkoztál fel:"
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user
 #. TRANS: (followers) without having any subscribers.
-#: lib/command.php:857
+#: lib/command.php:869
 msgid "No one is subscribed to you."
 msgstr "Senki sem követ figyelemmel."
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
-#: lib/command.php:862
+#: lib/command.php:874
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Ez a személy iratkozott fel a híreidre:"
@@ -8060,21 +7940,21 @@ msgstr[1] "Ezek az emberek iratkoztak fel a híreidre:"
 
 #. TRANS: Text shown after requesting groups a user is subscribed to without having
 #. TRANS: any group subscriptions.
-#: lib/command.php:884
+#: lib/command.php:896
 msgid "You are not a member of any groups."
 msgstr "Nem vagy tagja semmilyen csoportnak."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
-#: lib/command.php:889
+#: lib/command.php:901
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "Ennek a csoportnak vagy tagja:"
 msgstr[1] "Ezeknek a csoportoknak vagy tagja:"
 
 #. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-#: lib/command.php:904
+#: lib/command.php:916
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -8179,11 +8059,6 @@ msgstr ""
 msgid "Database error"
 msgstr "Adatbázishiba"
 
-#. TRANS: Description of form for deleting a user.
-#: lib/deleteuserform.php:75
-msgid "Delete this user"
-msgstr "Töröljük ezt a felhasználót"
-
 #. TRANS: Label in form on profile design page.
 #. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
 #: lib/designsettings.php:108
@@ -8220,21 +8095,6 @@ msgstr "Színek megváltoztatása"
 msgid "Use defaults"
 msgstr "Alapértelmezések használata"
 
-#. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: lib/designsettings.php:259
-msgid "Restore default designs"
-msgstr ""
-
-#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: lib/designsettings.php:267
-msgid "Reset back to default"
-msgstr "Visszaállítás az alapértelmezettre"
-
-#. TRANS: Title for button on profile design page to save settings.
-#: lib/designsettings.php:272
-msgid "Save design"
-msgstr "Design mentése"
-
 #. TRANS: Error message displayed if design settings could not be saved.
 #. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
 #: lib/designsettings.php:405 lib/designsettings.php:427
@@ -9081,10 +8941,6 @@ msgstr "Válaszoljunk erre a hírre"
 msgid "Reply"
 msgstr "Válasz"
 
-#: lib/noticelist.php:673
-msgid "Delete this notice"
-msgstr "Töröljük ezt a hírt"
-
 #: lib/noticelist.php:691
 msgid "Notice repeated"
 msgstr "A hírt megismételtük"
@@ -9366,10 +9222,6 @@ msgstr "Meghívás"
 msgid "Invite friends and colleagues to join you on %s"
 msgstr ""
 
-#: lib/subscribeform.php:115 lib/subscribeform.php:139
-msgid "Subscribe to this user"
-msgstr ""
-
 #: lib/subscriberspeopleselftagcloudsection.php:48
 #: lib/subscriptionspeopleselftagcloudsection.php:48
 msgid "People Tagcloud as self-tagged"
@@ -9539,23 +9391,18 @@ msgctxt "role"
 msgid "Moderator"
 msgstr "Moderátor"
 
-#: lib/util.php:305
-#, fuzzy
-msgid "Not allowed to log in."
-msgstr "Nem vagy bejelentkezve."
-
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1309
+#: lib/util.php:1306
 msgid "a few seconds ago"
 msgstr "pár másodperce"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1312
+#: lib/util.php:1309
 msgid "about a minute ago"
 msgstr "körülbelül egy perce"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1316
+#: lib/util.php:1313
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
@@ -9563,12 +9410,12 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1319
+#: lib/util.php:1316
 msgid "about an hour ago"
 msgstr "körülbelül egy órája"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1323
+#: lib/util.php:1320
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
@@ -9576,12 +9423,12 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1326
+#: lib/util.php:1323
 msgid "about a day ago"
 msgstr "körülbelül egy napja"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1330
+#: lib/util.php:1327
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
@@ -9589,12 +9436,12 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1333
+#: lib/util.php:1330
 msgid "about a month ago"
 msgstr "körülbelül egy hónapja"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1337
+#: lib/util.php:1334
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
@@ -9602,7 +9449,7 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1340
+#: lib/util.php:1337
 msgid "about a year ago"
 msgstr "körülbelül egy éve"
 
@@ -9644,3 +9491,73 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#, fuzzy
+#~ msgid "Block this user."
+#~ msgstr "Felhasználó blokkolása"
+
+#, fuzzy
+#~ msgid "Delete this notice."
+#~ msgstr "Töröljük ezt a hírt"
+
+#, fuzzy
+#~ msgid "Delete this user."
+#~ msgstr "Töröljük ezt a felhasználót"
+
+#, fuzzy
+#~ msgid "Restore default designs."
+#~ msgstr "Alapértelmezések használata"
+
+#, fuzzy
+#~ msgid "Reset back to default."
+#~ msgstr "Visszaállítás az alapértelmezettre"
+
+#, fuzzy
+#~ msgid "Save design."
+#~ msgstr "Design mentése"
+
+#, fuzzy
+#~ msgid "Disfavor favorite."
+#~ msgstr "Kedvenc eltávolítása"
+
+#, fuzzy
+#~ msgid "\"%s\" not found."
+#~ msgstr "Az API-metódus nem található."
+
+#, fuzzy
+#~ msgid "Notice %s not found."
+#~ msgstr "Az API-metódus nem található."
+
+#, fuzzy
+#~ msgid "Attachment %s not found."
+#~ msgstr "A címzett felhasználó nem található."
+
+#, fuzzy
+#~ msgid "Invalid tag: \"%s\"."
+#~ msgstr "Érvénytelen címke: \"%s\""
+
+#, fuzzy
+#~ msgid "%s updates from everyone."
+#~ msgstr "%s-frissítések mindenki számára!"
+
+#, fuzzy
+#~ msgid "Password saved"
+#~ msgstr "Jelszó elmentve."
+
+#, fuzzy
+#~ msgid "Where you are, like \"City, State (or Region), Country\"."
+#~ msgstr "Merre vagy, mint pl. \"Város, Megye, Ország\""
+
+#, fuzzy
+#~ msgid "Subscribe to this user."
+#~ msgstr "Ezen felhasználók híreire már feliratkoztál:"
+
+#, fuzzy
+#~ msgid ""
+#~ "Listenee stream license \"%1$s\" is not compatible with site license \"%2"
+#~ "$s\"."
+#~ msgstr "A hír licence ‘%1$s’ nem kompatibilis a webhely licencével ‘%2$s’."
+
+#, fuzzy
+#~ msgid "Not allowed to log in."
+#~ msgstr "Nem vagy bejelentkezve."
diff --git a/locale/ia/LC_MESSAGES/statusnet.po b/locale/ia/LC_MESSAGES/statusnet.po
index 5c718d489c..0cff547124 100644
--- a/locale/ia/LC_MESSAGES/statusnet.po
+++ b/locale/ia/LC_MESSAGES/statusnet.po
@@ -9,17 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-24 10:32+0000\n"
-"PO-Revision-Date: 2011-02-24 10:36:53+0000\n"
+"POT-Creation-Date: 2011-03-03 15:58+0000\n"
+"PO-Revision-Date: 2011-03-03 16:00:51+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r82712); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-02-17 11:39:54+0000\n"
+"X-POT-Import-Date: 2011-02-25 23:49:23+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -131,11 +131,7 @@ msgstr "Pagina non existe."
 #. 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 use "one time password login" without using an existing user.
-#. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
-#. TRANS: Client error displayed trying to find a user by ID for a non-existing ID.
-#. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when calling a profile action without specifying a user.
 #: actions/all.php:80 actions/allrss.php:69
@@ -153,12 +149,12 @@ msgstr "Pagina non existe."
 #: actions/apitimelinementions.php:77 actions/apitimelineuser.php:79
 #: actions/avatarbynickname.php:79 actions/favoritesrss.php:72
 #: actions/foaf.php:42 actions/foaf.php:61 actions/hcard.php:67
-#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:78
+#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
 #: actions/remotesubscribe.php:144 actions/remotesubscribe.php:153
-#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:113
-#: actions/showfavorites.php:106 actions/userbyid.php:75
+#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
+#: actions/showfavorites.php:106 actions/userbyid.php:74
 #: actions/usergroups.php:93 actions/userrss.php:40 actions/userxrd.php:59
-#: actions/xrds.php:71 lib/command.php:497 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:509 lib/galleryaction.php:59
 #: lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Iste usator non existe."
@@ -288,7 +284,7 @@ msgstr "Actualisationes de %1$s e su amicos in %2$s!"
 #: actions/apigrouplistall.php:120 actions/apigroupmembership.php:105
 #: actions/apigroupshow.php:114 actions/apihelptest.php:84
 #: actions/apistatusesdestroy.php:101 actions/apistatusesretweets.php:110
-#: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:138
+#: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:139
 #: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
 #: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:268
 #: actions/apitimelinegroup.php:147 actions/apitimelinehome.php:173
@@ -521,7 +517,8 @@ msgstr "Usator destinatario non trovate."
 
 #. TRANS: Client error displayed trying to direct message another user who's not a friend (403).
 #: actions/apidirectmessagenew.php:144
-msgid "Cannot send direct messages to users who aren't your friend."
+#, fuzzy
+msgid "Can't send direct messages to users who aren't your friend."
 msgstr "Non pote inviar messages directe a usatores que non es tu amicos."
 
 #. TRANS: Client error displayed trying to direct message self (403).
@@ -546,7 +543,7 @@ msgstr "Iste stato es ja favorite."
 #. TRANS: Client error displayed when marking a notice as favourite fails.
 #. TRANS: Server error displayed when trying to mark a notice as favorite fails in the database.
 #. TRANS: Error message text shown when a favorite could not be set.
-#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:294
+#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:306
 msgid "Could not create favorite."
 msgstr "Non poteva crear le favorite."
 
@@ -604,7 +601,7 @@ msgstr "Non poteva trovar le usator de destination."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:191
 #: actions/newgroup.php:137 actions/profilesettings.php:273
-#: actions/register.php:206
+#: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "Pseudonymo ja in uso. Proba un altere."
 
@@ -614,7 +611,7 @@ msgstr "Pseudonymo ja in uso. Proba un altere."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:195
 #: actions/newgroup.php:141 actions/profilesettings.php:243
-#: actions/register.php:208
+#: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "Non un pseudonymo valide."
 
@@ -627,7 +624,7 @@ msgstr "Non un pseudonymo valide."
 #: actions/apigroupcreate.php:181 actions/editapplication.php:235
 #: actions/editgroup.php:202 actions/newapplication.php:221
 #: actions/newgroup.php:148 actions/profilesettings.php:248
-#: actions/register.php:215
+#: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "Le pagina personal non es un URL valide."
 
@@ -637,7 +634,7 @@ msgstr "Le pagina personal non es un URL valide."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:191 actions/editgroup.php:206
 #: actions/newgroup.php:152 actions/profilesettings.php:252
-#: actions/register.php:218
+#: actions/register.php:226
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "Le nomine complete es troppo longe (maximo 255 characteres)."
 
@@ -665,7 +662,7 @@ msgstr[1] "Description es troppo longe (maximo %d characteres)."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:215 actions/editgroup.php:218
 #: actions/newgroup.php:164 actions/profilesettings.php:265
-#: actions/register.php:227
+#: actions/register.php:235
 msgid "Location is too long (maximum 255 characters)."
 msgstr "Loco es troppo longe (maximo 255 characteres)."
 
@@ -721,14 +718,14 @@ msgstr "Gruppo non trovate."
 #. TRANS: Server error displayed when trying to join a group the user is already a member of.
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:333
+#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:345
 msgid "You are already a member of that group."
 msgstr "Tu es ja membro de iste gruppo."
 
 #. TRANS: Server error displayed when trying to join a group the user is blocked from joining.
 #. 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.
-#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:338
+#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:350
 msgid "You have been blocked from that group by the admin."
 msgstr "Le administrator te ha blocate de iste gruppo."
 
@@ -738,7 +735,7 @@ msgstr "Le administrator te ha blocate de iste gruppo."
 #. TRANS: %1$s is the joining user's nickname, $2$s is the group nickname for which the join failed.
 #. TRANS: Message given having failed to add a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:350
+#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:362
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "Non poteva inscriber le usator %1$s in le gruppo %2$s."
@@ -755,7 +752,7 @@ msgstr "Tu non es membro de iste gruppo."
 #. TRANS: Message given having failed to remove a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
 #: actions/apigroupleave.php:127 actions/leavegroup.php:133
-#: lib/command.php:398
+#: lib/command.php:410
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
 msgstr "Non poteva remover le usator %1$s del gruppo %2$s."
@@ -815,21 +812,20 @@ msgstr "Indicio de requesta jam autorisate."
 #. TRANS: Form validation error message.
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
-#. TRANS: Client error displayed when the session token is not okay.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
 #: actions/deletenotice.php:177 actions/disfavor.php:75
 #: actions/emailsettings.php:291 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:65 actions/grouplogo.php:321
 #: actions/groupunblock.php:65 actions/imsettings.php:224
-#: actions/invite.php:60 actions/login.php:131 actions/makeadmin.php:66
+#: actions/invite.php:60 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
-#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:136
-#: actions/othersettings.php:155 actions/passwordsettings.php:137
+#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
+#: actions/othersettings.php:155 actions/passwordsettings.php:138
 #: actions/profilesettings.php:217 actions/recoverpassword.php:383
-#: actions/register.php:164 actions/remotesubscribe.php:76
+#: actions/register.php:172 actions/remotesubscribe.php:76
 #: actions/repeat.php:82 actions/smssettings.php:250 actions/subedit.php:40
-#: actions/subscribe.php:87 actions/tagother.php:166
-#: actions/unsubscribe.php:69 actions/userauthorization.php:53
+#: actions/subscribe.php:86 actions/tagother.php:166
+#: actions/unsubscribe.php:69 actions/userauthorization.php:52
 #: lib/designsettings.php:310
 msgid "There was a problem with your session token. Try again, please."
 msgstr "Occurreva un problema con le indicio de tu session. Per favor reproba."
@@ -861,7 +857,7 @@ msgstr ""
 #: actions/designadminpanel.php:100 actions/editapplication.php:144
 #: actions/emailsettings.php:310 actions/grouplogo.php:332
 #: actions/imsettings.php:239 actions/newapplication.php:124
-#: actions/oauthconnectionssettings.php:145 actions/recoverpassword.php:46
+#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
 #: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
 msgstr "Submission de formulario inexpectate."
@@ -912,20 +908,19 @@ msgstr "Conto"
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group nickname (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT for nick name in a profile.
-#: actions/apioauthauthorize.php:459 actions/login.php:242
-#: actions/profilesettings.php:106 actions/register.php:418
+#: actions/apioauthauthorize.php:459 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:432
 #: actions/showgroup.php:243 actions/tagother.php:94
-#: actions/userauthorization.php:152 lib/groupeditform.php:145
+#: actions/userauthorization.php:145 lib/groupeditform.php:145
 #: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "Pseudonymo"
 
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:463 actions/login.php:245
-#: actions/register.php:422 lib/accountsettingsaction.php:120
+#: actions/apioauthauthorize.php:463 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:120
 msgid "Password"
 msgstr "Contrasigno"
 
@@ -1020,13 +1015,13 @@ msgstr "Nota non trovate."
 
 #. TRANS: Client error displayed trying to repeat an own notice through the API.
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:537
+#: actions/apistatusesretweet.php:83 lib/command.php:549
 msgid "Cannot repeat your own notice."
 msgstr "Non pote repeter tu proprie nota."
 
 #. TRANS: Client error displayed trying to re-repeat a notice through the API.
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:92 lib/command.php:543
+#: actions/apistatusesretweet.php:92 lib/command.php:555
 msgid "Already repeated that notice."
 msgstr "Iste nota ha ja essite repetite."
 
@@ -1047,8 +1042,8 @@ msgstr "Methodo HTTP non supportate."
 #. TRANS: Exception thrown requesting an unsupported notice output format.
 #. TRANS: %s is the requested output format.
 #: actions/apistatusesshow.php:144
-#, php-format
-msgid "Unsupported format: %s."
+#, fuzzy, php-format
+msgid "Unsupported format: %s"
 msgstr "Formato non supportate: %s."
 
 #. TRANS: Client error displayed requesting a deleted status.
@@ -1156,14 +1151,13 @@ msgstr ""
 "Actualisationes de %1$s que responde al actualisationes de %2$s / %3$s."
 
 #. TRANS: Title for site timeline. %s is the StatusNet sitename.
-#. TRANS: Public RSS feed title. %s is the StatusNet site name.
 #: actions/apitimelinepublic.php:193 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "Chronologia public de %s"
 
 #. TRANS: Subtitle for site timeline. %s is the StatusNet sitename.
-#: actions/apitimelinepublic.php:199
+#: actions/apitimelinepublic.php:199 actions/publicrss.php:105
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "Actualisationes de totes in %s!"
@@ -1228,26 +1222,25 @@ msgid "Atom post must be an Atom entry."
 msgstr "Message Atom debe esser un entrata Atom."
 
 #. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
-#: actions/apitimelineuser.php:334
+#: actions/apitimelineuser.php:335
 msgid "Can only handle POST activities."
 msgstr "Solmente le activitates POST es possibile."
 
 #. TRANS: Client error displayed when using an unsupported activity object type.
 #. TRANS: %s is the unsupported activity object type.
-#: actions/apitimelineuser.php:345
+#: actions/apitimelineuser.php:346
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr "Impossibile manear le typo de objecto de activitate \"%s\"."
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
 #. TRANS: %d is the notice ID (number).
-#: actions/apitimelineuser.php:379
+#: actions/apitimelineuser.php:380
 #, php-format
 msgid "No content for notice %d."
 msgstr "Nulle contento pro nota %d."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#. TRANS: %s is the notice URI.
 #: actions/apitimelineuser.php:408
 #, php-format
 msgid "Notice with URI \"%s\" already exists."
@@ -1265,10 +1258,9 @@ msgstr "Usator non trovate."
 
 #. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
 #. TRANS: Client exception.
-#. TRANS: Client error displayed trying to subscribe to a non-existing profile.
 #: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
 #: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
-#: actions/subscribe.php:110
+#: actions/subscribe.php:107
 msgid "No such profile."
 msgstr "Profilo non existe."
 
@@ -1393,7 +1385,7 @@ msgstr "Non pote deler le favorite de un altere persona."
 #: actions/joingroup.php:95 actions/leavegroup.php:82
 #: actions/leavegroup.php:95 actions/makeadmin.php:86
 #: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:380
+#: lib/command.php:392
 msgid "No such group."
 msgstr "Gruppo non existe."
 
@@ -1403,7 +1395,7 @@ msgid "Not a member."
 msgstr "Non es membro."
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
-#: actions/atompubshowmembership.php:150
+#: actions/atompubshowmembership.php:151
 msgid "Cannot delete someone else's membership."
 msgstr "Non pote deler le membrato de un altere persona."
 
@@ -1507,11 +1499,9 @@ msgstr ""
 
 #. TRANS: Server error displayed in avatar upload page when no matching profile can be found for a user.
 #. TRANS: Server error displayed coming across a request from a user without a profile.
-#. TRANS: Server error displayed when trying to authorise a remote subscription request
-#. TRANS: while the user has no profile.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
 #: actions/grouplogo.php:184 actions/remotesubscribe.php:190
-#: actions/userauthorization.php:75 actions/userrss.php:108
+#: actions/userauthorization.php:72 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr "Usator sin profilo correspondente"
 
@@ -1566,9 +1556,10 @@ msgstr "Taliar"
 msgid "No file uploaded."
 msgstr "Nulle file incargate."
 
-#. TRANS: Avatar upload form instruction after uploading a file.
+#. TRANS: Avatar upload form unstruction after uploading a file.
 #: actions/avatarsettings.php:345
-msgid "Pick a square area of the image to be your avatar."
+#, fuzzy
+msgid "Pick a square area of the image to be your avatar"
 msgstr "Selige un area quadrate del imagine pro facer lo tu avatar."
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
@@ -1610,7 +1601,7 @@ msgid "You may not backup your account."
 msgstr "Tu non pote facer un copia de reserva de tu conto."
 
 #. TRANS: Information displayed on the backup account page.
-#: actions/backupaccount.php:225
+#: actions/backupaccount.php:227
 msgid ""
 "You can backup your account data in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format. This is an experimental feature and provides "
@@ -1625,14 +1616,15 @@ msgstr ""
 "addition, le files incargate e le messages directe non es copiate."
 
 #. TRANS: Submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:248
+#: actions/backupaccount.php:250
 msgctxt "BUTTON"
 msgid "Backup"
 msgstr "Copia de reserva"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:252
-msgid "Backup your account."
+#: actions/backupaccount.php:254
+#, fuzzy
+msgid "Backup your account"
 msgstr "Facer un copia de reserva de tu conto."
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
@@ -1673,7 +1665,8 @@ msgstr "No"
 
 #. TRANS: Submit button title for 'No' when blocking a user.
 #: actions/block.php:158
-msgid "Do not block this user."
+#, fuzzy
+msgid "Do not block this user"
 msgstr "Non blocar iste usator."
 
 #. TRANS: Button label on the user block form.
@@ -1690,9 +1683,10 @@ msgid "Yes"
 msgstr "Si"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:165
-msgid "Block this user."
-msgstr "Blocar iste usator."
+#. TRANS: Description of the form to block a user.
+#: actions/block.php:165 lib/blockform.php:79
+msgid "Block this user"
+msgstr "Blocar iste usator"
 
 #. TRANS: Server error displayed when blocking a user fails.
 #: actions/block.php:189
@@ -1854,7 +1848,7 @@ msgstr ""
 #. TRANS: Field label for delete account confirmation entry.
 #. TRANS: Field label for password reset form where the password has to be typed again.
 #: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:262 actions/register.php:426
+#: actions/recoverpassword.php:262 actions/register.php:440
 msgid "Confirm"
 msgstr "Confirmar"
 
@@ -1883,14 +1877,14 @@ msgstr "Application non trovate."
 #. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
 #: actions/deleteapplication.php:79 actions/editapplication.php:78
-#: actions/showapplication.php:90
+#: actions/showapplication.php:94
 msgid "You are not the owner of this application."
 msgstr "Tu non es le proprietario de iste application."
 
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
-#: actions/newapplication.php:112 actions/showapplication.php:113
-#: lib/action.php:1422
+#: actions/newapplication.php:112 actions/showapplication.php:118
+#: lib/action.php:1425
 msgid "There was a problem with your session token."
 msgstr "Il habeva un problema con tu indicio de session."
 
@@ -1913,12 +1907,14 @@ msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting an application.
 #: actions/deleteapplication.php:161
-msgid "Do not delete this application."
+#, fuzzy
+msgid "Do not delete this application"
 msgstr "Non deler iste application."
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
 #: actions/deleteapplication.php:167
-msgid "Delete this application."
+#, fuzzy
+msgid "Delete this application"
 msgstr "Deler iste application."
 
 #. TRANS: Client error when trying to delete group while not logged in.
@@ -1972,12 +1968,14 @@ msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting a group.
 #: actions/deletegroup.php:224
-msgid "Do not delete this group."
+#, fuzzy
+msgid "Do not delete this group"
 msgstr "Non deler iste gruppo."
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
 #: actions/deletegroup.php:231
-msgid "Delete this group."
+#, fuzzy
+msgid "Delete this group"
 msgstr "Deler iste gruppo."
 
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
@@ -1985,15 +1983,13 @@ msgstr "Deler iste gruppo."
 #. TRANS: Client error displayed when trying to mark a notice as favorite without being logged in.
 #. TRANS: Client error displayed trying to block a user from a group while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
-#. TRANS: Client error displayed trying to log out when not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
-#. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
 #. TRANS: Client error displayed when trying to change user options while not logged in.
 #: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
-#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:70
+#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
-#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:98
+#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
 #: lib/adminpanelaction.php:71 lib/profileformaction.php:63
 #: lib/settingsaction.php:72
@@ -2022,13 +2018,14 @@ msgstr "Es tu secur de voler deler iste nota?"
 
 #. TRANS: Submit button title for 'No' when deleting a notice.
 #: actions/deletenotice.php:159
-msgid "Do not delete this notice."
+#, fuzzy
+msgid "Do not delete this notice"
 msgstr "Non deler iste nota."
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:166
-msgid "Delete this notice."
-msgstr "Deler iste nota."
+#: actions/deletenotice.php:166 lib/noticelist.php:673
+msgid "Delete this notice"
+msgstr "Deler iste nota"
 
 #. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
 #: actions/deleteuser.php:66
@@ -2062,13 +2059,15 @@ msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting a user.
 #: actions/deleteuser.php:158
-msgid "Do not delete this user."
+#, fuzzy
+msgid "Do not delete this user"
 msgstr "Non deler iste usator."
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
-#: actions/deleteuser.php:165
-msgid "Delete this user."
-msgstr "Deler iste usator."
+#. TRANS: Description of form for deleting a user.
+#: actions/deleteuser.php:165 lib/deleteuserform.php:75
+msgid "Delete this user"
+msgstr "Deler iste usator"
 
 #. TRANS: Message used as title for design settings for the site.
 #. TRANS: Link description in user account settings menu.
@@ -2233,19 +2232,22 @@ msgid "Use defaults"
 msgstr "Usar predefinitiones"
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:720
-msgid "Restore default designs."
-msgstr "Restaurar apparentias predefinite."
+#. TRANS: Title for button on profile design page to reset all colour settings to default.
+#: actions/designadminpanel.php:720 lib/designsettings.php:259
+msgid "Restore default designs"
+msgstr "Restaurar apparentias predefinite"
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:728
-msgid "Reset back to default."
-msgstr "Revenir al predefinitiones."
+#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
+#: actions/designadminpanel.php:728 lib/designsettings.php:267
+msgid "Reset back to default"
+msgstr "Revenir al predefinitiones"
 
 #. TRANS: Title for button for saving theme settings.
-#: actions/designadminpanel.php:736
-msgid "Save design."
-msgstr "Salveguardar apparentia."
+#. TRANS: Title for button on profile design page to save settings.
+#: actions/designadminpanel.php:736 lib/designsettings.php:272
+msgid "Save design"
+msgstr "Salveguardar apparentia"
 
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
 #: actions/disfavor.php:83
@@ -2276,7 +2278,7 @@ msgid "You must be logged in to edit an application."
 msgstr "Tu debe aperir un session pro modificar un application."
 
 #. TRANS: Client error displayed trying to edit an application that does not exist.
-#: actions/editapplication.php:83 actions/showapplication.php:83
+#: actions/editapplication.php:83 actions/showapplication.php:87
 msgid "No such application."
 msgstr "Application non trovate."
 
@@ -2557,7 +2559,7 @@ msgid "Cannot normalize that email address."
 msgstr "Non pote normalisar iste adresse de e-mail."
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:393 actions/register.php:204
+#: actions/emailsettings.php:393 actions/register.php:212
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "Adresse de e-mail invalide."
@@ -2632,21 +2634,18 @@ msgstr "Nulle adresse de e-mail entrante."
 
 #. 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.
 #: actions/emailsettings.php:530 actions/emailsettings.php:554
-#: actions/smssettings.php:566 actions/smssettings.php:591
+#: actions/smssettings.php:565 actions/smssettings.php:588
 msgid "Could not update user record."
 msgstr "Non poteva actualisar le datos del usator."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
-#. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:534 actions/smssettings.php:570
+#: actions/emailsettings.php:534 actions/smssettings.php:568
 msgid "Incoming email address removed."
 msgstr "Adresse de e-mail entrante removite."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
-#. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:558 actions/smssettings.php:595
+#: actions/emailsettings.php:558 actions/smssettings.php:591
 msgid "New incoming email address added."
 msgstr "Nove adresse de e-mail entrante addite."
 
@@ -2657,8 +2656,9 @@ msgstr "Iste nota es ja favorite!"
 
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
 #: actions/favor.php:95
-msgid "Disfavor favorite."
-msgstr "Disfavorir favorite."
+#, fuzzy
+msgid "Disfavor favorite"
+msgstr "Disfavorir favorite"
 
 #. TRANS: Page title for first page of favorited notices.
 #. TRANS: Title for favourited notices section.
@@ -2897,12 +2897,14 @@ msgstr ""
 
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
 #: actions/groupblock.php:191
-msgid "Do not block this user from this group."
+#, fuzzy
+msgid "Do not block this user from this group"
 msgstr "Non blocar iste usator de iste gruppo."
 
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
 #: actions/groupblock.php:198
-msgid "Block this user from this group."
+#, fuzzy
+msgid "Block this user from this group"
 msgstr "Blocar iste usator de iste gruppo."
 
 #. TRANS: Server error displayed when trying to block a user from a group fails because of an application error.
@@ -2911,7 +2913,6 @@ msgid "Database error blocking user from group."
 msgstr "Error del base de datos al blocar le usator del gruppo."
 
 #. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
-#. TRANS: Client error displayed trying to find a user by ID without providing an ID.
 #: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr "Nulle ID."
@@ -3098,10 +3099,8 @@ msgid "Group search"
 msgstr "Recerca de gruppos"
 
 #. TRANS: Text on page where groups can be searched if no results were found for a query.
-#. TRANS: Text for notice search results is the query had no results.
-#. TRANS: Message on the "People search" page where a query has no results.
-#: actions/groupsearch.php:82 actions/noticesearch.php:122
-#: actions/peoplesearch.php:87
+#: actions/groupsearch.php:82 actions/noticesearch.php:117
+#: actions/peoplesearch.php:83
 msgid "No results."
 msgstr "Nulle resultato."
 
@@ -3138,7 +3137,6 @@ msgid "User is not blocked from group."
 msgstr "Le usator non es blocate del gruppo."
 
 #. TRANS: Server error displayed when unblocking a user from a group fails because of an unknown error.
-#. TRANS: Server error displayed when removing a user block.
 #: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "Error de remover le blocada."
@@ -3230,8 +3228,7 @@ msgid "Publish a MicroID for my Jabber/Google Talk address."
 msgstr "Publicar un MicroID pro mi adresse Jabber/Google Talk."
 
 #. TRANS: Confirmation message for successful Instant Messaging preferences save.
-#. TRANS: Confirmation message after saving preferences.
-#: actions/imsettings.php:283 actions/othersettings.php:193
+#: actions/imsettings.php:283 actions/othersettings.php:192
 msgid "Preferences saved."
 msgstr "Preferentias confirmate."
 
@@ -3519,7 +3516,7 @@ msgstr "Tu debe aperir un session pro quitar un gruppo."
 
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
-#: actions/leavegroup.php:103 lib/command.php:386
+#: actions/leavegroup.php:103 lib/command.php:398
 msgid "You are not a member of that group."
 msgstr "Tu non es membro de iste gruppo."
 
@@ -3643,44 +3640,42 @@ msgstr "Salveguardar"
 msgid "Save license settings"
 msgstr "Salveguardar configurationes de licentia"
 
-#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
-#: actions/login.php:97 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
 msgid "Already logged in."
 msgstr "Tu es jam authenticate."
 
-#: actions/login.php:142
+#: actions/login.php:148
 msgid "Incorrect username or password."
 msgstr "Nomine de usator o contrasigno incorrecte."
 
-#. TRANS: Server error displayed when a user object could not be created trying to login using "one time password login".
-#: actions/login.php:148 actions/otp.php:127
+#: actions/login.php:154 actions/otp.php:120
 msgid "Error setting user. You are probably not authorized."
 msgstr ""
 "Error de acceder al conto de usator. Tu probabilemente non es autorisate."
 
-#: actions/login.php:202 actions/login.php:253
+#: actions/login.php:210 actions/login.php:263
 msgid "Login"
 msgstr "Aperir session"
 
-#: actions/login.php:239
+#: actions/login.php:249
 msgid "Login to site"
 msgstr "Authenticar te a iste sito"
 
-#: actions/login.php:248 actions/register.php:476
+#: actions/login.php:258 actions/register.php:490
 msgid "Remember me"
 msgstr "Memorar me"
 
-#: actions/login.php:249 actions/register.php:478
+#: actions/login.php:259 actions/register.php:492
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 "Aperir session automaticamente in le futuro; non pro computatores usate in "
 "commun!"
 
-#: actions/login.php:259
+#: actions/login.php:269
 msgid "Lost or forgotten password?"
 msgstr "Contrasigno perdite o oblidate?"
 
-#: actions/login.php:277
+#: actions/login.php:288
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -3688,11 +3683,11 @@ msgstr ""
 "Pro motivos de securitate, per favor re-entra tu nomine de usator e "
 "contrasigno ante de cambiar tu configurationes."
 
-#: actions/login.php:281
+#: actions/login.php:292
 msgid "Login with your username and password."
 msgstr "Aperi un session con tu nomine de usator e contrasigno."
 
-#: actions/login.php:284
+#: actions/login.php:295
 #, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -3772,14 +3767,14 @@ msgid "New message"
 msgstr "Nove message"
 
 #. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
-#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:501
+#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:513
 msgid "You can't send a message to this user."
 msgstr "Tu non pote inviar un message a iste usator."
 
 #. TRANS: Command exception text shown when trying to send a direct message to another user without content.
 #. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
-#: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:478
-#: lib/command.php:581
+#: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:490
+#: lib/command.php:593
 msgid "No content!"
 msgstr "Nulle contento!"
 
@@ -3788,7 +3783,7 @@ msgid "No recipient specified."
 msgstr "Nulle destinatario specificate."
 
 #. TRANS: Error text shown when trying to send a direct message to self.
-#: actions/newmessage.php:167 lib/command.php:505
+#: actions/newmessage.php:167 lib/command.php:517
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr "Non invia un message a te mesme; il suffice susurrar lo discretemente."
@@ -3799,7 +3794,7 @@ msgstr "Message inviate"
 
 #. TRANS: Message given have sent a direct message to another user.
 #. TRANS: %s is the name of the other user.
-#: actions/newmessage.php:188 lib/command.php:513
+#: actions/newmessage.php:188 lib/command.php:525
 #, php-format
 msgid "Direct message to %s sent."
 msgstr "Message directe a %s inviate."
@@ -3816,9 +3811,7 @@ msgstr "Nove nota"
 msgid "Notice posted"
 msgstr "Nota publicate"
 
-#. TRANS: Instructions for Notice search page.
-#. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/noticesearch.php:69
+#: actions/noticesearch.php:68
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -3827,21 +3820,16 @@ msgstr ""
 "Cerca notas in %%site.name%% per contento. Separa terminos de recerca per "
 "spatios; illos debe haber al minus 3 characteres."
 
-#. TRANS: Title of the page where users can search for notices.
-#: actions/noticesearch.php:80
+#: actions/noticesearch.php:78
 msgid "Text search"
 msgstr "Recerca de texto"
 
-#. TRANS: Test in RSS notice search.
-#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearch.php:95
+#: actions/noticesearch.php:91
 #, php-format
 msgid "Search results for \"%1$s\" on %2$s"
 msgstr "Resultatos del recerca de \"%1$s\" in %2$s"
 
-#. TRANS: Text for logged in users making a query for notices without results.
-#. TRANS: This message contains a Markdown link.
-#: actions/noticesearch.php:128
+#: actions/noticesearch.php:121
 #, php-format
 msgid ""
 "Be the first to [post on this topic](%%%%action.newnotice%%%%?"
@@ -3850,9 +3838,7 @@ msgstr ""
 "Sia le prime a [publicar un nota super iste topico](%%%%action.newnotice%%%%?"
 "status_textarea=%s)!"
 
-#. TRANS: Text for not logged in users making a query for notices without results.
-#. TRANS: This message contains Markdown links.
-#: actions/noticesearch.php:133
+#: actions/noticesearch.php:124
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and be the first to "
@@ -3862,18 +3848,15 @@ msgstr ""
 "a [publicar un nota super iste topico](%%%%action.newnotice%%%%?"
 "status_textarea=%s)?"
 
-#. TRANS: RSS notice search feed title. %s is the query.
-#: actions/noticesearchrss.php:95
+#: actions/noticesearchrss.php:96
 #, php-format
 msgid "Updates with \"%s\""
 msgstr "Actualisationes con \"%s\""
 
-#. TRANS: RSS notice search feed description.
-#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearchrss.php:99
+#: actions/noticesearchrss.php:98
 #, fuzzy, php-format
-msgid "Updates matching search term \"%1$s\" on %2$s."
-msgstr "Actualisationes correspondente al termino de recerca \"%1$s\" in %2$s!"
+msgid "Updates matching search term \"%1$s\" on %2$s!"
+msgstr "Actualisationes correspondente al termino de recerca \"%1$s\" in %2$s."
 
 #: actions/nudge.php:85
 msgid ""
@@ -3913,30 +3896,30 @@ msgid "You have not registered any applications yet."
 msgstr "Tu non ha ancora registrate alcun application."
 
 #. TRANS: Title for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:70
+#: actions/oauthconnectionssettings.php:71
 msgid "Connected applications"
 msgstr "Applicationes connectite"
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:81
+#: actions/oauthconnectionssettings.php:83
 msgid "The following connections exist for your account."
 msgstr "Le sequente connexiones existe pro tu conto."
 
 #. TRANS: Client error when trying to revoke access for an application while not being a user of it.
-#: actions/oauthconnectionssettings.php:166
+#: actions/oauthconnectionssettings.php:168
 msgid "You are not a user of that application."
 msgstr "Tu non es usator de iste application."
 
 #. TRANS: Client error when revoking access has failed for some reason.
 #. TRANS: %s is the application ID revoking access failed for.
-#: actions/oauthconnectionssettings.php:181
+#: actions/oauthconnectionssettings.php:183
 #, php-format
 msgid "Unable to revoke access for application: %s."
 msgstr "Impossibile revocar le accesso del application: %s."
 
 #. TRANS: Success message after revoking access for an application.
 #. TRANS: %1$s is the application name, %2$s is the first part of the user token.
-#: actions/oauthconnectionssettings.php:200
+#: actions/oauthconnectionssettings.php:202
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -3946,14 +3929,14 @@ msgstr ""
 "comenciante con %2$s."
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:211
+#: actions/oauthconnectionssettings.php:213
 msgid "You have not authorized any applications to use your account."
 msgstr "Tu non ha autorisate alcun application a usar tu conto."
 
 #. TRANS: Note for developers in the OAuth connection settings form.
 #. TRANS: This message contains a Markdown link. Do not separate "](".
 #. TRANS: %s is the URL to the OAuth settings.
-#: actions/oauthconnectionssettings.php:231
+#: actions/oauthconnectionssettings.php:233
 #, php-format
 msgid ""
 "Are you a developer? [Register an OAuth client application](%s) to use with "
@@ -3962,16 +3945,6 @@ msgstr ""
 "Es tu un programmator? [Registra un application cliente OAuth](%s) a usar "
 "con iste installation de StatusNet."
 
-#: actions/oembed.php:64
-#, php-format
-msgid "\"%s\" not found."
-msgstr "\"%s\" non trovate."
-
-#: actions/oembed.php:76
-#, php-format
-msgid "Notice %s not found."
-msgstr "Nota %s non trovate."
-
 #: actions/oembed.php:80 actions/shownotice.php:100
 msgid "Notice has no profile."
 msgstr "Le nota ha nulle profilo."
@@ -3981,16 +3954,6 @@ msgstr "Le nota ha nulle profilo."
 msgid "%1$s's status on %2$s"
 msgstr "Le stato de %1$s in %2$s"
 
-#: actions/oembed.php:95
-#, php-format
-msgid "Attachment %s not found."
-msgstr "Annexo %s non trovate."
-
-#: actions/oembed.php:136
-#, php-format
-msgid "\"%s\" not supported for oembed requests."
-msgstr "\"%s\" non es supportate pro le requestas \"oembed\"."
-
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
 #: actions/oembed.php:168
 #, php-format
@@ -4009,12 +3972,11 @@ msgstr "Solmente le URLs %s es permittite super HTTP simple."
 msgid "Not a supported data format."
 msgstr "Formato de datos non supportate."
 
-#. TRANS: ShortName in the OpenSearch interface when trying to find users.
 #: actions/opensearch.php:64
 msgid "People Search"
 msgstr "Recerca de personas"
 
-#: actions/opensearch.php:68
+#: actions/opensearch.php:67
 msgid "Notice Search"
 msgstr "Rercerca de notas"
 
@@ -4062,46 +4024,37 @@ msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr ""
 "Le servicio de accurtamento de URL es troppo longe (maximo 50 characteres)."
 
-#. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
-#: actions/otp.php:70
+#: actions/otp.php:69
 msgid "No user ID specified."
 msgstr "Nulle identificator de usator specificate."
 
-#. TRANS: Client error displayed trying to use "one time password login" without specifying a login token.
-#: actions/otp.php:86
+#: actions/otp.php:83
 msgid "No login token specified."
 msgstr "Nulle indicio de identification specificate."
 
-#. TRANS: Client error displayed trying to use "one time password login" without requesting a login token.
-#: actions/otp.php:94
+#: actions/otp.php:90
 msgid "No login token requested."
 msgstr "Nulle indicio de identification requestate."
 
-#. TRANS: Client error displayed trying to use "one time password login" while specifying an invalid login token.
-#: actions/otp.php:100
+#: actions/otp.php:95
 msgid "Invalid login token specified."
 msgstr "Indicio de identification invalide specificate."
 
-#. TRANS: Client error displayed trying to use "one time password login" while specifying an expired login token.
-#: actions/otp.php:110
+#: actions/otp.php:104
 msgid "Login token expired."
 msgstr "Le indicio de identification ha expirate."
 
-#. TRANS: Title for outbox for any but the fist page.
-#. TRANS: %1$s is the user nickname, %2$d is the page number.
-#: actions/outbox.php:57
+#: actions/outbox.php:58
 #, php-format
 msgid "Outbox for %1$s - page %2$d"
 msgstr "Cassa de exito de %1$s - pagina %2$d"
 
-#. TRANS: Title for first page of outbox.
 #: actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
 msgstr "Cassa de exito pro %s"
 
-#. TRANS: Instructions for outbox.
-#: actions/outbox.php:103
+#: actions/outbox.php:104
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr ""
 "Isto es tu cassa de exito, que lista le messages private que tu ha inviate."
@@ -4128,42 +4081,43 @@ msgstr "Ancian contrasigno"
 msgid "New password"
 msgstr "Nove contrasigno"
 
-#: actions/passwordsettings.php:109 actions/register.php:423
-msgid "6 or more characters."
+#: actions/passwordsettings.php:109
+#, fuzzy
+msgid "6 or more characters"
 msgstr "6 o plus characteres."
 
-#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:264
-#: actions/register.php:427
-msgid "Same as password above."
+#: actions/passwordsettings.php:113
+#, fuzzy
+msgid "Same as password above"
 msgstr "Identic al contrasigno hic supra."
 
 #: actions/passwordsettings.php:117
 msgid "Change"
 msgstr "Cambiar"
 
-#: actions/passwordsettings.php:153 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:238
 msgid "Password must be 6 or more characters."
 msgstr "Le contrasigno debe haber al minus 6 characteres."
 
-#: actions/passwordsettings.php:156 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:241
 msgid "Passwords don't match."
 msgstr "Le contrasignos non corresponde."
 
-#: actions/passwordsettings.php:164
+#: actions/passwordsettings.php:165
 msgid "Incorrect old password"
 msgstr "Ancian contrasigno incorrecte"
 
-#: actions/passwordsettings.php:180
+#: actions/passwordsettings.php:181
 msgid "Error saving user; invalid."
 msgstr "Error de salveguardar le usator; invalide."
 
-#. TRANS: Reset password form validation error message.
-#: actions/passwordsettings.php:185 actions/recoverpassword.php:418
-msgid "Cannot save new password."
+#: actions/passwordsettings.php:186
+#, fuzzy
+msgid "Can't save new password."
 msgstr "Non pote salveguardar le nove contrasigno."
 
-#: actions/passwordsettings.php:191
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
 msgid "Password saved."
 msgstr "Contrasigno salveguardate."
 
@@ -4437,9 +4391,7 @@ msgstr "Servitor verso le qual diriger le requestas SSL."
 msgid "Save paths"
 msgstr "Salveguardar camminos"
 
-#. TRANS: Instructions for the "People search" page.
-#. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/peoplesearch.php:54
+#: actions/peoplesearch.php:52
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
@@ -4448,8 +4400,7 @@ msgstr ""
 "Cerca personas in %%site.name%% per nomine, loco o interesses. Separa le "
 "terminos per spatios; illos debe haber 3 characteres o plus."
 
-#. TRANS: Title of a page where users can search for other users.
-#: actions/peoplesearch.php:61
+#: actions/peoplesearch.php:58
 msgid "People search"
 msgstr "Recerca de personas"
 
@@ -4493,14 +4444,14 @@ msgid "Profile information"
 msgstr "Informationes del profilo"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109 actions/register.php:419
+#: actions/profilesettings.php:109 actions/register.php:433
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr "1-64 minusculas o numeros, sin punctuation o spatios."
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for full group name (dt). Text hidden by default.
 #. TRANS: DT for full name in a profile.
-#: actions/profilesettings.php:113 actions/register.php:441
+#: actions/profilesettings.php:113 actions/register.php:455
 #: actions/showgroup.php:255 actions/tagother.php:104
 #: lib/groupeditform.php:150 lib/userprofile.php:156
 msgid "Full name"
@@ -4508,20 +4459,20 @@ msgstr "Nomine complete"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:118 actions/register.php:446
+#: actions/profilesettings.php:118 actions/register.php:460
 #: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "Pagina personal"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:121 actions/register.php:448
+#: actions/profilesettings.php:121
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr "URL de tu pagina personal, blog o profilo in un altere sito."
 
 #. TRANS: Tooltip for field label in form for profile settings. Plural
 #. TRANS: is decided by the number of characters available for the
 #. TRANS: biography (%d).
-#: actions/profilesettings.php:129 actions/register.php:457
+#: actions/profilesettings.php:129 actions/register.php:471
 #, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4529,29 +4480,28 @@ msgstr[0] "Describe te e tu interesses in %d character"
 msgstr[1] "Describe te e tu interesses in %d characteres"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:135 actions/register.php:462
+#: actions/profilesettings.php:135 actions/register.php:476
 msgid "Describe yourself and your interests"
 msgstr "Describe te e tu interesses"
 
 #. TRANS: Text area label in form for profile settings where users can provide.
 #. TRANS: their biography.
-#: actions/profilesettings.php:139 actions/register.php:464
+#: actions/profilesettings.php:139 actions/register.php:478
 msgid "Bio"
 msgstr "Bio"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group location (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT for location in a profile.
-#: actions/profilesettings.php:145 actions/register.php:469
+#: actions/profilesettings.php:145 actions/register.php:483
 #: actions/showgroup.php:265 actions/tagother.php:112
-#: actions/userauthorization.php:174 lib/groupeditform.php:173
+#: actions/userauthorization.php:166 lib/groupeditform.php:173
 #: lib/userprofile.php:172
 msgid "Location"
 msgstr "Loco"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148
+#: actions/profilesettings.php:148 actions/register.php:485
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Ubi tu es, como \"Citate, Stato (o Region), Pais\""
 
@@ -4570,9 +4520,9 @@ msgstr "Etiquettas"
 
 #. TRANS: Tooltip for field label in form for profile settings.
 #: actions/profilesettings.php:164
+#, fuzzy
 msgid ""
-"Tags for yourself (letters, numbers, -, ., and _), comma- or space- "
-"separated."
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr ""
 "Etiquettas pro te (litteras, numeros, -, ., e _), separate per commas o "
 "spatios."
@@ -4584,7 +4534,8 @@ msgstr "Lingua"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
 #: actions/profilesettings.php:171
-msgid "Preferred language."
+#, fuzzy
+msgid "Preferred language"
 msgstr "Lingua preferite."
 
 #. TRANS: Dropdownlist label in form for profile settings.
@@ -4599,8 +4550,9 @@ msgstr "In que fuso horari es tu normalmente?"
 
 #. TRANS: Checkbox label in form for profile settings.
 #: actions/profilesettings.php:189
+#, fuzzy
 msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)."
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr ""
 "Subscriber me automaticamente a qui se subscribe a me (utile pro non-"
 "humanos)."
@@ -4608,7 +4560,7 @@ msgstr ""
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Plural form is used based on the maximum number of allowed
 #. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:258 actions/register.php:221
+#: actions/profilesettings.php:258 actions/register.php:229
 #, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4627,10 +4579,10 @@ msgstr "Lingua es troppo longe (maximo 50 characteres)."
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:291
+#: actions/profilesettings.php:291 actions/tagother.php:178
 #, php-format
-msgid "Invalid tag: \"%s\"."
-msgstr "Etiquetta invalide: \"%s\"."
+msgid "Invalid tag: \"%s\""
+msgstr "Etiquetta invalide: \"%s\""
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
 #. TRANS: automatically subscribe to any subscriber.
@@ -4734,12 +4686,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: Public RSS feed description. %s is the StatusNet site name.
-#: actions/publicrss.php:106
-#, fuzzy, php-format
-msgid "%s updates from everyone."
-msgstr "Actualisationes de totes in %s!"
-
 #. TRANS: Title for public tag cloud.
 #: actions/publictagcloud.php:57
 msgid "Public tag cloud"
@@ -4875,11 +4821,6 @@ msgstr "Recuperar contrasigno"
 msgid "Password recovery requested"
 msgstr "Recuperation de contrasigno requestate"
 
-#. TRANS: Title for password recovery page in password saved mode.
-#: actions/recoverpassword.php:229
-msgid "Password saved"
-msgstr "Contrasigno salveguardate"
-
 #. TRANS: Title for password recovery page when an unknown action has been specified.
 #: actions/recoverpassword.php:232
 msgid "Unknown action"
@@ -4890,6 +4831,11 @@ msgstr "Action incognite"
 msgid "6 or more characters, and do not forget it!"
 msgstr "6 o plus characteres, e non oblida lo!"
 
+#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#: actions/recoverpassword.php:264 actions/register.php:441
+msgid "Same as password above."
+msgstr "Identic al contrasigno hic supra."
+
 #. TRANS: Button text for password reset form.
 #. TRANS: Button text on profile design page to reset all colour settings to default without saving.
 #: actions/recoverpassword.php:268 lib/designsettings.php:264
@@ -4941,8 +4887,13 @@ msgstr "Le contrasigno debe haber 6 characteres o plus."
 msgid "Password and confirmation do not match."
 msgstr "Contrasigno e confirmation non corresponde."
 
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:418
+msgid "Cannot save new password."
+msgstr "Non pote salveguardar le nove contrasigno."
+
 #. TRANS: Server error displayed when something does wrong with the user object during password reset.
-#: actions/recoverpassword.php:426 actions/register.php:248
+#: actions/recoverpassword.php:426 actions/register.php:256
 msgid "Error setting user."
 msgstr "Error durante le configuration del usator."
 
@@ -4951,90 +4902,99 @@ msgstr "Error durante le configuration del usator."
 msgid "New password successfully saved. You are now logged in."
 msgstr "Nove contrasigno salveguardate con successo. Tu session es ora aperte."
 
-#: actions/register.php:87 actions/register.php:188 actions/register.php:399
+#: actions/register.php:92 actions/register.php:196 actions/register.php:413
 msgid "Sorry, only invited people can register."
 msgstr "Pardono, solmente le personas invitate pote registrar se."
 
-#: actions/register.php:94
+#: actions/register.php:99
 msgid "Sorry, invalid invitation code."
 msgstr "Pardono, le codice de invitation es invalide."
 
-#: actions/register.php:113
+#: actions/register.php:119
 msgid "Registration successful"
 msgstr "Registration succedite"
 
-#: actions/register.php:115 actions/register.php:497
+#: actions/register.php:121 actions/register.php:511
 msgid "Register"
 msgstr "Crear conto"
 
-#: actions/register.php:135
+#: actions/register.php:142
 msgid "Registration not allowed."
 msgstr "Creation de conto non permittite."
 
-#: actions/register.php:201
-msgid "You cannot register if you don't agree to the license."
+#: actions/register.php:209
+#, fuzzy
+msgid "You can't register if you don't agree to the license."
 msgstr "Tu non pote crear un conto si tu non accepta le licentia."
 
-#: actions/register.php:210
+#: actions/register.php:218
 msgid "Email address already exists."
 msgstr "Le adresse de e-mail existe ja."
 
-#: actions/register.php:243 actions/register.php:265
+#: actions/register.php:251 actions/register.php:273
 msgid "Invalid username or password."
 msgstr "Nomine de usator o contrasigno invalide."
 
-#: actions/register.php:340
+#: actions/register.php:351
+#, fuzzy
 msgid ""
 "With this form you can create a new account. You can then post notices and "
-"link up to friends and colleagues."
+"link up to friends and colleagues. "
 msgstr ""
 "Con iste formulario tu pote crear un nove conto. Postea, tu pote publicar "
 "notas e mitter te in contacto con amicos e collegas."
 
+#: actions/register.php:437
+msgid "6 or more characters."
+msgstr "6 o plus characteres."
+
 #. TRANS: Link description in user account settings menu.
-#: actions/register.php:431 actions/register.php:435
+#: actions/register.php:445 actions/register.php:449
 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
 msgid "Email"
 msgstr "E-mail"
 
-#: actions/register.php:432 actions/register.php:436
-msgid "Used only for updates, announcements, and password recovery."
+#: actions/register.php:446 actions/register.php:450
+#, fuzzy
+msgid "Used only for updates, announcements, and password recovery"
 msgstr ""
 "Usate solmente pro actualisationes, notificationes e recuperation de "
 "contrasigno."
 
-#: actions/register.php:443
-msgid "Longer name, preferably your \"real\" name."
+#: actions/register.php:457
+#, fuzzy
+msgid "Longer name, preferably your \"real\" name"
 msgstr "Nomine plus longe, preferibilemente tu nomine \"real\"."
 
-#: actions/register.php:471
-msgid "Where you are, like \"City, State (or Region), Country\"."
-msgstr "Ubi tu es, como \"Citate, Stato (o Region), Pais\"."
+#: actions/register.php:462
+#, fuzzy
+msgid "URL of your homepage, blog, or profile on another site"
+msgstr "URL de tu pagina personal, blog o profilo in un altere sito."
 
-#: actions/register.php:510
+#: actions/register.php:523
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
 msgstr ""
 "io comprende que le contento e datos de %1$s es private e confidential."
 
-#: actions/register.php:520
+#: actions/register.php:533
 #, php-format
 msgid "My text and files are copyright by %1$s."
 msgstr "Le derecto de autor pro mi texto e files es in possession de %1$s."
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:524
+#: actions/register.php:537
 msgid "My text and files remain under my own copyright."
 msgstr "Le derecto de autor pro mi texto e files resta in mi possession."
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:527
+#: actions/register.php:540
 msgid "All rights reserved."
 msgstr "Tote le derectos reservate."
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:532
+#: actions/register.php:545
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -5044,7 +5004,7 @@ msgstr ""
 "contrasigno, adresse de e-mail, adresse de messageria instantanee, numero de "
 "telephono."
 
-#: actions/register.php:573
+#: actions/register.php:588
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -5076,7 +5036,7 @@ msgstr ""
 "\n"
 "Gratias pro inscriber te, e nos spera que iste servicio te place."
 
-#: actions/register.php:597
+#: actions/register.php:612
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5109,7 +5069,8 @@ msgid "User nickname"
 msgstr "Pseudonymo del usator"
 
 #: actions/remotesubscribe.php:129
-msgid "Nickname of the user you want to follow."
+#, fuzzy
+msgid "Nickname of the user you want to follow"
 msgstr "Le pseudonymo del usator que tu vole sequer."
 
 #: actions/remotesubscribe.php:132
@@ -5117,7 +5078,8 @@ msgid "Profile URL"
 msgstr "URL del profilo"
 
 #: actions/remotesubscribe.php:133
-msgid "URL of your profile on another compatible microblogging service."
+#, fuzzy
+msgid "URL of your profile on another compatible microblogging service"
 msgstr "URL de tu profilo in un altere servicio de microblogging compatibile."
 
 #. TRANS: Link text for link that will subscribe to a remote profile.
@@ -5127,7 +5089,8 @@ msgid "Subscribe"
 msgstr "Subscriber"
 
 #: actions/remotesubscribe.php:158
-msgid "Invalid profile URL (bad format)."
+#, fuzzy
+msgid "Invalid profile URL (bad format)"
 msgstr "URL de profilo invalide (mal formato)."
 
 #: actions/remotesubscribe.php:167
@@ -5168,7 +5131,6 @@ msgstr "Repetite"
 msgid "Repeated!"
 msgstr "Repetite!"
 
-#. TRANS: RSS reply feed title. %s is a user nickname.
 #. TRANS: Tooltip for personal group navigation menu option when logged in for viewing @-replies.
 #: actions/replies.php:126 actions/repliesrss.php:68
 #: lib/personalgroupnav.php:109
@@ -5223,12 +5185,10 @@ msgstr ""
 "Tu pote tentar [pulsar %1$s](../%2$s) o [publicar alique a su attention](%%%%"
 "action.newnotice%%%%?status_textarea=%3$s)."
 
-#. TRANS: RSS reply feed description.
-#. TRANS: %1$s is a user nickname, %2$s is the StatusNet site name.
-#: actions/repliesrss.php:74
+#: actions/repliesrss.php:72
 #, fuzzy, php-format
-msgid "Replies to %1$s on %2$s."
-msgstr "Responsas a %1$s in %2$s!"
+msgid "Replies to %1$s on %2$s!"
+msgstr "Responsas a %1$s in %2$s."
 
 #. TRANS: Client exception displayed when trying to restore an account while not logged in.
 #: actions/restoreaccount.php:78
@@ -5328,7 +5288,7 @@ msgstr "Tu non pote revocar rolos de usatores in iste sito."
 msgid "User doesn't have this role."
 msgstr "Le usator non ha iste rolo."
 
-#: actions/rsd.php:142 actions/version.php:159
+#: actions/rsd.php:146 actions/version.php:159
 msgid "StatusNet"
 msgstr "StatusNet"
 
@@ -5370,87 +5330,87 @@ msgstr "Producer informationes technic pro cercar defectos in sessiones."
 msgid "Save site settings"
 msgstr "Salveguardar configurationes del sito"
 
-#: actions/showapplication.php:78
+#: actions/showapplication.php:82
 msgid "You must be logged in to view an application."
 msgstr "Tu debe aperir un session pro vider un application."
 
-#: actions/showapplication.php:151
+#: actions/showapplication.php:157
 msgid "Application profile"
 msgstr "Profilo del application"
 
 #. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:153 lib/applicationeditform.php:177
+#: actions/showapplication.php:159 lib/applicationeditform.php:177
 msgid "Icon"
 msgstr "Icone"
 
 #. TRANS: Form input field label for application name.
-#: actions/showapplication.php:163 actions/version.php:197
+#: actions/showapplication.php:169 actions/version.php:197
 #: lib/applicationeditform.php:190
 msgid "Name"
 msgstr "Nomine"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:172 lib/applicationeditform.php:227
+#: actions/showapplication.php:178 lib/applicationeditform.php:227
 msgid "Organization"
 msgstr "Organisation"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:181 actions/version.php:200
+#: actions/showapplication.php:187 actions/version.php:200
 #: lib/applicationeditform.php:208 lib/groupeditform.php:168
 msgid "Description"
 msgstr "Description"
 
 #. TRANS: Header for group statistics on a group page (h2).
 #. TRANS: H2 text for user statistics.
-#: actions/showapplication.php:186 actions/showgroup.php:460
+#: actions/showapplication.php:192 actions/showgroup.php:460
 #: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "Statisticas"
 
-#: actions/showapplication.php:197
+#: actions/showapplication.php:203
 #, php-format
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr "Create per %1$s - accesso %2$s per predefinition - %3$d usatores"
 
-#: actions/showapplication.php:207
+#: actions/showapplication.php:213
 msgid "Application actions"
 msgstr "Actiones de application"
 
-#: actions/showapplication.php:230
+#: actions/showapplication.php:236
 msgid "Reset key & secret"
 msgstr "Reinitialisar clave e secreto"
 
 #. TRANS: Title of form for deleting a user.
-#: actions/showapplication.php:246 lib/deletegroupform.php:121
+#: actions/showapplication.php:252 lib/deletegroupform.php:121
 #: lib/deleteuserform.php:64 lib/noticelist.php:673
 msgid "Delete"
 msgstr "Deler"
 
-#: actions/showapplication.php:255
+#: actions/showapplication.php:261
 msgid "Application info"
 msgstr "Info del application"
 
-#: actions/showapplication.php:257
+#: actions/showapplication.php:263
 msgid "Consumer key"
 msgstr "Clave de consumitor"
 
-#: actions/showapplication.php:262
+#: actions/showapplication.php:268
 msgid "Consumer secret"
 msgstr "Secreto de consumitor"
 
-#: actions/showapplication.php:267
+#: actions/showapplication.php:273
 msgid "Request token URL"
 msgstr "URL del indicio de requesta"
 
-#: actions/showapplication.php:272
+#: actions/showapplication.php:278
 msgid "Access token URL"
 msgstr "URL del indicio de accesso"
 
-#: actions/showapplication.php:277
+#: actions/showapplication.php:283
 msgid "Authorize URL"
 msgstr "URL de autorisation"
 
-#: actions/showapplication.php:282
+#: actions/showapplication.php:288
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
@@ -5458,7 +5418,7 @@ msgstr ""
 "Nota: Nos supporta le signaturas HMAC-SHA1. Nos non accepta signaturas in "
 "texto simple."
 
-#: actions/showapplication.php:302
+#: actions/showapplication.php:309
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr "Es tu secur de voler reinitialisar tu clave e secreto de consumitor?"
 
@@ -5551,18 +5511,16 @@ msgid "Group profile"
 msgstr "Profilo del gruppo"
 
 #. TRANS: Label for group URL (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT for URL in a profile.
 #: actions/showgroup.php:273 actions/tagother.php:118
-#: actions/userauthorization.php:184 lib/userprofile.php:186
+#: actions/userauthorization.php:175 lib/userprofile.php:186
 msgid "URL"
 msgstr "URL"
 
 #. TRANS: Label for group description or group note (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page where bio is displayed.
 #. TRANS: DT for note in a profile.
 #: actions/showgroup.php:285 actions/tagother.php:128
-#: actions/userauthorization.php:197 lib/userprofile.php:204
+#: actions/userauthorization.php:187 lib/userprofile.php:204
 msgid "Note"
 msgstr "Nota"
 
@@ -5707,7 +5665,7 @@ msgid "%1$s tagged %2$s"
 msgstr "%1$s etiquettate con %2$s"
 
 #. TRANS: Page title showing tagged notices in one user's stream.
-#. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
+#. TRANS: %1$s is the username, %2$s is the hash tag, %1$d is the page number.
 #: actions/showstream.php:74
 #, php-format
 msgid "%1$s tagged %2$s, page %3$d"
@@ -5957,7 +5915,8 @@ msgstr ""
 
 #. TRANS: Title for button to save site notice in admin panel.
 #: actions/sitenoticeadminpanel.php:201
-msgid "Save site notice."
+#, fuzzy
+msgid "Save site notice"
 msgstr "Salveguardar aviso del sito."
 
 #. TRANS: Title for SMS settings.
@@ -6015,7 +5974,8 @@ msgstr "Numero de telephono pro SMS"
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
 #: actions/smssettings.php:152
-msgid "Phone number, no punctuation or spaces, with area code."
+#, fuzzy
+msgid "Phone number, no punctuation or spaces, with area code"
 msgstr "Numero de telephono, sin punctuation o spatios, con indicativo."
 
 #. TRANS: Form legend for SMS preferences form.
@@ -6183,19 +6143,15 @@ msgstr "Tu non es subscribite a iste profilo."
 msgid "Could not save subscription."
 msgstr "Non poteva salveguardar le subscription."
 
-#. TRANS: Client error displayed trying to perform any request method other than POST.
-#. TRANS: Do not translate POST.
 #: actions/subscribe.php:77
 msgid "This action only accepts POST requests."
 msgstr "Iste action accepta solmente le requestas de typo POST."
 
-#. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
-#: actions/subscribe.php:121
+#: actions/subscribe.php:117
 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
 msgstr "Tu non pote subscriber te a un profilo remote OMB 0.1 con iste action."
 
-#. TRANS: Page title when subscription succeeded.
-#: actions/subscribe.php:149
+#: actions/subscribe.php:145
 msgid "Subscribed"
 msgstr "Subscribite"
 
@@ -6355,9 +6311,8 @@ msgstr "Etiquetta %s"
 msgid "User profile"
 msgstr "Profilo del usator"
 
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT element in area for user avatar.
-#: actions/tagother.php:81 actions/userauthorization.php:138
+#: actions/tagother.php:81 actions/userauthorization.php:132
 #: lib/userprofile.php:108
 msgid "Photo"
 msgstr "Photo"
@@ -6374,11 +6329,6 @@ msgstr ""
 "Etiquettas pro iste usator (litteras, numeros, -, . e _), separate per "
 "commas o spatios"
 
-#: actions/tagother.php:178
-#, php-format
-msgid "Invalid tag: \"%s\""
-msgstr "Etiquetta invalide: \"%s\""
-
 #: actions/tagother.php:193
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
@@ -6395,7 +6345,6 @@ msgstr ""
 msgid "No such tag."
 msgstr "Etiquetta non existe."
 
-#. TRANS: Client error displayed when trying to unblock a non-blocked user.
 #: actions/unblock.php:59
 msgid "You haven't blocked that user."
 msgstr "Tu non ha blocate iste usator."
@@ -6416,7 +6365,7 @@ msgstr "Nulle ID de profilo in requesta."
 msgid "Unsubscribed"
 msgstr "Subscription cancellate"
 
-#: actions/updateprofile.php:64
+#: actions/updateprofile.php:64 actions/userauthorization.php:337
 #, php-format
 msgid ""
 "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
@@ -6448,8 +6397,8 @@ msgstr "Texto de benvenita invalide. Longitude maxime es 255 characteres."
 #. TRANS: Client error displayed when trying to set a non-existing user as default subscription for new
 #. TRANS: users in user admin panel. %1$s is the invalid nickname.
 #: actions/useradminpanel.php:166
-#, php-format
-msgid "Invalid default subscripton: \"%1$s\" is not a user."
+#, fuzzy, php-format
+msgid "Invalid default subscripton: '%1$s' is not a user."
 msgstr "Subscription predefinite invalide: \"%1$s\" non es usator."
 
 #. TRANS: Link description in user account settings menu.
@@ -6509,65 +6458,60 @@ msgstr "Si le usatores pote invitar nove usatores."
 
 #. TRANS: Title for button to save user settings in user admin panel.
 #: actions/useradminpanel.php:302
-msgid "Save user settings."
+#, fuzzy
+msgid "Save user settings"
 msgstr "Salveguardar configurationes de usator."
 
-#. TRANS: Page title.
-#: actions/userauthorization.php:109
+#: actions/userauthorization.php:105
 msgid "Authorize subscription"
 msgstr "Autorisar subscription"
 
-#. TRANS: Page notice on "Auhtorize subscription" page.
-#: actions/userauthorization.php:115
+#: actions/userauthorization.php:110
+#, fuzzy
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
 "user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
-"click \"Reject\"."
+"click “Reject”."
 msgstr ""
 "Per favor verifica iste detalios pro assecurar que tu vole subscriber al "
 "notas de iste usator. Si tu non ha justo requestate de subscriber al notas "
 "de alcuno, clicca \"Rejectar\"."
 
-#. TRANS: DT element on Authorise Subscription page where license is displayed.
 #. TRANS: Menu item for site administration
-#: actions/userauthorization.php:207 actions/version.php:167
+#: actions/userauthorization.php:196 actions/version.php:167
 #: lib/adminpanelaction.php:403
 msgid "License"
 msgstr "Licentia"
 
-#. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:229
-msgctxt "BUTTON"
+#: actions/userauthorization.php:217
+#, fuzzy
 msgid "Accept"
 msgstr "Acceptar"
 
-#. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:231
-msgid "Subscribe to this user."
-msgstr "Subscriber a iste usator."
+#: actions/userauthorization.php:218 lib/subscribeform.php:115
+#: lib/subscribeform.php:139
+msgid "Subscribe to this user"
+msgstr "Subscriber a iste usator"
 
-#. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:233
-msgctxt "BUTTON"
+#: actions/userauthorization.php:219
+#, fuzzy
 msgid "Reject"
 msgstr "Rejectar"
 
-#. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:235
-msgid "Reject this subscription."
+#: actions/userauthorization.php:220
+#, fuzzy
+msgid "Reject this subscription"
 msgstr "Rejectar iste subscription."
 
-#. TRANS: Client error displayed for an empty authorisation request.
-#: actions/userauthorization.php:248
+#: actions/userauthorization.php:232
 msgid "No authorization request!"
 msgstr "Nulle requesta de autorisation!"
 
-#. TRANS: Accept message header from Authorise subscription page.
-#: actions/userauthorization.php:271
+#: actions/userauthorization.php:254
 msgid "Subscription authorized"
 msgstr "Subscription autorisate"
 
-#: actions/userauthorization.php:274
+#: actions/userauthorization.php:256
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to authorize the "
@@ -6577,12 +6521,11 @@ msgstr ""
 "recipite. Lege in le instructiones del sito in question como autorisar le "
 "subscription. Tu indicio de subscription es:"
 
-#. TRANS: Reject message header from Authorise subscription page.
-#: actions/userauthorization.php:285
+#: actions/userauthorization.php:266
 msgid "Subscription rejected"
 msgstr "Subscription rejectate"
 
-#: actions/userauthorization.php:288
+#: actions/userauthorization.php:268
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to fully reject the "
@@ -6592,64 +6535,39 @@ msgstr ""
 "recipite. Lege in le instructiones del sito in question como rejectar "
 "completemente le subscription."
 
-#. TRANS: Exception thrown when no valid user is found for an authorisation request.
-#. TRANS: %s is a listener URI.
-#: actions/userauthorization.php:325
-#, php-format
-msgid "Listener URI \"%s\" not found here."
+#: actions/userauthorization.php:303
+#, fuzzy, php-format
+msgid "Listener URI ‘%s’ not found here."
 msgstr "URI de ascoltator \"%s\" non trovate hic."
 
-#. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:332
-#, php-format
-msgid "Listenee URI \"%s\" is too long."
+#: actions/userauthorization.php:308
+#, fuzzy, php-format
+msgid "Listenee URI ‘%s’ is too long."
 msgstr "URI de ascoltato \"%s\" es troppo longe."
 
-#. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:340
-#, php-format
-msgid "Listenee URI \"%s\" is a local user."
+#: actions/userauthorization.php:314
+#, fuzzy, php-format
+msgid "Listenee URI ‘%s’ is a local user."
 msgstr "URI de ascoltato \"%s\" es un usator local."
 
-#. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
-#. TRANS: %s is a profile URL.
-#: actions/userauthorization.php:358
-#, php-format
-msgid "Profile URL \"%s\" is for a local user."
+#: actions/userauthorization.php:329
+#, fuzzy, php-format
+msgid "Profile URL ‘%s’ is for a local user."
 msgstr "URL de profilo \"%s\" es de un usator local."
 
-#. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
-#. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
-#: actions/userauthorization.php:368
-#, php-format
-msgid ""
-"Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
-"\"."
-msgstr ""
-"Le licentia del fluxo que tu ascolta, \"%1$s\", non es compatibile con le "
-"licentia del sito \"%2$s\"."
-
-#. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:378
-#, php-format
-msgid "Avatar URL \"%s\" is not valid."
+#: actions/userauthorization.php:345
+#, fuzzy, php-format
+msgid "Avatar URL ‘%s’ is not valid."
 msgstr "URL de avatar \"%s\" non es valide."
 
-#. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:385
-#, php-format
-msgid "Cannot read avatar URL \"%s\"."
+#: actions/userauthorization.php:350
+#, fuzzy, php-format
+msgid "Can’t read avatar URL ‘%s’."
 msgstr "Non pote leger URL de avatar \"%s\"."
 
-#. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:392
-#, php-format
-msgid "Wrong image type for avatar URL \"%s\"."
+#: actions/userauthorization.php:355
+#, fuzzy, php-format
+msgid "Wrong image type for avatar URL ‘%s’."
 msgstr "Typo de imagine incorrecte pro URL de avatar \"%s\"."
 
 #. TRANS: Page title for profile design page.
@@ -6758,7 +6676,7 @@ msgid "Plugins"
 msgstr "Plug-ins"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:898
+#: actions/version.php:198 lib/action.php:901
 msgid "Version"
 msgstr "Version"
 
@@ -6966,14 +6884,14 @@ msgstr "Problema salveguardar le cassa de entrata del gruppo."
 
 #. TRANS: Server exception thrown when a reply cannot be saved.
 #. TRANS: %1$d is a notice ID, %2$d is the ID of the mentioned user.
-#: classes/Notice.php:1142
+#: classes/Notice.php:1144
 #, php-format
 msgid "Could not save reply for %1$d, %2$d."
 msgstr "Non poteva salveguardar le responsa pro %1$d, %2$d."
 
 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1661
+#: classes/Notice.php:1663
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
@@ -6987,14 +6905,14 @@ msgstr "%1$s (%2$s)"
 
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:775
+#: classes/Profile.php:779
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr "Non pote revocar le rolo \"%1$s\" del usator #%2$d; non existe."
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:784
+#: classes/Profile.php:788
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -7313,53 +7231,53 @@ msgid "Page notice"
 msgstr "Aviso de pagina"
 
 #. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:871
+#: lib/action.php:874
 msgid "Secondary site navigation"
 msgstr "Navigation secundari del sito"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:877
+#: lib/action.php:880
 msgid "Help"
 msgstr "Adjuta"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:880
+#: lib/action.php:883
 msgid "About"
 msgstr "A proposito"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:883
+#: lib/action.php:886
 msgid "FAQ"
 msgstr "FAQ"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:888
+#: lib/action.php:891
 msgid "TOS"
 msgstr "CdS"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:892
+#: lib/action.php:895
 msgid "Privacy"
 msgstr "Confidentialitate"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:895
+#: lib/action.php:898
 msgid "Source"
 msgstr "Fonte"
 
 #. TRANS: Secondary navigation menu option leading to e-mail contact information on the
 #. TRANS: StatusNet site, where to report bugs, ...
-#: lib/action.php:902
+#: lib/action.php:905
 msgid "Contact"
 msgstr "Contacto"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:905
+#: lib/action.php:908
 msgid "Badge"
 msgstr "Insignia"
 
 #. TRANS: DT element for StatusNet software license.
-#: lib/action.php:934
+#: lib/action.php:937
 msgid "StatusNet software license"
 msgstr "Licentia del software StatusNet"
 
@@ -7367,7 +7285,7 @@ msgstr "Licentia del software StatusNet"
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:941
+#: lib/action.php:944
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7377,7 +7295,7 @@ msgstr ""
 "%](%%site.broughtbyurl%%)."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:944
+#: lib/action.php:947
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** es un servicio de microblog."
@@ -7386,7 +7304,7 @@ msgstr "**%%site.name%%** es un servicio de microblog."
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:951
+#: lib/action.php:954
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7398,51 +7316,51 @@ msgstr ""
 "(http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:967
+#: lib/action.php:970
 msgid "Site content license"
 msgstr "Licentia del contento del sito"
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:974
+#: lib/action.php:977
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr "Le contento e datos de %1$s es private e confidential."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:981
+#: lib/action.php:984
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr "Contento e datos sub copyright de %1$s. Tote le derectos reservate."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:985
+#: lib/action.php:988
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 "Contento e datos sub copyright del contributores. Tote le derectos reservate."
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:1017
+#: lib/action.php:1020
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr "Tote le contento e datos de %1$s es disponibile sub le licentia %2$s."
 
 #. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1353
+#: lib/action.php:1356
 msgid "Pagination"
 msgstr "Pagination"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1364
+#: lib/action.php:1367
 msgid "After"
 msgstr "Post"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1374
+#: lib/action.php:1377
 msgid "Before"
 msgstr "Ante"
 
@@ -7643,23 +7561,19 @@ msgstr ""
 msgid "No application for that consumer key."
 msgstr "Nulle application pro iste clave de consumitor."
 
-#: lib/apiauth.php:202 lib/apiauth.php:284
-msgid "Not allowed to use API."
-msgstr ""
-
 #. TRANS: OAuth exception given when an incorrect access token was given for a user.
-#: lib/apiauth.php:225
+#: lib/apiauth.php:219
 msgid "Bad access token."
 msgstr "Mal indicio de accesso."
 
 #. TRANS: OAuth exception given when no user was found for a given token (no token was found).
-#: lib/apiauth.php:230
+#: lib/apiauth.php:224
 msgid "No user for that token."
 msgstr "Nulle usator pro iste indicio."
 
 #. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel".
 #. TRANS: Client error thrown when authentication fails.
-#: lib/apiauth.php:272 lib/apiauth.php:302
+#: lib/apiauth.php:266 lib/apiauth.php:293
 msgid "Could not authenticate you."
 msgstr "Non poteva authenticar te."
 
@@ -7866,11 +7780,6 @@ msgstr "Cambio del contrasigno non permittite."
 msgid "Block"
 msgstr "Blocar"
 
-#. TRANS: Description of the form to block a user.
-#: lib/blockform.php:79
-msgid "Block this user"
-msgstr "Blocar iste usator"
-
 #. TRANS: Title for command results.
 #: lib/channel.php:160 lib/channel.php:181
 msgid "Command results"
@@ -7898,7 +7807,7 @@ msgstr "Non existe un nota con iste ID."
 
 #. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
 #. TRANS: Error text shown when a last user notice is requested and it does not exist.
-#: lib/command.php:99 lib/command.php:630
+#: lib/command.php:99 lib/command.php:642
 msgid "User has no last notice."
 msgstr "Le usator non ha un ultime nota."
 
@@ -7948,35 +7857,41 @@ msgstr ""
 "Subscriptores: %2$s\n"
 "Notas: %3$s"
 
+#. TRANS: Error message text shown when a favorite could not be set because it has already been favorited.
+#: lib/command.php:298
+#, fuzzy
+msgid "Could not create favorite: already favorited."
+msgstr "Non poteva crear le favorite."
+
 #. TRANS: Text shown when a notice has been marked as favourite successfully.
-#: lib/command.php:312
+#: lib/command.php:324
 msgid "Notice marked as fave."
 msgstr "Nota marcate como favorite."
 
 #. TRANS: Message given having added a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:357
+#: lib/command.php:369
 #, php-format
 msgid "%1$s joined group %2$s."
 msgstr "%1$s se jungeva al gruppo %2$s."
 
 #. TRANS: Message given having removed a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:405
+#: lib/command.php:417
 #, php-format
 msgid "%1$s left group %2$s."
 msgstr "%1$s quitava le gruppo %2$s."
 
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: lib/command.php:426
+#: lib/command.php:438
 #, php-format
 msgctxt "WHOIS"
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
 
 #. TRANS: Whois output. %s is the full name of the queried user.
-#: lib/command.php:430
+#: lib/command.php:442
 #, php-format
 msgid "Fullname: %s"
 msgstr "Nomine complete: %s"
@@ -7984,7 +7899,7 @@ msgstr "Nomine complete: %s"
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a location.
-#: lib/command.php:434 lib/mail.php:270
+#: lib/command.php:446 lib/mail.php:270
 #, php-format
 msgid "Location: %s"
 msgstr "Loco: %s"
@@ -7992,20 +7907,20 @@ msgstr "Loco: %s"
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a homepage.
-#: lib/command.php:438 lib/mail.php:274
+#: lib/command.php:450 lib/mail.php:274
 #, php-format
 msgid "Homepage: %s"
 msgstr "Pagina personal: %s"
 
 #. TRANS: Whois output. %s is the bio information of the queried user.
-#: lib/command.php:442
+#: lib/command.php:454
 #, php-format
 msgid "About: %s"
 msgstr "A proposito: %s"
 
 #. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).
 #. TRANS: %s is a remote profile.
-#: lib/command.php:471
+#: lib/command.php:483
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
@@ -8016,7 +7931,7 @@ msgstr ""
 
 #. TRANS: Message given if content is too long. %1$sd is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:488
+#: lib/command.php:500
 #, php-format
 msgid "Message too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
@@ -8024,25 +7939,25 @@ msgstr[0] "Message troppo longe - maximo es %1$d character, tu inviava %2$d."
 msgstr[1] "Message troppo longe - maximo es %1$d characteres, tu inviava %2$d."
 
 #. TRANS: Error text shown sending a direct message fails with an unknown reason.
-#: lib/command.php:516
+#: lib/command.php:528
 msgid "Error sending direct message."
 msgstr "Error durante le invio del message directe."
 
 #. TRANS: Message given having repeated a notice from another user.
 #. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:553
+#: lib/command.php:565
 #, php-format
 msgid "Notice from %s repeated."
 msgstr "Nota de %s repetite."
 
 #. TRANS: Error text shown when repeating a notice fails with an unknown reason.
-#: lib/command.php:556
+#: lib/command.php:568
 msgid "Error repeating notice."
 msgstr "Error durante le repetition del nota."
 
 #. TRANS: Message given if content of a notice for a reply is too long. %1$d is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:591
+#: lib/command.php:603
 #, php-format
 msgid "Notice too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Notice too long - maximum is %1$d characters, you sent %2$d."
@@ -8051,80 +7966,80 @@ msgstr[1] "Nota troppo longe - maximo es %1$d characteres, tu inviava %2$d."
 
 #. TRANS: Text shown having sent a reply to a notice successfully.
 #. TRANS: %s is the nickname of the user of the notice the reply was sent to.
-#: lib/command.php:604
+#: lib/command.php:616
 #, php-format
 msgid "Reply to %s sent."
 msgstr "Responsa a %s inviate."
 
 #. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
-#: lib/command.php:607
+#: lib/command.php:619
 msgid "Error saving notice."
 msgstr "Errur durante le salveguarda del nota."
 
 #. TRANS: Error text shown when no username was provided when issuing a subscribe command.
-#: lib/command.php:654
+#: lib/command.php:666
 msgid "Specify the name of the user to subscribe to."
 msgstr "Specifica le nomine del usator al qual subscriber te."
 
 #. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
-#: lib/command.php:663
+#: lib/command.php:675
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "Impossibile subscriber se a profilos OMB per medio de un commando."
 
 #. TRANS: Text shown after having subscribed to another user successfully.
 #. TRANS: %s is the name of the user the subscription was requested for.
-#: lib/command.php:671
+#: lib/command.php:683
 #, php-format
 msgid "Subscribed to %s."
 msgstr "Subscribite a %s."
 
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.
-#: lib/command.php:692 lib/command.php:803
+#: lib/command.php:704 lib/command.php:815
 msgid "Specify the name of the user to unsubscribe from."
 msgstr "Specifica le nomine del usator al qual cancellar le subscription."
 
 #. TRANS: Text shown after having unsubscribed from another user successfully.
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:703
+#: lib/command.php:715
 #, php-format
 msgid "Unsubscribed from %s."
 msgstr "Subscription a %s cancellate."
 
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
-#: lib/command.php:723 lib/command.php:749
+#: lib/command.php:735 lib/command.php:761
 msgid "Command not yet implemented."
 msgstr "Commando non ancora implementate."
 
 #. TRANS: Text shown when issuing the command "off" successfully.
-#: lib/command.php:727
+#: lib/command.php:739
 msgid "Notification off."
 msgstr "Notification disactivate."
 
 #. TRANS: Error text shown when the command "off" fails for an unknown reason.
-#: lib/command.php:730
+#: lib/command.php:742
 msgid "Can't turn off notification."
 msgstr "Non pote disactivar notification."
 
 #. TRANS: Text shown when issuing the command "on" successfully.
-#: lib/command.php:753
+#: lib/command.php:765
 msgid "Notification on."
 msgstr "Notification activate."
 
 #. TRANS: Error text shown when the command "on" fails for an unknown reason.
-#: lib/command.php:756
+#: lib/command.php:768
 msgid "Can't turn on notification."
 msgstr "Non pote activar notification."
 
 #. TRANS: Error text shown when issuing the login command while login is disabled.
-#: lib/command.php:770
+#: lib/command.php:782
 msgid "Login command is disabled."
 msgstr "Le commando de apertura de session es disactivate."
 
 #. TRANS: Text shown after issuing the login command successfully.
 #. TRANS: %s is a logon link..
-#: lib/command.php:783
+#: lib/command.php:795
 #, php-format
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
@@ -8133,20 +8048,20 @@ msgstr ""
 
 #. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:812
+#: lib/command.php:824
 #, php-format
 msgid "Unsubscribed %s."
 msgstr "Subscription de %s cancellate."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
-#: lib/command.php:830
+#: lib/command.php:842
 msgid "You are not subscribed to anyone."
 msgstr "Tu non es subscribite a alcuno."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
-#: lib/command.php:835
+#: lib/command.php:847
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Tu es subscribite a iste persona:"
@@ -8154,14 +8069,14 @@ msgstr[1] "Tu es subscribite a iste personas:"
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user
 #. TRANS: (followers) without having any subscribers.
-#: lib/command.php:857
+#: lib/command.php:869
 msgid "No one is subscribed to you."
 msgstr "Necuno es subscribite a te."
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
-#: lib/command.php:862
+#: lib/command.php:874
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Iste persona es subscribite a te:"
@@ -8169,21 +8084,21 @@ msgstr[1] "Iste personas es subscribite a te:"
 
 #. TRANS: Text shown after requesting groups a user is subscribed to without having
 #. TRANS: any group subscriptions.
-#: lib/command.php:884
+#: lib/command.php:896
 msgid "You are not a member of any groups."
 msgstr "Tu non es membro de alcun gruppo."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
-#: lib/command.php:889
+#: lib/command.php:901
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "Tu es membro de iste gruppo:"
 msgstr[1] "Tu es membro de iste gruppos:"
 
 #. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-#: lib/command.php:904
+#: lib/command.php:916
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -8322,11 +8237,6 @@ msgstr "Applicationes autorisate connectite"
 msgid "Database error"
 msgstr "Error de base de datos"
 
-#. TRANS: Description of form for deleting a user.
-#: lib/deleteuserform.php:75
-msgid "Delete this user"
-msgstr "Deler iste usator"
-
 #. TRANS: Label in form on profile design page.
 #. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
 #: lib/designsettings.php:108
@@ -8363,21 +8273,6 @@ msgstr "Cambiar colores"
 msgid "Use defaults"
 msgstr "Usar predefinitiones"
 
-#. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: lib/designsettings.php:259
-msgid "Restore default designs"
-msgstr "Restaurar apparentias predefinite"
-
-#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: lib/designsettings.php:267
-msgid "Reset back to default"
-msgstr "Revenir al predefinitiones"
-
-#. TRANS: Title for button on profile design page to save settings.
-#: lib/designsettings.php:272
-msgid "Save design"
-msgstr "Salveguardar apparentia"
-
 #. TRANS: Error message displayed if design settings could not be saved.
 #. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
 #: lib/designsettings.php:405 lib/designsettings.php:427
@@ -9255,10 +9150,6 @@ msgstr "Responder a iste nota"
 msgid "Reply"
 msgstr "Responder"
 
-#: lib/noticelist.php:673
-msgid "Delete this notice"
-msgstr "Deler iste nota"
-
 #: lib/noticelist.php:691
 msgid "Notice repeated"
 msgstr "Nota repetite"
@@ -9534,10 +9425,6 @@ msgstr "Invitar"
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Invitar amicos e collegas a accompaniar te in %s"
 
-#: lib/subscribeform.php:115 lib/subscribeform.php:139
-msgid "Subscribe to this user"
-msgstr "Subscriber a iste usator"
-
 #: lib/subscriberspeopleselftagcloudsection.php:48
 #: lib/subscriptionspeopleselftagcloudsection.php:48
 msgid "People Tagcloud as self-tagged"
@@ -9715,23 +9602,18 @@ msgctxt "role"
 msgid "Moderator"
 msgstr "Moderator"
 
-#: lib/util.php:305
-#, fuzzy
-msgid "Not allowed to log in."
-msgstr "Tu non ha aperite un session."
-
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1309
+#: lib/util.php:1306
 msgid "a few seconds ago"
 msgstr "alcun secundas retro"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1312
+#: lib/util.php:1309
 msgid "about a minute ago"
 msgstr "circa un minuta retro"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1316
+#: lib/util.php:1313
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
@@ -9739,12 +9621,12 @@ msgstr[0] "circa un minuta retro"
 msgstr[1] "circa %d minutas retro"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1319
+#: lib/util.php:1316
 msgid "about an hour ago"
 msgstr "circa un hora retro"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1323
+#: lib/util.php:1320
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
@@ -9752,12 +9634,12 @@ msgstr[0] "circa un hora retro"
 msgstr[1] "circa %d horas retro"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1326
+#: lib/util.php:1323
 msgid "about a day ago"
 msgstr "circa un die retro"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1330
+#: lib/util.php:1327
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
@@ -9765,12 +9647,12 @@ msgstr[0] "circa un die retro"
 msgstr[1] "circa %d dies retro"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1333
+#: lib/util.php:1330
 msgid "about a month ago"
 msgstr "circa un mense retro"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1337
+#: lib/util.php:1334
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
@@ -9778,7 +9660,7 @@ msgstr[0] "circa un mense retro"
 msgstr[1] "circa %d menses retro"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1340
+#: lib/util.php:1337
 msgid "about a year ago"
 msgstr "circa un anno retro"
 
@@ -9819,3 +9701,64 @@ msgstr "XML invalide, radice XRD mancante."
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr "Obtene copia de reserva ex file '%s'."
+
+#~ msgid "Block this user."
+#~ msgstr "Blocar iste usator."
+
+#~ msgid "Delete this notice."
+#~ msgstr "Deler iste nota."
+
+#~ msgid "Delete this user."
+#~ msgstr "Deler iste usator."
+
+#~ msgid "Restore default designs."
+#~ msgstr "Restaurar apparentias predefinite."
+
+#~ msgid "Reset back to default."
+#~ msgstr "Revenir al predefinitiones."
+
+#~ msgid "Save design."
+#~ msgstr "Salveguardar apparentia."
+
+#~ msgid "Disfavor favorite."
+#~ msgstr "Disfavorir favorite."
+
+#~ msgid "\"%s\" not found."
+#~ msgstr "\"%s\" non trovate."
+
+#~ msgid "Notice %s not found."
+#~ msgstr "Nota %s non trovate."
+
+#~ msgid "Attachment %s not found."
+#~ msgstr "Annexo %s non trovate."
+
+#~ msgid "\"%s\" not supported for oembed requests."
+#~ msgstr "\"%s\" non es supportate pro le requestas \"oembed\"."
+
+#~ msgid "Invalid tag: \"%s\"."
+#~ msgstr "Etiquetta invalide: \"%s\"."
+
+#~ msgid "%s updates from everyone."
+#~ msgstr "Actualisationes de totes in %s."
+
+#~ msgid "Password saved"
+#~ msgstr "Contrasigno salveguardate"
+
+#~ msgid "Where you are, like \"City, State (or Region), Country\"."
+#~ msgstr "Ubi tu es, como \"Citate, Stato (o Region), Pais\"."
+
+#~ msgid "Subscribe to this user."
+#~ msgstr "Subscriber a iste usator."
+
+#~ msgid ""
+#~ "Listenee stream license \"%1$s\" is not compatible with site license \"%2"
+#~ "$s\"."
+#~ msgstr ""
+#~ "Le licentia del fluxo que tu ascolta, \"%1$s\", non es compatibile con le "
+#~ "licentia del sito \"%2$s\"."
+
+#~ msgid "Not allowed to use API."
+#~ msgstr "Uso del API non permittite."
+
+#~ msgid "Not allowed to log in."
+#~ msgstr "Apertura de session non permittite."
diff --git a/locale/it/LC_MESSAGES/statusnet.po b/locale/it/LC_MESSAGES/statusnet.po
index 47f3c6f5d8..3f0ab6fa0b 100644
--- a/locale/it/LC_MESSAGES/statusnet.po
+++ b/locale/it/LC_MESSAGES/statusnet.po
@@ -11,17 +11,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-24 10:32+0000\n"
-"PO-Revision-Date: 2011-02-24 10:36:57+0000\n"
+"POT-Creation-Date: 2011-03-03 15:58+0000\n"
+"PO-Revision-Date: 2011-03-03 16:00:53+0000\n"
 "Language-Team: Italian <http://translatewiki.net/wiki/Portal:it>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r82712); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: it\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-02-17 11:39:54+0000\n"
+"X-POT-Import-Date: 2011-02-25 23:49:23+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -135,11 +135,7 @@ msgstr "Pagina inesistente."
 #. 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 use "one time password login" without using an existing user.
-#. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
-#. TRANS: Client error displayed trying to find a user by ID for a non-existing ID.
-#. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when calling a profile action without specifying a user.
 #: actions/all.php:80 actions/allrss.php:69
@@ -157,12 +153,12 @@ msgstr "Pagina inesistente."
 #: actions/apitimelinementions.php:77 actions/apitimelineuser.php:79
 #: actions/avatarbynickname.php:79 actions/favoritesrss.php:72
 #: actions/foaf.php:42 actions/foaf.php:61 actions/hcard.php:67
-#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:78
+#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
 #: actions/remotesubscribe.php:144 actions/remotesubscribe.php:153
-#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:113
-#: actions/showfavorites.php:106 actions/userbyid.php:75
+#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
+#: actions/showfavorites.php:106 actions/userbyid.php:74
 #: actions/usergroups.php:93 actions/userrss.php:40 actions/userxrd.php:59
-#: actions/xrds.php:71 lib/command.php:497 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:509 lib/galleryaction.php:59
 #: lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Utente inesistente."
@@ -290,7 +286,7 @@ msgstr "Messaggi da %1$s e amici su %2$s!"
 #: actions/apigrouplistall.php:120 actions/apigroupmembership.php:105
 #: actions/apigroupshow.php:114 actions/apihelptest.php:84
 #: actions/apistatusesdestroy.php:101 actions/apistatusesretweets.php:110
-#: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:138
+#: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:139
 #: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
 #: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:268
 #: actions/apitimelinegroup.php:147 actions/apitimelinehome.php:173
@@ -524,7 +520,7 @@ msgstr "Destinatario non trovato."
 #. TRANS: Client error displayed trying to direct message another user who's not a friend (403).
 #: actions/apidirectmessagenew.php:144
 #, fuzzy
-msgid "Cannot send direct messages to users who aren't your friend."
+msgid "Can't send direct messages to users who aren't your friend."
 msgstr "Non puoi inviare messaggi diretti a utenti che non sono tuoi amici."
 
 #. TRANS: Client error displayed trying to direct message self (403).
@@ -550,7 +546,7 @@ msgstr "Questo messaggio è già un preferito."
 #. TRANS: Client error displayed when marking a notice as favourite fails.
 #. TRANS: Server error displayed when trying to mark a notice as favorite fails in the database.
 #. TRANS: Error message text shown when a favorite could not be set.
-#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:294
+#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:306
 msgid "Could not create favorite."
 msgstr "Impossibile creare un preferito."
 
@@ -609,7 +605,7 @@ msgstr "Impossibile trovare l'utente destinazione."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:191
 #: actions/newgroup.php:137 actions/profilesettings.php:273
-#: actions/register.php:206
+#: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "Soprannome già in uso. Prova con un altro."
 
@@ -619,7 +615,7 @@ msgstr "Soprannome già in uso. Prova con un altro."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:195
 #: actions/newgroup.php:141 actions/profilesettings.php:243
-#: actions/register.php:208
+#: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "Non è un soprannome valido."
 
@@ -632,7 +628,7 @@ msgstr "Non è un soprannome valido."
 #: actions/apigroupcreate.php:181 actions/editapplication.php:235
 #: actions/editgroup.php:202 actions/newapplication.php:221
 #: actions/newgroup.php:148 actions/profilesettings.php:248
-#: actions/register.php:215
+#: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "L'indirizzo della pagina web non è valido."
 
@@ -642,7 +638,7 @@ msgstr "L'indirizzo della pagina web non è valido."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:191 actions/editgroup.php:206
 #: actions/newgroup.php:152 actions/profilesettings.php:252
-#: actions/register.php:218
+#: actions/register.php:226
 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "Nome troppo lungo (max 255 caratteri)."
@@ -671,7 +667,7 @@ msgstr[1] "La descrizione è troppo lunga (max %d caratteri)."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:215 actions/editgroup.php:218
 #: actions/newgroup.php:164 actions/profilesettings.php:265
-#: actions/register.php:227
+#: actions/register.php:235
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
 msgstr "Ubicazione troppo lunga (max 255 caratteri)."
@@ -728,14 +724,14 @@ msgstr "Gruppo non trovato."
 #. TRANS: Server error displayed when trying to join a group the user is already a member of.
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:333
+#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:345
 msgid "You are already a member of that group."
 msgstr "Fai già parte di quel gruppo."
 
 #. TRANS: Server error displayed when trying to join a group the user is blocked from joining.
 #. 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.
-#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:338
+#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:350
 msgid "You have been blocked from that group by the admin."
 msgstr "L'amministratore ti ha bloccato l'accesso a quel gruppo."
 
@@ -745,7 +741,7 @@ msgstr "L'amministratore ti ha bloccato l'accesso a quel gruppo."
 #. TRANS: %1$s is the joining user's nickname, $2$s is the group nickname for which the join failed.
 #. TRANS: Message given having failed to add a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:350
+#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:362
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "Impossibile iscrivere l'utente %1$s al gruppo %2$s."
@@ -762,7 +758,7 @@ msgstr "Non fai parte di questo gruppo."
 #. TRANS: Message given having failed to remove a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
 #: actions/apigroupleave.php:127 actions/leavegroup.php:133
-#: lib/command.php:398
+#: lib/command.php:410
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
 msgstr "Impossibile rimuovere l'utente %1$s dal gruppo %2$s."
@@ -825,21 +821,20 @@ msgstr "Autorizzazione non presente."
 #. TRANS: Form validation error message.
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
-#. TRANS: Client error displayed when the session token is not okay.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
 #: actions/deletenotice.php:177 actions/disfavor.php:75
 #: actions/emailsettings.php:291 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:65 actions/grouplogo.php:321
 #: actions/groupunblock.php:65 actions/imsettings.php:224
-#: actions/invite.php:60 actions/login.php:131 actions/makeadmin.php:66
+#: actions/invite.php:60 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
-#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:136
-#: actions/othersettings.php:155 actions/passwordsettings.php:137
+#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
+#: actions/othersettings.php:155 actions/passwordsettings.php:138
 #: actions/profilesettings.php:217 actions/recoverpassword.php:383
-#: actions/register.php:164 actions/remotesubscribe.php:76
+#: actions/register.php:172 actions/remotesubscribe.php:76
 #: actions/repeat.php:82 actions/smssettings.php:250 actions/subedit.php:40
-#: actions/subscribe.php:87 actions/tagother.php:166
-#: actions/unsubscribe.php:69 actions/userauthorization.php:53
+#: actions/subscribe.php:86 actions/tagother.php:166
+#: actions/unsubscribe.php:69 actions/userauthorization.php:52
 #: lib/designsettings.php:310
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
@@ -872,7 +867,7 @@ msgstr "Errore nel database nell'inserire l'applicazione utente OAuth."
 #: actions/designadminpanel.php:100 actions/editapplication.php:144
 #: actions/emailsettings.php:310 actions/grouplogo.php:332
 #: actions/imsettings.php:239 actions/newapplication.php:124
-#: actions/oauthconnectionssettings.php:145 actions/recoverpassword.php:46
+#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
 #: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
 msgstr "Invio del modulo inaspettato."
@@ -924,20 +919,19 @@ msgstr "Account"
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group nickname (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT for nick name in a profile.
-#: actions/apioauthauthorize.php:459 actions/login.php:242
-#: actions/profilesettings.php:106 actions/register.php:418
+#: actions/apioauthauthorize.php:459 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:432
 #: actions/showgroup.php:243 actions/tagother.php:94
-#: actions/userauthorization.php:152 lib/groupeditform.php:145
+#: actions/userauthorization.php:145 lib/groupeditform.php:145
 #: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "Soprannome"
 
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:463 actions/login.php:245
-#: actions/register.php:422 lib/accountsettingsaction.php:120
+#: actions/apioauthauthorize.php:463 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:120
 msgid "Password"
 msgstr "Password"
 
@@ -1032,13 +1026,13 @@ msgstr "Nessun messaggio."
 
 #. TRANS: Client error displayed trying to repeat an own notice through the API.
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:537
+#: actions/apistatusesretweet.php:83 lib/command.php:549
 msgid "Cannot repeat your own notice."
 msgstr "Non puoi ripetere un tuo messaggio."
 
 #. TRANS: Client error displayed trying to re-repeat a notice through the API.
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:92 lib/command.php:543
+#: actions/apistatusesretweet.php:92 lib/command.php:555
 msgid "Already repeated that notice."
 msgstr "Hai già ripetuto quel messaggio."
 
@@ -1061,7 +1055,7 @@ msgstr "Metodo delle API non trovato."
 #. TRANS: %s is the requested output format.
 #: actions/apistatusesshow.php:144
 #, fuzzy, php-format
-msgid "Unsupported format: %s."
+msgid "Unsupported format: %s"
 msgstr "Formato non supportato."
 
 #. TRANS: Client error displayed requesting a deleted status.
@@ -1168,14 +1162,13 @@ msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr "%1$s messaggi in risposta a quelli da %2$s / %3$s"
 
 #. TRANS: Title for site timeline. %s is the StatusNet sitename.
-#. TRANS: Public RSS feed title. %s is the StatusNet site name.
 #: actions/apitimelinepublic.php:193 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "Attività pubblica di %s"
 
 #. TRANS: Subtitle for site timeline. %s is the StatusNet sitename.
-#: actions/apitimelinepublic.php:199
+#: actions/apitimelinepublic.php:199 actions/publicrss.php:105
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "Aggiornamenti di %s da tutti!"
@@ -1242,26 +1235,25 @@ msgid "Atom post must be an Atom entry."
 msgstr ""
 
 #. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
-#: actions/apitimelineuser.php:334
+#: actions/apitimelineuser.php:335
 msgid "Can only handle POST activities."
 msgstr ""
 
 #. TRANS: Client error displayed when using an unsupported activity object type.
 #. TRANS: %s is the unsupported activity object type.
-#: actions/apitimelineuser.php:345
+#: actions/apitimelineuser.php:346
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
 #. TRANS: %d is the notice ID (number).
-#: actions/apitimelineuser.php:379
+#: actions/apitimelineuser.php:380
 #, fuzzy, php-format
 msgid "No content for notice %d."
 msgstr "Trova contenuto dei messaggi"
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#. TRANS: %s is the notice URI.
 #: actions/apitimelineuser.php:408
 #, fuzzy, php-format
 msgid "Notice with URI \"%s\" already exists."
@@ -1279,10 +1271,9 @@ msgstr "Metodo delle API non trovato."
 
 #. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
 #. TRANS: Client exception.
-#. TRANS: Client error displayed trying to subscribe to a non-existing profile.
 #: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
 #: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
-#: actions/subscribe.php:110
+#: actions/subscribe.php:107
 msgid "No such profile."
 msgstr "Nessun profilo."
 
@@ -1418,7 +1409,7 @@ msgstr "Impossibile eliminare un preferito."
 #: actions/joingroup.php:95 actions/leavegroup.php:82
 #: actions/leavegroup.php:95 actions/makeadmin.php:86
 #: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:380
+#: lib/command.php:392
 msgid "No such group."
 msgstr "Nessuna gruppo."
 
@@ -1429,7 +1420,7 @@ msgid "Not a member."
 msgstr "Tutti i membri"
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
-#: actions/atompubshowmembership.php:150
+#: actions/atompubshowmembership.php:151
 #, fuzzy
 msgid "Cannot delete someone else's membership."
 msgstr "Impossibile salvare l'abbonamento."
@@ -1535,11 +1526,9 @@ msgstr ""
 
 #. TRANS: Server error displayed in avatar upload page when no matching profile can be found for a user.
 #. TRANS: Server error displayed coming across a request from a user without a profile.
-#. TRANS: Server error displayed when trying to authorise a remote subscription request
-#. TRANS: while the user has no profile.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
 #: actions/grouplogo.php:184 actions/remotesubscribe.php:190
-#: actions/userauthorization.php:75 actions/userrss.php:108
+#: actions/userauthorization.php:72 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr "Utente senza profilo corrispondente."
 
@@ -1597,10 +1586,10 @@ msgstr "Ritaglia"
 msgid "No file uploaded."
 msgstr "Nessun file caricato."
 
-#. TRANS: Avatar upload form instruction after uploading a file.
+#. TRANS: Avatar upload form unstruction after uploading a file.
 #: actions/avatarsettings.php:345
 #, fuzzy
-msgid "Pick a square area of the image to be your avatar."
+msgid "Pick a square area of the image to be your avatar"
 msgstr "Scegli un'area quadrata per la tua immagine personale"
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
@@ -1642,7 +1631,7 @@ msgid "You may not backup your account."
 msgstr ""
 
 #. TRANS: Information displayed on the backup account page.
-#: actions/backupaccount.php:225
+#: actions/backupaccount.php:227
 msgid ""
 "You can backup your account data in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format. This is an experimental feature and provides "
@@ -1652,15 +1641,15 @@ msgid ""
 msgstr ""
 
 #. TRANS: Submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:248
+#: actions/backupaccount.php:250
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Backup"
 msgstr "Sfondo"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:252
-msgid "Backup your account."
+#: actions/backupaccount.php:254
+msgid "Backup your account"
 msgstr ""
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
@@ -1702,7 +1691,7 @@ msgstr "No"
 #. TRANS: Submit button title for 'No' when blocking a user.
 #: actions/block.php:158
 #, fuzzy
-msgid "Do not block this user."
+msgid "Do not block this user"
 msgstr "Non bloccare questo utente"
 
 #. TRANS: Button label on the user block form.
@@ -1719,9 +1708,9 @@ msgid "Yes"
 msgstr "Sì"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:165
-#, fuzzy
-msgid "Block this user."
+#. TRANS: Description of the form to block a user.
+#: actions/block.php:165 lib/blockform.php:79
+msgid "Block this user"
 msgstr "Blocca questo utente"
 
 #. TRANS: Server error displayed when blocking a user fails.
@@ -1886,7 +1875,7 @@ msgstr ""
 #. TRANS: Field label for delete account confirmation entry.
 #. TRANS: Field label for password reset form where the password has to be typed again.
 #: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:262 actions/register.php:426
+#: actions/recoverpassword.php:262 actions/register.php:440
 msgid "Confirm"
 msgstr "Conferma"
 
@@ -1916,14 +1905,14 @@ msgstr "Applicazione non trovata."
 #. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
 #: actions/deleteapplication.php:79 actions/editapplication.php:78
-#: actions/showapplication.php:90
+#: actions/showapplication.php:94
 msgid "You are not the owner of this application."
 msgstr "Questa applicazione non è di tua proprietà."
 
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
-#: actions/newapplication.php:112 actions/showapplication.php:113
-#: lib/action.php:1422
+#: actions/newapplication.php:112 actions/showapplication.php:118
+#: lib/action.php:1425
 msgid "There was a problem with your session token."
 msgstr "Si è verificato un problema con il tuo token di sessione."
 
@@ -1946,13 +1935,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting an application.
 #: actions/deleteapplication.php:161
 #, fuzzy
-msgid "Do not delete this application."
+msgid "Do not delete this application"
 msgstr "Non eliminare l'applicazione"
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
 #: actions/deleteapplication.php:167
 #, fuzzy
-msgid "Delete this application."
+msgid "Delete this application"
 msgstr "Elimina l'applicazione"
 
 #. TRANS: Client error when trying to delete group while not logged in.
@@ -2010,13 +1999,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting a group.
 #: actions/deletegroup.php:224
 #, fuzzy
-msgid "Do not delete this group."
+msgid "Do not delete this group"
 msgstr "Non eliminare il messaggio"
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
 #: actions/deletegroup.php:231
 #, fuzzy
-msgid "Delete this group."
+msgid "Delete this group"
 msgstr "Elimina questo utente"
 
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
@@ -2024,15 +2013,13 @@ msgstr "Elimina questo utente"
 #. TRANS: Client error displayed when trying to mark a notice as favorite without being logged in.
 #. TRANS: Client error displayed trying to block a user from a group while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
-#. TRANS: Client error displayed trying to log out when not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
-#. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
 #. TRANS: Client error displayed when trying to change user options while not logged in.
 #: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
-#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:70
+#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
-#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:98
+#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
 #: lib/adminpanelaction.php:71 lib/profileformaction.php:63
 #: lib/settingsaction.php:72
@@ -2062,13 +2049,12 @@ msgstr "Vuoi eliminare questo messaggio?"
 #. TRANS: Submit button title for 'No' when deleting a notice.
 #: actions/deletenotice.php:159
 #, fuzzy
-msgid "Do not delete this notice."
+msgid "Do not delete this notice"
 msgstr "Non eliminare il messaggio"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:166
-#, fuzzy
-msgid "Delete this notice."
+#: actions/deletenotice.php:166 lib/noticelist.php:673
+msgid "Delete this notice"
 msgstr "Elimina questo messaggio"
 
 #. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
@@ -2105,13 +2091,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting a user.
 #: actions/deleteuser.php:158
 #, fuzzy
-msgid "Do not delete this user."
+msgid "Do not delete this user"
 msgstr "Non eliminare il messaggio"
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
-#: actions/deleteuser.php:165
-#, fuzzy
-msgid "Delete this user."
+#. TRANS: Description of form for deleting a user.
+#: actions/deleteuser.php:165 lib/deleteuserform.php:75
+msgid "Delete this user"
 msgstr "Elimina questo utente"
 
 #. TRANS: Message used as title for design settings for the site.
@@ -2279,21 +2265,21 @@ msgid "Use defaults"
 msgstr "Usa predefiniti"
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:720
-#, fuzzy
-msgid "Restore default designs."
+#. TRANS: Title for button on profile design page to reset all colour settings to default.
+#: actions/designadminpanel.php:720 lib/designsettings.php:259
+msgid "Restore default designs"
 msgstr "Ripristina i valori predefiniti"
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:728
-#, fuzzy
-msgid "Reset back to default."
+#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
+#: actions/designadminpanel.php:728 lib/designsettings.php:267
+msgid "Reset back to default"
 msgstr "Reimposta i valori predefiniti"
 
 #. TRANS: Title for button for saving theme settings.
-#: actions/designadminpanel.php:736
-#, fuzzy
-msgid "Save design."
+#. TRANS: Title for button on profile design page to save settings.
+#: actions/designadminpanel.php:736 lib/designsettings.php:272
+msgid "Save design"
 msgstr "Salva aspetto"
 
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
@@ -2325,7 +2311,7 @@ msgid "You must be logged in to edit an application."
 msgstr "Devi eseguire l'accesso per modificare un'applicazione."
 
 #. TRANS: Client error displayed trying to edit an application that does not exist.
-#: actions/editapplication.php:83 actions/showapplication.php:83
+#: actions/editapplication.php:83 actions/showapplication.php:87
 msgid "No such application."
 msgstr "Nessuna applicazione."
 
@@ -2610,7 +2596,7 @@ msgid "Cannot normalize that email address."
 msgstr "Impossibile normalizzare quell'indirizzo email"
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:393 actions/register.php:204
+#: actions/emailsettings.php:393 actions/register.php:212
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "Non è un indirizzo email valido."
@@ -2687,22 +2673,19 @@ msgstr "Nessun indirizzo email di ricezione."
 
 #. 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.
 #: actions/emailsettings.php:530 actions/emailsettings.php:554
-#: actions/smssettings.php:566 actions/smssettings.php:591
+#: actions/smssettings.php:565 actions/smssettings.php:588
 #, fuzzy
 msgid "Could not update user record."
 msgstr "Impossibile aggiornare il record dell'utente."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
-#. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:534 actions/smssettings.php:570
+#: actions/emailsettings.php:534 actions/smssettings.php:568
 msgid "Incoming email address removed."
 msgstr "Indirizzo email di ricezione rimosso."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
-#. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:558 actions/smssettings.php:595
+#: actions/emailsettings.php:558 actions/smssettings.php:591
 msgid "New incoming email address added."
 msgstr "Nuovo indirizzo email di ricezione aggiunto."
 
@@ -2714,7 +2697,7 @@ msgstr "Questo messaggio è già un preferito!"
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
 #: actions/favor.php:95
 #, fuzzy
-msgid "Disfavor favorite."
+msgid "Disfavor favorite"
 msgstr "Rimuovi preferito"
 
 #. TRANS: Page title for first page of favorited notices.
@@ -2956,13 +2939,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
 #: actions/groupblock.php:191
 #, fuzzy
-msgid "Do not block this user from this group."
+msgid "Do not block this user from this group"
 msgstr "Non bloccare l'utente da questo gruppo"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
 #: actions/groupblock.php:198
 #, fuzzy
-msgid "Block this user from this group."
+msgid "Block this user from this group"
 msgstr "Blocca l'utente da questo gruppo"
 
 #. TRANS: Server error displayed when trying to block a user from a group fails because of an application error.
@@ -2971,7 +2954,6 @@ msgid "Database error blocking user from group."
 msgstr "Errore del database nel bloccare l'utente dal gruppo."
 
 #. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
-#. TRANS: Client error displayed trying to find a user by ID without providing an ID.
 #: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr "Nessun ID."
@@ -3160,10 +3142,8 @@ msgid "Group search"
 msgstr "Cerca gruppi"
 
 #. TRANS: Text on page where groups can be searched if no results were found for a query.
-#. TRANS: Text for notice search results is the query had no results.
-#. TRANS: Message on the "People search" page where a query has no results.
-#: actions/groupsearch.php:82 actions/noticesearch.php:122
-#: actions/peoplesearch.php:87
+#: actions/groupsearch.php:82 actions/noticesearch.php:117
+#: actions/peoplesearch.php:83
 msgid "No results."
 msgstr "Nessun risultato."
 
@@ -3200,7 +3180,6 @@ msgid "User is not blocked from group."
 msgstr "L'utente non è bloccato dal gruppo."
 
 #. TRANS: Server error displayed when unblocking a user from a group fails because of an unknown error.
-#. TRANS: Server error displayed when removing a user block.
 #: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "Errore nel rimuovere il blocco."
@@ -3297,8 +3276,7 @@ msgid "Publish a MicroID for my Jabber/Google Talk address."
 msgstr "Pubblica un MicroID per il mio indirizzo Jabber/GTalk"
 
 #. TRANS: Confirmation message for successful Instant Messaging preferences save.
-#. TRANS: Confirmation message after saving preferences.
-#: actions/imsettings.php:283 actions/othersettings.php:193
+#: actions/imsettings.php:283 actions/othersettings.php:192
 msgid "Preferences saved."
 msgstr "Preferenze salvate."
 
@@ -3594,7 +3572,7 @@ msgstr "Devi eseguire l'accesso per lasciare un gruppo."
 
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
-#: actions/leavegroup.php:103 lib/command.php:386
+#: actions/leavegroup.php:103 lib/command.php:398
 msgid "You are not a member of that group."
 msgstr "Non fai parte di quel gruppo."
 
@@ -3719,41 +3697,39 @@ msgstr "Salva"
 msgid "Save license settings"
 msgstr "Salva impostazioni licenza"
 
-#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
-#: actions/login.php:97 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
 msgid "Already logged in."
 msgstr "Accesso già effettuato."
 
-#: actions/login.php:142
+#: actions/login.php:148
 msgid "Incorrect username or password."
 msgstr "Nome utente o password non corretto."
 
-#. TRANS: Server error displayed when a user object could not be created trying to login using "one time password login".
-#: actions/login.php:148 actions/otp.php:127
+#: actions/login.php:154 actions/otp.php:120
 msgid "Error setting user. You are probably not authorized."
 msgstr "Errore nell'impostare l'utente. Forse non hai l'autorizzazione."
 
-#: actions/login.php:202 actions/login.php:253
+#: actions/login.php:210 actions/login.php:263
 msgid "Login"
 msgstr "Accedi"
 
-#: actions/login.php:239
+#: actions/login.php:249
 msgid "Login to site"
 msgstr "Accedi al sito"
 
-#: actions/login.php:248 actions/register.php:476
+#: actions/login.php:258 actions/register.php:490
 msgid "Remember me"
 msgstr "Ricordami"
 
-#: actions/login.php:249 actions/register.php:478
+#: actions/login.php:259 actions/register.php:492
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "Accedi automaticamente in futuro; non per computer condivisi!"
 
-#: actions/login.php:259
+#: actions/login.php:269
 msgid "Lost or forgotten password?"
 msgstr "Password persa o dimenticata?"
 
-#: actions/login.php:277
+#: actions/login.php:288
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -3761,11 +3737,11 @@ msgstr ""
 "Per motivi di sicurezza, è necessario che tu inserisca il tuo nome utente e "
 "la tua password prima di modificare le impostazioni."
 
-#: actions/login.php:281
+#: actions/login.php:292
 msgid "Login with your username and password."
 msgstr "Accedi con nome utente e password."
 
-#: actions/login.php:284
+#: actions/login.php:295
 #, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -3849,14 +3825,14 @@ msgid "New message"
 msgstr "Nuovo messaggio"
 
 #. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
-#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:501
+#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:513
 msgid "You can't send a message to this user."
 msgstr "Non puoi inviare un messaggio a questo utente."
 
 #. TRANS: Command exception text shown when trying to send a direct message to another user without content.
 #. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
-#: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:478
-#: lib/command.php:581
+#: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:490
+#: lib/command.php:593
 msgid "No content!"
 msgstr "Nessun contenuto!"
 
@@ -3865,7 +3841,7 @@ msgid "No recipient specified."
 msgstr "Nessun destinatario specificato."
 
 #. TRANS: Error text shown when trying to send a direct message to self.
-#: actions/newmessage.php:167 lib/command.php:505
+#: actions/newmessage.php:167 lib/command.php:517
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr "Non inviarti un messaggio, piuttosto ripetilo a voce dolcemente."
@@ -3876,7 +3852,7 @@ msgstr "Messaggio inviato"
 
 #. TRANS: Message given have sent a direct message to another user.
 #. TRANS: %s is the name of the other user.
-#: actions/newmessage.php:188 lib/command.php:513
+#: actions/newmessage.php:188 lib/command.php:525
 #, php-format
 msgid "Direct message to %s sent."
 msgstr "Messaggio diretto a %s inviato."
@@ -3893,9 +3869,7 @@ msgstr "Nuovo messaggio"
 msgid "Notice posted"
 msgstr "Messaggio inviato"
 
-#. TRANS: Instructions for Notice search page.
-#. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/noticesearch.php:69
+#: actions/noticesearch.php:68
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -3904,21 +3878,16 @@ msgstr ""
 "Cerca tra i messaggi su %%site.name%% in base al contenuto. Separa i termini "
 "di ricerca con degli spazi; lunghezza minima 3 caratteri."
 
-#. TRANS: Title of the page where users can search for notices.
-#: actions/noticesearch.php:80
+#: actions/noticesearch.php:78
 msgid "Text search"
 msgstr "Cerca testo"
 
-#. TRANS: Test in RSS notice search.
-#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearch.php:95
+#: actions/noticesearch.php:91
 #, php-format
 msgid "Search results for \"%1$s\" on %2$s"
 msgstr "Risultati della ricerca per \"%1$s\" su %2$s"
 
-#. TRANS: Text for logged in users making a query for notices without results.
-#. TRANS: This message contains a Markdown link.
-#: actions/noticesearch.php:128
+#: actions/noticesearch.php:121
 #, php-format
 msgid ""
 "Be the first to [post on this topic](%%%%action.newnotice%%%%?"
@@ -3927,9 +3896,7 @@ msgstr ""
 "[Scrivi qualche cosa](%%%%action.newnotice%%%%?status_textarea=%s) su questo "
 "argomento!"
 
-#. TRANS: Text for not logged in users making a query for notices without results.
-#. TRANS: This message contains Markdown links.
-#: actions/noticesearch.php:133
+#: actions/noticesearch.php:124
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and be the first to "
@@ -3938,17 +3905,14 @@ msgstr ""
 "Perché non [crei un account](%%%%action.register%%%%) e [scrivi qualche cosa]"
 "(%%%%action.newnotice%%%%?status_textarea=%s) su questo argomento!"
 
-#. TRANS: RSS notice search feed title. %s is the query.
-#: actions/noticesearchrss.php:95
+#: actions/noticesearchrss.php:96
 #, php-format
 msgid "Updates with \"%s\""
 msgstr "Messaggi con \"%s\""
 
-#. TRANS: RSS notice search feed description.
-#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearchrss.php:99
+#: actions/noticesearchrss.php:98
 #, fuzzy, php-format
-msgid "Updates matching search term \"%1$s\" on %2$s."
+msgid "Updates matching search term \"%1$s\" on %2$s!"
 msgstr "Messaggi che corrispondono al termine \"%1$s\" su %2$s!"
 
 #: actions/nudge.php:85
@@ -3990,31 +3954,31 @@ msgid "You have not registered any applications yet."
 msgstr "Non hai ancora registrato alcuna applicazione."
 
 #. TRANS: Title for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:70
+#: actions/oauthconnectionssettings.php:71
 msgid "Connected applications"
 msgstr "Applicazioni collegate"
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:81
+#: actions/oauthconnectionssettings.php:83
 #, fuzzy
 msgid "The following connections exist for your account."
 msgstr "Hai consentito alle seguenti applicazioni di accedere al tuo account."
 
 #. TRANS: Client error when trying to revoke access for an application while not being a user of it.
-#: actions/oauthconnectionssettings.php:166
+#: actions/oauthconnectionssettings.php:168
 msgid "You are not a user of that application."
 msgstr "Non sei un utente di quella applicazione."
 
 #. TRANS: Client error when revoking access has failed for some reason.
 #. TRANS: %s is the application ID revoking access failed for.
-#: actions/oauthconnectionssettings.php:181
+#: actions/oauthconnectionssettings.php:183
 #, fuzzy, php-format
 msgid "Unable to revoke access for application: %s."
 msgstr "Impossibile revocare l'accesso per l'applicazione: %s."
 
 #. TRANS: Success message after revoking access for an application.
 #. TRANS: %1$s is the application name, %2$s is the first part of the user token.
-#: actions/oauthconnectionssettings.php:200
+#: actions/oauthconnectionssettings.php:202
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -4022,30 +3986,20 @@ msgid ""
 msgstr ""
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:211
+#: actions/oauthconnectionssettings.php:213
 msgid "You have not authorized any applications to use your account."
 msgstr "Non hai autorizzato alcuna applicazione all'uso del tuo account."
 
 #. TRANS: Note for developers in the OAuth connection settings form.
 #. TRANS: This message contains a Markdown link. Do not separate "](".
 #. TRANS: %s is the URL to the OAuth settings.
-#: actions/oauthconnectionssettings.php:231
+#: actions/oauthconnectionssettings.php:233
 #, php-format
 msgid ""
 "Are you a developer? [Register an OAuth client application](%s) to use with "
 "this instance of StatusNet."
 msgstr ""
 
-#: actions/oembed.php:64
-#, fuzzy, php-format
-msgid "\"%s\" not found."
-msgstr "Metodo delle API non trovato."
-
-#: actions/oembed.php:76
-#, fuzzy, php-format
-msgid "Notice %s not found."
-msgstr "Metodo delle API non trovato."
-
 #: actions/oembed.php:80 actions/shownotice.php:100
 msgid "Notice has no profile."
 msgstr "Il messaggio non ha un profilo."
@@ -4055,16 +4009,6 @@ msgstr "Il messaggio non ha un profilo."
 msgid "%1$s's status on %2$s"
 msgstr "Stato di %1$s su %2$s"
 
-#: actions/oembed.php:95
-#, fuzzy, php-format
-msgid "Attachment %s not found."
-msgstr "Destinatario non trovato."
-
-#: actions/oembed.php:136
-#, php-format
-msgid "\"%s\" not supported for oembed requests."
-msgstr ""
-
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
 #: actions/oembed.php:168
 #, php-format
@@ -4083,12 +4027,11 @@ msgstr "Solo URL %s attraverso HTTP semplice."
 msgid "Not a supported data format."
 msgstr "Non è un formato di dati supportato."
 
-#. TRANS: ShortName in the OpenSearch interface when trying to find users.
 #: actions/opensearch.php:64
 msgid "People Search"
 msgstr "Cerca persone"
 
-#: actions/opensearch.php:68
+#: actions/opensearch.php:67
 msgid "Notice Search"
 msgstr "Cerca messaggi"
 
@@ -4136,46 +4079,37 @@ msgstr "Mostra o nasconde gli aspetti del profilo"
 msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr "Il servizio di riduzione degli URL è troppo lungo (max 50 caratteri)."
 
-#. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
-#: actions/otp.php:70
+#: actions/otp.php:69
 msgid "No user ID specified."
 msgstr "Nessun ID utente specificato."
 
-#. TRANS: Client error displayed trying to use "one time password login" without specifying a login token.
-#: actions/otp.php:86
+#: actions/otp.php:83
 msgid "No login token specified."
 msgstr "Nessun token di accesso specificato."
 
-#. TRANS: Client error displayed trying to use "one time password login" without requesting a login token.
-#: actions/otp.php:94
+#: actions/otp.php:90
 msgid "No login token requested."
 msgstr "Nessun token di accesso richiesto."
 
-#. TRANS: Client error displayed trying to use "one time password login" while specifying an invalid login token.
-#: actions/otp.php:100
+#: actions/otp.php:95
 msgid "Invalid login token specified."
 msgstr "Token di accesso specificato non valido."
 
-#. TRANS: Client error displayed trying to use "one time password login" while specifying an expired login token.
-#: actions/otp.php:110
+#: actions/otp.php:104
 msgid "Login token expired."
 msgstr "Token di accesso scaduto."
 
-#. TRANS: Title for outbox for any but the fist page.
-#. TRANS: %1$s is the user nickname, %2$d is the page number.
-#: actions/outbox.php:57
+#: actions/outbox.php:58
 #, php-format
 msgid "Outbox for %1$s - page %2$d"
 msgstr "Casella posta inviata di %s - pagina %2$d"
 
-#. TRANS: Title for first page of outbox.
 #: actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
 msgstr "Casella posta inviata di %s"
 
-#. TRANS: Instructions for outbox.
-#: actions/outbox.php:103
+#: actions/outbox.php:104
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr ""
 "Questa è la casella della tua posta inviata, contiene i messaggi privati che "
@@ -4203,45 +4137,43 @@ msgstr "Vecchia password"
 msgid "New password"
 msgstr "Nuova password"
 
-#: actions/passwordsettings.php:109 actions/register.php:423
+#: actions/passwordsettings.php:109
 #, fuzzy
-msgid "6 or more characters."
+msgid "6 or more characters"
 msgstr "6 o più caratteri"
 
-#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:264
-#: actions/register.php:427
+#: actions/passwordsettings.php:113
 #, fuzzy
-msgid "Same as password above."
+msgid "Same as password above"
 msgstr "Stessa password di sopra"
 
 #: actions/passwordsettings.php:117
 msgid "Change"
 msgstr "Modifica"
 
-#: actions/passwordsettings.php:153 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:238
 msgid "Password must be 6 or more characters."
 msgstr "La password deve essere di 6 o più caratteri."
 
-#: actions/passwordsettings.php:156 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:241
 msgid "Passwords don't match."
 msgstr "Le password non corrispondono."
 
-#: actions/passwordsettings.php:164
+#: actions/passwordsettings.php:165
 msgid "Incorrect old password"
 msgstr "Vecchia password non corretta"
 
-#: actions/passwordsettings.php:180
+#: actions/passwordsettings.php:181
 msgid "Error saving user; invalid."
 msgstr "Errore nel salvare l'utente; non valido."
 
-#. TRANS: Reset password form validation error message.
-#: actions/passwordsettings.php:185 actions/recoverpassword.php:418
+#: actions/passwordsettings.php:186
 #, fuzzy
-msgid "Cannot save new password."
+msgid "Can't save new password."
 msgstr "Impossibile salvare la nuova password."
 
-#: actions/passwordsettings.php:191
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
 msgid "Password saved."
 msgstr "Password salvata."
 
@@ -4533,9 +4465,7 @@ msgstr "Server a cui dirigere le richieste SSL"
 msgid "Save paths"
 msgstr "Salva percorsi"
 
-#. TRANS: Instructions for the "People search" page.
-#. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/peoplesearch.php:54
+#: actions/peoplesearch.php:52
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
@@ -4544,8 +4474,7 @@ msgstr ""
 "Cerca tra le persone su %%site.name%% per nome, ubicazione o interessi. "
 "Separa i termini di ricerca con degli spazi; lunghezza minima 3 caratteri."
 
-#. TRANS: Title of a page where users can search for other users.
-#: actions/peoplesearch.php:61
+#: actions/peoplesearch.php:58
 msgid "People search"
 msgstr "Cerca persone"
 
@@ -4589,7 +4518,7 @@ msgid "Profile information"
 msgstr "Informazioni sul profilo"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109 actions/register.php:419
+#: actions/profilesettings.php:109 actions/register.php:433
 #, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr ""
@@ -4598,7 +4527,7 @@ msgstr ""
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for full group name (dt). Text hidden by default.
 #. TRANS: DT for full name in a profile.
-#: actions/profilesettings.php:113 actions/register.php:441
+#: actions/profilesettings.php:113 actions/register.php:455
 #: actions/showgroup.php:255 actions/tagother.php:104
 #: lib/groupeditform.php:150 lib/userprofile.php:156
 msgid "Full name"
@@ -4606,13 +4535,13 @@ msgstr "Nome"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:118 actions/register.php:446
+#: actions/profilesettings.php:118 actions/register.php:460
 #: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "Pagina web"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:121 actions/register.php:448
+#: actions/profilesettings.php:121
 #, fuzzy
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr "URL della tua pagina web, blog o profilo su un altro sito"
@@ -4620,7 +4549,7 @@ msgstr "URL della tua pagina web, blog o profilo su un altro sito"
 #. TRANS: Tooltip for field label in form for profile settings. Plural
 #. TRANS: is decided by the number of characters available for the
 #. TRANS: biography (%d).
-#: actions/profilesettings.php:129 actions/register.php:457
+#: actions/profilesettings.php:129 actions/register.php:471
 #, fuzzy, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4628,29 +4557,28 @@ msgstr[0] "Descriviti assieme ai tuoi interessi in %d caratteri"
 msgstr[1] "Descriviti assieme ai tuoi interessi in %d caratteri"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:135 actions/register.php:462
+#: actions/profilesettings.php:135 actions/register.php:476
 msgid "Describe yourself and your interests"
 msgstr "Descrivi te e i tuoi interessi"
 
 #. TRANS: Text area label in form for profile settings where users can provide.
 #. TRANS: their biography.
-#: actions/profilesettings.php:139 actions/register.php:464
+#: actions/profilesettings.php:139 actions/register.php:478
 msgid "Bio"
 msgstr "Biografia"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group location (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT for location in a profile.
-#: actions/profilesettings.php:145 actions/register.php:469
+#: actions/profilesettings.php:145 actions/register.php:483
 #: actions/showgroup.php:265 actions/tagother.php:112
-#: actions/userauthorization.php:174 lib/groupeditform.php:173
+#: actions/userauthorization.php:166 lib/groupeditform.php:173
 #: lib/userprofile.php:172
 msgid "Location"
 msgstr "Ubicazione"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148
+#: actions/profilesettings.php:148 actions/register.php:485
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Dove ti trovi, tipo \"città, regione, stato\""
 
@@ -4671,8 +4599,7 @@ msgstr "Etichette"
 #: actions/profilesettings.php:164
 #, fuzzy
 msgid ""
-"Tags for yourself (letters, numbers, -, ., and _), comma- or space- "
-"separated."
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr ""
 "Le tue etichette (lettere, numeri, -, . e _), separate da virgole o spazi"
 
@@ -4684,7 +4611,7 @@ msgstr "Lingua"
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
 #: actions/profilesettings.php:171
 #, fuzzy
-msgid "Preferred language."
+msgid "Preferred language"
 msgstr "Lingua preferita"
 
 #. TRANS: Dropdownlist label in form for profile settings.
@@ -4701,7 +4628,7 @@ msgstr "In che fuso orario risiedi solitamente?"
 #: actions/profilesettings.php:189
 #, fuzzy
 msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)."
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr ""
 "Abbonami automaticamente a chi si abbona ai miei messaggi (utile per i non-"
 "umani)"
@@ -4709,7 +4636,7 @@ msgstr ""
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Plural form is used based on the maximum number of allowed
 #. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:258 actions/register.php:221
+#: actions/profilesettings.php:258 actions/register.php:229
 #, fuzzy, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4729,9 +4656,9 @@ msgstr "La lingua è troppo lunga (max 50 caratteri)."
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:291
-#, fuzzy, php-format
-msgid "Invalid tag: \"%s\"."
+#: actions/profilesettings.php:291 actions/tagother.php:178
+#, php-format
+msgid "Invalid tag: \"%s\""
 msgstr "Etichetta non valida: \"%s\""
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
@@ -4839,12 +4766,6 @@ msgstr ""
 "wiki/Microblogging) basato sul software libero [StatusNet](http://status."
 "net/)."
 
-#. TRANS: Public RSS feed description. %s is the StatusNet site name.
-#: actions/publicrss.php:106
-#, fuzzy, php-format
-msgid "%s updates from everyone."
-msgstr "Aggiornamenti di %s da tutti!"
-
 #. TRANS: Title for public tag cloud.
 #: actions/publictagcloud.php:57
 msgid "Public tag cloud"
@@ -4979,12 +4900,6 @@ msgstr "Recupera la password"
 msgid "Password recovery requested"
 msgstr "Richiesta password di ripristino"
 
-#. TRANS: Title for password recovery page in password saved mode.
-#: actions/recoverpassword.php:229
-#, fuzzy
-msgid "Password saved"
-msgstr "Password salvata."
-
 #. TRANS: Title for password recovery page when an unknown action has been specified.
 #: actions/recoverpassword.php:232
 msgid "Unknown action"
@@ -4996,6 +4911,12 @@ msgstr "Azione sconosciuta"
 msgid "6 or more characters, and do not forget it!"
 msgstr "6 o più caratteri, e non dimenticarla!"
 
+#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#: actions/recoverpassword.php:264 actions/register.php:441
+#, fuzzy
+msgid "Same as password above."
+msgstr "Stessa password di sopra"
+
 #. TRANS: Button text for password reset form.
 #. TRANS: Button text on profile design page to reset all colour settings to default without saving.
 #: actions/recoverpassword.php:268 lib/designsettings.php:264
@@ -5049,8 +4970,14 @@ msgstr "La password deve essere lunga almeno 6 caratteri."
 msgid "Password and confirmation do not match."
 msgstr "La password e la conferma non corrispondono."
 
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:418
+#, fuzzy
+msgid "Cannot save new password."
+msgstr "Impossibile salvare la nuova password."
+
 #. TRANS: Server error displayed when something does wrong with the user object during password reset.
-#: actions/recoverpassword.php:426 actions/register.php:248
+#: actions/recoverpassword.php:426 actions/register.php:256
 msgid "Error setting user."
 msgstr "Errore nell'impostare l'utente."
 
@@ -5059,94 +4986,99 @@ msgstr "Errore nell'impostare l'utente."
 msgid "New password successfully saved. You are now logged in."
 msgstr "Nuova password salvata con successo. Hai effettuato l'accesso."
 
-#: actions/register.php:87 actions/register.php:188 actions/register.php:399
+#: actions/register.php:92 actions/register.php:196 actions/register.php:413
 msgid "Sorry, only invited people can register."
 msgstr "Solo le persone invitate possono registrarsi."
 
-#: actions/register.php:94
+#: actions/register.php:99
 msgid "Sorry, invalid invitation code."
 msgstr "Codice di invito non valido."
 
-#: actions/register.php:113
+#: actions/register.php:119
 msgid "Registration successful"
 msgstr "Registrazione riuscita"
 
-#: actions/register.php:115 actions/register.php:497
+#: actions/register.php:121 actions/register.php:511
 msgid "Register"
 msgstr "Registrati"
 
-#: actions/register.php:135
+#: actions/register.php:142
 msgid "Registration not allowed."
 msgstr "Registrazione non consentita."
 
-#: actions/register.php:201
+#: actions/register.php:209
 #, fuzzy
-msgid "You cannot register if you don't agree to the license."
+msgid "You can't register if you don't agree to the license."
 msgstr "Non puoi registrarti se non accetti la licenza."
 
-#: actions/register.php:210
+#: actions/register.php:218
 msgid "Email address already exists."
 msgstr "Indirizzo email già esistente."
 
-#: actions/register.php:243 actions/register.php:265
+#: actions/register.php:251 actions/register.php:273
 msgid "Invalid username or password."
 msgstr "Nome utente o password non valido."
 
-#: actions/register.php:340
+#: actions/register.php:351
 #, fuzzy
 msgid ""
 "With this form you can create a new account. You can then post notices and "
-"link up to friends and colleagues."
+"link up to friends and colleagues. "
 msgstr ""
 "Attraverso questo modulo puoi creare un nuovo account con cui potrai "
 "successivamente inviare messaggi e metterti in contatto con i tuoi amici e "
 "colleghi. "
 
+#: actions/register.php:437
+#, fuzzy
+msgid "6 or more characters."
+msgstr "6 o più caratteri"
+
 #. TRANS: Link description in user account settings menu.
-#: actions/register.php:431 actions/register.php:435
+#: actions/register.php:445 actions/register.php:449
 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
 msgid "Email"
 msgstr "Email"
 
-#: actions/register.php:432 actions/register.php:436
+#: actions/register.php:446 actions/register.php:450
 #, fuzzy
-msgid "Used only for updates, announcements, and password recovery."
+msgid "Used only for updates, announcements, and password recovery"
 msgstr "Usata solo per aggiornamenti, annunci e recupero password"
 
-#: actions/register.php:443
+#: actions/register.php:457
 #, fuzzy
-msgid "Longer name, preferably your \"real\" name."
+msgid "Longer name, preferably your \"real\" name"
 msgstr "Nome completo, preferibilmente il tuo \"vero\" nome"
 
-#: actions/register.php:471
+#: actions/register.php:462
 #, fuzzy
-msgid "Where you are, like \"City, State (or Region), Country\"."
-msgstr "Dove ti trovi, tipo \"città, regione, stato\""
+msgid "URL of your homepage, blog, or profile on another site"
+msgstr "URL della tua pagina web, blog o profilo su un altro sito"
 
-#: actions/register.php:510
+#: actions/register.php:523
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
 msgstr ""
 "Comprendo che i contenuti e i dati di %1$s sono privati e confidenziali."
 
-#: actions/register.php:520
+#: actions/register.php:533
 #, php-format
 msgid "My text and files are copyright by %1$s."
 msgstr "I miei testi e i miei file sono copyright di %1$s."
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:524
+#: actions/register.php:537
 msgid "My text and files remain under my own copyright."
 msgstr "I miei testi e file restano sotto il mio diretto copyright."
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:527
+#: actions/register.php:540
 msgid "All rights reserved."
 msgstr "Tutti i diritti riservati."
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:532
+#: actions/register.php:545
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -5156,7 +5088,7 @@ msgstr ""
 "dati personali: password, indirizzo email, indirizzo messaggistica "
 "istantanea e numero di telefono."
 
-#: actions/register.php:573
+#: actions/register.php:588
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -5190,7 +5122,7 @@ msgstr ""
 "Grazie per la tua iscrizione e speriamo tu possa divertiti usando questo "
 "servizio."
 
-#: actions/register.php:597
+#: actions/register.php:612
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5224,7 +5156,7 @@ msgstr "Soprannome dell'utente"
 
 #: actions/remotesubscribe.php:129
 #, fuzzy
-msgid "Nickname of the user you want to follow."
+msgid "Nickname of the user you want to follow"
 msgstr "Soprannome dell'utente che vuoi seguire"
 
 #: actions/remotesubscribe.php:132
@@ -5233,7 +5165,7 @@ msgstr "URL del profilo"
 
 #: actions/remotesubscribe.php:133
 #, fuzzy
-msgid "URL of your profile on another compatible microblogging service."
+msgid "URL of your profile on another compatible microblogging service"
 msgstr "URL del tuo profilo su un altro servizio di microblog compatibile"
 
 #. TRANS: Link text for link that will subscribe to a remote profile.
@@ -5244,7 +5176,7 @@ msgstr "Abbonati"
 
 #: actions/remotesubscribe.php:158
 #, fuzzy
-msgid "Invalid profile URL (bad format)."
+msgid "Invalid profile URL (bad format)"
 msgstr "URL del profilo non valido (formato errato)"
 
 #: actions/remotesubscribe.php:167
@@ -5288,7 +5220,6 @@ msgstr "Ripetuti"
 msgid "Repeated!"
 msgstr "Ripetuti!"
 
-#. TRANS: RSS reply feed title. %s is a user nickname.
 #. TRANS: Tooltip for personal group navigation menu option when logged in for viewing @-replies.
 #: actions/replies.php:126 actions/repliesrss.php:68
 #: lib/personalgroupnav.php:109
@@ -5341,11 +5272,9 @@ msgstr ""
 "[Scrivi qualche cosa](%%%%action.newnotice%%%%?status_textarea=%s) su questo "
 "argomento!"
 
-#. TRANS: RSS reply feed description.
-#. TRANS: %1$s is a user nickname, %2$s is the StatusNet site name.
-#: actions/repliesrss.php:74
+#: actions/repliesrss.php:72
 #, fuzzy, php-format
-msgid "Replies to %1$s on %2$s."
+msgid "Replies to %1$s on %2$s!"
 msgstr "Risposte a %1$s su %2$s!"
 
 #. TRANS: Client exception displayed when trying to restore an account while not logged in.
@@ -5447,7 +5376,7 @@ msgstr "Non puoi revocare i ruoli degli utenti su questo sito."
 msgid "User doesn't have this role."
 msgstr "L'utente non ricopre questo ruolo."
 
-#: actions/rsd.php:142 actions/version.php:159
+#: actions/rsd.php:146 actions/version.php:159
 msgid "StatusNet"
 msgstr "StatusNet"
 
@@ -5489,87 +5418,87 @@ msgstr "Abilita il debug per le sessioni"
 msgid "Save site settings"
 msgstr "Salva impostazioni"
 
-#: actions/showapplication.php:78
+#: actions/showapplication.php:82
 msgid "You must be logged in to view an application."
 msgstr "Devi eseguire l'accesso per visualizzare un'applicazione."
 
-#: actions/showapplication.php:151
+#: actions/showapplication.php:157
 msgid "Application profile"
 msgstr "Profilo applicazione"
 
 #. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:153 lib/applicationeditform.php:177
+#: actions/showapplication.php:159 lib/applicationeditform.php:177
 msgid "Icon"
 msgstr "Icona"
 
 #. TRANS: Form input field label for application name.
-#: actions/showapplication.php:163 actions/version.php:197
+#: actions/showapplication.php:169 actions/version.php:197
 #: lib/applicationeditform.php:190
 msgid "Name"
 msgstr "Nome"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:172 lib/applicationeditform.php:227
+#: actions/showapplication.php:178 lib/applicationeditform.php:227
 msgid "Organization"
 msgstr "Organizzazione"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:181 actions/version.php:200
+#: actions/showapplication.php:187 actions/version.php:200
 #: lib/applicationeditform.php:208 lib/groupeditform.php:168
 msgid "Description"
 msgstr "Descrizione"
 
 #. TRANS: Header for group statistics on a group page (h2).
 #. TRANS: H2 text for user statistics.
-#: actions/showapplication.php:186 actions/showgroup.php:460
+#: actions/showapplication.php:192 actions/showgroup.php:460
 #: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "Statistiche"
 
-#: actions/showapplication.php:197
+#: actions/showapplication.php:203
 #, php-format
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr "creata da %1$s - %2$s accessi predefiniti - %3$d utenti"
 
-#: actions/showapplication.php:207
+#: actions/showapplication.php:213
 msgid "Application actions"
 msgstr "Azioni applicazione"
 
-#: actions/showapplication.php:230
+#: actions/showapplication.php:236
 msgid "Reset key & secret"
 msgstr "Reimposta chiave e segreto"
 
 #. TRANS: Title of form for deleting a user.
-#: actions/showapplication.php:246 lib/deletegroupform.php:121
+#: actions/showapplication.php:252 lib/deletegroupform.php:121
 #: lib/deleteuserform.php:64 lib/noticelist.php:673
 msgid "Delete"
 msgstr "Elimina"
 
-#: actions/showapplication.php:255
+#: actions/showapplication.php:261
 msgid "Application info"
 msgstr "Informazioni applicazione"
 
-#: actions/showapplication.php:257
+#: actions/showapplication.php:263
 msgid "Consumer key"
 msgstr "Chiave consumatore"
 
-#: actions/showapplication.php:262
+#: actions/showapplication.php:268
 msgid "Consumer secret"
 msgstr "Segreto consumatore"
 
-#: actions/showapplication.php:267
+#: actions/showapplication.php:273
 msgid "Request token URL"
 msgstr "URL token di richiesta"
 
-#: actions/showapplication.php:272
+#: actions/showapplication.php:278
 msgid "Access token URL"
 msgstr "URL token di accesso"
 
-#: actions/showapplication.php:277
+#: actions/showapplication.php:283
 msgid "Authorize URL"
 msgstr "URL di autorizzazione"
 
-#: actions/showapplication.php:282
+#: actions/showapplication.php:288
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
@@ -5577,7 +5506,7 @@ msgstr ""
 "Nota: sono supportate firme HMAC-SHA1, ma non è supportato il metodo di "
 "firma di testo in chiaro."
 
-#: actions/showapplication.php:302
+#: actions/showapplication.php:309
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr "Ripristinare la chiave e il segreto?"
 
@@ -5668,18 +5597,16 @@ msgid "Group profile"
 msgstr "Profilo del gruppo"
 
 #. TRANS: Label for group URL (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT for URL in a profile.
 #: actions/showgroup.php:273 actions/tagother.php:118
-#: actions/userauthorization.php:184 lib/userprofile.php:186
+#: actions/userauthorization.php:175 lib/userprofile.php:186
 msgid "URL"
 msgstr "URL"
 
 #. TRANS: Label for group description or group note (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page where bio is displayed.
 #. TRANS: DT for note in a profile.
 #: actions/showgroup.php:285 actions/tagother.php:128
-#: actions/userauthorization.php:197 lib/userprofile.php:204
+#: actions/userauthorization.php:187 lib/userprofile.php:204
 msgid "Note"
 msgstr "Nota"
 
@@ -5826,7 +5753,7 @@ msgid "%1$s tagged %2$s"
 msgstr "%1$s, pagina %2$s"
 
 #. TRANS: Page title showing tagged notices in one user's stream.
-#. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
+#. TRANS: %1$s is the username, %2$s is the hash tag, %1$d is the page number.
 #: actions/showstream.php:74
 #, fuzzy, php-format
 msgid "%1$s tagged %2$s, page %3$d"
@@ -6077,7 +6004,7 @@ msgstr "Testo messaggio del sito (massimo 255 caratteri, HTML consentito)"
 #. TRANS: Title for button to save site notice in admin panel.
 #: actions/sitenoticeadminpanel.php:201
 #, fuzzy
-msgid "Save site notice."
+msgid "Save site notice"
 msgstr "Salva messaggio"
 
 #. TRANS: Title for SMS settings.
@@ -6136,7 +6063,7 @@ msgstr "Numero di telefono per SMS"
 #. TRANS: SMS phone number input field instructions in SMS settings form.
 #: actions/smssettings.php:152
 #, fuzzy
-msgid "Phone number, no punctuation or spaces, with area code."
+msgid "Phone number, no punctuation or spaces, with area code"
 msgstr "Numero di telefono, senza punteggiatura o spazi, con il prefisso"
 
 #. TRANS: Form legend for SMS preferences form.
@@ -6305,20 +6232,16 @@ msgstr "Non hai una abbonamento a quel profilo."
 msgid "Could not save subscription."
 msgstr "Impossibile salvare l'abbonamento."
 
-#. TRANS: Client error displayed trying to perform any request method other than POST.
-#. TRANS: Do not translate POST.
 #: actions/subscribe.php:77
 msgid "This action only accepts POST requests."
 msgstr "Quest'azione accetta solo richieste POST."
 
-#. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
-#: actions/subscribe.php:121
+#: actions/subscribe.php:117
 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
 msgstr ""
 "Non è possibile abbonarsi a un profilo remoto OMB 0.1 con quest'azione."
 
-#. TRANS: Page title when subscription succeeded.
-#: actions/subscribe.php:149
+#: actions/subscribe.php:145
 msgid "Subscribed"
 msgstr "Abbonati"
 
@@ -6478,9 +6401,8 @@ msgstr "Etichetta %s"
 msgid "User profile"
 msgstr "Profilo utente"
 
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT element in area for user avatar.
-#: actions/tagother.php:81 actions/userauthorization.php:138
+#: actions/tagother.php:81 actions/userauthorization.php:132
 #: lib/userprofile.php:108
 msgid "Photo"
 msgstr "Fotografia"
@@ -6497,11 +6419,6 @@ msgstr ""
 "Etichette per questo utente (lettere, numeri, -, . e _), separate da virgole "
 "o spazi"
 
-#: actions/tagother.php:178
-#, php-format
-msgid "Invalid tag: \"%s\""
-msgstr "Etichetta non valida: \"%s\""
-
 #: actions/tagother.php:193
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
@@ -6519,7 +6436,6 @@ msgstr ""
 msgid "No such tag."
 msgstr "Nessuna etichetta."
 
-#. TRANS: Client error displayed when trying to unblock a non-blocked user.
 #: actions/unblock.php:59
 msgid "You haven't blocked that user."
 msgstr "Non hai bloccato quell'utente."
@@ -6540,7 +6456,7 @@ msgstr "Nessun ID di profilo nella richiesta."
 msgid "Unsubscribed"
 msgstr "Abbonamento annullato"
 
-#: actions/updateprofile.php:64
+#: actions/updateprofile.php:64 actions/userauthorization.php:337
 #, php-format
 msgid ""
 "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
@@ -6575,7 +6491,7 @@ msgstr ""
 #. TRANS: users in user admin panel. %1$s is the invalid nickname.
 #: actions/useradminpanel.php:166
 #, fuzzy, php-format
-msgid "Invalid default subscripton: \"%1$s\" is not a user."
+msgid "Invalid default subscripton: '%1$s' is not a user."
 msgstr "Abbonamento predefinito non valido: \"%1$s\" non è un utente."
 
 #. TRANS: Link description in user account settings menu.
@@ -6637,69 +6553,58 @@ msgstr "Indica se consentire agli utenti di invitarne di nuovi"
 #. TRANS: Title for button to save user settings in user admin panel.
 #: actions/useradminpanel.php:302
 #, fuzzy
-msgid "Save user settings."
+msgid "Save user settings"
 msgstr "Salva impostazioni utente"
 
-#. TRANS: Page title.
-#: actions/userauthorization.php:109
+#: actions/userauthorization.php:105
 msgid "Authorize subscription"
 msgstr "Autorizza abbonamento"
 
-#. TRANS: Page notice on "Auhtorize subscription" page.
-#: actions/userauthorization.php:115
+#: actions/userauthorization.php:110
 #, fuzzy
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
 "user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
-"click \"Reject\"."
+"click “Reject”."
 msgstr ""
 "Controlla i dettagli seguenti per essere sicuro di volerti abbonare ai "
 "messaggi di questo utente. Se non hai richiesto ciò, fai clic su \"Rifiuta\"."
 
-#. TRANS: DT element on Authorise Subscription page where license is displayed.
 #. TRANS: Menu item for site administration
-#: actions/userauthorization.php:207 actions/version.php:167
+#: actions/userauthorization.php:196 actions/version.php:167
 #: lib/adminpanelaction.php:403
 msgid "License"
 msgstr "Licenza"
 
-#. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:229
+#: actions/userauthorization.php:217
 #, fuzzy
-msgctxt "BUTTON"
 msgid "Accept"
 msgstr "Accetta"
 
-#. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:231
-#, fuzzy
-msgid "Subscribe to this user."
+#: actions/userauthorization.php:218 lib/subscribeform.php:115
+#: lib/subscribeform.php:139
+msgid "Subscribe to this user"
 msgstr "Abbonati a questo utente"
 
-#. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:233
+#: actions/userauthorization.php:219
 #, fuzzy
-msgctxt "BUTTON"
 msgid "Reject"
 msgstr "Rifiuta"
 
-#. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:235
+#: actions/userauthorization.php:220
 #, fuzzy
-msgid "Reject this subscription."
+msgid "Reject this subscription"
 msgstr "Rifiuta questo abbonamento"
 
-#. TRANS: Client error displayed for an empty authorisation request.
-#: actions/userauthorization.php:248
+#: actions/userauthorization.php:232
 msgid "No authorization request!"
 msgstr "Nessuna richiesta di autorizzazione!"
 
-#. TRANS: Accept message header from Authorise subscription page.
-#: actions/userauthorization.php:271
+#: actions/userauthorization.php:254
 msgid "Subscription authorized"
 msgstr "Abbonamento autorizzato"
 
-#: actions/userauthorization.php:274
+#: actions/userauthorization.php:256
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to authorize the "
@@ -6709,12 +6614,11 @@ msgstr ""
 "richiamo. Controlla le istruzioni del sito per i dettagli su come "
 "autorizzare l'abbonamento. Il tuo token per l'abbonamento è:"
 
-#. TRANS: Reject message header from Authorise subscription page.
-#: actions/userauthorization.php:285
+#: actions/userauthorization.php:266
 msgid "Subscription rejected"
 msgstr "Abbonamento rifiutato"
 
-#: actions/userauthorization.php:288
+#: actions/userauthorization.php:268
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to fully reject the "
@@ -6724,64 +6628,39 @@ msgstr ""
 "richiamo. Controlla le istruzioni del sito per i dettagli su come rifiutare "
 "completamente l'abbonamento."
 
-#. TRANS: Exception thrown when no valid user is found for an authorisation request.
-#. TRANS: %s is a listener URI.
-#: actions/userauthorization.php:325
+#: actions/userauthorization.php:303
 #, fuzzy, php-format
-msgid "Listener URI \"%s\" not found here."
+msgid "Listener URI ‘%s’ not found here."
 msgstr "URL \"%s\" dell'ascoltatore non trovato qui."
 
-#. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:332
+#: actions/userauthorization.php:308
 #, fuzzy, php-format
-msgid "Listenee URI \"%s\" is too long."
+msgid "Listenee URI ‘%s’ is too long."
 msgstr "L'URI \"%s\" di colui che si ascolta è troppo lungo."
 
-#. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:340
+#: actions/userauthorization.php:314
 #, fuzzy, php-format
-msgid "Listenee URI \"%s\" is a local user."
+msgid "Listenee URI ‘%s’ is a local user."
 msgstr "L'URI \"%s\" di colui che si ascolta è un utente locale."
 
-#. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
-#. TRANS: %s is a profile URL.
-#: actions/userauthorization.php:358
+#: actions/userauthorization.php:329
 #, fuzzy, php-format
-msgid "Profile URL \"%s\" is for a local user."
+msgid "Profile URL ‘%s’ is for a local user."
 msgstr "L'URL \"%s\" del profilo è per un utente locale."
 
-#. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
-#. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
-#: actions/userauthorization.php:368
+#: actions/userauthorization.php:345
 #, fuzzy, php-format
-msgid ""
-"Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
-"\"."
-msgstr ""
-"La licenza \"%1$s\" dello stream di chi ascolti non è compatibile con la "
-"licenza \"%2$s\" di questo sito."
-
-#. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:378
-#, fuzzy, php-format
-msgid "Avatar URL \"%s\" is not valid."
+msgid "Avatar URL ‘%s’ is not valid."
 msgstr "L'URL \"%s\" dell'immagine non è valido."
 
-#. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:385
+#: actions/userauthorization.php:350
 #, fuzzy, php-format
-msgid "Cannot read avatar URL \"%s\"."
+msgid "Can’t read avatar URL ‘%s’."
 msgstr "Impossibile leggere l'URL \"%s\" dell'immagine."
 
-#. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:392
+#: actions/userauthorization.php:355
 #, fuzzy, php-format
-msgid "Wrong image type for avatar URL \"%s\"."
+msgid "Wrong image type for avatar URL ‘%s’."
 msgstr "Tipo di immagine errata per l'URL \"%s\"."
 
 #. TRANS: Page title for profile design page.
@@ -6889,7 +6768,7 @@ msgid "Plugins"
 msgstr "Plugin"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:898
+#: actions/version.php:198 lib/action.php:901
 msgid "Version"
 msgstr "Versione"
 
@@ -7102,14 +6981,14 @@ msgstr "Problema nel salvare la casella della posta del gruppo."
 
 #. TRANS: Server exception thrown when a reply cannot be saved.
 #. TRANS: %1$d is a notice ID, %2$d is the ID of the mentioned user.
-#: classes/Notice.php:1142
+#: classes/Notice.php:1144
 #, fuzzy, php-format
 msgid "Could not save reply for %1$d, %2$d."
 msgstr "Impossibile salvare le informazioni del gruppo locale."
 
 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1661
+#: classes/Notice.php:1663
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
@@ -7123,7 +7002,7 @@ msgstr "%1$s (%2$s)"
 
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:775
+#: classes/Profile.php:779
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
@@ -7131,7 +7010,7 @@ msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:784
+#: classes/Profile.php:788
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -7450,53 +7329,53 @@ msgid "Page notice"
 msgstr "Pagina messaggio"
 
 #. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:871
+#: lib/action.php:874
 msgid "Secondary site navigation"
 msgstr "Esplorazione secondaria del sito"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:877
+#: lib/action.php:880
 msgid "Help"
 msgstr "Aiuto"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:880
+#: lib/action.php:883
 msgid "About"
 msgstr "Informazioni"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:883
+#: lib/action.php:886
 msgid "FAQ"
 msgstr "FAQ"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:888
+#: lib/action.php:891
 msgid "TOS"
 msgstr "TOS"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:892
+#: lib/action.php:895
 msgid "Privacy"
 msgstr "Privacy"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:895
+#: lib/action.php:898
 msgid "Source"
 msgstr "Sorgenti"
 
 #. TRANS: Secondary navigation menu option leading to e-mail contact information on the
 #. TRANS: StatusNet site, where to report bugs, ...
-#: lib/action.php:902
+#: lib/action.php:905
 msgid "Contact"
 msgstr "Contatti"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:905
+#: lib/action.php:908
 msgid "Badge"
 msgstr "Badge"
 
 #. TRANS: DT element for StatusNet software license.
-#: lib/action.php:934
+#: lib/action.php:937
 msgid "StatusNet software license"
 msgstr "Licenza del software StatusNet"
 
@@ -7504,7 +7383,7 @@ msgstr "Licenza del software StatusNet"
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:941
+#: lib/action.php:944
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7514,7 +7393,7 @@ msgstr ""
 "(%%site.broughtbyurl%%)."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:944
+#: lib/action.php:947
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** è un servizio di microblog."
@@ -7523,7 +7402,7 @@ msgstr "**%%site.name%%** è un servizio di microblog."
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:951
+#: lib/action.php:954
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7535,27 +7414,27 @@ msgstr ""
 "(http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:967
+#: lib/action.php:970
 msgid "Site content license"
 msgstr "Licenza del contenuto del sito"
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:974
+#: lib/action.php:977
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr "I contenuti e i dati di %1$s sono privati e confidenziali."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:981
+#: lib/action.php:984
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
 "I contenuti e i dati sono copyright di %1$s. Tutti i diritti riservati."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:985
+#: lib/action.php:988
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 "I contenuti e i dati sono forniti dai collaboratori. Tutti i diritti "
@@ -7563,7 +7442,7 @@ msgstr ""
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:1017
+#: lib/action.php:1020
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
@@ -7571,19 +7450,19 @@ msgstr ""
 "licenza %2$s."
 
 #. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1353
+#: lib/action.php:1356
 msgid "Pagination"
 msgstr "Paginazione"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1364
+#: lib/action.php:1367
 msgid "After"
 msgstr "Successivi"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1374
+#: lib/action.php:1377
 msgid "Before"
 msgstr "Precedenti"
 
@@ -7783,23 +7662,19 @@ msgstr ""
 msgid "No application for that consumer key."
 msgstr "Nessuna applicazione per quella chiave."
 
-#: lib/apiauth.php:202 lib/apiauth.php:284
-msgid "Not allowed to use API."
-msgstr ""
-
 #. TRANS: OAuth exception given when an incorrect access token was given for a user.
-#: lib/apiauth.php:225
+#: lib/apiauth.php:219
 msgid "Bad access token."
 msgstr "Token di accesso errato."
 
 #. TRANS: OAuth exception given when no user was found for a given token (no token was found).
-#: lib/apiauth.php:230
+#: lib/apiauth.php:224
 msgid "No user for that token."
 msgstr "Nessun utente per quel token."
 
 #. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel".
 #. TRANS: Client error thrown when authentication fails.
-#: lib/apiauth.php:272 lib/apiauth.php:302
+#: lib/apiauth.php:266 lib/apiauth.php:293
 msgid "Could not authenticate you."
 msgstr "Impossibile autenticarti."
 
@@ -8007,11 +7882,6 @@ msgstr "La modifica della password non è permessa"
 msgid "Block"
 msgstr "Blocca"
 
-#. TRANS: Description of the form to block a user.
-#: lib/blockform.php:79
-msgid "Block this user"
-msgstr "Blocca questo utente"
-
 #. TRANS: Title for command results.
 #: lib/channel.php:160 lib/channel.php:181
 msgid "Command results"
@@ -8040,7 +7910,7 @@ msgstr "Un messaggio con quel ID non esiste."
 
 #. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
 #. TRANS: Error text shown when a last user notice is requested and it does not exist.
-#: lib/command.php:99 lib/command.php:630
+#: lib/command.php:99 lib/command.php:642
 msgid "User has no last notice."
 msgstr "L'utente non ha un ultimo messaggio."
 
@@ -8090,35 +7960,41 @@ msgstr ""
 "Abbonati: %2$s\n"
 "Messaggi: %3$s"
 
+#. TRANS: Error message text shown when a favorite could not be set because it has already been favorited.
+#: lib/command.php:298
+#, fuzzy
+msgid "Could not create favorite: already favorited."
+msgstr "Impossibile creare un preferito."
+
 #. TRANS: Text shown when a notice has been marked as favourite successfully.
-#: lib/command.php:312
+#: lib/command.php:324
 msgid "Notice marked as fave."
 msgstr "Messaggio indicato come preferito."
 
 #. TRANS: Message given having added a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:357
+#: lib/command.php:369
 #, php-format
 msgid "%1$s joined group %2$s."
 msgstr "L'utente %1$s è entrato nel gruppo %2$s."
 
 #. TRANS: Message given having removed a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:405
+#: lib/command.php:417
 #, php-format
 msgid "%1$s left group %2$s."
 msgstr "%1$s ha lasciato il gruppo %2$s."
 
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: lib/command.php:426
+#: lib/command.php:438
 #, fuzzy, php-format
 msgctxt "WHOIS"
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
 
 #. TRANS: Whois output. %s is the full name of the queried user.
-#: lib/command.php:430
+#: lib/command.php:442
 #, php-format
 msgid "Fullname: %s"
 msgstr "Nome completo: %s"
@@ -8126,7 +8002,7 @@ msgstr "Nome completo: %s"
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a location.
-#: lib/command.php:434 lib/mail.php:270
+#: lib/command.php:446 lib/mail.php:270
 #, php-format
 msgid "Location: %s"
 msgstr "Posizione: %s"
@@ -8134,20 +8010,20 @@ msgstr "Posizione: %s"
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a homepage.
-#: lib/command.php:438 lib/mail.php:274
+#: lib/command.php:450 lib/mail.php:274
 #, php-format
 msgid "Homepage: %s"
 msgstr "Pagina web: %s"
 
 #. TRANS: Whois output. %s is the bio information of the queried user.
-#: lib/command.php:442
+#: lib/command.php:454
 #, php-format
 msgid "About: %s"
 msgstr "Informazioni: %s"
 
 #. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).
 #. TRANS: %s is a remote profile.
-#: lib/command.php:471
+#: lib/command.php:483
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
@@ -8158,7 +8034,7 @@ msgstr ""
 
 #. TRANS: Message given if content is too long. %1$sd is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:488
+#: lib/command.php:500
 #, fuzzy, php-format
 msgid "Message too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
@@ -8166,25 +8042,25 @@ msgstr[0] "Messaggio troppo lungo: massimo %1$d caratteri, inviati %2$d."
 msgstr[1] "Messaggio troppo lungo: massimo %1$d caratteri, inviati %2$d."
 
 #. TRANS: Error text shown sending a direct message fails with an unknown reason.
-#: lib/command.php:516
+#: lib/command.php:528
 msgid "Error sending direct message."
 msgstr "Errore nell'inviare il messaggio diretto."
 
 #. TRANS: Message given having repeated a notice from another user.
 #. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:553
+#: lib/command.php:565
 #, php-format
 msgid "Notice from %s repeated."
 msgstr "Messaggio da %s ripetuto."
 
 #. TRANS: Error text shown when repeating a notice fails with an unknown reason.
-#: lib/command.php:556
+#: lib/command.php:568
 msgid "Error repeating notice."
 msgstr "Errore nel ripetere il messaggio."
 
 #. TRANS: Message given if content of a notice for a reply is too long. %1$d is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:591
+#: lib/command.php:603
 #, fuzzy, php-format
 msgid "Notice too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Notice too long - maximum is %1$d characters, you sent %2$d."
@@ -8193,80 +8069,80 @@ msgstr[1] "Messaggio troppo lungo: massimo %1$d caratteri, inviati %2$d."
 
 #. TRANS: Text shown having sent a reply to a notice successfully.
 #. TRANS: %s is the nickname of the user of the notice the reply was sent to.
-#: lib/command.php:604
+#: lib/command.php:616
 #, php-format
 msgid "Reply to %s sent."
 msgstr "Risposta a %s inviata."
 
 #. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
-#: lib/command.php:607
+#: lib/command.php:619
 msgid "Error saving notice."
 msgstr "Errore nel salvare il messaggio."
 
 #. TRANS: Error text shown when no username was provided when issuing a subscribe command.
-#: lib/command.php:654
+#: lib/command.php:666
 msgid "Specify the name of the user to subscribe to."
 msgstr "Specifica il nome dell'utente a cui abbonarti."
 
 #. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
-#: lib/command.php:663
+#: lib/command.php:675
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "Impossibile abbonarsi ai profili OMB attraverso un comando."
 
 #. TRANS: Text shown after having subscribed to another user successfully.
 #. TRANS: %s is the name of the user the subscription was requested for.
-#: lib/command.php:671
+#: lib/command.php:683
 #, php-format
 msgid "Subscribed to %s."
 msgstr "Abbonati a %s."
 
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.
-#: lib/command.php:692 lib/command.php:803
+#: lib/command.php:704 lib/command.php:815
 msgid "Specify the name of the user to unsubscribe from."
 msgstr "Specifica il nome dell'utente da cui annullare l'abbonamento."
 
 #. TRANS: Text shown after having unsubscribed from another user successfully.
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:703
+#: lib/command.php:715
 #, php-format
 msgid "Unsubscribed from %s."
 msgstr "Abbonamento a %s annullato."
 
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
-#: lib/command.php:723 lib/command.php:749
+#: lib/command.php:735 lib/command.php:761
 msgid "Command not yet implemented."
 msgstr "Comando non ancora implementato."
 
 #. TRANS: Text shown when issuing the command "off" successfully.
-#: lib/command.php:727
+#: lib/command.php:739
 msgid "Notification off."
 msgstr "Notifiche disattivate."
 
 #. TRANS: Error text shown when the command "off" fails for an unknown reason.
-#: lib/command.php:730
+#: lib/command.php:742
 msgid "Can't turn off notification."
 msgstr "Impossibile disattivare le notifiche."
 
 #. TRANS: Text shown when issuing the command "on" successfully.
-#: lib/command.php:753
+#: lib/command.php:765
 msgid "Notification on."
 msgstr "Notifiche attivate."
 
 #. TRANS: Error text shown when the command "on" fails for an unknown reason.
-#: lib/command.php:756
+#: lib/command.php:768
 msgid "Can't turn on notification."
 msgstr "Impossibile attivare le notifiche."
 
 #. TRANS: Error text shown when issuing the login command while login is disabled.
-#: lib/command.php:770
+#: lib/command.php:782
 msgid "Login command is disabled."
 msgstr "Il comando di accesso è disabilitato."
 
 #. TRANS: Text shown after issuing the login command successfully.
 #. TRANS: %s is a logon link..
-#: lib/command.php:783
+#: lib/command.php:795
 #, php-format
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
@@ -8275,20 +8151,20 @@ msgstr ""
 
 #. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:812
+#: lib/command.php:824
 #, php-format
 msgid "Unsubscribed %s."
 msgstr "Abbonamento di %s annullato."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
-#: lib/command.php:830
+#: lib/command.php:842
 msgid "You are not subscribed to anyone."
 msgstr "Il tuo abbonamento è stato annullato."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
-#: lib/command.php:835
+#: lib/command.php:847
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Persona di cui hai già un abbonamento:"
@@ -8296,14 +8172,14 @@ msgstr[1] "Persone di cui hai già un abbonamento:"
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user
 #. TRANS: (followers) without having any subscribers.
-#: lib/command.php:857
+#: lib/command.php:869
 msgid "No one is subscribed to you."
 msgstr "Nessuno è abbonato ai tuoi messaggi."
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
-#: lib/command.php:862
+#: lib/command.php:874
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Questa persona è abbonata ai tuoi messaggi:"
@@ -8311,21 +8187,21 @@ msgstr[1] "Queste persone sono abbonate ai tuoi messaggi:"
 
 #. TRANS: Text shown after requesting groups a user is subscribed to without having
 #. TRANS: any group subscriptions.
-#: lib/command.php:884
+#: lib/command.php:896
 msgid "You are not a member of any groups."
 msgstr "Non fai parte di alcun gruppo."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
-#: lib/command.php:889
+#: lib/command.php:901
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "Non fai parte di questo gruppo:"
 msgstr[1] "Non fai parte di questi gruppi:"
 
 #. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-#: lib/command.php:904
+#: lib/command.php:916
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -8473,11 +8349,6 @@ msgstr "Applicazioni collegate autorizzate"
 msgid "Database error"
 msgstr "Errore del database"
 
-#. TRANS: Description of form for deleting a user.
-#: lib/deleteuserform.php:75
-msgid "Delete this user"
-msgstr "Elimina questo utente"
-
 #. TRANS: Label in form on profile design page.
 #. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
 #: lib/designsettings.php:108
@@ -8516,21 +8387,6 @@ msgstr "Modifica colori"
 msgid "Use defaults"
 msgstr "Usa predefiniti"
 
-#. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: lib/designsettings.php:259
-msgid "Restore default designs"
-msgstr "Ripristina i valori predefiniti"
-
-#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: lib/designsettings.php:267
-msgid "Reset back to default"
-msgstr "Reimposta i valori predefiniti"
-
-#. TRANS: Title for button on profile design page to save settings.
-#: lib/designsettings.php:272
-msgid "Save design"
-msgstr "Salva aspetto"
-
 #. TRANS: Error message displayed if design settings could not be saved.
 #. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
 #: lib/designsettings.php:405 lib/designsettings.php:427
@@ -9419,10 +9275,6 @@ msgstr "Rispondi a questo messaggio"
 msgid "Reply"
 msgstr "Rispondi"
 
-#: lib/noticelist.php:673
-msgid "Delete this notice"
-msgstr "Elimina questo messaggio"
-
 #: lib/noticelist.php:691
 msgid "Notice repeated"
 msgstr "Messaggio ripetuto"
@@ -9704,10 +9556,6 @@ msgstr "Invita"
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Invita amici e colleghi a seguirti su %s"
 
-#: lib/subscribeform.php:115 lib/subscribeform.php:139
-msgid "Subscribe to this user"
-msgstr "Abbonati a questo utente"
-
 #: lib/subscriberspeopleselftagcloudsection.php:48
 #: lib/subscriptionspeopleselftagcloudsection.php:48
 msgid "People Tagcloud as self-tagged"
@@ -9883,23 +9731,18 @@ msgctxt "role"
 msgid "Moderator"
 msgstr "Moderatore"
 
-#: lib/util.php:305
-#, fuzzy
-msgid "Not allowed to log in."
-msgstr "Accesso non effettuato."
-
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1309
+#: lib/util.php:1306
 msgid "a few seconds ago"
 msgstr "pochi secondi fa"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1312
+#: lib/util.php:1309
 msgid "about a minute ago"
 msgstr "circa un minuto fa"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1316
+#: lib/util.php:1313
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
@@ -9907,12 +9750,12 @@ msgstr[0] "circa un minuto fa"
 msgstr[1] "circa %d minuti fa"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1319
+#: lib/util.php:1316
 msgid "about an hour ago"
 msgstr "circa un'ora fa"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1323
+#: lib/util.php:1320
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
@@ -9920,12 +9763,12 @@ msgstr[0] "circa un'ora fa"
 msgstr[1] "circa %d ore fa"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1326
+#: lib/util.php:1323
 msgid "about a day ago"
 msgstr "circa un giorno fa"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1330
+#: lib/util.php:1327
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
@@ -9933,12 +9776,12 @@ msgstr[0] "circa un giorno fa"
 msgstr[1] "circa %d giorni fa"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1333
+#: lib/util.php:1330
 msgid "about a month ago"
 msgstr "circa un mese fa"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1337
+#: lib/util.php:1334
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
@@ -9946,7 +9789,7 @@ msgstr[0] "circa un mese fa"
 msgstr[1] "circa %d mesi fa"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1340
+#: lib/util.php:1337
 msgid "about a year ago"
 msgstr "circa un anno fa"
 
@@ -9988,3 +9831,75 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#, fuzzy
+#~ msgid "Block this user."
+#~ msgstr "Blocca questo utente"
+
+#, fuzzy
+#~ msgid "Delete this notice."
+#~ msgstr "Elimina questo messaggio"
+
+#, fuzzy
+#~ msgid "Delete this user."
+#~ msgstr "Elimina questo utente"
+
+#, fuzzy
+#~ msgid "Restore default designs."
+#~ msgstr "Ripristina i valori predefiniti"
+
+#, fuzzy
+#~ msgid "Reset back to default."
+#~ msgstr "Reimposta i valori predefiniti"
+
+#, fuzzy
+#~ msgid "Save design."
+#~ msgstr "Salva aspetto"
+
+#, fuzzy
+#~ msgid "Disfavor favorite."
+#~ msgstr "Rimuovi preferito"
+
+#, fuzzy
+#~ msgid "\"%s\" not found."
+#~ msgstr "Metodo delle API non trovato."
+
+#, fuzzy
+#~ msgid "Notice %s not found."
+#~ msgstr "Metodo delle API non trovato."
+
+#, fuzzy
+#~ msgid "Attachment %s not found."
+#~ msgstr "Destinatario non trovato."
+
+#, fuzzy
+#~ msgid "Invalid tag: \"%s\"."
+#~ msgstr "Etichetta non valida: \"%s\""
+
+#, fuzzy
+#~ msgid "%s updates from everyone."
+#~ msgstr "Aggiornamenti di %s da tutti!"
+
+#, fuzzy
+#~ msgid "Password saved"
+#~ msgstr "Password salvata."
+
+#, fuzzy
+#~ msgid "Where you are, like \"City, State (or Region), Country\"."
+#~ msgstr "Dove ti trovi, tipo \"città, regione, stato\""
+
+#, fuzzy
+#~ msgid "Subscribe to this user."
+#~ msgstr "Abbonati a questo utente"
+
+#, fuzzy
+#~ msgid ""
+#~ "Listenee stream license \"%1$s\" is not compatible with site license \"%2"
+#~ "$s\"."
+#~ msgstr ""
+#~ "La licenza \"%1$s\" dello stream di chi ascolti non è compatibile con la "
+#~ "licenza \"%2$s\" di questo sito."
+
+#, fuzzy
+#~ msgid "Not allowed to log in."
+#~ msgstr "Accesso non effettuato."
diff --git a/locale/ja/LC_MESSAGES/statusnet.po b/locale/ja/LC_MESSAGES/statusnet.po
index 445a05b253..73425f88d7 100644
--- a/locale/ja/LC_MESSAGES/statusnet.po
+++ b/locale/ja/LC_MESSAGES/statusnet.po
@@ -14,17 +14,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-24 10:32+0000\n"
-"PO-Revision-Date: 2011-02-24 10:36:59+0000\n"
+"POT-Creation-Date: 2011-03-03 15:58+0000\n"
+"PO-Revision-Date: 2011-03-03 16:00:56+0000\n"
 "Language-Team: Japanese <http://translatewiki.net/wiki/Portal:ja>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r82712); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ja\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-POT-Import-Date: 2011-02-17 11:39:54+0000\n"
+"X-POT-Import-Date: 2011-02-25 23:49:23+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -137,11 +137,7 @@ msgstr "そのようなページはありません。"
 #. 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 use "one time password login" without using an existing user.
-#. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
-#. TRANS: Client error displayed trying to find a user by ID for a non-existing ID.
-#. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when calling a profile action without specifying a user.
 #: actions/all.php:80 actions/allrss.php:69
@@ -159,12 +155,12 @@ msgstr "そのようなページはありません。"
 #: actions/apitimelinementions.php:77 actions/apitimelineuser.php:79
 #: actions/avatarbynickname.php:79 actions/favoritesrss.php:72
 #: actions/foaf.php:42 actions/foaf.php:61 actions/hcard.php:67
-#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:78
+#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
 #: actions/remotesubscribe.php:144 actions/remotesubscribe.php:153
-#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:113
-#: actions/showfavorites.php:106 actions/userbyid.php:75
+#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
+#: actions/showfavorites.php:106 actions/userbyid.php:74
 #: actions/usergroups.php:93 actions/userrss.php:40 actions/userxrd.php:59
-#: actions/xrds.php:71 lib/command.php:497 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:509 lib/galleryaction.php:59
 #: lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "そのようなユーザはいません。"
@@ -292,7 +288,7 @@ msgstr "%2$s に %1$s と友人からの更新があります！"
 #: actions/apigrouplistall.php:120 actions/apigroupmembership.php:105
 #: actions/apigroupshow.php:114 actions/apihelptest.php:84
 #: actions/apistatusesdestroy.php:101 actions/apistatusesretweets.php:110
-#: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:138
+#: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:139
 #: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
 #: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:268
 #: actions/apitimelinegroup.php:147 actions/apitimelinehome.php:173
@@ -521,7 +517,7 @@ msgstr "受け取り手のユーザが見つかりません。"
 #. TRANS: Client error displayed trying to direct message another user who's not a friend (403).
 #: actions/apidirectmessagenew.php:144
 #, fuzzy
-msgid "Cannot send direct messages to users who aren't your friend."
+msgid "Can't send direct messages to users who aren't your friend."
 msgstr "友人でないユーザにダイレクトメッセージを送ることはできません。"
 
 #. TRANS: Client error displayed trying to direct message self (403).
@@ -548,7 +544,7 @@ msgstr "このステータスはすでにお気に入りです。"
 #. TRANS: Client error displayed when marking a notice as favourite fails.
 #. TRANS: Server error displayed when trying to mark a notice as favorite fails in the database.
 #. TRANS: Error message text shown when a favorite could not be set.
-#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:294
+#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:306
 msgid "Could not create favorite."
 msgstr "お気に入りを作成できません。"
 
@@ -608,7 +604,7 @@ msgstr "ターゲットユーザーを見つけられません。"
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:191
 #: actions/newgroup.php:137 actions/profilesettings.php:273
-#: actions/register.php:206
+#: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "そのニックネームは既に使用されています。他のものを試してみて下さい。"
 
@@ -618,7 +614,7 @@ msgstr "そのニックネームは既に使用されています。他のもの
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:195
 #: actions/newgroup.php:141 actions/profilesettings.php:243
-#: actions/register.php:208
+#: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "有効なニックネームではありません。"
 
@@ -631,7 +627,7 @@ msgstr "有効なニックネームではありません。"
 #: actions/apigroupcreate.php:181 actions/editapplication.php:235
 #: actions/editgroup.php:202 actions/newapplication.php:221
 #: actions/newgroup.php:148 actions/profilesettings.php:248
-#: actions/register.php:215
+#: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "ホームページのURLが不適切です。"
 
@@ -641,7 +637,7 @@ msgstr "ホームページのURLが不適切です。"
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:191 actions/editgroup.php:206
 #: actions/newgroup.php:152 actions/profilesettings.php:252
-#: actions/register.php:218
+#: actions/register.php:226
 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "フルネームが長すぎます。（255字まで）"
@@ -669,7 +665,7 @@ msgstr[0] "記述が長すぎます。（最長%d字）"
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:215 actions/editgroup.php:218
 #: actions/newgroup.php:164 actions/profilesettings.php:265
-#: actions/register.php:227
+#: actions/register.php:235
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
 msgstr "場所が長すぎます。（255字まで）"
@@ -725,14 +721,14 @@ msgstr "見つかりません。"
 #. TRANS: Server error displayed when trying to join a group the user is already a member of.
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:333
+#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:345
 msgid "You are already a member of that group."
 msgstr "すでにこのグループのメンバーです。"
 
 #. TRANS: Server error displayed when trying to join a group the user is blocked from joining.
 #. 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.
-#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:338
+#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:350
 msgid "You have been blocked from that group by the admin."
 msgstr "管理者によってこのグループからブロックされています。"
 
@@ -742,7 +738,7 @@ msgstr "管理者によってこのグループからブロックされていま
 #. TRANS: %1$s is the joining user's nickname, $2$s is the group nickname for which the join failed.
 #. TRANS: Message given having failed to add a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:350
+#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:362
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "ユーザ %1$s はグループ %2$s に参加できません。"
@@ -759,7 +755,7 @@ msgstr "このグループのメンバーではありません。"
 #. TRANS: Message given having failed to remove a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
 #: actions/apigroupleave.php:127 actions/leavegroup.php:133
-#: lib/command.php:398
+#: lib/command.php:410
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
 msgstr "ユーザ %1$s をグループ %2$s から削除できません。"
@@ -823,21 +819,20 @@ msgstr "認証されていません。"
 #. TRANS: Form validation error message.
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
-#. TRANS: Client error displayed when the session token is not okay.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
 #: actions/deletenotice.php:177 actions/disfavor.php:75
 #: actions/emailsettings.php:291 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:65 actions/grouplogo.php:321
 #: actions/groupunblock.php:65 actions/imsettings.php:224
-#: actions/invite.php:60 actions/login.php:131 actions/makeadmin.php:66
+#: actions/invite.php:60 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
-#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:136
-#: actions/othersettings.php:155 actions/passwordsettings.php:137
+#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
+#: actions/othersettings.php:155 actions/passwordsettings.php:138
 #: actions/profilesettings.php:217 actions/recoverpassword.php:383
-#: actions/register.php:164 actions/remotesubscribe.php:76
+#: actions/register.php:172 actions/remotesubscribe.php:76
 #: actions/repeat.php:82 actions/smssettings.php:250 actions/subedit.php:40
-#: actions/subscribe.php:87 actions/tagother.php:166
-#: actions/unsubscribe.php:69 actions/userauthorization.php:53
+#: actions/subscribe.php:86 actions/tagother.php:166
+#: actions/unsubscribe.php:69 actions/userauthorization.php:52
 #: lib/designsettings.php:310
 msgid "There was a problem with your session token. Try again, please."
 msgstr "あなたのセッショントークンに問題がありました。再度お試しください。"
@@ -869,7 +864,7 @@ msgstr "OAuth アプリケーションユーザの追加時ＤＢエラー。"
 #: actions/designadminpanel.php:100 actions/editapplication.php:144
 #: actions/emailsettings.php:310 actions/grouplogo.php:332
 #: actions/imsettings.php:239 actions/newapplication.php:124
-#: actions/oauthconnectionssettings.php:145 actions/recoverpassword.php:46
+#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
 #: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
 msgstr "予期せぬフォーム送信です。"
@@ -915,20 +910,19 @@ msgstr "アカウント"
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group nickname (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT for nick name in a profile.
-#: actions/apioauthauthorize.php:459 actions/login.php:242
-#: actions/profilesettings.php:106 actions/register.php:418
+#: actions/apioauthauthorize.php:459 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:432
 #: actions/showgroup.php:243 actions/tagother.php:94
-#: actions/userauthorization.php:152 lib/groupeditform.php:145
+#: actions/userauthorization.php:145 lib/groupeditform.php:145
 #: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "ニックネーム"
 
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:463 actions/login.php:245
-#: actions/register.php:422 lib/accountsettingsaction.php:120
+#: actions/apioauthauthorize.php:463 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:120
 msgid "Password"
 msgstr "パスワード"
 
@@ -1024,13 +1018,13 @@ msgstr "そのようなつぶやきはありません。"
 
 #. TRANS: Client error displayed trying to repeat an own notice through the API.
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:537
+#: actions/apistatusesretweet.php:83 lib/command.php:549
 msgid "Cannot repeat your own notice."
 msgstr "あなたのつぶやきを繰り返せません。"
 
 #. TRANS: Client error displayed trying to re-repeat a notice through the API.
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:92 lib/command.php:543
+#: actions/apistatusesretweet.php:92 lib/command.php:555
 msgid "Already repeated that notice."
 msgstr "すでにつぶやきを繰り返しています。"
 
@@ -1053,7 +1047,7 @@ msgstr "API メソッドが見つかりません。"
 #. TRANS: %s is the requested output format.
 #: actions/apistatusesshow.php:144
 #, fuzzy, php-format
-msgid "Unsupported format: %s."
+msgid "Unsupported format: %s"
 msgstr "サポート外の形式です。"
 
 #. TRANS: Client error displayed requesting a deleted status.
@@ -1156,14 +1150,13 @@ msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr "%2$s からアップデートに答える %1$s アップデート"
 
 #. TRANS: Title for site timeline. %s is the StatusNet sitename.
-#. TRANS: Public RSS feed title. %s is the StatusNet site name.
 #: actions/apitimelinepublic.php:193 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "%s のパブリックタイムライン"
 
 #. TRANS: Subtitle for site timeline. %s is the StatusNet sitename.
-#: actions/apitimelinepublic.php:199
+#: actions/apitimelinepublic.php:199 actions/publicrss.php:105
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "皆からの %s アップデート!"
@@ -1230,26 +1223,25 @@ msgid "Atom post must be an Atom entry."
 msgstr ""
 
 #. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
-#: actions/apitimelineuser.php:334
+#: actions/apitimelineuser.php:335
 msgid "Can only handle POST activities."
 msgstr ""
 
 #. TRANS: Client error displayed when using an unsupported activity object type.
 #. TRANS: %s is the unsupported activity object type.
-#: actions/apitimelineuser.php:345
+#: actions/apitimelineuser.php:346
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
 #. TRANS: %d is the notice ID (number).
-#: actions/apitimelineuser.php:379
+#: actions/apitimelineuser.php:380
 #, fuzzy, php-format
 msgid "No content for notice %d."
 msgstr "つぶやきの内容を探す"
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#. TRANS: %s is the notice URI.
 #: actions/apitimelineuser.php:408
 #, fuzzy, php-format
 msgid "Notice with URI \"%s\" already exists."
@@ -1268,10 +1260,9 @@ msgstr "API メソッドが見つかりません。"
 
 #. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
 #. TRANS: Client exception.
-#. TRANS: Client error displayed trying to subscribe to a non-existing profile.
 #: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
 #: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
-#: actions/subscribe.php:110
+#: actions/subscribe.php:107
 #, fuzzy
 msgid "No such profile."
 msgstr "そのようなファイルはありません。"
@@ -1408,7 +1399,7 @@ msgstr "お気に入りを取り消すことができません。"
 #: actions/joingroup.php:95 actions/leavegroup.php:82
 #: actions/leavegroup.php:95 actions/makeadmin.php:86
 #: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:380
+#: lib/command.php:392
 msgid "No such group."
 msgstr "そのようなグループはありません。"
 
@@ -1419,7 +1410,7 @@ msgid "Not a member."
 msgstr "全てのメンバー"
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
-#: actions/atompubshowmembership.php:150
+#: actions/atompubshowmembership.php:151
 #, fuzzy
 msgid "Cannot delete someone else's membership."
 msgstr "フォローを保存できません。"
@@ -1524,11 +1515,9 @@ msgstr "自分のアバターをアップロードできます。最大サイズ
 
 #. TRANS: Server error displayed in avatar upload page when no matching profile can be found for a user.
 #. TRANS: Server error displayed coming across a request from a user without a profile.
-#. TRANS: Server error displayed when trying to authorise a remote subscription request
-#. TRANS: while the user has no profile.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
 #: actions/grouplogo.php:184 actions/remotesubscribe.php:190
-#: actions/userauthorization.php:75 actions/userrss.php:108
+#: actions/userauthorization.php:72 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr "合っているプロフィールのないユーザ"
 
@@ -1587,10 +1576,10 @@ msgstr "切り取り"
 msgid "No file uploaded."
 msgstr "プロファイル記述がありません。"
 
-#. TRANS: Avatar upload form instruction after uploading a file.
+#. TRANS: Avatar upload form unstruction after uploading a file.
 #: actions/avatarsettings.php:345
 #, fuzzy
-msgid "Pick a square area of the image to be your avatar."
+msgid "Pick a square area of the image to be your avatar"
 msgstr "あなたのアバターとなるイメージを正方形で指定"
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
@@ -1632,7 +1621,7 @@ msgid "You may not backup your account."
 msgstr ""
 
 #. TRANS: Information displayed on the backup account page.
-#: actions/backupaccount.php:225
+#: actions/backupaccount.php:227
 msgid ""
 "You can backup your account data in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format. This is an experimental feature and provides "
@@ -1642,15 +1631,15 @@ msgid ""
 msgstr ""
 
 #. TRANS: Submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:248
+#: actions/backupaccount.php:250
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Backup"
 msgstr "バックグラウンド"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:252
-msgid "Backup your account."
+#: actions/backupaccount.php:254
+msgid "Backup your account"
 msgstr ""
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
@@ -1693,7 +1682,7 @@ msgstr "ノート"
 #. TRANS: Submit button title for 'No' when blocking a user.
 #: actions/block.php:158
 #, fuzzy
-msgid "Do not block this user."
+msgid "Do not block this user"
 msgstr "このユーザをアンブロックする"
 
 #. TRANS: Button label on the user block form.
@@ -1710,9 +1699,9 @@ msgid "Yes"
 msgstr "はい"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:165
-#, fuzzy
-msgid "Block this user."
+#. TRANS: Description of the form to block a user.
+#: actions/block.php:165 lib/blockform.php:79
+msgid "Block this user"
 msgstr "このユーザをブロックする"
 
 #. TRANS: Server error displayed when blocking a user fails.
@@ -1877,7 +1866,7 @@ msgstr ""
 #. TRANS: Field label for delete account confirmation entry.
 #. TRANS: Field label for password reset form where the password has to be typed again.
 #: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:262 actions/register.php:426
+#: actions/recoverpassword.php:262 actions/register.php:440
 msgid "Confirm"
 msgstr "パスワード確認"
 
@@ -1907,14 +1896,14 @@ msgstr "アプリケーションが見つかりません。"
 #. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
 #: actions/deleteapplication.php:79 actions/editapplication.php:78
-#: actions/showapplication.php:90
+#: actions/showapplication.php:94
 msgid "You are not the owner of this application."
 msgstr "このアプリケーションのオーナーではありません。"
 
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
-#: actions/newapplication.php:112 actions/showapplication.php:113
-#: lib/action.php:1422
+#: actions/newapplication.php:112 actions/showapplication.php:118
+#: lib/action.php:1425
 msgid "There was a problem with your session token."
 msgstr "あなたのセッショントークンに関する問題がありました。"
 
@@ -1938,13 +1927,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting an application.
 #: actions/deleteapplication.php:161
 #, fuzzy
-msgid "Do not delete this application."
+msgid "Do not delete this application"
 msgstr "このアプリケーションを削除しないでください"
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
 #: actions/deleteapplication.php:167
 #, fuzzy
-msgid "Delete this application."
+msgid "Delete this application"
 msgstr "このアプリケーションを削除"
 
 #. TRANS: Client error when trying to delete group while not logged in.
@@ -2003,13 +1992,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting a group.
 #: actions/deletegroup.php:224
 #, fuzzy
-msgid "Do not delete this group."
+msgid "Do not delete this group"
 msgstr "このつぶやきを削除できません。"
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
 #: actions/deletegroup.php:231
 #, fuzzy
-msgid "Delete this group."
+msgid "Delete this group"
 msgstr "このユーザを削除"
 
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
@@ -2017,15 +2006,13 @@ msgstr "このユーザを削除"
 #. TRANS: Client error displayed when trying to mark a notice as favorite without being logged in.
 #. TRANS: Client error displayed trying to block a user from a group while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
-#. TRANS: Client error displayed trying to log out when not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
-#. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
 #. TRANS: Client error displayed when trying to change user options while not logged in.
 #: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
-#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:70
+#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
-#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:98
+#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
 #: lib/adminpanelaction.php:71 lib/profileformaction.php:63
 #: lib/settingsaction.php:72
@@ -2055,13 +2042,12 @@ msgstr "本当にこのつぶやきを削除しますか？"
 #. TRANS: Submit button title for 'No' when deleting a notice.
 #: actions/deletenotice.php:159
 #, fuzzy
-msgid "Do not delete this notice."
+msgid "Do not delete this notice"
 msgstr "このつぶやきを削除できません。"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:166
-#, fuzzy
-msgid "Delete this notice."
+#: actions/deletenotice.php:166 lib/noticelist.php:673
+msgid "Delete this notice"
 msgstr "このつぶやきを削除"
 
 #. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
@@ -2098,13 +2084,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting a user.
 #: actions/deleteuser.php:158
 #, fuzzy
-msgid "Do not delete this user."
+msgid "Do not delete this user"
 msgstr "このつぶやきを削除できません。"
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
-#: actions/deleteuser.php:165
-#, fuzzy
-msgid "Delete this user."
+#. TRANS: Description of form for deleting a user.
+#: actions/deleteuser.php:165 lib/deleteuserform.php:75
+msgid "Delete this user"
 msgstr "このユーザを削除"
 
 #. TRANS: Message used as title for design settings for the site.
@@ -2273,21 +2259,21 @@ msgid "Use defaults"
 msgstr "デフォルトを使用"
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:720
-#, fuzzy
-msgid "Restore default designs."
+#. TRANS: Title for button on profile design page to reset all colour settings to default.
+#: actions/designadminpanel.php:720 lib/designsettings.php:259
+msgid "Restore default designs"
 msgstr "デフォルトデザインに戻す。"
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:728
-#, fuzzy
-msgid "Reset back to default."
+#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
+#: actions/designadminpanel.php:728 lib/designsettings.php:267
+msgid "Reset back to default"
 msgstr "デフォルトへリセットする"
 
 #. TRANS: Title for button for saving theme settings.
-#: actions/designadminpanel.php:736
-#, fuzzy
-msgid "Save design."
+#. TRANS: Title for button on profile design page to save settings.
+#: actions/designadminpanel.php:736 lib/designsettings.php:272
+msgid "Save design"
 msgstr "デザインの保存"
 
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
@@ -2319,7 +2305,7 @@ msgid "You must be logged in to edit an application."
 msgstr "アプリケーションを編集するにはログインしていなければなりません。"
 
 #. TRANS: Client error displayed trying to edit an application that does not exist.
-#: actions/editapplication.php:83 actions/showapplication.php:83
+#: actions/editapplication.php:83 actions/showapplication.php:87
 msgid "No such application."
 msgstr "そのようなアプリケーションはありません。"
 
@@ -2606,7 +2592,7 @@ msgid "Cannot normalize that email address."
 msgstr "そのメールアドレスを正規化できません"
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:393 actions/register.php:204
+#: actions/emailsettings.php:393 actions/register.php:212
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "有効なメールアドレスではありません。"
@@ -2684,22 +2670,19 @@ msgstr "入ってくるメールアドレスではありません。"
 
 #. 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.
 #: actions/emailsettings.php:530 actions/emailsettings.php:554
-#: actions/smssettings.php:566 actions/smssettings.php:591
+#: actions/smssettings.php:565 actions/smssettings.php:588
 #, fuzzy
 msgid "Could not update user record."
 msgstr "ユーザレコードを更新できません。"
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
-#. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:534 actions/smssettings.php:570
+#: actions/emailsettings.php:534 actions/smssettings.php:568
 msgid "Incoming email address removed."
 msgstr "入ってくるメールアドレスは削除されました。"
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
-#. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:558 actions/smssettings.php:595
+#: actions/emailsettings.php:558 actions/smssettings.php:591
 msgid "New incoming email address added."
 msgstr "新しい入ってくるメールアドレスが追加されました。"
 
@@ -2711,7 +2694,7 @@ msgstr "このつぶやきはすでにお気に入りです!"
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
 #: actions/favor.php:95
 #, fuzzy
-msgid "Disfavor favorite."
+msgid "Disfavor favorite"
 msgstr "お気に入りをやめる"
 
 #. TRANS: Page title for first page of favorited notices.
@@ -2957,13 +2940,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
 #: actions/groupblock.php:191
 #, fuzzy
-msgid "Do not block this user from this group."
+msgid "Do not block this user from this group"
 msgstr "このグループからこのユーザをブロックしない"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
 #: actions/groupblock.php:198
 #, fuzzy
-msgid "Block this user from this group."
+msgid "Block this user from this group"
 msgstr "このグループからこのユーザをブロック"
 
 #. TRANS: Server error displayed when trying to block a user from a group fails because of an application error.
@@ -2972,7 +2955,6 @@ msgid "Database error blocking user from group."
 msgstr "グループからのブロックユーザのデータベースエラー"
 
 #. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
-#. TRANS: Client error displayed trying to find a user by ID without providing an ID.
 #: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr "ID がありません。"
@@ -3161,10 +3143,8 @@ msgid "Group search"
 msgstr "グループの検索"
 
 #. TRANS: Text on page where groups can be searched if no results were found for a query.
-#. TRANS: Text for notice search results is the query had no results.
-#. TRANS: Message on the "People search" page where a query has no results.
-#: actions/groupsearch.php:82 actions/noticesearch.php:122
-#: actions/peoplesearch.php:87
+#: actions/groupsearch.php:82 actions/noticesearch.php:117
+#: actions/peoplesearch.php:83
 msgid "No results."
 msgstr "結果なし。"
 
@@ -3201,7 +3181,6 @@ msgid "User is not blocked from group."
 msgstr "ユーザはグループからブロックされていません。"
 
 #. TRANS: Server error displayed when unblocking a user from a group fails because of an unknown error.
-#. TRANS: Server error displayed when removing a user block.
 #: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "ブロックの削除エラー"
@@ -3297,8 +3276,7 @@ msgid "Publish a MicroID for my Jabber/Google Talk address."
 msgstr "私のJabber/GTalkアドレスのためにMicroIDを発行してください。"
 
 #. TRANS: Confirmation message for successful Instant Messaging preferences save.
-#. TRANS: Confirmation message after saving preferences.
-#: actions/imsettings.php:283 actions/othersettings.php:193
+#: actions/imsettings.php:283 actions/othersettings.php:192
 msgid "Preferences saved."
 msgstr "設定が保存されました。"
 
@@ -3590,7 +3568,7 @@ msgstr "グループから離れるにはログインしていなければなり
 
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
-#: actions/leavegroup.php:103 lib/command.php:386
+#: actions/leavegroup.php:103 lib/command.php:398
 msgid "You are not a member of that group."
 msgstr "あなたはそのグループのメンバーではありません。"
 
@@ -3713,41 +3691,39 @@ msgstr "保存"
 msgid "Save license settings"
 msgstr ""
 
-#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
-#: actions/login.php:97 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
 msgid "Already logged in."
 msgstr "既にログインしています。"
 
-#: actions/login.php:142
+#: actions/login.php:148
 msgid "Incorrect username or password."
 msgstr "ユーザ名またはパスワードが間違っています。"
 
-#. TRANS: Server error displayed when a user object could not be created trying to login using "one time password login".
-#: actions/login.php:148 actions/otp.php:127
+#: actions/login.php:154 actions/otp.php:120
 msgid "Error setting user. You are probably not authorized."
 msgstr "ユーザ設定エラー。 あなたはたぶん承認されていません。"
 
-#: actions/login.php:202 actions/login.php:253
+#: actions/login.php:210 actions/login.php:263
 msgid "Login"
 msgstr "ログイン"
 
-#: actions/login.php:239
+#: actions/login.php:249
 msgid "Login to site"
 msgstr "サイトへログイン"
 
-#: actions/login.php:248 actions/register.php:476
+#: actions/login.php:258 actions/register.php:490
 msgid "Remember me"
 msgstr "ログイン状態を保持"
 
-#: actions/login.php:249 actions/register.php:478
+#: actions/login.php:259 actions/register.php:492
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "以降は自動的にログインする。共用コンピューターでは避けましょう！"
 
-#: actions/login.php:259
+#: actions/login.php:269
 msgid "Lost or forgotten password?"
 msgstr "パスワードを紛失、忘れた？"
 
-#: actions/login.php:277
+#: actions/login.php:288
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -3755,12 +3731,12 @@ msgstr ""
 "セキュリティー上の理由により、設定を変更する前にユーザ名とパスワードを入力し"
 "て下さい。"
 
-#: actions/login.php:281
+#: actions/login.php:292
 #, fuzzy
 msgid "Login with your username and password."
 msgstr "ユーザ名とパスワードでログイン"
 
-#: actions/login.php:284
+#: actions/login.php:295
 #, fuzzy, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -3843,14 +3819,14 @@ msgid "New message"
 msgstr "新しいメッセージ"
 
 #. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
-#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:501
+#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:513
 msgid "You can't send a message to this user."
 msgstr "このユーザにメッセージを送ることはできません。"
 
 #. TRANS: Command exception text shown when trying to send a direct message to another user without content.
 #. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
-#: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:478
-#: lib/command.php:581
+#: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:490
+#: lib/command.php:593
 msgid "No content!"
 msgstr "コンテンツがありません！"
 
@@ -3859,7 +3835,7 @@ msgid "No recipient specified."
 msgstr "受取人が書かれていません。"
 
 #. TRANS: Error text shown when trying to send a direct message to self.
-#: actions/newmessage.php:167 lib/command.php:505
+#: actions/newmessage.php:167 lib/command.php:517
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
@@ -3871,7 +3847,7 @@ msgstr "メッセージを送りました"
 
 #. TRANS: Message given have sent a direct message to another user.
 #. TRANS: %s is the name of the other user.
-#: actions/newmessage.php:188 lib/command.php:513
+#: actions/newmessage.php:188 lib/command.php:525
 #, php-format
 msgid "Direct message to %s sent."
 msgstr "ダイレクトメッセージを %s  に送りました"
@@ -3888,9 +3864,7 @@ msgstr "新しいつぶやき"
 msgid "Notice posted"
 msgstr "つぶやきを投稿しました"
 
-#. TRANS: Instructions for Notice search page.
-#. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/noticesearch.php:69
+#: actions/noticesearch.php:68
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -3898,21 +3872,16 @@ msgid ""
 msgstr ""
 "%%site.name%% のつぶやきを内容から検索。検索語はスペース区切り。3字以上"
 
-#. TRANS: Title of the page where users can search for notices.
-#: actions/noticesearch.php:80
+#: actions/noticesearch.php:78
 msgid "Text search"
 msgstr "テキスト検索"
 
-#. TRANS: Test in RSS notice search.
-#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearch.php:95
+#: actions/noticesearch.php:91
 #, php-format
 msgid "Search results for \"%1$s\" on %2$s"
 msgstr "\"%1$s\" の %2$s 上の検索結果"
 
-#. TRANS: Text for logged in users making a query for notices without results.
-#. TRANS: This message contains a Markdown link.
-#: actions/noticesearch.php:128
+#: actions/noticesearch.php:121
 #, php-format
 msgid ""
 "Be the first to [post on this topic](%%%%action.newnotice%%%%?"
@@ -3921,9 +3890,7 @@ msgstr ""
 "最初の [このトピック投稿](%%%%action.newnotice%%%%?status_textarea=%s) をして"
 "ください!"
 
-#. TRANS: Text for not logged in users making a query for notices without results.
-#. TRANS: This message contains Markdown links.
-#: actions/noticesearch.php:133
+#: actions/noticesearch.php:124
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and be the first to "
@@ -3932,17 +3899,14 @@ msgstr ""
 "なぜ [アカウント登録](%%%%action.register%%%%) しないのですか、そして最初の"
 "[このトピック投稿](%%%%action.newnotice%%%%?status_textarea=%s)してください!"
 
-#. TRANS: RSS notice search feed title. %s is the query.
-#: actions/noticesearchrss.php:95
+#: actions/noticesearchrss.php:96
 #, php-format
 msgid "Updates with \"%s\""
 msgstr "%s で更新"
 
-#. TRANS: RSS notice search feed description.
-#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearchrss.php:99
+#: actions/noticesearchrss.php:98
 #, fuzzy, php-format
-msgid "Updates matching search term \"%1$s\" on %2$s."
+msgid "Updates matching search term \"%1$s\" on %2$s!"
 msgstr "\"%2$s\" 上の検索語 \"$1$s\" に一致するすべての更新"
 
 #: actions/nudge.php:85
@@ -3984,30 +3948,30 @@ msgid "You have not registered any applications yet."
 msgstr "あなたはまだなんのアプリケーションも登録していません。"
 
 #. TRANS: Title for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:70
+#: actions/oauthconnectionssettings.php:71
 msgid "Connected applications"
 msgstr "接続されたアプリケーション"
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:81
+#: actions/oauthconnectionssettings.php:83
 msgid "The following connections exist for your account."
 msgstr ""
 
 #. TRANS: Client error when trying to revoke access for an application while not being a user of it.
-#: actions/oauthconnectionssettings.php:166
+#: actions/oauthconnectionssettings.php:168
 msgid "You are not a user of that application."
 msgstr "あなたはそのアプリケーションのユーザではありません。"
 
 #. TRANS: Client error when revoking access has failed for some reason.
 #. TRANS: %s is the application ID revoking access failed for.
-#: actions/oauthconnectionssettings.php:181
+#: actions/oauthconnectionssettings.php:183
 #, fuzzy, php-format
 msgid "Unable to revoke access for application: %s."
 msgstr "アプリケーションのための取消しアクセスができません: "
 
 #. TRANS: Success message after revoking access for an application.
 #. TRANS: %1$s is the application name, %2$s is the first part of the user token.
-#: actions/oauthconnectionssettings.php:200
+#: actions/oauthconnectionssettings.php:202
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -4015,7 +3979,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:211
+#: actions/oauthconnectionssettings.php:213
 msgid "You have not authorized any applications to use your account."
 msgstr ""
 "あなたは、どんなアプリケーションもあなたのアカウントを使用するのを認可してい"
@@ -4024,23 +3988,13 @@ msgstr ""
 #. TRANS: Note for developers in the OAuth connection settings form.
 #. TRANS: This message contains a Markdown link. Do not separate "](".
 #. TRANS: %s is the URL to the OAuth settings.
-#: actions/oauthconnectionssettings.php:231
+#: actions/oauthconnectionssettings.php:233
 #, php-format
 msgid ""
 "Are you a developer? [Register an OAuth client application](%s) to use with "
 "this instance of StatusNet."
 msgstr ""
 
-#: actions/oembed.php:64
-#, fuzzy, php-format
-msgid "\"%s\" not found."
-msgstr "API メソッドが見つかりません。"
-
-#: actions/oembed.php:76
-#, fuzzy, php-format
-msgid "Notice %s not found."
-msgstr "API メソッドが見つかりません。"
-
 #: actions/oembed.php:80 actions/shownotice.php:100
 msgid "Notice has no profile."
 msgstr "ユーザはプロフィールをもっていません。"
@@ -4050,16 +4004,6 @@ msgstr "ユーザはプロフィールをもっていません。"
 msgid "%1$s's status on %2$s"
 msgstr "%2$s における %1$s のステータス"
 
-#: actions/oembed.php:95
-#, fuzzy, php-format
-msgid "Attachment %s not found."
-msgstr "受け取り手のユーザが見つかりません。"
-
-#: actions/oembed.php:136
-#, php-format
-msgid "\"%s\" not supported for oembed requests."
-msgstr ""
-
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
 #: actions/oembed.php:168
 #, fuzzy, php-format
@@ -4078,12 +4022,11 @@ msgstr ""
 msgid "Not a supported data format."
 msgstr "サポートされていないデータ形式。"
 
-#. TRANS: ShortName in the OpenSearch interface when trying to find users.
 #: actions/opensearch.php:64
 msgid "People Search"
 msgstr "ピープル検索"
 
-#: actions/opensearch.php:68
+#: actions/opensearch.php:67
 msgid "Notice Search"
 msgstr "つぶやき検索"
 
@@ -4131,46 +4074,37 @@ msgstr "プロファイルデザインの表示または非表示"
 msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr "URL 短縮サービスが長すぎます。（最大50字）"
 
-#. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
-#: actions/otp.php:70
+#: actions/otp.php:69
 msgid "No user ID specified."
 msgstr "ユーザIDの記述がありません。"
 
-#. TRANS: Client error displayed trying to use "one time password login" without specifying a login token.
-#: actions/otp.php:86
+#: actions/otp.php:83
 msgid "No login token specified."
 msgstr "ログイントークンの記述がありません。"
 
-#. TRANS: Client error displayed trying to use "one time password login" without requesting a login token.
-#: actions/otp.php:94
+#: actions/otp.php:90
 msgid "No login token requested."
 msgstr "ログイントークンが要求されていません。"
 
-#. TRANS: Client error displayed trying to use "one time password login" while specifying an invalid login token.
-#: actions/otp.php:100
+#: actions/otp.php:95
 msgid "Invalid login token specified."
 msgstr "不正なログイントークンが指定されています。"
 
-#. TRANS: Client error displayed trying to use "one time password login" while specifying an expired login token.
-#: actions/otp.php:110
+#: actions/otp.php:104
 msgid "Login token expired."
 msgstr "ログイントークンが期限切れです・"
 
-#. TRANS: Title for outbox for any but the fist page.
-#. TRANS: %1$s is the user nickname, %2$d is the page number.
-#: actions/outbox.php:57
+#: actions/outbox.php:58
 #, php-format
 msgid "Outbox for %1$s - page %2$d"
 msgstr "%1$s の送信箱 - ページ %2$d"
 
-#. TRANS: Title for first page of outbox.
 #: actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
 msgstr "%s の送信箱"
 
-#. TRANS: Instructions for outbox.
-#: actions/outbox.php:103
+#: actions/outbox.php:104
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr ""
 "これはあなたの送信箱です、あなたが送ったプライベート・メッセージをリストしま"
@@ -4198,45 +4132,43 @@ msgstr "古いパスワード"
 msgid "New password"
 msgstr "新しいパスワード"
 
-#: actions/passwordsettings.php:109 actions/register.php:423
+#: actions/passwordsettings.php:109
 #, fuzzy
-msgid "6 or more characters."
+msgid "6 or more characters"
 msgstr "6文字以上"
 
-#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:264
-#: actions/register.php:427
+#: actions/passwordsettings.php:113
 #, fuzzy
-msgid "Same as password above."
+msgid "Same as password above"
 msgstr "上と同じパスワード"
 
 #: actions/passwordsettings.php:117
 msgid "Change"
 msgstr "変更"
 
-#: actions/passwordsettings.php:153 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:238
 msgid "Password must be 6 or more characters."
 msgstr "パスワードは6文字以上にする必要があります。"
 
-#: actions/passwordsettings.php:156 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:241
 msgid "Passwords don't match."
 msgstr "パスワードが一致しません。"
 
-#: actions/passwordsettings.php:164
+#: actions/passwordsettings.php:165
 msgid "Incorrect old password"
 msgstr "古いパスワードが間違っています。"
 
-#: actions/passwordsettings.php:180
+#: actions/passwordsettings.php:181
 msgid "Error saving user; invalid."
 msgstr "ユーザ保存エラー; 不正なユーザ"
 
-#. TRANS: Reset password form validation error message.
-#: actions/passwordsettings.php:185 actions/recoverpassword.php:418
+#: actions/passwordsettings.php:186
 #, fuzzy
-msgid "Cannot save new password."
+msgid "Can't save new password."
 msgstr "新しいパスワードを保存できません。"
 
-#: actions/passwordsettings.php:191
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
 msgid "Password saved."
 msgstr "パスワードが保存されました。"
 
@@ -4528,9 +4460,7 @@ msgstr "ダイレクト SSL リクエストを向けるサーバ"
 msgid "Save paths"
 msgstr "保存パス"
 
-#. TRANS: Instructions for the "People search" page.
-#. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/peoplesearch.php:54
+#: actions/peoplesearch.php:52
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
@@ -4539,8 +4469,7 @@ msgstr ""
 "%%site.name%% の人を名前、場所、興味から検索。検索語はスペース区切り。3字以"
 "上。"
 
-#. TRANS: Title of a page where users can search for other users.
-#: actions/peoplesearch.php:61
+#: actions/peoplesearch.php:58
 msgid "People search"
 msgstr "ピープルサーチ"
 
@@ -4583,7 +4512,7 @@ msgid "Profile information"
 msgstr "プロファイル情報"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109 actions/register.php:419
+#: actions/profilesettings.php:109 actions/register.php:433
 #, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr "1-64文字の、小文字アルファベットか数字で、スペースや句読点は除く"
@@ -4591,7 +4520,7 @@ msgstr "1-64文字の、小文字アルファベットか数字で、スペー
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for full group name (dt). Text hidden by default.
 #. TRANS: DT for full name in a profile.
-#: actions/profilesettings.php:113 actions/register.php:441
+#: actions/profilesettings.php:113 actions/register.php:455
 #: actions/showgroup.php:255 actions/tagother.php:104
 #: lib/groupeditform.php:150 lib/userprofile.php:156
 msgid "Full name"
@@ -4599,13 +4528,13 @@ msgstr "フルネーム"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:118 actions/register.php:446
+#: actions/profilesettings.php:118 actions/register.php:460
 #: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "ホームページ"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:121 actions/register.php:448
+#: actions/profilesettings.php:121
 #, fuzzy
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr "ホームページ、ブログ、プロファイル、その他サイトの URL"
@@ -4613,36 +4542,35 @@ msgstr "ホームページ、ブログ、プロファイル、その他サイト
 #. TRANS: Tooltip for field label in form for profile settings. Plural
 #. TRANS: is decided by the number of characters available for the
 #. TRANS: biography (%d).
-#: actions/profilesettings.php:129 actions/register.php:457
+#: actions/profilesettings.php:129 actions/register.php:471
 #, fuzzy, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
 msgstr[0] "%d字以内で自分自身と自分の興味について書いてください"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:135 actions/register.php:462
+#: actions/profilesettings.php:135 actions/register.php:476
 msgid "Describe yourself and your interests"
 msgstr "自分自身と自分の興味について書いてください"
 
 #. TRANS: Text area label in form for profile settings where users can provide.
 #. TRANS: their biography.
-#: actions/profilesettings.php:139 actions/register.php:464
+#: actions/profilesettings.php:139 actions/register.php:478
 msgid "Bio"
 msgstr "自己紹介"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group location (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT for location in a profile.
-#: actions/profilesettings.php:145 actions/register.php:469
+#: actions/profilesettings.php:145 actions/register.php:483
 #: actions/showgroup.php:265 actions/tagother.php:112
-#: actions/userauthorization.php:174 lib/groupeditform.php:173
+#: actions/userauthorization.php:166 lib/groupeditform.php:173
 #: lib/userprofile.php:172
 msgid "Location"
 msgstr "場所"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148
+#: actions/profilesettings.php:148 actions/register.php:485
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "自分のいる場所。例：「都市, 都道府県 (または地域), 国」"
 
@@ -4663,8 +4591,7 @@ msgstr "タグ"
 #: actions/profilesettings.php:164
 #, fuzzy
 msgid ""
-"Tags for yourself (letters, numbers, -, ., and _), comma- or space- "
-"separated."
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr ""
 "自分自身についてのタグ (アルファベット、数字、-、.、_)、カンマまたは空白区切"
 "りで"
@@ -4677,7 +4604,7 @@ msgstr "言語"
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
 #: actions/profilesettings.php:171
 #, fuzzy
-msgid "Preferred language."
+msgid "Preferred language"
 msgstr "ご希望の言語"
 
 #. TRANS: Dropdownlist label in form for profile settings.
@@ -4694,13 +4621,13 @@ msgstr "普段のタイムゾーンはどれですか？"
 #: actions/profilesettings.php:189
 #, fuzzy
 msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)."
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr "自分をフォローしている者を自動的にフォローする (BOTに最適)"
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Plural form is used based on the maximum number of allowed
 #. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:258 actions/register.php:221
+#: actions/profilesettings.php:258 actions/register.php:229
 #, fuzzy, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4719,9 +4646,9 @@ msgstr "言語が長すぎます。(最大50字)"
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:291
-#, fuzzy, php-format
-msgid "Invalid tag: \"%s\"."
+#: actions/profilesettings.php:291 actions/tagother.php:178
+#, php-format
+msgid "Invalid tag: \"%s\""
 msgstr "不正なタグ: \"%s\""
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
@@ -4831,12 +4758,6 @@ msgstr ""
 "net/)を基にした[マイクロブロギング](http://en.wikipedia.org/wiki/Micro-"
 "blogging) サービス。"
 
-#. TRANS: Public RSS feed description. %s is the StatusNet site name.
-#: actions/publicrss.php:106
-#, fuzzy, php-format
-msgid "%s updates from everyone."
-msgstr "皆からの %s アップデート!"
-
 #. TRANS: Title for public tag cloud.
 #: actions/publictagcloud.php:57
 msgid "Public tag cloud"
@@ -4973,12 +4894,6 @@ msgstr "パスワードを回復"
 msgid "Password recovery requested"
 msgstr "パスワード回復がリクエストされました"
 
-#. TRANS: Title for password recovery page in password saved mode.
-#: actions/recoverpassword.php:229
-#, fuzzy
-msgid "Password saved"
-msgstr "パスワードが保存されました。"
-
 #. TRANS: Title for password recovery page when an unknown action has been specified.
 #: actions/recoverpassword.php:232
 msgid "Unknown action"
@@ -4990,6 +4905,12 @@ msgstr "不明なアクション"
 msgid "6 or more characters, and do not forget it!"
 msgstr "6文字以上。忘れないでください！"
 
+#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#: actions/recoverpassword.php:264 actions/register.php:441
+#, fuzzy
+msgid "Same as password above."
+msgstr "上と同じパスワード"
+
 #. TRANS: Button text for password reset form.
 #. TRANS: Button text on profile design page to reset all colour settings to default without saving.
 #: actions/recoverpassword.php:268 lib/designsettings.php:264
@@ -5041,8 +4962,14 @@ msgstr "パスワードは6字以上でなければいけません。"
 msgid "Password and confirmation do not match."
 msgstr "パスワードと確認が一致しません。"
 
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:418
+#, fuzzy
+msgid "Cannot save new password."
+msgstr "新しいパスワードを保存できません。"
+
 #. TRANS: Server error displayed when something does wrong with the user object during password reset.
-#: actions/recoverpassword.php:426 actions/register.php:248
+#: actions/recoverpassword.php:426 actions/register.php:256
 msgid "Error setting user."
 msgstr "ユーザ設定エラー"
 
@@ -5051,99 +4978,104 @@ msgstr "ユーザ設定エラー"
 msgid "New password successfully saved. You are now logged in."
 msgstr "新しいパスワードの保存に成功しました。ログインしています。"
 
-#: actions/register.php:87 actions/register.php:188 actions/register.php:399
+#: actions/register.php:92 actions/register.php:196 actions/register.php:413
 msgid "Sorry, only invited people can register."
 msgstr "すみません、招待された人々だけが登録できます。"
 
-#: actions/register.php:94
+#: actions/register.php:99
 msgid "Sorry, invalid invitation code."
 msgstr "すみません、不正な招待コード。"
 
-#: actions/register.php:113
+#: actions/register.php:119
 msgid "Registration successful"
 msgstr "登録成功"
 
-#: actions/register.php:115 actions/register.php:497
+#: actions/register.php:121 actions/register.php:511
 msgid "Register"
 msgstr "登録"
 
-#: actions/register.php:135
+#: actions/register.php:142
 msgid "Registration not allowed."
 msgstr "登録は許可されていません。"
 
-#: actions/register.php:201
+#: actions/register.php:209
 #, fuzzy
-msgid "You cannot register if you don't agree to the license."
+msgid "You can't register if you don't agree to the license."
 msgstr "ライセンスに同意頂けない場合は登録できません。"
 
-#: actions/register.php:210
+#: actions/register.php:218
 msgid "Email address already exists."
 msgstr "メールアドレスが既に存在します。"
 
-#: actions/register.php:243 actions/register.php:265
+#: actions/register.php:251 actions/register.php:273
 msgid "Invalid username or password."
 msgstr "不正なユーザ名またはパスワード。"
 
-#: actions/register.php:340
+#: actions/register.php:351
 #, fuzzy
 msgid ""
 "With this form you can create a new account. You can then post notices and "
-"link up to friends and colleagues."
+"link up to friends and colleagues. "
 msgstr ""
 "このフォームで新しいアカウントを作成できます。 次につぶやきを投稿して、友人や"
 "同僚にリンクできます。 "
 
+#: actions/register.php:437
+#, fuzzy
+msgid "6 or more characters."
+msgstr "6文字以上"
+
 #. TRANS: Link description in user account settings menu.
-#: actions/register.php:431 actions/register.php:435
+#: actions/register.php:445 actions/register.php:449
 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
 msgid "Email"
 msgstr "メール"
 
-#: actions/register.php:432 actions/register.php:436
+#: actions/register.php:446 actions/register.php:450
 #, fuzzy
-msgid "Used only for updates, announcements, and password recovery."
+msgid "Used only for updates, announcements, and password recovery"
 msgstr "更新、アナウンス、パスワードリカバリーでのみ使用されます。"
 
-#: actions/register.php:443
+#: actions/register.php:457
 #, fuzzy
-msgid "Longer name, preferably your \"real\" name."
+msgid "Longer name, preferably your \"real\" name"
 msgstr "長い名前"
 
-#: actions/register.php:471
+#: actions/register.php:462
 #, fuzzy
-msgid "Where you are, like \"City, State (or Region), Country\"."
-msgstr "自分のいる場所。例：「都市, 都道府県 (または地域), 国」"
+msgid "URL of your homepage, blog, or profile on another site"
+msgstr "ホームページ、ブログ、プロファイル、その他サイトの URL"
 
-#: actions/register.php:510
+#: actions/register.php:523
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
 msgstr ""
 
-#: actions/register.php:520
+#: actions/register.php:533
 #, php-format
 msgid "My text and files are copyright by %1$s."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:524
+#: actions/register.php:537
 msgid "My text and files remain under my own copyright."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:527
+#: actions/register.php:540
 msgid "All rights reserved."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:532
+#: actions/register.php:545
 #, fuzzy, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
 "email address, IM address, and phone number."
 msgstr "個人情報を除く: パスワード、メールアドレス、IMアドレス、電話番号"
 
-#: actions/register.php:573
+#: actions/register.php:588
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -5176,7 +5108,7 @@ msgstr ""
 "参加してくださってありがとうございます。私たちはあなたがこのサービスを楽しん"
 "で使ってくれることを願っています。"
 
-#: actions/register.php:597
+#: actions/register.php:612
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5210,7 +5142,7 @@ msgstr "ユーザのニックネーム"
 
 #: actions/remotesubscribe.php:129
 #, fuzzy
-msgid "Nickname of the user you want to follow."
+msgid "Nickname of the user you want to follow"
 msgstr "フォローしたいユーザのニックネーム"
 
 #: actions/remotesubscribe.php:132
@@ -5219,7 +5151,7 @@ msgstr "プロファイルURL"
 
 #: actions/remotesubscribe.php:133
 #, fuzzy
-msgid "URL of your profile on another compatible microblogging service."
+msgid "URL of your profile on another compatible microblogging service"
 msgstr "プロファイルサービスまたはマイクロブロギングサービスのURL"
 
 #. TRANS: Link text for link that will subscribe to a remote profile.
@@ -5230,7 +5162,7 @@ msgstr "フォロー"
 
 #: actions/remotesubscribe.php:158
 #, fuzzy
-msgid "Invalid profile URL (bad format)."
+msgid "Invalid profile URL (bad format)"
 msgstr "不正なプロファイルURL。（形式不備）"
 
 #: actions/remotesubscribe.php:167
@@ -5275,7 +5207,6 @@ msgstr "繰り返された"
 msgid "Repeated!"
 msgstr "繰り返されました!"
 
-#. TRANS: RSS reply feed title. %s is a user nickname.
 #. TRANS: Tooltip for personal group navigation menu option when logged in for viewing @-replies.
 #: actions/replies.php:126 actions/repliesrss.php:68
 #: lib/personalgroupnav.php:109
@@ -5328,11 +5259,9 @@ msgstr ""
 "最初の [このトピック投稿](%%%%action.newnotice%%%%?status_textarea=%s) をして"
 "ください!"
 
-#. TRANS: RSS reply feed description.
-#. TRANS: %1$s is a user nickname, %2$s is the StatusNet site name.
-#: actions/repliesrss.php:74
+#: actions/repliesrss.php:72
 #, fuzzy, php-format
-msgid "Replies to %1$s on %2$s."
+msgid "Replies to %1$s on %2$s!"
 msgstr "%2$s 上の %1$s への返信!"
 
 #. TRANS: Client exception displayed when trying to restore an account while not logged in.
@@ -5438,7 +5367,7 @@ msgstr "あなたはこのサイトでユーザを黙らせることができま
 msgid "User doesn't have this role."
 msgstr "合っているプロフィールのないユーザ"
 
-#: actions/rsd.php:142 actions/version.php:159
+#: actions/rsd.php:146 actions/version.php:159
 msgid "StatusNet"
 msgstr "StatusNet"
 
@@ -5480,87 +5409,87 @@ msgstr "セッションのためのデバッグ出力をオン。"
 msgid "Save site settings"
 msgstr "サイト設定の保存"
 
-#: actions/showapplication.php:78
+#: actions/showapplication.php:82
 msgid "You must be logged in to view an application."
 msgstr "!!アプリケーションを見るためにはログインしていなければなりません。"
 
-#: actions/showapplication.php:151
+#: actions/showapplication.php:157
 msgid "Application profile"
 msgstr "アプリケーションプロファイル"
 
 #. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:153 lib/applicationeditform.php:177
+#: actions/showapplication.php:159 lib/applicationeditform.php:177
 msgid "Icon"
 msgstr "アイコン"
 
 #. TRANS: Form input field label for application name.
-#: actions/showapplication.php:163 actions/version.php:197
+#: actions/showapplication.php:169 actions/version.php:197
 #: lib/applicationeditform.php:190
 msgid "Name"
 msgstr "名前"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:172 lib/applicationeditform.php:227
+#: actions/showapplication.php:178 lib/applicationeditform.php:227
 msgid "Organization"
 msgstr "組織"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:181 actions/version.php:200
+#: actions/showapplication.php:187 actions/version.php:200
 #: lib/applicationeditform.php:208 lib/groupeditform.php:168
 msgid "Description"
 msgstr "概要"
 
 #. TRANS: Header for group statistics on a group page (h2).
 #. TRANS: H2 text for user statistics.
-#: actions/showapplication.php:186 actions/showgroup.php:460
+#: actions/showapplication.php:192 actions/showgroup.php:460
 #: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "統計データ"
 
-#: actions/showapplication.php:197
+#: actions/showapplication.php:203
 #, php-format
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr ""
 
-#: actions/showapplication.php:207
+#: actions/showapplication.php:213
 msgid "Application actions"
 msgstr "アプリケーションアクション"
 
-#: actions/showapplication.php:230
+#: actions/showapplication.php:236
 msgid "Reset key & secret"
 msgstr "key と secret のリセット"
 
 #. TRANS: Title of form for deleting a user.
-#: actions/showapplication.php:246 lib/deletegroupform.php:121
+#: actions/showapplication.php:252 lib/deletegroupform.php:121
 #: lib/deleteuserform.php:64 lib/noticelist.php:673
 msgid "Delete"
 msgstr "削除"
 
-#: actions/showapplication.php:255
+#: actions/showapplication.php:261
 msgid "Application info"
 msgstr "アプリケーション情報"
 
-#: actions/showapplication.php:257
+#: actions/showapplication.php:263
 msgid "Consumer key"
 msgstr ""
 
-#: actions/showapplication.php:262
+#: actions/showapplication.php:268
 msgid "Consumer secret"
 msgstr ""
 
-#: actions/showapplication.php:267
+#: actions/showapplication.php:273
 msgid "Request token URL"
 msgstr "リクエストトークンURL"
 
-#: actions/showapplication.php:272
+#: actions/showapplication.php:278
 msgid "Access token URL"
 msgstr "アクセストークンURL"
 
-#: actions/showapplication.php:277
+#: actions/showapplication.php:283
 msgid "Authorize URL"
 msgstr "承認URL"
 
-#: actions/showapplication.php:282
+#: actions/showapplication.php:288
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
@@ -5568,7 +5497,7 @@ msgstr ""
 "注意: 私たちはHMAC-SHA1署名をサポートします。 私たちは平文署名メソッドをサ"
 "ポートしません。"
 
-#: actions/showapplication.php:302
+#: actions/showapplication.php:309
 #, fuzzy
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr "本当にこのつぶやきを削除しますか？"
@@ -5661,18 +5590,16 @@ msgid "Group profile"
 msgstr "グループプロファイル"
 
 #. TRANS: Label for group URL (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT for URL in a profile.
 #: actions/showgroup.php:273 actions/tagother.php:118
-#: actions/userauthorization.php:184 lib/userprofile.php:186
+#: actions/userauthorization.php:175 lib/userprofile.php:186
 msgid "URL"
 msgstr "URL"
 
 #. TRANS: Label for group description or group note (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page where bio is displayed.
 #. TRANS: DT for note in a profile.
 #: actions/showgroup.php:285 actions/tagother.php:128
-#: actions/userauthorization.php:197 lib/userprofile.php:204
+#: actions/userauthorization.php:187 lib/userprofile.php:204
 msgid "Note"
 msgstr "ノート"
 
@@ -5819,7 +5746,7 @@ msgid "%1$s tagged %2$s"
 msgstr "%1$s、ページ %2$d"
 
 #. TRANS: Page title showing tagged notices in one user's stream.
-#. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
+#. TRANS: %1$s is the username, %2$s is the hash tag, %1$d is the page number.
 #: actions/showstream.php:74
 #, fuzzy, php-format
 msgid "%1$s tagged %2$s, page %3$d"
@@ -6076,7 +6003,7 @@ msgstr ""
 #. TRANS: Title for button to save site notice in admin panel.
 #: actions/sitenoticeadminpanel.php:201
 #, fuzzy
-msgid "Save site notice."
+msgid "Save site notice"
 msgstr "サイトつぶやき"
 
 #. TRANS: Title for SMS settings.
@@ -6138,7 +6065,7 @@ msgstr "SMS 電話番号"
 #. TRANS: SMS phone number input field instructions in SMS settings form.
 #: actions/smssettings.php:152
 #, fuzzy
-msgid "Phone number, no punctuation or spaces, with area code."
+msgid "Phone number, no punctuation or spaces, with area code"
 msgstr "電話番号、句読点またはスペースがない、市街番号付き"
 
 #. TRANS: Form legend for SMS preferences form.
@@ -6310,20 +6237,16 @@ msgstr "あなたはそのプロファイルにフォローされていません
 msgid "Could not save subscription."
 msgstr "フォローを保存できません。"
 
-#. TRANS: Client error displayed trying to perform any request method other than POST.
-#. TRANS: Do not translate POST.
 #: actions/subscribe.php:77
 msgid "This action only accepts POST requests."
 msgstr ""
 
-#. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
-#: actions/subscribe.php:121
+#: actions/subscribe.php:117
 #, fuzzy
 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
 msgstr "あなたはそのプロファイルにフォローされていません。"
 
-#. TRANS: Page title when subscription succeeded.
-#: actions/subscribe.php:149
+#: actions/subscribe.php:145
 msgid "Subscribed"
 msgstr "フォローしている"
 
@@ -6484,9 +6407,8 @@ msgstr "タグ %s"
 msgid "User profile"
 msgstr "ユーザプロファイル"
 
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT element in area for user avatar.
-#: actions/tagother.php:81 actions/userauthorization.php:138
+#: actions/tagother.php:81 actions/userauthorization.php:132
 #: lib/userprofile.php:108
 msgid "Photo"
 msgstr "写真"
@@ -6502,11 +6424,6 @@ msgid ""
 msgstr ""
 "このユーザのタグ (アルファベット、数字、-、.、_)、カンマかスペース区切り"
 
-#: actions/tagother.php:178
-#, php-format
-msgid "Invalid tag: \"%s\""
-msgstr "不正なタグ: \"%s\""
-
 #: actions/tagother.php:193
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
@@ -6522,7 +6439,6 @@ msgstr "このフォームを使用して、フォロー者かフォローにタ
 msgid "No such tag."
 msgstr "そのようなタグはありません。"
 
-#. TRANS: Client error displayed when trying to unblock a non-blocked user.
 #: actions/unblock.php:59
 msgid "You haven't blocked that user."
 msgstr "あなたはそのユーザをブロックしていません。"
@@ -6543,7 +6459,7 @@ msgstr "ログイントークンが要求されていません。"
 msgid "Unsubscribed"
 msgstr "フォロー解除済み"
 
-#: actions/updateprofile.php:64
+#: actions/updateprofile.php:64 actions/userauthorization.php:337
 #, php-format
 msgid ""
 "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
@@ -6578,7 +6494,7 @@ msgstr "不正なウェルカムテキスト。最大長は255字です。"
 #. TRANS: users in user admin panel. %1$s is the invalid nickname.
 #: actions/useradminpanel.php:166
 #, fuzzy, php-format
-msgid "Invalid default subscripton: \"%1$s\" is not a user."
+msgid "Invalid default subscripton: '%1$s' is not a user."
 msgstr "不正なデフォルトフォローです: '%1$s'  はユーザではありません。"
 
 #. TRANS: Link description in user account settings menu.
@@ -6640,69 +6556,58 @@ msgstr "ユーザが新しいユーザを招待するのを許容するかどう
 #. TRANS: Title for button to save user settings in user admin panel.
 #: actions/useradminpanel.php:302
 #, fuzzy
-msgid "Save user settings."
+msgid "Save user settings"
 msgstr "サイト設定の保存"
 
-#. TRANS: Page title.
-#: actions/userauthorization.php:109
+#: actions/userauthorization.php:105
 msgid "Authorize subscription"
 msgstr "フォローを承認"
 
-#. TRANS: Page notice on "Auhtorize subscription" page.
-#: actions/userauthorization.php:115
+#: actions/userauthorization.php:110
 #, fuzzy
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
 "user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
-"click \"Reject\"."
+"click “Reject”."
 msgstr ""
 "ユーザのつぶやきをフォローするには詳細を確認して下さい。だれかのつぶやきを"
 "フォローするために尋ねない場合は、\"Reject\" をクリックして下さい。"
 
-#. TRANS: DT element on Authorise Subscription page where license is displayed.
 #. TRANS: Menu item for site administration
-#: actions/userauthorization.php:207 actions/version.php:167
+#: actions/userauthorization.php:196 actions/version.php:167
 #: lib/adminpanelaction.php:403
 msgid "License"
 msgstr "ライセンス"
 
-#. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:229
+#: actions/userauthorization.php:217
 #, fuzzy
-msgctxt "BUTTON"
 msgid "Accept"
 msgstr "承認"
 
-#. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:231
-#, fuzzy
-msgid "Subscribe to this user."
+#: actions/userauthorization.php:218 lib/subscribeform.php:115
+#: lib/subscribeform.php:139
+msgid "Subscribe to this user"
 msgstr "このユーザーをフォロー"
 
-#. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:233
+#: actions/userauthorization.php:219
 #, fuzzy
-msgctxt "BUTTON"
 msgid "Reject"
 msgstr "拒否"
 
-#. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:235
+#: actions/userauthorization.php:220
 #, fuzzy
-msgid "Reject this subscription."
+msgid "Reject this subscription"
 msgstr "このフォローを拒否"
 
-#. TRANS: Client error displayed for an empty authorisation request.
-#: actions/userauthorization.php:248
+#: actions/userauthorization.php:232
 msgid "No authorization request!"
 msgstr "認証のリクエストがありません。"
 
-#. TRANS: Accept message header from Authorise subscription page.
-#: actions/userauthorization.php:271
+#: actions/userauthorization.php:254
 msgid "Subscription authorized"
 msgstr "フォローが承認されました"
 
-#: actions/userauthorization.php:274
+#: actions/userauthorization.php:256
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to authorize the "
@@ -6712,12 +6617,11 @@ msgstr ""
 "フォローを承認するかに関する詳細のためのサイトの指示をチェックしてください。"
 "あなたのフォロートークンは:"
 
-#. TRANS: Reject message header from Authorise subscription page.
-#: actions/userauthorization.php:285
+#: actions/userauthorization.php:266
 msgid "Subscription rejected"
 msgstr "フォローが拒否"
 
-#: actions/userauthorization.php:288
+#: actions/userauthorization.php:268
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to fully reject the "
@@ -6727,64 +6631,39 @@ msgstr ""
 "フォローを完全に拒絶するかに関する詳細のためのサイトの指示をチェックしてくだ"
 "さい。"
 
-#. TRANS: Exception thrown when no valid user is found for an authorisation request.
-#. TRANS: %s is a listener URI.
-#: actions/userauthorization.php:325
+#: actions/userauthorization.php:303
 #, fuzzy, php-format
-msgid "Listener URI \"%s\" not found here."
+msgid "Listener URI ‘%s’ not found here."
 msgstr "リスナー URI  ‘%s’ はここでは見つかりません。"
 
-#. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:332
+#: actions/userauthorization.php:308
 #, fuzzy, php-format
-msgid "Listenee URI \"%s\" is too long."
+msgid "Listenee URI ‘%s’ is too long."
 msgstr "リスニー URI  ‘%s’ が長すぎます。"
 
-#. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:340
+#: actions/userauthorization.php:314
 #, fuzzy, php-format
-msgid "Listenee URI \"%s\" is a local user."
+msgid "Listenee URI ‘%s’ is a local user."
 msgstr "リスニー URI  ‘%s’ はローカルユーザーではありません。"
 
-#. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
-#. TRANS: %s is a profile URL.
-#: actions/userauthorization.php:358
+#: actions/userauthorization.php:329
 #, fuzzy, php-format
-msgid "Profile URL \"%s\" is for a local user."
+msgid "Profile URL ‘%s’ is for a local user."
 msgstr "プロファイル URL  ‘%s’ はローカルユーザーではありません。"
 
-#. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
-#. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
-#: actions/userauthorization.php:368
+#: actions/userauthorization.php:345
 #, fuzzy, php-format
-msgid ""
-"Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
-"\"."
-msgstr ""
-"リスニーストリームライセンス ‘%1$s’ は、サイトライセンス ‘%2$s’ と互換性があ"
-"りません。"
-
-#. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:378
-#, fuzzy, php-format
-msgid "Avatar URL \"%s\" is not valid."
+msgid "Avatar URL ‘%s’ is not valid."
 msgstr "アバター URL  ‘%s’ が正しくありません。"
 
-#. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:385
+#: actions/userauthorization.php:350
 #, fuzzy, php-format
-msgid "Cannot read avatar URL \"%s\"."
+msgid "Can’t read avatar URL ‘%s’."
 msgstr "アバターURL　を読み取れません '%s'"
 
-#. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:392
+#: actions/userauthorization.php:355
 #, fuzzy, php-format
-msgid "Wrong image type for avatar URL \"%s\"."
+msgid "Wrong image type for avatar URL ‘%s’."
 msgstr "アバター URL '%s' は不正な画像形式。"
 
 #. TRANS: Page title for profile design page.
@@ -6883,7 +6762,7 @@ msgid "Plugins"
 msgstr "プラグイン"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:898
+#: actions/version.php:198 lib/action.php:901
 msgid "Version"
 msgstr "バージョン"
 
@@ -7090,14 +6969,14 @@ msgstr "グループ受信箱を保存する際に問題が発生しました。
 
 #. TRANS: Server exception thrown when a reply cannot be saved.
 #. TRANS: %1$d is a notice ID, %2$d is the ID of the mentioned user.
-#: classes/Notice.php:1142
+#: classes/Notice.php:1144
 #, fuzzy, php-format
 msgid "Could not save reply for %1$d, %2$d."
 msgstr "フォローを保存できません。"
 
 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1661
+#: classes/Notice.php:1663
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr ""
@@ -7111,14 +6990,14 @@ msgstr "%1$s (%2$s)"
 
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:775
+#: classes/Profile.php:779
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:784
+#: classes/Profile.php:788
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -7446,53 +7325,53 @@ msgid "Page notice"
 msgstr "ページつぶやき"
 
 #. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:871
+#: lib/action.php:874
 msgid "Secondary site navigation"
 msgstr "セカンダリサイトナビゲーション"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:877
+#: lib/action.php:880
 msgid "Help"
 msgstr "ヘルプ"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:880
+#: lib/action.php:883
 msgid "About"
 msgstr "About"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:883
+#: lib/action.php:886
 msgid "FAQ"
 msgstr "よくある質問"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:888
+#: lib/action.php:891
 msgid "TOS"
 msgstr ""
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:892
+#: lib/action.php:895
 msgid "Privacy"
 msgstr "プライバシー"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:895
+#: lib/action.php:898
 msgid "Source"
 msgstr "ソース"
 
 #. TRANS: Secondary navigation menu option leading to e-mail contact information on the
 #. TRANS: StatusNet site, where to report bugs, ...
-#: lib/action.php:902
+#: lib/action.php:905
 msgid "Contact"
 msgstr "連絡先"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:905
+#: lib/action.php:908
 msgid "Badge"
 msgstr "バッジ"
 
 #. TRANS: DT element for StatusNet software license.
-#: lib/action.php:934
+#: lib/action.php:937
 msgid "StatusNet software license"
 msgstr "StatusNet ソフトウェアライセンス"
 
@@ -7500,7 +7379,7 @@ msgstr "StatusNet ソフトウェアライセンス"
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:941
+#: lib/action.php:944
 #, fuzzy, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7510,7 +7389,7 @@ msgstr ""
 "イクロブログサービスです。 "
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:944
+#: lib/action.php:947
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** はマイクロブログサービスです。"
@@ -7519,7 +7398,7 @@ msgstr "**%%site.name%%** はマイクロブログサービスです。"
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:951
+#: lib/action.php:954
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7531,50 +7410,50 @@ msgstr ""
 "org/licensing/licenses/agpl-3.0.html)。"
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:967
+#: lib/action.php:970
 msgid "Site content license"
 msgstr "サイト内容ライセンス"
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:974
+#: lib/action.php:977
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:981
+#: lib/action.php:984
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:985
+#: lib/action.php:988
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:1017
+#: lib/action.php:1020
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
 
 #. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1353
+#: lib/action.php:1356
 msgid "Pagination"
 msgstr "ページ化"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1364
+#: lib/action.php:1367
 msgid "After"
 msgstr "<<後"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1374
+#: lib/action.php:1377
 msgid "Before"
 msgstr "前>>"
 
@@ -7778,23 +7657,19 @@ msgstr ""
 msgid "No application for that consumer key."
 msgstr ""
 
-#: lib/apiauth.php:202 lib/apiauth.php:284
-msgid "Not allowed to use API."
-msgstr ""
-
 #. TRANS: OAuth exception given when an incorrect access token was given for a user.
-#: lib/apiauth.php:225
+#: lib/apiauth.php:219
 msgid "Bad access token."
 msgstr ""
 
 #. TRANS: OAuth exception given when no user was found for a given token (no token was found).
-#: lib/apiauth.php:230
+#: lib/apiauth.php:224
 msgid "No user for that token."
 msgstr ""
 
 #. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel".
 #. TRANS: Client error thrown when authentication fails.
-#: lib/apiauth.php:272 lib/apiauth.php:302
+#: lib/apiauth.php:266 lib/apiauth.php:293
 msgid "Could not authenticate you."
 msgstr ""
 
@@ -8003,11 +7878,6 @@ msgstr "パスワード変更は許可されていません"
 msgid "Block"
 msgstr "ブロック"
 
-#. TRANS: Description of the form to block a user.
-#: lib/blockform.php:79
-msgid "Block this user"
-msgstr "このユーザをブロックする"
-
 #. TRANS: Title for command results.
 #: lib/channel.php:160 lib/channel.php:181
 msgid "Command results"
@@ -8037,7 +7907,7 @@ msgstr "その ID によるつぶやきは存在していません"
 
 #. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
 #. TRANS: Error text shown when a last user notice is requested and it does not exist.
-#: lib/command.php:99 lib/command.php:630
+#: lib/command.php:99 lib/command.php:642
 #, fuzzy
 msgid "User has no last notice."
 msgstr "利用者はまだつぶやいていません"
@@ -8088,35 +7958,41 @@ msgstr ""
 "フォローされている: %2$s\n"
 "つぶやき: %3$s"
 
+#. TRANS: Error message text shown when a favorite could not be set because it has already been favorited.
+#: lib/command.php:298
+#, fuzzy
+msgid "Could not create favorite: already favorited."
+msgstr "お気に入りを作成できません。"
+
 #. TRANS: Text shown when a notice has been marked as favourite successfully.
-#: lib/command.php:312
+#: lib/command.php:324
 msgid "Notice marked as fave."
 msgstr "お気に入りにされているつぶやき。"
 
 #. TRANS: Message given having added a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:357
+#: lib/command.php:369
 #, php-format
 msgid "%1$s joined group %2$s."
 msgstr ""
 
 #. TRANS: Message given having removed a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:405
+#: lib/command.php:417
 #, php-format
 msgid "%1$s left group %2$s."
 msgstr ""
 
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: lib/command.php:426
+#: lib/command.php:438
 #, fuzzy, php-format
 msgctxt "WHOIS"
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
 
 #. TRANS: Whois output. %s is the full name of the queried user.
-#: lib/command.php:430
+#: lib/command.php:442
 #, php-format
 msgid "Fullname: %s"
 msgstr "フルネーム： %s"
@@ -8124,7 +8000,7 @@ msgstr "フルネーム： %s"
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a location.
-#: lib/command.php:434 lib/mail.php:270
+#: lib/command.php:446 lib/mail.php:270
 #, php-format
 msgid "Location: %s"
 msgstr "場所: %s"
@@ -8132,20 +8008,20 @@ msgstr "場所: %s"
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a homepage.
-#: lib/command.php:438 lib/mail.php:274
+#: lib/command.php:450 lib/mail.php:274
 #, php-format
 msgid "Homepage: %s"
 msgstr "ホームページ: %s"
 
 #. TRANS: Whois output. %s is the bio information of the queried user.
-#: lib/command.php:442
+#: lib/command.php:454
 #, php-format
 msgid "About: %s"
 msgstr "About: %s"
 
 #. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).
 #. TRANS: %s is a remote profile.
-#: lib/command.php:471
+#: lib/command.php:483
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
@@ -8154,32 +8030,32 @@ msgstr ""
 
 #. TRANS: Message given if content is too long. %1$sd is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:488
+#: lib/command.php:500
 #, fuzzy, php-format
 msgid "Message too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
 msgstr[0] "メッセージが長すぎます - 最大 %1$d 字、あなたが送ったのは %2$d。"
 
 #. TRANS: Error text shown sending a direct message fails with an unknown reason.
-#: lib/command.php:516
+#: lib/command.php:528
 msgid "Error sending direct message."
 msgstr "ダイレクトメッセージ送信エラー。"
 
 #. TRANS: Message given having repeated a notice from another user.
 #. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:553
+#: lib/command.php:565
 #, fuzzy, php-format
 msgid "Notice from %s repeated."
 msgstr "%s からつぶやきが繰り返されています"
 
 #. TRANS: Error text shown when repeating a notice fails with an unknown reason.
-#: lib/command.php:556
+#: lib/command.php:568
 msgid "Error repeating notice."
 msgstr "つぶやき繰り返しエラー"
 
 #. TRANS: Message given if content of a notice for a reply is too long. %1$d is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:591
+#: lib/command.php:603
 #, fuzzy, php-format
 msgid "Notice too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Notice too long - maximum is %1$d characters, you sent %2$d."
@@ -8187,138 +8063,138 @@ msgstr[0] "つぶやきが長すぎます - 最大 %d 字、あなたが送っ
 
 #. TRANS: Text shown having sent a reply to a notice successfully.
 #. TRANS: %s is the nickname of the user of the notice the reply was sent to.
-#: lib/command.php:604
+#: lib/command.php:616
 #, fuzzy, php-format
 msgid "Reply to %s sent."
 msgstr "%s へ返信を送りました"
 
 #. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
-#: lib/command.php:607
+#: lib/command.php:619
 msgid "Error saving notice."
 msgstr "つぶやき保存エラー。"
 
 #. TRANS: Error text shown when no username was provided when issuing a subscribe command.
-#: lib/command.php:654
+#: lib/command.php:666
 #, fuzzy
 msgid "Specify the name of the user to subscribe to."
 msgstr "フォローする利用者の名前を指定してください"
 
 #. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
-#: lib/command.php:663
+#: lib/command.php:675
 #, fuzzy
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "あなたはそのプロファイルにフォローされていません。"
 
 #. TRANS: Text shown after having subscribed to another user successfully.
 #. TRANS: %s is the name of the user the subscription was requested for.
-#: lib/command.php:671
+#: lib/command.php:683
 #, php-format
 msgid "Subscribed to %s."
 msgstr ""
 
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.
-#: lib/command.php:692 lib/command.php:803
+#: lib/command.php:704 lib/command.php:815
 #, fuzzy
 msgid "Specify the name of the user to unsubscribe from."
 msgstr "フォローをやめるユーザの名前を指定してください"
 
 #. TRANS: Text shown after having unsubscribed from another user successfully.
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:703
+#: lib/command.php:715
 #, php-format
 msgid "Unsubscribed from %s."
 msgstr ""
 
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
-#: lib/command.php:723 lib/command.php:749
+#: lib/command.php:735 lib/command.php:761
 msgid "Command not yet implemented."
 msgstr "コマンドはまだ実装されていません。"
 
 #. TRANS: Text shown when issuing the command "off" successfully.
-#: lib/command.php:727
+#: lib/command.php:739
 msgid "Notification off."
 msgstr "通知オフ。"
 
 #. TRANS: Error text shown when the command "off" fails for an unknown reason.
-#: lib/command.php:730
+#: lib/command.php:742
 msgid "Can't turn off notification."
 msgstr "通知をオフできません。"
 
 #. TRANS: Text shown when issuing the command "on" successfully.
-#: lib/command.php:753
+#: lib/command.php:765
 msgid "Notification on."
 msgstr "通知オン。"
 
 #. TRANS: Error text shown when the command "on" fails for an unknown reason.
-#: lib/command.php:756
+#: lib/command.php:768
 msgid "Can't turn on notification."
 msgstr "通知をオンできません。"
 
 #. TRANS: Error text shown when issuing the login command while login is disabled.
-#: lib/command.php:770
+#: lib/command.php:782
 #, fuzzy
 msgid "Login command is disabled."
 msgstr "ログインコマンドが無効になっています。"
 
 #. TRANS: Text shown after issuing the login command successfully.
 #. TRANS: %s is a logon link..
-#: lib/command.php:783
+#: lib/command.php:795
 #, php-format
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
 
 #. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:812
+#: lib/command.php:824
 #, php-format
 msgid "Unsubscribed %s."
 msgstr ""
 
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
-#: lib/command.php:830
+#: lib/command.php:842
 msgid "You are not subscribed to anyone."
 msgstr "あなたはだれにもフォローされていません。"
 
 #. TRANS: Text shown after requesting other users a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
-#: lib/command.php:835
+#: lib/command.php:847
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "あなたはこの人にフォローされています:"
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user
 #. TRANS: (followers) without having any subscribers.
-#: lib/command.php:857
+#: lib/command.php:869
 msgid "No one is subscribed to you."
 msgstr "誰もフォローしていません。"
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
-#: lib/command.php:862
+#: lib/command.php:874
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "この人はあなたにフォローされている:"
 
 #. TRANS: Text shown after requesting groups a user is subscribed to without having
 #. TRANS: any group subscriptions.
-#: lib/command.php:884
+#: lib/command.php:896
 msgid "You are not a member of any groups."
 msgstr "あなたはどのグループのメンバーでもありません。"
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
-#: lib/command.php:889
+#: lib/command.php:901
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "あなたはこのグループのメンバーではありません:"
 
 #. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-#: lib/command.php:904
+#: lib/command.php:916
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -8426,11 +8302,6 @@ msgstr "承認された接続アプリケーション"
 msgid "Database error"
 msgstr "データベースエラー"
 
-#. TRANS: Description of form for deleting a user.
-#: lib/deleteuserform.php:75
-msgid "Delete this user"
-msgstr "このユーザを削除"
-
 #. TRANS: Label in form on profile design page.
 #. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
 #: lib/designsettings.php:108
@@ -8469,21 +8340,6 @@ msgstr "色の変更"
 msgid "Use defaults"
 msgstr "デフォルトを使用"
 
-#. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: lib/designsettings.php:259
-msgid "Restore default designs"
-msgstr "デフォルトデザインに戻す。"
-
-#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: lib/designsettings.php:267
-msgid "Reset back to default"
-msgstr "デフォルトへリセットする"
-
-#. TRANS: Title for button on profile design page to save settings.
-#: lib/designsettings.php:272
-msgid "Save design"
-msgstr "デザインの保存"
-
 #. TRANS: Error message displayed if design settings could not be saved.
 #. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
 #: lib/designsettings.php:405 lib/designsettings.php:427
@@ -9337,10 +9193,6 @@ msgstr "このつぶやきへ返信"
 msgid "Reply"
 msgstr "返信"
 
-#: lib/noticelist.php:673
-msgid "Delete this notice"
-msgstr "このつぶやきを削除"
-
 #: lib/noticelist.php:691
 msgid "Notice repeated"
 msgstr "つぶやきを繰り返しました"
@@ -9622,10 +9474,6 @@ msgstr "招待"
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "友人や同僚が %s で加わるよう誘ってください。"
 
-#: lib/subscribeform.php:115 lib/subscribeform.php:139
-msgid "Subscribe to this user"
-msgstr "このユーザーをフォロー"
-
 #: lib/subscriberspeopleselftagcloudsection.php:48
 #: lib/subscriptionspeopleselftagcloudsection.php:48
 msgid "People Tagcloud as self-tagged"
@@ -9799,66 +9647,61 @@ msgctxt "role"
 msgid "Moderator"
 msgstr "管理"
 
-#: lib/util.php:305
-#, fuzzy
-msgid "Not allowed to log in."
-msgstr "ログインしていません。"
-
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1309
+#: lib/util.php:1306
 msgid "a few seconds ago"
 msgstr "数秒前"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1312
+#: lib/util.php:1309
 msgid "about a minute ago"
 msgstr "約 1 分前"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1316
+#: lib/util.php:1313
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
 msgstr[0] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1319
+#: lib/util.php:1316
 msgid "about an hour ago"
 msgstr "約 1 時間前"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1323
+#: lib/util.php:1320
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
 msgstr[0] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1326
+#: lib/util.php:1323
 msgid "about a day ago"
 msgstr "約 1 日前"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1330
+#: lib/util.php:1327
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
 msgstr[0] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1333
+#: lib/util.php:1330
 msgid "about a month ago"
 msgstr "約 1 ヵ月前"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1337
+#: lib/util.php:1334
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
 msgstr[0] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1340
+#: lib/util.php:1337
 msgid "about a year ago"
 msgstr "約 1 年前"
 
@@ -9899,3 +9742,75 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#, fuzzy
+#~ msgid "Block this user."
+#~ msgstr "このユーザをブロックする"
+
+#, fuzzy
+#~ msgid "Delete this notice."
+#~ msgstr "このつぶやきを削除"
+
+#, fuzzy
+#~ msgid "Delete this user."
+#~ msgstr "このユーザを削除"
+
+#, fuzzy
+#~ msgid "Restore default designs."
+#~ msgstr "デフォルトデザインに戻す。"
+
+#, fuzzy
+#~ msgid "Reset back to default."
+#~ msgstr "デフォルトへリセットする"
+
+#, fuzzy
+#~ msgid "Save design."
+#~ msgstr "デザインの保存"
+
+#, fuzzy
+#~ msgid "Disfavor favorite."
+#~ msgstr "お気に入りをやめる"
+
+#, fuzzy
+#~ msgid "\"%s\" not found."
+#~ msgstr "API メソッドが見つかりません。"
+
+#, fuzzy
+#~ msgid "Notice %s not found."
+#~ msgstr "API メソッドが見つかりません。"
+
+#, fuzzy
+#~ msgid "Attachment %s not found."
+#~ msgstr "受け取り手のユーザが見つかりません。"
+
+#, fuzzy
+#~ msgid "Invalid tag: \"%s\"."
+#~ msgstr "不正なタグ: \"%s\""
+
+#, fuzzy
+#~ msgid "%s updates from everyone."
+#~ msgstr "皆からの %s アップデート!"
+
+#, fuzzy
+#~ msgid "Password saved"
+#~ msgstr "パスワードが保存されました。"
+
+#, fuzzy
+#~ msgid "Where you are, like \"City, State (or Region), Country\"."
+#~ msgstr "自分のいる場所。例：「都市, 都道府県 (または地域), 国」"
+
+#, fuzzy
+#~ msgid "Subscribe to this user."
+#~ msgstr "このユーザーをフォロー"
+
+#, fuzzy
+#~ msgid ""
+#~ "Listenee stream license \"%1$s\" is not compatible with site license \"%2"
+#~ "$s\"."
+#~ msgstr ""
+#~ "リスニーストリームライセンス ‘%1$s’ は、サイトライセンス ‘%2$s’ と互換性が"
+#~ "ありません。"
+
+#, fuzzy
+#~ msgid "Not allowed to log in."
+#~ msgstr "ログインしていません。"
diff --git a/locale/ka/LC_MESSAGES/statusnet.po b/locale/ka/LC_MESSAGES/statusnet.po
index 3659a4ef75..0b20a3bdcc 100644
--- a/locale/ka/LC_MESSAGES/statusnet.po
+++ b/locale/ka/LC_MESSAGES/statusnet.po
@@ -9,17 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-24 10:32+0000\n"
-"PO-Revision-Date: 2011-02-24 10:37:04+0000\n"
+"POT-Creation-Date: 2011-03-03 15:58+0000\n"
+"PO-Revision-Date: 2011-03-03 16:00:57+0000\n"
 "Language-Team: Georgian <http://translatewiki.net/wiki/Portal:ka>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r82712); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ka\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-POT-Import-Date: 2011-02-17 11:39:54+0000\n"
+"X-POT-Import-Date: 2011-02-25 23:49:23+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -131,11 +131,7 @@ msgstr "ასეთი გვერდი არ არსებობს."
 #. 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 use "one time password login" without using an existing user.
-#. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
-#. TRANS: Client error displayed trying to find a user by ID for a non-existing ID.
-#. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when calling a profile action without specifying a user.
 #: actions/all.php:80 actions/allrss.php:69
@@ -153,12 +149,12 @@ msgstr "ასეთი გვერდი არ არსებობს."
 #: actions/apitimelinementions.php:77 actions/apitimelineuser.php:79
 #: actions/avatarbynickname.php:79 actions/favoritesrss.php:72
 #: actions/foaf.php:42 actions/foaf.php:61 actions/hcard.php:67
-#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:78
+#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
 #: actions/remotesubscribe.php:144 actions/remotesubscribe.php:153
-#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:113
-#: actions/showfavorites.php:106 actions/userbyid.php:75
+#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
+#: actions/showfavorites.php:106 actions/userbyid.php:74
 #: actions/usergroups.php:93 actions/userrss.php:40 actions/userxrd.php:59
-#: actions/xrds.php:71 lib/command.php:497 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:509 lib/galleryaction.php:59
 #: lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "ასეთი მომხმარებელი არ არსებობს."
@@ -286,7 +282,7 @@ msgstr " %1$s და მეგობრების განახლებე
 #: actions/apigrouplistall.php:120 actions/apigroupmembership.php:105
 #: actions/apigroupshow.php:114 actions/apihelptest.php:84
 #: actions/apistatusesdestroy.php:101 actions/apistatusesretweets.php:110
-#: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:138
+#: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:139
 #: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
 #: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:268
 #: actions/apitimelinegroup.php:147 actions/apitimelinehome.php:173
@@ -514,7 +510,7 @@ msgstr "მიმღები მომხმარებელი ვერ მ
 #. TRANS: Client error displayed trying to direct message another user who's not a friend (403).
 #: actions/apidirectmessagenew.php:144
 #, fuzzy
-msgid "Cannot send direct messages to users who aren't your friend."
+msgid "Can't send direct messages to users who aren't your friend."
 msgstr "ვერ გაუგზავნი პირდაპირ შეტყობინებას იმას, ვისთანაც არ მეგობრობ."
 
 #. TRANS: Client error displayed trying to direct message self (403).
@@ -540,7 +536,7 @@ msgstr "ეს სტატუსი უკვე ფავორიტია."
 #. TRANS: Client error displayed when marking a notice as favourite fails.
 #. TRANS: Server error displayed when trying to mark a notice as favorite fails in the database.
 #. TRANS: Error message text shown when a favorite could not be set.
-#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:294
+#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:306
 msgid "Could not create favorite."
 msgstr "ფავორიტის შექმნა ვერ მოხერხდა."
 
@@ -599,7 +595,7 @@ msgstr "სასურველი მომხმარებელი ვე
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:191
 #: actions/newgroup.php:137 actions/profilesettings.php:273
-#: actions/register.php:206
+#: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "მეტსახელი უკვე გამოყენებულია. სცადე სხვა."
 
@@ -609,7 +605,7 @@ msgstr "მეტსახელი უკვე გამოყენებუ
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:195
 #: actions/newgroup.php:141 actions/profilesettings.php:243
-#: actions/register.php:208
+#: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "მეტსახელი არასწორია."
 
@@ -622,7 +618,7 @@ msgstr "მეტსახელი არასწორია."
 #: actions/apigroupcreate.php:181 actions/editapplication.php:235
 #: actions/editgroup.php:202 actions/newapplication.php:221
 #: actions/newgroup.php:148 actions/profilesettings.php:248
-#: actions/register.php:215
+#: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "სასტარტო გვერდი არასწორი URL-ია."
 
@@ -632,7 +628,7 @@ msgstr "სასტარტო გვერდი არასწორი URL
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:191 actions/editgroup.php:206
 #: actions/newgroup.php:152 actions/profilesettings.php:252
-#: actions/register.php:218
+#: actions/register.php:226
 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "სრული სახელი ძალიან გრძელია (არაუმეტეს 255 სიმბოლო)."
@@ -660,7 +656,7 @@ msgstr[0] "აღწერა ძალიან გრძელია (არ
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:215 actions/editgroup.php:218
 #: actions/newgroup.php:164 actions/profilesettings.php:265
-#: actions/register.php:227
+#: actions/register.php:235
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
 msgstr "ადგილმდებარეობა ძალიან გრძელია (არაუმეტეს 255 სიმბოლო)."
@@ -716,14 +712,14 @@ msgstr "ჯგუფი ვერ მოიძებნა."
 #. TRANS: Server error displayed when trying to join a group the user is already a member of.
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:333
+#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:345
 msgid "You are already a member of that group."
 msgstr "თქვენ უკვე ხართ ამ ჯგუფის წევრი."
 
 #. TRANS: Server error displayed when trying to join a group the user is blocked from joining.
 #. 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.
-#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:338
+#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:350
 msgid "You have been blocked from that group by the admin."
 msgstr "თქვენ დაბლოკილი ხართ ამ ჯგუფიდან ადმინისტრატორის მიერ."
 
@@ -733,7 +729,7 @@ msgstr "თქვენ დაბლოკილი ხართ ამ ჯგ
 #. TRANS: %1$s is the joining user's nickname, $2$s is the group nickname for which the join failed.
 #. TRANS: Message given having failed to add a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:350
+#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:362
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "ვერ მოხერხდა მომხმარებელ %1$s-სთან ერთად ჯგუფ %2$s-ში გაერთიანება."
@@ -750,7 +746,7 @@ msgstr "თვენ არ ხართ ამ ჯგუფის წევრ
 #. TRANS: Message given having failed to remove a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
 #: actions/apigroupleave.php:127 actions/leavegroup.php:133
-#: lib/command.php:398
+#: lib/command.php:410
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
 msgstr "მომხმარებლ %1$s-ის გარიცხვა ჯგუფიდან %2$s ვერ მოხერხდა."
@@ -812,21 +808,20 @@ msgstr "თქვენ არ ხართ ავტორიზირებუ
 #. TRANS: Form validation error message.
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
-#. TRANS: Client error displayed when the session token is not okay.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
 #: actions/deletenotice.php:177 actions/disfavor.php:75
 #: actions/emailsettings.php:291 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:65 actions/grouplogo.php:321
 #: actions/groupunblock.php:65 actions/imsettings.php:224
-#: actions/invite.php:60 actions/login.php:131 actions/makeadmin.php:66
+#: actions/invite.php:60 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
-#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:136
-#: actions/othersettings.php:155 actions/passwordsettings.php:137
+#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
+#: actions/othersettings.php:155 actions/passwordsettings.php:138
 #: actions/profilesettings.php:217 actions/recoverpassword.php:383
-#: actions/register.php:164 actions/remotesubscribe.php:76
+#: actions/register.php:172 actions/remotesubscribe.php:76
 #: actions/repeat.php:82 actions/smssettings.php:250 actions/subedit.php:40
-#: actions/subscribe.php:87 actions/tagother.php:166
-#: actions/unsubscribe.php:69 actions/userauthorization.php:53
+#: actions/subscribe.php:86 actions/tagother.php:166
+#: actions/unsubscribe.php:69 actions/userauthorization.php:52
 #: lib/designsettings.php:310
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
@@ -858,7 +853,7 @@ msgstr "ბაზამ დაუშვა შეცდომა OAuth აპლ
 #: actions/designadminpanel.php:100 actions/editapplication.php:144
 #: actions/emailsettings.php:310 actions/grouplogo.php:332
 #: actions/imsettings.php:239 actions/newapplication.php:124
-#: actions/oauthconnectionssettings.php:145 actions/recoverpassword.php:46
+#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
 #: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
 msgstr ""
@@ -904,20 +899,19 @@ msgstr "ანგარიში"
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group nickname (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT for nick name in a profile.
-#: actions/apioauthauthorize.php:459 actions/login.php:242
-#: actions/profilesettings.php:106 actions/register.php:418
+#: actions/apioauthauthorize.php:459 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:432
 #: actions/showgroup.php:243 actions/tagother.php:94
-#: actions/userauthorization.php:152 lib/groupeditform.php:145
+#: actions/userauthorization.php:145 lib/groupeditform.php:145
 #: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "მეტსახელი"
 
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:463 actions/login.php:245
-#: actions/register.php:422 lib/accountsettingsaction.php:120
+#: actions/apioauthauthorize.php:463 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:120
 msgid "Password"
 msgstr "პაროლი"
 
@@ -1012,13 +1006,13 @@ msgstr "ასეთი შეტყობინება არ არსებ
 
 #. TRANS: Client error displayed trying to repeat an own notice through the API.
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:537
+#: actions/apistatusesretweet.php:83 lib/command.php:549
 msgid "Cannot repeat your own notice."
 msgstr "საკუთარი შეტყობინების გამეორება არ შეიძლება."
 
 #. TRANS: Client error displayed trying to re-repeat a notice through the API.
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:92 lib/command.php:543
+#: actions/apistatusesretweet.php:92 lib/command.php:555
 msgid "Already repeated that notice."
 msgstr "ეს შეტყობინება უკვე გამეორებულია."
 
@@ -1041,7 +1035,7 @@ msgstr "API მეთოდი ვერ მოიძებნა."
 #. TRANS: %s is the requested output format.
 #: actions/apistatusesshow.php:144
 #, fuzzy, php-format
-msgid "Unsupported format: %s."
+msgid "Unsupported format: %s"
 msgstr "ფორმატი არ არის მხარდაჭერილი."
 
 #. TRANS: Client error displayed requesting a deleted status.
@@ -1144,14 +1138,13 @@ msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr ""
 
 #. TRANS: Title for site timeline. %s is the StatusNet sitename.
-#. TRANS: Public RSS feed title. %s is the StatusNet site name.
 #: actions/apitimelinepublic.php:193 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "%s საჯარო ნაკადი"
 
 #. TRANS: Subtitle for site timeline. %s is the StatusNet sitename.
-#: actions/apitimelinepublic.php:199
+#: actions/apitimelinepublic.php:199 actions/publicrss.php:105
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "%s განახლებები ყველასგან!"
@@ -1218,26 +1211,25 @@ msgid "Atom post must be an Atom entry."
 msgstr ""
 
 #. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
-#: actions/apitimelineuser.php:334
+#: actions/apitimelineuser.php:335
 msgid "Can only handle POST activities."
 msgstr ""
 
 #. TRANS: Client error displayed when using an unsupported activity object type.
 #. TRANS: %s is the unsupported activity object type.
-#: actions/apitimelineuser.php:345
+#: actions/apitimelineuser.php:346
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
 #. TRANS: %d is the notice ID (number).
-#: actions/apitimelineuser.php:379
+#: actions/apitimelineuser.php:380
 #, fuzzy, php-format
 msgid "No content for notice %d."
 msgstr "მოძებნე შეტყობინებებში"
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#. TRANS: %s is the notice URI.
 #: actions/apitimelineuser.php:408
 #, fuzzy, php-format
 msgid "Notice with URI \"%s\" already exists."
@@ -1256,10 +1248,9 @@ msgstr "API მეთოდი ვერ მოიძებნა."
 
 #. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
 #. TRANS: Client exception.
-#. TRANS: Client error displayed trying to subscribe to a non-existing profile.
 #: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
 #: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
-#: actions/subscribe.php:110
+#: actions/subscribe.php:107
 msgid "No such profile."
 msgstr "ასეთი პროფილი არ არსებობს."
 
@@ -1394,7 +1385,7 @@ msgstr "ფავორიტის წაშლა ვერ მოხერხ
 #: actions/joingroup.php:95 actions/leavegroup.php:82
 #: actions/leavegroup.php:95 actions/makeadmin.php:86
 #: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:380
+#: lib/command.php:392
 msgid "No such group."
 msgstr "ასეთი ჯგუფი ვერ მოიძებნა."
 
@@ -1405,7 +1396,7 @@ msgid "Not a member."
 msgstr "ტელეფონის ნომერი არ არის."
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
-#: actions/atompubshowmembership.php:150
+#: actions/atompubshowmembership.php:151
 #, fuzzy
 msgid "Cannot delete someone else's membership."
 msgstr "საკუთარი გამოწერის წაშლა ვერ ხერხდება."
@@ -1511,11 +1502,9 @@ msgstr ""
 
 #. TRANS: Server error displayed in avatar upload page when no matching profile can be found for a user.
 #. TRANS: Server error displayed coming across a request from a user without a profile.
-#. TRANS: Server error displayed when trying to authorise a remote subscription request
-#. TRANS: while the user has no profile.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
 #: actions/grouplogo.php:184 actions/remotesubscribe.php:190
-#: actions/userauthorization.php:75 actions/userrss.php:108
+#: actions/userauthorization.php:72 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr "მომხმარებელი შესაბამისი პროფილის გარეშე."
 
@@ -1573,10 +1562,10 @@ msgstr "მოჭრა"
 msgid "No file uploaded."
 msgstr "არცერთი ფაილი არ ატვირთულა"
 
-#. TRANS: Avatar upload form instruction after uploading a file.
+#. TRANS: Avatar upload form unstruction after uploading a file.
 #: actions/avatarsettings.php:345
 #, fuzzy
-msgid "Pick a square area of the image to be your avatar."
+msgid "Pick a square area of the image to be your avatar"
 msgstr "აირჩიეთ სურათის კვადრატული მონაკვეთი თქვენი ავატარისთვის"
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
@@ -1618,7 +1607,7 @@ msgid "You may not backup your account."
 msgstr ""
 
 #. TRANS: Information displayed on the backup account page.
-#: actions/backupaccount.php:225
+#: actions/backupaccount.php:227
 msgid ""
 "You can backup your account data in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format. This is an experimental feature and provides "
@@ -1628,15 +1617,15 @@ msgid ""
 msgstr ""
 
 #. TRANS: Submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:248
+#: actions/backupaccount.php:250
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Backup"
 msgstr "ფონი"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:252
-msgid "Backup your account."
+#: actions/backupaccount.php:254
+msgid "Backup your account"
 msgstr ""
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
@@ -1675,7 +1664,7 @@ msgstr "არა"
 #. TRANS: Submit button title for 'No' when blocking a user.
 #: actions/block.php:158
 #, fuzzy
-msgid "Do not block this user."
+msgid "Do not block this user"
 msgstr "არ დაბლოკო ეს მომხმარებელი"
 
 #. TRANS: Button label on the user block form.
@@ -1692,9 +1681,9 @@ msgid "Yes"
 msgstr "დიახ"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:165
-#, fuzzy
-msgid "Block this user."
+#. TRANS: Description of the form to block a user.
+#: actions/block.php:165 lib/blockform.php:79
+msgid "Block this user"
 msgstr "დაბლოკე ეს მომხმარებელი"
 
 #. TRANS: Server error displayed when blocking a user fails.
@@ -1859,7 +1848,7 @@ msgstr ""
 #. TRANS: Field label for delete account confirmation entry.
 #. TRANS: Field label for password reset form where the password has to be typed again.
 #: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:262 actions/register.php:426
+#: actions/recoverpassword.php:262 actions/register.php:440
 msgid "Confirm"
 msgstr "ვადასტურებ"
 
@@ -1889,14 +1878,14 @@ msgstr "აპლიკაცია ვერ მოიძებნა."
 #. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
 #: actions/deleteapplication.php:79 actions/editapplication.php:78
-#: actions/showapplication.php:90
+#: actions/showapplication.php:94
 msgid "You are not the owner of this application."
 msgstr "თქვენ არ ხართ ამ აპლიკაციის მფლობელი."
 
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
-#: actions/newapplication.php:112 actions/showapplication.php:113
-#: lib/action.php:1422
+#: actions/newapplication.php:112 actions/showapplication.php:118
+#: lib/action.php:1425
 msgid "There was a problem with your session token."
 msgstr ""
 
@@ -1919,13 +1908,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting an application.
 #: actions/deleteapplication.php:161
 #, fuzzy
-msgid "Do not delete this application."
+msgid "Do not delete this application"
 msgstr "არ წაშალო ეს აპლიკაცია"
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
 #: actions/deleteapplication.php:167
 #, fuzzy
-msgid "Delete this application."
+msgid "Delete this application"
 msgstr "აპლიკაციის წაშლა"
 
 #. TRANS: Client error when trying to delete group while not logged in.
@@ -1983,13 +1972,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting a group.
 #: actions/deletegroup.php:224
 #, fuzzy
-msgid "Do not delete this group."
+msgid "Do not delete this group"
 msgstr "არ წაშალო ეს შეტყობინება"
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
 #: actions/deletegroup.php:231
 #, fuzzy
-msgid "Delete this group."
+msgid "Delete this group"
 msgstr "ამ მომხმარებლის წაშლა"
 
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
@@ -1997,15 +1986,13 @@ msgstr "ამ მომხმარებლის წაშლა"
 #. TRANS: Client error displayed when trying to mark a notice as favorite without being logged in.
 #. TRANS: Client error displayed trying to block a user from a group while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
-#. TRANS: Client error displayed trying to log out when not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
-#. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
 #. TRANS: Client error displayed when trying to change user options while not logged in.
 #: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
-#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:70
+#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
-#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:98
+#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
 #: lib/adminpanelaction.php:71 lib/profileformaction.php:63
 #: lib/settingsaction.php:72
@@ -2033,13 +2020,12 @@ msgstr "ნამდვილად გსურთ ამ შეტყობი
 #. TRANS: Submit button title for 'No' when deleting a notice.
 #: actions/deletenotice.php:159
 #, fuzzy
-msgid "Do not delete this notice."
+msgid "Do not delete this notice"
 msgstr "არ წაშალო ეს შეტყობინება"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:166
-#, fuzzy
-msgid "Delete this notice."
+#: actions/deletenotice.php:166 lib/noticelist.php:673
+msgid "Delete this notice"
 msgstr "შეტყობინების წაშლა"
 
 #. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
@@ -2076,13 +2062,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting a user.
 #: actions/deleteuser.php:158
 #, fuzzy
-msgid "Do not delete this user."
+msgid "Do not delete this user"
 msgstr "არ წაშალო ეს შეტყობინება"
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
-#: actions/deleteuser.php:165
-#, fuzzy
-msgid "Delete this user."
+#. TRANS: Description of form for deleting a user.
+#: actions/deleteuser.php:165 lib/deleteuserform.php:75
+msgid "Delete this user"
 msgstr "ამ მომხმარებლის წაშლა"
 
 #. TRANS: Message used as title for design settings for the site.
@@ -2251,21 +2237,21 @@ msgid "Use defaults"
 msgstr "გამოიყენე პირვანდელი მდგომარეობა"
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:720
-#, fuzzy
-msgid "Restore default designs."
+#. TRANS: Title for button on profile design page to reset all colour settings to default.
+#: actions/designadminpanel.php:720 lib/designsettings.php:259
+msgid "Restore default designs"
 msgstr "დააბრუნე პირვანდელი დიზაინი"
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:728
-#, fuzzy
-msgid "Reset back to default."
+#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
+#: actions/designadminpanel.php:728 lib/designsettings.php:267
+msgid "Reset back to default"
 msgstr "პირვანდელის პარამეტრების დაბრუნება"
 
 #. TRANS: Title for button for saving theme settings.
-#: actions/designadminpanel.php:736
-#, fuzzy
-msgid "Save design."
+#. TRANS: Title for button on profile design page to save settings.
+#: actions/designadminpanel.php:736 lib/designsettings.php:272
+msgid "Save design"
 msgstr "შეინახე დიზაინი"
 
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
@@ -2297,7 +2283,7 @@ msgid "You must be logged in to edit an application."
 msgstr "აპლიკაციის ჩასასწორებლად საჭიროა ავროტიზაცია."
 
 #. TRANS: Client error displayed trying to edit an application that does not exist.
-#: actions/editapplication.php:83 actions/showapplication.php:83
+#: actions/editapplication.php:83 actions/showapplication.php:87
 msgid "No such application."
 msgstr "ასეთი აპლიკაცია არ არის."
 
@@ -2580,7 +2566,7 @@ msgid "Cannot normalize that email address."
 msgstr "Jabber ID-ს ნორმალიზაცია ვერ ხერხდება"
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:393 actions/register.php:204
+#: actions/emailsettings.php:393 actions/register.php:212
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "არასწორი ელ. ფოსტის მისამართი."
@@ -2657,22 +2643,19 @@ msgstr "შემომავალი ელ. ფოსტის მისა
 
 #. 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.
 #: actions/emailsettings.php:530 actions/emailsettings.php:554
-#: actions/smssettings.php:566 actions/smssettings.php:591
+#: actions/smssettings.php:565 actions/smssettings.php:588
 #, fuzzy
 msgid "Could not update user record."
 msgstr "მომხმარებლის ჩანაწერის განახლება ვერ მოხერხდა."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
-#. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:534 actions/smssettings.php:570
+#: actions/emailsettings.php:534 actions/smssettings.php:568
 msgid "Incoming email address removed."
 msgstr "შემომავალი ელ. ფოსტის მისამართი მოშორებულია."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
-#. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:558 actions/smssettings.php:595
+#: actions/emailsettings.php:558 actions/smssettings.php:591
 msgid "New incoming email address added."
 msgstr "დამატებულია ახალი შემომავალი ელ. ფოსტა."
 
@@ -2684,7 +2667,7 @@ msgstr "ეს შეტყობინება უკვე რჩეული
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
 #: actions/favor.php:95
 #, fuzzy
-msgid "Disfavor favorite."
+msgid "Disfavor favorite"
 msgstr "რჩეულის გაუქმება"
 
 #. TRANS: Page title for first page of favorited notices.
@@ -2925,13 +2908,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
 #: actions/groupblock.php:191
 #, fuzzy
-msgid "Do not block this user from this group."
+msgid "Do not block this user from this group"
 msgstr "არ გარიცხო ემ მომხმარებელი ამ ჯგუფიდან"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
 #: actions/groupblock.php:198
 #, fuzzy
-msgid "Block this user from this group."
+msgid "Block this user from this group"
 msgstr "გარიცხე ეს მომხმარებელი ამ ჯგუფიდან"
 
 #. TRANS: Server error displayed when trying to block a user from a group fails because of an application error.
@@ -2940,7 +2923,6 @@ msgid "Database error blocking user from group."
 msgstr "მომხმარებლის ჯგუფიდან გარიცხვისას მოხდა შეცდომა ბაზაში."
 
 #. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
-#. TRANS: Client error displayed trying to find a user by ID without providing an ID.
 #: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr "ID უცნობია."
@@ -3129,10 +3111,8 @@ msgid "Group search"
 msgstr "ჯგუფის ძიება"
 
 #. TRANS: Text on page where groups can be searched if no results were found for a query.
-#. TRANS: Text for notice search results is the query had no results.
-#. TRANS: Message on the "People search" page where a query has no results.
-#: actions/groupsearch.php:82 actions/noticesearch.php:122
-#: actions/peoplesearch.php:87
+#: actions/groupsearch.php:82 actions/noticesearch.php:117
+#: actions/peoplesearch.php:83
 msgid "No results."
 msgstr "უშედეგოდ."
 
@@ -3169,7 +3149,6 @@ msgid "User is not blocked from group."
 msgstr "მომხმარებელი არ არის დაბლოკილი ჯგუფიდან."
 
 #. TRANS: Server error displayed when unblocking a user from a group fails because of an unknown error.
-#. TRANS: Server error displayed when removing a user block.
 #: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "შეცდომა ბლოკის მოხსნისას."
@@ -3264,8 +3243,7 @@ msgid "Publish a MicroID for my Jabber/Google Talk address."
 msgstr "გამოაქვეყნე  MicroID ჩემი Jabber/GTalk მისამართისთვის."
 
 #. TRANS: Confirmation message for successful Instant Messaging preferences save.
-#. TRANS: Confirmation message after saving preferences.
-#: actions/imsettings.php:283 actions/othersettings.php:193
+#: actions/imsettings.php:283 actions/othersettings.php:192
 msgid "Preferences saved."
 msgstr "პარამეტრები შენახულია."
 
@@ -3558,7 +3536,7 @@ msgstr "გჯუფის დატოვებისათვის საჭ
 
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
-#: actions/leavegroup.php:103 lib/command.php:386
+#: actions/leavegroup.php:103 lib/command.php:398
 msgid "You are not a member of that group."
 msgstr "თვენ არ ხართ ამ ჯგუფის წევრი."
 
@@ -3681,41 +3659,39 @@ msgstr "შენახვა"
 msgid "Save license settings"
 msgstr ""
 
-#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
-#: actions/login.php:97 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
 msgid "Already logged in."
 msgstr "უკვე ავტორიზირებული ხართ."
 
-#: actions/login.php:142
+#: actions/login.php:148
 msgid "Incorrect username or password."
 msgstr "არასწორი მომხმარებლის სახელი ან პაროლი."
 
-#. TRANS: Server error displayed when a user object could not be created trying to login using "one time password login".
-#: actions/login.php:148 actions/otp.php:127
+#: actions/login.php:154 actions/otp.php:120
 msgid "Error setting user. You are probably not authorized."
 msgstr ""
 
-#: actions/login.php:202 actions/login.php:253
+#: actions/login.php:210 actions/login.php:263
 msgid "Login"
 msgstr "შესვლა"
 
-#: actions/login.php:239
+#: actions/login.php:249
 msgid "Login to site"
 msgstr "საიტზე შესვლა"
 
-#: actions/login.php:248 actions/register.php:476
+#: actions/login.php:258 actions/register.php:490
 msgid "Remember me"
 msgstr "დამიმახსოვრე"
 
-#: actions/login.php:249 actions/register.php:478
+#: actions/login.php:259 actions/register.php:492
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "მომავალში ავტომატურად შემიყვანე; არა საზიარო კომპიუტერებისათვის!"
 
-#: actions/login.php:259
+#: actions/login.php:269
 msgid "Lost or forgotten password?"
 msgstr "დაკარგეთ ან დაგავიწყდათ პაროლი?"
 
-#: actions/login.php:277
+#: actions/login.php:288
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -3723,11 +3699,11 @@ msgstr ""
 "უსაფრთხოების მიზნებისათვის, გთხოვთ შეიყვანოთ თქვენი მომხ. სახელი და პაროლი "
 "პარამეტრების შეცვლამდე."
 
-#: actions/login.php:281
+#: actions/login.php:292
 msgid "Login with your username and password."
 msgstr "შედი საკუთარი მომხ. სახელით და პაროლით."
 
-#: actions/login.php:284
+#: actions/login.php:295
 #, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -3810,14 +3786,14 @@ msgid "New message"
 msgstr "ახალი შეტყობინება"
 
 #. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
-#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:501
+#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:513
 msgid "You can't send a message to this user."
 msgstr "ამ მომხმარებელს შეტყობინებას ვერ გაუგზავნი."
 
 #. TRANS: Command exception text shown when trying to send a direct message to another user without content.
 #. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
-#: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:478
-#: lib/command.php:581
+#: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:490
+#: lib/command.php:593
 msgid "No content!"
 msgstr "შიგთავსი არ არის!"
 
@@ -3826,7 +3802,7 @@ msgid "No recipient specified."
 msgstr "მიმღები მითითებული არ არის."
 
 #. TRANS: Error text shown when trying to send a direct message to self.
-#: actions/newmessage.php:167 lib/command.php:505
+#: actions/newmessage.php:167 lib/command.php:517
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr "ნუ გაუგზავნი შეტყობინებას საკუთარ თავს; უბრალოდ ჩუმად ჩაუჩურჩულე."
@@ -3837,7 +3813,7 @@ msgstr "შეტყობინება გაგზავნილია"
 
 #. TRANS: Message given have sent a direct message to another user.
 #. TRANS: %s is the name of the other user.
-#: actions/newmessage.php:188 lib/command.php:513
+#: actions/newmessage.php:188 lib/command.php:525
 #, php-format
 msgid "Direct message to %s sent."
 msgstr "პირდაპირი შეტყობინება გაეგზავნა %s–ს."
@@ -3854,9 +3830,7 @@ msgstr "ახალი შეტყობინება"
 msgid "Notice posted"
 msgstr "შეტყობინება დაიპოსტა"
 
-#. TRANS: Instructions for Notice search page.
-#. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/noticesearch.php:69
+#: actions/noticesearch.php:68
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -3865,21 +3839,16 @@ msgstr ""
 "მოძებნეთ შეტყობინებები %%site.name%%-ზე მათი შიგთავსის მიხედვით. გამოყავით "
 "ფრაზები სივრცით; საძიებო ფრაზა 3 სიმბოლოზე მეტი უნდა იყოს."
 
-#. TRANS: Title of the page where users can search for notices.
-#: actions/noticesearch.php:80
+#: actions/noticesearch.php:78
 msgid "Text search"
 msgstr "ტექსტური ძიება"
 
-#. TRANS: Test in RSS notice search.
-#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearch.php:95
+#: actions/noticesearch.php:91
 #, php-format
 msgid "Search results for \"%1$s\" on %2$s"
 msgstr "\"%1$s\"–ს ძიების შედეგები %2$s–ზე"
 
-#. TRANS: Text for logged in users making a query for notices without results.
-#. TRANS: This message contains a Markdown link.
-#: actions/noticesearch.php:128
+#: actions/noticesearch.php:121
 #, php-format
 msgid ""
 "Be the first to [post on this topic](%%%%action.newnotice%%%%?"
@@ -3887,9 +3856,7 @@ msgid ""
 msgstr ""
 "პირველმა [დაპოსტე ამ თემაზე](%%%%action.newnotice%%%%?status_textarea=%s)!"
 
-#. TRANS: Text for not logged in users making a query for notices without results.
-#. TRANS: This message contains Markdown links.
-#: actions/noticesearch.php:133
+#: actions/noticesearch.php:124
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and be the first to "
@@ -3898,17 +3865,14 @@ msgstr ""
 "[დარეგისტრირდი](%%%%action.register%%%%) და იყავი პირველი ვინც ამ თემაზე "
 "[დაპოსტავს](%%%%action.newnotice%%%%?status_textarea=%s)!"
 
-#. TRANS: RSS notice search feed title. %s is the query.
-#: actions/noticesearchrss.php:95
+#: actions/noticesearchrss.php:96
 #, php-format
 msgid "Updates with \"%s\""
 msgstr "განახლებები \"%s\"–თ"
 
-#. TRANS: RSS notice search feed description.
-#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearchrss.php:99
+#: actions/noticesearchrss.php:98
 #, fuzzy, php-format
-msgid "Updates matching search term \"%1$s\" on %2$s."
+msgid "Updates matching search term \"%1$s\" on %2$s!"
 msgstr "განახლებები, რომლებიც შეიცავენ საძიებო სიტყვას \"%1$s\" %2$s–ზე!"
 
 #: actions/nudge.php:85
@@ -3947,30 +3911,30 @@ msgid "You have not registered any applications yet."
 msgstr "თქვენ ჯერჯერობით არცერთი აპლიკაცია არ დაგირეგისტრირებიათ."
 
 #. TRANS: Title for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:70
+#: actions/oauthconnectionssettings.php:71
 msgid "Connected applications"
 msgstr "მიერთებული აპლიკაციები"
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:81
+#: actions/oauthconnectionssettings.php:83
 msgid "The following connections exist for your account."
 msgstr ""
 
 #. TRANS: Client error when trying to revoke access for an application while not being a user of it.
-#: actions/oauthconnectionssettings.php:166
+#: actions/oauthconnectionssettings.php:168
 msgid "You are not a user of that application."
 msgstr "თქვენ არ ხართ ამ აპლიკაციის მომხმარებელი."
 
 #. TRANS: Client error when revoking access has failed for some reason.
 #. TRANS: %s is the application ID revoking access failed for.
-#: actions/oauthconnectionssettings.php:181
+#: actions/oauthconnectionssettings.php:183
 #, fuzzy, php-format
 msgid "Unable to revoke access for application: %s."
 msgstr "%s აპლიკაციის მიერ ზვდომის გაუქმება ვერ ხერხდება."
 
 #. TRANS: Success message after revoking access for an application.
 #. TRANS: %1$s is the application name, %2$s is the first part of the user token.
-#: actions/oauthconnectionssettings.php:200
+#: actions/oauthconnectionssettings.php:202
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -3978,7 +3942,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:211
+#: actions/oauthconnectionssettings.php:213
 msgid "You have not authorized any applications to use your account."
 msgstr ""
 "თქვენ არცერთი აპლიკაციისთვის არ მიგიციათ თქვენი ანგარიშის გამოყენების უფლება."
@@ -3986,23 +3950,13 @@ msgstr ""
 #. TRANS: Note for developers in the OAuth connection settings form.
 #. TRANS: This message contains a Markdown link. Do not separate "](".
 #. TRANS: %s is the URL to the OAuth settings.
-#: actions/oauthconnectionssettings.php:231
+#: actions/oauthconnectionssettings.php:233
 #, php-format
 msgid ""
 "Are you a developer? [Register an OAuth client application](%s) to use with "
 "this instance of StatusNet."
 msgstr ""
 
-#: actions/oembed.php:64
-#, fuzzy, php-format
-msgid "\"%s\" not found."
-msgstr "API მეთოდი ვერ მოიძებნა."
-
-#: actions/oembed.php:76
-#, fuzzy, php-format
-msgid "Notice %s not found."
-msgstr "API მეთოდი ვერ მოიძებნა."
-
 #: actions/oembed.php:80 actions/shownotice.php:100
 msgid "Notice has no profile."
 msgstr "შეტყობინებას პრფილი არ გააჩნია."
@@ -4012,16 +3966,6 @@ msgstr "შეტყობინებას პრფილი არ გაა
 msgid "%1$s's status on %2$s"
 msgstr "%1$s–ის სტატუსი %2$s–ზე"
 
-#: actions/oembed.php:95
-#, fuzzy, php-format
-msgid "Attachment %s not found."
-msgstr "მიმღები მომხმარებელი ვერ მოიძებნა."
-
-#: actions/oembed.php:136
-#, php-format
-msgid "\"%s\" not supported for oembed requests."
-msgstr ""
-
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
 #: actions/oembed.php:168
 #, php-format
@@ -4040,12 +3984,11 @@ msgstr "გთხოვთ გამოიყენოთ მხოლოდ %s
 msgid "Not a supported data format."
 msgstr "მონაცემთა ფორმატი მხარდაჭერილი არ არის."
 
-#. TRANS: ShortName in the OpenSearch interface when trying to find users.
 #: actions/opensearch.php:64
 msgid "People Search"
 msgstr "პიროვნებების ძიება"
 
-#: actions/opensearch.php:68
+#: actions/opensearch.php:67
 msgid "Notice Search"
 msgstr "შეტყობინებების ძიება"
 
@@ -4093,46 +4036,37 @@ msgstr "აჩვენე ან დამალე პროფილის 
 msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr "URL–ს შემოკლების სერვისი ძალიან გრძელია (მაქს. 50 სიმბოლო)."
 
-#. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
-#: actions/otp.php:70
+#: actions/otp.php:69
 msgid "No user ID specified."
 msgstr "მომხმარებლის ID მითითებული არ არის."
 
-#. TRANS: Client error displayed trying to use "one time password login" without specifying a login token.
-#: actions/otp.php:86
+#: actions/otp.php:83
 msgid "No login token specified."
 msgstr ""
 
-#. TRANS: Client error displayed trying to use "one time password login" without requesting a login token.
-#: actions/otp.php:94
+#: actions/otp.php:90
 msgid "No login token requested."
 msgstr ""
 
-#. TRANS: Client error displayed trying to use "one time password login" while specifying an invalid login token.
-#: actions/otp.php:100
+#: actions/otp.php:95
 msgid "Invalid login token specified."
 msgstr ""
 
-#. TRANS: Client error displayed trying to use "one time password login" while specifying an expired login token.
-#: actions/otp.php:110
+#: actions/otp.php:104
 msgid "Login token expired."
 msgstr ""
 
-#. TRANS: Title for outbox for any but the fist page.
-#. TRANS: %1$s is the user nickname, %2$d is the page number.
-#: actions/outbox.php:57
+#: actions/outbox.php:58
 #, php-format
 msgid "Outbox for %1$s - page %2$d"
 msgstr "%1$s-ის გამავალი ფოსტა - გვერდი %2$d"
 
-#. TRANS: Title for first page of outbox.
 #: actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
 msgstr "%s-ის გამავალი ფოსტა"
 
-#. TRANS: Instructions for outbox.
-#: actions/outbox.php:103
+#: actions/outbox.php:104
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr ""
 "ეს არის თქვენი გამავალი ფოსტა, რომელშიც ჩამოთვლილია პირადი შეტყობინებები "
@@ -4160,45 +4094,43 @@ msgstr "ძველი პაროლი"
 msgid "New password"
 msgstr "ახალი პაროლი"
 
-#: actions/passwordsettings.php:109 actions/register.php:423
+#: actions/passwordsettings.php:109
 #, fuzzy
-msgid "6 or more characters."
+msgid "6 or more characters"
 msgstr "6 ან მეტი სიმბოლო"
 
-#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:264
-#: actions/register.php:427
+#: actions/passwordsettings.php:113
 #, fuzzy
-msgid "Same as password above."
+msgid "Same as password above"
 msgstr "იგივე რაც ზედა პაროლი"
 
 #: actions/passwordsettings.php:117
 msgid "Change"
 msgstr "შეცვლა"
 
-#: actions/passwordsettings.php:153 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:238
 msgid "Password must be 6 or more characters."
 msgstr "პაროლი უნდა შედგებოდეს 6 ან მეტი სიმბოლოსგან."
 
-#: actions/passwordsettings.php:156 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:241
 msgid "Passwords don't match."
 msgstr "პაროლები არ ემთხვევა."
 
-#: actions/passwordsettings.php:164
+#: actions/passwordsettings.php:165
 msgid "Incorrect old password"
 msgstr "არასწორი ძველი პაროლი"
 
-#: actions/passwordsettings.php:180
+#: actions/passwordsettings.php:181
 msgid "Error saving user; invalid."
 msgstr "შეცდომა მომხმარებლის შენახვისას; არასწორი."
 
-#. TRANS: Reset password form validation error message.
-#: actions/passwordsettings.php:185 actions/recoverpassword.php:418
+#: actions/passwordsettings.php:186
 #, fuzzy
-msgid "Cannot save new password."
+msgid "Can't save new password."
 msgstr "ვერ ვინახავ ახალ პაროლს."
 
-#: actions/passwordsettings.php:191
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
 msgid "Password saved."
 msgstr "პაროლი შენახულია."
 
@@ -4485,9 +4417,7 @@ msgstr "სერვერი რომელზეც მიემართო
 msgid "Save paths"
 msgstr "გზების დამახსოვრება"
 
-#. TRANS: Instructions for the "People search" page.
-#. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/peoplesearch.php:54
+#: actions/peoplesearch.php:52
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
@@ -4497,8 +4427,7 @@ msgstr ""
 "მიხედვით. გამოყავით ფრაზები სივრცით; საძიებო ფრაზა 3 სიმბოლოზე მეტი უნდა "
 "იყოს."
 
-#. TRANS: Title of a page where users can search for other users.
-#: actions/peoplesearch.php:61
+#: actions/peoplesearch.php:58
 msgid "People search"
 msgstr "პიროვნებების ძიება"
 
@@ -4541,7 +4470,7 @@ msgid "Profile information"
 msgstr "ინფორმაცია პროფილზე"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109 actions/register.php:419
+#: actions/profilesettings.php:109 actions/register.php:433
 #, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr "1–64 პატარა ასოები ან ციფრები. პუნქტუაციები ან სივრცეები დაუშვებელია"
@@ -4549,7 +4478,7 @@ msgstr "1–64 პატარა ასოები ან ციფრებ
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for full group name (dt). Text hidden by default.
 #. TRANS: DT for full name in a profile.
-#: actions/profilesettings.php:113 actions/register.php:441
+#: actions/profilesettings.php:113 actions/register.php:455
 #: actions/showgroup.php:255 actions/tagother.php:104
 #: lib/groupeditform.php:150 lib/userprofile.php:156
 msgid "Full name"
@@ -4557,13 +4486,13 @@ msgstr "სრული სახელი"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:118 actions/register.php:446
+#: actions/profilesettings.php:118 actions/register.php:460
 #: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "ვებ. გვერსი"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:121 actions/register.php:448
+#: actions/profilesettings.php:121
 #, fuzzy
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr "თქვენი ვებ. გვერდის URL, ბლოგი, ან პროფილი სხვა საიტზე"
@@ -4571,36 +4500,35 @@ msgstr "თქვენი ვებ. გვერდის URL, ბლოგი
 #. TRANS: Tooltip for field label in form for profile settings. Plural
 #. TRANS: is decided by the number of characters available for the
 #. TRANS: biography (%d).
-#: actions/profilesettings.php:129 actions/register.php:457
+#: actions/profilesettings.php:129 actions/register.php:471
 #, fuzzy, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
 msgstr[0] "აღწერეთ საკუთარი თავი და თქვენი ინტერესები %d სიმბოლოთი"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:135 actions/register.php:462
+#: actions/profilesettings.php:135 actions/register.php:476
 msgid "Describe yourself and your interests"
 msgstr "აღწერეთ საკუთარი თავი და თქვენი ინტერესები"
 
 #. TRANS: Text area label in form for profile settings where users can provide.
 #. TRANS: their biography.
-#: actions/profilesettings.php:139 actions/register.php:464
+#: actions/profilesettings.php:139 actions/register.php:478
 msgid "Bio"
 msgstr "ბიოგრაფია"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group location (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT for location in a profile.
-#: actions/profilesettings.php:145 actions/register.php:469
+#: actions/profilesettings.php:145 actions/register.php:483
 #: actions/showgroup.php:265 actions/tagother.php:112
-#: actions/userauthorization.php:174 lib/groupeditform.php:173
+#: actions/userauthorization.php:166 lib/groupeditform.php:173
 #: lib/userprofile.php:172
 msgid "Location"
 msgstr "მდებარეობა"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148
+#: actions/profilesettings.php:148 actions/register.php:485
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "რომელ ქალაქში, რეგიონში, ქვეყანაში ხართ?"
 
@@ -4621,8 +4549,7 @@ msgstr "სანიშნეები"
 #: actions/profilesettings.php:164
 #, fuzzy
 msgid ""
-"Tags for yourself (letters, numbers, -, ., and _), comma- or space- "
-"separated."
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr ""
 "საკუთარი სანიშნეები (ასოები, ციფრები, -, ., და _). გამოყავით მძიმით ან "
 "სივრცით"
@@ -4635,7 +4562,7 @@ msgstr "ენა"
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
 #: actions/profilesettings.php:171
 #, fuzzy
-msgid "Preferred language."
+msgid "Preferred language"
 msgstr "სასურველი ენა"
 
 #. TRANS: Dropdownlist label in form for profile settings.
@@ -4652,14 +4579,14 @@ msgstr "რომელ დროის სარტყელში ხართ
 #: actions/profilesettings.php:189
 #, fuzzy
 msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)."
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr ""
 "ავტომატურად გამოიწერე ის ვინც მე გამომიწერს (საუკეთესოა არა ადამიანებისთვის)"
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Plural form is used based on the maximum number of allowed
 #. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:258 actions/register.php:221
+#: actions/profilesettings.php:258 actions/register.php:229
 #, fuzzy, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4678,9 +4605,9 @@ msgstr "ენა ძალიან გრძელია (არაუმე
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:291
-#, fuzzy, php-format
-msgid "Invalid tag: \"%s\"."
+#: actions/profilesettings.php:291 actions/tagother.php:178
+#, php-format
+msgid "Invalid tag: \"%s\""
 msgstr "არასწორი სანიშნე: \"%s\""
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
@@ -4785,12 +4712,6 @@ msgstr ""
 "რს არის %%site.name%%, [მიკრო–ბლოგინგის](http://en.wikipedia.org/wiki/Micro-"
 "blogging) სერვისი, დაფუძნებული უფასო [StatusNet](http://status.net/) კოდზე."
 
-#. TRANS: Public RSS feed description. %s is the StatusNet site name.
-#: actions/publicrss.php:106
-#, fuzzy, php-format
-msgid "%s updates from everyone."
-msgstr "%s განახლებები ყველასგან!"
-
 #. TRANS: Title for public tag cloud.
 #: actions/publictagcloud.php:57
 msgid "Public tag cloud"
@@ -4925,12 +4846,6 @@ msgstr "პაროლის აღდგენა"
 msgid "Password recovery requested"
 msgstr "პაროლის აღდგენა მოთხოვნილია"
 
-#. TRANS: Title for password recovery page in password saved mode.
-#: actions/recoverpassword.php:229
-#, fuzzy
-msgid "Password saved"
-msgstr "პაროლი შენახულია."
-
 #. TRANS: Title for password recovery page when an unknown action has been specified.
 #: actions/recoverpassword.php:232
 msgid "Unknown action"
@@ -4942,6 +4857,12 @@ msgstr "უცნობი მოქმედება"
 msgid "6 or more characters, and do not forget it!"
 msgstr "6 ან მეტი სიმბოლო, და არ დაგავიწყდეთ!"
 
+#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#: actions/recoverpassword.php:264 actions/register.php:441
+#, fuzzy
+msgid "Same as password above."
+msgstr "იგივე რაც ზედა პაროლი"
+
 #. TRANS: Button text for password reset form.
 #. TRANS: Button text on profile design page to reset all colour settings to default without saving.
 #: actions/recoverpassword.php:268 lib/designsettings.php:264
@@ -4995,8 +4916,14 @@ msgstr "პაროლი უნდა შედგებოდეს 6 ან
 msgid "Password and confirmation do not match."
 msgstr "პაროლი და დასტური არ ემთხვევა."
 
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:418
+#, fuzzy
+msgid "Cannot save new password."
+msgstr "ვერ ვინახავ ახალ პაროლს."
+
 #. TRANS: Server error displayed when something does wrong with the user object during password reset.
-#: actions/recoverpassword.php:426 actions/register.php:248
+#: actions/recoverpassword.php:426 actions/register.php:256
 msgid "Error setting user."
 msgstr "მომხმარებელის დაყენებისას მოხდა შეცდომა."
 
@@ -5005,71 +4932,76 @@ msgstr "მომხმარებელის დაყენებისა
 msgid "New password successfully saved. You are now logged in."
 msgstr "ახალი პაროლი წარმატებით იქნა შენახული. თქვენ ახლა ავტორიზირებული ხართ."
 
-#: actions/register.php:87 actions/register.php:188 actions/register.php:399
+#: actions/register.php:92 actions/register.php:196 actions/register.php:413
 msgid "Sorry, only invited people can register."
 msgstr "ბოდიშს გიხდით, დარეგისტრირება მხოლოდ მოწვევითაა შესაძლებელი."
 
-#: actions/register.php:94
+#: actions/register.php:99
 msgid "Sorry, invalid invitation code."
 msgstr "ბოდიშს გიხდით, მოსაწვევი კოდი არასწორია."
 
-#: actions/register.php:113
+#: actions/register.php:119
 msgid "Registration successful"
 msgstr "რეგისტრაცია წარმატებით დასრულდა"
 
-#: actions/register.php:115 actions/register.php:497
+#: actions/register.php:121 actions/register.php:511
 msgid "Register"
 msgstr "რეგისტრაცია"
 
-#: actions/register.php:135
+#: actions/register.php:142
 msgid "Registration not allowed."
 msgstr "რეგისტრაცია არ არის დაშვებული."
 
-#: actions/register.php:201
+#: actions/register.php:209
 #, fuzzy
-msgid "You cannot register if you don't agree to the license."
+msgid "You can't register if you don't agree to the license."
 msgstr "ვერ დარეგისტრირდებით თუ არ დაეთანხმებით ლიცენზიის პირობებს."
 
-#: actions/register.php:210
+#: actions/register.php:218
 msgid "Email address already exists."
 msgstr "ელ. ფოსტის მისამართი უკვე არსებობს."
 
-#: actions/register.php:243 actions/register.php:265
+#: actions/register.php:251 actions/register.php:273
 msgid "Invalid username or password."
 msgstr "არასწორი მომხმარებლის სახელი ან პაროლი."
 
-#: actions/register.php:340
+#: actions/register.php:351
 #, fuzzy
 msgid ""
 "With this form you can create a new account. You can then post notices and "
-"link up to friends and colleagues."
+"link up to friends and colleagues. "
 msgstr ""
 "ამ ფორმით შეგიძლიათ შექმნათ ახალი ანგარიში. შემდგომ შეძლებთ შეტყობინებების "
 "დაპოსტვას და მეგობრებთან და კოლეგებთან ურთიერთობას. "
 
+#: actions/register.php:437
+#, fuzzy
+msgid "6 or more characters."
+msgstr "6 ან მეტი სიმბოლო"
+
 #. TRANS: Link description in user account settings menu.
-#: actions/register.php:431 actions/register.php:435
+#: actions/register.php:445 actions/register.php:449
 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
 msgid "Email"
 msgstr "ელ. ფოსტა"
 
-#: actions/register.php:432 actions/register.php:436
+#: actions/register.php:446 actions/register.php:450
 #, fuzzy
-msgid "Used only for updates, announcements, and password recovery."
+msgid "Used only for updates, announcements, and password recovery"
 msgstr ""
 "გამოიყენება მხოლოდ განახლებებისთვის, განცხადებებისთვის და პაროლის აღსადგენად"
 
-#: actions/register.php:443
+#: actions/register.php:457
 #, fuzzy
-msgid "Longer name, preferably your \"real\" name."
+msgid "Longer name, preferably your \"real\" name"
 msgstr "გრძელი სახელი, სასურველია თქვენი ნამდვილი სახელი"
 
-#: actions/register.php:471
+#: actions/register.php:462
 #, fuzzy
-msgid "Where you are, like \"City, State (or Region), Country\"."
-msgstr "რომელ ქალაქში, რეგიონში, ქვეყანაში ხართ?"
+msgid "URL of your homepage, blog, or profile on another site"
+msgstr "თქვენი ვებ. გვერდის URL, ბლოგი, ან პროფილი სხვა საიტზე"
 
-#: actions/register.php:510
+#: actions/register.php:523
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
@@ -5077,23 +5009,23 @@ msgstr ""
 "მე ვაცნობიერებ, რომ %1$s–ის შიგთავსი და მონაცემები არის პირადული და "
 "კონციდენციალური."
 
-#: actions/register.php:520
+#: actions/register.php:533
 #, php-format
 msgid "My text and files are copyright by %1$s."
 msgstr "ჩემი ტექსტის და ფაილების საავტორო უფლება ეკუტვნის %1$s–ს."
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:524
+#: actions/register.php:537
 msgid "My text and files remain under my own copyright."
 msgstr "ჩემი ტექსტი და ფაილები ჩემივე საკუთრებაა."
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:527
+#: actions/register.php:540
 msgid "All rights reserved."
 msgstr "ყველა უფლება დაცულია."
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:532
+#: actions/register.php:545
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -5102,7 +5034,7 @@ msgstr ""
 "ჩემი ტექსტი და ფაილები ხელმისაწვდომია %s–ით, გარდა ამ პირადი ინფორმაციისა: "
 "პაროლი, ელ. ფოსტის მისამართი, IM მისამართი და ტელეფონის ნომერი."
 
-#: actions/register.php:573
+#: actions/register.php:588
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -5135,7 +5067,7 @@ msgstr ""
 "\n"
 "გმადლობთ რომ დარეგისტრირდით. იმედი გვაქვს ისიამოვნებთ ამ სერვისით."
 
-#: actions/register.php:597
+#: actions/register.php:612
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5169,7 +5101,7 @@ msgstr "მომხმარებლის მეტსახელი"
 
 #: actions/remotesubscribe.php:129
 #, fuzzy
-msgid "Nickname of the user you want to follow."
+msgid "Nickname of the user you want to follow"
 msgstr "მომხმარებლის მეტსახელი რომელსაც გინდათ რომ მიჰყვეთ"
 
 #: actions/remotesubscribe.php:132
@@ -5178,7 +5110,7 @@ msgstr "პროფილის URL"
 
 #: actions/remotesubscribe.php:133
 #, fuzzy
-msgid "URL of your profile on another compatible microblogging service."
+msgid "URL of your profile on another compatible microblogging service"
 msgstr "თქვენი პროფილის URL სხვა თავსებად მიკრობლოგინგის სერვისზე"
 
 #. TRANS: Link text for link that will subscribe to a remote profile.
@@ -5189,7 +5121,7 @@ msgstr "გამოწერა"
 
 #: actions/remotesubscribe.php:158
 #, fuzzy
-msgid "Invalid profile URL (bad format)."
+msgid "Invalid profile URL (bad format)"
 msgstr "პროფილის არასწორი URL (ცუდი ფორმატი)"
 
 #: actions/remotesubscribe.php:167
@@ -5233,7 +5165,6 @@ msgstr "გამეორებული"
 msgid "Repeated!"
 msgstr "გამეორებული!"
 
-#. TRANS: RSS reply feed title. %s is a user nickname.
 #. TRANS: Tooltip for personal group navigation menu option when logged in for viewing @-replies.
 #: actions/replies.php:126 actions/repliesrss.php:68
 #: lib/personalgroupnav.php:109
@@ -5286,11 +5217,9 @@ msgid ""
 "newnotice%%%%?status_textarea=%3$s)."
 msgstr ""
 
-#. TRANS: RSS reply feed description.
-#. TRANS: %1$s is a user nickname, %2$s is the StatusNet site name.
-#: actions/repliesrss.php:74
+#: actions/repliesrss.php:72
 #, fuzzy, php-format
-msgid "Replies to %1$s on %2$s."
+msgid "Replies to %1$s on %2$s!"
 msgstr "პასუხები %1$s–ს %2$s–ზე!"
 
 #. TRANS: Client exception displayed when trying to restore an account while not logged in.
@@ -5393,7 +5322,7 @@ msgstr "თქვენ არ შეგიძლიათ მომხმარ
 msgid "User doesn't have this role."
 msgstr "მომხმარებელს არ გააჩნია ეს როლი."
 
-#: actions/rsd.php:142 actions/version.php:159
+#: actions/rsd.php:146 actions/version.php:159
 msgid "StatusNet"
 msgstr "StatusNet"
 
@@ -5435,87 +5364,87 @@ msgstr ""
 msgid "Save site settings"
 msgstr "საიტის პარამეტრების შენახვა"
 
-#: actions/showapplication.php:78
+#: actions/showapplication.php:82
 msgid "You must be logged in to view an application."
 msgstr "აპლიკაციის სანახავად საჭიროა ავროტიზაცია."
 
-#: actions/showapplication.php:151
+#: actions/showapplication.php:157
 msgid "Application profile"
 msgstr "აპლიკაციის პროფილი"
 
 #. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:153 lib/applicationeditform.php:177
+#: actions/showapplication.php:159 lib/applicationeditform.php:177
 msgid "Icon"
 msgstr ""
 
 #. TRANS: Form input field label for application name.
-#: actions/showapplication.php:163 actions/version.php:197
+#: actions/showapplication.php:169 actions/version.php:197
 #: lib/applicationeditform.php:190
 msgid "Name"
 msgstr "დასახელება"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:172 lib/applicationeditform.php:227
+#: actions/showapplication.php:178 lib/applicationeditform.php:227
 msgid "Organization"
 msgstr "ორგანიზაცია"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:181 actions/version.php:200
+#: actions/showapplication.php:187 actions/version.php:200
 #: lib/applicationeditform.php:208 lib/groupeditform.php:168
 msgid "Description"
 msgstr "აღწერა"
 
 #. TRANS: Header for group statistics on a group page (h2).
 #. TRANS: H2 text for user statistics.
-#: actions/showapplication.php:186 actions/showgroup.php:460
+#: actions/showapplication.php:192 actions/showgroup.php:460
 #: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "სტატისტიკა"
 
-#: actions/showapplication.php:197
+#: actions/showapplication.php:203
 #, php-format
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr ""
 
-#: actions/showapplication.php:207
+#: actions/showapplication.php:213
 msgid "Application actions"
 msgstr "აპლიკაციის მოქმედებები"
 
-#: actions/showapplication.php:230
+#: actions/showapplication.php:236
 msgid "Reset key & secret"
 msgstr "გასაღების და საიდუმლოს გადაყენება"
 
 #. TRANS: Title of form for deleting a user.
-#: actions/showapplication.php:246 lib/deletegroupform.php:121
+#: actions/showapplication.php:252 lib/deletegroupform.php:121
 #: lib/deleteuserform.php:64 lib/noticelist.php:673
 msgid "Delete"
 msgstr "წაშლა"
 
-#: actions/showapplication.php:255
+#: actions/showapplication.php:261
 msgid "Application info"
 msgstr "ინფო აპლიკაციაზე"
 
-#: actions/showapplication.php:257
+#: actions/showapplication.php:263
 msgid "Consumer key"
 msgstr "მომხმარებლის გასაღები"
 
-#: actions/showapplication.php:262
+#: actions/showapplication.php:268
 msgid "Consumer secret"
 msgstr "მომხმარებლის საიდუმლო"
 
-#: actions/showapplication.php:267
+#: actions/showapplication.php:273
 msgid "Request token URL"
 msgstr ""
 
-#: actions/showapplication.php:272
+#: actions/showapplication.php:278
 msgid "Access token URL"
 msgstr ""
 
-#: actions/showapplication.php:277
+#: actions/showapplication.php:283
 msgid "Authorize URL"
 msgstr "URL-ის ავტორიზაცია"
 
-#: actions/showapplication.php:282
+#: actions/showapplication.php:288
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
@@ -5523,7 +5452,7 @@ msgstr ""
 "შენიშვნა: ჩვენ მხარს ვუჭერთ HMAC-SHA1 ხელმოწერებს. ჩვენ არ ვუჭერთ მხარს "
 "მხოლოდ ტექსტური ხელმოწერის მეთოდს."
 
-#: actions/showapplication.php:302
+#: actions/showapplication.php:309
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr ""
 "დარწმუნებული ხართ რომ გნებავთ თქვენი მომხმარებლის გასაღების და საიდუმლოს "
@@ -5612,18 +5541,16 @@ msgid "Group profile"
 msgstr ""
 
 #. TRANS: Label for group URL (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT for URL in a profile.
 #: actions/showgroup.php:273 actions/tagother.php:118
-#: actions/userauthorization.php:184 lib/userprofile.php:186
+#: actions/userauthorization.php:175 lib/userprofile.php:186
 msgid "URL"
 msgstr ""
 
 #. TRANS: Label for group description or group note (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page where bio is displayed.
 #. TRANS: DT for note in a profile.
 #: actions/showgroup.php:285 actions/tagother.php:128
-#: actions/userauthorization.php:197 lib/userprofile.php:204
+#: actions/userauthorization.php:187 lib/userprofile.php:204
 msgid "Note"
 msgstr "შენიშვნა"
 
@@ -5761,7 +5688,7 @@ msgid "%1$s tagged %2$s"
 msgstr "%1$s - %2$s"
 
 #. TRANS: Page title showing tagged notices in one user's stream.
-#. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
+#. TRANS: %1$s is the username, %2$s is the hash tag, %1$d is the page number.
 #: actions/showstream.php:74
 #, fuzzy, php-format
 msgid "%1$s tagged %2$s, page %3$d"
@@ -5999,7 +5926,7 @@ msgstr "საერთო სასაიტო შეტყობინებ
 #. TRANS: Title for button to save site notice in admin panel.
 #: actions/sitenoticeadminpanel.php:201
 #, fuzzy
-msgid "Save site notice."
+msgid "Save site notice"
 msgstr "შეინახე საერთოსასაიტო შეტყობინება"
 
 #. TRANS: Title for SMS settings.
@@ -6060,7 +5987,7 @@ msgstr "SMS ტელეფონის ნომერი"
 #. TRANS: SMS phone number input field instructions in SMS settings form.
 #: actions/smssettings.php:152
 #, fuzzy
-msgid "Phone number, no punctuation or spaces, with area code."
+msgid "Phone number, no punctuation or spaces, with area code"
 msgstr "ტელ. ნომერი, პუნქტუაციის ან სივრცეების გარეშე, ქვეყნის კოდით."
 
 #. TRANS: Form legend for SMS preferences form.
@@ -6230,20 +6157,16 @@ msgstr "თქვენ არ გაქვთ გამოწერილი 
 msgid "Could not save subscription."
 msgstr "გამოწერის დამახსოვრება ვერ მოხერხდა."
 
-#. TRANS: Client error displayed trying to perform any request method other than POST.
-#. TRANS: Do not translate POST.
 #: actions/subscribe.php:77
 msgid "This action only accepts POST requests."
 msgstr "ეს მოქმედება მხოლოდ POST მოთხოვნებს იღებს."
 
-#. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
-#: actions/subscribe.php:121
+#: actions/subscribe.php:117
 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
 msgstr ""
 "თქვენ არ შეგიძლიათ გამოიწეროთ 0მბ-იანი 0.1 დაშორებული პროფილი ამ მოქმედებით."
 
-#. TRANS: Page title when subscription succeeded.
-#: actions/subscribe.php:149
+#: actions/subscribe.php:145
 msgid "Subscribed"
 msgstr "გამოწერილია"
 
@@ -6404,9 +6327,8 @@ msgstr "სანიშნე %s"
 msgid "User profile"
 msgstr "მომხმარებლის პროფილი"
 
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT element in area for user avatar.
-#: actions/tagother.php:81 actions/userauthorization.php:138
+#: actions/tagother.php:81 actions/userauthorization.php:132
 #: lib/userprofile.php:108
 msgid "Photo"
 msgstr "ფოტო"
@@ -6423,11 +6345,6 @@ msgstr ""
 "სანიშნეები ამ მომხმარებლისთვის (ასოები, ციფრები, -, ., და _). გამოყავით "
 "მძიმით ან სივრცით"
 
-#: actions/tagother.php:178
-#, php-format
-msgid "Invalid tag: \"%s\""
-msgstr "არასწორი სანიშნე: \"%s\""
-
 #: actions/tagother.php:193
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
@@ -6445,7 +6362,6 @@ msgstr ""
 msgid "No such tag."
 msgstr "ასეთი სანიშნე არ არსებობს."
 
-#. TRANS: Client error displayed when trying to unblock a non-blocked user.
 #: actions/unblock.php:59
 msgid "You haven't blocked that user."
 msgstr "თქვენ არ დაგიბლოკავთ ეს მომხმარებელი."
@@ -6466,7 +6382,7 @@ msgstr "არცერთი პროფილის ID არ არის 
 msgid "Unsubscribed"
 msgstr "გამოწერა გაუქმებულია"
 
-#: actions/updateprofile.php:64
+#: actions/updateprofile.php:64 actions/userauthorization.php:337
 #, php-format
 msgid ""
 "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
@@ -6500,7 +6416,7 @@ msgstr "არასწორი მისასალმებელი ტე
 #. TRANS: users in user admin panel. %1$s is the invalid nickname.
 #: actions/useradminpanel.php:166
 #, php-format
-msgid "Invalid default subscripton: \"%1$s\" is not a user."
+msgid "Invalid default subscripton: '%1$s' is not a user."
 msgstr ""
 
 #. TRANS: Link description in user account settings menu.
@@ -6562,70 +6478,59 @@ msgstr "მიეცეთ თუ არა მომხმარებლებ
 #. TRANS: Title for button to save user settings in user admin panel.
 #: actions/useradminpanel.php:302
 #, fuzzy
-msgid "Save user settings."
+msgid "Save user settings"
 msgstr "საიტის პარამეტრების შენახვა"
 
-#. TRANS: Page title.
-#: actions/userauthorization.php:109
+#: actions/userauthorization.php:105
 msgid "Authorize subscription"
 msgstr "გამოწერის ავტორიზაცია"
 
-#. TRANS: Page notice on "Auhtorize subscription" page.
-#: actions/userauthorization.php:115
+#: actions/userauthorization.php:110
 #, fuzzy
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
 "user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
-"click \"Reject\"."
+"click “Reject”."
 msgstr ""
 "გთხოვთ გადახედოთ ამ დეტალებს, რომ დარწმუნდეთ რომ გინდათ ამ მომხმარებლის "
 "განახლებების გამოწერა. თუ თქვენ არ გინდოდათ გამოწერა, მაშინ გააჭირეთ ღილაკს "
 "\"უარყოფა\"."
 
-#. TRANS: DT element on Authorise Subscription page where license is displayed.
 #. TRANS: Menu item for site administration
-#: actions/userauthorization.php:207 actions/version.php:167
+#: actions/userauthorization.php:196 actions/version.php:167
 #: lib/adminpanelaction.php:403
 msgid "License"
 msgstr "ლიცენზია"
 
-#. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:229
+#: actions/userauthorization.php:217
 #, fuzzy
-msgctxt "BUTTON"
 msgid "Accept"
 msgstr "მიღება"
 
-#. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:231
-#, fuzzy
-msgid "Subscribe to this user."
+#: actions/userauthorization.php:218 lib/subscribeform.php:115
+#: lib/subscribeform.php:139
+msgid "Subscribe to this user"
 msgstr "გამოიწერე ეს მომხმარებელი"
 
-#. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:233
+#: actions/userauthorization.php:219
 #, fuzzy
-msgctxt "BUTTON"
 msgid "Reject"
 msgstr "უარყოფა"
 
-#. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:235
+#: actions/userauthorization.php:220
 #, fuzzy
-msgid "Reject this subscription."
+msgid "Reject this subscription"
 msgstr "ამ გამოწერის უარყოფა"
 
-#. TRANS: Client error displayed for an empty authorisation request.
-#: actions/userauthorization.php:248
+#: actions/userauthorization.php:232
 msgid "No authorization request!"
 msgstr "ავტორიზაციის მოთხოვნა არ არის!"
 
-#. TRANS: Accept message header from Authorise subscription page.
-#: actions/userauthorization.php:271
+#: actions/userauthorization.php:254
 msgid "Subscription authorized"
 msgstr "გამოწერა ავტორიზირებულია"
 
-#: actions/userauthorization.php:274
+#: actions/userauthorization.php:256
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to authorize the "
@@ -6635,12 +6540,11 @@ msgstr ""
 "გადაამოწმეთ საიტის ინსტრუქციებში გამოწერის ავტორიზირების დეტალები. თქვენი "
 "გამოწერის ტოკენია:"
 
-#. TRANS: Reject message header from Authorise subscription page.
-#: actions/userauthorization.php:285
+#: actions/userauthorization.php:266
 msgid "Subscription rejected"
 msgstr "გამოწერა უარყოფილია"
 
-#: actions/userauthorization.php:288
+#: actions/userauthorization.php:268
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to fully reject the "
@@ -6650,64 +6554,39 @@ msgstr ""
 "გადაამოწმეთ საიტის ინსტრუქციებში გამოწერის მთლიანად უარყოფის შესახებ "
 "დეტალები."
 
-#. TRANS: Exception thrown when no valid user is found for an authorisation request.
-#. TRANS: %s is a listener URI.
-#: actions/userauthorization.php:325
+#: actions/userauthorization.php:303
 #, fuzzy, php-format
-msgid "Listener URI \"%s\" not found here."
+msgid "Listener URI ‘%s’ not found here."
 msgstr "მსმენელის  URI ‘%s’ აქ ვერ მოიძებნა."
 
-#. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:332
+#: actions/userauthorization.php:308
 #, fuzzy, php-format
-msgid "Listenee URI \"%s\" is too long."
+msgid "Listenee URI ‘%s’ is too long."
 msgstr "წყაროს URL ძალიან გრძელია."
 
-#. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:340
+#: actions/userauthorization.php:314
 #, fuzzy, php-format
-msgid "Listenee URI \"%s\" is a local user."
+msgid "Listenee URI ‘%s’ is a local user."
 msgstr "პროფილის URL ‘%s’ ლოკალური მომხმარებლისთვისაა განკუთვნილი."
 
-#. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
-#. TRANS: %s is a profile URL.
-#: actions/userauthorization.php:358
+#: actions/userauthorization.php:329
 #, fuzzy, php-format
-msgid "Profile URL \"%s\" is for a local user."
+msgid "Profile URL ‘%s’ is for a local user."
 msgstr "პროფილის URL ‘%s’ ლოკალური მომხმარებლისთვისაა განკუთვნილი."
 
-#. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
-#. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
-#: actions/userauthorization.php:368
+#: actions/userauthorization.php:345
 #, fuzzy, php-format
-msgid ""
-"Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
-"\"."
-msgstr ""
-"გამოსაწერი მომხმარებლის ნაკადის ლიცენზია ‘%1$s’ შეუთავსებელია საიტის "
-"ლიცენზიასთან ‘%2$s’."
-
-#. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:378
-#, fuzzy, php-format
-msgid "Avatar URL \"%s\" is not valid."
+msgid "Avatar URL ‘%s’ is not valid."
 msgstr "ავატარის URL ‘%s’ არ არის სწორი."
 
-#. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:385
+#: actions/userauthorization.php:350
 #, fuzzy, php-format
-msgid "Cannot read avatar URL \"%s\"."
+msgid "Can’t read avatar URL ‘%s’."
 msgstr "ვერ ვკითხულობ ავატარის URL ‘%s’."
 
-#. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:392
+#: actions/userauthorization.php:355
 #, fuzzy, php-format
-msgid "Wrong image type for avatar URL \"%s\"."
+msgid "Wrong image type for avatar URL ‘%s’."
 msgstr "ავატარის სურათის ფორმატი არასწორია URL ‘%s’."
 
 #. TRANS: Page title for profile design page.
@@ -6815,7 +6694,7 @@ msgid "Plugins"
 msgstr "დამატებები"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:898
+#: actions/version.php:198 lib/action.php:901
 msgid "Version"
 msgstr "ვერსია"
 
@@ -7022,14 +6901,14 @@ msgstr "პრობლემა ჯგუფის ინდექსის შ
 
 #. TRANS: Server exception thrown when a reply cannot be saved.
 #. TRANS: %1$d is a notice ID, %2$d is the ID of the mentioned user.
-#: classes/Notice.php:1142
+#: classes/Notice.php:1144
 #, fuzzy, php-format
 msgid "Could not save reply for %1$d, %2$d."
 msgstr "ჯგუფის ლოკალური ინფორმაციის დამახსოვრება ვერ მოხერხდა."
 
 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1661
+#: classes/Notice.php:1663
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
@@ -7043,7 +6922,7 @@ msgstr "%1$s (%2$s)"
 
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:775
+#: classes/Profile.php:779
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
@@ -7051,7 +6930,7 @@ msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:784
+#: classes/Profile.php:788
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -7370,53 +7249,53 @@ msgid "Page notice"
 msgstr "გვერდის შეტყობინება"
 
 #. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:871
+#: lib/action.php:874
 msgid "Secondary site navigation"
 msgstr "საიტის მეორადი ნავიგაცია"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:877
+#: lib/action.php:880
 msgid "Help"
 msgstr "დახმარება"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:880
+#: lib/action.php:883
 msgid "About"
 msgstr "საიტის შესახებ"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:883
+#: lib/action.php:886
 msgid "FAQ"
 msgstr "ხდკ"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:888
+#: lib/action.php:891
 msgid "TOS"
 msgstr "მპ"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:892
+#: lib/action.php:895
 msgid "Privacy"
 msgstr "პირადი"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:895
+#: lib/action.php:898
 msgid "Source"
 msgstr "წყარო"
 
 #. TRANS: Secondary navigation menu option leading to e-mail contact information on the
 #. TRANS: StatusNet site, where to report bugs, ...
-#: lib/action.php:902
+#: lib/action.php:905
 msgid "Contact"
 msgstr "კონტაქტი"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:905
+#: lib/action.php:908
 msgid "Badge"
 msgstr "იარლიყი"
 
 #. TRANS: DT element for StatusNet software license.
-#: lib/action.php:934
+#: lib/action.php:937
 msgid "StatusNet software license"
 msgstr "StatusNet კოდის ლიცენზია"
 
@@ -7424,7 +7303,7 @@ msgstr "StatusNet კოდის ლიცენზია"
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:941
+#: lib/action.php:944
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7434,7 +7313,7 @@ msgstr ""
 "(%%site.broughtbyurl%%)-ს მიერ."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:944
+#: lib/action.php:947
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** არის მიკრობლოგინგის სერვისი."
@@ -7443,7 +7322,7 @@ msgstr "**%%site.name%%** არის მიკრობლოგინგი
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:951
+#: lib/action.php:954
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7455,51 +7334,51 @@ msgstr ""
 "org/licensing/licenses/agpl-3.0.html)."
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:967
+#: lib/action.php:970
 msgid "Site content license"
 msgstr "საიტის შიგთავსის ლიცენზია"
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:974
+#: lib/action.php:977
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr "%1$s ის შიგთავსი და მონაცემები არის პირადული და კონფიდენციალური."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:981
+#: lib/action.php:984
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr "შიგთავსი და მონაცემები %1$s-ის საკუთრებაა. ყველა უფლება დაცულია."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:985
+#: lib/action.php:988
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 "შიგთავსი და მონაცემები წვლილის შემტანების საკუთრებაა. ყველა უფლება დაცულია."
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:1017
+#: lib/action.php:1020
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr "%1$s-ს მთლიანი შიგთავსი და მონაცემები ხელმისაწვდომია %2$s ლიცენზიით."
 
 #. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1353
+#: lib/action.php:1356
 msgid "Pagination"
 msgstr "გვერდებათ დაყოფა"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1364
+#: lib/action.php:1367
 msgid "After"
 msgstr "შემდეგი"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1374
+#: lib/action.php:1377
 msgid "Before"
 msgstr "წინა"
 
@@ -7699,23 +7578,19 @@ msgstr ""
 msgid "No application for that consumer key."
 msgstr ""
 
-#: lib/apiauth.php:202 lib/apiauth.php:284
-msgid "Not allowed to use API."
-msgstr ""
-
 #. TRANS: OAuth exception given when an incorrect access token was given for a user.
-#: lib/apiauth.php:225
+#: lib/apiauth.php:219
 msgid "Bad access token."
 msgstr ""
 
 #. TRANS: OAuth exception given when no user was found for a given token (no token was found).
-#: lib/apiauth.php:230
+#: lib/apiauth.php:224
 msgid "No user for that token."
 msgstr ""
 
 #. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel".
 #. TRANS: Client error thrown when authentication fails.
-#: lib/apiauth.php:272 lib/apiauth.php:302
+#: lib/apiauth.php:266 lib/apiauth.php:293
 msgid "Could not authenticate you."
 msgstr ""
 
@@ -7922,11 +7797,6 @@ msgstr "პაროლის ცვლილება არ არის ნ
 msgid "Block"
 msgstr "ბლოკირება"
 
-#. TRANS: Description of the form to block a user.
-#: lib/blockform.php:79
-msgid "Block this user"
-msgstr "დაბლოკე ეს მომხმარებელი"
-
 #. TRANS: Title for command results.
 #: lib/channel.php:160 lib/channel.php:181
 msgid "Command results"
@@ -7955,7 +7825,7 @@ msgstr "შეტყობინებები ამ ID-თ არ არს
 
 #. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
 #. TRANS: Error text shown when a last user notice is requested and it does not exist.
-#: lib/command.php:99 lib/command.php:630
+#: lib/command.php:99 lib/command.php:642
 msgid "User has no last notice."
 msgstr "მომხმარებელს არ გააჩნია ბოლო შეტყობინება."
 
@@ -8005,35 +7875,41 @@ msgstr ""
 "გამომწერები: %2$s\n"
 "შეტყობინებები: %3$s"
 
+#. TRANS: Error message text shown when a favorite could not be set because it has already been favorited.
+#: lib/command.php:298
+#, fuzzy
+msgid "Could not create favorite: already favorited."
+msgstr "ფავორიტის შექმნა ვერ მოხერხდა."
+
 #. TRANS: Text shown when a notice has been marked as favourite successfully.
-#: lib/command.php:312
+#: lib/command.php:324
 msgid "Notice marked as fave."
 msgstr "შეტყობინება მონიშნულია რჩეულად."
 
 #. TRANS: Message given having added a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:357
+#: lib/command.php:369
 #, php-format
 msgid "%1$s joined group %2$s."
 msgstr "%1$s გაწევრიანდა ჯგუფში %2$s."
 
 #. TRANS: Message given having removed a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:405
+#: lib/command.php:417
 #, php-format
 msgid "%1$s left group %2$s."
 msgstr "%1$s-მა დატოვა ჯგუფი %2$s."
 
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: lib/command.php:426
+#: lib/command.php:438
 #, fuzzy, php-format
 msgctxt "WHOIS"
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
 
 #. TRANS: Whois output. %s is the full name of the queried user.
-#: lib/command.php:430
+#: lib/command.php:442
 #, php-format
 msgid "Fullname: %s"
 msgstr "სრული სახელი: %s"
@@ -8041,7 +7917,7 @@ msgstr "სრული სახელი: %s"
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a location.
-#: lib/command.php:434 lib/mail.php:270
+#: lib/command.php:446 lib/mail.php:270
 #, php-format
 msgid "Location: %s"
 msgstr "მდებარეობა: %s"
@@ -8049,20 +7925,20 @@ msgstr "მდებარეობა: %s"
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a homepage.
-#: lib/command.php:438 lib/mail.php:274
+#: lib/command.php:450 lib/mail.php:274
 #, php-format
 msgid "Homepage: %s"
 msgstr "გვერდი: %s"
 
 #. TRANS: Whois output. %s is the bio information of the queried user.
-#: lib/command.php:442
+#: lib/command.php:454
 #, php-format
 msgid "About: %s"
 msgstr "%s-ის შესახებ"
 
 #. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).
 #. TRANS: %s is a remote profile.
-#: lib/command.php:471
+#: lib/command.php:483
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
@@ -8073,7 +7949,7 @@ msgstr ""
 
 #. TRANS: Message given if content is too long. %1$sd is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:488
+#: lib/command.php:500
 #, fuzzy, php-format
 msgid "Message too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
@@ -8082,25 +7958,25 @@ msgstr[0] ""
 "გააგზავნეთ %2$d."
 
 #. TRANS: Error text shown sending a direct message fails with an unknown reason.
-#: lib/command.php:516
+#: lib/command.php:528
 msgid "Error sending direct message."
 msgstr "შეცდომა პირდაპირი შეტყობინების გაგზავნისას."
 
 #. TRANS: Message given having repeated a notice from another user.
 #. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:553
+#: lib/command.php:565
 #, php-format
 msgid "Notice from %s repeated."
 msgstr "შეტყობინება %s-გან გამეორდა."
 
 #. TRANS: Error text shown when repeating a notice fails with an unknown reason.
-#: lib/command.php:556
+#: lib/command.php:568
 msgid "Error repeating notice."
 msgstr "შეცდომა შეტყობინების გამეორებისას."
 
 #. TRANS: Message given if content of a notice for a reply is too long. %1$d is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:591
+#: lib/command.php:603
 #, fuzzy, php-format
 msgid "Notice too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Notice too long - maximum is %1$d characters, you sent %2$d."
@@ -8110,134 +7986,134 @@ msgstr[0] ""
 
 #. TRANS: Text shown having sent a reply to a notice successfully.
 #. TRANS: %s is the nickname of the user of the notice the reply was sent to.
-#: lib/command.php:604
+#: lib/command.php:616
 #, php-format
 msgid "Reply to %s sent."
 msgstr "პასუხი %s-ს გაეგზავნა."
 
 #. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
-#: lib/command.php:607
+#: lib/command.php:619
 msgid "Error saving notice."
 msgstr "შეცდომა შეტყობინების შენახვისას."
 
 #. TRANS: Error text shown when no username was provided when issuing a subscribe command.
-#: lib/command.php:654
+#: lib/command.php:666
 msgid "Specify the name of the user to subscribe to."
 msgstr "მიუთითეთ მომხმარებლის სახელი, რომელსაც გინდათ ყური დაუგდოთ."
 
 #. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
-#: lib/command.php:663
+#: lib/command.php:675
 msgid "Can't subscribe to OMB profiles by command."
 msgstr ""
 
 #. TRANS: Text shown after having subscribed to another user successfully.
 #. TRANS: %s is the name of the user the subscription was requested for.
-#: lib/command.php:671
+#: lib/command.php:683
 #, php-format
 msgid "Subscribed to %s."
 msgstr "%s-ს გამოწერა დასრულდა წარმატებით."
 
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.
-#: lib/command.php:692 lib/command.php:803
+#: lib/command.php:704 lib/command.php:815
 msgid "Specify the name of the user to unsubscribe from."
 msgstr "მიუთითეთ მომხმარებლის სახელი, რომ გამოწერა გააუქმოთ."
 
 #. TRANS: Text shown after having unsubscribed from another user successfully.
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:703
+#: lib/command.php:715
 #, php-format
 msgid "Unsubscribed from %s."
 msgstr "%s-ს გამოწერა გაუქმდა."
 
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
-#: lib/command.php:723 lib/command.php:749
+#: lib/command.php:735 lib/command.php:761
 msgid "Command not yet implemented."
 msgstr "ბრძანება ჯერ არ არის შემუშავებული."
 
 #. TRANS: Text shown when issuing the command "off" successfully.
-#: lib/command.php:727
+#: lib/command.php:739
 msgid "Notification off."
 msgstr ""
 
 #. TRANS: Error text shown when the command "off" fails for an unknown reason.
-#: lib/command.php:730
+#: lib/command.php:742
 msgid "Can't turn off notification."
 msgstr ""
 
 #. TRANS: Text shown when issuing the command "on" successfully.
-#: lib/command.php:753
+#: lib/command.php:765
 msgid "Notification on."
 msgstr ""
 
 #. TRANS: Error text shown when the command "on" fails for an unknown reason.
-#: lib/command.php:756
+#: lib/command.php:768
 msgid "Can't turn on notification."
 msgstr ""
 
 #. TRANS: Error text shown when issuing the login command while login is disabled.
-#: lib/command.php:770
+#: lib/command.php:782
 msgid "Login command is disabled."
 msgstr ""
 
 #. TRANS: Text shown after issuing the login command successfully.
 #. TRANS: %s is a logon link..
-#: lib/command.php:783
+#: lib/command.php:795
 #, php-format
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
 
 #. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:812
+#: lib/command.php:824
 #, php-format
 msgid "Unsubscribed %s."
 msgstr ""
 
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
-#: lib/command.php:830
+#: lib/command.php:842
 msgid "You are not subscribed to anyone."
 msgstr ""
 
 #. TRANS: Text shown after requesting other users a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
-#: lib/command.php:835
+#: lib/command.php:847
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] ""
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user
 #. TRANS: (followers) without having any subscribers.
-#: lib/command.php:857
+#: lib/command.php:869
 msgid "No one is subscribed to you."
 msgstr ""
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
-#: lib/command.php:862
+#: lib/command.php:874
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] ""
 
 #. TRANS: Text shown after requesting groups a user is subscribed to without having
 #. TRANS: any group subscriptions.
-#: lib/command.php:884
+#: lib/command.php:896
 msgid "You are not a member of any groups."
 msgstr ""
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
-#: lib/command.php:889
+#: lib/command.php:901
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] ""
 
 #. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-#: lib/command.php:904
+#: lib/command.php:916
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -8343,11 +8219,6 @@ msgstr "ავტორიზირებული შეერთებულ
 msgid "Database error"
 msgstr "მონაცემთა ბაზის შეცდომა"
 
-#. TRANS: Description of form for deleting a user.
-#: lib/deleteuserform.php:75
-msgid "Delete this user"
-msgstr "ამ მომხმარებლის წაშლა"
-
 #. TRANS: Label in form on profile design page.
 #. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
 #: lib/designsettings.php:108
@@ -8386,21 +8257,6 @@ msgstr "შეცვალე ფერები"
 msgid "Use defaults"
 msgstr "გამოიყენე პირვანდელი მდგომარეობა"
 
-#. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: lib/designsettings.php:259
-msgid "Restore default designs"
-msgstr "დააბრუნე პირვანდელი დიზაინი"
-
-#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: lib/designsettings.php:267
-msgid "Reset back to default"
-msgstr "პირვანდელის პარამეტრების დაბრუნება"
-
-#. TRANS: Title for button on profile design page to save settings.
-#: lib/designsettings.php:272
-msgid "Save design"
-msgstr "შეინახე დიზაინი"
-
 #. TRANS: Error message displayed if design settings could not be saved.
 #. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
 #: lib/designsettings.php:405 lib/designsettings.php:427
@@ -9256,10 +9112,6 @@ msgstr "უპასუხე ამ შეტყობინებას"
 msgid "Reply"
 msgstr "პასუხი"
 
-#: lib/noticelist.php:673
-msgid "Delete this notice"
-msgstr "შეტყობინების წაშლა"
-
 #: lib/noticelist.php:691
 msgid "Notice repeated"
 msgstr "შეტყობინება გამეორებულია"
@@ -9541,10 +9393,6 @@ msgstr "მოწვევა"
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "მოიწვიე მეგობრები და კოლეგები %s-ზე"
 
-#: lib/subscribeform.php:115 lib/subscribeform.php:139
-msgid "Subscribe to this user"
-msgstr "გამოიწერე ეს მომხმარებელი"
-
 #: lib/subscriberspeopleselftagcloudsection.php:48
 #: lib/subscriptionspeopleselftagcloudsection.php:48
 msgid "People Tagcloud as self-tagged"
@@ -9717,66 +9565,61 @@ msgctxt "role"
 msgid "Moderator"
 msgstr "მოდერატორი"
 
-#: lib/util.php:305
-#, fuzzy
-msgid "Not allowed to log in."
-msgstr "ავტორიზებული არ ხართ."
-
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1309
+#: lib/util.php:1306
 msgid "a few seconds ago"
 msgstr "რამდენიმე წამის წინ"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1312
+#: lib/util.php:1309
 msgid "about a minute ago"
 msgstr "დაახლოებით 1 წუთის წინ"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1316
+#: lib/util.php:1313
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
 msgstr[0] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1319
+#: lib/util.php:1316
 msgid "about an hour ago"
 msgstr "დაახლოებით 1 საათის წინ"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1323
+#: lib/util.php:1320
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
 msgstr[0] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1326
+#: lib/util.php:1323
 msgid "about a day ago"
 msgstr "დაახლოებით 1 დღის წინ"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1330
+#: lib/util.php:1327
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
 msgstr[0] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1333
+#: lib/util.php:1330
 msgid "about a month ago"
 msgstr "დაახლოებით 1 თვის წინ"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1337
+#: lib/util.php:1334
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
 msgstr[0] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1340
+#: lib/util.php:1337
 msgid "about a year ago"
 msgstr "დაახლოებით 1 წლის წინ"
 
@@ -9820,3 +9663,75 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#, fuzzy
+#~ msgid "Block this user."
+#~ msgstr "დაბლოკე ეს მომხმარებელი"
+
+#, fuzzy
+#~ msgid "Delete this notice."
+#~ msgstr "შეტყობინების წაშლა"
+
+#, fuzzy
+#~ msgid "Delete this user."
+#~ msgstr "ამ მომხმარებლის წაშლა"
+
+#, fuzzy
+#~ msgid "Restore default designs."
+#~ msgstr "დააბრუნე პირვანდელი დიზაინი"
+
+#, fuzzy
+#~ msgid "Reset back to default."
+#~ msgstr "პირვანდელის პარამეტრების დაბრუნება"
+
+#, fuzzy
+#~ msgid "Save design."
+#~ msgstr "შეინახე დიზაინი"
+
+#, fuzzy
+#~ msgid "Disfavor favorite."
+#~ msgstr "რჩეულის გაუქმება"
+
+#, fuzzy
+#~ msgid "\"%s\" not found."
+#~ msgstr "API მეთოდი ვერ მოიძებნა."
+
+#, fuzzy
+#~ msgid "Notice %s not found."
+#~ msgstr "API მეთოდი ვერ მოიძებნა."
+
+#, fuzzy
+#~ msgid "Attachment %s not found."
+#~ msgstr "მიმღები მომხმარებელი ვერ მოიძებნა."
+
+#, fuzzy
+#~ msgid "Invalid tag: \"%s\"."
+#~ msgstr "არასწორი სანიშნე: \"%s\""
+
+#, fuzzy
+#~ msgid "%s updates from everyone."
+#~ msgstr "%s განახლებები ყველასგან!"
+
+#, fuzzy
+#~ msgid "Password saved"
+#~ msgstr "პაროლი შენახულია."
+
+#, fuzzy
+#~ msgid "Where you are, like \"City, State (or Region), Country\"."
+#~ msgstr "რომელ ქალაქში, რეგიონში, ქვეყანაში ხართ?"
+
+#, fuzzy
+#~ msgid "Subscribe to this user."
+#~ msgstr "გამოიწერე ეს მომხმარებელი"
+
+#, fuzzy
+#~ msgid ""
+#~ "Listenee stream license \"%1$s\" is not compatible with site license \"%2"
+#~ "$s\"."
+#~ msgstr ""
+#~ "გამოსაწერი მომხმარებლის ნაკადის ლიცენზია ‘%1$s’ შეუთავსებელია საიტის "
+#~ "ლიცენზიასთან ‘%2$s’."
+
+#, fuzzy
+#~ msgid "Not allowed to log in."
+#~ msgstr "ავტორიზებული არ ხართ."
diff --git a/locale/ko/LC_MESSAGES/statusnet.po b/locale/ko/LC_MESSAGES/statusnet.po
index 8cd2084842..a65881d25b 100644
--- a/locale/ko/LC_MESSAGES/statusnet.po
+++ b/locale/ko/LC_MESSAGES/statusnet.po
@@ -11,17 +11,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-24 10:32+0000\n"
-"PO-Revision-Date: 2011-02-24 10:37:10+0000\n"
+"POT-Creation-Date: 2011-03-03 15:58+0000\n"
+"PO-Revision-Date: 2011-03-03 16:00:59+0000\n"
 "Language-Team: Korean <http://translatewiki.net/wiki/Portal:ko>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r82712); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ko\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-POT-Import-Date: 2011-02-17 11:39:54+0000\n"
+"X-POT-Import-Date: 2011-02-25 23:49:23+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -133,11 +133,7 @@ msgstr "해당하는 페이지 없음"
 #. 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 use "one time password login" without using an existing user.
-#. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
-#. TRANS: Client error displayed trying to find a user by ID for a non-existing ID.
-#. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when calling a profile action without specifying a user.
 #: actions/all.php:80 actions/allrss.php:69
@@ -155,12 +151,12 @@ msgstr "해당하는 페이지 없음"
 #: actions/apitimelinementions.php:77 actions/apitimelineuser.php:79
 #: actions/avatarbynickname.php:79 actions/favoritesrss.php:72
 #: actions/foaf.php:42 actions/foaf.php:61 actions/hcard.php:67
-#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:78
+#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
 #: actions/remotesubscribe.php:144 actions/remotesubscribe.php:153
-#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:113
-#: actions/showfavorites.php:106 actions/userbyid.php:75
+#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
+#: actions/showfavorites.php:106 actions/userbyid.php:74
 #: actions/usergroups.php:93 actions/userrss.php:40 actions/userxrd.php:59
-#: actions/xrds.php:71 lib/command.php:497 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:509 lib/galleryaction.php:59
 #: lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "해당하는 이용자 없음"
@@ -284,7 +280,7 @@ msgstr "%2$s에 있는 %1$s 및 친구들의 업데이트!"
 #: actions/apigrouplistall.php:120 actions/apigroupmembership.php:105
 #: actions/apigroupshow.php:114 actions/apihelptest.php:84
 #: actions/apistatusesdestroy.php:101 actions/apistatusesretweets.php:110
-#: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:138
+#: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:139
 #: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
 #: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:268
 #: actions/apitimelinegroup.php:147 actions/apitimelinehome.php:173
@@ -510,7 +506,7 @@ msgstr "받는 사용자가 없습니다."
 #. TRANS: Client error displayed trying to direct message another user who's not a friend (403).
 #: actions/apidirectmessagenew.php:144
 #, fuzzy
-msgid "Cannot send direct messages to users who aren't your friend."
+msgid "Can't send direct messages to users who aren't your friend."
 msgstr "당신의 친구가 아닌 사용자에게 직접 메시지를 보낼 수 없습니다."
 
 #. TRANS: Client error displayed trying to direct message self (403).
@@ -537,7 +533,7 @@ msgstr "이 소식은 이미 관심소식으로 등록되어 있습니다."
 #. TRANS: Client error displayed when marking a notice as favourite fails.
 #. TRANS: Server error displayed when trying to mark a notice as favorite fails in the database.
 #. TRANS: Error message text shown when a favorite could not be set.
-#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:294
+#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:306
 msgid "Could not create favorite."
 msgstr "관심소식을 생성할 수 없습니다."
 
@@ -596,7 +592,7 @@ msgstr "타겟 이용자를 찾을 수 없습니다."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:191
 #: actions/newgroup.php:137 actions/profilesettings.php:273
-#: actions/register.php:206
+#: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "별명이 이미 사용중 입니다. 다른 별명을 시도해 보십시오."
 
@@ -606,7 +602,7 @@ msgstr "별명이 이미 사용중 입니다. 다른 별명을 시도해 보십
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:195
 #: actions/newgroup.php:141 actions/profilesettings.php:243
-#: actions/register.php:208
+#: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "유효한 별명이 아닙니다"
 
@@ -619,7 +615,7 @@ msgstr "유효한 별명이 아닙니다"
 #: actions/apigroupcreate.php:181 actions/editapplication.php:235
 #: actions/editgroup.php:202 actions/newapplication.php:221
 #: actions/newgroup.php:148 actions/profilesettings.php:248
-#: actions/register.php:215
+#: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "홈페이지 주소형식이 올바르지 않습니다."
 
@@ -629,7 +625,7 @@ msgstr "홈페이지 주소형식이 올바르지 않습니다."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:191 actions/editgroup.php:206
 #: actions/newgroup.php:152 actions/profilesettings.php:252
-#: actions/register.php:218
+#: actions/register.php:226
 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "실명이 너무 깁니다. (최대 255글자)"
@@ -657,7 +653,7 @@ msgstr[0] "설명이 너무 깁니다. (최대 %d 글자)"
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:215 actions/editgroup.php:218
 #: actions/newgroup.php:164 actions/profilesettings.php:265
-#: actions/register.php:227
+#: actions/register.php:235
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
 msgstr "위치가 너무 깁니다. (최대 255글자)"
@@ -713,14 +709,14 @@ msgstr "찾을 수가 없습니다."
 #. TRANS: Server error displayed when trying to join a group the user is already a member of.
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:333
+#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:345
 msgid "You are already a member of that group."
 msgstr "당신은 이미 이 그룹의 멤버입니다."
 
 #. TRANS: Server error displayed when trying to join a group the user is blocked from joining.
 #. 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.
-#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:338
+#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:350
 msgid "You have been blocked from that group by the admin."
 msgstr "이미 차단된 이용자입니다."
 
@@ -730,7 +726,7 @@ msgstr "이미 차단된 이용자입니다."
 #. TRANS: %1$s is the joining user's nickname, $2$s is the group nickname for which the join failed.
 #. TRANS: Message given having failed to add a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:350
+#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:362
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "이용자 %1$s 의 그룹 %2$s 가입에 실패했습니다."
@@ -747,7 +743,7 @@ msgstr "당신은 해당 그룹의 멤버가 아닙니다."
 #. TRANS: Message given having failed to remove a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
 #: actions/apigroupleave.php:127 actions/leavegroup.php:133
-#: lib/command.php:398
+#: lib/command.php:410
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
 msgstr "이용자 %1$s 의 그룹 %2$s 가입에 실패했습니다."
@@ -810,21 +806,20 @@ msgstr "당신은 이 프로필에 구독되지 않고있습니다."
 #. TRANS: Form validation error message.
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
-#. TRANS: Client error displayed when the session token is not okay.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
 #: actions/deletenotice.php:177 actions/disfavor.php:75
 #: actions/emailsettings.php:291 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:65 actions/grouplogo.php:321
 #: actions/groupunblock.php:65 actions/imsettings.php:224
-#: actions/invite.php:60 actions/login.php:131 actions/makeadmin.php:66
+#: actions/invite.php:60 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
-#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:136
-#: actions/othersettings.php:155 actions/passwordsettings.php:137
+#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
+#: actions/othersettings.php:155 actions/passwordsettings.php:138
 #: actions/profilesettings.php:217 actions/recoverpassword.php:383
-#: actions/register.php:164 actions/remotesubscribe.php:76
+#: actions/register.php:172 actions/remotesubscribe.php:76
 #: actions/repeat.php:82 actions/smssettings.php:250 actions/subedit.php:40
-#: actions/subscribe.php:87 actions/tagother.php:166
-#: actions/unsubscribe.php:69 actions/userauthorization.php:53
+#: actions/subscribe.php:86 actions/tagother.php:166
+#: actions/unsubscribe.php:69 actions/userauthorization.php:52
 #: lib/designsettings.php:310
 msgid "There was a problem with your session token. Try again, please."
 msgstr "세션토큰에 문제가 있습니다. 다시 시도해주십시오."
@@ -856,7 +851,7 @@ msgstr "OAuth 응용 프로그램 사용자 추가 중 데이터베이스 오류
 #: actions/designadminpanel.php:100 actions/editapplication.php:144
 #: actions/emailsettings.php:310 actions/grouplogo.php:332
 #: actions/imsettings.php:239 actions/newapplication.php:124
-#: actions/oauthconnectionssettings.php:145 actions/recoverpassword.php:46
+#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
 #: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
 msgstr "잘못된 폼 제출"
@@ -908,20 +903,19 @@ msgstr "계정"
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group nickname (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT for nick name in a profile.
-#: actions/apioauthauthorize.php:459 actions/login.php:242
-#: actions/profilesettings.php:106 actions/register.php:418
+#: actions/apioauthauthorize.php:459 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:432
 #: actions/showgroup.php:243 actions/tagother.php:94
-#: actions/userauthorization.php:152 lib/groupeditform.php:145
+#: actions/userauthorization.php:145 lib/groupeditform.php:145
 #: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "별명"
 
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:463 actions/login.php:245
-#: actions/register.php:422 lib/accountsettingsaction.php:120
+#: actions/apioauthauthorize.php:463 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:120
 msgid "Password"
 msgstr "비밀 번호"
 
@@ -1016,13 +1010,13 @@ msgstr "그러한 통지는 없습니다."
 
 #. TRANS: Client error displayed trying to repeat an own notice through the API.
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:537
+#: actions/apistatusesretweet.php:83 lib/command.php:549
 msgid "Cannot repeat your own notice."
 msgstr "자기 자신의 소식은 재전송할 수 없습니다."
 
 #. TRANS: Client error displayed trying to re-repeat a notice through the API.
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:92 lib/command.php:543
+#: actions/apistatusesretweet.php:92 lib/command.php:555
 msgid "Already repeated that notice."
 msgstr "이미 재전송된 소식입니다."
 
@@ -1045,7 +1039,7 @@ msgstr "API 메서드 발견 안 됨."
 #. TRANS: %s is the requested output format.
 #: actions/apistatusesshow.php:144
 #, fuzzy, php-format
-msgid "Unsupported format: %s."
+msgid "Unsupported format: %s"
 msgstr "지원하지 않는 형식입니다."
 
 #. TRANS: Client error displayed requesting a deleted status.
@@ -1148,14 +1142,13 @@ msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr "%1$s님이 %2$s/%3$s의 업데이트에 답변했습니다."
 
 #. TRANS: Title for site timeline. %s is the StatusNet sitename.
-#. TRANS: Public RSS feed title. %s is the StatusNet site name.
 #: actions/apitimelinepublic.php:193 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "%s 공개 타임라인"
 
 #. TRANS: Subtitle for site timeline. %s is the StatusNet sitename.
-#: actions/apitimelinepublic.php:199
+#: actions/apitimelinepublic.php:199 actions/publicrss.php:105
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "모두로부터의 업데이트 %s개!"
@@ -1222,26 +1215,25 @@ msgid "Atom post must be an Atom entry."
 msgstr ""
 
 #. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
-#: actions/apitimelineuser.php:334
+#: actions/apitimelineuser.php:335
 msgid "Can only handle POST activities."
 msgstr ""
 
 #. TRANS: Client error displayed when using an unsupported activity object type.
 #. TRANS: %s is the unsupported activity object type.
-#: actions/apitimelineuser.php:345
+#: actions/apitimelineuser.php:346
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
 #. TRANS: %d is the notice ID (number).
-#: actions/apitimelineuser.php:379
+#: actions/apitimelineuser.php:380
 #, fuzzy, php-format
 msgid "No content for notice %d."
 msgstr "통지들의 내용 찾기"
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#. TRANS: %s is the notice URI.
 #: actions/apitimelineuser.php:408
 #, fuzzy, php-format
 msgid "Notice with URI \"%s\" already exists."
@@ -1259,10 +1251,9 @@ msgstr "API 메서드 발견 안 됨."
 
 #. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
 #. TRANS: Client exception.
-#. TRANS: Client error displayed trying to subscribe to a non-existing profile.
 #: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
 #: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
-#: actions/subscribe.php:110
+#: actions/subscribe.php:107
 msgid "No such profile."
 msgstr "해당하는 파일이 없습니다."
 
@@ -1398,7 +1389,7 @@ msgstr "관심소식을 삭제할 수 없습니다."
 #: actions/joingroup.php:95 actions/leavegroup.php:82
 #: actions/leavegroup.php:95 actions/makeadmin.php:86
 #: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:380
+#: lib/command.php:392
 msgid "No such group."
 msgstr "그러한 그룹이 없습니다."
 
@@ -1409,7 +1400,7 @@ msgid "Not a member."
 msgstr "모든 회원"
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
-#: actions/atompubshowmembership.php:150
+#: actions/atompubshowmembership.php:151
 #, fuzzy
 msgid "Cannot delete someone else's membership."
 msgstr "구독을 저장할 수 없습니다."
@@ -1514,11 +1505,9 @@ msgstr "당신의 개인 아바타를 업로드할 수 있습니다. 최대 파
 
 #. TRANS: Server error displayed in avatar upload page when no matching profile can be found for a user.
 #. TRANS: Server error displayed coming across a request from a user without a profile.
-#. TRANS: Server error displayed when trying to authorise a remote subscription request
-#. TRANS: while the user has no profile.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
 #: actions/grouplogo.php:184 actions/remotesubscribe.php:190
-#: actions/userauthorization.php:75 actions/userrss.php:108
+#: actions/userauthorization.php:72 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr "이용자가 프로필을 가지고 있지 않습니다."
 
@@ -1576,10 +1565,10 @@ msgstr "자르기"
 msgid "No file uploaded."
 msgstr "파일을 업로드하지 않았습니다."
 
-#. TRANS: Avatar upload form instruction after uploading a file.
+#. TRANS: Avatar upload form unstruction after uploading a file.
 #: actions/avatarsettings.php:345
 #, fuzzy
-msgid "Pick a square area of the image to be your avatar."
+msgid "Pick a square area of the image to be your avatar"
 msgstr "그림에서 당신의 아바타로 사용할 영역을 지정하십시오."
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
@@ -1621,7 +1610,7 @@ msgid "You may not backup your account."
 msgstr ""
 
 #. TRANS: Information displayed on the backup account page.
-#: actions/backupaccount.php:225
+#: actions/backupaccount.php:227
 msgid ""
 "You can backup your account data in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format. This is an experimental feature and provides "
@@ -1631,15 +1620,15 @@ msgid ""
 msgstr ""
 
 #. TRANS: Submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:248
+#: actions/backupaccount.php:250
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Backup"
 msgstr "배경"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:252
-msgid "Backup your account."
+#: actions/backupaccount.php:254
+msgid "Backup your account"
 msgstr ""
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
@@ -1680,7 +1669,7 @@ msgstr "아니오"
 #. TRANS: Submit button title for 'No' when blocking a user.
 #: actions/block.php:158
 #, fuzzy
-msgid "Do not block this user."
+msgid "Do not block this user"
 msgstr "이용자를 차단하지 않는다."
 
 #. TRANS: Button label on the user block form.
@@ -1697,9 +1686,9 @@ msgid "Yes"
 msgstr "예"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:165
-#, fuzzy
-msgid "Block this user."
+#. TRANS: Description of the form to block a user.
+#: actions/block.php:165 lib/blockform.php:79
+msgid "Block this user"
 msgstr "이 사용자 차단하기"
 
 #. TRANS: Server error displayed when blocking a user fails.
@@ -1865,7 +1854,7 @@ msgstr ""
 #. TRANS: Field label for delete account confirmation entry.
 #. TRANS: Field label for password reset form where the password has to be typed again.
 #: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:262 actions/register.php:426
+#: actions/recoverpassword.php:262 actions/register.php:440
 msgid "Confirm"
 msgstr "인증"
 
@@ -1895,14 +1884,14 @@ msgstr "인증 코드가 없습니다."
 #. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
 #: actions/deleteapplication.php:79 actions/editapplication.php:78
-#: actions/showapplication.php:90
+#: actions/showapplication.php:94
 msgid "You are not the owner of this application."
 msgstr "이 응용프로그램 삭제 않기"
 
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
-#: actions/newapplication.php:112 actions/showapplication.php:113
-#: lib/action.php:1422
+#: actions/newapplication.php:112 actions/showapplication.php:118
+#: lib/action.php:1425
 msgid "There was a problem with your session token."
 msgstr "당신의 세션토큰관련 문제가 있습니다."
 
@@ -1923,13 +1912,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting an application.
 #: actions/deleteapplication.php:161
 #, fuzzy
-msgid "Do not delete this application."
+msgid "Do not delete this application"
 msgstr "이 응용프로그램 삭제 않기"
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
 #: actions/deleteapplication.php:167
 #, fuzzy
-msgid "Delete this application."
+msgid "Delete this application"
 msgstr "이 응용프로그램 삭제"
 
 #. TRANS: Client error when trying to delete group while not logged in.
@@ -1985,13 +1974,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting a group.
 #: actions/deletegroup.php:224
 #, fuzzy
-msgid "Do not delete this group."
+msgid "Do not delete this group"
 msgstr "이 통지를 지울 수 없습니다."
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
 #: actions/deletegroup.php:231
 #, fuzzy
-msgid "Delete this group."
+msgid "Delete this group"
 msgstr "이 사용자 삭제"
 
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
@@ -1999,15 +1988,13 @@ msgstr "이 사용자 삭제"
 #. TRANS: Client error displayed when trying to mark a notice as favorite without being logged in.
 #. TRANS: Client error displayed trying to block a user from a group while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
-#. TRANS: Client error displayed trying to log out when not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
-#. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
 #. TRANS: Client error displayed when trying to change user options while not logged in.
 #: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
-#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:70
+#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
-#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:98
+#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
 #: lib/adminpanelaction.php:71 lib/profileformaction.php:63
 #: lib/settingsaction.php:72
@@ -2037,13 +2024,12 @@ msgstr "정말로 통지를 삭제하시겠습니까?"
 #. TRANS: Submit button title for 'No' when deleting a notice.
 #: actions/deletenotice.php:159
 #, fuzzy
-msgid "Do not delete this notice."
+msgid "Do not delete this notice"
 msgstr "이 통지를 지울 수 없습니다."
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:166
-#, fuzzy
-msgid "Delete this notice."
+#: actions/deletenotice.php:166 lib/noticelist.php:673
+msgid "Delete this notice"
 msgstr "이 게시글 삭제하기"
 
 #. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
@@ -2078,13 +2064,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting a user.
 #: actions/deleteuser.php:158
 #, fuzzy
-msgid "Do not delete this user."
+msgid "Do not delete this user"
 msgstr "이 통지를 지울 수 없습니다."
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
-#: actions/deleteuser.php:165
-#, fuzzy
-msgid "Delete this user."
+#. TRANS: Description of form for deleting a user.
+#: actions/deleteuser.php:165 lib/deleteuserform.php:75
+msgid "Delete this user"
 msgstr "이 사용자 삭제"
 
 #. TRANS: Message used as title for design settings for the site.
@@ -2251,20 +2237,21 @@ msgid "Use defaults"
 msgstr "기본값 사용"
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:720
-#, fuzzy
-msgid "Restore default designs."
-msgstr "기본값 사용"
+#. TRANS: Title for button on profile design page to reset all colour settings to default.
+#: actions/designadminpanel.php:720 lib/designsettings.php:259
+msgid "Restore default designs"
+msgstr ""
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:728
-msgid "Reset back to default."
+#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
+#: actions/designadminpanel.php:728 lib/designsettings.php:267
+msgid "Reset back to default"
 msgstr ""
 
 #. TRANS: Title for button for saving theme settings.
-#: actions/designadminpanel.php:736
-#, fuzzy
-msgid "Save design."
+#. TRANS: Title for button on profile design page to save settings.
+#: actions/designadminpanel.php:736 lib/designsettings.php:272
+msgid "Save design"
 msgstr "디자인 저장"
 
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
@@ -2296,7 +2283,7 @@ msgid "You must be logged in to edit an application."
 msgstr "응용 프로그램 수정을 위해서는 로그인해야 합니다."
 
 #. TRANS: Client error displayed trying to edit an application that does not exist.
-#: actions/editapplication.php:83 actions/showapplication.php:83
+#: actions/editapplication.php:83 actions/showapplication.php:87
 msgid "No such application."
 msgstr "신규 응용 프로그램"
 
@@ -2579,7 +2566,7 @@ msgid "Cannot normalize that email address."
 msgstr "메일 주소를 정규화 할 수 없습니다."
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:393 actions/register.php:204
+#: actions/emailsettings.php:393 actions/register.php:212
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "올바른 메일 주소가 아닙니다."
@@ -2656,22 +2643,19 @@ msgstr "받는 메일 주소가 없습니다."
 
 #. 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.
 #: actions/emailsettings.php:530 actions/emailsettings.php:554
-#: actions/smssettings.php:566 actions/smssettings.php:591
+#: actions/smssettings.php:565 actions/smssettings.php:588
 #, fuzzy
 msgid "Could not update user record."
 msgstr "사용자 기록을 업데이트 할 수 없습니다."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
-#. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:534 actions/smssettings.php:570
+#: actions/emailsettings.php:534 actions/smssettings.php:568
 msgid "Incoming email address removed."
 msgstr "받는 메일 주소를 지웠습니다."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
-#. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:558 actions/smssettings.php:595
+#: actions/emailsettings.php:558 actions/smssettings.php:591
 msgid "New incoming email address added."
 msgstr "새로운 받는 메일 주소를 추가했습니다."
 
@@ -2683,7 +2667,7 @@ msgstr "이 게시글은 이미 좋아하는 게시글입니다."
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
 #: actions/favor.php:95
 #, fuzzy
-msgid "Disfavor favorite."
+msgid "Disfavor favorite"
 msgstr "좋아하는글 취소"
 
 #. TRANS: Page title for first page of favorited notices.
@@ -2924,13 +2908,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
 #: actions/groupblock.php:191
 #, fuzzy
-msgid "Do not block this user from this group."
+msgid "Do not block this user from this group"
 msgstr "이용자를 차단하지 않는다."
 
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
 #: actions/groupblock.php:198
 #, fuzzy
-msgid "Block this user from this group."
+msgid "Block this user from this group"
 msgstr "그룹 이용자는 차단해제"
 
 #. TRANS: Server error displayed when trying to block a user from a group fails because of an application error.
@@ -2940,7 +2924,6 @@ msgid "Database error blocking user from group."
 msgstr "그룹 이용자는 차단해제"
 
 #. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
-#. TRANS: Client error displayed trying to find a user by ID without providing an ID.
 #: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr "ID가 없습니다."
@@ -3122,10 +3105,8 @@ msgid "Group search"
 msgstr "그룹 찾기"
 
 #. TRANS: Text on page where groups can be searched if no results were found for a query.
-#. TRANS: Text for notice search results is the query had no results.
-#. TRANS: Message on the "People search" page where a query has no results.
-#: actions/groupsearch.php:82 actions/noticesearch.php:122
-#: actions/peoplesearch.php:87
+#: actions/groupsearch.php:82 actions/noticesearch.php:117
+#: actions/peoplesearch.php:83
 msgid "No results."
 msgstr "결과 없음"
 
@@ -3158,7 +3139,6 @@ msgid "User is not blocked from group."
 msgstr "그룹 이용자는 차단해제"
 
 #. TRANS: Server error displayed when unblocking a user from a group fails because of an unknown error.
-#. TRANS: Server error displayed when removing a user block.
 #: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "차단 제거 에러!"
@@ -3253,8 +3233,7 @@ msgid "Publish a MicroID for my Jabber/Google Talk address."
 msgstr "Jabber/GTalk 계정을 위한 MicroID의 생성"
 
 #. TRANS: Confirmation message for successful Instant Messaging preferences save.
-#. TRANS: Confirmation message after saving preferences.
-#: actions/imsettings.php:283 actions/othersettings.php:193
+#: actions/imsettings.php:283 actions/othersettings.php:192
 msgid "Preferences saved."
 msgstr "설정이 저장되었습니다."
 
@@ -3536,7 +3515,7 @@ msgstr "그룹을 떠나기 위해서는 로그인해야 합니다."
 
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
-#: actions/leavegroup.php:103 lib/command.php:386
+#: actions/leavegroup.php:103 lib/command.php:398
 msgid "You are not a member of that group."
 msgstr "당신은 해당 그룹의 멤버가 아닙니다."
 
@@ -3660,53 +3639,51 @@ msgstr "저장"
 msgid "Save license settings"
 msgstr ""
 
-#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
-#: actions/login.php:97 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
 msgid "Already logged in."
 msgstr "이미 로그인 하셨습니다."
 
-#: actions/login.php:142
+#: actions/login.php:148
 msgid "Incorrect username or password."
 msgstr "틀린 계정 또는 비밀 번호"
 
-#. TRANS: Server error displayed when a user object could not be created trying to login using "one time password login".
-#: actions/login.php:148 actions/otp.php:127
+#: actions/login.php:154 actions/otp.php:120
 msgid "Error setting user. You are probably not authorized."
 msgstr "당신은 이 프로필에 구독되지 않고있습니다."
 
-#: actions/login.php:202 actions/login.php:253
+#: actions/login.php:210 actions/login.php:263
 msgid "Login"
 msgstr "로그인"
 
-#: actions/login.php:239
+#: actions/login.php:249
 msgid "Login to site"
 msgstr "사이트에 로그인하세요."
 
-#: actions/login.php:248 actions/register.php:476
+#: actions/login.php:258 actions/register.php:490
 msgid "Remember me"
 msgstr "자동 로그인"
 
-#: actions/login.php:249 actions/register.php:478
+#: actions/login.php:259 actions/register.php:492
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "앞으로는 자동으로 로그인합니다. 공용 컴퓨터에서는 이용하지 마십시오!"
 
-#: actions/login.php:259
+#: actions/login.php:269
 msgid "Lost or forgotten password?"
 msgstr "비밀 번호를 잊으셨나요?"
 
-#: actions/login.php:277
+#: actions/login.php:288
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
 msgstr ""
 "보안을 위해 세팅을 저장하기 전에 계정과 비밀 번호를 다시 입력 해 주십시오."
 
-#: actions/login.php:281
+#: actions/login.php:292
 #, fuzzy
 msgid "Login with your username and password."
 msgstr "사용자 이름과 비밀번호로 로그인"
 
-#: actions/login.php:284
+#: actions/login.php:295
 #, fuzzy, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -3791,14 +3768,14 @@ msgid "New message"
 msgstr "새로운 메시지입니다."
 
 #. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
-#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:501
+#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:513
 msgid "You can't send a message to this user."
 msgstr "당신은 이 사용자에게 메시지를 보낼 수 없습니다."
 
 #. TRANS: Command exception text shown when trying to send a direct message to another user without content.
 #. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
-#: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:478
-#: lib/command.php:581
+#: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:490
+#: lib/command.php:593
 msgid "No content!"
 msgstr "내용이 없습니다!"
 
@@ -3807,7 +3784,7 @@ msgid "No recipient specified."
 msgstr "수신자를 지정하지 않았습니다."
 
 #. TRANS: Error text shown when trying to send a direct message to self.
-#: actions/newmessage.php:167 lib/command.php:505
+#: actions/newmessage.php:167 lib/command.php:517
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
@@ -3819,7 +3796,7 @@ msgstr "쪽지가 전송되었습니다."
 
 #. TRANS: Message given have sent a direct message to another user.
 #. TRANS: %s is the name of the other user.
-#: actions/newmessage.php:188 lib/command.php:513
+#: actions/newmessage.php:188 lib/command.php:525
 #, fuzzy, php-format
 msgid "Direct message to %s sent."
 msgstr "%s에게 보낸 직접 메시지"
@@ -3836,9 +3813,7 @@ msgstr "새로운 통지"
 msgid "Notice posted"
 msgstr "게시글이 등록되었습니다."
 
-#. TRANS: Instructions for Notice search page.
-#. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/noticesearch.php:69
+#: actions/noticesearch.php:68
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -3847,47 +3822,37 @@ msgstr ""
 "%%site.name%%의 글 내용을 검색합니다. 검색어는 공백으로 구분하고, 적어도 3글"
 "자 이상 필요합니다."
 
-#. TRANS: Title of the page where users can search for notices.
-#: actions/noticesearch.php:80
+#: actions/noticesearch.php:78
 msgid "Text search"
 msgstr "문자 검색"
 
-#. TRANS: Test in RSS notice search.
-#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearch.php:95
+#: actions/noticesearch.php:91
 #, php-format
 msgid "Search results for \"%1$s\" on %2$s"
 msgstr "%1$s에서 %2$s까지 메시지"
 
-#. TRANS: Text for logged in users making a query for notices without results.
-#. TRANS: This message contains a Markdown link.
-#: actions/noticesearch.php:128
+#: actions/noticesearch.php:121
 #, php-format
 msgid ""
 "Be the first to [post on this topic](%%%%action.newnotice%%%%?"
 "status_textarea=%s)!"
 msgstr ""
 
-#. TRANS: Text for not logged in users making a query for notices without results.
-#. TRANS: This message contains Markdown links.
-#: actions/noticesearch.php:133
+#: actions/noticesearch.php:124
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and be the first to "
 "[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
 msgstr ""
 
-#. TRANS: RSS notice search feed title. %s is the query.
-#: actions/noticesearchrss.php:95
+#: actions/noticesearchrss.php:96
 #, fuzzy, php-format
 msgid "Updates with \"%s\""
 msgstr "%2$s에 있는 %1$s의 업데이트!"
 
-#. TRANS: RSS notice search feed description.
-#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearchrss.php:99
+#: actions/noticesearchrss.php:98
 #, fuzzy, php-format
-msgid "Updates matching search term \"%1$s\" on %2$s."
+msgid "Updates matching search term \"%1$s\" on %2$s!"
 msgstr "%2$s에 있는 %1$s의 업데이트!"
 
 #: actions/nudge.php:85
@@ -3928,31 +3893,31 @@ msgid "You have not registered any applications yet."
 msgstr "응용 프로그램 수정을 위해서는 로그인해야 합니다."
 
 #. TRANS: Title for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:70
+#: actions/oauthconnectionssettings.php:71
 msgid "Connected applications"
 msgstr "연결한 응용프로그램"
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:81
+#: actions/oauthconnectionssettings.php:83
 msgid "The following connections exist for your account."
 msgstr ""
 
 #. TRANS: Client error when trying to revoke access for an application while not being a user of it.
-#: actions/oauthconnectionssettings.php:166
+#: actions/oauthconnectionssettings.php:168
 #, fuzzy
 msgid "You are not a user of that application."
 msgstr "당신은 해당 그룹의 멤버가 아닙니다."
 
 #. TRANS: Client error when revoking access has failed for some reason.
 #. TRANS: %s is the application ID revoking access failed for.
-#: actions/oauthconnectionssettings.php:181
+#: actions/oauthconnectionssettings.php:183
 #, fuzzy, php-format
 msgid "Unable to revoke access for application: %s."
 msgstr "다음 양식을 이용해 그룹을 편집하십시오."
 
 #. TRANS: Success message after revoking access for an application.
 #. TRANS: %1$s is the application name, %2$s is the first part of the user token.
-#: actions/oauthconnectionssettings.php:200
+#: actions/oauthconnectionssettings.php:202
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -3960,30 +3925,20 @@ msgid ""
 msgstr ""
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:211
+#: actions/oauthconnectionssettings.php:213
 msgid "You have not authorized any applications to use your account."
 msgstr "계정에서 사용하도록 허용한 응용 프로그램이 없습니다."
 
 #. TRANS: Note for developers in the OAuth connection settings form.
 #. TRANS: This message contains a Markdown link. Do not separate "](".
 #. TRANS: %s is the URL to the OAuth settings.
-#: actions/oauthconnectionssettings.php:231
+#: actions/oauthconnectionssettings.php:233
 #, php-format
 msgid ""
 "Are you a developer? [Register an OAuth client application](%s) to use with "
 "this instance of StatusNet."
 msgstr ""
 
-#: actions/oembed.php:64
-#, fuzzy, php-format
-msgid "\"%s\" not found."
-msgstr "API 메서드 발견 안 됨."
-
-#: actions/oembed.php:76
-#, fuzzy, php-format
-msgid "Notice %s not found."
-msgstr "API 메서드 발견 안 됨."
-
 #: actions/oembed.php:80 actions/shownotice.php:100
 msgid "Notice has no profile."
 msgstr "이용자가 프로필을 가지고 있지 않습니다."
@@ -3993,16 +3948,6 @@ msgstr "이용자가 프로필을 가지고 있지 않습니다."
 msgid "%1$s's status on %2$s"
 msgstr "%1$s의 상태 (%2$s에서)"
 
-#: actions/oembed.php:95
-#, fuzzy, php-format
-msgid "Attachment %s not found."
-msgstr "받는 사용자가 없습니다."
-
-#: actions/oembed.php:136
-#, php-format
-msgid "\"%s\" not supported for oembed requests."
-msgstr ""
-
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
 #: actions/oembed.php:168
 #, fuzzy, php-format
@@ -4021,12 +3966,11 @@ msgstr ""
 msgid "Not a supported data format."
 msgstr "지원하는 형식의 데이터가 아닙니다."
 
-#. TRANS: ShortName in the OpenSearch interface when trying to find users.
 #: actions/opensearch.php:64
 msgid "People Search"
 msgstr "사람 찾기"
 
-#: actions/opensearch.php:68
+#: actions/opensearch.php:67
 msgid "Notice Search"
 msgstr "통지 검색"
 
@@ -4074,48 +4018,39 @@ msgstr "프로필 디자인 보이거나 감춥니다."
 msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr "URL 줄이기 서비스 너무 깁니다. (최대 50글자)"
 
-#. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
-#: actions/otp.php:70
+#: actions/otp.php:69
 #, fuzzy
 msgid "No user ID specified."
 msgstr "프로필을 지정하지 않았습니다."
 
-#. TRANS: Client error displayed trying to use "one time password login" without specifying a login token.
-#: actions/otp.php:86
+#: actions/otp.php:83
 msgid "No login token specified."
 msgstr "허용되지 않는 요청입니다."
 
-#. TRANS: Client error displayed trying to use "one time password login" without requesting a login token.
-#: actions/otp.php:94
+#: actions/otp.php:90
 msgid "No login token requested."
 msgstr "허용되지 않는 요청입니다."
 
-#. TRANS: Client error displayed trying to use "one time password login" while specifying an invalid login token.
-#: actions/otp.php:100
+#: actions/otp.php:95
 msgid "Invalid login token specified."
 msgstr "허용되지 않는 요청입니다."
 
-#. TRANS: Client error displayed trying to use "one time password login" while specifying an expired login token.
-#: actions/otp.php:110
+#: actions/otp.php:104
 #, fuzzy
 msgid "Login token expired."
 msgstr "사이트에 로그인하세요."
 
-#. TRANS: Title for outbox for any but the fist page.
-#. TRANS: %1$s is the user nickname, %2$d is the page number.
-#: actions/outbox.php:57
+#: actions/outbox.php:58
 #, php-format
 msgid "Outbox for %1$s - page %2$d"
 msgstr "%s 및 친구들, %d 페이지"
 
-#. TRANS: Title for first page of outbox.
 #: actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
 msgstr "%s의 보낸쪽지함"
 
-#. TRANS: Instructions for outbox.
-#: actions/outbox.php:103
+#: actions/outbox.php:104
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr "당신의 보낸 쪽지함입니다. 이곳엔 당신이 보냈던 비밀 쪽지가 있습니다."
 
@@ -4141,45 +4076,43 @@ msgstr "기존 비밀 번호"
 msgid "New password"
 msgstr "새로운 비밀 번호"
 
-#: actions/passwordsettings.php:109 actions/register.php:423
+#: actions/passwordsettings.php:109
 #, fuzzy
-msgid "6 or more characters."
+msgid "6 or more characters"
 msgstr "6글자 이상"
 
-#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:264
-#: actions/register.php:427
+#: actions/passwordsettings.php:113
 #, fuzzy
-msgid "Same as password above."
+msgid "Same as password above"
 msgstr "위와 같은 비밀 번호"
 
 #: actions/passwordsettings.php:117
 msgid "Change"
 msgstr "변경"
 
-#: actions/passwordsettings.php:153 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:238
 msgid "Password must be 6 or more characters."
 msgstr "비밀번호는 6자리 이상이어야 합니다."
 
-#: actions/passwordsettings.php:156 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:241
 msgid "Passwords don't match."
 msgstr "비밀 번호가 일치하지 않습니다."
 
-#: actions/passwordsettings.php:164
+#: actions/passwordsettings.php:165
 msgid "Incorrect old password"
 msgstr "기존 비밀 번호가 틀렸습니다"
 
-#: actions/passwordsettings.php:180
+#: actions/passwordsettings.php:181
 msgid "Error saving user; invalid."
 msgstr "사용자 저장 오류; 무효한 사용자"
 
-#. TRANS: Reset password form validation error message.
-#: actions/passwordsettings.php:185 actions/recoverpassword.php:418
+#: actions/passwordsettings.php:186
 #, fuzzy
-msgid "Cannot save new password."
+msgid "Can't save new password."
 msgstr "새 비밀번호를 저장 할 수 없습니다."
 
-#: actions/passwordsettings.php:191
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
 msgid "Password saved."
 msgstr "비밀 번호 저장"
 
@@ -4465,9 +4398,7 @@ msgstr ""
 msgid "Save paths"
 msgstr "사이트 테마"
 
-#. TRANS: Instructions for the "People search" page.
-#. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/peoplesearch.php:54
+#: actions/peoplesearch.php:52
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
@@ -4476,8 +4407,7 @@ msgstr ""
 "%%site.name%%의 사람을 이름, 장소, 관심 거리로 검색합니다. 검색어는 공백으로 "
 "구분하고, 적어도 3글자 이상 필요합니다."
 
-#. TRANS: Title of a page where users can search for other users.
-#: actions/peoplesearch.php:61
+#: actions/peoplesearch.php:58
 msgid "People search"
 msgstr "사람 찾기"
 
@@ -4519,7 +4449,7 @@ msgid "Profile information"
 msgstr "프로필 정보"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109 actions/register.php:419
+#: actions/profilesettings.php:109 actions/register.php:433
 #, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr "1-64자 사이에 영소문자, 숫자로만 씁니다. 기호나 공백을 쓰면 안 됩니다."
@@ -4527,7 +4457,7 @@ msgstr "1-64자 사이에 영소문자, 숫자로만 씁니다. 기호나 공백
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for full group name (dt). Text hidden by default.
 #. TRANS: DT for full name in a profile.
-#: actions/profilesettings.php:113 actions/register.php:441
+#: actions/profilesettings.php:113 actions/register.php:455
 #: actions/showgroup.php:255 actions/tagother.php:104
 #: lib/groupeditform.php:150 lib/userprofile.php:156
 msgid "Full name"
@@ -4535,13 +4465,13 @@ msgstr "실명"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:118 actions/register.php:446
+#: actions/profilesettings.php:118 actions/register.php:460
 #: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "홈페이지"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:121 actions/register.php:448
+#: actions/profilesettings.php:121
 #, fuzzy
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr "귀하의 홈페이지, 블로그 혹은 다른 사이트의 프로필 페이지 URL"
@@ -4549,36 +4479,35 @@ msgstr "귀하의 홈페이지, 블로그 혹은 다른 사이트의 프로필 
 #. TRANS: Tooltip for field label in form for profile settings. Plural
 #. TRANS: is decided by the number of characters available for the
 #. TRANS: biography (%d).
-#: actions/profilesettings.php:129 actions/register.php:457
+#: actions/profilesettings.php:129 actions/register.php:471
 #, fuzzy, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
 msgstr[0] "%d자 이내에서 자기 소개 및 자기 관심사"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:135 actions/register.php:462
+#: actions/profilesettings.php:135 actions/register.php:476
 msgid "Describe yourself and your interests"
 msgstr "자기 소개 및 자기 관심사"
 
 #. TRANS: Text area label in form for profile settings where users can provide.
 #. TRANS: their biography.
-#: actions/profilesettings.php:139 actions/register.php:464
+#: actions/profilesettings.php:139 actions/register.php:478
 msgid "Bio"
 msgstr "자기소개"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group location (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT for location in a profile.
-#: actions/profilesettings.php:145 actions/register.php:469
+#: actions/profilesettings.php:145 actions/register.php:483
 #: actions/showgroup.php:265 actions/tagother.php:112
-#: actions/userauthorization.php:174 lib/groupeditform.php:173
+#: actions/userauthorization.php:166 lib/groupeditform.php:173
 #: lib/userprofile.php:172
 msgid "Location"
 msgstr "위치"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148
+#: actions/profilesettings.php:148 actions/register.php:485
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "당신은 어디에 삽니까? \"시, 도 (or 군,구), 나라\""
 
@@ -4599,8 +4528,7 @@ msgstr "태그"
 #: actions/profilesettings.php:164
 #, fuzzy
 msgid ""
-"Tags for yourself (letters, numbers, -, ., and _), comma- or space- "
-"separated."
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr "당신을 위한 태그, (문자,숫자,-, ., _로 구성) 콤마 혹은 공백으로 구분."
 
 #. TRANS: Dropdownlist label in form for profile settings.
@@ -4611,7 +4539,7 @@ msgstr "언어"
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
 #: actions/profilesettings.php:171
 #, fuzzy
-msgid "Preferred language."
+msgid "Preferred language"
 msgstr "언어 설정"
 
 #. TRANS: Dropdownlist label in form for profile settings.
@@ -4628,13 +4556,13 @@ msgstr "주로 생활하는 곳이 어느 시간대입니까?"
 #: actions/profilesettings.php:189
 #, fuzzy
 msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)."
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr "나에게 구독하는 사람에게 자동 구독 신청"
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Plural form is used based on the maximum number of allowed
 #. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:258 actions/register.php:221
+#: actions/profilesettings.php:258 actions/register.php:229
 #, fuzzy, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4653,9 +4581,9 @@ msgstr "언어가 너무 깁니다. (최대 50글자)"
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:291
-#, fuzzy, php-format
-msgid "Invalid tag: \"%s\"."
+#: actions/profilesettings.php:291 actions/tagother.php:178
+#, php-format
+msgid "Invalid tag: \"%s\""
 msgstr "올바르지 않은 태그: \"%s\""
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
@@ -4758,12 +4686,6 @@ msgstr ""
 "%%site.name%% 는 마이크로블로깅(http://en.wikipedia.org/wiki/Micro-blogging) "
 "서비스 입니다."
 
-#. TRANS: Public RSS feed description. %s is the StatusNet site name.
-#: actions/publicrss.php:106
-#, fuzzy, php-format
-msgid "%s updates from everyone."
-msgstr "모두로부터의 업데이트 %s개!"
-
 #. TRANS: Title for public tag cloud.
 #: actions/publictagcloud.php:57
 msgid "Public tag cloud"
@@ -4897,12 +4819,6 @@ msgstr "비밀 번호 복구"
 msgid "Password recovery requested"
 msgstr "비밀 번호 복구가 요청되었습니다."
 
-#. TRANS: Title for password recovery page in password saved mode.
-#: actions/recoverpassword.php:229
-#, fuzzy
-msgid "Password saved"
-msgstr "비밀 번호 저장"
-
 #. TRANS: Title for password recovery page when an unknown action has been specified.
 #: actions/recoverpassword.php:232
 msgid "Unknown action"
@@ -4914,6 +4830,12 @@ msgstr "알려지지 않은 행동"
 msgid "6 or more characters, and do not forget it!"
 msgstr "6글자 이상, 잊어 버리지 마십시오!"
 
+#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#: actions/recoverpassword.php:264 actions/register.php:441
+#, fuzzy
+msgid "Same as password above."
+msgstr "위와 같은 비밀 번호"
+
 #. TRANS: Button text for password reset form.
 #. TRANS: Button text on profile design page to reset all colour settings to default without saving.
 #: actions/recoverpassword.php:268 lib/designsettings.php:264
@@ -4965,8 +4887,14 @@ msgstr "비밀 번호는 6자 이상이어야 합니다."
 msgid "Password and confirmation do not match."
 msgstr "비밀 번호가 일치하지 않습니다."
 
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:418
+#, fuzzy
+msgid "Cannot save new password."
+msgstr "새 비밀번호를 저장 할 수 없습니다."
+
 #. TRANS: Server error displayed when something does wrong with the user object during password reset.
-#: actions/recoverpassword.php:426 actions/register.php:248
+#: actions/recoverpassword.php:426 actions/register.php:256
 msgid "Error setting user."
 msgstr "사용자 세팅 오류"
 
@@ -4976,97 +4904,102 @@ msgid "New password successfully saved. You are now logged in."
 msgstr ""
 "새로운 비밀 번호를 성공적으로 저장했습니다. 귀하는 이제 로그인 되었습니다."
 
-#: actions/register.php:87 actions/register.php:188 actions/register.php:399
+#: actions/register.php:92 actions/register.php:196 actions/register.php:413
 msgid "Sorry, only invited people can register."
 msgstr "죄송합니다. 단지 초대된 사람들만 등록할 수 있습니다."
 
-#: actions/register.php:94
+#: actions/register.php:99
 #, fuzzy
 msgid "Sorry, invalid invitation code."
 msgstr "확인 코드 오류"
 
-#: actions/register.php:113
+#: actions/register.php:119
 msgid "Registration successful"
 msgstr "회원 가입이 성공적입니다."
 
-#: actions/register.php:115 actions/register.php:497
+#: actions/register.php:121 actions/register.php:511
 msgid "Register"
 msgstr "등록"
 
-#: actions/register.php:135
+#: actions/register.php:142
 msgid "Registration not allowed."
 msgstr "가입이 허용되지 않습니다."
 
-#: actions/register.php:201
+#: actions/register.php:209
 #, fuzzy
-msgid "You cannot register if you don't agree to the license."
+msgid "You can't register if you don't agree to the license."
 msgstr "라이선스에 동의하지 않는다면 등록할 수 없습니다."
 
-#: actions/register.php:210
+#: actions/register.php:218
 msgid "Email address already exists."
 msgstr "이메일 주소가 이미 존재 합니다."
 
-#: actions/register.php:243 actions/register.php:265
+#: actions/register.php:251 actions/register.php:273
 msgid "Invalid username or password."
 msgstr "사용자 이름이나 비밀 번호가 틀렸습니다."
 
-#: actions/register.php:340
+#: actions/register.php:351
 msgid ""
 "With this form you can create a new account. You can then post notices and "
-"link up to friends and colleagues."
+"link up to friends and colleagues. "
 msgstr ""
 
+#: actions/register.php:437
+#, fuzzy
+msgid "6 or more characters."
+msgstr "6글자 이상"
+
 #. TRANS: Link description in user account settings menu.
-#: actions/register.php:431 actions/register.php:435
+#: actions/register.php:445 actions/register.php:449
 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
 msgid "Email"
 msgstr "메일"
 
-#: actions/register.php:432 actions/register.php:436
+#: actions/register.php:446 actions/register.php:450
 #, fuzzy
-msgid "Used only for updates, announcements, and password recovery."
+msgid "Used only for updates, announcements, and password recovery"
 msgstr "업데이트나 공지, 비밀번호 찾기에 사용하세요."
 
-#: actions/register.php:443
+#: actions/register.php:457
 #, fuzzy
-msgid "Longer name, preferably your \"real\" name."
+msgid "Longer name, preferably your \"real\" name"
 msgstr "더욱 긴 이름을 요구합니다."
 
-#: actions/register.php:471
+#: actions/register.php:462
 #, fuzzy
-msgid "Where you are, like \"City, State (or Region), Country\"."
-msgstr "당신은 어디에 삽니까? \"시, 도 (or 군,구), 나라\""
+msgid "URL of your homepage, blog, or profile on another site"
+msgstr "귀하의 홈페이지, 블로그 혹은 다른 사이트의 프로필 페이지 URL"
 
-#: actions/register.php:510
+#: actions/register.php:523
 #, fuzzy, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
 msgstr "%1$s의 컨텐츠와 데이터는 외부 유출을 금지합니다."
 
-#: actions/register.php:520
+#: actions/register.php:533
 #, php-format
 msgid "My text and files are copyright by %1$s."
 msgstr "글과 파일의 저작권은 %1$s의 소유입니다"
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:524
+#: actions/register.php:537
 msgid "My text and files remain under my own copyright."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:527
+#: actions/register.php:540
 msgid "All rights reserved."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:532
+#: actions/register.php:545
 #, fuzzy, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
 "email address, IM address, and phone number."
 msgstr "다음 개인정보 제외: 비밀 번호, 메일 주소, 메신저 주소, 전화 번호"
 
-#: actions/register.php:573
+#: actions/register.php:588
 #, fuzzy, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -5099,7 +5032,7 @@ msgstr ""
 "\n"
 "다시 한번 가입하신 것을 환영하면서 즐거운 서비스가 되셨으면 합니다."
 
-#: actions/register.php:597
+#: actions/register.php:612
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5132,7 +5065,7 @@ msgstr "이용자 닉네임"
 
 #: actions/remotesubscribe.php:129
 #, fuzzy
-msgid "Nickname of the user you want to follow."
+msgid "Nickname of the user you want to follow"
 msgstr "따라가고 싶은 사용자의 별명"
 
 #: actions/remotesubscribe.php:132
@@ -5141,7 +5074,7 @@ msgstr "프로필 URL"
 
 #: actions/remotesubscribe.php:133
 #, fuzzy
-msgid "URL of your profile on another compatible microblogging service."
+msgid "URL of your profile on another compatible microblogging service"
 msgstr "다른 마이크로블로깅 서비스의 귀하의 프로필 URL"
 
 #. TRANS: Link text for link that will subscribe to a remote profile.
@@ -5152,7 +5085,7 @@ msgstr "구독"
 
 #: actions/remotesubscribe.php:158
 #, fuzzy
-msgid "Invalid profile URL (bad format)."
+msgid "Invalid profile URL (bad format)"
 msgstr "옳지 않은 프로필 URL (나쁜 포멧)"
 
 #: actions/remotesubscribe.php:167
@@ -5197,7 +5130,6 @@ msgstr "재전송됨"
 msgid "Repeated!"
 msgstr "재전송됨!"
 
-#. TRANS: RSS reply feed title. %s is a user nickname.
 #. TRANS: Tooltip for personal group navigation menu option when logged in for viewing @-replies.
 #: actions/replies.php:126 actions/repliesrss.php:68
 #: lib/personalgroupnav.php:109
@@ -5246,11 +5178,9 @@ msgid ""
 "newnotice%%%%?status_textarea=%3$s)."
 msgstr ""
 
-#. TRANS: RSS reply feed description.
-#. TRANS: %1$s is a user nickname, %2$s is the StatusNet site name.
-#: actions/repliesrss.php:74
+#: actions/repliesrss.php:72
 #, fuzzy, php-format
-msgid "Replies to %1$s on %2$s."
+msgid "Replies to %1$s on %2$s!"
 msgstr "%s에 답신"
 
 #. TRANS: Client exception displayed when trying to restore an account while not logged in.
@@ -5351,7 +5281,7 @@ msgstr "이 사이트의 이용자에 대해 권한정지 할 수 없습니다."
 msgid "User doesn't have this role."
 msgstr "이용자가 프로필을 가지고 있지 않습니다."
 
-#: actions/rsd.php:142 actions/version.php:159
+#: actions/rsd.php:146 actions/version.php:159
 msgid "StatusNet"
 msgstr "StatusNet %s"
 
@@ -5393,94 +5323,94 @@ msgstr ""
 msgid "Save site settings"
 msgstr "접근 설정을 저장"
 
-#: actions/showapplication.php:78
+#: actions/showapplication.php:82
 msgid "You must be logged in to view an application."
 msgstr "응용 프로그램 수정을 위해서는 로그인해야 합니다."
 
-#: actions/showapplication.php:151
+#: actions/showapplication.php:157
 msgid "Application profile"
 msgstr "신규 응용 프로그램"
 
 #. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:153 lib/applicationeditform.php:177
+#: actions/showapplication.php:159 lib/applicationeditform.php:177
 msgid "Icon"
 msgstr "아이콘"
 
 #. TRANS: Form input field label for application name.
-#: actions/showapplication.php:163 actions/version.php:197
+#: actions/showapplication.php:169 actions/version.php:197
 #: lib/applicationeditform.php:190
 msgid "Name"
 msgstr "이름"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:172 lib/applicationeditform.php:227
+#: actions/showapplication.php:178 lib/applicationeditform.php:227
 msgid "Organization"
 msgstr "기관 이름이 필요합니다."
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:181 actions/version.php:200
+#: actions/showapplication.php:187 actions/version.php:200
 #: lib/applicationeditform.php:208 lib/groupeditform.php:168
 msgid "Description"
 msgstr "설명"
 
 #. TRANS: Header for group statistics on a group page (h2).
 #. TRANS: H2 text for user statistics.
-#: actions/showapplication.php:186 actions/showgroup.php:460
+#: actions/showapplication.php:192 actions/showgroup.php:460
 #: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "통계"
 
-#: actions/showapplication.php:197
+#: actions/showapplication.php:203
 #, php-format
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr ""
 
-#: actions/showapplication.php:207
+#: actions/showapplication.php:213
 msgid "Application actions"
 msgstr "인증 코드가 없습니다."
 
-#: actions/showapplication.php:230
+#: actions/showapplication.php:236
 msgid "Reset key & secret"
 msgstr ""
 
 #. TRANS: Title of form for deleting a user.
-#: actions/showapplication.php:246 lib/deletegroupform.php:121
+#: actions/showapplication.php:252 lib/deletegroupform.php:121
 #: lib/deleteuserform.php:64 lib/noticelist.php:673
 msgid "Delete"
 msgstr "삭제"
 
-#: actions/showapplication.php:255
+#: actions/showapplication.php:261
 msgid "Application info"
 msgstr "인증 코드가 없습니다."
 
-#: actions/showapplication.php:257
+#: actions/showapplication.php:263
 msgid "Consumer key"
 msgstr ""
 
-#: actions/showapplication.php:262
+#: actions/showapplication.php:268
 msgid "Consumer secret"
 msgstr ""
 
-#: actions/showapplication.php:267
+#: actions/showapplication.php:273
 msgid "Request token URL"
 msgstr ""
 
-#: actions/showapplication.php:272
+#: actions/showapplication.php:278
 msgid "Access token URL"
 msgstr ""
 
-#: actions/showapplication.php:277
+#: actions/showapplication.php:283
 #, fuzzy
 msgid "Authorize URL"
 msgstr "작성자"
 
-#: actions/showapplication.php:282
+#: actions/showapplication.php:288
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
 msgstr ""
 
-#: actions/showapplication.php:302
+#: actions/showapplication.php:309
 #, fuzzy
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr "정말로 통지를 삭제하시겠습니까?"
@@ -5566,18 +5496,16 @@ msgid "Group profile"
 msgstr "그룹 프로필"
 
 #. TRANS: Label for group URL (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT for URL in a profile.
 #: actions/showgroup.php:273 actions/tagother.php:118
-#: actions/userauthorization.php:184 lib/userprofile.php:186
+#: actions/userauthorization.php:175 lib/userprofile.php:186
 msgid "URL"
 msgstr "URL"
 
 #. TRANS: Label for group description or group note (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page where bio is displayed.
 #. TRANS: DT for note in a profile.
 #: actions/showgroup.php:285 actions/tagother.php:128
-#: actions/userauthorization.php:197 lib/userprofile.php:204
+#: actions/userauthorization.php:187 lib/userprofile.php:204
 msgid "Note"
 msgstr "설명"
 
@@ -5719,7 +5647,7 @@ msgid "%1$s tagged %2$s"
 msgstr "%s 및 친구들, %d 페이지"
 
 #. TRANS: Page title showing tagged notices in one user's stream.
-#. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
+#. TRANS: %1$s is the username, %2$s is the hash tag, %1$d is the page number.
 #: actions/showstream.php:74
 #, fuzzy, php-format
 msgid "%1$s tagged %2$s, page %3$d"
@@ -5961,7 +5889,7 @@ msgstr ""
 #. TRANS: Title for button to save site notice in admin panel.
 #: actions/sitenoticeadminpanel.php:201
 #, fuzzy
-msgid "Save site notice."
+msgid "Save site notice"
 msgstr "사이트 공지"
 
 #. TRANS: Title for SMS settings.
@@ -6021,7 +5949,7 @@ msgstr "휴대폰 번호가 없습니다."
 #. TRANS: SMS phone number input field instructions in SMS settings form.
 #: actions/smssettings.php:152
 #, fuzzy
-msgid "Phone number, no punctuation or spaces, with area code."
+msgid "Phone number, no punctuation or spaces, with area code"
 msgstr "지역번호와 함께 띄어쓰기 없이 번호를 적어 주세요."
 
 #. TRANS: Form legend for SMS preferences form.
@@ -6191,20 +6119,16 @@ msgstr "당신은 이 프로필에 구독되지 않고있습니다."
 msgid "Could not save subscription."
 msgstr "구독을 저장할 수 없습니다."
 
-#. TRANS: Client error displayed trying to perform any request method other than POST.
-#. TRANS: Do not translate POST.
 #: actions/subscribe.php:77
 msgid "This action only accepts POST requests."
 msgstr ""
 
-#. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
-#: actions/subscribe.php:121
+#: actions/subscribe.php:117
 #, fuzzy
 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
 msgstr "당신은 이 프로필에 구독되지 않고있습니다."
 
-#. TRANS: Page title when subscription succeeded.
-#: actions/subscribe.php:149
+#: actions/subscribe.php:145
 msgid "Subscribed"
 msgstr "구독하였습니다."
 
@@ -6354,9 +6278,8 @@ msgstr "태그 %s"
 msgid "User profile"
 msgstr "이용자 프로필"
 
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT element in area for user avatar.
-#: actions/tagother.php:81 actions/userauthorization.php:138
+#: actions/tagother.php:81 actions/userauthorization.php:132
 #: lib/userprofile.php:108
 msgid "Photo"
 msgstr "사진"
@@ -6373,11 +6296,6 @@ msgstr ""
 "사용자를 위한 태그 (문자,숫자, -, . ,그리고 _), 콤마 혹은 공백으로 분리하세"
 "요."
 
-#: actions/tagother.php:178
-#, php-format
-msgid "Invalid tag: \"%s\""
-msgstr "올바르지 않은 태그: \"%s\""
-
 #: actions/tagother.php:193
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
@@ -6392,7 +6310,6 @@ msgstr "당신의 구독자나 구독하는 사람에 태깅을 위해 이 양
 msgid "No such tag."
 msgstr "그러한 태그가 없습니다."
 
-#. TRANS: Client error displayed when trying to unblock a non-blocked user.
 #: actions/unblock.php:59
 msgid "You haven't blocked that user."
 msgstr "이미 차단된 이용자입니다."
@@ -6413,7 +6330,7 @@ msgstr "해당 ID의 프로필이 없습니다."
 msgid "Unsubscribed"
 msgstr "구독취소 되었습니다."
 
-#: actions/updateprofile.php:64
+#: actions/updateprofile.php:64 actions/userauthorization.php:337
 #, php-format
 msgid ""
 "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
@@ -6444,7 +6361,7 @@ msgstr ""
 #. TRANS: users in user admin panel. %1$s is the invalid nickname.
 #: actions/useradminpanel.php:166
 #, php-format
-msgid "Invalid default subscripton: \"%1$s\" is not a user."
+msgid "Invalid default subscripton: '%1$s' is not a user."
 msgstr ""
 
 #. TRANS: Link description in user account settings menu.
@@ -6510,69 +6427,58 @@ msgstr ""
 #. TRANS: Title for button to save user settings in user admin panel.
 #: actions/useradminpanel.php:302
 #, fuzzy
-msgid "Save user settings."
+msgid "Save user settings"
 msgstr "접근 설정을 저장"
 
-#. TRANS: Page title.
-#: actions/userauthorization.php:109
+#: actions/userauthorization.php:105
 msgid "Authorize subscription"
 msgstr "구독을 허가"
 
-#. TRANS: Page notice on "Auhtorize subscription" page.
-#: actions/userauthorization.php:115
+#: actions/userauthorization.php:110
 #, fuzzy
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
 "user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
-"click \"Reject\"."
+"click “Reject”."
 msgstr ""
 "사용자의 통지를 구독하려면 상세를 확인해 주세요. 구독하지 않는 경우는, \"취소"
 "\"를 클릭해 주세요."
 
-#. TRANS: DT element on Authorise Subscription page where license is displayed.
 #. TRANS: Menu item for site administration
-#: actions/userauthorization.php:207 actions/version.php:167
+#: actions/userauthorization.php:196 actions/version.php:167
 #: lib/adminpanelaction.php:403
 msgid "License"
 msgstr "라이센스"
 
-#. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:229
+#: actions/userauthorization.php:217
 #, fuzzy
-msgctxt "BUTTON"
 msgid "Accept"
 msgstr "수락"
 
-#. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:231
-#, fuzzy
-msgid "Subscribe to this user."
+#: actions/userauthorization.php:218 lib/subscribeform.php:115
+#: lib/subscribeform.php:139
+msgid "Subscribe to this user"
 msgstr "이 회원을 구독합니다."
 
-#. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:233
+#: actions/userauthorization.php:219
 #, fuzzy
-msgctxt "BUTTON"
 msgid "Reject"
 msgstr "거부"
 
-#. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:235
+#: actions/userauthorization.php:220
 #, fuzzy
-msgid "Reject this subscription."
+msgid "Reject this subscription"
 msgstr "%s 구독"
 
-#. TRANS: Client error displayed for an empty authorisation request.
-#: actions/userauthorization.php:248
+#: actions/userauthorization.php:232
 msgid "No authorization request!"
 msgstr "허용되지 않는 요청입니다."
 
-#. TRANS: Accept message header from Authorise subscription page.
-#: actions/userauthorization.php:271
+#: actions/userauthorization.php:254
 msgid "Subscription authorized"
 msgstr "구독 허가"
 
-#: actions/userauthorization.php:274
+#: actions/userauthorization.php:256
 #, fuzzy
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
@@ -6582,12 +6488,11 @@ msgstr ""
 "구독이 승인 되었습니다. 하지만 콜백 URL이 통과 되지 않았습니다. 웹사이트의 지"
 "시를 찾아 구독 승인 방법에 대하여 읽어보십시오. 귀하의 구독 토큰은 : "
 
-#. TRANS: Reject message header from Authorise subscription page.
-#: actions/userauthorization.php:285
+#: actions/userauthorization.php:266
 msgid "Subscription rejected"
 msgstr "구독 거부"
 
-#: actions/userauthorization.php:288
+#: actions/userauthorization.php:268
 #, fuzzy
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
@@ -6597,62 +6502,39 @@ msgstr ""
 "구독이 해지 되었습니다. 하지만 콜백 URL이 통과 되지 않았습니다. 웹사이트의 지"
 "시를 찾아 구독 해지 방법에 대하여 읽어보십시오."
 
-#. TRANS: Exception thrown when no valid user is found for an authorisation request.
-#. TRANS: %s is a listener URI.
-#: actions/userauthorization.php:325
+#: actions/userauthorization.php:303
 #, php-format
-msgid "Listener URI \"%s\" not found here."
+msgid "Listener URI ‘%s’ not found here."
 msgstr ""
 
-#. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:332
+#: actions/userauthorization.php:308
 #, fuzzy, php-format
-msgid "Listenee URI \"%s\" is too long."
+msgid "Listenee URI ‘%s’ is too long."
 msgstr "소스 URL이 너무 깁니다."
 
-#. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:340
-#, php-format
-msgid "Listenee URI \"%s\" is a local user."
-msgstr ""
-
-#. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
-#. TRANS: %s is a profile URL.
-#: actions/userauthorization.php:358
-#, php-format
-msgid "Profile URL \"%s\" is for a local user."
-msgstr ""
-
-#. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
-#. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
-#: actions/userauthorization.php:368
-#, php-format
-msgid ""
-"Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
-"\"."
-msgstr ""
-
-#. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:378
+#: actions/userauthorization.php:314
 #, fuzzy, php-format
-msgid "Avatar URL \"%s\" is not valid."
+msgid "Listenee URI ‘%s’ is a local user."
+msgstr "소스 URL이 너무 깁니다."
+
+#: actions/userauthorization.php:329
+#, php-format
+msgid "Profile URL ‘%s’ is for a local user."
+msgstr ""
+
+#: actions/userauthorization.php:345
+#, fuzzy, php-format
+msgid "Avatar URL ‘%s’ is not valid."
 msgstr "소스 URL이 올바르지 않습니다."
 
-#. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:385
+#: actions/userauthorization.php:350
 #, fuzzy, php-format
-msgid "Cannot read avatar URL \"%s\"."
+msgid "Can’t read avatar URL ‘%s’."
 msgstr "아바타 URL '%s'을(를) 읽어낼 수 없습니다."
 
-#. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:392
+#: actions/userauthorization.php:355
 #, fuzzy, php-format
-msgid "Wrong image type for avatar URL \"%s\"."
+msgid "Wrong image type for avatar URL ‘%s’."
 msgstr "%S 잘못된 그림 파일 타입입니다. "
 
 #. TRANS: Page title for profile design page.
@@ -6758,7 +6640,7 @@ msgid "Plugins"
 msgstr "플러그인"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:898
+#: actions/version.php:198 lib/action.php:901
 msgid "Version"
 msgstr "버전"
 
@@ -6966,14 +6848,14 @@ msgstr "통지를 저장하는데 문제가 발생했습니다."
 
 #. TRANS: Server exception thrown when a reply cannot be saved.
 #. TRANS: %1$d is a notice ID, %2$d is the ID of the mentioned user.
-#: classes/Notice.php:1142
+#: classes/Notice.php:1144
 #, fuzzy, php-format
 msgid "Could not save reply for %1$d, %2$d."
 msgstr "새 그룹을 만들 수 없습니다."
 
 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1661
+#: classes/Notice.php:1663
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
@@ -6987,14 +6869,14 @@ msgstr "%1$s (%2$s)"
 
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:775
+#: classes/Profile.php:779
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:784
+#: classes/Profile.php:788
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -7315,53 +7197,53 @@ msgid "Page notice"
 msgstr "페이지 공지"
 
 #. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:871
+#: lib/action.php:874
 msgid "Secondary site navigation"
 msgstr "보조 사이트 네비게이션"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:877
+#: lib/action.php:880
 msgid "Help"
 msgstr "도움말"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:880
+#: lib/action.php:883
 msgid "About"
 msgstr "정보"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:883
+#: lib/action.php:886
 msgid "FAQ"
 msgstr "자주 묻는 질문"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:888
+#: lib/action.php:891
 msgid "TOS"
 msgstr "서비스 약관"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:892
+#: lib/action.php:895
 msgid "Privacy"
 msgstr "개인정보 취급방침"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:895
+#: lib/action.php:898
 msgid "Source"
 msgstr "소스 코드"
 
 #. TRANS: Secondary navigation menu option leading to e-mail contact information on the
 #. TRANS: StatusNet site, where to report bugs, ...
-#: lib/action.php:902
+#: lib/action.php:905
 msgid "Contact"
 msgstr "연락하기"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:905
+#: lib/action.php:908
 msgid "Badge"
 msgstr "배지"
 
 #. TRANS: DT element for StatusNet software license.
-#: lib/action.php:934
+#: lib/action.php:937
 msgid "StatusNet software license"
 msgstr "StatusNet 소프트웨어 라이선스"
 
@@ -7369,7 +7251,7 @@ msgstr "StatusNet 소프트웨어 라이선스"
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:941
+#: lib/action.php:944
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7379,7 +7261,7 @@ msgstr ""
 "공하는 마이크로블로깅서비스입니다."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:944
+#: lib/action.php:947
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** 는 마이크로블로깅서비스입니다."
@@ -7388,7 +7270,7 @@ msgstr "**%%site.name%%** 는 마이크로블로깅서비스입니다."
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:951
+#: lib/action.php:954
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7400,51 +7282,51 @@ msgstr ""
 "fsf.org/licensing/licenses/agpl-3.0.html) 라이선스에 따라 사용할 수 있습니다."
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:967
+#: lib/action.php:970
 msgid "Site content license"
 msgstr "사이트 컨텐츠 라이선스"
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:974
+#: lib/action.php:977
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr "%1$s의 컨텐츠와 데이터는 외부 유출을 금지합니다."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:981
+#: lib/action.php:984
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr "컨텐츠와 데이터의 저작권은 %1$s의 소유입니다. All rights reserved."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:985
+#: lib/action.php:988
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 "컨텐츠와 데이터의 저작권은 각 이용자의 소유입니다. All rights reserved."
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:1017
+#: lib/action.php:1020
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr "%1$s의 모든 컨텐츠와 데이터는 %2$s 라이선스에 따라 이용할 수 있습니다."
 
 #. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1353
+#: lib/action.php:1356
 msgid "Pagination"
 msgstr "페이지수"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1364
+#: lib/action.php:1367
 msgid "After"
 msgstr "뒷 페이지"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1374
+#: lib/action.php:1377
 msgid "Before"
 msgstr "앞 페이지"
 
@@ -7645,23 +7527,19 @@ msgstr ""
 msgid "No application for that consumer key."
 msgstr ""
 
-#: lib/apiauth.php:202 lib/apiauth.php:284
-msgid "Not allowed to use API."
-msgstr ""
-
 #. TRANS: OAuth exception given when an incorrect access token was given for a user.
-#: lib/apiauth.php:225
+#: lib/apiauth.php:219
 msgid "Bad access token."
 msgstr ""
 
 #. TRANS: OAuth exception given when no user was found for a given token (no token was found).
-#: lib/apiauth.php:230
+#: lib/apiauth.php:224
 msgid "No user for that token."
 msgstr ""
 
 #. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel".
 #. TRANS: Client error thrown when authentication fails.
-#: lib/apiauth.php:272 lib/apiauth.php:302
+#: lib/apiauth.php:266 lib/apiauth.php:293
 msgid "Could not authenticate you."
 msgstr ""
 
@@ -7870,11 +7748,6 @@ msgstr "비밀번호 변경"
 msgid "Block"
 msgstr "차단하기"
 
-#. TRANS: Description of the form to block a user.
-#: lib/blockform.php:79
-msgid "Block this user"
-msgstr "이 사용자 차단하기"
-
 #. TRANS: Title for command results.
 #: lib/channel.php:160 lib/channel.php:181
 msgid "Command results"
@@ -7904,7 +7777,7 @@ msgstr "해당 id의 프로필이 없습니다."
 
 #. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
 #. TRANS: Error text shown when a last user notice is requested and it does not exist.
-#: lib/command.php:99 lib/command.php:630
+#: lib/command.php:99 lib/command.php:642
 #, fuzzy
 msgid "User has no last notice."
 msgstr "이용자의 지속적인 게시글이 없습니다."
@@ -7952,35 +7825,41 @@ msgid ""
 "Notices: %3$s"
 msgstr ""
 
+#. TRANS: Error message text shown when a favorite could not be set because it has already been favorited.
+#: lib/command.php:298
+#, fuzzy
+msgid "Could not create favorite: already favorited."
+msgstr "관심소식을 생성할 수 없습니다."
+
 #. TRANS: Text shown when a notice has been marked as favourite successfully.
-#: lib/command.php:312
+#: lib/command.php:324
 msgid "Notice marked as fave."
 msgstr "게시글이 좋아하는 글로 지정되었습니다."
 
 #. TRANS: Message given having added a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:357
+#: lib/command.php:369
 #, php-format
 msgid "%1$s joined group %2$s."
 msgstr ""
 
 #. TRANS: Message given having removed a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:405
+#: lib/command.php:417
 #, php-format
 msgid "%1$s left group %2$s."
 msgstr ""
 
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: lib/command.php:426
+#: lib/command.php:438
 #, fuzzy, php-format
 msgctxt "WHOIS"
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
 
 #. TRANS: Whois output. %s is the full name of the queried user.
-#: lib/command.php:430
+#: lib/command.php:442
 #, php-format
 msgid "Fullname: %s"
 msgstr "전체이름: %s"
@@ -7988,7 +7867,7 @@ msgstr "전체이름: %s"
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a location.
-#: lib/command.php:434 lib/mail.php:270
+#: lib/command.php:446 lib/mail.php:270
 #, php-format
 msgid "Location: %s"
 msgstr "위치: %s"
@@ -7996,20 +7875,20 @@ msgstr "위치: %s"
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a homepage.
-#: lib/command.php:438 lib/mail.php:274
+#: lib/command.php:450 lib/mail.php:274
 #, php-format
 msgid "Homepage: %s"
 msgstr "홈페이지: %s"
 
 #. TRANS: Whois output. %s is the bio information of the queried user.
-#: lib/command.php:442
+#: lib/command.php:454
 #, php-format
 msgid "About: %s"
 msgstr "자기소개: %s"
 
 #. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).
 #. TRANS: %s is a remote profile.
-#: lib/command.php:471
+#: lib/command.php:483
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
@@ -8018,32 +7897,32 @@ msgstr ""
 
 #. TRANS: Message given if content is too long. %1$sd is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:488
+#: lib/command.php:500
 #, fuzzy, php-format
 msgid "Message too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
 msgstr[0] "당신이 보낸 메시지가 너무 길어요. 최대 140글자까지입니다."
 
 #. TRANS: Error text shown sending a direct message fails with an unknown reason.
-#: lib/command.php:516
+#: lib/command.php:528
 msgid "Error sending direct message."
 msgstr "직접 메시지 보내기 오류."
 
 #. TRANS: Message given having repeated a notice from another user.
 #. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:553
+#: lib/command.php:565
 #, fuzzy, php-format
 msgid "Notice from %s repeated."
 msgstr "게시글이 등록되었습니다."
 
 #. TRANS: Error text shown when repeating a notice fails with an unknown reason.
-#: lib/command.php:556
+#: lib/command.php:568
 msgid "Error repeating notice."
 msgstr "사용자 세팅 오류"
 
 #. TRANS: Message given if content of a notice for a reply is too long. %1$d is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:591
+#: lib/command.php:603
 #, fuzzy, php-format
 msgid "Notice too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Notice too long - maximum is %1$d characters, you sent %2$d."
@@ -8051,96 +7930,96 @@ msgstr[0] "당신이 보낸 메시지가 너무 길어요. 최대 140글자까
 
 #. TRANS: Text shown having sent a reply to a notice successfully.
 #. TRANS: %s is the nickname of the user of the notice the reply was sent to.
-#: lib/command.php:604
+#: lib/command.php:616
 #, fuzzy, php-format
 msgid "Reply to %s sent."
 msgstr "이 게시글에 대해 답장하기"
 
 #. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
-#: lib/command.php:607
+#: lib/command.php:619
 msgid "Error saving notice."
 msgstr "사용자 세팅 오류"
 
 #. TRANS: Error text shown when no username was provided when issuing a subscribe command.
-#: lib/command.php:654
+#: lib/command.php:666
 #, fuzzy
 msgid "Specify the name of the user to subscribe to."
 msgstr "구독하려는 사용자의 이름을 지정하십시오."
 
 #. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
-#: lib/command.php:663
+#: lib/command.php:675
 #, fuzzy
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "당신은 이 프로필에 구독되지 않고있습니다."
 
 #. TRANS: Text shown after having subscribed to another user successfully.
 #. TRANS: %s is the name of the user the subscription was requested for.
-#: lib/command.php:671
+#: lib/command.php:683
 #, php-format
 msgid "Subscribed to %s."
 msgstr ""
 
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.
-#: lib/command.php:692 lib/command.php:803
+#: lib/command.php:704 lib/command.php:815
 #, fuzzy
 msgid "Specify the name of the user to unsubscribe from."
 msgstr "구독을 해제하려는 사용자의 이름을 지정하십시오."
 
 #. TRANS: Text shown after having unsubscribed from another user successfully.
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:703
+#: lib/command.php:715
 #, php-format
 msgid "Unsubscribed from %s."
 msgstr ""
 
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
-#: lib/command.php:723 lib/command.php:749
+#: lib/command.php:735 lib/command.php:761
 msgid "Command not yet implemented."
 msgstr "명령이 아직 실행되지 않았습니다."
 
 #. TRANS: Text shown when issuing the command "off" successfully.
-#: lib/command.php:727
+#: lib/command.php:739
 msgid "Notification off."
 msgstr "알림끄기."
 
 #. TRANS: Error text shown when the command "off" fails for an unknown reason.
-#: lib/command.php:730
+#: lib/command.php:742
 msgid "Can't turn off notification."
 msgstr "알림을 끌 수 없습니다."
 
 #. TRANS: Text shown when issuing the command "on" successfully.
-#: lib/command.php:753
+#: lib/command.php:765
 msgid "Notification on."
 msgstr "알림이 켜졌습니다."
 
 #. TRANS: Error text shown when the command "on" fails for an unknown reason.
-#: lib/command.php:756
+#: lib/command.php:768
 msgid "Can't turn on notification."
 msgstr "알림을 켤 수 없습니다."
 
 #. TRANS: Error text shown when issuing the login command while login is disabled.
-#: lib/command.php:770
+#: lib/command.php:782
 msgid "Login command is disabled."
 msgstr ""
 
 #. TRANS: Text shown after issuing the login command successfully.
 #. TRANS: %s is a logon link..
-#: lib/command.php:783
+#: lib/command.php:795
 #, php-format
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
 
 #. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:812
+#: lib/command.php:824
 #, php-format
 msgid "Unsubscribed %s."
 msgstr ""
 
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
-#: lib/command.php:830
+#: lib/command.php:842
 #, fuzzy
 msgid "You are not subscribed to anyone."
 msgstr "당신은 이 프로필에 구독되지 않고있습니다."
@@ -8148,14 +8027,14 @@ msgstr "당신은 이 프로필에 구독되지 않고있습니다."
 #. TRANS: Text shown after requesting other users a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
-#: lib/command.php:835
+#: lib/command.php:847
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "당신은 다음 사용자를 이미 구독하고 있습니다."
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user
 #. TRANS: (followers) without having any subscribers.
-#: lib/command.php:857
+#: lib/command.php:869
 #, fuzzy
 msgid "No one is subscribed to you."
 msgstr "다른 사람을 구독 하실 수 없습니다."
@@ -8163,14 +8042,14 @@ msgstr "다른 사람을 구독 하실 수 없습니다."
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
-#: lib/command.php:862
+#: lib/command.php:874
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "다른 사람을 구독 하실 수 없습니다."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to without having
 #. TRANS: any group subscriptions.
-#: lib/command.php:884
+#: lib/command.php:896
 #, fuzzy
 msgid "You are not a member of any groups."
 msgstr "당신은 해당 그룹의 멤버가 아닙니다."
@@ -8178,13 +8057,13 @@ msgstr "당신은 해당 그룹의 멤버가 아닙니다."
 #. TRANS: Text shown after requesting groups a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
-#: lib/command.php:889
+#: lib/command.php:901
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "당신은 해당 그룹의 멤버가 아닙니다."
 
 #. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-#: lib/command.php:904
+#: lib/command.php:916
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -8290,11 +8169,6 @@ msgstr "응용프로그램 삭제"
 msgid "Database error"
 msgstr "데이터베이스 오류"
 
-#. TRANS: Description of form for deleting a user.
-#: lib/deleteuserform.php:75
-msgid "Delete this user"
-msgstr "이 사용자 삭제"
-
 #. TRANS: Label in form on profile design page.
 #. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
 #: lib/designsettings.php:108
@@ -8331,21 +8205,6 @@ msgstr "색상 변경"
 msgid "Use defaults"
 msgstr "기본값 사용"
 
-#. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: lib/designsettings.php:259
-msgid "Restore default designs"
-msgstr ""
-
-#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: lib/designsettings.php:267
-msgid "Reset back to default"
-msgstr ""
-
-#. TRANS: Title for button on profile design page to save settings.
-#: lib/designsettings.php:272
-msgid "Save design"
-msgstr "디자인 저장"
-
 #. TRANS: Error message displayed if design settings could not be saved.
 #. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
 #: lib/designsettings.php:405 lib/designsettings.php:427
@@ -9122,10 +8981,6 @@ msgstr "이 게시글에 대해 답장하기"
 msgid "Reply"
 msgstr "답장하기"
 
-#: lib/noticelist.php:673
-msgid "Delete this notice"
-msgstr "이 게시글 삭제하기"
-
 #: lib/noticelist.php:691
 #, fuzzy
 msgid "Notice repeated"
@@ -9414,10 +9269,6 @@ msgstr "초대"
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "%s에 친구를 가입시키기 위해 친구와 동료를 초대합니다."
 
-#: lib/subscribeform.php:115 lib/subscribeform.php:139
-msgid "Subscribe to this user"
-msgstr "이 회원을 구독합니다."
-
 #: lib/subscriberspeopleselftagcloudsection.php:48
 #: lib/subscriptionspeopleselftagcloudsection.php:48
 msgid "People Tagcloud as self-tagged"
@@ -9589,66 +9440,61 @@ msgctxt "role"
 msgid "Moderator"
 msgstr ""
 
-#: lib/util.php:305
-#, fuzzy
-msgid "Not allowed to log in."
-msgstr "로그인하고 있지 않습니다."
-
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1309
+#: lib/util.php:1306
 msgid "a few seconds ago"
 msgstr "몇 초 전"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1312
+#: lib/util.php:1309
 msgid "about a minute ago"
 msgstr "1분 전"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1316
+#: lib/util.php:1313
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
 msgstr[0] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1319
+#: lib/util.php:1316
 msgid "about an hour ago"
 msgstr "1시간 전"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1323
+#: lib/util.php:1320
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
 msgstr[0] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1326
+#: lib/util.php:1323
 msgid "about a day ago"
 msgstr "하루 전"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1330
+#: lib/util.php:1327
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
 msgstr[0] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1333
+#: lib/util.php:1330
 msgid "about a month ago"
 msgstr "1달 전"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1337
+#: lib/util.php:1334
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
 msgstr[0] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1340
+#: lib/util.php:1337
 msgid "about a year ago"
 msgstr "1년 전"
 
@@ -9689,3 +9535,63 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#, fuzzy
+#~ msgid "Block this user."
+#~ msgstr "이 사용자 차단하기"
+
+#, fuzzy
+#~ msgid "Delete this notice."
+#~ msgstr "이 게시글 삭제하기"
+
+#, fuzzy
+#~ msgid "Delete this user."
+#~ msgstr "이 사용자 삭제"
+
+#, fuzzy
+#~ msgid "Restore default designs."
+#~ msgstr "기본값 사용"
+
+#, fuzzy
+#~ msgid "Save design."
+#~ msgstr "디자인 저장"
+
+#, fuzzy
+#~ msgid "Disfavor favorite."
+#~ msgstr "좋아하는글 취소"
+
+#, fuzzy
+#~ msgid "\"%s\" not found."
+#~ msgstr "API 메서드 발견 안 됨."
+
+#, fuzzy
+#~ msgid "Notice %s not found."
+#~ msgstr "API 메서드 발견 안 됨."
+
+#, fuzzy
+#~ msgid "Attachment %s not found."
+#~ msgstr "받는 사용자가 없습니다."
+
+#, fuzzy
+#~ msgid "Invalid tag: \"%s\"."
+#~ msgstr "올바르지 않은 태그: \"%s\""
+
+#, fuzzy
+#~ msgid "%s updates from everyone."
+#~ msgstr "모두로부터의 업데이트 %s개!"
+
+#, fuzzy
+#~ msgid "Password saved"
+#~ msgstr "비밀 번호 저장"
+
+#, fuzzy
+#~ msgid "Where you are, like \"City, State (or Region), Country\"."
+#~ msgstr "당신은 어디에 삽니까? \"시, 도 (or 군,구), 나라\""
+
+#, fuzzy
+#~ msgid "Subscribe to this user."
+#~ msgstr "이 회원을 구독합니다."
+
+#, fuzzy
+#~ msgid "Not allowed to log in."
+#~ msgstr "로그인하고 있지 않습니다."
diff --git a/locale/mk/LC_MESSAGES/statusnet.po b/locale/mk/LC_MESSAGES/statusnet.po
index fdc9111de8..f544daef51 100644
--- a/locale/mk/LC_MESSAGES/statusnet.po
+++ b/locale/mk/LC_MESSAGES/statusnet.po
@@ -10,17 +10,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-24 10:32+0000\n"
-"PO-Revision-Date: 2011-02-24 10:37:13+0000\n"
+"POT-Creation-Date: 2011-03-03 15:58+0000\n"
+"PO-Revision-Date: 2011-03-03 16:01:01+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r82712); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
-"X-POT-Import-Date: 2011-02-17 11:39:54+0000\n"
+"X-POT-Import-Date: 2011-02-25 23:49:23+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -134,11 +134,7 @@ msgstr "Нема таква страница."
 #. 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 use "one time password login" without using an existing user.
-#. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
-#. TRANS: Client error displayed trying to find a user by ID for a non-existing ID.
-#. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when calling a profile action without specifying a user.
 #: actions/all.php:80 actions/allrss.php:69
@@ -156,12 +152,12 @@ msgstr "Нема таква страница."
 #: actions/apitimelinementions.php:77 actions/apitimelineuser.php:79
 #: actions/avatarbynickname.php:79 actions/favoritesrss.php:72
 #: actions/foaf.php:42 actions/foaf.php:61 actions/hcard.php:67
-#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:78
+#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
 #: actions/remotesubscribe.php:144 actions/remotesubscribe.php:153
-#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:113
-#: actions/showfavorites.php:106 actions/userbyid.php:75
+#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
+#: actions/showfavorites.php:106 actions/userbyid.php:74
 #: actions/usergroups.php:93 actions/userrss.php:40 actions/userxrd.php:59
-#: actions/xrds.php:71 lib/command.php:497 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:509 lib/galleryaction.php:59
 #: lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Нема таков корисник."
@@ -290,7 +286,7 @@ msgstr "Подновувања од %1$s и пријатели на %2$s!"
 #: actions/apigrouplistall.php:120 actions/apigroupmembership.php:105
 #: actions/apigroupshow.php:114 actions/apihelptest.php:84
 #: actions/apistatusesdestroy.php:101 actions/apistatusesretweets.php:110
-#: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:138
+#: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:139
 #: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
 #: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:268
 #: actions/apitimelinegroup.php:147 actions/apitimelinehome.php:173
@@ -521,7 +517,8 @@ msgstr "Примачот не е пронајден."
 
 #. TRANS: Client error displayed trying to direct message another user who's not a friend (403).
 #: actions/apidirectmessagenew.php:144
-msgid "Cannot send direct messages to users who aren't your friend."
+#, fuzzy
+msgid "Can't send direct messages to users who aren't your friend."
 msgstr ""
 "Не можете да испраќате непосредни пораки на корисници што не Ви се пријатели."
 
@@ -549,7 +546,7 @@ msgstr "Веќе сте го бендисале овој статус."
 #. TRANS: Client error displayed when marking a notice as favourite fails.
 #. TRANS: Server error displayed when trying to mark a notice as favorite fails in the database.
 #. TRANS: Error message text shown when a favorite could not be set.
-#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:294
+#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:306
 msgid "Could not create favorite."
 msgstr "Не можам да создадам бендисана забелешка."
 
@@ -608,7 +605,7 @@ msgstr "Не можев да го пронајдам целниот корисн
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:191
 #: actions/newgroup.php:137 actions/profilesettings.php:273
-#: actions/register.php:206
+#: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "Тој прекар е во употреба. Одберете друг."
 
@@ -618,7 +615,7 @@ msgstr "Тој прекар е во употреба. Одберете друг.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:195
 #: actions/newgroup.php:141 actions/profilesettings.php:243
-#: actions/register.php:208
+#: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "Неправилен прекар."
 
@@ -631,7 +628,7 @@ msgstr "Неправилен прекар."
 #: actions/apigroupcreate.php:181 actions/editapplication.php:235
 #: actions/editgroup.php:202 actions/newapplication.php:221
 #: actions/newgroup.php:148 actions/profilesettings.php:248
-#: actions/register.php:215
+#: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "Главната страница не е важечка URL-адреса."
 
@@ -641,7 +638,7 @@ msgstr "Главната страница не е важечка URL-адрес
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:191 actions/editgroup.php:206
 #: actions/newgroup.php:152 actions/profilesettings.php:252
-#: actions/register.php:218
+#: actions/register.php:226
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "Полното име е предолго (највеќе 255 знаци)."
 
@@ -669,7 +666,7 @@ msgstr[1] "Описот е предолг (дозволено е највеќе
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:215 actions/editgroup.php:218
 #: actions/newgroup.php:164 actions/profilesettings.php:265
-#: actions/register.php:227
+#: actions/register.php:235
 msgid "Location is too long (maximum 255 characters)."
 msgstr "Местоположбата е предолга (највеќе 255 знаци)."
 
@@ -725,14 +722,14 @@ msgstr "Групата не е пронајдена."
 #. TRANS: Server error displayed when trying to join a group the user is already a member of.
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:333
+#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:345
 msgid "You are already a member of that group."
 msgstr "Веќе членувате во таа група."
 
 #. TRANS: Server error displayed when trying to join a group the user is blocked from joining.
 #. 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.
-#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:338
+#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:350
 msgid "You have been blocked from that group by the admin."
 msgstr "Блокирани сте од таа група од администраторот."
 
@@ -742,7 +739,7 @@ msgstr "Блокирани сте од таа група од администр
 #. TRANS: %1$s is the joining user's nickname, $2$s is the group nickname for which the join failed.
 #. TRANS: Message given having failed to add a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:350
+#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:362
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "Не можам да го зачленам корисникот %1$s во групата 2$s."
@@ -759,7 +756,7 @@ msgstr "Не членувате во оваа група."
 #. TRANS: Message given having failed to remove a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
 #: actions/apigroupleave.php:127 actions/leavegroup.php:133
-#: lib/command.php:398
+#: lib/command.php:410
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
 msgstr "Не можев да го отстранам корисникот %1$s од групата %2$s."
@@ -819,21 +816,20 @@ msgstr "Жетонот за барање е веќе овластен."
 #. TRANS: Form validation error message.
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
-#. TRANS: Client error displayed when the session token is not okay.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
 #: actions/deletenotice.php:177 actions/disfavor.php:75
 #: actions/emailsettings.php:291 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:65 actions/grouplogo.php:321
 #: actions/groupunblock.php:65 actions/imsettings.php:224
-#: actions/invite.php:60 actions/login.php:131 actions/makeadmin.php:66
+#: actions/invite.php:60 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
-#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:136
-#: actions/othersettings.php:155 actions/passwordsettings.php:137
+#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
+#: actions/othersettings.php:155 actions/passwordsettings.php:138
 #: actions/profilesettings.php:217 actions/recoverpassword.php:383
-#: actions/register.php:164 actions/remotesubscribe.php:76
+#: actions/register.php:172 actions/remotesubscribe.php:76
 #: actions/repeat.php:82 actions/smssettings.php:250 actions/subedit.php:40
-#: actions/subscribe.php:87 actions/tagother.php:166
-#: actions/unsubscribe.php:69 actions/userauthorization.php:53
+#: actions/subscribe.php:86 actions/tagother.php:166
+#: actions/unsubscribe.php:69 actions/userauthorization.php:52
 #: lib/designsettings.php:310
 msgid "There was a problem with your session token. Try again, please."
 msgstr "Се поајви проблем со Вашиот сесиски жетон. Обидете се повторно."
@@ -864,7 +860,7 @@ msgstr "Грешка во базата при вметнувањето на auth
 #: actions/designadminpanel.php:100 actions/editapplication.php:144
 #: actions/emailsettings.php:310 actions/grouplogo.php:332
 #: actions/imsettings.php:239 actions/newapplication.php:124
-#: actions/oauthconnectionssettings.php:145 actions/recoverpassword.php:46
+#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
 #: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
 msgstr "Неочекувано поднесување на образец."
@@ -915,20 +911,19 @@ msgstr "Сметка"
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group nickname (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT for nick name in a profile.
-#: actions/apioauthauthorize.php:459 actions/login.php:242
-#: actions/profilesettings.php:106 actions/register.php:418
+#: actions/apioauthauthorize.php:459 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:432
 #: actions/showgroup.php:243 actions/tagother.php:94
-#: actions/userauthorization.php:152 lib/groupeditform.php:145
+#: actions/userauthorization.php:145 lib/groupeditform.php:145
 #: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "Прекар"
 
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:463 actions/login.php:245
-#: actions/register.php:422 lib/accountsettingsaction.php:120
+#: actions/apioauthauthorize.php:463 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:120
 msgid "Password"
 msgstr "Лозинка"
 
@@ -1023,13 +1018,13 @@ msgstr "Нема таква забелешка."
 
 #. TRANS: Client error displayed trying to repeat an own notice through the API.
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:537
+#: actions/apistatusesretweet.php:83 lib/command.php:549
 msgid "Cannot repeat your own notice."
 msgstr "Не можете да ја повторувате сопствената забелешка."
 
 #. TRANS: Client error displayed trying to re-repeat a notice through the API.
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:92 lib/command.php:543
+#: actions/apistatusesretweet.php:92 lib/command.php:555
 msgid "Already repeated that notice."
 msgstr "Забелешката е веќе повторена."
 
@@ -1050,8 +1045,8 @@ msgstr "HTML-методот не е поддржан."
 #. TRANS: Exception thrown requesting an unsupported notice output format.
 #. TRANS: %s is the requested output format.
 #: actions/apistatusesshow.php:144
-#, php-format
-msgid "Unsupported format: %s."
+#, fuzzy, php-format
+msgid "Unsupported format: %s"
 msgstr "Неподдржан формат: %s."
 
 #. TRANS: Client error displayed requesting a deleted status.
@@ -1158,14 +1153,13 @@ msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr "%1$s подновувања коишто се одговор на подновувањата од %2$s / %3$s."
 
 #. TRANS: Title for site timeline. %s is the StatusNet sitename.
-#. TRANS: Public RSS feed title. %s is the StatusNet site name.
 #: actions/apitimelinepublic.php:193 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "Јавна историја на %s"
 
 #. TRANS: Subtitle for site timeline. %s is the StatusNet sitename.
-#: actions/apitimelinepublic.php:199
+#: actions/apitimelinepublic.php:199 actions/publicrss.php:105
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "%s подновуввања од сите!"
@@ -1230,26 +1224,25 @@ msgid "Atom post must be an Atom entry."
 msgstr "Забелешката преку Atom мора да биде Atom-ставка."
 
 #. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
-#: actions/apitimelineuser.php:334
+#: actions/apitimelineuser.php:335
 msgid "Can only handle POST activities."
 msgstr "Може да работи само со POST-активности."
 
 #. TRANS: Client error displayed when using an unsupported activity object type.
 #. TRANS: %s is the unsupported activity object type.
-#: actions/apitimelineuser.php:345
+#: actions/apitimelineuser.php:346
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr "Не може да работи со предмети на активност од типот „%s“."
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
 #. TRANS: %d is the notice ID (number).
-#: actions/apitimelineuser.php:379
+#: actions/apitimelineuser.php:380
 #, php-format
 msgid "No content for notice %d."
 msgstr "Нема содржина за забелешката %d."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#. TRANS: %s is the notice URI.
 #: actions/apitimelineuser.php:408
 #, php-format
 msgid "Notice with URI \"%s\" already exists."
@@ -1267,10 +1260,9 @@ msgstr "Корисникот не е пронајден."
 
 #. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
 #. TRANS: Client exception.
-#. TRANS: Client error displayed trying to subscribe to a non-existing profile.
 #: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
 #: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
-#: actions/subscribe.php:110
+#: actions/subscribe.php:107
 msgid "No such profile."
 msgstr "Нема таков профил."
 
@@ -1395,7 +1387,7 @@ msgstr "Не можам да избришам туѓo бендисанo."
 #: actions/joingroup.php:95 actions/leavegroup.php:82
 #: actions/leavegroup.php:95 actions/makeadmin.php:86
 #: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:380
+#: lib/command.php:392
 msgid "No such group."
 msgstr "Нема таква група."
 
@@ -1405,7 +1397,7 @@ msgid "Not a member."
 msgstr "Не членувате."
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
-#: actions/atompubshowmembership.php:150
+#: actions/atompubshowmembership.php:151
 msgid "Cannot delete someone else's membership."
 msgstr "Не можам да избришам туѓо членство."
 
@@ -1510,11 +1502,9 @@ msgstr ""
 
 #. TRANS: Server error displayed in avatar upload page when no matching profile can be found for a user.
 #. TRANS: Server error displayed coming across a request from a user without a profile.
-#. TRANS: Server error displayed when trying to authorise a remote subscription request
-#. TRANS: while the user has no profile.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
 #: actions/grouplogo.php:184 actions/remotesubscribe.php:190
-#: actions/userauthorization.php:75 actions/userrss.php:108
+#: actions/userauthorization.php:72 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr "Корисник без соодветен профил."
 
@@ -1569,9 +1559,10 @@ msgstr "Отсечи"
 msgid "No file uploaded."
 msgstr "Нема подигнато податотека."
 
-#. TRANS: Avatar upload form instruction after uploading a file.
+#. TRANS: Avatar upload form unstruction after uploading a file.
 #: actions/avatarsettings.php:345
-msgid "Pick a square area of the image to be your avatar."
+#, fuzzy
+msgid "Pick a square area of the image to be your avatar"
 msgstr "Одберете квадратна површина од сликата за аватар."
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
@@ -1612,7 +1603,7 @@ msgid "You may not backup your account."
 msgstr "Не можете да направите резрвна верзија на Вашата сметка."
 
 #. TRANS: Information displayed on the backup account page.
-#: actions/backupaccount.php:225
+#: actions/backupaccount.php:227
 msgid ""
 "You can backup your account data in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format. This is an experimental feature and provides "
@@ -1627,14 +1618,15 @@ msgstr ""
 "резервата не се зачувуваат и подигнатите податотеки и непосредните пораки."
 
 #. TRANS: Submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:248
+#: actions/backupaccount.php:250
 msgctxt "BUTTON"
 msgid "Backup"
 msgstr "Резерва"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:252
-msgid "Backup your account."
+#: actions/backupaccount.php:254
+#, fuzzy
+msgid "Backup your account"
 msgstr "Направете резервна верзија на сметката."
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
@@ -1676,7 +1668,8 @@ msgstr "Не"
 
 #. TRANS: Submit button title for 'No' when blocking a user.
 #: actions/block.php:158
-msgid "Do not block this user."
+#, fuzzy
+msgid "Do not block this user"
 msgstr "Не го блокирај корисников."
 
 #. TRANS: Button label on the user block form.
@@ -1693,9 +1686,10 @@ msgid "Yes"
 msgstr "Да"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:165
-msgid "Block this user."
-msgstr "Блокирај го корисников."
+#. TRANS: Description of the form to block a user.
+#: actions/block.php:165 lib/blockform.php:79
+msgid "Block this user"
+msgstr "Блокирај го корисников"
 
 #. TRANS: Server error displayed when blocking a user fails.
 #: actions/block.php:189
@@ -1856,7 +1850,7 @@ msgstr ""
 #. TRANS: Field label for delete account confirmation entry.
 #. TRANS: Field label for password reset form where the password has to be typed again.
 #: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:262 actions/register.php:426
+#: actions/recoverpassword.php:262 actions/register.php:440
 msgid "Confirm"
 msgstr "Потврди"
 
@@ -1885,14 +1879,14 @@ msgstr "Програмот не е пронајден."
 #. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
 #: actions/deleteapplication.php:79 actions/editapplication.php:78
-#: actions/showapplication.php:90
+#: actions/showapplication.php:94
 msgid "You are not the owner of this application."
 msgstr "Не сте сопственик на овој програм."
 
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
-#: actions/newapplication.php:112 actions/showapplication.php:113
-#: lib/action.php:1422
+#: actions/newapplication.php:112 actions/showapplication.php:118
+#: lib/action.php:1425
 msgid "There was a problem with your session token."
 msgstr "Се појави проблем со Вашиот сесиски жетон."
 
@@ -1915,12 +1909,14 @@ msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting an application.
 #: actions/deleteapplication.php:161
-msgid "Do not delete this application."
+#, fuzzy
+msgid "Do not delete this application"
 msgstr "Не го бриши овој програм."
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
 #: actions/deleteapplication.php:167
-msgid "Delete this application."
+#, fuzzy
+msgid "Delete this application"
 msgstr "Избриши го програмов."
 
 #. TRANS: Client error when trying to delete group while not logged in.
@@ -1974,12 +1970,14 @@ msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting a group.
 #: actions/deletegroup.php:224
-msgid "Do not delete this group."
+#, fuzzy
+msgid "Do not delete this group"
 msgstr "Не ја бриши групава."
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
 #: actions/deletegroup.php:231
-msgid "Delete this group."
+#, fuzzy
+msgid "Delete this group"
 msgstr "Избриши ја групава."
 
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
@@ -1987,15 +1985,13 @@ msgstr "Избриши ја групава."
 #. TRANS: Client error displayed when trying to mark a notice as favorite without being logged in.
 #. TRANS: Client error displayed trying to block a user from a group while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
-#. TRANS: Client error displayed trying to log out when not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
-#. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
 #. TRANS: Client error displayed when trying to change user options while not logged in.
 #: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
-#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:70
+#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
-#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:98
+#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
 #: lib/adminpanelaction.php:71 lib/profileformaction.php:63
 #: lib/settingsaction.php:72
@@ -2024,13 +2020,14 @@ msgstr "Дали сте сигурни дека сакате да ја избр
 
 #. TRANS: Submit button title for 'No' when deleting a notice.
 #: actions/deletenotice.php:159
-msgid "Do not delete this notice."
+#, fuzzy
+msgid "Do not delete this notice"
 msgstr "Не ја бриши оваа забелешка."
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:166
-msgid "Delete this notice."
-msgstr "Избриши ја забелешкава."
+#: actions/deletenotice.php:166 lib/noticelist.php:673
+msgid "Delete this notice"
+msgstr "Избриши ја оваа забелешка"
 
 #. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
 #: actions/deleteuser.php:66
@@ -2064,13 +2061,15 @@ msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting a user.
 #: actions/deleteuser.php:158
-msgid "Do not delete this user."
+#, fuzzy
+msgid "Do not delete this user"
 msgstr "Не го бриши корисников."
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
-#: actions/deleteuser.php:165
-msgid "Delete this user."
-msgstr "Избриши го корисников."
+#. TRANS: Description of form for deleting a user.
+#: actions/deleteuser.php:165 lib/deleteuserform.php:75
+msgid "Delete this user"
+msgstr "Избриши овој корисник"
 
 #. TRANS: Message used as title for design settings for the site.
 #. TRANS: Link description in user account settings menu.
@@ -2233,19 +2232,22 @@ msgid "Use defaults"
 msgstr "Користи по основно"
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:720
-msgid "Restore default designs."
-msgstr "Врати ги изгледите по основно."
+#. TRANS: Title for button on profile design page to reset all colour settings to default.
+#: actions/designadminpanel.php:720 lib/designsettings.php:259
+msgid "Restore default designs"
+msgstr "Врати основно-зададени нагодувања"
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:728
-msgid "Reset back to default."
-msgstr "Врати по основно."
+#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
+#: actions/designadminpanel.php:728 lib/designsettings.php:267
+msgid "Reset back to default"
+msgstr "Врати по основно"
 
 #. TRANS: Title for button for saving theme settings.
-#: actions/designadminpanel.php:736
-msgid "Save design."
-msgstr "Зачувај изглед."
+#. TRANS: Title for button on profile design page to save settings.
+#: actions/designadminpanel.php:736 lib/designsettings.php:272
+msgid "Save design"
+msgstr "Зачувај изглед"
 
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
 #: actions/disfavor.php:83
@@ -2276,7 +2278,7 @@ msgid "You must be logged in to edit an application."
 msgstr "Мора да сте најавени за да можете да уредувате програми."
 
 #. TRANS: Client error displayed trying to edit an application that does not exist.
-#: actions/editapplication.php:83 actions/showapplication.php:83
+#: actions/editapplication.php:83 actions/showapplication.php:87
 msgid "No such application."
 msgstr "Нема таков програм."
 
@@ -2559,7 +2561,7 @@ msgid "Cannot normalize that email address."
 msgstr "Не можам да ја нормализирам таа е-поштенска адреса."
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:393 actions/register.php:204
+#: actions/emailsettings.php:393 actions/register.php:212
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "Неправилна адреса за е-пошта."
@@ -2634,21 +2636,18 @@ msgstr "Нема приемна е-поштенска адреса."
 
 #. 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.
 #: actions/emailsettings.php:530 actions/emailsettings.php:554
-#: actions/smssettings.php:566 actions/smssettings.php:591
+#: actions/smssettings.php:565 actions/smssettings.php:588
 msgid "Could not update user record."
 msgstr "Не можев да ја подновам корисничката евиденција."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
-#. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:534 actions/smssettings.php:570
+#: actions/emailsettings.php:534 actions/smssettings.php:568
 msgid "Incoming email address removed."
 msgstr "Приемната е-поштенска адреса е отстранета."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
-#. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:558 actions/smssettings.php:595
+#: actions/emailsettings.php:558 actions/smssettings.php:591
 msgid "New incoming email address added."
 msgstr "Додадена е нова влезна е-поштенска адреса."
 
@@ -2659,8 +2658,9 @@ msgstr "Веќе сте ја бендисале оваа забелешка!"
 
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
 #: actions/favor.php:95
-msgid "Disfavor favorite."
-msgstr "Тргни од бендисани."
+#, fuzzy
+msgid "Disfavor favorite"
+msgstr "Тргни од бендисани"
 
 #. TRANS: Page title for first page of favorited notices.
 #. TRANS: Title for favourited notices section.
@@ -2900,12 +2900,14 @@ msgstr ""
 
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
 #: actions/groupblock.php:191
-msgid "Do not block this user from this group."
+#, fuzzy
+msgid "Do not block this user from this group"
 msgstr "Не го блокирај овој корисник од групава."
 
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
 #: actions/groupblock.php:198
-msgid "Block this user from this group."
+#, fuzzy
+msgid "Block this user from this group"
 msgstr "Блокирај го овој корисник од групава."
 
 #. TRANS: Server error displayed when trying to block a user from a group fails because of an application error.
@@ -2916,7 +2918,6 @@ msgstr ""
 "групата."
 
 #. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
-#. TRANS: Client error displayed trying to find a user by ID without providing an ID.
 #: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr "Нема ID."
@@ -3104,10 +3105,8 @@ msgid "Group search"
 msgstr "Пребарување на групи"
 
 #. TRANS: Text on page where groups can be searched if no results were found for a query.
-#. TRANS: Text for notice search results is the query had no results.
-#. TRANS: Message on the "People search" page where a query has no results.
-#: actions/groupsearch.php:82 actions/noticesearch.php:122
-#: actions/peoplesearch.php:87
+#: actions/groupsearch.php:82 actions/noticesearch.php:117
+#: actions/peoplesearch.php:83
 msgid "No results."
 msgstr "Нема резултати."
 
@@ -3144,7 +3143,6 @@ msgid "User is not blocked from group."
 msgstr "Корисникот не е блокиран од групата."
 
 #. TRANS: Server error displayed when unblocking a user from a group fails because of an unknown error.
-#. TRANS: Server error displayed when removing a user block.
 #: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "Грешка при отстранување на блокот."
@@ -3238,8 +3236,7 @@ msgid "Publish a MicroID for my Jabber/Google Talk address."
 msgstr "Објави MicroID за мојата адреса на Jabber/Google Talk."
 
 #. TRANS: Confirmation message for successful Instant Messaging preferences save.
-#. TRANS: Confirmation message after saving preferences.
-#: actions/imsettings.php:283 actions/othersettings.php:193
+#: actions/imsettings.php:283 actions/othersettings.php:192
 msgid "Preferences saved."
 msgstr "Нагодувањата се зачувани."
 
@@ -3527,7 +3524,7 @@ msgstr "Мора да сте најавени за да можете да ја 
 
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
-#: actions/leavegroup.php:103 lib/command.php:386
+#: actions/leavegroup.php:103 lib/command.php:398
 msgid "You are not a member of that group."
 msgstr "Не членувате во таа група."
 
@@ -3655,42 +3652,40 @@ msgstr "Зачувај"
 msgid "Save license settings"
 msgstr "Зачувај нагодувања на лиценцата"
 
-#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
-#: actions/login.php:97 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
 msgid "Already logged in."
 msgstr "Веќе сте најавени."
 
-#: actions/login.php:142
+#: actions/login.php:148
 msgid "Incorrect username or password."
 msgstr "Неточно корисничко име или лозинка"
 
-#. TRANS: Server error displayed when a user object could not be created trying to login using "one time password login".
-#: actions/login.php:148 actions/otp.php:127
+#: actions/login.php:154 actions/otp.php:120
 msgid "Error setting user. You are probably not authorized."
 msgstr "Грешка при поставувањето на корисникот. Веројатно не се заверени."
 
-#: actions/login.php:202 actions/login.php:253
+#: actions/login.php:210 actions/login.php:263
 msgid "Login"
 msgstr "Најава"
 
-#: actions/login.php:239
+#: actions/login.php:249
 msgid "Login to site"
 msgstr "Најавете се"
 
-#: actions/login.php:248 actions/register.php:476
+#: actions/login.php:258 actions/register.php:490
 msgid "Remember me"
 msgstr "Запамети ме"
 
-#: actions/login.php:249 actions/register.php:478
+#: actions/login.php:259 actions/register.php:492
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 "Отсега врши автоматска најава. Не треба да се користи за јавни сметачи!"
 
-#: actions/login.php:259
+#: actions/login.php:269
 msgid "Lost or forgotten password?"
 msgstr "Ја загубивте или заборавивте лозинката?"
 
-#: actions/login.php:277
+#: actions/login.php:288
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -3698,11 +3693,11 @@ msgstr ""
 "Поради безбедносни причини треба повторно да го внесете Вашето корисничко "
 "име и лозинка пред да ги смените Вашите нагодувања."
 
-#: actions/login.php:281
+#: actions/login.php:292
 msgid "Login with your username and password."
 msgstr "Најавете се со корисничко име и лозинка."
 
-#: actions/login.php:284
+#: actions/login.php:295
 #, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -3782,14 +3777,14 @@ msgid "New message"
 msgstr "Нова порака"
 
 #. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
-#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:501
+#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:513
 msgid "You can't send a message to this user."
 msgstr "Не можете да испратите порака до овојо корисник."
 
 #. TRANS: Command exception text shown when trying to send a direct message to another user without content.
 #. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
-#: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:478
-#: lib/command.php:581
+#: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:490
+#: lib/command.php:593
 msgid "No content!"
 msgstr "Нема содржина!"
 
@@ -3798,7 +3793,7 @@ msgid "No recipient specified."
 msgstr "Нема назначено примач."
 
 #. TRANS: Error text shown when trying to send a direct message to self.
-#: actions/newmessage.php:167 lib/command.php:505
+#: actions/newmessage.php:167 lib/command.php:517
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
@@ -3811,7 +3806,7 @@ msgstr "Пораката е испратена"
 
 #. TRANS: Message given have sent a direct message to another user.
 #. TRANS: %s is the name of the other user.
-#: actions/newmessage.php:188 lib/command.php:513
+#: actions/newmessage.php:188 lib/command.php:525
 #, php-format
 msgid "Direct message to %s sent."
 msgstr "Директната порака до %s е испратена."
@@ -3828,9 +3823,7 @@ msgstr "Ново забелешка"
 msgid "Notice posted"
 msgstr "Забелешката е објавена"
 
-#. TRANS: Instructions for Notice search page.
-#. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/noticesearch.php:69
+#: actions/noticesearch.php:68
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -3839,21 +3832,16 @@ msgstr ""
 "Пребарајте забелешки на %%site.name%% според нивната содржина. Поимите "
 "одделете ги со празни места; мора да имаат барем по 3 знаци."
 
-#. TRANS: Title of the page where users can search for notices.
-#: actions/noticesearch.php:80
+#: actions/noticesearch.php:78
 msgid "Text search"
 msgstr "Текстуално пребарување"
 
-#. TRANS: Test in RSS notice search.
-#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearch.php:95
+#: actions/noticesearch.php:91
 #, php-format
 msgid "Search results for \"%1$s\" on %2$s"
 msgstr "Резултати од пребарувањето за „%1$s“ на %2$s"
 
-#. TRANS: Text for logged in users making a query for notices without results.
-#. TRANS: This message contains a Markdown link.
-#: actions/noticesearch.php:128
+#: actions/noticesearch.php:121
 #, php-format
 msgid ""
 "Be the first to [post on this topic](%%%%action.newnotice%%%%?"
@@ -3862,9 +3850,7 @@ msgstr ""
 "Бидете први што ќе [објавите нешто на оваа тема](%%%%action.newnotice%%%%?"
 "status_textarea=%s)!"
 
-#. TRANS: Text for not logged in users making a query for notices without results.
-#. TRANS: This message contains Markdown links.
-#: actions/noticesearch.php:133
+#: actions/noticesearch.php:124
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and be the first to "
@@ -3874,18 +3860,15 @@ msgstr ""
 "што ќе [објави нешто на оваа тема](%%%%action.newnotice%%%%?status_textarea=%"
 "s)!"
 
-#. TRANS: RSS notice search feed title. %s is the query.
-#: actions/noticesearchrss.php:95
+#: actions/noticesearchrss.php:96
 #, php-format
 msgid "Updates with \"%s\""
 msgstr "Подновувања со „%s“"
 
-#. TRANS: RSS notice search feed description.
-#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearchrss.php:99
+#: actions/noticesearchrss.php:98
 #, fuzzy, php-format
-msgid "Updates matching search term \"%1$s\" on %2$s."
-msgstr "Подновувања кои се совпаѓаат со пребараниот израз „%1$s“ на %2$s!"
+msgid "Updates matching search term \"%1$s\" on %2$s!"
+msgstr "Подновувања кои се совпаѓаат со пребараниот израз „%1$s“ на %2$s."
 
 #: actions/nudge.php:85
 msgid ""
@@ -3925,30 +3908,30 @@ msgid "You have not registered any applications yet."
 msgstr "Сè уште немате регистрирано ниеден програм,"
 
 #. TRANS: Title for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:70
+#: actions/oauthconnectionssettings.php:71
 msgid "Connected applications"
 msgstr "Поврзани програми"
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:81
+#: actions/oauthconnectionssettings.php:83
 msgid "The following connections exist for your account."
 msgstr "За Вашата сметка постојат следниве врски."
 
 #. TRANS: Client error when trying to revoke access for an application while not being a user of it.
-#: actions/oauthconnectionssettings.php:166
+#: actions/oauthconnectionssettings.php:168
 msgid "You are not a user of that application."
 msgstr "Не сте корисник на тој програм."
 
 #. TRANS: Client error when revoking access has failed for some reason.
 #. TRANS: %s is the application ID revoking access failed for.
-#: actions/oauthconnectionssettings.php:181
+#: actions/oauthconnectionssettings.php:183
 #, php-format
 msgid "Unable to revoke access for application: %s."
 msgstr "Не можам да му го одземам пристапот на програмот: %s."
 
 #. TRANS: Success message after revoking access for an application.
 #. TRANS: %1$s is the application name, %2$s is the first part of the user token.
-#: actions/oauthconnectionssettings.php:200
+#: actions/oauthconnectionssettings.php:202
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -3957,14 +3940,14 @@ msgstr ""
 "Успешно одземавте пристап за %1$s и пристапниот жетон што почнува со %2$s."
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:211
+#: actions/oauthconnectionssettings.php:213
 msgid "You have not authorized any applications to use your account."
 msgstr "Му немате дозволено пристап до Вашата сметка на ниеден програм."
 
 #. TRANS: Note for developers in the OAuth connection settings form.
 #. TRANS: This message contains a Markdown link. Do not separate "](".
 #. TRANS: %s is the URL to the OAuth settings.
-#: actions/oauthconnectionssettings.php:231
+#: actions/oauthconnectionssettings.php:233
 #, php-format
 msgid ""
 "Are you a developer? [Register an OAuth client application](%s) to use with "
@@ -3973,16 +3956,6 @@ msgstr ""
 "Дали сте програмер? [Регистрирајте клиентски програм за OAuth](%s) за да го "
 "користите овој примерок на StatusNet."
 
-#: actions/oembed.php:64
-#, php-format
-msgid "\"%s\" not found."
-msgstr "„%s“ не е пронајден."
-
-#: actions/oembed.php:76
-#, php-format
-msgid "Notice %s not found."
-msgstr "Забелешката %s не е пронајдена."
-
 #: actions/oembed.php:80 actions/shownotice.php:100
 msgid "Notice has no profile."
 msgstr "Забелешката нема профил."
@@ -3992,16 +3965,6 @@ msgstr "Забелешката нема профил."
 msgid "%1$s's status on %2$s"
 msgstr "%1$s статус на %2$s"
 
-#: actions/oembed.php:95
-#, php-format
-msgid "Attachment %s not found."
-msgstr "Прилогот %s не е пронајден."
-
-#: actions/oembed.php:136
-#, php-format
-msgid "\"%s\" not supported for oembed requests."
-msgstr "„%s“ не е поддржано за oembed-барања."
-
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
 #: actions/oembed.php:168
 #, php-format
@@ -4020,12 +3983,11 @@ msgstr "Ве молиме користете само %s URL-адреси врз
 msgid "Not a supported data format."
 msgstr "Ова не е поддржан формат на податотека."
 
-#. TRANS: ShortName in the OpenSearch interface when trying to find users.
 #: actions/opensearch.php:64
 msgid "People Search"
 msgstr "Пребарување на луѓе"
 
-#: actions/opensearch.php:68
+#: actions/opensearch.php:67
 msgid "Notice Search"
 msgstr "Пребарување на забелешки"
 
@@ -4045,7 +4007,7 @@ msgstr "Раководење со разни други можности."
 #. TRANS: here if it has one (most likely a single space).
 #: actions/othersettings.php:113
 msgid " (free service)"
-msgstr " (бесплатна служба)"
+msgstr " (слободна служба)"
 
 #. TRANS: Label for dropdown with URL shortener services.
 #: actions/othersettings.php:122
@@ -4072,46 +4034,37 @@ msgstr "Прикажи или скриј изгледи на профилот."
 msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr "Услугата за скратување на URL-адреси е предолга (највеќе до 50 знаци)."
 
-#. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
-#: actions/otp.php:70
+#: actions/otp.php:69
 msgid "No user ID specified."
 msgstr "Нема назначено кориснички ID."
 
-#. TRANS: Client error displayed trying to use "one time password login" without specifying a login token.
-#: actions/otp.php:86
+#: actions/otp.php:83
 msgid "No login token specified."
 msgstr "Нема назначено најавен жетон."
 
-#. TRANS: Client error displayed trying to use "one time password login" without requesting a login token.
-#: actions/otp.php:94
+#: actions/otp.php:90
 msgid "No login token requested."
 msgstr "Не е побаран најавен жетон."
 
-#. TRANS: Client error displayed trying to use "one time password login" while specifying an invalid login token.
-#: actions/otp.php:100
+#: actions/otp.php:95
 msgid "Invalid login token specified."
 msgstr "Назначен е неважечки најавен жетон."
 
-#. TRANS: Client error displayed trying to use "one time password login" while specifying an expired login token.
-#: actions/otp.php:110
+#: actions/otp.php:104
 msgid "Login token expired."
 msgstr "Најавниот жетон е истечен."
 
-#. TRANS: Title for outbox for any but the fist page.
-#. TRANS: %1$s is the user nickname, %2$d is the page number.
-#: actions/outbox.php:57
+#: actions/outbox.php:58
 #, php-format
 msgid "Outbox for %1$s - page %2$d"
 msgstr "Излезно сандаче за %1$s - стр. %2$d"
 
-#. TRANS: Title for first page of outbox.
 #: actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
 msgstr "Излезно сандаче за %s"
 
-#. TRANS: Instructions for outbox.
-#: actions/outbox.php:103
+#: actions/outbox.php:104
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr ""
 "Ова е Вашето излезно сандче, во кое се наведени приватните пораки кои ги "
@@ -4139,42 +4092,43 @@ msgstr "Стара лозинка"
 msgid "New password"
 msgstr "Нова лозинка"
 
-#: actions/passwordsettings.php:109 actions/register.php:423
-msgid "6 or more characters."
+#: actions/passwordsettings.php:109
+#, fuzzy
+msgid "6 or more characters"
 msgstr "6 или повеќе знаци."
 
-#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:264
-#: actions/register.php:427
-msgid "Same as password above."
+#: actions/passwordsettings.php:113
+#, fuzzy
+msgid "Same as password above"
 msgstr "Исто како лозинката погоре."
 
 #: actions/passwordsettings.php:117
 msgid "Change"
 msgstr "Промени"
 
-#: actions/passwordsettings.php:153 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:238
 msgid "Password must be 6 or more characters."
 msgstr "Лозинката мора да содржи барем 6 знаци."
 
-#: actions/passwordsettings.php:156 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:241
 msgid "Passwords don't match."
 msgstr "Лозинките не се совпаѓаат."
 
-#: actions/passwordsettings.php:164
+#: actions/passwordsettings.php:165
 msgid "Incorrect old password"
 msgstr "Неточна стара лозинка"
 
-#: actions/passwordsettings.php:180
+#: actions/passwordsettings.php:181
 msgid "Error saving user; invalid."
 msgstr "Грешка во зачувувањето на корисникот; неправилен."
 
-#. TRANS: Reset password form validation error message.
-#: actions/passwordsettings.php:185 actions/recoverpassword.php:418
-msgid "Cannot save new password."
+#: actions/passwordsettings.php:186
+#, fuzzy
+msgid "Can't save new password."
 msgstr "Не можам да ја зачувам новата лозинка."
 
-#: actions/passwordsettings.php:191
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
 msgid "Password saved."
 msgstr "Лозинката е зачувана."
 
@@ -4448,9 +4402,7 @@ msgstr "Oпслужувач, кому ќе му се испраќаат SSL-ба
 msgid "Save paths"
 msgstr "Зачувај патеки"
 
-#. TRANS: Instructions for the "People search" page.
-#. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/peoplesearch.php:54
+#: actions/peoplesearch.php:52
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
@@ -4460,8 +4412,7 @@ msgstr ""
 "одделете ги со празни места. Минималната должина на зборовите изнесува 3 "
 "знаци."
 
-#. TRANS: Title of a page where users can search for other users.
-#: actions/peoplesearch.php:61
+#: actions/peoplesearch.php:58
 msgid "People search"
 msgstr "Пребарување на луѓе"
 
@@ -4505,14 +4456,14 @@ msgid "Profile information"
 msgstr "Информации за профил"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109 actions/register.php:419
+#: actions/profilesettings.php:109 actions/register.php:433
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr "1-64 мали букви или бројки, без интерпукциски знаци и празни места."
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for full group name (dt). Text hidden by default.
 #. TRANS: DT for full name in a profile.
-#: actions/profilesettings.php:113 actions/register.php:441
+#: actions/profilesettings.php:113 actions/register.php:455
 #: actions/showgroup.php:255 actions/tagother.php:104
 #: lib/groupeditform.php:150 lib/userprofile.php:156
 msgid "Full name"
@@ -4520,13 +4471,13 @@ msgstr "Име и презиме"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:118 actions/register.php:446
+#: actions/profilesettings.php:118 actions/register.php:460
 #: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "Домашна страница"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:121 actions/register.php:448
+#: actions/profilesettings.php:121
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr ""
 "URL-адреса на Вашата домашна страница, блог или профил на друго мрежно место."
@@ -4534,7 +4485,7 @@ msgstr ""
 #. TRANS: Tooltip for field label in form for profile settings. Plural
 #. TRANS: is decided by the number of characters available for the
 #. TRANS: biography (%d).
-#: actions/profilesettings.php:129 actions/register.php:457
+#: actions/profilesettings.php:129 actions/register.php:471
 #, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4542,29 +4493,28 @@ msgstr[0] "Опишете се себеси и своите интереси с
 msgstr[1] "Опишете се себеси и своите интереси со %d знаци."
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:135 actions/register.php:462
+#: actions/profilesettings.php:135 actions/register.php:476
 msgid "Describe yourself and your interests"
 msgstr "Опишете се себеси и Вашите интереси"
 
 #. TRANS: Text area label in form for profile settings where users can provide.
 #. TRANS: their biography.
-#: actions/profilesettings.php:139 actions/register.php:464
+#: actions/profilesettings.php:139 actions/register.php:478
 msgid "Bio"
 msgstr "Биографија"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group location (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT for location in a profile.
-#: actions/profilesettings.php:145 actions/register.php:469
+#: actions/profilesettings.php:145 actions/register.php:483
 #: actions/showgroup.php:265 actions/tagother.php:112
-#: actions/userauthorization.php:174 lib/groupeditform.php:173
+#: actions/userauthorization.php:166 lib/groupeditform.php:173
 #: lib/userprofile.php:172
 msgid "Location"
 msgstr "Местоположба"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148
+#: actions/profilesettings.php:148 actions/register.php:485
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Каде се наоѓате, на пр. „Град, Област, Земја“."
 
@@ -4584,9 +4534,9 @@ msgstr "Ознаки"
 
 #. TRANS: Tooltip for field label in form for profile settings.
 #: actions/profilesettings.php:164
+#, fuzzy
 msgid ""
-"Tags for yourself (letters, numbers, -, ., and _), comma- or space- "
-"separated."
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr ""
 "Ознаки за Вас самите (букви, бројки, -, . и _), одделени со запирка или "
 "празно место."
@@ -4598,7 +4548,8 @@ msgstr "Јазик"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
 #: actions/profilesettings.php:171
-msgid "Preferred language."
+#, fuzzy
+msgid "Preferred language"
 msgstr "Претпочитан јазик"
 
 #. TRANS: Dropdownlist label in form for profile settings.
@@ -4613,8 +4564,9 @@ msgstr "Во која часовна зона обично се наоѓате?"
 
 #. TRANS: Checkbox label in form for profile settings.
 #: actions/profilesettings.php:189
+#, fuzzy
 msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)."
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr ""
 "Автоматски претплаќај ме на секој што се претплаќа на мене (најдобро за "
 "ботови и сл.)."
@@ -4622,7 +4574,7 @@ msgstr ""
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Plural form is used based on the maximum number of allowed
 #. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:258 actions/register.php:221
+#: actions/profilesettings.php:258 actions/register.php:229
 #, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4641,10 +4593,10 @@ msgstr "Јазикот е предолг (највеќе до 50 знаци)."
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:291
+#: actions/profilesettings.php:291 actions/tagother.php:178
 #, php-format
-msgid "Invalid tag: \"%s\"."
-msgstr "Неважечка ознака: „%s“."
+msgid "Invalid tag: \"%s\""
+msgstr "Неважечка ознака: „%s“"
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
 #. TRANS: automatically subscribe to any subscriber.
@@ -4749,12 +4701,6 @@ msgstr ""
 "org/wiki/Микроблогирање) заснована на слободната програмска алатка "
 "[StatusNet](http://status.net/)."
 
-#. TRANS: Public RSS feed description. %s is the StatusNet site name.
-#: actions/publicrss.php:106
-#, fuzzy, php-format
-msgid "%s updates from everyone."
-msgstr "%s подновуввања од сите!"
-
 #. TRANS: Title for public tag cloud.
 #: actions/publictagcloud.php:57
 msgid "Public tag cloud"
@@ -4892,11 +4838,6 @@ msgstr "Пронаоѓање на лозинка"
 msgid "Password recovery requested"
 msgstr "Побарано е пронаоѓање на лозинката"
 
-#. TRANS: Title for password recovery page in password saved mode.
-#: actions/recoverpassword.php:229
-msgid "Password saved"
-msgstr "Лозинката е зачувана"
-
 #. TRANS: Title for password recovery page when an unknown action has been specified.
 #: actions/recoverpassword.php:232
 msgid "Unknown action"
@@ -4907,6 +4848,11 @@ msgstr "Непознато дејство"
 msgid "6 or more characters, and do not forget it!"
 msgstr "6 или повеќе знаци - не заборавајте!"
 
+#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#: actions/recoverpassword.php:264 actions/register.php:441
+msgid "Same as password above."
+msgstr "Исто како лозинката погоре."
+
 #. TRANS: Button text for password reset form.
 #. TRANS: Button text on profile design page to reset all colour settings to default without saving.
 #: actions/recoverpassword.php:268 lib/designsettings.php:264
@@ -4958,8 +4904,13 @@ msgstr "Лозинката мора да има барем 6 знаци."
 msgid "Password and confirmation do not match."
 msgstr "Двете лозинки не се совпаѓаат."
 
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:418
+msgid "Cannot save new password."
+msgstr "Не можам да ја зачувам новата лозинка."
+
 #. TRANS: Server error displayed when something does wrong with the user object during password reset.
-#: actions/recoverpassword.php:426 actions/register.php:248
+#: actions/recoverpassword.php:426 actions/register.php:256
 msgid "Error setting user."
 msgstr "Грешка во поставувањето на корисникот."
 
@@ -4968,89 +4919,99 @@ msgstr "Грешка во поставувањето на корисникот."
 msgid "New password successfully saved. You are now logged in."
 msgstr "Новата лозинка е успешно зачувана. Сега сте најавени."
 
-#: actions/register.php:87 actions/register.php:188 actions/register.php:399
+#: actions/register.php:92 actions/register.php:196 actions/register.php:413
 msgid "Sorry, only invited people can register."
 msgstr "Жалиме, регистрацијата е само со покана."
 
-#: actions/register.php:94
+#: actions/register.php:99
 msgid "Sorry, invalid invitation code."
 msgstr "Жалиме, неважечки код за поканата."
 
-#: actions/register.php:113
+#: actions/register.php:119
 msgid "Registration successful"
 msgstr "Регистрацијата е успешна"
 
-#: actions/register.php:115 actions/register.php:497
+#: actions/register.php:121 actions/register.php:511
 msgid "Register"
 msgstr "Регистрирај се"
 
-#: actions/register.php:135
+#: actions/register.php:142
 msgid "Registration not allowed."
 msgstr "Регистрирањето не е дозволено."
 
-#: actions/register.php:201
-msgid "You cannot register if you don't agree to the license."
+#: actions/register.php:209
+#, fuzzy
+msgid "You can't register if you don't agree to the license."
 msgstr "Не може да се регистрирате ако не ја прифаќате лиценцата."
 
-#: actions/register.php:210
+#: actions/register.php:218
 msgid "Email address already exists."
 msgstr "Адресата веќе постои."
 
-#: actions/register.php:243 actions/register.php:265
+#: actions/register.php:251 actions/register.php:273
 msgid "Invalid username or password."
 msgstr "Погрешно име или лозинка."
 
-#: actions/register.php:340
+#: actions/register.php:351
+#, fuzzy
 msgid ""
 "With this form you can create a new account. You can then post notices and "
-"link up to friends and colleagues."
+"link up to friends and colleagues. "
 msgstr ""
 "Со овој образец можете да создадете нова сметка. Потоа ќе можете да "
 "објавувате забелешки и да се поврзувате со пријатели и колеги."
 
+#: actions/register.php:437
+msgid "6 or more characters."
+msgstr "6 или повеќе знаци."
+
 #. TRANS: Link description in user account settings menu.
-#: actions/register.php:431 actions/register.php:435
+#: actions/register.php:445 actions/register.php:449
 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
 msgid "Email"
 msgstr "Е-пошта"
 
-#: actions/register.php:432 actions/register.php:436
-msgid "Used only for updates, announcements, and password recovery."
+#: actions/register.php:446 actions/register.php:450
+#, fuzzy
+msgid "Used only for updates, announcements, and password recovery"
 msgstr "Се користи само за подновувања, објави и повраќање на лозинка."
 
-#: actions/register.php:443
-msgid "Longer name, preferably your \"real\" name."
+#: actions/register.php:457
+#, fuzzy
+msgid "Longer name, preferably your \"real\" name"
 msgstr "Подолго име, по можност Вашето „вистинско“ име и презиме"
 
-#: actions/register.php:471
-msgid "Where you are, like \"City, State (or Region), Country\"."
-msgstr "Каде се наоѓате, на пр. „Град, Сојуз. држава (или Област), Земја“."
+#: actions/register.php:462
+#, fuzzy
+msgid "URL of your homepage, blog, or profile on another site"
+msgstr ""
+"URL-адреса на Вашата домашна страница, блог или профил на друго мрежно место."
 
-#: actions/register.php:510
+#: actions/register.php:523
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
 msgstr "Сфаќам дека содржината и податоците на %1$s се лични и доверливи."
 
-#: actions/register.php:520
+#: actions/register.php:533
 #, php-format
 msgid "My text and files are copyright by %1$s."
 msgstr "Авторското правво на мојот текст и податотеки го има %1$s."
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:524
+#: actions/register.php:537
 msgid "My text and files remain under my own copyright."
 msgstr ""
 "Јас ја задржувам сопственоста на авторското право врз мојот текст и "
 "податотеки."
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:527
+#: actions/register.php:540
 msgid "All rights reserved."
 msgstr "Сите права задржани."
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:532
+#: actions/register.php:545
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -5059,7 +5020,7 @@ msgstr ""
 "Мојот текст и податотеки се достапни под %s, освен следниве приватни "
 "податоци: лозинка, е-пошта, IM-адреса и телефонски број."
 
-#: actions/register.php:573
+#: actions/register.php:588
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -5093,7 +5054,7 @@ msgstr ""
 "Ви благодариме што се зачленивте и Ви пожелуваме пријатни мигови со оваа "
 "служба."
 
-#: actions/register.php:597
+#: actions/register.php:612
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5126,7 +5087,8 @@ msgid "User nickname"
 msgstr "Прекар на корисникот"
 
 #: actions/remotesubscribe.php:129
-msgid "Nickname of the user you want to follow."
+#, fuzzy
+msgid "Nickname of the user you want to follow"
 msgstr "Прекар на корисникот што сакате да го следите."
 
 #: actions/remotesubscribe.php:132
@@ -5134,7 +5096,8 @@ msgid "Profile URL"
 msgstr "URL на профилот"
 
 #: actions/remotesubscribe.php:133
-msgid "URL of your profile on another compatible microblogging service."
+#, fuzzy
+msgid "URL of your profile on another compatible microblogging service"
 msgstr "!URL на Вашиот профил на друга складна служба за микроблогирање."
 
 #. TRANS: Link text for link that will subscribe to a remote profile.
@@ -5144,7 +5107,8 @@ msgid "Subscribe"
 msgstr "Претплати се"
 
 #: actions/remotesubscribe.php:158
-msgid "Invalid profile URL (bad format)."
+#, fuzzy
+msgid "Invalid profile URL (bad format)"
 msgstr "Неправилна URL на профилот (лош формат)."
 
 #: actions/remotesubscribe.php:167
@@ -5185,7 +5149,6 @@ msgstr "Повторено"
 msgid "Repeated!"
 msgstr "Повторено!"
 
-#. TRANS: RSS reply feed title. %s is a user nickname.
 #. TRANS: Tooltip for personal group navigation menu option when logged in for viewing @-replies.
 #: actions/replies.php:126 actions/repliesrss.php:68
 #: lib/personalgroupnav.php:109
@@ -5240,12 +5203,10 @@ msgstr ""
 "Можете да го [подбуцнете корисникот 1$s](../%2$s) или да [му испратите нешто]"
 "(%%%%action.newnotice%%%%?status_textarea=%3$s)."
 
-#. TRANS: RSS reply feed description.
-#. TRANS: %1$s is a user nickname, %2$s is the StatusNet site name.
-#: actions/repliesrss.php:74
+#: actions/repliesrss.php:72
 #, fuzzy, php-format
-msgid "Replies to %1$s on %2$s."
-msgstr "Одговори на %1$s на %2$s!"
+msgid "Replies to %1$s on %2$s!"
+msgstr "Одговори на %1$s на %2$s."
 
 #. TRANS: Client exception displayed when trying to restore an account while not logged in.
 #: actions/restoreaccount.php:78
@@ -5348,7 +5309,7 @@ msgstr "На ова мрежно место не можете да одзема
 msgid "User doesn't have this role."
 msgstr "Корисникот ја нема оваа улога."
 
-#: actions/rsd.php:142 actions/version.php:159
+#: actions/rsd.php:146 actions/version.php:159
 msgid "StatusNet"
 msgstr "StatusNet"
 
@@ -5390,87 +5351,87 @@ msgstr "Вклучи извод од поправка на грешки за с
 msgid "Save site settings"
 msgstr "Зачувај нагодувања на мреж. место"
 
-#: actions/showapplication.php:78
+#: actions/showapplication.php:82
 msgid "You must be logged in to view an application."
 msgstr "Мора да сте најавени за да можете да го видите програмот."
 
-#: actions/showapplication.php:151
+#: actions/showapplication.php:157
 msgid "Application profile"
 msgstr "Профил на програмот"
 
 #. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:153 lib/applicationeditform.php:177
+#: actions/showapplication.php:159 lib/applicationeditform.php:177
 msgid "Icon"
 msgstr "Икона"
 
 #. TRANS: Form input field label for application name.
-#: actions/showapplication.php:163 actions/version.php:197
+#: actions/showapplication.php:169 actions/version.php:197
 #: lib/applicationeditform.php:190
 msgid "Name"
 msgstr "Име"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:172 lib/applicationeditform.php:227
+#: actions/showapplication.php:178 lib/applicationeditform.php:227
 msgid "Organization"
 msgstr "Организација"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:181 actions/version.php:200
+#: actions/showapplication.php:187 actions/version.php:200
 #: lib/applicationeditform.php:208 lib/groupeditform.php:168
 msgid "Description"
 msgstr "Опис"
 
 #. TRANS: Header for group statistics on a group page (h2).
 #. TRANS: H2 text for user statistics.
-#: actions/showapplication.php:186 actions/showgroup.php:460
+#: actions/showapplication.php:192 actions/showgroup.php:460
 #: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "Статистики"
 
-#: actions/showapplication.php:197
+#: actions/showapplication.php:203
 #, php-format
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr "Создадено од %1$s - основен пристап: %2$s - %3$d корисници"
 
-#: actions/showapplication.php:207
+#: actions/showapplication.php:213
 msgid "Application actions"
 msgstr "Дејства на програмот"
 
-#: actions/showapplication.php:230
+#: actions/showapplication.php:236
 msgid "Reset key & secret"
 msgstr "Клуч за промена и тајна"
 
 #. TRANS: Title of form for deleting a user.
-#: actions/showapplication.php:246 lib/deletegroupform.php:121
+#: actions/showapplication.php:252 lib/deletegroupform.php:121
 #: lib/deleteuserform.php:64 lib/noticelist.php:673
 msgid "Delete"
 msgstr "Избриши"
 
-#: actions/showapplication.php:255
+#: actions/showapplication.php:261
 msgid "Application info"
 msgstr "Инфо за програмот"
 
-#: actions/showapplication.php:257
+#: actions/showapplication.php:263
 msgid "Consumer key"
 msgstr "Потрошувачки клуч"
 
-#: actions/showapplication.php:262
+#: actions/showapplication.php:268
 msgid "Consumer secret"
 msgstr "Потрошувачка тајна"
 
-#: actions/showapplication.php:267
+#: actions/showapplication.php:273
 msgid "Request token URL"
 msgstr "URL на жетонот на барањето"
 
-#: actions/showapplication.php:272
+#: actions/showapplication.php:278
 msgid "Access token URL"
 msgstr "URL на пристапниот жетон"
 
-#: actions/showapplication.php:277
+#: actions/showapplication.php:283
 msgid "Authorize URL"
 msgstr "Одобри URL"
 
-#: actions/showapplication.php:282
+#: actions/showapplication.php:288
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
@@ -5478,7 +5439,7 @@ msgstr ""
 "Напомена: Поддржуваме HMAC-SHA1 потписи. Не поддржуваме потпишување со прост "
 "текст."
 
-#: actions/showapplication.php:302
+#: actions/showapplication.php:309
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr ""
 "Дали сте сигурни дека сакате да го смените Вашиот кориснички клуч и тајна?"
@@ -5572,18 +5533,16 @@ msgid "Group profile"
 msgstr "Профил на група"
 
 #. TRANS: Label for group URL (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT for URL in a profile.
 #: actions/showgroup.php:273 actions/tagother.php:118
-#: actions/userauthorization.php:184 lib/userprofile.php:186
+#: actions/userauthorization.php:175 lib/userprofile.php:186
 msgid "URL"
 msgstr "URL"
 
 #. TRANS: Label for group description or group note (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page where bio is displayed.
 #. TRANS: DT for note in a profile.
 #: actions/showgroup.php:285 actions/tagother.php:128
-#: actions/userauthorization.php:197 lib/userprofile.php:204
+#: actions/userauthorization.php:187 lib/userprofile.php:204
 msgid "Note"
 msgstr "Забелешка"
 
@@ -5729,7 +5688,7 @@ msgid "%1$s tagged %2$s"
 msgstr "%1$s го/ја означи %2$s"
 
 #. TRANS: Page title showing tagged notices in one user's stream.
-#. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
+#. TRANS: %1$s is the username, %2$s is the hash tag, %1$d is the page number.
 #: actions/showstream.php:74
 #, php-format
 msgid "%1$s tagged %2$s, page %3$d"
@@ -5981,7 +5940,8 @@ msgstr ""
 
 #. TRANS: Title for button to save site notice in admin panel.
 #: actions/sitenoticeadminpanel.php:201
-msgid "Save site notice."
+#, fuzzy
+msgid "Save site notice"
 msgstr "Зачувај ја објавата на мреж. место."
 
 #. TRANS: Title for SMS settings.
@@ -6039,7 +5999,8 @@ msgstr "Телефонски број за СМС"
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
 #: actions/smssettings.php:152
-msgid "Phone number, no punctuation or spaces, with area code."
+#, fuzzy
+msgid "Phone number, no punctuation or spaces, with area code"
 msgstr ""
 "Телефонски број, без интерпункциски знаци и празни места, со повикувачки "
 "број."
@@ -6209,20 +6170,16 @@ msgstr "Не сте претплатени на тој профил."
 msgid "Could not save subscription."
 msgstr "Не можев да ја зачувам претплатата."
 
-#. TRANS: Client error displayed trying to perform any request method other than POST.
-#. TRANS: Do not translate POST.
 #: actions/subscribe.php:77
 msgid "This action only accepts POST requests."
 msgstr "Ова дејство прифаќа само POST-барања"
 
-#. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
-#: actions/subscribe.php:121
+#: actions/subscribe.php:117
 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
 msgstr ""
 "Не можете да се претплатите на OMB 0.1 далечински профил со ова дејство."
 
-#. TRANS: Page title when subscription succeeded.
-#: actions/subscribe.php:149
+#: actions/subscribe.php:145
 msgid "Subscribed"
 msgstr "Претплатено"
 
@@ -6381,9 +6338,8 @@ msgstr "Означи %s"
 msgid "User profile"
 msgstr "Кориснички профил"
 
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT element in area for user avatar.
-#: actions/tagother.php:81 actions/userauthorization.php:138
+#: actions/tagother.php:81 actions/userauthorization.php:132
 #: lib/userprofile.php:108
 msgid "Photo"
 msgstr "Фото"
@@ -6400,11 +6356,6 @@ msgstr ""
 "Ознаки за овој корисник (букви, бројки, -, . и _), одделени со запирка или "
 "празно место"
 
-#: actions/tagother.php:178
-#, php-format
-msgid "Invalid tag: \"%s\""
-msgstr "Неважечка ознака: „%s“"
-
 #: actions/tagother.php:193
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
@@ -6420,7 +6371,6 @@ msgstr "Со овој образец додавајте ознаки во Ваш
 msgid "No such tag."
 msgstr "Нема таква ознака."
 
-#. TRANS: Client error displayed when trying to unblock a non-blocked user.
 #: actions/unblock.php:59
 msgid "You haven't blocked that user."
 msgstr "Го немате блокирано тој корисник."
@@ -6441,7 +6391,7 @@ msgstr "!Во барањето нема ID на профилот."
 msgid "Unsubscribed"
 msgstr "Претплатата е откажана"
 
-#: actions/updateprofile.php:64
+#: actions/updateprofile.php:64 actions/userauthorization.php:337
 #, php-format
 msgid ""
 "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
@@ -6473,8 +6423,8 @@ msgstr "Неважечки текст за добредојде. Дозволе
 #. TRANS: Client error displayed when trying to set a non-existing user as default subscription for new
 #. TRANS: users in user admin panel. %1$s is the invalid nickname.
 #: actions/useradminpanel.php:166
-#, php-format
-msgid "Invalid default subscripton: \"%1$s\" is not a user."
+#, fuzzy, php-format
+msgid "Invalid default subscripton: '%1$s' is not a user."
 msgstr "Неважечки опис по основно: „%1$s“ не е корисник."
 
 #. TRANS: Link description in user account settings menu.
@@ -6534,65 +6484,60 @@ msgstr "Дали да им е дозволено на корисниците д
 
 #. TRANS: Title for button to save user settings in user admin panel.
 #: actions/useradminpanel.php:302
-msgid "Save user settings."
+#, fuzzy
+msgid "Save user settings"
 msgstr "Зачувај кориснички нагодувања."
 
-#. TRANS: Page title.
-#: actions/userauthorization.php:109
+#: actions/userauthorization.php:105
 msgid "Authorize subscription"
 msgstr "Одобрете ја претплатата"
 
-#. TRANS: Page notice on "Auhtorize subscription" page.
-#: actions/userauthorization.php:115
+#: actions/userauthorization.php:110
+#, fuzzy
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
 "user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
-"click \"Reject\"."
+"click “Reject”."
 msgstr ""
 "Проверете ги овие податоци и видете дали сакате да се претплатите на "
 "забелешките на овој корисник. Ако не сакате да се претплатите, едноставно "
 "стиснете на „Одбиј“."
 
-#. TRANS: DT element on Authorise Subscription page where license is displayed.
 #. TRANS: Menu item for site administration
-#: actions/userauthorization.php:207 actions/version.php:167
+#: actions/userauthorization.php:196 actions/version.php:167
 #: lib/adminpanelaction.php:403
 msgid "License"
 msgstr "Лиценца"
 
-#. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:229
-msgctxt "BUTTON"
+#: actions/userauthorization.php:217
+#, fuzzy
 msgid "Accept"
 msgstr "Прифати"
 
-#. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:231
-msgid "Subscribe to this user."
-msgstr "Претплати се на корисников."
+#: actions/userauthorization.php:218 lib/subscribeform.php:115
+#: lib/subscribeform.php:139
+msgid "Subscribe to this user"
+msgstr "Претплати се на корисников"
 
-#. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:233
-msgctxt "BUTTON"
+#: actions/userauthorization.php:219
+#, fuzzy
 msgid "Reject"
 msgstr "Одбиј"
 
-#. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:235
-msgid "Reject this subscription."
+#: actions/userauthorization.php:220
+#, fuzzy
+msgid "Reject this subscription"
 msgstr "Одбиј ја оваа претплата."
 
-#. TRANS: Client error displayed for an empty authorisation request.
-#: actions/userauthorization.php:248
+#: actions/userauthorization.php:232
 msgid "No authorization request!"
 msgstr "Нема барање за проверка!"
 
-#. TRANS: Accept message header from Authorise subscription page.
-#: actions/userauthorization.php:271
+#: actions/userauthorization.php:254
 msgid "Subscription authorized"
 msgstr "Претплатата е одобрена"
 
-#: actions/userauthorization.php:274
+#: actions/userauthorization.php:256
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to authorize the "
@@ -6602,12 +6547,11 @@ msgstr ""
 "инструкциите на мрежното место за да дознаете како се одобрува претплата. "
 "Жетонот на Вашата претплата е:"
 
-#. TRANS: Reject message header from Authorise subscription page.
-#: actions/userauthorization.php:285
+#: actions/userauthorization.php:266
 msgid "Subscription rejected"
 msgstr "Претплатата е одбиена"
 
-#: actions/userauthorization.php:288
+#: actions/userauthorization.php:268
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to fully reject the "
@@ -6617,64 +6561,39 @@ msgstr ""
 "инструкциите на мрежното место за да дознаете како се одбива претплата во "
 "потполност."
 
-#. TRANS: Exception thrown when no valid user is found for an authorisation request.
-#. TRANS: %s is a listener URI.
-#: actions/userauthorization.php:325
-#, php-format
-msgid "Listener URI \"%s\" not found here."
+#: actions/userauthorization.php:303
+#, fuzzy, php-format
+msgid "Listener URI ‘%s’ not found here."
 msgstr "URI-то на следачот „%s“ не е пронајдено тука."
 
-#. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:332
-#, php-format
-msgid "Listenee URI \"%s\" is too long."
+#: actions/userauthorization.php:308
+#, fuzzy, php-format
+msgid "Listenee URI ‘%s’ is too long."
 msgstr "Следеното URI „%s“ е предолго."
 
-#. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:340
-#, php-format
-msgid "Listenee URI \"%s\" is a local user."
+#: actions/userauthorization.php:314
+#, fuzzy, php-format
+msgid "Listenee URI ‘%s’ is a local user."
 msgstr "Следеното URI „%s“ е локален корисник."
 
-#. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
-#. TRANS: %s is a profile URL.
-#: actions/userauthorization.php:358
-#, php-format
-msgid "Profile URL \"%s\" is for a local user."
+#: actions/userauthorization.php:329
+#, fuzzy, php-format
+msgid "Profile URL ‘%s’ is for a local user."
 msgstr "Профилната URL-адреса „%s“ е за локален корисник."
 
-#. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
-#. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
-#: actions/userauthorization.php:368
-#, php-format
-msgid ""
-"Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
-"\"."
-msgstr ""
-"Лиценцата на каналот на следениот „%1$s“ не е складна на лиценцата на "
-"мрежното место „%2$s“."
-
-#. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:378
-#, php-format
-msgid "Avatar URL \"%s\" is not valid."
+#: actions/userauthorization.php:345
+#, fuzzy, php-format
+msgid "Avatar URL ‘%s’ is not valid."
 msgstr "URL-адресата „%s“ за аватар е неважечка."
 
-#. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:385
-#, php-format
-msgid "Cannot read avatar URL \"%s\"."
+#: actions/userauthorization.php:350
+#, fuzzy, php-format
+msgid "Can’t read avatar URL ‘%s’."
 msgstr "Не можам да ја прочитам URL-адресата на аватарот „%s“."
 
-#. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:392
-#, php-format
-msgid "Wrong image type for avatar URL \"%s\"."
+#: actions/userauthorization.php:355
+#, fuzzy, php-format
+msgid "Wrong image type for avatar URL ‘%s’."
 msgstr "Погрешен тип на слика за аватарот со URL „%s“."
 
 #. TRANS: Page title for profile design page.
@@ -6783,7 +6702,7 @@ msgid "Plugins"
 msgstr "Приклучоци"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:898
+#: actions/version.php:198 lib/action.php:901
 msgid "Version"
 msgstr "Верзија"
 
@@ -6996,14 +6915,14 @@ msgstr "Проблем при зачувувањето на групното п
 
 #. TRANS: Server exception thrown when a reply cannot be saved.
 #. TRANS: %1$d is a notice ID, %2$d is the ID of the mentioned user.
-#: classes/Notice.php:1142
+#: classes/Notice.php:1144
 #, php-format
 msgid "Could not save reply for %1$d, %2$d."
 msgstr "Не можев да го зачувам одговорот за %1$d, %2$d."
 
 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1661
+#: classes/Notice.php:1663
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
@@ -7017,7 +6936,7 @@ msgstr "%1$s (%2$s)"
 
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:775
+#: classes/Profile.php:779
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
@@ -7026,7 +6945,7 @@ msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:784
+#: classes/Profile.php:788
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -7345,53 +7264,53 @@ msgid "Page notice"
 msgstr "Напомена за страницата"
 
 #. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:871
+#: lib/action.php:874
 msgid "Secondary site navigation"
 msgstr "Споредна навигација"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:877
+#: lib/action.php:880
 msgid "Help"
 msgstr "Помош"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:880
+#: lib/action.php:883
 msgid "About"
 msgstr "За нас"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:883
+#: lib/action.php:886
 msgid "FAQ"
 msgstr "ЧПП"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:888
+#: lib/action.php:891
 msgid "TOS"
 msgstr "Услови"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:892
+#: lib/action.php:895
 msgid "Privacy"
 msgstr "Приватност"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:895
+#: lib/action.php:898
 msgid "Source"
 msgstr "Изворен код"
 
 #. TRANS: Secondary navigation menu option leading to e-mail contact information on the
 #. TRANS: StatusNet site, where to report bugs, ...
-#: lib/action.php:902
+#: lib/action.php:905
 msgid "Contact"
 msgstr "Контакт"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:905
+#: lib/action.php:908
 msgid "Badge"
 msgstr "Значка"
 
 #. TRANS: DT element for StatusNet software license.
-#: lib/action.php:934
+#: lib/action.php:937
 msgid "StatusNet software license"
 msgstr "Лиценца на програмот StatusNet"
 
@@ -7399,7 +7318,7 @@ msgstr "Лиценца на програмот StatusNet"
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:941
+#: lib/action.php:944
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7409,7 +7328,7 @@ msgstr ""
 "%](%%site.broughtbyurl%%)."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:944
+#: lib/action.php:947
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** е сервис за микроблогирање."
@@ -7418,7 +7337,7 @@ msgstr "**%%site.name%%** е сервис за микроблогирање."
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:951
+#: lib/action.php:954
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7430,20 +7349,20 @@ msgstr ""
 "(http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:967
+#: lib/action.php:970
 msgid "Site content license"
 msgstr "Лиценца на содржините на мрежното место"
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:974
+#: lib/action.php:977
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr "Содржината и податоците на %1$s се лични и доверливи."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:981
+#: lib/action.php:984
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
@@ -7451,7 +7370,7 @@ msgstr ""
 "права задржани."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:985
+#: lib/action.php:988
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 "Авторските права на содржината и податоците им припаѓаат на учесниците. Сите "
@@ -7459,25 +7378,25 @@ msgstr ""
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:1017
+#: lib/action.php:1020
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr "Сите содржини и податоци на %1$s се достапни под лиценцата %2$s."
 
 #. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1353
+#: lib/action.php:1356
 msgid "Pagination"
 msgstr "Прелом на страници"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1364
+#: lib/action.php:1367
 msgid "After"
 msgstr "Следно"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1374
+#: lib/action.php:1377
 msgid "Before"
 msgstr "Претходно"
 
@@ -7674,23 +7593,19 @@ msgstr ""
 msgid "No application for that consumer key."
 msgstr "Нема програм за тој потрошувачки клуч."
 
-#: lib/apiauth.php:202 lib/apiauth.php:284
-msgid "Not allowed to use API."
-msgstr ""
-
 #. TRANS: OAuth exception given when an incorrect access token was given for a user.
-#: lib/apiauth.php:225
+#: lib/apiauth.php:219
 msgid "Bad access token."
 msgstr "Лош пристапен жетон."
 
 #. TRANS: OAuth exception given when no user was found for a given token (no token was found).
-#: lib/apiauth.php:230
+#: lib/apiauth.php:224
 msgid "No user for that token."
 msgstr "Нема корисник за тој жетон."
 
 #. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel".
 #. TRANS: Client error thrown when authentication fails.
-#: lib/apiauth.php:272 lib/apiauth.php:302
+#: lib/apiauth.php:266 lib/apiauth.php:293
 msgid "Could not authenticate you."
 msgstr "Не можевме да Ве потврдиме."
 
@@ -7893,11 +7808,6 @@ msgstr "Менувањето на лозинки не е дозволено."
 msgid "Block"
 msgstr "Блокирај"
 
-#. TRANS: Description of the form to block a user.
-#: lib/blockform.php:79
-msgid "Block this user"
-msgstr "Блокирај го корисников"
-
 #. TRANS: Title for command results.
 #: lib/channel.php:160 lib/channel.php:181
 msgid "Command results"
@@ -7925,7 +7835,7 @@ msgstr "Не постои забелешка со таков id."
 
 #. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
 #. TRANS: Error text shown when a last user notice is requested and it does not exist.
-#: lib/command.php:99 lib/command.php:630
+#: lib/command.php:99 lib/command.php:642
 msgid "User has no last notice."
 msgstr "Корисникот нема последна забелешка"
 
@@ -7975,35 +7885,41 @@ msgstr ""
 "Претплатници: %2$s\n"
 "Забелешки: %3$s"
 
+#. TRANS: Error message text shown when a favorite could not be set because it has already been favorited.
+#: lib/command.php:298
+#, fuzzy
+msgid "Could not create favorite: already favorited."
+msgstr "Не можам да создадам бендисана забелешка."
+
 #. TRANS: Text shown when a notice has been marked as favourite successfully.
-#: lib/command.php:312
+#: lib/command.php:324
 msgid "Notice marked as fave."
 msgstr "Забелешката е обележана како бендисана."
 
 #. TRANS: Message given having added a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:357
+#: lib/command.php:369
 #, php-format
 msgid "%1$s joined group %2$s."
 msgstr "%1$s се зачлени во групата %2$s."
 
 #. TRANS: Message given having removed a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:405
+#: lib/command.php:417
 #, php-format
 msgid "%1$s left group %2$s."
 msgstr "%1$s ја напушти групата %2$s."
 
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: lib/command.php:426
+#: lib/command.php:438
 #, php-format
 msgctxt "WHOIS"
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
 
 #. TRANS: Whois output. %s is the full name of the queried user.
-#: lib/command.php:430
+#: lib/command.php:442
 #, php-format
 msgid "Fullname: %s"
 msgstr "Име и презиме: %s"
@@ -8011,7 +7927,7 @@ msgstr "Име и презиме: %s"
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a location.
-#: lib/command.php:434 lib/mail.php:270
+#: lib/command.php:446 lib/mail.php:270
 #, php-format
 msgid "Location: %s"
 msgstr "Местоположба: %s"
@@ -8019,20 +7935,20 @@ msgstr "Местоположба: %s"
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a homepage.
-#: lib/command.php:438 lib/mail.php:274
+#: lib/command.php:450 lib/mail.php:274
 #, php-format
 msgid "Homepage: %s"
 msgstr "Домашна страница: %s"
 
 #. TRANS: Whois output. %s is the bio information of the queried user.
-#: lib/command.php:442
+#: lib/command.php:454
 #, php-format
 msgid "About: %s"
 msgstr "За: %s"
 
 #. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).
 #. TRANS: %s is a remote profile.
-#: lib/command.php:471
+#: lib/command.php:483
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
@@ -8043,7 +7959,7 @@ msgstr ""
 
 #. TRANS: Message given if content is too long. %1$sd is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:488
+#: lib/command.php:500
 #, php-format
 msgid "Message too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
@@ -8053,25 +7969,25 @@ msgstr[1] ""
 "Пораката е предолга - дозволени се највеќе %1$d знаци, а Вие испративте %2$d."
 
 #. TRANS: Error text shown sending a direct message fails with an unknown reason.
-#: lib/command.php:516
+#: lib/command.php:528
 msgid "Error sending direct message."
 msgstr "Грашка при испаќањето на директната порака."
 
 #. TRANS: Message given having repeated a notice from another user.
 #. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:553
+#: lib/command.php:565
 #, php-format
 msgid "Notice from %s repeated."
 msgstr "Забелешката од %s е повторена."
 
 #. TRANS: Error text shown when repeating a notice fails with an unknown reason.
-#: lib/command.php:556
+#: lib/command.php:568
 msgid "Error repeating notice."
 msgstr "Грешка при повторувањето на белешката."
 
 #. TRANS: Message given if content of a notice for a reply is too long. %1$d is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:591
+#: lib/command.php:603
 #, php-format
 msgid "Notice too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Notice too long - maximum is %1$d characters, you sent %2$d."
@@ -8084,100 +8000,100 @@ msgstr[1] ""
 
 #. TRANS: Text shown having sent a reply to a notice successfully.
 #. TRANS: %s is the nickname of the user of the notice the reply was sent to.
-#: lib/command.php:604
+#: lib/command.php:616
 #, php-format
 msgid "Reply to %s sent."
 msgstr "Одговорот на %s е испратен."
 
 #. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
-#: lib/command.php:607
+#: lib/command.php:619
 msgid "Error saving notice."
 msgstr "Грешка при зачувувањето на белешката."
 
 #. TRANS: Error text shown when no username was provided when issuing a subscribe command.
-#: lib/command.php:654
+#: lib/command.php:666
 msgid "Specify the name of the user to subscribe to."
 msgstr "Назначете го името на корисникот на којшто сакате да се претплатите."
 
 #. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
-#: lib/command.php:663
+#: lib/command.php:675
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "Не можете да се претплаќате на OMB профили по наредба."
 
 #. TRANS: Text shown after having subscribed to another user successfully.
 #. TRANS: %s is the name of the user the subscription was requested for.
-#: lib/command.php:671
+#: lib/command.php:683
 #, php-format
 msgid "Subscribed to %s."
 msgstr "Претплатено на %s."
 
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.
-#: lib/command.php:692 lib/command.php:803
+#: lib/command.php:704 lib/command.php:815
 msgid "Specify the name of the user to unsubscribe from."
 msgstr "Назначете го името на корисникот од кого откажувате претплата."
 
 #. TRANS: Text shown after having unsubscribed from another user successfully.
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:703
+#: lib/command.php:715
 #, php-format
 msgid "Unsubscribed from %s."
 msgstr "Откажана претплата на %s."
 
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
-#: lib/command.php:723 lib/command.php:749
+#: lib/command.php:735 lib/command.php:761
 msgid "Command not yet implemented."
 msgstr "Наредбата сè уште не е имплементирана."
 
 #. TRANS: Text shown when issuing the command "off" successfully.
-#: lib/command.php:727
+#: lib/command.php:739
 msgid "Notification off."
 msgstr "Известувањето е исклучено."
 
 #. TRANS: Error text shown when the command "off" fails for an unknown reason.
-#: lib/command.php:730
+#: lib/command.php:742
 msgid "Can't turn off notification."
 msgstr "Не можам да исклучам известување."
 
 #. TRANS: Text shown when issuing the command "on" successfully.
-#: lib/command.php:753
+#: lib/command.php:765
 msgid "Notification on."
 msgstr "Известувањето е вклучено."
 
 #. TRANS: Error text shown when the command "on" fails for an unknown reason.
-#: lib/command.php:756
+#: lib/command.php:768
 msgid "Can't turn on notification."
 msgstr "Не можам да вклучам известување."
 
 #. TRANS: Error text shown when issuing the login command while login is disabled.
-#: lib/command.php:770
+#: lib/command.php:782
 msgid "Login command is disabled."
 msgstr "Наредбата за најава е оневозможена."
 
 #. TRANS: Text shown after issuing the login command successfully.
 #. TRANS: %s is a logon link..
-#: lib/command.php:783
+#: lib/command.php:795
 #, php-format
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr "Оваа врска може да се употреби само еднаш, и трае само 2 минути: %s"
 
 #. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:812
+#: lib/command.php:824
 #, php-format
 msgid "Unsubscribed %s."
 msgstr "Откажана претплата на %s."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
-#: lib/command.php:830
+#: lib/command.php:842
 msgid "You are not subscribed to anyone."
 msgstr "Не сте претплатени никому."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
-#: lib/command.php:835
+#: lib/command.php:847
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Не ни го испративте тој профил."
@@ -8185,14 +8101,14 @@ msgstr[1] "Не ни го испративте тој профил."
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user
 #. TRANS: (followers) without having any subscribers.
-#: lib/command.php:857
+#: lib/command.php:869
 msgid "No one is subscribed to you."
 msgstr "Никој не е претплатен на Вас."
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
-#: lib/command.php:862
+#: lib/command.php:874
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Оддалечена претплата"
@@ -8200,21 +8116,21 @@ msgstr[1] "Оддалечена претплата"
 
 #. TRANS: Text shown after requesting groups a user is subscribed to without having
 #. TRANS: any group subscriptions.
-#: lib/command.php:884
+#: lib/command.php:896
 msgid "You are not a member of any groups."
 msgstr "Не членувате во ниедна група."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
-#: lib/command.php:889
+#: lib/command.php:901
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "Не ни го испративте тој профил."
 msgstr[1] "Не ни го испративте тој профил."
 
 #. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-#: lib/command.php:904
+#: lib/command.php:916
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -8352,11 +8268,6 @@ msgstr "Овластени поврзани програми"
 msgid "Database error"
 msgstr "Грешка во базата на податоци"
 
-#. TRANS: Description of form for deleting a user.
-#: lib/deleteuserform.php:75
-msgid "Delete this user"
-msgstr "Избриши овој корисник"
-
 #. TRANS: Label in form on profile design page.
 #. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
 #: lib/designsettings.php:108
@@ -8393,21 +8304,6 @@ msgstr "Промена на бои"
 msgid "Use defaults"
 msgstr "Користи по основно"
 
-#. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: lib/designsettings.php:259
-msgid "Restore default designs"
-msgstr "Врати основно-зададени нагодувања"
-
-#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: lib/designsettings.php:267
-msgid "Reset back to default"
-msgstr "Врати по основно"
-
-#. TRANS: Title for button on profile design page to save settings.
-#: lib/designsettings.php:272
-msgid "Save design"
-msgstr "Зачувај изглед"
-
 #. TRANS: Error message displayed if design settings could not be saved.
 #. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
 #: lib/designsettings.php:405 lib/designsettings.php:427
@@ -9288,10 +9184,6 @@ msgstr "Одговори на забелешкава"
 msgid "Reply"
 msgstr "Одговор"
 
-#: lib/noticelist.php:673
-msgid "Delete this notice"
-msgstr "Избриши ја оваа забелешка"
-
 #: lib/noticelist.php:691
 msgid "Notice repeated"
 msgstr "Забелешката е повторена"
@@ -9567,10 +9459,6 @@ msgstr "Покани"
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Поканете пријатели и колеги да Ви се придружат на %s"
 
-#: lib/subscribeform.php:115 lib/subscribeform.php:139
-msgid "Subscribe to this user"
-msgstr "Претплати се на корисников"
-
 #: lib/subscriberspeopleselftagcloudsection.php:48
 #: lib/subscriptionspeopleselftagcloudsection.php:48
 msgid "People Tagcloud as self-tagged"
@@ -9743,23 +9631,18 @@ msgctxt "role"
 msgid "Moderator"
 msgstr "Модератор"
 
-#: lib/util.php:305
-#, fuzzy
-msgid "Not allowed to log in."
-msgstr "Не сте најавени."
-
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1309
+#: lib/util.php:1306
 msgid "a few seconds ago"
 msgstr "пред неколку секунди"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1312
+#: lib/util.php:1309
 msgid "about a minute ago"
 msgstr "пред една минута"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1316
+#: lib/util.php:1313
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
@@ -9767,12 +9650,12 @@ msgstr[0] "пред околу една минута"
 msgstr[1] "пред околу %d минути"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1319
+#: lib/util.php:1316
 msgid "about an hour ago"
 msgstr "пред еден час"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1323
+#: lib/util.php:1320
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
@@ -9780,12 +9663,12 @@ msgstr[0] "пред околу еден час"
 msgstr[1] "пред околу %d часа"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1326
+#: lib/util.php:1323
 msgid "about a day ago"
 msgstr "пред еден ден"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1330
+#: lib/util.php:1327
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
@@ -9793,12 +9676,12 @@ msgstr[0] "пред околу еден ден"
 msgstr[1] "пред околу %d дена"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1333
+#: lib/util.php:1330
 msgid "about a month ago"
 msgstr "пред еден месец"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1337
+#: lib/util.php:1334
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
@@ -9806,7 +9689,7 @@ msgstr[0] "пред околу еден месец"
 msgstr[1] "пред околу %d месеци"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1340
+#: lib/util.php:1337
 msgid "about a year ago"
 msgstr "пред една година"
 
@@ -9850,3 +9733,64 @@ msgstr "Неважечки XML. Нема XRD-корен."
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr "Земам резерва на податотеката „%s“."
+
+#~ msgid "Block this user."
+#~ msgstr "Блокирај го корисников."
+
+#~ msgid "Delete this notice."
+#~ msgstr "Избриши ја забелешкава."
+
+#~ msgid "Delete this user."
+#~ msgstr "Избриши го корисников."
+
+#~ msgid "Restore default designs."
+#~ msgstr "Врати ги изгледите по основно."
+
+#~ msgid "Reset back to default."
+#~ msgstr "Врати по основно."
+
+#~ msgid "Save design."
+#~ msgstr "Зачувај изглед."
+
+#~ msgid "Disfavor favorite."
+#~ msgstr "Тргни од бендисани."
+
+#~ msgid "\"%s\" not found."
+#~ msgstr "„%s“ не е пронајден."
+
+#~ msgid "Notice %s not found."
+#~ msgstr "Забелешката %s не е пронајдена."
+
+#~ msgid "Attachment %s not found."
+#~ msgstr "Прилогот %s не е пронајден."
+
+#~ msgid "\"%s\" not supported for oembed requests."
+#~ msgstr "„%s“ не е поддржано за oembed-барања."
+
+#~ msgid "Invalid tag: \"%s\"."
+#~ msgstr "Неважечка ознака: „%s“."
+
+#~ msgid "%s updates from everyone."
+#~ msgstr "%s подновувања од сите."
+
+#~ msgid "Password saved"
+#~ msgstr "Лозинката е зачувана"
+
+#~ msgid "Where you are, like \"City, State (or Region), Country\"."
+#~ msgstr "Каде се наоѓате, на пр. „Град, Сојуз. држава (или Област), Земја“."
+
+#~ msgid "Subscribe to this user."
+#~ msgstr "Претплати се на корисников."
+
+#~ msgid ""
+#~ "Listenee stream license \"%1$s\" is not compatible with site license \"%2"
+#~ "$s\"."
+#~ msgstr ""
+#~ "Лиценцата на каналот на следениот „%1$s“ не е складна на лиценцата на "
+#~ "мрежното место „%2$s“."
+
+#~ msgid "Not allowed to use API."
+#~ msgstr "Не е дозволено да се користи API."
+
+#~ msgid "Not allowed to log in."
+#~ msgstr "Не Ви е дозволено да се најавите."
diff --git a/locale/ml/LC_MESSAGES/statusnet.po b/locale/ml/LC_MESSAGES/statusnet.po
index b40dcfd870..d6cc5b405a 100644
--- a/locale/ml/LC_MESSAGES/statusnet.po
+++ b/locale/ml/LC_MESSAGES/statusnet.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-24 10:32+0000\n"
-"PO-Revision-Date: 2011-02-24 10:37:15+0000\n"
+"POT-Creation-Date: 2011-03-03 15:58+0000\n"
+"PO-Revision-Date: 2011-03-03 16:01:03+0000\n"
 "Language-Team: Malayalam <http://translatewiki.net/wiki/Portal:ml>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-17 11:39:54+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r82712); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-02-25 23:49:23+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ml\n"
 "X-Message-Group: #out-statusnet-core\n"
@@ -131,11 +131,7 @@ msgstr "അത്തരത്തിൽ ഒരു താളില്ല."
 #. 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 use "one time password login" without using an existing user.
-#. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
-#. TRANS: Client error displayed trying to find a user by ID for a non-existing ID.
-#. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when calling a profile action without specifying a user.
 #: actions/all.php:80 actions/allrss.php:69
@@ -153,12 +149,12 @@ msgstr "അത്തരത്തിൽ ഒരു താളില്ല."
 #: actions/apitimelinementions.php:77 actions/apitimelineuser.php:79
 #: actions/avatarbynickname.php:79 actions/favoritesrss.php:72
 #: actions/foaf.php:42 actions/foaf.php:61 actions/hcard.php:67
-#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:78
+#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
 #: actions/remotesubscribe.php:144 actions/remotesubscribe.php:153
-#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:113
-#: actions/showfavorites.php:106 actions/userbyid.php:75
+#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
+#: actions/showfavorites.php:106 actions/userbyid.php:74
 #: actions/usergroups.php:93 actions/userrss.php:40 actions/userxrd.php:59
-#: actions/xrds.php:71 lib/command.php:497 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:509 lib/galleryaction.php:59
 #: lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "അങ്ങനെ ഒരു ഉപയോക്താവില്ല."
@@ -280,7 +276,7 @@ msgstr ""
 #: actions/apigrouplistall.php:120 actions/apigroupmembership.php:105
 #: actions/apigroupshow.php:114 actions/apihelptest.php:84
 #: actions/apistatusesdestroy.php:101 actions/apistatusesretweets.php:110
-#: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:138
+#: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:139
 #: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
 #: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:268
 #: actions/apitimelinegroup.php:147 actions/apitimelinehome.php:173
@@ -505,7 +501,8 @@ msgstr "സ്വീകർത്താവായ ഉപയോക്താവി
 
 #. TRANS: Client error displayed trying to direct message another user who's not a friend (403).
 #: actions/apidirectmessagenew.php:144
-msgid "Cannot send direct messages to users who aren't your friend."
+#, fuzzy
+msgid "Can't send direct messages to users who aren't your friend."
 msgstr "താങ്കളുടെ സുഹൃത്തുക്കളല്ലാത്ത ഉപയോക്താക്കൾക്ക് നേരിട്ടുള്ള സന്ദേശങ്ങൾ അയയ്ക്കാൻ കഴിയില്ല."
 
 #. TRANS: Client error displayed trying to direct message self (403).
@@ -530,7 +527,7 @@ msgstr "ഈ സ്ഥിതിവിവരം മുമ്പേ തന്നെ
 #. TRANS: Client error displayed when marking a notice as favourite fails.
 #. TRANS: Server error displayed when trying to mark a notice as favorite fails in the database.
 #. TRANS: Error message text shown when a favorite could not be set.
-#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:294
+#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:306
 msgid "Could not create favorite."
 msgstr "പ്രിയങ്കരങ്ങൾ സൃഷ്ടിക്കാൻ കഴിഞ്ഞില്ല."
 
@@ -588,7 +585,7 @@ msgstr "ലക്ഷ്യമിട്ട ഉപയോക്താവിനെ 
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:191
 #: actions/newgroup.php:137 actions/profilesettings.php:273
-#: actions/register.php:206
+#: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "വിളിപ്പേര് മുമ്പേ ഉപയോഗത്തിലുണ്ട്. മറ്റൊരെണ്ണം ശ്രമിക്കുക."
 
@@ -598,7 +595,7 @@ msgstr "വിളിപ്പേര് മുമ്പേ ഉപയോഗത്
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:195
 #: actions/newgroup.php:141 actions/profilesettings.php:243
-#: actions/register.php:208
+#: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "സാധുവായ വിളിപ്പേര് അല്ല."
 
@@ -611,7 +608,7 @@ msgstr "സാധുവായ വിളിപ്പേര് അല്ല."
 #: actions/apigroupcreate.php:181 actions/editapplication.php:235
 #: actions/editgroup.php:202 actions/newapplication.php:221
 #: actions/newgroup.php:148 actions/profilesettings.php:248
-#: actions/register.php:215
+#: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "ഹോംപേജിന്റെ യൂ.ആർ.എൽ. സാധുവല്ല."
 
@@ -621,7 +618,7 @@ msgstr "ഹോംപേജിന്റെ യൂ.ആർ.എൽ. സാധുവ
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:191 actions/editgroup.php:206
 #: actions/newgroup.php:152 actions/profilesettings.php:252
-#: actions/register.php:218
+#: actions/register.php:226
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "പൂർണ്ണ നാമത്തിന്റെ നീളം വളരെ കൂടുതലാണ് (പരമാവധി 255 അക്ഷരങ്ങൾ)."
 
@@ -649,7 +646,7 @@ msgstr[1] "വിവരണത്തിനു നീളം കൂടുതലാ
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:215 actions/editgroup.php:218
 #: actions/newgroup.php:164 actions/profilesettings.php:265
-#: actions/register.php:227
+#: actions/register.php:235
 msgid "Location is too long (maximum 255 characters)."
 msgstr ""
 
@@ -705,14 +702,14 @@ msgstr "സംഘത്തെ കണ്ടെത്താനായില്ല."
 #. TRANS: Server error displayed when trying to join a group the user is already a member of.
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:333
+#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:345
 msgid "You are already a member of that group."
 msgstr "താങ്കൾ ആ സംഘത്തിൽ മുമ്പേ തന്നെ അംഗമാണ്."
 
 #. TRANS: Server error displayed when trying to join a group the user is blocked from joining.
 #. 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.
-#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:338
+#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:350
 msgid "You have been blocked from that group by the admin."
 msgstr "ആ സംഘത്തിൽ നിന്നും കാര്യനിർവ്വാഹകൻ താങ്കളെ തടഞ്ഞിരിക്കുന്നു."
 
@@ -722,7 +719,7 @@ msgstr "ആ സംഘത്തിൽ നിന്നും കാര്യനി
 #. TRANS: %1$s is the joining user's nickname, $2$s is the group nickname for which the join failed.
 #. TRANS: Message given having failed to add a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:350
+#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:362
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "%2$s എന്ന സംഘത്തിൽ %1$s എന്ന ഉപയോക്താവിനെ ചേർക്കാൻ കഴിഞ്ഞില്ല."
@@ -739,7 +736,7 @@ msgstr "താങ്കൾ ഈ സംഘത്തിൽ അംഗമല്ല."
 #. TRANS: Message given having failed to remove a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
 #: actions/apigroupleave.php:127 actions/leavegroup.php:133
-#: lib/command.php:398
+#: lib/command.php:410
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
 msgstr "%2$s എന്ന സംഘത്തിൽ നിന്നും %1$s  എന്ന ഉപയോക്താവിനെ നീക്കം ചെയ്യാൻ കഴിഞ്ഞില്ല."
@@ -799,21 +796,20 @@ msgstr "അഭ്യർത്ഥനാ ചീട്ട് മുമ്പേ ത
 #. TRANS: Form validation error message.
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
-#. TRANS: Client error displayed when the session token is not okay.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
 #: actions/deletenotice.php:177 actions/disfavor.php:75
 #: actions/emailsettings.php:291 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:65 actions/grouplogo.php:321
 #: actions/groupunblock.php:65 actions/imsettings.php:224
-#: actions/invite.php:60 actions/login.php:131 actions/makeadmin.php:66
+#: actions/invite.php:60 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
-#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:136
-#: actions/othersettings.php:155 actions/passwordsettings.php:137
+#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
+#: actions/othersettings.php:155 actions/passwordsettings.php:138
 #: actions/profilesettings.php:217 actions/recoverpassword.php:383
-#: actions/register.php:164 actions/remotesubscribe.php:76
+#: actions/register.php:172 actions/remotesubscribe.php:76
 #: actions/repeat.php:82 actions/smssettings.php:250 actions/subedit.php:40
-#: actions/subscribe.php:87 actions/tagother.php:166
-#: actions/unsubscribe.php:69 actions/userauthorization.php:53
+#: actions/subscribe.php:86 actions/tagother.php:166
+#: actions/unsubscribe.php:69 actions/userauthorization.php:52
 #: lib/designsettings.php:310
 msgid "There was a problem with your session token. Try again, please."
 msgstr "താങ്കളുടെ സെഷൻ ചീട്ടിൽ ഒരു ചെറിയ പ്രശ്നം. ദയവായി വീണ്ടും ശ്രമിക്കുക."
@@ -844,7 +840,7 @@ msgstr ""
 #: actions/designadminpanel.php:100 actions/editapplication.php:144
 #: actions/emailsettings.php:310 actions/grouplogo.php:332
 #: actions/imsettings.php:239 actions/newapplication.php:124
-#: actions/oauthconnectionssettings.php:145 actions/recoverpassword.php:46
+#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
 #: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
 msgstr "അപ്രതീക്ഷിത ഫോം സമർപ്പിക്കൽ."
@@ -889,20 +885,19 @@ msgstr "അംഗത്വം"
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group nickname (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT for nick name in a profile.
-#: actions/apioauthauthorize.php:459 actions/login.php:242
-#: actions/profilesettings.php:106 actions/register.php:418
+#: actions/apioauthauthorize.php:459 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:432
 #: actions/showgroup.php:243 actions/tagother.php:94
-#: actions/userauthorization.php:152 lib/groupeditform.php:145
+#: actions/userauthorization.php:145 lib/groupeditform.php:145
 #: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "വിളിപ്പേര്"
 
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:463 actions/login.php:245
-#: actions/register.php:422 lib/accountsettingsaction.php:120
+#: actions/apioauthauthorize.php:463 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:120
 msgid "Password"
 msgstr "രഹസ്യവാക്ക്"
 
@@ -993,13 +988,13 @@ msgstr "അത്തരത്തിൽ ഒരു അറിയിപ്പ് ഇ
 
 #. TRANS: Client error displayed trying to repeat an own notice through the API.
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:537
+#: actions/apistatusesretweet.php:83 lib/command.php:549
 msgid "Cannot repeat your own notice."
 msgstr "താങ്കൾക്ക് താങ്കളുടെ തന്നെ അറിയിപ്പ് ആവർത്തിക്കാനാവില്ല."
 
 #. TRANS: Client error displayed trying to re-repeat a notice through the API.
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:92 lib/command.php:543
+#: actions/apistatusesretweet.php:92 lib/command.php:555
 msgid "Already repeated that notice."
 msgstr "ആ അറിയിപ്പ് മുമ്പേ തന്നെ ആവർത്തിച്ചിരിക്കുന്നു."
 
@@ -1020,8 +1015,8 @@ msgstr "എച്ച്.റ്റി.റ്റി.പി. രീതി പിന
 #. TRANS: Exception thrown requesting an unsupported notice output format.
 #. TRANS: %s is the requested output format.
 #: actions/apistatusesshow.php:144
-#, php-format
-msgid "Unsupported format: %s."
+#, fuzzy, php-format
+msgid "Unsupported format: %s"
 msgstr "പിന്തുണയ്ക്കാത്തയിനം തരം: %s."
 
 #. TRANS: Client error displayed requesting a deleted status.
@@ -1126,14 +1121,13 @@ msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr ""
 
 #. TRANS: Title for site timeline. %s is the StatusNet sitename.
-#. TRANS: Public RSS feed title. %s is the StatusNet site name.
 #: actions/apitimelinepublic.php:193 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "%s സാർവ്വജനിക സമയരേഖ"
 
 #. TRANS: Subtitle for site timeline. %s is the StatusNet sitename.
-#: actions/apitimelinepublic.php:199
+#: actions/apitimelinepublic.php:199 actions/publicrss.php:105
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "%s പദ്ധതിയിൽ എല്ലാവരും അയച്ചിട്ടുള്ള പുതിയവാർത്തകൾ!"
@@ -1198,26 +1192,25 @@ msgid "Atom post must be an Atom entry."
 msgstr ""
 
 #. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
-#: actions/apitimelineuser.php:334
+#: actions/apitimelineuser.php:335
 msgid "Can only handle POST activities."
 msgstr ""
 
 #. TRANS: Client error displayed when using an unsupported activity object type.
 #. TRANS: %s is the unsupported activity object type.
-#: actions/apitimelineuser.php:345
+#: actions/apitimelineuser.php:346
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
 #. TRANS: %d is the notice ID (number).
-#: actions/apitimelineuser.php:379
+#: actions/apitimelineuser.php:380
 #, php-format
 msgid "No content for notice %d."
 msgstr "%d എന്ന അറിയിപ്പിനു ഉള്ളടക്കമില്ല"
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#. TRANS: %s is the notice URI.
 #: actions/apitimelineuser.php:408
 #, php-format
 msgid "Notice with URI \"%s\" already exists."
@@ -1235,10 +1228,9 @@ msgstr "ഉപയോക്താവിനെ കണ്ടത്താനായ
 
 #. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
 #. TRANS: Client exception.
-#. TRANS: Client error displayed trying to subscribe to a non-existing profile.
 #: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
 #: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
-#: actions/subscribe.php:110
+#: actions/subscribe.php:107
 msgid "No such profile."
 msgstr ""
 
@@ -1364,7 +1356,7 @@ msgstr "മറ്റൊരാൾക്ക് പ്രിയങ്കരമാ
 #: actions/joingroup.php:95 actions/leavegroup.php:82
 #: actions/leavegroup.php:95 actions/makeadmin.php:86
 #: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:380
+#: lib/command.php:392
 msgid "No such group."
 msgstr "അങ്ങനെ ഒരു സംഘം ഇല്ല."
 
@@ -1374,7 +1366,7 @@ msgid "Not a member."
 msgstr "അംഗം അല്ല"
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
-#: actions/atompubshowmembership.php:150
+#: actions/atompubshowmembership.php:151
 msgid "Cannot delete someone else's membership."
 msgstr "മറ്റൊരാളുടെ അംഗത്വം മായ്ക്കാനാവില്ല."
 
@@ -1477,11 +1469,9 @@ msgstr ""
 
 #. TRANS: Server error displayed in avatar upload page when no matching profile can be found for a user.
 #. TRANS: Server error displayed coming across a request from a user without a profile.
-#. TRANS: Server error displayed when trying to authorise a remote subscription request
-#. TRANS: while the user has no profile.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
 #: actions/grouplogo.php:184 actions/remotesubscribe.php:190
-#: actions/userauthorization.php:75 actions/userrss.php:108
+#: actions/userauthorization.php:72 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr ""
 
@@ -1536,10 +1526,10 @@ msgstr "വെട്ടിച്ചെറുതാക്കുക"
 msgid "No file uploaded."
 msgstr "പ്രമാണമൊന്നും അപ്‌ലോഡ് ചെയ്തിട്ടില്ല."
 
-#. TRANS: Avatar upload form instruction after uploading a file.
+#. TRANS: Avatar upload form unstruction after uploading a file.
 #: actions/avatarsettings.php:345
 #, fuzzy
-msgid "Pick a square area of the image to be your avatar."
+msgid "Pick a square area of the image to be your avatar"
 msgstr "ലോഗോ ആക്കാൻ ചിത്രത്തിന്റെ ഒരു സമചതുരത്തിലുള്ള ഭാഗം തിരഞ്ഞെടുക്കുക."
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
@@ -1580,7 +1570,7 @@ msgid "You may not backup your account."
 msgstr "താങ്കൾക്ക് താങ്കളുടെ അംഗത്വത്തിന്റെ ബാക്ക്അപ് എടുക്കാനായേക്കില്ല."
 
 #. TRANS: Information displayed on the backup account page.
-#: actions/backupaccount.php:225
+#: actions/backupaccount.php:227
 msgid ""
 "You can backup your account data in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format. This is an experimental feature and provides "
@@ -1590,14 +1580,15 @@ msgid ""
 msgstr ""
 
 #. TRANS: Submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:248
+#: actions/backupaccount.php:250
 msgctxt "BUTTON"
 msgid "Backup"
 msgstr "ബാക്ക്അപ്"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:252
-msgid "Backup your account."
+#: actions/backupaccount.php:254
+#, fuzzy
+msgid "Backup your account"
 msgstr "താങ്കളുടെ അംഗത്വത്തിന്റെ ബാക്ക്അപ് എടുക്കുക."
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
@@ -1635,7 +1626,8 @@ msgstr "അല്ല"
 
 #. TRANS: Submit button title for 'No' when blocking a user.
 #: actions/block.php:158
-msgid "Do not block this user."
+#, fuzzy
+msgid "Do not block this user"
 msgstr "ഈ ഉപയോക്താവിനെ തടയരുത്."
 
 #. TRANS: Button label on the user block form.
@@ -1652,9 +1644,10 @@ msgid "Yes"
 msgstr "അതെ"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:165
-msgid "Block this user."
-msgstr "ഈ ഉപയോക്താവിനെ തടയുക."
+#. TRANS: Description of the form to block a user.
+#: actions/block.php:165 lib/blockform.php:79
+msgid "Block this user"
+msgstr "ഈ ഉപയോക്താവിനെ തടയുക"
 
 #. TRANS: Server error displayed when blocking a user fails.
 #: actions/block.php:189
@@ -1813,7 +1806,7 @@ msgstr ""
 #. TRANS: Field label for delete account confirmation entry.
 #. TRANS: Field label for password reset form where the password has to be typed again.
 #: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:262 actions/register.php:426
+#: actions/recoverpassword.php:262 actions/register.php:440
 msgid "Confirm"
 msgstr "സ്ഥിരീകരിക്കുക"
 
@@ -1842,14 +1835,14 @@ msgstr ""
 #. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
 #: actions/deleteapplication.php:79 actions/editapplication.php:78
-#: actions/showapplication.php:90
+#: actions/showapplication.php:94
 msgid "You are not the owner of this application."
 msgstr ""
 
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
-#: actions/newapplication.php:112 actions/showapplication.php:113
-#: lib/action.php:1422
+#: actions/newapplication.php:112 actions/showapplication.php:118
+#: lib/action.php:1425
 msgid "There was a problem with your session token."
 msgstr "താങ്കളുടെ സെഷൻ ചീട്ടിൽ ഒരു പ്രശ്നമുണ്ടായിരുന്നു."
 
@@ -1870,13 +1863,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting an application.
 #: actions/deleteapplication.php:161
 #, fuzzy
-msgid "Do not delete this application."
+msgid "Do not delete this application"
 msgstr "ഈ അറിയിപ്പ് മായ്ക്കരുത്"
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
 #: actions/deleteapplication.php:167
 #, fuzzy
-msgid "Delete this application."
+msgid "Delete this application"
 msgstr "ഈ അറിയിപ്പ് മായ്ക്കുക"
 
 #. TRANS: Client error when trying to delete group while not logged in.
@@ -1927,12 +1920,14 @@ msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting a group.
 #: actions/deletegroup.php:224
-msgid "Do not delete this group."
+#, fuzzy
+msgid "Do not delete this group"
 msgstr "ഈ സംഘത്തെ മായ്ക്കരുത്."
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
 #: actions/deletegroup.php:231
-msgid "Delete this group."
+#, fuzzy
+msgid "Delete this group"
 msgstr "ഈ സംഘത്തെ മായ്ക്കുക."
 
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
@@ -1940,15 +1935,13 @@ msgstr "ഈ സംഘത്തെ മായ്ക്കുക."
 #. TRANS: Client error displayed when trying to mark a notice as favorite without being logged in.
 #. TRANS: Client error displayed trying to block a user from a group while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
-#. TRANS: Client error displayed trying to log out when not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
-#. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
 #. TRANS: Client error displayed when trying to change user options while not logged in.
 #: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
-#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:70
+#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
-#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:98
+#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
 #: lib/adminpanelaction.php:71 lib/profileformaction.php:63
 #: lib/settingsaction.php:72
@@ -1977,13 +1970,14 @@ msgstr "ഈ അറിയിപ്പ് ഒഴിവാക്കണമെന്
 
 #. TRANS: Submit button title for 'No' when deleting a notice.
 #: actions/deletenotice.php:159
-msgid "Do not delete this notice."
+#, fuzzy
+msgid "Do not delete this notice"
 msgstr "ഈ അറിയിപ്പ് മായ്ക്കരുത്."
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:166
-msgid "Delete this notice."
-msgstr "ഈ അറിയിപ്പ് മായ്ക്കുക."
+#: actions/deletenotice.php:166 lib/noticelist.php:673
+msgid "Delete this notice"
+msgstr "ഈ അറിയിപ്പ് മായ്ക്കുക"
 
 #. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
 #: actions/deleteuser.php:66
@@ -2017,13 +2011,15 @@ msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting a user.
 #: actions/deleteuser.php:158
-msgid "Do not delete this user."
+#, fuzzy
+msgid "Do not delete this user"
 msgstr "ഈ ഉപയോക്താവിനെ നീക്കം ചെയ്യരുത്."
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
-#: actions/deleteuser.php:165
-msgid "Delete this user."
-msgstr "ഈ ഉപയോക്താവിനെ നീക്കം ചെയ്യുക."
+#. TRANS: Description of form for deleting a user.
+#: actions/deleteuser.php:165 lib/deleteuserform.php:75
+msgid "Delete this user"
+msgstr "ഈ ഉപയോക്താവിനെ നീക്കം ചെയ്യുക"
 
 #. TRANS: Message used as title for design settings for the site.
 #. TRANS: Link description in user account settings menu.
@@ -2188,19 +2184,22 @@ msgid "Use defaults"
 msgstr "സ്വതേയുള്ളവ ഉപയോഗിക്കുക"
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:720
-msgid "Restore default designs."
-msgstr "സ്വതേയുള്ള രൂപകല്പനകൾ പുനഃസ്ഥാപിക്കുക."
+#. TRANS: Title for button on profile design page to reset all colour settings to default.
+#: actions/designadminpanel.php:720 lib/designsettings.php:259
+msgid "Restore default designs"
+msgstr "സ്വതേയുള്ള രൂപകല്പനകൾ പുനഃസ്ഥാപിക്കുക"
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:728
-msgid "Reset back to default."
-msgstr "മുമ്പ് സ്വതേയുണ്ടായിരുന്നതിലേയ്ക്ക് പുനഃസ്ഥാപിക്കുക."
+#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
+#: actions/designadminpanel.php:728 lib/designsettings.php:267
+msgid "Reset back to default"
+msgstr "മുമ്പ് സ്വതേയുണ്ടായിരുന്നതിലേയ്ക്ക് പുനഃസ്ഥാപിക്കുക"
 
 #. TRANS: Title for button for saving theme settings.
-#: actions/designadminpanel.php:736
-msgid "Save design."
-msgstr "രൂപകല്പന സേവ്‌ ചെയ്യുക."
+#. TRANS: Title for button on profile design page to save settings.
+#: actions/designadminpanel.php:736 lib/designsettings.php:272
+msgid "Save design"
+msgstr "രൂപകല്പന സേവ്‌ ചെയ്യുക"
 
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
 #: actions/disfavor.php:83
@@ -2231,7 +2230,7 @@ msgid "You must be logged in to edit an application."
 msgstr ""
 
 #. TRANS: Client error displayed trying to edit an application that does not exist.
-#: actions/editapplication.php:83 actions/showapplication.php:83
+#: actions/editapplication.php:83 actions/showapplication.php:87
 msgid "No such application."
 msgstr ""
 
@@ -2512,7 +2511,7 @@ msgid "Cannot normalize that email address."
 msgstr "സാധുവായ ഇമെയിൽ വിലാസം അല്ല."
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:393 actions/register.php:204
+#: actions/emailsettings.php:393 actions/register.php:212
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "സാധുവായ ഇമെയിൽ വിലാസം അല്ല."
@@ -2587,21 +2586,18 @@ msgstr "സ്വീകരിക്കാനുള്ള ഇമെയിൽ വ
 
 #. 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.
 #: actions/emailsettings.php:530 actions/emailsettings.php:554
-#: actions/smssettings.php:566 actions/smssettings.php:591
+#: actions/smssettings.php:565 actions/smssettings.php:588
 msgid "Could not update user record."
 msgstr "ഉപയോക്തൃ രേഖകൾ പുതുക്കാൻ കഴിഞ്ഞില്ല."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
-#. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:534 actions/smssettings.php:570
+#: actions/emailsettings.php:534 actions/smssettings.php:568
 msgid "Incoming email address removed."
 msgstr "സ്വീകരിക്കാനുള്ള ഇമെയിൽ വിലാസം നീക്കം ചെയ്തിരിക്കുന്നു."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
-#. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:558 actions/smssettings.php:595
+#: actions/emailsettings.php:558 actions/smssettings.php:591
 msgid "New incoming email address added."
 msgstr "സ്വീകരിക്കാനുള്ള പുതിയ ഇമെയിൽ വിലാസം കൂട്ടിച്ചേർത്തിരിക്കുന്നു."
 
@@ -2612,7 +2608,8 @@ msgstr "ഈ അറിയിപ്പ് മുമ്പേ തന്നെ പ
 
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
 #: actions/favor.php:95
-msgid "Disfavor favorite."
+#, fuzzy
+msgid "Disfavor favorite"
 msgstr "പ്രിയങ്കരമാണ് എന്നത് നീക്കം ചെയ്യുക."
 
 #. TRANS: Page title for first page of favorited notices.
@@ -2849,12 +2846,14 @@ msgstr ""
 
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
 #: actions/groupblock.php:191
-msgid "Do not block this user from this group."
+#, fuzzy
+msgid "Do not block this user from this group"
 msgstr "ഈ സംഘത്തിൽ നിന്നും ഈ ഉപയോക്താവിനെ തടയരുത്."
 
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
 #: actions/groupblock.php:198
-msgid "Block this user from this group."
+#, fuzzy
+msgid "Block this user from this group"
 msgstr "ഈ സംഘത്തിൽ നിന്നും ഈ ഉപയോക്താവിനെ തടയുക."
 
 #. TRANS: Server error displayed when trying to block a user from a group fails because of an application error.
@@ -2863,7 +2862,6 @@ msgid "Database error blocking user from group."
 msgstr "സംഘത്തിൽ നിന്നും ഉപയോക്താവിനെ തടയുമ്പോൾ ഡേറ്റാബേസ് പിഴവുണ്ടായി."
 
 #. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
-#. TRANS: Client error displayed trying to find a user by ID without providing an ID.
 #: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr "ഐ.ഡി. ഇല്ല."
@@ -3049,10 +3047,8 @@ msgid "Group search"
 msgstr "സംഘത്തിൽ തിരയുക"
 
 #. TRANS: Text on page where groups can be searched if no results were found for a query.
-#. TRANS: Text for notice search results is the query had no results.
-#. TRANS: Message on the "People search" page where a query has no results.
-#: actions/groupsearch.php:82 actions/noticesearch.php:122
-#: actions/peoplesearch.php:87
+#: actions/groupsearch.php:82 actions/noticesearch.php:117
+#: actions/peoplesearch.php:83
 msgid "No results."
 msgstr "ഫലങ്ങൾ ഒന്നുമില്ല"
 
@@ -3089,7 +3085,6 @@ msgid "User is not blocked from group."
 msgstr "ഉപയോക്താവ് സംഘത്തിൽ നിന്നും തടയപ്പെട്ടിട്ടില്ല."
 
 #. TRANS: Server error displayed when unblocking a user from a group fails because of an unknown error.
-#. TRANS: Server error displayed when removing a user block.
 #: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "തടയൽ നീക്കുന്നതിൽ പിഴവുണ്ടായി."
@@ -3180,8 +3175,7 @@ msgid "Publish a MicroID for my Jabber/Google Talk address."
 msgstr "ഇപ്പോഴത്തെ സ്ഥിരീകരിക്കപ്പെട്ട ജാബ്ബർ/ജിറ്റോക് വിലാസം"
 
 #. TRANS: Confirmation message for successful Instant Messaging preferences save.
-#. TRANS: Confirmation message after saving preferences.
-#: actions/imsettings.php:283 actions/othersettings.php:193
+#: actions/imsettings.php:283 actions/othersettings.php:192
 msgid "Preferences saved."
 msgstr "ക്രമീകരണങ്ങൾ സേവ് ചെയ്തു."
 
@@ -3439,7 +3433,7 @@ msgstr "ഒരു സംഘത്തിൽ നിന്നും പുറത്
 
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
-#: actions/leavegroup.php:103 lib/command.php:386
+#: actions/leavegroup.php:103 lib/command.php:398
 msgid "You are not a member of that group."
 msgstr "താങ്കൾ ആ സംഘത്തിൽ അംഗമല്ല."
 
@@ -3562,41 +3556,39 @@ msgstr "സേവ് ചെയ്യുക"
 msgid "Save license settings"
 msgstr "അനുമതി സജ്ജീകരണങ്ങൾ സേവ് ചെയ്യുക"
 
-#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
-#: actions/login.php:97 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
 msgid "Already logged in."
 msgstr "മുമ്പേ തന്നെ ലോഗിൻ ചെയ്തിട്ടുണ്ട്."
 
-#: actions/login.php:142
+#: actions/login.php:148
 msgid "Incorrect username or password."
 msgstr "ഉപയോക്തൃനാമമോ രഹസ്യവാക്കോ തെറ്റാണ്."
 
-#. TRANS: Server error displayed when a user object could not be created trying to login using "one time password login".
-#: actions/login.php:148 actions/otp.php:127
+#: actions/login.php:154 actions/otp.php:120
 msgid "Error setting user. You are probably not authorized."
 msgstr "ഉപയോക്തൃ സജ്ജീകരണത്തിൽ പിഴവുണ്ടായി. താങ്കൾക്ക് മിക്കവാറും അനുമതിയുണ്ടാവില്ല."
 
-#: actions/login.php:202 actions/login.php:253
+#: actions/login.php:210 actions/login.php:263
 msgid "Login"
 msgstr "പ്രവേശിക്കുക"
 
-#: actions/login.php:239
+#: actions/login.php:249
 msgid "Login to site"
 msgstr "സൈറ്റിലേക്ക് പ്രവേശിക്കുക"
 
-#: actions/login.php:248 actions/register.php:476
+#: actions/login.php:258 actions/register.php:490
 msgid "Remember me"
 msgstr "എന്നെ ഓർത്തുവെയ്ക്കുക"
 
-#: actions/login.php:249 actions/register.php:478
+#: actions/login.php:259 actions/register.php:492
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "ഭാവിയിൽ സ്വയം ലോഗിൻ ചെയ്യുക; പങ്ക് വെച്ച് ഉപയോഗിക്കുന്ന കമ്പ്യൂട്ടറുകളിൽ പാടില്ല!"
 
-#: actions/login.php:259
+#: actions/login.php:269
 msgid "Lost or forgotten password?"
 msgstr "രഹസ്യവാക്ക് നഷ്ടപ്പെടുകയോ മറക്കുകയോ ചെയ്തോ?"
 
-#: actions/login.php:277
+#: actions/login.php:288
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -3604,11 +3596,11 @@ msgstr ""
 "സുരക്ഷാകാരണങ്ങളാൽ, താങ്കളുടെ ഉപയോക്തൃനാമവും രഹസ്യവാക്കും സജ്ജീകരണങ്ങളിൽ മാറ്റം വരുത്തുന്നതിനു "
 "മുമ്പ് ഒരു പ്രാവശ്യം നൽകേണ്ടതാണ്."
 
-#: actions/login.php:281
+#: actions/login.php:292
 msgid "Login with your username and password."
 msgstr "താങ്കളുടെ ഉപയോക്തൃനാമവും രഹസ്യവാക്കും ഉപയോഗിച്ച് ലോഗിൻ ചെയ്യുക."
 
-#: actions/login.php:284
+#: actions/login.php:295
 #, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -3687,14 +3679,14 @@ msgid "New message"
 msgstr "പുതിയ സന്ദേശം"
 
 #. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
-#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:501
+#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:513
 msgid "You can't send a message to this user."
 msgstr "ഈ ഉപയോക്താവിന് സന്ദേശമയയ്ക്കാൻ താങ്കൾക്കാവില്ല."
 
 #. TRANS: Command exception text shown when trying to send a direct message to another user without content.
 #. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
-#: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:478
-#: lib/command.php:581
+#: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:490
+#: lib/command.php:593
 msgid "No content!"
 msgstr "ഉള്ളടക്കമില്ല!"
 
@@ -3703,7 +3695,7 @@ msgid "No recipient specified."
 msgstr "സ്വീകർത്താവിനെ വ്യക്തമാക്കിയിട്ടില്ല."
 
 #. TRANS: Error text shown when trying to send a direct message to self.
-#: actions/newmessage.php:167 lib/command.php:505
+#: actions/newmessage.php:167 lib/command.php:517
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr "താങ്കൾക്കു തന്നെ സന്ദേശം അയയ്ക്കരുത്; പകരം അത് പതുക്കെ സ്വയം പറയുക."
@@ -3714,7 +3706,7 @@ msgstr "സന്ദേശം അയച്ചു"
 
 #. TRANS: Message given have sent a direct message to another user.
 #. TRANS: %s is the name of the other user.
-#: actions/newmessage.php:188 lib/command.php:513
+#: actions/newmessage.php:188 lib/command.php:525
 #, php-format
 msgid "Direct message to %s sent."
 msgstr "%s എന്ന ഉപയോക്താവിന് നേരിട്ട് അയച്ച സന്ദേശങ്ങൾ."
@@ -3731,30 +3723,23 @@ msgstr "പുതിയ അറിയിപ്പ്"
 msgid "Notice posted"
 msgstr "അറിയിപ്പ് പ്രസിദ്ധീകരിച്ചിരിക്കുന്നു"
 
-#. TRANS: Instructions for Notice search page.
-#. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/noticesearch.php:69
+#: actions/noticesearch.php:68
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
 "by spaces; they must be 3 characters or more."
 msgstr ""
 
-#. TRANS: Title of the page where users can search for notices.
-#: actions/noticesearch.php:80
+#: actions/noticesearch.php:78
 msgid "Text search"
 msgstr "എഴുത്തുകളിലെ തിരച്ചിൽ"
 
-#. TRANS: Test in RSS notice search.
-#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearch.php:95
+#: actions/noticesearch.php:91
 #, php-format
 msgid "Search results for \"%1$s\" on %2$s"
 msgstr ""
 
-#. TRANS: Text for logged in users making a query for notices without results.
-#. TRANS: This message contains a Markdown link.
-#: actions/noticesearch.php:128
+#: actions/noticesearch.php:121
 #, php-format
 msgid ""
 "Be the first to [post on this topic](%%%%action.newnotice%%%%?"
@@ -3762,9 +3747,7 @@ msgid ""
 msgstr ""
 "[ഈ വിഷയത്തിൽ കുറിപ്പിടുന്ന](%%%%action.newnotice%%%%?status_textarea=%s) ആദ്യയാളാകൂ!"
 
-#. TRANS: Text for not logged in users making a query for notices without results.
-#. TRANS: This message contains Markdown links.
-#: actions/noticesearch.php:133
+#: actions/noticesearch.php:124
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and be the first to "
@@ -3773,17 +3756,14 @@ msgstr ""
 "എന്തുകൊണ്ട് [അംഗത്വമെടുക്കുകയും](%%%%action.register%%%%) [ഈ വിഷയത്തിൽ കുറിപ്പിടുന്ന](%%%%"
 "action.newnotice%%%%?status_textarea=%s) ആദ്യയാളാകുകയും ചെയ്തുകൂട!"
 
-#. TRANS: RSS notice search feed title. %s is the query.
-#: actions/noticesearchrss.php:95
+#: actions/noticesearchrss.php:96
 #, php-format
 msgid "Updates with \"%s\""
 msgstr ""
 
-#. TRANS: RSS notice search feed description.
-#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearchrss.php:99
+#: actions/noticesearchrss.php:98
 #, fuzzy, php-format
-msgid "Updates matching search term \"%1$s\" on %2$s."
+msgid "Updates matching search term \"%1$s\" on %2$s!"
 msgstr "%2$s സൈറ്റിലെ %1$s സംഘാങ്ങളുടെ പുതുക്കലുകൾ!"
 
 #: actions/nudge.php:85
@@ -3822,30 +3802,30 @@ msgid "You have not registered any applications yet."
 msgstr ""
 
 #. TRANS: Title for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:70
+#: actions/oauthconnectionssettings.php:71
 msgid "Connected applications"
 msgstr ""
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:81
+#: actions/oauthconnectionssettings.php:83
 msgid "The following connections exist for your account."
 msgstr ""
 
 #. TRANS: Client error when trying to revoke access for an application while not being a user of it.
-#: actions/oauthconnectionssettings.php:166
+#: actions/oauthconnectionssettings.php:168
 msgid "You are not a user of that application."
 msgstr ""
 
 #. TRANS: Client error when revoking access has failed for some reason.
 #. TRANS: %s is the application ID revoking access failed for.
-#: actions/oauthconnectionssettings.php:181
+#: actions/oauthconnectionssettings.php:183
 #, php-format
 msgid "Unable to revoke access for application: %s."
 msgstr ""
 
 #. TRANS: Success message after revoking access for an application.
 #. TRANS: %1$s is the application name, %2$s is the first part of the user token.
-#: actions/oauthconnectionssettings.php:200
+#: actions/oauthconnectionssettings.php:202
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -3853,30 +3833,20 @@ msgid ""
 msgstr ""
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:211
+#: actions/oauthconnectionssettings.php:213
 msgid "You have not authorized any applications to use your account."
 msgstr ""
 
 #. TRANS: Note for developers in the OAuth connection settings form.
 #. TRANS: This message contains a Markdown link. Do not separate "](".
 #. TRANS: %s is the URL to the OAuth settings.
-#: actions/oauthconnectionssettings.php:231
+#: actions/oauthconnectionssettings.php:233
 #, php-format
 msgid ""
 "Are you a developer? [Register an OAuth client application](%s) to use with "
 "this instance of StatusNet."
 msgstr ""
 
-#: actions/oembed.php:64
-#, fuzzy, php-format
-msgid "\"%s\" not found."
-msgstr "ഉപയോക്താവിനെ കണ്ടത്താനായില്ല."
-
-#: actions/oembed.php:76
-#, php-format
-msgid "Notice %s not found."
-msgstr "%s എന്ന അറിയിപ്പ് കണ്ടെത്താനായില്ല."
-
 #: actions/oembed.php:80 actions/shownotice.php:100
 msgid "Notice has no profile."
 msgstr ""
@@ -3886,16 +3856,6 @@ msgstr ""
 msgid "%1$s's status on %2$s"
 msgstr "%2$s പദ്ധതിയിൽ %1$s എന്ന ഉപയോക്താവിന്റെ സ്ഥിതിവിവരം"
 
-#: actions/oembed.php:95
-#, fuzzy, php-format
-msgid "Attachment %s not found."
-msgstr "സ്വീകർത്താവായ ഉപയോക്താവിനെ കണ്ടെത്താനായില്ല."
-
-#: actions/oembed.php:136
-#, php-format
-msgid "\"%s\" not supported for oembed requests."
-msgstr ""
-
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
 #: actions/oembed.php:168
 #, php-format
@@ -3914,12 +3874,11 @@ msgstr ""
 msgid "Not a supported data format."
 msgstr "പിന്തുണയില്ലാത്ത തരം ഡേറ്റ."
 
-#. TRANS: ShortName in the OpenSearch interface when trying to find users.
 #: actions/opensearch.php:64
 msgid "People Search"
 msgstr "ഉപയോക്താക്കളെ തിരയുക"
 
-#: actions/opensearch.php:68
+#: actions/opensearch.php:67
 msgid "Notice Search"
 msgstr "അറിയിപ്പുകൾ തിരയുക"
 
@@ -3966,46 +3925,37 @@ msgstr ""
 msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr "യൂ.ആർ.എൽ. ചെറുതാക്കൽ സേവനം വളരെ വലുതാണ് (പരമാവധി 50 അക്ഷരങ്ങൾ)."
 
-#. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
-#: actions/otp.php:70
+#: actions/otp.php:69
 msgid "No user ID specified."
 msgstr "ഉപയോക്തൃ ഐ.ഡി. വ്യക്തമാക്കിയിട്ടില്ല."
 
-#. TRANS: Client error displayed trying to use "one time password login" without specifying a login token.
-#: actions/otp.php:86
+#: actions/otp.php:83
 msgid "No login token specified."
 msgstr "ലോഗിൻ ചീട്ട് വ്യക്തമാക്കിയിട്ടില്ല."
 
-#. TRANS: Client error displayed trying to use "one time password login" without requesting a login token.
-#: actions/otp.php:94
+#: actions/otp.php:90
 msgid "No login token requested."
 msgstr "ലോഗിൻ ചീറ്റ് ആവശ്യപ്പെട്ടിട്ടില്ല."
 
-#. TRANS: Client error displayed trying to use "one time password login" while specifying an invalid login token.
-#: actions/otp.php:100
+#: actions/otp.php:95
 msgid "Invalid login token specified."
 msgstr "വ്യക്തമാക്കിയത് അസാധുവായ ലോഗിൻ ചീട്ട് ആണ്."
 
-#. TRANS: Client error displayed trying to use "one time password login" while specifying an expired login token.
-#: actions/otp.php:110
+#: actions/otp.php:104
 msgid "Login token expired."
 msgstr "ലോഗിൻ ചീട്ട് കാലഹരണപ്പെട്ടിരിക്കുന്നു."
 
-#. TRANS: Title for outbox for any but the fist page.
-#. TRANS: %1$s is the user nickname, %2$d is the page number.
-#: actions/outbox.php:57
+#: actions/outbox.php:58
 #, php-format
 msgid "Outbox for %1$s - page %2$d"
 msgstr "%1$s എന്ന ഉപയോക്താവിന്റെ ഔട്ട്ബോക്സ് - താൾ %2$d"
 
-#. TRANS: Title for first page of outbox.
 #: actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
 msgstr "%s എന്ന ഉപയോക്താവിന്റെ ഔട്ട്ബോക്സ്"
 
-#. TRANS: Instructions for outbox.
-#: actions/outbox.php:103
+#: actions/outbox.php:104
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr "ഇത് താങ്കളുടെ ഔട്ട്ബോക്സ് ആണ്, താങ്കൾ അയച്ച സ്വകാര്യ സന്ദേശങ്ങൾ ഇവിടെ കാണാം."
 
@@ -4031,42 +3981,43 @@ msgstr "പഴയ രഹസ്യവാക്ക്"
 msgid "New password"
 msgstr "പുതിയ രഹസ്യവാക്ക്"
 
-#: actions/passwordsettings.php:109 actions/register.php:423
-msgid "6 or more characters."
+#: actions/passwordsettings.php:109
+#, fuzzy
+msgid "6 or more characters"
 msgstr "ആറോ അതിലധികമോ അക്ഷരങ്ങൾ."
 
-#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:264
-#: actions/register.php:427
-msgid "Same as password above."
+#: actions/passwordsettings.php:113
+#, fuzzy
+msgid "Same as password above"
 msgstr "മുകളിൽ നൽകിയ അതേ രഹസ്യവാക്ക്."
 
 #: actions/passwordsettings.php:117
 msgid "Change"
 msgstr "മാറ്റുക"
 
-#: actions/passwordsettings.php:153 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:238
 msgid "Password must be 6 or more characters."
 msgstr "രഹസ്യവാക്കിന് ആറോ അതിലധികമോ അക്ഷരങ്ങളുണ്ടായിരിക്കണം."
 
-#: actions/passwordsettings.php:156 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:241
 msgid "Passwords don't match."
 msgstr "രഹസ്യവാക്കുകൾ തമ്മിൽ യോജിക്കുന്നില്ല"
 
-#: actions/passwordsettings.php:164
+#: actions/passwordsettings.php:165
 msgid "Incorrect old password"
 msgstr "പഴയ രഹസ്യവാക്ക് തെറ്റാണ്"
 
-#: actions/passwordsettings.php:180
+#: actions/passwordsettings.php:181
 msgid "Error saving user; invalid."
 msgstr "ഉപയോക്താവിനെ സേവ് ചെയ്യുന്നതിൽ പിഴവുണ്ടായി; അസാധുവാണ്."
 
-#. TRANS: Reset password form validation error message.
-#: actions/passwordsettings.php:185 actions/recoverpassword.php:418
-msgid "Cannot save new password."
+#: actions/passwordsettings.php:186
+#, fuzzy
+msgid "Can't save new password."
 msgstr "പുതിയ രഹസ്യവാക്ക് സേവ് ചെയ്യാനാവില്ല."
 
-#: actions/passwordsettings.php:191
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
 msgid "Password saved."
 msgstr "രഹസ്യവാക്ക് സേവ് ചെയ്തിരിക്കുന്നു."
 
@@ -4340,17 +4291,14 @@ msgstr ""
 msgid "Save paths"
 msgstr ""
 
-#. TRANS: Instructions for the "People search" page.
-#. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/peoplesearch.php:54
+#: actions/peoplesearch.php:52
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
 "Separate the terms by spaces; they must be 3 characters or more."
 msgstr ""
 
-#. TRANS: Title of a page where users can search for other users.
-#: actions/peoplesearch.php:61
+#: actions/peoplesearch.php:58
 msgid "People search"
 msgstr "ആൾക്കാരെ തിരയുക"
 
@@ -4392,14 +4340,14 @@ msgid "Profile information"
 msgstr ""
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109 actions/register.php:419
+#: actions/profilesettings.php:109 actions/register.php:433
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr ""
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for full group name (dt). Text hidden by default.
 #. TRANS: DT for full name in a profile.
-#: actions/profilesettings.php:113 actions/register.php:441
+#: actions/profilesettings.php:113 actions/register.php:455
 #: actions/showgroup.php:255 actions/tagother.php:104
 #: lib/groupeditform.php:150 lib/userprofile.php:156
 msgid "Full name"
@@ -4407,13 +4355,13 @@ msgstr "പൂർണ്ണനാമം"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:118 actions/register.php:446
+#: actions/profilesettings.php:118 actions/register.php:460
 #: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "ഹോംപേജ്"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:121 actions/register.php:448
+#: actions/profilesettings.php:121
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr ""
 "താങ്കളുടെ ഹോംപേജിന്റെ, ബ്ലോഗിന്റെ അല്ലെങ്കിൽ മറ്റൊരു സൈറ്റിലെ താങ്കളെക്കുറിച്ചുള്ള "
@@ -4422,7 +4370,7 @@ msgstr ""
 #. TRANS: Tooltip for field label in form for profile settings. Plural
 #. TRANS: is decided by the number of characters available for the
 #. TRANS: biography (%d).
-#: actions/profilesettings.php:129 actions/register.php:457
+#: actions/profilesettings.php:129 actions/register.php:471
 #, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4430,29 +4378,28 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:135 actions/register.php:462
+#: actions/profilesettings.php:135 actions/register.php:476
 msgid "Describe yourself and your interests"
 msgstr "താങ്കളെക്കുറിച്ചും താങ്കളുടെ ഇഷ്ടങ്ങളെക്കുറിച്ചും വിവരിക്കുക"
 
 #. TRANS: Text area label in form for profile settings where users can provide.
 #. TRANS: their biography.
-#: actions/profilesettings.php:139 actions/register.php:464
+#: actions/profilesettings.php:139 actions/register.php:478
 msgid "Bio"
 msgstr ""
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group location (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT for location in a profile.
-#: actions/profilesettings.php:145 actions/register.php:469
+#: actions/profilesettings.php:145 actions/register.php:483
 #: actions/showgroup.php:265 actions/tagother.php:112
-#: actions/userauthorization.php:174 lib/groupeditform.php:173
+#: actions/userauthorization.php:166 lib/groupeditform.php:173
 #: lib/userprofile.php:172
 msgid "Location"
 msgstr "സ്ഥലം"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148
+#: actions/profilesettings.php:148 actions/register.php:485
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "താങ്കളെവിടെയാണ്, അതായത് \"നഗരം, സംസ്ഥാനം (അഥവ പ്രദേശം), രാജ്യം\" എന്ന്"
 
@@ -4472,8 +4419,7 @@ msgstr "റ്റാഗുകൾ"
 #. TRANS: Tooltip for field label in form for profile settings.
 #: actions/profilesettings.php:164
 msgid ""
-"Tags for yourself (letters, numbers, -, ., and _), comma- or space- "
-"separated."
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr ""
 
 #. TRANS: Dropdownlist label in form for profile settings.
@@ -4483,7 +4429,8 @@ msgstr "ഭാഷ"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
 #: actions/profilesettings.php:171
-msgid "Preferred language."
+#, fuzzy
+msgid "Preferred language"
 msgstr "പ്രിയങ്കര ഭാഷ."
 
 #. TRANS: Dropdownlist label in form for profile settings.
@@ -4499,13 +4446,13 @@ msgstr "താങ്കൾ സാധാരണയുണ്ടാകാറുള
 #. TRANS: Checkbox label in form for profile settings.
 #: actions/profilesettings.php:189
 msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)."
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr ""
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Plural form is used based on the maximum number of allowed
 #. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:258 actions/register.php:221
+#: actions/profilesettings.php:258 actions/register.php:229
 #, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4524,9 +4471,9 @@ msgstr "ഭാഷയുടെ നീളം വളരെ കൂടുതലാണ
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:291
-#, fuzzy, php-format
-msgid "Invalid tag: \"%s\"."
+#: actions/profilesettings.php:291 actions/tagother.php:178
+#, php-format
+msgid "Invalid tag: \"%s\""
 msgstr "അസാധുവായ റ്റാഗ്: \"%s\""
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
@@ -4629,12 +4576,6 @@ msgid ""
 "tool."
 msgstr ""
 
-#. TRANS: Public RSS feed description. %s is the StatusNet site name.
-#: actions/publicrss.php:106
-#, fuzzy, php-format
-msgid "%s updates from everyone."
-msgstr "%s പദ്ധതിയിൽ എല്ലാവരും അയച്ചിട്ടുള്ള പുതിയവാർത്തകൾ!"
-
 #. TRANS: Title for public tag cloud.
 #: actions/publictagcloud.php:57
 msgid "Public tag cloud"
@@ -4770,11 +4711,6 @@ msgstr "രഹസ്യവാക്ക് വീണ്ടെടുക്കു
 msgid "Password recovery requested"
 msgstr "രഹസ്യവാക്ക് വീണ്ടെടുക്കൽ ആവശ്യപ്പെട്ടിരിക്കുന്നു"
 
-#. TRANS: Title for password recovery page in password saved mode.
-#: actions/recoverpassword.php:229
-msgid "Password saved"
-msgstr "രഹസ്യവാക്ക് സേവ് ചെയ്തിരിക്കുന്നു"
-
 #. TRANS: Title for password recovery page when an unknown action has been specified.
 #: actions/recoverpassword.php:232
 msgid "Unknown action"
@@ -4785,6 +4721,11 @@ msgstr "അജ്ഞാതമായ പ്രവൃത്തി"
 msgid "6 or more characters, and do not forget it!"
 msgstr "ആറോ അതിലധികമോ അക്ഷരങ്ങൾ, അത് മറക്കരുത്!"
 
+#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#: actions/recoverpassword.php:264 actions/register.php:441
+msgid "Same as password above."
+msgstr "മുകളിൽ നൽകിയ അതേ രഹസ്യവാക്ക്."
+
 #. TRANS: Button text for password reset form.
 #. TRANS: Button text on profile design page to reset all colour settings to default without saving.
 #: actions/recoverpassword.php:268 lib/designsettings.php:264
@@ -4836,8 +4777,13 @@ msgstr "രഹസ്യവാക്കിന് ആറോ അതിലധിക
 msgid "Password and confirmation do not match."
 msgstr "രഹസ്യവാക്കും സ്ഥിരീകരണവും യോജിക്കുന്നില്ല."
 
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:418
+msgid "Cannot save new password."
+msgstr "പുതിയ രഹസ്യവാക്ക് സേവ് ചെയ്യാനാവില്ല."
+
 #. TRANS: Server error displayed when something does wrong with the user object during password reset.
-#: actions/recoverpassword.php:426 actions/register.php:248
+#: actions/recoverpassword.php:426 actions/register.php:256
 msgid "Error setting user."
 msgstr "ഉപയോക്താവിനെ സജ്ജീകരിക്കുന്നതിൽ പിഴവുണ്ടായി."
 
@@ -4846,96 +4792,107 @@ msgstr "ഉപയോക്താവിനെ സജ്ജീകരിക്ക
 msgid "New password successfully saved. You are now logged in."
 msgstr "പുതിയ രഹസ്യവാക്ക് വിജയകരമായി സേവ് ചെയ്തു. താങ്കൾക്ക് ലോഗിൻ ചെയ്യാവുന്നതാണ്."
 
-#: actions/register.php:87 actions/register.php:188 actions/register.php:399
+#: actions/register.php:92 actions/register.php:196 actions/register.php:413
 msgid "Sorry, only invited people can register."
 msgstr "ക്ഷമിക്കുക, ക്ഷണിക്കപ്പെട്ടവർക്കു മാത്രമേ അംഗത്വമെടുക്കാനാകൂ."
 
-#: actions/register.php:94
+#: actions/register.php:99
 msgid "Sorry, invalid invitation code."
 msgstr "ക്ഷമിക്കുക, ക്ഷണത്തിന്റെ കോഡ് അസാധുവാണ്."
 
-#: actions/register.php:113
+#: actions/register.php:119
 msgid "Registration successful"
 msgstr "അംഗത്വമെടുക്കൽ വിജയകരം"
 
-#: actions/register.php:115 actions/register.php:497
+#: actions/register.php:121 actions/register.php:511
 msgid "Register"
 msgstr "അംഗത്വമെടുക്കുക"
 
-#: actions/register.php:135
+#: actions/register.php:142
 msgid "Registration not allowed."
 msgstr "അംഗത്വമെടുക്കൽ അനുവദിച്ചിട്ടില്ല."
 
-#: actions/register.php:201
-msgid "You cannot register if you don't agree to the license."
+#: actions/register.php:209
+#, fuzzy
+msgid "You can't register if you don't agree to the license."
 msgstr "താങ്കൾ അനുവാദ പത്രം അംഗീകരിക്കുകയില്ലെങ്കിൽ ഭാഗമാകാനാകില്ല."
 
-#: actions/register.php:210
+#: actions/register.php:218
 msgid "Email address already exists."
 msgstr "ഇമെയിൽ വിലാസം മുമ്പേ നിലവിലുണ്ട്."
 
-#: actions/register.php:243 actions/register.php:265
+#: actions/register.php:251 actions/register.php:273
 msgid "Invalid username or password."
 msgstr "ഉപയോക്തൃനാമമോ രഹസ്യവാക്കോ അസാധുവാണ്."
 
-#: actions/register.php:340
+#: actions/register.php:351
+#, fuzzy
 msgid ""
 "With this form you can create a new account. You can then post notices and "
-"link up to friends and colleagues."
+"link up to friends and colleagues. "
 msgstr ""
 "ഈ ഫോം ഉപയോഗിച്ച് താങ്കൾക്ക് പുതിയൊരു അംഗത്വം സൃഷ്ടിക്കാനാകും. പിന്നീട് താങ്കൾക്ക് അറിയിപ്പുകൾ "
 "പ്രസിദ്ധീകരിക്കാനും സുഹൃത്തുക്കളേയും സഹപ്രവർത്തകരേയും കണ്ണിചേർക്കാനുമാകും."
 
+#: actions/register.php:437
+msgid "6 or more characters."
+msgstr "ആറോ അതിലധികമോ അക്ഷരങ്ങൾ."
+
 #. TRANS: Link description in user account settings menu.
-#: actions/register.php:431 actions/register.php:435
+#: actions/register.php:445 actions/register.php:449
 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
 msgid "Email"
 msgstr "ഇമെയിൽ"
 
-#: actions/register.php:432 actions/register.php:436
-msgid "Used only for updates, announcements, and password recovery."
+#: actions/register.php:446 actions/register.php:450
+#, fuzzy
+msgid "Used only for updates, announcements, and password recovery"
 msgstr ""
 "പുതുക്കൽ വിവരങ്ങൾക്കും, അറിയിപ്പുകൾക്കും, രഹസ്യവാക്ക് വീണ്ടെടുക്കൽ പ്രവർത്തനത്തിനും മാത്രം "
 "ഉപയോഗിച്ചത്."
 
-#: actions/register.php:443
-msgid "Longer name, preferably your \"real\" name."
+#: actions/register.php:457
+#, fuzzy
+msgid "Longer name, preferably your \"real\" name"
 msgstr "വലിയ പേര്, താങ്കളുടെ \"യഥാർത്ഥ\" പേര് നൽകാൻ താത്പര്യപ്പെടുന്നു."
 
-#: actions/register.php:471
-msgid "Where you are, like \"City, State (or Region), Country\"."
-msgstr "താങ്കളെവിടെയാണ്, അതായത് \"നഗരം, സംസ്ഥാനം (അഥവ പ്രദേശം), രാജ്യം\" എന്നിവ."
+#: actions/register.php:462
+#, fuzzy
+msgid "URL of your homepage, blog, or profile on another site"
+msgstr ""
+"താങ്കളുടെ ഹോംപേജിന്റെ, ബ്ലോഗിന്റെ അല്ലെങ്കിൽ മറ്റൊരു സൈറ്റിലെ താങ്കളെക്കുറിച്ചുള്ള "
+"താളിലേയ്ക്കുള്ള യൂ.ആർ.എൽ."
 
-#: actions/register.php:510
+#: actions/register.php:523
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
 msgstr ""
 
-#: actions/register.php:520
+#: actions/register.php:533
 #, php-format
 msgid "My text and files are copyright by %1$s."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:524
+#: actions/register.php:537
 msgid "My text and files remain under my own copyright."
 msgstr "എന്റെ എഴുത്തുകളും പ്രമാണങ്ങളും എന്റെ സ്വന്തം പകർപ്പവകാശത്തിലായിരിക്കും."
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:527
+#: actions/register.php:540
 msgid "All rights reserved."
 msgstr "എല്ലാ അവകാശങ്ങളും സംരക്ഷിതം."
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:532
+#: actions/register.php:545
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
 "email address, IM address, and phone number."
 msgstr ""
 
-#: actions/register.php:573
+#: actions/register.php:588
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -4954,7 +4911,7 @@ msgid ""
 "Thanks for signing up and we hope you enjoy using this service."
 msgstr ""
 
-#: actions/register.php:597
+#: actions/register.php:612
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -4983,7 +4940,8 @@ msgid "User nickname"
 msgstr "ഉപയോക്തൃ വിളിപ്പേര്"
 
 #: actions/remotesubscribe.php:129
-msgid "Nickname of the user you want to follow."
+#, fuzzy
+msgid "Nickname of the user you want to follow"
 msgstr "താങ്കൾക്ക് പിന്തുടരേണ്ട ഉപയോക്താവിന്റെ വിളിപ്പേര്."
 
 #: actions/remotesubscribe.php:132
@@ -4991,7 +4949,7 @@ msgid "Profile URL"
 msgstr ""
 
 #: actions/remotesubscribe.php:133
-msgid "URL of your profile on another compatible microblogging service."
+msgid "URL of your profile on another compatible microblogging service"
 msgstr ""
 
 #. TRANS: Link text for link that will subscribe to a remote profile.
@@ -5002,7 +4960,7 @@ msgstr "വരിക്കാരാകുക"
 
 #: actions/remotesubscribe.php:158
 #, fuzzy
-msgid "Invalid profile URL (bad format)."
+msgid "Invalid profile URL (bad format)"
 msgstr "പ്രമാണത്തിന്റെ പേര് അസാധുവാണ്."
 
 #: actions/remotesubscribe.php:167
@@ -5042,7 +5000,6 @@ msgstr "ആവർത്തിച്ചു"
 msgid "Repeated!"
 msgstr "ആവർത്തിച്ചു!"
 
-#. TRANS: RSS reply feed title. %s is a user nickname.
 #. TRANS: Tooltip for personal group navigation menu option when logged in for viewing @-replies.
 #: actions/replies.php:126 actions/repliesrss.php:68
 #: lib/personalgroupnav.php:109
@@ -5091,11 +5048,9 @@ msgid ""
 "newnotice%%%%?status_textarea=%3$s)."
 msgstr ""
 
-#. TRANS: RSS reply feed description.
-#. TRANS: %1$s is a user nickname, %2$s is the StatusNet site name.
-#: actions/repliesrss.php:74
+#: actions/repliesrss.php:72
 #, fuzzy, php-format
-msgid "Replies to %1$s on %2$s."
+msgid "Replies to %1$s on %2$s!"
 msgstr "%2$s സംരംഭത്തിൽ %1$s എന്ന ഉപയോക്താവിന് അയച്ച മറുപടികൾ!"
 
 #. TRANS: Client exception displayed when trying to restore an account while not logged in.
@@ -5190,7 +5145,7 @@ msgstr ""
 msgid "User doesn't have this role."
 msgstr ""
 
-#: actions/rsd.php:142 actions/version.php:159
+#: actions/rsd.php:146 actions/version.php:159
 msgid "StatusNet"
 msgstr "സ്റ്റാറ്റസ്‌നെറ്റ്"
 
@@ -5232,87 +5187,87 @@ msgstr ""
 msgid "Save site settings"
 msgstr "സൈറ്റ് സജ്ജീകരണങ്ങൾ ചേവ് ചെയ്യുക"
 
-#: actions/showapplication.php:78
+#: actions/showapplication.php:82
 msgid "You must be logged in to view an application."
 msgstr ""
 
-#: actions/showapplication.php:151
+#: actions/showapplication.php:157
 msgid "Application profile"
 msgstr ""
 
 #. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:153 lib/applicationeditform.php:177
+#: actions/showapplication.php:159 lib/applicationeditform.php:177
 msgid "Icon"
 msgstr "ഐകോൺ"
 
 #. TRANS: Form input field label for application name.
-#: actions/showapplication.php:163 actions/version.php:197
+#: actions/showapplication.php:169 actions/version.php:197
 #: lib/applicationeditform.php:190
 msgid "Name"
 msgstr "പേര്"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:172 lib/applicationeditform.php:227
+#: actions/showapplication.php:178 lib/applicationeditform.php:227
 msgid "Organization"
 msgstr "സംഘടന"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:181 actions/version.php:200
+#: actions/showapplication.php:187 actions/version.php:200
 #: lib/applicationeditform.php:208 lib/groupeditform.php:168
 msgid "Description"
 msgstr "വിവരണം"
 
 #. TRANS: Header for group statistics on a group page (h2).
 #. TRANS: H2 text for user statistics.
-#: actions/showapplication.php:186 actions/showgroup.php:460
+#: actions/showapplication.php:192 actions/showgroup.php:460
 #: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "സ്ഥിതിവിവരക്കണക്കുകൾ"
 
-#: actions/showapplication.php:197
+#: actions/showapplication.php:203
 #, php-format
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr ""
 
-#: actions/showapplication.php:207
+#: actions/showapplication.php:213
 msgid "Application actions"
 msgstr ""
 
-#: actions/showapplication.php:230
+#: actions/showapplication.php:236
 msgid "Reset key & secret"
 msgstr "പുനഃക്രമീകരണ ചാവിയും രഹസ്യവും"
 
 #. TRANS: Title of form for deleting a user.
-#: actions/showapplication.php:246 lib/deletegroupform.php:121
+#: actions/showapplication.php:252 lib/deletegroupform.php:121
 #: lib/deleteuserform.php:64 lib/noticelist.php:673
 msgid "Delete"
 msgstr "മായ്ക്കുക"
 
-#: actions/showapplication.php:255
+#: actions/showapplication.php:261
 msgid "Application info"
 msgstr ""
 
-#: actions/showapplication.php:257
+#: actions/showapplication.php:263
 msgid "Consumer key"
 msgstr ""
 
-#: actions/showapplication.php:262
+#: actions/showapplication.php:268
 msgid "Consumer secret"
 msgstr "ഉപയോക്തൃ രഹസ്യം"
 
-#: actions/showapplication.php:267
+#: actions/showapplication.php:273
 msgid "Request token URL"
 msgstr "അഭ്യർത്ഥനാ ചീട്ടിന്റെ യൂ.ആർ.എൽ."
 
-#: actions/showapplication.php:272
+#: actions/showapplication.php:278
 msgid "Access token URL"
 msgstr "അഭിഗമ്യതാ ചീട്ടിന്റെ യൂ.ആർ.എൽ."
 
-#: actions/showapplication.php:277
+#: actions/showapplication.php:283
 msgid "Authorize URL"
 msgstr "അംഗീകരണത്തിനുള്ള യൂ.ആർ.എൽ."
 
-#: actions/showapplication.php:282
+#: actions/showapplication.php:288
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
@@ -5320,7 +5275,7 @@ msgstr ""
 "ശ്രദ്ധിക്കുക: HMAC-SHA1 ഒപ്പുകളാണ് ഞങ്ങൾ പിന്തുണയ്ക്കുന്നത്. പ്ലെയിൻ-ടെക്സ്റ്റ് ഒപ്പ് രീതി ഞങ്ങൾ "
 "പിന്തുണയ്ക്കുന്നില്ല."
 
-#: actions/showapplication.php:302
+#: actions/showapplication.php:309
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr "ഉപയോക്തൃ ചാവിയും രഹസ്യവും പുനഃക്രമീകരണം എന്ന് താങ്കൾക്ക് തീർച്ചയാണോ?"
 
@@ -5408,18 +5363,16 @@ msgid "Group profile"
 msgstr ""
 
 #. TRANS: Label for group URL (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT for URL in a profile.
 #: actions/showgroup.php:273 actions/tagother.php:118
-#: actions/userauthorization.php:184 lib/userprofile.php:186
+#: actions/userauthorization.php:175 lib/userprofile.php:186
 msgid "URL"
 msgstr "യൂ.ആർ.എൽ."
 
 #. TRANS: Label for group description or group note (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page where bio is displayed.
 #. TRANS: DT for note in a profile.
 #: actions/showgroup.php:285 actions/tagother.php:128
-#: actions/userauthorization.php:197 lib/userprofile.php:204
+#: actions/userauthorization.php:187 lib/userprofile.php:204
 msgid "Note"
 msgstr "കുറിപ്പ്"
 
@@ -5555,7 +5508,7 @@ msgid "%1$s tagged %2$s"
 msgstr ""
 
 #. TRANS: Page title showing tagged notices in one user's stream.
-#. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
+#. TRANS: %1$s is the username, %2$s is the hash tag, %1$d is the page number.
 #: actions/showstream.php:74
 #, php-format
 msgid "%1$s tagged %2$s, page %3$d"
@@ -5799,7 +5752,8 @@ msgstr ""
 
 #. TRANS: Title for button to save site notice in admin panel.
 #: actions/sitenoticeadminpanel.php:201
-msgid "Save site notice."
+#, fuzzy
+msgid "Save site notice"
 msgstr "സൈറ്റ് അറിയിപ്പ് സേവ് ചെയ്യുക."
 
 #. TRANS: Title for SMS settings.
@@ -5859,7 +5813,8 @@ msgstr "എസ്.എം.എസ്. ഫോൺ നമ്പർ."
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
 #: actions/smssettings.php:152
-msgid "Phone number, no punctuation or spaces, with area code."
+#, fuzzy
+msgid "Phone number, no punctuation or spaces, with area code"
 msgstr "ഫോൺ നമ്പർ, വിരാമചിഹ്നമോ ഇടയോ ചേർക്കാതെ പ്രദേശത്തിന്റെ കോഡിനോടൊപ്പം നൽകുക."
 
 #. TRANS: Form legend for SMS preferences form.
@@ -6022,19 +5977,15 @@ msgstr ""
 msgid "Could not save subscription."
 msgstr ""
 
-#. TRANS: Client error displayed trying to perform any request method other than POST.
-#. TRANS: Do not translate POST.
 #: actions/subscribe.php:77
 msgid "This action only accepts POST requests."
 msgstr ""
 
-#. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
-#: actions/subscribe.php:121
+#: actions/subscribe.php:117
 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
 msgstr ""
 
-#. TRANS: Page title when subscription succeeded.
-#: actions/subscribe.php:149
+#: actions/subscribe.php:145
 msgid "Subscribed"
 msgstr ""
 
@@ -6188,9 +6139,8 @@ msgstr "റ്റാഗ് %s"
 msgid "User profile"
 msgstr ""
 
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT element in area for user avatar.
-#: actions/tagother.php:81 actions/userauthorization.php:138
+#: actions/tagother.php:81 actions/userauthorization.php:132
 #: lib/userprofile.php:108
 msgid "Photo"
 msgstr "ഛായാചിത്രം"
@@ -6205,11 +6155,6 @@ msgid ""
 "separated"
 msgstr ""
 
-#: actions/tagother.php:178
-#, php-format
-msgid "Invalid tag: \"%s\""
-msgstr "അസാധുവായ റ്റാഗ്: \"%s\""
-
 #: actions/tagother.php:193
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
@@ -6223,7 +6168,6 @@ msgstr ""
 msgid "No such tag."
 msgstr "അത്തരത്തിൽ ഒരു റ്റാഗില്ല."
 
-#. TRANS: Client error displayed when trying to unblock a non-blocked user.
 #: actions/unblock.php:59
 msgid "You haven't blocked that user."
 msgstr ""
@@ -6244,7 +6188,7 @@ msgstr ""
 msgid "Unsubscribed"
 msgstr ""
 
-#: actions/updateprofile.php:64
+#: actions/updateprofile.php:64 actions/userauthorization.php:337
 #, php-format
 msgid ""
 "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
@@ -6275,7 +6219,7 @@ msgstr ""
 #. TRANS: users in user admin panel. %1$s is the invalid nickname.
 #: actions/useradminpanel.php:166
 #, php-format
-msgid "Invalid default subscripton: \"%1$s\" is not a user."
+msgid "Invalid default subscripton: '%1$s' is not a user."
 msgstr ""
 
 #. TRANS: Link description in user account settings menu.
@@ -6335,138 +6279,106 @@ msgstr "പുതിയ ഉപയോക്താക്കളെ ക്ഷണി
 
 #. TRANS: Title for button to save user settings in user admin panel.
 #: actions/useradminpanel.php:302
-msgid "Save user settings."
+#, fuzzy
+msgid "Save user settings"
 msgstr "ഉപയോക്തൃ സജ്ജീകരണങ്ങൾ സേവ് ചെയ്യുക."
 
-#. TRANS: Page title.
-#: actions/userauthorization.php:109
+#: actions/userauthorization.php:105
 msgid "Authorize subscription"
 msgstr "വരിക്കാരനാകൽ അംഗീകരിക്കുക"
 
-#. TRANS: Page notice on "Auhtorize subscription" page.
-#: actions/userauthorization.php:115
+#: actions/userauthorization.php:110
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
 "user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
-"click \"Reject\"."
+"click “Reject”."
 msgstr ""
 
-#. TRANS: DT element on Authorise Subscription page where license is displayed.
 #. TRANS: Menu item for site administration
-#: actions/userauthorization.php:207 actions/version.php:167
+#: actions/userauthorization.php:196 actions/version.php:167
 #: lib/adminpanelaction.php:403
 msgid "License"
 msgstr "അനുമതി"
 
-#. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:229
-msgctxt "BUTTON"
+#: actions/userauthorization.php:217
+#, fuzzy
 msgid "Accept"
 msgstr "സ്വീകരിക്കുക"
 
-#. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:231
-msgid "Subscribe to this user."
-msgstr "ഈ ഉപയോക്താവിന്റെ വരിക്കാരൻ/വരിക്കാരി ആകുക."
+#: actions/userauthorization.php:218 lib/subscribeform.php:115
+#: lib/subscribeform.php:139
+msgid "Subscribe to this user"
+msgstr "ഈ ഉപയോക്താവിന്റെ വരിക്കാരൻ/വരിക്കാരി ആകുക"
 
-#. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:233
-msgctxt "BUTTON"
+#: actions/userauthorization.php:219
+#, fuzzy
 msgid "Reject"
 msgstr "നിരസിക്കുക"
 
-#. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:235
-msgid "Reject this subscription."
+#: actions/userauthorization.php:220
+#, fuzzy
+msgid "Reject this subscription"
 msgstr "ഈ വരിക്കാരനാകൽ നിരസിക്കുക."
 
-#. TRANS: Client error displayed for an empty authorisation request.
-#: actions/userauthorization.php:248
+#: actions/userauthorization.php:232
 msgid "No authorization request!"
 msgstr ""
 
-#. TRANS: Accept message header from Authorise subscription page.
-#: actions/userauthorization.php:271
+#: actions/userauthorization.php:254
 msgid "Subscription authorized"
 msgstr "വരിക്കാരനാകൽ അംഗീകരിക്കപ്പെട്ടു"
 
-#: actions/userauthorization.php:274
+#: actions/userauthorization.php:256
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to authorize the "
 "subscription. Your subscription token is:"
 msgstr ""
 
-#. TRANS: Reject message header from Authorise subscription page.
-#: actions/userauthorization.php:285
+#: actions/userauthorization.php:266
 msgid "Subscription rejected"
 msgstr "വരിക്കാരനാകൽ നിരസിക്കപ്പെട്ടു"
 
-#: actions/userauthorization.php:288
+#: actions/userauthorization.php:268
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to fully reject the "
 "subscription."
 msgstr ""
 
-#. TRANS: Exception thrown when no valid user is found for an authorisation request.
-#. TRANS: %s is a listener URI.
-#: actions/userauthorization.php:325
+#: actions/userauthorization.php:303
 #, php-format
-msgid "Listener URI \"%s\" not found here."
+msgid "Listener URI ‘%s’ not found here."
 msgstr ""
 
-#. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:332
+#: actions/userauthorization.php:308
 #, fuzzy, php-format
-msgid "Listenee URI \"%s\" is too long."
+msgid "Listenee URI ‘%s’ is too long."
 msgstr "സ്രോതസ്സ് യൂ.ആർ.എൽ. വളരെ വലുതാണ്."
 
-#. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:340
-#, php-format
-msgid "Listenee URI \"%s\" is a local user."
-msgstr ""
-
-#. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
-#. TRANS: %s is a profile URL.
-#: actions/userauthorization.php:358
-#, php-format
-msgid "Profile URL \"%s\" is for a local user."
-msgstr ""
-
-#. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
-#. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
-#: actions/userauthorization.php:368
+#: actions/userauthorization.php:314
 #, fuzzy, php-format
-msgid ""
-"Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
-"\"."
-msgstr ""
-"അറിയിപ്പിന്റെ ഉപയോഗാനുമതിയായ് ‘%1$s’ സൈറ്റിന്റെ ഉപയോഗാനുമതിയായ ‘%2$s’ എന്നതുമായി "
-"ചേർന്നു പോകുന്നില്ല."
+msgid "Listenee URI ‘%s’ is a local user."
+msgstr "സ്രോതസ്സ് യൂ.ആർ.എൽ. വളരെ വലുതാണ്."
 
-#. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:378
+#: actions/userauthorization.php:329
+#, php-format
+msgid "Profile URL ‘%s’ is for a local user."
+msgstr ""
+
+#: actions/userauthorization.php:345
 #, fuzzy, php-format
-msgid "Avatar URL \"%s\" is not valid."
+msgid "Avatar URL ‘%s’ is not valid."
 msgstr "സ്രോതസ്സ് യൂ.ആർ.എൽ. അസാധുവാണ്."
 
-#. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:385
+#: actions/userauthorization.php:350
 #, php-format
-msgid "Cannot read avatar URL \"%s\"."
+msgid "Can’t read avatar URL ‘%s’."
 msgstr ""
 
-#. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:392
+#: actions/userauthorization.php:355
 #, php-format
-msgid "Wrong image type for avatar URL \"%s\"."
+msgid "Wrong image type for avatar URL ‘%s’."
 msgstr ""
 
 #. TRANS: Page title for profile design page.
@@ -6560,7 +6472,7 @@ msgid "Plugins"
 msgstr "പ്ലഗിനുകൾ"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:898
+#: actions/version.php:198 lib/action.php:901
 msgid "Version"
 msgstr "പതിപ്പ്"
 
@@ -6764,14 +6676,14 @@ msgstr "സംഘത്തിന്റെ ഇൻബോക്സ് സേവ്
 
 #. TRANS: Server exception thrown when a reply cannot be saved.
 #. TRANS: %1$d is a notice ID, %2$d is the ID of the mentioned user.
-#: classes/Notice.php:1142
+#: classes/Notice.php:1144
 #, php-format
 msgid "Could not save reply for %1$d, %2$d."
 msgstr " %2$d, %1$d എന്ന അറിയിപ്പിനുള്ള മറുപടി സേവ് ചെയ്യാൻ കഴിഞ്ഞില്ല."
 
 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1661
+#: classes/Notice.php:1663
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr ""
@@ -6785,14 +6697,14 @@ msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:775
+#: classes/Profile.php:779
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:784
+#: classes/Profile.php:788
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -7109,53 +7021,53 @@ msgid "Page notice"
 msgstr "താളിലെ അറിയിപ്പ്"
 
 #. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:871
+#: lib/action.php:874
 msgid "Secondary site navigation"
 msgstr ""
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:877
+#: lib/action.php:880
 msgid "Help"
 msgstr "സഹായം"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:880
+#: lib/action.php:883
 msgid "About"
 msgstr "വിവരണം"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:883
+#: lib/action.php:886
 msgid "FAQ"
 msgstr "പതിവുചോദ്യങ്ങൾ"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:888
+#: lib/action.php:891
 msgid "TOS"
 msgstr ""
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:892
+#: lib/action.php:895
 msgid "Privacy"
 msgstr "സ്വകാര്യത"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:895
+#: lib/action.php:898
 msgid "Source"
 msgstr "സ്രോതസ്സ്"
 
 #. TRANS: Secondary navigation menu option leading to e-mail contact information on the
 #. TRANS: StatusNet site, where to report bugs, ...
-#: lib/action.php:902
+#: lib/action.php:905
 msgid "Contact"
 msgstr "സമ്പർക്കം"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:905
+#: lib/action.php:908
 msgid "Badge"
 msgstr ""
 
 #. TRANS: DT element for StatusNet software license.
-#: lib/action.php:934
+#: lib/action.php:937
 msgid "StatusNet software license"
 msgstr "സ്റ്റാറ്റസ്‌നെറ്റ് സോഫ്റ്റ്‌വേർ അനുമതി"
 
@@ -7163,7 +7075,7 @@ msgstr "സ്റ്റാറ്റസ്‌നെറ്റ് സോഫ്റ
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:941
+#: lib/action.php:944
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7171,7 +7083,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:944
+#: lib/action.php:947
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr ""
@@ -7180,7 +7092,7 @@ msgstr ""
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:951
+#: lib/action.php:954
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7189,50 +7101,50 @@ msgid ""
 msgstr ""
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:967
+#: lib/action.php:970
 msgid "Site content license"
 msgstr "സൈറ്റിന്റെ ഉള്ളടക്കത്തിന്റെ ഉപയോഗാനുമതി"
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:974
+#: lib/action.php:977
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr "%1$s സൈറ്റിന്റെ ഉള്ളടക്കം സ്വകാര്യവും രഹസ്യവുമാണ്."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:981
+#: lib/action.php:984
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:985
+#: lib/action.php:988
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr "ഉള്ളടക്കവും വിവരങ്ങളും സംഭാവകർക്ക് പകർപ്പവകാശമുള്ളതാണ്. എല്ലാ അവകാശങ്ങളും സംരക്ഷിതം."
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:1017
+#: lib/action.php:1020
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
 
 #. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1353
+#: lib/action.php:1356
 msgid "Pagination"
 msgstr ""
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1364
+#: lib/action.php:1367
 msgid "After"
 msgstr "ശേഷം"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1374
+#: lib/action.php:1377
 msgid "Before"
 msgstr "മുമ്പ്"
 
@@ -7428,23 +7340,19 @@ msgstr ""
 msgid "No application for that consumer key."
 msgstr ""
 
-#: lib/apiauth.php:202 lib/apiauth.php:284
-msgid "Not allowed to use API."
-msgstr ""
-
 #. TRANS: OAuth exception given when an incorrect access token was given for a user.
-#: lib/apiauth.php:225
+#: lib/apiauth.php:219
 msgid "Bad access token."
 msgstr ""
 
 #. TRANS: OAuth exception given when no user was found for a given token (no token was found).
-#: lib/apiauth.php:230
+#: lib/apiauth.php:224
 msgid "No user for that token."
 msgstr ""
 
 #. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel".
 #. TRANS: Client error thrown when authentication fails.
-#: lib/apiauth.php:272 lib/apiauth.php:302
+#: lib/apiauth.php:266 lib/apiauth.php:293
 msgid "Could not authenticate you."
 msgstr ""
 
@@ -7643,11 +7551,6 @@ msgstr "രഹസ്യവാക്ക് മാറ്റൽ അനുവദി
 msgid "Block"
 msgstr "തടയുക"
 
-#. TRANS: Description of the form to block a user.
-#: lib/blockform.php:79
-msgid "Block this user"
-msgstr "ഈ ഉപയോക്താവിനെ തടയുക"
-
 #. TRANS: Title for command results.
 #: lib/channel.php:160 lib/channel.php:181
 msgid "Command results"
@@ -7675,7 +7578,7 @@ msgstr "ആ ഐ.ഡി.യിൽ അറിയിപ്പ് നിലവില
 
 #. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
 #. TRANS: Error text shown when a last user notice is requested and it does not exist.
-#: lib/command.php:99 lib/command.php:630
+#: lib/command.php:99 lib/command.php:642
 msgid "User has no last notice."
 msgstr ""
 
@@ -7725,35 +7628,41 @@ msgstr ""
 "വരിക്കാർ: %2$s\n"
 "അറിയിപ്പുകൾ: %3$s"
 
+#. TRANS: Error message text shown when a favorite could not be set because it has already been favorited.
+#: lib/command.php:298
+#, fuzzy
+msgid "Could not create favorite: already favorited."
+msgstr "പ്രിയങ്കരങ്ങൾ സൃഷ്ടിക്കാൻ കഴിഞ്ഞില്ല."
+
 #. TRANS: Text shown when a notice has been marked as favourite successfully.
-#: lib/command.php:312
+#: lib/command.php:324
 msgid "Notice marked as fave."
 msgstr "അറിയിപ്പ് പ്രിയങ്കരമെന്ന് അടയാളപ്പെടുത്തി."
 
 #. TRANS: Message given having added a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:357
+#: lib/command.php:369
 #, php-format
 msgid "%1$s joined group %2$s."
 msgstr "%2$s എന്ന സംഘത്തിൽ %1$s എന്ന ഉപയോക്താവ് ചേർന്നു."
 
 #. TRANS: Message given having removed a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:405
+#: lib/command.php:417
 #, php-format
 msgid "%1$s left group %2$s."
 msgstr "%2$s എന്ന സംഘത്തിൽ നിന്ന് %1$s എന്ന ഉപയോക്താവ് വിട്ടുപോയി."
 
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: lib/command.php:426
+#: lib/command.php:438
 #, php-format
 msgctxt "WHOIS"
 msgid "%1$s (%2$s)"
 msgstr ""
 
 #. TRANS: Whois output. %s is the full name of the queried user.
-#: lib/command.php:430
+#: lib/command.php:442
 #, php-format
 msgid "Fullname: %s"
 msgstr "പൂർണ്ണനാമം: %s"
@@ -7761,7 +7670,7 @@ msgstr "പൂർണ്ണനാമം: %s"
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a location.
-#: lib/command.php:434 lib/mail.php:270
+#: lib/command.php:446 lib/mail.php:270
 #, php-format
 msgid "Location: %s"
 msgstr "സ്ഥാനം: %s"
@@ -7769,20 +7678,20 @@ msgstr "സ്ഥാനം: %s"
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a homepage.
-#: lib/command.php:438 lib/mail.php:274
+#: lib/command.php:450 lib/mail.php:274
 #, php-format
 msgid "Homepage: %s"
 msgstr "പ്രധാനതാൾ: %s"
 
 #. TRANS: Whois output. %s is the bio information of the queried user.
-#: lib/command.php:442
+#: lib/command.php:454
 #, php-format
 msgid "About: %s"
 msgstr "വിവരണം: %s"
 
 #. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).
 #. TRANS: %s is a remote profile.
-#: lib/command.php:471
+#: lib/command.php:483
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
@@ -7791,7 +7700,7 @@ msgstr ""
 
 #. TRANS: Message given if content is too long. %1$sd is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:488
+#: lib/command.php:500
 #, php-format
 msgid "Message too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
@@ -7799,25 +7708,25 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Error text shown sending a direct message fails with an unknown reason.
-#: lib/command.php:516
+#: lib/command.php:528
 msgid "Error sending direct message."
 msgstr "നേരിട്ടുള്ള സന്ദേശം അയക്കുന്നതിൽ പിഴവുണ്ടായി."
 
 #. TRANS: Message given having repeated a notice from another user.
 #. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:553
+#: lib/command.php:565
 #, php-format
 msgid "Notice from %s repeated."
 msgstr "%s എന്ന ഉപയോക്താവിന്റെ അറിയിപ്പ് ആവർത്തിച്ചു."
 
 #. TRANS: Error text shown when repeating a notice fails with an unknown reason.
-#: lib/command.php:556
+#: lib/command.php:568
 msgid "Error repeating notice."
 msgstr "അറിയിപ്പ് ആവർത്തിക്കുന്നതിൽ പിഴവുണ്ടായി."
 
 #. TRANS: Message given if content of a notice for a reply is too long. %1$d is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:591
+#: lib/command.php:603
 #, php-format
 msgid "Notice too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Notice too long - maximum is %1$d characters, you sent %2$d."
@@ -7826,80 +7735,80 @@ msgstr[1] ""
 
 #. TRANS: Text shown having sent a reply to a notice successfully.
 #. TRANS: %s is the nickname of the user of the notice the reply was sent to.
-#: lib/command.php:604
+#: lib/command.php:616
 #, php-format
 msgid "Reply to %s sent."
 msgstr "%s എന്ന ഉപയോക്താവിനുള്ള മറുപടി അയച്ചു."
 
 #. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
-#: lib/command.php:607
+#: lib/command.php:619
 msgid "Error saving notice."
 msgstr "അറിയിപ്പ് സേവ് ചെയ്യുന്നതിൽ പിഴവുണ്ടായി."
 
 #. TRANS: Error text shown when no username was provided when issuing a subscribe command.
-#: lib/command.php:654
+#: lib/command.php:666
 msgid "Specify the name of the user to subscribe to."
 msgstr ""
 
 #. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
-#: lib/command.php:663
+#: lib/command.php:675
 msgid "Can't subscribe to OMB profiles by command."
 msgstr ""
 
 #. TRANS: Text shown after having subscribed to another user successfully.
 #. TRANS: %s is the name of the user the subscription was requested for.
-#: lib/command.php:671
+#: lib/command.php:683
 #, php-format
 msgid "Subscribed to %s."
 msgstr ""
 
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.
-#: lib/command.php:692 lib/command.php:803
+#: lib/command.php:704 lib/command.php:815
 msgid "Specify the name of the user to unsubscribe from."
 msgstr ""
 
 #. TRANS: Text shown after having unsubscribed from another user successfully.
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:703
+#: lib/command.php:715
 #, php-format
 msgid "Unsubscribed from %s."
 msgstr ""
 
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
-#: lib/command.php:723 lib/command.php:749
+#: lib/command.php:735 lib/command.php:761
 msgid "Command not yet implemented."
 msgstr ""
 
 #. TRANS: Text shown when issuing the command "off" successfully.
-#: lib/command.php:727
+#: lib/command.php:739
 msgid "Notification off."
 msgstr ""
 
 #. TRANS: Error text shown when the command "off" fails for an unknown reason.
-#: lib/command.php:730
+#: lib/command.php:742
 msgid "Can't turn off notification."
 msgstr ""
 
 #. TRANS: Text shown when issuing the command "on" successfully.
-#: lib/command.php:753
+#: lib/command.php:765
 msgid "Notification on."
 msgstr ""
 
 #. TRANS: Error text shown when the command "on" fails for an unknown reason.
-#: lib/command.php:756
+#: lib/command.php:768
 msgid "Can't turn on notification."
 msgstr ""
 
 #. TRANS: Error text shown when issuing the login command while login is disabled.
-#: lib/command.php:770
+#: lib/command.php:782
 msgid "Login command is disabled."
 msgstr ""
 
 #. TRANS: Text shown after issuing the login command successfully.
 #. TRANS: %s is a logon link..
-#: lib/command.php:783
+#: lib/command.php:795
 #, php-format
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
@@ -7908,20 +7817,20 @@ msgstr ""
 
 #. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:812
+#: lib/command.php:824
 #, php-format
 msgid "Unsubscribed %s."
 msgstr ""
 
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
-#: lib/command.php:830
+#: lib/command.php:842
 msgid "You are not subscribed to anyone."
 msgstr ""
 
 #. TRANS: Text shown after requesting other users a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
-#: lib/command.php:835
+#: lib/command.php:847
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] ""
@@ -7929,14 +7838,14 @@ msgstr[1] ""
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user
 #. TRANS: (followers) without having any subscribers.
-#: lib/command.php:857
+#: lib/command.php:869
 msgid "No one is subscribed to you."
 msgstr ""
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
-#: lib/command.php:862
+#: lib/command.php:874
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] ""
@@ -7944,21 +7853,21 @@ msgstr[1] ""
 
 #. TRANS: Text shown after requesting groups a user is subscribed to without having
 #. TRANS: any group subscriptions.
-#: lib/command.php:884
+#: lib/command.php:896
 msgid "You are not a member of any groups."
 msgstr "താങ്കൾ ഒരു സംഘത്തിലേയും അംഗമല്ല."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
-#: lib/command.php:889
+#: lib/command.php:901
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "താങ്കൾ ഈ സംഘത്തിലെ അംഗമാണ്:"
 msgstr[1] "താങ്കൾ ഈ സംഘങ്ങളിലെ അംഗമാണ്:"
 
 #. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-#: lib/command.php:904
+#: lib/command.php:916
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -8059,11 +7968,6 @@ msgstr ""
 msgid "Database error"
 msgstr "ഡാറ്റാബേസ് പിഴവ്"
 
-#. TRANS: Description of form for deleting a user.
-#: lib/deleteuserform.php:75
-msgid "Delete this user"
-msgstr "ഈ ഉപയോക്താവിനെ നീക്കം ചെയ്യുക"
-
 #. TRANS: Label in form on profile design page.
 #. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
 #: lib/designsettings.php:108
@@ -8098,21 +8002,6 @@ msgstr "നിറങ്ങൾ മാറ്റുക"
 msgid "Use defaults"
 msgstr "സ്വതേയുള്ളവ ഉപയോഗിക്കുക"
 
-#. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: lib/designsettings.php:259
-msgid "Restore default designs"
-msgstr "സ്വതേയുള്ള രൂപകല്പനകൾ പുനഃസ്ഥാപിക്കുക"
-
-#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: lib/designsettings.php:267
-msgid "Reset back to default"
-msgstr "മുമ്പ് സ്വതേയുണ്ടായിരുന്നതിലേയ്ക്ക് പുനഃസ്ഥാപിക്കുക"
-
-#. TRANS: Title for button on profile design page to save settings.
-#: lib/designsettings.php:272
-msgid "Save design"
-msgstr "രൂപകല്പന സേവ്‌ ചെയ്യുക"
-
 #. TRANS: Error message displayed if design settings could not be saved.
 #. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
 #: lib/designsettings.php:405 lib/designsettings.php:427
@@ -8888,10 +8777,6 @@ msgstr "ഈ അറിയിപ്പിന് മറുപടിയിടുക"
 msgid "Reply"
 msgstr "മറുപടി"
 
-#: lib/noticelist.php:673
-msgid "Delete this notice"
-msgstr "ഈ അറിയിപ്പ് മായ്ക്കുക"
-
 #: lib/noticelist.php:691
 msgid "Notice repeated"
 msgstr "അറിയിപ്പ് ആവർത്തിച്ചിരിക്കുന്നു"
@@ -9168,10 +9053,6 @@ msgstr "ക്ഷണിക്കുക"
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "%s-ൽ നമ്മോടൊപ്പം ചേരാൻ സുഹൃത്തുക്കളേയും സഹപ്രവർത്തകരേയും ക്ഷണിക്കുക"
 
-#: lib/subscribeform.php:115 lib/subscribeform.php:139
-msgid "Subscribe to this user"
-msgstr "ഈ ഉപയോക്താവിന്റെ വരിക്കാരൻ/വരിക്കാരി ആകുക"
-
 #: lib/subscriberspeopleselftagcloudsection.php:48
 #: lib/subscriptionspeopleselftagcloudsection.php:48
 msgid "People Tagcloud as self-tagged"
@@ -9339,23 +9220,18 @@ msgctxt "role"
 msgid "Moderator"
 msgstr "മദ്ധ്യസ്ഥ(ൻ)"
 
-#: lib/util.php:305
-#, fuzzy
-msgid "Not allowed to log in."
-msgstr "ലോഗിൻ ചെയ്തിട്ടില്ല"
-
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1309
+#: lib/util.php:1306
 msgid "a few seconds ago"
 msgstr "ഏതാനം സെക്കന്റുകൾ മുമ്പ്"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1312
+#: lib/util.php:1309
 msgid "about a minute ago"
 msgstr "ഏകദേശം ഒരു മിനിറ്റ് മുമ്പ്"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1316
+#: lib/util.php:1313
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
@@ -9363,12 +9239,12 @@ msgstr[0] "ഏകദേശം ഒരു മിനിറ്റ് മുമ്പ
 msgstr[1] "ഏകദേശം %d മിനിറ്റ് മുമ്പ്"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1319
+#: lib/util.php:1316
 msgid "about an hour ago"
 msgstr "ഏകദേശം ഒരു മണിക്കൂർ മുമ്പ്"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1323
+#: lib/util.php:1320
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
@@ -9376,12 +9252,12 @@ msgstr[0] "ഏകദേശം ഒരു മണിക്കൂർ മുമ്പ
 msgstr[1] "ഏകദേശം %d മണിക്കൂർ മുമ്പ്"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1326
+#: lib/util.php:1323
 msgid "about a day ago"
 msgstr "ഏകദേശം ഒരു ദിവസം മുമ്പ്"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1330
+#: lib/util.php:1327
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
@@ -9389,12 +9265,12 @@ msgstr[0] "ഏകദേശം ഒരു ദിവസം മുമ്പ്"
 msgstr[1] "ഏകദേശം %d ദിവസം മുമ്പ്"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1333
+#: lib/util.php:1330
 msgid "about a month ago"
 msgstr "ഏകദേഅം ഒരു മാസം മുമ്പ്"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1337
+#: lib/util.php:1334
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
@@ -9402,7 +9278,7 @@ msgstr[0] "ഏകദേശം ഒരു മാസം മുമ്പ്"
 msgstr[1] "ഏകദേശം %d മാസം മുമ്പ്"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1340
+#: lib/util.php:1337
 msgid "about a year ago"
 msgstr "ഏകദേശം ഒരു വർഷം മുമ്പ്"
 
@@ -9447,3 +9323,61 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#~ msgid "Block this user."
+#~ msgstr "ഈ ഉപയോക്താവിനെ തടയുക."
+
+#~ msgid "Delete this notice."
+#~ msgstr "ഈ അറിയിപ്പ് മായ്ക്കുക."
+
+#~ msgid "Delete this user."
+#~ msgstr "ഈ ഉപയോക്താവിനെ നീക്കം ചെയ്യുക."
+
+#~ msgid "Restore default designs."
+#~ msgstr "സ്വതേയുള്ള രൂപകല്പനകൾ പുനഃസ്ഥാപിക്കുക."
+
+#~ msgid "Reset back to default."
+#~ msgstr "മുമ്പ് സ്വതേയുണ്ടായിരുന്നതിലേയ്ക്ക് പുനഃസ്ഥാപിക്കുക."
+
+#~ msgid "Save design."
+#~ msgstr "രൂപകല്പന സേവ്‌ ചെയ്യുക."
+
+#, fuzzy
+#~ msgid "\"%s\" not found."
+#~ msgstr "ഉപയോക്താവിനെ കണ്ടത്താനായില്ല."
+
+#~ msgid "Notice %s not found."
+#~ msgstr "%s എന്ന അറിയിപ്പ് കണ്ടെത്താനായില്ല."
+
+#, fuzzy
+#~ msgid "Attachment %s not found."
+#~ msgstr "സ്വീകർത്താവായ ഉപയോക്താവിനെ കണ്ടെത്താനായില്ല."
+
+#, fuzzy
+#~ msgid "Invalid tag: \"%s\"."
+#~ msgstr "അസാധുവായ റ്റാഗ്: \"%s\""
+
+#, fuzzy
+#~ msgid "%s updates from everyone."
+#~ msgstr "%s പദ്ധതിയിൽ എല്ലാവരും അയച്ചിട്ടുള്ള പുതിയവാർത്തകൾ!"
+
+#~ msgid "Password saved"
+#~ msgstr "രഹസ്യവാക്ക് സേവ് ചെയ്തിരിക്കുന്നു"
+
+#~ msgid "Where you are, like \"City, State (or Region), Country\"."
+#~ msgstr "താങ്കളെവിടെയാണ്, അതായത് \"നഗരം, സംസ്ഥാനം (അഥവ പ്രദേശം), രാജ്യം\" എന്നിവ."
+
+#~ msgid "Subscribe to this user."
+#~ msgstr "ഈ ഉപയോക്താവിന്റെ വരിക്കാരൻ/വരിക്കാരി ആകുക."
+
+#, fuzzy
+#~ msgid ""
+#~ "Listenee stream license \"%1$s\" is not compatible with site license \"%2"
+#~ "$s\"."
+#~ msgstr ""
+#~ "അറിയിപ്പിന്റെ ഉപയോഗാനുമതിയായ് ‘%1$s’ സൈറ്റിന്റെ ഉപയോഗാനുമതിയായ ‘%2$s’ എന്നതുമായി "
+#~ "ചേർന്നു പോകുന്നില്ല."
+
+#, fuzzy
+#~ msgid "Not allowed to log in."
+#~ msgstr "ലോഗിൻ ചെയ്തിട്ടില്ല"
diff --git a/locale/nb/LC_MESSAGES/statusnet.po b/locale/nb/LC_MESSAGES/statusnet.po
index 1bf6d559d5..9105f3f80b 100644
--- a/locale/nb/LC_MESSAGES/statusnet.po
+++ b/locale/nb/LC_MESSAGES/statusnet.po
@@ -3,6 +3,7 @@
 #
 # Author: Jon Harald Søby
 # Author: Laaknor
+# Author: McDutchie
 # Author: Nghtwlkr
 # --
 # This file is distributed under the same license as the StatusNet package.
@@ -11,17 +12,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-24 10:32+0000\n"
-"PO-Revision-Date: 2011-02-24 10:37:25+0000\n"
+"POT-Creation-Date: 2011-03-03 15:58+0000\n"
+"PO-Revision-Date: 2011-03-03 16:01:13+0000\n"
 "Language-Team: Norwegian (bokmål)‬ <http://translatewiki.net/wiki/Portal:no>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r82712); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-02-17 11:39:54+0000\n"
+"X-POT-Import-Date: 2011-02-25 23:49:23+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -133,11 +134,7 @@ msgstr "Ingen slik side."
 #. 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 use "one time password login" without using an existing user.
-#. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
-#. TRANS: Client error displayed trying to find a user by ID for a non-existing ID.
-#. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when calling a profile action without specifying a user.
 #: actions/all.php:80 actions/allrss.php:69
@@ -155,12 +152,12 @@ msgstr "Ingen slik side."
 #: actions/apitimelinementions.php:77 actions/apitimelineuser.php:79
 #: actions/avatarbynickname.php:79 actions/favoritesrss.php:72
 #: actions/foaf.php:42 actions/foaf.php:61 actions/hcard.php:67
-#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:78
+#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
 #: actions/remotesubscribe.php:144 actions/remotesubscribe.php:153
-#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:113
-#: actions/showfavorites.php:106 actions/userbyid.php:75
+#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
+#: actions/showfavorites.php:106 actions/userbyid.php:74
 #: actions/usergroups.php:93 actions/userrss.php:40 actions/userxrd.php:59
-#: actions/xrds.php:71 lib/command.php:497 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:509 lib/galleryaction.php:59
 #: lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Ingen slik bruker."
@@ -288,7 +285,7 @@ msgstr "Oppdateringer fra %1$s og venner på %2$s!"
 #: actions/apigrouplistall.php:120 actions/apigroupmembership.php:105
 #: actions/apigroupshow.php:114 actions/apihelptest.php:84
 #: actions/apistatusesdestroy.php:101 actions/apistatusesretweets.php:110
-#: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:138
+#: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:139
 #: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
 #: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:268
 #: actions/apitimelinegroup.php:147 actions/apitimelinehome.php:173
@@ -519,7 +516,7 @@ msgstr "Fant ikke mottakeren."
 #. TRANS: Client error displayed trying to direct message another user who's not a friend (403).
 #: actions/apidirectmessagenew.php:144
 #, fuzzy
-msgid "Cannot send direct messages to users who aren't your friend."
+msgid "Can't send direct messages to users who aren't your friend."
 msgstr "Kan ikke sende direktemeldinger til brukere du ikke er venn med."
 
 #. TRANS: Client error displayed trying to direct message self (403).
@@ -545,7 +542,7 @@ msgstr "Denne statusen er allerede en favoritt."
 #. TRANS: Client error displayed when marking a notice as favourite fails.
 #. TRANS: Server error displayed when trying to mark a notice as favorite fails in the database.
 #. TRANS: Error message text shown when a favorite could not be set.
-#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:294
+#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:306
 msgid "Could not create favorite."
 msgstr "Kunne ikke opprette favoritt."
 
@@ -603,7 +600,7 @@ msgstr "Kunne ikke finne målbruker."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:191
 #: actions/newgroup.php:137 actions/profilesettings.php:273
-#: actions/register.php:206
+#: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "Det nicket er allerede i bruk. Prøv et annet."
 
@@ -613,7 +610,7 @@ msgstr "Det nicket er allerede i bruk. Prøv et annet."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:195
 #: actions/newgroup.php:141 actions/profilesettings.php:243
-#: actions/register.php:208
+#: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "Ugyldig nick."
 
@@ -626,7 +623,7 @@ msgstr "Ugyldig nick."
 #: actions/apigroupcreate.php:181 actions/editapplication.php:235
 #: actions/editgroup.php:202 actions/newapplication.php:221
 #: actions/newgroup.php:148 actions/profilesettings.php:248
-#: actions/register.php:215
+#: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "Hjemmesiden er ikke en gyldig URL."
 
@@ -636,7 +633,7 @@ msgstr "Hjemmesiden er ikke en gyldig URL."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:191 actions/editgroup.php:206
 #: actions/newgroup.php:152 actions/profilesettings.php:252
-#: actions/register.php:218
+#: actions/register.php:226
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "Fullt navn er for langt (maks 255 tegn)."
 
@@ -664,7 +661,7 @@ msgstr[1] "Beskrivelsen er for lang (maks %d tegn)."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:215 actions/editgroup.php:218
 #: actions/newgroup.php:164 actions/profilesettings.php:265
-#: actions/register.php:227
+#: actions/register.php:235
 msgid "Location is too long (maximum 255 characters)."
 msgstr "Plasseringen er for lang (maks 255 tegn)."
 
@@ -720,14 +717,14 @@ msgstr "Gruppe ikke funnet."
 #. TRANS: Server error displayed when trying to join a group the user is already a member of.
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:333
+#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:345
 msgid "You are already a member of that group."
 msgstr "Du er allerede medlem av den gruppen."
 
 #. TRANS: Server error displayed when trying to join a group the user is blocked from joining.
 #. 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.
-#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:338
+#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:350
 msgid "You have been blocked from that group by the admin."
 msgstr "Du har blitt blokkert fra den gruppen av administratoren."
 
@@ -737,7 +734,7 @@ msgstr "Du har blitt blokkert fra den gruppen av administratoren."
 #. TRANS: %1$s is the joining user's nickname, $2$s is the group nickname for which the join failed.
 #. TRANS: Message given having failed to add a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:350
+#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:362
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "Kunne ikke legge bruker %1$s til gruppe %2$s."
@@ -754,7 +751,7 @@ msgstr "Du er ikke et medlem av denne gruppen."
 #. TRANS: Message given having failed to remove a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
 #: actions/apigroupleave.php:127 actions/leavegroup.php:133
-#: lib/command.php:398
+#: lib/command.php:410
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
 msgstr "Kunne ikke fjerne bruker %1$s fra gruppe %2$s."
@@ -817,21 +814,20 @@ msgstr "Du er ikke autorisert."
 #. TRANS: Form validation error message.
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
-#. TRANS: Client error displayed when the session token is not okay.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
 #: actions/deletenotice.php:177 actions/disfavor.php:75
 #: actions/emailsettings.php:291 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:65 actions/grouplogo.php:321
 #: actions/groupunblock.php:65 actions/imsettings.php:224
-#: actions/invite.php:60 actions/login.php:131 actions/makeadmin.php:66
+#: actions/invite.php:60 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
-#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:136
-#: actions/othersettings.php:155 actions/passwordsettings.php:137
+#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
+#: actions/othersettings.php:155 actions/passwordsettings.php:138
 #: actions/profilesettings.php:217 actions/recoverpassword.php:383
-#: actions/register.php:164 actions/remotesubscribe.php:76
+#: actions/register.php:172 actions/remotesubscribe.php:76
 #: actions/repeat.php:82 actions/smssettings.php:250 actions/subedit.php:40
-#: actions/subscribe.php:87 actions/tagother.php:166
-#: actions/unsubscribe.php:69 actions/userauthorization.php:53
+#: actions/subscribe.php:86 actions/tagother.php:166
+#: actions/unsubscribe.php:69 actions/userauthorization.php:52
 #: lib/designsettings.php:310
 msgid "There was a problem with your session token. Try again, please."
 msgstr "Det var et problem med din sesjons-autentisering. Prøv igjen."
@@ -862,7 +858,7 @@ msgstr "Databasefeil ved innsetting av oauth_token_association."
 #: actions/designadminpanel.php:100 actions/editapplication.php:144
 #: actions/emailsettings.php:310 actions/grouplogo.php:332
 #: actions/imsettings.php:239 actions/newapplication.php:124
-#: actions/oauthconnectionssettings.php:145 actions/recoverpassword.php:46
+#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
 #: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
 msgstr "Uventet skjemainnsending."
@@ -913,20 +909,19 @@ msgstr "Konto"
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group nickname (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT for nick name in a profile.
-#: actions/apioauthauthorize.php:459 actions/login.php:242
-#: actions/profilesettings.php:106 actions/register.php:418
+#: actions/apioauthauthorize.php:459 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:432
 #: actions/showgroup.php:243 actions/tagother.php:94
-#: actions/userauthorization.php:152 lib/groupeditform.php:145
+#: actions/userauthorization.php:145 lib/groupeditform.php:145
 #: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "Nick"
 
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:463 actions/login.php:245
-#: actions/register.php:422 lib/accountsettingsaction.php:120
+#: actions/apioauthauthorize.php:463 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:120
 msgid "Password"
 msgstr "Passord"
 
@@ -1021,13 +1016,13 @@ msgstr "Ingen slik notis."
 
 #. TRANS: Client error displayed trying to repeat an own notice through the API.
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:537
+#: actions/apistatusesretweet.php:83 lib/command.php:549
 msgid "Cannot repeat your own notice."
 msgstr "Kan ikke gjenta din egen notis."
 
 #. TRANS: Client error displayed trying to re-repeat a notice through the API.
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:92 lib/command.php:543
+#: actions/apistatusesretweet.php:92 lib/command.php:555
 msgid "Already repeated that notice."
 msgstr "Allerede gjentatt den notisen."
 
@@ -1049,7 +1044,7 @@ msgstr "HTTP-metoden støttes ikke."
 #. TRANS: %s is the requested output format.
 #: actions/apistatusesshow.php:144
 #, fuzzy, php-format
-msgid "Unsupported format: %s."
+msgid "Unsupported format: %s"
 msgstr "Formatet støttes ikke: %s"
 
 #. TRANS: Client error displayed requesting a deleted status.
@@ -1153,14 +1148,13 @@ msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr "%1$s oppdateringer som svarer på oppdateringer fra %2$s / %3$s."
 
 #. TRANS: Title for site timeline. %s is the StatusNet sitename.
-#. TRANS: Public RSS feed title. %s is the StatusNet site name.
 #: actions/apitimelinepublic.php:193 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "%s offentlig tidslinje"
 
 #. TRANS: Subtitle for site timeline. %s is the StatusNet sitename.
-#: actions/apitimelinepublic.php:199
+#: actions/apitimelinepublic.php:199 actions/publicrss.php:105
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "%s oppdateringer fra alle sammen!"
@@ -1225,26 +1219,25 @@ msgid "Atom post must be an Atom entry."
 msgstr "Atom-innlegget må være en Atom-oppføring."
 
 #. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
-#: actions/apitimelineuser.php:334
+#: actions/apitimelineuser.php:335
 msgid "Can only handle POST activities."
 msgstr "Kan bare håndtere POST-handlinger."
 
 #. TRANS: Client error displayed when using an unsupported activity object type.
 #. TRANS: %s is the unsupported activity object type.
-#: actions/apitimelineuser.php:345
+#: actions/apitimelineuser.php:346
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr "Kan ikke håndtere handlingsobjekttype «%s»."
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
 #. TRANS: %d is the notice ID (number).
-#: actions/apitimelineuser.php:379
+#: actions/apitimelineuser.php:380
 #, php-format
 msgid "No content for notice %d."
 msgstr "Inget innhold for notis %d."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#. TRANS: %s is the notice URI.
 #: actions/apitimelineuser.php:408
 #, php-format
 msgid "Notice with URI \"%s\" already exists."
@@ -1262,10 +1255,9 @@ msgstr "Bruker ikke funnet."
 
 #. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
 #. TRANS: Client exception.
-#. TRANS: Client error displayed trying to subscribe to a non-existing profile.
 #: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
 #: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
-#: actions/subscribe.php:110
+#: actions/subscribe.php:107
 msgid "No such profile."
 msgstr "Ingen slik profil."
 
@@ -1400,7 +1392,7 @@ msgstr "Kunne ikke slette favoritt."
 #: actions/joingroup.php:95 actions/leavegroup.php:82
 #: actions/leavegroup.php:95 actions/makeadmin.php:86
 #: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:380
+#: lib/command.php:392
 msgid "No such group."
 msgstr "Ingen slik gruppe."
 
@@ -1411,7 +1403,7 @@ msgid "Not a member."
 msgstr "Alle medlemmer"
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
-#: actions/atompubshowmembership.php:150
+#: actions/atompubshowmembership.php:151
 #, fuzzy
 msgid "Cannot delete someone else's membership."
 msgstr "Kunne ikke slette favoritt."
@@ -1516,11 +1508,9 @@ msgstr "Du kan laste opp en personlig avatar. Maks filstørrelse er %s."
 
 #. TRANS: Server error displayed in avatar upload page when no matching profile can be found for a user.
 #. TRANS: Server error displayed coming across a request from a user without a profile.
-#. TRANS: Server error displayed when trying to authorise a remote subscription request
-#. TRANS: while the user has no profile.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
 #: actions/grouplogo.php:184 actions/remotesubscribe.php:190
-#: actions/userauthorization.php:75 actions/userrss.php:108
+#: actions/userauthorization.php:72 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr "Bruker uten samsvarende profil."
 
@@ -1575,10 +1565,10 @@ msgstr "Beskjær"
 msgid "No file uploaded."
 msgstr "Ingen fil lastet opp."
 
-#. TRANS: Avatar upload form instruction after uploading a file.
+#. TRANS: Avatar upload form unstruction after uploading a file.
 #: actions/avatarsettings.php:345
 #, fuzzy
-msgid "Pick a square area of the image to be your avatar."
+msgid "Pick a square area of the image to be your avatar"
 msgstr "Velg et kvadratisk utsnitt av bildet som din avatar."
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
@@ -1620,7 +1610,7 @@ msgid "You may not backup your account."
 msgstr ""
 
 #. TRANS: Information displayed on the backup account page.
-#: actions/backupaccount.php:225
+#: actions/backupaccount.php:227
 msgid ""
 "You can backup your account data in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format. This is an experimental feature and provides "
@@ -1630,15 +1620,15 @@ msgid ""
 msgstr ""
 
 #. TRANS: Submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:248
+#: actions/backupaccount.php:250
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Backup"
 msgstr "Bakgrunn"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:252
-msgid "Backup your account."
+#: actions/backupaccount.php:254
+msgid "Backup your account"
 msgstr ""
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
@@ -1680,7 +1670,7 @@ msgstr "Nei"
 #. TRANS: Submit button title for 'No' when blocking a user.
 #: actions/block.php:158
 #, fuzzy
-msgid "Do not block this user."
+msgid "Do not block this user"
 msgstr "Ikke blokker denne brukeren"
 
 #. TRANS: Button label on the user block form.
@@ -1697,9 +1687,9 @@ msgid "Yes"
 msgstr "Ja"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:165
-#, fuzzy
-msgid "Block this user."
+#. TRANS: Description of the form to block a user.
+#: actions/block.php:165 lib/blockform.php:79
+msgid "Block this user"
 msgstr "Blokker denne brukeren"
 
 #. TRANS: Server error displayed when blocking a user fails.
@@ -1862,7 +1852,7 @@ msgstr ""
 #. TRANS: Field label for delete account confirmation entry.
 #. TRANS: Field label for password reset form where the password has to be typed again.
 #: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:262 actions/register.php:426
+#: actions/recoverpassword.php:262 actions/register.php:440
 msgid "Confirm"
 msgstr "Bekreft"
 
@@ -1892,14 +1882,14 @@ msgstr "Program ikke funnet."
 #. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
 #: actions/deleteapplication.php:79 actions/editapplication.php:78
-#: actions/showapplication.php:90
+#: actions/showapplication.php:94
 msgid "You are not the owner of this application."
 msgstr "Du er ikke eieren av dette programmet."
 
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
-#: actions/newapplication.php:112 actions/showapplication.php:113
-#: lib/action.php:1422
+#: actions/newapplication.php:112 actions/showapplication.php:118
+#: lib/action.php:1425
 #, fuzzy
 msgid "There was a problem with your session token."
 msgstr "Det var et problem med din sesjons-autentisering. Prøv igjen."
@@ -1924,13 +1914,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting an application.
 #: actions/deleteapplication.php:161
 #, fuzzy
-msgid "Do not delete this application."
+msgid "Do not delete this application"
 msgstr "Ikke slett dette programmet"
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
 #: actions/deleteapplication.php:167
 #, fuzzy
-msgid "Delete this application."
+msgid "Delete this application"
 msgstr "Slett dette programmet"
 
 #. TRANS: Client error when trying to delete group while not logged in.
@@ -1985,13 +1975,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting a group.
 #: actions/deletegroup.php:224
 #, fuzzy
-msgid "Do not delete this group."
+msgid "Do not delete this group"
 msgstr "Ikke slett denne gruppen"
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
 #: actions/deletegroup.php:231
 #, fuzzy
-msgid "Delete this group."
+msgid "Delete this group"
 msgstr "Slett denne gruppen"
 
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
@@ -1999,15 +1989,13 @@ msgstr "Slett denne gruppen"
 #. TRANS: Client error displayed when trying to mark a notice as favorite without being logged in.
 #. TRANS: Client error displayed trying to block a user from a group while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
-#. TRANS: Client error displayed trying to log out when not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
-#. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
 #. TRANS: Client error displayed when trying to change user options while not logged in.
 #: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
-#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:70
+#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
-#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:98
+#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
 #: lib/adminpanelaction.php:71 lib/profileformaction.php:63
 #: lib/settingsaction.php:72
@@ -2037,13 +2025,12 @@ msgstr "Er du sikker på at du vil slette denne notisen?"
 #. TRANS: Submit button title for 'No' when deleting a notice.
 #: actions/deletenotice.php:159
 #, fuzzy
-msgid "Do not delete this notice."
+msgid "Do not delete this notice"
 msgstr "Ikke slett denne notisen"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:166
-#, fuzzy
-msgid "Delete this notice."
+#: actions/deletenotice.php:166 lib/noticelist.php:673
+msgid "Delete this notice"
 msgstr "Slett denne notisen"
 
 #. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
@@ -2080,13 +2067,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting a user.
 #: actions/deleteuser.php:158
 #, fuzzy
-msgid "Do not delete this user."
+msgid "Do not delete this user"
 msgstr "Ikke slett denne gruppen"
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
-#: actions/deleteuser.php:165
-#, fuzzy
-msgid "Delete this user."
+#. TRANS: Description of form for deleting a user.
+#: actions/deleteuser.php:165 lib/deleteuserform.php:75
+msgid "Delete this user"
 msgstr "Slett denne brukeren"
 
 #. TRANS: Message used as title for design settings for the site.
@@ -2251,21 +2238,21 @@ msgid "Use defaults"
 msgstr "Bruk standard"
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:720
-#, fuzzy
-msgid "Restore default designs."
+#. TRANS: Title for button on profile design page to reset all colour settings to default.
+#: actions/designadminpanel.php:720 lib/designsettings.php:259
+msgid "Restore default designs"
 msgstr "Gjenopprett standardutseende"
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:728
-#, fuzzy
-msgid "Reset back to default."
+#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
+#: actions/designadminpanel.php:728 lib/designsettings.php:267
+msgid "Reset back to default"
 msgstr "Tilbakestill til standardverdier"
 
 #. TRANS: Title for button for saving theme settings.
-#: actions/designadminpanel.php:736
-#, fuzzy
-msgid "Save design."
+#. TRANS: Title for button on profile design page to save settings.
+#: actions/designadminpanel.php:736 lib/designsettings.php:272
+msgid "Save design"
 msgstr "Lagre utseende"
 
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
@@ -2297,7 +2284,7 @@ msgid "You must be logged in to edit an application."
 msgstr "Du må være innlogget for å redigere et program."
 
 #. TRANS: Client error displayed trying to edit an application that does not exist.
-#: actions/editapplication.php:83 actions/showapplication.php:83
+#: actions/editapplication.php:83 actions/showapplication.php:87
 msgid "No such application."
 msgstr "Inget slikt program."
 
@@ -2576,7 +2563,7 @@ msgid "Cannot normalize that email address."
 msgstr "Klarer ikke normalisere epostadressen"
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:393 actions/register.php:204
+#: actions/emailsettings.php:393 actions/register.php:212
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "Ugyldig e-postadresse."
@@ -2652,22 +2639,19 @@ msgstr "Ingen innkommende e-postadresse."
 
 #. 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.
 #: actions/emailsettings.php:530 actions/emailsettings.php:554
-#: actions/smssettings.php:566 actions/smssettings.php:591
+#: actions/smssettings.php:565 actions/smssettings.php:588
 #, fuzzy
 msgid "Could not update user record."
 msgstr "Kunne ikke oppdatere brukeroppføring."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
-#. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:534 actions/smssettings.php:570
+#: actions/emailsettings.php:534 actions/smssettings.php:568
 msgid "Incoming email address removed."
 msgstr "Inkommende e-postadresse fjernet."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
-#. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:558 actions/smssettings.php:595
+#: actions/emailsettings.php:558 actions/smssettings.php:591
 msgid "New incoming email address added."
 msgstr "Ny innkommende e-postadresse lagt til."
 
@@ -2679,7 +2663,7 @@ msgstr "Denne notisen er allerede en favoritt."
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
 #: actions/favor.php:95
 #, fuzzy
-msgid "Disfavor favorite."
+msgid "Disfavor favorite"
 msgstr "Fjern favoritt"
 
 #. TRANS: Page title for first page of favorited notices.
@@ -2921,13 +2905,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
 #: actions/groupblock.php:191
 #, fuzzy
-msgid "Do not block this user from this group."
+msgid "Do not block this user from this group"
 msgstr "Ikke blokker denne brukeren fra denne gruppa"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
 #: actions/groupblock.php:198
 #, fuzzy
-msgid "Block this user from this group."
+msgid "Block this user from this group"
 msgstr "Blokker denne brukeren fra denne gruppen"
 
 #. TRANS: Server error displayed when trying to block a user from a group fails because of an application error.
@@ -2936,7 +2920,6 @@ msgid "Database error blocking user from group."
 msgstr "Databasefeil ved blokkering av bruker fra gruppe."
 
 #. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
-#. TRANS: Client error displayed trying to find a user by ID without providing an ID.
 #: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr "Ingen ID."
@@ -3123,10 +3106,8 @@ msgid "Group search"
 msgstr "Gruppesøk"
 
 #. TRANS: Text on page where groups can be searched if no results were found for a query.
-#. TRANS: Text for notice search results is the query had no results.
-#. TRANS: Message on the "People search" page where a query has no results.
-#: actions/groupsearch.php:82 actions/noticesearch.php:122
-#: actions/peoplesearch.php:87
+#: actions/groupsearch.php:82 actions/noticesearch.php:117
+#: actions/peoplesearch.php:83
 msgid "No results."
 msgstr "Ingen resultat."
 
@@ -3163,7 +3144,6 @@ msgid "User is not blocked from group."
 msgstr "Bruker er ikke blokkert fra gruppe."
 
 #. TRANS: Server error displayed when unblocking a user from a group fails because of an unknown error.
-#. TRANS: Server error displayed when removing a user block.
 #: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "Feil under oppheving av blokkering."
@@ -3257,8 +3237,7 @@ msgid "Publish a MicroID for my Jabber/Google Talk address."
 msgstr "Publiser en MicroID for min Jabber/Gtalk-adresse."
 
 #. TRANS: Confirmation message for successful Instant Messaging preferences save.
-#. TRANS: Confirmation message after saving preferences.
-#: actions/imsettings.php:283 actions/othersettings.php:193
+#: actions/imsettings.php:283 actions/othersettings.php:192
 msgid "Preferences saved."
 msgstr "Innstillinger lagret."
 
@@ -3545,7 +3524,7 @@ msgstr "Du må være innlogget for å forlate en gruppe."
 
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
-#: actions/leavegroup.php:103 lib/command.php:386
+#: actions/leavegroup.php:103 lib/command.php:398
 msgid "You are not a member of that group."
 msgstr "Du er ikke et medlem av den gruppen."
 
@@ -3667,42 +3646,40 @@ msgstr "Lagre"
 msgid "Save license settings"
 msgstr "Lagre lisensinnstillinger"
 
-#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
-#: actions/login.php:97 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
 msgid "Already logged in."
 msgstr "Allerede innlogget."
 
-#: actions/login.php:142
+#: actions/login.php:148
 msgid "Incorrect username or password."
 msgstr "Feil brukernavn eller passord."
 
-#. TRANS: Server error displayed when a user object could not be created trying to login using "one time password login".
-#: actions/login.php:148 actions/otp.php:127
+#: actions/login.php:154 actions/otp.php:120
 msgid "Error setting user. You are probably not authorized."
 msgstr "Feil ved innstilling av bruker. Du er mest sannsynlig kke autorisert."
 
-#: actions/login.php:202 actions/login.php:253
+#: actions/login.php:210 actions/login.php:263
 msgid "Login"
 msgstr "Logg inn"
 
-#: actions/login.php:239
+#: actions/login.php:249
 msgid "Login to site"
 msgstr "Logg inn på nettstedet"
 
-#: actions/login.php:248 actions/register.php:476
+#: actions/login.php:258 actions/register.php:490
 msgid "Remember me"
 msgstr "Husk meg"
 
-#: actions/login.php:249 actions/register.php:478
+#: actions/login.php:259 actions/register.php:492
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 "Logg inn automatisk i framtiden. Ikke for datamaskiner du deler med andre!"
 
-#: actions/login.php:259
+#: actions/login.php:269
 msgid "Lost or forgotten password?"
 msgstr "Mistet eller glemt passordet?"
 
-#: actions/login.php:277
+#: actions/login.php:288
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -3710,11 +3687,11 @@ msgstr ""
 "Av sikkerhetsmessige årsaker, skriv inn brukernavn og passord på nytt før du "
 "endrer innstillingene dine."
 
-#: actions/login.php:281
+#: actions/login.php:292
 msgid "Login with your username and password."
 msgstr "Logg inn med brukernavn og passord."
 
-#: actions/login.php:284
+#: actions/login.php:295
 #, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -3796,14 +3773,14 @@ msgid "New message"
 msgstr "Ny melding"
 
 #. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
-#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:501
+#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:513
 msgid "You can't send a message to this user."
 msgstr "Du kan ikke sende en melding til denne brukeren."
 
 #. TRANS: Command exception text shown when trying to send a direct message to another user without content.
 #. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
-#: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:478
-#: lib/command.php:581
+#: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:490
+#: lib/command.php:593
 msgid "No content!"
 msgstr "Inget innhold."
 
@@ -3812,7 +3789,7 @@ msgid "No recipient specified."
 msgstr "Ingen mottaker oppgitt."
 
 #. TRANS: Error text shown when trying to send a direct message to self.
-#: actions/newmessage.php:167 lib/command.php:505
+#: actions/newmessage.php:167 lib/command.php:517
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
@@ -3824,7 +3801,7 @@ msgstr "Melding sendt"
 
 #. TRANS: Message given have sent a direct message to another user.
 #. TRANS: %s is the name of the other user.
-#: actions/newmessage.php:188 lib/command.php:513
+#: actions/newmessage.php:188 lib/command.php:525
 #, php-format
 msgid "Direct message to %s sent."
 msgstr "Direktemelding til %s sendt."
@@ -3841,9 +3818,7 @@ msgstr "Ny notis"
 msgid "Notice posted"
 msgstr "Notis postet"
 
-#. TRANS: Instructions for Notice search page.
-#. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/noticesearch.php:69
+#: actions/noticesearch.php:68
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -3852,21 +3827,16 @@ msgstr ""
 "Søk i notiser på %%site.name%% etter deres innhold. Separer nøkkelord med "
 "mellomrom; de må være minst 3 tegn lange."
 
-#. TRANS: Title of the page where users can search for notices.
-#: actions/noticesearch.php:80
+#: actions/noticesearch.php:78
 msgid "Text search"
 msgstr "Tekst-søk"
 
-#. TRANS: Test in RSS notice search.
-#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearch.php:95
+#: actions/noticesearch.php:91
 #, php-format
 msgid "Search results for \"%1$s\" on %2$s"
 msgstr "Søkeresultat for «%1$s» på %2$s"
 
-#. TRANS: Text for logged in users making a query for notices without results.
-#. TRANS: This message contains a Markdown link.
-#: actions/noticesearch.php:128
+#: actions/noticesearch.php:121
 #, php-format
 msgid ""
 "Be the first to [post on this topic](%%%%action.newnotice%%%%?"
@@ -3875,9 +3845,7 @@ msgstr ""
 "Vær den første til å [poste om dette emnet](%%%%action.newnotice%%%%?"
 "status_textarea=%s)!"
 
-#. TRANS: Text for not logged in users making a query for notices without results.
-#. TRANS: This message contains Markdown links.
-#: actions/noticesearch.php:133
+#: actions/noticesearch.php:124
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and be the first to "
@@ -3887,17 +3855,14 @@ msgstr ""
 "første til å [poste om dette emnet](%%%%action.newnotice%%%%?status_textarea="
 "%s)!"
 
-#. TRANS: RSS notice search feed title. %s is the query.
-#: actions/noticesearchrss.php:95
+#: actions/noticesearchrss.php:96
 #, php-format
 msgid "Updates with \"%s\""
 msgstr "Oppdateringer med «%s»"
 
-#. TRANS: RSS notice search feed description.
-#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearchrss.php:99
+#: actions/noticesearchrss.php:98
 #, fuzzy, php-format
-msgid "Updates matching search term \"%1$s\" on %2$s."
+msgid "Updates matching search term \"%1$s\" on %2$s!"
 msgstr "Oppdateringer som samsvarer søkestrengen «%1$s» på %2$s."
 
 #: actions/nudge.php:85
@@ -3938,30 +3903,30 @@ msgid "You have not registered any applications yet."
 msgstr "Du har ikke registrert noen program ennå."
 
 #. TRANS: Title for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:70
+#: actions/oauthconnectionssettings.php:71
 msgid "Connected applications"
 msgstr "Tilkoblede program"
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:81
+#: actions/oauthconnectionssettings.php:83
 msgid "The following connections exist for your account."
 msgstr "Følgende tilkoblinger finnes for kontoen din."
 
 #. TRANS: Client error when trying to revoke access for an application while not being a user of it.
-#: actions/oauthconnectionssettings.php:166
+#: actions/oauthconnectionssettings.php:168
 msgid "You are not a user of that application."
 msgstr "Du er ikke bruker av dette programmet."
 
 #. TRANS: Client error when revoking access has failed for some reason.
 #. TRANS: %s is the application ID revoking access failed for.
-#: actions/oauthconnectionssettings.php:181
+#: actions/oauthconnectionssettings.php:183
 #, fuzzy, php-format
 msgid "Unable to revoke access for application: %s."
 msgstr "Kunne ikke fjerne tilgang for applikasjonen: %s."
 
 #. TRANS: Success message after revoking access for an application.
 #. TRANS: %1$s is the application name, %2$s is the first part of the user token.
-#: actions/oauthconnectionssettings.php:200
+#: actions/oauthconnectionssettings.php:202
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -3970,30 +3935,20 @@ msgstr ""
 "Du har fjernet tilgangen for %1$s og tilgangstegnet som begynner med %2$s."
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:211
+#: actions/oauthconnectionssettings.php:213
 msgid "You have not authorized any applications to use your account."
 msgstr "Du har ikke tillatt noen programmer å bruke din konto."
 
 #. TRANS: Note for developers in the OAuth connection settings form.
 #. TRANS: This message contains a Markdown link. Do not separate "](".
 #. TRANS: %s is the URL to the OAuth settings.
-#: actions/oauthconnectionssettings.php:231
+#: actions/oauthconnectionssettings.php:233
 #, php-format
 msgid ""
 "Are you a developer? [Register an OAuth client application](%s) to use with "
 "this instance of StatusNet."
 msgstr ""
 
-#: actions/oembed.php:64
-#, fuzzy, php-format
-msgid "\"%s\" not found."
-msgstr "Bruker ikke funnet."
-
-#: actions/oembed.php:76
-#, fuzzy, php-format
-msgid "Notice %s not found."
-msgstr "Foreldrenotis ikke funnet."
-
 #: actions/oembed.php:80 actions/shownotice.php:100
 msgid "Notice has no profile."
 msgstr "Notisen har ingen profil."
@@ -4003,16 +3958,6 @@ msgstr "Notisen har ingen profil."
 msgid "%1$s's status on %2$s"
 msgstr "%1$s sin status på %2$s"
 
-#: actions/oembed.php:95
-#, fuzzy, php-format
-msgid "Attachment %s not found."
-msgstr "Fant ikke mottakeren."
-
-#: actions/oembed.php:136
-#, php-format
-msgid "\"%s\" not supported for oembed requests."
-msgstr ""
-
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
 #: actions/oembed.php:168
 #, php-format
@@ -4031,12 +3976,11 @@ msgstr "Bare %s-nettadresser over vanlig HTTP."
 msgid "Not a supported data format."
 msgstr "Ikke et støttet dataformat."
 
-#. TRANS: ShortName in the OpenSearch interface when trying to find users.
 #: actions/opensearch.php:64
 msgid "People Search"
 msgstr "Personsøk"
 
-#: actions/opensearch.php:68
+#: actions/opensearch.php:67
 msgid "Notice Search"
 msgstr "Notissøk"
 
@@ -4056,7 +4000,7 @@ msgstr "Håndter diverse andre alternativ."
 #. TRANS: here if it has one (most likely a single space).
 #: actions/othersettings.php:113
 msgid " (free service)"
-msgstr " (gratis tjeneste)"
+msgstr " (fri tjeneste)"
 
 #. TRANS: Label for dropdown with URL shortener services.
 #: actions/othersettings.php:122
@@ -4083,47 +4027,38 @@ msgstr "Vis eller skjul profilutseender."
 msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr "Adresseforkortelsestjenesten er for lang (maks 50 tegn)."
 
-#. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
-#: actions/otp.php:70
+#: actions/otp.php:69
 msgid "No user ID specified."
 msgstr "Ingen bruker-ID spesifisert."
 
-#. TRANS: Client error displayed trying to use "one time password login" without specifying a login token.
-#: actions/otp.php:86
+#: actions/otp.php:83
 msgid "No login token specified."
 msgstr "Ingen notis spesifisert."
 
-#. TRANS: Client error displayed trying to use "one time password login" without requesting a login token.
-#: actions/otp.php:94
+#: actions/otp.php:90
 msgid "No login token requested."
 msgstr ""
 
-#. TRANS: Client error displayed trying to use "one time password login" while specifying an invalid login token.
-#: actions/otp.php:100
+#: actions/otp.php:95
 msgid "Invalid login token specified."
 msgstr "Ugyldig symbol."
 
-#. TRANS: Client error displayed trying to use "one time password login" while specifying an expired login token.
-#: actions/otp.php:110
+#: actions/otp.php:104
 #, fuzzy
 msgid "Login token expired."
 msgstr "Logg inn på nettstedet"
 
-#. TRANS: Title for outbox for any but the fist page.
-#. TRANS: %1$s is the user nickname, %2$d is the page number.
-#: actions/outbox.php:57
+#: actions/outbox.php:58
 #, php-format
 msgid "Outbox for %1$s - page %2$d"
 msgstr "Utboks for %1$s - side %2$d"
 
-#. TRANS: Title for first page of outbox.
 #: actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
 msgstr "Utboks for %s"
 
-#. TRANS: Instructions for outbox.
-#: actions/outbox.php:103
+#: actions/outbox.php:104
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr "Dette er utboksen din som viser alle private meldinger du har sendt."
 
@@ -4149,45 +4084,43 @@ msgstr "Gammelt passord"
 msgid "New password"
 msgstr "Nytt passord"
 
-#: actions/passwordsettings.php:109 actions/register.php:423
+#: actions/passwordsettings.php:109
 #, fuzzy
-msgid "6 or more characters."
+msgid "6 or more characters"
 msgstr "6 eller flere tegn"
 
-#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:264
-#: actions/register.php:427
+#: actions/passwordsettings.php:113
 #, fuzzy
-msgid "Same as password above."
+msgid "Same as password above"
 msgstr "Samme som passord ovenfor"
 
 #: actions/passwordsettings.php:117
 msgid "Change"
 msgstr "Endre"
 
-#: actions/passwordsettings.php:153 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:238
 msgid "Password must be 6 or more characters."
 msgstr "Passord må være minst 6 tegn."
 
-#: actions/passwordsettings.php:156 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:241
 msgid "Passwords don't match."
 msgstr "Passordene var ikke like."
 
-#: actions/passwordsettings.php:164
+#: actions/passwordsettings.php:165
 msgid "Incorrect old password"
 msgstr "Feil gammelt passord"
 
-#: actions/passwordsettings.php:180
+#: actions/passwordsettings.php:181
 msgid "Error saving user; invalid."
 msgstr "Feil ved lagring av bruker; ugyldig."
 
-#. TRANS: Reset password form validation error message.
-#: actions/passwordsettings.php:185 actions/recoverpassword.php:418
+#: actions/passwordsettings.php:186
 #, fuzzy
-msgid "Cannot save new password."
+msgid "Can't save new password."
 msgstr "Klarer ikke å lagre nytt passord."
 
-#: actions/passwordsettings.php:191
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
 msgid "Password saved."
 msgstr "Passordet ble lagret"
 
@@ -4463,9 +4396,7 @@ msgstr "Tjener SSL-forespørsler skal rettes til."
 msgid "Save paths"
 msgstr "Lagre stier"
 
-#. TRANS: Instructions for the "People search" page.
-#. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/peoplesearch.php:54
+#: actions/peoplesearch.php:52
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
@@ -4474,8 +4405,7 @@ msgstr ""
 "Søk etter personer på %%site.name%% etter deres navn, lokasjon eller "
 "interesser. Skill nøkkelord med mellomrom; de må være 3 tegn eller lengre."
 
-#. TRANS: Title of a page where users can search for other users.
-#: actions/peoplesearch.php:61
+#: actions/peoplesearch.php:58
 msgid "People search"
 msgstr "Personsøk"
 
@@ -4517,14 +4447,14 @@ msgid "Profile information"
 msgstr "Profilinformasjon"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109 actions/register.php:419
+#: actions/profilesettings.php:109 actions/register.php:433
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr "1‒64 små bokstaver eller tall, ingen tegnsetting eller mellomrom."
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for full group name (dt). Text hidden by default.
 #. TRANS: DT for full name in a profile.
-#: actions/profilesettings.php:113 actions/register.php:441
+#: actions/profilesettings.php:113 actions/register.php:455
 #: actions/showgroup.php:255 actions/tagother.php:104
 #: lib/groupeditform.php:150 lib/userprofile.php:156
 msgid "Full name"
@@ -4532,20 +4462,20 @@ msgstr "Fullt navn"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:118 actions/register.php:446
+#: actions/profilesettings.php:118 actions/register.php:460
 #: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "Hjemmesiden"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:121 actions/register.php:448
+#: actions/profilesettings.php:121
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr "Adressen til din hjemmeside, blogg eller profil på et annet nettsted."
 
 #. TRANS: Tooltip for field label in form for profile settings. Plural
 #. TRANS: is decided by the number of characters available for the
 #. TRANS: biography (%d).
-#: actions/profilesettings.php:129 actions/register.php:457
+#: actions/profilesettings.php:129 actions/register.php:471
 #, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4553,29 +4483,28 @@ msgstr[0] "Beskriv deg selv og dine interesser på %d tegn"
 msgstr[1] "Beskriv deg selv og dine interesser på %d tegn"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:135 actions/register.php:462
+#: actions/profilesettings.php:135 actions/register.php:476
 msgid "Describe yourself and your interests"
 msgstr "Beskriv degselv og dine interesser"
 
 #. TRANS: Text area label in form for profile settings where users can provide.
 #. TRANS: their biography.
-#: actions/profilesettings.php:139 actions/register.php:464
+#: actions/profilesettings.php:139 actions/register.php:478
 msgid "Bio"
 msgstr "Om meg"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group location (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT for location in a profile.
-#: actions/profilesettings.php:145 actions/register.php:469
+#: actions/profilesettings.php:145 actions/register.php:483
 #: actions/showgroup.php:265 actions/tagother.php:112
-#: actions/userauthorization.php:174 lib/groupeditform.php:173
+#: actions/userauthorization.php:166 lib/groupeditform.php:173
 #: lib/userprofile.php:172
 msgid "Location"
 msgstr "Plassering"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148
+#: actions/profilesettings.php:148 actions/register.php:485
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Hvor du er, for eksempel «By, fylke (eller region), land»"
 
@@ -4596,8 +4525,7 @@ msgstr "Tagger"
 #: actions/profilesettings.php:164
 #, fuzzy
 msgid ""
-"Tags for yourself (letters, numbers, -, ., and _), comma- or space- "
-"separated."
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr ""
 "Merkelapper for degselv (bokstaver, nummer, -, ., og _), adskilt med komma "
 "eller mellomrom"
@@ -4610,7 +4538,7 @@ msgstr "Språk"
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
 #: actions/profilesettings.php:171
 #, fuzzy
-msgid "Preferred language."
+msgid "Preferred language"
 msgstr "Foretrukket språk"
 
 #. TRANS: Dropdownlist label in form for profile settings.
@@ -4627,14 +4555,14 @@ msgstr "Hvilken tidssone er du vanligvis i?"
 #: actions/profilesettings.php:189
 #, fuzzy
 msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)."
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr ""
 "Abonner automatisk på de som abonnerer på meg (best for ikke-mennesker)"
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Plural form is used based on the maximum number of allowed
 #. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:258 actions/register.php:221
+#: actions/profilesettings.php:258 actions/register.php:229
 #, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4653,9 +4581,9 @@ msgstr "Språknavnet er for langt (maks 50 tegn)."
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:291
-#, fuzzy, php-format
-msgid "Invalid tag: \"%s\"."
+#: actions/profilesettings.php:291 actions/tagother.php:178
+#, php-format
+msgid "Invalid tag: \"%s\""
 msgstr "Ugyldig merkelapp: «%s»"
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
@@ -4764,12 +4692,6 @@ msgstr ""
 "Mikroblogg)tjeneste basert på det frie programvareverktøyet [StatusNet]"
 "(http://status.net)."
 
-#. TRANS: Public RSS feed description. %s is the StatusNet site name.
-#: actions/publicrss.php:106
-#, fuzzy, php-format
-msgid "%s updates from everyone."
-msgstr "%s oppdateringer fra alle sammen!"
-
 #. TRANS: Title for public tag cloud.
 #: actions/publictagcloud.php:57
 msgid "Public tag cloud"
@@ -4905,12 +4827,6 @@ msgstr "Gjenopprett passord"
 msgid "Password recovery requested"
 msgstr "Passordgjenoppretting forespurt"
 
-#. TRANS: Title for password recovery page in password saved mode.
-#: actions/recoverpassword.php:229
-#, fuzzy
-msgid "Password saved"
-msgstr "Passordet ble lagret"
-
 #. TRANS: Title for password recovery page when an unknown action has been specified.
 #: actions/recoverpassword.php:232
 msgid "Unknown action"
@@ -4922,6 +4838,12 @@ msgstr "Ukjent handling"
 msgid "6 or more characters, and do not forget it!"
 msgstr "6 eller flere tegn. Og ikke glem det!"
 
+#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#: actions/recoverpassword.php:264 actions/register.php:441
+#, fuzzy
+msgid "Same as password above."
+msgstr "Samme som passord ovenfor"
+
 #. TRANS: Button text for password reset form.
 #. TRANS: Button text on profile design page to reset all colour settings to default without saving.
 #: actions/recoverpassword.php:268 lib/designsettings.php:264
@@ -4974,8 +4896,14 @@ msgstr "Passordet må bestå av 6 eller flere tegn."
 msgid "Password and confirmation do not match."
 msgstr "Passord og bekreftelse samsvarer ikke."
 
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:418
+#, fuzzy
+msgid "Cannot save new password."
+msgstr "Klarer ikke å lagre nytt passord."
+
 #. TRANS: Server error displayed when something does wrong with the user object during password reset.
-#: actions/recoverpassword.php:426 actions/register.php:248
+#: actions/recoverpassword.php:426 actions/register.php:256
 msgid "Error setting user."
 msgstr "Feil ved innstilling av bruker."
 
@@ -4984,92 +4912,97 @@ msgstr "Feil ved innstilling av bruker."
 msgid "New password successfully saved. You are now logged in."
 msgstr "Nytt passord ble lagret. Du er nå logget inn."
 
-#: actions/register.php:87 actions/register.php:188 actions/register.php:399
+#: actions/register.php:92 actions/register.php:196 actions/register.php:413
 msgid "Sorry, only invited people can register."
 msgstr "Beklager, kun inviterte personer kan registrere seg."
 
-#: actions/register.php:94
+#: actions/register.php:99
 msgid "Sorry, invalid invitation code."
 msgstr "Beklager, ugyldig invitasjonskode."
 
-#: actions/register.php:113
+#: actions/register.php:119
 msgid "Registration successful"
 msgstr "Registrering vellykket"
 
-#: actions/register.php:115 actions/register.php:497
+#: actions/register.php:121 actions/register.php:511
 msgid "Register"
 msgstr "Registrer"
 
-#: actions/register.php:135
+#: actions/register.php:142
 msgid "Registration not allowed."
 msgstr "Registrering ikke tillatt."
 
-#: actions/register.php:201
+#: actions/register.php:209
 #, fuzzy
-msgid "You cannot register if you don't agree to the license."
+msgid "You can't register if you don't agree to the license."
 msgstr "Du kan ikke registrere deg om du ikke godtar lisensvilkårene."
 
-#: actions/register.php:210
+#: actions/register.php:218
 msgid "Email address already exists."
 msgstr "E-postadressen finnes allerede."
 
-#: actions/register.php:243 actions/register.php:265
+#: actions/register.php:251 actions/register.php:273
 msgid "Invalid username or password."
 msgstr "Ugyldig brukernavn eller passord."
 
-#: actions/register.php:340
+#: actions/register.php:351
 #, fuzzy
 msgid ""
 "With this form you can create a new account. You can then post notices and "
-"link up to friends and colleagues."
+"link up to friends and colleagues. "
 msgstr ""
 "Med dette skjemaet kan du opprette en ny konto. Du kan så poste notiser og "
 "knytte deg til venner og kollegaer. "
 
+#: actions/register.php:437
+#, fuzzy
+msgid "6 or more characters."
+msgstr "6 eller flere tegn"
+
 #. TRANS: Link description in user account settings menu.
-#: actions/register.php:431 actions/register.php:435
+#: actions/register.php:445 actions/register.php:449
 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
 msgid "Email"
 msgstr "E-post"
 
-#: actions/register.php:432 actions/register.php:436
+#: actions/register.php:446 actions/register.php:450
 #, fuzzy
-msgid "Used only for updates, announcements, and password recovery."
+msgid "Used only for updates, announcements, and password recovery"
 msgstr "Kun brukt for oppdateringer, kunngjøringer og passordgjenoppretting"
 
-#: actions/register.php:443
+#: actions/register.php:457
 #, fuzzy
-msgid "Longer name, preferably your \"real\" name."
+msgid "Longer name, preferably your \"real\" name"
 msgstr "Lengre navn, helst ditt \"ekte\" navn"
 
-#: actions/register.php:471
+#: actions/register.php:462
 #, fuzzy
-msgid "Where you are, like \"City, State (or Region), Country\"."
-msgstr "Hvor du er, for eksempel «By, fylke (eller region), land»"
+msgid "URL of your homepage, blog, or profile on another site"
+msgstr "Adressen til din hjemmeside, blogg eller profil på et annet nettsted."
 
-#: actions/register.php:510
+#: actions/register.php:523
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
 msgstr ""
 
-#: actions/register.php:520
+#: actions/register.php:533
 #, php-format
 msgid "My text and files are copyright by %1$s."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:524
+#: actions/register.php:537
 msgid "My text and files remain under my own copyright."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:527
+#: actions/register.php:540
 msgid "All rights reserved."
 msgstr "Alle rettigheter reservert."
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:532
+#: actions/register.php:545
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -5078,7 +5011,7 @@ msgstr ""
 "Mine tekster og filer er tilgjengelig under %s med unntak av disse private "
 "dataene: passord, e-postadresse, direktemeldingsadresse og telefonnummer."
 
-#: actions/register.php:573
+#: actions/register.php:588
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -5111,7 +5044,7 @@ msgstr ""
 "\n"
 "Takk for at du registrerte deg og vi håper du kommer til å like tjenesten."
 
-#: actions/register.php:597
+#: actions/register.php:612
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5145,7 +5078,7 @@ msgstr "Brukerens kallenavn"
 
 #: actions/remotesubscribe.php:129
 #, fuzzy
-msgid "Nickname of the user you want to follow."
+msgid "Nickname of the user you want to follow"
 msgstr "Kallenavn på brukeren du vil følge"
 
 #: actions/remotesubscribe.php:132
@@ -5154,7 +5087,7 @@ msgstr "Profilnettadresse"
 
 #: actions/remotesubscribe.php:133
 #, fuzzy
-msgid "URL of your profile on another compatible microblogging service."
+msgid "URL of your profile on another compatible microblogging service"
 msgstr ""
 "Nettadresse til profilen din på en annen kompatibel mikrobloggingstjeneste"
 
@@ -5166,7 +5099,7 @@ msgstr "Abonner"
 
 #: actions/remotesubscribe.php:158
 #, fuzzy
-msgid "Invalid profile URL (bad format)."
+msgid "Invalid profile URL (bad format)"
 msgstr "Ugyldig profilnettadresse (dårlig format)"
 
 #: actions/remotesubscribe.php:167
@@ -5210,7 +5143,6 @@ msgstr "Gjentatt"
 msgid "Repeated!"
 msgstr "Gjentatt!"
 
-#. TRANS: RSS reply feed title. %s is a user nickname.
 #. TRANS: Tooltip for personal group navigation menu option when logged in for viewing @-replies.
 #: actions/replies.php:126 actions/repliesrss.php:68
 #: lib/personalgroupnav.php:109
@@ -5263,11 +5195,9 @@ msgstr ""
 "Vær den første til å [poste om dette emnet](%%%%action.newnotice%%%%?"
 "status_textarea=%s)!"
 
-#. TRANS: RSS reply feed description.
-#. TRANS: %1$s is a user nickname, %2$s is the StatusNet site name.
-#: actions/repliesrss.php:74
+#: actions/repliesrss.php:72
 #, fuzzy, php-format
-msgid "Replies to %1$s on %2$s."
+msgid "Replies to %1$s on %2$s!"
 msgstr "Svar til %1$s på %2$s!"
 
 #. TRANS: Client exception displayed when trying to restore an account while not logged in.
@@ -5367,7 +5297,7 @@ msgstr "Du kan ikke trekke tilbake brukerroller på dette nettstedet."
 msgid "User doesn't have this role."
 msgstr "Brukeren har ikke denne rollen."
 
-#: actions/rsd.php:142 actions/version.php:159
+#: actions/rsd.php:146 actions/version.php:159
 msgid "StatusNet"
 msgstr "StatusNet"
 
@@ -5409,88 +5339,88 @@ msgstr "Slå på feilsøkingsutdata for økter."
 msgid "Save site settings"
 msgstr "Lagre nettstedsinnstillinger"
 
-#: actions/showapplication.php:78
+#: actions/showapplication.php:82
 msgid "You must be logged in to view an application."
 msgstr "Du må være innlogget for å se et program."
 
-#: actions/showapplication.php:151
+#: actions/showapplication.php:157
 msgid "Application profile"
 msgstr "Programprofil"
 
 #. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:153 lib/applicationeditform.php:177
+#: actions/showapplication.php:159 lib/applicationeditform.php:177
 msgid "Icon"
 msgstr "Ikon"
 
 #. TRANS: Form input field label for application name.
-#: actions/showapplication.php:163 actions/version.php:197
+#: actions/showapplication.php:169 actions/version.php:197
 #: lib/applicationeditform.php:190
 msgid "Name"
 msgstr "Navn"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:172 lib/applicationeditform.php:227
+#: actions/showapplication.php:178 lib/applicationeditform.php:227
 msgid "Organization"
 msgstr "Organisasjon"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:181 actions/version.php:200
+#: actions/showapplication.php:187 actions/version.php:200
 #: lib/applicationeditform.php:208 lib/groupeditform.php:168
 msgid "Description"
 msgstr "Beskrivelse"
 
 #. TRANS: Header for group statistics on a group page (h2).
 #. TRANS: H2 text for user statistics.
-#: actions/showapplication.php:186 actions/showgroup.php:460
+#: actions/showapplication.php:192 actions/showgroup.php:460
 #: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "Statistikk"
 
-#: actions/showapplication.php:197
+#: actions/showapplication.php:203
 #, php-format
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr "Opprettet av %1$s - %2$s standardtilgang - %3$d brukere"
 
-#: actions/showapplication.php:207
+#: actions/showapplication.php:213
 msgid "Application actions"
 msgstr "Programhandlinger"
 
-#: actions/showapplication.php:230
+#: actions/showapplication.php:236
 msgid "Reset key & secret"
 msgstr "Tilbakestill nøkkel & hemmelighet"
 
 #. TRANS: Title of form for deleting a user.
-#: actions/showapplication.php:246 lib/deletegroupform.php:121
+#: actions/showapplication.php:252 lib/deletegroupform.php:121
 #: lib/deleteuserform.php:64 lib/noticelist.php:673
 msgid "Delete"
 msgstr "Slett"
 
-#: actions/showapplication.php:255
+#: actions/showapplication.php:261
 msgid "Application info"
 msgstr "Programinformasjon"
 
-#: actions/showapplication.php:257
+#: actions/showapplication.php:263
 msgid "Consumer key"
 msgstr "Forbrukernøkkel"
 
-#: actions/showapplication.php:262
+#: actions/showapplication.php:268
 msgid "Consumer secret"
 msgstr "Forbrukerhemmelighet"
 
-#: actions/showapplication.php:267
+#: actions/showapplication.php:273
 msgid "Request token URL"
 msgstr ""
 
-#: actions/showapplication.php:272
+#: actions/showapplication.php:278
 msgid "Access token URL"
 msgstr ""
 
-#: actions/showapplication.php:277
+#: actions/showapplication.php:283
 #, fuzzy
 msgid "Authorize URL"
 msgstr "Forfatter"
 
-#: actions/showapplication.php:282
+#: actions/showapplication.php:288
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
@@ -5498,7 +5428,7 @@ msgstr ""
 "Merk: Vi støtter HMAC-SHA1-signaturer. Vi støtter ikke metoden for "
 "klartekstsignatur."
 
-#: actions/showapplication.php:302
+#: actions/showapplication.php:309
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr ""
 "Er du sikker på at du vil tilbakestille din forbrukernøkkel og -hemmelighet?"
@@ -5591,18 +5521,16 @@ msgid "Group profile"
 msgstr "Gruppeprofil"
 
 #. TRANS: Label for group URL (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT for URL in a profile.
 #: actions/showgroup.php:273 actions/tagother.php:118
-#: actions/userauthorization.php:184 lib/userprofile.php:186
+#: actions/userauthorization.php:175 lib/userprofile.php:186
 msgid "URL"
 msgstr "Nettadresse"
 
 #. TRANS: Label for group description or group note (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page where bio is displayed.
 #. TRANS: DT for note in a profile.
 #: actions/showgroup.php:285 actions/tagother.php:128
-#: actions/userauthorization.php:197 lib/userprofile.php:204
+#: actions/userauthorization.php:187 lib/userprofile.php:204
 msgid "Note"
 msgstr "Merk"
 
@@ -5748,7 +5676,7 @@ msgid "%1$s tagged %2$s"
 msgstr "%1$s, side %2$d"
 
 #. TRANS: Page title showing tagged notices in one user's stream.
-#. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
+#. TRANS: %1$s is the username, %2$s is the hash tag, %1$d is the page number.
 #: actions/showstream.php:74
 #, fuzzy, php-format
 msgid "%1$s tagged %2$s, page %3$d"
@@ -5995,7 +5923,7 @@ msgstr ""
 #. TRANS: Title for button to save site notice in admin panel.
 #: actions/sitenoticeadminpanel.php:201
 #, fuzzy
-msgid "Save site notice."
+msgid "Save site notice"
 msgstr "Lagre nettstedsnotis"
 
 #. TRANS: Title for SMS settings.
@@ -6054,7 +5982,7 @@ msgstr "Telefonnummer for SMS"
 #. TRANS: SMS phone number input field instructions in SMS settings form.
 #: actions/smssettings.php:152
 #, fuzzy
-msgid "Phone number, no punctuation or spaces, with area code."
+msgid "Phone number, no punctuation or spaces, with area code"
 msgstr "Telefonnummer, ingen tegnsetting eller mellomrom, med retningsnummer"
 
 #. TRANS: Form legend for SMS preferences form.
@@ -6228,19 +6156,15 @@ msgstr "Ikke autorisert."
 msgid "Could not save subscription."
 msgstr "Kunne ikke lagre merkelapper."
 
-#. TRANS: Client error displayed trying to perform any request method other than POST.
-#. TRANS: Do not translate POST.
 #: actions/subscribe.php:77
 msgid "This action only accepts POST requests."
 msgstr ""
 
-#. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
-#: actions/subscribe.php:121
+#: actions/subscribe.php:117
 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
 msgstr ""
 
-#. TRANS: Page title when subscription succeeded.
-#: actions/subscribe.php:149
+#: actions/subscribe.php:145
 #, fuzzy
 msgid "Subscribed"
 msgstr "Abonner"
@@ -6394,9 +6318,8 @@ msgstr "Merk %s"
 msgid "User profile"
 msgstr "Brukerprofil"
 
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT element in area for user avatar.
-#: actions/tagother.php:81 actions/userauthorization.php:138
+#: actions/tagother.php:81 actions/userauthorization.php:132
 #: lib/userprofile.php:108
 msgid "Photo"
 msgstr "Foto"
@@ -6414,11 +6337,6 @@ msgstr ""
 "Merkelapper for degselv (bokstaver, nummer, -, ., og _), adskilt med komma "
 "eller mellomrom"
 
-#: actions/tagother.php:178
-#, php-format
-msgid "Invalid tag: \"%s\""
-msgstr "Ugyldig merkelapp: «%s»"
-
 #: actions/tagother.php:193
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
@@ -6434,7 +6352,6 @@ msgstr "Bruk dette skjemaet for å redigere programmet ditt."
 msgid "No such tag."
 msgstr "Ingen slik side."
 
-#. TRANS: Client error displayed when trying to unblock a non-blocked user.
 #: actions/unblock.php:59
 msgid "You haven't blocked that user."
 msgstr "Du har ikke blokkert den brukeren."
@@ -6459,7 +6376,7 @@ msgstr "Ingen profil med den ID'en."
 msgid "Unsubscribed"
 msgstr "Abonner"
 
-#: actions/updateprofile.php:64
+#: actions/updateprofile.php:64 actions/userauthorization.php:337
 #, fuzzy, php-format
 msgid ""
 "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
@@ -6491,7 +6408,7 @@ msgstr "Ugyldig velkomsttekst. Maks lengde er 255 tegn."
 #. TRANS: users in user admin panel. %1$s is the invalid nickname.
 #: actions/useradminpanel.php:166
 #, fuzzy, php-format
-msgid "Invalid default subscripton: \"%1$s\" is not a user."
+msgid "Invalid default subscripton: '%1$s' is not a user."
 msgstr "Ugyldig standardabonnement: '%1$s' er ikke bruker."
 
 #. TRANS: Link description in user account settings menu.
@@ -6553,142 +6470,107 @@ msgstr "Hvorvidt brukere tillates å invitere nye brukere."
 #. TRANS: Title for button to save user settings in user admin panel.
 #: actions/useradminpanel.php:302
 #, fuzzy
-msgid "Save user settings."
+msgid "Save user settings"
 msgstr "Lagre nettstedsinnstillinger"
 
-#. TRANS: Page title.
-#: actions/userauthorization.php:109
+#: actions/userauthorization.php:105
 msgid "Authorize subscription"
 msgstr "Autoriser abonnementet"
 
-#. TRANS: Page notice on "Auhtorize subscription" page.
-#: actions/userauthorization.php:115
+#: actions/userauthorization.php:110
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
 "user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
-"click \"Reject\"."
+"click “Reject”."
 msgstr ""
 
-#. TRANS: DT element on Authorise Subscription page where license is displayed.
 #. TRANS: Menu item for site administration
-#: actions/userauthorization.php:207 actions/version.php:167
+#: actions/userauthorization.php:196 actions/version.php:167
 #: lib/adminpanelaction.php:403
 msgid "License"
 msgstr "Lisens"
 
-#. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:229
+#: actions/userauthorization.php:217
 #, fuzzy
-msgctxt "BUTTON"
 msgid "Accept"
 msgstr "Godta"
 
-#. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:231
-#, fuzzy
-msgid "Subscribe to this user."
+#: actions/userauthorization.php:218 lib/subscribeform.php:115
+#: lib/subscribeform.php:139
+msgid "Subscribe to this user"
 msgstr "Abonner på denne brukeren"
 
-#. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:233
+#: actions/userauthorization.php:219
 #, fuzzy
-msgctxt "BUTTON"
 msgid "Reject"
 msgstr "Avvis"
 
-#. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:235
+#: actions/userauthorization.php:220
 #, fuzzy
-msgid "Reject this subscription."
+msgid "Reject this subscription"
 msgstr "Avvis dette abonnementet"
 
-#. TRANS: Client error displayed for an empty authorisation request.
-#: actions/userauthorization.php:248
+#: actions/userauthorization.php:232
 msgid "No authorization request!"
 msgstr ""
 
-#. TRANS: Accept message header from Authorise subscription page.
-#: actions/userauthorization.php:271
+#: actions/userauthorization.php:254
 #, fuzzy
 msgid "Subscription authorized"
 msgstr "Abonnement"
 
-#: actions/userauthorization.php:274
+#: actions/userauthorization.php:256
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to authorize the "
 "subscription. Your subscription token is:"
 msgstr ""
 
-#. TRANS: Reject message header from Authorise subscription page.
-#: actions/userauthorization.php:285
+#: actions/userauthorization.php:266
 #, fuzzy
 msgid "Subscription rejected"
 msgstr "Abonnement"
 
-#: actions/userauthorization.php:288
+#: actions/userauthorization.php:268
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to fully reject the "
 "subscription."
 msgstr ""
 
-#. TRANS: Exception thrown when no valid user is found for an authorisation request.
-#. TRANS: %s is a listener URI.
-#: actions/userauthorization.php:325
+#: actions/userauthorization.php:303
 #, php-format
-msgid "Listener URI \"%s\" not found here."
+msgid "Listener URI ‘%s’ not found here."
 msgstr ""
 
-#. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:332
+#: actions/userauthorization.php:308
 #, fuzzy, php-format
-msgid "Listenee URI \"%s\" is too long."
+msgid "Listenee URI ‘%s’ is too long."
 msgstr "Kilde-URL er for lang."
 
-#. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:340
+#: actions/userauthorization.php:314
 #, fuzzy, php-format
-msgid "Listenee URI \"%s\" is a local user."
+msgid "Listenee URI ‘%s’ is a local user."
 msgstr "Profil-URL ‘%s’ er for en lokal bruker."
 
-#. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
-#. TRANS: %s is a profile URL.
-#: actions/userauthorization.php:358
+#: actions/userauthorization.php:329
 #, fuzzy, php-format
-msgid "Profile URL \"%s\" is for a local user."
+msgid "Profile URL ‘%s’ is for a local user."
 msgstr "Profil-URL ‘%s’ er for en lokal bruker."
 
-#. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
-#. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
-#: actions/userauthorization.php:368
+#: actions/userauthorization.php:345
 #, fuzzy, php-format
-msgid ""
-"Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
-"\"."
-msgstr "Notislisensen ‘%1$s’ er ikke kompatibel med nettstedslisensen ‘%2$s’."
-
-#. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:378
-#, fuzzy, php-format
-msgid "Avatar URL \"%s\" is not valid."
+msgid "Avatar URL ‘%s’ is not valid."
 msgstr "Avatar-URL ‘%s’ er ikke gyldig."
 
-#. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:385
+#: actions/userauthorization.php:350
 #, fuzzy, php-format
-msgid "Cannot read avatar URL \"%s\"."
+msgid "Can’t read avatar URL ‘%s’."
 msgstr "Kan ikke lese avatar-URL ‘%s’"
 
-#. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:392
+#: actions/userauthorization.php:355
 #, fuzzy, php-format
-msgid "Wrong image type for avatar URL \"%s\"."
+msgid "Wrong image type for avatar URL ‘%s’."
 msgstr "Feil bildetype for avatar-URL ‘%s’."
 
 #. TRANS: Page title for profile design page.
@@ -6787,7 +6669,7 @@ msgid "Plugins"
 msgstr "Programtillegg"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:898
+#: actions/version.php:198 lib/action.php:901
 msgid "Version"
 msgstr "Versjon"
 
@@ -6990,14 +6872,14 @@ msgstr "Problem ved lagring av gruppeinnboks."
 
 #. TRANS: Server exception thrown when a reply cannot be saved.
 #. TRANS: %1$d is a notice ID, %2$d is the ID of the mentioned user.
-#: classes/Notice.php:1142
+#: classes/Notice.php:1144
 #, fuzzy, php-format
 msgid "Could not save reply for %1$d, %2$d."
 msgstr "Kunne ikke lagre lokal gruppeinformasjon."
 
 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1661
+#: classes/Notice.php:1663
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
@@ -7011,14 +6893,14 @@ msgstr "%1$s (%2$s)"
 
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:775
+#: classes/Profile.php:779
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:784
+#: classes/Profile.php:788
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -7340,55 +7222,55 @@ msgid "Page notice"
 msgstr "Sidenotis"
 
 #. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:871
+#: lib/action.php:874
 msgid "Secondary site navigation"
 msgstr ""
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:877
+#: lib/action.php:880
 msgid "Help"
 msgstr "Hjelp"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:880
+#: lib/action.php:883
 msgid "About"
 msgstr "Om"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:883
+#: lib/action.php:886
 msgid "FAQ"
 msgstr "OSS/FAQ"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:888
+#: lib/action.php:891
 msgid "TOS"
 msgstr ""
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:892
+#: lib/action.php:895
 #, fuzzy
 msgid "Privacy"
 msgstr "Privat"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:895
+#: lib/action.php:898
 msgid "Source"
 msgstr "Kilde"
 
 #. TRANS: Secondary navigation menu option leading to e-mail contact information on the
 #. TRANS: StatusNet site, where to report bugs, ...
-#: lib/action.php:902
+#: lib/action.php:905
 msgid "Contact"
 msgstr "Kontakt"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:905
+#: lib/action.php:908
 #, fuzzy
 msgid "Badge"
 msgstr "Knuff"
 
 #. TRANS: DT element for StatusNet software license.
-#: lib/action.php:934
+#: lib/action.php:937
 msgid "StatusNet software license"
 msgstr "Programvarelisens for StatusNet"
 
@@ -7396,7 +7278,7 @@ msgstr "Programvarelisens for StatusNet"
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:941
+#: lib/action.php:944
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7406,7 +7288,7 @@ msgstr ""
 "broughtby%%](%%site.broughtbyurl%%)."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:944
+#: lib/action.php:947
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** er en mikrobloggingtjeneste."
@@ -7415,7 +7297,7 @@ msgstr "**%%site.name%%** er en mikrobloggingtjeneste."
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:951
+#: lib/action.php:954
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7424,52 +7306,52 @@ msgid ""
 msgstr ""
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:967
+#: lib/action.php:970
 #, fuzzy
 msgid "Site content license"
 msgstr "Programvarelisens for StatusNet"
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:974
+#: lib/action.php:977
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:981
+#: lib/action.php:984
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:985
+#: lib/action.php:988
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:1017
+#: lib/action.php:1020
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
 
 #. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1353
+#: lib/action.php:1356
 #, fuzzy
 msgid "Pagination"
 msgstr "Registrering"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1364
+#: lib/action.php:1367
 msgid "After"
 msgstr "Etter"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1374
+#: lib/action.php:1377
 msgid "Before"
 msgstr "Før"
 
@@ -7673,23 +7555,19 @@ msgstr ""
 msgid "No application for that consumer key."
 msgstr ""
 
-#: lib/apiauth.php:202 lib/apiauth.php:284
-msgid "Not allowed to use API."
-msgstr ""
-
 #. TRANS: OAuth exception given when an incorrect access token was given for a user.
-#: lib/apiauth.php:225
+#: lib/apiauth.php:219
 msgid "Bad access token."
 msgstr ""
 
 #. TRANS: OAuth exception given when no user was found for a given token (no token was found).
-#: lib/apiauth.php:230
+#: lib/apiauth.php:224
 msgid "No user for that token."
 msgstr ""
 
 #. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel".
 #. TRANS: Client error thrown when authentication fails.
-#: lib/apiauth.php:272 lib/apiauth.php:302
+#: lib/apiauth.php:266 lib/apiauth.php:293
 msgid "Could not authenticate you."
 msgstr ""
 
@@ -7899,11 +7777,6 @@ msgstr "Endring av passord er ikke tillatt"
 msgid "Block"
 msgstr "Blokkér"
 
-#. TRANS: Description of the form to block a user.
-#: lib/blockform.php:79
-msgid "Block this user"
-msgstr "Blokker denne brukeren"
-
 #. TRANS: Title for command results.
 #: lib/channel.php:160 lib/channel.php:181
 msgid "Command results"
@@ -7932,7 +7805,7 @@ msgstr ""
 
 #. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
 #. TRANS: Error text shown when a last user notice is requested and it does not exist.
-#: lib/command.php:99 lib/command.php:630
+#: lib/command.php:99 lib/command.php:642
 #, fuzzy
 msgid "User has no last notice."
 msgstr "Brukeren har ingen profil."
@@ -7983,35 +7856,41 @@ msgstr ""
 "Abonnenter: %2$s\n"
 "Notiser: %3$s"
 
+#. TRANS: Error message text shown when a favorite could not be set because it has already been favorited.
+#: lib/command.php:298
+#, fuzzy
+msgid "Could not create favorite: already favorited."
+msgstr "Kunne ikke opprette favoritt."
+
 #. TRANS: Text shown when a notice has been marked as favourite successfully.
-#: lib/command.php:312
+#: lib/command.php:324
 msgid "Notice marked as fave."
 msgstr "Notis markert som favoritt."
 
 #. TRANS: Message given having added a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:357
+#: lib/command.php:369
 #, php-format
 msgid "%1$s joined group %2$s."
 msgstr ""
 
 #. TRANS: Message given having removed a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:405
+#: lib/command.php:417
 #, php-format
 msgid "%1$s left group %2$s."
 msgstr ""
 
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: lib/command.php:426
+#: lib/command.php:438
 #, fuzzy, php-format
 msgctxt "WHOIS"
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
 
 #. TRANS: Whois output. %s is the full name of the queried user.
-#: lib/command.php:430
+#: lib/command.php:442
 #, php-format
 msgid "Fullname: %s"
 msgstr "Fullt navn: %s"
@@ -8019,7 +7898,7 @@ msgstr "Fullt navn: %s"
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a location.
-#: lib/command.php:434 lib/mail.php:270
+#: lib/command.php:446 lib/mail.php:270
 #, php-format
 msgid "Location: %s"
 msgstr "Posisjon: %s"
@@ -8027,20 +7906,20 @@ msgstr "Posisjon: %s"
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a homepage.
-#: lib/command.php:438 lib/mail.php:274
+#: lib/command.php:450 lib/mail.php:274
 #, php-format
 msgid "Homepage: %s"
 msgstr "Hjemmeside: %s"
 
 #. TRANS: Whois output. %s is the bio information of the queried user.
-#: lib/command.php:442
+#: lib/command.php:454
 #, php-format
 msgid "About: %s"
 msgstr "Om: %s"
 
 #. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).
 #. TRANS: %s is a remote profile.
-#: lib/command.php:471
+#: lib/command.php:483
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
@@ -8049,7 +7928,7 @@ msgstr ""
 
 #. TRANS: Message given if content is too long. %1$sd is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:488
+#: lib/command.php:500
 #, fuzzy, php-format
 msgid "Message too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
@@ -8057,25 +7936,25 @@ msgstr[0] "Melding for lang - maks er %1$d tegn, du sendte %2$d."
 msgstr[1] "Melding for lang - maks er %1$d tegn, du sendte %2$d."
 
 #. TRANS: Error text shown sending a direct message fails with an unknown reason.
-#: lib/command.php:516
+#: lib/command.php:528
 msgid "Error sending direct message."
 msgstr "Feil ved sending av direktemelding."
 
 #. TRANS: Message given having repeated a notice from another user.
 #. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:553
+#: lib/command.php:565
 #, fuzzy, php-format
 msgid "Notice from %s repeated."
 msgstr "Nytt nick"
 
 #. TRANS: Error text shown when repeating a notice fails with an unknown reason.
-#: lib/command.php:556
+#: lib/command.php:568
 msgid "Error repeating notice."
 msgstr "Feil ved repetering av notis."
 
 #. TRANS: Message given if content of a notice for a reply is too long. %1$d is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:591
+#: lib/command.php:603
 #, fuzzy, php-format
 msgid "Notice too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Notice too long - maximum is %1$d characters, you sent %2$d."
@@ -8084,97 +7963,97 @@ msgstr[1] "Melding for lang - maks er %1$d tegn, du sendte %2$d."
 
 #. TRANS: Text shown having sent a reply to a notice successfully.
 #. TRANS: %s is the nickname of the user of the notice the reply was sent to.
-#: lib/command.php:604
+#: lib/command.php:616
 #, fuzzy, php-format
 msgid "Reply to %s sent."
 msgstr "Svar til %s"
 
 #. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
-#: lib/command.php:607
+#: lib/command.php:619
 msgid "Error saving notice."
 msgstr "Feil ved lagring av notis."
 
 #. TRANS: Error text shown when no username was provided when issuing a subscribe command.
-#: lib/command.php:654
+#: lib/command.php:666
 msgid "Specify the name of the user to subscribe to."
 msgstr ""
 
 #. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
-#: lib/command.php:663
+#: lib/command.php:675
 msgid "Can't subscribe to OMB profiles by command."
 msgstr ""
 
 #. TRANS: Text shown after having subscribed to another user successfully.
 #. TRANS: %s is the name of the user the subscription was requested for.
-#: lib/command.php:671
+#: lib/command.php:683
 #, php-format
 msgid "Subscribed to %s."
 msgstr ""
 
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.
-#: lib/command.php:692 lib/command.php:803
+#: lib/command.php:704 lib/command.php:815
 msgid "Specify the name of the user to unsubscribe from."
 msgstr ""
 
 #. TRANS: Text shown after having unsubscribed from another user successfully.
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:703
+#: lib/command.php:715
 #, php-format
 msgid "Unsubscribed from %s."
 msgstr ""
 
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
-#: lib/command.php:723 lib/command.php:749
+#: lib/command.php:735 lib/command.php:761
 #, fuzzy
 msgid "Command not yet implemented."
 msgstr "Beklager, denne kommandoen er ikke implementert ennå."
 
 #. TRANS: Text shown when issuing the command "off" successfully.
-#: lib/command.php:727
+#: lib/command.php:739
 #, fuzzy
 msgid "Notification off."
 msgstr "Ingen bekreftelseskode."
 
 #. TRANS: Error text shown when the command "off" fails for an unknown reason.
-#: lib/command.php:730
+#: lib/command.php:742
 msgid "Can't turn off notification."
 msgstr ""
 
 #. TRANS: Text shown when issuing the command "on" successfully.
-#: lib/command.php:753
+#: lib/command.php:765
 #, fuzzy
 msgid "Notification on."
 msgstr "Ingen bekreftelseskode."
 
 #. TRANS: Error text shown when the command "on" fails for an unknown reason.
-#: lib/command.php:756
+#: lib/command.php:768
 #, fuzzy
 msgid "Can't turn on notification."
 msgstr "Kan ikke gjenta din egen notis."
 
 #. TRANS: Error text shown when issuing the login command while login is disabled.
-#: lib/command.php:770
+#: lib/command.php:782
 msgid "Login command is disabled."
 msgstr ""
 
 #. TRANS: Text shown after issuing the login command successfully.
 #. TRANS: %s is a logon link..
-#: lib/command.php:783
+#: lib/command.php:795
 #, php-format
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
 
 #. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:812
+#: lib/command.php:824
 #, php-format
 msgid "Unsubscribed %s."
 msgstr ""
 
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
-#: lib/command.php:830
+#: lib/command.php:842
 #, fuzzy
 msgid "You are not subscribed to anyone."
 msgstr "Ikke autorisert."
@@ -8182,7 +8061,7 @@ msgstr "Ikke autorisert."
 #. TRANS: Text shown after requesting other users a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
-#: lib/command.php:835
+#: lib/command.php:847
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Ikke autorisert."
@@ -8190,7 +8069,7 @@ msgstr[1] "Ikke autorisert."
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user
 #. TRANS: (followers) without having any subscribers.
-#: lib/command.php:857
+#: lib/command.php:869
 #, fuzzy
 msgid "No one is subscribed to you."
 msgstr "Svar til %s"
@@ -8198,7 +8077,7 @@ msgstr "Svar til %s"
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
-#: lib/command.php:862
+#: lib/command.php:874
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Svar til %s"
@@ -8206,21 +8085,21 @@ msgstr[1] "Svar til %s"
 
 #. TRANS: Text shown after requesting groups a user is subscribed to without having
 #. TRANS: any group subscriptions.
-#: lib/command.php:884
+#: lib/command.php:896
 msgid "You are not a member of any groups."
 msgstr "Du er ikke et medlem av den gruppen."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
-#: lib/command.php:889
+#: lib/command.php:901
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "Du er allerede logget inn!"
 msgstr[1] "Du er allerede logget inn!"
 
 #. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-#: lib/command.php:904
+#: lib/command.php:916
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -8327,11 +8206,6 @@ msgstr "Tilkoblede program"
 msgid "Database error"
 msgstr "Databasefeil"
 
-#. TRANS: Description of form for deleting a user.
-#: lib/deleteuserform.php:75
-msgid "Delete this user"
-msgstr "Slett denne brukeren"
-
 #. TRANS: Label in form on profile design page.
 #. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
 #: lib/designsettings.php:108
@@ -8369,21 +8243,6 @@ msgstr "Endre farger"
 msgid "Use defaults"
 msgstr "Bruk standard"
 
-#. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: lib/designsettings.php:259
-msgid "Restore default designs"
-msgstr "Gjenopprett standardutseende"
-
-#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: lib/designsettings.php:267
-msgid "Reset back to default"
-msgstr "Tilbakestill til standardverdier"
-
-#. TRANS: Title for button on profile design page to save settings.
-#: lib/designsettings.php:272
-msgid "Save design"
-msgstr "Lagre utseende"
-
 #. TRANS: Error message displayed if design settings could not be saved.
 #. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
 #: lib/designsettings.php:405 lib/designsettings.php:427
@@ -9267,10 +9126,6 @@ msgstr "Svar på denne notisen"
 msgid "Reply"
 msgstr "Svar"
 
-#: lib/noticelist.php:673
-msgid "Delete this notice"
-msgstr "Slett denne notisen"
-
 #: lib/noticelist.php:691
 msgid "Notice repeated"
 msgstr "Notis repetert"
@@ -9560,10 +9415,6 @@ msgstr "Inviter"
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Inviter venner og kollegaer til å bli med deg på %s"
 
-#: lib/subscribeform.php:115 lib/subscribeform.php:139
-msgid "Subscribe to this user"
-msgstr "Abonner på denne brukeren"
-
 #: lib/subscriberspeopleselftagcloudsection.php:48
 #: lib/subscriptionspeopleselftagcloudsection.php:48
 msgid "People Tagcloud as self-tagged"
@@ -9739,23 +9590,18 @@ msgctxt "role"
 msgid "Moderator"
 msgstr "Moderator"
 
-#: lib/util.php:305
-#, fuzzy
-msgid "Not allowed to log in."
-msgstr "Ikke logget inn."
-
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1309
+#: lib/util.php:1306
 msgid "a few seconds ago"
 msgstr "noen få sekunder siden"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1312
+#: lib/util.php:1309
 msgid "about a minute ago"
 msgstr "omtrent ett minutt siden"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1316
+#: lib/util.php:1313
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
@@ -9763,12 +9609,12 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1319
+#: lib/util.php:1316
 msgid "about an hour ago"
 msgstr "omtrent én time siden"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1323
+#: lib/util.php:1320
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
@@ -9776,12 +9622,12 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1326
+#: lib/util.php:1323
 msgid "about a day ago"
 msgstr "omtrent én dag siden"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1330
+#: lib/util.php:1327
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
@@ -9789,12 +9635,12 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1333
+#: lib/util.php:1330
 msgid "about a month ago"
 msgstr "omtrent én måned siden"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1337
+#: lib/util.php:1334
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
@@ -9802,7 +9648,7 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1340
+#: lib/util.php:1337
 msgid "about a year ago"
 msgstr "omtrent ett år siden"
 
@@ -9844,3 +9690,74 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#, fuzzy
+#~ msgid "Block this user."
+#~ msgstr "Blokker denne brukeren"
+
+#, fuzzy
+#~ msgid "Delete this notice."
+#~ msgstr "Slett denne notisen"
+
+#, fuzzy
+#~ msgid "Delete this user."
+#~ msgstr "Slett denne brukeren"
+
+#, fuzzy
+#~ msgid "Restore default designs."
+#~ msgstr "Gjenopprett standardutseende"
+
+#, fuzzy
+#~ msgid "Reset back to default."
+#~ msgstr "Tilbakestill til standardverdier"
+
+#, fuzzy
+#~ msgid "Save design."
+#~ msgstr "Lagre utseende"
+
+#, fuzzy
+#~ msgid "Disfavor favorite."
+#~ msgstr "Fjern favoritt"
+
+#, fuzzy
+#~ msgid "\"%s\" not found."
+#~ msgstr "Bruker ikke funnet."
+
+#, fuzzy
+#~ msgid "Notice %s not found."
+#~ msgstr "Foreldrenotis ikke funnet."
+
+#, fuzzy
+#~ msgid "Attachment %s not found."
+#~ msgstr "Fant ikke mottakeren."
+
+#, fuzzy
+#~ msgid "Invalid tag: \"%s\"."
+#~ msgstr "Ugyldig merkelapp: «%s»"
+
+#, fuzzy
+#~ msgid "%s updates from everyone."
+#~ msgstr "%s oppdateringer fra alle sammen!"
+
+#, fuzzy
+#~ msgid "Password saved"
+#~ msgstr "Passordet ble lagret"
+
+#, fuzzy
+#~ msgid "Where you are, like \"City, State (or Region), Country\"."
+#~ msgstr "Hvor du er, for eksempel «By, fylke (eller region), land»"
+
+#, fuzzy
+#~ msgid "Subscribe to this user."
+#~ msgstr "Abonner på denne brukeren"
+
+#, fuzzy
+#~ msgid ""
+#~ "Listenee stream license \"%1$s\" is not compatible with site license \"%2"
+#~ "$s\"."
+#~ msgstr ""
+#~ "Notislisensen ‘%1$s’ er ikke kompatibel med nettstedslisensen ‘%2$s’."
+
+#, fuzzy
+#~ msgid "Not allowed to log in."
+#~ msgstr "Ikke logget inn."
diff --git a/locale/nl/LC_MESSAGES/statusnet.po b/locale/nl/LC_MESSAGES/statusnet.po
index 9193da0198..8cc2f98dbf 100644
--- a/locale/nl/LC_MESSAGES/statusnet.po
+++ b/locale/nl/LC_MESSAGES/statusnet.po
@@ -12,17 +12,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-24 10:32+0000\n"
-"PO-Revision-Date: 2011-02-24 10:37:20+0000\n"
+"POT-Creation-Date: 2011-03-03 15:58+0000\n"
+"PO-Revision-Date: 2011-03-03 16:01:08+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r82712); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-02-17 11:39:54+0000\n"
+"X-POT-Import-Date: 2011-02-25 23:49:23+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -134,11 +134,7 @@ msgstr "Deze pagina bestaat niet."
 #. 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 use "one time password login" without using an existing user.
-#. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
-#. TRANS: Client error displayed trying to find a user by ID for a non-existing ID.
-#. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when calling a profile action without specifying a user.
 #: actions/all.php:80 actions/allrss.php:69
@@ -156,12 +152,12 @@ msgstr "Deze pagina bestaat niet."
 #: actions/apitimelinementions.php:77 actions/apitimelineuser.php:79
 #: actions/avatarbynickname.php:79 actions/favoritesrss.php:72
 #: actions/foaf.php:42 actions/foaf.php:61 actions/hcard.php:67
-#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:78
+#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
 #: actions/remotesubscribe.php:144 actions/remotesubscribe.php:153
-#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:113
-#: actions/showfavorites.php:106 actions/userbyid.php:75
+#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
+#: actions/showfavorites.php:106 actions/userbyid.php:74
 #: actions/usergroups.php:93 actions/userrss.php:40 actions/userxrd.php:59
-#: actions/xrds.php:71 lib/command.php:497 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:509 lib/galleryaction.php:59
 #: lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Onbekende gebruiker."
@@ -292,7 +288,7 @@ msgstr "Updates van %1$s en vrienden op %2$s."
 #: actions/apigrouplistall.php:120 actions/apigroupmembership.php:105
 #: actions/apigroupshow.php:114 actions/apihelptest.php:84
 #: actions/apistatusesdestroy.php:101 actions/apistatusesretweets.php:110
-#: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:138
+#: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:139
 #: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
 #: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:268
 #: actions/apitimelinegroup.php:147 actions/apitimelinehome.php:173
@@ -523,7 +519,8 @@ msgstr "De ontvanger is niet aangetroffen."
 
 #. TRANS: Client error displayed trying to direct message another user who's not a friend (403).
 #: actions/apidirectmessagenew.php:144
-msgid "Cannot send direct messages to users who aren't your friend."
+#, fuzzy
+msgid "Can't send direct messages to users who aren't your friend."
 msgstr ""
 "U kunt geen privéberichten sturen aan gebruikers die niet op uw "
 "vriendenlijst staan."
@@ -550,7 +547,7 @@ msgstr "Deze mededeling staat al in uw favorietenlijst."
 #. TRANS: Client error displayed when marking a notice as favourite fails.
 #. TRANS: Server error displayed when trying to mark a notice as favorite fails in the database.
 #. TRANS: Error message text shown when a favorite could not be set.
-#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:294
+#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:306
 msgid "Could not create favorite."
 msgstr "Het was niet mogelijk een favoriet aan te maken."
 
@@ -611,7 +608,7 @@ msgstr "Het was niet mogelijk de doelgebruiker te vinden."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:191
 #: actions/newgroup.php:137 actions/profilesettings.php:273
-#: actions/register.php:206
+#: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr ""
 "De opgegeven gebruikersnaam is al in gebruik. Kies een andere gebruikersnaam."
@@ -622,7 +619,7 @@ msgstr ""
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:195
 #: actions/newgroup.php:141 actions/profilesettings.php:243
-#: actions/register.php:208
+#: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "Ongeldige gebruikersnaam!"
 
@@ -635,7 +632,7 @@ msgstr "Ongeldige gebruikersnaam!"
 #: actions/apigroupcreate.php:181 actions/editapplication.php:235
 #: actions/editgroup.php:202 actions/newapplication.php:221
 #: actions/newgroup.php:148 actions/profilesettings.php:248
-#: actions/register.php:215
+#: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "De thuispagina is geen geldige URL."
 
@@ -645,7 +642,7 @@ msgstr "De thuispagina is geen geldige URL."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:191 actions/editgroup.php:206
 #: actions/newgroup.php:152 actions/profilesettings.php:252
-#: actions/register.php:218
+#: actions/register.php:226
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "De volledige naam is te lang (maximaal 255 tekens)."
 
@@ -673,7 +670,7 @@ msgstr[1] "De beschrijving is te lang (maximaal %d tekens)."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:215 actions/editgroup.php:218
 #: actions/newgroup.php:164 actions/profilesettings.php:265
-#: actions/register.php:227
+#: actions/register.php:235
 msgid "Location is too long (maximum 255 characters)."
 msgstr "De locatie is te lang (maximaal 255 tekens)."
 
@@ -729,14 +726,14 @@ msgstr "De groep is niet aangetroffen."
 #. TRANS: Server error displayed when trying to join a group the user is already a member of.
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:333
+#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:345
 msgid "You are already a member of that group."
 msgstr "U bent al lid van die groep."
 
 #. TRANS: Server error displayed when trying to join a group the user is blocked from joining.
 #. 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.
-#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:338
+#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:350
 msgid "You have been blocked from that group by the admin."
 msgstr "Een beheerder heeft ingesteld dat u geen lid mag worden van die groep."
 
@@ -746,7 +743,7 @@ msgstr "Een beheerder heeft ingesteld dat u geen lid mag worden van die groep."
 #. TRANS: %1$s is the joining user's nickname, $2$s is the group nickname for which the join failed.
 #. TRANS: Message given having failed to add a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:350
+#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:362
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "Het was niet mogelijk gebruiker %1$s toe te voegen aan de groep %2$s."
@@ -763,7 +760,7 @@ msgstr "U bent geen lid van deze groep."
 #. TRANS: Message given having failed to remove a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
 #: actions/apigroupleave.php:127 actions/leavegroup.php:133
-#: lib/command.php:398
+#: lib/command.php:410
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
 msgstr "Het was niet mogelijk gebruiker %1$s uit de groep %2$s te verwijderen."
@@ -823,21 +820,20 @@ msgstr "Het verzoektoken is al geautoriseerd."
 #. TRANS: Form validation error message.
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
-#. TRANS: Client error displayed when the session token is not okay.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
 #: actions/deletenotice.php:177 actions/disfavor.php:75
 #: actions/emailsettings.php:291 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:65 actions/grouplogo.php:321
 #: actions/groupunblock.php:65 actions/imsettings.php:224
-#: actions/invite.php:60 actions/login.php:131 actions/makeadmin.php:66
+#: actions/invite.php:60 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
-#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:136
-#: actions/othersettings.php:155 actions/passwordsettings.php:137
+#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
+#: actions/othersettings.php:155 actions/passwordsettings.php:138
 #: actions/profilesettings.php:217 actions/recoverpassword.php:383
-#: actions/register.php:164 actions/remotesubscribe.php:76
+#: actions/register.php:172 actions/remotesubscribe.php:76
 #: actions/repeat.php:82 actions/smssettings.php:250 actions/subedit.php:40
-#: actions/subscribe.php:87 actions/tagother.php:166
-#: actions/unsubscribe.php:69 actions/userauthorization.php:53
+#: actions/subscribe.php:86 actions/tagother.php:166
+#: actions/unsubscribe.php:69 actions/userauthorization.php:52
 #: lib/designsettings.php:310
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
@@ -872,7 +868,7 @@ msgstr ""
 #: actions/designadminpanel.php:100 actions/editapplication.php:144
 #: actions/emailsettings.php:310 actions/grouplogo.php:332
 #: actions/imsettings.php:239 actions/newapplication.php:124
-#: actions/oauthconnectionssettings.php:145 actions/recoverpassword.php:46
+#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
 #: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
 msgstr "Het formulier is onverwacht ingezonden."
@@ -923,20 +919,19 @@ msgstr "Gebruikersgegevens"
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group nickname (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT for nick name in a profile.
-#: actions/apioauthauthorize.php:459 actions/login.php:242
-#: actions/profilesettings.php:106 actions/register.php:418
+#: actions/apioauthauthorize.php:459 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:432
 #: actions/showgroup.php:243 actions/tagother.php:94
-#: actions/userauthorization.php:152 lib/groupeditform.php:145
+#: actions/userauthorization.php:145 lib/groupeditform.php:145
 #: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "Gebruikersnaam"
 
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:463 actions/login.php:245
-#: actions/register.php:422 lib/accountsettingsaction.php:120
+#: actions/apioauthauthorize.php:463 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:120
 msgid "Password"
 msgstr "Wachtwoord"
 
@@ -1031,13 +1026,13 @@ msgstr "De mededeling bestaat niet."
 
 #. TRANS: Client error displayed trying to repeat an own notice through the API.
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:537
+#: actions/apistatusesretweet.php:83 lib/command.php:549
 msgid "Cannot repeat your own notice."
 msgstr "U kunt uw eigen mededeling niet herhalen."
 
 #. TRANS: Client error displayed trying to re-repeat a notice through the API.
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:92 lib/command.php:543
+#: actions/apistatusesretweet.php:92 lib/command.php:555
 msgid "Already repeated that notice."
 msgstr "U hebt die mededeling al herhaald."
 
@@ -1058,8 +1053,8 @@ msgstr "HTTP-methode wordt niet ondersteund."
 #. TRANS: Exception thrown requesting an unsupported notice output format.
 #. TRANS: %s is the requested output format.
 #: actions/apistatusesshow.php:144
-#, php-format
-msgid "Unsupported format: %s."
+#, fuzzy, php-format
+msgid "Unsupported format: %s"
 msgstr "Niet-ondersteund formaat: %s."
 
 #. TRANS: Client error displayed requesting a deleted status.
@@ -1167,14 +1162,13 @@ msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr "%1$s updates die een reactie zijn op updates van %2$s / %3$s."
 
 #. TRANS: Title for site timeline. %s is the StatusNet sitename.
-#. TRANS: Public RSS feed title. %s is the StatusNet site name.
 #: actions/apitimelinepublic.php:193 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "%s publieke tijdlijn"
 
 #. TRANS: Subtitle for site timeline. %s is the StatusNet sitename.
-#: actions/apitimelinepublic.php:199
+#: actions/apitimelinepublic.php:199 actions/publicrss.php:105
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "%s updates van iedereen"
@@ -1239,26 +1233,25 @@ msgid "Atom post must be an Atom entry."
 msgstr "Het Atombericht moet een Atomopmaak hebben."
 
 #. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
-#: actions/apitimelineuser.php:334
+#: actions/apitimelineuser.php:335
 msgid "Can only handle POST activities."
 msgstr "Het is alleen mogelijk om POST-activiteiten af te handelen."
 
 #. TRANS: Client error displayed when using an unsupported activity object type.
 #. TRANS: %s is the unsupported activity object type.
-#: actions/apitimelineuser.php:345
+#: actions/apitimelineuser.php:346
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr "Het is niet mogelijk om het activiteitobjecttype \"%s\" te verwerken."
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
 #. TRANS: %d is the notice ID (number).
-#: actions/apitimelineuser.php:379
+#: actions/apitimelineuser.php:380
 #, php-format
 msgid "No content for notice %d."
 msgstr "Geen inhoud voor mededeling %d."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#. TRANS: %s is the notice URI.
 #: actions/apitimelineuser.php:408
 #, php-format
 msgid "Notice with URI \"%s\" already exists."
@@ -1276,10 +1269,9 @@ msgstr "De pagina is niet aangetroffen."
 
 #. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
 #. TRANS: Client exception.
-#. TRANS: Client error displayed trying to subscribe to a non-existing profile.
 #: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
 #: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
-#: actions/subscribe.php:110
+#: actions/subscribe.php:107
 msgid "No such profile."
 msgstr "Het profiel bestaat niet."
 
@@ -1408,7 +1400,7 @@ msgstr "Het is niet mogelijk om een favoriet van een ander te verwijderen."
 #: actions/joingroup.php:95 actions/leavegroup.php:82
 #: actions/leavegroup.php:95 actions/makeadmin.php:86
 #: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:380
+#: lib/command.php:392
 msgid "No such group."
 msgstr "De opgegeven groep bestaat niet."
 
@@ -1418,7 +1410,7 @@ msgid "Not a member."
 msgstr "Geen lid."
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
-#: actions/atompubshowmembership.php:150
+#: actions/atompubshowmembership.php:151
 msgid "Cannot delete someone else's membership."
 msgstr "Het is niet mogelijk om een lidmaatschap van een ander te verwijderen."
 
@@ -1525,11 +1517,9 @@ msgstr ""
 
 #. TRANS: Server error displayed in avatar upload page when no matching profile can be found for a user.
 #. TRANS: Server error displayed coming across a request from a user without a profile.
-#. TRANS: Server error displayed when trying to authorise a remote subscription request
-#. TRANS: while the user has no profile.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
 #: actions/grouplogo.php:184 actions/remotesubscribe.php:190
-#: actions/userauthorization.php:75 actions/userrss.php:108
+#: actions/userauthorization.php:72 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr "Gebruiker zonder bijbehorend profiel."
 
@@ -1584,9 +1574,10 @@ msgstr "Uitsnijden"
 msgid "No file uploaded."
 msgstr "Er is geen bestand geüpload."
 
-#. TRANS: Avatar upload form instruction after uploading a file.
+#. TRANS: Avatar upload form unstruction after uploading a file.
 #: actions/avatarsettings.php:345
-msgid "Pick a square area of the image to be your avatar."
+#, fuzzy
+msgid "Pick a square area of the image to be your avatar"
 msgstr ""
 "Selecteer een vierkant in de afbeelding om deze als uw avatar in te stellen."
 
@@ -1628,7 +1619,7 @@ msgid "You may not backup your account."
 msgstr "U kunt geen back-up van uw gebruiker maken."
 
 #. TRANS: Information displayed on the backup account page.
-#: actions/backupaccount.php:225
+#: actions/backupaccount.php:227
 msgid ""
 "You can backup your account data in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format. This is an experimental feature and provides "
@@ -1643,14 +1634,15 @@ msgstr ""
 "meegenomen. Hetzelfde geldt voor geüploade bestanden en directe berichten."
 
 #. TRANS: Submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:248
+#: actions/backupaccount.php:250
 msgctxt "BUTTON"
 msgid "Backup"
 msgstr "Reservekopie"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:252
-msgid "Backup your account."
+#: actions/backupaccount.php:254
+#, fuzzy
+msgid "Backup your account"
 msgstr "Uw gebruiker back-uppen."
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
@@ -1691,7 +1683,8 @@ msgstr "Nee"
 
 #. TRANS: Submit button title for 'No' when blocking a user.
 #: actions/block.php:158
-msgid "Do not block this user."
+#, fuzzy
+msgid "Do not block this user"
 msgstr "Deze gebruiker niet blokkeren."
 
 #. TRANS: Button label on the user block form.
@@ -1708,9 +1701,10 @@ msgid "Yes"
 msgstr "Ja"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:165
-msgid "Block this user."
-msgstr "Deze gebruiker blokkeren."
+#. TRANS: Description of the form to block a user.
+#: actions/block.php:165 lib/blockform.php:79
+msgid "Block this user"
+msgstr "Deze gebruiker blokkeren"
 
 #. TRANS: Server error displayed when blocking a user fails.
 #: actions/block.php:189
@@ -1872,7 +1866,7 @@ msgstr ""
 #. TRANS: Field label for delete account confirmation entry.
 #. TRANS: Field label for password reset form where the password has to be typed again.
 #: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:262 actions/register.php:426
+#: actions/recoverpassword.php:262 actions/register.php:440
 msgid "Confirm"
 msgstr "Bevestigen"
 
@@ -1903,14 +1897,14 @@ msgstr "De applicatie is niet gevonden."
 #. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
 #: actions/deleteapplication.php:79 actions/editapplication.php:78
-#: actions/showapplication.php:90
+#: actions/showapplication.php:94
 msgid "You are not the owner of this application."
 msgstr "U bent niet de eigenaar van deze applicatie."
 
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
-#: actions/newapplication.php:112 actions/showapplication.php:113
-#: lib/action.php:1422
+#: actions/newapplication.php:112 actions/showapplication.php:118
+#: lib/action.php:1425
 msgid "There was a problem with your session token."
 msgstr "Er is een probleem met uw sessietoken."
 
@@ -1933,12 +1927,14 @@ msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting an application.
 #: actions/deleteapplication.php:161
-msgid "Do not delete this application."
+#, fuzzy
+msgid "Do not delete this application"
 msgstr "Deze applicatie niet verwijderen."
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
 #: actions/deleteapplication.php:167
-msgid "Delete this application."
+#, fuzzy
+msgid "Delete this application"
 msgstr "Deze applicatie verwijderen."
 
 #. TRANS: Client error when trying to delete group while not logged in.
@@ -1993,12 +1989,14 @@ msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting a group.
 #: actions/deletegroup.php:224
-msgid "Do not delete this group."
+#, fuzzy
+msgid "Do not delete this group"
 msgstr "Deze groep niet verwijderen."
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
 #: actions/deletegroup.php:231
-msgid "Delete this group."
+#, fuzzy
+msgid "Delete this group"
 msgstr "Deze groep verwijderen."
 
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
@@ -2006,15 +2004,13 @@ msgstr "Deze groep verwijderen."
 #. TRANS: Client error displayed when trying to mark a notice as favorite without being logged in.
 #. TRANS: Client error displayed trying to block a user from a group while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
-#. TRANS: Client error displayed trying to log out when not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
-#. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
 #. TRANS: Client error displayed when trying to change user options while not logged in.
 #: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
-#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:70
+#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
-#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:98
+#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
 #: lib/adminpanelaction.php:71 lib/profileformaction.php:63
 #: lib/settingsaction.php:72
@@ -2043,13 +2039,14 @@ msgstr "Weet u zeker dat u deze aankondiging wilt verwijderen?"
 
 #. TRANS: Submit button title for 'No' when deleting a notice.
 #: actions/deletenotice.php:159
-msgid "Do not delete this notice."
+#, fuzzy
+msgid "Do not delete this notice"
 msgstr "Deze mededeling niet verwijderen."
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:166
-msgid "Delete this notice."
-msgstr "Deze mededeling verwijderen."
+#: actions/deletenotice.php:166 lib/noticelist.php:673
+msgid "Delete this notice"
+msgstr "Deze mededeling verwijderen"
 
 #. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
 #: actions/deleteuser.php:66
@@ -2084,13 +2081,15 @@ msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting a user.
 #: actions/deleteuser.php:158
-msgid "Do not delete this user."
+#, fuzzy
+msgid "Do not delete this user"
 msgstr "Deze gebruiker niet verwijderen."
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
-#: actions/deleteuser.php:165
-msgid "Delete this user."
-msgstr "Deze gebruiker verwijderen."
+#. TRANS: Description of form for deleting a user.
+#: actions/deleteuser.php:165 lib/deleteuserform.php:75
+msgid "Delete this user"
+msgstr "Gebruiker verwijderen"
 
 #. TRANS: Message used as title for design settings for the site.
 #. TRANS: Link description in user account settings menu.
@@ -2253,19 +2252,22 @@ msgid "Use defaults"
 msgstr "Standaardinstellingen gebruiken"
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:720
-msgid "Restore default designs."
-msgstr "Het standaardontwerp toepassen."
+#. TRANS: Title for button on profile design page to reset all colour settings to default.
+#: actions/designadminpanel.php:720 lib/designsettings.php:259
+msgid "Restore default designs"
+msgstr "Standaardontwerp toepassen"
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:728
-msgid "Reset back to default."
-msgstr "De standaardinstellingen toepassen."
+#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
+#: actions/designadminpanel.php:728 lib/designsettings.php:267
+msgid "Reset back to default"
+msgstr "Standaardinstellingen toepassen"
 
 #. TRANS: Title for button for saving theme settings.
-#: actions/designadminpanel.php:736
-msgid "Save design."
-msgstr "Ontwerp opslaan."
+#. TRANS: Title for button on profile design page to save settings.
+#: actions/designadminpanel.php:736 lib/designsettings.php:272
+msgid "Save design"
+msgstr "Ontwerp opslaan"
 
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
 #: actions/disfavor.php:83
@@ -2296,7 +2298,7 @@ msgid "You must be logged in to edit an application."
 msgstr "U moet aangemeld zijn om een applicatie te kunnen bewerken."
 
 #. TRANS: Client error displayed trying to edit an application that does not exist.
-#: actions/editapplication.php:83 actions/showapplication.php:83
+#: actions/editapplication.php:83 actions/showapplication.php:87
 msgid "No such application."
 msgstr "De applicatie bestaat niet."
 
@@ -2578,7 +2580,7 @@ msgid "Cannot normalize that email address."
 msgstr "Kan het e-mailadres niet normaliseren."
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:393 actions/register.php:204
+#: actions/emailsettings.php:393 actions/register.php:212
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "Geen geldig e-mailadres."
@@ -2653,21 +2655,18 @@ msgstr "Geen binnenkomend e-mailadres"
 
 #. 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.
 #: actions/emailsettings.php:530 actions/emailsettings.php:554
-#: actions/smssettings.php:566 actions/smssettings.php:591
+#: actions/smssettings.php:565 actions/smssettings.php:588
 msgid "Could not update user record."
 msgstr "Kan de gebruikersgegevens niet vernieuwen."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
-#. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:534 actions/smssettings.php:570
+#: actions/emailsettings.php:534 actions/smssettings.php:568
 msgid "Incoming email address removed."
 msgstr "Het e-mailadres voor inkomende mail is verwijderd."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
-#. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:558 actions/smssettings.php:595
+#: actions/emailsettings.php:558 actions/smssettings.php:591
 msgid "New incoming email address added."
 msgstr "Het nieuwe binnenkomende e-mailadres is toegevoegd."
 
@@ -2678,8 +2677,9 @@ msgstr "Deze mededeling staat al in uw favorietenlijst."
 
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
 #: actions/favor.php:95
-msgid "Disfavor favorite."
-msgstr "Van uw favorietenlijst verwijderen."
+#, fuzzy
+msgid "Disfavor favorite"
+msgstr "Van favorietenlijst verwijderen"
 
 #. TRANS: Page title for first page of favorited notices.
 #. TRANS: Title for favourited notices section.
@@ -2924,12 +2924,14 @@ msgstr ""
 
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
 #: actions/groupblock.php:191
-msgid "Do not block this user from this group."
+#, fuzzy
+msgid "Do not block this user from this group"
 msgstr "Deze gebruiker niet de toegang tot deze groep ontzeggen."
 
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
 #: actions/groupblock.php:198
-msgid "Block this user from this group."
+#, fuzzy
+msgid "Block this user from this group"
 msgstr "Deze gebruiker de toegang tot deze groep ontzeggen."
 
 #. TRANS: Server error displayed when trying to block a user from a group fails because of an application error.
@@ -2940,7 +2942,6 @@ msgstr ""
 "groep."
 
 #. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
-#. TRANS: Client error displayed trying to find a user by ID without providing an ID.
 #: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr "Geen ID."
@@ -3129,10 +3130,8 @@ msgid "Group search"
 msgstr "Groepen zoeken"
 
 #. TRANS: Text on page where groups can be searched if no results were found for a query.
-#. TRANS: Text for notice search results is the query had no results.
-#. TRANS: Message on the "People search" page where a query has no results.
-#: actions/groupsearch.php:82 actions/noticesearch.php:122
-#: actions/peoplesearch.php:87
+#: actions/groupsearch.php:82 actions/noticesearch.php:117
+#: actions/peoplesearch.php:83
 msgid "No results."
 msgstr "Geen resultaten."
 
@@ -3169,7 +3168,6 @@ msgid "User is not blocked from group."
 msgstr "De gebruiker is niet de toegang tot de groep ontzegd."
 
 #. TRANS: Server error displayed when unblocking a user from a group fails because of an unknown error.
-#. TRANS: Server error displayed when removing a user block.
 #: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "Er is een fout opgetreden bij het verwijderen van de blokkade."
@@ -3264,8 +3262,7 @@ msgid "Publish a MicroID for my Jabber/Google Talk address."
 msgstr "Een MicroID voor mijn Jabber- of Google Talk-adres publiceren."
 
 #. TRANS: Confirmation message for successful Instant Messaging preferences save.
-#. TRANS: Confirmation message after saving preferences.
-#: actions/imsettings.php:283 actions/othersettings.php:193
+#: actions/imsettings.php:283 actions/othersettings.php:192
 msgid "Preferences saved."
 msgstr "Uw voorkeuren zijn opgeslagen."
 
@@ -3553,7 +3550,7 @@ msgstr "U moet aangemeld zijn om een groep te kunnen verlaten."
 
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
-#: actions/leavegroup.php:103 lib/command.php:386
+#: actions/leavegroup.php:103 lib/command.php:398
 msgid "You are not a member of that group."
 msgstr "U bent geen lid van deze groep"
 
@@ -3677,43 +3674,41 @@ msgstr "Opslaan"
 msgid "Save license settings"
 msgstr "Licentieinstellingen opslaan"
 
-#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
-#: actions/login.php:97 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
 msgid "Already logged in."
 msgstr "U bent al aangemeld."
 
-#: actions/login.php:142
+#: actions/login.php:148
 msgid "Incorrect username or password."
 msgstr "De gebruikersnaam of wachtwoord is onjuist."
 
-#. TRANS: Server error displayed when a user object could not be created trying to login using "one time password login".
-#: actions/login.php:148 actions/otp.php:127
+#: actions/login.php:154 actions/otp.php:120
 msgid "Error setting user. You are probably not authorized."
 msgstr ""
 "Er is een fout opgetreden bij het maken van de instellingen. U hebt "
 "waarschijnlijk niet de juiste rechten."
 
-#: actions/login.php:202 actions/login.php:253
+#: actions/login.php:210 actions/login.php:263
 msgid "Login"
 msgstr "Aanmelden"
 
-#: actions/login.php:239
+#: actions/login.php:249
 msgid "Login to site"
 msgstr "Aanmelden"
 
-#: actions/login.php:248 actions/register.php:476
+#: actions/login.php:258 actions/register.php:490
 msgid "Remember me"
 msgstr "Aanmeldgegevens onthouden"
 
-#: actions/login.php:249 actions/register.php:478
+#: actions/login.php:259 actions/register.php:492
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "Voortaan automatisch aanmelden. Niet gebruiken op gedeelde computers!"
 
-#: actions/login.php:259
+#: actions/login.php:269
 msgid "Lost or forgotten password?"
 msgstr "Wachtwoord kwijt of vergeten?"
 
-#: actions/login.php:277
+#: actions/login.php:288
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -3721,11 +3716,11 @@ msgstr ""
 "Om veiligheidsredenen moet u uw gebruikersnaam en wachtwoord nogmaals "
 "invoeren alvorens u uw instellingen kunt wijzigen."
 
-#: actions/login.php:281
+#: actions/login.php:292
 msgid "Login with your username and password."
 msgstr "Aanmelden met uw gebruikersnaam en wachtwoord."
 
-#: actions/login.php:284
+#: actions/login.php:295
 #, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -3806,14 +3801,14 @@ msgid "New message"
 msgstr "Nieuw bericht"
 
 #. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
-#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:501
+#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:513
 msgid "You can't send a message to this user."
 msgstr "U kunt geen bericht naar deze gebruiker zenden."
 
 #. TRANS: Command exception text shown when trying to send a direct message to another user without content.
 #. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
-#: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:478
-#: lib/command.php:581
+#: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:490
+#: lib/command.php:593
 msgid "No content!"
 msgstr "Geen inhoud!"
 
@@ -3822,7 +3817,7 @@ msgid "No recipient specified."
 msgstr "Er is geen ontvanger aangegeven."
 
 #. TRANS: Error text shown when trying to send a direct message to self.
-#: actions/newmessage.php:167 lib/command.php:505
+#: actions/newmessage.php:167 lib/command.php:517
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr "Stuur geen berichten naar uzelf. Zeg het gewoon in uw hoofd."
@@ -3833,7 +3828,7 @@ msgstr "Bericht verzonden."
 
 #. TRANS: Message given have sent a direct message to another user.
 #. TRANS: %s is the name of the other user.
-#: actions/newmessage.php:188 lib/command.php:513
+#: actions/newmessage.php:188 lib/command.php:525
 #, php-format
 msgid "Direct message to %s sent."
 msgstr "Het directe bericht aan %s is verzonden."
@@ -3850,9 +3845,7 @@ msgstr "Nieuw bericht"
 msgid "Notice posted"
 msgstr "De mededeling is verzonden"
 
-#. TRANS: Instructions for Notice search page.
-#. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/noticesearch.php:69
+#: actions/noticesearch.php:68
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -3861,21 +3854,16 @@ msgstr ""
 "Zoek naar mededelingen op %%site.name%% op basis van inhoud. Scheid "
 "zoektermen met spaties. Zoektermen moeten uit drie of meer tekens bestaan."
 
-#. TRANS: Title of the page where users can search for notices.
-#: actions/noticesearch.php:80
+#: actions/noticesearch.php:78
 msgid "Text search"
 msgstr "Tekst doorzoeken"
 
-#. TRANS: Test in RSS notice search.
-#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearch.php:95
+#: actions/noticesearch.php:91
 #, php-format
 msgid "Search results for \"%1$s\" on %2$s"
 msgstr "Zoekresultaten voor \"%1$s\" op %2$s"
 
-#. TRANS: Text for logged in users making a query for notices without results.
-#. TRANS: This message contains a Markdown link.
-#: actions/noticesearch.php:128
+#: actions/noticesearch.php:121
 #, php-format
 msgid ""
 "Be the first to [post on this topic](%%%%action.newnotice%%%%?"
@@ -3884,9 +3872,7 @@ msgstr ""
 "U kunt de eerste zijn die een bericht plaatst in [dit onderwerp](%%%%action."
 "newnotice%%%%?status_textarea=%s)!"
 
-#. TRANS: Text for not logged in users making a query for notices without results.
-#. TRANS: This message contains Markdown links.
-#: actions/noticesearch.php:133
+#: actions/noticesearch.php:124
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and be the first to "
@@ -3896,17 +3882,14 @@ msgstr ""
 "zijn die een bericht plaatst in [dit onderwerp](%%%%action.newnotice%%%%?"
 "status_textarea=%s)!"
 
-#. TRANS: RSS notice search feed title. %s is the query.
-#: actions/noticesearchrss.php:95
+#: actions/noticesearchrss.php:96
 #, php-format
 msgid "Updates with \"%s\""
 msgstr "Updates met \"%s\""
 
-#. TRANS: RSS notice search feed description.
-#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearchrss.php:99
+#: actions/noticesearchrss.php:98
 #, fuzzy, php-format
-msgid "Updates matching search term \"%1$s\" on %2$s."
+msgid "Updates matching search term \"%1$s\" on %2$s!"
 msgstr "Updates die overeenkomen met de zoekterm \"%1$s\" op %2$s."
 
 #: actions/nudge.php:85
@@ -3947,24 +3930,24 @@ msgid "You have not registered any applications yet."
 msgstr "U hebt nog geen applicaties geregistreerd."
 
 #. TRANS: Title for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:70
+#: actions/oauthconnectionssettings.php:71
 msgid "Connected applications"
 msgstr "Verbonden applicaties"
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:81
+#: actions/oauthconnectionssettings.php:83
 msgid "The following connections exist for your account."
 msgstr ""
 "U hebt de onderstaande applicaties toegang gegeven tot uw gebruikersgegevens."
 
 #. TRANS: Client error when trying to revoke access for an application while not being a user of it.
-#: actions/oauthconnectionssettings.php:166
+#: actions/oauthconnectionssettings.php:168
 msgid "You are not a user of that application."
 msgstr "U bent geen gebruiker van die applicatie."
 
 #. TRANS: Client error when revoking access has failed for some reason.
 #. TRANS: %s is the application ID revoking access failed for.
-#: actions/oauthconnectionssettings.php:181
+#: actions/oauthconnectionssettings.php:183
 #, php-format
 msgid "Unable to revoke access for application: %s."
 msgstr ""
@@ -3973,7 +3956,7 @@ msgstr ""
 
 #. TRANS: Success message after revoking access for an application.
 #. TRANS: %1$s is the application name, %2$s is the first part of the user token.
-#: actions/oauthconnectionssettings.php:200
+#: actions/oauthconnectionssettings.php:202
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -3983,7 +3966,7 @@ msgstr ""
 "ingetrokken."
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:211
+#: actions/oauthconnectionssettings.php:213
 msgid "You have not authorized any applications to use your account."
 msgstr ""
 "U hebt geen enkele applicatie geautoriseerd voor toegang tot uw "
@@ -3992,7 +3975,7 @@ msgstr ""
 #. TRANS: Note for developers in the OAuth connection settings form.
 #. TRANS: This message contains a Markdown link. Do not separate "](".
 #. TRANS: %s is the URL to the OAuth settings.
-#: actions/oauthconnectionssettings.php:231
+#: actions/oauthconnectionssettings.php:233
 #, php-format
 msgid ""
 "Are you a developer? [Register an OAuth client application](%s) to use with "
@@ -4001,16 +3984,6 @@ msgstr ""
 "Bet u ontwikkelaar? [Registreer dan een OAuthprogramma](%s) om te gebruiken "
 "met deze Statusnetsite."
 
-#: actions/oembed.php:64
-#, php-format
-msgid "\"%s\" not found."
-msgstr "\"%s\" is niet aangetroffen."
-
-#: actions/oembed.php:76
-#, php-format
-msgid "Notice %s not found."
-msgstr "Opmerking \"%s\" is niet gevonden."
-
 #: actions/oembed.php:80 actions/shownotice.php:100
 msgid "Notice has no profile."
 msgstr "Mededeling heeft geen profiel."
@@ -4020,16 +3993,6 @@ msgstr "Mededeling heeft geen profiel."
 msgid "%1$s's status on %2$s"
 msgstr "Status van %1$s op %2$s"
 
-#: actions/oembed.php:95
-#, php-format
-msgid "Attachment %s not found."
-msgstr "De bijlage %s is niet gevonden."
-
-#: actions/oembed.php:136
-#, php-format
-msgid "\"%s\" not supported for oembed requests."
-msgstr "\"%s\" wordt niet ondersteund voor oembed-verzoeken."
-
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
 #: actions/oembed.php:168
 #, php-format
@@ -4048,12 +4011,11 @@ msgstr "Alleen URL's voor %s via normale HTTP alstublieft."
 msgid "Not a supported data format."
 msgstr "Geen ondersteund gegevensformaat."
 
-#. TRANS: ShortName in the OpenSearch interface when trying to find users.
 #: actions/opensearch.php:64
 msgid "People Search"
 msgstr "Mensen zoeken"
 
-#: actions/opensearch.php:68
+#: actions/opensearch.php:67
 msgid "Notice Search"
 msgstr "Mededeling zoeken"
 
@@ -4073,7 +4035,7 @@ msgstr "Overige instellingen beheren."
 #. TRANS: here if it has one (most likely a single space).
 #: actions/othersettings.php:113
 msgid " (free service)"
-msgstr " (gratis dienst)"
+msgstr " (vrij beschikbare dienst)"
 
 #. TRANS: Label for dropdown with URL shortener services.
 #: actions/othersettings.php:122
@@ -4100,46 +4062,37 @@ msgstr "Profielontwerpen weergeven of verbergen"
 msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr "De URL voor de verkortingdienst is te lang (maximaal 50 tekens)."
 
-#. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
-#: actions/otp.php:70
+#: actions/otp.php:69
 msgid "No user ID specified."
 msgstr "Er is geen ID opgegeven."
 
-#. TRANS: Client error displayed trying to use "one time password login" without specifying a login token.
-#: actions/otp.php:86
+#: actions/otp.php:83
 msgid "No login token specified."
 msgstr "Er is geen token opgegeven."
 
-#. TRANS: Client error displayed trying to use "one time password login" without requesting a login token.
-#: actions/otp.php:94
+#: actions/otp.php:90
 msgid "No login token requested."
 msgstr "Er is niet om een aanmeldtoken gevraagd."
 
-#. TRANS: Client error displayed trying to use "one time password login" while specifying an invalid login token.
-#: actions/otp.php:100
+#: actions/otp.php:95
 msgid "Invalid login token specified."
 msgstr "Het opgegeven token is ongeldig."
 
-#. TRANS: Client error displayed trying to use "one time password login" while specifying an expired login token.
-#: actions/otp.php:110
+#: actions/otp.php:104
 msgid "Login token expired."
 msgstr "Het aanmeldtoken is verlopen."
 
-#. TRANS: Title for outbox for any but the fist page.
-#. TRANS: %1$s is the user nickname, %2$d is the page number.
-#: actions/outbox.php:57
+#: actions/outbox.php:58
 #, php-format
 msgid "Outbox for %1$s - page %2$d"
 msgstr "Postvak UIT voor %1$s - pagina %2$d"
 
-#. TRANS: Title for first page of outbox.
 #: actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
 msgstr "Postvak UIT voor %s"
 
-#. TRANS: Instructions for outbox.
-#: actions/outbox.php:103
+#: actions/outbox.php:104
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr "Dit is uw Postvak UIT waarin de door u verzonden privéberichten staan."
 
@@ -4165,42 +4118,43 @@ msgstr "Huidige wachtwoord"
 msgid "New password"
 msgstr "Nieuw wachtwoord"
 
-#: actions/passwordsettings.php:109 actions/register.php:423
-msgid "6 or more characters."
+#: actions/passwordsettings.php:109
+#, fuzzy
+msgid "6 or more characters"
 msgstr "Zes of meer tekens"
 
-#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:264
-#: actions/register.php:427
-msgid "Same as password above."
+#: actions/passwordsettings.php:113
+#, fuzzy
+msgid "Same as password above"
 msgstr "Gelijk aan het wachtwoord hierboven."
 
 #: actions/passwordsettings.php:117
 msgid "Change"
 msgstr "Wijzigen"
 
-#: actions/passwordsettings.php:153 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:238
 msgid "Password must be 6 or more characters."
 msgstr "Het wachtwoord moet zes of meer tekens bevatten."
 
-#: actions/passwordsettings.php:156 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:241
 msgid "Passwords don't match."
 msgstr "De wachtwoorden komen niet overeen."
 
-#: actions/passwordsettings.php:164
+#: actions/passwordsettings.php:165
 msgid "Incorrect old password"
 msgstr "Het oude wachtwoord is onjuist"
 
-#: actions/passwordsettings.php:180
+#: actions/passwordsettings.php:181
 msgid "Error saving user; invalid."
 msgstr "Fout bij opslaan gebruiker; ongeldig."
 
-#. TRANS: Reset password form validation error message.
-#: actions/passwordsettings.php:185 actions/recoverpassword.php:418
-msgid "Cannot save new password."
+#: actions/passwordsettings.php:186
+#, fuzzy
+msgid "Can't save new password."
 msgstr "Het was niet mogelijk het nieuwe wachtwoord op te slaan."
 
-#: actions/passwordsettings.php:191
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
 msgid "Password saved."
 msgstr "Het wachtwoord is opgeslagen."
 
@@ -4474,9 +4428,7 @@ msgstr "De server waar SSL-verzoeken heen gestuurd moeten worden."
 msgid "Save paths"
 msgstr "Opslagpaden"
 
-#. TRANS: Instructions for the "People search" page.
-#. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/peoplesearch.php:54
+#: actions/peoplesearch.php:52
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
@@ -4486,8 +4438,7 @@ msgstr ""
 "interesses. Scheid de zoektermen met spaties. Zoektermen moeten uit drie of "
 "meer tekens bestaan."
 
-#. TRANS: Title of a page where users can search for other users.
-#: actions/peoplesearch.php:61
+#: actions/peoplesearch.php:58
 msgid "People search"
 msgstr "Gebruikers zoeken"
 
@@ -4531,14 +4482,14 @@ msgid "Profile information"
 msgstr "Profielinformatie"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109 actions/register.php:419
+#: actions/profilesettings.php:109 actions/register.php:433
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr "1-64 kleine letters of cijfers, geen leestekens of spaties."
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for full group name (dt). Text hidden by default.
 #. TRANS: DT for full name in a profile.
-#: actions/profilesettings.php:113 actions/register.php:441
+#: actions/profilesettings.php:113 actions/register.php:455
 #: actions/showgroup.php:255 actions/tagother.php:104
 #: lib/groupeditform.php:150 lib/userprofile.php:156
 msgid "Full name"
@@ -4546,20 +4497,20 @@ msgstr "Volledige naam"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:118 actions/register.php:446
+#: actions/profilesettings.php:118 actions/register.php:460
 #: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "Startpagina"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:121 actions/register.php:448
+#: actions/profilesettings.php:121
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr "De URL van uw thuispagina, blog of profiel bij een andere website."
 
 #. TRANS: Tooltip for field label in form for profile settings. Plural
 #. TRANS: is decided by the number of characters available for the
 #. TRANS: biography (%d).
-#: actions/profilesettings.php:129 actions/register.php:457
+#: actions/profilesettings.php:129 actions/register.php:471
 #, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4567,29 +4518,28 @@ msgstr[0] "Beschrijf uzelf en uw interesses in %d teken"
 msgstr[1] "Beschrijf uzelf en uw interesses in %d tekens"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:135 actions/register.php:462
+#: actions/profilesettings.php:135 actions/register.php:476
 msgid "Describe yourself and your interests"
 msgstr "Beschrijf uzelf en uw interesses"
 
 #. TRANS: Text area label in form for profile settings where users can provide.
 #. TRANS: their biography.
-#: actions/profilesettings.php:139 actions/register.php:464
+#: actions/profilesettings.php:139 actions/register.php:478
 msgid "Bio"
 msgstr "Beschrijving"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group location (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT for location in a profile.
-#: actions/profilesettings.php:145 actions/register.php:469
+#: actions/profilesettings.php:145 actions/register.php:483
 #: actions/showgroup.php:265 actions/tagother.php:112
-#: actions/userauthorization.php:174 lib/groupeditform.php:173
+#: actions/userauthorization.php:166 lib/groupeditform.php:173
 #: lib/userprofile.php:172
 msgid "Location"
 msgstr "Locatie"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148
+#: actions/profilesettings.php:148 actions/register.php:485
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Waar u bent, bijvoorbeeld \"woonplaats, land\" of \"postcode, land\""
 
@@ -4608,9 +4558,9 @@ msgstr "Labels"
 
 #. TRANS: Tooltip for field label in form for profile settings.
 #: actions/profilesettings.php:164
+#, fuzzy
 msgid ""
-"Tags for yourself (letters, numbers, -, ., and _), comma- or space- "
-"separated."
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr ""
 "Eigen labels (letter, getallen, -, ., en _). Gescheiden door komma's of "
 "spaties."
@@ -4622,7 +4572,8 @@ msgstr "Taal"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
 #: actions/profilesettings.php:171
-msgid "Preferred language."
+#, fuzzy
+msgid "Preferred language"
 msgstr "Uw voorkeurstaal."
 
 #. TRANS: Dropdownlist label in form for profile settings.
@@ -4637,8 +4588,9 @@ msgstr "In welke tijdzone verblijft u meestal?"
 
 #. TRANS: Checkbox label in form for profile settings.
 #: actions/profilesettings.php:189
+#, fuzzy
 msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)."
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr ""
 "Automatisch abonneren bij abonnement op mij (beste voor automatische "
 "processen)."
@@ -4646,7 +4598,7 @@ msgstr ""
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Plural form is used based on the maximum number of allowed
 #. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:258 actions/register.php:221
+#: actions/profilesettings.php:258 actions/register.php:229
 #, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4665,10 +4617,10 @@ msgstr "De taal is te lang (maximaal 50 tekens)."
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:291
+#: actions/profilesettings.php:291 actions/tagother.php:178
 #, php-format
-msgid "Invalid tag: \"%s\"."
-msgstr "Ongeldig label: \"%s\"."
+msgid "Invalid tag: \"%s\""
+msgstr "Ongeldig label: '%s'"
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
 #. TRANS: automatically subscribe to any subscriber.
@@ -4775,12 +4727,6 @@ msgstr ""
 "Micro-blogging) gebaseerd op de Vrije Software [StatusNet](http://status."
 "net/)"
 
-#. TRANS: Public RSS feed description. %s is the StatusNet site name.
-#: actions/publicrss.php:106
-#, fuzzy, php-format
-msgid "%s updates from everyone."
-msgstr "%s updates van iedereen"
-
 #. TRANS: Title for public tag cloud.
 #: actions/publictagcloud.php:57
 msgid "Public tag cloud"
@@ -4919,11 +4865,6 @@ msgstr "Wachtwoord herstellen"
 msgid "Password recovery requested"
 msgstr "Wachtwoordherstel aangevraagd"
 
-#. TRANS: Title for password recovery page in password saved mode.
-#: actions/recoverpassword.php:229
-msgid "Password saved"
-msgstr "Het wachtwoord is opgeslagen"
-
 #. TRANS: Title for password recovery page when an unknown action has been specified.
 #: actions/recoverpassword.php:232
 msgid "Unknown action"
@@ -4934,6 +4875,11 @@ msgstr "Onbekende handeling"
 msgid "6 or more characters, and do not forget it!"
 msgstr "Zes of meer tekens, en vergeet uw wachtwoord niet!"
 
+#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#: actions/recoverpassword.php:264 actions/register.php:441
+msgid "Same as password above."
+msgstr "Gelijk aan het wachtwoord hierboven."
+
 #. TRANS: Button text for password reset form.
 #. TRANS: Button text on profile design page to reset all colour settings to default without saving.
 #: actions/recoverpassword.php:268 lib/designsettings.php:264
@@ -4987,8 +4933,13 @@ msgstr "Het wachtwoord moet uit zes of meer tekens bestaan."
 msgid "Password and confirmation do not match."
 msgstr "Het wachtwoord en de bevestiging komen niet overeen."
 
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:418
+msgid "Cannot save new password."
+msgstr "Het was niet mogelijk het nieuwe wachtwoord op te slaan."
+
 #. TRANS: Server error displayed when something does wrong with the user object during password reset.
-#: actions/recoverpassword.php:426 actions/register.php:248
+#: actions/recoverpassword.php:426 actions/register.php:256
 msgid "Error setting user."
 msgstr "Er is een fout opgetreden tijdens het instellen van de gebruiker."
 
@@ -4997,88 +4948,97 @@ msgstr "Er is een fout opgetreden tijdens het instellen van de gebruiker."
 msgid "New password successfully saved. You are now logged in."
 msgstr "Het nieuwe wachtwoord is opgeslagen. U bent nu aangemeld."
 
-#: actions/register.php:87 actions/register.php:188 actions/register.php:399
+#: actions/register.php:92 actions/register.php:196 actions/register.php:413
 msgid "Sorry, only invited people can register."
 msgstr "U kunt zich alleen registreren als u wordt uitgenodigd."
 
-#: actions/register.php:94
+#: actions/register.php:99
 msgid "Sorry, invalid invitation code."
 msgstr "Sorry. De uitnodigingscode is ongeldig."
 
-#: actions/register.php:113
+#: actions/register.php:119
 msgid "Registration successful"
 msgstr "De registratie is voltooid"
 
-#: actions/register.php:115 actions/register.php:497
+#: actions/register.php:121 actions/register.php:511
 msgid "Register"
 msgstr "Registreren"
 
-#: actions/register.php:135
+#: actions/register.php:142
 msgid "Registration not allowed."
 msgstr "Registratie is niet toegestaan."
 
-#: actions/register.php:201
-msgid "You cannot register if you don't agree to the license."
+#: actions/register.php:209
+#, fuzzy
+msgid "You can't register if you don't agree to the license."
 msgstr "U kunt zich niet registreren als u niet akkoord gaat met de licentie."
 
-#: actions/register.php:210
+#: actions/register.php:218
 msgid "Email address already exists."
 msgstr "Het e-mailadres bestaat al."
 
-#: actions/register.php:243 actions/register.php:265
+#: actions/register.php:251 actions/register.php:273
 msgid "Invalid username or password."
 msgstr "Ongeldige gebruikersnaam of wachtwoord."
 
-#: actions/register.php:340
+#: actions/register.php:351
+#, fuzzy
 msgid ""
 "With this form you can create a new account. You can then post notices and "
-"link up to friends and colleagues."
+"link up to friends and colleagues. "
 msgstr ""
 "Via dit formulier kunt u een nieuwe gebruiker aanmaken. Daarna kunt u "
 "mededelingen uitsturen en contact maken met vrienden en collega's."
 
+#: actions/register.php:437
+msgid "6 or more characters."
+msgstr "Zes of meer tekens"
+
 #. TRANS: Link description in user account settings menu.
-#: actions/register.php:431 actions/register.php:435
+#: actions/register.php:445 actions/register.php:449
 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
 msgid "Email"
 msgstr "E-mail"
 
-#: actions/register.php:432 actions/register.php:436
-msgid "Used only for updates, announcements, and password recovery."
+#: actions/register.php:446 actions/register.php:450
+#, fuzzy
+msgid "Used only for updates, announcements, and password recovery"
 msgstr "Alleen gebruikt voor updates, aankondigingen en wachtwoordherstel."
 
-#: actions/register.php:443
-msgid "Longer name, preferably your \"real\" name."
+#: actions/register.php:457
+#, fuzzy
+msgid "Longer name, preferably your \"real\" name"
 msgstr "Een langere naam, mogelijk uw echte naam."
 
-#: actions/register.php:471
-msgid "Where you are, like \"City, State (or Region), Country\"."
-msgstr "Waar u bent, bijvoorbeeld \"woonplaats, land\" of \"postcode, land\"."
+#: actions/register.php:462
+#, fuzzy
+msgid "URL of your homepage, blog, or profile on another site"
+msgstr "De URL van uw thuispagina, blog of profiel bij een andere website."
 
-#: actions/register.php:510
+#: actions/register.php:523
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
 msgstr ""
 "Ik begrijp dat inhoud en gegevens van %1$s persoonlijk en vertrouwelijk zijn."
 
-#: actions/register.php:520
+#: actions/register.php:533
 #, php-format
 msgid "My text and files are copyright by %1$s."
 msgstr "Voor mijn teksten en bestanden rust het auteursrecht bij %1$s."
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:524
+#: actions/register.php:537
 msgid "My text and files remain under my own copyright."
 msgstr "Ik ben de rechthebbende voor mijn teksten en bestanden."
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:527
+#: actions/register.php:540
 msgid "All rights reserved."
 msgstr "Alle rechten voorbehouden."
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:532
+#: actions/register.php:545
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -5087,7 +5047,7 @@ msgstr ""
 "Mijn teksten en bestanden zijn beschikbaar onder %s, behalve de volgende "
 "privégegevens: wachtwoord, e-mailadres, IM-adres, telefoonnummer."
 
-#: actions/register.php:573
+#: actions/register.php:588
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -5121,7 +5081,7 @@ msgstr ""
 "Dank u wel voor het registreren en we hopen dat deze dienst u biedt wat u "
 "ervan verwacht."
 
-#: actions/register.php:597
+#: actions/register.php:612
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5154,7 +5114,8 @@ msgid "User nickname"
 msgstr "Gebruikersnaam"
 
 #: actions/remotesubscribe.php:129
-msgid "Nickname of the user you want to follow."
+#, fuzzy
+msgid "Nickname of the user you want to follow"
 msgstr "Gebruikersnaam van de gebruiker waarop u wilt abonneren."
 
 #: actions/remotesubscribe.php:132
@@ -5162,7 +5123,8 @@ msgid "Profile URL"
 msgstr "Profiel-URL"
 
 #: actions/remotesubscribe.php:133
-msgid "URL of your profile on another compatible microblogging service."
+#, fuzzy
+msgid "URL of your profile on another compatible microblogging service"
 msgstr "De URL van uw profiel bij een andere, compatibele microblogdienst."
 
 #. TRANS: Link text for link that will subscribe to a remote profile.
@@ -5172,7 +5134,8 @@ msgid "Subscribe"
 msgstr "Abonneren"
 
 #: actions/remotesubscribe.php:158
-msgid "Invalid profile URL (bad format)."
+#, fuzzy
+msgid "Invalid profile URL (bad format)"
 msgstr "Ongeldige profiel-URL (foutieve opmaak)."
 
 #: actions/remotesubscribe.php:167
@@ -5213,7 +5176,6 @@ msgstr "Herhaald"
 msgid "Repeated!"
 msgstr "Herhaald!"
 
-#. TRANS: RSS reply feed title. %s is a user nickname.
 #. TRANS: Tooltip for personal group navigation menu option when logged in for viewing @-replies.
 #: actions/replies.php:126 actions/repliesrss.php:68
 #: lib/personalgroupnav.php:109
@@ -5268,11 +5230,9 @@ msgstr ""
 "U kunt proberen [%1$s te porren](../%2$s) of [een bericht voor die gebruiker "
 "plaatsen](%%%%action.newnotice%%%%?status_textarea=%3$s)."
 
-#. TRANS: RSS reply feed description.
-#. TRANS: %1$s is a user nickname, %2$s is the StatusNet site name.
-#: actions/repliesrss.php:74
+#: actions/repliesrss.php:72
 #, fuzzy, php-format
-msgid "Replies to %1$s on %2$s."
+msgid "Replies to %1$s on %2$s!"
 msgstr "Antwoorden aan %1$s op %2$s."
 
 #. TRANS: Client exception displayed when trying to restore an account while not logged in.
@@ -5376,7 +5336,7 @@ msgstr "U kunt geen gebruikersrollen intrekken op deze website."
 msgid "User doesn't have this role."
 msgstr "Deze gebruiker heeft deze rol niet."
 
-#: actions/rsd.php:142 actions/version.php:159
+#: actions/rsd.php:146 actions/version.php:159
 msgid "StatusNet"
 msgstr "StatusNet"
 
@@ -5418,87 +5378,87 @@ msgstr "Debuguitvoer voor sessies inschakelen."
 msgid "Save site settings"
 msgstr "Websiteinstellingen opslaan"
 
-#: actions/showapplication.php:78
+#: actions/showapplication.php:82
 msgid "You must be logged in to view an application."
 msgstr "U moet aangemeld zijn om een applicatie te kunnen bekijken."
 
-#: actions/showapplication.php:151
+#: actions/showapplication.php:157
 msgid "Application profile"
 msgstr "Applicatieprofiel"
 
 #. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:153 lib/applicationeditform.php:177
+#: actions/showapplication.php:159 lib/applicationeditform.php:177
 msgid "Icon"
 msgstr "Icoon"
 
 #. TRANS: Form input field label for application name.
-#: actions/showapplication.php:163 actions/version.php:197
+#: actions/showapplication.php:169 actions/version.php:197
 #: lib/applicationeditform.php:190
 msgid "Name"
 msgstr "Naam"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:172 lib/applicationeditform.php:227
+#: actions/showapplication.php:178 lib/applicationeditform.php:227
 msgid "Organization"
 msgstr "Organisatie"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:181 actions/version.php:200
+#: actions/showapplication.php:187 actions/version.php:200
 #: lib/applicationeditform.php:208 lib/groupeditform.php:168
 msgid "Description"
 msgstr "Beschrijving"
 
 #. TRANS: Header for group statistics on a group page (h2).
 #. TRANS: H2 text for user statistics.
-#: actions/showapplication.php:186 actions/showgroup.php:460
+#: actions/showapplication.php:192 actions/showgroup.php:460
 #: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "Statistieken"
 
-#: actions/showapplication.php:197
+#: actions/showapplication.php:203
 #, php-format
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr "Aangemaakt door %1$s - standaardtoegang \"%2$s\" - %3$d gebruikers"
 
-#: actions/showapplication.php:207
+#: actions/showapplication.php:213
 msgid "Application actions"
 msgstr "Applicatiehandelingen"
 
-#: actions/showapplication.php:230
+#: actions/showapplication.php:236
 msgid "Reset key & secret"
 msgstr "Sleutel en wachtwoord op nieuw instellen"
 
 #. TRANS: Title of form for deleting a user.
-#: actions/showapplication.php:246 lib/deletegroupform.php:121
+#: actions/showapplication.php:252 lib/deletegroupform.php:121
 #: lib/deleteuserform.php:64 lib/noticelist.php:673
 msgid "Delete"
 msgstr "Verwijderen"
 
-#: actions/showapplication.php:255
+#: actions/showapplication.php:261
 msgid "Application info"
 msgstr "Applicatieinformatie"
 
-#: actions/showapplication.php:257
+#: actions/showapplication.php:263
 msgid "Consumer key"
 msgstr "Gebruikerssleutel"
 
-#: actions/showapplication.php:262
+#: actions/showapplication.php:268
 msgid "Consumer secret"
 msgstr "Gebruikersgeheim"
 
-#: actions/showapplication.php:267
+#: actions/showapplication.php:273
 msgid "Request token URL"
 msgstr "URL voor verzoektoken"
 
-#: actions/showapplication.php:272
+#: actions/showapplication.php:278
 msgid "Access token URL"
 msgstr "URL voor toegangstoken"
 
-#: actions/showapplication.php:277
+#: actions/showapplication.php:283
 msgid "Authorize URL"
 msgstr "Autorisatie-URL"
 
-#: actions/showapplication.php:282
+#: actions/showapplication.php:288
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
@@ -5506,7 +5466,7 @@ msgstr ""
 "Opmerking: HMAC-SHA1 ondertekening wordt ondersteund. Ondertekening in "
 "platte tekst is niet mogelijk."
 
-#: actions/showapplication.php:302
+#: actions/showapplication.php:309
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr ""
 "Weet u zeker dat u uw gebruikerssleutel en geheime code wilt verwijderen?"
@@ -5601,18 +5561,16 @@ msgid "Group profile"
 msgstr "Groepsprofiel"
 
 #. TRANS: Label for group URL (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT for URL in a profile.
 #: actions/showgroup.php:273 actions/tagother.php:118
-#: actions/userauthorization.php:184 lib/userprofile.php:186
+#: actions/userauthorization.php:175 lib/userprofile.php:186
 msgid "URL"
 msgstr "URL"
 
 #. TRANS: Label for group description or group note (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page where bio is displayed.
 #. TRANS: DT for note in a profile.
 #: actions/showgroup.php:285 actions/tagother.php:128
-#: actions/userauthorization.php:197 lib/userprofile.php:204
+#: actions/userauthorization.php:187 lib/userprofile.php:204
 msgid "Note"
 msgstr "Opmerking"
 
@@ -5758,7 +5716,7 @@ msgid "%1$s tagged %2$s"
 msgstr "%2$s gelabeld door %1$s"
 
 #. TRANS: Page title showing tagged notices in one user's stream.
-#. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
+#. TRANS: %1$s is the username, %2$s is the hash tag, %1$d is the page number.
 #: actions/showstream.php:74
 #, php-format
 msgid "%1$s tagged %2$s, page %3$d"
@@ -6014,7 +5972,8 @@ msgstr ""
 
 #. TRANS: Title for button to save site notice in admin panel.
 #: actions/sitenoticeadminpanel.php:201
-msgid "Save site notice."
+#, fuzzy
+msgid "Save site notice"
 msgstr "Websitebrede mededeling opslaan."
 
 #. TRANS: Title for SMS settings.
@@ -6072,7 +6031,8 @@ msgstr "SMS-nummer"
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
 #: actions/smssettings.php:152
-msgid "Phone number, no punctuation or spaces, with area code."
+#, fuzzy
+msgid "Phone number, no punctuation or spaces, with area code"
 msgstr "Telefoonnummer zonder spaties of leestekens, met netnummer."
 
 #. TRANS: Form legend for SMS preferences form.
@@ -6241,21 +6201,17 @@ msgstr "U bent niet geabonneerd op dat profiel."
 msgid "Could not save subscription."
 msgstr "Het was niet mogelijk het abonnement op te slaan."
 
-#. TRANS: Client error displayed trying to perform any request method other than POST.
-#. TRANS: Do not translate POST.
 #: actions/subscribe.php:77
 msgid "This action only accepts POST requests."
 msgstr "Deze handeling accepteert alleen POST-verzoeken."
 
-#. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
-#: actions/subscribe.php:121
+#: actions/subscribe.php:117
 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
 msgstr ""
 "U kunt niet abonneren op een OMB 1.0 profiel van een andere omgeving via "
 "deze handeling."
 
-#. TRANS: Page title when subscription succeeded.
-#: actions/subscribe.php:149
+#: actions/subscribe.php:145
 msgid "Subscribed"
 msgstr "Geabonneerd"
 
@@ -6415,9 +6371,8 @@ msgstr "Label %s"
 msgid "User profile"
 msgstr "Gebruikersprofiel"
 
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT element in area for user avatar.
-#: actions/tagother.php:81 actions/userauthorization.php:138
+#: actions/tagother.php:81 actions/userauthorization.php:132
 #: lib/userprofile.php:108
 msgid "Photo"
 msgstr "Foto"
@@ -6434,11 +6389,6 @@ msgstr ""
 "Labels voor deze gebruiker (letters, cijfers, -, ., en _). Gebruik komma's "
 "of spaties als scheidingsteken"
 
-#: actions/tagother.php:178
-#, php-format
-msgid "Invalid tag: \"%s\""
-msgstr "Ongeldig label: '%s'"
-
 #: actions/tagother.php:193
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
@@ -6456,7 +6406,6 @@ msgstr ""
 msgid "No such tag."
 msgstr "Onbekend label."
 
-#. TRANS: Client error displayed when trying to unblock a non-blocked user.
 #: actions/unblock.php:59
 msgid "You haven't blocked that user."
 msgstr "U hebt deze gebruiker niet geblokkeerd."
@@ -6477,7 +6426,7 @@ msgstr "Het profiel-ID was niet aanwezig in het verzoek."
 msgid "Unsubscribed"
 msgstr "Het abonnement is opgezegd"
 
-#: actions/updateprofile.php:64
+#: actions/updateprofile.php:64 actions/userauthorization.php:337
 #, php-format
 msgid ""
 "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
@@ -6509,8 +6458,8 @@ msgstr "Ongeldige welkomsttekst. De maximale lengte is 255 tekens."
 #. TRANS: Client error displayed when trying to set a non-existing user as default subscription for new
 #. TRANS: users in user admin panel. %1$s is the invalid nickname.
 #: actions/useradminpanel.php:166
-#, php-format
-msgid "Invalid default subscripton: \"%1$s\" is not a user."
+#, fuzzy, php-format
+msgid "Invalid default subscripton: '%1$s' is not a user."
 msgstr "Ongeldig standaardabonnement: \"%1$s\" is geen gebruiker."
 
 #. TRANS: Link description in user account settings menu.
@@ -6570,66 +6519,61 @@ msgstr "Of gebruikers nieuwe gebruikers kunnen uitnodigen."
 
 #. TRANS: Title for button to save user settings in user admin panel.
 #: actions/useradminpanel.php:302
-msgid "Save user settings."
+#, fuzzy
+msgid "Save user settings"
 msgstr "Gebruikersinstellingen opslaan."
 
-#. TRANS: Page title.
-#: actions/userauthorization.php:109
+#: actions/userauthorization.php:105
 msgid "Authorize subscription"
 msgstr "Abonneren"
 
-#. TRANS: Page notice on "Auhtorize subscription" page.
-#: actions/userauthorization.php:115
+#: actions/userauthorization.php:110
+#, fuzzy
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
 "user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
-"click \"Reject\"."
+"click “Reject”."
 msgstr ""
 "Controleer alstublieft deze details om er zeker van te zijn dat u zich wilt "
 "abonneren op de mededelingen van deze gebruiker. Als u zojuist niet hebt "
 "aangegeven dat u zich op de mededelingen van een gebruiker wilt abonneren, "
 "klik dan op \"Afwijzen\"."
 
-#. TRANS: DT element on Authorise Subscription page where license is displayed.
 #. TRANS: Menu item for site administration
-#: actions/userauthorization.php:207 actions/version.php:167
+#: actions/userauthorization.php:196 actions/version.php:167
 #: lib/adminpanelaction.php:403
 msgid "License"
 msgstr "Licentie"
 
-#. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:229
-msgctxt "BUTTON"
+#: actions/userauthorization.php:217
+#, fuzzy
 msgid "Accept"
 msgstr "Aanvaarden"
 
-#. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:231
-msgid "Subscribe to this user."
-msgstr "Abonneren op deze gebruiker."
+#: actions/userauthorization.php:218 lib/subscribeform.php:115
+#: lib/subscribeform.php:139
+msgid "Subscribe to this user"
+msgstr "Abonneren op deze gebruiker"
 
-#. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:233
-msgctxt "BUTTON"
+#: actions/userauthorization.php:219
+#, fuzzy
 msgid "Reject"
 msgstr "Afwijzen"
 
-#. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:235
-msgid "Reject this subscription."
+#: actions/userauthorization.php:220
+#, fuzzy
+msgid "Reject this subscription"
 msgstr "Dit abonnement weigeren."
 
-#. TRANS: Client error displayed for an empty authorisation request.
-#: actions/userauthorization.php:248
+#: actions/userauthorization.php:232
 msgid "No authorization request!"
 msgstr "Geen autorisatieverzoek!"
 
-#. TRANS: Accept message header from Authorise subscription page.
-#: actions/userauthorization.php:271
+#: actions/userauthorization.php:254
 msgid "Subscription authorized"
 msgstr "Het abonnement is geautoriseerd"
 
-#: actions/userauthorization.php:274
+#: actions/userauthorization.php:256
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to authorize the "
@@ -6639,12 +6583,11 @@ msgstr ""
 "Controleer de instructies van de site voor informatie over het volledig "
 "afwijzen van een abonnement. Uw abonnementstoken is:"
 
-#. TRANS: Reject message header from Authorise subscription page.
-#: actions/userauthorization.php:285
+#: actions/userauthorization.php:266
 msgid "Subscription rejected"
 msgstr "Het abonnement is afgewezen"
 
-#: actions/userauthorization.php:288
+#: actions/userauthorization.php:268
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to fully reject the "
@@ -6654,64 +6597,39 @@ msgstr ""
 "Controleer de instructies van de site voor informatie over het volledig "
 "afwijzen van een abonnement."
 
-#. TRANS: Exception thrown when no valid user is found for an authorisation request.
-#. TRANS: %s is a listener URI.
-#: actions/userauthorization.php:325
-#, php-format
-msgid "Listener URI \"%s\" not found here."
+#: actions/userauthorization.php:303
+#, fuzzy, php-format
+msgid "Listener URI ‘%s’ not found here."
 msgstr "De abonnee-URI \"%s\" is hier niet te vinden."
 
-#. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:332
-#, php-format
-msgid "Listenee URI \"%s\" is too long."
+#: actions/userauthorization.php:308
+#, fuzzy, php-format
+msgid "Listenee URI ‘%s’ is too long."
 msgstr "De URI \"%s\" van de gevolgde gebruiker is te lang."
 
-#. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:340
-#, php-format
-msgid "Listenee URI \"%s\" is a local user."
+#: actions/userauthorization.php:314
+#, fuzzy, php-format
+msgid "Listenee URI ‘%s’ is a local user."
 msgstr "De abonnements-URI \"%s\" is een lokale gebruiker."
 
-#. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
-#. TRANS: %s is a profile URL.
-#: actions/userauthorization.php:358
-#, php-format
-msgid "Profile URL \"%s\" is for a local user."
+#: actions/userauthorization.php:329
+#, fuzzy, php-format
+msgid "Profile URL ‘%s’ is for a local user."
 msgstr "De profiel-URL \"%s\" is van een lokale gebruiker."
 
-#. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
-#. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
-#: actions/userauthorization.php:368
-#, php-format
-msgid ""
-"Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
-"\"."
-msgstr ""
-"De licentie \"%1$s\" voor de stream die u wilt volgen is niet compatibel met "
-"de sitelicentie \"%2$s\"."
-
-#. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:378
-#, php-format
-msgid "Avatar URL \"%s\" is not valid."
+#: actions/userauthorization.php:345
+#, fuzzy, php-format
+msgid "Avatar URL ‘%s’ is not valid."
 msgstr "De avatar-URL \"%s\" is niet geldig."
 
-#. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:385
-#, php-format
-msgid "Cannot read avatar URL \"%s\"."
+#: actions/userauthorization.php:350
+#, fuzzy, php-format
+msgid "Can’t read avatar URL ‘%s’."
 msgstr "Het was niet mogelijk de avatar-URL \"%s\" te lezen."
 
-#. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:392
-#, php-format
-msgid "Wrong image type for avatar URL \"%s\"."
+#: actions/userauthorization.php:355
+#, fuzzy, php-format
+msgid "Wrong image type for avatar URL ‘%s’."
 msgstr "Er staat een verkeerd afbeeldingsttype op de avatar-URL \"%s\"."
 
 #. TRANS: Page title for profile design page.
@@ -6820,7 +6738,7 @@ msgid "Plugins"
 msgstr "Plug-ins"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:898
+#: actions/version.php:198 lib/action.php:901
 msgid "Version"
 msgstr "Versie"
 
@@ -7038,14 +6956,14 @@ msgstr ""
 
 #. TRANS: Server exception thrown when a reply cannot be saved.
 #. TRANS: %1$d is a notice ID, %2$d is the ID of the mentioned user.
-#: classes/Notice.php:1142
+#: classes/Notice.php:1144
 #, php-format
 msgid "Could not save reply for %1$d, %2$d."
 msgstr "Het was niet mogelijk antwoord %1$d voor %2$d op te slaan."
 
 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1661
+#: classes/Notice.php:1663
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
@@ -7059,7 +6977,7 @@ msgstr "%1$s (%2$s)"
 
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:775
+#: classes/Profile.php:779
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
@@ -7068,7 +6986,7 @@ msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:784
+#: classes/Profile.php:788
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -7389,53 +7307,53 @@ msgid "Page notice"
 msgstr "Mededeling van de pagina"
 
 #. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:871
+#: lib/action.php:874
 msgid "Secondary site navigation"
 msgstr "Secundaire sitenavigatie"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:877
+#: lib/action.php:880
 msgid "Help"
 msgstr "Help"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:880
+#: lib/action.php:883
 msgid "About"
 msgstr "Over"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:883
+#: lib/action.php:886
 msgid "FAQ"
 msgstr "Veel gestelde vragen"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:888
+#: lib/action.php:891
 msgid "TOS"
 msgstr "Gebruiksvoorwaarden"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:892
+#: lib/action.php:895
 msgid "Privacy"
 msgstr "Privacy"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:895
+#: lib/action.php:898
 msgid "Source"
 msgstr "Broncode"
 
 #. TRANS: Secondary navigation menu option leading to e-mail contact information on the
 #. TRANS: StatusNet site, where to report bugs, ...
-#: lib/action.php:902
+#: lib/action.php:905
 msgid "Contact"
 msgstr "Contact"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:905
+#: lib/action.php:908
 msgid "Badge"
 msgstr "Widget"
 
 #. TRANS: DT element for StatusNet software license.
-#: lib/action.php:934
+#: lib/action.php:937
 msgid "StatusNet software license"
 msgstr "Licentie van de StatusNet-software"
 
@@ -7443,7 +7361,7 @@ msgstr "Licentie van de StatusNet-software"
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:941
+#: lib/action.php:944
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7453,7 +7371,7 @@ msgstr ""
 "broughtbyurl%%)."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:944
+#: lib/action.php:947
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** is een microblogdienst."
@@ -7462,7 +7380,7 @@ msgstr "**%%site.name%%** is een microblogdienst."
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:951
+#: lib/action.php:954
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7474,20 +7392,20 @@ msgstr ""
 "www.fsf.org/licensing/licenses/agpl-3.0.html)."
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:967
+#: lib/action.php:970
 msgid "Site content license"
 msgstr "Licentie voor siteinhoud"
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:974
+#: lib/action.php:977
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr "Inhoud en gegevens van %1$s zijn persoonlijk en vertrouwelijk."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:981
+#: lib/action.php:984
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
@@ -7495,7 +7413,7 @@ msgstr ""
 "voorbehouden."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:985
+#: lib/action.php:988
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 "Auteursrechten op inhoud en gegevens rusten bij de respectievelijke "
@@ -7503,26 +7421,26 @@ msgstr ""
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:1017
+#: lib/action.php:1020
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
 "Alle inhoud en gegevens van %1$s zijn beschikbaar onder de licentie %2$s."
 
 #. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1353
+#: lib/action.php:1356
 msgid "Pagination"
 msgstr "Paginering"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1364
+#: lib/action.php:1367
 msgid "After"
 msgstr "Later"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1374
+#: lib/action.php:1377
 msgid "Before"
 msgstr "Eerder"
 
@@ -7724,23 +7642,19 @@ msgstr ""
 msgid "No application for that consumer key."
 msgstr "Er is geen applicatie voor die gebruikerssleutel."
 
-#: lib/apiauth.php:202 lib/apiauth.php:284
-msgid "Not allowed to use API."
-msgstr ""
-
 #. TRANS: OAuth exception given when an incorrect access token was given for a user.
-#: lib/apiauth.php:225
+#: lib/apiauth.php:219
 msgid "Bad access token."
 msgstr "Ongeldig toegangstoken."
 
 #. TRANS: OAuth exception given when no user was found for a given token (no token was found).
-#: lib/apiauth.php:230
+#: lib/apiauth.php:224
 msgid "No user for that token."
 msgstr "Er is geen gebruiker voor dat token."
 
 #. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel".
 #. TRANS: Client error thrown when authentication fails.
-#: lib/apiauth.php:272 lib/apiauth.php:302
+#: lib/apiauth.php:266 lib/apiauth.php:293
 msgid "Could not authenticate you."
 msgstr "U kon niet geauthenticeerd worden."
 
@@ -7946,11 +7860,6 @@ msgstr "Wachtwoord wijzigen is niet toegestaan"
 msgid "Block"
 msgstr "Blokkeren"
 
-#. TRANS: Description of the form to block a user.
-#: lib/blockform.php:79
-msgid "Block this user"
-msgstr "Deze gebruiker blokkeren"
-
 #. TRANS: Title for command results.
 #: lib/channel.php:160 lib/channel.php:181
 msgid "Command results"
@@ -7978,7 +7887,7 @@ msgstr "Er bestaat geen mededeling met dat ID."
 
 #. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
 #. TRANS: Error text shown when a last user notice is requested and it does not exist.
-#: lib/command.php:99 lib/command.php:630
+#: lib/command.php:99 lib/command.php:642
 msgid "User has no last notice."
 msgstr "Deze gebruiker heeft geen laatste mededeling."
 
@@ -8028,35 +7937,41 @@ msgstr ""
 "Abonnees: %2$s\n"
 "Mededelingen: %3$s"
 
+#. TRANS: Error message text shown when a favorite could not be set because it has already been favorited.
+#: lib/command.php:298
+#, fuzzy
+msgid "Could not create favorite: already favorited."
+msgstr "Het was niet mogelijk een favoriet aan te maken."
+
 #. TRANS: Text shown when a notice has been marked as favourite successfully.
-#: lib/command.php:312
+#: lib/command.php:324
 msgid "Notice marked as fave."
 msgstr "De mededeling is op de favorietenlijst geplaatst."
 
 #. TRANS: Message given having added a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:357
+#: lib/command.php:369
 #, php-format
 msgid "%1$s joined group %2$s."
 msgstr "%1$s is lid geworden van de groep %2$s."
 
 #. TRANS: Message given having removed a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:405
+#: lib/command.php:417
 #, php-format
 msgid "%1$s left group %2$s."
 msgstr "%1$s heeft de groep %2$s verlaten."
 
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: lib/command.php:426
+#: lib/command.php:438
 #, php-format
 msgctxt "WHOIS"
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
 
 #. TRANS: Whois output. %s is the full name of the queried user.
-#: lib/command.php:430
+#: lib/command.php:442
 #, php-format
 msgid "Fullname: %s"
 msgstr "Volledige naam: %s"
@@ -8064,7 +7979,7 @@ msgstr "Volledige naam: %s"
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a location.
-#: lib/command.php:434 lib/mail.php:270
+#: lib/command.php:446 lib/mail.php:270
 #, php-format
 msgid "Location: %s"
 msgstr "Locatie: %s"
@@ -8072,20 +7987,20 @@ msgstr "Locatie: %s"
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a homepage.
-#: lib/command.php:438 lib/mail.php:274
+#: lib/command.php:450 lib/mail.php:274
 #, php-format
 msgid "Homepage: %s"
 msgstr "Thuispagina: %s"
 
 #. TRANS: Whois output. %s is the bio information of the queried user.
-#: lib/command.php:442
+#: lib/command.php:454
 #, php-format
 msgid "About: %s"
 msgstr "Over: %s"
 
 #. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).
 #. TRANS: %s is a remote profile.
-#: lib/command.php:471
+#: lib/command.php:483
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
@@ -8096,7 +8011,7 @@ msgstr ""
 
 #. TRANS: Message given if content is too long. %1$sd is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:488
+#: lib/command.php:500
 #, php-format
 msgid "Message too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
@@ -8108,25 +8023,25 @@ msgstr[1] ""
 "$d gebruikt."
 
 #. TRANS: Error text shown sending a direct message fails with an unknown reason.
-#: lib/command.php:516
+#: lib/command.php:528
 msgid "Error sending direct message."
 msgstr "Er is een fout opgetreden bij het verzonden van het directe bericht."
 
 #. TRANS: Message given having repeated a notice from another user.
 #. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:553
+#: lib/command.php:565
 #, php-format
 msgid "Notice from %s repeated."
 msgstr "De mededeling van %s is herhaald."
 
 #. TRANS: Error text shown when repeating a notice fails with an unknown reason.
-#: lib/command.php:556
+#: lib/command.php:568
 msgid "Error repeating notice."
 msgstr "Er is een fout opgetreden bij het herhalen van de mededeling."
 
 #. TRANS: Message given if content of a notice for a reply is too long. %1$d is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:591
+#: lib/command.php:603
 #, php-format
 msgid "Notice too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Notice too long - maximum is %1$d characters, you sent %2$d."
@@ -8139,81 +8054,81 @@ msgstr[1] ""
 
 #. TRANS: Text shown having sent a reply to a notice successfully.
 #. TRANS: %s is the nickname of the user of the notice the reply was sent to.
-#: lib/command.php:604
+#: lib/command.php:616
 #, php-format
 msgid "Reply to %s sent."
 msgstr "Het antwoord aan %s is verzonden."
 
 #. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
-#: lib/command.php:607
+#: lib/command.php:619
 msgid "Error saving notice."
 msgstr "Er is een fout opgetreden bij het opslaan van de mededeling."
 
 #. TRANS: Error text shown when no username was provided when issuing a subscribe command.
-#: lib/command.php:654
+#: lib/command.php:666
 msgid "Specify the name of the user to subscribe to."
 msgstr "Geef de naam op van de gebruiker waarop u zich wilt abonneren."
 
 #. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
-#: lib/command.php:663
+#: lib/command.php:675
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "Abonneren op OMB-profielen op commando is niet mogelijk."
 
 #. TRANS: Text shown after having subscribed to another user successfully.
 #. TRANS: %s is the name of the user the subscription was requested for.
-#: lib/command.php:671
+#: lib/command.php:683
 #, php-format
 msgid "Subscribed to %s."
 msgstr "Geabonneerd op %s."
 
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.
-#: lib/command.php:692 lib/command.php:803
+#: lib/command.php:704 lib/command.php:815
 msgid "Specify the name of the user to unsubscribe from."
 msgstr ""
 "Geef de naam op van de gebruiker waarop u het abonnement wilt opzeggen."
 
 #. TRANS: Text shown after having unsubscribed from another user successfully.
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:703
+#: lib/command.php:715
 #, php-format
 msgid "Unsubscribed from %s."
 msgstr "Uw abonnement op %s is opgezegd."
 
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
-#: lib/command.php:723 lib/command.php:749
+#: lib/command.php:735 lib/command.php:761
 msgid "Command not yet implemented."
 msgstr "Dit commando is nog niet geïmplementeerd."
 
 #. TRANS: Text shown when issuing the command "off" successfully.
-#: lib/command.php:727
+#: lib/command.php:739
 msgid "Notification off."
 msgstr "Notificaties uitgeschakeld."
 
 #. TRANS: Error text shown when the command "off" fails for an unknown reason.
-#: lib/command.php:730
+#: lib/command.php:742
 msgid "Can't turn off notification."
 msgstr "Het is niet mogelijk de mededelingen uit te schakelen."
 
 #. TRANS: Text shown when issuing the command "on" successfully.
-#: lib/command.php:753
+#: lib/command.php:765
 msgid "Notification on."
 msgstr "Notificaties ingeschakeld."
 
 #. TRANS: Error text shown when the command "on" fails for an unknown reason.
-#: lib/command.php:756
+#: lib/command.php:768
 msgid "Can't turn on notification."
 msgstr "Het is niet mogelijk de notificatie uit te schakelen."
 
 #. TRANS: Error text shown when issuing the login command while login is disabled.
-#: lib/command.php:770
+#: lib/command.php:782
 msgid "Login command is disabled."
 msgstr "Het aanmeldcommando is uitgeschakeld."
 
 #. TRANS: Text shown after issuing the login command successfully.
 #. TRANS: %s is a logon link..
-#: lib/command.php:783
+#: lib/command.php:795
 #, php-format
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
@@ -8222,20 +8137,20 @@ msgstr ""
 
 #. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:812
+#: lib/command.php:824
 #, php-format
 msgid "Unsubscribed %s."
 msgstr "Het abonnement van %s is opgeheven."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
-#: lib/command.php:830
+#: lib/command.php:842
 msgid "You are not subscribed to anyone."
 msgstr "U bent op geen enkele gebruiker geabonneerd."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
-#: lib/command.php:835
+#: lib/command.php:847
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "U bent geabonneerd op deze gebruiker:"
@@ -8243,14 +8158,14 @@ msgstr[1] "U bent geabonneerd op deze gebruikers:"
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user
 #. TRANS: (followers) without having any subscribers.
-#: lib/command.php:857
+#: lib/command.php:869
 msgid "No one is subscribed to you."
 msgstr "Niemand heeft een abonnenment op u."
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
-#: lib/command.php:862
+#: lib/command.php:874
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Deze gebruiker is op u geabonneerd:"
@@ -8258,21 +8173,21 @@ msgstr[1] "Deze gebruikers zijn op u geabonneerd:"
 
 #. TRANS: Text shown after requesting groups a user is subscribed to without having
 #. TRANS: any group subscriptions.
-#: lib/command.php:884
+#: lib/command.php:896
 msgid "You are not a member of any groups."
 msgstr "U bent lid van geen enkele groep."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
-#: lib/command.php:889
+#: lib/command.php:901
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "U bent lid van deze groep:"
 msgstr[1] "U bent lid van deze groepen:"
 
 #. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-#: lib/command.php:904
+#: lib/command.php:916
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -8414,11 +8329,6 @@ msgstr "Geautoriseerde verbonden applicaties"
 msgid "Database error"
 msgstr "Databasefout"
 
-#. TRANS: Description of form for deleting a user.
-#: lib/deleteuserform.php:75
-msgid "Delete this user"
-msgstr "Gebruiker verwijderen"
-
 #. TRANS: Label in form on profile design page.
 #. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
 #: lib/designsettings.php:108
@@ -8455,21 +8365,6 @@ msgstr "Kleuren wijzigen"
 msgid "Use defaults"
 msgstr "Standaardinstellingen gebruiken"
 
-#. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: lib/designsettings.php:259
-msgid "Restore default designs"
-msgstr "Standaardontwerp toepassen"
-
-#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: lib/designsettings.php:267
-msgid "Reset back to default"
-msgstr "Standaardinstellingen toepassen"
-
-#. TRANS: Title for button on profile design page to save settings.
-#: lib/designsettings.php:272
-msgid "Save design"
-msgstr "Ontwerp opslaan"
-
 #. TRANS: Error message displayed if design settings could not be saved.
 #. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
 #: lib/designsettings.php:405 lib/designsettings.php:427
@@ -9350,10 +9245,6 @@ msgstr "Op deze mededeling antwoorden"
 msgid "Reply"
 msgstr "Antwoorden"
 
-#: lib/noticelist.php:673
-msgid "Delete this notice"
-msgstr "Deze mededeling verwijderen"
-
 #: lib/noticelist.php:691
 msgid "Notice repeated"
 msgstr "Mededeling herhaald"
@@ -9629,10 +9520,6 @@ msgstr "Uitnodigen"
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Vrienden en collega's uitnodigen om u te vergezellen op %s"
 
-#: lib/subscribeform.php:115 lib/subscribeform.php:139
-msgid "Subscribe to this user"
-msgstr "Abonneren op deze gebruiker"
-
 #: lib/subscriberspeopleselftagcloudsection.php:48
 #: lib/subscriptionspeopleselftagcloudsection.php:48
 msgid "People Tagcloud as self-tagged"
@@ -9812,23 +9699,18 @@ msgctxt "role"
 msgid "Moderator"
 msgstr "Moderator"
 
-#: lib/util.php:305
-#, fuzzy
-msgid "Not allowed to log in."
-msgstr "Niet aangemeld."
-
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1309
+#: lib/util.php:1306
 msgid "a few seconds ago"
 msgstr "een paar seconden geleden"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1312
+#: lib/util.php:1309
 msgid "about a minute ago"
 msgstr "ongeveer een minuut geleden"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1316
+#: lib/util.php:1313
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
@@ -9836,12 +9718,12 @@ msgstr[0] "ongeveer een minuut geleden"
 msgstr[1] "ongeveer %d minuten geleden"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1319
+#: lib/util.php:1316
 msgid "about an hour ago"
 msgstr "ongeveer een uur geleden"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1323
+#: lib/util.php:1320
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
@@ -9849,12 +9731,12 @@ msgstr[0] "ongeveer een uur geleden"
 msgstr[1] "ongeveer %d uur geleden"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1326
+#: lib/util.php:1323
 msgid "about a day ago"
 msgstr "ongeveer een dag geleden"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1330
+#: lib/util.php:1327
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
@@ -9862,12 +9744,12 @@ msgstr[0] "ongeveer een dag geleden"
 msgstr[1] "ongeveer %d dagen geleden"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1333
+#: lib/util.php:1330
 msgid "about a month ago"
 msgstr "ongeveer een maand geleden"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1337
+#: lib/util.php:1334
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
@@ -9875,7 +9757,7 @@ msgstr[0] "ongeveer een maand geleden"
 msgstr[1] "ongeveer %d maanden geleden"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1340
+#: lib/util.php:1337
 msgid "about a year ago"
 msgstr "ongeveer een jaar geleden"
 
@@ -9921,3 +9803,65 @@ msgstr "Ongeldige XML. De XRD-root mist."
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr "De back-up wordt uit het bestand \"%s\" geladen."
+
+#~ msgid "Block this user."
+#~ msgstr "Deze gebruiker blokkeren."
+
+#~ msgid "Delete this notice."
+#~ msgstr "Deze mededeling verwijderen."
+
+#~ msgid "Delete this user."
+#~ msgstr "Deze gebruiker verwijderen."
+
+#~ msgid "Restore default designs."
+#~ msgstr "Het standaardontwerp toepassen."
+
+#~ msgid "Reset back to default."
+#~ msgstr "De standaardinstellingen toepassen."
+
+#~ msgid "Save design."
+#~ msgstr "Ontwerp opslaan."
+
+#~ msgid "Disfavor favorite."
+#~ msgstr "Van uw favorietenlijst verwijderen."
+
+#~ msgid "\"%s\" not found."
+#~ msgstr "\"%s\" is niet aangetroffen."
+
+#~ msgid "Notice %s not found."
+#~ msgstr "Opmerking \"%s\" is niet gevonden."
+
+#~ msgid "Attachment %s not found."
+#~ msgstr "De bijlage %s is niet gevonden."
+
+#~ msgid "\"%s\" not supported for oembed requests."
+#~ msgstr "\"%s\" wordt niet ondersteund voor oembed-verzoeken."
+
+#~ msgid "Invalid tag: \"%s\"."
+#~ msgstr "Ongeldig label: \"%s\"."
+
+#~ msgid "%s updates from everyone."
+#~ msgstr "%s updates van iedereen."
+
+#~ msgid "Password saved"
+#~ msgstr "Het wachtwoord is opgeslagen"
+
+#~ msgid "Where you are, like \"City, State (or Region), Country\"."
+#~ msgstr ""
+#~ "Waar u bent, bijvoorbeeld \"woonplaats, land\" of \"postcode, land\"."
+
+#~ msgid "Subscribe to this user."
+#~ msgstr "Abonneren op deze gebruiker."
+
+#~ msgid ""
+#~ "Listenee stream license \"%1$s\" is not compatible with site license \"%2"
+#~ "$s\"."
+#~ msgstr ""
+#~ "De licentie \"%1$s\" voor de stream die u wilt volgen is niet compatibel "
+#~ "met de sitelicentie \"%2$s\"."
+
+#~ msgid "Not allowed to use API."
+#~ msgstr "Het gebruik van de API is niet toegestaan."
+
+#~ msgid "Not allowed to log in."
+#~ msgstr "Aanmelden is niet toegestaan."
diff --git a/locale/nn/LC_MESSAGES/statusnet.po b/locale/nn/LC_MESSAGES/statusnet.po
index 0329f9d044..905af12eb1 100644
--- a/locale/nn/LC_MESSAGES/statusnet.po
+++ b/locale/nn/LC_MESSAGES/statusnet.po
@@ -10,17 +10,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-24 10:32+0000\n"
-"PO-Revision-Date: 2011-02-24 10:37:23+0000\n"
+"POT-Creation-Date: 2011-03-03 15:58+0000\n"
+"PO-Revision-Date: 2011-03-03 16:01:12+0000\n"
 "Language-Team: Norwegian Nynorsk <http://translatewiki.net/wiki/Portal:nn>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r82712); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nn\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-02-17 11:39:54+0000\n"
+"X-POT-Import-Date: 2011-02-25 23:49:23+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -141,11 +141,7 @@ msgstr "Dette emneord finst ikkje."
 #. 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 use "one time password login" without using an existing user.
-#. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
-#. TRANS: Client error displayed trying to find a user by ID for a non-existing ID.
-#. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when calling a profile action without specifying a user.
 #: actions/all.php:80 actions/allrss.php:69
@@ -163,12 +159,12 @@ msgstr "Dette emneord finst ikkje."
 #: actions/apitimelinementions.php:77 actions/apitimelineuser.php:79
 #: actions/avatarbynickname.php:79 actions/favoritesrss.php:72
 #: actions/foaf.php:42 actions/foaf.php:61 actions/hcard.php:67
-#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:78
+#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
 #: actions/remotesubscribe.php:144 actions/remotesubscribe.php:153
-#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:113
-#: actions/showfavorites.php:106 actions/userbyid.php:75
+#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
+#: actions/showfavorites.php:106 actions/userbyid.php:74
 #: actions/usergroups.php:93 actions/userrss.php:40 actions/userxrd.php:59
-#: actions/xrds.php:71 lib/command.php:497 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:509 lib/galleryaction.php:59
 #: lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Brukaren finst ikkje."
@@ -291,7 +287,7 @@ msgstr "Oppdateringar frå %1$s og vener på %2$s!"
 #: actions/apigrouplistall.php:120 actions/apigroupmembership.php:105
 #: actions/apigroupshow.php:114 actions/apihelptest.php:84
 #: actions/apistatusesdestroy.php:101 actions/apistatusesretweets.php:110
-#: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:138
+#: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:139
 #: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
 #: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:268
 #: actions/apitimelinegroup.php:147 actions/apitimelinehome.php:173
@@ -520,7 +516,7 @@ msgstr "Kunne ikkje finne mottakar."
 #. TRANS: Client error displayed trying to direct message another user who's not a friend (403).
 #: actions/apidirectmessagenew.php:144
 #, fuzzy
-msgid "Cannot send direct messages to users who aren't your friend."
+msgid "Can't send direct messages to users who aren't your friend."
 msgstr "Kan ikkje senda direktemeldingar til brukarar som du ikkje er ven med."
 
 #. TRANS: Client error displayed trying to direct message self (403).
@@ -549,7 +545,7 @@ msgstr "Denne notisen er alt ein favoritt!"
 #. TRANS: Client error displayed when marking a notice as favourite fails.
 #. TRANS: Server error displayed when trying to mark a notice as favorite fails in the database.
 #. TRANS: Error message text shown when a favorite could not be set.
-#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:294
+#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:306
 msgid "Could not create favorite."
 msgstr "Kunne ikkje lagre favoritt."
 
@@ -610,7 +606,7 @@ msgstr "Kan ikkje oppdatera brukar."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:191
 #: actions/newgroup.php:137 actions/profilesettings.php:273
-#: actions/register.php:206
+#: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "Kallenamnet er allereie i bruk. Prøv eit anna."
 
@@ -620,7 +616,7 @@ msgstr "Kallenamnet er allereie i bruk. Prøv eit anna."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:195
 #: actions/newgroup.php:141 actions/profilesettings.php:243
-#: actions/register.php:208
+#: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "Ikkje eit gyldig brukarnamn."
 
@@ -633,7 +629,7 @@ msgstr "Ikkje eit gyldig brukarnamn."
 #: actions/apigroupcreate.php:181 actions/editapplication.php:235
 #: actions/editgroup.php:202 actions/newapplication.php:221
 #: actions/newgroup.php:148 actions/profilesettings.php:248
-#: actions/register.php:215
+#: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "Heimesida er ikkje ei gyldig internettadresse."
 
@@ -643,7 +639,7 @@ msgstr "Heimesida er ikkje ei gyldig internettadresse."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:191 actions/editgroup.php:206
 #: actions/newgroup.php:152 actions/profilesettings.php:252
-#: actions/register.php:218
+#: actions/register.php:226
 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "Ditt fulle namn er for langt (maksimalt 255 teikn)."
@@ -672,7 +668,7 @@ msgstr[1] "Plassering er for lang (maksimalt 255 teikn)."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:215 actions/editgroup.php:218
 #: actions/newgroup.php:164 actions/profilesettings.php:265
-#: actions/register.php:227
+#: actions/register.php:235
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
 msgstr "Plassering er for lang (maksimalt 255 teikn)."
@@ -729,7 +725,7 @@ msgstr "Finst ikkje."
 #. TRANS: Server error displayed when trying to join a group the user is already a member of.
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:333
+#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:345
 #, fuzzy
 msgid "You are already a member of that group."
 msgstr "Du er allereie medlem av den gruppa"
@@ -737,7 +733,7 @@ msgstr "Du er allereie medlem av den gruppa"
 #. TRANS: Server error displayed when trying to join a group the user is blocked from joining.
 #. 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.
-#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:338
+#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:350
 msgid "You have been blocked from that group by the admin."
 msgstr ""
 
@@ -747,7 +743,7 @@ msgstr ""
 #. TRANS: %1$s is the joining user's nickname, $2$s is the group nickname for which the join failed.
 #. TRANS: Message given having failed to add a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:350
+#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:362
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "Kunne ikkje bli med i gruppa."
@@ -765,7 +761,7 @@ msgstr "Du er ikkje medlem av den gruppa."
 #. TRANS: Message given having failed to remove a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
 #: actions/apigroupleave.php:127 actions/leavegroup.php:133
-#: lib/command.php:398
+#: lib/command.php:410
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
 msgstr "Kunne ikkje laga gruppa."
@@ -829,21 +825,20 @@ msgstr "Du tingar ikkje oppdateringar til den profilen."
 #. TRANS: Form validation error message.
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
-#. TRANS: Client error displayed when the session token is not okay.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
 #: actions/deletenotice.php:177 actions/disfavor.php:75
 #: actions/emailsettings.php:291 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:65 actions/grouplogo.php:321
 #: actions/groupunblock.php:65 actions/imsettings.php:224
-#: actions/invite.php:60 actions/login.php:131 actions/makeadmin.php:66
+#: actions/invite.php:60 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
-#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:136
-#: actions/othersettings.php:155 actions/passwordsettings.php:137
+#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
+#: actions/othersettings.php:155 actions/passwordsettings.php:138
 #: actions/profilesettings.php:217 actions/recoverpassword.php:383
-#: actions/register.php:164 actions/remotesubscribe.php:76
+#: actions/register.php:172 actions/remotesubscribe.php:76
 #: actions/repeat.php:82 actions/smssettings.php:250 actions/subedit.php:40
-#: actions/subscribe.php:87 actions/tagother.php:166
-#: actions/unsubscribe.php:69 actions/userauthorization.php:53
+#: actions/subscribe.php:86 actions/tagother.php:166
+#: actions/unsubscribe.php:69 actions/userauthorization.php:52
 #: lib/designsettings.php:310
 msgid "There was a problem with your session token. Try again, please."
 msgstr "Der var eit problem med sesjonen din. Vennlegst prøv på nytt."
@@ -876,7 +871,7 @@ msgstr "databasefeil ved innsetjing av skigardmerkelapp (#merkelapp): %s"
 #: actions/designadminpanel.php:100 actions/editapplication.php:144
 #: actions/emailsettings.php:310 actions/grouplogo.php:332
 #: actions/imsettings.php:239 actions/newapplication.php:124
-#: actions/oauthconnectionssettings.php:145 actions/recoverpassword.php:46
+#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
 #: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
 msgstr "Uventa skjemasending."
@@ -922,20 +917,19 @@ msgstr "Konto"
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group nickname (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT for nick name in a profile.
-#: actions/apioauthauthorize.php:459 actions/login.php:242
-#: actions/profilesettings.php:106 actions/register.php:418
+#: actions/apioauthauthorize.php:459 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:432
 #: actions/showgroup.php:243 actions/tagother.php:94
-#: actions/userauthorization.php:152 lib/groupeditform.php:145
+#: actions/userauthorization.php:145 lib/groupeditform.php:145
 #: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "Kallenamn"
 
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:463 actions/login.php:245
-#: actions/register.php:422 lib/accountsettingsaction.php:120
+#: actions/apioauthauthorize.php:463 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:120
 msgid "Password"
 msgstr "Passord"
 
@@ -1030,14 +1024,14 @@ msgstr "Denne notisen finst ikkje."
 
 #. TRANS: Client error displayed trying to repeat an own notice through the API.
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:537
+#: actions/apistatusesretweet.php:83 lib/command.php:549
 #, fuzzy
 msgid "Cannot repeat your own notice."
 msgstr "Kan ikkje slå på notifikasjon."
 
 #. TRANS: Client error displayed trying to re-repeat a notice through the API.
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:92 lib/command.php:543
+#: actions/apistatusesretweet.php:92 lib/command.php:555
 msgid "Already repeated that notice."
 msgstr "Kan ikkje sletta notisen."
 
@@ -1060,7 +1054,7 @@ msgstr "Fann ikkje API-metode."
 #. TRANS: %s is the requested output format.
 #: actions/apistatusesshow.php:144
 #, fuzzy, php-format
-msgid "Unsupported format: %s."
+msgid "Unsupported format: %s"
 msgstr "Støttar ikkje bileteformatet."
 
 #. TRANS: Client error displayed requesting a deleted status.
@@ -1167,14 +1161,13 @@ msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr "%1$s oppdateringar som svarar på oppdateringar frå %2$s / %3$s."
 
 #. TRANS: Title for site timeline. %s is the StatusNet sitename.
-#. TRANS: Public RSS feed title. %s is the StatusNet site name.
 #: actions/apitimelinepublic.php:193 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "%s offentleg tidsline"
 
 #. TRANS: Subtitle for site timeline. %s is the StatusNet sitename.
-#: actions/apitimelinepublic.php:199
+#: actions/apitimelinepublic.php:199 actions/publicrss.php:105
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "%s oppdateringar frå alle saman!"
@@ -1241,26 +1234,25 @@ msgid "Atom post must be an Atom entry."
 msgstr ""
 
 #. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
-#: actions/apitimelineuser.php:334
+#: actions/apitimelineuser.php:335
 msgid "Can only handle POST activities."
 msgstr ""
 
 #. TRANS: Client error displayed when using an unsupported activity object type.
 #. TRANS: %s is the unsupported activity object type.
-#: actions/apitimelineuser.php:345
+#: actions/apitimelineuser.php:346
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
 #. TRANS: %d is the notice ID (number).
-#: actions/apitimelineuser.php:379
+#: actions/apitimelineuser.php:380
 #, fuzzy, php-format
 msgid "No content for notice %d."
 msgstr "Søk i innhaldet av notisar"
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#. TRANS: %s is the notice URI.
 #: actions/apitimelineuser.php:408
 #, fuzzy, php-format
 msgid "Notice with URI \"%s\" already exists."
@@ -1278,10 +1270,9 @@ msgstr "Fann ikkje API-metode."
 
 #. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
 #. TRANS: Client exception.
-#. TRANS: Client error displayed trying to subscribe to a non-existing profile.
 #: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
 #: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
-#: actions/subscribe.php:110
+#: actions/subscribe.php:107
 #, fuzzy
 msgid "No such profile."
 msgstr "Denne notisen finst ikkje."
@@ -1418,7 +1409,7 @@ msgstr "Kunne ikkje slette favoritt."
 #: actions/joingroup.php:95 actions/leavegroup.php:82
 #: actions/leavegroup.php:95 actions/makeadmin.php:86
 #: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:380
+#: lib/command.php:392
 msgid "No such group."
 msgstr "Denne gruppa finst ikkje."
 
@@ -1429,7 +1420,7 @@ msgid "Not a member."
 msgstr "Alle medlemmar"
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
-#: actions/atompubshowmembership.php:150
+#: actions/atompubshowmembership.php:151
 #, fuzzy
 msgid "Cannot delete someone else's membership."
 msgstr "Kunne ikkje lagra abonnement."
@@ -1534,11 +1525,9 @@ msgstr "Du kan lasta opp ein logo for gruppa."
 
 #. TRANS: Server error displayed in avatar upload page when no matching profile can be found for a user.
 #. TRANS: Server error displayed coming across a request from a user without a profile.
-#. TRANS: Server error displayed when trying to authorise a remote subscription request
-#. TRANS: while the user has no profile.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
 #: actions/grouplogo.php:184 actions/remotesubscribe.php:190
-#: actions/userauthorization.php:75 actions/userrss.php:108
+#: actions/userauthorization.php:72 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr "Brukaren har inga profil."
 
@@ -1597,10 +1586,10 @@ msgstr "Skaler"
 msgid "No file uploaded."
 msgstr "Ingen vald profil."
 
-#. TRANS: Avatar upload form instruction after uploading a file.
+#. TRANS: Avatar upload form unstruction after uploading a file.
 #: actions/avatarsettings.php:345
 #, fuzzy
-msgid "Pick a square area of the image to be your avatar."
+msgid "Pick a square area of the image to be your avatar"
 msgstr "Velg eit utvalg av bildet som vil blir din avatar."
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
@@ -1643,7 +1632,7 @@ msgid "You may not backup your account."
 msgstr ""
 
 #. TRANS: Information displayed on the backup account page.
-#: actions/backupaccount.php:225
+#: actions/backupaccount.php:227
 msgid ""
 "You can backup your account data in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format. This is an experimental feature and provides "
@@ -1653,14 +1642,14 @@ msgid ""
 msgstr ""
 
 #. TRANS: Submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:248
+#: actions/backupaccount.php:250
 msgctxt "BUTTON"
 msgid "Backup"
 msgstr ""
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:252
-msgid "Backup your account."
+#: actions/backupaccount.php:254
+msgid "Backup your account"
 msgstr ""
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
@@ -1699,7 +1688,7 @@ msgstr "Merknad"
 #. TRANS: Submit button title for 'No' when blocking a user.
 #: actions/block.php:158
 #, fuzzy
-msgid "Do not block this user."
+msgid "Do not block this user"
 msgstr "Lås opp brukaren"
 
 #. TRANS: Button label on the user block form.
@@ -1717,9 +1706,9 @@ msgid "Yes"
 msgstr "Jau"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:165
-#, fuzzy
-msgid "Block this user."
+#. TRANS: Description of the form to block a user.
+#: actions/block.php:165 lib/blockform.php:79
+msgid "Block this user"
 msgstr "Blokkér denne brukaren"
 
 #. TRANS: Server error displayed when blocking a user fails.
@@ -1887,7 +1876,7 @@ msgstr ""
 #. TRANS: Field label for delete account confirmation entry.
 #. TRANS: Field label for password reset form where the password has to be typed again.
 #: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:262 actions/register.php:426
+#: actions/recoverpassword.php:262 actions/register.php:440
 msgid "Confirm"
 msgstr "Godta"
 
@@ -1917,15 +1906,15 @@ msgstr "Fann ikkje stadfestingskode."
 #. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
 #: actions/deleteapplication.php:79 actions/editapplication.php:78
-#: actions/showapplication.php:90
+#: actions/showapplication.php:94
 #, fuzzy
 msgid "You are not the owner of this application."
 msgstr "Du er ikkje medlem av den gruppa."
 
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
-#: actions/newapplication.php:112 actions/showapplication.php:113
-#: lib/action.php:1422
+#: actions/newapplication.php:112 actions/showapplication.php:118
+#: lib/action.php:1425
 msgid "There was a problem with your session token."
 msgstr "Det var eit problem med sesjons billetten din."
 
@@ -1947,13 +1936,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting an application.
 #: actions/deleteapplication.php:161
 #, fuzzy
-msgid "Do not delete this application."
+msgid "Do not delete this application"
 msgstr "Kan ikkje sletta notisen."
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
 #: actions/deleteapplication.php:167
 #, fuzzy
-msgid "Delete this application."
+msgid "Delete this application"
 msgstr "Slett denne notisen"
 
 #. TRANS: Client error when trying to delete group while not logged in.
@@ -2009,13 +1998,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting a group.
 #: actions/deletegroup.php:224
 #, fuzzy
-msgid "Do not delete this group."
+msgid "Do not delete this group"
 msgstr "Ikkje slett denne gruppa"
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
 #: actions/deletegroup.php:231
 #, fuzzy
-msgid "Delete this group."
+msgid "Delete this group"
 msgstr "Slett denne gruppa"
 
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
@@ -2023,15 +2012,13 @@ msgstr "Slett denne gruppa"
 #. TRANS: Client error displayed when trying to mark a notice as favorite without being logged in.
 #. TRANS: Client error displayed trying to block a user from a group while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
-#. TRANS: Client error displayed trying to log out when not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
-#. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
 #. TRANS: Client error displayed when trying to change user options while not logged in.
 #: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
-#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:70
+#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
-#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:98
+#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
 #: lib/adminpanelaction.php:71 lib/profileformaction.php:63
 #: lib/settingsaction.php:72
@@ -2062,13 +2049,12 @@ msgstr "Sikker på at du vil sletta notisen?"
 #. TRANS: Submit button title for 'No' when deleting a notice.
 #: actions/deletenotice.php:159
 #, fuzzy
-msgid "Do not delete this notice."
+msgid "Do not delete this notice"
 msgstr "Kan ikkje sletta notisen."
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:166
-#, fuzzy
-msgid "Delete this notice."
+#: actions/deletenotice.php:166 lib/noticelist.php:673
+msgid "Delete this notice"
 msgstr "Slett denne notisen"
 
 #. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
@@ -2106,13 +2092,14 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting a user.
 #: actions/deleteuser.php:158
 #, fuzzy
-msgid "Do not delete this user."
+msgid "Do not delete this user"
 msgstr "Ikkje slett denne gruppa"
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
-#: actions/deleteuser.php:165
+#. TRANS: Description of form for deleting a user.
+#: actions/deleteuser.php:165 lib/deleteuserform.php:75
 #, fuzzy
-msgid "Delete this user."
+msgid "Delete this user"
 msgstr "Slett denne notisen"
 
 #. TRANS: Message used as title for design settings for the site.
@@ -2283,21 +2270,22 @@ msgid "Use defaults"
 msgstr ""
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:720
-#, fuzzy
-msgid "Restore default designs."
-msgstr "Klarte ikkje å lagra Twitter-innstillingane dine!"
+#. TRANS: Title for button on profile design page to reset all colour settings to default.
+#: actions/designadminpanel.php:720 lib/designsettings.php:259
+msgid "Restore default designs"
+msgstr ""
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:728
-msgid "Reset back to default."
+#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
+#: actions/designadminpanel.php:728 lib/designsettings.php:267
+msgid "Reset back to default"
 msgstr ""
 
 #. TRANS: Title for button for saving theme settings.
-#: actions/designadminpanel.php:736
-#, fuzzy
-msgid "Save design."
-msgstr "Profilinnstillingar"
+#. TRANS: Title for button on profile design page to save settings.
+#: actions/designadminpanel.php:736 lib/designsettings.php:272
+msgid "Save design"
+msgstr ""
 
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
 #: actions/disfavor.php:83
@@ -2329,7 +2317,7 @@ msgid "You must be logged in to edit an application."
 msgstr "Du må være logga inn for å lage ei gruppe."
 
 #. TRANS: Client error displayed trying to edit an application that does not exist.
-#: actions/editapplication.php:83 actions/showapplication.php:83
+#: actions/editapplication.php:83 actions/showapplication.php:87
 #, fuzzy
 msgid "No such application."
 msgstr "Denne notisen finst ikkje."
@@ -2622,7 +2610,7 @@ msgid "Cannot normalize that email address."
 msgstr "Klarar ikkje normalisera epostadressa"
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:393 actions/register.php:204
+#: actions/emailsettings.php:393 actions/register.php:212
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "Ikkje ei gyldig epostadresse."
@@ -2699,22 +2687,19 @@ msgstr "Ingen innkomande epostadresse."
 
 #. 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.
 #: actions/emailsettings.php:530 actions/emailsettings.php:554
-#: actions/smssettings.php:566 actions/smssettings.php:591
+#: actions/smssettings.php:565 actions/smssettings.php:588
 #, fuzzy
 msgid "Could not update user record."
 msgstr "Kan ikkje oppdatera brukarinformajon."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
-#. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:534 actions/smssettings.php:570
+#: actions/emailsettings.php:534 actions/smssettings.php:568
 msgid "Incoming email address removed."
 msgstr "Fjerna innkomande epostadresse."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
-#. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:558 actions/smssettings.php:595
+#: actions/emailsettings.php:558 actions/smssettings.php:591
 msgid "New incoming email address added."
 msgstr "La til ny innkomande epostadresse."
 
@@ -2726,7 +2711,7 @@ msgstr "Denne notisen er alt ein favoritt!"
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
 #: actions/favor.php:95
 #, fuzzy
-msgid "Disfavor favorite."
+msgid "Disfavor favorite"
 msgstr "Fjern favoritt"
 
 #. TRANS: Page title for first page of favorited notices.
@@ -2972,13 +2957,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
 #: actions/groupblock.php:191
 #, fuzzy
-msgid "Do not block this user from this group."
+msgid "Do not block this user from this group"
 msgstr "Ei liste over brukarane i denne gruppa."
 
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
 #: actions/groupblock.php:198
 #, fuzzy
-msgid "Block this user from this group."
+msgid "Block this user from this group"
 msgstr "Ei liste over brukarane i denne gruppa."
 
 #. TRANS: Server error displayed when trying to block a user from a group fails because of an application error.
@@ -2987,7 +2972,6 @@ msgid "Database error blocking user from group."
 msgstr ""
 
 #. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
-#. TRANS: Client error displayed trying to find a user by ID without providing an ID.
 #: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr "Nei Jabber-ID"
@@ -3171,10 +3155,8 @@ msgid "Group search"
 msgstr "Gruppesøk"
 
 #. TRANS: Text on page where groups can be searched if no results were found for a query.
-#. TRANS: Text for notice search results is the query had no results.
-#. TRANS: Message on the "People search" page where a query has no results.
-#: actions/groupsearch.php:82 actions/noticesearch.php:122
-#: actions/peoplesearch.php:87
+#: actions/groupsearch.php:82 actions/noticesearch.php:117
+#: actions/peoplesearch.php:83
 msgid "No results."
 msgstr "Resultat frå kommandoen"
 
@@ -3208,7 +3190,6 @@ msgid "User is not blocked from group."
 msgstr "Brukar har blokkert deg."
 
 #. TRANS: Server error displayed when unblocking a user from a group fails because of an unknown error.
-#. TRANS: Server error displayed when removing a user block.
 #: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "Feil ved fjerning av blokka."
@@ -3303,8 +3284,7 @@ msgid "Publish a MicroID for my Jabber/Google Talk address."
 msgstr "Publiser ein MicroID for Jabber/GTalk addressene mine"
 
 #. TRANS: Confirmation message for successful Instant Messaging preferences save.
-#. TRANS: Confirmation message after saving preferences.
-#: actions/imsettings.php:283 actions/othersettings.php:193
+#: actions/imsettings.php:283 actions/othersettings.php:192
 msgid "Preferences saved."
 msgstr "Lagra brukarval."
 
@@ -3594,7 +3574,7 @@ msgstr "Du må være innlogga for å melde deg ut av ei gruppe."
 
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
-#: actions/leavegroup.php:103 lib/command.php:386
+#: actions/leavegroup.php:103 lib/command.php:398
 msgid "You are not a member of that group."
 msgstr "Du er ikkje medlem av den gruppa."
 
@@ -3718,42 +3698,40 @@ msgstr "Lagra"
 msgid "Save license settings"
 msgstr ""
 
-#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
-#: actions/login.php:97 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
 msgid "Already logged in."
 msgstr "Allereie logga inn."
 
-#: actions/login.php:142
+#: actions/login.php:148
 msgid "Incorrect username or password."
 msgstr "Feil brukarnamn eller passord."
 
-#. TRANS: Server error displayed when a user object could not be created trying to login using "one time password login".
-#: actions/login.php:148 actions/otp.php:127
+#: actions/login.php:154 actions/otp.php:120
 #, fuzzy
 msgid "Error setting user. You are probably not authorized."
 msgstr "Ikkje autorisert."
 
-#: actions/login.php:202 actions/login.php:253
+#: actions/login.php:210 actions/login.php:263
 msgid "Login"
 msgstr "Logg inn"
 
-#: actions/login.php:239
+#: actions/login.php:249
 msgid "Login to site"
 msgstr "Logg inn "
 
-#: actions/login.php:248 actions/register.php:476
+#: actions/login.php:258 actions/register.php:490
 msgid "Remember me"
 msgstr "Hugs meg"
 
-#: actions/login.php:249 actions/register.php:478
+#: actions/login.php:259 actions/register.php:492
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "Logg inn automatisk i framtidi (ikkje for delte maskiner)."
 
-#: actions/login.php:259
+#: actions/login.php:269
 msgid "Lost or forgotten password?"
 msgstr "Mista eller gløymd passord?"
 
-#: actions/login.php:277
+#: actions/login.php:288
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -3761,12 +3739,12 @@ msgstr ""
 "Skriv inn brukarnam og passord før du endrar innstillingar (av "
 "tryggleiksomsyn)."
 
-#: actions/login.php:281
+#: actions/login.php:292
 #, fuzzy
 msgid "Login with your username and password."
 msgstr "Log inn med brukarnamn og passord."
 
-#: actions/login.php:284
+#: actions/login.php:295
 #, fuzzy, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -3854,14 +3832,14 @@ msgid "New message"
 msgstr "Ny melding"
 
 #. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
-#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:501
+#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:513
 msgid "You can't send a message to this user."
 msgstr "Du kan ikkje sende melding til denne brukaren."
 
 #. TRANS: Command exception text shown when trying to send a direct message to another user without content.
 #. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
-#: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:478
-#: lib/command.php:581
+#: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:490
+#: lib/command.php:593
 msgid "No content!"
 msgstr "Ingen innhald."
 
@@ -3870,7 +3848,7 @@ msgid "No recipient specified."
 msgstr "Ingen mottakar spesifisert."
 
 #. TRANS: Error text shown when trying to send a direct message to self.
-#: actions/newmessage.php:167 lib/command.php:505
+#: actions/newmessage.php:167 lib/command.php:517
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
@@ -3884,7 +3862,7 @@ msgstr "Melding"
 
 #. TRANS: Message given have sent a direct message to another user.
 #. TRANS: %s is the name of the other user.
-#: actions/newmessage.php:188 lib/command.php:513
+#: actions/newmessage.php:188 lib/command.php:525
 #, fuzzy, php-format
 msgid "Direct message to %s sent."
 msgstr "Direkte melding til %s sendt"
@@ -3901,9 +3879,7 @@ msgstr "Ny notis"
 msgid "Notice posted"
 msgstr "Melding lagra"
 
-#. TRANS: Instructions for Notice search page.
-#. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/noticesearch.php:69
+#: actions/noticesearch.php:68
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -3912,47 +3888,37 @@ msgstr ""
 "Søk i notisar på %%site.name%% i innhald. Separer nøkkelord med mellomrom; "
 "dei må være minimum 3 bokstavar eller meir."
 
-#. TRANS: Title of the page where users can search for notices.
-#: actions/noticesearch.php:80
+#: actions/noticesearch.php:78
 msgid "Text search"
 msgstr "Tekstsøk"
 
-#. TRANS: Test in RSS notice search.
-#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearch.php:95
+#: actions/noticesearch.php:91
 #, php-format
 msgid "Search results for \"%1$s\" on %2$s"
 msgstr "Melding fra %1$s på %2$s"
 
-#. TRANS: Text for logged in users making a query for notices without results.
-#. TRANS: This message contains a Markdown link.
-#: actions/noticesearch.php:128
+#: actions/noticesearch.php:121
 #, php-format
 msgid ""
 "Be the first to [post on this topic](%%%%action.newnotice%%%%?"
 "status_textarea=%s)!"
 msgstr ""
 
-#. TRANS: Text for not logged in users making a query for notices without results.
-#. TRANS: This message contains Markdown links.
-#: actions/noticesearch.php:133
+#: actions/noticesearch.php:124
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and be the first to "
 "[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
 msgstr ""
 
-#. TRANS: RSS notice search feed title. %s is the query.
-#: actions/noticesearchrss.php:95
+#: actions/noticesearchrss.php:96
 #, fuzzy, php-format
 msgid "Updates with \"%s\""
 msgstr "Oppdateringar frå %1$s på %2$s!"
 
-#. TRANS: RSS notice search feed description.
-#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearchrss.php:99
+#: actions/noticesearchrss.php:98
 #, fuzzy, php-format
-msgid "Updates matching search term \"%1$s\" on %2$s."
+msgid "Updates matching search term \"%1$s\" on %2$s!"
 msgstr "Oppdateringar frå %1$s på %2$s!"
 
 #: actions/nudge.php:85
@@ -3995,31 +3961,31 @@ msgid "You have not registered any applications yet."
 msgstr ""
 
 #. TRANS: Title for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:70
+#: actions/oauthconnectionssettings.php:71
 msgid "Connected applications"
 msgstr ""
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:81
+#: actions/oauthconnectionssettings.php:83
 msgid "The following connections exist for your account."
 msgstr ""
 
 #. TRANS: Client error when trying to revoke access for an application while not being a user of it.
-#: actions/oauthconnectionssettings.php:166
+#: actions/oauthconnectionssettings.php:168
 #, fuzzy
 msgid "You are not a user of that application."
 msgstr "Du er ikkje medlem av den gruppa."
 
 #. TRANS: Client error when revoking access has failed for some reason.
 #. TRANS: %s is the application ID revoking access failed for.
-#: actions/oauthconnectionssettings.php:181
+#: actions/oauthconnectionssettings.php:183
 #, fuzzy, php-format
 msgid "Unable to revoke access for application: %s."
 msgstr "Bruk dette skjemaet for å redigere gruppa"
 
 #. TRANS: Success message after revoking access for an application.
 #. TRANS: %1$s is the application name, %2$s is the first part of the user token.
-#: actions/oauthconnectionssettings.php:200
+#: actions/oauthconnectionssettings.php:202
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -4027,30 +3993,20 @@ msgid ""
 msgstr ""
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:211
+#: actions/oauthconnectionssettings.php:213
 msgid "You have not authorized any applications to use your account."
 msgstr ""
 
 #. TRANS: Note for developers in the OAuth connection settings form.
 #. TRANS: This message contains a Markdown link. Do not separate "](".
 #. TRANS: %s is the URL to the OAuth settings.
-#: actions/oauthconnectionssettings.php:231
+#: actions/oauthconnectionssettings.php:233
 #, php-format
 msgid ""
 "Are you a developer? [Register an OAuth client application](%s) to use with "
 "this instance of StatusNet."
 msgstr ""
 
-#: actions/oembed.php:64
-#, fuzzy, php-format
-msgid "\"%s\" not found."
-msgstr "Fann ikkje API-metode."
-
-#: actions/oembed.php:76
-#, fuzzy, php-format
-msgid "Notice %s not found."
-msgstr "Fann ikkje API-metode."
-
 #: actions/oembed.php:80 actions/shownotice.php:100
 msgid "Notice has no profile."
 msgstr "Brukaren har inga profil."
@@ -4060,16 +4016,6 @@ msgstr "Brukaren har inga profil."
 msgid "%1$s's status on %2$s"
 msgstr "%1$s sin status på %2$s"
 
-#: actions/oembed.php:95
-#, fuzzy, php-format
-msgid "Attachment %s not found."
-msgstr "Kunne ikkje finne mottakar."
-
-#: actions/oembed.php:136
-#, php-format
-msgid "\"%s\" not supported for oembed requests."
-msgstr ""
-
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
 #: actions/oembed.php:168
 #, fuzzy, php-format
@@ -4088,12 +4034,11 @@ msgstr ""
 msgid "Not a supported data format."
 msgstr "Ikkje eit støtta dataformat."
 
-#. TRANS: ShortName in the OpenSearch interface when trying to find users.
 #: actions/opensearch.php:64
 msgid "People Search"
 msgstr "Søk etter folk"
 
-#: actions/opensearch.php:68
+#: actions/opensearch.php:67
 msgid "Notice Search"
 msgstr "Notissøk"
 
@@ -4142,50 +4087,41 @@ msgstr ""
 msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr "Adressa til forkortingstenesta er for lang (maksimalt 50 teikn)."
 
-#. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
-#: actions/otp.php:70
+#: actions/otp.php:69
 #, fuzzy
 msgid "No user ID specified."
 msgstr "Ingen vald profil."
 
-#. TRANS: Client error displayed trying to use "one time password login" without specifying a login token.
-#: actions/otp.php:86
+#: actions/otp.php:83
 #, fuzzy
 msgid "No login token specified."
 msgstr "Ingen vald profil."
 
-#. TRANS: Client error displayed trying to use "one time password login" without requesting a login token.
-#: actions/otp.php:94
+#: actions/otp.php:90
 msgid "No login token requested."
 msgstr "Ingen autoriserings-spørjing!"
 
-#. TRANS: Client error displayed trying to use "one time password login" while specifying an invalid login token.
-#: actions/otp.php:100
+#: actions/otp.php:95
 #, fuzzy
 msgid "Invalid login token specified."
 msgstr "Ugyldig notisinnhald"
 
-#. TRANS: Client error displayed trying to use "one time password login" while specifying an expired login token.
-#: actions/otp.php:110
+#: actions/otp.php:104
 #, fuzzy
 msgid "Login token expired."
 msgstr "Logg inn "
 
-#. TRANS: Title for outbox for any but the fist page.
-#. TRANS: %1$s is the user nickname, %2$d is the page number.
-#: actions/outbox.php:57
+#: actions/outbox.php:58
 #, fuzzy, php-format
 msgid "Outbox for %1$s - page %2$d"
 msgstr "Utboks for %s"
 
-#. TRANS: Title for first page of outbox.
 #: actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
 msgstr "Utboks for %s"
 
-#. TRANS: Instructions for outbox.
-#: actions/outbox.php:103
+#: actions/outbox.php:104
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr "Dette er din utboks som syner alle private meldingar du har sendt."
 
@@ -4211,45 +4147,43 @@ msgstr "Gamalt passord"
 msgid "New password"
 msgstr "Nytt passord"
 
-#: actions/passwordsettings.php:109 actions/register.php:423
+#: actions/passwordsettings.php:109
 #, fuzzy
-msgid "6 or more characters."
+msgid "6 or more characters"
 msgstr "6 eller fleire teikn"
 
-#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:264
-#: actions/register.php:427
+#: actions/passwordsettings.php:113
 #, fuzzy
-msgid "Same as password above."
+msgid "Same as password above"
 msgstr "Samme passord som over"
 
 #: actions/passwordsettings.php:117
 msgid "Change"
 msgstr "Endra"
 
-#: actions/passwordsettings.php:153 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:238
 msgid "Password must be 6 or more characters."
 msgstr "Passord må være minst 6 teikn."
 
-#: actions/passwordsettings.php:156 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:241
 msgid "Passwords don't match."
 msgstr "Passorda var ikkje like."
 
-#: actions/passwordsettings.php:164
+#: actions/passwordsettings.php:165
 msgid "Incorrect old password"
 msgstr "Det gamle passordet stemmer ikkje"
 
-#: actions/passwordsettings.php:180
+#: actions/passwordsettings.php:181
 msgid "Error saving user; invalid."
 msgstr "Feil ved lagring av brukar; fungerer ikkje."
 
-#. TRANS: Reset password form validation error message.
-#: actions/passwordsettings.php:185 actions/recoverpassword.php:418
+#: actions/passwordsettings.php:186
 #, fuzzy
-msgid "Cannot save new password."
+msgid "Can't save new password."
 msgstr "Klarar ikkje lagra nytt passord."
 
-#: actions/passwordsettings.php:191
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
 msgid "Password saved."
 msgstr "Lagra passord."
 
@@ -4542,9 +4476,7 @@ msgstr ""
 msgid "Save paths"
 msgstr "Statusmelding"
 
-#. TRANS: Instructions for the "People search" page.
-#. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/peoplesearch.php:54
+#: actions/peoplesearch.php:52
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
@@ -4553,8 +4485,7 @@ msgstr ""
 "Søk for mennesker på %%site.name%% i namn, lokasjon eller interesse. Separer "
 "nøkkelord med mellomrom; dei må være minimum 3 bokstavar eller meir."
 
-#. TRANS: Title of a page where users can search for other users.
-#: actions/peoplesearch.php:61
+#: actions/peoplesearch.php:58
 msgid "People search"
 msgstr "Søk etter folk"
 
@@ -4596,7 +4527,7 @@ msgid "Profile information"
 msgstr "Profil informasjon"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109 actions/register.php:419
+#: actions/profilesettings.php:109 actions/register.php:433
 #, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr ""
@@ -4605,7 +4536,7 @@ msgstr ""
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for full group name (dt). Text hidden by default.
 #. TRANS: DT for full name in a profile.
-#: actions/profilesettings.php:113 actions/register.php:441
+#: actions/profilesettings.php:113 actions/register.php:455
 #: actions/showgroup.php:255 actions/tagother.php:104
 #: lib/groupeditform.php:150 lib/userprofile.php:156
 msgid "Full name"
@@ -4613,13 +4544,13 @@ msgstr "Fullt namn"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:118 actions/register.php:446
+#: actions/profilesettings.php:118 actions/register.php:460
 #: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "Heimeside"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:121 actions/register.php:448
+#: actions/profilesettings.php:121
 #, fuzzy
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr "URL til heimesida di, bloggen din, eller ein profil på ei anna side."
@@ -4627,7 +4558,7 @@ msgstr "URL til heimesida di, bloggen din, eller ein profil på ei anna side."
 #. TRANS: Tooltip for field label in form for profile settings. Plural
 #. TRANS: is decided by the number of characters available for the
 #. TRANS: biography (%d).
-#: actions/profilesettings.php:129 actions/register.php:457
+#: actions/profilesettings.php:129 actions/register.php:471
 #, fuzzy, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4635,30 +4566,29 @@ msgstr[0] "Skriv om deg og interessene dine med 140 teikn"
 msgstr[1] "Skriv om deg og interessene dine med 140 teikn"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:135 actions/register.php:462
+#: actions/profilesettings.php:135 actions/register.php:476
 #, fuzzy
 msgid "Describe yourself and your interests"
 msgstr "Skildra deg sjølv og din"
 
 #. TRANS: Text area label in form for profile settings where users can provide.
 #. TRANS: their biography.
-#: actions/profilesettings.php:139 actions/register.php:464
+#: actions/profilesettings.php:139 actions/register.php:478
 msgid "Bio"
 msgstr "Om meg"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group location (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT for location in a profile.
-#: actions/profilesettings.php:145 actions/register.php:469
+#: actions/profilesettings.php:145 actions/register.php:483
 #: actions/showgroup.php:265 actions/tagother.php:112
-#: actions/userauthorization.php:174 lib/groupeditform.php:173
+#: actions/userauthorization.php:166 lib/groupeditform.php:173
 #: lib/userprofile.php:172
 msgid "Location"
 msgstr "Plassering"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148
+#: actions/profilesettings.php:148 actions/register.php:485
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Kvar er du, t.d. «By, Fylke (eller Region), Land»"
 
@@ -4679,8 +4609,7 @@ msgstr "Merkelappar"
 #: actions/profilesettings.php:164
 #, fuzzy
 msgid ""
-"Tags for yourself (letters, numbers, -, ., and _), comma- or space- "
-"separated."
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr ""
 "merkelappar for deg sjølv ( bokstavar, nummer, -, ., og _ ), komma eller "
 "mellomroms separert."
@@ -4693,7 +4622,7 @@ msgstr "Språk"
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
 #: actions/profilesettings.php:171
 #, fuzzy
-msgid "Preferred language."
+msgid "Preferred language"
 msgstr "Foretrukke språk"
 
 #. TRANS: Dropdownlist label in form for profile settings.
@@ -4710,14 +4639,14 @@ msgstr "Kva tidssone er du vanlegvis i?"
 #: actions/profilesettings.php:189
 #, fuzzy
 msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)."
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr ""
 "Automatisk ting notisane til dei som tingar mine (best for ikkje-menneskje)"
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Plural form is used based on the maximum number of allowed
 #. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:258 actions/register.php:221
+#: actions/profilesettings.php:258 actions/register.php:229
 #, fuzzy, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4737,9 +4666,9 @@ msgstr "Språk er for langt (maksimalt 50 teikn)."
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:291
-#, fuzzy, php-format
-msgid "Invalid tag: \"%s\"."
+#: actions/profilesettings.php:291 actions/tagother.php:178
+#, php-format
+msgid "Invalid tag: \"%s\""
 msgstr "Ugyldig merkelapp: %s"
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
@@ -4842,12 +4771,6 @@ msgstr ""
 "Dette er %%site.name%%, ei [mikroblogging](http://en.wikipedia.org/wiki/"
 "Micro-blogging)-teneste"
 
-#. TRANS: Public RSS feed description. %s is the StatusNet site name.
-#: actions/publicrss.php:106
-#, fuzzy, php-format
-msgid "%s updates from everyone."
-msgstr "%s oppdateringar frå alle saman!"
-
 #. TRANS: Title for public tag cloud.
 #: actions/publictagcloud.php:57
 msgid "Public tag cloud"
@@ -4984,12 +4907,6 @@ msgstr "Hent fram passord"
 msgid "Password recovery requested"
 msgstr "Passord opphenting etterspurt"
 
-#. TRANS: Title for password recovery page in password saved mode.
-#: actions/recoverpassword.php:229
-#, fuzzy
-msgid "Password saved"
-msgstr "Lagra passord."
-
 #. TRANS: Title for password recovery page when an unknown action has been specified.
 #: actions/recoverpassword.php:232
 msgid "Unknown action"
@@ -5001,6 +4918,12 @@ msgstr "Uventa handling."
 msgid "6 or more characters, and do not forget it!"
 msgstr "6 eller fleire teikn, og ikkje gløym dei."
 
+#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#: actions/recoverpassword.php:264 actions/register.php:441
+#, fuzzy
+msgid "Same as password above."
+msgstr "Samme passord som over"
+
 #. TRANS: Button text for password reset form.
 #. TRANS: Button text on profile design page to reset all colour settings to default without saving.
 #: actions/recoverpassword.php:268 lib/designsettings.php:264
@@ -5053,8 +4976,14 @@ msgstr "Passord må vera 6 tekn eller meir."
 msgid "Password and confirmation do not match."
 msgstr "Passord og stadfesting stemmer ikkje."
 
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:418
+#, fuzzy
+msgid "Cannot save new password."
+msgstr "Klarar ikkje lagra nytt passord."
+
 #. TRANS: Server error displayed when something does wrong with the user object during password reset.
-#: actions/recoverpassword.php:426 actions/register.php:248
+#: actions/recoverpassword.php:426 actions/register.php:256
 msgid "Error setting user."
 msgstr "Feil ved å setja brukar."
 
@@ -5063,91 +4992,96 @@ msgstr "Feil ved å setja brukar."
 msgid "New password successfully saved. You are now logged in."
 msgstr "Lagra det nye passordet. Du er logga inn."
 
-#: actions/register.php:87 actions/register.php:188 actions/register.php:399
+#: actions/register.php:92 actions/register.php:196 actions/register.php:413
 msgid "Sorry, only invited people can register."
 msgstr "Beklage, men kun inviterte kan registrere seg."
 
-#: actions/register.php:94
+#: actions/register.php:99
 #, fuzzy
 msgid "Sorry, invalid invitation code."
 msgstr "Feil med stadfestingskode."
 
-#: actions/register.php:113
+#: actions/register.php:119
 msgid "Registration successful"
 msgstr "Registreringa gikk bra"
 
-#: actions/register.php:115 actions/register.php:497
+#: actions/register.php:121 actions/register.php:511
 msgid "Register"
 msgstr "Registrér"
 
-#: actions/register.php:135
+#: actions/register.php:142
 msgid "Registration not allowed."
 msgstr "Registrering ikkje tillatt."
 
-#: actions/register.php:201
+#: actions/register.php:209
 #, fuzzy
-msgid "You cannot register if you don't agree to the license."
+msgid "You can't register if you don't agree to the license."
 msgstr "Du kan ikkje registrera deg om du ikkje godtek vilkåra i lisensen."
 
-#: actions/register.php:210
+#: actions/register.php:218
 msgid "Email address already exists."
 msgstr "Epostadressa finst allereie."
 
-#: actions/register.php:243 actions/register.php:265
+#: actions/register.php:251 actions/register.php:273
 msgid "Invalid username or password."
 msgstr "Ugyldig brukarnamn eller passord."
 
-#: actions/register.php:340
+#: actions/register.php:351
 msgid ""
 "With this form you can create a new account. You can then post notices and "
-"link up to friends and colleagues."
+"link up to friends and colleagues. "
 msgstr ""
 
+#: actions/register.php:437
+#, fuzzy
+msgid "6 or more characters."
+msgstr "6 eller fleire teikn"
+
 #. TRANS: Link description in user account settings menu.
-#: actions/register.php:431 actions/register.php:435
+#: actions/register.php:445 actions/register.php:449
 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
 msgid "Email"
 msgstr "Epost"
 
-#: actions/register.php:432 actions/register.php:436
+#: actions/register.php:446 actions/register.php:450
 #, fuzzy
-msgid "Used only for updates, announcements, and password recovery."
+msgid "Used only for updates, announcements, and password recovery"
 msgstr ""
 "Blir berre brukt for uppdateringar, viktige meldingar og for gløymde passord"
 
-#: actions/register.php:443
+#: actions/register.php:457
 #, fuzzy
-msgid "Longer name, preferably your \"real\" name."
+msgid "Longer name, preferably your \"real\" name"
 msgstr "Lengre namn, fortrinnsvis ditt «ekte» namn"
 
-#: actions/register.php:471
+#: actions/register.php:462
 #, fuzzy
-msgid "Where you are, like \"City, State (or Region), Country\"."
-msgstr "Kvar er du, t.d. «By, Fylke (eller Region), Land»"
+msgid "URL of your homepage, blog, or profile on another site"
+msgstr "URL til heimesida di, bloggen din, eller ein profil på ei anna side."
 
-#: actions/register.php:510
+#: actions/register.php:523
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
 msgstr ""
 
-#: actions/register.php:520
+#: actions/register.php:533
 #, php-format
 msgid "My text and files are copyright by %1$s."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:524
+#: actions/register.php:537
 msgid "My text and files remain under my own copyright."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:527
+#: actions/register.php:540
 msgid "All rights reserved."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:532
+#: actions/register.php:545
 #, fuzzy, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -5156,7 +5090,7 @@ msgstr ""
 " unnateke privatdata: passord, epostadresse, ljonmeldingsadresse og "
 "telefonnummer."
 
-#: actions/register.php:573
+#: actions/register.php:588
 #, fuzzy, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -5188,7 +5122,7 @@ msgstr ""
 "\n"
 "Takk for at du blei med, og vi håpar du vil lika tenesta!"
 
-#: actions/register.php:597
+#: actions/register.php:612
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5223,7 +5157,7 @@ msgstr "Brukaren sitt kallenamn"
 
 #: actions/remotesubscribe.php:129
 #, fuzzy
-msgid "Nickname of the user you want to follow."
+msgid "Nickname of the user you want to follow"
 msgstr "Kallenamnet til brukaren du vil fylgja"
 
 #: actions/remotesubscribe.php:132
@@ -5232,7 +5166,7 @@ msgstr "Profil-adresse"
 
 #: actions/remotesubscribe.php:133
 #, fuzzy
-msgid "URL of your profile on another compatible microblogging service."
+msgid "URL of your profile on another compatible microblogging service"
 msgstr "URL til profilsida di på ei anna kompatibel mikrobloggingteneste."
 
 #. TRANS: Link text for link that will subscribe to a remote profile.
@@ -5243,7 +5177,7 @@ msgstr "Ting"
 
 #: actions/remotesubscribe.php:158
 #, fuzzy
-msgid "Invalid profile URL (bad format)."
+msgid "Invalid profile URL (bad format)"
 msgstr "Ugyldig profil-nettadresse (feil format)"
 
 #: actions/remotesubscribe.php:167
@@ -5290,7 +5224,6 @@ msgstr "Framheva"
 msgid "Repeated!"
 msgstr "Lag"
 
-#. TRANS: RSS reply feed title. %s is a user nickname.
 #. TRANS: Tooltip for personal group navigation menu option when logged in for viewing @-replies.
 #: actions/replies.php:126 actions/repliesrss.php:68
 #: lib/personalgroupnav.php:109
@@ -5339,11 +5272,9 @@ msgid ""
 "newnotice%%%%?status_textarea=%3$s)."
 msgstr ""
 
-#. TRANS: RSS reply feed description.
-#. TRANS: %1$s is a user nickname, %2$s is the StatusNet site name.
-#: actions/repliesrss.php:74
+#: actions/repliesrss.php:72
 #, fuzzy, php-format
-msgid "Replies to %1$s on %2$s."
+msgid "Replies to %1$s on %2$s!"
 msgstr "Melding til %1$s på %2$s"
 
 #. TRANS: Client exception displayed when trying to restore an account while not logged in.
@@ -5444,7 +5375,7 @@ msgstr "Du kan ikkje lengre legge inn notisar på denne sida."
 msgid "User doesn't have this role."
 msgstr "Kan ikkje finne brukar"
 
-#: actions/rsd.php:142 actions/version.php:159
+#: actions/rsd.php:146 actions/version.php:159
 msgid "StatusNet"
 msgstr "Statistikk"
 
@@ -5489,97 +5420,97 @@ msgstr ""
 msgid "Save site settings"
 msgstr "Avatar-innstillingar"
 
-#: actions/showapplication.php:78
+#: actions/showapplication.php:82
 #, fuzzy
 msgid "You must be logged in to view an application."
 msgstr "Du må være innlogga for å melde deg ut av ei gruppe."
 
-#: actions/showapplication.php:151
+#: actions/showapplication.php:157
 #, fuzzy
 msgid "Application profile"
 msgstr "Notisen har ingen profil"
 
 #. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:153 lib/applicationeditform.php:177
+#: actions/showapplication.php:159 lib/applicationeditform.php:177
 msgid "Icon"
 msgstr ""
 
 #. TRANS: Form input field label for application name.
-#: actions/showapplication.php:163 actions/version.php:197
+#: actions/showapplication.php:169 actions/version.php:197
 #: lib/applicationeditform.php:190
 #, fuzzy
 msgid "Name"
 msgstr "Kallenamn"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:172 lib/applicationeditform.php:227
+#: actions/showapplication.php:178 lib/applicationeditform.php:227
 #, fuzzy
 msgid "Organization"
 msgstr "Paginering"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:181 actions/version.php:200
+#: actions/showapplication.php:187 actions/version.php:200
 #: lib/applicationeditform.php:208 lib/groupeditform.php:168
 msgid "Description"
 msgstr "Beskriving"
 
 #. TRANS: Header for group statistics on a group page (h2).
 #. TRANS: H2 text for user statistics.
-#: actions/showapplication.php:186 actions/showgroup.php:460
+#: actions/showapplication.php:192 actions/showgroup.php:460
 #: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "Statistikk"
 
-#: actions/showapplication.php:197
+#: actions/showapplication.php:203
 #, php-format
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr ""
 
-#: actions/showapplication.php:207
+#: actions/showapplication.php:213
 msgid "Application actions"
 msgstr ""
 
-#: actions/showapplication.php:230
+#: actions/showapplication.php:236
 msgid "Reset key & secret"
 msgstr ""
 
 #. TRANS: Title of form for deleting a user.
-#: actions/showapplication.php:246 lib/deletegroupform.php:121
+#: actions/showapplication.php:252 lib/deletegroupform.php:121
 #: lib/deleteuserform.php:64 lib/noticelist.php:673
 msgid "Delete"
 msgstr "Slett"
 
-#: actions/showapplication.php:255
+#: actions/showapplication.php:261
 msgid "Application info"
 msgstr ""
 
-#: actions/showapplication.php:257
+#: actions/showapplication.php:263
 msgid "Consumer key"
 msgstr ""
 
-#: actions/showapplication.php:262
+#: actions/showapplication.php:268
 msgid "Consumer secret"
 msgstr ""
 
-#: actions/showapplication.php:267
+#: actions/showapplication.php:273
 msgid "Request token URL"
 msgstr ""
 
-#: actions/showapplication.php:272
+#: actions/showapplication.php:278
 msgid "Access token URL"
 msgstr ""
 
-#: actions/showapplication.php:277
+#: actions/showapplication.php:283
 msgid "Authorize URL"
 msgstr ""
 
-#: actions/showapplication.php:282
+#: actions/showapplication.php:288
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
 msgstr ""
 
-#: actions/showapplication.php:302
+#: actions/showapplication.php:309
 #, fuzzy
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr "Sikker på at du vil sletta notisen?"
@@ -5665,18 +5596,16 @@ msgid "Group profile"
 msgstr "Gruppe profil"
 
 #. TRANS: Label for group URL (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT for URL in a profile.
 #: actions/showgroup.php:273 actions/tagother.php:118
-#: actions/userauthorization.php:184 lib/userprofile.php:186
+#: actions/userauthorization.php:175 lib/userprofile.php:186
 msgid "URL"
 msgstr "URL"
 
 #. TRANS: Label for group description or group note (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page where bio is displayed.
 #. TRANS: DT for note in a profile.
 #: actions/showgroup.php:285 actions/tagother.php:128
-#: actions/userauthorization.php:197 lib/userprofile.php:204
+#: actions/userauthorization.php:187 lib/userprofile.php:204
 msgid "Note"
 msgstr "Merknad"
 
@@ -5816,7 +5745,7 @@ msgid "%1$s tagged %2$s"
 msgstr "Grupper, side %d"
 
 #. TRANS: Page title showing tagged notices in one user's stream.
-#. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
+#. TRANS: %1$s is the username, %2$s is the hash tag, %1$d is the page number.
 #: actions/showstream.php:74
 #, fuzzy, php-format
 msgid "%1$s tagged %2$s, page %3$d"
@@ -6061,7 +5990,7 @@ msgstr ""
 #. TRANS: Title for button to save site notice in admin panel.
 #: actions/sitenoticeadminpanel.php:201
 #, fuzzy
-msgid "Save site notice."
+msgid "Save site notice"
 msgstr "Statusmelding"
 
 #. TRANS: Title for SMS settings.
@@ -6122,7 +6051,7 @@ msgstr "Ingen telefonnummer."
 #. TRANS: SMS phone number input field instructions in SMS settings form.
 #: actions/smssettings.php:152
 #, fuzzy
-msgid "Phone number, no punctuation or spaces, with area code."
+msgid "Phone number, no punctuation or spaces, with area code"
 msgstr "Telefonnummer, kun tall, med landskode"
 
 #. TRANS: Form legend for SMS preferences form.
@@ -6293,20 +6222,16 @@ msgstr "Du tingar ikkje oppdateringar til den profilen."
 msgid "Could not save subscription."
 msgstr "Kunne ikkje lagra abonnement."
 
-#. TRANS: Client error displayed trying to perform any request method other than POST.
-#. TRANS: Do not translate POST.
 #: actions/subscribe.php:77
 msgid "This action only accepts POST requests."
 msgstr ""
 
-#. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
-#: actions/subscribe.php:121
+#: actions/subscribe.php:117
 #, fuzzy
 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
 msgstr "Du tingar ikkje oppdateringar til den profilen."
 
-#. TRANS: Page title when subscription succeeded.
-#: actions/subscribe.php:149
+#: actions/subscribe.php:145
 msgid "Subscribed"
 msgstr "Abonnent"
 
@@ -6457,9 +6382,8 @@ msgstr "Merkelapp %s"
 msgid "User profile"
 msgstr "Brukarprofil"
 
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT element in area for user avatar.
-#: actions/tagother.php:81 actions/userauthorization.php:138
+#: actions/tagother.php:81 actions/userauthorization.php:132
 #: lib/userprofile.php:108
 msgid "Photo"
 msgstr "Bilete"
@@ -6476,11 +6400,6 @@ msgstr ""
 "Emneord for denne brukaren (bokstavar, tal, <kbd>-</kbd>, <kbd>.</kbd>, og "
 "<kbd>_</kbd>, separert med komma eller mellomrom"
 
-#: actions/tagother.php:178
-#, php-format
-msgid "Invalid tag: \"%s\""
-msgstr "Ugyldig merkelapp: %s"
-
 #: actions/tagother.php:193
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
@@ -6498,7 +6417,6 @@ msgstr ""
 msgid "No such tag."
 msgstr "Dette emneord finst ikkje."
 
-#. TRANS: Client error displayed when trying to unblock a non-blocked user.
 #: actions/unblock.php:59
 msgid "You haven't blocked that user."
 msgstr "Du tingar ikkje oppdateringar til den profilen."
@@ -6520,7 +6438,7 @@ msgstr "Fann ingen profil med den IDen."
 msgid "Unsubscribed"
 msgstr "Fjerna tinging"
 
-#: actions/updateprofile.php:64
+#: actions/updateprofile.php:64 actions/userauthorization.php:337
 #, php-format
 msgid ""
 "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
@@ -6552,7 +6470,7 @@ msgstr ""
 #. TRANS: users in user admin panel. %1$s is the invalid nickname.
 #: actions/useradminpanel.php:166
 #, php-format
-msgid "Invalid default subscripton: \"%1$s\" is not a user."
+msgid "Invalid default subscripton: '%1$s' is not a user."
 msgstr ""
 
 #. TRANS: Link description in user account settings menu.
@@ -6620,70 +6538,59 @@ msgstr ""
 #. TRANS: Title for button to save user settings in user admin panel.
 #: actions/useradminpanel.php:302
 #, fuzzy
-msgid "Save user settings."
+msgid "Save user settings"
 msgstr "Avatar-innstillingar"
 
-#. TRANS: Page title.
-#: actions/userauthorization.php:109
+#: actions/userauthorization.php:105
 msgid "Authorize subscription"
 msgstr "Autoriser tinging"
 
-#. TRANS: Page notice on "Auhtorize subscription" page.
-#: actions/userauthorization.php:115
+#: actions/userauthorization.php:110
 #, fuzzy
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
 "user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
-"click \"Reject\"."
+"click “Reject”."
 msgstr ""
 "Sjekk desse detaljane og forsikre deg om at du vil abonnere på denne "
 "brukaren sine notisar. Vist du ikkje har bedt om dette, klikk \"Avbryt\""
 
-#. TRANS: DT element on Authorise Subscription page where license is displayed.
 #. TRANS: Menu item for site administration
-#: actions/userauthorization.php:207 actions/version.php:167
+#: actions/userauthorization.php:196 actions/version.php:167
 #: lib/adminpanelaction.php:403
 #, fuzzy
 msgid "License"
 msgstr "lisens."
 
-#. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:229
+#: actions/userauthorization.php:217
 #, fuzzy
-msgctxt "BUTTON"
 msgid "Accept"
 msgstr "Godta"
 
-#. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:231
-#, fuzzy
-msgid "Subscribe to this user."
+#: actions/userauthorization.php:218 lib/subscribeform.php:115
+#: lib/subscribeform.php:139
+msgid "Subscribe to this user"
 msgstr "Lagre tinging for brukar: %s"
 
-#. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:233
+#: actions/userauthorization.php:219
 #, fuzzy
-msgctxt "BUTTON"
 msgid "Reject"
 msgstr "Avslå"
 
-#. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:235
+#: actions/userauthorization.php:220
 #, fuzzy
-msgid "Reject this subscription."
+msgid "Reject this subscription"
 msgstr "%s tingarar"
 
-#. TRANS: Client error displayed for an empty authorisation request.
-#: actions/userauthorization.php:248
+#: actions/userauthorization.php:232
 msgid "No authorization request!"
 msgstr "Ingen autoriserings-spørjing!"
 
-#. TRANS: Accept message header from Authorise subscription page.
-#: actions/userauthorization.php:271
+#: actions/userauthorization.php:254
 msgid "Subscription authorized"
 msgstr "Tinging autorisert"
 
-#: actions/userauthorization.php:274
+#: actions/userauthorization.php:256
 #, fuzzy
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
@@ -6694,12 +6601,11 @@ msgstr ""
 "Sjekk med sida sine instruksjonar for korleis autorisering til tinginga skal "
 "gjennomførast. Ditt tingings teikn er: "
 
-#. TRANS: Reject message header from Authorise subscription page.
-#: actions/userauthorization.php:285
+#: actions/userauthorization.php:266
 msgid "Subscription rejected"
 msgstr "Tinging avvist"
 
-#: actions/userauthorization.php:288
+#: actions/userauthorization.php:268
 #, fuzzy
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
@@ -6709,62 +6615,39 @@ msgstr ""
 "Tingina har blitt avvist, men ingen henvisnings URL er tilgjengleg. Sjekk "
 "med sida sine instruksjonar for korleis ein skal avvise tinginga."
 
-#. TRANS: Exception thrown when no valid user is found for an authorisation request.
-#. TRANS: %s is a listener URI.
-#: actions/userauthorization.php:325
+#: actions/userauthorization.php:303
 #, php-format
-msgid "Listener URI \"%s\" not found here."
+msgid "Listener URI ‘%s’ not found here."
 msgstr ""
 
-#. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:332
+#: actions/userauthorization.php:308
 #, php-format
-msgid "Listenee URI \"%s\" is too long."
+msgid "Listenee URI ‘%s’ is too long."
 msgstr ""
 
-#. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:340
+#: actions/userauthorization.php:314
 #, php-format
-msgid "Listenee URI \"%s\" is a local user."
+msgid "Listenee URI ‘%s’ is a local user."
 msgstr ""
 
-#. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
-#. TRANS: %s is a profile URL.
-#: actions/userauthorization.php:358
+#: actions/userauthorization.php:329
 #, php-format
-msgid "Profile URL \"%s\" is for a local user."
+msgid "Profile URL ‘%s’ is for a local user."
 msgstr ""
 
-#. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
-#. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
-#: actions/userauthorization.php:368
-#, php-format
-msgid ""
-"Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
-"\"."
-msgstr ""
-
-#. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:378
+#: actions/userauthorization.php:345
 #, fuzzy, php-format
-msgid "Avatar URL \"%s\" is not valid."
+msgid "Avatar URL ‘%s’ is not valid."
 msgstr "Heimesida er ikkje ei gyldig internettadresse."
 
-#. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:385
+#: actions/userauthorization.php:350
 #, fuzzy, php-format
-msgid "Cannot read avatar URL \"%s\"."
+msgid "Can’t read avatar URL ‘%s’."
 msgstr "Kan ikkje lesa brukarbilete-URL «%s»"
 
-#. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:392
+#: actions/userauthorization.php:355
 #, fuzzy, php-format
-msgid "Wrong image type for avatar URL \"%s\"."
+msgid "Wrong image type for avatar URL ‘%s’."
 msgstr "Feil biletetype for '%s'"
 
 #. TRANS: Page title for profile design page.
@@ -6860,7 +6743,7 @@ msgid "Plugins"
 msgstr ""
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:898
+#: actions/version.php:198 lib/action.php:901
 #, fuzzy
 msgid "Version"
 msgstr "Personleg"
@@ -7072,14 +6955,14 @@ msgstr "Eit problem oppstod ved lagring av notis."
 
 #. TRANS: Server exception thrown when a reply cannot be saved.
 #. TRANS: %1$d is a notice ID, %2$d is the ID of the mentioned user.
-#: classes/Notice.php:1142
+#: classes/Notice.php:1144
 #, fuzzy, php-format
 msgid "Could not save reply for %1$d, %2$d."
 msgstr "Kunne ikkje lagra abonnement."
 
 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1661
+#: classes/Notice.php:1663
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
@@ -7093,14 +6976,14 @@ msgstr "%1$s (%2$s)"
 
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:775
+#: classes/Profile.php:779
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:784
+#: classes/Profile.php:788
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -7433,54 +7316,54 @@ msgid "Page notice"
 msgstr "Sidenotis"
 
 #. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:871
+#: lib/action.php:874
 msgid "Secondary site navigation"
 msgstr "Andrenivås side navigasjon"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:877
+#: lib/action.php:880
 msgid "Help"
 msgstr "Hjelp"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:880
+#: lib/action.php:883
 msgid "About"
 msgstr "Om"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:883
+#: lib/action.php:886
 msgid "FAQ"
 msgstr "OSS"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:888
+#: lib/action.php:891
 msgid "TOS"
 msgstr ""
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:892
+#: lib/action.php:895
 msgid "Privacy"
 msgstr "Personvern"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:895
+#: lib/action.php:898
 msgid "Source"
 msgstr "Kjeldekode"
 
 #. TRANS: Secondary navigation menu option leading to e-mail contact information on the
 #. TRANS: StatusNet site, where to report bugs, ...
-#: lib/action.php:902
+#: lib/action.php:905
 msgid "Contact"
 msgstr "Kontakt"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:905
+#: lib/action.php:908
 #, fuzzy
 msgid "Badge"
 msgstr "Dult"
 
 #. TRANS: DT element for StatusNet software license.
-#: lib/action.php:934
+#: lib/action.php:937
 msgid "StatusNet software license"
 msgstr "StatusNets programvarelisens"
 
@@ -7488,7 +7371,7 @@ msgstr "StatusNets programvarelisens"
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:941
+#: lib/action.php:944
 #, fuzzy, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7498,7 +7381,7 @@ msgstr ""
 "broughtbyurl%%). "
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:944
+#: lib/action.php:947
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** er ei mikrobloggingteneste."
@@ -7507,7 +7390,7 @@ msgstr "**%%site.name%%** er ei mikrobloggingteneste."
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:951
+#: lib/action.php:954
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7519,51 +7402,51 @@ msgstr ""
 "org/licensing/licenses/agpl-3.0.html)."
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:967
+#: lib/action.php:970
 #, fuzzy
 msgid "Site content license"
 msgstr "StatusNets programvarelisens"
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:974
+#: lib/action.php:977
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:981
+#: lib/action.php:984
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:985
+#: lib/action.php:988
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:1017
+#: lib/action.php:1020
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
 
 #. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1353
+#: lib/action.php:1356
 msgid "Pagination"
 msgstr "Paginering"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1364
+#: lib/action.php:1367
 msgid "After"
 msgstr "« Etter"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1374
+#: lib/action.php:1377
 msgid "Before"
 msgstr "Før »"
 
@@ -7776,23 +7659,19 @@ msgstr ""
 msgid "No application for that consumer key."
 msgstr ""
 
-#: lib/apiauth.php:202 lib/apiauth.php:284
-msgid "Not allowed to use API."
-msgstr ""
-
 #. TRANS: OAuth exception given when an incorrect access token was given for a user.
-#: lib/apiauth.php:225
+#: lib/apiauth.php:219
 msgid "Bad access token."
 msgstr ""
 
 #. TRANS: OAuth exception given when no user was found for a given token (no token was found).
-#: lib/apiauth.php:230
+#: lib/apiauth.php:224
 msgid "No user for that token."
 msgstr ""
 
 #. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel".
 #. TRANS: Client error thrown when authentication fails.
-#: lib/apiauth.php:272 lib/apiauth.php:302
+#: lib/apiauth.php:266 lib/apiauth.php:293
 msgid "Could not authenticate you."
 msgstr ""
 
@@ -8002,11 +7881,6 @@ msgstr "Endra passord"
 msgid "Block"
 msgstr "Blokkér"
 
-#. TRANS: Description of the form to block a user.
-#: lib/blockform.php:79
-msgid "Block this user"
-msgstr "Blokkér denne brukaren"
-
 #. TRANS: Title for command results.
 #: lib/channel.php:160 lib/channel.php:181
 msgid "Command results"
@@ -8036,7 +7910,7 @@ msgstr "Fann ingen profil med den IDen."
 
 #. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
 #. TRANS: Error text shown when a last user notice is requested and it does not exist.
-#: lib/command.php:99 lib/command.php:630
+#: lib/command.php:99 lib/command.php:642
 #, fuzzy
 msgid "User has no last notice."
 msgstr "Brukaren har ikkje siste notis"
@@ -8084,35 +7958,41 @@ msgid ""
 "Notices: %3$s"
 msgstr ""
 
+#. TRANS: Error message text shown when a favorite could not be set because it has already been favorited.
+#: lib/command.php:298
+#, fuzzy
+msgid "Could not create favorite: already favorited."
+msgstr "Kunne ikkje lagre favoritt."
+
 #. TRANS: Text shown when a notice has been marked as favourite successfully.
-#: lib/command.php:312
+#: lib/command.php:324
 msgid "Notice marked as fave."
 msgstr "Notis markert som favoritt."
 
 #. TRANS: Message given having added a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:357
+#: lib/command.php:369
 #, php-format
 msgid "%1$s joined group %2$s."
 msgstr ""
 
 #. TRANS: Message given having removed a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:405
+#: lib/command.php:417
 #, php-format
 msgid "%1$s left group %2$s."
 msgstr ""
 
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: lib/command.php:426
+#: lib/command.php:438
 #, fuzzy, php-format
 msgctxt "WHOIS"
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
 
 #. TRANS: Whois output. %s is the full name of the queried user.
-#: lib/command.php:430
+#: lib/command.php:442
 #, php-format
 msgid "Fullname: %s"
 msgstr "Fullt namn: %s"
@@ -8120,7 +8000,7 @@ msgstr "Fullt namn: %s"
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a location.
-#: lib/command.php:434 lib/mail.php:270
+#: lib/command.php:446 lib/mail.php:270
 #, php-format
 msgid "Location: %s"
 msgstr "Stad: %s"
@@ -8128,20 +8008,20 @@ msgstr "Stad: %s"
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a homepage.
-#: lib/command.php:438 lib/mail.php:274
+#: lib/command.php:450 lib/mail.php:274
 #, php-format
 msgid "Homepage: %s"
 msgstr "Heimeside: %s"
 
 #. TRANS: Whois output. %s is the bio information of the queried user.
-#: lib/command.php:442
+#: lib/command.php:454
 #, php-format
 msgid "About: %s"
 msgstr "Om: %s"
 
 #. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).
 #. TRANS: %s is a remote profile.
-#: lib/command.php:471
+#: lib/command.php:483
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
@@ -8150,7 +8030,7 @@ msgstr ""
 
 #. TRANS: Message given if content is too long. %1$sd is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:488
+#: lib/command.php:500
 #, fuzzy, php-format
 msgid "Message too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
@@ -8158,25 +8038,25 @@ msgstr[0] "Melding for lang - maksimum 140 teikn, du skreiv %d"
 msgstr[1] "Melding for lang - maksimum 140 teikn, du skreiv %d"
 
 #. TRANS: Error text shown sending a direct message fails with an unknown reason.
-#: lib/command.php:516
+#: lib/command.php:528
 msgid "Error sending direct message."
 msgstr "Ein feil oppstod ved sending av direkte melding."
 
 #. TRANS: Message given having repeated a notice from another user.
 #. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:553
+#: lib/command.php:565
 #, fuzzy, php-format
 msgid "Notice from %s repeated."
 msgstr "Melding lagra"
 
 #. TRANS: Error text shown when repeating a notice fails with an unknown reason.
-#: lib/command.php:556
+#: lib/command.php:568
 msgid "Error repeating notice."
 msgstr "Feil ved å setja brukar."
 
 #. TRANS: Message given if content of a notice for a reply is too long. %1$d is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:591
+#: lib/command.php:603
 #, fuzzy, php-format
 msgid "Notice too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Notice too long - maximum is %1$d characters, you sent %2$d."
@@ -8185,97 +8065,97 @@ msgstr[1] "Melding for lang - maksimum 140 teikn, du skreiv %d"
 
 #. TRANS: Text shown having sent a reply to a notice successfully.
 #. TRANS: %s is the nickname of the user of the notice the reply was sent to.
-#: lib/command.php:604
+#: lib/command.php:616
 #, fuzzy, php-format
 msgid "Reply to %s sent."
 msgstr "Svar på denne notisen"
 
 #. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
-#: lib/command.php:607
+#: lib/command.php:619
 #, fuzzy
 msgid "Error saving notice."
 msgstr "Eit problem oppstod ved lagring av notis."
 
 #. TRANS: Error text shown when no username was provided when issuing a subscribe command.
-#: lib/command.php:654
+#: lib/command.php:666
 #, fuzzy
 msgid "Specify the name of the user to subscribe to."
 msgstr "Spesifer namnet til brukaren du vil tinge"
 
 #. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
-#: lib/command.php:663
+#: lib/command.php:675
 #, fuzzy
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "Du tingar ikkje oppdateringar til den profilen."
 
 #. TRANS: Text shown after having subscribed to another user successfully.
 #. TRANS: %s is the name of the user the subscription was requested for.
-#: lib/command.php:671
+#: lib/command.php:683
 #, php-format
 msgid "Subscribed to %s."
 msgstr ""
 
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.
-#: lib/command.php:692 lib/command.php:803
+#: lib/command.php:704 lib/command.php:815
 #, fuzzy
 msgid "Specify the name of the user to unsubscribe from."
 msgstr "Spesifer namnet til brukar du vil fjerne tinging på"
 
 #. TRANS: Text shown after having unsubscribed from another user successfully.
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:703
+#: lib/command.php:715
 #, php-format
 msgid "Unsubscribed from %s."
 msgstr ""
 
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
-#: lib/command.php:723 lib/command.php:749
+#: lib/command.php:735 lib/command.php:761
 msgid "Command not yet implemented."
 msgstr "Kommando ikkje implementert."
 
 #. TRANS: Text shown when issuing the command "off" successfully.
-#: lib/command.php:727
+#: lib/command.php:739
 msgid "Notification off."
 msgstr "Notifikasjon av."
 
 #. TRANS: Error text shown when the command "off" fails for an unknown reason.
-#: lib/command.php:730
+#: lib/command.php:742
 msgid "Can't turn off notification."
 msgstr "Kan ikkje skru av notifikasjon."
 
 #. TRANS: Text shown when issuing the command "on" successfully.
-#: lib/command.php:753
+#: lib/command.php:765
 msgid "Notification on."
 msgstr "Notifikasjon på."
 
 #. TRANS: Error text shown when the command "on" fails for an unknown reason.
-#: lib/command.php:756
+#: lib/command.php:768
 msgid "Can't turn on notification."
 msgstr "Kan ikkje slå på notifikasjon."
 
 #. TRANS: Error text shown when issuing the login command while login is disabled.
-#: lib/command.php:770
+#: lib/command.php:782
 msgid "Login command is disabled."
 msgstr ""
 
 #. TRANS: Text shown after issuing the login command successfully.
 #. TRANS: %s is a logon link..
-#: lib/command.php:783
+#: lib/command.php:795
 #, php-format
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
 
 #. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:812
+#: lib/command.php:824
 #, php-format
 msgid "Unsubscribed %s."
 msgstr ""
 
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
-#: lib/command.php:830
+#: lib/command.php:842
 #, fuzzy
 msgid "You are not subscribed to anyone."
 msgstr "Du tingar ikkje oppdateringar til den profilen."
@@ -8283,7 +8163,7 @@ msgstr "Du tingar ikkje oppdateringar til den profilen."
 #. TRANS: Text shown after requesting other users a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
-#: lib/command.php:835
+#: lib/command.php:847
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Du tingar allereie oppdatering frå desse brukarane:"
@@ -8291,7 +8171,7 @@ msgstr[1] "Du tingar allereie oppdatering frå desse brukarane:"
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user
 #. TRANS: (followers) without having any subscribers.
-#: lib/command.php:857
+#: lib/command.php:869
 #, fuzzy
 msgid "No one is subscribed to you."
 msgstr "Kan ikkje tinga andre til deg."
@@ -8299,7 +8179,7 @@ msgstr "Kan ikkje tinga andre til deg."
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
-#: lib/command.php:862
+#: lib/command.php:874
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Kan ikkje tinga andre til deg."
@@ -8307,7 +8187,7 @@ msgstr[1] "Kan ikkje tinga andre til deg."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to without having
 #. TRANS: any group subscriptions.
-#: lib/command.php:884
+#: lib/command.php:896
 #, fuzzy
 msgid "You are not a member of any groups."
 msgstr "Du er ikkje medlem av den gruppa."
@@ -8315,14 +8195,14 @@ msgstr "Du er ikkje medlem av den gruppa."
 #. TRANS: Text shown after requesting groups a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
-#: lib/command.php:889
+#: lib/command.php:901
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "Du er ikkje medlem av den gruppa."
 msgstr[1] "Du er ikkje medlem av den gruppa."
 
 #. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-#: lib/command.php:904
+#: lib/command.php:916
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -8429,12 +8309,6 @@ msgstr ""
 msgid "Database error"
 msgstr ""
 
-#. TRANS: Description of form for deleting a user.
-#: lib/deleteuserform.php:75
-#, fuzzy
-msgid "Delete this user"
-msgstr "Slett denne notisen"
-
 #. TRANS: Label in form on profile design page.
 #. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
 #: lib/designsettings.php:108
@@ -8470,21 +8344,6 @@ msgstr "Endra passordet ditt"
 msgid "Use defaults"
 msgstr ""
 
-#. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: lib/designsettings.php:259
-msgid "Restore default designs"
-msgstr ""
-
-#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: lib/designsettings.php:267
-msgid "Reset back to default"
-msgstr ""
-
-#. TRANS: Title for button on profile design page to save settings.
-#: lib/designsettings.php:272
-msgid "Save design"
-msgstr ""
-
 #. TRANS: Error message displayed if design settings could not be saved.
 #. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
 #: lib/designsettings.php:405 lib/designsettings.php:427
@@ -9282,10 +9141,6 @@ msgstr "Svar på denne notisen"
 msgid "Reply"
 msgstr "Svar"
 
-#: lib/noticelist.php:673
-msgid "Delete this notice"
-msgstr "Slett denne notisen"
-
 #: lib/noticelist.php:691
 #, fuzzy
 msgid "Notice repeated"
@@ -9579,10 +9434,6 @@ msgstr "Invitér"
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Inviter vennar og kollega til å bli med deg på %s"
 
-#: lib/subscribeform.php:115 lib/subscribeform.php:139
-msgid "Subscribe to this user"
-msgstr "Lagre tinging for brukar: %s"
-
 #: lib/subscriberspeopleselftagcloudsection.php:48
 #: lib/subscriptionspeopleselftagcloudsection.php:48
 msgid "People Tagcloud as self-tagged"
@@ -9759,23 +9610,18 @@ msgctxt "role"
 msgid "Moderator"
 msgstr ""
 
-#: lib/util.php:305
-#, fuzzy
-msgid "Not allowed to log in."
-msgstr "Ikkje logga inn"
-
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1309
+#: lib/util.php:1306
 msgid "a few seconds ago"
 msgstr "eit par sekund sidan"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1312
+#: lib/util.php:1309
 msgid "about a minute ago"
 msgstr "omtrent eitt minutt sidan"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1316
+#: lib/util.php:1313
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
@@ -9783,12 +9629,12 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1319
+#: lib/util.php:1316
 msgid "about an hour ago"
 msgstr "omtrent ein time sidan"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1323
+#: lib/util.php:1320
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
@@ -9796,12 +9642,12 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1326
+#: lib/util.php:1323
 msgid "about a day ago"
 msgstr "omtrent ein dag sidan"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1330
+#: lib/util.php:1327
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
@@ -9809,12 +9655,12 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1333
+#: lib/util.php:1330
 msgid "about a month ago"
 msgstr "omtrent ein månad sidan"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1337
+#: lib/util.php:1334
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
@@ -9822,7 +9668,7 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1340
+#: lib/util.php:1337
 msgid "about a year ago"
 msgstr "omtrent eitt år sidan"
 
@@ -9864,3 +9710,63 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#, fuzzy
+#~ msgid "Block this user."
+#~ msgstr "Blokkér denne brukaren"
+
+#, fuzzy
+#~ msgid "Delete this notice."
+#~ msgstr "Slett denne notisen"
+
+#, fuzzy
+#~ msgid "Delete this user."
+#~ msgstr "Slett denne notisen"
+
+#, fuzzy
+#~ msgid "Restore default designs."
+#~ msgstr "Klarte ikkje å lagra Twitter-innstillingane dine!"
+
+#, fuzzy
+#~ msgid "Save design."
+#~ msgstr "Profilinnstillingar"
+
+#, fuzzy
+#~ msgid "Disfavor favorite."
+#~ msgstr "Fjern favoritt"
+
+#, fuzzy
+#~ msgid "\"%s\" not found."
+#~ msgstr "Fann ikkje API-metode."
+
+#, fuzzy
+#~ msgid "Notice %s not found."
+#~ msgstr "Fann ikkje API-metode."
+
+#, fuzzy
+#~ msgid "Attachment %s not found."
+#~ msgstr "Kunne ikkje finne mottakar."
+
+#, fuzzy
+#~ msgid "Invalid tag: \"%s\"."
+#~ msgstr "Ugyldig merkelapp: %s"
+
+#, fuzzy
+#~ msgid "%s updates from everyone."
+#~ msgstr "%s oppdateringar frå alle saman!"
+
+#, fuzzy
+#~ msgid "Password saved"
+#~ msgstr "Lagra passord."
+
+#, fuzzy
+#~ msgid "Where you are, like \"City, State (or Region), Country\"."
+#~ msgstr "Kvar er du, t.d. «By, Fylke (eller Region), Land»"
+
+#, fuzzy
+#~ msgid "Subscribe to this user."
+#~ msgstr "Lagre tinging for brukar: %s"
+
+#, fuzzy
+#~ msgid "Not allowed to log in."
+#~ msgstr "Ikkje logga inn"
diff --git a/locale/pl/LC_MESSAGES/statusnet.po b/locale/pl/LC_MESSAGES/statusnet.po
index d69609d4f4..e08d69f141 100644
--- a/locale/pl/LC_MESSAGES/statusnet.po
+++ b/locale/pl/LC_MESSAGES/statusnet.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-24 10:32+0000\n"
-"PO-Revision-Date: 2011-02-24 10:37:28+0000\n"
+"POT-Creation-Date: 2011-03-03 15:58+0000\n"
+"PO-Revision-Date: 2011-03-03 16:01:15+0000\n"
 "Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
 "Language-Team: Polish <http://translatewiki.net/wiki/Portal:pl>\n"
 "MIME-Version: 1.0\n"
@@ -20,11 +20,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n == 1) ? 0 : ( (n%10 >= 2 && n%10 <= 4 && "
 "(n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
-"X-Generator: MediaWiki 1.18alpha (r82712); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pl\n"
 "X-Message-Group: #out-statusnet-core\n"
-"X-POT-Import-Date: 2011-02-17 11:39:54+0000\n"
+"X-POT-Import-Date: 2011-02-25 23:49:23+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -136,11 +136,7 @@ msgstr "Nie ma takiej strony."
 #. 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 use "one time password login" without using an existing user.
-#. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
-#. TRANS: Client error displayed trying to find a user by ID for a non-existing ID.
-#. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when calling a profile action without specifying a user.
 #: actions/all.php:80 actions/allrss.php:69
@@ -158,12 +154,12 @@ msgstr "Nie ma takiej strony."
 #: actions/apitimelinementions.php:77 actions/apitimelineuser.php:79
 #: actions/avatarbynickname.php:79 actions/favoritesrss.php:72
 #: actions/foaf.php:42 actions/foaf.php:61 actions/hcard.php:67
-#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:78
+#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
 #: actions/remotesubscribe.php:144 actions/remotesubscribe.php:153
-#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:113
-#: actions/showfavorites.php:106 actions/userbyid.php:75
+#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
+#: actions/showfavorites.php:106 actions/userbyid.php:74
 #: actions/usergroups.php:93 actions/userrss.php:40 actions/userxrd.php:59
-#: actions/xrds.php:71 lib/command.php:497 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:509 lib/galleryaction.php:59
 #: lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Brak takiego użytkownika."
@@ -293,7 +289,7 @@ msgstr "Aktualizacje z %1$s i przyjaciół na %2$s."
 #: actions/apigrouplistall.php:120 actions/apigroupmembership.php:105
 #: actions/apigroupshow.php:114 actions/apihelptest.php:84
 #: actions/apistatusesdestroy.php:101 actions/apistatusesretweets.php:110
-#: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:138
+#: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:139
 #: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
 #: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:268
 #: actions/apitimelinegroup.php:147 actions/apitimelinehome.php:173
@@ -528,7 +524,7 @@ msgstr "Nie odnaleziono odbiorcy."
 #. TRANS: Client error displayed trying to direct message another user who's not a friend (403).
 #: actions/apidirectmessagenew.php:144
 #, fuzzy
-msgid "Cannot send direct messages to users who aren't your friend."
+msgid "Can't send direct messages to users who aren't your friend."
 msgstr ""
 "Nie można wysłać bezpośredniej wiadomości do użytkowników, którzy nie są "
 "twoimi przyjaciółmi."
@@ -555,7 +551,7 @@ msgstr "Ten stan jest już ulubiony."
 #. TRANS: Client error displayed when marking a notice as favourite fails.
 #. TRANS: Server error displayed when trying to mark a notice as favorite fails in the database.
 #. TRANS: Error message text shown when a favorite could not be set.
-#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:294
+#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:306
 msgid "Could not create favorite."
 msgstr "Nie można utworzyć ulubionego wpisu."
 
@@ -614,7 +610,7 @@ msgstr "Nie można odnaleźć użytkownika docelowego."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:191
 #: actions/newgroup.php:137 actions/profilesettings.php:273
-#: actions/register.php:206
+#: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "Pseudonim jest już używany. Spróbuj innego."
 
@@ -624,7 +620,7 @@ msgstr "Pseudonim jest już używany. Spróbuj innego."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:195
 #: actions/newgroup.php:141 actions/profilesettings.php:243
-#: actions/register.php:208
+#: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "To nie jest prawidłowy pseudonim."
 
@@ -637,7 +633,7 @@ msgstr "To nie jest prawidłowy pseudonim."
 #: actions/apigroupcreate.php:181 actions/editapplication.php:235
 #: actions/editgroup.php:202 actions/newapplication.php:221
 #: actions/newgroup.php:148 actions/profilesettings.php:248
-#: actions/register.php:215
+#: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "Strona domowa nie jest prawidłowym adresem URL."
 
@@ -647,7 +643,7 @@ msgstr "Strona domowa nie jest prawidłowym adresem URL."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:191 actions/editgroup.php:206
 #: actions/newgroup.php:152 actions/profilesettings.php:252
-#: actions/register.php:218
+#: actions/register.php:226
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "Imię i nazwisko jest za długie (maksymalnie 255 znaków)."
 
@@ -676,7 +672,7 @@ msgstr[2] "Opis jest za długi (maksymalnie %d znaków)."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:215 actions/editgroup.php:218
 #: actions/newgroup.php:164 actions/profilesettings.php:265
-#: actions/register.php:227
+#: actions/register.php:235
 msgid "Location is too long (maximum 255 characters)."
 msgstr "Położenie jest za długie (maksymalnie 255 znaków)."
 
@@ -733,14 +729,14 @@ msgstr "Nie odnaleziono grupy."
 #. TRANS: Server error displayed when trying to join a group the user is already a member of.
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:333
+#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:345
 msgid "You are already a member of that group."
 msgstr "Jesteś już członkiem tej grupy."
 
 #. TRANS: Server error displayed when trying to join a group the user is blocked from joining.
 #. 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.
-#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:338
+#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:350
 msgid "You have been blocked from that group by the admin."
 msgstr "Zostałeś zablokowany w tej grupie przez administratora."
 
@@ -750,7 +746,7 @@ msgstr "Zostałeś zablokowany w tej grupie przez administratora."
 #. TRANS: %1$s is the joining user's nickname, $2$s is the group nickname for which the join failed.
 #. TRANS: Message given having failed to add a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:350
+#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:362
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "Nie można dołączyć użytkownika %1$s do grupy %2$s."
@@ -767,7 +763,7 @@ msgstr "Nie jesteś członkiem tej grupy."
 #. TRANS: Message given having failed to remove a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
 #: actions/apigroupleave.php:127 actions/leavegroup.php:133
-#: lib/command.php:398
+#: lib/command.php:410
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
 msgstr "Nie można usunąć użytkownika %1$s z grupy %2$s."
@@ -827,21 +823,20 @@ msgstr "Token żądania został już upoważniony."
 #. TRANS: Form validation error message.
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
-#. TRANS: Client error displayed when the session token is not okay.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
 #: actions/deletenotice.php:177 actions/disfavor.php:75
 #: actions/emailsettings.php:291 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:65 actions/grouplogo.php:321
 #: actions/groupunblock.php:65 actions/imsettings.php:224
-#: actions/invite.php:60 actions/login.php:131 actions/makeadmin.php:66
+#: actions/invite.php:60 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
-#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:136
-#: actions/othersettings.php:155 actions/passwordsettings.php:137
+#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
+#: actions/othersettings.php:155 actions/passwordsettings.php:138
 #: actions/profilesettings.php:217 actions/recoverpassword.php:383
-#: actions/register.php:164 actions/remotesubscribe.php:76
+#: actions/register.php:172 actions/remotesubscribe.php:76
 #: actions/repeat.php:82 actions/smssettings.php:250 actions/subedit.php:40
-#: actions/subscribe.php:87 actions/tagother.php:166
-#: actions/unsubscribe.php:69 actions/userauthorization.php:53
+#: actions/subscribe.php:86 actions/tagother.php:166
+#: actions/unsubscribe.php:69 actions/userauthorization.php:52
 #: lib/designsettings.php:310
 msgid "There was a problem with your session token. Try again, please."
 msgstr "Wystąpił problem z tokenem sesji. Spróbuj ponownie."
@@ -872,7 +867,7 @@ msgstr "Błąd bazy danych podczas wprowadzania oauth_token_association."
 #: actions/designadminpanel.php:100 actions/editapplication.php:144
 #: actions/emailsettings.php:310 actions/grouplogo.php:332
 #: actions/imsettings.php:239 actions/newapplication.php:124
-#: actions/oauthconnectionssettings.php:145 actions/recoverpassword.php:46
+#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
 #: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
 msgstr "Nieoczekiwane wysłanie formularza."
@@ -923,20 +918,19 @@ msgstr "Konto"
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group nickname (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT for nick name in a profile.
-#: actions/apioauthauthorize.php:459 actions/login.php:242
-#: actions/profilesettings.php:106 actions/register.php:418
+#: actions/apioauthauthorize.php:459 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:432
 #: actions/showgroup.php:243 actions/tagother.php:94
-#: actions/userauthorization.php:152 lib/groupeditform.php:145
+#: actions/userauthorization.php:145 lib/groupeditform.php:145
 #: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "Pseudonim"
 
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:463 actions/login.php:245
-#: actions/register.php:422 lib/accountsettingsaction.php:120
+#: actions/apioauthauthorize.php:463 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:120
 msgid "Password"
 msgstr "Hasło"
 
@@ -1031,13 +1025,13 @@ msgstr "Nie ma takiego wpisu."
 
 #. TRANS: Client error displayed trying to repeat an own notice through the API.
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:537
+#: actions/apistatusesretweet.php:83 lib/command.php:549
 msgid "Cannot repeat your own notice."
 msgstr "Nie można powtórzyć własnego wpisu."
 
 #. TRANS: Client error displayed trying to re-repeat a notice through the API.
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:92 lib/command.php:543
+#: actions/apistatusesretweet.php:92 lib/command.php:555
 msgid "Already repeated that notice."
 msgstr "Już powtórzono ten wpis."
 
@@ -1059,7 +1053,7 @@ msgstr "Metoda HTTP nie jest obsługiwana."
 #. TRANS: %s is the requested output format.
 #: actions/apistatusesshow.php:144
 #, fuzzy, php-format
-msgid "Unsupported format: %s."
+msgid "Unsupported format: %s"
 msgstr "Nieobsługiwany format: %s"
 
 #. TRANS: Client error displayed requesting a deleted status.
@@ -1167,14 +1161,13 @@ msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr "%1$s aktualizuje tę odpowiedź na aktualizacje od %2$s/%3$s."
 
 #. TRANS: Title for site timeline. %s is the StatusNet sitename.
-#. TRANS: Public RSS feed title. %s is the StatusNet site name.
 #: actions/apitimelinepublic.php:193 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "Publiczna oś czasu użytkownika %s"
 
 #. TRANS: Subtitle for site timeline. %s is the StatusNet sitename.
-#: actions/apitimelinepublic.php:199
+#: actions/apitimelinepublic.php:199 actions/publicrss.php:105
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "Użytkownik %s aktualizuje od każdego."
@@ -1239,26 +1232,25 @@ msgid "Atom post must be an Atom entry."
 msgstr "Wpis Atom musi być wpisem Atom."
 
 #. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
-#: actions/apitimelineuser.php:334
+#: actions/apitimelineuser.php:335
 msgid "Can only handle POST activities."
 msgstr "Można obsługiwać tylko działania POST."
 
 #. TRANS: Client error displayed when using an unsupported activity object type.
 #. TRANS: %s is the unsupported activity object type.
-#: actions/apitimelineuser.php:345
+#: actions/apitimelineuser.php:346
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr "Nie można obsłużyć typu obiektu działania \"%s\"."
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
 #. TRANS: %d is the notice ID (number).
-#: actions/apitimelineuser.php:379
+#: actions/apitimelineuser.php:380
 #, php-format
 msgid "No content for notice %d."
 msgstr "Brak zawartości dla wpisu %d."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#. TRANS: %s is the notice URI.
 #: actions/apitimelineuser.php:408
 #, php-format
 msgid "Notice with URI \"%s\" already exists."
@@ -1276,10 +1268,9 @@ msgstr "Nie odnaleziono strony."
 
 #. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
 #. TRANS: Client exception.
-#. TRANS: Client error displayed trying to subscribe to a non-existing profile.
 #: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
 #: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
-#: actions/subscribe.php:110
+#: actions/subscribe.php:107
 msgid "No such profile."
 msgstr "Nie ma takiego profilu."
 
@@ -1404,7 +1395,7 @@ msgstr "Nie można usunąć ulubionego wpisu innej osoby."
 #: actions/joingroup.php:95 actions/leavegroup.php:82
 #: actions/leavegroup.php:95 actions/makeadmin.php:86
 #: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:380
+#: lib/command.php:392
 msgid "No such group."
 msgstr "Nie ma takiej grupy."
 
@@ -1414,7 +1405,7 @@ msgid "Not a member."
 msgstr "Nie jest członkiem."
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
-#: actions/atompubshowmembership.php:150
+#: actions/atompubshowmembership.php:151
 msgid "Cannot delete someone else's membership."
 msgstr "Nie można usunąć członkostwa innej osoby."
 
@@ -1517,11 +1508,9 @@ msgstr "Można wysłać osobisty awatar. Maksymalny rozmiar pliku to %s."
 
 #. TRANS: Server error displayed in avatar upload page when no matching profile can be found for a user.
 #. TRANS: Server error displayed coming across a request from a user without a profile.
-#. TRANS: Server error displayed when trying to authorise a remote subscription request
-#. TRANS: while the user has no profile.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
 #: actions/grouplogo.php:184 actions/remotesubscribe.php:190
-#: actions/userauthorization.php:75 actions/userrss.php:108
+#: actions/userauthorization.php:72 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr "Użytkownik bez odpowiadającego profilu."
 
@@ -1576,10 +1565,10 @@ msgstr "Przytnij"
 msgid "No file uploaded."
 msgstr "Nie wysłano pliku."
 
-#. TRANS: Avatar upload form instruction after uploading a file.
+#. TRANS: Avatar upload form unstruction after uploading a file.
 #: actions/avatarsettings.php:345
 #, fuzzy
-msgid "Pick a square area of the image to be your avatar."
+msgid "Pick a square area of the image to be your avatar"
 msgstr "Wybierz kwadratowy obszar obrazu do awatara"
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
@@ -1621,7 +1610,7 @@ msgid "You may not backup your account."
 msgstr "Użytkownik nie może wykonać kopii zapasowej konta."
 
 #. TRANS: Information displayed on the backup account page.
-#: actions/backupaccount.php:225
+#: actions/backupaccount.php:227
 msgid ""
 "You can backup your account data in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format. This is an experimental feature and provides "
@@ -1637,15 +1626,15 @@ msgstr ""
 "bezpośrednie wiadomości."
 
 #. TRANS: Submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:248
+#: actions/backupaccount.php:250
 msgctxt "BUTTON"
 msgid "Backup"
 msgstr "Kopia zapasowa"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:252
+#: actions/backupaccount.php:254
 #, fuzzy
-msgid "Backup your account."
+msgid "Backup your account"
 msgstr "Wykonuje kopię zapasową konta"
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
@@ -1687,7 +1676,7 @@ msgstr "Nie"
 #. TRANS: Submit button title for 'No' when blocking a user.
 #: actions/block.php:158
 #, fuzzy
-msgid "Do not block this user."
+msgid "Do not block this user"
 msgstr "Nie blokuj tego użytkownika"
 
 #. TRANS: Button label on the user block form.
@@ -1704,9 +1693,9 @@ msgid "Yes"
 msgstr "Tak"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:165
-#, fuzzy
-msgid "Block this user."
+#. TRANS: Description of the form to block a user.
+#: actions/block.php:165 lib/blockform.php:79
+msgid "Block this user"
 msgstr "Zablokuj tego użytkownika"
 
 #. TRANS: Server error displayed when blocking a user fails.
@@ -1868,7 +1857,7 @@ msgstr ""
 #. TRANS: Field label for delete account confirmation entry.
 #. TRANS: Field label for password reset form where the password has to be typed again.
 #: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:262 actions/register.php:426
+#: actions/recoverpassword.php:262 actions/register.php:440
 msgid "Confirm"
 msgstr "Potwierdź"
 
@@ -1897,14 +1886,14 @@ msgstr "Nie odnaleziono aplikacji."
 #. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
 #: actions/deleteapplication.php:79 actions/editapplication.php:78
-#: actions/showapplication.php:90
+#: actions/showapplication.php:94
 msgid "You are not the owner of this application."
 msgstr "Nie jesteś właścicielem tej aplikacji."
 
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
-#: actions/newapplication.php:112 actions/showapplication.php:113
-#: lib/action.php:1422
+#: actions/newapplication.php:112 actions/showapplication.php:118
+#: lib/action.php:1425
 msgid "There was a problem with your session token."
 msgstr "Wystąpił problem z tokenem sesji."
 
@@ -1927,13 +1916,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting an application.
 #: actions/deleteapplication.php:161
 #, fuzzy
-msgid "Do not delete this application."
+msgid "Do not delete this application"
 msgstr "Nie usuwaj tej aplikacji"
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
 #: actions/deleteapplication.php:167
 #, fuzzy
-msgid "Delete this application."
+msgid "Delete this application"
 msgstr "Usuń tę aplikację"
 
 #. TRANS: Client error when trying to delete group while not logged in.
@@ -1988,13 +1977,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting a group.
 #: actions/deletegroup.php:224
 #, fuzzy
-msgid "Do not delete this group."
+msgid "Do not delete this group"
 msgstr "Nie usuwaj tej grupy"
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
 #: actions/deletegroup.php:231
 #, fuzzy
-msgid "Delete this group."
+msgid "Delete this group"
 msgstr "Usuń tę grupę"
 
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
@@ -2002,15 +1991,13 @@ msgstr "Usuń tę grupę"
 #. TRANS: Client error displayed when trying to mark a notice as favorite without being logged in.
 #. TRANS: Client error displayed trying to block a user from a group while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
-#. TRANS: Client error displayed trying to log out when not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
-#. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
 #. TRANS: Client error displayed when trying to change user options while not logged in.
 #: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
-#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:70
+#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
-#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:98
+#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
 #: lib/adminpanelaction.php:71 lib/profileformaction.php:63
 #: lib/settingsaction.php:72
@@ -2040,13 +2027,12 @@ msgstr "Jesteś pewien, że chcesz usunąć ten wpis?"
 #. TRANS: Submit button title for 'No' when deleting a notice.
 #: actions/deletenotice.php:159
 #, fuzzy
-msgid "Do not delete this notice."
+msgid "Do not delete this notice"
 msgstr "Nie usuwaj tego wpisu"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:166
-#, fuzzy
-msgid "Delete this notice."
+#: actions/deletenotice.php:166 lib/noticelist.php:673
+msgid "Delete this notice"
 msgstr "Usuń ten wpis"
 
 #. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
@@ -2082,13 +2068,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting a user.
 #: actions/deleteuser.php:158
 #, fuzzy
-msgid "Do not delete this user."
+msgid "Do not delete this user"
 msgstr "Nie usuwaj tego użytkownika"
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
-#: actions/deleteuser.php:165
-#, fuzzy
-msgid "Delete this user."
+#. TRANS: Description of form for deleting a user.
+#: actions/deleteuser.php:165 lib/deleteuserform.php:75
+msgid "Delete this user"
 msgstr "Usuń tego użytkownika"
 
 #. TRANS: Message used as title for design settings for the site.
@@ -2250,21 +2236,21 @@ msgid "Use defaults"
 msgstr "Użyj domyślne"
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:720
-#, fuzzy
-msgid "Restore default designs."
+#. TRANS: Title for button on profile design page to reset all colour settings to default.
+#: actions/designadminpanel.php:720 lib/designsettings.php:259
+msgid "Restore default designs"
 msgstr "Przywróć domyślny wygląd"
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:728
-#, fuzzy
-msgid "Reset back to default."
+#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
+#: actions/designadminpanel.php:728 lib/designsettings.php:267
+msgid "Reset back to default"
 msgstr "Przywróć domyślne ustawienia"
 
 #. TRANS: Title for button for saving theme settings.
-#: actions/designadminpanel.php:736
-#, fuzzy
-msgid "Save design."
+#. TRANS: Title for button on profile design page to save settings.
+#: actions/designadminpanel.php:736 lib/designsettings.php:272
+msgid "Save design"
 msgstr "Zapisz wygląd"
 
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
@@ -2296,7 +2282,7 @@ msgid "You must be logged in to edit an application."
 msgstr "Musisz być zalogowany, aby zmodyfikować aplikację."
 
 #. TRANS: Client error displayed trying to edit an application that does not exist.
-#: actions/editapplication.php:83 actions/showapplication.php:83
+#: actions/editapplication.php:83 actions/showapplication.php:87
 msgid "No such application."
 msgstr "Nie ma takiej aplikacji."
 
@@ -2578,7 +2564,7 @@ msgid "Cannot normalize that email address."
 msgstr "Nie można znormalizować tego adresu e-mail"
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:393 actions/register.php:204
+#: actions/emailsettings.php:393 actions/register.php:212
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "To nie jest prawidłowy adres e-mail."
@@ -2653,21 +2639,18 @@ msgstr "Brak przychodzącego adresu e-mail."
 
 #. 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.
 #: actions/emailsettings.php:530 actions/emailsettings.php:554
-#: actions/smssettings.php:566 actions/smssettings.php:591
+#: actions/smssettings.php:565 actions/smssettings.php:588
 msgid "Could not update user record."
 msgstr "Nie można zaktualizować wpisu użytkownika."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
-#. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:534 actions/smssettings.php:570
+#: actions/emailsettings.php:534 actions/smssettings.php:568
 msgid "Incoming email address removed."
 msgstr "Usunięto przychodzący adres e-mail."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
-#. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:558 actions/smssettings.php:595
+#: actions/emailsettings.php:558 actions/smssettings.php:591
 msgid "New incoming email address added."
 msgstr "Dodano nowy przychodzący adres e-mail."
 
@@ -2679,7 +2662,7 @@ msgstr "Ten wpis jest już ulubiony."
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
 #: actions/favor.php:95
 #, fuzzy
-msgid "Disfavor favorite."
+msgid "Disfavor favorite"
 msgstr "Usuń wpis z ulubionych"
 
 #. TRANS: Page title for first page of favorited notices.
@@ -2921,13 +2904,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
 #: actions/groupblock.php:191
 #, fuzzy
-msgid "Do not block this user from this group."
+msgid "Do not block this user from this group"
 msgstr "Nie blokuj tego użytkownika w tej grupie"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
 #: actions/groupblock.php:198
 #, fuzzy
-msgid "Block this user from this group."
+msgid "Block this user from this group"
 msgstr "Zablokuj tego użytkownika w tej grupie"
 
 #. TRANS: Server error displayed when trying to block a user from a group fails because of an application error.
@@ -2936,7 +2919,6 @@ msgid "Database error blocking user from group."
 msgstr "Błąd bazy danych podczas blokowania użytkownika w grupie."
 
 #. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
-#. TRANS: Client error displayed trying to find a user by ID without providing an ID.
 #: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr "Brak identyfikatora."
@@ -3121,10 +3103,8 @@ msgid "Group search"
 msgstr "Wyszukaj grupę"
 
 #. TRANS: Text on page where groups can be searched if no results were found for a query.
-#. TRANS: Text for notice search results is the query had no results.
-#. TRANS: Message on the "People search" page where a query has no results.
-#: actions/groupsearch.php:82 actions/noticesearch.php:122
-#: actions/peoplesearch.php:87
+#: actions/groupsearch.php:82 actions/noticesearch.php:117
+#: actions/peoplesearch.php:83
 msgid "No results."
 msgstr "Brak wyników."
 
@@ -3161,7 +3141,6 @@ msgid "User is not blocked from group."
 msgstr "Użytkownik nie został zablokowany w grupie."
 
 #. TRANS: Server error displayed when unblocking a user from a group fails because of an unknown error.
-#. TRANS: Server error displayed when removing a user block.
 #: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "Błąd podczas usuwania blokady."
@@ -3257,8 +3236,7 @@ msgid "Publish a MicroID for my Jabber/Google Talk address."
 msgstr "Opublikuj MicroID adresu Jabber/GTalk."
 
 #. TRANS: Confirmation message for successful Instant Messaging preferences save.
-#. TRANS: Confirmation message after saving preferences.
-#: actions/imsettings.php:283 actions/othersettings.php:193
+#: actions/imsettings.php:283 actions/othersettings.php:192
 msgid "Preferences saved."
 msgstr "Zapisano preferencje."
 
@@ -3554,7 +3532,7 @@ msgstr "Musisz być zalogowany, aby opuścić grupę."
 
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
-#: actions/leavegroup.php:103 lib/command.php:386
+#: actions/leavegroup.php:103 lib/command.php:398
 msgid "You are not a member of that group."
 msgstr "Nie jesteś członkiem tej grupy."
 
@@ -3678,43 +3656,41 @@ msgstr "Zapisz"
 msgid "Save license settings"
 msgstr "Zapisz ustawienia licencji"
 
-#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
-#: actions/login.php:97 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
 msgid "Already logged in."
 msgstr "Jesteś już zalogowany."
 
-#: actions/login.php:142
+#: actions/login.php:148
 msgid "Incorrect username or password."
 msgstr "Niepoprawna nazwa użytkownika lub hasło."
 
-#. TRANS: Server error displayed when a user object could not be created trying to login using "one time password login".
-#: actions/login.php:148 actions/otp.php:127
+#: actions/login.php:154 actions/otp.php:120
 msgid "Error setting user. You are probably not authorized."
 msgstr "Błąd podczas ustawiania użytkownika. Prawdopodobnie brak upoważnienia."
 
-#: actions/login.php:202 actions/login.php:253
+#: actions/login.php:210 actions/login.php:263
 msgid "Login"
 msgstr "Zaloguj się"
 
-#: actions/login.php:239
+#: actions/login.php:249
 msgid "Login to site"
 msgstr "Zaloguj się na witrynie"
 
-#: actions/login.php:248 actions/register.php:476
+#: actions/login.php:258 actions/register.php:490
 msgid "Remember me"
 msgstr "Zapamiętaj mnie"
 
-#: actions/login.php:249 actions/register.php:478
+#: actions/login.php:259 actions/register.php:492
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 "Automatyczne logowanie. Nie należy używać na komputerach używanych przez "
 "wiele osób."
 
-#: actions/login.php:259
+#: actions/login.php:269
 msgid "Lost or forgotten password?"
 msgstr "Zgubione lub zapomniane hasło?"
 
-#: actions/login.php:277
+#: actions/login.php:288
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -3722,11 +3698,11 @@ msgstr ""
 "Z powodów bezpieczeństwa ponownie podaj nazwę użytkownika i hasło przed "
 "zmienianiem ustawień."
 
-#: actions/login.php:281
+#: actions/login.php:292
 msgid "Login with your username and password."
 msgstr "Logowanie za pomocą nazwy użytkownika i hasła."
 
-#: actions/login.php:284
+#: actions/login.php:295
 #, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -3807,14 +3783,14 @@ msgid "New message"
 msgstr "Nowa wiadomość"
 
 #. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
-#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:501
+#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:513
 msgid "You can't send a message to this user."
 msgstr "Nie można wysłać wiadomości do tego użytkownika."
 
 #. TRANS: Command exception text shown when trying to send a direct message to another user without content.
 #. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
-#: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:478
-#: lib/command.php:581
+#: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:490
+#: lib/command.php:593
 msgid "No content!"
 msgstr "Brak treści."
 
@@ -3823,7 +3799,7 @@ msgid "No recipient specified."
 msgstr "Nie podano odbiorcy."
 
 #. TRANS: Error text shown when trying to send a direct message to self.
-#: actions/newmessage.php:167 lib/command.php:505
+#: actions/newmessage.php:167 lib/command.php:517
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr "Nie wysyłaj wiadomości do siebie, po prostu powiedz to sobie po cichu."
@@ -3834,7 +3810,7 @@ msgstr "Wysłano wiadomość"
 
 #. TRANS: Message given have sent a direct message to another user.
 #. TRANS: %s is the name of the other user.
-#: actions/newmessage.php:188 lib/command.php:513
+#: actions/newmessage.php:188 lib/command.php:525
 #, php-format
 msgid "Direct message to %s sent."
 msgstr "Wysłano bezpośrednią wiadomość do użytkownika %s."
@@ -3851,9 +3827,7 @@ msgstr "Nowy wpis"
 msgid "Notice posted"
 msgstr "Wysłano wpis"
 
-#. TRANS: Instructions for Notice search page.
-#. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/noticesearch.php:69
+#: actions/noticesearch.php:68
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -3862,21 +3836,16 @@ msgstr ""
 "Wyszukaj wpisy na %%site.name%% według ich treści. Oddziel wyszukiwane "
 "terminy spacjami. Terminy muszą mieć trzy znaki lub więcej."
 
-#. TRANS: Title of the page where users can search for notices.
-#: actions/noticesearch.php:80
+#: actions/noticesearch.php:78
 msgid "Text search"
 msgstr "Wyszukiwanie tekstu"
 
-#. TRANS: Test in RSS notice search.
-#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearch.php:95
+#: actions/noticesearch.php:91
 #, php-format
 msgid "Search results for \"%1$s\" on %2$s"
 msgstr "Wyniki wyszukiwania dla \"%1$s\" na %2$s"
 
-#. TRANS: Text for logged in users making a query for notices without results.
-#. TRANS: This message contains a Markdown link.
-#: actions/noticesearch.php:128
+#: actions/noticesearch.php:121
 #, php-format
 msgid ""
 "Be the first to [post on this topic](%%%%action.newnotice%%%%?"
@@ -3885,9 +3854,7 @@ msgstr ""
 "Zostań pierwszym, który [wyśle coś na ten temat](%%%%action.newnotice%%%%?"
 "status_textarea=%s)."
 
-#. TRANS: Text for not logged in users making a query for notices without results.
-#. TRANS: This message contains Markdown links.
-#: actions/noticesearch.php:133
+#: actions/noticesearch.php:124
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and be the first to "
@@ -3897,17 +3864,14 @@ msgstr ""
 "pierwszym, który [wyśle coś na ten temat](%%%%action.newnotice%%%%?"
 "status_textarea=%s)."
 
-#. TRANS: RSS notice search feed title. %s is the query.
-#: actions/noticesearchrss.php:95
+#: actions/noticesearchrss.php:96
 #, php-format
 msgid "Updates with \"%s\""
 msgstr "Aktualizacje z \"%s\""
 
-#. TRANS: RSS notice search feed description.
-#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearchrss.php:99
+#: actions/noticesearchrss.php:98
 #, fuzzy, php-format
-msgid "Updates matching search term \"%1$s\" on %2$s."
+msgid "Updates matching search term \"%1$s\" on %2$s!"
 msgstr "Aktualizacje pasujące do wyszukiwanego terminu \"%1$s\" na %2$s."
 
 #: actions/nudge.php:85
@@ -3948,30 +3912,30 @@ msgid "You have not registered any applications yet."
 msgstr "Nie zarejestrowano jeszcze żadnych aplikacji."
 
 #. TRANS: Title for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:70
+#: actions/oauthconnectionssettings.php:71
 msgid "Connected applications"
 msgstr "Połączone aplikacje"
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:81
+#: actions/oauthconnectionssettings.php:83
 msgid "The following connections exist for your account."
 msgstr "Istnieją następujące połączenia dla konta."
 
 #. TRANS: Client error when trying to revoke access for an application while not being a user of it.
-#: actions/oauthconnectionssettings.php:166
+#: actions/oauthconnectionssettings.php:168
 msgid "You are not a user of that application."
 msgstr "Nie jesteś użytkownikiem tej aplikacji."
 
 #. TRANS: Client error when revoking access has failed for some reason.
 #. TRANS: %s is the application ID revoking access failed for.
-#: actions/oauthconnectionssettings.php:181
+#: actions/oauthconnectionssettings.php:183
 #, php-format
 msgid "Unable to revoke access for application: %s."
 msgstr "Nie można unieważnić dostępu dla aplikacji: %s."
 
 #. TRANS: Success message after revoking access for an application.
 #. TRANS: %1$s is the application name, %2$s is the first part of the user token.
-#: actions/oauthconnectionssettings.php:200
+#: actions/oauthconnectionssettings.php:202
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -3981,14 +3945,14 @@ msgstr ""
 "$s."
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:211
+#: actions/oauthconnectionssettings.php:213
 msgid "You have not authorized any applications to use your account."
 msgstr "Nie upoważniono żadnych aplikacji do używania konta."
 
 #. TRANS: Note for developers in the OAuth connection settings form.
 #. TRANS: This message contains a Markdown link. Do not separate "](".
 #. TRANS: %s is the URL to the OAuth settings.
-#: actions/oauthconnectionssettings.php:231
+#: actions/oauthconnectionssettings.php:233
 #, php-format
 msgid ""
 "Are you a developer? [Register an OAuth client application](%s) to use with "
@@ -3997,16 +3961,6 @@ msgstr ""
 "Jesteś programistą? [Zarejestruj aplikację kliencką OAuth](%s) do użycia z "
 "tą witryną StatusNet."
 
-#: actions/oembed.php:64
-#, fuzzy, php-format
-msgid "\"%s\" not found."
-msgstr "Nie odnaleziono strony."
-
-#: actions/oembed.php:76
-#, fuzzy, php-format
-msgid "Notice %s not found."
-msgstr "Nie odnaleziono wpisu nadrzędnego."
-
 #: actions/oembed.php:80 actions/shownotice.php:100
 msgid "Notice has no profile."
 msgstr "Wpis nie posiada profilu."
@@ -4016,16 +3970,6 @@ msgstr "Wpis nie posiada profilu."
 msgid "%1$s's status on %2$s"
 msgstr "Stan użytkownika %1$s na %2$s"
 
-#: actions/oembed.php:95
-#, fuzzy, php-format
-msgid "Attachment %s not found."
-msgstr "Nie odnaleziono odbiorcy."
-
-#: actions/oembed.php:136
-#, php-format
-msgid "\"%s\" not supported for oembed requests."
-msgstr ""
-
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
 #: actions/oembed.php:168
 #, php-format
@@ -4044,12 +3988,11 @@ msgstr "Dozwolone są tylko adresy URL %s przez zwykły protokół HTTP."
 msgid "Not a supported data format."
 msgstr "To nie jest obsługiwany format danych."
 
-#. TRANS: ShortName in the OpenSearch interface when trying to find users.
 #: actions/opensearch.php:64
 msgid "People Search"
 msgstr "Wyszukiwanie osób"
 
-#: actions/opensearch.php:68
+#: actions/opensearch.php:67
 msgid "Notice Search"
 msgstr "Wyszukiwanie wpisów"
 
@@ -4096,46 +4039,37 @@ msgstr "Wyświetl lub ukryj ustawienia wyglądu profilu."
 msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr "Adres URL usługi skracania jest za długi (maksymalnie 50 znaków)."
 
-#. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
-#: actions/otp.php:70
+#: actions/otp.php:69
 msgid "No user ID specified."
 msgstr "Nie podano identyfikatora użytkownika."
 
-#. TRANS: Client error displayed trying to use "one time password login" without specifying a login token.
-#: actions/otp.php:86
+#: actions/otp.php:83
 msgid "No login token specified."
 msgstr "Nie podano tokenu logowania."
 
-#. TRANS: Client error displayed trying to use "one time password login" without requesting a login token.
-#: actions/otp.php:94
+#: actions/otp.php:90
 msgid "No login token requested."
 msgstr "Nie zażądano tokenu logowania."
 
-#. TRANS: Client error displayed trying to use "one time password login" while specifying an invalid login token.
-#: actions/otp.php:100
+#: actions/otp.php:95
 msgid "Invalid login token specified."
 msgstr "Podano nieprawidłowy token logowania."
 
-#. TRANS: Client error displayed trying to use "one time password login" while specifying an expired login token.
-#: actions/otp.php:110
+#: actions/otp.php:104
 msgid "Login token expired."
 msgstr "Token logowania wygasł."
 
-#. TRANS: Title for outbox for any but the fist page.
-#. TRANS: %1$s is the user nickname, %2$d is the page number.
-#: actions/outbox.php:57
+#: actions/outbox.php:58
 #, php-format
 msgid "Outbox for %1$s - page %2$d"
 msgstr "Wysłane wiadomości użytkownika %1$s - strona %2$d"
 
-#. TRANS: Title for first page of outbox.
 #: actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
 msgstr "Wysłane wiadomości użytkownika %s"
 
-#. TRANS: Instructions for outbox.
-#: actions/outbox.php:103
+#: actions/outbox.php:104
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr "To są wiadomości wysłane, czyli prywatne wiadomości, które wysłałeś."
 
@@ -4161,42 +4095,43 @@ msgstr "Poprzednie hasło"
 msgid "New password"
 msgstr "Nowe hasło"
 
-#: actions/passwordsettings.php:109 actions/register.php:423
-msgid "6 or more characters."
+#: actions/passwordsettings.php:109
+#, fuzzy
+msgid "6 or more characters"
 msgstr "6 lub więcej znaków."
 
-#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:264
-#: actions/register.php:427
-msgid "Same as password above."
+#: actions/passwordsettings.php:113
+#, fuzzy
+msgid "Same as password above"
 msgstr "Takie samo jak powyższe hasło."
 
 #: actions/passwordsettings.php:117
 msgid "Change"
 msgstr "Zmień"
 
-#: actions/passwordsettings.php:153 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:238
 msgid "Password must be 6 or more characters."
 msgstr "Hasło musi mieć sześć lub więcej znaków."
 
-#: actions/passwordsettings.php:156 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:241
 msgid "Passwords don't match."
 msgstr "Hasła nie pasują do siebie."
 
-#: actions/passwordsettings.php:164
+#: actions/passwordsettings.php:165
 msgid "Incorrect old password"
 msgstr "Niepoprawne poprzednie hasło"
 
-#: actions/passwordsettings.php:180
+#: actions/passwordsettings.php:181
 msgid "Error saving user; invalid."
 msgstr "Błąd podczas zapisywania użytkownika; nieprawidłowy."
 
-#. TRANS: Reset password form validation error message.
-#: actions/passwordsettings.php:185 actions/recoverpassword.php:418
-msgid "Cannot save new password."
+#: actions/passwordsettings.php:186
+#, fuzzy
+msgid "Can't save new password."
 msgstr "Nie można zapisać nowego hasła."
 
-#: actions/passwordsettings.php:191
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
 msgid "Password saved."
 msgstr "Zapisano hasło."
 
@@ -4472,9 +4407,7 @@ msgstr "Serwer do przekierowywania żądań SSL."
 msgid "Save paths"
 msgstr "Ścieżki zapisu"
 
-#. TRANS: Instructions for the "People search" page.
-#. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/peoplesearch.php:54
+#: actions/peoplesearch.php:52
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
@@ -4484,8 +4417,7 @@ msgstr ""
 "zainteresowań. Oddziel wyszukiwane terminy spacjami. Terminy muszą mieć trzy "
 "znaki lub więcej."
 
-#. TRANS: Title of a page where users can search for other users.
-#: actions/peoplesearch.php:61
+#: actions/peoplesearch.php:58
 msgid "People search"
 msgstr "Wyszukiwanie osób"
 
@@ -4527,14 +4459,14 @@ msgid "Profile information"
 msgstr "Informacje o profilu"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109 actions/register.php:419
+#: actions/profilesettings.php:109 actions/register.php:433
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr "1-64 małe litery lub liczby, bez spacji i znaków przestankowych."
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for full group name (dt). Text hidden by default.
 #. TRANS: DT for full name in a profile.
-#: actions/profilesettings.php:113 actions/register.php:441
+#: actions/profilesettings.php:113 actions/register.php:455
 #: actions/showgroup.php:255 actions/tagother.php:104
 #: lib/groupeditform.php:150 lib/userprofile.php:156
 msgid "Full name"
@@ -4542,20 +4474,20 @@ msgstr "Imię i nazwisko"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:118 actions/register.php:446
+#: actions/profilesettings.php:118 actions/register.php:460
 #: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "Strona domowa"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:121 actions/register.php:448
+#: actions/profilesettings.php:121
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr "Adres URL strony domowej, bloga lub profilu na innej witrynie."
 
 #. TRANS: Tooltip for field label in form for profile settings. Plural
 #. TRANS: is decided by the number of characters available for the
 #. TRANS: biography (%d).
-#: actions/profilesettings.php:129 actions/register.php:457
+#: actions/profilesettings.php:129 actions/register.php:471
 #, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4564,29 +4496,28 @@ msgstr[1] "Opisz siebie i swoje zainteresowania w %d znakach"
 msgstr[2] "Opisz siebie i swoje zainteresowania w %d znakach"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:135 actions/register.php:462
+#: actions/profilesettings.php:135 actions/register.php:476
 msgid "Describe yourself and your interests"
 msgstr "Opisz się i swoje zainteresowania"
 
 #. TRANS: Text area label in form for profile settings where users can provide.
 #. TRANS: their biography.
-#: actions/profilesettings.php:139 actions/register.php:464
+#: actions/profilesettings.php:139 actions/register.php:478
 msgid "Bio"
 msgstr "O mnie"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group location (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT for location in a profile.
-#: actions/profilesettings.php:145 actions/register.php:469
+#: actions/profilesettings.php:145 actions/register.php:483
 #: actions/showgroup.php:265 actions/tagother.php:112
-#: actions/userauthorization.php:174 lib/groupeditform.php:173
+#: actions/userauthorization.php:166 lib/groupeditform.php:173
 #: lib/userprofile.php:172
 msgid "Location"
 msgstr "Położenie"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148
+#: actions/profilesettings.php:148 actions/register.php:485
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Gdzie jesteś, np. \"miasto, województwo (lub region), kraj\""
 
@@ -4607,8 +4538,7 @@ msgstr "Znaczniki"
 #: actions/profilesettings.php:164
 #, fuzzy
 msgid ""
-"Tags for yourself (letters, numbers, -, ., and _), comma- or space- "
-"separated."
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr ""
 "Znaczniki dla siebie (litery, liczby, -, . i _), oddzielone przecinkami lub "
 "spacjami"
@@ -4621,7 +4551,7 @@ msgstr "Język"
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
 #: actions/profilesettings.php:171
 #, fuzzy
-msgid "Preferred language."
+msgid "Preferred language"
 msgstr "Preferowany język"
 
 #. TRANS: Dropdownlist label in form for profile settings.
@@ -4638,14 +4568,14 @@ msgstr "W jakiej strefie czasowej zwykle się znajdujesz?"
 #: actions/profilesettings.php:189
 #, fuzzy
 msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)."
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr ""
 "Automatycznie subskrybuj każdego, kto mnie subskrybuje (najlepsze dla botów)"
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Plural form is used based on the maximum number of allowed
 #. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:258 actions/register.php:221
+#: actions/profilesettings.php:258 actions/register.php:229
 #, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4665,9 +4595,9 @@ msgstr "Język jest za długi (maksymalnie 50 znaków)."
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:291
-#, fuzzy, php-format
-msgid "Invalid tag: \"%s\"."
+#: actions/profilesettings.php:291 actions/tagother.php:178
+#, php-format
+msgid "Invalid tag: \"%s\""
 msgstr "Nieprawidłowy znacznik: \"%s\""
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
@@ -4772,12 +4702,6 @@ msgstr ""
 "To jest %%site.name%%, usługa [mikroblogowania](http://pl.wikipedia.org/wiki/"
 "Mikroblog) oparta na wolnym narzędziu [StatusNet](http://status.net/)."
 
-#. TRANS: Public RSS feed description. %s is the StatusNet site name.
-#: actions/publicrss.php:106
-#, fuzzy, php-format
-msgid "%s updates from everyone."
-msgstr "Użytkownik %s aktualizuje od każdego."
-
 #. TRANS: Title for public tag cloud.
 #: actions/publictagcloud.php:57
 msgid "Public tag cloud"
@@ -4913,12 +4837,6 @@ msgstr "Przywróć hasło"
 msgid "Password recovery requested"
 msgstr "Zażądano przywracania hasła"
 
-#. TRANS: Title for password recovery page in password saved mode.
-#: actions/recoverpassword.php:229
-#, fuzzy
-msgid "Password saved"
-msgstr "Zapisano hasło."
-
 #. TRANS: Title for password recovery page when an unknown action has been specified.
 #: actions/recoverpassword.php:232
 msgid "Unknown action"
@@ -4929,6 +4847,11 @@ msgstr "Nieznane działanie"
 msgid "6 or more characters, and do not forget it!"
 msgstr "6 lub więcej znaków, i nie zapomnij go."
 
+#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#: actions/recoverpassword.php:264 actions/register.php:441
+msgid "Same as password above."
+msgstr "Takie samo jak powyższe hasło."
+
 #. TRANS: Button text for password reset form.
 #. TRANS: Button text on profile design page to reset all colour settings to default without saving.
 #: actions/recoverpassword.php:268 lib/designsettings.php:264
@@ -4980,8 +4903,13 @@ msgstr "Hasło musi mieć sześć lub więcej znaków."
 msgid "Password and confirmation do not match."
 msgstr "Hasło i potwierdzenie nie pasują do siebie."
 
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:418
+msgid "Cannot save new password."
+msgstr "Nie można zapisać nowego hasła."
+
 #. TRANS: Server error displayed when something does wrong with the user object during password reset.
-#: actions/recoverpassword.php:426 actions/register.php:248
+#: actions/recoverpassword.php:426 actions/register.php:256
 msgid "Error setting user."
 msgstr "Błąd podczas ustawiania użytkownika."
 
@@ -4990,93 +4918,97 @@ msgstr "Błąd podczas ustawiania użytkownika."
 msgid "New password successfully saved. You are now logged in."
 msgstr "Pomyślnie zapisano nowe hasło. Jesteś teraz zalogowany."
 
-#: actions/register.php:87 actions/register.php:188 actions/register.php:399
+#: actions/register.php:92 actions/register.php:196 actions/register.php:413
 msgid "Sorry, only invited people can register."
 msgstr "Tylko zaproszone osoby mogą się rejestrować."
 
-#: actions/register.php:94
+#: actions/register.php:99
 msgid "Sorry, invalid invitation code."
 msgstr "Nieprawidłowy kod zaproszenia."
 
-#: actions/register.php:113
+#: actions/register.php:119
 msgid "Registration successful"
 msgstr "Rejestracja powiodła się"
 
-#: actions/register.php:115 actions/register.php:497
+#: actions/register.php:121 actions/register.php:511
 msgid "Register"
 msgstr "Zarejestruj się"
 
-#: actions/register.php:135
+#: actions/register.php:142
 msgid "Registration not allowed."
 msgstr "Rejestracja nie jest dozwolona."
 
-#: actions/register.php:201
+#: actions/register.php:209
 #, fuzzy
-msgid "You cannot register if you don't agree to the license."
+msgid "You can't register if you don't agree to the license."
 msgstr ""
 "Nie można się zarejestrować, jeśli nie zgadzasz się z warunkami licencji."
 
-#: actions/register.php:210
+#: actions/register.php:218
 msgid "Email address already exists."
 msgstr "Adres e-mail już istnieje."
 
-#: actions/register.php:243 actions/register.php:265
+#: actions/register.php:251 actions/register.php:273
 msgid "Invalid username or password."
 msgstr "Nieprawidłowa nazwa użytkownika lub hasło."
 
-#: actions/register.php:340
+#: actions/register.php:351
 #, fuzzy
 msgid ""
 "With this form you can create a new account. You can then post notices and "
-"link up to friends and colleagues."
+"link up to friends and colleagues. "
 msgstr ""
 "Za pomocą tego formularza można utworzyć nowe konto. Można wtedy wysyłać "
 "wpisy i połączyć się z przyjaciółmi i kolegami. "
 
+#: actions/register.php:437
+msgid "6 or more characters."
+msgstr "6 lub więcej znaków."
+
 #. TRANS: Link description in user account settings menu.
-#: actions/register.php:431 actions/register.php:435
+#: actions/register.php:445 actions/register.php:449
 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
 msgid "Email"
 msgstr "E-mail"
 
-#: actions/register.php:432 actions/register.php:436
+#: actions/register.php:446 actions/register.php:450
 #, fuzzy
-msgid "Used only for updates, announcements, and password recovery."
+msgid "Used only for updates, announcements, and password recovery"
 msgstr "Używane tylko do aktualizacji, ogłoszeń i przywracania hasła"
 
-#: actions/register.php:443
+#: actions/register.php:457
 #, fuzzy
-msgid "Longer name, preferably your \"real\" name."
+msgid "Longer name, preferably your \"real\" name"
 msgstr "Dłuższa nazwa, najlepiej twoje \"prawdziwe\" imię i nazwisko"
 
-#: actions/register.php:471
+#: actions/register.php:462
 #, fuzzy
-msgid "Where you are, like \"City, State (or Region), Country\"."
-msgstr "Gdzie jesteś, np. \"miasto, województwo (lub region), kraj\""
+msgid "URL of your homepage, blog, or profile on another site"
+msgstr "Adres URL strony domowej, bloga lub profilu na innej witrynie."
 
-#: actions/register.php:510
+#: actions/register.php:523
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
 msgstr "Rozumiem, że treść i dane %1$s są prywatne i poufne."
 
-#: actions/register.php:520
+#: actions/register.php:533
 #, php-format
 msgid "My text and files are copyright by %1$s."
 msgstr "Moje teksty i pliki są objęte prawami autorskimi %1$s."
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:524
+#: actions/register.php:537
 msgid "My text and files remain under my own copyright."
 msgstr "Moje teksty i pliki pozostają pod moimi prawami autorskimi."
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:527
+#: actions/register.php:540
 msgid "All rights reserved."
 msgstr "Wszystkie prawa zastrzeżone."
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:532
+#: actions/register.php:545
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -5085,7 +5017,7 @@ msgstr ""
 "Tekst i pliki są dostępne na warunkach licencji %s, poza tymi prywatnymi "
 "danymi: hasło, adres e-mail, adres komunikatora i numer telefonu."
 
-#: actions/register.php:573
+#: actions/register.php:588
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -5118,7 +5050,7 @@ msgstr ""
 "Dziękujemy za zarejestrowanie się i mamy nadzieję, że używanie tej usługi "
 "sprawi ci przyjemność."
 
-#: actions/register.php:597
+#: actions/register.php:612
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5152,7 +5084,7 @@ msgstr "Pseudonim użytkownika"
 
 #: actions/remotesubscribe.php:129
 #, fuzzy
-msgid "Nickname of the user you want to follow."
+msgid "Nickname of the user you want to follow"
 msgstr "Pseudonim użytkownika którego chcesz obserwować"
 
 #: actions/remotesubscribe.php:132
@@ -5161,7 +5093,7 @@ msgstr "Adres URL profilu"
 
 #: actions/remotesubscribe.php:133
 #, fuzzy
-msgid "URL of your profile on another compatible microblogging service."
+msgid "URL of your profile on another compatible microblogging service"
 msgstr "Adres URL profilu na innej, zgodnej usłudze mikroblogowania"
 
 #. TRANS: Link text for link that will subscribe to a remote profile.
@@ -5172,7 +5104,7 @@ msgstr "Subskrybuj"
 
 #: actions/remotesubscribe.php:158
 #, fuzzy
-msgid "Invalid profile URL (bad format)."
+msgid "Invalid profile URL (bad format)"
 msgstr "Nieprawidłowy adres URL profilu (błędny format)"
 
 #: actions/remotesubscribe.php:167
@@ -5213,7 +5145,6 @@ msgstr "Powtórzono"
 msgid "Repeated!"
 msgstr "Powtórzono."
 
-#. TRANS: RSS reply feed title. %s is a user nickname.
 #. TRANS: Tooltip for personal group navigation menu option when logged in for viewing @-replies.
 #: actions/replies.php:126 actions/repliesrss.php:68
 #: lib/personalgroupnav.php:109
@@ -5268,11 +5199,9 @@ msgstr ""
 "Można spróbować [szturchnąć użytkownika %1$s](../%2$s) lub [wysłać mu coś](%%"
 "%%action.newnotice%%%%?status_textarea=%3$s)."
 
-#. TRANS: RSS reply feed description.
-#. TRANS: %1$s is a user nickname, %2$s is the StatusNet site name.
-#: actions/repliesrss.php:74
+#: actions/repliesrss.php:72
 #, fuzzy, php-format
-msgid "Replies to %1$s on %2$s."
+msgid "Replies to %1$s on %2$s!"
 msgstr "odpowiedzi dla użytkownika %1$s na %2$s."
 
 #. TRANS: Client exception displayed when trying to restore an account while not logged in.
@@ -5372,7 +5301,7 @@ msgstr "Nie można unieważnić rol użytkowników na tej witrynie."
 msgid "User doesn't have this role."
 msgstr "Użytkownik nie ma tej roli."
 
-#: actions/rsd.php:142 actions/version.php:159
+#: actions/rsd.php:146 actions/version.php:159
 msgid "StatusNet"
 msgstr "StatusNet"
 
@@ -5414,87 +5343,87 @@ msgstr "Włącza wyjście debugowania dla sesji."
 msgid "Save site settings"
 msgstr "Zapisz ustawienia witryny"
 
-#: actions/showapplication.php:78
+#: actions/showapplication.php:82
 msgid "You must be logged in to view an application."
 msgstr "Musisz być zalogowany, aby wyświetlić aplikację."
 
-#: actions/showapplication.php:151
+#: actions/showapplication.php:157
 msgid "Application profile"
 msgstr "Profil aplikacji"
 
 #. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:153 lib/applicationeditform.php:177
+#: actions/showapplication.php:159 lib/applicationeditform.php:177
 msgid "Icon"
 msgstr "Ikona"
 
 #. TRANS: Form input field label for application name.
-#: actions/showapplication.php:163 actions/version.php:197
+#: actions/showapplication.php:169 actions/version.php:197
 #: lib/applicationeditform.php:190
 msgid "Name"
 msgstr "Nazwa"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:172 lib/applicationeditform.php:227
+#: actions/showapplication.php:178 lib/applicationeditform.php:227
 msgid "Organization"
 msgstr "Organizacja"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:181 actions/version.php:200
+#: actions/showapplication.php:187 actions/version.php:200
 #: lib/applicationeditform.php:208 lib/groupeditform.php:168
 msgid "Description"
 msgstr "Opis"
 
 #. TRANS: Header for group statistics on a group page (h2).
 #. TRANS: H2 text for user statistics.
-#: actions/showapplication.php:186 actions/showgroup.php:460
+#: actions/showapplication.php:192 actions/showgroup.php:460
 #: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "Statystyki"
 
-#: actions/showapplication.php:197
+#: actions/showapplication.php:203
 #, php-format
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr "Utworzona przez %1$s - domyślny dostęp: %2$s - %3$d użytkowników"
 
-#: actions/showapplication.php:207
+#: actions/showapplication.php:213
 msgid "Application actions"
 msgstr "Czynności aplikacji"
 
-#: actions/showapplication.php:230
+#: actions/showapplication.php:236
 msgid "Reset key & secret"
 msgstr "Przywrócenie klucza i sekretu"
 
 #. TRANS: Title of form for deleting a user.
-#: actions/showapplication.php:246 lib/deletegroupform.php:121
+#: actions/showapplication.php:252 lib/deletegroupform.php:121
 #: lib/deleteuserform.php:64 lib/noticelist.php:673
 msgid "Delete"
 msgstr "Usuń"
 
-#: actions/showapplication.php:255
+#: actions/showapplication.php:261
 msgid "Application info"
 msgstr "Informacje o aplikacji"
 
-#: actions/showapplication.php:257
+#: actions/showapplication.php:263
 msgid "Consumer key"
 msgstr "Klucz klienta"
 
-#: actions/showapplication.php:262
+#: actions/showapplication.php:268
 msgid "Consumer secret"
 msgstr "Sekret klienta"
 
-#: actions/showapplication.php:267
+#: actions/showapplication.php:273
 msgid "Request token URL"
 msgstr "Adres URL tokenu żądania"
 
-#: actions/showapplication.php:272
+#: actions/showapplication.php:278
 msgid "Access token URL"
 msgstr "Adres URL tokenu żądania"
 
-#: actions/showapplication.php:277
+#: actions/showapplication.php:283
 msgid "Authorize URL"
 msgstr "Adres URL upoważnienia"
 
-#: actions/showapplication.php:282
+#: actions/showapplication.php:288
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
@@ -5502,7 +5431,7 @@ msgstr ""
 "Uwaga: obsługiwane są podpisy HMAC-SHA1. Metoda podpisu w zwykłym tekście "
 "nie jest obsługiwana."
 
-#: actions/showapplication.php:302
+#: actions/showapplication.php:309
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr "Jesteś pewien, że chcesz przywrócić klucz i sekret klienta?"
 
@@ -5595,18 +5524,16 @@ msgid "Group profile"
 msgstr "Profil grupy"
 
 #. TRANS: Label for group URL (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT for URL in a profile.
 #: actions/showgroup.php:273 actions/tagother.php:118
-#: actions/userauthorization.php:184 lib/userprofile.php:186
+#: actions/userauthorization.php:175 lib/userprofile.php:186
 msgid "URL"
 msgstr "Adres URL"
 
 #. TRANS: Label for group description or group note (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page where bio is displayed.
 #. TRANS: DT for note in a profile.
 #: actions/showgroup.php:285 actions/tagother.php:128
-#: actions/userauthorization.php:197 lib/userprofile.php:204
+#: actions/userauthorization.php:187 lib/userprofile.php:204
 msgid "Note"
 msgstr "Wpis"
 
@@ -5752,7 +5679,7 @@ msgid "%1$s tagged %2$s"
 msgstr "%1$s nadał etykietę %2$s"
 
 #. TRANS: Page title showing tagged notices in one user's stream.
-#. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
+#. TRANS: %1$s is the username, %2$s is the hash tag, %1$d is the page number.
 #: actions/showstream.php:74
 #, php-format
 msgid "%1$s tagged %2$s, page %3$d"
@@ -6003,7 +5930,7 @@ msgstr ""
 #. TRANS: Title for button to save site notice in admin panel.
 #: actions/sitenoticeadminpanel.php:201
 #, fuzzy
-msgid "Save site notice."
+msgid "Save site notice"
 msgstr "Zapisz wpis witryny"
 
 #. TRANS: Title for SMS settings.
@@ -6062,7 +5989,7 @@ msgstr "Numer telefonu SMS"
 #. TRANS: SMS phone number input field instructions in SMS settings form.
 #: actions/smssettings.php:152
 #, fuzzy
-msgid "Phone number, no punctuation or spaces, with area code."
+msgid "Phone number, no punctuation or spaces, with area code"
 msgstr "Numer telefonu, bez znaków przestankowych i spacji, z kodem państwa"
 
 #. TRANS: Form legend for SMS preferences form.
@@ -6231,21 +6158,17 @@ msgstr "Nie jesteś subskrybowany do tego profilu."
 msgid "Could not save subscription."
 msgstr "Nie można zapisać subskrypcji."
 
-#. TRANS: Client error displayed trying to perform any request method other than POST.
-#. TRANS: Do not translate POST.
 #: actions/subscribe.php:77
 msgid "This action only accepts POST requests."
 msgstr "Ta czynność przyjmuje tylko żądania POST."
 
-#. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
-#: actions/subscribe.php:121
+#: actions/subscribe.php:117
 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
 msgstr ""
 "Nie można subskrybować zdalnego profilu profilu OMB 0.1 za pomocą tej "
 "czynności."
 
-#. TRANS: Page title when subscription succeeded.
-#: actions/subscribe.php:149
+#: actions/subscribe.php:145
 msgid "Subscribed"
 msgstr "Subskrybowano"
 
@@ -6405,9 +6328,8 @@ msgstr "Znacznik %s"
 msgid "User profile"
 msgstr "Profil użytkownika"
 
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT element in area for user avatar.
-#: actions/tagother.php:81 actions/userauthorization.php:138
+#: actions/tagother.php:81 actions/userauthorization.php:132
 #: lib/userprofile.php:108
 msgid "Photo"
 msgstr "Zdjęcie"
@@ -6424,11 +6346,6 @@ msgstr ""
 "Znaczniki dla tego użytkownika (litery, liczby, -, . i _), oddzielone "
 "przecinkami lub spacjami"
 
-#: actions/tagother.php:178
-#, php-format
-msgid "Invalid tag: \"%s\""
-msgstr "Nieprawidłowy znacznik: \"%s\""
-
 #: actions/tagother.php:193
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
@@ -6445,7 +6362,6 @@ msgstr ""
 msgid "No such tag."
 msgstr "Nie ma takiego znacznika."
 
-#. TRANS: Client error displayed when trying to unblock a non-blocked user.
 #: actions/unblock.php:59
 msgid "You haven't blocked that user."
 msgstr "Ten użytkownik nie został zablokowany."
@@ -6466,7 +6382,7 @@ msgstr "Brak identyfikatora profilu w żądaniu."
 msgid "Unsubscribed"
 msgstr "Zrezygnowano z subskrypcji"
 
-#: actions/updateprofile.php:64
+#: actions/updateprofile.php:64 actions/userauthorization.php:337
 #, php-format
 msgid ""
 "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
@@ -6499,7 +6415,7 @@ msgstr "Nieprawidłowy tekst powitania. Maksymalna długość to 255 znaków."
 #. TRANS: users in user admin panel. %1$s is the invalid nickname.
 #: actions/useradminpanel.php:166
 #, fuzzy, php-format
-msgid "Invalid default subscripton: \"%1$s\" is not a user."
+msgid "Invalid default subscripton: '%1$s' is not a user."
 msgstr "Nieprawidłowa domyślna subskrypcja: \"%1$s\" nie jest użytkownikiem."
 
 #. TRANS: Link description in user account settings menu.
@@ -6560,70 +6476,59 @@ msgstr "Czy zezwolić użytkownikom zapraszanie nowych użytkowników."
 #. TRANS: Title for button to save user settings in user admin panel.
 #: actions/useradminpanel.php:302
 #, fuzzy
-msgid "Save user settings."
+msgid "Save user settings"
 msgstr "Zapisz ustawienia użytkownika"
 
-#. TRANS: Page title.
-#: actions/userauthorization.php:109
+#: actions/userauthorization.php:105
 msgid "Authorize subscription"
 msgstr "Upoważnij subskrypcję"
 
-#. TRANS: Page notice on "Auhtorize subscription" page.
-#: actions/userauthorization.php:115
+#: actions/userauthorization.php:110
 #, fuzzy
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
 "user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
-"click \"Reject\"."
+"click “Reject”."
 msgstr ""
 "Sprawdź te szczegóły, aby upewnić się, czy na pewno chcesz subskrybować "
 "wpisy tego użytkownika. Jeżeli nie prosiłeś o subskrypcję czyichś wpisów, "
 "naciśnij \"Odrzuć\"."
 
-#. TRANS: DT element on Authorise Subscription page where license is displayed.
 #. TRANS: Menu item for site administration
-#: actions/userauthorization.php:207 actions/version.php:167
+#: actions/userauthorization.php:196 actions/version.php:167
 #: lib/adminpanelaction.php:403
 msgid "License"
 msgstr "Licencja"
 
-#. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:229
+#: actions/userauthorization.php:217
 #, fuzzy
-msgctxt "BUTTON"
 msgid "Accept"
 msgstr "Zaakceptuj"
 
-#. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:231
-#, fuzzy
-msgid "Subscribe to this user."
+#: actions/userauthorization.php:218 lib/subscribeform.php:115
+#: lib/subscribeform.php:139
+msgid "Subscribe to this user"
 msgstr "Subskrybuj tego użytkownika"
 
-#. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:233
+#: actions/userauthorization.php:219
 #, fuzzy
-msgctxt "BUTTON"
 msgid "Reject"
 msgstr "Odrzuć"
 
-#. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:235
+#: actions/userauthorization.php:220
 #, fuzzy
-msgid "Reject this subscription."
+msgid "Reject this subscription"
 msgstr "Odrzuć tę subskrypcję"
 
-#. TRANS: Client error displayed for an empty authorisation request.
-#: actions/userauthorization.php:248
+#: actions/userauthorization.php:232
 msgid "No authorization request!"
 msgstr "Brak żądania upoważnienia."
 
-#. TRANS: Accept message header from Authorise subscription page.
-#: actions/userauthorization.php:271
+#: actions/userauthorization.php:254
 msgid "Subscription authorized"
 msgstr "Upoważniono subskrypcję"
 
-#: actions/userauthorization.php:274
+#: actions/userauthorization.php:256
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to authorize the "
@@ -6632,12 +6537,11 @@ msgstr ""
 "Subskrypcja została upoważniona, ale nie przekazano zwrotnego adresu URL. "
 "Sprawdź w instrukcjach witryny, jak upoważnić subskrypcję. Token subskrypcji:"
 
-#. TRANS: Reject message header from Authorise subscription page.
-#: actions/userauthorization.php:285
+#: actions/userauthorization.php:266
 msgid "Subscription rejected"
 msgstr "Odrzucono subskrypcję"
 
-#: actions/userauthorization.php:288
+#: actions/userauthorization.php:268
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to fully reject the "
@@ -6646,64 +6550,39 @@ msgstr ""
 "Subskrypcja została odrzucona, ale nie przekazano zwrotnego adresu URL. "
 "Sprawdź w instrukcjach witryny, jak w pełni odrzucić subskrypcję."
 
-#. TRANS: Exception thrown when no valid user is found for an authorisation request.
-#. TRANS: %s is a listener URI.
-#: actions/userauthorization.php:325
+#: actions/userauthorization.php:303
 #, fuzzy, php-format
-msgid "Listener URI \"%s\" not found here."
+msgid "Listener URI ‘%s’ not found here."
 msgstr "Adres URI nasłuchującego \"%s\" nie został tutaj odnaleziony."
 
-#. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:332
+#: actions/userauthorization.php:308
 #, fuzzy, php-format
-msgid "Listenee URI \"%s\" is too long."
+msgid "Listenee URI ‘%s’ is too long."
 msgstr "Adres URI nasłuchującego \"%s\" jest za długi."
 
-#. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:340
+#: actions/userauthorization.php:314
 #, fuzzy, php-format
-msgid "Listenee URI \"%s\" is a local user."
+msgid "Listenee URI ‘%s’ is a local user."
 msgstr "Adres URI nasłuchującego \"%s\" jest lokalnym użytkownikiem."
 
-#. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
-#. TRANS: %s is a profile URL.
-#: actions/userauthorization.php:358
+#: actions/userauthorization.php:329
 #, fuzzy, php-format
-msgid "Profile URL \"%s\" is for a local user."
+msgid "Profile URL ‘%s’ is for a local user."
 msgstr "Adres URL profilu \"%s\" jest dla lokalnego użytkownika."
 
-#. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
-#. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
-#: actions/userauthorization.php:368
+#: actions/userauthorization.php:345
 #, fuzzy, php-format
-msgid ""
-"Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
-"\"."
-msgstr ""
-"Licencja nasłuchiwanego strumienia \"%1$s\" nie jest zgodna z licencją "
-"witryny \"%2$s\"."
-
-#. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:378
-#, fuzzy, php-format
-msgid "Avatar URL \"%s\" is not valid."
+msgid "Avatar URL ‘%s’ is not valid."
 msgstr "Adres URL \"%s\" jest nieprawidłowy."
 
-#. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:385
+#: actions/userauthorization.php:350
 #, fuzzy, php-format
-msgid "Cannot read avatar URL \"%s\"."
+msgid "Can’t read avatar URL ‘%s’."
 msgstr "Nie można odczytać adresu URL awatara \"%s\"."
 
-#. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:392
+#: actions/userauthorization.php:355
 #, fuzzy, php-format
-msgid "Wrong image type for avatar URL \"%s\"."
+msgid "Wrong image type for avatar URL ‘%s’."
 msgstr "Błędny typ obrazu dla adresu URL awatara \"%s\"."
 
 #. TRANS: Page title for profile design page.
@@ -6812,7 +6691,7 @@ msgid "Plugins"
 msgstr "Wtyczki"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:898
+#: actions/version.php:198 lib/action.php:901
 msgid "Version"
 msgstr "Wersja"
 
@@ -7034,14 +6913,14 @@ msgstr "Problem podczas zapisywania skrzynki odbiorczej grupy."
 
 #. TRANS: Server exception thrown when a reply cannot be saved.
 #. TRANS: %1$d is a notice ID, %2$d is the ID of the mentioned user.
-#: classes/Notice.php:1142
+#: classes/Notice.php:1144
 #, php-format
 msgid "Could not save reply for %1$d, %2$d."
 msgstr "Nie można zapisać odpowiedzi na %1$d, %2$d."
 
 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1661
+#: classes/Notice.php:1663
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
@@ -7055,14 +6934,14 @@ msgstr "%1$s (%2$s)"
 
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:775
+#: classes/Profile.php:779
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr "Nie można unieważnić roli \"\"%1$s\" użytkownika #%2$d; nie istnieje."
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:784
+#: classes/Profile.php:788
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -7381,53 +7260,53 @@ msgid "Page notice"
 msgstr "Wpis strony"
 
 #. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:871
+#: lib/action.php:874
 msgid "Secondary site navigation"
 msgstr "Druga nawigacja witryny"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:877
+#: lib/action.php:880
 msgid "Help"
 msgstr "Pomoc"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:880
+#: lib/action.php:883
 msgid "About"
 msgstr "O usłudze"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:883
+#: lib/action.php:886
 msgid "FAQ"
 msgstr "FAQ"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:888
+#: lib/action.php:891
 msgid "TOS"
 msgstr "TOS"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:892
+#: lib/action.php:895
 msgid "Privacy"
 msgstr "Prywatność"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:895
+#: lib/action.php:898
 msgid "Source"
 msgstr "Kod źródłowy"
 
 #. TRANS: Secondary navigation menu option leading to e-mail contact information on the
 #. TRANS: StatusNet site, where to report bugs, ...
-#: lib/action.php:902
+#: lib/action.php:905
 msgid "Contact"
 msgstr "Kontakt"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:905
+#: lib/action.php:908
 msgid "Badge"
 msgstr "Odznaka"
 
 #. TRANS: DT element for StatusNet software license.
-#: lib/action.php:934
+#: lib/action.php:937
 msgid "StatusNet software license"
 msgstr "Licencja oprogramowania StatusNet"
 
@@ -7435,7 +7314,7 @@ msgstr "Licencja oprogramowania StatusNet"
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:941
+#: lib/action.php:944
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7445,7 +7324,7 @@ msgstr ""
 "broughtby%%](%%site.broughtbyurl%%)."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:944
+#: lib/action.php:947
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** jest usługą mikroblogowania."
@@ -7454,7 +7333,7 @@ msgstr "**%%site.name%%** jest usługą mikroblogowania."
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:951
+#: lib/action.php:954
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7466,20 +7345,20 @@ msgstr ""
 "Affero](http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:967
+#: lib/action.php:970
 msgid "Site content license"
 msgstr "Licencja zawartości witryny"
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:974
+#: lib/action.php:977
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr "Treść i dane %1$s są prywatne i poufne."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:981
+#: lib/action.php:984
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
@@ -7487,7 +7366,7 @@ msgstr ""
 "zastrzeżone."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:985
+#: lib/action.php:988
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 "Prawa autorskie do treści i danych są własnością współtwórców. Wszystkie "
@@ -7495,7 +7374,7 @@ msgstr ""
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:1017
+#: lib/action.php:1020
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
@@ -7503,19 +7382,19 @@ msgstr ""
 "$s."
 
 #. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1353
+#: lib/action.php:1356
 msgid "Pagination"
 msgstr "Paginacja"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1364
+#: lib/action.php:1367
 msgid "After"
 msgstr "Później"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1374
+#: lib/action.php:1377
 msgid "Before"
 msgstr "Wcześniej"
 
@@ -7713,23 +7592,19 @@ msgstr ""
 msgid "No application for that consumer key."
 msgstr "Brak aplikacji dla tego klucza klienta."
 
-#: lib/apiauth.php:202 lib/apiauth.php:284
-msgid "Not allowed to use API."
-msgstr ""
-
 #. TRANS: OAuth exception given when an incorrect access token was given for a user.
-#: lib/apiauth.php:225
+#: lib/apiauth.php:219
 msgid "Bad access token."
 msgstr "Błędny token dostępu."
 
 #. TRANS: OAuth exception given when no user was found for a given token (no token was found).
-#: lib/apiauth.php:230
+#: lib/apiauth.php:224
 msgid "No user for that token."
 msgstr "Brak użytkownika dla tego tokenu."
 
 #. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel".
 #. TRANS: Client error thrown when authentication fails.
-#: lib/apiauth.php:272 lib/apiauth.php:302
+#: lib/apiauth.php:266 lib/apiauth.php:293
 msgid "Could not authenticate you."
 msgstr "Nie można uwierzytelnić."
 
@@ -7930,11 +7805,6 @@ msgstr "Zmiana hasła nie jest dozwolona."
 msgid "Block"
 msgstr "Zablokuj"
 
-#. TRANS: Description of the form to block a user.
-#: lib/blockform.php:79
-msgid "Block this user"
-msgstr "Zablokuj tego użytkownika"
-
 #. TRANS: Title for command results.
 #: lib/channel.php:160 lib/channel.php:181
 msgid "Command results"
@@ -7962,7 +7832,7 @@ msgstr "Wpis z tym identyfikatorem nie istnieje."
 
 #. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
 #. TRANS: Error text shown when a last user notice is requested and it does not exist.
-#: lib/command.php:99 lib/command.php:630
+#: lib/command.php:99 lib/command.php:642
 msgid "User has no last notice."
 msgstr "Użytkownik nie posiada ostatniego wpisu."
 
@@ -8012,35 +7882,41 @@ msgstr ""
 "Subskrybenci: %2$s\n"
 "Wpisy: %3$s"
 
+#. TRANS: Error message text shown when a favorite could not be set because it has already been favorited.
+#: lib/command.php:298
+#, fuzzy
+msgid "Could not create favorite: already favorited."
+msgstr "Nie można utworzyć ulubionego wpisu."
+
 #. TRANS: Text shown when a notice has been marked as favourite successfully.
-#: lib/command.php:312
+#: lib/command.php:324
 msgid "Notice marked as fave."
 msgstr "Zaznaczono wpis jako ulubiony."
 
 #. TRANS: Message given having added a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:357
+#: lib/command.php:369
 #, php-format
 msgid "%1$s joined group %2$s."
 msgstr "Użytkownik %1$s dołączył do grupy %2$s."
 
 #. TRANS: Message given having removed a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:405
+#: lib/command.php:417
 #, php-format
 msgid "%1$s left group %2$s."
 msgstr "Użytkownik %1$s opuścił grupę %2$s."
 
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: lib/command.php:426
+#: lib/command.php:438
 #, php-format
 msgctxt "WHOIS"
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
 
 #. TRANS: Whois output. %s is the full name of the queried user.
-#: lib/command.php:430
+#: lib/command.php:442
 #, php-format
 msgid "Fullname: %s"
 msgstr "Imię i nazwisko: %s"
@@ -8048,7 +7924,7 @@ msgstr "Imię i nazwisko: %s"
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a location.
-#: lib/command.php:434 lib/mail.php:270
+#: lib/command.php:446 lib/mail.php:270
 #, php-format
 msgid "Location: %s"
 msgstr "Położenie: %s"
@@ -8056,20 +7932,20 @@ msgstr "Położenie: %s"
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a homepage.
-#: lib/command.php:438 lib/mail.php:274
+#: lib/command.php:450 lib/mail.php:274
 #, php-format
 msgid "Homepage: %s"
 msgstr "Strona domowa: %s"
 
 #. TRANS: Whois output. %s is the bio information of the queried user.
-#: lib/command.php:442
+#: lib/command.php:454
 #, php-format
 msgid "About: %s"
 msgstr "O mnie: %s"
 
 #. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).
 #. TRANS: %s is a remote profile.
-#: lib/command.php:471
+#: lib/command.php:483
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
@@ -8080,7 +7956,7 @@ msgstr ""
 
 #. TRANS: Message given if content is too long. %1$sd is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:488
+#: lib/command.php:500
 #, php-format
 msgid "Message too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
@@ -8089,25 +7965,25 @@ msgstr[1] "Wiadomość jest za długa - maksymalnie %1$d znaki, wysłano %2$d."
 msgstr[2] "Wiadomość jest za długa - maksymalnie %1$d znaków, wysłano %2$d."
 
 #. TRANS: Error text shown sending a direct message fails with an unknown reason.
-#: lib/command.php:516
+#: lib/command.php:528
 msgid "Error sending direct message."
 msgstr "Błąd podczas wysyłania bezpośredniej wiadomości."
 
 #. TRANS: Message given having repeated a notice from another user.
 #. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:553
+#: lib/command.php:565
 #, php-format
 msgid "Notice from %s repeated."
 msgstr "Powtórzono wpis od użytkownika %s."
 
 #. TRANS: Error text shown when repeating a notice fails with an unknown reason.
-#: lib/command.php:556
+#: lib/command.php:568
 msgid "Error repeating notice."
 msgstr "Błąd podczas powtarzania wpisu."
 
 #. TRANS: Message given if content of a notice for a reply is too long. %1$d is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:591
+#: lib/command.php:603
 #, php-format
 msgid "Notice too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Notice too long - maximum is %1$d characters, you sent %2$d."
@@ -8117,80 +7993,80 @@ msgstr[2] "Wpis jest za długi - maksymalnie %1$d znaków, wysłano %2$d."
 
 #. TRANS: Text shown having sent a reply to a notice successfully.
 #. TRANS: %s is the nickname of the user of the notice the reply was sent to.
-#: lib/command.php:604
+#: lib/command.php:616
 #, php-format
 msgid "Reply to %s sent."
 msgstr "Wysłano odpowiedź do %s."
 
 #. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
-#: lib/command.php:607
+#: lib/command.php:619
 msgid "Error saving notice."
 msgstr "Błąd podczas zapisywania wpisu."
 
 #. TRANS: Error text shown when no username was provided when issuing a subscribe command.
-#: lib/command.php:654
+#: lib/command.php:666
 msgid "Specify the name of the user to subscribe to."
 msgstr "Podaj nazwę użytkownika do subskrybowania."
 
 #. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
-#: lib/command.php:663
+#: lib/command.php:675
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "Nie można subskrybować profili OMB za pomocą polecenia."
 
 #. TRANS: Text shown after having subscribed to another user successfully.
 #. TRANS: %s is the name of the user the subscription was requested for.
-#: lib/command.php:671
+#: lib/command.php:683
 #, php-format
 msgid "Subscribed to %s."
 msgstr "Subskrybowano użytkownika %s."
 
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.
-#: lib/command.php:692 lib/command.php:803
+#: lib/command.php:704 lib/command.php:815
 msgid "Specify the name of the user to unsubscribe from."
 msgstr "Podaj nazwę użytkownika do usunięcia subskrypcji."
 
 #. TRANS: Text shown after having unsubscribed from another user successfully.
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:703
+#: lib/command.php:715
 #, php-format
 msgid "Unsubscribed from %s."
 msgstr "Usunięto subskrypcję użytkownika %s."
 
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
-#: lib/command.php:723 lib/command.php:749
+#: lib/command.php:735 lib/command.php:761
 msgid "Command not yet implemented."
 msgstr "Nie zaimplementowano polecenia."
 
 #. TRANS: Text shown when issuing the command "off" successfully.
-#: lib/command.php:727
+#: lib/command.php:739
 msgid "Notification off."
 msgstr "Wyłączono powiadomienia."
 
 #. TRANS: Error text shown when the command "off" fails for an unknown reason.
-#: lib/command.php:730
+#: lib/command.php:742
 msgid "Can't turn off notification."
 msgstr "Nie można wyłączyć powiadomień."
 
 #. TRANS: Text shown when issuing the command "on" successfully.
-#: lib/command.php:753
+#: lib/command.php:765
 msgid "Notification on."
 msgstr "Włączono powiadomienia."
 
 #. TRANS: Error text shown when the command "on" fails for an unknown reason.
-#: lib/command.php:756
+#: lib/command.php:768
 msgid "Can't turn on notification."
 msgstr "Nie można włączyć powiadomień."
 
 #. TRANS: Error text shown when issuing the login command while login is disabled.
-#: lib/command.php:770
+#: lib/command.php:782
 msgid "Login command is disabled."
 msgstr "Polecenie logowania jest wyłączone."
 
 #. TRANS: Text shown after issuing the login command successfully.
 #. TRANS: %s is a logon link..
-#: lib/command.php:783
+#: lib/command.php:795
 #, php-format
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
@@ -8198,20 +8074,20 @@ msgstr ""
 
 #. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:812
+#: lib/command.php:824
 #, php-format
 msgid "Unsubscribed %s."
 msgstr "Usunięto subskrypcję użytkownika %s."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
-#: lib/command.php:830
+#: lib/command.php:842
 msgid "You are not subscribed to anyone."
 msgstr "Nie subskrybujesz nikogo."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
-#: lib/command.php:835
+#: lib/command.php:847
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Subskrybujesz tę osobę:"
@@ -8220,14 +8096,14 @@ msgstr[2] "Subskrybujesz te osoby:"
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user
 #. TRANS: (followers) without having any subscribers.
-#: lib/command.php:857
+#: lib/command.php:869
 msgid "No one is subscribed to you."
 msgstr "Nikt cię nie subskrybuje."
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
-#: lib/command.php:862
+#: lib/command.php:874
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Ta osoba cię subskrybuje:"
@@ -8236,14 +8112,14 @@ msgstr[2] "Te osoby cię subskrybują:"
 
 #. TRANS: Text shown after requesting groups a user is subscribed to without having
 #. TRANS: any group subscriptions.
-#: lib/command.php:884
+#: lib/command.php:896
 msgid "You are not a member of any groups."
 msgstr "Nie jesteś członkiem żadnej grupy."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
-#: lib/command.php:889
+#: lib/command.php:901
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "Jesteś członkiem tej grupy:"
@@ -8251,7 +8127,7 @@ msgstr[1] "Jesteś członkiem tych grup:"
 msgstr[2] "Jesteś członkiem tych grup:"
 
 #. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-#: lib/command.php:904
+#: lib/command.php:916
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -8392,11 +8268,6 @@ msgstr "Upoważnione połączone aplikacje"
 msgid "Database error"
 msgstr "Błąd bazy danych"
 
-#. TRANS: Description of form for deleting a user.
-#: lib/deleteuserform.php:75
-msgid "Delete this user"
-msgstr "Usuń tego użytkownika"
-
 #. TRANS: Label in form on profile design page.
 #. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
 #: lib/designsettings.php:108
@@ -8431,21 +8302,6 @@ msgstr "Zmień kolory"
 msgid "Use defaults"
 msgstr "Użycie domyślnych"
 
-#. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: lib/designsettings.php:259
-msgid "Restore default designs"
-msgstr "Przywróć domyślny wygląd"
-
-#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: lib/designsettings.php:267
-msgid "Reset back to default"
-msgstr "Przywróć domyślne ustawienia"
-
-#. TRANS: Title for button on profile design page to save settings.
-#: lib/designsettings.php:272
-msgid "Save design"
-msgstr "Zapisz wygląd"
-
 #. TRANS: Error message displayed if design settings could not be saved.
 #. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
 #: lib/designsettings.php:405 lib/designsettings.php:427
@@ -9336,10 +9192,6 @@ msgstr "Odpowiedz na ten wpis"
 msgid "Reply"
 msgstr "Odpowiedz"
 
-#: lib/noticelist.php:673
-msgid "Delete this notice"
-msgstr "Usuń ten wpis"
-
 #: lib/noticelist.php:691
 msgid "Notice repeated"
 msgstr "Powtórzono wpis"
@@ -9620,10 +9472,6 @@ msgstr "Zaproś"
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Zaproś przyjaciół i kolegów do dołączenia do ciebie na %s"
 
-#: lib/subscribeform.php:115 lib/subscribeform.php:139
-msgid "Subscribe to this user"
-msgstr "Subskrybuj tego użytkownika"
-
 #: lib/subscriberspeopleselftagcloudsection.php:48
 #: lib/subscriptionspeopleselftagcloudsection.php:48
 msgid "People Tagcloud as self-tagged"
@@ -9803,23 +9651,18 @@ msgctxt "role"
 msgid "Moderator"
 msgstr "Moderator"
 
-#: lib/util.php:305
-#, fuzzy
-msgid "Not allowed to log in."
-msgstr "Niezalogowany."
-
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1309
+#: lib/util.php:1306
 msgid "a few seconds ago"
 msgstr "kilka sekund temu"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1312
+#: lib/util.php:1309
 msgid "about a minute ago"
 msgstr "około minutę temu"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1316
+#: lib/util.php:1313
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
@@ -9828,12 +9671,12 @@ msgstr[1] "około %d minut temu"
 msgstr[2] "około %d minut temu"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1319
+#: lib/util.php:1316
 msgid "about an hour ago"
 msgstr "około godzinę temu"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1323
+#: lib/util.php:1320
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
@@ -9842,12 +9685,12 @@ msgstr[1] "około %d godzin temu"
 msgstr[2] "około %d godzin temu"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1326
+#: lib/util.php:1323
 msgid "about a day ago"
 msgstr "blisko dzień temu"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1330
+#: lib/util.php:1327
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
@@ -9856,12 +9699,12 @@ msgstr[1] "około %d dni temu"
 msgstr[2] "około %d dni temu"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1333
+#: lib/util.php:1330
 msgid "about a month ago"
 msgstr "około miesiąc temu"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1337
+#: lib/util.php:1334
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
@@ -9870,7 +9713,7 @@ msgstr[1] "około %d miesięcy temu"
 msgstr[2] "około %d miesięcy temu"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1340
+#: lib/util.php:1337
 msgid "about a year ago"
 msgstr "około rok temu"
 
@@ -9915,3 +9758,75 @@ msgstr "Nieprawidłowy kod XML, brak głównego XRD."
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr "Pobieranie kopii zapasowej z pliku \"%s\"."
+
+#, fuzzy
+#~ msgid "Block this user."
+#~ msgstr "Zablokuj tego użytkownika"
+
+#, fuzzy
+#~ msgid "Delete this notice."
+#~ msgstr "Usuń ten wpis"
+
+#, fuzzy
+#~ msgid "Delete this user."
+#~ msgstr "Usuń tego użytkownika"
+
+#, fuzzy
+#~ msgid "Restore default designs."
+#~ msgstr "Przywróć domyślny wygląd"
+
+#, fuzzy
+#~ msgid "Reset back to default."
+#~ msgstr "Przywróć domyślne ustawienia"
+
+#, fuzzy
+#~ msgid "Save design."
+#~ msgstr "Zapisz wygląd"
+
+#, fuzzy
+#~ msgid "Disfavor favorite."
+#~ msgstr "Usuń wpis z ulubionych"
+
+#, fuzzy
+#~ msgid "\"%s\" not found."
+#~ msgstr "Nie odnaleziono strony."
+
+#, fuzzy
+#~ msgid "Notice %s not found."
+#~ msgstr "Nie odnaleziono wpisu nadrzędnego."
+
+#, fuzzy
+#~ msgid "Attachment %s not found."
+#~ msgstr "Nie odnaleziono odbiorcy."
+
+#, fuzzy
+#~ msgid "Invalid tag: \"%s\"."
+#~ msgstr "Nieprawidłowy znacznik: \"%s\""
+
+#, fuzzy
+#~ msgid "%s updates from everyone."
+#~ msgstr "Użytkownik %s aktualizuje od każdego."
+
+#, fuzzy
+#~ msgid "Password saved"
+#~ msgstr "Zapisano hasło."
+
+#, fuzzy
+#~ msgid "Where you are, like \"City, State (or Region), Country\"."
+#~ msgstr "Gdzie jesteś, np. \"miasto, województwo (lub region), kraj\""
+
+#, fuzzy
+#~ msgid "Subscribe to this user."
+#~ msgstr "Subskrybuj tego użytkownika"
+
+#, fuzzy
+#~ msgid ""
+#~ "Listenee stream license \"%1$s\" is not compatible with site license \"%2"
+#~ "$s\"."
+#~ msgstr ""
+#~ "Licencja nasłuchiwanego strumienia \"%1$s\" nie jest zgodna z licencją "
+#~ "witryny \"%2$s\"."
+
+#, fuzzy
+#~ msgid "Not allowed to log in."
+#~ msgstr "Niezalogowany."
diff --git a/locale/pt/LC_MESSAGES/statusnet.po b/locale/pt/LC_MESSAGES/statusnet.po
index 7cd89e3ed8..496bc80ee4 100644
--- a/locale/pt/LC_MESSAGES/statusnet.po
+++ b/locale/pt/LC_MESSAGES/statusnet.po
@@ -7,6 +7,7 @@
 # Author: Giro720
 # Author: Hamilton Abreu
 # Author: Ipublicis
+# Author: McDutchie
 # Author: Waldir
 # --
 # This file is distributed under the same license as the StatusNet package.
@@ -15,17 +16,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-24 10:32+0000\n"
-"PO-Revision-Date: 2011-02-24 10:37:31+0000\n"
+"POT-Creation-Date: 2011-03-03 15:58+0000\n"
+"PO-Revision-Date: 2011-03-03 16:01:16+0000\n"
 "Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r82712); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-02-17 11:39:54+0000\n"
+"X-POT-Import-Date: 2011-02-25 23:49:23+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -137,11 +138,7 @@ msgstr "Página não foi encontrada."
 #. 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 use "one time password login" without using an existing user.
-#. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
-#. TRANS: Client error displayed trying to find a user by ID for a non-existing ID.
-#. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when calling a profile action without specifying a user.
 #: actions/all.php:80 actions/allrss.php:69
@@ -159,12 +156,12 @@ msgstr "Página não foi encontrada."
 #: actions/apitimelinementions.php:77 actions/apitimelineuser.php:79
 #: actions/avatarbynickname.php:79 actions/favoritesrss.php:72
 #: actions/foaf.php:42 actions/foaf.php:61 actions/hcard.php:67
-#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:78
+#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
 #: actions/remotesubscribe.php:144 actions/remotesubscribe.php:153
-#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:113
-#: actions/showfavorites.php:106 actions/userbyid.php:75
+#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
+#: actions/showfavorites.php:106 actions/userbyid.php:74
 #: actions/usergroups.php:93 actions/userrss.php:40 actions/userxrd.php:59
-#: actions/xrds.php:71 lib/command.php:497 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:509 lib/galleryaction.php:59
 #: lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Utilizador não foi encontrado."
@@ -293,7 +290,7 @@ msgstr "Actualizações de %1$s e amigos no %2$s!"
 #: actions/apigrouplistall.php:120 actions/apigroupmembership.php:105
 #: actions/apigroupshow.php:114 actions/apihelptest.php:84
 #: actions/apistatusesdestroy.php:101 actions/apistatusesretweets.php:110
-#: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:138
+#: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:139
 #: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
 #: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:268
 #: actions/apitimelinegroup.php:147 actions/apitimelinehome.php:173
@@ -525,7 +522,7 @@ msgstr "Destinatário não encontrado."
 #. TRANS: Client error displayed trying to direct message another user who's not a friend (403).
 #: actions/apidirectmessagenew.php:144
 #, fuzzy
-msgid "Cannot send direct messages to users who aren't your friend."
+msgid "Can't send direct messages to users who aren't your friend."
 msgstr ""
 "Não pode enviar mensagens directas a utilizadores que não sejam amigos."
 
@@ -552,7 +549,7 @@ msgstr "Este estado já é um favorito."
 #. TRANS: Client error displayed when marking a notice as favourite fails.
 #. TRANS: Server error displayed when trying to mark a notice as favorite fails in the database.
 #. TRANS: Error message text shown when a favorite could not be set.
-#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:294
+#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:306
 msgid "Could not create favorite."
 msgstr "Não foi possível criar o favorito."
 
@@ -612,7 +609,7 @@ msgstr "Não foi possível encontrar o utilizador de destino."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:191
 #: actions/newgroup.php:137 actions/profilesettings.php:273
-#: actions/register.php:206
+#: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "Utilizador já é usado. Tente outro."
 
@@ -622,7 +619,7 @@ msgstr "Utilizador já é usado. Tente outro."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:195
 #: actions/newgroup.php:141 actions/profilesettings.php:243
-#: actions/register.php:208
+#: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "Utilizador não é válido."
 
@@ -635,7 +632,7 @@ msgstr "Utilizador não é válido."
 #: actions/apigroupcreate.php:181 actions/editapplication.php:235
 #: actions/editgroup.php:202 actions/newapplication.php:221
 #: actions/newgroup.php:148 actions/profilesettings.php:248
-#: actions/register.php:215
+#: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "Página de ínicio não é uma URL válida."
 
@@ -645,7 +642,7 @@ msgstr "Página de ínicio não é uma URL válida."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:191 actions/editgroup.php:206
 #: actions/newgroup.php:152 actions/profilesettings.php:252
-#: actions/register.php:218
+#: actions/register.php:226
 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "Nome completo demasiado longo (máx. 255 caracteres)."
@@ -674,7 +671,7 @@ msgstr[1] "Descrição demasiado longa (máx. %d caracteres)."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:215 actions/editgroup.php:218
 #: actions/newgroup.php:164 actions/profilesettings.php:265
-#: actions/register.php:227
+#: actions/register.php:235
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
 msgstr "Localidade demasiado longa (máx. 255 caracteres)."
@@ -731,14 +728,14 @@ msgstr "Grupo não foi encontrado."
 #. TRANS: Server error displayed when trying to join a group the user is already a member of.
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:333
+#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:345
 msgid "You are already a member of that group."
 msgstr "Já é membro desse grupo."
 
 #. TRANS: Server error displayed when trying to join a group the user is blocked from joining.
 #. 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.
-#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:338
+#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:350
 msgid "You have been blocked from that group by the admin."
 msgstr "Foi bloqueado desse grupo pelo gestor."
 
@@ -748,7 +745,7 @@ msgstr "Foi bloqueado desse grupo pelo gestor."
 #. TRANS: %1$s is the joining user's nickname, $2$s is the group nickname for which the join failed.
 #. TRANS: Message given having failed to add a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:350
+#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:362
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "Não foi possível adicionar %1$s ao grupo %2$s."
@@ -765,7 +762,7 @@ msgstr "Não é membro deste grupo."
 #. TRANS: Message given having failed to remove a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
 #: actions/apigroupleave.php:127 actions/leavegroup.php:133
-#: lib/command.php:398
+#: lib/command.php:410
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
 msgstr "Não foi possível remover %1$s do grupo %2$s."
@@ -828,21 +825,20 @@ msgstr "Não tem autorização."
 #. TRANS: Form validation error message.
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
-#. TRANS: Client error displayed when the session token is not okay.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
 #: actions/deletenotice.php:177 actions/disfavor.php:75
 #: actions/emailsettings.php:291 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:65 actions/grouplogo.php:321
 #: actions/groupunblock.php:65 actions/imsettings.php:224
-#: actions/invite.php:60 actions/login.php:131 actions/makeadmin.php:66
+#: actions/invite.php:60 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
-#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:136
-#: actions/othersettings.php:155 actions/passwordsettings.php:137
+#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
+#: actions/othersettings.php:155 actions/passwordsettings.php:138
 #: actions/profilesettings.php:217 actions/recoverpassword.php:383
-#: actions/register.php:164 actions/remotesubscribe.php:76
+#: actions/register.php:172 actions/remotesubscribe.php:76
 #: actions/repeat.php:82 actions/smssettings.php:250 actions/subedit.php:40
-#: actions/subscribe.php:87 actions/tagother.php:166
-#: actions/unsubscribe.php:69 actions/userauthorization.php:53
+#: actions/subscribe.php:86 actions/tagother.php:166
+#: actions/unsubscribe.php:69 actions/userauthorization.php:52
 #: lib/designsettings.php:310
 msgid "There was a problem with your session token. Try again, please."
 msgstr "Ocorreu um problema com a sua sessão. Por favor, tente novamente."
@@ -874,7 +870,7 @@ msgstr "Erro na base de dados ao inserir o utilizador da aplicação OAuth."
 #: actions/designadminpanel.php:100 actions/editapplication.php:144
 #: actions/emailsettings.php:310 actions/grouplogo.php:332
 #: actions/imsettings.php:239 actions/newapplication.php:124
-#: actions/oauthconnectionssettings.php:145 actions/recoverpassword.php:46
+#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
 #: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
 msgstr "Envio inesperado de formulário."
@@ -926,20 +922,19 @@ msgstr "Conta"
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group nickname (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT for nick name in a profile.
-#: actions/apioauthauthorize.php:459 actions/login.php:242
-#: actions/profilesettings.php:106 actions/register.php:418
+#: actions/apioauthauthorize.php:459 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:432
 #: actions/showgroup.php:243 actions/tagother.php:94
-#: actions/userauthorization.php:152 lib/groupeditform.php:145
+#: actions/userauthorization.php:145 lib/groupeditform.php:145
 #: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "Utilizador"
 
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:463 actions/login.php:245
-#: actions/register.php:422 lib/accountsettingsaction.php:120
+#: actions/apioauthauthorize.php:463 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:120
 msgid "Password"
 msgstr "Senha"
 
@@ -1034,13 +1029,13 @@ msgstr "Nota não foi encontrada."
 
 #. TRANS: Client error displayed trying to repeat an own notice through the API.
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:537
+#: actions/apistatusesretweet.php:83 lib/command.php:549
 msgid "Cannot repeat your own notice."
 msgstr "Não pode repetir a sua própria nota."
 
 #. TRANS: Client error displayed trying to re-repeat a notice through the API.
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:92 lib/command.php:543
+#: actions/apistatusesretweet.php:92 lib/command.php:555
 msgid "Already repeated that notice."
 msgstr "Já repetiu essa nota."
 
@@ -1063,7 +1058,7 @@ msgstr "Método da API não encontrado."
 #. TRANS: %s is the requested output format.
 #: actions/apistatusesshow.php:144
 #, fuzzy, php-format
-msgid "Unsupported format: %s."
+msgid "Unsupported format: %s"
 msgstr "Formato não suportado."
 
 #. TRANS: Client error displayed requesting a deleted status.
@@ -1168,14 +1163,13 @@ msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr "%1$s actualizações em resposta a actualizações de %2$s / %3$s."
 
 #. TRANS: Title for site timeline. %s is the StatusNet sitename.
-#. TRANS: Public RSS feed title. %s is the StatusNet site name.
 #: actions/apitimelinepublic.php:193 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "Notas públicas de %s"
 
 #. TRANS: Subtitle for site timeline. %s is the StatusNet sitename.
-#: actions/apitimelinepublic.php:199
+#: actions/apitimelinepublic.php:199 actions/publicrss.php:105
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "%s actualizações de todos!"
@@ -1242,26 +1236,25 @@ msgid "Atom post must be an Atom entry."
 msgstr ""
 
 #. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
-#: actions/apitimelineuser.php:334
+#: actions/apitimelineuser.php:335
 msgid "Can only handle POST activities."
 msgstr ""
 
 #. TRANS: Client error displayed when using an unsupported activity object type.
 #. TRANS: %s is the unsupported activity object type.
-#: actions/apitimelineuser.php:345
+#: actions/apitimelineuser.php:346
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
 #. TRANS: %d is the notice ID (number).
-#: actions/apitimelineuser.php:379
+#: actions/apitimelineuser.php:380
 #, fuzzy, php-format
 msgid "No content for notice %d."
 msgstr "Procurar no conteúdo das notas"
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#. TRANS: %s is the notice URI.
 #: actions/apitimelineuser.php:408
 #, fuzzy, php-format
 msgid "Notice with URI \"%s\" already exists."
@@ -1280,10 +1273,9 @@ msgstr "Método da API não encontrado."
 
 #. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
 #. TRANS: Client exception.
-#. TRANS: Client error displayed trying to subscribe to a non-existing profile.
 #: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
 #: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
-#: actions/subscribe.php:110
+#: actions/subscribe.php:107
 msgid "No such profile."
 msgstr "Perfil não foi encontrado."
 
@@ -1419,7 +1411,7 @@ msgstr "Não foi possível eliminar o favorito."
 #: actions/joingroup.php:95 actions/leavegroup.php:82
 #: actions/leavegroup.php:95 actions/makeadmin.php:86
 #: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:380
+#: lib/command.php:392
 msgid "No such group."
 msgstr "Grupo não foi encontrado."
 
@@ -1430,7 +1422,7 @@ msgid "Not a member."
 msgstr "Todos os membros"
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
-#: actions/atompubshowmembership.php:150
+#: actions/atompubshowmembership.php:151
 #, fuzzy
 msgid "Cannot delete someone else's membership."
 msgstr "Não foi possível apagar a auto-subscrição."
@@ -1535,11 +1527,9 @@ msgstr "Pode carregar o seu avatar pessoal. O tamanho máximo do ficheiro é %s.
 
 #. TRANS: Server error displayed in avatar upload page when no matching profile can be found for a user.
 #. TRANS: Server error displayed coming across a request from a user without a profile.
-#. TRANS: Server error displayed when trying to authorise a remote subscription request
-#. TRANS: while the user has no profile.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
 #: actions/grouplogo.php:184 actions/remotesubscribe.php:190
-#: actions/userauthorization.php:75 actions/userrss.php:108
+#: actions/userauthorization.php:72 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr "Utilizador sem perfil correspondente."
 
@@ -1597,10 +1587,10 @@ msgstr "Cortar"
 msgid "No file uploaded."
 msgstr "Não foi carregado nenhum ficheiro."
 
-#. TRANS: Avatar upload form instruction after uploading a file.
+#. TRANS: Avatar upload form unstruction after uploading a file.
 #: actions/avatarsettings.php:345
 #, fuzzy
-msgid "Pick a square area of the image to be your avatar."
+msgid "Pick a square area of the image to be your avatar"
 msgstr "Escolha uma área quadrada da imagem para ser o seu avatar"
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
@@ -1642,7 +1632,7 @@ msgid "You may not backup your account."
 msgstr ""
 
 #. TRANS: Information displayed on the backup account page.
-#: actions/backupaccount.php:225
+#: actions/backupaccount.php:227
 msgid ""
 "You can backup your account data in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format. This is an experimental feature and provides "
@@ -1652,15 +1642,15 @@ msgid ""
 msgstr ""
 
 #. TRANS: Submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:248
+#: actions/backupaccount.php:250
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Backup"
 msgstr "Fundo"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:252
-msgid "Backup your account."
+#: actions/backupaccount.php:254
+msgid "Backup your account"
 msgstr ""
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
@@ -1702,7 +1692,7 @@ msgstr "Não"
 #. TRANS: Submit button title for 'No' when blocking a user.
 #: actions/block.php:158
 #, fuzzy
-msgid "Do not block this user."
+msgid "Do not block this user"
 msgstr "Não bloquear este utilizador"
 
 #. TRANS: Button label on the user block form.
@@ -1719,9 +1709,9 @@ msgid "Yes"
 msgstr "Sim"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:165
-#, fuzzy
-msgid "Block this user."
+#. TRANS: Description of the form to block a user.
+#: actions/block.php:165 lib/blockform.php:79
+msgid "Block this user"
 msgstr "Bloquear este utilizador"
 
 #. TRANS: Server error displayed when blocking a user fails.
@@ -1886,7 +1876,7 @@ msgstr ""
 #. TRANS: Field label for delete account confirmation entry.
 #. TRANS: Field label for password reset form where the password has to be typed again.
 #: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:262 actions/register.php:426
+#: actions/recoverpassword.php:262 actions/register.php:440
 msgid "Confirm"
 msgstr "Confirmação"
 
@@ -1916,14 +1906,14 @@ msgstr "Aplicação não foi encontrada."
 #. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
 #: actions/deleteapplication.php:79 actions/editapplication.php:78
-#: actions/showapplication.php:90
+#: actions/showapplication.php:94
 msgid "You are not the owner of this application."
 msgstr "Não é o proprietário desta aplicação."
 
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
-#: actions/newapplication.php:112 actions/showapplication.php:113
-#: lib/action.php:1422
+#: actions/newapplication.php:112 actions/showapplication.php:118
+#: lib/action.php:1425
 msgid "There was a problem with your session token."
 msgstr "Ocorreu um problema com a sua sessão."
 
@@ -1947,13 +1937,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting an application.
 #: actions/deleteapplication.php:161
 #, fuzzy
-msgid "Do not delete this application."
+msgid "Do not delete this application"
 msgstr "Não apagar esta aplicação"
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
 #: actions/deleteapplication.php:167
 #, fuzzy
-msgid "Delete this application."
+msgid "Delete this application"
 msgstr "Apagar esta aplicação"
 
 #. TRANS: Client error when trying to delete group while not logged in.
@@ -2011,13 +2001,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting a group.
 #: actions/deletegroup.php:224
 #, fuzzy
-msgid "Do not delete this group."
+msgid "Do not delete this group"
 msgstr "Não apagar esta nota"
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
 #: actions/deletegroup.php:231
 #, fuzzy
-msgid "Delete this group."
+msgid "Delete this group"
 msgstr "Apagar este utilizador"
 
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
@@ -2025,15 +2015,13 @@ msgstr "Apagar este utilizador"
 #. TRANS: Client error displayed when trying to mark a notice as favorite without being logged in.
 #. TRANS: Client error displayed trying to block a user from a group while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
-#. TRANS: Client error displayed trying to log out when not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
-#. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
 #. TRANS: Client error displayed when trying to change user options while not logged in.
 #: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
-#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:70
+#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
-#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:98
+#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
 #: lib/adminpanelaction.php:71 lib/profileformaction.php:63
 #: lib/settingsaction.php:72
@@ -2063,13 +2051,12 @@ msgstr "Tem a certeza de que quer apagar esta nota?"
 #. TRANS: Submit button title for 'No' when deleting a notice.
 #: actions/deletenotice.php:159
 #, fuzzy
-msgid "Do not delete this notice."
+msgid "Do not delete this notice"
 msgstr "Não apagar esta nota"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:166
-#, fuzzy
-msgid "Delete this notice."
+#: actions/deletenotice.php:166 lib/noticelist.php:673
+msgid "Delete this notice"
 msgstr "Apagar esta nota"
 
 #. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
@@ -2106,13 +2093,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting a user.
 #: actions/deleteuser.php:158
 #, fuzzy
-msgid "Do not delete this user."
+msgid "Do not delete this user"
 msgstr "Não apagar esta nota"
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
-#: actions/deleteuser.php:165
-#, fuzzy
-msgid "Delete this user."
+#. TRANS: Description of form for deleting a user.
+#: actions/deleteuser.php:165 lib/deleteuserform.php:75
+msgid "Delete this user"
 msgstr "Apagar este utilizador"
 
 #. TRANS: Message used as title for design settings for the site.
@@ -2282,21 +2269,21 @@ msgid "Use defaults"
 msgstr "Usar predefinições"
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:720
-#, fuzzy
-msgid "Restore default designs."
+#. TRANS: Title for button on profile design page to reset all colour settings to default.
+#: actions/designadminpanel.php:720 lib/designsettings.php:259
+msgid "Restore default designs"
 msgstr "Repor estilos predefinidos"
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:728
-#, fuzzy
-msgid "Reset back to default."
+#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
+#: actions/designadminpanel.php:728 lib/designsettings.php:267
+msgid "Reset back to default"
 msgstr "Repor predefinição"
 
 #. TRANS: Title for button for saving theme settings.
-#: actions/designadminpanel.php:736
-#, fuzzy
-msgid "Save design."
+#. TRANS: Title for button on profile design page to save settings.
+#: actions/designadminpanel.php:736 lib/designsettings.php:272
+msgid "Save design"
 msgstr "Gravar o estilo"
 
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
@@ -2328,7 +2315,7 @@ msgid "You must be logged in to edit an application."
 msgstr "Tem de iniciar uma sessão para editar uma aplicação."
 
 #. TRANS: Client error displayed trying to edit an application that does not exist.
-#: actions/editapplication.php:83 actions/showapplication.php:83
+#: actions/editapplication.php:83 actions/showapplication.php:87
 msgid "No such application."
 msgstr "Aplicação não foi encontrada."
 
@@ -2614,7 +2601,7 @@ msgid "Cannot normalize that email address."
 msgstr "Não é possível normalizar esse endereço electrónico"
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:393 actions/register.php:204
+#: actions/emailsettings.php:393 actions/register.php:212
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "Correio electrónico é inválido."
@@ -2691,22 +2678,19 @@ msgstr "Sem endereço electrónico de entrada."
 
 #. 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.
 #: actions/emailsettings.php:530 actions/emailsettings.php:554
-#: actions/smssettings.php:566 actions/smssettings.php:591
+#: actions/smssettings.php:565 actions/smssettings.php:588
 #, fuzzy
 msgid "Could not update user record."
 msgstr "Não foi possível actualizar o registo do utilizador."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
-#. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:534 actions/smssettings.php:570
+#: actions/emailsettings.php:534 actions/smssettings.php:568
 msgid "Incoming email address removed."
 msgstr "Endereço electrónico de entrada foi removido."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
-#. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:558 actions/smssettings.php:595
+#: actions/emailsettings.php:558 actions/smssettings.php:591
 msgid "New incoming email address added."
 msgstr "Adicionado endereço electrónico de entrada novo."
 
@@ -2718,7 +2702,7 @@ msgstr "Esta nota já é uma favorita!"
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
 #: actions/favor.php:95
 #, fuzzy
-msgid "Disfavor favorite."
+msgid "Disfavor favorite"
 msgstr "Retirar das favoritas"
 
 #. TRANS: Page title for first page of favorited notices.
@@ -2959,13 +2943,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
 #: actions/groupblock.php:191
 #, fuzzy
-msgid "Do not block this user from this group."
+msgid "Do not block this user from this group"
 msgstr "Não bloquear acesso deste utilizador a este grupo"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
 #: actions/groupblock.php:198
 #, fuzzy
-msgid "Block this user from this group."
+msgid "Block this user from this group"
 msgstr "Bloquear acesso deste utilizador a este grupo"
 
 #. TRANS: Server error displayed when trying to block a user from a group fails because of an application error.
@@ -2974,7 +2958,6 @@ msgid "Database error blocking user from group."
 msgstr "Erro na base de dados ao bloquear acesso do utilizador ao grupo."
 
 #. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
-#. TRANS: Client error displayed trying to find a user by ID without providing an ID.
 #: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr "Sem ID."
@@ -3163,10 +3146,8 @@ msgid "Group search"
 msgstr "Pesquisa de grupos"
 
 #. TRANS: Text on page where groups can be searched if no results were found for a query.
-#. TRANS: Text for notice search results is the query had no results.
-#. TRANS: Message on the "People search" page where a query has no results.
-#: actions/groupsearch.php:82 actions/noticesearch.php:122
-#: actions/peoplesearch.php:87
+#: actions/groupsearch.php:82 actions/noticesearch.php:117
+#: actions/peoplesearch.php:83
 msgid "No results."
 msgstr "Sem resultados."
 
@@ -3203,7 +3184,6 @@ msgid "User is not blocked from group."
 msgstr "Acesso do utilizador ao grupo não foi bloqueado."
 
 #. TRANS: Server error displayed when unblocking a user from a group fails because of an unknown error.
-#. TRANS: Server error displayed when removing a user block.
 #: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "Erro ao remover o bloqueio."
@@ -3299,8 +3279,7 @@ msgid "Publish a MicroID for my Jabber/Google Talk address."
 msgstr "Publicar um MicroID para o meu endereço Jabber/GTalk."
 
 #. TRANS: Confirmation message for successful Instant Messaging preferences save.
-#. TRANS: Confirmation message after saving preferences.
-#: actions/imsettings.php:283 actions/othersettings.php:193
+#: actions/imsettings.php:283 actions/othersettings.php:192
 msgid "Preferences saved."
 msgstr "Preferências gravadas."
 
@@ -3596,7 +3575,7 @@ msgstr "Tem de iniciar uma sessão para deixar um grupo."
 
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
-#: actions/leavegroup.php:103 lib/command.php:386
+#: actions/leavegroup.php:103 lib/command.php:398
 msgid "You are not a member of that group."
 msgstr "Não é um membro desse grupo."
 
@@ -3719,43 +3698,41 @@ msgstr "Gravar"
 msgid "Save license settings"
 msgstr ""
 
-#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
-#: actions/login.php:97 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
 msgid "Already logged in."
 msgstr "Sessão já foi iniciada."
 
-#: actions/login.php:142
+#: actions/login.php:148
 msgid "Incorrect username or password."
 msgstr "Nome de utilizador ou senha incorrectos."
 
-#. TRANS: Server error displayed when a user object could not be created trying to login using "one time password login".
-#: actions/login.php:148 actions/otp.php:127
+#: actions/login.php:154 actions/otp.php:120
 msgid "Error setting user. You are probably not authorized."
 msgstr "Erro ao preparar o utilizador. Provavelmente não está autorizado."
 
-#: actions/login.php:202 actions/login.php:253
+#: actions/login.php:210 actions/login.php:263
 msgid "Login"
 msgstr "Entrar"
 
-#: actions/login.php:239
+#: actions/login.php:249
 msgid "Login to site"
 msgstr "Iniciar sessão no site"
 
-#: actions/login.php:248 actions/register.php:476
+#: actions/login.php:258 actions/register.php:490
 msgid "Remember me"
 msgstr "Lembrar-me neste computador"
 
-#: actions/login.php:249 actions/register.php:478
+#: actions/login.php:259 actions/register.php:492
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 "De futuro, iniciar sessão automaticamente. Não usar em computadores "
 "partilhados!"
 
-#: actions/login.php:259
+#: actions/login.php:269
 msgid "Lost or forgotten password?"
 msgstr "Perdeu ou esqueceu-se da senha?"
 
-#: actions/login.php:277
+#: actions/login.php:288
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -3763,11 +3740,11 @@ msgstr ""
 "Por razões de segurança, por favor re-introduza o seu nome de utilizador e "
 "senha antes de alterar as configurações."
 
-#: actions/login.php:281
+#: actions/login.php:292
 msgid "Login with your username and password."
 msgstr "Iniciar sessão com um nome de utilizador e senha."
 
-#: actions/login.php:284
+#: actions/login.php:295
 #, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -3849,14 +3826,14 @@ msgid "New message"
 msgstr "Mensagem nova"
 
 #. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
-#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:501
+#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:513
 msgid "You can't send a message to this user."
 msgstr "Não pode enviar uma mensagem a este utilizador."
 
 #. TRANS: Command exception text shown when trying to send a direct message to another user without content.
 #. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
-#: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:478
-#: lib/command.php:581
+#: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:490
+#: lib/command.php:593
 msgid "No content!"
 msgstr "Sem conteúdo!"
 
@@ -3865,7 +3842,7 @@ msgid "No recipient specified."
 msgstr "Não especificou um destinatário."
 
 #. TRANS: Error text shown when trying to send a direct message to self.
-#: actions/newmessage.php:167 lib/command.php:505
+#: actions/newmessage.php:167 lib/command.php:517
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr "Não auto-envie uma mensagem; basta lê-la baixinho a si próprio."
@@ -3876,7 +3853,7 @@ msgstr "Mensagem enviada"
 
 #. TRANS: Message given have sent a direct message to another user.
 #. TRANS: %s is the name of the other user.
-#: actions/newmessage.php:188 lib/command.php:513
+#: actions/newmessage.php:188 lib/command.php:525
 #, php-format
 msgid "Direct message to %s sent."
 msgstr "Mensagem directa para %s foi enviada."
@@ -3893,9 +3870,7 @@ msgstr "Nota nova"
 msgid "Notice posted"
 msgstr "Nota publicada"
 
-#. TRANS: Instructions for Notice search page.
-#. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/noticesearch.php:69
+#: actions/noticesearch.php:68
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -3904,21 +3879,16 @@ msgstr ""
 "Procure notas no %%site.name%%, pesquisando o seu conteúdo. Os termos de "
 "busca devem ter 3 ou mais caracteres e estar separados por espaços."
 
-#. TRANS: Title of the page where users can search for notices.
-#: actions/noticesearch.php:80
+#: actions/noticesearch.php:78
 msgid "Text search"
 msgstr "Pesquisa de texto"
 
-#. TRANS: Test in RSS notice search.
-#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearch.php:95
+#: actions/noticesearch.php:91
 #, php-format
 msgid "Search results for \"%1$s\" on %2$s"
 msgstr "Resultados da pesquisa de \"%1$s\" em %2$s"
 
-#. TRANS: Text for logged in users making a query for notices without results.
-#. TRANS: This message contains a Markdown link.
-#: actions/noticesearch.php:128
+#: actions/noticesearch.php:121
 #, php-format
 msgid ""
 "Be the first to [post on this topic](%%%%action.newnotice%%%%?"
@@ -3927,9 +3897,7 @@ msgstr ""
 "Seja o primeiro a [publicar neste tópico](%%action.newnotice%%?"
 "status_textarea=%s)!"
 
-#. TRANS: Text for not logged in users making a query for notices without results.
-#. TRANS: This message contains Markdown links.
-#: actions/noticesearch.php:133
+#: actions/noticesearch.php:124
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and be the first to "
@@ -3938,17 +3906,14 @@ msgstr ""
 "Podia [registar uma conta](%%action.register%%) e ser a primeira pessoa a "
 "[publicar neste tópico](%%action.newnotice%%?status_textarea=%s)!"
 
-#. TRANS: RSS notice search feed title. %s is the query.
-#: actions/noticesearchrss.php:95
+#: actions/noticesearchrss.php:96
 #, php-format
 msgid "Updates with \"%s\""
 msgstr "Actualizações com \"%s\""
 
-#. TRANS: RSS notice search feed description.
-#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearchrss.php:99
+#: actions/noticesearchrss.php:98
 #, fuzzy, php-format
-msgid "Updates matching search term \"%1$s\" on %2$s."
+msgid "Updates matching search term \"%1$s\" on %2$s!"
 msgstr "Actualizações que contêm o termo \"%1$s\" em %2$s!"
 
 #: actions/nudge.php:85
@@ -3990,30 +3955,30 @@ msgid "You have not registered any applications yet."
 msgstr "Ainda não registou nenhuma aplicação."
 
 #. TRANS: Title for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:70
+#: actions/oauthconnectionssettings.php:71
 msgid "Connected applications"
 msgstr "Aplicações ligadas"
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:81
+#: actions/oauthconnectionssettings.php:83
 msgid "The following connections exist for your account."
 msgstr ""
 
 #. TRANS: Client error when trying to revoke access for an application while not being a user of it.
-#: actions/oauthconnectionssettings.php:166
+#: actions/oauthconnectionssettings.php:168
 msgid "You are not a user of that application."
 msgstr "Não é utilizador dessa aplicação."
 
 #. TRANS: Client error when revoking access has failed for some reason.
 #. TRANS: %s is the application ID revoking access failed for.
-#: actions/oauthconnectionssettings.php:181
+#: actions/oauthconnectionssettings.php:183
 #, fuzzy, php-format
 msgid "Unable to revoke access for application: %s."
 msgstr "Não foi possível retirar acesso da aplicação: %s"
 
 #. TRANS: Success message after revoking access for an application.
 #. TRANS: %1$s is the application name, %2$s is the first part of the user token.
-#: actions/oauthconnectionssettings.php:200
+#: actions/oauthconnectionssettings.php:202
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -4021,30 +3986,20 @@ msgid ""
 msgstr ""
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:211
+#: actions/oauthconnectionssettings.php:213
 msgid "You have not authorized any applications to use your account."
 msgstr "Não permitiu que nenhuma aplicação use a sua conta."
 
 #. TRANS: Note for developers in the OAuth connection settings form.
 #. TRANS: This message contains a Markdown link. Do not separate "](".
 #. TRANS: %s is the URL to the OAuth settings.
-#: actions/oauthconnectionssettings.php:231
+#: actions/oauthconnectionssettings.php:233
 #, php-format
 msgid ""
 "Are you a developer? [Register an OAuth client application](%s) to use with "
 "this instance of StatusNet."
 msgstr ""
 
-#: actions/oembed.php:64
-#, fuzzy, php-format
-msgid "\"%s\" not found."
-msgstr "Método da API não encontrado."
-
-#: actions/oembed.php:76
-#, fuzzy, php-format
-msgid "Notice %s not found."
-msgstr "Método da API não encontrado."
-
 #: actions/oembed.php:80 actions/shownotice.php:100
 msgid "Notice has no profile."
 msgstr "Nota não tem perfil."
@@ -4054,16 +4009,6 @@ msgstr "Nota não tem perfil."
 msgid "%1$s's status on %2$s"
 msgstr "Estado de %1$s em %2$s"
 
-#: actions/oembed.php:95
-#, fuzzy, php-format
-msgid "Attachment %s not found."
-msgstr "Destinatário não encontrado."
-
-#: actions/oembed.php:136
-#, php-format
-msgid "\"%s\" not supported for oembed requests."
-msgstr ""
-
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
 #: actions/oembed.php:168
 #, php-format
@@ -4082,12 +4027,11 @@ msgstr "Só URLs %s sobre HTTP simples, por favor."
 msgid "Not a supported data format."
 msgstr "Formato de dados não suportado."
 
-#. TRANS: ShortName in the OpenSearch interface when trying to find users.
 #: actions/opensearch.php:64
 msgid "People Search"
 msgstr "Pesquisa de Pessoas"
 
-#: actions/opensearch.php:68
+#: actions/opensearch.php:67
 msgid "Notice Search"
 msgstr "Pesquisa de Notas"
 
@@ -4107,7 +4051,7 @@ msgstr "Gerir várias outras opções."
 #. TRANS: here if it has one (most likely a single space).
 #: actions/othersettings.php:113
 msgid " (free service)"
-msgstr " (serviço gratuito)"
+msgstr " (serviço livre)"
 
 #. TRANS: Label for dropdown with URL shortener services.
 #: actions/othersettings.php:122
@@ -4135,46 +4079,37 @@ msgstr "Mostrar ou esconder estilos para o perfil."
 msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr "Serviço de encurtamento de URLs demasiado extenso (máx. 50 caracteres)"
 
-#. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
-#: actions/otp.php:70
+#: actions/otp.php:69
 msgid "No user ID specified."
 msgstr "Não foi especificado um ID de utilizador."
 
-#. TRANS: Client error displayed trying to use "one time password login" without specifying a login token.
-#: actions/otp.php:86
+#: actions/otp.php:83
 msgid "No login token specified."
 msgstr "Chave de entrada não foi especificada."
 
-#. TRANS: Client error displayed trying to use "one time password login" without requesting a login token.
-#: actions/otp.php:94
+#: actions/otp.php:90
 msgid "No login token requested."
 msgstr "Chave de entrada não foi pedida."
 
-#. TRANS: Client error displayed trying to use "one time password login" while specifying an invalid login token.
-#: actions/otp.php:100
+#: actions/otp.php:95
 msgid "Invalid login token specified."
 msgstr "Chave de entrada especificada é inválida."
 
-#. TRANS: Client error displayed trying to use "one time password login" while specifying an expired login token.
-#: actions/otp.php:110
+#: actions/otp.php:104
 msgid "Login token expired."
 msgstr "Chave de entrada expirou."
 
-#. TRANS: Title for outbox for any but the fist page.
-#. TRANS: %1$s is the user nickname, %2$d is the page number.
-#: actions/outbox.php:57
+#: actions/outbox.php:58
 #, php-format
 msgid "Outbox for %1$s - page %2$d"
 msgstr "Caixa de saída de %s - página %2$d"
 
-#. TRANS: Title for first page of outbox.
 #: actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
 msgstr "Caixa de saída de %s"
 
-#. TRANS: Instructions for outbox.
-#: actions/outbox.php:103
+#: actions/outbox.php:104
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr ""
 "Esta é a sua caixa de saída, que apresenta as mensagens privadas que enviou."
@@ -4201,45 +4136,43 @@ msgstr "Antiga"
 msgid "New password"
 msgstr "Nova"
 
-#: actions/passwordsettings.php:109 actions/register.php:423
+#: actions/passwordsettings.php:109
 #, fuzzy
-msgid "6 or more characters."
+msgid "6 or more characters"
 msgstr "6 ou mais caracteres"
 
-#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:264
-#: actions/register.php:427
+#: actions/passwordsettings.php:113
 #, fuzzy
-msgid "Same as password above."
+msgid "Same as password above"
 msgstr "Repita a senha nova"
 
 #: actions/passwordsettings.php:117
 msgid "Change"
 msgstr "Modificar"
 
-#: actions/passwordsettings.php:153 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:238
 msgid "Password must be 6 or more characters."
 msgstr "Senha tem de ter 6 ou mais caracteres."
 
-#: actions/passwordsettings.php:156 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:241
 msgid "Passwords don't match."
 msgstr "Senhas não coincidem."
 
-#: actions/passwordsettings.php:164
+#: actions/passwordsettings.php:165
 msgid "Incorrect old password"
 msgstr "Senha antiga incorrecta."
 
-#: actions/passwordsettings.php:180
+#: actions/passwordsettings.php:181
 msgid "Error saving user; invalid."
 msgstr "Erro ao guardar utilizador; inválido."
 
-#. TRANS: Reset password form validation error message.
-#: actions/passwordsettings.php:185 actions/recoverpassword.php:418
+#: actions/passwordsettings.php:186
 #, fuzzy
-msgid "Cannot save new password."
+msgid "Can't save new password."
 msgstr "Não é possível guardar a nova senha."
 
-#: actions/passwordsettings.php:191
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
 msgid "Password saved."
 msgstr "Senha gravada."
 
@@ -4531,9 +4464,7 @@ msgstr "Servidor para onde encaminhar pedidos SSL"
 msgid "Save paths"
 msgstr "Gravar localizações"
 
-#. TRANS: Instructions for the "People search" page.
-#. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/peoplesearch.php:54
+#: actions/peoplesearch.php:52
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
@@ -4543,8 +4474,7 @@ msgstr ""
 "interesses. Os termos de busca devem ter 3 ou mais caracteres e estar "
 "separados por espaços."
 
-#. TRANS: Title of a page where users can search for other users.
-#: actions/peoplesearch.php:61
+#: actions/peoplesearch.php:58
 msgid "People search"
 msgstr "Pesquisa de pessoas"
 
@@ -4587,7 +4517,7 @@ msgid "Profile information"
 msgstr "Informação do perfil"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109 actions/register.php:419
+#: actions/profilesettings.php:109 actions/register.php:433
 #, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr "1-64 letras minúsculas ou números, sem pontuação ou espaços"
@@ -4595,7 +4525,7 @@ msgstr "1-64 letras minúsculas ou números, sem pontuação ou espaços"
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for full group name (dt). Text hidden by default.
 #. TRANS: DT for full name in a profile.
-#: actions/profilesettings.php:113 actions/register.php:441
+#: actions/profilesettings.php:113 actions/register.php:455
 #: actions/showgroup.php:255 actions/tagother.php:104
 #: lib/groupeditform.php:150 lib/userprofile.php:156
 msgid "Full name"
@@ -4603,13 +4533,13 @@ msgstr "Nome completo"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:118 actions/register.php:446
+#: actions/profilesettings.php:118 actions/register.php:460
 #: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "Página pessoal"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:121 actions/register.php:448
+#: actions/profilesettings.php:121
 #, fuzzy
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr "URL da sua página pessoal, blogue ou perfil noutro site na internet"
@@ -4617,7 +4547,7 @@ msgstr "URL da sua página pessoal, blogue ou perfil noutro site na internet"
 #. TRANS: Tooltip for field label in form for profile settings. Plural
 #. TRANS: is decided by the number of characters available for the
 #. TRANS: biography (%d).
-#: actions/profilesettings.php:129 actions/register.php:457
+#: actions/profilesettings.php:129 actions/register.php:471
 #, fuzzy, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4625,29 +4555,28 @@ msgstr[0] "Descreva-se e aos seus interesses (máx. 140 caracteres)"
 msgstr[1] "Descreva-se e aos seus interesses (máx. 140 caracteres)"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:135 actions/register.php:462
+#: actions/profilesettings.php:135 actions/register.php:476
 msgid "Describe yourself and your interests"
 msgstr "Descreva-se e aos seus interesses"
 
 #. TRANS: Text area label in form for profile settings where users can provide.
 #. TRANS: their biography.
-#: actions/profilesettings.php:139 actions/register.php:464
+#: actions/profilesettings.php:139 actions/register.php:478
 msgid "Bio"
 msgstr "Biografia"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group location (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT for location in a profile.
-#: actions/profilesettings.php:145 actions/register.php:469
+#: actions/profilesettings.php:145 actions/register.php:483
 #: actions/showgroup.php:265 actions/tagother.php:112
-#: actions/userauthorization.php:174 lib/groupeditform.php:173
+#: actions/userauthorization.php:166 lib/groupeditform.php:173
 #: lib/userprofile.php:172
 msgid "Location"
 msgstr "Localidade"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148
+#: actions/profilesettings.php:148 actions/register.php:485
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Onde está, por ex. \"Cidade, Região, País\""
 
@@ -4668,8 +4597,7 @@ msgstr "Categorias"
 #: actions/profilesettings.php:164
 #, fuzzy
 msgid ""
-"Tags for yourself (letters, numbers, -, ., and _), comma- or space- "
-"separated."
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr ""
 "Categorias para si (letras, números, -, ., _), separadas por vírgulas ou "
 "espaços"
@@ -4682,7 +4610,7 @@ msgstr "Língua"
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
 #: actions/profilesettings.php:171
 #, fuzzy
-msgid "Preferred language."
+msgid "Preferred language"
 msgstr "Língua preferida"
 
 #. TRANS: Dropdownlist label in form for profile settings.
@@ -4699,13 +4627,13 @@ msgstr "Em que fuso horário se encontra normalmente?"
 #: actions/profilesettings.php:189
 #, fuzzy
 msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)."
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr "Subscrever automaticamente quem me subscreva (óptimo para não-humanos)"
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Plural form is used based on the maximum number of allowed
 #. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:258 actions/register.php:221
+#: actions/profilesettings.php:258 actions/register.php:229
 #, fuzzy, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4725,9 +4653,9 @@ msgstr "Língua é demasiado extensa (máx. 50 caracteres)."
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:291
-#, fuzzy, php-format
-msgid "Invalid tag: \"%s\"."
+#: actions/profilesettings.php:291 actions/tagother.php:178
+#, php-format
+msgid "Invalid tag: \"%s\""
 msgstr "Categoria inválida: \"%s\""
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
@@ -4836,12 +4764,6 @@ msgstr ""
 "wikipedia.org/wiki/Micro-blogging) baseado no programa de Software Livre "
 "[StatusNet](http://status.net/)."
 
-#. TRANS: Public RSS feed description. %s is the StatusNet site name.
-#: actions/publicrss.php:106
-#, fuzzy, php-format
-msgid "%s updates from everyone."
-msgstr "%s actualizações de todos!"
-
 #. TRANS: Title for public tag cloud.
 #: actions/publictagcloud.php:57
 msgid "Public tag cloud"
@@ -4980,12 +4902,6 @@ msgstr "Recuperar senha"
 msgid "Password recovery requested"
 msgstr "Solicitada recuperação da senha"
 
-#. TRANS: Title for password recovery page in password saved mode.
-#: actions/recoverpassword.php:229
-#, fuzzy
-msgid "Password saved"
-msgstr "Senha gravada."
-
 #. TRANS: Title for password recovery page when an unknown action has been specified.
 #: actions/recoverpassword.php:232
 msgid "Unknown action"
@@ -4997,6 +4913,12 @@ msgstr "Acção desconhecida"
 msgid "6 or more characters, and do not forget it!"
 msgstr "6 ou mais caracteres, e não a esqueça!"
 
+#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#: actions/recoverpassword.php:264 actions/register.php:441
+#, fuzzy
+msgid "Same as password above."
+msgstr "Repita a senha nova"
+
 #. TRANS: Button text for password reset form.
 #. TRANS: Button text on profile design page to reset all colour settings to default without saving.
 #: actions/recoverpassword.php:268 lib/designsettings.php:264
@@ -5051,8 +4973,14 @@ msgstr "Senha tem de ter 6 ou mais caracteres."
 msgid "Password and confirmation do not match."
 msgstr "A senha e a confirmação não coincidem."
 
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:418
+#, fuzzy
+msgid "Cannot save new password."
+msgstr "Não é possível guardar a nova senha."
+
 #. TRANS: Server error displayed when something does wrong with the user object during password reset.
-#: actions/recoverpassword.php:426 actions/register.php:248
+#: actions/recoverpassword.php:426 actions/register.php:256
 msgid "Error setting user."
 msgstr "Erro ao configurar utilizador."
 
@@ -5061,96 +4989,101 @@ msgstr "Erro ao configurar utilizador."
 msgid "New password successfully saved. You are now logged in."
 msgstr "A senha nova foi gravada com sucesso. Iniciou uma sessão."
 
-#: actions/register.php:87 actions/register.php:188 actions/register.php:399
+#: actions/register.php:92 actions/register.php:196 actions/register.php:413
 msgid "Sorry, only invited people can register."
 msgstr "Desculpe, só pessoas convidadas se podem registar."
 
-#: actions/register.php:94
+#: actions/register.php:99
 msgid "Sorry, invalid invitation code."
 msgstr "Desculpe, código de convite inválido."
 
-#: actions/register.php:113
+#: actions/register.php:119
 msgid "Registration successful"
 msgstr "Registo efectuado"
 
-#: actions/register.php:115 actions/register.php:497
+#: actions/register.php:121 actions/register.php:511
 msgid "Register"
 msgstr "Registar"
 
-#: actions/register.php:135
+#: actions/register.php:142
 msgid "Registration not allowed."
 msgstr "Registo não é permitido."
 
-#: actions/register.php:201
+#: actions/register.php:209
 #, fuzzy
-msgid "You cannot register if you don't agree to the license."
+msgid "You can't register if you don't agree to the license."
 msgstr "Não se pode registar se não aceita a licença."
 
-#: actions/register.php:210
+#: actions/register.php:218
 msgid "Email address already exists."
 msgstr "Correio electrónico já existe."
 
-#: actions/register.php:243 actions/register.php:265
+#: actions/register.php:251 actions/register.php:273
 msgid "Invalid username or password."
 msgstr "Nome de utilizador ou senha inválidos."
 
-#: actions/register.php:340
+#: actions/register.php:351
 #, fuzzy
 msgid ""
 "With this form you can create a new account. You can then post notices and "
-"link up to friends and colleagues."
+"link up to friends and colleagues. "
 msgstr ""
 "Com este formulário pode criar uma conta nova. Poderá então publicar notas e "
 "ligar-se a amigos e colegas. "
 
+#: actions/register.php:437
+#, fuzzy
+msgid "6 or more characters."
+msgstr "6 ou mais caracteres"
+
 #. TRANS: Link description in user account settings menu.
-#: actions/register.php:431 actions/register.php:435
+#: actions/register.php:445 actions/register.php:449
 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
 msgid "Email"
 msgstr "Correio"
 
-#: actions/register.php:432 actions/register.php:436
+#: actions/register.php:446 actions/register.php:450
 #, fuzzy
-msgid "Used only for updates, announcements, and password recovery."
+msgid "Used only for updates, announcements, and password recovery"
 msgstr "Usado apenas para actualizações, anúncios e recuperação da senha"
 
-#: actions/register.php:443
+#: actions/register.php:457
 #, fuzzy
-msgid "Longer name, preferably your \"real\" name."
+msgid "Longer name, preferably your \"real\" name"
 msgstr "Nome mais longo, de preferência o seu nome \"verdadeiro\""
 
-#: actions/register.php:471
+#: actions/register.php:462
 #, fuzzy
-msgid "Where you are, like \"City, State (or Region), Country\"."
-msgstr "Onde está, por ex. \"Cidade, Região, País\""
+msgid "URL of your homepage, blog, or profile on another site"
+msgstr "URL da sua página pessoal, blogue ou perfil noutro site na internet"
 
-#: actions/register.php:510
+#: actions/register.php:523
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
 msgstr ""
 "Compreendo que o conteúdo e dados do site %1$s são privados e confidenciais."
 
-#: actions/register.php:520
+#: actions/register.php:533
 #, php-format
 msgid "My text and files are copyright by %1$s."
 msgstr ""
 "Os meus textos e ficheiros estão protegidos pelos direitos de autor de %1$s."
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:524
+#: actions/register.php:537
 msgid "My text and files remain under my own copyright."
 msgstr ""
 "Os meus textos e ficheiros permanecem protegidos pelos meus próprios "
 "direitos de autor."
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:527
+#: actions/register.php:540
 msgid "All rights reserved."
 msgstr "Todos os direitos reservados."
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:532
+#: actions/register.php:545
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -5160,7 +5093,7 @@ msgstr ""
 "estes dados privados: senha, endereço de correio electrónico, endereço de "
 "mensageiro instantâneo, número de telefone."
 
-#: actions/register.php:573
+#: actions/register.php:588
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -5193,7 +5126,7 @@ msgstr ""
 "\n"
 "Obrigado por se ter registado e esperamos que se divirta usando este serviço."
 
-#: actions/register.php:597
+#: actions/register.php:612
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5227,7 +5160,7 @@ msgstr "Nome do utilizador"
 
 #: actions/remotesubscribe.php:129
 #, fuzzy
-msgid "Nickname of the user you want to follow."
+msgid "Nickname of the user you want to follow"
 msgstr "Nome do utilizador que pretende seguir"
 
 #: actions/remotesubscribe.php:132
@@ -5236,7 +5169,7 @@ msgstr "URL do perfil"
 
 #: actions/remotesubscribe.php:133
 #, fuzzy
-msgid "URL of your profile on another compatible microblogging service."
+msgid "URL of your profile on another compatible microblogging service"
 msgstr "URL do seu perfil noutro serviço de microblogues compatível"
 
 #. TRANS: Link text for link that will subscribe to a remote profile.
@@ -5247,7 +5180,7 @@ msgstr "Subscrever"
 
 #: actions/remotesubscribe.php:158
 #, fuzzy
-msgid "Invalid profile URL (bad format)."
+msgid "Invalid profile URL (bad format)"
 msgstr "URL de perfil inválido (formato incorrecto)"
 
 #: actions/remotesubscribe.php:167
@@ -5291,7 +5224,6 @@ msgstr "Repetida"
 msgid "Repeated!"
 msgstr "Repetida!"
 
-#. TRANS: RSS reply feed title. %s is a user nickname.
 #. TRANS: Tooltip for personal group navigation menu option when logged in for viewing @-replies.
 #: actions/replies.php:126 actions/repliesrss.php:68
 #: lib/personalgroupnav.php:109
@@ -5345,11 +5277,9 @@ msgstr ""
 "Pode tentar [dar um toque em %1$s](../%2$s) ou [endereçar-lhe uma nota](%%%%"
 "action.newnotice%%%%?status_textarea=%3$s)."
 
-#. TRANS: RSS reply feed description.
-#. TRANS: %1$s is a user nickname, %2$s is the StatusNet site name.
-#: actions/repliesrss.php:74
+#: actions/repliesrss.php:72
 #, fuzzy, php-format
-msgid "Replies to %1$s on %2$s."
+msgid "Replies to %1$s on %2$s!"
 msgstr "Respostas a %1$s em %2$s!"
 
 #. TRANS: Client exception displayed when trying to restore an account while not logged in.
@@ -5451,7 +5381,7 @@ msgstr "Não pode retirar funções aos utilizadores neste site."
 msgid "User doesn't have this role."
 msgstr "O utilizador não tem esta função."
 
-#: actions/rsd.php:142 actions/version.php:159
+#: actions/rsd.php:146 actions/version.php:159
 msgid "StatusNet"
 msgstr "StatusNet"
 
@@ -5493,87 +5423,87 @@ msgstr "Ligar a impressão de dados de depuração, para sessões."
 msgid "Save site settings"
 msgstr "Gravar configurações do site"
 
-#: actions/showapplication.php:78
+#: actions/showapplication.php:82
 msgid "You must be logged in to view an application."
 msgstr "Tem de iniciar uma sessão para ver uma aplicação."
 
-#: actions/showapplication.php:151
+#: actions/showapplication.php:157
 msgid "Application profile"
 msgstr "Perfil da aplicação"
 
 #. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:153 lib/applicationeditform.php:177
+#: actions/showapplication.php:159 lib/applicationeditform.php:177
 msgid "Icon"
 msgstr "Ícone"
 
 #. TRANS: Form input field label for application name.
-#: actions/showapplication.php:163 actions/version.php:197
+#: actions/showapplication.php:169 actions/version.php:197
 #: lib/applicationeditform.php:190
 msgid "Name"
 msgstr "Nome"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:172 lib/applicationeditform.php:227
+#: actions/showapplication.php:178 lib/applicationeditform.php:227
 msgid "Organization"
 msgstr "Organização"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:181 actions/version.php:200
+#: actions/showapplication.php:187 actions/version.php:200
 #: lib/applicationeditform.php:208 lib/groupeditform.php:168
 msgid "Description"
 msgstr "Descrição"
 
 #. TRANS: Header for group statistics on a group page (h2).
 #. TRANS: H2 text for user statistics.
-#: actions/showapplication.php:186 actions/showgroup.php:460
+#: actions/showapplication.php:192 actions/showgroup.php:460
 #: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "Estatísticas"
 
-#: actions/showapplication.php:197
+#: actions/showapplication.php:203
 #, php-format
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr "Criado por %1$s - acesso por omissão %2$s - %3$d utilizadores"
 
-#: actions/showapplication.php:207
+#: actions/showapplication.php:213
 msgid "Application actions"
 msgstr "Operações da aplicação"
 
-#: actions/showapplication.php:230
+#: actions/showapplication.php:236
 msgid "Reset key & secret"
 msgstr "Reiniciar chave e segredo"
 
 #. TRANS: Title of form for deleting a user.
-#: actions/showapplication.php:246 lib/deletegroupform.php:121
+#: actions/showapplication.php:252 lib/deletegroupform.php:121
 #: lib/deleteuserform.php:64 lib/noticelist.php:673
 msgid "Delete"
 msgstr "Apagar"
 
-#: actions/showapplication.php:255
+#: actions/showapplication.php:261
 msgid "Application info"
 msgstr "Informação da aplicação"
 
-#: actions/showapplication.php:257
+#: actions/showapplication.php:263
 msgid "Consumer key"
 msgstr "Chave do consumidor"
 
-#: actions/showapplication.php:262
+#: actions/showapplication.php:268
 msgid "Consumer secret"
 msgstr "Segredo do consumidor"
 
-#: actions/showapplication.php:267
+#: actions/showapplication.php:273
 msgid "Request token URL"
 msgstr "URL da chave de pedido"
 
-#: actions/showapplication.php:272
+#: actions/showapplication.php:278
 msgid "Access token URL"
 msgstr "URL da chave de acesso"
 
-#: actions/showapplication.php:277
+#: actions/showapplication.php:283
 msgid "Authorize URL"
 msgstr "Autorizar URL"
 
-#: actions/showapplication.php:282
+#: actions/showapplication.php:288
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
@@ -5581,7 +5511,7 @@ msgstr ""
 "Nota: Assinaturas HMAC-SHA1 são suportadas. O método de assinatura com texto "
 "simples não é suportado."
 
-#: actions/showapplication.php:302
+#: actions/showapplication.php:309
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr ""
 "Tem a certeza de que quer reiniciar a sua chave e segredo de consumidor?"
@@ -5675,18 +5605,16 @@ msgid "Group profile"
 msgstr "Perfil do grupo"
 
 #. TRANS: Label for group URL (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT for URL in a profile.
 #: actions/showgroup.php:273 actions/tagother.php:118
-#: actions/userauthorization.php:184 lib/userprofile.php:186
+#: actions/userauthorization.php:175 lib/userprofile.php:186
 msgid "URL"
 msgstr "URL"
 
 #. TRANS: Label for group description or group note (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page where bio is displayed.
 #. TRANS: DT for note in a profile.
 #: actions/showgroup.php:285 actions/tagother.php:128
-#: actions/userauthorization.php:197 lib/userprofile.php:204
+#: actions/userauthorization.php:187 lib/userprofile.php:204
 msgid "Note"
 msgstr "Anotação"
 
@@ -5834,7 +5762,7 @@ msgid "%1$s tagged %2$s"
 msgstr "%1$s, página %2$d"
 
 #. TRANS: Page title showing tagged notices in one user's stream.
-#. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
+#. TRANS: %1$s is the username, %2$s is the hash tag, %1$d is the page number.
 #: actions/showstream.php:74
 #, fuzzy, php-format
 msgid "%1$s tagged %2$s, page %3$d"
@@ -6085,7 +6013,7 @@ msgstr "Texto do aviso do site (máx. 255 caracteres; pode usar HTML)"
 #. TRANS: Title for button to save site notice in admin panel.
 #: actions/sitenoticeadminpanel.php:201
 #, fuzzy
-msgid "Save site notice."
+msgid "Save site notice"
 msgstr "Gravar aviso do site"
 
 #. TRANS: Title for SMS settings.
@@ -6144,7 +6072,7 @@ msgstr "Número de telefone para SMS"
 #. TRANS: SMS phone number input field instructions in SMS settings form.
 #: actions/smssettings.php:152
 #, fuzzy
-msgid "Phone number, no punctuation or spaces, with area code."
+msgid "Phone number, no punctuation or spaces, with area code"
 msgstr "Número de telefone, sem pontuação ou espaços, com código de área"
 
 #. TRANS: Form legend for SMS preferences form.
@@ -6314,19 +6242,15 @@ msgstr "Não subscreveu esse perfil."
 msgid "Could not save subscription."
 msgstr "Não foi possível gravar a subscrição."
 
-#. TRANS: Client error displayed trying to perform any request method other than POST.
-#. TRANS: Do not translate POST.
 #: actions/subscribe.php:77
 msgid "This action only accepts POST requests."
 msgstr "Esta operação só aceita pedidos POST."
 
-#. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
-#: actions/subscribe.php:121
+#: actions/subscribe.php:117
 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
 msgstr "Não pode subscrever um perfil remoto OMB 0.1 com esta operação."
 
-#. TRANS: Page title when subscription succeeded.
-#: actions/subscribe.php:149
+#: actions/subscribe.php:145
 msgid "Subscribed"
 msgstr "Subscrito"
 
@@ -6487,9 +6411,8 @@ msgstr "Categoria %s"
 msgid "User profile"
 msgstr "Perfil"
 
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT element in area for user avatar.
-#: actions/tagother.php:81 actions/userauthorization.php:138
+#: actions/tagother.php:81 actions/userauthorization.php:132
 #: lib/userprofile.php:108
 msgid "Photo"
 msgstr "Foto"
@@ -6506,11 +6429,6 @@ msgstr ""
 "Categorias para este utilizador (letras, números, ., _), separadas por "
 "vírgulas ou espaços"
 
-#: actions/tagother.php:178
-#, php-format
-msgid "Invalid tag: \"%s\""
-msgstr "Categoria inválida: \"%s\""
-
 #: actions/tagother.php:193
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
@@ -6526,7 +6444,6 @@ msgstr ""
 msgid "No such tag."
 msgstr "Categoria não foi encontrada."
 
-#. TRANS: Client error displayed when trying to unblock a non-blocked user.
 #: actions/unblock.php:59
 msgid "You haven't blocked that user."
 msgstr "Não bloqueou esse utilizador."
@@ -6547,7 +6464,7 @@ msgstr "O pedido não tem a identificação do perfil."
 msgid "Unsubscribed"
 msgstr "Subscrição cancelada"
 
-#: actions/updateprofile.php:64
+#: actions/updateprofile.php:64 actions/userauthorization.php:337
 #, php-format
 msgid ""
 "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
@@ -6581,7 +6498,7 @@ msgstr "Texto de boas-vindas inválido. Tamanho máx. é 255 caracteres."
 #. TRANS: users in user admin panel. %1$s is the invalid nickname.
 #: actions/useradminpanel.php:166
 #, fuzzy, php-format
-msgid "Invalid default subscripton: \"%1$s\" is not a user."
+msgid "Invalid default subscripton: '%1$s' is not a user."
 msgstr "Subscrição predefinida é inválida: '%1$s' não é utilizador."
 
 #. TRANS: Link description in user account settings menu.
@@ -6643,70 +6560,59 @@ msgstr "Permitir, ou não, que utilizadores convidem utilizadores novos."
 #. TRANS: Title for button to save user settings in user admin panel.
 #: actions/useradminpanel.php:302
 #, fuzzy
-msgid "Save user settings."
+msgid "Save user settings"
 msgstr "Gravar configurações do site"
 
-#. TRANS: Page title.
-#: actions/userauthorization.php:109
+#: actions/userauthorization.php:105
 msgid "Authorize subscription"
 msgstr "Autorizar subscrição"
 
-#. TRANS: Page notice on "Auhtorize subscription" page.
-#: actions/userauthorization.php:115
+#: actions/userauthorization.php:110
 #, fuzzy
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
 "user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
-"click \"Reject\"."
+"click “Reject”."
 msgstr ""
 "Por favor, verifique estes detalhes para se certificar de que deseja "
 "subscrever as notas deste utilizador. Se não fez um pedido para subscrever "
 "as notas de alguém, simplesmente clique \"Rejeitar\"."
 
-#. TRANS: DT element on Authorise Subscription page where license is displayed.
 #. TRANS: Menu item for site administration
-#: actions/userauthorization.php:207 actions/version.php:167
+#: actions/userauthorization.php:196 actions/version.php:167
 #: lib/adminpanelaction.php:403
 msgid "License"
 msgstr "Licença"
 
-#. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:229
+#: actions/userauthorization.php:217
 #, fuzzy
-msgctxt "BUTTON"
 msgid "Accept"
 msgstr "Aceitar"
 
-#. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:231
-#, fuzzy
-msgid "Subscribe to this user."
+#: actions/userauthorization.php:218 lib/subscribeform.php:115
+#: lib/subscribeform.php:139
+msgid "Subscribe to this user"
 msgstr "Subscrever este utilizador"
 
-#. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:233
+#: actions/userauthorization.php:219
 #, fuzzy
-msgctxt "BUTTON"
 msgid "Reject"
 msgstr "Rejeitar"
 
-#. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:235
+#: actions/userauthorization.php:220
 #, fuzzy
-msgid "Reject this subscription."
+msgid "Reject this subscription"
 msgstr "Rejeitar esta subscrição"
 
-#. TRANS: Client error displayed for an empty authorisation request.
-#: actions/userauthorization.php:248
+#: actions/userauthorization.php:232
 msgid "No authorization request!"
 msgstr "Não há pedido de autorização!"
 
-#. TRANS: Accept message header from Authorise subscription page.
-#: actions/userauthorization.php:271
+#: actions/userauthorization.php:254
 msgid "Subscription authorized"
 msgstr "Subscrição autorizada"
 
-#: actions/userauthorization.php:274
+#: actions/userauthorization.php:256
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to authorize the "
@@ -6716,12 +6622,11 @@ msgstr ""
 "Verifique as instruções do site para saber como autorizar a subscrição. A "
 "sua chave de subscrição é:"
 
-#. TRANS: Reject message header from Authorise subscription page.
-#: actions/userauthorization.php:285
+#: actions/userauthorization.php:266
 msgid "Subscription rejected"
 msgstr "Subscrição rejeitada"
 
-#: actions/userauthorization.php:288
+#: actions/userauthorization.php:268
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to fully reject the "
@@ -6731,64 +6636,39 @@ msgstr ""
 "Verifique as instruções do site para saber como rejeitar completamente a "
 "subscrição."
 
-#. TRANS: Exception thrown when no valid user is found for an authorisation request.
-#. TRANS: %s is a listener URI.
-#: actions/userauthorization.php:325
+#: actions/userauthorization.php:303
 #, fuzzy, php-format
-msgid "Listener URI \"%s\" not found here."
+msgid "Listener URI ‘%s’ not found here."
 msgstr "A listener URI ‘%s’ não foi encontrada aqui."
 
-#. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:332
+#: actions/userauthorization.php:308
 #, fuzzy, php-format
-msgid "Listenee URI \"%s\" is too long."
+msgid "Listenee URI ‘%s’ is too long."
 msgstr "URI do escutado ‘%s’ é demasiado longo."
 
-#. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:340
+#: actions/userauthorization.php:314
 #, fuzzy, php-format
-msgid "Listenee URI \"%s\" is a local user."
+msgid "Listenee URI ‘%s’ is a local user."
 msgstr "URI do ouvido ‘%s’ é um utilizador local."
 
-#. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
-#. TRANS: %s is a profile URL.
-#: actions/userauthorization.php:358
+#: actions/userauthorization.php:329
 #, fuzzy, php-format
-msgid "Profile URL \"%s\" is for a local user."
+msgid "Profile URL ‘%s’ is for a local user."
 msgstr "A URL ‘%s’ do perfil é de um utilizador local."
 
-#. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
-#. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
-#: actions/userauthorization.php:368
+#: actions/userauthorization.php:345
 #, fuzzy, php-format
-msgid ""
-"Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
-"\"."
-msgstr ""
-"Licença ‘%1$s’ da listenee stream não é compatível com a licença ‘%2$s’ do "
-"site."
-
-#. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:378
-#, fuzzy, php-format
-msgid "Avatar URL \"%s\" is not valid."
+msgid "Avatar URL ‘%s’ is not valid."
 msgstr "A URL ‘%s’ do avatar é inválida."
 
-#. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:385
+#: actions/userauthorization.php:350
 #, fuzzy, php-format
-msgid "Cannot read avatar URL \"%s\"."
+msgid "Can’t read avatar URL ‘%s’."
 msgstr "Não é possível ler a URL do avatar ‘%s’."
 
-#. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:392
+#: actions/userauthorization.php:355
 #, fuzzy, php-format
-msgid "Wrong image type for avatar URL \"%s\"."
+msgid "Wrong image type for avatar URL ‘%s’."
 msgstr "Tipo de imagem incorrecto para o avatar da URL ‘%s’."
 
 #. TRANS: Page title for profile design page.
@@ -6895,7 +6775,7 @@ msgid "Plugins"
 msgstr "Plugins"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:898
+#: actions/version.php:198 lib/action.php:901
 msgid "Version"
 msgstr "Versão"
 
@@ -7108,14 +6988,14 @@ msgstr "Problema na gravação da caixa de entrada do grupo."
 
 #. TRANS: Server exception thrown when a reply cannot be saved.
 #. TRANS: %1$d is a notice ID, %2$d is the ID of the mentioned user.
-#: classes/Notice.php:1142
+#: classes/Notice.php:1144
 #, fuzzy, php-format
 msgid "Could not save reply for %1$d, %2$d."
 msgstr "Não foi possível gravar a informação do grupo local."
 
 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1661
+#: classes/Notice.php:1663
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
@@ -7129,7 +7009,7 @@ msgstr "%1$s (%2$s)"
 
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:775
+#: classes/Profile.php:779
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
@@ -7137,7 +7017,7 @@ msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:784
+#: classes/Profile.php:788
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -7456,53 +7336,53 @@ msgid "Page notice"
 msgstr "Aviso da página"
 
 #. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:871
+#: lib/action.php:874
 msgid "Secondary site navigation"
 msgstr "Navegação secundária deste site"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:877
+#: lib/action.php:880
 msgid "Help"
 msgstr "Ajuda"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:880
+#: lib/action.php:883
 msgid "About"
 msgstr "Sobre"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:883
+#: lib/action.php:886
 msgid "FAQ"
 msgstr "FAQ"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:888
+#: lib/action.php:891
 msgid "TOS"
 msgstr "Termos"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:892
+#: lib/action.php:895
 msgid "Privacy"
 msgstr "Privacidade"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:895
+#: lib/action.php:898
 msgid "Source"
 msgstr "Código fonte"
 
 #. TRANS: Secondary navigation menu option leading to e-mail contact information on the
 #. TRANS: StatusNet site, where to report bugs, ...
-#: lib/action.php:902
+#: lib/action.php:905
 msgid "Contact"
 msgstr "Contacto"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:905
+#: lib/action.php:908
 msgid "Badge"
 msgstr "Emblema"
 
 #. TRANS: DT element for StatusNet software license.
-#: lib/action.php:934
+#: lib/action.php:937
 msgid "StatusNet software license"
 msgstr "Licença de software do StatusNet"
 
@@ -7510,7 +7390,7 @@ msgstr "Licença de software do StatusNet"
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:941
+#: lib/action.php:944
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7520,7 +7400,7 @@ msgstr ""
 "broughtby%%](%%site.broughtbyurl%%)."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:944
+#: lib/action.php:947
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** é um serviço de microblogues."
@@ -7529,7 +7409,7 @@ msgstr "**%%site.name%%** é um serviço de microblogues."
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:951
+#: lib/action.php:954
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7541,20 +7421,20 @@ msgstr ""
 "fsf.org/licensing/licenses/agpl-3.0.html)."
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:967
+#: lib/action.php:970
 msgid "Site content license"
 msgstr "Licença de conteúdos do site"
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:974
+#: lib/action.php:977
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr "O conteúdo e dados do site %1$s são privados e confidenciais."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:981
+#: lib/action.php:984
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
@@ -7562,7 +7442,7 @@ msgstr ""
 "direitos reservados."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:985
+#: lib/action.php:988
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 "Direitos de autor sobre o conteúdo e dados detidos pelos contribuidores. "
@@ -7570,7 +7450,7 @@ msgstr ""
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:1017
+#: lib/action.php:1020
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
@@ -7578,19 +7458,19 @@ msgstr ""
 "licença %2$s."
 
 #. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1353
+#: lib/action.php:1356
 msgid "Pagination"
 msgstr "Paginação"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1364
+#: lib/action.php:1367
 msgid "After"
 msgstr "Posteriores"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1374
+#: lib/action.php:1377
 msgid "Before"
 msgstr "Anteriores"
 
@@ -7790,23 +7670,19 @@ msgstr "API requer acesso de leitura e escrita, mas só tem acesso de leitura."
 msgid "No application for that consumer key."
 msgstr "Nenhuma aplicação para essa chave de consumidor."
 
-#: lib/apiauth.php:202 lib/apiauth.php:284
-msgid "Not allowed to use API."
-msgstr ""
-
 #. TRANS: OAuth exception given when an incorrect access token was given for a user.
-#: lib/apiauth.php:225
+#: lib/apiauth.php:219
 msgid "Bad access token."
 msgstr "Código de acesso incorrecto."
 
 #. TRANS: OAuth exception given when no user was found for a given token (no token was found).
-#: lib/apiauth.php:230
+#: lib/apiauth.php:224
 msgid "No user for that token."
 msgstr "Nenhum utilizador para esse código."
 
 #. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel".
 #. TRANS: Client error thrown when authentication fails.
-#: lib/apiauth.php:272 lib/apiauth.php:302
+#: lib/apiauth.php:266 lib/apiauth.php:293
 msgid "Could not authenticate you."
 msgstr "Não foi possível autenticá-lo."
 
@@ -8012,11 +7888,6 @@ msgstr "Não é permitido mudar a palavra-chave"
 msgid "Block"
 msgstr "Bloquear"
 
-#. TRANS: Description of the form to block a user.
-#: lib/blockform.php:79
-msgid "Block this user"
-msgstr "Bloquear este utilizador"
-
 #. TRANS: Title for command results.
 #: lib/channel.php:160 lib/channel.php:181
 msgid "Command results"
@@ -8045,7 +7916,7 @@ msgstr "Não existe nenhuma nota com essa identificação."
 
 #. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
 #. TRANS: Error text shown when a last user notice is requested and it does not exist.
-#: lib/command.php:99 lib/command.php:630
+#: lib/command.php:99 lib/command.php:642
 msgid "User has no last notice."
 msgstr "Utilizador não tem nenhuma última nota."
 
@@ -8095,35 +7966,41 @@ msgstr ""
 "Subscritores: %2$s\n"
 "Notas: %3$s"
 
+#. TRANS: Error message text shown when a favorite could not be set because it has already been favorited.
+#: lib/command.php:298
+#, fuzzy
+msgid "Could not create favorite: already favorited."
+msgstr "Não foi possível criar o favorito."
+
 #. TRANS: Text shown when a notice has been marked as favourite successfully.
-#: lib/command.php:312
+#: lib/command.php:324
 msgid "Notice marked as fave."
 msgstr "Nota marcada como favorita."
 
 #. TRANS: Message given having added a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:357
+#: lib/command.php:369
 #, php-format
 msgid "%1$s joined group %2$s."
 msgstr "%1$s juntou-se ao grupo %2$s."
 
 #. TRANS: Message given having removed a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:405
+#: lib/command.php:417
 #, php-format
 msgid "%1$s left group %2$s."
 msgstr "%1$s deixou o grupo %2$s."
 
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: lib/command.php:426
+#: lib/command.php:438
 #, fuzzy, php-format
 msgctxt "WHOIS"
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
 
 #. TRANS: Whois output. %s is the full name of the queried user.
-#: lib/command.php:430
+#: lib/command.php:442
 #, php-format
 msgid "Fullname: %s"
 msgstr "Nome completo: %s"
@@ -8131,7 +8008,7 @@ msgstr "Nome completo: %s"
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a location.
-#: lib/command.php:434 lib/mail.php:270
+#: lib/command.php:446 lib/mail.php:270
 #, php-format
 msgid "Location: %s"
 msgstr "Localidade: %s"
@@ -8139,20 +8016,20 @@ msgstr "Localidade: %s"
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a homepage.
-#: lib/command.php:438 lib/mail.php:274
+#: lib/command.php:450 lib/mail.php:274
 #, php-format
 msgid "Homepage: %s"
 msgstr "Página pessoal: %s"
 
 #. TRANS: Whois output. %s is the bio information of the queried user.
-#: lib/command.php:442
+#: lib/command.php:454
 #, php-format
 msgid "About: %s"
 msgstr "Sobre: %s"
 
 #. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).
 #. TRANS: %s is a remote profile.
-#: lib/command.php:471
+#: lib/command.php:483
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
@@ -8163,7 +8040,7 @@ msgstr ""
 
 #. TRANS: Message given if content is too long. %1$sd is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:488
+#: lib/command.php:500
 #, fuzzy, php-format
 msgid "Message too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
@@ -8171,25 +8048,25 @@ msgstr[0] "Mensagem demasiado extensa - máx. %1$d caracteres, enviou %2$d."
 msgstr[1] "Mensagem demasiado extensa - máx. %1$d caracteres, enviou %2$d."
 
 #. TRANS: Error text shown sending a direct message fails with an unknown reason.
-#: lib/command.php:516
+#: lib/command.php:528
 msgid "Error sending direct message."
 msgstr "Erro no envio da mensagem directa."
 
 #. TRANS: Message given having repeated a notice from another user.
 #. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:553
+#: lib/command.php:565
 #, php-format
 msgid "Notice from %s repeated."
 msgstr "Nota de %s repetida."
 
 #. TRANS: Error text shown when repeating a notice fails with an unknown reason.
-#: lib/command.php:556
+#: lib/command.php:568
 msgid "Error repeating notice."
 msgstr "Erro ao repetir nota."
 
 #. TRANS: Message given if content of a notice for a reply is too long. %1$d is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:591
+#: lib/command.php:603
 #, fuzzy, php-format
 msgid "Notice too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Notice too long - maximum is %1$d characters, you sent %2$d."
@@ -8198,100 +8075,100 @@ msgstr[1] "Nota demasiado extensa - máx. %1$d caracteres, enviou %2$d."
 
 #. TRANS: Text shown having sent a reply to a notice successfully.
 #. TRANS: %s is the nickname of the user of the notice the reply was sent to.
-#: lib/command.php:604
+#: lib/command.php:616
 #, php-format
 msgid "Reply to %s sent."
 msgstr "Resposta a %s enviada."
 
 #. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
-#: lib/command.php:607
+#: lib/command.php:619
 msgid "Error saving notice."
 msgstr "Erro ao gravar nota."
 
 #. TRANS: Error text shown when no username was provided when issuing a subscribe command.
-#: lib/command.php:654
+#: lib/command.php:666
 msgid "Specify the name of the user to subscribe to."
 msgstr "Introduza o nome do utilizador para subscrever."
 
 #. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
-#: lib/command.php:663
+#: lib/command.php:675
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "Não pode subscrever perfis OMB por comando."
 
 #. TRANS: Text shown after having subscribed to another user successfully.
 #. TRANS: %s is the name of the user the subscription was requested for.
-#: lib/command.php:671
+#: lib/command.php:683
 #, php-format
 msgid "Subscribed to %s."
 msgstr "Subscreveu %s."
 
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.
-#: lib/command.php:692 lib/command.php:803
+#: lib/command.php:704 lib/command.php:815
 msgid "Specify the name of the user to unsubscribe from."
 msgstr "Introduza o nome do utilizador para deixar de subscrever."
 
 #. TRANS: Text shown after having unsubscribed from another user successfully.
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:703
+#: lib/command.php:715
 #, php-format
 msgid "Unsubscribed from %s."
 msgstr "Deixou de subscrever %s."
 
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
-#: lib/command.php:723 lib/command.php:749
+#: lib/command.php:735 lib/command.php:761
 msgid "Command not yet implemented."
 msgstr "Comando ainda não implementado."
 
 #. TRANS: Text shown when issuing the command "off" successfully.
-#: lib/command.php:727
+#: lib/command.php:739
 msgid "Notification off."
 msgstr "Notificação desligada."
 
 #. TRANS: Error text shown when the command "off" fails for an unknown reason.
-#: lib/command.php:730
+#: lib/command.php:742
 msgid "Can't turn off notification."
 msgstr "Não foi possível desligar a notificação."
 
 #. TRANS: Text shown when issuing the command "on" successfully.
-#: lib/command.php:753
+#: lib/command.php:765
 msgid "Notification on."
 msgstr "Notificação ligada."
 
 #. TRANS: Error text shown when the command "on" fails for an unknown reason.
-#: lib/command.php:756
+#: lib/command.php:768
 msgid "Can't turn on notification."
 msgstr "Não foi possível ligar a notificação."
 
 #. TRANS: Error text shown when issuing the login command while login is disabled.
-#: lib/command.php:770
+#: lib/command.php:782
 msgid "Login command is disabled."
 msgstr "Comando para iniciar sessão foi desactivado."
 
 #. TRANS: Text shown after issuing the login command successfully.
 #. TRANS: %s is a logon link..
-#: lib/command.php:783
+#: lib/command.php:795
 #, php-format
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr "O link é utilizável uma única vez e só é válido durante 2 minutos: %s."
 
 #. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:812
+#: lib/command.php:824
 #, php-format
 msgid "Unsubscribed %s."
 msgstr "Subscrição de %s cancelada."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
-#: lib/command.php:830
+#: lib/command.php:842
 msgid "You are not subscribed to anyone."
 msgstr "Não subscreveu ninguém."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
-#: lib/command.php:835
+#: lib/command.php:847
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Subscreveu esta pessoa:"
@@ -8299,14 +8176,14 @@ msgstr[1] "Subscreveu estas pessoas:"
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user
 #. TRANS: (followers) without having any subscribers.
-#: lib/command.php:857
+#: lib/command.php:869
 msgid "No one is subscribed to you."
 msgstr "Ninguém subscreve as suas notas."
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
-#: lib/command.php:862
+#: lib/command.php:874
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Esta pessoa subscreve as suas notas:"
@@ -8314,21 +8191,21 @@ msgstr[1] "Estas pessoas subscrevem as suas notas:"
 
 #. TRANS: Text shown after requesting groups a user is subscribed to without having
 #. TRANS: any group subscriptions.
-#: lib/command.php:884
+#: lib/command.php:896
 msgid "You are not a member of any groups."
 msgstr "Não está em nenhum grupo."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
-#: lib/command.php:889
+#: lib/command.php:901
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "Está no grupo:"
 msgstr[1] "Está nos grupos:"
 
 #. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-#: lib/command.php:904
+#: lib/command.php:916
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -8472,11 +8349,6 @@ msgstr "Aplicações ligadas autorizadas"
 msgid "Database error"
 msgstr "Erro de base de dados"
 
-#. TRANS: Description of form for deleting a user.
-#: lib/deleteuserform.php:75
-msgid "Delete this user"
-msgstr "Apagar este utilizador"
-
 #. TRANS: Label in form on profile design page.
 #. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
 #: lib/designsettings.php:108
@@ -8515,21 +8387,6 @@ msgstr "Alterar cores"
 msgid "Use defaults"
 msgstr "Usar predefinições"
 
-#. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: lib/designsettings.php:259
-msgid "Restore default designs"
-msgstr "Repor estilos predefinidos"
-
-#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: lib/designsettings.php:267
-msgid "Reset back to default"
-msgstr "Repor predefinição"
-
-#. TRANS: Title for button on profile design page to save settings.
-#: lib/designsettings.php:272
-msgid "Save design"
-msgstr "Gravar o estilo"
-
 #. TRANS: Error message displayed if design settings could not be saved.
 #. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
 #: lib/designsettings.php:405 lib/designsettings.php:427
@@ -9414,10 +9271,6 @@ msgstr "Responder a esta nota"
 msgid "Reply"
 msgstr "Responder"
 
-#: lib/noticelist.php:673
-msgid "Delete this notice"
-msgstr "Apagar esta nota"
-
 #: lib/noticelist.php:691
 msgid "Notice repeated"
 msgstr "Nota repetida"
@@ -9699,10 +9552,6 @@ msgstr "Convidar"
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Convidar amigos e colegas para se juntarem a si em %s"
 
-#: lib/subscribeform.php:115 lib/subscribeform.php:139
-msgid "Subscribe to this user"
-msgstr "Subscrever este utilizador"
-
 #: lib/subscriberspeopleselftagcloudsection.php:48
 #: lib/subscriptionspeopleselftagcloudsection.php:48
 msgid "People Tagcloud as self-tagged"
@@ -9879,23 +9728,18 @@ msgctxt "role"
 msgid "Moderator"
 msgstr "Moderador"
 
-#: lib/util.php:305
-#, fuzzy
-msgid "Not allowed to log in."
-msgstr "Não iniciou sessão."
-
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1309
+#: lib/util.php:1306
 msgid "a few seconds ago"
 msgstr "há alguns segundos"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1312
+#: lib/util.php:1309
 msgid "about a minute ago"
 msgstr "há cerca de um minuto"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1316
+#: lib/util.php:1313
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
@@ -9903,12 +9747,12 @@ msgstr[0] "há cerca de um minuto atrás"
 msgstr[1] "há cerca de %d minutos atrás"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1319
+#: lib/util.php:1316
 msgid "about an hour ago"
 msgstr "há cerca de uma hora"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1323
+#: lib/util.php:1320
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
@@ -9916,12 +9760,12 @@ msgstr[0] "há cerca de uma hora atrás"
 msgstr[1] "há cerca de %d horas atrás"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1326
+#: lib/util.php:1323
 msgid "about a day ago"
 msgstr "há cerca de um dia"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1330
+#: lib/util.php:1327
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
@@ -9929,12 +9773,12 @@ msgstr[0] "há cerca de um dia atrás"
 msgstr[1] "há cerca de %d dias atrás"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1333
+#: lib/util.php:1330
 msgid "about a month ago"
 msgstr "há cerca de um mês"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1337
+#: lib/util.php:1334
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
@@ -9942,7 +9786,7 @@ msgstr[0] "há cerca de um mês atrás"
 msgstr[1] "há cerca de %d meses atrás"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1340
+#: lib/util.php:1337
 msgid "about a year ago"
 msgstr "há cerca de um ano"
 
@@ -9984,3 +9828,75 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#, fuzzy
+#~ msgid "Block this user."
+#~ msgstr "Bloquear este utilizador"
+
+#, fuzzy
+#~ msgid "Delete this notice."
+#~ msgstr "Apagar esta nota"
+
+#, fuzzy
+#~ msgid "Delete this user."
+#~ msgstr "Apagar este utilizador"
+
+#, fuzzy
+#~ msgid "Restore default designs."
+#~ msgstr "Repor estilos predefinidos"
+
+#, fuzzy
+#~ msgid "Reset back to default."
+#~ msgstr "Repor predefinição"
+
+#, fuzzy
+#~ msgid "Save design."
+#~ msgstr "Gravar o estilo"
+
+#, fuzzy
+#~ msgid "Disfavor favorite."
+#~ msgstr "Retirar das favoritas"
+
+#, fuzzy
+#~ msgid "\"%s\" not found."
+#~ msgstr "Método da API não encontrado."
+
+#, fuzzy
+#~ msgid "Notice %s not found."
+#~ msgstr "Método da API não encontrado."
+
+#, fuzzy
+#~ msgid "Attachment %s not found."
+#~ msgstr "Destinatário não encontrado."
+
+#, fuzzy
+#~ msgid "Invalid tag: \"%s\"."
+#~ msgstr "Categoria inválida: \"%s\""
+
+#, fuzzy
+#~ msgid "%s updates from everyone."
+#~ msgstr "%s actualizações de todos!"
+
+#, fuzzy
+#~ msgid "Password saved"
+#~ msgstr "Senha gravada."
+
+#, fuzzy
+#~ msgid "Where you are, like \"City, State (or Region), Country\"."
+#~ msgstr "Onde está, por ex. \"Cidade, Região, País\""
+
+#, fuzzy
+#~ msgid "Subscribe to this user."
+#~ msgstr "Subscrever este utilizador"
+
+#, fuzzy
+#~ msgid ""
+#~ "Listenee stream license \"%1$s\" is not compatible with site license \"%2"
+#~ "$s\"."
+#~ msgstr ""
+#~ "Licença ‘%1$s’ da listenee stream não é compatível com a licença ‘%2$s’ "
+#~ "do site."
+
+#, fuzzy
+#~ msgid "Not allowed to log in."
+#~ msgstr "Não iniciou sessão."
diff --git a/locale/pt_BR/LC_MESSAGES/statusnet.po b/locale/pt_BR/LC_MESSAGES/statusnet.po
index 50c2733981..3ae0770f61 100644
--- a/locale/pt_BR/LC_MESSAGES/statusnet.po
+++ b/locale/pt_BR/LC_MESSAGES/statusnet.po
@@ -15,18 +15,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-24 10:32+0000\n"
-"PO-Revision-Date: 2011-02-24 10:37:34+0000\n"
+"POT-Creation-Date: 2011-03-03 15:58+0000\n"
+"PO-Revision-Date: 2011-03-03 16:01:18+0000\n"
 "Language-Team: Brazilian Portuguese <http://translatewiki.net/wiki/Portal:pt-"
 "br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r82712); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt-br\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-POT-Import-Date: 2011-02-17 11:39:54+0000\n"
+"X-POT-Import-Date: 2011-02-25 23:49:23+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -138,11 +138,7 @@ msgstr "Esta página não existe."
 #. 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 use "one time password login" without using an existing user.
-#. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
-#. TRANS: Client error displayed trying to find a user by ID for a non-existing ID.
-#. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when calling a profile action without specifying a user.
 #: actions/all.php:80 actions/allrss.php:69
@@ -160,12 +156,12 @@ msgstr "Esta página não existe."
 #: actions/apitimelinementions.php:77 actions/apitimelineuser.php:79
 #: actions/avatarbynickname.php:79 actions/favoritesrss.php:72
 #: actions/foaf.php:42 actions/foaf.php:61 actions/hcard.php:67
-#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:78
+#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
 #: actions/remotesubscribe.php:144 actions/remotesubscribe.php:153
-#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:113
-#: actions/showfavorites.php:106 actions/userbyid.php:75
+#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
+#: actions/showfavorites.php:106 actions/userbyid.php:74
 #: actions/usergroups.php:93 actions/userrss.php:40 actions/userxrd.php:59
-#: actions/xrds.php:71 lib/command.php:497 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:509 lib/galleryaction.php:59
 #: lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Este usuário não existe."
@@ -295,7 +291,7 @@ msgstr "Atualizações de %1$s e amigos no %2$s!"
 #: actions/apigrouplistall.php:120 actions/apigroupmembership.php:105
 #: actions/apigroupshow.php:114 actions/apihelptest.php:84
 #: actions/apistatusesdestroy.php:101 actions/apistatusesretweets.php:110
-#: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:138
+#: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:139
 #: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
 #: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:268
 #: actions/apitimelinegroup.php:147 actions/apitimelinehome.php:173
@@ -529,7 +525,7 @@ msgstr "O usuário destinatário não foi encontrado."
 #. TRANS: Client error displayed trying to direct message another user who's not a friend (403).
 #: actions/apidirectmessagenew.php:144
 #, fuzzy
-msgid "Cannot send direct messages to users who aren't your friend."
+msgid "Can't send direct messages to users who aren't your friend."
 msgstr ""
 "Não é possível enviar mensagens diretas para usuários que não sejam seus "
 "amigos."
@@ -558,7 +554,7 @@ msgstr "Esta mensagem já é favorita!"
 #. TRANS: Client error displayed when marking a notice as favourite fails.
 #. TRANS: Server error displayed when trying to mark a notice as favorite fails in the database.
 #. TRANS: Error message text shown when a favorite could not be set.
-#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:294
+#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:306
 msgid "Could not create favorite."
 msgstr "Não foi possível criar a favorita."
 
@@ -616,7 +612,7 @@ msgstr "Não foi possível encontrar usuário de destino."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:191
 #: actions/newgroup.php:137 actions/profilesettings.php:273
-#: actions/register.php:206
+#: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "Esta identificação já está em uso. Tente outro."
 
@@ -626,7 +622,7 @@ msgstr "Esta identificação já está em uso. Tente outro."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:195
 #: actions/newgroup.php:141 actions/profilesettings.php:243
-#: actions/register.php:208
+#: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "Não é uma identificação válida."
 
@@ -639,7 +635,7 @@ msgstr "Não é uma identificação válida."
 #: actions/apigroupcreate.php:181 actions/editapplication.php:235
 #: actions/editgroup.php:202 actions/newapplication.php:221
 #: actions/newgroup.php:148 actions/profilesettings.php:248
-#: actions/register.php:215
+#: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "A URL informada não é válida."
 
@@ -649,7 +645,7 @@ msgstr "A URL informada não é válida."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:191 actions/editgroup.php:206
 #: actions/newgroup.php:152 actions/profilesettings.php:252
-#: actions/register.php:218
+#: actions/register.php:226
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "O nome completo é muito extenso (máx. 255 caracteres)"
 
@@ -677,7 +673,7 @@ msgstr[1] "A descrição é muito extensa (máximo %d caracteres)."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:215 actions/editgroup.php:218
 #: actions/newgroup.php:164 actions/profilesettings.php:265
-#: actions/register.php:227
+#: actions/register.php:235
 msgid "Location is too long (maximum 255 characters)."
 msgstr "A localização é muito extensa (máx. 255 caracteres)."
 
@@ -733,14 +729,14 @@ msgstr "O grupo não foi encontrado."
 #. TRANS: Server error displayed when trying to join a group the user is already a member of.
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:333
+#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:345
 msgid "You are already a member of that group."
 msgstr "Você já é membro desse grupo."
 
 #. TRANS: Server error displayed when trying to join a group the user is blocked from joining.
 #. 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.
-#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:338
+#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:350
 msgid "You have been blocked from that group by the admin."
 msgstr "O administrador desse grupo bloqueou sua inscrição."
 
@@ -750,7 +746,7 @@ msgstr "O administrador desse grupo bloqueou sua inscrição."
 #. TRANS: %1$s is the joining user's nickname, $2$s is the group nickname for which the join failed.
 #. TRANS: Message given having failed to add a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:350
+#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:362
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "Não foi possível associar o usuário %1$s ao grupo %2$s."
@@ -767,7 +763,7 @@ msgstr "Você não é membro deste grupo."
 #. TRANS: Message given having failed to remove a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
 #: actions/apigroupleave.php:127 actions/leavegroup.php:133
-#: lib/command.php:398
+#: lib/command.php:410
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
 msgstr "Não foi possível remover o usuário %1$s do grupo %2$s."
@@ -827,21 +823,20 @@ msgstr "O token solicitado já foi autorizado."
 #. TRANS: Form validation error message.
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
-#. TRANS: Client error displayed when the session token is not okay.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
 #: actions/deletenotice.php:177 actions/disfavor.php:75
 #: actions/emailsettings.php:291 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:65 actions/grouplogo.php:321
 #: actions/groupunblock.php:65 actions/imsettings.php:224
-#: actions/invite.php:60 actions/login.php:131 actions/makeadmin.php:66
+#: actions/invite.php:60 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
-#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:136
-#: actions/othersettings.php:155 actions/passwordsettings.php:137
+#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
+#: actions/othersettings.php:155 actions/passwordsettings.php:138
 #: actions/profilesettings.php:217 actions/recoverpassword.php:383
-#: actions/register.php:164 actions/remotesubscribe.php:76
+#: actions/register.php:172 actions/remotesubscribe.php:76
 #: actions/repeat.php:82 actions/smssettings.php:250 actions/subedit.php:40
-#: actions/subscribe.php:87 actions/tagother.php:166
-#: actions/unsubscribe.php:69 actions/userauthorization.php:53
+#: actions/subscribe.php:86 actions/tagother.php:166
+#: actions/unsubscribe.php:69 actions/userauthorization.php:52
 #: lib/designsettings.php:310
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
@@ -873,7 +868,7 @@ msgstr "Erro no banco de dados durante a inserção de oauth_token_association."
 #: actions/designadminpanel.php:100 actions/editapplication.php:144
 #: actions/emailsettings.php:310 actions/grouplogo.php:332
 #: actions/imsettings.php:239 actions/newapplication.php:124
-#: actions/oauthconnectionssettings.php:145 actions/recoverpassword.php:46
+#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
 #: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
 msgstr "Submissão inesperada de formulário."
@@ -925,20 +920,19 @@ msgstr "Conta"
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group nickname (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT for nick name in a profile.
-#: actions/apioauthauthorize.php:459 actions/login.php:242
-#: actions/profilesettings.php:106 actions/register.php:418
+#: actions/apioauthauthorize.php:459 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:432
 #: actions/showgroup.php:243 actions/tagother.php:94
-#: actions/userauthorization.php:152 lib/groupeditform.php:145
+#: actions/userauthorization.php:145 lib/groupeditform.php:145
 #: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "Usuário"
 
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:463 actions/login.php:245
-#: actions/register.php:422 lib/accountsettingsaction.php:120
+#: actions/apioauthauthorize.php:463 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:120
 msgid "Password"
 msgstr "Senha"
 
@@ -1033,13 +1027,13 @@ msgstr "Essa mensagem não existe."
 
 #. TRANS: Client error displayed trying to repeat an own notice through the API.
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:537
+#: actions/apistatusesretweet.php:83 lib/command.php:549
 msgid "Cannot repeat your own notice."
 msgstr "Você não pode repetir a sua própria mensagem."
 
 #. TRANS: Client error displayed trying to re-repeat a notice through the API.
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:92 lib/command.php:543
+#: actions/apistatusesretweet.php:92 lib/command.php:555
 msgid "Already repeated that notice."
 msgstr "Você já repetiu essa mensagem."
 
@@ -1061,7 +1055,7 @@ msgstr "O método HTTP não é suportado."
 #. TRANS: %s is the requested output format.
 #: actions/apistatusesshow.php:144
 #, fuzzy, php-format
-msgid "Unsupported format: %s."
+msgid "Unsupported format: %s"
 msgstr "Formato não suportado: %s"
 
 #. TRANS: Client error displayed requesting a deleted status.
@@ -1164,14 +1158,13 @@ msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr "%1$s mensagens em resposta a mensagens de %2$s / %3$s."
 
 #. TRANS: Title for site timeline. %s is the StatusNet sitename.
-#. TRANS: Public RSS feed title. %s is the StatusNet site name.
 #: actions/apitimelinepublic.php:193 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "Mensagens públicas de %s"
 
 #. TRANS: Subtitle for site timeline. %s is the StatusNet sitename.
-#: actions/apitimelinepublic.php:199
+#: actions/apitimelinepublic.php:199 actions/publicrss.php:105
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "%s mensagens de todo mundo!"
@@ -1236,26 +1229,25 @@ msgid "Atom post must be an Atom entry."
 msgstr "A publicação Atom deve ser uma entrada Atom."
 
 #. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
-#: actions/apitimelineuser.php:334
+#: actions/apitimelineuser.php:335
 msgid "Can only handle POST activities."
 msgstr "Só é possível manipular atividades POST."
 
 #. TRANS: Client error displayed when using an unsupported activity object type.
 #. TRANS: %s is the unsupported activity object type.
-#: actions/apitimelineuser.php:345
+#: actions/apitimelineuser.php:346
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr "Não é possível manipular o tipo de objeto de atividade \"%s\"."
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
 #. TRANS: %d is the notice ID (number).
-#: actions/apitimelineuser.php:379
+#: actions/apitimelineuser.php:380
 #, php-format
 msgid "No content for notice %d."
 msgstr "Nenhum conteúdo para a mensagem %d."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#. TRANS: %s is the notice URI.
 #: actions/apitimelineuser.php:408
 #, php-format
 msgid "Notice with URI \"%s\" already exists."
@@ -1273,10 +1265,9 @@ msgstr "O método da API não foi encontrado!"
 
 #. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
 #. TRANS: Client exception.
-#. TRANS: Client error displayed trying to subscribe to a non-existing profile.
 #: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
 #: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
-#: actions/subscribe.php:110
+#: actions/subscribe.php:107
 msgid "No such profile."
 msgstr "Este perfil não existe."
 
@@ -1405,7 +1396,7 @@ msgstr "Não é possível excluir a Favorita de outra pessoa"
 #: actions/joingroup.php:95 actions/leavegroup.php:82
 #: actions/leavegroup.php:95 actions/makeadmin.php:86
 #: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:380
+#: lib/command.php:392
 msgid "No such group."
 msgstr "Esse grupo não existe."
 
@@ -1416,7 +1407,7 @@ msgid "Not a member."
 msgstr "Não é um membro"
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
-#: actions/atompubshowmembership.php:150
+#: actions/atompubshowmembership.php:151
 #, fuzzy
 msgid "Cannot delete someone else's membership."
 msgstr "Não é possível excluir a assinatura de outra pessoa"
@@ -1522,11 +1513,9 @@ msgstr ""
 
 #. TRANS: Server error displayed in avatar upload page when no matching profile can be found for a user.
 #. TRANS: Server error displayed coming across a request from a user without a profile.
-#. TRANS: Server error displayed when trying to authorise a remote subscription request
-#. TRANS: while the user has no profile.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
 #: actions/grouplogo.php:184 actions/remotesubscribe.php:190
-#: actions/userauthorization.php:75 actions/userrss.php:108
+#: actions/userauthorization.php:72 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr "Usuário sem um perfil correspondente"
 
@@ -1581,10 +1570,10 @@ msgstr "Cortar"
 msgid "No file uploaded."
 msgstr "Não foi enviado nenhum arquivo."
 
-#. TRANS: Avatar upload form instruction after uploading a file.
+#. TRANS: Avatar upload form unstruction after uploading a file.
 #: actions/avatarsettings.php:345
 #, fuzzy
-msgid "Pick a square area of the image to be your avatar."
+msgid "Pick a square area of the image to be your avatar"
 msgstr "Selecione uma área quadrada da imagem para ser seu avatar"
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
@@ -1625,7 +1614,7 @@ msgid "You may not backup your account."
 msgstr "Você não pode fazer backup da sua conta."
 
 #. TRANS: Information displayed on the backup account page.
-#: actions/backupaccount.php:225
+#: actions/backupaccount.php:227
 #, fuzzy
 msgid ""
 "You can backup your account data in <a href=\"http://activitystrea.ms/"
@@ -1641,16 +1630,16 @@ msgstr ""
 "disso, arquivos enviados e mensagens diretas também não entram no backup."
 
 #. TRANS: Submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:248
+#: actions/backupaccount.php:250
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Backup"
 msgstr "Fundo"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:252
+#: actions/backupaccount.php:254
 #, fuzzy
-msgid "Backup your account."
+msgid "Backup your account"
 msgstr "Fazer backup da conta"
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
@@ -1693,7 +1682,7 @@ msgstr "Não"
 #. TRANS: Submit button title for 'No' when blocking a user.
 #: actions/block.php:158
 #, fuzzy
-msgid "Do not block this user."
+msgid "Do not block this user"
 msgstr "Não bloquear este usuário"
 
 #. TRANS: Button label on the user block form.
@@ -1710,9 +1699,9 @@ msgid "Yes"
 msgstr "Sim"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:165
-#, fuzzy
-msgid "Block this user."
+#. TRANS: Description of the form to block a user.
+#: actions/block.php:165 lib/blockform.php:79
+msgid "Block this user"
 msgstr "Bloquear este usuário"
 
 #. TRANS: Server error displayed when blocking a user fails.
@@ -1875,7 +1864,7 @@ msgstr ""
 #. TRANS: Field label for delete account confirmation entry.
 #. TRANS: Field label for password reset form where the password has to be typed again.
 #: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:262 actions/register.php:426
+#: actions/recoverpassword.php:262 actions/register.php:440
 msgid "Confirm"
 msgstr "Confirmar"
 
@@ -1905,14 +1894,14 @@ msgstr "A aplicação não foi encontrada."
 #. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
 #: actions/deleteapplication.php:79 actions/editapplication.php:78
-#: actions/showapplication.php:90
+#: actions/showapplication.php:94
 msgid "You are not the owner of this application."
 msgstr "Você não é o dono desta aplicação."
 
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
-#: actions/newapplication.php:112 actions/showapplication.php:113
-#: lib/action.php:1422
+#: actions/newapplication.php:112 actions/showapplication.php:118
+#: lib/action.php:1425
 msgid "There was a problem with your session token."
 msgstr "Ocorreu um problema com o seu token de sessão."
 
@@ -1936,13 +1925,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting an application.
 #: actions/deleteapplication.php:161
 #, fuzzy
-msgid "Do not delete this application."
+msgid "Do not delete this application"
 msgstr "Não excluir esta aplicação"
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
 #: actions/deleteapplication.php:167
 #, fuzzy
-msgid "Delete this application."
+msgid "Delete this application"
 msgstr "Excluir esta aplicação"
 
 #. TRANS: Client error when trying to delete group while not logged in.
@@ -1997,13 +1986,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting a group.
 #: actions/deletegroup.php:224
 #, fuzzy
-msgid "Do not delete this group."
+msgid "Do not delete this group"
 msgstr "Não excluir este grupo"
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
 #: actions/deletegroup.php:231
 #, fuzzy
-msgid "Delete this group."
+msgid "Delete this group"
 msgstr "Excluir este grupo"
 
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
@@ -2011,15 +2000,13 @@ msgstr "Excluir este grupo"
 #. TRANS: Client error displayed when trying to mark a notice as favorite without being logged in.
 #. TRANS: Client error displayed trying to block a user from a group while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
-#. TRANS: Client error displayed trying to log out when not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
-#. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
 #. TRANS: Client error displayed when trying to change user options while not logged in.
 #: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
-#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:70
+#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
-#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:98
+#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
 #: lib/adminpanelaction.php:71 lib/profileformaction.php:63
 #: lib/settingsaction.php:72
@@ -2049,13 +2036,12 @@ msgstr "Tem certeza que deseja excluir esta mensagem?"
 #. TRANS: Submit button title for 'No' when deleting a notice.
 #: actions/deletenotice.php:159
 #, fuzzy
-msgid "Do not delete this notice."
+msgid "Do not delete this notice"
 msgstr "Não excluir esta mensagem."
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:166
-#, fuzzy
-msgid "Delete this notice."
+#: actions/deletenotice.php:166 lib/noticelist.php:673
+msgid "Delete this notice"
 msgstr "Excluir esta mensagem"
 
 #. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
@@ -2092,13 +2078,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting a user.
 #: actions/deleteuser.php:158
 #, fuzzy
-msgid "Do not delete this user."
+msgid "Do not delete this user"
 msgstr "Não excluir este grupo"
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
-#: actions/deleteuser.php:165
-#, fuzzy
-msgid "Delete this user."
+#. TRANS: Description of form for deleting a user.
+#: actions/deleteuser.php:165 lib/deleteuserform.php:75
+msgid "Delete this user"
 msgstr "Excluir este usuário"
 
 #. TRANS: Message used as title for design settings for the site.
@@ -2266,21 +2252,21 @@ msgid "Use defaults"
 msgstr "Usar o padrão|"
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:720
-#, fuzzy
-msgid "Restore default designs."
+#. TRANS: Title for button on profile design page to reset all colour settings to default.
+#: actions/designadminpanel.php:720 lib/designsettings.php:259
+msgid "Restore default designs"
 msgstr "Restaura a aparência padrão"
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:728
-#, fuzzy
-msgid "Reset back to default."
+#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
+#: actions/designadminpanel.php:728 lib/designsettings.php:267
+msgid "Reset back to default"
 msgstr "Restaura de volta ao padrão"
 
 #. TRANS: Title for button for saving theme settings.
-#: actions/designadminpanel.php:736
-#, fuzzy
-msgid "Save design."
+#. TRANS: Title for button on profile design page to save settings.
+#: actions/designadminpanel.php:736 lib/designsettings.php:272
+msgid "Save design"
 msgstr "Salvar a aparência"
 
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
@@ -2312,7 +2298,7 @@ msgid "You must be logged in to edit an application."
 msgstr "Você precisa estar autenticado para editar uma aplicação."
 
 #. TRANS: Client error displayed trying to edit an application that does not exist.
-#: actions/editapplication.php:83 actions/showapplication.php:83
+#: actions/editapplication.php:83 actions/showapplication.php:87
 msgid "No such application."
 msgstr "Essa aplicação não existe."
 
@@ -2595,7 +2581,7 @@ msgid "Cannot normalize that email address."
 msgstr "Não foi possível normalizar este endereço de e-mail"
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:393 actions/register.php:204
+#: actions/emailsettings.php:393 actions/register.php:212
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "Não é um endereço de e-mail válido."
@@ -2672,22 +2658,19 @@ msgstr "Nenhum endereço de e-mail para recebimentos."
 
 #. 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.
 #: actions/emailsettings.php:530 actions/emailsettings.php:554
-#: actions/smssettings.php:566 actions/smssettings.php:591
+#: actions/smssettings.php:565 actions/smssettings.php:588
 #, fuzzy
 msgid "Could not update user record."
 msgstr "Não foi possível atualizar o registro do usuário."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
-#. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:534 actions/smssettings.php:570
+#: actions/emailsettings.php:534 actions/smssettings.php:568
 msgid "Incoming email address removed."
 msgstr "O endereço de e-mail de recebimento foi removido."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
-#. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:558 actions/smssettings.php:595
+#: actions/emailsettings.php:558 actions/smssettings.php:591
 msgid "New incoming email address added."
 msgstr ""
 "Foi adicionado um novo endereço de e-mail para recebimento de mensagens."
@@ -2700,7 +2683,7 @@ msgstr "Essa mensagem já é uma favorita!"
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
 #: actions/favor.php:95
 #, fuzzy
-msgid "Disfavor favorite."
+msgid "Disfavor favorite"
 msgstr "Desmarcar a favorita"
 
 #. TRANS: Page title for first page of favorited notices.
@@ -2942,13 +2925,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
 #: actions/groupblock.php:191
 #, fuzzy
-msgid "Do not block this user from this group."
+msgid "Do not block this user from this group"
 msgstr "Não bloquear este usuário neste grupo"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
 #: actions/groupblock.php:198
 #, fuzzy
-msgid "Block this user from this group."
+msgid "Block this user from this group"
 msgstr "Bloquear este usuário neste grupo"
 
 #. TRANS: Server error displayed when trying to block a user from a group fails because of an application error.
@@ -2958,7 +2941,6 @@ msgstr ""
 "Ocorreu um erro no banco de dados ao tentar bloquear o usuário no grupo."
 
 #. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
-#. TRANS: Client error displayed trying to find a user by ID without providing an ID.
 #: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr "Nenhuma ID."
@@ -3147,10 +3129,8 @@ msgid "Group search"
 msgstr "Procurar grupos"
 
 #. TRANS: Text on page where groups can be searched if no results were found for a query.
-#. TRANS: Text for notice search results is the query had no results.
-#. TRANS: Message on the "People search" page where a query has no results.
-#: actions/groupsearch.php:82 actions/noticesearch.php:122
-#: actions/peoplesearch.php:87
+#: actions/groupsearch.php:82 actions/noticesearch.php:117
+#: actions/peoplesearch.php:83
 msgid "No results."
 msgstr "Nenhum resultado."
 
@@ -3187,7 +3167,6 @@ msgid "User is not blocked from group."
 msgstr "O usuário não está bloqueado no grupo."
 
 #. TRANS: Server error displayed when unblocking a user from a group fails because of an unknown error.
-#. TRANS: Server error displayed when removing a user block.
 #: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "Erro na remoção do bloqueio."
@@ -3285,8 +3264,7 @@ msgid "Publish a MicroID for my Jabber/Google Talk address."
 msgstr "Publique um MicroID para meu endereço de Jabber/Gtalk."
 
 #. TRANS: Confirmation message for successful Instant Messaging preferences save.
-#. TRANS: Confirmation message after saving preferences.
-#: actions/imsettings.php:283 actions/othersettings.php:193
+#: actions/imsettings.php:283 actions/othersettings.php:192
 msgid "Preferences saved."
 msgstr "As preferências foram salvas."
 
@@ -3577,7 +3555,7 @@ msgstr "Você deve estar autenticado para sair de um grupo."
 
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
-#: actions/leavegroup.php:103 lib/command.php:386
+#: actions/leavegroup.php:103 lib/command.php:398
 msgid "You are not a member of that group."
 msgstr "Você não é um membro desse grupo."
 
@@ -3706,44 +3684,42 @@ msgstr "Salvar"
 msgid "Save license settings"
 msgstr "Salvar as configurações da licença"
 
-#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
-#: actions/login.php:97 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
 msgid "Already logged in."
 msgstr "Já está autenticado."
 
-#: actions/login.php:142
+#: actions/login.php:148
 msgid "Incorrect username or password."
 msgstr "Nome de usuário e/ou senha incorreto(s)."
 
-#. TRANS: Server error displayed when a user object could not be created trying to login using "one time password login".
-#: actions/login.php:148 actions/otp.php:127
+#: actions/login.php:154 actions/otp.php:120
 msgid "Error setting user. You are probably not authorized."
 msgstr ""
 "Erro na configuração do usuário. Você provavelmente não tem autorização."
 
-#: actions/login.php:202 actions/login.php:253
+#: actions/login.php:210 actions/login.php:263
 msgid "Login"
 msgstr "Entrar"
 
-#: actions/login.php:239
+#: actions/login.php:249
 msgid "Login to site"
 msgstr "Autenticar-se no site"
 
-#: actions/login.php:248 actions/register.php:476
+#: actions/login.php:258 actions/register.php:490
 msgid "Remember me"
 msgstr "Lembrar neste computador"
 
-#: actions/login.php:249 actions/register.php:478
+#: actions/login.php:259 actions/register.php:492
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 "Entra automaticamente da próxima vez, sem pedir a senha. Não use em "
 "computadores compartilhados!"
 
-#: actions/login.php:259
+#: actions/login.php:269
 msgid "Lost or forgotten password?"
 msgstr "Perdeu ou esqueceu sua senha?"
 
-#: actions/login.php:277
+#: actions/login.php:288
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -3751,11 +3727,11 @@ msgstr ""
 "Por razões de segurança, por favor, digite novamente seu nome de usuário e "
 "senha antes de alterar suas configurações."
 
-#: actions/login.php:281
+#: actions/login.php:292
 msgid "Login with your username and password."
 msgstr "Autentique-se com seu nome de usuário e senha."
 
-#: actions/login.php:284
+#: actions/login.php:295
 #, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -3839,14 +3815,14 @@ msgid "New message"
 msgstr "Nova mensagem"
 
 #. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
-#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:501
+#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:513
 msgid "You can't send a message to this user."
 msgstr "Você não pode enviar mensagens para este usuário."
 
 #. TRANS: Command exception text shown when trying to send a direct message to another user without content.
 #. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
-#: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:478
-#: lib/command.php:581
+#: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:490
+#: lib/command.php:593
 msgid "No content!"
 msgstr "Nenhum conteúdo!"
 
@@ -3855,7 +3831,7 @@ msgid "No recipient specified."
 msgstr "Não foi especificado nenhum destinatário."
 
 #. TRANS: Error text shown when trying to send a direct message to self.
-#: actions/newmessage.php:167 lib/command.php:505
+#: actions/newmessage.php:167 lib/command.php:517
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
@@ -3868,7 +3844,7 @@ msgstr "A mensagem foi enviada"
 
 #. TRANS: Message given have sent a direct message to another user.
 #. TRANS: %s is the name of the other user.
-#: actions/newmessage.php:188 lib/command.php:513
+#: actions/newmessage.php:188 lib/command.php:525
 #, php-format
 msgid "Direct message to %s sent."
 msgstr "A mensagem direta para %s foi enviada."
@@ -3885,9 +3861,7 @@ msgstr "Nova mensagem"
 msgid "Notice posted"
 msgstr "A mensagem foi publicada"
 
-#. TRANS: Instructions for Notice search page.
-#. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/noticesearch.php:69
+#: actions/noticesearch.php:68
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -3896,21 +3870,16 @@ msgstr ""
 "Procurar mensagens no %%site.name%% por seu conteúdo. Separe os termos da "
 "busca com espaços; eles devem ter 3 ou mais caracteres."
 
-#. TRANS: Title of the page where users can search for notices.
-#: actions/noticesearch.php:80
+#: actions/noticesearch.php:78
 msgid "Text search"
 msgstr "Procurar por texto"
 
-#. TRANS: Test in RSS notice search.
-#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearch.php:95
+#: actions/noticesearch.php:91
 #, php-format
 msgid "Search results for \"%1$s\" on %2$s"
 msgstr "Resultados da procura para \"%1$s\" no %2$s"
 
-#. TRANS: Text for logged in users making a query for notices without results.
-#. TRANS: This message contains a Markdown link.
-#: actions/noticesearch.php:128
+#: actions/noticesearch.php:121
 #, php-format
 msgid ""
 "Be the first to [post on this topic](%%%%action.newnotice%%%%?"
@@ -3919,9 +3888,7 @@ msgstr ""
 "Seja o primeiro a [publicar sobre este tópico](%%%%action.newnotice%%%%?"
 "status_textarea=%s)!"
 
-#. TRANS: Text for not logged in users making a query for notices without results.
-#. TRANS: This message contains Markdown links.
-#: actions/noticesearch.php:133
+#: actions/noticesearch.php:124
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and be the first to "
@@ -3931,17 +3898,14 @@ msgstr ""
 "primeiro a [publicar sobre este tópico](%%%%action.newnotice%%%%?"
 "status_textarea=%s)?"
 
-#. TRANS: RSS notice search feed title. %s is the query.
-#: actions/noticesearchrss.php:95
+#: actions/noticesearchrss.php:96
 #, php-format
 msgid "Updates with \"%s\""
 msgstr "Mensagens com \"%s\""
 
-#. TRANS: RSS notice search feed description.
-#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearchrss.php:99
+#: actions/noticesearchrss.php:98
 #, fuzzy, php-format
-msgid "Updates matching search term \"%1$s\" on %2$s."
+msgid "Updates matching search term \"%1$s\" on %2$s!"
 msgstr "Mensagens correspondentes aos termos \"%1$s\" no %2$s!"
 
 #: actions/nudge.php:85
@@ -3982,30 +3946,30 @@ msgid "You have not registered any applications yet."
 msgstr "Você ainda não registrou nenhuma aplicação."
 
 #. TRANS: Title for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:70
+#: actions/oauthconnectionssettings.php:71
 msgid "Connected applications"
 msgstr "Aplicações conectadas"
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:81
+#: actions/oauthconnectionssettings.php:83
 msgid "The following connections exist for your account."
 msgstr "Existem as seguintes conexões para a sua conta."
 
 #. TRANS: Client error when trying to revoke access for an application while not being a user of it.
-#: actions/oauthconnectionssettings.php:166
+#: actions/oauthconnectionssettings.php:168
 msgid "You are not a user of that application."
 msgstr "Você não é um usuário dessa aplicação."
 
 #. TRANS: Client error when revoking access has failed for some reason.
 #. TRANS: %s is the application ID revoking access failed for.
-#: actions/oauthconnectionssettings.php:181
+#: actions/oauthconnectionssettings.php:183
 #, php-format
 msgid "Unable to revoke access for application: %s."
 msgstr "Não foi possível revogar o acesso para a aplicação: %s."
 
 #. TRANS: Success message after revoking access for an application.
 #. TRANS: %1$s is the application name, %2$s is the first part of the user token.
-#: actions/oauthconnectionssettings.php:200
+#: actions/oauthconnectionssettings.php:202
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -4014,14 +3978,14 @@ msgstr ""
 "O acesso de %1$s e do token iniciado por %2$s foi revogado com sucesso."
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:211
+#: actions/oauthconnectionssettings.php:213
 msgid "You have not authorized any applications to use your account."
 msgstr "Você não autorizou nenhuma aplicação a usar a sua conta."
 
 #. TRANS: Note for developers in the OAuth connection settings form.
 #. TRANS: This message contains a Markdown link. Do not separate "](".
 #. TRANS: %s is the URL to the OAuth settings.
-#: actions/oauthconnectionssettings.php:231
+#: actions/oauthconnectionssettings.php:233
 #, php-format
 msgid ""
 "Are you a developer? [Register an OAuth client application](%s) to use with "
@@ -4030,16 +3994,6 @@ msgstr ""
 "Você é um desenvolvedor? [Registre uma aplicação cliente OAuth](%s) para "
 "usar com esta instância do StatusNet."
 
-#: actions/oembed.php:64
-#, fuzzy, php-format
-msgid "\"%s\" not found."
-msgstr "O método da API não foi encontrado!"
-
-#: actions/oembed.php:76
-#, fuzzy, php-format
-msgid "Notice %s not found."
-msgstr "A mensagem pai não foi encontrada."
-
 #: actions/oembed.php:80 actions/shownotice.php:100
 msgid "Notice has no profile."
 msgstr "A mensagem não está associada a nenhum perfil."
@@ -4049,16 +4003,6 @@ msgstr "A mensagem não está associada a nenhum perfil."
 msgid "%1$s's status on %2$s"
 msgstr "Mensagem de %1$s no %2$s"
 
-#: actions/oembed.php:95
-#, fuzzy, php-format
-msgid "Attachment %s not found."
-msgstr "O usuário destinatário não foi encontrado."
-
-#: actions/oembed.php:136
-#, php-format
-msgid "\"%s\" not supported for oembed requests."
-msgstr ""
-
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
 #: actions/oembed.php:168
 #, php-format
@@ -4077,12 +4021,11 @@ msgstr "Por favor, somente URLs %s sobre HTTP puro."
 msgid "Not a supported data format."
 msgstr "Não é um formato de dados suportado."
 
-#. TRANS: ShortName in the OpenSearch interface when trying to find users.
 #: actions/opensearch.php:64
 msgid "People Search"
 msgstr "Procurar pessoas"
 
-#: actions/opensearch.php:68
+#: actions/opensearch.php:67
 msgid "Notice Search"
 msgstr "Procurar mensagens"
 
@@ -4129,46 +4072,37 @@ msgstr "Exibir ou esconder as aparências do perfil."
 msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr "O serviço de encolhimento de URL é muito extenso (máx. 50 caracteres)."
 
-#. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
-#: actions/otp.php:70
+#: actions/otp.php:69
 msgid "No user ID specified."
 msgstr "Não foi especificado nenhum ID de usuário."
 
-#. TRANS: Client error displayed trying to use "one time password login" without specifying a login token.
-#: actions/otp.php:86
+#: actions/otp.php:83
 msgid "No login token specified."
 msgstr "Não foi especificado nenhum token de autenticação."
 
-#. TRANS: Client error displayed trying to use "one time password login" without requesting a login token.
-#: actions/otp.php:94
+#: actions/otp.php:90
 msgid "No login token requested."
 msgstr "Não foi requerido nenhum token de autenticação."
 
-#. TRANS: Client error displayed trying to use "one time password login" while specifying an invalid login token.
-#: actions/otp.php:100
+#: actions/otp.php:95
 msgid "Invalid login token specified."
 msgstr "O token de autenticação especificado é inválido."
 
-#. TRANS: Client error displayed trying to use "one time password login" while specifying an expired login token.
-#: actions/otp.php:110
+#: actions/otp.php:104
 msgid "Login token expired."
 msgstr "O token de autenticação expirou."
 
-#. TRANS: Title for outbox for any but the fist page.
-#. TRANS: %1$s is the user nickname, %2$d is the page number.
-#: actions/outbox.php:57
+#: actions/outbox.php:58
 #, php-format
 msgid "Outbox for %1$s - page %2$d"
 msgstr "Enviadas por %s - pág. %2$d"
 
-#. TRANS: Title for first page of outbox.
 #: actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
 msgstr "Enviadas de %s"
 
-#. TRANS: Instructions for outbox.
-#: actions/outbox.php:103
+#: actions/outbox.php:104
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr ""
 "Essa é a sua caixa de mensagens enviadas, que lista as mensagens "
@@ -4196,45 +4130,43 @@ msgstr "Senha anterior"
 msgid "New password"
 msgstr "Senha nova"
 
-#: actions/passwordsettings.php:109 actions/register.php:423
+#: actions/passwordsettings.php:109
 #, fuzzy
-msgid "6 or more characters."
+msgid "6 or more characters"
 msgstr "No mínimo 6 caracteres"
 
-#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:264
-#: actions/register.php:427
+#: actions/passwordsettings.php:113
 #, fuzzy
-msgid "Same as password above."
+msgid "Same as password above"
 msgstr "Igual à senha acima"
 
 #: actions/passwordsettings.php:117
 msgid "Change"
 msgstr "Alterar"
 
-#: actions/passwordsettings.php:153 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:238
 msgid "Password must be 6 or more characters."
 msgstr "A senha deve ter, no mínimo, 6 caracteres."
 
-#: actions/passwordsettings.php:156 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:241
 msgid "Passwords don't match."
 msgstr "As senhas não coincidem."
 
-#: actions/passwordsettings.php:164
+#: actions/passwordsettings.php:165
 msgid "Incorrect old password"
 msgstr "A senha anterior está errada"
 
-#: actions/passwordsettings.php:180
+#: actions/passwordsettings.php:181
 msgid "Error saving user; invalid."
 msgstr "Erro ao salvar usuário; inválido."
 
-#. TRANS: Reset password form validation error message.
-#: actions/passwordsettings.php:185 actions/recoverpassword.php:418
+#: actions/passwordsettings.php:186
 #, fuzzy
-msgid "Cannot save new password."
+msgid "Can't save new password."
 msgstr "Não é possível salvar a nova senha."
 
-#: actions/passwordsettings.php:191
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
 msgid "Password saved."
 msgstr "A senha foi salva."
 
@@ -4509,9 +4441,7 @@ msgstr "Servidor para onde devem ser direcionadas as requisições SSL."
 msgid "Save paths"
 msgstr "Salvar caminhos"
 
-#. TRANS: Instructions for the "People search" page.
-#. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/peoplesearch.php:54
+#: actions/peoplesearch.php:52
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
@@ -4520,8 +4450,7 @@ msgstr ""
 "Procurar pessoas no %%site.name%% por seus nomes, localidade ou interesses. "
 "Separe os termos da busca com espaços; eles devem ter 3 ou mais caracteres."
 
-#. TRANS: Title of a page where users can search for other users.
-#: actions/peoplesearch.php:61
+#: actions/peoplesearch.php:58
 msgid "People search"
 msgstr "Procurar pessoas"
 
@@ -4564,14 +4493,14 @@ msgid "Profile information"
 msgstr "Informações do perfil"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109 actions/register.php:419
+#: actions/profilesettings.php:109 actions/register.php:433
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr "1-64 letras minúsculas ou números, sem pontuações ou espaços."
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for full group name (dt). Text hidden by default.
 #. TRANS: DT for full name in a profile.
-#: actions/profilesettings.php:113 actions/register.php:441
+#: actions/profilesettings.php:113 actions/register.php:455
 #: actions/showgroup.php:255 actions/tagother.php:104
 #: lib/groupeditform.php:150 lib/userprofile.php:156
 msgid "Full name"
@@ -4579,20 +4508,20 @@ msgstr "Nome completo"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:118 actions/register.php:446
+#: actions/profilesettings.php:118 actions/register.php:460
 #: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "Site"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:121 actions/register.php:448
+#: actions/profilesettings.php:121
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr "URL do seu site, blog ou perfil em outro site."
 
 #. TRANS: Tooltip for field label in form for profile settings. Plural
 #. TRANS: is decided by the number of characters available for the
 #. TRANS: biography (%d).
-#: actions/profilesettings.php:129 actions/register.php:457
+#: actions/profilesettings.php:129 actions/register.php:471
 #, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4600,29 +4529,28 @@ msgstr[0] "Descreva a si mesmo e os seus interesses em %d caractere"
 msgstr[1] "Descreva a si mesmo e os seus interesses em %d caracteres"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:135 actions/register.php:462
+#: actions/profilesettings.php:135 actions/register.php:476
 msgid "Describe yourself and your interests"
 msgstr "Descreva a si mesmo e os seus interesses"
 
 #. TRANS: Text area label in form for profile settings where users can provide.
 #. TRANS: their biography.
-#: actions/profilesettings.php:139 actions/register.php:464
+#: actions/profilesettings.php:139 actions/register.php:478
 msgid "Bio"
 msgstr "Descrição"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group location (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT for location in a profile.
-#: actions/profilesettings.php:145 actions/register.php:469
+#: actions/profilesettings.php:145 actions/register.php:483
 #: actions/showgroup.php:265 actions/tagother.php:112
-#: actions/userauthorization.php:174 lib/groupeditform.php:173
+#: actions/userauthorization.php:166 lib/groupeditform.php:173
 #: lib/userprofile.php:172
 msgid "Location"
 msgstr "Localização"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148
+#: actions/profilesettings.php:148 actions/register.php:485
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Onde você está, ex: \"cidade, estado (ou região), país\""
 
@@ -4643,8 +4571,7 @@ msgstr "Etiquetas"
 #: actions/profilesettings.php:164
 #, fuzzy
 msgid ""
-"Tags for yourself (letters, numbers, -, ., and _), comma- or space- "
-"separated."
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr ""
 "Suas etiquetas (letras, números, -, ., e _), separadas por vírgulas ou "
 "espaços"
@@ -4657,7 +4584,7 @@ msgstr "Idioma"
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
 #: actions/profilesettings.php:171
 #, fuzzy
-msgid "Preferred language."
+msgid "Preferred language"
 msgstr "Idioma preferencial"
 
 #. TRANS: Dropdownlist label in form for profile settings.
@@ -4674,14 +4601,14 @@ msgstr "Em que fuso horário você normalmente está?"
 #: actions/profilesettings.php:189
 #, fuzzy
 msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)."
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr ""
 "Assinar automaticamente à quem me assinar (melhor para perfis não humanos)"
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Plural form is used based on the maximum number of allowed
 #. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:258 actions/register.php:221
+#: actions/profilesettings.php:258 actions/register.php:229
 #, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4700,9 +4627,9 @@ msgstr "O nome do idioma é muito extenso (máx. 50 caracteres)."
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:291
-#, fuzzy, php-format
-msgid "Invalid tag: \"%s\"."
+#: actions/profilesettings.php:291 actions/tagother.php:178
+#, php-format
+msgid "Invalid tag: \"%s\""
 msgstr "Etiqueta inválida: \"%s\""
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
@@ -4810,12 +4737,6 @@ msgstr ""
 "Este é %%site.name%%, um serviço de [microblog](http://pt.wikipedia.org/wiki/"
 "Microblogging) baseado no software livre [StatusNet](http://status.net/)."
 
-#. TRANS: Public RSS feed description. %s is the StatusNet site name.
-#: actions/publicrss.php:106
-#, fuzzy, php-format
-msgid "%s updates from everyone."
-msgstr "%s mensagens de todo mundo!"
-
 #. TRANS: Title for public tag cloud.
 #: actions/publictagcloud.php:57
 msgid "Public tag cloud"
@@ -4953,12 +4874,6 @@ msgstr "Recuperar a senha"
 msgid "Password recovery requested"
 msgstr "Foi solicitada a recuperação da senha"
 
-#. TRANS: Title for password recovery page in password saved mode.
-#: actions/recoverpassword.php:229
-#, fuzzy
-msgid "Password saved"
-msgstr "A senha foi salva."
-
 #. TRANS: Title for password recovery page when an unknown action has been specified.
 #: actions/recoverpassword.php:232
 msgid "Unknown action"
@@ -4970,6 +4885,12 @@ msgstr "Ação desconhecida"
 msgid "6 or more characters, and do not forget it!"
 msgstr "No mínimo 6 caracteres. E não se esqueça dela!"
 
+#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#: actions/recoverpassword.php:264 actions/register.php:441
+#, fuzzy
+msgid "Same as password above."
+msgstr "Igual à senha acima"
+
 #. TRANS: Button text for password reset form.
 #. TRANS: Button text on profile design page to reset all colour settings to default without saving.
 #: actions/recoverpassword.php:268 lib/designsettings.php:264
@@ -5024,8 +4945,14 @@ msgstr "A senha deve ter 6 ou mais caracteres."
 msgid "Password and confirmation do not match."
 msgstr "A senha e a confirmação não coincidem."
 
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:418
+#, fuzzy
+msgid "Cannot save new password."
+msgstr "Não é possível salvar a nova senha."
+
 #. TRANS: Server error displayed when something does wrong with the user object during password reset.
-#: actions/recoverpassword.php:426 actions/register.php:248
+#: actions/recoverpassword.php:426 actions/register.php:256
 msgid "Error setting user."
 msgstr "Erro na configuração do usuário."
 
@@ -5036,70 +4963,75 @@ msgstr ""
 "A nova senha foi salva com sucesso. A partir de agora você já está "
 "autenticado."
 
-#: actions/register.php:87 actions/register.php:188 actions/register.php:399
+#: actions/register.php:92 actions/register.php:196 actions/register.php:413
 msgid "Sorry, only invited people can register."
 msgstr "Desculpe, mas somente convidados podem se registrar."
 
-#: actions/register.php:94
+#: actions/register.php:99
 msgid "Sorry, invalid invitation code."
 msgstr "Desculpe, mas o código do convite é inválido."
 
-#: actions/register.php:113
+#: actions/register.php:119
 msgid "Registration successful"
 msgstr "Registro realizado com sucesso"
 
-#: actions/register.php:115 actions/register.php:497
+#: actions/register.php:121 actions/register.php:511
 msgid "Register"
 msgstr "Registrar-se"
 
-#: actions/register.php:135
+#: actions/register.php:142
 msgid "Registration not allowed."
 msgstr "Não é permitido o registro."
 
-#: actions/register.php:201
+#: actions/register.php:209
 #, fuzzy
-msgid "You cannot register if you don't agree to the license."
+msgid "You can't register if you don't agree to the license."
 msgstr "Você não pode se registrar se não aceitar a licença."
 
-#: actions/register.php:210
+#: actions/register.php:218
 msgid "Email address already exists."
 msgstr "O endereço de e-mail já existe."
 
-#: actions/register.php:243 actions/register.php:265
+#: actions/register.php:251 actions/register.php:273
 msgid "Invalid username or password."
 msgstr "Nome de usuário e/ou senha inválido(s)"
 
-#: actions/register.php:340
+#: actions/register.php:351
 #, fuzzy
 msgid ""
 "With this form you can create a new account. You can then post notices and "
-"link up to friends and colleagues."
+"link up to friends and colleagues. "
 msgstr ""
 "Através deste formulário você pode criar uma nova conta. A partir daí você "
 "pode publicar mensagens e se conectar a amigos e colegas. "
 
+#: actions/register.php:437
+#, fuzzy
+msgid "6 or more characters."
+msgstr "No mínimo 6 caracteres"
+
 #. TRANS: Link description in user account settings menu.
-#: actions/register.php:431 actions/register.php:435
+#: actions/register.php:445 actions/register.php:449
 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
 msgid "Email"
 msgstr "E-mail"
 
-#: actions/register.php:432 actions/register.php:436
+#: actions/register.php:446 actions/register.php:450
 #, fuzzy
-msgid "Used only for updates, announcements, and password recovery."
+msgid "Used only for updates, announcements, and password recovery"
 msgstr "Usado apenas para atualizações, anúncios e recuperações de senha"
 
-#: actions/register.php:443
+#: actions/register.php:457
 #, fuzzy
-msgid "Longer name, preferably your \"real\" name."
+msgid "Longer name, preferably your \"real\" name"
 msgstr "Nome completo, de preferência seu nome \"real\""
 
-#: actions/register.php:471
+#: actions/register.php:462
 #, fuzzy
-msgid "Where you are, like \"City, State (or Region), Country\"."
-msgstr "Onde você está, ex: \"cidade, estado (ou região), país\""
+msgid "URL of your homepage, blog, or profile on another site"
+msgstr "URL do seu site, blog ou perfil em outro site."
 
-#: actions/register.php:510
+#: actions/register.php:523
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
@@ -5107,23 +5039,23 @@ msgstr ""
 "Eu entendo que o conteúdo e os dados de %1$s são particulares e "
 "confidenciais."
 
-#: actions/register.php:520
+#: actions/register.php:533
 #, php-format
 msgid "My text and files are copyright by %1$s."
 msgstr "Meus textos e arquivos estão licenciados sob a %1$s."
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:524
+#: actions/register.php:537
 msgid "My text and files remain under my own copyright."
 msgstr "Meus textos e arquivos permanecem sob meus próprios direitos autorais."
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:527
+#: actions/register.php:540
 msgid "All rights reserved."
 msgstr "Todos os direitos reservados."
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:532
+#: actions/register.php:545
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -5133,7 +5065,7 @@ msgstr ""
 "particulares: senha, endereço de e-mail, endereço do mensageiro instantâneo "
 "e número de telefone."
 
-#: actions/register.php:573
+#: actions/register.php:588
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -5166,7 +5098,7 @@ msgstr ""
 "\n"
 "Obrigado por se registrar e esperamos que você aproveite o serviço."
 
-#: actions/register.php:597
+#: actions/register.php:612
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5200,7 +5132,7 @@ msgstr "Identificação do usuário"
 
 #: actions/remotesubscribe.php:129
 #, fuzzy
-msgid "Nickname of the user you want to follow."
+msgid "Nickname of the user you want to follow"
 msgstr "Identificação do usuário que você quer seguir"
 
 #: actions/remotesubscribe.php:132
@@ -5209,7 +5141,7 @@ msgstr "URL do perfil"
 
 #: actions/remotesubscribe.php:133
 #, fuzzy
-msgid "URL of your profile on another compatible microblogging service."
+msgid "URL of your profile on another compatible microblogging service"
 msgstr "URL do seu perfil em outro serviço de microblog compatível"
 
 #. TRANS: Link text for link that will subscribe to a remote profile.
@@ -5220,7 +5152,7 @@ msgstr "Assinar"
 
 #: actions/remotesubscribe.php:158
 #, fuzzy
-msgid "Invalid profile URL (bad format)."
+msgid "Invalid profile URL (bad format)"
 msgstr "A URL do perfil é inválida (formato inválido)"
 
 #: actions/remotesubscribe.php:167
@@ -5263,7 +5195,6 @@ msgstr "Repetida"
 msgid "Repeated!"
 msgstr "Repetida!"
 
-#. TRANS: RSS reply feed title. %s is a user nickname.
 #. TRANS: Tooltip for personal group navigation menu option when logged in for viewing @-replies.
 #: actions/replies.php:126 actions/repliesrss.php:68
 #: lib/personalgroupnav.php:109
@@ -5318,11 +5249,9 @@ msgstr ""
 "Seja o primeiro a [publicar sobre este tópico](%%%%action.newnotice%%%%?"
 "status_textarea=%s)!"
 
-#. TRANS: RSS reply feed description.
-#. TRANS: %1$s is a user nickname, %2$s is the StatusNet site name.
-#: actions/repliesrss.php:74
+#: actions/repliesrss.php:72
 #, fuzzy, php-format
-msgid "Replies to %1$s on %2$s."
+msgid "Replies to %1$s on %2$s!"
 msgstr "Respostas para %1$s no %2$s"
 
 #. TRANS: Client exception displayed when trying to restore an account while not logged in.
@@ -5426,7 +5355,7 @@ msgstr "Não é possível revogar os papéis dos usuários neste site."
 msgid "User doesn't have this role."
 msgstr "O usuário não possui este papel."
 
-#: actions/rsd.php:142 actions/version.php:159
+#: actions/rsd.php:146 actions/version.php:159
 msgid "StatusNet"
 msgstr "StatusNet"
 
@@ -5468,87 +5397,87 @@ msgstr "Ativa a saída de depuração para as sessões."
 msgid "Save site settings"
 msgstr "Salvar as configurações do site"
 
-#: actions/showapplication.php:78
+#: actions/showapplication.php:82
 msgid "You must be logged in to view an application."
 msgstr "Você deve estar autenticado para visualizar uma aplicação."
 
-#: actions/showapplication.php:151
+#: actions/showapplication.php:157
 msgid "Application profile"
 msgstr "Perfil da aplicação"
 
 #. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:153 lib/applicationeditform.php:177
+#: actions/showapplication.php:159 lib/applicationeditform.php:177
 msgid "Icon"
 msgstr "Ícone"
 
 #. TRANS: Form input field label for application name.
-#: actions/showapplication.php:163 actions/version.php:197
+#: actions/showapplication.php:169 actions/version.php:197
 #: lib/applicationeditform.php:190
 msgid "Name"
 msgstr "Nome"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:172 lib/applicationeditform.php:227
+#: actions/showapplication.php:178 lib/applicationeditform.php:227
 msgid "Organization"
 msgstr "Organização"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:181 actions/version.php:200
+#: actions/showapplication.php:187 actions/version.php:200
 #: lib/applicationeditform.php:208 lib/groupeditform.php:168
 msgid "Description"
 msgstr "Descrição"
 
 #. TRANS: Header for group statistics on a group page (h2).
 #. TRANS: H2 text for user statistics.
-#: actions/showapplication.php:186 actions/showgroup.php:460
+#: actions/showapplication.php:192 actions/showgroup.php:460
 #: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "Estatísticas"
 
-#: actions/showapplication.php:197
+#: actions/showapplication.php:203
 #, php-format
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr "Criado por %1$s - acesso %2$s por padrão - %3$d usuários"
 
-#: actions/showapplication.php:207
+#: actions/showapplication.php:213
 msgid "Application actions"
 msgstr "Ações da aplicação"
 
-#: actions/showapplication.php:230
+#: actions/showapplication.php:236
 msgid "Reset key & secret"
 msgstr "Restaurar a chave e o segredo"
 
 #. TRANS: Title of form for deleting a user.
-#: actions/showapplication.php:246 lib/deletegroupform.php:121
+#: actions/showapplication.php:252 lib/deletegroupform.php:121
 #: lib/deleteuserform.php:64 lib/noticelist.php:673
 msgid "Delete"
 msgstr "Excluir"
 
-#: actions/showapplication.php:255
+#: actions/showapplication.php:261
 msgid "Application info"
 msgstr "Informação da aplicação"
 
-#: actions/showapplication.php:257
+#: actions/showapplication.php:263
 msgid "Consumer key"
 msgstr "Chave do consumidor"
 
-#: actions/showapplication.php:262
+#: actions/showapplication.php:268
 msgid "Consumer secret"
 msgstr "Segredo do consumidor"
 
-#: actions/showapplication.php:267
+#: actions/showapplication.php:273
 msgid "Request token URL"
 msgstr "URL do token de requisição"
 
-#: actions/showapplication.php:272
+#: actions/showapplication.php:278
 msgid "Access token URL"
 msgstr "URL do token de acesso"
 
-#: actions/showapplication.php:277
+#: actions/showapplication.php:283
 msgid "Authorize URL"
 msgstr "Autorizar a URL"
 
-#: actions/showapplication.php:282
+#: actions/showapplication.php:288
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
@@ -5556,7 +5485,7 @@ msgstr ""
 "Nota: Nós suportamos assinaturas HMAC-SHA1. Nós não suportamos o método de "
 "assinatura em texto plano."
 
-#: actions/showapplication.php:302
+#: actions/showapplication.php:309
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr "Tem certeza que deseja restaurar sua chave e segredo de consumidor?"
 
@@ -5648,18 +5577,16 @@ msgid "Group profile"
 msgstr "Perfil do grupo"
 
 #. TRANS: Label for group URL (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT for URL in a profile.
 #: actions/showgroup.php:273 actions/tagother.php:118
-#: actions/userauthorization.php:184 lib/userprofile.php:186
+#: actions/userauthorization.php:175 lib/userprofile.php:186
 msgid "URL"
 msgstr "Site"
 
 #. TRANS: Label for group description or group note (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page where bio is displayed.
 #. TRANS: DT for note in a profile.
 #: actions/showgroup.php:285 actions/tagother.php:128
-#: actions/userauthorization.php:197 lib/userprofile.php:204
+#: actions/userauthorization.php:187 lib/userprofile.php:204
 msgid "Note"
 msgstr "Mensagem"
 
@@ -5805,7 +5732,7 @@ msgid "%1$s tagged %2$s"
 msgstr "Mensagens de %1$s etiquetadas como %2$s"
 
 #. TRANS: Page title showing tagged notices in one user's stream.
-#. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
+#. TRANS: %1$s is the username, %2$s is the hash tag, %1$d is the page number.
 #: actions/showstream.php:74
 #, php-format
 msgid "%1$s tagged %2$s, page %3$d"
@@ -6057,7 +5984,7 @@ msgstr ""
 #. TRANS: Title for button to save site notice in admin panel.
 #: actions/sitenoticeadminpanel.php:201
 #, fuzzy
-msgid "Save site notice."
+msgid "Save site notice"
 msgstr "Salvar os avisos do site"
 
 #. TRANS: Title for SMS settings.
@@ -6116,7 +6043,7 @@ msgstr "Telefone para SMS"
 #. TRANS: SMS phone number input field instructions in SMS settings form.
 #: actions/smssettings.php:152
 #, fuzzy
-msgid "Phone number, no punctuation or spaces, with area code."
+msgid "Phone number, no punctuation or spaces, with area code"
 msgstr "Número de telefone, sem pontuação ou espaços, com código de área"
 
 #. TRANS: Form legend for SMS preferences form.
@@ -6284,19 +6211,15 @@ msgstr "Você não está assinando esse perfil."
 msgid "Could not save subscription."
 msgstr "Não foi possível salvar a assinatura."
 
-#. TRANS: Client error displayed trying to perform any request method other than POST.
-#. TRANS: Do not translate POST.
 #: actions/subscribe.php:77
 msgid "This action only accepts POST requests."
 msgstr "Esta ação aceita somente requisições POST."
 
-#. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
-#: actions/subscribe.php:121
+#: actions/subscribe.php:117
 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
 msgstr "Não é possível assinar um perfil OMB 0.1 remoto com essa ação."
 
-#. TRANS: Page title when subscription succeeded.
-#: actions/subscribe.php:149
+#: actions/subscribe.php:145
 msgid "Subscribed"
 msgstr "Assinado"
 
@@ -6456,9 +6379,8 @@ msgstr "Etiqueta %s"
 msgid "User profile"
 msgstr "Perfil do usuário"
 
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT element in area for user avatar.
-#: actions/tagother.php:81 actions/userauthorization.php:138
+#: actions/tagother.php:81 actions/userauthorization.php:132
 #: lib/userprofile.php:108
 msgid "Photo"
 msgstr "Imagem"
@@ -6475,11 +6397,6 @@ msgstr ""
 "Etiquetas para este usuário (letras, números, -, ., e _), separadas por "
 "vírgulas ou espaços"
 
-#: actions/tagother.php:178
-#, php-format
-msgid "Invalid tag: \"%s\""
-msgstr "Etiqueta inválida: \"%s\""
-
 #: actions/tagother.php:193
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
@@ -6495,7 +6412,6 @@ msgstr ""
 msgid "No such tag."
 msgstr "Esta etiqueta não existe."
 
-#. TRANS: Client error displayed when trying to unblock a non-blocked user.
 #: actions/unblock.php:59
 msgid "You haven't blocked that user."
 msgstr "Você não bloqueou esse usuário."
@@ -6516,7 +6432,7 @@ msgstr "A requisição não possui nenhuma ID de perfil."
 msgid "Unsubscribed"
 msgstr "Cancelado"
 
-#: actions/updateprofile.php:64
+#: actions/updateprofile.php:64 actions/userauthorization.php:337
 #, php-format
 msgid ""
 "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
@@ -6550,7 +6466,7 @@ msgstr ""
 #. TRANS: users in user admin panel. %1$s is the invalid nickname.
 #: actions/useradminpanel.php:166
 #, fuzzy, php-format
-msgid "Invalid default subscripton: \"%1$s\" is not a user."
+msgid "Invalid default subscripton: '%1$s' is not a user."
 msgstr "Assinatura padrão inválida: '%1$s' não é um usuário."
 
 #. TRANS: Link description in user account settings menu.
@@ -6611,70 +6527,59 @@ msgstr "Define se os usuários podem ou não convidar novos usuários."
 #. TRANS: Title for button to save user settings in user admin panel.
 #: actions/useradminpanel.php:302
 #, fuzzy
-msgid "Save user settings."
+msgid "Save user settings"
 msgstr "Salvar as configurações de usuário"
 
-#. TRANS: Page title.
-#: actions/userauthorization.php:109
+#: actions/userauthorization.php:105
 msgid "Authorize subscription"
 msgstr "Autorizar a assinatura"
 
-#. TRANS: Page notice on "Auhtorize subscription" page.
-#: actions/userauthorization.php:115
+#: actions/userauthorization.php:110
 #, fuzzy
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
 "user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
-"click \"Reject\"."
+"click “Reject”."
 msgstr ""
 "Por favor, verifique estes detalhes para ter certeza que você quer assinar "
 "as mensagens deste usuário. Se você não solicitou assinar as mensagens de "
 "alguém, clique em \"Recusar\"."
 
-#. TRANS: DT element on Authorise Subscription page where license is displayed.
 #. TRANS: Menu item for site administration
-#: actions/userauthorization.php:207 actions/version.php:167
+#: actions/userauthorization.php:196 actions/version.php:167
 #: lib/adminpanelaction.php:403
 msgid "License"
 msgstr "Licença"
 
-#. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:229
+#: actions/userauthorization.php:217
 #, fuzzy
-msgctxt "BUTTON"
 msgid "Accept"
 msgstr "Aceitar"
 
-#. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:231
-#, fuzzy
-msgid "Subscribe to this user."
+#: actions/userauthorization.php:218 lib/subscribeform.php:115
+#: lib/subscribeform.php:139
+msgid "Subscribe to this user"
 msgstr "Assinar este usuário"
 
-#. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:233
+#: actions/userauthorization.php:219
 #, fuzzy
-msgctxt "BUTTON"
 msgid "Reject"
 msgstr "Recusar"
 
-#. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:235
+#: actions/userauthorization.php:220
 #, fuzzy
-msgid "Reject this subscription."
+msgid "Reject this subscription"
 msgstr "Recusar esta assinatura"
 
-#. TRANS: Client error displayed for an empty authorisation request.
-#: actions/userauthorization.php:248
+#: actions/userauthorization.php:232
 msgid "No authorization request!"
 msgstr "Nenhum pedido de autorização!"
 
-#. TRANS: Accept message header from Authorise subscription page.
-#: actions/userauthorization.php:271
+#: actions/userauthorization.php:254
 msgid "Subscription authorized"
 msgstr "A assinatura foi autorizada"
 
-#: actions/userauthorization.php:274
+#: actions/userauthorization.php:256
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to authorize the "
@@ -6684,12 +6589,11 @@ msgstr ""
 "Verifique as instruções do site para detalhes sobre como autorizar a "
 "assinatura. Seu token de assinatura é:"
 
-#. TRANS: Reject message header from Authorise subscription page.
-#: actions/userauthorization.php:285
+#: actions/userauthorization.php:266
 msgid "Subscription rejected"
 msgstr "A assinatura foi recusada"
 
-#: actions/userauthorization.php:288
+#: actions/userauthorization.php:268
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to fully reject the "
@@ -6699,64 +6603,39 @@ msgstr ""
 "Verifique as instruções do site para detalhes sobre como rejeitar "
 "completamente a assinatura."
 
-#. TRANS: Exception thrown when no valid user is found for an authorisation request.
-#. TRANS: %s is a listener URI.
-#: actions/userauthorization.php:325
+#: actions/userauthorization.php:303
 #, fuzzy, php-format
-msgid "Listener URI \"%s\" not found here."
+msgid "Listener URI ‘%s’ not found here."
 msgstr "A URI ‘%s’ do usuário não foi encontrada aqui."
 
-#. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:332
+#: actions/userauthorization.php:308
 #, fuzzy, php-format
-msgid "Listenee URI \"%s\" is too long."
+msgid "Listenee URI ‘%s’ is too long."
 msgstr "A URI ‘%s’ do usuário é muito extensa."
 
-#. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:340
+#: actions/userauthorization.php:314
 #, fuzzy, php-format
-msgid "Listenee URI \"%s\" is a local user."
+msgid "Listenee URI ‘%s’ is a local user."
 msgstr "A URI ‘%s’ é de um usuário local."
 
-#. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
-#. TRANS: %s is a profile URL.
-#: actions/userauthorization.php:358
+#: actions/userauthorization.php:329
 #, fuzzy, php-format
-msgid "Profile URL \"%s\" is for a local user."
+msgid "Profile URL ‘%s’ is for a local user."
 msgstr "A URL ‘%s’ do perfil é de um usuário local."
 
-#. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
-#. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
-#: actions/userauthorization.php:368
+#: actions/userauthorization.php:345
 #, fuzzy, php-format
-msgid ""
-"Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
-"\"."
-msgstr ""
-"A licença '%1$s' do fluxo do usuário não é compatível com a licença '%2$s' "
-"do site."
-
-#. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:378
-#, fuzzy, php-format
-msgid "Avatar URL \"%s\" is not valid."
+msgid "Avatar URL ‘%s’ is not valid."
 msgstr "A URL ‘%s’ do avatar não é válida."
 
-#. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:385
+#: actions/userauthorization.php:350
 #, fuzzy, php-format
-msgid "Cannot read avatar URL \"%s\"."
+msgid "Can’t read avatar URL ‘%s’."
 msgstr "Não é possível ler a URL '%s' do avatar."
 
-#. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:392
+#: actions/userauthorization.php:355
 #, fuzzy, php-format
-msgid "Wrong image type for avatar URL \"%s\"."
+msgid "Wrong image type for avatar URL ‘%s’."
 msgstr "Tipo de imagem errado para a URL '%s' do avatar."
 
 #. TRANS: Page title for profile design page.
@@ -6866,7 +6745,7 @@ msgid "Plugins"
 msgstr "Plugins"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:898
+#: actions/version.php:198 lib/action.php:901
 msgid "Version"
 msgstr "Versão"
 
@@ -7075,14 +6954,14 @@ msgstr "Problema no salvamento das mensagens recebidas do grupo."
 
 #. TRANS: Server exception thrown when a reply cannot be saved.
 #. TRANS: %1$d is a notice ID, %2$d is the ID of the mentioned user.
-#: classes/Notice.php:1142
+#: classes/Notice.php:1144
 #, fuzzy, php-format
 msgid "Could not save reply for %1$d, %2$d."
 msgstr "Não foi possível salvar a informação do grupo local."
 
 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1661
+#: classes/Notice.php:1663
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
@@ -7096,14 +6975,14 @@ msgstr "%1$s (%2$s)"
 
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:775
+#: classes/Profile.php:779
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr "Não é possível revogar a função \"%1$s\" do usuário #%2$d; não existe."
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:784
+#: classes/Profile.php:788
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -7422,53 +7301,53 @@ msgid "Page notice"
 msgstr "Notícia da página"
 
 #. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:871
+#: lib/action.php:874
 msgid "Secondary site navigation"
 msgstr "Navegação secundária no site"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:877
+#: lib/action.php:880
 msgid "Help"
 msgstr "Ajuda"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:880
+#: lib/action.php:883
 msgid "About"
 msgstr "Sobre"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:883
+#: lib/action.php:886
 msgid "FAQ"
 msgstr "FAQ"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:888
+#: lib/action.php:891
 msgid "TOS"
 msgstr "Termos de uso"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:892
+#: lib/action.php:895
 msgid "Privacy"
 msgstr "Privacidade"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:895
+#: lib/action.php:898
 msgid "Source"
 msgstr "Fonte"
 
 #. TRANS: Secondary navigation menu option leading to e-mail contact information on the
 #. TRANS: StatusNet site, where to report bugs, ...
-#: lib/action.php:902
+#: lib/action.php:905
 msgid "Contact"
 msgstr "Contato"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:905
+#: lib/action.php:908
 msgid "Badge"
 msgstr "Mini-aplicativo"
 
 #. TRANS: DT element for StatusNet software license.
-#: lib/action.php:934
+#: lib/action.php:937
 msgid "StatusNet software license"
 msgstr "Licença do software StatusNet"
 
@@ -7476,7 +7355,7 @@ msgstr "Licença do software StatusNet"
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:941
+#: lib/action.php:944
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7486,7 +7365,7 @@ msgstr ""
 "broughtby%%](%%site.broughtbyurl%%). "
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:944
+#: lib/action.php:947
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** é um serviço de microblog."
@@ -7495,7 +7374,7 @@ msgstr "**%%site.name%%** é um serviço de microblog."
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:951
+#: lib/action.php:954
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7507,26 +7386,26 @@ msgstr ""
 "fsf.org/licensing/licenses/agpl-3.0.html)."
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:967
+#: lib/action.php:970
 msgid "Site content license"
 msgstr "Licença do conteúdo do site"
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:974
+#: lib/action.php:977
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr "O conteúdo e os dados de %1$s são privados e confidenciais."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:981
+#: lib/action.php:984
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr "Conteúdo e dados licenciados sob %1$s. Todos os direitos reservados."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:985
+#: lib/action.php:988
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 "Conteúdo e dados licenciados pelos colaboradores. Todos os direitos "
@@ -7534,25 +7413,25 @@ msgstr ""
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:1017
+#: lib/action.php:1020
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr "Todo o conteúdo e dados de %1$s estão disponíveis sob a licença %2$s."
 
 #. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1353
+#: lib/action.php:1356
 msgid "Pagination"
 msgstr "Paginação"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1364
+#: lib/action.php:1367
 msgid "After"
 msgstr "Próximo"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1374
+#: lib/action.php:1377
 msgid "Before"
 msgstr "Anterior"
 
@@ -7754,23 +7633,19 @@ msgstr ""
 msgid "No application for that consumer key."
 msgstr "Não foi encontrado nenhuma aplicação para essa chave de consumidor."
 
-#: lib/apiauth.php:202 lib/apiauth.php:284
-msgid "Not allowed to use API."
-msgstr ""
-
 #. TRANS: OAuth exception given when an incorrect access token was given for a user.
-#: lib/apiauth.php:225
+#: lib/apiauth.php:219
 msgid "Bad access token."
 msgstr "Token de acesso incorreto."
 
 #. TRANS: OAuth exception given when no user was found for a given token (no token was found).
-#: lib/apiauth.php:230
+#: lib/apiauth.php:224
 msgid "No user for that token."
 msgstr "Nenhum usuário para esse código."
 
 #. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel".
 #. TRANS: Client error thrown when authentication fails.
-#: lib/apiauth.php:272 lib/apiauth.php:302
+#: lib/apiauth.php:266 lib/apiauth.php:293
 msgid "Could not authenticate you."
 msgstr "Não foi possível autenticá-lo."
 
@@ -7979,11 +7854,6 @@ msgstr "Não é permitido alterar a senha"
 msgid "Block"
 msgstr "Bloquear"
 
-#. TRANS: Description of the form to block a user.
-#: lib/blockform.php:79
-msgid "Block this user"
-msgstr "Bloquear este usuário"
-
 #. TRANS: Title for command results.
 #: lib/channel.php:160 lib/channel.php:181
 msgid "Command results"
@@ -8012,7 +7882,7 @@ msgstr "Não existe uma mensagem com essa id."
 
 #. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
 #. TRANS: Error text shown when a last user notice is requested and it does not exist.
-#: lib/command.php:99 lib/command.php:630
+#: lib/command.php:99 lib/command.php:642
 msgid "User has no last notice."
 msgstr "O usuário não tem nenhuma \"última mensagem\"."
 
@@ -8063,35 +7933,41 @@ msgstr ""
 "Assinantes: %2$s\n"
 "Mensagens: %3$s"
 
+#. TRANS: Error message text shown when a favorite could not be set because it has already been favorited.
+#: lib/command.php:298
+#, fuzzy
+msgid "Could not create favorite: already favorited."
+msgstr "Não foi possível criar a favorita."
+
 #. TRANS: Text shown when a notice has been marked as favourite successfully.
-#: lib/command.php:312
+#: lib/command.php:324
 msgid "Notice marked as fave."
 msgstr "Mensagem marcada como favorita."
 
 #. TRANS: Message given having added a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:357
+#: lib/command.php:369
 #, php-format
 msgid "%1$s joined group %2$s."
 msgstr "%1$s associou-se ao grupo %2$s."
 
 #. TRANS: Message given having removed a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:405
+#: lib/command.php:417
 #, php-format
 msgid "%1$s left group %2$s."
 msgstr "%1$s deixou o grupo %2$s."
 
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: lib/command.php:426
+#: lib/command.php:438
 #, fuzzy, php-format
 msgctxt "WHOIS"
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
 
 #. TRANS: Whois output. %s is the full name of the queried user.
-#: lib/command.php:430
+#: lib/command.php:442
 #, php-format
 msgid "Fullname: %s"
 msgstr "Nome completo: %s"
@@ -8099,7 +7975,7 @@ msgstr "Nome completo: %s"
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a location.
-#: lib/command.php:434 lib/mail.php:270
+#: lib/command.php:446 lib/mail.php:270
 #, php-format
 msgid "Location: %s"
 msgstr "Localização: %s"
@@ -8107,20 +7983,20 @@ msgstr "Localização: %s"
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a homepage.
-#: lib/command.php:438 lib/mail.php:274
+#: lib/command.php:450 lib/mail.php:274
 #, php-format
 msgid "Homepage: %s"
 msgstr "Site: %s"
 
 #. TRANS: Whois output. %s is the bio information of the queried user.
-#: lib/command.php:442
+#: lib/command.php:454
 #, php-format
 msgid "About: %s"
 msgstr "Sobre: %s"
 
 #. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).
 #. TRANS: %s is a remote profile.
-#: lib/command.php:471
+#: lib/command.php:483
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
@@ -8131,7 +8007,7 @@ msgstr ""
 
 #. TRANS: Message given if content is too long. %1$sd is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:488
+#: lib/command.php:500
 #, fuzzy, php-format
 msgid "Message too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
@@ -8141,25 +8017,25 @@ msgstr[1] ""
 "A mensagem é muito extensa - o máximo são %1$d caracteres e você enviou %2$d."
 
 #. TRANS: Error text shown sending a direct message fails with an unknown reason.
-#: lib/command.php:516
+#: lib/command.php:528
 msgid "Error sending direct message."
 msgstr "Ocorreu um erro durante o envio da mensagem direta."
 
 #. TRANS: Message given having repeated a notice from another user.
 #. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:553
+#: lib/command.php:565
 #, php-format
 msgid "Notice from %s repeated."
 msgstr "A mensagem de %s foi repetida."
 
 #. TRANS: Error text shown when repeating a notice fails with an unknown reason.
-#: lib/command.php:556
+#: lib/command.php:568
 msgid "Error repeating notice."
 msgstr "Erro na repetição da mensagem."
 
 #. TRANS: Message given if content of a notice for a reply is too long. %1$d is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:591
+#: lib/command.php:603
 #, fuzzy, php-format
 msgid "Notice too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Notice too long - maximum is %1$d characters, you sent %2$d."
@@ -8170,80 +8046,80 @@ msgstr[1] ""
 
 #. TRANS: Text shown having sent a reply to a notice successfully.
 #. TRANS: %s is the nickname of the user of the notice the reply was sent to.
-#: lib/command.php:604
+#: lib/command.php:616
 #, php-format
 msgid "Reply to %s sent."
 msgstr "A resposta para %s foi enviada."
 
 #. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
-#: lib/command.php:607
+#: lib/command.php:619
 msgid "Error saving notice."
 msgstr "Erro no salvamento da mensagem."
 
 #. TRANS: Error text shown when no username was provided when issuing a subscribe command.
-#: lib/command.php:654
+#: lib/command.php:666
 msgid "Specify the name of the user to subscribe to."
 msgstr "Especifique o nome do usuário que será assinado."
 
 #. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
-#: lib/command.php:663
+#: lib/command.php:675
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "Não é possível assinar perfis OMB com comandos."
 
 #. TRANS: Text shown after having subscribed to another user successfully.
 #. TRANS: %s is the name of the user the subscription was requested for.
-#: lib/command.php:671
+#: lib/command.php:683
 #, php-format
 msgid "Subscribed to %s."
 msgstr "Foi efetuada a assinatura de $s."
 
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.
-#: lib/command.php:692 lib/command.php:803
+#: lib/command.php:704 lib/command.php:815
 msgid "Specify the name of the user to unsubscribe from."
 msgstr "Especifique o nome do usuário cuja assinatura será cancelada."
 
 #. TRANS: Text shown after having unsubscribed from another user successfully.
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:703
+#: lib/command.php:715
 #, php-format
 msgid "Unsubscribed from %s."
 msgstr "Foi cancelada a assinatura de %s."
 
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
-#: lib/command.php:723 lib/command.php:749
+#: lib/command.php:735 lib/command.php:761
 msgid "Command not yet implemented."
 msgstr "O comando não foi implementado ainda."
 
 #. TRANS: Text shown when issuing the command "off" successfully.
-#: lib/command.php:727
+#: lib/command.php:739
 msgid "Notification off."
 msgstr "Notificação desligada."
 
 #. TRANS: Error text shown when the command "off" fails for an unknown reason.
-#: lib/command.php:730
+#: lib/command.php:742
 msgid "Can't turn off notification."
 msgstr "Não é possível desligar a notificação."
 
 #. TRANS: Text shown when issuing the command "on" successfully.
-#: lib/command.php:753
+#: lib/command.php:765
 msgid "Notification on."
 msgstr "Notificação ligada."
 
 #. TRANS: Error text shown when the command "on" fails for an unknown reason.
-#: lib/command.php:756
+#: lib/command.php:768
 msgid "Can't turn on notification."
 msgstr "Não é possível ligar a notificação."
 
 #. TRANS: Error text shown when issuing the login command while login is disabled.
-#: lib/command.php:770
+#: lib/command.php:782
 msgid "Login command is disabled."
 msgstr "O comando para autenticação está desabilitado."
 
 #. TRANS: Text shown after issuing the login command successfully.
 #. TRANS: %s is a logon link..
-#: lib/command.php:783
+#: lib/command.php:795
 #, php-format
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
@@ -8252,20 +8128,20 @@ msgstr ""
 
 #. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:812
+#: lib/command.php:824
 #, php-format
 msgid "Unsubscribed %s."
 msgstr "Foi cancelada a assinatura de %s."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
-#: lib/command.php:830
+#: lib/command.php:842
 msgid "You are not subscribed to anyone."
 msgstr "Você não está assinando ninguém."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
-#: lib/command.php:835
+#: lib/command.php:847
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Você já está assinando esta pessoa:"
@@ -8273,14 +8149,14 @@ msgstr[1] "Você já está assinando estas pessoas:"
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user
 #. TRANS: (followers) without having any subscribers.
-#: lib/command.php:857
+#: lib/command.php:869
 msgid "No one is subscribed to you."
 msgstr "Ninguém o assinou ainda."
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
-#: lib/command.php:862
+#: lib/command.php:874
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Esta pessoa está assinando você:"
@@ -8288,21 +8164,21 @@ msgstr[1] "Estas pessoas estão assinando você:"
 
 #. TRANS: Text shown after requesting groups a user is subscribed to without having
 #. TRANS: any group subscriptions.
-#: lib/command.php:884
+#: lib/command.php:896
 msgid "You are not a member of any groups."
 msgstr "Você não é membro de nenhum grupo."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
-#: lib/command.php:889
+#: lib/command.php:901
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "Você é membro deste grupo:"
 msgstr[1] "Você é membro destes grupos:"
 
 #. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-#: lib/command.php:904
+#: lib/command.php:916
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -8447,11 +8323,6 @@ msgstr "Aplicações autorizadas conectadas"
 msgid "Database error"
 msgstr "Erro no banco de dados"
 
-#. TRANS: Description of form for deleting a user.
-#: lib/deleteuserform.php:75
-msgid "Delete this user"
-msgstr "Excluir este usuário"
-
 #. TRANS: Label in form on profile design page.
 #. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
 #: lib/designsettings.php:108
@@ -8489,21 +8360,6 @@ msgstr "Alterar a cor"
 msgid "Use defaults"
 msgstr "Usar o padrão|"
 
-#. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: lib/designsettings.php:259
-msgid "Restore default designs"
-msgstr "Restaura a aparência padrão"
-
-#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: lib/designsettings.php:267
-msgid "Reset back to default"
-msgstr "Restaura de volta ao padrão"
-
-#. TRANS: Title for button on profile design page to save settings.
-#: lib/designsettings.php:272
-msgid "Save design"
-msgstr "Salvar a aparência"
-
 #. TRANS: Error message displayed if design settings could not be saved.
 #. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
 #: lib/designsettings.php:405 lib/designsettings.php:427
@@ -9393,10 +9249,6 @@ msgstr "Responder a esta mensagem"
 msgid "Reply"
 msgstr "Responder"
 
-#: lib/noticelist.php:673
-msgid "Delete this notice"
-msgstr "Excluir esta mensagem"
-
 #: lib/noticelist.php:691
 msgid "Notice repeated"
 msgstr "Mensagem repetida"
@@ -9678,10 +9530,6 @@ msgstr "Convidar"
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Convide seus amigos e colegas para unir-se a você no %s"
 
-#: lib/subscribeform.php:115 lib/subscribeform.php:139
-msgid "Subscribe to this user"
-msgstr "Assinar este usuário"
-
 #: lib/subscriberspeopleselftagcloudsection.php:48
 #: lib/subscriptionspeopleselftagcloudsection.php:48
 msgid "People Tagcloud as self-tagged"
@@ -9856,23 +9704,18 @@ msgctxt "role"
 msgid "Moderator"
 msgstr "Moderador"
 
-#: lib/util.php:305
-#, fuzzy
-msgid "Not allowed to log in."
-msgstr "Você não está autenticado."
-
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1309
+#: lib/util.php:1306
 msgid "a few seconds ago"
 msgstr "alguns segundos atrás"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1312
+#: lib/util.php:1309
 msgid "about a minute ago"
 msgstr "cerca de 1 minuto atrás"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1316
+#: lib/util.php:1313
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
@@ -9880,12 +9723,12 @@ msgstr[0] "há cerca de um minuto atrás"
 msgstr[1] "há cerca de %d minutos atrás"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1319
+#: lib/util.php:1316
 msgid "about an hour ago"
 msgstr "cerca de 1 hora atrás"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1323
+#: lib/util.php:1320
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
@@ -9893,12 +9736,12 @@ msgstr[0] "há cerca de uma hora atrás"
 msgstr[1] "há cerca de %d horas atrás"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1326
+#: lib/util.php:1323
 msgid "about a day ago"
 msgstr "cerca de 1 dia atrás"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1330
+#: lib/util.php:1327
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
@@ -9906,12 +9749,12 @@ msgstr[0] "há cerca de um dia atrás"
 msgstr[1] "há cerca de %d dias atrás"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1333
+#: lib/util.php:1330
 msgid "about a month ago"
 msgstr "cerca de 1 mês atrás"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1337
+#: lib/util.php:1334
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
@@ -9919,7 +9762,7 @@ msgstr[0] "há cerca de um mês atrás"
 msgstr[1] "há cerca de %d meses atrás"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1340
+#: lib/util.php:1337
 msgid "about a year ago"
 msgstr "cerca de 1 ano atrás"
 
@@ -9963,3 +9806,75 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#, fuzzy
+#~ msgid "Block this user."
+#~ msgstr "Bloquear este usuário"
+
+#, fuzzy
+#~ msgid "Delete this notice."
+#~ msgstr "Excluir esta mensagem"
+
+#, fuzzy
+#~ msgid "Delete this user."
+#~ msgstr "Excluir este usuário"
+
+#, fuzzy
+#~ msgid "Restore default designs."
+#~ msgstr "Restaura a aparência padrão"
+
+#, fuzzy
+#~ msgid "Reset back to default."
+#~ msgstr "Restaura de volta ao padrão"
+
+#, fuzzy
+#~ msgid "Save design."
+#~ msgstr "Salvar a aparência"
+
+#, fuzzy
+#~ msgid "Disfavor favorite."
+#~ msgstr "Desmarcar a favorita"
+
+#, fuzzy
+#~ msgid "\"%s\" not found."
+#~ msgstr "O método da API não foi encontrado!"
+
+#, fuzzy
+#~ msgid "Notice %s not found."
+#~ msgstr "A mensagem pai não foi encontrada."
+
+#, fuzzy
+#~ msgid "Attachment %s not found."
+#~ msgstr "O usuário destinatário não foi encontrado."
+
+#, fuzzy
+#~ msgid "Invalid tag: \"%s\"."
+#~ msgstr "Etiqueta inválida: \"%s\""
+
+#, fuzzy
+#~ msgid "%s updates from everyone."
+#~ msgstr "%s mensagens de todo mundo!"
+
+#, fuzzy
+#~ msgid "Password saved"
+#~ msgstr "A senha foi salva."
+
+#, fuzzy
+#~ msgid "Where you are, like \"City, State (or Region), Country\"."
+#~ msgstr "Onde você está, ex: \"cidade, estado (ou região), país\""
+
+#, fuzzy
+#~ msgid "Subscribe to this user."
+#~ msgstr "Assinar este usuário"
+
+#, fuzzy
+#~ msgid ""
+#~ "Listenee stream license \"%1$s\" is not compatible with site license \"%2"
+#~ "$s\"."
+#~ msgstr ""
+#~ "A licença '%1$s' do fluxo do usuário não é compatível com a licença '%2"
+#~ "$s' do site."
+
+#, fuzzy
+#~ msgid "Not allowed to log in."
+#~ msgstr "Você não está autenticado."
diff --git a/locale/ru/LC_MESSAGES/statusnet.po b/locale/ru/LC_MESSAGES/statusnet.po
index 8530c5e105..734acc3331 100644
--- a/locale/ru/LC_MESSAGES/statusnet.po
+++ b/locale/ru/LC_MESSAGES/statusnet.po
@@ -18,18 +18,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-24 10:32+0000\n"
-"PO-Revision-Date: 2011-02-24 10:37:36+0000\n"
+"POT-Creation-Date: 2011-03-03 15:58+0000\n"
+"PO-Revision-Date: 2011-03-03 16:01:19+0000\n"
 "Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r82712); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
-"X-POT-Import-Date: 2011-02-17 11:39:54+0000\n"
+"X-POT-Import-Date: 2011-02-25 23:49:23+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -142,11 +142,7 @@ msgstr "Нет такой страницы."
 #. 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 use "one time password login" without using an existing user.
-#. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
-#. TRANS: Client error displayed trying to find a user by ID for a non-existing ID.
-#. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when calling a profile action without specifying a user.
 #: actions/all.php:80 actions/allrss.php:69
@@ -164,12 +160,12 @@ msgstr "Нет такой страницы."
 #: actions/apitimelinementions.php:77 actions/apitimelineuser.php:79
 #: actions/avatarbynickname.php:79 actions/favoritesrss.php:72
 #: actions/foaf.php:42 actions/foaf.php:61 actions/hcard.php:67
-#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:78
+#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
 #: actions/remotesubscribe.php:144 actions/remotesubscribe.php:153
-#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:113
-#: actions/showfavorites.php:106 actions/userbyid.php:75
+#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
+#: actions/showfavorites.php:106 actions/userbyid.php:74
 #: actions/usergroups.php:93 actions/userrss.php:40 actions/userxrd.php:59
-#: actions/xrds.php:71 lib/command.php:497 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:509 lib/galleryaction.php:59
 #: lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Нет такого пользователя."
@@ -297,7 +293,7 @@ msgstr "Обновлено от %1$s и его друзей на %2$s!"
 #: actions/apigrouplistall.php:120 actions/apigroupmembership.php:105
 #: actions/apigroupshow.php:114 actions/apihelptest.php:84
 #: actions/apistatusesdestroy.php:101 actions/apistatusesretweets.php:110
-#: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:138
+#: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:139
 #: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
 #: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:268
 #: actions/apitimelinegroup.php:147 actions/apitimelinehome.php:173
@@ -533,7 +529,7 @@ msgstr "Получатель не найден."
 #. TRANS: Client error displayed trying to direct message another user who's not a friend (403).
 #: actions/apidirectmessagenew.php:144
 #, fuzzy
-msgid "Cannot send direct messages to users who aren't your friend."
+msgid "Can't send direct messages to users who aren't your friend."
 msgstr ""
 "Не удаётся посылать прямые сообщения пользователям, которые не являются "
 "Вашими друзьями."
@@ -560,7 +556,7 @@ msgstr "Этот статус уже входит в число любимых."
 #. TRANS: Client error displayed when marking a notice as favourite fails.
 #. TRANS: Server error displayed when trying to mark a notice as favorite fails in the database.
 #. TRANS: Error message text shown when a favorite could not be set.
-#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:294
+#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:306
 msgid "Could not create favorite."
 msgstr "Не удаётся создать любимую запись."
 
@@ -620,7 +616,7 @@ msgstr "Не удаётся найти целевого пользователя
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:191
 #: actions/newgroup.php:137 actions/profilesettings.php:273
-#: actions/register.php:206
+#: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "Такое имя уже используется. Попробуйте какое-нибудь другое."
 
@@ -630,7 +626,7 @@ msgstr "Такое имя уже используется. Попробуйте
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:195
 #: actions/newgroup.php:141 actions/profilesettings.php:243
-#: actions/register.php:208
+#: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "Неверное имя."
 
@@ -643,7 +639,7 @@ msgstr "Неверное имя."
 #: actions/apigroupcreate.php:181 actions/editapplication.php:235
 #: actions/editgroup.php:202 actions/newapplication.php:221
 #: actions/newgroup.php:148 actions/profilesettings.php:248
-#: actions/register.php:215
+#: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "URL Главной страницы неверен."
 
@@ -653,7 +649,7 @@ msgstr "URL Главной страницы неверен."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:191 actions/editgroup.php:206
 #: actions/newgroup.php:152 actions/profilesettings.php:252
-#: actions/register.php:218
+#: actions/register.php:226
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "Полное имя слишком длинное (максимум 255 символов)."
 
@@ -682,7 +678,7 @@ msgstr[2] "Слишком длинное описание (максимум %d 
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:215 actions/editgroup.php:218
 #: actions/newgroup.php:164 actions/profilesettings.php:265
-#: actions/register.php:227
+#: actions/register.php:235
 msgid "Location is too long (maximum 255 characters)."
 msgstr "Слишком длинное месторасположение (максимум 255 символов)."
 
@@ -739,14 +735,14 @@ msgstr "Группа не найдена."
 #. TRANS: Server error displayed when trying to join a group the user is already a member of.
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:333
+#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:345
 msgid "You are already a member of that group."
 msgstr "Вы уже являетесь членом этой группы."
 
 #. TRANS: Server error displayed when trying to join a group the user is blocked from joining.
 #. 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.
-#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:338
+#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:350
 msgid "You have been blocked from that group by the admin."
 msgstr "Вы заблокированы из этой группы администратором."
 
@@ -756,7 +752,7 @@ msgstr "Вы заблокированы из этой группы админи
 #. TRANS: %1$s is the joining user's nickname, $2$s is the group nickname for which the join failed.
 #. TRANS: Message given having failed to add a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:350
+#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:362
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "Не удаётся присоединить пользователя %1$s к группе %2$s."
@@ -773,7 +769,7 @@ msgstr "Вы не являетесь членом этой группы."
 #. TRANS: Message given having failed to remove a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
 #: actions/apigroupleave.php:127 actions/leavegroup.php:133
-#: lib/command.php:398
+#: lib/command.php:410
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
 msgstr "Не удаётся удалить пользователя %1$s из группы %2$s."
@@ -833,21 +829,20 @@ msgstr "Ключ запроса уже авторизован."
 #. TRANS: Form validation error message.
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
-#. TRANS: Client error displayed when the session token is not okay.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
 #: actions/deletenotice.php:177 actions/disfavor.php:75
 #: actions/emailsettings.php:291 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:65 actions/grouplogo.php:321
 #: actions/groupunblock.php:65 actions/imsettings.php:224
-#: actions/invite.php:60 actions/login.php:131 actions/makeadmin.php:66
+#: actions/invite.php:60 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
-#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:136
-#: actions/othersettings.php:155 actions/passwordsettings.php:137
+#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
+#: actions/othersettings.php:155 actions/passwordsettings.php:138
 #: actions/profilesettings.php:217 actions/recoverpassword.php:383
-#: actions/register.php:164 actions/remotesubscribe.php:76
+#: actions/register.php:172 actions/remotesubscribe.php:76
 #: actions/repeat.php:82 actions/smssettings.php:250 actions/subedit.php:40
-#: actions/subscribe.php:87 actions/tagother.php:166
-#: actions/unsubscribe.php:69 actions/userauthorization.php:53
+#: actions/subscribe.php:86 actions/tagother.php:166
+#: actions/unsubscribe.php:69 actions/userauthorization.php:52
 #: lib/designsettings.php:310
 msgid "There was a problem with your session token. Try again, please."
 msgstr "Проблема с вашим ключом сессии. Пожалуйста, попробуйте ещё раз."
@@ -878,7 +873,7 @@ msgstr "Ошибка базы данных при вставке oauth_token_ass
 #: actions/designadminpanel.php:100 actions/editapplication.php:144
 #: actions/emailsettings.php:310 actions/grouplogo.php:332
 #: actions/imsettings.php:239 actions/newapplication.php:124
-#: actions/oauthconnectionssettings.php:145 actions/recoverpassword.php:46
+#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
 #: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
 msgstr "Нетиповое подтверждение формы."
@@ -930,20 +925,19 @@ msgstr "Аккаунт"
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group nickname (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT for nick name in a profile.
-#: actions/apioauthauthorize.php:459 actions/login.php:242
-#: actions/profilesettings.php:106 actions/register.php:418
+#: actions/apioauthauthorize.php:459 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:432
 #: actions/showgroup.php:243 actions/tagother.php:94
-#: actions/userauthorization.php:152 lib/groupeditform.php:145
+#: actions/userauthorization.php:145 lib/groupeditform.php:145
 #: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "Имя"
 
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:463 actions/login.php:245
-#: actions/register.php:422 lib/accountsettingsaction.php:120
+#: actions/apioauthauthorize.php:463 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:120
 msgid "Password"
 msgstr "Пароль"
 
@@ -1038,13 +1032,13 @@ msgstr "Нет такой записи."
 
 #. TRANS: Client error displayed trying to repeat an own notice through the API.
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:537
+#: actions/apistatusesretweet.php:83 lib/command.php:549
 msgid "Cannot repeat your own notice."
 msgstr "Невозможно повторить собственную запись."
 
 #. TRANS: Client error displayed trying to re-repeat a notice through the API.
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:92 lib/command.php:543
+#: actions/apistatusesretweet.php:92 lib/command.php:555
 msgid "Already repeated that notice."
 msgstr "Запись уже повторена."
 
@@ -1066,7 +1060,7 @@ msgstr "HTTP-метод не поддерживается."
 #. TRANS: %s is the requested output format.
 #: actions/apistatusesshow.php:144
 #, fuzzy, php-format
-msgid "Unsupported format: %s."
+msgid "Unsupported format: %s"
 msgstr "Неподдерживаемый формат: %s"
 
 #. TRANS: Client error displayed requesting a deleted status.
@@ -1171,14 +1165,13 @@ msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr "%1$s обновил этот ответ на сообщение: %2$s / %3$s."
 
 #. TRANS: Title for site timeline. %s is the StatusNet sitename.
-#. TRANS: Public RSS feed title. %s is the StatusNet site name.
 #: actions/apitimelinepublic.php:193 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "Общая лента %s"
 
 #. TRANS: Subtitle for site timeline. %s is the StatusNet sitename.
-#: actions/apitimelinepublic.php:199
+#: actions/apitimelinepublic.php:199 actions/publicrss.php:105
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "Обновления %s от всех!"
@@ -1243,26 +1236,25 @@ msgid "Atom post must be an Atom entry."
 msgstr "POST-запрос Atom должен быть объектом Atom."
 
 #. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
-#: actions/apitimelineuser.php:334
+#: actions/apitimelineuser.php:335
 msgid "Can only handle POST activities."
 msgstr "Возможна обработка только POST-запросов."
 
 #. TRANS: Client error displayed when using an unsupported activity object type.
 #. TRANS: %s is the unsupported activity object type.
-#: actions/apitimelineuser.php:345
+#: actions/apitimelineuser.php:346
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr "Невозможно обработать действия объекта типа «%s»."
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
 #. TRANS: %d is the notice ID (number).
-#: actions/apitimelineuser.php:379
+#: actions/apitimelineuser.php:380
 #, php-format
 msgid "No content for notice %d."
 msgstr "Нет содержания для записи %d."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#. TRANS: %s is the notice URI.
 #: actions/apitimelineuser.php:408
 #, php-format
 msgid "Notice with URI \"%s\" already exists."
@@ -1280,10 +1272,9 @@ msgstr "Метод API не найден."
 
 #. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
 #. TRANS: Client exception.
-#. TRANS: Client error displayed trying to subscribe to a non-existing profile.
 #: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
 #: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
-#: actions/subscribe.php:110
+#: actions/subscribe.php:107
 msgid "No such profile."
 msgstr "Нет такого профиля."
 
@@ -1413,7 +1404,7 @@ msgstr "Не удаётся удалить любимую запись."
 #: actions/joingroup.php:95 actions/leavegroup.php:82
 #: actions/leavegroup.php:95 actions/makeadmin.php:86
 #: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:380
+#: lib/command.php:392
 msgid "No such group."
 msgstr "Нет такой группы."
 
@@ -1424,7 +1415,7 @@ msgid "Not a member."
 msgstr "Все участники"
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
-#: actions/atompubshowmembership.php:150
+#: actions/atompubshowmembership.php:151
 #, fuzzy
 msgid "Cannot delete someone else's membership."
 msgstr "Невозможно удалить подписку на самого себя."
@@ -1531,11 +1522,9 @@ msgstr ""
 
 #. TRANS: Server error displayed in avatar upload page when no matching profile can be found for a user.
 #. TRANS: Server error displayed coming across a request from a user without a profile.
-#. TRANS: Server error displayed when trying to authorise a remote subscription request
-#. TRANS: while the user has no profile.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
 #: actions/grouplogo.php:184 actions/remotesubscribe.php:190
-#: actions/userauthorization.php:75 actions/userrss.php:108
+#: actions/userauthorization.php:72 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr "Пользователь без соответствующего профиля."
 
@@ -1590,10 +1579,10 @@ msgstr "Обрезать"
 msgid "No file uploaded."
 msgstr "Файл не загружен."
 
-#. TRANS: Avatar upload form instruction after uploading a file.
+#. TRANS: Avatar upload form unstruction after uploading a file.
 #: actions/avatarsettings.php:345
 #, fuzzy
-msgid "Pick a square area of the image to be your avatar."
+msgid "Pick a square area of the image to be your avatar"
 msgstr "Подберите нужный квадратный участок для вашей аватары"
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
@@ -1635,7 +1624,7 @@ msgid "You may not backup your account."
 msgstr ""
 
 #. TRANS: Information displayed on the backup account page.
-#: actions/backupaccount.php:225
+#: actions/backupaccount.php:227
 msgid ""
 "You can backup your account data in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format. This is an experimental feature and provides "
@@ -1645,16 +1634,16 @@ msgid ""
 msgstr ""
 
 #. TRANS: Submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:248
+#: actions/backupaccount.php:250
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Backup"
 msgstr "Фон"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:252
+#: actions/backupaccount.php:254
 #, fuzzy
-msgid "Backup your account."
+msgid "Backup your account"
 msgstr "Резервное копирование учетной записи"
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
@@ -1696,7 +1685,7 @@ msgstr "Нет"
 #. TRANS: Submit button title for 'No' when blocking a user.
 #: actions/block.php:158
 #, fuzzy
-msgid "Do not block this user."
+msgid "Do not block this user"
 msgstr "Не блокировать этого пользователя"
 
 #. TRANS: Button label on the user block form.
@@ -1713,9 +1702,9 @@ msgid "Yes"
 msgstr "Да"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:165
-#, fuzzy
-msgid "Block this user."
+#. TRANS: Description of the form to block a user.
+#: actions/block.php:165 lib/blockform.php:79
+msgid "Block this user"
 msgstr "Заблокировать пользователя."
 
 #. TRANS: Server error displayed when blocking a user fails.
@@ -1878,7 +1867,7 @@ msgstr ""
 #. TRANS: Field label for delete account confirmation entry.
 #. TRANS: Field label for password reset form where the password has to be typed again.
 #: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:262 actions/register.php:426
+#: actions/recoverpassword.php:262 actions/register.php:440
 msgid "Confirm"
 msgstr "Подтверждение"
 
@@ -1908,14 +1897,14 @@ msgstr "Приложение не найдено."
 #. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
 #: actions/deleteapplication.php:79 actions/editapplication.php:78
-#: actions/showapplication.php:90
+#: actions/showapplication.php:94
 msgid "You are not the owner of this application."
 msgstr "Вы не являетесь владельцем этого приложения."
 
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
-#: actions/newapplication.php:112 actions/showapplication.php:113
-#: lib/action.php:1422
+#: actions/newapplication.php:112 actions/showapplication.php:118
+#: lib/action.php:1425
 msgid "There was a problem with your session token."
 msgstr "Проблема с вашим ключом сессии."
 
@@ -1939,13 +1928,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting an application.
 #: actions/deleteapplication.php:161
 #, fuzzy
-msgid "Do not delete this application."
+msgid "Do not delete this application"
 msgstr "Не удаляйте это приложение"
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
 #: actions/deleteapplication.php:167
 #, fuzzy
-msgid "Delete this application."
+msgid "Delete this application"
 msgstr "Удалить это приложение"
 
 #. TRANS: Client error when trying to delete group while not logged in.
@@ -2000,13 +1989,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting a group.
 #: actions/deletegroup.php:224
 #, fuzzy
-msgid "Do not delete this group."
+msgid "Do not delete this group"
 msgstr "Не удаляйте эту группу"
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
 #: actions/deletegroup.php:231
 #, fuzzy
-msgid "Delete this group."
+msgid "Delete this group"
 msgstr "Удалить эту группу"
 
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
@@ -2014,15 +2003,13 @@ msgstr "Удалить эту группу"
 #. TRANS: Client error displayed when trying to mark a notice as favorite without being logged in.
 #. TRANS: Client error displayed trying to block a user from a group while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
-#. TRANS: Client error displayed trying to log out when not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
-#. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
 #. TRANS: Client error displayed when trying to change user options while not logged in.
 #: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
-#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:70
+#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
-#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:98
+#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
 #: lib/adminpanelaction.php:71 lib/profileformaction.php:63
 #: lib/settingsaction.php:72
@@ -2052,13 +2039,12 @@ msgstr "Вы уверены, что хотите удалить эту запи
 #. TRANS: Submit button title for 'No' when deleting a notice.
 #: actions/deletenotice.php:159
 #, fuzzy
-msgid "Do not delete this notice."
+msgid "Do not delete this notice"
 msgstr "Не удалять эту запись"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:166
-#, fuzzy
-msgid "Delete this notice."
+#: actions/deletenotice.php:166 lib/noticelist.php:673
+msgid "Delete this notice"
 msgstr "Удалить эту запись"
 
 #. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
@@ -2095,13 +2081,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting a user.
 #: actions/deleteuser.php:158
 #, fuzzy
-msgid "Do not delete this user."
+msgid "Do not delete this user"
 msgstr "Не удаляйте эту группу"
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
-#: actions/deleteuser.php:165
-#, fuzzy
-msgid "Delete this user."
+#. TRANS: Description of form for deleting a user.
+#: actions/deleteuser.php:165 lib/deleteuserform.php:75
+msgid "Delete this user"
 msgstr "Удалить этого пользователя"
 
 #. TRANS: Message used as title for design settings for the site.
@@ -2267,21 +2253,21 @@ msgid "Use defaults"
 msgstr "Использовать значения по умолчанию"
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:720
-#, fuzzy
-msgid "Restore default designs."
+#. TRANS: Title for button on profile design page to reset all colour settings to default.
+#: actions/designadminpanel.php:720 lib/designsettings.php:259
+msgid "Restore default designs"
 msgstr "Восстановить оформление по умолчанию"
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:728
-#, fuzzy
-msgid "Reset back to default."
+#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
+#: actions/designadminpanel.php:728 lib/designsettings.php:267
+msgid "Reset back to default"
 msgstr "Восстановить значения по умолчанию"
 
 #. TRANS: Title for button for saving theme settings.
-#: actions/designadminpanel.php:736
-#, fuzzy
-msgid "Save design."
+#. TRANS: Title for button on profile design page to save settings.
+#: actions/designadminpanel.php:736 lib/designsettings.php:272
+msgid "Save design"
 msgstr "Сохранить оформление"
 
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
@@ -2313,7 +2299,7 @@ msgid "You must be logged in to edit an application."
 msgstr "Вы должны авторизоваться, чтобы изменить приложение."
 
 #. TRANS: Client error displayed trying to edit an application that does not exist.
-#: actions/editapplication.php:83 actions/showapplication.php:83
+#: actions/editapplication.php:83 actions/showapplication.php:87
 msgid "No such application."
 msgstr "Нет такого приложения."
 
@@ -2602,7 +2588,7 @@ msgid "Cannot normalize that email address."
 msgstr "Не удаётся стандартизировать этот электронный адрес"
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:393 actions/register.php:204
+#: actions/emailsettings.php:393 actions/register.php:212
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "Неверный электронный адрес."
@@ -2679,22 +2665,19 @@ msgstr "Нет входящего электронного адреса."
 
 #. 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.
 #: actions/emailsettings.php:530 actions/emailsettings.php:554
-#: actions/smssettings.php:566 actions/smssettings.php:591
+#: actions/smssettings.php:565 actions/smssettings.php:588
 #, fuzzy
 msgid "Could not update user record."
 msgstr "Не удаётся обновить пользовательскую запись."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
-#. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:534 actions/smssettings.php:570
+#: actions/emailsettings.php:534 actions/smssettings.php:568
 msgid "Incoming email address removed."
 msgstr "Входящий электронный адрес удалён."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
-#. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:558 actions/smssettings.php:595
+#: actions/emailsettings.php:558 actions/smssettings.php:591
 msgid "New incoming email address added."
 msgstr "Новый входящий электронный адрес добавлен."
 
@@ -2706,7 +2689,7 @@ msgstr "Эта запись уже входит в число любимых!"
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
 #: actions/favor.php:95
 #, fuzzy
-msgid "Disfavor favorite."
+msgid "Disfavor favorite"
 msgstr "Разлюбить"
 
 #. TRANS: Page title for first page of favorited notices.
@@ -2948,13 +2931,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
 #: actions/groupblock.php:191
 #, fuzzy
-msgid "Do not block this user from this group."
+msgid "Do not block this user from this group"
 msgstr "Не блокировать этого пользователя из этой группы"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
 #: actions/groupblock.php:198
 #, fuzzy
-msgid "Block this user from this group."
+msgid "Block this user from this group"
 msgstr "Заблокировать этого пользователя из этой группы"
 
 #. TRANS: Server error displayed when trying to block a user from a group fails because of an application error.
@@ -2963,7 +2946,6 @@ msgid "Database error blocking user from group."
 msgstr "Ошибка базы данных при блокировании пользователя из группы."
 
 #. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
-#. TRANS: Client error displayed trying to find a user by ID without providing an ID.
 #: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr "Нет ID."
@@ -3152,10 +3134,8 @@ msgid "Group search"
 msgstr "Поиск группы"
 
 #. TRANS: Text on page where groups can be searched if no results were found for a query.
-#. TRANS: Text for notice search results is the query had no results.
-#. TRANS: Message on the "People search" page where a query has no results.
-#: actions/groupsearch.php:82 actions/noticesearch.php:122
-#: actions/peoplesearch.php:87
+#: actions/groupsearch.php:82 actions/noticesearch.php:117
+#: actions/peoplesearch.php:83
 msgid "No results."
 msgstr "Нет результатов."
 
@@ -3192,7 +3172,6 @@ msgid "User is not blocked from group."
 msgstr "Пользователь не заблокировал вас из группы."
 
 #. TRANS: Server error displayed when unblocking a user from a group fails because of an unknown error.
-#. TRANS: Server error displayed when removing a user block.
 #: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "Ошибка при удалении данного блока."
@@ -3289,8 +3268,7 @@ msgid "Publish a MicroID for my Jabber/Google Talk address."
 msgstr "Опубликовать MicroID для моего Jabber/GTalk - адреса."
 
 #. TRANS: Confirmation message for successful Instant Messaging preferences save.
-#. TRANS: Confirmation message after saving preferences.
-#: actions/imsettings.php:283 actions/othersettings.php:193
+#: actions/imsettings.php:283 actions/othersettings.php:192
 msgid "Preferences saved."
 msgstr "Предпочтения сохранены."
 
@@ -3589,7 +3567,7 @@ msgstr "Вы должны авторизоваться, чтобы покину
 
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
-#: actions/leavegroup.php:103 lib/command.php:386
+#: actions/leavegroup.php:103 lib/command.php:398
 msgid "You are not a member of that group."
 msgstr "Вы не являетесь членом этой группы."
 
@@ -3713,41 +3691,39 @@ msgstr "Сохранить"
 msgid "Save license settings"
 msgstr "Сохранить настройки лицензии"
 
-#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
-#: actions/login.php:97 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
 msgid "Already logged in."
 msgstr "Вы уже авторизовались."
 
-#: actions/login.php:142
+#: actions/login.php:148
 msgid "Incorrect username or password."
 msgstr "Некорректное имя или пароль."
 
-#. TRANS: Server error displayed when a user object could not be created trying to login using "one time password login".
-#: actions/login.php:148 actions/otp.php:127
+#: actions/login.php:154 actions/otp.php:120
 msgid "Error setting user. You are probably not authorized."
 msgstr "Ошибка установки пользователя. Вы, вероятно, не авторизованы."
 
-#: actions/login.php:202 actions/login.php:253
+#: actions/login.php:210 actions/login.php:263
 msgid "Login"
 msgstr "Вход"
 
-#: actions/login.php:239
+#: actions/login.php:249
 msgid "Login to site"
 msgstr "Авторизоваться"
 
-#: actions/login.php:248 actions/register.php:476
+#: actions/login.php:258 actions/register.php:490
 msgid "Remember me"
 msgstr "Запомнить меня"
 
-#: actions/login.php:249 actions/register.php:478
+#: actions/login.php:259 actions/register.php:492
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "Автоматическии входить в дальнейшем. Не для общедоступных компьютеров!"
 
-#: actions/login.php:259
+#: actions/login.php:269
 msgid "Lost or forgotten password?"
 msgstr "Потеряли или забыли пароль?"
 
-#: actions/login.php:277
+#: actions/login.php:288
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -3755,11 +3731,11 @@ msgstr ""
 "По причинам сохранения безопасности введите имя и пароль ещё раз, прежде чем "
 "изменять Ваши установки."
 
-#: actions/login.php:281
+#: actions/login.php:292
 msgid "Login with your username and password."
 msgstr "Войти с вашим именем участника и паролем."
 
-#: actions/login.php:284
+#: actions/login.php:295
 #, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -3843,14 +3819,14 @@ msgid "New message"
 msgstr "Новое сообщение"
 
 #. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
-#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:501
+#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:513
 msgid "You can't send a message to this user."
 msgstr "Вы не можете послать сообщение этому пользователю."
 
 #. TRANS: Command exception text shown when trying to send a direct message to another user without content.
 #. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
-#: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:478
-#: lib/command.php:581
+#: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:490
+#: lib/command.php:593
 msgid "No content!"
 msgstr "Нет контента!"
 
@@ -3859,7 +3835,7 @@ msgid "No recipient specified."
 msgstr "Нет адресата."
 
 #. TRANS: Error text shown when trying to send a direct message to self.
-#: actions/newmessage.php:167 lib/command.php:505
+#: actions/newmessage.php:167 lib/command.php:517
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr "Не посылайте сообщения сами себе; просто потихоньку скажите это себе."
@@ -3870,7 +3846,7 @@ msgstr "Сообщение отправлено"
 
 #. TRANS: Message given have sent a direct message to another user.
 #. TRANS: %s is the name of the other user.
-#: actions/newmessage.php:188 lib/command.php:513
+#: actions/newmessage.php:188 lib/command.php:525
 #, php-format
 msgid "Direct message to %s sent."
 msgstr "Прямое сообщение для %s послано."
@@ -3887,9 +3863,7 @@ msgstr "Новая запись"
 msgid "Notice posted"
 msgstr "Запись опубликована"
 
-#. TRANS: Instructions for Notice search page.
-#. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/noticesearch.php:69
+#: actions/noticesearch.php:68
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -3898,21 +3872,16 @@ msgstr ""
 "Поиск по содержанию записей на %%site.name%%. Между ключевыми словами "
 "ставьте пробелы. Минимальная длина слова — 3 буквы."
 
-#. TRANS: Title of the page where users can search for notices.
-#: actions/noticesearch.php:80
+#: actions/noticesearch.php:78
 msgid "Text search"
 msgstr "Поиск текста"
 
-#. TRANS: Test in RSS notice search.
-#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearch.php:95
+#: actions/noticesearch.php:91
 #, php-format
 msgid "Search results for \"%1$s\" on %2$s"
 msgstr "Результаты поиска для «%1$s» на %2$s"
 
-#. TRANS: Text for logged in users making a query for notices without results.
-#. TRANS: This message contains a Markdown link.
-#: actions/noticesearch.php:128
+#: actions/noticesearch.php:121
 #, php-format
 msgid ""
 "Be the first to [post on this topic](%%%%action.newnotice%%%%?"
@@ -3921,9 +3890,7 @@ msgstr ""
 "Станьте первыми, кто [напишет на эту тему](%%%%action.newnotice%%%%?"
 "status_textarea=%s)!"
 
-#. TRANS: Text for not logged in users making a query for notices without results.
-#. TRANS: This message contains Markdown links.
-#: actions/noticesearch.php:133
+#: actions/noticesearch.php:124
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and be the first to "
@@ -3932,17 +3899,14 @@ msgstr ""
 "Почему бы не [зарегистрироваться](%%%%action.register%%%%) и не отправить "
 "первое [сообщение на эту тему](%%%%action.newnotice%%%%?status_textarea=%s)?"
 
-#. TRANS: RSS notice search feed title. %s is the query.
-#: actions/noticesearchrss.php:95
+#: actions/noticesearchrss.php:96
 #, php-format
 msgid "Updates with \"%s\""
 msgstr "Обновления с «$s»"
 
-#. TRANS: RSS notice search feed description.
-#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearchrss.php:99
+#: actions/noticesearchrss.php:98
 #, fuzzy, php-format
-msgid "Updates matching search term \"%1$s\" on %2$s."
+msgid "Updates matching search term \"%1$s\" on %2$s!"
 msgstr "Все обновления, соответствующие поисковому запросу «%s»"
 
 #: actions/nudge.php:85
@@ -3983,30 +3947,30 @@ msgid "You have not registered any applications yet."
 msgstr "Вы пока не зарегистрировали ни одного приложения."
 
 #. TRANS: Title for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:70
+#: actions/oauthconnectionssettings.php:71
 msgid "Connected applications"
 msgstr "Подключённые приложения"
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:81
+#: actions/oauthconnectionssettings.php:83
 msgid "The following connections exist for your account."
 msgstr "Следующие приложения подключены к вашей учётной записи."
 
 #. TRANS: Client error when trying to revoke access for an application while not being a user of it.
-#: actions/oauthconnectionssettings.php:166
+#: actions/oauthconnectionssettings.php:168
 msgid "You are not a user of that application."
 msgstr "Вы не являетесь пользователем этого приложения."
 
 #. TRANS: Client error when revoking access has failed for some reason.
 #. TRANS: %s is the application ID revoking access failed for.
-#: actions/oauthconnectionssettings.php:181
+#: actions/oauthconnectionssettings.php:183
 #, php-format
 msgid "Unable to revoke access for application: %s."
 msgstr "Не удаётся отозвать доступ для приложения: %s."
 
 #. TRANS: Success message after revoking access for an application.
 #. TRANS: %1$s is the application name, %2$s is the first part of the user token.
-#: actions/oauthconnectionssettings.php:200
+#: actions/oauthconnectionssettings.php:202
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -4015,14 +3979,14 @@ msgstr ""
 "Доступ для %1$s и ключ доступа, начинающийся на %2$s, успешно отозваны."
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:211
+#: actions/oauthconnectionssettings.php:213
 msgid "You have not authorized any applications to use your account."
 msgstr "Вы не разрешили приложениям использовать вашу учётную запись."
 
 #. TRANS: Note for developers in the OAuth connection settings form.
 #. TRANS: This message contains a Markdown link. Do not separate "](".
 #. TRANS: %s is the URL to the OAuth settings.
-#: actions/oauthconnectionssettings.php:231
+#: actions/oauthconnectionssettings.php:233
 #, php-format
 msgid ""
 "Are you a developer? [Register an OAuth client application](%s) to use with "
@@ -4031,16 +3995,6 @@ msgstr ""
 "Вы разработчик? [Зарегистрируйте клиентское приложение OAuth](%s) для "
 "использования с этим сайтом StatusNet."
 
-#: actions/oembed.php:64
-#, fuzzy, php-format
-msgid "\"%s\" not found."
-msgstr "Метод API не найден."
-
-#: actions/oembed.php:76
-#, fuzzy, php-format
-msgid "Notice %s not found."
-msgstr "Родительская запись не найдена."
-
 #: actions/oembed.php:80 actions/shownotice.php:100
 msgid "Notice has no profile."
 msgstr "Уведомление не имеет профиля."
@@ -4050,16 +4004,6 @@ msgstr "Уведомление не имеет профиля."
 msgid "%1$s's status on %2$s"
 msgstr "Статус %1$s на %2$s"
 
-#: actions/oembed.php:95
-#, fuzzy, php-format
-msgid "Attachment %s not found."
-msgstr "Получатель не найден."
-
-#: actions/oembed.php:136
-#, php-format
-msgid "\"%s\" not supported for oembed requests."
-msgstr ""
-
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
 #: actions/oembed.php:168
 #, php-format
@@ -4078,12 +4022,11 @@ msgstr "Только %s URL в простом HTTP, пожалуйста."
 msgid "Not a supported data format."
 msgstr "Неподдерживаемый формат данных."
 
-#. TRANS: ShortName in the OpenSearch interface when trying to find users.
 #: actions/opensearch.php:64
 msgid "People Search"
 msgstr "Поиск людей"
 
-#: actions/opensearch.php:68
+#: actions/opensearch.php:67
 msgid "Notice Search"
 msgstr "Поиск в записях"
 
@@ -4130,46 +4073,37 @@ msgstr "Показать или скрыть оформления профиля
 msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr "Сервис сокращения URL слишком длинный (максимум 50 символов)."
 
-#. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
-#: actions/otp.php:70
+#: actions/otp.php:69
 msgid "No user ID specified."
 msgstr "Не указан идентификатор пользователя."
 
-#. TRANS: Client error displayed trying to use "one time password login" without specifying a login token.
-#: actions/otp.php:86
+#: actions/otp.php:83
 msgid "No login token specified."
 msgstr "Не указан ключ для входа."
 
-#. TRANS: Client error displayed trying to use "one time password login" without requesting a login token.
-#: actions/otp.php:94
+#: actions/otp.php:90
 msgid "No login token requested."
 msgstr "Ключ для входа не был запрошен."
 
-#. TRANS: Client error displayed trying to use "one time password login" while specifying an invalid login token.
-#: actions/otp.php:100
+#: actions/otp.php:95
 msgid "Invalid login token specified."
 msgstr "Задан неверный ключ для входа."
 
-#. TRANS: Client error displayed trying to use "one time password login" while specifying an expired login token.
-#: actions/otp.php:110
+#: actions/otp.php:104
 msgid "Login token expired."
 msgstr "Срок действия ключа для входа истёк."
 
-#. TRANS: Title for outbox for any but the fist page.
-#. TRANS: %1$s is the user nickname, %2$d is the page number.
-#: actions/outbox.php:57
+#: actions/outbox.php:58
 #, php-format
 msgid "Outbox for %1$s - page %2$d"
 msgstr "Исходящие для %s — страница %2$d"
 
-#. TRANS: Title for first page of outbox.
 #: actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
 msgstr "Исходящие для %s"
 
-#. TRANS: Instructions for outbox.
-#: actions/outbox.php:103
+#: actions/outbox.php:104
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr ""
 "Это список исходящих писем, в котором перечислены отправленные вами личные "
@@ -4197,45 +4131,43 @@ msgstr "Старый пароль"
 msgid "New password"
 msgstr "Новый пароль"
 
-#: actions/passwordsettings.php:109 actions/register.php:423
+#: actions/passwordsettings.php:109
 #, fuzzy
-msgid "6 or more characters."
+msgid "6 or more characters"
 msgstr "6 или больше знаков"
 
-#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:264
-#: actions/register.php:427
+#: actions/passwordsettings.php:113
 #, fuzzy
-msgid "Same as password above."
+msgid "Same as password above"
 msgstr "Тот же пароль, что и выше"
 
 #: actions/passwordsettings.php:117
 msgid "Change"
 msgstr "Изменить"
 
-#: actions/passwordsettings.php:153 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:238
 msgid "Password must be 6 or more characters."
 msgstr "Пароль должен быть длиной не менее 6 символов."
 
-#: actions/passwordsettings.php:156 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:241
 msgid "Passwords don't match."
 msgstr "Пароли не совпадают."
 
-#: actions/passwordsettings.php:164
+#: actions/passwordsettings.php:165
 msgid "Incorrect old password"
 msgstr "Некорректный старый пароль"
 
-#: actions/passwordsettings.php:180
+#: actions/passwordsettings.php:181
 msgid "Error saving user; invalid."
 msgstr "Ошибка сохранения пользователя; неверное имя."
 
-#. TRANS: Reset password form validation error message.
-#: actions/passwordsettings.php:185 actions/recoverpassword.php:418
+#: actions/passwordsettings.php:186
 #, fuzzy
-msgid "Cannot save new password."
+msgid "Can't save new password."
 msgstr "Не удаётся сохранить новый пароль."
 
-#: actions/passwordsettings.php:191
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
 msgid "Password saved."
 msgstr "Пароль сохранён."
 
@@ -4509,9 +4441,7 @@ msgstr "Сервер, которому направлять SSL-запросы."
 msgid "Save paths"
 msgstr "Сохранить пути"
 
-#. TRANS: Instructions for the "People search" page.
-#. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/peoplesearch.php:54
+#: actions/peoplesearch.php:52
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
@@ -4520,8 +4450,7 @@ msgstr ""
 "Поиск людей на %%site.name%% по имени, месторасположению или интересам. "
 "Разделяйте ключевые слова пробелами. Минимальная длина слова — 3 буквы."
 
-#. TRANS: Title of a page where users can search for other users.
-#: actions/peoplesearch.php:61
+#: actions/peoplesearch.php:58
 msgid "People search"
 msgstr "Поиск людей"
 
@@ -4563,7 +4492,7 @@ msgid "Profile information"
 msgstr "Информация профиля"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109 actions/register.php:419
+#: actions/profilesettings.php:109 actions/register.php:433
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr ""
 "1-64 латинских строчных буквы или цифры, без знаков препинания и пробелов"
@@ -4571,7 +4500,7 @@ msgstr ""
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for full group name (dt). Text hidden by default.
 #. TRANS: DT for full name in a profile.
-#: actions/profilesettings.php:113 actions/register.php:441
+#: actions/profilesettings.php:113 actions/register.php:455
 #: actions/showgroup.php:255 actions/tagother.php:104
 #: lib/groupeditform.php:150 lib/userprofile.php:156
 msgid "Full name"
@@ -4579,20 +4508,20 @@ msgstr "Полное имя"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:118 actions/register.php:446
+#: actions/profilesettings.php:118 actions/register.php:460
 #: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "Главная"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:121 actions/register.php:448
+#: actions/profilesettings.php:121
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr "Адрес вашей домашней страницы, блога или профиля на другом сайте."
 
 #. TRANS: Tooltip for field label in form for profile settings. Plural
 #. TRANS: is decided by the number of characters available for the
 #. TRANS: biography (%d).
-#: actions/profilesettings.php:129 actions/register.php:457
+#: actions/profilesettings.php:129 actions/register.php:471
 #, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4601,29 +4530,28 @@ msgstr[1] "Опишите себя и свои увлечения при пом
 msgstr[2] "Опишите себя и свои увлечения при помощи %d символов"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:135 actions/register.php:462
+#: actions/profilesettings.php:135 actions/register.php:476
 msgid "Describe yourself and your interests"
 msgstr "Опишите себя и свои интересы"
 
 #. TRANS: Text area label in form for profile settings where users can provide.
 #. TRANS: their biography.
-#: actions/profilesettings.php:139 actions/register.php:464
+#: actions/profilesettings.php:139 actions/register.php:478
 msgid "Bio"
 msgstr "Биография"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group location (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT for location in a profile.
-#: actions/profilesettings.php:145 actions/register.php:469
+#: actions/profilesettings.php:145 actions/register.php:483
 #: actions/showgroup.php:265 actions/tagother.php:112
-#: actions/userauthorization.php:174 lib/groupeditform.php:173
+#: actions/userauthorization.php:166 lib/groupeditform.php:173
 #: lib/userprofile.php:172
 msgid "Location"
 msgstr "Месторасположение"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148
+#: actions/profilesettings.php:148 actions/register.php:485
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Где вы находитесь, например «Город, область, страна»"
 
@@ -4644,8 +4572,7 @@ msgstr "Теги"
 #: actions/profilesettings.php:164
 #, fuzzy
 msgid ""
-"Tags for yourself (letters, numbers, -, ., and _), comma- or space- "
-"separated."
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr ""
 "Теги для самого себя (буквы, цифры, -, ., и _), разделенные запятой или "
 "пробелом"
@@ -4658,7 +4585,7 @@ msgstr "Язык"
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
 #: actions/profilesettings.php:171
 #, fuzzy
-msgid "Preferred language."
+msgid "Preferred language"
 msgstr "Предпочитаемый язык"
 
 #. TRANS: Dropdownlist label in form for profile settings.
@@ -4675,13 +4602,13 @@ msgstr "В каком часовом поясе Вы обычно находит
 #: actions/profilesettings.php:189
 #, fuzzy
 msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)."
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr "Автоматически подписываться на всех, кто подписался на меня"
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Plural form is used based on the maximum number of allowed
 #. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:258 actions/register.php:221
+#: actions/profilesettings.php:258 actions/register.php:229
 #, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4701,9 +4628,9 @@ msgstr "Слишком длинный язык (максимум 50 символ
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:291
-#, fuzzy, php-format
-msgid "Invalid tag: \"%s\"."
+#: actions/profilesettings.php:291 actions/tagother.php:178
+#, php-format
+msgid "Invalid tag: \"%s\""
 msgstr "Неверный тег: «%s»"
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
@@ -4811,12 +4738,6 @@ msgstr ""
 "Микроблоггинг), созданный с использованием свободного программного "
 "обеспечения [StatusNet](http://status.net/)."
 
-#. TRANS: Public RSS feed description. %s is the StatusNet site name.
-#: actions/publicrss.php:106
-#, fuzzy, php-format
-msgid "%s updates from everyone."
-msgstr "Обновления %s от всех!"
-
 #. TRANS: Title for public tag cloud.
 #: actions/publictagcloud.php:57
 msgid "Public tag cloud"
@@ -4952,12 +4873,6 @@ msgstr "Восстановление пароля"
 msgid "Password recovery requested"
 msgstr "Запрошено восстановление пароля"
 
-#. TRANS: Title for password recovery page in password saved mode.
-#: actions/recoverpassword.php:229
-#, fuzzy
-msgid "Password saved"
-msgstr "Пароль сохранён."
-
 #. TRANS: Title for password recovery page when an unknown action has been specified.
 #: actions/recoverpassword.php:232
 msgid "Unknown action"
@@ -4969,6 +4884,12 @@ msgstr "Неизвестное действие"
 msgid "6 or more characters, and do not forget it!"
 msgstr "6 или более символов, и не забывайте его!"
 
+#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#: actions/recoverpassword.php:264 actions/register.php:441
+#, fuzzy
+msgid "Same as password above."
+msgstr "Тот же пароль, что и выше"
+
 #. TRANS: Button text for password reset form.
 #. TRANS: Button text on profile design page to reset all colour settings to default without saving.
 #: actions/recoverpassword.php:268 lib/designsettings.php:264
@@ -5020,8 +4941,14 @@ msgstr "Пароль должен быть длиной не менее 6 сим
 msgid "Password and confirmation do not match."
 msgstr "Пароль и его подтверждение не совпадают."
 
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:418
+#, fuzzy
+msgid "Cannot save new password."
+msgstr "Не удаётся сохранить новый пароль."
+
 #. TRANS: Server error displayed when something does wrong with the user object during password reset.
-#: actions/recoverpassword.php:426 actions/register.php:248
+#: actions/recoverpassword.php:426 actions/register.php:256
 msgid "Error setting user."
 msgstr "Ошибка в установках пользователя."
 
@@ -5030,73 +4957,78 @@ msgstr "Ошибка в установках пользователя."
 msgid "New password successfully saved. You are now logged in."
 msgstr "Новый пароль успешно сохранён. Вы авторизовались."
 
-#: actions/register.php:87 actions/register.php:188 actions/register.php:399
+#: actions/register.php:92 actions/register.php:196 actions/register.php:413
 msgid "Sorry, only invited people can register."
 msgstr "Простите, регистрация только по приглашению."
 
-#: actions/register.php:94
+#: actions/register.php:99
 msgid "Sorry, invalid invitation code."
 msgstr "Извините, неверный пригласительный код."
 
-#: actions/register.php:113
+#: actions/register.php:119
 msgid "Registration successful"
 msgstr "Регистрация успешна!"
 
-#: actions/register.php:115 actions/register.php:497
+#: actions/register.php:121 actions/register.php:511
 msgid "Register"
 msgstr "Регистрация"
 
-#: actions/register.php:135
+#: actions/register.php:142
 msgid "Registration not allowed."
 msgstr "Регистрация недопустима."
 
-#: actions/register.php:201
+#: actions/register.php:209
 #, fuzzy
-msgid "You cannot register if you don't agree to the license."
+msgid "You can't register if you don't agree to the license."
 msgstr ""
 "Вы не можете зарегистрироваться, если Вы не подтверждаете лицензионного "
 "соглашения."
 
-#: actions/register.php:210
+#: actions/register.php:218
 msgid "Email address already exists."
 msgstr "Такой электронный адрес уже задействован."
 
-#: actions/register.php:243 actions/register.php:265
+#: actions/register.php:251 actions/register.php:273
 msgid "Invalid username or password."
 msgstr "Неверное имя или пароль."
 
-#: actions/register.php:340
+#: actions/register.php:351
 #, fuzzy
 msgid ""
 "With this form you can create a new account. You can then post notices and "
-"link up to friends and colleagues."
+"link up to friends and colleagues. "
 msgstr ""
 "С помощью этой формы вы можете создать новую учётную запись. Тогда вы "
 "получите возможность публиковать короткие сообщения и устанавливать связи с "
 "друзьями и коллегами. "
 
+#: actions/register.php:437
+#, fuzzy
+msgid "6 or more characters."
+msgstr "6 или больше знаков"
+
 #. TRANS: Link description in user account settings menu.
-#: actions/register.php:431 actions/register.php:435
+#: actions/register.php:445 actions/register.php:449
 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
 msgid "Email"
 msgstr "Email"
 
-#: actions/register.php:432 actions/register.php:436
+#: actions/register.php:446 actions/register.php:450
 #, fuzzy
-msgid "Used only for updates, announcements, and password recovery."
+msgid "Used only for updates, announcements, and password recovery"
 msgstr "Нужна только для обновлений, осведомлений и восстановления пароля."
 
-#: actions/register.php:443
+#: actions/register.php:457
 #, fuzzy
-msgid "Longer name, preferably your \"real\" name."
+msgid "Longer name, preferably your \"real\" name"
 msgstr "Полное имя, предпочтительно Ваше настоящее имя"
 
-#: actions/register.php:471
+#: actions/register.php:462
 #, fuzzy
-msgid "Where you are, like \"City, State (or Region), Country\"."
-msgstr "Где вы находитесь, например «Город, область, страна»"
+msgid "URL of your homepage, blog, or profile on another site"
+msgstr "Адрес вашей домашней страницы, блога или профиля на другом сайте."
 
-#: actions/register.php:510
+#: actions/register.php:523
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
@@ -5104,23 +5036,23 @@ msgstr ""
 "Я понимаю, что содержание и данные %1$s являются частными и "
 "конфиденциальными."
 
-#: actions/register.php:520
+#: actions/register.php:533
 #, php-format
 msgid "My text and files are copyright by %1$s."
 msgstr "Авторским правом на мои тексты и файлы обладает %1$s."
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:524
+#: actions/register.php:537
 msgid "My text and files remain under my own copyright."
 msgstr "Авторские права на мои тексты и файлы остаются за мной."
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:527
+#: actions/register.php:540
 msgid "All rights reserved."
 msgstr "Все права защищены."
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:532
+#: actions/register.php:545
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -5129,7 +5061,7 @@ msgstr ""
 "Мои тексты и файлы доступны на условиях %s, за исключением следующей личной "
 "информации: пароля, почтового адреса, номера мессенджера и номера телефона."
 
-#: actions/register.php:573
+#: actions/register.php:588
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -5163,7 +5095,7 @@ msgstr ""
 "Спасибо за то, что присоединились к нам, надеемся, что вы получите "
 "удовольствие от использования данного сервиса!"
 
-#: actions/register.php:597
+#: actions/register.php:612
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5195,7 +5127,7 @@ msgstr "Имя пользователя."
 
 #: actions/remotesubscribe.php:129
 #, fuzzy
-msgid "Nickname of the user you want to follow."
+msgid "Nickname of the user you want to follow"
 msgstr "Имя пользователя, которому Вы хотите следовать"
 
 #: actions/remotesubscribe.php:132
@@ -5204,7 +5136,7 @@ msgstr "URL профиля"
 
 #: actions/remotesubscribe.php:133
 #, fuzzy
-msgid "URL of your profile on another compatible microblogging service."
+msgid "URL of your profile on another compatible microblogging service"
 msgstr "Адрес URL твоего профиля на другом подходящем сервисе микроблогинга"
 
 #. TRANS: Link text for link that will subscribe to a remote profile.
@@ -5215,7 +5147,7 @@ msgstr "Подписаться"
 
 #: actions/remotesubscribe.php:158
 #, fuzzy
-msgid "Invalid profile URL (bad format)."
+msgid "Invalid profile URL (bad format)"
 msgstr "Неверный URL профиля (плохой формат)"
 
 #: actions/remotesubscribe.php:167
@@ -5257,7 +5189,6 @@ msgstr "Повторено"
 msgid "Repeated!"
 msgstr "Повторено!"
 
-#. TRANS: RSS reply feed title. %s is a user nickname.
 #. TRANS: Tooltip for personal group navigation menu option when logged in for viewing @-replies.
 #: actions/replies.php:126 actions/repliesrss.php:68
 #: lib/personalgroupnav.php:109
@@ -5312,11 +5243,9 @@ msgstr ""
 "Вы можете попробовать «[подтолкнуть %1$s](../%2$s)» или [написать им что-"
 "нибудь](%%%%action.newnotice%%%%?status_textarea=%3$s)."
 
-#. TRANS: RSS reply feed description.
-#. TRANS: %1$s is a user nickname, %2$s is the StatusNet site name.
-#: actions/repliesrss.php:74
+#: actions/repliesrss.php:72
 #, fuzzy, php-format
-msgid "Replies to %1$s on %2$s."
+msgid "Replies to %1$s on %2$s!"
 msgstr "Ответы на записи %1$s на %2$s!"
 
 #. TRANS: Client exception displayed when trying to restore an account while not logged in.
@@ -5417,7 +5346,7 @@ msgstr "Вы не можете снимать роли пользователе
 msgid "User doesn't have this role."
 msgstr "Пользователь не имеет этой роли."
 
-#: actions/rsd.php:142 actions/version.php:159
+#: actions/rsd.php:146 actions/version.php:159
 msgid "StatusNet"
 msgstr "StatusNet"
 
@@ -5460,87 +5389,87 @@ msgstr "Включить отладочный вывод для сессий."
 msgid "Save site settings"
 msgstr "Сохранить настройки сайта"
 
-#: actions/showapplication.php:78
+#: actions/showapplication.php:82
 msgid "You must be logged in to view an application."
 msgstr "Вы должны авторизоваться, чтобы просматривать приложения."
 
-#: actions/showapplication.php:151
+#: actions/showapplication.php:157
 msgid "Application profile"
 msgstr "Профиль приложения"
 
 #. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:153 lib/applicationeditform.php:177
+#: actions/showapplication.php:159 lib/applicationeditform.php:177
 msgid "Icon"
 msgstr "Иконка"
 
 #. TRANS: Form input field label for application name.
-#: actions/showapplication.php:163 actions/version.php:197
+#: actions/showapplication.php:169 actions/version.php:197
 #: lib/applicationeditform.php:190
 msgid "Name"
 msgstr "Имя"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:172 lib/applicationeditform.php:227
+#: actions/showapplication.php:178 lib/applicationeditform.php:227
 msgid "Organization"
 msgstr "Организация"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:181 actions/version.php:200
+#: actions/showapplication.php:187 actions/version.php:200
 #: lib/applicationeditform.php:208 lib/groupeditform.php:168
 msgid "Description"
 msgstr "Описание"
 
 #. TRANS: Header for group statistics on a group page (h2).
 #. TRANS: H2 text for user statistics.
-#: actions/showapplication.php:186 actions/showgroup.php:460
+#: actions/showapplication.php:192 actions/showgroup.php:460
 #: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "Статистика"
 
-#: actions/showapplication.php:197
+#: actions/showapplication.php:203
 #, php-format
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr "Создано %1$s — доступ по умолчанию: %2$s — %3$d польз."
 
-#: actions/showapplication.php:207
+#: actions/showapplication.php:213
 msgid "Application actions"
 msgstr "Действия приложения"
 
-#: actions/showapplication.php:230
+#: actions/showapplication.php:236
 msgid "Reset key & secret"
 msgstr "Сбросить ключ и секретную фразу"
 
 #. TRANS: Title of form for deleting a user.
-#: actions/showapplication.php:246 lib/deletegroupform.php:121
+#: actions/showapplication.php:252 lib/deletegroupform.php:121
 #: lib/deleteuserform.php:64 lib/noticelist.php:673
 msgid "Delete"
 msgstr "Удалить"
 
-#: actions/showapplication.php:255
+#: actions/showapplication.php:261
 msgid "Application info"
 msgstr "Информация о приложении"
 
-#: actions/showapplication.php:257
+#: actions/showapplication.php:263
 msgid "Consumer key"
 msgstr "Потребительский ключ"
 
-#: actions/showapplication.php:262
+#: actions/showapplication.php:268
 msgid "Consumer secret"
 msgstr "Секретная фраза потребителя"
 
-#: actions/showapplication.php:267
+#: actions/showapplication.php:273
 msgid "Request token URL"
 msgstr "URL ключа запроса"
 
-#: actions/showapplication.php:272
+#: actions/showapplication.php:278
 msgid "Access token URL"
 msgstr "URL ключа доступа"
 
-#: actions/showapplication.php:277
+#: actions/showapplication.php:283
 msgid "Authorize URL"
 msgstr "URL авторизации"
 
-#: actions/showapplication.php:282
+#: actions/showapplication.php:288
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
@@ -5548,7 +5477,7 @@ msgstr ""
 "Примечание: Мы поддерживаем подписи HMAC-SHA1. Мы не поддерживаем метод "
 "подписи открытым текстом."
 
-#: actions/showapplication.php:302
+#: actions/showapplication.php:309
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr ""
 "Вы уверены, что хотите сбросить ваш ключ потребителя и секретную фразу?"
@@ -5641,18 +5570,16 @@ msgid "Group profile"
 msgstr "Профиль группы"
 
 #. TRANS: Label for group URL (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT for URL in a profile.
 #: actions/showgroup.php:273 actions/tagother.php:118
-#: actions/userauthorization.php:184 lib/userprofile.php:186
+#: actions/userauthorization.php:175 lib/userprofile.php:186
 msgid "URL"
 msgstr "URL"
 
 #. TRANS: Label for group description or group note (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page where bio is displayed.
 #. TRANS: DT for note in a profile.
 #: actions/showgroup.php:285 actions/tagother.php:128
-#: actions/userauthorization.php:197 lib/userprofile.php:204
+#: actions/userauthorization.php:187 lib/userprofile.php:204
 msgid "Note"
 msgstr "Запись"
 
@@ -5798,7 +5725,7 @@ msgid "%1$s tagged %2$s"
 msgstr "%1$s с тегом %2$s"
 
 #. TRANS: Page title showing tagged notices in one user's stream.
-#. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
+#. TRANS: %1$s is the username, %2$s is the hash tag, %1$d is the page number.
 #: actions/showstream.php:74
 #, php-format
 msgid "%1$s tagged %2$s, page %3$d"
@@ -6049,7 +5976,7 @@ msgstr "Текст уведомления сайта (максимум 255 си
 #. TRANS: Title for button to save site notice in admin panel.
 #: actions/sitenoticeadminpanel.php:201
 #, fuzzy
-msgid "Save site notice."
+msgid "Save site notice"
 msgstr "Сохранить уведомление сайта"
 
 #. TRANS: Title for SMS settings.
@@ -6110,7 +6037,7 @@ msgstr "Номер телефона для СМС"
 #. TRANS: SMS phone number input field instructions in SMS settings form.
 #: actions/smssettings.php:152
 #, fuzzy
-msgid "Phone number, no punctuation or spaces, with area code."
+msgid "Phone number, no punctuation or spaces, with area code"
 msgstr "Номер телефона, без пробелов, с кодом зоны"
 
 #. TRANS: Form legend for SMS preferences form.
@@ -6279,21 +6206,17 @@ msgstr "Вы не подписаны на этот профиль."
 msgid "Could not save subscription."
 msgstr "Не удаётся сохранить подписку."
 
-#. TRANS: Client error displayed trying to perform any request method other than POST.
-#. TRANS: Do not translate POST.
 #: actions/subscribe.php:77
 msgid "This action only accepts POST requests."
 msgstr "Это действие принимает только POST-запросы."
 
-#. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
-#: actions/subscribe.php:121
+#: actions/subscribe.php:117
 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
 msgstr ""
 "Вы не можете подписаться на удалённый профиль OMB 0.1 с помощью этого "
 "действия."
 
-#. TRANS: Page title when subscription succeeded.
-#: actions/subscribe.php:149
+#: actions/subscribe.php:145
 msgid "Subscribed"
 msgstr "Подписано"
 
@@ -6453,9 +6376,8 @@ msgstr "Теги %s"
 msgid "User profile"
 msgstr "Профиль пользователя"
 
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT element in area for user avatar.
-#: actions/tagother.php:81 actions/userauthorization.php:138
+#: actions/tagother.php:81 actions/userauthorization.php:132
 #: lib/userprofile.php:108
 msgid "Photo"
 msgstr "Фото"
@@ -6472,11 +6394,6 @@ msgstr ""
 "Теги для этого пользователя (буквы, цифры, -, ., и _), разделённые запятой "
 "или пробелом"
 
-#: actions/tagother.php:178
-#, php-format
-msgid "Invalid tag: \"%s\""
-msgstr "Неверный тег: «%s»"
-
 #: actions/tagother.php:193
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
@@ -6493,7 +6410,6 @@ msgstr ""
 msgid "No such tag."
 msgstr "Нет такого тега."
 
-#. TRANS: Client error displayed when trying to unblock a non-blocked user.
 #: actions/unblock.php:59
 msgid "You haven't blocked that user."
 msgstr "Вы не заблокировали этого пользователя."
@@ -6514,7 +6430,7 @@ msgstr "Нет ID профиля в запросе."
 msgid "Unsubscribed"
 msgstr "Отписано"
 
-#: actions/updateprofile.php:64
+#: actions/updateprofile.php:64 actions/userauthorization.php:337
 #, php-format
 msgid ""
 "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
@@ -6547,7 +6463,7 @@ msgstr ""
 #. TRANS: users in user admin panel. %1$s is the invalid nickname.
 #: actions/useradminpanel.php:166
 #, fuzzy, php-format
-msgid "Invalid default subscripton: \"%1$s\" is not a user."
+msgid "Invalid default subscripton: '%1$s' is not a user."
 msgstr "Неверная подписка по умолчанию: «%1$s» не является пользователем."
 
 #. TRANS: Link description in user account settings menu.
@@ -6608,70 +6524,59 @@ msgstr "Разрешать ли пользователям приглашать
 #. TRANS: Title for button to save user settings in user admin panel.
 #: actions/useradminpanel.php:302
 #, fuzzy
-msgid "Save user settings."
+msgid "Save user settings"
 msgstr "Сохранить пользовательские настройки"
 
-#. TRANS: Page title.
-#: actions/userauthorization.php:109
+#: actions/userauthorization.php:105
 msgid "Authorize subscription"
 msgstr "Авторизовать подписку"
 
-#. TRANS: Page notice on "Auhtorize subscription" page.
-#: actions/userauthorization.php:115
+#: actions/userauthorization.php:110
 #, fuzzy
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
 "user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
-"click \"Reject\"."
+"click “Reject”."
 msgstr ""
 "Пожалуйста, проверьте эти подробности, чтобы быть уверенным, что вы хотите "
 "подписаться на записи этого пользователя. Если Вы этого не хотите делать, "
 "нажмите «Отказ»."
 
-#. TRANS: DT element on Authorise Subscription page where license is displayed.
 #. TRANS: Menu item for site administration
-#: actions/userauthorization.php:207 actions/version.php:167
+#: actions/userauthorization.php:196 actions/version.php:167
 #: lib/adminpanelaction.php:403
 msgid "License"
 msgstr "Лицензия"
 
-#. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:229
+#: actions/userauthorization.php:217
 #, fuzzy
-msgctxt "BUTTON"
 msgid "Accept"
 msgstr "Принять"
 
-#. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:231
-#, fuzzy
-msgid "Subscribe to this user."
+#: actions/userauthorization.php:218 lib/subscribeform.php:115
+#: lib/subscribeform.php:139
+msgid "Subscribe to this user"
 msgstr "Подписаться на этого пользователя"
 
-#. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:233
+#: actions/userauthorization.php:219
 #, fuzzy
-msgctxt "BUTTON"
 msgid "Reject"
 msgstr "Отбросить"
 
-#. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:235
+#: actions/userauthorization.php:220
 #, fuzzy
-msgid "Reject this subscription."
+msgid "Reject this subscription"
 msgstr "Отвергнуть эту подписку"
 
-#. TRANS: Client error displayed for an empty authorisation request.
-#: actions/userauthorization.php:248
+#: actions/userauthorization.php:232
 msgid "No authorization request!"
 msgstr "Не авторизованный запрос!"
 
-#. TRANS: Accept message header from Authorise subscription page.
-#: actions/userauthorization.php:271
+#: actions/userauthorization.php:254
 msgid "Subscription authorized"
 msgstr "Подписка авторизована"
 
-#: actions/userauthorization.php:274
+#: actions/userauthorization.php:256
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to authorize the "
@@ -6680,12 +6585,11 @@ msgstr ""
 "Подписка авторизована, но нет обратного URL. Посмотрите инструкции на сайте "
 "о том, как авторизовать подписку. Ваш ключ подписки:"
 
-#. TRANS: Reject message header from Authorise subscription page.
-#: actions/userauthorization.php:285
+#: actions/userauthorization.php:266
 msgid "Subscription rejected"
 msgstr "Подписка отменена"
 
-#: actions/userauthorization.php:288
+#: actions/userauthorization.php:268
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to fully reject the "
@@ -6694,63 +6598,39 @@ msgstr ""
 "Подписка отвергнута, но не бы передан URL обратного вызова. Проверьте "
 "инструкции на сайте, чтобы полностью отказаться от подписки."
 
-#. TRANS: Exception thrown when no valid user is found for an authorisation request.
-#. TRANS: %s is a listener URI.
-#: actions/userauthorization.php:325
+#: actions/userauthorization.php:303
 #, fuzzy, php-format
-msgid "Listener URI \"%s\" not found here."
+msgid "Listener URI ‘%s’ not found here."
 msgstr "Смотрящий URI «%s» здесь не найден."
 
-#. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:332
+#: actions/userauthorization.php:308
 #, fuzzy, php-format
-msgid "Listenee URI \"%s\" is too long."
+msgid "Listenee URI ‘%s’ is too long."
 msgstr "Просматриваемый URI «%s» слишком длинный."
 
-#. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:340
+#: actions/userauthorization.php:314
 #, fuzzy, php-format
-msgid "Listenee URI \"%s\" is a local user."
+msgid "Listenee URI ‘%s’ is a local user."
 msgstr "Просматриваемый URI «%s» — локальный пользователь."
 
-#. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
-#. TRANS: %s is a profile URL.
-#: actions/userauthorization.php:358
+#: actions/userauthorization.php:329
 #, fuzzy, php-format
-msgid "Profile URL \"%s\" is for a local user."
+msgid "Profile URL ‘%s’ is for a local user."
 msgstr "URL профиля «%s» предназначен только для локального пользователя."
 
-#. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
-#. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
-#: actions/userauthorization.php:368
+#: actions/userauthorization.php:345
 #, fuzzy, php-format
-msgid ""
-"Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
-"\"."
-msgstr ""
-"Лицензия просматриваемого потока «%1$s» несовместима с лицензией сайта «%2$s»."
-
-#. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:378
-#, fuzzy, php-format
-msgid "Avatar URL \"%s\" is not valid."
+msgid "Avatar URL ‘%s’ is not valid."
 msgstr "URL аватары «%s» недействителен."
 
-#. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:385
+#: actions/userauthorization.php:350
 #, fuzzy, php-format
-msgid "Cannot read avatar URL \"%s\"."
+msgid "Can’t read avatar URL ‘%s’."
 msgstr "Не удаётся прочитать URL аватары «%s»"
 
-#. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:392
+#: actions/userauthorization.php:355
 #, fuzzy, php-format
-msgid "Wrong image type for avatar URL \"%s\"."
+msgid "Wrong image type for avatar URL ‘%s’."
 msgstr "Неверный тип изображения для URL аватары «%s»."
 
 #. TRANS: Page title for profile design page.
@@ -6859,7 +6739,7 @@ msgid "Plugins"
 msgstr "Плагины"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:898
+#: actions/version.php:198 lib/action.php:901
 msgid "Version"
 msgstr "Версия"
 
@@ -7073,14 +6953,14 @@ msgstr "Проблемы с сохранением входящих сообще
 
 #. TRANS: Server exception thrown when a reply cannot be saved.
 #. TRANS: %1$d is a notice ID, %2$d is the ID of the mentioned user.
-#: classes/Notice.php:1142
+#: classes/Notice.php:1144
 #, php-format
 msgid "Could not save reply for %1$d, %2$d."
 msgstr "Не удаётся сохранить ответ для %1$d, %2$d."
 
 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1661
+#: classes/Notice.php:1663
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
@@ -7094,7 +6974,7 @@ msgstr "%1$s (%2$s)"
 
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:775
+#: classes/Profile.php:779
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
@@ -7103,7 +6983,7 @@ msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:784
+#: classes/Profile.php:788
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -7421,53 +7301,53 @@ msgid "Page notice"
 msgstr "Новая запись"
 
 #. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:871
+#: lib/action.php:874
 msgid "Secondary site navigation"
 msgstr "Навигация по подпискам"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:877
+#: lib/action.php:880
 msgid "Help"
 msgstr "Помощь"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:880
+#: lib/action.php:883
 msgid "About"
 msgstr "О проекте"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:883
+#: lib/action.php:886
 msgid "FAQ"
 msgstr "ЧаВо"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:888
+#: lib/action.php:891
 msgid "TOS"
 msgstr "TOS"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:892
+#: lib/action.php:895
 msgid "Privacy"
 msgstr "Пользовательское соглашение"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:895
+#: lib/action.php:898
 msgid "Source"
 msgstr "Исходный код"
 
 #. TRANS: Secondary navigation menu option leading to e-mail contact information on the
 #. TRANS: StatusNet site, where to report bugs, ...
-#: lib/action.php:902
+#: lib/action.php:905
 msgid "Contact"
 msgstr "Контактная информация"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:905
+#: lib/action.php:908
 msgid "Badge"
 msgstr "Бедж"
 
 #. TRANS: DT element for StatusNet software license.
-#: lib/action.php:934
+#: lib/action.php:937
 msgid "StatusNet software license"
 msgstr "StatusNet лицензия"
 
@@ -7475,7 +7355,7 @@ msgstr "StatusNet лицензия"
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:941
+#: lib/action.php:944
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7485,7 +7365,7 @@ msgstr ""
 "broughtby%%](%%site.broughtbyurl%%)."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:944
+#: lib/action.php:947
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** — сервис микроблогинга."
@@ -7494,7 +7374,7 @@ msgstr "**%%site.name%%** — сервис микроблогинга."
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:951
+#: lib/action.php:954
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7507,27 +7387,27 @@ msgstr ""
 "licenses/agpl-3.0.html)."
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:967
+#: lib/action.php:970
 msgid "Site content license"
 msgstr "Лицензия содержимого сайта"
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:974
+#: lib/action.php:977
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr "Содержание и данные %1$s являются личными и конфиденциальными."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:981
+#: lib/action.php:984
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
 "Авторские права на содержание и данные принадлежат %1$s. Все права защищены."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:985
+#: lib/action.php:988
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 "Авторские права на содержание и данные принадлежат разработчикам. Все права "
@@ -7535,25 +7415,25 @@ msgstr ""
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:1017
+#: lib/action.php:1020
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr "Все материалы и данные %1$s доступны на условиях лицензии %2$s."
 
 #. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1353
+#: lib/action.php:1356
 msgid "Pagination"
 msgstr "Разбиение на страницы"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1364
+#: lib/action.php:1367
 msgid "After"
 msgstr "Сюда"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1374
+#: lib/action.php:1377
 msgid "Before"
 msgstr "Туда"
 
@@ -7753,23 +7633,19 @@ msgstr ""
 msgid "No application for that consumer key."
 msgstr "Нет приложения для этого пользовательского ключа."
 
-#: lib/apiauth.php:202 lib/apiauth.php:284
-msgid "Not allowed to use API."
-msgstr ""
-
 #. TRANS: OAuth exception given when an incorrect access token was given for a user.
-#: lib/apiauth.php:225
+#: lib/apiauth.php:219
 msgid "Bad access token."
 msgstr "Неверный ключ доступа."
 
 #. TRANS: OAuth exception given when no user was found for a given token (no token was found).
-#: lib/apiauth.php:230
+#: lib/apiauth.php:224
 msgid "No user for that token."
 msgstr "Нет пользователя для этого ключа."
 
 #. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel".
 #. TRANS: Client error thrown when authentication fails.
-#: lib/apiauth.php:272 lib/apiauth.php:302
+#: lib/apiauth.php:266 lib/apiauth.php:293
 msgid "Could not authenticate you."
 msgstr "Не удаётся произвести аутентификацию."
 
@@ -7973,11 +7849,6 @@ msgstr "Смена пароля не разрешена."
 msgid "Block"
 msgstr "Блокировать"
 
-#. TRANS: Description of the form to block a user.
-#: lib/blockform.php:79
-msgid "Block this user"
-msgstr "Заблокировать пользователя."
-
 #. TRANS: Title for command results.
 #: lib/channel.php:160 lib/channel.php:181
 msgid "Command results"
@@ -8005,7 +7876,7 @@ msgstr "Записи с таким id не существует."
 
 #. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
 #. TRANS: Error text shown when a last user notice is requested and it does not exist.
-#: lib/command.php:99 lib/command.php:630
+#: lib/command.php:99 lib/command.php:642
 msgid "User has no last notice."
 msgstr "У пользователя нет последней записи."
 
@@ -8055,35 +7926,41 @@ msgstr ""
 "Подписчиков: %2$s\n"
 "Записей: %3$s"
 
+#. TRANS: Error message text shown when a favorite could not be set because it has already been favorited.
+#: lib/command.php:298
+#, fuzzy
+msgid "Could not create favorite: already favorited."
+msgstr "Не удаётся создать любимую запись."
+
 #. TRANS: Text shown when a notice has been marked as favourite successfully.
-#: lib/command.php:312
+#: lib/command.php:324
 msgid "Notice marked as fave."
 msgstr "Запись помечена как любимая."
 
 #. TRANS: Message given having added a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:357
+#: lib/command.php:369
 #, php-format
 msgid "%1$s joined group %2$s."
 msgstr "%1$s присоединился к группе %2$s."
 
 #. TRANS: Message given having removed a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:405
+#: lib/command.php:417
 #, php-format
 msgid "%1$s left group %2$s."
 msgstr "%1$s покинул группу %2$s."
 
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: lib/command.php:426
+#: lib/command.php:438
 #, php-format
 msgctxt "WHOIS"
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
 
 #. TRANS: Whois output. %s is the full name of the queried user.
-#: lib/command.php:430
+#: lib/command.php:442
 #, php-format
 msgid "Fullname: %s"
 msgstr "Полное имя: %s"
@@ -8091,7 +7968,7 @@ msgstr "Полное имя: %s"
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a location.
-#: lib/command.php:434 lib/mail.php:270
+#: lib/command.php:446 lib/mail.php:270
 #, php-format
 msgid "Location: %s"
 msgstr "Месторасположение: %s"
@@ -8099,20 +7976,20 @@ msgstr "Месторасположение: %s"
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a homepage.
-#: lib/command.php:438 lib/mail.php:274
+#: lib/command.php:450 lib/mail.php:274
 #, php-format
 msgid "Homepage: %s"
 msgstr "Домашняя страница: %s"
 
 #. TRANS: Whois output. %s is the bio information of the queried user.
-#: lib/command.php:442
+#: lib/command.php:454
 #, php-format
 msgid "About: %s"
 msgstr "О пользователе: %s"
 
 #. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).
 #. TRANS: %s is a remote profile.
-#: lib/command.php:471
+#: lib/command.php:483
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
@@ -8123,7 +8000,7 @@ msgstr ""
 
 #. TRANS: Message given if content is too long. %1$sd is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:488
+#: lib/command.php:500
 #, php-format
 msgid "Message too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
@@ -8135,25 +8012,25 @@ msgstr[2] ""
 "Сообщение слишком длинное — не больше %1$d символов, вы отправили %2$d."
 
 #. TRANS: Error text shown sending a direct message fails with an unknown reason.
-#: lib/command.php:516
+#: lib/command.php:528
 msgid "Error sending direct message."
 msgstr "Ошибка при отправке прямого сообщения."
 
 #. TRANS: Message given having repeated a notice from another user.
 #. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:553
+#: lib/command.php:565
 #, php-format
 msgid "Notice from %s repeated."
 msgstr "Запись %s повторена."
 
 #. TRANS: Error text shown when repeating a notice fails with an unknown reason.
-#: lib/command.php:556
+#: lib/command.php:568
 msgid "Error repeating notice."
 msgstr "Ошибка при повторении записи."
 
 #. TRANS: Message given if content of a notice for a reply is too long. %1$d is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:591
+#: lib/command.php:603
 #, php-format
 msgid "Notice too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Notice too long - maximum is %1$d characters, you sent %2$d."
@@ -8165,80 +8042,80 @@ msgstr[2] ""
 
 #. TRANS: Text shown having sent a reply to a notice successfully.
 #. TRANS: %s is the nickname of the user of the notice the reply was sent to.
-#: lib/command.php:604
+#: lib/command.php:616
 #, php-format
 msgid "Reply to %s sent."
 msgstr "Ответ %s отправлен."
 
 #. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
-#: lib/command.php:607
+#: lib/command.php:619
 msgid "Error saving notice."
 msgstr "Проблемы с сохранением записи."
 
 #. TRANS: Error text shown when no username was provided when issuing a subscribe command.
-#: lib/command.php:654
+#: lib/command.php:666
 msgid "Specify the name of the user to subscribe to."
 msgstr "Укажите имя пользователя для подписки."
 
 #. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
-#: lib/command.php:663
+#: lib/command.php:675
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "Невозможно подписаться командой на профили OMB."
 
 #. TRANS: Text shown after having subscribed to another user successfully.
 #. TRANS: %s is the name of the user the subscription was requested for.
-#: lib/command.php:671
+#: lib/command.php:683
 #, php-format
 msgid "Subscribed to %s."
 msgstr "Подписался на %s."
 
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.
-#: lib/command.php:692 lib/command.php:803
+#: lib/command.php:704 lib/command.php:815
 msgid "Specify the name of the user to unsubscribe from."
 msgstr "Укажите имя пользователя для отмены подписки."
 
 #. TRANS: Text shown after having unsubscribed from another user successfully.
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:703
+#: lib/command.php:715
 #, php-format
 msgid "Unsubscribed from %s."
 msgstr "Отписаться от %s."
 
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
-#: lib/command.php:723 lib/command.php:749
+#: lib/command.php:735 lib/command.php:761
 msgid "Command not yet implemented."
 msgstr "Команда ещё не выполнена."
 
 #. TRANS: Text shown when issuing the command "off" successfully.
-#: lib/command.php:727
+#: lib/command.php:739
 msgid "Notification off."
 msgstr "Оповещение отсутствует."
 
 #. TRANS: Error text shown when the command "off" fails for an unknown reason.
-#: lib/command.php:730
+#: lib/command.php:742
 msgid "Can't turn off notification."
 msgstr "Нет оповещения."
 
 #. TRANS: Text shown when issuing the command "on" successfully.
-#: lib/command.php:753
+#: lib/command.php:765
 msgid "Notification on."
 msgstr "Есть оповещение."
 
 #. TRANS: Error text shown when the command "on" fails for an unknown reason.
-#: lib/command.php:756
+#: lib/command.php:768
 msgid "Can't turn on notification."
 msgstr "Есть оповещение."
 
 #. TRANS: Error text shown when issuing the login command while login is disabled.
-#: lib/command.php:770
+#: lib/command.php:782
 msgid "Login command is disabled."
 msgstr "Команда входа отключена."
 
 #. TRANS: Text shown after issuing the login command successfully.
 #. TRANS: %s is a logon link..
-#: lib/command.php:783
+#: lib/command.php:795
 #, php-format
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
@@ -8247,20 +8124,20 @@ msgstr ""
 
 #. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:812
+#: lib/command.php:824
 #, php-format
 msgid "Unsubscribed %s."
 msgstr "Отписано %s."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
-#: lib/command.php:830
+#: lib/command.php:842
 msgid "You are not subscribed to anyone."
 msgstr "Вы ни на кого не подписаны."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
-#: lib/command.php:835
+#: lib/command.php:847
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Вы подписаны на этих людей:"
@@ -8269,14 +8146,14 @@ msgstr[2] "Вы подписаны на этих людей:"
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user
 #. TRANS: (followers) without having any subscribers.
-#: lib/command.php:857
+#: lib/command.php:869
 msgid "No one is subscribed to you."
 msgstr "Никто не подписан на вас."
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
-#: lib/command.php:862
+#: lib/command.php:874
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Эти люди подписались на вас:"
@@ -8285,14 +8162,14 @@ msgstr[2] "Эти люди подписались на вас:"
 
 #. TRANS: Text shown after requesting groups a user is subscribed to without having
 #. TRANS: any group subscriptions.
-#: lib/command.php:884
+#: lib/command.php:896
 msgid "You are not a member of any groups."
 msgstr "Вы не состоите ни в одной группе."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
-#: lib/command.php:889
+#: lib/command.php:901
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "Вы являетесь участником следующих групп:"
@@ -8300,7 +8177,7 @@ msgstr[1] "Вы являетесь участником следующих гр
 msgstr[2] "Вы являетесь участником следующих групп:"
 
 #. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-#: lib/command.php:904
+#: lib/command.php:916
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -8439,11 +8316,6 @@ msgstr "Авторизованные соединённые приложения
 msgid "Database error"
 msgstr "Ошибка базы данных"
 
-#. TRANS: Description of form for deleting a user.
-#: lib/deleteuserform.php:75
-msgid "Delete this user"
-msgstr "Удалить этого пользователя"
-
 #. TRANS: Label in form on profile design page.
 #. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
 #: lib/designsettings.php:108
@@ -8480,21 +8352,6 @@ msgstr "Изменение цветовой гаммы"
 msgid "Use defaults"
 msgstr "Использовать значения по умолчанию"
 
-#. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: lib/designsettings.php:259
-msgid "Restore default designs"
-msgstr "Восстановить оформление по умолчанию"
-
-#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: lib/designsettings.php:267
-msgid "Reset back to default"
-msgstr "Восстановить значения по умолчанию"
-
-#. TRANS: Title for button on profile design page to save settings.
-#: lib/designsettings.php:272
-msgid "Save design"
-msgstr "Сохранить оформление"
-
 #. TRANS: Error message displayed if design settings could not be saved.
 #. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
 #: lib/designsettings.php:405 lib/designsettings.php:427
@@ -9387,10 +9244,6 @@ msgstr "Ответить на эту запись"
 msgid "Reply"
 msgstr "Ответить"
 
-#: lib/noticelist.php:673
-msgid "Delete this notice"
-msgstr "Удалить эту запись"
-
 #: lib/noticelist.php:691
 msgid "Notice repeated"
 msgstr "Запись повторена"
@@ -9671,10 +9524,6 @@ msgstr "Пригласить"
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Пригласите друзей и коллег стать такими же как вы участниками %s"
 
-#: lib/subscribeform.php:115 lib/subscribeform.php:139
-msgid "Subscribe to this user"
-msgstr "Подписаться на этого пользователя"
-
 #: lib/subscriberspeopleselftagcloudsection.php:48
 #: lib/subscriptionspeopleselftagcloudsection.php:48
 msgid "People Tagcloud as self-tagged"
@@ -9851,23 +9700,18 @@ msgctxt "role"
 msgid "Moderator"
 msgstr "Модератор"
 
-#: lib/util.php:305
-#, fuzzy
-msgid "Not allowed to log in."
-msgstr "Не авторизован."
-
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1309
+#: lib/util.php:1306
 msgid "a few seconds ago"
 msgstr "пару секунд назад"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1312
+#: lib/util.php:1309
 msgid "about a minute ago"
 msgstr "около минуты назад"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1316
+#: lib/util.php:1313
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
@@ -9876,12 +9720,12 @@ msgstr[1] "около %d минут назад"
 msgstr[2] "около %d минут назад"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1319
+#: lib/util.php:1316
 msgid "about an hour ago"
 msgstr "около часа назад"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1323
+#: lib/util.php:1320
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
@@ -9890,12 +9734,12 @@ msgstr[1] "около %d часов назад"
 msgstr[2] "около %d часов назад"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1326
+#: lib/util.php:1323
 msgid "about a day ago"
 msgstr "около дня назад"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1330
+#: lib/util.php:1327
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
@@ -9904,12 +9748,12 @@ msgstr[1] "около %d дней назад"
 msgstr[2] "около %d дней назад"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1333
+#: lib/util.php:1330
 msgid "about a month ago"
 msgstr "около месяца назад"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1337
+#: lib/util.php:1334
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
@@ -9918,7 +9762,7 @@ msgstr[1] "около %d месяцев назад"
 msgstr[2] "около %d месяцев назад"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1340
+#: lib/util.php:1337
 msgid "about a year ago"
 msgstr "около года назад"
 
@@ -9967,3 +9811,75 @@ msgstr "Неверный XML, отсутствует корень XRD."
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr "Получение резервной копии из файла «%s»."
+
+#, fuzzy
+#~ msgid "Block this user."
+#~ msgstr "Заблокировать пользователя."
+
+#, fuzzy
+#~ msgid "Delete this notice."
+#~ msgstr "Удалить эту запись"
+
+#, fuzzy
+#~ msgid "Delete this user."
+#~ msgstr "Удалить этого пользователя"
+
+#, fuzzy
+#~ msgid "Restore default designs."
+#~ msgstr "Восстановить оформление по умолчанию"
+
+#, fuzzy
+#~ msgid "Reset back to default."
+#~ msgstr "Восстановить значения по умолчанию"
+
+#, fuzzy
+#~ msgid "Save design."
+#~ msgstr "Сохранить оформление"
+
+#, fuzzy
+#~ msgid "Disfavor favorite."
+#~ msgstr "Разлюбить"
+
+#, fuzzy
+#~ msgid "\"%s\" not found."
+#~ msgstr "Метод API не найден."
+
+#, fuzzy
+#~ msgid "Notice %s not found."
+#~ msgstr "Родительская запись не найдена."
+
+#, fuzzy
+#~ msgid "Attachment %s not found."
+#~ msgstr "Получатель не найден."
+
+#, fuzzy
+#~ msgid "Invalid tag: \"%s\"."
+#~ msgstr "Неверный тег: «%s»"
+
+#, fuzzy
+#~ msgid "%s updates from everyone."
+#~ msgstr "Обновления %s от всех!"
+
+#, fuzzy
+#~ msgid "Password saved"
+#~ msgstr "Пароль сохранён."
+
+#, fuzzy
+#~ msgid "Where you are, like \"City, State (or Region), Country\"."
+#~ msgstr "Где вы находитесь, например «Город, область, страна»"
+
+#, fuzzy
+#~ msgid "Subscribe to this user."
+#~ msgstr "Подписаться на этого пользователя"
+
+#, fuzzy
+#~ msgid ""
+#~ "Listenee stream license \"%1$s\" is not compatible with site license \"%2"
+#~ "$s\"."
+#~ msgstr ""
+#~ "Лицензия просматриваемого потока «%1$s» несовместима с лицензией сайта «%2"
+#~ "$s»."
+
+#, fuzzy
+#~ msgid "Not allowed to log in."
+#~ msgstr "Не авторизован."
diff --git a/locale/statusnet.pot b/locale/statusnet.pot
index 69aa295e1c..4499ddb4bf 100644
--- a/locale/statusnet.pot
+++ b/locale/statusnet.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-24 10:32+0000\n"
+"POT-Creation-Date: 2011-03-03 15:58+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -127,11 +127,7 @@ msgstr ""
 #. 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 use "one time password login" without using an existing user.
-#. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
-#. TRANS: Client error displayed trying to find a user by ID for a non-existing ID.
-#. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when calling a profile action without specifying a user.
 #: actions/all.php:80 actions/allrss.php:69
@@ -149,12 +145,12 @@ msgstr ""
 #: actions/apitimelinementions.php:77 actions/apitimelineuser.php:79
 #: actions/avatarbynickname.php:79 actions/favoritesrss.php:72
 #: actions/foaf.php:42 actions/foaf.php:61 actions/hcard.php:67
-#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:78
+#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
 #: actions/remotesubscribe.php:144 actions/remotesubscribe.php:153
-#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:113
-#: actions/showfavorites.php:106 actions/userbyid.php:75
+#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
+#: actions/showfavorites.php:106 actions/userbyid.php:74
 #: actions/usergroups.php:93 actions/userrss.php:40 actions/userxrd.php:59
-#: actions/xrds.php:71 lib/command.php:497 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:509 lib/galleryaction.php:59
 #: lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr ""
@@ -276,7 +272,7 @@ msgstr ""
 #: actions/apigrouplistall.php:120 actions/apigroupmembership.php:105
 #: actions/apigroupshow.php:114 actions/apihelptest.php:84
 #: actions/apistatusesdestroy.php:101 actions/apistatusesretweets.php:110
-#: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:138
+#: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:139
 #: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
 #: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:268
 #: actions/apitimelinegroup.php:147 actions/apitimelinehome.php:173
@@ -501,7 +497,7 @@ msgstr ""
 
 #. TRANS: Client error displayed trying to direct message another user who's not a friend (403).
 #: actions/apidirectmessagenew.php:144
-msgid "Cannot send direct messages to users who aren't your friend."
+msgid "Can't send direct messages to users who aren't your friend."
 msgstr ""
 
 #. TRANS: Client error displayed trying to direct message self (403).
@@ -526,7 +522,7 @@ msgstr ""
 #. TRANS: Client error displayed when marking a notice as favourite fails.
 #. TRANS: Server error displayed when trying to mark a notice as favorite fails in the database.
 #. TRANS: Error message text shown when a favorite could not be set.
-#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:294
+#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:306
 msgid "Could not create favorite."
 msgstr ""
 
@@ -584,7 +580,7 @@ msgstr ""
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:191
 #: actions/newgroup.php:137 actions/profilesettings.php:273
-#: actions/register.php:206
+#: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr ""
 
@@ -594,7 +590,7 @@ msgstr ""
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:195
 #: actions/newgroup.php:141 actions/profilesettings.php:243
-#: actions/register.php:208
+#: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr ""
 
@@ -607,7 +603,7 @@ msgstr ""
 #: actions/apigroupcreate.php:181 actions/editapplication.php:235
 #: actions/editgroup.php:202 actions/newapplication.php:221
 #: actions/newgroup.php:148 actions/profilesettings.php:248
-#: actions/register.php:215
+#: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr ""
 
@@ -617,7 +613,7 @@ msgstr ""
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:191 actions/editgroup.php:206
 #: actions/newgroup.php:152 actions/profilesettings.php:252
-#: actions/register.php:218
+#: actions/register.php:226
 msgid "Full name is too long (maximum 255 characters)."
 msgstr ""
 
@@ -645,7 +641,7 @@ msgstr[1] ""
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:215 actions/editgroup.php:218
 #: actions/newgroup.php:164 actions/profilesettings.php:265
-#: actions/register.php:227
+#: actions/register.php:235
 msgid "Location is too long (maximum 255 characters)."
 msgstr ""
 
@@ -701,14 +697,14 @@ msgstr ""
 #. TRANS: Server error displayed when trying to join a group the user is already a member of.
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:333
+#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:345
 msgid "You are already a member of that group."
 msgstr ""
 
 #. TRANS: Server error displayed when trying to join a group the user is blocked from joining.
 #. 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.
-#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:338
+#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:350
 msgid "You have been blocked from that group by the admin."
 msgstr ""
 
@@ -718,7 +714,7 @@ msgstr ""
 #. TRANS: %1$s is the joining user's nickname, $2$s is the group nickname for which the join failed.
 #. TRANS: Message given having failed to add a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:350
+#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:362
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr ""
@@ -735,7 +731,7 @@ msgstr ""
 #. TRANS: Message given having failed to remove a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
 #: actions/apigroupleave.php:127 actions/leavegroup.php:133
-#: lib/command.php:398
+#: lib/command.php:410
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
 msgstr ""
@@ -795,21 +791,20 @@ msgstr ""
 #. TRANS: Form validation error message.
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
-#. TRANS: Client error displayed when the session token is not okay.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
 #: actions/deletenotice.php:177 actions/disfavor.php:75
 #: actions/emailsettings.php:291 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:65 actions/grouplogo.php:321
 #: actions/groupunblock.php:65 actions/imsettings.php:224
-#: actions/invite.php:60 actions/login.php:131 actions/makeadmin.php:66
+#: actions/invite.php:60 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
-#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:136
-#: actions/othersettings.php:155 actions/passwordsettings.php:137
+#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
+#: actions/othersettings.php:155 actions/passwordsettings.php:138
 #: actions/profilesettings.php:217 actions/recoverpassword.php:383
-#: actions/register.php:164 actions/remotesubscribe.php:76
+#: actions/register.php:172 actions/remotesubscribe.php:76
 #: actions/repeat.php:82 actions/smssettings.php:250 actions/subedit.php:40
-#: actions/subscribe.php:87 actions/tagother.php:166
-#: actions/unsubscribe.php:69 actions/userauthorization.php:53
+#: actions/subscribe.php:86 actions/tagother.php:166
+#: actions/unsubscribe.php:69 actions/userauthorization.php:52
 #: lib/designsettings.php:310
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
@@ -840,7 +835,7 @@ msgstr ""
 #: actions/designadminpanel.php:100 actions/editapplication.php:144
 #: actions/emailsettings.php:310 actions/grouplogo.php:332
 #: actions/imsettings.php:239 actions/newapplication.php:124
-#: actions/oauthconnectionssettings.php:145 actions/recoverpassword.php:46
+#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
 #: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
 msgstr ""
@@ -885,20 +880,19 @@ msgstr ""
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group nickname (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT for nick name in a profile.
-#: actions/apioauthauthorize.php:459 actions/login.php:242
-#: actions/profilesettings.php:106 actions/register.php:418
+#: actions/apioauthauthorize.php:459 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:432
 #: actions/showgroup.php:243 actions/tagother.php:94
-#: actions/userauthorization.php:152 lib/groupeditform.php:145
+#: actions/userauthorization.php:145 lib/groupeditform.php:145
 #: lib/userprofile.php:137
 msgid "Nickname"
 msgstr ""
 
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:463 actions/login.php:245
-#: actions/register.php:422 lib/accountsettingsaction.php:120
+#: actions/apioauthauthorize.php:463 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:120
 msgid "Password"
 msgstr ""
 
@@ -989,13 +983,13 @@ msgstr ""
 
 #. TRANS: Client error displayed trying to repeat an own notice through the API.
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:537
+#: actions/apistatusesretweet.php:83 lib/command.php:549
 msgid "Cannot repeat your own notice."
 msgstr ""
 
 #. TRANS: Client error displayed trying to re-repeat a notice through the API.
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:92 lib/command.php:543
+#: actions/apistatusesretweet.php:92 lib/command.php:555
 msgid "Already repeated that notice."
 msgstr ""
 
@@ -1017,7 +1011,7 @@ msgstr ""
 #. TRANS: %s is the requested output format.
 #: actions/apistatusesshow.php:144
 #, php-format
-msgid "Unsupported format: %s."
+msgid "Unsupported format: %s"
 msgstr ""
 
 #. TRANS: Client error displayed requesting a deleted status.
@@ -1120,14 +1114,13 @@ msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr ""
 
 #. TRANS: Title for site timeline. %s is the StatusNet sitename.
-#. TRANS: Public RSS feed title. %s is the StatusNet site name.
 #: actions/apitimelinepublic.php:193 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr ""
 
 #. TRANS: Subtitle for site timeline. %s is the StatusNet sitename.
-#: actions/apitimelinepublic.php:199
+#: actions/apitimelinepublic.php:199 actions/publicrss.php:105
 #, php-format
 msgid "%s updates from everyone!"
 msgstr ""
@@ -1192,26 +1185,25 @@ msgid "Atom post must be an Atom entry."
 msgstr ""
 
 #. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
-#: actions/apitimelineuser.php:334
+#: actions/apitimelineuser.php:335
 msgid "Can only handle POST activities."
 msgstr ""
 
 #. TRANS: Client error displayed when using an unsupported activity object type.
 #. TRANS: %s is the unsupported activity object type.
-#: actions/apitimelineuser.php:345
+#: actions/apitimelineuser.php:346
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
 #. TRANS: %d is the notice ID (number).
-#: actions/apitimelineuser.php:379
+#: actions/apitimelineuser.php:380
 #, php-format
 msgid "No content for notice %d."
 msgstr ""
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#. TRANS: %s is the notice URI.
 #: actions/apitimelineuser.php:408
 #, php-format
 msgid "Notice with URI \"%s\" already exists."
@@ -1229,10 +1221,9 @@ msgstr ""
 
 #. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
 #. TRANS: Client exception.
-#. TRANS: Client error displayed trying to subscribe to a non-existing profile.
 #: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
 #: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
-#: actions/subscribe.php:110
+#: actions/subscribe.php:107
 msgid "No such profile."
 msgstr ""
 
@@ -1357,7 +1348,7 @@ msgstr ""
 #: actions/joingroup.php:95 actions/leavegroup.php:82
 #: actions/leavegroup.php:95 actions/makeadmin.php:86
 #: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:380
+#: lib/command.php:392
 msgid "No such group."
 msgstr ""
 
@@ -1367,7 +1358,7 @@ msgid "Not a member."
 msgstr ""
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
-#: actions/atompubshowmembership.php:150
+#: actions/atompubshowmembership.php:151
 msgid "Cannot delete someone else's membership."
 msgstr ""
 
@@ -1470,11 +1461,9 @@ msgstr ""
 
 #. TRANS: Server error displayed in avatar upload page when no matching profile can be found for a user.
 #. TRANS: Server error displayed coming across a request from a user without a profile.
-#. TRANS: Server error displayed when trying to authorise a remote subscription request
-#. TRANS: while the user has no profile.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
 #: actions/grouplogo.php:184 actions/remotesubscribe.php:190
-#: actions/userauthorization.php:75 actions/userrss.php:108
+#: actions/userauthorization.php:72 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr ""
 
@@ -1529,9 +1518,9 @@ msgstr ""
 msgid "No file uploaded."
 msgstr ""
 
-#. TRANS: Avatar upload form instruction after uploading a file.
+#. TRANS: Avatar upload form unstruction after uploading a file.
 #: actions/avatarsettings.php:345
-msgid "Pick a square area of the image to be your avatar."
+msgid "Pick a square area of the image to be your avatar"
 msgstr ""
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
@@ -1572,7 +1561,7 @@ msgid "You may not backup your account."
 msgstr ""
 
 #. TRANS: Information displayed on the backup account page.
-#: actions/backupaccount.php:225
+#: actions/backupaccount.php:227
 msgid ""
 "You can backup your account data in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format. This is an experimental feature and provides "
@@ -1582,14 +1571,14 @@ msgid ""
 msgstr ""
 
 #. TRANS: Submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:248
+#: actions/backupaccount.php:250
 msgctxt "BUTTON"
 msgid "Backup"
 msgstr ""
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:252
-msgid "Backup your account."
+#: actions/backupaccount.php:254
+msgid "Backup your account"
 msgstr ""
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
@@ -1627,7 +1616,7 @@ msgstr ""
 
 #. TRANS: Submit button title for 'No' when blocking a user.
 #: actions/block.php:158
-msgid "Do not block this user."
+msgid "Do not block this user"
 msgstr ""
 
 #. TRANS: Button label on the user block form.
@@ -1644,8 +1633,9 @@ msgid "Yes"
 msgstr ""
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:165
-msgid "Block this user."
+#. TRANS: Description of the form to block a user.
+#: actions/block.php:165 lib/blockform.php:79
+msgid "Block this user"
 msgstr ""
 
 #. TRANS: Server error displayed when blocking a user fails.
@@ -1804,7 +1794,7 @@ msgstr ""
 #. TRANS: Field label for delete account confirmation entry.
 #. TRANS: Field label for password reset form where the password has to be typed again.
 #: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:262 actions/register.php:426
+#: actions/recoverpassword.php:262 actions/register.php:440
 msgid "Confirm"
 msgstr ""
 
@@ -1833,14 +1823,14 @@ msgstr ""
 #. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
 #: actions/deleteapplication.php:79 actions/editapplication.php:78
-#: actions/showapplication.php:90
+#: actions/showapplication.php:94
 msgid "You are not the owner of this application."
 msgstr ""
 
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
-#: actions/newapplication.php:112 actions/showapplication.php:113
-#: lib/action.php:1422
+#: actions/newapplication.php:112 actions/showapplication.php:118
+#: lib/action.php:1425
 msgid "There was a problem with your session token."
 msgstr ""
 
@@ -1860,12 +1850,12 @@ msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting an application.
 #: actions/deleteapplication.php:161
-msgid "Do not delete this application."
+msgid "Do not delete this application"
 msgstr ""
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
 #: actions/deleteapplication.php:167
-msgid "Delete this application."
+msgid "Delete this application"
 msgstr ""
 
 #. TRANS: Client error when trying to delete group while not logged in.
@@ -1916,12 +1906,12 @@ msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting a group.
 #: actions/deletegroup.php:224
-msgid "Do not delete this group."
+msgid "Do not delete this group"
 msgstr ""
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
 #: actions/deletegroup.php:231
-msgid "Delete this group."
+msgid "Delete this group"
 msgstr ""
 
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
@@ -1929,15 +1919,13 @@ msgstr ""
 #. TRANS: Client error displayed when trying to mark a notice as favorite without being logged in.
 #. TRANS: Client error displayed trying to block a user from a group while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
-#. TRANS: Client error displayed trying to log out when not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
-#. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
 #. TRANS: Client error displayed when trying to change user options while not logged in.
 #: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
-#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:70
+#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
-#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:98
+#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
 #: lib/adminpanelaction.php:71 lib/profileformaction.php:63
 #: lib/settingsaction.php:72
@@ -1964,12 +1952,12 @@ msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting a notice.
 #: actions/deletenotice.php:159
-msgid "Do not delete this notice."
+msgid "Do not delete this notice"
 msgstr ""
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:166
-msgid "Delete this notice."
+#: actions/deletenotice.php:166 lib/noticelist.php:673
+msgid "Delete this notice"
 msgstr ""
 
 #. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
@@ -2002,12 +1990,13 @@ msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting a user.
 #: actions/deleteuser.php:158
-msgid "Do not delete this user."
+msgid "Do not delete this user"
 msgstr ""
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
-#: actions/deleteuser.php:165
-msgid "Delete this user."
+#. TRANS: Description of form for deleting a user.
+#: actions/deleteuser.php:165 lib/deleteuserform.php:75
+msgid "Delete this user"
 msgstr ""
 
 #. TRANS: Message used as title for design settings for the site.
@@ -2169,18 +2158,21 @@ msgid "Use defaults"
 msgstr ""
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:720
-msgid "Restore default designs."
+#. TRANS: Title for button on profile design page to reset all colour settings to default.
+#: actions/designadminpanel.php:720 lib/designsettings.php:259
+msgid "Restore default designs"
 msgstr ""
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:728
-msgid "Reset back to default."
+#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
+#: actions/designadminpanel.php:728 lib/designsettings.php:267
+msgid "Reset back to default"
 msgstr ""
 
 #. TRANS: Title for button for saving theme settings.
-#: actions/designadminpanel.php:736
-msgid "Save design."
+#. TRANS: Title for button on profile design page to save settings.
+#: actions/designadminpanel.php:736 lib/designsettings.php:272
+msgid "Save design"
 msgstr ""
 
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
@@ -2212,7 +2204,7 @@ msgid "You must be logged in to edit an application."
 msgstr ""
 
 #. TRANS: Client error displayed trying to edit an application that does not exist.
-#: actions/editapplication.php:83 actions/showapplication.php:83
+#: actions/editapplication.php:83 actions/showapplication.php:87
 msgid "No such application."
 msgstr ""
 
@@ -2488,7 +2480,7 @@ msgid "Cannot normalize that email address."
 msgstr ""
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:393 actions/register.php:204
+#: actions/emailsettings.php:393 actions/register.php:212
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr ""
@@ -2560,21 +2552,18 @@ msgstr ""
 
 #. 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.
 #: actions/emailsettings.php:530 actions/emailsettings.php:554
-#: actions/smssettings.php:566 actions/smssettings.php:591
+#: actions/smssettings.php:565 actions/smssettings.php:588
 msgid "Could not update user record."
 msgstr ""
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
-#. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:534 actions/smssettings.php:570
+#: actions/emailsettings.php:534 actions/smssettings.php:568
 msgid "Incoming email address removed."
 msgstr ""
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
-#. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:558 actions/smssettings.php:595
+#: actions/emailsettings.php:558 actions/smssettings.php:591
 msgid "New incoming email address added."
 msgstr ""
 
@@ -2585,7 +2574,7 @@ msgstr ""
 
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
 #: actions/favor.php:95
-msgid "Disfavor favorite."
+msgid "Disfavor favorite"
 msgstr ""
 
 #. TRANS: Page title for first page of favorited notices.
@@ -2817,12 +2806,12 @@ msgstr ""
 
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
 #: actions/groupblock.php:191
-msgid "Do not block this user from this group."
+msgid "Do not block this user from this group"
 msgstr ""
 
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
 #: actions/groupblock.php:198
-msgid "Block this user from this group."
+msgid "Block this user from this group"
 msgstr ""
 
 #. TRANS: Server error displayed when trying to block a user from a group fails because of an application error.
@@ -2831,7 +2820,6 @@ msgid "Database error blocking user from group."
 msgstr ""
 
 #. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
-#. TRANS: Client error displayed trying to find a user by ID without providing an ID.
 #: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr ""
@@ -3007,10 +2995,8 @@ msgid "Group search"
 msgstr ""
 
 #. TRANS: Text on page where groups can be searched if no results were found for a query.
-#. TRANS: Text for notice search results is the query had no results.
-#. TRANS: Message on the "People search" page where a query has no results.
-#: actions/groupsearch.php:82 actions/noticesearch.php:122
-#: actions/peoplesearch.php:87
+#: actions/groupsearch.php:82 actions/noticesearch.php:117
+#: actions/peoplesearch.php:83
 msgid "No results."
 msgstr ""
 
@@ -3043,7 +3029,6 @@ msgid "User is not blocked from group."
 msgstr ""
 
 #. TRANS: Server error displayed when unblocking a user from a group fails because of an unknown error.
-#. TRANS: Server error displayed when removing a user block.
 #: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr ""
@@ -3126,8 +3111,7 @@ msgid "Publish a MicroID for my Jabber/Google Talk address."
 msgstr ""
 
 #. TRANS: Confirmation message for successful Instant Messaging preferences save.
-#. TRANS: Confirmation message after saving preferences.
-#: actions/imsettings.php:283 actions/othersettings.php:193
+#: actions/imsettings.php:283 actions/othersettings.php:192
 msgid "Preferences saved."
 msgstr ""
 
@@ -3379,7 +3363,7 @@ msgstr ""
 
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
-#: actions/leavegroup.php:103 lib/command.php:386
+#: actions/leavegroup.php:103 lib/command.php:398
 msgid "You are not a member of that group."
 msgstr ""
 
@@ -3501,51 +3485,49 @@ msgstr ""
 msgid "Save license settings"
 msgstr ""
 
-#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
-#: actions/login.php:97 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
 msgid "Already logged in."
 msgstr ""
 
-#: actions/login.php:142
+#: actions/login.php:148
 msgid "Incorrect username or password."
 msgstr ""
 
-#. TRANS: Server error displayed when a user object could not be created trying to login using "one time password login".
-#: actions/login.php:148 actions/otp.php:127
+#: actions/login.php:154 actions/otp.php:120
 msgid "Error setting user. You are probably not authorized."
 msgstr ""
 
-#: actions/login.php:202 actions/login.php:253
+#: actions/login.php:210 actions/login.php:263
 msgid "Login"
 msgstr ""
 
-#: actions/login.php:239
+#: actions/login.php:249
 msgid "Login to site"
 msgstr ""
 
-#: actions/login.php:248 actions/register.php:476
+#: actions/login.php:258 actions/register.php:490
 msgid "Remember me"
 msgstr ""
 
-#: actions/login.php:249 actions/register.php:478
+#: actions/login.php:259 actions/register.php:492
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 
-#: actions/login.php:259
+#: actions/login.php:269
 msgid "Lost or forgotten password?"
 msgstr ""
 
-#: actions/login.php:277
+#: actions/login.php:288
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
 msgstr ""
 
-#: actions/login.php:281
+#: actions/login.php:292
 msgid "Login with your username and password."
 msgstr ""
 
-#: actions/login.php:284
+#: actions/login.php:295
 #, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -3624,14 +3606,14 @@ msgid "New message"
 msgstr ""
 
 #. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
-#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:501
+#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:513
 msgid "You can't send a message to this user."
 msgstr ""
 
 #. TRANS: Command exception text shown when trying to send a direct message to another user without content.
 #. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
-#: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:478
-#: lib/command.php:581
+#: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:490
+#: lib/command.php:593
 msgid "No content!"
 msgstr ""
 
@@ -3640,7 +3622,7 @@ msgid "No recipient specified."
 msgstr ""
 
 #. TRANS: Error text shown when trying to send a direct message to self.
-#: actions/newmessage.php:167 lib/command.php:505
+#: actions/newmessage.php:167 lib/command.php:517
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
@@ -3651,7 +3633,7 @@ msgstr ""
 
 #. TRANS: Message given have sent a direct message to another user.
 #. TRANS: %s is the name of the other user.
-#: actions/newmessage.php:188 lib/command.php:513
+#: actions/newmessage.php:188 lib/command.php:525
 #, php-format
 msgid "Direct message to %s sent."
 msgstr ""
@@ -3668,56 +3650,44 @@ msgstr ""
 msgid "Notice posted"
 msgstr ""
 
-#. TRANS: Instructions for Notice search page.
-#. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/noticesearch.php:69
+#: actions/noticesearch.php:68
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
 "by spaces; they must be 3 characters or more."
 msgstr ""
 
-#. TRANS: Title of the page where users can search for notices.
-#: actions/noticesearch.php:80
+#: actions/noticesearch.php:78
 msgid "Text search"
 msgstr ""
 
-#. TRANS: Test in RSS notice search.
-#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearch.php:95
+#: actions/noticesearch.php:91
 #, php-format
 msgid "Search results for \"%1$s\" on %2$s"
 msgstr ""
 
-#. TRANS: Text for logged in users making a query for notices without results.
-#. TRANS: This message contains a Markdown link.
-#: actions/noticesearch.php:128
+#: actions/noticesearch.php:121
 #, php-format
 msgid ""
 "Be the first to [post on this topic](%%%%action.newnotice%%%%?"
 "status_textarea=%s)!"
 msgstr ""
 
-#. TRANS: Text for not logged in users making a query for notices without results.
-#. TRANS: This message contains Markdown links.
-#: actions/noticesearch.php:133
+#: actions/noticesearch.php:124
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and be the first to "
 "[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
 msgstr ""
 
-#. TRANS: RSS notice search feed title. %s is the query.
-#: actions/noticesearchrss.php:95
+#: actions/noticesearchrss.php:96
 #, php-format
 msgid "Updates with \"%s\""
 msgstr ""
 
-#. TRANS: RSS notice search feed description.
-#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearchrss.php:99
+#: actions/noticesearchrss.php:98
 #, php-format
-msgid "Updates matching search term \"%1$s\" on %2$s."
+msgid "Updates matching search term \"%1$s\" on %2$s!"
 msgstr ""
 
 #: actions/nudge.php:85
@@ -3756,30 +3726,30 @@ msgid "You have not registered any applications yet."
 msgstr ""
 
 #. TRANS: Title for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:70
+#: actions/oauthconnectionssettings.php:71
 msgid "Connected applications"
 msgstr ""
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:81
+#: actions/oauthconnectionssettings.php:83
 msgid "The following connections exist for your account."
 msgstr ""
 
 #. TRANS: Client error when trying to revoke access for an application while not being a user of it.
-#: actions/oauthconnectionssettings.php:166
+#: actions/oauthconnectionssettings.php:168
 msgid "You are not a user of that application."
 msgstr ""
 
 #. TRANS: Client error when revoking access has failed for some reason.
 #. TRANS: %s is the application ID revoking access failed for.
-#: actions/oauthconnectionssettings.php:181
+#: actions/oauthconnectionssettings.php:183
 #, php-format
 msgid "Unable to revoke access for application: %s."
 msgstr ""
 
 #. TRANS: Success message after revoking access for an application.
 #. TRANS: %1$s is the application name, %2$s is the first part of the user token.
-#: actions/oauthconnectionssettings.php:200
+#: actions/oauthconnectionssettings.php:202
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -3787,30 +3757,20 @@ msgid ""
 msgstr ""
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:211
+#: actions/oauthconnectionssettings.php:213
 msgid "You have not authorized any applications to use your account."
 msgstr ""
 
 #. TRANS: Note for developers in the OAuth connection settings form.
 #. TRANS: This message contains a Markdown link. Do not separate "](".
 #. TRANS: %s is the URL to the OAuth settings.
-#: actions/oauthconnectionssettings.php:231
+#: actions/oauthconnectionssettings.php:233
 #, php-format
 msgid ""
 "Are you a developer? [Register an OAuth client application](%s) to use with "
 "this instance of StatusNet."
 msgstr ""
 
-#: actions/oembed.php:64
-#, php-format
-msgid "\"%s\" not found."
-msgstr ""
-
-#: actions/oembed.php:76
-#, php-format
-msgid "Notice %s not found."
-msgstr ""
-
 #: actions/oembed.php:80 actions/shownotice.php:100
 msgid "Notice has no profile."
 msgstr ""
@@ -3820,16 +3780,6 @@ msgstr ""
 msgid "%1$s's status on %2$s"
 msgstr ""
 
-#: actions/oembed.php:95
-#, php-format
-msgid "Attachment %s not found."
-msgstr ""
-
-#: actions/oembed.php:136
-#, php-format
-msgid "\"%s\" not supported for oembed requests."
-msgstr ""
-
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
 #: actions/oembed.php:168
 #, php-format
@@ -3848,12 +3798,11 @@ msgstr ""
 msgid "Not a supported data format."
 msgstr ""
 
-#. TRANS: ShortName in the OpenSearch interface when trying to find users.
 #: actions/opensearch.php:64
 msgid "People Search"
 msgstr ""
 
-#: actions/opensearch.php:68
+#: actions/opensearch.php:67
 msgid "Notice Search"
 msgstr ""
 
@@ -3900,46 +3849,37 @@ msgstr ""
 msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr ""
 
-#. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
-#: actions/otp.php:70
+#: actions/otp.php:69
 msgid "No user ID specified."
 msgstr ""
 
-#. TRANS: Client error displayed trying to use "one time password login" without specifying a login token.
-#: actions/otp.php:86
+#: actions/otp.php:83
 msgid "No login token specified."
 msgstr ""
 
-#. TRANS: Client error displayed trying to use "one time password login" without requesting a login token.
-#: actions/otp.php:94
+#: actions/otp.php:90
 msgid "No login token requested."
 msgstr ""
 
-#. TRANS: Client error displayed trying to use "one time password login" while specifying an invalid login token.
-#: actions/otp.php:100
+#: actions/otp.php:95
 msgid "Invalid login token specified."
 msgstr ""
 
-#. TRANS: Client error displayed trying to use "one time password login" while specifying an expired login token.
-#: actions/otp.php:110
+#: actions/otp.php:104
 msgid "Login token expired."
 msgstr ""
 
-#. TRANS: Title for outbox for any but the fist page.
-#. TRANS: %1$s is the user nickname, %2$d is the page number.
-#: actions/outbox.php:57
+#: actions/outbox.php:58
 #, php-format
 msgid "Outbox for %1$s - page %2$d"
 msgstr ""
 
-#. TRANS: Title for first page of outbox.
 #: actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
 msgstr ""
 
-#. TRANS: Instructions for outbox.
-#: actions/outbox.php:103
+#: actions/outbox.php:104
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr ""
 
@@ -3965,42 +3905,40 @@ msgstr ""
 msgid "New password"
 msgstr ""
 
-#: actions/passwordsettings.php:109 actions/register.php:423
-msgid "6 or more characters."
+#: actions/passwordsettings.php:109
+msgid "6 or more characters"
 msgstr ""
 
-#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:264
-#: actions/register.php:427
-msgid "Same as password above."
+#: actions/passwordsettings.php:113
+msgid "Same as password above"
 msgstr ""
 
 #: actions/passwordsettings.php:117
 msgid "Change"
 msgstr ""
 
-#: actions/passwordsettings.php:153 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:238
 msgid "Password must be 6 or more characters."
 msgstr ""
 
-#: actions/passwordsettings.php:156 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:241
 msgid "Passwords don't match."
 msgstr ""
 
-#: actions/passwordsettings.php:164
+#: actions/passwordsettings.php:165
 msgid "Incorrect old password"
 msgstr ""
 
-#: actions/passwordsettings.php:180
+#: actions/passwordsettings.php:181
 msgid "Error saving user; invalid."
 msgstr ""
 
-#. TRANS: Reset password form validation error message.
-#: actions/passwordsettings.php:185 actions/recoverpassword.php:418
-msgid "Cannot save new password."
+#: actions/passwordsettings.php:186
+msgid "Can't save new password."
 msgstr ""
 
-#: actions/passwordsettings.php:191
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
 msgid "Password saved."
 msgstr ""
 
@@ -4274,17 +4212,14 @@ msgstr ""
 msgid "Save paths"
 msgstr ""
 
-#. TRANS: Instructions for the "People search" page.
-#. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/peoplesearch.php:54
+#: actions/peoplesearch.php:52
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
 "Separate the terms by spaces; they must be 3 characters or more."
 msgstr ""
 
-#. TRANS: Title of a page where users can search for other users.
-#: actions/peoplesearch.php:61
+#: actions/peoplesearch.php:58
 msgid "People search"
 msgstr ""
 
@@ -4324,14 +4259,14 @@ msgid "Profile information"
 msgstr ""
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109 actions/register.php:419
+#: actions/profilesettings.php:109 actions/register.php:433
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr ""
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for full group name (dt). Text hidden by default.
 #. TRANS: DT for full name in a profile.
-#: actions/profilesettings.php:113 actions/register.php:441
+#: actions/profilesettings.php:113 actions/register.php:455
 #: actions/showgroup.php:255 actions/tagother.php:104
 #: lib/groupeditform.php:150 lib/userprofile.php:156
 msgid "Full name"
@@ -4339,20 +4274,20 @@ msgstr ""
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:118 actions/register.php:446
+#: actions/profilesettings.php:118 actions/register.php:460
 #: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr ""
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:121 actions/register.php:448
+#: actions/profilesettings.php:121
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr ""
 
 #. TRANS: Tooltip for field label in form for profile settings. Plural
 #. TRANS: is decided by the number of characters available for the
 #. TRANS: biography (%d).
-#: actions/profilesettings.php:129 actions/register.php:457
+#: actions/profilesettings.php:129 actions/register.php:471
 #, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4360,29 +4295,28 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:135 actions/register.php:462
+#: actions/profilesettings.php:135 actions/register.php:476
 msgid "Describe yourself and your interests"
 msgstr ""
 
 #. TRANS: Text area label in form for profile settings where users can provide.
 #. TRANS: their biography.
-#: actions/profilesettings.php:139 actions/register.php:464
+#: actions/profilesettings.php:139 actions/register.php:478
 msgid "Bio"
 msgstr ""
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group location (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT for location in a profile.
-#: actions/profilesettings.php:145 actions/register.php:469
+#: actions/profilesettings.php:145 actions/register.php:483
 #: actions/showgroup.php:265 actions/tagother.php:112
-#: actions/userauthorization.php:174 lib/groupeditform.php:173
+#: actions/userauthorization.php:166 lib/groupeditform.php:173
 #: lib/userprofile.php:172
 msgid "Location"
 msgstr ""
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148
+#: actions/profilesettings.php:148 actions/register.php:485
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr ""
 
@@ -4402,8 +4336,7 @@ msgstr ""
 #. TRANS: Tooltip for field label in form for profile settings.
 #: actions/profilesettings.php:164
 msgid ""
-"Tags for yourself (letters, numbers, -, ., and _), comma- or space- "
-"separated."
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr ""
 
 #. TRANS: Dropdownlist label in form for profile settings.
@@ -4413,7 +4346,7 @@ msgstr ""
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
 #: actions/profilesettings.php:171
-msgid "Preferred language."
+msgid "Preferred language"
 msgstr ""
 
 #. TRANS: Dropdownlist label in form for profile settings.
@@ -4429,13 +4362,13 @@ msgstr ""
 #. TRANS: Checkbox label in form for profile settings.
 #: actions/profilesettings.php:189
 msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)."
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr ""
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Plural form is used based on the maximum number of allowed
 #. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:258 actions/register.php:221
+#: actions/profilesettings.php:258 actions/register.php:229
 #, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4454,9 +4387,9 @@ msgstr ""
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:291
+#: actions/profilesettings.php:291 actions/tagother.php:178
 #, php-format
-msgid "Invalid tag: \"%s\"."
+msgid "Invalid tag: \"%s\""
 msgstr ""
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
@@ -4551,12 +4484,6 @@ msgid ""
 "tool."
 msgstr ""
 
-#. TRANS: Public RSS feed description. %s is the StatusNet site name.
-#: actions/publicrss.php:106
-#, php-format
-msgid "%s updates from everyone."
-msgstr ""
-
 #. TRANS: Title for public tag cloud.
 #: actions/publictagcloud.php:57
 msgid "Public tag cloud"
@@ -4687,11 +4614,6 @@ msgstr ""
 msgid "Password recovery requested"
 msgstr ""
 
-#. TRANS: Title for password recovery page in password saved mode.
-#: actions/recoverpassword.php:229
-msgid "Password saved"
-msgstr ""
-
 #. TRANS: Title for password recovery page when an unknown action has been specified.
 #: actions/recoverpassword.php:232
 msgid "Unknown action"
@@ -4702,6 +4624,11 @@ msgstr ""
 msgid "6 or more characters, and do not forget it!"
 msgstr ""
 
+#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#: actions/recoverpassword.php:264 actions/register.php:441
+msgid "Same as password above."
+msgstr ""
+
 #. TRANS: Button text for password reset form.
 #. TRANS: Button text on profile design page to reset all colour settings to default without saving.
 #: actions/recoverpassword.php:268 lib/designsettings.php:264
@@ -4751,8 +4678,13 @@ msgstr ""
 msgid "Password and confirmation do not match."
 msgstr ""
 
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:418
+msgid "Cannot save new password."
+msgstr ""
+
 #. TRANS: Server error displayed when something does wrong with the user object during password reset.
-#: actions/recoverpassword.php:426 actions/register.php:248
+#: actions/recoverpassword.php:426 actions/register.php:256
 msgid "Error setting user."
 msgstr ""
 
@@ -4761,92 +4693,96 @@ msgstr ""
 msgid "New password successfully saved. You are now logged in."
 msgstr ""
 
-#: actions/register.php:87 actions/register.php:188 actions/register.php:399
+#: actions/register.php:92 actions/register.php:196 actions/register.php:413
 msgid "Sorry, only invited people can register."
 msgstr ""
 
-#: actions/register.php:94
+#: actions/register.php:99
 msgid "Sorry, invalid invitation code."
 msgstr ""
 
-#: actions/register.php:113
+#: actions/register.php:119
 msgid "Registration successful"
 msgstr ""
 
-#: actions/register.php:115 actions/register.php:497
+#: actions/register.php:121 actions/register.php:511
 msgid "Register"
 msgstr ""
 
-#: actions/register.php:135
+#: actions/register.php:142
 msgid "Registration not allowed."
 msgstr ""
 
-#: actions/register.php:201
-msgid "You cannot register if you don't agree to the license."
+#: actions/register.php:209
+msgid "You can't register if you don't agree to the license."
 msgstr ""
 
-#: actions/register.php:210
+#: actions/register.php:218
 msgid "Email address already exists."
 msgstr ""
 
-#: actions/register.php:243 actions/register.php:265
+#: actions/register.php:251 actions/register.php:273
 msgid "Invalid username or password."
 msgstr ""
 
-#: actions/register.php:340
+#: actions/register.php:351
 msgid ""
 "With this form you can create a new account. You can then post notices and "
-"link up to friends and colleagues."
+"link up to friends and colleagues. "
+msgstr ""
+
+#: actions/register.php:437
+msgid "6 or more characters."
 msgstr ""
 
 #. TRANS: Link description in user account settings menu.
-#: actions/register.php:431 actions/register.php:435
+#: actions/register.php:445 actions/register.php:449
 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
 msgid "Email"
 msgstr ""
 
-#: actions/register.php:432 actions/register.php:436
-msgid "Used only for updates, announcements, and password recovery."
+#: actions/register.php:446 actions/register.php:450
+msgid "Used only for updates, announcements, and password recovery"
 msgstr ""
 
-#: actions/register.php:443
-msgid "Longer name, preferably your \"real\" name."
+#: actions/register.php:457
+msgid "Longer name, preferably your \"real\" name"
 msgstr ""
 
-#: actions/register.php:471
-msgid "Where you are, like \"City, State (or Region), Country\"."
+#: actions/register.php:462
+msgid "URL of your homepage, blog, or profile on another site"
 msgstr ""
 
-#: actions/register.php:510
+#: actions/register.php:523
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
 msgstr ""
 
-#: actions/register.php:520
+#: actions/register.php:533
 #, php-format
 msgid "My text and files are copyright by %1$s."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:524
+#: actions/register.php:537
 msgid "My text and files remain under my own copyright."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:527
+#: actions/register.php:540
 msgid "All rights reserved."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:532
+#: actions/register.php:545
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
 "email address, IM address, and phone number."
 msgstr ""
 
-#: actions/register.php:573
+#: actions/register.php:588
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -4865,7 +4801,7 @@ msgid ""
 "Thanks for signing up and we hope you enjoy using this service."
 msgstr ""
 
-#: actions/register.php:597
+#: actions/register.php:612
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -4892,7 +4828,7 @@ msgid "User nickname"
 msgstr ""
 
 #: actions/remotesubscribe.php:129
-msgid "Nickname of the user you want to follow."
+msgid "Nickname of the user you want to follow"
 msgstr ""
 
 #: actions/remotesubscribe.php:132
@@ -4900,7 +4836,7 @@ msgid "Profile URL"
 msgstr ""
 
 #: actions/remotesubscribe.php:133
-msgid "URL of your profile on another compatible microblogging service."
+msgid "URL of your profile on another compatible microblogging service"
 msgstr ""
 
 #. TRANS: Link text for link that will subscribe to a remote profile.
@@ -4910,7 +4846,7 @@ msgid "Subscribe"
 msgstr ""
 
 #: actions/remotesubscribe.php:158
-msgid "Invalid profile URL (bad format)."
+msgid "Invalid profile URL (bad format)"
 msgstr ""
 
 #: actions/remotesubscribe.php:167
@@ -4949,7 +4885,6 @@ msgstr ""
 msgid "Repeated!"
 msgstr ""
 
-#. TRANS: RSS reply feed title. %s is a user nickname.
 #. TRANS: Tooltip for personal group navigation menu option when logged in for viewing @-replies.
 #: actions/replies.php:126 actions/repliesrss.php:68
 #: lib/personalgroupnav.php:109
@@ -4998,11 +4933,9 @@ msgid ""
 "newnotice%%%%?status_textarea=%3$s)."
 msgstr ""
 
-#. TRANS: RSS reply feed description.
-#. TRANS: %1$s is a user nickname, %2$s is the StatusNet site name.
-#: actions/repliesrss.php:74
+#: actions/repliesrss.php:72
 #, php-format
-msgid "Replies to %1$s on %2$s."
+msgid "Replies to %1$s on %2$s!"
 msgstr ""
 
 #. TRANS: Client exception displayed when trying to restore an account while not logged in.
@@ -5097,7 +5030,7 @@ msgstr ""
 msgid "User doesn't have this role."
 msgstr ""
 
-#: actions/rsd.php:142 actions/version.php:159
+#: actions/rsd.php:146 actions/version.php:159
 msgid "StatusNet"
 msgstr ""
 
@@ -5139,93 +5072,93 @@ msgstr ""
 msgid "Save site settings"
 msgstr ""
 
-#: actions/showapplication.php:78
+#: actions/showapplication.php:82
 msgid "You must be logged in to view an application."
 msgstr ""
 
-#: actions/showapplication.php:151
+#: actions/showapplication.php:157
 msgid "Application profile"
 msgstr ""
 
 #. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:153 lib/applicationeditform.php:177
+#: actions/showapplication.php:159 lib/applicationeditform.php:177
 msgid "Icon"
 msgstr ""
 
 #. TRANS: Form input field label for application name.
-#: actions/showapplication.php:163 actions/version.php:197
+#: actions/showapplication.php:169 actions/version.php:197
 #: lib/applicationeditform.php:190
 msgid "Name"
 msgstr ""
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:172 lib/applicationeditform.php:227
+#: actions/showapplication.php:178 lib/applicationeditform.php:227
 msgid "Organization"
 msgstr ""
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:181 actions/version.php:200
+#: actions/showapplication.php:187 actions/version.php:200
 #: lib/applicationeditform.php:208 lib/groupeditform.php:168
 msgid "Description"
 msgstr ""
 
 #. TRANS: Header for group statistics on a group page (h2).
 #. TRANS: H2 text for user statistics.
-#: actions/showapplication.php:186 actions/showgroup.php:460
+#: actions/showapplication.php:192 actions/showgroup.php:460
 #: lib/profileaction.php:205
 msgid "Statistics"
 msgstr ""
 
-#: actions/showapplication.php:197
+#: actions/showapplication.php:203
 #, php-format
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr ""
 
-#: actions/showapplication.php:207
+#: actions/showapplication.php:213
 msgid "Application actions"
 msgstr ""
 
-#: actions/showapplication.php:230
+#: actions/showapplication.php:236
 msgid "Reset key & secret"
 msgstr ""
 
 #. TRANS: Title of form for deleting a user.
-#: actions/showapplication.php:246 lib/deletegroupform.php:121
+#: actions/showapplication.php:252 lib/deletegroupform.php:121
 #: lib/deleteuserform.php:64 lib/noticelist.php:673
 msgid "Delete"
 msgstr ""
 
-#: actions/showapplication.php:255
+#: actions/showapplication.php:261
 msgid "Application info"
 msgstr ""
 
-#: actions/showapplication.php:257
+#: actions/showapplication.php:263
 msgid "Consumer key"
 msgstr ""
 
-#: actions/showapplication.php:262
+#: actions/showapplication.php:268
 msgid "Consumer secret"
 msgstr ""
 
-#: actions/showapplication.php:267
+#: actions/showapplication.php:273
 msgid "Request token URL"
 msgstr ""
 
-#: actions/showapplication.php:272
+#: actions/showapplication.php:278
 msgid "Access token URL"
 msgstr ""
 
-#: actions/showapplication.php:277
+#: actions/showapplication.php:283
 msgid "Authorize URL"
 msgstr ""
 
-#: actions/showapplication.php:282
+#: actions/showapplication.php:288
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
 msgstr ""
 
-#: actions/showapplication.php:302
+#: actions/showapplication.php:309
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr ""
 
@@ -5310,18 +5243,16 @@ msgid "Group profile"
 msgstr ""
 
 #. TRANS: Label for group URL (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT for URL in a profile.
 #: actions/showgroup.php:273 actions/tagother.php:118
-#: actions/userauthorization.php:184 lib/userprofile.php:186
+#: actions/userauthorization.php:175 lib/userprofile.php:186
 msgid "URL"
 msgstr ""
 
 #. TRANS: Label for group description or group note (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page where bio is displayed.
 #. TRANS: DT for note in a profile.
 #: actions/showgroup.php:285 actions/tagother.php:128
-#: actions/userauthorization.php:197 lib/userprofile.php:204
+#: actions/userauthorization.php:187 lib/userprofile.php:204
 msgid "Note"
 msgstr ""
 
@@ -5457,7 +5388,7 @@ msgid "%1$s tagged %2$s"
 msgstr ""
 
 #. TRANS: Page title showing tagged notices in one user's stream.
-#. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
+#. TRANS: %1$s is the username, %2$s is the hash tag, %1$d is the page number.
 #: actions/showstream.php:74
 #, php-format
 msgid "%1$s tagged %2$s, page %3$d"
@@ -5689,7 +5620,7 @@ msgstr ""
 
 #. TRANS: Title for button to save site notice in admin panel.
 #: actions/sitenoticeadminpanel.php:201
-msgid "Save site notice."
+msgid "Save site notice"
 msgstr ""
 
 #. TRANS: Title for SMS settings.
@@ -5747,7 +5678,7 @@ msgstr ""
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
 #: actions/smssettings.php:152
-msgid "Phone number, no punctuation or spaces, with area code."
+msgid "Phone number, no punctuation or spaces, with area code"
 msgstr ""
 
 #. TRANS: Form legend for SMS preferences form.
@@ -5908,19 +5839,15 @@ msgstr ""
 msgid "Could not save subscription."
 msgstr ""
 
-#. TRANS: Client error displayed trying to perform any request method other than POST.
-#. TRANS: Do not translate POST.
 #: actions/subscribe.php:77
 msgid "This action only accepts POST requests."
 msgstr ""
 
-#. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
-#: actions/subscribe.php:121
+#: actions/subscribe.php:117
 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
 msgstr ""
 
-#. TRANS: Page title when subscription succeeded.
-#: actions/subscribe.php:149
+#: actions/subscribe.php:145
 msgid "Subscribed"
 msgstr ""
 
@@ -6070,9 +5997,8 @@ msgstr ""
 msgid "User profile"
 msgstr ""
 
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT element in area for user avatar.
-#: actions/tagother.php:81 actions/userauthorization.php:138
+#: actions/tagother.php:81 actions/userauthorization.php:132
 #: lib/userprofile.php:108
 msgid "Photo"
 msgstr ""
@@ -6087,11 +6013,6 @@ msgid ""
 "separated"
 msgstr ""
 
-#: actions/tagother.php:178
-#, php-format
-msgid "Invalid tag: \"%s\""
-msgstr ""
-
 #: actions/tagother.php:193
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
@@ -6105,7 +6026,6 @@ msgstr ""
 msgid "No such tag."
 msgstr ""
 
-#. TRANS: Client error displayed when trying to unblock a non-blocked user.
 #: actions/unblock.php:59
 msgid "You haven't blocked that user."
 msgstr ""
@@ -6126,7 +6046,7 @@ msgstr ""
 msgid "Unsubscribed"
 msgstr ""
 
-#: actions/updateprofile.php:64
+#: actions/updateprofile.php:64 actions/userauthorization.php:337
 #, php-format
 msgid ""
 "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
@@ -6157,7 +6077,7 @@ msgstr ""
 #. TRANS: users in user admin panel. %1$s is the invalid nickname.
 #: actions/useradminpanel.php:166
 #, php-format
-msgid "Invalid default subscripton: \"%1$s\" is not a user."
+msgid "Invalid default subscripton: '%1$s' is not a user."
 msgstr ""
 
 #. TRANS: Link description in user account settings menu.
@@ -6217,136 +6137,102 @@ msgstr ""
 
 #. TRANS: Title for button to save user settings in user admin panel.
 #: actions/useradminpanel.php:302
-msgid "Save user settings."
+msgid "Save user settings"
 msgstr ""
 
-#. TRANS: Page title.
-#: actions/userauthorization.php:109
+#: actions/userauthorization.php:105
 msgid "Authorize subscription"
 msgstr ""
 
-#. TRANS: Page notice on "Auhtorize subscription" page.
-#: actions/userauthorization.php:115
+#: actions/userauthorization.php:110
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
 "user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
-"click \"Reject\"."
+"click “Reject”."
 msgstr ""
 
-#. TRANS: DT element on Authorise Subscription page where license is displayed.
 #. TRANS: Menu item for site administration
-#: actions/userauthorization.php:207 actions/version.php:167
+#: actions/userauthorization.php:196 actions/version.php:167
 #: lib/adminpanelaction.php:403
 msgid "License"
 msgstr ""
 
-#. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:229
-msgctxt "BUTTON"
+#: actions/userauthorization.php:217
 msgid "Accept"
 msgstr ""
 
-#. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:231
-msgid "Subscribe to this user."
+#: actions/userauthorization.php:218 lib/subscribeform.php:115
+#: lib/subscribeform.php:139
+msgid "Subscribe to this user"
 msgstr ""
 
-#. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:233
-msgctxt "BUTTON"
+#: actions/userauthorization.php:219
 msgid "Reject"
 msgstr ""
 
-#. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:235
-msgid "Reject this subscription."
+#: actions/userauthorization.php:220
+msgid "Reject this subscription"
 msgstr ""
 
-#. TRANS: Client error displayed for an empty authorisation request.
-#: actions/userauthorization.php:248
+#: actions/userauthorization.php:232
 msgid "No authorization request!"
 msgstr ""
 
-#. TRANS: Accept message header from Authorise subscription page.
-#: actions/userauthorization.php:271
+#: actions/userauthorization.php:254
 msgid "Subscription authorized"
 msgstr ""
 
-#: actions/userauthorization.php:274
+#: actions/userauthorization.php:256
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to authorize the "
 "subscription. Your subscription token is:"
 msgstr ""
 
-#. TRANS: Reject message header from Authorise subscription page.
-#: actions/userauthorization.php:285
+#: actions/userauthorization.php:266
 msgid "Subscription rejected"
 msgstr ""
 
-#: actions/userauthorization.php:288
+#: actions/userauthorization.php:268
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to fully reject the "
 "subscription."
 msgstr ""
 
-#. TRANS: Exception thrown when no valid user is found for an authorisation request.
-#. TRANS: %s is a listener URI.
-#: actions/userauthorization.php:325
+#: actions/userauthorization.php:303
 #, php-format
-msgid "Listener URI \"%s\" not found here."
+msgid "Listener URI ‘%s’ not found here."
 msgstr ""
 
-#. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:332
+#: actions/userauthorization.php:308
 #, php-format
-msgid "Listenee URI \"%s\" is too long."
+msgid "Listenee URI ‘%s’ is too long."
 msgstr ""
 
-#. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:340
+#: actions/userauthorization.php:314
 #, php-format
-msgid "Listenee URI \"%s\" is a local user."
+msgid "Listenee URI ‘%s’ is a local user."
 msgstr ""
 
-#. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
-#. TRANS: %s is a profile URL.
-#: actions/userauthorization.php:358
+#: actions/userauthorization.php:329
 #, php-format
-msgid "Profile URL \"%s\" is for a local user."
+msgid "Profile URL ‘%s’ is for a local user."
 msgstr ""
 
-#. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
-#. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
-#: actions/userauthorization.php:368
+#: actions/userauthorization.php:345
 #, php-format
-msgid ""
-"Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
-"\"."
+msgid "Avatar URL ‘%s’ is not valid."
 msgstr ""
 
-#. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:378
+#: actions/userauthorization.php:350
 #, php-format
-msgid "Avatar URL \"%s\" is not valid."
+msgid "Can’t read avatar URL ‘%s’."
 msgstr ""
 
-#. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:385
+#: actions/userauthorization.php:355
 #, php-format
-msgid "Cannot read avatar URL \"%s\"."
-msgstr ""
-
-#. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:392
-#, php-format
-msgid "Wrong image type for avatar URL \"%s\"."
+msgid "Wrong image type for avatar URL ‘%s’."
 msgstr ""
 
 #. TRANS: Page title for profile design page.
@@ -6440,7 +6326,7 @@ msgid "Plugins"
 msgstr ""
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:898
+#: actions/version.php:198 lib/action.php:901
 msgid "Version"
 msgstr ""
 
@@ -6640,14 +6526,14 @@ msgstr ""
 
 #. TRANS: Server exception thrown when a reply cannot be saved.
 #. TRANS: %1$d is a notice ID, %2$d is the ID of the mentioned user.
-#: classes/Notice.php:1142
+#: classes/Notice.php:1144
 #, php-format
 msgid "Could not save reply for %1$d, %2$d."
 msgstr ""
 
 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1661
+#: classes/Notice.php:1663
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr ""
@@ -6661,14 +6547,14 @@ msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:775
+#: classes/Profile.php:779
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:784
+#: classes/Profile.php:788
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -6985,53 +6871,53 @@ msgid "Page notice"
 msgstr ""
 
 #. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:871
+#: lib/action.php:874
 msgid "Secondary site navigation"
 msgstr ""
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:877
+#: lib/action.php:880
 msgid "Help"
 msgstr ""
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:880
+#: lib/action.php:883
 msgid "About"
 msgstr ""
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:883
+#: lib/action.php:886
 msgid "FAQ"
 msgstr ""
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:888
+#: lib/action.php:891
 msgid "TOS"
 msgstr ""
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:892
+#: lib/action.php:895
 msgid "Privacy"
 msgstr ""
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:895
+#: lib/action.php:898
 msgid "Source"
 msgstr ""
 
 #. TRANS: Secondary navigation menu option leading to e-mail contact information on the
 #. TRANS: StatusNet site, where to report bugs, ...
-#: lib/action.php:902
+#: lib/action.php:905
 msgid "Contact"
 msgstr ""
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:905
+#: lib/action.php:908
 msgid "Badge"
 msgstr ""
 
 #. TRANS: DT element for StatusNet software license.
-#: lib/action.php:934
+#: lib/action.php:937
 msgid "StatusNet software license"
 msgstr ""
 
@@ -7039,7 +6925,7 @@ msgstr ""
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:941
+#: lib/action.php:944
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7047,7 +6933,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:944
+#: lib/action.php:947
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr ""
@@ -7056,7 +6942,7 @@ msgstr ""
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:951
+#: lib/action.php:954
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7065,50 +6951,50 @@ msgid ""
 msgstr ""
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:967
+#: lib/action.php:970
 msgid "Site content license"
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:974
+#: lib/action.php:977
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:981
+#: lib/action.php:984
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:985
+#: lib/action.php:988
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:1017
+#: lib/action.php:1020
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
 
 #. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1353
+#: lib/action.php:1356
 msgid "Pagination"
 msgstr ""
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1364
+#: lib/action.php:1367
 msgid "After"
 msgstr ""
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1374
+#: lib/action.php:1377
 msgid "Before"
 msgstr ""
 
@@ -7303,23 +7189,19 @@ msgstr ""
 msgid "No application for that consumer key."
 msgstr ""
 
-#: lib/apiauth.php:202 lib/apiauth.php:284
-msgid "Not allowed to use API."
-msgstr ""
-
 #. TRANS: OAuth exception given when an incorrect access token was given for a user.
-#: lib/apiauth.php:225
+#: lib/apiauth.php:219
 msgid "Bad access token."
 msgstr ""
 
 #. TRANS: OAuth exception given when no user was found for a given token (no token was found).
-#: lib/apiauth.php:230
+#: lib/apiauth.php:224
 msgid "No user for that token."
 msgstr ""
 
 #. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel".
 #. TRANS: Client error thrown when authentication fails.
-#: lib/apiauth.php:272 lib/apiauth.php:302
+#: lib/apiauth.php:266 lib/apiauth.php:293
 msgid "Could not authenticate you."
 msgstr ""
 
@@ -7518,11 +7400,6 @@ msgstr ""
 msgid "Block"
 msgstr ""
 
-#. TRANS: Description of the form to block a user.
-#: lib/blockform.php:79
-msgid "Block this user"
-msgstr ""
-
 #. TRANS: Title for command results.
 #: lib/channel.php:160 lib/channel.php:181
 msgid "Command results"
@@ -7550,7 +7427,7 @@ msgstr ""
 
 #. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
 #. TRANS: Error text shown when a last user notice is requested and it does not exist.
-#: lib/command.php:99 lib/command.php:630
+#: lib/command.php:99 lib/command.php:642
 msgid "User has no last notice."
 msgstr ""
 
@@ -7597,35 +7474,40 @@ msgid ""
 "Notices: %3$s"
 msgstr ""
 
+#. TRANS: Error message text shown when a favorite could not be set because it has already been favorited.
+#: lib/command.php:298
+msgid "Could not create favorite: already favorited."
+msgstr ""
+
 #. TRANS: Text shown when a notice has been marked as favourite successfully.
-#: lib/command.php:312
+#: lib/command.php:324
 msgid "Notice marked as fave."
 msgstr ""
 
 #. TRANS: Message given having added a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:357
+#: lib/command.php:369
 #, php-format
 msgid "%1$s joined group %2$s."
 msgstr ""
 
 #. TRANS: Message given having removed a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:405
+#: lib/command.php:417
 #, php-format
 msgid "%1$s left group %2$s."
 msgstr ""
 
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: lib/command.php:426
+#: lib/command.php:438
 #, php-format
 msgctxt "WHOIS"
 msgid "%1$s (%2$s)"
 msgstr ""
 
 #. TRANS: Whois output. %s is the full name of the queried user.
-#: lib/command.php:430
+#: lib/command.php:442
 #, php-format
 msgid "Fullname: %s"
 msgstr ""
@@ -7633,7 +7515,7 @@ msgstr ""
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a location.
-#: lib/command.php:434 lib/mail.php:270
+#: lib/command.php:446 lib/mail.php:270
 #, php-format
 msgid "Location: %s"
 msgstr ""
@@ -7641,20 +7523,20 @@ msgstr ""
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a homepage.
-#: lib/command.php:438 lib/mail.php:274
+#: lib/command.php:450 lib/mail.php:274
 #, php-format
 msgid "Homepage: %s"
 msgstr ""
 
 #. TRANS: Whois output. %s is the bio information of the queried user.
-#: lib/command.php:442
+#: lib/command.php:454
 #, php-format
 msgid "About: %s"
 msgstr ""
 
 #. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).
 #. TRANS: %s is a remote profile.
-#: lib/command.php:471
+#: lib/command.php:483
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
@@ -7663,7 +7545,7 @@ msgstr ""
 
 #. TRANS: Message given if content is too long. %1$sd is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:488
+#: lib/command.php:500
 #, php-format
 msgid "Message too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
@@ -7671,25 +7553,25 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Error text shown sending a direct message fails with an unknown reason.
-#: lib/command.php:516
+#: lib/command.php:528
 msgid "Error sending direct message."
 msgstr ""
 
 #. TRANS: Message given having repeated a notice from another user.
 #. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:553
+#: lib/command.php:565
 #, php-format
 msgid "Notice from %s repeated."
 msgstr ""
 
 #. TRANS: Error text shown when repeating a notice fails with an unknown reason.
-#: lib/command.php:556
+#: lib/command.php:568
 msgid "Error repeating notice."
 msgstr ""
 
 #. TRANS: Message given if content of a notice for a reply is too long. %1$d is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:591
+#: lib/command.php:603
 #, php-format
 msgid "Notice too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Notice too long - maximum is %1$d characters, you sent %2$d."
@@ -7698,100 +7580,100 @@ msgstr[1] ""
 
 #. TRANS: Text shown having sent a reply to a notice successfully.
 #. TRANS: %s is the nickname of the user of the notice the reply was sent to.
-#: lib/command.php:604
+#: lib/command.php:616
 #, php-format
 msgid "Reply to %s sent."
 msgstr ""
 
 #. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
-#: lib/command.php:607
+#: lib/command.php:619
 msgid "Error saving notice."
 msgstr ""
 
 #. TRANS: Error text shown when no username was provided when issuing a subscribe command.
-#: lib/command.php:654
+#: lib/command.php:666
 msgid "Specify the name of the user to subscribe to."
 msgstr ""
 
 #. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
-#: lib/command.php:663
+#: lib/command.php:675
 msgid "Can't subscribe to OMB profiles by command."
 msgstr ""
 
 #. TRANS: Text shown after having subscribed to another user successfully.
 #. TRANS: %s is the name of the user the subscription was requested for.
-#: lib/command.php:671
+#: lib/command.php:683
 #, php-format
 msgid "Subscribed to %s."
 msgstr ""
 
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.
-#: lib/command.php:692 lib/command.php:803
+#: lib/command.php:704 lib/command.php:815
 msgid "Specify the name of the user to unsubscribe from."
 msgstr ""
 
 #. TRANS: Text shown after having unsubscribed from another user successfully.
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:703
+#: lib/command.php:715
 #, php-format
 msgid "Unsubscribed from %s."
 msgstr ""
 
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
-#: lib/command.php:723 lib/command.php:749
+#: lib/command.php:735 lib/command.php:761
 msgid "Command not yet implemented."
 msgstr ""
 
 #. TRANS: Text shown when issuing the command "off" successfully.
-#: lib/command.php:727
+#: lib/command.php:739
 msgid "Notification off."
 msgstr ""
 
 #. TRANS: Error text shown when the command "off" fails for an unknown reason.
-#: lib/command.php:730
+#: lib/command.php:742
 msgid "Can't turn off notification."
 msgstr ""
 
 #. TRANS: Text shown when issuing the command "on" successfully.
-#: lib/command.php:753
+#: lib/command.php:765
 msgid "Notification on."
 msgstr ""
 
 #. TRANS: Error text shown when the command "on" fails for an unknown reason.
-#: lib/command.php:756
+#: lib/command.php:768
 msgid "Can't turn on notification."
 msgstr ""
 
 #. TRANS: Error text shown when issuing the login command while login is disabled.
-#: lib/command.php:770
+#: lib/command.php:782
 msgid "Login command is disabled."
 msgstr ""
 
 #. TRANS: Text shown after issuing the login command successfully.
 #. TRANS: %s is a logon link..
-#: lib/command.php:783
+#: lib/command.php:795
 #, php-format
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
 
 #. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:812
+#: lib/command.php:824
 #, php-format
 msgid "Unsubscribed %s."
 msgstr ""
 
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
-#: lib/command.php:830
+#: lib/command.php:842
 msgid "You are not subscribed to anyone."
 msgstr ""
 
 #. TRANS: Text shown after requesting other users a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
-#: lib/command.php:835
+#: lib/command.php:847
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] ""
@@ -7799,14 +7681,14 @@ msgstr[1] ""
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user
 #. TRANS: (followers) without having any subscribers.
-#: lib/command.php:857
+#: lib/command.php:869
 msgid "No one is subscribed to you."
 msgstr ""
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
-#: lib/command.php:862
+#: lib/command.php:874
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] ""
@@ -7814,21 +7696,21 @@ msgstr[1] ""
 
 #. TRANS: Text shown after requesting groups a user is subscribed to without having
 #. TRANS: any group subscriptions.
-#: lib/command.php:884
+#: lib/command.php:896
 msgid "You are not a member of any groups."
 msgstr ""
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
-#: lib/command.php:889
+#: lib/command.php:901
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-#: lib/command.php:904
+#: lib/command.php:916
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -7929,11 +7811,6 @@ msgstr ""
 msgid "Database error"
 msgstr ""
 
-#. TRANS: Description of form for deleting a user.
-#: lib/deleteuserform.php:75
-msgid "Delete this user"
-msgstr ""
-
 #. TRANS: Label in form on profile design page.
 #. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
 #: lib/designsettings.php:108
@@ -7968,21 +7845,6 @@ msgstr ""
 msgid "Use defaults"
 msgstr ""
 
-#. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: lib/designsettings.php:259
-msgid "Restore default designs"
-msgstr ""
-
-#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: lib/designsettings.php:267
-msgid "Reset back to default"
-msgstr ""
-
-#. TRANS: Title for button on profile design page to save settings.
-#: lib/designsettings.php:272
-msgid "Save design"
-msgstr ""
-
 #. TRANS: Error message displayed if design settings could not be saved.
 #. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
 #: lib/designsettings.php:405 lib/designsettings.php:427
@@ -8747,10 +8609,6 @@ msgstr ""
 msgid "Reply"
 msgstr ""
 
-#: lib/noticelist.php:673
-msgid "Delete this notice"
-msgstr ""
-
 #: lib/noticelist.php:691
 msgid "Notice repeated"
 msgstr ""
@@ -9026,10 +8884,6 @@ msgstr ""
 msgid "Invite friends and colleagues to join you on %s"
 msgstr ""
 
-#: lib/subscribeform.php:115 lib/subscribeform.php:139
-msgid "Subscribe to this user"
-msgstr ""
-
 #: lib/subscriberspeopleselftagcloudsection.php:48
 #: lib/subscriptionspeopleselftagcloudsection.php:48
 msgid "People Tagcloud as self-tagged"
@@ -9197,22 +9051,18 @@ msgctxt "role"
 msgid "Moderator"
 msgstr ""
 
-#: lib/util.php:305
-msgid "Not allowed to log in."
-msgstr ""
-
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1309
+#: lib/util.php:1306
 msgid "a few seconds ago"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1312
+#: lib/util.php:1309
 msgid "about a minute ago"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1316
+#: lib/util.php:1313
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
@@ -9220,12 +9070,12 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1319
+#: lib/util.php:1316
 msgid "about an hour ago"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1323
+#: lib/util.php:1320
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
@@ -9233,12 +9083,12 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1326
+#: lib/util.php:1323
 msgid "about a day ago"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1330
+#: lib/util.php:1327
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
@@ -9246,12 +9096,12 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1333
+#: lib/util.php:1330
 msgid "about a month ago"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1337
+#: lib/util.php:1334
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
@@ -9259,7 +9109,7 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1340
+#: lib/util.php:1337
 msgid "about a year ago"
 msgstr ""
 
diff --git a/locale/sv/LC_MESSAGES/statusnet.po b/locale/sv/LC_MESSAGES/statusnet.po
index 7db6444adf..1edde09543 100644
--- a/locale/sv/LC_MESSAGES/statusnet.po
+++ b/locale/sv/LC_MESSAGES/statusnet.po
@@ -5,6 +5,7 @@
 # Author: Kjell
 # Author: McDutchie
 # Author: Nghtwlkr
+# Author: WikiPhoenix
 # --
 # This file is distributed under the same license as the StatusNet package.
 #
@@ -12,17 +13,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-24 10:32+0000\n"
-"PO-Revision-Date: 2011-02-24 10:37:39+0000\n"
+"POT-Creation-Date: 2011-03-03 15:58+0000\n"
+"PO-Revision-Date: 2011-03-03 16:01:21+0000\n"
 "Language-Team: Swedish <http://translatewiki.net/wiki/Portal:sv>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r82712); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: sv\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-02-17 11:39:54+0000\n"
+"X-POT-Import-Date: 2011-02-25 23:49:23+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -135,11 +136,7 @@ msgstr "Ingen sådan sida"
 #. 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 use "one time password login" without using an existing user.
-#. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
-#. TRANS: Client error displayed trying to find a user by ID for a non-existing ID.
-#. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when calling a profile action without specifying a user.
 #: actions/all.php:80 actions/allrss.php:69
@@ -157,12 +154,12 @@ msgstr "Ingen sådan sida"
 #: actions/apitimelinementions.php:77 actions/apitimelineuser.php:79
 #: actions/avatarbynickname.php:79 actions/favoritesrss.php:72
 #: actions/foaf.php:42 actions/foaf.php:61 actions/hcard.php:67
-#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:78
+#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
 #: actions/remotesubscribe.php:144 actions/remotesubscribe.php:153
-#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:113
-#: actions/showfavorites.php:106 actions/userbyid.php:75
+#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
+#: actions/showfavorites.php:106 actions/userbyid.php:74
 #: actions/usergroups.php:93 actions/userrss.php:40 actions/userxrd.php:59
-#: actions/xrds.php:71 lib/command.php:497 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:509 lib/galleryaction.php:59
 #: lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Ingen sådan användare."
@@ -290,7 +287,7 @@ msgstr "Uppdateringar från %1$s och vänner på %2$s!"
 #: actions/apigrouplistall.php:120 actions/apigroupmembership.php:105
 #: actions/apigroupshow.php:114 actions/apihelptest.php:84
 #: actions/apistatusesdestroy.php:101 actions/apistatusesretweets.php:110
-#: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:138
+#: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:139
 #: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
 #: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:268
 #: actions/apitimelinegroup.php:147 actions/apitimelinehome.php:173
@@ -520,7 +517,7 @@ msgstr "Mottagare hittades inte."
 #. TRANS: Client error displayed trying to direct message another user who's not a friend (403).
 #: actions/apidirectmessagenew.php:144
 #, fuzzy
-msgid "Cannot send direct messages to users who aren't your friend."
+msgid "Can't send direct messages to users who aren't your friend."
 msgstr "Kan inte skicka direktmeddelanden till användare som inte är din vän."
 
 #. TRANS: Client error displayed trying to direct message self (403).
@@ -547,7 +544,7 @@ msgstr "Denna status är redan en favorit."
 #. TRANS: Client error displayed when marking a notice as favourite fails.
 #. TRANS: Server error displayed when trying to mark a notice as favorite fails in the database.
 #. TRANS: Error message text shown when a favorite could not be set.
-#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:294
+#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:306
 msgid "Could not create favorite."
 msgstr "Kunde inte skapa favorit."
 
@@ -606,7 +603,7 @@ msgstr "Kunde inte hitta målanvändare."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:191
 #: actions/newgroup.php:137 actions/profilesettings.php:273
-#: actions/register.php:206
+#: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "Smeknamnet används redan. Försök med ett annat."
 
@@ -616,7 +613,7 @@ msgstr "Smeknamnet används redan. Försök med ett annat."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:195
 #: actions/newgroup.php:141 actions/profilesettings.php:243
-#: actions/register.php:208
+#: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "Inte ett giltigt smeknamn."
 
@@ -629,7 +626,7 @@ msgstr "Inte ett giltigt smeknamn."
 #: actions/apigroupcreate.php:181 actions/editapplication.php:235
 #: actions/editgroup.php:202 actions/newapplication.php:221
 #: actions/newgroup.php:148 actions/profilesettings.php:248
-#: actions/register.php:215
+#: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "Hemsida är inte en giltig webbadress."
 
@@ -639,7 +636,7 @@ msgstr "Hemsida är inte en giltig webbadress."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:191 actions/editgroup.php:206
 #: actions/newgroup.php:152 actions/profilesettings.php:252
-#: actions/register.php:218
+#: actions/register.php:226
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "Fullständigt namn är för långt (max 255 tecken)."
 
@@ -667,7 +664,7 @@ msgstr[1] "Beskrivning är för lång (max %d tecken)."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:215 actions/editgroup.php:218
 #: actions/newgroup.php:164 actions/profilesettings.php:265
-#: actions/register.php:227
+#: actions/register.php:235
 msgid "Location is too long (maximum 255 characters)."
 msgstr "Beskrivning av plats är för lång (max 255 tecken)."
 
@@ -723,14 +720,14 @@ msgstr "Grupp hittades inte."
 #. TRANS: Server error displayed when trying to join a group the user is already a member of.
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:333
+#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:345
 msgid "You are already a member of that group."
 msgstr "Du är redan en medlem i denna grupp."
 
 #. TRANS: Server error displayed when trying to join a group the user is blocked from joining.
 #. 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.
-#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:338
+#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:350
 msgid "You have been blocked from that group by the admin."
 msgstr "Du har blivit blockerad från denna grupp av administratören."
 
@@ -740,7 +737,7 @@ msgstr "Du har blivit blockerad från denna grupp av administratören."
 #. TRANS: %1$s is the joining user's nickname, $2$s is the group nickname for which the join failed.
 #. TRANS: Message given having failed to add a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:350
+#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:362
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "Kunde inte ansluta användare %1$s till grupp %2$s."
@@ -757,7 +754,7 @@ msgstr "Du är inte en medlem i denna grupp."
 #. TRANS: Message given having failed to remove a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
 #: actions/apigroupleave.php:127 actions/leavegroup.php:133
-#: lib/command.php:398
+#: lib/command.php:410
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
 msgstr "Kunde inte ta bort användare %1$s från grupp %2$s."
@@ -818,21 +815,20 @@ msgstr "Begäran-token är redan auktoriserad."
 #. TRANS: Form validation error message.
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
-#. TRANS: Client error displayed when the session token is not okay.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
 #: actions/deletenotice.php:177 actions/disfavor.php:75
 #: actions/emailsettings.php:291 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:65 actions/grouplogo.php:321
 #: actions/groupunblock.php:65 actions/imsettings.php:224
-#: actions/invite.php:60 actions/login.php:131 actions/makeadmin.php:66
+#: actions/invite.php:60 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
-#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:136
-#: actions/othersettings.php:155 actions/passwordsettings.php:137
+#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
+#: actions/othersettings.php:155 actions/passwordsettings.php:138
 #: actions/profilesettings.php:217 actions/recoverpassword.php:383
-#: actions/register.php:164 actions/remotesubscribe.php:76
+#: actions/register.php:172 actions/remotesubscribe.php:76
 #: actions/repeat.php:82 actions/smssettings.php:250 actions/subedit.php:40
-#: actions/subscribe.php:87 actions/tagother.php:166
-#: actions/unsubscribe.php:69 actions/userauthorization.php:53
+#: actions/subscribe.php:86 actions/tagother.php:166
+#: actions/unsubscribe.php:69 actions/userauthorization.php:52
 #: lib/designsettings.php:310
 msgid "There was a problem with your session token. Try again, please."
 msgstr "Det var ett problem med din sessions-token. Var vänlig försök igen."
@@ -864,7 +860,7 @@ msgstr "Databasfel vid infogning av OAuth-applikationsanvändare."
 #: actions/designadminpanel.php:100 actions/editapplication.php:144
 #: actions/emailsettings.php:310 actions/grouplogo.php:332
 #: actions/imsettings.php:239 actions/newapplication.php:124
-#: actions/oauthconnectionssettings.php:145 actions/recoverpassword.php:46
+#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
 #: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
 msgstr "Oväntat inskick av formulär."
@@ -915,20 +911,19 @@ msgstr "Konto"
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group nickname (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT for nick name in a profile.
-#: actions/apioauthauthorize.php:459 actions/login.php:242
-#: actions/profilesettings.php:106 actions/register.php:418
+#: actions/apioauthauthorize.php:459 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:432
 #: actions/showgroup.php:243 actions/tagother.php:94
-#: actions/userauthorization.php:152 lib/groupeditform.php:145
+#: actions/userauthorization.php:145 lib/groupeditform.php:145
 #: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "Smeknamn"
 
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:463 actions/login.php:245
-#: actions/register.php:422 lib/accountsettingsaction.php:120
+#: actions/apioauthauthorize.php:463 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:120
 msgid "Password"
 msgstr "Lösenord"
 
@@ -1022,13 +1017,13 @@ msgstr "Ingen sådan notis."
 
 #. TRANS: Client error displayed trying to repeat an own notice through the API.
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:537
+#: actions/apistatusesretweet.php:83 lib/command.php:549
 msgid "Cannot repeat your own notice."
 msgstr "Kan inte upprepa din egen notis."
 
 #. TRANS: Client error displayed trying to re-repeat a notice through the API.
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:92 lib/command.php:543
+#: actions/apistatusesretweet.php:92 lib/command.php:555
 msgid "Already repeated that notice."
 msgstr "Redan upprepat denna notis."
 
@@ -1051,7 +1046,7 @@ msgstr "API-metod hittades inte."
 #. TRANS: %s is the requested output format.
 #: actions/apistatusesshow.php:144
 #, fuzzy, php-format
-msgid "Unsupported format: %s."
+msgid "Unsupported format: %s"
 msgstr "Format som inte stödjs."
 
 #. TRANS: Client error displayed requesting a deleted status.
@@ -1156,14 +1151,13 @@ msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr "%1$s uppdateringar med svar på uppdatering från %2$s / %3$s."
 
 #. TRANS: Title for site timeline. %s is the StatusNet sitename.
-#. TRANS: Public RSS feed title. %s is the StatusNet site name.
 #: actions/apitimelinepublic.php:193 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "%s publika tidslinje"
 
 #. TRANS: Subtitle for site timeline. %s is the StatusNet sitename.
-#: actions/apitimelinepublic.php:199
+#: actions/apitimelinepublic.php:199 actions/publicrss.php:105
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "%s uppdateringar från alla!"
@@ -1229,26 +1223,25 @@ msgid "Atom post must be an Atom entry."
 msgstr ""
 
 #. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
-#: actions/apitimelineuser.php:334
+#: actions/apitimelineuser.php:335
 msgid "Can only handle POST activities."
 msgstr ""
 
 #. TRANS: Client error displayed when using an unsupported activity object type.
 #. TRANS: %s is the unsupported activity object type.
-#: actions/apitimelineuser.php:345
+#: actions/apitimelineuser.php:346
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
 #. TRANS: %d is the notice ID (number).
-#: actions/apitimelineuser.php:379
+#: actions/apitimelineuser.php:380
 #, fuzzy, php-format
 msgid "No content for notice %d."
 msgstr "Hitta innehåll i notiser"
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#. TRANS: %s is the notice URI.
 #: actions/apitimelineuser.php:408
 #, fuzzy, php-format
 msgid "Notice with URI \"%s\" already exists."
@@ -1266,10 +1259,9 @@ msgstr "API-metod hittades inte."
 
 #. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
 #. TRANS: Client exception.
-#. TRANS: Client error displayed trying to subscribe to a non-existing profile.
 #: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
 #: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
-#: actions/subscribe.php:110
+#: actions/subscribe.php:107
 msgid "No such profile."
 msgstr "Ingen sådan profil."
 
@@ -1405,7 +1397,7 @@ msgstr "Kunde inte ta bort favoriten."
 #: actions/joingroup.php:95 actions/leavegroup.php:82
 #: actions/leavegroup.php:95 actions/makeadmin.php:86
 #: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:380
+#: lib/command.php:392
 msgid "No such group."
 msgstr "Ingen sådan grupp."
 
@@ -1416,7 +1408,7 @@ msgid "Not a member."
 msgstr "Alla medlemmar"
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
-#: actions/atompubshowmembership.php:150
+#: actions/atompubshowmembership.php:151
 #, fuzzy
 msgid "Cannot delete someone else's membership."
 msgstr "Kunde inte spara prenumeration."
@@ -1522,11 +1514,9 @@ msgstr ""
 
 #. TRANS: Server error displayed in avatar upload page when no matching profile can be found for a user.
 #. TRANS: Server error displayed coming across a request from a user without a profile.
-#. TRANS: Server error displayed when trying to authorise a remote subscription request
-#. TRANS: while the user has no profile.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
 #: actions/grouplogo.php:184 actions/remotesubscribe.php:190
-#: actions/userauthorization.php:75 actions/userrss.php:108
+#: actions/userauthorization.php:72 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr "Användare utan matchande profil."
 
@@ -1581,10 +1571,10 @@ msgstr "Beskär"
 msgid "No file uploaded."
 msgstr "Ingen fil laddades upp."
 
-#. TRANS: Avatar upload form instruction after uploading a file.
+#. TRANS: Avatar upload form unstruction after uploading a file.
 #: actions/avatarsettings.php:345
 #, fuzzy
-msgid "Pick a square area of the image to be your avatar."
+msgid "Pick a square area of the image to be your avatar"
 msgstr "Välj ett kvadratiskt område i bilden som din avatar"
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
@@ -1626,7 +1616,7 @@ msgid "You may not backup your account."
 msgstr ""
 
 #. TRANS: Information displayed on the backup account page.
-#: actions/backupaccount.php:225
+#: actions/backupaccount.php:227
 msgid ""
 "You can backup your account data in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format. This is an experimental feature and provides "
@@ -1636,15 +1626,15 @@ msgid ""
 msgstr ""
 
 #. TRANS: Submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:248
+#: actions/backupaccount.php:250
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Backup"
 msgstr "Bakgrund"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:252
-msgid "Backup your account."
+#: actions/backupaccount.php:254
+msgid "Backup your account"
 msgstr ""
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
@@ -1686,7 +1676,7 @@ msgstr "Nej"
 #. TRANS: Submit button title for 'No' when blocking a user.
 #: actions/block.php:158
 #, fuzzy
-msgid "Do not block this user."
+msgid "Do not block this user"
 msgstr "Blockera inte denna användare"
 
 #. TRANS: Button label on the user block form.
@@ -1703,9 +1693,9 @@ msgid "Yes"
 msgstr "Ja"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:165
-#, fuzzy
-msgid "Block this user."
+#. TRANS: Description of the form to block a user.
+#: actions/block.php:165 lib/blockform.php:79
+msgid "Block this user"
 msgstr "Blockera denna användare"
 
 #. TRANS: Server error displayed when blocking a user fails.
@@ -1869,7 +1859,7 @@ msgstr ""
 #. TRANS: Field label for delete account confirmation entry.
 #. TRANS: Field label for password reset form where the password has to be typed again.
 #: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:262 actions/register.php:426
+#: actions/recoverpassword.php:262 actions/register.php:440
 msgid "Confirm"
 msgstr "Bekräfta"
 
@@ -1899,14 +1889,14 @@ msgstr "Applikation hittades inte."
 #. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
 #: actions/deleteapplication.php:79 actions/editapplication.php:78
-#: actions/showapplication.php:90
+#: actions/showapplication.php:94
 msgid "You are not the owner of this application."
 msgstr "Du är inte ägaren av denna applikation."
 
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
-#: actions/newapplication.php:112 actions/showapplication.php:113
-#: lib/action.php:1422
+#: actions/newapplication.php:112 actions/showapplication.php:118
+#: lib/action.php:1425
 msgid "There was a problem with your session token."
 msgstr "Det var ett problem med din sessions-token."
 
@@ -1930,13 +1920,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting an application.
 #: actions/deleteapplication.php:161
 #, fuzzy
-msgid "Do not delete this application."
+msgid "Do not delete this application"
 msgstr "Ta inte bort denna applikation"
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
 #: actions/deleteapplication.php:167
 #, fuzzy
-msgid "Delete this application."
+msgid "Delete this application"
 msgstr "Ta bort denna applikation"
 
 #. TRANS: Client error when trying to delete group while not logged in.
@@ -1991,13 +1981,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting a group.
 #: actions/deletegroup.php:224
 #, fuzzy
-msgid "Do not delete this group."
+msgid "Do not delete this group"
 msgstr "Ta inte bort denna grupp"
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
 #: actions/deletegroup.php:231
 #, fuzzy
-msgid "Delete this group."
+msgid "Delete this group"
 msgstr "Ta bort denna grupp"
 
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
@@ -2005,15 +1995,13 @@ msgstr "Ta bort denna grupp"
 #. TRANS: Client error displayed when trying to mark a notice as favorite without being logged in.
 #. TRANS: Client error displayed trying to block a user from a group while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
-#. TRANS: Client error displayed trying to log out when not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
-#. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
 #. TRANS: Client error displayed when trying to change user options while not logged in.
 #: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
-#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:70
+#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
-#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:98
+#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
 #: lib/adminpanelaction.php:71 lib/profileformaction.php:63
 #: lib/settingsaction.php:72
@@ -2043,13 +2031,12 @@ msgstr "Är du säker på att du vill ta bort denna notis?"
 #. TRANS: Submit button title for 'No' when deleting a notice.
 #: actions/deletenotice.php:159
 #, fuzzy
-msgid "Do not delete this notice."
+msgid "Do not delete this notice"
 msgstr "Ta inte bort denna notis"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:166
-#, fuzzy
-msgid "Delete this notice."
+#: actions/deletenotice.php:166 lib/noticelist.php:673
+msgid "Delete this notice"
 msgstr "Ta bort denna notis"
 
 #. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
@@ -2086,13 +2073,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting a user.
 #: actions/deleteuser.php:158
 #, fuzzy
-msgid "Do not delete this user."
+msgid "Do not delete this user"
 msgstr "Ta inte bort denna grupp"
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
-#: actions/deleteuser.php:165
-#, fuzzy
-msgid "Delete this user."
+#. TRANS: Description of form for deleting a user.
+#: actions/deleteuser.php:165 lib/deleteuserform.php:75
+msgid "Delete this user"
 msgstr "Ta bort denna användare"
 
 #. TRANS: Message used as title for design settings for the site.
@@ -2258,21 +2245,21 @@ msgid "Use defaults"
 msgstr "Använd standardvärden"
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:720
-#, fuzzy
-msgid "Restore default designs."
+#. TRANS: Title for button on profile design page to reset all colour settings to default.
+#: actions/designadminpanel.php:720 lib/designsettings.php:259
+msgid "Restore default designs"
 msgstr "Återställ standardutseende"
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:728
-#, fuzzy
-msgid "Reset back to default."
+#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
+#: actions/designadminpanel.php:728 lib/designsettings.php:267
+msgid "Reset back to default"
 msgstr "Återställ till standardvärde"
 
 #. TRANS: Title for button for saving theme settings.
-#: actions/designadminpanel.php:736
-#, fuzzy
-msgid "Save design."
+#. TRANS: Title for button on profile design page to save settings.
+#: actions/designadminpanel.php:736 lib/designsettings.php:272
+msgid "Save design"
 msgstr "Spara utseende"
 
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
@@ -2304,7 +2291,7 @@ msgid "You must be logged in to edit an application."
 msgstr "Du måste vara inloggad för att redigera en applikation."
 
 #. TRANS: Client error displayed trying to edit an application that does not exist.
-#: actions/editapplication.php:83 actions/showapplication.php:83
+#: actions/editapplication.php:83 actions/showapplication.php:87
 msgid "No such application."
 msgstr "Ingen sådan applikation."
 
@@ -2584,7 +2571,7 @@ msgid "Cannot normalize that email address."
 msgstr "Kan inte normalisera den e-postadressen"
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:393 actions/register.php:204
+#: actions/emailsettings.php:393 actions/register.php:212
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "Inte en giltig e-postadress."
@@ -2661,22 +2648,19 @@ msgstr "Ingen inkommande e-postadress."
 
 #. 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.
 #: actions/emailsettings.php:530 actions/emailsettings.php:554
-#: actions/smssettings.php:566 actions/smssettings.php:591
+#: actions/smssettings.php:565 actions/smssettings.php:588
 #, fuzzy
 msgid "Could not update user record."
 msgstr "Kunde inte uppdatera användaruppgift."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
-#. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:534 actions/smssettings.php:570
+#: actions/emailsettings.php:534 actions/smssettings.php:568
 msgid "Incoming email address removed."
 msgstr "Inkommande e-postadress borttagen."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
-#. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:558 actions/smssettings.php:595
+#: actions/emailsettings.php:558 actions/smssettings.php:591
 msgid "New incoming email address added."
 msgstr "Ny inkommande e-postadress tillagd."
 
@@ -2688,7 +2672,7 @@ msgstr "Denna notis är redan en favorit!"
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
 #: actions/favor.php:95
 #, fuzzy
-msgid "Disfavor favorite."
+msgid "Disfavor favorite"
 msgstr "Ta bort märkning som favorit"
 
 #. TRANS: Page title for first page of favorited notices.
@@ -2930,13 +2914,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
 #: actions/groupblock.php:191
 #, fuzzy
-msgid "Do not block this user from this group."
+msgid "Do not block this user from this group"
 msgstr "Blockera inte denna användare från denna grupp"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
 #: actions/groupblock.php:198
 #, fuzzy
-msgid "Block this user from this group."
+msgid "Block this user from this group"
 msgstr "Blockera denna användare från denna grupp"
 
 #. TRANS: Server error displayed when trying to block a user from a group fails because of an application error.
@@ -2945,7 +2929,6 @@ msgid "Database error blocking user from group."
 msgstr "Databasfel vid blockering av användare från grupp."
 
 #. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
-#. TRANS: Client error displayed trying to find a user by ID without providing an ID.
 #: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr "Ingen ID."
@@ -3081,7 +3064,6 @@ msgstr "Uppdateringar från medlemmar i %1$s på %2$s!"
 
 #. TRANS: Title for first page of the groups list.
 #: actions/groups.php:62
-#, fuzzy
 msgctxt "TITLE"
 msgid "Groups"
 msgstr "Grupper"
@@ -3134,10 +3116,8 @@ msgid "Group search"
 msgstr "Gruppsökning"
 
 #. TRANS: Text on page where groups can be searched if no results were found for a query.
-#. TRANS: Text for notice search results is the query had no results.
-#. TRANS: Message on the "People search" page where a query has no results.
-#: actions/groupsearch.php:82 actions/noticesearch.php:122
-#: actions/peoplesearch.php:87
+#: actions/groupsearch.php:82 actions/noticesearch.php:117
+#: actions/peoplesearch.php:83
 msgid "No results."
 msgstr "Inga resultat."
 
@@ -3174,7 +3154,6 @@ msgid "User is not blocked from group."
 msgstr "Användare är inte blockerad från grupp."
 
 #. TRANS: Server error displayed when unblocking a user from a group fails because of an unknown error.
-#. TRANS: Server error displayed when removing a user block.
 #: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "Fel vid hävning av blockering."
@@ -3270,8 +3249,7 @@ msgid "Publish a MicroID for my Jabber/Google Talk address."
 msgstr "Publicera ett MicroID för min Jabber/GTalk-adress."
 
 #. TRANS: Confirmation message for successful Instant Messaging preferences save.
-#. TRANS: Confirmation message after saving preferences.
-#: actions/imsettings.php:283 actions/othersettings.php:193
+#: actions/imsettings.php:283 actions/othersettings.php:192
 msgid "Preferences saved."
 msgstr "Inställningar sparade."
 
@@ -3566,7 +3544,7 @@ msgstr "Du måste vara inloggad för att lämna en grupp."
 
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
-#: actions/leavegroup.php:103 lib/command.php:386
+#: actions/leavegroup.php:103 lib/command.php:398
 msgid "You are not a member of that group."
 msgstr "Du är inte en medlem i den gruppen."
 
@@ -3689,41 +3667,39 @@ msgstr "Spara"
 msgid "Save license settings"
 msgstr "Spara licensinsällningar"
 
-#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
-#: actions/login.php:97 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
 msgid "Already logged in."
 msgstr "Redan inloggad."
 
-#: actions/login.php:142
+#: actions/login.php:148
 msgid "Incorrect username or password."
 msgstr "Felaktigt användarnamn eller lösenord."
 
-#. TRANS: Server error displayed when a user object could not be created trying to login using "one time password login".
-#: actions/login.php:148 actions/otp.php:127
+#: actions/login.php:154 actions/otp.php:120
 msgid "Error setting user. You are probably not authorized."
 msgstr "Fel vid inställning av användare. Du har sannolikt inte tillstånd."
 
-#: actions/login.php:202 actions/login.php:253
+#: actions/login.php:210 actions/login.php:263
 msgid "Login"
 msgstr "Logga in"
 
-#: actions/login.php:239
+#: actions/login.php:249
 msgid "Login to site"
 msgstr "Logga in på webbplatsen"
 
-#: actions/login.php:248 actions/register.php:476
+#: actions/login.php:258 actions/register.php:490
 msgid "Remember me"
 msgstr "Kom ihåg mig"
 
-#: actions/login.php:249 actions/register.php:478
+#: actions/login.php:259 actions/register.php:492
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "Logga in automatiskt i framtiden; inte för delade datorer!"
 
-#: actions/login.php:259
+#: actions/login.php:269
 msgid "Lost or forgotten password?"
 msgstr "Tappat bort eller glömt ditt lösenord?"
 
-#: actions/login.php:277
+#: actions/login.php:288
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -3731,11 +3707,11 @@ msgstr ""
 "Av säkerhetsskäl, var vänlig och skriv in ditt användarnamn och lösenord "
 "igen innan du ändrar dina inställningar."
 
-#: actions/login.php:281
+#: actions/login.php:292
 msgid "Login with your username and password."
 msgstr "Logga in med ditt användarnamn och lösenord."
 
-#: actions/login.php:284
+#: actions/login.php:295
 #, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -3818,14 +3794,14 @@ msgid "New message"
 msgstr "Nytt meddelande"
 
 #. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
-#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:501
+#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:513
 msgid "You can't send a message to this user."
 msgstr "Du kan inte skicka ett meddelande till den användaren."
 
 #. TRANS: Command exception text shown when trying to send a direct message to another user without content.
 #. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
-#: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:478
-#: lib/command.php:581
+#: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:490
+#: lib/command.php:593
 msgid "No content!"
 msgstr "Inget innehåll!"
 
@@ -3834,7 +3810,7 @@ msgid "No recipient specified."
 msgstr "Ingen mottagare angiven."
 
 #. TRANS: Error text shown when trying to send a direct message to self.
-#: actions/newmessage.php:167 lib/command.php:505
+#: actions/newmessage.php:167 lib/command.php:517
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
@@ -3847,7 +3823,7 @@ msgstr "Meddelande skickat"
 
 #. TRANS: Message given have sent a direct message to another user.
 #. TRANS: %s is the name of the other user.
-#: actions/newmessage.php:188 lib/command.php:513
+#: actions/newmessage.php:188 lib/command.php:525
 #, php-format
 msgid "Direct message to %s sent."
 msgstr "Direktmeddelande till %s skickat."
@@ -3864,9 +3840,7 @@ msgstr "Ny notis"
 msgid "Notice posted"
 msgstr "Notis postad"
 
-#. TRANS: Instructions for Notice search page.
-#. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/noticesearch.php:69
+#: actions/noticesearch.php:68
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -3875,21 +3849,16 @@ msgstr ""
 "Sök efter innehåll i notiser på %%site.name%%. Skilj söktermerna åt med "
 "mellanslag; de måste vara minst tre tecken långa."
 
-#. TRANS: Title of the page where users can search for notices.
-#: actions/noticesearch.php:80
+#: actions/noticesearch.php:78
 msgid "Text search"
 msgstr "Textsökning"
 
-#. TRANS: Test in RSS notice search.
-#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearch.php:95
+#: actions/noticesearch.php:91
 #, php-format
 msgid "Search results for \"%1$s\" on %2$s"
 msgstr "Sökresultat för \"%1$s\" på %2$s"
 
-#. TRANS: Text for logged in users making a query for notices without results.
-#. TRANS: This message contains a Markdown link.
-#: actions/noticesearch.php:128
+#: actions/noticesearch.php:121
 #, php-format
 msgid ""
 "Be the first to [post on this topic](%%%%action.newnotice%%%%?"
@@ -3898,9 +3867,7 @@ msgstr ""
 "Var den första att [skriva i detta ämne](%%%%action.newnotice%%%%?"
 "status_textarea=%s)!"
 
-#. TRANS: Text for not logged in users making a query for notices without results.
-#. TRANS: This message contains Markdown links.
-#: actions/noticesearch.php:133
+#: actions/noticesearch.php:124
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and be the first to "
@@ -3909,17 +3876,14 @@ msgstr ""
 "Varför inte [registrera ett konto](%%%%action.register%%%%) och vara först "
 "med att [skriva i detta ämne](%%%%action.newnotice%%%%?status_textarea=%s)!"
 
-#. TRANS: RSS notice search feed title. %s is the query.
-#: actions/noticesearchrss.php:95
+#: actions/noticesearchrss.php:96
 #, php-format
 msgid "Updates with \"%s\""
 msgstr "Uppdateringar med \"%s\""
 
-#. TRANS: RSS notice search feed description.
-#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearchrss.php:99
+#: actions/noticesearchrss.php:98
 #, fuzzy, php-format
-msgid "Updates matching search term \"%1$s\" on %2$s."
+msgid "Updates matching search term \"%1$s\" on %2$s!"
 msgstr "Uppdateringar som matchar söksträngen \"%1$s\" på %2$s!"
 
 #: actions/nudge.php:85
@@ -3961,30 +3925,30 @@ msgid "You have not registered any applications yet."
 msgstr "Du har inte registrerat några applikationer än."
 
 #. TRANS: Title for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:70
+#: actions/oauthconnectionssettings.php:71
 msgid "Connected applications"
 msgstr "Anslutna applikationer"
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:81
+#: actions/oauthconnectionssettings.php:83
 msgid "The following connections exist for your account."
 msgstr ""
 
 #. TRANS: Client error when trying to revoke access for an application while not being a user of it.
-#: actions/oauthconnectionssettings.php:166
+#: actions/oauthconnectionssettings.php:168
 msgid "You are not a user of that application."
 msgstr "Du är inte en användare av den applikationen."
 
 #. TRANS: Client error when revoking access has failed for some reason.
 #. TRANS: %s is the application ID revoking access failed for.
-#: actions/oauthconnectionssettings.php:181
+#: actions/oauthconnectionssettings.php:183
 #, php-format
 msgid "Unable to revoke access for application: %s."
 msgstr "Kunde inte återkalla åtkomst för applikation: %s."
 
 #. TRANS: Success message after revoking access for an application.
 #. TRANS: %1$s is the application name, %2$s is the first part of the user token.
-#: actions/oauthconnectionssettings.php:200
+#: actions/oauthconnectionssettings.php:202
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -3992,30 +3956,20 @@ msgid ""
 msgstr ""
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:211
+#: actions/oauthconnectionssettings.php:213
 msgid "You have not authorized any applications to use your account."
 msgstr "Du har inte tillåtit några applikationer att använda ditt konto."
 
 #. TRANS: Note for developers in the OAuth connection settings form.
 #. TRANS: This message contains a Markdown link. Do not separate "](".
 #. TRANS: %s is the URL to the OAuth settings.
-#: actions/oauthconnectionssettings.php:231
+#: actions/oauthconnectionssettings.php:233
 #, php-format
 msgid ""
 "Are you a developer? [Register an OAuth client application](%s) to use with "
 "this instance of StatusNet."
 msgstr ""
 
-#: actions/oembed.php:64
-#, fuzzy, php-format
-msgid "\"%s\" not found."
-msgstr "API-metod hittades inte."
-
-#: actions/oembed.php:76
-#, fuzzy, php-format
-msgid "Notice %s not found."
-msgstr "API-metod hittades inte."
-
 #: actions/oembed.php:80 actions/shownotice.php:100
 msgid "Notice has no profile."
 msgstr "Notisen har ingen profil."
@@ -4025,16 +3979,6 @@ msgstr "Notisen har ingen profil."
 msgid "%1$s's status on %2$s"
 msgstr "%1$ss status den %2$s"
 
-#: actions/oembed.php:95
-#, fuzzy, php-format
-msgid "Attachment %s not found."
-msgstr "Mottagare hittades inte."
-
-#: actions/oembed.php:136
-#, php-format
-msgid "\"%s\" not supported for oembed requests."
-msgstr ""
-
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
 #: actions/oembed.php:168
 #, php-format
@@ -4053,12 +3997,11 @@ msgstr "Endast %s-webbadresser över vanlig HTTP."
 msgid "Not a supported data format."
 msgstr "Ett dataformat som inte stödjs"
 
-#. TRANS: ShortName in the OpenSearch interface when trying to find users.
 #: actions/opensearch.php:64
 msgid "People Search"
 msgstr "Personsökning"
 
-#: actions/opensearch.php:68
+#: actions/opensearch.php:67
 msgid "Notice Search"
 msgstr "Notissökning"
 
@@ -4106,46 +4049,37 @@ msgstr "Visa eller göm profilutseenden."
 msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr "Namnet på URL-förkortningstjänsen är för långt (max 50 tecken)."
 
-#. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
-#: actions/otp.php:70
+#: actions/otp.php:69
 msgid "No user ID specified."
 msgstr "Ingen användar-ID angiven."
 
-#. TRANS: Client error displayed trying to use "one time password login" without specifying a login token.
-#: actions/otp.php:86
+#: actions/otp.php:83
 msgid "No login token specified."
 msgstr "Ingen inloggnings-token angiven."
 
-#. TRANS: Client error displayed trying to use "one time password login" without requesting a login token.
-#: actions/otp.php:94
+#: actions/otp.php:90
 msgid "No login token requested."
 msgstr "Ingen token för inloggning begärd."
 
-#. TRANS: Client error displayed trying to use "one time password login" while specifying an invalid login token.
-#: actions/otp.php:100
+#: actions/otp.php:95
 msgid "Invalid login token specified."
 msgstr "Ogiltig inloggnings-token angiven."
 
-#. TRANS: Client error displayed trying to use "one time password login" while specifying an expired login token.
-#: actions/otp.php:110
+#: actions/otp.php:104
 msgid "Login token expired."
 msgstr "Inloggnings-token förfallen."
 
-#. TRANS: Title for outbox for any but the fist page.
-#. TRANS: %1$s is the user nickname, %2$d is the page number.
-#: actions/outbox.php:57
+#: actions/outbox.php:58
 #, php-format
 msgid "Outbox for %1$s - page %2$d"
 msgstr "Utkorg för %1$s - sida %2$d"
 
-#. TRANS: Title for first page of outbox.
 #: actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
 msgstr "Utkorg för %s"
 
-#. TRANS: Instructions for outbox.
-#: actions/outbox.php:103
+#: actions/outbox.php:104
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr "Detta är din utkorg som innehåller privata meddelanden du har skickat."
 
@@ -4171,45 +4105,43 @@ msgstr "Gammalt lösenord"
 msgid "New password"
 msgstr "Nytt lösenord"
 
-#: actions/passwordsettings.php:109 actions/register.php:423
+#: actions/passwordsettings.php:109
 #, fuzzy
-msgid "6 or more characters."
+msgid "6 or more characters"
 msgstr "Minst 6 tecken"
 
-#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:264
-#: actions/register.php:427
+#: actions/passwordsettings.php:113
 #, fuzzy
-msgid "Same as password above."
+msgid "Same as password above"
 msgstr "Samma som lösenordet ovan"
 
 #: actions/passwordsettings.php:117
 msgid "Change"
 msgstr "Ändra"
 
-#: actions/passwordsettings.php:153 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:238
 msgid "Password must be 6 or more characters."
 msgstr "Lösenordet måste vara minst 6 tecken."
 
-#: actions/passwordsettings.php:156 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:241
 msgid "Passwords don't match."
 msgstr "Lösenorden matchar inte."
 
-#: actions/passwordsettings.php:164
+#: actions/passwordsettings.php:165
 msgid "Incorrect old password"
 msgstr "Felaktigt gammalt lösenord"
 
-#: actions/passwordsettings.php:180
+#: actions/passwordsettings.php:181
 msgid "Error saving user; invalid."
 msgstr "Fel vid sparande av användare; ogiltig."
 
-#. TRANS: Reset password form validation error message.
-#: actions/passwordsettings.php:185 actions/recoverpassword.php:418
+#: actions/passwordsettings.php:186
 #, fuzzy
-msgid "Cannot save new password."
+msgid "Can't save new password."
 msgstr "Kan inte spara nytt lösenord."
 
-#: actions/passwordsettings.php:191
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
 msgid "Password saved."
 msgstr "Lösenord sparat."
 
@@ -4494,9 +4426,7 @@ msgstr "Server att dirigera SSL-begäran till."
 msgid "Save paths"
 msgstr "Spara sökvägar"
 
-#. TRANS: Instructions for the "People search" page.
-#. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/peoplesearch.php:54
+#: actions/peoplesearch.php:52
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
@@ -4505,8 +4435,7 @@ msgstr ""
 "Sök efter personer på %%site.name%% efter deras namn, plats eller intressen. "
 "Skilj söktermerna åt med mellanslag; de måste vara tre tecken långa."
 
-#. TRANS: Title of a page where users can search for other users.
-#: actions/peoplesearch.php:61
+#: actions/peoplesearch.php:58
 msgid "People search"
 msgstr "Personsökning"
 
@@ -4548,7 +4477,7 @@ msgid "Profile information"
 msgstr "Profilinformation"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109 actions/register.php:419
+#: actions/profilesettings.php:109 actions/register.php:433
 #, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr "1-64 små bokstäver eller nummer, inga punkter eller mellanslag"
@@ -4556,7 +4485,7 @@ msgstr "1-64 små bokstäver eller nummer, inga punkter eller mellanslag"
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for full group name (dt). Text hidden by default.
 #. TRANS: DT for full name in a profile.
-#: actions/profilesettings.php:113 actions/register.php:441
+#: actions/profilesettings.php:113 actions/register.php:455
 #: actions/showgroup.php:255 actions/tagother.php:104
 #: lib/groupeditform.php:150 lib/userprofile.php:156
 msgid "Full name"
@@ -4564,13 +4493,13 @@ msgstr "Fullständigt namn"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:118 actions/register.php:446
+#: actions/profilesettings.php:118 actions/register.php:460
 #: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "Hemsida"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:121 actions/register.php:448
+#: actions/profilesettings.php:121
 #, fuzzy
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr "URL till din hemsida, blogg eller profil på en annan webbplats."
@@ -4578,7 +4507,7 @@ msgstr "URL till din hemsida, blogg eller profil på en annan webbplats."
 #. TRANS: Tooltip for field label in form for profile settings. Plural
 #. TRANS: is decided by the number of characters available for the
 #. TRANS: biography (%d).
-#: actions/profilesettings.php:129 actions/register.php:457
+#: actions/profilesettings.php:129 actions/register.php:471
 #, fuzzy, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4586,29 +4515,28 @@ msgstr[0] "Beskriv dig själv och dina intressen med högst 140 tecken"
 msgstr[1] "Beskriv dig själv och dina intressen med högst 140 tecken"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:135 actions/register.php:462
+#: actions/profilesettings.php:135 actions/register.php:476
 msgid "Describe yourself and your interests"
 msgstr "Beskriv dig själv och dina intressen"
 
 #. TRANS: Text area label in form for profile settings where users can provide.
 #. TRANS: their biography.
-#: actions/profilesettings.php:139 actions/register.php:464
+#: actions/profilesettings.php:139 actions/register.php:478
 msgid "Bio"
 msgstr "Biografi"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group location (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT for location in a profile.
-#: actions/profilesettings.php:145 actions/register.php:469
+#: actions/profilesettings.php:145 actions/register.php:483
 #: actions/showgroup.php:265 actions/tagother.php:112
-#: actions/userauthorization.php:174 lib/groupeditform.php:173
+#: actions/userauthorization.php:166 lib/groupeditform.php:173
 #: lib/userprofile.php:172
 msgid "Location"
 msgstr "Plats"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148
+#: actions/profilesettings.php:148 actions/register.php:485
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Var du håller till, såsom \"Stad, Län, Land\""
 
@@ -4629,8 +4557,7 @@ msgstr "Taggar"
 #: actions/profilesettings.php:164
 #, fuzzy
 msgid ""
-"Tags for yourself (letters, numbers, -, ., and _), comma- or space- "
-"separated."
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr ""
 "Taggar för dig själv (bokstäver, nummer, -, ., och _), separerade med "
 "kommatecken eller mellanslag"
@@ -4643,7 +4570,7 @@ msgstr "Språk"
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
 #: actions/profilesettings.php:171
 #, fuzzy
-msgid "Preferred language."
+msgid "Preferred language"
 msgstr "Föredraget språk"
 
 #. TRANS: Dropdownlist label in form for profile settings.
@@ -4660,7 +4587,7 @@ msgstr "I vilken tidszon befinner du dig normalt?"
 #: actions/profilesettings.php:189
 #, fuzzy
 msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)."
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr ""
 "Prenumerera automatiskt på den som prenumererar på mig (bäst för icke-"
 "människa) "
@@ -4668,7 +4595,7 @@ msgstr ""
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Plural form is used based on the maximum number of allowed
 #. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:258 actions/register.php:221
+#: actions/profilesettings.php:258 actions/register.php:229
 #, fuzzy, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4688,9 +4615,9 @@ msgstr "Språknamn är för långt (max 50 tecken)."
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:291
-#, fuzzy, php-format
-msgid "Invalid tag: \"%s\"."
+#: actions/profilesettings.php:291 actions/tagother.php:178
+#, php-format
+msgid "Invalid tag: \"%s\""
 msgstr "Ogiltig tagg: \"%s\""
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
@@ -4799,12 +4726,6 @@ msgstr ""
 "Mikroblogg)tjänst baserad på den fria programvaran [StatusNet](http://status."
 "net/)."
 
-#. TRANS: Public RSS feed description. %s is the StatusNet site name.
-#: actions/publicrss.php:106
-#, fuzzy, php-format
-msgid "%s updates from everyone."
-msgstr "%s uppdateringar från alla!"
-
 #. TRANS: Title for public tag cloud.
 #: actions/publictagcloud.php:57
 msgid "Public tag cloud"
@@ -4941,12 +4862,6 @@ msgstr "Återskapa lösenord"
 msgid "Password recovery requested"
 msgstr "Återskapande av lösenord begärd"
 
-#. TRANS: Title for password recovery page in password saved mode.
-#: actions/recoverpassword.php:229
-#, fuzzy
-msgid "Password saved"
-msgstr "Lösenord sparat."
-
 #. TRANS: Title for password recovery page when an unknown action has been specified.
 #: actions/recoverpassword.php:232
 msgid "Unknown action"
@@ -4958,6 +4873,12 @@ msgstr "Okänd funktion"
 msgid "6 or more characters, and do not forget it!"
 msgstr "Minst 6 tecken, och glöm inte bort det!"
 
+#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#: actions/recoverpassword.php:264 actions/register.php:441
+#, fuzzy
+msgid "Same as password above."
+msgstr "Samma som lösenordet ovan"
+
 #. TRANS: Button text for password reset form.
 #. TRANS: Button text on profile design page to reset all colour settings to default without saving.
 #: actions/recoverpassword.php:268 lib/designsettings.php:264
@@ -5010,8 +4931,14 @@ msgstr "Lösenordet måste vara minst 6 tecken."
 msgid "Password and confirmation do not match."
 msgstr "Lösenord och bekräftelse matchar inte."
 
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:418
+#, fuzzy
+msgid "Cannot save new password."
+msgstr "Kan inte spara nytt lösenord."
+
 #. TRANS: Server error displayed when something does wrong with the user object during password reset.
-#: actions/recoverpassword.php:426 actions/register.php:248
+#: actions/recoverpassword.php:426 actions/register.php:256
 msgid "Error setting user."
 msgstr "Fel uppstog i användarens inställning"
 
@@ -5020,95 +4947,100 @@ msgstr "Fel uppstog i användarens inställning"
 msgid "New password successfully saved. You are now logged in."
 msgstr "Nya lösenordet sparat. Du är nu inloggad."
 
-#: actions/register.php:87 actions/register.php:188 actions/register.php:399
+#: actions/register.php:92 actions/register.php:196 actions/register.php:413
 msgid "Sorry, only invited people can register."
 msgstr "Tyvärr, bara inbjudna personer kan registrera sig."
 
-#: actions/register.php:94
+#: actions/register.php:99
 msgid "Sorry, invalid invitation code."
 msgstr "Tyvärr, ogiltig inbjudningskod."
 
-#: actions/register.php:113
+#: actions/register.php:119
 msgid "Registration successful"
 msgstr "Registreringen genomförd"
 
-#: actions/register.php:115 actions/register.php:497
+#: actions/register.php:121 actions/register.php:511
 msgid "Register"
 msgstr "Registrera"
 
-#: actions/register.php:135
+#: actions/register.php:142
 msgid "Registration not allowed."
 msgstr "Registrering inte tillåten."
 
-#: actions/register.php:201
+#: actions/register.php:209
 #, fuzzy
-msgid "You cannot register if you don't agree to the license."
+msgid "You can't register if you don't agree to the license."
 msgstr "Du kan inte registrera dig om du inte godkänner licensen."
 
-#: actions/register.php:210
+#: actions/register.php:218
 msgid "Email address already exists."
 msgstr "E-postadressen finns redan."
 
-#: actions/register.php:243 actions/register.php:265
+#: actions/register.php:251 actions/register.php:273
 msgid "Invalid username or password."
 msgstr "Ogiltigt användarnamn eller lösenord."
 
-#: actions/register.php:340
+#: actions/register.php:351
 #, fuzzy
 msgid ""
 "With this form you can create a new account. You can then post notices and "
-"link up to friends and colleagues."
+"link up to friends and colleagues. "
 msgstr ""
 "Med detta formulär kan du skapa ett nytt konto. Du kan sedan posta notiser "
 "och ansluta till vänner och kollegor. "
 
+#: actions/register.php:437
+#, fuzzy
+msgid "6 or more characters."
+msgstr "Minst 6 tecken"
+
 #. TRANS: Link description in user account settings menu.
-#: actions/register.php:431 actions/register.php:435
+#: actions/register.php:445 actions/register.php:449
 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
 msgid "Email"
 msgstr "E-post"
 
-#: actions/register.php:432 actions/register.php:436
+#: actions/register.php:446 actions/register.php:450
 #, fuzzy
-msgid "Used only for updates, announcements, and password recovery."
+msgid "Used only for updates, announcements, and password recovery"
 msgstr ""
 "Används endast för uppdateringar, tillkännagivanden och återskapande av "
 "lösenord"
 
-#: actions/register.php:443
+#: actions/register.php:457
 #, fuzzy
-msgid "Longer name, preferably your \"real\" name."
+msgid "Longer name, preferably your \"real\" name"
 msgstr "Längre namn, förslagsvis ditt \"verkliga\" namn"
 
-#: actions/register.php:471
+#: actions/register.php:462
 #, fuzzy
-msgid "Where you are, like \"City, State (or Region), Country\"."
-msgstr "Var du håller till, såsom \"Stad, Län, Land\""
+msgid "URL of your homepage, blog, or profile on another site"
+msgstr "URL till din hemsida, blogg eller profil på en annan webbplats."
 
-#: actions/register.php:510
+#: actions/register.php:523
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
 msgstr ""
 "Jag förstår att innehåll och data av %1$s är privata och konfidentiella."
 
-#: actions/register.php:520
+#: actions/register.php:533
 #, php-format
 msgid "My text and files are copyright by %1$s."
 msgstr "Upphovsrätten till min text och mina filer innehas av %1$s."
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:524
+#: actions/register.php:537
 msgid "My text and files remain under my own copyright."
 msgstr "Upphovsrätten till min text och mina filer är fortsatt min."
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:527
+#: actions/register.php:540
 msgid "All rights reserved."
 msgstr "Alla rättigheter reserverade."
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:532
+#: actions/register.php:545
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -5117,7 +5049,7 @@ msgstr ""
 "Mina texter och filer är tillgängliga under %s med undantag av den här "
 "privata datan: lösenord, e-postadress, IM-adress, telefonnummer."
 
-#: actions/register.php:573
+#: actions/register.php:588
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -5150,7 +5082,7 @@ msgstr ""
 "Tack för att du anmält dig och vi hoppas att du kommer tycka om att använda "
 "denna tjänst."
 
-#: actions/register.php:597
+#: actions/register.php:612
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5184,7 +5116,7 @@ msgstr "Användarens smeknamn"
 
 #: actions/remotesubscribe.php:129
 #, fuzzy
-msgid "Nickname of the user you want to follow."
+msgid "Nickname of the user you want to follow"
 msgstr "Smeknamnet på användaren du vill följa"
 
 #: actions/remotesubscribe.php:132
@@ -5193,7 +5125,7 @@ msgstr "Profil-URL"
 
 #: actions/remotesubscribe.php:133
 #, fuzzy
-msgid "URL of your profile on another compatible microblogging service."
+msgid "URL of your profile on another compatible microblogging service"
 msgstr "URL till din profil på en annan kompatibel mikrobloggtjänst"
 
 #. TRANS: Link text for link that will subscribe to a remote profile.
@@ -5204,7 +5136,7 @@ msgstr "Prenumerera"
 
 #: actions/remotesubscribe.php:158
 #, fuzzy
-msgid "Invalid profile URL (bad format)."
+msgid "Invalid profile URL (bad format)"
 msgstr "Ogiltig profil-URL (dåligt format)"
 
 #: actions/remotesubscribe.php:167
@@ -5248,7 +5180,6 @@ msgstr "Upprepad"
 msgid "Repeated!"
 msgstr "Upprepad!"
 
-#. TRANS: RSS reply feed title. %s is a user nickname.
 #. TRANS: Tooltip for personal group navigation menu option when logged in for viewing @-replies.
 #: actions/replies.php:126 actions/repliesrss.php:68
 #: lib/personalgroupnav.php:109
@@ -5301,11 +5232,9 @@ msgstr ""
 "Var den första att [skriva i detta ämne](%%%%action.newnotice%%%%?"
 "status_textarea=%s)!"
 
-#. TRANS: RSS reply feed description.
-#. TRANS: %1$s is a user nickname, %2$s is the StatusNet site name.
-#: actions/repliesrss.php:74
+#: actions/repliesrss.php:72
 #, fuzzy, php-format
-msgid "Replies to %1$s on %2$s."
+msgid "Replies to %1$s on %2$s!"
 msgstr "Svar till %1$s på %2$s"
 
 #. TRANS: Client exception displayed when trying to restore an account while not logged in.
@@ -5408,7 +5337,7 @@ msgstr "Du kan inte återkalla användarroller på denna webbplats."
 msgid "User doesn't have this role."
 msgstr "Användare har inte denna roll."
 
-#: actions/rsd.php:142 actions/version.php:159
+#: actions/rsd.php:146 actions/version.php:159
 msgid "StatusNet"
 msgstr "StatusNet"
 
@@ -5450,87 +5379,87 @@ msgstr "Sätt på felsökningsutdata för sessioner."
 msgid "Save site settings"
 msgstr "Spara webbplatsinställningar"
 
-#: actions/showapplication.php:78
+#: actions/showapplication.php:82
 msgid "You must be logged in to view an application."
 msgstr "Du måste vara inloggad för att se en applikation."
 
-#: actions/showapplication.php:151
+#: actions/showapplication.php:157
 msgid "Application profile"
 msgstr "Applikationsprofil"
 
 #. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:153 lib/applicationeditform.php:177
+#: actions/showapplication.php:159 lib/applicationeditform.php:177
 msgid "Icon"
 msgstr "Ikon"
 
 #. TRANS: Form input field label for application name.
-#: actions/showapplication.php:163 actions/version.php:197
+#: actions/showapplication.php:169 actions/version.php:197
 #: lib/applicationeditform.php:190
 msgid "Name"
 msgstr "Namn"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:172 lib/applicationeditform.php:227
+#: actions/showapplication.php:178 lib/applicationeditform.php:227
 msgid "Organization"
 msgstr "Organisation"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:181 actions/version.php:200
+#: actions/showapplication.php:187 actions/version.php:200
 #: lib/applicationeditform.php:208 lib/groupeditform.php:168
 msgid "Description"
 msgstr "Beskrivning"
 
 #. TRANS: Header for group statistics on a group page (h2).
 #. TRANS: H2 text for user statistics.
-#: actions/showapplication.php:186 actions/showgroup.php:460
+#: actions/showapplication.php:192 actions/showgroup.php:460
 #: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "Statistik"
 
-#: actions/showapplication.php:197
+#: actions/showapplication.php:203
 #, php-format
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr "Skapad av %1$s - %2$s standardåtkomst - %3$d användare"
 
-#: actions/showapplication.php:207
+#: actions/showapplication.php:213
 msgid "Application actions"
 msgstr "Åtgärder för applikation"
 
-#: actions/showapplication.php:230
+#: actions/showapplication.php:236
 msgid "Reset key & secret"
 msgstr "Återställ nyckel & hemlighet"
 
 #. TRANS: Title of form for deleting a user.
-#: actions/showapplication.php:246 lib/deletegroupform.php:121
+#: actions/showapplication.php:252 lib/deletegroupform.php:121
 #: lib/deleteuserform.php:64 lib/noticelist.php:673
 msgid "Delete"
 msgstr "Ta bort"
 
-#: actions/showapplication.php:255
+#: actions/showapplication.php:261
 msgid "Application info"
 msgstr "Information om applikation"
 
-#: actions/showapplication.php:257
+#: actions/showapplication.php:263
 msgid "Consumer key"
 msgstr "Nyckel för konsument"
 
-#: actions/showapplication.php:262
+#: actions/showapplication.php:268
 msgid "Consumer secret"
 msgstr "Hemlighet för konsument"
 
-#: actions/showapplication.php:267
+#: actions/showapplication.php:273
 msgid "Request token URL"
 msgstr "URL för begäran-token"
 
-#: actions/showapplication.php:272
+#: actions/showapplication.php:278
 msgid "Access token URL"
 msgstr "URL för åtkomst-token"
 
-#: actions/showapplication.php:277
+#: actions/showapplication.php:283
 msgid "Authorize URL"
 msgstr "Tillåt URL"
 
-#: actions/showapplication.php:282
+#: actions/showapplication.php:288
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
@@ -5538,7 +5467,7 @@ msgstr ""
 "Notera: Vi stöjder HMAC-SHA1-signaturer. Vi stödjer inte metoden med "
 "klartextsignatur."
 
-#: actions/showapplication.php:302
+#: actions/showapplication.php:309
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr ""
 "Är du säker på att du vill återställa din konsumentnyckel och -hemlighet?"
@@ -5631,18 +5560,16 @@ msgid "Group profile"
 msgstr "Grupprofil"
 
 #. TRANS: Label for group URL (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT for URL in a profile.
 #: actions/showgroup.php:273 actions/tagother.php:118
-#: actions/userauthorization.php:184 lib/userprofile.php:186
+#: actions/userauthorization.php:175 lib/userprofile.php:186
 msgid "URL"
 msgstr "URL"
 
 #. TRANS: Label for group description or group note (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page where bio is displayed.
 #. TRANS: DT for note in a profile.
 #: actions/showgroup.php:285 actions/tagother.php:128
-#: actions/userauthorization.php:197 lib/userprofile.php:204
+#: actions/userauthorization.php:187 lib/userprofile.php:204
 msgid "Note"
 msgstr "Notis"
 
@@ -5787,7 +5714,7 @@ msgid "%1$s tagged %2$s"
 msgstr "%1$s taggade %2$d"
 
 #. TRANS: Page title showing tagged notices in one user's stream.
-#. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
+#. TRANS: %1$s is the username, %2$s is the hash tag, %1$d is the page number.
 #: actions/showstream.php:74
 #, php-format
 msgid "%1$s tagged %2$s, page %3$d"
@@ -6036,7 +5963,7 @@ msgstr "Text för webbplatsnotis (max 255 tecken; HTML ok)"
 #. TRANS: Title for button to save site notice in admin panel.
 #: actions/sitenoticeadminpanel.php:201
 #, fuzzy
-msgid "Save site notice."
+msgid "Save site notice"
 msgstr "Spara webbplatsnotis"
 
 #. TRANS: Title for SMS settings.
@@ -6095,7 +6022,7 @@ msgstr "Telefonnummer för SMS"
 #. TRANS: SMS phone number input field instructions in SMS settings form.
 #: actions/smssettings.php:152
 #, fuzzy
-msgid "Phone number, no punctuation or spaces, with area code."
+msgid "Phone number, no punctuation or spaces, with area code"
 msgstr "Telefonnummer, inga punkter eller mellanslag, med landskod"
 
 #. TRANS: Form legend for SMS preferences form.
@@ -6264,19 +6191,15 @@ msgstr "Du är inte prenumerat hos den profilen."
 msgid "Could not save subscription."
 msgstr "Kunde inte spara prenumeration."
 
-#. TRANS: Client error displayed trying to perform any request method other than POST.
-#. TRANS: Do not translate POST.
 #: actions/subscribe.php:77
 msgid "This action only accepts POST requests."
 msgstr "Denna åtgärd accepterar endast POST-begäran."
 
-#. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
-#: actions/subscribe.php:121
+#: actions/subscribe.php:117
 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
 msgstr "Du kan inte prenumerera på en 0MB 0.1-fjärrprofil med denna åtgärd."
 
-#. TRANS: Page title when subscription succeeded.
-#: actions/subscribe.php:149
+#: actions/subscribe.php:145
 msgid "Subscribed"
 msgstr "Prenumerant"
 
@@ -6437,9 +6360,8 @@ msgstr "Tagg %s"
 msgid "User profile"
 msgstr "Användarprofil"
 
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT element in area for user avatar.
-#: actions/tagother.php:81 actions/userauthorization.php:138
+#: actions/tagother.php:81 actions/userauthorization.php:132
 #: lib/userprofile.php:108
 msgid "Photo"
 msgstr "Foto"
@@ -6456,11 +6378,6 @@ msgstr ""
 "Taggar för denna användare (bokstäver, nummer, -, ., och _), separerade med "
 "kommatecken eller mellanslag"
 
-#: actions/tagother.php:178
-#, php-format
-msgid "Invalid tag: \"%s\""
-msgstr "Ogiltig tagg: \"%s\""
-
 #: actions/tagother.php:193
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
@@ -6477,7 +6394,6 @@ msgstr ""
 msgid "No such tag."
 msgstr "Ingen sådan tagg."
 
-#. TRANS: Client error displayed when trying to unblock a non-blocked user.
 #: actions/unblock.php:59
 msgid "You haven't blocked that user."
 msgstr "Du har inte blockerat denna användared."
@@ -6498,7 +6414,7 @@ msgstr "Ingen profil-ID i begäran."
 msgid "Unsubscribed"
 msgstr "Prenumeration avslutad"
 
-#: actions/updateprofile.php:64
+#: actions/updateprofile.php:64 actions/userauthorization.php:337
 #, php-format
 msgid ""
 "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
@@ -6532,7 +6448,7 @@ msgstr "Ogiltig välkomsttext. Maximal längd är 255 tecken."
 #. TRANS: users in user admin panel. %1$s is the invalid nickname.
 #: actions/useradminpanel.php:166
 #, fuzzy, php-format
-msgid "Invalid default subscripton: \"%1$s\" is not a user."
+msgid "Invalid default subscripton: '%1$s' is not a user."
 msgstr "Ogiltig standardprenumeration: '%1$s' är inte användare."
 
 #. TRANS: Link description in user account settings menu.
@@ -6596,70 +6512,59 @@ msgstr "Hurvida användare skall tillåtas bjuda in nya användare."
 #. TRANS: Title for button to save user settings in user admin panel.
 #: actions/useradminpanel.php:302
 #, fuzzy
-msgid "Save user settings."
+msgid "Save user settings"
 msgstr "Spara webbplatsinställningar"
 
-#. TRANS: Page title.
-#: actions/userauthorization.php:109
+#: actions/userauthorization.php:105
 msgid "Authorize subscription"
 msgstr "Godkänn prenumeration"
 
-#. TRANS: Page notice on "Auhtorize subscription" page.
-#: actions/userauthorization.php:115
+#: actions/userauthorization.php:110
 #, fuzzy
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
 "user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
-"click \"Reject\"."
+"click “Reject”."
 msgstr ""
 "Vänligen kontrollera dessa uppgifter för att försäkra dig om att du vill "
 "prenumerera på den här användarens notiser. Om du inte bett att prenumerera "
 "på någons meddelanden, klicka på \"Avvisa\"."
 
-#. TRANS: DT element on Authorise Subscription page where license is displayed.
 #. TRANS: Menu item for site administration
-#: actions/userauthorization.php:207 actions/version.php:167
+#: actions/userauthorization.php:196 actions/version.php:167
 #: lib/adminpanelaction.php:403
 msgid "License"
 msgstr "Licens"
 
-#. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:229
+#: actions/userauthorization.php:217
 #, fuzzy
-msgctxt "BUTTON"
 msgid "Accept"
 msgstr "Acceptera"
 
-#. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:231
-#, fuzzy
-msgid "Subscribe to this user."
+#: actions/userauthorization.php:218 lib/subscribeform.php:115
+#: lib/subscribeform.php:139
+msgid "Subscribe to this user"
 msgstr "Prenumerera på denna användare"
 
-#. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:233
+#: actions/userauthorization.php:219
 #, fuzzy
-msgctxt "BUTTON"
 msgid "Reject"
 msgstr "Avvisa"
 
-#. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:235
+#: actions/userauthorization.php:220
 #, fuzzy
-msgid "Reject this subscription."
+msgid "Reject this subscription"
 msgstr "Avvisa denna prenumeration"
 
-#. TRANS: Client error displayed for an empty authorisation request.
-#: actions/userauthorization.php:248
+#: actions/userauthorization.php:232
 msgid "No authorization request!"
 msgstr "Ingen begäran om godkännande!"
 
-#. TRANS: Accept message header from Authorise subscription page.
-#: actions/userauthorization.php:271
+#: actions/userauthorization.php:254
 msgid "Subscription authorized"
 msgstr "Prenumeration godkänd"
 
-#: actions/userauthorization.php:274
+#: actions/userauthorization.php:256
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to authorize the "
@@ -6669,12 +6574,11 @@ msgstr ""
 "med webbplatsens instruktioner hur du bekräftar en prenumeration. Din "
 "prenumerations-token är:"
 
-#. TRANS: Reject message header from Authorise subscription page.
-#: actions/userauthorization.php:285
+#: actions/userauthorization.php:266
 msgid "Subscription rejected"
 msgstr "Prenumeration avvisad"
 
-#: actions/userauthorization.php:288
+#: actions/userauthorization.php:268
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to fully reject the "
@@ -6684,64 +6588,39 @@ msgstr ""
 "webbplatsens instruktioner för detaljer om hur du fullständingt avvisar "
 "prenumerationen."
 
-#. TRANS: Exception thrown when no valid user is found for an authorisation request.
-#. TRANS: %s is a listener URI.
-#: actions/userauthorization.php:325
+#: actions/userauthorization.php:303
 #, fuzzy, php-format
-msgid "Listener URI \"%s\" not found here."
+msgid "Listener URI ‘%s’ not found here."
 msgstr "URI för lyssnare '%s' hittades inte här."
 
-#. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:332
+#: actions/userauthorization.php:308
 #, fuzzy, php-format
-msgid "Listenee URI \"%s\" is too long."
+msgid "Listenee URI ‘%s’ is too long."
 msgstr "Lyssnar-URI '%s' är för lång."
 
-#. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:340
+#: actions/userauthorization.php:314
 #, fuzzy, php-format
-msgid "Listenee URI \"%s\" is a local user."
+msgid "Listenee URI ‘%s’ is a local user."
 msgstr "Lyssnar-URI '%s' är en lokal användare."
 
-#. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
-#. TRANS: %s is a profile URL.
-#: actions/userauthorization.php:358
+#: actions/userauthorization.php:329
 #, fuzzy, php-format
-msgid "Profile URL \"%s\" is for a local user."
+msgid "Profile URL ‘%s’ is for a local user."
 msgstr "Profil-URL ‘%s’ är för en lokal användare."
 
-#. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
-#. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
-#: actions/userauthorization.php:368
+#: actions/userauthorization.php:345
 #, fuzzy, php-format
-msgid ""
-"Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
-"\"."
-msgstr ""
-"Licensen för lyssnarströmmen '%1$s' är inte förenlig med webbplatslicensen '%"
-"2$s'."
-
-#. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:378
-#, fuzzy, php-format
-msgid "Avatar URL \"%s\" is not valid."
+msgid "Avatar URL ‘%s’ is not valid."
 msgstr "Avatar-URL ‘%s’ är inte giltig."
 
-#. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:385
+#: actions/userauthorization.php:350
 #, fuzzy, php-format
-msgid "Cannot read avatar URL \"%s\"."
+msgid "Can’t read avatar URL ‘%s’."
 msgstr "Kan inte läsa avatar-URL '%s'."
 
-#. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:392
+#: actions/userauthorization.php:355
 #, fuzzy, php-format
-msgid "Wrong image type for avatar URL \"%s\"."
+msgid "Wrong image type for avatar URL ‘%s’."
 msgstr "Fel bildtyp för avatar-URL '%s'."
 
 #. TRANS: Page title for profile design page.
@@ -6849,7 +6728,7 @@ msgid "Plugins"
 msgstr "Insticksmoduler"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:898
+#: actions/version.php:198 lib/action.php:901
 msgid "Version"
 msgstr "Version"
 
@@ -7060,14 +6939,14 @@ msgstr "Problem med att spara gruppinkorg."
 
 #. TRANS: Server exception thrown when a reply cannot be saved.
 #. TRANS: %1$d is a notice ID, %2$d is the ID of the mentioned user.
-#: classes/Notice.php:1142
+#: classes/Notice.php:1144
 #, fuzzy, php-format
 msgid "Could not save reply for %1$d, %2$d."
 msgstr "Kunde inte spara lokal gruppinformation."
 
 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1661
+#: classes/Notice.php:1663
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
@@ -7081,14 +6960,14 @@ msgstr "%1$s (%2$s)"
 
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:775
+#: classes/Profile.php:779
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr "Kan inte återkalla roll \"%1$s\" för användare #%2$d; finns inte."
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:784
+#: classes/Profile.php:788
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr "Kan inte återkalla roll \"%1$s\" för användare #%2$d; databasfel."
@@ -7405,53 +7284,53 @@ msgid "Page notice"
 msgstr "Sidnotis"
 
 #. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:871
+#: lib/action.php:874
 msgid "Secondary site navigation"
 msgstr "Sekundär webbplatsnavigation"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:877
+#: lib/action.php:880
 msgid "Help"
 msgstr "Hjälp"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:880
+#: lib/action.php:883
 msgid "About"
 msgstr "Om"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:883
+#: lib/action.php:886
 msgid "FAQ"
 msgstr "Frågor & svar"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:888
+#: lib/action.php:891
 msgid "TOS"
 msgstr "Användarvillkor"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:892
+#: lib/action.php:895
 msgid "Privacy"
 msgstr "Sekretess"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:895
+#: lib/action.php:898
 msgid "Source"
 msgstr "Källa"
 
 #. TRANS: Secondary navigation menu option leading to e-mail contact information on the
 #. TRANS: StatusNet site, where to report bugs, ...
-#: lib/action.php:902
+#: lib/action.php:905
 msgid "Contact"
 msgstr "Kontakt"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:905
+#: lib/action.php:908
 msgid "Badge"
 msgstr "Emblem"
 
 #. TRANS: DT element for StatusNet software license.
-#: lib/action.php:934
+#: lib/action.php:937
 msgid "StatusNet software license"
 msgstr "Programvarulicens för StatusNet"
 
@@ -7459,7 +7338,7 @@ msgstr "Programvarulicens för StatusNet"
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:941
+#: lib/action.php:944
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7469,7 +7348,7 @@ msgstr ""
 "%%](%%site.broughtbyurl%%)."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:944
+#: lib/action.php:947
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** är en mikrobloggtjänst."
@@ -7478,7 +7357,7 @@ msgstr "**%%site.name%%** är en mikrobloggtjänst."
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:951
+#: lib/action.php:954
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7490,51 +7369,51 @@ msgstr ""
 "fsf.org/licensing/licenses/agpl-3.0.html)."
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:967
+#: lib/action.php:970
 msgid "Site content license"
 msgstr "Licens för webbplatsinnehåll"
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:974
+#: lib/action.php:977
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr "Innehåll och data av %1$s är privat och konfidensiell."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:981
+#: lib/action.php:984
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr "Innehåll och data copyright av %1$s. Alla rättigheter reserverade."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:985
+#: lib/action.php:988
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 "Innehåll och data copyright av medarbetare. Alla rättigheter reserverade."
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:1017
+#: lib/action.php:1020
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr "Innehåll och data på %1$s är tillgänglig under licensen %2$s."
 
 #. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1353
+#: lib/action.php:1356
 msgid "Pagination"
 msgstr "Numrering av sidor"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1364
+#: lib/action.php:1367
 msgid "After"
 msgstr "Senare"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1374
+#: lib/action.php:1377
 msgid "Before"
 msgstr "Tidigare"
 
@@ -7733,23 +7612,19 @@ msgstr ""
 msgid "No application for that consumer key."
 msgstr ""
 
-#: lib/apiauth.php:202 lib/apiauth.php:284
-msgid "Not allowed to use API."
-msgstr ""
-
 #. TRANS: OAuth exception given when an incorrect access token was given for a user.
-#: lib/apiauth.php:225
+#: lib/apiauth.php:219
 msgid "Bad access token."
 msgstr ""
 
 #. TRANS: OAuth exception given when no user was found for a given token (no token was found).
-#: lib/apiauth.php:230
+#: lib/apiauth.php:224
 msgid "No user for that token."
 msgstr ""
 
 #. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel".
 #. TRANS: Client error thrown when authentication fails.
-#: lib/apiauth.php:272 lib/apiauth.php:302
+#: lib/apiauth.php:266 lib/apiauth.php:293
 msgid "Could not authenticate you."
 msgstr ""
 
@@ -7954,11 +7829,6 @@ msgstr "Byte av lösenord är inte tillåtet."
 msgid "Block"
 msgstr "Blockera"
 
-#. TRANS: Description of the form to block a user.
-#: lib/blockform.php:79
-msgid "Block this user"
-msgstr "Blockera denna användare"
-
 #. TRANS: Title for command results.
 #: lib/channel.php:160 lib/channel.php:181
 msgid "Command results"
@@ -7986,7 +7856,7 @@ msgstr "Notis med den ID:n finns inte."
 
 #. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
 #. TRANS: Error text shown when a last user notice is requested and it does not exist.
-#: lib/command.php:99 lib/command.php:630
+#: lib/command.php:99 lib/command.php:642
 msgid "User has no last notice."
 msgstr "Användare har ingen sista notis."
 
@@ -8036,35 +7906,41 @@ msgstr ""
 "Prenumeranter: %2$s\n"
 "Notiser: %3$s"
 
+#. TRANS: Error message text shown when a favorite could not be set because it has already been favorited.
+#: lib/command.php:298
+#, fuzzy
+msgid "Could not create favorite: already favorited."
+msgstr "Kunde inte skapa favorit."
+
 #. TRANS: Text shown when a notice has been marked as favourite successfully.
-#: lib/command.php:312
+#: lib/command.php:324
 msgid "Notice marked as fave."
 msgstr "Notis markerad som favorit."
 
 #. TRANS: Message given having added a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:357
+#: lib/command.php:369
 #, php-format
 msgid "%1$s joined group %2$s."
 msgstr "%1$s gick med i grupp %2$s."
 
 #. TRANS: Message given having removed a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:405
+#: lib/command.php:417
 #, php-format
 msgid "%1$s left group %2$s."
 msgstr "%1$s lämnade grupp %2$s."
 
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: lib/command.php:426
+#: lib/command.php:438
 #, php-format
 msgctxt "WHOIS"
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
 
 #. TRANS: Whois output. %s is the full name of the queried user.
-#: lib/command.php:430
+#: lib/command.php:442
 #, php-format
 msgid "Fullname: %s"
 msgstr "Fullständigt namn: %s"
@@ -8072,7 +7948,7 @@ msgstr "Fullständigt namn: %s"
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a location.
-#: lib/command.php:434 lib/mail.php:270
+#: lib/command.php:446 lib/mail.php:270
 #, php-format
 msgid "Location: %s"
 msgstr "Plats: %s"
@@ -8080,20 +7956,20 @@ msgstr "Plats: %s"
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a homepage.
-#: lib/command.php:438 lib/mail.php:274
+#: lib/command.php:450 lib/mail.php:274
 #, php-format
 msgid "Homepage: %s"
 msgstr "Hemsida: %s"
 
 #. TRANS: Whois output. %s is the bio information of the queried user.
-#: lib/command.php:442
+#: lib/command.php:454
 #, php-format
 msgid "About: %s"
 msgstr "Om: %s"
 
 #. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).
 #. TRANS: %s is a remote profile.
-#: lib/command.php:471
+#: lib/command.php:483
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
@@ -8104,7 +7980,7 @@ msgstr ""
 
 #. TRANS: Message given if content is too long. %1$sd is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:488
+#: lib/command.php:500
 #, fuzzy, php-format
 msgid "Message too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
@@ -8112,25 +7988,25 @@ msgstr[0] "Meddelande för långt - maximum är %1$d tecken, du skickade %2$d."
 msgstr[1] "Meddelande för långt - maximum är %1$d tecken, du skickade %2$d."
 
 #. TRANS: Error text shown sending a direct message fails with an unknown reason.
-#: lib/command.php:516
+#: lib/command.php:528
 msgid "Error sending direct message."
 msgstr "Fel vid sändning av direktmeddelande."
 
 #. TRANS: Message given having repeated a notice from another user.
 #. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:553
+#: lib/command.php:565
 #, php-format
 msgid "Notice from %s repeated."
 msgstr "Notis från %s upprepad."
 
 #. TRANS: Error text shown when repeating a notice fails with an unknown reason.
-#: lib/command.php:556
+#: lib/command.php:568
 msgid "Error repeating notice."
 msgstr "Fel vid upprepning av notis."
 
 #. TRANS: Message given if content of a notice for a reply is too long. %1$d is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:591
+#: lib/command.php:603
 #, fuzzy, php-format
 msgid "Notice too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Notice too long - maximum is %1$d characters, you sent %2$d."
@@ -8139,80 +8015,80 @@ msgstr[1] "Notis för långt - maximum är %1$d tecken, du skickade %2$d."
 
 #. TRANS: Text shown having sent a reply to a notice successfully.
 #. TRANS: %s is the nickname of the user of the notice the reply was sent to.
-#: lib/command.php:604
+#: lib/command.php:616
 #, php-format
 msgid "Reply to %s sent."
 msgstr "Svar på %s skickat."
 
 #. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
-#: lib/command.php:607
+#: lib/command.php:619
 msgid "Error saving notice."
 msgstr "Fel vid sparande av notis."
 
 #. TRANS: Error text shown when no username was provided when issuing a subscribe command.
-#: lib/command.php:654
+#: lib/command.php:666
 msgid "Specify the name of the user to subscribe to."
 msgstr "Ange namnet på användaren att prenumerara på."
 
 #. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
-#: lib/command.php:663
+#: lib/command.php:675
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "Kan inte prenumera på OMB-profiler via kommando."
 
 #. TRANS: Text shown after having subscribed to another user successfully.
 #. TRANS: %s is the name of the user the subscription was requested for.
-#: lib/command.php:671
+#: lib/command.php:683
 #, php-format
 msgid "Subscribed to %s."
 msgstr "Prenumererar på %s."
 
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.
-#: lib/command.php:692 lib/command.php:803
+#: lib/command.php:704 lib/command.php:815
 msgid "Specify the name of the user to unsubscribe from."
 msgstr "Ange namnet på användaren att avsluta prenumeration på."
 
 #. TRANS: Text shown after having unsubscribed from another user successfully.
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:703
+#: lib/command.php:715
 #, php-format
 msgid "Unsubscribed from %s."
 msgstr "Prenumeration på %s avslutad."
 
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
-#: lib/command.php:723 lib/command.php:749
+#: lib/command.php:735 lib/command.php:761
 msgid "Command not yet implemented."
 msgstr "Kommando inte implementerat än."
 
 #. TRANS: Text shown when issuing the command "off" successfully.
-#: lib/command.php:727
+#: lib/command.php:739
 msgid "Notification off."
 msgstr "Notifikation av."
 
 #. TRANS: Error text shown when the command "off" fails for an unknown reason.
-#: lib/command.php:730
+#: lib/command.php:742
 msgid "Can't turn off notification."
 msgstr "Kan inte sätta på notifikation."
 
 #. TRANS: Text shown when issuing the command "on" successfully.
-#: lib/command.php:753
+#: lib/command.php:765
 msgid "Notification on."
 msgstr "Notifikation på."
 
 #. TRANS: Error text shown when the command "on" fails for an unknown reason.
-#: lib/command.php:756
+#: lib/command.php:768
 msgid "Can't turn on notification."
 msgstr "Kan inte stänga av notifikation."
 
 #. TRANS: Error text shown when issuing the login command while login is disabled.
-#: lib/command.php:770
+#: lib/command.php:782
 msgid "Login command is disabled."
 msgstr "Inloggningskommando är inaktiverat."
 
 #. TRANS: Text shown after issuing the login command successfully.
 #. TRANS: %s is a logon link..
-#: lib/command.php:783
+#: lib/command.php:795
 #, php-format
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
@@ -8220,20 +8096,20 @@ msgstr ""
 
 #. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:812
+#: lib/command.php:824
 #, php-format
 msgid "Unsubscribed %s."
 msgstr "%ss prenumeration avslutad."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
-#: lib/command.php:830
+#: lib/command.php:842
 msgid "You are not subscribed to anyone."
 msgstr "Du prenumererar inte på någon."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
-#: lib/command.php:835
+#: lib/command.php:847
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Du prenumererar på denna person:"
@@ -8241,14 +8117,14 @@ msgstr[1] "Du prenumererar på dessa personer:"
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user
 #. TRANS: (followers) without having any subscribers.
-#: lib/command.php:857
+#: lib/command.php:869
 msgid "No one is subscribed to you."
 msgstr "Ingen prenumerar på dig."
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
-#: lib/command.php:862
+#: lib/command.php:874
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Denna person prenumererar på dig:"
@@ -8256,21 +8132,21 @@ msgstr[1] "Dessa personer prenumererar på dig:"
 
 #. TRANS: Text shown after requesting groups a user is subscribed to without having
 #. TRANS: any group subscriptions.
-#: lib/command.php:884
+#: lib/command.php:896
 msgid "You are not a member of any groups."
 msgstr "Du är inte medlem i några grupper."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
-#: lib/command.php:889
+#: lib/command.php:901
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "Du är en medlem i denna grupp:"
 msgstr[1] "Du är en medlem i dessa grupper:"
 
 #. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-#: lib/command.php:904
+#: lib/command.php:916
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -8411,11 +8287,6 @@ msgstr "Tillåt anslutna applikationer"
 msgid "Database error"
 msgstr "Databasfel"
 
-#. TRANS: Description of form for deleting a user.
-#: lib/deleteuserform.php:75
-msgid "Delete this user"
-msgstr "Ta bort denna användare"
-
 #. TRANS: Label in form on profile design page.
 #. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
 #: lib/designsettings.php:108
@@ -8452,21 +8323,6 @@ msgstr "Byt färger"
 msgid "Use defaults"
 msgstr "Använd standardvärden"
 
-#. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: lib/designsettings.php:259
-msgid "Restore default designs"
-msgstr "Återställ standardutseende"
-
-#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: lib/designsettings.php:267
-msgid "Reset back to default"
-msgstr "Återställ till standardvärde"
-
-#. TRANS: Title for button on profile design page to save settings.
-#: lib/designsettings.php:272
-msgid "Save design"
-msgstr "Spara utseende"
-
 #. TRANS: Error message displayed if design settings could not be saved.
 #. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
 #: lib/designsettings.php:405 lib/designsettings.php:427
@@ -9349,10 +9205,6 @@ msgstr "Svara på denna notis"
 msgid "Reply"
 msgstr "Svara"
 
-#: lib/noticelist.php:673
-msgid "Delete this notice"
-msgstr "Ta bort denna notis"
-
 #: lib/noticelist.php:691
 msgid "Notice repeated"
 msgstr "Notis upprepad"
@@ -9634,10 +9486,6 @@ msgstr "Bjud in"
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Bjud in vänner och kollegor att gå med dig på %s"
 
-#: lib/subscribeform.php:115 lib/subscribeform.php:139
-msgid "Subscribe to this user"
-msgstr "Prenumerera på denna användare"
-
 #: lib/subscriberspeopleselftagcloudsection.php:48
 #: lib/subscriptionspeopleselftagcloudsection.php:48
 msgid "People Tagcloud as self-tagged"
@@ -9810,23 +9658,18 @@ msgctxt "role"
 msgid "Moderator"
 msgstr "Moderator"
 
-#: lib/util.php:305
-#, fuzzy
-msgid "Not allowed to log in."
-msgstr "Inte inloggad."
-
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1309
+#: lib/util.php:1306
 msgid "a few seconds ago"
 msgstr "ett par sekunder sedan"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1312
+#: lib/util.php:1309
 msgid "about a minute ago"
 msgstr "för nån minut sedan"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1316
+#: lib/util.php:1313
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
@@ -9834,12 +9677,12 @@ msgstr[0] "för ungefär en minut sedan"
 msgstr[1] "för ungefär %d minuter sedan"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1319
+#: lib/util.php:1316
 msgid "about an hour ago"
 msgstr "för en timma sedan"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1323
+#: lib/util.php:1320
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
@@ -9847,12 +9690,12 @@ msgstr[0] "för ungefär en timma sedan"
 msgstr[1] "för ungefär %d timmar sedan"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1326
+#: lib/util.php:1323
 msgid "about a day ago"
 msgstr "för en dag sedan"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1330
+#: lib/util.php:1327
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
@@ -9860,12 +9703,12 @@ msgstr[0] "för ungefär en dag sedan"
 msgstr[1] "för ungefär %d dagar sedan"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1333
+#: lib/util.php:1330
 msgid "about a month ago"
 msgstr "för en månad sedan"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1337
+#: lib/util.php:1334
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
@@ -9873,7 +9716,7 @@ msgstr[0] "för ungefär en månad sedan"
 msgstr[1] "för ungefär %d månader sedan"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1340
+#: lib/util.php:1337
 msgid "about a year ago"
 msgstr "för ett år sedan"
 
@@ -9915,3 +9758,75 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#, fuzzy
+#~ msgid "Block this user."
+#~ msgstr "Blockera denna användare"
+
+#, fuzzy
+#~ msgid "Delete this notice."
+#~ msgstr "Ta bort denna notis"
+
+#, fuzzy
+#~ msgid "Delete this user."
+#~ msgstr "Ta bort denna användare"
+
+#, fuzzy
+#~ msgid "Restore default designs."
+#~ msgstr "Återställ standardutseende"
+
+#, fuzzy
+#~ msgid "Reset back to default."
+#~ msgstr "Återställ till standardvärde"
+
+#, fuzzy
+#~ msgid "Save design."
+#~ msgstr "Spara utseende"
+
+#, fuzzy
+#~ msgid "Disfavor favorite."
+#~ msgstr "Ta bort märkning som favorit"
+
+#, fuzzy
+#~ msgid "\"%s\" not found."
+#~ msgstr "API-metod hittades inte."
+
+#, fuzzy
+#~ msgid "Notice %s not found."
+#~ msgstr "API-metod hittades inte."
+
+#, fuzzy
+#~ msgid "Attachment %s not found."
+#~ msgstr "Mottagare hittades inte."
+
+#, fuzzy
+#~ msgid "Invalid tag: \"%s\"."
+#~ msgstr "Ogiltig tagg: \"%s\""
+
+#, fuzzy
+#~ msgid "%s updates from everyone."
+#~ msgstr "%s uppdateringar från alla!"
+
+#, fuzzy
+#~ msgid "Password saved"
+#~ msgstr "Lösenord sparat."
+
+#, fuzzy
+#~ msgid "Where you are, like \"City, State (or Region), Country\"."
+#~ msgstr "Var du håller till, såsom \"Stad, Län, Land\""
+
+#, fuzzy
+#~ msgid "Subscribe to this user."
+#~ msgstr "Prenumerera på denna användare"
+
+#, fuzzy
+#~ msgid ""
+#~ "Listenee stream license \"%1$s\" is not compatible with site license \"%2"
+#~ "$s\"."
+#~ msgstr ""
+#~ "Licensen för lyssnarströmmen '%1$s' är inte förenlig med "
+#~ "webbplatslicensen '%2$s'."
+
+#, fuzzy
+#~ msgid "Not allowed to log in."
+#~ msgstr "Inte inloggad."
diff --git a/locale/te/LC_MESSAGES/statusnet.po b/locale/te/LC_MESSAGES/statusnet.po
index 2ea0fd8dd2..86e3970216 100644
--- a/locale/te/LC_MESSAGES/statusnet.po
+++ b/locale/te/LC_MESSAGES/statusnet.po
@@ -10,17 +10,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-24 10:32+0000\n"
-"PO-Revision-Date: 2011-02-24 10:37:41+0000\n"
+"POT-Creation-Date: 2011-03-03 15:58+0000\n"
+"PO-Revision-Date: 2011-03-03 16:01:22+0000\n"
 "Language-Team: Telugu <http://translatewiki.net/wiki/Portal:te>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r82712); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: te\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-02-17 11:39:54+0000\n"
+"X-POT-Import-Date: 2011-02-25 23:49:23+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -132,11 +132,7 @@ msgstr "అటువంటి పేజీ లేదు."
 #. 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 use "one time password login" without using an existing user.
-#. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
-#. TRANS: Client error displayed trying to find a user by ID for a non-existing ID.
-#. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when calling a profile action without specifying a user.
 #: actions/all.php:80 actions/allrss.php:69
@@ -154,12 +150,12 @@ msgstr "అటువంటి పేజీ లేదు."
 #: actions/apitimelinementions.php:77 actions/apitimelineuser.php:79
 #: actions/avatarbynickname.php:79 actions/favoritesrss.php:72
 #: actions/foaf.php:42 actions/foaf.php:61 actions/hcard.php:67
-#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:78
+#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
 #: actions/remotesubscribe.php:144 actions/remotesubscribe.php:153
-#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:113
-#: actions/showfavorites.php:106 actions/userbyid.php:75
+#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
+#: actions/showfavorites.php:106 actions/userbyid.php:74
 #: actions/usergroups.php:93 actions/userrss.php:40 actions/userxrd.php:59
-#: actions/xrds.php:71 lib/command.php:497 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:509 lib/galleryaction.php:59
 #: lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "అటువంటి వాడుకరి లేరు."
@@ -284,7 +280,7 @@ msgstr "%2$sలో %1$s మరియు స్నేహితుల నుండ
 #: actions/apigrouplistall.php:120 actions/apigroupmembership.php:105
 #: actions/apigroupshow.php:114 actions/apihelptest.php:84
 #: actions/apistatusesdestroy.php:101 actions/apistatusesretweets.php:110
-#: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:138
+#: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:139
 #: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
 #: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:268
 #: actions/apitimelinegroup.php:147 actions/apitimelinehome.php:173
@@ -512,7 +508,8 @@ msgstr "అందుకోవాల్సిన వాడుకరి కనబ
 
 #. TRANS: Client error displayed trying to direct message another user who's not a friend (403).
 #: actions/apidirectmessagenew.php:144
-msgid "Cannot send direct messages to users who aren't your friend."
+#, fuzzy
+msgid "Can't send direct messages to users who aren't your friend."
 msgstr "మీ స్నేహితులు కాని వాడుకరులకి నేరు సందేశాలు పంపించలేరు."
 
 #. TRANS: Client error displayed trying to direct message self (403).
@@ -537,7 +534,7 @@ msgstr "ఈ నోటీసు ఇప్పటికే మీ ఇష్టా
 #. TRANS: Client error displayed when marking a notice as favourite fails.
 #. TRANS: Server error displayed when trying to mark a notice as favorite fails in the database.
 #. TRANS: Error message text shown when a favorite could not be set.
-#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:294
+#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:306
 msgid "Could not create favorite."
 msgstr "ఇష్టాంశాన్ని సృష్టించలేకపోయాం."
 
@@ -595,7 +592,7 @@ msgstr "లక్ష్యిత వాడుకరిని కనుగొన
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:191
 #: actions/newgroup.php:137 actions/profilesettings.php:273
-#: actions/register.php:206
+#: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "ఆ పేరుని ఇప్పటికే వాడుతున్నారు. మరోటి ప్రయత్నించండి."
 
@@ -605,7 +602,7 @@ msgstr "ఆ పేరుని ఇప్పటికే వాడుతున్
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:195
 #: actions/newgroup.php:141 actions/profilesettings.php:243
-#: actions/register.php:208
+#: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "సరైన పేరు కాదు."
 
@@ -618,7 +615,7 @@ msgstr "సరైన పేరు కాదు."
 #: actions/apigroupcreate.php:181 actions/editapplication.php:235
 #: actions/editgroup.php:202 actions/newapplication.php:221
 #: actions/newgroup.php:148 actions/profilesettings.php:248
-#: actions/register.php:215
+#: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "హోమ్ పేజీ URL సరైనది కాదు."
 
@@ -628,7 +625,7 @@ msgstr "హోమ్ పేజీ URL సరైనది కాదు."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:191 actions/editgroup.php:206
 #: actions/newgroup.php:152 actions/profilesettings.php:252
-#: actions/register.php:218
+#: actions/register.php:226
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "పూర్తి పేరు చాలా పెద్దగా ఉంది (గరిష్ఠం 255 అక్షరాలు)."
 
@@ -656,7 +653,7 @@ msgstr[1] "వివరణ చాలా పెద్దగా ఉంది (%d 
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:215 actions/editgroup.php:218
 #: actions/newgroup.php:164 actions/profilesettings.php:265
-#: actions/register.php:227
+#: actions/register.php:235
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
 msgstr "ప్రాంతం పేరు మరీ పెద్దగా ఉంది (255 అక్షరాలు గరిష్ఠం)."
@@ -713,14 +710,14 @@ msgstr "గుంపు దొరకలేదు."
 #. TRANS: Server error displayed when trying to join a group the user is already a member of.
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:333
+#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:345
 msgid "You are already a member of that group."
 msgstr "మీరు ఇప్పటికే ఆ గుంపులో సభ్యులు."
 
 #. TRANS: Server error displayed when trying to join a group the user is blocked from joining.
 #. 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.
-#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:338
+#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:350
 msgid "You have been blocked from that group by the admin."
 msgstr "నిర్వాహకులు ఆ గుంపు నుండి మిమ్మల్ని నిరోధించారు."
 
@@ -730,7 +727,7 @@ msgstr "నిర్వాహకులు ఆ గుంపు నుండి 
 #. TRANS: %1$s is the joining user's nickname, $2$s is the group nickname for which the join failed.
 #. TRANS: Message given having failed to add a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:350
+#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:362
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "వాడుకరి %1$sని %2$s గుంపులో చేర్చలేకపోయాం"
@@ -747,7 +744,7 @@ msgstr "మీరు ఈ గుంపులో సభ్యులు కాద
 #. TRANS: Message given having failed to remove a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
 #: actions/apigroupleave.php:127 actions/leavegroup.php:133
-#: lib/command.php:398
+#: lib/command.php:410
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
 msgstr "వాడుకరి %1$sని %2$s గుంపు నుండి తొలగించలేకపోయాం."
@@ -810,21 +807,20 @@ msgstr "మీకు అధీకరణ లేదు."
 #. TRANS: Form validation error message.
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
-#. TRANS: Client error displayed when the session token is not okay.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
 #: actions/deletenotice.php:177 actions/disfavor.php:75
 #: actions/emailsettings.php:291 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:65 actions/grouplogo.php:321
 #: actions/groupunblock.php:65 actions/imsettings.php:224
-#: actions/invite.php:60 actions/login.php:131 actions/makeadmin.php:66
+#: actions/invite.php:60 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
-#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:136
-#: actions/othersettings.php:155 actions/passwordsettings.php:137
+#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
+#: actions/othersettings.php:155 actions/passwordsettings.php:138
 #: actions/profilesettings.php:217 actions/recoverpassword.php:383
-#: actions/register.php:164 actions/remotesubscribe.php:76
+#: actions/register.php:172 actions/remotesubscribe.php:76
 #: actions/repeat.php:82 actions/smssettings.php:250 actions/subedit.php:40
-#: actions/subscribe.php:87 actions/tagother.php:166
-#: actions/unsubscribe.php:69 actions/userauthorization.php:53
+#: actions/subscribe.php:86 actions/tagother.php:166
+#: actions/unsubscribe.php:69 actions/userauthorization.php:52
 #: lib/designsettings.php:310
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
@@ -856,7 +852,7 @@ msgstr "అవతారాన్ని పెట్టడంలో పొరప
 #: actions/designadminpanel.php:100 actions/editapplication.php:144
 #: actions/emailsettings.php:310 actions/grouplogo.php:332
 #: actions/imsettings.php:239 actions/newapplication.php:124
-#: actions/oauthconnectionssettings.php:145 actions/recoverpassword.php:46
+#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
 #: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
 msgstr ""
@@ -901,20 +897,19 @@ msgstr "ఖాతా"
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group nickname (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT for nick name in a profile.
-#: actions/apioauthauthorize.php:459 actions/login.php:242
-#: actions/profilesettings.php:106 actions/register.php:418
+#: actions/apioauthauthorize.php:459 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:432
 #: actions/showgroup.php:243 actions/tagother.php:94
-#: actions/userauthorization.php:152 lib/groupeditform.php:145
+#: actions/userauthorization.php:145 lib/groupeditform.php:145
 #: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "పేరు"
 
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:463 actions/login.php:245
-#: actions/register.php:422 lib/accountsettingsaction.php:120
+#: actions/apioauthauthorize.php:463 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:120
 msgid "Password"
 msgstr "సంకేతపదం"
 
@@ -1007,13 +1002,13 @@ msgstr "అటువంటి సందేశమేమీ లేదు."
 
 #. TRANS: Client error displayed trying to repeat an own notice through the API.
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:537
+#: actions/apistatusesretweet.php:83 lib/command.php:549
 msgid "Cannot repeat your own notice."
 msgstr "మీ నోటీసుని మీరే పునరావృతించలేరు."
 
 #. TRANS: Client error displayed trying to re-repeat a notice through the API.
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:92 lib/command.php:543
+#: actions/apistatusesretweet.php:92 lib/command.php:555
 msgid "Already repeated that notice."
 msgstr "ఇప్పటికే ఆ నోటీసుని పునరావృతించారు."
 
@@ -1036,7 +1031,7 @@ msgstr "నిర్ధారణ సంకేతం కనబడలేదు."
 #. TRANS: %s is the requested output format.
 #: actions/apistatusesshow.php:144
 #, fuzzy, php-format
-msgid "Unsupported format: %s."
+msgid "Unsupported format: %s"
 msgstr "%s కి నేరు సందేశాలు"
 
 #. TRANS: Client error displayed requesting a deleted status.
@@ -1140,14 +1135,13 @@ msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr ""
 
 #. TRANS: Title for site timeline. %s is the StatusNet sitename.
-#. TRANS: Public RSS feed title. %s is the StatusNet site name.
 #: actions/apitimelinepublic.php:193 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "%s బహిరంగ కాలరేఖ"
 
 #. TRANS: Subtitle for site timeline. %s is the StatusNet sitename.
-#: actions/apitimelinepublic.php:199
+#: actions/apitimelinepublic.php:199 actions/publicrss.php:105
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "అందరి నుండి %s తాజాకరణలు!"
@@ -1212,26 +1206,25 @@ msgid "Atom post must be an Atom entry."
 msgstr ""
 
 #. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
-#: actions/apitimelineuser.php:334
+#: actions/apitimelineuser.php:335
 msgid "Can only handle POST activities."
 msgstr ""
 
 #. TRANS: Client error displayed when using an unsupported activity object type.
 #. TRANS: %s is the unsupported activity object type.
-#: actions/apitimelineuser.php:345
+#: actions/apitimelineuser.php:346
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
 #. TRANS: %d is the notice ID (number).
-#: actions/apitimelineuser.php:379
+#: actions/apitimelineuser.php:380
 #, fuzzy, php-format
 msgid "No content for notice %d."
 msgstr "మీ నోటీసుని మీరే పునరావృతించలేరు."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#. TRANS: %s is the notice URI.
 #: actions/apitimelineuser.php:408
 #, fuzzy, php-format
 msgid "Notice with URI \"%s\" already exists."
@@ -1250,10 +1243,9 @@ msgstr "వాడుకరి దొరకలేదు."
 
 #. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
 #. TRANS: Client exception.
-#. TRANS: Client error displayed trying to subscribe to a non-existing profile.
 #: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
 #: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
-#: actions/subscribe.php:110
+#: actions/subscribe.php:107
 #, fuzzy
 msgid "No such profile."
 msgstr "అటువంటి ఫైలు లేదు."
@@ -1389,7 +1381,7 @@ msgstr "ఇష్టాంశాన్ని తొలగించలేకప
 #: actions/joingroup.php:95 actions/leavegroup.php:82
 #: actions/leavegroup.php:95 actions/makeadmin.php:86
 #: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:380
+#: lib/command.php:392
 msgid "No such group."
 msgstr "అటువంటి గుంపు లేదు."
 
@@ -1399,7 +1391,7 @@ msgid "Not a member."
 msgstr "సభ్యులు కాదు."
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
-#: actions/atompubshowmembership.php:150
+#: actions/atompubshowmembership.php:151
 #, fuzzy
 msgid "Cannot delete someone else's membership."
 msgstr "కొత్త చందాని చేర్చలేకపోయాం."
@@ -1504,11 +1496,9 @@ msgstr "మీ వ్యక్తిగత అవతారాన్ని మీ
 
 #. TRANS: Server error displayed in avatar upload page when no matching profile can be found for a user.
 #. TRANS: Server error displayed coming across a request from a user without a profile.
-#. TRANS: Server error displayed when trying to authorise a remote subscription request
-#. TRANS: while the user has no profile.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
 #: actions/grouplogo.php:184 actions/remotesubscribe.php:190
-#: actions/userauthorization.php:75 actions/userrss.php:108
+#: actions/userauthorization.php:72 actions/userrss.php:108
 #, fuzzy
 msgid "User without matching profile."
 msgstr "వాడుకరికి ప్రొఫైలు లేదు."
@@ -1564,10 +1554,10 @@ msgstr "కత్తిరించు"
 msgid "No file uploaded."
 msgstr "ఏ దస్త్రమూ ఎక్కింపబడలేదు."
 
-#. TRANS: Avatar upload form instruction after uploading a file.
+#. TRANS: Avatar upload form unstruction after uploading a file.
 #: actions/avatarsettings.php:345
 #, fuzzy
-msgid "Pick a square area of the image to be your avatar."
+msgid "Pick a square area of the image to be your avatar"
 msgstr "మీ అవతారానికి గానూ ఈ చిత్రం నుండి ఒక చతురస్రపు ప్రదేశాన్ని ఎంచుకోండి"
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
@@ -1609,7 +1599,7 @@ msgid "You may not backup your account."
 msgstr ""
 
 #. TRANS: Information displayed on the backup account page.
-#: actions/backupaccount.php:225
+#: actions/backupaccount.php:227
 msgid ""
 "You can backup your account data in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format. This is an experimental feature and provides "
@@ -1619,15 +1609,15 @@ msgid ""
 msgstr ""
 
 #. TRANS: Submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:248
+#: actions/backupaccount.php:250
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Backup"
 msgstr "నేపథ్యం"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:252
-msgid "Backup your account."
+#: actions/backupaccount.php:254
+msgid "Backup your account"
 msgstr ""
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
@@ -1668,7 +1658,7 @@ msgstr "కాదు"
 #. TRANS: Submit button title for 'No' when blocking a user.
 #: actions/block.php:158
 #, fuzzy
-msgid "Do not block this user."
+msgid "Do not block this user"
 msgstr "ఈ వాడుకరిని నిరోధించకు"
 
 #. TRANS: Button label on the user block form.
@@ -1685,9 +1675,10 @@ msgid "Yes"
 msgstr "అవును"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:165
-msgid "Block this user."
-msgstr "ఈ వాడుకరిని నిరోధించండి."
+#. TRANS: Description of the form to block a user.
+#: actions/block.php:165 lib/blockform.php:79
+msgid "Block this user"
+msgstr "ఈ వాడుకరిని నిరోధించు"
 
 #. TRANS: Server error displayed when blocking a user fails.
 #: actions/block.php:189
@@ -1849,7 +1840,7 @@ msgstr ""
 #. TRANS: Field label for delete account confirmation entry.
 #. TRANS: Field label for password reset form where the password has to be typed again.
 #: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:262 actions/register.php:426
+#: actions/recoverpassword.php:262 actions/register.php:440
 msgid "Confirm"
 msgstr "నిర్థారించు"
 
@@ -1879,14 +1870,14 @@ msgstr "ఉపకరణం కనబడలేదు."
 #. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
 #: actions/deleteapplication.php:79 actions/editapplication.php:78
-#: actions/showapplication.php:90
+#: actions/showapplication.php:94
 msgid "You are not the owner of this application."
 msgstr "మీరు ఈ ఉపకరణం యొక్క యజమాని కాదు."
 
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
-#: actions/newapplication.php:112 actions/showapplication.php:113
-#: lib/action.php:1422
+#: actions/newapplication.php:112 actions/showapplication.php:118
+#: lib/action.php:1425
 msgid "There was a problem with your session token."
 msgstr ""
 
@@ -1909,13 +1900,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting an application.
 #: actions/deleteapplication.php:161
 #, fuzzy
-msgid "Do not delete this application."
+msgid "Do not delete this application"
 msgstr "ఈ ఉపకరణాన్ని తొలగించకు"
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
 #: actions/deleteapplication.php:167
 #, fuzzy
-msgid "Delete this application."
+msgid "Delete this application"
 msgstr "ఈ ఉపకరణాన్ని తొలగించు"
 
 #. TRANS: Client error when trying to delete group while not logged in.
@@ -1970,13 +1961,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting a group.
 #: actions/deletegroup.php:224
 #, fuzzy
-msgid "Do not delete this group."
+msgid "Do not delete this group"
 msgstr "ఈ గుంపును తొలగించకు"
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
 #: actions/deletegroup.php:231
 #, fuzzy
-msgid "Delete this group."
+msgid "Delete this group"
 msgstr "ఈ గుంపుని తొలగించు"
 
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
@@ -1984,15 +1975,13 @@ msgstr "ఈ గుంపుని తొలగించు"
 #. TRANS: Client error displayed when trying to mark a notice as favorite without being logged in.
 #. TRANS: Client error displayed trying to block a user from a group while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
-#. TRANS: Client error displayed trying to log out when not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
-#. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
 #. TRANS: Client error displayed when trying to change user options while not logged in.
 #: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
-#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:70
+#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
-#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:98
+#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
 #: lib/adminpanelaction.php:71 lib/profileformaction.php:63
 #: lib/settingsaction.php:72
@@ -2020,13 +2009,12 @@ msgstr "మీరు నిజంగానే ఈ నోటీసుని త
 #. TRANS: Submit button title for 'No' when deleting a notice.
 #: actions/deletenotice.php:159
 #, fuzzy
-msgid "Do not delete this notice."
+msgid "Do not delete this notice"
 msgstr "ఈ నోటీసుని తొలగించకు"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:166
-#, fuzzy
-msgid "Delete this notice."
+#: actions/deletenotice.php:166 lib/noticelist.php:673
+msgid "Delete this notice"
 msgstr "ఈ నోటీసుని తొలగించు"
 
 #. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
@@ -2062,13 +2050,15 @@ msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting a user.
 #: actions/deleteuser.php:158
-msgid "Do not delete this user."
+#, fuzzy
+msgid "Do not delete this user"
 msgstr "ఈ వాడుకరిని తొలగించకండి."
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
-#: actions/deleteuser.php:165
-msgid "Delete this user."
-msgstr "ఈ వాడుకరిని తొలగించండి."
+#. TRANS: Description of form for deleting a user.
+#: actions/deleteuser.php:165 lib/deleteuserform.php:75
+msgid "Delete this user"
+msgstr "ఈ వాడుకరిని తొలగించు"
 
 #. TRANS: Message used as title for design settings for the site.
 #. TRANS: Link description in user account settings menu.
@@ -2234,21 +2224,23 @@ msgid "Use defaults"
 msgstr "అప్రమేయాలని ఉపయోగించు"
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:720
+#. TRANS: Title for button on profile design page to reset all colour settings to default.
+#: actions/designadminpanel.php:720 lib/designsettings.php:259
 #, fuzzy
-msgid "Restore default designs."
+msgid "Restore default designs"
 msgstr "అప్రమేయాలని ఉపయోగించు"
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:728
+#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
+#: actions/designadminpanel.php:728 lib/designsettings.php:267
 #, fuzzy
-msgid "Reset back to default."
+msgid "Reset back to default"
 msgstr "అప్రమేయాలని ఉపయోగించు"
 
 #. TRANS: Title for button for saving theme settings.
-#: actions/designadminpanel.php:736
-#, fuzzy
-msgid "Save design."
+#. TRANS: Title for button on profile design page to save settings.
+#: actions/designadminpanel.php:736 lib/designsettings.php:272
+msgid "Save design"
 msgstr "రూపురేఖలని భద్రపరచు"
 
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
@@ -2280,7 +2272,7 @@ msgid "You must be logged in to edit an application."
 msgstr "ఉపకరణాలని మార్చడానికి మీరు ప్రవేశించి ఉండాలి."
 
 #. TRANS: Client error displayed trying to edit an application that does not exist.
-#: actions/editapplication.php:83 actions/showapplication.php:83
+#: actions/editapplication.php:83 actions/showapplication.php:87
 msgid "No such application."
 msgstr "అటువంటి ఉపకరణం లేదు."
 
@@ -2566,7 +2558,7 @@ msgid "Cannot normalize that email address."
 msgstr "ప్రస్తుత నిర్ధారిత ఈమెయిలు చిరునామా."
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:393 actions/register.php:204
+#: actions/emailsettings.php:393 actions/register.php:212
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "సరైన ఈమెయిల్ చిరునామా కాదు:"
@@ -2644,22 +2636,19 @@ msgstr "ఈమెయిలు చిరునామా లేదు."
 
 #. 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.
 #: actions/emailsettings.php:530 actions/emailsettings.php:554
-#: actions/smssettings.php:566 actions/smssettings.php:591
+#: actions/smssettings.php:565 actions/smssettings.php:588
 msgid "Could not update user record."
 msgstr "వాడుకరిని తాజాకరించలేకున్నాం."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
-#. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:534 actions/smssettings.php:570
+#: actions/emailsettings.php:534 actions/smssettings.php:568
 #, fuzzy
 msgid "Incoming email address removed."
 msgstr "ఆ ఈమెయిలు చిరునామాని తొలగించాం."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
-#. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:558 actions/smssettings.php:595
+#: actions/emailsettings.php:558 actions/smssettings.php:591
 #, fuzzy
 msgid "New incoming email address added."
 msgstr "ఈమెయిలు చిరునామా లేదు."
@@ -2672,7 +2661,7 @@ msgstr "ఈ నోటీసు ఇప్పటికే మీ ఇష్టా
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
 #: actions/favor.php:95
 #, fuzzy
-msgid "Disfavor favorite."
+msgid "Disfavor favorite"
 msgstr "ఇష్టాంశాలకు చేర్చు"
 
 #. TRANS: Page title for first page of favorited notices.
@@ -2910,12 +2899,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
 #: actions/groupblock.php:191
 #, fuzzy
-msgid "Do not block this user from this group."
+msgid "Do not block this user from this group"
 msgstr "ఈ వాడుకరిని ఈ గుంపు నుండి నిరోధించకు"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
 #: actions/groupblock.php:198
-msgid "Block this user from this group."
+#, fuzzy
+msgid "Block this user from this group"
 msgstr "ఈ వాడుకరిని ఈ గుంపునుండి నిరోధించండి."
 
 #. TRANS: Server error displayed when trying to block a user from a group fails because of an application error.
@@ -2925,7 +2915,6 @@ msgid "Database error blocking user from group."
 msgstr "ఈ వాడుకరిని ఈ గుంపు నుండి నిరోధించకు"
 
 #. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
-#. TRANS: Client error displayed trying to find a user by ID without providing an ID.
 #: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr "ఐడీ లేదు."
@@ -3108,10 +3097,8 @@ msgid "Group search"
 msgstr "గుంపుల అన్వేషణ"
 
 #. TRANS: Text on page where groups can be searched if no results were found for a query.
-#. TRANS: Text for notice search results is the query had no results.
-#. TRANS: Message on the "People search" page where a query has no results.
-#: actions/groupsearch.php:82 actions/noticesearch.php:122
-#: actions/peoplesearch.php:87
+#: actions/groupsearch.php:82 actions/noticesearch.php:117
+#: actions/peoplesearch.php:83
 msgid "No results."
 msgstr "ఫలితాలేమీ లేవు."
 
@@ -3147,7 +3134,6 @@ msgid "User is not blocked from group."
 msgstr "వాడుకరిని గుంపు నుండి నిరోధించలేదు."
 
 #. TRANS: Server error displayed when unblocking a user from a group fails because of an unknown error.
-#. TRANS: Server error displayed when removing a user block.
 #: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "నిరోధాన్ని తొలగించడంలో పొరపాటు."
@@ -3234,8 +3220,7 @@ msgid "Publish a MicroID for my Jabber/Google Talk address."
 msgstr "ప్రస్తుతం నిర్ధారించిన Jabber/GTalk చిరునామా"
 
 #. TRANS: Confirmation message for successful Instant Messaging preferences save.
-#. TRANS: Confirmation message after saving preferences.
-#: actions/imsettings.php:283 actions/othersettings.php:193
+#: actions/imsettings.php:283 actions/othersettings.php:192
 msgid "Preferences saved."
 msgstr "అభిరుచులు భద్రమయ్యాయి."
 
@@ -3518,7 +3503,7 @@ msgstr "గుంపుని వదిలివెళ్ళడానికి 
 
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
-#: actions/leavegroup.php:103 lib/command.php:386
+#: actions/leavegroup.php:103 lib/command.php:398
 msgid "You are not a member of that group."
 msgstr "మీరు ఆ గుంపులో సభ్యులు కాదు."
 
@@ -3641,52 +3626,50 @@ msgstr "భద్రపరచు"
 msgid "Save license settings"
 msgstr "లైసెన్సు అమరికలను భద్రపరచు"
 
-#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
-#: actions/login.php:97 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
 msgid "Already logged in."
 msgstr "ఇప్పటికే లోనికి ప్రవేశించారు."
 
-#: actions/login.php:142
+#: actions/login.php:148
 msgid "Incorrect username or password."
 msgstr "వాడుకరిపేరు లేదా సంకేతపదం తప్పు."
 
-#. TRANS: Server error displayed when a user object could not be created trying to login using "one time password login".
-#: actions/login.php:148 actions/otp.php:127
+#: actions/login.php:154 actions/otp.php:120
 msgid "Error setting user. You are probably not authorized."
 msgstr "వాడుకరిని అమర్చడంలో పొరపాటు. బహుశా మీకు అధీకరణ లేకపోవచ్చు."
 
-#: actions/login.php:202 actions/login.php:253
+#: actions/login.php:210 actions/login.php:263
 msgid "Login"
 msgstr "ప్రవేశించండి"
 
-#: actions/login.php:239
+#: actions/login.php:249
 msgid "Login to site"
 msgstr "సైటు లోనికి ప్రవేశించు"
 
-#: actions/login.php:248 actions/register.php:476
+#: actions/login.php:258 actions/register.php:490
 msgid "Remember me"
 msgstr "నన్ను గుర్తుంచుకో"
 
-#: actions/login.php:249 actions/register.php:478
+#: actions/login.php:259 actions/register.php:492
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "భవిష్యత్తులో ఆటోమెటిగ్గా లోనికి ప్రవేశించు; బయటి కంప్యూర్ల కొరకు కాదు!"
 
-#: actions/login.php:259
+#: actions/login.php:269
 msgid "Lost or forgotten password?"
 msgstr "మీ సంకేతపదం మర్చిపోయారా?"
 
-#: actions/login.php:277
+#: actions/login.php:288
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
 msgstr ""
 "భద్రతా కారణాల దృష్ట్యా, అమరికలు మార్చే ముందు మీ వాడుకరి పేరుని మరియు సంకేతపదాన్ని మరోసారి ఇవ్వండి."
 
-#: actions/login.php:281
+#: actions/login.php:292
 msgid "Login with your username and password."
 msgstr "మీ వాడుకరిపేరు మరియు సంకేతపదాలతో ప్రవేశించండి."
 
-#: actions/login.php:284
+#: actions/login.php:295
 #, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -3768,14 +3751,14 @@ msgid "New message"
 msgstr "కొత్త సందేశం"
 
 #. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
-#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:501
+#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:513
 msgid "You can't send a message to this user."
 msgstr "ఈ వాడుకరికి మీరు సందేశాన్ని పంపించలేరు."
 
 #. TRANS: Command exception text shown when trying to send a direct message to another user without content.
 #. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
-#: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:478
-#: lib/command.php:581
+#: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:490
+#: lib/command.php:593
 msgid "No content!"
 msgstr "విషయం లేదు!"
 
@@ -3784,7 +3767,7 @@ msgid "No recipient specified."
 msgstr "ఎవరికి పంపించాలో పేర్కొనలేదు."
 
 #. TRANS: Error text shown when trying to send a direct message to self.
-#: actions/newmessage.php:167 lib/command.php:505
+#: actions/newmessage.php:167 lib/command.php:517
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr "మీకు మీరే సందేశాన్ని పంపుకోకండి; దాని బదులు మీలో మీరే మెల్లగా చెప్పుకోండి."
@@ -3795,7 +3778,7 @@ msgstr "సందేశాన్ని పంపించాం"
 
 #. TRANS: Message given have sent a direct message to another user.
 #. TRANS: %s is the name of the other user.
-#: actions/newmessage.php:188 lib/command.php:513
+#: actions/newmessage.php:188 lib/command.php:525
 #, php-format
 msgid "Direct message to %s sent."
 msgstr "%sకి నేరు సందేశాన్ని పంపించాం."
@@ -3812,9 +3795,7 @@ msgstr "కొత్త సందేశం"
 msgid "Notice posted"
 msgstr "నోటీసుని పునరావృతించారు"
 
-#. TRANS: Instructions for Notice search page.
-#. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/noticesearch.php:69
+#: actions/noticesearch.php:68
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -3823,21 +3804,16 @@ msgstr ""
 "%%site.name%%లోని సందేశాలను వెతకండి. అన్వేషణ పదాలను ఖాళీలతో వేరుచేయండి; ఒక్కో పదంలో 3 లేదా "
 "అంతకంటే ఎక్కువ అక్షరాలు ఉండాలి."
 
-#. TRANS: Title of the page where users can search for notices.
-#: actions/noticesearch.php:80
+#: actions/noticesearch.php:78
 msgid "Text search"
 msgstr "పాఠ్య అన్వేషణ"
 
-#. TRANS: Test in RSS notice search.
-#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearch.php:95
+#: actions/noticesearch.php:91
 #, php-format
 msgid "Search results for \"%1$s\" on %2$s"
 msgstr "%2$sలో \"%1$s\"కై అన్వేషణ ఫలితాలు"
 
-#. TRANS: Text for logged in users making a query for notices without results.
-#. TRANS: This message contains a Markdown link.
-#: actions/noticesearch.php:128
+#: actions/noticesearch.php:121
 #, php-format
 msgid ""
 "Be the first to [post on this topic](%%%%action.newnotice%%%%?"
@@ -3845,9 +3821,7 @@ msgid ""
 msgstr ""
 "[ఈ విషయంపై](%%%%action.newnotice%%%%?status_textarea=%s) వ్రాసే మొదటివారు మీరే అవ్వండి!"
 
-#. TRANS: Text for not logged in users making a query for notices without results.
-#. TRANS: This message contains Markdown links.
-#: actions/noticesearch.php:133
+#: actions/noticesearch.php:124
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and be the first to "
@@ -3856,17 +3830,14 @@ msgstr ""
 "మీరు [ఒక ఖాతా నమోదు చేసుకుని](%%%%action.register%%%%) [ఈ విషయంపై వ్రాసే](%%%%action."
 "newnotice%%%%?status_textarea=%s) మొదటివారు ఎందుకుకాకూడదు!"
 
-#. TRANS: RSS notice search feed title. %s is the query.
-#: actions/noticesearchrss.php:95
+#: actions/noticesearchrss.php:96
 #, php-format
 msgid "Updates with \"%s\""
 msgstr "%2$sలో %1$s అనే ట్యాగుతో ఉన్న నోటీసులు!"
 
-#. TRANS: RSS notice search feed description.
-#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearchrss.php:99
+#: actions/noticesearchrss.php:98
 #, fuzzy, php-format
-msgid "Updates matching search term \"%1$s\" on %2$s."
+msgid "Updates matching search term \"%1$s\" on %2$s!"
 msgstr "%2$sలో %1$s అనే ట్యాగుతో ఉన్న నోటీసులు!"
 
 #: actions/nudge.php:85
@@ -3907,30 +3878,30 @@ msgid "You have not registered any applications yet."
 msgstr "మీరు ఇంకా ఏ ఉపకరణాన్నీ నమోదు చేసుకోలేదు."
 
 #. TRANS: Title for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:70
+#: actions/oauthconnectionssettings.php:71
 msgid "Connected applications"
 msgstr "సంధానిత ఉపకరణాలు"
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:81
+#: actions/oauthconnectionssettings.php:83
 msgid "The following connections exist for your account."
 msgstr ""
 
 #. TRANS: Client error when trying to revoke access for an application while not being a user of it.
-#: actions/oauthconnectionssettings.php:166
+#: actions/oauthconnectionssettings.php:168
 msgid "You are not a user of that application."
 msgstr "మీరు ఆ ఉపకరణం యొక్క వాడుకరి కాదు."
 
 #. TRANS: Client error when revoking access has failed for some reason.
 #. TRANS: %s is the application ID revoking access failed for.
-#: actions/oauthconnectionssettings.php:181
+#: actions/oauthconnectionssettings.php:183
 #, fuzzy, php-format
 msgid "Unable to revoke access for application: %s."
 msgstr "మీ ఉపకరణాన్ని మార్చడానికి ఈ ఫారాన్ని ఉపయోగించండి."
 
 #. TRANS: Success message after revoking access for an application.
 #. TRANS: %1$s is the application name, %2$s is the first part of the user token.
-#: actions/oauthconnectionssettings.php:200
+#: actions/oauthconnectionssettings.php:202
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -3938,30 +3909,20 @@ msgid ""
 msgstr ""
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:211
+#: actions/oauthconnectionssettings.php:213
 msgid "You have not authorized any applications to use your account."
 msgstr "మీ ఖాతాని ఉపయోగించుకోడానికి మీరు ఏ ఉపకరణాన్నీ అధీకరించలేదు."
 
 #. TRANS: Note for developers in the OAuth connection settings form.
 #. TRANS: This message contains a Markdown link. Do not separate "](".
 #. TRANS: %s is the URL to the OAuth settings.
-#: actions/oauthconnectionssettings.php:231
+#: actions/oauthconnectionssettings.php:233
 #, php-format
 msgid ""
 "Are you a developer? [Register an OAuth client application](%s) to use with "
 "this instance of StatusNet."
 msgstr ""
 
-#: actions/oembed.php:64
-#, fuzzy, php-format
-msgid "\"%s\" not found."
-msgstr "వాడుకరి దొరకలేదు."
-
-#: actions/oembed.php:76
-#, fuzzy, php-format
-msgid "Notice %s not found."
-msgstr "నిర్ధారణ సంకేతం కనబడలేదు."
-
 #: actions/oembed.php:80 actions/shownotice.php:100
 msgid "Notice has no profile."
 msgstr "నోటీసుకి ప్రొఫైలు లేదు."
@@ -3971,16 +3932,6 @@ msgstr "నోటీసుకి ప్రొఫైలు లేదు."
 msgid "%1$s's status on %2$s"
 msgstr "%2$sలో %1$s యొక్క స్థితి"
 
-#: actions/oembed.php:95
-#, fuzzy, php-format
-msgid "Attachment %s not found."
-msgstr "అందుకోవాల్సిన వాడుకరి కనబడలేదు."
-
-#: actions/oembed.php:136
-#, php-format
-msgid "\"%s\" not supported for oembed requests."
-msgstr ""
-
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
 #: actions/oembed.php:168
 #, fuzzy, php-format
@@ -3999,12 +3950,11 @@ msgstr ""
 msgid "Not a supported data format."
 msgstr ""
 
-#. TRANS: ShortName in the OpenSearch interface when trying to find users.
 #: actions/opensearch.php:64
 msgid "People Search"
 msgstr "ప్రజల అన్వేషణ"
 
-#: actions/opensearch.php:68
+#: actions/opensearch.php:67
 msgid "Notice Search"
 msgstr "నోటీసుల అన్వేషణ"
 
@@ -4053,49 +4003,40 @@ msgstr "ఫ్రొఫైలు రూపురేఖలు"
 msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr "URL కుదింపు సేవ మరీ పెద్దగా ఉంది (50 అక్షరాలు గరిష్ఠం)."
 
-#. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
-#: actions/otp.php:70
+#: actions/otp.php:69
 msgid "No user ID specified."
 msgstr "గుంపు ఏమీ పేర్కొనలేదు."
 
-#. TRANS: Client error displayed trying to use "one time password login" without specifying a login token.
-#: actions/otp.php:86
+#: actions/otp.php:83
 msgid "No login token specified."
 msgstr "గుంపు ఏమీ పేర్కొనలేదు."
 
-#. TRANS: Client error displayed trying to use "one time password login" without requesting a login token.
-#: actions/otp.php:94
+#: actions/otp.php:90
 #, fuzzy
 msgid "No login token requested."
 msgstr "అధీకరణ అభ్యర్థన లేదు!"
 
-#. TRANS: Client error displayed trying to use "one time password login" while specifying an invalid login token.
-#: actions/otp.php:100
+#: actions/otp.php:95
 #, fuzzy
 msgid "Invalid login token specified."
 msgstr "సందేశపు విషయం సరైనది కాదు"
 
-#. TRANS: Client error displayed trying to use "one time password login" while specifying an expired login token.
-#: actions/otp.php:110
+#: actions/otp.php:104
 #, fuzzy
 msgid "Login token expired."
 msgstr "సైటు లోనికి ప్రవేశించు"
 
-#. TRANS: Title for outbox for any but the fist page.
-#. TRANS: %1$s is the user nickname, %2$d is the page number.
-#: actions/outbox.php:57
+#: actions/outbox.php:58
 #, fuzzy, php-format
 msgid "Outbox for %1$s - page %2$d"
 msgstr "%1$sకి వచ్చినవి - %2$dవ పేజీ"
 
-#. TRANS: Title for first page of outbox.
 #: actions/outbox.php:61
 #, fuzzy, php-format
 msgid "Outbox for %s"
 msgstr "%sకి వచ్చినవి"
 
-#. TRANS: Instructions for outbox.
-#: actions/outbox.php:103
+#: actions/outbox.php:104
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr "ఇవి మీరు పంపివున్న అంతరంగిక సందేశాలు."
 
@@ -4121,44 +4062,43 @@ msgstr "పాత సంకేతపదం"
 msgid "New password"
 msgstr "కొత్త సంకేతపదం"
 
-#: actions/passwordsettings.php:109 actions/register.php:423
-msgid "6 or more characters."
+#: actions/passwordsettings.php:109
+#, fuzzy
+msgid "6 or more characters"
 msgstr "6 లేదా అంతకంటే ఎక్కువ అక్షరాలు."
 
-#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:264
-#: actions/register.php:427
+#: actions/passwordsettings.php:113
 #, fuzzy
-msgid "Same as password above."
+msgid "Same as password above"
 msgstr "పై సంకేతపదం వలెనే"
 
 #: actions/passwordsettings.php:117
 msgid "Change"
 msgstr "మార్చు"
 
-#: actions/passwordsettings.php:153 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:238
 msgid "Password must be 6 or more characters."
 msgstr "సంకేతపదం తప్పనిసరిగా 6 లేదా అంతకంటే ఎక్కువ అక్షరాలుండాలి."
 
-#: actions/passwordsettings.php:156 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:241
 msgid "Passwords don't match."
 msgstr "సంకేతపదాలు సరిపోలలేదు."
 
-#: actions/passwordsettings.php:164
+#: actions/passwordsettings.php:165
 msgid "Incorrect old password"
 msgstr "పాత సంకేతపదం తప్పు"
 
-#: actions/passwordsettings.php:180
+#: actions/passwordsettings.php:181
 msgid "Error saving user; invalid."
 msgstr "వాడుకరిని భద్రపరచడంలో పొరపాటు: సరికాదు."
 
-#. TRANS: Reset password form validation error message.
-#: actions/passwordsettings.php:185 actions/recoverpassword.php:418
+#: actions/passwordsettings.php:186
 #, fuzzy
-msgid "Cannot save new password."
+msgid "Can't save new password."
 msgstr "కొత్త సంకేతపదాన్ని భద్రపరచలేము."
 
-#: actions/passwordsettings.php:191
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
 msgid "Password saved."
 msgstr "సంకేతపదం భద్రమయ్యింది."
 
@@ -4448,9 +4388,7 @@ msgstr ""
 msgid "Save paths"
 msgstr "కొత్త సందేశం"
 
-#. TRANS: Instructions for the "People search" page.
-#. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/peoplesearch.php:54
+#: actions/peoplesearch.php:52
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
@@ -4459,8 +4397,7 @@ msgstr ""
 "%%site.name%%లో వ్యక్తులను వారి పేరు, ప్రాంతం, లేదా ఆసక్తులను బట్టి వెతకండి. అన్వేషించే పదాలను "
 "ఖాళీలతో వేరుచేయండి; ఒక్కో పదంలో 3 లేదా అంతకంటే ఎక్కువ అక్షరాలు ఉండాలి."
 
-#. TRANS: Title of a page where users can search for other users.
-#: actions/peoplesearch.php:61
+#: actions/peoplesearch.php:58
 msgid "People search"
 msgstr "వ్యక్తుల అన్వేషణ"
 
@@ -4502,7 +4439,7 @@ msgid "Profile information"
 msgstr "ప్రొఫైలు సమాచారం"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109 actions/register.php:419
+#: actions/profilesettings.php:109 actions/register.php:433
 #, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr "1-64 చిన్నబడి అక్షరాలు లేదా అంకెలు, విరామచిహ్నాలు మరియు ఖాళీలు తప్ప"
@@ -4510,7 +4447,7 @@ msgstr "1-64 చిన్నబడి అక్షరాలు లేదా అ
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for full group name (dt). Text hidden by default.
 #. TRANS: DT for full name in a profile.
-#: actions/profilesettings.php:113 actions/register.php:441
+#: actions/profilesettings.php:113 actions/register.php:455
 #: actions/showgroup.php:255 actions/tagother.php:104
 #: lib/groupeditform.php:150 lib/userprofile.php:156
 msgid "Full name"
@@ -4518,13 +4455,13 @@ msgstr "పూర్తి పేరు"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:118 actions/register.php:446
+#: actions/profilesettings.php:118 actions/register.php:460
 #: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "హోమ్ పేజీ"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:121 actions/register.php:448
+#: actions/profilesettings.php:121
 #, fuzzy
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr "మీ హోమ్ పేజీ, బ్లాగు, లేదా వేరే సేటులోని మీ ప్రొఫైలు యొక్క చిరునామా"
@@ -4532,7 +4469,7 @@ msgstr "మీ హోమ్ పేజీ, బ్లాగు, లేదా వ
 #. TRANS: Tooltip for field label in form for profile settings. Plural
 #. TRANS: is decided by the number of characters available for the
 #. TRANS: biography (%d).
-#: actions/profilesettings.php:129 actions/register.php:457
+#: actions/profilesettings.php:129 actions/register.php:471
 #, fuzzy, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4540,29 +4477,28 @@ msgstr[0] "మీ గురించి మరియు మీ ఆసక్త
 msgstr[1] "మీ గురించి మరియు మీ ఆసక్తుల గురించి %d అక్షరాల్లో చెప్పండి"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:135 actions/register.php:462
+#: actions/profilesettings.php:135 actions/register.php:476
 msgid "Describe yourself and your interests"
 msgstr "మీ గురించి మరియు మీ ఆసక్తుల గురించి చెప్పండి"
 
 #. TRANS: Text area label in form for profile settings where users can provide.
 #. TRANS: their biography.
-#: actions/profilesettings.php:139 actions/register.php:464
+#: actions/profilesettings.php:139 actions/register.php:478
 msgid "Bio"
 msgstr "స్వపరిచయం"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group location (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT for location in a profile.
-#: actions/profilesettings.php:145 actions/register.php:469
+#: actions/profilesettings.php:145 actions/register.php:483
 #: actions/showgroup.php:265 actions/tagother.php:112
-#: actions/userauthorization.php:174 lib/groupeditform.php:173
+#: actions/userauthorization.php:166 lib/groupeditform.php:173
 #: lib/userprofile.php:172
 msgid "Location"
 msgstr "ప్రాంతం"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148
+#: actions/profilesettings.php:148 actions/register.php:485
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "మీరు ఎక్కడ నుండి, \"నగరం, రాష్ట్రం (లేదా ప్రాంతం), దేశం\""
 
@@ -4582,8 +4518,7 @@ msgstr "ట్యాగులు"
 #. TRANS: Tooltip for field label in form for profile settings.
 #: actions/profilesettings.php:164
 msgid ""
-"Tags for yourself (letters, numbers, -, ., and _), comma- or space- "
-"separated."
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr ""
 
 #. TRANS: Dropdownlist label in form for profile settings.
@@ -4593,7 +4528,8 @@ msgstr "భాష"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
 #: actions/profilesettings.php:171
-msgid "Preferred language."
+#, fuzzy
+msgid "Preferred language"
 msgstr "ప్రాధాన్యతా భాష."
 
 #. TRANS: Dropdownlist label in form for profile settings.
@@ -4610,13 +4546,13 @@ msgstr "మీరు సామాన్యంగా ఉండే కాలమం
 #: actions/profilesettings.php:189
 #, fuzzy
 msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)."
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr "ఉపయోగించాల్సిన యాంత్రిక కుదింపు సేవ."
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Plural form is used based on the maximum number of allowed
 #. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:258 actions/register.php:221
+#: actions/profilesettings.php:258 actions/register.php:229
 #, fuzzy, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4636,9 +4572,9 @@ msgstr "భాష మరీ పెద్దగా ఉంది (50 అక్ష
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:291
-#, fuzzy, php-format
-msgid "Invalid tag: \"%s\"."
+#: actions/profilesettings.php:291 actions/tagother.php:178
+#, php-format
+msgid "Invalid tag: \"%s\""
 msgstr "తప్పుడు మారుపేరు: \"%s\""
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
@@ -4745,12 +4681,6 @@ msgstr ""
 "ఇది %%site.name%%, స్వేచ్ఛా మృదూపకరమైన [స్టేటస్‌నెట్](http://status.net/) అనే పనిముట్టుపై "
 "ఆధారపడిన ఒక [మైక్రో-బ్లాగింగు](http://en.wikipedia.org/wiki/Micro-blogging) సేవ."
 
-#. TRANS: Public RSS feed description. %s is the StatusNet site name.
-#: actions/publicrss.php:106
-#, fuzzy, php-format
-msgid "%s updates from everyone."
-msgstr "అందరి నుండి %s తాజాకరణలు!"
-
 #. TRANS: Title for public tag cloud.
 #: actions/publictagcloud.php:57
 msgid "Public tag cloud"
@@ -4889,12 +4819,6 @@ msgstr "కొత్త సంకేతపదం"
 msgid "Password recovery requested"
 msgstr ""
 
-#. TRANS: Title for password recovery page in password saved mode.
-#: actions/recoverpassword.php:229
-#, fuzzy
-msgid "Password saved"
-msgstr "సంకేతపదం భద్రమయ్యింది."
-
 #. TRANS: Title for password recovery page when an unknown action has been specified.
 #: actions/recoverpassword.php:232
 msgid "Unknown action"
@@ -4906,6 +4830,12 @@ msgstr "తెలియని చర్య"
 msgid "6 or more characters, and do not forget it!"
 msgstr "6 లేదా అంతకంటే ఎక్కువ అక్షరాలు, మర్చిపోకండి!"
 
+#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#: actions/recoverpassword.php:264 actions/register.php:441
+#, fuzzy
+msgid "Same as password above."
+msgstr "పై సంకేతపదం వలెనే"
+
 #. TRANS: Button text for password reset form.
 #. TRANS: Button text on profile design page to reset all colour settings to default without saving.
 #: actions/recoverpassword.php:268 lib/designsettings.php:264
@@ -4956,8 +4886,14 @@ msgstr "సంకేతపదం 6 లేదా అంతకంటే ఎక్
 msgid "Password and confirmation do not match."
 msgstr "సంకేతపదం మరియు నిర్ధారణ సరిపోలేదు."
 
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:418
+#, fuzzy
+msgid "Cannot save new password."
+msgstr "కొత్త సంకేతపదాన్ని భద్రపరచలేము."
+
 #. TRANS: Server error displayed when something does wrong with the user object during password reset.
-#: actions/recoverpassword.php:426 actions/register.php:248
+#: actions/recoverpassword.php:426 actions/register.php:256
 #, fuzzy
 msgid "Error setting user."
 msgstr "వాడుకరిని భద్రపరచడంలో పొరపాటు: సరికాదు."
@@ -4967,89 +4903,93 @@ msgstr "వాడుకరిని భద్రపరచడంలో పొర
 msgid "New password successfully saved. You are now logged in."
 msgstr "మీ కొత్త సంకేతపదం భద్రమైంది. మీరు ఇప్పుడు లోనికి ప్రవేశించారు."
 
-#: actions/register.php:87 actions/register.php:188 actions/register.php:399
+#: actions/register.php:92 actions/register.php:196 actions/register.php:413
 msgid "Sorry, only invited people can register."
 msgstr "క్షమించండి, ఆహ్వానితులు మాత్రమే నమోదుకాగలరు."
 
-#: actions/register.php:94
+#: actions/register.php:99
 msgid "Sorry, invalid invitation code."
 msgstr "క్షమించండి, తప్పు ఆహ్వాన సంకేతం."
 
-#: actions/register.php:113
+#: actions/register.php:119
 msgid "Registration successful"
 msgstr "నమోదు విజయవంతం"
 
-#: actions/register.php:115 actions/register.php:497
+#: actions/register.php:121 actions/register.php:511
 msgid "Register"
 msgstr "నమోదు"
 
-#: actions/register.php:135
+#: actions/register.php:142
 msgid "Registration not allowed."
 msgstr "నమోదు అనుమతించబడదు."
 
-#: actions/register.php:201
+#: actions/register.php:209
 #, fuzzy
-msgid "You cannot register if you don't agree to the license."
+msgid "You can't register if you don't agree to the license."
 msgstr "ఈ లైసెన్సుకి అంగీకరించకపోతే మీరు నమోదుచేసుకోలేరు."
 
-#: actions/register.php:210
+#: actions/register.php:218
 msgid "Email address already exists."
 msgstr "ఈమెయిల్ చిరునామా ఇప్పటికే ఉంది."
 
-#: actions/register.php:243 actions/register.php:265
+#: actions/register.php:251 actions/register.php:273
 msgid "Invalid username or password."
 msgstr "వాడుకరిపేరు లేదా సంకేతపదం తప్పు."
 
-#: actions/register.php:340
+#: actions/register.php:351
 msgid ""
 "With this form you can create a new account. You can then post notices and "
-"link up to friends and colleagues."
+"link up to friends and colleagues. "
 msgstr ""
 
+#: actions/register.php:437
+msgid "6 or more characters."
+msgstr "6 లేదా అంతకంటే ఎక్కువ అక్షరాలు."
+
 #. TRANS: Link description in user account settings menu.
-#: actions/register.php:431 actions/register.php:435
+#: actions/register.php:445 actions/register.php:449
 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
 msgid "Email"
 msgstr "ఈమెయిల్"
 
-#: actions/register.php:432 actions/register.php:436
+#: actions/register.php:446 actions/register.php:450
 #, fuzzy
-msgid "Used only for updates, announcements, and password recovery."
+msgid "Used only for updates, announcements, and password recovery"
 msgstr "తాజా విశేషాలు, ప్రకటనలు, మరియు సంకేతపదం పోయినప్పుడు మాత్రమే ఉపయోగిస్తాం."
 
-#: actions/register.php:443
+#: actions/register.php:457
 #, fuzzy
-msgid "Longer name, preferably your \"real\" name."
+msgid "Longer name, preferably your \"real\" name"
 msgstr "పొడుగాటి పేరు, మీ \"అసలు\" పేరైతే మంచిది"
 
-#: actions/register.php:471
+#: actions/register.php:462
 #, fuzzy
-msgid "Where you are, like \"City, State (or Region), Country\"."
-msgstr "మీరు ఎక్కడ నుండి, \"నగరం, రాష్ట్రం (లేదా ప్రాంతం), దేశం\""
+msgid "URL of your homepage, blog, or profile on another site"
+msgstr "మీ హోమ్ పేజీ, బ్లాగు, లేదా వేరే సేటులోని మీ ప్రొఫైలు యొక్క చిరునామా"
 
-#: actions/register.php:510
+#: actions/register.php:523
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
 msgstr ""
 
-#: actions/register.php:520
+#: actions/register.php:533
 #, php-format
 msgid "My text and files are copyright by %1$s."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:524
+#: actions/register.php:537
 msgid "My text and files remain under my own copyright."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:527
+#: actions/register.php:540
 msgid "All rights reserved."
 msgstr "సర్వహక్కులూ సురక్షితం."
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:532
+#: actions/register.php:545
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -5058,7 +4998,7 @@ msgstr ""
 "నా పాఠ్యం మరియు దస్త్రాలు %s క్రింద లభ్యం, ఈ అంతరంగిక భోగట్టా తప్ప: సంకేతపదం, ఈమెయిల్ చిరునామా, IM "
 "చిరునామా, మరియు ఫోన్ నంబర్."
 
-#: actions/register.php:573
+#: actions/register.php:588
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -5089,7 +5029,7 @@ msgstr ""
 "\n"
 "నమోదుచేసుకున్నందుకు కృతజ్ఞతలు మరియు ఈ సేవని ఉపయోగిస్తూ మీరు ఆనందిస్తారని మేం ఆశిస్తున్నాం."
 
-#: actions/register.php:597
+#: actions/register.php:612
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5122,7 +5062,7 @@ msgstr "వాడుకరి పేరు"
 
 #: actions/remotesubscribe.php:129
 #, fuzzy
-msgid "Nickname of the user you want to follow."
+msgid "Nickname of the user you want to follow"
 msgstr "మీరు అనుసరించాలనుకుంటున్న వాడుకరి యొక్క ముద్దుపేరు"
 
 #: actions/remotesubscribe.php:132
@@ -5130,7 +5070,7 @@ msgid "Profile URL"
 msgstr "ప్రొఫైలు URL"
 
 #: actions/remotesubscribe.php:133
-msgid "URL of your profile on another compatible microblogging service."
+msgid "URL of your profile on another compatible microblogging service"
 msgstr ""
 
 #. TRANS: Link text for link that will subscribe to a remote profile.
@@ -5141,7 +5081,7 @@ msgstr "చందాచేరు"
 
 #: actions/remotesubscribe.php:158
 #, fuzzy
-msgid "Invalid profile URL (bad format)."
+msgid "Invalid profile URL (bad format)"
 msgstr "ప్రొపైల్ URL తప్పు (చెడు ఫార్మాట్)"
 
 #: actions/remotesubscribe.php:167
@@ -5184,7 +5124,6 @@ msgstr "సృష్టితం"
 msgid "Repeated!"
 msgstr "పునరావృతించారు!"
 
-#. TRANS: RSS reply feed title. %s is a user nickname.
 #. TRANS: Tooltip for personal group navigation menu option when logged in for viewing @-replies.
 #: actions/replies.php:126 actions/repliesrss.php:68
 #: lib/personalgroupnav.php:109
@@ -5236,11 +5175,9 @@ msgid ""
 msgstr ""
 "[ఈ విషయంపై](%%%%action.newnotice%%%%?status_textarea=%s) వ్రాసే మొదటివారు మీరే అవ్వండి!"
 
-#. TRANS: RSS reply feed description.
-#. TRANS: %1$s is a user nickname, %2$s is the StatusNet site name.
-#: actions/repliesrss.php:74
+#: actions/repliesrss.php:72
 #, fuzzy, php-format
-msgid "Replies to %1$s on %2$s."
+msgid "Replies to %1$s on %2$s!"
 msgstr "%2$sలో %1$sకి స్పందనలు!"
 
 #. TRANS: Client exception displayed when trying to restore an account while not logged in.
@@ -5340,7 +5277,7 @@ msgstr "ఈ సైటులో మీరు వాడుకరలకి పా
 msgid "User doesn't have this role."
 msgstr "వాడుకరికి ఈ పాత్ర లేదు."
 
-#: actions/rsd.php:142 actions/version.php:159
+#: actions/rsd.php:146 actions/version.php:159
 msgid "StatusNet"
 msgstr "స్టేటస్‌నెట్"
 
@@ -5385,94 +5322,94 @@ msgstr ""
 msgid "Save site settings"
 msgstr "సైటు అమరికలను భద్రపరచు"
 
-#: actions/showapplication.php:78
+#: actions/showapplication.php:82
 msgid "You must be logged in to view an application."
 msgstr "ఉపకరణాలని చూడడానికి మీరు తప్పనిసరిగా ప్రవేశించి ఉండాలి."
 
-#: actions/showapplication.php:151
+#: actions/showapplication.php:157
 msgid "Application profile"
 msgstr "ఉపకరణ ప్రవర"
 
 #. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:153 lib/applicationeditform.php:177
+#: actions/showapplication.php:159 lib/applicationeditform.php:177
 msgid "Icon"
 msgstr "ప్రతీకం"
 
 #. TRANS: Form input field label for application name.
-#: actions/showapplication.php:163 actions/version.php:197
+#: actions/showapplication.php:169 actions/version.php:197
 #: lib/applicationeditform.php:190
 msgid "Name"
 msgstr "పేరు"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:172 lib/applicationeditform.php:227
+#: actions/showapplication.php:178 lib/applicationeditform.php:227
 msgid "Organization"
 msgstr "సంస్ధ"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:181 actions/version.php:200
+#: actions/showapplication.php:187 actions/version.php:200
 #: lib/applicationeditform.php:208 lib/groupeditform.php:168
 msgid "Description"
 msgstr "వివరణ"
 
 #. TRANS: Header for group statistics on a group page (h2).
 #. TRANS: H2 text for user statistics.
-#: actions/showapplication.php:186 actions/showgroup.php:460
+#: actions/showapplication.php:192 actions/showgroup.php:460
 #: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "గణాంకాలు"
 
-#: actions/showapplication.php:197
+#: actions/showapplication.php:203
 #, php-format
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr "సృష్టించినది %1$s - అప్రమేయ అందుబాటు %2$s  - %3$d వాడుకరులు"
 
-#: actions/showapplication.php:207
+#: actions/showapplication.php:213
 msgid "Application actions"
 msgstr "ఉపకరణ చర్యలు"
 
-#: actions/showapplication.php:230
+#: actions/showapplication.php:236
 msgid "Reset key & secret"
 msgstr ""
 
 #. TRANS: Title of form for deleting a user.
-#: actions/showapplication.php:246 lib/deletegroupform.php:121
+#: actions/showapplication.php:252 lib/deletegroupform.php:121
 #: lib/deleteuserform.php:64 lib/noticelist.php:673
 msgid "Delete"
 msgstr "తొలగించు"
 
-#: actions/showapplication.php:255
+#: actions/showapplication.php:261
 msgid "Application info"
 msgstr "ఉపకరణ సమాచారం"
 
-#: actions/showapplication.php:257
+#: actions/showapplication.php:263
 msgid "Consumer key"
 msgstr ""
 
-#: actions/showapplication.php:262
+#: actions/showapplication.php:268
 msgid "Consumer secret"
 msgstr ""
 
-#: actions/showapplication.php:267
+#: actions/showapplication.php:273
 msgid "Request token URL"
 msgstr ""
 
-#: actions/showapplication.php:272
+#: actions/showapplication.php:278
 msgid "Access token URL"
 msgstr ""
 
-#: actions/showapplication.php:277
+#: actions/showapplication.php:283
 #, fuzzy
 msgid "Authorize URL"
 msgstr "రచయిత"
 
-#: actions/showapplication.php:282
+#: actions/showapplication.php:288
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
 msgstr ""
 
-#: actions/showapplication.php:302
+#: actions/showapplication.php:309
 #, fuzzy
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr "మీరు నిజంగానే ఈ నోటీసుని తొలగించాలనుకుంటున్నారా?"
@@ -5561,18 +5498,16 @@ msgid "Group profile"
 msgstr "గుంపు ప్రొఫైలు"
 
 #. TRANS: Label for group URL (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT for URL in a profile.
 #: actions/showgroup.php:273 actions/tagother.php:118
-#: actions/userauthorization.php:184 lib/userprofile.php:186
+#: actions/userauthorization.php:175 lib/userprofile.php:186
 msgid "URL"
 msgstr ""
 
 #. TRANS: Label for group description or group note (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page where bio is displayed.
 #. TRANS: DT for note in a profile.
 #: actions/showgroup.php:285 actions/tagother.php:128
-#: actions/userauthorization.php:197 lib/userprofile.php:204
+#: actions/userauthorization.php:187 lib/userprofile.php:204
 msgid "Note"
 msgstr "గమనిక"
 
@@ -5721,7 +5656,7 @@ msgid "%1$s tagged %2$s"
 msgstr "%1$s, %2$dవ పేజీ"
 
 #. TRANS: Page title showing tagged notices in one user's stream.
-#. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
+#. TRANS: %1$s is the username, %2$s is the hash tag, %1$d is the page number.
 #: actions/showstream.php:74
 #, fuzzy, php-format
 msgid "%1$s tagged %2$s, page %3$d"
@@ -5970,7 +5905,7 @@ msgstr "సైటు-వారీ నోటీసు పాఠ్యం (255 అ
 #. TRANS: Title for button to save site notice in admin panel.
 #: actions/sitenoticeadminpanel.php:201
 #, fuzzy
-msgid "Save site notice."
+msgid "Save site notice"
 msgstr "సైటు గమనికని భద్రపరచు"
 
 #. TRANS: Title for SMS settings.
@@ -6031,7 +5966,7 @@ msgstr "ఫోను నెంబరు లేదు."
 #. TRANS: SMS phone number input field instructions in SMS settings form.
 #: actions/smssettings.php:152
 #, fuzzy
-msgid "Phone number, no punctuation or spaces, with area code."
+msgid "Phone number, no punctuation or spaces, with area code"
 msgstr "1-64 చిన్నబడి అక్షరాలు లేదా అంకెలు, విరామ చిహ్నాలు లేదా ఖాళీలు లేకుండా. తప్పనిసరి."
 
 #. TRANS: Form legend for SMS preferences form.
@@ -6200,19 +6135,15 @@ msgstr "మీరు ఎవరికీ చందాచేరలేదు."
 msgid "Could not save subscription."
 msgstr "కొత్త చందాని చేర్చలేకపోయాం."
 
-#. TRANS: Client error displayed trying to perform any request method other than POST.
-#. TRANS: Do not translate POST.
 #: actions/subscribe.php:77
 msgid "This action only accepts POST requests."
 msgstr ""
 
-#. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
-#: actions/subscribe.php:121
+#: actions/subscribe.php:117
 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
 msgstr ""
 
-#. TRANS: Page title when subscription succeeded.
-#: actions/subscribe.php:149
+#: actions/subscribe.php:145
 msgid "Subscribed"
 msgstr "చందాచేరారు"
 
@@ -6366,9 +6297,8 @@ msgstr "ట్యాగులు"
 msgid "User profile"
 msgstr "వాడుకరి ప్రొఫైలు"
 
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT element in area for user avatar.
-#: actions/tagother.php:81 actions/userauthorization.php:138
+#: actions/tagother.php:81 actions/userauthorization.php:132
 #: lib/userprofile.php:108
 msgid "Photo"
 msgstr "ఫొటో"
@@ -6384,11 +6314,6 @@ msgid ""
 "separated"
 msgstr ""
 
-#: actions/tagother.php:178
-#, php-format
-msgid "Invalid tag: \"%s\""
-msgstr "తప్పుడు మారుపేరు: \"%s\""
-
 #: actions/tagother.php:193
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
@@ -6403,7 +6328,6 @@ msgstr "మీ ఉపకరణాన్ని మార్చడానికి
 msgid "No such tag."
 msgstr "అటువంటి ట్యాగు లేదు."
 
-#. TRANS: Client error displayed when trying to unblock a non-blocked user.
 #: actions/unblock.php:59
 msgid "You haven't blocked that user."
 msgstr "మీరు ఆ వాడుకరిని నిరోధించలేదు."
@@ -6426,7 +6350,7 @@ msgstr "అధీకరణ అభ్యర్థన లేదు!"
 msgid "Unsubscribed"
 msgstr "చందామాను"
 
-#: actions/updateprofile.php:64
+#: actions/updateprofile.php:64 actions/userauthorization.php:337
 #, php-format
 msgid ""
 "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
@@ -6457,7 +6381,7 @@ msgstr "చెల్లని స్వాగత పాఠ్యం. గరి
 #. TRANS: users in user admin panel. %1$s is the invalid nickname.
 #: actions/useradminpanel.php:166
 #, php-format
-msgid "Invalid default subscripton: \"%1$s\" is not a user."
+msgid "Invalid default subscripton: '%1$s' is not a user."
 msgstr ""
 
 #. TRANS: Link description in user account settings menu.
@@ -6520,136 +6444,105 @@ msgstr "వాడుకరులను కొత్త వారిని ఆహ
 #. TRANS: Title for button to save user settings in user admin panel.
 #: actions/useradminpanel.php:302
 #, fuzzy
-msgid "Save user settings."
+msgid "Save user settings"
 msgstr "వాడుకరి అమరికలను భద్రపరచు"
 
-#. TRANS: Page title.
-#: actions/userauthorization.php:109
+#: actions/userauthorization.php:105
 msgid "Authorize subscription"
 msgstr "చందాని అధీకరించండి"
 
-#. TRANS: Page notice on "Auhtorize subscription" page.
-#: actions/userauthorization.php:115
+#: actions/userauthorization.php:110
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
 "user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
-"click \"Reject\"."
+"click “Reject”."
 msgstr ""
 
-#. TRANS: DT element on Authorise Subscription page where license is displayed.
 #. TRANS: Menu item for site administration
-#: actions/userauthorization.php:207 actions/version.php:167
+#: actions/userauthorization.php:196 actions/version.php:167
 #: lib/adminpanelaction.php:403
 msgid "License"
 msgstr "లైసెన్సు"
 
-#. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:229
-msgctxt "BUTTON"
+#: actions/userauthorization.php:217
+#, fuzzy
 msgid "Accept"
 msgstr "అంగీకరించు"
 
-#. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:231
-msgid "Subscribe to this user."
-msgstr "ఈ వాడుకరికి చందాచేరండి."
+#: actions/userauthorization.php:218 lib/subscribeform.php:115
+#: lib/subscribeform.php:139
+msgid "Subscribe to this user"
+msgstr "ఈ వాడుకరికి చందాచేరు"
 
-#. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:233
-msgctxt "BUTTON"
+#: actions/userauthorization.php:219
+#, fuzzy
 msgid "Reject"
 msgstr "తిరస్కరించు"
 
-#. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:235
-msgid "Reject this subscription."
+#: actions/userauthorization.php:220
+#, fuzzy
+msgid "Reject this subscription"
 msgstr "ఈ చందాని తిరస్కరించండి."
 
-#. TRANS: Client error displayed for an empty authorisation request.
-#: actions/userauthorization.php:248
+#: actions/userauthorization.php:232
 msgid "No authorization request!"
 msgstr "అధీకరణ అభ్యర్థన లేదు!"
 
-#. TRANS: Accept message header from Authorise subscription page.
-#: actions/userauthorization.php:271
+#: actions/userauthorization.php:254
 msgid "Subscription authorized"
 msgstr "చందాని అధీకరించారు"
 
-#: actions/userauthorization.php:274
+#: actions/userauthorization.php:256
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to authorize the "
 "subscription. Your subscription token is:"
 msgstr ""
 
-#. TRANS: Reject message header from Authorise subscription page.
-#: actions/userauthorization.php:285
+#: actions/userauthorization.php:266
 msgid "Subscription rejected"
 msgstr "చందాని తిరస్కరించారు."
 
-#: actions/userauthorization.php:288
+#: actions/userauthorization.php:268
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to fully reject the "
 "subscription."
 msgstr ""
 
-#. TRANS: Exception thrown when no valid user is found for an authorisation request.
-#. TRANS: %s is a listener URI.
-#: actions/userauthorization.php:325
+#: actions/userauthorization.php:303
 #, php-format
-msgid "Listener URI \"%s\" not found here."
+msgid "Listener URI ‘%s’ not found here."
 msgstr ""
 
-#. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:332
+#: actions/userauthorization.php:308
 #, php-format
-msgid "Listenee URI \"%s\" is too long."
+msgid "Listenee URI ‘%s’ is too long."
 msgstr ""
 
-#. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:340
+#: actions/userauthorization.php:314
 #, php-format
-msgid "Listenee URI \"%s\" is a local user."
+msgid "Listenee URI ‘%s’ is a local user."
 msgstr ""
 
-#. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
-#. TRANS: %s is a profile URL.
-#: actions/userauthorization.php:358
+#: actions/userauthorization.php:329
 #, php-format
-msgid "Profile URL \"%s\" is for a local user."
+msgid "Profile URL ‘%s’ is for a local user."
 msgstr ""
 
-#. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
-#. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
-#: actions/userauthorization.php:368
-#, php-format
-msgid ""
-"Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
-"\"."
-msgstr ""
-
-#. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:378
+#: actions/userauthorization.php:345
 #, fuzzy, php-format
-msgid "Avatar URL \"%s\" is not valid."
+msgid "Avatar URL ‘%s’ is not valid."
 msgstr "హోమ్ పేజీ URL సరైనది కాదు."
 
-#. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:385
+#: actions/userauthorization.php:350
 #, fuzzy, php-format
-msgid "Cannot read avatar URL \"%s\"."
+msgid "Can’t read avatar URL ‘%s’."
 msgstr "'%s' అనే అవతారపు URL తప్పు"
 
-#. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:392
+#: actions/userauthorization.php:355
 #, fuzzy, php-format
-msgid "Wrong image type for avatar URL \"%s\"."
+msgid "Wrong image type for avatar URL ‘%s’."
 msgstr "'%s' కొరకు తప్పుడు బొమ్మ రకం"
 
 #. TRANS: Page title for profile design page.
@@ -6745,7 +6638,7 @@ msgid "Plugins"
 msgstr "ప్లగిన్లు"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:898
+#: actions/version.php:198 lib/action.php:901
 msgid "Version"
 msgstr "సంచిక"
 
@@ -6949,14 +6842,14 @@ msgstr "సందేశాన్ని భద్రపరచడంలో పొ
 
 #. TRANS: Server exception thrown when a reply cannot be saved.
 #. TRANS: %1$d is a notice ID, %2$d is the ID of the mentioned user.
-#: classes/Notice.php:1142
+#: classes/Notice.php:1144
 #, fuzzy, php-format
 msgid "Could not save reply for %1$d, %2$d."
 msgstr "స్థానిక గుంపుని తాజాకరించలేకున్నాం."
 
 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1661
+#: classes/Notice.php:1663
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
@@ -6970,14 +6863,14 @@ msgstr "%1$s (%2$s)"
 
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:775
+#: classes/Profile.php:779
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:784
+#: classes/Profile.php:788
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -7298,53 +7191,53 @@ msgid "Page notice"
 msgstr "పేజీ గమనిక"
 
 #. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:871
+#: lib/action.php:874
 msgid "Secondary site navigation"
 msgstr "ద్వితీయ సైటు మార్గదర్శిని"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:877
+#: lib/action.php:880
 msgid "Help"
 msgstr "సహాయం"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:880
+#: lib/action.php:883
 msgid "About"
 msgstr "గురించి"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:883
+#: lib/action.php:886
 msgid "FAQ"
 msgstr "ప్రశ్నలు"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:888
+#: lib/action.php:891
 msgid "TOS"
 msgstr "సేవా నియమాలు"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:892
+#: lib/action.php:895
 msgid "Privacy"
 msgstr "అంతరంగికత"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:895
+#: lib/action.php:898
 msgid "Source"
 msgstr "మూలము"
 
 #. TRANS: Secondary navigation menu option leading to e-mail contact information on the
 #. TRANS: StatusNet site, where to report bugs, ...
-#: lib/action.php:902
+#: lib/action.php:905
 msgid "Contact"
 msgstr "సంప్రదించు"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:905
+#: lib/action.php:908
 msgid "Badge"
 msgstr "బాడ్జి"
 
 #. TRANS: DT element for StatusNet software license.
-#: lib/action.php:934
+#: lib/action.php:937
 msgid "StatusNet software license"
 msgstr "స్టేటస్‌నెట్ మృదూపకరణ లైసెన్సు"
 
@@ -7352,7 +7245,7 @@ msgstr "స్టేటస్‌నెట్ మృదూపకరణ లైస
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:941
+#: lib/action.php:944
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7362,7 +7255,7 @@ msgstr ""
 "అందిస్తున్న సూక్ష్మ బ్లాగింగు సేవ."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:944
+#: lib/action.php:947
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** అనేది మైక్రో బ్లాగింగు సదుపాయం."
@@ -7371,7 +7264,7 @@ msgstr "**%%site.name%%** అనేది మైక్రో బ్లాగి
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:951
+#: lib/action.php:954
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7383,50 +7276,50 @@ msgstr ""
 "పై నడుస్తుంది."
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:967
+#: lib/action.php:970
 msgid "Site content license"
 msgstr "స్టేటస్‌నెట్ మృదూపకరణ లైసెన్సు"
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:974
+#: lib/action.php:977
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:981
+#: lib/action.php:984
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:985
+#: lib/action.php:988
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:1017
+#: lib/action.php:1020
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
 
 #. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1353
+#: lib/action.php:1356
 msgid "Pagination"
 msgstr "పేజీకరణ"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1364
+#: lib/action.php:1367
 msgid "After"
 msgstr "తర్వాత"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1374
+#: lib/action.php:1377
 msgid "Before"
 msgstr "ఇంతక్రితం"
 
@@ -7626,23 +7519,19 @@ msgstr ""
 msgid "No application for that consumer key."
 msgstr ""
 
-#: lib/apiauth.php:202 lib/apiauth.php:284
-msgid "Not allowed to use API."
-msgstr ""
-
 #. TRANS: OAuth exception given when an incorrect access token was given for a user.
-#: lib/apiauth.php:225
+#: lib/apiauth.php:219
 msgid "Bad access token."
 msgstr ""
 
 #. TRANS: OAuth exception given when no user was found for a given token (no token was found).
-#: lib/apiauth.php:230
+#: lib/apiauth.php:224
 msgid "No user for that token."
 msgstr ""
 
 #. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel".
 #. TRANS: Client error thrown when authentication fails.
-#: lib/apiauth.php:272 lib/apiauth.php:302
+#: lib/apiauth.php:266 lib/apiauth.php:293
 msgid "Could not authenticate you."
 msgstr ""
 
@@ -7851,11 +7740,6 @@ msgstr "సంకేతపదం మార్పడానికి అనుమ
 msgid "Block"
 msgstr "నిరోధించు"
 
-#. TRANS: Description of the form to block a user.
-#: lib/blockform.php:79
-msgid "Block this user"
-msgstr "ఈ వాడుకరిని నిరోధించు"
-
 #. TRANS: Title for command results.
 #: lib/channel.php:160 lib/channel.php:181
 msgid "Command results"
@@ -7885,7 +7769,7 @@ msgstr "ఆ ఈమెయిలు చిరునామా లేదా వా
 
 #. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
 #. TRANS: Error text shown when a last user notice is requested and it does not exist.
-#: lib/command.php:99 lib/command.php:630
+#: lib/command.php:99 lib/command.php:642
 #, fuzzy
 msgid "User has no last notice."
 msgstr "వాడుకరికి ప్రొఫైలు లేదు."
@@ -7936,35 +7820,41 @@ msgstr ""
 "చందాదార్లు: %2$s\n"
 "నోటీసులు: %3$s"
 
+#. TRANS: Error message text shown when a favorite could not be set because it has already been favorited.
+#: lib/command.php:298
+#, fuzzy
+msgid "Could not create favorite: already favorited."
+msgstr "ఇష్టాంశాన్ని సృష్టించలేకపోయాం."
+
 #. TRANS: Text shown when a notice has been marked as favourite successfully.
-#: lib/command.php:312
+#: lib/command.php:324
 msgid "Notice marked as fave."
 msgstr "నోటీసుని ఇష్టాంశంగా గుర్తించాం."
 
 #. TRANS: Message given having added a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:357
+#: lib/command.php:369
 #, php-format
 msgid "%1$s joined group %2$s."
 msgstr "%1$s %2$s గుంపులో చేరారు."
 
 #. TRANS: Message given having removed a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:405
+#: lib/command.php:417
 #, php-format
 msgid "%1$s left group %2$s."
 msgstr "%2$s గుంపు నుండి %1$s వైదొలిగారు."
 
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: lib/command.php:426
+#: lib/command.php:438
 #, php-format
 msgctxt "WHOIS"
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
 
 #. TRANS: Whois output. %s is the full name of the queried user.
-#: lib/command.php:430
+#: lib/command.php:442
 #, php-format
 msgid "Fullname: %s"
 msgstr "పూర్తిపేరు: %s"
@@ -7972,7 +7862,7 @@ msgstr "పూర్తిపేరు: %s"
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a location.
-#: lib/command.php:434 lib/mail.php:270
+#: lib/command.php:446 lib/mail.php:270
 #, php-format
 msgid "Location: %s"
 msgstr "ప్రాంతం: %s"
@@ -7980,20 +7870,20 @@ msgstr "ప్రాంతం: %s"
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a homepage.
-#: lib/command.php:438 lib/mail.php:274
+#: lib/command.php:450 lib/mail.php:274
 #, php-format
 msgid "Homepage: %s"
 msgstr "హోంపేజీ: %s"
 
 #. TRANS: Whois output. %s is the bio information of the queried user.
-#: lib/command.php:442
+#: lib/command.php:454
 #, php-format
 msgid "About: %s"
 msgstr "గురించి: %s"
 
 #. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).
 #. TRANS: %s is a remote profile.
-#: lib/command.php:471
+#: lib/command.php:483
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
@@ -8002,7 +7892,7 @@ msgstr ""
 
 #. TRANS: Message given if content is too long. %1$sd is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:488
+#: lib/command.php:500
 #, fuzzy, php-format
 msgid "Message too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
@@ -8010,26 +7900,26 @@ msgstr[0] "నోటిసు చాలా పొడవుగా ఉంది -
 msgstr[1] "నోటిసు చాలా పొడవుగా ఉంది - %1$d అక్షరాలు గరిష్ఠం, మీరు %2$d పంపించారు."
 
 #. TRANS: Error text shown sending a direct message fails with an unknown reason.
-#: lib/command.php:516
+#: lib/command.php:528
 #, fuzzy
 msgid "Error sending direct message."
 msgstr "నేరుగా సందేశాలు పంపడం నుండి మిమ్మల్ని నిషేధించారు."
 
 #. TRANS: Message given having repeated a notice from another user.
 #. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:553
+#: lib/command.php:565
 #, fuzzy, php-format
 msgid "Notice from %s repeated."
 msgstr "సందేశాలు"
 
 #. TRANS: Error text shown when repeating a notice fails with an unknown reason.
-#: lib/command.php:556
+#: lib/command.php:568
 msgid "Error repeating notice."
 msgstr "నోటీసుని పునరావృతించడంలో పొరపాటు."
 
 #. TRANS: Message given if content of a notice for a reply is too long. %1$d is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:591
+#: lib/command.php:603
 #, fuzzy, php-format
 msgid "Notice too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Notice too long - maximum is %1$d characters, you sent %2$d."
@@ -8038,104 +7928,104 @@ msgstr[1] "నోటిసు చాలా పొడవుగా ఉంది -
 
 #. TRANS: Text shown having sent a reply to a notice successfully.
 #. TRANS: %s is the nickname of the user of the notice the reply was sent to.
-#: lib/command.php:604
+#: lib/command.php:616
 #, fuzzy, php-format
 msgid "Reply to %s sent."
 msgstr "%sకి స్పందనలు"
 
 #. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
-#: lib/command.php:607
+#: lib/command.php:619
 msgid "Error saving notice."
 msgstr "నోటీసుని భద్రపరచడంలో పొరపాటు."
 
 #. TRANS: Error text shown when no username was provided when issuing a subscribe command.
-#: lib/command.php:654
+#: lib/command.php:666
 msgid "Specify the name of the user to subscribe to."
 msgstr "ఏవరికి చందా చేరాలనుకుంటున్నారో ఆ వాడుకరి పేరుని ఇవ్వండి."
 
 #. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
-#: lib/command.php:663
+#: lib/command.php:675
 msgid "Can't subscribe to OMB profiles by command."
 msgstr ""
 
 #. TRANS: Text shown after having subscribed to another user successfully.
 #. TRANS: %s is the name of the user the subscription was requested for.
-#: lib/command.php:671
+#: lib/command.php:683
 #, php-format
 msgid "Subscribed to %s."
 msgstr "%sకి చందా చేరారు."
 
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.
-#: lib/command.php:692 lib/command.php:803
+#: lib/command.php:704 lib/command.php:815
 msgid "Specify the name of the user to unsubscribe from."
 msgstr "ఎవరినుండైతే చందావిరమించాలనుకుంటున్నారో ఆ వాడుకరి పేరుని ఇవ్వండి."
 
 #. TRANS: Text shown after having unsubscribed from another user successfully.
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:703
+#: lib/command.php:715
 #, php-format
 msgid "Unsubscribed from %s."
 msgstr "%s నుండి చందా విరమించారు."
 
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
-#: lib/command.php:723 lib/command.php:749
+#: lib/command.php:735 lib/command.php:761
 #, fuzzy
 msgid "Command not yet implemented."
 msgstr "క్షమించండి, ఈ ఆదేశం ఇంకా అమలుపరచబడలేదు."
 
 #. TRANS: Text shown when issuing the command "off" successfully.
-#: lib/command.php:727
+#: lib/command.php:739
 #, fuzzy
 msgid "Notification off."
 msgstr "నిర్ధారణ సంకేతం లేదు."
 
 #. TRANS: Error text shown when the command "off" fails for an unknown reason.
-#: lib/command.php:730
+#: lib/command.php:742
 msgid "Can't turn off notification."
 msgstr ""
 
 #. TRANS: Text shown when issuing the command "on" successfully.
-#: lib/command.php:753
+#: lib/command.php:765
 #, fuzzy
 msgid "Notification on."
 msgstr "నిర్ధారణ సంకేతం లేదు."
 
 #. TRANS: Error text shown when the command "on" fails for an unknown reason.
-#: lib/command.php:756
+#: lib/command.php:768
 #, fuzzy
 msgid "Can't turn on notification."
 msgstr "మీ నోటీసుని మీరే పునరావృతించలేరు."
 
 #. TRANS: Error text shown when issuing the login command while login is disabled.
-#: lib/command.php:770
+#: lib/command.php:782
 msgid "Login command is disabled."
 msgstr ""
 
 #. TRANS: Text shown after issuing the login command successfully.
 #. TRANS: %s is a logon link..
-#: lib/command.php:783
+#: lib/command.php:795
 #, php-format
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr "ఈ లంకెని ఒకేసారి ఉపయోగించగలరు మరియు అది 2 నిమిషాల వరకు మాత్రమే చెల్లుతుంది: %s."
 
 #. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:812
+#: lib/command.php:824
 #, php-format
 msgid "Unsubscribed %s."
 msgstr "%sని చందా విరమింపజేసారు."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
-#: lib/command.php:830
+#: lib/command.php:842
 msgid "You are not subscribed to anyone."
 msgstr "మీరు ఎవరికీ చందాచేరలేదు."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
-#: lib/command.php:835
+#: lib/command.php:847
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "%sకి స్పందనలు"
@@ -8143,14 +8033,14 @@ msgstr[1] "%sకి స్పందనలు"
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user
 #. TRANS: (followers) without having any subscribers.
-#: lib/command.php:857
+#: lib/command.php:869
 msgid "No one is subscribed to you."
 msgstr "మీకు చందాదార్లు ఎవరూ లేరు."
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
-#: lib/command.php:862
+#: lib/command.php:874
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "%sకి స్పందనలు"
@@ -8158,21 +8048,21 @@ msgstr[1] "%sకి స్పందనలు"
 
 #. TRANS: Text shown after requesting groups a user is subscribed to without having
 #. TRANS: any group subscriptions.
-#: lib/command.php:884
+#: lib/command.php:896
 msgid "You are not a member of any groups."
 msgstr "మీరు ఏ గుంపులోనూ సభ్యులు కాదు."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
-#: lib/command.php:889
+#: lib/command.php:901
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "మీరు ఇప్పటికే లోనికి ప్రవేశించారు!"
 msgstr[1] "మీరు ఇప్పటికే లోనికి ప్రవేశించారు!"
 
 #. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-#: lib/command.php:904
+#: lib/command.php:916
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -8278,11 +8168,6 @@ msgstr "అధీకృత అనుసంధాన ఉపకరణాలు"
 msgid "Database error"
 msgstr ""
 
-#. TRANS: Description of form for deleting a user.
-#: lib/deleteuserform.php:75
-msgid "Delete this user"
-msgstr "ఈ వాడుకరిని తొలగించు"
-
 #. TRANS: Label in form on profile design page.
 #. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
 #: lib/designsettings.php:108
@@ -8317,23 +8202,6 @@ msgstr "రంగులను మార్చు"
 msgid "Use defaults"
 msgstr "అప్రమేయాలని ఉపయోగించు"
 
-#. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: lib/designsettings.php:259
-#, fuzzy
-msgid "Restore default designs"
-msgstr "అప్రమేయాలని ఉపయోగించు"
-
-#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: lib/designsettings.php:267
-#, fuzzy
-msgid "Reset back to default"
-msgstr "అప్రమేయాలని ఉపయోగించు"
-
-#. TRANS: Title for button on profile design page to save settings.
-#: lib/designsettings.php:272
-msgid "Save design"
-msgstr "రూపురేఖలని భద్రపరచు"
-
 #. TRANS: Error message displayed if design settings could not be saved.
 #. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
 #: lib/designsettings.php:405 lib/designsettings.php:427
@@ -9202,10 +9070,6 @@ msgstr "ఈ నోటీసుపై స్పందించండి"
 msgid "Reply"
 msgstr "స్పందించండి"
 
-#: lib/noticelist.php:673
-msgid "Delete this notice"
-msgstr "ఈ నోటీసుని తొలగించు"
-
 #: lib/noticelist.php:691
 msgid "Notice repeated"
 msgstr "నోటీసుని పునరావృతించారు"
@@ -9492,10 +9356,6 @@ msgstr "ఆహ్వానించు"
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "%sలో తోడుకై మీ స్నేహితులని మరియు సహోద్యోగులని ఆహ్వానించండి"
 
-#: lib/subscribeform.php:115 lib/subscribeform.php:139
-msgid "Subscribe to this user"
-msgstr "ఈ వాడుకరికి చందాచేరు"
-
 #: lib/subscriberspeopleselftagcloudsection.php:48
 #: lib/subscriptionspeopleselftagcloudsection.php:48
 msgid "People Tagcloud as self-tagged"
@@ -9666,23 +9526,18 @@ msgctxt "role"
 msgid "Moderator"
 msgstr "సమన్వయకర్త"
 
-#: lib/util.php:305
-#, fuzzy
-msgid "Not allowed to log in."
-msgstr "లోనికి ప్రవేశించలేదు."
-
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1309
+#: lib/util.php:1306
 msgid "a few seconds ago"
 msgstr "కొన్ని క్షణాల క్రితం"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1312
+#: lib/util.php:1309
 msgid "about a minute ago"
 msgstr "ఓ నిమిషం క్రితం"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1316
+#: lib/util.php:1313
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
@@ -9690,12 +9545,12 @@ msgstr[0] "సుమారు ఒక నిమిషం క్రితం"
 msgstr[1] "సుమారు %d నిమిషాల క్రితం"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1319
+#: lib/util.php:1316
 msgid "about an hour ago"
 msgstr "ఒక గంట క్రితం"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1323
+#: lib/util.php:1320
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
@@ -9703,12 +9558,12 @@ msgstr[0] "సుమారు ఒక గంట క్రితం"
 msgstr[1] "సుమారు %d గంటల క్రితం"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1326
+#: lib/util.php:1323
 msgid "about a day ago"
 msgstr "ఓ రోజు క్రితం"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1330
+#: lib/util.php:1327
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
@@ -9716,12 +9571,12 @@ msgstr[0] "సుమారు ఒక రోజు క్రితం"
 msgstr[1] "సుమారు %d రోజుల క్రితం"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1333
+#: lib/util.php:1330
 msgid "about a month ago"
 msgstr "ఓ నెల క్రితం"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1337
+#: lib/util.php:1334
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
@@ -9729,7 +9584,7 @@ msgstr[0] "సుమారు ఒక నెల క్రితం"
 msgstr[1] "సుమారు %d నెలల క్రితం"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1340
+#: lib/util.php:1337
 msgid "about a year ago"
 msgstr "ఒక సంవత్సరం క్రితం"
 
@@ -9771,3 +9626,64 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#~ msgid "Block this user."
+#~ msgstr "ఈ వాడుకరిని నిరోధించండి."
+
+#, fuzzy
+#~ msgid "Delete this notice."
+#~ msgstr "ఈ నోటీసుని తొలగించు"
+
+#~ msgid "Delete this user."
+#~ msgstr "ఈ వాడుకరిని తొలగించండి."
+
+#, fuzzy
+#~ msgid "Restore default designs."
+#~ msgstr "అప్రమేయాలని ఉపయోగించు"
+
+#, fuzzy
+#~ msgid "Reset back to default."
+#~ msgstr "అప్రమేయాలని ఉపయోగించు"
+
+#, fuzzy
+#~ msgid "Save design."
+#~ msgstr "రూపురేఖలని భద్రపరచు"
+
+#, fuzzy
+#~ msgid "Disfavor favorite."
+#~ msgstr "ఇష్టాంశాలకు చేర్చు"
+
+#, fuzzy
+#~ msgid "\"%s\" not found."
+#~ msgstr "వాడుకరి దొరకలేదు."
+
+#, fuzzy
+#~ msgid "Notice %s not found."
+#~ msgstr "నిర్ధారణ సంకేతం కనబడలేదు."
+
+#, fuzzy
+#~ msgid "Attachment %s not found."
+#~ msgstr "అందుకోవాల్సిన వాడుకరి కనబడలేదు."
+
+#, fuzzy
+#~ msgid "Invalid tag: \"%s\"."
+#~ msgstr "తప్పుడు మారుపేరు: \"%s\""
+
+#, fuzzy
+#~ msgid "%s updates from everyone."
+#~ msgstr "అందరి నుండి %s తాజాకరణలు!"
+
+#, fuzzy
+#~ msgid "Password saved"
+#~ msgstr "సంకేతపదం భద్రమయ్యింది."
+
+#, fuzzy
+#~ msgid "Where you are, like \"City, State (or Region), Country\"."
+#~ msgstr "మీరు ఎక్కడ నుండి, \"నగరం, రాష్ట్రం (లేదా ప్రాంతం), దేశం\""
+
+#~ msgid "Subscribe to this user."
+#~ msgstr "ఈ వాడుకరికి చందాచేరండి."
+
+#, fuzzy
+#~ msgid "Not allowed to log in."
+#~ msgstr "లోనికి ప్రవేశించలేదు."
diff --git a/locale/tr/LC_MESSAGES/statusnet.po b/locale/tr/LC_MESSAGES/statusnet.po
index 7445a3cb42..66d16b962e 100644
--- a/locale/tr/LC_MESSAGES/statusnet.po
+++ b/locale/tr/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-02-24 10:32+0000\n"
-"PO-Revision-Date: 2011-02-24 10:37:44+0000\n"
+"POT-Creation-Date: 2011-03-03 15:58+0000\n"
+"PO-Revision-Date: 2011-03-03 16:01:26+0000\n"
 "Language-Team: Turkish <http://translatewiki.net/wiki/Portal:tr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r82712); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tr\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-POT-Import-Date: 2011-02-17 11:39:54+0000\n"
+"X-POT-Import-Date: 2011-02-25 23:49:23+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -135,11 +135,7 @@ msgstr "Böyle bir sayfa yok."
 #. 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 use "one time password login" without using an existing user.
-#. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
-#. TRANS: Client error displayed trying to find a user by ID for a non-existing ID.
-#. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when calling a profile action without specifying a user.
 #: actions/all.php:80 actions/allrss.php:69
@@ -157,12 +153,12 @@ msgstr "Böyle bir sayfa yok."
 #: actions/apitimelinementions.php:77 actions/apitimelineuser.php:79
 #: actions/avatarbynickname.php:79 actions/favoritesrss.php:72
 #: actions/foaf.php:42 actions/foaf.php:61 actions/hcard.php:67
-#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:78
+#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
 #: actions/remotesubscribe.php:144 actions/remotesubscribe.php:153
-#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:113
-#: actions/showfavorites.php:106 actions/userbyid.php:75
+#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
+#: actions/showfavorites.php:106 actions/userbyid.php:74
 #: actions/usergroups.php:93 actions/userrss.php:40 actions/userxrd.php:59
-#: actions/xrds.php:71 lib/command.php:497 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:509 lib/galleryaction.php:59
 #: lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Böyle bir kullanıcı yok."
@@ -293,7 +289,7 @@ msgstr "%2$s üzerindeki %1$s ve arkadaşlarından güncellemeler!"
 #: actions/apigrouplistall.php:120 actions/apigroupmembership.php:105
 #: actions/apigroupshow.php:114 actions/apihelptest.php:84
 #: actions/apistatusesdestroy.php:101 actions/apistatusesretweets.php:110
-#: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:138
+#: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:139
 #: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
 #: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:268
 #: actions/apitimelinegroup.php:147 actions/apitimelinehome.php:173
@@ -521,7 +517,7 @@ msgstr "Alıcı kullanıcı bulunamadı."
 #. TRANS: Client error displayed trying to direct message another user who's not a friend (403).
 #: actions/apidirectmessagenew.php:144
 #, fuzzy
-msgid "Cannot send direct messages to users who aren't your friend."
+msgid "Can't send direct messages to users who aren't your friend."
 msgstr "Arkadaşınız olmayan kullanıcılara özel mesaj gönderemezsiniz."
 
 #. TRANS: Client error displayed trying to direct message self (403).
@@ -548,7 +544,7 @@ msgstr "Bu durum mesajı zaten bir favori."
 #. TRANS: Client error displayed when marking a notice as favourite fails.
 #. TRANS: Server error displayed when trying to mark a notice as favorite fails in the database.
 #. TRANS: Error message text shown when a favorite could not be set.
-#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:294
+#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:306
 msgid "Could not create favorite."
 msgstr "Favori oluşturulamadı."
 
@@ -606,7 +602,7 @@ msgstr "Hedef kullanıcı bulunamadı."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:191
 #: actions/newgroup.php:137 actions/profilesettings.php:273
-#: actions/register.php:206
+#: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "Takma ad kullanımda. Başka bir tane deneyin."
 
@@ -616,7 +612,7 @@ msgstr "Takma ad kullanımda. Başka bir tane deneyin."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:195
 #: actions/newgroup.php:141 actions/profilesettings.php:243
-#: actions/register.php:208
+#: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "Geçersiz bir takma ad."
 
@@ -629,7 +625,7 @@ msgstr "Geçersiz bir takma ad."
 #: actions/apigroupcreate.php:181 actions/editapplication.php:235
 #: actions/editgroup.php:202 actions/newapplication.php:221
 #: actions/newgroup.php:148 actions/profilesettings.php:248
-#: actions/register.php:215
+#: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "Başlangıç sayfası adresi geçerli bir URL değil."
 
@@ -639,7 +635,7 @@ msgstr "Başlangıç sayfası adresi geçerli bir URL değil."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:191 actions/editgroup.php:206
 #: actions/newgroup.php:152 actions/profilesettings.php:252
-#: actions/register.php:218
+#: actions/register.php:226
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "Tam isim çok uzun (en fazla: 255 karakter)."
 
@@ -666,7 +662,7 @@ msgstr[0] "Tanım çok uzun (en fazla %d karakter)."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:215 actions/editgroup.php:218
 #: actions/newgroup.php:164 actions/profilesettings.php:265
-#: actions/register.php:227
+#: actions/register.php:235
 msgid "Location is too long (maximum 255 characters)."
 msgstr "Yer bilgisi çok uzun (en fazla 255 karakter)."
 
@@ -721,14 +717,14 @@ msgstr "Onay kodu bulunamadı."
 #. TRANS: Server error displayed when trying to join a group the user is already a member of.
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:333
+#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:345
 msgid "You are already a member of that group."
 msgstr "Bize o profili yollamadınız"
 
 #. TRANS: Server error displayed when trying to join a group the user is blocked from joining.
 #. 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.
-#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:338
+#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:350
 msgid "You have been blocked from that group by the admin."
 msgstr "Bu gruptan yönetici tarafından engellendiniz."
 
@@ -738,7 +734,7 @@ msgstr "Bu gruptan yönetici tarafından engellendiniz."
 #. TRANS: %1$s is the joining user's nickname, $2$s is the group nickname for which the join failed.
 #. TRANS: Message given having failed to add a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:350
+#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:362
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "%1$s kullanıcısı, %2$s grubuna katılamadı."
@@ -755,7 +751,7 @@ msgstr "Bu grubun bir üyesi değilsiniz."
 #. TRANS: Message given having failed to remove a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
 #: actions/apigroupleave.php:127 actions/leavegroup.php:133
-#: lib/command.php:398
+#: lib/command.php:410
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
 msgstr "%1$s kullanıcısı, %2$s grubundan silinemedi."
@@ -815,21 +811,20 @@ msgstr "İstek belirteci zaten yetkili."
 #. TRANS: Form validation error message.
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
-#. TRANS: Client error displayed when the session token is not okay.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
 #: actions/deletenotice.php:177 actions/disfavor.php:75
 #: actions/emailsettings.php:291 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:65 actions/grouplogo.php:321
 #: actions/groupunblock.php:65 actions/imsettings.php:224
-#: actions/invite.php:60 actions/login.php:131 actions/makeadmin.php:66
+#: actions/invite.php:60 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
-#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:136
-#: actions/othersettings.php:155 actions/passwordsettings.php:137
+#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
+#: actions/othersettings.php:155 actions/passwordsettings.php:138
 #: actions/profilesettings.php:217 actions/recoverpassword.php:383
-#: actions/register.php:164 actions/remotesubscribe.php:76
+#: actions/register.php:172 actions/remotesubscribe.php:76
 #: actions/repeat.php:82 actions/smssettings.php:250 actions/subedit.php:40
-#: actions/subscribe.php:87 actions/tagother.php:166
-#: actions/unsubscribe.php:69 actions/userauthorization.php:53
+#: actions/subscribe.php:86 actions/tagother.php:166
+#: actions/unsubscribe.php:69 actions/userauthorization.php:52
 #: lib/designsettings.php:310
 msgid "There was a problem with your session token. Try again, please."
 msgstr "Oturum belirtecinizde bir sorun var. Lütfen, tekrar deneyin."
@@ -860,7 +855,7 @@ msgstr "oauth_token_association eklerken veritabanı hatası."
 #: actions/designadminpanel.php:100 actions/editapplication.php:144
 #: actions/emailsettings.php:310 actions/grouplogo.php:332
 #: actions/imsettings.php:239 actions/newapplication.php:124
-#: actions/oauthconnectionssettings.php:145 actions/recoverpassword.php:46
+#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
 #: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
 msgstr "Beklenmeğen form girdisi."
@@ -913,20 +908,19 @@ msgstr "Hesap"
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group nickname (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT for nick name in a profile.
-#: actions/apioauthauthorize.php:459 actions/login.php:242
-#: actions/profilesettings.php:106 actions/register.php:418
+#: actions/apioauthauthorize.php:459 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:432
 #: actions/showgroup.php:243 actions/tagother.php:94
-#: actions/userauthorization.php:152 lib/groupeditform.php:145
+#: actions/userauthorization.php:145 lib/groupeditform.php:145
 #: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "Takma ad"
 
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:463 actions/login.php:245
-#: actions/register.php:422 lib/accountsettingsaction.php:120
+#: actions/apioauthauthorize.php:463 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:120
 msgid "Password"
 msgstr "Parola"
 
@@ -1021,13 +1015,13 @@ msgstr "Böyle bir durum mesajı yok."
 
 #. TRANS: Client error displayed trying to repeat an own notice through the API.
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:537
+#: actions/apistatusesretweet.php:83 lib/command.php:549
 msgid "Cannot repeat your own notice."
 msgstr "Kendi durum mesajınızı tekrarlayamazsınız."
 
 #. TRANS: Client error displayed trying to re-repeat a notice through the API.
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:92 lib/command.php:543
+#: actions/apistatusesretweet.php:92 lib/command.php:555
 msgid "Already repeated that notice."
 msgstr "Bu durum mesajı zaten tekrarlanmış."
 
@@ -1049,7 +1043,7 @@ msgstr "HTTP yöntemi desteklenmiyor."
 #. TRANS: %s is the requested output format.
 #: actions/apistatusesshow.php:144
 #, fuzzy, php-format
-msgid "Unsupported format: %s."
+msgid "Unsupported format: %s"
 msgstr "Desteklenmeyen biçim: %s"
 
 #. TRANS: Client error displayed requesting a deleted status.
@@ -1152,14 +1146,13 @@ msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr ""
 
 #. TRANS: Title for site timeline. %s is the StatusNet sitename.
-#. TRANS: Public RSS feed title. %s is the StatusNet site name.
 #: actions/apitimelinepublic.php:193 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "%s genel zaman çizelgesi"
 
 #. TRANS: Subtitle for site timeline. %s is the StatusNet sitename.
-#: actions/apitimelinepublic.php:199
+#: actions/apitimelinepublic.php:199 actions/publicrss.php:105
 #, php-format
 msgid "%s updates from everyone!"
 msgstr ""
@@ -1225,26 +1218,25 @@ msgid "Atom post must be an Atom entry."
 msgstr ""
 
 #. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
-#: actions/apitimelineuser.php:334
+#: actions/apitimelineuser.php:335
 msgid "Can only handle POST activities."
 msgstr ""
 
 #. TRANS: Client error displayed when using an unsupported activity object type.
 #. TRANS: %s is the unsupported activity object type.
-#: actions/apitimelineuser.php:345
+#: actions/apitimelineuser.php:346
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
 #. TRANS: %d is the notice ID (number).
-#: actions/apitimelineuser.php:379
+#: actions/apitimelineuser.php:380
 #, fuzzy, php-format
 msgid "No content for notice %d."
 msgstr "Eğer lisansı kabul etmezseniz kayıt olamazsınız."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#. TRANS: %s is the notice URI.
 #: actions/apitimelineuser.php:408
 #, php-format
 msgid "Notice with URI \"%s\" already exists."
@@ -1263,10 +1255,9 @@ msgstr "Onay kodu bulunamadı."
 
 #. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
 #. TRANS: Client exception.
-#. TRANS: Client error displayed trying to subscribe to a non-existing profile.
 #: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
 #: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
-#: actions/subscribe.php:110
+#: actions/subscribe.php:107
 #, fuzzy
 msgid "No such profile."
 msgstr "Böyle bir durum mesajı yok."
@@ -1403,7 +1394,7 @@ msgstr "Favori silinemedi."
 #: actions/joingroup.php:95 actions/leavegroup.php:82
 #: actions/leavegroup.php:95 actions/makeadmin.php:86
 #: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:380
+#: lib/command.php:392
 msgid "No such group."
 msgstr "Böyle bir kullanıcı yok."
 
@@ -1414,7 +1405,7 @@ msgid "Not a member."
 msgstr "Tüm üyeler"
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
-#: actions/atompubshowmembership.php:150
+#: actions/atompubshowmembership.php:151
 #, fuzzy
 msgid "Cannot delete someone else's membership."
 msgstr "Yeni abonelik eklenemedi."
@@ -1520,11 +1511,9 @@ msgstr ""
 
 #. TRANS: Server error displayed in avatar upload page when no matching profile can be found for a user.
 #. TRANS: Server error displayed coming across a request from a user without a profile.
-#. TRANS: Server error displayed when trying to authorise a remote subscription request
-#. TRANS: while the user has no profile.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
 #: actions/grouplogo.php:184 actions/remotesubscribe.php:190
-#: actions/userauthorization.php:75 actions/userrss.php:108
+#: actions/userauthorization.php:72 actions/userrss.php:108
 #, fuzzy
 msgid "User without matching profile."
 msgstr "Kullanıcının profili yok."
@@ -1581,10 +1570,10 @@ msgstr "Kırp"
 msgid "No file uploaded."
 msgstr "Hiçbir dosya yüklenmedi."
 
-#. TRANS: Avatar upload form instruction after uploading a file.
+#. TRANS: Avatar upload form unstruction after uploading a file.
 #: actions/avatarsettings.php:345
 #, fuzzy
-msgid "Pick a square area of the image to be your avatar."
+msgid "Pick a square area of the image to be your avatar"
 msgstr "Resimden kullanıcı resminiz olacak bir kare alanı seçin"
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
@@ -1625,7 +1614,7 @@ msgid "You may not backup your account."
 msgstr ""
 
 #. TRANS: Information displayed on the backup account page.
-#: actions/backupaccount.php:225
+#: actions/backupaccount.php:227
 msgid ""
 "You can backup your account data in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format. This is an experimental feature and provides "
@@ -1635,15 +1624,15 @@ msgid ""
 msgstr ""
 
 #. TRANS: Submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:248
+#: actions/backupaccount.php:250
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Backup"
 msgstr "Arkaplan"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:252
-msgid "Backup your account."
+#: actions/backupaccount.php:254
+msgid "Backup your account"
 msgstr ""
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
@@ -1686,7 +1675,7 @@ msgstr "Hayır"
 #. TRANS: Submit button title for 'No' when blocking a user.
 #: actions/block.php:158
 #, fuzzy
-msgid "Do not block this user."
+msgid "Do not block this user"
 msgstr "Bu kullanıcıyı engelleme"
 
 #. TRANS: Button label on the user block form.
@@ -1703,9 +1692,9 @@ msgid "Yes"
 msgstr "Evet"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:165
-#, fuzzy
-msgid "Block this user."
+#. TRANS: Description of the form to block a user.
+#: actions/block.php:165 lib/blockform.php:79
+msgid "Block this user"
 msgstr "Bu kullanıcıyı engelle"
 
 #. TRANS: Server error displayed when blocking a user fails.
@@ -1869,7 +1858,7 @@ msgstr ""
 #. TRANS: Field label for delete account confirmation entry.
 #. TRANS: Field label for password reset form where the password has to be typed again.
 #: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:262 actions/register.php:426
+#: actions/recoverpassword.php:262 actions/register.php:440
 msgid "Confirm"
 msgstr "Onayla"
 
@@ -1899,14 +1888,14 @@ msgstr "Onay kodu bulunamadı."
 #. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
 #: actions/deleteapplication.php:79 actions/editapplication.php:78
-#: actions/showapplication.php:90
+#: actions/showapplication.php:94
 msgid "You are not the owner of this application."
 msgstr "Bu uygulamanın sahibi değilsiniz."
 
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
-#: actions/newapplication.php:112 actions/showapplication.php:113
-#: lib/action.php:1422
+#: actions/newapplication.php:112 actions/showapplication.php:118
+#: lib/action.php:1425
 msgid "There was a problem with your session token."
 msgstr ""
 
@@ -1930,13 +1919,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting an application.
 #: actions/deleteapplication.php:161
 #, fuzzy
-msgid "Do not delete this application."
+msgid "Do not delete this application"
 msgstr "Bu uygulamayı silme"
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
 #: actions/deleteapplication.php:167
 #, fuzzy
-msgid "Delete this application."
+msgid "Delete this application"
 msgstr "Bu uygulamayı sil"
 
 #. TRANS: Client error when trying to delete group while not logged in.
@@ -1995,13 +1984,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting a group.
 #: actions/deletegroup.php:224
 #, fuzzy
-msgid "Do not delete this group."
+msgid "Do not delete this group"
 msgstr "Bu durum mesajını silme"
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
 #: actions/deletegroup.php:231
 #, fuzzy
-msgid "Delete this group."
+msgid "Delete this group"
 msgstr "Bu kullanıcıyı sil"
 
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
@@ -2009,15 +1998,13 @@ msgstr "Bu kullanıcıyı sil"
 #. TRANS: Client error displayed when trying to mark a notice as favorite without being logged in.
 #. TRANS: Client error displayed trying to block a user from a group while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
-#. TRANS: Client error displayed trying to log out when not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
-#. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
 #. TRANS: Client error displayed when trying to change user options while not logged in.
 #: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
-#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:70
+#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
-#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:98
+#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
 #: lib/adminpanelaction.php:71 lib/profileformaction.php:63
 #: lib/settingsaction.php:72
@@ -2047,13 +2034,12 @@ msgstr "Bu durum mesajını silmek istediğinizden emin misiniz?"
 #. TRANS: Submit button title for 'No' when deleting a notice.
 #: actions/deletenotice.php:159
 #, fuzzy
-msgid "Do not delete this notice."
+msgid "Do not delete this notice"
 msgstr "Bu durum mesajını silme"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:166
-#, fuzzy
-msgid "Delete this notice."
+#: actions/deletenotice.php:166 lib/noticelist.php:673
+msgid "Delete this notice"
 msgstr "Bu durum mesajını sil"
 
 #. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
@@ -2090,13 +2076,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting a user.
 #: actions/deleteuser.php:158
 #, fuzzy
-msgid "Do not delete this user."
+msgid "Do not delete this user"
 msgstr "Bu durum mesajını silme"
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
-#: actions/deleteuser.php:165
-#, fuzzy
-msgid "Delete this user."
+#. TRANS: Description of form for deleting a user.
+#: actions/deleteuser.php:165 lib/deleteuserform.php:75
+msgid "Delete this user"
 msgstr "Bu kullanıcıyı sil"
 
 #. TRANS: Message used as title for design settings for the site.
@@ -2263,21 +2249,21 @@ msgid "Use defaults"
 msgstr "Öntanımlıları kullan"
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:720
-#, fuzzy
-msgid "Restore default designs."
-msgstr "Öntanımlıları kullan"
+#. TRANS: Title for button on profile design page to reset all colour settings to default.
+#: actions/designadminpanel.php:720 lib/designsettings.php:259
+msgid "Restore default designs"
+msgstr ""
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:728
-#, fuzzy
-msgid "Reset back to default."
+#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
+#: actions/designadminpanel.php:728 lib/designsettings.php:267
+msgid "Reset back to default"
 msgstr "Öntanımlıya geri dön"
 
 #. TRANS: Title for button for saving theme settings.
-#: actions/designadminpanel.php:736
-#, fuzzy
-msgid "Save design."
+#. TRANS: Title for button on profile design page to save settings.
+#: actions/designadminpanel.php:736 lib/designsettings.php:272
+msgid "Save design"
 msgstr "Dizaynı kaydet"
 
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
@@ -2309,7 +2295,7 @@ msgid "You must be logged in to edit an application."
 msgstr "Bir uygulamayı düzenlemek için giriş yapmış olmanız gerekir."
 
 #. TRANS: Client error displayed trying to edit an application that does not exist.
-#: actions/editapplication.php:83 actions/showapplication.php:83
+#: actions/editapplication.php:83 actions/showapplication.php:87
 msgid "No such application."
 msgstr "Böyle bir uygulama yok."
 
@@ -2596,7 +2582,7 @@ msgid "Cannot normalize that email address."
 msgstr "Jabber işlemlerinde bir hata oluştu."
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:393 actions/register.php:204
+#: actions/emailsettings.php:393 actions/register.php:212
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "Geçersiz bir eposta adresi."
@@ -2675,22 +2661,19 @@ msgstr "Geçersiz bir eposta adresi."
 
 #. 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.
 #: actions/emailsettings.php:530 actions/emailsettings.php:554
-#: actions/smssettings.php:566 actions/smssettings.php:591
+#: actions/smssettings.php:565 actions/smssettings.php:588
 #, fuzzy
 msgid "Could not update user record."
 msgstr "Kullanıcı kayıtları güncellenemedi."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
-#. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:534 actions/smssettings.php:570
+#: actions/emailsettings.php:534 actions/smssettings.php:568
 msgid "Incoming email address removed."
 msgstr "Gelen e-posta adresi silindi."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
-#. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:558 actions/smssettings.php:595
+#: actions/emailsettings.php:558 actions/smssettings.php:591
 msgid "New incoming email address added."
 msgstr "Yeni gelen e-posta adresi eklendi."
 
@@ -2702,7 +2685,7 @@ msgstr "Bu durum mesajı zaten bir favori!"
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
 #: actions/favor.php:95
 #, fuzzy
-msgid "Disfavor favorite."
+msgid "Disfavor favorite"
 msgstr "Favoriliğini kaldır"
 
 #. TRANS: Page title for first page of favorited notices.
@@ -2942,13 +2925,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
 #: actions/groupblock.php:191
 #, fuzzy
-msgid "Do not block this user from this group."
+msgid "Do not block this user from this group"
 msgstr "Bu kullanıcıyı bu gruptan engellemeyin"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
 #: actions/groupblock.php:198
 #, fuzzy
-msgid "Block this user from this group."
+msgid "Block this user from this group"
 msgstr "Bu kullanıcıyı bu gruptan engelleyin"
 
 #. TRANS: Server error displayed when trying to block a user from a group fails because of an application error.
@@ -2957,7 +2940,6 @@ msgid "Database error blocking user from group."
 msgstr ""
 
 #. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
-#. TRANS: Client error displayed trying to find a user by ID without providing an ID.
 #: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr "JabberID yok."
@@ -3142,10 +3124,8 @@ msgid "Group search"
 msgstr "Grup arama"
 
 #. TRANS: Text on page where groups can be searched if no results were found for a query.
-#. TRANS: Text for notice search results is the query had no results.
-#. TRANS: Message on the "People search" page where a query has no results.
-#: actions/groupsearch.php:82 actions/noticesearch.php:122
-#: actions/peoplesearch.php:87
+#: actions/groupsearch.php:82 actions/noticesearch.php:117
+#: actions/peoplesearch.php:83
 msgid "No results."
 msgstr "Sonuç yok."
 
@@ -3178,7 +3158,6 @@ msgid "User is not blocked from group."
 msgstr "Kullanıcı gruptan engellenmedi."
 
 #. TRANS: Server error displayed when unblocking a user from a group fails because of an unknown error.
-#. TRANS: Server error displayed when removing a user block.
 #: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "Engellemeyi kaldırırken hata."
@@ -3273,8 +3252,7 @@ msgid "Publish a MicroID for my Jabber/Google Talk address."
 msgstr "Onaylanmış Jabber/Gtalk adresi."
 
 #. TRANS: Confirmation message for successful Instant Messaging preferences save.
-#. TRANS: Confirmation message after saving preferences.
-#: actions/imsettings.php:283 actions/othersettings.php:193
+#: actions/imsettings.php:283 actions/othersettings.php:192
 msgid "Preferences saved."
 msgstr "Tercihler kaydedildi."
 
@@ -3532,7 +3510,7 @@ msgstr ""
 
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
-#: actions/leavegroup.php:103 lib/command.php:386
+#: actions/leavegroup.php:103 lib/command.php:398
 msgid "You are not a member of that group."
 msgstr "Bu grubun bir üyesi değilsiniz."
 
@@ -3656,43 +3634,41 @@ msgstr "Kaydet"
 msgid "Save license settings"
 msgstr "Lisans ayarlarını kaydet"
 
-#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
-#: actions/login.php:97 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
 msgid "Already logged in."
 msgstr "Zaten giriş yapılmış."
 
-#: actions/login.php:142
+#: actions/login.php:148
 msgid "Incorrect username or password."
 msgstr "Yanlış kullanıcı adı veya parola."
 
-#. TRANS: Server error displayed when a user object could not be created trying to login using "one time password login".
-#: actions/login.php:148 actions/otp.php:127
+#: actions/login.php:154 actions/otp.php:120
 #, fuzzy
 msgid "Error setting user. You are probably not authorized."
 msgstr "Yetkilendirilmemiş."
 
-#: actions/login.php:202 actions/login.php:253
+#: actions/login.php:210 actions/login.php:263
 msgid "Login"
 msgstr "Giriş"
 
-#: actions/login.php:239
+#: actions/login.php:249
 msgid "Login to site"
 msgstr "Siteye giriş"
 
-#: actions/login.php:248 actions/register.php:476
+#: actions/login.php:258 actions/register.php:490
 msgid "Remember me"
 msgstr "Beni hatırla"
 
-#: actions/login.php:249 actions/register.php:478
+#: actions/login.php:259 actions/register.php:492
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 "Gelecekte kendiliğinden giriş yap, paylaşılan bilgisayarlar için değildir!"
 
-#: actions/login.php:259
+#: actions/login.php:269
 msgid "Lost or forgotten password?"
 msgstr "Parolamı unuttum veya kaybettim"
 
-#: actions/login.php:277
+#: actions/login.php:288
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -3700,11 +3676,11 @@ msgstr ""
 "Güvenliğiniz için, ayarlarınızı değiştirmeden önce lütfen kullanıcı adınızı "
 "ve parolanızı tekrar giriniz."
 
-#: actions/login.php:281
+#: actions/login.php:292
 msgid "Login with your username and password."
 msgstr "Yanlış kullanıcı adı veya parola."
 
-#: actions/login.php:284
+#: actions/login.php:295
 #, fuzzy, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -3790,15 +3766,15 @@ msgid "New message"
 msgstr "Yeni mesaj"
 
 #. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
-#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:501
+#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:513
 #, fuzzy
 msgid "You can't send a message to this user."
 msgstr "Bize o profili yollamadınız"
 
 #. TRANS: Command exception text shown when trying to send a direct message to another user without content.
 #. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
-#: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:478
-#: lib/command.php:581
+#: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:490
+#: lib/command.php:593
 msgid "No content!"
 msgstr "İçerik yok!"
 
@@ -3807,7 +3783,7 @@ msgid "No recipient specified."
 msgstr ""
 
 #. TRANS: Error text shown when trying to send a direct message to self.
-#: actions/newmessage.php:167 lib/command.php:505
+#: actions/newmessage.php:167 lib/command.php:517
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
@@ -3818,7 +3794,7 @@ msgstr "Mesaj gönder"
 
 #. TRANS: Message given have sent a direct message to another user.
 #. TRANS: %s is the name of the other user.
-#: actions/newmessage.php:188 lib/command.php:513
+#: actions/newmessage.php:188 lib/command.php:525
 #, php-format
 msgid "Direct message to %s sent."
 msgstr "%s kullanıcısına özel mesaj gönderildi."
@@ -3835,9 +3811,7 @@ msgstr "Yeni durum mesajı"
 msgid "Notice posted"
 msgstr "Durum mesajı gönderildi"
 
-#. TRANS: Instructions for Notice search page.
-#. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/noticesearch.php:69
+#: actions/noticesearch.php:68
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -3846,47 +3820,37 @@ msgstr ""
 "%%site.name%%'da durum mesajlarının içeriğinde arama yap. Anahtar kelimeleri "
 "boşluk ile ayırın. Anahtar kelime 3 veya daha fazla karakterden oluşmalı."
 
-#. TRANS: Title of the page where users can search for notices.
-#: actions/noticesearch.php:80
+#: actions/noticesearch.php:78
 msgid "Text search"
 msgstr "Metin arama"
 
-#. TRANS: Test in RSS notice search.
-#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearch.php:95
+#: actions/noticesearch.php:91
 #, php-format
 msgid "Search results for \"%1$s\" on %2$s"
 msgstr "%2$s üzerindeki \"%1$s\" için arama sonuçları"
 
-#. TRANS: Text for logged in users making a query for notices without results.
-#. TRANS: This message contains a Markdown link.
-#: actions/noticesearch.php:128
+#: actions/noticesearch.php:121
 #, php-format
 msgid ""
 "Be the first to [post on this topic](%%%%action.newnotice%%%%?"
 "status_textarea=%s)!"
 msgstr ""
 
-#. TRANS: Text for not logged in users making a query for notices without results.
-#. TRANS: This message contains Markdown links.
-#: actions/noticesearch.php:133
+#: actions/noticesearch.php:124
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and be the first to "
 "[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
 msgstr ""
 
-#. TRANS: RSS notice search feed title. %s is the query.
-#: actions/noticesearchrss.php:95
+#: actions/noticesearchrss.php:96
 #, fuzzy, php-format
 msgid "Updates with \"%s\""
 msgstr "%s adli kullanicinin durum mesajlari"
 
-#. TRANS: RSS notice search feed description.
-#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearchrss.php:99
+#: actions/noticesearchrss.php:98
 #, fuzzy, php-format
-msgid "Updates matching search term \"%1$s\" on %2$s."
+msgid "Updates matching search term \"%1$s\" on %2$s!"
 msgstr "\"%s\" kelimesinin geçtiği tüm güncellemeler"
 
 #: actions/nudge.php:85
@@ -3925,30 +3889,30 @@ msgid "You have not registered any applications yet."
 msgstr ""
 
 #. TRANS: Title for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:70
+#: actions/oauthconnectionssettings.php:71
 msgid "Connected applications"
 msgstr "Bağlı uygulamalar"
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:81
+#: actions/oauthconnectionssettings.php:83
 msgid "The following connections exist for your account."
 msgstr ""
 
 #. TRANS: Client error when trying to revoke access for an application while not being a user of it.
-#: actions/oauthconnectionssettings.php:166
+#: actions/oauthconnectionssettings.php:168
 msgid "You are not a user of that application."
 msgstr "Bu uygulamanın bir kullanıcısı değilsiniz."
 
 #. TRANS: Client error when revoking access has failed for some reason.
 #. TRANS: %s is the application ID revoking access failed for.
-#: actions/oauthconnectionssettings.php:181
+#: actions/oauthconnectionssettings.php:183
 #, fuzzy, php-format
 msgid "Unable to revoke access for application: %s."
 msgstr "Uygulamayı düzenlemek için bu biçimi kullan."
 
 #. TRANS: Success message after revoking access for an application.
 #. TRANS: %1$s is the application name, %2$s is the first part of the user token.
-#: actions/oauthconnectionssettings.php:200
+#: actions/oauthconnectionssettings.php:202
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -3956,30 +3920,20 @@ msgid ""
 msgstr ""
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:211
+#: actions/oauthconnectionssettings.php:213
 msgid "You have not authorized any applications to use your account."
 msgstr ""
 
 #. TRANS: Note for developers in the OAuth connection settings form.
 #. TRANS: This message contains a Markdown link. Do not separate "](".
 #. TRANS: %s is the URL to the OAuth settings.
-#: actions/oauthconnectionssettings.php:231
+#: actions/oauthconnectionssettings.php:233
 #, php-format
 msgid ""
 "Are you a developer? [Register an OAuth client application](%s) to use with "
 "this instance of StatusNet."
 msgstr ""
 
-#: actions/oembed.php:64
-#, fuzzy, php-format
-msgid "\"%s\" not found."
-msgstr "Onay kodu bulunamadı."
-
-#: actions/oembed.php:76
-#, fuzzy, php-format
-msgid "Notice %s not found."
-msgstr "Üst durum mesajı bulunamadı."
-
 #: actions/oembed.php:80 actions/shownotice.php:100
 msgid "Notice has no profile."
 msgstr "Kullanıcının profili yok."
@@ -3989,16 +3943,6 @@ msgstr "Kullanıcının profili yok."
 msgid "%1$s's status on %2$s"
 msgstr "%1$s'in %2$s'deki durum mesajları "
 
-#: actions/oembed.php:95
-#, fuzzy, php-format
-msgid "Attachment %s not found."
-msgstr "Alıcı kullanıcı bulunamadı."
-
-#: actions/oembed.php:136
-#, php-format
-msgid "\"%s\" not supported for oembed requests."
-msgstr ""
-
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
 #: actions/oembed.php:168
 #, fuzzy, php-format
@@ -4017,12 +3961,11 @@ msgstr ""
 msgid "Not a supported data format."
 msgstr "Desteklenen bir veri biçimi değil."
 
-#. TRANS: ShortName in the OpenSearch interface when trying to find users.
 #: actions/opensearch.php:64
 msgid "People Search"
 msgstr "Kişi Arama"
 
-#: actions/opensearch.php:68
+#: actions/opensearch.php:67
 msgid "Notice Search"
 msgstr "Durum Mesajı Arama"
 
@@ -4070,50 +4013,41 @@ msgstr ""
 msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr "Yer bilgisi çok uzun (azm: 255 karakter)."
 
-#. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
-#: actions/otp.php:70
+#: actions/otp.php:69
 #, fuzzy
 msgid "No user ID specified."
 msgstr "Yeni durum mesajı"
 
-#. TRANS: Client error displayed trying to use "one time password login" without specifying a login token.
-#: actions/otp.php:86
+#: actions/otp.php:83
 #, fuzzy
 msgid "No login token specified."
 msgstr "Yeni durum mesajı"
 
-#. TRANS: Client error displayed trying to use "one time password login" without requesting a login token.
-#: actions/otp.php:94
+#: actions/otp.php:90
 #, fuzzy
 msgid "No login token requested."
 msgstr "Yetkilendirme isteği yok!"
 
-#. TRANS: Client error displayed trying to use "one time password login" while specifying an invalid login token.
-#: actions/otp.php:100
+#: actions/otp.php:95
 #, fuzzy
 msgid "Invalid login token specified."
 msgstr "Geçersiz durum mesajı"
 
-#. TRANS: Client error displayed trying to use "one time password login" while specifying an expired login token.
-#: actions/otp.php:110
+#: actions/otp.php:104
 msgid "Login token expired."
 msgstr ""
 
-#. TRANS: Title for outbox for any but the fist page.
-#. TRANS: %1$s is the user nickname, %2$d is the page number.
-#: actions/outbox.php:57
+#: actions/outbox.php:58
 #, php-format
 msgid "Outbox for %1$s - page %2$d"
 msgstr ""
 
-#. TRANS: Title for first page of outbox.
 #: actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
 msgstr ""
 
-#. TRANS: Instructions for outbox.
-#: actions/outbox.php:103
+#: actions/outbox.php:104
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr ""
 
@@ -4139,45 +4073,43 @@ msgstr "Eski parola"
 msgid "New password"
 msgstr "Yeni parola"
 
-#: actions/passwordsettings.php:109 actions/register.php:423
+#: actions/passwordsettings.php:109
 #, fuzzy
-msgid "6 or more characters."
+msgid "6 or more characters"
 msgstr "6 veya daha fazla karakter"
 
-#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:264
-#: actions/register.php:427
+#: actions/passwordsettings.php:113
 #, fuzzy
-msgid "Same as password above."
+msgid "Same as password above"
 msgstr "yukarıdaki parolanın aynısı"
 
 #: actions/passwordsettings.php:117
 msgid "Change"
 msgstr "Değiştir"
 
-#: actions/passwordsettings.php:153 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:238
 msgid "Password must be 6 or more characters."
 msgstr "Parola 6 veya daha fazla karakterden oluşmalıdır."
 
-#: actions/passwordsettings.php:156 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:241
 msgid "Passwords don't match."
 msgstr "Parolalar birbirini tutmuyor."
 
-#: actions/passwordsettings.php:164
+#: actions/passwordsettings.php:165
 msgid "Incorrect old password"
 msgstr "Eski parola yanlış"
 
-#: actions/passwordsettings.php:180
+#: actions/passwordsettings.php:181
 msgid "Error saving user; invalid."
 msgstr "Kullanıcıyı kaydetmede hata oluştu; geçersiz."
 
-#. TRANS: Reset password form validation error message.
-#: actions/passwordsettings.php:185 actions/recoverpassword.php:418
+#: actions/passwordsettings.php:186
 #, fuzzy
-msgid "Cannot save new password."
+msgid "Can't save new password."
 msgstr "Yeni parola kaydedilemedi."
 
-#: actions/passwordsettings.php:191
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
 msgid "Password saved."
 msgstr "Parola kaydedildi."
 
@@ -4467,9 +4399,7 @@ msgstr ""
 msgid "Save paths"
 msgstr "Yeni durum mesajı"
 
-#. TRANS: Instructions for the "People search" page.
-#. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/peoplesearch.php:54
+#: actions/peoplesearch.php:52
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
@@ -4479,8 +4409,7 @@ msgstr ""
 "yap. Anahtar kelimeleri boşluk ile ayırın. Anahtar kelime 3 veya daha fazla "
 "karakterden oluşmalı. "
 
-#. TRANS: Title of a page where users can search for other users.
-#: actions/peoplesearch.php:61
+#: actions/peoplesearch.php:58
 msgid "People search"
 msgstr "Kişi Arama"
 
@@ -4522,7 +4451,7 @@ msgid "Profile information"
 msgstr "Profil ayarları"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109 actions/register.php:419
+#: actions/profilesettings.php:109 actions/register.php:433
 #, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr ""
@@ -4532,7 +4461,7 @@ msgstr ""
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for full group name (dt). Text hidden by default.
 #. TRANS: DT for full name in a profile.
-#: actions/profilesettings.php:113 actions/register.php:441
+#: actions/profilesettings.php:113 actions/register.php:455
 #: actions/showgroup.php:255 actions/tagother.php:104
 #: lib/groupeditform.php:150 lib/userprofile.php:156
 msgid "Full name"
@@ -4540,13 +4469,13 @@ msgstr "Tam İsim"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:118 actions/register.php:446
+#: actions/profilesettings.php:118 actions/register.php:460
 #: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "Başlangıç Sayfası"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:121 actions/register.php:448
+#: actions/profilesettings.php:121
 #, fuzzy
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr ""
@@ -4555,37 +4484,36 @@ msgstr ""
 #. TRANS: Tooltip for field label in form for profile settings. Plural
 #. TRANS: is decided by the number of characters available for the
 #. TRANS: biography (%d).
-#: actions/profilesettings.php:129 actions/register.php:457
+#: actions/profilesettings.php:129 actions/register.php:471
 #, fuzzy, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
 msgstr[0] "Kendinizi ve ilgi alanlarınızı 140 karakter ile anlatın"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:135 actions/register.php:462
+#: actions/profilesettings.php:135 actions/register.php:476
 #, fuzzy
 msgid "Describe yourself and your interests"
 msgstr "Kendinizi ve ilgi alanlarınızı 140 karakter ile anlatın"
 
 #. TRANS: Text area label in form for profile settings where users can provide.
 #. TRANS: their biography.
-#: actions/profilesettings.php:139 actions/register.php:464
+#: actions/profilesettings.php:139 actions/register.php:478
 msgid "Bio"
 msgstr "Hakkında"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group location (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT for location in a profile.
-#: actions/profilesettings.php:145 actions/register.php:469
+#: actions/profilesettings.php:145 actions/register.php:483
 #: actions/showgroup.php:265 actions/tagother.php:112
-#: actions/userauthorization.php:174 lib/groupeditform.php:173
+#: actions/userauthorization.php:166 lib/groupeditform.php:173
 #: lib/userprofile.php:172
 msgid "Location"
 msgstr "Yer"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148
+#: actions/profilesettings.php:148 actions/register.php:485
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Bulunduğunuz yer, \"Şehir, Eyalet (veya Bölge), Ülke\" gibi"
 
@@ -4606,8 +4534,7 @@ msgstr "Etiketler"
 #: actions/profilesettings.php:164
 #, fuzzy
 msgid ""
-"Tags for yourself (letters, numbers, -, ., and _), comma- or space- "
-"separated."
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr ""
 "Kendiniz için etiketler (harf, sayı, -. ., ve _ kullanılabilir), virgül veya "
 "boşlukla ayırabilirsiniz"
@@ -4620,7 +4547,7 @@ msgstr "Dil"
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
 #: actions/profilesettings.php:171
 #, fuzzy
-msgid "Preferred language."
+msgid "Preferred language"
 msgstr "Tercih edilen dil"
 
 #. TRANS: Dropdownlist label in form for profile settings.
@@ -4637,13 +4564,13 @@ msgstr "Normalde hangi zaman dilimi içindesiniz?"
 #: actions/profilesettings.php:189
 #, fuzzy
 msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)."
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr "Bana abone olan herkese abone yap (insan olmayanlar için en iyisi)"
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Plural form is used based on the maximum number of allowed
 #. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:258 actions/register.php:221
+#: actions/profilesettings.php:258 actions/register.php:229
 #, fuzzy, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4662,9 +4589,9 @@ msgstr "Dil çok uzun (maksimum: 50 karakter)."
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:291
-#, fuzzy, php-format
-msgid "Invalid tag: \"%s\"."
+#: actions/profilesettings.php:291 actions/tagother.php:178
+#, php-format
+msgid "Invalid tag: \"%s\""
 msgstr "Geçersiz büyüklük."
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
@@ -4766,12 +4693,6 @@ msgid ""
 "tool."
 msgstr ""
 
-#. TRANS: Public RSS feed description. %s is the StatusNet site name.
-#: actions/publicrss.php:106
-#, php-format
-msgid "%s updates from everyone."
-msgstr ""
-
 #. TRANS: Title for public tag cloud.
 #: actions/publictagcloud.php:57
 #, fuzzy
@@ -4910,12 +4831,6 @@ msgstr "Parolanı geri al"
 msgid "Password recovery requested"
 msgstr "Parola geri alma isteği"
 
-#. TRANS: Title for password recovery page in password saved mode.
-#: actions/recoverpassword.php:229
-#, fuzzy
-msgid "Password saved"
-msgstr "Parola kaydedildi."
-
 #. TRANS: Title for password recovery page when an unknown action has been specified.
 #: actions/recoverpassword.php:232
 msgid "Unknown action"
@@ -4927,6 +4842,12 @@ msgstr ""
 msgid "6 or more characters, and do not forget it!"
 msgstr "Unutmayın, 6 veya daha fazla karakter"
 
+#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#: actions/recoverpassword.php:264 actions/register.php:441
+#, fuzzy
+msgid "Same as password above."
+msgstr "yukarıdaki parolanın aynısı"
+
 #. TRANS: Button text for password reset form.
 #. TRANS: Button text on profile design page to reset all colour settings to default without saving.
 #: actions/recoverpassword.php:268 lib/designsettings.php:264
@@ -4981,8 +4902,14 @@ msgstr "Parola 6 veya daha fazla karakterden oluşmalıdır."
 msgid "Password and confirmation do not match."
 msgstr "Parola ve onaylaması birbirini tutmuyor."
 
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:418
+#, fuzzy
+msgid "Cannot save new password."
+msgstr "Yeni parola kaydedilemedi."
+
 #. TRANS: Server error displayed when something does wrong with the user object during password reset.
-#: actions/recoverpassword.php:426 actions/register.php:248
+#: actions/recoverpassword.php:426 actions/register.php:256
 msgid "Error setting user."
 msgstr "Kullanıcı ayarlamada hata oluştu."
 
@@ -4991,90 +4918,96 @@ msgstr "Kullanıcı ayarlamada hata oluştu."
 msgid "New password successfully saved. You are now logged in."
 msgstr "Yeni parola başarıyla kaydedildi. Şimdi giriş yaptınız."
 
-#: actions/register.php:87 actions/register.php:188 actions/register.php:399
+#: actions/register.php:92 actions/register.php:196 actions/register.php:413
 msgid "Sorry, only invited people can register."
 msgstr ""
 
-#: actions/register.php:94
+#: actions/register.php:99
 #, fuzzy
 msgid "Sorry, invalid invitation code."
 msgstr "Onay kodu hatası."
 
-#: actions/register.php:113
+#: actions/register.php:119
 msgid "Registration successful"
 msgstr "Kayıt başarılı"
 
-#: actions/register.php:115 actions/register.php:497
+#: actions/register.php:121 actions/register.php:511
 msgid "Register"
 msgstr "Kayıt"
 
-#: actions/register.php:135
+#: actions/register.php:142
 msgid "Registration not allowed."
 msgstr "Kayıt yapılmasına izin verilmiyor."
 
-#: actions/register.php:201
+#: actions/register.php:209
 #, fuzzy
-msgid "You cannot register if you don't agree to the license."
+msgid "You can't register if you don't agree to the license."
 msgstr "Eğer lisansı kabul etmezseniz kayıt olamazsınız."
 
-#: actions/register.php:210
+#: actions/register.php:218
 msgid "Email address already exists."
 msgstr "Eposta adresi zaten var."
 
-#: actions/register.php:243 actions/register.php:265
+#: actions/register.php:251 actions/register.php:273
 msgid "Invalid username or password."
 msgstr "Geçersiz kullanıcı adı veya parola."
 
-#: actions/register.php:340
+#: actions/register.php:351
 msgid ""
 "With this form you can create a new account. You can then post notices and "
-"link up to friends and colleagues."
+"link up to friends and colleagues. "
 msgstr ""
 
+#: actions/register.php:437
+#, fuzzy
+msgid "6 or more characters."
+msgstr "6 veya daha fazla karakter"
+
 #. TRANS: Link description in user account settings menu.
-#: actions/register.php:431 actions/register.php:435
+#: actions/register.php:445 actions/register.php:449
 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
 msgid "Email"
 msgstr "Eposta"
 
-#: actions/register.php:432 actions/register.php:436
+#: actions/register.php:446 actions/register.php:450
 #, fuzzy
-msgid "Used only for updates, announcements, and password recovery."
+msgid "Used only for updates, announcements, and password recovery"
 msgstr ""
 "Sadece sistem güncellemeleri, duyurular ve parola geri alma için kullanılır."
 
-#: actions/register.php:443
-msgid "Longer name, preferably your \"real\" name."
+#: actions/register.php:457
+msgid "Longer name, preferably your \"real\" name"
 msgstr ""
 
-#: actions/register.php:471
+#: actions/register.php:462
 #, fuzzy
-msgid "Where you are, like \"City, State (or Region), Country\"."
-msgstr "Bulunduğunuz yer, \"Şehir, Eyalet (veya Bölge), Ülke\" gibi"
+msgid "URL of your homepage, blog, or profile on another site"
+msgstr ""
+"Web Sitenizin, blogunuzun ya da varsa başka bir sitedeki profilinizin adresi"
 
-#: actions/register.php:510
+#: actions/register.php:523
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
 msgstr ""
 
-#: actions/register.php:520
+#: actions/register.php:533
 #, php-format
 msgid "My text and files are copyright by %1$s."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:524
+#: actions/register.php:537
 msgid "My text and files remain under my own copyright."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:527
+#: actions/register.php:540
 msgid "All rights reserved."
 msgstr "Tüm hakları saklıdır."
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:532
+#: actions/register.php:545
 #, fuzzy, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -5083,7 +5016,7 @@ msgstr ""
 "bu özel veriler haricinde: parola, eposta adresi, IM adresi, telefon "
 "numarası."
 
-#: actions/register.php:573
+#: actions/register.php:588
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -5102,7 +5035,7 @@ msgid ""
 "Thanks for signing up and we hope you enjoy using this service."
 msgstr ""
 
-#: actions/register.php:597
+#: actions/register.php:612
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5131,7 +5064,7 @@ msgstr "Kullanıcı takma adı"
 
 #: actions/remotesubscribe.php:129
 #, fuzzy
-msgid "Nickname of the user you want to follow."
+msgid "Nickname of the user you want to follow"
 msgstr "Takip etmek istediğiniz kullanıcının takma adı"
 
 #: actions/remotesubscribe.php:132
@@ -5139,7 +5072,7 @@ msgid "Profile URL"
 msgstr "Profil Adresi"
 
 #: actions/remotesubscribe.php:133
-msgid "URL of your profile on another compatible microblogging service."
+msgid "URL of your profile on another compatible microblogging service"
 msgstr ""
 
 #. TRANS: Link text for link that will subscribe to a remote profile.
@@ -5150,7 +5083,7 @@ msgstr "Abone ol"
 
 #: actions/remotesubscribe.php:158
 #, fuzzy
-msgid "Invalid profile URL (bad format)."
+msgid "Invalid profile URL (bad format)"
 msgstr "Geçersiz dosya ismi."
 
 #: actions/remotesubscribe.php:167
@@ -5195,7 +5128,6 @@ msgstr "Sıfırla"
 msgid "Repeated!"
 msgstr "Yarat"
 
-#. TRANS: RSS reply feed title. %s is a user nickname.
 #. TRANS: Tooltip for personal group navigation menu option when logged in for viewing @-replies.
 #: actions/replies.php:126 actions/repliesrss.php:68
 #: lib/personalgroupnav.php:109
@@ -5244,11 +5176,9 @@ msgid ""
 "newnotice%%%%?status_textarea=%3$s)."
 msgstr ""
 
-#. TRANS: RSS reply feed description.
-#. TRANS: %1$s is a user nickname, %2$s is the StatusNet site name.
-#: actions/repliesrss.php:74
+#: actions/repliesrss.php:72
 #, fuzzy, php-format
-msgid "Replies to %1$s on %2$s."
+msgid "Replies to %1$s on %2$s!"
 msgstr "%s için cevaplar"
 
 #. TRANS: Client exception displayed when trying to restore an account while not logged in.
@@ -5349,7 +5279,7 @@ msgstr "Bize o profili yollamadınız"
 msgid "User doesn't have this role."
 msgstr "Kullanıcının profili yok."
 
-#: actions/rsd.php:142 actions/version.php:159
+#: actions/rsd.php:146 actions/version.php:159
 msgid "StatusNet"
 msgstr "İstatistikler"
 
@@ -5393,95 +5323,95 @@ msgstr ""
 msgid "Save site settings"
 msgstr "Profil ayarları"
 
-#: actions/showapplication.php:78
+#: actions/showapplication.php:82
 msgid "You must be logged in to view an application."
 msgstr ""
 
-#: actions/showapplication.php:151
+#: actions/showapplication.php:157
 #, fuzzy
 msgid "Application profile"
 msgstr "Bu durum mesajının ait oldugu kullanıcı profili yok"
 
 #. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:153 lib/applicationeditform.php:177
+#: actions/showapplication.php:159 lib/applicationeditform.php:177
 msgid "Icon"
 msgstr "Simge"
 
 #. TRANS: Form input field label for application name.
-#: actions/showapplication.php:163 actions/version.php:197
+#: actions/showapplication.php:169 actions/version.php:197
 #: lib/applicationeditform.php:190
 #, fuzzy
 msgid "Name"
 msgstr "Takma ad"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:172 lib/applicationeditform.php:227
+#: actions/showapplication.php:178 lib/applicationeditform.php:227
 msgid "Organization"
 msgstr "Organizasyon"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:181 actions/version.php:200
+#: actions/showapplication.php:187 actions/version.php:200
 #: lib/applicationeditform.php:208 lib/groupeditform.php:168
 msgid "Description"
 msgstr "Tanım"
 
 #. TRANS: Header for group statistics on a group page (h2).
 #. TRANS: H2 text for user statistics.
-#: actions/showapplication.php:186 actions/showgroup.php:460
+#: actions/showapplication.php:192 actions/showgroup.php:460
 #: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "İstatistikler"
 
-#: actions/showapplication.php:197
+#: actions/showapplication.php:203
 #, php-format
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr ""
 
-#: actions/showapplication.php:207
+#: actions/showapplication.php:213
 msgid "Application actions"
 msgstr ""
 
-#: actions/showapplication.php:230
+#: actions/showapplication.php:236
 msgid "Reset key & secret"
 msgstr ""
 
 #. TRANS: Title of form for deleting a user.
-#: actions/showapplication.php:246 lib/deletegroupform.php:121
+#: actions/showapplication.php:252 lib/deletegroupform.php:121
 #: lib/deleteuserform.php:64 lib/noticelist.php:673
 msgid "Delete"
 msgstr "Sil"
 
-#: actions/showapplication.php:255
+#: actions/showapplication.php:261
 msgid "Application info"
 msgstr ""
 
-#: actions/showapplication.php:257
+#: actions/showapplication.php:263
 msgid "Consumer key"
 msgstr ""
 
-#: actions/showapplication.php:262
+#: actions/showapplication.php:268
 msgid "Consumer secret"
 msgstr ""
 
-#: actions/showapplication.php:267
+#: actions/showapplication.php:273
 msgid "Request token URL"
 msgstr ""
 
-#: actions/showapplication.php:272
+#: actions/showapplication.php:278
 msgid "Access token URL"
 msgstr ""
 
-#: actions/showapplication.php:277
+#: actions/showapplication.php:283
 msgid "Authorize URL"
 msgstr ""
 
-#: actions/showapplication.php:282
+#: actions/showapplication.php:288
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
 msgstr ""
 
-#: actions/showapplication.php:302
+#: actions/showapplication.php:309
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr ""
 
@@ -5567,18 +5497,16 @@ msgid "Group profile"
 msgstr "Kullanıcının profili yok."
 
 #. TRANS: Label for group URL (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT for URL in a profile.
 #: actions/showgroup.php:273 actions/tagother.php:118
-#: actions/userauthorization.php:184 lib/userprofile.php:186
+#: actions/userauthorization.php:175 lib/userprofile.php:186
 msgid "URL"
 msgstr "Bağlantı"
 
 #. TRANS: Label for group description or group note (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page where bio is displayed.
 #. TRANS: DT for note in a profile.
 #: actions/showgroup.php:285 actions/tagother.php:128
-#: actions/userauthorization.php:197 lib/userprofile.php:204
+#: actions/userauthorization.php:187 lib/userprofile.php:204
 msgid "Note"
 msgstr "Not"
 
@@ -5716,7 +5644,7 @@ msgid "%1$s tagged %2$s"
 msgstr "%s ve arkadaşları"
 
 #. TRANS: Page title showing tagged notices in one user's stream.
-#. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
+#. TRANS: %1$s is the username, %2$s is the hash tag, %1$d is the page number.
 #: actions/showstream.php:74
 #, fuzzy, php-format
 msgid "%1$s tagged %2$s, page %3$d"
@@ -5957,7 +5885,7 @@ msgstr ""
 #. TRANS: Title for button to save site notice in admin panel.
 #: actions/sitenoticeadminpanel.php:201
 #, fuzzy
-msgid "Save site notice."
+msgid "Save site notice"
 msgstr "Yeni durum mesajı"
 
 #. TRANS: Title for SMS settings.
@@ -6020,7 +5948,7 @@ msgstr ""
 #. TRANS: SMS phone number input field instructions in SMS settings form.
 #: actions/smssettings.php:152
 #, fuzzy
-msgid "Phone number, no punctuation or spaces, with area code."
+msgid "Phone number, no punctuation or spaces, with area code"
 msgstr ""
 "1-64 küçük harf veya rakam, noktalama işaretlerine ve boşluklara izin "
 "verilmez"
@@ -6195,20 +6123,16 @@ msgstr "Bize o profili yollamadınız"
 msgid "Could not save subscription."
 msgstr "Yeni abonelik eklenemedi."
 
-#. TRANS: Client error displayed trying to perform any request method other than POST.
-#. TRANS: Do not translate POST.
 #: actions/subscribe.php:77
 msgid "This action only accepts POST requests."
 msgstr ""
 
-#. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
-#: actions/subscribe.php:121
+#: actions/subscribe.php:117
 #, fuzzy
 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
 msgstr "Bize o profili yollamadınız"
 
-#. TRANS: Page title when subscription succeeded.
-#: actions/subscribe.php:149
+#: actions/subscribe.php:145
 #, fuzzy
 msgid "Subscribed"
 msgstr "Abone ol"
@@ -6361,9 +6285,8 @@ msgstr ""
 msgid "User profile"
 msgstr "Kullanıcının profili yok."
 
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT element in area for user avatar.
-#: actions/tagother.php:81 actions/userauthorization.php:138
+#: actions/tagother.php:81 actions/userauthorization.php:132
 #: lib/userprofile.php:108
 msgid "Photo"
 msgstr "Fotoğraf"
@@ -6378,11 +6301,6 @@ msgid ""
 "separated"
 msgstr ""
 
-#: actions/tagother.php:178
-#, php-format
-msgid "Invalid tag: \"%s\""
-msgstr "Geçersiz büyüklük."
-
 #: actions/tagother.php:193
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
@@ -6396,7 +6314,6 @@ msgstr ""
 msgid "No such tag."
 msgstr "Böyle bir etiket yok."
 
-#. TRANS: Client error displayed when trying to unblock a non-blocked user.
 #: actions/unblock.php:59
 #, fuzzy
 msgid "You haven't blocked that user."
@@ -6422,7 +6339,7 @@ msgstr "Yetkilendirme isteği yok!"
 msgid "Unsubscribed"
 msgstr "Aboneliği sonlandır"
 
-#: actions/updateprofile.php:64
+#: actions/updateprofile.php:64 actions/userauthorization.php:337
 #, php-format
 msgid ""
 "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
@@ -6454,7 +6371,7 @@ msgstr "Geçersiz lisans başlığı. En fazla uzunluk 255 karakterdir."
 #. TRANS: users in user admin panel. %1$s is the invalid nickname.
 #: actions/useradminpanel.php:166
 #, php-format
-msgid "Invalid default subscripton: \"%1$s\" is not a user."
+msgid "Invalid default subscripton: '%1$s' is not a user."
 msgstr ""
 
 #. TRANS: Link description in user account settings menu.
@@ -6519,144 +6436,109 @@ msgstr ""
 #. TRANS: Title for button to save user settings in user admin panel.
 #: actions/useradminpanel.php:302
 #, fuzzy
-msgid "Save user settings."
+msgid "Save user settings"
 msgstr "Profil ayarları"
 
-#. TRANS: Page title.
-#: actions/userauthorization.php:109
+#: actions/userauthorization.php:105
 msgid "Authorize subscription"
 msgstr "Takip isteğini onayla"
 
-#. TRANS: Page notice on "Auhtorize subscription" page.
-#: actions/userauthorization.php:115
+#: actions/userauthorization.php:110
 #, fuzzy
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
 "user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
-"click \"Reject\"."
+"click “Reject”."
 msgstr ""
 "Lütfen bu kullanıcının durumunu takip etmek istediğinizden emin olmak için "
 "detayları gözden geçirin. Kimsenin durumunu taki etme isteğinde "
 "bulunmadıysanız \"İptal\" tuşuna basın. "
 
-#. TRANS: DT element on Authorise Subscription page where license is displayed.
 #. TRANS: Menu item for site administration
-#: actions/userauthorization.php:207 actions/version.php:167
+#: actions/userauthorization.php:196 actions/version.php:167
 #: lib/adminpanelaction.php:403
 msgid "License"
 msgstr "Lisans"
 
-#. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:229
+#: actions/userauthorization.php:217
 #, fuzzy
-msgctxt "BUTTON"
 msgid "Accept"
 msgstr "Kabul et"
 
-#. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:231
-#, fuzzy
-msgid "Subscribe to this user."
+#: actions/userauthorization.php:218 lib/subscribeform.php:115
+#: lib/subscribeform.php:139
+msgid "Subscribe to this user"
 msgstr "Bize o profili yollamadınız"
 
-#. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:233
+#: actions/userauthorization.php:219
 #, fuzzy
-msgctxt "BUTTON"
 msgid "Reject"
 msgstr "Reddet"
 
-#. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:235
+#: actions/userauthorization.php:220
 #, fuzzy
-msgid "Reject this subscription."
+msgid "Reject this subscription"
 msgstr "Takip isteğini onayla"
 
-#. TRANS: Client error displayed for an empty authorisation request.
-#: actions/userauthorization.php:248
+#: actions/userauthorization.php:232
 msgid "No authorization request!"
 msgstr "Yetkilendirme isteği yok!"
 
-#. TRANS: Accept message header from Authorise subscription page.
-#: actions/userauthorization.php:271
+#: actions/userauthorization.php:254
 msgid "Subscription authorized"
 msgstr "Takip talebine izin verildi"
 
-#: actions/userauthorization.php:274
+#: actions/userauthorization.php:256
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to authorize the "
 "subscription. Your subscription token is:"
 msgstr ""
 
-#. TRANS: Reject message header from Authorise subscription page.
-#: actions/userauthorization.php:285
+#: actions/userauthorization.php:266
 msgid "Subscription rejected"
 msgstr "Abonelik reddedildi."
 
-#: actions/userauthorization.php:288
+#: actions/userauthorization.php:268
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to fully reject the "
 "subscription."
 msgstr ""
 
-#. TRANS: Exception thrown when no valid user is found for an authorisation request.
-#. TRANS: %s is a listener URI.
-#: actions/userauthorization.php:325
+#: actions/userauthorization.php:303
 #, php-format
-msgid "Listener URI \"%s\" not found here."
+msgid "Listener URI ‘%s’ not found here."
 msgstr ""
 
-#. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:332
+#: actions/userauthorization.php:308
 #, fuzzy, php-format
-msgid "Listenee URI \"%s\" is too long."
+msgid "Listenee URI ‘%s’ is too long."
 msgstr "Kaynak bağlantı çok uzun."
 
-#. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:340
-#, php-format
-msgid "Listenee URI \"%s\" is a local user."
-msgstr ""
-
-#. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
-#. TRANS: %s is a profile URL.
-#: actions/userauthorization.php:358
-#, php-format
-msgid "Profile URL \"%s\" is for a local user."
-msgstr ""
-
-#. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
-#. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
-#: actions/userauthorization.php:368
-#, php-format
-msgid ""
-"Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
-"\"."
-msgstr ""
-
-#. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:378
+#: actions/userauthorization.php:314
 #, fuzzy, php-format
-msgid "Avatar URL \"%s\" is not valid."
+msgid "Listenee URI ‘%s’ is a local user."
+msgstr "Kaynak bağlantı çok uzun."
+
+#: actions/userauthorization.php:329
+#, php-format
+msgid "Profile URL ‘%s’ is for a local user."
+msgstr ""
+
+#: actions/userauthorization.php:345
+#, fuzzy, php-format
+msgid "Avatar URL ‘%s’ is not valid."
 msgstr "Kaynak bağlantı geçerli değil."
 
-#. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:385
+#: actions/userauthorization.php:350
 #, fuzzy, php-format
-msgid "Cannot read avatar URL \"%s\"."
+msgid "Can’t read avatar URL ‘%s’."
 msgstr "Avatar URLi '%s' okunamıyor"
 
-#. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:392
+#: actions/userauthorization.php:355
 #, fuzzy, php-format
-msgid "Wrong image type for avatar URL \"%s\"."
+msgid "Wrong image type for avatar URL ‘%s’."
 msgstr "%s için yanlış resim türü"
 
 #. TRANS: Page title for profile design page.
@@ -6751,7 +6633,7 @@ msgid "Plugins"
 msgstr "Eklentiler"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:898
+#: actions/version.php:198 lib/action.php:901
 msgid "Version"
 msgstr "Sürüm"
 
@@ -6956,14 +6838,14 @@ msgstr "Durum mesajını kaydederken hata oluştu."
 
 #. TRANS: Server exception thrown when a reply cannot be saved.
 #. TRANS: %1$d is a notice ID, %2$d is the ID of the mentioned user.
-#: classes/Notice.php:1142
+#: classes/Notice.php:1144
 #, fuzzy, php-format
 msgid "Could not save reply for %1$d, %2$d."
 msgstr "Profil kaydedilemedi."
 
 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1661
+#: classes/Notice.php:1663
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr ""
@@ -6977,14 +6859,14 @@ msgstr "%1$s'in %2$s'deki durum mesajları "
 
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:775
+#: classes/Profile.php:779
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:784
+#: classes/Profile.php:788
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -7308,54 +7190,54 @@ msgid "Page notice"
 msgstr "Yeni durum mesajı"
 
 #. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:871
+#: lib/action.php:874
 #, fuzzy
 msgid "Secondary site navigation"
 msgstr "Abonelikler"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:877
+#: lib/action.php:880
 msgid "Help"
 msgstr "Yardım"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:880
+#: lib/action.php:883
 msgid "About"
 msgstr "Hakkında"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:883
+#: lib/action.php:886
 msgid "FAQ"
 msgstr "SSS"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:888
+#: lib/action.php:891
 msgid "TOS"
 msgstr ""
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:892
+#: lib/action.php:895
 msgid "Privacy"
 msgstr "Gizlilik"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:895
+#: lib/action.php:898
 msgid "Source"
 msgstr "Kaynak"
 
 #. TRANS: Secondary navigation menu option leading to e-mail contact information on the
 #. TRANS: StatusNet site, where to report bugs, ...
-#: lib/action.php:902
+#: lib/action.php:905
 msgid "Contact"
 msgstr "İletişim"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:905
+#: lib/action.php:908
 msgid "Badge"
 msgstr ""
 
 #. TRANS: DT element for StatusNet software license.
-#: lib/action.php:934
+#: lib/action.php:937
 msgid "StatusNet software license"
 msgstr "StatusNet yazılım lisansı"
 
@@ -7363,7 +7245,7 @@ msgstr "StatusNet yazılım lisansı"
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:941
+#: lib/action.php:944
 #, fuzzy, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7373,7 +7255,7 @@ msgstr ""
 "hazırlanan anında mesajlaşma ağıdır. "
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:944
+#: lib/action.php:947
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** bir aninda mesajlaşma sosyal ağıdır."
@@ -7382,7 +7264,7 @@ msgstr "**%%site.name%%** bir aninda mesajlaşma sosyal ağıdır."
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:951
+#: lib/action.php:954
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7394,50 +7276,50 @@ msgstr ""
 "microbloglama yazılımının %s. versiyonunu kullanmaktadır."
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:967
+#: lib/action.php:970
 msgid "Site content license"
 msgstr "Site içeriği lisansı"
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:974
+#: lib/action.php:977
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:981
+#: lib/action.php:984
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:985
+#: lib/action.php:988
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:1017
+#: lib/action.php:1020
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
 
 #. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1353
+#: lib/action.php:1356
 msgid "Pagination"
 msgstr ""
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1364
+#: lib/action.php:1367
 msgid "After"
 msgstr "Sonra"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1374
+#: lib/action.php:1377
 msgid "Before"
 msgstr "Önce"
 
@@ -7637,23 +7519,19 @@ msgstr ""
 msgid "No application for that consumer key."
 msgstr ""
 
-#: lib/apiauth.php:202 lib/apiauth.php:284
-msgid "Not allowed to use API."
-msgstr ""
-
 #. TRANS: OAuth exception given when an incorrect access token was given for a user.
-#: lib/apiauth.php:225
+#: lib/apiauth.php:219
 msgid "Bad access token."
 msgstr ""
 
 #. TRANS: OAuth exception given when no user was found for a given token (no token was found).
-#: lib/apiauth.php:230
+#: lib/apiauth.php:224
 msgid "No user for that token."
 msgstr ""
 
 #. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel".
 #. TRANS: Client error thrown when authentication fails.
-#: lib/apiauth.php:272 lib/apiauth.php:302
+#: lib/apiauth.php:266 lib/apiauth.php:293
 msgid "Could not authenticate you."
 msgstr ""
 
@@ -7864,11 +7742,6 @@ msgstr "Parola kaydedildi."
 msgid "Block"
 msgstr "Engelle"
 
-#. TRANS: Description of the form to block a user.
-#: lib/blockform.php:79
-msgid "Block this user"
-msgstr "Bu kullanıcıyı engelle"
-
 #. TRANS: Title for command results.
 #: lib/channel.php:160 lib/channel.php:181
 msgid "Command results"
@@ -7896,7 +7769,7 @@ msgstr ""
 
 #. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
 #. TRANS: Error text shown when a last user notice is requested and it does not exist.
-#: lib/command.php:99 lib/command.php:630
+#: lib/command.php:99 lib/command.php:642
 #, fuzzy
 msgid "User has no last notice."
 msgstr "Kullanıcının profili yok."
@@ -7944,35 +7817,41 @@ msgid ""
 "Notices: %3$s"
 msgstr ""
 
+#. TRANS: Error message text shown when a favorite could not be set because it has already been favorited.
+#: lib/command.php:298
+#, fuzzy
+msgid "Could not create favorite: already favorited."
+msgstr "Favori oluşturulamadı."
+
 #. TRANS: Text shown when a notice has been marked as favourite successfully.
-#: lib/command.php:312
+#: lib/command.php:324
 msgid "Notice marked as fave."
 msgstr ""
 
 #. TRANS: Message given having added a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:357
+#: lib/command.php:369
 #, php-format
 msgid "%1$s joined group %2$s."
 msgstr ""
 
 #. TRANS: Message given having removed a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:405
+#: lib/command.php:417
 #, php-format
 msgid "%1$s left group %2$s."
 msgstr ""
 
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: lib/command.php:426
+#: lib/command.php:438
 #, fuzzy, php-format
 msgctxt "WHOIS"
 msgid "%1$s (%2$s)"
 msgstr "%1$s'in %2$s'deki durum mesajları "
 
 #. TRANS: Whois output. %s is the full name of the queried user.
-#: lib/command.php:430
+#: lib/command.php:442
 #, php-format
 msgid "Fullname: %s"
 msgstr "Tam İsim: %s"
@@ -7980,7 +7859,7 @@ msgstr "Tam İsim: %s"
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a location.
-#: lib/command.php:434 lib/mail.php:270
+#: lib/command.php:446 lib/mail.php:270
 #, php-format
 msgid "Location: %s"
 msgstr "Yer: %s"
@@ -7988,20 +7867,20 @@ msgstr "Yer: %s"
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a homepage.
-#: lib/command.php:438 lib/mail.php:274
+#: lib/command.php:450 lib/mail.php:274
 #, fuzzy, php-format
 msgid "Homepage: %s"
 msgstr "Başlangıç Sayfası"
 
 #. TRANS: Whois output. %s is the bio information of the queried user.
-#: lib/command.php:442
+#: lib/command.php:454
 #, php-format
 msgid "About: %s"
 msgstr "Hakkında: %s"
 
 #. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).
 #. TRANS: %s is a remote profile.
-#: lib/command.php:471
+#: lib/command.php:483
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
@@ -8010,33 +7889,33 @@ msgstr ""
 
 #. TRANS: Message given if content is too long. %1$sd is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:488
+#: lib/command.php:500
 #, fuzzy, php-format
 msgid "Message too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
 msgstr[0] "Bu çok uzun. Maksimum durum mesajı boyutu %d karakterdir."
 
 #. TRANS: Error text shown sending a direct message fails with an unknown reason.
-#: lib/command.php:516
+#: lib/command.php:528
 #, fuzzy
 msgid "Error sending direct message."
 msgstr "Kullanıcı ayarlamada hata oluştu."
 
 #. TRANS: Message given having repeated a notice from another user.
 #. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:553
+#: lib/command.php:565
 #, fuzzy, php-format
 msgid "Notice from %s repeated."
 msgstr "Durum mesajları"
 
 #. TRANS: Error text shown when repeating a notice fails with an unknown reason.
-#: lib/command.php:556
+#: lib/command.php:568
 msgid "Error repeating notice."
 msgstr "Kullanıcı ayarlamada hata oluştu."
 
 #. TRANS: Message given if content of a notice for a reply is too long. %1$d is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:591
+#: lib/command.php:603
 #, fuzzy, php-format
 msgid "Notice too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Notice too long - maximum is %1$d characters, you sent %2$d."
@@ -8044,97 +7923,97 @@ msgstr[0] "Bu çok uzun. Maksimum durum mesajı boyutu %d karakterdir."
 
 #. TRANS: Text shown having sent a reply to a notice successfully.
 #. TRANS: %s is the nickname of the user of the notice the reply was sent to.
-#: lib/command.php:604
+#: lib/command.php:616
 #, fuzzy, php-format
 msgid "Reply to %s sent."
 msgstr "%s için cevaplar"
 
 #. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
-#: lib/command.php:607
+#: lib/command.php:619
 #, fuzzy
 msgid "Error saving notice."
 msgstr "Durum mesajını kaydederken hata oluştu."
 
 #. TRANS: Error text shown when no username was provided when issuing a subscribe command.
-#: lib/command.php:654
+#: lib/command.php:666
 msgid "Specify the name of the user to subscribe to."
 msgstr ""
 
 #. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
-#: lib/command.php:663
+#: lib/command.php:675
 #, fuzzy
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "Bize o profili yollamadınız"
 
 #. TRANS: Text shown after having subscribed to another user successfully.
 #. TRANS: %s is the name of the user the subscription was requested for.
-#: lib/command.php:671
+#: lib/command.php:683
 #, php-format
 msgid "Subscribed to %s."
 msgstr ""
 
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.
-#: lib/command.php:692 lib/command.php:803
+#: lib/command.php:704 lib/command.php:815
 msgid "Specify the name of the user to unsubscribe from."
 msgstr ""
 
 #. TRANS: Text shown after having unsubscribed from another user successfully.
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:703
+#: lib/command.php:715
 #, php-format
 msgid "Unsubscribed from %s."
 msgstr ""
 
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
-#: lib/command.php:723 lib/command.php:749
+#: lib/command.php:735 lib/command.php:761
 msgid "Command not yet implemented."
 msgstr ""
 
 #. TRANS: Text shown when issuing the command "off" successfully.
-#: lib/command.php:727
+#: lib/command.php:739
 #, fuzzy
 msgid "Notification off."
 msgstr "Onay kodu yok."
 
 #. TRANS: Error text shown when the command "off" fails for an unknown reason.
-#: lib/command.php:730
+#: lib/command.php:742
 msgid "Can't turn off notification."
 msgstr ""
 
 #. TRANS: Text shown when issuing the command "on" successfully.
-#: lib/command.php:753
+#: lib/command.php:765
 #, fuzzy
 msgid "Notification on."
 msgstr "Onay kodu yok."
 
 #. TRANS: Error text shown when the command "on" fails for an unknown reason.
-#: lib/command.php:756
+#: lib/command.php:768
 msgid "Can't turn on notification."
 msgstr ""
 
 #. TRANS: Error text shown when issuing the login command while login is disabled.
-#: lib/command.php:770
+#: lib/command.php:782
 msgid "Login command is disabled."
 msgstr ""
 
 #. TRANS: Text shown after issuing the login command successfully.
 #. TRANS: %s is a logon link..
-#: lib/command.php:783
+#: lib/command.php:795
 #, php-format
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
 
 #. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:812
+#: lib/command.php:824
 #, php-format
 msgid "Unsubscribed %s."
 msgstr ""
 
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
-#: lib/command.php:830
+#: lib/command.php:842
 #, fuzzy
 msgid "You are not subscribed to anyone."
 msgstr "Bize o profili yollamadınız"
@@ -8142,14 +8021,14 @@ msgstr "Bize o profili yollamadınız"
 #. TRANS: Text shown after requesting other users a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
-#: lib/command.php:835
+#: lib/command.php:847
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Bize o profili yollamadınız"
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user
 #. TRANS: (followers) without having any subscribers.
-#: lib/command.php:857
+#: lib/command.php:869
 #, fuzzy
 msgid "No one is subscribed to you."
 msgstr "Uzaktan abonelik"
@@ -8157,14 +8036,14 @@ msgstr "Uzaktan abonelik"
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
-#: lib/command.php:862
+#: lib/command.php:874
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Uzaktan abonelik"
 
 #. TRANS: Text shown after requesting groups a user is subscribed to without having
 #. TRANS: any group subscriptions.
-#: lib/command.php:884
+#: lib/command.php:896
 #, fuzzy
 msgid "You are not a member of any groups."
 msgstr "Bize o profili yollamadınız"
@@ -8172,13 +8051,13 @@ msgstr "Bize o profili yollamadınız"
 #. TRANS: Text shown after requesting groups a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
-#: lib/command.php:889
+#: lib/command.php:901
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "Bize o profili yollamadınız"
 
 #. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-#: lib/command.php:904
+#: lib/command.php:916
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -8281,11 +8160,6 @@ msgstr ""
 msgid "Database error"
 msgstr ""
 
-#. TRANS: Description of form for deleting a user.
-#: lib/deleteuserform.php:75
-msgid "Delete this user"
-msgstr "Bu kullanıcıyı sil"
-
 #. TRANS: Label in form on profile design page.
 #. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
 #: lib/designsettings.php:108
@@ -8325,21 +8199,6 @@ msgstr "Renkleri değiştir"
 msgid "Use defaults"
 msgstr "Öntanımlıları kullan"
 
-#. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: lib/designsettings.php:259
-msgid "Restore default designs"
-msgstr ""
-
-#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: lib/designsettings.php:267
-msgid "Reset back to default"
-msgstr "Öntanımlıya geri dön"
-
-#. TRANS: Title for button on profile design page to save settings.
-#: lib/designsettings.php:272
-msgid "Save design"
-msgstr "Dizaynı kaydet"
-
 #. TRANS: Error message displayed if design settings could not be saved.
 #. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
 #: lib/designsettings.php:405 lib/designsettings.php:427
@@ -9131,10 +8990,6 @@ msgstr ""
 msgid "Reply"
 msgstr "Cevaplar"
 
-#: lib/noticelist.php:673
-msgid "Delete this notice"
-msgstr "Bu durum mesajını sil"
-
 #: lib/noticelist.php:691
 #, fuzzy
 msgid "Notice repeated"
@@ -9426,10 +9281,6 @@ msgstr ""
 msgid "Invite friends and colleagues to join you on %s"
 msgstr ""
 
-#: lib/subscribeform.php:115 lib/subscribeform.php:139
-msgid "Subscribe to this user"
-msgstr "Bize o profili yollamadınız"
-
 #: lib/subscriberspeopleselftagcloudsection.php:48
 #: lib/subscriptionspeopleselftagcloudsection.php:48
 msgid "People Tagcloud as self-tagged"
@@ -9606,66 +9457,61 @@ msgctxt "role"
 msgid "Moderator"
 msgstr ""
 
-#: lib/util.php:305
-#, fuzzy
-msgid "Not allowed to log in."
-msgstr "Giriş yapılmadı."
-
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1309
+#: lib/util.php:1306
 msgid "a few seconds ago"
 msgstr "birkaç saniye önce"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1312
+#: lib/util.php:1309
 msgid "about a minute ago"
 msgstr "yaklaşık bir dakika önce"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1316
+#: lib/util.php:1313
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
 msgstr[0] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1319
+#: lib/util.php:1316
 msgid "about an hour ago"
 msgstr "yaklaşık bir saat önce"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1323
+#: lib/util.php:1320
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
 msgstr[0] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1326
+#: lib/util.php:1323
 msgid "about a day ago"
 msgstr "yaklaşık bir gün önce"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1330
+#: lib/util.php:1327
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
 msgstr[0] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1333
+#: lib/util.php:1330
 msgid "about a month ago"
 msgstr "yaklaşık bir ay önce"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1337
+#: lib/util.php:1334
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
 msgstr[0] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1340
+#: lib/util.php:1337
 msgid "about a year ago"
 msgstr "yaklaşık bir yıl önce"
 
@@ -9706,3 +9552,63 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#, fuzzy
+#~ msgid "Block this user."
+#~ msgstr "Bu kullanıcıyı engelle"
+
+#, fuzzy
+#~ msgid "Delete this notice."
+#~ msgstr "Bu durum mesajını sil"
+
+#, fuzzy
+#~ msgid "Delete this user."
+#~ msgstr "Bu kullanıcıyı sil"
+
+#, fuzzy
+#~ msgid "Restore default designs."
+#~ msgstr "Öntanımlıları kullan"
+
+#, fuzzy
+#~ msgid "Reset back to default."
+#~ msgstr "Öntanımlıya geri dön"
+
+#, fuzzy
+#~ msgid "Save design."
+#~ msgstr "Dizaynı kaydet"
+
+#, fuzzy
+#~ msgid "Disfavor favorite."
+#~ msgstr "Favoriliğini kaldır"
+
+#, fuzzy
+#~ msgid "\"%s\" not found."
+#~ msgstr "Onay kodu bulunamadı."
+
+#, fuzzy
+#~ msgid "Notice %s not found."
+#~ msgstr "Üst durum mesajı bulunamadı."
+
+#, fuzzy
+#~ msgid "Attachment %s not found."
+#~ msgstr "Alıcı kullanıcı bulunamadı."
+
+#, fuzzy
+#~ msgid "Invalid tag: \"%s\"."
+#~ msgstr "Geçersiz büyüklük."
+
+#, fuzzy
+#~ msgid "Password saved"
+#~ msgstr "Parola kaydedildi."
+
+#, fuzzy
+#~ msgid "Where you are, like \"City, State (or Region), Country\"."
+#~ msgstr "Bulunduğunuz yer, \"Şehir, Eyalet (veya Bölge), Ülke\" gibi"
+
+#, fuzzy
+#~ msgid "Subscribe to this user."
+#~ msgstr "Bize o profili yollamadınız"
+
+#, fuzzy
+#~ msgid "Not allowed to log in."
+#~ msgstr "Giriş yapılmadı."
diff --git a/locale/uk/LC_MESSAGES/statusnet.po b/locale/uk/LC_MESSAGES/statusnet.po
index 747a4bcbed..ac01403373 100644
--- a/locale/uk/LC_MESSAGES/statusnet.po
+++ b/locale/uk/LC_MESSAGES/statusnet.po
@@ -12,18 +12,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-24 10:32+0000\n"
-"PO-Revision-Date: 2011-02-24 10:37:47+0000\n"
+"POT-Creation-Date: 2011-03-03 15:58+0000\n"
+"PO-Revision-Date: 2011-03-03 16:01:28+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r82712); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
-"X-POT-Import-Date: 2011-02-17 11:39:54+0000\n"
+"X-POT-Import-Date: 2011-02-25 23:49:23+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -137,11 +137,7 @@ msgstr "Немає такої сторінки."
 #. 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 use "one time password login" without using an existing user.
-#. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
-#. TRANS: Client error displayed trying to find a user by ID for a non-existing ID.
-#. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when calling a profile action without specifying a user.
 #: actions/all.php:80 actions/allrss.php:69
@@ -159,12 +155,12 @@ msgstr "Немає такої сторінки."
 #: actions/apitimelinementions.php:77 actions/apitimelineuser.php:79
 #: actions/avatarbynickname.php:79 actions/favoritesrss.php:72
 #: actions/foaf.php:42 actions/foaf.php:61 actions/hcard.php:67
-#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:78
+#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
 #: actions/remotesubscribe.php:144 actions/remotesubscribe.php:153
-#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:113
-#: actions/showfavorites.php:106 actions/userbyid.php:75
+#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
+#: actions/showfavorites.php:106 actions/userbyid.php:74
 #: actions/usergroups.php:93 actions/userrss.php:40 actions/userxrd.php:59
-#: actions/xrds.php:71 lib/command.php:497 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:509 lib/galleryaction.php:59
 #: lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Такого користувача немає."
@@ -292,7 +288,7 @@ msgstr "Оновлення від %1$s та друзів на %2$s!"
 #: actions/apigrouplistall.php:120 actions/apigroupmembership.php:105
 #: actions/apigroupshow.php:114 actions/apihelptest.php:84
 #: actions/apistatusesdestroy.php:101 actions/apistatusesretweets.php:110
-#: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:138
+#: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:139
 #: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
 #: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:268
 #: actions/apitimelinegroup.php:147 actions/apitimelinehome.php:173
@@ -526,7 +522,8 @@ msgstr "Отримувача не знайдено."
 
 #. TRANS: Client error displayed trying to direct message another user who's not a friend (403).
 #: actions/apidirectmessagenew.php:144
-msgid "Cannot send direct messages to users who aren't your friend."
+#, fuzzy
+msgid "Can't send direct messages to users who aren't your friend."
 msgstr ""
 "Не вдається надіслати пряме повідомлення користувачеві, який не є вашим "
 "другом."
@@ -555,7 +552,7 @@ msgstr "Цей статус вже є обраним."
 #. TRANS: Client error displayed when marking a notice as favourite fails.
 #. TRANS: Server error displayed when trying to mark a notice as favorite fails in the database.
 #. TRANS: Error message text shown when a favorite could not be set.
-#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:294
+#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:306
 msgid "Could not create favorite."
 msgstr "Не можна позначити як обране."
 
@@ -615,7 +612,7 @@ msgstr "Не вдалося знайти цільового користувач
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:191
 #: actions/newgroup.php:137 actions/profilesettings.php:273
-#: actions/register.php:206
+#: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "Це ім’я вже використовується. Спробуйте інше."
 
@@ -625,7 +622,7 @@ msgstr "Це ім’я вже використовується. Спробуйт
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:195
 #: actions/newgroup.php:141 actions/profilesettings.php:243
-#: actions/register.php:208
+#: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "Це недійсне ім’я користувача."
 
@@ -638,7 +635,7 @@ msgstr "Це недійсне ім’я користувача."
 #: actions/apigroupcreate.php:181 actions/editapplication.php:235
 #: actions/editgroup.php:202 actions/newapplication.php:221
 #: actions/newgroup.php:148 actions/profilesettings.php:248
-#: actions/register.php:215
+#: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "Веб-сторінка має недійсну URL-адресу."
 
@@ -648,7 +645,7 @@ msgstr "Веб-сторінка має недійсну URL-адресу."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:191 actions/editgroup.php:206
 #: actions/newgroup.php:152 actions/profilesettings.php:252
-#: actions/register.php:218
+#: actions/register.php:226
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "Повне ім’я надто довге (не більше 255 символів)."
 
@@ -677,7 +674,7 @@ msgstr[2] "Опис надто довгий (максимум — %d знакі
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:215 actions/editgroup.php:218
 #: actions/newgroup.php:164 actions/profilesettings.php:265
-#: actions/register.php:227
+#: actions/register.php:235
 msgid "Location is too long (maximum 255 characters)."
 msgstr "Розташування надто довге (не більше 255 символів)."
 
@@ -734,14 +731,14 @@ msgstr "Спільноту не знайдено."
 #. TRANS: Server error displayed when trying to join a group the user is already a member of.
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:333
+#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:345
 msgid "You are already a member of that group."
 msgstr "Ви вже стоїте у цій спільноти."
 
 #. TRANS: Server error displayed when trying to join a group the user is blocked from joining.
 #. 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.
-#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:338
+#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:350
 msgid "You have been blocked from that group by the admin."
 msgstr "Адміністратор спільноти заблокував ваш профіль."
 
@@ -751,7 +748,7 @@ msgstr "Адміністратор спільноти заблокував ва
 #. TRANS: %1$s is the joining user's nickname, $2$s is the group nickname for which the join failed.
 #. TRANS: Message given having failed to add a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:350
+#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:362
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "Не вдалось долучити користувача %1$s до спільноти %2$s."
@@ -768,7 +765,7 @@ msgstr "Ви не стоїте у цій спільноті."
 #. TRANS: Message given having failed to remove a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
 #: actions/apigroupleave.php:127 actions/leavegroup.php:133
-#: lib/command.php:398
+#: lib/command.php:410
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
 msgstr "Не вдалось видалити користувача %1$s зі спільноти %2$s."
@@ -828,21 +825,20 @@ msgstr "Токен запиту вже авторизовано."
 #. TRANS: Form validation error message.
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
-#. TRANS: Client error displayed when the session token is not okay.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
 #: actions/deletenotice.php:177 actions/disfavor.php:75
 #: actions/emailsettings.php:291 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:65 actions/grouplogo.php:321
 #: actions/groupunblock.php:65 actions/imsettings.php:224
-#: actions/invite.php:60 actions/login.php:131 actions/makeadmin.php:66
+#: actions/invite.php:60 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
-#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:136
-#: actions/othersettings.php:155 actions/passwordsettings.php:137
+#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
+#: actions/othersettings.php:155 actions/passwordsettings.php:138
 #: actions/profilesettings.php:217 actions/recoverpassword.php:383
-#: actions/register.php:164 actions/remotesubscribe.php:76
+#: actions/register.php:172 actions/remotesubscribe.php:76
 #: actions/repeat.php:82 actions/smssettings.php:250 actions/subedit.php:40
-#: actions/subscribe.php:87 actions/tagother.php:166
-#: actions/unsubscribe.php:69 actions/userauthorization.php:53
+#: actions/subscribe.php:86 actions/tagother.php:166
+#: actions/unsubscribe.php:69 actions/userauthorization.php:52
 #: lib/designsettings.php:310
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
@@ -874,7 +870,7 @@ msgstr "Помилка бази даних при додаванні парам
 #: actions/designadminpanel.php:100 actions/editapplication.php:144
 #: actions/emailsettings.php:310 actions/grouplogo.php:332
 #: actions/imsettings.php:239 actions/newapplication.php:124
-#: actions/oauthconnectionssettings.php:145 actions/recoverpassword.php:46
+#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
 #: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
 msgstr "Несподіване представлення форми."
@@ -926,20 +922,19 @@ msgstr "Акаунт"
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group nickname (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT for nick name in a profile.
-#: actions/apioauthauthorize.php:459 actions/login.php:242
-#: actions/profilesettings.php:106 actions/register.php:418
+#: actions/apioauthauthorize.php:459 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:432
 #: actions/showgroup.php:243 actions/tagother.php:94
-#: actions/userauthorization.php:152 lib/groupeditform.php:145
+#: actions/userauthorization.php:145 lib/groupeditform.php:145
 #: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "Ім’я користувача"
 
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:463 actions/login.php:245
-#: actions/register.php:422 lib/accountsettingsaction.php:120
+#: actions/apioauthauthorize.php:463 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:120
 msgid "Password"
 msgstr "Пароль"
 
@@ -1034,13 +1029,13 @@ msgstr "Такого допису немає."
 
 #. TRANS: Client error displayed trying to repeat an own notice through the API.
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:537
+#: actions/apistatusesretweet.php:83 lib/command.php:549
 msgid "Cannot repeat your own notice."
 msgstr "Не можна повторювати власні дописи."
 
 #. TRANS: Client error displayed trying to re-repeat a notice through the API.
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:92 lib/command.php:543
+#: actions/apistatusesretweet.php:92 lib/command.php:555
 msgid "Already repeated that notice."
 msgstr "Цей допис вже повторено."
 
@@ -1061,8 +1056,8 @@ msgstr "HTTP спосіб не підтримується."
 #. TRANS: Exception thrown requesting an unsupported notice output format.
 #. TRANS: %s is the requested output format.
 #: actions/apistatusesshow.php:144
-#, php-format
-msgid "Unsupported format: %s."
+#, fuzzy, php-format
+msgid "Unsupported format: %s"
 msgstr "Формат, який не підтримується: %s."
 
 #. TRANS: Client error displayed requesting a deleted status.
@@ -1173,14 +1168,13 @@ msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr "%1$s оновив цю відповідь на допис від %2$s / %3$s."
 
 #. TRANS: Title for site timeline. %s is the StatusNet sitename.
-#. TRANS: Public RSS feed title. %s is the StatusNet site name.
 #: actions/apitimelinepublic.php:193 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "%s загальна стрічка"
 
 #. TRANS: Subtitle for site timeline. %s is the StatusNet sitename.
-#: actions/apitimelinepublic.php:199
+#: actions/apitimelinepublic.php:199 actions/publicrss.php:105
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "%s оновлення від усіх!"
@@ -1245,26 +1239,25 @@ msgid "Atom post must be an Atom entry."
 msgstr "POST-запит Atom має бути записом формату Atom."
 
 #. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
-#: actions/apitimelineuser.php:334
+#: actions/apitimelineuser.php:335
 msgid "Can only handle POST activities."
 msgstr "Можливою є обробка лише POST-запитів."
 
 #. TRANS: Client error displayed when using an unsupported activity object type.
 #. TRANS: %s is the unsupported activity object type.
-#: actions/apitimelineuser.php:345
+#: actions/apitimelineuser.php:346
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr "Неможливо опрацювати дії об’єкта типу «%s»."
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
 #. TRANS: %d is the notice ID (number).
-#: actions/apitimelineuser.php:379
+#: actions/apitimelineuser.php:380
 #, php-format
 msgid "No content for notice %d."
 msgstr "Допис %d не має змісту."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#. TRANS: %s is the notice URI.
 #: actions/apitimelineuser.php:408
 #, php-format
 msgid "Notice with URI \"%s\" already exists."
@@ -1282,10 +1275,9 @@ msgstr "Сторінку не знайдено."
 
 #. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
 #. TRANS: Client exception.
-#. TRANS: Client error displayed trying to subscribe to a non-existing profile.
 #: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
 #: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
-#: actions/subscribe.php:110
+#: actions/subscribe.php:107
 msgid "No such profile."
 msgstr "Немає такого профілю."
 
@@ -1410,7 +1402,7 @@ msgstr "Не вдається видалити допис з чужого спи
 #: actions/joingroup.php:95 actions/leavegroup.php:82
 #: actions/leavegroup.php:95 actions/makeadmin.php:86
 #: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:380
+#: lib/command.php:392
 msgid "No such group."
 msgstr "Такої спільноти не існує."
 
@@ -1420,7 +1412,7 @@ msgid "Not a member."
 msgstr "Не є учасником."
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
-#: actions/atompubshowmembership.php:150
+#: actions/atompubshowmembership.php:151
 msgid "Cannot delete someone else's membership."
 msgstr "Неможливо позбавити когось членства."
 
@@ -1523,11 +1515,9 @@ msgstr "Ви можете завантажити аватару. Максима
 
 #. TRANS: Server error displayed in avatar upload page when no matching profile can be found for a user.
 #. TRANS: Server error displayed coming across a request from a user without a profile.
-#. TRANS: Server error displayed when trying to authorise a remote subscription request
-#. TRANS: while the user has no profile.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
 #: actions/grouplogo.php:184 actions/remotesubscribe.php:190
-#: actions/userauthorization.php:75 actions/userrss.php:108
+#: actions/userauthorization.php:72 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr "Користувач без відповідного профілю."
 
@@ -1582,9 +1572,10 @@ msgstr "Втяти"
 msgid "No file uploaded."
 msgstr "Жодного файлу не завантажено."
 
-#. TRANS: Avatar upload form instruction after uploading a file.
+#. TRANS: Avatar upload form unstruction after uploading a file.
 #: actions/avatarsettings.php:345
-msgid "Pick a square area of the image to be your avatar."
+#, fuzzy
+msgid "Pick a square area of the image to be your avatar"
 msgstr "Оберіть квадратну ділянку зображення, яка й буде вашою аватаркою."
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
@@ -1627,7 +1618,7 @@ msgid "You may not backup your account."
 msgstr "Ви не можете створити резервну копію свого акаунту."
 
 #. TRANS: Information displayed on the backup account page.
-#: actions/backupaccount.php:225
+#: actions/backupaccount.php:227
 msgid ""
 "You can backup your account data in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format. This is an experimental feature and provides "
@@ -1643,14 +1634,15 @@ msgstr ""
 "не долучаються до резервного файлу."
 
 #. TRANS: Submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:248
+#: actions/backupaccount.php:250
 msgctxt "BUTTON"
 msgid "Backup"
 msgstr "Резерв. копія"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:252
-msgid "Backup your account."
+#: actions/backupaccount.php:254
+#, fuzzy
+msgid "Backup your account"
 msgstr "Резервне копіювання вашого облікового запису."
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
@@ -1691,7 +1683,8 @@ msgstr "Ні"
 
 #. TRANS: Submit button title for 'No' when blocking a user.
 #: actions/block.php:158
-msgid "Do not block this user."
+#, fuzzy
+msgid "Do not block this user"
 msgstr "Не блокувати цього користувача."
 
 #. TRANS: Button label on the user block form.
@@ -1708,9 +1701,10 @@ msgid "Yes"
 msgstr "Так"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:165
-msgid "Block this user."
-msgstr "Блокувати користувача."
+#. TRANS: Description of the form to block a user.
+#: actions/block.php:165 lib/blockform.php:79
+msgid "Block this user"
+msgstr "Блокувати користувача"
 
 #. TRANS: Server error displayed when blocking a user fails.
 #: actions/block.php:189
@@ -1873,7 +1867,7 @@ msgstr ""
 #. TRANS: Field label for delete account confirmation entry.
 #. TRANS: Field label for password reset form where the password has to be typed again.
 #: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:262 actions/register.php:426
+#: actions/recoverpassword.php:262 actions/register.php:440
 msgid "Confirm"
 msgstr "Підтвердити"
 
@@ -1902,14 +1896,14 @@ msgstr "Додаток не виявлено."
 #. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
 #: actions/deleteapplication.php:79 actions/editapplication.php:78
-#: actions/showapplication.php:90
+#: actions/showapplication.php:94
 msgid "You are not the owner of this application."
 msgstr "Ви не є власником цього додатку."
 
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
-#: actions/newapplication.php:112 actions/showapplication.php:113
-#: lib/action.php:1422
+#: actions/newapplication.php:112 actions/showapplication.php:118
+#: lib/action.php:1425
 msgid "There was a problem with your session token."
 msgstr "Виникли певні проблеми з токеном поточної сесії."
 
@@ -1932,12 +1926,14 @@ msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting an application.
 #: actions/deleteapplication.php:161
-msgid "Do not delete this application."
+#, fuzzy
+msgid "Do not delete this application"
 msgstr "Не видаляти цей додаток."
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
 #: actions/deleteapplication.php:167
-msgid "Delete this application."
+#, fuzzy
+msgid "Delete this application"
 msgstr "Видалити додаток."
 
 #. TRANS: Client error when trying to delete group while not logged in.
@@ -1991,12 +1987,14 @@ msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting a group.
 #: actions/deletegroup.php:224
-msgid "Do not delete this group."
+#, fuzzy
+msgid "Do not delete this group"
 msgstr "Не видаляти цю спільноту."
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
 #: actions/deletegroup.php:231
-msgid "Delete this group."
+#, fuzzy
+msgid "Delete this group"
 msgstr "Видалити спільноту."
 
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
@@ -2004,15 +2002,13 @@ msgstr "Видалити спільноту."
 #. TRANS: Client error displayed when trying to mark a notice as favorite without being logged in.
 #. TRANS: Client error displayed trying to block a user from a group while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
-#. TRANS: Client error displayed trying to log out when not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
-#. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
 #. TRANS: Client error displayed when trying to change user options while not logged in.
 #: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
-#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:70
+#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
-#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:98
+#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
 #: lib/adminpanelaction.php:71 lib/profileformaction.php:63
 #: lib/settingsaction.php:72
@@ -2039,13 +2035,14 @@ msgstr "Ви впевненні, що бажаєте видалити цей д
 
 #. TRANS: Submit button title for 'No' when deleting a notice.
 #: actions/deletenotice.php:159
-msgid "Do not delete this notice."
+#, fuzzy
+msgid "Do not delete this notice"
 msgstr "Не видаляти цей допис."
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:166
-msgid "Delete this notice."
-msgstr "Видалити допис."
+#: actions/deletenotice.php:166 lib/noticelist.php:673
+msgid "Delete this notice"
+msgstr "Видалити допис"
 
 #. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
 #: actions/deleteuser.php:66
@@ -2079,13 +2076,15 @@ msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting a user.
 #: actions/deleteuser.php:158
-msgid "Do not delete this user."
+#, fuzzy
+msgid "Do not delete this user"
 msgstr "Не видаляти цього користувача."
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
-#: actions/deleteuser.php:165
-msgid "Delete this user."
-msgstr "Видалити цього користувача."
+#. TRANS: Description of form for deleting a user.
+#: actions/deleteuser.php:165 lib/deleteuserform.php:75
+msgid "Delete this user"
+msgstr "Видалити цього користувача"
 
 #. TRANS: Message used as title for design settings for the site.
 #. TRANS: Link description in user account settings menu.
@@ -2248,19 +2247,22 @@ msgid "Use defaults"
 msgstr "За замовч."
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:720
-msgid "Restore default designs."
-msgstr "Відновити стандартні установки."
+#. TRANS: Title for button on profile design page to reset all colour settings to default.
+#: actions/designadminpanel.php:720 lib/designsettings.php:259
+msgid "Restore default designs"
+msgstr "Оновити налаштування за замовчуванням"
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:728
-msgid "Reset back to default."
-msgstr "Повернутись до стандартних налаштувань."
+#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
+#: actions/designadminpanel.php:728 lib/designsettings.php:267
+msgid "Reset back to default"
+msgstr "Повернутись до початкових налаштувань"
 
 #. TRANS: Title for button for saving theme settings.
-#: actions/designadminpanel.php:736
-msgid "Save design."
-msgstr "Зберегти дизайн."
+#. TRANS: Title for button on profile design page to save settings.
+#: actions/designadminpanel.php:736 lib/designsettings.php:272
+msgid "Save design"
+msgstr "Зберегти дизайн"
 
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
 #: actions/disfavor.php:83
@@ -2291,7 +2293,7 @@ msgid "You must be logged in to edit an application."
 msgstr "Ви маєте спочатку увійти, аби мати змогу керувати додатком."
 
 #. TRANS: Client error displayed trying to edit an application that does not exist.
-#: actions/editapplication.php:83 actions/showapplication.php:83
+#: actions/editapplication.php:83 actions/showapplication.php:87
 msgid "No such application."
 msgstr "Такого додатку немає."
 
@@ -2573,7 +2575,7 @@ msgid "Cannot normalize that email address."
 msgstr "Не можна полагодити цю поштову адресу."
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:393 actions/register.php:204
+#: actions/emailsettings.php:393 actions/register.php:212
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "Це недійсна електронна адреса."
@@ -2648,21 +2650,18 @@ msgstr "Немає адреси для вхідної пошти."
 
 #. 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.
 #: actions/emailsettings.php:530 actions/emailsettings.php:554
-#: actions/smssettings.php:566 actions/smssettings.php:591
+#: actions/smssettings.php:565 actions/smssettings.php:588
 msgid "Could not update user record."
 msgstr "Не вдалося оновити запис користувача."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
-#. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:534 actions/smssettings.php:570
+#: actions/emailsettings.php:534 actions/smssettings.php:568
 msgid "Incoming email address removed."
 msgstr "Адресу вхідної пошти видалено."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
-#. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:558 actions/smssettings.php:595
+#: actions/emailsettings.php:558 actions/smssettings.php:591
 msgid "New incoming email address added."
 msgstr "Нову адресу для вхідних повідомлень додано."
 
@@ -2673,8 +2672,9 @@ msgstr "Цей допис вже є обраним!"
 
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
 #: actions/favor.php:95
-msgid "Disfavor favorite."
-msgstr "Видалити з обраних."
+#, fuzzy
+msgid "Disfavor favorite"
+msgstr "Видалити з обраних"
 
 #. TRANS: Page title for first page of favorited notices.
 #. TRANS: Title for favourited notices section.
@@ -2912,12 +2912,14 @@ msgstr ""
 
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
 #: actions/groupblock.php:191
-msgid "Do not block this user from this group."
+#, fuzzy
+msgid "Do not block this user from this group"
 msgstr "Не блокувати цього користувача у цій спільноті."
 
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
 #: actions/groupblock.php:198
-msgid "Block this user from this group."
+#, fuzzy
+msgid "Block this user from this group"
 msgstr "Заблокувати цього користувача у цій спільноті."
 
 #. TRANS: Server error displayed when trying to block a user from a group fails because of an application error.
@@ -2926,7 +2928,6 @@ msgid "Database error blocking user from group."
 msgstr "Виникла помилка при блокуванні користувача в цій спільноті."
 
 #. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
-#. TRANS: Client error displayed trying to find a user by ID without providing an ID.
 #: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr "Немає ID."
@@ -3115,10 +3116,8 @@ msgid "Group search"
 msgstr "Пошук спільнот"
 
 #. TRANS: Text on page where groups can be searched if no results were found for a query.
-#. TRANS: Text for notice search results is the query had no results.
-#. TRANS: Message on the "People search" page where a query has no results.
-#: actions/groupsearch.php:82 actions/noticesearch.php:122
-#: actions/peoplesearch.php:87
+#: actions/groupsearch.php:82 actions/noticesearch.php:117
+#: actions/peoplesearch.php:83
 msgid "No results."
 msgstr "Немає результатів."
 
@@ -3155,7 +3154,6 @@ msgid "User is not blocked from group."
 msgstr "Користувача не блоковано."
 
 #. TRANS: Server error displayed when unblocking a user from a group fails because of an unknown error.
-#. TRANS: Server error displayed when removing a user block.
 #: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "Помилка при розблокуванні."
@@ -3250,8 +3248,7 @@ msgid "Publish a MicroID for my Jabber/Google Talk address."
 msgstr "Позначати міткою MicroID мою адресу Jabber/Google Talk."
 
 #. TRANS: Confirmation message for successful Instant Messaging preferences save.
-#. TRANS: Confirmation message after saving preferences.
-#: actions/imsettings.php:283 actions/othersettings.php:193
+#: actions/imsettings.php:283 actions/othersettings.php:192
 msgid "Preferences saved."
 msgstr "Преференції збережно."
 
@@ -3544,7 +3541,7 @@ msgstr "Ви повинні спочатку увійти на сайт, аби
 
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
-#: actions/leavegroup.php:103 lib/command.php:386
+#: actions/leavegroup.php:103 lib/command.php:398
 msgid "You are not a member of that group."
 msgstr "Ви не є учасником цієї спільноти."
 
@@ -3668,43 +3665,41 @@ msgstr "Зберегти"
 msgid "Save license settings"
 msgstr "Зберегти налаштування ліцензії"
 
-#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
-#: actions/login.php:97 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
 msgid "Already logged in."
 msgstr "Тепер ви увійшли."
 
-#: actions/login.php:142
+#: actions/login.php:148
 msgid "Incorrect username or password."
 msgstr "Неточне ім’я або пароль."
 
-#. TRANS: Server error displayed when a user object could not be created trying to login using "one time password login".
-#: actions/login.php:148 actions/otp.php:127
+#: actions/login.php:154 actions/otp.php:120
 msgid "Error setting user. You are probably not authorized."
 msgstr "Помилка. Можливо, ви не авторизовані."
 
-#: actions/login.php:202 actions/login.php:253
+#: actions/login.php:210 actions/login.php:263
 msgid "Login"
 msgstr "Увійти"
 
-#: actions/login.php:239
+#: actions/login.php:249
 msgid "Login to site"
 msgstr "Вхід на сайт"
 
-#: actions/login.php:248 actions/register.php:476
+#: actions/login.php:258 actions/register.php:490
 msgid "Remember me"
 msgstr "Пам’ятати мене"
 
-#: actions/login.php:249 actions/register.php:478
+#: actions/login.php:259 actions/register.php:492
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 "Автоматично входити у майбутньому; не для комп’ютерів загального "
 "користування!"
 
-#: actions/login.php:259
+#: actions/login.php:269
 msgid "Lost or forgotten password?"
 msgstr "Загубили або забули пароль?"
 
-#: actions/login.php:277
+#: actions/login.php:288
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -3712,11 +3707,11 @@ msgstr ""
 "З міркувань безпеки, будь ласка, введіть ще раз ім’я та пароль, перед тим як "
 "змінювати налаштування."
 
-#: actions/login.php:281
+#: actions/login.php:292
 msgid "Login with your username and password."
 msgstr "Увійти використовуючи ім’я та пароль."
 
-#: actions/login.php:284
+#: actions/login.php:295
 #, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -3800,14 +3795,14 @@ msgid "New message"
 msgstr "Нове повідомлення"
 
 #. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
-#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:501
+#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:513
 msgid "You can't send a message to this user."
 msgstr "Ви не можете надіслати повідомлення цьому користувачеві."
 
 #. TRANS: Command exception text shown when trying to send a direct message to another user without content.
 #. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
-#: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:478
-#: lib/command.php:581
+#: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:490
+#: lib/command.php:593
 msgid "No content!"
 msgstr "Немає змісту!"
 
@@ -3816,7 +3811,7 @@ msgid "No recipient specified."
 msgstr "Жодного отримувача не визначено."
 
 #. TRANS: Error text shown when trying to send a direct message to self.
-#: actions/newmessage.php:167 lib/command.php:505
+#: actions/newmessage.php:167 lib/command.php:517
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
@@ -3828,7 +3823,7 @@ msgstr "Повідомлення надіслано"
 
 #. TRANS: Message given have sent a direct message to another user.
 #. TRANS: %s is the name of the other user.
-#: actions/newmessage.php:188 lib/command.php:513
+#: actions/newmessage.php:188 lib/command.php:525
 #, php-format
 msgid "Direct message to %s sent."
 msgstr "Пряме повідомлення для %s надіслано."
@@ -3845,9 +3840,7 @@ msgstr "Новий допис"
 msgid "Notice posted"
 msgstr "Допис надіслано"
 
-#. TRANS: Instructions for Notice search page.
-#. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/noticesearch.php:69
+#: actions/noticesearch.php:68
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -3856,21 +3849,16 @@ msgstr ""
 "Пошук дописів на %%site.name%% за їх змістом. Відокремлюйте пошукові умови "
 "інтервалами; вони повинні складатись з 3 знаків або більше."
 
-#. TRANS: Title of the page where users can search for notices.
-#: actions/noticesearch.php:80
+#: actions/noticesearch.php:78
 msgid "Text search"
 msgstr "Пошук текстів"
 
-#. TRANS: Test in RSS notice search.
-#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearch.php:95
+#: actions/noticesearch.php:91
 #, php-format
 msgid "Search results for \"%1$s\" on %2$s"
 msgstr "Результати пошуку «%1$s» на сайті %2$s"
 
-#. TRANS: Text for logged in users making a query for notices without results.
-#. TRANS: This message contains a Markdown link.
-#: actions/noticesearch.php:128
+#: actions/noticesearch.php:121
 #, php-format
 msgid ""
 "Be the first to [post on this topic](%%%%action.newnotice%%%%?"
@@ -3879,9 +3867,7 @@ msgstr ""
 "Станьте тим, хто напише перший [допис до цього топіку](%%%%action.newnotice%%"
 "%%?status_textarea=%s)!"
 
-#. TRANS: Text for not logged in users making a query for notices without results.
-#. TRANS: This message contains Markdown links.
-#: actions/noticesearch.php:133
+#: actions/noticesearch.php:124
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and be the first to "
@@ -3890,18 +3876,15 @@ msgstr ""
 "Чому б не [зареєструватись](%%%%action.register%%%%) і не написати перший "
 "[допис до цього топіку](%%%%action.newnotice%%%%?status_textarea=%s)!"
 
-#. TRANS: RSS notice search feed title. %s is the query.
-#: actions/noticesearchrss.php:95
+#: actions/noticesearchrss.php:96
 #, php-format
 msgid "Updates with \"%s\""
 msgstr "Оновлення з «%s»"
 
-#. TRANS: RSS notice search feed description.
-#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearchrss.php:99
+#: actions/noticesearchrss.php:98
 #, fuzzy, php-format
-msgid "Updates matching search term \"%1$s\" on %2$s."
-msgstr "Всі оновлення за збігом з «%s» на %2$s!"
+msgid "Updates matching search term \"%1$s\" on %2$s!"
+msgstr "Всі оновлення за збігом з «%1$s» на %2$s."
 
 #: actions/nudge.php:85
 msgid ""
@@ -3941,30 +3924,30 @@ msgid "You have not registered any applications yet."
 msgstr "Поки що ви не зареєстрували жодних додатків."
 
 #. TRANS: Title for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:70
+#: actions/oauthconnectionssettings.php:71
 msgid "Connected applications"
 msgstr "Під’єднані додатки"
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:81
+#: actions/oauthconnectionssettings.php:83
 msgid "The following connections exist for your account."
 msgstr "Наступні з’єднання вже існують для вашого профілю."
 
 #. TRANS: Client error when trying to revoke access for an application while not being a user of it.
-#: actions/oauthconnectionssettings.php:166
+#: actions/oauthconnectionssettings.php:168
 msgid "You are not a user of that application."
 msgstr "Ви не є користувачем даного додатку."
 
 #. TRANS: Client error when revoking access has failed for some reason.
 #. TRANS: %s is the application ID revoking access failed for.
-#: actions/oauthconnectionssettings.php:181
+#: actions/oauthconnectionssettings.php:183
 #, php-format
 msgid "Unable to revoke access for application: %s."
 msgstr "Неможливо скасувати доступ для додатку: %s."
 
 #. TRANS: Success message after revoking access for an application.
 #. TRANS: %1$s is the application name, %2$s is the first part of the user token.
-#: actions/oauthconnectionssettings.php:200
+#: actions/oauthconnectionssettings.php:202
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -3974,14 +3957,14 @@ msgstr ""
 "$s."
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:211
+#: actions/oauthconnectionssettings.php:213
 msgid "You have not authorized any applications to use your account."
 msgstr "Ви не дозволили жодним додаткам використовувати ваш акаунт."
 
 #. TRANS: Note for developers in the OAuth connection settings form.
 #. TRANS: This message contains a Markdown link. Do not separate "](".
 #. TRANS: %s is the URL to the OAuth settings.
-#: actions/oauthconnectionssettings.php:231
+#: actions/oauthconnectionssettings.php:233
 #, php-format
 msgid ""
 "Are you a developer? [Register an OAuth client application](%s) to use with "
@@ -3990,16 +3973,6 @@ msgstr ""
 "Ви — розробник? [Зареєструйте клієнтський додаток OAuth](%s) щоб "
 "користуватися ним на даному сайті StatusNet."
 
-#: actions/oembed.php:64
-#, php-format
-msgid "\"%s\" not found."
-msgstr "«%s» не знайдено."
-
-#: actions/oembed.php:76
-#, php-format
-msgid "Notice %s not found."
-msgstr "Допис %s не знайдено."
-
 #: actions/oembed.php:80 actions/shownotice.php:100
 msgid "Notice has no profile."
 msgstr "Допис не має профілю."
@@ -4009,16 +3982,6 @@ msgstr "Допис не має профілю."
 msgid "%1$s's status on %2$s"
 msgstr "%1$s має статус на %2$s"
 
-#: actions/oembed.php:95
-#, php-format
-msgid "Attachment %s not found."
-msgstr "Вкладення %s не знайдено."
-
-#: actions/oembed.php:136
-#, php-format
-msgid "\"%s\" not supported for oembed requests."
-msgstr "«%s» не підтримується для oembed-запитів."
-
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
 #: actions/oembed.php:168
 #, php-format
@@ -4037,12 +4000,11 @@ msgstr "URL-адреса %s лише в простому HTTP, будь ласк
 msgid "Not a supported data format."
 msgstr "Такий формат даних не підтримується."
 
-#. TRANS: ShortName in the OpenSearch interface when trying to find users.
 #: actions/opensearch.php:64
 msgid "People Search"
 msgstr "Пошук людей"
 
-#: actions/opensearch.php:68
+#: actions/opensearch.php:67
 msgid "Notice Search"
 msgstr "Пошук дописів"
 
@@ -4089,46 +4051,37 @@ msgstr "Показувати або приховувати дизайни сто
 msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr "Сервіс скорочення URL-адрес надто довгий (50 символів максимум)."
 
-#. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
-#: actions/otp.php:70
+#: actions/otp.php:69
 msgid "No user ID specified."
 msgstr "ID користувача не визначено."
 
-#. TRANS: Client error displayed trying to use "one time password login" without specifying a login token.
-#: actions/otp.php:86
+#: actions/otp.php:83
 msgid "No login token specified."
 msgstr "Токен для входу не визначено."
 
-#. TRANS: Client error displayed trying to use "one time password login" without requesting a login token.
-#: actions/otp.php:94
+#: actions/otp.php:90
 msgid "No login token requested."
 msgstr "Токен для входу у запиті відсутній."
 
-#. TRANS: Client error displayed trying to use "one time password login" while specifying an invalid login token.
-#: actions/otp.php:100
+#: actions/otp.php:95
 msgid "Invalid login token specified."
 msgstr "Токен для входу визначено як неправильний."
 
-#. TRANS: Client error displayed trying to use "one time password login" while specifying an expired login token.
-#: actions/otp.php:110
+#: actions/otp.php:104
 msgid "Login token expired."
 msgstr "Токен для входу втратив чинність."
 
-#. TRANS: Title for outbox for any but the fist page.
-#. TRANS: %1$s is the user nickname, %2$d is the page number.
-#: actions/outbox.php:57
+#: actions/outbox.php:58
 #, php-format
 msgid "Outbox for %1$s - page %2$d"
 msgstr "Вихідні для %1$s — сторінка %2$d"
 
-#. TRANS: Title for first page of outbox.
 #: actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
 msgstr "Вихідні для %s"
 
-#. TRANS: Instructions for outbox.
-#: actions/outbox.php:103
+#: actions/outbox.php:104
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr ""
 "Це ваші вихідні повідомлення, тут містяться повідомлення, які ви надіслали "
@@ -4156,42 +4109,43 @@ msgstr "Старий пароль"
 msgid "New password"
 msgstr "Новий пароль"
 
-#: actions/passwordsettings.php:109 actions/register.php:423
-msgid "6 or more characters."
+#: actions/passwordsettings.php:109
+#, fuzzy
+msgid "6 or more characters"
 msgstr "6 або більше знаків."
 
-#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:264
-#: actions/register.php:427
-msgid "Same as password above."
+#: actions/passwordsettings.php:113
+#, fuzzy
+msgid "Same as password above"
 msgstr "Такий само, як і пароль вище."
 
 #: actions/passwordsettings.php:117
 msgid "Change"
 msgstr "Змінити"
 
-#: actions/passwordsettings.php:153 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:238
 msgid "Password must be 6 or more characters."
 msgstr "Пароль має складатись з 6-ти або більше знаків."
 
-#: actions/passwordsettings.php:156 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:241
 msgid "Passwords don't match."
 msgstr "Паролі не співпадають."
 
-#: actions/passwordsettings.php:164
+#: actions/passwordsettings.php:165
 msgid "Incorrect old password"
 msgstr "Старий пароль є неточним"
 
-#: actions/passwordsettings.php:180
+#: actions/passwordsettings.php:181
 msgid "Error saving user; invalid."
 msgstr "Помилка при збереженні користувача; недійсний."
 
-#. TRANS: Reset password form validation error message.
-#: actions/passwordsettings.php:185 actions/recoverpassword.php:418
-msgid "Cannot save new password."
+#: actions/passwordsettings.php:186
+#, fuzzy
+msgid "Can't save new password."
 msgstr "Не вдається зберегти новий пароль."
 
-#: actions/passwordsettings.php:191
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
 msgid "Password saved."
 msgstr "Пароль збережено."
 
@@ -4465,9 +4419,7 @@ msgstr "Сервер на який направляти SSL-запити."
 msgid "Save paths"
 msgstr "Зберегти шляхи"
 
-#. TRANS: Instructions for the "People search" page.
-#. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/peoplesearch.php:54
+#: actions/peoplesearch.php:52
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
@@ -4477,8 +4429,7 @@ msgstr ""
 "Відокремлюйте пошукові умови інтервалами; вони повинні складатись з 3 знаків "
 "або більше."
 
-#. TRANS: Title of a page where users can search for other users.
-#: actions/peoplesearch.php:61
+#: actions/peoplesearch.php:58
 msgid "People search"
 msgstr "Пошук людей"
 
@@ -4519,14 +4470,14 @@ msgid "Profile information"
 msgstr "Інформація профілю"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109 actions/register.php:419
+#: actions/profilesettings.php:109 actions/register.php:433
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr "1-64 рядкових літер і цифр, ніякої пунктуації або інтервалів."
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for full group name (dt). Text hidden by default.
 #. TRANS: DT for full name in a profile.
-#: actions/profilesettings.php:113 actions/register.php:441
+#: actions/profilesettings.php:113 actions/register.php:455
 #: actions/showgroup.php:255 actions/tagother.php:104
 #: lib/groupeditform.php:150 lib/userprofile.php:156
 msgid "Full name"
@@ -4534,20 +4485,20 @@ msgstr "Повне ім’я"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:118 actions/register.php:446
+#: actions/profilesettings.php:118 actions/register.php:460
 #: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "Веб-сторінка"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:121 actions/register.php:448
+#: actions/profilesettings.php:121
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr "URL-адреса вашої веб-сторінки, блоґу, або профілю на іншому сайті."
 
 #. TRANS: Tooltip for field label in form for profile settings. Plural
 #. TRANS: is decided by the number of characters available for the
 #. TRANS: biography (%d).
-#: actions/profilesettings.php:129 actions/register.php:457
+#: actions/profilesettings.php:129 actions/register.php:471
 #, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4556,29 +4507,28 @@ msgstr[1] "Опишіть себе та свої інтереси інтерес
 msgstr[2] "Опишіть себе та свої інтереси інтереси вкладаючись у %d символів"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:135 actions/register.php:462
+#: actions/profilesettings.php:135 actions/register.php:476
 msgid "Describe yourself and your interests"
 msgstr "Опишіть себе та свої інтереси"
 
 #. TRANS: Text area label in form for profile settings where users can provide.
 #. TRANS: their biography.
-#: actions/profilesettings.php:139 actions/register.php:464
+#: actions/profilesettings.php:139 actions/register.php:478
 msgid "Bio"
 msgstr "Про себе"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group location (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT for location in a profile.
-#: actions/profilesettings.php:145 actions/register.php:469
+#: actions/profilesettings.php:145 actions/register.php:483
 #: actions/showgroup.php:265 actions/tagother.php:112
-#: actions/userauthorization.php:174 lib/groupeditform.php:173
+#: actions/userauthorization.php:166 lib/groupeditform.php:173
 #: lib/userprofile.php:172
 msgid "Location"
 msgstr "Розташування"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148
+#: actions/profilesettings.php:148 actions/register.php:485
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Де ви живете, на кшталт «Місто, область (регіон), країна»"
 
@@ -4597,9 +4547,9 @@ msgstr "Теґи"
 
 #. TRANS: Tooltip for field label in form for profile settings.
 #: actions/profilesettings.php:164
+#, fuzzy
 msgid ""
-"Tags for yourself (letters, numbers, -, ., and _), comma- or space- "
-"separated."
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr ""
 "Позначте себе теґами (літери, цифри, -, . та _), відокремлюючи кожен комою "
 "або пробілом."
@@ -4611,7 +4561,8 @@ msgstr "Мова"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
 #: actions/profilesettings.php:171
-msgid "Preferred language."
+#, fuzzy
+msgid "Preferred language"
 msgstr "Мова, котрій надаєте перевагу."
 
 #. TRANS: Dropdownlist label in form for profile settings.
@@ -4626,15 +4577,16 @@ msgstr "За яким часовим поясом ви живете?"
 
 #. TRANS: Checkbox label in form for profile settings.
 #: actions/profilesettings.php:189
+#, fuzzy
 msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)."
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr ""
 "Автоматично підписуватись до тих, хто підписався до мене. (Слава роботам!)"
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Plural form is used based on the maximum number of allowed
 #. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:258 actions/register.php:221
+#: actions/profilesettings.php:258 actions/register.php:229
 #, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4654,10 +4606,10 @@ msgstr "Мова надто довга (не більше 50 символів)."
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:291
+#: actions/profilesettings.php:291 actions/tagother.php:178
 #, php-format
-msgid "Invalid tag: \"%s\"."
-msgstr "Неприпустимий теґ: «%s»."
+msgid "Invalid tag: \"%s\""
+msgstr "Недійсний теґ: «%s»"
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
 #. TRANS: automatically subscribe to any subscriber.
@@ -4762,12 +4714,6 @@ msgstr ""
 "Мікроблогінг), який працює на вільному програмному забезпеченні [StatusNet]"
 "(http://status.net/)."
 
-#. TRANS: Public RSS feed description. %s is the StatusNet site name.
-#: actions/publicrss.php:106
-#, fuzzy, php-format
-msgid "%s updates from everyone."
-msgstr "%s оновлення від усіх!"
-
 #. TRANS: Title for public tag cloud.
 #: actions/publictagcloud.php:57
 msgid "Public tag cloud"
@@ -4903,11 +4849,6 @@ msgstr "Відновити пароль"
 msgid "Password recovery requested"
 msgstr "Запит на відновлення паролю відправлено"
 
-#. TRANS: Title for password recovery page in password saved mode.
-#: actions/recoverpassword.php:229
-msgid "Password saved"
-msgstr "Пароль збережено"
-
 #. TRANS: Title for password recovery page when an unknown action has been specified.
 #: actions/recoverpassword.php:232
 msgid "Unknown action"
@@ -4918,6 +4859,11 @@ msgstr "Дія невідома"
 msgid "6 or more characters, and do not forget it!"
 msgstr "6 або більше знаків, і не забудьте їх!"
 
+#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#: actions/recoverpassword.php:264 actions/register.php:441
+msgid "Same as password above."
+msgstr "Такий само, як і пароль вище."
+
 #. TRANS: Button text for password reset form.
 #. TRANS: Button text on profile design page to reset all colour settings to default without saving.
 #: actions/recoverpassword.php:268 lib/designsettings.php:264
@@ -4969,8 +4915,13 @@ msgstr "Пароль має складатись з 6-ти або більше 
 msgid "Password and confirmation do not match."
 msgstr "Пароль та підтвердження не співпадають."
 
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:418
+msgid "Cannot save new password."
+msgstr "Не вдається зберегти новий пароль."
+
 #. TRANS: Server error displayed when something does wrong with the user object during password reset.
-#: actions/recoverpassword.php:426 actions/register.php:248
+#: actions/recoverpassword.php:426 actions/register.php:256
 msgid "Error setting user."
 msgstr "Помилка в налаштуваннях користувача."
 
@@ -4979,88 +4930,97 @@ msgstr "Помилка в налаштуваннях користувача."
 msgid "New password successfully saved. You are now logged in."
 msgstr "Новий пароль успішно збережено. Тепер ви увійшли."
 
-#: actions/register.php:87 actions/register.php:188 actions/register.php:399
+#: actions/register.php:92 actions/register.php:196 actions/register.php:413
 msgid "Sorry, only invited people can register."
 msgstr ""
 "Пробачте, але лише ті, кого було запрошено, мають змогу зареєструватись тут."
 
-#: actions/register.php:94
+#: actions/register.php:99
 msgid "Sorry, invalid invitation code."
 msgstr "Даруйте, помилка у коді запрошення."
 
-#: actions/register.php:113
+#: actions/register.php:119
 msgid "Registration successful"
 msgstr "Реєстрація успішна"
 
-#: actions/register.php:115 actions/register.php:497
+#: actions/register.php:121 actions/register.php:511
 msgid "Register"
 msgstr "Реєстрація"
 
-#: actions/register.php:135
+#: actions/register.php:142
 msgid "Registration not allowed."
 msgstr "Реєстрацію не дозволено."
 
-#: actions/register.php:201
-msgid "You cannot register if you don't agree to the license."
+#: actions/register.php:209
+#, fuzzy
+msgid "You can't register if you don't agree to the license."
 msgstr "Ви не можете зареєструватись, якщо не погодитесь з умовами ліцензії."
 
-#: actions/register.php:210
+#: actions/register.php:218
 msgid "Email address already exists."
 msgstr "Ця адреса вже використовується."
 
-#: actions/register.php:243 actions/register.php:265
+#: actions/register.php:251 actions/register.php:273
 msgid "Invalid username or password."
 msgstr "Недійсне ім’я або пароль."
 
-#: actions/register.php:340
+#: actions/register.php:351
+#, fuzzy
 msgid ""
 "With this form you can create a new account. You can then post notices and "
-"link up to friends and colleagues."
+"link up to friends and colleagues. "
 msgstr ""
 "Ця форма дозволить вам створити новий акаунт. Ви зможете робити дописи і "
 "будете в курсі справ ваших друзів та колег."
 
+#: actions/register.php:437
+msgid "6 or more characters."
+msgstr "6 або більше знаків."
+
 #. TRANS: Link description in user account settings menu.
-#: actions/register.php:431 actions/register.php:435
+#: actions/register.php:445 actions/register.php:449
 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
 msgid "Email"
 msgstr "Пошта"
 
-#: actions/register.php:432 actions/register.php:436
-msgid "Used only for updates, announcements, and password recovery."
+#: actions/register.php:446 actions/register.php:450
+#, fuzzy
+msgid "Used only for updates, announcements, and password recovery"
 msgstr "Використовується лише для оновлень, оголошень та відновлення пароля."
 
-#: actions/register.php:443
-msgid "Longer name, preferably your \"real\" name."
+#: actions/register.php:457
+#, fuzzy
+msgid "Longer name, preferably your \"real\" name"
 msgstr "Повне ім’я, бажано ваше справжнє ім’я."
 
-#: actions/register.php:471
-msgid "Where you are, like \"City, State (or Region), Country\"."
-msgstr "Де ви живете, на кшталт «Місто, область (регіон), країна»."
+#: actions/register.php:462
+#, fuzzy
+msgid "URL of your homepage, blog, or profile on another site"
+msgstr "URL-адреса вашої веб-сторінки, блоґу, або профілю на іншому сайті."
 
-#: actions/register.php:510
+#: actions/register.php:523
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
 msgstr "Я розумію, що зміст і дані %1$s є приватними і конфіденційними."
 
-#: actions/register.php:520
+#: actions/register.php:533
 #, php-format
 msgid "My text and files are copyright by %1$s."
 msgstr "Авторські права на мої тексти і файли належать %1$s."
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:524
+#: actions/register.php:537
 msgid "My text and files remain under my own copyright."
 msgstr "Авторські права на мої тексти і файли залишаються за мною."
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:527
+#: actions/register.php:540
 msgid "All rights reserved."
 msgstr "Всі права захищені."
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:532
+#: actions/register.php:545
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -5069,7 +5029,7 @@ msgstr ""
 "Мої дописи і файли доступні на умовах %s, окрім цих приватних даних: пароль, "
 "електронна адреса, адреса IM, телефонний номер."
 
-#: actions/register.php:573
+#: actions/register.php:588
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -5102,7 +5062,7 @@ msgstr ""
 "Дякуємо, що зареєструвались у нас, і, сподіваємось, вам сподобається наш "
 "сервіс."
 
-#: actions/register.php:597
+#: actions/register.php:612
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5134,7 +5094,8 @@ msgid "User nickname"
 msgstr "Ім’я користувача"
 
 #: actions/remotesubscribe.php:129
-msgid "Nickname of the user you want to follow."
+#, fuzzy
+msgid "Nickname of the user you want to follow"
 msgstr "Ім’я користувача, дописи якого ви хотіли б читати."
 
 #: actions/remotesubscribe.php:132
@@ -5142,7 +5103,8 @@ msgid "Profile URL"
 msgstr "URL-адреса профілю"
 
 #: actions/remotesubscribe.php:133
-msgid "URL of your profile on another compatible microblogging service."
+#, fuzzy
+msgid "URL of your profile on another compatible microblogging service"
 msgstr "URL-адреса вашого профілю на іншому сумісному сервісі мікроблоґів."
 
 #. TRANS: Link text for link that will subscribe to a remote profile.
@@ -5152,7 +5114,8 @@ msgid "Subscribe"
 msgstr "Підписатись"
 
 #: actions/remotesubscribe.php:158
-msgid "Invalid profile URL (bad format)."
+#, fuzzy
+msgid "Invalid profile URL (bad format)"
 msgstr "Неприпустима URL-адреса профілю (неправильний формат)."
 
 #: actions/remotesubscribe.php:167
@@ -5192,7 +5155,6 @@ msgstr "Повторено"
 msgid "Repeated!"
 msgstr "Повторено!"
 
-#. TRANS: RSS reply feed title. %s is a user nickname.
 #. TRANS: Tooltip for personal group navigation menu option when logged in for viewing @-replies.
 #: actions/replies.php:126 actions/repliesrss.php:68
 #: lib/personalgroupnav.php:109
@@ -5247,12 +5209,10 @@ msgstr ""
 "Ви можете [«розштовхати» %1$s](../%2$s) або [написати дещо варте його уваги](%"
 "%%%action.newnotice%%%%?status_textarea=%3$s)."
 
-#. TRANS: RSS reply feed description.
-#. TRANS: %1$s is a user nickname, %2$s is the StatusNet site name.
-#: actions/repliesrss.php:74
+#: actions/repliesrss.php:72
 #, fuzzy, php-format
-msgid "Replies to %1$s on %2$s."
-msgstr "Відповіді до %1$s на %2$s!"
+msgid "Replies to %1$s on %2$s!"
+msgstr "Відповіді до %1$s на %2$s."
 
 #. TRANS: Client exception displayed when trying to restore an account while not logged in.
 #: actions/restoreaccount.php:78
@@ -5354,7 +5314,7 @@ msgstr "Ви не можете позбавляти користувачів р
 msgid "User doesn't have this role."
 msgstr "Користувач не має цієї ролі."
 
-#: actions/rsd.php:142 actions/version.php:159
+#: actions/rsd.php:146 actions/version.php:159
 msgid "StatusNet"
 msgstr "StatusNet"
 
@@ -5396,87 +5356,87 @@ msgstr "Виводити дані сесії наладки."
 msgid "Save site settings"
 msgstr "Зберегти налаштування сайту"
 
-#: actions/showapplication.php:78
+#: actions/showapplication.php:82
 msgid "You must be logged in to view an application."
 msgstr "Ви повинні спочатку увійти, аби переглянути додаток."
 
-#: actions/showapplication.php:151
+#: actions/showapplication.php:157
 msgid "Application profile"
 msgstr "Профіль додатку"
 
 #. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:153 lib/applicationeditform.php:177
+#: actions/showapplication.php:159 lib/applicationeditform.php:177
 msgid "Icon"
 msgstr "Іконка"
 
 #. TRANS: Form input field label for application name.
-#: actions/showapplication.php:163 actions/version.php:197
+#: actions/showapplication.php:169 actions/version.php:197
 #: lib/applicationeditform.php:190
 msgid "Name"
 msgstr "Ім’я"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:172 lib/applicationeditform.php:227
+#: actions/showapplication.php:178 lib/applicationeditform.php:227
 msgid "Organization"
 msgstr "Організація"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:181 actions/version.php:200
+#: actions/showapplication.php:187 actions/version.php:200
 #: lib/applicationeditform.php:208 lib/groupeditform.php:168
 msgid "Description"
 msgstr "Опис"
 
 #. TRANS: Header for group statistics on a group page (h2).
 #. TRANS: H2 text for user statistics.
-#: actions/showapplication.php:186 actions/showgroup.php:460
+#: actions/showapplication.php:192 actions/showgroup.php:460
 #: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "Статистика"
 
-#: actions/showapplication.php:197
+#: actions/showapplication.php:203
 #, php-format
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr "Створено %1$s — %2$s доступ за замовч. — %3$d користувачів"
 
-#: actions/showapplication.php:207
+#: actions/showapplication.php:213
 msgid "Application actions"
 msgstr "Можливості додатку"
 
-#: actions/showapplication.php:230
+#: actions/showapplication.php:236
 msgid "Reset key & secret"
 msgstr "Призначити новий ключ і таємне слово"
 
 #. TRANS: Title of form for deleting a user.
-#: actions/showapplication.php:246 lib/deletegroupform.php:121
+#: actions/showapplication.php:252 lib/deletegroupform.php:121
 #: lib/deleteuserform.php:64 lib/noticelist.php:673
 msgid "Delete"
 msgstr "Видалити"
 
-#: actions/showapplication.php:255
+#: actions/showapplication.php:261
 msgid "Application info"
 msgstr "Інфо додатку"
 
-#: actions/showapplication.php:257
+#: actions/showapplication.php:263
 msgid "Consumer key"
 msgstr "Ключ споживача"
 
-#: actions/showapplication.php:262
+#: actions/showapplication.php:268
 msgid "Consumer secret"
 msgstr "Таємно слово споживача"
 
-#: actions/showapplication.php:267
+#: actions/showapplication.php:273
 msgid "Request token URL"
 msgstr "URL-адреса токена запиту"
 
-#: actions/showapplication.php:272
+#: actions/showapplication.php:278
 msgid "Access token URL"
 msgstr "URL-адреса токена дозволу"
 
-#: actions/showapplication.php:277
+#: actions/showapplication.php:283
 msgid "Authorize URL"
 msgstr "Авторизувати URL-адресу"
 
-#: actions/showapplication.php:282
+#: actions/showapplication.php:288
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
@@ -5484,7 +5444,7 @@ msgstr ""
 "До уваги: Всі підписи шифруються за методом HMAC-SHA1. Ми не підтримуємо "
 "шифрування підписів відкритим текстом."
 
-#: actions/showapplication.php:302
+#: actions/showapplication.php:309
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr "Ви впевнені, що бажаєте скинути ваш ключ споживача і секретний код?"
 
@@ -5577,18 +5537,16 @@ msgid "Group profile"
 msgstr "Профіль спільноти"
 
 #. TRANS: Label for group URL (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT for URL in a profile.
 #: actions/showgroup.php:273 actions/tagother.php:118
-#: actions/userauthorization.php:184 lib/userprofile.php:186
+#: actions/userauthorization.php:175 lib/userprofile.php:186
 msgid "URL"
 msgstr "URL"
 
 #. TRANS: Label for group description or group note (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page where bio is displayed.
 #. TRANS: DT for note in a profile.
 #: actions/showgroup.php:285 actions/tagother.php:128
-#: actions/userauthorization.php:197 lib/userprofile.php:204
+#: actions/userauthorization.php:187 lib/userprofile.php:204
 msgid "Note"
 msgstr "Зауваження"
 
@@ -5734,7 +5692,7 @@ msgid "%1$s tagged %2$s"
 msgstr "Дописи %1$s позначені теґом %2$s"
 
 #. TRANS: Page title showing tagged notices in one user's stream.
-#. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
+#. TRANS: %1$s is the username, %2$s is the hash tag, %1$d is the page number.
 #: actions/showstream.php:74
 #, php-format
 msgid "%1$s tagged %2$s, page %3$d"
@@ -5985,7 +5943,8 @@ msgstr ""
 
 #. TRANS: Title for button to save site notice in admin panel.
 #: actions/sitenoticeadminpanel.php:201
-msgid "Save site notice."
+#, fuzzy
+msgid "Save site notice"
 msgstr "Зберегти повідомлення сайту."
 
 #. TRANS: Title for SMS settings.
@@ -6043,7 +6002,8 @@ msgstr "Телефонний номер"
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
 #: actions/smssettings.php:152
-msgid "Phone number, no punctuation or spaces, with area code."
+#, fuzzy
+msgid "Phone number, no punctuation or spaces, with area code"
 msgstr "Телефонний номер та регіональний код, ніякої пунктуації чи інтервалів."
 
 #. TRANS: Form legend for SMS preferences form.
@@ -6211,19 +6171,15 @@ msgstr "Ви не підписані до цього профілю."
 msgid "Could not save subscription."
 msgstr "Не вдалося зберегти підписку."
 
-#. TRANS: Client error displayed trying to perform any request method other than POST.
-#. TRANS: Do not translate POST.
 #: actions/subscribe.php:77
 msgid "This action only accepts POST requests."
 msgstr "Ця дія приймає лише запити POST."
 
-#. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
-#: actions/subscribe.php:121
+#: actions/subscribe.php:117
 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
 msgstr "Цією дією ви не зможете підписатися до віддаленого профілю OMB 0.1."
 
-#. TRANS: Page title when subscription succeeded.
-#: actions/subscribe.php:149
+#: actions/subscribe.php:145
 msgid "Subscribed"
 msgstr "Підписані"
 
@@ -6383,9 +6339,8 @@ msgstr "Позначити %s"
 msgid "User profile"
 msgstr "Профіль користувача."
 
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT element in area for user avatar.
-#: actions/tagother.php:81 actions/userauthorization.php:138
+#: actions/tagother.php:81 actions/userauthorization.php:132
 #: lib/userprofile.php:108
 msgid "Photo"
 msgstr "Фото"
@@ -6402,11 +6357,6 @@ msgstr ""
 "Позначити користувача теґами (літери, цифри, -, . та _), відокремлюючи кожен "
 "комою або пробілом"
 
-#: actions/tagother.php:178
-#, php-format
-msgid "Invalid tag: \"%s\""
-msgstr "Недійсний теґ: «%s»"
-
 #: actions/tagother.php:193
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
@@ -6422,7 +6372,6 @@ msgstr "Скористайтесь цією формою, щоб додати т
 msgid "No such tag."
 msgstr "Такого теґу немає."
 
-#. TRANS: Client error displayed when trying to unblock a non-blocked user.
 #: actions/unblock.php:59
 msgid "You haven't blocked that user."
 msgstr "Цього користувача блокувати неможливо."
@@ -6443,7 +6392,7 @@ msgstr "У запиті відсутній ID профілю."
 msgid "Unsubscribed"
 msgstr "Відписано"
 
-#: actions/updateprofile.php:64
+#: actions/updateprofile.php:64 actions/userauthorization.php:337
 #, php-format
 msgid ""
 "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
@@ -6473,8 +6422,8 @@ msgstr "Помилковий текст привітання. Максималь
 #. TRANS: Client error displayed when trying to set a non-existing user as default subscription for new
 #. TRANS: users in user admin panel. %1$s is the invalid nickname.
 #: actions/useradminpanel.php:166
-#, php-format
-msgid "Invalid default subscripton: \"%1$s\" is not a user."
+#, fuzzy, php-format
+msgid "Invalid default subscripton: '%1$s' is not a user."
 msgstr "Помилкова підписка за замовчуванням: «%1$s» не є користувачем."
 
 #. TRANS: Link description in user account settings menu.
@@ -6535,65 +6484,60 @@ msgstr ""
 
 #. TRANS: Title for button to save user settings in user admin panel.
 #: actions/useradminpanel.php:302
-msgid "Save user settings."
+#, fuzzy
+msgid "Save user settings"
 msgstr "Зберегти налаштування користувача."
 
-#. TRANS: Page title.
-#: actions/userauthorization.php:109
+#: actions/userauthorization.php:105
 msgid "Authorize subscription"
 msgstr "Авторизувати підписку"
 
-#. TRANS: Page notice on "Auhtorize subscription" page.
-#: actions/userauthorization.php:115
+#: actions/userauthorization.php:110
+#, fuzzy
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
 "user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
-"click \"Reject\"."
+"click “Reject”."
 msgstr ""
 "Будь ласка, перевірте всі деталі, аби упевнитись, що ви дійсно бажаєте "
 "підписатись на дописи цього користувача. Якщо ви не збираєтесь "
 "підписуватись, то просто натисніть «Відмінити»."
 
-#. TRANS: DT element on Authorise Subscription page where license is displayed.
 #. TRANS: Menu item for site administration
-#: actions/userauthorization.php:207 actions/version.php:167
+#: actions/userauthorization.php:196 actions/version.php:167
 #: lib/adminpanelaction.php:403
 msgid "License"
 msgstr "Ліцензія"
 
-#. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:229
-msgctxt "BUTTON"
+#: actions/userauthorization.php:217
+#, fuzzy
 msgid "Accept"
 msgstr "Погодитись"
 
-#. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:231
-msgid "Subscribe to this user."
-msgstr "Підписатися до цього користувача."
+#: actions/userauthorization.php:218 lib/subscribeform.php:115
+#: lib/subscribeform.php:139
+msgid "Subscribe to this user"
+msgstr "Підписатись до цього користувача"
 
-#. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:233
-msgctxt "BUTTON"
+#: actions/userauthorization.php:219
+#, fuzzy
 msgid "Reject"
 msgstr "Відхилити"
 
-#. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:235
-msgid "Reject this subscription."
+#: actions/userauthorization.php:220
+#, fuzzy
+msgid "Reject this subscription"
 msgstr "Відхилити підписку."
 
-#. TRANS: Client error displayed for an empty authorisation request.
-#: actions/userauthorization.php:248
+#: actions/userauthorization.php:232
 msgid "No authorization request!"
 msgstr "Немає запиту на авторизацію!"
 
-#. TRANS: Accept message header from Authorise subscription page.
-#: actions/userauthorization.php:271
+#: actions/userauthorization.php:254
 msgid "Subscription authorized"
 msgstr "Підписку авторизовано"
 
-#: actions/userauthorization.php:274
+#: actions/userauthorization.php:256
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to authorize the "
@@ -6603,12 +6547,11 @@ msgstr ""
 "Звіртесь з інструкціями на сайті для більш конкретної інформації про те, як "
 "авторизувати підписку. Ваш підписний токен:"
 
-#. TRANS: Reject message header from Authorise subscription page.
-#: actions/userauthorization.php:285
+#: actions/userauthorization.php:266
 msgid "Subscription rejected"
 msgstr "Підписку скинуто"
 
-#: actions/userauthorization.php:288
+#: actions/userauthorization.php:268
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to fully reject the "
@@ -6618,62 +6561,39 @@ msgstr ""
 "з інструкціями на сайті для більш конкретної інформації про те, як скинути "
 "підписку."
 
-#. TRANS: Exception thrown when no valid user is found for an authorisation request.
-#. TRANS: %s is a listener URI.
-#: actions/userauthorization.php:325
-#, php-format
-msgid "Listener URI \"%s\" not found here."
+#: actions/userauthorization.php:303
+#, fuzzy, php-format
+msgid "Listener URI ‘%s’ not found here."
 msgstr "URI слухача «%s» тут не знайдено."
 
-#. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:332
-#, php-format
-msgid "Listenee URI \"%s\" is too long."
+#: actions/userauthorization.php:308
+#, fuzzy, php-format
+msgid "Listenee URI ‘%s’ is too long."
 msgstr "URI слухача «%s» задовге."
 
-#. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:340
-#, php-format
-msgid "Listenee URI \"%s\" is a local user."
+#: actions/userauthorization.php:314
+#, fuzzy, php-format
+msgid "Listenee URI ‘%s’ is a local user."
 msgstr "URI слухача «%s» — це локальний користувач."
 
-#. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
-#. TRANS: %s is a profile URL.
-#: actions/userauthorization.php:358
-#, php-format
-msgid "Profile URL \"%s\" is for a local user."
+#: actions/userauthorization.php:329
+#, fuzzy, php-format
+msgid "Profile URL ‘%s’ is for a local user."
 msgstr "URL-адреса профілю «%s» для локального користувача."
 
-#. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
-#. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
-#: actions/userauthorization.php:368
-#, php-format
-msgid ""
-"Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
-"\"."
-msgstr "Ліцензія потоку «%1$s» є несумісною з ліцензією сайту «%2$s»."
-
-#. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:378
-#, php-format
-msgid "Avatar URL \"%s\" is not valid."
+#: actions/userauthorization.php:345
+#, fuzzy, php-format
+msgid "Avatar URL ‘%s’ is not valid."
 msgstr "URL-адреса аватари «%s» не є дійсною."
 
-#. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:385
-#, php-format
-msgid "Cannot read avatar URL \"%s\"."
+#: actions/userauthorization.php:350
+#, fuzzy, php-format
+msgid "Can’t read avatar URL ‘%s’."
 msgstr "Не вдалося прочитати URL аватари «%s»."
 
-#. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:392
-#, php-format
-msgid "Wrong image type for avatar URL \"%s\"."
+#: actions/userauthorization.php:355
+#, fuzzy, php-format
+msgid "Wrong image type for avatar URL ‘%s’."
 msgstr "Неправильний тип зображення для URL аватари «%s»."
 
 #. TRANS: Page title for profile design page.
@@ -6783,7 +6703,7 @@ msgid "Plugins"
 msgstr "Додатки"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:898
+#: actions/version.php:198 lib/action.php:901
 msgid "Version"
 msgstr "Версія"
 
@@ -6996,14 +6916,14 @@ msgstr "Проблема при збереженні вхідних дописі
 
 #. TRANS: Server exception thrown when a reply cannot be saved.
 #. TRANS: %1$d is a notice ID, %2$d is the ID of the mentioned user.
-#: classes/Notice.php:1142
+#: classes/Notice.php:1144
 #, php-format
 msgid "Could not save reply for %1$d, %2$d."
 msgstr "Не вдалося зберегти відповідь для %1$d, %2$d."
 
 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1661
+#: classes/Notice.php:1663
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
@@ -7017,14 +6937,14 @@ msgstr "%1$s (%2$s)"
 
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:775
+#: classes/Profile.php:779
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr "Не вдалося скасувати роль «%s» для користувача #%2$s; не існує."
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:784
+#: classes/Profile.php:788
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -7342,53 +7262,53 @@ msgid "Page notice"
 msgstr "Зауваження сторінки"
 
 #. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:871
+#: lib/action.php:874
 msgid "Secondary site navigation"
 msgstr "Другорядна навігація по сайту"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:877
+#: lib/action.php:880
 msgid "Help"
 msgstr "Допомога"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:880
+#: lib/action.php:883
 msgid "About"
 msgstr "Про"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:883
+#: lib/action.php:886
 msgid "FAQ"
 msgstr "ЧаП"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:888
+#: lib/action.php:891
 msgid "TOS"
 msgstr "Умови"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:892
+#: lib/action.php:895
 msgid "Privacy"
 msgstr "Приватність"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:895
+#: lib/action.php:898
 msgid "Source"
 msgstr "Джерело"
 
 #. TRANS: Secondary navigation menu option leading to e-mail contact information on the
 #. TRANS: StatusNet site, where to report bugs, ...
-#: lib/action.php:902
+#: lib/action.php:905
 msgid "Contact"
 msgstr "Контакт"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:905
+#: lib/action.php:908
 msgid "Badge"
 msgstr "Бедж"
 
 #. TRANS: DT element for StatusNet software license.
-#: lib/action.php:934
+#: lib/action.php:937
 msgid "StatusNet software license"
 msgstr "Ліцензія програмного забезпечення StatusNet"
 
@@ -7396,7 +7316,7 @@ msgstr "Ліцензія програмного забезпечення StatusN
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:941
+#: lib/action.php:944
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7406,7 +7326,7 @@ msgstr ""
 "site.broughtbyurl%%)."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:944
+#: lib/action.php:947
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** — це сервіс мікроблоґів."
@@ -7415,7 +7335,7 @@ msgstr "**%%site.name%%** — це сервіс мікроблоґів."
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:951
+#: lib/action.php:954
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7427,51 +7347,51 @@ msgstr ""
 "License](http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:967
+#: lib/action.php:970
 msgid "Site content license"
 msgstr "Ліцензія змісту сайту"
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:974
+#: lib/action.php:977
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr "Зміст і дані %1$s є приватними і конфіденційними."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:981
+#: lib/action.php:984
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr "Авторські права на зміст і дані належать %1$s. Всі права захищено."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:985
+#: lib/action.php:988
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 "Авторські права на зміст і дані належать розробникам. Всі права захищено."
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:1017
+#: lib/action.php:1020
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr "Весь зміст і дані %1$s доступні на умовах ліцензії %2$s."
 
 #. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1353
+#: lib/action.php:1356
 msgid "Pagination"
 msgstr "Нумерація сторінок"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1364
+#: lib/action.php:1367
 msgid "After"
 msgstr "Вперед"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1374
+#: lib/action.php:1377
 msgid "Before"
 msgstr "Назад"
 
@@ -7670,23 +7590,19 @@ msgstr ""
 msgid "No application for that consumer key."
 msgstr "Немає додатків для даного споживчого ключа."
 
-#: lib/apiauth.php:202 lib/apiauth.php:284
-msgid "Not allowed to use API."
-msgstr ""
-
 #. TRANS: OAuth exception given when an incorrect access token was given for a user.
-#: lib/apiauth.php:225
+#: lib/apiauth.php:219
 msgid "Bad access token."
 msgstr "Токен погодження невірний."
 
 #. TRANS: OAuth exception given when no user was found for a given token (no token was found).
-#: lib/apiauth.php:230
+#: lib/apiauth.php:224
 msgid "No user for that token."
 msgstr "Немає користувача для цього токену."
 
 #. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel".
 #. TRANS: Client error thrown when authentication fails.
-#: lib/apiauth.php:272 lib/apiauth.php:302
+#: lib/apiauth.php:266 lib/apiauth.php:293
 msgid "Could not authenticate you."
 msgstr "Не вдалося автентифікувати вас."
 
@@ -7887,11 +7803,6 @@ msgstr "Змінювати пароль не дозволено."
 msgid "Block"
 msgstr "Блок"
 
-#. TRANS: Description of the form to block a user.
-#: lib/blockform.php:79
-msgid "Block this user"
-msgstr "Блокувати користувача"
-
 #. TRANS: Title for command results.
 #: lib/channel.php:160 lib/channel.php:181
 msgid "Command results"
@@ -7919,7 +7830,7 @@ msgstr "Допису з таким id не існує."
 
 #. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
 #. TRANS: Error text shown when a last user notice is requested and it does not exist.
-#: lib/command.php:99 lib/command.php:630
+#: lib/command.php:99 lib/command.php:642
 msgid "User has no last notice."
 msgstr "Користувач не має останнього допису."
 
@@ -7969,35 +7880,41 @@ msgstr ""
 "Підписані: %2$s\n"
 "Дописи: %3$s"
 
+#. TRANS: Error message text shown when a favorite could not be set because it has already been favorited.
+#: lib/command.php:298
+#, fuzzy
+msgid "Could not create favorite: already favorited."
+msgstr "Не можна позначити як обране."
+
 #. TRANS: Text shown when a notice has been marked as favourite successfully.
-#: lib/command.php:312
+#: lib/command.php:324
 msgid "Notice marked as fave."
 msgstr "Допис позначено як обраний."
 
 #. TRANS: Message given having added a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:357
+#: lib/command.php:369
 #, php-format
 msgid "%1$s joined group %2$s."
 msgstr "%1$s приєднався до спільноти %2$s."
 
 #. TRANS: Message given having removed a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:405
+#: lib/command.php:417
 #, php-format
 msgid "%1$s left group %2$s."
 msgstr "%1$s залишив спільноту %2$s."
 
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: lib/command.php:426
+#: lib/command.php:438
 #, php-format
 msgctxt "WHOIS"
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
 
 #. TRANS: Whois output. %s is the full name of the queried user.
-#: lib/command.php:430
+#: lib/command.php:442
 #, php-format
 msgid "Fullname: %s"
 msgstr "Повне ім’я: %s"
@@ -8005,7 +7922,7 @@ msgstr "Повне ім’я: %s"
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a location.
-#: lib/command.php:434 lib/mail.php:270
+#: lib/command.php:446 lib/mail.php:270
 #, php-format
 msgid "Location: %s"
 msgstr "Розташування: %s"
@@ -8013,20 +7930,20 @@ msgstr "Розташування: %s"
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a homepage.
-#: lib/command.php:438 lib/mail.php:274
+#: lib/command.php:450 lib/mail.php:274
 #, php-format
 msgid "Homepage: %s"
 msgstr "Веб-сторінка: %s"
 
 #. TRANS: Whois output. %s is the bio information of the queried user.
-#: lib/command.php:442
+#: lib/command.php:454
 #, php-format
 msgid "About: %s"
 msgstr "Про мене: %s"
 
 #. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).
 #. TRANS: %s is a remote profile.
-#: lib/command.php:471
+#: lib/command.php:483
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
@@ -8037,7 +7954,7 @@ msgstr ""
 
 #. TRANS: Message given if content is too long. %1$sd is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:488
+#: lib/command.php:500
 #, php-format
 msgid "Message too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
@@ -8052,25 +7969,25 @@ msgstr[2] ""
 "надсилаєте %2$d."
 
 #. TRANS: Error text shown sending a direct message fails with an unknown reason.
-#: lib/command.php:516
+#: lib/command.php:528
 msgid "Error sending direct message."
 msgstr "Помилка при відправці прямого повідомлення."
 
 #. TRANS: Message given having repeated a notice from another user.
 #. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:553
+#: lib/command.php:565
 #, php-format
 msgid "Notice from %s repeated."
 msgstr "Допису від %s вторували."
 
 #. TRANS: Error text shown when repeating a notice fails with an unknown reason.
-#: lib/command.php:556
+#: lib/command.php:568
 msgid "Error repeating notice."
 msgstr "Помилка при повторенні допису."
 
 #. TRANS: Message given if content of a notice for a reply is too long. %1$d is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:591
+#: lib/command.php:603
 #, php-format
 msgid "Notice too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Notice too long - maximum is %1$d characters, you sent %2$d."
@@ -8083,80 +8000,80 @@ msgstr[2] ""
 
 #. TRANS: Text shown having sent a reply to a notice successfully.
 #. TRANS: %s is the nickname of the user of the notice the reply was sent to.
-#: lib/command.php:604
+#: lib/command.php:616
 #, php-format
 msgid "Reply to %s sent."
 msgstr "Відповідь для %s надіслано."
 
 #. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
-#: lib/command.php:607
+#: lib/command.php:619
 msgid "Error saving notice."
 msgstr "Проблема при збереженні допису."
 
 #. TRANS: Error text shown when no username was provided when issuing a subscribe command.
-#: lib/command.php:654
+#: lib/command.php:666
 msgid "Specify the name of the user to subscribe to."
 msgstr "Зазначте ім’я користувача, до якого бажаєте підписатись."
 
 #. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
-#: lib/command.php:663
+#: lib/command.php:675
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "Не можу підписатись до  профілю OMB за командою."
 
 #. TRANS: Text shown after having subscribed to another user successfully.
 #. TRANS: %s is the name of the user the subscription was requested for.
-#: lib/command.php:671
+#: lib/command.php:683
 #, php-format
 msgid "Subscribed to %s."
 msgstr "Тепер ви підписані на дописи %s."
 
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.
-#: lib/command.php:692 lib/command.php:803
+#: lib/command.php:704 lib/command.php:815
 msgid "Specify the name of the user to unsubscribe from."
 msgstr "Зазначте ім’я користувача, від якого бажаєте відписатись."
 
 #. TRANS: Text shown after having unsubscribed from another user successfully.
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:703
+#: lib/command.php:715
 #, php-format
 msgid "Unsubscribed from %s."
 msgstr "Підписку на дописи від %s скасовано."
 
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
-#: lib/command.php:723 lib/command.php:749
+#: lib/command.php:735 lib/command.php:761
 msgid "Command not yet implemented."
 msgstr "Виконання команди ще не завершено."
 
 #. TRANS: Text shown when issuing the command "off" successfully.
-#: lib/command.php:727
+#: lib/command.php:739
 msgid "Notification off."
 msgstr "Сповіщення вимкнуто."
 
 #. TRANS: Error text shown when the command "off" fails for an unknown reason.
-#: lib/command.php:730
+#: lib/command.php:742
 msgid "Can't turn off notification."
 msgstr "Не можна вимкнути сповіщення."
 
 #. TRANS: Text shown when issuing the command "on" successfully.
-#: lib/command.php:753
+#: lib/command.php:765
 msgid "Notification on."
 msgstr "Сповіщення увімкнуто."
 
 #. TRANS: Error text shown when the command "on" fails for an unknown reason.
-#: lib/command.php:756
+#: lib/command.php:768
 msgid "Can't turn on notification."
 msgstr "Не можна увімкнути сповіщення."
 
 #. TRANS: Error text shown when issuing the login command while login is disabled.
-#: lib/command.php:770
+#: lib/command.php:782
 msgid "Login command is disabled."
 msgstr "Команду входу відключено."
 
 #. TRANS: Text shown after issuing the login command successfully.
 #. TRANS: %s is a logon link..
-#: lib/command.php:783
+#: lib/command.php:795
 #, php-format
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
@@ -8164,20 +8081,20 @@ msgstr ""
 
 #. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:812
+#: lib/command.php:824
 #, php-format
 msgid "Unsubscribed %s."
 msgstr "Підписку %s скасовано."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
-#: lib/command.php:830
+#: lib/command.php:842
 msgid "You are not subscribed to anyone."
 msgstr "Ви не маєте жодних підписок."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
-#: lib/command.php:835
+#: lib/command.php:847
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Ви підписані до цієї особи:"
@@ -8186,14 +8103,14 @@ msgstr[2] "Ви підписані до цих людей:"
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user
 #. TRANS: (followers) without having any subscribers.
-#: lib/command.php:857
+#: lib/command.php:869
 msgid "No one is subscribed to you."
 msgstr "Ніхто до вас не підписаний."
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
-#: lib/command.php:862
+#: lib/command.php:874
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Ця особа є підписаною до вас:"
@@ -8202,14 +8119,14 @@ msgstr[2] "Ці люди підписані до вас:"
 
 #. TRANS: Text shown after requesting groups a user is subscribed to without having
 #. TRANS: any group subscriptions.
-#: lib/command.php:884
+#: lib/command.php:896
 msgid "You are not a member of any groups."
 msgstr "Ви не залучені до жодної спільноти."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
-#: lib/command.php:889
+#: lib/command.php:901
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "Ви є учасником спільноти:"
@@ -8217,7 +8134,7 @@ msgstr[1] "Ви є учасником таких спільнот:"
 msgstr[2] "Ви є учасником таких спільнот:"
 
 #. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-#: lib/command.php:904
+#: lib/command.php:916
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -8353,11 +8270,6 @@ msgstr "Авторизовані під’єднані додатки"
 msgid "Database error"
 msgstr "Помилка бази даних"
 
-#. TRANS: Description of form for deleting a user.
-#: lib/deleteuserform.php:75
-msgid "Delete this user"
-msgstr "Видалити цього користувача"
-
 #. TRANS: Label in form on profile design page.
 #. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
 #: lib/designsettings.php:108
@@ -8394,21 +8306,6 @@ msgstr "Змінити кольори"
 msgid "Use defaults"
 msgstr "За замовч."
 
-#. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: lib/designsettings.php:259
-msgid "Restore default designs"
-msgstr "Оновити налаштування за замовчуванням"
-
-#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: lib/designsettings.php:267
-msgid "Reset back to default"
-msgstr "Повернутись до початкових налаштувань"
-
-#. TRANS: Title for button on profile design page to save settings.
-#: lib/designsettings.php:272
-msgid "Save design"
-msgstr "Зберегти дизайн"
-
 #. TRANS: Error message displayed if design settings could not be saved.
 #. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
 #: lib/designsettings.php:405 lib/designsettings.php:427
@@ -9299,10 +9196,6 @@ msgstr "Відповісти на цей допис"
 msgid "Reply"
 msgstr "Відповісти"
 
-#: lib/noticelist.php:673
-msgid "Delete this notice"
-msgstr "Видалити допис"
-
 #: lib/noticelist.php:691
 msgid "Notice repeated"
 msgstr "Допис повторили"
@@ -9578,10 +9471,6 @@ msgstr "Запросити"
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Запросіть друзів та колег приєднатись до вас на %s"
 
-#: lib/subscribeform.php:115 lib/subscribeform.php:139
-msgid "Subscribe to this user"
-msgstr "Підписатись до цього користувача"
-
 #: lib/subscriberspeopleselftagcloudsection.php:48
 #: lib/subscriptionspeopleselftagcloudsection.php:48
 msgid "People Tagcloud as self-tagged"
@@ -9760,23 +9649,18 @@ msgctxt "role"
 msgid "Moderator"
 msgstr "Модератор"
 
-#: lib/util.php:305
-#, fuzzy
-msgid "Not allowed to log in."
-msgstr "Не увійшли."
-
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1309
+#: lib/util.php:1306
 msgid "a few seconds ago"
 msgstr "мить тому"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1312
+#: lib/util.php:1309
 msgid "about a minute ago"
 msgstr "хвилину тому"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1316
+#: lib/util.php:1313
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
@@ -9785,12 +9669,12 @@ msgstr[1] "близько %d хвилин тому"
 msgstr[2] "близько %d хвилин тому"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1319
+#: lib/util.php:1316
 msgid "about an hour ago"
 msgstr "годину тому"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1323
+#: lib/util.php:1320
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
@@ -9799,12 +9683,12 @@ msgstr[1] "близько %d годин тому"
 msgstr[2] "близько %d годин тому"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1326
+#: lib/util.php:1323
 msgid "about a day ago"
 msgstr "день тому"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1330
+#: lib/util.php:1327
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
@@ -9813,12 +9697,12 @@ msgstr[1] "близько %d днів тому"
 msgstr[2] "близько %d днів тому"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1333
+#: lib/util.php:1330
 msgid "about a month ago"
 msgstr "місяць тому"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1337
+#: lib/util.php:1334
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
@@ -9827,7 +9711,7 @@ msgstr[1] "близько %d місяців тому"
 msgstr[2] "близько %d місяців тому"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1340
+#: lib/util.php:1337
 msgid "about a year ago"
 msgstr "близько року тому"
 
@@ -9876,3 +9760,62 @@ msgstr "Неправильний XML, корінь XRD відсутній."
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr "Отримання резервної копії файлу «%s»."
+
+#~ msgid "Block this user."
+#~ msgstr "Блокувати користувача."
+
+#~ msgid "Delete this notice."
+#~ msgstr "Видалити допис."
+
+#~ msgid "Delete this user."
+#~ msgstr "Видалити цього користувача."
+
+#~ msgid "Restore default designs."
+#~ msgstr "Відновити стандартні установки."
+
+#~ msgid "Reset back to default."
+#~ msgstr "Повернутись до стандартних налаштувань."
+
+#~ msgid "Save design."
+#~ msgstr "Зберегти дизайн."
+
+#~ msgid "Disfavor favorite."
+#~ msgstr "Видалити з обраних."
+
+#~ msgid "\"%s\" not found."
+#~ msgstr "«%s» не знайдено."
+
+#~ msgid "Notice %s not found."
+#~ msgstr "Допис %s не знайдено."
+
+#~ msgid "Attachment %s not found."
+#~ msgstr "Вкладення %s не знайдено."
+
+#~ msgid "\"%s\" not supported for oembed requests."
+#~ msgstr "«%s» не підтримується для oembed-запитів."
+
+#~ msgid "Invalid tag: \"%s\"."
+#~ msgstr "Неприпустимий теґ: «%s»."
+
+#~ msgid "%s updates from everyone."
+#~ msgstr "Всі оновлення на %s."
+
+#~ msgid "Password saved"
+#~ msgstr "Пароль збережено"
+
+#~ msgid "Where you are, like \"City, State (or Region), Country\"."
+#~ msgstr "Де ви живете, на кшталт «Місто, область (регіон), країна»."
+
+#~ msgid "Subscribe to this user."
+#~ msgstr "Підписатися до цього користувача."
+
+#~ msgid ""
+#~ "Listenee stream license \"%1$s\" is not compatible with site license \"%2"
+#~ "$s\"."
+#~ msgstr "Ліцензія потоку «%1$s» є несумісною з ліцензією сайту «%2$s»."
+
+#~ msgid "Not allowed to use API."
+#~ msgstr "Не дозволяється використовувати API."
+
+#~ msgid "Not allowed to log in."
+#~ msgstr "Вхід до системи не дозволено."
diff --git a/locale/zh_CN/LC_MESSAGES/statusnet.po b/locale/zh_CN/LC_MESSAGES/statusnet.po
index 52f657227f..f5d5cedd2e 100644
--- a/locale/zh_CN/LC_MESSAGES/statusnet.po
+++ b/locale/zh_CN/LC_MESSAGES/statusnet.po
@@ -15,18 +15,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-24 10:32+0000\n"
-"PO-Revision-Date: 2011-02-24 10:37:50+0000\n"
+"POT-Creation-Date: 2011-03-03 15:58+0000\n"
+"PO-Revision-Date: 2011-03-03 16:01:29+0000\n"
 "Language-Team: Simplified Chinese <http://translatewiki.net/wiki/Portal:zh-"
 "hans>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r82712); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-POT-Import-Date: 2011-02-17 11:39:54+0000\n"
+"X-POT-Import-Date: 2011-02-25 23:49:23+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -138,11 +138,7 @@ msgstr "没有这个页面。"
 #. 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 use "one time password login" without using an existing user.
-#. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
-#. TRANS: Client error displayed trying to find a user by ID for a non-existing ID.
-#. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when calling a profile action without specifying a user.
 #: actions/all.php:80 actions/allrss.php:69
@@ -160,12 +156,12 @@ msgstr "没有这个页面。"
 #: actions/apitimelinementions.php:77 actions/apitimelineuser.php:79
 #: actions/avatarbynickname.php:79 actions/favoritesrss.php:72
 #: actions/foaf.php:42 actions/foaf.php:61 actions/hcard.php:67
-#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:78
+#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
 #: actions/remotesubscribe.php:144 actions/remotesubscribe.php:153
-#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:113
-#: actions/showfavorites.php:106 actions/userbyid.php:75
+#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
+#: actions/showfavorites.php:106 actions/userbyid.php:74
 #: actions/usergroups.php:93 actions/userrss.php:40 actions/userxrd.php:59
-#: actions/xrds.php:71 lib/command.php:497 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:509 lib/galleryaction.php:59
 #: lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "没有这个用户。"
@@ -291,7 +287,7 @@ msgstr "%2$s上%1$s和好友们的更新！"
 #: actions/apigrouplistall.php:120 actions/apigroupmembership.php:105
 #: actions/apigroupshow.php:114 actions/apihelptest.php:84
 #: actions/apistatusesdestroy.php:101 actions/apistatusesretweets.php:110
-#: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:138
+#: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:139
 #: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
 #: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:268
 #: actions/apitimelinegroup.php:147 actions/apitimelinehome.php:173
@@ -515,7 +511,8 @@ msgstr "未找到收件人。"
 
 #. TRANS: Client error displayed trying to direct message another user who's not a friend (403).
 #: actions/apidirectmessagenew.php:144
-msgid "Cannot send direct messages to users who aren't your friend."
+#, fuzzy
+msgid "Can't send direct messages to users who aren't your friend."
 msgstr "不能将直接邮件发送到用户的不是你的朋友。"
 
 #. TRANS: Client error displayed trying to direct message self (403).
@@ -540,7 +537,7 @@ msgstr "已收藏过此消息。"
 #. TRANS: Client error displayed when marking a notice as favourite fails.
 #. TRANS: Server error displayed when trying to mark a notice as favorite fails in the database.
 #. TRANS: Error message text shown when a favorite could not be set.
-#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:294
+#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:306
 msgid "Could not create favorite."
 msgstr "无法创建收藏。"
 
@@ -598,7 +595,7 @@ msgstr "无法找到目标用户。"
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:191
 #: actions/newgroup.php:137 actions/profilesettings.php:273
-#: actions/register.php:206
+#: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "昵称已被使用，换一个吧。"
 
@@ -608,7 +605,7 @@ msgstr "昵称已被使用，换一个吧。"
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:195
 #: actions/newgroup.php:141 actions/profilesettings.php:243
-#: actions/register.php:208
+#: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "不是有效的昵称。"
 
@@ -621,7 +618,7 @@ msgstr "不是有效的昵称。"
 #: actions/apigroupcreate.php:181 actions/editapplication.php:235
 #: actions/editgroup.php:202 actions/newapplication.php:221
 #: actions/newgroup.php:148 actions/profilesettings.php:248
-#: actions/register.php:215
+#: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "主页的URL不正确。"
 
@@ -631,7 +628,7 @@ msgstr "主页的URL不正确。"
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:191 actions/editgroup.php:206
 #: actions/newgroup.php:152 actions/profilesettings.php:252
-#: actions/register.php:218
+#: actions/register.php:226
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "全名过长(不能超过 255 个字符)。"
 
@@ -658,7 +655,7 @@ msgstr[0] "D描述过长(不能超过%d 个字符)。"
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:215 actions/editgroup.php:218
 #: actions/newgroup.php:164 actions/profilesettings.php:265
-#: actions/register.php:227
+#: actions/register.php:235
 msgid "Location is too long (maximum 255 characters)."
 msgstr "位置过长(不能超过255个字符)。"
 
@@ -713,14 +710,14 @@ msgstr "小组未找到。"
 #. TRANS: Server error displayed when trying to join a group the user is already a member of.
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:333
+#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:345
 msgid "You are already a member of that group."
 msgstr "你已经是该小组成员。"
 
 #. TRANS: Server error displayed when trying to join a group the user is blocked from joining.
 #. 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.
-#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:338
+#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:350
 msgid "You have been blocked from that group by the admin."
 msgstr "你已经被管理员从该小组中屏蔽。"
 
@@ -730,7 +727,7 @@ msgstr "你已经被管理员从该小组中屏蔽。"
 #. TRANS: %1$s is the joining user's nickname, $2$s is the group nickname for which the join failed.
 #. TRANS: Message given having failed to add a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:350
+#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:362
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "无法把用户%1$s添加到%2$s小组"
@@ -747,7 +744,7 @@ msgstr "你不是该小组成员。"
 #. TRANS: Message given having failed to remove a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
 #: actions/apigroupleave.php:127 actions/leavegroup.php:133
-#: lib/command.php:398
+#: lib/command.php:410
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
 msgstr "无法把用户%1$s从%2$s小组删除"
@@ -807,21 +804,20 @@ msgstr "请求 token 已被授权了。"
 #. TRANS: Form validation error message.
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
-#. TRANS: Client error displayed when the session token is not okay.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
 #: actions/deletenotice.php:177 actions/disfavor.php:75
 #: actions/emailsettings.php:291 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:65 actions/grouplogo.php:321
 #: actions/groupunblock.php:65 actions/imsettings.php:224
-#: actions/invite.php:60 actions/login.php:131 actions/makeadmin.php:66
+#: actions/invite.php:60 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
-#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:136
-#: actions/othersettings.php:155 actions/passwordsettings.php:137
+#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
+#: actions/othersettings.php:155 actions/passwordsettings.php:138
 #: actions/profilesettings.php:217 actions/recoverpassword.php:383
-#: actions/register.php:164 actions/remotesubscribe.php:76
+#: actions/register.php:172 actions/remotesubscribe.php:76
 #: actions/repeat.php:82 actions/smssettings.php:250 actions/subedit.php:40
-#: actions/subscribe.php:87 actions/tagother.php:166
-#: actions/unsubscribe.php:69 actions/userauthorization.php:53
+#: actions/subscribe.php:86 actions/tagother.php:166
+#: actions/unsubscribe.php:69 actions/userauthorization.php:52
 #: lib/designsettings.php:310
 msgid "There was a problem with your session token. Try again, please."
 msgstr "你的 session 出现了一个问题，请重试。"
@@ -852,7 +848,7 @@ msgstr "插入 oauth_token_association 时数据库出错。"
 #: actions/designadminpanel.php:100 actions/editapplication.php:144
 #: actions/emailsettings.php:310 actions/grouplogo.php:332
 #: actions/imsettings.php:239 actions/newapplication.php:124
-#: actions/oauthconnectionssettings.php:145 actions/recoverpassword.php:46
+#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
 #: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
 msgstr "未预料的表单提交。"
@@ -901,20 +897,19 @@ msgstr "帐号"
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group nickname (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT for nick name in a profile.
-#: actions/apioauthauthorize.php:459 actions/login.php:242
-#: actions/profilesettings.php:106 actions/register.php:418
+#: actions/apioauthauthorize.php:459 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:432
 #: actions/showgroup.php:243 actions/tagother.php:94
-#: actions/userauthorization.php:152 lib/groupeditform.php:145
+#: actions/userauthorization.php:145 lib/groupeditform.php:145
 #: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "昵称"
 
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:463 actions/login.php:245
-#: actions/register.php:422 lib/accountsettingsaction.php:120
+#: actions/apioauthauthorize.php:463 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:120
 msgid "Password"
 msgstr "密码"
 
@@ -1005,13 +1000,13 @@ msgstr "没有这条消息。"
 
 #. TRANS: Client error displayed trying to repeat an own notice through the API.
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:537
+#: actions/apistatusesretweet.php:83 lib/command.php:549
 msgid "Cannot repeat your own notice."
 msgstr "不能转发你自己的消息。"
 
 #. TRANS: Client error displayed trying to re-repeat a notice through the API.
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:92 lib/command.php:543
+#: actions/apistatusesretweet.php:92 lib/command.php:555
 msgid "Already repeated that notice."
 msgstr "已转发了该消息。"
 
@@ -1032,8 +1027,8 @@ msgstr "HTTP 方法不支持。"
 #. TRANS: Exception thrown requesting an unsupported notice output format.
 #. TRANS: %s is the requested output format.
 #: actions/apistatusesshow.php:144
-#, php-format
-msgid "Unsupported format: %s."
+#, fuzzy, php-format
+msgid "Unsupported format: %s"
 msgstr "不支持的格式： %s。"
 
 #. TRANS: Client error displayed requesting a deleted status.
@@ -1134,14 +1129,13 @@ msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr " %1$s 条消息回复给来自 %2$s 的消息 / %3$s。"
 
 #. TRANS: Title for site timeline. %s is the StatusNet sitename.
-#. TRANS: Public RSS feed title. %s is the StatusNet site name.
 #: actions/apitimelinepublic.php:193 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "%s 公共时间线"
 
 #. TRANS: Subtitle for site timeline. %s is the StatusNet sitename.
-#: actions/apitimelinepublic.php:199
+#: actions/apitimelinepublic.php:199 actions/publicrss.php:105
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "%s条来自所有人的消息！"
@@ -1206,26 +1200,25 @@ msgid "Atom post must be an Atom entry."
 msgstr "原子后必须是一个原子的条目。"
 
 #. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
-#: actions/apitimelineuser.php:334
+#: actions/apitimelineuser.php:335
 msgid "Can only handle POST activities."
 msgstr "只能处理开机自检活动。"
 
 #. TRANS: Client error displayed when using an unsupported activity object type.
 #. TRANS: %s is the unsupported activity object type.
-#: actions/apitimelineuser.php:345
+#: actions/apitimelineuser.php:346
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr "无法处理活动对象类型 %s。"
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
 #. TRANS: %d is the notice ID (number).
-#: actions/apitimelineuser.php:379
+#: actions/apitimelineuser.php:380
 #, php-format
 msgid "No content for notice %d."
 msgstr "没有通知 %d 的内容。"
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#. TRANS: %s is the notice URI.
 #: actions/apitimelineuser.php:408
 #, php-format
 msgid "Notice with URI \"%s\" already exists."
@@ -1243,10 +1236,9 @@ msgstr "API方法没有找到。"
 
 #. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
 #. TRANS: Client exception.
-#. TRANS: Client error displayed trying to subscribe to a non-existing profile.
 #: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
 #: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
-#: actions/subscribe.php:110
+#: actions/subscribe.php:107
 msgid "No such profile."
 msgstr "没有这个文件。"
 
@@ -1371,7 +1363,7 @@ msgstr "不能删除其他人的最爱。"
 #: actions/joingroup.php:95 actions/leavegroup.php:82
 #: actions/leavegroup.php:95 actions/makeadmin.php:86
 #: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:380
+#: lib/command.php:392
 msgid "No such group."
 msgstr "没有这个组。"
 
@@ -1381,7 +1373,7 @@ msgid "Not a member."
 msgstr "不是会员。"
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
-#: actions/atompubshowmembership.php:150
+#: actions/atompubshowmembership.php:151
 msgid "Cannot delete someone else's membership."
 msgstr "不能删除其他人的成员资格。"
 
@@ -1484,11 +1476,9 @@ msgstr "你可以上传你的个人头像。文件大小限制在%s以下。"
 
 #. TRANS: Server error displayed in avatar upload page when no matching profile can be found for a user.
 #. TRANS: Server error displayed coming across a request from a user without a profile.
-#. TRANS: Server error displayed when trying to authorise a remote subscription request
-#. TRANS: while the user has no profile.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
 #: actions/grouplogo.php:184 actions/remotesubscribe.php:190
-#: actions/userauthorization.php:75 actions/userrss.php:108
+#: actions/userauthorization.php:72 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr "用户没有相应个人信息。"
 
@@ -1543,9 +1533,10 @@ msgstr "剪裁"
 msgid "No file uploaded."
 msgstr "没有文件被上传。"
 
-#. TRANS: Avatar upload form instruction after uploading a file.
+#. TRANS: Avatar upload form unstruction after uploading a file.
 #: actions/avatarsettings.php:345
-msgid "Pick a square area of the image to be your avatar."
+#, fuzzy
+msgid "Pick a square area of the image to be your avatar"
 msgstr "选择一个方形的区域的图像为您的虚拟形象。"
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
@@ -1586,7 +1577,7 @@ msgid "You may not backup your account."
 msgstr "您可能不会备份您的帐户。"
 
 #. TRANS: Information displayed on the backup account page.
-#: actions/backupaccount.php:225
+#: actions/backupaccount.php:227
 msgid ""
 "You can backup your account data in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format. This is an experimental feature and provides "
@@ -1599,14 +1590,15 @@ msgstr ""
 "不备份。此外上，传的文件和直接的消息不备份。"
 
 #. TRANS: Submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:248
+#: actions/backupaccount.php:250
 msgctxt "BUTTON"
 msgid "Backup"
 msgstr "备份"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:252
-msgid "Backup your account."
+#: actions/backupaccount.php:254
+#, fuzzy
+msgid "Backup your account"
 msgstr "备份您的帐户。"
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
@@ -1646,7 +1638,8 @@ msgstr "否"
 
 #. TRANS: Submit button title for 'No' when blocking a user.
 #: actions/block.php:158
-msgid "Do not block this user."
+#, fuzzy
+msgid "Do not block this user"
 msgstr "不要屏蔽这个用户"
 
 #. TRANS: Button label on the user block form.
@@ -1663,8 +1656,9 @@ msgid "Yes"
 msgstr "是"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:165
-msgid "Block this user."
+#. TRANS: Description of the form to block a user.
+#: actions/block.php:165 lib/blockform.php:79
+msgid "Block this user"
 msgstr "屏蔽这个用户"
 
 #. TRANS: Server error displayed when blocking a user fails.
@@ -1823,7 +1817,7 @@ msgstr "强烈建议您在删除前 <a href=\"%s\">备份您的数据</a>。"
 #. TRANS: Field label for delete account confirmation entry.
 #. TRANS: Field label for password reset form where the password has to be typed again.
 #: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:262 actions/register.php:426
+#: actions/recoverpassword.php:262 actions/register.php:440
 msgid "Confirm"
 msgstr "密码确认"
 
@@ -1852,14 +1846,14 @@ msgstr "未找到应用。"
 #. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
 #: actions/deleteapplication.php:79 actions/editapplication.php:78
-#: actions/showapplication.php:90
+#: actions/showapplication.php:94
 msgid "You are not the owner of this application."
 msgstr "你不是该应用的拥有者。"
 
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
-#: actions/newapplication.php:112 actions/showapplication.php:113
-#: lib/action.php:1422
+#: actions/newapplication.php:112 actions/showapplication.php:118
+#: lib/action.php:1425
 msgid "There was a problem with your session token."
 msgstr "你的 session token 出现了问题。"
 
@@ -1881,12 +1875,14 @@ msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting an application.
 #: actions/deleteapplication.php:161
-msgid "Do not delete this application."
+#, fuzzy
+msgid "Do not delete this application"
 msgstr "不要删除此应用程序。"
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
 #: actions/deleteapplication.php:167
-msgid "Delete this application."
+#, fuzzy
+msgid "Delete this application"
 msgstr "删除此应用程序。"
 
 #. TRANS: Client error when trying to delete group while not logged in.
@@ -1939,12 +1935,14 @@ msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting a group.
 #: actions/deletegroup.php:224
-msgid "Do not delete this group."
+#, fuzzy
+msgid "Do not delete this group"
 msgstr "不要删除此组。"
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
 #: actions/deletegroup.php:231
-msgid "Delete this group."
+#, fuzzy
+msgid "Delete this group"
 msgstr "删除此组。"
 
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
@@ -1952,15 +1950,13 @@ msgstr "删除此组。"
 #. TRANS: Client error displayed when trying to mark a notice as favorite without being logged in.
 #. TRANS: Client error displayed trying to block a user from a group while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
-#. TRANS: Client error displayed trying to log out when not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
-#. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
 #. TRANS: Client error displayed when trying to change user options while not logged in.
 #: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
-#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:70
+#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
-#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:98
+#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
 #: lib/adminpanelaction.php:71 lib/profileformaction.php:63
 #: lib/settingsaction.php:72
@@ -1987,13 +1983,14 @@ msgstr "你确定要删除这条消息吗？"
 
 #. TRANS: Submit button title for 'No' when deleting a notice.
 #: actions/deletenotice.php:159
-msgid "Do not delete this notice."
+#, fuzzy
+msgid "Do not delete this notice"
 msgstr "不要删除此通知。"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:166
-msgid "Delete this notice."
-msgstr "删除此通知。"
+#: actions/deletenotice.php:166 lib/noticelist.php:673
+msgid "Delete this notice"
+msgstr "删除"
 
 #. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
 #: actions/deleteuser.php:66
@@ -2026,13 +2023,15 @@ msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting a user.
 #: actions/deleteuser.php:158
-msgid "Do not delete this user."
+#, fuzzy
+msgid "Do not delete this user"
 msgstr "请不要删除该用户。"
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
-#: actions/deleteuser.php:165
-msgid "Delete this user."
-msgstr "删除此用户。"
+#. TRANS: Description of form for deleting a user.
+#: actions/deleteuser.php:165 lib/deleteuserform.php:75
+msgid "Delete this user"
+msgstr "删除这个用户"
 
 #. TRANS: Message used as title for design settings for the site.
 #. TRANS: Link description in user account settings menu.
@@ -2193,19 +2192,22 @@ msgid "Use defaults"
 msgstr "使用默认值"
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:720
-msgid "Restore default designs."
-msgstr "还原默认设计。"
+#. TRANS: Title for button on profile design page to reset all colour settings to default.
+#: actions/designadminpanel.php:720 lib/designsettings.php:259
+msgid "Restore default designs"
+msgstr "恢复默认外观"
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:728
-msgid "Reset back to default."
-msgstr "重置回默认值。"
+#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
+#: actions/designadminpanel.php:728 lib/designsettings.php:267
+msgid "Reset back to default"
+msgstr "重置到默认"
 
 #. TRANS: Title for button for saving theme settings.
-#: actions/designadminpanel.php:736
-msgid "Save design."
-msgstr "保存设计。"
+#. TRANS: Title for button on profile design page to save settings.
+#: actions/designadminpanel.php:736 lib/designsettings.php:272
+msgid "Save design"
+msgstr "保存外观"
 
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
 #: actions/disfavor.php:83
@@ -2236,7 +2238,7 @@ msgid "You must be logged in to edit an application."
 msgstr "你必须登录后才能编辑应用。"
 
 #. TRANS: Client error displayed trying to edit an application that does not exist.
-#: actions/editapplication.php:83 actions/showapplication.php:83
+#: actions/editapplication.php:83 actions/showapplication.php:87
 msgid "No such application."
 msgstr "没有这个应用。"
 
@@ -2515,7 +2517,7 @@ msgid "Cannot normalize that email address."
 msgstr "无法识别此电子邮件。"
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:393 actions/register.php:204
+#: actions/emailsettings.php:393 actions/register.php:212
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "不是有效的电子邮件。"
@@ -2589,21 +2591,18 @@ msgstr "没有发布用的电子邮件地址。"
 
 #. 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.
 #: actions/emailsettings.php:530 actions/emailsettings.php:554
-#: actions/smssettings.php:566 actions/smssettings.php:591
+#: actions/smssettings.php:565 actions/smssettings.php:588
 msgid "Could not update user record."
 msgstr "无法更新用户记录。"
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
-#. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:534 actions/smssettings.php:570
+#: actions/emailsettings.php:534 actions/smssettings.php:568
 msgid "Incoming email address removed."
 msgstr "发布用的电子邮件被删除。"
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
-#. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:558 actions/smssettings.php:595
+#: actions/emailsettings.php:558 actions/smssettings.php:591
 msgid "New incoming email address added."
 msgstr "已添加新的发布用的电子邮件地址。"
 
@@ -2614,8 +2613,9 @@ msgstr "已收藏过此消息！"
 
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
 #: actions/favor.php:95
-msgid "Disfavor favorite."
-msgstr "不是赞成的最爱。"
+#, fuzzy
+msgid "Disfavor favorite"
+msgstr "不赞成的最爱"
 
 #. TRANS: Page title for first page of favorited notices.
 #. TRANS: Title for favourited notices section.
@@ -2848,12 +2848,14 @@ msgstr ""
 
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
 #: actions/groupblock.php:191
-msgid "Do not block this user from this group."
+#, fuzzy
+msgid "Do not block this user from this group"
 msgstr "不要在此小组屏蔽此用户。"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
 #: actions/groupblock.php:198
-msgid "Block this user from this group."
+#, fuzzy
+msgid "Block this user from this group"
 msgstr "阻止此此组中的用户。"
 
 #. TRANS: Server error displayed when trying to block a user from a group fails because of an application error.
@@ -2862,7 +2864,6 @@ msgid "Database error blocking user from group."
 msgstr "在小组中屏蔽用户时数据库发生错误。"
 
 #. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
-#. TRANS: Client error displayed trying to find a user by ID without providing an ID.
 #: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr "没有 ID。"
@@ -3044,10 +3045,8 @@ msgid "Group search"
 msgstr "小组搜索"
 
 #. TRANS: Text on page where groups can be searched if no results were found for a query.
-#. TRANS: Text for notice search results is the query had no results.
-#. TRANS: Message on the "People search" page where a query has no results.
-#: actions/groupsearch.php:82 actions/noticesearch.php:122
-#: actions/peoplesearch.php:87
+#: actions/groupsearch.php:82 actions/noticesearch.php:117
+#: actions/peoplesearch.php:83
 msgid "No results."
 msgstr "没有查询结果。"
 
@@ -3082,7 +3081,6 @@ msgid "User is not blocked from group."
 msgstr "用户未被小组屏蔽。"
 
 #. TRANS: Server error displayed when unblocking a user from a group fails because of an unknown error.
-#. TRANS: Server error displayed when removing a user block.
 #: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "取消屏蔽时出错。"
@@ -3122,13 +3120,13 @@ msgstr "当前已确认的Jabber/GTalk账号。"
 #. TRANS: Form note in Instant Messaging settings form.
 #. TRANS: %s is the Instant Messaging address set for the site.
 #: actions/imsettings.php:120
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your Jabber/Google Talk account "
 "for a message with further instructions. (Did you add %s to your buddy list?)"
 msgstr ""
-"正在等待验证这个地址。请查阅你的 Jabber/GTalk 帐户看有没有收到下一步的指示。"
-"（你添加 %s 为到你的好友了吗？）"
+"正在等待验证这个地址。请检查你的 Jabber/GTalk 帐户看有没有收到下一步的指示。"
+"（你添加 %s 为你的好友了吗？）"
 
 #. TRANS: IM address input field instructions in Instant Messaging settings form.
 #. TRANS: %s is the Instant Messaging address set for the site.
@@ -3136,13 +3134,13 @@ msgstr ""
 #. TRANS: http://www.rfc-editor.org/rfc/rfc2606.txt. Any other domain may be owned by a legitimate
 #. TRANS: person or organization.
 #: actions/imsettings.php:139
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Jabber or Google Talk address, like \"UserName@example.org\". First, make "
 "sure to add %s to your buddy list in your IM client or on Google Talk."
 msgstr ""
-"Jabber 或 GTalk 帐号，类似\"UserName@example.org\"。首先，必须在即时聊天工具"
-"或 GTalk 中将 %s 加为好友。"
+"Jabber 或 Google Talk 地址，比如 \"UserName@example.org\"。首先，请确认你已"
+"在 IM 聊天工具或 Google Talk 中将 %s 添加了好友。"
 
 #. TRANS: Form legend for Instant Messaging preferences form.
 #: actions/imsettings.php:154
@@ -3151,32 +3149,27 @@ msgstr "IM 首选项已保存。"
 
 #. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:159
-#, fuzzy
 msgid "Send me notices through Jabber/Google Talk."
-msgstr "通过 Jabber/GTalk 发送通告。"
+msgstr "通过 Jabber/Google Talk 给我发送消息。"
 
 #. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:165
-#, fuzzy
 msgid "Post a notice when my Jabber/Google Talk status changes."
-msgstr "当我的 Jabber/GTalk 状态改变时自动发布消息。"
+msgstr "当我的 Jabber/Google Talk 状态消息改变时自动发布消息。"
 
 #. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:171
-#, fuzzy
 msgid ""
 "Send me replies through Jabber/Google Talk from people I'm not subscribed to."
-msgstr "将我没有关注的用户给我的回复通过 Jabber/GTalk 发送给我。"
+msgstr "将我没有关注的用户给我的回复通过 Jabber/Google Talk 发送给我。"
 
 #. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:178
-#, fuzzy
 msgid "Publish a MicroID for my Jabber/Google Talk address."
-msgstr "公开 Jabber/GTalk 帐号的 MicroID。"
+msgstr "为我的 Jabber/Google Talk 地址发布一个 MicroID。"
 
 #. TRANS: Confirmation message for successful Instant Messaging preferences save.
-#. TRANS: Confirmation message after saving preferences.
-#: actions/imsettings.php:283 actions/othersettings.php:193
+#: actions/imsettings.php:283 actions/othersettings.php:192
 msgid "Preferences saved."
 msgstr "首选项已保存。"
 
@@ -3187,15 +3180,13 @@ msgstr "没有 Jabber ID。"
 
 #. TRANS: Message given saving Instant Messaging address that cannot be normalised.
 #: actions/imsettings.php:312
-#, fuzzy
 msgid "Cannot normalize that Jabber ID."
-msgstr "无法识别此 Jabber ID"
+msgstr "无法识别此 Jabber ID。"
 
 #. TRANS: Message given saving Instant Messaging address that not valid.
 #: actions/imsettings.php:317
-#, fuzzy
 msgid "Not a valid Jabber ID."
-msgstr "不是有效的 Jabber ID"
+msgstr "不是有效的 Jabber ID。"
 
 #. TRANS: Message given saving Instant Messaging address that is already set.
 #: actions/imsettings.php:321
@@ -3449,7 +3440,7 @@ msgstr "你必须登录才能离开小组。"
 
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
-#: actions/leavegroup.php:103 lib/command.php:386
+#: actions/leavegroup.php:103 lib/command.php:398
 msgid "You are not a member of that group."
 msgstr "你不是该群小组成员。"
 
@@ -3571,51 +3562,49 @@ msgstr "保存"
 msgid "Save license settings"
 msgstr "保存许可协议设置"
 
-#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
-#: actions/login.php:97 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
 msgid "Already logged in."
 msgstr "已登录。"
 
-#: actions/login.php:142
+#: actions/login.php:148
 msgid "Incorrect username or password."
 msgstr "用户名或密码不正确。"
 
-#. TRANS: Server error displayed when a user object could not be created trying to login using "one time password login".
-#: actions/login.php:148 actions/otp.php:127
+#: actions/login.php:154 actions/otp.php:120
 msgid "Error setting user. You are probably not authorized."
 msgstr "设置用户时出错。你可能没有被认证。"
 
-#: actions/login.php:202 actions/login.php:253
+#: actions/login.php:210 actions/login.php:263
 msgid "Login"
 msgstr "登录"
 
-#: actions/login.php:239
+#: actions/login.php:249
 msgid "Login to site"
 msgstr "登录"
 
-#: actions/login.php:248 actions/register.php:476
+#: actions/login.php:258 actions/register.php:490
 msgid "Remember me"
 msgstr "记住登录状态"
 
-#: actions/login.php:249 actions/register.php:478
+#: actions/login.php:259 actions/register.php:492
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "下次自动登录，请不要在公共电脑上使用此选项！"
 
-#: actions/login.php:259
+#: actions/login.php:269
 msgid "Lost or forgotten password?"
 msgstr "忘记了密码？"
 
-#: actions/login.php:277
+#: actions/login.php:288
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
 msgstr "由于安全原因，修改设置前需要输入用户名和密码。"
 
-#: actions/login.php:281
+#: actions/login.php:292
 msgid "Login with your username and password."
 msgstr "使用用户名和密码登录。"
 
-#: actions/login.php:284
+#: actions/login.php:295
 #, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -3694,14 +3683,14 @@ msgid "New message"
 msgstr "新消息"
 
 #. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
-#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:501
+#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:513
 msgid "You can't send a message to this user."
 msgstr "无法向此用户发送消息。"
 
 #. TRANS: Command exception text shown when trying to send a direct message to another user without content.
 #. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
-#: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:478
-#: lib/command.php:581
+#: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:490
+#: lib/command.php:593
 msgid "No content!"
 msgstr "没有内容！"
 
@@ -3710,7 +3699,7 @@ msgid "No recipient specified."
 msgstr "没有收件人。"
 
 #. TRANS: Error text shown when trying to send a direct message to self.
-#: actions/newmessage.php:167 lib/command.php:505
+#: actions/newmessage.php:167 lib/command.php:517
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr "不要向自己发送消息；跟自己悄悄说就得了。"
@@ -3721,7 +3710,7 @@ msgstr "消息已发送"
 
 #. TRANS: Message given have sent a direct message to another user.
 #. TRANS: %s is the name of the other user.
-#: actions/newmessage.php:188 lib/command.php:513
+#: actions/newmessage.php:188 lib/command.php:525
 #, php-format
 msgid "Direct message to %s sent."
 msgstr "向%s发送私信成功。"
@@ -3738,9 +3727,7 @@ msgstr "新消息"
 msgid "Notice posted"
 msgstr "消息已发布。"
 
-#. TRANS: Instructions for Notice search page.
-#. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/noticesearch.php:69
+#: actions/noticesearch.php:68
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -3749,21 +3736,16 @@ msgstr ""
 "在%%site.name%%的消息内容中搜索。搜索条件至少包含 3 个字符，多个搜索条件用空"
 "格分隔。"
 
-#. TRANS: Title of the page where users can search for notices.
-#: actions/noticesearch.php:80
+#: actions/noticesearch.php:78
 msgid "Text search"
 msgstr "搜索消息"
 
-#. TRANS: Test in RSS notice search.
-#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearch.php:95
+#: actions/noticesearch.php:91
 #, php-format
 msgid "Search results for \"%1$s\" on %2$s"
 msgstr "在%2$s上搜索\"%1$s\"的结果"
 
-#. TRANS: Text for logged in users making a query for notices without results.
-#. TRANS: This message contains a Markdown link.
-#: actions/noticesearch.php:128
+#: actions/noticesearch.php:121
 #, php-format
 msgid ""
 "Be the first to [post on this topic](%%%%action.newnotice%%%%?"
@@ -3772,9 +3754,7 @@ msgstr ""
 "成为第一个[对该主题发布消息]的人(%%%%action.newnotice%%%%?status_textarea=%"
 "s) ！"
 
-#. TRANS: Text for not logged in users making a query for notices without results.
-#. TRANS: This message contains Markdown links.
-#: actions/noticesearch.php:133
+#: actions/noticesearch.php:124
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and be the first to "
@@ -3783,17 +3763,14 @@ msgstr ""
 "现在就 [注册账户](%%%%action.register%%%%) 并成为第一个 [对该主题发布消息的"
 "人](%%%%action.newnotice%%%%?status_textarea=%s) ！"
 
-#. TRANS: RSS notice search feed title. %s is the query.
-#: actions/noticesearchrss.php:95
+#: actions/noticesearchrss.php:96
 #, php-format
 msgid "Updates with \"%s\""
 msgstr "\"%s\"的更新"
 
-#. TRANS: RSS notice search feed description.
-#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearchrss.php:99
+#: actions/noticesearchrss.php:98
 #, fuzzy, php-format
-msgid "Updates matching search term \"%1$s\" on %2$s."
+msgid "Updates matching search term \"%1$s\" on %2$s!"
 msgstr "%2$s上符合搜索关键字\"%1$s\"的更新！"
 
 #: actions/nudge.php:85
@@ -3832,30 +3809,30 @@ msgid "You have not registered any applications yet."
 msgstr "你还没登记任何程序。"
 
 #. TRANS: Title for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:70
+#: actions/oauthconnectionssettings.php:71
 msgid "Connected applications"
 msgstr "关联的应用"
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:81
+#: actions/oauthconnectionssettings.php:83
 msgid "The following connections exist for your account."
 msgstr "你的账号的关联。"
 
 #. TRANS: Client error when trying to revoke access for an application while not being a user of it.
-#: actions/oauthconnectionssettings.php:166
+#: actions/oauthconnectionssettings.php:168
 msgid "You are not a user of that application."
 msgstr "你不是那个应用的用户。"
 
 #. TRANS: Client error when revoking access has failed for some reason.
 #. TRANS: %s is the application ID revoking access failed for.
-#: actions/oauthconnectionssettings.php:181
+#: actions/oauthconnectionssettings.php:183
 #, php-format
 msgid "Unable to revoke access for application: %s."
 msgstr "不能取消%s应用的访问。"
 
 #. TRANS: Success message after revoking access for an application.
 #. TRANS: %1$s is the application name, %2$s is the first part of the user token.
-#: actions/oauthconnectionssettings.php:200
+#: actions/oauthconnectionssettings.php:202
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -3863,14 +3840,14 @@ msgid ""
 msgstr "你已成功取消了%1$s的访问，access token 中前面的部分是 %2$s。"
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:211
+#: actions/oauthconnectionssettings.php:213
 msgid "You have not authorized any applications to use your account."
 msgstr "你还没允许任何程序使用你的账户。"
 
 #. TRANS: Note for developers in the OAuth connection settings form.
 #. TRANS: This message contains a Markdown link. Do not separate "](".
 #. TRANS: %s is the URL to the OAuth settings.
-#: actions/oauthconnectionssettings.php:231
+#: actions/oauthconnectionssettings.php:233
 #, php-format
 msgid ""
 "Are you a developer? [Register an OAuth client application](%s) to use with "
@@ -3878,16 +3855,6 @@ msgid ""
 msgstr ""
 "你是开发者么？[注册一个 OAuth 客户端应用](%s) 来使用这个 StatusNet 网站。"
 
-#: actions/oembed.php:64
-#, php-format
-msgid "\"%s\" not found."
-msgstr "找不到\"%s\"。"
-
-#: actions/oembed.php:76
-#, php-format
-msgid "Notice %s not found."
-msgstr "找不到 %s 的通知。"
-
 #: actions/oembed.php:80 actions/shownotice.php:100
 msgid "Notice has no profile."
 msgstr "消息没有对应用户。"
@@ -3897,16 +3864,6 @@ msgstr "消息没有对应用户。"
 msgid "%1$s's status on %2$s"
 msgstr "%1$s在%2$s时发的消息"
 
-#: actions/oembed.php:95
-#, php-format
-msgid "Attachment %s not found."
-msgstr "找不到 %s 的附件。"
-
-#: actions/oembed.php:136
-#, php-format
-msgid "\"%s\" not supported for oembed requests."
-msgstr "\"%s\"不支持 oembed 的请求。"
-
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
 #: actions/oembed.php:168
 #, php-format
@@ -3925,12 +3882,11 @@ msgstr "请只用HTTP明文的%sURLs的地址。"
 msgid "Not a supported data format."
 msgstr "不支持的数据格式。"
 
-#. TRANS: ShortName in the OpenSearch interface when trying to find users.
 #: actions/opensearch.php:64
 msgid "People Search"
 msgstr "搜索用户"
 
-#: actions/opensearch.php:68
+#: actions/opensearch.php:67
 msgid "Notice Search"
 msgstr "搜索消息"
 
@@ -3977,46 +3933,37 @@ msgstr "显示或隐藏个人页面外观。"
 msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr "短网址服务过长(不能超过50个字符)。"
 
-#. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
-#: actions/otp.php:70
+#: actions/otp.php:69
 msgid "No user ID specified."
 msgstr "没用指定用户 ID。"
 
-#. TRANS: Client error displayed trying to use "one time password login" without specifying a login token.
-#: actions/otp.php:86
+#: actions/otp.php:83
 msgid "No login token specified."
 msgstr "没有指定登录 token。"
 
-#. TRANS: Client error displayed trying to use "one time password login" without requesting a login token.
-#: actions/otp.php:94
+#: actions/otp.php:90
 msgid "No login token requested."
 msgstr "没有请求的登录 token。"
 
-#. TRANS: Client error displayed trying to use "one time password login" while specifying an invalid login token.
-#: actions/otp.php:100
+#: actions/otp.php:95
 msgid "Invalid login token specified."
 msgstr "指定的登录 token 无效。"
 
-#. TRANS: Client error displayed trying to use "one time password login" while specifying an expired login token.
-#: actions/otp.php:110
+#: actions/otp.php:104
 msgid "Login token expired."
 msgstr "登录 token 已过期。"
 
-#. TRANS: Title for outbox for any but the fist page.
-#. TRANS: %1$s is the user nickname, %2$d is the page number.
-#: actions/outbox.php:57
+#: actions/outbox.php:58
 #, php-format
 msgid "Outbox for %1$s - page %2$d"
 msgstr "%1$s的发件箱 - 第%2$d页"
 
-#. TRANS: Title for first page of outbox.
 #: actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
 msgstr "%s 的发件箱"
 
-#. TRANS: Instructions for outbox.
-#: actions/outbox.php:103
+#: actions/outbox.php:104
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr "这是你的发件箱，包含你发送的私信。"
 
@@ -4042,42 +3989,43 @@ msgstr "旧密码"
 msgid "New password"
 msgstr "新密码"
 
-#: actions/passwordsettings.php:109 actions/register.php:423
-msgid "6 or more characters."
+#: actions/passwordsettings.php:109
+#, fuzzy
+msgid "6 or more characters"
 msgstr "6 个或更多字符"
 
-#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:264
-#: actions/register.php:427
-msgid "Same as password above."
+#: actions/passwordsettings.php:113
+#, fuzzy
+msgid "Same as password above"
 msgstr "与上面相同的密码"
 
 #: actions/passwordsettings.php:117
 msgid "Change"
 msgstr "修改"
 
-#: actions/passwordsettings.php:153 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:238
 msgid "Password must be 6 or more characters."
 msgstr "密码必须包含 6 个或更多字符。"
 
-#: actions/passwordsettings.php:156 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:241
 msgid "Passwords don't match."
 msgstr "密码不匹配。"
 
-#: actions/passwordsettings.php:164
+#: actions/passwordsettings.php:165
 msgid "Incorrect old password"
 msgstr "旧密码不正确"
 
-#: actions/passwordsettings.php:180
+#: actions/passwordsettings.php:181
 msgid "Error saving user; invalid."
 msgstr "保存用户时出错；无效。"
 
-#. TRANS: Reset password form validation error message.
-#: actions/passwordsettings.php:185 actions/recoverpassword.php:418
-msgid "Cannot save new password."
+#: actions/passwordsettings.php:186
+#, fuzzy
+msgid "Can't save new password."
 msgstr "无法保存新密码。"
 
-#: actions/passwordsettings.php:191
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
 msgid "Password saved."
 msgstr "密码已保存。"
 
@@ -4351,9 +4299,7 @@ msgstr "直接SSL请求的服务器"
 msgid "Save paths"
 msgstr "保存路径"
 
-#. TRANS: Instructions for the "People search" page.
-#. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/peoplesearch.php:54
+#: actions/peoplesearch.php:52
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
@@ -4362,8 +4308,7 @@ msgstr ""
 "通过姓名、位置和爱好搜索在%%site.name%%的用户。搜索条件至少包含 3 个字符，多"
 "个搜索条件用空格分隔。"
 
-#. TRANS: Title of a page where users can search for other users.
-#: actions/peoplesearch.php:61
+#: actions/peoplesearch.php:58
 msgid "People search"
 msgstr "搜索用户"
 
@@ -4403,14 +4348,14 @@ msgid "Profile information"
 msgstr "个人信息"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109 actions/register.php:419
+#: actions/profilesettings.php:109 actions/register.php:433
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr "1 到 64 个小写字母或数字，不包含标点或空格。"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for full group name (dt). Text hidden by default.
 #. TRANS: DT for full name in a profile.
-#: actions/profilesettings.php:113 actions/register.php:441
+#: actions/profilesettings.php:113 actions/register.php:455
 #: actions/showgroup.php:255 actions/tagother.php:104
 #: lib/groupeditform.php:150 lib/userprofile.php:156
 msgid "Full name"
@@ -4418,49 +4363,48 @@ msgstr "全名"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:118 actions/register.php:446
+#: actions/profilesettings.php:118 actions/register.php:460
 #: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "主页"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:121 actions/register.php:448
+#: actions/profilesettings.php:121
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr "你的主页、博客或在其他网站的URL。"
 
 #. TRANS: Tooltip for field label in form for profile settings. Plural
 #. TRANS: is decided by the number of characters available for the
 #. TRANS: biography (%d).
-#: actions/profilesettings.php:129 actions/register.php:457
+#: actions/profilesettings.php:129 actions/register.php:471
 #, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
 msgstr[0] "用不超过%d个字符描述你自己和你的兴趣"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:135 actions/register.php:462
+#: actions/profilesettings.php:135 actions/register.php:476
 msgid "Describe yourself and your interests"
 msgstr "描述你自己和你的兴趣"
 
 #. TRANS: Text area label in form for profile settings where users can provide.
 #. TRANS: their biography.
-#: actions/profilesettings.php:139 actions/register.php:464
+#: actions/profilesettings.php:139 actions/register.php:478
 msgid "Bio"
 msgstr "自述"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group location (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT for location in a profile.
-#: actions/profilesettings.php:145 actions/register.php:469
+#: actions/profilesettings.php:145 actions/register.php:483
 #: actions/showgroup.php:265 actions/tagother.php:112
-#: actions/userauthorization.php:174 lib/groupeditform.php:173
+#: actions/userauthorization.php:166 lib/groupeditform.php:173
 #: lib/userprofile.php:172
 msgid "Location"
 msgstr "位置"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148
+#: actions/profilesettings.php:148 actions/register.php:485
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "你的地理位置，格式类似\"城市，省份，国家\""
 
@@ -4481,8 +4425,7 @@ msgstr "标签"
 #: actions/profilesettings.php:164
 #, fuzzy
 msgid ""
-"Tags for yourself (letters, numbers, -, ., and _), comma- or space- "
-"separated."
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr "你的标签 (字母、数字、“-”、“. ”和“ _”)， 以逗号或空格分隔"
 
 #. TRANS: Dropdownlist label in form for profile settings.
@@ -4492,7 +4435,8 @@ msgstr "语言"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
 #: actions/profilesettings.php:171
-msgid "Preferred language."
+#, fuzzy
+msgid "Preferred language"
 msgstr "首选的语言。"
 
 #. TRANS: Dropdownlist label in form for profile settings.
@@ -4507,14 +4451,15 @@ msgstr "你一般处于哪个时区？"
 
 #. TRANS: Checkbox label in form for profile settings.
 #: actions/profilesettings.php:189
+#, fuzzy
 msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)."
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr "自动关注任何关注我的人（这个选项适合机器人）"
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Plural form is used based on the maximum number of allowed
 #. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:258 actions/register.php:221
+#: actions/profilesettings.php:258 actions/register.php:229
 #, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4532,10 +4477,10 @@ msgstr "语言过长(不能超过50个字符)。"
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:291
+#: actions/profilesettings.php:291 actions/tagother.php:178
 #, php-format
-msgid "Invalid tag: \"%s\"."
-msgstr "无效的标记： %s。"
+msgid "Invalid tag: \"%s\""
+msgstr "无效的标签：\"%s\"。"
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
 #. TRANS: automatically subscribe to any subscriber.
@@ -4635,12 +4580,6 @@ msgstr ""
 "这里是%%site.name%%，一个基于自由软件[StatusNet](http://status.net/)的[微博"
 "客](http://zh.wikipedia.org/zh-hans/%E5%BE%AE%E5%8D%9A%E5%AE%A2) 。"
 
-#. TRANS: Public RSS feed description. %s is the StatusNet site name.
-#: actions/publicrss.php:106
-#, fuzzy, php-format
-msgid "%s updates from everyone."
-msgstr "%s条来自所有人的消息！"
-
 #. TRANS: Title for public tag cloud.
 #: actions/publictagcloud.php:57
 msgid "Public tag cloud"
@@ -4771,11 +4710,6 @@ msgstr "恢复密码"
 msgid "Password recovery requested"
 msgstr "已请求密码恢复"
 
-#. TRANS: Title for password recovery page in password saved mode.
-#: actions/recoverpassword.php:229
-msgid "Password saved"
-msgstr "密码已保存。"
-
 #. TRANS: Title for password recovery page when an unknown action has been specified.
 #: actions/recoverpassword.php:232
 msgid "Unknown action"
@@ -4786,6 +4720,11 @@ msgstr "未知动作"
 msgid "6 or more characters, and do not forget it!"
 msgstr "至少6个字符，还有，别忘记它！"
 
+#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#: actions/recoverpassword.php:264 actions/register.php:441
+msgid "Same as password above."
+msgstr "与上面相同的密码"
+
 #. TRANS: Button text for password reset form.
 #. TRANS: Button text on profile design page to reset all colour settings to default without saving.
 #: actions/recoverpassword.php:268 lib/designsettings.php:264
@@ -4835,8 +4774,13 @@ msgstr "密码必须是 6 位或更多字符。"
 msgid "Password and confirmation do not match."
 msgstr "密码和确认密码不匹配。"
 
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:418
+msgid "Cannot save new password."
+msgstr "无法保存新密码。"
+
 #. TRANS: Server error displayed when something does wrong with the user object during password reset.
-#: actions/recoverpassword.php:426 actions/register.php:248
+#: actions/recoverpassword.php:426 actions/register.php:256
 msgid "Error setting user."
 msgstr "保存用户设置时出错。"
 
@@ -4845,85 +4789,94 @@ msgstr "保存用户设置时出错。"
 msgid "New password successfully saved. You are now logged in."
 msgstr "新密码已保存，你现在已登录。"
 
-#: actions/register.php:87 actions/register.php:188 actions/register.php:399
+#: actions/register.php:92 actions/register.php:196 actions/register.php:413
 msgid "Sorry, only invited people can register."
 msgstr "对不起，只有被邀请的用户才能注册。"
 
-#: actions/register.php:94
+#: actions/register.php:99
 msgid "Sorry, invalid invitation code."
 msgstr "对不起，无效的邀请码。"
 
-#: actions/register.php:113
+#: actions/register.php:119
 msgid "Registration successful"
 msgstr "注册成功"
 
-#: actions/register.php:115 actions/register.php:497
+#: actions/register.php:121 actions/register.php:511
 msgid "Register"
 msgstr "注册"
 
-#: actions/register.php:135
+#: actions/register.php:142
 msgid "Registration not allowed."
 msgstr "不允许注册。"
 
-#: actions/register.php:201
-msgid "You cannot register if you don't agree to the license."
+#: actions/register.php:209
+#, fuzzy
+msgid "You can't register if you don't agree to the license."
 msgstr "如果您不同意该许可，您不能注册。"
 
-#: actions/register.php:210
+#: actions/register.php:218
 msgid "Email address already exists."
 msgstr "电子邮件地址已存在。"
 
-#: actions/register.php:243 actions/register.php:265
+#: actions/register.php:251 actions/register.php:273
 msgid "Invalid username or password."
 msgstr "用户名或密码不正确。"
 
-#: actions/register.php:340
+#: actions/register.php:351
+#, fuzzy
 msgid ""
 "With this form you can create a new account. You can then post notices and "
-"link up to friends and colleagues."
+"link up to friends and colleagues. "
 msgstr "使用此窗体可以创建一个新的帐户。然后可以张贴告示及链接到的朋友和同事。"
 
+#: actions/register.php:437
+msgid "6 or more characters."
+msgstr "6 个或更多字符"
+
 #. TRANS: Link description in user account settings menu.
-#: actions/register.php:431 actions/register.php:435
+#: actions/register.php:445 actions/register.php:449
 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
 msgid "Email"
 msgstr "电子邮件"
 
-#: actions/register.php:432 actions/register.php:436
-msgid "Used only for updates, announcements, and password recovery."
+#: actions/register.php:446 actions/register.php:450
+#, fuzzy
+msgid "Used only for updates, announcements, and password recovery"
 msgstr "仅用于更新、 公告及密码恢复。"
 
-#: actions/register.php:443
-msgid "Longer name, preferably your \"real\" name."
+#: actions/register.php:457
+#, fuzzy
+msgid "Longer name, preferably your \"real\" name"
 msgstr "你最好是\"真正的\"的名字的长名称技术。"
 
-#: actions/register.php:471
-msgid "Where you are, like \"City, State (or Region), Country\"."
-msgstr "你在哪里，像\"城市、 国家（或地区）、国家\"。"
+#: actions/register.php:462
+#, fuzzy
+msgid "URL of your homepage, blog, or profile on another site"
+msgstr "你的主页、博客或在其他网站的URL。"
 
-#: actions/register.php:510
+#: actions/register.php:523
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
 msgstr "我明白%1$s的信息是私人且保密的。"
 
-#: actions/register.php:520
+#: actions/register.php:533
 #, php-format
 msgid "My text and files are copyright by %1$s."
 msgstr "我的文字和文件的版权归%1$s所有。"
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:524
+#: actions/register.php:537
 msgid "My text and files remain under my own copyright."
 msgstr "我的文字和文件的版权由我自己保留。"
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:527
+#: actions/register.php:540
 msgid "All rights reserved."
 msgstr "保留所有权利。"
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:532
+#: actions/register.php:545
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -4932,7 +4885,7 @@ msgstr ""
 "我的文字和文件在%s下提供，除了如下隐私内容：密码、电子邮件地址、IM 地址和电话"
 "号码。"
 
-#: actions/register.php:573
+#: actions/register.php:588
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -4962,7 +4915,7 @@ msgstr ""
 "\n"
 "感谢你的注册，希望你喜欢这个服务。"
 
-#: actions/register.php:597
+#: actions/register.php:612
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -4992,7 +4945,8 @@ msgid "User nickname"
 msgstr "昵称"
 
 #: actions/remotesubscribe.php:129
-msgid "Nickname of the user you want to follow."
+#, fuzzy
+msgid "Nickname of the user you want to follow"
 msgstr "您要执行的用户的别名。"
 
 #: actions/remotesubscribe.php:132
@@ -5000,7 +4954,8 @@ msgid "Profile URL"
 msgstr "资料页 URL"
 
 #: actions/remotesubscribe.php:133
-msgid "URL of your profile on another compatible microblogging service."
+#, fuzzy
+msgid "URL of your profile on another compatible microblogging service"
 msgstr "另一种兼容的微博客服务配置文件的 URL。"
 
 #. TRANS: Link text for link that will subscribe to a remote profile.
@@ -5011,7 +4966,7 @@ msgstr "关注"
 
 #: actions/remotesubscribe.php:158
 #, fuzzy
-msgid "Invalid profile URL (bad format)."
+msgid "Invalid profile URL (bad format)"
 msgstr "无效的用户 URL (格式错误)"
 
 #: actions/remotesubscribe.php:167
@@ -5050,7 +5005,6 @@ msgstr "已转发"
 msgid "Repeated!"
 msgstr "已转发！"
 
-#. TRANS: RSS reply feed title. %s is a user nickname.
 #. TRANS: Tooltip for personal group navigation menu option when logged in for viewing @-replies.
 #: actions/replies.php:126 actions/repliesrss.php:68
 #: lib/personalgroupnav.php:109
@@ -5102,11 +5056,9 @@ msgstr ""
 "你可以试着 [呼叫%1$s](../%2$s) 或者给他们 [发一些消息](%%%%action.newnotice%%"
 "%%?status_textarea=%3$s)。"
 
-#. TRANS: RSS reply feed description.
-#. TRANS: %1$s is a user nickname, %2$s is the StatusNet site name.
-#: actions/repliesrss.php:74
+#: actions/repliesrss.php:72
 #, fuzzy, php-format
-msgid "Replies to %1$s on %2$s."
+msgid "Replies to %1$s on %2$s!"
 msgstr "在%2$s上对%1$s的回复!"
 
 #. TRANS: Client exception displayed when trying to restore an account while not logged in.
@@ -5203,7 +5155,7 @@ msgstr "你不能在这个网站移除用户角色。"
 msgid "User doesn't have this role."
 msgstr "用户没有此权限。"
 
-#: actions/rsd.php:142 actions/version.php:159
+#: actions/rsd.php:146 actions/version.php:159
 msgid "StatusNet"
 msgstr "StatusNet"
 
@@ -5245,93 +5197,93 @@ msgstr "打开 sessions 的调试输出。"
 msgid "Save site settings"
 msgstr "保存访问设置"
 
-#: actions/showapplication.php:78
+#: actions/showapplication.php:82
 msgid "You must be logged in to view an application."
 msgstr "你必须登录才能创建小组。"
 
-#: actions/showapplication.php:151
+#: actions/showapplication.php:157
 msgid "Application profile"
 msgstr "未找到应用。"
 
 #. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:153 lib/applicationeditform.php:177
+#: actions/showapplication.php:159 lib/applicationeditform.php:177
 msgid "Icon"
 msgstr "图标"
 
 #. TRANS: Form input field label for application name.
-#: actions/showapplication.php:163 actions/version.php:197
+#: actions/showapplication.php:169 actions/version.php:197
 #: lib/applicationeditform.php:190
 msgid "Name"
 msgstr "名称"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:172 lib/applicationeditform.php:227
+#: actions/showapplication.php:178 lib/applicationeditform.php:227
 msgid "Organization"
 msgstr "组织名称必填。"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:181 actions/version.php:200
+#: actions/showapplication.php:187 actions/version.php:200
 #: lib/applicationeditform.php:208 lib/groupeditform.php:168
 msgid "Description"
 msgstr "描述"
 
 #. TRANS: Header for group statistics on a group page (h2).
 #. TRANS: H2 text for user statistics.
-#: actions/showapplication.php:186 actions/showgroup.php:460
+#: actions/showapplication.php:192 actions/showgroup.php:460
 #: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "统计"
 
-#: actions/showapplication.php:197
+#: actions/showapplication.php:203
 #, php-format
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr "由%1$s创建 - 默认访问权限%2$s - %3$d个用户"
 
-#: actions/showapplication.php:207
+#: actions/showapplication.php:213
 msgid "Application actions"
 msgstr "应用程序动作"
 
-#: actions/showapplication.php:230
+#: actions/showapplication.php:236
 msgid "Reset key & secret"
 msgstr "重置key和secret"
 
 #. TRANS: Title of form for deleting a user.
-#: actions/showapplication.php:246 lib/deletegroupform.php:121
+#: actions/showapplication.php:252 lib/deletegroupform.php:121
 #: lib/deleteuserform.php:64 lib/noticelist.php:673
 msgid "Delete"
 msgstr "删除"
 
-#: actions/showapplication.php:255
+#: actions/showapplication.php:261
 msgid "Application info"
 msgstr "应用程序信息"
 
-#: actions/showapplication.php:257
+#: actions/showapplication.php:263
 msgid "Consumer key"
 msgstr "Consumer key"
 
-#: actions/showapplication.php:262
+#: actions/showapplication.php:268
 msgid "Consumer secret"
 msgstr "Consumer secret"
 
-#: actions/showapplication.php:267
+#: actions/showapplication.php:273
 msgid "Request token URL"
 msgstr "请求令牌URL"
 
-#: actions/showapplication.php:272
+#: actions/showapplication.php:278
 msgid "Access token URL"
 msgstr "访问令牌URL"
 
-#: actions/showapplication.php:277
+#: actions/showapplication.php:283
 msgid "Authorize URL"
 msgstr "授权URL"
 
-#: actions/showapplication.php:282
+#: actions/showapplication.php:288
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
 msgstr "提示：我们支持HMAC-SHA1签名。我们不支持明文的签名方法。"
 
-#: actions/showapplication.php:302
+#: actions/showapplication.php:309
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr "你确定要重置你的consumer key和secret吗？"
 
@@ -5420,18 +5372,16 @@ msgid "Group profile"
 msgstr "小组资料"
 
 #. TRANS: Label for group URL (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT for URL in a profile.
 #: actions/showgroup.php:273 actions/tagother.php:118
-#: actions/userauthorization.php:184 lib/userprofile.php:186
+#: actions/userauthorization.php:175 lib/userprofile.php:186
 msgid "URL"
 msgstr "URL 互联网地址"
 
 #. TRANS: Label for group description or group note (dt). Text hidden by default.
-#. TRANS: DT element on Authorise Subscription page where bio is displayed.
 #. TRANS: DT for note in a profile.
 #: actions/showgroup.php:285 actions/tagother.php:128
-#: actions/userauthorization.php:197 lib/userprofile.php:204
+#: actions/userauthorization.php:187 lib/userprofile.php:204
 msgid "Note"
 msgstr "注释"
 
@@ -5576,7 +5526,7 @@ msgid "%1$s tagged %2$s"
 msgstr "%1$s 的标签 %2$s"
 
 #. TRANS: Page title showing tagged notices in one user's stream.
-#. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
+#. TRANS: %1$s is the username, %2$s is the hash tag, %1$d is the page number.
 #: actions/showstream.php:74
 #, php-format
 msgid "%1$s tagged %2$s, page %3$d"
@@ -5817,7 +5767,8 @@ msgstr "整个网站的公告文字（最长255字符；可使用HTML）"
 
 #. TRANS: Title for button to save site notice in admin panel.
 #: actions/sitenoticeadminpanel.php:201
-msgid "Save site notice."
+#, fuzzy
+msgid "Save site notice"
 msgstr "保存网站公告。"
 
 #. TRANS: Title for SMS settings.
@@ -5875,7 +5826,8 @@ msgstr "SMS 电话号码"
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
 #: actions/smssettings.php:152
-msgid "Phone number, no punctuation or spaces, with area code."
+#, fuzzy
+msgid "Phone number, no punctuation or spaces, with area code"
 msgstr "电话号码、 没有标点或带区号的空格。"
 
 #. TRANS: Form legend for SMS preferences form.
@@ -6039,19 +5991,15 @@ msgstr "你没有关注这个用户"
 msgid "Could not save subscription."
 msgstr "无法保存关注。"
 
-#. TRANS: Client error displayed trying to perform any request method other than POST.
-#. TRANS: Do not translate POST.
 #: actions/subscribe.php:77
 msgid "This action only accepts POST requests."
 msgstr "这个动作只接受 POST 请求"
 
-#. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
-#: actions/subscribe.php:121
+#: actions/subscribe.php:117
 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
 msgstr "你不能用这个操作关注一个 OMB 0.1 远程用户。"
 
-#. TRANS: Page title when subscription succeeded.
-#: actions/subscribe.php:149
+#: actions/subscribe.php:145
 msgid "Subscribed"
 msgstr "已关注"
 
@@ -6207,9 +6155,8 @@ msgstr "将%s加为标签"
 msgid "User profile"
 msgstr "用户页面"
 
-#. TRANS: DT element on Authorise Subscription page.
 #. TRANS: DT element in area for user avatar.
-#: actions/tagother.php:81 actions/userauthorization.php:138
+#: actions/tagother.php:81 actions/userauthorization.php:132
 #: lib/userprofile.php:108
 msgid "Photo"
 msgstr "相片"
@@ -6225,11 +6172,6 @@ msgid ""
 msgstr ""
 "给这个用户加注标签 (字母letters, 数字numbers, -, ., and _), 逗号或空格分隔"
 
-#: actions/tagother.php:178
-#, php-format
-msgid "Invalid tag: \"%s\""
-msgstr "无效的标签：\"%s\"。"
-
 #: actions/tagother.php:193
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
@@ -6243,7 +6185,6 @@ msgstr "使用这个表单给你的关注者或你关注的用户添加标签。
 msgid "No such tag."
 msgstr "没有此标签。"
 
-#. TRANS: Client error displayed when trying to unblock a non-blocked user.
 #: actions/unblock.php:59
 msgid "You haven't blocked that user."
 msgstr "你未屏蔽该用户。"
@@ -6264,7 +6205,7 @@ msgstr "请求不含资料页 ID。"
 msgid "Unsubscribed"
 msgstr "已取消关注"
 
-#: actions/updateprofile.php:64
+#: actions/updateprofile.php:64 actions/userauthorization.php:337
 #, php-format
 msgid ""
 "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
@@ -6295,7 +6236,7 @@ msgstr "无效的欢迎文字。最大长度255个字符。"
 #. TRANS: users in user admin panel. %1$s is the invalid nickname.
 #: actions/useradminpanel.php:166
 #, fuzzy, php-format
-msgid "Invalid default subscripton: \"%1$s\" is not a user."
+msgid "Invalid default subscripton: '%1$s' is not a user."
 msgstr "无效的默认关注：“%1$s”不是一个用户。"
 
 #. TRANS: Link description in user account settings menu.
@@ -6355,64 +6296,59 @@ msgstr "是否允许用户发送注册邀请。"
 
 #. TRANS: Title for button to save user settings in user admin panel.
 #: actions/useradminpanel.php:302
-msgid "Save user settings."
+#, fuzzy
+msgid "Save user settings"
 msgstr "保存用户设置。"
 
-#. TRANS: Page title.
-#: actions/userauthorization.php:109
+#: actions/userauthorization.php:105
 msgid "Authorize subscription"
 msgstr "授权关注"
 
-#. TRANS: Page notice on "Auhtorize subscription" page.
-#: actions/userauthorization.php:115
+#: actions/userauthorization.php:110
+#, fuzzy
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
 "user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
-"click \"Reject\"."
+"click “Reject”."
 msgstr ""
 "请检查这些详细信息，请确保您要订阅此用户的通知。如果您不只是要求某人的通知订"
 "阅，请单击\"拒绝\"。"
 
-#. TRANS: DT element on Authorise Subscription page where license is displayed.
 #. TRANS: Menu item for site administration
-#: actions/userauthorization.php:207 actions/version.php:167
+#: actions/userauthorization.php:196 actions/version.php:167
 #: lib/adminpanelaction.php:403
 msgid "License"
 msgstr "许可协议"
 
-#. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:229
-msgctxt "BUTTON"
+#: actions/userauthorization.php:217
+#, fuzzy
 msgid "Accept"
 msgstr "接受"
 
-#. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:231
-msgid "Subscribe to this user."
-msgstr "订阅此用户。"
+#: actions/userauthorization.php:218 lib/subscribeform.php:115
+#: lib/subscribeform.php:139
+msgid "Subscribe to this user"
+msgstr "关注这个用户"
 
-#. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:233
-msgctxt "BUTTON"
+#: actions/userauthorization.php:219
+#, fuzzy
 msgid "Reject"
 msgstr "拒绝"
 
-#. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:235
-msgid "Reject this subscription."
+#: actions/userauthorization.php:220
+#, fuzzy
+msgid "Reject this subscription"
 msgstr "拒绝此订阅。"
 
-#. TRANS: Client error displayed for an empty authorisation request.
-#: actions/userauthorization.php:248
+#: actions/userauthorization.php:232
 msgid "No authorization request!"
 msgstr "没有授权请求！"
 
-#. TRANS: Accept message header from Authorise subscription page.
-#: actions/userauthorization.php:271
+#: actions/userauthorization.php:254
 msgid "Subscription authorized"
 msgstr "已授权关注"
 
-#: actions/userauthorization.php:274
+#: actions/userauthorization.php:256
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to authorize the "
@@ -6421,74 +6357,50 @@ msgstr ""
 "已授权关注，但是没有回传 URL。请到网站查看如何授权关注。你的 subscription "
 "token 是："
 
-#. TRANS: Reject message header from Authorise subscription page.
-#: actions/userauthorization.php:285
+#: actions/userauthorization.php:266
 msgid "Subscription rejected"
 msgstr "关注已拒绝"
 
-#: actions/userauthorization.php:288
+#: actions/userauthorization.php:268
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to fully reject the "
 "subscription."
 msgstr "关注已拒绝，但是没有回传 URL。请到网站查看如何完全拒绝关注。"
 
-#. TRANS: Exception thrown when no valid user is found for an authorisation request.
-#. TRANS: %s is a listener URI.
-#: actions/userauthorization.php:325
+#: actions/userauthorization.php:303
 #, fuzzy, php-format
-msgid "Listener URI \"%s\" not found here."
+msgid "Listener URI ‘%s’ not found here."
 msgstr "Listener URI ‘%s’ 没有找到。"
 
-#. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:332
+#: actions/userauthorization.php:308
 #, fuzzy, php-format
-msgid "Listenee URI \"%s\" is too long."
+msgid "Listenee URI ‘%s’ is too long."
 msgstr "Listenee URI ‘%s’ 过长。"
 
-#. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:340
+#: actions/userauthorization.php:314
 #, fuzzy, php-format
-msgid "Listenee URI \"%s\" is a local user."
+msgid "Listenee URI ‘%s’ is a local user."
 msgstr "Listenee URI ‘%s’ 是一个本地用户。"
 
-#. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
-#. TRANS: %s is a profile URL.
-#: actions/userauthorization.php:358
+#: actions/userauthorization.php:329
 #, fuzzy, php-format
-msgid "Profile URL \"%s\" is for a local user."
+msgid "Profile URL ‘%s’ is for a local user."
 msgstr "个人信息 URL “%s” 是为本地用户的。"
 
-#. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
-#. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
-#: actions/userauthorization.php:368
+#: actions/userauthorization.php:345
 #, fuzzy, php-format
-msgid ""
-"Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
-"\"."
-msgstr "Listenee stream 许可证“‘%1$s” 与本网站的许可证 “%2$s”不兼容。"
-
-#. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:378
-#, fuzzy, php-format
-msgid "Avatar URL \"%s\" is not valid."
+msgid "Avatar URL ‘%s’ is not valid."
 msgstr "头像地址‘%s’无效。"
 
-#. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:385
+#: actions/userauthorization.php:350
 #, fuzzy, php-format
-msgid "Cannot read avatar URL \"%s\"."
+msgid "Can’t read avatar URL ‘%s’."
 msgstr "无法读取头像 URL '%s'。"
 
-#. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:392
+#: actions/userauthorization.php:355
 #, fuzzy, php-format
-msgid "Wrong image type for avatar URL \"%s\"."
+msgid "Wrong image type for avatar URL ‘%s’."
 msgstr "头像 URL ‘%s’ 图像格式错误。"
 
 #. TRANS: Page title for profile design page.
@@ -6587,7 +6499,7 @@ msgid "Plugins"
 msgstr "插件"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:898
+#: actions/version.php:198 lib/action.php:901
 msgid "Version"
 msgstr "版本"
 
@@ -6784,14 +6696,14 @@ msgstr "保存小组收件箱时出错。"
 
 #. TRANS: Server exception thrown when a reply cannot be saved.
 #. TRANS: %1$d is a notice ID, %2$d is the ID of the mentioned user.
-#: classes/Notice.php:1142
+#: classes/Notice.php:1144
 #, php-format
 msgid "Could not save reply for %1$d, %2$d."
 msgstr "无法保存回复，%1$d 对 %2$d。"
 
 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1661
+#: classes/Notice.php:1663
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
@@ -6805,14 +6717,14 @@ msgstr "%1$s (%2$s)"
 
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:775
+#: classes/Profile.php:779
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr "无法取消用户#%2$d的\\\"%1$s\\\"权限，不存在。"
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:784
+#: classes/Profile.php:788
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr "无法取消用户#%2$d的\\\"%1$s\\\"权限，数据库错误。"
@@ -7129,53 +7041,53 @@ msgid "Page notice"
 msgstr "页面消息"
 
 #. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:871
+#: lib/action.php:874
 msgid "Secondary site navigation"
 msgstr "副站导航"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:877
+#: lib/action.php:880
 msgid "Help"
 msgstr "帮助"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:880
+#: lib/action.php:883
 msgid "About"
 msgstr "关于"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:883
+#: lib/action.php:886
 msgid "FAQ"
 msgstr "FAQ"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:888
+#: lib/action.php:891
 msgid "TOS"
 msgstr "条款"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:892
+#: lib/action.php:895
 msgid "Privacy"
 msgstr "隐私"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:895
+#: lib/action.php:898
 msgid "Source"
 msgstr "源码"
 
 #. TRANS: Secondary navigation menu option leading to e-mail contact information on the
 #. TRANS: StatusNet site, where to report bugs, ...
-#: lib/action.php:902
+#: lib/action.php:905
 msgid "Contact"
 msgstr "联系"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:905
+#: lib/action.php:908
 msgid "Badge"
 msgstr "挂件"
 
 #. TRANS: DT element for StatusNet software license.
-#: lib/action.php:934
+#: lib/action.php:937
 msgid "StatusNet software license"
 msgstr "StatusNet 软件许可证"
 
@@ -7183,7 +7095,7 @@ msgstr "StatusNet 软件许可证"
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:941
+#: lib/action.php:944
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7193,7 +7105,7 @@ msgstr ""
 "broughtbyurl%%)。"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:944
+#: lib/action.php:947
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** 是一个微博客服务。"
@@ -7202,7 +7114,7 @@ msgstr "**%%site.name%%** 是一个微博客服务。"
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:951
+#: lib/action.php:954
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7213,50 +7125,50 @@ msgstr ""
 "(http://www.fsf.org/licensing/licenses/agpl-3.0.html)授权。"
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:967
+#: lib/action.php:970
 msgid "Site content license"
 msgstr "网站内容许可协议"
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:974
+#: lib/action.php:977
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr "%1$s的内容和数据是私人且保密的。"
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:981
+#: lib/action.php:984
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr "内容和数据%1$s版权所有并保留所有权利。"
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:985
+#: lib/action.php:988
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr "内容和数据贡献者版权所有并保留所有权利。"
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:1017
+#: lib/action.php:1020
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr "所有%1$s的内容和数据在%2$s许可下有效。"
 
 #. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1353
+#: lib/action.php:1356
 msgid "Pagination"
 msgstr "分页"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1364
+#: lib/action.php:1367
 msgid "After"
 msgstr "之后"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1374
+#: lib/action.php:1377
 msgid "Before"
 msgstr "之前"
 
@@ -7451,23 +7363,19 @@ msgstr "API 资源需要读写的访问权限，但是你只有只读的权限
 msgid "No application for that consumer key."
 msgstr "没有应用使用这个 consumer key。"
 
-#: lib/apiauth.php:202 lib/apiauth.php:284
-msgid "Not allowed to use API."
-msgstr ""
-
 #. TRANS: OAuth exception given when an incorrect access token was given for a user.
-#: lib/apiauth.php:225
+#: lib/apiauth.php:219
 msgid "Bad access token."
 msgstr "无效的 access token。"
 
 #. TRANS: OAuth exception given when no user was found for a given token (no token was found).
-#: lib/apiauth.php:230
+#: lib/apiauth.php:224
 msgid "No user for that token."
 msgstr "没有用户使用这个 token。"
 
 #. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel".
 #. TRANS: Client error thrown when authentication fails.
-#: lib/apiauth.php:272 lib/apiauth.php:302
+#: lib/apiauth.php:266 lib/apiauth.php:293
 msgid "Could not authenticate you."
 msgstr "无法验证你。"
 
@@ -7665,11 +7573,6 @@ msgstr "不允许更改密码。"
 msgid "Block"
 msgstr "屏蔽"
 
-#. TRANS: Description of the form to block a user.
-#: lib/blockform.php:79
-msgid "Block this user"
-msgstr "屏蔽这个用户"
-
 #. TRANS: Title for command results.
 #: lib/channel.php:160 lib/channel.php:181
 msgid "Command results"
@@ -7697,7 +7600,7 @@ msgstr "没有此 id 的消息。"
 
 #. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
 #. TRANS: Error text shown when a last user notice is requested and it does not exist.
-#: lib/command.php:99 lib/command.php:630
+#: lib/command.php:99 lib/command.php:642
 msgid "User has no last notice."
 msgstr "用户没有最后一条的消息。"
 
@@ -7747,35 +7650,41 @@ msgstr ""
 "关注者： %2$s\\n\n"
 "消息数： %3$s"
 
+#. TRANS: Error message text shown when a favorite could not be set because it has already been favorited.
+#: lib/command.php:298
+#, fuzzy
+msgid "Could not create favorite: already favorited."
+msgstr "无法创建收藏。"
+
 #. TRANS: Text shown when a notice has been marked as favourite successfully.
-#: lib/command.php:312
+#: lib/command.php:324
 msgid "Notice marked as fave."
 msgstr "收藏了消息。"
 
 #. TRANS: Message given having added a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:357
+#: lib/command.php:369
 #, php-format
 msgid "%1$s joined group %2$s."
 msgstr "%1$s加入了%2$s小组。"
 
 #. TRANS: Message given having removed a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:405
+#: lib/command.php:417
 #, php-format
 msgid "%1$s left group %2$s."
 msgstr "%1$s离开了%2$s小组。"
 
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: lib/command.php:426
+#: lib/command.php:438
 #, php-format
 msgctxt "WHOIS"
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
 
 #. TRANS: Whois output. %s is the full name of the queried user.
-#: lib/command.php:430
+#: lib/command.php:442
 #, php-format
 msgid "Fullname: %s"
 msgstr "全名：%s"
@@ -7783,7 +7692,7 @@ msgstr "全名：%s"
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a location.
-#: lib/command.php:434 lib/mail.php:270
+#: lib/command.php:446 lib/mail.php:270
 #, php-format
 msgid "Location: %s"
 msgstr "位置：%s"
@@ -7791,20 +7700,20 @@ msgstr "位置：%s"
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a homepage.
-#: lib/command.php:438 lib/mail.php:274
+#: lib/command.php:450 lib/mail.php:274
 #, php-format
 msgid "Homepage: %s"
 msgstr "主页：%s"
 
 #. TRANS: Whois output. %s is the bio information of the queried user.
-#: lib/command.php:442
+#: lib/command.php:454
 #, php-format
 msgid "About: %s"
 msgstr "关于：%s"
 
 #. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).
 #. TRANS: %s is a remote profile.
-#: lib/command.php:471
+#: lib/command.php:483
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
@@ -7813,32 +7722,32 @@ msgstr "%s是一个远程的用户；你只能给同一个服务器上的用户
 
 #. TRANS: Message given if content is too long. %1$sd is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:488
+#: lib/command.php:500
 #, php-format
 msgid "Message too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
 msgstr[0] "消息太长了 - 最大长度为%1$d字符，你发送的是%2$d字符。"
 
 #. TRANS: Error text shown sending a direct message fails with an unknown reason.
-#: lib/command.php:516
+#: lib/command.php:528
 msgid "Error sending direct message."
 msgstr "发送消息出错。"
 
 #. TRANS: Message given having repeated a notice from another user.
 #. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:553
+#: lib/command.php:565
 #, php-format
 msgid "Notice from %s repeated."
 msgstr "来自 %s 的消息已转发。"
 
 #. TRANS: Error text shown when repeating a notice fails with an unknown reason.
-#: lib/command.php:556
+#: lib/command.php:568
 msgid "Error repeating notice."
 msgstr "转发消息时出错。"
 
 #. TRANS: Message given if content of a notice for a reply is too long. %1$d is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:591
+#: lib/command.php:603
 #, php-format
 msgid "Notice too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Notice too long - maximum is %1$d characters, you sent %2$d."
@@ -7846,134 +7755,134 @@ msgstr[0] "消息过长 - 最长%1$d个字符，你发送的是%2$d。"
 
 #. TRANS: Text shown having sent a reply to a notice successfully.
 #. TRANS: %s is the nickname of the user of the notice the reply was sent to.
-#: lib/command.php:604
+#: lib/command.php:616
 #, php-format
 msgid "Reply to %s sent."
 msgstr "给 %s 的回复已发送。"
 
 #. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
-#: lib/command.php:607
+#: lib/command.php:619
 msgid "Error saving notice."
 msgstr "保存消息时出错。"
 
 #. TRANS: Error text shown when no username was provided when issuing a subscribe command.
-#: lib/command.php:654
+#: lib/command.php:666
 msgid "Specify the name of the user to subscribe to."
 msgstr "指定要关注的用户名。"
 
 #. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
-#: lib/command.php:663
+#: lib/command.php:675
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "无法通过命令行关注 OMB 用户。"
 
 #. TRANS: Text shown after having subscribed to another user successfully.
 #. TRANS: %s is the name of the user the subscription was requested for.
-#: lib/command.php:671
+#: lib/command.php:683
 #, php-format
 msgid "Subscribed to %s."
 msgstr "已关注%s。"
 
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.
-#: lib/command.php:692 lib/command.php:803
+#: lib/command.php:704 lib/command.php:815
 msgid "Specify the name of the user to unsubscribe from."
 msgstr "指定要取消关注的用户名。"
 
 #. TRANS: Text shown after having unsubscribed from another user successfully.
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:703
+#: lib/command.php:715
 #, php-format
 msgid "Unsubscribed from %s."
 msgstr "取消关注%s。"
 
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
-#: lib/command.php:723 lib/command.php:749
+#: lib/command.php:735 lib/command.php:761
 msgid "Command not yet implemented."
 msgstr "命令尚未实现。"
 
 #. TRANS: Text shown when issuing the command "off" successfully.
-#: lib/command.php:727
+#: lib/command.php:739
 msgid "Notification off."
 msgstr "通知已关闭。"
 
 #. TRANS: Error text shown when the command "off" fails for an unknown reason.
-#: lib/command.php:730
+#: lib/command.php:742
 msgid "Can't turn off notification."
 msgstr "无法关闭通知。"
 
 #. TRANS: Text shown when issuing the command "on" successfully.
-#: lib/command.php:753
+#: lib/command.php:765
 msgid "Notification on."
 msgstr "通知已开启。"
 
 #. TRANS: Error text shown when the command "on" fails for an unknown reason.
-#: lib/command.php:756
+#: lib/command.php:768
 msgid "Can't turn on notification."
 msgstr "无法开启通知。"
 
 #. TRANS: Error text shown when issuing the login command while login is disabled.
-#: lib/command.php:770
+#: lib/command.php:782
 msgid "Login command is disabled."
 msgstr "登录命令被禁用。"
 
 #. TRANS: Text shown after issuing the login command successfully.
 #. TRANS: %s is a logon link..
-#: lib/command.php:783
+#: lib/command.php:795
 #, php-format
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr "这个链接只能使用一次并且仅在2分钟内有效：%s。"
 
 #. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:812
+#: lib/command.php:824
 #, php-format
 msgid "Unsubscribed %s."
 msgstr "已取消关注%s。"
 
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
-#: lib/command.php:830
+#: lib/command.php:842
 msgid "You are not subscribed to anyone."
 msgstr "你没有关注任何人。"
 
 #. TRANS: Text shown after requesting other users a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
-#: lib/command.php:835
+#: lib/command.php:847
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "你已关注了这个用户："
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user
 #. TRANS: (followers) without having any subscribers.
-#: lib/command.php:857
+#: lib/command.php:869
 msgid "No one is subscribed to you."
 msgstr "没有人关注你。"
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
-#: lib/command.php:862
+#: lib/command.php:874
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "这个用户正在关注你："
 
 #. TRANS: Text shown after requesting groups a user is subscribed to without having
 #. TRANS: any group subscriptions.
-#: lib/command.php:884
+#: lib/command.php:896
 msgid "You are not a member of any groups."
 msgstr "你还未成为任何一个小组的成员。"
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
-#: lib/command.php:889
+#: lib/command.php:901
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "你是该小组成员："
 
 #. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-#: lib/command.php:904
+#: lib/command.php:916
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -8112,11 +8021,6 @@ msgstr "被授权已连接的应用"
 msgid "Database error"
 msgstr "数据库错误"
 
-#. TRANS: Description of form for deleting a user.
-#: lib/deleteuserform.php:75
-msgid "Delete this user"
-msgstr "删除这个用户"
-
 #. TRANS: Label in form on profile design page.
 #. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
 #: lib/designsettings.php:108
@@ -8151,21 +8055,6 @@ msgstr "改变颜色"
 msgid "Use defaults"
 msgstr "使用默认值"
 
-#. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: lib/designsettings.php:259
-msgid "Restore default designs"
-msgstr "恢复默认外观"
-
-#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: lib/designsettings.php:267
-msgid "Reset back to default"
-msgstr "重置到默认"
-
-#. TRANS: Title for button on profile design page to save settings.
-#: lib/designsettings.php:272
-msgid "Save design"
-msgstr "保存外观"
-
 #. TRANS: Error message displayed if design settings could not be saved.
 #. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
 #: lib/designsettings.php:405 lib/designsettings.php:427
@@ -9024,10 +8913,6 @@ msgstr "回复"
 msgid "Reply"
 msgstr "回复"
 
-#: lib/noticelist.php:673
-msgid "Delete this notice"
-msgstr "删除"
-
 #: lib/noticelist.php:691
 msgid "Notice repeated"
 msgstr "消息已转发"
@@ -9303,10 +9188,6 @@ msgstr "邀请"
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "邀请朋友和同事来%s一起和你交流"
 
-#: lib/subscribeform.php:115 lib/subscribeform.php:139
-msgid "Subscribe to this user"
-msgstr "关注这个用户"
-
 #: lib/subscriberspeopleselftagcloudsection.php:48
 #: lib/subscriptionspeopleselftagcloudsection.php:48
 msgid "People Tagcloud as self-tagged"
@@ -9474,66 +9355,61 @@ msgctxt "role"
 msgid "Moderator"
 msgstr "审核员"
 
-#: lib/util.php:305
-#, fuzzy
-msgid "Not allowed to log in."
-msgstr "未登录。"
-
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1309
+#: lib/util.php:1306
 msgid "a few seconds ago"
 msgstr "几秒前"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1312
+#: lib/util.php:1309
 msgid "about a minute ago"
 msgstr "约1分钟前"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1316
+#: lib/util.php:1313
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
 msgstr[0] "约%d分钟前"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1319
+#: lib/util.php:1316
 msgid "about an hour ago"
 msgstr "约1小时前"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1323
+#: lib/util.php:1320
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
 msgstr[0] "约%d小时前"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1326
+#: lib/util.php:1323
 msgid "about a day ago"
 msgstr "约1天前"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1330
+#: lib/util.php:1327
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
 msgstr[0] "约%d天前"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1333
+#: lib/util.php:1330
 msgid "about a month ago"
 msgstr "约1个月前"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1337
+#: lib/util.php:1334
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
 msgstr[0] "约%d个月前"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1340
+#: lib/util.php:1337
 msgid "about a year ago"
 msgstr "约1年前"
 
@@ -9573,3 +9449,61 @@ msgstr "不合法的XML, 缺少XRD根"
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr "从文件'%s'获取备份。"
+
+#~ msgid "Block this user."
+#~ msgstr "屏蔽这个用户"
+
+#~ msgid "Delete this notice."
+#~ msgstr "删除此通知。"
+
+#~ msgid "Delete this user."
+#~ msgstr "删除此用户。"
+
+#~ msgid "Restore default designs."
+#~ msgstr "还原默认设计。"
+
+#~ msgid "Reset back to default."
+#~ msgstr "重置回默认值。"
+
+#~ msgid "Save design."
+#~ msgstr "保存设计。"
+
+#~ msgid "Disfavor favorite."
+#~ msgstr "不是赞成的最爱。"
+
+#~ msgid "\"%s\" not found."
+#~ msgstr "找不到\"%s\"。"
+
+#~ msgid "Notice %s not found."
+#~ msgstr "找不到 %s 的通知。"
+
+#~ msgid "Attachment %s not found."
+#~ msgstr "找不到 %s 的附件。"
+
+#~ msgid "\"%s\" not supported for oembed requests."
+#~ msgstr "\"%s\"不支持 oembed 的请求。"
+
+#~ msgid "Invalid tag: \"%s\"."
+#~ msgstr "无效的标记： %s。"
+
+#, fuzzy
+#~ msgid "%s updates from everyone."
+#~ msgstr "%s条来自所有人的消息！"
+
+#~ msgid "Password saved"
+#~ msgstr "密码已保存。"
+
+#~ msgid "Where you are, like \"City, State (or Region), Country\"."
+#~ msgstr "你在哪里，像\"城市、 国家（或地区）、国家\"。"
+
+#~ msgid "Subscribe to this user."
+#~ msgstr "订阅此用户。"
+
+#, fuzzy
+#~ msgid ""
+#~ "Listenee stream license \"%1$s\" is not compatible with site license \"%2"
+#~ "$s\"."
+#~ msgstr "Listenee stream 许可证“‘%1$s” 与本网站的许可证 “%2$s”不兼容。"
+
+#~ msgid "Not allowed to log in."
+#~ msgstr "不允许登录。"
diff --git a/plugins/Awesomeness/locale/pt/LC_MESSAGES/Awesomeness.po b/plugins/Awesomeness/locale/pt/LC_MESSAGES/Awesomeness.po
new file mode 100644
index 0000000000..6184d5212c
--- /dev/null
+++ b/plugins/Awesomeness/locale/pt/LC_MESSAGES/Awesomeness.po
@@ -0,0 +1,30 @@
+# Translation of StatusNet - Awesomeness to Portuguese (Português)
+# Exported from translatewiki.net
+#
+# Author: Waldir
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Awesomeness\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-03 15:58+0000\n"
+"PO-Revision-Date: 2011-03-03 16:01:39+0000\n"
+"Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-02-14 17:19:12+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: pt\n"
+"X-Message-Group: #out-statusnet-plugin-awesomeness\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: AwesomenessPlugin.php:56
+msgid ""
+"The Awesomeness plugin adds additional awesomeness to a StatusNet "
+"installation."
+msgstr ""
+"O plugin de Espectacularidade adiciona espectacularidade adicional a uma "
+"instalação de StatusNet."
diff --git a/plugins/EmailSummary/locale/pt/LC_MESSAGES/EmailSummary.po b/plugins/EmailSummary/locale/pt/LC_MESSAGES/EmailSummary.po
new file mode 100644
index 0000000000..734d48d3f5
--- /dev/null
+++ b/plugins/EmailSummary/locale/pt/LC_MESSAGES/EmailSummary.po
@@ -0,0 +1,26 @@
+# Translation of StatusNet - EmailSummary to Portuguese (Português)
+# Exported from translatewiki.net
+#
+# Author: Waldir
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - EmailSummary\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-03 15:58+0000\n"
+"PO-Revision-Date: 2011-03-03 16:01:52+0000\n"
+"Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-02-17 11:29:53+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: pt\n"
+"X-Message-Group: #out-statusnet-plugin-emailsummary\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: EmailSummaryPlugin.php:120
+msgid "Send an email summary of the inbox to users."
+msgstr "Enviar por email um resumo da caixa de entrada aos utilizadores."
diff --git a/plugins/FacebookBridge/locale/FacebookBridge.pot b/plugins/FacebookBridge/locale/FacebookBridge.pot
index a518adb42b..0bedae8cd3 100644
--- a/plugins/FacebookBridge/locale/FacebookBridge.pot
+++ b/plugins/FacebookBridge/locale/FacebookBridge.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-14 16:01+0000\n"
+"POT-Creation-Date: 2011-03-03 15:58+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,37 +18,37 @@ msgstr ""
 
 #. TRANS: Menu item.
 #. TRANS: Menu item tab.
-#: FacebookBridgePlugin.php:224 FacebookBridgePlugin.php:263
-#: FacebookBridgePlugin.php:304
+#: FacebookBridgePlugin.php:218 FacebookBridgePlugin.php:257
+#: FacebookBridgePlugin.php:298
 msgctxt "MENU"
 msgid "Facebook"
 msgstr ""
 
 #. TRANS: Tooltip for menu item "Facebook".
-#: FacebookBridgePlugin.php:226
+#: FacebookBridgePlugin.php:220
 msgid "Login or register using Facebook"
 msgstr ""
 
 #. TRANS: Tooltip for menu item "Facebook".
-#: FacebookBridgePlugin.php:265
+#: FacebookBridgePlugin.php:259
 msgid "Facebook integration configuration"
 msgstr ""
 
 #. TRANS: Tooltip for menu item "Facebook".
 #. TRANS: Page title for Facebook settings.
-#: FacebookBridgePlugin.php:306 actions/facebooksettings.php:105
+#: FacebookBridgePlugin.php:300 actions/facebooksettings.php:105
 msgid "Facebook settings"
 msgstr ""
 
-#: FacebookBridgePlugin.php:570
+#: FacebookBridgePlugin.php:564
 msgid "A plugin for integrating StatusNet with Facebook."
 msgstr ""
 
-#: lib/facebookclient.php:760
+#: lib/facebookclient.php:786
 msgid "Your Facebook connection has been removed"
 msgstr ""
 
-#: lib/facebookclient.php:819
+#: lib/facebookclient.php:845
 #, php-format
 msgid "Contact the %s administrator to retrieve your account"
 msgstr ""
diff --git a/plugins/FacebookBridge/locale/br/LC_MESSAGES/FacebookBridge.po b/plugins/FacebookBridge/locale/br/LC_MESSAGES/FacebookBridge.po
index c0b564b12f..0cc05ab9a8 100644
--- a/plugins/FacebookBridge/locale/br/LC_MESSAGES/FacebookBridge.po
+++ b/plugins/FacebookBridge/locale/br/LC_MESSAGES/FacebookBridge.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - FacebookBridge\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-14 16:01+0000\n"
-"PO-Revision-Date: 2011-02-14 16:07:52+0000\n"
+"POT-Creation-Date: 2011-03-03 15:58+0000\n"
+"PO-Revision-Date: 2011-03-03 16:01:56+0000\n"
 "Language-Team: Breton <http://translatewiki.net/wiki/Portal:br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:24:13+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r82114); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-02-25 23:44:49+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-facebookbridge\n"
@@ -23,37 +23,37 @@ msgstr ""
 
 #. TRANS: Menu item.
 #. TRANS: Menu item tab.
-#: FacebookBridgePlugin.php:224 FacebookBridgePlugin.php:263
-#: FacebookBridgePlugin.php:304
+#: FacebookBridgePlugin.php:218 FacebookBridgePlugin.php:257
+#: FacebookBridgePlugin.php:298
 msgctxt "MENU"
 msgid "Facebook"
 msgstr "Facebook"
 
 #. TRANS: Tooltip for menu item "Facebook".
-#: FacebookBridgePlugin.php:226
+#: FacebookBridgePlugin.php:220
 msgid "Login or register using Facebook"
 msgstr "Kevreañ pe en em enskrivañ dre Facebook"
 
 #. TRANS: Tooltip for menu item "Facebook".
-#: FacebookBridgePlugin.php:265
+#: FacebookBridgePlugin.php:259
 msgid "Facebook integration configuration"
 msgstr ""
 
 #. TRANS: Tooltip for menu item "Facebook".
 #. TRANS: Page title for Facebook settings.
-#: FacebookBridgePlugin.php:306 actions/facebooksettings.php:105
+#: FacebookBridgePlugin.php:300 actions/facebooksettings.php:105
 msgid "Facebook settings"
 msgstr "Arventennoù Facebook"
 
-#: FacebookBridgePlugin.php:570
+#: FacebookBridgePlugin.php:564
 msgid "A plugin for integrating StatusNet with Facebook."
 msgstr ""
 
-#: lib/facebookclient.php:760
+#: lib/facebookclient.php:786
 msgid "Your Facebook connection has been removed"
 msgstr ""
 
-#: lib/facebookclient.php:819
+#: lib/facebookclient.php:845
 #, php-format
 msgid "Contact the %s administrator to retrieve your account"
 msgstr ""
diff --git a/plugins/FacebookBridge/locale/ca/LC_MESSAGES/FacebookBridge.po b/plugins/FacebookBridge/locale/ca/LC_MESSAGES/FacebookBridge.po
index 6605725e98..9e20aae44a 100644
--- a/plugins/FacebookBridge/locale/ca/LC_MESSAGES/FacebookBridge.po
+++ b/plugins/FacebookBridge/locale/ca/LC_MESSAGES/FacebookBridge.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - FacebookBridge\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-14 16:01+0000\n"
-"PO-Revision-Date: 2011-02-14 16:07:53+0000\n"
+"POT-Creation-Date: 2011-03-03 15:58+0000\n"
+"PO-Revision-Date: 2011-03-03 16:01:56+0000\n"
 "Language-Team: Catalan <http://translatewiki.net/wiki/Portal:ca>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:24:13+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r82114); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-02-25 23:44:49+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ca\n"
 "X-Message-Group: #out-statusnet-plugin-facebookbridge\n"
@@ -23,37 +23,37 @@ msgstr ""
 
 #. TRANS: Menu item.
 #. TRANS: Menu item tab.
-#: FacebookBridgePlugin.php:224 FacebookBridgePlugin.php:263
-#: FacebookBridgePlugin.php:304
+#: FacebookBridgePlugin.php:218 FacebookBridgePlugin.php:257
+#: FacebookBridgePlugin.php:298
 msgctxt "MENU"
 msgid "Facebook"
 msgstr "Facebook"
 
 #. TRANS: Tooltip for menu item "Facebook".
-#: FacebookBridgePlugin.php:226
+#: FacebookBridgePlugin.php:220
 msgid "Login or register using Facebook"
 msgstr "Inicieu-hi una sessió o registreu-vos-hi des del Facebook"
 
 #. TRANS: Tooltip for menu item "Facebook".
-#: FacebookBridgePlugin.php:265
+#: FacebookBridgePlugin.php:259
 msgid "Facebook integration configuration"
 msgstr "Configuració de la integració del Facebook"
 
 #. TRANS: Tooltip for menu item "Facebook".
 #. TRANS: Page title for Facebook settings.
-#: FacebookBridgePlugin.php:306 actions/facebooksettings.php:105
+#: FacebookBridgePlugin.php:300 actions/facebooksettings.php:105
 msgid "Facebook settings"
 msgstr "Paràmetres del Facebook"
 
-#: FacebookBridgePlugin.php:570
+#: FacebookBridgePlugin.php:564
 msgid "A plugin for integrating StatusNet with Facebook."
 msgstr "Un connector per integrar l'StatusNet amb el Facebook"
 
-#: lib/facebookclient.php:760
+#: lib/facebookclient.php:786
 msgid "Your Facebook connection has been removed"
 msgstr "S'ha eliminat la connexió amb el Facebook"
 
-#: lib/facebookclient.php:819
+#: lib/facebookclient.php:845
 #, php-format
 msgid "Contact the %s administrator to retrieve your account"
 msgstr "Contacteu amb l'administrador de %s per recuperar el vostre compte"
diff --git a/plugins/FacebookBridge/locale/de/LC_MESSAGES/FacebookBridge.po b/plugins/FacebookBridge/locale/de/LC_MESSAGES/FacebookBridge.po
index add1e26513..c7aad4cac5 100644
--- a/plugins/FacebookBridge/locale/de/LC_MESSAGES/FacebookBridge.po
+++ b/plugins/FacebookBridge/locale/de/LC_MESSAGES/FacebookBridge.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - FacebookBridge\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-14 16:01+0000\n"
-"PO-Revision-Date: 2011-02-14 16:07:53+0000\n"
+"POT-Creation-Date: 2011-03-03 15:58+0000\n"
+"PO-Revision-Date: 2011-03-03 16:01:56+0000\n"
 "Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:24:13+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r82114); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-02-25 23:44:49+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-facebookbridge\n"
@@ -23,37 +23,37 @@ msgstr ""
 
 #. TRANS: Menu item.
 #. TRANS: Menu item tab.
-#: FacebookBridgePlugin.php:224 FacebookBridgePlugin.php:263
-#: FacebookBridgePlugin.php:304
+#: FacebookBridgePlugin.php:218 FacebookBridgePlugin.php:257
+#: FacebookBridgePlugin.php:298
 msgctxt "MENU"
 msgid "Facebook"
 msgstr "Facebook"
 
 #. TRANS: Tooltip for menu item "Facebook".
-#: FacebookBridgePlugin.php:226
+#: FacebookBridgePlugin.php:220
 msgid "Login or register using Facebook"
 msgstr "Über Facebook anmelden oder registrieren"
 
 #. TRANS: Tooltip for menu item "Facebook".
-#: FacebookBridgePlugin.php:265
+#: FacebookBridgePlugin.php:259
 msgid "Facebook integration configuration"
 msgstr "Konfiguration der Facebook-Integration"
 
 #. TRANS: Tooltip for menu item "Facebook".
 #. TRANS: Page title for Facebook settings.
-#: FacebookBridgePlugin.php:306 actions/facebooksettings.php:105
+#: FacebookBridgePlugin.php:300 actions/facebooksettings.php:105
 msgid "Facebook settings"
 msgstr "Facebook-Einstellungen"
 
-#: FacebookBridgePlugin.php:570
+#: FacebookBridgePlugin.php:564
 msgid "A plugin for integrating StatusNet with Facebook."
 msgstr "Ein Plugin zur Integration von StatusNet mit Facebook."
 
-#: lib/facebookclient.php:760
+#: lib/facebookclient.php:786
 msgid "Your Facebook connection has been removed"
 msgstr "Ihre Facebook-Verbindung wurde entfernt"
 
-#: lib/facebookclient.php:819
+#: lib/facebookclient.php:845
 #, php-format
 msgid "Contact the %s administrator to retrieve your account"
 msgstr "Kontaktiere den %s-Administrator um dein Konto zurück zu bekommen"
diff --git a/plugins/FacebookBridge/locale/ia/LC_MESSAGES/FacebookBridge.po b/plugins/FacebookBridge/locale/ia/LC_MESSAGES/FacebookBridge.po
index 7b47ff711f..f48c2e8667 100644
--- a/plugins/FacebookBridge/locale/ia/LC_MESSAGES/FacebookBridge.po
+++ b/plugins/FacebookBridge/locale/ia/LC_MESSAGES/FacebookBridge.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - FacebookBridge\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-14 16:01+0000\n"
-"PO-Revision-Date: 2011-02-14 16:07:53+0000\n"
+"POT-Creation-Date: 2011-03-03 15:58+0000\n"
+"PO-Revision-Date: 2011-03-03 16:01:56+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:24:13+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r82114); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-02-25 23:44:49+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-facebookbridge\n"
@@ -23,37 +23,37 @@ msgstr ""
 
 #. TRANS: Menu item.
 #. TRANS: Menu item tab.
-#: FacebookBridgePlugin.php:224 FacebookBridgePlugin.php:263
-#: FacebookBridgePlugin.php:304
+#: FacebookBridgePlugin.php:218 FacebookBridgePlugin.php:257
+#: FacebookBridgePlugin.php:298
 msgctxt "MENU"
 msgid "Facebook"
 msgstr "Facebook"
 
 #. TRANS: Tooltip for menu item "Facebook".
-#: FacebookBridgePlugin.php:226
+#: FacebookBridgePlugin.php:220
 msgid "Login or register using Facebook"
 msgstr "Aperir session o crear conto usante Facebook"
 
 #. TRANS: Tooltip for menu item "Facebook".
-#: FacebookBridgePlugin.php:265
+#: FacebookBridgePlugin.php:259
 msgid "Facebook integration configuration"
 msgstr "Configuration del integration de Facebook"
 
 #. TRANS: Tooltip for menu item "Facebook".
 #. TRANS: Page title for Facebook settings.
-#: FacebookBridgePlugin.php:306 actions/facebooksettings.php:105
+#: FacebookBridgePlugin.php:300 actions/facebooksettings.php:105
 msgid "Facebook settings"
 msgstr "Configuration de Facebook"
 
-#: FacebookBridgePlugin.php:570
+#: FacebookBridgePlugin.php:564
 msgid "A plugin for integrating StatusNet with Facebook."
 msgstr "Un plug-in pro integrar StatusNet con Facebook."
 
-#: lib/facebookclient.php:760
+#: lib/facebookclient.php:786
 msgid "Your Facebook connection has been removed"
 msgstr "Tu connexion a Facebook ha essite removite"
 
-#: lib/facebookclient.php:819
+#: lib/facebookclient.php:845
 #, php-format
 msgid "Contact the %s administrator to retrieve your account"
 msgstr "Contacta le administrator de %s pro recuperar tu conto"
diff --git a/plugins/FacebookBridge/locale/mk/LC_MESSAGES/FacebookBridge.po b/plugins/FacebookBridge/locale/mk/LC_MESSAGES/FacebookBridge.po
index 17f23e2bd8..5ac9ae5a2e 100644
--- a/plugins/FacebookBridge/locale/mk/LC_MESSAGES/FacebookBridge.po
+++ b/plugins/FacebookBridge/locale/mk/LC_MESSAGES/FacebookBridge.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - FacebookBridge\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-14 16:01+0000\n"
-"PO-Revision-Date: 2011-02-14 16:07:53+0000\n"
+"POT-Creation-Date: 2011-03-03 15:58+0000\n"
+"PO-Revision-Date: 2011-03-03 16:01:56+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:24:13+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r82114); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-02-25 23:44:49+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-facebookbridge\n"
@@ -23,37 +23,37 @@ msgstr ""
 
 #. TRANS: Menu item.
 #. TRANS: Menu item tab.
-#: FacebookBridgePlugin.php:224 FacebookBridgePlugin.php:263
-#: FacebookBridgePlugin.php:304
+#: FacebookBridgePlugin.php:218 FacebookBridgePlugin.php:257
+#: FacebookBridgePlugin.php:298
 msgctxt "MENU"
 msgid "Facebook"
 msgstr "Facebook"
 
 #. TRANS: Tooltip for menu item "Facebook".
-#: FacebookBridgePlugin.php:226
+#: FacebookBridgePlugin.php:220
 msgid "Login or register using Facebook"
 msgstr "Најава или регистрација со Facebook"
 
 #. TRANS: Tooltip for menu item "Facebook".
-#: FacebookBridgePlugin.php:265
+#: FacebookBridgePlugin.php:259
 msgid "Facebook integration configuration"
 msgstr "Поставки за обединување со Facebook"
 
 #. TRANS: Tooltip for menu item "Facebook".
 #. TRANS: Page title for Facebook settings.
-#: FacebookBridgePlugin.php:306 actions/facebooksettings.php:105
+#: FacebookBridgePlugin.php:300 actions/facebooksettings.php:105
 msgid "Facebook settings"
 msgstr "Поставки за Facebook"
 
-#: FacebookBridgePlugin.php:570
+#: FacebookBridgePlugin.php:564
 msgid "A plugin for integrating StatusNet with Facebook."
 msgstr "Приклучок за обединување на StatusNet со Facebook."
 
-#: lib/facebookclient.php:760
+#: lib/facebookclient.php:786
 msgid "Your Facebook connection has been removed"
 msgstr "Вашата врска со Facebook е отстранета"
 
-#: lib/facebookclient.php:819
+#: lib/facebookclient.php:845
 #, php-format
 msgid "Contact the %s administrator to retrieve your account"
 msgstr "Контактирајте го администраторот на %s за да си ја повртатите сметката"
diff --git a/plugins/FacebookBridge/locale/nl/LC_MESSAGES/FacebookBridge.po b/plugins/FacebookBridge/locale/nl/LC_MESSAGES/FacebookBridge.po
index 05f7977828..946a153984 100644
--- a/plugins/FacebookBridge/locale/nl/LC_MESSAGES/FacebookBridge.po
+++ b/plugins/FacebookBridge/locale/nl/LC_MESSAGES/FacebookBridge.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - FacebookBridge\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-14 16:01+0000\n"
-"PO-Revision-Date: 2011-02-14 16:07:53+0000\n"
+"POT-Creation-Date: 2011-03-03 15:58+0000\n"
+"PO-Revision-Date: 2011-03-03 16:01:56+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:24:13+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r82114); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-02-25 23:44:49+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-facebookbridge\n"
@@ -23,37 +23,37 @@ msgstr ""
 
 #. TRANS: Menu item.
 #. TRANS: Menu item tab.
-#: FacebookBridgePlugin.php:224 FacebookBridgePlugin.php:263
-#: FacebookBridgePlugin.php:304
+#: FacebookBridgePlugin.php:218 FacebookBridgePlugin.php:257
+#: FacebookBridgePlugin.php:298
 msgctxt "MENU"
 msgid "Facebook"
 msgstr "Facebook"
 
 #. TRANS: Tooltip for menu item "Facebook".
-#: FacebookBridgePlugin.php:226
+#: FacebookBridgePlugin.php:220
 msgid "Login or register using Facebook"
 msgstr "Aanmelden of registreren via Facebook"
 
 #. TRANS: Tooltip for menu item "Facebook".
-#: FacebookBridgePlugin.php:265
+#: FacebookBridgePlugin.php:259
 msgid "Facebook integration configuration"
 msgstr "Instellingen voor Facebookintegratie"
 
 #. TRANS: Tooltip for menu item "Facebook".
 #. TRANS: Page title for Facebook settings.
-#: FacebookBridgePlugin.php:306 actions/facebooksettings.php:105
+#: FacebookBridgePlugin.php:300 actions/facebooksettings.php:105
 msgid "Facebook settings"
 msgstr "Facebookinstellingen"
 
-#: FacebookBridgePlugin.php:570
+#: FacebookBridgePlugin.php:564
 msgid "A plugin for integrating StatusNet with Facebook."
 msgstr "Een plug-in voor het integreren van StatusNet met Facebook."
 
-#: lib/facebookclient.php:760
+#: lib/facebookclient.php:786
 msgid "Your Facebook connection has been removed"
 msgstr "Uw koppeling met Facebook is verwijderd"
 
-#: lib/facebookclient.php:819
+#: lib/facebookclient.php:845
 #, php-format
 msgid "Contact the %s administrator to retrieve your account"
 msgstr ""
diff --git a/plugins/FacebookBridge/locale/uk/LC_MESSAGES/FacebookBridge.po b/plugins/FacebookBridge/locale/uk/LC_MESSAGES/FacebookBridge.po
index 54dd7663e3..9b2c1c55f4 100644
--- a/plugins/FacebookBridge/locale/uk/LC_MESSAGES/FacebookBridge.po
+++ b/plugins/FacebookBridge/locale/uk/LC_MESSAGES/FacebookBridge.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - FacebookBridge\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-14 16:01+0000\n"
-"PO-Revision-Date: 2011-02-14 16:07:53+0000\n"
+"POT-Creation-Date: 2011-03-03 15:58+0000\n"
+"PO-Revision-Date: 2011-03-03 16:01:56+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:24:13+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r82114); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-02-25 23:44:49+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-facebookbridge\n"
@@ -24,37 +24,37 @@ msgstr ""
 
 #. TRANS: Menu item.
 #. TRANS: Menu item tab.
-#: FacebookBridgePlugin.php:224 FacebookBridgePlugin.php:263
-#: FacebookBridgePlugin.php:304
+#: FacebookBridgePlugin.php:218 FacebookBridgePlugin.php:257
+#: FacebookBridgePlugin.php:298
 msgctxt "MENU"
 msgid "Facebook"
 msgstr "Facebook"
 
 #. TRANS: Tooltip for menu item "Facebook".
-#: FacebookBridgePlugin.php:226
+#: FacebookBridgePlugin.php:220
 msgid "Login or register using Facebook"
 msgstr "Увійти або зареєструватись з Facebook"
 
 #. TRANS: Tooltip for menu item "Facebook".
-#: FacebookBridgePlugin.php:265
+#: FacebookBridgePlugin.php:259
 msgid "Facebook integration configuration"
 msgstr "Налаштування інтеграції з Facebook"
 
 #. TRANS: Tooltip for menu item "Facebook".
 #. TRANS: Page title for Facebook settings.
-#: FacebookBridgePlugin.php:306 actions/facebooksettings.php:105
+#: FacebookBridgePlugin.php:300 actions/facebooksettings.php:105
 msgid "Facebook settings"
 msgstr "Налаштування Facebook"
 
-#: FacebookBridgePlugin.php:570
+#: FacebookBridgePlugin.php:564
 msgid "A plugin for integrating StatusNet with Facebook."
 msgstr "Додаток для інтеграції StatusNet з Facebook."
 
-#: lib/facebookclient.php:760
+#: lib/facebookclient.php:786
 msgid "Your Facebook connection has been removed"
 msgstr "З’єднання з Facebook було видалено"
 
-#: lib/facebookclient.php:819
+#: lib/facebookclient.php:845
 #, php-format
 msgid "Contact the %s administrator to retrieve your account"
 msgstr "Зверніться до адміністратора %s, аби відновити свій обліковий запис"
diff --git a/plugins/FacebookBridge/locale/zh_CN/LC_MESSAGES/FacebookBridge.po b/plugins/FacebookBridge/locale/zh_CN/LC_MESSAGES/FacebookBridge.po
index 970db99b9c..8efc229088 100644
--- a/plugins/FacebookBridge/locale/zh_CN/LC_MESSAGES/FacebookBridge.po
+++ b/plugins/FacebookBridge/locale/zh_CN/LC_MESSAGES/FacebookBridge.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - FacebookBridge\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-24 10:32+0000\n"
-"PO-Revision-Date: 2011-02-24 10:38:46+0000\n"
+"POT-Creation-Date: 2011-03-03 15:58+0000\n"
+"PO-Revision-Date: 2011-03-03 16:01:57+0000\n"
 "Language-Team: Simplified Chinese <http://translatewiki.net/wiki/Portal:zh-"
 "hans>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-23 21:16:27+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r82712); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-02-25 23:44:49+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-facebookbridge\n"
@@ -24,37 +24,37 @@ msgstr ""
 
 #. TRANS: Menu item.
 #. TRANS: Menu item tab.
-#: FacebookBridgePlugin.php:224 FacebookBridgePlugin.php:263
-#: FacebookBridgePlugin.php:304
+#: FacebookBridgePlugin.php:218 FacebookBridgePlugin.php:257
+#: FacebookBridgePlugin.php:298
 msgctxt "MENU"
 msgid "Facebook"
 msgstr "Facebook"
 
 #. TRANS: Tooltip for menu item "Facebook".
-#: FacebookBridgePlugin.php:226
+#: FacebookBridgePlugin.php:220
 msgid "Login or register using Facebook"
 msgstr "登入或使用 Facebook 的注册"
 
 #. TRANS: Tooltip for menu item "Facebook".
-#: FacebookBridgePlugin.php:265
+#: FacebookBridgePlugin.php:259
 msgid "Facebook integration configuration"
 msgstr "Facebook 整合配置"
 
 #. TRANS: Tooltip for menu item "Facebook".
 #. TRANS: Page title for Facebook settings.
-#: FacebookBridgePlugin.php:306 actions/facebooksettings.php:105
+#: FacebookBridgePlugin.php:300 actions/facebooksettings.php:105
 msgid "Facebook settings"
 msgstr "Facebook 的设置"
 
-#: FacebookBridgePlugin.php:570
+#: FacebookBridgePlugin.php:564
 msgid "A plugin for integrating StatusNet with Facebook."
 msgstr "StatusNet 与结合 Facebook 的插件。"
 
-#: lib/facebookclient.php:760
+#: lib/facebookclient.php:786
 msgid "Your Facebook connection has been removed"
 msgstr "Facebook 的连接已被删除"
 
-#: lib/facebookclient.php:819
+#: lib/facebookclient.php:845
 #, php-format
 msgid "Contact the %s administrator to retrieve your account"
 msgstr "与 %s 管理员联系，以检索您的帐户"
diff --git a/plugins/FollowEveryone/locale/pt/LC_MESSAGES/FollowEveryone.po b/plugins/FollowEveryone/locale/pt/LC_MESSAGES/FollowEveryone.po
new file mode 100644
index 0000000000..75069b07bf
--- /dev/null
+++ b/plugins/FollowEveryone/locale/pt/LC_MESSAGES/FollowEveryone.po
@@ -0,0 +1,28 @@
+# Translation of StatusNet - FollowEveryone to Portuguese (Português)
+# Exported from translatewiki.net
+#
+# Author: Waldir
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - FollowEveryone\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-03 15:58+0000\n"
+"PO-Revision-Date: 2011-03-03 16:01:58+0000\n"
+"Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-01-29 22:24:16+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: pt\n"
+"X-Message-Group: #out-statusnet-plugin-followeveryone\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: FollowEveryonePlugin.php:203
+msgid "New users follow everyone at registration and are followed in return."
+msgstr ""
+"Novos utilizadores seguem toda a gente no momento do registo e são seguidos "
+"em troca."
diff --git a/plugins/Imap/locale/zh_CN/LC_MESSAGES/Imap.po b/plugins/Imap/locale/zh_CN/LC_MESSAGES/Imap.po
index 78dee0eed8..fdd1a2d316 100644
--- a/plugins/Imap/locale/zh_CN/LC_MESSAGES/Imap.po
+++ b/plugins/Imap/locale/zh_CN/LC_MESSAGES/Imap.po
@@ -1,6 +1,7 @@
 # Translation of StatusNet - Imap to Simplified Chinese (‪中文(简体)‬)
 # Exported from translatewiki.net
 #
+# Author: Hydra
 # Author: ZhengYiFeng
 # --
 # This file is distributed under the same license as the StatusNet package.
@@ -9,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Imap\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:56+0000\n"
+"POT-Creation-Date: 2011-03-03 15:58+0000\n"
+"PO-Revision-Date: 2011-03-03 16:02:04+0000\n"
 "Language-Team: Simplified Chinese <http://translatewiki.net/wiki/Portal:zh-"
 "hans>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:02+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-02-14 17:20:37+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-imap\n"
@@ -52,4 +53,4 @@ msgstr "必须设定一个抓取频率。"
 msgid ""
 "The IMAP plugin allows for StatusNet to check a POP or IMAP mailbox for "
 "incoming mail containing user posts."
-msgstr ""
+msgstr "IMAP 插件允许你检查传入邮件包含用户公告一 POP 或 IMAP 邮箱。"
diff --git a/plugins/InProcessCache/locale/pt/LC_MESSAGES/InProcessCache.po b/plugins/InProcessCache/locale/pt/LC_MESSAGES/InProcessCache.po
new file mode 100644
index 0000000000..04fa407dd0
--- /dev/null
+++ b/plugins/InProcessCache/locale/pt/LC_MESSAGES/InProcessCache.po
@@ -0,0 +1,26 @@
+# Translation of StatusNet - InProcessCache to Portuguese (Português)
+# Exported from translatewiki.net
+#
+# Author: Waldir
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - InProcessCache\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-03 15:58+0000\n"
+"PO-Revision-Date: 2011-03-03 16:02:05+0000\n"
+"Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-02-25 23:45:16+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: pt\n"
+"X-Message-Group: #out-statusnet-plugin-inprocesscache\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: InProcessCachePlugin.php:188
+msgid "Additional in-process cache for plugins."
+msgstr "Cache de processo adicional para plug-ins."
diff --git a/plugins/LdapAuthentication/locale/pt/LC_MESSAGES/LdapAuthentication.po b/plugins/LdapAuthentication/locale/pt/LC_MESSAGES/LdapAuthentication.po
new file mode 100644
index 0000000000..2ee261b700
--- /dev/null
+++ b/plugins/LdapAuthentication/locale/pt/LC_MESSAGES/LdapAuthentication.po
@@ -0,0 +1,30 @@
+# Translation of StatusNet - LdapAuthentication to Portuguese (Português)
+# Exported from translatewiki.net
+#
+# Author: Waldir
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - LdapAuthentication\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-03 15:58+0000\n"
+"PO-Revision-Date: 2011-03-03 16:02:06+0000\n"
+"Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-02-14 17:20:41+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: pt\n"
+"X-Message-Group: #out-statusnet-plugin-ldapauthentication\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: LdapAuthenticationPlugin.php:146
+msgid ""
+"The LDAP Authentication plugin allows for StatusNet to handle authentication "
+"through LDAP."
+msgstr ""
+"O plug-in de autenticação LDAP permite ao StatusNet efectuar autenticações "
+"através de LDAP."
diff --git a/plugins/LdapAuthorization/locale/pt/LC_MESSAGES/LdapAuthorization.po b/plugins/LdapAuthorization/locale/pt/LC_MESSAGES/LdapAuthorization.po
new file mode 100644
index 0000000000..414b497685
--- /dev/null
+++ b/plugins/LdapAuthorization/locale/pt/LC_MESSAGES/LdapAuthorization.po
@@ -0,0 +1,30 @@
+# Translation of StatusNet - LdapAuthorization to Portuguese (Português)
+# Exported from translatewiki.net
+#
+# Author: Waldir
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - LdapAuthorization\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-03 15:58+0000\n"
+"PO-Revision-Date: 2011-03-03 16:02:07+0000\n"
+"Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-02-14 17:20:41+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: pt\n"
+"X-Message-Group: #out-statusnet-plugin-ldapauthorization\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: LdapAuthorizationPlugin.php:124
+msgid ""
+"The LDAP Authorization plugin allows for StatusNet to handle authorization "
+"through LDAP."
+msgstr ""
+"O plug-in de autenticação LDAP permite ao StatusNet efetuar autorizações "
+"através de LDAP."
diff --git a/plugins/Mapstraction/locale/fur/LC_MESSAGES/Mapstraction.po b/plugins/Mapstraction/locale/fur/LC_MESSAGES/Mapstraction.po
new file mode 100644
index 0000000000..41f14b0f18
--- /dev/null
+++ b/plugins/Mapstraction/locale/fur/LC_MESSAGES/Mapstraction.po
@@ -0,0 +1,66 @@
+# Translation of StatusNet - Mapstraction to Friulian (Furlan)
+# Exported from translatewiki.net
+#
+# Author: Klenje
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Mapstraction\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-03 15:58+0000\n"
+"PO-Revision-Date: 2011-03-03 16:02:11+0000\n"
+"Language-Team: Friulian <http://translatewiki.net/wiki/Portal:fur>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-02-03 00:37:38+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: fur\n"
+"X-Message-Group: #out-statusnet-plugin-mapstraction\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: MapstractionPlugin.php:187
+msgid "Map"
+msgstr "Mape"
+
+#. TRANS: Clickable item to allow opening the map in full size.
+#: MapstractionPlugin.php:199
+msgid "Full size"
+msgstr "Dimension plene"
+
+#: MapstractionPlugin.php:211
+msgid ""
+"Show maps of users' and friends' notices with <a href=\"http://www."
+"mapstraction.com/\">Mapstraction</a>."
+msgstr ""
+"Mostre lis mapis dai avîs dai utents e dai amis cun <a href=\"http://www."
+"mapstraction.com/\">Mapstraction</a>."
+
+#: map.php:72
+msgid "No such user."
+msgstr "Utent no cjatât."
+
+#: map.php:79
+msgid "User has no profile."
+msgstr "L'utent nol à un profîl."
+
+#. TRANS: Page title.
+#. TRANS: %s is a user nickname.
+#: allmap.php:69
+#, php-format
+msgid "%s friends map"
+msgstr "Mape dai amîs di %s"
+
+#. TRANS: Page title.
+#. TRANS: %1$s is a user nickname, %2$d is a page number.
+#: allmap.php:75
+#, php-format
+msgid "%1$s friends map, page %2$d"
+msgstr "Mape dai amîs di %1$s, pagjine %2$d"
+
+#: usermap.php:68
+#, php-format
+msgid "%s map, page %d"
+msgstr "Mape di %s, pagjine %d"
diff --git a/plugins/MobileProfile/locale/MobileProfile.pot b/plugins/MobileProfile/locale/MobileProfile.pot
index dfd2daf7f0..9211418104 100644
--- a/plugins/MobileProfile/locale/MobileProfile.pot
+++ b/plugins/MobileProfile/locale/MobileProfile.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-14 16:01+0000\n"
+"POT-Creation-Date: 2011-03-03 15:58+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,58 +16,68 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: MobileProfilePlugin.php:193
+#: MobileProfilePlugin.php:196
 msgid "This page is not available in a media type you accept."
 msgstr ""
 
-#: MobileProfilePlugin.php:310
+#: MobileProfilePlugin.php:313
 msgid "Home"
 msgstr ""
 
-#: MobileProfilePlugin.php:312
+#: MobileProfilePlugin.php:315
 msgid "Account"
 msgstr ""
 
-#: MobileProfilePlugin.php:314
+#: MobileProfilePlugin.php:317
 msgid "Connect"
 msgstr ""
 
-#: MobileProfilePlugin.php:317
+#: MobileProfilePlugin.php:320
 msgid "Admin"
 msgstr ""
 
-#: MobileProfilePlugin.php:317
+#: MobileProfilePlugin.php:320
 msgid "Change site configuration"
 msgstr ""
 
-#: MobileProfilePlugin.php:321
+#: MobileProfilePlugin.php:324
 msgid "Invite"
 msgstr ""
 
-#: MobileProfilePlugin.php:324
+#: MobileProfilePlugin.php:327
 msgid "Logout"
 msgstr ""
 
-#: MobileProfilePlugin.php:328
+#: MobileProfilePlugin.php:331
 msgid "Register"
 msgstr ""
 
-#: MobileProfilePlugin.php:331
+#: MobileProfilePlugin.php:334
 msgid "Login"
 msgstr ""
 
-#: MobileProfilePlugin.php:335
+#: MobileProfilePlugin.php:338
 msgid "Search"
 msgstr ""
 
-#: MobileProfilePlugin.php:362
+#: MobileProfilePlugin.php:365
 msgid "Attach"
 msgstr ""
 
-#: MobileProfilePlugin.php:366
+#: MobileProfilePlugin.php:369
 msgid "Attach a file"
 msgstr ""
 
-#: MobileProfilePlugin.php:417
+#. TRANS: Link to switch site layout from mobile to desktop mode. Appears at very bottom of page.
+#: MobileProfilePlugin.php:410
+msgid "Switch to desktop site layout."
+msgstr ""
+
+#. TRANS: Link to switch site layout from desktop to mobile mode. Appears at very bottom of page.
+#: MobileProfilePlugin.php:414
+msgid "Switch to mobile site layout."
+msgstr ""
+
+#: MobileProfilePlugin.php:451
 msgid "XHTML MobileProfile output for supporting user agents."
 msgstr ""
diff --git a/plugins/MobileProfile/locale/bg/LC_MESSAGES/MobileProfile.po b/plugins/MobileProfile/locale/bg/LC_MESSAGES/MobileProfile.po
index 7fd5b6bffc..6d7f8bbcbf 100644
--- a/plugins/MobileProfile/locale/bg/LC_MESSAGES/MobileProfile.po
+++ b/plugins/MobileProfile/locale/bg/LC_MESSAGES/MobileProfile.po
@@ -9,70 +9,80 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - MobileProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-02 23:31+0000\n"
-"PO-Revision-Date: 2011-02-02 23:37:19+0000\n"
+"POT-Creation-Date: 2011-03-03 15:58+0000\n"
+"PO-Revision-Date: 2011-03-03 16:02:16+0000\n"
 "Language-Team: Bulgarian <http://translatewiki.net/wiki/Portal:bg>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:25:41+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81409); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-02-14 17:20:45+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: bg\n"
 "X-Message-Group: #out-statusnet-plugin-mobileprofile\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: MobileProfilePlugin.php:193
+#: MobileProfilePlugin.php:196
 msgid "This page is not available in a media type you accept."
 msgstr ""
 
-#: MobileProfilePlugin.php:310
+#: MobileProfilePlugin.php:313
 msgid "Home"
 msgstr ""
 
-#: MobileProfilePlugin.php:312
+#: MobileProfilePlugin.php:315
 msgid "Account"
 msgstr ""
 
-#: MobileProfilePlugin.php:314
+#: MobileProfilePlugin.php:317
 msgid "Connect"
 msgstr ""
 
-#: MobileProfilePlugin.php:317
+#: MobileProfilePlugin.php:320
 msgid "Admin"
 msgstr ""
 
-#: MobileProfilePlugin.php:317
+#: MobileProfilePlugin.php:320
 msgid "Change site configuration"
 msgstr ""
 
-#: MobileProfilePlugin.php:321
+#: MobileProfilePlugin.php:324
 msgid "Invite"
 msgstr ""
 
-#: MobileProfilePlugin.php:324
+#: MobileProfilePlugin.php:327
 msgid "Logout"
 msgstr "Излизане"
 
-#: MobileProfilePlugin.php:328
+#: MobileProfilePlugin.php:331
 msgid "Register"
 msgstr ""
 
-#: MobileProfilePlugin.php:331
+#: MobileProfilePlugin.php:334
 msgid "Login"
 msgstr "Влизане"
 
-#: MobileProfilePlugin.php:335
+#: MobileProfilePlugin.php:338
 msgid "Search"
 msgstr "Търсене"
 
-#: MobileProfilePlugin.php:362
+#: MobileProfilePlugin.php:365
 msgid "Attach"
 msgstr "Прикачване"
 
-#: MobileProfilePlugin.php:366
+#: MobileProfilePlugin.php:369
 msgid "Attach a file"
 msgstr "Прикачване на файл"
 
-#: MobileProfilePlugin.php:417
+#. TRANS: Link to switch site layout from mobile to desktop mode. Appears at very bottom of page.
+#: MobileProfilePlugin.php:410
+msgid "Switch to desktop site layout."
+msgstr ""
+
+#. TRANS: Link to switch site layout from desktop to mobile mode. Appears at very bottom of page.
+#: MobileProfilePlugin.php:414
+msgid "Switch to mobile site layout."
+msgstr ""
+
+#: MobileProfilePlugin.php:451
 msgid "XHTML MobileProfile output for supporting user agents."
 msgstr ""
diff --git a/plugins/MobileProfile/locale/br/LC_MESSAGES/MobileProfile.po b/plugins/MobileProfile/locale/br/LC_MESSAGES/MobileProfile.po
index d5fa690272..6a79108fee 100644
--- a/plugins/MobileProfile/locale/br/LC_MESSAGES/MobileProfile.po
+++ b/plugins/MobileProfile/locale/br/LC_MESSAGES/MobileProfile.po
@@ -9,70 +9,80 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - MobileProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-02 23:31+0000\n"
-"PO-Revision-Date: 2011-02-02 23:37:19+0000\n"
+"POT-Creation-Date: 2011-03-03 15:58+0000\n"
+"PO-Revision-Date: 2011-03-03 16:02:16+0000\n"
 "Language-Team: Breton <http://translatewiki.net/wiki/Portal:br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:25:41+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81409); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-02-14 17:20:45+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-mobileprofile\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: MobileProfilePlugin.php:193
+#: MobileProfilePlugin.php:196
 msgid "This page is not available in a media type you accept."
 msgstr ""
 
-#: MobileProfilePlugin.php:310
+#: MobileProfilePlugin.php:313
 msgid "Home"
 msgstr "Degemer"
 
-#: MobileProfilePlugin.php:312
+#: MobileProfilePlugin.php:315
 msgid "Account"
 msgstr "Kont"
 
-#: MobileProfilePlugin.php:314
+#: MobileProfilePlugin.php:317
 msgid "Connect"
 msgstr "Kevreañ"
 
-#: MobileProfilePlugin.php:317
+#: MobileProfilePlugin.php:320
 msgid "Admin"
 msgstr "Merour"
 
-#: MobileProfilePlugin.php:317
+#: MobileProfilePlugin.php:320
 msgid "Change site configuration"
 msgstr "Kemmañ arventennoù al lec'hienn"
 
-#: MobileProfilePlugin.php:321
+#: MobileProfilePlugin.php:324
 msgid "Invite"
 msgstr "Pediñ"
 
-#: MobileProfilePlugin.php:324
+#: MobileProfilePlugin.php:327
 msgid "Logout"
 msgstr "Digevreañ"
 
-#: MobileProfilePlugin.php:328
+#: MobileProfilePlugin.php:331
 msgid "Register"
 msgstr "Marilhañ"
 
-#: MobileProfilePlugin.php:331
+#: MobileProfilePlugin.php:334
 msgid "Login"
 msgstr "Kevreañ"
 
-#: MobileProfilePlugin.php:335
+#: MobileProfilePlugin.php:338
 msgid "Search"
 msgstr "Klask"
 
-#: MobileProfilePlugin.php:362
+#: MobileProfilePlugin.php:365
 msgid "Attach"
 msgstr "Stagañ"
 
-#: MobileProfilePlugin.php:366
+#: MobileProfilePlugin.php:369
 msgid "Attach a file"
 msgstr "Stagañ ur restr"
 
-#: MobileProfilePlugin.php:417
+#. TRANS: Link to switch site layout from mobile to desktop mode. Appears at very bottom of page.
+#: MobileProfilePlugin.php:410
+msgid "Switch to desktop site layout."
+msgstr ""
+
+#. TRANS: Link to switch site layout from desktop to mobile mode. Appears at very bottom of page.
+#: MobileProfilePlugin.php:414
+msgid "Switch to mobile site layout."
+msgstr ""
+
+#: MobileProfilePlugin.php:451
 msgid "XHTML MobileProfile output for supporting user agents."
 msgstr ""
diff --git a/plugins/MobileProfile/locale/ce/LC_MESSAGES/MobileProfile.po b/plugins/MobileProfile/locale/ce/LC_MESSAGES/MobileProfile.po
index 04fdea35fb..157e5f58e5 100644
--- a/plugins/MobileProfile/locale/ce/LC_MESSAGES/MobileProfile.po
+++ b/plugins/MobileProfile/locale/ce/LC_MESSAGES/MobileProfile.po
@@ -9,70 +9,80 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - MobileProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-02 23:31+0000\n"
-"PO-Revision-Date: 2011-02-02 23:37:19+0000\n"
+"POT-Creation-Date: 2011-03-03 15:58+0000\n"
+"PO-Revision-Date: 2011-03-03 16:02:16+0000\n"
 "Language-Team: Chechen <http://translatewiki.net/wiki/Portal:ce>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:25:41+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81409); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-02-14 17:20:45+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ce\n"
 "X-Message-Group: #out-statusnet-plugin-mobileprofile\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: MobileProfilePlugin.php:193
+#: MobileProfilePlugin.php:196
 msgid "This page is not available in a media type you accept."
 msgstr "Агlо схьа ца гойту ишта тайпнара чун, ахьа лелош йолу."
 
-#: MobileProfilePlugin.php:310
+#: MobileProfilePlugin.php:313
 msgid "Home"
 msgstr "Цlехьа"
 
-#: MobileProfilePlugin.php:312
+#: MobileProfilePlugin.php:315
 msgid "Account"
 msgstr "Дlавазвалар"
 
-#: MobileProfilePlugin.php:314
+#: MobileProfilePlugin.php:317
 msgid "Connect"
 msgstr "Зlе тасар"
 
-#: MobileProfilePlugin.php:317
+#: MobileProfilePlugin.php:320
 msgid "Admin"
 msgstr "Адаманкуьйгалхо"
 
-#: MobileProfilePlugin.php:317
+#: MobileProfilePlugin.php:320
 msgid "Change site configuration"
 msgstr ""
 
-#: MobileProfilePlugin.php:321
+#: MobileProfilePlugin.php:324
 msgid "Invite"
 msgstr "Схьакхайкха"
 
-#: MobileProfilePlugin.php:324
+#: MobileProfilePlugin.php:327
 msgid "Logout"
 msgstr "Ара валар"
 
-#: MobileProfilePlugin.php:328
+#: MobileProfilePlugin.php:331
 msgid "Register"
 msgstr "Дlавазвалар"
 
-#: MobileProfilePlugin.php:331
+#: MobileProfilePlugin.php:334
 msgid "Login"
 msgstr "Вовзийта хьой"
 
-#: MobileProfilePlugin.php:335
+#: MobileProfilePlugin.php:338
 msgid "Search"
 msgstr "Лаха"
 
-#: MobileProfilePlugin.php:362
+#: MobileProfilePlugin.php:365
 msgid "Attach"
 msgstr "Тlечlагlде"
 
-#: MobileProfilePlugin.php:366
+#: MobileProfilePlugin.php:369
 msgid "Attach a file"
 msgstr "Тlечlагlйе хlума"
 
-#: MobileProfilePlugin.php:417
+#. TRANS: Link to switch site layout from mobile to desktop mode. Appears at very bottom of page.
+#: MobileProfilePlugin.php:410
+msgid "Switch to desktop site layout."
+msgstr ""
+
+#. TRANS: Link to switch site layout from desktop to mobile mode. Appears at very bottom of page.
+#: MobileProfilePlugin.php:414
+msgid "Switch to mobile site layout."
+msgstr ""
+
+#: MobileProfilePlugin.php:451
 msgid "XHTML MobileProfile output for supporting user agents."
 msgstr "XHTML MobileProfile арайокху иза лелочу декъашхошна аттон."
diff --git a/plugins/MobileProfile/locale/de/LC_MESSAGES/MobileProfile.po b/plugins/MobileProfile/locale/de/LC_MESSAGES/MobileProfile.po
index 866307052b..511eb04f02 100644
--- a/plugins/MobileProfile/locale/de/LC_MESSAGES/MobileProfile.po
+++ b/plugins/MobileProfile/locale/de/LC_MESSAGES/MobileProfile.po
@@ -9,70 +9,80 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - MobileProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-14 16:01+0000\n"
-"PO-Revision-Date: 2011-02-14 16:08:51+0000\n"
+"POT-Creation-Date: 2011-03-03 15:58+0000\n"
+"PO-Revision-Date: 2011-03-03 16:02:16+0000\n"
 "Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-03 00:37:39+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r82114); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-02-14 17:20:45+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-mobileprofile\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: MobileProfilePlugin.php:193
+#: MobileProfilePlugin.php:196
 msgid "This page is not available in a media type you accept."
 msgstr "Diese Seite liegt in keinem von Ihnen akzeptierten Medientyp vor."
 
-#: MobileProfilePlugin.php:310
+#: MobileProfilePlugin.php:313
 msgid "Home"
 msgstr "Startseite"
 
-#: MobileProfilePlugin.php:312
+#: MobileProfilePlugin.php:315
 msgid "Account"
 msgstr "Konto"
 
-#: MobileProfilePlugin.php:314
+#: MobileProfilePlugin.php:317
 msgid "Connect"
 msgstr "Verbinden"
 
-#: MobileProfilePlugin.php:317
+#: MobileProfilePlugin.php:320
 msgid "Admin"
 msgstr "Administration"
 
-#: MobileProfilePlugin.php:317
+#: MobileProfilePlugin.php:320
 msgid "Change site configuration"
 msgstr "Seitenkonfiguration ändern"
 
-#: MobileProfilePlugin.php:321
+#: MobileProfilePlugin.php:324
 msgid "Invite"
 msgstr "Einladen"
 
-#: MobileProfilePlugin.php:324
+#: MobileProfilePlugin.php:327
 msgid "Logout"
 msgstr "Abmelden"
 
-#: MobileProfilePlugin.php:328
+#: MobileProfilePlugin.php:331
 msgid "Register"
 msgstr "Registrieren"
 
-#: MobileProfilePlugin.php:331
+#: MobileProfilePlugin.php:334
 msgid "Login"
 msgstr "Anmelden"
 
-#: MobileProfilePlugin.php:335
+#: MobileProfilePlugin.php:338
 msgid "Search"
 msgstr "Suche"
 
-#: MobileProfilePlugin.php:362
+#: MobileProfilePlugin.php:365
 msgid "Attach"
 msgstr "Anhängen"
 
-#: MobileProfilePlugin.php:366
+#: MobileProfilePlugin.php:369
 msgid "Attach a file"
 msgstr "Datei anhängen"
 
-#: MobileProfilePlugin.php:417
+#. TRANS: Link to switch site layout from mobile to desktop mode. Appears at very bottom of page.
+#: MobileProfilePlugin.php:410
+msgid "Switch to desktop site layout."
+msgstr ""
+
+#. TRANS: Link to switch site layout from desktop to mobile mode. Appears at very bottom of page.
+#: MobileProfilePlugin.php:414
+msgid "Switch to mobile site layout."
+msgstr ""
+
+#: MobileProfilePlugin.php:451
 msgid "XHTML MobileProfile output for supporting user agents."
 msgstr "XHTML-MobileProfile-Ausgabe zur Unterstützung von User-Agents."
diff --git a/plugins/MobileProfile/locale/fr/LC_MESSAGES/MobileProfile.po b/plugins/MobileProfile/locale/fr/LC_MESSAGES/MobileProfile.po
index c286fabe01..a48a0edbf7 100644
--- a/plugins/MobileProfile/locale/fr/LC_MESSAGES/MobileProfile.po
+++ b/plugins/MobileProfile/locale/fr/LC_MESSAGES/MobileProfile.po
@@ -10,71 +10,81 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - MobileProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-02 23:31+0000\n"
-"PO-Revision-Date: 2011-02-02 23:37:19+0000\n"
+"POT-Creation-Date: 2011-03-03 15:58+0000\n"
+"PO-Revision-Date: 2011-03-03 16:02:16+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:25:41+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81409); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-02-14 17:20:45+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-mobileprofile\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: MobileProfilePlugin.php:193
+#: MobileProfilePlugin.php:196
 msgid "This page is not available in a media type you accept."
 msgstr ""
 "Cette page n’est pas disponible dans un des types de média que vous acceptez."
 
-#: MobileProfilePlugin.php:310
+#: MobileProfilePlugin.php:313
 msgid "Home"
 msgstr "Accueil"
 
-#: MobileProfilePlugin.php:312
+#: MobileProfilePlugin.php:315
 msgid "Account"
 msgstr "Compte"
 
-#: MobileProfilePlugin.php:314
+#: MobileProfilePlugin.php:317
 msgid "Connect"
 msgstr "Connexion"
 
-#: MobileProfilePlugin.php:317
+#: MobileProfilePlugin.php:320
 msgid "Admin"
 msgstr "Administrateur"
 
-#: MobileProfilePlugin.php:317
+#: MobileProfilePlugin.php:320
 msgid "Change site configuration"
 msgstr "Modifier la configuration du site"
 
-#: MobileProfilePlugin.php:321
+#: MobileProfilePlugin.php:324
 msgid "Invite"
 msgstr "Inviter"
 
-#: MobileProfilePlugin.php:324
+#: MobileProfilePlugin.php:327
 msgid "Logout"
 msgstr "Déconnexion"
 
-#: MobileProfilePlugin.php:328
+#: MobileProfilePlugin.php:331
 msgid "Register"
 msgstr "S’inscrire"
 
-#: MobileProfilePlugin.php:331
+#: MobileProfilePlugin.php:334
 msgid "Login"
 msgstr "Connexion"
 
-#: MobileProfilePlugin.php:335
+#: MobileProfilePlugin.php:338
 msgid "Search"
 msgstr "Rechercher"
 
-#: MobileProfilePlugin.php:362
+#: MobileProfilePlugin.php:365
 msgid "Attach"
 msgstr "Joindre"
 
-#: MobileProfilePlugin.php:366
+#: MobileProfilePlugin.php:369
 msgid "Attach a file"
 msgstr "Joindre un fichier"
 
-#: MobileProfilePlugin.php:417
+#. TRANS: Link to switch site layout from mobile to desktop mode. Appears at very bottom of page.
+#: MobileProfilePlugin.php:410
+msgid "Switch to desktop site layout."
+msgstr ""
+
+#. TRANS: Link to switch site layout from desktop to mobile mode. Appears at very bottom of page.
+#: MobileProfilePlugin.php:414
+msgid "Switch to mobile site layout."
+msgstr ""
+
+#: MobileProfilePlugin.php:451
 msgid "XHTML MobileProfile output for supporting user agents."
 msgstr "Sortie XHTML MobileProfile pour les navigateurs compatibles."
diff --git a/plugins/MobileProfile/locale/gl/LC_MESSAGES/MobileProfile.po b/plugins/MobileProfile/locale/gl/LC_MESSAGES/MobileProfile.po
index f59acbbe14..a16052b790 100644
--- a/plugins/MobileProfile/locale/gl/LC_MESSAGES/MobileProfile.po
+++ b/plugins/MobileProfile/locale/gl/LC_MESSAGES/MobileProfile.po
@@ -9,70 +9,80 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - MobileProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-02 23:31+0000\n"
-"PO-Revision-Date: 2011-02-02 23:37:19+0000\n"
+"POT-Creation-Date: 2011-03-03 15:58+0000\n"
+"PO-Revision-Date: 2011-03-03 16:02:16+0000\n"
 "Language-Team: Galician <http://translatewiki.net/wiki/Portal:gl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:25:41+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81409); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-02-14 17:20:45+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: gl\n"
 "X-Message-Group: #out-statusnet-plugin-mobileprofile\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: MobileProfilePlugin.php:193
+#: MobileProfilePlugin.php:196
 msgid "This page is not available in a media type you accept."
 msgstr ""
 
-#: MobileProfilePlugin.php:310
+#: MobileProfilePlugin.php:313
 msgid "Home"
 msgstr "Inicio"
 
-#: MobileProfilePlugin.php:312
+#: MobileProfilePlugin.php:315
 msgid "Account"
 msgstr "Conta"
 
-#: MobileProfilePlugin.php:314
+#: MobileProfilePlugin.php:317
 msgid "Connect"
 msgstr "Conectar"
 
-#: MobileProfilePlugin.php:317
+#: MobileProfilePlugin.php:320
 msgid "Admin"
 msgstr "Administrador"
 
-#: MobileProfilePlugin.php:317
+#: MobileProfilePlugin.php:320
 msgid "Change site configuration"
 msgstr "Cambiar a configuración do sitio"
 
-#: MobileProfilePlugin.php:321
+#: MobileProfilePlugin.php:324
 msgid "Invite"
 msgstr "Convidar"
 
-#: MobileProfilePlugin.php:324
+#: MobileProfilePlugin.php:327
 msgid "Logout"
 msgstr "Saír"
 
-#: MobileProfilePlugin.php:328
+#: MobileProfilePlugin.php:331
 msgid "Register"
 msgstr "Rexistrarse"
 
-#: MobileProfilePlugin.php:331
+#: MobileProfilePlugin.php:334
 msgid "Login"
 msgstr "Rexistro"
 
-#: MobileProfilePlugin.php:335
+#: MobileProfilePlugin.php:338
 msgid "Search"
 msgstr "Procurar"
 
-#: MobileProfilePlugin.php:362
+#: MobileProfilePlugin.php:365
 msgid "Attach"
 msgstr "Anexar"
 
-#: MobileProfilePlugin.php:366
+#: MobileProfilePlugin.php:369
 msgid "Attach a file"
 msgstr "Anexar un ficheiro"
 
-#: MobileProfilePlugin.php:417
+#. TRANS: Link to switch site layout from mobile to desktop mode. Appears at very bottom of page.
+#: MobileProfilePlugin.php:410
+msgid "Switch to desktop site layout."
+msgstr ""
+
+#. TRANS: Link to switch site layout from desktop to mobile mode. Appears at very bottom of page.
+#: MobileProfilePlugin.php:414
+msgid "Switch to mobile site layout."
+msgstr ""
+
+#: MobileProfilePlugin.php:451
 msgid "XHTML MobileProfile output for supporting user agents."
 msgstr ""
diff --git a/plugins/MobileProfile/locale/ia/LC_MESSAGES/MobileProfile.po b/plugins/MobileProfile/locale/ia/LC_MESSAGES/MobileProfile.po
index 2ea0a3a45b..13e1f18e36 100644
--- a/plugins/MobileProfile/locale/ia/LC_MESSAGES/MobileProfile.po
+++ b/plugins/MobileProfile/locale/ia/LC_MESSAGES/MobileProfile.po
@@ -9,71 +9,81 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - MobileProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-02 23:31+0000\n"
-"PO-Revision-Date: 2011-02-02 23:37:19+0000\n"
+"POT-Creation-Date: 2011-03-03 15:58+0000\n"
+"PO-Revision-Date: 2011-03-03 16:02:16+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:25:41+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81409); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-02-14 17:20:45+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-mobileprofile\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: MobileProfilePlugin.php:193
+#: MobileProfilePlugin.php:196
 msgid "This page is not available in a media type you accept."
 msgstr "Iste pagina non es disponibile in un formato que tu accepta."
 
-#: MobileProfilePlugin.php:310
+#: MobileProfilePlugin.php:313
 msgid "Home"
 msgstr "Initio"
 
-#: MobileProfilePlugin.php:312
+#: MobileProfilePlugin.php:315
 msgid "Account"
 msgstr "Conto"
 
-#: MobileProfilePlugin.php:314
+#: MobileProfilePlugin.php:317
 msgid "Connect"
 msgstr "Connecter"
 
-#: MobileProfilePlugin.php:317
+#: MobileProfilePlugin.php:320
 msgid "Admin"
 msgstr "Admin"
 
-#: MobileProfilePlugin.php:317
+#: MobileProfilePlugin.php:320
 msgid "Change site configuration"
 msgstr "Modificar le configuration del sito"
 
-#: MobileProfilePlugin.php:321
+#: MobileProfilePlugin.php:324
 msgid "Invite"
 msgstr "Invitar"
 
-#: MobileProfilePlugin.php:324
+#: MobileProfilePlugin.php:327
 msgid "Logout"
 msgstr "Clauder session"
 
-#: MobileProfilePlugin.php:328
+#: MobileProfilePlugin.php:331
 msgid "Register"
 msgstr "Crear conto"
 
-#: MobileProfilePlugin.php:331
+#: MobileProfilePlugin.php:334
 msgid "Login"
 msgstr "Aperir session"
 
-#: MobileProfilePlugin.php:335
+#: MobileProfilePlugin.php:338
 msgid "Search"
 msgstr "Cercar"
 
-#: MobileProfilePlugin.php:362
+#: MobileProfilePlugin.php:365
 msgid "Attach"
 msgstr "Annexar"
 
-#: MobileProfilePlugin.php:366
+#: MobileProfilePlugin.php:369
 msgid "Attach a file"
 msgstr "Annexar un file"
 
-#: MobileProfilePlugin.php:417
+#. TRANS: Link to switch site layout from mobile to desktop mode. Appears at very bottom of page.
+#: MobileProfilePlugin.php:410
+msgid "Switch to desktop site layout."
+msgstr ""
+
+#. TRANS: Link to switch site layout from desktop to mobile mode. Appears at very bottom of page.
+#: MobileProfilePlugin.php:414
+msgid "Switch to mobile site layout."
+msgstr ""
+
+#: MobileProfilePlugin.php:451
 msgid "XHTML MobileProfile output for supporting user agents."
 msgstr ""
 "Production de XHTML MobileProfile pro le programmas de usator que lo "
diff --git a/plugins/MobileProfile/locale/mk/LC_MESSAGES/MobileProfile.po b/plugins/MobileProfile/locale/mk/LC_MESSAGES/MobileProfile.po
index 6e225a62ea..7e463a787c 100644
--- a/plugins/MobileProfile/locale/mk/LC_MESSAGES/MobileProfile.po
+++ b/plugins/MobileProfile/locale/mk/LC_MESSAGES/MobileProfile.po
@@ -9,70 +9,80 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - MobileProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-02 23:31+0000\n"
-"PO-Revision-Date: 2011-02-02 23:37:19+0000\n"
+"POT-Creation-Date: 2011-03-03 15:58+0000\n"
+"PO-Revision-Date: 2011-03-03 16:02:16+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:25:41+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81409); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-02-14 17:20:45+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-mobileprofile\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
 
-#: MobileProfilePlugin.php:193
+#: MobileProfilePlugin.php:196
 msgid "This page is not available in a media type you accept."
 msgstr "Страницава не е достапна во форматот кој Вие го прифаќате."
 
-#: MobileProfilePlugin.php:310
+#: MobileProfilePlugin.php:313
 msgid "Home"
 msgstr "Почетна"
 
-#: MobileProfilePlugin.php:312
+#: MobileProfilePlugin.php:315
 msgid "Account"
 msgstr "Сметка"
 
-#: MobileProfilePlugin.php:314
+#: MobileProfilePlugin.php:317
 msgid "Connect"
 msgstr "Поврзи се"
 
-#: MobileProfilePlugin.php:317
+#: MobileProfilePlugin.php:320
 msgid "Admin"
 msgstr "Администратор"
 
-#: MobileProfilePlugin.php:317
+#: MobileProfilePlugin.php:320
 msgid "Change site configuration"
 msgstr "Промена на поставките на мрежното место"
 
-#: MobileProfilePlugin.php:321
+#: MobileProfilePlugin.php:324
 msgid "Invite"
 msgstr "Покани"
 
-#: MobileProfilePlugin.php:324
+#: MobileProfilePlugin.php:327
 msgid "Logout"
 msgstr "Одјава"
 
-#: MobileProfilePlugin.php:328
+#: MobileProfilePlugin.php:331
 msgid "Register"
 msgstr "Регистрација"
 
-#: MobileProfilePlugin.php:331
+#: MobileProfilePlugin.php:334
 msgid "Login"
 msgstr "Најава"
 
-#: MobileProfilePlugin.php:335
+#: MobileProfilePlugin.php:338
 msgid "Search"
 msgstr "Пребарај"
 
-#: MobileProfilePlugin.php:362
+#: MobileProfilePlugin.php:365
 msgid "Attach"
 msgstr "Приложи"
 
-#: MobileProfilePlugin.php:366
+#: MobileProfilePlugin.php:369
 msgid "Attach a file"
 msgstr "Приложи податотека"
 
-#: MobileProfilePlugin.php:417
+#. TRANS: Link to switch site layout from mobile to desktop mode. Appears at very bottom of page.
+#: MobileProfilePlugin.php:410
+msgid "Switch to desktop site layout."
+msgstr ""
+
+#. TRANS: Link to switch site layout from desktop to mobile mode. Appears at very bottom of page.
+#: MobileProfilePlugin.php:414
+msgid "Switch to mobile site layout."
+msgstr ""
+
+#: MobileProfilePlugin.php:451
 msgid "XHTML MobileProfile output for supporting user agents."
 msgstr "Излез „XHTML MobileProfile“ за поддршка на кориснички агенти."
diff --git a/plugins/MobileProfile/locale/nb/LC_MESSAGES/MobileProfile.po b/plugins/MobileProfile/locale/nb/LC_MESSAGES/MobileProfile.po
index 498b2704e2..ea90e967ca 100644
--- a/plugins/MobileProfile/locale/nb/LC_MESSAGES/MobileProfile.po
+++ b/plugins/MobileProfile/locale/nb/LC_MESSAGES/MobileProfile.po
@@ -9,70 +9,80 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - MobileProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-02 23:31+0000\n"
-"PO-Revision-Date: 2011-02-02 23:37:19+0000\n"
+"POT-Creation-Date: 2011-03-03 15:58+0000\n"
+"PO-Revision-Date: 2011-03-03 16:02:16+0000\n"
 "Language-Team: Norwegian (bokmål)‬ <http://translatewiki.net/wiki/Portal:no>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:25:41+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81409); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-02-14 17:20:45+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: #out-statusnet-plugin-mobileprofile\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: MobileProfilePlugin.php:193
+#: MobileProfilePlugin.php:196
 msgid "This page is not available in a media type you accept."
 msgstr "Denne siden er ikke tilgjengelig i en mediatype du aksepterer."
 
-#: MobileProfilePlugin.php:310
+#: MobileProfilePlugin.php:313
 msgid "Home"
 msgstr "Hjem"
 
-#: MobileProfilePlugin.php:312
+#: MobileProfilePlugin.php:315
 msgid "Account"
 msgstr "Konto"
 
-#: MobileProfilePlugin.php:314
+#: MobileProfilePlugin.php:317
 msgid "Connect"
 msgstr "Koble til"
 
-#: MobileProfilePlugin.php:317
+#: MobileProfilePlugin.php:320
 msgid "Admin"
 msgstr "Admin"
 
-#: MobileProfilePlugin.php:317
+#: MobileProfilePlugin.php:320
 msgid "Change site configuration"
 msgstr "Endre nettstedskonfigurasjon"
 
-#: MobileProfilePlugin.php:321
+#: MobileProfilePlugin.php:324
 msgid "Invite"
 msgstr "Inviter"
 
-#: MobileProfilePlugin.php:324
+#: MobileProfilePlugin.php:327
 msgid "Logout"
 msgstr "Logg ut"
 
-#: MobileProfilePlugin.php:328
+#: MobileProfilePlugin.php:331
 msgid "Register"
 msgstr "Registrer"
 
-#: MobileProfilePlugin.php:331
+#: MobileProfilePlugin.php:334
 msgid "Login"
 msgstr "Logg inn"
 
-#: MobileProfilePlugin.php:335
+#: MobileProfilePlugin.php:338
 msgid "Search"
 msgstr "Søk"
 
-#: MobileProfilePlugin.php:362
+#: MobileProfilePlugin.php:365
 msgid "Attach"
 msgstr "Legg ved"
 
-#: MobileProfilePlugin.php:366
+#: MobileProfilePlugin.php:369
 msgid "Attach a file"
 msgstr "Legg ved en fil"
 
-#: MobileProfilePlugin.php:417
+#. TRANS: Link to switch site layout from mobile to desktop mode. Appears at very bottom of page.
+#: MobileProfilePlugin.php:410
+msgid "Switch to desktop site layout."
+msgstr ""
+
+#. TRANS: Link to switch site layout from desktop to mobile mode. Appears at very bottom of page.
+#: MobileProfilePlugin.php:414
+msgid "Switch to mobile site layout."
+msgstr ""
+
+#: MobileProfilePlugin.php:451
 msgid "XHTML MobileProfile output for supporting user agents."
 msgstr "XHTML MobileProfile-utdata for støttede brukeragenter."
diff --git a/plugins/MobileProfile/locale/nl/LC_MESSAGES/MobileProfile.po b/plugins/MobileProfile/locale/nl/LC_MESSAGES/MobileProfile.po
index ba2ec506a1..0887a8f63a 100644
--- a/plugins/MobileProfile/locale/nl/LC_MESSAGES/MobileProfile.po
+++ b/plugins/MobileProfile/locale/nl/LC_MESSAGES/MobileProfile.po
@@ -10,71 +10,81 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - MobileProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-02 23:31+0000\n"
-"PO-Revision-Date: 2011-02-02 23:37:19+0000\n"
+"POT-Creation-Date: 2011-03-03 15:58+0000\n"
+"PO-Revision-Date: 2011-03-03 16:02:16+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:25:41+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81409); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-02-14 17:20:45+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-mobileprofile\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: MobileProfilePlugin.php:193
+#: MobileProfilePlugin.php:196
 msgid "This page is not available in a media type you accept."
 msgstr "Deze pagina is niet beschikbaar in een mediumtype dat u accepteert."
 
-#: MobileProfilePlugin.php:310
+#: MobileProfilePlugin.php:313
 msgid "Home"
 msgstr "Hoofdmenu"
 
-#: MobileProfilePlugin.php:312
+#: MobileProfilePlugin.php:315
 msgid "Account"
 msgstr "Gebruiker"
 
-#: MobileProfilePlugin.php:314
+#: MobileProfilePlugin.php:317
 msgid "Connect"
 msgstr "Koppelen"
 
-#: MobileProfilePlugin.php:317
+#: MobileProfilePlugin.php:320
 msgid "Admin"
 msgstr "Beheer"
 
-#: MobileProfilePlugin.php:317
+#: MobileProfilePlugin.php:320
 msgid "Change site configuration"
 msgstr "Websiteinstellingen wijzigen"
 
-#: MobileProfilePlugin.php:321
+#: MobileProfilePlugin.php:324
 msgid "Invite"
 msgstr "Uitnodigen"
 
-#: MobileProfilePlugin.php:324
+#: MobileProfilePlugin.php:327
 msgid "Logout"
 msgstr "Afmelden"
 
-#: MobileProfilePlugin.php:328
+#: MobileProfilePlugin.php:331
 msgid "Register"
 msgstr "Registreren"
 
-#: MobileProfilePlugin.php:331
+#: MobileProfilePlugin.php:334
 msgid "Login"
 msgstr "Aanmelden"
 
-#: MobileProfilePlugin.php:335
+#: MobileProfilePlugin.php:338
 msgid "Search"
 msgstr "Zoeken"
 
-#: MobileProfilePlugin.php:362
+#: MobileProfilePlugin.php:365
 msgid "Attach"
 msgstr "Toevoegen"
 
-#: MobileProfilePlugin.php:366
+#: MobileProfilePlugin.php:369
 msgid "Attach a file"
 msgstr "Bestand toevoegen"
 
-#: MobileProfilePlugin.php:417
+#. TRANS: Link to switch site layout from mobile to desktop mode. Appears at very bottom of page.
+#: MobileProfilePlugin.php:410
+msgid "Switch to desktop site layout."
+msgstr ""
+
+#. TRANS: Link to switch site layout from desktop to mobile mode. Appears at very bottom of page.
+#: MobileProfilePlugin.php:414
+msgid "Switch to mobile site layout."
+msgstr ""
+
+#: MobileProfilePlugin.php:451
 msgid "XHTML MobileProfile output for supporting user agents."
 msgstr ""
 "Uitvoer in MobileProfile XHTML voor de gebruikersprogramma's die dat "
diff --git a/plugins/MobileProfile/locale/ps/LC_MESSAGES/MobileProfile.po b/plugins/MobileProfile/locale/ps/LC_MESSAGES/MobileProfile.po
index ef7e62fb29..6122ae2385 100644
--- a/plugins/MobileProfile/locale/ps/LC_MESSAGES/MobileProfile.po
+++ b/plugins/MobileProfile/locale/ps/LC_MESSAGES/MobileProfile.po
@@ -9,70 +9,80 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - MobileProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-14 16:01+0000\n"
-"PO-Revision-Date: 2011-02-14 16:08:51+0000\n"
+"POT-Creation-Date: 2011-03-03 15:58+0000\n"
+"PO-Revision-Date: 2011-03-03 16:02:16+0000\n"
 "Language-Team: Pashto <http://translatewiki.net/wiki/Portal:ps>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-03 00:37:39+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r82114); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-02-14 17:20:45+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ps\n"
 "X-Message-Group: #out-statusnet-plugin-mobileprofile\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: MobileProfilePlugin.php:193
+#: MobileProfilePlugin.php:196
 msgid "This page is not available in a media type you accept."
 msgstr ""
 
-#: MobileProfilePlugin.php:310
+#: MobileProfilePlugin.php:313
 msgid "Home"
 msgstr "کور"
 
-#: MobileProfilePlugin.php:312
+#: MobileProfilePlugin.php:315
 msgid "Account"
 msgstr "ګڼون"
 
-#: MobileProfilePlugin.php:314
+#: MobileProfilePlugin.php:317
 msgid "Connect"
 msgstr ""
 
-#: MobileProfilePlugin.php:317
+#: MobileProfilePlugin.php:320
 msgid "Admin"
 msgstr "پازوال"
 
-#: MobileProfilePlugin.php:317
+#: MobileProfilePlugin.php:320
 msgid "Change site configuration"
 msgstr ""
 
-#: MobileProfilePlugin.php:321
+#: MobileProfilePlugin.php:324
 msgid "Invite"
 msgstr ""
 
-#: MobileProfilePlugin.php:324
+#: MobileProfilePlugin.php:327
 msgid "Logout"
 msgstr "وتل"
 
-#: MobileProfilePlugin.php:328
+#: MobileProfilePlugin.php:331
 msgid "Register"
 msgstr "نومليکل"
 
-#: MobileProfilePlugin.php:331
+#: MobileProfilePlugin.php:334
 msgid "Login"
 msgstr "ننوتل"
 
-#: MobileProfilePlugin.php:335
+#: MobileProfilePlugin.php:338
 msgid "Search"
 msgstr "پلټل"
 
-#: MobileProfilePlugin.php:362
+#: MobileProfilePlugin.php:365
 msgid "Attach"
 msgstr ""
 
-#: MobileProfilePlugin.php:366
+#: MobileProfilePlugin.php:369
 msgid "Attach a file"
 msgstr ""
 
-#: MobileProfilePlugin.php:417
+#. TRANS: Link to switch site layout from mobile to desktop mode. Appears at very bottom of page.
+#: MobileProfilePlugin.php:410
+msgid "Switch to desktop site layout."
+msgstr ""
+
+#. TRANS: Link to switch site layout from desktop to mobile mode. Appears at very bottom of page.
+#: MobileProfilePlugin.php:414
+msgid "Switch to mobile site layout."
+msgstr ""
+
+#: MobileProfilePlugin.php:451
 msgid "XHTML MobileProfile output for supporting user agents."
 msgstr ""
diff --git a/plugins/MobileProfile/locale/ru/LC_MESSAGES/MobileProfile.po b/plugins/MobileProfile/locale/ru/LC_MESSAGES/MobileProfile.po
index a61f14ad63..f6c5dd2257 100644
--- a/plugins/MobileProfile/locale/ru/LC_MESSAGES/MobileProfile.po
+++ b/plugins/MobileProfile/locale/ru/LC_MESSAGES/MobileProfile.po
@@ -10,71 +10,81 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - MobileProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-02 23:31+0000\n"
-"PO-Revision-Date: 2011-02-02 23:37:19+0000\n"
+"POT-Creation-Date: 2011-03-03 15:58+0000\n"
+"PO-Revision-Date: 2011-03-03 16:02:16+0000\n"
 "Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:25:41+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81409); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-02-14 17:20:45+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-mobileprofile\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: MobileProfilePlugin.php:193
+#: MobileProfilePlugin.php:196
 msgid "This page is not available in a media type you accept."
 msgstr "Страница недоступна для того типа, который вы задействовали."
 
-#: MobileProfilePlugin.php:310
+#: MobileProfilePlugin.php:313
 msgid "Home"
 msgstr "Домой"
 
-#: MobileProfilePlugin.php:312
+#: MobileProfilePlugin.php:315
 msgid "Account"
 msgstr "Аккаунт"
 
-#: MobileProfilePlugin.php:314
+#: MobileProfilePlugin.php:317
 msgid "Connect"
 msgstr "Подключиться"
 
-#: MobileProfilePlugin.php:317
+#: MobileProfilePlugin.php:320
 msgid "Admin"
 msgstr "Администратор"
 
-#: MobileProfilePlugin.php:317
+#: MobileProfilePlugin.php:320
 msgid "Change site configuration"
 msgstr "Изменить конфигурацию сайта"
 
-#: MobileProfilePlugin.php:321
+#: MobileProfilePlugin.php:324
 msgid "Invite"
 msgstr "Пригласить"
 
-#: MobileProfilePlugin.php:324
+#: MobileProfilePlugin.php:327
 msgid "Logout"
 msgstr "Выйти"
 
-#: MobileProfilePlugin.php:328
+#: MobileProfilePlugin.php:331
 msgid "Register"
 msgstr "Регистрация"
 
-#: MobileProfilePlugin.php:331
+#: MobileProfilePlugin.php:334
 msgid "Login"
 msgstr "Представиться"
 
-#: MobileProfilePlugin.php:335
+#: MobileProfilePlugin.php:338
 msgid "Search"
 msgstr "Поиск"
 
-#: MobileProfilePlugin.php:362
+#: MobileProfilePlugin.php:365
 msgid "Attach"
 msgstr "Прикрепить"
 
-#: MobileProfilePlugin.php:366
+#: MobileProfilePlugin.php:369
 msgid "Attach a file"
 msgstr "Прикрепить файл"
 
-#: MobileProfilePlugin.php:417
+#. TRANS: Link to switch site layout from mobile to desktop mode. Appears at very bottom of page.
+#: MobileProfilePlugin.php:410
+msgid "Switch to desktop site layout."
+msgstr ""
+
+#. TRANS: Link to switch site layout from desktop to mobile mode. Appears at very bottom of page.
+#: MobileProfilePlugin.php:414
+msgid "Switch to mobile site layout."
+msgstr ""
+
+#: MobileProfilePlugin.php:451
 msgid "XHTML MobileProfile output for supporting user agents."
 msgstr "XHTML MobileProfile вывод для поддерживаемых пользовательских агентов."
diff --git a/plugins/MobileProfile/locale/ta/LC_MESSAGES/MobileProfile.po b/plugins/MobileProfile/locale/ta/LC_MESSAGES/MobileProfile.po
index 0a9e22a493..a19892a8d9 100644
--- a/plugins/MobileProfile/locale/ta/LC_MESSAGES/MobileProfile.po
+++ b/plugins/MobileProfile/locale/ta/LC_MESSAGES/MobileProfile.po
@@ -9,70 +9,80 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - MobileProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-02 23:31+0000\n"
-"PO-Revision-Date: 2011-02-02 23:37:20+0000\n"
+"POT-Creation-Date: 2011-03-03 15:58+0000\n"
+"PO-Revision-Date: 2011-03-03 16:02:16+0000\n"
 "Language-Team: Tamil <http://translatewiki.net/wiki/Portal:ta>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:25:41+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81409); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-02-14 17:20:45+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ta\n"
 "X-Message-Group: #out-statusnet-plugin-mobileprofile\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: MobileProfilePlugin.php:193
+#: MobileProfilePlugin.php:196
 msgid "This page is not available in a media type you accept."
 msgstr ""
 
-#: MobileProfilePlugin.php:310
+#: MobileProfilePlugin.php:313
 msgid "Home"
 msgstr ""
 
-#: MobileProfilePlugin.php:312
+#: MobileProfilePlugin.php:315
 msgid "Account"
 msgstr "கணக்கு"
 
-#: MobileProfilePlugin.php:314
+#: MobileProfilePlugin.php:317
 msgid "Connect"
 msgstr "இணை"
 
-#: MobileProfilePlugin.php:317
+#: MobileProfilePlugin.php:320
 msgid "Admin"
 msgstr ""
 
-#: MobileProfilePlugin.php:317
+#: MobileProfilePlugin.php:320
 msgid "Change site configuration"
 msgstr ""
 
-#: MobileProfilePlugin.php:321
+#: MobileProfilePlugin.php:324
 msgid "Invite"
 msgstr ""
 
-#: MobileProfilePlugin.php:324
+#: MobileProfilePlugin.php:327
 msgid "Logout"
 msgstr "விடுபதிகை"
 
-#: MobileProfilePlugin.php:328
+#: MobileProfilePlugin.php:331
 msgid "Register"
 msgstr "பதிவு செய்"
 
-#: MobileProfilePlugin.php:331
+#: MobileProfilePlugin.php:334
 msgid "Login"
 msgstr "புகுபதிகை"
 
-#: MobileProfilePlugin.php:335
+#: MobileProfilePlugin.php:338
 msgid "Search"
 msgstr "தேடுக"
 
-#: MobileProfilePlugin.php:362
+#: MobileProfilePlugin.php:365
 msgid "Attach"
 msgstr "இணை"
 
-#: MobileProfilePlugin.php:366
+#: MobileProfilePlugin.php:369
 msgid "Attach a file"
 msgstr "ஒரு கோப்பை இணைக்கவும்"
 
-#: MobileProfilePlugin.php:417
+#. TRANS: Link to switch site layout from mobile to desktop mode. Appears at very bottom of page.
+#: MobileProfilePlugin.php:410
+msgid "Switch to desktop site layout."
+msgstr ""
+
+#. TRANS: Link to switch site layout from desktop to mobile mode. Appears at very bottom of page.
+#: MobileProfilePlugin.php:414
+msgid "Switch to mobile site layout."
+msgstr ""
+
+#: MobileProfilePlugin.php:451
 msgid "XHTML MobileProfile output for supporting user agents."
 msgstr ""
diff --git a/plugins/MobileProfile/locale/te/LC_MESSAGES/MobileProfile.po b/plugins/MobileProfile/locale/te/LC_MESSAGES/MobileProfile.po
index 7c6c643d89..c2b871c7b2 100644
--- a/plugins/MobileProfile/locale/te/LC_MESSAGES/MobileProfile.po
+++ b/plugins/MobileProfile/locale/te/LC_MESSAGES/MobileProfile.po
@@ -9,70 +9,80 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - MobileProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-02 23:31+0000\n"
-"PO-Revision-Date: 2011-02-02 23:37:20+0000\n"
+"POT-Creation-Date: 2011-03-03 15:58+0000\n"
+"PO-Revision-Date: 2011-03-03 16:02:17+0000\n"
 "Language-Team: Telugu <http://translatewiki.net/wiki/Portal:te>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:25:41+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81409); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-02-14 17:20:45+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: te\n"
 "X-Message-Group: #out-statusnet-plugin-mobileprofile\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: MobileProfilePlugin.php:193
+#: MobileProfilePlugin.php:196
 msgid "This page is not available in a media type you accept."
 msgstr ""
 
-#: MobileProfilePlugin.php:310
+#: MobileProfilePlugin.php:313
 msgid "Home"
 msgstr "ముంగిలి"
 
-#: MobileProfilePlugin.php:312
+#: MobileProfilePlugin.php:315
 msgid "Account"
 msgstr "ఖాతా"
 
-#: MobileProfilePlugin.php:314
+#: MobileProfilePlugin.php:317
 msgid "Connect"
 msgstr ""
 
-#: MobileProfilePlugin.php:317
+#: MobileProfilePlugin.php:320
 msgid "Admin"
 msgstr ""
 
-#: MobileProfilePlugin.php:317
+#: MobileProfilePlugin.php:320
 msgid "Change site configuration"
 msgstr ""
 
-#: MobileProfilePlugin.php:321
+#: MobileProfilePlugin.php:324
 msgid "Invite"
 msgstr "ఆహ్వానించు"
 
-#: MobileProfilePlugin.php:324
+#: MobileProfilePlugin.php:327
 msgid "Logout"
 msgstr "నిష్క్రమించండి"
 
-#: MobileProfilePlugin.php:328
+#: MobileProfilePlugin.php:331
 msgid "Register"
 msgstr "నమోదవ్వండి"
 
-#: MobileProfilePlugin.php:331
+#: MobileProfilePlugin.php:334
 msgid "Login"
 msgstr "ప్రవేశించండి"
 
-#: MobileProfilePlugin.php:335
+#: MobileProfilePlugin.php:338
 msgid "Search"
 msgstr "వెతుకు"
 
-#: MobileProfilePlugin.php:362
+#: MobileProfilePlugin.php:365
 msgid "Attach"
 msgstr ""
 
-#: MobileProfilePlugin.php:366
+#: MobileProfilePlugin.php:369
 msgid "Attach a file"
 msgstr ""
 
-#: MobileProfilePlugin.php:417
+#. TRANS: Link to switch site layout from mobile to desktop mode. Appears at very bottom of page.
+#: MobileProfilePlugin.php:410
+msgid "Switch to desktop site layout."
+msgstr ""
+
+#. TRANS: Link to switch site layout from desktop to mobile mode. Appears at very bottom of page.
+#: MobileProfilePlugin.php:414
+msgid "Switch to mobile site layout."
+msgstr ""
+
+#: MobileProfilePlugin.php:451
 msgid "XHTML MobileProfile output for supporting user agents."
 msgstr ""
diff --git a/plugins/MobileProfile/locale/tl/LC_MESSAGES/MobileProfile.po b/plugins/MobileProfile/locale/tl/LC_MESSAGES/MobileProfile.po
index 400bed9a55..1c7ab8af4f 100644
--- a/plugins/MobileProfile/locale/tl/LC_MESSAGES/MobileProfile.po
+++ b/plugins/MobileProfile/locale/tl/LC_MESSAGES/MobileProfile.po
@@ -9,71 +9,81 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - MobileProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-02 23:31+0000\n"
-"PO-Revision-Date: 2011-02-02 23:37:20+0000\n"
+"POT-Creation-Date: 2011-03-03 15:58+0000\n"
+"PO-Revision-Date: 2011-03-03 16:02:17+0000\n"
 "Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:25:41+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81409); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-02-14 17:20:45+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-mobileprofile\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: MobileProfilePlugin.php:193
+#: MobileProfilePlugin.php:196
 msgid "This page is not available in a media type you accept."
 msgstr "Ang pahinang ito ay hindi makukuha sa uri ng midya na tinanggap mo."
 
-#: MobileProfilePlugin.php:310
+#: MobileProfilePlugin.php:313
 msgid "Home"
 msgstr "Tahanan"
 
-#: MobileProfilePlugin.php:312
+#: MobileProfilePlugin.php:315
 msgid "Account"
 msgstr "Akawnt"
 
-#: MobileProfilePlugin.php:314
+#: MobileProfilePlugin.php:317
 msgid "Connect"
 msgstr "Umugnay"
 
-#: MobileProfilePlugin.php:317
+#: MobileProfilePlugin.php:320
 msgid "Admin"
 msgstr "Tagapangasiwa"
 
-#: MobileProfilePlugin.php:317
+#: MobileProfilePlugin.php:320
 msgid "Change site configuration"
 msgstr "Baguhin ang pagkakaayos ng sityo"
 
-#: MobileProfilePlugin.php:321
+#: MobileProfilePlugin.php:324
 msgid "Invite"
 msgstr "Anyayahan"
 
-#: MobileProfilePlugin.php:324
+#: MobileProfilePlugin.php:327
 msgid "Logout"
 msgstr "Umalis sa pagkakalagda"
 
-#: MobileProfilePlugin.php:328
+#: MobileProfilePlugin.php:331
 msgid "Register"
 msgstr "Magpatala"
 
-#: MobileProfilePlugin.php:331
+#: MobileProfilePlugin.php:334
 msgid "Login"
 msgstr "Lumagda"
 
-#: MobileProfilePlugin.php:335
+#: MobileProfilePlugin.php:338
 msgid "Search"
 msgstr "Humanap"
 
-#: MobileProfilePlugin.php:362
+#: MobileProfilePlugin.php:365
 msgid "Attach"
 msgstr "Ilakip"
 
-#: MobileProfilePlugin.php:366
+#: MobileProfilePlugin.php:369
 msgid "Attach a file"
 msgstr "Maglakip ng isang talaksan"
 
-#: MobileProfilePlugin.php:417
+#. TRANS: Link to switch site layout from mobile to desktop mode. Appears at very bottom of page.
+#: MobileProfilePlugin.php:410
+msgid "Switch to desktop site layout."
+msgstr ""
+
+#. TRANS: Link to switch site layout from desktop to mobile mode. Appears at very bottom of page.
+#: MobileProfilePlugin.php:414
+msgid "Switch to mobile site layout."
+msgstr ""
+
+#: MobileProfilePlugin.php:451
 msgid "XHTML MobileProfile output for supporting user agents."
 msgstr ""
 "Mga paglalabas na XHTML na MobileProfile para sa pagtataguyo ng mga ahente "
diff --git a/plugins/MobileProfile/locale/uk/LC_MESSAGES/MobileProfile.po b/plugins/MobileProfile/locale/uk/LC_MESSAGES/MobileProfile.po
index 087b1f7966..8a1dd30b85 100644
--- a/plugins/MobileProfile/locale/uk/LC_MESSAGES/MobileProfile.po
+++ b/plugins/MobileProfile/locale/uk/LC_MESSAGES/MobileProfile.po
@@ -9,72 +9,82 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - MobileProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-02 23:31+0000\n"
-"PO-Revision-Date: 2011-02-02 23:37:20+0000\n"
+"POT-Creation-Date: 2011-03-03 15:58+0000\n"
+"PO-Revision-Date: 2011-03-03 16:02:17+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:25:41+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81409); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-02-14 17:20:45+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-mobileprofile\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: MobileProfilePlugin.php:193
+#: MobileProfilePlugin.php:196
 msgid "This page is not available in a media type you accept."
 msgstr "Ця сторінка не доступна для того типу медіа, з яким ви погодились."
 
-#: MobileProfilePlugin.php:310
+#: MobileProfilePlugin.php:313
 msgid "Home"
 msgstr "Дім"
 
-#: MobileProfilePlugin.php:312
+#: MobileProfilePlugin.php:315
 msgid "Account"
 msgstr "Акаунт"
 
-#: MobileProfilePlugin.php:314
+#: MobileProfilePlugin.php:317
 msgid "Connect"
 msgstr "З’єднання"
 
-#: MobileProfilePlugin.php:317
+#: MobileProfilePlugin.php:320
 msgid "Admin"
 msgstr "Адмін"
 
-#: MobileProfilePlugin.php:317
+#: MobileProfilePlugin.php:320
 msgid "Change site configuration"
 msgstr "Змінити конфігурацію сайту"
 
-#: MobileProfilePlugin.php:321
+#: MobileProfilePlugin.php:324
 msgid "Invite"
 msgstr "Запросити"
 
-#: MobileProfilePlugin.php:324
+#: MobileProfilePlugin.php:327
 msgid "Logout"
 msgstr "Вийти"
 
-#: MobileProfilePlugin.php:328
+#: MobileProfilePlugin.php:331
 msgid "Register"
 msgstr "Реєстрація"
 
-#: MobileProfilePlugin.php:331
+#: MobileProfilePlugin.php:334
 msgid "Login"
 msgstr "Увійти"
 
-#: MobileProfilePlugin.php:335
+#: MobileProfilePlugin.php:338
 msgid "Search"
 msgstr "Пошук"
 
-#: MobileProfilePlugin.php:362
+#: MobileProfilePlugin.php:365
 msgid "Attach"
 msgstr "Вкласти"
 
-#: MobileProfilePlugin.php:366
+#: MobileProfilePlugin.php:369
 msgid "Attach a file"
 msgstr "Вкласти файл"
 
-#: MobileProfilePlugin.php:417
+#. TRANS: Link to switch site layout from mobile to desktop mode. Appears at very bottom of page.
+#: MobileProfilePlugin.php:410
+msgid "Switch to desktop site layout."
+msgstr ""
+
+#. TRANS: Link to switch site layout from desktop to mobile mode. Appears at very bottom of page.
+#: MobileProfilePlugin.php:414
+msgid "Switch to mobile site layout."
+msgstr ""
+
+#: MobileProfilePlugin.php:451
 msgid "XHTML MobileProfile output for supporting user agents."
 msgstr ""
 "Додаток MobileProfile генерує XHTML прийнятний для мобільних пристроїв."
diff --git a/plugins/MobileProfile/locale/zh_CN/LC_MESSAGES/MobileProfile.po b/plugins/MobileProfile/locale/zh_CN/LC_MESSAGES/MobileProfile.po
index 4ecc461062..5c6dd90c5a 100644
--- a/plugins/MobileProfile/locale/zh_CN/LC_MESSAGES/MobileProfile.po
+++ b/plugins/MobileProfile/locale/zh_CN/LC_MESSAGES/MobileProfile.po
@@ -1,6 +1,7 @@
 # Translation of StatusNet - MobileProfile to Simplified Chinese (‪中文(简体)‬)
 # Exported from translatewiki.net
 #
+# Author: Hydra
 # Author: ZhengYiFeng
 # --
 # This file is distributed under the same license as the StatusNet package.
@@ -9,71 +10,81 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - MobileProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-02 23:31+0000\n"
-"PO-Revision-Date: 2011-02-02 23:37:20+0000\n"
+"POT-Creation-Date: 2011-03-03 15:58+0000\n"
+"PO-Revision-Date: 2011-03-03 16:02:17+0000\n"
 "Language-Team: Simplified Chinese <http://translatewiki.net/wiki/Portal:zh-"
 "hans>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:25:41+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81409); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-02-14 17:20:45+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-mobileprofile\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: MobileProfilePlugin.php:193
+#: MobileProfilePlugin.php:196
 msgid "This page is not available in a media type you accept."
-msgstr ""
+msgstr "此页不在您接受的媒体类型中可用。"
 
-#: MobileProfilePlugin.php:310
+#: MobileProfilePlugin.php:313
 msgid "Home"
-msgstr ""
+msgstr "首页"
 
-#: MobileProfilePlugin.php:312
+#: MobileProfilePlugin.php:315
 msgid "Account"
 msgstr "账号"
 
-#: MobileProfilePlugin.php:314
+#: MobileProfilePlugin.php:317
 msgid "Connect"
 msgstr "关联"
 
-#: MobileProfilePlugin.php:317
+#: MobileProfilePlugin.php:320
 msgid "Admin"
 msgstr "管理"
 
-#: MobileProfilePlugin.php:317
+#: MobileProfilePlugin.php:320
 msgid "Change site configuration"
 msgstr "更改网站配置"
 
-#: MobileProfilePlugin.php:321
+#: MobileProfilePlugin.php:324
 msgid "Invite"
 msgstr "邀请"
 
-#: MobileProfilePlugin.php:324
+#: MobileProfilePlugin.php:327
 msgid "Logout"
 msgstr "登出"
 
-#: MobileProfilePlugin.php:328
+#: MobileProfilePlugin.php:331
 msgid "Register"
 msgstr "注册"
 
-#: MobileProfilePlugin.php:331
+#: MobileProfilePlugin.php:334
 msgid "Login"
 msgstr "登录"
 
-#: MobileProfilePlugin.php:335
+#: MobileProfilePlugin.php:338
 msgid "Search"
 msgstr "搜索"
 
-#: MobileProfilePlugin.php:362
+#: MobileProfilePlugin.php:365
 msgid "Attach"
 msgstr "附件"
 
-#: MobileProfilePlugin.php:366
+#: MobileProfilePlugin.php:369
 msgid "Attach a file"
 msgstr "添加一个文件附件"
 
-#: MobileProfilePlugin.php:417
-msgid "XHTML MobileProfile output for supporting user agents."
+#. TRANS: Link to switch site layout from mobile to desktop mode. Appears at very bottom of page.
+#: MobileProfilePlugin.php:410
+msgid "Switch to desktop site layout."
 msgstr ""
+
+#. TRANS: Link to switch site layout from desktop to mobile mode. Appears at very bottom of page.
+#: MobileProfilePlugin.php:414
+msgid "Switch to mobile site layout."
+msgstr ""
+
+#: MobileProfilePlugin.php:451
+msgid "XHTML MobileProfile output for supporting user agents."
+msgstr "XHTML MobileProfile 支持用户代理的输出。"
diff --git a/plugins/OpenExternalLinkTarget/locale/pt/LC_MESSAGES/OpenExternalLinkTarget.po b/plugins/OpenExternalLinkTarget/locale/pt/LC_MESSAGES/OpenExternalLinkTarget.po
new file mode 100644
index 0000000000..151a836374
--- /dev/null
+++ b/plugins/OpenExternalLinkTarget/locale/pt/LC_MESSAGES/OpenExternalLinkTarget.po
@@ -0,0 +1,28 @@
+# Translation of StatusNet - OpenExternalLinkTarget to Portuguese (Português)
+# Exported from translatewiki.net
+#
+# Author: Waldir
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - OpenExternalLinkTarget\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-03 15:58+0000\n"
+"PO-Revision-Date: 2011-03-03 16:02:21+0000\n"
+"Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-01-29 22:25:48+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: pt\n"
+"X-Message-Group: #out-statusnet-plugin-openexternallinktarget\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: OpenExternalLinkTargetPlugin.php:59
+msgid "Opens external links (i.e. with rel=external) on a new window or tab."
+msgstr ""
+"Abre links externos (por exemplo, com rel=external) num novo separador ou "
+"janela."
diff --git a/plugins/PiwikAnalytics/locale/pt/LC_MESSAGES/PiwikAnalytics.po b/plugins/PiwikAnalytics/locale/pt/LC_MESSAGES/PiwikAnalytics.po
new file mode 100644
index 0000000000..c750d39ec8
--- /dev/null
+++ b/plugins/PiwikAnalytics/locale/pt/LC_MESSAGES/PiwikAnalytics.po
@@ -0,0 +1,30 @@
+# Translation of StatusNet - PiwikAnalytics to Portuguese (Português)
+# Exported from translatewiki.net
+#
+# Author: Waldir
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - PiwikAnalytics\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-03 15:58+0000\n"
+"PO-Revision-Date: 2011-03-03 16:02:40+0000\n"
+"Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-01-29 22:28:12+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: pt\n"
+"X-Message-Group: #out-statusnet-plugin-piwikanalytics\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: PiwikAnalyticsPlugin.php:113
+msgid ""
+"Use <a href=\"http://piwik.org/\">Piwik</a> Open Source web analytics "
+"software."
+msgstr ""
+"Usar o <a href=\"http://piwik.org/\">Piwik</a>, um software de análise web "
+"de código aberto."
diff --git a/plugins/PostDebug/locale/pt/LC_MESSAGES/PostDebug.po b/plugins/PostDebug/locale/pt/LC_MESSAGES/PostDebug.po
new file mode 100644
index 0000000000..a28193312e
--- /dev/null
+++ b/plugins/PostDebug/locale/pt/LC_MESSAGES/PostDebug.po
@@ -0,0 +1,26 @@
+# Translation of StatusNet - PostDebug to Portuguese (Português)
+# Exported from translatewiki.net
+#
+# Author: Waldir
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - PostDebug\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-03 15:58+0000\n"
+"PO-Revision-Date: 2011-03-03 16:02:40+0000\n"
+"Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-01-29 22:28:14+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: pt\n"
+"X-Message-Group: #out-statusnet-plugin-postdebug\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: PostDebugPlugin.php:58
+msgid "Debugging tool to record request details on POST."
+msgstr "Ferramenta de depuração para registar detalhes de pedidos POST."
diff --git a/plugins/Recaptcha/locale/fur/LC_MESSAGES/Recaptcha.po b/plugins/Recaptcha/locale/fur/LC_MESSAGES/Recaptcha.po
new file mode 100644
index 0000000000..6d9eab8b5a
--- /dev/null
+++ b/plugins/Recaptcha/locale/fur/LC_MESSAGES/Recaptcha.po
@@ -0,0 +1,38 @@
+# Translation of StatusNet - Recaptcha to Friulian (Furlan)
+# Exported from translatewiki.net
+#
+# Author: Klenje
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Recaptcha\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-03 15:58+0000\n"
+"PO-Revision-Date: 2011-03-03 16:02:50+0000\n"
+"Language-Team: Friulian <http://translatewiki.net/wiki/Portal:fur>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-01-29 22:28:18+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: fur\n"
+"X-Message-Group: #out-statusnet-plugin-recaptcha\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: RecaptchaPlugin.php:64
+msgid "Captcha"
+msgstr "Captcha"
+
+#: RecaptchaPlugin.php:105
+msgid "Captcha does not match!"
+msgstr "Il Captcha nol corispuint!"
+
+#: RecaptchaPlugin.php:117
+msgid ""
+"Uses <a href=\"http://recaptcha.org/\">Recaptcha</a> service to add a  "
+"captcha to the registration page."
+msgstr ""
+"Dopre il servizi <a href=\"http://recaptcha.org/\">Recaptcha</a> par zontâ "
+"un captcha ae pagjine di regjistrazion."
diff --git a/plugins/RequireValidatedEmail/locale/RequireValidatedEmail.pot b/plugins/RequireValidatedEmail/locale/RequireValidatedEmail.pot
index bf9abd4b04..c8d8f212f3 100644
--- a/plugins/RequireValidatedEmail/locale/RequireValidatedEmail.pot
+++ b/plugins/RequireValidatedEmail/locale/RequireValidatedEmail.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-24 10:32+0000\n"
+"POT-Creation-Date: 2011-03-03 15:58+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,14 +16,14 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: RequireValidatedEmailPlugin.php:100
+#: RequireValidatedEmailPlugin.php:92
 msgid "You must validate your email address before posting."
 msgstr ""
 
-#: RequireValidatedEmailPlugin.php:120
+#: RequireValidatedEmailPlugin.php:112
 msgid "You must provide an email address to register."
 msgstr ""
 
-#: RequireValidatedEmailPlugin.php:224
+#: RequireValidatedEmailPlugin.php:216
 msgid "Disables posting without a validated email address."
 msgstr ""
diff --git a/plugins/RequireValidatedEmail/locale/de/LC_MESSAGES/RequireValidatedEmail.po b/plugins/RequireValidatedEmail/locale/de/LC_MESSAGES/RequireValidatedEmail.po
index 2dbcff2873..d0e7151ec6 100644
--- a/plugins/RequireValidatedEmail/locale/de/LC_MESSAGES/RequireValidatedEmail.po
+++ b/plugins/RequireValidatedEmail/locale/de/LC_MESSAGES/RequireValidatedEmail.po
@@ -9,26 +9,26 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - RequireValidatedEmail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-24 10:32+0000\n"
-"PO-Revision-Date: 2011-02-24 10:40:43+0000\n"
+"POT-Creation-Date: 2011-03-03 15:58+0000\n"
+"PO-Revision-Date: 2011-03-03 16:02:51+0000\n"
 "Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:28:20+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r82712); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-02-25 23:45:22+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-requirevalidatedemail\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: RequireValidatedEmailPlugin.php:100
+#: RequireValidatedEmailPlugin.php:92
 msgid "You must validate your email address before posting."
 msgstr "Du musst deine E-Mail-Adresse validieren, bevor du beitragen kannst."
 
-#: RequireValidatedEmailPlugin.php:120
+#: RequireValidatedEmailPlugin.php:112
 msgid "You must provide an email address to register."
 msgstr "Du musst eine E-Mail-Adresse angeben, um dich zu registrieren."
 
-#: RequireValidatedEmailPlugin.php:224
+#: RequireValidatedEmailPlugin.php:216
 msgid "Disables posting without a validated email address."
 msgstr "Deaktiviert Posten ohne gültige E-Mail-Adresse."
diff --git a/plugins/RequireValidatedEmail/locale/fr/LC_MESSAGES/RequireValidatedEmail.po b/plugins/RequireValidatedEmail/locale/fr/LC_MESSAGES/RequireValidatedEmail.po
index da29ce72cf..36d56338b8 100644
--- a/plugins/RequireValidatedEmail/locale/fr/LC_MESSAGES/RequireValidatedEmail.po
+++ b/plugins/RequireValidatedEmail/locale/fr/LC_MESSAGES/RequireValidatedEmail.po
@@ -9,27 +9,27 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - RequireValidatedEmail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-24 10:32+0000\n"
-"PO-Revision-Date: 2011-02-24 10:40:44+0000\n"
+"POT-Creation-Date: 2011-03-03 15:58+0000\n"
+"PO-Revision-Date: 2011-03-03 16:02:51+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:28:20+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r82712); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-02-25 23:45:22+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-requirevalidatedemail\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: RequireValidatedEmailPlugin.php:100
+#: RequireValidatedEmailPlugin.php:92
 msgid "You must validate your email address before posting."
 msgstr "Vous devez valider votre adresse électronique avant de poster."
 
-#: RequireValidatedEmailPlugin.php:120
+#: RequireValidatedEmailPlugin.php:112
 msgid "You must provide an email address to register."
 msgstr "Vous devez fournir une adresse électronique avant de vous enregistrer."
 
-#: RequireValidatedEmailPlugin.php:224
+#: RequireValidatedEmailPlugin.php:216
 msgid "Disables posting without a validated email address."
 msgstr ""
 "Désactive le postage pour ceux qui n’ont pas d’adresse électronique valide."
diff --git a/plugins/RequireValidatedEmail/locale/ia/LC_MESSAGES/RequireValidatedEmail.po b/plugins/RequireValidatedEmail/locale/ia/LC_MESSAGES/RequireValidatedEmail.po
index d1c7173d2f..6dd6b54e51 100644
--- a/plugins/RequireValidatedEmail/locale/ia/LC_MESSAGES/RequireValidatedEmail.po
+++ b/plugins/RequireValidatedEmail/locale/ia/LC_MESSAGES/RequireValidatedEmail.po
@@ -9,26 +9,26 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - RequireValidatedEmail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-24 10:32+0000\n"
-"PO-Revision-Date: 2011-02-24 10:40:44+0000\n"
+"POT-Creation-Date: 2011-03-03 15:58+0000\n"
+"PO-Revision-Date: 2011-03-03 16:02:51+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:28:20+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r82712); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-02-25 23:45:22+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-requirevalidatedemail\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: RequireValidatedEmailPlugin.php:100
+#: RequireValidatedEmailPlugin.php:92
 msgid "You must validate your email address before posting."
 msgstr "Tu debe validar tu adresse de e-mail ante de publicar."
 
-#: RequireValidatedEmailPlugin.php:120
+#: RequireValidatedEmailPlugin.php:112
 msgid "You must provide an email address to register."
 msgstr "Tu debe fornir un adresse de e-mail pro poter crear un conto."
 
-#: RequireValidatedEmailPlugin.php:224
+#: RequireValidatedEmailPlugin.php:216
 msgid "Disables posting without a validated email address."
 msgstr "Disactiva le publication de messages sin adresse de e-mail validate."
diff --git a/plugins/RequireValidatedEmail/locale/mk/LC_MESSAGES/RequireValidatedEmail.po b/plugins/RequireValidatedEmail/locale/mk/LC_MESSAGES/RequireValidatedEmail.po
index a67d6d0c6b..bbf01db034 100644
--- a/plugins/RequireValidatedEmail/locale/mk/LC_MESSAGES/RequireValidatedEmail.po
+++ b/plugins/RequireValidatedEmail/locale/mk/LC_MESSAGES/RequireValidatedEmail.po
@@ -9,28 +9,28 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - RequireValidatedEmail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-24 10:32+0000\n"
-"PO-Revision-Date: 2011-02-24 10:40:44+0000\n"
+"POT-Creation-Date: 2011-03-03 15:58+0000\n"
+"PO-Revision-Date: 2011-03-03 16:02:52+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:28:20+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r82712); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-02-25 23:45:22+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-requirevalidatedemail\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
 
-#: RequireValidatedEmailPlugin.php:100
+#: RequireValidatedEmailPlugin.php:92
 msgid "You must validate your email address before posting."
 msgstr ""
 "Пред да почнете да објавувате ќе мора да ја потврдите Вашата е-поштенска "
 "адреса."
 
-#: RequireValidatedEmailPlugin.php:120
+#: RequireValidatedEmailPlugin.php:112
 msgid "You must provide an email address to register."
 msgstr "За да се регистрирате, ќе мора да наведете е-поштенска адреса."
 
-#: RequireValidatedEmailPlugin.php:224
+#: RequireValidatedEmailPlugin.php:216
 msgid "Disables posting without a validated email address."
 msgstr "Оневозможува објавување без потврдена е-пошта."
diff --git a/plugins/RequireValidatedEmail/locale/nl/LC_MESSAGES/RequireValidatedEmail.po b/plugins/RequireValidatedEmail/locale/nl/LC_MESSAGES/RequireValidatedEmail.po
index 0e78ecb1d1..8d5831dc11 100644
--- a/plugins/RequireValidatedEmail/locale/nl/LC_MESSAGES/RequireValidatedEmail.po
+++ b/plugins/RequireValidatedEmail/locale/nl/LC_MESSAGES/RequireValidatedEmail.po
@@ -9,26 +9,26 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - RequireValidatedEmail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-24 10:32+0000\n"
-"PO-Revision-Date: 2011-02-24 10:40:44+0000\n"
+"POT-Creation-Date: 2011-03-03 15:58+0000\n"
+"PO-Revision-Date: 2011-03-03 16:02:52+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:28:20+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r82712); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-02-25 23:45:22+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-requirevalidatedemail\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: RequireValidatedEmailPlugin.php:100
+#: RequireValidatedEmailPlugin.php:92
 msgid "You must validate your email address before posting."
 msgstr "U moet uw e-mailadres bevestigen voordat u berichten kunt plaatsen."
 
-#: RequireValidatedEmailPlugin.php:120
+#: RequireValidatedEmailPlugin.php:112
 msgid "You must provide an email address to register."
 msgstr "U moet een e-mailadres opgeven om te kunnen registreren."
 
-#: RequireValidatedEmailPlugin.php:224
+#: RequireValidatedEmailPlugin.php:216
 msgid "Disables posting without a validated email address."
 msgstr "Schakelt berichten plaatsen zonder gevalideerd e-mailadres uit."
diff --git a/plugins/RequireValidatedEmail/locale/tl/LC_MESSAGES/RequireValidatedEmail.po b/plugins/RequireValidatedEmail/locale/tl/LC_MESSAGES/RequireValidatedEmail.po
index efbfd6a8e1..387c2e91a8 100644
--- a/plugins/RequireValidatedEmail/locale/tl/LC_MESSAGES/RequireValidatedEmail.po
+++ b/plugins/RequireValidatedEmail/locale/tl/LC_MESSAGES/RequireValidatedEmail.po
@@ -9,26 +9,26 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - RequireValidatedEmail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-24 10:32+0000\n"
-"PO-Revision-Date: 2011-02-24 10:40:44+0000\n"
+"POT-Creation-Date: 2011-03-03 15:58+0000\n"
+"PO-Revision-Date: 2011-03-03 16:02:52+0000\n"
 "Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:28:20+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r82712); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-02-25 23:45:22+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-requirevalidatedemail\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: RequireValidatedEmailPlugin.php:100
+#: RequireValidatedEmailPlugin.php:92
 msgid "You must validate your email address before posting."
 msgstr "Kailangan patunayan mo ang iyong tirahan ng e-liham bago magpaskil."
 
-#: RequireValidatedEmailPlugin.php:120
+#: RequireValidatedEmailPlugin.php:112
 msgid "You must provide an email address to register."
 msgstr "Dapat kang magbigay ng isang tirahan ng e-liham upang makapagpatala."
 
-#: RequireValidatedEmailPlugin.php:224
+#: RequireValidatedEmailPlugin.php:216
 msgid "Disables posting without a validated email address."
 msgstr ""
diff --git a/plugins/RequireValidatedEmail/locale/uk/LC_MESSAGES/RequireValidatedEmail.po b/plugins/RequireValidatedEmail/locale/uk/LC_MESSAGES/RequireValidatedEmail.po
index cca8d72aa0..b649cb361b 100644
--- a/plugins/RequireValidatedEmail/locale/uk/LC_MESSAGES/RequireValidatedEmail.po
+++ b/plugins/RequireValidatedEmail/locale/uk/LC_MESSAGES/RequireValidatedEmail.po
@@ -9,30 +9,30 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - RequireValidatedEmail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-24 10:32+0000\n"
-"PO-Revision-Date: 2011-02-24 10:40:44+0000\n"
+"POT-Creation-Date: 2011-03-03 15:58+0000\n"
+"PO-Revision-Date: 2011-03-03 16:02:52+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:28:20+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r82712); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-02-25 23:45:22+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-requirevalidatedemail\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: RequireValidatedEmailPlugin.php:100
+#: RequireValidatedEmailPlugin.php:92
 msgid "You must validate your email address before posting."
 msgstr ""
 "Ви повинні підтвердити свою адресу електронної пошти до того, як почнете "
 "надсилати дописи поштою."
 
-#: RequireValidatedEmailPlugin.php:120
+#: RequireValidatedEmailPlugin.php:112
 msgid "You must provide an email address to register."
 msgstr "Ви повинні зазначити свою адресу електронної пошти для реєстрації."
 
-#: RequireValidatedEmailPlugin.php:224
+#: RequireValidatedEmailPlugin.php:216
 msgid "Disables posting without a validated email address."
 msgstr ""
 "Забороняє надсилання дописів, якщо користувач не має підтвердженої "
diff --git a/plugins/SQLProfile/locale/pt/LC_MESSAGES/SQLProfile.po b/plugins/SQLProfile/locale/pt/LC_MESSAGES/SQLProfile.po
new file mode 100644
index 0000000000..28cfa95bbf
--- /dev/null
+++ b/plugins/SQLProfile/locale/pt/LC_MESSAGES/SQLProfile.po
@@ -0,0 +1,26 @@
+# Translation of StatusNet - SQLProfile to Portuguese (Português)
+# Exported from translatewiki.net
+#
+# Author: Waldir
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - SQLProfile\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-03 15:58+0000\n"
+"PO-Revision-Date: 2011-03-03 16:03:03+0000\n"
+"Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-02-14 17:22:10+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: pt\n"
+"X-Message-Group: #out-statusnet-plugin-sqlprofile\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: SQLProfilePlugin.php:41
+msgid "Debug tool to watch for poorly indexed DB queries."
+msgstr "Ferramenta de depuração para vigiar consultas à BD mal indexadas."
diff --git a/plugins/SubMirror/locale/uk/LC_MESSAGES/SubMirror.po b/plugins/SubMirror/locale/uk/LC_MESSAGES/SubMirror.po
index 5806ac9551..0fafc4566b 100644
--- a/plugins/SubMirror/locale/uk/LC_MESSAGES/SubMirror.po
+++ b/plugins/SubMirror/locale/uk/LC_MESSAGES/SubMirror.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SubMirror\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-30 22:50+0000\n"
-"PO-Revision-Date: 2011-01-30 22:54:21+0000\n"
+"POT-Creation-Date: 2011-03-03 15:58+0000\n"
+"PO-Revision-Date: 2011-03-03 16:03:05+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:28:47+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81224); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-02-14 17:22:11+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-submirror\n"
@@ -39,7 +39,7 @@ msgstr "Конфігурація віддзеркалення дописів з
 
 #: SubMirrorPlugin.php:183
 msgid "Mirrored feeds"
-msgstr "Дзеркальні потоки"
+msgstr "Дзеркала"
 
 #: lib/editmirrorform.php:83
 msgctxt "LABEL"
diff --git a/plugins/SubscriptionThrottle/locale/pt/LC_MESSAGES/SubscriptionThrottle.po b/plugins/SubscriptionThrottle/locale/pt/LC_MESSAGES/SubscriptionThrottle.po
new file mode 100644
index 0000000000..87c3cc174b
--- /dev/null
+++ b/plugins/SubscriptionThrottle/locale/pt/LC_MESSAGES/SubscriptionThrottle.po
@@ -0,0 +1,26 @@
+# Translation of StatusNet - SubscriptionThrottle to Portuguese (Português)
+# Exported from translatewiki.net
+#
+# Author: Waldir
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - SubscriptionThrottle\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-03 15:58+0000\n"
+"PO-Revision-Date: 2011-03-03 16:03:05+0000\n"
+"Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-01-29 22:29:07+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: pt\n"
+"X-Message-Group: #out-statusnet-plugin-subscriptionthrottle\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: SubscriptionThrottlePlugin.php:171
+msgid "Configurable limits for subscriptions and group memberships."
+msgstr "Limites configuráveis para subscrições e adesões a grupos."
diff --git a/plugins/TightUrl/locale/pt/LC_MESSAGES/TightUrl.po b/plugins/TightUrl/locale/pt/LC_MESSAGES/TightUrl.po
new file mode 100644
index 0000000000..b645880286
--- /dev/null
+++ b/plugins/TightUrl/locale/pt/LC_MESSAGES/TightUrl.po
@@ -0,0 +1,27 @@
+# Translation of StatusNet - TightUrl to Portuguese (Português)
+# Exported from translatewiki.net
+#
+# Author: Waldir
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - TightUrl\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-03 15:58+0000\n"
+"PO-Revision-Date: 2011-03-03 16:03:06+0000\n"
+"Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-01-29 22:29:10+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: pt\n"
+"X-Message-Group: #out-statusnet-plugin-tighturl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: TightUrlPlugin.php:68
+#, php-format
+msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
+msgstr "Usa o serviço de abreviação de URLs <a href=\"http://%1$s/\">%1$s</a>."
diff --git a/plugins/TinyMCE/locale/pt/LC_MESSAGES/TinyMCE.po b/plugins/TinyMCE/locale/pt/LC_MESSAGES/TinyMCE.po
new file mode 100644
index 0000000000..2531674f43
--- /dev/null
+++ b/plugins/TinyMCE/locale/pt/LC_MESSAGES/TinyMCE.po
@@ -0,0 +1,26 @@
+# Translation of StatusNet - TinyMCE to Portuguese (Português)
+# Exported from translatewiki.net
+#
+# Author: Waldir
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - TinyMCE\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-03 15:58+0000\n"
+"PO-Revision-Date: 2011-03-03 16:03:07+0000\n"
+"Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-02-14 17:22:12+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: pt\n"
+"X-Message-Group: #out-statusnet-plugin-tinymce\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: TinyMCEPlugin.php:87
+msgid "Use TinyMCE library to allow rich text editing in the browser."
+msgstr "Use biblioteca TinyMCE para permitir a edição em rich text no browser."
diff --git a/plugins/WikiHashtags/locale/pt/LC_MESSAGES/WikiHashtags.po b/plugins/WikiHashtags/locale/pt/LC_MESSAGES/WikiHashtags.po
new file mode 100644
index 0000000000..c610c46fb5
--- /dev/null
+++ b/plugins/WikiHashtags/locale/pt/LC_MESSAGES/WikiHashtags.po
@@ -0,0 +1,30 @@
+# Translation of StatusNet - WikiHashtags to Portuguese (Português)
+# Exported from translatewiki.net
+#
+# Author: Waldir
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - WikiHashtags\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-03 15:58+0000\n"
+"PO-Revision-Date: 2011-03-03 16:03:15+0000\n"
+"Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-01-29 22:29:51+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: pt\n"
+"X-Message-Group: #out-statusnet-plugin-wikihashtags\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: WikiHashtagsPlugin.php:110
+msgid ""
+"Gets hashtag descriptions from <a href=\"http://hashtags.wikia.com/"
+"\">WikiHashtags</a>."
+msgstr ""
+"Obtém descrições de hashtags a partir de <a href=\"http://hashtags.wikia.com/"
+"\">WikiHashtags</a>."
diff --git a/plugins/XCache/locale/pt/LC_MESSAGES/XCache.po b/plugins/XCache/locale/pt/LC_MESSAGES/XCache.po
new file mode 100644
index 0000000000..19f82c4ba1
--- /dev/null
+++ b/plugins/XCache/locale/pt/LC_MESSAGES/XCache.po
@@ -0,0 +1,30 @@
+# Translation of StatusNet - XCache to Portuguese (Português)
+# Exported from translatewiki.net
+#
+# Author: Waldir
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - XCache\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-03 15:58+0000\n"
+"PO-Revision-Date: 2011-03-03 16:03:17+0000\n"
+"Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-01-29 22:29:54+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: pt\n"
+"X-Message-Group: #out-statusnet-plugin-xcache\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: XCachePlugin.php:120
+msgid ""
+"Use the <a href=\"http://xcache.lighttpd.net/\">XCache</a> variable cache to "
+"cache query results."
+msgstr ""
+"Utilizar a cache variável <a href=\"http://xcache.lighttpd.net/\">XCache</a> "
+"para armazenar resultados de consultas."

From 5fd9767e805aec3caa061d8a232a25c4a3b4207b Mon Sep 17 00:00:00 2001
From: Siebrand Mazeland <s.mazeland@xs4all.nl>
Date: Thu, 3 Mar 2011 18:39:12 +0100
Subject: [PATCH 376/655] Localisation updates from http://translatewiki.net. *
 Fix previous commit. Pot files were built against master instead of 1.0.x.

---
 locale/ar/LC_MESSAGES/statusnet.po            | 2678 ++++++++--------
 locale/arz/LC_MESSAGES/statusnet.po           | 2688 ++++++++--------
 locale/bg/LC_MESSAGES/statusnet.po            | 2674 ++++++++--------
 locale/br/LC_MESSAGES/statusnet.po            | 2697 ++++++++--------
 locale/ca/LC_MESSAGES/statusnet.po            | 2762 ++++++++--------
 locale/cs/LC_MESSAGES/statusnet.po            | 2712 ++++++++--------
 locale/de/LC_MESSAGES/statusnet.po            | 2721 ++++++++--------
 locale/en_GB/LC_MESSAGES/statusnet.po         | 2687 ++++++++--------
 locale/eo/LC_MESSAGES/statusnet.po            | 2707 ++++++++--------
 locale/es/LC_MESSAGES/statusnet.po            | 2712 ++++++++--------
 locale/fa/LC_MESSAGES/statusnet.po            | 2710 ++++++++--------
 locale/fi/LC_MESSAGES/statusnet.po            | 2704 ++++++++--------
 locale/fr/LC_MESSAGES/statusnet.po            | 2722 ++++++++--------
 locale/fur/LC_MESSAGES/statusnet.po           | 2630 ++++++++--------
 locale/gl/LC_MESSAGES/statusnet.po            | 2724 ++++++++--------
 locale/hsb/LC_MESSAGES/statusnet.po           | 2718 ++++++++--------
 locale/hu/LC_MESSAGES/statusnet.po            | 2627 ++++++++--------
 locale/ia/LC_MESSAGES/statusnet.po            | 2767 ++++++++--------
 locale/it/LC_MESSAGES/statusnet.po            | 2716 ++++++++--------
 locale/ja/LC_MESSAGES/statusnet.po            | 2705 ++++++++--------
 locale/ka/LC_MESSAGES/statusnet.po            | 2703 ++++++++--------
 locale/ko/LC_MESSAGES/statusnet.po            | 2672 ++++++++--------
 locale/mk/LC_MESSAGES/statusnet.po            | 2771 ++++++++--------
 locale/ml/LC_MESSAGES/statusnet.po            | 2706 ++++++++--------
 locale/nb/LC_MESSAGES/statusnet.po            | 2698 ++++++++--------
 locale/nl/LC_MESSAGES/statusnet.po            | 2781 ++++++++--------
 locale/nn/LC_MESSAGES/statusnet.po            | 2680 ++++++++--------
 locale/pl/LC_MESSAGES/statusnet.po            | 2710 ++++++++--------
 locale/pt/LC_MESSAGES/statusnet.po            | 2712 ++++++++--------
 locale/pt_BR/LC_MESSAGES/statusnet.po         | 2718 ++++++++--------
 locale/ru/LC_MESSAGES/statusnet.po            | 2719 ++++++++--------
 locale/statusnet.pot                          | 2378 +++++++-------
 locale/sv/LC_MESSAGES/statusnet.po            | 2705 ++++++++--------
 locale/te/LC_MESSAGES/statusnet.po            | 2675 ++++++++--------
 locale/tr/LC_MESSAGES/statusnet.po            | 2667 ++++++++--------
 locale/uk/LC_MESSAGES/statusnet.po            | 2788 +++++++++--------
 locale/zh_CN/LC_MESSAGES/statusnet.po         | 2735 ++++++++--------
 plugins/APC/locale/APC.pot                    |    2 +-
 .../AccountManager/locale/AccountManager.pot  |   22 +
 plugins/Adsense/locale/Adsense.pot            |    2 +-
 plugins/Aim/locale/Aim.pot                    |   30 +
 .../AnonymousFave/locale/AnonymousFave.pot    |    2 +-
 plugins/AutoSandbox/locale/AutoSandbox.pot    |    2 +-
 plugins/Autocomplete/locale/Autocomplete.pot  |    2 +-
 plugins/Awesomeness/locale/Awesomeness.pot    |    2 +-
 .../locale/pt/LC_MESSAGES/Awesomeness.po      |    4 +-
 plugins/BitlyUrl/locale/BitlyUrl.pot          |   10 +-
 .../locale/be-tarask/LC_MESSAGES/BitlyUrl.po  |   16 +-
 .../locale/ca/LC_MESSAGES/BitlyUrl.po         |   16 +-
 .../locale/de/LC_MESSAGES/BitlyUrl.po         |   16 +-
 .../locale/fr/LC_MESSAGES/BitlyUrl.po         |   16 +-
 .../locale/gl/LC_MESSAGES/BitlyUrl.po         |   16 +-
 .../locale/ia/LC_MESSAGES/BitlyUrl.po         |   16 +-
 .../locale/mk/LC_MESSAGES/BitlyUrl.po         |   16 +-
 .../locale/nb/LC_MESSAGES/BitlyUrl.po         |   16 +-
 .../locale/nl/LC_MESSAGES/BitlyUrl.po         |   16 +-
 .../locale/ru/LC_MESSAGES/BitlyUrl.po         |   16 +-
 .../locale/uk/LC_MESSAGES/BitlyUrl.po         |   16 +-
 plugins/Blacklist/locale/Blacklist.pot        |    2 +-
 plugins/BlankAd/locale/BlankAd.pot            |    2 +-
 plugins/BlogspamNet/locale/BlogspamNet.pot    |    2 +-
 plugins/Bookmark/locale/Bookmark.pot          |    2 +-
 plugins/CacheLog/locale/CacheLog.pot          |    2 +-
 .../locale/CasAuthentication.pot              |    2 +-
 .../locale/ClientSideShorten.pot              |    4 +-
 .../LC_MESSAGES/ClientSideShorten.po          |   10 +-
 .../br/LC_MESSAGES/ClientSideShorten.po       |   10 +-
 .../de/LC_MESSAGES/ClientSideShorten.po       |   10 +-
 .../es/LC_MESSAGES/ClientSideShorten.po       |   10 +-
 .../fr/LC_MESSAGES/ClientSideShorten.po       |   10 +-
 .../he/LC_MESSAGES/ClientSideShorten.po       |   10 +-
 .../ia/LC_MESSAGES/ClientSideShorten.po       |   10 +-
 .../id/LC_MESSAGES/ClientSideShorten.po       |   10 +-
 .../mk/LC_MESSAGES/ClientSideShorten.po       |   10 +-
 .../nb/LC_MESSAGES/ClientSideShorten.po       |   10 +-
 .../nl/LC_MESSAGES/ClientSideShorten.po       |   10 +-
 .../ru/LC_MESSAGES/ClientSideShorten.po       |   10 +-
 .../tl/LC_MESSAGES/ClientSideShorten.po       |   10 +-
 .../uk/LC_MESSAGES/ClientSideShorten.po       |   10 +-
 .../zh_CN/LC_MESSAGES/ClientSideShorten.po    |   10 +-
 plugins/Comet/locale/Comet.pot                |    2 +-
 .../locale/DirectionDetector.pot              |    2 +-
 plugins/DiskCache/locale/DiskCache.pot        |    2 +-
 plugins/Disqus/locale/Disqus.pot              |    2 +-
 plugins/Echo/locale/Echo.pot                  |    2 +-
 .../locale/EmailAuthentication.pot            |    2 +-
 plugins/EmailSummary/locale/EmailSummary.pot  |    2 +-
 .../locale/ExtendedProfile.pot                |  116 +
 .../FacebookBridge/locale/FacebookBridge.pot  |    2 +-
 plugins/FirePHP/locale/FirePHP.pot            |    2 +-
 .../FollowEveryone/locale/FollowEveryone.pot  |    2 +-
 plugins/ForceGroup/locale/ForceGroup.pot      |    2 +-
 plugins/GeoURL/locale/GeoURL.pot              |    2 +-
 plugins/Geonames/locale/Geonames.pot          |    2 +-
 .../locale/GoogleAnalytics.pot                |    2 +-
 plugins/Gravatar/locale/Gravatar.pot          |    2 +-
 .../GroupFavorited/locale/GroupFavorited.pot  |    2 +-
 .../locale/GroupPrivateMessage.pot            |    2 +-
 plugins/Imap/locale/Imap.pot                  |    2 +-
 .../InProcessCache/locale/InProcessCache.pot  |    2 +-
 .../InfiniteScroll/locale/InfiniteScroll.pot  |    2 +-
 plugins/Irc/locale/Irc.pot                    |   35 +
 .../locale/LdapAuthentication.pot             |    2 +-
 .../locale/LdapAuthorization.pot              |    2 +-
 plugins/LilUrl/locale/LilUrl.pot              |    6 +-
 .../LilUrl/locale/de/LC_MESSAGES/LilUrl.po    |   12 +-
 .../LilUrl/locale/fr/LC_MESSAGES/LilUrl.po    |   12 +-
 .../LilUrl/locale/he/LC_MESSAGES/LilUrl.po    |   12 +-
 .../LilUrl/locale/ia/LC_MESSAGES/LilUrl.po    |   12 +-
 .../LilUrl/locale/id/LC_MESSAGES/LilUrl.po    |   12 +-
 .../LilUrl/locale/ja/LC_MESSAGES/LilUrl.po    |   12 +-
 .../LilUrl/locale/mk/LC_MESSAGES/LilUrl.po    |   12 +-
 .../LilUrl/locale/nb/LC_MESSAGES/LilUrl.po    |   12 +-
 .../LilUrl/locale/nl/LC_MESSAGES/LilUrl.po    |   12 +-
 .../LilUrl/locale/ru/LC_MESSAGES/LilUrl.po    |   12 +-
 .../LilUrl/locale/tl/LC_MESSAGES/LilUrl.po    |   12 +-
 .../LilUrl/locale/uk/LC_MESSAGES/LilUrl.po    |   12 +-
 .../LilUrl/locale/zh_CN/LC_MESSAGES/LilUrl.po |   12 +-
 plugins/LinkPreview/locale/LinkPreview.pot    |    2 +-
 plugins/Linkback/locale/Linkback.pot          |    2 +-
 plugins/LogFilter/locale/LogFilter.pot        |    2 +-
 plugins/Mapstraction/locale/Mapstraction.pot  |    2 +-
 plugins/Memcache/locale/Memcache.pot          |    2 +-
 plugins/Memcached/locale/Memcached.pot        |    2 +-
 plugins/Meteor/locale/Meteor.pot              |    2 +-
 plugins/Minify/locale/Minify.pot              |    2 +-
 .../MobileProfile/locale/MobileProfile.pot    |    2 +-
 plugins/ModHelper/locale/ModHelper.pot        |    2 +-
 plugins/ModPlus/locale/ModPlus.pot            |    2 +-
 plugins/Msn/locale/Msn.pot                    |   26 +
 plugins/NoticeTitle/locale/NoticeTitle.pot    |    2 +-
 plugins/OStatus/locale/OStatus.pot            |   92 +-
 .../OStatus/locale/de/LC_MESSAGES/OStatus.po  |  113 +-
 .../OStatus/locale/fr/LC_MESSAGES/OStatus.po  |  113 +-
 .../OStatus/locale/ia/LC_MESSAGES/OStatus.po  |  113 +-
 .../OStatus/locale/mk/LC_MESSAGES/OStatus.po  |  113 +-
 .../OStatus/locale/nl/LC_MESSAGES/OStatus.po  |  113 +-
 .../OStatus/locale/uk/LC_MESSAGES/OStatus.po  |  113 +-
 .../locale/OpenExternalLinkTarget.pot         |    2 +-
 plugins/OpenID/locale/OpenID.pot              |   32 +-
 .../OpenID/locale/br/LC_MESSAGES/OpenID.po    |   38 +-
 .../OpenID/locale/ca/LC_MESSAGES/OpenID.po    |   38 +-
 .../OpenID/locale/de/LC_MESSAGES/OpenID.po    |   38 +-
 .../OpenID/locale/fr/LC_MESSAGES/OpenID.po    |   38 +-
 .../OpenID/locale/ia/LC_MESSAGES/OpenID.po    |   38 +-
 .../OpenID/locale/mk/LC_MESSAGES/OpenID.po    |   38 +-
 .../OpenID/locale/nl/LC_MESSAGES/OpenID.po    |   38 +-
 .../OpenID/locale/tl/LC_MESSAGES/OpenID.po    |   38 +-
 .../OpenID/locale/uk/LC_MESSAGES/OpenID.po    |   38 +-
 plugins/OpenX/locale/OpenX.pot                |    2 +-
 .../PiwikAnalytics/locale/PiwikAnalytics.pot  |    2 +-
 plugins/PostDebug/locale/PostDebug.pot        |    2 +-
 .../locale/PoweredByStatusNet.pot             |    2 +-
 plugins/PtitUrl/locale/PtitUrl.pot            |    4 +-
 .../PtitUrl/locale/br/LC_MESSAGES/PtitUrl.po  |   10 +-
 .../PtitUrl/locale/de/LC_MESSAGES/PtitUrl.po  |   10 +-
 .../PtitUrl/locale/es/LC_MESSAGES/PtitUrl.po  |   10 +-
 .../PtitUrl/locale/fr/LC_MESSAGES/PtitUrl.po  |   10 +-
 .../PtitUrl/locale/gl/LC_MESSAGES/PtitUrl.po  |   10 +-
 .../PtitUrl/locale/he/LC_MESSAGES/PtitUrl.po  |   10 +-
 .../PtitUrl/locale/ia/LC_MESSAGES/PtitUrl.po  |   10 +-
 .../PtitUrl/locale/ja/LC_MESSAGES/PtitUrl.po  |   10 +-
 .../PtitUrl/locale/mk/LC_MESSAGES/PtitUrl.po  |   10 +-
 .../PtitUrl/locale/nb/LC_MESSAGES/PtitUrl.po  |   10 +-
 .../PtitUrl/locale/nl/LC_MESSAGES/PtitUrl.po  |   10 +-
 .../PtitUrl/locale/pt/LC_MESSAGES/PtitUrl.po  |   10 +-
 .../locale/pt_BR/LC_MESSAGES/PtitUrl.po       |   10 +-
 .../PtitUrl/locale/ru/LC_MESSAGES/PtitUrl.po  |   10 +-
 .../PtitUrl/locale/tl/LC_MESSAGES/PtitUrl.po  |   10 +-
 .../PtitUrl/locale/uk/LC_MESSAGES/PtitUrl.po  |   10 +-
 plugins/RSSCloud/locale/RSSCloud.pot          |    4 +-
 .../locale/de/LC_MESSAGES/RSSCloud.po         |   10 +-
 .../locale/fr/LC_MESSAGES/RSSCloud.po         |   10 +-
 .../locale/ia/LC_MESSAGES/RSSCloud.po         |   10 +-
 .../locale/mk/LC_MESSAGES/RSSCloud.po         |   10 +-
 .../locale/nl/LC_MESSAGES/RSSCloud.po         |   10 +-
 .../locale/tl/LC_MESSAGES/RSSCloud.po         |   10 +-
 .../locale/uk/LC_MESSAGES/RSSCloud.po         |   10 +-
 plugins/Realtime/locale/Realtime.pot          |    2 +-
 plugins/Recaptcha/locale/Recaptcha.pot        |    8 +-
 .../locale/de/LC_MESSAGES/Recaptcha.po        |   14 +-
 .../locale/fr/LC_MESSAGES/Recaptcha.po        |   14 +-
 .../locale/fur/LC_MESSAGES/Recaptcha.po       |   10 +-
 .../locale/ia/LC_MESSAGES/Recaptcha.po        |   14 +-
 .../locale/mk/LC_MESSAGES/Recaptcha.po        |   14 +-
 .../locale/nb/LC_MESSAGES/Recaptcha.po        |   14 +-
 .../locale/nl/LC_MESSAGES/Recaptcha.po        |   14 +-
 .../locale/pt/LC_MESSAGES/Recaptcha.po        |   14 +-
 .../locale/ru/LC_MESSAGES/Recaptcha.po        |   14 +-
 .../locale/tl/LC_MESSAGES/Recaptcha.po        |   14 +-
 .../locale/uk/LC_MESSAGES/Recaptcha.po        |   14 +-
 .../locale/RegisterThrottle.pot               |    2 +-
 .../locale/RequireValidatedEmail.pot          |    8 +-
 .../de/LC_MESSAGES/RequireValidatedEmail.po   |   10 +-
 .../fr/LC_MESSAGES/RequireValidatedEmail.po   |   10 +-
 .../ia/LC_MESSAGES/RequireValidatedEmail.po   |   10 +-
 .../mk/LC_MESSAGES/RequireValidatedEmail.po   |   10 +-
 .../nl/LC_MESSAGES/RequireValidatedEmail.po   |   10 +-
 .../tl/LC_MESSAGES/RequireValidatedEmail.po   |   10 +-
 .../uk/LC_MESSAGES/RequireValidatedEmail.po   |   10 +-
 .../locale/ReverseUsernameAuthentication.pot  |    2 +-
 .../ReverseUsernameAuthentication.po          |    8 +-
 .../ReverseUsernameAuthentication.po          |    8 +-
 .../ReverseUsernameAuthentication.po          |    8 +-
 .../ReverseUsernameAuthentication.po          |    8 +-
 .../ReverseUsernameAuthentication.po          |    8 +-
 .../ReverseUsernameAuthentication.po          |    8 +-
 .../ReverseUsernameAuthentication.po          |    8 +-
 .../ReverseUsernameAuthentication.po          |    8 +-
 .../ReverseUsernameAuthentication.po          |    8 +-
 .../ReverseUsernameAuthentication.po          |    8 +-
 .../ReverseUsernameAuthentication.po          |    8 +-
 .../ReverseUsernameAuthentication.po          |    8 +-
 plugins/SQLProfile/locale/SQLProfile.pot      |    2 +-
 .../locale/de/LC_MESSAGES/SQLProfile.po       |    8 +-
 .../locale/fr/LC_MESSAGES/SQLProfile.po       |    8 +-
 .../locale/ia/LC_MESSAGES/SQLProfile.po       |    8 +-
 .../locale/mk/LC_MESSAGES/SQLProfile.po       |    8 +-
 .../locale/nl/LC_MESSAGES/SQLProfile.po       |    8 +-
 .../locale/pt/LC_MESSAGES/SQLProfile.po       |    4 +-
 .../locale/ru/LC_MESSAGES/SQLProfile.po       |    8 +-
 .../locale/uk/LC_MESSAGES/SQLProfile.po       |    8 +-
 plugins/Sample/locale/Sample.pot              |    8 +-
 .../Sample/locale/br/LC_MESSAGES/Sample.po    |   14 +-
 .../Sample/locale/de/LC_MESSAGES/Sample.po    |   14 +-
 .../Sample/locale/fr/LC_MESSAGES/Sample.po    |   14 +-
 .../Sample/locale/ia/LC_MESSAGES/Sample.po    |   14 +-
 .../Sample/locale/lb/LC_MESSAGES/Sample.po    |   14 +-
 .../Sample/locale/mk/LC_MESSAGES/Sample.po    |   14 +-
 .../Sample/locale/nl/LC_MESSAGES/Sample.po    |   14 +-
 .../Sample/locale/ru/LC_MESSAGES/Sample.po    |   14 +-
 .../Sample/locale/tl/LC_MESSAGES/Sample.po    |   14 +-
 .../Sample/locale/uk/LC_MESSAGES/Sample.po    |   14 +-
 .../Sample/locale/zh_CN/LC_MESSAGES/Sample.po |   14 +-
 plugins/ShareNotice/locale/ShareNotice.pot    |    2 +-
 .../locale/br/LC_MESSAGES/ShareNotice.po      |    8 +-
 .../locale/ca/LC_MESSAGES/ShareNotice.po      |    8 +-
 .../locale/de/LC_MESSAGES/ShareNotice.po      |    8 +-
 .../locale/fr/LC_MESSAGES/ShareNotice.po      |    8 +-
 .../locale/ia/LC_MESSAGES/ShareNotice.po      |    8 +-
 .../locale/mk/LC_MESSAGES/ShareNotice.po      |    8 +-
 .../locale/nl/LC_MESSAGES/ShareNotice.po      |    8 +-
 .../locale/tl/LC_MESSAGES/ShareNotice.po      |    8 +-
 .../locale/uk/LC_MESSAGES/ShareNotice.po      |    8 +-
 plugins/SimpleUrl/locale/SimpleUrl.pot        |    4 +-
 .../locale/br/LC_MESSAGES/SimpleUrl.po        |   10 +-
 .../locale/de/LC_MESSAGES/SimpleUrl.po        |   10 +-
 .../locale/es/LC_MESSAGES/SimpleUrl.po        |   10 +-
 .../locale/fr/LC_MESSAGES/SimpleUrl.po        |   10 +-
 .../locale/gl/LC_MESSAGES/SimpleUrl.po        |   10 +-
 .../locale/he/LC_MESSAGES/SimpleUrl.po        |   10 +-
 .../locale/ia/LC_MESSAGES/SimpleUrl.po        |   10 +-
 .../locale/id/LC_MESSAGES/SimpleUrl.po        |   10 +-
 .../locale/ja/LC_MESSAGES/SimpleUrl.po        |   10 +-
 .../locale/mk/LC_MESSAGES/SimpleUrl.po        |   10 +-
 .../locale/nb/LC_MESSAGES/SimpleUrl.po        |   10 +-
 .../locale/nl/LC_MESSAGES/SimpleUrl.po        |   10 +-
 .../locale/pt/LC_MESSAGES/SimpleUrl.po        |   10 +-
 .../locale/ru/LC_MESSAGES/SimpleUrl.po        |   10 +-
 .../locale/tl/LC_MESSAGES/SimpleUrl.po        |   10 +-
 .../locale/uk/LC_MESSAGES/SimpleUrl.po        |   10 +-
 plugins/Sitemap/locale/Sitemap.pot            |    2 +-
 .../Sitemap/locale/br/LC_MESSAGES/Sitemap.po  |    8 +-
 .../Sitemap/locale/de/LC_MESSAGES/Sitemap.po  |    8 +-
 .../Sitemap/locale/fr/LC_MESSAGES/Sitemap.po  |    8 +-
 .../Sitemap/locale/ia/LC_MESSAGES/Sitemap.po  |    8 +-
 .../Sitemap/locale/mk/LC_MESSAGES/Sitemap.po  |    8 +-
 .../Sitemap/locale/nl/LC_MESSAGES/Sitemap.po  |    8 +-
 .../Sitemap/locale/ru/LC_MESSAGES/Sitemap.po  |    8 +-
 .../Sitemap/locale/tl/LC_MESSAGES/Sitemap.po  |    8 +-
 .../Sitemap/locale/uk/LC_MESSAGES/Sitemap.po  |    8 +-
 .../locale/SlicedFavorites.pot                |    2 +-
 .../locale/de/LC_MESSAGES/SlicedFavorites.po  |    8 +-
 .../locale/fr/LC_MESSAGES/SlicedFavorites.po  |    8 +-
 .../locale/he/LC_MESSAGES/SlicedFavorites.po  |    8 +-
 .../locale/ia/LC_MESSAGES/SlicedFavorites.po  |    8 +-
 .../locale/id/LC_MESSAGES/SlicedFavorites.po  |    8 +-
 .../locale/mk/LC_MESSAGES/SlicedFavorites.po  |    8 +-
 .../locale/nl/LC_MESSAGES/SlicedFavorites.po  |    8 +-
 .../locale/ru/LC_MESSAGES/SlicedFavorites.po  |    8 +-
 .../locale/tl/LC_MESSAGES/SlicedFavorites.po  |    8 +-
 .../locale/uk/LC_MESSAGES/SlicedFavorites.po  |    8 +-
 plugins/SphinxSearch/locale/SphinxSearch.pot  |    2 +-
 .../locale/de/LC_MESSAGES/SphinxSearch.po     |    8 +-
 .../locale/fr/LC_MESSAGES/SphinxSearch.po     |    8 +-
 .../locale/ia/LC_MESSAGES/SphinxSearch.po     |    8 +-
 .../locale/mk/LC_MESSAGES/SphinxSearch.po     |    8 +-
 .../locale/nl/LC_MESSAGES/SphinxSearch.po     |    8 +-
 .../locale/ru/LC_MESSAGES/SphinxSearch.po     |    8 +-
 .../locale/tl/LC_MESSAGES/SphinxSearch.po     |    8 +-
 .../locale/uk/LC_MESSAGES/SphinxSearch.po     |    8 +-
 .../locale/StrictTransportSecurity.pot        |   23 +
 plugins/SubMirror/locale/SubMirror.pot        |    2 +-
 .../locale/de/LC_MESSAGES/SubMirror.po        |    8 +-
 .../locale/fr/LC_MESSAGES/SubMirror.po        |    8 +-
 .../locale/ia/LC_MESSAGES/SubMirror.po        |    8 +-
 .../locale/mk/LC_MESSAGES/SubMirror.po        |    8 +-
 .../locale/nl/LC_MESSAGES/SubMirror.po        |    8 +-
 .../locale/tl/LC_MESSAGES/SubMirror.po        |    8 +-
 .../locale/uk/LC_MESSAGES/SubMirror.po        |    4 +-
 .../locale/SubscriptionThrottle.pot           |    2 +-
 .../de/LC_MESSAGES/SubscriptionThrottle.po    |    8 +-
 .../es/LC_MESSAGES/SubscriptionThrottle.po    |    8 +-
 .../fr/LC_MESSAGES/SubscriptionThrottle.po    |    8 +-
 .../he/LC_MESSAGES/SubscriptionThrottle.po    |    8 +-
 .../ia/LC_MESSAGES/SubscriptionThrottle.po    |    8 +-
 .../id/LC_MESSAGES/SubscriptionThrottle.po    |    8 +-
 .../mk/LC_MESSAGES/SubscriptionThrottle.po    |    8 +-
 .../nb/LC_MESSAGES/SubscriptionThrottle.po    |    8 +-
 .../nl/LC_MESSAGES/SubscriptionThrottle.po    |    8 +-
 .../pt/LC_MESSAGES/SubscriptionThrottle.po    |    4 +-
 .../ru/LC_MESSAGES/SubscriptionThrottle.po    |    8 +-
 .../tl/LC_MESSAGES/SubscriptionThrottle.po    |    8 +-
 .../uk/LC_MESSAGES/SubscriptionThrottle.po    |    8 +-
 plugins/TabFocus/locale/TabFocus.pot          |    2 +-
 .../locale/br/LC_MESSAGES/TabFocus.po         |    8 +-
 .../locale/es/LC_MESSAGES/TabFocus.po         |    8 +-
 .../locale/fr/LC_MESSAGES/TabFocus.po         |    8 +-
 .../locale/gl/LC_MESSAGES/TabFocus.po         |    8 +-
 .../locale/he/LC_MESSAGES/TabFocus.po         |    8 +-
 .../locale/ia/LC_MESSAGES/TabFocus.po         |    8 +-
 .../locale/id/LC_MESSAGES/TabFocus.po         |    8 +-
 .../locale/mk/LC_MESSAGES/TabFocus.po         |    8 +-
 .../locale/nb/LC_MESSAGES/TabFocus.po         |    8 +-
 .../locale/nl/LC_MESSAGES/TabFocus.po         |    8 +-
 .../locale/ru/LC_MESSAGES/TabFocus.po         |    8 +-
 .../locale/tl/LC_MESSAGES/TabFocus.po         |    8 +-
 .../locale/uk/LC_MESSAGES/TabFocus.po         |    8 +-
 plugins/TightUrl/locale/TightUrl.pot          |    4 +-
 .../locale/de/LC_MESSAGES/TightUrl.po         |   10 +-
 .../locale/es/LC_MESSAGES/TightUrl.po         |   10 +-
 .../locale/fr/LC_MESSAGES/TightUrl.po         |   10 +-
 .../locale/gl/LC_MESSAGES/TightUrl.po         |   10 +-
 .../locale/he/LC_MESSAGES/TightUrl.po         |   10 +-
 .../locale/ia/LC_MESSAGES/TightUrl.po         |   10 +-
 .../locale/id/LC_MESSAGES/TightUrl.po         |   10 +-
 .../locale/ja/LC_MESSAGES/TightUrl.po         |   10 +-
 .../locale/mk/LC_MESSAGES/TightUrl.po         |   10 +-
 .../locale/nb/LC_MESSAGES/TightUrl.po         |   10 +-
 .../locale/nl/LC_MESSAGES/TightUrl.po         |   10 +-
 .../locale/pt/LC_MESSAGES/TightUrl.po         |    6 +-
 .../locale/pt_BR/LC_MESSAGES/TightUrl.po      |   10 +-
 .../locale/ru/LC_MESSAGES/TightUrl.po         |   10 +-
 .../locale/tl/LC_MESSAGES/TightUrl.po         |   10 +-
 .../locale/uk/LC_MESSAGES/TightUrl.po         |   10 +-
 plugins/TinyMCE/locale/TinyMCE.pot            |    2 +-
 .../TinyMCE/locale/ca/LC_MESSAGES/TinyMCE.po  |    8 +-
 .../TinyMCE/locale/eo/LC_MESSAGES/TinyMCE.po  |    8 +-
 .../TinyMCE/locale/es/LC_MESSAGES/TinyMCE.po  |    8 +-
 .../TinyMCE/locale/fr/LC_MESSAGES/TinyMCE.po  |    8 +-
 .../TinyMCE/locale/he/LC_MESSAGES/TinyMCE.po  |    8 +-
 .../TinyMCE/locale/ia/LC_MESSAGES/TinyMCE.po  |    8 +-
 .../TinyMCE/locale/id/LC_MESSAGES/TinyMCE.po  |    8 +-
 .../TinyMCE/locale/mk/LC_MESSAGES/TinyMCE.po  |    8 +-
 .../TinyMCE/locale/nb/LC_MESSAGES/TinyMCE.po  |    8 +-
 .../TinyMCE/locale/nl/LC_MESSAGES/TinyMCE.po  |    8 +-
 .../TinyMCE/locale/pt/LC_MESSAGES/TinyMCE.po  |    4 +-
 .../locale/pt_BR/LC_MESSAGES/TinyMCE.po       |    8 +-
 .../TinyMCE/locale/ru/LC_MESSAGES/TinyMCE.po  |    8 +-
 .../TinyMCE/locale/tl/LC_MESSAGES/TinyMCE.po  |    8 +-
 .../TinyMCE/locale/uk/LC_MESSAGES/TinyMCE.po  |    8 +-
 .../TwitterBridge/locale/TwitterBridge.pot    |   50 +-
 .../locale/br/LC_MESSAGES/TwitterBridge.po    |   56 +-
 .../locale/ca/LC_MESSAGES/TwitterBridge.po    |   56 +-
 .../locale/fa/LC_MESSAGES/TwitterBridge.po    |   56 +-
 .../locale/fr/LC_MESSAGES/TwitterBridge.po    |   56 +-
 .../locale/ia/LC_MESSAGES/TwitterBridge.po    |   56 +-
 .../locale/mk/LC_MESSAGES/TwitterBridge.po    |   56 +-
 .../locale/nl/LC_MESSAGES/TwitterBridge.po    |   56 +-
 .../locale/tr/LC_MESSAGES/TwitterBridge.po    |   56 +-
 .../locale/uk/LC_MESSAGES/TwitterBridge.po    |   56 +-
 .../locale/zh_CN/LC_MESSAGES/TwitterBridge.po |   56 +-
 plugins/UserFlag/locale/UserFlag.pot          |    2 +-
 .../locale/ca/LC_MESSAGES/UserFlag.po         |    8 +-
 .../locale/fr/LC_MESSAGES/UserFlag.po         |    8 +-
 .../locale/ia/LC_MESSAGES/UserFlag.po         |    8 +-
 .../locale/mk/LC_MESSAGES/UserFlag.po         |    8 +-
 .../locale/nl/LC_MESSAGES/UserFlag.po         |    8 +-
 .../locale/pt/LC_MESSAGES/UserFlag.po         |    8 +-
 .../locale/ru/LC_MESSAGES/UserFlag.po         |    8 +-
 .../locale/uk/LC_MESSAGES/UserFlag.po         |    8 +-
 plugins/UserLimit/locale/UserLimit.pot        |    2 +-
 .../locale/br/LC_MESSAGES/UserLimit.po        |    8 +-
 .../locale/de/LC_MESSAGES/UserLimit.po        |    8 +-
 .../locale/es/LC_MESSAGES/UserLimit.po        |    8 +-
 .../locale/fi/LC_MESSAGES/UserLimit.po        |    8 +-
 .../locale/fr/LC_MESSAGES/UserLimit.po        |    8 +-
 .../locale/gl/LC_MESSAGES/UserLimit.po        |    8 +-
 .../locale/he/LC_MESSAGES/UserLimit.po        |    8 +-
 .../locale/ia/LC_MESSAGES/UserLimit.po        |    8 +-
 .../locale/id/LC_MESSAGES/UserLimit.po        |    8 +-
 .../locale/lb/LC_MESSAGES/UserLimit.po        |    8 +-
 .../locale/lv/LC_MESSAGES/UserLimit.po        |    8 +-
 .../locale/mk/LC_MESSAGES/UserLimit.po        |    8 +-
 .../locale/nb/LC_MESSAGES/UserLimit.po        |    8 +-
 .../locale/nl/LC_MESSAGES/UserLimit.po        |    8 +-
 .../locale/pt/LC_MESSAGES/UserLimit.po        |    8 +-
 .../locale/pt_BR/LC_MESSAGES/UserLimit.po     |    8 +-
 .../locale/ru/LC_MESSAGES/UserLimit.po        |    8 +-
 .../locale/tl/LC_MESSAGES/UserLimit.po        |    8 +-
 .../locale/tr/LC_MESSAGES/UserLimit.po        |    8 +-
 .../locale/uk/LC_MESSAGES/UserLimit.po        |    8 +-
 plugins/WikiHashtags/locale/WikiHashtags.pot  |    2 +-
 .../locale/br/LC_MESSAGES/WikiHashtags.po     |    8 +-
 .../locale/de/LC_MESSAGES/WikiHashtags.po     |    8 +-
 .../locale/fr/LC_MESSAGES/WikiHashtags.po     |    8 +-
 .../locale/he/LC_MESSAGES/WikiHashtags.po     |    8 +-
 .../locale/ia/LC_MESSAGES/WikiHashtags.po     |    8 +-
 .../locale/id/LC_MESSAGES/WikiHashtags.po     |    8 +-
 .../locale/mk/LC_MESSAGES/WikiHashtags.po     |    8 +-
 .../locale/nb/LC_MESSAGES/WikiHashtags.po     |    8 +-
 .../locale/nl/LC_MESSAGES/WikiHashtags.po     |    8 +-
 .../locale/pt/LC_MESSAGES/WikiHashtags.po     |    4 +-
 .../locale/pt_BR/LC_MESSAGES/WikiHashtags.po  |    8 +-
 .../locale/ru/LC_MESSAGES/WikiHashtags.po     |    8 +-
 .../locale/tl/LC_MESSAGES/WikiHashtags.po     |    8 +-
 .../locale/tr/LC_MESSAGES/WikiHashtags.po     |    8 +-
 .../locale/uk/LC_MESSAGES/WikiHashtags.po     |    8 +-
 .../WikiHowProfile/locale/WikiHowProfile.pot  |    2 +-
 .../locale/fr/LC_MESSAGES/WikiHowProfile.po   |    8 +-
 .../locale/ia/LC_MESSAGES/WikiHowProfile.po   |    8 +-
 .../locale/mk/LC_MESSAGES/WikiHowProfile.po   |    8 +-
 .../locale/nl/LC_MESSAGES/WikiHowProfile.po   |    8 +-
 .../locale/ru/LC_MESSAGES/WikiHowProfile.po   |    8 +-
 .../locale/tl/LC_MESSAGES/WikiHowProfile.po   |    8 +-
 .../locale/tr/LC_MESSAGES/WikiHowProfile.po   |    8 +-
 .../locale/uk/LC_MESSAGES/WikiHowProfile.po   |    8 +-
 plugins/XCache/locale/XCache.pot              |    2 +-
 .../XCache/locale/br/LC_MESSAGES/XCache.po    |    8 +-
 .../XCache/locale/es/LC_MESSAGES/XCache.po    |    8 +-
 .../XCache/locale/fi/LC_MESSAGES/XCache.po    |    8 +-
 .../XCache/locale/fr/LC_MESSAGES/XCache.po    |    8 +-
 .../XCache/locale/gl/LC_MESSAGES/XCache.po    |    8 +-
 .../XCache/locale/he/LC_MESSAGES/XCache.po    |    8 +-
 .../XCache/locale/ia/LC_MESSAGES/XCache.po    |    8 +-
 .../XCache/locale/id/LC_MESSAGES/XCache.po    |    8 +-
 .../XCache/locale/mk/LC_MESSAGES/XCache.po    |    8 +-
 .../XCache/locale/nb/LC_MESSAGES/XCache.po    |    8 +-
 .../XCache/locale/nl/LC_MESSAGES/XCache.po    |    8 +-
 .../XCache/locale/pt/LC_MESSAGES/XCache.po    |    4 +-
 .../XCache/locale/pt_BR/LC_MESSAGES/XCache.po |    8 +-
 .../XCache/locale/ru/LC_MESSAGES/XCache.po    |    8 +-
 .../XCache/locale/tl/LC_MESSAGES/XCache.po    |    8 +-
 .../XCache/locale/tr/LC_MESSAGES/XCache.po    |    8 +-
 .../XCache/locale/uk/LC_MESSAGES/XCache.po    |    8 +-
 plugins/Xmpp/locale/Xmpp.pot                  |   31 +
 plugins/YammerImport/locale/YammerImport.pot  |    2 +-
 .../locale/br/LC_MESSAGES/YammerImport.po     |    8 +-
 .../locale/fr/LC_MESSAGES/YammerImport.po     |    8 +-
 .../locale/gl/LC_MESSAGES/YammerImport.po     |    8 +-
 .../locale/ia/LC_MESSAGES/YammerImport.po     |    8 +-
 .../locale/mk/LC_MESSAGES/YammerImport.po     |    8 +-
 .../locale/nl/LC_MESSAGES/YammerImport.po     |    8 +-
 .../locale/ru/LC_MESSAGES/YammerImport.po     |    8 +-
 .../locale/tr/LC_MESSAGES/YammerImport.po     |    8 +-
 .../locale/uk/LC_MESSAGES/YammerImport.po     |    8 +-
 456 files changed, 56505 insertions(+), 48439 deletions(-)
 create mode 100644 plugins/AccountManager/locale/AccountManager.pot
 create mode 100644 plugins/Aim/locale/Aim.pot
 create mode 100644 plugins/ExtendedProfile/locale/ExtendedProfile.pot
 create mode 100644 plugins/Irc/locale/Irc.pot
 create mode 100644 plugins/Msn/locale/Msn.pot
 create mode 100644 plugins/StrictTransportSecurity/locale/StrictTransportSecurity.pot
 create mode 100644 plugins/Xmpp/locale/Xmpp.pot

diff --git a/locale/ar/LC_MESSAGES/statusnet.po b/locale/ar/LC_MESSAGES/statusnet.po
index b0a3b8577f..c207204036 100644
--- a/locale/ar/LC_MESSAGES/statusnet.po
+++ b/locale/ar/LC_MESSAGES/statusnet.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 15:58+0000\n"
-"PO-Revision-Date: 2011-03-03 16:00:08+0000\n"
+"POT-Creation-Date: 2011-03-03 17:23+0000\n"
+"PO-Revision-Date: 2011-03-03 17:25:35+0000\n"
 "Language-Team: Arabic <http://translatewiki.net/wiki/Portal:ar>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -81,23 +81,23 @@ msgstr "حفظ إعدادت الوصول"
 #. TRANS: Tooltip for button to save access settings in site admin panel.
 #. TRANS: Button text for saving theme settings.
 #. TRANS: Button label to save e-mail preferences.
-#. TRANS: Button label to save Instant Messaging preferences.
-#. TRANS: Button text for saving "Other settings" in profile.
+#. TRANS: Button label to save IM preferences.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
 #. TRANS: Button text for saving site notice in admin panel.
 #. TRANS: Button label to save SMS preferences.
 #. TRANS: Save button for settings for a profile in a subscriptions list.
+#. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
 #. TRANS: Button text on profile design page to save settings.
 #: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
-#: actions/emailsettings.php:250 actions/imsettings.php:183
-#: actions/othersettings.php:136 actions/pathsadminpanel.php:512
-#: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
-#: actions/smssettings.php:205 actions/subscriptions.php:259
+#: actions/emailsettings.php:251 actions/imsettings.php:199
+#: actions/pathsadminpanel.php:512 actions/profilesettings.php:198
+#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:204
+#: actions/subscriptions.php:261 actions/urlsettings.php:152
 #: actions/useradminpanel.php:298 lib/applicationeditform.php:355
-#: lib/designsettings.php:270 lib/groupeditform.php:201
+#: lib/designform.php:320 lib/groupeditform.php:201
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "احفظ"
@@ -136,7 +136,11 @@ msgstr "لا صفحة كهذه."
 #. 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 use "one time password login" without using an existing user.
+#. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
+#. TRANS: Client error displayed trying to find a user by ID for a non-existing ID.
+#. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when calling a profile action without specifying a user.
 #: actions/all.php:80 actions/allrss.php:69
@@ -148,19 +152,19 @@ msgstr "لا صفحة كهذه."
 #: actions/apidirectmessage.php:75 actions/apidirectmessagenew.php:72
 #: actions/apigroupcreate.php:111 actions/apigroupismember.php:89
 #: actions/apigroupjoin.php:98 actions/apigroupleave.php:98
-#: actions/apigrouplist.php:70 actions/apistatusesupdate.php:230
-#: actions/apisubscriptions.php:85 actions/apitimelinefavorites.php:70
-#: actions/apitimelinefriends.php:173 actions/apitimelinehome.php:78
-#: actions/apitimelinementions.php:77 actions/apitimelineuser.php:79
-#: actions/avatarbynickname.php:79 actions/favoritesrss.php:72
-#: actions/foaf.php:42 actions/foaf.php:61 actions/hcard.php:67
-#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
-#: actions/remotesubscribe.php:144 actions/remotesubscribe.php:153
-#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
-#: actions/showfavorites.php:106 actions/userbyid.php:74
-#: actions/usergroups.php:93 actions/userrss.php:40 actions/userxrd.php:59
-#: actions/xrds.php:71 lib/command.php:509 lib/galleryaction.php:59
-#: lib/mailbox.php:80 lib/profileaction.php:77
+#: actions/apigrouplist.php:70 actions/apigroupprofileupdate.php:108
+#: actions/apistatusesupdate.php:230 actions/apisubscriptions.php:85
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:173
+#: actions/apitimelinehome.php:78 actions/apitimelinementions.php:77
+#: actions/apitimelineuser.php:79 actions/avatarbynickname.php:79
+#: actions/favoritesrss.php:72 actions/foaf.php:42 actions/foaf.php:61
+#: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116
+#: actions/otp.php:78 actions/remotesubscribe.php:144
+#: actions/remotesubscribe.php:153 actions/replies.php:73
+#: actions/repliesrss.php:38 actions/rsd.php:113 actions/showfavorites.php:106
+#: actions/userbyid.php:75 actions/usergroups.php:93 actions/userrss.php:40
+#: actions/userxrd.php:59 actions/xrds.php:71 lib/command.php:509
+#: lib/galleryaction.php:59 lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "لا مستخدم كهذا."
 
@@ -174,10 +178,9 @@ msgstr "%1$s والأصدقاء, الصفحة %2$d"
 #. TRANS: H1 text for page. %s is a user nickname.
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Timeline title for user and friends. %s is a user nickname.
-#. TRANS: Tooltop for personal group navigation menu option when logged in for viewing timeline of self and friends.
 #: actions/all.php:94 actions/all.php:191 actions/allrss.php:117
 #: actions/apitimelinefriends.php:207 actions/apitimelinehome.php:113
-#: lib/personalgroupnav.php:102
+#: lib/personalgroupnav.php:100
 #, php-format
 msgid "%s and friends"
 msgstr "%s والأصدقاء"
@@ -229,7 +232,7 @@ msgstr ""
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
 #. TRANS: Second sentence of empty message for anonymous users. %s is a user nickname.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:227
+#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:221
 #, fuzzy, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -278,19 +281,20 @@ msgstr "الإشعارات التي فضلها %1$s في %2$s!"
 #: actions/apifavoritecreate.php:98 actions/apifavoritedestroy.php:98
 #: actions/apifriendshipscreate.php:99 actions/apifriendshipsdestroy.php:99
 #: actions/apifriendshipsshow.php:124 actions/apigroupcreate.php:138
-#: actions/apigroupismember.php:115 actions/apigroupjoin.php:160
-#: actions/apigroupleave.php:145 actions/apigrouplist.php:134
+#: actions/apigroupismember.php:115 actions/apigroupjoin.php:151
+#: actions/apigroupleave.php:141 actions/apigrouplist.php:134
 #: actions/apigrouplistall.php:120 actions/apigroupmembership.php:105
+#: actions/apigroupprofileupdate.php:100 actions/apigroupprofileupdate.php:213
 #: actions/apigroupshow.php:114 actions/apihelptest.php:84
 #: actions/apistatusesdestroy.php:101 actions/apistatusesretweets.php:110
 #: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:139
 #: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
-#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:268
-#: actions/apitimelinegroup.php:147 actions/apitimelinehome.php:173
-#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:239
-#: actions/apitimelineretweetedtome.php:118
-#: actions/apitimelineretweetsofme.php:150 actions/apitimelinetag.php:159
-#: actions/apitimelineuser.php:206 actions/apiusershow.php:100
+#: actions/apitimelinefavorites.php:182 actions/apitimelinefriends.php:276
+#: actions/apitimelinegroup.php:148 actions/apitimelinehome.php:181
+#: actions/apitimelinementions.php:182 actions/apitimelinepublic.php:247
+#: actions/apitimelineretweetedtome.php:147
+#: actions/apitimelineretweetsofme.php:147 actions/apitimelinetag.php:165
+#: actions/apitimelineuser.php:217 actions/apiusershow.php:100
 msgid "API method not found."
 msgstr "لم يتم العثور على وسيلة API."
 
@@ -305,8 +309,9 @@ msgstr "لم يتم العثور على وسيلة API."
 #: actions/apifavoritecreate.php:88 actions/apifavoritedestroy.php:88
 #: actions/apifriendshipscreate.php:89 actions/apifriendshipsdestroy.php:89
 #: actions/apigroupcreate.php:102 actions/apigroupjoin.php:89
-#: actions/apigroupleave.php:89 actions/apimediaupload.php:66
-#: actions/apistatusesretweet.php:63 actions/apistatusesupdate.php:194
+#: actions/apigroupleave.php:89 actions/apigroupprofileupdate.php:92
+#: actions/apimediaupload.php:66 actions/apistatusesretweet.php:63
+#: actions/apistatusesupdate.php:194
 msgid "This method requires a POST."
 msgstr "تتطلب هذه الطريقة POST."
 
@@ -318,21 +323,16 @@ msgid ""
 msgstr ""
 
 #. TRANS: Server error displayed when a user's delivery device cannot be updated.
-#. TRANS: Server error displayed when a user update to the database fails in the contact address confirmation action.
 #. TRANS: Server error thrown on database error updating e-mail preferences.
 #. TRANS: Server error thrown on database error removing a registered e-mail address.
-#. TRANS: Server error thrown on database error updating Instant Messaging preferences.
-#. TRANS: Server error thrown on database error removing a registered Instant Messaging address.
-#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
 #. TRANS: Server error thrown when user profile settings could not be updated.
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
-#: actions/apiaccountupdatedeliverydevice.php:130
-#: actions/confirmaddress.php:118 actions/emailsettings.php:352
-#: actions/emailsettings.php:498 actions/imsettings.php:276
-#: actions/imsettings.php:432 actions/othersettings.php:186
-#: actions/profilesettings.php:322 actions/smssettings.php:301
-#: actions/smssettings.php:454
+#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
+#: actions/apiaccountupdatedeliverydevice.php:136
+#: actions/emailsettings.php:353 actions/emailsettings.php:499
+#: actions/profilesettings.php:323 actions/smssettings.php:300
+#: actions/smssettings.php:453 actions/urlsettings.php:211
 msgid "Could not update user."
 msgstr "تعذّر تحديث المستخدم."
 
@@ -358,7 +358,7 @@ msgstr "ليس للمستخدم ملف شخصي."
 
 #. TRANS: Server error displayed if a user profile could not be saved.
 #. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:418
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:419
 msgid "Could not save profile."
 msgstr "لم يمكن حفظ الملف."
 
@@ -370,7 +370,7 @@ msgstr "لم يمكن حفظ الملف."
 #: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
 #: actions/designadminpanel.php:120 actions/editapplication.php:121
 #: actions/newapplication.php:102 actions/newnotice.php:95
-#: lib/designsettings.php:298
+#: lib/designsettings.php:110
 #, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s byte) due to its "
@@ -395,8 +395,8 @@ msgstr[5] ""
 #: actions/apiaccountupdateprofilecolors.php:160
 #: actions/apiaccountupdateprofilecolors.php:171
 #: actions/groupdesignsettings.php:285 actions/groupdesignsettings.php:296
-#: actions/userdesignsettings.php:201 actions/userdesignsettings.php:211
-#: actions/userdesignsettings.php:253 actions/userdesignsettings.php:263
+#: actions/userdesignsettings.php:218 actions/userdesignsettings.php:228
+#: actions/userdesignsettings.php:270 actions/userdesignsettings.php:280
 msgid "Unable to save your design settings."
 msgstr "تعذّر حفظ إعدادات تصميمك."
 
@@ -404,7 +404,7 @@ msgstr "تعذّر حفظ إعدادات تصميمك."
 #. TRANS: Client error displayed when a database error occurs updating profile colours.
 #: actions/apiaccountupdateprofilebackgroundimage.php:191
 #: actions/apiaccountupdateprofilecolors.php:139
-#: actions/userdesignsettings.php:179
+#: actions/userdesignsettings.php:196
 msgid "Could not update your design."
 msgstr "تعذّر تحديث تصميمك."
 
@@ -516,7 +516,7 @@ msgstr "لم يُعثر على المستخدم المستلم."
 
 #. TRANS: Client error displayed trying to direct message another user who's not a friend (403).
 #: actions/apidirectmessagenew.php:144
-msgid "Can't send direct messages to users who aren't your friend."
+msgid "Cannot send direct messages to users who aren't your friend."
 msgstr ""
 
 #. TRANS: Client error displayed trying to direct message self (403).
@@ -597,9 +597,9 @@ msgstr "تعذّر إيجاد المستخدم الهدف."
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:156 actions/editgroup.php:191
-#: actions/newgroup.php:137 actions/profilesettings.php:273
-#: actions/register.php:214
+#: actions/apigroupcreate.php:156 actions/apigroupprofileupdate.php:255
+#: actions/editgroup.php:191 actions/newgroup.php:137
+#: actions/profilesettings.php:274 actions/register.php:199
 msgid "Nickname already in use. Try another one."
 msgstr "الاسم المستعار مستخدم بالفعل. جرّب اسمًا آخرًا."
 
@@ -607,9 +607,9 @@ msgstr "الاسم المستعار مستخدم بالفعل. جرّب اسمً
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:164 actions/editgroup.php:195
-#: actions/newgroup.php:141 actions/profilesettings.php:243
-#: actions/register.php:216
+#: actions/apigroupcreate.php:164 actions/apigroupprofileupdate.php:259
+#: actions/editgroup.php:195 actions/newgroup.php:141
+#: actions/profilesettings.php:244 actions/register.php:201
 msgid "Not a valid nickname."
 msgstr "ليس اسمًا مستعارًا صحيحًا."
 
@@ -619,10 +619,10 @@ msgstr "ليس اسمًا مستعارًا صحيحًا."
 #. TRANS: Validation error shown when providing an invalid homepage URL in the "New application" form.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:181 actions/editapplication.php:235
-#: actions/editgroup.php:202 actions/newapplication.php:221
-#: actions/newgroup.php:148 actions/profilesettings.php:248
-#: actions/register.php:223
+#: actions/apigroupcreate.php:181 actions/apigroupprofileupdate.php:277
+#: actions/editapplication.php:235 actions/editgroup.php:202
+#: actions/newapplication.php:221 actions/newgroup.php:148
+#: actions/profilesettings.php:249 actions/register.php:208
 msgid "Homepage is not a valid URL."
 msgstr "الصفحة الرئيسية ليست عنونًا صالحًا."
 
@@ -631,8 +631,8 @@ msgstr "الصفحة الرئيسية ليست عنونًا صالحًا."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:191 actions/editgroup.php:206
-#: actions/newgroup.php:152 actions/profilesettings.php:252
-#: actions/register.php:226
+#: actions/newgroup.php:152 actions/profilesettings.php:253
+#: actions/register.php:211
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "الاسم الكامل طويل جدًا (الحد الأقصى 255 حرفًا)."
 
@@ -663,8 +663,8 @@ msgstr[5] "المنظمة طويلة جدا (الأقصى %d حرفا)."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:215 actions/editgroup.php:218
-#: actions/newgroup.php:164 actions/profilesettings.php:265
-#: actions/register.php:235
+#: actions/newgroup.php:164 actions/profilesettings.php:266
+#: actions/register.php:220
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
 msgstr "المنظمة طويلة جدا (الأقصى 255 حرفا)."
@@ -698,15 +698,16 @@ msgstr "كنية غير صالحة: \"%s\"."
 #. TRANS: %s is the alias that is already in use.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error. %s is the already used alias.
-#: actions/apigroupcreate.php:264 actions/editgroup.php:246
-#: actions/newgroup.php:193
+#: actions/apigroupcreate.php:264 actions/apigroupprofileupdate.php:351
+#: actions/editgroup.php:246 actions/newgroup.php:193
 #, fuzzy, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "هذا الاسم مستخدم بالفعل. جرّب اسمًا آخر."
 
 #. TRANS: Client error displayed when trying to use an alias during group creation that is the same as the group's nickname.
 #. TRANS: Group edit form validation error.
-#: actions/apigroupcreate.php:278 actions/editgroup.php:253
+#: actions/apigroupcreate.php:278 actions/apigroupprofileupdate.php:359
+#: actions/editgroup.php:253
 msgid "Alias can't be the same as nickname."
 msgstr ""
 
@@ -718,7 +719,8 @@ msgstr ""
 #. TRANS: Client error displayed requesting most recent notices to a group for a non-existing group.
 #: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
 #: actions/apigroupleave.php:104 actions/apigroupmembership.php:71
-#: actions/apigroupshow.php:81 actions/apitimelinegroup.php:89
+#: actions/apigroupprofileupdate.php:113 actions/apigroupshow.php:81
+#: actions/apitimelinegroup.php:89
 msgid "Group not found."
 msgstr "المجموعة غير موجودة."
 
@@ -738,13 +740,11 @@ msgstr "أنت بالفعل عضو في هذه المجموعة"
 msgid "You have been blocked from that group by the admin."
 msgstr "لم تمنع هذا المستخدم."
 
-#. TRANS: Server error displayed when joining a group fails.
-#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
 #. 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.
 #. TRANS: Message given having failed to add a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:362
+#: actions/apigroupjoin.php:136 actions/joingroup.php:139 lib/command.php:362
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "لم يمكن ضم المستخدم %1$s إلى المجموعة %2$s."
@@ -754,8 +754,6 @@ msgstr "لم يمكن ضم المستخدم %1$s إلى المجموعة %2$s."
 msgid "You are not a member of this group."
 msgstr "لست عضوًا في هذه المجموعة"
 
-#. TRANS: Server error displayed when leaving a group fails.
-#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
 #. TRANS: Server error displayed when leaving a group failed in the database.
 #. TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
 #. TRANS: Message given having failed to remove a user from a group.
@@ -791,6 +789,62 @@ msgstr "مجموعات %s"
 msgid "groups on %s"
 msgstr "مجموعات %s"
 
+#. TRANS: Client error displayed trying to edit a group while not being a group admin.
+#. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
+#. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
+#: actions/apigroupprofileupdate.php:118 actions/editgroup.php:110
+#: actions/editgroup.php:176 actions/groupdesignsettings.php:109
+#: actions/grouplogo.php:111
+msgid "You must be an admin to edit the group."
+msgstr "يجب أن تكون إداريا لتعدل المجموعة."
+
+#. TRANS: Server error displayed when editing a group fails.
+#: actions/apigroupprofileupdate.php:171 actions/editgroup.php:274
+msgid "Could not update group."
+msgstr "تعذر تحديث المجموعة."
+
+#. TRANS: Server error displayed when group aliases could not be added.
+#. TRANS: Server exception thrown when creating group aliases failed.
+#: actions/apigroupprofileupdate.php:194 actions/editgroup.php:281
+#: classes/User_group.php:540
+msgid "Could not create aliases."
+msgstr "تعذّر إنشاء الكنى."
+
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: actions/apigroupprofileupdate.php:249 lib/nickname.php:165
+#, fuzzy
+msgid "Nickname must have only lowercase letters and numbers and no spaces."
+msgstr "1-64 حرفًا إنجليزيًا أو رقمًا بدون نقاط أو مسافات"
+
+#: actions/apigroupprofileupdate.php:286
+#, fuzzy
+msgid "Full name is too long (max 255 chars)."
+msgstr "الاسم الكامل طويل جدًا (الحد الأقصى 255 حرفًا)."
+
+#: actions/apigroupprofileupdate.php:296
+#, fuzzy, php-format
+msgid "description is too long (max %d chars)."
+msgstr "المنظمة طويلة جدا (الأقصى %d حرفا)."
+
+#: actions/apigroupprofileupdate.php:307
+#, fuzzy
+msgid "Location is too long (max 255 chars)."
+msgstr "المنظمة طويلة جدا (الأقصى 255 حرفا)."
+
+#: actions/apigroupprofileupdate.php:326
+#, fuzzy, php-format
+msgid "Too many aliases! Maximum %d."
+msgstr "كنيات كيرة! العدد الأقصى هو %d."
+
+#. TRANS: Group edit form validation error.
+#. TRANS: Group create form validation error.
+#. TRANS: %s is the invalid alias.
+#: actions/apigroupprofileupdate.php:342 actions/editgroup.php:241
+#: actions/newgroup.php:188
+#, php-format
+msgid "Invalid alias: \"%s\""
+msgstr "كنية غير صالحة: \"%s\""
+
 #. TRANS: Client error displayed when uploading a media file has failed.
 #: actions/apimediaupload.php:101
 #, fuzzy
@@ -825,21 +879,22 @@ msgstr "لا تملك تصريحًا."
 #. TRANS: Form validation error message.
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
+#. TRANS: Client error displayed when the session token is not okay.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
 #: actions/deletenotice.php:177 actions/disfavor.php:75
-#: actions/emailsettings.php:291 actions/favor.php:75 actions/geocode.php:55
+#: actions/emailsettings.php:292 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:65 actions/grouplogo.php:321
-#: actions/groupunblock.php:65 actions/imsettings.php:224
-#: actions/invite.php:60 actions/login.php:137 actions/makeadmin.php:66
-#: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
-#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
-#: actions/othersettings.php:155 actions/passwordsettings.php:138
-#: actions/profilesettings.php:217 actions/recoverpassword.php:383
-#: actions/register.php:172 actions/remotesubscribe.php:76
-#: actions/repeat.php:82 actions/smssettings.php:250 actions/subedit.php:40
-#: actions/subscribe.php:86 actions/tagother.php:166
-#: actions/unsubscribe.php:69 actions/userauthorization.php:52
-#: lib/designsettings.php:310
+#: actions/groupunblock.php:65 actions/imsettings.php:241
+#: actions/invite.php:60 actions/makeadmin.php:66 actions/newmessage.php:135
+#: actions/newnotice.php:105 actions/nudge.php:80
+#: actions/oauthappssettings.php:162 actions/oauthconnectionssettings.php:135
+#: actions/passwordsettings.php:137 actions/pluginenable.php:87
+#: actions/profilesettings.php:218 actions/recoverpassword.php:383
+#: actions/register.php:157 actions/remotesubscribe.php:76
+#: actions/repeat.php:82 actions/smssettings.php:249 actions/subedit.php:40
+#: actions/subscribe.php:87 actions/tagother.php:145
+#: actions/unsubscribe.php:69 actions/urlsettings.php:171
+#: actions/userauthorization.php:53 lib/designsettings.php:122
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 
@@ -868,10 +923,10 @@ msgstr "خطأ في قاعدة البيانات أثناء حذف مستخدم 
 #. TRANS: Unknown form validation error in design settings form.
 #: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
 #: actions/designadminpanel.php:100 actions/editapplication.php:144
-#: actions/emailsettings.php:310 actions/grouplogo.php:332
-#: actions/imsettings.php:239 actions/newapplication.php:124
-#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
-#: actions/smssettings.php:271 lib/designsettings.php:321
+#: actions/emailsettings.php:311 actions/grouplogo.php:332
+#: actions/imsettings.php:256 actions/newapplication.php:124
+#: actions/oauthconnectionssettings.php:144 actions/recoverpassword.php:46
+#: actions/smssettings.php:270 lib/designsettings.php:133
 msgid "Unexpected form submission."
 msgstr ""
 
@@ -914,31 +969,26 @@ msgstr "الحساب"
 
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Field label in form for profile settings.
-#. TRANS: Label for group nickname (dt). Text hidden by default.
-#. TRANS: DT for nick name in a profile.
-#: actions/apioauthauthorize.php:459 actions/login.php:252
-#: actions/profilesettings.php:106 actions/register.php:432
-#: actions/showgroup.php:243 actions/tagother.php:94
+#: actions/apioauthauthorize.php:459 actions/login.php:225
+#: actions/profilesettings.php:107 actions/register.php:411
 #: actions/userauthorization.php:145 lib/groupeditform.php:145
-#: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "الاسم المستعار"
 
 #. TRANS: Field label on OAuth API authorisation form.
-#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:463 actions/login.php:255
-#: actions/register.php:436 lib/accountsettingsaction.php:120
+#: actions/apioauthauthorize.php:463 actions/login.php:228
+#: actions/register.php:415 lib/settingsnav.php:87
 msgid "Password"
 msgstr "كلمة السر"
 
 #. TRANS: Button text that when clicked will cancel the process of allowing access to an account
 #. TRANS: by an external application.
 #. TRANS: Button label to cancel an e-mail address confirmation procedure.
-#. TRANS: Button label to cancel an Instant Messaging address confirmation procedure.
+#. TRANS: Button label to cancel an IM address confirmation procedure.
 #. TRANS: Button label to cancel a SMS address confirmation procedure.
 #. TRANS: Button label in the "Edit application" form.
-#: actions/apioauthauthorize.php:478 actions/emailsettings.php:124
-#: actions/imsettings.php:127 actions/smssettings.php:133
+#: actions/apioauthauthorize.php:478 actions/emailsettings.php:125
+#: actions/imsettings.php:136 actions/smssettings.php:132
 #: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Cancel"
@@ -1051,7 +1101,7 @@ msgstr "لم يتم العثور على وسيلة API."
 #. TRANS: %s is the requested output format.
 #: actions/apistatusesshow.php:144
 #, fuzzy, php-format
-msgid "Unsupported format: %s"
+msgid "Unsupported format: %s."
 msgstr "نسق غير مدعوم."
 
 #. TRANS: Client error displayed requesting a deleted status.
@@ -1141,13 +1191,6 @@ msgstr "%1$s انضم للمجموعة %2$s"
 msgid "%1$s updates favorited by %2$s / %3$s."
 msgstr "الإشعارات التي فضلها %1$s في %2$s!"
 
-#. TRANS: Server error displayed when generating an Atom feed fails.
-#. TRANS: %s is the error.
-#: actions/apitimelinegroup.php:134
-#, fuzzy, php-format
-msgid "Could not generate feed for group - %s"
-msgstr "تعذر تحديث المجموعة."
-
 #. TRANS: Title for timeline of most recent mentions of a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname.
 #: actions/apitimelinementions.php:115
@@ -1164,13 +1207,14 @@ msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr ""
 
 #. TRANS: Title for site timeline. %s is the StatusNet sitename.
+#. TRANS: Public RSS feed title. %s is the StatusNet site name.
 #: actions/apitimelinepublic.php:193 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "مسار %s الزمني العام"
 
 #. TRANS: Subtitle for site timeline. %s is the StatusNet sitename.
-#: actions/apitimelinepublic.php:199 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:199
 #, php-format
 msgid "%s updates from everyone!"
 msgstr ""
@@ -1182,21 +1226,33 @@ msgid "Unimplemented."
 msgstr "الأمر لم يُجهزّ بعد."
 
 #. TRANS: Title for Atom feed "repeated to me". %s is the user nickname.
-#: actions/apitimelineretweetedtome.php:108
+#: actions/apitimelineretweetedtome.php:96
 #, php-format
 msgid "Repeated to %s"
 msgstr "كرر إلى %s"
 
+#: actions/apitimelineretweetedtome.php:98
+#, fuzzy, php-format
+msgid "%1$s notices that were to repeated to %2$s / %3$s."
+msgstr "الإشعارات التي فضلها %1$s في %2$s!"
+
 #. TRANS: Title of list of repeated notices of the logged in user.
 #. TRANS: %s is the nickname of the logged in user.
-#: actions/apitimelineretweetsofme.php:112
+#: actions/apitimelineretweetsofme.php:98
 #, php-format
 msgid "Repeats of %s"
 msgstr "تكرارات %s"
 
+#: actions/apitimelineretweetsofme.php:104
+#, fuzzy, php-format
+msgid "%1$s notices that %2$s / %3$s has repeated."
+msgstr "لقد أضاف %s (@%s) إشعارك إلى مفضلاته"
+
 #. TRANS: Title for timeline with lastest notices with a given tag.
 #. TRANS: %s is the tag.
-#: actions/apitimelinetag.php:101 actions/tag.php:67
+#. TRANS: Title for first page of notices with tags.
+#. TRANS: %s is the tag.
+#: actions/apitimelinetag.php:101 actions/tag.php:69
 #, php-format
 msgid "Notices tagged with %s"
 msgstr "الإشعارات الموسومة ب%s"
@@ -1209,54 +1265,55 @@ msgid "Updates tagged with %1$s on %2$s!"
 msgstr "الإشعارات التي فضلها %1$s في %2$s!"
 
 #. TRANS: Client error displayed trying to add a notice to another user's timeline.
-#: actions/apitimelineuser.php:297
+#: actions/apitimelineuser.php:308
 #, fuzzy
 msgid "Only the user can add to their own timeline."
 msgstr "يستطيع المستخدمون الوالجون وحدهم تكرار الإشعارات."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:304
+#: actions/apitimelineuser.php:315
 msgid "Only accept AtomPub for Atom feeds."
 msgstr ""
 
 #. TRANS: Client error displayed attempting to post an empty API notice.
-#: actions/apitimelineuser.php:311
+#: actions/apitimelineuser.php:322
 msgid "Atom post must not be empty."
 msgstr ""
 
 #. TRANS: Client error displayed attempting to post an API that is not well-formed XML.
-#: actions/apitimelineuser.php:317
+#: actions/apitimelineuser.php:328
 msgid "Atom post must be well-formed XML."
 msgstr ""
 
 #. TRANS: Client error displayed when not using an Atom entry.
-#: actions/apitimelineuser.php:323 actions/atompubfavoritefeed.php:228
+#: actions/apitimelineuser.php:334 actions/atompubfavoritefeed.php:228
 #: actions/atompubmembershipfeed.php:230
 #: actions/atompubsubscriptionfeed.php:236
 msgid "Atom post must be an Atom entry."
 msgstr ""
 
 #. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
-#: actions/apitimelineuser.php:335
+#: actions/apitimelineuser.php:345
 msgid "Can only handle POST activities."
 msgstr ""
 
 #. TRANS: Client error displayed when using an unsupported activity object type.
 #. TRANS: %s is the unsupported activity object type.
-#: actions/apitimelineuser.php:346
+#: actions/apitimelineuser.php:356
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
 #. TRANS: %d is the notice ID (number).
-#: actions/apitimelineuser.php:380
+#: actions/apitimelineuser.php:390
 #, fuzzy, php-format
 msgid "No content for notice %d."
 msgstr "ابحث عن محتويات في الإشعارات"
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:408
+#. TRANS: %s is the notice URI.
+#: actions/apitimelineuser.php:419
 #, fuzzy, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "لا ملف بهذه الهوية."
@@ -1274,9 +1331,10 @@ msgstr "لم يُعثرعلى المستخدم."
 
 #. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
 #. TRANS: Client exception.
+#. TRANS: Client error displayed trying to subscribe to a non-existing profile.
 #: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
 #: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
-#: actions/subscribe.php:107
+#: actions/subscribe.php:110
 msgid "No such profile."
 msgstr "لا ملف كهذا."
 
@@ -1423,7 +1481,7 @@ msgid "Not a member."
 msgstr "جميع الأعضاء"
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
-#: actions/atompubshowmembership.php:151
+#: actions/atompubshowmembership.php:150
 #, fuzzy
 msgid "Cannot delete someone else's membership."
 msgstr "تعذّر حفظ الاشتراك."
@@ -1512,10 +1570,7 @@ msgid "Invalid size."
 msgstr "حجم غير صالح."
 
 #. TRANS: Title for avatar upload page.
-#. TRANS: Label for group avatar (dt). Text hidden by default.
-#. TRANS: Link description in user account settings menu.
-#: actions/avatarsettings.php:66 actions/showgroup.php:227
-#: lib/accountsettingsaction.php:113
+#: actions/avatarsettings.php:66 lib/settingsnav.php:82
 msgid "Avatar"
 msgstr "أفتار"
 
@@ -1528,9 +1583,11 @@ msgstr "بإمكانك رفع أفتارك الشخصي. أقصى حجم للم
 
 #. TRANS: Server error displayed in avatar upload page when no matching profile can be found for a user.
 #. TRANS: Server error displayed coming across a request from a user without a profile.
+#. TRANS: Server error displayed when trying to authorise a remote subscription request
+#. TRANS: while the user has no profile.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
 #: actions/grouplogo.php:184 actions/remotesubscribe.php:190
-#: actions/userauthorization.php:72 actions/userrss.php:108
+#: actions/userauthorization.php:75 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr "المستخدم بدون ملف مطابق."
 
@@ -1588,10 +1645,10 @@ msgstr "مجموعات"
 msgid "No file uploaded."
 msgstr "لم يُرفع ملف."
 
-#. TRANS: Avatar upload form unstruction after uploading a file.
+#. TRANS: Avatar upload form instruction after uploading a file.
 #: actions/avatarsettings.php:345
 #, fuzzy
-msgid "Pick a square area of the image to be your avatar"
+msgid "Pick a square area of the image to be your avatar."
 msgstr "اختر منطقة مربعة من الصورة لتكون صورة أفتارك."
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
@@ -1617,7 +1674,7 @@ msgstr "حُذف الأفتار."
 
 #. TRANS: Title for backup account page.
 #. TRANS: Option in profile settings to create a backup of the account of the currently logged in user.
-#: actions/backupaccount.php:61 actions/profilesettings.php:467
+#: actions/backupaccount.php:61 actions/profilesettings.php:468
 msgid "Backup account"
 msgstr ""
 
@@ -1651,7 +1708,7 @@ msgstr "الخلفية"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
 #: actions/backupaccount.php:254
-msgid "Backup your account"
+msgid "Backup your account."
 msgstr ""
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
@@ -1692,7 +1749,7 @@ msgstr "لا"
 #. TRANS: Submit button title for 'No' when blocking a user.
 #: actions/block.php:158
 #, fuzzy
-msgid "Do not block this user"
+msgid "Do not block this user."
 msgstr "لا تمنع هذا المستخدم"
 
 #. TRANS: Button label on the user block form.
@@ -1709,9 +1766,9 @@ msgid "Yes"
 msgstr "نعم"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#. TRANS: Description of the form to block a user.
-#: actions/block.php:165 lib/blockform.php:79
-msgid "Block this user"
+#: actions/block.php:165
+#, fuzzy
+msgid "Block this user."
 msgstr "امنع هذا المستخدم"
 
 #. TRANS: Server error displayed when blocking a user fails.
@@ -1778,33 +1835,49 @@ msgstr "لم يوجد رمز التأكيد."
 msgid "That confirmation code is not for you!"
 msgstr "رمز التأكيد ليس لك!"
 
-#. TRANS: Server error for a unknow address type %s, which can be 'email', 'jabber', or 'sms'.
-#: actions/confirmaddress.php:92
-#, php-format
-msgid "Unrecognized address type %s."
-msgstr ""
+#. TRANS: Server error for an unknown address type, which can be 'email', 'sms', or the name of an IM network (such as 'xmpp' or 'aim')
+#: actions/confirmaddress.php:94
+#, fuzzy, php-format
+msgid "Unrecognized address type %s"
+msgstr "نوع رسالة غير مدعوم: %s"
 
 #. TRANS: Client error for an already confirmed email/jabber/sms address.
-#: actions/confirmaddress.php:97
+#: actions/confirmaddress.php:103 actions/confirmaddress.php:136
 #, fuzzy
 msgid "That address has already been confirmed."
 msgstr "هذا البريد الإلكتروني ملك مستخدم آخر بالفعل."
 
+#: actions/confirmaddress.php:121 actions/imsettings.php:444
+#: actions/userdesignsettings.php:306
+#, fuzzy
+msgid "Couldn't update user."
+msgstr "تعذّر تحديث المستخدم."
+
+#: actions/confirmaddress.php:144
+#, fuzzy
+msgid "Couldn't update user im preferences."
+msgstr "تعذّر تحديث سجل المستخدم."
+
+#: actions/confirmaddress.php:156
+#, fuzzy
+msgid "Couldn't insert user im preferences."
+msgstr "تعذّر إدراج اشتراك جديد."
+
 #. TRANS: Server error displayed when an address confirmation code deletion from the
 #. TRANS: database fails in the contact address confirmation action.
-#: actions/confirmaddress.php:132
+#: actions/confirmaddress.php:169
 #, fuzzy
 msgid "Could not delete address confirmation."
 msgstr "تعذّر حذف تأكيد البريد المراسلة الفورية."
 
 #. TRANS: Title for the contact address confirmation action.
-#: actions/confirmaddress.php:150
+#: actions/confirmaddress.php:185
 msgid "Confirm address"
 msgstr "أكد العنوان"
 
 #. TRANS: Success message for the contact address confirmation action.
 #. TRANS: %s can be 'email', 'jabber', or 'sms'.
-#: actions/confirmaddress.php:166
+#: actions/confirmaddress.php:200
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr ""
@@ -1818,6 +1891,7 @@ msgstr "محادثة"
 #. TRANS: Label for user statistics.
 #: actions/conversation.php:149 lib/noticelist.php:87
 #: lib/profileaction.php:246 lib/searchgroupnav.php:82
+#: lib/threadednoticelist.php:66
 msgid "Notices"
 msgstr "الإشعارات"
 
@@ -1853,7 +1927,7 @@ msgstr "حُذف الأفتار."
 
 #. TRANS: Page title for page on which a user account can be deleted.
 #. TRANS: Option in profile settings to delete the account of the currently logged in user.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:475
+#: actions/deleteaccount.php:228 actions/profilesettings.php:476
 #, fuzzy
 msgid "Delete account"
 msgstr "أنشئ حسابًا"
@@ -1877,7 +1951,7 @@ msgstr ""
 #. TRANS: Field label for delete account confirmation entry.
 #. TRANS: Field label for password reset form where the password has to be typed again.
 #: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:262 actions/register.php:440
+#: actions/recoverpassword.php:262 actions/register.php:419
 msgid "Confirm"
 msgstr "أكّد"
 
@@ -1907,14 +1981,14 @@ msgstr "لم يوجد التطبيق."
 #. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
 #: actions/deleteapplication.php:79 actions/editapplication.php:78
-#: actions/showapplication.php:94
+#: actions/showapplication.php:90
 msgid "You are not the owner of this application."
 msgstr "أنت لست مالك هذا التطبيق."
 
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
-#: actions/newapplication.php:112 actions/showapplication.php:118
-#: lib/action.php:1425
+#: actions/newapplication.php:112 actions/showapplication.php:113
+#: lib/action.php:1391
 msgid "There was a problem with your session token."
 msgstr ""
 
@@ -1935,13 +2009,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting an application.
 #: actions/deleteapplication.php:161
 #, fuzzy
-msgid "Do not delete this application"
+msgid "Do not delete this application."
 msgstr "لا تحذف هذا التطبيق"
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
 #: actions/deleteapplication.php:167
 #, fuzzy
-msgid "Delete this application"
+msgid "Delete this application."
 msgstr "احذف هذا التطبيق"
 
 #. TRANS: Client error when trying to delete group while not logged in.
@@ -1997,13 +2071,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting a group.
 #: actions/deletegroup.php:224
 #, fuzzy
-msgid "Do not delete this group"
+msgid "Do not delete this group."
 msgstr "لا تحذف هذا الإشعار"
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
 #: actions/deletegroup.php:231
 #, fuzzy
-msgid "Delete this group"
+msgid "Delete this group."
 msgstr "احذف هذا المستخدم"
 
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
@@ -2011,14 +2085,16 @@ msgstr "احذف هذا المستخدم"
 #. TRANS: Client error displayed when trying to mark a notice as favorite without being logged in.
 #. TRANS: Client error displayed trying to block a user from a group while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
+#. TRANS: Client error displayed trying to log out when not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
+#. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
 #. TRANS: Client error displayed when trying to change user options while not logged in.
 #: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
-#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:69
+#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:70
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
-#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
-#: actions/tagother.php:33 actions/unsubscribe.php:52
+#: actions/nudge.php:63 actions/pluginenable.php:97 actions/subedit.php:33
+#: actions/subscribe.php:98 actions/tagother.php:33 actions/unsubscribe.php:52
 #: lib/adminpanelaction.php:71 lib/profileformaction.php:63
 #: lib/settingsaction.php:72
 msgid "Not logged in."
@@ -2045,12 +2121,13 @@ msgstr "أمتأكد من أنك تريد حذف هذا الإشعار؟"
 #. TRANS: Submit button title for 'No' when deleting a notice.
 #: actions/deletenotice.php:159
 #, fuzzy
-msgid "Do not delete this notice"
+msgid "Do not delete this notice."
 msgstr "لا تحذف هذا الإشعار"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:166 lib/noticelist.php:673
-msgid "Delete this notice"
+#: actions/deletenotice.php:166
+#, fuzzy
+msgid "Delete this notice."
 msgstr "احذف هذا الإشعار"
 
 #. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
@@ -2085,18 +2162,17 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting a user.
 #: actions/deleteuser.php:158
 #, fuzzy
-msgid "Do not delete this user"
+msgid "Do not delete this user."
 msgstr "لا تحذف هذا الإشعار"
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
-#. TRANS: Description of form for deleting a user.
-#: actions/deleteuser.php:165 lib/deleteuserform.php:75
-msgid "Delete this user"
+#: actions/deleteuser.php:165
+#, fuzzy
+msgid "Delete this user."
 msgstr "احذف هذا المستخدم"
 
 #. TRANS: Message used as title for design settings for the site.
-#. TRANS: Link description in user account settings menu.
-#: actions/designadminpanel.php:60 lib/accountsettingsaction.php:134
+#: actions/designadminpanel.php:60 lib/settingsnav.php:97
 msgid "Design"
 msgstr "التصميم"
 
@@ -2165,8 +2241,7 @@ msgid "You can upload a custom StatusNet theme as a .ZIP archive."
 msgstr ""
 
 #. TRANS: Fieldset legend for theme background image.
-#. TRANS: Fieldset legend on profile design page.
-#: actions/designadminpanel.php:515 lib/designsettings.php:98
+#: actions/designadminpanel.php:515
 msgid "Change background image"
 msgstr "تغيير صورة الخلفية"
 
@@ -2174,7 +2249,7 @@ msgstr "تغيير صورة الخلفية"
 #. TRANS: Field label for background color selector.
 #. TRANS: Label on profile design page for setting a profile page background colour.
 #: actions/designadminpanel.php:525 actions/designadminpanel.php:609
-#: lib/designsettings.php:183
+#: lib/designform.php:238
 msgid "Background"
 msgstr "الخلفية"
 
@@ -2199,13 +2274,13 @@ msgstr "عطّل"
 #. TRANS: Form guide for turning background image on or off on theme designer page.
 #. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
 #. TRANS: use of the uploaded profile image.
-#: actions/designadminpanel.php:577 lib/designsettings.php:159
+#: actions/designadminpanel.php:577 lib/designform.php:214
 msgid "Turn background image on or off."
 msgstr "مكّن صورة الخلفية أو عطّلها."
 
 #. TRANS: Checkbox label to title background image on theme designer page.
 #. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-#: actions/designadminpanel.php:583 lib/designsettings.php:165
+#: actions/designadminpanel.php:583 lib/designform.php:220
 #, fuzzy
 msgid "Tile background image"
 msgstr "تغيير صورة الخلفية"
@@ -2218,25 +2293,25 @@ msgstr "تغيير الألوان"
 
 #. TRANS: Field label for content color selector.
 #. TRANS: Label on profile design page for setting a profile page content colour.
-#: actions/designadminpanel.php:623 lib/designsettings.php:197
+#: actions/designadminpanel.php:623 lib/designform.php:252
 msgid "Content"
 msgstr "المحتوى"
 
 #. TRANS: Field label for sidebar color selector.
 #. TRANS: Label on profile design page for setting a profile page sidebar colour.
-#: actions/designadminpanel.php:637 lib/designsettings.php:211
+#: actions/designadminpanel.php:637 lib/designform.php:266
 msgid "Sidebar"
 msgstr "الشريط الجانبي"
 
 #. TRANS: Field label for text color selector.
 #. TRANS: Label on profile design page for setting a profile page text colour.
-#: actions/designadminpanel.php:651 lib/designsettings.php:225
+#: actions/designadminpanel.php:651 lib/designform.php:280
 msgid "Text"
 msgstr "النص"
 
 #. TRANS: Field label for link color selector.
 #. TRANS: Label on profile design page for setting a profile page links colour.
-#: actions/designadminpanel.php:665 lib/designsettings.php:239
+#: actions/designadminpanel.php:665 lib/designform.php:294
 msgid "Links"
 msgstr "وصلات"
 
@@ -2258,21 +2333,21 @@ msgid "Use defaults"
 msgstr "استخدم المبدئيات"
 
 #. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: actions/designadminpanel.php:720 lib/designsettings.php:259
-msgid "Restore default designs"
+#: actions/designadminpanel.php:720
+#, fuzzy
+msgid "Restore default designs."
 msgstr "استعد التصميمات المبدئية"
 
 #. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: actions/designadminpanel.php:728 lib/designsettings.php:267
-msgid "Reset back to default"
+#: actions/designadminpanel.php:728
+#, fuzzy
+msgid "Reset back to default."
 msgstr "ارجع إلى المبدئي"
 
 #. TRANS: Title for button for saving theme settings.
-#. TRANS: Title for button on profile design page to save settings.
-#: actions/designadminpanel.php:736 lib/designsettings.php:272
-msgid "Save design"
+#: actions/designadminpanel.php:736
+#, fuzzy
+msgid "Save design."
 msgstr "احفظ التصميم"
 
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
@@ -2304,7 +2379,7 @@ msgid "You must be logged in to edit an application."
 msgstr "يجب أن تكون مسجل الدخول لتعدل تطبيقا."
 
 #. TRANS: Client error displayed trying to edit an application that does not exist.
-#: actions/editapplication.php:83 actions/showapplication.php:87
+#: actions/editapplication.php:83 actions/showapplication.php:83
 msgid "No such application."
 msgstr "لا تطبيق كهذا."
 
@@ -2400,80 +2475,53 @@ msgstr "عدّل مجموعة %s"
 msgid "You must be logged in to create a group."
 msgstr "يجب أن تكون والجًا لتنشئ مجموعة."
 
-#. TRANS: Client error displayed trying to edit a group while not being a group admin.
-#. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
-#. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
-#: actions/editgroup.php:110 actions/editgroup.php:176
-#: actions/groupdesignsettings.php:109 actions/grouplogo.php:111
-msgid "You must be an admin to edit the group."
-msgstr "يجب أن تكون إداريا لتعدل المجموعة."
-
 #. TRANS: Form instructions for group edit form.
 #: actions/editgroup.php:161
 msgid "Use this form to edit the group."
 msgstr "استخدم هذا النموذج لتعديل المجموعة."
 
-#. TRANS: Group edit form validation error.
-#. TRANS: Group create form validation error.
-#. TRANS: %s is the invalid alias.
-#: actions/editgroup.php:241 actions/newgroup.php:188
-#, php-format
-msgid "Invalid alias: \"%s\""
-msgstr "كنية غير صالحة: \"%s\""
-
-#. TRANS: Server error displayed when editing a group fails.
-#: actions/editgroup.php:274
-msgid "Could not update group."
-msgstr "تعذر تحديث المجموعة."
-
-#. TRANS: Server error displayed when group aliases could not be added.
-#. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/editgroup.php:281 classes/User_group.php:540
-msgid "Could not create aliases."
-msgstr "تعذّر إنشاء الكنى."
-
 #. TRANS: Group edit form success message.
 #: actions/editgroup.php:301
 msgid "Options saved."
 msgstr "حُفظت الخيارات."
 
 #. TRANS: Title for e-mail settings.
-#: actions/emailsettings.php:59
+#: actions/emailsettings.php:60
 msgid "Email settings"
 msgstr "إعدادات البريد الإلكتروني"
 
 #. TRANS: E-mail settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/emailsettings.php:73
+#: actions/emailsettings.php:74
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 msgstr "أدر كيف تستلم البريد الإلكتروني من %%site.name%%."
 
 #. TRANS: Form legend for e-mail settings form.
 #. TRANS: Field label for e-mail address input in e-mail settings form.
-#: actions/emailsettings.php:103 actions/emailsettings.php:129
+#: actions/emailsettings.php:104 actions/emailsettings.php:130
 msgid "Email address"
 msgstr "عنوان البريد الإلكتروني"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:109
+#: actions/emailsettings.php:110
 msgid "Current confirmed email address."
 msgstr "عنوان البريد الإلكتروني المُؤكد الحالي."
 
 #. TRANS: Button label to remove a confirmed e-mail address.
 #. TRANS: Button label for removing a set sender e-mail address to post notices from.
-#. TRANS: Button label to remove a confirmed Instant Messaging address.
+#. TRANS: Button label to remove a confirmed IM address.
 #. TRANS: Button label to remove a confirmed SMS address.
 #. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
-#: actions/emailsettings.php:112 actions/emailsettings.php:179
-#: actions/imsettings.php:112 actions/smssettings.php:120
-#: actions/smssettings.php:176
+#: actions/emailsettings.php:113 actions/emailsettings.php:180
+#: actions/imsettings.php:119 actions/smssettings.php:119
+#: actions/smssettings.php:175
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "أزل"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:119
+#: actions/emailsettings.php:120
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -2484,44 +2532,44 @@ msgstr ""
 #. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
 #. TRANS: Any other domain may be owned by a legitimate person or
 #. TRANS: organization.
-#: actions/emailsettings.php:136
+#: actions/emailsettings.php:137
 msgid "Email address, like \"UserName@example.org\""
 msgstr "عنوان البريد الإلكتروني، مثل \"UserName@example.org\""
 
 #. TRANS: Button label for adding an e-mail address in e-mail settings form.
-#. TRANS: Button label for adding an Instant Messaging address in Instant Messaging settings form.
+#. TRANS: Button label for adding an IM address in IM settings form.
 #. TRANS: Button label for adding a SMS phone number in SMS settings form.
-#: actions/emailsettings.php:140 actions/imsettings.php:147
-#: actions/smssettings.php:158
+#: actions/emailsettings.php:141 actions/imsettings.php:147
+#: actions/smssettings.php:157
 msgctxt "BUTTON"
 msgid "Add"
 msgstr "أضف"
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:148 actions/smssettings.php:167
+#: actions/emailsettings.php:149 actions/smssettings.php:166
 msgid "Incoming email"
 msgstr "البريد الإلكتروني الوارد"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:154
+#: actions/emailsettings.php:155
 msgid "I want to post notices by email."
 msgstr "أريد أن أرسل الملاحظات عبر البريد الإلكتروني."
 
 #. TRANS: Form instructions for incoming e-mail form in e-mail settings.
 #. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
-#: actions/emailsettings.php:176 actions/smssettings.php:174
+#: actions/emailsettings.php:177 actions/smssettings.php:173
 msgid "Send email to this address to post new notices."
 msgstr "أرسل بريدًا إلكترونيًا إلى هذا العنوان لترسل إشعارات جديدة."
 
 #. TRANS: Instructions for incoming e-mail address input form, when an address has already been assigned.
 #. TRANS: Instructions for incoming SMS e-mail address input form.
-#: actions/emailsettings.php:185 actions/smssettings.php:182
+#: actions/emailsettings.php:186 actions/smssettings.php:181
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr "أنشئ عنوان بريد إلكتروني لترسل إليه؛ ألغِ القديم."
 
 #. TRANS: Instructions for incoming e-mail address input form.
-#: actions/emailsettings.php:189
+#: actions/emailsettings.php:190
 msgid ""
 "To send notices via email, we need to create a unique email address for you "
 "on this server:"
@@ -2529,89 +2577,89 @@ msgstr ""
 
 #. TRANS: Button label for adding an e-mail address to send notices from.
 #. TRANS: Button label for adding an SMS e-mail address to send notices from.
-#: actions/emailsettings.php:195 actions/smssettings.php:185
+#: actions/emailsettings.php:196 actions/smssettings.php:184
 msgctxt "BUTTON"
 msgid "New"
 msgstr "جديد"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:204
+#: actions/emailsettings.php:205
 msgid "Email preferences"
 msgstr "تفضيلات البريد الإلكتروني"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:212
+#: actions/emailsettings.php:213
 msgid "Send me notices of new subscriptions through email."
 msgstr "أرسل لي إشعارات بالاشتراكات الجديدة عبر البريد الإلكتروني."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:218
+#: actions/emailsettings.php:219
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr "أرسل لي بريدًا إلكرتونيًا عندما يضيف أحدهم إشعاري مفضلة."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:225
+#: actions/emailsettings.php:226
 msgid "Send me email when someone sends me a private message."
 msgstr "أرسل لي بريدًا إلكترونيًا عندما يرسل لي أحد رسالة خاصة."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:231
+#: actions/emailsettings.php:232
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr "أرسل لي بريدًا إلكترونيًا عندما يرسل لي أحد \"@-رد\"."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:237
+#: actions/emailsettings.php:238
 msgid "Allow friends to nudge me and send me an email."
 msgstr "اسمح لأصدقائي بتنبيهي ومراسلتي عبر البريد الإلكتروني."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:243
+#: actions/emailsettings.php:244
 msgid "Publish a MicroID for my email address."
 msgstr "انشر هوية مصغّرة لعنوان بريدي الإلكتروني."
 
 #. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:361
+#: actions/emailsettings.php:362
 msgid "Email preferences saved."
 msgstr "حُفظت تفضيلات البريد الإلكرتوني."
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:380
+#: actions/emailsettings.php:381
 msgid "No email address."
 msgstr "لا عنوان بريد إلكتروني."
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:388
+#: actions/emailsettings.php:389
 #, fuzzy
 msgid "Cannot normalize that email address."
 msgstr "عنوان البريد الإلكتروني المُؤكد الحالي."
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:393 actions/register.php:212
+#: actions/emailsettings.php:394 actions/register.php:197
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "ليس عنوان بريد صالح."
 
 #. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:397
+#: actions/emailsettings.php:398
 msgid "That is already your email address."
 msgstr "هذا هو عنوان بريدك الإكتروني سابقًا."
 
 #. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:401
+#: actions/emailsettings.php:402
 msgid "That email address already belongs to another user."
 msgstr "هذا البريد الإلكتروني ملك مستخدم آخر بالفعل."
 
 #. TRANS: Server error thrown on database error adding e-mail confirmation code.
 #. TRANS: Server error thrown on database error adding Instant Messaging confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:418 actions/imsettings.php:343
-#: actions/smssettings.php:365
+#: actions/emailsettings.php:419 actions/imsettings.php:362
+#: actions/smssettings.php:364
 #, fuzzy
 msgid "Could not insert confirmation code."
 msgstr "تعذّر إدراج رمز التأكيد."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:425
+#: actions/emailsettings.php:426
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
@@ -2620,61 +2668,64 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling Instant Messaging address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:445 actions/imsettings.php:377
-#: actions/smssettings.php:399
+#: actions/emailsettings.php:446 actions/imsettings.php:391
+#: actions/smssettings.php:398
 #, fuzzy
 msgid "No pending confirmation to cancel."
 msgstr "أُلغي تأكيد المراسلة الفورية."
 
 #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:450
+#: actions/emailsettings.php:451
 msgid "That is the wrong email address."
 msgstr "هذا عنوان بريد إلكتروني خطأ."
 
 #. TRANS: Server error thrown on database error canceling e-mail address confirmation.
 #. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
-#: actions/emailsettings.php:459 actions/smssettings.php:413
+#: actions/emailsettings.php:460 actions/smssettings.php:412
 #, fuzzy
 msgid "Could not delete email confirmation."
 msgstr "تعذّر حذف تأكيد البريد الإلكتروني."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:464
+#: actions/emailsettings.php:465
 msgid "Email confirmation cancelled."
 msgstr "أُلغي تأكيد البريد الإلكتروني."
 
 #. TRANS: Message given trying to remove an e-mail address that is not
 #. TRANS: registered for the active user.
-#: actions/emailsettings.php:483
+#: actions/emailsettings.php:484
 msgid "That is not your email address."
 msgstr "هذا ليس عنوان بريدك الإلكتروني."
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:504
+#: actions/emailsettings.php:505
 msgid "The email address was removed."
 msgstr "أزيل عنوان البريد الإلكتروني."
 
 #. TRANS: Form validation error displayed when trying to remove an incoming e-mail address while no address has been set.
-#: actions/emailsettings.php:518 actions/smssettings.php:555
+#: actions/emailsettings.php:519 actions/smssettings.php:554
 msgid "No incoming email address."
 msgstr "لا عنوان بريد إلكتروني وارد."
 
 #. TRANS: Server error thrown on database error removing incoming e-mail address.
 #. TRANS: Server error thrown on database error adding incoming e-mail address.
-#: actions/emailsettings.php:530 actions/emailsettings.php:554
-#: actions/smssettings.php:565 actions/smssettings.php:588
+#. TRANS: Server error displayed when the user could not be updated in SMS settings.
+#: actions/emailsettings.php:531 actions/emailsettings.php:555
+#: actions/smssettings.php:565 actions/smssettings.php:590
 #, fuzzy
 msgid "Could not update user record."
 msgstr "تعذّر تحديث سجل المستخدم."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:534 actions/smssettings.php:568
+#. TRANS: Confirmation text after updating SMS settings.
+#: actions/emailsettings.php:535 actions/smssettings.php:569
 #, fuzzy
 msgid "Incoming email address removed."
 msgstr "لا عنوان بريد إلكتروني وارد."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:558 actions/smssettings.php:591
+#. TRANS: Confirmation text after updating SMS settings.
+#: actions/emailsettings.php:559 actions/smssettings.php:594
 #, fuzzy
 msgid "New incoming email address added."
 msgstr "لا عنوان بريد إلكتروني وارد."
@@ -2687,7 +2738,7 @@ msgstr "هذا الإشعار مفضلة مسبقًا!"
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
 #: actions/favor.php:95
 #, fuzzy
-msgid "Disfavor favorite"
+msgid "Disfavor favorite."
 msgstr "ألغِ تفضيل المفضلة"
 
 #. TRANS: Page title for first page of favorited notices.
@@ -2734,9 +2785,8 @@ msgstr ""
 #. TRANS: %s is a user's nickname.
 #. TRANS: Title for first page of favourite notices of a user.
 #. TRANS: %s is the user for whom the favourite notices are displayed.
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing own favourited notices.
 #: actions/favoritesrss.php:111 actions/showfavorites.php:76
-#: lib/personalgroupnav.php:122
+#: lib/personalgroupnav.php:110
 #, php-format
 msgid "%s's favorite notices"
 msgstr "إشعارات %s المُفضلة"
@@ -2923,13 +2973,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
 #: actions/groupblock.php:191
 #, fuzzy
-msgid "Do not block this user from this group"
+msgid "Do not block this user from this group."
 msgstr "لا تمنع هذا المستخدم من هذه المجموعة"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
 #: actions/groupblock.php:198
 #, fuzzy
-msgid "Block this user from this group"
+msgid "Block this user from this group."
 msgstr "امنع هذا المستخدم من هذه المجموعة"
 
 #. TRANS: Server error displayed when trying to block a user from a group fails because of an application error.
@@ -2938,6 +2988,7 @@ msgid "Database error blocking user from group."
 msgstr "خطأ في قاعدة البيانات أثناء منع المستخدم من المجموعة."
 
 #. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
+#. TRANS: Client error displayed trying to find a user by ID without providing an ID.
 #: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr "لا هوية."
@@ -2967,7 +3018,7 @@ msgid "Unable to update your design settings."
 msgstr "تعذّر حفظ إعدادات تصميمك."
 
 #. TRANS: Form text to confirm saved group design settings.
-#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:222
+#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:239
 msgid "Design preferences saved."
 msgstr "حُفظت تفضيلات التصميم."
 
@@ -3031,7 +3082,7 @@ msgid "A list of the users in this group."
 msgstr "قائمة بمستخدمي هذه المجموعة."
 
 #. TRANS: Indicator in group members list that this user is a group administrator.
-#: actions/groupmembers.php:190
+#: actions/groupmembers.php:190 lib/action.php:581
 msgid "Admin"
 msgstr "إداري"
 
@@ -3123,8 +3174,10 @@ msgid "Group search"
 msgstr "بحث في المجموعات"
 
 #. TRANS: Text on page where groups can be searched if no results were found for a query.
-#: actions/groupsearch.php:82 actions/noticesearch.php:117
-#: actions/peoplesearch.php:83
+#. TRANS: Text for notice search results is the query had no results.
+#. TRANS: Message on the "People search" page where a query has no results.
+#: actions/groupsearch.php:82 actions/noticesearch.php:122
+#: actions/peoplesearch.php:87
 msgid "No results."
 msgstr "لا نتائج."
 
@@ -3157,157 +3210,160 @@ msgid "User is not blocked from group."
 msgstr "المستخدم ليس ممنوعًا من المجموعة."
 
 #. TRANS: Server error displayed when unblocking a user from a group fails because of an unknown error.
+#. TRANS: Server error displayed when removing a user block.
 #: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "خطأ أثناء منع الحجب."
 
 #. TRANS: Title for Instant Messaging settings.
-#: actions/imsettings.php:58
+#: actions/imsettings.php:56
 msgid "IM settings"
 msgstr "إعدادات المراسلة الفورية"
 
 #. 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.
-#: actions/imsettings.php:71
+#: actions/imsettings.php:69
 #, php-format
 msgid ""
-"You can send and receive notices through Jabber/Google Talk [instant "
-"messages](%%doc.im%%). Configure your address and settings below."
+"You can send and receive notices through instant messaging [instant messages]"
+"(%%doc.im%%). Configure your addresses and settings below."
 msgstr ""
 
-#. TRANS: Message given in the Instant Messaging settings if XMPP is not enabled on the site.
+#. TRANS: Message given in the IM settings if IM is not enabled on the site.
 #: actions/imsettings.php:90
 msgid "IM is not available."
 msgstr "المراسلة الفورية غير متوفرة."
 
-#. TRANS: Form legend for Instant Messaging settings form.
-#. TRANS: Field label for Instant Messaging address input in Instant Messaging settings form.
-#: actions/imsettings.php:102 actions/imsettings.php:132
+#: actions/imsettings.php:116
+#, fuzzy, php-format
+msgid "Current confirmed %s address."
+msgstr "عنوان البريد الإلكتروني المُؤكد الحالي."
+
+#. TRANS: Form note in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:128
+#, php-format
+msgid ""
+"Awaiting confirmation on this address. Check your %s account for a message "
+"with further instructions. (Did you add %s to your buddy list?)"
+msgstr ""
+
+#: actions/imsettings.php:140
 msgid "IM address"
 msgstr "عنوان المراسلة الفورية"
 
-#: actions/imsettings.php:109
+#: actions/imsettings.php:142
+#, php-format
+msgid "%s screenname."
+msgstr ""
+
+#. TRANS: Header for IM preferences form.
+#: actions/imsettings.php:163
 #, fuzzy
-msgid "Current confirmed Jabber/Google Talk address."
-msgstr "عنوان جابر أو محادثة غوغل المعتمد حاليًا."
-
-#. TRANS: Form note in Instant Messaging settings form.
-#. TRANS: %s is the Instant Messaging address set for the site.
-#: actions/imsettings.php:120
-#, php-format
-msgid ""
-"Awaiting confirmation on this address. Check your Jabber/Google Talk account "
-"for a message with further instructions. (Did you add %s to your buddy list?)"
-msgstr ""
-
-#. TRANS: IM address input field instructions in Instant Messaging settings form.
-#. TRANS: %s is the Instant Messaging address set for the site.
-#. TRANS: Do not translate "example.org". It is one of the domain names reserved for use in examples by
-#. TRANS: http://www.rfc-editor.org/rfc/rfc2606.txt. Any other domain may be owned by a legitimate
-#. TRANS: person or organization.
-#: actions/imsettings.php:139
-#, php-format
-msgid ""
-"Jabber or Google Talk address, like \"UserName@example.org\". First, make "
-"sure to add %s to your buddy list in your IM client or on Google Talk."
-msgstr ""
-
-#. TRANS: Form legend for Instant Messaging preferences form.
-#: actions/imsettings.php:154
-msgid "IM preferences"
+msgid "IM Preferences"
 msgstr "تفضيلات المحادثة الفورية"
 
-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:159
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:174
 #, fuzzy
-msgid "Send me notices through Jabber/Google Talk."
-msgstr "أرسل لي إشعارات بالاشتراكات الجديدة عبر البريد الإلكتروني."
+msgid "Send me notices"
+msgstr "أرسل إشعارًا"
 
-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:165
-msgid "Post a notice when my Jabber/Google Talk status changes."
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:176
+msgid "Post a notice when my status changes."
 msgstr ""
 
-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:171
-msgid ""
-"Send me replies through Jabber/Google Talk from people I'm not subscribed to."
-msgstr ""
-
-#. TRANS: Checkbox label in Instant Messaging preferences form.
+#. TRANS: Checkbox label in IM preferences form.
 #: actions/imsettings.php:178
+msgid "Send me replies from people I'm not subscribed to."
+msgstr ""
+
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:181
 #, fuzzy
-msgid "Publish a MicroID for my Jabber/Google Talk address."
+msgid "Publish a MicroID"
 msgstr "انشر هوية مصغّرة لعنوان بريدي الإلكتروني."
 
-#. TRANS: Confirmation message for successful Instant Messaging preferences save.
-#: actions/imsettings.php:283 actions/othersettings.php:192
+#. TRANS: Server error thrown on database error updating IM preferences.
+#: actions/imsettings.php:291
+#, fuzzy
+msgid "Couldn't update IM preferences."
+msgstr "تعذّر تحديث المستخدم."
+
+#. TRANS: Confirmation message for successful IM preferences save.
+#. TRANS: Confirmation message after saving preferences.
+#: actions/imsettings.php:298 actions/urlsettings.php:244
 msgid "Preferences saved."
 msgstr "حُفِظت التفضيلات."
 
-#. TRANS: Message given saving Instant Messaging address without having provided one.
-#: actions/imsettings.php:304
-msgid "No Jabber ID."
-msgstr "لا هوية جابر."
-
-#. TRANS: Message given saving Instant Messaging address that cannot be normalised.
-#: actions/imsettings.php:312
+#. TRANS: Message given saving IM address without having provided one.
+#: actions/imsettings.php:320
 #, fuzzy
-msgid "Cannot normalize that Jabber ID."
-msgstr "ليست هوية جابر صالحة"
+msgid "No screenname."
+msgstr "لا اسم مستعار."
 
-#. TRANS: Message given saving Instant Messaging address that not valid.
-#: actions/imsettings.php:317
-#, fuzzy
-msgid "Not a valid Jabber ID."
-msgstr "ليست هوية جابر صالحة"
-
-#. TRANS: Message given saving Instant Messaging address that is already set.
-#: actions/imsettings.php:321
-#, fuzzy
-msgid "That is already your Jabber ID."
-msgstr "هذه ليست هويتك في جابر."
-
-#. TRANS: Message given saving Instant Messaging address that is already set for another user.
 #: actions/imsettings.php:325
 #, fuzzy
-msgid "Jabber ID already belongs to another user."
+msgid "No transport."
+msgstr "لا ملاحظة."
+
+#. TRANS: Message given saving IM address that cannot be normalised.
+#: actions/imsettings.php:333
+#, fuzzy
+msgid "Cannot normalize that screenname"
+msgstr "ليست هوية جابر صالحة"
+
+#. TRANS: Message given saving IM address that not valid.
+#: actions/imsettings.php:340
+#, fuzzy
+msgid "Not a valid screenname"
+msgstr "ليس اسمًا مستعارًا صحيحًا."
+
+#. TRANS: Message given saving IM address that is already set for another user.
+#: actions/imsettings.php:344
+#, fuzzy
+msgid "Screenname already belongs to another user."
 msgstr "هذا البريد الإلكتروني ملك مستخدم آخر بالفعل."
 
-#. TRANS: Message given saving valid Instant Messaging address that is to be confirmed.
-#. TRANS: %s is the Instant Messaging address set for the site.
-#: actions/imsettings.php:353
-#, php-format
-msgid ""
-"A confirmation code was sent to the IM address you added. You must approve %"
-"s for sending messages to you."
-msgstr ""
+#. TRANS: Message given saving valid IM address that is to be confirmed.
+#: actions/imsettings.php:369
+#, fuzzy
+msgid "A confirmation code was sent to the IM address you added."
+msgstr "رمز التأكيد ليس لك!"
 
-#. TRANS: Message given canceling Instant Messaging address confirmation for the wrong IM address.
-#: actions/imsettings.php:382
+#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#: actions/imsettings.php:396
 msgid "That is the wrong IM address."
 msgstr "هذا عنوان محادثة فورية خاطئ."
 
-#. TRANS: Server error thrown on database error canceling Instant Messaging address confirmation.
-#: actions/imsettings.php:391
+#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#: actions/imsettings.php:405
 #, fuzzy
-msgid "Could not delete IM confirmation."
+msgid "Couldn't delete confirmation."
 msgstr "تعذّر حذف تأكيد البريد المراسلة الفورية."
 
-#. TRANS: Message given after successfully canceling Instant Messaging address confirmation.
-#: actions/imsettings.php:396
+#. TRANS: Message given after successfully canceling IM address confirmation.
+#: actions/imsettings.php:410
 msgid "IM confirmation cancelled."
 msgstr "أُلغي تأكيد المراسلة الفورية."
 
-#. TRANS: Message given trying to remove an Instant Messaging address that is not
+#. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.
-#: actions/imsettings.php:417
-msgid "That is not your Jabber ID."
-msgstr "هذه ليست هويتك في جابر."
+#: actions/imsettings.php:434
+#, fuzzy
+msgid "That is not your screenname."
+msgstr "هذا ليس رقم هاتفك."
+
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#: actions/imsettings.php:443
+#, fuzzy
+msgid "Couldn't update user im prefs."
+msgstr "تعذّر تحديث سجل المستخدم."
 
 #. TRANS: Message given after successfully removing a registered Instant Messaging address.
-#: actions/imsettings.php:440
+#: actions/imsettings.php:451
 msgid "The IM address was removed."
 msgstr "أزيل عنوان المراسلة الفورية هذا."
 
@@ -3500,7 +3556,7 @@ msgid "You must be logged in to join a group."
 msgstr "يجب أن تلج لتنضم إلى مجموعة."
 
 #. TRANS: Title for join group page after joining.
-#: actions/joingroup.php:147
+#: actions/joingroup.php:148
 #, fuzzy, php-format
 msgctxt "TITLE"
 msgid "%1$s joined group %2$s"
@@ -3628,7 +3684,7 @@ msgstr ""
 #. TRANS: Submit button title.
 #: actions/licenseadminpanel.php:311 actions/sessionsadminpanel.php:199
 #: actions/siteadminpanel.php:292 actions/snapshotadminpanel.php:245
-#: actions/tagother.php:154 lib/applicationeditform.php:357
+#: actions/tagother.php:133 lib/applicationeditform.php:357
 msgid "Save"
 msgstr "أرسل"
 
@@ -3636,51 +3692,53 @@ msgstr "أرسل"
 msgid "Save license settings"
 msgstr ""
 
-#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
+#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
+#: actions/login.php:97 actions/otp.php:62 actions/register.php:130
 msgid "Already logged in."
 msgstr "والج بالفعل."
 
-#: actions/login.php:148
+#: actions/login.php:125
 msgid "Incorrect username or password."
 msgstr "اسم المستخدم أو كلمة السر غير صحيحان."
 
-#: actions/login.php:154 actions/otp.php:120
+#. TRANS: Server error displayed when a user object could not be created trying to login using "one time password login".
+#: actions/login.php:131 actions/otp.php:127
 msgid "Error setting user. You are probably not authorized."
 msgstr "خطأ أثناء ضبط المستخدم. لست مُصرحًا على الأرجح."
 
-#: actions/login.php:210 actions/login.php:263
+#: actions/login.php:185 actions/login.php:236 lib/action.php:598
 msgid "Login"
 msgstr "لُج"
 
-#: actions/login.php:249
+#: actions/login.php:222
 msgid "Login to site"
 msgstr "لُج إلى الموقع"
 
-#: actions/login.php:258 actions/register.php:490
+#: actions/login.php:231 actions/register.php:469
 msgid "Remember me"
 msgstr "تذكّرني"
 
-#: actions/login.php:259 actions/register.php:492
+#: actions/login.php:232 actions/register.php:471
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "لُج تلقائيًا في المستقبل؛ هذا الخيار ليس مُعدًا للحواسيب المشتركة!"
 
-#: actions/login.php:269
+#: actions/login.php:241
 msgid "Lost or forgotten password?"
 msgstr "أنسيت كلمة السر؟"
 
-#: actions/login.php:288
+#: actions/login.php:259
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
 msgstr ""
 "لأسباب أمنية، من فضلك أعد إدخال اسم مستخدمك وكلمة سرك قبل تغيير إعداداتك."
 
-#: actions/login.php:292
+#: actions/login.php:263
 #, fuzzy
 msgid "Login with your username and password."
 msgstr "لُج باسم مستخدم وكلمة سر"
 
-#: actions/login.php:295
+#: actions/login.php:266
 #, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -3805,7 +3863,9 @@ msgstr "إشعار جديد"
 msgid "Notice posted"
 msgstr "أُرسل الإشعار"
 
-#: actions/noticesearch.php:68
+#. TRANS: Instructions for Notice search page.
+#. TRANS: %%site.name%% is the name of the StatusNet site.
+#: actions/noticesearch.php:69
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -3814,37 +3874,47 @@ msgstr ""
 "ابحث عن إشعارات على %%site.name%% عبر محتوياتها. افصل عبارات البحث بمسافات؛ "
 "ويجب أن تتكون هذه العبارات من 3 أحرف أو أكثر."
 
-#: actions/noticesearch.php:78
+#. TRANS: Title of the page where users can search for notices.
+#: actions/noticesearch.php:80
 msgid "Text search"
 msgstr "بحث في النصوص"
 
-#: actions/noticesearch.php:91
+#. TRANS: Test in RSS notice search.
+#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
+#: actions/noticesearch.php:95
 #, php-format
 msgid "Search results for \"%1$s\" on %2$s"
 msgstr "نتائج البحث ل\"%1$s\" على %2$s"
 
-#: actions/noticesearch.php:121
+#. TRANS: Text for logged in users making a query for notices without results.
+#. TRANS: This message contains a Markdown link.
+#: actions/noticesearch.php:128
 #, php-format
 msgid ""
 "Be the first to [post on this topic](%%%%action.newnotice%%%%?"
 "status_textarea=%s)!"
 msgstr ""
 
-#: actions/noticesearch.php:124
+#. TRANS: Text for not logged in users making a query for notices without results.
+#. TRANS: This message contains Markdown links.
+#: actions/noticesearch.php:133
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and be the first to "
 "[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
 msgstr ""
 
-#: actions/noticesearchrss.php:96
+#. TRANS: RSS notice search feed title. %s is the query.
+#: actions/noticesearchrss.php:95
 #, php-format
 msgid "Updates with \"%s\""
 msgstr ""
 
-#: actions/noticesearchrss.php:98
+#. TRANS: RSS notice search feed description.
+#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
+#: actions/noticesearchrss.php:99
 #, fuzzy, php-format
-msgid "Updates matching search term \"%1$s\" on %2$s!"
+msgid "Updates matching search term \"%1$s\" on %2$s."
 msgstr "الإشعارات التي فضلها %1$s في %2$s!"
 
 #: actions/nudge.php:85
@@ -3862,52 +3932,52 @@ msgid "Nudge sent!"
 msgstr "أُرسل التنبيه!"
 
 #. TRANS: Message displayed to an anonymous user trying to view OAuth application list.
-#: actions/oauthappssettings.php:60
+#: actions/oauthappssettings.php:57
 msgid "You must be logged in to list your applications."
 msgstr "يجب أن تكون مسجل الدخول لعرض تطبيقاتك."
 
 #. TRANS: Page title for OAuth applications
-#: actions/oauthappssettings.php:76
+#: actions/oauthappssettings.php:73
 msgid "OAuth applications"
 msgstr "تطبيقات OAuth"
 
 #. TRANS: Page instructions for OAuth applications
-#: actions/oauthappssettings.php:88
+#: actions/oauthappssettings.php:85
 msgid "Applications you have registered"
 msgstr ""
 
 #. TRANS: Empty list message on page with OAuth applications.
-#: actions/oauthappssettings.php:141
+#: actions/oauthappssettings.php:138
 #, fuzzy, php-format
 msgid "You have not registered any applications yet."
 msgstr "يجب أن تكون مسجل الدخول لتسجل تطبيقا."
 
 #. TRANS: Title for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:71
+#: actions/oauthconnectionssettings.php:69
 #, fuzzy
 msgid "Connected applications"
 msgstr "احذف هذا التطبيق"
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:83
+#: actions/oauthconnectionssettings.php:80
 msgid "The following connections exist for your account."
 msgstr ""
 
 #. TRANS: Client error when trying to revoke access for an application while not being a user of it.
-#: actions/oauthconnectionssettings.php:168
+#: actions/oauthconnectionssettings.php:165
 msgid "You are not a user of that application."
 msgstr "لست مستخدما لهذا التطبيق."
 
 #. TRANS: Client error when revoking access has failed for some reason.
 #. TRANS: %s is the application ID revoking access failed for.
-#: actions/oauthconnectionssettings.php:183
+#: actions/oauthconnectionssettings.php:180
 #, fuzzy, php-format
 msgid "Unable to revoke access for application: %s."
 msgstr "استخدم هذا النموذج لتعدل تطبيقك."
 
 #. TRANS: Success message after revoking access for an application.
 #. TRANS: %1$s is the application name, %2$s is the first part of the user token.
-#: actions/oauthconnectionssettings.php:202
+#: actions/oauthconnectionssettings.php:199
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -3915,20 +3985,30 @@ msgid ""
 msgstr ""
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:213
+#: actions/oauthconnectionssettings.php:210
 msgid "You have not authorized any applications to use your account."
 msgstr ""
 
 #. TRANS: Note for developers in the OAuth connection settings form.
 #. TRANS: This message contains a Markdown link. Do not separate "](".
 #. TRANS: %s is the URL to the OAuth settings.
-#: actions/oauthconnectionssettings.php:233
+#: actions/oauthconnectionssettings.php:230
 #, php-format
 msgid ""
 "Are you a developer? [Register an OAuth client application](%s) to use with "
 "this instance of StatusNet."
 msgstr ""
 
+#: actions/oembed.php:64
+#, fuzzy, php-format
+msgid "\"%s\" not found."
+msgstr "لم يُعثرعلى المستخدم."
+
+#: actions/oembed.php:76
+#, fuzzy, php-format
+msgid "Notice %s not found."
+msgstr "لم يتم العثور على وسيلة API."
+
 #: actions/oembed.php:80 actions/shownotice.php:100
 #, fuzzy
 msgid "Notice has no profile."
@@ -3939,6 +4019,16 @@ msgstr "ليس للمستخدم ملف شخصي."
 msgid "%1$s's status on %2$s"
 msgstr "حالة %1$s في يوم %2$s"
 
+#: actions/oembed.php:95
+#, fuzzy, php-format
+msgid "Attachment %s not found."
+msgstr "لم يُعثر على المستخدم المستلم."
+
+#: actions/oembed.php:136
+#, php-format
+msgid "\"%s\" not supported for oembed requests."
+msgstr ""
+
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
 #: actions/oembed.php:168
 #, fuzzy, php-format
@@ -3952,94 +4042,60 @@ msgid "Only %s URLs over plain HTTP please."
 msgstr ""
 
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1205
-#: lib/apiaction.php:1232 lib/apiaction.php:1367
+#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1207
+#: lib/apiaction.php:1234 lib/apiaction.php:1369
 msgid "Not a supported data format."
 msgstr "ليس نسق بيانات مدعوم."
 
+#. TRANS: ShortName in the OpenSearch interface when trying to find users.
 #: actions/opensearch.php:64
 msgid "People Search"
 msgstr "بحث في الأشخاص"
 
-#: actions/opensearch.php:67
+#: actions/opensearch.php:68
 msgid "Notice Search"
 msgstr "بحث الإشعارات"
 
-#: actions/othersettings.php:59
-msgid "Other settings"
-msgstr "إعدادات أخرى"
-
-#. TRANS: Instructions for tab "Other" in user profile settings.
-#: actions/othersettings.php:71
-msgid "Manage various other options."
-msgstr "أدر خيارات أخرى عديدة."
-
-#. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
-#. TRANS: user's profile settings. Use of "free" is as in "open", indicating that the
-#. TRANS: information on the shortener site is freely distributable.
-#. TRANS: This message has one space at the beginning. Use your language's word separator
-#. TRANS: here if it has one (most likely a single space).
-#: actions/othersettings.php:113
-msgid " (free service)"
-msgstr " (خدمة حرة)"
-
-#. TRANS: Label for dropdown with URL shortener services.
-#: actions/othersettings.php:122
-msgid "Shorten URLs with"
-msgstr "قصّر المسارات بـ"
-
-#. TRANS: Tooltip for for dropdown with URL shortener services.
-#: actions/othersettings.php:124
-msgid "Automatic shortening service to use."
-msgstr "خدمة التقصير المطلوب استخدامها."
-
-#. TRANS: Label for checkbox.
-#: actions/othersettings.php:130
-msgid "View profile designs"
-msgstr "اعرض تصاميم الملف الشخصي"
-
-#. TRANS: Tooltip for checkbox.
-#: actions/othersettings.php:132
-msgid "Show or hide profile designs."
-msgstr "أظهر أو أخفِ تصاميم الملفات الشخصية."
-
-#. TRANS: Form validation error for form "Other settings" in user profile.
-#: actions/othersettings.php:164
-#, fuzzy
-msgid "URL shortening service is too long (maximum 50 characters)."
-msgstr "الاسم الكامل طويل جدا (الأقصى 255 حرفًا)"
-
-#: actions/otp.php:69
+#. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
+#: actions/otp.php:70
 msgid "No user ID specified."
 msgstr "لا هوية مستخدم محددة."
 
-#: actions/otp.php:83
+#. TRANS: Client error displayed trying to use "one time password login" without specifying a login token.
+#: actions/otp.php:86
 msgid "No login token specified."
 msgstr "لا محتوى دخول محدد."
 
-#: actions/otp.php:90
+#. TRANS: Client error displayed trying to use "one time password login" without requesting a login token.
+#: actions/otp.php:94
 msgid "No login token requested."
 msgstr "لا طلب استيثاق."
 
-#: actions/otp.php:95
+#. TRANS: Client error displayed trying to use "one time password login" while specifying an invalid login token.
+#: actions/otp.php:100
 msgid "Invalid login token specified."
 msgstr "توكن دخول غير صحيح محدد."
 
-#: actions/otp.php:104
+#. TRANS: Client error displayed trying to use "one time password login" while specifying an expired login token.
+#: actions/otp.php:110
 msgid "Login token expired."
 msgstr "توكن الدخول انتهى."
 
-#: actions/outbox.php:58
+#. TRANS: Title for outbox for any but the fist page.
+#. TRANS: %1$s is the user nickname, %2$d is the page number.
+#: actions/outbox.php:57
 #, php-format
 msgid "Outbox for %1$s - page %2$d"
 msgstr "صندوق %1$s الصادر - صفحة %2$d"
 
+#. TRANS: Title for first page of outbox.
 #: actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
 msgstr "صندوق %s الصادر"
 
-#: actions/outbox.php:104
+#. TRANS: Instructions for outbox.
+#: actions/outbox.php:103
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr "هذا صندوق بريدك الصادر، والذي يسرد الرسائل الخاصة التي أرسلتها."
 
@@ -4065,43 +4121,45 @@ msgstr "كلمة السر القديمة"
 msgid "New password"
 msgstr "كلمة السر الجديدة"
 
-#: actions/passwordsettings.php:109
+#: actions/passwordsettings.php:109 actions/register.php:416
 #, fuzzy
-msgid "6 or more characters"
+msgid "6 or more characters."
 msgstr "6 أحرف أو أكثر"
 
-#: actions/passwordsettings.php:113
+#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#: actions/passwordsettings.php:113 actions/recoverpassword.php:264
+#: actions/register.php:420
 #, fuzzy
-msgid "Same as password above"
+msgid "Same as password above."
 msgstr "نفس كلمة السر أعلاه"
 
 #: actions/passwordsettings.php:117
 msgid "Change"
 msgstr "غيّر"
 
-#: actions/passwordsettings.php:154 actions/register.php:238
+#: actions/passwordsettings.php:153 actions/register.php:223
 msgid "Password must be 6 or more characters."
 msgstr "يجب أن تكون كلمة السر 6 حروف أو أكثر."
 
-#: actions/passwordsettings.php:157 actions/register.php:241
+#: actions/passwordsettings.php:156 actions/register.php:226
 msgid "Passwords don't match."
 msgstr "كلمتا السر غير متطابقتين."
 
-#: actions/passwordsettings.php:165
+#: actions/passwordsettings.php:164
 msgid "Incorrect old password"
 msgstr "كلمة السر القديمة غير صحيحة"
 
-#: actions/passwordsettings.php:181
+#: actions/passwordsettings.php:180
 msgid "Error saving user; invalid."
 msgstr "خطأ أثناء حفظ المستخدم؛ غير صالح."
 
-#: actions/passwordsettings.php:186
+#. TRANS: Reset password form validation error message.
+#: actions/passwordsettings.php:185 actions/recoverpassword.php:418
 #, fuzzy
-msgid "Can't save new password."
+msgid "Cannot save new password."
 msgstr "تعذّر حفظ كلمة السر الجديدة."
 
-#. TRANS: Title for password recovery page in password saved mode.
-#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
+#: actions/passwordsettings.php:191
 msgid "Password saved."
 msgstr "حُفظت كلمة السر."
 
@@ -4319,8 +4377,7 @@ msgid "Directory where backgrounds are located."
 msgstr "مسار دليل المحليات"
 
 #. TRANS: Fieldset legens in Paths admin panel.
-#. TRANS: DT element label in attachment list.
-#: actions/pathsadminpanel.php:419 lib/attachmentlist.php:98
+#: actions/pathsadminpanel.php:419
 msgid "Attachments"
 msgstr "مرفقات"
 
@@ -4392,7 +4449,9 @@ msgstr ""
 msgid "Save paths"
 msgstr "احفظ المسارات"
 
-#: actions/peoplesearch.php:52
+#. TRANS: Instructions for the "People search" page.
+#. TRANS: %%site.name%% is the name of the StatusNet site.
+#: actions/peoplesearch.php:54
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
@@ -4401,7 +4460,8 @@ msgstr ""
 "ابحث عن أشخاص على %%site.name%% بدلالة الاسم أو الموقع أو الاهتمامات. افصل "
 "عبارات البحث بمسافات؛ ويجب أن تتكون تلك العبارات من 3 أحرف أو أكثر."
 
-#: actions/peoplesearch.php:58
+#. TRANS: Title of a page where users can search for other users.
+#: actions/peoplesearch.php:61
 msgid "People search"
 msgstr "بحث في الأشخاص"
 
@@ -4415,6 +4475,60 @@ msgstr "ليس وسم أشخاص صالح: %s."
 msgid "Users self-tagged with %1$s - page %2$d"
 msgstr "المستخدمون الذين وسموا أنفسهم ب%1$s - الصفحة %2$d"
 
+#. TRANS: Page title for AJAX form return when a disabling a plugin.
+#: actions/plugindisable.php:69
+msgctxt "plugin"
+msgid "Disabled"
+msgstr ""
+
+#. TRANS: Client error displayed trying to perform any request method other than POST.
+#. TRANS: Do not translate POST.
+#: actions/pluginenable.php:78 actions/subscribe.php:77
+msgid "This action only accepts POST requests."
+msgstr "هذا الإجراء يقبل طلبات POST فقط."
+
+#: actions/pluginenable.php:102
+#, fuzzy
+msgid "You cannot administer plugins."
+msgstr "لا يمكنك حذف المستخدمين."
+
+#: actions/pluginenable.php:109
+#, fuzzy
+msgid "No such plugin."
+msgstr "لا صفحة كهذه."
+
+#. TRANS: Page title for AJAX form return when enabling a plugin.
+#: actions/pluginenable.php:159
+msgctxt "plugin"
+msgid "Enabled"
+msgstr ""
+
+#. TRANS: Tab and title for plugins admin panel.
+#. TRANS: Menu item for site administration
+#: actions/pluginsadminpanel.php:56 actions/version.php:191
+#: lib/adminpanelaction.php:411
+msgid "Plugins"
+msgstr "الملحقات"
+
+#. TRANS: Instructions at top of plugin admin page.
+#: actions/pluginsadminpanel.php:68
+msgid ""
+"Additional plugins can be enabled and configured manually. See the <a href="
+"\"http://status.net/wiki/Plugins\">online plugin documentation</a> for more "
+"details."
+msgstr ""
+
+#. TRANS: Admin form section header
+#: actions/pluginsadminpanel.php:84
+#, fuzzy
+msgid "Default plugins"
+msgstr "اللغة المبدئية"
+
+#: actions/pluginsadminpanel.php:106
+msgid ""
+"All default plugins have been disabled from the site's configuration file."
+msgstr ""
+
 #: actions/postnotice.php:95
 msgid "Invalid notice content."
 msgstr "محتوى إشعار غير صالح."
@@ -4425,45 +4539,42 @@ msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’.
 msgstr ""
 
 #. TRANS: Page title for profile settings.
-#: actions/profilesettings.php:59
+#: actions/profilesettings.php:60
 msgid "Profile settings"
 msgstr "إعدادات الملف الشخصي"
 
 #. TRANS: Usage instructions for profile settings.
-#: actions/profilesettings.php:70
+#: actions/profilesettings.php:71
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr "بإمكانك تحديث بيانات ملفك الشخصي ليعرف عنك الناس أكثر."
 
 #. TRANS: Profile settings form legend.
-#: actions/profilesettings.php:98
+#: actions/profilesettings.php:99
 msgid "Profile information"
 msgstr "معلومات الملف الشخصي"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109 actions/register.php:433
+#: actions/profilesettings.php:110 actions/register.php:412
 #, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr "1-64 حرفًا إنجليزيًا أو رقمًا بدون نقاط أو مسافات"
 
 #. TRANS: Field label in form for profile settings.
-#. TRANS: Label for full group name (dt). Text hidden by default.
-#. TRANS: DT for full name in a profile.
-#: actions/profilesettings.php:113 actions/register.php:455
-#: actions/showgroup.php:255 actions/tagother.php:104
-#: lib/groupeditform.php:150 lib/userprofile.php:156
+#: actions/profilesettings.php:114 actions/register.php:434
+#: lib/groupeditform.php:150
 msgid "Full name"
 msgstr "الاسم الكامل"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:118 actions/register.php:460
+#: actions/profilesettings.php:119 actions/register.php:439
 #: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "الصفحة الرئيسية"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:121
+#: actions/profilesettings.php:122 actions/register.php:441
 #, fuzzy
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr "مسار صفحتك الرئيسية أو مدونتك أو ملفك الشخصي على موقع آخر"
@@ -4471,7 +4582,7 @@ msgstr "مسار صفحتك الرئيسية أو مدونتك أو ملفك ا
 #. TRANS: Tooltip for field label in form for profile settings. Plural
 #. TRANS: is decided by the number of characters available for the
 #. TRANS: biography (%d).
-#: actions/profilesettings.php:129 actions/register.php:471
+#: actions/profilesettings.php:130 actions/register.php:450
 #, fuzzy, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4483,84 +4594,80 @@ msgstr[4] "تكلم عن نفسك واهتمامتك في %d حرف"
 msgstr[5] "تكلم عن نفسك واهتمامتك في %d حرف"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:135 actions/register.php:476
+#: actions/profilesettings.php:136 actions/register.php:455
 msgid "Describe yourself and your interests"
 msgstr "صِف نفسك واهتماماتك"
 
 #. TRANS: Text area label in form for profile settings where users can provide.
 #. TRANS: their biography.
-#: actions/profilesettings.php:139 actions/register.php:478
+#: actions/profilesettings.php:140 actions/register.php:457
 msgid "Bio"
 msgstr "السيرة"
 
 #. TRANS: Field label in form for profile settings.
-#. TRANS: Label for group location (dt). Text hidden by default.
-#. TRANS: DT for location in a profile.
-#: actions/profilesettings.php:145 actions/register.php:483
-#: actions/showgroup.php:265 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:173
-#: lib/userprofile.php:172
+#: actions/profilesettings.php:146 actions/register.php:462
+#: lib/groupeditform.php:173
 msgid "Location"
 msgstr "الموقع"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148 actions/register.php:485
+#: actions/profilesettings.php:149
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "مكان تواجدك، على سبيل المثال \"المدينة، الولاية (أو المنطقة)، الدولة\""
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:153
+#: actions/profilesettings.php:154
 msgid "Share my current location when posting notices"
 msgstr "شارك مكاني الحالي عند إرسال إشعارات"
 
 #. TRANS: Field label in form for profile settings.
-#. TRANS: DT for tags in a profile.
-#: actions/profilesettings.php:161 actions/tagother.php:149
-#: actions/tagother.php:209 lib/subscriptionlist.php:106
-#: lib/subscriptionlist.php:108 lib/userprofile.php:220
+#: actions/profilesettings.php:162 actions/tagother.php:128
+#: actions/tagother.php:188 lib/subscriptionlist.php:104
+#: lib/subscriptionlist.php:106
 msgid "Tags"
 msgstr "الوسوم"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:164
+#: actions/profilesettings.php:165
 #, fuzzy
 msgid ""
-"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- "
+"separated."
 msgstr ""
 "سِم نفسك (حروف وأرقام و \"-\" و \".\" و \"_\")، افصلها بفاصلة (',') أو مسافة."
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:169
+#: actions/profilesettings.php:170
 msgid "Language"
 msgstr "اللغة"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:171
+#: actions/profilesettings.php:172
 #, fuzzy
-msgid "Preferred language"
+msgid "Preferred language."
 msgstr "اللغة المفضلة"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:181
+#: actions/profilesettings.php:182
 msgid "Timezone"
 msgstr "المنطقة الزمنية"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:183
+#: actions/profilesettings.php:184
 msgid "What timezone are you normally in?"
 msgstr "ما المنطقة الزمنية التي تتواجد فيها عادة؟"
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:189
+#: actions/profilesettings.php:190
 #, fuzzy
 msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)"
+"Automatically subscribe to whoever subscribes to me (best for non-humans)."
 msgstr "اشترك تلقائيًا بأي شخص يشترك بي (يفضل أن يستخدم لغير البشر)"
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Plural form is used based on the maximum number of allowed
 #. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:258 actions/register.php:229
+#: actions/profilesettings.php:259 actions/register.php:214
 #, fuzzy, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4572,50 +4679,50 @@ msgstr[4] "الاسم طويل جدا (الأقصى %d حرفا)."
 msgstr[5] "الاسم طويل جدا (الأقصى %d حرفا)."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:269 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:270 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr "لم تُختر المنطقة الزمنية."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:277
+#: actions/profilesettings.php:278
 #, fuzzy
 msgid "Language is too long (maximum 50 characters)."
 msgstr "الاسم طويل جدا (الأقصى 255 حرفا)."
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:291 actions/tagother.php:178
-#, php-format
-msgid "Invalid tag: \"%s\""
+#: actions/profilesettings.php:292
+#, fuzzy, php-format
+msgid "Invalid tag: \"%s\"."
 msgstr "وسم غير صالح: \"%s\""
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:347
+#: actions/profilesettings.php:348
 #, fuzzy
 msgid "Could not update user for autosubscribe."
 msgstr "تعذّر تحديث سجل المستخدم."
 
 #. TRANS: Server error thrown when user profile location preference settings could not be updated.
-#: actions/profilesettings.php:405
+#: actions/profilesettings.php:406
 #, fuzzy
 msgid "Could not save location prefs."
 msgstr "لم يمكن حفظ تفضيلات الموقع."
 
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:427 actions/tagother.php:200
+#: actions/profilesettings.php:428 actions/tagother.php:179
 msgid "Could not save tags."
 msgstr "تعذّر حفظ الوسوم."
 
 #. TRANS: Confirmation shown when user profile settings are saved.
 #. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:436 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:437 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "حُفظت الإعدادات."
 
 #. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
 #. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:483 actions/restoreaccount.php:60
+#: actions/profilesettings.php:484 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "أنشئ حسابًا"
@@ -4691,6 +4798,12 @@ msgstr ""
 "هنا %%site.name%%، خدمة [التدوين المُصغّر](http://en.wikipedia.org/wiki/Micro-"
 "blogging) المبنية على البرنامج الحر [StatusNet](http://status.net/)."
 
+#. TRANS: Public RSS feed description. %s is the StatusNet site name.
+#: actions/publicrss.php:106
+#, php-format
+msgid "%s updates from everyone."
+msgstr ""
+
 #. TRANS: Title for public tag cloud.
 #: actions/publictagcloud.php:57
 msgid "Public tag cloud"
@@ -4729,10 +4842,6 @@ msgid ""
 "one!"
 msgstr ""
 
-#: actions/publictagcloud.php:146
-msgid "Tag cloud"
-msgstr "سحابة الوسوم"
-
 #. TRANS: Client error displayed trying to recover password while already logged in.
 #: actions/recoverpassword.php:37
 msgid "You are already logged in!"
@@ -4823,6 +4932,12 @@ msgstr "استعد كلمة السر"
 msgid "Password recovery requested"
 msgstr "طُلبت استعادة كلمة السر"
 
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/recoverpassword.php:229
+#, fuzzy
+msgid "Password saved"
+msgstr "حُفظت كلمة السر."
+
 #. TRANS: Title for password recovery page when an unknown action has been specified.
 #: actions/recoverpassword.php:232
 msgid "Unknown action"
@@ -4834,15 +4949,9 @@ msgstr "إجراء غير معروف"
 msgid "6 or more characters, and do not forget it!"
 msgstr "6 أحرف أو أكثر"
 
-#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
-#: actions/recoverpassword.php:264 actions/register.php:441
-#, fuzzy
-msgid "Same as password above."
-msgstr "نفس كلمة السر أعلاه"
-
 #. TRANS: Button text for password reset form.
 #. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: actions/recoverpassword.php:268 lib/designsettings.php:264
+#: actions/recoverpassword.php:268 lib/designform.php:145
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Reset"
@@ -4894,14 +5003,8 @@ msgstr "يجب أن تكون كلمة السر 6 محارف أو أكثر."
 msgid "Password and confirmation do not match."
 msgstr "كلمتا السر غير متطابقتين."
 
-#. TRANS: Reset password form validation error message.
-#: actions/recoverpassword.php:418
-#, fuzzy
-msgid "Cannot save new password."
-msgstr "تعذّر حفظ كلمة السر الجديدة."
-
 #. TRANS: Server error displayed when something does wrong with the user object during password reset.
-#: actions/recoverpassword.php:426 actions/register.php:256
+#: actions/recoverpassword.php:426 actions/register.php:241
 msgid "Error setting user."
 msgstr "خطأ أثناء ضبط المستخدم."
 
@@ -4910,101 +5013,105 @@ msgstr "خطأ أثناء ضبط المستخدم."
 msgid "New password successfully saved. You are now logged in."
 msgstr "حُفظت كلمة السر الجديدة بنجاح. أنت الآن والج."
 
-#: actions/register.php:92 actions/register.php:196 actions/register.php:413
+#: actions/redirecturl.php:70
+#, fuzzy
+msgid "No id parameter"
+msgstr "لا مدخل هوية."
+
+#: actions/redirecturl.php:76
+#, fuzzy, php-format
+msgid "No such file \"%d\""
+msgstr "لا ملف كهذا."
+
+#: actions/register.php:80 actions/register.php:181 actions/register.php:392
 msgid "Sorry, only invited people can register."
 msgstr "عذرًا، الأشخاص المدعوون وحدهم يستطيعون التسجيل."
 
-#: actions/register.php:99
+#: actions/register.php:87
 msgid "Sorry, invalid invitation code."
 msgstr "عذرا، رمز دعوة غير صالح."
 
-#: actions/register.php:119
+#: actions/register.php:106
 msgid "Registration successful"
 msgstr "نجح التسجيل"
 
-#: actions/register.php:121 actions/register.php:511
+#: actions/register.php:108 actions/register.php:490
 msgid "Register"
 msgstr "سجّل"
 
-#: actions/register.php:142
+#: actions/register.php:128
 msgid "Registration not allowed."
 msgstr "لا يُسمح بالتسجيل."
 
-#: actions/register.php:209
+#: actions/register.php:194
 #, fuzzy
-msgid "You can't register if you don't agree to the license."
+msgid "You cannot register if you don't agree to the license."
 msgstr "لا يمكنك تكرار ملاحظتك الشخصية."
 
-#: actions/register.php:218
+#: actions/register.php:203
 msgid "Email address already exists."
 msgstr "عنوان البريد الإلكتروني موجود مسبقًا."
 
-#: actions/register.php:251 actions/register.php:273
+#: actions/register.php:236 actions/register.php:258
 msgid "Invalid username or password."
 msgstr "اسم مستخدم أو كلمة سر غير صالحة."
 
-#: actions/register.php:351
+#: actions/register.php:333
 msgid ""
 "With this form you can create a new account. You can then post notices and "
-"link up to friends and colleagues. "
+"link up to friends and colleagues."
 msgstr ""
 
-#: actions/register.php:437
-#, fuzzy
-msgid "6 or more characters."
-msgstr "6 أحرف أو أكثر"
-
-#. TRANS: Link description in user account settings menu.
-#: actions/register.php:445 actions/register.php:449
-#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
+#: actions/register.php:424 actions/register.php:428
+#: actions/siteadminpanel.php:238 lib/settingsnav.php:92
 msgid "Email"
 msgstr "البريد الإلكتروني"
 
-#: actions/register.php:446 actions/register.php:450
+#: actions/register.php:425 actions/register.php:429
 #, fuzzy
-msgid "Used only for updates, announcements, and password recovery"
+msgid "Used only for updates, announcements, and password recovery."
 msgstr "لا يُستخدم إلا عند التحديثات، والتعميمات، ولاستعادة كلمة السر"
 
-#: actions/register.php:457
+#: actions/register.php:436
 #, fuzzy
-msgid "Longer name, preferably your \"real\" name"
+msgid "Longer name, preferably your \"real\" name."
 msgstr "اسم أطول. يُفضَّل استخدام اسمك الحقيقي"
 
-#: actions/register.php:462
+#: actions/register.php:464
 #, fuzzy
-msgid "URL of your homepage, blog, or profile on another site"
-msgstr "مسار صفحتك الرئيسية أو مدونتك أو ملفك الشخصي على موقع آخر"
+msgid "Where you are, like \"City, State (or Region), Country\"."
+msgstr "مكان تواجدك، على سبيل المثال \"المدينة، الولاية (أو المنطقة)، الدولة\""
 
-#: actions/register.php:523
+#: actions/register.php:503
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
 msgstr ""
 
-#: actions/register.php:533
+#: actions/register.php:513
 #, php-format
 msgid "My text and files are copyright by %1$s."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:537
+#: actions/register.php:517
 msgid "My text and files remain under my own copyright."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:540
+#: actions/register.php:520
 msgid "All rights reserved."
 msgstr "جميع الحقوق محفوظة."
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:545
+#: actions/register.php:525
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
 "email address, IM address, and phone number."
 msgstr ""
 
-#: actions/register.php:588
+#: actions/register.php:566
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -5023,7 +5130,7 @@ msgid ""
 "Thanks for signing up and we hope you enjoy using this service."
 msgstr ""
 
-#: actions/register.php:612
+#: actions/register.php:590
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5050,7 +5157,7 @@ msgid "User nickname"
 msgstr "اسم المستخدم المستعار"
 
 #: actions/remotesubscribe.php:129
-msgid "Nickname of the user you want to follow"
+msgid "Nickname of the user you want to follow."
 msgstr ""
 
 #: actions/remotesubscribe.php:132
@@ -5058,18 +5165,18 @@ msgid "Profile URL"
 msgstr "مسار الملف الشخصي"
 
 #: actions/remotesubscribe.php:133
-msgid "URL of your profile on another compatible microblogging service"
+msgid "URL of your profile on another compatible microblogging service."
 msgstr ""
 
 #. TRANS: Link text for link that will subscribe to a remote profile.
 #: actions/remotesubscribe.php:136 lib/subscribeform.php:139
-#: lib/userprofile.php:431
+#: lib/userprofile.php:402
 msgid "Subscribe"
 msgstr "اشترك"
 
 #: actions/remotesubscribe.php:158
 #, fuzzy
-msgid "Invalid profile URL (bad format)"
+msgid "Invalid profile URL (bad format)."
 msgstr "حجم غير صالح."
 
 #: actions/remotesubscribe.php:167
@@ -5103,7 +5210,7 @@ msgstr "لا يمكنك تكرار ملاحظتك الشخصية."
 msgid "You already repeated that notice."
 msgstr "أنت كررت هذه الملاحظة بالفعل."
 
-#: actions/repeat.php:112 lib/noticelist.php:692
+#: actions/repeat.php:112 lib/noticelist.php:697
 msgid "Repeated"
 msgstr "مكرر"
 
@@ -5111,9 +5218,9 @@ msgstr "مكرر"
 msgid "Repeated!"
 msgstr "مكرر!"
 
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing @-replies.
+#. TRANS: RSS reply feed title. %s is a user nickname.
 #: actions/replies.php:126 actions/repliesrss.php:68
-#: lib/personalgroupnav.php:109
+#: lib/personalgroupnav.php:105
 #, php-format
 msgid "Replies to %s"
 msgstr "الردود على %s"
@@ -5159,9 +5266,11 @@ msgid ""
 "newnotice%%%%?status_textarea=%3$s)."
 msgstr ""
 
-#: actions/repliesrss.php:72
+#. TRANS: RSS reply feed description.
+#. TRANS: %1$s is a user nickname, %2$s is the StatusNet site name.
+#: actions/repliesrss.php:74
 #, fuzzy, php-format
-msgid "Replies to %1$s on %2$s!"
+msgid "Replies to %1$s on %2$s."
 msgstr "الردود على %1$s، الصفحة %2$d"
 
 #. TRANS: Client exception displayed when trying to restore an account while not logged in.
@@ -5261,7 +5370,7 @@ msgstr "لا يمكنك سحب أدوار المستخدمين على هذا ا
 msgid "User doesn't have this role."
 msgstr "ليس للمستخدم هذا الدور."
 
-#: actions/rsd.php:146 actions/version.php:159
+#: actions/rsd.php:142 actions/version.php:159
 msgid "StatusNet"
 msgstr "ستاتس نت"
 
@@ -5306,95 +5415,46 @@ msgstr "مكّن تنقيح مُخرجات الجلسة."
 msgid "Save site settings"
 msgstr "اذف إعدادت الموقع"
 
-#: actions/showapplication.php:82
+#: actions/showapplication.php:78
 msgid "You must be logged in to view an application."
 msgstr "يجب أن تكون مسجل الدخول لرؤية تطبيق."
 
-#: actions/showapplication.php:157
+#: actions/showapplication.php:151
 #, fuzzy
 msgid "Application profile"
 msgstr "معلومات التطبيق"
 
-#. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:159 lib/applicationeditform.php:177
-msgid "Icon"
-msgstr "أيقونة"
-
-#. TRANS: Form input field label for application name.
-#: actions/showapplication.php:169 actions/version.php:197
-#: lib/applicationeditform.php:190
-msgid "Name"
-msgstr "الاسم"
-
-#. TRANS: Form input field label.
-#: actions/showapplication.php:178 lib/applicationeditform.php:227
-msgid "Organization"
-msgstr "المنظمة"
-
-#. TRANS: Form input field label.
-#: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:168
-msgid "Description"
-msgstr "الوصف"
-
-#. TRANS: Header for group statistics on a group page (h2).
-#. TRANS: H2 text for user statistics.
-#: actions/showapplication.php:192 actions/showgroup.php:460
-#: lib/profileaction.php:205
-msgid "Statistics"
-msgstr "إحصاءات"
-
-#: actions/showapplication.php:203
+#: actions/showapplication.php:179
 #, php-format
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr ""
 
-#: actions/showapplication.php:213
+#: actions/showapplication.php:189
 #, fuzzy
 msgid "Application actions"
 msgstr "معلومات التطبيق"
 
-#: actions/showapplication.php:236
+#: actions/showapplication.php:212
 msgid "Reset key & secret"
 msgstr ""
 
 #. TRANS: Title of form for deleting a user.
-#: actions/showapplication.php:252 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:64 lib/noticelist.php:673
+#: actions/showapplication.php:228 lib/deletegroupform.php:121
+#: lib/deleteuserform.php:64 lib/noticelist.php:678
 msgid "Delete"
 msgstr "احذف"
 
-#: actions/showapplication.php:261
+#: actions/showapplication.php:237
 msgid "Application info"
 msgstr "معلومات التطبيق"
 
-#: actions/showapplication.php:263
-msgid "Consumer key"
-msgstr ""
-
-#: actions/showapplication.php:268
-msgid "Consumer secret"
-msgstr ""
-
-#: actions/showapplication.php:273
-msgid "Request token URL"
-msgstr ""
-
-#: actions/showapplication.php:278
-msgid "Access token URL"
-msgstr ""
-
-#: actions/showapplication.php:283
-msgid "Authorize URL"
-msgstr "اسمح بالمسار"
-
-#: actions/showapplication.php:288
+#: actions/showapplication.php:255
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
 msgstr ""
 
-#: actions/showapplication.php:309
+#: actions/showapplication.php:275
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr "أمتأكد من أنك تريد إعادة ضبط مفتاح المستهلك وكلمة سره؟"
 
@@ -5478,62 +5538,48 @@ msgstr "مجموعة %s"
 msgid "%1$s group, page %2$d"
 msgstr "مجموعة %1$s، الصفحة %2$d"
 
-#. TRANS: Group profile header (h2). Text hidden by default.
-#: actions/showgroup.php:223
-msgid "Group profile"
-msgstr "ملف المجموعة الشخصي"
-
-#. TRANS: Label for group URL (dt). Text hidden by default.
-#. TRANS: DT for URL in a profile.
-#: actions/showgroup.php:273 actions/tagother.php:118
-#: actions/userauthorization.php:175 lib/userprofile.php:186
-msgid "URL"
-msgstr "مسار"
-
 #. TRANS: Label for group description or group note (dt). Text hidden by default.
-#. TRANS: DT for note in a profile.
-#: actions/showgroup.php:285 actions/tagother.php:128
-#: actions/userauthorization.php:187 lib/userprofile.php:204
+#: actions/showgroup.php:266
 msgid "Note"
 msgstr "ملاحظة"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:296 lib/groupeditform.php:180
+#: actions/showgroup.php:277 lib/groupeditform.php:180
 msgid "Aliases"
 msgstr "الكنى"
 
 #. TRANS: Group actions header (h2). Text hidden by default.
-#: actions/showgroup.php:313
+#: actions/showgroup.php:294
 #, fuzzy
 msgid "Group actions"
 msgstr "تصرفات المستخدم"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:357
+#: actions/showgroup.php:338
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
 msgstr ""
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:364
+#: actions/showgroup.php:345
 #, php-format
 msgid "Notice feed for %s group (RSS 2.0)"
 msgstr ""
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:371
+#: actions/showgroup.php:352
 #, php-format
 msgid "Notice feed for %s group (Atom)"
 msgstr ""
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:377
+#: actions/showgroup.php:358
 #, fuzzy, php-format
 msgid "FOAF for %s group"
 msgstr "مجموعة %s"
 
 #. TRANS: Header for mini list of group members on a group page (h2).
-#: actions/showgroup.php:414
+#: actions/showgroup.php:395
 msgid "Members"
 msgstr "الأعضاء"
 
@@ -5541,26 +5587,31 @@ msgstr "الأعضاء"
 #. TRANS: Text for user subscription statistics if the user has no subscriptions.
 #. TRANS: Text for user subscriber statistics if user has no subscribers.
 #. TRANS: Text for user user group membership statistics if user is not a member of any group.
-#: actions/showgroup.php:420 lib/profileaction.php:137
+#: actions/showgroup.php:401 lib/profileaction.php:137
 #: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
-#: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
+#: lib/subscriptionlist.php:123 lib/tagcloudsection.php:71
 msgid "(None)"
 msgstr "(لا شيء)"
 
 #. TRANS: Link to all group members from mini list of group members if group has more than n members.
-#: actions/showgroup.php:429
+#: actions/showgroup.php:410
 msgid "All members"
 msgstr "جميع الأعضاء"
 
-#. TRANS: Label for creation date in statistics on group page.
-#: actions/showgroup.php:465
+#. TRANS: Header for group statistics on a group page (h2).
+#. TRANS: H2 text for user statistics.
+#: actions/showgroup.php:441 lib/profileaction.php:205
+msgid "Statistics"
+msgstr "إحصاءات"
+
+#: actions/showgroup.php:444
 #, fuzzy
 msgctxt "LABEL"
 msgid "Created"
 msgstr "أنشئت"
 
 #. TRANS: Label for member count in statistics on group page.
-#: actions/showgroup.php:473
+#: actions/showgroup.php:449
 #, fuzzy
 msgctxt "LABEL"
 msgid "Members"
@@ -5570,7 +5621,7 @@ msgstr "الأعضاء"
 #. TRANS: **%s** is the group alias, %%%%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).
-#: actions/showgroup.php:488
+#: actions/showgroup.php:464
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5588,7 +5639,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: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
-#: actions/showgroup.php:498
+#: actions/showgroup.php:474
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5601,7 +5652,7 @@ msgstr ""
 "(http://status.net/). يتشارك أعضاؤها رسائل قصيرة عن حياتهم واهتماماتهم. "
 
 #. TRANS: Header for list of group administrators on a group page (h2).
-#: actions/showgroup.php:527
+#: actions/showgroup.php:503
 msgid "Admins"
 msgstr "الإداريون"
 
@@ -5640,7 +5691,7 @@ msgid "%1$s tagged %2$s"
 msgstr "%1$s، الصفحة %2$d"
 
 #. TRANS: Page title showing tagged notices in one user's stream.
-#. TRANS: %1$s is the username, %2$s is the hash tag, %1$d is the page number.
+#. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
 #: actions/showstream.php:74
 #, fuzzy, php-format
 msgid "%1$s tagged %2$s, page %3$d"
@@ -5687,13 +5738,13 @@ msgid "FOAF for %s"
 msgstr "صندوق %s الصادر"
 
 #. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
-#: actions/showstream.php:211
+#: actions/showstream.php:205
 #, php-format
 msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr ""
 
 #. TRANS: Second sentence of empty list message for a stream for the user themselves.
-#: actions/showstream.php:217
+#: actions/showstream.php:211
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
@@ -5701,7 +5752,7 @@ msgstr ""
 
 #. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:221
+#: actions/showstream.php:215
 #, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
@@ -5710,7 +5761,7 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:264
+#: actions/showstream.php:258
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5726,7 +5777,7 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:271
+#: actions/showstream.php:265
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5738,7 +5789,7 @@ msgstr ""
 "(http://status.net/). "
 
 #. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
-#: actions/showstream.php:328
+#: actions/showstream.php:322
 #, php-format
 msgid "Repeat of %s"
 msgstr "تكرار ل%s"
@@ -5885,112 +5936,112 @@ msgstr "نص إشعار عام للموقع (255 حرف كحد أقصى؛ يسم
 #. TRANS: Title for button to save site notice in admin panel.
 #: actions/sitenoticeadminpanel.php:201
 #, fuzzy
-msgid "Save site notice"
+msgid "Save site notice."
 msgstr "احفظ إشعار الموقع"
 
 #. TRANS: Title for SMS settings.
-#: actions/smssettings.php:57
+#: actions/smssettings.php:56
 msgid "SMS settings"
 msgstr "إعدادات الرسائل القصيرة"
 
 #. TRANS: SMS settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/smssettings.php:71
+#: actions/smssettings.php:70
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr "لا يمكنك استلام رسائل قصيرة عبر البريد الإلكرتوني من %%site.name%%."
 
 #. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
-#: actions/smssettings.php:93
+#: actions/smssettings.php:92
 msgid "SMS is not available."
 msgstr "الرسائل القصيرة غير متوفرة."
 
 #. TRANS: Form legend for SMS settings form.
-#: actions/smssettings.php:107
+#: actions/smssettings.php:106
 msgid "SMS address"
 msgstr "عنوان الرسائل القصيرة"
 
 #. TRANS: Form guide in SMS settings form.
-#: actions/smssettings.php:116
+#: actions/smssettings.php:115
 #, fuzzy
 msgid "Current confirmed SMS-enabled phone number."
 msgstr "عنوان البريد الإلكتروني المُؤكد الحالي."
 
 #. TRANS: Form guide in IM settings form.
-#: actions/smssettings.php:129
+#: actions/smssettings.php:128
 #, fuzzy
 msgid "Awaiting confirmation on this phone number."
 msgstr "إن رقم التأكيد هذا خاطئ."
 
 #. TRANS: Field label for SMS address input in SMS settings form.
-#: actions/smssettings.php:138
+#: actions/smssettings.php:137
 msgid "Confirmation code"
 msgstr "رمز التأكيد"
 
 #. TRANS: Form field instructions in SMS settings form.
-#: actions/smssettings.php:140
+#: actions/smssettings.php:139
 msgid "Enter the code you received on your phone."
 msgstr "أدخِل الرمز الذي تلقيته على هاتفك."
 
 #. TRANS: Button label to confirm SMS confirmation code in SMS settings.
-#: actions/smssettings.php:144
+#: actions/smssettings.php:143
 msgctxt "BUTTON"
 msgid "Confirm"
 msgstr "أكّد"
 
 #. TRANS: Field label for SMS phone number input in SMS settings form.
-#: actions/smssettings.php:149
+#: actions/smssettings.php:148
 msgid "SMS phone number"
 msgstr "رقم هاتف SMS"
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
-#: actions/smssettings.php:152
+#: actions/smssettings.php:151
 #, fuzzy
-msgid "Phone number, no punctuation or spaces, with area code"
+msgid "Phone number, no punctuation or spaces, with area code."
 msgstr "رقم الهاتف بدون شرطات أو مسافات مع رمز المنطقة"
 
 #. TRANS: Form legend for SMS preferences form.
-#: actions/smssettings.php:191
+#: actions/smssettings.php:190
 msgid "SMS preferences"
 msgstr "تفضيلات الرسائل القصيرة"
 
 #. TRANS: Checkbox label in SMS preferences form.
-#: actions/smssettings.php:197
+#: actions/smssettings.php:196
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
 msgstr ""
 
 #. TRANS: Confirmation message for successful SMS preferences save.
-#: actions/smssettings.php:308
+#: actions/smssettings.php:307
 msgid "SMS preferences saved."
 msgstr "حُفظت تفضيلات الرسائل القصيرة."
 
 #. TRANS: Message given saving SMS phone number without having provided one.
-#: actions/smssettings.php:330
+#: actions/smssettings.php:329
 msgid "No phone number."
 msgstr "لا رقم هاتف."
 
 #. TRANS: Message given saving SMS phone number without having selected a carrier.
-#: actions/smssettings.php:336
+#: actions/smssettings.php:335
 #, fuzzy
 msgid "No carrier selected."
 msgstr "حُذف الإشعار."
 
 #. TRANS: Message given saving SMS phone number that is already set.
-#: actions/smssettings.php:344
+#: actions/smssettings.php:343
 #, fuzzy
 msgid "That is already your phone number."
 msgstr "هذا ليس رقم هاتفك."
 
 #. TRANS: Message given saving SMS phone number that is already set for another user.
-#: actions/smssettings.php:348
+#: actions/smssettings.php:347
 #, fuzzy
 msgid "That phone number already belongs to another user."
 msgstr "هذا البريد الإلكتروني ملك مستخدم آخر بالفعل."
 
 #. TRANS: Message given saving valid SMS phone number that is to be confirmed.
-#: actions/smssettings.php:376
+#: actions/smssettings.php:375
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
 "for the code and instructions on how to use it."
@@ -5999,39 +6050,39 @@ msgstr ""
 "والتعليمات لكيفية استخدامه."
 
 #. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
-#: actions/smssettings.php:404
+#: actions/smssettings.php:403
 msgid "That is the wrong confirmation number."
 msgstr "إن رقم التأكيد هذا خاطئ."
 
 #. TRANS: Message given after successfully canceling SMS phone number confirmation.
-#: actions/smssettings.php:418
+#: actions/smssettings.php:417
 msgid "SMS confirmation cancelled."
 msgstr "أُلغي تأكيد الرسائل القصيرة."
 
 #. TRANS: Message given trying to remove an SMS phone number that is not
 #. TRANS: registered for the active user.
-#: actions/smssettings.php:438
+#: actions/smssettings.php:437
 msgid "That is not your phone number."
 msgstr "هذا ليس رقم هاتفك."
 
 #. TRANS: Message given after successfully removing a registered SMS phone number.
-#: actions/smssettings.php:460
+#: actions/smssettings.php:459
 msgid "The SMS phone number was removed."
 msgstr "تمت إزالة رقم هاتف الرسائل القصيرة."
 
 #. TRANS: Label for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:499
+#: actions/smssettings.php:498
 msgid "Mobile carrier"
 msgstr "شركة الهاتف الخليوي"
 
 #. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:504
+#: actions/smssettings.php:503
 msgid "Select a carrier"
 msgstr "اختر شركة"
 
 #. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
 #. TRANS: %s is an administrative contact's e-mail address.
-#: actions/smssettings.php:513
+#: actions/smssettings.php:512
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -6039,7 +6090,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
-#: actions/smssettings.php:535
+#: actions/smssettings.php:534
 #, fuzzy
 msgid "No code entered."
 msgstr "لم تدخل رمزًا"
@@ -6118,15 +6169,13 @@ msgstr "لست مُشتركًا بأي أحد."
 msgid "Could not save subscription."
 msgstr "تعذّر حفظ الاشتراك."
 
-#: actions/subscribe.php:77
-msgid "This action only accepts POST requests."
-msgstr "هذا الإجراء يقبل طلبات POST فقط."
-
-#: actions/subscribe.php:117
+#. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
+#: actions/subscribe.php:121
 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
 msgstr ""
 
-#: actions/subscribe.php:145
+#. TRANS: Page title when subscription succeeded.
+#: actions/subscribe.php:149
 msgid "Subscribed"
 msgstr "مُشترك"
 
@@ -6233,31 +6282,34 @@ msgid "Subscription feed for %s (Atom)"
 msgstr "الردود على %s"
 
 #. TRANS: Checkbox label for enabling Jabber messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:239
-msgid "Jabber"
-msgstr "جابر"
+#: actions/subscriptions.php:241 lib/settingsnav.php:110
+#, fuzzy
+msgid "IM"
+msgstr "محادثة فورية"
 
 #. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:254
+#: actions/subscriptions.php:256 lib/settingsnav.php:117
 msgid "SMS"
 msgstr "رسائل قصيرة"
 
-#: actions/tag.php:69
+#. TRANS: Title for all but the first page of notices with tags.
+#. TRANS: %1$s is the tag, %2$d is the page number.
+#: actions/tag.php:73
 #, php-format
 msgid "Notices tagged with %1$s, page %2$d"
 msgstr "الإشعارات الموسومة ب%s، الصفحة %2$d"
 
-#: actions/tag.php:87
+#: actions/tag.php:91
 #, php-format
 msgid "Notice feed for tag %s (RSS 1.0)"
 msgstr ""
 
-#: actions/tag.php:93
+#: actions/tag.php:97
 #, php-format
 msgid "Notice feed for tag %s (RSS 2.0)"
 msgstr ""
 
-#: actions/tag.php:99
+#: actions/tag.php:103
 #, php-format
 msgid "Notice feed for tag %s (Atom)"
 msgstr ""
@@ -6276,17 +6328,11 @@ msgstr "الوسوم"
 msgid "User profile"
 msgstr "ملف المستخدم الشخصي"
 
-#. TRANS: DT element in area for user avatar.
-#: actions/tagother.php:81 actions/userauthorization.php:132
-#: lib/userprofile.php:108
-msgid "Photo"
-msgstr "صورة"
-
-#: actions/tagother.php:141
+#: actions/tagother.php:120
 msgid "Tag user"
 msgstr "اوسم المستخدم"
 
-#: actions/tagother.php:151
+#: actions/tagother.php:130
 #, fuzzy
 msgid ""
 "Tags for this user (letters, numbers, -, ., and _), comma- or space- "
@@ -6294,12 +6340,17 @@ msgid ""
 msgstr ""
 "سِم نفسك (حروف وأرقام و \"-\" و \".\" و \"_\")، افصلها بفاصلة (',') أو مسافة."
 
-#: actions/tagother.php:193
+#: actions/tagother.php:157
+#, php-format
+msgid "Invalid tag: \"%s\""
+msgstr "وسم غير صالح: \"%s\""
+
+#: actions/tagother.php:172
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 
-#: actions/tagother.php:236
+#: actions/tagother.php:215
 #, fuzzy
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr "استخدم هذا النموذج لتعدل تطبيقك."
@@ -6308,6 +6359,7 @@ msgstr "استخدم هذا النموذج لتعدل تطبيقك."
 msgid "No such tag."
 msgstr "لا وسم كهذا."
 
+#. TRANS: Client error displayed when trying to unblock a non-blocked user.
 #: actions/unblock.php:59
 msgid "You haven't blocked that user."
 msgstr "لم تمنع هذا المستخدم."
@@ -6329,12 +6381,84 @@ msgstr "لا طلب استيثاق."
 msgid "Unsubscribed"
 msgstr "غير مشترك"
 
-#: actions/updateprofile.php:64 actions/userauthorization.php:337
+#: actions/updateprofile.php:64
 #, php-format
 msgid ""
 "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
 msgstr ""
 
+#: actions/urlsettings.php:60
+#, fuzzy
+msgid "URL settings"
+msgstr "إعدادات المراسلة الفورية"
+
+#. TRANS: Instructions for tab "Other" in user profile settings.
+#: actions/urlsettings.php:72
+msgid "Manage various other options."
+msgstr "أدر خيارات أخرى عديدة."
+
+#. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
+#. TRANS: user's profile settings. This message has one space at the beginning. Use your
+#. TRANS: language's word separator here if it has one (most likely a single space).
+#: actions/urlsettings.php:115
+msgid " (free service)"
+msgstr " (خدمة حرة)"
+
+#: actions/urlsettings.php:121
+#, fuzzy
+msgid "[none]"
+msgstr "لا شيء"
+
+#: actions/urlsettings.php:122
+msgid "[internal]"
+msgstr ""
+
+#. TRANS: Label for dropdown with URL shortener services.
+#: actions/urlsettings.php:130
+msgid "Shorten URLs with"
+msgstr "قصّر المسارات بـ"
+
+#. TRANS: Tooltip for for dropdown with URL shortener services.
+#: actions/urlsettings.php:132
+msgid "Automatic shortening service to use."
+msgstr "خدمة التقصير المطلوب استخدامها."
+
+#: actions/urlsettings.php:138
+msgid "URL longer than"
+msgstr ""
+
+#: actions/urlsettings.php:141
+msgid "URLs longer than this will be shortened, 0 means always shorten."
+msgstr ""
+
+#: actions/urlsettings.php:145
+msgid "Text longer than"
+msgstr ""
+
+#: actions/urlsettings.php:148
+msgid ""
+"URLs in notices longer than this will be shortened, 0 means always shorten."
+msgstr ""
+
+#. TRANS: Form validation error for form "Other settings" in user profile.
+#: actions/urlsettings.php:180
+#, fuzzy
+msgid "URL shortening service is too long (maximum 50 characters)."
+msgstr "الاسم الكامل طويل جدا (الأقصى 255 حرفًا)"
+
+#: actions/urlsettings.php:187
+msgid "Invalid number for max url length."
+msgstr ""
+
+#: actions/urlsettings.php:193
+#, fuzzy
+msgid "Invalid number for max notice length."
+msgstr "محتوى إشعار غير صالح."
+
+#: actions/urlsettings.php:238
+msgid "Error saving user URL shortening preferences."
+msgstr ""
+
 #. TRANS: User admin panel title
 #: actions/useradminpanel.php:58
 msgctxt "TITLE"
@@ -6361,11 +6485,11 @@ msgstr "رسالة ترحيب غير صالحة. أقصى طول هو 255 حرف
 #. TRANS: users in user admin panel. %1$s is the invalid nickname.
 #: actions/useradminpanel.php:166
 #, php-format
-msgid "Invalid default subscripton: '%1$s' is not a user."
+msgid "Invalid default subscripton: \"%1$s\" is not a user."
 msgstr ""
 
-#. TRANS: Link description in user account settings menu.
-#: actions/useradminpanel.php:215 lib/accountsettingsaction.php:106
+#: actions/useradminpanel.php:215 lib/action.php:565 lib/settingsnav.php:77
+#: lib/subgroupnav.php:81
 msgid "Profile"
 msgstr "الملف الشخصي"
 
@@ -6423,128 +6547,174 @@ msgstr "اسمح للمستخدمين بدعوة مستخدمين جدد."
 #. TRANS: Title for button to save user settings in user admin panel.
 #: actions/useradminpanel.php:302
 #, fuzzy
-msgid "Save user settings"
+msgid "Save user settings."
 msgstr "احفظ إعدادات المستخدم"
 
-#: actions/userauthorization.php:105
+#. TRANS: Page title.
+#: actions/userauthorization.php:109
 #, fuzzy
 msgid "Authorize subscription"
 msgstr "جميع الاشتراكات"
 
-#: actions/userauthorization.php:110
+#. TRANS: Page notice on "Auhtorize subscription" page.
+#: actions/userauthorization.php:115
 #, fuzzy
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
 "user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
-"click “Reject”."
+"click \"Reject\"."
 msgstr ""
 "يُرجى التحقق من هذه التفاصيل للتأكد من أنك تريد الاستماع لإشعارات هذا "
 "المستخدم. إذا لم تطلب للتو الاستماع لإشعارات شخص ما فانقر \"ارفض\"."
 
-#. TRANS: Menu item for site administration
-#: actions/userauthorization.php:196 actions/version.php:167
-#: lib/adminpanelaction.php:403
-msgid "License"
-msgstr "الرخصة"
-
-#: actions/userauthorization.php:217
+#. TRANS: Button text on Authorise Subscription page.
+#: actions/userauthorization.php:200
 #, fuzzy
+msgctxt "BUTTON"
 msgid "Accept"
 msgstr "اقبل"
 
-#: actions/userauthorization.php:218 lib/subscribeform.php:115
-#: lib/subscribeform.php:139
-msgid "Subscribe to this user"
+#. TRANS: Title for button on Authorise Subscription page.
+#: actions/userauthorization.php:202
+#, fuzzy
+msgid "Subscribe to this user."
 msgstr "اشترك بهذا المستخدم"
 
-#: actions/userauthorization.php:219
+#. TRANS: Button text on Authorise Subscription page.
+#: actions/userauthorization.php:204
 #, fuzzy
+msgctxt "BUTTON"
 msgid "Reject"
 msgstr "ارفض"
 
-#: actions/userauthorization.php:220
+#. TRANS: Title for button on Authorise Subscription page.
+#: actions/userauthorization.php:206
 #, fuzzy
-msgid "Reject this subscription"
+msgid "Reject this subscription."
 msgstr "ارفض هذا الاشتراك"
 
-#: actions/userauthorization.php:232
+#. TRANS: Client error displayed for an empty authorisation request.
+#: actions/userauthorization.php:219
 msgid "No authorization request!"
 msgstr "لا طلب استيثاق!"
 
-#: actions/userauthorization.php:254
+#. TRANS: Accept message header from Authorise subscription page.
+#: actions/userauthorization.php:242
 #, fuzzy
 msgid "Subscription authorized"
 msgstr "رُفض الاشتراك"
 
-#: actions/userauthorization.php:256
+#: actions/userauthorization.php:245
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to authorize the "
 "subscription. Your subscription token is:"
 msgstr ""
 
-#: actions/userauthorization.php:266
+#. TRANS: Reject message header from Authorise subscription page.
+#: actions/userauthorization.php:256
 msgid "Subscription rejected"
 msgstr "رُفض الاشتراك"
 
-#: actions/userauthorization.php:268
+#: actions/userauthorization.php:259
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to fully reject the "
 "subscription."
 msgstr ""
 
-#: actions/userauthorization.php:303
+#. TRANS: Exception thrown when no valid user is found for an authorisation request.
+#. TRANS: %s is a listener URI.
+#: actions/userauthorization.php:296
 #, php-format
-msgid "Listener URI ‘%s’ not found here."
+msgid "Listener URI \"%s\" not found here."
 msgstr ""
 
-#: actions/userauthorization.php:308
+#. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
+#. TRANS: %s is a listenee URI.
+#: actions/userauthorization.php:303
 #, fuzzy, php-format
-msgid "Listenee URI ‘%s’ is too long."
+msgid "Listenee URI \"%s\" is too long."
 msgstr "المسار المصدر طويل جدًا."
 
-#: actions/userauthorization.php:314
-#, fuzzy, php-format
-msgid "Listenee URI ‘%s’ is a local user."
-msgstr "المسار المصدر طويل جدًا."
+#. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
+#. TRANS: %s is a listenee URI.
+#: actions/userauthorization.php:311
+#, php-format
+msgid "Listenee URI \"%s\" is a local user."
+msgstr ""
 
+#. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
+#. TRANS: %s is a profile URL.
 #: actions/userauthorization.php:329
 #, php-format
-msgid "Profile URL ‘%s’ is for a local user."
+msgid "Profile URL \"%s\" is for a local user."
 msgstr ""
 
-#: actions/userauthorization.php:345
+#. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
+#. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
+#: actions/userauthorization.php:339
+#, php-format
+msgid ""
+"Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
+"\"."
+msgstr ""
+
+#. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
+#. TRANS: %s is an avatar URL.
+#: actions/userauthorization.php:349
 #, fuzzy, php-format
-msgid "Avatar URL ‘%s’ is not valid."
+msgid "Avatar URL \"%s\" is not valid."
 msgstr "مسار المصدر ليس صحيحا."
 
-#: actions/userauthorization.php:350
+#. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
+#. TRANS: %s is an avatar URL.
+#: actions/userauthorization.php:356
 #, fuzzy, php-format
-msgid "Can’t read avatar URL ‘%s’."
+msgid "Cannot read avatar URL \"%s\"."
 msgstr "تعذر قراءة رابط الأفتار ‘%s’."
 
-#: actions/userauthorization.php:355
+#. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
+#. TRANS: %s is an avatar URL.
+#: actions/userauthorization.php:363
 #, php-format
-msgid "Wrong image type for avatar URL ‘%s’."
+msgid "Wrong image type for avatar URL \"%s\"."
 msgstr ""
 
 #. TRANS: Page title for profile design page.
-#: actions/userdesignsettings.php:74 lib/designsettings.php:63
+#: actions/userdesignsettings.php:74 lib/designsettings.php:61
 msgid "Profile design"
 msgstr "تصميم الملف الشخصي"
 
 #. TRANS: Instructions for profile design page.
-#: actions/userdesignsettings.php:84 lib/designsettings.php:74
+#: actions/userdesignsettings.php:84 lib/designsettings.php:72
 msgid ""
 "Customize the way your profile looks with a background image and a colour "
 "palette of your choice."
 msgstr "خصّص أسلوب عرض ملفك بصورة خلفية ومخطط ألوان من اختيارك."
 
-#: actions/userdesignsettings.php:272
+#: actions/userdesignsettings.php:289
 msgid "Enjoy your hotdog!"
 msgstr "استمتع بالنقانق!"
 
+#: actions/userdesignsettings.php:325
+#, fuzzy
+msgid "Design settings"
+msgstr "اذف إعدادت الموقع"
+
+#: actions/userdesignsettings.php:340
+msgid "View profile designs"
+msgstr "اعرض تصاميم الملف الشخصي"
+
+#: actions/userdesignsettings.php:341
+msgid "Show or hide profile designs."
+msgstr "أظهر أو أخفِ تصاميم الملفات الشخصية."
+
+#: actions/userdesignsettings.php:348
+#, fuzzy
+msgid "Background file"
+msgstr "الخلفية"
+
 #. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number.
 #: actions/usergroups.php:66
 #, php-format
@@ -6594,6 +6764,11 @@ msgstr ""
 msgid "Contributors"
 msgstr "المساهمون"
 
+#. TRANS: Menu item for site administration
+#: actions/version.php:167 lib/adminpanelaction.php:403
+msgid "License"
+msgstr "الرخصة"
+
 #: actions/version.php:170
 msgid ""
 "StatusNet is free software: you can redistribute it and/or modify it under "
@@ -6620,12 +6795,13 @@ msgid ""
 "along with this program.  If not, see %s."
 msgstr ""
 
-#: actions/version.php:191
-msgid "Plugins"
-msgstr "الملحقات"
+#. TRANS: Form input field label for application name.
+#: actions/version.php:197 lib/applicationeditform.php:190
+msgid "Name"
+msgstr "الاسم"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:901
+#: actions/version.php:198 lib/action.php:885
 msgid "Version"
 msgstr "النسخة"
 
@@ -6633,6 +6809,12 @@ msgstr "النسخة"
 msgid "Author(s)"
 msgstr "المؤلف(ون)"
 
+#. TRANS: Form input field label.
+#: actions/version.php:200 lib/applicationeditform.php:208
+#: lib/groupeditform.php:168
+msgid "Description"
+msgstr "الوصف"
+
 #. TRANS: Activity title when marking a notice as favorite.
 #: classes/Fave.php:164
 msgid "Favor"
@@ -6760,7 +6942,7 @@ msgid "Could not create login token for %s"
 msgstr "لم يمكن إنشاء توكن الولوج ل%s"
 
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
-#: classes/Memcached_DataObject.php:542
+#: classes/Memcached_DataObject.php:556
 msgid "No database name or DSN found anywhere."
 msgstr ""
 
@@ -6935,18 +7117,18 @@ msgstr "%1$s يستمع الآن إلى إشعاراتك على %2$s."
 
 #. TRANS: Notice given on user registration.
 #. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:395
+#: classes/User.php:390
 #, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr "أهلا بكم في %1$s يا @%2$s!"
 
 #. TRANS: Server exception.
-#: classes/User.php:918
+#: classes/User.php:923
 msgid "No single user defined for single-user mode."
 msgstr ""
 
 #. TRANS: Server exception.
-#: classes/User.php:922
+#: classes/User.php:927
 msgid "Single-user mode code called when not enabled."
 msgstr ""
 
@@ -6991,41 +7173,6 @@ msgstr ""
 msgid "No AtomPub API service for %s."
 msgstr ""
 
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:104
-msgid "Change your profile settings"
-msgstr "غيّر إعدادات ملفك الشخصي"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:111
-msgid "Upload an avatar"
-msgstr "ارفع أفتارًا"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:118
-msgid "Change your password"
-msgstr "غير كلمة سرّك"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:125
-msgid "Change email handling"
-msgstr "غير أسلوب التعامل مع البريد الإلكتروني"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:132
-msgid "Design your profile"
-msgstr "صمّم ملفك الشخصي"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:139
-msgid "Other options"
-msgstr "خيارات أخرى"
-
-#. TRANS: Link description in user account settings menu.
-#: lib/accountsettingsaction.php:141
-msgid "Other"
-msgstr "أخرى"
-
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
 #: lib/action.php:161
 #, php-format
@@ -7043,208 +7190,128 @@ msgctxt "TOOLTIP"
 msgid "Show more"
 msgstr ""
 
-#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:544
+#. TRANS: Inline reply form submit button: submits a reply comment.
+#: lib/action.php:328
 #, fuzzy
-msgid "Primary site navigation"
-msgstr "ضبط الموقع الأساسي"
+msgctxt "BUTTON"
+msgid "Comment"
+msgstr "المحتوى"
 
-#. TRANS: Tooltip for main menu option "Personal".
-#: lib/action.php:550
-msgctxt "TOOLTIP"
-msgid "Personal profile and friends timeline"
-msgstr "الملف الشخصي ومسار الأصدقاء الزمني"
+#. TRANS: Placeholder text for inline reply form. Clicking in this box will turn it into a mini notice form.
+#: lib/action.php:331
+msgid "Add a comment..."
+msgstr ""
 
-#. TRANS: Main menu option when logged in for access to personal profile and friends timeline.
-#. TRANS: Personal group navigation menu option when logged in for viewing timeline of self and friends.
-#: lib/action.php:553 lib/personalgroupnav.php:100
-msgctxt "MENU"
-msgid "Personal"
-msgstr "الصفحة الشخصية"
+#: lib/action.php:559 lib/personalgroupnav.php:99
+#, fuzzy
+msgid "Home"
+msgstr "الصفحة الرئيسية"
 
-#. TRANS: Tooltip for main menu option "Account".
-#: lib/action.php:555
-msgctxt "TOOLTIP"
-msgid "Change your email, avatar, password, profile"
-msgstr "غير بريدك الإلكتروني وكلمة سرّك وأفتارك وملفك الشخصي"
-
-#. TRANS: Main menu option when logged in for access to user settings.
-#: lib/action.php:558
-msgid "Account"
-msgstr "الحساب"
-
-#. TRANS: Tooltip for main menu option "Services".
 #: lib/action.php:560
-msgctxt "TOOLTIP"
-msgid "Connect to services"
-msgstr "اتصل بالخدمات"
+#, fuzzy
+msgid "Friends timeline"
+msgstr "مسار %s الزمني"
 
-#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services.
-#: lib/action.php:563
-msgid "Connect"
-msgstr "اتصل"
-
-#. TRANS: Tooltip for menu option "Admin".
 #: lib/action.php:566
-msgctxt "TOOLTIP"
-msgid "Change site configuration"
-msgstr "غيّر ضبط الموقع"
+#, fuzzy
+msgid "Your profile"
+msgstr "ملف المجموعة الشخصي"
 
-#. TRANS: Main menu option when logged in and site admin for access to site configuration.
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/action.php:569 lib/groupnav.php:117
-msgctxt "MENU"
-msgid "Admin"
-msgstr "إداري"
+#: lib/action.php:570 lib/action.php:593 lib/publicgroupnav.php:78
+msgid "Public"
+msgstr "عام"
 
-#. TRANS: Tooltip for main menu option "Invite".
-#: lib/action.php:573
-#, php-format
-msgctxt "TOOLTIP"
-msgid "Invite friends and colleagues to join you on %s"
-msgstr "ادعُ أصدقائك وزملائك للانضمام إليك في %s"
+#: lib/action.php:571 lib/action.php:594
+#, fuzzy
+msgid "Everyone on this site"
+msgstr "ابحث عن أشخاص على هذا الموقع"
+
+#: lib/action.php:575
+#, fuzzy
+msgid "Settings"
+msgstr "إعدادات الرسائل القصيرة"
 
-#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users.
 #: lib/action.php:576
-msgctxt "MENU"
-msgid "Invite"
-msgstr "ادعُ"
+#, fuzzy
+msgid "Change your personal settings"
+msgstr "غيّر إعدادات ملفك الشخصي"
 
-#. TRANS: Tooltip for main menu option "Logout"
 #: lib/action.php:582
-msgctxt "TOOLTIP"
-msgid "Logout from the site"
-msgstr "اخرج من الموقع"
+#, fuzzy
+msgid "Site configuration"
+msgstr "ضبط المستخدم"
 
-#. TRANS: Main menu option when logged in to log out the current user.
-#: lib/action.php:585
-msgctxt "MENU"
+#: lib/action.php:587
+#, fuzzy
 msgid "Logout"
 msgstr "اخرج"
 
-#. TRANS: Tooltip for main menu option "Register".
-#: lib/action.php:590
-msgctxt "TOOLTIP"
-msgid "Create an account"
-msgstr "أنشئ حسابًا"
+#: lib/action.php:588
+#, fuzzy
+msgid "Logout from the site"
+msgstr "اخرج من الموقع"
 
-#. TRANS: Main menu option when not logged in to register a new account.
-#. TRANS: Menu item for registering with the StatusNet site.
-#: lib/action.php:593 lib/logingroupnav.php:85
-msgctxt "MENU"
-msgid "Register"
-msgstr "سجّل"
-
-#. TRANS: Tooltip for main menu option "Login".
-#: lib/action.php:596
-msgctxt "TOOLTIP"
+#: lib/action.php:599
+#, fuzzy
 msgid "Login to the site"
 msgstr "لُج إلى الموقع"
 
-#. TRANS: Main menu option when not logged in to log in.
-#. TRANS: Menu item for logging in to the StatusNet site.
-#: lib/action.php:599 lib/logingroupnav.php:77
-msgctxt "MENU"
-msgid "Login"
-msgstr "لُج"
-
-#. TRANS: Tooltip for main menu option "Help".
-#: lib/action.php:602
-msgctxt "TOOLTIP"
-msgid "Help me!"
-msgstr "ساعدني!"
-
-#. TRANS: Main menu option for help on the StatusNet site.
-#: lib/action.php:605
-msgctxt "MENU"
-msgid "Help"
-msgstr "مساعدة"
-
-#. TRANS: Tooltip for main menu option "Search".
-#: lib/action.php:608
-msgctxt "TOOLTIP"
-msgid "Search for people or text"
-msgstr "ابحث عن أشخاص أو نصوص"
-
-#. TRANS: Main menu option when logged in or when the StatusNet instance is not private.
-#: lib/action.php:611
-msgctxt "MENU"
+#: lib/action.php:606
+#, fuzzy
 msgid "Search"
 msgstr "ابحث"
 
-#. TRANS: DT element for site notice. String is hidden in default CSS.
-#. TRANS: Menu item for site administration
-#: lib/action.php:633 lib/adminpanelaction.php:387
-msgid "Site notice"
-msgstr "إشعار الموقع"
-
-#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:700
-msgid "Local views"
-msgstr "المشاهدات المحلية"
-
-#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:770
-msgid "Page notice"
-msgstr "إشعار الصفحة"
-
-#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:874
+#: lib/action.php:607
 #, fuzzy
-msgid "Secondary site navigation"
-msgstr "ضبط الموقع الأساسي"
+msgid "Search the site"
+msgstr "ابحث في الموقع"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:880
+#: lib/action.php:864
 msgid "Help"
 msgstr "مساعدة"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:883
+#: lib/action.php:867
 msgid "About"
 msgstr "عن"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:886
+#: lib/action.php:870
 msgid "FAQ"
 msgstr "الأسئلة المكررة"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:891
+#: lib/action.php:875
 msgid "TOS"
 msgstr "الشروط"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:895
+#: lib/action.php:879
 msgid "Privacy"
 msgstr "خصوصية"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:898
+#: lib/action.php:882
 msgid "Source"
 msgstr "المصدر"
 
 #. TRANS: Secondary navigation menu option leading to e-mail contact information on the
 #. TRANS: StatusNet site, where to report bugs, ...
-#: lib/action.php:905
+#: lib/action.php:889
 msgid "Contact"
 msgstr "اتصل"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:908
+#: lib/action.php:892
 msgid "Badge"
 msgstr "الجسر"
 
-#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:937
-msgid "StatusNet software license"
-msgstr "رخصة برنامج StatusNet"
-
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:944
+#: lib/action.php:921
 #, fuzzy, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7254,7 +7321,7 @@ msgstr ""
 "broughtbyurl%%). "
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:947
+#: lib/action.php:924
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr ""
@@ -7263,7 +7330,7 @@ msgstr ""
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:954
+#: lib/action.php:931
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7274,52 +7341,41 @@ msgstr ""
 "المتوفر تحت [رخصة غنو أفيرو العمومية](http://www.fsf.org/licensing/licenses/"
 "agpl-3.0.html)."
 
-#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:970
-msgid "Site content license"
-msgstr "رخصة محتوى الموقع"
-
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:977
+#: lib/action.php:949
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:984
+#: lib/action.php:956
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:988
+#: lib/action.php:960
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:1020
+#: lib/action.php:992
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
 
-#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1356
-#, fuzzy
-msgid "Pagination"
-msgstr "تسجيل"
-
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1367
+#: lib/action.php:1335
 msgid "After"
 msgstr "بعد"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1377
+#: lib/action.php:1345
 msgid "Before"
 msgstr "قبل"
 
@@ -7475,7 +7531,7 @@ msgid "User configuration"
 msgstr "ضبط المستخدم"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:122
+#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:110
 msgid "User"
 msgstr "المستخدم"
 
@@ -7499,6 +7555,11 @@ msgstr "ضبط الجلسات"
 msgid "Edit site notice"
 msgstr "عدّل إشعار الموقع"
 
+#. TRANS: Menu item for site administration
+#: lib/adminpanelaction.php:387
+msgid "Site notice"
+msgstr "إشعار الموقع"
+
 #. TRANS: Menu item title/tooltip
 #: lib/adminpanelaction.php:393
 #, fuzzy
@@ -7510,6 +7571,12 @@ msgstr "ضبط المسارات"
 msgid "Set site license"
 msgstr ""
 
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:409
+#, fuzzy
+msgid "Plugins configuration"
+msgstr "ضبط المسارات"
+
 #. TRANS: Client error 401.
 #: lib/apiauth.php:111
 msgid "API resource requires read-write access, but you only have read access."
@@ -7520,19 +7587,23 @@ msgstr ""
 msgid "No application for that consumer key."
 msgstr ""
 
+#: lib/apiauth.php:202 lib/apiauth.php:284
+msgid "Not allowed to use API."
+msgstr ""
+
 #. TRANS: OAuth exception given when an incorrect access token was given for a user.
-#: lib/apiauth.php:219
+#: lib/apiauth.php:225
 msgid "Bad access token."
 msgstr ""
 
 #. TRANS: OAuth exception given when no user was found for a given token (no token was found).
-#: lib/apiauth.php:224
+#: lib/apiauth.php:230
 msgid "No user for that token."
 msgstr ""
 
 #. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel".
 #. TRANS: Client error thrown when authentication fails.
-#: lib/apiauth.php:266 lib/apiauth.php:293
+#: lib/apiauth.php:272 lib/apiauth.php:302
 msgid "Could not authenticate you."
 msgstr ""
 
@@ -7579,6 +7650,11 @@ msgstr ""
 msgid "Failed to delete revoked token."
 msgstr ""
 
+#. TRANS: Form input field label for application icon.
+#: lib/applicationeditform.php:177
+msgid "Icon"
+msgstr "أيقونة"
+
 #. TRANS: Form guide.
 #: lib/applicationeditform.php:182
 msgid "Icon for this application"
@@ -7618,6 +7694,11 @@ msgstr "مسار المصدر"
 msgid "Organization responsible for this application"
 msgstr "أيقونة لهذا التطبيق"
 
+#. TRANS: Form input field label.
+#: lib/applicationeditform.php:227
+msgid "Organization"
+msgstr "المنظمة"
+
 #. TRANS: Form input field instructions.
 #: lib/applicationeditform.php:234
 #, fuzzy
@@ -7707,16 +7788,6 @@ msgstr ""
 msgid "Do not use this method!"
 msgstr "لا تحذف هذا الإشعار"
 
-#. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:293
-msgid "Author"
-msgstr "المؤلف"
-
-#. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:307
-msgid "Provider"
-msgstr "المزود"
-
 #. TRANS: Title.
 #: lib/attachmentnoticesection.php:67
 #, fuzzy
@@ -7745,24 +7816,29 @@ msgstr "تغيير كلمة السر غير مسموح به"
 msgid "Block"
 msgstr "امنع"
 
+#. TRANS: Description of the form to block a user.
+#: lib/blockform.php:79
+msgid "Block this user"
+msgstr "امنع هذا المستخدم"
+
 #. TRANS: Title for command results.
-#: lib/channel.php:160 lib/channel.php:181
+#: lib/channel.php:104 lib/channel.php:125
 msgid "Command results"
 msgstr "نتائج الأمر"
 
 #. TRANS: Title for command results.
-#: lib/channel.php:194
+#: lib/channel.php:138
 #, fuzzy
 msgid "AJAX error"
 msgstr "خطأ أجاكس"
 
 #. TRANS: E-mail subject when a command has completed.
-#: lib/channel.php:233 lib/mailhandler.php:143
+#: lib/channel.php:177 lib/mailhandler.php:143
 msgid "Command complete"
 msgstr "اكتمل الأمر"
 
 #. TRANS: E-mail subject when a command has failed.
-#: lib/channel.php:244
+#: lib/channel.php:188
 msgid "Command failed"
 msgstr "فشل الأمر"
 
@@ -7869,7 +7945,7 @@ msgstr "الاسم الكامل: %s"
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a location.
-#: lib/command.php:446 lib/mail.php:270
+#: lib/command.php:446 lib/mail.php:275
 #, php-format
 msgid "Location: %s"
 msgstr "الموقع: %s"
@@ -7877,7 +7953,7 @@ msgstr "الموقع: %s"
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a homepage.
-#: lib/command.php:450 lib/mail.php:274
+#: lib/command.php:450 lib/mail.php:279
 #, php-format
 msgid "Homepage: %s"
 msgstr "الصفحة الرئيسية: %s"
@@ -8166,113 +8242,102 @@ msgstr ""
 "tracking - لم يطبق بعد.\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:162
+#: lib/common.php:36
 #, fuzzy
 msgid "No configuration file found."
 msgstr "لا رمز تأكيد."
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:165
+#: lib/common.php:39
 msgid "I looked for configuration files in the following places:"
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:168
+#: lib/common.php:42
 msgid "You may wish to run the installer to fix this."
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:172
+#: lib/common.php:46
 msgid "Go to the installer."
 msgstr "اذهب إلى المُثبّت."
 
-#. TRANS: Menu item for Instant Messaging settings.
-#: lib/connectsettingsaction.php:106
-#, fuzzy
-msgctxt "MENU"
-msgid "IM"
-msgstr "محادثة فورية"
-
-#. TRANS: Tooltip for Instant Messaging menu item.
-#: lib/connectsettingsaction.php:108
-msgid "Updates by instant messenger (IM)"
-msgstr ""
-
-#. TRANS: Menu item for Short Message Service settings.
-#: lib/connectsettingsaction.php:113
-#, fuzzy
-msgctxt "MENU"
-msgid "SMS"
-msgstr "رسائل قصيرة"
-
-#. TRANS: Tooltip for Short Message Service menu item.
-#: lib/connectsettingsaction.php:115
-msgid "Updates by SMS"
-msgstr "تحديثات عبر الرسائل القصيرة"
-
-#. TRANS: Menu item for OuAth connection settings.
-#: lib/connectsettingsaction.php:120
-#, fuzzy
-msgctxt "MENU"
-msgid "Connections"
-msgstr "اتصالات"
-
-#. TRANS: Tooltip for connected applications (Connections through OAuth) menu item.
-#: lib/connectsettingsaction.php:122
-#, fuzzy
-msgid "Authorized connected applications"
-msgstr "تطبيقات OAuth"
-
 #: lib/dberroraction.php:59
 msgid "Database error"
 msgstr "خطأ قاعدة بيانات"
 
+#. TRANS: Description of form for deleting a user.
+#: lib/deleteuserform.php:75
+msgid "Delete this user"
+msgstr "احذف هذا المستخدم"
+
+#: lib/designform.php:114
+#, fuzzy
+msgid "Change design"
+msgstr "احفظ التصميم"
+
+#. TRANS: Fieldset legend on profile design page to change profile page colours.
+#: lib/designform.php:131
+msgid "Change colours"
+msgstr "تغيير الألوان"
+
+#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
+#: lib/designform.php:138
+msgid "Use defaults"
+msgstr "استخدم المبدئيات"
+
+#. TRANS: Title for button on profile design page to reset all colour settings to default.
+#: lib/designform.php:140
+msgid "Restore default designs"
+msgstr "استعد التصميمات المبدئية"
+
+#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
+#: lib/designform.php:148
+msgid "Reset back to default"
+msgstr "ارجع إلى المبدئي"
+
 #. TRANS: Label in form on profile design page.
 #. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
-#: lib/designsettings.php:108
+#: lib/designform.php:158
 msgid "Upload file"
 msgstr "ارفع ملفًا"
 
 #. TRANS: Instructions for form on profile design page.
-#: lib/designsettings.php:113
+#: lib/designform.php:163
+#, fuzzy
 msgid ""
-"You can upload your personal background image. The maximum file size is 2MB."
+"You can upload your personal background image. The maximum file size is 2Mb."
 msgstr "تستطيع رفع صورتك الشخصية. أقصى حجم للملف هو 2 م.ب."
 
 #. TRANS: Radio button on profile design page that will enable use of the uploaded profile image.
-#: lib/designsettings.php:139
+#: lib/designform.php:194
 #, fuzzy
 msgctxt "RADIO"
 msgid "On"
 msgstr "مكّن"
 
 #. TRANS: Radio button on profile design page that will disable use of the uploaded profile image.
-#: lib/designsettings.php:156
+#: lib/designform.php:211
 #, fuzzy
 msgctxt "RADIO"
 msgid "Off"
 msgstr "عطّل"
 
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: lib/designsettings.php:175
-msgid "Change colours"
-msgstr "تغيير الألوان"
-
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: lib/designsettings.php:257
-msgid "Use defaults"
-msgstr "استخدم المبدئيات"
+#. TRANS: Title for button on profile design page to save settings.
+#: lib/designform.php:322
+msgid "Save design"
+msgstr "احفظ التصميم"
 
 #. TRANS: Error message displayed if design settings could not be saved.
 #. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
-#: lib/designsettings.php:405 lib/designsettings.php:427
+#: lib/designsettings.php:216 lib/designsettings.php:238
 msgid "Couldn't update your design."
 msgstr "تعذّر تحديث تصميمك."
 
 #. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
-#: lib/designsettings.php:433
+#: lib/designsettings.php:244
 msgid "Design defaults restored."
 msgstr "استعيدت مبدئيات التصميم."
 
@@ -8342,27 +8407,23 @@ msgstr ""
 msgid "Feeds"
 msgstr ""
 
-#: lib/galleryaction.php:121
-msgid "Filter tags"
-msgstr "رشّح الوسوم"
-
-#: lib/galleryaction.php:131
+#: lib/galleryaction.php:128
 msgid "All"
 msgstr "الكل"
 
-#: lib/galleryaction.php:139
+#: lib/galleryaction.php:136
 msgid "Select tag to filter"
 msgstr "اختر وسمًا لترشيحه"
 
-#: lib/galleryaction.php:140
+#: lib/galleryaction.php:137
 msgid "Tag"
 msgstr "الوسم"
 
-#: lib/galleryaction.php:141
+#: lib/galleryaction.php:138
 msgid "Choose a tag to narrow list"
 msgstr ""
 
-#: lib/galleryaction.php:143
+#: lib/galleryaction.php:140
 msgid "Go"
 msgstr "اذهب"
 
@@ -8458,6 +8519,12 @@ msgctxt "TOOLTIP"
 msgid "%s blocked users"
 msgstr ""
 
+#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
+#: lib/groupnav.php:117
+msgctxt "MENU"
+msgid "Admin"
+msgstr "إداري"
+
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
 #: lib/groupnav.php:120
@@ -8582,39 +8649,61 @@ msgstr[3] ""
 msgstr[4] ""
 msgstr[5] ""
 
-#: lib/jabber.php:387
+#: lib/implugin.php:262
 #, php-format
-msgid "[%s]"
-msgstr "[%s]"
+msgid ""
+"User \"%s\" on %s has said that your %s screenname belongs to them. If "
+"that's true, you can confirm by clicking on this URL: %s . (If you cannot "
+"click it, copy-and-paste it into the address bar of your browser). If that "
+"user isn't you, or if you didn't request this confirmation, just ignore this "
+"message."
+msgstr ""
 
-#: lib/jabber.php:567
+#: lib/implugin.php:349
 #, php-format
 msgid "Unknown inbox source %d."
 msgstr "مصدر صندوق وارد غير معروف %d."
 
+#: lib/implugin.php:485
+#, fuzzy, php-format
+msgid "Message too long - maximum is %1$d characters, you sent %2$d."
+msgstr "هذه طويلة جدًا. أطول حجم للإشعار %d  حرفًا."
+
 #: lib/leaveform.php:114
 msgid "Leave"
 msgstr "غادر"
 
+#. TRANS: Menu item for logging in to the StatusNet site.
+#: lib/logingroupnav.php:77
+msgctxt "MENU"
+msgid "Login"
+msgstr "لُج"
+
 #. TRANS: Title for menu item for logging in to the StatusNet site.
 #: lib/logingroupnav.php:79
 msgid "Login with a username and password"
 msgstr "لُج باسم مستخدم وكلمة سر"
 
+#. TRANS: Menu item for registering with the StatusNet site.
+#: lib/logingroupnav.php:85
+msgctxt "MENU"
+msgid "Register"
+msgstr "سجّل"
+
 #. TRANS: Title for menu item for registering with the StatusNet site.
 #: lib/logingroupnav.php:87
 msgid "Sign up for a new account"
 msgstr "سجّل حسابًا جديدًا"
 
 #. TRANS: Subject for address confirmation email.
-#: lib/mail.php:168
+#: lib/mail.php:172
 msgid "Email address confirmation"
 msgstr "تأكيد عنوان البريد الإلكتروني"
 
 #. TRANS: Body for address confirmation email.
 #. TRANS: %1$s is the addressed user's nickname, %2$s is the StatusNet sitename,
 #. TRANS: %3$s is the URL to confirm at.
-#: lib/mail.php:173
+#: lib/mail.php:177
 #, fuzzy, php-format
 msgid ""
 "Hey, %1$s.\n"
@@ -8645,14 +8734,14 @@ msgstr ""
 
 #. TRANS: Subject of new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
-#: lib/mail.php:238
+#: lib/mail.php:243
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1$s يستمع الآن إلى إشعاراتك على %2$s."
 
 #. TRANS: This is a paragraph in a new-subscriber e-mail.
 #. TRANS: %s is a URL where the subscriber can be reported as abusive.
-#: lib/mail.php:245
+#: lib/mail.php:250
 #, php-format
 msgid ""
 "If you believe this account is being used abusively, you can block them from "
@@ -8664,7 +8753,7 @@ msgstr ""
 #. TRANS: %3$s is the subscriber's profile URL, %4$s is the subscriber's location (or empty)
 #. TRANS: %5$s is the subscriber's homepage URL (or empty), %6%s is the subscriber's bio (or empty)
 #. TRANS: %7$s is a link to the addressed user's e-mail settings.
-#: lib/mail.php:255
+#: lib/mail.php:260
 #, fuzzy, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -8691,14 +8780,14 @@ msgstr ""
 
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is biographical information.
-#: lib/mail.php:278
+#: lib/mail.php:283
 #, php-format
 msgid "Bio: %s"
 msgstr "السيرة: %s"
 
 #. TRANS: Subject of notification mail for new posting email address.
 #. TRANS: %s is the StatusNet sitename.
-#: lib/mail.php:307
+#: lib/mail.php:312
 #, php-format
 msgid "New email address for posting to %s"
 msgstr "عنوان بريد إلكتروني جديد للإرسال إلى %s"
@@ -8706,7 +8795,7 @@ msgstr "عنوان بريد إلكتروني جديد للإرسال إلى %s"
 #. TRANS: Body of notification mail for new posting email address.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is the e-mail address to send
 #. TRANS: to to post by e-mail, %3$s is a URL to more instructions.
-#: lib/mail.php:313
+#: lib/mail.php:318
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -8721,26 +8810,26 @@ msgstr ""
 
 #. TRANS: Subject line for SMS-by-email notification messages.
 #. TRANS: %s is the posting user's nickname.
-#: lib/mail.php:434
+#: lib/mail.php:439
 #, php-format
 msgid "%s status"
 msgstr "حالة %s"
 
 #. TRANS: Subject line for SMS-by-email address confirmation message.
-#: lib/mail.php:460
+#: lib/mail.php:465
 msgid "SMS confirmation"
 msgstr "تأكيد الرسالة القصيرة"
 
 #. TRANS: Main body heading for SMS-by-email address confirmation message.
 #. TRANS: %s is the addressed user's nickname.
-#: lib/mail.php:464
+#: lib/mail.php:469
 #, php-format
 msgid "%s: confirm you own this phone number with this code:"
 msgstr ""
 
 #. TRANS: Subject for 'nudge' notification email.
 #. TRANS: %s is the nudging user.
-#: lib/mail.php:485
+#: lib/mail.php:490
 #, fuzzy, php-format
 msgid "You have been nudged by %s"
 msgstr "لقد نبهك %s"
@@ -8748,7 +8837,7 @@ msgstr "لقد نبهك %s"
 #. TRANS: Body for 'nudge' notification email.
 #. TRANS: %1$s is the nuding user's long name, $2$s is the nudging user's nickname,
 #. TRANS: %3$s is a URL to post notices at, %4$s is the StatusNet sitename.
-#: lib/mail.php:492
+#: lib/mail.php:497
 #, php-format
 msgid ""
 "%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -8766,7 +8855,7 @@ msgstr ""
 
 #. TRANS: Subject for direct-message notification email.
 #. TRANS: %s is the sending user's nickname.
-#: lib/mail.php:539
+#: lib/mail.php:544
 #, php-format
 msgid "New private message from %s"
 msgstr "رسالة خاصة جديدة من %s"
@@ -8775,7 +8864,7 @@ msgstr "رسالة خاصة جديدة من %s"
 #. TRANS: %1$s is the sending user's long name, %2$s is the sending user's nickname,
 #. TRANS: %3$s is the message content, %4$s a URL to the message,
 #. TRANS: %5$s is the StatusNet sitename.
-#: lib/mail.php:547
+#: lib/mail.php:552
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -8796,7 +8885,7 @@ msgstr ""
 
 #. TRANS: Subject for favorite notification e-mail.
 #. TRANS: %1$s is the adding user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:599
+#: lib/mail.php:604
 #, fuzzy, php-format
 msgid "%1$s (@%2$s) added your notice as a favorite"
 msgstr "لقد أضاف %s (@%s) إشعارك إلى مفضلاته"
@@ -8806,7 +8895,7 @@ msgstr "لقد أضاف %s (@%s) إشعارك إلى مفضلاته"
 #. TRANS: %3$s is a URL to the faved notice, %4$s is the faved notice text,
 #. TRANS: %5$s is a URL to all faves of the adding user, %6$s is the StatusNet sitename,
 #. TRANS: %7$s is the adding user's nickname.
-#: lib/mail.php:606
+#: lib/mail.php:611
 #, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -8828,7 +8917,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:664
+#: lib/mail.php:669
 #, php-format
 msgid ""
 "The full conversation can be read here:\n"
@@ -8838,7 +8927,7 @@ msgstr ""
 
 #. TRANS: E-mail subject for notice notification.
 #. TRANS: %1$s is the sending user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:672
+#: lib/mail.php:677
 #, fuzzy, php-format
 msgid "%1$s (@%2$s) sent a notice to your attention"
 msgstr "لقد أرسل %s (@%s) إشعارًا إليك"
@@ -8849,7 +8938,7 @@ msgstr "لقد أرسل %s (@%s) إشعارًا إليك"
 #. TRANS: %5$s is a URL to the full conversion if it exists (otherwise empty),
 #. TRANS: %6$s is a URL to reply to the notice, %7$s is a URL to all @-replied for the addressed user,
 #. TRANS: %8$s is a URL to the addressed user's e-mail settings, %9$s is the sender's nickname.
-#: lib/mail.php:680
+#: lib/mail.php:685
 #, php-format
 msgid ""
 "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -8969,11 +9058,7 @@ msgstr "غير مشترك!"
 msgid "To"
 msgstr "إلى"
 
-#: lib/messageform.php:166 lib/noticeform.php:186
-msgid "Available characters"
-msgstr "المحارف المتوفرة"
-
-#: lib/messageform.php:185 lib/noticeform.php:237
+#: lib/messageform.php:184 lib/noticeform.php:236
 msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr "أرسل"
@@ -8983,16 +9068,10 @@ msgstr "أرسل"
 msgid "Messages"
 msgstr "رسالة"
 
-#: lib/messagelistitem.php:123 lib/noticelist.php:522
+#: lib/messagelistitem.php:123 lib/noticelist.php:527
 msgid "from"
 msgstr "من"
 
-#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:165
-#, fuzzy
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr "1-64 حرفًا إنجليزيًا أو رقمًا بدون نقاط أو مسافات"
-
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 #: lib/nickname.php:178
 msgid "Nickname cannot be empty."
@@ -9019,78 +9098,82 @@ msgstr "أرسل إشعارًا"
 msgid "What's up, %s?"
 msgstr "ما الأخبار يا %s؟"
 
-#: lib/noticeform.php:194
+#: lib/noticeform.php:193
 msgid "Attach"
 msgstr "أرفق"
 
-#: lib/noticeform.php:198
+#: lib/noticeform.php:197
 msgid "Attach a file"
 msgstr "أرفق ملفًا"
 
-#: lib/noticeform.php:213
+#: lib/noticeform.php:212
 msgid "Share my location"
 msgstr "شارك موقعي"
 
-#: lib/noticeform.php:216
+#: lib/noticeform.php:215
 msgid "Do not share my location"
 msgstr "لا تشارك موقعي"
 
-#: lib/noticeform.php:217
+#: lib/noticeform.php:216
 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
 "try again later"
 msgstr ""
 
 #. TRANS: Used in coordinates as abbreviation of north
-#: lib/noticelist.php:452
+#: lib/noticelist.php:457
 msgid "N"
 msgstr "ش"
 
 #. TRANS: Used in coordinates as abbreviation of south
-#: lib/noticelist.php:454
+#: lib/noticelist.php:459
 msgid "S"
 msgstr "ج"
 
 #. TRANS: Used in coordinates as abbreviation of east
-#: lib/noticelist.php:456
+#: lib/noticelist.php:461
 msgid "E"
 msgstr "ر"
 
 #. TRANS: Used in coordinates as abbreviation of west
-#: lib/noticelist.php:458
+#: lib/noticelist.php:463
 msgid "W"
 msgstr "غ"
 
-#: lib/noticelist.php:460
+#: lib/noticelist.php:465
 #, php-format
 msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgstr ""
 
-#: lib/noticelist.php:469
+#: lib/noticelist.php:474
 msgid "at"
 msgstr "في"
 
-#: lib/noticelist.php:518
+#: lib/noticelist.php:523
 msgid "web"
 msgstr ""
 
-#: lib/noticelist.php:584
+#: lib/noticelist.php:589
 msgid "in context"
 msgstr "في السياق"
 
-#: lib/noticelist.php:619
+#: lib/noticelist.php:624
 msgid "Repeated by"
 msgstr "مكرر بواسطة"
 
-#: lib/noticelist.php:646
+#: lib/noticelist.php:651
 msgid "Reply to this notice"
 msgstr "رُد على هذا الإشعار"
 
-#: lib/noticelist.php:647
+#: lib/noticelist.php:652
 msgid "Reply"
 msgstr "رُد"
 
-#: lib/noticelist.php:691
+#: lib/noticelist.php:678
+msgid "Delete this notice"
+msgstr "احذف هذا الإشعار"
+
+#: lib/noticelist.php:696
 msgid "Notice repeated"
 msgstr "الإشعار مكرر"
 
@@ -9128,48 +9211,31 @@ msgstr ""
 msgid "Couldn't insert new subscription."
 msgstr "تعذّر إدراج اشتراك جديد."
 
-#. TRANS: Personal group navigation menu option when logged in for viewing @-replies.
-#: lib/personalgroupnav.php:107
+#: lib/personalgroupnav.php:104
 #, fuzzy
-msgctxt "MENU"
 msgid "Replies"
 msgstr "الردود"
 
-#. TRANS: Personal group navigation menu option when logged in for seeing own profile.
-#: lib/personalgroupnav.php:114
+#: lib/personalgroupnav.php:109
 #, fuzzy
-msgctxt "MENU"
-msgid "Profile"
-msgstr "الملف الشخصي"
-
-#. TRANS: Personal group navigation menu option when logged in for viewing own favourited notices.
-#: lib/personalgroupnav.php:120
-#, fuzzy
-msgctxt "MENU"
 msgid "Favorites"
 msgstr "المفضلات"
 
-#. TRANS: Personal group navigation menu option when logged in for viewing recieved personal messages.
-#: lib/personalgroupnav.php:133
+#: lib/personalgroupnav.php:120
 #, fuzzy
-msgctxt "MENU"
 msgid "Inbox"
 msgstr "صندوق الوارد"
 
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing recieved personal messages.
-#: lib/personalgroupnav.php:135
+#: lib/personalgroupnav.php:121
 msgid "Your incoming messages"
 msgstr "رسائلك الواردة"
 
-#. TRANS: Personal group navigation menu option when logged in for viewing senet personal messages.
-#: lib/personalgroupnav.php:140
+#: lib/personalgroupnav.php:125
 #, fuzzy
-msgctxt "MENU"
 msgid "Outbox"
 msgstr "صندوق الصادر"
 
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing senet personal messages.
-#: lib/personalgroupnav.php:142
+#: lib/personalgroupnav.php:126
 msgid "Your sent messages"
 msgstr "رسائلك المُرسلة"
 
@@ -9184,9 +9250,26 @@ msgstr "وسوم في إشعارات %s"
 msgid "Unknown"
 msgstr "غير معروفة"
 
+#. TRANS: Plugin admin panel controls
+#: lib/plugindisableform.php:90
+msgctxt "plugin"
+msgid "Disable"
+msgstr ""
+
+#. TRANS: Plugin admin panel controls
+#: lib/pluginenableform.php:112
+msgctxt "plugin"
+msgid "Enable"
+msgstr ""
+
+#: lib/pluginlist.php:196
+msgctxt "plugin-description"
+msgid "(Plugin descriptions unavailable when disabled.)"
+msgstr ""
+
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:82
+#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:88
 msgid "Subscriptions"
 msgstr "الاشتراكات"
 
@@ -9197,7 +9280,7 @@ msgstr "جميع الاشتراكات"
 
 #. TRANS: H2 text for user subscriber statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:90
+#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:96
 msgid "Subscribers"
 msgstr "المشتركون"
 
@@ -9219,7 +9302,7 @@ msgstr "عضو منذ"
 #. TRANS: Label for user statistics.
 #. TRANS: H2 text for user group membership statistics.
 #: lib/profileaction.php:239 lib/profileaction.php:290
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:104
 msgid "Groups"
 msgstr "مجموعات"
 
@@ -9239,10 +9322,6 @@ msgstr "كل المجموعات"
 msgid "Unimplemented method."
 msgstr ""
 
-#: lib/publicgroupnav.php:78
-msgid "Public"
-msgstr "عام"
-
 #: lib/publicgroupnav.php:82
 msgid "User groups"
 msgstr "مجموعات المستخدمين"
@@ -9281,7 +9360,7 @@ msgid "Revoke the \"%s\" role from this user"
 msgstr "امنع هذا المستخدم من هذه المجموعة"
 
 #. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:974
+#: lib/router.php:1001
 #, fuzzy
 msgid "Page not found."
 msgstr "لم يتم العثور على وسيلة API."
@@ -9311,11 +9390,6 @@ msgctxt "BUTTON"
 msgid "Search"
 msgstr ""
 
-#. TRANS: Definition list item with instructions on how to get (better) search results.
-#: lib/searchaction.php:170
-msgid "Search help"
-msgstr "ابحث في المساعدة"
-
 #: lib/searchgroupnav.php:80
 msgid "People"
 msgstr "أشخاص"
@@ -9340,6 +9414,52 @@ msgstr "قسم غير مُعنون"
 msgid "More..."
 msgstr "المزيد..."
 
+#: lib/settingsnav.php:78
+msgid "Change your profile settings"
+msgstr "غيّر إعدادات ملفك الشخصي"
+
+#: lib/settingsnav.php:83
+msgid "Upload an avatar"
+msgstr "ارفع أفتارًا"
+
+#: lib/settingsnav.php:88
+msgid "Change your password"
+msgstr "غير كلمة سرّك"
+
+#: lib/settingsnav.php:93
+msgid "Change email handling"
+msgstr "غير أسلوب التعامل مع البريد الإلكتروني"
+
+#: lib/settingsnav.php:98
+msgid "Design your profile"
+msgstr "صمّم ملفك الشخصي"
+
+#: lib/settingsnav.php:102
+msgid "URL"
+msgstr "مسار"
+
+#: lib/settingsnav.php:103
+msgid "URL shorteners"
+msgstr ""
+
+#: lib/settingsnav.php:111
+msgid "Updates by instant messenger (IM)"
+msgstr ""
+
+#: lib/settingsnav.php:118
+msgid "Updates by SMS"
+msgstr "تحديثات عبر الرسائل القصيرة"
+
+#: lib/settingsnav.php:123
+#, fuzzy
+msgid "Connections"
+msgstr "اتصالات"
+
+#: lib/settingsnav.php:124
+#, fuzzy
+msgid "Authorized connected applications"
+msgstr "تطبيقات OAuth"
+
 #: lib/silenceform.php:67
 msgid "Silence"
 msgstr "أسكت"
@@ -9348,30 +9468,34 @@ msgstr "أسكت"
 msgid "Silence this user"
 msgstr "أسكت هذا المستخدم"
 
-#: lib/subgroupnav.php:83
+#: lib/subgroupnav.php:89
 #, php-format
 msgid "People %s subscribes to"
 msgstr "الأشخاص الذين اشترك بهم %s"
 
-#: lib/subgroupnav.php:91
+#: lib/subgroupnav.php:97
 #, php-format
 msgid "People subscribed to %s"
 msgstr "الأشخاص المشتركون ب%s"
 
-#: lib/subgroupnav.php:99
+#: lib/subgroupnav.php:105
 #, php-format
 msgid "Groups %s is a member of"
 msgstr "المجموعات التي %s عضو فيها"
 
-#: lib/subgroupnav.php:105
+#: lib/subgroupnav.php:111
 msgid "Invite"
 msgstr "ادعُ"
 
-#: lib/subgroupnav.php:106
+#: lib/subgroupnav.php:112
 #, fuzzy, php-format
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "ادعُ أصدقائك وزملائك للانضمام إليك في %s"
 
+#: lib/subscribeform.php:115 lib/subscribeform.php:139
+msgid "Subscribe to this user"
+msgstr "اشترك بهذا المستخدم"
+
 #: lib/subscriberspeopleselftagcloudsection.php:48
 #: lib/subscriptionspeopleselftagcloudsection.php:48
 msgid "People Tagcloud as self-tagged"
@@ -9446,6 +9570,17 @@ msgstr ""
 msgid "Error opening theme archive."
 msgstr "خطأ أثناء تحديث الملف الشخصي البعيد."
 
+#: lib/threadednoticelist.php:270
+#, php-format
+msgid "Show all %d comment"
+msgid_plural "Show all %d comments"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+msgstr[5] ""
+
 #: lib/topposterssection.php:74
 msgid "Top posters"
 msgstr "أعلى المرسلين"
@@ -9489,76 +9624,80 @@ msgstr "ألغِ الاشتراك"
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "ليس للمستخدم ملف شخصي."
 
-#. TRANS: Link text for changeing the avatar of the logged in user.
-#: lib/userprofile.php:121
+#: lib/userprofile.php:116
 msgid "Edit Avatar"
 msgstr "عدّل الأفتار"
 
 #. TRANS: H2 for user actions in a profile.
 #. TRANS: H2 for entity actions in a profile.
-#: lib/userprofile.php:245 lib/userprofile.php:261
+#: lib/userprofile.php:216 lib/userprofile.php:232
 msgid "User actions"
 msgstr "تصرفات المستخدم"
 
 #. TRANS: Text shown in user profile of not yet compeltely deleted users.
-#: lib/userprofile.php:249
+#: lib/userprofile.php:220
 msgid "User deletion in progress..."
 msgstr "حذف المستخدم قيد التنفيذ..."
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:277
+#: lib/userprofile.php:248
 msgid "Edit profile settings"
 msgstr "عدّل إعدادات الملف الشخصي"
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:279
+#: lib/userprofile.php:250
 msgid "Edit"
 msgstr "عدّل"
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:303
+#: lib/userprofile.php:274
 msgid "Send a direct message to this user"
 msgstr "أرسل رسالة مباشرة إلى هذا المستخدم"
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:305
+#: lib/userprofile.php:276
 msgid "Message"
 msgstr "رسالة"
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:347
+#: lib/userprofile.php:318
 msgid "Moderate"
 msgstr "راقب"
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:386
+#: lib/userprofile.php:357
 msgid "User role"
 msgstr "دور المستخدم"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:389
+#: lib/userprofile.php:360
 msgctxt "role"
 msgid "Administrator"
 msgstr "إداري"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:391
+#: lib/userprofile.php:362
 msgctxt "role"
 msgid "Moderator"
 msgstr "مراقب"
 
+#: lib/util.php:321
+#, fuzzy
+msgid "Not allowed to log in."
+msgstr "لست والجًا."
+
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1306
+#: lib/util.php:1337
 msgid "a few seconds ago"
 msgstr "قبل لحظات قليلة"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1309
+#: lib/util.php:1340
 msgid "about a minute ago"
 msgstr "قبل دقيقة تقريبًا"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1313
+#: lib/util.php:1344
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
@@ -9570,12 +9709,12 @@ msgstr[4] ""
 msgstr[5] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1316
+#: lib/util.php:1347
 msgid "about an hour ago"
 msgstr "قبل ساعة تقريبًا"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1320
+#: lib/util.php:1351
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
@@ -9587,12 +9726,12 @@ msgstr[4] ""
 msgstr[5] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1323
+#: lib/util.php:1354
 msgid "about a day ago"
 msgstr "قبل يوم تقريبا"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1327
+#: lib/util.php:1358
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
@@ -9604,12 +9743,12 @@ msgstr[4] ""
 msgstr[5] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1330
+#: lib/util.php:1361
 msgid "about a month ago"
 msgstr "قبل شهر تقريبًا"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1334
+#: lib/util.php:1365
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
@@ -9621,7 +9760,7 @@ msgstr[4] ""
 msgstr[5] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1337
+#: lib/util.php:1368
 msgid "about a year ago"
 msgstr "قبل سنة تقريبًا"
 
@@ -9632,25 +9771,6 @@ msgstr "قبل سنة تقريبًا"
 msgid "%s is not a valid color! Use 3 or 6 hex characters."
 msgstr "%s ليس لونًا صحيحًا!"
 
-#. TRANS: %s is the URL to the StatusNet site's Instant Messaging settings.
-#: lib/xmppmanager.php:287
-#, php-format
-msgid "Unknown user. Go to %s to add your address to your account"
-msgstr ""
-
-#. TRANS: Response to XMPP source when it sent too long a message.
-#. TRANS: %1$d the maximum number of allowed characters (used for plural), %2$d is the sent number.
-#: lib/xmppmanager.php:406
-#, fuzzy, php-format
-msgid "Message too long. Maximum is %1$d character, you sent %2$d."
-msgid_plural "Message too long. Maximum is %1$d characters, you sent %2$d."
-msgstr[0] "هذه طويلة جدًا. أطول حجم للإشعار %d  حرفًا."
-msgstr[1] "هذه طويلة جدًا. أطول حجم للإشعار %d  حرفًا."
-msgstr[2] "هذه طويلة جدًا. أطول حجم للإشعار %d  حرفًا."
-msgstr[3] "هذه طويلة جدًا. أطول حجم للإشعار %d  حرفًا."
-msgstr[4] "هذه طويلة جدًا. أطول حجم للإشعار %d  حرفًا."
-msgstr[5] "هذه طويلة جدًا. أطول حجم للإشعار %d  حرفًا."
-
 #. TRANS: Exception.
 #: lib/xrd.php:63
 #, fuzzy
@@ -9669,62 +9789,164 @@ msgid "Getting backup from file '%s'."
 msgstr ""
 
 #, fuzzy
-#~ msgid "Block this user."
-#~ msgstr "امنع هذا المستخدم"
+#~ msgid "Could not generate feed for group - %s"
+#~ msgstr "تعذر تحديث المجموعة."
 
 #, fuzzy
-#~ msgid "Delete this notice."
-#~ msgstr "احذف هذا الإشعار"
+#~ msgid "Current confirmed Jabber/Google Talk address."
+#~ msgstr "عنوان جابر أو محادثة غوغل المعتمد حاليًا."
 
 #, fuzzy
-#~ msgid "Delete this user."
-#~ msgstr "احذف هذا المستخدم"
+#~ msgid "Send me notices through Jabber/Google Talk."
+#~ msgstr "أرسل لي إشعارات بالاشتراكات الجديدة عبر البريد الإلكتروني."
 
 #, fuzzy
-#~ msgid "Restore default designs."
-#~ msgstr "استعد التصميمات المبدئية"
+#~ msgid "Publish a MicroID for my Jabber/Google Talk address."
+#~ msgstr "انشر هوية مصغّرة لعنوان بريدي الإلكتروني."
+
+#~ msgid "No Jabber ID."
+#~ msgstr "لا هوية جابر."
 
 #, fuzzy
-#~ msgid "Reset back to default."
-#~ msgstr "ارجع إلى المبدئي"
+#~ msgid "Not a valid Jabber ID."
+#~ msgstr "ليست هوية جابر صالحة"
 
 #, fuzzy
-#~ msgid "Save design."
-#~ msgstr "احفظ التصميم"
+#~ msgid "That is already your Jabber ID."
+#~ msgstr "هذه ليست هويتك في جابر."
+
+#~ msgid "That is not your Jabber ID."
+#~ msgstr "هذه ليست هويتك في جابر."
+
+#~ msgid "Other settings"
+#~ msgstr "إعدادات أخرى"
+
+#~ msgid "Tag cloud"
+#~ msgstr "سحابة الوسوم"
+
+#~ msgid "Authorize URL"
+#~ msgstr "اسمح بالمسار"
+
+#~ msgid "Jabber"
+#~ msgstr "جابر"
+
+#~ msgid "Photo"
+#~ msgstr "صورة"
+
+#~ msgid "Other options"
+#~ msgstr "خيارات أخرى"
+
+#~ msgid "Other"
+#~ msgstr "أخرى"
 
 #, fuzzy
-#~ msgid "Disfavor favorite."
-#~ msgstr "ألغِ تفضيل المفضلة"
+#~ msgid "Primary site navigation"
+#~ msgstr "ضبط الموقع الأساسي"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Personal profile and friends timeline"
+#~ msgstr "الملف الشخصي ومسار الأصدقاء الزمني"
+
+#~ msgctxt "MENU"
+#~ msgid "Personal"
+#~ msgstr "الصفحة الشخصية"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Change your email, avatar, password, profile"
+#~ msgstr "غير بريدك الإلكتروني وكلمة سرّك وأفتارك وملفك الشخصي"
+
+#~ msgid "Account"
+#~ msgstr "الحساب"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Connect to services"
+#~ msgstr "اتصل بالخدمات"
+
+#~ msgid "Connect"
+#~ msgstr "اتصل"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Change site configuration"
+#~ msgstr "غيّر ضبط الموقع"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Invite friends and colleagues to join you on %s"
+#~ msgstr "ادعُ أصدقائك وزملائك للانضمام إليك في %s"
+
+#~ msgctxt "MENU"
+#~ msgid "Invite"
+#~ msgstr "ادعُ"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Create an account"
+#~ msgstr "أنشئ حسابًا"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Help me!"
+#~ msgstr "ساعدني!"
+
+#~ msgctxt "MENU"
+#~ msgid "Help"
+#~ msgstr "مساعدة"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Search for people or text"
+#~ msgstr "ابحث عن أشخاص أو نصوص"
+
+#~ msgid "Local views"
+#~ msgstr "المشاهدات المحلية"
+
+#~ msgid "Page notice"
+#~ msgstr "إشعار الصفحة"
 
 #, fuzzy
-#~ msgid "\"%s\" not found."
-#~ msgstr "لم يُعثرعلى المستخدم."
+#~ msgid "Secondary site navigation"
+#~ msgstr "ضبط الموقع الأساسي"
+
+#~ msgid "StatusNet software license"
+#~ msgstr "رخصة برنامج StatusNet"
+
+#~ msgid "Site content license"
+#~ msgstr "رخصة محتوى الموقع"
 
 #, fuzzy
-#~ msgid "Notice %s not found."
-#~ msgstr "لم يتم العثور على وسيلة API."
+#~ msgid "Pagination"
+#~ msgstr "تسجيل"
+
+#~ msgid "Author"
+#~ msgstr "المؤلف"
+
+#~ msgid "Provider"
+#~ msgstr "المزود"
 
 #, fuzzy
-#~ msgid "Attachment %s not found."
-#~ msgstr "لم يُعثر على المستخدم المستلم."
+#~ msgctxt "MENU"
+#~ msgid "SMS"
+#~ msgstr "رسائل قصيرة"
+
+#~ msgid "Filter tags"
+#~ msgstr "رشّح الوسوم"
+
+#~ msgid "[%s]"
+#~ msgstr "[%s]"
+
+#~ msgid "Available characters"
+#~ msgstr "المحارف المتوفرة"
 
 #, fuzzy
-#~ msgid "Invalid tag: \"%s\"."
-#~ msgstr "وسم غير صالح: \"%s\""
+#~ msgctxt "MENU"
+#~ msgid "Profile"
+#~ msgstr "الملف الشخصي"
+
+#~ msgid "Search help"
+#~ msgstr "ابحث في المساعدة"
 
 #, fuzzy
-#~ msgid "Password saved"
-#~ msgstr "حُفظت كلمة السر."
-
-#, fuzzy
-#~ msgid "Where you are, like \"City, State (or Region), Country\"."
-#~ msgstr ""
-#~ "مكان تواجدك، على سبيل المثال \"المدينة، الولاية (أو المنطقة)، الدولة\""
-
-#, fuzzy
-#~ msgid "Subscribe to this user."
-#~ msgstr "اشترك بهذا المستخدم"
-
-#, fuzzy
-#~ msgid "Not allowed to log in."
-#~ msgstr "لست والجًا."
+#~ msgid "Message too long. Maximum is %1$d character, you sent %2$d."
+#~ msgid_plural "Message too long. Maximum is %1$d characters, you sent %2$d."
+#~ msgstr[0] "هذه طويلة جدًا. أطول حجم للإشعار %d  حرفًا."
+#~ msgstr[1] "هذه طويلة جدًا. أطول حجم للإشعار %d  حرفًا."
+#~ msgstr[2] "هذه طويلة جدًا. أطول حجم للإشعار %d  حرفًا."
+#~ msgstr[3] "هذه طويلة جدًا. أطول حجم للإشعار %d  حرفًا."
+#~ msgstr[4] "هذه طويلة جدًا. أطول حجم للإشعار %d  حرفًا."
+#~ msgstr[5] "هذه طويلة جدًا. أطول حجم للإشعار %d  حرفًا."
diff --git a/locale/arz/LC_MESSAGES/statusnet.po b/locale/arz/LC_MESSAGES/statusnet.po
index a56cbf60e3..46668d5b4d 100644
--- a/locale/arz/LC_MESSAGES/statusnet.po
+++ b/locale/arz/LC_MESSAGES/statusnet.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 15:58+0000\n"
-"PO-Revision-Date: 2011-03-03 16:00:10+0000\n"
+"POT-Creation-Date: 2011-03-03 17:23+0000\n"
+"PO-Revision-Date: 2011-03-03 17:25:40+0000\n"
 "Language-Team: Egyptian Spoken Arabic <http://translatewiki.net/wiki/Portal:"
 "arz>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -83,23 +83,23 @@ msgstr "اذف إعدادت الموقع"
 #. TRANS: Tooltip for button to save access settings in site admin panel.
 #. TRANS: Button text for saving theme settings.
 #. TRANS: Button label to save e-mail preferences.
-#. TRANS: Button label to save Instant Messaging preferences.
-#. TRANS: Button text for saving "Other settings" in profile.
+#. TRANS: Button label to save IM preferences.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
 #. TRANS: Button text for saving site notice in admin panel.
 #. TRANS: Button label to save SMS preferences.
 #. TRANS: Save button for settings for a profile in a subscriptions list.
+#. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
 #. TRANS: Button text on profile design page to save settings.
 #: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
-#: actions/emailsettings.php:250 actions/imsettings.php:183
-#: actions/othersettings.php:136 actions/pathsadminpanel.php:512
-#: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
-#: actions/smssettings.php:205 actions/subscriptions.php:259
+#: actions/emailsettings.php:251 actions/imsettings.php:199
+#: actions/pathsadminpanel.php:512 actions/profilesettings.php:198
+#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:204
+#: actions/subscriptions.php:261 actions/urlsettings.php:152
 #: actions/useradminpanel.php:298 lib/applicationeditform.php:355
-#: lib/designsettings.php:270 lib/groupeditform.php:201
+#: lib/designform.php:320 lib/groupeditform.php:201
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Save"
@@ -139,7 +139,11 @@ msgstr "لا وسم كهذا."
 #. 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 use "one time password login" without using an existing user.
+#. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
+#. TRANS: Client error displayed trying to find a user by ID for a non-existing ID.
+#. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when calling a profile action without specifying a user.
 #: actions/all.php:80 actions/allrss.php:69
@@ -151,19 +155,19 @@ msgstr "لا وسم كهذا."
 #: actions/apidirectmessage.php:75 actions/apidirectmessagenew.php:72
 #: actions/apigroupcreate.php:111 actions/apigroupismember.php:89
 #: actions/apigroupjoin.php:98 actions/apigroupleave.php:98
-#: actions/apigrouplist.php:70 actions/apistatusesupdate.php:230
-#: actions/apisubscriptions.php:85 actions/apitimelinefavorites.php:70
-#: actions/apitimelinefriends.php:173 actions/apitimelinehome.php:78
-#: actions/apitimelinementions.php:77 actions/apitimelineuser.php:79
-#: actions/avatarbynickname.php:79 actions/favoritesrss.php:72
-#: actions/foaf.php:42 actions/foaf.php:61 actions/hcard.php:67
-#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
-#: actions/remotesubscribe.php:144 actions/remotesubscribe.php:153
-#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
-#: actions/showfavorites.php:106 actions/userbyid.php:74
-#: actions/usergroups.php:93 actions/userrss.php:40 actions/userxrd.php:59
-#: actions/xrds.php:71 lib/command.php:509 lib/galleryaction.php:59
-#: lib/mailbox.php:80 lib/profileaction.php:77
+#: actions/apigrouplist.php:70 actions/apigroupprofileupdate.php:108
+#: actions/apistatusesupdate.php:230 actions/apisubscriptions.php:85
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:173
+#: actions/apitimelinehome.php:78 actions/apitimelinementions.php:77
+#: actions/apitimelineuser.php:79 actions/avatarbynickname.php:79
+#: actions/favoritesrss.php:72 actions/foaf.php:42 actions/foaf.php:61
+#: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116
+#: actions/otp.php:78 actions/remotesubscribe.php:144
+#: actions/remotesubscribe.php:153 actions/replies.php:73
+#: actions/repliesrss.php:38 actions/rsd.php:113 actions/showfavorites.php:106
+#: actions/userbyid.php:75 actions/usergroups.php:93 actions/userrss.php:40
+#: actions/userxrd.php:59 actions/xrds.php:71 lib/command.php:509
+#: lib/galleryaction.php:59 lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "لا مستخدم كهذا."
 
@@ -177,10 +181,9 @@ msgstr "%1$s و الصحاب, صفحه %2$d"
 #. TRANS: H1 text for page. %s is a user nickname.
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Timeline title for user and friends. %s is a user nickname.
-#. TRANS: Tooltop for personal group navigation menu option when logged in for viewing timeline of self and friends.
 #: actions/all.php:94 actions/all.php:191 actions/allrss.php:117
 #: actions/apitimelinefriends.php:207 actions/apitimelinehome.php:113
-#: lib/personalgroupnav.php:102
+#: lib/personalgroupnav.php:100
 #, php-format
 msgid "%s and friends"
 msgstr "%s والأصدقاء"
@@ -232,7 +235,7 @@ msgstr ""
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
 #. TRANS: Second sentence of empty message for anonymous users. %s is a user nickname.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:227
+#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:221
 #, fuzzy, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -281,19 +284,20 @@ msgstr "%1$s و الصحاب, صفحه %2$d"
 #: actions/apifavoritecreate.php:98 actions/apifavoritedestroy.php:98
 #: actions/apifriendshipscreate.php:99 actions/apifriendshipsdestroy.php:99
 #: actions/apifriendshipsshow.php:124 actions/apigroupcreate.php:138
-#: actions/apigroupismember.php:115 actions/apigroupjoin.php:160
-#: actions/apigroupleave.php:145 actions/apigrouplist.php:134
+#: actions/apigroupismember.php:115 actions/apigroupjoin.php:151
+#: actions/apigroupleave.php:141 actions/apigrouplist.php:134
 #: actions/apigrouplistall.php:120 actions/apigroupmembership.php:105
+#: actions/apigroupprofileupdate.php:100 actions/apigroupprofileupdate.php:213
 #: actions/apigroupshow.php:114 actions/apihelptest.php:84
 #: actions/apistatusesdestroy.php:101 actions/apistatusesretweets.php:110
 #: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:139
 #: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
-#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:268
-#: actions/apitimelinegroup.php:147 actions/apitimelinehome.php:173
-#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:239
-#: actions/apitimelineretweetedtome.php:118
-#: actions/apitimelineretweetsofme.php:150 actions/apitimelinetag.php:159
-#: actions/apitimelineuser.php:206 actions/apiusershow.php:100
+#: actions/apitimelinefavorites.php:182 actions/apitimelinefriends.php:276
+#: actions/apitimelinegroup.php:148 actions/apitimelinehome.php:181
+#: actions/apitimelinementions.php:182 actions/apitimelinepublic.php:247
+#: actions/apitimelineretweetedtome.php:147
+#: actions/apitimelineretweetsofme.php:147 actions/apitimelinetag.php:165
+#: actions/apitimelineuser.php:217 actions/apiusershow.php:100
 msgid "API method not found."
 msgstr "الـ API method مش موجوده."
 
@@ -308,8 +312,9 @@ msgstr "الـ API method مش موجوده."
 #: actions/apifavoritecreate.php:88 actions/apifavoritedestroy.php:88
 #: actions/apifriendshipscreate.php:89 actions/apifriendshipsdestroy.php:89
 #: actions/apigroupcreate.php:102 actions/apigroupjoin.php:89
-#: actions/apigroupleave.php:89 actions/apimediaupload.php:66
-#: actions/apistatusesretweet.php:63 actions/apistatusesupdate.php:194
+#: actions/apigroupleave.php:89 actions/apigroupprofileupdate.php:92
+#: actions/apimediaupload.php:66 actions/apistatusesretweet.php:63
+#: actions/apistatusesupdate.php:194
 msgid "This method requires a POST."
 msgstr "تتطلب هذه الطريقه POST."
 
@@ -321,21 +326,16 @@ msgid ""
 msgstr ""
 
 #. TRANS: Server error displayed when a user's delivery device cannot be updated.
-#. TRANS: Server error displayed when a user update to the database fails in the contact address confirmation action.
 #. TRANS: Server error thrown on database error updating e-mail preferences.
 #. TRANS: Server error thrown on database error removing a registered e-mail address.
-#. TRANS: Server error thrown on database error updating Instant Messaging preferences.
-#. TRANS: Server error thrown on database error removing a registered Instant Messaging address.
-#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
 #. TRANS: Server error thrown when user profile settings could not be updated.
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
-#: actions/apiaccountupdatedeliverydevice.php:130
-#: actions/confirmaddress.php:118 actions/emailsettings.php:352
-#: actions/emailsettings.php:498 actions/imsettings.php:276
-#: actions/imsettings.php:432 actions/othersettings.php:186
-#: actions/profilesettings.php:322 actions/smssettings.php:301
-#: actions/smssettings.php:454
+#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
+#: actions/apiaccountupdatedeliverydevice.php:136
+#: actions/emailsettings.php:353 actions/emailsettings.php:499
+#: actions/profilesettings.php:323 actions/smssettings.php:300
+#: actions/smssettings.php:453 actions/urlsettings.php:211
 msgid "Could not update user."
 msgstr "تعذّر تحديث المستخدم."
 
@@ -361,7 +361,7 @@ msgstr "ليس للمستخدم ملف شخصى."
 
 #. TRANS: Server error displayed if a user profile could not be saved.
 #. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:418
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:419
 msgid "Could not save profile."
 msgstr "لم يمكن حفظ الملف."
 
@@ -373,7 +373,7 @@ msgstr "لم يمكن حفظ الملف."
 #: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
 #: actions/designadminpanel.php:120 actions/editapplication.php:121
 #: actions/newapplication.php:102 actions/newnotice.php:95
-#: lib/designsettings.php:298
+#: lib/designsettings.php:110
 #, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s byte) due to its "
@@ -398,8 +398,8 @@ msgstr[5] ""
 #: actions/apiaccountupdateprofilecolors.php:160
 #: actions/apiaccountupdateprofilecolors.php:171
 #: actions/groupdesignsettings.php:285 actions/groupdesignsettings.php:296
-#: actions/userdesignsettings.php:201 actions/userdesignsettings.php:211
-#: actions/userdesignsettings.php:253 actions/userdesignsettings.php:263
+#: actions/userdesignsettings.php:218 actions/userdesignsettings.php:228
+#: actions/userdesignsettings.php:270 actions/userdesignsettings.php:280
 #, fuzzy
 msgid "Unable to save your design settings."
 msgstr "تعذّر حذف إعدادات التصميم."
@@ -408,7 +408,7 @@ msgstr "تعذّر حذف إعدادات التصميم."
 #. TRANS: Client error displayed when a database error occurs updating profile colours.
 #: actions/apiaccountupdateprofilebackgroundimage.php:191
 #: actions/apiaccountupdateprofilecolors.php:139
-#: actions/userdesignsettings.php:179
+#: actions/userdesignsettings.php:196
 msgid "Could not update your design."
 msgstr "تعذّر تحديث تصميمك."
 
@@ -520,7 +520,7 @@ msgstr "لم يُعثر على المستخدم المستلم."
 
 #. TRANS: Client error displayed trying to direct message another user who's not a friend (403).
 #: actions/apidirectmessagenew.php:144
-msgid "Can't send direct messages to users who aren't your friend."
+msgid "Cannot send direct messages to users who aren't your friend."
 msgstr ""
 
 #. TRANS: Client error displayed trying to direct message self (403).
@@ -605,9 +605,9 @@ msgstr "تعذّر إيجاد المستخدم الهدف."
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:156 actions/editgroup.php:191
-#: actions/newgroup.php:137 actions/profilesettings.php:273
-#: actions/register.php:214
+#: actions/apigroupcreate.php:156 actions/apigroupprofileupdate.php:255
+#: actions/editgroup.php:191 actions/newgroup.php:137
+#: actions/profilesettings.php:274 actions/register.php:199
 msgid "Nickname already in use. Try another one."
 msgstr ""
 
@@ -615,9 +615,9 @@ msgstr ""
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:164 actions/editgroup.php:195
-#: actions/newgroup.php:141 actions/profilesettings.php:243
-#: actions/register.php:216
+#: actions/apigroupcreate.php:164 actions/apigroupprofileupdate.php:259
+#: actions/editgroup.php:195 actions/newgroup.php:141
+#: actions/profilesettings.php:244 actions/register.php:201
 msgid "Not a valid nickname."
 msgstr "ليس اسمًا مستعارًا صحيحًا."
 
@@ -627,10 +627,10 @@ msgstr "ليس اسمًا مستعارًا صحيحًا."
 #. TRANS: Validation error shown when providing an invalid homepage URL in the "New application" form.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:181 actions/editapplication.php:235
-#: actions/editgroup.php:202 actions/newapplication.php:221
-#: actions/newgroup.php:148 actions/profilesettings.php:248
-#: actions/register.php:223
+#: actions/apigroupcreate.php:181 actions/apigroupprofileupdate.php:277
+#: actions/editapplication.php:235 actions/editgroup.php:202
+#: actions/newapplication.php:221 actions/newgroup.php:148
+#: actions/profilesettings.php:249 actions/register.php:208
 msgid "Homepage is not a valid URL."
 msgstr "الصفحه الرئيسيه ليست عنونًا صالحًا."
 
@@ -639,8 +639,8 @@ msgstr "الصفحه الرئيسيه ليست عنونًا صالحًا."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:191 actions/editgroup.php:206
-#: actions/newgroup.php:152 actions/profilesettings.php:252
-#: actions/register.php:226
+#: actions/newgroup.php:152 actions/profilesettings.php:253
+#: actions/register.php:211
 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "الاسم الكامل طويل جدا (الأقصى 255 حرفًا)"
@@ -672,8 +672,8 @@ msgstr[5] "المنظمه طويله جدا (اكتر حاجه %d رمز)."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:215 actions/editgroup.php:218
-#: actions/newgroup.php:164 actions/profilesettings.php:265
-#: actions/register.php:235
+#: actions/newgroup.php:164 actions/profilesettings.php:266
+#: actions/register.php:220
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
 msgstr "المنظمه طويله جدا (اكتر حاجه 255 رمز)."
@@ -707,15 +707,16 @@ msgstr "كنيه غير صالحة: \"%s\""
 #. TRANS: %s is the alias that is already in use.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error. %s is the already used alias.
-#: actions/apigroupcreate.php:264 actions/editgroup.php:246
-#: actions/newgroup.php:193
+#: actions/apigroupcreate.php:264 actions/apigroupprofileupdate.php:351
+#: actions/editgroup.php:246 actions/newgroup.php:193
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to use an alias during group creation that is the same as the group's nickname.
 #. TRANS: Group edit form validation error.
-#: actions/apigroupcreate.php:278 actions/editgroup.php:253
+#: actions/apigroupcreate.php:278 actions/apigroupprofileupdate.php:359
+#: actions/editgroup.php:253
 msgid "Alias can't be the same as nickname."
 msgstr ""
 
@@ -727,7 +728,8 @@ msgstr ""
 #. TRANS: Client error displayed requesting most recent notices to a group for a non-existing group.
 #: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
 #: actions/apigroupleave.php:104 actions/apigroupmembership.php:71
-#: actions/apigroupshow.php:81 actions/apitimelinegroup.php:89
+#: actions/apigroupprofileupdate.php:113 actions/apigroupshow.php:81
+#: actions/apitimelinegroup.php:89
 msgid "Group not found."
 msgstr "لم يوجد."
 
@@ -747,13 +749,11 @@ msgstr "انت اصلا عضو فى الجروپ ده"
 msgid "You have been blocked from that group by the admin."
 msgstr "لم تمنع هذا المستخدم."
 
-#. TRANS: Server error displayed when joining a group fails.
-#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
 #. 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.
 #. TRANS: Message given having failed to add a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:362
+#: actions/apigroupjoin.php:136 actions/joingroup.php:139 lib/command.php:362
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "ما نفعش يضم %1$s للجروپ %2$s."
@@ -764,8 +764,6 @@ msgstr "ما نفعش يضم %1$s للجروپ %2$s."
 msgid "You are not a member of this group."
 msgstr "لست عضوا فى تلك المجموعه."
 
-#. TRANS: Server error displayed when leaving a group fails.
-#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
 #. TRANS: Server error displayed when leaving a group failed in the database.
 #. TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
 #. TRANS: Message given having failed to remove a user from a group.
@@ -801,6 +799,61 @@ msgstr "مجموعات %s"
 msgid "groups on %s"
 msgstr "مجموعات %s"
 
+#. TRANS: Client error displayed trying to edit a group while not being a group admin.
+#. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
+#. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
+#: actions/apigroupprofileupdate.php:118 actions/editgroup.php:110
+#: actions/editgroup.php:176 actions/groupdesignsettings.php:109
+#: actions/grouplogo.php:111
+msgid "You must be an admin to edit the group."
+msgstr "لازم تكون ادارى علشان تعدّل الجروپ."
+
+#. TRANS: Server error displayed when editing a group fails.
+#: actions/apigroupprofileupdate.php:171 actions/editgroup.php:274
+msgid "Could not update group."
+msgstr "تعذر تحديث المجموعه."
+
+#. TRANS: Server error displayed when group aliases could not be added.
+#. TRANS: Server exception thrown when creating group aliases failed.
+#: actions/apigroupprofileupdate.php:194 actions/editgroup.php:281
+#: classes/User_group.php:540
+msgid "Could not create aliases."
+msgstr "تعذّر إنشاء الكنى."
+
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: actions/apigroupprofileupdate.php:249 lib/nickname.php:165
+msgid "Nickname must have only lowercase letters and numbers and no spaces."
+msgstr ""
+
+#: actions/apigroupprofileupdate.php:286
+#, fuzzy
+msgid "Full name is too long (max 255 chars)."
+msgstr "الاسم الكامل طويل جدا (الأقصى 255 حرفًا)"
+
+#: actions/apigroupprofileupdate.php:296
+#, fuzzy, php-format
+msgid "description is too long (max %d chars)."
+msgstr "المنظمه طويله جدا (اكتر حاجه %d رمز)."
+
+#: actions/apigroupprofileupdate.php:307
+#, fuzzy
+msgid "Location is too long (max 255 chars)."
+msgstr "المنظمه طويله جدا (اكتر حاجه 255 رمز)."
+
+#: actions/apigroupprofileupdate.php:326
+#, php-format
+msgid "Too many aliases! Maximum %d."
+msgstr ""
+
+#. TRANS: Group edit form validation error.
+#. TRANS: Group create form validation error.
+#. TRANS: %s is the invalid alias.
+#: actions/apigroupprofileupdate.php:342 actions/editgroup.php:241
+#: actions/newgroup.php:188
+#, php-format
+msgid "Invalid alias: \"%s\""
+msgstr "كنيه غير صالحة: \"%s\""
+
 #. TRANS: Client error displayed when uploading a media file has failed.
 #: actions/apimediaupload.php:101
 #, fuzzy
@@ -835,21 +888,22 @@ msgstr "لا تملك تصريحًا."
 #. TRANS: Form validation error message.
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
+#. TRANS: Client error displayed when the session token is not okay.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
 #: actions/deletenotice.php:177 actions/disfavor.php:75
-#: actions/emailsettings.php:291 actions/favor.php:75 actions/geocode.php:55
+#: actions/emailsettings.php:292 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:65 actions/grouplogo.php:321
-#: actions/groupunblock.php:65 actions/imsettings.php:224
-#: actions/invite.php:60 actions/login.php:137 actions/makeadmin.php:66
-#: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
-#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
-#: actions/othersettings.php:155 actions/passwordsettings.php:138
-#: actions/profilesettings.php:217 actions/recoverpassword.php:383
-#: actions/register.php:172 actions/remotesubscribe.php:76
-#: actions/repeat.php:82 actions/smssettings.php:250 actions/subedit.php:40
-#: actions/subscribe.php:86 actions/tagother.php:166
-#: actions/unsubscribe.php:69 actions/userauthorization.php:52
-#: lib/designsettings.php:310
+#: actions/groupunblock.php:65 actions/imsettings.php:241
+#: actions/invite.php:60 actions/makeadmin.php:66 actions/newmessage.php:135
+#: actions/newnotice.php:105 actions/nudge.php:80
+#: actions/oauthappssettings.php:162 actions/oauthconnectionssettings.php:135
+#: actions/passwordsettings.php:137 actions/pluginenable.php:87
+#: actions/profilesettings.php:218 actions/recoverpassword.php:383
+#: actions/register.php:157 actions/remotesubscribe.php:76
+#: actions/repeat.php:82 actions/smssettings.php:249 actions/subedit.php:40
+#: actions/subscribe.php:87 actions/tagother.php:145
+#: actions/unsubscribe.php:69 actions/urlsettings.php:171
+#: actions/userauthorization.php:53 lib/designsettings.php:122
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 
@@ -878,10 +932,10 @@ msgstr "خطأ قاعده البيانات أثناء إدخال المستخد
 #. TRANS: Unknown form validation error in design settings form.
 #: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
 #: actions/designadminpanel.php:100 actions/editapplication.php:144
-#: actions/emailsettings.php:310 actions/grouplogo.php:332
-#: actions/imsettings.php:239 actions/newapplication.php:124
-#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
-#: actions/smssettings.php:271 lib/designsettings.php:321
+#: actions/emailsettings.php:311 actions/grouplogo.php:332
+#: actions/imsettings.php:256 actions/newapplication.php:124
+#: actions/oauthconnectionssettings.php:144 actions/recoverpassword.php:46
+#: actions/smssettings.php:270 lib/designsettings.php:133
 msgid "Unexpected form submission."
 msgstr ""
 
@@ -925,31 +979,26 @@ msgstr "الحساب"
 
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Field label in form for profile settings.
-#. TRANS: Label for group nickname (dt). Text hidden by default.
-#. TRANS: DT for nick name in a profile.
-#: actions/apioauthauthorize.php:459 actions/login.php:252
-#: actions/profilesettings.php:106 actions/register.php:432
-#: actions/showgroup.php:243 actions/tagother.php:94
+#: actions/apioauthauthorize.php:459 actions/login.php:225
+#: actions/profilesettings.php:107 actions/register.php:411
 #: actions/userauthorization.php:145 lib/groupeditform.php:145
-#: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "الاسم المستعار"
 
 #. TRANS: Field label on OAuth API authorisation form.
-#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:463 actions/login.php:255
-#: actions/register.php:436 lib/accountsettingsaction.php:120
+#: actions/apioauthauthorize.php:463 actions/login.php:228
+#: actions/register.php:415 lib/settingsnav.php:87
 msgid "Password"
 msgstr "كلمه السر"
 
 #. TRANS: Button text that when clicked will cancel the process of allowing access to an account
 #. TRANS: by an external application.
 #. TRANS: Button label to cancel an e-mail address confirmation procedure.
-#. TRANS: Button label to cancel an Instant Messaging address confirmation procedure.
+#. TRANS: Button label to cancel an IM address confirmation procedure.
 #. TRANS: Button label to cancel a SMS address confirmation procedure.
 #. TRANS: Button label in the "Edit application" form.
-#: actions/apioauthauthorize.php:478 actions/emailsettings.php:124
-#: actions/imsettings.php:127 actions/smssettings.php:133
+#: actions/apioauthauthorize.php:478 actions/emailsettings.php:125
+#: actions/imsettings.php:136 actions/smssettings.php:132
 #: lib/applicationeditform.php:351
 #, fuzzy
 msgctxt "BUTTON"
@@ -1064,7 +1113,7 @@ msgstr "الـ API method مش موجوده."
 #. TRANS: %s is the requested output format.
 #: actions/apistatusesshow.php:144
 #, fuzzy, php-format
-msgid "Unsupported format: %s"
+msgid "Unsupported format: %s."
 msgstr "نسق غير مدعوم."
 
 #. TRANS: Client error displayed requesting a deleted status.
@@ -1155,13 +1204,6 @@ msgstr "%1$s دخل جروپ %2$s"
 msgid "%1$s updates favorited by %2$s / %3$s."
 msgstr "نتايج التدوير لـ\"%1$s\" على %2$s"
 
-#. TRANS: Server error displayed when generating an Atom feed fails.
-#. TRANS: %s is the error.
-#: actions/apitimelinegroup.php:134
-#, fuzzy, php-format
-msgid "Could not generate feed for group - %s"
-msgstr "تعذر تحديث المجموعه."
-
 #. TRANS: Title for timeline of most recent mentions of a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname.
 #: actions/apitimelinementions.php:115
@@ -1178,13 +1220,14 @@ msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr ""
 
 #. TRANS: Title for site timeline. %s is the StatusNet sitename.
+#. TRANS: Public RSS feed title. %s is the StatusNet site name.
 #: actions/apitimelinepublic.php:193 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "مسار %s الزمنى العام"
 
 #. TRANS: Subtitle for site timeline. %s is the StatusNet sitename.
-#: actions/apitimelinepublic.php:199 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:199
 #, php-format
 msgid "%s updates from everyone!"
 msgstr ""
@@ -1196,21 +1239,33 @@ msgid "Unimplemented."
 msgstr "اكتمل الأمر"
 
 #. TRANS: Title for Atom feed "repeated to me". %s is the user nickname.
-#: actions/apitimelineretweetedtome.php:108
+#: actions/apitimelineretweetedtome.php:96
 #, php-format
 msgid "Repeated to %s"
 msgstr "كرر إلى %s"
 
+#: actions/apitimelineretweetedtome.php:98
+#, fuzzy, php-format
+msgid "%1$s notices that were to repeated to %2$s / %3$s."
+msgstr "نتايج التدوير لـ\"%1$s\" على %2$s"
+
 #. TRANS: Title of list of repeated notices of the logged in user.
 #. TRANS: %s is the nickname of the logged in user.
-#: actions/apitimelineretweetsofme.php:112
+#: actions/apitimelineretweetsofme.php:98
 #, php-format
 msgid "Repeats of %s"
 msgstr "تكرارات %s"
 
+#: actions/apitimelineretweetsofme.php:104
+#, fuzzy, php-format
+msgid "%1$s notices that %2$s / %3$s has repeated."
+msgstr "أرسل لى بريدًا إلكرتونيًا عندما يضيف أحدهم إشعارى مفضله."
+
 #. TRANS: Title for timeline with lastest notices with a given tag.
 #. TRANS: %s is the tag.
-#: actions/apitimelinetag.php:101 actions/tag.php:67
+#. TRANS: Title for first page of notices with tags.
+#. TRANS: %s is the tag.
+#: actions/apitimelinetag.php:101 actions/tag.php:69
 #, php-format
 msgid "Notices tagged with %s"
 msgstr "الإشعارات الموسومه ب%s"
@@ -1223,54 +1278,55 @@ msgid "Updates tagged with %1$s on %2$s!"
 msgstr "الإشعارات الموسومه ب%s"
 
 #. TRANS: Client error displayed trying to add a notice to another user's timeline.
-#: actions/apitimelineuser.php:297
+#: actions/apitimelineuser.php:308
 #, fuzzy
 msgid "Only the user can add to their own timeline."
 msgstr "يحق للمُرسل والمستلم فقط قراءه هذه الرساله."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:304
+#: actions/apitimelineuser.php:315
 msgid "Only accept AtomPub for Atom feeds."
 msgstr ""
 
 #. TRANS: Client error displayed attempting to post an empty API notice.
-#: actions/apitimelineuser.php:311
+#: actions/apitimelineuser.php:322
 msgid "Atom post must not be empty."
 msgstr ""
 
 #. TRANS: Client error displayed attempting to post an API that is not well-formed XML.
-#: actions/apitimelineuser.php:317
+#: actions/apitimelineuser.php:328
 msgid "Atom post must be well-formed XML."
 msgstr ""
 
 #. TRANS: Client error displayed when not using an Atom entry.
-#: actions/apitimelineuser.php:323 actions/atompubfavoritefeed.php:228
+#: actions/apitimelineuser.php:334 actions/atompubfavoritefeed.php:228
 #: actions/atompubmembershipfeed.php:230
 #: actions/atompubsubscriptionfeed.php:236
 msgid "Atom post must be an Atom entry."
 msgstr ""
 
 #. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
-#: actions/apitimelineuser.php:335
+#: actions/apitimelineuser.php:345
 msgid "Can only handle POST activities."
 msgstr ""
 
 #. TRANS: Client error displayed when using an unsupported activity object type.
 #. TRANS: %s is the unsupported activity object type.
-#: actions/apitimelineuser.php:346
+#: actions/apitimelineuser.php:356
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
 #. TRANS: %d is the notice ID (number).
-#: actions/apitimelineuser.php:380
+#: actions/apitimelineuser.php:390
 #, fuzzy, php-format
 msgid "No content for notice %d."
 msgstr "ابحث عن محتويات فى الإشعارات"
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:408
+#. TRANS: %s is the notice URI.
+#: actions/apitimelineuser.php:419
 #, fuzzy, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "لا ملف بهذه الهويه."
@@ -1289,9 +1345,10 @@ msgstr "الـ API method مش موجوده."
 
 #. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
 #. TRANS: Client exception.
+#. TRANS: Client error displayed trying to subscribe to a non-existing profile.
 #: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
 #: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
-#: actions/subscribe.php:107
+#: actions/subscribe.php:110
 #, fuzzy
 msgid "No such profile."
 msgstr "لا ملف كهذا."
@@ -1439,7 +1496,7 @@ msgid "Not a member."
 msgstr "جميع الأعضاء"
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
-#: actions/atompubshowmembership.php:151
+#: actions/atompubshowmembership.php:150
 #, fuzzy
 msgid "Cannot delete someone else's membership."
 msgstr "تعذّر حفظ الاشتراك."
@@ -1528,10 +1585,7 @@ msgid "Invalid size."
 msgstr "حجم غير صالح."
 
 #. TRANS: Title for avatar upload page.
-#. TRANS: Label for group avatar (dt). Text hidden by default.
-#. TRANS: Link description in user account settings menu.
-#: actions/avatarsettings.php:66 actions/showgroup.php:227
-#: lib/accountsettingsaction.php:113
+#: actions/avatarsettings.php:66 lib/settingsnav.php:82
 msgid "Avatar"
 msgstr "أفتار"
 
@@ -1544,9 +1598,11 @@ msgstr "تستطيع رفع صورتك الشخصيه. أقصى حجم للمل
 
 #. TRANS: Server error displayed in avatar upload page when no matching profile can be found for a user.
 #. TRANS: Server error displayed coming across a request from a user without a profile.
+#. TRANS: Server error displayed when trying to authorise a remote subscription request
+#. TRANS: while the user has no profile.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
 #: actions/grouplogo.php:184 actions/remotesubscribe.php:190
-#: actions/userauthorization.php:72 actions/userrss.php:108
+#: actions/userauthorization.php:75 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr "يوزر من-غير پروفايل زيّه."
 
@@ -1605,9 +1661,9 @@ msgstr "مجموعات"
 msgid "No file uploaded."
 msgstr "لا ملف شخصى مُحدّد."
 
-#. TRANS: Avatar upload form unstruction after uploading a file.
+#. TRANS: Avatar upload form instruction after uploading a file.
 #: actions/avatarsettings.php:345
-msgid "Pick a square area of the image to be your avatar"
+msgid "Pick a square area of the image to be your avatar."
 msgstr ""
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
@@ -1633,7 +1689,7 @@ msgstr "حُذف الأفتار."
 
 #. TRANS: Title for backup account page.
 #. TRANS: Option in profile settings to create a backup of the account of the currently logged in user.
-#: actions/backupaccount.php:61 actions/profilesettings.php:467
+#: actions/backupaccount.php:61 actions/profilesettings.php:468
 msgid "Backup account"
 msgstr ""
 
@@ -1667,7 +1723,7 @@ msgstr "الخلفية"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
 #: actions/backupaccount.php:254
-msgid "Backup your account"
+msgid "Backup your account."
 msgstr ""
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
@@ -1706,7 +1762,7 @@ msgstr "ملاحظة"
 #. TRANS: Submit button title for 'No' when blocking a user.
 #: actions/block.php:158
 #, fuzzy
-msgid "Do not block this user"
+msgid "Do not block this user."
 msgstr "لا تمنع هذا المستخدم"
 
 #. TRANS: Button label on the user block form.
@@ -1724,9 +1780,9 @@ msgid "Yes"
 msgstr "نعم"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#. TRANS: Description of the form to block a user.
-#: actions/block.php:165 lib/blockform.php:79
-msgid "Block this user"
+#: actions/block.php:165
+#, fuzzy
+msgid "Block this user."
 msgstr "امنع هذا المستخدم"
 
 #. TRANS: Server error displayed when blocking a user fails.
@@ -1794,33 +1850,49 @@ msgstr "لم يوجد رمز التأكيد."
 msgid "That confirmation code is not for you!"
 msgstr "رمز التأكيد ليس لك!"
 
-#. TRANS: Server error for a unknow address type %s, which can be 'email', 'jabber', or 'sms'.
-#: actions/confirmaddress.php:92
-#, php-format
-msgid "Unrecognized address type %s."
-msgstr ""
+#. TRANS: Server error for an unknown address type, which can be 'email', 'sms', or the name of an IM network (such as 'xmpp' or 'aim')
+#: actions/confirmaddress.php:94
+#, fuzzy, php-format
+msgid "Unrecognized address type %s"
+msgstr "نوع رساله مش مدعوم: %s"
 
 #. TRANS: Client error for an already confirmed email/jabber/sms address.
-#: actions/confirmaddress.php:97
+#: actions/confirmaddress.php:103 actions/confirmaddress.php:136
 #, fuzzy
 msgid "That address has already been confirmed."
 msgstr "هذا البريد الإلكترونى ملك مستخدم آخر بالفعل."
 
+#: actions/confirmaddress.php:121 actions/imsettings.php:444
+#: actions/userdesignsettings.php:306
+#, fuzzy
+msgid "Couldn't update user."
+msgstr "تعذّر تحديث المستخدم."
+
+#: actions/confirmaddress.php:144
+#, fuzzy
+msgid "Couldn't update user im preferences."
+msgstr "تعذّر تحديث المستخدم."
+
+#: actions/confirmaddress.php:156
+#, fuzzy
+msgid "Couldn't insert user im preferences."
+msgstr "تعذّر إدراج اشتراك جديد."
+
 #. TRANS: Server error displayed when an address confirmation code deletion from the
 #. TRANS: database fails in the contact address confirmation action.
-#: actions/confirmaddress.php:132
+#: actions/confirmaddress.php:169
 #, fuzzy
 msgid "Could not delete address confirmation."
 msgstr "تعذّر حذف تأكيد البريد الإلكترونى."
 
 #. TRANS: Title for the contact address confirmation action.
-#: actions/confirmaddress.php:150
+#: actions/confirmaddress.php:185
 msgid "Confirm address"
 msgstr "اكد العنوان"
 
 #. TRANS: Success message for the contact address confirmation action.
 #. TRANS: %s can be 'email', 'jabber', or 'sms'.
-#: actions/confirmaddress.php:166
+#: actions/confirmaddress.php:200
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr ""
@@ -1834,6 +1906,7 @@ msgstr "محادثة"
 #. TRANS: Label for user statistics.
 #: actions/conversation.php:149 lib/noticelist.php:87
 #: lib/profileaction.php:246 lib/searchgroupnav.php:82
+#: lib/threadednoticelist.php:66
 msgid "Notices"
 msgstr "الإشعارات"
 
@@ -1869,7 +1942,7 @@ msgstr "حُذف الأفتار."
 
 #. TRANS: Page title for page on which a user account can be deleted.
 #. TRANS: Option in profile settings to delete the account of the currently logged in user.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:475
+#: actions/deleteaccount.php:228 actions/profilesettings.php:476
 #, fuzzy
 msgid "Delete account"
 msgstr "أنشئ مجموعه جديدة"
@@ -1893,7 +1966,7 @@ msgstr ""
 #. TRANS: Field label for delete account confirmation entry.
 #. TRANS: Field label for password reset form where the password has to be typed again.
 #: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:262 actions/register.php:440
+#: actions/recoverpassword.php:262 actions/register.php:419
 msgid "Confirm"
 msgstr "أكّد"
 
@@ -1924,14 +1997,14 @@ msgstr "لم يوجد رمز التأكيد."
 #. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
 #: actions/deleteapplication.php:79 actions/editapplication.php:78
-#: actions/showapplication.php:94
+#: actions/showapplication.php:90
 msgid "You are not the owner of this application."
 msgstr "انت مش بتملك الapplication دى."
 
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
-#: actions/newapplication.php:112 actions/showapplication.php:118
-#: lib/action.php:1425
+#: actions/newapplication.php:112 actions/showapplication.php:113
+#: lib/action.php:1391
 msgid "There was a problem with your session token."
 msgstr ""
 
@@ -1952,13 +2025,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting an application.
 #: actions/deleteapplication.php:161
 #, fuzzy
-msgid "Do not delete this application"
+msgid "Do not delete this application."
 msgstr "لا تحذف هذا الإشعار"
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
 #: actions/deleteapplication.php:167
 #, fuzzy
-msgid "Delete this application"
+msgid "Delete this application."
 msgstr "احذف هذا الإشعار"
 
 #. TRANS: Client error when trying to delete group while not logged in.
@@ -2014,13 +2087,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting a group.
 #: actions/deletegroup.php:224
 #, fuzzy
-msgid "Do not delete this group"
+msgid "Do not delete this group."
 msgstr "لا تحذف هذا الإشعار"
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
 #: actions/deletegroup.php:231
 #, fuzzy
-msgid "Delete this group"
+msgid "Delete this group."
 msgstr "احذف هذا المستخدم"
 
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
@@ -2028,14 +2101,16 @@ msgstr "احذف هذا المستخدم"
 #. TRANS: Client error displayed when trying to mark a notice as favorite without being logged in.
 #. TRANS: Client error displayed trying to block a user from a group while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
+#. TRANS: Client error displayed trying to log out when not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
+#. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
 #. TRANS: Client error displayed when trying to change user options while not logged in.
 #: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
-#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:69
+#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:70
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
-#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
-#: actions/tagother.php:33 actions/unsubscribe.php:52
+#: actions/nudge.php:63 actions/pluginenable.php:97 actions/subedit.php:33
+#: actions/subscribe.php:98 actions/tagother.php:33 actions/unsubscribe.php:52
 #: lib/adminpanelaction.php:71 lib/profileformaction.php:63
 #: lib/settingsaction.php:72
 msgid "Not logged in."
@@ -2062,12 +2137,13 @@ msgstr "أمتأكد من أنك تريد حذف هذا الإشعار؟"
 #. TRANS: Submit button title for 'No' when deleting a notice.
 #: actions/deletenotice.php:159
 #, fuzzy
-msgid "Do not delete this notice"
+msgid "Do not delete this notice."
 msgstr "لا تحذف هذا الإشعار"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:166 lib/noticelist.php:673
-msgid "Delete this notice"
+#: actions/deletenotice.php:166
+#, fuzzy
+msgid "Delete this notice."
 msgstr "احذف هذا الإشعار"
 
 #. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
@@ -2102,18 +2178,17 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting a user.
 #: actions/deleteuser.php:158
 #, fuzzy
-msgid "Do not delete this user"
+msgid "Do not delete this user."
 msgstr "لا تحذف هذا الإشعار"
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
-#. TRANS: Description of form for deleting a user.
-#: actions/deleteuser.php:165 lib/deleteuserform.php:75
-msgid "Delete this user"
+#: actions/deleteuser.php:165
+#, fuzzy
+msgid "Delete this user."
 msgstr "احذف هذا المستخدم"
 
 #. TRANS: Message used as title for design settings for the site.
-#. TRANS: Link description in user account settings menu.
-#: actions/designadminpanel.php:60 lib/accountsettingsaction.php:134
+#: actions/designadminpanel.php:60 lib/settingsnav.php:97
 msgid "Design"
 msgstr "التصميم"
 
@@ -2183,8 +2258,7 @@ msgid "You can upload a custom StatusNet theme as a .ZIP archive."
 msgstr ""
 
 #. TRANS: Fieldset legend for theme background image.
-#. TRANS: Fieldset legend on profile design page.
-#: actions/designadminpanel.php:515 lib/designsettings.php:98
+#: actions/designadminpanel.php:515
 msgid "Change background image"
 msgstr "تغيير صوره الخلفية"
 
@@ -2192,7 +2266,7 @@ msgstr "تغيير صوره الخلفية"
 #. TRANS: Field label for background color selector.
 #. TRANS: Label on profile design page for setting a profile page background colour.
 #: actions/designadminpanel.php:525 actions/designadminpanel.php:609
-#: lib/designsettings.php:183
+#: lib/designform.php:238
 msgid "Background"
 msgstr "الخلفية"
 
@@ -2217,13 +2291,13 @@ msgstr "عطّل"
 #. TRANS: Form guide for turning background image on or off on theme designer page.
 #. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
 #. TRANS: use of the uploaded profile image.
-#: actions/designadminpanel.php:577 lib/designsettings.php:159
+#: actions/designadminpanel.php:577 lib/designform.php:214
 msgid "Turn background image on or off."
 msgstr "مكّن صوره الخلفيه أو عطّلها."
 
 #. TRANS: Checkbox label to title background image on theme designer page.
 #. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-#: actions/designadminpanel.php:583 lib/designsettings.php:165
+#: actions/designadminpanel.php:583 lib/designform.php:220
 #, fuzzy
 msgid "Tile background image"
 msgstr "تغيير صوره الخلفية"
@@ -2236,25 +2310,25 @@ msgstr "تغيير الألوان"
 
 #. TRANS: Field label for content color selector.
 #. TRANS: Label on profile design page for setting a profile page content colour.
-#: actions/designadminpanel.php:623 lib/designsettings.php:197
+#: actions/designadminpanel.php:623 lib/designform.php:252
 msgid "Content"
 msgstr "المحتوى"
 
 #. TRANS: Field label for sidebar color selector.
 #. TRANS: Label on profile design page for setting a profile page sidebar colour.
-#: actions/designadminpanel.php:637 lib/designsettings.php:211
+#: actions/designadminpanel.php:637 lib/designform.php:266
 msgid "Sidebar"
 msgstr "الشريط الجانبي"
 
 #. TRANS: Field label for text color selector.
 #. TRANS: Label on profile design page for setting a profile page text colour.
-#: actions/designadminpanel.php:651 lib/designsettings.php:225
+#: actions/designadminpanel.php:651 lib/designform.php:280
 msgid "Text"
 msgstr "النص"
 
 #. TRANS: Field label for link color selector.
 #. TRANS: Label on profile design page for setting a profile page links colour.
-#: actions/designadminpanel.php:665 lib/designsettings.php:239
+#: actions/designadminpanel.php:665 lib/designform.php:294
 msgid "Links"
 msgstr "وصلات"
 
@@ -2276,21 +2350,21 @@ msgid "Use defaults"
 msgstr "استخدم المبدئيات"
 
 #. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: actions/designadminpanel.php:720 lib/designsettings.php:259
-msgid "Restore default designs"
+#: actions/designadminpanel.php:720
+#, fuzzy
+msgid "Restore default designs."
 msgstr "استعد التصميمات المبدئية"
 
 #. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: actions/designadminpanel.php:728 lib/designsettings.php:267
-msgid "Reset back to default"
+#: actions/designadminpanel.php:728
+#, fuzzy
+msgid "Reset back to default."
 msgstr "ارجع إلى المبدئي"
 
 #. TRANS: Title for button for saving theme settings.
-#. TRANS: Title for button on profile design page to save settings.
-#: actions/designadminpanel.php:736 lib/designsettings.php:272
-msgid "Save design"
+#: actions/designadminpanel.php:736
+#, fuzzy
+msgid "Save design."
 msgstr "احفظ التصميم"
 
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
@@ -2323,7 +2397,7 @@ msgid "You must be logged in to edit an application."
 msgstr "لازم يكون متسجل دخولك علشان تعدّل application."
 
 #. TRANS: Client error displayed trying to edit an application that does not exist.
-#: actions/editapplication.php:83 actions/showapplication.php:87
+#: actions/editapplication.php:83 actions/showapplication.php:83
 msgid "No such application."
 msgstr "ما فيش application زى كده."
 
@@ -2420,80 +2494,53 @@ msgstr "عدّل مجموعه %s"
 msgid "You must be logged in to create a group."
 msgstr "يجب أن تكون والجًا لتنشئ مجموعه."
 
-#. TRANS: Client error displayed trying to edit a group while not being a group admin.
-#. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
-#. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
-#: actions/editgroup.php:110 actions/editgroup.php:176
-#: actions/groupdesignsettings.php:109 actions/grouplogo.php:111
-msgid "You must be an admin to edit the group."
-msgstr "لازم تكون ادارى علشان تعدّل الجروپ."
-
 #. TRANS: Form instructions for group edit form.
 #: actions/editgroup.php:161
 msgid "Use this form to edit the group."
 msgstr "استخدم هذا النموذج لتعديل المجموعه."
 
-#. TRANS: Group edit form validation error.
-#. TRANS: Group create form validation error.
-#. TRANS: %s is the invalid alias.
-#: actions/editgroup.php:241 actions/newgroup.php:188
-#, php-format
-msgid "Invalid alias: \"%s\""
-msgstr "كنيه غير صالحة: \"%s\""
-
-#. TRANS: Server error displayed when editing a group fails.
-#: actions/editgroup.php:274
-msgid "Could not update group."
-msgstr "تعذر تحديث المجموعه."
-
-#. TRANS: Server error displayed when group aliases could not be added.
-#. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/editgroup.php:281 classes/User_group.php:540
-msgid "Could not create aliases."
-msgstr "تعذّر إنشاء الكنى."
-
 #. TRANS: Group edit form success message.
 #: actions/editgroup.php:301
 msgid "Options saved."
 msgstr "حُفظت الخيارات."
 
 #. TRANS: Title for e-mail settings.
-#: actions/emailsettings.php:59
+#: actions/emailsettings.php:60
 msgid "Email settings"
 msgstr "تظبيطات الايميل"
 
 #. TRANS: E-mail settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/emailsettings.php:73
+#: actions/emailsettings.php:74
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 msgstr "أدر كيف تستلم البريد الإلكترونى من %%site.name%%."
 
 #. TRANS: Form legend for e-mail settings form.
 #. TRANS: Field label for e-mail address input in e-mail settings form.
-#: actions/emailsettings.php:103 actions/emailsettings.php:129
+#: actions/emailsettings.php:104 actions/emailsettings.php:130
 msgid "Email address"
 msgstr "عنوان الايميل"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:109
+#: actions/emailsettings.php:110
 msgid "Current confirmed email address."
 msgstr "عنوان البريد الإلكترونى المُؤكد الحالى."
 
 #. TRANS: Button label to remove a confirmed e-mail address.
 #. TRANS: Button label for removing a set sender e-mail address to post notices from.
-#. TRANS: Button label to remove a confirmed Instant Messaging address.
+#. TRANS: Button label to remove a confirmed IM address.
 #. TRANS: Button label to remove a confirmed SMS address.
 #. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
-#: actions/emailsettings.php:112 actions/emailsettings.php:179
-#: actions/imsettings.php:112 actions/smssettings.php:120
-#: actions/smssettings.php:176
+#: actions/emailsettings.php:113 actions/emailsettings.php:180
+#: actions/imsettings.php:119 actions/smssettings.php:119
+#: actions/smssettings.php:175
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "استرجع"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:119
+#: actions/emailsettings.php:120
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -2504,15 +2551,15 @@ msgstr ""
 #. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
 #. TRANS: Any other domain may be owned by a legitimate person or
 #. TRANS: organization.
-#: actions/emailsettings.php:136
+#: actions/emailsettings.php:137
 msgid "Email address, like \"UserName@example.org\""
 msgstr "عنوان البريد الإلكترونى، مثل \"UserName@example.org\""
 
 #. TRANS: Button label for adding an e-mail address in e-mail settings form.
-#. TRANS: Button label for adding an Instant Messaging address in Instant Messaging settings form.
+#. TRANS: Button label for adding an IM address in IM settings form.
 #. TRANS: Button label for adding a SMS phone number in SMS settings form.
-#: actions/emailsettings.php:140 actions/imsettings.php:147
-#: actions/smssettings.php:158
+#: actions/emailsettings.php:141 actions/imsettings.php:147
+#: actions/smssettings.php:157
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Add"
@@ -2520,29 +2567,29 @@ msgstr "أضف"
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:148 actions/smssettings.php:167
+#: actions/emailsettings.php:149 actions/smssettings.php:166
 msgid "Incoming email"
 msgstr "البريد الإلكترونى الوارد"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:154
+#: actions/emailsettings.php:155
 msgid "I want to post notices by email."
 msgstr "أريد أن أرسل الملاحظات عبر البريد الإلكترونى."
 
 #. TRANS: Form instructions for incoming e-mail form in e-mail settings.
 #. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
-#: actions/emailsettings.php:176 actions/smssettings.php:174
+#: actions/emailsettings.php:177 actions/smssettings.php:173
 msgid "Send email to this address to post new notices."
 msgstr "أرسل بريدًا إلكترونيًا إلى هذا العنوان لترسل إشعارات جديده."
 
 #. TRANS: Instructions for incoming e-mail address input form, when an address has already been assigned.
 #. TRANS: Instructions for incoming SMS e-mail address input form.
-#: actions/emailsettings.php:185 actions/smssettings.php:182
+#: actions/emailsettings.php:186 actions/smssettings.php:181
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr "أنشئ عنوان بريد إلكترونى لترسل إليه؛ ألغِ القديم."
 
 #. TRANS: Instructions for incoming e-mail address input form.
-#: actions/emailsettings.php:189
+#: actions/emailsettings.php:190
 msgid ""
 "To send notices via email, we need to create a unique email address for you "
 "on this server:"
@@ -2550,93 +2597,93 @@ msgstr ""
 
 #. TRANS: Button label for adding an e-mail address to send notices from.
 #. TRANS: Button label for adding an SMS e-mail address to send notices from.
-#: actions/emailsettings.php:195 actions/smssettings.php:185
+#: actions/emailsettings.php:196 actions/smssettings.php:184
 #, fuzzy
 msgctxt "BUTTON"
 msgid "New"
 msgstr "جديد"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:204
+#: actions/emailsettings.php:205
 msgid "Email preferences"
 msgstr "عناوين البريد الإلكتروني"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:212
+#: actions/emailsettings.php:213
 msgid "Send me notices of new subscriptions through email."
 msgstr "أرسل لى إشعارات بالاشتراكات الجديده عبر البريد الإلكترونى."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:218
+#: actions/emailsettings.php:219
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr "أرسل لى بريدًا إلكرتونيًا عندما يضيف أحدهم إشعارى مفضله."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:225
+#: actions/emailsettings.php:226
 #, fuzzy
 msgid "Send me email when someone sends me a private message."
 msgstr "أرسل لى بريدًا إلكترونيًا عندما يرسل لى أحدهم \"@-رد\"."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:231
+#: actions/emailsettings.php:232
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr "أرسل لى بريدًا إلكترونيًا عندما يرسل لى أحدهم \"@-رد\"."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:237
+#: actions/emailsettings.php:238
 msgid "Allow friends to nudge me and send me an email."
 msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:243
+#: actions/emailsettings.php:244
 #, fuzzy
 msgid "Publish a MicroID for my email address."
 msgstr "هذا ليس عنوان بريدك الإلكترونى."
 
 #. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:361
+#: actions/emailsettings.php:362
 #, fuzzy
 msgid "Email preferences saved."
 msgstr "حُفِظت التفضيلات."
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:380
+#: actions/emailsettings.php:381
 msgid "No email address."
 msgstr "لا عنوان بريد إلكترونى."
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:388
+#: actions/emailsettings.php:389
 #, fuzzy
 msgid "Cannot normalize that email address."
 msgstr "عنوان البريد الإلكترونى المُؤكد الحالى."
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:393 actions/register.php:212
+#: actions/emailsettings.php:394 actions/register.php:197
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "ليس عنوان بريد صالح."
 
 #. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:397
+#: actions/emailsettings.php:398
 msgid "That is already your email address."
 msgstr "هذا هو عنوان بريدك الإكترونى سابقًا."
 
 #. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:401
+#: actions/emailsettings.php:402
 msgid "That email address already belongs to another user."
 msgstr "هذا البريد الإلكترونى ملك مستخدم آخر بالفعل."
 
 #. TRANS: Server error thrown on database error adding e-mail confirmation code.
 #. TRANS: Server error thrown on database error adding Instant Messaging confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:418 actions/imsettings.php:343
-#: actions/smssettings.php:365
+#: actions/emailsettings.php:419 actions/imsettings.php:362
+#: actions/smssettings.php:364
 #, fuzzy
 msgid "Could not insert confirmation code."
 msgstr "تعذّر إدراج رمز التأكيد."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:425
+#: actions/emailsettings.php:426
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
@@ -2645,63 +2692,66 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling Instant Messaging address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:445 actions/imsettings.php:377
-#: actions/smssettings.php:399
+#: actions/emailsettings.php:446 actions/imsettings.php:391
+#: actions/smssettings.php:398
 #, fuzzy
 msgid "No pending confirmation to cancel."
 msgstr "لا رمز تأكيد."
 
 #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:450
+#: actions/emailsettings.php:451
 #, fuzzy
 msgid "That is the wrong email address."
 msgstr "هذا عنوان محادثه فوريه خاطئ."
 
 #. TRANS: Server error thrown on database error canceling e-mail address confirmation.
 #. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
-#: actions/emailsettings.php:459 actions/smssettings.php:413
+#: actions/emailsettings.php:460 actions/smssettings.php:412
 #, fuzzy
 msgid "Could not delete email confirmation."
 msgstr "تعذّر حذف تأكيد البريد الإلكترونى."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:464
+#: actions/emailsettings.php:465
 msgid "Email confirmation cancelled."
 msgstr "لا رمز تأكيد."
 
 #. TRANS: Message given trying to remove an e-mail address that is not
 #. TRANS: registered for the active user.
-#: actions/emailsettings.php:483
+#: actions/emailsettings.php:484
 msgid "That is not your email address."
 msgstr "هذا ليس عنوان بريدك الإلكترونى."
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:504
+#: actions/emailsettings.php:505
 msgid "The email address was removed."
 msgstr "لا عنوان بريد إلكترونى."
 
 #. TRANS: Form validation error displayed when trying to remove an incoming e-mail address while no address has been set.
-#: actions/emailsettings.php:518 actions/smssettings.php:555
+#: actions/emailsettings.php:519 actions/smssettings.php:554
 #, fuzzy
 msgid "No incoming email address."
 msgstr "لا عنوان بريد إلكترونى."
 
 #. TRANS: Server error thrown on database error removing incoming e-mail address.
 #. TRANS: Server error thrown on database error adding incoming e-mail address.
-#: actions/emailsettings.php:530 actions/emailsettings.php:554
-#: actions/smssettings.php:565 actions/smssettings.php:588
+#. TRANS: Server error displayed when the user could not be updated in SMS settings.
+#: actions/emailsettings.php:531 actions/emailsettings.php:555
+#: actions/smssettings.php:565 actions/smssettings.php:590
 #, fuzzy
 msgid "Could not update user record."
 msgstr "تعذّر تحديث المستخدم."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:534 actions/smssettings.php:568
+#. TRANS: Confirmation text after updating SMS settings.
+#: actions/emailsettings.php:535 actions/smssettings.php:569
 #, fuzzy
 msgid "Incoming email address removed."
 msgstr "لا عنوان بريد إلكترونى."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:558 actions/smssettings.php:591
+#. TRANS: Confirmation text after updating SMS settings.
+#: actions/emailsettings.php:559 actions/smssettings.php:594
 #, fuzzy
 msgid "New incoming email address added."
 msgstr "لا عنوان بريد إلكترونى."
@@ -2714,7 +2764,7 @@ msgstr "هذا الإشعار مفضله مسبقًا!"
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
 #: actions/favor.php:95
 #, fuzzy
-msgid "Disfavor favorite"
+msgid "Disfavor favorite."
 msgstr "ألغِ تفضيل المفضلة"
 
 #. TRANS: Page title for first page of favorited notices.
@@ -2761,9 +2811,8 @@ msgstr ""
 #. TRANS: %s is a user's nickname.
 #. TRANS: Title for first page of favourite notices of a user.
 #. TRANS: %s is the user for whom the favourite notices are displayed.
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing own favourited notices.
 #: actions/favoritesrss.php:111 actions/showfavorites.php:76
-#: lib/personalgroupnav.php:122
+#: lib/personalgroupnav.php:110
 #, php-format
 msgid "%s's favorite notices"
 msgstr "إشعارات %s المُفضلة"
@@ -2954,13 +3003,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
 #: actions/groupblock.php:191
 #, fuzzy
-msgid "Do not block this user from this group"
+msgid "Do not block this user from this group."
 msgstr "لا تمنع هذا المستخدم من هذه المجموعة"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
 #: actions/groupblock.php:198
 #, fuzzy
-msgid "Block this user from this group"
+msgid "Block this user from this group."
 msgstr "امنع هذا المستخدم من هذه المجموعة"
 
 #. TRANS: Server error displayed when trying to block a user from a group fails because of an application error.
@@ -2969,6 +3018,7 @@ msgid "Database error blocking user from group."
 msgstr "خطأ فى قاعده البيانات أثناء منع المستخدم من المجموعه."
 
 #. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
+#. TRANS: Client error displayed trying to find a user by ID without providing an ID.
 #: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr "لا هويه."
@@ -2997,7 +3047,7 @@ msgid "Unable to update your design settings."
 msgstr "تعذّر حذف إعدادات التصميم."
 
 #. TRANS: Form text to confirm saved group design settings.
-#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:222
+#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:239
 #, fuzzy
 msgid "Design preferences saved."
 msgstr "حُفِظت التفضيلات."
@@ -3062,7 +3112,7 @@ msgid "A list of the users in this group."
 msgstr "قائمه بمستخدمى هذه المجموعه."
 
 #. TRANS: Indicator in group members list that this user is a group administrator.
-#: actions/groupmembers.php:190
+#: actions/groupmembers.php:190 lib/action.php:581
 msgid "Admin"
 msgstr "إداري"
 
@@ -3149,8 +3199,10 @@ msgid "Group search"
 msgstr "بحث فى المجموعات"
 
 #. TRANS: Text on page where groups can be searched if no results were found for a query.
-#: actions/groupsearch.php:82 actions/noticesearch.php:117
-#: actions/peoplesearch.php:83
+#. TRANS: Text for notice search results is the query had no results.
+#. TRANS: Message on the "People search" page where a query has no results.
+#: actions/groupsearch.php:82 actions/noticesearch.php:122
+#: actions/peoplesearch.php:87
 msgid "No results."
 msgstr "لا نتائج."
 
@@ -3183,157 +3235,160 @@ msgid "User is not blocked from group."
 msgstr "المستخدم ليس ممنوعًا من المجموعه."
 
 #. TRANS: Server error displayed when unblocking a user from a group fails because of an unknown error.
+#. TRANS: Server error displayed when removing a user block.
 #: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "خطأ أثناء منع الحجب."
 
 #. TRANS: Title for Instant Messaging settings.
-#: actions/imsettings.php:58
+#: actions/imsettings.php:56
 msgid "IM settings"
 msgstr "تظبيطات بعت الرسايل الفوريه"
 
 #. 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.
-#: actions/imsettings.php:71
+#: actions/imsettings.php:69
 #, php-format
 msgid ""
-"You can send and receive notices through Jabber/Google Talk [instant "
-"messages](%%doc.im%%). Configure your address and settings below."
+"You can send and receive notices through instant messaging [instant messages]"
+"(%%doc.im%%). Configure your addresses and settings below."
 msgstr ""
 
-#. TRANS: Message given in the Instant Messaging settings if XMPP is not enabled on the site.
+#. TRANS: Message given in the IM settings if IM is not enabled on the site.
 #: actions/imsettings.php:90
 msgid "IM is not available."
 msgstr "المراسله الفوريه غير متوفره."
 
-#. TRANS: Form legend for Instant Messaging settings form.
-#. TRANS: Field label for Instant Messaging address input in Instant Messaging settings form.
-#: actions/imsettings.php:102 actions/imsettings.php:132
+#: actions/imsettings.php:116
+#, fuzzy, php-format
+msgid "Current confirmed %s address."
+msgstr "عنوان البريد الإلكترونى المُؤكد الحالى."
+
+#. TRANS: Form note in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:128
+#, php-format
+msgid ""
+"Awaiting confirmation on this address. Check your %s account for a message "
+"with further instructions. (Did you add %s to your buddy list?)"
+msgstr ""
+
+#: actions/imsettings.php:140
 msgid "IM address"
 msgstr "عنوان الرساله الفوريه"
 
-#: actions/imsettings.php:109
+#: actions/imsettings.php:142
+#, php-format
+msgid "%s screenname."
+msgstr ""
+
+#. TRANS: Header for IM preferences form.
+#: actions/imsettings.php:163
 #, fuzzy
-msgid "Current confirmed Jabber/Google Talk address."
-msgstr "عنوان البريد الإلكترونى المُؤكد الحالى."
-
-#. TRANS: Form note in Instant Messaging settings form.
-#. TRANS: %s is the Instant Messaging address set for the site.
-#: actions/imsettings.php:120
-#, php-format
-msgid ""
-"Awaiting confirmation on this address. Check your Jabber/Google Talk account "
-"for a message with further instructions. (Did you add %s to your buddy list?)"
-msgstr ""
-
-#. TRANS: IM address input field instructions in Instant Messaging settings form.
-#. TRANS: %s is the Instant Messaging address set for the site.
-#. TRANS: Do not translate "example.org". It is one of the domain names reserved for use in examples by
-#. TRANS: http://www.rfc-editor.org/rfc/rfc2606.txt. Any other domain may be owned by a legitimate
-#. TRANS: person or organization.
-#: actions/imsettings.php:139
-#, php-format
-msgid ""
-"Jabber or Google Talk address, like \"UserName@example.org\". First, make "
-"sure to add %s to your buddy list in your IM client or on Google Talk."
-msgstr ""
-
-#. TRANS: Form legend for Instant Messaging preferences form.
-#: actions/imsettings.php:154
-msgid "IM preferences"
+msgid "IM Preferences"
 msgstr "حُفِظت التفضيلات."
 
-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:159
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:174
 #, fuzzy
-msgid "Send me notices through Jabber/Google Talk."
-msgstr "أرسل لى إشعارات بالاشتراكات الجديده عبر البريد الإلكترونى."
+msgid "Send me notices"
+msgstr "أرسل إشعارًا"
 
-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:165
-msgid "Post a notice when my Jabber/Google Talk status changes."
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:176
+msgid "Post a notice when my status changes."
 msgstr ""
 
-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:171
-msgid ""
-"Send me replies through Jabber/Google Talk from people I'm not subscribed to."
-msgstr ""
-
-#. TRANS: Checkbox label in Instant Messaging preferences form.
+#. TRANS: Checkbox label in IM preferences form.
 #: actions/imsettings.php:178
+msgid "Send me replies from people I'm not subscribed to."
+msgstr ""
+
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:181
 #, fuzzy
-msgid "Publish a MicroID for my Jabber/Google Talk address."
+msgid "Publish a MicroID"
 msgstr "هذا ليس عنوان بريدك الإلكترونى."
 
-#. TRANS: Confirmation message for successful Instant Messaging preferences save.
-#: actions/imsettings.php:283 actions/othersettings.php:192
+#. TRANS: Server error thrown on database error updating IM preferences.
+#: actions/imsettings.php:291
+#, fuzzy
+msgid "Couldn't update IM preferences."
+msgstr "تعذّر تحديث المستخدم."
+
+#. TRANS: Confirmation message for successful IM preferences save.
+#. TRANS: Confirmation message after saving preferences.
+#: actions/imsettings.php:298 actions/urlsettings.php:244
 msgid "Preferences saved."
 msgstr "حُفِظت التفضيلات."
 
-#. TRANS: Message given saving Instant Messaging address without having provided one.
-#: actions/imsettings.php:304
-msgid "No Jabber ID."
-msgstr "لا هويه جابر."
-
-#. TRANS: Message given saving Instant Messaging address that cannot be normalised.
-#: actions/imsettings.php:312
+#. TRANS: Message given saving IM address without having provided one.
+#: actions/imsettings.php:320
 #, fuzzy
-msgid "Cannot normalize that Jabber ID."
-msgstr "ليست هويه جابر صالحة"
+msgid "No screenname."
+msgstr "لا اسم مستعار."
 
-#. TRANS: Message given saving Instant Messaging address that not valid.
-#: actions/imsettings.php:317
-#, fuzzy
-msgid "Not a valid Jabber ID."
-msgstr "ليست هويه جابر صالحة"
-
-#. TRANS: Message given saving Instant Messaging address that is already set.
-#: actions/imsettings.php:321
-#, fuzzy
-msgid "That is already your Jabber ID."
-msgstr "هذه ليست هويتك فى جابر."
-
-#. TRANS: Message given saving Instant Messaging address that is already set for another user.
 #: actions/imsettings.php:325
 #, fuzzy
-msgid "Jabber ID already belongs to another user."
+msgid "No transport."
+msgstr "ما فيش ملاحظه."
+
+#. TRANS: Message given saving IM address that cannot be normalised.
+#: actions/imsettings.php:333
+#, fuzzy
+msgid "Cannot normalize that screenname"
+msgstr "ليست هويه جابر صالحة"
+
+#. TRANS: Message given saving IM address that not valid.
+#: actions/imsettings.php:340
+#, fuzzy
+msgid "Not a valid screenname"
+msgstr "ليس اسمًا مستعارًا صحيحًا."
+
+#. TRANS: Message given saving IM address that is already set for another user.
+#: actions/imsettings.php:344
+#, fuzzy
+msgid "Screenname already belongs to another user."
 msgstr "هذا البريد الإلكترونى ملك مستخدم آخر بالفعل."
 
-#. TRANS: Message given saving valid Instant Messaging address that is to be confirmed.
-#. TRANS: %s is the Instant Messaging address set for the site.
-#: actions/imsettings.php:353
-#, php-format
-msgid ""
-"A confirmation code was sent to the IM address you added. You must approve %"
-"s for sending messages to you."
-msgstr ""
+#. TRANS: Message given saving valid IM address that is to be confirmed.
+#: actions/imsettings.php:369
+#, fuzzy
+msgid "A confirmation code was sent to the IM address you added."
+msgstr "رمز التأكيد ليس لك!"
 
-#. TRANS: Message given canceling Instant Messaging address confirmation for the wrong IM address.
-#: actions/imsettings.php:382
+#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#: actions/imsettings.php:396
 msgid "That is the wrong IM address."
 msgstr "هذا عنوان محادثه فوريه خاطئ."
 
-#. TRANS: Server error thrown on database error canceling Instant Messaging address confirmation.
-#: actions/imsettings.php:391
+#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#: actions/imsettings.php:405
 #, fuzzy
-msgid "Could not delete IM confirmation."
+msgid "Couldn't delete confirmation."
 msgstr "تعذّر حذف تأكيد البريد الإلكترونى."
 
-#. TRANS: Message given after successfully canceling Instant Messaging address confirmation.
-#: actions/imsettings.php:396
+#. TRANS: Message given after successfully canceling IM address confirmation.
+#: actions/imsettings.php:410
 msgid "IM confirmation cancelled."
 msgstr "لا رمز تأكيد."
 
-#. TRANS: Message given trying to remove an Instant Messaging address that is not
+#. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.
-#: actions/imsettings.php:417
-msgid "That is not your Jabber ID."
-msgstr "هذه ليست هويتك فى جابر."
+#: actions/imsettings.php:434
+#, fuzzy
+msgid "That is not your screenname."
+msgstr "هذا ليس رقم هاتفك."
+
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#: actions/imsettings.php:443
+#, fuzzy
+msgid "Couldn't update user im prefs."
+msgstr "تعذّر تحديث المستخدم."
 
 #. TRANS: Message given after successfully removing a registered Instant Messaging address.
-#: actions/imsettings.php:440
+#: actions/imsettings.php:451
 #, fuzzy
 msgid "The IM address was removed."
 msgstr "أزيل هذا العنوان."
@@ -3530,7 +3585,7 @@ msgid "You must be logged in to join a group."
 msgstr "يجب أن تلج لتُعدّل المجموعات."
 
 #. TRANS: Title for join group page after joining.
-#: actions/joingroup.php:147
+#: actions/joingroup.php:148
 #, fuzzy, php-format
 msgctxt "TITLE"
 msgid "%1$s joined group %2$s"
@@ -3659,7 +3714,7 @@ msgstr ""
 #. TRANS: Submit button title.
 #: actions/licenseadminpanel.php:311 actions/sessionsadminpanel.php:199
 #: actions/siteadminpanel.php:292 actions/snapshotadminpanel.php:245
-#: actions/tagother.php:154 lib/applicationeditform.php:357
+#: actions/tagother.php:133 lib/applicationeditform.php:357
 msgid "Save"
 msgstr "أرسل"
 
@@ -3667,50 +3722,52 @@ msgstr "أرسل"
 msgid "Save license settings"
 msgstr ""
 
-#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
+#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
+#: actions/login.php:97 actions/otp.php:62 actions/register.php:130
 msgid "Already logged in."
 msgstr "والج بالفعل."
 
-#: actions/login.php:148
+#: actions/login.php:125
 msgid "Incorrect username or password."
 msgstr "اسم المستخدم أو كلمه السر غير صحيحان."
 
-#: actions/login.php:154 actions/otp.php:120
+#. TRANS: Server error displayed when a user object could not be created trying to login using "one time password login".
+#: actions/login.php:131 actions/otp.php:127
 msgid "Error setting user. You are probably not authorized."
 msgstr "خطأ أثناء ضبط المستخدم. لست مُصرحًا على الأرجح."
 
-#: actions/login.php:210 actions/login.php:263
+#: actions/login.php:185 actions/login.php:236 lib/action.php:598
 msgid "Login"
 msgstr "لُج"
 
-#: actions/login.php:249
+#: actions/login.php:222
 msgid "Login to site"
 msgstr "لُج إلى الموقع"
 
-#: actions/login.php:258 actions/register.php:490
+#: actions/login.php:231 actions/register.php:469
 msgid "Remember me"
 msgstr "تذكّرني"
 
-#: actions/login.php:259 actions/register.php:492
+#: actions/login.php:232 actions/register.php:471
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 
-#: actions/login.php:269
+#: actions/login.php:241
 msgid "Lost or forgotten password?"
 msgstr "أنسيت كلمه السر؟"
 
-#: actions/login.php:288
+#: actions/login.php:259
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
 msgstr ""
 
-#: actions/login.php:292
+#: actions/login.php:263
 #, fuzzy
 msgid "Login with your username and password."
 msgstr "اسم المستخدم أو كلمه السر غير صحيحان."
 
-#: actions/login.php:295
+#: actions/login.php:266
 #, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -3837,44 +3894,56 @@ msgstr "إشعار جديد"
 msgid "Notice posted"
 msgstr "أُرسل الإشعار"
 
-#: actions/noticesearch.php:68
+#. TRANS: Instructions for Notice search page.
+#. TRANS: %%site.name%% is the name of the StatusNet site.
+#: actions/noticesearch.php:69
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
 "by spaces; they must be 3 characters or more."
 msgstr ""
 
-#: actions/noticesearch.php:78
+#. TRANS: Title of the page where users can search for notices.
+#: actions/noticesearch.php:80
 msgid "Text search"
 msgstr "بحث فى النصوص"
 
-#: actions/noticesearch.php:91
+#. TRANS: Test in RSS notice search.
+#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
+#: actions/noticesearch.php:95
 #, php-format
 msgid "Search results for \"%1$s\" on %2$s"
 msgstr "نتايج التدوير لـ\"%1$s\" على %2$s"
 
-#: actions/noticesearch.php:121
+#. TRANS: Text for logged in users making a query for notices without results.
+#. TRANS: This message contains a Markdown link.
+#: actions/noticesearch.php:128
 #, php-format
 msgid ""
 "Be the first to [post on this topic](%%%%action.newnotice%%%%?"
 "status_textarea=%s)!"
 msgstr ""
 
-#: actions/noticesearch.php:124
+#. TRANS: Text for not logged in users making a query for notices without results.
+#. TRANS: This message contains Markdown links.
+#: actions/noticesearch.php:133
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and be the first to "
 "[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
 msgstr ""
 
-#: actions/noticesearchrss.php:96
+#. TRANS: RSS notice search feed title. %s is the query.
+#: actions/noticesearchrss.php:95
 #, php-format
 msgid "Updates with \"%s\""
 msgstr ""
 
-#: actions/noticesearchrss.php:98
+#. TRANS: RSS notice search feed description.
+#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
+#: actions/noticesearchrss.php:99
 #, fuzzy, php-format
-msgid "Updates matching search term \"%1$s\" on %2$s!"
+msgid "Updates matching search term \"%1$s\" on %2$s."
 msgstr "الإشعارات الموسومه ب%s"
 
 #: actions/nudge.php:85
@@ -3892,52 +3961,52 @@ msgid "Nudge sent!"
 msgstr "أُرسل التنبيه!"
 
 #. TRANS: Message displayed to an anonymous user trying to view OAuth application list.
-#: actions/oauthappssettings.php:60
+#: actions/oauthappssettings.php:57
 msgid "You must be logged in to list your applications."
 msgstr "لازم تكون مسجل دخولك علشان تشوف ليستة الapplications بتاعتك."
 
 #. TRANS: Page title for OAuth applications
-#: actions/oauthappssettings.php:76
+#: actions/oauthappssettings.php:73
 msgid "OAuth applications"
 msgstr "OAuth applications"
 
 #. TRANS: Page instructions for OAuth applications
-#: actions/oauthappssettings.php:88
+#: actions/oauthappssettings.php:85
 msgid "Applications you have registered"
 msgstr ""
 
 #. TRANS: Empty list message on page with OAuth applications.
-#: actions/oauthappssettings.php:141
+#: actions/oauthappssettings.php:138
 #, fuzzy, php-format
 msgid "You have not registered any applications yet."
 msgstr "لازم تكون مسجل دخوللك علشان تسجل application."
 
 #. TRANS: Title for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:71
+#: actions/oauthconnectionssettings.php:69
 #, fuzzy
 msgid "Connected applications"
 msgstr "مش ممكن إنشاء الapplication."
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:83
+#: actions/oauthconnectionssettings.php:80
 msgid "The following connections exist for your account."
 msgstr ""
 
 #. TRANS: Client error when trying to revoke access for an application while not being a user of it.
-#: actions/oauthconnectionssettings.php:168
+#: actions/oauthconnectionssettings.php:165
 msgid "You are not a user of that application."
 msgstr "انت مش يوزر للapplication دى."
 
 #. TRANS: Client error when revoking access has failed for some reason.
 #. TRANS: %s is the application ID revoking access failed for.
-#: actions/oauthconnectionssettings.php:183
+#: actions/oauthconnectionssettings.php:180
 #, fuzzy, php-format
 msgid "Unable to revoke access for application: %s."
 msgstr "استعمل الفورمه دى علشان تعدّل الapplication بتاعتك."
 
 #. TRANS: Success message after revoking access for an application.
 #. TRANS: %1$s is the application name, %2$s is the first part of the user token.
-#: actions/oauthconnectionssettings.php:202
+#: actions/oauthconnectionssettings.php:199
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -3945,20 +4014,30 @@ msgid ""
 msgstr ""
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:213
+#: actions/oauthconnectionssettings.php:210
 msgid "You have not authorized any applications to use your account."
 msgstr ""
 
 #. TRANS: Note for developers in the OAuth connection settings form.
 #. TRANS: This message contains a Markdown link. Do not separate "](".
 #. TRANS: %s is the URL to the OAuth settings.
-#: actions/oauthconnectionssettings.php:233
+#: actions/oauthconnectionssettings.php:230
 #, php-format
 msgid ""
 "Are you a developer? [Register an OAuth client application](%s) to use with "
 "this instance of StatusNet."
 msgstr ""
 
+#: actions/oembed.php:64
+#, fuzzy, php-format
+msgid "\"%s\" not found."
+msgstr "الـ API method مش موجوده."
+
+#: actions/oembed.php:76
+#, fuzzy, php-format
+msgid "Notice %s not found."
+msgstr "الـ API method مش موجوده."
+
 #: actions/oembed.php:80 actions/shownotice.php:100
 #, fuzzy
 msgid "Notice has no profile."
@@ -3969,6 +4048,16 @@ msgstr "ليس للمستخدم ملف شخصى."
 msgid "%1$s's status on %2$s"
 msgstr "%1$s ساب جروپ %2$s"
 
+#: actions/oembed.php:95
+#, fuzzy, php-format
+msgid "Attachment %s not found."
+msgstr "لم يُعثر على المستخدم المستلم."
+
+#: actions/oembed.php:136
+#, php-format
+msgid "\"%s\" not supported for oembed requests."
+msgstr ""
+
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
 #: actions/oembed.php:168
 #, fuzzy, php-format
@@ -3982,94 +4071,60 @@ msgid "Only %s URLs over plain HTTP please."
 msgstr ""
 
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1205
-#: lib/apiaction.php:1232 lib/apiaction.php:1367
+#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1207
+#: lib/apiaction.php:1234 lib/apiaction.php:1369
 msgid "Not a supported data format."
 msgstr " مش نظام بيانات مدعوم."
 
+#. TRANS: ShortName in the OpenSearch interface when trying to find users.
 #: actions/opensearch.php:64
 msgid "People Search"
 msgstr "تدوير فى الأشخاص"
 
-#: actions/opensearch.php:67
+#: actions/opensearch.php:68
 msgid "Notice Search"
 msgstr "بحث الإشعارات"
 
-#: actions/othersettings.php:59
-msgid "Other settings"
-msgstr "تظبيطات تانيه"
-
-#. TRANS: Instructions for tab "Other" in user profile settings.
-#: actions/othersettings.php:71
-msgid "Manage various other options."
-msgstr "أدر خيارات أخرى عديده."
-
-#. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
-#. TRANS: user's profile settings. Use of "free" is as in "open", indicating that the
-#. TRANS: information on the shortener site is freely distributable.
-#. TRANS: This message has one space at the beginning. Use your language's word separator
-#. TRANS: here if it has one (most likely a single space).
-#: actions/othersettings.php:113
-msgid " (free service)"
-msgstr " (خدمه حرة)"
-
-#. TRANS: Label for dropdown with URL shortener services.
-#: actions/othersettings.php:122
-msgid "Shorten URLs with"
-msgstr "قصّر المسارات بـ"
-
-#. TRANS: Tooltip for for dropdown with URL shortener services.
-#: actions/othersettings.php:124
-msgid "Automatic shortening service to use."
-msgstr "خدمه التقصير المطلوب استخدامها."
-
-#. TRANS: Label for checkbox.
-#: actions/othersettings.php:130
-msgid "View profile designs"
-msgstr "اعرض تصاميم الملف الشخصي"
-
-#. TRANS: Tooltip for checkbox.
-#: actions/othersettings.php:132
-msgid "Show or hide profile designs."
-msgstr "أظهر أو أخفِ تصاميم الملفات الشخصيه."
-
-#. TRANS: Form validation error for form "Other settings" in user profile.
-#: actions/othersettings.php:164
-#, fuzzy
-msgid "URL shortening service is too long (maximum 50 characters)."
-msgstr "الاسم الكامل طويل جدا (الأقصى 255 حرفًا)"
-
-#: actions/otp.php:69
+#. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
+#: actions/otp.php:70
 msgid "No user ID specified."
 msgstr "ما فيش ID متحدد لليوزر."
 
-#: actions/otp.php:83
+#. TRANS: Client error displayed trying to use "one time password login" without specifying a login token.
+#: actions/otp.php:86
 msgid "No login token specified."
 msgstr "ما فيش امارة دخول متحدده."
 
-#: actions/otp.php:90
+#. TRANS: Client error displayed trying to use "one time password login" without requesting a login token.
+#: actions/otp.php:94
 msgid "No login token requested."
 msgstr "ما فيش طلب تسجيل دخول مطلوب."
 
-#: actions/otp.php:95
+#. TRANS: Client error displayed trying to use "one time password login" while specifying an invalid login token.
+#: actions/otp.php:100
 msgid "Invalid login token specified."
 msgstr "امارة تسجيل الدخول اللى اتحطت مش موجوده."
 
-#: actions/otp.php:104
+#. TRANS: Client error displayed trying to use "one time password login" while specifying an expired login token.
+#: actions/otp.php:110
 msgid "Login token expired."
 msgstr "تاريخ صلاحية الاماره خلص."
 
-#: actions/outbox.php:58
+#. TRANS: Title for outbox for any but the fist page.
+#. TRANS: %1$s is the user nickname, %2$d is the page number.
+#: actions/outbox.php:57
 #, php-format
 msgid "Outbox for %1$s - page %2$d"
 msgstr ""
 
+#. TRANS: Title for first page of outbox.
 #: actions/outbox.php:61
 #, fuzzy, php-format
 msgid "Outbox for %s"
 msgstr "صندوق الصادر"
 
-#: actions/outbox.php:104
+#. TRANS: Instructions for outbox.
+#: actions/outbox.php:103
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr ""
 
@@ -4095,43 +4150,45 @@ msgstr "كلمه السر القديمة"
 msgid "New password"
 msgstr "كلمه سر جديدة"
 
-#: actions/passwordsettings.php:109
+#: actions/passwordsettings.php:109 actions/register.php:416
 #, fuzzy
-msgid "6 or more characters"
+msgid "6 or more characters."
 msgstr "6 حروف أو أكثر. مطلوب."
 
-#: actions/passwordsettings.php:113
+#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#: actions/passwordsettings.php:113 actions/recoverpassword.php:264
+#: actions/register.php:420
 #, fuzzy
-msgid "Same as password above"
+msgid "Same as password above."
 msgstr "نفس كلمه السر أعلاه"
 
 #: actions/passwordsettings.php:117
 msgid "Change"
 msgstr "غيّر"
 
-#: actions/passwordsettings.php:154 actions/register.php:238
+#: actions/passwordsettings.php:153 actions/register.php:223
 msgid "Password must be 6 or more characters."
 msgstr "يجب أن تكون كلمه السر 6 حروف أو أكثر."
 
-#: actions/passwordsettings.php:157 actions/register.php:241
+#: actions/passwordsettings.php:156 actions/register.php:226
 msgid "Passwords don't match."
 msgstr "كلمتا السر غير متطابقتين."
 
-#: actions/passwordsettings.php:165
+#: actions/passwordsettings.php:164
 msgid "Incorrect old password"
 msgstr "كلمه السر القديمه غير صحيحة"
 
-#: actions/passwordsettings.php:181
+#: actions/passwordsettings.php:180
 msgid "Error saving user; invalid."
 msgstr "خطأ أثناء حفظ المستخدم؛ غير صالح."
 
-#: actions/passwordsettings.php:186
+#. TRANS: Reset password form validation error message.
+#: actions/passwordsettings.php:185 actions/recoverpassword.php:418
 #, fuzzy
-msgid "Can't save new password."
+msgid "Cannot save new password."
 msgstr "تعذّر حفظ كلمه السر الجديده."
 
-#. TRANS: Title for password recovery page in password saved mode.
-#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
+#: actions/passwordsettings.php:191
 msgid "Password saved."
 msgstr "حُفظت كلمه السر."
 
@@ -4349,8 +4406,7 @@ msgid "Directory where backgrounds are located."
 msgstr "مسار دليل المحليات"
 
 #. TRANS: Fieldset legens in Paths admin panel.
-#. TRANS: DT element label in attachment list.
-#: actions/pathsadminpanel.php:419 lib/attachmentlist.php:98
+#: actions/pathsadminpanel.php:419
 msgid "Attachments"
 msgstr "مرفقات"
 
@@ -4422,14 +4478,17 @@ msgstr ""
 msgid "Save paths"
 msgstr "احفظ المسارات"
 
-#: actions/peoplesearch.php:52
+#. TRANS: Instructions for the "People search" page.
+#. TRANS: %%site.name%% is the name of the StatusNet site.
+#: actions/peoplesearch.php:54
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
 "Separate the terms by spaces; they must be 3 characters or more."
 msgstr ""
 
-#: actions/peoplesearch.php:58
+#. TRANS: Title of a page where users can search for other users.
+#: actions/peoplesearch.php:61
 msgid "People search"
 msgstr "بحث فى الأشخاص"
 
@@ -4443,6 +4502,60 @@ msgstr "ليس عنوان بريد صالح."
 msgid "Users self-tagged with %1$s - page %2$d"
 msgstr ""
 
+#. TRANS: Page title for AJAX form return when a disabling a plugin.
+#: actions/plugindisable.php:69
+msgctxt "plugin"
+msgid "Disabled"
+msgstr ""
+
+#. TRANS: Client error displayed trying to perform any request method other than POST.
+#. TRANS: Do not translate POST.
+#: actions/pluginenable.php:78 actions/subscribe.php:77
+msgid "This action only accepts POST requests."
+msgstr ""
+
+#: actions/pluginenable.php:102
+#, fuzzy
+msgid "You cannot administer plugins."
+msgstr "لا يمكنك حذف المستخدمين."
+
+#: actions/pluginenable.php:109
+#, fuzzy
+msgid "No such plugin."
+msgstr "لا وسم كهذا."
+
+#. TRANS: Page title for AJAX form return when enabling a plugin.
+#: actions/pluginenable.php:159
+msgctxt "plugin"
+msgid "Enabled"
+msgstr ""
+
+#. TRANS: Tab and title for plugins admin panel.
+#. TRANS: Menu item for site administration
+#: actions/pluginsadminpanel.php:56 actions/version.php:191
+#: lib/adminpanelaction.php:411
+msgid "Plugins"
+msgstr ""
+
+#. TRANS: Instructions at top of plugin admin page.
+#: actions/pluginsadminpanel.php:68
+msgid ""
+"Additional plugins can be enabled and configured manually. See the <a href="
+"\"http://status.net/wiki/Plugins\">online plugin documentation</a> for more "
+"details."
+msgstr ""
+
+#. TRANS: Admin form section header
+#: actions/pluginsadminpanel.php:84
+#, fuzzy
+msgid "Default plugins"
+msgstr "اللغه المفضلة"
+
+#: actions/pluginsadminpanel.php:106
+msgid ""
+"All default plugins have been disabled from the site's configuration file."
+msgstr ""
+
 #: actions/postnotice.php:95
 msgid "Invalid notice content."
 msgstr "حجم غير صالح."
@@ -4453,51 +4566,48 @@ msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’.
 msgstr ""
 
 #. TRANS: Page title for profile settings.
-#: actions/profilesettings.php:59
+#: actions/profilesettings.php:60
 msgid "Profile settings"
 msgstr "إعدادات الملف الشخصي"
 
 #. TRANS: Usage instructions for profile settings.
-#: actions/profilesettings.php:70
+#: actions/profilesettings.php:71
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
 
 #. TRANS: Profile settings form legend.
-#: actions/profilesettings.php:98
+#: actions/profilesettings.php:99
 msgid "Profile information"
 msgstr "معلومات الملف الشخصي"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109 actions/register.php:433
+#: actions/profilesettings.php:110 actions/register.php:412
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr ""
 
 #. TRANS: Field label in form for profile settings.
-#. TRANS: Label for full group name (dt). Text hidden by default.
-#. TRANS: DT for full name in a profile.
-#: actions/profilesettings.php:113 actions/register.php:455
-#: actions/showgroup.php:255 actions/tagother.php:104
-#: lib/groupeditform.php:150 lib/userprofile.php:156
+#: actions/profilesettings.php:114 actions/register.php:434
+#: lib/groupeditform.php:150
 msgid "Full name"
 msgstr "الاسم الكامل"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:118 actions/register.php:460
+#: actions/profilesettings.php:119 actions/register.php:439
 #: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "الصفحه الرئيسية"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:121
+#: actions/profilesettings.php:122 actions/register.php:441
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr ""
 
 #. TRANS: Tooltip for field label in form for profile settings. Plural
 #. TRANS: is decided by the number of characters available for the
 #. TRANS: biography (%d).
-#: actions/profilesettings.php:129 actions/register.php:471
+#: actions/profilesettings.php:130 actions/register.php:450
 #, fuzzy, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4509,82 +4619,78 @@ msgstr[4] "صِف نفسك واهتماماتك"
 msgstr[5] "صِف نفسك واهتماماتك"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:135 actions/register.php:476
+#: actions/profilesettings.php:136 actions/register.php:455
 msgid "Describe yourself and your interests"
 msgstr "صِف نفسك واهتماماتك"
 
 #. TRANS: Text area label in form for profile settings where users can provide.
 #. TRANS: their biography.
-#: actions/profilesettings.php:139 actions/register.php:478
+#: actions/profilesettings.php:140 actions/register.php:457
 msgid "Bio"
 msgstr "السيرة"
 
 #. TRANS: Field label in form for profile settings.
-#. TRANS: Label for group location (dt). Text hidden by default.
-#. TRANS: DT for location in a profile.
-#: actions/profilesettings.php:145 actions/register.php:483
-#: actions/showgroup.php:265 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:173
-#: lib/userprofile.php:172
+#: actions/profilesettings.php:146 actions/register.php:462
+#: lib/groupeditform.php:173
 msgid "Location"
 msgstr "الموقع"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148 actions/register.php:485
+#: actions/profilesettings.php:149
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr ""
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:153
+#: actions/profilesettings.php:154
 msgid "Share my current location when posting notices"
 msgstr ""
 
 #. TRANS: Field label in form for profile settings.
-#. TRANS: DT for tags in a profile.
-#: actions/profilesettings.php:161 actions/tagother.php:149
-#: actions/tagother.php:209 lib/subscriptionlist.php:106
-#: lib/subscriptionlist.php:108 lib/userprofile.php:220
+#: actions/profilesettings.php:162 actions/tagother.php:128
+#: actions/tagother.php:188 lib/subscriptionlist.php:104
+#: lib/subscriptionlist.php:106
 msgid "Tags"
 msgstr "الوسوم"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:164
+#: actions/profilesettings.php:165
 msgid ""
-"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- "
+"separated."
 msgstr ""
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:169
+#: actions/profilesettings.php:170
 msgid "Language"
 msgstr "اللغة"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:171
+#: actions/profilesettings.php:172
 #, fuzzy
-msgid "Preferred language"
+msgid "Preferred language."
 msgstr "اللغه المفضلة"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:181
+#: actions/profilesettings.php:182
 msgid "Timezone"
 msgstr "المنطقه الزمنية"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:183
+#: actions/profilesettings.php:184
 msgid "What timezone are you normally in?"
 msgstr "ما المنطقه الزمنيه التى تتواجد فيها عادة؟"
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:189
+#: actions/profilesettings.php:190
 #, fuzzy
 msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)"
+"Automatically subscribe to whoever subscribes to me (best for non-humans)."
 msgstr "أشرك المستخدمين الجدد بهذا المستخدم تلقائيًا."
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Plural form is used based on the maximum number of allowed
 #. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:258 actions/register.php:229
+#: actions/profilesettings.php:259 actions/register.php:214
 #, fuzzy, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4596,50 +4702,50 @@ msgstr[4] "الاسم طويل جدا (اكتر حاجه %d رمز)."
 msgstr[5] "الاسم طويل جدا (اكتر حاجه %d رمز)."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:269 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:270 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr "لم تُختر المنطقه الزمنيه."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:277
+#: actions/profilesettings.php:278
 #, fuzzy
 msgid "Language is too long (maximum 50 characters)."
 msgstr "الاسم طويل جدا (اكتر حاجه 255 رمز)."
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:291 actions/tagother.php:178
-#, php-format
-msgid "Invalid tag: \"%s\""
+#: actions/profilesettings.php:292
+#, fuzzy, php-format
+msgid "Invalid tag: \"%s\"."
 msgstr "وسم غير صالح: \"%s\""
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:347
+#: actions/profilesettings.php:348
 #, fuzzy
 msgid "Could not update user for autosubscribe."
 msgstr "تعذّر تحديث المستخدم."
 
 #. TRANS: Server error thrown when user profile location preference settings could not be updated.
-#: actions/profilesettings.php:405
+#: actions/profilesettings.php:406
 #, fuzzy
 msgid "Could not save location prefs."
 msgstr "لم يمكن حفظ تفضيلات الموقع."
 
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:427 actions/tagother.php:200
+#: actions/profilesettings.php:428 actions/tagother.php:179
 msgid "Could not save tags."
 msgstr "تعذّر حفظ الوسوم."
 
 #. TRANS: Confirmation shown when user profile settings are saved.
 #. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:436 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:437 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "حُفظت الإعدادات."
 
 #. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
 #. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:483 actions/restoreaccount.php:60
+#: actions/profilesettings.php:484 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "أنشئ مجموعه جديدة"
@@ -4715,6 +4821,12 @@ msgstr ""
 "هنا %%site.name%%، خدمه [التدوين المُصغّر](http://en.wikipedia.org/wiki/Micro-"
 "blogging) المبنيه على البرنامج الحر [StatusNet](http://status.net/)."
 
+#. TRANS: Public RSS feed description. %s is the StatusNet site name.
+#: actions/publicrss.php:106
+#, php-format
+msgid "%s updates from everyone."
+msgstr ""
+
 #. TRANS: Title for public tag cloud.
 #: actions/publictagcloud.php:57
 msgid "Public tag cloud"
@@ -4753,10 +4865,6 @@ msgid ""
 "one!"
 msgstr ""
 
-#: actions/publictagcloud.php:146
-msgid "Tag cloud"
-msgstr "سحابه الوسوم"
-
 #. TRANS: Client error displayed trying to recover password while already logged in.
 #: actions/recoverpassword.php:37
 msgid "You are already logged in!"
@@ -4847,6 +4955,12 @@ msgstr "استعد كلمه السر"
 msgid "Password recovery requested"
 msgstr "طُلبت استعاده كلمه السر"
 
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/recoverpassword.php:229
+#, fuzzy
+msgid "Password saved"
+msgstr "حُفظت كلمه السر."
+
 #. TRANS: Title for password recovery page when an unknown action has been specified.
 #: actions/recoverpassword.php:232
 msgid "Unknown action"
@@ -4858,15 +4972,9 @@ msgstr "إجراء غير معروف"
 msgid "6 or more characters, and do not forget it!"
 msgstr "6 حروف أو أكثر. مطلوب."
 
-#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
-#: actions/recoverpassword.php:264 actions/register.php:441
-#, fuzzy
-msgid "Same as password above."
-msgstr "نفس كلمه السر أعلاه"
-
 #. TRANS: Button text for password reset form.
 #. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: actions/recoverpassword.php:268 lib/designsettings.php:264
+#: actions/recoverpassword.php:268 lib/designform.php:145
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Reset"
@@ -4919,14 +5027,8 @@ msgstr "يجب أن تكون كلمه السر 6 محارف أو أكثر."
 msgid "Password and confirmation do not match."
 msgstr "كلمتا السر غير متطابقتين."
 
-#. TRANS: Reset password form validation error message.
-#: actions/recoverpassword.php:418
-#, fuzzy
-msgid "Cannot save new password."
-msgstr "تعذّر حفظ كلمه السر الجديده."
-
 #. TRANS: Server error displayed when something does wrong with the user object during password reset.
-#: actions/recoverpassword.php:426 actions/register.php:256
+#: actions/recoverpassword.php:426 actions/register.php:241
 msgid "Error setting user."
 msgstr "خطأ أثناء ضبط المستخدم."
 
@@ -4935,99 +5037,102 @@ msgstr "خطأ أثناء ضبط المستخدم."
 msgid "New password successfully saved. You are now logged in."
 msgstr ""
 
-#: actions/register.php:92 actions/register.php:196 actions/register.php:413
+#: actions/redirecturl.php:70
+#, fuzzy
+msgid "No id parameter"
+msgstr "لا مدخل هويه."
+
+#: actions/redirecturl.php:76
+#, fuzzy, php-format
+msgid "No such file \"%d\""
+msgstr "لا ملف كهذا."
+
+#: actions/register.php:80 actions/register.php:181 actions/register.php:392
 msgid "Sorry, only invited people can register."
 msgstr "عذرًا، الأشخاص المدعوون وحدهم يستطيعون التسجيل."
 
-#: actions/register.php:99
+#: actions/register.php:87
 msgid "Sorry, invalid invitation code."
 msgstr "عذرا، رمز دعوه غير صالح."
 
-#: actions/register.php:119
+#: actions/register.php:106
 msgid "Registration successful"
 msgstr "نجح التسجيل"
 
-#: actions/register.php:121 actions/register.php:511
+#: actions/register.php:108 actions/register.php:490
 msgid "Register"
 msgstr "سجّل"
 
-#: actions/register.php:142
+#: actions/register.php:128
 msgid "Registration not allowed."
 msgstr "لا يُسمح بالتسجيل."
 
-#: actions/register.php:209
+#: actions/register.php:194
 #, fuzzy
-msgid "You can't register if you don't agree to the license."
+msgid "You cannot register if you don't agree to the license."
 msgstr "ما ينفعش تكرر الملاحظه بتاعتك."
 
-#: actions/register.php:218
+#: actions/register.php:203
 msgid "Email address already exists."
 msgstr "عنوان البريد الإلكترونى موجود مسبقًا."
 
-#: actions/register.php:251 actions/register.php:273
+#: actions/register.php:236 actions/register.php:258
 msgid "Invalid username or password."
 msgstr "اسم مستخدم أو كلمه سر غير صالحه."
 
-#: actions/register.php:351
+#: actions/register.php:333
 msgid ""
 "With this form you can create a new account. You can then post notices and "
-"link up to friends and colleagues. "
+"link up to friends and colleagues."
 msgstr ""
 
-#: actions/register.php:437
-#, fuzzy
-msgid "6 or more characters."
-msgstr "6 حروف أو أكثر. مطلوب."
-
-#. TRANS: Link description in user account settings menu.
-#: actions/register.php:445 actions/register.php:449
-#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
+#: actions/register.php:424 actions/register.php:428
+#: actions/siteadminpanel.php:238 lib/settingsnav.php:92
 msgid "Email"
 msgstr "البريد الإلكتروني"
 
-#: actions/register.php:446 actions/register.php:450
-msgid "Used only for updates, announcements, and password recovery"
+#: actions/register.php:425 actions/register.php:429
+msgid "Used only for updates, announcements, and password recovery."
 msgstr ""
 
-#: actions/register.php:457
-msgid "Longer name, preferably your \"real\" name"
+#: actions/register.php:436
+msgid "Longer name, preferably your \"real\" name."
 msgstr ""
 
-#: actions/register.php:462
-#, fuzzy
-msgid "URL of your homepage, blog, or profile on another site"
-msgstr "انت مش بتملك الapplication دى."
+#: actions/register.php:464
+msgid "Where you are, like \"City, State (or Region), Country\"."
+msgstr ""
 
-#: actions/register.php:523
+#: actions/register.php:503
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
 msgstr ""
 
-#: actions/register.php:533
+#: actions/register.php:513
 #, php-format
 msgid "My text and files are copyright by %1$s."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:537
+#: actions/register.php:517
 msgid "My text and files remain under my own copyright."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:540
+#: actions/register.php:520
 msgid "All rights reserved."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:545
+#: actions/register.php:525
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
 "email address, IM address, and phone number."
 msgstr ""
 
-#: actions/register.php:588
+#: actions/register.php:566
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -5046,7 +5151,7 @@ msgid ""
 "Thanks for signing up and we hope you enjoy using this service."
 msgstr ""
 
-#: actions/register.php:612
+#: actions/register.php:590
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5073,7 +5178,7 @@ msgid "User nickname"
 msgstr "اسم المستخدم المستعار"
 
 #: actions/remotesubscribe.php:129
-msgid "Nickname of the user you want to follow"
+msgid "Nickname of the user you want to follow."
 msgstr ""
 
 #: actions/remotesubscribe.php:132
@@ -5081,18 +5186,18 @@ msgid "Profile URL"
 msgstr "مسار الملف الشخصي"
 
 #: actions/remotesubscribe.php:133
-msgid "URL of your profile on another compatible microblogging service"
+msgid "URL of your profile on another compatible microblogging service."
 msgstr ""
 
 #. TRANS: Link text for link that will subscribe to a remote profile.
 #: actions/remotesubscribe.php:136 lib/subscribeform.php:139
-#: lib/userprofile.php:431
+#: lib/userprofile.php:402
 msgid "Subscribe"
 msgstr "اشترك"
 
 #: actions/remotesubscribe.php:158
 #, fuzzy
-msgid "Invalid profile URL (bad format)"
+msgid "Invalid profile URL (bad format)."
 msgstr "حجم غير صالح."
 
 #: actions/remotesubscribe.php:167
@@ -5126,7 +5231,7 @@ msgstr "ما ينفعش تكرر الملاحظه بتاعتك."
 msgid "You already repeated that notice."
 msgstr "انت عيدت الملاحظه دى فعلا."
 
-#: actions/repeat.php:112 lib/noticelist.php:692
+#: actions/repeat.php:112 lib/noticelist.php:697
 msgid "Repeated"
 msgstr "مكرر"
 
@@ -5134,9 +5239,9 @@ msgstr "مكرر"
 msgid "Repeated!"
 msgstr "مكرر!"
 
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing @-replies.
+#. TRANS: RSS reply feed title. %s is a user nickname.
 #: actions/replies.php:126 actions/repliesrss.php:68
-#: lib/personalgroupnav.php:109
+#: lib/personalgroupnav.php:105
 #, php-format
 msgid "Replies to %s"
 msgstr "الردود على %s"
@@ -5182,9 +5287,11 @@ msgid ""
 "newnotice%%%%?status_textarea=%3$s)."
 msgstr ""
 
-#: actions/repliesrss.php:72
+#. TRANS: RSS reply feed description.
+#. TRANS: %1$s is a user nickname, %2$s is the StatusNet site name.
+#: actions/repliesrss.php:74
 #, fuzzy, php-format
-msgid "Replies to %1$s on %2$s!"
+msgid "Replies to %1$s on %2$s."
 msgstr "أهلا بكم فى %1$s يا @%2$s!"
 
 #. TRANS: Client exception displayed when trying to restore an account while not logged in.
@@ -5286,7 +5393,7 @@ msgstr "لا يمكنك إسكات المستخدمين على هذا الموق
 msgid "User doesn't have this role."
 msgstr "يوزر من-غير پروفايل زيّه."
 
-#: actions/rsd.php:146 actions/version.php:159
+#: actions/rsd.php:142 actions/version.php:159
 msgid "StatusNet"
 msgstr "StatusNet"
 
@@ -5331,95 +5438,46 @@ msgstr "مكّن تنقيح مُخرجات الجلسه."
 msgid "Save site settings"
 msgstr "اذف إعدادت الموقع"
 
-#: actions/showapplication.php:82
+#: actions/showapplication.php:78
 msgid "You must be logged in to view an application."
 msgstr "لازم تكون مسجل دخولك علشان تشوف اى application."
 
-#: actions/showapplication.php:157
+#: actions/showapplication.php:151
 msgid "Application profile"
 msgstr ""
 
-#. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:159 lib/applicationeditform.php:177
-msgid "Icon"
-msgstr ""
-
-#. TRANS: Form input field label for application name.
-#: actions/showapplication.php:169 actions/version.php:197
-#: lib/applicationeditform.php:190
-msgid "Name"
-msgstr "الاسم"
-
-#. TRANS: Form input field label.
-#: actions/showapplication.php:178 lib/applicationeditform.php:227
-msgid "Organization"
-msgstr "المنظمه"
-
-#. TRANS: Form input field label.
-#: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:168
-msgid "Description"
-msgstr "الوصف"
-
-#. TRANS: Header for group statistics on a group page (h2).
-#. TRANS: H2 text for user statistics.
-#: actions/showapplication.php:192 actions/showgroup.php:460
-#: lib/profileaction.php:205
-msgid "Statistics"
-msgstr "إحصاءات"
-
-#: actions/showapplication.php:203
+#: actions/showapplication.php:179
 #, php-format
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr ""
 
-#: actions/showapplication.php:213
+#: actions/showapplication.php:189
 #, fuzzy
 msgid "Application actions"
 msgstr "OAuth applications"
 
-#: actions/showapplication.php:236
+#: actions/showapplication.php:212
 msgid "Reset key & secret"
 msgstr ""
 
 #. TRANS: Title of form for deleting a user.
-#: actions/showapplication.php:252 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:64 lib/noticelist.php:673
+#: actions/showapplication.php:228 lib/deletegroupform.php:121
+#: lib/deleteuserform.php:64 lib/noticelist.php:678
 msgid "Delete"
 msgstr "احذف"
 
-#: actions/showapplication.php:261
+#: actions/showapplication.php:237
 #, fuzzy
 msgid "Application info"
 msgstr "OAuth applications"
 
-#: actions/showapplication.php:263
-msgid "Consumer key"
-msgstr ""
-
-#: actions/showapplication.php:268
-msgid "Consumer secret"
-msgstr ""
-
-#: actions/showapplication.php:273
-msgid "Request token URL"
-msgstr ""
-
-#: actions/showapplication.php:278
-msgid "Access token URL"
-msgstr ""
-
-#: actions/showapplication.php:283
-msgid "Authorize URL"
-msgstr "اسمح للURL"
-
-#: actions/showapplication.php:288
+#: actions/showapplication.php:255
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
 msgstr ""
 
-#: actions/showapplication.php:309
+#: actions/showapplication.php:275
 #, fuzzy
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr "أمتأكد من أنك تريد حذف هذا الإشعار؟"
@@ -5504,62 +5562,48 @@ msgstr "مجموعه %s"
 msgid "%1$s group, page %2$d"
 msgstr "%1$s اعضاء الجروپ, صفحه %2$d"
 
-#. TRANS: Group profile header (h2). Text hidden by default.
-#: actions/showgroup.php:223
-msgid "Group profile"
-msgstr "ملف المجموعه الشخصي"
-
-#. TRANS: Label for group URL (dt). Text hidden by default.
-#. TRANS: DT for URL in a profile.
-#: actions/showgroup.php:273 actions/tagother.php:118
-#: actions/userauthorization.php:175 lib/userprofile.php:186
-msgid "URL"
-msgstr "مسار"
-
 #. TRANS: Label for group description or group note (dt). Text hidden by default.
-#. TRANS: DT for note in a profile.
-#: actions/showgroup.php:285 actions/tagother.php:128
-#: actions/userauthorization.php:187 lib/userprofile.php:204
+#: actions/showgroup.php:266
 msgid "Note"
 msgstr "ملاحظة"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:296 lib/groupeditform.php:180
+#: actions/showgroup.php:277 lib/groupeditform.php:180
 msgid "Aliases"
 msgstr "الكنى"
 
 #. TRANS: Group actions header (h2). Text hidden by default.
-#: actions/showgroup.php:313
+#: actions/showgroup.php:294
 #, fuzzy
 msgid "Group actions"
 msgstr "تصرفات المستخدم"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:357
+#: actions/showgroup.php:338
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
 msgstr ""
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:364
+#: actions/showgroup.php:345
 #, php-format
 msgid "Notice feed for %s group (RSS 2.0)"
 msgstr ""
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:371
+#: actions/showgroup.php:352
 #, php-format
 msgid "Notice feed for %s group (Atom)"
 msgstr ""
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:377
+#: actions/showgroup.php:358
 #, fuzzy, php-format
 msgid "FOAF for %s group"
 msgstr "مجموعه %s"
 
 #. TRANS: Header for mini list of group members on a group page (h2).
-#: actions/showgroup.php:414
+#: actions/showgroup.php:395
 msgid "Members"
 msgstr "الأعضاء"
 
@@ -5567,26 +5611,31 @@ msgstr "الأعضاء"
 #. TRANS: Text for user subscription statistics if the user has no subscriptions.
 #. TRANS: Text for user subscriber statistics if user has no subscribers.
 #. TRANS: Text for user user group membership statistics if user is not a member of any group.
-#: actions/showgroup.php:420 lib/profileaction.php:137
+#: actions/showgroup.php:401 lib/profileaction.php:137
 #: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
-#: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
+#: lib/subscriptionlist.php:123 lib/tagcloudsection.php:71
 msgid "(None)"
 msgstr "(لا شيء)"
 
 #. TRANS: Link to all group members from mini list of group members if group has more than n members.
-#: actions/showgroup.php:429
+#: actions/showgroup.php:410
 msgid "All members"
 msgstr "جميع الأعضاء"
 
-#. TRANS: Label for creation date in statistics on group page.
-#: actions/showgroup.php:465
+#. TRANS: Header for group statistics on a group page (h2).
+#. TRANS: H2 text for user statistics.
+#: actions/showgroup.php:441 lib/profileaction.php:205
+msgid "Statistics"
+msgstr "إحصاءات"
+
+#: actions/showgroup.php:444
 #, fuzzy
 msgctxt "LABEL"
 msgid "Created"
 msgstr "أنشئ"
 
 #. TRANS: Label for member count in statistics on group page.
-#: actions/showgroup.php:473
+#: actions/showgroup.php:449
 #, fuzzy
 msgctxt "LABEL"
 msgid "Members"
@@ -5596,7 +5645,7 @@ msgstr "الأعضاء"
 #. TRANS: **%s** is the group alias, %%%%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).
-#: actions/showgroup.php:488
+#: actions/showgroup.php:464
 #, fuzzy, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5613,7 +5662,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: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
-#: actions/showgroup.php:498
+#: actions/showgroup.php:474
 #, fuzzy, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5625,7 +5674,7 @@ msgstr ""
 "blogging) المبنيه على البرنامج الحر [StatusNet](http://status.net/)."
 
 #. TRANS: Header for list of group administrators on a group page (h2).
-#: actions/showgroup.php:527
+#: actions/showgroup.php:503
 msgid "Admins"
 msgstr "الإداريون"
 
@@ -5664,7 +5713,7 @@ msgid "%1$s tagged %2$s"
 msgstr "%1$s و الصحاب, صفحه %2$d"
 
 #. TRANS: Page title showing tagged notices in one user's stream.
-#. TRANS: %1$s is the username, %2$s is the hash tag, %1$d is the page number.
+#. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
 #: actions/showstream.php:74
 #, fuzzy, php-format
 msgid "%1$s tagged %2$s, page %3$d"
@@ -5711,13 +5760,13 @@ msgid "FOAF for %s"
 msgstr ""
 
 #. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
-#: actions/showstream.php:211
+#: actions/showstream.php:205
 #, php-format
 msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr ""
 
 #. TRANS: Second sentence of empty list message for a stream for the user themselves.
-#: actions/showstream.php:217
+#: actions/showstream.php:211
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
@@ -5725,7 +5774,7 @@ msgstr ""
 
 #. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:221
+#: actions/showstream.php:215
 #, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
@@ -5734,7 +5783,7 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:264
+#: actions/showstream.php:258
 #, fuzzy, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5749,7 +5798,7 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:271
+#: actions/showstream.php:265
 #, fuzzy, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5760,7 +5809,7 @@ msgstr ""
 "blogging) المبنيه على البرنامج الحر [StatusNet](http://status.net/)."
 
 #. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
-#: actions/showstream.php:328
+#: actions/showstream.php:322
 #, php-format
 msgid "Repeat of %s"
 msgstr "تكرارات %s"
@@ -5910,156 +5959,156 @@ msgstr ""
 #. TRANS: Title for button to save site notice in admin panel.
 #: actions/sitenoticeadminpanel.php:201
 #, fuzzy
-msgid "Save site notice"
+msgid "Save site notice."
 msgstr "إشعار الموقع"
 
 #. TRANS: Title for SMS settings.
-#: actions/smssettings.php:57
+#: actions/smssettings.php:56
 msgid "SMS settings"
 msgstr "تظبيطات الـSMS"
 
 #. TRANS: SMS settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/smssettings.php:71
+#: actions/smssettings.php:70
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr "لا يمكنك استلام رسائل قصيره عبر البريد الإلكرتونى من %%site.name%%."
 
 #. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
-#: actions/smssettings.php:93
+#: actions/smssettings.php:92
 msgid "SMS is not available."
 msgstr "الرسائل القصيره غير متوفره."
 
 #. TRANS: Form legend for SMS settings form.
-#: actions/smssettings.php:107
+#: actions/smssettings.php:106
 #, fuzzy
 msgid "SMS address"
 msgstr "عنوان الرساله الفوريه"
 
 #. TRANS: Form guide in SMS settings form.
-#: actions/smssettings.php:116
+#: actions/smssettings.php:115
 #, fuzzy
 msgid "Current confirmed SMS-enabled phone number."
 msgstr "عنوان البريد الإلكترونى المُؤكد الحالى."
 
 #. TRANS: Form guide in IM settings form.
-#: actions/smssettings.php:129
+#: actions/smssettings.php:128
 #, fuzzy
 msgid "Awaiting confirmation on this phone number."
 msgstr "هذا ليس رقم هاتفك."
 
 #. TRANS: Field label for SMS address input in SMS settings form.
-#: actions/smssettings.php:138
+#: actions/smssettings.php:137
 msgid "Confirmation code"
 msgstr "رمز التأكيد"
 
 #. TRANS: Form field instructions in SMS settings form.
-#: actions/smssettings.php:140
+#: actions/smssettings.php:139
 msgid "Enter the code you received on your phone."
 msgstr ""
 
 #. TRANS: Button label to confirm SMS confirmation code in SMS settings.
-#: actions/smssettings.php:144
+#: actions/smssettings.php:143
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Confirm"
 msgstr "أكّد"
 
 #. TRANS: Field label for SMS phone number input in SMS settings form.
-#: actions/smssettings.php:149
+#: actions/smssettings.php:148
 msgid "SMS phone number"
 msgstr "نمرة تليفون الـSMS"
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
-#: actions/smssettings.php:152
-msgid "Phone number, no punctuation or spaces, with area code"
+#: actions/smssettings.php:151
+msgid "Phone number, no punctuation or spaces, with area code."
 msgstr ""
 
 #. TRANS: Form legend for SMS preferences form.
-#: actions/smssettings.php:191
+#: actions/smssettings.php:190
 msgid "SMS preferences"
 msgstr "حُفِظت التفضيلات."
 
 #. TRANS: Checkbox label in SMS preferences form.
-#: actions/smssettings.php:197
+#: actions/smssettings.php:196
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
 msgstr ""
 
 #. TRANS: Confirmation message for successful SMS preferences save.
-#: actions/smssettings.php:308
+#: actions/smssettings.php:307
 #, fuzzy
 msgid "SMS preferences saved."
 msgstr "حُفِظت التفضيلات."
 
 #. TRANS: Message given saving SMS phone number without having provided one.
-#: actions/smssettings.php:330
+#: actions/smssettings.php:329
 msgid "No phone number."
 msgstr "لا رقم هاتف."
 
 #. TRANS: Message given saving SMS phone number without having selected a carrier.
-#: actions/smssettings.php:336
+#: actions/smssettings.php:335
 #, fuzzy
 msgid "No carrier selected."
 msgstr "حُذف الإشعار."
 
 #. TRANS: Message given saving SMS phone number that is already set.
-#: actions/smssettings.php:344
+#: actions/smssettings.php:343
 #, fuzzy
 msgid "That is already your phone number."
 msgstr "هذا ليس رقم هاتفك."
 
 #. TRANS: Message given saving SMS phone number that is already set for another user.
-#: actions/smssettings.php:348
+#: actions/smssettings.php:347
 #, fuzzy
 msgid "That phone number already belongs to another user."
 msgstr "هذا البريد الإلكترونى ملك مستخدم آخر بالفعل."
 
 #. TRANS: Message given saving valid SMS phone number that is to be confirmed.
-#: actions/smssettings.php:376
+#: actions/smssettings.php:375
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
 "for the code and instructions on how to use it."
 msgstr ""
 
 #. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
-#: actions/smssettings.php:404
+#: actions/smssettings.php:403
 #, fuzzy
 msgid "That is the wrong confirmation number."
 msgstr "هذا ليس رقم هاتفك."
 
 #. TRANS: Message given after successfully canceling SMS phone number confirmation.
-#: actions/smssettings.php:418
+#: actions/smssettings.php:417
 msgid "SMS confirmation cancelled."
 msgstr "لا رمز تأكيد."
 
 #. TRANS: Message given trying to remove an SMS phone number that is not
 #. TRANS: registered for the active user.
-#: actions/smssettings.php:438
+#: actions/smssettings.php:437
 msgid "That is not your phone number."
 msgstr "هذا ليس رقم هاتفك."
 
 #. TRANS: Message given after successfully removing a registered SMS phone number.
-#: actions/smssettings.php:460
+#: actions/smssettings.php:459
 #, fuzzy
 msgid "The SMS phone number was removed."
 msgstr "نمرة تليفون الـSMS"
 
 #. TRANS: Label for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:499
+#: actions/smssettings.php:498
 msgid "Mobile carrier"
 msgstr ""
 
 #. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:504
+#: actions/smssettings.php:503
 #, fuzzy
 msgid "Select a carrier"
 msgstr "اختر وسمًا لترشيحه"
 
 #. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
 #. TRANS: %s is an administrative contact's e-mail address.
-#: actions/smssettings.php:513
+#: actions/smssettings.php:512
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -6067,7 +6116,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
-#: actions/smssettings.php:535
+#: actions/smssettings.php:534
 #, fuzzy
 msgid "No code entered."
 msgstr "لا محتوى!"
@@ -6144,15 +6193,13 @@ msgstr "لست مُشتركًا بأى أحد."
 msgid "Could not save subscription."
 msgstr "تعذّر حفظ الاشتراك."
 
-#: actions/subscribe.php:77
-msgid "This action only accepts POST requests."
-msgstr ""
-
-#: actions/subscribe.php:117
+#. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
+#: actions/subscribe.php:121
 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
 msgstr ""
 
-#: actions/subscribe.php:145
+#. TRANS: Page title when subscription succeeded.
+#: actions/subscribe.php:149
 msgid "Subscribed"
 msgstr "مُشترك"
 
@@ -6259,31 +6306,34 @@ msgid "Subscription feed for %s (Atom)"
 msgstr "الردود على %s"
 
 #. TRANS: Checkbox label for enabling Jabber messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:239
-msgid "Jabber"
-msgstr "جابر"
+#: actions/subscriptions.php:241 lib/settingsnav.php:110
+#, fuzzy
+msgid "IM"
+msgstr "محادثه فورية"
 
 #. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:254
+#: actions/subscriptions.php:256 lib/settingsnav.php:117
 msgid "SMS"
 msgstr "رسائل قصيرة"
 
-#: actions/tag.php:69
+#. TRANS: Title for all but the first page of notices with tags.
+#. TRANS: %1$s is the tag, %2$d is the page number.
+#: actions/tag.php:73
 #, fuzzy, php-format
 msgid "Notices tagged with %1$s, page %2$d"
 msgstr "الإشعارات الموسومه ب%s"
 
-#: actions/tag.php:87
+#: actions/tag.php:91
 #, php-format
 msgid "Notice feed for tag %s (RSS 1.0)"
 msgstr ""
 
-#: actions/tag.php:93
+#: actions/tag.php:97
 #, php-format
 msgid "Notice feed for tag %s (RSS 2.0)"
 msgstr ""
 
-#: actions/tag.php:99
+#: actions/tag.php:103
 #, php-format
 msgid "Notice feed for tag %s (Atom)"
 msgstr ""
@@ -6302,28 +6352,27 @@ msgstr "الوسوم"
 msgid "User profile"
 msgstr "ملف المستخدم الشخصي"
 
-#. TRANS: DT element in area for user avatar.
-#: actions/tagother.php:81 actions/userauthorization.php:132
-#: lib/userprofile.php:108
-msgid "Photo"
-msgstr "صورة"
-
-#: actions/tagother.php:141
+#: actions/tagother.php:120
 msgid "Tag user"
 msgstr "اعمل tag لليوزر"
 
-#: actions/tagother.php:151
+#: actions/tagother.php:130
 msgid ""
 "Tags for this user (letters, numbers, -, ., and _), comma- or space- "
 "separated"
 msgstr ""
 
-#: actions/tagother.php:193
+#: actions/tagother.php:157
+#, php-format
+msgid "Invalid tag: \"%s\""
+msgstr "وسم غير صالح: \"%s\""
+
+#: actions/tagother.php:172
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 
-#: actions/tagother.php:236
+#: actions/tagother.php:215
 #, fuzzy
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr "استعمل الفورمه دى علشان تعدّل الapplication بتاعتك."
@@ -6332,6 +6381,7 @@ msgstr "استعمل الفورمه دى علشان تعدّل الapplication 
 msgid "No such tag."
 msgstr "لا وسم كهذا."
 
+#. TRANS: Client error displayed when trying to unblock a non-blocked user.
 #: actions/unblock.php:59
 msgid "You haven't blocked that user."
 msgstr "لم تمنع هذا المستخدم."
@@ -6354,12 +6404,84 @@ msgstr "ما فيش طلب تسجيل دخول مطلوب."
 msgid "Unsubscribed"
 msgstr "ألغِ الاشتراك"
 
-#: actions/updateprofile.php:64 actions/userauthorization.php:337
+#: actions/updateprofile.php:64
 #, php-format
 msgid ""
 "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
 msgstr ""
 
+#: actions/urlsettings.php:60
+#, fuzzy
+msgid "URL settings"
+msgstr "تظبيطات بعت الرسايل الفوريه"
+
+#. TRANS: Instructions for tab "Other" in user profile settings.
+#: actions/urlsettings.php:72
+msgid "Manage various other options."
+msgstr "أدر خيارات أخرى عديده."
+
+#. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
+#. TRANS: user's profile settings. This message has one space at the beginning. Use your
+#. TRANS: language's word separator here if it has one (most likely a single space).
+#: actions/urlsettings.php:115
+msgid " (free service)"
+msgstr " (خدمه حرة)"
+
+#: actions/urlsettings.php:121
+#, fuzzy
+msgid "[none]"
+msgstr "لا شيء"
+
+#: actions/urlsettings.php:122
+msgid "[internal]"
+msgstr ""
+
+#. TRANS: Label for dropdown with URL shortener services.
+#: actions/urlsettings.php:130
+msgid "Shorten URLs with"
+msgstr "قصّر المسارات بـ"
+
+#. TRANS: Tooltip for for dropdown with URL shortener services.
+#: actions/urlsettings.php:132
+msgid "Automatic shortening service to use."
+msgstr "خدمه التقصير المطلوب استخدامها."
+
+#: actions/urlsettings.php:138
+msgid "URL longer than"
+msgstr ""
+
+#: actions/urlsettings.php:141
+msgid "URLs longer than this will be shortened, 0 means always shorten."
+msgstr ""
+
+#: actions/urlsettings.php:145
+msgid "Text longer than"
+msgstr ""
+
+#: actions/urlsettings.php:148
+msgid ""
+"URLs in notices longer than this will be shortened, 0 means always shorten."
+msgstr ""
+
+#. TRANS: Form validation error for form "Other settings" in user profile.
+#: actions/urlsettings.php:180
+#, fuzzy
+msgid "URL shortening service is too long (maximum 50 characters)."
+msgstr "الاسم الكامل طويل جدا (الأقصى 255 حرفًا)"
+
+#: actions/urlsettings.php:187
+msgid "Invalid number for max url length."
+msgstr ""
+
+#: actions/urlsettings.php:193
+#, fuzzy
+msgid "Invalid number for max notice length."
+msgstr "حجم غير صالح."
+
+#: actions/urlsettings.php:238
+msgid "Error saving user URL shortening preferences."
+msgstr ""
+
 #. TRANS: User admin panel title
 #: actions/useradminpanel.php:58
 #, fuzzy
@@ -6387,11 +6509,11 @@ msgstr "رساله ترحيب غير صالحه. أقصى طول هو 255 حرف
 #. TRANS: users in user admin panel. %1$s is the invalid nickname.
 #: actions/useradminpanel.php:166
 #, php-format
-msgid "Invalid default subscripton: '%1$s' is not a user."
+msgid "Invalid default subscripton: \"%1$s\" is not a user."
 msgstr ""
 
-#. TRANS: Link description in user account settings menu.
-#: actions/useradminpanel.php:215 lib/accountsettingsaction.php:106
+#: actions/useradminpanel.php:215 lib/action.php:565 lib/settingsnav.php:77
+#: lib/subgroupnav.php:81
 msgid "Profile"
 msgstr "الملف الشخصي"
 
@@ -6449,125 +6571,171 @@ msgstr ""
 #. TRANS: Title for button to save user settings in user admin panel.
 #: actions/useradminpanel.php:302
 #, fuzzy
-msgid "Save user settings"
+msgid "Save user settings."
 msgstr "اذف إعدادت الموقع"
 
-#: actions/userauthorization.php:105
+#. TRANS: Page title.
+#: actions/userauthorization.php:109
 #, fuzzy
 msgid "Authorize subscription"
 msgstr "جميع الاشتراكات"
 
-#: actions/userauthorization.php:110
+#. TRANS: Page notice on "Auhtorize subscription" page.
+#: actions/userauthorization.php:115
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
 "user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
-"click “Reject”."
+"click \"Reject\"."
 msgstr ""
 
-#. TRANS: Menu item for site administration
-#: actions/userauthorization.php:196 actions/version.php:167
-#: lib/adminpanelaction.php:403
-msgid "License"
-msgstr "الرخصة"
-
-#: actions/userauthorization.php:217
+#. TRANS: Button text on Authorise Subscription page.
+#: actions/userauthorization.php:200
 #, fuzzy
+msgctxt "BUTTON"
 msgid "Accept"
 msgstr "اقبل"
 
-#: actions/userauthorization.php:218 lib/subscribeform.php:115
-#: lib/subscribeform.php:139
-msgid "Subscribe to this user"
+#. TRANS: Title for button on Authorise Subscription page.
+#: actions/userauthorization.php:202
+#, fuzzy
+msgid "Subscribe to this user."
 msgstr "اشترك بهذا المستخدم"
 
-#: actions/userauthorization.php:219
+#. TRANS: Button text on Authorise Subscription page.
+#: actions/userauthorization.php:204
 #, fuzzy
+msgctxt "BUTTON"
 msgid "Reject"
 msgstr "ارفض"
 
-#: actions/userauthorization.php:220
+#. TRANS: Title for button on Authorise Subscription page.
+#: actions/userauthorization.php:206
 #, fuzzy
-msgid "Reject this subscription"
+msgid "Reject this subscription."
 msgstr "ارفض هذا الاشتراك"
 
-#: actions/userauthorization.php:232
+#. TRANS: Client error displayed for an empty authorisation request.
+#: actions/userauthorization.php:219
 msgid "No authorization request!"
 msgstr "لا طلب استيثاق!"
 
-#: actions/userauthorization.php:254
+#. TRANS: Accept message header from Authorise subscription page.
+#: actions/userauthorization.php:242
 #, fuzzy
 msgid "Subscription authorized"
 msgstr "رُفض الاشتراك"
 
-#: actions/userauthorization.php:256
+#: actions/userauthorization.php:245
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to authorize the "
 "subscription. Your subscription token is:"
 msgstr ""
 
-#: actions/userauthorization.php:266
+#. TRANS: Reject message header from Authorise subscription page.
+#: actions/userauthorization.php:256
 msgid "Subscription rejected"
 msgstr "رُفض الاشتراك"
 
-#: actions/userauthorization.php:268
+#: actions/userauthorization.php:259
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to fully reject the "
 "subscription."
 msgstr ""
 
-#: actions/userauthorization.php:303
+#. TRANS: Exception thrown when no valid user is found for an authorisation request.
+#. TRANS: %s is a listener URI.
+#: actions/userauthorization.php:296
 #, php-format
-msgid "Listener URI ‘%s’ not found here."
+msgid "Listener URI \"%s\" not found here."
 msgstr ""
 
-#: actions/userauthorization.php:308
+#. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
+#. TRANS: %s is a listenee URI.
+#: actions/userauthorization.php:303
 #, fuzzy, php-format
-msgid "Listenee URI ‘%s’ is too long."
+msgid "Listenee URI \"%s\" is too long."
 msgstr "الSource URL مش مظبوط."
 
-#: actions/userauthorization.php:314
-#, fuzzy, php-format
-msgid "Listenee URI ‘%s’ is a local user."
-msgstr "الSource URL مش مظبوط."
+#. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
+#. TRANS: %s is a listenee URI.
+#: actions/userauthorization.php:311
+#, php-format
+msgid "Listenee URI \"%s\" is a local user."
+msgstr ""
 
+#. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
+#. TRANS: %s is a profile URL.
 #: actions/userauthorization.php:329
 #, php-format
-msgid "Profile URL ‘%s’ is for a local user."
+msgid "Profile URL \"%s\" is for a local user."
 msgstr ""
 
-#: actions/userauthorization.php:345
+#. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
+#. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
+#: actions/userauthorization.php:339
+#, php-format
+msgid ""
+"Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
+"\"."
+msgstr ""
+
+#. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
+#. TRANS: %s is an avatar URL.
+#: actions/userauthorization.php:349
 #, fuzzy, php-format
-msgid "Avatar URL ‘%s’ is not valid."
+msgid "Avatar URL \"%s\" is not valid."
 msgstr "الSource URL مش مظبوط."
 
-#: actions/userauthorization.php:350
+#. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
+#. TRANS: %s is an avatar URL.
+#: actions/userauthorization.php:356
 #, php-format
-msgid "Can’t read avatar URL ‘%s’."
+msgid "Cannot read avatar URL \"%s\"."
 msgstr ""
 
-#: actions/userauthorization.php:355
+#. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
+#. TRANS: %s is an avatar URL.
+#: actions/userauthorization.php:363
 #, php-format
-msgid "Wrong image type for avatar URL ‘%s’."
+msgid "Wrong image type for avatar URL \"%s\"."
 msgstr ""
 
 #. TRANS: Page title for profile design page.
-#: actions/userdesignsettings.php:74 lib/designsettings.php:63
+#: actions/userdesignsettings.php:74 lib/designsettings.php:61
 msgid "Profile design"
 msgstr "تصميم الملف الشخصي"
 
 #. TRANS: Instructions for profile design page.
-#: actions/userdesignsettings.php:84 lib/designsettings.php:74
+#: actions/userdesignsettings.php:84 lib/designsettings.php:72
 msgid ""
 "Customize the way your profile looks with a background image and a colour "
 "palette of your choice."
 msgstr ""
 
-#: actions/userdesignsettings.php:272
+#: actions/userdesignsettings.php:289
 msgid "Enjoy your hotdog!"
 msgstr "استمتع بالنقانق!"
 
+#: actions/userdesignsettings.php:325
+#, fuzzy
+msgid "Design settings"
+msgstr "اذف إعدادت الموقع"
+
+#: actions/userdesignsettings.php:340
+msgid "View profile designs"
+msgstr "اعرض تصاميم الملف الشخصي"
+
+#: actions/userdesignsettings.php:341
+msgid "Show or hide profile designs."
+msgstr "أظهر أو أخفِ تصاميم الملفات الشخصيه."
+
+#: actions/userdesignsettings.php:348
+#, fuzzy
+msgid "Background file"
+msgstr "الخلفية"
+
 #. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number.
 #: actions/usergroups.php:66
 #, php-format
@@ -6616,6 +6784,11 @@ msgstr ""
 msgid "Contributors"
 msgstr "كونيكشونات (Connections)"
 
+#. TRANS: Menu item for site administration
+#: actions/version.php:167 lib/adminpanelaction.php:403
+msgid "License"
+msgstr "الرخصة"
+
 #: actions/version.php:170
 msgid ""
 "StatusNet is free software: you can redistribute it and/or modify it under "
@@ -6639,12 +6812,13 @@ msgid ""
 "along with this program.  If not, see %s."
 msgstr ""
 
-#: actions/version.php:191
-msgid "Plugins"
-msgstr ""
+#. TRANS: Form input field label for application name.
+#: actions/version.php:197 lib/applicationeditform.php:190
+msgid "Name"
+msgstr "الاسم"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:901
+#: actions/version.php:198 lib/action.php:885
 msgid "Version"
 msgstr "النسخه"
 
@@ -6652,6 +6826,12 @@ msgstr "النسخه"
 msgid "Author(s)"
 msgstr "المؤلف/ين"
 
+#. TRANS: Form input field label.
+#: actions/version.php:200 lib/applicationeditform.php:208
+#: lib/groupeditform.php:168
+msgid "Description"
+msgstr "الوصف"
+
 #. TRANS: Activity title when marking a notice as favorite.
 #: classes/Fave.php:164
 msgid "Favor"
@@ -6780,7 +6960,7 @@ msgid "Could not create login token for %s"
 msgstr "ما نفعش يتعمل امارة تسجيل دخول لـ %s"
 
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
-#: classes/Memcached_DataObject.php:542
+#: classes/Memcached_DataObject.php:556
 msgid "No database name or DSN found anywhere."
 msgstr ""
 
@@ -6954,18 +7134,18 @@ msgstr "هؤلاء هم الأشخاص الذين يستمعون إلى إشعا
 
 #. TRANS: Notice given on user registration.
 #. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:395
+#: classes/User.php:390
 #, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr "أهلا بكم فى %1$s يا @%2$s!"
 
 #. TRANS: Server exception.
-#: classes/User.php:918
+#: classes/User.php:923
 msgid "No single user defined for single-user mode."
 msgstr ""
 
 #. TRANS: Server exception.
-#: classes/User.php:922
+#: classes/User.php:927
 msgid "Single-user mode code called when not enabled."
 msgstr ""
 
@@ -7011,41 +7191,6 @@ msgstr ""
 msgid "No AtomPub API service for %s."
 msgstr ""
 
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:104
-msgid "Change your profile settings"
-msgstr "غيّر إعدادات ملفك الشخصي"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:111
-msgid "Upload an avatar"
-msgstr "ارفع أفتارًا"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:118
-msgid "Change your password"
-msgstr "غير كلمه سرّك"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:125
-msgid "Change email handling"
-msgstr "غير أسلوب التعامل مع البريد الإلكتروني"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:132
-msgid "Design your profile"
-msgstr "صمّم ملفك الشخصي"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:139
-msgid "Other options"
-msgstr "خيارات أخرى"
-
-#. TRANS: Link description in user account settings menu.
-#: lib/accountsettingsaction.php:141
-msgid "Other"
-msgstr "أخرى"
-
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
 #: lib/action.php:161
 #, php-format
@@ -7063,222 +7208,129 @@ msgctxt "TOOLTIP"
 msgid "Show more"
 msgstr ""
 
-#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:544
+#. TRANS: Inline reply form submit button: submits a reply comment.
+#: lib/action.php:328
 #, fuzzy
-msgid "Primary site navigation"
-msgstr "ضبط الموقع الأساسي"
+msgctxt "BUTTON"
+msgid "Comment"
+msgstr "المحتوى"
 
-#. TRANS: Tooltip for main menu option "Personal".
-#: lib/action.php:550
-#, fuzzy
-msgctxt "TOOLTIP"
-msgid "Personal profile and friends timeline"
-msgstr "الملف الشخصى ومسار الأصدقاء الزمني"
-
-#. TRANS: Main menu option when logged in for access to personal profile and friends timeline.
-#. TRANS: Personal group navigation menu option when logged in for viewing timeline of self and friends.
-#: lib/action.php:553 lib/personalgroupnav.php:100
-#, fuzzy
-msgctxt "MENU"
-msgid "Personal"
-msgstr "شخصية"
-
-#. TRANS: Tooltip for main menu option "Account".
-#: lib/action.php:555
-#, fuzzy
-msgctxt "TOOLTIP"
-msgid "Change your email, avatar, password, profile"
-msgstr "غير كلمه سرّك"
-
-#. TRANS: Main menu option when logged in for access to user settings.
-#: lib/action.php:558
-msgid "Account"
-msgstr "الحساب"
-
-#. TRANS: Tooltip for main menu option "Services".
-#: lib/action.php:560
-#, fuzzy
-msgctxt "TOOLTIP"
-msgid "Connect to services"
-msgstr "كونيكشونات (Connections)"
-
-#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services.
-#: lib/action.php:563
-msgid "Connect"
-msgstr "اتصل"
-
-#. TRANS: Tooltip for menu option "Admin".
-#: lib/action.php:566
-msgctxt "TOOLTIP"
-msgid "Change site configuration"
-msgstr "ضبط الموقع الأساسي"
-
-#. TRANS: Main menu option when logged in and site admin for access to site configuration.
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/action.php:569 lib/groupnav.php:117
-#, fuzzy
-msgctxt "MENU"
-msgid "Admin"
-msgstr "إداري"
-
-#. TRANS: Tooltip for main menu option "Invite".
-#: lib/action.php:573
-#, php-format
-msgctxt "TOOLTIP"
-msgid "Invite friends and colleagues to join you on %s"
+#. TRANS: Placeholder text for inline reply form. Clicking in this box will turn it into a mini notice form.
+#: lib/action.php:331
+msgid "Add a comment..."
 msgstr ""
 
-#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users.
+#: lib/action.php:559 lib/personalgroupnav.php:99
+#, fuzzy
+msgid "Home"
+msgstr "الصفحه الرئيسية"
+
+#: lib/action.php:560
+#, fuzzy
+msgid "Friends timeline"
+msgstr "مسار %s الزمني"
+
+#: lib/action.php:566
+#, fuzzy
+msgid "Your profile"
+msgstr "ملف المجموعه الشخصي"
+
+#: lib/action.php:570 lib/action.php:593 lib/publicgroupnav.php:78
+msgid "Public"
+msgstr "عام"
+
+#: lib/action.php:571 lib/action.php:594
+#, fuzzy
+msgid "Everyone on this site"
+msgstr "ابحث عن أشخاص على هذا الموقع"
+
+#: lib/action.php:575
+#, fuzzy
+msgid "Settings"
+msgstr "تظبيطات الـSMS"
+
 #: lib/action.php:576
 #, fuzzy
-msgctxt "MENU"
-msgid "Invite"
-msgstr "ادعُ"
+msgid "Change your personal settings"
+msgstr "غيّر إعدادات ملفك الشخصي"
 
-#. TRANS: Tooltip for main menu option "Logout"
 #: lib/action.php:582
-msgctxt "TOOLTIP"
-msgid "Logout from the site"
-msgstr "سمه الموقع."
+#, fuzzy
+msgid "Site configuration"
+msgstr "ضبط المسارات"
 
-#. TRANS: Main menu option when logged in to log out the current user.
-#: lib/action.php:585
-msgctxt "MENU"
+#: lib/action.php:587
+#, fuzzy
 msgid "Logout"
 msgstr "الشعار"
 
-#. TRANS: Tooltip for main menu option "Register".
-#: lib/action.php:590
-msgctxt "TOOLTIP"
-msgid "Create an account"
-msgstr "أنشئ مجموعه جديدة"
-
-#. TRANS: Main menu option when not logged in to register a new account.
-#. TRANS: Menu item for registering with the StatusNet site.
-#: lib/action.php:593 lib/logingroupnav.php:85
+#: lib/action.php:588
 #, fuzzy
-msgctxt "MENU"
-msgid "Register"
-msgstr "سجّل"
+msgid "Logout from the site"
+msgstr "سمه الموقع."
 
-#. TRANS: Tooltip for main menu option "Login".
-#: lib/action.php:596
+#: lib/action.php:599
 #, fuzzy
-msgctxt "TOOLTIP"
 msgid "Login to the site"
 msgstr "لُج إلى الموقع"
 
-#. TRANS: Main menu option when not logged in to log in.
-#. TRANS: Menu item for logging in to the StatusNet site.
-#: lib/action.php:599 lib/logingroupnav.php:77
+#: lib/action.php:606
 #, fuzzy
-msgctxt "MENU"
-msgid "Login"
-msgstr "لُج"
-
-#. TRANS: Tooltip for main menu option "Help".
-#: lib/action.php:602
-msgctxt "TOOLTIP"
-msgid "Help me!"
-msgstr "مساعدة"
-
-#. TRANS: Main menu option for help on the StatusNet site.
-#: lib/action.php:605
-#, fuzzy
-msgctxt "MENU"
-msgid "Help"
-msgstr "مساعدة"
-
-#. TRANS: Tooltip for main menu option "Search".
-#: lib/action.php:608
-#, fuzzy
-msgctxt "TOOLTIP"
-msgid "Search for people or text"
-msgstr "ابحث عن أشخاص أو نص"
-
-#. TRANS: Main menu option when logged in or when the StatusNet instance is not private.
-#: lib/action.php:611
-#, fuzzy
-msgctxt "MENU"
 msgid "Search"
 msgstr "ابحث"
 
-#. TRANS: DT element for site notice. String is hidden in default CSS.
-#. TRANS: Menu item for site administration
-#: lib/action.php:633 lib/adminpanelaction.php:387
-msgid "Site notice"
-msgstr "إشعار الموقع"
-
-#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:700
-msgid "Local views"
-msgstr "المشاهدات المحلية"
-
-#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:770
-msgid "Page notice"
-msgstr "إشعار الصفحة"
-
-#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:874
+#: lib/action.php:607
 #, fuzzy
-msgid "Secondary site navigation"
-msgstr "ضبط الموقع الأساسي"
+msgid "Search the site"
+msgstr "ابحث فى الموقع"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:880
+#: lib/action.php:864
 msgid "Help"
 msgstr "مساعدة"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:883
+#: lib/action.php:867
 msgid "About"
 msgstr "عن"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:886
+#: lib/action.php:870
 msgid "FAQ"
 msgstr "الأسئله المكررة"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:891
+#: lib/action.php:875
 msgid "TOS"
 msgstr "الشروط"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:895
+#: lib/action.php:879
 msgid "Privacy"
 msgstr "خصوصية"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:898
+#: lib/action.php:882
 msgid "Source"
 msgstr "المصدر"
 
 #. TRANS: Secondary navigation menu option leading to e-mail contact information on the
 #. TRANS: StatusNet site, where to report bugs, ...
-#: lib/action.php:905
+#: lib/action.php:889
 msgid "Contact"
 msgstr "اتصل"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:908
+#: lib/action.php:892
 #, fuzzy
 msgid "Badge"
 msgstr "نبّه"
 
-#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:937
-#, fuzzy
-msgid "StatusNet software license"
-msgstr "رخصه محتوى الموقع"
-
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:944
+#: lib/action.php:921
 #, fuzzy, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7288,7 +7340,7 @@ msgstr ""
 "broughtbyurl%%). "
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:947
+#: lib/action.php:924
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr ""
@@ -7297,7 +7349,7 @@ msgstr ""
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:954
+#: lib/action.php:931
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7308,52 +7360,41 @@ msgstr ""
 "المتوفر تحت [رخصه غنو أفيرو العمومية](http://www.fsf.org/licensing/licenses/"
 "agpl-3.0.html)."
 
-#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:970
-msgid "Site content license"
-msgstr "رخصه محتوى الموقع"
-
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:977
+#: lib/action.php:949
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:984
+#: lib/action.php:956
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:988
+#: lib/action.php:960
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:1020
+#: lib/action.php:992
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
 
-#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1356
-#, fuzzy
-msgid "Pagination"
-msgstr "المنظمه"
-
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1367
+#: lib/action.php:1335
 msgid "After"
 msgstr "بعد"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1377
+#: lib/action.php:1345
 msgid "Before"
 msgstr "قبل"
 
@@ -7512,7 +7553,7 @@ msgid "User configuration"
 msgstr "ضبط المسارات"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:122
+#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:110
 msgid "User"
 msgstr "المستخدم"
 
@@ -7539,6 +7580,11 @@ msgstr "ضبط التصميم"
 msgid "Edit site notice"
 msgstr "إشعار الموقع"
 
+#. TRANS: Menu item for site administration
+#: lib/adminpanelaction.php:387
+msgid "Site notice"
+msgstr "إشعار الموقع"
+
 #. TRANS: Menu item title/tooltip
 #: lib/adminpanelaction.php:393
 #, fuzzy
@@ -7550,6 +7596,12 @@ msgstr "ضبط المسارات"
 msgid "Set site license"
 msgstr ""
 
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:409
+#, fuzzy
+msgid "Plugins configuration"
+msgstr "ضبط المسارات"
+
 #. TRANS: Client error 401.
 #: lib/apiauth.php:111
 msgid "API resource requires read-write access, but you only have read access."
@@ -7560,19 +7612,23 @@ msgstr ""
 msgid "No application for that consumer key."
 msgstr ""
 
+#: lib/apiauth.php:202 lib/apiauth.php:284
+msgid "Not allowed to use API."
+msgstr ""
+
 #. TRANS: OAuth exception given when an incorrect access token was given for a user.
-#: lib/apiauth.php:219
+#: lib/apiauth.php:225
 msgid "Bad access token."
 msgstr ""
 
 #. TRANS: OAuth exception given when no user was found for a given token (no token was found).
-#: lib/apiauth.php:224
+#: lib/apiauth.php:230
 msgid "No user for that token."
 msgstr ""
 
 #. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel".
 #. TRANS: Client error thrown when authentication fails.
-#: lib/apiauth.php:266 lib/apiauth.php:293
+#: lib/apiauth.php:272 lib/apiauth.php:302
 msgid "Could not authenticate you."
 msgstr ""
 
@@ -7620,6 +7676,11 @@ msgstr ""
 msgid "Failed to delete revoked token."
 msgstr ""
 
+#. TRANS: Form input field label for application icon.
+#: lib/applicationeditform.php:177
+msgid "Icon"
+msgstr ""
+
 #. TRANS: Form guide.
 #: lib/applicationeditform.php:182
 #, fuzzy
@@ -7661,6 +7722,11 @@ msgstr "Source URL"
 msgid "Organization responsible for this application"
 msgstr "انت مش بتملك الapplication دى."
 
+#. TRANS: Form input field label.
+#: lib/applicationeditform.php:227
+msgid "Organization"
+msgstr "المنظمه"
+
 #. TRANS: Form input field instructions.
 #: lib/applicationeditform.php:234
 msgid "URL for the homepage of the organization"
@@ -7749,16 +7815,6 @@ msgstr ""
 msgid "Do not use this method!"
 msgstr "لا تحذف هذا الإشعار"
 
-#. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:293
-msgid "Author"
-msgstr "المؤلف"
-
-#. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:307
-msgid "Provider"
-msgstr "المزود"
-
 #. TRANS: Title.
 #: lib/attachmentnoticesection.php:67
 #, fuzzy
@@ -7787,24 +7843,29 @@ msgstr "تغيير الپاسوورد مش مسموح"
 msgid "Block"
 msgstr "امنع"
 
+#. TRANS: Description of the form to block a user.
+#: lib/blockform.php:79
+msgid "Block this user"
+msgstr "امنع هذا المستخدم"
+
 #. TRANS: Title for command results.
-#: lib/channel.php:160 lib/channel.php:181
+#: lib/channel.php:104 lib/channel.php:125
 msgid "Command results"
 msgstr "نتائج الأمر"
 
 #. TRANS: Title for command results.
-#: lib/channel.php:194
+#: lib/channel.php:138
 #, fuzzy
 msgid "AJAX error"
 msgstr "خطأ أجاكس"
 
 #. TRANS: E-mail subject when a command has completed.
-#: lib/channel.php:233 lib/mailhandler.php:143
+#: lib/channel.php:177 lib/mailhandler.php:143
 msgid "Command complete"
 msgstr "اكتمل الأمر"
 
 #. TRANS: E-mail subject when a command has failed.
-#: lib/channel.php:244
+#: lib/channel.php:188
 msgid "Command failed"
 msgstr "فشل الأمر"
 
@@ -7910,7 +7971,7 @@ msgstr "الاسم الكامل: %s"
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a location.
-#: lib/command.php:446 lib/mail.php:270
+#: lib/command.php:446 lib/mail.php:275
 #, php-format
 msgid "Location: %s"
 msgstr "الموقع: %s"
@@ -7918,7 +7979,7 @@ msgstr "الموقع: %s"
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a homepage.
-#: lib/command.php:450 lib/mail.php:274
+#: lib/command.php:450 lib/mail.php:279
 #, php-format
 msgid "Homepage: %s"
 msgstr "الصفحه الرئيسية: %s"
@@ -8173,113 +8234,102 @@ msgid ""
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:162
+#: lib/common.php:36
 #, fuzzy
 msgid "No configuration file found."
 msgstr "لا رمز تأكيد."
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:165
+#: lib/common.php:39
 msgid "I looked for configuration files in the following places:"
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:168
+#: lib/common.php:42
 msgid "You may wish to run the installer to fix this."
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:172
+#: lib/common.php:46
 msgid "Go to the installer."
 msgstr "اذهب إلى المُثبّت."
 
-#. TRANS: Menu item for Instant Messaging settings.
-#: lib/connectsettingsaction.php:106
-#, fuzzy
-msgctxt "MENU"
-msgid "IM"
-msgstr "محادثه فورية"
-
-#. TRANS: Tooltip for Instant Messaging menu item.
-#: lib/connectsettingsaction.php:108
-msgid "Updates by instant messenger (IM)"
-msgstr ""
-
-#. TRANS: Menu item for Short Message Service settings.
-#: lib/connectsettingsaction.php:113
-#, fuzzy
-msgctxt "MENU"
-msgid "SMS"
-msgstr "رسائل قصيرة"
-
-#. TRANS: Tooltip for Short Message Service menu item.
-#: lib/connectsettingsaction.php:115
-msgid "Updates by SMS"
-msgstr ""
-
-#. TRANS: Menu item for OuAth connection settings.
-#: lib/connectsettingsaction.php:120
-#, fuzzy
-msgctxt "MENU"
-msgid "Connections"
-msgstr "كونيكشونات (Connections)"
-
-#. TRANS: Tooltip for connected applications (Connections through OAuth) menu item.
-#: lib/connectsettingsaction.php:122
-#, fuzzy
-msgid "Authorized connected applications"
-msgstr "OAuth applications"
-
 #: lib/dberroraction.php:59
 msgid "Database error"
 msgstr "خطأ قاعده بيانات"
 
+#. TRANS: Description of form for deleting a user.
+#: lib/deleteuserform.php:75
+msgid "Delete this user"
+msgstr "احذف هذا المستخدم"
+
+#: lib/designform.php:114
+#, fuzzy
+msgid "Change design"
+msgstr "احفظ التصميم"
+
+#. TRANS: Fieldset legend on profile design page to change profile page colours.
+#: lib/designform.php:131
+msgid "Change colours"
+msgstr "تغيير الألوان"
+
+#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
+#: lib/designform.php:138
+msgid "Use defaults"
+msgstr "استخدم المبدئيات"
+
+#. TRANS: Title for button on profile design page to reset all colour settings to default.
+#: lib/designform.php:140
+msgid "Restore default designs"
+msgstr "استعد التصميمات المبدئية"
+
+#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
+#: lib/designform.php:148
+msgid "Reset back to default"
+msgstr "ارجع إلى المبدئي"
+
 #. TRANS: Label in form on profile design page.
 #. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
-#: lib/designsettings.php:108
+#: lib/designform.php:158
 msgid "Upload file"
 msgstr "ارفع ملفًا"
 
 #. TRANS: Instructions for form on profile design page.
-#: lib/designsettings.php:113
+#: lib/designform.php:163
+#, fuzzy
 msgid ""
-"You can upload your personal background image. The maximum file size is 2MB."
+"You can upload your personal background image. The maximum file size is 2Mb."
 msgstr "تستطيع رفع صورتك الشخصيه. أقصى حجم للملف هو 2 م.ب."
 
 #. TRANS: Radio button on profile design page that will enable use of the uploaded profile image.
-#: lib/designsettings.php:139
+#: lib/designform.php:194
 #, fuzzy
 msgctxt "RADIO"
 msgid "On"
 msgstr "مكّن"
 
 #. TRANS: Radio button on profile design page that will disable use of the uploaded profile image.
-#: lib/designsettings.php:156
+#: lib/designform.php:211
 #, fuzzy
 msgctxt "RADIO"
 msgid "Off"
 msgstr "عطّل"
 
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: lib/designsettings.php:175
-msgid "Change colours"
-msgstr "تغيير الألوان"
-
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: lib/designsettings.php:257
-msgid "Use defaults"
-msgstr "استخدم المبدئيات"
+#. TRANS: Title for button on profile design page to save settings.
+#: lib/designform.php:322
+msgid "Save design"
+msgstr "احفظ التصميم"
 
 #. TRANS: Error message displayed if design settings could not be saved.
 #. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
-#: lib/designsettings.php:405 lib/designsettings.php:427
+#: lib/designsettings.php:216 lib/designsettings.php:238
 msgid "Couldn't update your design."
 msgstr "تعذّر تحديث تصميمك."
 
 #. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
-#: lib/designsettings.php:433
+#: lib/designsettings.php:244
 msgid "Design defaults restored."
 msgstr "استعيدت مبدئيات التصميم."
 
@@ -8349,27 +8399,23 @@ msgstr ""
 msgid "Feeds"
 msgstr ""
 
-#: lib/galleryaction.php:121
-msgid "Filter tags"
-msgstr "رشّح الوسوم"
-
-#: lib/galleryaction.php:131
+#: lib/galleryaction.php:128
 msgid "All"
 msgstr "الكل"
 
-#: lib/galleryaction.php:139
+#: lib/galleryaction.php:136
 msgid "Select tag to filter"
 msgstr "اختر وسمًا لترشيحه"
 
-#: lib/galleryaction.php:140
+#: lib/galleryaction.php:137
 msgid "Tag"
 msgstr "الوسم"
 
-#: lib/galleryaction.php:141
+#: lib/galleryaction.php:138
 msgid "Choose a tag to narrow list"
 msgstr ""
 
-#: lib/galleryaction.php:143
+#: lib/galleryaction.php:140
 msgid "Go"
 msgstr "اذهب"
 
@@ -8465,6 +8511,13 @@ msgctxt "TOOLTIP"
 msgid "%s blocked users"
 msgstr ""
 
+#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
+#: lib/groupnav.php:117
+#, fuzzy
+msgctxt "MENU"
+msgid "Admin"
+msgstr "إداري"
+
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
 #: lib/groupnav.php:120
@@ -8589,40 +8642,64 @@ msgstr[3] ""
 msgstr[4] ""
 msgstr[5] ""
 
-#: lib/jabber.php:387
+#: lib/implugin.php:262
 #, php-format
-msgid "[%s]"
-msgstr "[%s]"
+msgid ""
+"User \"%s\" on %s has said that your %s screenname belongs to them. If "
+"that's true, you can confirm by clicking on this URL: %s . (If you cannot "
+"click it, copy-and-paste it into the address bar of your browser). If that "
+"user isn't you, or if you didn't request this confirmation, just ignore this "
+"message."
+msgstr ""
 
-#: lib/jabber.php:567
+#: lib/implugin.php:349
 #, php-format
 msgid "Unknown inbox source %d."
 msgstr "مصدر الـinbox مش معروف %d."
 
+#: lib/implugin.php:485
+#, fuzzy, php-format
+msgid "Message too long - maximum is %1$d characters, you sent %2$d."
+msgstr "هذا الملف كبير جدًا. إن أقصى حجم للملفات هو %d."
+
 #: lib/leaveform.php:114
 msgid "Leave"
 msgstr "غادر"
 
+#. TRANS: Menu item for logging in to the StatusNet site.
+#: lib/logingroupnav.php:77
+#, fuzzy
+msgctxt "MENU"
+msgid "Login"
+msgstr "لُج"
+
 #. TRANS: Title for menu item for logging in to the StatusNet site.
 #: lib/logingroupnav.php:79
 #, fuzzy
 msgid "Login with a username and password"
 msgstr "اسم مستخدم أو كلمه سر غير صالحه."
 
+#. TRANS: Menu item for registering with the StatusNet site.
+#: lib/logingroupnav.php:85
+#, fuzzy
+msgctxt "MENU"
+msgid "Register"
+msgstr "سجّل"
+
 #. TRANS: Title for menu item for registering with the StatusNet site.
 #: lib/logingroupnav.php:87
 msgid "Sign up for a new account"
 msgstr ""
 
 #. TRANS: Subject for address confirmation email.
-#: lib/mail.php:168
+#: lib/mail.php:172
 msgid "Email address confirmation"
 msgstr "تأكيد عنوان البريد الإلكتروني"
 
 #. TRANS: Body for address confirmation email.
 #. TRANS: %1$s is the addressed user's nickname, %2$s is the StatusNet sitename,
 #. TRANS: %3$s is the URL to confirm at.
-#: lib/mail.php:173
+#: lib/mail.php:177
 #, php-format
 msgid ""
 "Hey, %1$s.\n"
@@ -8641,14 +8718,14 @@ msgstr ""
 
 #. TRANS: Subject of new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
-#: lib/mail.php:238
+#: lib/mail.php:243
 #, fuzzy, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "هؤلاء هم الأشخاص الذين يستمعون إلى إشعاراتك."
 
 #. TRANS: This is a paragraph in a new-subscriber e-mail.
 #. TRANS: %s is a URL where the subscriber can be reported as abusive.
-#: lib/mail.php:245
+#: lib/mail.php:250
 #, php-format
 msgid ""
 "If you believe this account is being used abusively, you can block them from "
@@ -8660,7 +8737,7 @@ msgstr ""
 #. TRANS: %3$s is the subscriber's profile URL, %4$s is the subscriber's location (or empty)
 #. TRANS: %5$s is the subscriber's homepage URL (or empty), %6%s is the subscriber's bio (or empty)
 #. TRANS: %7$s is a link to the addressed user's e-mail settings.
-#: lib/mail.php:255
+#: lib/mail.php:260
 #, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -8677,14 +8754,14 @@ msgstr ""
 
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is biographical information.
-#: lib/mail.php:278
+#: lib/mail.php:283
 #, php-format
 msgid "Bio: %s"
 msgstr "عن نفسك: %s"
 
 #. TRANS: Subject of notification mail for new posting email address.
 #. TRANS: %s is the StatusNet sitename.
-#: lib/mail.php:307
+#: lib/mail.php:312
 #, fuzzy, php-format
 msgid "New email address for posting to %s"
 msgstr "أنشئ عنوان بريد إلكترونى لترسل إليه؛ ألغِ القديم."
@@ -8692,7 +8769,7 @@ msgstr "أنشئ عنوان بريد إلكترونى لترسل إليه؛ أل
 #. TRANS: Body of notification mail for new posting email address.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is the e-mail address to send
 #. TRANS: to to post by e-mail, %3$s is a URL to more instructions.
-#: lib/mail.php:313
+#: lib/mail.php:318
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -8707,27 +8784,27 @@ msgstr ""
 
 #. TRANS: Subject line for SMS-by-email notification messages.
 #. TRANS: %s is the posting user's nickname.
-#: lib/mail.php:434
+#: lib/mail.php:439
 #, php-format
 msgid "%s status"
 msgstr "حاله %s"
 
 #. TRANS: Subject line for SMS-by-email address confirmation message.
-#: lib/mail.php:460
+#: lib/mail.php:465
 #, fuzzy
 msgid "SMS confirmation"
 msgstr "لا رمز تأكيد."
 
 #. TRANS: Main body heading for SMS-by-email address confirmation message.
 #. TRANS: %s is the addressed user's nickname.
-#: lib/mail.php:464
+#: lib/mail.php:469
 #, php-format
 msgid "%s: confirm you own this phone number with this code:"
 msgstr ""
 
 #. TRANS: Subject for 'nudge' notification email.
 #. TRANS: %s is the nudging user.
-#: lib/mail.php:485
+#: lib/mail.php:490
 #, php-format
 msgid "You have been nudged by %s"
 msgstr ""
@@ -8735,7 +8812,7 @@ msgstr ""
 #. TRANS: Body for 'nudge' notification email.
 #. TRANS: %1$s is the nuding user's long name, $2$s is the nudging user's nickname,
 #. TRANS: %3$s is a URL to post notices at, %4$s is the StatusNet sitename.
-#: lib/mail.php:492
+#: lib/mail.php:497
 #, php-format
 msgid ""
 "%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -8753,7 +8830,7 @@ msgstr ""
 
 #. TRANS: Subject for direct-message notification email.
 #. TRANS: %s is the sending user's nickname.
-#: lib/mail.php:539
+#: lib/mail.php:544
 #, php-format
 msgid "New private message from %s"
 msgstr "رساله خاصه جديده من %s"
@@ -8762,7 +8839,7 @@ msgstr "رساله خاصه جديده من %s"
 #. TRANS: %1$s is the sending user's long name, %2$s is the sending user's nickname,
 #. TRANS: %3$s is the message content, %4$s a URL to the message,
 #. TRANS: %5$s is the StatusNet sitename.
-#: lib/mail.php:547
+#: lib/mail.php:552
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -8783,7 +8860,7 @@ msgstr ""
 
 #. TRANS: Subject for favorite notification e-mail.
 #. TRANS: %1$s is the adding user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:599
+#: lib/mail.php:604
 #, fuzzy, php-format
 msgid "%1$s (@%2$s) added your notice as a favorite"
 msgstr "أرسل لى بريدًا إلكرتونيًا عندما يضيف أحدهم إشعارى مفضله."
@@ -8793,7 +8870,7 @@ msgstr "أرسل لى بريدًا إلكرتونيًا عندما يضيف أح
 #. TRANS: %3$s is a URL to the faved notice, %4$s is the faved notice text,
 #. TRANS: %5$s is a URL to all faves of the adding user, %6$s is the StatusNet sitename,
 #. TRANS: %7$s is the adding user's nickname.
-#: lib/mail.php:606
+#: lib/mail.php:611
 #, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -8815,7 +8892,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:664
+#: lib/mail.php:669
 #, php-format
 msgid ""
 "The full conversation can be read here:\n"
@@ -8825,7 +8902,7 @@ msgstr ""
 
 #. TRANS: E-mail subject for notice notification.
 #. TRANS: %1$s is the sending user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:672
+#: lib/mail.php:677
 #, php-format
 msgid "%1$s (@%2$s) sent a notice to your attention"
 msgstr ""
@@ -8836,7 +8913,7 @@ msgstr ""
 #. TRANS: %5$s is a URL to the full conversion if it exists (otherwise empty),
 #. TRANS: %6$s is a URL to reply to the notice, %7$s is a URL to all @-replied for the addressed user,
 #. TRANS: %8$s is a URL to the addressed user's e-mail settings, %9$s is the sender's nickname.
-#: lib/mail.php:680
+#: lib/mail.php:685
 #, php-format
 msgid ""
 "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -8955,11 +9032,7 @@ msgstr "غير مشترك!"
 msgid "To"
 msgstr "إلى"
 
-#: lib/messageform.php:166 lib/noticeform.php:186
-msgid "Available characters"
-msgstr "المحارف المتوفرة"
-
-#: lib/messageform.php:185 lib/noticeform.php:237
+#: lib/messageform.php:184 lib/noticeform.php:236
 #, fuzzy
 msgctxt "Send button for sending notice"
 msgid "Send"
@@ -8970,15 +9043,10 @@ msgstr "أرسل"
 msgid "Messages"
 msgstr "رسالة"
 
-#: lib/messagelistitem.php:123 lib/noticelist.php:522
+#: lib/messagelistitem.php:123 lib/noticelist.php:527
 msgid "from"
 msgstr "من"
 
-#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:165
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr ""
-
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 #: lib/nickname.php:178
 msgid "Nickname cannot be empty."
@@ -9005,78 +9073,82 @@ msgstr "أرسل إشعارًا"
 msgid "What's up, %s?"
 msgstr "ما الأخبار يا %s؟"
 
-#: lib/noticeform.php:194
+#: lib/noticeform.php:193
 msgid "Attach"
 msgstr "أرفق"
 
-#: lib/noticeform.php:198
+#: lib/noticeform.php:197
 msgid "Attach a file"
 msgstr "أرفق ملفًا"
 
-#: lib/noticeform.php:213
+#: lib/noticeform.php:212
 msgid "Share my location"
 msgstr "اعمل مشاركه لمكانى"
 
-#: lib/noticeform.php:216
+#: lib/noticeform.php:215
 msgid "Do not share my location"
 msgstr "ما تعملش مشاركه لمكانى"
 
-#: lib/noticeform.php:217
+#: lib/noticeform.php:216
 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
 "try again later"
 msgstr ""
 
 #. TRANS: Used in coordinates as abbreviation of north
-#: lib/noticelist.php:452
+#: lib/noticelist.php:457
 msgid "N"
 msgstr "ش"
 
 #. TRANS: Used in coordinates as abbreviation of south
-#: lib/noticelist.php:454
+#: lib/noticelist.php:459
 msgid "S"
 msgstr "ج"
 
 #. TRANS: Used in coordinates as abbreviation of east
-#: lib/noticelist.php:456
+#: lib/noticelist.php:461
 msgid "E"
 msgstr "ر"
 
 #. TRANS: Used in coordinates as abbreviation of west
-#: lib/noticelist.php:458
+#: lib/noticelist.php:463
 msgid "W"
 msgstr "غ"
 
-#: lib/noticelist.php:460
+#: lib/noticelist.php:465
 #, php-format
 msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgstr ""
 
-#: lib/noticelist.php:469
+#: lib/noticelist.php:474
 msgid "at"
 msgstr "في"
 
-#: lib/noticelist.php:518
+#: lib/noticelist.php:523
 msgid "web"
 msgstr ""
 
-#: lib/noticelist.php:584
+#: lib/noticelist.php:589
 msgid "in context"
 msgstr "فى السياق"
 
-#: lib/noticelist.php:619
+#: lib/noticelist.php:624
 msgid "Repeated by"
 msgstr "متكرر من"
 
-#: lib/noticelist.php:646
+#: lib/noticelist.php:651
 msgid "Reply to this notice"
 msgstr "رُد على هذا الإشعار"
 
-#: lib/noticelist.php:647
+#: lib/noticelist.php:652
 msgid "Reply"
 msgstr "رُد"
 
-#: lib/noticelist.php:691
+#: lib/noticelist.php:678
+msgid "Delete this notice"
+msgstr "احذف هذا الإشعار"
+
+#: lib/noticelist.php:696
 msgid "Notice repeated"
 msgstr "الإشعار مكرر"
 
@@ -9114,48 +9186,31 @@ msgstr ""
 msgid "Couldn't insert new subscription."
 msgstr "تعذّر إدراج اشتراك جديد."
 
-#. TRANS: Personal group navigation menu option when logged in for viewing @-replies.
-#: lib/personalgroupnav.php:107
+#: lib/personalgroupnav.php:104
 #, fuzzy
-msgctxt "MENU"
 msgid "Replies"
 msgstr "الردود"
 
-#. TRANS: Personal group navigation menu option when logged in for seeing own profile.
-#: lib/personalgroupnav.php:114
+#: lib/personalgroupnav.php:109
 #, fuzzy
-msgctxt "MENU"
-msgid "Profile"
-msgstr "الملف الشخصي"
-
-#. TRANS: Personal group navigation menu option when logged in for viewing own favourited notices.
-#: lib/personalgroupnav.php:120
-#, fuzzy
-msgctxt "MENU"
 msgid "Favorites"
 msgstr "المفضلات"
 
-#. TRANS: Personal group navigation menu option when logged in for viewing recieved personal messages.
-#: lib/personalgroupnav.php:133
+#: lib/personalgroupnav.php:120
 #, fuzzy
-msgctxt "MENU"
 msgid "Inbox"
 msgstr "صندوق الوارد"
 
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing recieved personal messages.
-#: lib/personalgroupnav.php:135
+#: lib/personalgroupnav.php:121
 msgid "Your incoming messages"
 msgstr "رسائلك الواردة"
 
-#. TRANS: Personal group navigation menu option when logged in for viewing senet personal messages.
-#: lib/personalgroupnav.php:140
+#: lib/personalgroupnav.php:125
 #, fuzzy
-msgctxt "MENU"
 msgid "Outbox"
 msgstr "صندوق الصادر"
 
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing senet personal messages.
-#: lib/personalgroupnav.php:142
+#: lib/personalgroupnav.php:126
 msgid "Your sent messages"
 msgstr "رسائلك المُرسلة"
 
@@ -9170,9 +9225,26 @@ msgstr "ليس للمستخدم إشعار أخير"
 msgid "Unknown"
 msgstr "مش معروف"
 
+#. TRANS: Plugin admin panel controls
+#: lib/plugindisableform.php:90
+msgctxt "plugin"
+msgid "Disable"
+msgstr ""
+
+#. TRANS: Plugin admin panel controls
+#: lib/pluginenableform.php:112
+msgctxt "plugin"
+msgid "Enable"
+msgstr ""
+
+#: lib/pluginlist.php:196
+msgctxt "plugin-description"
+msgid "(Plugin descriptions unavailable when disabled.)"
+msgstr ""
+
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:82
+#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:88
 msgid "Subscriptions"
 msgstr "الاشتراكات"
 
@@ -9183,7 +9255,7 @@ msgstr "جميع الاشتراكات"
 
 #. TRANS: H2 text for user subscriber statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:90
+#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:96
 msgid "Subscribers"
 msgstr "المشتركون"
 
@@ -9205,7 +9277,7 @@ msgstr "عضو منذ"
 #. TRANS: Label for user statistics.
 #. TRANS: H2 text for user group membership statistics.
 #: lib/profileaction.php:239 lib/profileaction.php:290
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:104
 msgid "Groups"
 msgstr "مجموعات"
 
@@ -9225,10 +9297,6 @@ msgstr "كل المجموعات"
 msgid "Unimplemented method."
 msgstr ""
 
-#: lib/publicgroupnav.php:78
-msgid "Public"
-msgstr "عام"
-
 #: lib/publicgroupnav.php:82
 msgid "User groups"
 msgstr "مجموعات المستخدمين"
@@ -9267,7 +9335,7 @@ msgid "Revoke the \"%s\" role from this user"
 msgstr "امنع هذا المستخدم من هذه المجموعة"
 
 #. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:974
+#: lib/router.php:1001
 #, fuzzy
 msgid "Page not found."
 msgstr "الـ API method مش موجوده."
@@ -9298,11 +9366,6 @@ msgctxt "BUTTON"
 msgid "Search"
 msgstr ""
 
-#. TRANS: Definition list item with instructions on how to get (better) search results.
-#: lib/searchaction.php:170
-msgid "Search help"
-msgstr "ابحث فى المساعدة"
-
 #: lib/searchgroupnav.php:80
 msgid "People"
 msgstr "أشخاص"
@@ -9327,6 +9390,52 @@ msgstr "قسم غير مُعنون"
 msgid "More..."
 msgstr "المزيد..."
 
+#: lib/settingsnav.php:78
+msgid "Change your profile settings"
+msgstr "غيّر إعدادات ملفك الشخصي"
+
+#: lib/settingsnav.php:83
+msgid "Upload an avatar"
+msgstr "ارفع أفتارًا"
+
+#: lib/settingsnav.php:88
+msgid "Change your password"
+msgstr "غير كلمه سرّك"
+
+#: lib/settingsnav.php:93
+msgid "Change email handling"
+msgstr "غير أسلوب التعامل مع البريد الإلكتروني"
+
+#: lib/settingsnav.php:98
+msgid "Design your profile"
+msgstr "صمّم ملفك الشخصي"
+
+#: lib/settingsnav.php:102
+msgid "URL"
+msgstr "مسار"
+
+#: lib/settingsnav.php:103
+msgid "URL shorteners"
+msgstr ""
+
+#: lib/settingsnav.php:111
+msgid "Updates by instant messenger (IM)"
+msgstr ""
+
+#: lib/settingsnav.php:118
+msgid "Updates by SMS"
+msgstr ""
+
+#: lib/settingsnav.php:123
+#, fuzzy
+msgid "Connections"
+msgstr "كونيكشونات (Connections)"
+
+#: lib/settingsnav.php:124
+#, fuzzy
+msgid "Authorized connected applications"
+msgstr "OAuth applications"
+
 #: lib/silenceform.php:67
 msgid "Silence"
 msgstr "أسكت"
@@ -9335,30 +9444,34 @@ msgstr "أسكت"
 msgid "Silence this user"
 msgstr "أسكت هذا المستخدم"
 
-#: lib/subgroupnav.php:83
+#: lib/subgroupnav.php:89
 #, php-format
 msgid "People %s subscribes to"
 msgstr "الأشخاص الذين اشترك بهم %s"
 
-#: lib/subgroupnav.php:91
+#: lib/subgroupnav.php:97
 #, php-format
 msgid "People subscribed to %s"
 msgstr "الأشخاص المشتركون ب%s"
 
-#: lib/subgroupnav.php:99
+#: lib/subgroupnav.php:105
 #, php-format
 msgid "Groups %s is a member of"
 msgstr "المجموعات التى %s عضو فيها"
 
-#: lib/subgroupnav.php:105
+#: lib/subgroupnav.php:111
 msgid "Invite"
 msgstr "ادعُ"
 
-#: lib/subgroupnav.php:106
+#: lib/subgroupnav.php:112
 #, php-format
 msgid "Invite friends and colleagues to join you on %s"
 msgstr ""
 
+#: lib/subscribeform.php:115 lib/subscribeform.php:139
+msgid "Subscribe to this user"
+msgstr "اشترك بهذا المستخدم"
+
 #: lib/subscriberspeopleselftagcloudsection.php:48
 #: lib/subscriptionspeopleselftagcloudsection.php:48
 msgid "People Tagcloud as self-tagged"
@@ -9433,6 +9546,17 @@ msgstr ""
 msgid "Error opening theme archive."
 msgstr "خطأ أثناء منع الحجب."
 
+#: lib/threadednoticelist.php:270
+#, php-format
+msgid "Show all %d comment"
+msgid_plural "Show all %d comments"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+msgstr[5] ""
+
 #: lib/topposterssection.php:74
 msgid "Top posters"
 msgstr "أعلى المرسلين"
@@ -9476,78 +9600,82 @@ msgstr "ألغِ الاشتراك"
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "ليس للمستخدم ملف شخصى."
 
-#. TRANS: Link text for changeing the avatar of the logged in user.
-#: lib/userprofile.php:121
+#: lib/userprofile.php:116
 msgid "Edit Avatar"
 msgstr "عدّل الأفتار"
 
 #. TRANS: H2 for user actions in a profile.
 #. TRANS: H2 for entity actions in a profile.
-#: lib/userprofile.php:245 lib/userprofile.php:261
+#: lib/userprofile.php:216 lib/userprofile.php:232
 msgid "User actions"
 msgstr "تصرفات المستخدم"
 
 #. TRANS: Text shown in user profile of not yet compeltely deleted users.
-#: lib/userprofile.php:249
+#: lib/userprofile.php:220
 msgid "User deletion in progress..."
 msgstr ""
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:277
+#: lib/userprofile.php:248
 msgid "Edit profile settings"
 msgstr "عدّل إعدادات الملف الشخصي"
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:279
+#: lib/userprofile.php:250
 msgid "Edit"
 msgstr "عدّل"
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:303
+#: lib/userprofile.php:274
 msgid "Send a direct message to this user"
 msgstr "أرسل رساله مباشره إلى هذا المستخدم"
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:305
+#: lib/userprofile.php:276
 msgid "Message"
 msgstr "رسالة"
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:347
+#: lib/userprofile.php:318
 msgid "Moderate"
 msgstr ""
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:386
+#: lib/userprofile.php:357
 #, fuzzy
 msgid "User role"
 msgstr "ملف المستخدم الشخصي"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:389
+#: lib/userprofile.php:360
 #, fuzzy
 msgctxt "role"
 msgid "Administrator"
 msgstr "الإداريون"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:391
+#: lib/userprofile.php:362
 msgctxt "role"
 msgid "Moderator"
 msgstr ""
 
+#: lib/util.php:321
+#, fuzzy
+msgid "Not allowed to log in."
+msgstr "لست والجًا."
+
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1306
+#: lib/util.php:1337
 msgid "a few seconds ago"
 msgstr "قبل لحظات قليلة"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1309
+#: lib/util.php:1340
 msgid "about a minute ago"
 msgstr "قبل دقيقه تقريبًا"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1313
+#: lib/util.php:1344
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
@@ -9559,12 +9687,12 @@ msgstr[4] ""
 msgstr[5] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1316
+#: lib/util.php:1347
 msgid "about an hour ago"
 msgstr "قبل ساعه تقريبًا"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1320
+#: lib/util.php:1351
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
@@ -9576,12 +9704,12 @@ msgstr[4] ""
 msgstr[5] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1323
+#: lib/util.php:1354
 msgid "about a day ago"
 msgstr "قبل يوم تقريبا"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1327
+#: lib/util.php:1358
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
@@ -9593,12 +9721,12 @@ msgstr[4] ""
 msgstr[5] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1330
+#: lib/util.php:1361
 msgid "about a month ago"
 msgstr "قبل شهر تقريبًا"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1334
+#: lib/util.php:1365
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
@@ -9610,7 +9738,7 @@ msgstr[4] ""
 msgstr[5] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1337
+#: lib/util.php:1368
 msgid "about a year ago"
 msgstr "قبل سنه تقريبًا"
 
@@ -9621,25 +9749,6 @@ msgstr "قبل سنه تقريبًا"
 msgid "%s is not a valid color! Use 3 or 6 hex characters."
 msgstr "%s ليس لونًا صحيحًا!"
 
-#. TRANS: %s is the URL to the StatusNet site's Instant Messaging settings.
-#: lib/xmppmanager.php:287
-#, php-format
-msgid "Unknown user. Go to %s to add your address to your account"
-msgstr ""
-
-#. TRANS: Response to XMPP source when it sent too long a message.
-#. TRANS: %1$d the maximum number of allowed characters (used for plural), %2$d is the sent number.
-#: lib/xmppmanager.php:406
-#, fuzzy, php-format
-msgid "Message too long. Maximum is %1$d character, you sent %2$d."
-msgid_plural "Message too long. Maximum is %1$d characters, you sent %2$d."
-msgstr[0] "هذا الملف كبير جدًا. إن أقصى حجم للملفات هو %d."
-msgstr[1] "هذا الملف كبير جدًا. إن أقصى حجم للملفات هو %d."
-msgstr[2] "هذا الملف كبير جدًا. إن أقصى حجم للملفات هو %d."
-msgstr[3] "هذا الملف كبير جدًا. إن أقصى حجم للملفات هو %d."
-msgstr[4] "هذا الملف كبير جدًا. إن أقصى حجم للملفات هو %d."
-msgstr[5] "هذا الملف كبير جدًا. إن أقصى حجم للملفات هو %d."
-
 #. TRANS: Exception.
 #: lib/xrd.php:63
 #, fuzzy
@@ -9658,57 +9767,168 @@ msgid "Getting backup from file '%s'."
 msgstr ""
 
 #, fuzzy
-#~ msgid "Block this user."
-#~ msgstr "امنع هذا المستخدم"
+#~ msgid "Could not generate feed for group - %s"
+#~ msgstr "تعذر تحديث المجموعه."
 
 #, fuzzy
-#~ msgid "Delete this notice."
-#~ msgstr "احذف هذا الإشعار"
+#~ msgid "Current confirmed Jabber/Google Talk address."
+#~ msgstr "عنوان البريد الإلكترونى المُؤكد الحالى."
 
 #, fuzzy
-#~ msgid "Delete this user."
-#~ msgstr "احذف هذا المستخدم"
+#~ msgid "Send me notices through Jabber/Google Talk."
+#~ msgstr "أرسل لى إشعارات بالاشتراكات الجديده عبر البريد الإلكترونى."
 
 #, fuzzy
-#~ msgid "Restore default designs."
-#~ msgstr "استعد التصميمات المبدئية"
+#~ msgid "Publish a MicroID for my Jabber/Google Talk address."
+#~ msgstr "هذا ليس عنوان بريدك الإلكترونى."
+
+#~ msgid "No Jabber ID."
+#~ msgstr "لا هويه جابر."
 
 #, fuzzy
-#~ msgid "Reset back to default."
-#~ msgstr "ارجع إلى المبدئي"
+#~ msgid "Not a valid Jabber ID."
+#~ msgstr "ليست هويه جابر صالحة"
 
 #, fuzzy
-#~ msgid "Save design."
-#~ msgstr "احفظ التصميم"
+#~ msgid "That is already your Jabber ID."
+#~ msgstr "هذه ليست هويتك فى جابر."
+
+#~ msgid "That is not your Jabber ID."
+#~ msgstr "هذه ليست هويتك فى جابر."
+
+#~ msgid "Other settings"
+#~ msgstr "تظبيطات تانيه"
+
+#~ msgid "Tag cloud"
+#~ msgstr "سحابه الوسوم"
+
+#~ msgid "Authorize URL"
+#~ msgstr "اسمح للURL"
+
+#~ msgid "Jabber"
+#~ msgstr "جابر"
+
+#~ msgid "Photo"
+#~ msgstr "صورة"
+
+#~ msgid "Other options"
+#~ msgstr "خيارات أخرى"
+
+#~ msgid "Other"
+#~ msgstr "أخرى"
 
 #, fuzzy
-#~ msgid "Disfavor favorite."
-#~ msgstr "ألغِ تفضيل المفضلة"
+#~ msgid "Primary site navigation"
+#~ msgstr "ضبط الموقع الأساسي"
 
 #, fuzzy
-#~ msgid "\"%s\" not found."
-#~ msgstr "الـ API method مش موجوده."
+#~ msgctxt "TOOLTIP"
+#~ msgid "Personal profile and friends timeline"
+#~ msgstr "الملف الشخصى ومسار الأصدقاء الزمني"
 
 #, fuzzy
-#~ msgid "Notice %s not found."
-#~ msgstr "الـ API method مش موجوده."
+#~ msgctxt "MENU"
+#~ msgid "Personal"
+#~ msgstr "شخصية"
 
 #, fuzzy
-#~ msgid "Attachment %s not found."
-#~ msgstr "لم يُعثر على المستخدم المستلم."
+#~ msgctxt "TOOLTIP"
+#~ msgid "Change your email, avatar, password, profile"
+#~ msgstr "غير كلمه سرّك"
+
+#~ msgid "Account"
+#~ msgstr "الحساب"
 
 #, fuzzy
-#~ msgid "Invalid tag: \"%s\"."
-#~ msgstr "وسم غير صالح: \"%s\""
+#~ msgctxt "TOOLTIP"
+#~ msgid "Connect to services"
+#~ msgstr "كونيكشونات (Connections)"
+
+#~ msgid "Connect"
+#~ msgstr "اتصل"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Change site configuration"
+#~ msgstr "ضبط الموقع الأساسي"
 
 #, fuzzy
-#~ msgid "Password saved"
-#~ msgstr "حُفظت كلمه السر."
+#~ msgctxt "MENU"
+#~ msgid "Invite"
+#~ msgstr "ادعُ"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Create an account"
+#~ msgstr "أنشئ مجموعه جديدة"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Help me!"
+#~ msgstr "مساعدة"
 
 #, fuzzy
-#~ msgid "Subscribe to this user."
-#~ msgstr "اشترك بهذا المستخدم"
+#~ msgctxt "MENU"
+#~ msgid "Help"
+#~ msgstr "مساعدة"
 
 #, fuzzy
-#~ msgid "Not allowed to log in."
-#~ msgstr "لست والجًا."
+#~ msgctxt "TOOLTIP"
+#~ msgid "Search for people or text"
+#~ msgstr "ابحث عن أشخاص أو نص"
+
+#~ msgid "Local views"
+#~ msgstr "المشاهدات المحلية"
+
+#~ msgid "Page notice"
+#~ msgstr "إشعار الصفحة"
+
+#, fuzzy
+#~ msgid "Secondary site navigation"
+#~ msgstr "ضبط الموقع الأساسي"
+
+#, fuzzy
+#~ msgid "StatusNet software license"
+#~ msgstr "رخصه محتوى الموقع"
+
+#~ msgid "Site content license"
+#~ msgstr "رخصه محتوى الموقع"
+
+#, fuzzy
+#~ msgid "Pagination"
+#~ msgstr "المنظمه"
+
+#~ msgid "Author"
+#~ msgstr "المؤلف"
+
+#~ msgid "Provider"
+#~ msgstr "المزود"
+
+#, fuzzy
+#~ msgctxt "MENU"
+#~ msgid "SMS"
+#~ msgstr "رسائل قصيرة"
+
+#~ msgid "Filter tags"
+#~ msgstr "رشّح الوسوم"
+
+#~ msgid "[%s]"
+#~ msgstr "[%s]"
+
+#~ msgid "Available characters"
+#~ msgstr "المحارف المتوفرة"
+
+#, fuzzy
+#~ msgctxt "MENU"
+#~ msgid "Profile"
+#~ msgstr "الملف الشخصي"
+
+#~ msgid "Search help"
+#~ msgstr "ابحث فى المساعدة"
+
+#, fuzzy
+#~ msgid "Message too long. Maximum is %1$d character, you sent %2$d."
+#~ msgid_plural "Message too long. Maximum is %1$d characters, you sent %2$d."
+#~ msgstr[0] "هذا الملف كبير جدًا. إن أقصى حجم للملفات هو %d."
+#~ msgstr[1] "هذا الملف كبير جدًا. إن أقصى حجم للملفات هو %d."
+#~ msgstr[2] "هذا الملف كبير جدًا. إن أقصى حجم للملفات هو %d."
+#~ msgstr[3] "هذا الملف كبير جدًا. إن أقصى حجم للملفات هو %d."
+#~ msgstr[4] "هذا الملف كبير جدًا. إن أقصى حجم للملفات هو %d."
+#~ msgstr[5] "هذا الملف كبير جدًا. إن أقصى حجم للملفات هو %d."
diff --git a/locale/bg/LC_MESSAGES/statusnet.po b/locale/bg/LC_MESSAGES/statusnet.po
index 5076133331..8694f56413 100644
--- a/locale/bg/LC_MESSAGES/statusnet.po
+++ b/locale/bg/LC_MESSAGES/statusnet.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 15:58+0000\n"
-"PO-Revision-Date: 2011-03-03 16:00:11+0000\n"
+"POT-Creation-Date: 2011-03-03 17:23+0000\n"
+"PO-Revision-Date: 2011-03-03 17:25:41+0000\n"
 "Language-Team: Bulgarian <http://translatewiki.net/wiki/Portal:bg>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -78,23 +78,23 @@ msgstr "Запазване настройките за достъп"
 #. TRANS: Tooltip for button to save access settings in site admin panel.
 #. TRANS: Button text for saving theme settings.
 #. TRANS: Button label to save e-mail preferences.
-#. TRANS: Button label to save Instant Messaging preferences.
-#. TRANS: Button text for saving "Other settings" in profile.
+#. TRANS: Button label to save IM preferences.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
 #. TRANS: Button text for saving site notice in admin panel.
 #. TRANS: Button label to save SMS preferences.
 #. TRANS: Save button for settings for a profile in a subscriptions list.
+#. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
 #. TRANS: Button text on profile design page to save settings.
 #: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
-#: actions/emailsettings.php:250 actions/imsettings.php:183
-#: actions/othersettings.php:136 actions/pathsadminpanel.php:512
-#: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
-#: actions/smssettings.php:205 actions/subscriptions.php:259
+#: actions/emailsettings.php:251 actions/imsettings.php:199
+#: actions/pathsadminpanel.php:512 actions/profilesettings.php:198
+#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:204
+#: actions/subscriptions.php:261 actions/urlsettings.php:152
 #: actions/useradminpanel.php:298 lib/applicationeditform.php:355
-#: lib/designsettings.php:270 lib/groupeditform.php:201
+#: lib/designform.php:320 lib/groupeditform.php:201
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Запазване"
@@ -133,7 +133,11 @@ msgstr "Няма такака страница."
 #. 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 use "one time password login" without using an existing user.
+#. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
+#. TRANS: Client error displayed trying to find a user by ID for a non-existing ID.
+#. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when calling a profile action without specifying a user.
 #: actions/all.php:80 actions/allrss.php:69
@@ -145,19 +149,19 @@ msgstr "Няма такака страница."
 #: actions/apidirectmessage.php:75 actions/apidirectmessagenew.php:72
 #: actions/apigroupcreate.php:111 actions/apigroupismember.php:89
 #: actions/apigroupjoin.php:98 actions/apigroupleave.php:98
-#: actions/apigrouplist.php:70 actions/apistatusesupdate.php:230
-#: actions/apisubscriptions.php:85 actions/apitimelinefavorites.php:70
-#: actions/apitimelinefriends.php:173 actions/apitimelinehome.php:78
-#: actions/apitimelinementions.php:77 actions/apitimelineuser.php:79
-#: actions/avatarbynickname.php:79 actions/favoritesrss.php:72
-#: actions/foaf.php:42 actions/foaf.php:61 actions/hcard.php:67
-#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
-#: actions/remotesubscribe.php:144 actions/remotesubscribe.php:153
-#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
-#: actions/showfavorites.php:106 actions/userbyid.php:74
-#: actions/usergroups.php:93 actions/userrss.php:40 actions/userxrd.php:59
-#: actions/xrds.php:71 lib/command.php:509 lib/galleryaction.php:59
-#: lib/mailbox.php:80 lib/profileaction.php:77
+#: actions/apigrouplist.php:70 actions/apigroupprofileupdate.php:108
+#: actions/apistatusesupdate.php:230 actions/apisubscriptions.php:85
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:173
+#: actions/apitimelinehome.php:78 actions/apitimelinementions.php:77
+#: actions/apitimelineuser.php:79 actions/avatarbynickname.php:79
+#: actions/favoritesrss.php:72 actions/foaf.php:42 actions/foaf.php:61
+#: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116
+#: actions/otp.php:78 actions/remotesubscribe.php:144
+#: actions/remotesubscribe.php:153 actions/replies.php:73
+#: actions/repliesrss.php:38 actions/rsd.php:113 actions/showfavorites.php:106
+#: actions/userbyid.php:75 actions/usergroups.php:93 actions/userrss.php:40
+#: actions/userxrd.php:59 actions/xrds.php:71 lib/command.php:509
+#: lib/galleryaction.php:59 lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Няма такъв потребител"
 
@@ -171,10 +175,9 @@ msgstr "%1$s и приятели, страница %2$d"
 #. TRANS: H1 text for page. %s is a user nickname.
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Timeline title for user and friends. %s is a user nickname.
-#. TRANS: Tooltop for personal group navigation menu option when logged in for viewing timeline of self and friends.
 #: actions/all.php:94 actions/all.php:191 actions/allrss.php:117
 #: actions/apitimelinefriends.php:207 actions/apitimelinehome.php:113
-#: lib/personalgroupnav.php:102
+#: lib/personalgroupnav.php:100
 #, php-format
 msgid "%s and friends"
 msgstr "%s и приятели"
@@ -226,7 +229,7 @@ msgstr ""
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
 #. TRANS: Second sentence of empty message for anonymous users. %s is a user nickname.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:227
+#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:221
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -273,19 +276,20 @@ msgstr "Бележки от %1$s и приятели в %2$s."
 #: actions/apifavoritecreate.php:98 actions/apifavoritedestroy.php:98
 #: actions/apifriendshipscreate.php:99 actions/apifriendshipsdestroy.php:99
 #: actions/apifriendshipsshow.php:124 actions/apigroupcreate.php:138
-#: actions/apigroupismember.php:115 actions/apigroupjoin.php:160
-#: actions/apigroupleave.php:145 actions/apigrouplist.php:134
+#: actions/apigroupismember.php:115 actions/apigroupjoin.php:151
+#: actions/apigroupleave.php:141 actions/apigrouplist.php:134
 #: actions/apigrouplistall.php:120 actions/apigroupmembership.php:105
+#: actions/apigroupprofileupdate.php:100 actions/apigroupprofileupdate.php:213
 #: actions/apigroupshow.php:114 actions/apihelptest.php:84
 #: actions/apistatusesdestroy.php:101 actions/apistatusesretweets.php:110
 #: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:139
 #: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
-#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:268
-#: actions/apitimelinegroup.php:147 actions/apitimelinehome.php:173
-#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:239
-#: actions/apitimelineretweetedtome.php:118
-#: actions/apitimelineretweetsofme.php:150 actions/apitimelinetag.php:159
-#: actions/apitimelineuser.php:206 actions/apiusershow.php:100
+#: actions/apitimelinefavorites.php:182 actions/apitimelinefriends.php:276
+#: actions/apitimelinegroup.php:148 actions/apitimelinehome.php:181
+#: actions/apitimelinementions.php:182 actions/apitimelinepublic.php:247
+#: actions/apitimelineretweetedtome.php:147
+#: actions/apitimelineretweetsofme.php:147 actions/apitimelinetag.php:165
+#: actions/apitimelineuser.php:217 actions/apiusershow.php:100
 msgid "API method not found."
 msgstr "Не е открит методът в API."
 
@@ -300,8 +304,9 @@ msgstr "Не е открит методът в API."
 #: actions/apifavoritecreate.php:88 actions/apifavoritedestroy.php:88
 #: actions/apifriendshipscreate.php:89 actions/apifriendshipsdestroy.php:89
 #: actions/apigroupcreate.php:102 actions/apigroupjoin.php:89
-#: actions/apigroupleave.php:89 actions/apimediaupload.php:66
-#: actions/apistatusesretweet.php:63 actions/apistatusesupdate.php:194
+#: actions/apigroupleave.php:89 actions/apigroupprofileupdate.php:92
+#: actions/apimediaupload.php:66 actions/apistatusesretweet.php:63
+#: actions/apistatusesupdate.php:194
 msgid "This method requires a POST."
 msgstr "Този метод изисква заявка POST."
 
@@ -313,21 +318,16 @@ msgid ""
 msgstr ""
 
 #. TRANS: Server error displayed when a user's delivery device cannot be updated.
-#. TRANS: Server error displayed when a user update to the database fails in the contact address confirmation action.
 #. TRANS: Server error thrown on database error updating e-mail preferences.
 #. TRANS: Server error thrown on database error removing a registered e-mail address.
-#. TRANS: Server error thrown on database error updating Instant Messaging preferences.
-#. TRANS: Server error thrown on database error removing a registered Instant Messaging address.
-#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
 #. TRANS: Server error thrown when user profile settings could not be updated.
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
-#: actions/apiaccountupdatedeliverydevice.php:130
-#: actions/confirmaddress.php:118 actions/emailsettings.php:352
-#: actions/emailsettings.php:498 actions/imsettings.php:276
-#: actions/imsettings.php:432 actions/othersettings.php:186
-#: actions/profilesettings.php:322 actions/smssettings.php:301
-#: actions/smssettings.php:454
+#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
+#: actions/apiaccountupdatedeliverydevice.php:136
+#: actions/emailsettings.php:353 actions/emailsettings.php:499
+#: actions/profilesettings.php:323 actions/smssettings.php:300
+#: actions/smssettings.php:453 actions/urlsettings.php:211
 msgid "Could not update user."
 msgstr "Грешка при обновяване на потребителя."
 
@@ -353,7 +353,7 @@ msgstr "Потребителят няма профил."
 
 #. TRANS: Server error displayed if a user profile could not be saved.
 #. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:418
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:419
 msgid "Could not save profile."
 msgstr "Грешка при запазване на профила."
 
@@ -365,7 +365,7 @@ msgstr "Грешка при запазване на профила."
 #: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
 #: actions/designadminpanel.php:120 actions/editapplication.php:121
 #: actions/newapplication.php:102 actions/newnotice.php:95
-#: lib/designsettings.php:298
+#: lib/designsettings.php:110
 #, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s byte) due to its "
@@ -386,8 +386,8 @@ msgstr[1] ""
 #: actions/apiaccountupdateprofilecolors.php:160
 #: actions/apiaccountupdateprofilecolors.php:171
 #: actions/groupdesignsettings.php:285 actions/groupdesignsettings.php:296
-#: actions/userdesignsettings.php:201 actions/userdesignsettings.php:211
-#: actions/userdesignsettings.php:253 actions/userdesignsettings.php:263
+#: actions/userdesignsettings.php:218 actions/userdesignsettings.php:228
+#: actions/userdesignsettings.php:270 actions/userdesignsettings.php:280
 #, fuzzy
 msgid "Unable to save your design settings."
 msgstr "Грешка при записване настройките за Twitter"
@@ -396,7 +396,7 @@ msgstr "Грешка при записване настройките за Twitt
 #. TRANS: Client error displayed when a database error occurs updating profile colours.
 #: actions/apiaccountupdateprofilebackgroundimage.php:191
 #: actions/apiaccountupdateprofilecolors.php:139
-#: actions/userdesignsettings.php:179
+#: actions/userdesignsettings.php:196
 #, fuzzy
 msgid "Could not update your design."
 msgstr "Грешка при обновяване на потребителя."
@@ -506,7 +506,7 @@ msgstr "Получателят не е открит"
 #. TRANS: Client error displayed trying to direct message another user who's not a friend (403).
 #: actions/apidirectmessagenew.php:144
 #, fuzzy
-msgid "Can't send direct messages to users who aren't your friend."
+msgid "Cannot send direct messages to users who aren't your friend."
 msgstr ""
 "Не може да изпращате преки съобщения до хора, които не са в списъка ви с "
 "приятели."
@@ -593,9 +593,9 @@ msgstr "Целевият потребител не беше открит."
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:156 actions/editgroup.php:191
-#: actions/newgroup.php:137 actions/profilesettings.php:273
-#: actions/register.php:214
+#: actions/apigroupcreate.php:156 actions/apigroupprofileupdate.php:255
+#: actions/editgroup.php:191 actions/newgroup.php:137
+#: actions/profilesettings.php:274 actions/register.php:199
 msgid "Nickname already in use. Try another one."
 msgstr "Опитайте друг псевдоним, този вече е зает."
 
@@ -603,9 +603,9 @@ msgstr "Опитайте друг псевдоним, този вече е за
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:164 actions/editgroup.php:195
-#: actions/newgroup.php:141 actions/profilesettings.php:243
-#: actions/register.php:216
+#: actions/apigroupcreate.php:164 actions/apigroupprofileupdate.php:259
+#: actions/editgroup.php:195 actions/newgroup.php:141
+#: actions/profilesettings.php:244 actions/register.php:201
 msgid "Not a valid nickname."
 msgstr "Неправилен псевдоним."
 
@@ -615,10 +615,10 @@ msgstr "Неправилен псевдоним."
 #. TRANS: Validation error shown when providing an invalid homepage URL in the "New application" form.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:181 actions/editapplication.php:235
-#: actions/editgroup.php:202 actions/newapplication.php:221
-#: actions/newgroup.php:148 actions/profilesettings.php:248
-#: actions/register.php:223
+#: actions/apigroupcreate.php:181 actions/apigroupprofileupdate.php:277
+#: actions/editapplication.php:235 actions/editgroup.php:202
+#: actions/newapplication.php:221 actions/newgroup.php:148
+#: actions/profilesettings.php:249 actions/register.php:208
 msgid "Homepage is not a valid URL."
 msgstr "Адресът на личната страница не е правилен URL."
 
@@ -627,8 +627,8 @@ msgstr "Адресът на личната страница не е правил
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:191 actions/editgroup.php:206
-#: actions/newgroup.php:152 actions/profilesettings.php:252
-#: actions/register.php:226
+#: actions/newgroup.php:152 actions/profilesettings.php:253
+#: actions/register.php:211
 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "Пълното име е твърде дълго (макс. 255 знака)"
@@ -656,8 +656,8 @@ msgstr[1] "Описанието е твърде дълго (до %d символ
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:215 actions/editgroup.php:218
-#: actions/newgroup.php:164 actions/profilesettings.php:265
-#: actions/register.php:235
+#: actions/newgroup.php:164 actions/profilesettings.php:266
+#: actions/register.php:220
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
 msgstr "Името на местоположението е твърде дълго (макс. 255 знака)."
@@ -687,15 +687,16 @@ msgstr "Неправилен псевдоним: \"%s\""
 #. TRANS: %s is the alias that is already in use.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error. %s is the already used alias.
-#: actions/apigroupcreate.php:264 actions/editgroup.php:246
-#: actions/newgroup.php:193
+#: actions/apigroupcreate.php:264 actions/apigroupprofileupdate.php:351
+#: actions/editgroup.php:246 actions/newgroup.php:193
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "Псевдонимът \"%s\" вече е зает. Опитайте друг."
 
 #. TRANS: Client error displayed when trying to use an alias during group creation that is the same as the group's nickname.
 #. TRANS: Group edit form validation error.
-#: actions/apigroupcreate.php:278 actions/editgroup.php:253
+#: actions/apigroupcreate.php:278 actions/apigroupprofileupdate.php:359
+#: actions/editgroup.php:253
 msgid "Alias can't be the same as nickname."
 msgstr ""
 
@@ -707,7 +708,8 @@ msgstr ""
 #. TRANS: Client error displayed requesting most recent notices to a group for a non-existing group.
 #: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
 #: actions/apigroupleave.php:104 actions/apigroupmembership.php:71
-#: actions/apigroupshow.php:81 actions/apitimelinegroup.php:89
+#: actions/apigroupprofileupdate.php:113 actions/apigroupshow.php:81
+#: actions/apitimelinegroup.php:89
 msgid "Group not found."
 msgstr "Групата не е открита."
 
@@ -726,13 +728,11 @@ msgstr "Вече членувате в тази група."
 msgid "You have been blocked from that group by the admin."
 msgstr "Не сте блокирали този потребител."
 
-#. TRANS: Server error displayed when joining a group fails.
-#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
 #. 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.
 #. TRANS: Message given having failed to add a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:362
+#: actions/apigroupjoin.php:136 actions/joingroup.php:139 lib/command.php:362
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "Грешка при обновяване на групата."
@@ -742,8 +742,6 @@ msgstr "Грешка при обновяване на групата."
 msgid "You are not a member of this group."
 msgstr "Не членувате в тази група."
 
-#. TRANS: Server error displayed when leaving a group fails.
-#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
 #. TRANS: Server error displayed when leaving a group failed in the database.
 #. TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
 #. TRANS: Message given having failed to remove a user from a group.
@@ -779,6 +777,64 @@ msgstr "Групи на %s"
 msgid "groups on %s"
 msgstr "групи в %s"
 
+#. TRANS: Client error displayed trying to edit a group while not being a group admin.
+#. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
+#. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
+#: actions/apigroupprofileupdate.php:118 actions/editgroup.php:110
+#: actions/editgroup.php:176 actions/groupdesignsettings.php:109
+#: actions/grouplogo.php:111
+msgid "You must be an admin to edit the group."
+msgstr "За да редактирате група, трябва да сте влезли."
+
+#. TRANS: Server error displayed when editing a group fails.
+#: actions/apigroupprofileupdate.php:171 actions/editgroup.php:274
+msgid "Could not update group."
+msgstr "Грешка при обновяване на групата."
+
+#. TRANS: Server error displayed when group aliases could not be added.
+#. TRANS: Server exception thrown when creating group aliases failed.
+#: actions/apigroupprofileupdate.php:194 actions/editgroup.php:281
+#: classes/User_group.php:540
+#, fuzzy
+msgid "Could not create aliases."
+msgstr "Грешка при отбелязване като любима."
+
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: actions/apigroupprofileupdate.php:249 lib/nickname.php:165
+msgid "Nickname must have only lowercase letters and numbers and no spaces."
+msgstr ""
+"Псевдонимът може да съдържа само малки букви, числа и никакво разстояние "
+"между тях."
+
+#: actions/apigroupprofileupdate.php:286
+#, fuzzy
+msgid "Full name is too long (max 255 chars)."
+msgstr "Пълното име е твърде дълго (макс. 255 знака)"
+
+#: actions/apigroupprofileupdate.php:296
+#, fuzzy, php-format
+msgid "description is too long (max %d chars)."
+msgstr "Описанието е твърде дълго (до %d символа)."
+
+#: actions/apigroupprofileupdate.php:307
+#, fuzzy
+msgid "Location is too long (max 255 chars)."
+msgstr "Името на местоположението е твърде дълго (макс. 255 знака)."
+
+#: actions/apigroupprofileupdate.php:326
+#, php-format
+msgid "Too many aliases! Maximum %d."
+msgstr ""
+
+#. TRANS: Group edit form validation error.
+#. TRANS: Group create form validation error.
+#. TRANS: %s is the invalid alias.
+#: actions/apigroupprofileupdate.php:342 actions/editgroup.php:241
+#: actions/newgroup.php:188
+#, php-format
+msgid "Invalid alias: \"%s\""
+msgstr "Неправилен псевдоним: \"%s\""
+
 #. TRANS: Client error displayed when uploading a media file has failed.
 #: actions/apimediaupload.php:101
 #, fuzzy
@@ -813,21 +869,22 @@ msgstr "Не сте абонирани за никого."
 #. TRANS: Form validation error message.
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
+#. TRANS: Client error displayed when the session token is not okay.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
 #: actions/deletenotice.php:177 actions/disfavor.php:75
-#: actions/emailsettings.php:291 actions/favor.php:75 actions/geocode.php:55
+#: actions/emailsettings.php:292 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:65 actions/grouplogo.php:321
-#: actions/groupunblock.php:65 actions/imsettings.php:224
-#: actions/invite.php:60 actions/login.php:137 actions/makeadmin.php:66
-#: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
-#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
-#: actions/othersettings.php:155 actions/passwordsettings.php:138
-#: actions/profilesettings.php:217 actions/recoverpassword.php:383
-#: actions/register.php:172 actions/remotesubscribe.php:76
-#: actions/repeat.php:82 actions/smssettings.php:250 actions/subedit.php:40
-#: actions/subscribe.php:86 actions/tagother.php:166
-#: actions/unsubscribe.php:69 actions/userauthorization.php:52
-#: lib/designsettings.php:310
+#: actions/groupunblock.php:65 actions/imsettings.php:241
+#: actions/invite.php:60 actions/makeadmin.php:66 actions/newmessage.php:135
+#: actions/newnotice.php:105 actions/nudge.php:80
+#: actions/oauthappssettings.php:162 actions/oauthconnectionssettings.php:135
+#: actions/passwordsettings.php:137 actions/pluginenable.php:87
+#: actions/profilesettings.php:218 actions/recoverpassword.php:383
+#: actions/register.php:157 actions/remotesubscribe.php:76
+#: actions/repeat.php:82 actions/smssettings.php:249 actions/subedit.php:40
+#: actions/subscribe.php:87 actions/tagother.php:145
+#: actions/unsubscribe.php:69 actions/urlsettings.php:171
+#: actions/userauthorization.php:53 lib/designsettings.php:122
 msgid "There was a problem with your session token. Try again, please."
 msgstr "Имаше проблем със сесията ви в сайта. Моля, опитайте отново!"
 
@@ -856,10 +913,10 @@ msgstr "Грешка в базата от данни — отговор при 
 #. TRANS: Unknown form validation error in design settings form.
 #: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
 #: actions/designadminpanel.php:100 actions/editapplication.php:144
-#: actions/emailsettings.php:310 actions/grouplogo.php:332
-#: actions/imsettings.php:239 actions/newapplication.php:124
-#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
-#: actions/smssettings.php:271 lib/designsettings.php:321
+#: actions/emailsettings.php:311 actions/grouplogo.php:332
+#: actions/imsettings.php:256 actions/newapplication.php:124
+#: actions/oauthconnectionssettings.php:144 actions/recoverpassword.php:46
+#: actions/smssettings.php:270 lib/designsettings.php:133
 msgid "Unexpected form submission."
 msgstr "Неочаквано изпращане на форма."
 
@@ -903,31 +960,26 @@ msgstr "Сметка"
 
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Field label in form for profile settings.
-#. TRANS: Label for group nickname (dt). Text hidden by default.
-#. TRANS: DT for nick name in a profile.
-#: actions/apioauthauthorize.php:459 actions/login.php:252
-#: actions/profilesettings.php:106 actions/register.php:432
-#: actions/showgroup.php:243 actions/tagother.php:94
+#: actions/apioauthauthorize.php:459 actions/login.php:225
+#: actions/profilesettings.php:107 actions/register.php:411
 #: actions/userauthorization.php:145 lib/groupeditform.php:145
-#: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "Псевдоним"
 
 #. TRANS: Field label on OAuth API authorisation form.
-#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:463 actions/login.php:255
-#: actions/register.php:436 lib/accountsettingsaction.php:120
+#: actions/apioauthauthorize.php:463 actions/login.php:228
+#: actions/register.php:415 lib/settingsnav.php:87
 msgid "Password"
 msgstr "Парола"
 
 #. TRANS: Button text that when clicked will cancel the process of allowing access to an account
 #. TRANS: by an external application.
 #. TRANS: Button label to cancel an e-mail address confirmation procedure.
-#. TRANS: Button label to cancel an Instant Messaging address confirmation procedure.
+#. TRANS: Button label to cancel an IM address confirmation procedure.
 #. TRANS: Button label to cancel a SMS address confirmation procedure.
 #. TRANS: Button label in the "Edit application" form.
-#: actions/apioauthauthorize.php:478 actions/emailsettings.php:124
-#: actions/imsettings.php:127 actions/smssettings.php:133
+#: actions/apioauthauthorize.php:478 actions/emailsettings.php:125
+#: actions/imsettings.php:136 actions/smssettings.php:132
 #: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Cancel"
@@ -1039,7 +1091,7 @@ msgstr "Не е открит методът в API."
 #. TRANS: %s is the requested output format.
 #: actions/apistatusesshow.php:144
 #, fuzzy, php-format
-msgid "Unsupported format: %s"
+msgid "Unsupported format: %s."
 msgstr "Неподдържан формат."
 
 #. TRANS: Client error displayed requesting a deleted status.
@@ -1121,13 +1173,6 @@ msgstr "Бележка на %1$s от %2$s"
 msgid "%1$s updates favorited by %2$s / %3$s."
 msgstr "%1$s реплики на съобщения от %2$s / %3$s."
 
-#. TRANS: Server error displayed when generating an Atom feed fails.
-#. TRANS: %s is the error.
-#: actions/apitimelinegroup.php:134
-#, fuzzy, php-format
-msgid "Could not generate feed for group - %s"
-msgstr "Грешка при обновяване на групата."
-
 #. TRANS: Title for timeline of most recent mentions of a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname.
 #: actions/apitimelinementions.php:115
@@ -1144,13 +1189,14 @@ msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr "%1$s реплики на съобщения от %2$s / %3$s."
 
 #. TRANS: Title for site timeline. %s is the StatusNet sitename.
+#. TRANS: Public RSS feed title. %s is the StatusNet site name.
 #: actions/apitimelinepublic.php:193 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "Общ поток на %s"
 
 #. TRANS: Subtitle for site timeline. %s is the StatusNet sitename.
-#: actions/apitimelinepublic.php:199 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:199
 #, php-format
 msgid "%s updates from everyone!"
 msgstr ""
@@ -1162,21 +1208,33 @@ msgid "Unimplemented."
 msgstr "Командата все още не се поддържа."
 
 #. TRANS: Title for Atom feed "repeated to me". %s is the user nickname.
-#: actions/apitimelineretweetedtome.php:108
+#: actions/apitimelineretweetedtome.php:96
 #, php-format
 msgid "Repeated to %s"
 msgstr "Повторено за %s"
 
+#: actions/apitimelineretweetedtome.php:98
+#, fuzzy, php-format
+msgid "%1$s notices that were to repeated to %2$s / %3$s."
+msgstr "%1$s реплики на съобщения от %2$s / %3$s."
+
 #. TRANS: Title of list of repeated notices of the logged in user.
 #. TRANS: %s is the nickname of the logged in user.
-#: actions/apitimelineretweetsofme.php:112
+#: actions/apitimelineretweetsofme.php:98
 #, php-format
 msgid "Repeats of %s"
 msgstr "Повторения на %s"
 
+#: actions/apitimelineretweetsofme.php:104
+#, fuzzy, php-format
+msgid "%1$s notices that %2$s / %3$s has repeated."
+msgstr "%s (@%s) отбеляза бележката ви като любима"
+
 #. TRANS: Title for timeline with lastest notices with a given tag.
 #. TRANS: %s is the tag.
-#: actions/apitimelinetag.php:101 actions/tag.php:67
+#. TRANS: Title for first page of notices with tags.
+#. TRANS: %s is the tag.
+#: actions/apitimelinetag.php:101 actions/tag.php:69
 #, php-format
 msgid "Notices tagged with %s"
 msgstr "Бележки с етикет %s"
@@ -1189,54 +1247,55 @@ msgid "Updates tagged with %1$s on %2$s!"
 msgstr "Бележки от %1$s в %2$s."
 
 #. TRANS: Client error displayed trying to add a notice to another user's timeline.
-#: actions/apitimelineuser.php:297
+#: actions/apitimelineuser.php:308
 #, fuzzy
 msgid "Only the user can add to their own timeline."
 msgstr "Само потребителят може да отваря собствената си кутия."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:304
+#: actions/apitimelineuser.php:315
 msgid "Only accept AtomPub for Atom feeds."
 msgstr ""
 
 #. TRANS: Client error displayed attempting to post an empty API notice.
-#: actions/apitimelineuser.php:311
+#: actions/apitimelineuser.php:322
 msgid "Atom post must not be empty."
 msgstr ""
 
 #. TRANS: Client error displayed attempting to post an API that is not well-formed XML.
-#: actions/apitimelineuser.php:317
+#: actions/apitimelineuser.php:328
 msgid "Atom post must be well-formed XML."
 msgstr ""
 
 #. TRANS: Client error displayed when not using an Atom entry.
-#: actions/apitimelineuser.php:323 actions/atompubfavoritefeed.php:228
+#: actions/apitimelineuser.php:334 actions/atompubfavoritefeed.php:228
 #: actions/atompubmembershipfeed.php:230
 #: actions/atompubsubscriptionfeed.php:236
 msgid "Atom post must be an Atom entry."
 msgstr ""
 
 #. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
-#: actions/apitimelineuser.php:335
+#: actions/apitimelineuser.php:345
 msgid "Can only handle POST activities."
 msgstr ""
 
 #. TRANS: Client error displayed when using an unsupported activity object type.
 #. TRANS: %s is the unsupported activity object type.
-#: actions/apitimelineuser.php:346
+#: actions/apitimelineuser.php:356
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
 #. TRANS: %d is the notice ID (number).
-#: actions/apitimelineuser.php:380
+#: actions/apitimelineuser.php:390
 #, fuzzy, php-format
 msgid "No content for notice %d."
 msgstr "Търсене в съдържанието на бележките"
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:408
+#. TRANS: %s is the notice URI.
+#: actions/apitimelineuser.php:419
 #, fuzzy, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "Не е открита бележка с такъв идентификатор."
@@ -1253,9 +1312,10 @@ msgstr "Не е открит методът в API."
 
 #. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
 #. TRANS: Client exception.
+#. TRANS: Client error displayed trying to subscribe to a non-existing profile.
 #: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
 #: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
-#: actions/subscribe.php:107
+#: actions/subscribe.php:110
 msgid "No such profile."
 msgstr "Няма такъв профил."
 
@@ -1402,7 +1462,7 @@ msgid "Not a member."
 msgstr "Всички членове"
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
-#: actions/atompubshowmembership.php:151
+#: actions/atompubshowmembership.php:150
 #, fuzzy
 msgid "Cannot delete someone else's membership."
 msgstr "Грешка при добавяне на нов абонамент."
@@ -1491,10 +1551,7 @@ msgid "Invalid size."
 msgstr "Неправилен размер."
 
 #. TRANS: Title for avatar upload page.
-#. TRANS: Label for group avatar (dt). Text hidden by default.
-#. TRANS: Link description in user account settings menu.
-#: actions/avatarsettings.php:66 actions/showgroup.php:227
-#: lib/accountsettingsaction.php:113
+#: actions/avatarsettings.php:66 lib/settingsnav.php:82
 msgid "Avatar"
 msgstr "Аватар"
 
@@ -1508,9 +1565,11 @@ msgstr ""
 
 #. TRANS: Server error displayed in avatar upload page when no matching profile can be found for a user.
 #. TRANS: Server error displayed coming across a request from a user without a profile.
+#. TRANS: Server error displayed when trying to authorise a remote subscription request
+#. TRANS: while the user has no profile.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
 #: actions/grouplogo.php:184 actions/remotesubscribe.php:190
-#: actions/userauthorization.php:72 actions/userrss.php:108
+#: actions/userauthorization.php:75 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr "Потребителят няма профил."
 
@@ -1568,10 +1627,10 @@ msgstr "Изрязване"
 msgid "No file uploaded."
 msgstr "Няма качен файл."
 
-#. TRANS: Avatar upload form unstruction after uploading a file.
+#. TRANS: Avatar upload form instruction after uploading a file.
 #: actions/avatarsettings.php:345
 #, fuzzy
-msgid "Pick a square area of the image to be your avatar"
+msgid "Pick a square area of the image to be your avatar."
 msgstr "Изберете квадратна област от изображението за аватар"
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
@@ -1597,7 +1656,7 @@ msgstr "Аватарът е изтрит."
 
 #. TRANS: Title for backup account page.
 #. TRANS: Option in profile settings to create a backup of the account of the currently logged in user.
-#: actions/backupaccount.php:61 actions/profilesettings.php:467
+#: actions/backupaccount.php:61 actions/profilesettings.php:468
 msgid "Backup account"
 msgstr ""
 
@@ -1631,7 +1690,7 @@ msgstr "Фон"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
 #: actions/backupaccount.php:254
-msgid "Backup your account"
+msgid "Backup your account."
 msgstr ""
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
@@ -1670,7 +1729,7 @@ msgstr "Не"
 #. TRANS: Submit button title for 'No' when blocking a user.
 #: actions/block.php:158
 #, fuzzy
-msgid "Do not block this user"
+msgid "Do not block this user."
 msgstr "Да не се блокира този потребител"
 
 #. TRANS: Button label on the user block form.
@@ -1687,9 +1746,9 @@ msgid "Yes"
 msgstr "Да"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#. TRANS: Description of the form to block a user.
-#: actions/block.php:165 lib/blockform.php:79
-msgid "Block this user"
+#: actions/block.php:165
+#, fuzzy
+msgid "Block this user."
 msgstr "Блокиране на потребителя"
 
 #. TRANS: Server error displayed when blocking a user fails.
@@ -1757,32 +1816,48 @@ msgstr "Кодът за потвърждение не е открит."
 msgid "That confirmation code is not for you!"
 msgstr "Този код за потвърждение не е за вас!"
 
-#. TRANS: Server error for a unknow address type %s, which can be 'email', 'jabber', or 'sms'.
-#: actions/confirmaddress.php:92
+#. TRANS: Server error for an unknown address type, which can be 'email', 'sms', or the name of an IM network (such as 'xmpp' or 'aim')
+#: actions/confirmaddress.php:94
 #, fuzzy, php-format
-msgid "Unrecognized address type %s."
+msgid "Unrecognized address type %s"
 msgstr "Неразпознат вид адрес %s"
 
 #. TRANS: Client error for an already confirmed email/jabber/sms address.
-#: actions/confirmaddress.php:97
+#: actions/confirmaddress.php:103 actions/confirmaddress.php:136
 msgid "That address has already been confirmed."
 msgstr "Този адрес е вече потвърден."
 
+#: actions/confirmaddress.php:121 actions/imsettings.php:444
+#: actions/userdesignsettings.php:306
+#, fuzzy
+msgid "Couldn't update user."
+msgstr "Грешка при обновяване на потребителя."
+
+#: actions/confirmaddress.php:144
+#, fuzzy
+msgid "Couldn't update user im preferences."
+msgstr "Грешка при обновяване записа на потребител."
+
+#: actions/confirmaddress.php:156
+#, fuzzy
+msgid "Couldn't insert user im preferences."
+msgstr "Грешка при добавяне на нов абонамент."
+
 #. TRANS: Server error displayed when an address confirmation code deletion from the
 #. TRANS: database fails in the contact address confirmation action.
-#: actions/confirmaddress.php:132
+#: actions/confirmaddress.php:169
 #, fuzzy
 msgid "Could not delete address confirmation."
 msgstr "Грешка при изтриване потвърждението по е-поща."
 
 #. TRANS: Title for the contact address confirmation action.
-#: actions/confirmaddress.php:150
+#: actions/confirmaddress.php:185
 msgid "Confirm address"
 msgstr "Потвърждаване на адрес"
 
 #. TRANS: Success message for the contact address confirmation action.
 #. TRANS: %s can be 'email', 'jabber', or 'sms'.
-#: actions/confirmaddress.php:166
+#: actions/confirmaddress.php:200
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "Адресът \"%s\" е потвърден за сметката ви."
@@ -1796,6 +1871,7 @@ msgstr "Разговор"
 #. TRANS: Label for user statistics.
 #: actions/conversation.php:149 lib/noticelist.php:87
 #: lib/profileaction.php:246 lib/searchgroupnav.php:82
+#: lib/threadednoticelist.php:66
 msgid "Notices"
 msgstr "Бележки"
 
@@ -1831,7 +1907,7 @@ msgstr "Аватарът е изтрит."
 
 #. TRANS: Page title for page on which a user account can be deleted.
 #. TRANS: Option in profile settings to delete the account of the currently logged in user.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:475
+#: actions/deleteaccount.php:228 actions/profilesettings.php:476
 #, fuzzy
 msgid "Delete account"
 msgstr "Създаване на нова сметка"
@@ -1855,7 +1931,7 @@ msgstr ""
 #. TRANS: Field label for delete account confirmation entry.
 #. TRANS: Field label for password reset form where the password has to be typed again.
 #: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:262 actions/register.php:440
+#: actions/recoverpassword.php:262 actions/register.php:419
 msgid "Confirm"
 msgstr "Потвърждаване"
 
@@ -1885,14 +1961,14 @@ msgstr "Приложението не е открито."
 #. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
 #: actions/deleteapplication.php:79 actions/editapplication.php:78
-#: actions/showapplication.php:94
+#: actions/showapplication.php:90
 msgid "You are not the owner of this application."
 msgstr "Не сте собственик на това приложение."
 
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
-#: actions/newapplication.php:112 actions/showapplication.php:118
-#: lib/action.php:1425
+#: actions/newapplication.php:112 actions/showapplication.php:113
+#: lib/action.php:1391
 msgid "There was a problem with your session token."
 msgstr "Имаше проблем със сесията ви в сайта."
 
@@ -1913,13 +1989,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting an application.
 #: actions/deleteapplication.php:161
 #, fuzzy
-msgid "Do not delete this application"
+msgid "Do not delete this application."
 msgstr "Да не се изтрива приложението"
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
 #: actions/deleteapplication.php:167
 #, fuzzy
-msgid "Delete this application"
+msgid "Delete this application."
 msgstr "Изтриване на това приложение"
 
 #. TRANS: Client error when trying to delete group while not logged in.
@@ -1975,13 +2051,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting a group.
 #: actions/deletegroup.php:224
 #, fuzzy
-msgid "Do not delete this group"
+msgid "Do not delete this group."
 msgstr "Да не се изтрива бележката"
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
 #: actions/deletegroup.php:231
 #, fuzzy
-msgid "Delete this group"
+msgid "Delete this group."
 msgstr "Изтриване на този потребител"
 
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
@@ -1989,14 +2065,16 @@ msgstr "Изтриване на този потребител"
 #. TRANS: Client error displayed when trying to mark a notice as favorite without being logged in.
 #. TRANS: Client error displayed trying to block a user from a group while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
+#. TRANS: Client error displayed trying to log out when not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
+#. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
 #. TRANS: Client error displayed when trying to change user options while not logged in.
 #: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
-#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:69
+#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:70
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
-#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
-#: actions/tagother.php:33 actions/unsubscribe.php:52
+#: actions/nudge.php:63 actions/pluginenable.php:97 actions/subedit.php:33
+#: actions/subscribe.php:98 actions/tagother.php:33 actions/unsubscribe.php:52
 #: lib/adminpanelaction.php:71 lib/profileformaction.php:63
 #: lib/settingsaction.php:72
 msgid "Not logged in."
@@ -2023,12 +2101,13 @@ msgstr "Наистина ли искате да изтриете тази бел
 #. TRANS: Submit button title for 'No' when deleting a notice.
 #: actions/deletenotice.php:159
 #, fuzzy
-msgid "Do not delete this notice"
+msgid "Do not delete this notice."
 msgstr "Да не се изтрива бележката"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:166 lib/noticelist.php:673
-msgid "Delete this notice"
+#: actions/deletenotice.php:166
+#, fuzzy
+msgid "Delete this notice."
 msgstr "Изтриване на бележката"
 
 #. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
@@ -2063,18 +2142,17 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting a user.
 #: actions/deleteuser.php:158
 #, fuzzy
-msgid "Do not delete this user"
+msgid "Do not delete this user."
 msgstr "Да не се изтрива бележката"
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
-#. TRANS: Description of form for deleting a user.
-#: actions/deleteuser.php:165 lib/deleteuserform.php:75
-msgid "Delete this user"
+#: actions/deleteuser.php:165
+#, fuzzy
+msgid "Delete this user."
 msgstr "Изтриване на този потребител"
 
 #. TRANS: Message used as title for design settings for the site.
-#. TRANS: Link description in user account settings menu.
-#: actions/designadminpanel.php:60 lib/accountsettingsaction.php:134
+#: actions/designadminpanel.php:60 lib/settingsnav.php:97
 #, fuzzy
 msgid "Design"
 msgstr "Версия"
@@ -2148,8 +2226,7 @@ msgid "You can upload a custom StatusNet theme as a .ZIP archive."
 msgstr ""
 
 #. TRANS: Fieldset legend for theme background image.
-#. TRANS: Fieldset legend on profile design page.
-#: actions/designadminpanel.php:515 lib/designsettings.php:98
+#: actions/designadminpanel.php:515
 msgid "Change background image"
 msgstr "Смяна на изображението за фон"
 
@@ -2157,7 +2234,7 @@ msgstr "Смяна на изображението за фон"
 #. TRANS: Field label for background color selector.
 #. TRANS: Label on profile design page for setting a profile page background colour.
 #: actions/designadminpanel.php:525 actions/designadminpanel.php:609
-#: lib/designsettings.php:183
+#: lib/designform.php:238
 msgid "Background"
 msgstr "Фон"
 
@@ -2184,14 +2261,14 @@ msgstr "Изкл."
 #. TRANS: Form guide for turning background image on or off on theme designer page.
 #. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
 #. TRANS: use of the uploaded profile image.
-#: actions/designadminpanel.php:577 lib/designsettings.php:159
+#: actions/designadminpanel.php:577 lib/designform.php:214
 #, fuzzy
 msgid "Turn background image on or off."
 msgstr "Смяна на изображението за фон"
 
 #. TRANS: Checkbox label to title background image on theme designer page.
 #. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-#: actions/designadminpanel.php:583 lib/designsettings.php:165
+#: actions/designadminpanel.php:583 lib/designform.php:220
 #, fuzzy
 msgid "Tile background image"
 msgstr "Смяна на изображението за фон"
@@ -2204,25 +2281,25 @@ msgstr "Смяна на цветовете"
 
 #. TRANS: Field label for content color selector.
 #. TRANS: Label on profile design page for setting a profile page content colour.
-#: actions/designadminpanel.php:623 lib/designsettings.php:197
+#: actions/designadminpanel.php:623 lib/designform.php:252
 msgid "Content"
 msgstr "Съдържание"
 
 #. TRANS: Field label for sidebar color selector.
 #. TRANS: Label on profile design page for setting a profile page sidebar colour.
-#: actions/designadminpanel.php:637 lib/designsettings.php:211
+#: actions/designadminpanel.php:637 lib/designform.php:266
 msgid "Sidebar"
 msgstr "Страничен панел"
 
 #. TRANS: Field label for text color selector.
 #. TRANS: Label on profile design page for setting a profile page text colour.
-#: actions/designadminpanel.php:651 lib/designsettings.php:225
+#: actions/designadminpanel.php:651 lib/designform.php:280
 msgid "Text"
 msgstr "Текст"
 
 #. TRANS: Field label for link color selector.
 #. TRANS: Label on profile design page for setting a profile page links colour.
-#: actions/designadminpanel.php:665 lib/designsettings.php:239
+#: actions/designadminpanel.php:665 lib/designform.php:294
 msgid "Links"
 msgstr "Лиценз"
 
@@ -2243,22 +2320,20 @@ msgid "Use defaults"
 msgstr ""
 
 #. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: actions/designadminpanel.php:720 lib/designsettings.php:259
-msgid "Restore default designs"
-msgstr ""
+#: actions/designadminpanel.php:720
+#, fuzzy
+msgid "Restore default designs."
+msgstr "Грешка при записване настройките за Twitter"
 
 #. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: actions/designadminpanel.php:728 lib/designsettings.php:267
-msgid "Reset back to default"
+#: actions/designadminpanel.php:728
+msgid "Reset back to default."
 msgstr ""
 
 #. TRANS: Title for button for saving theme settings.
-#. TRANS: Title for button on profile design page to save settings.
-#: actions/designadminpanel.php:736 lib/designsettings.php:272
+#: actions/designadminpanel.php:736
 #, fuzzy
-msgid "Save design"
+msgid "Save design."
 msgstr "Запазване настройките на сайта"
 
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
@@ -2291,7 +2366,7 @@ msgid "You must be logged in to edit an application."
 msgstr "За да редактирате приложение, трябва да сте влезли."
 
 #. TRANS: Client error displayed trying to edit an application that does not exist.
-#: actions/editapplication.php:83 actions/showapplication.php:87
+#: actions/editapplication.php:83 actions/showapplication.php:83
 msgid "No such application."
 msgstr "Няма такова приложение."
 
@@ -2390,82 +2465,54 @@ msgstr "Редактиране на групата %s"
 msgid "You must be logged in to create a group."
 msgstr "За да създавате група, трябва да сте влезли."
 
-#. TRANS: Client error displayed trying to edit a group while not being a group admin.
-#. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
-#. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
-#: actions/editgroup.php:110 actions/editgroup.php:176
-#: actions/groupdesignsettings.php:109 actions/grouplogo.php:111
-msgid "You must be an admin to edit the group."
-msgstr "За да редактирате група, трябва да сте влезли."
-
 #. TRANS: Form instructions for group edit form.
 #: actions/editgroup.php:161
 #, fuzzy
 msgid "Use this form to edit the group."
 msgstr "Използвайте тази бланка за създаване на нова група."
 
-#. TRANS: Group edit form validation error.
-#. TRANS: Group create form validation error.
-#. TRANS: %s is the invalid alias.
-#: actions/editgroup.php:241 actions/newgroup.php:188
-#, php-format
-msgid "Invalid alias: \"%s\""
-msgstr "Неправилен псевдоним: \"%s\""
-
-#. TRANS: Server error displayed when editing a group fails.
-#: actions/editgroup.php:274
-msgid "Could not update group."
-msgstr "Грешка при обновяване на групата."
-
-#. TRANS: Server error displayed when group aliases could not be added.
-#. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/editgroup.php:281 classes/User_group.php:540
-#, fuzzy
-msgid "Could not create aliases."
-msgstr "Грешка при отбелязване като любима."
-
 #. TRANS: Group edit form success message.
 #: actions/editgroup.php:301
 msgid "Options saved."
 msgstr "Настройките са запазени."
 
 #. TRANS: Title for e-mail settings.
-#: actions/emailsettings.php:59
+#: actions/emailsettings.php:60
 msgid "Email settings"
 msgstr "Настройки на е-поща"
 
 #. TRANS: E-mail settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/emailsettings.php:73
+#: actions/emailsettings.php:74
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 msgstr "Управление на пощата, идваща от %%site.name%%."
 
 #. TRANS: Form legend for e-mail settings form.
 #. TRANS: Field label for e-mail address input in e-mail settings form.
-#: actions/emailsettings.php:103 actions/emailsettings.php:129
+#: actions/emailsettings.php:104 actions/emailsettings.php:130
 msgid "Email address"
 msgstr "Адрес на е-поща"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:109
+#: actions/emailsettings.php:110
 msgid "Current confirmed email address."
 msgstr "Текущ потвърден адрес на е-поща."
 
 #. TRANS: Button label to remove a confirmed e-mail address.
 #. TRANS: Button label for removing a set sender e-mail address to post notices from.
-#. TRANS: Button label to remove a confirmed Instant Messaging address.
+#. TRANS: Button label to remove a confirmed IM address.
 #. TRANS: Button label to remove a confirmed SMS address.
 #. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
-#: actions/emailsettings.php:112 actions/emailsettings.php:179
-#: actions/imsettings.php:112 actions/smssettings.php:120
-#: actions/smssettings.php:176
+#: actions/emailsettings.php:113 actions/emailsettings.php:180
+#: actions/imsettings.php:119 actions/smssettings.php:119
+#: actions/smssettings.php:175
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Премахване"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:119
+#: actions/emailsettings.php:120
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -2478,44 +2525,44 @@ msgstr ""
 #. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
 #. TRANS: Any other domain may be owned by a legitimate person or
 #. TRANS: organization.
-#: actions/emailsettings.php:136
+#: actions/emailsettings.php:137
 msgid "Email address, like \"UserName@example.org\""
 msgstr "Адрес на е-поща, като \"UserName@example.org\""
 
 #. TRANS: Button label for adding an e-mail address in e-mail settings form.
-#. TRANS: Button label for adding an Instant Messaging address in Instant Messaging settings form.
+#. TRANS: Button label for adding an IM address in IM settings form.
 #. TRANS: Button label for adding a SMS phone number in SMS settings form.
-#: actions/emailsettings.php:140 actions/imsettings.php:147
-#: actions/smssettings.php:158
+#: actions/emailsettings.php:141 actions/imsettings.php:147
+#: actions/smssettings.php:157
 msgctxt "BUTTON"
 msgid "Add"
 msgstr "Добавяне"
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:148 actions/smssettings.php:167
+#: actions/emailsettings.php:149 actions/smssettings.php:166
 msgid "Incoming email"
 msgstr "Входяща поща"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:154
+#: actions/emailsettings.php:155
 msgid "I want to post notices by email."
 msgstr "Искам да изпращам бележки по пощата."
 
 #. TRANS: Form instructions for incoming e-mail form in e-mail settings.
 #. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
-#: actions/emailsettings.php:176 actions/smssettings.php:174
+#: actions/emailsettings.php:177 actions/smssettings.php:173
 msgid "Send email to this address to post new notices."
 msgstr "Изпратете писмо до този адрес за публикуване като бележка."
 
 #. TRANS: Instructions for incoming e-mail address input form, when an address has already been assigned.
 #. TRANS: Instructions for incoming SMS e-mail address input form.
-#: actions/emailsettings.php:185 actions/smssettings.php:182
+#: actions/emailsettings.php:186 actions/smssettings.php:181
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr "Задаване на нова е-поща, от която да се публикува. Отменя предишната."
 
 #. TRANS: Instructions for incoming e-mail address input form.
-#: actions/emailsettings.php:189
+#: actions/emailsettings.php:190
 msgid ""
 "To send notices via email, we need to create a unique email address for you "
 "on this server:"
@@ -2523,91 +2570,91 @@ msgstr ""
 
 #. TRANS: Button label for adding an e-mail address to send notices from.
 #. TRANS: Button label for adding an SMS e-mail address to send notices from.
-#: actions/emailsettings.php:195 actions/smssettings.php:185
+#: actions/emailsettings.php:196 actions/smssettings.php:184
 #, fuzzy
 msgctxt "BUTTON"
 msgid "New"
 msgstr "Ново"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:204
+#: actions/emailsettings.php:205
 msgid "Email preferences"
 msgstr "Настройки на е-поща"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:212
+#: actions/emailsettings.php:213
 msgid "Send me notices of new subscriptions through email."
 msgstr "Изпращане на уведомления за нови абонаменти по пощата."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:218
+#: actions/emailsettings.php:219
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr "Изпращане на писмо при отбелязване на моя бележка като любима."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:225
+#: actions/emailsettings.php:226
 msgid "Send me email when someone sends me a private message."
 msgstr "Изпращане на писмо при ново лично съобщение."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:231
+#: actions/emailsettings.php:232
 #, fuzzy
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr "Изпращане на писмо при ново лично съобщение."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:237
+#: actions/emailsettings.php:238
 msgid "Allow friends to nudge me and send me an email."
 msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:243
+#: actions/emailsettings.php:244
 msgid "Publish a MicroID for my email address."
 msgstr "Публикуване на MicroID за адреса на е-пощата."
 
 #. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:361
+#: actions/emailsettings.php:362
 msgid "Email preferences saved."
 msgstr "Настройките на е-поща са запазени."
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:380
+#: actions/emailsettings.php:381
 msgid "No email address."
 msgstr "Не е въведена е-поща."
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:388
+#: actions/emailsettings.php:389
 #, fuzzy
 msgid "Cannot normalize that email address."
 msgstr "Грешка при нормализиране адреса на е-пощата"
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:393 actions/register.php:212
+#: actions/emailsettings.php:394 actions/register.php:197
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "Неправилен адрес на е-поща."
 
 #. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:397
+#: actions/emailsettings.php:398
 msgid "That is already your email address."
 msgstr "Това и сега е адресът на е-пощата ви."
 
 #. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:401
+#: actions/emailsettings.php:402
 msgid "That email address already belongs to another user."
 msgstr "Тази е-поща вече се използва от друг потребител."
 
 #. TRANS: Server error thrown on database error adding e-mail confirmation code.
 #. TRANS: Server error thrown on database error adding Instant Messaging confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:418 actions/imsettings.php:343
-#: actions/smssettings.php:365
+#: actions/emailsettings.php:419 actions/imsettings.php:362
+#: actions/smssettings.php:364
 #, fuzzy
 msgid "Could not insert confirmation code."
 msgstr "Не може да се вмъкне код за потвърждение."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:425
+#: actions/emailsettings.php:426
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
@@ -2619,60 +2666,63 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling Instant Messaging address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:445 actions/imsettings.php:377
-#: actions/smssettings.php:399
+#: actions/emailsettings.php:446 actions/imsettings.php:391
+#: actions/smssettings.php:398
 msgid "No pending confirmation to cancel."
 msgstr "Няма потвърждения, очакващи да бъдат отказани."
 
 #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:450
+#: actions/emailsettings.php:451
 #, fuzzy
 msgid "That is the wrong email address."
 msgstr "Грешен IM адрес."
 
 #. TRANS: Server error thrown on database error canceling e-mail address confirmation.
 #. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
-#: actions/emailsettings.php:459 actions/smssettings.php:413
+#: actions/emailsettings.php:460 actions/smssettings.php:412
 #, fuzzy
 msgid "Could not delete email confirmation."
 msgstr "Грешка при изтриване потвърждението по е-поща."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:464
+#: actions/emailsettings.php:465
 msgid "Email confirmation cancelled."
 msgstr "Няма потвърждения, очакващи да бъдат отказани."
 
 #. TRANS: Message given trying to remove an e-mail address that is not
 #. TRANS: registered for the active user.
-#: actions/emailsettings.php:483
+#: actions/emailsettings.php:484
 msgid "That is not your email address."
 msgstr "Това не е вашият адрес на е-поща."
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:504
+#: actions/emailsettings.php:505
 msgid "The email address was removed."
 msgstr "Входящият адрес на е-поща е премахнат."
 
 #. TRANS: Form validation error displayed when trying to remove an incoming e-mail address while no address has been set.
-#: actions/emailsettings.php:518 actions/smssettings.php:555
+#: actions/emailsettings.php:519 actions/smssettings.php:554
 msgid "No incoming email address."
 msgstr "Няма входящ адрес на е-поща."
 
 #. TRANS: Server error thrown on database error removing incoming e-mail address.
 #. TRANS: Server error thrown on database error adding incoming e-mail address.
-#: actions/emailsettings.php:530 actions/emailsettings.php:554
-#: actions/smssettings.php:565 actions/smssettings.php:588
+#. TRANS: Server error displayed when the user could not be updated in SMS settings.
+#: actions/emailsettings.php:531 actions/emailsettings.php:555
+#: actions/smssettings.php:565 actions/smssettings.php:590
 #, fuzzy
 msgid "Could not update user record."
 msgstr "Грешка при обновяване записа на потребител."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:534 actions/smssettings.php:568
+#. TRANS: Confirmation text after updating SMS settings.
+#: actions/emailsettings.php:535 actions/smssettings.php:569
 msgid "Incoming email address removed."
 msgstr "Входящият адрес на е-поща е премахнат."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:558 actions/smssettings.php:591
+#. TRANS: Confirmation text after updating SMS settings.
+#: actions/emailsettings.php:559 actions/smssettings.php:594
 msgid "New incoming email address added."
 msgstr "Добавен е нов входящ адрес на е-поща."
 
@@ -2684,7 +2734,7 @@ msgstr "Тази бележка вече е отбелязана като люб
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
 #: actions/favor.php:95
 #, fuzzy
-msgid "Disfavor favorite"
+msgid "Disfavor favorite."
 msgstr "Добавяне към любимите"
 
 #. TRANS: Page title for first page of favorited notices.
@@ -2731,9 +2781,8 @@ msgstr ""
 #. TRANS: %s is a user's nickname.
 #. TRANS: Title for first page of favourite notices of a user.
 #. TRANS: %s is the user for whom the favourite notices are displayed.
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing own favourited notices.
 #: actions/favoritesrss.php:111 actions/showfavorites.php:76
-#: lib/personalgroupnav.php:122
+#: lib/personalgroupnav.php:110
 #, php-format
 msgid "%s's favorite notices"
 msgstr "Любими бележки на %s"
@@ -2923,13 +2972,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
 #: actions/groupblock.php:191
 #, fuzzy
-msgid "Do not block this user from this group"
+msgid "Do not block this user from this group."
 msgstr "Да не се блокира този потребител"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
 #: actions/groupblock.php:198
 #, fuzzy
-msgid "Block this user from this group"
+msgid "Block this user from this group."
 msgstr "Разблокиране на потребителя от групата"
 
 #. TRANS: Server error displayed when trying to block a user from a group fails because of an application error.
@@ -2939,6 +2988,7 @@ msgid "Database error blocking user from group."
 msgstr "Разблокиране на потребителя от групата"
 
 #. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
+#. TRANS: Client error displayed trying to find a user by ID without providing an ID.
 #: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr "Липсва ID."
@@ -2968,7 +3018,7 @@ msgid "Unable to update your design settings."
 msgstr "Грешка при записване настройките за Twitter"
 
 #. TRANS: Form text to confirm saved group design settings.
-#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:222
+#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:239
 msgid "Design preferences saved."
 msgstr "Настройките на е-поща са запазени."
 
@@ -3033,7 +3083,7 @@ msgid "A list of the users in this group."
 msgstr "Списък с потребителите в тази група."
 
 #. TRANS: Indicator in group members list that this user is a group administrator.
-#: actions/groupmembers.php:190
+#: actions/groupmembers.php:190 lib/action.php:581
 msgid "Admin"
 msgstr "Настройки"
 
@@ -3122,8 +3172,10 @@ msgid "Group search"
 msgstr "Търсене на групи"
 
 #. TRANS: Text on page where groups can be searched if no results were found for a query.
-#: actions/groupsearch.php:82 actions/noticesearch.php:117
-#: actions/peoplesearch.php:83
+#. TRANS: Text for notice search results is the query had no results.
+#. TRANS: Message on the "People search" page where a query has no results.
+#: actions/groupsearch.php:82 actions/noticesearch.php:122
+#: actions/peoplesearch.php:87
 msgid "No results."
 msgstr "Няма резултати."
 
@@ -3157,166 +3209,169 @@ msgid "User is not blocked from group."
 msgstr "Потребителят вече е блокиран за групата."
 
 #. TRANS: Server error displayed when unblocking a user from a group fails because of an unknown error.
+#. TRANS: Server error displayed when removing a user block.
 #: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "Грешка при повтаряне на бележката."
 
 #. TRANS: Title for Instant Messaging settings.
-#: actions/imsettings.php:58
+#: actions/imsettings.php:56
 msgid "IM settings"
 msgstr "Настройки за SMS"
 
 #. 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.
-#: actions/imsettings.php:71
+#: actions/imsettings.php:69
 #, fuzzy, php-format
 msgid ""
-"You can send and receive notices through Jabber/Google Talk [instant "
-"messages](%%doc.im%%). Configure your address and settings below."
+"You can send and receive notices through instant messaging [instant messages]"
+"(%%doc.im%%). Configure your addresses and settings below."
 msgstr ""
 "Можете да получавате съобщения по Jabber/GTalk [instant messages](%%doc.im%"
 "%). Въведете адреса си в настройките по-долу."
 
-#. TRANS: Message given in the Instant Messaging settings if XMPP is not enabled on the site.
+#. TRANS: Message given in the IM settings if IM is not enabled on the site.
 #: actions/imsettings.php:90
 #, fuzzy
 msgid "IM is not available."
 msgstr "Страницата не е достъпна във вида медия, който приемате"
 
-#. TRANS: Form legend for Instant Messaging settings form.
-#. TRANS: Field label for Instant Messaging address input in Instant Messaging settings form.
-#: actions/imsettings.php:102 actions/imsettings.php:132
-msgid "IM address"
-msgstr "Адрес на е-поща"
+#: actions/imsettings.php:116
+#, fuzzy, php-format
+msgid "Current confirmed %s address."
+msgstr "Текущ потвърден адрес на е-поща."
 
-#: actions/imsettings.php:109
-#, fuzzy
-msgid "Current confirmed Jabber/Google Talk address."
-msgstr "Текущ потвърден Jabber/GTalk адрес."
-
-#. TRANS: Form note in Instant Messaging settings form.
-#. TRANS: %s is the Instant Messaging address set for the site.
-#: actions/imsettings.php:120
+#. TRANS: Form note in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:128
 #, fuzzy, php-format
 msgid ""
-"Awaiting confirmation on this address. Check your Jabber/Google Talk account "
-"for a message with further instructions. (Did you add %s to your buddy list?)"
+"Awaiting confirmation on this address. Check your %s account for a message "
+"with further instructions. (Did you add %s to your buddy list?)"
 msgstr ""
 "Oчаква се потвърждение на този адрес. Проверете акаунта си в Jabber/GTalk за "
 "съобщение с инструкции. (Добавихте ли %s в списъка си там?)"
 
-#. TRANS: IM address input field instructions in Instant Messaging settings form.
-#. TRANS: %s is the Instant Messaging address set for the site.
-#. TRANS: Do not translate "example.org". It is one of the domain names reserved for use in examples by
-#. TRANS: http://www.rfc-editor.org/rfc/rfc2606.txt. Any other domain may be owned by a legitimate
-#. TRANS: person or organization.
-#: actions/imsettings.php:139
-#, fuzzy, php-format
-msgid ""
-"Jabber or Google Talk address, like \"UserName@example.org\". First, make "
-"sure to add %s to your buddy list in your IM client or on Google Talk."
-msgstr ""
-"Jabber или GTalk адрес, като \"UserName@example.org\". Първо се уверете, че "
-"сте добавили %s в списъка си с приятели в IM или GTalk клиента си."
+#: actions/imsettings.php:140
+msgid "IM address"
+msgstr "Адрес на е-поща"
 
-#. TRANS: Form legend for Instant Messaging preferences form.
-#: actions/imsettings.php:154
-msgid "IM preferences"
+#: actions/imsettings.php:142
+#, php-format
+msgid "%s screenname."
+msgstr ""
+
+#. TRANS: Header for IM preferences form.
+#: actions/imsettings.php:163
+#, fuzzy
+msgid "IM Preferences"
 msgstr "Настройки на е-поща"
 
-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:159
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:174
 #, fuzzy
-msgid "Send me notices through Jabber/Google Talk."
-msgstr "Изпращане на бележките по Jabber/GTalk."
+msgid "Send me notices"
+msgstr "Изпращане на бележка"
 
-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:165
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:176
 #, fuzzy
-msgid "Post a notice when my Jabber/Google Talk status changes."
+msgid "Post a notice when my status changes."
 msgstr "Публикуване промяната на състоянието ми в Jabber/GTalk."
 
-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:171
-#, fuzzy
-msgid ""
-"Send me replies through Jabber/Google Talk from people I'm not subscribed to."
-msgstr "Изпращане по Jabber/GTalk на отговори от хора, "
-
-#. TRANS: Checkbox label in Instant Messaging preferences form.
+#. TRANS: Checkbox label in IM preferences form.
 #: actions/imsettings.php:178
 #, fuzzy
-msgid "Publish a MicroID for my Jabber/Google Talk address."
-msgstr "Публикуване на MicroID за адреса в Jabber/GTalk."
+msgid "Send me replies from people I'm not subscribed to."
+msgstr "Изпращане по Jabber/GTalk на отговори от хора, "
 
-#. TRANS: Confirmation message for successful Instant Messaging preferences save.
-#: actions/imsettings.php:283 actions/othersettings.php:192
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:181
+#, fuzzy
+msgid "Publish a MicroID"
+msgstr "Публикуване на MicroID за адреса на е-пощата."
+
+#. TRANS: Server error thrown on database error updating IM preferences.
+#: actions/imsettings.php:291
+#, fuzzy
+msgid "Couldn't update IM preferences."
+msgstr "Грешка при обновяване на потребителя."
+
+#. TRANS: Confirmation message for successful IM preferences save.
+#. TRANS: Confirmation message after saving preferences.
+#: actions/imsettings.php:298 actions/urlsettings.php:244
 msgid "Preferences saved."
 msgstr "Настройките са запазени."
 
-#. TRANS: Message given saving Instant Messaging address without having provided one.
-#: actions/imsettings.php:304
-msgid "No Jabber ID."
-msgstr "Няма Jabber ID."
-
-#. TRANS: Message given saving Instant Messaging address that cannot be normalised.
-#: actions/imsettings.php:312
+#. TRANS: Message given saving IM address without having provided one.
+#: actions/imsettings.php:320
 #, fuzzy
-msgid "Cannot normalize that Jabber ID."
+msgid "No screenname."
+msgstr "Няма псевдоним."
+
+#: actions/imsettings.php:325
+#, fuzzy
+msgid "No transport."
+msgstr "Липсва бележка."
+
+#. TRANS: Message given saving IM address that cannot be normalised.
+#: actions/imsettings.php:333
+#, fuzzy
+msgid "Cannot normalize that screenname"
 msgstr "Грешка при нормализация на този Jabber ID"
 
-#. TRANS: Message given saving Instant Messaging address that not valid.
-#: actions/imsettings.php:317
+#. TRANS: Message given saving IM address that not valid.
+#: actions/imsettings.php:340
 #, fuzzy
-msgid "Not a valid Jabber ID."
-msgstr "Неправилен Jabber ID"
+msgid "Not a valid screenname"
+msgstr "Неправилен псевдоним."
 
-#. TRANS: Message given saving Instant Messaging address that is already set.
-#: actions/imsettings.php:321
-msgid "That is already your Jabber ID."
-msgstr "Това вече е вашият Jabber ID."
-
-#. TRANS: Message given saving Instant Messaging address that is already set for another user.
-#: actions/imsettings.php:325
-msgid "Jabber ID already belongs to another user."
+#. TRANS: Message given saving IM address that is already set for another user.
+#: actions/imsettings.php:344
+#, fuzzy
+msgid "Screenname already belongs to another user."
 msgstr "Този Jabber ID принадлежи на друг потребител."
 
-#. TRANS: Message given saving valid Instant Messaging address that is to be confirmed.
-#. TRANS: %s is the Instant Messaging address set for the site.
-#: actions/imsettings.php:353
-#, php-format
-msgid ""
-"A confirmation code was sent to the IM address you added. You must approve %"
-"s for sending messages to you."
+#. TRANS: Message given saving valid IM address that is to be confirmed.
+#: actions/imsettings.php:369
+#, fuzzy
+msgid "A confirmation code was sent to the IM address you added."
 msgstr ""
 "На месинджъра ви е изпратен код за потвърждение. За да получавате съобщения "
 "от %s, трябва да го одобрите."
 
-#. TRANS: Message given canceling Instant Messaging address confirmation for the wrong IM address.
-#: actions/imsettings.php:382
+#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#: actions/imsettings.php:396
 msgid "That is the wrong IM address."
 msgstr "Грешен IM адрес."
 
-#. TRANS: Server error thrown on database error canceling Instant Messaging address confirmation.
-#: actions/imsettings.php:391
+#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#: actions/imsettings.php:405
 #, fuzzy
-msgid "Could not delete IM confirmation."
+msgid "Couldn't delete confirmation."
 msgstr "Грешка при изтриване потвърждението по е-поща."
 
-#. TRANS: Message given after successfully canceling Instant Messaging address confirmation.
-#: actions/imsettings.php:396
+#. TRANS: Message given after successfully canceling IM address confirmation.
+#: actions/imsettings.php:410
 msgid "IM confirmation cancelled."
 msgstr "Няма код за потвърждение."
 
-#. TRANS: Message given trying to remove an Instant Messaging address that is not
+#. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.
-#: actions/imsettings.php:417
-msgid "That is not your Jabber ID."
-msgstr "Това не е вашият Jabber ID."
+#: actions/imsettings.php:434
+#, fuzzy
+msgid "That is not your screenname."
+msgstr "Това не е вашият телефонен номер."
+
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#: actions/imsettings.php:443
+#, fuzzy
+msgid "Couldn't update user im prefs."
+msgstr "Грешка при обновяване записа на потребител."
 
 #. TRANS: Message given after successfully removing a registered Instant Messaging address.
-#: actions/imsettings.php:440
+#: actions/imsettings.php:451
 msgid "The IM address was removed."
 msgstr "Входящият адрес на е-поща е премахнат."
 
@@ -3531,7 +3586,7 @@ msgid "You must be logged in to join a group."
 msgstr "За да се присъедините към група, трябва да сте влезли."
 
 #. TRANS: Title for join group page after joining.
-#: actions/joingroup.php:147
+#: actions/joingroup.php:148
 #, fuzzy, php-format
 msgctxt "TITLE"
 msgid "%1$s joined group %2$s"
@@ -3659,7 +3714,7 @@ msgstr ""
 #. TRANS: Submit button title.
 #: actions/licenseadminpanel.php:311 actions/sessionsadminpanel.php:199
 #: actions/siteadminpanel.php:292 actions/snapshotadminpanel.php:245
-#: actions/tagother.php:154 lib/applicationeditform.php:357
+#: actions/tagother.php:133 lib/applicationeditform.php:357
 msgid "Save"
 msgstr "Запазване"
 
@@ -3667,40 +3722,42 @@ msgstr "Запазване"
 msgid "Save license settings"
 msgstr ""
 
-#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
+#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
+#: actions/login.php:97 actions/otp.php:62 actions/register.php:130
 msgid "Already logged in."
 msgstr "Вече сте влезли."
 
-#: actions/login.php:148
+#: actions/login.php:125
 msgid "Incorrect username or password."
 msgstr "Грешно име или парола."
 
-#: actions/login.php:154 actions/otp.php:120
+#. TRANS: Server error displayed when a user object could not be created trying to login using "one time password login".
+#: actions/login.php:131 actions/otp.php:127
 #, fuzzy
 msgid "Error setting user. You are probably not authorized."
 msgstr "Забранено."
 
-#: actions/login.php:210 actions/login.php:263
+#: actions/login.php:185 actions/login.php:236 lib/action.php:598
 msgid "Login"
 msgstr "Вход"
 
-#: actions/login.php:249
+#: actions/login.php:222
 msgid "Login to site"
 msgstr "Вход в сайта"
 
-#: actions/login.php:258 actions/register.php:490
+#: actions/login.php:231 actions/register.php:469
 msgid "Remember me"
 msgstr "Запомни ме"
 
-#: actions/login.php:259 actions/register.php:492
+#: actions/login.php:232 actions/register.php:471
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "Автоматично влизане занапред. Да не се ползва на общи компютри!"
 
-#: actions/login.php:269
+#: actions/login.php:241
 msgid "Lost or forgotten password?"
 msgstr "Загубена или забравена парола"
 
-#: actions/login.php:288
+#: actions/login.php:259
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -3708,12 +3765,12 @@ msgstr ""
 "За по-голяма сигурност, моля въведете отново потребителското си име и парола "
 "при промяна на настройките."
 
-#: actions/login.php:292
+#: actions/login.php:263
 #, fuzzy
 msgid "Login with your username and password."
 msgstr "Вход с име и парола"
 
-#: actions/login.php:295
+#: actions/login.php:266
 #, fuzzy, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -3847,7 +3904,9 @@ msgstr "Нова бележка"
 msgid "Notice posted"
 msgstr "Бележката е публикувана"
 
-#: actions/noticesearch.php:68
+#. TRANS: Instructions for Notice search page.
+#. TRANS: %%site.name%% is the name of the StatusNet site.
+#: actions/noticesearch.php:69
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -3856,37 +3915,47 @@ msgstr ""
 "Търсене на бележки в %%site.name%% по съдържанието им. Отделяйте фразите за "
 "търсене (трябва да са по-дълги от 3 символа) с интервали."
 
-#: actions/noticesearch.php:78
+#. TRANS: Title of the page where users can search for notices.
+#: actions/noticesearch.php:80
 msgid "Text search"
 msgstr "Търсене на текст"
 
-#: actions/noticesearch.php:91
+#. TRANS: Test in RSS notice search.
+#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
+#: actions/noticesearch.php:95
 #, php-format
 msgid "Search results for \"%1$s\" on %2$s"
 msgstr "Съобщение от %1$s в %2$s"
 
-#: actions/noticesearch.php:121
+#. TRANS: Text for logged in users making a query for notices without results.
+#. TRANS: This message contains a Markdown link.
+#: actions/noticesearch.php:128
 #, php-format
 msgid ""
 "Be the first to [post on this topic](%%%%action.newnotice%%%%?"
 "status_textarea=%s)!"
 msgstr ""
 
-#: actions/noticesearch.php:124
+#. TRANS: Text for not logged in users making a query for notices without results.
+#. TRANS: This message contains Markdown links.
+#: actions/noticesearch.php:133
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and be the first to "
 "[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
 msgstr ""
 
-#: actions/noticesearchrss.php:96
+#. TRANS: RSS notice search feed title. %s is the query.
+#: actions/noticesearchrss.php:95
 #, php-format
 msgid "Updates with \"%s\""
 msgstr "Бележки, съдържащи \"%s\""
 
-#: actions/noticesearchrss.php:98
+#. TRANS: RSS notice search feed description.
+#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
+#: actions/noticesearchrss.php:99
 #, fuzzy, php-format
-msgid "Updates matching search term \"%1$s\" on %2$s!"
+msgid "Updates matching search term \"%1$s\" on %2$s."
 msgstr "Бележки, съдържащи търсеното \"%1$s\" в %2$s!"
 
 #: actions/nudge.php:85
@@ -3904,52 +3973,52 @@ msgid "Nudge sent!"
 msgstr "Побутването е изпратено!"
 
 #. TRANS: Message displayed to an anonymous user trying to view OAuth application list.
-#: actions/oauthappssettings.php:60
+#: actions/oauthappssettings.php:57
 msgid "You must be logged in to list your applications."
 msgstr "За да редактирате приложение, трябва да сте влезли."
 
 #. TRANS: Page title for OAuth applications
-#: actions/oauthappssettings.php:76
+#: actions/oauthappssettings.php:73
 msgid "OAuth applications"
 msgstr "Няма такова приложение."
 
 #. TRANS: Page instructions for OAuth applications
-#: actions/oauthappssettings.php:88
+#: actions/oauthappssettings.php:85
 msgid "Applications you have registered"
 msgstr ""
 
 #. TRANS: Empty list message on page with OAuth applications.
-#: actions/oauthappssettings.php:141
+#: actions/oauthappssettings.php:138
 #, fuzzy, php-format
 msgid "You have not registered any applications yet."
 msgstr "Не сте собственик на това приложение."
 
 #. TRANS: Title for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:71
+#: actions/oauthconnectionssettings.php:69
 #, fuzzy
 msgid "Connected applications"
 msgstr "Изтриване на приложението"
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:83
+#: actions/oauthconnectionssettings.php:80
 msgid "The following connections exist for your account."
 msgstr ""
 
 #. TRANS: Client error when trying to revoke access for an application while not being a user of it.
-#: actions/oauthconnectionssettings.php:168
+#: actions/oauthconnectionssettings.php:165
 msgid "You are not a user of that application."
 msgstr "Не сте собственик на това приложение."
 
 #. TRANS: Client error when revoking access has failed for some reason.
 #. TRANS: %s is the application ID revoking access failed for.
-#: actions/oauthconnectionssettings.php:183
+#: actions/oauthconnectionssettings.php:180
 #, fuzzy, php-format
 msgid "Unable to revoke access for application: %s."
 msgstr "Използвайте тази бланка за създаване на нова група."
 
 #. TRANS: Success message after revoking access for an application.
 #. TRANS: %1$s is the application name, %2$s is the first part of the user token.
-#: actions/oauthconnectionssettings.php:202
+#: actions/oauthconnectionssettings.php:199
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -3957,20 +4026,30 @@ msgid ""
 msgstr ""
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:213
+#: actions/oauthconnectionssettings.php:210
 msgid "You have not authorized any applications to use your account."
 msgstr ""
 
 #. TRANS: Note for developers in the OAuth connection settings form.
 #. TRANS: This message contains a Markdown link. Do not separate "](".
 #. TRANS: %s is the URL to the OAuth settings.
-#: actions/oauthconnectionssettings.php:233
+#: actions/oauthconnectionssettings.php:230
 #, php-format
 msgid ""
 "Are you a developer? [Register an OAuth client application](%s) to use with "
 "this instance of StatusNet."
 msgstr ""
 
+#: actions/oembed.php:64
+#, fuzzy, php-format
+msgid "\"%s\" not found."
+msgstr "Не е открит методът в API."
+
+#: actions/oembed.php:76
+#, fuzzy, php-format
+msgid "Notice %s not found."
+msgstr "Не е открит методът в API."
+
 #: actions/oembed.php:80 actions/shownotice.php:100
 msgid "Notice has no profile."
 msgstr "Потребителят няма профил."
@@ -3980,6 +4059,16 @@ msgstr "Потребителят няма профил."
 msgid "%1$s's status on %2$s"
 msgstr "Бележка на %1$s от %2$s"
 
+#: actions/oembed.php:95
+#, fuzzy, php-format
+msgid "Attachment %s not found."
+msgstr "Получателят не е открит"
+
+#: actions/oembed.php:136
+#, php-format
+msgid "\"%s\" not supported for oembed requests."
+msgstr ""
+
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
 #: actions/oembed.php:168
 #, fuzzy, php-format
@@ -3993,96 +4082,62 @@ msgid "Only %s URLs over plain HTTP please."
 msgstr ""
 
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1205
-#: lib/apiaction.php:1232 lib/apiaction.php:1367
+#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1207
+#: lib/apiaction.php:1234 lib/apiaction.php:1369
 msgid "Not a supported data format."
 msgstr "Неподдържан формат на данните"
 
+#. TRANS: ShortName in the OpenSearch interface when trying to find users.
 #: actions/opensearch.php:64
 msgid "People Search"
 msgstr "Търсене на хора"
 
-#: actions/opensearch.php:67
+#: actions/opensearch.php:68
 msgid "Notice Search"
 msgstr "Търсене на бележки"
 
-#: actions/othersettings.php:59
-msgid "Other settings"
-msgstr "Други настройки"
-
-#. TRANS: Instructions for tab "Other" in user profile settings.
-#: actions/othersettings.php:71
-msgid "Manage various other options."
-msgstr "Управление на различни други настройки."
-
-#. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
-#. TRANS: user's profile settings. Use of "free" is as in "open", indicating that the
-#. TRANS: information on the shortener site is freely distributable.
-#. TRANS: This message has one space at the beginning. Use your language's word separator
-#. TRANS: here if it has one (most likely a single space).
-#: actions/othersettings.php:113
-msgid " (free service)"
-msgstr " (свободна услуга)"
-
-#. TRANS: Label for dropdown with URL shortener services.
-#: actions/othersettings.php:122
-msgid "Shorten URLs with"
-msgstr "Съкращаване на адресите с"
-
-#. TRANS: Tooltip for for dropdown with URL shortener services.
-#: actions/othersettings.php:124
-msgid "Automatic shortening service to use."
-msgstr "Услуга за автоматично съкращаване, която да се ползва."
-
-#. TRANS: Label for checkbox.
-#: actions/othersettings.php:130
-msgid "View profile designs"
-msgstr "Редактиране на профила"
-
-#. TRANS: Tooltip for checkbox.
-#: actions/othersettings.php:132
-msgid "Show or hide profile designs."
-msgstr ""
-
-#. TRANS: Form validation error for form "Other settings" in user profile.
-#: actions/othersettings.php:164
-#, fuzzy
-msgid "URL shortening service is too long (maximum 50 characters)."
-msgstr "Услугата за съкращаване е твърде дълга (може да е до 50 знака)."
-
-#: actions/otp.php:69
+#. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
+#: actions/otp.php:70
 #, fuzzy
 msgid "No user ID specified."
 msgstr "Не е указана група."
 
-#: actions/otp.php:83
+#. TRANS: Client error displayed trying to use "one time password login" without specifying a login token.
+#: actions/otp.php:86
 #, fuzzy
 msgid "No login token specified."
 msgstr "Не е указана бележка."
 
-#: actions/otp.php:90
+#. TRANS: Client error displayed trying to use "one time password login" without requesting a login token.
+#: actions/otp.php:94
 msgid "No login token requested."
 msgstr "Няма заявка за одобрение."
 
-#: actions/otp.php:95
+#. TRANS: Client error displayed trying to use "one time password login" while specifying an invalid login token.
+#: actions/otp.php:100
 msgid "Invalid login token specified."
 msgstr "Не е указана бележка."
 
-#: actions/otp.php:104
+#. TRANS: Client error displayed trying to use "one time password login" while specifying an expired login token.
+#: actions/otp.php:110
 msgid "Login token expired."
 msgstr "Вход в сайта"
 
-#: actions/outbox.php:58
+#. TRANS: Title for outbox for any but the fist page.
+#. TRANS: %1$s is the user nickname, %2$d is the page number.
+#: actions/outbox.php:57
 #, php-format
 msgid "Outbox for %1$s - page %2$d"
 msgstr "%1$s, страница %2$d"
 
+#. TRANS: Title for first page of outbox.
 #: actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
 msgstr "Изходяща кутия за %s"
 
-#: actions/outbox.php:104
+#. TRANS: Instructions for outbox.
+#: actions/outbox.php:103
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr "Това е изходящата ви кутия с лични съобщения до други потребители."
 
@@ -4109,43 +4164,45 @@ msgstr "Стара парола"
 msgid "New password"
 msgstr "Нова парола"
 
-#: actions/passwordsettings.php:109
+#: actions/passwordsettings.php:109 actions/register.php:416
 #, fuzzy
-msgid "6 or more characters"
+msgid "6 or more characters."
 msgstr "6 или повече знака"
 
-#: actions/passwordsettings.php:113
+#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#: actions/passwordsettings.php:113 actions/recoverpassword.php:264
+#: actions/register.php:420
 #, fuzzy
-msgid "Same as password above"
+msgid "Same as password above."
 msgstr "Също като паролата по-горе"
 
 #: actions/passwordsettings.php:117
 msgid "Change"
 msgstr "Промяна"
 
-#: actions/passwordsettings.php:154 actions/register.php:238
+#: actions/passwordsettings.php:153 actions/register.php:223
 msgid "Password must be 6 or more characters."
 msgstr "Паролата трябва да е 6 или повече знака."
 
-#: actions/passwordsettings.php:157 actions/register.php:241
+#: actions/passwordsettings.php:156 actions/register.php:226
 msgid "Passwords don't match."
 msgstr "Паролите не съвпадат."
 
-#: actions/passwordsettings.php:165
+#: actions/passwordsettings.php:164
 msgid "Incorrect old password"
 msgstr "Грешна стара парола"
 
-#: actions/passwordsettings.php:181
+#: actions/passwordsettings.php:180
 msgid "Error saving user; invalid."
 msgstr "Грешка при запазване на потребител — невалидност."
 
-#: actions/passwordsettings.php:186
+#. TRANS: Reset password form validation error message.
+#: actions/passwordsettings.php:185 actions/recoverpassword.php:418
 #, fuzzy
-msgid "Can't save new password."
+msgid "Cannot save new password."
 msgstr "Грешка при запазване на новата парола."
 
-#. TRANS: Title for password recovery page in password saved mode.
-#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
+#: actions/passwordsettings.php:191
 msgid "Password saved."
 msgstr "Паролата е записана."
 
@@ -4358,8 +4415,7 @@ msgid "Directory where backgrounds are located."
 msgstr ""
 
 #. TRANS: Fieldset legens in Paths admin panel.
-#. TRANS: DT element label in attachment list.
-#: actions/pathsadminpanel.php:419 lib/attachmentlist.php:98
+#: actions/pathsadminpanel.php:419
 #, fuzzy
 msgid "Attachments"
 msgstr "Няма прикачени файлове."
@@ -4432,7 +4488,9 @@ msgstr ""
 msgid "Save paths"
 msgstr "Запазване на пътищата"
 
-#: actions/peoplesearch.php:52
+#. TRANS: Instructions for the "People search" page.
+#. TRANS: %%site.name%% is the name of the StatusNet site.
+#: actions/peoplesearch.php:54
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
@@ -4441,7 +4499,8 @@ msgstr ""
 "Търсене на хора в %%site.name%% по техните име, място или интереси. "
 "Отделяйте фразите за "
 
-#: actions/peoplesearch.php:58
+#. TRANS: Title of a page where users can search for other users.
+#: actions/peoplesearch.php:61
 msgid "People search"
 msgstr "Търсене на хора"
 
@@ -4455,6 +4514,60 @@ msgstr "Неправилен адрес на е-поща."
 msgid "Users self-tagged with %1$s - page %2$d"
 msgstr "Бележки с етикет %s, страница %d"
 
+#. TRANS: Page title for AJAX form return when a disabling a plugin.
+#: actions/plugindisable.php:69
+msgctxt "plugin"
+msgid "Disabled"
+msgstr ""
+
+#. TRANS: Client error displayed trying to perform any request method other than POST.
+#. TRANS: Do not translate POST.
+#: actions/pluginenable.php:78 actions/subscribe.php:77
+msgid "This action only accepts POST requests."
+msgstr ""
+
+#: actions/pluginenable.php:102
+#, fuzzy
+msgid "You cannot administer plugins."
+msgstr "Не можете да изтривате потребители."
+
+#: actions/pluginenable.php:109
+#, fuzzy
+msgid "No such plugin."
+msgstr "Няма такака страница."
+
+#. TRANS: Page title for AJAX form return when enabling a plugin.
+#: actions/pluginenable.php:159
+msgctxt "plugin"
+msgid "Enabled"
+msgstr ""
+
+#. TRANS: Tab and title for plugins admin panel.
+#. TRANS: Menu item for site administration
+#: actions/pluginsadminpanel.php:56 actions/version.php:191
+#: lib/adminpanelaction.php:411
+msgid "Plugins"
+msgstr "Приставки"
+
+#. TRANS: Instructions at top of plugin admin page.
+#: actions/pluginsadminpanel.php:68
+msgid ""
+"Additional plugins can be enabled and configured manually. See the <a href="
+"\"http://status.net/wiki/Plugins\">online plugin documentation</a> for more "
+"details."
+msgstr ""
+
+#. TRANS: Admin form section header
+#: actions/pluginsadminpanel.php:84
+#, fuzzy
+msgid "Default plugins"
+msgstr "Език по подразбиране"
+
+#: actions/pluginsadminpanel.php:106
+msgid ""
+"All default plugins have been disabled from the site's configuration file."
+msgstr ""
+
 #: actions/postnotice.php:95
 msgid "Invalid notice content."
 msgstr "Неправилен размер."
@@ -4465,45 +4578,42 @@ msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’.
 msgstr ""
 
 #. TRANS: Page title for profile settings.
-#: actions/profilesettings.php:59
+#: actions/profilesettings.php:60
 msgid "Profile settings"
 msgstr "Настройки на профила"
 
 #. TRANS: Usage instructions for profile settings.
-#: actions/profilesettings.php:70
+#: actions/profilesettings.php:71
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr "Можете да обновите личния си профил, за да знаят хората повече за вас."
 
 #. TRANS: Profile settings form legend.
-#: actions/profilesettings.php:98
+#: actions/profilesettings.php:99
 msgid "Profile information"
 msgstr "Данни на профила"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109 actions/register.php:433
+#: actions/profilesettings.php:110 actions/register.php:412
 #, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr "От 1 до 64 малки букви или цифри, без пунктоация и интервали"
 
 #. TRANS: Field label in form for profile settings.
-#. TRANS: Label for full group name (dt). Text hidden by default.
-#. TRANS: DT for full name in a profile.
-#: actions/profilesettings.php:113 actions/register.php:455
-#: actions/showgroup.php:255 actions/tagother.php:104
-#: lib/groupeditform.php:150 lib/userprofile.php:156
+#: actions/profilesettings.php:114 actions/register.php:434
+#: lib/groupeditform.php:150
 msgid "Full name"
 msgstr "Пълно име"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:118 actions/register.php:460
+#: actions/profilesettings.php:119 actions/register.php:439
 #: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "Лична страница"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:121
+#: actions/profilesettings.php:122 actions/register.php:441
 #, fuzzy
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr "Адрес на личната ви страница, блог или профил в друг сайт"
@@ -4511,7 +4621,7 @@ msgstr "Адрес на личната ви страница, блог или п
 #. TRANS: Tooltip for field label in form for profile settings. Plural
 #. TRANS: is decided by the number of characters available for the
 #. TRANS: biography (%d).
-#: actions/profilesettings.php:129 actions/register.php:471
+#: actions/profilesettings.php:130 actions/register.php:450
 #, fuzzy, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4519,76 +4629,72 @@ msgstr[0] "Опишете себе си и интересите си в до %d
 msgstr[1] "Опишете себе си и интересите си в до %d букви"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:135 actions/register.php:476
+#: actions/profilesettings.php:136 actions/register.php:455
 msgid "Describe yourself and your interests"
 msgstr "Опишете себе си и интересите си"
 
 #. TRANS: Text area label in form for profile settings where users can provide.
 #. TRANS: their biography.
-#: actions/profilesettings.php:139 actions/register.php:478
+#: actions/profilesettings.php:140 actions/register.php:457
 msgid "Bio"
 msgstr "За мен"
 
 #. TRANS: Field label in form for profile settings.
-#. TRANS: Label for group location (dt). Text hidden by default.
-#. TRANS: DT for location in a profile.
-#: actions/profilesettings.php:145 actions/register.php:483
-#: actions/showgroup.php:265 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:173
-#: lib/userprofile.php:172
+#: actions/profilesettings.php:146 actions/register.php:462
+#: lib/groupeditform.php:173
 msgid "Location"
 msgstr "Местоположение"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148 actions/register.php:485
+#: actions/profilesettings.php:149
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Къде се намирате (град, община, държава и т.н.)"
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:153
+#: actions/profilesettings.php:154
 msgid "Share my current location when posting notices"
 msgstr ""
 
 #. TRANS: Field label in form for profile settings.
-#. TRANS: DT for tags in a profile.
-#: actions/profilesettings.php:161 actions/tagother.php:149
-#: actions/tagother.php:209 lib/subscriptionlist.php:106
-#: lib/subscriptionlist.php:108 lib/userprofile.php:220
+#: actions/profilesettings.php:162 actions/tagother.php:128
+#: actions/tagother.php:188 lib/subscriptionlist.php:104
+#: lib/subscriptionlist.php:106
 msgid "Tags"
 msgstr "Етикети"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:164
+#: actions/profilesettings.php:165
 msgid ""
-"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- "
+"separated."
 msgstr ""
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:169
+#: actions/profilesettings.php:170
 msgid "Language"
 msgstr "Език"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:171
+#: actions/profilesettings.php:172
 #, fuzzy
-msgid "Preferred language"
+msgid "Preferred language."
 msgstr "Предпочитан език"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:181
+#: actions/profilesettings.php:182
 msgid "Timezone"
 msgstr "Часови пояс"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:183
+#: actions/profilesettings.php:184
 msgid "What timezone are you normally in?"
 msgstr "В кой часови пояс сте обикновено?"
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:189
+#: actions/profilesettings.php:190
 #, fuzzy
 msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)"
+"Automatically subscribe to whoever subscribes to me (best for non-humans)."
 msgstr ""
 "Автоматично абониране за всеки, който се абонира за мен (подходящо за "
 "ботове)."
@@ -4596,7 +4702,7 @@ msgstr ""
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Plural form is used based on the maximum number of allowed
 #. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:258 actions/register.php:229
+#: actions/profilesettings.php:259 actions/register.php:214
 #, fuzzy, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4604,50 +4710,50 @@ msgstr[0] "Биографията е твърде дълга (до %d симво
 msgstr[1] "Биографията е твърде дълга (до %d символа)."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:269 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:270 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr "Не е избран часови пояс"
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:277
+#: actions/profilesettings.php:278
 #, fuzzy
 msgid "Language is too long (maximum 50 characters)."
 msgstr "Името на езика е твърде дълго (може да е до 50 знака)."
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:291 actions/tagother.php:178
-#, php-format
-msgid "Invalid tag: \"%s\""
+#: actions/profilesettings.php:292
+#, fuzzy, php-format
+msgid "Invalid tag: \"%s\"."
 msgstr "Неправилен етикет: \"%s\""
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:347
+#: actions/profilesettings.php:348
 #, fuzzy
 msgid "Could not update user for autosubscribe."
 msgstr "Грешка при обновяване записа на потребител."
 
 #. TRANS: Server error thrown when user profile location preference settings could not be updated.
-#: actions/profilesettings.php:405
+#: actions/profilesettings.php:406
 #, fuzzy
 msgid "Could not save location prefs."
 msgstr "Грешка при запазване етикетите."
 
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:427 actions/tagother.php:200
+#: actions/profilesettings.php:428 actions/tagother.php:179
 msgid "Could not save tags."
 msgstr "Грешка при запазване на етикетите."
 
 #. TRANS: Confirmation shown when user profile settings are saved.
 #. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:436 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:437 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "Настройките са запазени."
 
 #. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
 #. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:483 actions/restoreaccount.php:60
+#: actions/profilesettings.php:484 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "Създаване на нова сметка"
@@ -4716,6 +4822,12 @@ msgid ""
 "tool."
 msgstr ""
 
+#. TRANS: Public RSS feed description. %s is the StatusNet site name.
+#: actions/publicrss.php:106
+#, php-format
+msgid "%s updates from everyone."
+msgstr ""
+
 #. TRANS: Title for public tag cloud.
 #: actions/publictagcloud.php:57
 msgid "Public tag cloud"
@@ -4754,11 +4866,6 @@ msgid ""
 "one!"
 msgstr ""
 
-#: actions/publictagcloud.php:146
-#, fuzzy
-msgid "Tag cloud"
-msgstr "Смяна на цветовете"
-
 #. TRANS: Client error displayed trying to recover password while already logged in.
 #: actions/recoverpassword.php:37
 msgid "You are already logged in!"
@@ -4851,6 +4958,12 @@ msgstr "Възстановяване на паролата"
 msgid "Password recovery requested"
 msgstr "Поискано е възстановяване на парола"
 
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/recoverpassword.php:229
+#, fuzzy
+msgid "Password saved"
+msgstr "Паролата е записана."
+
 #. TRANS: Title for password recovery page when an unknown action has been specified.
 #: actions/recoverpassword.php:232
 msgid "Unknown action"
@@ -4862,15 +4975,9 @@ msgstr "Непознато действие"
 msgid "6 or more characters, and do not forget it!"
 msgstr "6 или повече знака. И не ги забравяйте!"
 
-#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
-#: actions/recoverpassword.php:264 actions/register.php:441
-#, fuzzy
-msgid "Same as password above."
-msgstr "Също като паролата по-горе"
-
 #. TRANS: Button text for password reset form.
 #. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: actions/recoverpassword.php:268 lib/designsettings.php:264
+#: actions/recoverpassword.php:268 lib/designform.php:145
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Reset"
@@ -4921,14 +5028,8 @@ msgstr "Паролата трябва да е от поне 6 знака."
 msgid "Password and confirmation do not match."
 msgstr "Паролата и потвърждението й не съвпадат."
 
-#. TRANS: Reset password form validation error message.
-#: actions/recoverpassword.php:418
-#, fuzzy
-msgid "Cannot save new password."
-msgstr "Грешка при запазване на новата парола."
-
 #. TRANS: Server error displayed when something does wrong with the user object during password reset.
-#: actions/recoverpassword.php:426 actions/register.php:256
+#: actions/recoverpassword.php:426 actions/register.php:241
 msgid "Error setting user."
 msgstr "Грешка в настройките на потребителя."
 
@@ -4937,102 +5038,106 @@ msgstr "Грешка в настройките на потребителя."
 msgid "New password successfully saved. You are now logged in."
 msgstr "Новата парола е запазена. Влязохте успешно."
 
-#: actions/register.php:92 actions/register.php:196 actions/register.php:413
+#: actions/redirecturl.php:70
+#, fuzzy
+msgid "No id parameter"
+msgstr "Липсват аргументи return-to."
+
+#: actions/redirecturl.php:76
+#, fuzzy, php-format
+msgid "No such file \"%d\""
+msgstr "Няма такъв файл."
+
+#: actions/register.php:80 actions/register.php:181 actions/register.php:392
 msgid "Sorry, only invited people can register."
 msgstr ""
 
-#: actions/register.php:99
+#: actions/register.php:87
 #, fuzzy
 msgid "Sorry, invalid invitation code."
 msgstr "Грешка в кода за потвърждение."
 
-#: actions/register.php:119
+#: actions/register.php:106
 msgid "Registration successful"
 msgstr "Записването е успешно."
 
-#: actions/register.php:121 actions/register.php:511
+#: actions/register.php:108 actions/register.php:490
 msgid "Register"
 msgstr "Регистриране"
 
-#: actions/register.php:142
+#: actions/register.php:128
 msgid "Registration not allowed."
 msgstr "Записването не е позволено."
 
-#: actions/register.php:209
+#: actions/register.php:194
 #, fuzzy
-msgid "You can't register if you don't agree to the license."
+msgid "You cannot register if you don't agree to the license."
 msgstr "Не можете да се регистрате, ако не сте съгласни с  лиценза."
 
-#: actions/register.php:218
+#: actions/register.php:203
 msgid "Email address already exists."
 msgstr "Адресът на е-поща вече се използва."
 
-#: actions/register.php:251 actions/register.php:273
+#: actions/register.php:236 actions/register.php:258
 msgid "Invalid username or password."
 msgstr "Неправилно име или парола."
 
-#: actions/register.php:351
+#: actions/register.php:333
 msgid ""
 "With this form you can create a new account. You can then post notices and "
-"link up to friends and colleagues. "
+"link up to friends and colleagues."
 msgstr ""
 
-#: actions/register.php:437
-#, fuzzy
-msgid "6 or more characters."
-msgstr "6 или повече знака"
-
-#. TRANS: Link description in user account settings menu.
-#: actions/register.php:445 actions/register.php:449
-#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
+#: actions/register.php:424 actions/register.php:428
+#: actions/siteadminpanel.php:238 lib/settingsnav.php:92
 msgid "Email"
 msgstr "Е-поща"
 
-#: actions/register.php:446 actions/register.php:450
+#: actions/register.php:425 actions/register.php:429
 #, fuzzy
-msgid "Used only for updates, announcements, and password recovery"
+msgid "Used only for updates, announcements, and password recovery."
 msgstr "Използва се само за промени, обяви или възстановяване на паролата"
 
-#: actions/register.php:457
+#: actions/register.php:436
 #, fuzzy
-msgid "Longer name, preferably your \"real\" name"
+msgid "Longer name, preferably your \"real\" name."
 msgstr "По-дълго име, за предпочитане \"истинското\" ви име."
 
-#: actions/register.php:462
+#: actions/register.php:464
 #, fuzzy
-msgid "URL of your homepage, blog, or profile on another site"
-msgstr "Адрес на личната ви страница, блог или профил в друг сайт"
+msgid "Where you are, like \"City, State (or Region), Country\"."
+msgstr "Къде се намирате (град, община, държава и т.н.)"
 
-#: actions/register.php:523
+#: actions/register.php:503
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
 msgstr ""
 
-#: actions/register.php:533
+#: actions/register.php:513
 #, php-format
 msgid "My text and files are copyright by %1$s."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:537
+#: actions/register.php:517
 msgid "My text and files remain under my own copyright."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:540
+#: actions/register.php:520
 msgid "All rights reserved."
 msgstr "Всички права запазени."
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:545
+#: actions/register.php:525
 #, fuzzy, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
 "email address, IM address, and phone number."
 msgstr " освен тези лични данни: парола, е-поща, месинджър, телефон."
 
-#: actions/register.php:588
+#: actions/register.php:566
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -5065,7 +5170,7 @@ msgstr ""
 "Благодарим, че се включихте в сайта и дано ползването на услугата ви носи "
 "само приятни мигове!"
 
-#: actions/register.php:612
+#: actions/register.php:590
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5099,7 +5204,7 @@ msgstr "Потребителски псевдоним"
 
 #: actions/remotesubscribe.php:129
 #, fuzzy
-msgid "Nickname of the user you want to follow"
+msgid "Nickname of the user you want to follow."
 msgstr "Псевдоним на потребител, когото искате да следите"
 
 #: actions/remotesubscribe.php:132
@@ -5108,18 +5213,18 @@ msgstr "Адрес на профила"
 
 #: actions/remotesubscribe.php:133
 #, fuzzy
-msgid "URL of your profile on another compatible microblogging service"
+msgid "URL of your profile on another compatible microblogging service."
 msgstr "Адрес на профила ви в друга, съвместима услуга за микроблогване"
 
 #. TRANS: Link text for link that will subscribe to a remote profile.
 #: actions/remotesubscribe.php:136 lib/subscribeform.php:139
-#: lib/userprofile.php:431
+#: lib/userprofile.php:402
 msgid "Subscribe"
 msgstr "Абониране"
 
 #: actions/remotesubscribe.php:158
 #, fuzzy
-msgid "Invalid profile URL (bad format)"
+msgid "Invalid profile URL (bad format)."
 msgstr "Неправилен адрес на профил (грешен формат)"
 
 #: actions/remotesubscribe.php:167
@@ -5154,7 +5259,7 @@ msgstr "Не можете да повтаряте собствена бележ
 msgid "You already repeated that notice."
 msgstr "Вече сте повторили тази бележка."
 
-#: actions/repeat.php:112 lib/noticelist.php:692
+#: actions/repeat.php:112 lib/noticelist.php:697
 msgid "Repeated"
 msgstr "Повторено"
 
@@ -5162,9 +5267,9 @@ msgstr "Повторено"
 msgid "Repeated!"
 msgstr "Повторено!"
 
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing @-replies.
+#. TRANS: RSS reply feed title. %s is a user nickname.
 #: actions/replies.php:126 actions/repliesrss.php:68
-#: lib/personalgroupnav.php:109
+#: lib/personalgroupnav.php:105
 #, php-format
 msgid "Replies to %s"
 msgstr "Отговори на %s"
@@ -5210,9 +5315,11 @@ msgid ""
 "newnotice%%%%?status_textarea=%3$s)."
 msgstr ""
 
-#: actions/repliesrss.php:72
+#. TRANS: RSS reply feed description.
+#. TRANS: %1$s is a user nickname, %2$s is the StatusNet site name.
+#: actions/repliesrss.php:74
 #, fuzzy, php-format
-msgid "Replies to %1$s on %2$s!"
+msgid "Replies to %1$s on %2$s."
 msgstr "Отговори до %1$s в %2$s!"
 
 #. TRANS: Client exception displayed when trying to restore an account while not logged in.
@@ -5314,7 +5421,7 @@ msgstr "Не можете да заглушавате потребители н
 msgid "User doesn't have this role."
 msgstr "Потребител без съответстващ профил"
 
-#: actions/rsd.php:146 actions/version.php:159
+#: actions/rsd.php:142 actions/version.php:159
 msgid "StatusNet"
 msgstr "StatusNet"
 
@@ -5356,95 +5463,45 @@ msgstr ""
 msgid "Save site settings"
 msgstr "Запазване настройките на сайта"
 
-#: actions/showapplication.php:82
+#: actions/showapplication.php:78
 msgid "You must be logged in to view an application."
 msgstr "За прегледате приложение, трябва да сте влезли."
 
-#: actions/showapplication.php:157
+#: actions/showapplication.php:151
 msgid "Application profile"
 msgstr "Профил на приложението"
 
-#. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:159 lib/applicationeditform.php:177
-msgid "Icon"
-msgstr "Икона"
-
-#. TRANS: Form input field label for application name.
-#: actions/showapplication.php:169 actions/version.php:197
-#: lib/applicationeditform.php:190
-msgid "Name"
-msgstr "Име"
-
-#. TRANS: Form input field label.
-#: actions/showapplication.php:178 lib/applicationeditform.php:227
-msgid "Organization"
-msgstr "Организация"
-
-#. TRANS: Form input field label.
-#: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:168
-msgid "Description"
-msgstr "Описание"
-
-#. TRANS: Header for group statistics on a group page (h2).
-#. TRANS: H2 text for user statistics.
-#: actions/showapplication.php:192 actions/showgroup.php:460
-#: lib/profileaction.php:205
-msgid "Statistics"
-msgstr "Статистики"
-
-#: actions/showapplication.php:203
+#: actions/showapplication.php:179
 #, php-format
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr ""
 
-#: actions/showapplication.php:213
+#: actions/showapplication.php:189
 #, fuzzy
 msgid "Application actions"
 msgstr "Данни за приложението"
 
-#: actions/showapplication.php:236
+#: actions/showapplication.php:212
 msgid "Reset key & secret"
 msgstr ""
 
 #. TRANS: Title of form for deleting a user.
-#: actions/showapplication.php:252 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:64 lib/noticelist.php:673
+#: actions/showapplication.php:228 lib/deletegroupform.php:121
+#: lib/deleteuserform.php:64 lib/noticelist.php:678
 msgid "Delete"
 msgstr "Изтриване"
 
-#: actions/showapplication.php:261
+#: actions/showapplication.php:237
 msgid "Application info"
 msgstr "Данни за приложението"
 
-#: actions/showapplication.php:263
-msgid "Consumer key"
-msgstr ""
-
-#: actions/showapplication.php:268
-msgid "Consumer secret"
-msgstr ""
-
-#: actions/showapplication.php:273
-msgid "Request token URL"
-msgstr ""
-
-#: actions/showapplication.php:278
-msgid "Access token URL"
-msgstr ""
-
-#: actions/showapplication.php:283
-#, fuzzy
-msgid "Authorize URL"
-msgstr "Автор"
-
-#: actions/showapplication.php:288
+#: actions/showapplication.php:255
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
 msgstr ""
 
-#: actions/showapplication.php:309
+#: actions/showapplication.php:275
 #, fuzzy
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr "Наистина ли искате да изтриете тази бележка?"
@@ -5524,62 +5581,48 @@ msgstr "Група %s"
 msgid "%1$s group, page %2$d"
 msgstr "%1$s, страница %2$d"
 
-#. TRANS: Group profile header (h2). Text hidden by default.
-#: actions/showgroup.php:223
-msgid "Group profile"
-msgstr "Профил на групата"
-
-#. TRANS: Label for group URL (dt). Text hidden by default.
-#. TRANS: DT for URL in a profile.
-#: actions/showgroup.php:273 actions/tagother.php:118
-#: actions/userauthorization.php:175 lib/userprofile.php:186
-msgid "URL"
-msgstr "URL"
-
 #. TRANS: Label for group description or group note (dt). Text hidden by default.
-#. TRANS: DT for note in a profile.
-#: actions/showgroup.php:285 actions/tagother.php:128
-#: actions/userauthorization.php:187 lib/userprofile.php:204
+#: actions/showgroup.php:266
 msgid "Note"
 msgstr "Бележка"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:296 lib/groupeditform.php:180
+#: actions/showgroup.php:277 lib/groupeditform.php:180
 msgid "Aliases"
 msgstr "Псевдоними"
 
 #. TRANS: Group actions header (h2). Text hidden by default.
-#: actions/showgroup.php:313
+#: actions/showgroup.php:294
 #, fuzzy
 msgid "Group actions"
 msgstr "Потребителски действия"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:357
+#: actions/showgroup.php:338
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
 msgstr "Емисия с бележки на %s (RSS 1.0)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:364
+#: actions/showgroup.php:345
 #, php-format
 msgid "Notice feed for %s group (RSS 2.0)"
 msgstr "Емисия с бележки на %s (RSS 2.0)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:371
+#: actions/showgroup.php:352
 #, php-format
 msgid "Notice feed for %s group (Atom)"
 msgstr "Емисия с бележки на %s (Atom)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:377
+#: actions/showgroup.php:358
 #, php-format
 msgid "FOAF for %s group"
 msgstr "Изходяща кутия за %s"
 
 #. TRANS: Header for mini list of group members on a group page (h2).
-#: actions/showgroup.php:414
+#: actions/showgroup.php:395
 msgid "Members"
 msgstr "Членове"
 
@@ -5587,26 +5630,31 @@ msgstr "Членове"
 #. TRANS: Text for user subscription statistics if the user has no subscriptions.
 #. TRANS: Text for user subscriber statistics if user has no subscribers.
 #. TRANS: Text for user user group membership statistics if user is not a member of any group.
-#: actions/showgroup.php:420 lib/profileaction.php:137
+#: actions/showgroup.php:401 lib/profileaction.php:137
 #: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
-#: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
+#: lib/subscriptionlist.php:123 lib/tagcloudsection.php:71
 msgid "(None)"
 msgstr "(Без)"
 
 #. TRANS: Link to all group members from mini list of group members if group has more than n members.
-#: actions/showgroup.php:429
+#: actions/showgroup.php:410
 msgid "All members"
 msgstr "Всички членове"
 
-#. TRANS: Label for creation date in statistics on group page.
-#: actions/showgroup.php:465
+#. TRANS: Header for group statistics on a group page (h2).
+#. TRANS: H2 text for user statistics.
+#: actions/showgroup.php:441 lib/profileaction.php:205
+msgid "Statistics"
+msgstr "Статистики"
+
+#: actions/showgroup.php:444
 #, fuzzy
 msgctxt "LABEL"
 msgid "Created"
 msgstr "Създадена на"
 
 #. TRANS: Label for member count in statistics on group page.
-#: actions/showgroup.php:473
+#: actions/showgroup.php:449
 #, fuzzy
 msgctxt "LABEL"
 msgid "Members"
@@ -5616,7 +5664,7 @@ msgstr "Членове"
 #. TRANS: **%s** is the group alias, %%%%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).
-#: actions/showgroup.php:488
+#: actions/showgroup.php:464
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5629,7 +5677,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: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
-#: actions/showgroup.php:498
+#: actions/showgroup.php:474
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5639,7 +5687,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: Header for list of group administrators on a group page (h2).
-#: actions/showgroup.php:527
+#: actions/showgroup.php:503
 msgid "Admins"
 msgstr "Администратори"
 
@@ -5678,7 +5726,7 @@ msgid "%1$s tagged %2$s"
 msgstr "%1$s, страница %2$d"
 
 #. TRANS: Page title showing tagged notices in one user's stream.
-#. TRANS: %1$s is the username, %2$s is the hash tag, %1$d is the page number.
+#. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
 #: actions/showstream.php:74
 #, fuzzy, php-format
 msgid "%1$s tagged %2$s, page %3$d"
@@ -5725,13 +5773,13 @@ msgid "FOAF for %s"
 msgstr "FOAF за %s"
 
 #. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
-#: actions/showstream.php:211
+#: actions/showstream.php:205
 #, php-format
 msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr ""
 
 #. TRANS: Second sentence of empty list message for a stream for the user themselves.
-#: actions/showstream.php:217
+#: actions/showstream.php:211
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
@@ -5739,7 +5787,7 @@ msgstr ""
 
 #. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:221
+#: actions/showstream.php:215
 #, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
@@ -5748,7 +5796,7 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:264
+#: actions/showstream.php:258
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5759,7 +5807,7 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:271
+#: actions/showstream.php:265
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5768,7 +5816,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
-#: actions/showstream.php:328
+#: actions/showstream.php:322
 #, php-format
 msgid "Repeat of %s"
 msgstr "Повторения на %s"
@@ -5915,77 +5963,77 @@ msgstr ""
 #. TRANS: Title for button to save site notice in admin panel.
 #: actions/sitenoticeadminpanel.php:201
 #, fuzzy
-msgid "Save site notice"
+msgid "Save site notice."
 msgstr "Запазване настройките на сайта"
 
 #. TRANS: Title for SMS settings.
-#: actions/smssettings.php:57
+#: actions/smssettings.php:56
 msgid "SMS settings"
 msgstr "Настройки за SMS"
 
 #. TRANS: SMS settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/smssettings.php:71
+#: actions/smssettings.php:70
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr "Може да получавате на е-пощата си SMS-съобщения от %%site.name%%."
 
 #. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
-#: actions/smssettings.php:93
+#: actions/smssettings.php:92
 #, fuzzy
 msgid "SMS is not available."
 msgstr "Страницата не е достъпна във вида медия, който приемате"
 
 #. TRANS: Form legend for SMS settings form.
-#: actions/smssettings.php:107
+#: actions/smssettings.php:106
 msgid "SMS address"
 msgstr "Адрес на е-поща"
 
 #. TRANS: Form guide in SMS settings form.
-#: actions/smssettings.php:116
+#: actions/smssettings.php:115
 msgid "Current confirmed SMS-enabled phone number."
 msgstr "Текущ потвърден телефонен номер за SMS-и."
 
 #. TRANS: Form guide in IM settings form.
-#: actions/smssettings.php:129
+#: actions/smssettings.php:128
 msgid "Awaiting confirmation on this phone number."
 msgstr "Очаква се потвърждение за този телефонен номер."
 
 #. TRANS: Field label for SMS address input in SMS settings form.
-#: actions/smssettings.php:138
+#: actions/smssettings.php:137
 msgid "Confirmation code"
 msgstr "Код за потвърждение"
 
 #. TRANS: Form field instructions in SMS settings form.
-#: actions/smssettings.php:140
+#: actions/smssettings.php:139
 msgid "Enter the code you received on your phone."
 msgstr "Въведете кода, който получихте по телефона."
 
 #. TRANS: Button label to confirm SMS confirmation code in SMS settings.
-#: actions/smssettings.php:144
+#: actions/smssettings.php:143
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Confirm"
 msgstr "Потвърждаване"
 
 #. TRANS: Field label for SMS phone number input in SMS settings form.
-#: actions/smssettings.php:149
+#: actions/smssettings.php:148
 msgid "SMS phone number"
 msgstr "Телефонен номер за SMS"
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
-#: actions/smssettings.php:152
+#: actions/smssettings.php:151
 #, fuzzy
-msgid "Phone number, no punctuation or spaces, with area code"
+msgid "Phone number, no punctuation or spaces, with area code."
 msgstr "Телефонен номер — с код, без пунктоация и без интервали."
 
 #. TRANS: Form legend for SMS preferences form.
-#: actions/smssettings.php:191
+#: actions/smssettings.php:190
 msgid "SMS preferences"
 msgstr "Настройки на е-поща"
 
 #. TRANS: Checkbox label in SMS preferences form.
-#: actions/smssettings.php:197
+#: actions/smssettings.php:196
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
@@ -5994,33 +6042,33 @@ msgstr ""
 "такси от оператора."
 
 #. TRANS: Confirmation message for successful SMS preferences save.
-#: actions/smssettings.php:308
+#: actions/smssettings.php:307
 #, fuzzy
 msgid "SMS preferences saved."
 msgstr "Настройките са запазени."
 
 #. TRANS: Message given saving SMS phone number without having provided one.
-#: actions/smssettings.php:330
+#: actions/smssettings.php:329
 msgid "No phone number."
 msgstr "Не е въведен телефонен номер."
 
 #. TRANS: Message given saving SMS phone number without having selected a carrier.
-#: actions/smssettings.php:336
+#: actions/smssettings.php:335
 msgid "No carrier selected."
 msgstr "Не е избран оператор."
 
 #. TRANS: Message given saving SMS phone number that is already set.
-#: actions/smssettings.php:344
+#: actions/smssettings.php:343
 msgid "That is already your phone number."
 msgstr "Това и сега е номерът на телефона ви."
 
 #. TRANS: Message given saving SMS phone number that is already set for another user.
-#: actions/smssettings.php:348
+#: actions/smssettings.php:347
 msgid "That phone number already belongs to another user."
 msgstr "Този телефонен номер вече се използва от друг потребител."
 
 #. TRANS: Message given saving valid SMS phone number that is to be confirmed.
-#: actions/smssettings.php:376
+#: actions/smssettings.php:375
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
 "for the code and instructions on how to use it."
@@ -6030,40 +6078,40 @@ msgstr ""
 "му."
 
 #. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
-#: actions/smssettings.php:404
+#: actions/smssettings.php:403
 msgid "That is the wrong confirmation number."
 msgstr "Този код за потвърждение е грешен."
 
 #. TRANS: Message given after successfully canceling SMS phone number confirmation.
-#: actions/smssettings.php:418
+#: actions/smssettings.php:417
 msgid "SMS confirmation cancelled."
 msgstr "Потвърждение за SMS"
 
 #. TRANS: Message given trying to remove an SMS phone number that is not
 #. TRANS: registered for the active user.
-#: actions/smssettings.php:438
+#: actions/smssettings.php:437
 msgid "That is not your phone number."
 msgstr "Това не е вашият телефонен номер."
 
 #. TRANS: Message given after successfully removing a registered SMS phone number.
-#: actions/smssettings.php:460
+#: actions/smssettings.php:459
 #, fuzzy
 msgid "The SMS phone number was removed."
 msgstr "Телефонен номер за SMS"
 
 #. TRANS: Label for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:499
+#: actions/smssettings.php:498
 msgid "Mobile carrier"
 msgstr "Мобилен оператор"
 
 #. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:504
+#: actions/smssettings.php:503
 msgid "Select a carrier"
 msgstr "Изберете оператор"
 
 #. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
 #. TRANS: %s is an administrative contact's e-mail address.
-#: actions/smssettings.php:513
+#: actions/smssettings.php:512
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -6073,7 +6121,7 @@ msgstr ""
 "не фигурира тук, пишете ни на адрес %s."
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
-#: actions/smssettings.php:535
+#: actions/smssettings.php:534
 #, fuzzy
 msgid "No code entered."
 msgstr "Не е въведен код."
@@ -6149,16 +6197,14 @@ msgstr "Не сте абонирани за този профил"
 msgid "Could not save subscription."
 msgstr "Грешка при добавяне на нов абонамент."
 
-#: actions/subscribe.php:77
-msgid "This action only accepts POST requests."
-msgstr ""
-
-#: actions/subscribe.php:117
+#. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
+#: actions/subscribe.php:121
 #, fuzzy
 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
 msgstr "Не сте абонирани за този профил"
 
-#: actions/subscribe.php:145
+#. TRANS: Page title when subscription succeeded.
+#: actions/subscribe.php:149
 #, fuzzy
 msgid "Subscribed"
 msgstr "Абониране"
@@ -6266,31 +6312,34 @@ msgid "Subscription feed for %s (Atom)"
 msgstr "Емисия с бележки на %s (Atom)"
 
 #. TRANS: Checkbox label for enabling Jabber messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:239
-msgid "Jabber"
-msgstr "Jabber"
+#: actions/subscriptions.php:241 lib/settingsnav.php:110
+#, fuzzy
+msgid "IM"
+msgstr "IM"
 
 #. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:254
+#: actions/subscriptions.php:256 lib/settingsnav.php:117
 msgid "SMS"
 msgstr "SMS"
 
-#: actions/tag.php:69
+#. TRANS: Title for all but the first page of notices with tags.
+#. TRANS: %1$s is the tag, %2$d is the page number.
+#: actions/tag.php:73
 #, php-format
 msgid "Notices tagged with %1$s, page %2$d"
 msgstr "Бележки с етикет %s"
 
-#: actions/tag.php:87
+#: actions/tag.php:91
 #, php-format
 msgid "Notice feed for tag %s (RSS 1.0)"
 msgstr "Емисия с бележки на %s (RSS 1.0)"
 
-#: actions/tag.php:93
+#: actions/tag.php:97
 #, php-format
 msgid "Notice feed for tag %s (RSS 2.0)"
 msgstr "Емисия с бележки на %s (RSS 2.0)"
 
-#: actions/tag.php:99
+#: actions/tag.php:103
 #, php-format
 msgid "Notice feed for tag %s (Atom)"
 msgstr "Емисия с бележки на %s (Atom)"
@@ -6309,29 +6358,28 @@ msgstr "Етикети"
 msgid "User profile"
 msgstr "Потребителски профил"
 
-#. TRANS: DT element in area for user avatar.
-#: actions/tagother.php:81 actions/userauthorization.php:132
-#: lib/userprofile.php:108
-msgid "Photo"
-msgstr "Снимка"
-
-#: actions/tagother.php:141
+#: actions/tagother.php:120
 #, fuzzy
 msgid "Tag user"
 msgstr "Етикети"
 
-#: actions/tagother.php:151
+#: actions/tagother.php:130
 msgid ""
 "Tags for this user (letters, numbers, -, ., and _), comma- or space- "
 "separated"
 msgstr ""
 
-#: actions/tagother.php:193
+#: actions/tagother.php:157
+#, php-format
+msgid "Invalid tag: \"%s\""
+msgstr "Неправилен етикет: \"%s\""
+
+#: actions/tagother.php:172
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 
-#: actions/tagother.php:236
+#: actions/tagother.php:215
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
 
@@ -6339,6 +6387,7 @@ msgstr ""
 msgid "No such tag."
 msgstr "Няма такъв етикет."
 
+#. TRANS: Client error displayed when trying to unblock a non-blocked user.
 #: actions/unblock.php:59
 msgid "You haven't blocked that user."
 msgstr "Не сте блокирали този потребител."
@@ -6360,12 +6409,84 @@ msgstr "Не е открит профил с такъв идентификато
 msgid "Unsubscribed"
 msgstr "Отписване"
 
-#: actions/updateprofile.php:64 actions/userauthorization.php:337
+#: actions/updateprofile.php:64
 #, php-format
 msgid ""
 "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
 msgstr ""
 
+#: actions/urlsettings.php:60
+#, fuzzy
+msgid "URL settings"
+msgstr "Настройки за SMS"
+
+#. TRANS: Instructions for tab "Other" in user profile settings.
+#: actions/urlsettings.php:72
+msgid "Manage various other options."
+msgstr "Управление на различни други настройки."
+
+#. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
+#. TRANS: user's profile settings. This message has one space at the beginning. Use your
+#. TRANS: language's word separator here if it has one (most likely a single space).
+#: actions/urlsettings.php:115
+msgid " (free service)"
+msgstr " (свободна услуга)"
+
+#: actions/urlsettings.php:121
+#, fuzzy
+msgid "[none]"
+msgstr "Без"
+
+#: actions/urlsettings.php:122
+msgid "[internal]"
+msgstr ""
+
+#. TRANS: Label for dropdown with URL shortener services.
+#: actions/urlsettings.php:130
+msgid "Shorten URLs with"
+msgstr "Съкращаване на адресите с"
+
+#. TRANS: Tooltip for for dropdown with URL shortener services.
+#: actions/urlsettings.php:132
+msgid "Automatic shortening service to use."
+msgstr "Услуга за автоматично съкращаване, която да се ползва."
+
+#: actions/urlsettings.php:138
+msgid "URL longer than"
+msgstr ""
+
+#: actions/urlsettings.php:141
+msgid "URLs longer than this will be shortened, 0 means always shorten."
+msgstr ""
+
+#: actions/urlsettings.php:145
+msgid "Text longer than"
+msgstr ""
+
+#: actions/urlsettings.php:148
+msgid ""
+"URLs in notices longer than this will be shortened, 0 means always shorten."
+msgstr ""
+
+#. TRANS: Form validation error for form "Other settings" in user profile.
+#: actions/urlsettings.php:180
+#, fuzzy
+msgid "URL shortening service is too long (maximum 50 characters)."
+msgstr "Услугата за съкращаване е твърде дълга (може да е до 50 знака)."
+
+#: actions/urlsettings.php:187
+msgid "Invalid number for max url length."
+msgstr ""
+
+#: actions/urlsettings.php:193
+#, fuzzy
+msgid "Invalid number for max notice length."
+msgstr "Неправилен размер."
+
+#: actions/urlsettings.php:238
+msgid "Error saving user URL shortening preferences."
+msgstr ""
+
 #. TRANS: User admin panel title
 #: actions/useradminpanel.php:58
 msgctxt "TITLE"
@@ -6391,11 +6512,11 @@ msgstr ""
 #. TRANS: users in user admin panel. %1$s is the invalid nickname.
 #: actions/useradminpanel.php:166
 #, php-format
-msgid "Invalid default subscripton: '%1$s' is not a user."
+msgid "Invalid default subscripton: \"%1$s\" is not a user."
 msgstr ""
 
-#. TRANS: Link description in user account settings menu.
-#: actions/useradminpanel.php:215 lib/accountsettingsaction.php:106
+#: actions/useradminpanel.php:215 lib/action.php:565 lib/settingsnav.php:77
+#: lib/subgroupnav.php:81
 msgid "Profile"
 msgstr "Профил"
 
@@ -6459,58 +6580,62 @@ msgstr ""
 #. TRANS: Title for button to save user settings in user admin panel.
 #: actions/useradminpanel.php:302
 #, fuzzy
-msgid "Save user settings"
+msgid "Save user settings."
 msgstr "Запазване настройките на сайта"
 
-#: actions/userauthorization.php:105
+#. TRANS: Page title.
+#: actions/userauthorization.php:109
 msgid "Authorize subscription"
 msgstr "Одобряване на абонамента"
 
-#: actions/userauthorization.php:110
+#. TRANS: Page notice on "Auhtorize subscription" page.
+#: actions/userauthorization.php:115
 #, fuzzy
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
 "user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
-"click “Reject”."
+"click \"Reject\"."
 msgstr ""
 "Проверете тези детайли и се уверете, че искате да се абонирате за бележките "
 "на този потребител. Ако не искате абонамента, натиснете \"Cancel\" (Отказ)."
 
-#. TRANS: Menu item for site administration
-#: actions/userauthorization.php:196 actions/version.php:167
-#: lib/adminpanelaction.php:403
-msgid "License"
-msgstr "Лиценз"
-
-#: actions/userauthorization.php:217
+#. TRANS: Button text on Authorise Subscription page.
+#: actions/userauthorization.php:200
 #, fuzzy
+msgctxt "BUTTON"
 msgid "Accept"
 msgstr "Приемане"
 
-#: actions/userauthorization.php:218 lib/subscribeform.php:115
-#: lib/subscribeform.php:139
-msgid "Subscribe to this user"
+#. TRANS: Title for button on Authorise Subscription page.
+#: actions/userauthorization.php:202
+#, fuzzy
+msgid "Subscribe to this user."
 msgstr "Абониране за този потребител"
 
-#: actions/userauthorization.php:219
+#. TRANS: Button text on Authorise Subscription page.
+#: actions/userauthorization.php:204
 #, fuzzy
+msgctxt "BUTTON"
 msgid "Reject"
 msgstr "Охвърляне"
 
-#: actions/userauthorization.php:220
+#. TRANS: Title for button on Authorise Subscription page.
+#: actions/userauthorization.php:206
 #, fuzzy
-msgid "Reject this subscription"
+msgid "Reject this subscription."
 msgstr "Абонаменти на %s"
 
-#: actions/userauthorization.php:232
+#. TRANS: Client error displayed for an empty authorisation request.
+#: actions/userauthorization.php:219
 msgid "No authorization request!"
 msgstr "Няма заявка за одобрение."
 
-#: actions/userauthorization.php:254
+#. TRANS: Accept message header from Authorise subscription page.
+#: actions/userauthorization.php:242
 msgid "Subscription authorized"
 msgstr "Абонаментът е одобрен"
 
-#: actions/userauthorization.php:256
+#: actions/userauthorization.php:245
 #, fuzzy
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
@@ -6520,11 +6645,12 @@ msgstr ""
 "Абонаментът е одобрен, но не е зададен callback URL. За да завършите "
 "одобряването, проверете инструкциите на сайта. Вашият token за абонамент е:"
 
-#: actions/userauthorization.php:266
+#. TRANS: Reject message header from Authorise subscription page.
+#: actions/userauthorization.php:256
 msgid "Subscription rejected"
 msgstr "Абонаментът е отказан"
 
-#: actions/userauthorization.php:268
+#: actions/userauthorization.php:259
 #, fuzzy
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
@@ -6534,58 +6660,99 @@ msgstr ""
 "Абонаментът е отказан, но не е зададен callback URL. За да откажете напълно "
 "абонамента, проверете инструкциите на сайта."
 
-#: actions/userauthorization.php:303
+#. TRANS: Exception thrown when no valid user is found for an authorisation request.
+#. TRANS: %s is a listener URI.
+#: actions/userauthorization.php:296
 #, php-format
-msgid "Listener URI ‘%s’ not found here."
+msgid "Listener URI \"%s\" not found here."
 msgstr ""
 
-#: actions/userauthorization.php:308
+#. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
+#. TRANS: %s is a listenee URI.
+#: actions/userauthorization.php:303
 #, fuzzy, php-format
-msgid "Listenee URI ‘%s’ is too long."
+msgid "Listenee URI \"%s\" is too long."
 msgstr "Изходният адрес е твърде дълъг."
 
-#: actions/userauthorization.php:314
-#, fuzzy, php-format
-msgid "Listenee URI ‘%s’ is a local user."
-msgstr "Изходният адрес е твърде дълъг."
+#. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
+#. TRANS: %s is a listenee URI.
+#: actions/userauthorization.php:311
+#, php-format
+msgid "Listenee URI \"%s\" is a local user."
+msgstr ""
 
+#. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
+#. TRANS: %s is a profile URL.
 #: actions/userauthorization.php:329
 #, php-format
-msgid "Profile URL ‘%s’ is for a local user."
+msgid "Profile URL \"%s\" is for a local user."
 msgstr ""
 
-#: actions/userauthorization.php:345
+#. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
+#. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
+#: actions/userauthorization.php:339
+#, php-format
+msgid ""
+"Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
+"\"."
+msgstr ""
+
+#. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
+#. TRANS: %s is an avatar URL.
+#: actions/userauthorization.php:349
 #, fuzzy, php-format
-msgid "Avatar URL ‘%s’ is not valid."
+msgid "Avatar URL \"%s\" is not valid."
 msgstr "Адресът на личната страница не е правилен URL."
 
-#: actions/userauthorization.php:350
+#. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
+#. TRANS: %s is an avatar URL.
+#: actions/userauthorization.php:356
 #, fuzzy, php-format
-msgid "Can’t read avatar URL ‘%s’."
+msgid "Cannot read avatar URL \"%s\"."
 msgstr "Грешка при четене адреса на аватара '%s'"
 
-#: actions/userauthorization.php:355
+#. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
+#. TRANS: %s is an avatar URL.
+#: actions/userauthorization.php:363
 #, fuzzy, php-format
-msgid "Wrong image type for avatar URL ‘%s’."
+msgid "Wrong image type for avatar URL \"%s\"."
 msgstr "Грешен вид изображение за '%s'"
 
 #. TRANS: Page title for profile design page.
-#: actions/userdesignsettings.php:74 lib/designsettings.php:63
+#: actions/userdesignsettings.php:74 lib/designsettings.php:61
 #, fuzzy
 msgid "Profile design"
 msgstr "Настройки на профила"
 
 #. TRANS: Instructions for profile design page.
-#: actions/userdesignsettings.php:84 lib/designsettings.php:74
+#: actions/userdesignsettings.php:84 lib/designsettings.php:72
 msgid ""
 "Customize the way your profile looks with a background image and a colour "
 "palette of your choice."
 msgstr ""
 
-#: actions/userdesignsettings.php:272
+#: actions/userdesignsettings.php:289
 msgid "Enjoy your hotdog!"
 msgstr ""
 
+#: actions/userdesignsettings.php:325
+#, fuzzy
+msgid "Design settings"
+msgstr "Запазване настройките на сайта"
+
+#: actions/userdesignsettings.php:340
+msgid "View profile designs"
+msgstr "Редактиране на профила"
+
+#: actions/userdesignsettings.php:341
+msgid "Show or hide profile designs."
+msgstr ""
+
+#: actions/userdesignsettings.php:348
+#, fuzzy
+msgid "Background file"
+msgstr "Фон"
+
 #. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number.
 #: actions/usergroups.php:66
 #, php-format
@@ -6633,6 +6800,11 @@ msgstr ""
 msgid "Contributors"
 msgstr ""
 
+#. TRANS: Menu item for site administration
+#: actions/version.php:167 lib/adminpanelaction.php:403
+msgid "License"
+msgstr "Лиценз"
+
 #: actions/version.php:170
 msgid ""
 "StatusNet is free software: you can redistribute it and/or modify it under "
@@ -6656,12 +6828,13 @@ msgid ""
 "along with this program.  If not, see %s."
 msgstr ""
 
-#: actions/version.php:191
-msgid "Plugins"
-msgstr "Приставки"
+#. TRANS: Form input field label for application name.
+#: actions/version.php:197 lib/applicationeditform.php:190
+msgid "Name"
+msgstr "Име"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:901
+#: actions/version.php:198 lib/action.php:885
 msgid "Version"
 msgstr "Версия"
 
@@ -6669,6 +6842,12 @@ msgstr "Версия"
 msgid "Author(s)"
 msgstr "Автор(и)"
 
+#. TRANS: Form input field label.
+#: actions/version.php:200 lib/applicationeditform.php:208
+#: lib/groupeditform.php:168
+msgid "Description"
+msgstr "Описание"
+
 #. TRANS: Activity title when marking a notice as favorite.
 #: classes/Fave.php:164
 msgid "Favor"
@@ -6788,7 +6967,7 @@ msgid "Could not create login token for %s"
 msgstr "Грешка при отбелязване като любима."
 
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
-#: classes/Memcached_DataObject.php:542
+#: classes/Memcached_DataObject.php:556
 msgid "No database name or DSN found anywhere."
 msgstr ""
 
@@ -6970,18 +7149,18 @@ msgstr "%1$s вече получава бележките ви в %2$s."
 
 #. TRANS: Notice given on user registration.
 #. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:395
+#: classes/User.php:390
 #, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr "Добре дошли в %1$s, @%2$s!"
 
 #. TRANS: Server exception.
-#: classes/User.php:918
+#: classes/User.php:923
 msgid "No single user defined for single-user mode."
 msgstr ""
 
 #. TRANS: Server exception.
-#: classes/User.php:922
+#: classes/User.php:927
 msgid "Single-user mode code called when not enabled."
 msgstr ""
 
@@ -7026,42 +7205,6 @@ msgstr ""
 msgid "No AtomPub API service for %s."
 msgstr ""
 
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:104
-msgid "Change your profile settings"
-msgstr "Промяна настройките на профила"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:111
-msgid "Upload an avatar"
-msgstr "Качване на аватар"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:118
-msgid "Change your password"
-msgstr "Смяна на паролата"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:125
-msgid "Change email handling"
-msgstr "Промяна обработката на писмата"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:132
-#, fuzzy
-msgid "Design your profile"
-msgstr "Потребителски профил"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:139
-msgid "Other options"
-msgstr "Други настройки"
-
-#. TRANS: Link description in user account settings menu.
-#: lib/accountsettingsaction.php:141
-msgid "Other"
-msgstr "Друго"
-
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
 #: lib/action.php:161
 #, php-format
@@ -7079,212 +7222,128 @@ msgctxt "TOOLTIP"
 msgid "Show more"
 msgstr ""
 
-#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:544
+#. TRANS: Inline reply form submit button: submits a reply comment.
+#: lib/action.php:328
 #, fuzzy
-msgid "Primary site navigation"
-msgstr "Основна настройка на сайта"
+msgctxt "BUTTON"
+msgid "Comment"
+msgstr "Съдържание"
 
-#. TRANS: Tooltip for main menu option "Personal".
-#: lib/action.php:550
-msgctxt "TOOLTIP"
-msgid "Personal profile and friends timeline"
+#. TRANS: Placeholder text for inline reply form. Clicking in this box will turn it into a mini notice form.
+#: lib/action.php:331
+msgid "Add a comment..."
 msgstr ""
 
-#. TRANS: Main menu option when logged in for access to personal profile and friends timeline.
-#. TRANS: Personal group navigation menu option when logged in for viewing timeline of self and friends.
-#: lib/action.php:553 lib/personalgroupnav.php:100
-msgctxt "MENU"
-msgid "Personal"
-msgstr "Лично"
-
-#. TRANS: Tooltip for main menu option "Account".
-#: lib/action.php:555
-msgctxt "TOOLTIP"
-msgid "Change your email, avatar, password, profile"
-msgstr "Промяна на поща, аватар, парола, профил"
-
-#. TRANS: Main menu option when logged in for access to user settings.
-#: lib/action.php:558
-msgid "Account"
-msgstr "Сметка"
-
-#. TRANS: Tooltip for main menu option "Services".
-#: lib/action.php:560
-msgctxt "TOOLTIP"
-msgid "Connect to services"
-msgstr "Свързване към услуги"
-
-#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services.
-#: lib/action.php:563
-msgid "Connect"
-msgstr "Свързване"
-
-#. TRANS: Tooltip for menu option "Admin".
-#: lib/action.php:566
-msgctxt "TOOLTIP"
-msgid "Change site configuration"
-msgstr "Промяна настройките на сайта"
-
-#. TRANS: Main menu option when logged in and site admin for access to site configuration.
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/action.php:569 lib/groupnav.php:117
+#: lib/action.php:559 lib/personalgroupnav.php:99
 #, fuzzy
-msgctxt "MENU"
-msgid "Admin"
-msgstr "Настройки"
+msgid "Home"
+msgstr "Лична страница"
 
-#. TRANS: Tooltip for main menu option "Invite".
-#: lib/action.php:573
-#, php-format
-msgctxt "TOOLTIP"
-msgid "Invite friends and colleagues to join you on %s"
-msgstr "Поканете приятели и колеги да се присъединят към вас в %s"
+#: lib/action.php:560
+#, fuzzy
+msgid "Friends timeline"
+msgstr "Поток на %s"
+
+#: lib/action.php:566
+#, fuzzy
+msgid "Your profile"
+msgstr "Профил на групата"
+
+#: lib/action.php:570 lib/action.php:593 lib/publicgroupnav.php:78
+msgid "Public"
+msgstr "Общ поток"
+
+#: lib/action.php:571 lib/action.php:594
+#, fuzzy
+msgid "Everyone on this site"
+msgstr "Търсене на хора в сайта"
+
+#: lib/action.php:575
+#, fuzzy
+msgid "Settings"
+msgstr "Настройки за SMS"
 
-#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users.
 #: lib/action.php:576
 #, fuzzy
-msgctxt "MENU"
-msgid "Invite"
-msgstr "Покани"
+msgid "Change your personal settings"
+msgstr "Промяна настройките на профила"
 
-#. TRANS: Tooltip for main menu option "Logout"
 #: lib/action.php:582
-msgctxt "TOOLTIP"
-msgid "Logout from the site"
-msgstr "Излизане от сайта"
+#, fuzzy
+msgid "Site configuration"
+msgstr "Настройка на пътищата"
 
-#. TRANS: Main menu option when logged in to log out the current user.
-#: lib/action.php:585
-msgctxt "MENU"
+#: lib/action.php:587
+#, fuzzy
 msgid "Logout"
 msgstr "Изход"
 
-#. TRANS: Tooltip for main menu option "Register".
-#: lib/action.php:590
-msgctxt "TOOLTIP"
-msgid "Create an account"
-msgstr "Създаване на нова сметка"
+#: lib/action.php:588
+#, fuzzy
+msgid "Logout from the site"
+msgstr "Излизане от сайта"
 
-#. TRANS: Main menu option when not logged in to register a new account.
-#. TRANS: Menu item for registering with the StatusNet site.
-#: lib/action.php:593 lib/logingroupnav.php:85
-msgctxt "MENU"
-msgid "Register"
-msgstr "Регистриране"
-
-#. TRANS: Tooltip for main menu option "Login".
-#: lib/action.php:596
-msgctxt "TOOLTIP"
+#: lib/action.php:599
+#, fuzzy
 msgid "Login to the site"
 msgstr "Влизане в сайта"
 
-#. TRANS: Main menu option when not logged in to log in.
-#. TRANS: Menu item for logging in to the StatusNet site.
-#: lib/action.php:599 lib/logingroupnav.php:77
-msgctxt "MENU"
-msgid "Login"
-msgstr "Вход"
-
-#. TRANS: Tooltip for main menu option "Help".
-#: lib/action.php:602
+#: lib/action.php:606
 #, fuzzy
-msgctxt "TOOLTIP"
-msgid "Help me!"
-msgstr "Помощ"
-
-#. TRANS: Main menu option for help on the StatusNet site.
-#: lib/action.php:605
-msgctxt "MENU"
-msgid "Help"
-msgstr "Помощ"
-
-#. TRANS: Tooltip for main menu option "Search".
-#: lib/action.php:608
-msgctxt "TOOLTIP"
-msgid "Search for people or text"
-msgstr "Търсене за хора или бележки"
-
-#. TRANS: Main menu option when logged in or when the StatusNet instance is not private.
-#: lib/action.php:611
-msgctxt "MENU"
 msgid "Search"
 msgstr "Търсене"
 
-#. TRANS: DT element for site notice. String is hidden in default CSS.
-#. TRANS: Menu item for site administration
-#: lib/action.php:633 lib/adminpanelaction.php:387
+#: lib/action.php:607
 #, fuzzy
-msgid "Site notice"
-msgstr "Нова бележка"
-
-#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:700
-msgid "Local views"
-msgstr ""
-
-#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:770
-#, fuzzy
-msgid "Page notice"
-msgstr "Нова бележка"
-
-#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:874
-msgid "Secondary site navigation"
-msgstr "Основна настройка на сайта"
+msgid "Search the site"
+msgstr "Търсене в сайта"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:880
+#: lib/action.php:864
 msgid "Help"
 msgstr "Помощ"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:883
+#: lib/action.php:867
 msgid "About"
 msgstr "Относно"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:886
+#: lib/action.php:870
 msgid "FAQ"
 msgstr "Въпроси"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:891
+#: lib/action.php:875
 msgid "TOS"
 msgstr "Условия"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:895
+#: lib/action.php:879
 msgid "Privacy"
 msgstr "Поверителност"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:898
+#: lib/action.php:882
 msgid "Source"
 msgstr "Изходен код"
 
 #. TRANS: Secondary navigation menu option leading to e-mail contact information on the
 #. TRANS: StatusNet site, where to report bugs, ...
-#: lib/action.php:905
+#: lib/action.php:889
 msgid "Contact"
 msgstr "Контакт"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:908
+#: lib/action.php:892
 msgid "Badge"
 msgstr "Табелка"
 
-#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:937
-msgid "StatusNet software license"
-msgstr "Лиценз на програмата StatusNet"
-
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:944
+#: lib/action.php:921
 #, fuzzy, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7294,7 +7353,7 @@ msgstr ""
 "broughtby%%](%%site.broughtbyurl%%). "
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:947
+#: lib/action.php:924
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** е услуга за микроблогване."
@@ -7303,7 +7362,7 @@ msgstr "**%%site.name%%** е услуга за микроблогване."
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:954
+#: lib/action.php:931
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7314,51 +7373,41 @@ msgstr ""
 "достъпна под [GNU Affero General Public License](http://www.fsf.org/"
 "licensing/licenses/agpl-3.0.html)."
 
-#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:970
-msgid "Site content license"
-msgstr "Лиценз на съдържанието"
-
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:977
+#: lib/action.php:949
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:984
+#: lib/action.php:956
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:988
+#: lib/action.php:960
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:1020
+#: lib/action.php:992
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
 
-#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1356
-msgid "Pagination"
-msgstr "Страниране"
-
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1367
+#: lib/action.php:1335
 msgid "After"
 msgstr "След"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1377
+#: lib/action.php:1345
 msgid "Before"
 msgstr "Преди"
 
@@ -7518,7 +7567,7 @@ msgid "User configuration"
 msgstr "Настройка на пътищата"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:122
+#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:110
 msgid "User"
 msgstr "Потребител"
 
@@ -7544,6 +7593,12 @@ msgstr "Настройка на оформлението"
 msgid "Edit site notice"
 msgstr "Изтриване на бележката"
 
+#. TRANS: Menu item for site administration
+#: lib/adminpanelaction.php:387
+#, fuzzy
+msgid "Site notice"
+msgstr "Нова бележка"
+
 #. TRANS: Menu item title/tooltip
 #: lib/adminpanelaction.php:393
 #, fuzzy
@@ -7555,6 +7610,12 @@ msgstr "Настройка на пътищата"
 msgid "Set site license"
 msgstr ""
 
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:409
+#, fuzzy
+msgid "Plugins configuration"
+msgstr "Настройка на пътищата"
+
 #. TRANS: Client error 401.
 #: lib/apiauth.php:111
 msgid "API resource requires read-write access, but you only have read access."
@@ -7565,19 +7626,23 @@ msgstr ""
 msgid "No application for that consumer key."
 msgstr ""
 
+#: lib/apiauth.php:202 lib/apiauth.php:284
+msgid "Not allowed to use API."
+msgstr ""
+
 #. TRANS: OAuth exception given when an incorrect access token was given for a user.
-#: lib/apiauth.php:219
+#: lib/apiauth.php:225
 msgid "Bad access token."
 msgstr ""
 
 #. TRANS: OAuth exception given when no user was found for a given token (no token was found).
-#: lib/apiauth.php:224
+#: lib/apiauth.php:230
 msgid "No user for that token."
 msgstr ""
 
 #. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel".
 #. TRANS: Client error thrown when authentication fails.
-#: lib/apiauth.php:266 lib/apiauth.php:293
+#: lib/apiauth.php:272 lib/apiauth.php:302
 msgid "Could not authenticate you."
 msgstr ""
 
@@ -7625,6 +7690,11 @@ msgstr ""
 msgid "Failed to delete revoked token."
 msgstr ""
 
+#. TRANS: Form input field label for application icon.
+#: lib/applicationeditform.php:177
+msgid "Icon"
+msgstr "Икона"
+
 #. TRANS: Form guide.
 #: lib/applicationeditform.php:182
 #, fuzzy
@@ -7662,6 +7732,11 @@ msgstr "Изходен код"
 msgid "Organization responsible for this application"
 msgstr "Не сте собственик на това приложение."
 
+#. TRANS: Form input field label.
+#: lib/applicationeditform.php:227
+msgid "Organization"
+msgstr "Организация"
+
 #. TRANS: Form input field instructions.
 #: lib/applicationeditform.php:234
 #, fuzzy
@@ -7752,16 +7827,6 @@ msgstr ""
 msgid "Do not use this method!"
 msgstr "Да не се изтрива бележката"
 
-#. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:293
-msgid "Author"
-msgstr "Автор"
-
-#. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:307
-msgid "Provider"
-msgstr "Доставчик"
-
 #. TRANS: Title.
 #: lib/attachmentnoticesection.php:67
 msgid "Notices where this attachment appears"
@@ -7790,24 +7855,29 @@ msgstr "Паролата е записана."
 msgid "Block"
 msgstr "Блокиране"
 
+#. TRANS: Description of the form to block a user.
+#: lib/blockform.php:79
+msgid "Block this user"
+msgstr "Блокиране на потребителя"
+
 #. TRANS: Title for command results.
-#: lib/channel.php:160 lib/channel.php:181
+#: lib/channel.php:104 lib/channel.php:125
 msgid "Command results"
 msgstr "Резултат от командата"
 
 #. TRANS: Title for command results.
-#: lib/channel.php:194
+#: lib/channel.php:138
 #, fuzzy
 msgid "AJAX error"
 msgstr "Грешка в Ajax"
 
 #. TRANS: E-mail subject when a command has completed.
-#: lib/channel.php:233 lib/mailhandler.php:143
+#: lib/channel.php:177 lib/mailhandler.php:143
 msgid "Command complete"
 msgstr "Командата е изпълнена"
 
 #. TRANS: E-mail subject when a command has failed.
-#: lib/channel.php:244
+#: lib/channel.php:188
 msgid "Command failed"
 msgstr "Грешка при изпълнение на командата"
 
@@ -7912,7 +7982,7 @@ msgstr "Пълно име: %s"
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a location.
-#: lib/command.php:446 lib/mail.php:270
+#: lib/command.php:446 lib/mail.php:275
 #, php-format
 msgid "Location: %s"
 msgstr "Местоположение: %s"
@@ -7920,7 +7990,7 @@ msgstr "Местоположение: %s"
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a homepage.
-#: lib/command.php:450 lib/mail.php:274
+#: lib/command.php:450 lib/mail.php:279
 #, php-format
 msgid "Homepage: %s"
 msgstr "Домашна страница: %s"
@@ -8159,118 +8229,108 @@ msgid ""
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:162
+#: lib/common.php:36
 #, fuzzy
 msgid "No configuration file found."
 msgstr "Не е открит файл с настройки. "
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:165
+#: lib/common.php:39
 #, fuzzy
 msgid "I looked for configuration files in the following places:"
 msgstr "Изпратени са покани до следните хора:"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:168
+#: lib/common.php:42
 msgid "You may wish to run the installer to fix this."
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:172
+#: lib/common.php:46
 #, fuzzy
 msgid "Go to the installer."
 msgstr "Влизане в сайта"
 
-#. TRANS: Menu item for Instant Messaging settings.
-#: lib/connectsettingsaction.php:106
-#, fuzzy
-msgctxt "MENU"
-msgid "IM"
-msgstr "IM"
-
-#. TRANS: Tooltip for Instant Messaging menu item.
-#: lib/connectsettingsaction.php:108
-msgid "Updates by instant messenger (IM)"
-msgstr "Бележки през месинджър (IM)"
-
-#. TRANS: Menu item for Short Message Service settings.
-#: lib/connectsettingsaction.php:113
-#, fuzzy
-msgctxt "MENU"
-msgid "SMS"
-msgstr "SMS"
-
-#. TRANS: Tooltip for Short Message Service menu item.
-#: lib/connectsettingsaction.php:115
-msgid "Updates by SMS"
-msgstr "Бележки през SMS"
-
-#. TRANS: Menu item for OuAth connection settings.
-#: lib/connectsettingsaction.php:120
-#, fuzzy
-msgctxt "MENU"
-msgid "Connections"
-msgstr "Свързване"
-
-#. TRANS: Tooltip for connected applications (Connections through OAuth) menu item.
-#: lib/connectsettingsaction.php:122
-#, fuzzy
-msgid "Authorized connected applications"
-msgstr "Изтриване на приложението"
-
 #: lib/dberroraction.php:59
 msgid "Database error"
 msgstr "Грешка в базата от данни"
 
+#. TRANS: Description of form for deleting a user.
+#: lib/deleteuserform.php:75
+msgid "Delete this user"
+msgstr "Изтриване на този потребител"
+
+#: lib/designform.php:114
+#, fuzzy
+msgid "Change design"
+msgstr "Запазване настройките на сайта"
+
+#. TRANS: Fieldset legend on profile design page to change profile page colours.
+#: lib/designform.php:131
+msgid "Change colours"
+msgstr "Смяна на цветовете"
+
+#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
+#: lib/designform.php:138
+msgid "Use defaults"
+msgstr ""
+
+#. TRANS: Title for button on profile design page to reset all colour settings to default.
+#: lib/designform.php:140
+msgid "Restore default designs"
+msgstr ""
+
+#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
+#: lib/designform.php:148
+msgid "Reset back to default"
+msgstr ""
+
 #. TRANS: Label in form on profile design page.
 #. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
-#: lib/designsettings.php:108
+#: lib/designform.php:158
 msgid "Upload file"
 msgstr "Качване на файл"
 
 #. TRANS: Instructions for form on profile design page.
-#: lib/designsettings.php:113
+#: lib/designform.php:163
+#, fuzzy
 msgid ""
-"You can upload your personal background image. The maximum file size is 2MB."
+"You can upload your personal background image. The maximum file size is 2Mb."
 msgstr ""
 "Можете да качите лично изображение за фон. Максималната големина на файла е "
 "2MB."
 
 #. TRANS: Radio button on profile design page that will enable use of the uploaded profile image.
-#: lib/designsettings.php:139
+#: lib/designform.php:194
 #, fuzzy
 msgctxt "RADIO"
 msgid "On"
 msgstr "Вкл."
 
 #. TRANS: Radio button on profile design page that will disable use of the uploaded profile image.
-#: lib/designsettings.php:156
+#: lib/designform.php:211
 #, fuzzy
 msgctxt "RADIO"
 msgid "Off"
 msgstr "Изкл."
 
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: lib/designsettings.php:175
-msgid "Change colours"
-msgstr "Смяна на цветовете"
-
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: lib/designsettings.php:257
-msgid "Use defaults"
-msgstr ""
+#. TRANS: Title for button on profile design page to save settings.
+#: lib/designform.php:322
+#, fuzzy
+msgid "Save design"
+msgstr "Запазване настройките на сайта"
 
 #. TRANS: Error message displayed if design settings could not be saved.
 #. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
-#: lib/designsettings.php:405 lib/designsettings.php:427
+#: lib/designsettings.php:216 lib/designsettings.php:238
 #, fuzzy
 msgid "Couldn't update your design."
 msgstr "Грешка при обновяване на потребителя."
 
 #. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
-#: lib/designsettings.php:433
+#: lib/designsettings.php:244
 msgid "Design defaults restored."
 msgstr ""
 
@@ -8340,27 +8400,23 @@ msgstr ""
 msgid "Feeds"
 msgstr ""
 
-#: lib/galleryaction.php:121
-msgid "Filter tags"
-msgstr "Филтриране на етикетите"
-
-#: lib/galleryaction.php:131
+#: lib/galleryaction.php:128
 msgid "All"
 msgstr "Всички"
 
-#: lib/galleryaction.php:139
+#: lib/galleryaction.php:136
 msgid "Select tag to filter"
 msgstr "Изберете етикет за филтриране"
 
-#: lib/galleryaction.php:140
+#: lib/galleryaction.php:137
 msgid "Tag"
 msgstr "Етикет"
 
-#: lib/galleryaction.php:141
+#: lib/galleryaction.php:138
 msgid "Choose a tag to narrow list"
 msgstr "Изберете етикет за конкретизиране"
 
-#: lib/galleryaction.php:143
+#: lib/galleryaction.php:140
 msgid "Go"
 msgstr ""
 
@@ -8449,6 +8505,13 @@ msgctxt "TOOLTIP"
 msgid "%s blocked users"
 msgstr ""
 
+#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
+#: lib/groupnav.php:117
+#, fuzzy
+msgctxt "MENU"
+msgid "Admin"
+msgstr "Настройки"
+
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
 #: lib/groupnav.php:120
@@ -8558,39 +8621,63 @@ msgid_plural "%dB"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/jabber.php:387
+#: lib/implugin.php:262
 #, php-format
-msgid "[%s]"
-msgstr "[%s]"
+msgid ""
+"User \"%s\" on %s has said that your %s screenname belongs to them. If "
+"that's true, you can confirm by clicking on this URL: %s . (If you cannot "
+"click it, copy-and-paste it into the address bar of your browser). If that "
+"user isn't you, or if you didn't request this confirmation, just ignore this "
+"message."
+msgstr ""
 
-#: lib/jabber.php:567
+#: lib/implugin.php:349
 #, php-format
 msgid "Unknown inbox source %d."
 msgstr "Непознат език \"%s\"."
 
+#: lib/implugin.php:485
+#, fuzzy, php-format
+msgid "Message too long - maximum is %1$d characters, you sent %2$d."
+msgstr ""
+"Съобщението е твърде дълго. Най-много може да е %1$d знака, а сте въвели %2"
+"$d."
+
 #: lib/leaveform.php:114
 msgid "Leave"
 msgstr "Напускане"
 
+#. TRANS: Menu item for logging in to the StatusNet site.
+#: lib/logingroupnav.php:77
+msgctxt "MENU"
+msgid "Login"
+msgstr "Вход"
+
 #. TRANS: Title for menu item for logging in to the StatusNet site.
 #: lib/logingroupnav.php:79
 msgid "Login with a username and password"
 msgstr "Вход с име и парола"
 
+#. TRANS: Menu item for registering with the StatusNet site.
+#: lib/logingroupnav.php:85
+msgctxt "MENU"
+msgid "Register"
+msgstr "Регистриране"
+
 #. TRANS: Title for menu item for registering with the StatusNet site.
 #: lib/logingroupnav.php:87
 msgid "Sign up for a new account"
 msgstr "Създаване на нова сметка"
 
 #. TRANS: Subject for address confirmation email.
-#: lib/mail.php:168
+#: lib/mail.php:172
 msgid "Email address confirmation"
 msgstr "Потвърждаване адреса на е-поща"
 
 #. TRANS: Body for address confirmation email.
 #. TRANS: %1$s is the addressed user's nickname, %2$s is the StatusNet sitename,
 #. TRANS: %3$s is the URL to confirm at.
-#: lib/mail.php:173
+#: lib/mail.php:177
 #, php-format
 msgid ""
 "Hey, %1$s.\n"
@@ -8609,14 +8696,14 @@ msgstr ""
 
 #. TRANS: Subject of new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
-#: lib/mail.php:238
+#: lib/mail.php:243
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1$s вече получава бележките ви в %2$s."
 
 #. TRANS: This is a paragraph in a new-subscriber e-mail.
 #. TRANS: %s is a URL where the subscriber can be reported as abusive.
-#: lib/mail.php:245
+#: lib/mail.php:250
 #, php-format
 msgid ""
 "If you believe this account is being used abusively, you can block them from "
@@ -8628,7 +8715,7 @@ msgstr ""
 #. TRANS: %3$s is the subscriber's profile URL, %4$s is the subscriber's location (or empty)
 #. TRANS: %5$s is the subscriber's homepage URL (or empty), %6%s is the subscriber's bio (or empty)
 #. TRANS: %7$s is a link to the addressed user's e-mail settings.
-#: lib/mail.php:255
+#: lib/mail.php:260
 #, fuzzy, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -8655,14 +8742,14 @@ msgstr ""
 
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is biographical information.
-#: lib/mail.php:278
+#: lib/mail.php:283
 #, php-format
 msgid "Bio: %s"
 msgstr "Биография: %s"
 
 #. TRANS: Subject of notification mail for new posting email address.
 #. TRANS: %s is the StatusNet sitename.
-#: lib/mail.php:307
+#: lib/mail.php:312
 #, php-format
 msgid "New email address for posting to %s"
 msgstr "Нов адрес на е-поща за публикщуване в %s"
@@ -8670,7 +8757,7 @@ msgstr "Нов адрес на е-поща за публикщуване в %s"
 #. TRANS: Body of notification mail for new posting email address.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is the e-mail address to send
 #. TRANS: to to post by e-mail, %3$s is a URL to more instructions.
-#: lib/mail.php:313
+#: lib/mail.php:318
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -8685,26 +8772,26 @@ msgstr ""
 
 #. TRANS: Subject line for SMS-by-email notification messages.
 #. TRANS: %s is the posting user's nickname.
-#: lib/mail.php:434
+#: lib/mail.php:439
 #, php-format
 msgid "%s status"
 msgstr "Състояние на %s"
 
 #. TRANS: Subject line for SMS-by-email address confirmation message.
-#: lib/mail.php:460
+#: lib/mail.php:465
 msgid "SMS confirmation"
 msgstr "Потвърждение за SMS"
 
 #. TRANS: Main body heading for SMS-by-email address confirmation message.
 #. TRANS: %s is the addressed user's nickname.
-#: lib/mail.php:464
+#: lib/mail.php:469
 #, fuzzy, php-format
 msgid "%s: confirm you own this phone number with this code:"
 msgstr "Очаква се потвърждение за този телефонен номер."
 
 #. TRANS: Subject for 'nudge' notification email.
 #. TRANS: %s is the nudging user.
-#: lib/mail.php:485
+#: lib/mail.php:490
 #, fuzzy, php-format
 msgid "You have been nudged by %s"
 msgstr "Побутнати сте от %s"
@@ -8712,7 +8799,7 @@ msgstr "Побутнати сте от %s"
 #. TRANS: Body for 'nudge' notification email.
 #. TRANS: %1$s is the nuding user's long name, $2$s is the nudging user's nickname,
 #. TRANS: %3$s is a URL to post notices at, %4$s is the StatusNet sitename.
-#: lib/mail.php:492
+#: lib/mail.php:497
 #, php-format
 msgid ""
 "%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -8730,7 +8817,7 @@ msgstr ""
 
 #. TRANS: Subject for direct-message notification email.
 #. TRANS: %s is the sending user's nickname.
-#: lib/mail.php:539
+#: lib/mail.php:544
 #, php-format
 msgid "New private message from %s"
 msgstr "Ново лично съобщение от %s"
@@ -8739,7 +8826,7 @@ msgstr "Ново лично съобщение от %s"
 #. TRANS: %1$s is the sending user's long name, %2$s is the sending user's nickname,
 #. TRANS: %3$s is the message content, %4$s a URL to the message,
 #. TRANS: %5$s is the StatusNet sitename.
-#: lib/mail.php:547
+#: lib/mail.php:552
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -8760,7 +8847,7 @@ msgstr ""
 
 #. TRANS: Subject for favorite notification e-mail.
 #. TRANS: %1$s is the adding user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:599
+#: lib/mail.php:604
 #, fuzzy, php-format
 msgid "%1$s (@%2$s) added your notice as a favorite"
 msgstr "%s (@%s) отбеляза бележката ви като любима"
@@ -8770,7 +8857,7 @@ msgstr "%s (@%s) отбеляза бележката ви като любима"
 #. TRANS: %3$s is a URL to the faved notice, %4$s is the faved notice text,
 #. TRANS: %5$s is a URL to all faves of the adding user, %6$s is the StatusNet sitename,
 #. TRANS: %7$s is the adding user's nickname.
-#: lib/mail.php:606
+#: lib/mail.php:611
 #, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -8792,7 +8879,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:664
+#: lib/mail.php:669
 #, php-format
 msgid ""
 "The full conversation can be read here:\n"
@@ -8802,7 +8889,7 @@ msgstr ""
 
 #. TRANS: E-mail subject for notice notification.
 #. TRANS: %1$s is the sending user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:672
+#: lib/mail.php:677
 #, fuzzy, php-format
 msgid "%1$s (@%2$s) sent a notice to your attention"
 msgstr "%s (@%s) отбеляза бележката ви като любима"
@@ -8813,7 +8900,7 @@ msgstr "%s (@%s) отбеляза бележката ви като любима"
 #. TRANS: %5$s is a URL to the full conversion if it exists (otherwise empty),
 #. TRANS: %6$s is a URL to reply to the notice, %7$s is a URL to all @-replied for the addressed user,
 #. TRANS: %8$s is a URL to the addressed user's e-mail settings, %9$s is the sender's nickname.
-#: lib/mail.php:680
+#: lib/mail.php:685
 #, php-format
 msgid ""
 "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -8930,11 +9017,7 @@ msgstr "Не сте абонирани!"
 msgid "To"
 msgstr "До"
 
-#: lib/messageform.php:166 lib/noticeform.php:186
-msgid "Available characters"
-msgstr "Налични знаци"
-
-#: lib/messageform.php:185 lib/noticeform.php:237
+#: lib/messageform.php:184 lib/noticeform.php:236
 #, fuzzy
 msgctxt "Send button for sending notice"
 msgid "Send"
@@ -8945,17 +9028,10 @@ msgstr "Прати"
 msgid "Messages"
 msgstr "Съобщение"
 
-#: lib/messagelistitem.php:123 lib/noticelist.php:522
+#: lib/messagelistitem.php:123 lib/noticelist.php:527
 msgid "from"
 msgstr "от"
 
-#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:165
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr ""
-"Псевдонимът може да съдържа само малки букви, числа и никакво разстояние "
-"между тях."
-
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 #: lib/nickname.php:178
 msgid "Nickname cannot be empty."
@@ -8978,79 +9054,83 @@ msgstr "Изпращане на бележка"
 msgid "What's up, %s?"
 msgstr "Какво става, %s?"
 
-#: lib/noticeform.php:194
+#: lib/noticeform.php:193
 msgid "Attach"
 msgstr "Прикрепяне"
 
-#: lib/noticeform.php:198
+#: lib/noticeform.php:197
 msgid "Attach a file"
 msgstr "Прикрепяне на файл"
 
-#: lib/noticeform.php:213
+#: lib/noticeform.php:212
 msgid "Share my location"
 msgstr "Споделяне на местоположението ми"
 
-#: lib/noticeform.php:216
+#: lib/noticeform.php:215
 msgid "Do not share my location"
 msgstr "Без споделяне на местоположението ми"
 
-#: lib/noticeform.php:217
+#: lib/noticeform.php:216
 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
 "try again later"
 msgstr ""
 
 #. TRANS: Used in coordinates as abbreviation of north
-#: lib/noticelist.php:452
+#: lib/noticelist.php:457
 msgid "N"
 msgstr "С"
 
 #. TRANS: Used in coordinates as abbreviation of south
-#: lib/noticelist.php:454
+#: lib/noticelist.php:459
 msgid "S"
 msgstr "Ю"
 
 #. TRANS: Used in coordinates as abbreviation of east
-#: lib/noticelist.php:456
+#: lib/noticelist.php:461
 msgid "E"
 msgstr "И"
 
 #. TRANS: Used in coordinates as abbreviation of west
-#: lib/noticelist.php:458
+#: lib/noticelist.php:463
 msgid "W"
 msgstr "З"
 
-#: lib/noticelist.php:460
+#: lib/noticelist.php:465
 #, php-format
 msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgstr ""
 
-#: lib/noticelist.php:469
+#: lib/noticelist.php:474
 #, fuzzy
 msgid "at"
 msgstr "Път"
 
-#: lib/noticelist.php:518
+#: lib/noticelist.php:523
 msgid "web"
 msgstr ""
 
-#: lib/noticelist.php:584
+#: lib/noticelist.php:589
 msgid "in context"
 msgstr "в контекст"
 
-#: lib/noticelist.php:619
+#: lib/noticelist.php:624
 msgid "Repeated by"
 msgstr "Повторено от"
 
-#: lib/noticelist.php:646
+#: lib/noticelist.php:651
 msgid "Reply to this notice"
 msgstr "Отговаряне на тази бележка"
 
-#: lib/noticelist.php:647
+#: lib/noticelist.php:652
 msgid "Reply"
 msgstr "Отговор"
 
-#: lib/noticelist.php:691
+#: lib/noticelist.php:678
+msgid "Delete this notice"
+msgstr "Изтриване на бележката"
+
+#: lib/noticelist.php:696
 msgid "Notice repeated"
 msgstr "Бележката е повторена."
 
@@ -9087,48 +9167,31 @@ msgstr ""
 msgid "Couldn't insert new subscription."
 msgstr "Грешка при добавяне на нов абонамент."
 
-#. TRANS: Personal group navigation menu option when logged in for viewing @-replies.
-#: lib/personalgroupnav.php:107
+#: lib/personalgroupnav.php:104
 #, fuzzy
-msgctxt "MENU"
 msgid "Replies"
 msgstr "Отговори"
 
-#. TRANS: Personal group navigation menu option when logged in for seeing own profile.
-#: lib/personalgroupnav.php:114
+#: lib/personalgroupnav.php:109
 #, fuzzy
-msgctxt "MENU"
-msgid "Profile"
-msgstr "Профил"
-
-#. TRANS: Personal group navigation menu option when logged in for viewing own favourited notices.
-#: lib/personalgroupnav.php:120
-#, fuzzy
-msgctxt "MENU"
 msgid "Favorites"
 msgstr "Любими"
 
-#. TRANS: Personal group navigation menu option when logged in for viewing recieved personal messages.
-#: lib/personalgroupnav.php:133
+#: lib/personalgroupnav.php:120
 #, fuzzy
-msgctxt "MENU"
 msgid "Inbox"
 msgstr "Входящи"
 
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing recieved personal messages.
-#: lib/personalgroupnav.php:135
+#: lib/personalgroupnav.php:121
 msgid "Your incoming messages"
 msgstr "Получените от вас съобщения"
 
-#. TRANS: Personal group navigation menu option when logged in for viewing senet personal messages.
-#: lib/personalgroupnav.php:140
+#: lib/personalgroupnav.php:125
 #, fuzzy
-msgctxt "MENU"
 msgid "Outbox"
 msgstr "Изходящи"
 
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing senet personal messages.
-#: lib/personalgroupnav.php:142
+#: lib/personalgroupnav.php:126
 msgid "Your sent messages"
 msgstr "Изпратените от вас съобщения"
 
@@ -9143,9 +9206,26 @@ msgstr "Етикети в бележките на %s"
 msgid "Unknown"
 msgstr "Непознато"
 
+#. TRANS: Plugin admin panel controls
+#: lib/plugindisableform.php:90
+msgctxt "plugin"
+msgid "Disable"
+msgstr ""
+
+#. TRANS: Plugin admin panel controls
+#: lib/pluginenableform.php:112
+msgctxt "plugin"
+msgid "Enable"
+msgstr ""
+
+#: lib/pluginlist.php:196
+msgctxt "plugin-description"
+msgid "(Plugin descriptions unavailable when disabled.)"
+msgstr ""
+
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:82
+#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:88
 msgid "Subscriptions"
 msgstr "Абонаменти"
 
@@ -9156,7 +9236,7 @@ msgstr "Всички абонаменти"
 
 #. TRANS: H2 text for user subscriber statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:90
+#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:96
 msgid "Subscribers"
 msgstr "Абонати"
 
@@ -9179,7 +9259,7 @@ msgstr "Участник от"
 #. TRANS: Label for user statistics.
 #. TRANS: H2 text for user group membership statistics.
 #: lib/profileaction.php:239 lib/profileaction.php:290
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:104
 msgid "Groups"
 msgstr "Групи"
 
@@ -9199,10 +9279,6 @@ msgstr "Всички групи"
 msgid "Unimplemented method."
 msgstr ""
 
-#: lib/publicgroupnav.php:78
-msgid "Public"
-msgstr "Общ поток"
-
 #: lib/publicgroupnav.php:82
 msgid "User groups"
 msgstr "Групи"
@@ -9241,7 +9317,7 @@ msgid "Revoke the \"%s\" role from this user"
 msgstr "Списък с потребителите в тази група."
 
 #. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:974
+#: lib/router.php:1001
 #, fuzzy
 msgid "Page not found."
 msgstr "Не е открит методът в API."
@@ -9273,11 +9349,6 @@ msgctxt "BUTTON"
 msgid "Search"
 msgstr "Търсене"
 
-#. TRANS: Definition list item with instructions on how to get (better) search results.
-#: lib/searchaction.php:170
-msgid "Search help"
-msgstr "Помощ за търсенето"
-
 #: lib/searchgroupnav.php:80
 msgid "People"
 msgstr "Хора"
@@ -9302,6 +9373,53 @@ msgstr "Неозаглавен раздел"
 msgid "More..."
 msgstr "Още…"
 
+#: lib/settingsnav.php:78
+msgid "Change your profile settings"
+msgstr "Промяна настройките на профила"
+
+#: lib/settingsnav.php:83
+msgid "Upload an avatar"
+msgstr "Качване на аватар"
+
+#: lib/settingsnav.php:88
+msgid "Change your password"
+msgstr "Смяна на паролата"
+
+#: lib/settingsnav.php:93
+msgid "Change email handling"
+msgstr "Промяна обработката на писмата"
+
+#: lib/settingsnav.php:98
+#, fuzzy
+msgid "Design your profile"
+msgstr "Потребителски профил"
+
+#: lib/settingsnav.php:102
+msgid "URL"
+msgstr "URL"
+
+#: lib/settingsnav.php:103
+msgid "URL shorteners"
+msgstr ""
+
+#: lib/settingsnav.php:111
+msgid "Updates by instant messenger (IM)"
+msgstr "Бележки през месинджър (IM)"
+
+#: lib/settingsnav.php:118
+msgid "Updates by SMS"
+msgstr "Бележки през SMS"
+
+#: lib/settingsnav.php:123
+#, fuzzy
+msgid "Connections"
+msgstr "Свързване"
+
+#: lib/settingsnav.php:124
+#, fuzzy
+msgid "Authorized connected applications"
+msgstr "Изтриване на приложението"
+
 #: lib/silenceform.php:67
 msgid "Silence"
 msgstr "Заглушаване"
@@ -9310,30 +9428,34 @@ msgstr "Заглушаване"
 msgid "Silence this user"
 msgstr "Заглушаване на този потребител."
 
-#: lib/subgroupnav.php:83
+#: lib/subgroupnav.php:89
 #, php-format
 msgid "People %s subscribes to"
 msgstr "Абонаменти на %s"
 
-#: lib/subgroupnav.php:91
+#: lib/subgroupnav.php:97
 #, php-format
 msgid "People subscribed to %s"
 msgstr "Абонирани за %s"
 
-#: lib/subgroupnav.php:99
+#: lib/subgroupnav.php:105
 #, php-format
 msgid "Groups %s is a member of"
 msgstr "Групи, в които участва %s"
 
-#: lib/subgroupnav.php:105
+#: lib/subgroupnav.php:111
 msgid "Invite"
 msgstr "Покани"
 
-#: lib/subgroupnav.php:106
+#: lib/subgroupnav.php:112
 #, php-format
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Поканете приятели и колеги да се присъединят към вас в %s"
 
+#: lib/subscribeform.php:115 lib/subscribeform.php:139
+msgid "Subscribe to this user"
+msgstr "Абониране за този потребител"
+
 #: lib/subscriberspeopleselftagcloudsection.php:48
 #: lib/subscriptionspeopleselftagcloudsection.php:48
 msgid "People Tagcloud as self-tagged"
@@ -9404,6 +9526,13 @@ msgstr ""
 msgid "Error opening theme archive."
 msgstr "Грешка при изпращане на прякото съобщение"
 
+#: lib/threadednoticelist.php:270
+#, php-format
+msgid "Show all %d comment"
+msgid_plural "Show all %d comments"
+msgstr[0] ""
+msgstr[1] ""
+
 #: lib/topposterssection.php:74
 msgid "Top posters"
 msgstr "Най-често пишещи"
@@ -9448,77 +9577,81 @@ msgstr "Отписване"
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "Потребителят няма профил."
 
-#. TRANS: Link text for changeing the avatar of the logged in user.
-#: lib/userprofile.php:121
+#: lib/userprofile.php:116
 msgid "Edit Avatar"
 msgstr "Редактиране на аватара"
 
 #. TRANS: H2 for user actions in a profile.
 #. TRANS: H2 for entity actions in a profile.
-#: lib/userprofile.php:245 lib/userprofile.php:261
+#: lib/userprofile.php:216 lib/userprofile.php:232
 msgid "User actions"
 msgstr "Потребителски действия"
 
 #. TRANS: Text shown in user profile of not yet compeltely deleted users.
-#: lib/userprofile.php:249
+#: lib/userprofile.php:220
 msgid "User deletion in progress..."
 msgstr ""
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:277
+#: lib/userprofile.php:248
 msgid "Edit profile settings"
 msgstr "Редактиране на профила"
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:279
+#: lib/userprofile.php:250
 msgid "Edit"
 msgstr "Редактиране"
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:303
+#: lib/userprofile.php:274
 msgid "Send a direct message to this user"
 msgstr "Изпращате на пряко съобщение до този потребител."
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:305
+#: lib/userprofile.php:276
 msgid "Message"
 msgstr "Съобщение"
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:347
+#: lib/userprofile.php:318
 #, fuzzy
 msgid "Moderate"
 msgstr "Модератор"
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:386
+#: lib/userprofile.php:357
 msgid "User role"
 msgstr "Потребителска роля"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:389
+#: lib/userprofile.php:360
 msgctxt "role"
 msgid "Administrator"
 msgstr "Администратор"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:391
+#: lib/userprofile.php:362
 msgctxt "role"
 msgid "Moderator"
 msgstr "Модератор"
 
+#: lib/util.php:321
+#, fuzzy
+msgid "Not allowed to log in."
+msgstr "Не сте влезли в системата."
+
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1306
+#: lib/util.php:1337
 msgid "a few seconds ago"
 msgstr "преди няколко секунди"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1309
+#: lib/util.php:1340
 msgid "about a minute ago"
 msgstr "преди около минута"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1313
+#: lib/util.php:1344
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
@@ -9526,12 +9659,12 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1316
+#: lib/util.php:1347
 msgid "about an hour ago"
 msgstr "преди около час"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1320
+#: lib/util.php:1351
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
@@ -9539,12 +9672,12 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1323
+#: lib/util.php:1354
 msgid "about a day ago"
 msgstr "преди около ден"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1327
+#: lib/util.php:1358
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
@@ -9552,12 +9685,12 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1330
+#: lib/util.php:1361
 msgid "about a month ago"
 msgstr "преди около месец"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1334
+#: lib/util.php:1365
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
@@ -9565,7 +9698,7 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1337
+#: lib/util.php:1368
 msgid "about a year ago"
 msgstr "преди около година"
 
@@ -9576,25 +9709,6 @@ msgstr "преди около година"
 msgid "%s is not a valid color! Use 3 or 6 hex characters."
 msgstr "%s не е допустим цвят! Използвайте 3 или 6 шестнадесетични знака."
 
-#. TRANS: %s is the URL to the StatusNet site's Instant Messaging settings.
-#: lib/xmppmanager.php:287
-#, php-format
-msgid "Unknown user. Go to %s to add your address to your account"
-msgstr ""
-
-#. TRANS: Response to XMPP source when it sent too long a message.
-#. TRANS: %1$d the maximum number of allowed characters (used for plural), %2$d is the sent number.
-#: lib/xmppmanager.php:406
-#, fuzzy, php-format
-msgid "Message too long. Maximum is %1$d character, you sent %2$d."
-msgid_plural "Message too long. Maximum is %1$d characters, you sent %2$d."
-msgstr[0] ""
-"Съобщението е твърде дълго. Най-много може да е %1$d знака, а сте въвели %2"
-"$d."
-msgstr[1] ""
-"Съобщението е твърде дълго. Най-много може да е %1$d знака, а сте въвели %2"
-"$d."
-
 #. TRANS: Exception.
 #: lib/xrd.php:63
 #, fuzzy
@@ -9613,57 +9727,167 @@ msgid "Getting backup from file '%s'."
 msgstr ""
 
 #, fuzzy
-#~ msgid "Block this user."
-#~ msgstr "Блокиране на потребителя"
+#~ msgid "Could not generate feed for group - %s"
+#~ msgstr "Грешка при обновяване на групата."
 
 #, fuzzy
-#~ msgid "Delete this notice."
-#~ msgstr "Изтриване на бележката"
+#~ msgid "Current confirmed Jabber/Google Talk address."
+#~ msgstr "Текущ потвърден Jabber/GTalk адрес."
 
 #, fuzzy
-#~ msgid "Delete this user."
-#~ msgstr "Изтриване на този потребител"
+#~ msgid ""
+#~ "Jabber or Google Talk address, like \"UserName@example.org\". First, make "
+#~ "sure to add %s to your buddy list in your IM client or on Google Talk."
+#~ msgstr ""
+#~ "Jabber или GTalk адрес, като \"UserName@example.org\". Първо се уверете, "
+#~ "че сте добавили %s в списъка си с приятели в IM или GTalk клиента си."
 
 #, fuzzy
-#~ msgid "Restore default designs."
-#~ msgstr "Грешка при записване настройките за Twitter"
+#~ msgid "Send me notices through Jabber/Google Talk."
+#~ msgstr "Изпращане на бележките по Jabber/GTalk."
 
 #, fuzzy
-#~ msgid "Save design."
-#~ msgstr "Запазване настройките на сайта"
+#~ msgid "Publish a MicroID for my Jabber/Google Talk address."
+#~ msgstr "Публикуване на MicroID за адреса в Jabber/GTalk."
+
+#~ msgid "No Jabber ID."
+#~ msgstr "Няма Jabber ID."
 
 #, fuzzy
-#~ msgid "Disfavor favorite."
-#~ msgstr "Добавяне към любимите"
+#~ msgid "Not a valid Jabber ID."
+#~ msgstr "Неправилен Jabber ID"
+
+#~ msgid "That is already your Jabber ID."
+#~ msgstr "Това вече е вашият Jabber ID."
+
+#~ msgid "That is not your Jabber ID."
+#~ msgstr "Това не е вашият Jabber ID."
+
+#~ msgid "Other settings"
+#~ msgstr "Други настройки"
 
 #, fuzzy
-#~ msgid "\"%s\" not found."
-#~ msgstr "Не е открит методът в API."
+#~ msgid "Tag cloud"
+#~ msgstr "Смяна на цветовете"
 
 #, fuzzy
-#~ msgid "Notice %s not found."
-#~ msgstr "Не е открит методът в API."
+#~ msgid "Authorize URL"
+#~ msgstr "Автор"
+
+#~ msgid "Jabber"
+#~ msgstr "Jabber"
+
+#~ msgid "Photo"
+#~ msgstr "Снимка"
+
+#~ msgid "Other options"
+#~ msgstr "Други настройки"
+
+#~ msgid "Other"
+#~ msgstr "Друго"
 
 #, fuzzy
-#~ msgid "Attachment %s not found."
-#~ msgstr "Получателят не е открит"
+#~ msgid "Primary site navigation"
+#~ msgstr "Основна настройка на сайта"
+
+#~ msgctxt "MENU"
+#~ msgid "Personal"
+#~ msgstr "Лично"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Change your email, avatar, password, profile"
+#~ msgstr "Промяна на поща, аватар, парола, профил"
+
+#~ msgid "Account"
+#~ msgstr "Сметка"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Connect to services"
+#~ msgstr "Свързване към услуги"
+
+#~ msgid "Connect"
+#~ msgstr "Свързване"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Change site configuration"
+#~ msgstr "Промяна настройките на сайта"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Invite friends and colleagues to join you on %s"
+#~ msgstr "Поканете приятели и колеги да се присъединят към вас в %s"
 
 #, fuzzy
-#~ msgid "Invalid tag: \"%s\"."
-#~ msgstr "Неправилен етикет: \"%s\""
+#~ msgctxt "MENU"
+#~ msgid "Invite"
+#~ msgstr "Покани"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Create an account"
+#~ msgstr "Създаване на нова сметка"
 
 #, fuzzy
-#~ msgid "Password saved"
-#~ msgstr "Паролата е записана."
+#~ msgctxt "TOOLTIP"
+#~ msgid "Help me!"
+#~ msgstr "Помощ"
+
+#~ msgctxt "MENU"
+#~ msgid "Help"
+#~ msgstr "Помощ"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Search for people or text"
+#~ msgstr "Търсене за хора или бележки"
 
 #, fuzzy
-#~ msgid "Where you are, like \"City, State (or Region), Country\"."
-#~ msgstr "Къде се намирате (град, община, държава и т.н.)"
+#~ msgid "Page notice"
+#~ msgstr "Нова бележка"
+
+#~ msgid "Secondary site navigation"
+#~ msgstr "Основна настройка на сайта"
+
+#~ msgid "StatusNet software license"
+#~ msgstr "Лиценз на програмата StatusNet"
+
+#~ msgid "Site content license"
+#~ msgstr "Лиценз на съдържанието"
+
+#~ msgid "Pagination"
+#~ msgstr "Страниране"
+
+#~ msgid "Author"
+#~ msgstr "Автор"
+
+#~ msgid "Provider"
+#~ msgstr "Доставчик"
 
 #, fuzzy
-#~ msgid "Subscribe to this user."
-#~ msgstr "Абониране за този потребител"
+#~ msgctxt "MENU"
+#~ msgid "SMS"
+#~ msgstr "SMS"
+
+#~ msgid "Filter tags"
+#~ msgstr "Филтриране на етикетите"
+
+#~ msgid "[%s]"
+#~ msgstr "[%s]"
+
+#~ msgid "Available characters"
+#~ msgstr "Налични знаци"
 
 #, fuzzy
-#~ msgid "Not allowed to log in."
-#~ msgstr "Не сте влезли в системата."
+#~ msgctxt "MENU"
+#~ msgid "Profile"
+#~ msgstr "Профил"
+
+#~ msgid "Search help"
+#~ msgstr "Помощ за търсенето"
+
+#, fuzzy
+#~ msgid "Message too long. Maximum is %1$d character, you sent %2$d."
+#~ msgid_plural "Message too long. Maximum is %1$d characters, you sent %2$d."
+#~ msgstr[0] ""
+#~ "Съобщението е твърде дълго. Най-много може да е %1$d знака, а сте въвели %"
+#~ "2$d."
+#~ msgstr[1] ""
+#~ "Съобщението е твърде дълго. Най-много може да е %1$d знака, а сте въвели %"
+#~ "2$d."
diff --git a/locale/br/LC_MESSAGES/statusnet.po b/locale/br/LC_MESSAGES/statusnet.po
index c368616265..27d00a8860 100644
--- a/locale/br/LC_MESSAGES/statusnet.po
+++ b/locale/br/LC_MESSAGES/statusnet.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 15:58+0000\n"
-"PO-Revision-Date: 2011-03-03 16:00:13+0000\n"
+"POT-Creation-Date: 2011-03-03 17:23+0000\n"
+"PO-Revision-Date: 2011-03-03 17:25:42+0000\n"
 "Language-Team: Breton <http://translatewiki.net/wiki/Portal:br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -80,23 +80,23 @@ msgstr "Enrollañ an arventennoù moned"
 #. TRANS: Tooltip for button to save access settings in site admin panel.
 #. TRANS: Button text for saving theme settings.
 #. TRANS: Button label to save e-mail preferences.
-#. TRANS: Button label to save Instant Messaging preferences.
-#. TRANS: Button text for saving "Other settings" in profile.
+#. TRANS: Button label to save IM preferences.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
 #. TRANS: Button text for saving site notice in admin panel.
 #. TRANS: Button label to save SMS preferences.
 #. TRANS: Save button for settings for a profile in a subscriptions list.
+#. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
 #. TRANS: Button text on profile design page to save settings.
 #: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
-#: actions/emailsettings.php:250 actions/imsettings.php:183
-#: actions/othersettings.php:136 actions/pathsadminpanel.php:512
-#: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
-#: actions/smssettings.php:205 actions/subscriptions.php:259
+#: actions/emailsettings.php:251 actions/imsettings.php:199
+#: actions/pathsadminpanel.php:512 actions/profilesettings.php:198
+#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:204
+#: actions/subscriptions.php:261 actions/urlsettings.php:152
 #: actions/useradminpanel.php:298 lib/applicationeditform.php:355
-#: lib/designsettings.php:270 lib/groupeditform.php:201
+#: lib/designform.php:320 lib/groupeditform.php:201
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Enrollañ"
@@ -135,7 +135,11 @@ msgstr "N'eus ket eus ar bajenn-se."
 #. 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 use "one time password login" without using an existing user.
+#. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
+#. TRANS: Client error displayed trying to find a user by ID for a non-existing ID.
+#. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when calling a profile action without specifying a user.
 #: actions/all.php:80 actions/allrss.php:69
@@ -147,19 +151,19 @@ msgstr "N'eus ket eus ar bajenn-se."
 #: actions/apidirectmessage.php:75 actions/apidirectmessagenew.php:72
 #: actions/apigroupcreate.php:111 actions/apigroupismember.php:89
 #: actions/apigroupjoin.php:98 actions/apigroupleave.php:98
-#: actions/apigrouplist.php:70 actions/apistatusesupdate.php:230
-#: actions/apisubscriptions.php:85 actions/apitimelinefavorites.php:70
-#: actions/apitimelinefriends.php:173 actions/apitimelinehome.php:78
-#: actions/apitimelinementions.php:77 actions/apitimelineuser.php:79
-#: actions/avatarbynickname.php:79 actions/favoritesrss.php:72
-#: actions/foaf.php:42 actions/foaf.php:61 actions/hcard.php:67
-#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
-#: actions/remotesubscribe.php:144 actions/remotesubscribe.php:153
-#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
-#: actions/showfavorites.php:106 actions/userbyid.php:74
-#: actions/usergroups.php:93 actions/userrss.php:40 actions/userxrd.php:59
-#: actions/xrds.php:71 lib/command.php:509 lib/galleryaction.php:59
-#: lib/mailbox.php:80 lib/profileaction.php:77
+#: actions/apigrouplist.php:70 actions/apigroupprofileupdate.php:108
+#: actions/apistatusesupdate.php:230 actions/apisubscriptions.php:85
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:173
+#: actions/apitimelinehome.php:78 actions/apitimelinementions.php:77
+#: actions/apitimelineuser.php:79 actions/avatarbynickname.php:79
+#: actions/favoritesrss.php:72 actions/foaf.php:42 actions/foaf.php:61
+#: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116
+#: actions/otp.php:78 actions/remotesubscribe.php:144
+#: actions/remotesubscribe.php:153 actions/replies.php:73
+#: actions/repliesrss.php:38 actions/rsd.php:113 actions/showfavorites.php:106
+#: actions/userbyid.php:75 actions/usergroups.php:93 actions/userrss.php:40
+#: actions/userxrd.php:59 actions/xrds.php:71 lib/command.php:509
+#: lib/galleryaction.php:59 lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "N'eus ket eus an implijer-se."
 
@@ -173,10 +177,9 @@ msgstr "%1$s hag e vignoned, pajenn %2$d"
 #. TRANS: H1 text for page. %s is a user nickname.
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Timeline title for user and friends. %s is a user nickname.
-#. TRANS: Tooltop for personal group navigation menu option when logged in for viewing timeline of self and friends.
 #: actions/all.php:94 actions/all.php:191 actions/allrss.php:117
 #: actions/apitimelinefriends.php:207 actions/apitimelinehome.php:113
-#: lib/personalgroupnav.php:102
+#: lib/personalgroupnav.php:100
 #, php-format
 msgid "%s and friends"
 msgstr "%s hag e vignoned"
@@ -232,7 +235,7 @@ msgstr ""
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
 #. TRANS: Second sentence of empty message for anonymous users. %s is a user nickname.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:227
+#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:221
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -281,19 +284,20 @@ msgstr "Hizivadennoù %1$s ha mignoned e %2$s!"
 #: actions/apifavoritecreate.php:98 actions/apifavoritedestroy.php:98
 #: actions/apifriendshipscreate.php:99 actions/apifriendshipsdestroy.php:99
 #: actions/apifriendshipsshow.php:124 actions/apigroupcreate.php:138
-#: actions/apigroupismember.php:115 actions/apigroupjoin.php:160
-#: actions/apigroupleave.php:145 actions/apigrouplist.php:134
+#: actions/apigroupismember.php:115 actions/apigroupjoin.php:151
+#: actions/apigroupleave.php:141 actions/apigrouplist.php:134
 #: actions/apigrouplistall.php:120 actions/apigroupmembership.php:105
+#: actions/apigroupprofileupdate.php:100 actions/apigroupprofileupdate.php:213
 #: actions/apigroupshow.php:114 actions/apihelptest.php:84
 #: actions/apistatusesdestroy.php:101 actions/apistatusesretweets.php:110
 #: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:139
 #: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
-#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:268
-#: actions/apitimelinegroup.php:147 actions/apitimelinehome.php:173
-#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:239
-#: actions/apitimelineretweetedtome.php:118
-#: actions/apitimelineretweetsofme.php:150 actions/apitimelinetag.php:159
-#: actions/apitimelineuser.php:206 actions/apiusershow.php:100
+#: actions/apitimelinefavorites.php:182 actions/apitimelinefriends.php:276
+#: actions/apitimelinegroup.php:148 actions/apitimelinehome.php:181
+#: actions/apitimelinementions.php:182 actions/apitimelinepublic.php:247
+#: actions/apitimelineretweetedtome.php:147
+#: actions/apitimelineretweetsofme.php:147 actions/apitimelinetag.php:165
+#: actions/apitimelineuser.php:217 actions/apiusershow.php:100
 msgid "API method not found."
 msgstr "N'eo ket bet kavet an hentenn API !"
 
@@ -308,8 +312,9 @@ msgstr "N'eo ket bet kavet an hentenn API !"
 #: actions/apifavoritecreate.php:88 actions/apifavoritedestroy.php:88
 #: actions/apifriendshipscreate.php:89 actions/apifriendshipsdestroy.php:89
 #: actions/apigroupcreate.php:102 actions/apigroupjoin.php:89
-#: actions/apigroupleave.php:89 actions/apimediaupload.php:66
-#: actions/apistatusesretweet.php:63 actions/apistatusesupdate.php:194
+#: actions/apigroupleave.php:89 actions/apigroupprofileupdate.php:92
+#: actions/apimediaupload.php:66 actions/apistatusesretweet.php:63
+#: actions/apistatusesupdate.php:194
 msgid "This method requires a POST."
 msgstr "Ezhomm en deus an argerzh-mañ eus ur POST."
 
@@ -321,21 +326,16 @@ msgid ""
 msgstr ""
 
 #. TRANS: Server error displayed when a user's delivery device cannot be updated.
-#. TRANS: Server error displayed when a user update to the database fails in the contact address confirmation action.
 #. TRANS: Server error thrown on database error updating e-mail preferences.
 #. TRANS: Server error thrown on database error removing a registered e-mail address.
-#. TRANS: Server error thrown on database error updating Instant Messaging preferences.
-#. TRANS: Server error thrown on database error removing a registered Instant Messaging address.
-#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
 #. TRANS: Server error thrown when user profile settings could not be updated.
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
-#: actions/apiaccountupdatedeliverydevice.php:130
-#: actions/confirmaddress.php:118 actions/emailsettings.php:352
-#: actions/emailsettings.php:498 actions/imsettings.php:276
-#: actions/imsettings.php:432 actions/othersettings.php:186
-#: actions/profilesettings.php:322 actions/smssettings.php:301
-#: actions/smssettings.php:454
+#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
+#: actions/apiaccountupdatedeliverydevice.php:136
+#: actions/emailsettings.php:353 actions/emailsettings.php:499
+#: actions/profilesettings.php:323 actions/smssettings.php:300
+#: actions/smssettings.php:453 actions/urlsettings.php:211
 msgid "Could not update user."
 msgstr "Dibosupl hizivaat an implijer."
 
@@ -361,7 +361,7 @@ msgstr "An implijer-mañ n'eus profil ebet dezhañ."
 
 #. TRANS: Server error displayed if a user profile could not be saved.
 #. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:418
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:419
 msgid "Could not save profile."
 msgstr "Dibosupl eo enrollañ ar profil."
 
@@ -373,7 +373,7 @@ msgstr "Dibosupl eo enrollañ ar profil."
 #: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
 #: actions/designadminpanel.php:120 actions/editapplication.php:121
 #: actions/newapplication.php:102 actions/newnotice.php:95
-#: lib/designsettings.php:298
+#: lib/designsettings.php:110
 #, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s byte) due to its "
@@ -394,8 +394,8 @@ msgstr[1] ""
 #: actions/apiaccountupdateprofilecolors.php:160
 #: actions/apiaccountupdateprofilecolors.php:171
 #: actions/groupdesignsettings.php:285 actions/groupdesignsettings.php:296
-#: actions/userdesignsettings.php:201 actions/userdesignsettings.php:211
-#: actions/userdesignsettings.php:253 actions/userdesignsettings.php:263
+#: actions/userdesignsettings.php:218 actions/userdesignsettings.php:228
+#: actions/userdesignsettings.php:270 actions/userdesignsettings.php:280
 msgid "Unable to save your design settings."
 msgstr "Dibosupl eo enrollañ an arventennoù empentiñ."
 
@@ -403,7 +403,7 @@ msgstr "Dibosupl eo enrollañ an arventennoù empentiñ."
 #. TRANS: Client error displayed when a database error occurs updating profile colours.
 #: actions/apiaccountupdateprofilebackgroundimage.php:191
 #: actions/apiaccountupdateprofilecolors.php:139
-#: actions/userdesignsettings.php:179
+#: actions/userdesignsettings.php:196
 msgid "Could not update your design."
 msgstr "Dibosupl eo hizivaat ho design."
 
@@ -512,7 +512,7 @@ msgstr "N'eo ket bet kavet ar resever."
 #. TRANS: Client error displayed trying to direct message another user who's not a friend (403).
 #: actions/apidirectmessagenew.php:144
 #, fuzzy
-msgid "Can't send direct messages to users who aren't your friend."
+msgid "Cannot send direct messages to users who aren't your friend."
 msgstr ""
 "Ne c'helloc'h ket kas kemennadennoù personel d'an implijerien n'int ket ho "
 "mignoned."
@@ -598,9 +598,9 @@ msgstr "Dibosupl eo kavout an implijer pal."
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:156 actions/editgroup.php:191
-#: actions/newgroup.php:137 actions/profilesettings.php:273
-#: actions/register.php:214
+#: actions/apigroupcreate.php:156 actions/apigroupprofileupdate.php:255
+#: actions/editgroup.php:191 actions/newgroup.php:137
+#: actions/profilesettings.php:274 actions/register.php:199
 msgid "Nickname already in use. Try another one."
 msgstr "Implijet eo dija al lesanv-se. Klaskit unan all."
 
@@ -608,9 +608,9 @@ msgstr "Implijet eo dija al lesanv-se. Klaskit unan all."
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:164 actions/editgroup.php:195
-#: actions/newgroup.php:141 actions/profilesettings.php:243
-#: actions/register.php:216
+#: actions/apigroupcreate.php:164 actions/apigroupprofileupdate.php:259
+#: actions/editgroup.php:195 actions/newgroup.php:141
+#: actions/profilesettings.php:244 actions/register.php:201
 msgid "Not a valid nickname."
 msgstr "N'eo ket ul lesanv mat."
 
@@ -620,10 +620,10 @@ msgstr "N'eo ket ul lesanv mat."
 #. TRANS: Validation error shown when providing an invalid homepage URL in the "New application" form.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:181 actions/editapplication.php:235
-#: actions/editgroup.php:202 actions/newapplication.php:221
-#: actions/newgroup.php:148 actions/profilesettings.php:248
-#: actions/register.php:223
+#: actions/apigroupcreate.php:181 actions/apigroupprofileupdate.php:277
+#: actions/editapplication.php:235 actions/editgroup.php:202
+#: actions/newapplication.php:221 actions/newgroup.php:148
+#: actions/profilesettings.php:249 actions/register.php:208
 msgid "Homepage is not a valid URL."
 msgstr "N'eo ket chomlec'h al lec'hienn personel un URL reizh."
 
@@ -632,8 +632,8 @@ msgstr "N'eo ket chomlec'h al lec'hienn personel un URL reizh."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:191 actions/editgroup.php:206
-#: actions/newgroup.php:152 actions/profilesettings.php:252
-#: actions/register.php:226
+#: actions/newgroup.php:152 actions/profilesettings.php:253
+#: actions/register.php:211
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "Re hir eo an anv klok (255 arouezenn d'ar muiañ)."
 
@@ -660,8 +660,8 @@ msgstr[1] "Re hir eo an deskrivadur (%d arouezenn d'ar muiañ)."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:215 actions/editgroup.php:218
-#: actions/newgroup.php:164 actions/profilesettings.php:265
-#: actions/register.php:235
+#: actions/newgroup.php:164 actions/profilesettings.php:266
+#: actions/register.php:220
 msgid "Location is too long (maximum 255 characters)."
 msgstr "Re hir eo al lec'hiadur (255 arouezenn d'ar muiañ)."
 
@@ -690,15 +690,16 @@ msgstr "Alias fall : \"%s\"."
 #. TRANS: %s is the alias that is already in use.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error. %s is the already used alias.
-#: actions/apigroupcreate.php:264 actions/editgroup.php:246
-#: actions/newgroup.php:193
+#: actions/apigroupcreate.php:264 actions/apigroupprofileupdate.php:351
+#: actions/editgroup.php:246 actions/newgroup.php:193
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "Implijet e vez an alias \"%s\" dija. Klaskit gant unan all."
 
 #. TRANS: Client error displayed when trying to use an alias during group creation that is the same as the group's nickname.
 #. TRANS: Group edit form validation error.
-#: actions/apigroupcreate.php:278 actions/editgroup.php:253
+#: actions/apigroupcreate.php:278 actions/apigroupprofileupdate.php:359
+#: actions/editgroup.php:253
 msgid "Alias can't be the same as nickname."
 msgstr "Ne c'hell ket an alias bezañ ar memes hini eget al lesanv."
 
@@ -710,7 +711,8 @@ msgstr "Ne c'hell ket an alias bezañ ar memes hini eget al lesanv."
 #. TRANS: Client error displayed requesting most recent notices to a group for a non-existing group.
 #: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
 #: actions/apigroupleave.php:104 actions/apigroupmembership.php:71
-#: actions/apigroupshow.php:81 actions/apitimelinegroup.php:89
+#: actions/apigroupprofileupdate.php:113 actions/apigroupshow.php:81
+#: actions/apitimelinegroup.php:89
 msgid "Group not found."
 msgstr "N'eo ket bet kavet ar strollad."
 
@@ -728,13 +730,11 @@ msgstr "Un ezel eus ar strollad-mañ eo dija."
 msgid "You have been blocked from that group by the admin."
 msgstr "Stanket oc'h bet eus ar strollad-mañ gant ur merour."
 
-#. TRANS: Server error displayed when joining a group fails.
-#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
 #. 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.
 #. TRANS: Message given having failed to add a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:362
+#: actions/apigroupjoin.php:136 actions/joingroup.php:139 lib/command.php:362
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "Dibosupl eo stagañ an implijer %1$s d'ar strollad %2$s."
@@ -744,8 +744,6 @@ msgstr "Dibosupl eo stagañ an implijer %1$s d'ar strollad %2$s."
 msgid "You are not a member of this group."
 msgstr "N'oc'h ket ezel eus ar strollad-mañ."
 
-#. TRANS: Server error displayed when leaving a group fails.
-#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
 #. TRANS: Server error displayed when leaving a group failed in the database.
 #. TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
 #. TRANS: Message given having failed to remove a user from a group.
@@ -781,6 +779,62 @@ msgstr "Strolladoù %s"
 msgid "groups on %s"
 msgstr "strolladoù war %s"
 
+#. TRANS: Client error displayed trying to edit a group while not being a group admin.
+#. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
+#. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
+#: actions/apigroupprofileupdate.php:118 actions/editgroup.php:110
+#: actions/editgroup.php:176 actions/groupdesignsettings.php:109
+#: actions/grouplogo.php:111
+msgid "You must be an admin to edit the group."
+msgstr "Rankout a reer bezañ merour evit kemmañ ar strollad."
+
+#. TRANS: Server error displayed when editing a group fails.
+#: actions/apigroupprofileupdate.php:171 actions/editgroup.php:274
+msgid "Could not update group."
+msgstr "Dibosupl eo hizivaat ar strollad."
+
+#. TRANS: Server error displayed when group aliases could not be added.
+#. TRANS: Server exception thrown when creating group aliases failed.
+#: actions/apigroupprofileupdate.php:194 actions/editgroup.php:281
+#: classes/User_group.php:540
+msgid "Could not create aliases."
+msgstr "Dibosupl eo krouiñ an aliasoù."
+
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: actions/apigroupprofileupdate.php:249 lib/nickname.php:165
+#, fuzzy
+msgid "Nickname must have only lowercase letters and numbers and no spaces."
+msgstr "1 da 64 lizherenn vihan pe sifr, hep poentaouiñ nag esaouenn"
+
+#: actions/apigroupprofileupdate.php:286
+#, fuzzy
+msgid "Full name is too long (max 255 chars)."
+msgstr "Re hir eo an anv klok (255 arouezenn d'ar muiañ)."
+
+#: actions/apigroupprofileupdate.php:296
+#, fuzzy, php-format
+msgid "description is too long (max %d chars)."
+msgstr "Re hir eo an deskrivadur (%d arouezenn d'ar muiañ)."
+
+#: actions/apigroupprofileupdate.php:307
+#, fuzzy
+msgid "Location is too long (max 255 chars)."
+msgstr "Re hir eo al lec'hiadur (255 arouezenn d'ar muiañ)."
+
+#: actions/apigroupprofileupdate.php:326
+#, fuzzy, php-format
+msgid "Too many aliases! Maximum %d."
+msgstr "Re a aliasoù ! %d d'ar muiañ."
+
+#. TRANS: Group edit form validation error.
+#. TRANS: Group create form validation error.
+#. TRANS: %s is the invalid alias.
+#: actions/apigroupprofileupdate.php:342 actions/editgroup.php:241
+#: actions/newgroup.php:188
+#, php-format
+msgid "Invalid alias: \"%s\""
+msgstr "Alias fall : \"%s\""
+
 #. TRANS: Client error displayed when uploading a media file has failed.
 #: actions/apimediaupload.php:101
 msgid "Upload failed."
@@ -811,21 +865,22 @@ msgstr "Aotreet eo bet ar jedouer reked dija."
 #. TRANS: Form validation error message.
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
+#. TRANS: Client error displayed when the session token is not okay.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
 #: actions/deletenotice.php:177 actions/disfavor.php:75
-#: actions/emailsettings.php:291 actions/favor.php:75 actions/geocode.php:55
+#: actions/emailsettings.php:292 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:65 actions/grouplogo.php:321
-#: actions/groupunblock.php:65 actions/imsettings.php:224
-#: actions/invite.php:60 actions/login.php:137 actions/makeadmin.php:66
-#: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
-#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
-#: actions/othersettings.php:155 actions/passwordsettings.php:138
-#: actions/profilesettings.php:217 actions/recoverpassword.php:383
-#: actions/register.php:172 actions/remotesubscribe.php:76
-#: actions/repeat.php:82 actions/smssettings.php:250 actions/subedit.php:40
-#: actions/subscribe.php:86 actions/tagother.php:166
-#: actions/unsubscribe.php:69 actions/userauthorization.php:52
-#: lib/designsettings.php:310
+#: actions/groupunblock.php:65 actions/imsettings.php:241
+#: actions/invite.php:60 actions/makeadmin.php:66 actions/newmessage.php:135
+#: actions/newnotice.php:105 actions/nudge.php:80
+#: actions/oauthappssettings.php:162 actions/oauthconnectionssettings.php:135
+#: actions/passwordsettings.php:137 actions/pluginenable.php:87
+#: actions/profilesettings.php:218 actions/recoverpassword.php:383
+#: actions/register.php:157 actions/remotesubscribe.php:76
+#: actions/repeat.php:82 actions/smssettings.php:249 actions/subedit.php:40
+#: actions/subscribe.php:87 actions/tagother.php:145
+#: actions/unsubscribe.php:69 actions/urlsettings.php:171
+#: actions/userauthorization.php:53 lib/designsettings.php:122
 msgid "There was a problem with your session token. Try again, please."
 msgstr "Ur gudenn 'zo bet gant ho jedaouer dalc'h. Mar plij adklaskit."
 
@@ -855,10 +910,10 @@ msgstr ""
 #. TRANS: Unknown form validation error in design settings form.
 #: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
 #: actions/designadminpanel.php:100 actions/editapplication.php:144
-#: actions/emailsettings.php:310 actions/grouplogo.php:332
-#: actions/imsettings.php:239 actions/newapplication.php:124
-#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
-#: actions/smssettings.php:271 lib/designsettings.php:321
+#: actions/emailsettings.php:311 actions/grouplogo.php:332
+#: actions/imsettings.php:256 actions/newapplication.php:124
+#: actions/oauthconnectionssettings.php:144 actions/recoverpassword.php:46
+#: actions/smssettings.php:270 lib/designsettings.php:133
 msgid "Unexpected form submission."
 msgstr "Kinnig ar furmskrid dic'hortoz."
 
@@ -901,31 +956,26 @@ msgstr "Kont"
 
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Field label in form for profile settings.
-#. TRANS: Label for group nickname (dt). Text hidden by default.
-#. TRANS: DT for nick name in a profile.
-#: actions/apioauthauthorize.php:459 actions/login.php:252
-#: actions/profilesettings.php:106 actions/register.php:432
-#: actions/showgroup.php:243 actions/tagother.php:94
+#: actions/apioauthauthorize.php:459 actions/login.php:225
+#: actions/profilesettings.php:107 actions/register.php:411
 #: actions/userauthorization.php:145 lib/groupeditform.php:145
-#: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "Lesanv"
 
 #. TRANS: Field label on OAuth API authorisation form.
-#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:463 actions/login.php:255
-#: actions/register.php:436 lib/accountsettingsaction.php:120
+#: actions/apioauthauthorize.php:463 actions/login.php:228
+#: actions/register.php:415 lib/settingsnav.php:87
 msgid "Password"
 msgstr "Ger-tremen"
 
 #. TRANS: Button text that when clicked will cancel the process of allowing access to an account
 #. TRANS: by an external application.
 #. TRANS: Button label to cancel an e-mail address confirmation procedure.
-#. TRANS: Button label to cancel an Instant Messaging address confirmation procedure.
+#. TRANS: Button label to cancel an IM address confirmation procedure.
 #. TRANS: Button label to cancel a SMS address confirmation procedure.
 #. TRANS: Button label in the "Edit application" form.
-#: actions/apioauthauthorize.php:478 actions/emailsettings.php:124
-#: actions/imsettings.php:127 actions/smssettings.php:133
+#: actions/apioauthauthorize.php:478 actions/emailsettings.php:125
+#: actions/imsettings.php:136 actions/smssettings.php:132
 #: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Cancel"
@@ -1037,7 +1087,7 @@ msgstr "N'eo ket skoret an hentenn HTTP."
 #. TRANS: %s is the requested output format.
 #: actions/apistatusesshow.php:144
 #, fuzzy, php-format
-msgid "Unsupported format: %s"
+msgid "Unsupported format: %s."
 msgstr "Diembreget eo ar furmad : %s"
 
 #. TRANS: Client error displayed requesting a deleted status.
@@ -1118,13 +1168,6 @@ msgstr "%1$s / Pennroll %2$s"
 msgid "%1$s updates favorited by %2$s / %3$s."
 msgstr "%1$s kemennadenn garetañ gant %2$s / %3$s."
 
-#. TRANS: Server error displayed when generating an Atom feed fails.
-#. TRANS: %s is the error.
-#: actions/apitimelinegroup.php:134
-#, fuzzy, php-format
-msgid "Could not generate feed for group - %s"
-msgstr "Diposubl eo hizivaat ar strollad."
-
 #. TRANS: Title for timeline of most recent mentions of a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname.
 #: actions/apitimelinementions.php:115
@@ -1141,13 +1184,14 @@ msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr "%1$s statud pennroll da %2$s / %2$s."
 
 #. TRANS: Title for site timeline. %s is the StatusNet sitename.
+#. TRANS: Public RSS feed title. %s is the StatusNet site name.
 #: actions/apitimelinepublic.php:193 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "Oberezhioù publik %s"
 
 #. TRANS: Subtitle for site timeline. %s is the StatusNet sitename.
-#: actions/apitimelinepublic.php:199 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:199
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "%s statud an holl !"
@@ -1159,21 +1203,33 @@ msgid "Unimplemented."
 msgstr "N'eo ket bet emplementet showForm()."
 
 #. TRANS: Title for Atom feed "repeated to me". %s is the user nickname.
-#: actions/apitimelineretweetedtome.php:108
+#: actions/apitimelineretweetedtome.php:96
 #, php-format
 msgid "Repeated to %s"
 msgstr "Adkemeret evit %s"
 
+#: actions/apitimelineretweetedtome.php:98
+#, fuzzy, php-format
+msgid "%1$s notices that were to repeated to %2$s / %3$s."
+msgstr "%1$s statud pennroll da %2$s / %2$s."
+
 #. TRANS: Title of list of repeated notices of the logged in user.
 #. TRANS: %s is the nickname of the logged in user.
-#: actions/apitimelineretweetsofme.php:112
+#: actions/apitimelineretweetsofme.php:98
 #, php-format
 msgid "Repeats of %s"
 msgstr "Adkemeret eus %s"
 
+#: actions/apitimelineretweetsofme.php:104
+#, fuzzy, php-format
+msgid "%1$s notices that %2$s / %3$s has repeated."
+msgstr "Kas din ur postel pa lak unan bennak unan eus va alioù evel pennroll."
+
 #. TRANS: Title for timeline with lastest notices with a given tag.
 #. TRANS: %s is the tag.
-#: actions/apitimelinetag.php:101 actions/tag.php:67
+#. TRANS: Title for first page of notices with tags.
+#. TRANS: %s is the tag.
+#: actions/apitimelinetag.php:101 actions/tag.php:69
 #, php-format
 msgid "Notices tagged with %s"
 msgstr "Alioù merket gant %s"
@@ -1186,54 +1242,55 @@ msgid "Updates tagged with %1$s on %2$s!"
 msgstr "Hizivadennoù merket gant %1$s e %2$s !"
 
 #. TRANS: Client error displayed trying to add a notice to another user's timeline.
-#: actions/apitimelineuser.php:297
+#: actions/apitimelineuser.php:308
 msgid "Only the user can add to their own timeline."
 msgstr ""
 "N'eus nemet an implijer a c'hall ouzhpennañ traoù d'e lanvad dezhañ e-unan."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:304
+#: actions/apitimelineuser.php:315
 msgid "Only accept AtomPub for Atom feeds."
 msgstr ""
 
 #. TRANS: Client error displayed attempting to post an empty API notice.
-#: actions/apitimelineuser.php:311
+#: actions/apitimelineuser.php:322
 msgid "Atom post must not be empty."
 msgstr ""
 
 #. TRANS: Client error displayed attempting to post an API that is not well-formed XML.
-#: actions/apitimelineuser.php:317
+#: actions/apitimelineuser.php:328
 msgid "Atom post must be well-formed XML."
 msgstr ""
 
 #. TRANS: Client error displayed when not using an Atom entry.
-#: actions/apitimelineuser.php:323 actions/atompubfavoritefeed.php:228
+#: actions/apitimelineuser.php:334 actions/atompubfavoritefeed.php:228
 #: actions/atompubmembershipfeed.php:230
 #: actions/atompubsubscriptionfeed.php:236
 msgid "Atom post must be an Atom entry."
 msgstr ""
 
 #. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
-#: actions/apitimelineuser.php:335
+#: actions/apitimelineuser.php:345
 msgid "Can only handle POST activities."
 msgstr ""
 
 #. TRANS: Client error displayed when using an unsupported activity object type.
 #. TRANS: %s is the unsupported activity object type.
-#: actions/apitimelineuser.php:346
+#: actions/apitimelineuser.php:356
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
 #. TRANS: %d is the notice ID (number).
-#: actions/apitimelineuser.php:380
+#: actions/apitimelineuser.php:390
 #, php-format
 msgid "No content for notice %d."
 msgstr "N'eus danvez ebet evit ar gemennadenn%d."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:408
+#. TRANS: %s is the notice URI.
+#: actions/apitimelineuser.php:419
 #, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr ""
@@ -1250,9 +1307,10 @@ msgstr "N'eo ket bet kavet an implijer."
 
 #. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
 #. TRANS: Client exception.
+#. TRANS: Client error displayed trying to subscribe to a non-existing profile.
 #: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
 #: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
-#: actions/subscribe.php:107
+#: actions/subscribe.php:110
 msgid "No such profile."
 msgstr "N'eus ket eus ar profil-se."
 
@@ -1392,7 +1450,7 @@ msgid "Not a member."
 msgstr "N'eo ket ezel."
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
-#: actions/atompubshowmembership.php:151
+#: actions/atompubshowmembership.php:150
 #, fuzzy
 msgid "Cannot delete someone else's membership."
 msgstr "Dibosupl eo dilemel ar c'houmanant."
@@ -1480,10 +1538,7 @@ msgid "Invalid size."
 msgstr "Ment direizh."
 
 #. TRANS: Title for avatar upload page.
-#. TRANS: Label for group avatar (dt). Text hidden by default.
-#. TRANS: Link description in user account settings menu.
-#: actions/avatarsettings.php:66 actions/showgroup.php:227
-#: lib/accountsettingsaction.php:113
+#: actions/avatarsettings.php:66 lib/settingsnav.php:82
 msgid "Avatar"
 msgstr "Avatar"
 
@@ -1497,9 +1552,11 @@ msgstr ""
 
 #. TRANS: Server error displayed in avatar upload page when no matching profile can be found for a user.
 #. TRANS: Server error displayed coming across a request from a user without a profile.
+#. TRANS: Server error displayed when trying to authorise a remote subscription request
+#. TRANS: while the user has no profile.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
 #: actions/grouplogo.php:184 actions/remotesubscribe.php:190
-#: actions/userauthorization.php:72 actions/userrss.php:108
+#: actions/userauthorization.php:75 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr "Implijer hep profil klotus."
 
@@ -1554,10 +1611,10 @@ msgstr "Adframmañ"
 msgid "No file uploaded."
 msgstr "N'eus bet enporzhiet restr ebet."
 
-#. TRANS: Avatar upload form unstruction after uploading a file.
+#. TRANS: Avatar upload form instruction after uploading a file.
 #: actions/avatarsettings.php:345
 #, fuzzy
-msgid "Pick a square area of the image to be your avatar"
+msgid "Pick a square area of the image to be your avatar."
 msgstr "Diuzit ur zonenn gant ur stumm karrez evit tremeniñ ho avatar"
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
@@ -1583,7 +1640,7 @@ msgstr "Dilammet eo bet an Avatar."
 
 #. TRANS: Title for backup account page.
 #. TRANS: Option in profile settings to create a backup of the account of the currently logged in user.
-#: actions/backupaccount.php:61 actions/profilesettings.php:467
+#: actions/backupaccount.php:61 actions/profilesettings.php:468
 msgid "Backup account"
 msgstr "Saveteiñ ar gont"
 
@@ -1616,7 +1673,7 @@ msgstr "Eilenn savete"
 #. TRANS: Title for submit button to backup an account on the backup account page.
 #: actions/backupaccount.php:254
 #, fuzzy
-msgid "Backup your account"
+msgid "Backup your account."
 msgstr "Saveteiñ ho kont"
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
@@ -1655,7 +1712,7 @@ msgstr "Ket"
 #. TRANS: Submit button title for 'No' when blocking a user.
 #: actions/block.php:158
 #, fuzzy
-msgid "Do not block this user"
+msgid "Do not block this user."
 msgstr "Arabat stankañ an implijer-mañ"
 
 #. TRANS: Button label on the user block form.
@@ -1672,9 +1729,9 @@ msgid "Yes"
 msgstr "Ya"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#. TRANS: Description of the form to block a user.
-#: actions/block.php:165 lib/blockform.php:79
-msgid "Block this user"
+#: actions/block.php:165
+#, fuzzy
+msgid "Block this user."
 msgstr "Stankañ an implijer-mañ"
 
 #. TRANS: Server error displayed when blocking a user fails.
@@ -1741,31 +1798,47 @@ msgstr "N'eo ket bet kavet ar c'hod kadarnaat."
 msgid "That confirmation code is not for you!"
 msgstr "N'eo ket ar c'hod-se evidoc'h !"
 
-#. TRANS: Server error for a unknow address type %s, which can be 'email', 'jabber', or 'sms'.
-#: actions/confirmaddress.php:92
-#, php-format
-msgid "Unrecognized address type %s."
+#. TRANS: Server error for an unknown address type, which can be 'email', 'sms', or the name of an IM network (such as 'xmpp' or 'aim')
+#: actions/confirmaddress.php:94
+#, fuzzy, php-format
+msgid "Unrecognized address type %s"
 msgstr "Doare chomlec'h dianav %s."
 
 #. TRANS: Client error for an already confirmed email/jabber/sms address.
-#: actions/confirmaddress.php:97
+#: actions/confirmaddress.php:103 actions/confirmaddress.php:136
 msgid "That address has already been confirmed."
 msgstr "Kadarnaet eo bet dija ar chomlec'h-mañ."
 
+#: actions/confirmaddress.php:121 actions/imsettings.php:444
+#: actions/userdesignsettings.php:306
+#, fuzzy
+msgid "Couldn't update user."
+msgstr "Dibosupl hizivaat an implijer."
+
+#: actions/confirmaddress.php:144
+#, fuzzy
+msgid "Couldn't update user im preferences."
+msgstr "Dibosupl hizivaat teuliad an implijer."
+
+#: actions/confirmaddress.php:156
+#, fuzzy
+msgid "Couldn't insert user im preferences."
+msgstr "Dibosupl eo dilemel ar c'houmanant."
+
 #. TRANS: Server error displayed when an address confirmation code deletion from the
 #. TRANS: database fails in the contact address confirmation action.
-#: actions/confirmaddress.php:132
+#: actions/confirmaddress.php:169
 msgid "Could not delete address confirmation."
 msgstr "Dibosupl dilemel ar gadarnadenn chomlec'h."
 
 #. TRANS: Title for the contact address confirmation action.
-#: actions/confirmaddress.php:150
+#: actions/confirmaddress.php:185
 msgid "Confirm address"
 msgstr "Chomlec'h kadarnaet"
 
 #. TRANS: Success message for the contact address confirmation action.
 #. TRANS: %s can be 'email', 'jabber', or 'sms'.
-#: actions/confirmaddress.php:166
+#: actions/confirmaddress.php:200
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "Kadarnaet eo bet ar chomlec'h \"%s\" evit ho kont."
@@ -1779,6 +1852,7 @@ msgstr "Kaozeadenn"
 #. TRANS: Label for user statistics.
 #: actions/conversation.php:149 lib/noticelist.php:87
 #: lib/profileaction.php:246 lib/searchgroupnav.php:82
+#: lib/threadednoticelist.php:66
 msgid "Notices"
 msgstr "Ali"
 
@@ -1811,7 +1885,7 @@ msgstr "Dilamet eo bet ar gont."
 
 #. TRANS: Page title for page on which a user account can be deleted.
 #. TRANS: Option in profile settings to delete the account of the currently logged in user.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:475
+#: actions/deleteaccount.php:228 actions/profilesettings.php:476
 msgid "Delete account"
 msgstr "Dilemel ar gont"
 
@@ -1834,7 +1908,7 @@ msgstr ""
 #. TRANS: Field label for delete account confirmation entry.
 #. TRANS: Field label for password reset form where the password has to be typed again.
 #: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:262 actions/register.php:440
+#: actions/recoverpassword.php:262 actions/register.php:419
 msgid "Confirm"
 msgstr "Kadarnaat"
 
@@ -1863,14 +1937,14 @@ msgstr "N'eo ket bet kavet ar poellad"
 #. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
 #: actions/deleteapplication.php:79 actions/editapplication.php:78
-#: actions/showapplication.php:94
+#: actions/showapplication.php:90
 msgid "You are not the owner of this application."
 msgstr "N'oc'h ket perc'henn ar poellad-se."
 
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
-#: actions/newapplication.php:112 actions/showapplication.php:118
-#: lib/action.php:1425
+#: actions/newapplication.php:112 actions/showapplication.php:113
+#: lib/action.php:1391
 msgid "There was a problem with your session token."
 msgstr "Ur gudenn 'zo bet gant ho jedaouer dalc'h."
 
@@ -1891,13 +1965,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting an application.
 #: actions/deleteapplication.php:161
 #, fuzzy
-msgid "Do not delete this application"
+msgid "Do not delete this application."
 msgstr "Arabat eo dilemel ar poellad-mañ"
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
 #: actions/deleteapplication.php:167
 #, fuzzy
-msgid "Delete this application"
+msgid "Delete this application."
 msgstr "Dilemel ar poelad-se"
 
 #. TRANS: Client error when trying to delete group while not logged in.
@@ -1949,13 +2023,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting a group.
 #: actions/deletegroup.php:224
 #, fuzzy
-msgid "Do not delete this group"
+msgid "Do not delete this group."
 msgstr "Arabat dilemel ar strollad-mañ"
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
 #: actions/deletegroup.php:231
 #, fuzzy
-msgid "Delete this group"
+msgid "Delete this group."
 msgstr "Dilemel ar strollad-mañ"
 
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
@@ -1963,14 +2037,16 @@ msgstr "Dilemel ar strollad-mañ"
 #. TRANS: Client error displayed when trying to mark a notice as favorite without being logged in.
 #. TRANS: Client error displayed trying to block a user from a group while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
+#. TRANS: Client error displayed trying to log out when not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
+#. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
 #. TRANS: Client error displayed when trying to change user options while not logged in.
 #: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
-#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:69
+#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:70
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
-#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
-#: actions/tagother.php:33 actions/unsubscribe.php:52
+#: actions/nudge.php:63 actions/pluginenable.php:97 actions/subedit.php:33
+#: actions/subscribe.php:98 actions/tagother.php:33 actions/unsubscribe.php:52
 #: lib/adminpanelaction.php:71 lib/profileformaction.php:63
 #: lib/settingsaction.php:72
 msgid "Not logged in."
@@ -1997,12 +2073,13 @@ msgstr "Ha sur oc'h hoc'h eus c'hoant da zilemel ar c'hemenn-mañ ?"
 #. TRANS: Submit button title for 'No' when deleting a notice.
 #: actions/deletenotice.php:159
 #, fuzzy
-msgid "Do not delete this notice"
+msgid "Do not delete this notice."
 msgstr "Arabat dilemel ar c'hemenn-mañ"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:166 lib/noticelist.php:673
-msgid "Delete this notice"
+#: actions/deletenotice.php:166
+#, fuzzy
+msgid "Delete this notice."
 msgstr "Dilemel ar c'hemenn-mañ"
 
 #. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
@@ -2036,18 +2113,17 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting a user.
 #: actions/deleteuser.php:158
 #, fuzzy
-msgid "Do not delete this user"
+msgid "Do not delete this user."
 msgstr "Arabat dilemel an implijer-mañ"
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
-#. TRANS: Description of form for deleting a user.
-#: actions/deleteuser.php:165 lib/deleteuserform.php:75
-msgid "Delete this user"
+#: actions/deleteuser.php:165
+#, fuzzy
+msgid "Delete this user."
 msgstr "Diverkañ an implijer-mañ"
 
 #. TRANS: Message used as title for design settings for the site.
-#. TRANS: Link description in user account settings menu.
-#: actions/designadminpanel.php:60 lib/accountsettingsaction.php:134
+#: actions/designadminpanel.php:60 lib/settingsnav.php:97
 msgid "Design"
 msgstr "Design"
 
@@ -2114,8 +2190,7 @@ msgid "You can upload a custom StatusNet theme as a .ZIP archive."
 msgstr ""
 
 #. TRANS: Fieldset legend for theme background image.
-#. TRANS: Fieldset legend on profile design page.
-#: actions/designadminpanel.php:515 lib/designsettings.php:98
+#: actions/designadminpanel.php:515
 msgid "Change background image"
 msgstr "Kemmañ ar skeudenn foñs"
 
@@ -2123,7 +2198,7 @@ msgstr "Kemmañ ar skeudenn foñs"
 #. TRANS: Field label for background color selector.
 #. TRANS: Label on profile design page for setting a profile page background colour.
 #: actions/designadminpanel.php:525 actions/designadminpanel.php:609
-#: lib/designsettings.php:183
+#: lib/designform.php:238
 msgid "Background"
 msgstr "Background"
 
@@ -2148,13 +2223,13 @@ msgstr "Diweredekaet"
 #. TRANS: Form guide for turning background image on or off on theme designer page.
 #. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
 #. TRANS: use of the uploaded profile image.
-#: actions/designadminpanel.php:577 lib/designsettings.php:159
+#: actions/designadminpanel.php:577 lib/designform.php:214
 msgid "Turn background image on or off."
 msgstr "Gweredekaat pe diweredekaat ar skeudenn foñs."
 
 #. TRANS: Checkbox label to title background image on theme designer page.
 #. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-#: actions/designadminpanel.php:583 lib/designsettings.php:165
+#: actions/designadminpanel.php:583 lib/designform.php:220
 msgid "Tile background image"
 msgstr "Adober gant ar skeudenn drekleur"
 
@@ -2166,25 +2241,25 @@ msgstr "Kemmañ al livioù"
 
 #. TRANS: Field label for content color selector.
 #. TRANS: Label on profile design page for setting a profile page content colour.
-#: actions/designadminpanel.php:623 lib/designsettings.php:197
+#: actions/designadminpanel.php:623 lib/designform.php:252
 msgid "Content"
 msgstr "Endalc'h"
 
 #. TRANS: Field label for sidebar color selector.
 #. TRANS: Label on profile design page for setting a profile page sidebar colour.
-#: actions/designadminpanel.php:637 lib/designsettings.php:211
+#: actions/designadminpanel.php:637 lib/designform.php:266
 msgid "Sidebar"
 msgstr "Barenn kostez"
 
 #. TRANS: Field label for text color selector.
 #. TRANS: Label on profile design page for setting a profile page text colour.
-#: actions/designadminpanel.php:651 lib/designsettings.php:225
+#: actions/designadminpanel.php:651 lib/designform.php:280
 msgid "Text"
 msgstr "Testenn"
 
 #. TRANS: Field label for link color selector.
 #. TRANS: Label on profile design page for setting a profile page links colour.
-#: actions/designadminpanel.php:665 lib/designsettings.php:239
+#: actions/designadminpanel.php:665 lib/designform.php:294
 msgid "Links"
 msgstr "Liammoù"
 
@@ -2206,21 +2281,21 @@ msgid "Use defaults"
 msgstr "Implijout an talvoudoù dre ziouer"
 
 #. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: actions/designadminpanel.php:720 lib/designsettings.php:259
-msgid "Restore default designs"
+#: actions/designadminpanel.php:720
+#, fuzzy
+msgid "Restore default designs."
 msgstr "Adlakaat an neuz dre ziouer."
 
 #. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: actions/designadminpanel.php:728 lib/designsettings.php:267
-msgid "Reset back to default"
+#: actions/designadminpanel.php:728
+#, fuzzy
+msgid "Reset back to default."
 msgstr "Adlakaat an arventennoù dre ziouer"
 
 #. TRANS: Title for button for saving theme settings.
-#. TRANS: Title for button on profile design page to save settings.
-#: actions/designadminpanel.php:736 lib/designsettings.php:272
-msgid "Save design"
+#: actions/designadminpanel.php:736
+#, fuzzy
+msgid "Save design."
 msgstr "Enrollañ an design"
 
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
@@ -2252,7 +2327,7 @@ msgid "You must be logged in to edit an application."
 msgstr "Ret eo bezañ kevreet evit kemmañ ur poellad."
 
 #. TRANS: Client error displayed trying to edit an application that does not exist.
-#: actions/editapplication.php:83 actions/showapplication.php:87
+#: actions/editapplication.php:83 actions/showapplication.php:83
 msgid "No such application."
 msgstr "N'eus ket eus an arload-mañ."
 
@@ -2345,80 +2420,53 @@ msgstr "Kemmañ ar strollad  %s"
 msgid "You must be logged in to create a group."
 msgstr "Rankout a reoc'h bezañ luget evit krouiñ ur strollad."
 
-#. TRANS: Client error displayed trying to edit a group while not being a group admin.
-#. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
-#. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
-#: actions/editgroup.php:110 actions/editgroup.php:176
-#: actions/groupdesignsettings.php:109 actions/grouplogo.php:111
-msgid "You must be an admin to edit the group."
-msgstr "Rankout a reer bezañ merour evit kemmañ ar strollad."
-
 #. TRANS: Form instructions for group edit form.
 #: actions/editgroup.php:161
 msgid "Use this form to edit the group."
 msgstr "Leunit ar furmskrid-mañ evit kemmañ dibarzhioù ar strollad."
 
-#. TRANS: Group edit form validation error.
-#. TRANS: Group create form validation error.
-#. TRANS: %s is the invalid alias.
-#: actions/editgroup.php:241 actions/newgroup.php:188
-#, php-format
-msgid "Invalid alias: \"%s\""
-msgstr "Alias fall : \"%s\""
-
-#. TRANS: Server error displayed when editing a group fails.
-#: actions/editgroup.php:274
-msgid "Could not update group."
-msgstr "Dibosupl eo hizivaat ar strollad."
-
-#. TRANS: Server error displayed when group aliases could not be added.
-#. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/editgroup.php:281 classes/User_group.php:540
-msgid "Could not create aliases."
-msgstr "Dibosupl eo krouiñ an aliasoù."
-
 #. TRANS: Group edit form success message.
 #: actions/editgroup.php:301
 msgid "Options saved."
 msgstr "Enrollet eo bet ho dibarzhioù."
 
 #. TRANS: Title for e-mail settings.
-#: actions/emailsettings.php:59
+#: actions/emailsettings.php:60
 msgid "Email settings"
 msgstr "Arventennoù ar postel"
 
 #. TRANS: E-mail settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/emailsettings.php:73
+#: actions/emailsettings.php:74
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 msgstr "Merañ ar posteloù a fell deoc'h resevout a-berzh %%site.name%%."
 
 #. TRANS: Form legend for e-mail settings form.
 #. TRANS: Field label for e-mail address input in e-mail settings form.
-#: actions/emailsettings.php:103 actions/emailsettings.php:129
+#: actions/emailsettings.php:104 actions/emailsettings.php:130
 msgid "Email address"
 msgstr "Chomlec'h postel"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:109
+#: actions/emailsettings.php:110
 msgid "Current confirmed email address."
 msgstr "Chomlec'h postel gwiriekaet er mare-mañ."
 
 #. TRANS: Button label to remove a confirmed e-mail address.
 #. TRANS: Button label for removing a set sender e-mail address to post notices from.
-#. TRANS: Button label to remove a confirmed Instant Messaging address.
+#. TRANS: Button label to remove a confirmed IM address.
 #. TRANS: Button label to remove a confirmed SMS address.
 #. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
-#: actions/emailsettings.php:112 actions/emailsettings.php:179
-#: actions/imsettings.php:112 actions/smssettings.php:120
-#: actions/smssettings.php:176
+#: actions/emailsettings.php:113 actions/emailsettings.php:180
+#: actions/imsettings.php:119 actions/smssettings.php:119
+#: actions/smssettings.php:175
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Dilemel"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:119
+#: actions/emailsettings.php:120
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -2429,46 +2477,46 @@ msgstr ""
 #. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
 #. TRANS: Any other domain may be owned by a legitimate person or
 #. TRANS: organization.
-#: actions/emailsettings.php:136
+#: actions/emailsettings.php:137
 msgid "Email address, like \"UserName@example.org\""
 msgstr "Chomlec'h postel, evel \"AnvImplijer@example.org\""
 
 #. TRANS: Button label for adding an e-mail address in e-mail settings form.
-#. TRANS: Button label for adding an Instant Messaging address in Instant Messaging settings form.
+#. TRANS: Button label for adding an IM address in IM settings form.
 #. TRANS: Button label for adding a SMS phone number in SMS settings form.
-#: actions/emailsettings.php:140 actions/imsettings.php:147
-#: actions/smssettings.php:158
+#: actions/emailsettings.php:141 actions/imsettings.php:147
+#: actions/smssettings.php:157
 msgctxt "BUTTON"
 msgid "Add"
 msgstr "Ouzhpennañ"
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:148 actions/smssettings.php:167
+#: actions/emailsettings.php:149 actions/smssettings.php:166
 msgid "Incoming email"
 msgstr "Postel o tont"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:154
+#: actions/emailsettings.php:155
 msgid "I want to post notices by email."
 msgstr "C'hoant am eus kas va alioù dre bostel."
 
 #. TRANS: Form instructions for incoming e-mail form in e-mail settings.
 #. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
-#: actions/emailsettings.php:176 actions/smssettings.php:174
+#: actions/emailsettings.php:177 actions/smssettings.php:173
 #, fuzzy
 msgid "Send email to this address to post new notices."
 msgstr "Chomlec'h postel nevez evit embann e %s"
 
 #. TRANS: Instructions for incoming e-mail address input form, when an address has already been assigned.
 #. TRANS: Instructions for incoming SMS e-mail address input form.
-#: actions/emailsettings.php:185 actions/smssettings.php:182
+#: actions/emailsettings.php:186 actions/smssettings.php:181
 #, fuzzy
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr "Chomlec'h postel nevez evit embann e %s"
 
 #. TRANS: Instructions for incoming e-mail address input form.
-#: actions/emailsettings.php:189
+#: actions/emailsettings.php:190
 msgid ""
 "To send notices via email, we need to create a unique email address for you "
 "on this server:"
@@ -2476,90 +2524,90 @@ msgstr ""
 
 #. TRANS: Button label for adding an e-mail address to send notices from.
 #. TRANS: Button label for adding an SMS e-mail address to send notices from.
-#: actions/emailsettings.php:195 actions/smssettings.php:185
+#: actions/emailsettings.php:196 actions/smssettings.php:184
 msgctxt "BUTTON"
 msgid "New"
 msgstr "Nevez"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:204
+#: actions/emailsettings.php:205
 msgid "Email preferences"
 msgstr "Penndibaboù ar posteloù"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:212
+#: actions/emailsettings.php:213
 #, fuzzy
 msgid "Send me notices of new subscriptions through email."
 msgstr "Kas din an alioù dre Jabber/GTalk."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:218
+#: actions/emailsettings.php:219
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr "Kas din ur postel pa lak unan bennak unan eus va alioù evel pennroll."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:225
+#: actions/emailsettings.php:226
 msgid "Send me email when someone sends me a private message."
 msgstr "Kas din ur postel pa gas unan bennak ur gemennadenn bersonel din."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:231
+#: actions/emailsettings.php:232
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr "Kas din ur postel pa gas unan bennak ur \"@-respont\" din."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:237
+#: actions/emailsettings.php:238
 msgid "Allow friends to nudge me and send me an email."
 msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:243
+#: actions/emailsettings.php:244
 msgid "Publish a MicroID for my email address."
 msgstr "Embann ur MicroID evit ma chomlec'h postel."
 
 #. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:361
+#: actions/emailsettings.php:362
 msgid "Email preferences saved."
 msgstr "Enrollet eo bet an arventennoù postel."
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:380
+#: actions/emailsettings.php:381
 msgid "No email address."
 msgstr "Chomlec'h postel ebet."
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:388
+#: actions/emailsettings.php:389
 #, fuzzy
 msgid "Cannot normalize that email address."
 msgstr "Diposubl eo implijout an ID Jabber-mañ"
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:393 actions/register.php:212
+#: actions/emailsettings.php:394 actions/register.php:197
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "N'eo ket ur chomlec'h postel reizh."
 
 #. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:397
+#: actions/emailsettings.php:398
 msgid "That is already your email address."
 msgstr "Ho postel eo dija."
 
 #. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:401
+#: actions/emailsettings.php:402
 msgid "That email address already belongs to another user."
 msgstr "D'un implijer all eo ar chomlec'h postel-mañ."
 
 #. TRANS: Server error thrown on database error adding e-mail confirmation code.
 #. TRANS: Server error thrown on database error adding Instant Messaging confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:418 actions/imsettings.php:343
-#: actions/smssettings.php:365
+#: actions/emailsettings.php:419 actions/imsettings.php:362
+#: actions/smssettings.php:364
 #, fuzzy
 msgid "Could not insert confirmation code."
 msgstr "Dibosupl eo ensoc'hañ ar c'hod gwiriekaat."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:425
+#: actions/emailsettings.php:426
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
@@ -2568,57 +2616,60 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling Instant Messaging address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:445 actions/imsettings.php:377
-#: actions/smssettings.php:399
+#: actions/emailsettings.php:446 actions/imsettings.php:391
+#: actions/smssettings.php:398
 msgid "No pending confirmation to cancel."
 msgstr "Kadarnadenn ebet da vezañ nullet."
 
 #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:450
+#: actions/emailsettings.php:451
 msgid "That is the wrong email address."
 msgstr "N'eo ket mat ar chomlec'h postelerezh prim."
 
 #. TRANS: Server error thrown on database error canceling e-mail address confirmation.
 #. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
-#: actions/emailsettings.php:459 actions/smssettings.php:413
+#: actions/emailsettings.php:460 actions/smssettings.php:412
 msgid "Could not delete email confirmation."
 msgstr "Dibosupl dilemel ar postel kadarnaat."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:464
+#: actions/emailsettings.php:465
 msgid "Email confirmation cancelled."
 msgstr "Nullet eo bet kadarnadenn ar postel."
 
 #. TRANS: Message given trying to remove an e-mail address that is not
 #. TRANS: registered for the active user.
-#: actions/emailsettings.php:483
+#: actions/emailsettings.php:484
 msgid "That is not your email address."
 msgstr "N'eo ket ho postel."
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:504
+#: actions/emailsettings.php:505
 msgid "The email address was removed."
 msgstr "Dilamet eo bet ar chomlec'h postel."
 
 #. TRANS: Form validation error displayed when trying to remove an incoming e-mail address while no address has been set.
-#: actions/emailsettings.php:518 actions/smssettings.php:555
+#: actions/emailsettings.php:519 actions/smssettings.php:554
 msgid "No incoming email address."
 msgstr "Chomlec'h postel ebet o tont."
 
 #. TRANS: Server error thrown on database error removing incoming e-mail address.
 #. TRANS: Server error thrown on database error adding incoming e-mail address.
-#: actions/emailsettings.php:530 actions/emailsettings.php:554
-#: actions/smssettings.php:565 actions/smssettings.php:588
+#. TRANS: Server error displayed when the user could not be updated in SMS settings.
+#: actions/emailsettings.php:531 actions/emailsettings.php:555
+#: actions/smssettings.php:565 actions/smssettings.php:590
 msgid "Could not update user record."
 msgstr "Dibosupl hizivaat teuliad an implijer."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:534 actions/smssettings.php:568
+#. TRANS: Confirmation text after updating SMS settings.
+#: actions/emailsettings.php:535 actions/smssettings.php:569
 msgid "Incoming email address removed."
 msgstr "Diverket eo bet ar chomlec'h postel o tont tre."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:558 actions/smssettings.php:591
+#. TRANS: Confirmation text after updating SMS settings.
+#: actions/emailsettings.php:559 actions/smssettings.php:594
 msgid "New incoming email address added."
 msgstr "Ouzhpennet ez eus bet ur chomlec'h postel nevez o tont tre"
 
@@ -2630,7 +2681,7 @@ msgstr "Ouzhpennet eo bet ar c'hemenn-mañ d'ho pennrolloù dija !"
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
 #: actions/favor.php:95
 #, fuzzy
-msgid "Disfavor favorite"
+msgid "Disfavor favorite."
 msgstr "Tennañ ar pennroll"
 
 #. TRANS: Page title for first page of favorited notices.
@@ -2679,9 +2730,8 @@ msgstr ""
 #. TRANS: %s is a user's nickname.
 #. TRANS: Title for first page of favourite notices of a user.
 #. TRANS: %s is the user for whom the favourite notices are displayed.
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing own favourited notices.
 #: actions/favoritesrss.php:111 actions/showfavorites.php:76
-#: lib/personalgroupnav.php:122
+#: lib/personalgroupnav.php:110
 #, php-format
 msgid "%s's favorite notices"
 msgstr "Alioù pennrollet eus %s"
@@ -2868,14 +2918,12 @@ msgstr ""
 
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
 #: actions/groupblock.php:191
-#, fuzzy
-msgid "Do not block this user from this group"
+msgid "Do not block this user from this group."
 msgstr "Arabat stankañ an implijer-mañ er strollad-mañ."
 
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
 #: actions/groupblock.php:198
-#, fuzzy
-msgid "Block this user from this group"
+msgid "Block this user from this group."
 msgstr "Stankañ an implijer-mañ er strollad-mañ."
 
 #. TRANS: Server error displayed when trying to block a user from a group fails because of an application error.
@@ -2885,6 +2933,7 @@ msgid "Database error blocking user from group."
 msgstr "Distankañ implijer ar strollad"
 
 #. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
+#. TRANS: Client error displayed trying to find a user by ID without providing an ID.
 #: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr "ID ebet"
@@ -2914,7 +2963,7 @@ msgid "Unable to update your design settings."
 msgstr "Dibosupl eo enrollañ an arventennoù empentiñ."
 
 #. TRANS: Form text to confirm saved group design settings.
-#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:222
+#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:239
 msgid "Design preferences saved."
 msgstr "Enrollet eo bet an arventennoù design."
 
@@ -2978,7 +3027,7 @@ msgid "A list of the users in this group."
 msgstr "Roll an implijerien enrollet er strollad-mañ."
 
 #. TRANS: Indicator in group members list that this user is a group administrator.
-#: actions/groupmembers.php:190
+#: actions/groupmembers.php:190 lib/action.php:581
 msgid "Admin"
 msgstr "Merañ"
 
@@ -3067,8 +3116,10 @@ msgid "Group search"
 msgstr "Klask strolladoù"
 
 #. TRANS: Text on page where groups can be searched if no results were found for a query.
-#: actions/groupsearch.php:82 actions/noticesearch.php:117
-#: actions/peoplesearch.php:83
+#. TRANS: Text for notice search results is the query had no results.
+#. TRANS: Message on the "People search" page where a query has no results.
+#: actions/groupsearch.php:82 actions/noticesearch.php:122
+#: actions/peoplesearch.php:87
 msgid "No results."
 msgstr "Disoc'h ebet."
 
@@ -3105,157 +3156,162 @@ msgid "User is not blocked from group."
 msgstr "N'eo ket stanket an implijer-mañ eus ar strollad."
 
 #. TRANS: Server error displayed when unblocking a user from a group fails because of an unknown error.
+#. TRANS: Server error displayed when removing a user block.
 #: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "Ur fazi a zo bet e-pad nulladenn ar stankadenn."
 
 #. TRANS: Title for Instant Messaging settings.
-#: actions/imsettings.php:58
+#: actions/imsettings.php:56
 msgid "IM settings"
 msgstr "Arventennoù ar bostelerezh prim"
 
 #. 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.
-#: actions/imsettings.php:71
+#: actions/imsettings.php:69
 #, php-format
 msgid ""
-"You can send and receive notices through Jabber/Google Talk [instant "
-"messages](%%doc.im%%). Configure your address and settings below."
+"You can send and receive notices through instant messaging [instant messages]"
+"(%%doc.im%%). Configure your addresses and settings below."
 msgstr ""
 
-#. TRANS: Message given in the Instant Messaging settings if XMPP is not enabled on the site.
+#. TRANS: Message given in the IM settings if IM is not enabled on the site.
 #: actions/imsettings.php:90
 msgid "IM is not available."
 msgstr "Dizimplijadus eo ar bostelerezh prim"
 
-#. TRANS: Form legend for Instant Messaging settings form.
-#. TRANS: Field label for Instant Messaging address input in Instant Messaging settings form.
-#: actions/imsettings.php:102 actions/imsettings.php:132
+#: actions/imsettings.php:116
+#, fuzzy, php-format
+msgid "Current confirmed %s address."
+msgstr "Chomlec'h postel gwiriekaet er mare-mañ."
+
+#. TRANS: Form note in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:128
+#, php-format
+msgid ""
+"Awaiting confirmation on this address. Check your %s account for a message "
+"with further instructions. (Did you add %s to your buddy list?)"
+msgstr ""
+
+#: actions/imsettings.php:140
 msgid "IM address"
 msgstr "Chomlec'h postelerezh prim"
 
-#: actions/imsettings.php:109
+#: actions/imsettings.php:142
+#, php-format
+msgid "%s screenname."
+msgstr ""
+
+#. TRANS: Header for IM preferences form.
+#: actions/imsettings.php:163
 #, fuzzy
-msgid "Current confirmed Jabber/Google Talk address."
-msgstr "Chomlec'h Jabber/GTalk kadarnaet er mare-mañ."
-
-#. TRANS: Form note in Instant Messaging settings form.
-#. TRANS: %s is the Instant Messaging address set for the site.
-#: actions/imsettings.php:120
-#, php-format
-msgid ""
-"Awaiting confirmation on this address. Check your Jabber/Google Talk account "
-"for a message with further instructions. (Did you add %s to your buddy list?)"
-msgstr ""
-
-#. TRANS: IM address input field instructions in Instant Messaging settings form.
-#. TRANS: %s is the Instant Messaging address set for the site.
-#. TRANS: Do not translate "example.org". It is one of the domain names reserved for use in examples by
-#. TRANS: http://www.rfc-editor.org/rfc/rfc2606.txt. Any other domain may be owned by a legitimate
-#. TRANS: person or organization.
-#: actions/imsettings.php:139
-#, php-format
-msgid ""
-"Jabber or Google Talk address, like \"UserName@example.org\". First, make "
-"sure to add %s to your buddy list in your IM client or on Google Talk."
-msgstr ""
-
-#. TRANS: Form legend for Instant Messaging preferences form.
-#: actions/imsettings.php:154
-msgid "IM preferences"
+msgid "IM Preferences"
 msgstr "Penndibaboù ar bostelerezh prim"
 
-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:159
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:174
 #, fuzzy
-msgid "Send me notices through Jabber/Google Talk."
-msgstr "Kas din an alioù dre Jabber/GTalk."
+msgid "Send me notices"
+msgstr "Kas un ali"
 
-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:165
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:176
 #, fuzzy
-msgid "Post a notice when my Jabber/Google Talk status changes."
+msgid "Post a notice when my status changes."
 msgstr "Embann ur MicroID evit ma chomlec'h Jabber/GTalk."
 
-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:171
-#, fuzzy
-msgid ""
-"Send me replies through Jabber/Google Talk from people I'm not subscribed to."
-msgstr "Kas din an alioù dre Jabber/GTalk."
-
-#. TRANS: Checkbox label in Instant Messaging preferences form.
+#. TRANS: Checkbox label in IM preferences form.
 #: actions/imsettings.php:178
 #, fuzzy
-msgid "Publish a MicroID for my Jabber/Google Talk address."
-msgstr "Embann ur MicroID evit ma chomlec'h Jabber/GTalk."
+msgid "Send me replies from people I'm not subscribed to."
+msgstr "Kas din an alioù dre Jabber/GTalk."
 
-#. TRANS: Confirmation message for successful Instant Messaging preferences save.
-#: actions/imsettings.php:283 actions/othersettings.php:192
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:181
+#, fuzzy
+msgid "Publish a MicroID"
+msgstr "Embann ur MicroID evit ma chomlec'h postel."
+
+#. TRANS: Server error thrown on database error updating IM preferences.
+#: actions/imsettings.php:291
+#, fuzzy
+msgid "Couldn't update IM preferences."
+msgstr "Dibosupl hizivaat an implijer."
+
+#. TRANS: Confirmation message for successful IM preferences save.
+#. TRANS: Confirmation message after saving preferences.
+#: actions/imsettings.php:298 actions/urlsettings.php:244
 msgid "Preferences saved."
 msgstr "Penndibaboù enrollet"
 
-#. TRANS: Message given saving Instant Messaging address without having provided one.
-#: actions/imsettings.php:304
-msgid "No Jabber ID."
-msgstr "ID Jabber ebet."
-
-#. TRANS: Message given saving Instant Messaging address that cannot be normalised.
-#: actions/imsettings.php:312
+#. TRANS: Message given saving IM address without having provided one.
+#: actions/imsettings.php:320
 #, fuzzy
-msgid "Cannot normalize that Jabber ID."
+msgid "No screenname."
+msgstr "Lesanv ebet."
+
+#: actions/imsettings.php:325
+#, fuzzy
+msgid "No transport."
+msgstr "Ali ebet."
+
+#. TRANS: Message given saving IM address that cannot be normalised.
+#: actions/imsettings.php:333
+#, fuzzy
+msgid "Cannot normalize that screenname"
 msgstr "Dibosupl eo implijout an ID Jabber-mañ"
 
-#. TRANS: Message given saving Instant Messaging address that not valid.
-#: actions/imsettings.php:317
+#. TRANS: Message given saving IM address that not valid.
+#: actions/imsettings.php:340
 #, fuzzy
-msgid "Not a valid Jabber ID."
-msgstr "N'eo ket un ID Jabber reizh."
+msgid "Not a valid screenname"
+msgstr "N'eo ket ul lesanv mat."
 
-#. TRANS: Message given saving Instant Messaging address that is already set.
-#: actions/imsettings.php:321
-msgid "That is already your Jabber ID."
-msgstr "Ho ID Jabber eo dija"
-
-#. TRANS: Message given saving Instant Messaging address that is already set for another user.
-#: actions/imsettings.php:325
-msgid "Jabber ID already belongs to another user."
+#. TRANS: Message given saving IM address that is already set for another user.
+#: actions/imsettings.php:344
+#, fuzzy
+msgid "Screenname already belongs to another user."
 msgstr "Implijet eo an Jabber ID-mañ gant un implijer all."
 
-#. TRANS: Message given saving valid Instant Messaging address that is to be confirmed.
-#. TRANS: %s is the Instant Messaging address set for the site.
-#: actions/imsettings.php:353
-#, php-format
-msgid ""
-"A confirmation code was sent to the IM address you added. You must approve %"
-"s for sending messages to you."
-msgstr ""
+#. TRANS: Message given saving valid IM address that is to be confirmed.
+#: actions/imsettings.php:369
+#, fuzzy
+msgid "A confirmation code was sent to the IM address you added."
+msgstr "N'eo ket ar c'hod-se evidoc'h !"
 
-#. TRANS: Message given canceling Instant Messaging address confirmation for the wrong IM address.
-#: actions/imsettings.php:382
+#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#: actions/imsettings.php:396
 msgid "That is the wrong IM address."
 msgstr "N'eo ket mat ar chomlec'h postelerezh prim."
 
-#. TRANS: Server error thrown on database error canceling Instant Messaging address confirmation.
-#: actions/imsettings.php:391
+#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#: actions/imsettings.php:405
 #, fuzzy
-msgid "Could not delete IM confirmation."
+msgid "Couldn't delete confirmation."
 msgstr "Diposubl eo dilemel ar postel kadarnadur."
 
-#. TRANS: Message given after successfully canceling Instant Messaging address confirmation.
-#: actions/imsettings.php:396
+#. TRANS: Message given after successfully canceling IM address confirmation.
+#: actions/imsettings.php:410
 msgid "IM confirmation cancelled."
 msgstr "Nullet eo bet kadarnadenn ar bostelerezh prim."
 
-#. TRANS: Message given trying to remove an Instant Messaging address that is not
+#. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.
-#: actions/imsettings.php:417
-msgid "That is not your Jabber ID."
-msgstr "N'eo ket ho ID Jabber."
+#: actions/imsettings.php:434
+#, fuzzy
+msgid "That is not your screenname."
+msgstr "n'eo ket ho niverenn pellgomz."
+
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#: actions/imsettings.php:443
+#, fuzzy
+msgid "Couldn't update user im prefs."
+msgstr "Dibosupl hizivaat teuliad an implijer."
 
 #. TRANS: Message given after successfully removing a registered Instant Messaging address.
-#: actions/imsettings.php:440
+#: actions/imsettings.php:451
 msgid "The IM address was removed."
 msgstr "Dilamet eo bet ar chomlec'h IM."
 
@@ -3443,7 +3499,7 @@ msgid "You must be logged in to join a group."
 msgstr "Rankout a reoc'h bezañ luget evit mont en ur strollad."
 
 #. TRANS: Title for join group page after joining.
-#: actions/joingroup.php:147
+#: actions/joingroup.php:148
 #, php-format
 msgctxt "TITLE"
 msgid "%1$s joined group %2$s"
@@ -3571,7 +3627,7 @@ msgstr "URL ur skeudenn da ziskouez gant an aotre-implijout."
 #. TRANS: Submit button title.
 #: actions/licenseadminpanel.php:311 actions/sessionsadminpanel.php:199
 #: actions/siteadminpanel.php:292 actions/snapshotadminpanel.php:245
-#: actions/tagother.php:154 lib/applicationeditform.php:357
+#: actions/tagother.php:133 lib/applicationeditform.php:357
 msgid "Save"
 msgstr "Enrollañ"
 
@@ -3579,43 +3635,45 @@ msgstr "Enrollañ"
 msgid "Save license settings"
 msgstr "Enrollañ arventennoù an aotre-implijout"
 
-#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
+#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
+#: actions/login.php:97 actions/otp.php:62 actions/register.php:130
 msgid "Already logged in."
 msgstr "Kevreet oc'h dija."
 
-#: actions/login.php:148
+#: actions/login.php:125
 msgid "Incorrect username or password."
 msgstr "Anv implijer pe ger-tremen direizh."
 
-#: actions/login.php:154 actions/otp.php:120
+#. TRANS: Server error displayed when a user object could not be created trying to login using "one time password login".
+#: actions/login.php:131 actions/otp.php:127
 msgid "Error setting user. You are probably not authorized."
 msgstr ""
 "Ur fazi 'zo bet e-pad hizivadenn an implijer. Moarvat n'oc'h ket aotreet "
 "evit en ober."
 
-#: actions/login.php:210 actions/login.php:263
+#: actions/login.php:185 actions/login.php:236 lib/action.php:598
 msgid "Login"
 msgstr "Kevreañ"
 
-#: actions/login.php:249
+#: actions/login.php:222
 msgid "Login to site"
 msgstr "Kevreañ d'al lec'hienn"
 
-#: actions/login.php:258 actions/register.php:490
+#: actions/login.php:231 actions/register.php:469
 msgid "Remember me"
 msgstr "Kaout soñj"
 
-#: actions/login.php:259 actions/register.php:492
+#: actions/login.php:232 actions/register.php:471
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 "Digeriñ va dalc'h war-eeun ar wechoù o tont ; arabat en ober war "
 "urzhiataeroù rannet pe publik !"
 
-#: actions/login.php:269
+#: actions/login.php:241
 msgid "Lost or forgotten password?"
 msgstr "Ha kollet ho peus ho ker-tremen ?"
 
-#: actions/login.php:288
+#: actions/login.php:259
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -3623,11 +3681,11 @@ msgstr ""
 "Evit abegoù a surentezh, mar plij adlakait hoc'h anv implijer hag ho ker-"
 "tremen a-benn enrollañ ho penndibaboù."
 
-#: actions/login.php:292
+#: actions/login.php:263
 msgid "Login with your username and password."
 msgstr "Kevreit gant ho anv implijer hag ho ker-tremen."
 
-#: actions/login.php:295
+#: actions/login.php:266
 #, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -3756,7 +3814,9 @@ msgstr "Ali nevez"
 msgid "Notice posted"
 msgstr "Ali embannet"
 
-#: actions/noticesearch.php:68
+#. TRANS: Instructions for Notice search page.
+#. TRANS: %%site.name%% is the name of the StatusNet site.
+#: actions/noticesearch.php:69
 #, fuzzy, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -3766,23 +3826,30 @@ msgstr ""
 "Dispartiañ termenoù ar c'hlask gant esaouennoù. Ret eo e vefe da nebeutañ 3 "
 "arouezenn."
 
-#: actions/noticesearch.php:78
+#. TRANS: Title of the page where users can search for notices.
+#: actions/noticesearch.php:80
 msgid "Text search"
 msgstr "Klask testennoù"
 
-#: actions/noticesearch.php:91
+#. TRANS: Test in RSS notice search.
+#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
+#: actions/noticesearch.php:95
 #, php-format
 msgid "Search results for \"%1$s\" on %2$s"
 msgstr "Disoc'hoù ar c'hlask evit \"%1$s\" e %2$s"
 
-#: actions/noticesearch.php:121
+#. TRANS: Text for logged in users making a query for notices without results.
+#. TRANS: This message contains a Markdown link.
+#: actions/noticesearch.php:128
 #, php-format
 msgid ""
 "Be the first to [post on this topic](%%%%action.newnotice%%%%?"
 "status_textarea=%s)!"
 msgstr ""
 
-#: actions/noticesearch.php:124
+#. TRANS: Text for not logged in users making a query for notices without results.
+#. TRANS: This message contains Markdown links.
+#: actions/noticesearch.php:133
 #, fuzzy, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and be the first to "
@@ -3791,14 +3858,17 @@ msgstr ""
 "Perak ne [groufec'h ket ur gont](%%action.register%%) ha bezañ an hini "
 "gentañ da embann un dra !"
 
-#: actions/noticesearchrss.php:96
+#. TRANS: RSS notice search feed title. %s is the query.
+#: actions/noticesearchrss.php:95
 #, php-format
 msgid "Updates with \"%s\""
 msgstr "Hizivadenn gant \"%s\""
 
-#: actions/noticesearchrss.php:98
+#. TRANS: RSS notice search feed description.
+#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
+#: actions/noticesearchrss.php:99
 #, fuzzy, php-format
-msgid "Updates matching search term \"%1$s\" on %2$s!"
+msgid "Updates matching search term \"%1$s\" on %2$s."
 msgstr "Hizivadennoù merket gant %1$s e %2$s !"
 
 #: actions/nudge.php:85
@@ -3816,51 +3886,51 @@ msgid "Nudge sent!"
 msgstr "Kaset eo bet ar blinkadenn !"
 
 #. TRANS: Message displayed to an anonymous user trying to view OAuth application list.
-#: actions/oauthappssettings.php:60
+#: actions/oauthappssettings.php:57
 msgid "You must be logged in to list your applications."
 msgstr "Rankout a reoc'h bezañ kevreet evit rollañ ho poelladoù."
 
 #. TRANS: Page title for OAuth applications
-#: actions/oauthappssettings.php:76
+#: actions/oauthappssettings.php:73
 msgid "OAuth applications"
 msgstr "Poelladoù OAuth"
 
 #. TRANS: Page instructions for OAuth applications
-#: actions/oauthappssettings.php:88
+#: actions/oauthappssettings.php:85
 msgid "Applications you have registered"
 msgstr "Ar poelladoù ho peus enrollet"
 
 #. TRANS: Empty list message on page with OAuth applications.
-#: actions/oauthappssettings.php:141
+#: actions/oauthappssettings.php:138
 #, php-format
 msgid "You have not registered any applications yet."
 msgstr "N'ho peus enrollet poellad ebet evit poent."
 
 #. TRANS: Title for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:71
+#: actions/oauthconnectionssettings.php:69
 msgid "Connected applications"
 msgstr "Poeladoù kevreet."
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:83
+#: actions/oauthconnectionssettings.php:80
 msgid "The following connections exist for your account."
 msgstr ""
 
 #. TRANS: Client error when trying to revoke access for an application while not being a user of it.
-#: actions/oauthconnectionssettings.php:168
+#: actions/oauthconnectionssettings.php:165
 msgid "You are not a user of that application."
 msgstr "N'oc'h ket un implijer eus ar poellad-mañ."
 
 #. TRANS: Client error when revoking access has failed for some reason.
 #. TRANS: %s is the application ID revoking access failed for.
-#: actions/oauthconnectionssettings.php:183
+#: actions/oauthconnectionssettings.php:180
 #, fuzzy, php-format
 msgid "Unable to revoke access for application: %s."
 msgstr "Dibosupl eo nullañ moned ar poellad : "
 
 #. TRANS: Success message after revoking access for an application.
 #. TRANS: %1$s is the application name, %2$s is the first part of the user token.
-#: actions/oauthconnectionssettings.php:202
+#: actions/oauthconnectionssettings.php:199
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -3868,20 +3938,30 @@ msgid ""
 msgstr ""
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:213
+#: actions/oauthconnectionssettings.php:210
 msgid "You have not authorized any applications to use your account."
 msgstr "N'ho peus aotreet poellad ebet da implijout ho kont."
 
 #. TRANS: Note for developers in the OAuth connection settings form.
 #. TRANS: This message contains a Markdown link. Do not separate "](".
 #. TRANS: %s is the URL to the OAuth settings.
-#: actions/oauthconnectionssettings.php:233
+#: actions/oauthconnectionssettings.php:230
 #, php-format
 msgid ""
 "Are you a developer? [Register an OAuth client application](%s) to use with "
 "this instance of StatusNet."
 msgstr ""
 
+#: actions/oembed.php:64
+#, fuzzy, php-format
+msgid "\"%s\" not found."
+msgstr "N'eo ket bet kavet an implijer."
+
+#: actions/oembed.php:76
+#, fuzzy, php-format
+msgid "Notice %s not found."
+msgstr "N'eo ket bet kavet an hentenn API !"
+
 #: actions/oembed.php:80 actions/shownotice.php:100
 msgid "Notice has no profile."
 msgstr "N'en deus ket an ali a profil."
@@ -3891,6 +3971,16 @@ msgstr "N'en deus ket an ali a profil."
 msgid "%1$s's status on %2$s"
 msgstr "Statud %1$s war %2$s"
 
+#: actions/oembed.php:95
+#, fuzzy, php-format
+msgid "Attachment %s not found."
+msgstr "N'eo ket bet kavet ar resever."
+
+#: actions/oembed.php:136
+#, php-format
+msgid "\"%s\" not supported for oembed requests."
+msgstr ""
+
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
 #: actions/oembed.php:168
 #, fuzzy, php-format
@@ -3904,100 +3994,65 @@ msgid "Only %s URLs over plain HTTP please."
 msgstr ""
 
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1205
-#: lib/apiaction.php:1232 lib/apiaction.php:1367
+#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1207
+#: lib/apiaction.php:1234 lib/apiaction.php:1369
 #, fuzzy
 msgid "Not a supported data format."
 msgstr "Diembreget eo ar furmad-se."
 
+#. TRANS: ShortName in the OpenSearch interface when trying to find users.
 #: actions/opensearch.php:64
 msgid "People Search"
 msgstr "Klask tud"
 
-#: actions/opensearch.php:67
+#: actions/opensearch.php:68
 msgid "Notice Search"
 msgstr "Klask alioù"
 
-#: actions/othersettings.php:59
-msgid "Other settings"
-msgstr "Arventennoù all"
-
-#. TRANS: Instructions for tab "Other" in user profile settings.
-#: actions/othersettings.php:71
-msgid "Manage various other options."
-msgstr "Dibarzhioù all da gefluniañ."
-
-#. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
-#. TRANS: user's profile settings. Use of "free" is as in "open", indicating that the
-#. TRANS: information on the shortener site is freely distributable.
-#. TRANS: This message has one space at the beginning. Use your language's word separator
-#. TRANS: here if it has one (most likely a single space).
-#: actions/othersettings.php:113
-msgid " (free service)"
-msgstr " (servij digoust)"
-
-#. TRANS: Label for dropdown with URL shortener services.
-#: actions/othersettings.php:122
-msgid "Shorten URLs with"
-msgstr ""
-
-#. TRANS: Tooltip for for dropdown with URL shortener services.
-#: actions/othersettings.php:124
-msgid "Automatic shortening service to use."
-msgstr ""
-
-#. TRANS: Label for checkbox.
-#: actions/othersettings.php:130
-#, fuzzy
-msgid "View profile designs"
-msgstr "Design ar profil"
-
-#. TRANS: Tooltip for checkbox.
-#: actions/othersettings.php:132
-msgid "Show or hide profile designs."
-msgstr "Diskouez pe kuzhat designoù ar profil."
-
-#. TRANS: Form validation error for form "Other settings" in user profile.
-#: actions/othersettings.php:164
-#, fuzzy
-msgid "URL shortening service is too long (maximum 50 characters)."
-msgstr "Re hir eo ar yezh (255 arouezenn d'ar muiañ)."
-
-#: actions/otp.php:69
+#. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
+#: actions/otp.php:70
 msgid "No user ID specified."
 msgstr "N'eus bet diferet ID implijer ebet."
 
-#: actions/otp.php:83
+#. TRANS: Client error displayed trying to use "one time password login" without specifying a login token.
+#: actions/otp.php:86
 #, fuzzy
 msgid "No login token specified."
 msgstr "N'eus bet diferet ali ebet."
 
-#: actions/otp.php:90
+#. TRANS: Client error displayed trying to use "one time password login" without requesting a login token.
+#: actions/otp.php:94
 #, fuzzy
 msgid "No login token requested."
 msgstr "N'eus profil ID ebet er reked."
 
-#: actions/otp.php:95
+#. TRANS: Client error displayed trying to use "one time password login" while specifying an invalid login token.
+#: actions/otp.php:100
 #, fuzzy
 msgid "Invalid login token specified."
 msgstr "Fichenn direizh."
 
-#: actions/otp.php:104
+#. TRANS: Client error displayed trying to use "one time password login" while specifying an expired login token.
+#: actions/otp.php:110
 #, fuzzy
 msgid "Login token expired."
 msgstr "Kevreañ d'al lec'hienn"
 
-#: actions/outbox.php:58
+#. TRANS: Title for outbox for any but the fist page.
+#. TRANS: %1$s is the user nickname, %2$d is the page number.
+#: actions/outbox.php:57
 #, php-format
 msgid "Outbox for %1$s - page %2$d"
 msgstr "Boest kas %1$s - pajenn %2$d"
 
+#. TRANS: Title for first page of outbox.
 #: actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
 msgstr "Boest kas %s"
 
-#: actions/outbox.php:104
+#. TRANS: Instructions for outbox.
+#: actions/outbox.php:103
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr ""
 
@@ -4023,43 +4078,45 @@ msgstr "Ger-tremen kozh"
 msgid "New password"
 msgstr "Ger-tremen nevez"
 
-#: actions/passwordsettings.php:109
+#: actions/passwordsettings.php:109 actions/register.php:416
 #, fuzzy
-msgid "6 or more characters"
+msgid "6 or more characters."
 msgstr "6 arouezenn pe muioc'h"
 
-#: actions/passwordsettings.php:113
+#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#: actions/passwordsettings.php:113 actions/recoverpassword.php:264
+#: actions/register.php:420
 #, fuzzy
-msgid "Same as password above"
+msgid "Same as password above."
 msgstr "Memestra eget ar ger tremen a-us"
 
 #: actions/passwordsettings.php:117
 msgid "Change"
 msgstr "Kemmañ"
 
-#: actions/passwordsettings.php:154 actions/register.php:238
+#: actions/passwordsettings.php:153 actions/register.php:223
 msgid "Password must be 6 or more characters."
 msgstr "Rankout a ra ar ger-tremen bezañ gant 6 arouezenn d'an nebeutañ."
 
-#: actions/passwordsettings.php:157 actions/register.php:241
+#: actions/passwordsettings.php:156 actions/register.php:226
 msgid "Passwords don't match."
 msgstr "Ne glot ket ar gerioù-tremen."
 
-#: actions/passwordsettings.php:165
+#: actions/passwordsettings.php:164
 msgid "Incorrect old password"
 msgstr "Ger-termen kozh direizh"
 
-#: actions/passwordsettings.php:181
+#: actions/passwordsettings.php:180
 msgid "Error saving user; invalid."
 msgstr "Ur fazi 'zo bet e-pad enolladenn an implijer ; diwiriek."
 
-#: actions/passwordsettings.php:186
+#. TRANS: Reset password form validation error message.
+#: actions/passwordsettings.php:185 actions/recoverpassword.php:418
 #, fuzzy
-msgid "Can't save new password."
+msgid "Cannot save new password."
 msgstr "Dibosupl eo enrollañ ar ger-tremen nevez."
 
-#. TRANS: Title for password recovery page in password saved mode.
-#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
+#: actions/passwordsettings.php:191
 msgid "Password saved."
 msgstr "Ger-tremen enrollet."
 
@@ -4272,8 +4329,7 @@ msgid "Directory where backgrounds are located."
 msgstr ""
 
 #. TRANS: Fieldset legens in Paths admin panel.
-#. TRANS: DT element label in attachment list.
-#: actions/pathsadminpanel.php:419 lib/attachmentlist.php:98
+#: actions/pathsadminpanel.php:419
 msgid "Attachments"
 msgstr "Pezhioù stag"
 
@@ -4345,7 +4401,9 @@ msgstr ""
 msgid "Save paths"
 msgstr "Enrollañ an hentadoù."
 
-#: actions/peoplesearch.php:52
+#. TRANS: Instructions for the "People search" page.
+#. TRANS: %%site.name%% is the name of the StatusNet site.
+#: actions/peoplesearch.php:54
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
@@ -4355,7 +4413,8 @@ msgstr ""
 "Dispartiañ termenoù ar c'hlask gant esaouennoù. Ret eo e vefe da nebeutañ 3 "
 "arouezenn."
 
-#: actions/peoplesearch.php:58
+#. TRANS: Title of a page where users can search for other users.
+#: actions/peoplesearch.php:61
 msgid "People search"
 msgstr "Klask tud"
 
@@ -4369,6 +4428,60 @@ msgstr "N'eo ket reizh ar merk-se : %s."
 msgid "Users self-tagged with %1$s - page %2$d"
 msgstr "Implijerien bet merket drezo o unan gant %1$s - pajenn %2$d"
 
+#. TRANS: Page title for AJAX form return when a disabling a plugin.
+#: actions/plugindisable.php:69
+msgctxt "plugin"
+msgid "Disabled"
+msgstr ""
+
+#. TRANS: Client error displayed trying to perform any request method other than POST.
+#. TRANS: Do not translate POST.
+#: actions/pluginenable.php:78 actions/subscribe.php:77
+msgid "This action only accepts POST requests."
+msgstr ""
+
+#: actions/pluginenable.php:102
+#, fuzzy
+msgid "You cannot administer plugins."
+msgstr "N'hallit ket diverkañ implijerien."
+
+#: actions/pluginenable.php:109
+#, fuzzy
+msgid "No such plugin."
+msgstr "N'eus ket eus ar bajenn-se."
+
+#. TRANS: Page title for AJAX form return when enabling a plugin.
+#: actions/pluginenable.php:159
+msgctxt "plugin"
+msgid "Enabled"
+msgstr ""
+
+#. TRANS: Tab and title for plugins admin panel.
+#. TRANS: Menu item for site administration
+#: actions/pluginsadminpanel.php:56 actions/version.php:191
+#: lib/adminpanelaction.php:411
+msgid "Plugins"
+msgstr "Pluginoù"
+
+#. TRANS: Instructions at top of plugin admin page.
+#: actions/pluginsadminpanel.php:68
+msgid ""
+"Additional plugins can be enabled and configured manually. See the <a href="
+"\"http://status.net/wiki/Plugins\">online plugin documentation</a> for more "
+"details."
+msgstr ""
+
+#. TRANS: Admin form section header
+#: actions/pluginsadminpanel.php:84
+#, fuzzy
+msgid "Default plugins"
+msgstr "Yezh dre ziouer"
+
+#: actions/pluginsadminpanel.php:106
+msgid ""
+"All default plugins have been disabled from the site's configuration file."
+msgstr ""
+
 #: actions/postnotice.php:95
 msgid "Invalid notice content."
 msgstr "Danvez direizh an ali."
@@ -4381,12 +4494,12 @@ msgstr ""
 "lec'hienn \"%2$s\"."
 
 #. TRANS: Page title for profile settings.
-#: actions/profilesettings.php:59
+#: actions/profilesettings.php:60
 msgid "Profile settings"
 msgstr "Arventennoù ar profil"
 
 #. TRANS: Usage instructions for profile settings.
-#: actions/profilesettings.php:70
+#: actions/profilesettings.php:71
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
@@ -4394,34 +4507,31 @@ msgstr ""
 "diwar ho penn."
 
 #. TRANS: Profile settings form legend.
-#: actions/profilesettings.php:98
+#: actions/profilesettings.php:99
 msgid "Profile information"
 msgstr "Titouroù ar profil"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109 actions/register.php:433
+#: actions/profilesettings.php:110 actions/register.php:412
 #, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr "1 da 64 lizherenn vihan pe sifr, hep poentaouiñ nag esaouenn"
 
 #. TRANS: Field label in form for profile settings.
-#. TRANS: Label for full group name (dt). Text hidden by default.
-#. TRANS: DT for full name in a profile.
-#: actions/profilesettings.php:113 actions/register.php:455
-#: actions/showgroup.php:255 actions/tagother.php:104
-#: lib/groupeditform.php:150 lib/userprofile.php:156
+#: actions/profilesettings.php:114 actions/register.php:434
+#: lib/groupeditform.php:150
 msgid "Full name"
 msgstr "Anv klok"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:118 actions/register.php:460
+#: actions/profilesettings.php:119 actions/register.php:439
 #: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "Pajenn degemer"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:121
+#: actions/profilesettings.php:122 actions/register.php:441
 #, fuzzy
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr "URL ho pajenn degemer, ho blog, pe ho profil en ul lec'hienn all"
@@ -4429,7 +4539,7 @@ msgstr "URL ho pajenn degemer, ho blog, pe ho profil en ul lec'hienn all"
 #. TRANS: Tooltip for field label in form for profile settings. Plural
 #. TRANS: is decided by the number of characters available for the
 #. TRANS: biography (%d).
-#: actions/profilesettings.php:129 actions/register.php:471
+#: actions/profilesettings.php:130 actions/register.php:450
 #, fuzzy, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4437,79 +4547,75 @@ msgstr[0] "Deskrivit ac'hanoc'h hag ho interestoù, gant %d arouezenn"
 msgstr[1] "Deskrivit ac'hanoc'h hag ho interestoù, gant %d arouezenn"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:135 actions/register.php:476
+#: actions/profilesettings.php:136 actions/register.php:455
 msgid "Describe yourself and your interests"
 msgstr "Deskrivit hoc'h-unan hag ar pezh a zedenn ac'hanoc'h"
 
 #. TRANS: Text area label in form for profile settings where users can provide.
 #. TRANS: their biography.
-#: actions/profilesettings.php:139 actions/register.php:478
+#: actions/profilesettings.php:140 actions/register.php:457
 msgid "Bio"
 msgstr "Buhezskrid"
 
 #. TRANS: Field label in form for profile settings.
-#. TRANS: Label for group location (dt). Text hidden by default.
-#. TRANS: DT for location in a profile.
-#: actions/profilesettings.php:145 actions/register.php:483
-#: actions/showgroup.php:265 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:173
-#: lib/userprofile.php:172
+#: actions/profilesettings.php:146 actions/register.php:462
+#: lib/groupeditform.php:173
 msgid "Location"
 msgstr "Lec'hiadur"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148 actions/register.php:485
+#: actions/profilesettings.php:149
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "El lec'h m'emaoc'h, da skouer \"Kêr, Stad (pe Rannvro), Bro\""
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:153
+#: actions/profilesettings.php:154
 msgid "Share my current location when posting notices"
 msgstr "Rannañ va lec'hiadur pa bostan un ali."
 
 #. TRANS: Field label in form for profile settings.
-#. TRANS: DT for tags in a profile.
-#: actions/profilesettings.php:161 actions/tagother.php:149
-#: actions/tagother.php:209 lib/subscriptionlist.php:106
-#: lib/subscriptionlist.php:108 lib/userprofile.php:220
+#: actions/profilesettings.php:162 actions/tagother.php:128
+#: actions/tagother.php:188 lib/subscriptionlist.php:104
+#: lib/subscriptionlist.php:106
 msgid "Tags"
 msgstr "Balizennoù"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:164
+#: actions/profilesettings.php:165
 #, fuzzy
 msgid ""
-"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- "
+"separated."
 msgstr ""
 "Merkoù evidoc'h oc'h unan (lizherennoù, sifroù, -, ., ha _), dispartiet gant "
 "virgulennoù pe esaouennoù"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:169
+#: actions/profilesettings.php:170
 msgid "Language"
 msgstr "Yezh"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:171
+#: actions/profilesettings.php:172
 #, fuzzy
-msgid "Preferred language"
+msgid "Preferred language."
 msgstr "Yezh d'ober ganti da gentañ"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:181
+#: actions/profilesettings.php:182
 msgid "Timezone"
 msgstr "Takad eur"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:183
+#: actions/profilesettings.php:184
 msgid "What timezone are you normally in?"
 msgstr "Pehini eo gwerzhid-eur boaz ?"
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:189
+#: actions/profilesettings.php:190
 #, fuzzy
 msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)"
+"Automatically subscribe to whoever subscribes to me (best for non-humans)."
 msgstr ""
 "En em enskrivañ ez emgefre d'an holl re hag en em goumanant din (erbedet "
 "evit an implijerien nann-denel)"
@@ -4517,7 +4623,7 @@ msgstr ""
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Plural form is used based on the maximum number of allowed
 #. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:258 actions/register.php:229
+#: actions/profilesettings.php:259 actions/register.php:214
 #, fuzzy, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4525,50 +4631,50 @@ msgstr[0] "Re hir eo ar bio (%d arouezenn d'ar muiañ)."
 msgstr[1] "Re hir eo ar bio (%d arouezenn d'ar muiañ)."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:269 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:270 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr "N'eo bet dibabet gwerzhid-eur ebet."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:277
+#: actions/profilesettings.php:278
 #, fuzzy
 msgid "Language is too long (maximum 50 characters)."
 msgstr "Re hir eo ar yezh (255 arouezenn d'ar muiañ)."
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:291 actions/tagother.php:178
-#, php-format
-msgid "Invalid tag: \"%s\""
+#: actions/profilesettings.php:292
+#, fuzzy, php-format
+msgid "Invalid tag: \"%s\"."
 msgstr "Balizenn direizh : \"%s\""
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:347
+#: actions/profilesettings.php:348
 #, fuzzy
 msgid "Could not update user for autosubscribe."
 msgstr "Dibosupl eo hizivaat ar c'houmanant ez emgefre."
 
 #. TRANS: Server error thrown when user profile location preference settings could not be updated.
-#: actions/profilesettings.php:405
+#: actions/profilesettings.php:406
 #, fuzzy
 msgid "Could not save location prefs."
 msgstr "Dibosupl eo enrollañ an dibaboù lec'hiadur."
 
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:427 actions/tagother.php:200
+#: actions/profilesettings.php:428 actions/tagother.php:179
 msgid "Could not save tags."
 msgstr "Dibosupl eo enrollañ ar merkoù."
 
 #. TRANS: Confirmation shown when user profile settings are saved.
 #. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:436 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:437 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "Enrollet eo bet an arventennoù."
 
 #. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
 #. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:483 actions/restoreaccount.php:60
+#: actions/profilesettings.php:484 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "Krouiñ ur gont"
@@ -4644,6 +4750,12 @@ 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: Public RSS feed description. %s is the StatusNet site name.
+#: actions/publicrss.php:106
+#, fuzzy, php-format
+msgid "%s updates from everyone."
+msgstr "%s statud an holl !"
+
 #. TRANS: Title for public tag cloud.
 #: actions/publictagcloud.php:57
 msgid "Public tag cloud"
@@ -4684,10 +4796,6 @@ msgstr ""
 "Perak ne [groufec'h ket ur gont](%%action.register%%) ha bezañ an hini "
 "gentañ da embann un dra !"
 
-#: actions/publictagcloud.php:146
-msgid "Tag cloud"
-msgstr "Nivlennad tikedennoù"
-
 #. TRANS: Client error displayed trying to recover password while already logged in.
 #: actions/recoverpassword.php:37
 msgid "You are already logged in!"
@@ -4780,6 +4888,12 @@ msgstr "Adtapout ar ger-tremen"
 msgid "Password recovery requested"
 msgstr "Goulennet eo an adtapout gerioù-tremen"
 
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/recoverpassword.php:229
+#, fuzzy
+msgid "Password saved"
+msgstr "Ger-tremen enrollet."
+
 #. TRANS: Title for password recovery page when an unknown action has been specified.
 #: actions/recoverpassword.php:232
 msgid "Unknown action"
@@ -4791,15 +4905,9 @@ msgstr "Oberiadenn dianav"
 msgid "6 or more characters, and do not forget it!"
 msgstr "6 arouezenn pe muioc'h, ha n'e zisoñjit ket !"
 
-#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
-#: actions/recoverpassword.php:264 actions/register.php:441
-#, fuzzy
-msgid "Same as password above."
-msgstr "Memestra eget ar ger tremen a-us"
-
 #. TRANS: Button text for password reset form.
 #. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: actions/recoverpassword.php:268 lib/designsettings.php:264
+#: actions/recoverpassword.php:268 lib/designform.php:145
 msgctxt "BUTTON"
 msgid "Reset"
 msgstr "Adderaouiñ"
@@ -4849,14 +4957,8 @@ msgstr "Rankout a ra ar ger-tremen bezañ 6 arouezenn d'an nebeutañ."
 msgid "Password and confirmation do not match."
 msgstr "Ne glot ket ar ger-tremen gant ar c'hadarnadur."
 
-#. TRANS: Reset password form validation error message.
-#: actions/recoverpassword.php:418
-#, fuzzy
-msgid "Cannot save new password."
-msgstr "Dibosupl eo enrollañ ar ger-tremen nevez."
-
 #. TRANS: Server error displayed when something does wrong with the user object during password reset.
-#: actions/recoverpassword.php:426 actions/register.php:256
+#: actions/recoverpassword.php:426 actions/register.php:241
 msgid "Error setting user."
 msgstr "Ur fazi 'zo bet e-pad kefluniadur an implijer."
 
@@ -4865,107 +4967,111 @@ msgstr "Ur fazi 'zo bet e-pad kefluniadur an implijer."
 msgid "New password successfully saved. You are now logged in."
 msgstr "Krouet eo bet ar ger-tremen nevez. Kevreet oc'h bremañ."
 
-#: actions/register.php:92 actions/register.php:196 actions/register.php:413
+#: actions/redirecturl.php:70
+#, fuzzy
+msgid "No id parameter"
+msgstr "Arguzenn ID ebet."
+
+#: actions/redirecturl.php:76
+#, fuzzy, php-format
+msgid "No such file \"%d\""
+msgstr "Restr ezvezant."
+
+#: actions/register.php:80 actions/register.php:181 actions/register.php:392
 msgid "Sorry, only invited people can register."
 msgstr ""
 "Digarezit, met n'eus nemet an implijerien bet pedet hag a c'hell en em "
 "enskrivañ."
 
-#: actions/register.php:99
+#: actions/register.php:87
 msgid "Sorry, invalid invitation code."
 msgstr "Digarezit, kod pedadenn direizh."
 
-#: actions/register.php:119
+#: actions/register.php:106
 msgid "Registration successful"
 msgstr "Krouet eo bet ar gont."
 
-#: actions/register.php:121 actions/register.php:511
+#: actions/register.php:108 actions/register.php:490
 msgid "Register"
 msgstr "Krouiñ ur gont"
 
-#: actions/register.php:142
+#: actions/register.php:128
 msgid "Registration not allowed."
 msgstr "N'eo ket aotreet krouiñ kontoù."
 
-#: actions/register.php:209
+#: actions/register.php:194
 #, fuzzy
-msgid "You can't register if you don't agree to the license."
+msgid "You cannot register if you don't agree to the license."
 msgstr ""
 "Rankout a rit bezañ a-du gant termenoù an aotre-implijout evit krouiñ ur "
 "gont."
 
-#: actions/register.php:218
+#: actions/register.php:203
 msgid "Email address already exists."
 msgstr "Implijet eo dija ar chomlec'h postel-se."
 
-#: actions/register.php:251 actions/register.php:273
+#: actions/register.php:236 actions/register.php:258
 msgid "Invalid username or password."
 msgstr "Anv implijer pe ger-tremen direizh."
 
-#: actions/register.php:351
+#: actions/register.php:333
 msgid ""
 "With this form you can create a new account. You can then post notices and "
-"link up to friends and colleagues. "
+"link up to friends and colleagues."
 msgstr ""
 
-#: actions/register.php:437
-#, fuzzy
-msgid "6 or more characters."
-msgstr "6 arouezenn pe muioc'h"
-
-#. TRANS: Link description in user account settings menu.
-#: actions/register.php:445 actions/register.php:449
-#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
+#: actions/register.php:424 actions/register.php:428
+#: actions/siteadminpanel.php:238 lib/settingsnav.php:92
 msgid "Email"
 msgstr "Postel"
 
-#: actions/register.php:446 actions/register.php:450
+#: actions/register.php:425 actions/register.php:429
 #, fuzzy
-msgid "Used only for updates, announcements, and password recovery"
+msgid "Used only for updates, announcements, and password recovery."
 msgstr ""
 "Implijet hepken evit an hizivadennoù, ar c'hemennoù, pe adtapout gerioù-"
 "tremen"
 
-#: actions/register.php:457
+#: actions/register.php:436
 #, fuzzy
-msgid "Longer name, preferably your \"real\" name"
+msgid "Longer name, preferably your \"real\" name."
 msgstr "Anv hiroc'h, ho anv \"gwir\" a zo gwelloc'h"
 
-#: actions/register.php:462
+#: actions/register.php:464
 #, fuzzy
-msgid "URL of your homepage, blog, or profile on another site"
-msgstr "URL ho pajenn degemer, ho blog, pe ho profil en ul lec'hienn all"
+msgid "Where you are, like \"City, State (or Region), Country\"."
+msgstr "El lec'h m'emaoc'h, da skouer \"Kêr, Stad (pe Rannvro), Bro\""
 
-#: actions/register.php:523
+#: actions/register.php:503
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
 msgstr "Kompren a ran ez eo prevez danvez ha roadennoù %1$s."
 
-#: actions/register.php:533
+#: actions/register.php:513
 #, php-format
 msgid "My text and files are copyright by %1$s."
 msgstr "Ma zestenn ha ma restroù a zo gwarezet dre copyright gant %1$s."
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:537
+#: actions/register.php:517
 msgid "My text and files remain under my own copyright."
 msgstr "Ma zestenn ha ma restroù a chom dindan ma gwirioù oberour."
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:540
+#: actions/register.php:520
 msgid "All rights reserved."
 msgstr "Holl gwrioù miret strizh."
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:545
+#: actions/register.php:525
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
 "email address, IM address, and phone number."
 msgstr ""
 
-#: actions/register.php:588
+#: actions/register.php:566
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -4984,7 +5090,7 @@ msgid ""
 "Thanks for signing up and we hope you enjoy using this service."
 msgstr ""
 
-#: actions/register.php:612
+#: actions/register.php:590
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5014,7 +5120,7 @@ msgstr "Lesanv an implijer"
 
 #: actions/remotesubscribe.php:129
 #, fuzzy
-msgid "Nickname of the user you want to follow"
+msgid "Nickname of the user you want to follow."
 msgstr "Lesanv an implijer ho peus c'hoant heuliañ"
 
 #: actions/remotesubscribe.php:132
@@ -5022,18 +5128,18 @@ msgid "Profile URL"
 msgstr "URL ar profil"
 
 #: actions/remotesubscribe.php:133
-msgid "URL of your profile on another compatible microblogging service"
+msgid "URL of your profile on another compatible microblogging service."
 msgstr ""
 
 #. TRANS: Link text for link that will subscribe to a remote profile.
 #: actions/remotesubscribe.php:136 lib/subscribeform.php:139
-#: lib/userprofile.php:431
+#: lib/userprofile.php:402
 msgid "Subscribe"
 msgstr "En em enskrivañ"
 
 #: actions/remotesubscribe.php:158
 #, fuzzy
-msgid "Invalid profile URL (bad format)"
+msgid "Invalid profile URL (bad format)."
 msgstr "URL direizh evit ar profil (furmad fall)"
 
 #: actions/remotesubscribe.php:167
@@ -5067,7 +5173,7 @@ msgstr "Ne c'helloc'h ket adkemer ho ali deoc'h."
 msgid "You already repeated that notice."
 msgstr "Adkemeret ho peus ar c'hemenn-mañ c'hoazh."
 
-#: actions/repeat.php:112 lib/noticelist.php:692
+#: actions/repeat.php:112 lib/noticelist.php:697
 msgid "Repeated"
 msgstr "Adlavaret"
 
@@ -5075,9 +5181,9 @@ msgstr "Adlavaret"
 msgid "Repeated!"
 msgstr "Adlavaret !"
 
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing @-replies.
+#. TRANS: RSS reply feed title. %s is a user nickname.
 #: actions/replies.php:126 actions/repliesrss.php:68
-#: lib/personalgroupnav.php:109
+#: lib/personalgroupnav.php:105
 #, php-format
 msgid "Replies to %s"
 msgstr "Respontoù da %s"
@@ -5125,9 +5231,11 @@ msgid ""
 "newnotice%%%%?status_textarea=%3$s)."
 msgstr ""
 
-#: actions/repliesrss.php:72
+#. TRANS: RSS reply feed description.
+#. TRANS: %1$s is a user nickname, %2$s is the StatusNet site name.
+#: actions/repliesrss.php:74
 #, fuzzy, php-format
-msgid "Replies to %1$s on %2$s!"
+msgid "Replies to %1$s on %2$s."
 msgstr "Respontoù da %1$s war %2$s !"
 
 #. TRANS: Client exception displayed when trying to restore an account while not logged in.
@@ -5227,7 +5335,7 @@ msgstr "Ne c'helloc'h ket reiñ rolloù d'an implijerien eus al lec'hienn-mañ."
 msgid "User doesn't have this role."
 msgstr "n'en deus ket an implijer-mañ ar rol-se."
 
-#: actions/rsd.php:146 actions/version.php:159
+#: actions/rsd.php:142 actions/version.php:159
 msgid "StatusNet"
 msgstr "StatusNet"
 
@@ -5270,93 +5378,44 @@ msgstr ""
 msgid "Save site settings"
 msgstr "Enrollañ arventennoù al lec'hienn"
 
-#: actions/showapplication.php:82
+#: actions/showapplication.php:78
 msgid "You must be logged in to view an application."
 msgstr "Rankout a reoc'h bezañ kevreet evit gwelet ur poellad."
 
-#: actions/showapplication.php:157
+#: actions/showapplication.php:151
 msgid "Application profile"
 msgstr "Profil ar poellad"
 
-#. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:159 lib/applicationeditform.php:177
-msgid "Icon"
-msgstr "Arlun"
-
-#. TRANS: Form input field label for application name.
-#: actions/showapplication.php:169 actions/version.php:197
-#: lib/applicationeditform.php:190
-msgid "Name"
-msgstr "Anv"
-
-#. TRANS: Form input field label.
-#: actions/showapplication.php:178 lib/applicationeditform.php:227
-msgid "Organization"
-msgstr "Aozadur"
-
-#. TRANS: Form input field label.
-#: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:168
-msgid "Description"
-msgstr "Deskrivadur"
-
-#. TRANS: Header for group statistics on a group page (h2).
-#. TRANS: H2 text for user statistics.
-#: actions/showapplication.php:192 actions/showgroup.php:460
-#: lib/profileaction.php:205
-msgid "Statistics"
-msgstr "Stadegoù"
-
-#: actions/showapplication.php:203
+#: actions/showapplication.php:179
 #, php-format
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr "Krouet gant %1$s - moned %2$s dre ziouer - %3$d implijer"
 
-#: actions/showapplication.php:213
+#: actions/showapplication.php:189
 msgid "Application actions"
 msgstr "Obererezhioù ar poellad"
 
-#: actions/showapplication.php:236
+#: actions/showapplication.php:212
 msgid "Reset key & secret"
 msgstr "Adderaouekaat an alc'hwez hag ar sekred"
 
 #. TRANS: Title of form for deleting a user.
-#: actions/showapplication.php:252 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:64 lib/noticelist.php:673
+#: actions/showapplication.php:228 lib/deletegroupform.php:121
+#: lib/deleteuserform.php:64 lib/noticelist.php:678
 msgid "Delete"
 msgstr "Diverkañ"
 
-#: actions/showapplication.php:261
+#: actions/showapplication.php:237
 msgid "Application info"
 msgstr "Titouroù ar poelad"
 
-#: actions/showapplication.php:263
-msgid "Consumer key"
-msgstr "Alc'hwez implijer"
-
-#: actions/showapplication.php:268
-msgid "Consumer secret"
-msgstr "Sekred an implijer"
-
-#: actions/showapplication.php:273
-msgid "Request token URL"
-msgstr "URL ar jedouer reked"
-
-#: actions/showapplication.php:278
-msgid "Access token URL"
-msgstr "URL ar jedouer moned"
-
-#: actions/showapplication.php:283
-msgid "Authorize URL"
-msgstr "aotren an URL"
-
-#: actions/showapplication.php:288
+#: actions/showapplication.php:255
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
 msgstr ""
 
-#: actions/showapplication.php:309
+#: actions/showapplication.php:275
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr ""
 "Ha sur oc'h ho peus c'hoant adderaouekaat ho alc'hwez bevezer ha sekred ?"
@@ -5436,61 +5495,47 @@ msgstr "strollad %s"
 msgid "%1$s group, page %2$d"
 msgstr "Strollad %1$s, pajenn %2$d"
 
-#. TRANS: Group profile header (h2). Text hidden by default.
-#: actions/showgroup.php:223
-msgid "Group profile"
-msgstr "Profil ar strollad"
-
-#. TRANS: Label for group URL (dt). Text hidden by default.
-#. TRANS: DT for URL in a profile.
-#: actions/showgroup.php:273 actions/tagother.php:118
-#: actions/userauthorization.php:175 lib/userprofile.php:186
-msgid "URL"
-msgstr "URL"
-
 #. TRANS: Label for group description or group note (dt). Text hidden by default.
-#. TRANS: DT for note in a profile.
-#: actions/showgroup.php:285 actions/tagother.php:128
-#: actions/userauthorization.php:187 lib/userprofile.php:204
+#: actions/showgroup.php:266
 msgid "Note"
 msgstr "Notenn"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:296 lib/groupeditform.php:180
+#: actions/showgroup.php:277 lib/groupeditform.php:180
 msgid "Aliases"
 msgstr "Aliasoù"
 
 #. TRANS: Group actions header (h2). Text hidden by default.
-#: actions/showgroup.php:313
+#: actions/showgroup.php:294
 msgid "Group actions"
 msgstr "Obererezh ar strollad"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:357
+#: actions/showgroup.php:338
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
 msgstr "Neudenn alioù ar strollad %s (RSS 1.0)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:364
+#: actions/showgroup.php:345
 #, php-format
 msgid "Notice feed for %s group (RSS 2.0)"
 msgstr "Neudenn alioù ar strollad %s (RSS 2.0)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:371
+#: actions/showgroup.php:352
 #, php-format
 msgid "Notice feed for %s group (Atom)"
 msgstr "Neudenn alioù ar strollad %s (Atom)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:377
+#: actions/showgroup.php:358
 #, php-format
 msgid "FOAF for %s group"
 msgstr "Mignon ur mignon evit ar strollad %s"
 
 #. TRANS: Header for mini list of group members on a group page (h2).
-#: actions/showgroup.php:414
+#: actions/showgroup.php:395
 msgid "Members"
 msgstr "Izili"
 
@@ -5498,25 +5543,30 @@ msgstr "Izili"
 #. TRANS: Text for user subscription statistics if the user has no subscriptions.
 #. TRANS: Text for user subscriber statistics if user has no subscribers.
 #. TRANS: Text for user user group membership statistics if user is not a member of any group.
-#: actions/showgroup.php:420 lib/profileaction.php:137
+#: actions/showgroup.php:401 lib/profileaction.php:137
 #: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
-#: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
+#: lib/subscriptionlist.php:123 lib/tagcloudsection.php:71
 msgid "(None)"
 msgstr "(Hini ebet)"
 
 #. TRANS: Link to all group members from mini list of group members if group has more than n members.
-#: actions/showgroup.php:429
+#: actions/showgroup.php:410
 msgid "All members"
 msgstr "An holl izili"
 
-#. TRANS: Label for creation date in statistics on group page.
-#: actions/showgroup.php:465
+#. TRANS: Header for group statistics on a group page (h2).
+#. TRANS: H2 text for user statistics.
+#: actions/showgroup.php:441 lib/profileaction.php:205
+msgid "Statistics"
+msgstr "Stadegoù"
+
+#: actions/showgroup.php:444
 msgctxt "LABEL"
 msgid "Created"
 msgstr "Krouet"
 
 #. TRANS: Label for member count in statistics on group page.
-#: actions/showgroup.php:473
+#: actions/showgroup.php:449
 msgctxt "LABEL"
 msgid "Members"
 msgstr "Izili"
@@ -5525,7 +5575,7 @@ msgstr "Izili"
 #. TRANS: **%s** is the group alias, %%%%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).
-#: actions/showgroup.php:488
+#: actions/showgroup.php:464
 #, fuzzy, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5540,7 +5590,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: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
-#: actions/showgroup.php:498
+#: actions/showgroup.php:474
 #, fuzzy, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5552,7 +5602,7 @@ msgstr ""
 "Microblog) diazezet war ar meziant frank [StatusNet](http://status.net/)."
 
 #. TRANS: Header for list of group administrators on a group page (h2).
-#: actions/showgroup.php:527
+#: actions/showgroup.php:503
 msgid "Admins"
 msgstr "Merourien"
 
@@ -5593,7 +5643,7 @@ msgid "%1$s tagged %2$s"
 msgstr "%1$s, pajenn %2$d"
 
 #. TRANS: Page title showing tagged notices in one user's stream.
-#. TRANS: %1$s is the username, %2$s is the hash tag, %1$d is the page number.
+#. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
 #: actions/showstream.php:74
 #, fuzzy, php-format
 msgid "%1$s tagged %2$s, page %3$d"
@@ -5640,7 +5690,7 @@ msgid "FOAF for %s"
 msgstr "mignon ur mignon evit %s"
 
 #. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
-#: actions/showstream.php:211
+#: actions/showstream.php:205
 #, fuzzy, php-format
 msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr ""
@@ -5648,7 +5698,7 @@ msgstr ""
 "evit ar mare."
 
 #. TRANS: Second sentence of empty list message for a stream for the user themselves.
-#: actions/showstream.php:217
+#: actions/showstream.php:211
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
@@ -5656,7 +5706,7 @@ msgstr ""
 
 #. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:221
+#: actions/showstream.php:215
 #, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
@@ -5665,7 +5715,7 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:264
+#: actions/showstream.php:258
 #, fuzzy, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5678,7 +5728,7 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:271
+#: actions/showstream.php:265
 #, fuzzy, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5689,7 +5739,7 @@ msgstr ""
 "Microblog) diazezet war ar meziant frank [StatusNet](http://status.net/)."
 
 #. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
-#: actions/showstream.php:328
+#: actions/showstream.php:322
 #, php-format
 msgid "Repeat of %s"
 msgstr "Adkemeret eus %s"
@@ -5838,17 +5888,17 @@ msgstr ""
 #. TRANS: Title for button to save site notice in admin panel.
 #: actions/sitenoticeadminpanel.php:201
 #, fuzzy
-msgid "Save site notice"
+msgid "Save site notice."
 msgstr "Enrollañ ali ul lec'hienn"
 
 #. TRANS: Title for SMS settings.
-#: actions/smssettings.php:57
+#: actions/smssettings.php:56
 msgid "SMS settings"
 msgstr "Arventennoù SMS"
 
 #. TRANS: SMS settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/smssettings.php:71
+#: actions/smssettings.php:70
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr ""
@@ -5856,131 +5906,131 @@ msgstr ""
 "%."
 
 #. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
-#: actions/smssettings.php:93
+#: actions/smssettings.php:92
 msgid "SMS is not available."
 msgstr "Dizimplijadus eo an SMS."
 
 #. TRANS: Form legend for SMS settings form.
-#: actions/smssettings.php:107
+#: actions/smssettings.php:106
 msgid "SMS address"
 msgstr "Chomlec'h SMS"
 
 #. TRANS: Form guide in SMS settings form.
-#: actions/smssettings.php:116
+#: actions/smssettings.php:115
 msgid "Current confirmed SMS-enabled phone number."
 msgstr "Niverenn pellgomz bet gwiriekaet evit resevout SMSoù."
 
 #. TRANS: Form guide in IM settings form.
-#: actions/smssettings.php:129
+#: actions/smssettings.php:128
 msgid "Awaiting confirmation on this phone number."
 msgstr "Niverenn pellgomz o c'hortoz bezañ kadarnaet."
 
 #. TRANS: Field label for SMS address input in SMS settings form.
-#: actions/smssettings.php:138
+#: actions/smssettings.php:137
 msgid "Confirmation code"
 msgstr "Kod kadarnaat"
 
 #. TRANS: Form field instructions in SMS settings form.
-#: actions/smssettings.php:140
+#: actions/smssettings.php:139
 msgid "Enter the code you received on your phone."
 msgstr "Lakait ar c'hod ho peus resevet war ho pellgomzer hezoug."
 
 #. TRANS: Button label to confirm SMS confirmation code in SMS settings.
-#: actions/smssettings.php:144
+#: actions/smssettings.php:143
 msgctxt "BUTTON"
 msgid "Confirm"
 msgstr "Kadarnaat"
 
 #. TRANS: Field label for SMS phone number input in SMS settings form.
-#: actions/smssettings.php:149
+#: actions/smssettings.php:148
 msgid "SMS phone number"
 msgstr "Niverenn bellgomz evit an SMS"
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
-#: actions/smssettings.php:152
+#: actions/smssettings.php:151
 #, fuzzy
-msgid "Phone number, no punctuation or spaces, with area code"
+msgid "Phone number, no punctuation or spaces, with area code."
 msgstr "1 da 64 lizherenn vihan pe sifr, hep poentaouiñ nag esaouenn"
 
 #. TRANS: Form legend for SMS preferences form.
-#: actions/smssettings.php:191
+#: actions/smssettings.php:190
 msgid "SMS preferences"
 msgstr "Penndibaboù an SMSoù"
 
 #. TRANS: Checkbox label in SMS preferences form.
-#: actions/smssettings.php:197
+#: actions/smssettings.php:196
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
 msgstr ""
 
 #. TRANS: Confirmation message for successful SMS preferences save.
-#: actions/smssettings.php:308
+#: actions/smssettings.php:307
 msgid "SMS preferences saved."
 msgstr "Penndibaboù an SMSoù enrollet."
 
 #. TRANS: Message given saving SMS phone number without having provided one.
-#: actions/smssettings.php:330
+#: actions/smssettings.php:329
 msgid "No phone number."
 msgstr "Niverenn bellgomz ebet."
 
 #. TRANS: Message given saving SMS phone number without having selected a carrier.
-#: actions/smssettings.php:336
+#: actions/smssettings.php:335
 #, fuzzy
 msgid "No carrier selected."
 msgstr "Ali dilammet."
 
 #. TRANS: Message given saving SMS phone number that is already set.
-#: actions/smssettings.php:344
+#: actions/smssettings.php:343
 msgid "That is already your phone number."
 msgstr "Ho niverenn pellgomz eo dija."
 
 #. TRANS: Message given saving SMS phone number that is already set for another user.
-#: actions/smssettings.php:348
+#: actions/smssettings.php:347
 msgid "That phone number already belongs to another user."
 msgstr "D'un implijer all eo an niverenn-mañ dija."
 
 #. TRANS: Message given saving valid SMS phone number that is to be confirmed.
-#: actions/smssettings.php:376
+#: actions/smssettings.php:375
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
 "for the code and instructions on how to use it."
 msgstr ""
 
 #. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
-#: actions/smssettings.php:404
+#: actions/smssettings.php:403
 msgid "That is the wrong confirmation number."
 msgstr "Direizh eo ar c'hod gwiriekaat-mañ."
 
 #. TRANS: Message given after successfully canceling SMS phone number confirmation.
-#: actions/smssettings.php:418
+#: actions/smssettings.php:417
 msgid "SMS confirmation cancelled."
 msgstr "Nullet eo bet ar gadarnadenn SMS."
 
 #. TRANS: Message given trying to remove an SMS phone number that is not
 #. TRANS: registered for the active user.
-#: actions/smssettings.php:438
+#: actions/smssettings.php:437
 msgid "That is not your phone number."
 msgstr "n'eo ket ho niverenn pellgomz."
 
 #. TRANS: Message given after successfully removing a registered SMS phone number.
-#: actions/smssettings.php:460
+#: actions/smssettings.php:459
 msgid "The SMS phone number was removed."
 msgstr "Dilamet eo bet an niverenn bellgomz evit an SMSoù."
 
 #. TRANS: Label for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:499
+#: actions/smssettings.php:498
 msgid "Mobile carrier"
 msgstr "Pourvezer pellgomzerezh hezoug"
 
 #. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:504
+#: actions/smssettings.php:503
 msgid "Select a carrier"
 msgstr "Dibab un douger"
 
 #. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
 #. TRANS: %s is an administrative contact's e-mail address.
-#: actions/smssettings.php:513
+#: actions/smssettings.php:512
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -5988,7 +6038,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
-#: actions/smssettings.php:535
+#: actions/smssettings.php:534
 #, fuzzy
 msgid "No code entered."
 msgstr "N'eo bet lakaet kod ebet"
@@ -6067,15 +6117,13 @@ msgstr "N'oc'h ket koumanantet d'ar profil-se."
 msgid "Could not save subscription."
 msgstr "Dibosupl eo dilemel ar c'houmanant."
 
-#: actions/subscribe.php:77
-msgid "This action only accepts POST requests."
-msgstr ""
-
-#: actions/subscribe.php:117
+#. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
+#: actions/subscribe.php:121
 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
 msgstr ""
 
-#: actions/subscribe.php:145
+#. TRANS: Page title when subscription succeeded.
+#: actions/subscribe.php:149
 msgid "Subscribed"
 msgstr "Koumanantet"
 
@@ -6187,31 +6235,34 @@ msgid "Subscription feed for %s (Atom)"
 msgstr "Gwazh alioù %s (Atom)"
 
 #. TRANS: Checkbox label for enabling Jabber messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:239
-msgid "Jabber"
-msgstr "Jabber"
+#: actions/subscriptions.php:241 lib/settingsnav.php:110
+#, fuzzy
+msgid "IM"
+msgstr "IM"
 
 #. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:254
+#: actions/subscriptions.php:256 lib/settingsnav.php:117
 msgid "SMS"
 msgstr "SMS"
 
-#: actions/tag.php:69
+#. TRANS: Title for all but the first page of notices with tags.
+#. TRANS: %1$s is the tag, %2$d is the page number.
+#: actions/tag.php:73
 #, php-format
 msgid "Notices tagged with %1$s, page %2$d"
 msgstr "Alioù merket gant %1$s, pajenn %2$d"
 
-#: actions/tag.php:87
+#: actions/tag.php:91
 #, php-format
 msgid "Notice feed for tag %s (RSS 1.0)"
 msgstr "Gwazh an alioù evit ar merk %s (RSS 1.0)"
 
-#: actions/tag.php:93
+#: actions/tag.php:97
 #, php-format
 msgid "Notice feed for tag %s (RSS 2.0)"
 msgstr "Gwazh an alioù evit ar merk %s (RSS 2.0)"
 
-#: actions/tag.php:99
+#: actions/tag.php:103
 #, php-format
 msgid "Notice feed for tag %s (Atom)"
 msgstr "Gwazh an alioù evit ar merk %s (Atom)"
@@ -6230,17 +6281,11 @@ msgstr "Merk %s"
 msgid "User profile"
 msgstr "Profil an implijer"
 
-#. TRANS: DT element in area for user avatar.
-#: actions/tagother.php:81 actions/userauthorization.php:132
-#: lib/userprofile.php:108
-msgid "Photo"
-msgstr "Skeudenn"
-
-#: actions/tagother.php:141
+#: actions/tagother.php:120
 msgid "Tag user"
 msgstr "Merkañ an implijer"
 
-#: actions/tagother.php:151
+#: actions/tagother.php:130
 msgid ""
 "Tags for this user (letters, numbers, -, ., and _), comma- or space- "
 "separated"
@@ -6248,12 +6293,17 @@ msgstr ""
 "Merkoù evit an implijer-mañ (lizherennoù, sifroù, -, ., ha  _), dispartiet "
 "gant virgulennoù pe gant esaouennoù"
 
-#: actions/tagother.php:193
+#: actions/tagother.php:157
+#, php-format
+msgid "Invalid tag: \"%s\""
+msgstr "Balizenn direizh : \"%s\""
+
+#: actions/tagother.php:172
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 
-#: actions/tagother.php:236
+#: actions/tagother.php:215
 #, fuzzy
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr "Implijit ar furmskrid-mañ evit kemmañ ho poellad."
@@ -6263,6 +6313,7 @@ msgstr "Implijit ar furmskrid-mañ evit kemmañ ho poellad."
 msgid "No such tag."
 msgstr "N'eus ket eus ar bajenn-se."
 
+#. TRANS: Client error displayed when trying to unblock a non-blocked user.
 #: actions/unblock.php:59
 msgid "You haven't blocked that user."
 msgstr "N'ho peus ket stanket an implijer-mañ."
@@ -6285,7 +6336,7 @@ msgstr "N'eus profil ID ebet er reked."
 msgid "Unsubscribed"
 msgstr "Digoumanantet"
 
-#: actions/updateprofile.php:64 actions/userauthorization.php:337
+#: actions/updateprofile.php:64
 #, fuzzy, php-format
 msgid ""
 "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
@@ -6293,6 +6344,78 @@ msgstr ""
 "Aotre-implijout ar menegoù \"%1$s\" ne ya ket gant aotre-implijout al "
 "lec'hienn \"%2$s\"."
 
+#: actions/urlsettings.php:60
+#, fuzzy
+msgid "URL settings"
+msgstr "Arventennoù ar bostelerezh prim"
+
+#. TRANS: Instructions for tab "Other" in user profile settings.
+#: actions/urlsettings.php:72
+msgid "Manage various other options."
+msgstr "Dibarzhioù all da gefluniañ."
+
+#. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
+#. TRANS: user's profile settings. This message has one space at the beginning. Use your
+#. TRANS: language's word separator here if it has one (most likely a single space).
+#: actions/urlsettings.php:115
+msgid " (free service)"
+msgstr " (servij digoust)"
+
+#: actions/urlsettings.php:121
+#, fuzzy
+msgid "[none]"
+msgstr "Hini ebet"
+
+#: actions/urlsettings.php:122
+msgid "[internal]"
+msgstr ""
+
+#. TRANS: Label for dropdown with URL shortener services.
+#: actions/urlsettings.php:130
+msgid "Shorten URLs with"
+msgstr ""
+
+#. TRANS: Tooltip for for dropdown with URL shortener services.
+#: actions/urlsettings.php:132
+msgid "Automatic shortening service to use."
+msgstr ""
+
+#: actions/urlsettings.php:138
+msgid "URL longer than"
+msgstr ""
+
+#: actions/urlsettings.php:141
+msgid "URLs longer than this will be shortened, 0 means always shorten."
+msgstr ""
+
+#: actions/urlsettings.php:145
+msgid "Text longer than"
+msgstr ""
+
+#: actions/urlsettings.php:148
+msgid ""
+"URLs in notices longer than this will be shortened, 0 means always shorten."
+msgstr ""
+
+#. TRANS: Form validation error for form "Other settings" in user profile.
+#: actions/urlsettings.php:180
+#, fuzzy
+msgid "URL shortening service is too long (maximum 50 characters)."
+msgstr "Re hir eo ar yezh (255 arouezenn d'ar muiañ)."
+
+#: actions/urlsettings.php:187
+msgid "Invalid number for max url length."
+msgstr ""
+
+#: actions/urlsettings.php:193
+#, fuzzy
+msgid "Invalid number for max notice length."
+msgstr "Danvez direizh an ali."
+
+#: actions/urlsettings.php:238
+msgid "Error saving user URL shortening preferences."
+msgstr ""
+
 #. TRANS: User admin panel title
 #: actions/useradminpanel.php:58
 msgctxt "TITLE"
@@ -6318,11 +6441,11 @@ msgstr ""
 #. TRANS: users in user admin panel. %1$s is the invalid nickname.
 #: actions/useradminpanel.php:166
 #, php-format
-msgid "Invalid default subscripton: '%1$s' is not a user."
+msgid "Invalid default subscripton: \"%1$s\" is not a user."
 msgstr ""
 
-#. TRANS: Link description in user account settings menu.
-#: actions/useradminpanel.php:215 lib/accountsettingsaction.php:106
+#: actions/useradminpanel.php:215 lib/action.php:565 lib/settingsnav.php:77
+#: lib/subgroupnav.php:81
 msgid "Profile"
 msgstr "Profil"
 
@@ -6384,123 +6507,172 @@ msgstr "Ma rankomp merañ an dalc'hoù hon unan."
 #. TRANS: Title for button to save user settings in user admin panel.
 #: actions/useradminpanel.php:302
 #, fuzzy
-msgid "Save user settings"
+msgid "Save user settings."
 msgstr "Enrollañ arventennoù an implijer"
 
-#: actions/userauthorization.php:105
+#. TRANS: Page title.
+#: actions/userauthorization.php:109
 msgid "Authorize subscription"
 msgstr "Aotreañ ar c'houmanant"
 
-#: actions/userauthorization.php:110
+#. TRANS: Page notice on "Auhtorize subscription" page.
+#: actions/userauthorization.php:115
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
 "user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
-"click “Reject”."
+"click \"Reject\"."
 msgstr ""
 
-#. TRANS: Menu item for site administration
-#: actions/userauthorization.php:196 actions/version.php:167
-#: lib/adminpanelaction.php:403
-msgid "License"
-msgstr "Aotre implijout"
-
-#: actions/userauthorization.php:217
+#. TRANS: Button text on Authorise Subscription page.
+#: actions/userauthorization.php:200
 #, fuzzy
+msgctxt "BUTTON"
 msgid "Accept"
 msgstr "Degemer"
 
-#: actions/userauthorization.php:218 lib/subscribeform.php:115
-#: lib/subscribeform.php:139
-msgid "Subscribe to this user"
+#. TRANS: Title for button on Authorise Subscription page.
+#: actions/userauthorization.php:202
+#, fuzzy
+msgid "Subscribe to this user."
 msgstr "En em goumanantiñ d'an implijer-mañ"
 
-#: actions/userauthorization.php:219
+#. TRANS: Button text on Authorise Subscription page.
+#: actions/userauthorization.php:204
 #, fuzzy
+msgctxt "BUTTON"
 msgid "Reject"
 msgstr "Disteurel"
 
-#: actions/userauthorization.php:220
+#. TRANS: Title for button on Authorise Subscription page.
+#: actions/userauthorization.php:206
 #, fuzzy
-msgid "Reject this subscription"
+msgid "Reject this subscription."
 msgstr "Nac'hañ ar c'houmanant"
 
-#: actions/userauthorization.php:232
+#. TRANS: Client error displayed for an empty authorisation request.
+#: actions/userauthorization.php:219
 msgid "No authorization request!"
 msgstr "Reked aotreañ ebet !"
 
-#: actions/userauthorization.php:254
+#. TRANS: Accept message header from Authorise subscription page.
+#: actions/userauthorization.php:242
 msgid "Subscription authorized"
 msgstr "Koumanant aotreet"
 
-#: actions/userauthorization.php:256
+#: actions/userauthorization.php:245
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to authorize the "
 "subscription. Your subscription token is:"
 msgstr ""
 
-#: actions/userauthorization.php:266
+#. TRANS: Reject message header from Authorise subscription page.
+#: actions/userauthorization.php:256
 msgid "Subscription rejected"
 msgstr "Koumanant bet nac'het"
 
-#: actions/userauthorization.php:268
+#: actions/userauthorization.php:259
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to fully reject the "
 "subscription."
 msgstr ""
 
-#: actions/userauthorization.php:303
+#. TRANS: Exception thrown when no valid user is found for an authorisation request.
+#. TRANS: %s is a listener URI.
+#: actions/userauthorization.php:296
 #, fuzzy, php-format
-msgid "Listener URI ‘%s’ not found here."
+msgid "Listener URI \"%s\" not found here."
 msgstr "N'eo ket bet kavet amañ URI ar selaouer \"%s\"."
 
-#: actions/userauthorization.php:308
+#. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
+#. TRANS: %s is a listenee URI.
+#: actions/userauthorization.php:303
 #, fuzzy, php-format
-msgid "Listenee URI ‘%s’ is too long."
+msgid "Listenee URI \"%s\" is too long."
 msgstr "Re hir eo an URI \"%s\" ez oc'h koumanantet dezhi."
 
-#: actions/userauthorization.php:314
+#. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
+#. TRANS: %s is a listenee URI.
+#: actions/userauthorization.php:311
 #, fuzzy, php-format
-msgid "Listenee URI ‘%s’ is a local user."
+msgid "Listenee URI \"%s\" is a local user."
 msgstr "An URI \"%s\" ez oc'h koumanantet dezhi a zo un implijer lec'hel."
 
+#. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
+#. TRANS: %s is a profile URL.
 #: actions/userauthorization.php:329
 #, fuzzy, php-format
-msgid "Profile URL ‘%s’ is for a local user."
+msgid "Profile URL \"%s\" is for a local user."
 msgstr "URI ar profil \"%s\" a zo evit un implijer lec'hel."
 
-#: actions/userauthorization.php:345
+#. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
+#. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
+#: actions/userauthorization.php:339
 #, fuzzy, php-format
-msgid "Avatar URL ‘%s’ is not valid."
+msgid ""
+"Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
+"\"."
+msgstr ""
+"Aotre-implijout ar menegoù \"%1$s\" ne ya ket gant aotre-implijout al "
+"lec'hienn \"%2$s\"."
+
+#. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
+#. TRANS: %s is an avatar URL.
+#: actions/userauthorization.php:349
+#, fuzzy, php-format
+msgid "Avatar URL \"%s\" is not valid."
 msgstr "N'eo ket reizh URL an avatar \"%s\"."
 
-#: actions/userauthorization.php:350
+#. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
+#. TRANS: %s is an avatar URL.
+#: actions/userauthorization.php:356
 #, fuzzy, php-format
-msgid "Can’t read avatar URL ‘%s’."
+msgid "Cannot read avatar URL \"%s\"."
 msgstr "Dibosupl eo lenn URL an avatar \"%s\"."
 
-#: actions/userauthorization.php:355
+#. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
+#. TRANS: %s is an avatar URL.
+#: actions/userauthorization.php:363
 #, fuzzy, php-format
-msgid "Wrong image type for avatar URL ‘%s’."
+msgid "Wrong image type for avatar URL \"%s\"."
 msgstr "Seurt skeudenn direizh evit URL an avatar \"%s\"."
 
 #. TRANS: Page title for profile design page.
-#: actions/userdesignsettings.php:74 lib/designsettings.php:63
+#: actions/userdesignsettings.php:74 lib/designsettings.php:61
 msgid "Profile design"
 msgstr "Design ar profil"
 
 #. TRANS: Instructions for profile design page.
-#: actions/userdesignsettings.php:84 lib/designsettings.php:74
+#: actions/userdesignsettings.php:84 lib/designsettings.php:72
 msgid ""
 "Customize the way your profile looks with a background image and a colour "
 "palette of your choice."
 msgstr ""
 
-#: actions/userdesignsettings.php:272
+#: actions/userdesignsettings.php:289
 msgid "Enjoy your hotdog!"
 msgstr "Bez plijadur gant da hotdog !"
 
+#: actions/userdesignsettings.php:325
+#, fuzzy
+msgid "Design settings"
+msgstr "Enrollañ arventennoù al lec'hienn"
+
+#: actions/userdesignsettings.php:340
+#, fuzzy
+msgid "View profile designs"
+msgstr "Design ar profil"
+
+#: actions/userdesignsettings.php:341
+msgid "Show or hide profile designs."
+msgstr "Diskouez pe kuzhat designoù ar profil."
+
+#: actions/userdesignsettings.php:348
+#, fuzzy
+msgid "Background file"
+msgstr "Background"
+
 #. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number.
 #: actions/usergroups.php:66
 #, php-format
@@ -6548,6 +6720,11 @@ msgstr ""
 msgid "Contributors"
 msgstr "Aozerien"
 
+#. TRANS: Menu item for site administration
+#: actions/version.php:167 lib/adminpanelaction.php:403
+msgid "License"
+msgstr "Aotre implijout"
+
 #: actions/version.php:170
 msgid ""
 "StatusNet is free software: you can redistribute it and/or modify it under "
@@ -6571,12 +6748,13 @@ msgid ""
 "along with this program.  If not, see %s."
 msgstr ""
 
-#: actions/version.php:191
-msgid "Plugins"
-msgstr "Pluginoù"
+#. TRANS: Form input field label for application name.
+#: actions/version.php:197 lib/applicationeditform.php:190
+msgid "Name"
+msgstr "Anv"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:901
+#: actions/version.php:198 lib/action.php:885
 msgid "Version"
 msgstr "Stumm"
 
@@ -6584,6 +6762,12 @@ msgstr "Stumm"
 msgid "Author(s)"
 msgstr "Aozer(ien)"
 
+#. TRANS: Form input field label.
+#: actions/version.php:200 lib/applicationeditform.php:208
+#: lib/groupeditform.php:168
+msgid "Description"
+msgstr "Deskrivadur"
+
 #. TRANS: Activity title when marking a notice as favorite.
 #: classes/Fave.php:164
 msgid "Favor"
@@ -6700,7 +6884,7 @@ msgid "Could not create login token for %s"
 msgstr "Diposubl eo krouiñ an aliasoù."
 
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
-#: classes/Memcached_DataObject.php:542
+#: classes/Memcached_DataObject.php:556
 msgid "No database name or DSN found anywhere."
 msgstr ""
 
@@ -6872,18 +7056,18 @@ msgstr "Ne heuilh %s den ebet."
 
 #. TRANS: Notice given on user registration.
 #. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:395
+#: classes/User.php:390
 #, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr "Deuet mat da %1$s, @%2$s !"
 
 #. TRANS: Server exception.
-#: classes/User.php:918
+#: classes/User.php:923
 msgid "No single user defined for single-user mode."
 msgstr ""
 
 #. TRANS: Server exception.
-#: classes/User.php:922
+#: classes/User.php:927
 msgid "Single-user mode code called when not enabled."
 msgstr ""
 
@@ -6928,41 +7112,6 @@ msgstr ""
 msgid "No AtomPub API service for %s."
 msgstr ""
 
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:104
-msgid "Change your profile settings"
-msgstr "Kemmañ arventennoù ho profil"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:111
-msgid "Upload an avatar"
-msgstr "Enporzhiañ un avatar"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:118
-msgid "Change your password"
-msgstr "Cheñch ar ger-tremen"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:125
-msgid "Change email handling"
-msgstr "Kemmañ tretadur ar posteloù"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:132
-msgid "Design your profile"
-msgstr "Krouit ho profil"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:139
-msgid "Other options"
-msgstr "Dibarzhioù all"
-
-#. TRANS: Link description in user account settings menu.
-#: lib/accountsettingsaction.php:141
-msgid "Other"
-msgstr "All"
-
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
 #: lib/action.php:161
 #, php-format
@@ -6980,208 +7129,128 @@ msgctxt "TOOLTIP"
 msgid "Show more"
 msgstr "Diskouez muioc'h"
 
-#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:544
+#. TRANS: Inline reply form submit button: submits a reply comment.
+#: lib/action.php:328
 #, fuzzy
-msgid "Primary site navigation"
-msgstr "Arventennoù diazez al lec'hienn"
+msgctxt "BUTTON"
+msgid "Comment"
+msgstr "Endalc'h"
 
-#. TRANS: Tooltip for main menu option "Personal".
-#: lib/action.php:550
-msgctxt "TOOLTIP"
-msgid "Personal profile and friends timeline"
+#. TRANS: Placeholder text for inline reply form. Clicking in this box will turn it into a mini notice form.
+#: lib/action.php:331
+msgid "Add a comment..."
 msgstr ""
 
-#. TRANS: Main menu option when logged in for access to personal profile and friends timeline.
-#. TRANS: Personal group navigation menu option when logged in for viewing timeline of self and friends.
-#: lib/action.php:553 lib/personalgroupnav.php:100
-msgctxt "MENU"
-msgid "Personal"
-msgstr "Personel"
+#: lib/action.php:559 lib/personalgroupnav.php:99
+#, fuzzy
+msgid "Home"
+msgstr "Pajenn degemer"
 
-#. TRANS: Tooltip for main menu option "Account".
-#: lib/action.php:555
-msgctxt "TOOLTIP"
-msgid "Change your email, avatar, password, profile"
-msgstr "Kemmañ ho chomlec'h postel, hoc'h avatar, ho ger-tremen, ho profil"
-
-#. TRANS: Main menu option when logged in for access to user settings.
-#: lib/action.php:558
-msgid "Account"
-msgstr "Kont"
-
-#. TRANS: Tooltip for main menu option "Services".
 #: lib/action.php:560
-msgctxt "TOOLTIP"
-msgid "Connect to services"
-msgstr "Liammañ d'ar servijoù"
+#, fuzzy
+msgid "Friends timeline"
+msgstr "Oberezhioù %s"
 
-#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services.
-#: lib/action.php:563
-msgid "Connect"
-msgstr "Kevreañ"
-
-#. TRANS: Tooltip for menu option "Admin".
 #: lib/action.php:566
-msgctxt "TOOLTIP"
-msgid "Change site configuration"
-msgstr "Kemmañ arventennoù al lec'hienn"
+#, fuzzy
+msgid "Your profile"
+msgstr "Profil ar strollad"
 
-#. TRANS: Main menu option when logged in and site admin for access to site configuration.
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/action.php:569 lib/groupnav.php:117
-msgctxt "MENU"
-msgid "Admin"
-msgstr "Merañ"
+#: lib/action.php:570 lib/action.php:593 lib/publicgroupnav.php:78
+msgid "Public"
+msgstr "Foran"
 
-#. TRANS: Tooltip for main menu option "Invite".
-#: lib/action.php:573
-#, php-format
-msgctxt "TOOLTIP"
-msgid "Invite friends and colleagues to join you on %s"
-msgstr "Pediñ mignoned hag kenseurted da zont ganeoc'h war %s"
+#: lib/action.php:571 lib/action.php:594
+#, fuzzy
+msgid "Everyone on this site"
+msgstr "Klask tud el lec'hienn-mañ"
+
+#: lib/action.php:575
+#, fuzzy
+msgid "Settings"
+msgstr "Arventennoù SMS"
 
-#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users.
 #: lib/action.php:576
-msgctxt "MENU"
-msgid "Invite"
-msgstr "Pediñ"
+#, fuzzy
+msgid "Change your personal settings"
+msgstr "Kemmañ arventennoù ho profil"
 
-#. TRANS: Tooltip for main menu option "Logout"
 #: lib/action.php:582
-msgctxt "TOOLTIP"
-msgid "Logout from the site"
-msgstr "Digevreañ diouzh al lec'hienn"
+#, fuzzy
+msgid "Site configuration"
+msgstr "Kefluniadur an implijer"
 
-#. TRANS: Main menu option when logged in to log out the current user.
-#: lib/action.php:585
-msgctxt "MENU"
+#: lib/action.php:587
+#, fuzzy
 msgid "Logout"
 msgstr "Digevreañ"
 
-#. TRANS: Tooltip for main menu option "Register".
-#: lib/action.php:590
-msgctxt "TOOLTIP"
-msgid "Create an account"
-msgstr "Krouiñ ur gont"
+#: lib/action.php:588
+#, fuzzy
+msgid "Logout from the site"
+msgstr "Digevreañ diouzh al lec'hienn"
 
-#. TRANS: Main menu option when not logged in to register a new account.
-#. TRANS: Menu item for registering with the StatusNet site.
-#: lib/action.php:593 lib/logingroupnav.php:85
-msgctxt "MENU"
-msgid "Register"
-msgstr "En em enskrivañ"
-
-#. TRANS: Tooltip for main menu option "Login".
-#: lib/action.php:596
-msgctxt "TOOLTIP"
+#: lib/action.php:599
+#, fuzzy
 msgid "Login to the site"
 msgstr "Kevreañ d'al lec'hienn"
 
-#. TRANS: Main menu option when not logged in to log in.
-#. TRANS: Menu item for logging in to the StatusNet site.
-#: lib/action.php:599 lib/logingroupnav.php:77
-msgctxt "MENU"
-msgid "Login"
-msgstr "Kevreañ"
-
-#. TRANS: Tooltip for main menu option "Help".
-#: lib/action.php:602
-msgctxt "TOOLTIP"
-msgid "Help me!"
-msgstr "Sikour din !"
-
-#. TRANS: Main menu option for help on the StatusNet site.
-#: lib/action.php:605
-msgctxt "MENU"
-msgid "Help"
-msgstr "Skoazell"
-
-#. TRANS: Tooltip for main menu option "Search".
-#: lib/action.php:608
-msgctxt "TOOLTIP"
-msgid "Search for people or text"
-msgstr "Klask tud pe un tamm testenn"
-
-#. TRANS: Main menu option when logged in or when the StatusNet instance is not private.
-#: lib/action.php:611
-msgctxt "MENU"
+#: lib/action.php:606
+#, fuzzy
 msgid "Search"
 msgstr "Klask"
 
-#. TRANS: DT element for site notice. String is hidden in default CSS.
-#. TRANS: Menu item for site administration
-#: lib/action.php:633 lib/adminpanelaction.php:387
-msgid "Site notice"
-msgstr "Ali al lec'hienn"
-
-#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:700
-msgid "Local views"
-msgstr "Selloù lec'hel"
-
-#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:770
-msgid "Page notice"
-msgstr "Ali ar bajenn"
-
-#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:874
+#: lib/action.php:607
 #, fuzzy
-msgid "Secondary site navigation"
-msgstr "Arventennoù diazez al lec'hienn"
+msgid "Search the site"
+msgstr "Klask el lec'hienn"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:880
+#: lib/action.php:864
 msgid "Help"
 msgstr "Skoazell"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:883
+#: lib/action.php:867
 msgid "About"
 msgstr "Diwar-benn"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:886
+#: lib/action.php:870
 msgid "FAQ"
 msgstr "FAG"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:891
+#: lib/action.php:875
 msgid "TOS"
 msgstr "AIH"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:895
+#: lib/action.php:879
 msgid "Privacy"
 msgstr "Prevezded"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:898
+#: lib/action.php:882
 msgid "Source"
 msgstr "Mammenn"
 
 #. TRANS: Secondary navigation menu option leading to e-mail contact information on the
 #. TRANS: StatusNet site, where to report bugs, ...
-#: lib/action.php:905
+#: lib/action.php:889
 msgid "Contact"
 msgstr "Darempred"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:908
+#: lib/action.php:892
 msgid "Badge"
 msgstr "Badj"
 
-#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:937
-msgid "StatusNet software license"
-msgstr "Aotre-implijout ar meziant StatusNet"
-
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:944
+#: lib/action.php:921
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7189,7 +7258,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:947
+#: lib/action.php:924
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** a zo ur servij microblogging."
@@ -7198,7 +7267,7 @@ msgstr "**%%site.name%%** a zo ur servij microblogging."
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:954
+#: lib/action.php:931
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7206,51 +7275,41 @@ msgid ""
 "org/licensing/licenses/agpl-3.0.html)."
 msgstr ""
 
-#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:970
-msgid "Site content license"
-msgstr "Aotre-implijout diwar-benn danvez al lec'hienn"
-
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:977
+#: lib/action.php:949
 #, fuzzy, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr "Kompren a ran ez eo prevez danvez ha roadennoù %1$s."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:984
+#: lib/action.php:956
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:988
+#: lib/action.php:960
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:1020
+#: lib/action.php:992
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
 
-#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1356
-msgid "Pagination"
-msgstr "Pajennadur"
-
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1367
+#: lib/action.php:1335
 msgid "After"
 msgstr "War-lerc'h"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1377
+#: lib/action.php:1345
 msgid "Before"
 msgstr "Kent"
 
@@ -7405,7 +7464,7 @@ msgid "User configuration"
 msgstr "Kefluniadur an implijer"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:122
+#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:110
 msgid "User"
 msgstr "Implijer"
 
@@ -7429,6 +7488,11 @@ msgstr "Kefluniadur an dalc'hoù"
 msgid "Edit site notice"
 msgstr "Kemmañ ali al lec'hienn"
 
+#. TRANS: Menu item for site administration
+#: lib/adminpanelaction.php:387
+msgid "Site notice"
+msgstr "Ali al lec'hienn"
+
 #. TRANS: Menu item title/tooltip
 #: lib/adminpanelaction.php:393
 msgid "Snapshots configuration"
@@ -7439,6 +7503,12 @@ msgstr "Kefluniadur ar primoù"
 msgid "Set site license"
 msgstr ""
 
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:409
+#, fuzzy
+msgid "Plugins configuration"
+msgstr "Kefluniadur an hentoù"
+
 #. TRANS: Client error 401.
 #: lib/apiauth.php:111
 msgid "API resource requires read-write access, but you only have read access."
@@ -7449,19 +7519,23 @@ msgstr ""
 msgid "No application for that consumer key."
 msgstr ""
 
+#: lib/apiauth.php:202 lib/apiauth.php:284
+msgid "Not allowed to use API."
+msgstr ""
+
 #. TRANS: OAuth exception given when an incorrect access token was given for a user.
-#: lib/apiauth.php:219
+#: lib/apiauth.php:225
 msgid "Bad access token."
 msgstr ""
 
 #. TRANS: OAuth exception given when no user was found for a given token (no token was found).
-#: lib/apiauth.php:224
+#: lib/apiauth.php:230
 msgid "No user for that token."
 msgstr ""
 
 #. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel".
 #. TRANS: Client error thrown when authentication fails.
-#: lib/apiauth.php:266 lib/apiauth.php:293
+#: lib/apiauth.php:272 lib/apiauth.php:302
 msgid "Could not authenticate you."
 msgstr ""
 
@@ -7508,6 +7582,11 @@ msgstr ""
 msgid "Failed to delete revoked token."
 msgstr ""
 
+#. TRANS: Form input field label for application icon.
+#: lib/applicationeditform.php:177
+msgid "Icon"
+msgstr "Arlun"
+
 #. TRANS: Form guide.
 #: lib/applicationeditform.php:182
 msgid "Icon for this application"
@@ -7542,6 +7621,11 @@ msgstr "Mammenn URL"
 msgid "Organization responsible for this application"
 msgstr "An aozadur e karg eus ar poellad-mañ"
 
+#. TRANS: Form input field label.
+#: lib/applicationeditform.php:227
+msgid "Organization"
+msgstr "Aozadur"
+
 #. TRANS: Form input field instructions.
 #: lib/applicationeditform.php:234
 msgid "URL for the homepage of the organization"
@@ -7630,16 +7714,6 @@ msgstr ""
 msgid "Do not use this method!"
 msgstr "Arabat dilemel ar c'hemenn-mañ"
 
-#. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:293
-msgid "Author"
-msgstr "Aozer"
-
-#. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:307
-msgid "Provider"
-msgstr "Pourvezer"
-
 #. TRANS: Title.
 #: lib/attachmentnoticesection.php:67
 msgid "Notices where this attachment appears"
@@ -7668,24 +7742,29 @@ msgstr "N'eo ket aotreet kemmañ ar ger-tremen"
 msgid "Block"
 msgstr "Stankañ"
 
+#. TRANS: Description of the form to block a user.
+#: lib/blockform.php:79
+msgid "Block this user"
+msgstr "Stankañ an implijer-mañ"
+
 #. TRANS: Title for command results.
-#: lib/channel.php:160 lib/channel.php:181
+#: lib/channel.php:104 lib/channel.php:125
 msgid "Command results"
 msgstr "Disoc'hoù an urzhiad"
 
 #. TRANS: Title for command results.
-#: lib/channel.php:194
+#: lib/channel.php:138
 #, fuzzy
 msgid "AJAX error"
 msgstr "Fazi Ajax"
 
 #. TRANS: E-mail subject when a command has completed.
-#: lib/channel.php:233 lib/mailhandler.php:143
+#: lib/channel.php:177 lib/mailhandler.php:143
 msgid "Command complete"
 msgstr "Urzhiad bet klokaet"
 
 #. TRANS: E-mail subject when a command has failed.
-#: lib/channel.php:244
+#: lib/channel.php:188
 msgid "Command failed"
 msgstr "C'hwitet en deus an urzhiad"
 
@@ -7789,7 +7868,7 @@ msgstr "Anv klok : %s"
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a location.
-#: lib/command.php:446 lib/mail.php:270
+#: lib/command.php:446 lib/mail.php:275
 #, php-format
 msgid "Location: %s"
 msgstr "Lec'hiadur : %s"
@@ -7797,7 +7876,7 @@ msgstr "Lec'hiadur : %s"
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a homepage.
-#: lib/command.php:450 lib/mail.php:274
+#: lib/command.php:450 lib/mail.php:279
 #, php-format
 msgid "Homepage: %s"
 msgstr "Lec'hienn Web : %s"
@@ -8041,112 +8120,102 @@ msgid ""
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:162
+#: lib/common.php:36
 #, fuzzy
 msgid "No configuration file found."
 msgstr "N'eo bet kavet restr kefluniadur ebet. "
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:165
+#: lib/common.php:39
 #, fuzzy
 msgid "I looked for configuration files in the following places:"
 msgstr "Pedadennoù bet kaset d'an implijerien da-heul :"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:168
+#: lib/common.php:42
 msgid "You may wish to run the installer to fix this."
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:172
+#: lib/common.php:46
 msgid "Go to the installer."
 msgstr "Mont d'ar meziant staliañ"
 
-#. TRANS: Menu item for Instant Messaging settings.
-#: lib/connectsettingsaction.php:106
-#, fuzzy
-msgctxt "MENU"
-msgid "IM"
-msgstr "IM"
-
-#. TRANS: Tooltip for Instant Messaging menu item.
-#: lib/connectsettingsaction.php:108
-msgid "Updates by instant messenger (IM)"
-msgstr ""
-
-#. TRANS: Menu item for Short Message Service settings.
-#: lib/connectsettingsaction.php:113
-#, fuzzy
-msgctxt "MENU"
-msgid "SMS"
-msgstr "SMS"
-
-#. TRANS: Tooltip for Short Message Service menu item.
-#: lib/connectsettingsaction.php:115
-msgid "Updates by SMS"
-msgstr "Hizivadennoù dre SMS"
-
-#. TRANS: Menu item for OuAth connection settings.
-#: lib/connectsettingsaction.php:120
-#, fuzzy
-msgctxt "MENU"
-msgid "Connections"
-msgstr "Kevreadennoù"
-
-#. TRANS: Tooltip for connected applications (Connections through OAuth) menu item.
-#: lib/connectsettingsaction.php:122
-#, fuzzy
-msgid "Authorized connected applications"
-msgstr "Poeladoù kevreet."
-
 #: lib/dberroraction.php:59
 msgid "Database error"
 msgstr "Fazi bank roadennoù"
 
+#. TRANS: Description of form for deleting a user.
+#: lib/deleteuserform.php:75
+msgid "Delete this user"
+msgstr "Diverkañ an implijer-mañ"
+
+#: lib/designform.php:114
+#, fuzzy
+msgid "Change design"
+msgstr "Enrollañ an design"
+
+#. TRANS: Fieldset legend on profile design page to change profile page colours.
+#: lib/designform.php:131
+msgid "Change colours"
+msgstr "Kemmañ al livioù"
+
+#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
+#: lib/designform.php:138
+msgid "Use defaults"
+msgstr "Implijout an talvoudoù dre ziouer"
+
+#. TRANS: Title for button on profile design page to reset all colour settings to default.
+#: lib/designform.php:140
+msgid "Restore default designs"
+msgstr "Adlakaat an neuz dre ziouer."
+
+#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
+#: lib/designform.php:148
+msgid "Reset back to default"
+msgstr "Adlakaat an arventennoù dre ziouer"
+
 #. TRANS: Label in form on profile design page.
 #. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
-#: lib/designsettings.php:108
+#: lib/designform.php:158
 msgid "Upload file"
 msgstr "Enporzhiañ ar restr"
 
 #. TRANS: Instructions for form on profile design page.
-#: lib/designsettings.php:113
+#: lib/designform.php:163
+#, fuzzy
 msgid ""
-"You can upload your personal background image. The maximum file size is 2MB."
+"You can upload your personal background image. The maximum file size is 2Mb."
 msgstr ""
+"Gallout a rit kargañ hoc'h avatar personel. Ment vrasañ ar restr zo %s."
 
 #. TRANS: Radio button on profile design page that will enable use of the uploaded profile image.
-#: lib/designsettings.php:139
+#: lib/designform.php:194
 msgctxt "RADIO"
 msgid "On"
 msgstr "Gweredekaet"
 
 #. TRANS: Radio button on profile design page that will disable use of the uploaded profile image.
-#: lib/designsettings.php:156
+#: lib/designform.php:211
 msgctxt "RADIO"
 msgid "Off"
 msgstr "Diweredekaet"
 
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: lib/designsettings.php:175
-msgid "Change colours"
-msgstr "Kemmañ al livioù"
-
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: lib/designsettings.php:257
-msgid "Use defaults"
-msgstr "Implijout an talvoudoù dre ziouer"
+#. TRANS: Title for button on profile design page to save settings.
+#: lib/designform.php:322
+msgid "Save design"
+msgstr "Enrollañ an design"
 
 #. TRANS: Error message displayed if design settings could not be saved.
 #. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
-#: lib/designsettings.php:405 lib/designsettings.php:427
+#: lib/designsettings.php:216 lib/designsettings.php:238
 msgid "Couldn't update your design."
 msgstr "Dibosupl eo hizivaat ho design."
 
 #. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
-#: lib/designsettings.php:433
+#: lib/designsettings.php:244
 #, fuzzy
 msgid "Design defaults restored."
 msgstr "Enrollet eo bet an arventennoù design."
@@ -8217,28 +8286,24 @@ msgstr ""
 msgid "Feeds"
 msgstr "Lanvioù"
 
-#: lib/galleryaction.php:121
-msgid "Filter tags"
-msgstr "Silañ ar balizennoù"
-
-#: lib/galleryaction.php:131
+#: lib/galleryaction.php:128
 msgid "All"
 msgstr "An holl"
 
-#: lib/galleryaction.php:139
+#: lib/galleryaction.php:136
 #, fuzzy
 msgid "Select tag to filter"
 msgstr "Dibab un douger"
 
-#: lib/galleryaction.php:140
+#: lib/galleryaction.php:137
 msgid "Tag"
 msgstr "Balizenn"
 
-#: lib/galleryaction.php:141
+#: lib/galleryaction.php:138
 msgid "Choose a tag to narrow list"
 msgstr ""
 
-#: lib/galleryaction.php:143
+#: lib/galleryaction.php:140
 msgid "Go"
 msgstr "Mont"
 
@@ -8327,6 +8392,12 @@ msgctxt "TOOLTIP"
 msgid "%s blocked users"
 msgstr "implijerien stanket ar strollad %s"
 
+#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
+#: lib/groupnav.php:117
+msgctxt "MENU"
+msgid "Admin"
+msgstr "Merañ"
+
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
 #: lib/groupnav.php:120
@@ -8438,40 +8509,64 @@ msgid_plural "%dB"
 msgstr[0] "%d&nbsp;o"
 msgstr[1] "%d&nbsp;o"
 
-#: lib/jabber.php:387
+#: lib/implugin.php:262
 #, php-format
-msgid "[%s]"
-msgstr "[%s]"
+msgid ""
+"User \"%s\" on %s has said that your %s screenname belongs to them. If "
+"that's true, you can confirm by clicking on this URL: %s . (If you cannot "
+"click it, copy-and-paste it into the address bar of your browser). If that "
+"user isn't you, or if you didn't request this confirmation, just ignore this "
+"message."
+msgstr ""
 
-#: lib/jabber.php:567
+#: lib/implugin.php:349
 #, fuzzy, php-format
 msgid "Unknown inbox source %d."
 msgstr "Yezh \"%s\" dizanv."
 
+#: lib/implugin.php:485
+#, fuzzy, php-format
+msgid "Message too long - maximum is %1$d characters, you sent %2$d."
+msgstr ""
+"Re hir eo ar gemennadenn - ar ment brasañ a zo %1$d arouezenn, %2$d "
+"arouezenn ho peus lakaet."
+
 #: lib/leaveform.php:114
 msgid "Leave"
 msgstr "Kuitaat"
 
+#. TRANS: Menu item for logging in to the StatusNet site.
+#: lib/logingroupnav.php:77
+msgctxt "MENU"
+msgid "Login"
+msgstr "Kevreañ"
+
 #. TRANS: Title for menu item for logging in to the StatusNet site.
 #: lib/logingroupnav.php:79
 #, fuzzy
 msgid "Login with a username and password"
 msgstr "Kevreit gant ho anv implijer hag ho ker-tremen."
 
+#. TRANS: Menu item for registering with the StatusNet site.
+#: lib/logingroupnav.php:85
+msgctxt "MENU"
+msgid "Register"
+msgstr "En em enskrivañ"
+
 #. TRANS: Title for menu item for registering with the StatusNet site.
 #: lib/logingroupnav.php:87
 msgid "Sign up for a new account"
 msgstr "Digeriñ ur gont nevez"
 
 #. TRANS: Subject for address confirmation email.
-#: lib/mail.php:168
+#: lib/mail.php:172
 msgid "Email address confirmation"
 msgstr "Kadarnadur ar chomlec'h postel"
 
 #. TRANS: Body for address confirmation email.
 #. TRANS: %1$s is the addressed user's nickname, %2$s is the StatusNet sitename,
 #. TRANS: %3$s is the URL to confirm at.
-#: lib/mail.php:173
+#: lib/mail.php:177
 #, php-format
 msgid ""
 "Hey, %1$s.\n"
@@ -8490,14 +8585,14 @@ msgstr ""
 
 #. TRANS: Subject of new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
-#: lib/mail.php:238
+#: lib/mail.php:243
 #, fuzzy, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "Ne heuilh %s den ebet."
 
 #. TRANS: This is a paragraph in a new-subscriber e-mail.
 #. TRANS: %s is a URL where the subscriber can be reported as abusive.
-#: lib/mail.php:245
+#: lib/mail.php:250
 #, php-format
 msgid ""
 "If you believe this account is being used abusively, you can block them from "
@@ -8509,7 +8604,7 @@ msgstr ""
 #. TRANS: %3$s is the subscriber's profile URL, %4$s is the subscriber's location (or empty)
 #. TRANS: %5$s is the subscriber's homepage URL (or empty), %6%s is the subscriber's bio (or empty)
 #. TRANS: %7$s is a link to the addressed user's e-mail settings.
-#: lib/mail.php:255
+#: lib/mail.php:260
 #, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -8526,14 +8621,14 @@ msgstr ""
 
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is biographical information.
-#: lib/mail.php:278
+#: lib/mail.php:283
 #, fuzzy, php-format
 msgid "Bio: %s"
 msgstr "Lec'hiadur : %s"
 
 #. TRANS: Subject of notification mail for new posting email address.
 #. TRANS: %s is the StatusNet sitename.
-#: lib/mail.php:307
+#: lib/mail.php:312
 #, php-format
 msgid "New email address for posting to %s"
 msgstr "Chomlec'h postel nevez evit embann e %s"
@@ -8541,7 +8636,7 @@ msgstr "Chomlec'h postel nevez evit embann e %s"
 #. TRANS: Body of notification mail for new posting email address.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is the e-mail address to send
 #. TRANS: to to post by e-mail, %3$s is a URL to more instructions.
-#: lib/mail.php:313
+#: lib/mail.php:318
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -8556,26 +8651,26 @@ msgstr ""
 
 #. TRANS: Subject line for SMS-by-email notification messages.
 #. TRANS: %s is the posting user's nickname.
-#: lib/mail.php:434
+#: lib/mail.php:439
 #, php-format
 msgid "%s status"
 msgstr "Statud %s"
 
 #. TRANS: Subject line for SMS-by-email address confirmation message.
-#: lib/mail.php:460
+#: lib/mail.php:465
 msgid "SMS confirmation"
 msgstr "Kadarnadur SMS"
 
 #. TRANS: Main body heading for SMS-by-email address confirmation message.
 #. TRANS: %s is the addressed user's nickname.
-#: lib/mail.php:464
+#: lib/mail.php:469
 #, fuzzy, php-format
 msgid "%s: confirm you own this phone number with this code:"
 msgstr "Niverenn pellgomz o c'hortoz bezañ kadarnaet."
 
 #. TRANS: Subject for 'nudge' notification email.
 #. TRANS: %s is the nudging user.
-#: lib/mail.php:485
+#: lib/mail.php:490
 #, fuzzy, php-format
 msgid "You have been nudged by %s"
 msgstr "Nac'het ez eus bet deoc'h en em goumanantiñ."
@@ -8583,7 +8678,7 @@ msgstr "Nac'het ez eus bet deoc'h en em goumanantiñ."
 #. TRANS: Body for 'nudge' notification email.
 #. TRANS: %1$s is the nuding user's long name, $2$s is the nudging user's nickname,
 #. TRANS: %3$s is a URL to post notices at, %4$s is the StatusNet sitename.
-#: lib/mail.php:492
+#: lib/mail.php:497
 #, php-format
 msgid ""
 "%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -8601,7 +8696,7 @@ msgstr ""
 
 #. TRANS: Subject for direct-message notification email.
 #. TRANS: %s is the sending user's nickname.
-#: lib/mail.php:539
+#: lib/mail.php:544
 #, php-format
 msgid "New private message from %s"
 msgstr "Kemenadenn personel nevez a-berzh %s"
@@ -8610,7 +8705,7 @@ msgstr "Kemenadenn personel nevez a-berzh %s"
 #. TRANS: %1$s is the sending user's long name, %2$s is the sending user's nickname,
 #. TRANS: %3$s is the message content, %4$s a URL to the message,
 #. TRANS: %5$s is the StatusNet sitename.
-#: lib/mail.php:547
+#: lib/mail.php:552
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -8631,7 +8726,7 @@ msgstr ""
 
 #. TRANS: Subject for favorite notification e-mail.
 #. TRANS: %1$s is the adding user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:599
+#: lib/mail.php:604
 #, fuzzy, php-format
 msgid "%1$s (@%2$s) added your notice as a favorite"
 msgstr "Kas din ur postel pa lak unan bennak unan eus va alioù evel pennroll."
@@ -8641,7 +8736,7 @@ msgstr "Kas din ur postel pa lak unan bennak unan eus va alioù evel pennroll."
 #. TRANS: %3$s is a URL to the faved notice, %4$s is the faved notice text,
 #. TRANS: %5$s is a URL to all faves of the adding user, %6$s is the StatusNet sitename,
 #. TRANS: %7$s is the adding user's nickname.
-#: lib/mail.php:606
+#: lib/mail.php:611
 #, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -8663,7 +8758,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:664
+#: lib/mail.php:669
 #, php-format
 msgid ""
 "The full conversation can be read here:\n"
@@ -8676,7 +8771,7 @@ msgstr ""
 
 #. TRANS: E-mail subject for notice notification.
 #. TRANS: %1$s is the sending user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:672
+#: lib/mail.php:677
 #, fuzzy, php-format
 msgid "%1$s (@%2$s) sent a notice to your attention"
 msgstr "%s (@%s) en deus kaset deoc'h ur c'hemenn"
@@ -8687,7 +8782,7 @@ msgstr "%s (@%s) en deus kaset deoc'h ur c'hemenn"
 #. TRANS: %5$s is a URL to the full conversion if it exists (otherwise empty),
 #. TRANS: %6$s is a URL to reply to the notice, %7$s is a URL to all @-replied for the addressed user,
 #. TRANS: %8$s is a URL to the addressed user's e-mail settings, %9$s is the sender's nickname.
-#: lib/mail.php:680
+#: lib/mail.php:685
 #, php-format
 msgid ""
 "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -8809,12 +8904,7 @@ msgstr "Nann-koumanantet !"
 msgid "To"
 msgstr "Da"
 
-#: lib/messageform.php:166 lib/noticeform.php:186
-#, fuzzy
-msgid "Available characters"
-msgstr "6 arouezenn pe muioc'h"
-
-#: lib/messageform.php:185 lib/noticeform.php:237
+#: lib/messageform.php:184 lib/noticeform.php:236
 msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr "Kas"
@@ -8824,16 +8914,10 @@ msgstr "Kas"
 msgid "Messages"
 msgstr "Kemennadenn"
 
-#: lib/messagelistitem.php:123 lib/noticelist.php:522
+#: lib/messagelistitem.php:123 lib/noticelist.php:527
 msgid "from"
 msgstr "eus"
 
-#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:165
-#, fuzzy
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr "1 da 64 lizherenn vihan pe sifr, hep poentaouiñ nag esaouenn"
-
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 #: lib/nickname.php:178
 msgid "Nickname cannot be empty."
@@ -8856,78 +8940,82 @@ msgstr "Kas un ali"
 msgid "What's up, %s?"
 msgstr "Penaos 'mañ kont, %s ?"
 
-#: lib/noticeform.php:194
+#: lib/noticeform.php:193
 msgid "Attach"
 msgstr "Stagañ"
 
-#: lib/noticeform.php:198
+#: lib/noticeform.php:197
 msgid "Attach a file"
 msgstr "Stagañ ur restr"
 
-#: lib/noticeform.php:213
+#: lib/noticeform.php:212
 msgid "Share my location"
 msgstr "Rannañ va lec'hiadur."
 
-#: lib/noticeform.php:216
+#: lib/noticeform.php:215
 msgid "Do not share my location"
 msgstr "Chom hep rannañ va lec'hiadur."
 
-#: lib/noticeform.php:217
+#: lib/noticeform.php:216
 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
 "try again later"
 msgstr ""
 
 #. TRANS: Used in coordinates as abbreviation of north
-#: lib/noticelist.php:452
+#: lib/noticelist.php:457
 msgid "N"
 msgstr "N"
 
 #. TRANS: Used in coordinates as abbreviation of south
-#: lib/noticelist.php:454
+#: lib/noticelist.php:459
 msgid "S"
 msgstr "S"
 
 #. TRANS: Used in coordinates as abbreviation of east
-#: lib/noticelist.php:456
+#: lib/noticelist.php:461
 msgid "E"
 msgstr "R"
 
 #. TRANS: Used in coordinates as abbreviation of west
-#: lib/noticelist.php:458
+#: lib/noticelist.php:463
 msgid "W"
 msgstr "K"
 
-#: lib/noticelist.php:460
+#: lib/noticelist.php:465
 #, php-format
 msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 
-#: lib/noticelist.php:469
+#: lib/noticelist.php:474
 msgid "at"
 msgstr "e"
 
-#: lib/noticelist.php:518
+#: lib/noticelist.php:523
 msgid "web"
 msgstr "web"
 
-#: lib/noticelist.php:584
+#: lib/noticelist.php:589
 msgid "in context"
 msgstr "en amdro"
 
-#: lib/noticelist.php:619
+#: lib/noticelist.php:624
 msgid "Repeated by"
 msgstr "Adkemeret gant"
 
-#: lib/noticelist.php:646
+#: lib/noticelist.php:651
 msgid "Reply to this notice"
 msgstr "Respont d'ar c'hemenn-mañ"
 
-#: lib/noticelist.php:647
+#: lib/noticelist.php:652
 msgid "Reply"
 msgstr "Respont"
 
-#: lib/noticelist.php:691
+#: lib/noticelist.php:678
+msgid "Delete this notice"
+msgstr "Dilemel ar c'hemenn-mañ"
+
+#: lib/noticelist.php:696
 msgid "Notice repeated"
 msgstr "Ali adkemeret"
 
@@ -8965,48 +9053,31 @@ msgstr ""
 msgid "Couldn't insert new subscription."
 msgstr "Dibosupl eo dilemel ar c'houmanant."
 
-#. TRANS: Personal group navigation menu option when logged in for viewing @-replies.
-#: lib/personalgroupnav.php:107
+#: lib/personalgroupnav.php:104
 #, fuzzy
-msgctxt "MENU"
 msgid "Replies"
 msgstr "Respontoù"
 
-#. TRANS: Personal group navigation menu option when logged in for seeing own profile.
-#: lib/personalgroupnav.php:114
+#: lib/personalgroupnav.php:109
 #, fuzzy
-msgctxt "MENU"
-msgid "Profile"
-msgstr "Profil"
-
-#. TRANS: Personal group navigation menu option when logged in for viewing own favourited notices.
-#: lib/personalgroupnav.php:120
-#, fuzzy
-msgctxt "MENU"
 msgid "Favorites"
 msgstr "Pennrolloù"
 
-#. TRANS: Personal group navigation menu option when logged in for viewing recieved personal messages.
-#: lib/personalgroupnav.php:133
+#: lib/personalgroupnav.php:120
 #, fuzzy
-msgctxt "MENU"
 msgid "Inbox"
 msgstr "Boest resev"
 
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing recieved personal messages.
-#: lib/personalgroupnav.php:135
+#: lib/personalgroupnav.php:121
 msgid "Your incoming messages"
 msgstr "Ar gemennadennoù ho peus resevet"
 
-#. TRANS: Personal group navigation menu option when logged in for viewing senet personal messages.
-#: lib/personalgroupnav.php:140
+#: lib/personalgroupnav.php:125
 #, fuzzy
-msgctxt "MENU"
 msgid "Outbox"
 msgstr "Boest kas"
 
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing senet personal messages.
-#: lib/personalgroupnav.php:142
+#: lib/personalgroupnav.php:126
 msgid "Your sent messages"
 msgstr "Ar c'hemenadennoù kaset ganeoc'h"
 
@@ -9021,9 +9092,26 @@ msgstr "N'eus ali nevez evit an implijer-mañ"
 msgid "Unknown"
 msgstr "Dianav"
 
+#. TRANS: Plugin admin panel controls
+#: lib/plugindisableform.php:90
+msgctxt "plugin"
+msgid "Disable"
+msgstr ""
+
+#. TRANS: Plugin admin panel controls
+#: lib/pluginenableform.php:112
+msgctxt "plugin"
+msgid "Enable"
+msgstr ""
+
+#: lib/pluginlist.php:196
+msgctxt "plugin-description"
+msgid "(Plugin descriptions unavailable when disabled.)"
+msgstr ""
+
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:82
+#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:88
 msgid "Subscriptions"
 msgstr "Koumanantoù"
 
@@ -9034,7 +9122,7 @@ msgstr "An holl koumanantoù"
 
 #. TRANS: H2 text for user subscriber statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:90
+#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:96
 msgid "Subscribers"
 msgstr "Ar re koumanantet"
 
@@ -9056,7 +9144,7 @@ msgstr "Ezel abaoe"
 #. TRANS: Label for user statistics.
 #. TRANS: H2 text for user group membership statistics.
 #: lib/profileaction.php:239 lib/profileaction.php:290
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:104
 msgid "Groups"
 msgstr "Strolladoù"
 
@@ -9076,10 +9164,6 @@ msgstr "An holl strolladoù"
 msgid "Unimplemented method."
 msgstr ""
 
-#: lib/publicgroupnav.php:78
-msgid "Public"
-msgstr "Foran"
-
 #: lib/publicgroupnav.php:82
 msgid "User groups"
 msgstr "Strolladoù implijerien"
@@ -9119,7 +9203,7 @@ msgid "Revoke the \"%s\" role from this user"
 msgstr "Stankañ an implijer-mañ eus ar strollad-se"
 
 #. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:974
+#: lib/router.php:1001
 #, fuzzy
 msgid "Page not found."
 msgstr "N'eo ket bet kavet an hentenn API !"
@@ -9150,11 +9234,6 @@ msgctxt "BUTTON"
 msgid "Search"
 msgstr "Klask"
 
-#. TRANS: Definition list item with instructions on how to get (better) search results.
-#: lib/searchaction.php:170
-msgid "Search help"
-msgstr "Skoazell diwar-benn ar c'hlask"
-
 #: lib/searchgroupnav.php:80
 msgid "People"
 msgstr "Tud"
@@ -9179,6 +9258,52 @@ msgstr "Rann hep titl"
 msgid "More..."
 msgstr "Muioc'h..."
 
+#: lib/settingsnav.php:78
+msgid "Change your profile settings"
+msgstr "Kemmañ arventennoù ho profil"
+
+#: lib/settingsnav.php:83
+msgid "Upload an avatar"
+msgstr "Enporzhiañ un avatar"
+
+#: lib/settingsnav.php:88
+msgid "Change your password"
+msgstr "Cheñch ar ger-tremen"
+
+#: lib/settingsnav.php:93
+msgid "Change email handling"
+msgstr "Kemmañ tretadur ar posteloù"
+
+#: lib/settingsnav.php:98
+msgid "Design your profile"
+msgstr "Krouit ho profil"
+
+#: lib/settingsnav.php:102
+msgid "URL"
+msgstr "URL"
+
+#: lib/settingsnav.php:103
+msgid "URL shorteners"
+msgstr ""
+
+#: lib/settingsnav.php:111
+msgid "Updates by instant messenger (IM)"
+msgstr ""
+
+#: lib/settingsnav.php:118
+msgid "Updates by SMS"
+msgstr "Hizivadennoù dre SMS"
+
+#: lib/settingsnav.php:123
+#, fuzzy
+msgid "Connections"
+msgstr "Kevreadennoù"
+
+#: lib/settingsnav.php:124
+#, fuzzy
+msgid "Authorized connected applications"
+msgstr "Poeladoù kevreet."
+
 #: lib/silenceform.php:67
 msgid "Silence"
 msgstr "Didrouz"
@@ -9188,30 +9313,34 @@ msgstr "Didrouz"
 msgid "Silence this user"
 msgstr "Diverkañ an implijer-mañ"
 
-#: lib/subgroupnav.php:83
+#: lib/subgroupnav.php:89
 #, php-format
 msgid "People %s subscribes to"
 msgstr "Koumanantoù %s"
 
-#: lib/subgroupnav.php:91
+#: lib/subgroupnav.php:97
 #, php-format
 msgid "People subscribed to %s"
 msgstr "Koumananterien %s"
 
-#: lib/subgroupnav.php:99
+#: lib/subgroupnav.php:105
 #, php-format
 msgid "Groups %s is a member of"
 msgstr "Ezel eo %s eus ar strolladoù"
 
-#: lib/subgroupnav.php:105
+#: lib/subgroupnav.php:111
 msgid "Invite"
 msgstr "Pediñ"
 
-#: lib/subgroupnav.php:106
+#: lib/subgroupnav.php:112
 #, php-format
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Pediñ mignoned hag kenseurted da zont ganeoc'h war %s"
 
+#: lib/subscribeform.php:115 lib/subscribeform.php:139
+msgid "Subscribe to this user"
+msgstr "En em goumanantiñ d'an implijer-mañ"
+
 #: lib/subscriberspeopleselftagcloudsection.php:48
 #: lib/subscriptionspeopleselftagcloudsection.php:48
 msgid "People Tagcloud as self-tagged"
@@ -9283,6 +9412,13 @@ msgstr ""
 msgid "Error opening theme archive."
 msgstr "Fazi en ur hizivaat ar profil a-bell."
 
+#: lib/threadednoticelist.php:270
+#, php-format
+msgid "Show all %d comment"
+msgid_plural "Show all %d comments"
+msgstr[0] ""
+msgstr[1] ""
+
 #: lib/topposterssection.php:74
 msgid "Top posters"
 msgstr "An implijerien an efedusañ"
@@ -9327,76 +9463,80 @@ msgstr "Digoumanantiñ"
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "An implijer-mañ n'eus profil ebet dezhañ."
 
-#. TRANS: Link text for changeing the avatar of the logged in user.
-#: lib/userprofile.php:121
+#: lib/userprofile.php:116
 msgid "Edit Avatar"
 msgstr "Kemmañ an Avatar"
 
 #. TRANS: H2 for user actions in a profile.
 #. TRANS: H2 for entity actions in a profile.
-#: lib/userprofile.php:245 lib/userprofile.php:261
+#: lib/userprofile.php:216 lib/userprofile.php:232
 msgid "User actions"
 msgstr "Obererezh an implijer"
 
 #. TRANS: Text shown in user profile of not yet compeltely deleted users.
-#: lib/userprofile.php:249
+#: lib/userprofile.php:220
 msgid "User deletion in progress..."
 msgstr "Diverkadenn an implijer o vont war-raok..."
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:277
+#: lib/userprofile.php:248
 msgid "Edit profile settings"
 msgstr "Kemmañ arventennoù ar profil"
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:279
+#: lib/userprofile.php:250
 msgid "Edit"
 msgstr "Aozañ"
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:303
+#: lib/userprofile.php:274
 msgid "Send a direct message to this user"
 msgstr "Kas ur gemennadenn war-eeun d'an implijer-mañ"
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:305
+#: lib/userprofile.php:276
 msgid "Message"
 msgstr "Kemennadenn"
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:347
+#: lib/userprofile.php:318
 msgid "Moderate"
 msgstr "Habaskaat"
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:386
+#: lib/userprofile.php:357
 msgid "User role"
 msgstr "Rol an implijer"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:389
+#: lib/userprofile.php:360
 msgctxt "role"
 msgid "Administrator"
 msgstr "Merour"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:391
+#: lib/userprofile.php:362
 msgctxt "role"
 msgid "Moderator"
 msgstr "Habasker"
 
+#: lib/util.php:321
+#, fuzzy
+msgid "Not allowed to log in."
+msgstr "Nann-kevreet."
+
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1306
+#: lib/util.php:1337
 msgid "a few seconds ago"
 msgstr "un nebeud eilennoù zo"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1309
+#: lib/util.php:1340
 msgid "about a minute ago"
 msgstr "1 vunutenn zo well-wazh"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1313
+#: lib/util.php:1344
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
@@ -9404,12 +9544,12 @@ msgstr[0] "tro ur vunutenn zo"
 msgstr[1] "tro %d munutenn zo"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1316
+#: lib/util.php:1347
 msgid "about an hour ago"
 msgstr "1 eurvezh zo well-wazh"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1320
+#: lib/util.php:1351
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
@@ -9417,12 +9557,12 @@ msgstr[0] "tro un eur zo"
 msgstr[1] "tro %d eur zo"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1323
+#: lib/util.php:1354
 msgid "about a day ago"
 msgstr "1 devezh zo well-wazh"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1327
+#: lib/util.php:1358
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
@@ -9430,12 +9570,12 @@ msgstr[0] "tro un devezh zo"
 msgstr[1] "tro %d devezh zo"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1330
+#: lib/util.php:1361
 msgid "about a month ago"
 msgstr "miz zo well-wazh"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1334
+#: lib/util.php:1365
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
@@ -9443,7 +9583,7 @@ msgstr[0] "tro ur miz zo"
 msgstr[1] "tro %d miz zo"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1337
+#: lib/util.php:1368
 msgid "about a year ago"
 msgstr "bloaz zo well-wazh"
 
@@ -9454,25 +9594,6 @@ msgstr "bloaz zo well-wazh"
 msgid "%s is not a valid color! Use 3 or 6 hex characters."
 msgstr "N'eo ket %s ul liv reizh ! Implijit 3 pe 6 arouezenn heksdekvedennel."
 
-#. TRANS: %s is the URL to the StatusNet site's Instant Messaging settings.
-#: lib/xmppmanager.php:287
-#, php-format
-msgid "Unknown user. Go to %s to add your address to your account"
-msgstr ""
-
-#. TRANS: Response to XMPP source when it sent too long a message.
-#. TRANS: %1$d the maximum number of allowed characters (used for plural), %2$d is the sent number.
-#: lib/xmppmanager.php:406
-#, fuzzy, php-format
-msgid "Message too long. Maximum is %1$d character, you sent %2$d."
-msgid_plural "Message too long. Maximum is %1$d characters, you sent %2$d."
-msgstr[0] ""
-"Re hir eo ar gemennadenn - ar ment brasañ a zo %1$d arouezenn, %2$d "
-"arouezenn ho peus lakaet."
-msgstr[1] ""
-"Re hir eo ar gemennadenn - ar ment brasañ a zo %1$d arouezenn, %2$d "
-"arouezenn ho peus lakaet."
-
 #. TRANS: Exception.
 #: lib/xrd.php:63
 #, fuzzy
@@ -9491,73 +9612,171 @@ msgid "Getting backup from file '%s'."
 msgstr ""
 
 #, fuzzy
-#~ msgid "Block this user."
-#~ msgstr "Stankañ an implijer-mañ"
+#~ msgid "Could not generate feed for group - %s"
+#~ msgstr "Diposubl eo hizivaat ar strollad."
 
 #, fuzzy
-#~ msgid "Delete this notice."
-#~ msgstr "Dilemel ar c'hemenn-mañ"
+#~ msgid "Current confirmed Jabber/Google Talk address."
+#~ msgstr "Chomlec'h Jabber/GTalk kadarnaet er mare-mañ."
 
 #, fuzzy
-#~ msgid "Delete this user."
-#~ msgstr "Diverkañ an implijer-mañ"
+#~ msgid "Send me notices through Jabber/Google Talk."
+#~ msgstr "Kas din an alioù dre Jabber/GTalk."
 
 #, fuzzy
-#~ msgid "Restore default designs."
-#~ msgstr "Adlakaat an neuz dre ziouer."
+#~ msgid "Publish a MicroID for my Jabber/Google Talk address."
+#~ msgstr "Embann ur MicroID evit ma chomlec'h Jabber/GTalk."
+
+#~ msgid "No Jabber ID."
+#~ msgstr "ID Jabber ebet."
 
 #, fuzzy
-#~ msgid "Reset back to default."
-#~ msgstr "Adlakaat an arventennoù dre ziouer"
+#~ msgid "Not a valid Jabber ID."
+#~ msgstr "N'eo ket un ID Jabber reizh."
+
+#~ msgid "That is already your Jabber ID."
+#~ msgstr "Ho ID Jabber eo dija"
+
+#~ msgid "That is not your Jabber ID."
+#~ msgstr "N'eo ket ho ID Jabber."
+
+#~ msgid "Other settings"
+#~ msgstr "Arventennoù all"
+
+#~ msgid "Tag cloud"
+#~ msgstr "Nivlennad tikedennoù"
+
+#~ msgid "Consumer key"
+#~ msgstr "Alc'hwez implijer"
+
+#~ msgid "Consumer secret"
+#~ msgstr "Sekred an implijer"
+
+#~ msgid "Request token URL"
+#~ msgstr "URL ar jedouer reked"
+
+#~ msgid "Access token URL"
+#~ msgstr "URL ar jedouer moned"
+
+#~ msgid "Authorize URL"
+#~ msgstr "aotren an URL"
+
+#~ msgid "Jabber"
+#~ msgstr "Jabber"
+
+#~ msgid "Photo"
+#~ msgstr "Skeudenn"
+
+#~ msgid "Other options"
+#~ msgstr "Dibarzhioù all"
+
+#~ msgid "Other"
+#~ msgstr "All"
 
 #, fuzzy
-#~ msgid "Save design."
-#~ msgstr "Enrollañ an design"
+#~ msgid "Primary site navigation"
+#~ msgstr "Arventennoù diazez al lec'hienn"
+
+#~ msgctxt "MENU"
+#~ msgid "Personal"
+#~ msgstr "Personel"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Change your email, avatar, password, profile"
+#~ msgstr "Kemmañ ho chomlec'h postel, hoc'h avatar, ho ger-tremen, ho profil"
+
+#~ msgid "Account"
+#~ msgstr "Kont"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Connect to services"
+#~ msgstr "Liammañ d'ar servijoù"
+
+#~ msgid "Connect"
+#~ msgstr "Kevreañ"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Change site configuration"
+#~ msgstr "Kemmañ arventennoù al lec'hienn"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Invite friends and colleagues to join you on %s"
+#~ msgstr "Pediñ mignoned hag kenseurted da zont ganeoc'h war %s"
+
+#~ msgctxt "MENU"
+#~ msgid "Invite"
+#~ msgstr "Pediñ"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Create an account"
+#~ msgstr "Krouiñ ur gont"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Help me!"
+#~ msgstr "Sikour din !"
+
+#~ msgctxt "MENU"
+#~ msgid "Help"
+#~ msgstr "Skoazell"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Search for people or text"
+#~ msgstr "Klask tud pe un tamm testenn"
+
+#~ msgid "Local views"
+#~ msgstr "Selloù lec'hel"
+
+#~ msgid "Page notice"
+#~ msgstr "Ali ar bajenn"
 
 #, fuzzy
-#~ msgid "Disfavor favorite."
-#~ msgstr "Tennañ ar pennroll"
+#~ msgid "Secondary site navigation"
+#~ msgstr "Arventennoù diazez al lec'hienn"
+
+#~ msgid "StatusNet software license"
+#~ msgstr "Aotre-implijout ar meziant StatusNet"
+
+#~ msgid "Site content license"
+#~ msgstr "Aotre-implijout diwar-benn danvez al lec'hienn"
+
+#~ msgid "Pagination"
+#~ msgstr "Pajennadur"
+
+#~ msgid "Author"
+#~ msgstr "Aozer"
+
+#~ msgid "Provider"
+#~ msgstr "Pourvezer"
 
 #, fuzzy
-#~ msgid "\"%s\" not found."
-#~ msgstr "N'eo ket bet kavet an implijer."
+#~ msgctxt "MENU"
+#~ msgid "SMS"
+#~ msgstr "SMS"
+
+#~ msgid "Filter tags"
+#~ msgstr "Silañ ar balizennoù"
+
+#~ msgid "[%s]"
+#~ msgstr "[%s]"
 
 #, fuzzy
-#~ msgid "Notice %s not found."
-#~ msgstr "N'eo ket bet kavet an hentenn API !"
+#~ msgid "Available characters"
+#~ msgstr "6 arouezenn pe muioc'h"
 
 #, fuzzy
-#~ msgid "Attachment %s not found."
-#~ msgstr "N'eo ket bet kavet ar resever."
+#~ msgctxt "MENU"
+#~ msgid "Profile"
+#~ msgstr "Profil"
+
+#~ msgid "Search help"
+#~ msgstr "Skoazell diwar-benn ar c'hlask"
 
 #, fuzzy
-#~ msgid "Invalid tag: \"%s\"."
-#~ msgstr "Balizenn direizh : \"%s\""
-
-#, fuzzy
-#~ msgid "%s updates from everyone."
-#~ msgstr "%s statud an holl !"
-
-#, fuzzy
-#~ msgid "Password saved"
-#~ msgstr "Ger-tremen enrollet."
-
-#, fuzzy
-#~ msgid "Where you are, like \"City, State (or Region), Country\"."
-#~ msgstr "El lec'h m'emaoc'h, da skouer \"Kêr, Stad (pe Rannvro), Bro\""
-
-#, fuzzy
-#~ msgid "Subscribe to this user."
-#~ msgstr "En em goumanantiñ d'an implijer-mañ"
-
-#, fuzzy
-#~ msgid ""
-#~ "Listenee stream license \"%1$s\" is not compatible with site license \"%2"
-#~ "$s\"."
-#~ msgstr ""
-#~ "Aotre-implijout ar menegoù \"%1$s\" ne ya ket gant aotre-implijout al "
-#~ "lec'hienn \"%2$s\"."
-
-#, fuzzy
-#~ msgid "Not allowed to log in."
-#~ msgstr "Nann-kevreet."
+#~ msgid "Message too long. Maximum is %1$d character, you sent %2$d."
+#~ msgid_plural "Message too long. Maximum is %1$d characters, you sent %2$d."
+#~ msgstr[0] ""
+#~ "Re hir eo ar gemennadenn - ar ment brasañ a zo %1$d arouezenn, %2$d "
+#~ "arouezenn ho peus lakaet."
+#~ msgstr[1] ""
+#~ "Re hir eo ar gemennadenn - ar ment brasañ a zo %1$d arouezenn, %2$d "
+#~ "arouezenn ho peus lakaet."
diff --git a/locale/ca/LC_MESSAGES/statusnet.po b/locale/ca/LC_MESSAGES/statusnet.po
index d96fc08b94..b4fc4baf12 100644
--- a/locale/ca/LC_MESSAGES/statusnet.po
+++ b/locale/ca/LC_MESSAGES/statusnet.po
@@ -16,8 +16,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 15:58+0000\n"
-"PO-Revision-Date: 2011-03-03 16:00:16+0000\n"
+"POT-Creation-Date: 2011-03-03 17:23+0000\n"
+"PO-Revision-Date: 2011-03-03 17:25:44+0000\n"
 "Language-Team: Catalan <http://translatewiki.net/wiki/Portal:ca>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -85,23 +85,23 @@ msgstr "Desa els paràmetres d'accés"
 #. TRANS: Tooltip for button to save access settings in site admin panel.
 #. TRANS: Button text for saving theme settings.
 #. TRANS: Button label to save e-mail preferences.
-#. TRANS: Button label to save Instant Messaging preferences.
-#. TRANS: Button text for saving "Other settings" in profile.
+#. TRANS: Button label to save IM preferences.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
 #. TRANS: Button text for saving site notice in admin panel.
 #. TRANS: Button label to save SMS preferences.
 #. TRANS: Save button for settings for a profile in a subscriptions list.
+#. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
 #. TRANS: Button text on profile design page to save settings.
 #: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
-#: actions/emailsettings.php:250 actions/imsettings.php:183
-#: actions/othersettings.php:136 actions/pathsadminpanel.php:512
-#: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
-#: actions/smssettings.php:205 actions/subscriptions.php:259
+#: actions/emailsettings.php:251 actions/imsettings.php:199
+#: actions/pathsadminpanel.php:512 actions/profilesettings.php:198
+#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:204
+#: actions/subscriptions.php:261 actions/urlsettings.php:152
 #: actions/useradminpanel.php:298 lib/applicationeditform.php:355
-#: lib/designsettings.php:270 lib/groupeditform.php:201
+#: lib/designform.php:320 lib/groupeditform.php:201
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Desa"
@@ -140,7 +140,11 @@ msgstr "No existeix la pàgina."
 #. 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 use "one time password login" without using an existing user.
+#. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
+#. TRANS: Client error displayed trying to find a user by ID for a non-existing ID.
+#. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when calling a profile action without specifying a user.
 #: actions/all.php:80 actions/allrss.php:69
@@ -152,19 +156,19 @@ msgstr "No existeix la pàgina."
 #: actions/apidirectmessage.php:75 actions/apidirectmessagenew.php:72
 #: actions/apigroupcreate.php:111 actions/apigroupismember.php:89
 #: actions/apigroupjoin.php:98 actions/apigroupleave.php:98
-#: actions/apigrouplist.php:70 actions/apistatusesupdate.php:230
-#: actions/apisubscriptions.php:85 actions/apitimelinefavorites.php:70
-#: actions/apitimelinefriends.php:173 actions/apitimelinehome.php:78
-#: actions/apitimelinementions.php:77 actions/apitimelineuser.php:79
-#: actions/avatarbynickname.php:79 actions/favoritesrss.php:72
-#: actions/foaf.php:42 actions/foaf.php:61 actions/hcard.php:67
-#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
-#: actions/remotesubscribe.php:144 actions/remotesubscribe.php:153
-#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
-#: actions/showfavorites.php:106 actions/userbyid.php:74
-#: actions/usergroups.php:93 actions/userrss.php:40 actions/userxrd.php:59
-#: actions/xrds.php:71 lib/command.php:509 lib/galleryaction.php:59
-#: lib/mailbox.php:80 lib/profileaction.php:77
+#: actions/apigrouplist.php:70 actions/apigroupprofileupdate.php:108
+#: actions/apistatusesupdate.php:230 actions/apisubscriptions.php:85
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:173
+#: actions/apitimelinehome.php:78 actions/apitimelinementions.php:77
+#: actions/apitimelineuser.php:79 actions/avatarbynickname.php:79
+#: actions/favoritesrss.php:72 actions/foaf.php:42 actions/foaf.php:61
+#: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116
+#: actions/otp.php:78 actions/remotesubscribe.php:144
+#: actions/remotesubscribe.php:153 actions/replies.php:73
+#: actions/repliesrss.php:38 actions/rsd.php:113 actions/showfavorites.php:106
+#: actions/userbyid.php:75 actions/usergroups.php:93 actions/userrss.php:40
+#: actions/userxrd.php:59 actions/xrds.php:71 lib/command.php:509
+#: lib/galleryaction.php:59 lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "No existeix l'usuari."
 
@@ -178,10 +182,9 @@ msgstr "%1$s i amics, pàgina %2$d"
 #. TRANS: H1 text for page. %s is a user nickname.
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Timeline title for user and friends. %s is a user nickname.
-#. TRANS: Tooltop for personal group navigation menu option when logged in for viewing timeline of self and friends.
 #: actions/all.php:94 actions/all.php:191 actions/allrss.php:117
 #: actions/apitimelinefriends.php:207 actions/apitimelinehome.php:113
-#: lib/personalgroupnav.php:102
+#: lib/personalgroupnav.php:100
 #, php-format
 msgid "%s and friends"
 msgstr "%s i amics"
@@ -239,7 +242,7 @@ msgstr ""
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
 #. TRANS: Second sentence of empty message for anonymous users. %s is a user nickname.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:227
+#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:221
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -288,19 +291,20 @@ msgstr "Actualitzacions de %1$s i amics a %2$s!"
 #: actions/apifavoritecreate.php:98 actions/apifavoritedestroy.php:98
 #: actions/apifriendshipscreate.php:99 actions/apifriendshipsdestroy.php:99
 #: actions/apifriendshipsshow.php:124 actions/apigroupcreate.php:138
-#: actions/apigroupismember.php:115 actions/apigroupjoin.php:160
-#: actions/apigroupleave.php:145 actions/apigrouplist.php:134
+#: actions/apigroupismember.php:115 actions/apigroupjoin.php:151
+#: actions/apigroupleave.php:141 actions/apigrouplist.php:134
 #: actions/apigrouplistall.php:120 actions/apigroupmembership.php:105
+#: actions/apigroupprofileupdate.php:100 actions/apigroupprofileupdate.php:213
 #: actions/apigroupshow.php:114 actions/apihelptest.php:84
 #: actions/apistatusesdestroy.php:101 actions/apistatusesretweets.php:110
 #: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:139
 #: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
-#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:268
-#: actions/apitimelinegroup.php:147 actions/apitimelinehome.php:173
-#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:239
-#: actions/apitimelineretweetedtome.php:118
-#: actions/apitimelineretweetsofme.php:150 actions/apitimelinetag.php:159
-#: actions/apitimelineuser.php:206 actions/apiusershow.php:100
+#: actions/apitimelinefavorites.php:182 actions/apitimelinefriends.php:276
+#: actions/apitimelinegroup.php:148 actions/apitimelinehome.php:181
+#: actions/apitimelinementions.php:182 actions/apitimelinepublic.php:247
+#: actions/apitimelineretweetedtome.php:147
+#: actions/apitimelineretweetsofme.php:147 actions/apitimelinetag.php:165
+#: actions/apitimelineuser.php:217 actions/apiusershow.php:100
 msgid "API method not found."
 msgstr "No s'ha trobat el mètode API!"
 
@@ -315,8 +319,9 @@ msgstr "No s'ha trobat el mètode API!"
 #: actions/apifavoritecreate.php:88 actions/apifavoritedestroy.php:88
 #: actions/apifriendshipscreate.php:89 actions/apifriendshipsdestroy.php:89
 #: actions/apigroupcreate.php:102 actions/apigroupjoin.php:89
-#: actions/apigroupleave.php:89 actions/apimediaupload.php:66
-#: actions/apistatusesretweet.php:63 actions/apistatusesupdate.php:194
+#: actions/apigroupleave.php:89 actions/apigroupprofileupdate.php:92
+#: actions/apimediaupload.php:66 actions/apistatusesretweet.php:63
+#: actions/apistatusesupdate.php:194
 msgid "This method requires a POST."
 msgstr "Aquest mètode requereix POST."
 
@@ -330,21 +335,16 @@ msgstr ""
 "dels següents: sms, im, none (cap)"
 
 #. TRANS: Server error displayed when a user's delivery device cannot be updated.
-#. TRANS: Server error displayed when a user update to the database fails in the contact address confirmation action.
 #. TRANS: Server error thrown on database error updating e-mail preferences.
 #. TRANS: Server error thrown on database error removing a registered e-mail address.
-#. TRANS: Server error thrown on database error updating Instant Messaging preferences.
-#. TRANS: Server error thrown on database error removing a registered Instant Messaging address.
-#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
 #. TRANS: Server error thrown when user profile settings could not be updated.
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
-#: actions/apiaccountupdatedeliverydevice.php:130
-#: actions/confirmaddress.php:118 actions/emailsettings.php:352
-#: actions/emailsettings.php:498 actions/imsettings.php:276
-#: actions/imsettings.php:432 actions/othersettings.php:186
-#: actions/profilesettings.php:322 actions/smssettings.php:301
-#: actions/smssettings.php:454
+#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
+#: actions/apiaccountupdatedeliverydevice.php:136
+#: actions/emailsettings.php:353 actions/emailsettings.php:499
+#: actions/profilesettings.php:323 actions/smssettings.php:300
+#: actions/smssettings.php:453 actions/urlsettings.php:211
 msgid "Could not update user."
 msgstr "No s'ha pogut actualitzar l'usuari."
 
@@ -370,7 +370,7 @@ msgstr "L'usuari no té perfil."
 
 #. TRANS: Server error displayed if a user profile could not be saved.
 #. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:418
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:419
 msgid "Could not save profile."
 msgstr "No s'ha pogut desar el perfil."
 
@@ -382,7 +382,7 @@ msgstr "No s'ha pogut desar el perfil."
 #: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
 #: actions/designadminpanel.php:120 actions/editapplication.php:121
 #: actions/newapplication.php:102 actions/newnotice.php:95
-#: lib/designsettings.php:298
+#: lib/designsettings.php:110
 #, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s byte) due to its "
@@ -407,8 +407,8 @@ msgstr[1] ""
 #: actions/apiaccountupdateprofilecolors.php:160
 #: actions/apiaccountupdateprofilecolors.php:171
 #: actions/groupdesignsettings.php:285 actions/groupdesignsettings.php:296
-#: actions/userdesignsettings.php:201 actions/userdesignsettings.php:211
-#: actions/userdesignsettings.php:253 actions/userdesignsettings.php:263
+#: actions/userdesignsettings.php:218 actions/userdesignsettings.php:228
+#: actions/userdesignsettings.php:270 actions/userdesignsettings.php:280
 msgid "Unable to save your design settings."
 msgstr "No s'han pogut desar els paràmetres de disseny."
 
@@ -416,7 +416,7 @@ msgstr "No s'han pogut desar els paràmetres de disseny."
 #. TRANS: Client error displayed when a database error occurs updating profile colours.
 #: actions/apiaccountupdateprofilebackgroundimage.php:191
 #: actions/apiaccountupdateprofilecolors.php:139
-#: actions/userdesignsettings.php:179
+#: actions/userdesignsettings.php:196
 msgid "Could not update your design."
 msgstr "No s'ha pogut actualitzar el vostre disseny."
 
@@ -524,8 +524,7 @@ msgstr "No s'ha trobat l'usuari destinatari."
 
 #. TRANS: Client error displayed trying to direct message another user who's not a friend (403).
 #: actions/apidirectmessagenew.php:144
-#, fuzzy
-msgid "Can't send direct messages to users who aren't your friend."
+msgid "Cannot send direct messages to users who aren't your friend."
 msgstr ""
 "No es poden enviar missatges directes a usuaris que no siguin els vostres "
 "amics."
@@ -608,9 +607,9 @@ msgstr "No s'ha pogut trobar l'usuari de destinació."
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:156 actions/editgroup.php:191
-#: actions/newgroup.php:137 actions/profilesettings.php:273
-#: actions/register.php:214
+#: actions/apigroupcreate.php:156 actions/apigroupprofileupdate.php:255
+#: actions/editgroup.php:191 actions/newgroup.php:137
+#: actions/profilesettings.php:274 actions/register.php:199
 msgid "Nickname already in use. Try another one."
 msgstr "Aquest sobrenom ja existeix. Prova un altre. "
 
@@ -618,9 +617,9 @@ msgstr "Aquest sobrenom ja existeix. Prova un altre. "
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:164 actions/editgroup.php:195
-#: actions/newgroup.php:141 actions/profilesettings.php:243
-#: actions/register.php:216
+#: actions/apigroupcreate.php:164 actions/apigroupprofileupdate.php:259
+#: actions/editgroup.php:195 actions/newgroup.php:141
+#: actions/profilesettings.php:244 actions/register.php:201
 msgid "Not a valid nickname."
 msgstr "Sobrenom no vàlid."
 
@@ -630,10 +629,10 @@ msgstr "Sobrenom no vàlid."
 #. TRANS: Validation error shown when providing an invalid homepage URL in the "New application" form.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:181 actions/editapplication.php:235
-#: actions/editgroup.php:202 actions/newapplication.php:221
-#: actions/newgroup.php:148 actions/profilesettings.php:248
-#: actions/register.php:223
+#: actions/apigroupcreate.php:181 actions/apigroupprofileupdate.php:277
+#: actions/editapplication.php:235 actions/editgroup.php:202
+#: actions/newapplication.php:221 actions/newgroup.php:148
+#: actions/profilesettings.php:249 actions/register.php:208
 msgid "Homepage is not a valid URL."
 msgstr "La pàgina personal no és un URL vàlid."
 
@@ -642,8 +641,8 @@ msgstr "La pàgina personal no és un URL vàlid."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:191 actions/editgroup.php:206
-#: actions/newgroup.php:152 actions/profilesettings.php:252
-#: actions/register.php:226
+#: actions/newgroup.php:152 actions/profilesettings.php:253
+#: actions/register.php:211
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "El vostre nom sencer és massa llarg (màx. 255 caràcters)."
 
@@ -670,8 +669,8 @@ msgstr[1] "La descripció és massa llarga (màx. %d caràcters)."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:215 actions/editgroup.php:218
-#: actions/newgroup.php:164 actions/profilesettings.php:265
-#: actions/register.php:235
+#: actions/newgroup.php:164 actions/profilesettings.php:266
+#: actions/register.php:220
 msgid "Location is too long (maximum 255 characters)."
 msgstr "La localització és massa llarga (màx. 255 caràcters)."
 
@@ -700,15 +699,16 @@ msgstr "L'àlies no és vàlid: «%s»."
 #. TRANS: %s is the alias that is already in use.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error. %s is the already used alias.
-#: actions/apigroupcreate.php:264 actions/editgroup.php:246
-#: actions/newgroup.php:193
+#: actions/apigroupcreate.php:264 actions/apigroupprofileupdate.php:351
+#: actions/editgroup.php:246 actions/newgroup.php:193
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "L'àlies «%s» ja està en ús. Proveu-ne un altre."
 
 #. TRANS: Client error displayed when trying to use an alias during group creation that is the same as the group's nickname.
 #. TRANS: Group edit form validation error.
-#: actions/apigroupcreate.php:278 actions/editgroup.php:253
+#: actions/apigroupcreate.php:278 actions/apigroupprofileupdate.php:359
+#: actions/editgroup.php:253
 msgid "Alias can't be the same as nickname."
 msgstr "L'àlies no pot ser el mateix que el sobrenom."
 
@@ -720,7 +720,8 @@ msgstr "L'àlies no pot ser el mateix que el sobrenom."
 #. TRANS: Client error displayed requesting most recent notices to a group for a non-existing group.
 #: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
 #: actions/apigroupleave.php:104 actions/apigroupmembership.php:71
-#: actions/apigroupshow.php:81 actions/apitimelinegroup.php:89
+#: actions/apigroupprofileupdate.php:113 actions/apigroupshow.php:81
+#: actions/apitimelinegroup.php:89
 msgid "Group not found."
 msgstr "No s'ha trobat el grup."
 
@@ -738,13 +739,11 @@ msgstr "Ja sou membre del grup."
 msgid "You have been blocked from that group by the admin."
 msgstr "L'administrador us ha blocat del grup."
 
-#. TRANS: Server error displayed when joining a group fails.
-#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
 #. 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.
 #. TRANS: Message given having failed to add a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:362
+#: actions/apigroupjoin.php:136 actions/joingroup.php:139 lib/command.php:362
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "No s'ha pogut afegir l'usuari %1$s al grup %2$s."
@@ -754,8 +753,6 @@ msgstr "No s'ha pogut afegir l'usuari %1$s al grup %2$s."
 msgid "You are not a member of this group."
 msgstr "No sou un membre del grup."
 
-#. TRANS: Server error displayed when leaving a group fails.
-#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
 #. TRANS: Server error displayed when leaving a group failed in the database.
 #. TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
 #. TRANS: Message given having failed to remove a user from a group.
@@ -791,6 +788,63 @@ msgstr "Grups de %s"
 msgid "groups on %s"
 msgstr "grups sobre %s"
 
+#. TRANS: Client error displayed trying to edit a group while not being a group admin.
+#. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
+#. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
+#: actions/apigroupprofileupdate.php:118 actions/editgroup.php:110
+#: actions/editgroup.php:176 actions/groupdesignsettings.php:109
+#: actions/grouplogo.php:111
+msgid "You must be an admin to edit the group."
+msgstr "Heu de ser administrador per editar el grup."
+
+#. TRANS: Server error displayed when editing a group fails.
+#: actions/apigroupprofileupdate.php:171 actions/editgroup.php:274
+msgid "Could not update group."
+msgstr "No s'ha pogut actualitzar el grup."
+
+#. TRANS: Server error displayed when group aliases could not be added.
+#. TRANS: Server exception thrown when creating group aliases failed.
+#: actions/apigroupprofileupdate.php:194 actions/editgroup.php:281
+#: classes/User_group.php:540
+msgid "Could not create aliases."
+msgstr "No s'han pogut crear els àlies."
+
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: actions/apigroupprofileupdate.php:249 lib/nickname.php:165
+msgid "Nickname must have only lowercase letters and numbers and no spaces."
+msgstr ""
+"El sobrenom ha de tenir només lletres minúscules i números i no pot tenir "
+"espais."
+
+#: actions/apigroupprofileupdate.php:286
+#, fuzzy
+msgid "Full name is too long (max 255 chars)."
+msgstr "El vostre nom sencer és massa llarg (màx. 255 caràcters)."
+
+#: actions/apigroupprofileupdate.php:296
+#, fuzzy, php-format
+msgid "description is too long (max %d chars)."
+msgstr "La descripció és massa llarga (màx. %d caràcter)."
+
+#: actions/apigroupprofileupdate.php:307
+#, fuzzy
+msgid "Location is too long (max 255 chars)."
+msgstr "La localització és massa llarga (màx. 255 caràcters)."
+
+#: actions/apigroupprofileupdate.php:326
+#, fuzzy, php-format
+msgid "Too many aliases! Maximum %d."
+msgstr "Hi ha massa àlies! Es permet %d com a màxim."
+
+#. TRANS: Group edit form validation error.
+#. TRANS: Group create form validation error.
+#. TRANS: %s is the invalid alias.
+#: actions/apigroupprofileupdate.php:342 actions/editgroup.php:241
+#: actions/newgroup.php:188
+#, php-format
+msgid "Invalid alias: \"%s\""
+msgstr "L'àlies no és vàlid «%s»"
+
 #. TRANS: Client error displayed when uploading a media file has failed.
 #: actions/apimediaupload.php:101
 msgid "Upload failed."
@@ -821,21 +875,22 @@ msgstr "El testimoni de sol·licitud ja està autoritzat."
 #. TRANS: Form validation error message.
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
+#. TRANS: Client error displayed when the session token is not okay.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
 #: actions/deletenotice.php:177 actions/disfavor.php:75
-#: actions/emailsettings.php:291 actions/favor.php:75 actions/geocode.php:55
+#: actions/emailsettings.php:292 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:65 actions/grouplogo.php:321
-#: actions/groupunblock.php:65 actions/imsettings.php:224
-#: actions/invite.php:60 actions/login.php:137 actions/makeadmin.php:66
-#: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
-#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
-#: actions/othersettings.php:155 actions/passwordsettings.php:138
-#: actions/profilesettings.php:217 actions/recoverpassword.php:383
-#: actions/register.php:172 actions/remotesubscribe.php:76
-#: actions/repeat.php:82 actions/smssettings.php:250 actions/subedit.php:40
-#: actions/subscribe.php:86 actions/tagother.php:166
-#: actions/unsubscribe.php:69 actions/userauthorization.php:52
-#: lib/designsettings.php:310
+#: actions/groupunblock.php:65 actions/imsettings.php:241
+#: actions/invite.php:60 actions/makeadmin.php:66 actions/newmessage.php:135
+#: actions/newnotice.php:105 actions/nudge.php:80
+#: actions/oauthappssettings.php:162 actions/oauthconnectionssettings.php:135
+#: actions/passwordsettings.php:137 actions/pluginenable.php:87
+#: actions/profilesettings.php:218 actions/recoverpassword.php:383
+#: actions/register.php:157 actions/remotesubscribe.php:76
+#: actions/repeat.php:82 actions/smssettings.php:249 actions/subedit.php:40
+#: actions/subscribe.php:87 actions/tagother.php:145
+#: actions/unsubscribe.php:69 actions/urlsettings.php:171
+#: actions/userauthorization.php:53 lib/designsettings.php:122
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 "Sembla que hi ha hagut un problema amb la teva sessió. Prova-ho de nou, si "
@@ -865,10 +920,10 @@ msgstr "Error de la base de dades en inserir l'oauth_token_association."
 #. TRANS: Unknown form validation error in design settings form.
 #: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
 #: actions/designadminpanel.php:100 actions/editapplication.php:144
-#: actions/emailsettings.php:310 actions/grouplogo.php:332
-#: actions/imsettings.php:239 actions/newapplication.php:124
-#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
-#: actions/smssettings.php:271 lib/designsettings.php:321
+#: actions/emailsettings.php:311 actions/grouplogo.php:332
+#: actions/imsettings.php:256 actions/newapplication.php:124
+#: actions/oauthconnectionssettings.php:144 actions/recoverpassword.php:46
+#: actions/smssettings.php:270 lib/designsettings.php:133
 msgid "Unexpected form submission."
 msgstr "Enviament de formulari inesperat."
 
@@ -917,31 +972,26 @@ msgstr "Compte"
 
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Field label in form for profile settings.
-#. TRANS: Label for group nickname (dt). Text hidden by default.
-#. TRANS: DT for nick name in a profile.
-#: actions/apioauthauthorize.php:459 actions/login.php:252
-#: actions/profilesettings.php:106 actions/register.php:432
-#: actions/showgroup.php:243 actions/tagother.php:94
+#: actions/apioauthauthorize.php:459 actions/login.php:225
+#: actions/profilesettings.php:107 actions/register.php:411
 #: actions/userauthorization.php:145 lib/groupeditform.php:145
-#: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "Sobrenom"
 
 #. TRANS: Field label on OAuth API authorisation form.
-#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:463 actions/login.php:255
-#: actions/register.php:436 lib/accountsettingsaction.php:120
+#: actions/apioauthauthorize.php:463 actions/login.php:228
+#: actions/register.php:415 lib/settingsnav.php:87
 msgid "Password"
 msgstr "Contrasenya"
 
 #. TRANS: Button text that when clicked will cancel the process of allowing access to an account
 #. TRANS: by an external application.
 #. TRANS: Button label to cancel an e-mail address confirmation procedure.
-#. TRANS: Button label to cancel an Instant Messaging address confirmation procedure.
+#. TRANS: Button label to cancel an IM address confirmation procedure.
 #. TRANS: Button label to cancel a SMS address confirmation procedure.
 #. TRANS: Button label in the "Edit application" form.
-#: actions/apioauthauthorize.php:478 actions/emailsettings.php:124
-#: actions/imsettings.php:127 actions/smssettings.php:133
+#: actions/apioauthauthorize.php:478 actions/emailsettings.php:125
+#: actions/imsettings.php:136 actions/smssettings.php:132
 #: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Cancel"
@@ -1051,8 +1101,8 @@ msgstr "El mètode HTTP no està implementat."
 #. TRANS: Exception thrown requesting an unsupported notice output format.
 #. TRANS: %s is the requested output format.
 #: actions/apistatusesshow.php:144
-#, fuzzy, php-format
-msgid "Unsupported format: %s"
+#, php-format
+msgid "Unsupported format: %s."
 msgstr "Format no permès: %s."
 
 #. TRANS: Client error displayed requesting a deleted status.
@@ -1134,13 +1184,6 @@ msgstr "%1$s / Preferits de %2$s"
 msgid "%1$s updates favorited by %2$s / %3$s."
 msgstr "%1$s actualitzacions preferides per %2$s / %3$s."
 
-#. TRANS: Server error displayed when generating an Atom feed fails.
-#. TRANS: %s is the error.
-#: actions/apitimelinegroup.php:134
-#, php-format
-msgid "Could not generate feed for group - %s"
-msgstr "No s'ha pogut generar un canal per al grup - %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.
 #: actions/apitimelinementions.php:115
@@ -1157,13 +1200,14 @@ msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr "%1$s actualitzacions que responen a avisos de %2$s / %3$s."
 
 #. TRANS: Title for site timeline. %s is the StatusNet sitename.
+#. TRANS: Public RSS feed title. %s is the StatusNet site name.
 #: actions/apitimelinepublic.php:193 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "%s línia temporal pública"
 
 #. TRANS: Subtitle for site timeline. %s is the StatusNet sitename.
-#: actions/apitimelinepublic.php:199 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:199
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "%s actualitzacions de tothom!"
@@ -1174,21 +1218,33 @@ msgid "Unimplemented."
 msgstr "No implementat."
 
 #. TRANS: Title for Atom feed "repeated to me". %s is the user nickname.
-#: actions/apitimelineretweetedtome.php:108
+#: actions/apitimelineretweetedtome.php:96
 #, php-format
 msgid "Repeated to %s"
 msgstr "Repetit a %s"
 
+#: actions/apitimelineretweetedtome.php:98
+#, fuzzy, php-format
+msgid "%1$s notices that were to repeated to %2$s / %3$s."
+msgstr "%1$s actualitzacions que responen a avisos de %2$s / %3$s."
+
 #. TRANS: Title of list of repeated notices of the logged in user.
 #. TRANS: %s is the nickname of the logged in user.
-#: actions/apitimelineretweetsofme.php:112
+#: actions/apitimelineretweetsofme.php:98
 #, php-format
 msgid "Repeats of %s"
 msgstr "Repeticions de %s"
 
+#: actions/apitimelineretweetsofme.php:104
+#, fuzzy, php-format
+msgid "%1$s notices that %2$s / %3$s has repeated."
+msgstr "%1$s ha marcat l'avís %2$s com a preferit"
+
 #. TRANS: Title for timeline with lastest notices with a given tag.
 #. TRANS: %s is the tag.
-#: actions/apitimelinetag.php:101 actions/tag.php:67
+#. TRANS: Title for first page of notices with tags.
+#. TRANS: %s is the tag.
+#: actions/apitimelinetag.php:101 actions/tag.php:69
 #, php-format
 msgid "Notices tagged with %s"
 msgstr "Avisos etiquetats amb %s"
@@ -1201,53 +1257,54 @@ msgid "Updates tagged with %1$s on %2$s!"
 msgstr "Actualitzacions etiquetades amb %1$s el %2$s!"
 
 #. TRANS: Client error displayed trying to add a notice to another user's timeline.
-#: actions/apitimelineuser.php:297
+#: actions/apitimelineuser.php:308
 msgid "Only the user can add to their own timeline."
 msgstr "Només l'usuari pot afegir a la pròpia línia temporal."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:304
+#: actions/apitimelineuser.php:315
 msgid "Only accept AtomPub for Atom feeds."
 msgstr "Només accepta AtomPub per als canals Atom."
 
 #. TRANS: Client error displayed attempting to post an empty API notice.
-#: actions/apitimelineuser.php:311
+#: actions/apitimelineuser.php:322
 msgid "Atom post must not be empty."
 msgstr "L'enviament Atom no ha de ser buit."
 
 #. TRANS: Client error displayed attempting to post an API that is not well-formed XML.
-#: actions/apitimelineuser.php:317
+#: actions/apitimelineuser.php:328
 msgid "Atom post must be well-formed XML."
 msgstr "L'enviament Atom ha de ser un XML ben format."
 
 #. TRANS: Client error displayed when not using an Atom entry.
-#: actions/apitimelineuser.php:323 actions/atompubfavoritefeed.php:228
+#: actions/apitimelineuser.php:334 actions/atompubfavoritefeed.php:228
 #: actions/atompubmembershipfeed.php:230
 #: actions/atompubsubscriptionfeed.php:236
 msgid "Atom post must be an Atom entry."
 msgstr "L'enviament Atom ha de ser una entrada Atom."
 
 #. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
-#: actions/apitimelineuser.php:335
+#: actions/apitimelineuser.php:345
 msgid "Can only handle POST activities."
 msgstr "Només es poden gestionar les activitats POST."
 
 #. TRANS: Client error displayed when using an unsupported activity object type.
 #. TRANS: %s is the unsupported activity object type.
-#: actions/apitimelineuser.php:346
+#: actions/apitimelineuser.php:356
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr "No es pot gestionar l'activitat del tipus d'objecte «%s»"
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
 #. TRANS: %d is the notice ID (number).
-#: actions/apitimelineuser.php:380
+#: actions/apitimelineuser.php:390
 #, php-format
 msgid "No content for notice %d."
 msgstr "No hi ha contingut de l'avís %d"
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:408
+#. TRANS: %s is the notice URI.
+#: actions/apitimelineuser.php:419
 #, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "L'avís amb URI «%s» amb ja existeix."
@@ -1264,9 +1321,10 @@ msgstr "No s'ha trobat el mètode API!"
 
 #. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
 #. TRANS: Client exception.
+#. TRANS: Client error displayed trying to subscribe to a non-existing profile.
 #: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
 #: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
-#: actions/subscribe.php:107
+#: actions/subscribe.php:110
 msgid "No such profile."
 msgstr "No existeix el perfil."
 
@@ -1401,7 +1459,7 @@ msgid "Not a member."
 msgstr "No és un membre."
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
-#: actions/atompubshowmembership.php:151
+#: actions/atompubshowmembership.php:150
 msgid "Cannot delete someone else's membership."
 msgstr "No es pot eliminar la pertinència d'algú altre."
 
@@ -1488,10 +1546,7 @@ msgid "Invalid size."
 msgstr "La mida no és vàlida."
 
 #. TRANS: Title for avatar upload page.
-#. TRANS: Label for group avatar (dt). Text hidden by default.
-#. TRANS: Link description in user account settings menu.
-#: actions/avatarsettings.php:66 actions/showgroup.php:227
-#: lib/accountsettingsaction.php:113
+#: actions/avatarsettings.php:66 lib/settingsnav.php:82
 msgid "Avatar"
 msgstr "Avatar"
 
@@ -1505,9 +1560,11 @@ msgstr ""
 
 #. TRANS: Server error displayed in avatar upload page when no matching profile can be found for a user.
 #. TRANS: Server error displayed coming across a request from a user without a profile.
+#. TRANS: Server error displayed when trying to authorise a remote subscription request
+#. TRANS: while the user has no profile.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
 #: actions/grouplogo.php:184 actions/remotesubscribe.php:190
-#: actions/userauthorization.php:72 actions/userrss.php:108
+#: actions/userauthorization.php:75 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr "L'usuari que no coincideix amb cap perfil"
 
@@ -1562,10 +1619,9 @@ msgstr "Retalla"
 msgid "No file uploaded."
 msgstr "No s'ha carregat cap fitxer."
 
-#. TRANS: Avatar upload form unstruction after uploading a file.
+#. TRANS: Avatar upload form instruction after uploading a file.
 #: actions/avatarsettings.php:345
-#, fuzzy
-msgid "Pick a square area of the image to be your avatar"
+msgid "Pick a square area of the image to be your avatar."
 msgstr ""
 "Seleccioneu una àrea quadrada de la imatge que voleu que sigui el vostre "
 "avatar."
@@ -1593,7 +1649,7 @@ msgstr "S'ha eliminat l'avatar."
 
 #. TRANS: Title for backup account page.
 #. TRANS: Option in profile settings to create a backup of the account of the currently logged in user.
-#: actions/backupaccount.php:61 actions/profilesettings.php:467
+#: actions/backupaccount.php:61 actions/profilesettings.php:468
 msgid "Backup account"
 msgstr "Fes una còpia de seguretat del compte"
 
@@ -1633,8 +1689,7 @@ msgstr "Còpia de seguretat"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
 #: actions/backupaccount.php:254
-#, fuzzy
-msgid "Backup your account"
+msgid "Backup your account."
 msgstr "Fes una còpia de seguretat del compte."
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
@@ -1675,8 +1730,7 @@ msgstr "No"
 
 #. TRANS: Submit button title for 'No' when blocking a user.
 #: actions/block.php:158
-#, fuzzy
-msgid "Do not block this user"
+msgid "Do not block this user."
 msgstr "No bloquis l'usuari."
 
 #. TRANS: Button label on the user block form.
@@ -1693,10 +1747,9 @@ msgid "Yes"
 msgstr "Sí"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#. TRANS: Description of the form to block a user.
-#: actions/block.php:165 lib/blockform.php:79
-msgid "Block this user"
-msgstr "Bloca aquest usuari"
+#: actions/block.php:165
+msgid "Block this user."
+msgstr "Bloca l'usuari."
 
 #. TRANS: Server error displayed when blocking a user fails.
 #: actions/block.php:189
@@ -1761,31 +1814,47 @@ msgstr "Codi de confirmació no trobat. "
 msgid "That confirmation code is not for you!"
 msgstr "Aquest codi de confirmació no és vostre!"
 
-#. TRANS: Server error for a unknow address type %s, which can be 'email', 'jabber', or 'sms'.
-#: actions/confirmaddress.php:92
-#, php-format
-msgid "Unrecognized address type %s."
+#. TRANS: Server error for an unknown address type, which can be 'email', 'sms', or the name of an IM network (such as 'xmpp' or 'aim')
+#: actions/confirmaddress.php:94
+#, fuzzy, php-format
+msgid "Unrecognized address type %s"
 msgstr "Tipus d'adreça desconeguda %s."
 
 #. TRANS: Client error for an already confirmed email/jabber/sms address.
-#: actions/confirmaddress.php:97
+#: actions/confirmaddress.php:103 actions/confirmaddress.php:136
 msgid "That address has already been confirmed."
 msgstr "Aquesta adreça ja ha estat confirmada."
 
+#: actions/confirmaddress.php:121 actions/imsettings.php:444
+#: actions/userdesignsettings.php:306
+#, fuzzy
+msgid "Couldn't update user."
+msgstr "No s'ha pogut actualitzar l'usuari."
+
+#: actions/confirmaddress.php:144
+#, fuzzy
+msgid "Couldn't update user im preferences."
+msgstr "No s'ha pogut actualitzar el registre de l'usuari."
+
+#: actions/confirmaddress.php:156
+#, fuzzy
+msgid "Couldn't insert user im preferences."
+msgstr "No s'ha pogut inserir una nova subscripció."
+
 #. TRANS: Server error displayed when an address confirmation code deletion from the
 #. TRANS: database fails in the contact address confirmation action.
-#: actions/confirmaddress.php:132
+#: actions/confirmaddress.php:169
 msgid "Could not delete address confirmation."
 msgstr "No s'ha pogut eliminar la confirmació de l'adreça."
 
 #. TRANS: Title for the contact address confirmation action.
-#: actions/confirmaddress.php:150
+#: actions/confirmaddress.php:185
 msgid "Confirm address"
 msgstr "Confirmeu l'adreça de correu electrònic"
 
 #. TRANS: Success message for the contact address confirmation action.
 #. TRANS: %s can be 'email', 'jabber', or 'sms'.
-#: actions/confirmaddress.php:166
+#: actions/confirmaddress.php:200
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "L'adreça «%s» ha estat confirmada per al vostre compte."
@@ -1799,6 +1868,7 @@ msgstr "Conversa"
 #. TRANS: Label for user statistics.
 #: actions/conversation.php:149 lib/noticelist.php:87
 #: lib/profileaction.php:246 lib/searchgroupnav.php:82
+#: lib/threadednoticelist.php:66
 msgid "Notices"
 msgstr "Avisos"
 
@@ -1831,7 +1901,7 @@ msgstr "S'ha eliminat el compte."
 
 #. TRANS: Page title for page on which a user account can be deleted.
 #. TRANS: Option in profile settings to delete the account of the currently logged in user.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:475
+#: actions/deleteaccount.php:228 actions/profilesettings.php:476
 msgid "Delete account"
 msgstr "Elimina el compte"
 
@@ -1858,7 +1928,7 @@ msgstr ""
 #. TRANS: Field label for delete account confirmation entry.
 #. TRANS: Field label for password reset form where the password has to be typed again.
 #: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:262 actions/register.php:440
+#: actions/recoverpassword.php:262 actions/register.php:419
 msgid "Confirm"
 msgstr "Confirma"
 
@@ -1887,14 +1957,14 @@ msgstr "No s'ha trobat l'aplicació."
 #. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
 #: actions/deleteapplication.php:79 actions/editapplication.php:78
-#: actions/showapplication.php:94
+#: actions/showapplication.php:90
 msgid "You are not the owner of this application."
 msgstr "No sou el propietari d'aquesta aplicació."
 
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
-#: actions/newapplication.php:112 actions/showapplication.php:118
-#: lib/action.php:1425
+#: actions/newapplication.php:112 actions/showapplication.php:113
+#: lib/action.php:1391
 msgid "There was a problem with your session token."
 msgstr "S'ha produït un problema amb el testimoni de la vostra sessió."
 
@@ -1917,14 +1987,12 @@ msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting an application.
 #: actions/deleteapplication.php:161
-#, fuzzy
-msgid "Do not delete this application"
+msgid "Do not delete this application."
 msgstr "No eliminis l'aplicació."
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
 #: actions/deleteapplication.php:167
-#, fuzzy
-msgid "Delete this application"
+msgid "Delete this application."
 msgstr "Elimina l'aplicació."
 
 #. TRANS: Client error when trying to delete group while not logged in.
@@ -1978,14 +2046,12 @@ msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting a group.
 #: actions/deletegroup.php:224
-#, fuzzy
-msgid "Do not delete this group"
+msgid "Do not delete this group."
 msgstr "No eliminis el grup."
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
 #: actions/deletegroup.php:231
-#, fuzzy
-msgid "Delete this group"
+msgid "Delete this group."
 msgstr "Elimina el grup."
 
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
@@ -1993,14 +2059,16 @@ msgstr "Elimina el grup."
 #. TRANS: Client error displayed when trying to mark a notice as favorite without being logged in.
 #. TRANS: Client error displayed trying to block a user from a group while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
+#. TRANS: Client error displayed trying to log out when not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
+#. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
 #. TRANS: Client error displayed when trying to change user options while not logged in.
 #: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
-#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:69
+#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:70
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
-#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
-#: actions/tagother.php:33 actions/unsubscribe.php:52
+#: actions/nudge.php:63 actions/pluginenable.php:97 actions/subedit.php:33
+#: actions/subscribe.php:98 actions/tagother.php:33 actions/unsubscribe.php:52
 #: lib/adminpanelaction.php:71 lib/profileformaction.php:63
 #: lib/settingsaction.php:72
 msgid "Not logged in."
@@ -2028,14 +2096,13 @@ msgstr "Esteu segur que voleu eliminar aquest avís?"
 
 #. TRANS: Submit button title for 'No' when deleting a notice.
 #: actions/deletenotice.php:159
-#, fuzzy
-msgid "Do not delete this notice"
+msgid "Do not delete this notice."
 msgstr "No eliminis l'avís."
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:166 lib/noticelist.php:673
-msgid "Delete this notice"
-msgstr "Elimina aquest avís"
+#: actions/deletenotice.php:166
+msgid "Delete this notice."
+msgstr "Elimina l'avís."
 
 #. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
 #: actions/deleteuser.php:66
@@ -2069,19 +2136,16 @@ msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting a user.
 #: actions/deleteuser.php:158
-#, fuzzy
-msgid "Do not delete this user"
+msgid "Do not delete this user."
 msgstr "No eliminis l'usuari."
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
-#. TRANS: Description of form for deleting a user.
-#: actions/deleteuser.php:165 lib/deleteuserform.php:75
-msgid "Delete this user"
-msgstr "Elimina l'usuari"
+#: actions/deleteuser.php:165
+msgid "Delete this user."
+msgstr "Elimina l'usuari."
 
 #. TRANS: Message used as title for design settings for the site.
-#. TRANS: Link description in user account settings menu.
-#: actions/designadminpanel.php:60 lib/accountsettingsaction.php:134
+#: actions/designadminpanel.php:60 lib/settingsnav.php:97
 msgid "Design"
 msgstr "Disseny"
 
@@ -2148,8 +2212,7 @@ msgid "You can upload a custom StatusNet theme as a .ZIP archive."
 msgstr "Podeu pujar un tema personalitzat de l'StatusNet amb un arxiu ZIP."
 
 #. TRANS: Fieldset legend for theme background image.
-#. TRANS: Fieldset legend on profile design page.
-#: actions/designadminpanel.php:515 lib/designsettings.php:98
+#: actions/designadminpanel.php:515
 msgid "Change background image"
 msgstr "Canvia la imatge de fons"
 
@@ -2157,7 +2220,7 @@ msgstr "Canvia la imatge de fons"
 #. TRANS: Field label for background color selector.
 #. TRANS: Label on profile design page for setting a profile page background colour.
 #: actions/designadminpanel.php:525 actions/designadminpanel.php:609
-#: lib/designsettings.php:183
+#: lib/designform.php:238
 msgid "Background"
 msgstr "Fons"
 
@@ -2183,13 +2246,13 @@ msgstr "Desactivada"
 #. TRANS: Form guide for turning background image on or off on theme designer page.
 #. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
 #. TRANS: use of the uploaded profile image.
-#: actions/designadminpanel.php:577 lib/designsettings.php:159
+#: actions/designadminpanel.php:577 lib/designform.php:214
 msgid "Turn background image on or off."
 msgstr "Activa o desactiva la imatge de fons."
 
 #. TRANS: Checkbox label to title background image on theme designer page.
 #. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-#: actions/designadminpanel.php:583 lib/designsettings.php:165
+#: actions/designadminpanel.php:583 lib/designform.php:220
 msgid "Tile background image"
 msgstr "Posa en mosaic la imatge de fons"
 
@@ -2200,25 +2263,25 @@ msgstr "Canvia els colors"
 
 #. TRANS: Field label for content color selector.
 #. TRANS: Label on profile design page for setting a profile page content colour.
-#: actions/designadminpanel.php:623 lib/designsettings.php:197
+#: actions/designadminpanel.php:623 lib/designform.php:252
 msgid "Content"
 msgstr "Contingut"
 
 #. TRANS: Field label for sidebar color selector.
 #. TRANS: Label on profile design page for setting a profile page sidebar colour.
-#: actions/designadminpanel.php:637 lib/designsettings.php:211
+#: actions/designadminpanel.php:637 lib/designform.php:266
 msgid "Sidebar"
 msgstr "Barra lateral"
 
 #. TRANS: Field label for text color selector.
 #. TRANS: Label on profile design page for setting a profile page text colour.
-#: actions/designadminpanel.php:651 lib/designsettings.php:225
+#: actions/designadminpanel.php:651 lib/designform.php:280
 msgid "Text"
 msgstr "Text"
 
 #. TRANS: Field label for link color selector.
 #. TRANS: Label on profile design page for setting a profile page links colour.
-#: actions/designadminpanel.php:665 lib/designsettings.php:239
+#: actions/designadminpanel.php:665 lib/designform.php:294
 msgid "Links"
 msgstr "Enllaços"
 
@@ -2239,22 +2302,19 @@ msgid "Use defaults"
 msgstr "Utilitza els paràmetres per defecte"
 
 #. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: actions/designadminpanel.php:720 lib/designsettings.php:259
-msgid "Restore default designs"
-msgstr "Restaura els dissenys per defecte"
+#: actions/designadminpanel.php:720
+msgid "Restore default designs."
+msgstr "Restaura els dissenys per defecte."
 
 #. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: actions/designadminpanel.php:728 lib/designsettings.php:267
-msgid "Reset back to default"
-msgstr "Torna a restaurar al valor per defecte"
+#: actions/designadminpanel.php:728
+msgid "Reset back to default."
+msgstr "Torna a restaurar els paràmetres per defecte."
 
 #. TRANS: Title for button for saving theme settings.
-#. TRANS: Title for button on profile design page to save settings.
-#: actions/designadminpanel.php:736 lib/designsettings.php:272
-msgid "Save design"
-msgstr "Desa el disseny"
+#: actions/designadminpanel.php:736
+msgid "Save design."
+msgstr "Desa el disseny."
 
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
 #: actions/disfavor.php:83
@@ -2285,7 +2345,7 @@ msgid "You must be logged in to edit an application."
 msgstr "Heu d'iniciar una sessió per editar una aplicació."
 
 #. TRANS: Client error displayed trying to edit an application that does not exist.
-#: actions/editapplication.php:83 actions/showapplication.php:87
+#: actions/editapplication.php:83 actions/showapplication.php:83
 msgid "No such application."
 msgstr "No hi ha tal aplicació."
 
@@ -2376,80 +2436,53 @@ msgstr "Edita el grup %s"
 msgid "You must be logged in to create a group."
 msgstr "Heu d'haver iniciat una sessió per crear un grup."
 
-#. TRANS: Client error displayed trying to edit a group while not being a group admin.
-#. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
-#. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
-#: actions/editgroup.php:110 actions/editgroup.php:176
-#: actions/groupdesignsettings.php:109 actions/grouplogo.php:111
-msgid "You must be an admin to edit the group."
-msgstr "Heu de ser administrador per editar el grup."
-
 #. TRANS: Form instructions for group edit form.
 #: actions/editgroup.php:161
 msgid "Use this form to edit the group."
 msgstr "Utilitza aquest formulari per editar el grup."
 
-#. TRANS: Group edit form validation error.
-#. TRANS: Group create form validation error.
-#. TRANS: %s is the invalid alias.
-#: actions/editgroup.php:241 actions/newgroup.php:188
-#, php-format
-msgid "Invalid alias: \"%s\""
-msgstr "L'àlies no és vàlid «%s»"
-
-#. TRANS: Server error displayed when editing a group fails.
-#: actions/editgroup.php:274
-msgid "Could not update group."
-msgstr "No s'ha pogut actualitzar el grup."
-
-#. TRANS: Server error displayed when group aliases could not be added.
-#. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/editgroup.php:281 classes/User_group.php:540
-msgid "Could not create aliases."
-msgstr "No s'han pogut crear els àlies."
-
 #. TRANS: Group edit form success message.
 #: actions/editgroup.php:301
 msgid "Options saved."
 msgstr "Configuració guardada."
 
 #. TRANS: Title for e-mail settings.
-#: actions/emailsettings.php:59
+#: actions/emailsettings.php:60
 msgid "Email settings"
 msgstr "Paràmetres del correu electrònic"
 
 #. TRANS: E-mail settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/emailsettings.php:73
+#: actions/emailsettings.php:74
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 msgstr "Gestioneu com rebeu correu de %%site.name%%."
 
 #. TRANS: Form legend for e-mail settings form.
 #. TRANS: Field label for e-mail address input in e-mail settings form.
-#: actions/emailsettings.php:103 actions/emailsettings.php:129
+#: actions/emailsettings.php:104 actions/emailsettings.php:130
 msgid "Email address"
 msgstr "Adreça de correu electrònic"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:109
+#: actions/emailsettings.php:110
 msgid "Current confirmed email address."
 msgstr "Adreça electrònica confirmada actualment."
 
 #. TRANS: Button label to remove a confirmed e-mail address.
 #. TRANS: Button label for removing a set sender e-mail address to post notices from.
-#. TRANS: Button label to remove a confirmed Instant Messaging address.
+#. TRANS: Button label to remove a confirmed IM address.
 #. TRANS: Button label to remove a confirmed SMS address.
 #. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
-#: actions/emailsettings.php:112 actions/emailsettings.php:179
-#: actions/imsettings.php:112 actions/smssettings.php:120
-#: actions/smssettings.php:176
+#: actions/emailsettings.php:113 actions/emailsettings.php:180
+#: actions/imsettings.php:119 actions/smssettings.php:119
+#: actions/smssettings.php:175
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Elimina"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:119
+#: actions/emailsettings.php:120
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -2462,44 +2495,44 @@ msgstr ""
 #. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
 #. TRANS: Any other domain may be owned by a legitimate person or
 #. TRANS: organization.
-#: actions/emailsettings.php:136
+#: actions/emailsettings.php:137
 msgid "Email address, like \"UserName@example.org\""
 msgstr "Adreça electrònica, com ara «nomusuari@example.org»"
 
 #. TRANS: Button label for adding an e-mail address in e-mail settings form.
-#. TRANS: Button label for adding an Instant Messaging address in Instant Messaging settings form.
+#. TRANS: Button label for adding an IM address in IM settings form.
 #. TRANS: Button label for adding a SMS phone number in SMS settings form.
-#: actions/emailsettings.php:140 actions/imsettings.php:147
-#: actions/smssettings.php:158
+#: actions/emailsettings.php:141 actions/imsettings.php:147
+#: actions/smssettings.php:157
 msgctxt "BUTTON"
 msgid "Add"
 msgstr "Afegeix"
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:148 actions/smssettings.php:167
+#: actions/emailsettings.php:149 actions/smssettings.php:166
 msgid "Incoming email"
 msgstr "Correu electrònic entrant"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:154
+#: actions/emailsettings.php:155
 msgid "I want to post notices by email."
 msgstr "Vull publicar avisos amb el correu electrònic."
 
 #. TRANS: Form instructions for incoming e-mail form in e-mail settings.
 #. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
-#: actions/emailsettings.php:176 actions/smssettings.php:174
+#: actions/emailsettings.php:177 actions/smssettings.php:173
 msgid "Send email to this address to post new notices."
 msgstr "Envia correu electrònic a aquesta adreça per publicar nous avisos."
 
 #. TRANS: Instructions for incoming e-mail address input form, when an address has already been assigned.
 #. TRANS: Instructions for incoming SMS e-mail address input form.
-#: actions/emailsettings.php:185 actions/smssettings.php:182
+#: actions/emailsettings.php:186 actions/smssettings.php:181
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr "Estableix una nova adreça electrònica d'enviament; cancel·la l'antiga."
 
 #. TRANS: Instructions for incoming e-mail address input form.
-#: actions/emailsettings.php:189
+#: actions/emailsettings.php:190
 msgid ""
 "To send notices via email, we need to create a unique email address for you "
 "on this server:"
@@ -2509,89 +2542,89 @@ msgstr ""
 
 #. TRANS: Button label for adding an e-mail address to send notices from.
 #. TRANS: Button label for adding an SMS e-mail address to send notices from.
-#: actions/emailsettings.php:195 actions/smssettings.php:185
+#: actions/emailsettings.php:196 actions/smssettings.php:184
 msgctxt "BUTTON"
 msgid "New"
 msgstr "Nou"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:204
+#: actions/emailsettings.php:205
 msgid "Email preferences"
 msgstr "Preferències del correu electrònic"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:212
+#: actions/emailsettings.php:213
 msgid "Send me notices of new subscriptions through email."
 msgstr "Envia'm avisos per correu electrònic quan algú nou se'm subscrigui."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:218
+#: actions/emailsettings.php:219
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr ""
 "Envia'm un correu electrònic quan algú afegeixi un avís meu com a preferit."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:225
+#: actions/emailsettings.php:226
 msgid "Send me email when someone sends me a private message."
 msgstr "Envia'm un correu electrònic quan algú m'envii un missatge privat."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:231
+#: actions/emailsettings.php:232
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr "Envia'm un correu electrònic quan algú m'enviï una resposta amb @."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:237
+#: actions/emailsettings.php:238
 msgid "Allow friends to nudge me and send me an email."
 msgstr ""
 "Permetre que els amics em cridin l'atenció i m'enviïn un correu electrònic."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:243
+#: actions/emailsettings.php:244
 msgid "Publish a MicroID for my email address."
 msgstr "Publica una MicroID per al meu correu electrònic."
 
 #. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:361
+#: actions/emailsettings.php:362
 msgid "Email preferences saved."
 msgstr "S'han desat les preferències del correu electrònic."
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:380
+#: actions/emailsettings.php:381
 msgid "No email address."
 msgstr "No hi ha cap adreça electrònica."
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:388
+#: actions/emailsettings.php:389
 msgid "Cannot normalize that email address."
 msgstr "No es pot normalitzar l'adreça electrònica."
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:393 actions/register.php:212
+#: actions/emailsettings.php:394 actions/register.php:197
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "Adreça de correu electrònic no vàlida."
 
 #. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:397
+#: actions/emailsettings.php:398
 msgid "That is already your email address."
 msgstr "Ja és la vostra adreça electrònica."
 
 #. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:401
+#: actions/emailsettings.php:402
 msgid "That email address already belongs to another user."
 msgstr "L'adreça electrònica ja pertany a un altre usuari."
 
 #. TRANS: Server error thrown on database error adding e-mail confirmation code.
 #. TRANS: Server error thrown on database error adding Instant Messaging confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:418 actions/imsettings.php:343
-#: actions/smssettings.php:365
+#: actions/emailsettings.php:419 actions/imsettings.php:362
+#: actions/smssettings.php:364
 msgid "Could not insert confirmation code."
 msgstr "No s'ha pogut inserir el codi de confirmació."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:425
+#: actions/emailsettings.php:426
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
@@ -2603,57 +2636,60 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling Instant Messaging address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:445 actions/imsettings.php:377
-#: actions/smssettings.php:399
+#: actions/emailsettings.php:446 actions/imsettings.php:391
+#: actions/smssettings.php:398
 msgid "No pending confirmation to cancel."
 msgstr "Cap confirmació pendent per cancel·lar."
 
 #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:450
+#: actions/emailsettings.php:451
 msgid "That is the wrong email address."
 msgstr "Aquesta l'adreça de correu electrònic incorrecta."
 
 #. TRANS: Server error thrown on database error canceling e-mail address confirmation.
 #. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
-#: actions/emailsettings.php:459 actions/smssettings.php:413
+#: actions/emailsettings.php:460 actions/smssettings.php:412
 msgid "Could not delete email confirmation."
 msgstr "No s'ha pogut eliminar la confirmació de correu electrònic."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:464
+#: actions/emailsettings.php:465
 msgid "Email confirmation cancelled."
 msgstr "S'ha cancel·lat la confirmació de correu electrònic."
 
 #. TRANS: Message given trying to remove an e-mail address that is not
 #. TRANS: registered for the active user.
-#: actions/emailsettings.php:483
+#: actions/emailsettings.php:484
 msgid "That is not your email address."
 msgstr "Aquest no és el teu correu electrònic"
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:504
+#: actions/emailsettings.php:505
 msgid "The email address was removed."
 msgstr "S'ha eliminat l'adreça de correu electrònic."
 
 #. TRANS: Form validation error displayed when trying to remove an incoming e-mail address while no address has been set.
-#: actions/emailsettings.php:518 actions/smssettings.php:555
+#: actions/emailsettings.php:519 actions/smssettings.php:554
 msgid "No incoming email address."
 msgstr "No hi ha cap direcció de correu electrònic entrant."
 
 #. TRANS: Server error thrown on database error removing incoming e-mail address.
 #. TRANS: Server error thrown on database error adding incoming e-mail address.
-#: actions/emailsettings.php:530 actions/emailsettings.php:554
-#: actions/smssettings.php:565 actions/smssettings.php:588
+#. TRANS: Server error displayed when the user could not be updated in SMS settings.
+#: actions/emailsettings.php:531 actions/emailsettings.php:555
+#: actions/smssettings.php:565 actions/smssettings.php:590
 msgid "Could not update user record."
 msgstr "No s'ha pogut actualitzar el registre de l'usuari."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:534 actions/smssettings.php:568
+#. TRANS: Confirmation text after updating SMS settings.
+#: actions/emailsettings.php:535 actions/smssettings.php:569
 msgid "Incoming email address removed."
 msgstr "Eliminat el correu electrònic entrant."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:558 actions/smssettings.php:591
+#. TRANS: Confirmation text after updating SMS settings.
+#: actions/emailsettings.php:559 actions/smssettings.php:594
 msgid "New incoming email address added."
 msgstr "Nou correu electrònic entrant afegit."
 
@@ -2664,9 +2700,8 @@ msgstr "Aquest avís ja és un preferit."
 
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
 #: actions/favor.php:95
-#, fuzzy
-msgid "Disfavor favorite"
-msgstr "Fes que deixi de ser preferit"
+msgid "Disfavor favorite."
+msgstr "Fes que deixi de ser preferit."
 
 #. TRANS: Page title for first page of favorited notices.
 #. TRANS: Title for favourited notices section.
@@ -2718,9 +2753,8 @@ msgstr ""
 #. TRANS: %s is a user's nickname.
 #. TRANS: Title for first page of favourite notices of a user.
 #. TRANS: %s is the user for whom the favourite notices are displayed.
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing own favourited notices.
 #: actions/favoritesrss.php:111 actions/showfavorites.php:76
-#: lib/personalgroupnav.php:122
+#: lib/personalgroupnav.php:110
 #, php-format
 msgid "%s's favorite notices"
 msgstr "Avisos preferits de %s"
@@ -2905,14 +2939,12 @@ msgstr ""
 
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
 #: actions/groupblock.php:191
-#, fuzzy
-msgid "Do not block this user from this group"
+msgid "Do not block this user from this group."
 msgstr "No bloquis l'usuari del grup."
 
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
 #: actions/groupblock.php:198
-#, fuzzy
-msgid "Block this user from this group"
+msgid "Block this user from this group."
 msgstr "Bloca l'usuari del grup."
 
 #. TRANS: Server error displayed when trying to block a user from a group fails because of an application error.
@@ -2921,6 +2953,7 @@ msgid "Database error blocking user from group."
 msgstr "S'ha produït un error en la base de dades en blocar l'usuari del grup."
 
 #. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
+#. TRANS: Client error displayed trying to find a user by ID without providing an ID.
 #: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr "Sense ID."
@@ -2950,7 +2983,7 @@ msgid "Unable to update your design settings."
 msgstr "No s'han pogut actualitzar els paràmetres de disseny."
 
 #. TRANS: Form text to confirm saved group design settings.
-#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:222
+#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:239
 msgid "Design preferences saved."
 msgstr "S'han desat les preferències de disseny."
 
@@ -3015,7 +3048,7 @@ msgid "A list of the users in this group."
 msgstr "La llista dels usuaris d'aquest grup."
 
 #. TRANS: Indicator in group members list that this user is a group administrator.
-#: actions/groupmembers.php:190
+#: actions/groupmembers.php:190 lib/action.php:581
 msgid "Admin"
 msgstr "Admin"
 
@@ -3107,8 +3140,10 @@ msgid "Group search"
 msgstr "Cerca de grups"
 
 #. TRANS: Text on page where groups can be searched if no results were found for a query.
-#: actions/groupsearch.php:82 actions/noticesearch.php:117
-#: actions/peoplesearch.php:83
+#. TRANS: Text for notice search results is the query had no results.
+#. TRANS: Message on the "People search" page where a query has no results.
+#: actions/groupsearch.php:82 actions/noticesearch.php:122
+#: actions/peoplesearch.php:87
 msgid "No results."
 msgstr "Cap resultat."
 
@@ -3145,161 +3180,171 @@ msgid "User is not blocked from group."
 msgstr "L'usuari no està blocat del grup."
 
 #. TRANS: Server error displayed when unblocking a user from a group fails because of an unknown error.
+#. TRANS: Server error displayed when removing a user block.
 #: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "S'ha produït un error en eliminar el bloc."
 
 #. TRANS: Title for Instant Messaging settings.
-#: actions/imsettings.php:58
+#: actions/imsettings.php:56
 msgid "IM settings"
 msgstr "Paràmetres de missatgeria instantània"
 
 #. 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.
-#: actions/imsettings.php:71
-#, php-format
+#: actions/imsettings.php:69
+#, fuzzy, php-format
 msgid ""
-"You can send and receive notices through Jabber/Google Talk [instant "
-"messages](%%doc.im%%). Configure your address and settings below."
+"You can send and receive notices through instant messaging [instant messages]"
+"(%%doc.im%%). Configure your addresses and settings below."
 msgstr ""
 "Podeu enviar i rebre avisos a través de [missatges instantanis](%%doc.im%%) "
 "de Jabber/GTalk. Configureu la vostra adreça i opcions a continuació."
 
-#. TRANS: Message given in the Instant Messaging settings if XMPP is not enabled on the site.
+#. TRANS: Message given in the IM settings if IM is not enabled on the site.
 #: actions/imsettings.php:90
 msgid "IM is not available."
 msgstr "La MI no és disponible."
 
-#. TRANS: Form legend for Instant Messaging settings form.
-#. TRANS: Field label for Instant Messaging address input in Instant Messaging settings form.
-#: actions/imsettings.php:102 actions/imsettings.php:132
-msgid "IM address"
-msgstr "Adreça de missatgeria instantània"
+#: actions/imsettings.php:116
+#, fuzzy, php-format
+msgid "Current confirmed %s address."
+msgstr "Adreça electrònica confirmada actualment."
 
-#: actions/imsettings.php:109
-msgid "Current confirmed Jabber/Google Talk address."
-msgstr "Adreça actual Jabber/Gtalk confirmada."
-
-#. TRANS: Form note in Instant Messaging settings form.
-#. TRANS: %s is the Instant Messaging address set for the site.
-#: actions/imsettings.php:120
-#, php-format
+#. TRANS: Form note in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:128
+#, fuzzy, php-format
 msgid ""
-"Awaiting confirmation on this address. Check your Jabber/Google Talk account "
-"for a message with further instructions. (Did you add %s to your buddy list?)"
+"Awaiting confirmation on this address. Check your %s account for a message "
+"with further instructions. (Did you add %s to your buddy list?)"
 msgstr ""
 "A l'espera d'una confirmació per a aquesta adreça. Reviseu al vostre compte "
 "de Jabber/GTalk si hi ha un missatge amb més instruccions. (Heu afegit a %s "
 "a la llista d'amics?)"
 
-#. TRANS: IM address input field instructions in Instant Messaging settings form.
-#. TRANS: %s is the Instant Messaging address set for the site.
-#. TRANS: Do not translate "example.org". It is one of the domain names reserved for use in examples by
-#. TRANS: http://www.rfc-editor.org/rfc/rfc2606.txt. Any other domain may be owned by a legitimate
-#. TRANS: person or organization.
-#: actions/imsettings.php:139
-#, php-format
-msgid ""
-"Jabber or Google Talk address, like \"UserName@example.org\". First, make "
-"sure to add %s to your buddy list in your IM client or on Google Talk."
-msgstr ""
-"Adreça Jabber o GTalk, per exemple «NomUsuari@example.org». Primer, assegureu-"
-"vos d'afegir %s a la vostra llista d'amics en el vostre client de "
-"missatgeria instantània o al GTalk."
+#: actions/imsettings.php:140
+msgid "IM address"
+msgstr "Adreça de missatgeria instantània"
 
-#. TRANS: Form legend for Instant Messaging preferences form.
-#: actions/imsettings.php:154
-msgid "IM preferences"
+#: actions/imsettings.php:142
+#, php-format
+msgid "%s screenname."
+msgstr ""
+
+#. TRANS: Header for IM preferences form.
+#: actions/imsettings.php:163
+#, fuzzy
+msgid "IM Preferences"
 msgstr "Preferències de MI"
 
-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:159
-msgid "Send me notices through Jabber/Google Talk."
-msgstr "Envia'm avisos per Jabber/GTalk."
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:174
+#, fuzzy
+msgid "Send me notices"
+msgstr "Envia un avís"
 
-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:165
-msgid "Post a notice when my Jabber/Google Talk status changes."
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:176
+#, fuzzy
+msgid "Post a notice when my status changes."
 msgstr "Envia un avís quan el meu estat Jabber/GTalk canviï."
 
-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:171
-msgid ""
-"Send me replies through Jabber/Google Talk from people I'm not subscribed to."
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:178
+#, fuzzy
+msgid "Send me replies from people I'm not subscribed to."
 msgstr ""
 "Envia'm respostes a través de Jabber/GTalk de la gent a la que no estic "
 "subscrita."
 
-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:178
-msgid "Publish a MicroID for my Jabber/Google Talk address."
-msgstr "Publica una MicroID per a la meva adreça de Jabber/GTalk."
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:181
+#, fuzzy
+msgid "Publish a MicroID"
+msgstr "Publica una MicroID per al meu correu electrònic."
 
-#. TRANS: Confirmation message for successful Instant Messaging preferences save.
-#: actions/imsettings.php:283 actions/othersettings.php:192
+#. TRANS: Server error thrown on database error updating IM preferences.
+#: actions/imsettings.php:291
+#, fuzzy
+msgid "Couldn't update IM preferences."
+msgstr "No s'ha pogut actualitzar l'usuari."
+
+#. TRANS: Confirmation message for successful IM preferences save.
+#. TRANS: Confirmation message after saving preferences.
+#: actions/imsettings.php:298 actions/urlsettings.php:244
 msgid "Preferences saved."
 msgstr "S'han desat les preferències."
 
-#. TRANS: Message given saving Instant Messaging address without having provided one.
-#: actions/imsettings.php:304
-msgid "No Jabber ID."
-msgstr "Cap Jabber ID."
+#. TRANS: Message given saving IM address without having provided one.
+#: actions/imsettings.php:320
+#, fuzzy
+msgid "No screenname."
+msgstr "Cap sobrenom."
 
-#. TRANS: Message given saving Instant Messaging address that cannot be normalised.
-#: actions/imsettings.php:312
-msgid "Cannot normalize that Jabber ID."
+#: actions/imsettings.php:325
+#, fuzzy
+msgid "No transport."
+msgstr "Cap avís."
+
+#. TRANS: Message given saving IM address that cannot be normalised.
+#: actions/imsettings.php:333
+#, fuzzy
+msgid "Cannot normalize that screenname"
 msgstr "No es pot normalitzar aquest Jabber ID."
 
-#. TRANS: Message given saving Instant Messaging address that not valid.
-#: actions/imsettings.php:317
-msgid "Not a valid Jabber ID."
-msgstr "No és un ID de Jabber vàlid."
+#. TRANS: Message given saving IM address that not valid.
+#: actions/imsettings.php:340
+#, fuzzy
+msgid "Not a valid screenname"
+msgstr "Sobrenom no vàlid."
 
-#. TRANS: Message given saving Instant Messaging address that is already set.
-#: actions/imsettings.php:321
-msgid "That is already your Jabber ID."
-msgstr "Aquest ja és el teu Jabber ID."
-
-#. TRANS: Message given saving Instant Messaging address that is already set for another user.
-#: actions/imsettings.php:325
-msgid "Jabber ID already belongs to another user."
+#. TRANS: Message given saving IM address that is already set for another user.
+#: actions/imsettings.php:344
+#, fuzzy
+msgid "Screenname already belongs to another user."
 msgstr "Aquest Jabber ID ja està sent utilitzat per un altre usuari."
 
-#. TRANS: Message given saving valid Instant Messaging address that is to be confirmed.
-#. TRANS: %s is the Instant Messaging address set for the site.
-#: actions/imsettings.php:353
-#, php-format
-msgid ""
-"A confirmation code was sent to the IM address you added. You must approve %"
-"s for sending messages to you."
+#. TRANS: Message given saving valid IM address that is to be confirmed.
+#: actions/imsettings.php:369
+#, fuzzy
+msgid "A confirmation code was sent to the IM address you added."
 msgstr ""
 "S'ha enviat un codi de confirmació a l'adreça de missatgeria instantània que "
 "heu afegit. Heu d'acceptar que %s us pugui enviar missatges."
 
-#. TRANS: Message given canceling Instant Messaging address confirmation for the wrong IM address.
-#: actions/imsettings.php:382
+#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#: actions/imsettings.php:396
 msgid "That is the wrong IM address."
 msgstr "Aquesta adreça de missatgeria instantània és incorrecta."
 
-#. TRANS: Server error thrown on database error canceling Instant Messaging address confirmation.
-#: actions/imsettings.php:391
-msgid "Could not delete IM confirmation."
+#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#: actions/imsettings.php:405
+#, fuzzy
+msgid "Couldn't delete confirmation."
 msgstr "No s'ha pogut eliminar la confirmació de MI."
 
-#. TRANS: Message given after successfully canceling Instant Messaging address confirmation.
-#: actions/imsettings.php:396
+#. TRANS: Message given after successfully canceling IM address confirmation.
+#: actions/imsettings.php:410
 msgid "IM confirmation cancelled."
 msgstr "S'ha cancel·lat la confirmació de MI."
 
-#. TRANS: Message given trying to remove an Instant Messaging address that is not
+#. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.
-#: actions/imsettings.php:417
-msgid "That is not your Jabber ID."
-msgstr "Aquest no és el teu Jabber ID."
+#: actions/imsettings.php:434
+#, fuzzy
+msgid "That is not your screenname."
+msgstr "Aquest no és el teu número de telèfon."
+
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#: actions/imsettings.php:443
+#, fuzzy
+msgid "Couldn't update user im prefs."
+msgstr "No s'ha pogut actualitzar el registre de l'usuari."
 
 #. TRANS: Message given after successfully removing a registered Instant Messaging address.
-#: actions/imsettings.php:440
+#: actions/imsettings.php:451
 msgid "The IM address was removed."
 msgstr "S'ha eliminat l'adreça de MI."
 
@@ -3512,7 +3557,7 @@ msgid "You must be logged in to join a group."
 msgstr "Heu d'haver iniciat una sessió per unir-vos a un grup."
 
 #. TRANS: Title for join group page after joining.
-#: actions/joingroup.php:147
+#: actions/joingroup.php:148
 #, php-format
 msgctxt "TITLE"
 msgid "%1$s joined group %2$s"
@@ -3642,7 +3687,7 @@ msgstr "URL de la imatge que es mostrarà juntament amb la llicència."
 #. TRANS: Submit button title.
 #: actions/licenseadminpanel.php:311 actions/sessionsadminpanel.php:199
 #: actions/siteadminpanel.php:292 actions/snapshotadminpanel.php:245
-#: actions/tagother.php:154 lib/applicationeditform.php:357
+#: actions/tagother.php:133 lib/applicationeditform.php:357
 msgid "Save"
 msgstr "Desa"
 
@@ -3650,43 +3695,45 @@ msgstr "Desa"
 msgid "Save license settings"
 msgstr "Desa els paràmetres de la llicència"
 
-#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
+#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
+#: actions/login.php:97 actions/otp.php:62 actions/register.php:130
 msgid "Already logged in."
 msgstr "Ja hi heu iniciat una sessió."
 
-#: actions/login.php:148
+#: actions/login.php:125
 msgid "Incorrect username or password."
 msgstr "Nom d'usuari o contrasenya incorrectes."
 
-#: actions/login.php:154 actions/otp.php:120
+#. TRANS: Server error displayed when a user object could not be created trying to login using "one time password login".
+#: actions/login.php:131 actions/otp.php:127
 msgid "Error setting user. You are probably not authorized."
 msgstr ""
 "S'ha produït un error en definir l'usuari. Probablement no hi esteu "
 "autoritzat."
 
-#: actions/login.php:210 actions/login.php:263
+#: actions/login.php:185 actions/login.php:236 lib/action.php:598
 msgid "Login"
 msgstr "Inici de sessió"
 
-#: actions/login.php:249
+#: actions/login.php:222
 msgid "Login to site"
 msgstr "Accedir al lloc"
 
-#: actions/login.php:258 actions/register.php:490
+#: actions/login.php:231 actions/register.php:469
 msgid "Remember me"
 msgstr "Recorda'm"
 
-#: actions/login.php:259 actions/register.php:492
+#: actions/login.php:232 actions/register.php:471
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 "Inicia la sessió automàticament en el futur; no ho activeu en ordinadors "
 "compartits!"
 
-#: actions/login.php:269
+#: actions/login.php:241
 msgid "Lost or forgotten password?"
 msgstr "Contrasenya oblidada o perduda?"
 
-#: actions/login.php:288
+#: actions/login.php:259
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -3694,11 +3741,11 @@ msgstr ""
 "Per raons de seguretat, torneu a escriure el vostre nom d'usuari i "
 "contrasenya abans de canviar la vostra configuració."
 
-#: actions/login.php:292
+#: actions/login.php:263
 msgid "Login with your username and password."
 msgstr "Inicieu una sessió amb nom d'usuari i contrasenya"
 
-#: actions/login.php:295
+#: actions/login.php:266
 #, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -3823,7 +3870,9 @@ msgstr "Nou avís"
 msgid "Notice posted"
 msgstr "S'ha publicat l'avís"
 
-#: actions/noticesearch.php:68
+#. TRANS: Instructions for Notice search page.
+#. TRANS: %%site.name%% is the name of the StatusNet site.
+#: actions/noticesearch.php:69
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -3832,16 +3881,21 @@ msgstr ""
 "Troba avisos a %%site.name%% per contingut. Separa els termes de cerca amb "
 "espais; han de ser majors a 3 caràcters."
 
-#: actions/noticesearch.php:78
+#. TRANS: Title of the page where users can search for notices.
+#: actions/noticesearch.php:80
 msgid "Text search"
 msgstr "Cerca de text"
 
-#: actions/noticesearch.php:91
+#. TRANS: Test in RSS notice search.
+#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
+#: actions/noticesearch.php:95
 #, php-format
 msgid "Search results for \"%1$s\" on %2$s"
 msgstr "Cerca els resultats de «%s» a %s"
 
-#: actions/noticesearch.php:121
+#. TRANS: Text for logged in users making a query for notices without results.
+#. TRANS: This message contains a Markdown link.
+#: actions/noticesearch.php:128
 #, php-format
 msgid ""
 "Be the first to [post on this topic](%%%%action.newnotice%%%%?"
@@ -3850,7 +3904,9 @@ msgstr ""
 "Sigueu el primer en [enviar sobre aquest tema](%%%%action.newnotice%%%%?"
 "status_textarea=%s)!"
 
-#: actions/noticesearch.php:124
+#. TRANS: Text for not logged in users making a query for notices without results.
+#. TRANS: This message contains Markdown links.
+#: actions/noticesearch.php:133
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and be the first to "
@@ -3859,14 +3915,17 @@ msgstr ""
 "Per què no [registreu un compte](%%%%action.register%%%%) i sou el primer "
 "[en parlar del tema](%%%%action.newnotice%%%%?status_textarea=%s)!"
 
-#: actions/noticesearchrss.php:96
+#. TRANS: RSS notice search feed title. %s is the query.
+#: actions/noticesearchrss.php:95
 #, php-format
 msgid "Updates with \"%s\""
 msgstr "Actualitzacions amb «%s»"
 
-#: actions/noticesearchrss.php:98
-#, fuzzy, php-format
-msgid "Updates matching search term \"%1$s\" on %2$s!"
+#. TRANS: RSS notice search feed description.
+#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
+#: actions/noticesearchrss.php:99
+#, php-format
+msgid "Updates matching search term \"%1$s\" on %2$s."
 msgstr ""
 "Les actualitzacions que coincideixen amb el terme de cerca «%1$s» el %2$s."
 
@@ -3887,51 +3946,51 @@ msgid "Nudge sent!"
 msgstr "S'ha cridat l'atenció!"
 
 #. TRANS: Message displayed to an anonymous user trying to view OAuth application list.
-#: actions/oauthappssettings.php:60
+#: actions/oauthappssettings.php:57
 msgid "You must be logged in to list your applications."
 msgstr "Heu d'haver iniciat una sessió per llistar les vostres aplicacions."
 
 #. TRANS: Page title for OAuth applications
-#: actions/oauthappssettings.php:76
+#: actions/oauthappssettings.php:73
 msgid "OAuth applications"
 msgstr "Aplicacions OAuth"
 
 #. TRANS: Page instructions for OAuth applications
-#: actions/oauthappssettings.php:88
+#: actions/oauthappssettings.php:85
 msgid "Applications you have registered"
 msgstr "Aplicacions que heu registrat"
 
 #. TRANS: Empty list message on page with OAuth applications.
-#: actions/oauthappssettings.php:141
+#: actions/oauthappssettings.php:138
 #, php-format
 msgid "You have not registered any applications yet."
 msgstr "No teniu cap aplicació registrada encara."
 
 #. TRANS: Title for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:71
+#: actions/oauthconnectionssettings.php:69
 msgid "Connected applications"
 msgstr "Aplicacions connectades"
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:83
+#: actions/oauthconnectionssettings.php:80
 msgid "The following connections exist for your account."
 msgstr "Les connexions següents existeixen per al vostre compte."
 
 #. TRANS: Client error when trying to revoke access for an application while not being a user of it.
-#: actions/oauthconnectionssettings.php:168
+#: actions/oauthconnectionssettings.php:165
 msgid "You are not a user of that application."
 msgstr "No sou usuari de l'aplicació."
 
 #. TRANS: Client error when revoking access has failed for some reason.
 #. TRANS: %s is the application ID revoking access failed for.
-#: actions/oauthconnectionssettings.php:183
+#: actions/oauthconnectionssettings.php:180
 #, php-format
 msgid "Unable to revoke access for application: %s."
 msgstr "No s'ha pogut revocar l'accés de l'aplicació: %s"
 
 #. TRANS: Success message after revoking access for an application.
 #. TRANS: %1$s is the application name, %2$s is the first part of the user token.
-#: actions/oauthconnectionssettings.php:202
+#: actions/oauthconnectionssettings.php:199
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -3941,14 +4000,14 @@ msgstr ""
 "2$s."
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:213
+#: actions/oauthconnectionssettings.php:210
 msgid "You have not authorized any applications to use your account."
 msgstr "No heu autoritzat cap aplicació perquè utilitzi el vostre compte."
 
 #. TRANS: Note for developers in the OAuth connection settings form.
 #. TRANS: This message contains a Markdown link. Do not separate "](".
 #. TRANS: %s is the URL to the OAuth settings.
-#: actions/oauthconnectionssettings.php:233
+#: actions/oauthconnectionssettings.php:230
 #, php-format
 msgid ""
 "Are you a developer? [Register an OAuth client application](%s) to use with "
@@ -3957,6 +4016,16 @@ msgstr ""
 "Sou un desenvolupador? [Registreu una aplicació de client OAuth](%s) per "
 "utilitzar-la amb una instància de l'StatusNet."
 
+#: actions/oembed.php:64
+#, php-format
+msgid "\"%s\" not found."
+msgstr "No s'ha trobat «%s»."
+
+#: actions/oembed.php:76
+#, php-format
+msgid "Notice %s not found."
+msgstr "No s'ha trobat l'avís «%s»."
+
 #: actions/oembed.php:80 actions/shownotice.php:100
 msgid "Notice has no profile."
 msgstr "L'avís no té cap perfil."
@@ -3966,6 +4035,16 @@ msgstr "L'avís no té cap perfil."
 msgid "%1$s's status on %2$s"
 msgstr "estat de %1$s a %2$s"
 
+#: actions/oembed.php:95
+#, php-format
+msgid "Attachment %s not found."
+msgstr "No s'ha trobat l'adjunció %s."
+
+#: actions/oembed.php:136
+#, php-format
+msgid "\"%s\" not supported for oembed requests."
+msgstr "No es permet «%s» per a sol·licituds oembed."
+
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
 #: actions/oembed.php:168
 #, php-format
@@ -3979,94 +4058,60 @@ msgid "Only %s URLs over plain HTTP please."
 msgstr "Si us plau, només URL %s sobre HTTP pla."
 
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1205
-#: lib/apiaction.php:1232 lib/apiaction.php:1367
+#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1207
+#: lib/apiaction.php:1234 lib/apiaction.php:1369
 msgid "Not a supported data format."
 msgstr "Format de data no suportat."
 
+#. TRANS: ShortName in the OpenSearch interface when trying to find users.
 #: actions/opensearch.php:64
 msgid "People Search"
 msgstr "Cerca de gent"
 
-#: actions/opensearch.php:67
+#: actions/opensearch.php:68
 msgid "Notice Search"
 msgstr "Cerca d'avisos"
 
-#: actions/othersettings.php:59
-msgid "Other settings"
-msgstr "Altres paràmetres"
-
-#. TRANS: Instructions for tab "Other" in user profile settings.
-#: actions/othersettings.php:71
-msgid "Manage various other options."
-msgstr "Gestiona altres opcions diferents."
-
-#. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
-#. TRANS: user's profile settings. Use of "free" is as in "open", indicating that the
-#. TRANS: information on the shortener site is freely distributable.
-#. TRANS: This message has one space at the beginning. Use your language's word separator
-#. TRANS: here if it has one (most likely a single space).
-#: actions/othersettings.php:113
-msgid " (free service)"
-msgstr " (servei lliure)"
-
-#. TRANS: Label for dropdown with URL shortener services.
-#: actions/othersettings.php:122
-msgid "Shorten URLs with"
-msgstr "Escurça els URL amb"
-
-#. TRANS: Tooltip for for dropdown with URL shortener services.
-#: actions/othersettings.php:124
-msgid "Automatic shortening service to use."
-msgstr "Servei d'auto-escurçament a utilitzar."
-
-#. TRANS: Label for checkbox.
-#: actions/othersettings.php:130
-msgid "View profile designs"
-msgstr "Visualitza els dissenys de perfil"
-
-#. TRANS: Tooltip for checkbox.
-#: actions/othersettings.php:132
-msgid "Show or hide profile designs."
-msgstr "Mostra o amaga els dissenys de perfil."
-
-#. TRANS: Form validation error for form "Other settings" in user profile.
-#: actions/othersettings.php:164
-msgid "URL shortening service is too long (maximum 50 characters)."
-msgstr ""
-"El servei d'autoescurçament d'URL és massa llarga (màxim 50 caràcters)."
-
-#: actions/otp.php:69
+#. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
+#: actions/otp.php:70
 msgid "No user ID specified."
 msgstr "No s'ha especificat cap ID d'usuari."
 
-#: actions/otp.php:83
+#. TRANS: Client error displayed trying to use "one time password login" without specifying a login token.
+#: actions/otp.php:86
 msgid "No login token specified."
 msgstr "No s'ha especificat cap testimoni d'inici de sessió."
 
-#: actions/otp.php:90
+#. TRANS: Client error displayed trying to use "one time password login" without requesting a login token.
+#: actions/otp.php:94
 msgid "No login token requested."
 msgstr "No s'ha sol·licitat cap testimoni d'inici de sessió."
 
-#: actions/otp.php:95
+#. TRANS: Client error displayed trying to use "one time password login" while specifying an invalid login token.
+#: actions/otp.php:100
 msgid "Invalid login token specified."
 msgstr "No s'ha especificat un testimoni d'inici de sessió vàlid."
 
-#: actions/otp.php:104
+#. TRANS: Client error displayed trying to use "one time password login" while specifying an expired login token.
+#: actions/otp.php:110
 msgid "Login token expired."
 msgstr "El testimoni d'inici de sessió ha vençut."
 
-#: actions/outbox.php:58
+#. TRANS: Title for outbox for any but the fist page.
+#. TRANS: %1$s is the user nickname, %2$d is the page number.
+#: actions/outbox.php:57
 #, php-format
 msgid "Outbox for %1$s - page %2$d"
 msgstr "Safata de sortida de %1$s - pàgina %2$d"
 
+#. TRANS: Title for first page of outbox.
 #: actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
 msgstr "Safata de sortida per %s"
 
-#: actions/outbox.php:104
+#. TRANS: Instructions for outbox.
+#: actions/outbox.php:103
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr ""
 "Aquesta és la teva safata de sortida, que et mostrarà els missatges privats "
@@ -4094,43 +4139,42 @@ msgstr "Antiga contrasenya"
 msgid "New password"
 msgstr "Nova contrasenya"
 
-#: actions/passwordsettings.php:109
-#, fuzzy
-msgid "6 or more characters"
+#: actions/passwordsettings.php:109 actions/register.php:416
+msgid "6 or more characters."
 msgstr "6 o més caràcters."
 
-#: actions/passwordsettings.php:113
-#, fuzzy
-msgid "Same as password above"
+#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#: actions/passwordsettings.php:113 actions/recoverpassword.php:264
+#: actions/register.php:420
+msgid "Same as password above."
 msgstr "Igual que la contrasenya de dalt"
 
 #: actions/passwordsettings.php:117
 msgid "Change"
 msgstr "Canvia"
 
-#: actions/passwordsettings.php:154 actions/register.php:238
+#: actions/passwordsettings.php:153 actions/register.php:223
 msgid "Password must be 6 or more characters."
 msgstr "La contrasenya hauria de ser d'entre 6 a més caràcters."
 
-#: actions/passwordsettings.php:157 actions/register.php:241
+#: actions/passwordsettings.php:156 actions/register.php:226
 msgid "Passwords don't match."
 msgstr "Les contrasenyes no coincideixen."
 
-#: actions/passwordsettings.php:165
+#: actions/passwordsettings.php:164
 msgid "Incorrect old password"
 msgstr "Contrasenya antiga incorrecta"
 
-#: actions/passwordsettings.php:181
+#: actions/passwordsettings.php:180
 msgid "Error saving user; invalid."
 msgstr "S'ha produït un error en desar l'usuari; no és vàlid."
 
-#: actions/passwordsettings.php:186
-#, fuzzy
-msgid "Can't save new password."
+#. TRANS: Reset password form validation error message.
+#: actions/passwordsettings.php:185 actions/recoverpassword.php:418
+msgid "Cannot save new password."
 msgstr "No es pot desar la nova contrasenya."
 
-#. TRANS: Title for password recovery page in password saved mode.
-#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
+#: actions/passwordsettings.php:191
 msgid "Password saved."
 msgstr "Contrasenya guardada."
 
@@ -4335,8 +4379,7 @@ msgid "Directory where backgrounds are located."
 msgstr "Directori on es troben els fons."
 
 #. TRANS: Fieldset legens in Paths admin panel.
-#. TRANS: DT element label in attachment list.
-#: actions/pathsadminpanel.php:419 lib/attachmentlist.php:98
+#: actions/pathsadminpanel.php:419
 msgid "Attachments"
 msgstr "Adjuncions"
 
@@ -4404,7 +4447,9 @@ msgstr "Servidor on dirigir les sol·licituds SSL."
 msgid "Save paths"
 msgstr "Desa els camins"
 
-#: actions/peoplesearch.php:52
+#. TRANS: Instructions for the "People search" page.
+#. TRANS: %%site.name%% is the name of the StatusNet site.
+#: actions/peoplesearch.php:54
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
@@ -4413,7 +4458,8 @@ msgstr ""
 "Troba gent a %%site.name%% per nom, ubicació o interessos. Separa els termes "
 "de cerca amb espais; han de ser majors a 3 caràcters."
 
-#: actions/peoplesearch.php:58
+#. TRANS: Title of a page where users can search for other users.
+#: actions/peoplesearch.php:61
 msgid "People search"
 msgstr "Cerca de gent"
 
@@ -4427,6 +4473,60 @@ msgstr "No és una etiqueta de gent vàlida: %s"
 msgid "Users self-tagged with %1$s - page %2$d"
 msgstr "Usuaris que s'han etiquetat amb %1$s - pàgina %2$d"
 
+#. TRANS: Page title for AJAX form return when a disabling a plugin.
+#: actions/plugindisable.php:69
+msgctxt "plugin"
+msgid "Disabled"
+msgstr ""
+
+#. TRANS: Client error displayed trying to perform any request method other than POST.
+#. TRANS: Do not translate POST.
+#: actions/pluginenable.php:78 actions/subscribe.php:77
+msgid "This action only accepts POST requests."
+msgstr "Aquesta acció només accepta sol·licituds POST."
+
+#: actions/pluginenable.php:102
+#, fuzzy
+msgid "You cannot administer plugins."
+msgstr "No podeu eliminar els usuaris."
+
+#: actions/pluginenable.php:109
+#, fuzzy
+msgid "No such plugin."
+msgstr "No existeix la pàgina."
+
+#. TRANS: Page title for AJAX form return when enabling a plugin.
+#: actions/pluginenable.php:159
+msgctxt "plugin"
+msgid "Enabled"
+msgstr ""
+
+#. TRANS: Tab and title for plugins admin panel.
+#. TRANS: Menu item for site administration
+#: actions/pluginsadminpanel.php:56 actions/version.php:191
+#: lib/adminpanelaction.php:411
+msgid "Plugins"
+msgstr "Connectors"
+
+#. TRANS: Instructions at top of plugin admin page.
+#: actions/pluginsadminpanel.php:68
+msgid ""
+"Additional plugins can be enabled and configured manually. See the <a href="
+"\"http://status.net/wiki/Plugins\">online plugin documentation</a> for more "
+"details."
+msgstr ""
+
+#. TRANS: Admin form section header
+#: actions/pluginsadminpanel.php:84
+#, fuzzy
+msgid "Default plugins"
+msgstr "Llengua per defecte"
+
+#: actions/pluginsadminpanel.php:106
+msgid ""
+"All default plugins have been disabled from the site's configuration file."
+msgstr ""
+
 #: actions/postnotice.php:95
 msgid "Invalid notice content."
 msgstr "El contingut de l'avís no és vàlid."
@@ -4439,12 +4539,12 @@ msgstr ""
 "lloc."
 
 #. TRANS: Page title for profile settings.
-#: actions/profilesettings.php:59
+#: actions/profilesettings.php:60
 msgid "Profile settings"
 msgstr "Configuració del perfil"
 
 #. TRANS: Usage instructions for profile settings.
-#: actions/profilesettings.php:70
+#: actions/profilesettings.php:71
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
@@ -4452,41 +4552,38 @@ msgstr ""
 "pugui conèixer millor."
 
 #. TRANS: Profile settings form legend.
-#: actions/profilesettings.php:98
+#: actions/profilesettings.php:99
 msgid "Profile information"
 msgstr "Informació del perfil"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109 actions/register.php:433
+#: actions/profilesettings.php:110 actions/register.php:412
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr ""
 "1-64 lletres en minúscula o nombres, sense signes de puntuació o espais."
 
 #. TRANS: Field label in form for profile settings.
-#. TRANS: Label for full group name (dt). Text hidden by default.
-#. TRANS: DT for full name in a profile.
-#: actions/profilesettings.php:113 actions/register.php:455
-#: actions/showgroup.php:255 actions/tagother.php:104
-#: lib/groupeditform.php:150 lib/userprofile.php:156
+#: actions/profilesettings.php:114 actions/register.php:434
+#: lib/groupeditform.php:150
 msgid "Full name"
 msgstr "Nom complet"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:118 actions/register.php:460
+#: actions/profilesettings.php:119 actions/register.php:439
 #: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "Pàgina personal"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:121
+#: actions/profilesettings.php:122 actions/register.php:441
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr "URL del vostre web, blog o perfil en un altre lloc."
 
 #. TRANS: Tooltip for field label in form for profile settings. Plural
 #. TRANS: is decided by the number of characters available for the
 #. TRANS: biography (%d).
-#: actions/profilesettings.php:129 actions/register.php:471
+#: actions/profilesettings.php:130 actions/register.php:450
 #, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4494,79 +4591,72 @@ msgstr[0] "Descriviu qui sou i els vostres interessos en %d caràcter"
 msgstr[1] "Descriviu qui sou i els vostres interessos en %d caràcters"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:135 actions/register.php:476
+#: actions/profilesettings.php:136 actions/register.php:455
 msgid "Describe yourself and your interests"
 msgstr "Feu una descripció personal i interessos"
 
 #. TRANS: Text area label in form for profile settings where users can provide.
 #. TRANS: their biography.
-#: actions/profilesettings.php:139 actions/register.php:478
+#: actions/profilesettings.php:140 actions/register.php:457
 msgid "Bio"
 msgstr "Biografia"
 
 #. TRANS: Field label in form for profile settings.
-#. TRANS: Label for group location (dt). Text hidden by default.
-#. TRANS: DT for location in a profile.
-#: actions/profilesettings.php:145 actions/register.php:483
-#: actions/showgroup.php:265 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:173
-#: lib/userprofile.php:172
+#: actions/profilesettings.php:146 actions/register.php:462
+#: lib/groupeditform.php:173
 msgid "Location"
 msgstr "Ubicació"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148 actions/register.php:485
+#: actions/profilesettings.php:149
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "On us trobeu, per exemple «ciutat, comarca (o illa), país»"
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:153
+#: actions/profilesettings.php:154
 msgid "Share my current location when posting notices"
 msgstr "Comparteix la ubicació on estic en enviar avisos"
 
 #. TRANS: Field label in form for profile settings.
-#. TRANS: DT for tags in a profile.
-#: actions/profilesettings.php:161 actions/tagother.php:149
-#: actions/tagother.php:209 lib/subscriptionlist.php:106
-#: lib/subscriptionlist.php:108 lib/userprofile.php:220
+#: actions/profilesettings.php:162 actions/tagother.php:128
+#: actions/tagother.php:188 lib/subscriptionlist.php:104
+#: lib/subscriptionlist.php:106
 msgid "Tags"
 msgstr "Etiquetes"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:164
-#, fuzzy
+#: actions/profilesettings.php:165
 msgid ""
-"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- "
+"separated."
 msgstr ""
 "Etiquetes pròpies (lletres, nombres, -, ., i _), per comes o separades amb "
 "espais."
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:169
+#: actions/profilesettings.php:170
 msgid "Language"
 msgstr "Llengua"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:171
-#, fuzzy
-msgid "Preferred language"
+#: actions/profilesettings.php:172
+msgid "Preferred language."
 msgstr "Llengua preferida."
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:181
+#: actions/profilesettings.php:182
 msgid "Timezone"
 msgstr "Fus horari"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:183
+#: actions/profilesettings.php:184
 msgid "What timezone are you normally in?"
 msgstr "En quin fus horari us trobeu normalment?"
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:189
-#, fuzzy
+#: actions/profilesettings.php:190
 msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)"
+"Automatically subscribe to whoever subscribes to me (best for non-humans)."
 msgstr ""
 "Subscriu automàticament a qualsevol qui em tingui subscrit (ideal per no-"
 "humans)"
@@ -4574,7 +4664,7 @@ msgstr ""
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Plural form is used based on the maximum number of allowed
 #. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:258 actions/register.php:229
+#: actions/profilesettings.php:259 actions/register.php:214
 #, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4582,47 +4672,47 @@ msgstr[0] "La biografia és massa llarga (màx. %d caràcter)."
 msgstr[1] "La biografia és massa llarga (màx. %d caràcters)."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:269 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:270 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr "No s'ha seleccionat el fus horari."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:277
+#: actions/profilesettings.php:278
 msgid "Language is too long (maximum 50 characters)."
 msgstr "La llengua és massa llarga (màxim 50 caràcters)."
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:291 actions/tagother.php:178
+#: actions/profilesettings.php:292
 #, php-format
-msgid "Invalid tag: \"%s\""
-msgstr "L'etiqueta no és vàlida: «%s»"
+msgid "Invalid tag: \"%s\"."
+msgstr "Etiqueta no vàlida: «%s»."
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:347
+#: actions/profilesettings.php:348
 msgid "Could not update user for autosubscribe."
 msgstr "No es pot actualitzar l'usuari per autosubscriure."
 
 #. TRANS: Server error thrown when user profile location preference settings could not be updated.
-#: actions/profilesettings.php:405
+#: actions/profilesettings.php:406
 msgid "Could not save location prefs."
 msgstr "No s'han pogut desar les preferències d'ubicació."
 
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:427 actions/tagother.php:200
+#: actions/profilesettings.php:428 actions/tagother.php:179
 msgid "Could not save tags."
 msgstr "No s'han pogut guardar les etiquetes."
 
 #. TRANS: Confirmation shown when user profile settings are saved.
 #. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:436 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:437 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "S'ha desat la configuració."
 
 #. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
 #. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:483 actions/restoreaccount.php:60
+#: actions/profilesettings.php:484 actions/restoreaccount.php:60
 msgid "Restore account"
 msgstr "Restaura el compte"
 
@@ -4700,6 +4790,12 @@ 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: Public RSS feed description. %s is the StatusNet site name.
+#: actions/publicrss.php:106
+#, php-format
+msgid "%s updates from everyone."
+msgstr "%s actualitzacions de tothom."
+
 #. TRANS: Title for public tag cloud.
 #: actions/publictagcloud.php:57
 msgid "Public tag cloud"
@@ -4742,10 +4838,6 @@ msgstr ""
 "Per què no hi [registreu un compte](%%action.register%%) i sou el primer en "
 "escriure'n un!"
 
-#: actions/publictagcloud.php:146
-msgid "Tag cloud"
-msgstr "Núvol d'etiquetes"
-
 #. TRANS: Client error displayed trying to recover password while already logged in.
 #: actions/recoverpassword.php:37
 msgid "You are already logged in!"
@@ -4838,6 +4930,11 @@ msgstr "Recupera la contrasenya"
 msgid "Password recovery requested"
 msgstr "Recuperació de contrasenya sol·licitada"
 
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/recoverpassword.php:229
+msgid "Password saved"
+msgstr "Contrasenya desada"
+
 #. TRANS: Title for password recovery page when an unknown action has been specified.
 #: actions/recoverpassword.php:232
 msgid "Unknown action"
@@ -4848,14 +4945,9 @@ msgstr "Acció desconeguda"
 msgid "6 or more characters, and do not forget it!"
 msgstr "6 o més caràcters, i no ho oblideu!"
 
-#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
-#: actions/recoverpassword.php:264 actions/register.php:441
-msgid "Same as password above."
-msgstr "Igual que la contrasenya de dalt"
-
 #. TRANS: Button text for password reset form.
 #. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: actions/recoverpassword.php:268 lib/designsettings.php:264
+#: actions/recoverpassword.php:268 lib/designform.php:145
 msgctxt "BUTTON"
 msgid "Reset"
 msgstr "Reinicialitza"
@@ -4904,13 +4996,8 @@ msgstr "La contrasenya ha de tenir 6 o més caràcters."
 msgid "Password and confirmation do not match."
 msgstr "La contrasenya i la confirmació no coincideixen."
 
-#. TRANS: Reset password form validation error message.
-#: actions/recoverpassword.php:418
-msgid "Cannot save new password."
-msgstr "No es pot desar la nova contrasenya."
-
 #. TRANS: Server error displayed when something does wrong with the user object during password reset.
-#: actions/recoverpassword.php:426 actions/register.php:256
+#: actions/recoverpassword.php:426 actions/register.php:241
 msgid "Error setting user."
 msgstr "Error en configurar l'usuari."
 
@@ -4919,98 +5006,98 @@ msgstr "Error en configurar l'usuari."
 msgid "New password successfully saved. You are now logged in."
 msgstr "Nova contrasenya guardada correctament. Has iniciat una sessió."
 
-#: actions/register.php:92 actions/register.php:196 actions/register.php:413
+#: actions/redirecturl.php:70
+#, fuzzy
+msgid "No id parameter"
+msgstr "No hi ha cap argument ID."
+
+#: actions/redirecturl.php:76
+#, fuzzy, php-format
+msgid "No such file \"%d\""
+msgstr "No existeix el fitxer."
+
+#: actions/register.php:80 actions/register.php:181 actions/register.php:392
 msgid "Sorry, only invited people can register."
 msgstr "Ho sentim, però només la gent convidada pot registrar-s'hi."
 
-#: actions/register.php:99
+#: actions/register.php:87
 msgid "Sorry, invalid invitation code."
 msgstr "El codi d'invitació no és vàlid."
 
-#: actions/register.php:119
+#: actions/register.php:106
 msgid "Registration successful"
 msgstr "Registre satisfactori"
 
-#: actions/register.php:121 actions/register.php:511
+#: actions/register.php:108 actions/register.php:490
 msgid "Register"
 msgstr "Registre"
 
-#: actions/register.php:142
+#: actions/register.php:128
 msgid "Registration not allowed."
 msgstr "Registre no permès."
 
-#: actions/register.php:209
-#, fuzzy
-msgid "You can't register if you don't agree to the license."
+#: actions/register.php:194
+msgid "You cannot register if you don't agree to the license."
 msgstr "No podeu registrar-vos-hi si no accepteu la llicència."
 
-#: actions/register.php:218
+#: actions/register.php:203
 msgid "Email address already exists."
 msgstr "L'adreça de correu electrònic ja existeix."
 
-#: actions/register.php:251 actions/register.php:273
+#: actions/register.php:236 actions/register.php:258
 msgid "Invalid username or password."
 msgstr "El nom d'usuari o la contrasenya no són vàlids."
 
-#: actions/register.php:351
-#, fuzzy
+#: actions/register.php:333
 msgid ""
 "With this form you can create a new account. You can then post notices and "
-"link up to friends and colleagues. "
+"link up to friends and colleagues."
 msgstr ""
 "Amb aquest formulari, podeu crear un compte nou. Podeu enviar avisos i "
 "enllaçar a amics i col·legues."
 
-#: actions/register.php:437
-msgid "6 or more characters."
-msgstr "6 o més caràcters."
-
-#. TRANS: Link description in user account settings menu.
-#: actions/register.php:445 actions/register.php:449
-#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
+#: actions/register.php:424 actions/register.php:428
+#: actions/siteadminpanel.php:238 lib/settingsnav.php:92
 msgid "Email"
 msgstr "Correu electrònic"
 
-#: actions/register.php:446 actions/register.php:450
-#, fuzzy
-msgid "Used only for updates, announcements, and password recovery"
+#: actions/register.php:425 actions/register.php:429
+msgid "Used only for updates, announcements, and password recovery."
 msgstr ""
 "Utilitzat només per a actualitzacions, anuncis i recuperació de contrasenya."
 
-#: actions/register.php:457
-#, fuzzy
-msgid "Longer name, preferably your \"real\" name"
+#: actions/register.php:436
+msgid "Longer name, preferably your \"real\" name."
 msgstr "Nom més llarg, preferiblement el vostre nom «real»."
 
-#: actions/register.php:462
-#, fuzzy
-msgid "URL of your homepage, blog, or profile on another site"
-msgstr "URL del vostre web, blog o perfil en un altre lloc."
+#: actions/register.php:464
+msgid "Where you are, like \"City, State (or Region), Country\"."
+msgstr "On us trobeu, per exemple «ciutat, comarca (o illa), país»."
 
-#: actions/register.php:523
+#: actions/register.php:503
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
 msgstr ""
 "Entenc que el contingut i les dades de %1$s són privades i confidencials."
 
-#: actions/register.php:533
+#: actions/register.php:513
 #, php-format
 msgid "My text and files are copyright by %1$s."
 msgstr "El meu text i els meus fitxers són copyright de %1$s."
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:537
+#: actions/register.php:517
 msgid "My text and files remain under my own copyright."
 msgstr "El meu text i els meus fitxers es troben sota el meu propi copyright."
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:540
+#: actions/register.php:520
 msgid "All rights reserved."
 msgstr "Tots els drets reservats."
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:545
+#: actions/register.php:525
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -5020,7 +5107,7 @@ msgstr ""
 "les dades privades: contrasenya, adreça de correu electrònic, adreça de "
 "missatgeria instantània i número de telèfon."
 
-#: actions/register.php:588
+#: actions/register.php:566
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -5053,7 +5140,7 @@ msgstr ""
 "\n"
 "Gràcies per registrar-vos-hi i esperem que en gaudiu."
 
-#: actions/register.php:612
+#: actions/register.php:590
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5086,8 +5173,7 @@ msgid "User nickname"
 msgstr "Sobrenom de l'usuari"
 
 #: actions/remotesubscribe.php:129
-#, fuzzy
-msgid "Nickname of the user you want to follow"
+msgid "Nickname of the user you want to follow."
 msgstr "Sobrenom de l'usuari que voleu seguir."
 
 #: actions/remotesubscribe.php:132
@@ -5095,19 +5181,17 @@ msgid "Profile URL"
 msgstr "URL del perfil"
 
 #: actions/remotesubscribe.php:133
-#, fuzzy
-msgid "URL of your profile on another compatible microblogging service"
+msgid "URL of your profile on another compatible microblogging service."
 msgstr "URL del vostre perfil en un altre servei de microblogging compatible."
 
 #. TRANS: Link text for link that will subscribe to a remote profile.
 #: actions/remotesubscribe.php:136 lib/subscribeform.php:139
-#: lib/userprofile.php:431
+#: lib/userprofile.php:402
 msgid "Subscribe"
 msgstr "Subscriu-m'hi"
 
 #: actions/remotesubscribe.php:158
-#, fuzzy
-msgid "Invalid profile URL (bad format)"
+msgid "Invalid profile URL (bad format)."
 msgstr "L'URL del perfil no és vàlid (format incorrecte)."
 
 #: actions/remotesubscribe.php:167
@@ -5140,7 +5224,7 @@ msgstr "No podeu repetir el vostre propi avís."
 msgid "You already repeated that notice."
 msgstr "Ja havíeu repetit l'avís."
 
-#: actions/repeat.php:112 lib/noticelist.php:692
+#: actions/repeat.php:112 lib/noticelist.php:697
 msgid "Repeated"
 msgstr "Repetit"
 
@@ -5148,9 +5232,9 @@ msgstr "Repetit"
 msgid "Repeated!"
 msgstr "Repetit!"
 
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing @-replies.
+#. TRANS: RSS reply feed title. %s is a user nickname.
 #: actions/replies.php:126 actions/repliesrss.php:68
-#: lib/personalgroupnav.php:109
+#: lib/personalgroupnav.php:105
 #, php-format
 msgid "Replies to %s"
 msgstr "Respostes a %s"
@@ -5201,9 +5285,11 @@ msgstr ""
 "Sigueu el primer en [enviar sobre aquest tema](%%%%action.newnotice%%%%?"
 "status_textarea=%s)!"
 
-#: actions/repliesrss.php:72
-#, fuzzy, php-format
-msgid "Replies to %1$s on %2$s!"
+#. TRANS: RSS reply feed description.
+#. TRANS: %1$s is a user nickname, %2$s is the StatusNet site name.
+#: actions/repliesrss.php:74
+#, php-format
+msgid "Replies to %1$s on %2$s."
 msgstr "Respostes a %1$s el %2$s."
 
 #. TRANS: Client exception displayed when trying to restore an account while not logged in.
@@ -5307,7 +5393,7 @@ msgstr "No podeu revocar els rols d'usuari en aquest lloc."
 msgid "User doesn't have this role."
 msgstr "L'usuari no té aquest rol."
 
-#: actions/rsd.php:146 actions/version.php:159
+#: actions/rsd.php:142 actions/version.php:159
 msgid "StatusNet"
 msgstr "StatusNet"
 
@@ -5349,87 +5435,38 @@ msgstr "Activa la sortida de depuració per a les sessions."
 msgid "Save site settings"
 msgstr "Desa els paràmetres del lloc"
 
-#: actions/showapplication.php:82
+#: actions/showapplication.php:78
 msgid "You must be logged in to view an application."
 msgstr "Heu d'haver iniciat una sessió per visualitzar una aplicació."
 
-#: actions/showapplication.php:157
+#: actions/showapplication.php:151
 msgid "Application profile"
 msgstr "Perfil de l'aplicació"
 
-#. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:159 lib/applicationeditform.php:177
-msgid "Icon"
-msgstr "Icona"
-
-#. TRANS: Form input field label for application name.
-#: actions/showapplication.php:169 actions/version.php:197
-#: lib/applicationeditform.php:190
-msgid "Name"
-msgstr "Nom"
-
-#. TRANS: Form input field label.
-#: actions/showapplication.php:178 lib/applicationeditform.php:227
-msgid "Organization"
-msgstr "Organització"
-
-#. TRANS: Form input field label.
-#: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:168
-msgid "Description"
-msgstr "Descripció"
-
-#. TRANS: Header for group statistics on a group page (h2).
-#. TRANS: H2 text for user statistics.
-#: actions/showapplication.php:192 actions/showgroup.php:460
-#: lib/profileaction.php:205
-msgid "Statistics"
-msgstr "Estadístiques"
-
-#: actions/showapplication.php:203
+#: actions/showapplication.php:179
 #, php-format
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr "Creat per %1$s - %2$s accés per defecte - %3$d usuaris"
 
-#: actions/showapplication.php:213
+#: actions/showapplication.php:189
 msgid "Application actions"
 msgstr "Accions d'aplicació"
 
-#: actions/showapplication.php:236
+#: actions/showapplication.php:212
 msgid "Reset key & secret"
 msgstr "Reinicialitza la clau i la secreta"
 
 #. TRANS: Title of form for deleting a user.
-#: actions/showapplication.php:252 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:64 lib/noticelist.php:673
+#: actions/showapplication.php:228 lib/deletegroupform.php:121
+#: lib/deleteuserform.php:64 lib/noticelist.php:678
 msgid "Delete"
 msgstr "Elimina"
 
-#: actions/showapplication.php:261
+#: actions/showapplication.php:237
 msgid "Application info"
 msgstr "Informació de l'aplicació"
 
-#: actions/showapplication.php:263
-msgid "Consumer key"
-msgstr "Clau del consumidor"
-
-#: actions/showapplication.php:268
-msgid "Consumer secret"
-msgstr "Secreta del consumidor"
-
-#: actions/showapplication.php:273
-msgid "Request token URL"
-msgstr "Sol·licita l'URL del testimoni"
-
-#: actions/showapplication.php:278
-msgid "Access token URL"
-msgstr "Accedeix a l'URL del testimoni"
-
-#: actions/showapplication.php:283
-msgid "Authorize URL"
-msgstr "Autoritza l'URL"
-
-#: actions/showapplication.php:288
+#: actions/showapplication.php:255
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
@@ -5437,7 +5474,7 @@ msgstr ""
 "Nota: Les signatures HMAC-SHA1 són vàlides; però no es permet el mètode de "
 "signatures en text net."
 
-#: actions/showapplication.php:309
+#: actions/showapplication.php:275
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr ""
 "Esteu segur que voleu reinicialitzar la clau del consumidor i la secreta?"
@@ -5523,61 +5560,47 @@ msgstr "%s grup"
 msgid "%1$s group, page %2$d"
 msgstr "grup %1$s, pàgina %2$d"
 
-#. TRANS: Group profile header (h2). Text hidden by default.
-#: actions/showgroup.php:223
-msgid "Group profile"
-msgstr "Perfil del grup"
-
-#. TRANS: Label for group URL (dt). Text hidden by default.
-#. TRANS: DT for URL in a profile.
-#: actions/showgroup.php:273 actions/tagother.php:118
-#: actions/userauthorization.php:175 lib/userprofile.php:186
-msgid "URL"
-msgstr "URL"
-
 #. TRANS: Label for group description or group note (dt). Text hidden by default.
-#. TRANS: DT for note in a profile.
-#: actions/showgroup.php:285 actions/tagother.php:128
-#: actions/userauthorization.php:187 lib/userprofile.php:204
+#: actions/showgroup.php:266
 msgid "Note"
 msgstr "Avisos"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:296 lib/groupeditform.php:180
+#: actions/showgroup.php:277 lib/groupeditform.php:180
 msgid "Aliases"
 msgstr "Àlies"
 
 #. TRANS: Group actions header (h2). Text hidden by default.
-#: actions/showgroup.php:313
+#: actions/showgroup.php:294
 msgid "Group actions"
 msgstr "Accions del grup"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:357
+#: actions/showgroup.php:338
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
 msgstr "Canal d'avisos del grup %s (RSS 1.0)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:364
+#: actions/showgroup.php:345
 #, php-format
 msgid "Notice feed for %s group (RSS 2.0)"
 msgstr "Canal d'avisos del grup %s (RSS 2.0)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:371
+#: actions/showgroup.php:352
 #, php-format
 msgid "Notice feed for %s group (Atom)"
 msgstr "Canal d'avisos del grup %s (Atom)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:377
+#: actions/showgroup.php:358
 #, php-format
 msgid "FOAF for %s group"
 msgstr "Safata de sortida per %s"
 
 #. TRANS: Header for mini list of group members on a group page (h2).
-#: actions/showgroup.php:414
+#: actions/showgroup.php:395
 msgid "Members"
 msgstr "Membres"
 
@@ -5585,25 +5608,30 @@ msgstr "Membres"
 #. TRANS: Text for user subscription statistics if the user has no subscriptions.
 #. TRANS: Text for user subscriber statistics if user has no subscribers.
 #. TRANS: Text for user user group membership statistics if user is not a member of any group.
-#: actions/showgroup.php:420 lib/profileaction.php:137
+#: actions/showgroup.php:401 lib/profileaction.php:137
 #: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
-#: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
+#: lib/subscriptionlist.php:123 lib/tagcloudsection.php:71
 msgid "(None)"
 msgstr "(Cap)"
 
 #. TRANS: Link to all group members from mini list of group members if group has more than n members.
-#: actions/showgroup.php:429
+#: actions/showgroup.php:410
 msgid "All members"
 msgstr "Tots els membres"
 
-#. TRANS: Label for creation date in statistics on group page.
-#: actions/showgroup.php:465
+#. TRANS: Header for group statistics on a group page (h2).
+#. TRANS: H2 text for user statistics.
+#: actions/showgroup.php:441 lib/profileaction.php:205
+msgid "Statistics"
+msgstr "Estadístiques"
+
+#: actions/showgroup.php:444
 msgctxt "LABEL"
 msgid "Created"
 msgstr "S'ha creat"
 
 #. TRANS: Label for member count in statistics on group page.
-#: actions/showgroup.php:473
+#: actions/showgroup.php:449
 msgctxt "LABEL"
 msgid "Members"
 msgstr "Membres"
@@ -5612,7 +5640,7 @@ msgstr "Membres"
 #. TRANS: **%s** is the group alias, %%%%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).
-#: actions/showgroup.php:488
+#: actions/showgroup.php:464
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5631,7 +5659,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: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
-#: actions/showgroup.php:498
+#: actions/showgroup.php:474
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5645,7 +5673,7 @@ msgstr ""
 "curts sobre llur vida i interessos. "
 
 #. TRANS: Header for list of group administrators on a group page (h2).
-#: actions/showgroup.php:527
+#: actions/showgroup.php:503
 msgid "Admins"
 msgstr "Administradors"
 
@@ -5684,7 +5712,7 @@ msgid "%1$s tagged %2$s"
 msgstr "%1$s etiquetats %2$s"
 
 #. TRANS: Page title showing tagged notices in one user's stream.
-#. TRANS: %1$s is the username, %2$s is the hash tag, %1$d is the page number.
+#. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
 #: actions/showstream.php:74
 #, php-format
 msgid "%1$s tagged %2$s, page %3$d"
@@ -5731,14 +5759,14 @@ msgid "FOAF for %s"
 msgstr "FOAF de %s"
 
 #. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
-#: actions/showstream.php:211
+#: actions/showstream.php:205
 #, php-format
 msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr ""
 "Aquesta és la línia temporal de %1$s, però %1$s no hi ha enviat encara res."
 
 #. TRANS: Second sentence of empty list message for a stream for the user themselves.
-#: actions/showstream.php:217
+#: actions/showstream.php:211
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
@@ -5748,7 +5776,7 @@ msgstr ""
 
 #. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:221
+#: actions/showstream.php:215
 #, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
@@ -5759,7 +5787,7 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:264
+#: actions/showstream.php:258
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5776,7 +5804,7 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:271
+#: actions/showstream.php:265
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5788,7 +5816,7 @@ msgstr ""
 "(http://status.net/). "
 
 #. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
-#: actions/showstream.php:328
+#: actions/showstream.php:322
 #, php-format
 msgid "Repeat of %s"
 msgstr "Repetició de %s"
@@ -5934,18 +5962,17 @@ msgstr "Text d'avís per a tot el lloc (màxim 255 caràcters; es permet l'HTML)
 
 #. TRANS: Title for button to save site notice in admin panel.
 #: actions/sitenoticeadminpanel.php:201
-#, fuzzy
-msgid "Save site notice"
+msgid "Save site notice."
 msgstr "Desa l'avís per a tot el lloc."
 
 #. TRANS: Title for SMS settings.
-#: actions/smssettings.php:57
+#: actions/smssettings.php:56
 msgid "SMS settings"
 msgstr "Paràmetres de l'SMS"
 
 #. TRANS: SMS settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/smssettings.php:71
+#: actions/smssettings.php:70
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr ""
@@ -5953,59 +5980,58 @@ msgstr ""
 "site.name%%."
 
 #. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
-#: actions/smssettings.php:93
+#: actions/smssettings.php:92
 msgid "SMS is not available."
 msgstr "L'SMS no és disponible."
 
 #. TRANS: Form legend for SMS settings form.
-#: actions/smssettings.php:107
+#: actions/smssettings.php:106
 msgid "SMS address"
 msgstr "Adreça SMS"
 
 #. TRANS: Form guide in SMS settings form.
-#: actions/smssettings.php:116
+#: actions/smssettings.php:115
 msgid "Current confirmed SMS-enabled phone number."
 msgstr "Número de telèfon actualment confirmat i activat per SMS."
 
 #. TRANS: Form guide in IM settings form.
-#: actions/smssettings.php:129
+#: actions/smssettings.php:128
 msgid "Awaiting confirmation on this phone number."
 msgstr "S'està esperant la confirmació d'aquest número de telèfon."
 
 #. TRANS: Field label for SMS address input in SMS settings form.
-#: actions/smssettings.php:138
+#: actions/smssettings.php:137
 msgid "Confirmation code"
 msgstr "Codi de confirmació"
 
 #. TRANS: Form field instructions in SMS settings form.
-#: actions/smssettings.php:140
+#: actions/smssettings.php:139
 msgid "Enter the code you received on your phone."
 msgstr "Escriu el codi que has rebut en el teu telèfon mòbil."
 
 #. TRANS: Button label to confirm SMS confirmation code in SMS settings.
-#: actions/smssettings.php:144
+#: actions/smssettings.php:143
 msgctxt "BUTTON"
 msgid "Confirm"
 msgstr "Confirma"
 
 #. TRANS: Field label for SMS phone number input in SMS settings form.
-#: actions/smssettings.php:149
+#: actions/smssettings.php:148
 msgid "SMS phone number"
 msgstr "Número de telèfon per als SMS"
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
-#: actions/smssettings.php:152
-#, fuzzy
-msgid "Phone number, no punctuation or spaces, with area code"
+#: actions/smssettings.php:151
+msgid "Phone number, no punctuation or spaces, with area code."
 msgstr "Número de telèfon, no puntuació ni espais, en l'àrea del codi."
 
 #. TRANS: Form legend for SMS preferences form.
-#: actions/smssettings.php:191
+#: actions/smssettings.php:190
 msgid "SMS preferences"
 msgstr "Preferències de l'SMS"
 
 #. TRANS: Checkbox label in SMS preferences form.
-#: actions/smssettings.php:197
+#: actions/smssettings.php:196
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
@@ -6014,32 +6040,32 @@ msgstr ""
 "exorbitant càrrega del meu transport."
 
 #. TRANS: Confirmation message for successful SMS preferences save.
-#: actions/smssettings.php:308
+#: actions/smssettings.php:307
 msgid "SMS preferences saved."
 msgstr "S'han desat les preferències de l'SMS."
 
 #. TRANS: Message given saving SMS phone number without having provided one.
-#: actions/smssettings.php:330
+#: actions/smssettings.php:329
 msgid "No phone number."
 msgstr "No hi ha cap número de telèfon."
 
 #. TRANS: Message given saving SMS phone number without having selected a carrier.
-#: actions/smssettings.php:336
+#: actions/smssettings.php:335
 msgid "No carrier selected."
 msgstr "No s'ha sel·leccionat cap transport."
 
 #. TRANS: Message given saving SMS phone number that is already set.
-#: actions/smssettings.php:344
+#: actions/smssettings.php:343
 msgid "That is already your phone number."
 msgstr "Aquest ja és el vostre número de telèfon."
 
 #. TRANS: Message given saving SMS phone number that is already set for another user.
-#: actions/smssettings.php:348
+#: actions/smssettings.php:347
 msgid "That phone number already belongs to another user."
 msgstr "Aquest número de telèfon pertany a un altre usuari."
 
 #. TRANS: Message given saving valid SMS phone number that is to be confirmed.
-#: actions/smssettings.php:376
+#: actions/smssettings.php:375
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
 "for the code and instructions on how to use it."
@@ -6049,39 +6075,39 @@ msgstr ""
 "servir."
 
 #. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
-#: actions/smssettings.php:404
+#: actions/smssettings.php:403
 msgid "That is the wrong confirmation number."
 msgstr "Aquest és un número de confirmació incorrecte."
 
 #. TRANS: Message given after successfully canceling SMS phone number confirmation.
-#: actions/smssettings.php:418
+#: actions/smssettings.php:417
 msgid "SMS confirmation cancelled."
 msgstr "La confirmació d'SMS s'ha cancel·lat."
 
 #. TRANS: Message given trying to remove an SMS phone number that is not
 #. TRANS: registered for the active user.
-#: actions/smssettings.php:438
+#: actions/smssettings.php:437
 msgid "That is not your phone number."
 msgstr "Aquest no és el teu número de telèfon."
 
 #. TRANS: Message given after successfully removing a registered SMS phone number.
-#: actions/smssettings.php:460
+#: actions/smssettings.php:459
 msgid "The SMS phone number was removed."
 msgstr "S'ha eliminat el número de telèfon de l'SMS."
 
 #. TRANS: Label for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:499
+#: actions/smssettings.php:498
 msgid "Mobile carrier"
 msgstr "Transport mòbil"
 
 #. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:504
+#: actions/smssettings.php:503
 msgid "Select a carrier"
 msgstr "Selecciona un transport"
 
 #. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
 #. TRANS: %s is an administrative contact's e-mail address.
-#: actions/smssettings.php:513
+#: actions/smssettings.php:512
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -6092,7 +6118,7 @@ msgstr ""
 "un missatge de correu per fer-nos-ho saber %s."
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
-#: actions/smssettings.php:535
+#: actions/smssettings.php:534
 msgid "No code entered."
 msgstr "No s'ha introduït cap codi."
 
@@ -6165,15 +6191,13 @@ msgstr "No estàs subscrit a aquest perfil."
 msgid "Could not save subscription."
 msgstr "No s'ha pogut guardar la subscripció."
 
-#: actions/subscribe.php:77
-msgid "This action only accepts POST requests."
-msgstr "Aquesta acció només accepta sol·licituds POST."
-
-#: actions/subscribe.php:117
+#. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
+#: actions/subscribe.php:121
 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
 msgstr "No podeu subscriure-us a un perfil remot OMB 0.1 amb aquesta acció."
 
-#: actions/subscribe.php:145
+#. TRANS: Page title when subscription succeeded.
+#: actions/subscribe.php:149
 msgid "Subscribed"
 msgstr "Subscrit"
 
@@ -6290,31 +6314,34 @@ msgid "Subscription feed for %s (Atom)"
 msgstr "Canal de subscripció de %s (Atom)"
 
 #. TRANS: Checkbox label for enabling Jabber messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:239
-msgid "Jabber"
-msgstr "Jabber"
+#: actions/subscriptions.php:241 lib/settingsnav.php:110
+#, fuzzy
+msgid "IM"
+msgstr "MI"
 
 #. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:254
+#: actions/subscriptions.php:256 lib/settingsnav.php:117
 msgid "SMS"
 msgstr "SMS"
 
-#: actions/tag.php:69
+#. TRANS: Title for all but the first page of notices with tags.
+#. TRANS: %1$s is the tag, %2$d is the page number.
+#: actions/tag.php:73
 #, php-format
 msgid "Notices tagged with %1$s, page %2$d"
 msgstr "Avisos etiquetats amb %1$s, pàgina %2$d"
 
-#: actions/tag.php:87
+#: actions/tag.php:91
 #, php-format
 msgid "Notice feed for tag %s (RSS 1.0)"
 msgstr "Canal d'avisos de l'etiqueta %s (RSS 1.0)"
 
-#: actions/tag.php:93
+#: actions/tag.php:97
 #, php-format
 msgid "Notice feed for tag %s (RSS 2.0)"
 msgstr "Canal d'avisos de l'etiqueta %s (RSS 2.0)"
 
-#: actions/tag.php:99
+#: actions/tag.php:103
 #, php-format
 msgid "Notice feed for tag %s (Atom)"
 msgstr "Canal d'avisos de l'etiqueta %s (Atom)"
@@ -6333,17 +6360,11 @@ msgstr "Etiqueta %s"
 msgid "User profile"
 msgstr "Perfil de l'usuari"
 
-#. TRANS: DT element in area for user avatar.
-#: actions/tagother.php:81 actions/userauthorization.php:132
-#: lib/userprofile.php:108
-msgid "Photo"
-msgstr "Foto"
-
-#: actions/tagother.php:141
+#: actions/tagother.php:120
 msgid "Tag user"
 msgstr "Etiqueta usuari"
 
-#: actions/tagother.php:151
+#: actions/tagother.php:130
 msgid ""
 "Tags for this user (letters, numbers, -, ., and _), comma- or space- "
 "separated"
@@ -6351,14 +6372,19 @@ msgstr ""
 "Etiquetes d'aquest usuari (lletres, nombres,, -, ., i _), comes o separades "
 "amb espais"
 
-#: actions/tagother.php:193
+#: actions/tagother.php:157
+#, php-format
+msgid "Invalid tag: \"%s\""
+msgstr "L'etiqueta no és vàlida: «%s»"
+
+#: actions/tagother.php:172
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 "Només podeu etiquetar gent a la qual estigueu subscrit o que us hagin "
 "subscrit."
 
-#: actions/tagother.php:236
+#: actions/tagother.php:215
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
 "Utilitzeu aquest formulari per afegir etiquetes als vostres subscriptors i "
@@ -6368,6 +6394,7 @@ msgstr ""
 msgid "No such tag."
 msgstr "No existeix aquesta etiqueta."
 
+#. TRANS: Client error displayed when trying to unblock a non-blocked user.
 #: actions/unblock.php:59
 msgid "You haven't blocked that user."
 msgstr "No heu blocat l'usuari."
@@ -6388,7 +6415,7 @@ msgstr "No hi ha cap identificador del perfil en la sol·licitud."
 msgid "Unsubscribed"
 msgstr "No subscrit"
 
-#: actions/updateprofile.php:64 actions/userauthorization.php:337
+#: actions/updateprofile.php:64
 #, php-format
 msgid ""
 "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
@@ -6396,6 +6423,78 @@ msgstr ""
 "La llicència del flux de qui escolteu, «%1$s», no és compatible amb la "
 "llicència del lloc, «%2$s»."
 
+#: actions/urlsettings.php:60
+#, fuzzy
+msgid "URL settings"
+msgstr "Paràmetres de missatgeria instantània"
+
+#. TRANS: Instructions for tab "Other" in user profile settings.
+#: actions/urlsettings.php:72
+msgid "Manage various other options."
+msgstr "Gestiona altres opcions diferents."
+
+#. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
+#. TRANS: user's profile settings. This message has one space at the beginning. Use your
+#. TRANS: language's word separator here if it has one (most likely a single space).
+#: actions/urlsettings.php:115
+msgid " (free service)"
+msgstr " (servei lliure)"
+
+#: actions/urlsettings.php:121
+#, fuzzy
+msgid "[none]"
+msgstr "Cap"
+
+#: actions/urlsettings.php:122
+msgid "[internal]"
+msgstr ""
+
+#. TRANS: Label for dropdown with URL shortener services.
+#: actions/urlsettings.php:130
+msgid "Shorten URLs with"
+msgstr "Escurça els URL amb"
+
+#. TRANS: Tooltip for for dropdown with URL shortener services.
+#: actions/urlsettings.php:132
+msgid "Automatic shortening service to use."
+msgstr "Servei d'auto-escurçament a utilitzar."
+
+#: actions/urlsettings.php:138
+msgid "URL longer than"
+msgstr ""
+
+#: actions/urlsettings.php:141
+msgid "URLs longer than this will be shortened, 0 means always shorten."
+msgstr ""
+
+#: actions/urlsettings.php:145
+msgid "Text longer than"
+msgstr ""
+
+#: actions/urlsettings.php:148
+msgid ""
+"URLs in notices longer than this will be shortened, 0 means always shorten."
+msgstr ""
+
+#. TRANS: Form validation error for form "Other settings" in user profile.
+#: actions/urlsettings.php:180
+msgid "URL shortening service is too long (maximum 50 characters)."
+msgstr ""
+"El servei d'autoescurçament d'URL és massa llarga (màxim 50 caràcters)."
+
+#: actions/urlsettings.php:187
+msgid "Invalid number for max url length."
+msgstr ""
+
+#: actions/urlsettings.php:193
+#, fuzzy
+msgid "Invalid number for max notice length."
+msgstr "El contingut de l'avís no és vàlid."
+
+#: actions/urlsettings.php:238
+msgid "Error saving user URL shortening preferences."
+msgstr ""
+
 #. TRANS: User admin panel title
 #: actions/useradminpanel.php:58
 msgctxt "TITLE"
@@ -6421,12 +6520,12 @@ msgstr ""
 #. TRANS: Client error displayed when trying to set a non-existing user as default subscription for new
 #. TRANS: users in user admin panel. %1$s is the invalid nickname.
 #: actions/useradminpanel.php:166
-#, fuzzy, php-format
-msgid "Invalid default subscripton: '%1$s' is not a user."
+#, php-format
+msgid "Invalid default subscripton: \"%1$s\" is not a user."
 msgstr "La subscripció per defecte no és vàlida: «%1$s» no és cap usuari."
 
-#. TRANS: Link description in user account settings menu.
-#: actions/useradminpanel.php:215 lib/accountsettingsaction.php:106
+#: actions/useradminpanel.php:215 lib/action.php:565 lib/settingsnav.php:77
+#: lib/subgroupnav.php:81
 msgid "Profile"
 msgstr "Perfil"
 
@@ -6482,60 +6581,61 @@ msgstr "Si es permet als usuaris invitar-ne de nous."
 
 #. TRANS: Title for button to save user settings in user admin panel.
 #: actions/useradminpanel.php:302
-#, fuzzy
-msgid "Save user settings"
+msgid "Save user settings."
 msgstr "Desa els paràmetres d'usuari."
 
-#: actions/userauthorization.php:105
+#. TRANS: Page title.
+#: actions/userauthorization.php:109
 msgid "Authorize subscription"
 msgstr "Autoritza la subscripció"
 
-#: actions/userauthorization.php:110
+#. TRANS: Page notice on "Auhtorize subscription" page.
+#: actions/userauthorization.php:115
 #, fuzzy
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
 "user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
-"click “Reject”."
+"click \"Reject\"."
 msgstr ""
 "Si us plau, reviseu aquests detalls per assegurar-vos que voleu subscriure-"
 "us als avisos d'aquest usuari. Si no heu demanat subscriure-us als avisos de "
 "ningú, feu clic a «Rebutja»."
 
-#. TRANS: Menu item for site administration
-#: actions/userauthorization.php:196 actions/version.php:167
-#: lib/adminpanelaction.php:403
-msgid "License"
-msgstr "Llicència"
-
-#: actions/userauthorization.php:217
-#, fuzzy
+#. TRANS: Button text on Authorise Subscription page.
+#: actions/userauthorization.php:200
+msgctxt "BUTTON"
 msgid "Accept"
 msgstr "Accepta"
 
-#: actions/userauthorization.php:218 lib/subscribeform.php:115
-#: lib/subscribeform.php:139
-msgid "Subscribe to this user"
+#. TRANS: Title for button on Authorise Subscription page.
+#: actions/userauthorization.php:202
+msgid "Subscribe to this user."
 msgstr "Subscriu-me a aquest usuari"
 
-#: actions/userauthorization.php:219
+#. TRANS: Button text on Authorise Subscription page.
+#: actions/userauthorization.php:204
 #, fuzzy
+msgctxt "BUTTON"
 msgid "Reject"
 msgstr "Rebutja"
 
-#: actions/userauthorization.php:220
+#. TRANS: Title for button on Authorise Subscription page.
+#: actions/userauthorization.php:206
 #, fuzzy
-msgid "Reject this subscription"
+msgid "Reject this subscription."
 msgstr "Rebutja la subscripció"
 
-#: actions/userauthorization.php:232
+#. TRANS: Client error displayed for an empty authorisation request.
+#: actions/userauthorization.php:219
 msgid "No authorization request!"
 msgstr "No és una sol·licitud d'autorització!"
 
-#: actions/userauthorization.php:254
+#. TRANS: Accept message header from Authorise subscription page.
+#: actions/userauthorization.php:242
 msgid "Subscription authorized"
 msgstr "Subscripció autoritzada"
 
-#: actions/userauthorization.php:256
+#: actions/userauthorization.php:245
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to authorize the "
@@ -6545,11 +6645,12 @@ msgstr ""
 "retorn. Reviseu les instruccions del lloc per tal de tenir més detalls de "
 "com autoritzar la subscripció. El vostre testimoni de subscripció és:"
 
-#: actions/userauthorization.php:266
+#. TRANS: Reject message header from Authorise subscription page.
+#: actions/userauthorization.php:256
 msgid "Subscription rejected"
 msgstr "Subscripció rebutjada"
 
-#: actions/userauthorization.php:268
+#: actions/userauthorization.php:259
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to fully reject the "
@@ -6559,48 +6660,73 @@ msgstr ""
 "retorn. Reviseu les instruccions del lloc per tal de tenir més detalls de "
 "com rebutjar la subscripció completament."
 
-#: actions/userauthorization.php:303
+#. TRANS: Exception thrown when no valid user is found for an authorisation request.
+#. TRANS: %s is a listener URI.
+#: actions/userauthorization.php:296
 #, fuzzy, php-format
-msgid "Listener URI ‘%s’ not found here."
+msgid "Listener URI \"%s\" not found here."
 msgstr "No s'hi ha trobat l'URI de qui us escolta, «%s»."
 
-#: actions/userauthorization.php:308
+#. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
+#. TRANS: %s is a listenee URI.
+#: actions/userauthorization.php:303
 #, fuzzy, php-format
-msgid "Listenee URI ‘%s’ is too long."
+msgid "Listenee URI \"%s\" is too long."
 msgstr "L'URI de qui escolteu, «%s», és massa llarga."
 
-#: actions/userauthorization.php:314
+#. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
+#. TRANS: %s is a listenee URI.
+#: actions/userauthorization.php:311
 #, fuzzy, php-format
-msgid "Listenee URI ‘%s’ is a local user."
+msgid "Listenee URI \"%s\" is a local user."
 msgstr "L'URI de qui escolteu, «%s», és un usuari local."
 
+#. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
+#. TRANS: %s is a profile URL.
 #: actions/userauthorization.php:329
 #, fuzzy, php-format
-msgid "Profile URL ‘%s’ is for a local user."
+msgid "Profile URL \"%s\" is for a local user."
 msgstr "L'URL del perfil «%s» és només per a un usuari local."
 
-#: actions/userauthorization.php:345
+#. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
+#. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
+#: actions/userauthorization.php:339
 #, fuzzy, php-format
-msgid "Avatar URL ‘%s’ is not valid."
+msgid ""
+"Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
+"\"."
+msgstr ""
+"La llicència del flux de qui escolteu, «%1$s», no és compatible amb la "
+"llicència del lloc, «%2$s»."
+
+#. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
+#. TRANS: %s is an avatar URL.
+#: actions/userauthorization.php:349
+#, fuzzy, php-format
+msgid "Avatar URL \"%s\" is not valid."
 msgstr "L'URL de l'avatar «%s» no és vàlid."
 
-#: actions/userauthorization.php:350
-#, fuzzy, php-format
-msgid "Can’t read avatar URL ‘%s’."
+#. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
+#. TRANS: %s is an avatar URL.
+#: actions/userauthorization.php:356
+#, php-format
+msgid "Cannot read avatar URL \"%s\"."
 msgstr "No es pot llegir l'URL de l'avatar «%s»."
 
-#: actions/userauthorization.php:355
-#, fuzzy, php-format
-msgid "Wrong image type for avatar URL ‘%s’."
+#. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
+#. TRANS: %s is an avatar URL.
+#: actions/userauthorization.php:363
+#, php-format
+msgid "Wrong image type for avatar URL \"%s\"."
 msgstr "Tipus d'imatge incorrecta per a l'URL de l'avatar «%s»."
 
 #. TRANS: Page title for profile design page.
-#: actions/userdesignsettings.php:74 lib/designsettings.php:63
+#: actions/userdesignsettings.php:74 lib/designsettings.php:61
 msgid "Profile design"
 msgstr "Disseny del perfil"
 
 #. TRANS: Instructions for profile design page.
-#: actions/userdesignsettings.php:84 lib/designsettings.php:74
+#: actions/userdesignsettings.php:84 lib/designsettings.php:72
 msgid ""
 "Customize the way your profile looks with a background image and a colour "
 "palette of your choice."
@@ -6608,10 +6734,28 @@ msgstr ""
 "Personalitzeu l'aspecte del vostre perfil amb una imatge de fons o una "
 "paleta de colors de la vostra elecció."
 
-#: actions/userdesignsettings.php:272
+#: actions/userdesignsettings.php:289
 msgid "Enjoy your hotdog!"
 msgstr "Gaudiu de l'entrepà!"
 
+#: actions/userdesignsettings.php:325
+#, fuzzy
+msgid "Design settings"
+msgstr "Desa els paràmetres del lloc"
+
+#: actions/userdesignsettings.php:340
+msgid "View profile designs"
+msgstr "Visualitza els dissenys de perfil"
+
+#: actions/userdesignsettings.php:341
+msgid "Show or hide profile designs."
+msgstr "Mostra o amaga els dissenys de perfil."
+
+#: actions/userdesignsettings.php:348
+#, fuzzy
+msgid "Background file"
+msgstr "Fons"
+
 #. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number.
 #: actions/usergroups.php:66
 #, php-format
@@ -6661,6 +6805,11 @@ msgstr ""
 msgid "Contributors"
 msgstr "Col·laboració"
 
+#. TRANS: Menu item for site administration
+#: actions/version.php:167 lib/adminpanelaction.php:403
+msgid "License"
+msgstr "Llicència"
+
 #: actions/version.php:170
 msgid ""
 "StatusNet is free software: you can redistribute it and/or modify it under "
@@ -6694,12 +6843,13 @@ msgstr ""
 "Hauríeu d'haver rebut una còpia de la llicència GNU Affero General Public "
 "License juntament amb el programa. Si no és així, consulteu %s."
 
-#: actions/version.php:191
-msgid "Plugins"
-msgstr "Connectors"
+#. TRANS: Form input field label for application name.
+#: actions/version.php:197 lib/applicationeditform.php:190
+msgid "Name"
+msgstr "Nom"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:901
+#: actions/version.php:198 lib/action.php:885
 msgid "Version"
 msgstr "Versió"
 
@@ -6707,6 +6857,12 @@ msgstr "Versió"
 msgid "Author(s)"
 msgstr "Autoria"
 
+#. TRANS: Form input field label.
+#: actions/version.php:200 lib/applicationeditform.php:208
+#: lib/groupeditform.php:168
+msgid "Description"
+msgstr "Descripció"
+
 #. TRANS: Activity title when marking a notice as favorite.
 #: classes/Fave.php:164
 msgid "Favor"
@@ -6829,7 +6985,7 @@ msgid "Could not create login token for %s"
 msgstr "No s'ha pogut crear un testimoni d'inici de sessió per a %s"
 
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
-#: classes/Memcached_DataObject.php:542
+#: classes/Memcached_DataObject.php:556
 msgid "No database name or DSN found anywhere."
 msgstr "No s'ha trobat el nom de la base de dades o el DSN enlloc."
 
@@ -7006,18 +7162,18 @@ msgstr "%1$s ara està seguint %2$s."
 
 #. TRANS: Notice given on user registration.
 #. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:395
+#: classes/User.php:390
 #, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr "Us donem la benvinguda a %1$s, @%2$s!"
 
 #. TRANS: Server exception.
-#: classes/User.php:918
+#: classes/User.php:923
 msgid "No single user defined for single-user mode."
 msgstr "No s'ha definit cap usuari únic per al mode d'usuari únic."
 
 #. TRANS: Server exception.
-#: classes/User.php:922
+#: classes/User.php:927
 msgid "Single-user mode code called when not enabled."
 msgstr "S'ha cridat el codi del mode d'únic usuari quan no està habilitat."
 
@@ -7062,41 +7218,6 @@ msgstr "No es pot trobar l'XRD de %s."
 msgid "No AtomPub API service for %s."
 msgstr "No hi ha cap servei API d'AtomPub de %s."
 
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:104
-msgid "Change your profile settings"
-msgstr "Canvieu els paràmetres del vostre perfil"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:111
-msgid "Upload an avatar"
-msgstr "Puja un avatar"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:118
-msgid "Change your password"
-msgstr "Canvieu la vostra contrasenya"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:125
-msgid "Change email handling"
-msgstr "Canvieu la gestió del correu"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:132
-msgid "Design your profile"
-msgstr "Dissenyeu el vostre perfil"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:139
-msgid "Other options"
-msgstr "Altres opcions"
-
-#. TRANS: Link description in user account settings menu.
-#: lib/accountsettingsaction.php:141
-msgid "Other"
-msgstr "Altres"
-
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
 #: lib/action.php:161
 #, php-format
@@ -7114,206 +7235,128 @@ msgctxt "TOOLTIP"
 msgid "Show more"
 msgstr "Mostra més"
 
-#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:544
-msgid "Primary site navigation"
-msgstr "Navegació primària del lloc"
+#. TRANS: Inline reply form submit button: submits a reply comment.
+#: lib/action.php:328
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Comment"
+msgstr "Contingut"
 
-#. TRANS: Tooltip for main menu option "Personal".
-#: lib/action.php:550
-msgctxt "TOOLTIP"
-msgid "Personal profile and friends timeline"
-msgstr "Perfil personal i línia temporal dels amics"
+#. TRANS: Placeholder text for inline reply form. Clicking in this box will turn it into a mini notice form.
+#: lib/action.php:331
+msgid "Add a comment..."
+msgstr ""
 
-#. TRANS: Main menu option when logged in for access to personal profile and friends timeline.
-#. TRANS: Personal group navigation menu option when logged in for viewing timeline of self and friends.
-#: lib/action.php:553 lib/personalgroupnav.php:100
-msgctxt "MENU"
-msgid "Personal"
-msgstr "Personal"
+#: lib/action.php:559 lib/personalgroupnav.php:99
+#, fuzzy
+msgid "Home"
+msgstr "Pàgina personal"
 
-#. TRANS: Tooltip for main menu option "Account".
-#: lib/action.php:555
-msgctxt "TOOLTIP"
-msgid "Change your email, avatar, password, profile"
-msgstr "Canvia l'adreça electrònica, l'avatar, la contrasenya o el perfil"
-
-#. TRANS: Main menu option when logged in for access to user settings.
-#: lib/action.php:558
-msgid "Account"
-msgstr "Compte"
-
-#. TRANS: Tooltip for main menu option "Services".
 #: lib/action.php:560
-msgctxt "TOOLTIP"
-msgid "Connect to services"
-msgstr "Connecta als serveis"
+#, fuzzy
+msgid "Friends timeline"
+msgstr "%s línia temporal"
 
-#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services.
-#: lib/action.php:563
-msgid "Connect"
-msgstr "Connexió"
-
-#. TRANS: Tooltip for menu option "Admin".
 #: lib/action.php:566
-msgctxt "TOOLTIP"
-msgid "Change site configuration"
-msgstr "Canvia la configuració del lloc"
+#, fuzzy
+msgid "Your profile"
+msgstr "Perfil del grup"
 
-#. TRANS: Main menu option when logged in and site admin for access to site configuration.
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/action.php:569 lib/groupnav.php:117
-msgctxt "MENU"
-msgid "Admin"
-msgstr "Administrador"
+#: lib/action.php:570 lib/action.php:593 lib/publicgroupnav.php:78
+msgid "Public"
+msgstr "Públic"
 
-#. TRANS: Tooltip for main menu option "Invite".
-#: lib/action.php:573
-#, php-format
-msgctxt "TOOLTIP"
-msgid "Invite friends and colleagues to join you on %s"
-msgstr "Convida amics i coneguts perquè participin a %s"
+#: lib/action.php:571 lib/action.php:594
+#, fuzzy
+msgid "Everyone on this site"
+msgstr "Cerca gent en aquest lloc"
+
+#: lib/action.php:575
+#, fuzzy
+msgid "Settings"
+msgstr "Paràmetres de l'SMS"
 
-#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users.
 #: lib/action.php:576
-msgctxt "MENU"
-msgid "Invite"
-msgstr "Convida"
+#, fuzzy
+msgid "Change your personal settings"
+msgstr "Canvieu els paràmetres del vostre perfil"
 
-#. TRANS: Tooltip for main menu option "Logout"
 #: lib/action.php:582
-msgctxt "TOOLTIP"
-msgid "Logout from the site"
-msgstr "Finalitza la sessió del lloc"
+#, fuzzy
+msgid "Site configuration"
+msgstr "Configuració de l'usuari"
 
-#. TRANS: Main menu option when logged in to log out the current user.
-#: lib/action.php:585
-msgctxt "MENU"
+#: lib/action.php:587
+#, fuzzy
 msgid "Logout"
 msgstr "Finalitza la sessió"
 
-#. TRANS: Tooltip for main menu option "Register".
-#: lib/action.php:590
-msgctxt "TOOLTIP"
-msgid "Create an account"
-msgstr "Crea un compte"
+#: lib/action.php:588
+#, fuzzy
+msgid "Logout from the site"
+msgstr "Finalitza la sessió del lloc"
 
-#. TRANS: Main menu option when not logged in to register a new account.
-#. TRANS: Menu item for registering with the StatusNet site.
-#: lib/action.php:593 lib/logingroupnav.php:85
-msgctxt "MENU"
-msgid "Register"
-msgstr "Registre"
-
-#. TRANS: Tooltip for main menu option "Login".
-#: lib/action.php:596
-msgctxt "TOOLTIP"
+#: lib/action.php:599
+#, fuzzy
 msgid "Login to the site"
 msgstr "Inicia una sessió al lloc"
 
-#. TRANS: Main menu option when not logged in to log in.
-#. TRANS: Menu item for logging in to the StatusNet site.
-#: lib/action.php:599 lib/logingroupnav.php:77
-msgctxt "MENU"
-msgid "Login"
-msgstr "Inici de sessió"
-
-#. TRANS: Tooltip for main menu option "Help".
-#: lib/action.php:602
-msgctxt "TOOLTIP"
-msgid "Help me!"
-msgstr "Ajuda'm!"
-
-#. TRANS: Main menu option for help on the StatusNet site.
-#: lib/action.php:605
-msgctxt "MENU"
-msgid "Help"
-msgstr "Ajuda"
-
-#. TRANS: Tooltip for main menu option "Search".
-#: lib/action.php:608
-msgctxt "TOOLTIP"
-msgid "Search for people or text"
-msgstr "Cerca gent o text"
-
-#. TRANS: Main menu option when logged in or when the StatusNet instance is not private.
-#: lib/action.php:611
-msgctxt "MENU"
+#: lib/action.php:606
+#, fuzzy
 msgid "Search"
 msgstr "Cerca"
 
-#. TRANS: DT element for site notice. String is hidden in default CSS.
-#. TRANS: Menu item for site administration
-#: lib/action.php:633 lib/adminpanelaction.php:387
-msgid "Site notice"
-msgstr "Avís del lloc"
-
-#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:700
-msgid "Local views"
-msgstr "Vistes locals"
-
-#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:770
-msgid "Page notice"
-msgstr "Avís de pàgina"
-
-#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:874
-msgid "Secondary site navigation"
-msgstr "Navegació del lloc secundària"
+#: lib/action.php:607
+#, fuzzy
+msgid "Search the site"
+msgstr "Cerca al lloc"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:880
+#: lib/action.php:864
 msgid "Help"
 msgstr "Ajuda"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:883
+#: lib/action.php:867
 msgid "About"
 msgstr "Quant a"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:886
+#: lib/action.php:870
 msgid "FAQ"
 msgstr "Preguntes més freqüents"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:891
+#: lib/action.php:875
 msgid "TOS"
 msgstr "Termes del servei"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:895
+#: lib/action.php:879
 msgid "Privacy"
 msgstr "Privadesa"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:898
+#: lib/action.php:882
 msgid "Source"
 msgstr "Font"
 
 #. TRANS: Secondary navigation menu option leading to e-mail contact information on the
 #. TRANS: StatusNet site, where to report bugs, ...
-#: lib/action.php:905
+#: lib/action.php:889
 msgid "Contact"
 msgstr "Contacte"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:908
+#: lib/action.php:892
 msgid "Badge"
 msgstr "Insígnia"
 
-#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:937
-msgid "StatusNet software license"
-msgstr "Llicència del programari StatusNet"
-
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:944
+#: lib/action.php:921
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7323,7 +7366,7 @@ msgstr ""
 "site.broughtbyurl%%)."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:947
+#: lib/action.php:924
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** és un servei de microblogging."
@@ -7332,7 +7375,7 @@ msgstr "**%%site.name%%** és un servei de microblogging."
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:954
+#: lib/action.php:931
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7343,28 +7386,23 @@ msgstr ""
 "%s, disponible sota la [GNU Affero General Public License](http://www.fsf."
 "org/licensing/licenses/agpl-3.0.html)."
 
-#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:970
-msgid "Site content license"
-msgstr "Llicència de contingut del lloc"
-
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:977
+#: lib/action.php:949
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr "El contingut i les dades de %1$s són privades i confidencials."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:984
+#: lib/action.php:956
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
 "El contingut i les dades són copyright de %1$s. Tots els drets reservats."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:988
+#: lib/action.php:960
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 "El contingut i les dades són copyright dels col·laboradors. Tots els drets "
@@ -7372,27 +7410,22 @@ msgstr ""
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:1020
+#: lib/action.php:992
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
 "Tot el contingut i les dades de %1$s es troben disponibles sota una "
 "llicència %2$s."
 
-#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1356
-msgid "Pagination"
-msgstr "Paginació"
-
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1367
+#: lib/action.php:1335
 msgid "After"
 msgstr "Posteriors"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1377
+#: lib/action.php:1345
 msgid "Before"
 msgstr "Anteriors"
 
@@ -7547,7 +7580,7 @@ msgid "User configuration"
 msgstr "Configuració de l'usuari"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:122
+#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:110
 msgid "User"
 msgstr "Usuari"
 
@@ -7571,6 +7604,11 @@ msgstr "Configuració de les sessions"
 msgid "Edit site notice"
 msgstr "Edita l'avís del lloc"
 
+#. TRANS: Menu item for site administration
+#: lib/adminpanelaction.php:387
+msgid "Site notice"
+msgstr "Avís del lloc"
+
 #. TRANS: Menu item title/tooltip
 #: lib/adminpanelaction.php:393
 msgid "Snapshots configuration"
@@ -7581,6 +7619,12 @@ msgstr "Configuració de les instantànies"
 msgid "Set site license"
 msgstr "Defineix la llicència del lloc"
 
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:409
+#, fuzzy
+msgid "Plugins configuration"
+msgstr "Configuració dels camins"
+
 #. TRANS: Client error 401.
 #: lib/apiauth.php:111
 msgid "API resource requires read-write access, but you only have read access."
@@ -7593,19 +7637,23 @@ msgstr ""
 msgid "No application for that consumer key."
 msgstr "No hi ha cap aplicació per a aquest clau de consumidor."
 
+#: lib/apiauth.php:202 lib/apiauth.php:284
+msgid "Not allowed to use API."
+msgstr "No es permet l'ús de l'API."
+
 #. TRANS: OAuth exception given when an incorrect access token was given for a user.
-#: lib/apiauth.php:219
+#: lib/apiauth.php:225
 msgid "Bad access token."
 msgstr "Testimoni d'accés incorrecte."
 
 #. TRANS: OAuth exception given when no user was found for a given token (no token was found).
-#: lib/apiauth.php:224
+#: lib/apiauth.php:230
 msgid "No user for that token."
 msgstr "No hi ha cap usuari per aquest testimoni."
 
 #. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel".
 #. TRANS: Client error thrown when authentication fails.
-#: lib/apiauth.php:266 lib/apiauth.php:293
+#: lib/apiauth.php:272 lib/apiauth.php:302
 msgid "Could not authenticate you."
 msgstr "No se us ha pogut autenticar."
 
@@ -7651,6 +7699,11 @@ msgstr "S'ha provat de revocar el testimoni desconegut."
 msgid "Failed to delete revoked token."
 msgstr "No s'ha pogut suprimir el testimoni revocat."
 
+#. TRANS: Form input field label for application icon.
+#: lib/applicationeditform.php:177
+msgid "Icon"
+msgstr "Icona"
+
 #. TRANS: Form guide.
 #: lib/applicationeditform.php:182
 msgid "Icon for this application"
@@ -7685,6 +7738,11 @@ msgstr "URL d'origen"
 msgid "Organization responsible for this application"
 msgstr "Organització responsable de l'aplicació"
 
+#. TRANS: Form input field label.
+#: lib/applicationeditform.php:227
+msgid "Organization"
+msgstr "Organització"
+
 #. TRANS: Form input field instructions.
 #: lib/applicationeditform.php:234
 msgid "URL for the homepage of the organization"
@@ -7773,16 +7831,6 @@ msgstr "L'element autor ha de contenir un element nom."
 msgid "Do not use this method!"
 msgstr "No feu servir aquest mètode!"
 
-#. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:293
-msgid "Author"
-msgstr "Autoria"
-
-#. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:307
-msgid "Provider"
-msgstr "Proveïdor"
-
 #. TRANS: Title.
 #: lib/attachmentnoticesection.php:67
 msgid "Notices where this attachment appears"
@@ -7808,23 +7856,28 @@ msgstr "No es permet el canvi de contrasenya."
 msgid "Block"
 msgstr "Bloca"
 
+#. TRANS: Description of the form to block a user.
+#: lib/blockform.php:79
+msgid "Block this user"
+msgstr "Bloca aquest usuari"
+
 #. TRANS: Title for command results.
-#: lib/channel.php:160 lib/channel.php:181
+#: lib/channel.php:104 lib/channel.php:125
 msgid "Command results"
 msgstr "Resultats de les comandes"
 
 #. TRANS: Title for command results.
-#: lib/channel.php:194
+#: lib/channel.php:138
 msgid "AJAX error"
 msgstr "Error de l'AJAX"
 
 #. TRANS: E-mail subject when a command has completed.
-#: lib/channel.php:233 lib/mailhandler.php:143
+#: lib/channel.php:177 lib/mailhandler.php:143
 msgid "Command complete"
 msgstr "Comanda completada"
 
 #. TRANS: E-mail subject when a command has failed.
-#: lib/channel.php:244
+#: lib/channel.php:188
 msgid "Command failed"
 msgstr "Comanda fallida"
 
@@ -7927,7 +7980,7 @@ msgstr "Nom complet: %s"
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a location.
-#: lib/command.php:446 lib/mail.php:270
+#: lib/command.php:446 lib/mail.php:275
 #, php-format
 msgid "Location: %s"
 msgstr "Localització: %s"
@@ -7935,7 +7988,7 @@ msgstr "Localització: %s"
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a homepage.
-#: lib/command.php:450 lib/mail.php:274
+#: lib/command.php:450 lib/mail.php:279
 #, php-format
 msgid "Homepage: %s"
 msgstr "Pàgina web: %s"
@@ -8211,108 +8264,101 @@ msgstr ""
 "tracking - no s'ha implementat encara.\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:162
+#: lib/common.php:36
 msgid "No configuration file found."
 msgstr "No s'ha trobat cap fitxer de configuració. "
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:165
+#: lib/common.php:39
 msgid "I looked for configuration files in the following places:"
 msgstr "S'han cercat fitxers de configuracions en els llocs següents: "
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:168
+#: lib/common.php:42
 msgid "You may wish to run the installer to fix this."
 msgstr "Podeu voler executar l'instal·lador per corregir-ho."
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:172
+#: lib/common.php:46
 msgid "Go to the installer."
 msgstr "Vés a l'instal·lador."
 
-#. TRANS: Menu item for Instant Messaging settings.
-#: lib/connectsettingsaction.php:106
-msgctxt "MENU"
-msgid "IM"
-msgstr "MI"
-
-#. TRANS: Tooltip for Instant Messaging menu item.
-#: lib/connectsettingsaction.php:108
-msgid "Updates by instant messenger (IM)"
-msgstr "Actualitzacions per missatgeria instantània (MI)"
-
-#. TRANS: Menu item for Short Message Service settings.
-#: lib/connectsettingsaction.php:113
-msgctxt "MENU"
-msgid "SMS"
-msgstr "SMS"
-
-#. TRANS: Tooltip for Short Message Service menu item.
-#: lib/connectsettingsaction.php:115
-msgid "Updates by SMS"
-msgstr "Actualitzacions per SMS"
-
-#. TRANS: Menu item for OuAth connection settings.
-#: lib/connectsettingsaction.php:120
-msgctxt "MENU"
-msgid "Connections"
-msgstr "Connexions"
-
-#. TRANS: Tooltip for connected applications (Connections through OAuth) menu item.
-#: lib/connectsettingsaction.php:122
-msgid "Authorized connected applications"
-msgstr "Aplicacions de connexió autoritzades"
-
 #: lib/dberroraction.php:59
 msgid "Database error"
 msgstr "Error de la base de dades"
 
+#. TRANS: Description of form for deleting a user.
+#: lib/deleteuserform.php:75
+msgid "Delete this user"
+msgstr "Elimina l'usuari"
+
+#: lib/designform.php:114
+#, fuzzy
+msgid "Change design"
+msgstr "Desa el disseny"
+
+#. TRANS: Fieldset legend on profile design page to change profile page colours.
+#: lib/designform.php:131
+msgid "Change colours"
+msgstr "Canvia els colors"
+
+#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
+#: lib/designform.php:138
+msgid "Use defaults"
+msgstr "Utilitza els paràmetres per defecte"
+
+#. TRANS: Title for button on profile design page to reset all colour settings to default.
+#: lib/designform.php:140
+msgid "Restore default designs"
+msgstr "Restaura els dissenys per defecte"
+
+#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
+#: lib/designform.php:148
+msgid "Reset back to default"
+msgstr "Torna a restaurar al valor per defecte"
+
 #. TRANS: Label in form on profile design page.
 #. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
-#: lib/designsettings.php:108
+#: lib/designform.php:158
 msgid "Upload file"
 msgstr "Puja un fitxer"
 
 #. TRANS: Instructions for form on profile design page.
-#: lib/designsettings.php:113
+#: lib/designform.php:163
+#, fuzzy
 msgid ""
-"You can upload your personal background image. The maximum file size is 2MB."
+"You can upload your personal background image. The maximum file size is 2Mb."
 msgstr ""
 "Podeu pujar la vostra imatge de fons personal. La mida màxima del fitxer és "
 "2MB."
 
 #. TRANS: Radio button on profile design page that will enable use of the uploaded profile image.
-#: lib/designsettings.php:139
+#: lib/designform.php:194
 msgctxt "RADIO"
 msgid "On"
 msgstr "Activada"
 
 #. TRANS: Radio button on profile design page that will disable use of the uploaded profile image.
-#: lib/designsettings.php:156
+#: lib/designform.php:211
 msgctxt "RADIO"
 msgid "Off"
 msgstr "Desactivada"
 
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: lib/designsettings.php:175
-msgid "Change colours"
-msgstr "Canvia els colors"
-
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: lib/designsettings.php:257
-msgid "Use defaults"
-msgstr "Utilitza els paràmetres per defecte"
+#. TRANS: Title for button on profile design page to save settings.
+#: lib/designform.php:322
+msgid "Save design"
+msgstr "Desa el disseny"
 
 #. TRANS: Error message displayed if design settings could not be saved.
 #. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
-#: lib/designsettings.php:405 lib/designsettings.php:427
+#: lib/designsettings.php:216 lib/designsettings.php:238
 msgid "Couldn't update your design."
 msgstr "No s'ha pogut actualitzar el vostre disseny."
 
 #. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
-#: lib/designsettings.php:433
+#: lib/designsettings.php:244
 msgid "Design defaults restored."
 msgstr "S'han restaurat els paràmetres de disseny per defecte."
 
@@ -8379,27 +8425,23 @@ msgstr "No es pot importar sense un usuari."
 msgid "Feeds"
 msgstr "Canals"
 
-#: lib/galleryaction.php:121
-msgid "Filter tags"
-msgstr "Filtre d'etiquetes"
-
-#: lib/galleryaction.php:131
+#: lib/galleryaction.php:128
 msgid "All"
 msgstr "Tot"
 
-#: lib/galleryaction.php:139
+#: lib/galleryaction.php:136
 msgid "Select tag to filter"
 msgstr "Seleccioneu l'etiqueta per filtrar"
 
-#: lib/galleryaction.php:140
+#: lib/galleryaction.php:137
 msgid "Tag"
 msgstr "Etiqueta"
 
-#: lib/galleryaction.php:141
+#: lib/galleryaction.php:138
 msgid "Choose a tag to narrow list"
 msgstr "Trieu una etiqueta per escurçar la llista"
 
-#: lib/galleryaction.php:143
+#: lib/galleryaction.php:140
 msgid "Go"
 msgstr "Vés-hi"
 
@@ -8491,6 +8533,12 @@ msgctxt "TOOLTIP"
 msgid "%s blocked users"
 msgstr "%s usuaris blocats"
 
+#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
+#: lib/groupnav.php:117
+msgctxt "MENU"
+msgid "Admin"
+msgstr "Administrador"
+
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
 #: lib/groupnav.php:120
@@ -8600,39 +8648,62 @@ msgid_plural "%dB"
 msgstr[0] "%dB"
 msgstr[1] "%dB"
 
-#: lib/jabber.php:387
+#: lib/implugin.php:262
 #, php-format
-msgid "[%s]"
-msgstr "[%s]"
+msgid ""
+"User \"%s\" on %s has said that your %s screenname belongs to them. If "
+"that's true, you can confirm by clicking on this URL: %s . (If you cannot "
+"click it, copy-and-paste it into the address bar of your browser). If that "
+"user isn't you, or if you didn't request this confirmation, just ignore this "
+"message."
+msgstr ""
 
-#: lib/jabber.php:567
+#: lib/implugin.php:349
 #, php-format
 msgid "Unknown inbox source %d."
 msgstr "Font %d de la safata d'entrada desconeguda."
 
+#: lib/implugin.php:485
+#, fuzzy, php-format
+msgid "Message too long - maximum is %1$d characters, you sent %2$d."
+msgstr ""
+"El missatge és massa llarg - el màxim és %1$d caràcter, i n'heu enviat %2$d."
+
 #: lib/leaveform.php:114
 msgid "Leave"
 msgstr "Deixa"
 
+#. TRANS: Menu item for logging in to the StatusNet site.
+#: lib/logingroupnav.php:77
+msgctxt "MENU"
+msgid "Login"
+msgstr "Inici de sessió"
+
 #. TRANS: Title for menu item for logging in to the StatusNet site.
 #: lib/logingroupnav.php:79
 msgid "Login with a username and password"
 msgstr "Accedir amb el nom d'usuari i contrasenya"
 
+#. TRANS: Menu item for registering with the StatusNet site.
+#: lib/logingroupnav.php:85
+msgctxt "MENU"
+msgid "Register"
+msgstr "Registre"
+
 #. TRANS: Title for menu item for registering with the StatusNet site.
 #: lib/logingroupnav.php:87
 msgid "Sign up for a new account"
 msgstr "Registreu-vos-hi si voleu un compte nou"
 
 #. TRANS: Subject for address confirmation email.
-#: lib/mail.php:168
+#: lib/mail.php:172
 msgid "Email address confirmation"
 msgstr "Confirmació de l'adreça de correu electrònic"
 
 #. TRANS: Body for address confirmation email.
 #. TRANS: %1$s is the addressed user's nickname, %2$s is the StatusNet sitename,
 #. TRANS: %3$s is the URL to confirm at.
-#: lib/mail.php:173
+#: lib/mail.php:177
 #, php-format
 msgid ""
 "Hey, %1$s.\n"
@@ -8664,14 +8735,14 @@ msgstr ""
 
 #. TRANS: Subject of new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
-#: lib/mail.php:238
+#: lib/mail.php:243
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1$s ara està escoltant els vostres avisos a %2$s."
 
 #. TRANS: This is a paragraph in a new-subscriber e-mail.
 #. TRANS: %s is a URL where the subscriber can be reported as abusive.
-#: lib/mail.php:245
+#: lib/mail.php:250
 #, php-format
 msgid ""
 "If you believe this account is being used abusively, you can block them from "
@@ -8686,7 +8757,7 @@ msgstr ""
 #. TRANS: %3$s is the subscriber's profile URL, %4$s is the subscriber's location (or empty)
 #. TRANS: %5$s is the subscriber's homepage URL (or empty), %6%s is the subscriber's bio (or empty)
 #. TRANS: %7$s is a link to the addressed user's e-mail settings.
-#: lib/mail.php:255
+#: lib/mail.php:260
 #, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -8713,14 +8784,14 @@ msgstr ""
 
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is biographical information.
-#: lib/mail.php:278
+#: lib/mail.php:283
 #, php-format
 msgid "Bio: %s"
 msgstr "Biografia: %s"
 
 #. TRANS: Subject of notification mail for new posting email address.
 #. TRANS: %s is the StatusNet sitename.
-#: lib/mail.php:307
+#: lib/mail.php:312
 #, php-format
 msgid "New email address for posting to %s"
 msgstr "Nou correu electrònic per publicar a %s"
@@ -8728,7 +8799,7 @@ msgstr "Nou correu electrònic per publicar a %s"
 #. TRANS: Body of notification mail for new posting email address.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is the e-mail address to send
 #. TRANS: to to post by e-mail, %3$s is a URL to more instructions.
-#: lib/mail.php:313
+#: lib/mail.php:318
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -8751,26 +8822,26 @@ msgstr ""
 
 #. TRANS: Subject line for SMS-by-email notification messages.
 #. TRANS: %s is the posting user's nickname.
-#: lib/mail.php:434
+#: lib/mail.php:439
 #, php-format
 msgid "%s status"
 msgstr "%s estat"
 
 #. TRANS: Subject line for SMS-by-email address confirmation message.
-#: lib/mail.php:460
+#: lib/mail.php:465
 msgid "SMS confirmation"
 msgstr "Confirmació SMS"
 
 #. TRANS: Main body heading for SMS-by-email address confirmation message.
 #. TRANS: %s is the addressed user's nickname.
-#: lib/mail.php:464
+#: lib/mail.php:469
 #, php-format
 msgid "%s: confirm you own this phone number with this code:"
 msgstr "%s: confirmeu-ho si teniu aquest número de telèfon amb aquest codi:"
 
 #. TRANS: Subject for 'nudge' notification email.
 #. TRANS: %s is the nudging user.
-#: lib/mail.php:485
+#: lib/mail.php:490
 #, php-format
 msgid "You have been nudged by %s"
 msgstr "%s us ha cridat l'atenció"
@@ -8778,7 +8849,7 @@ msgstr "%s us ha cridat l'atenció"
 #. TRANS: Body for 'nudge' notification email.
 #. TRANS: %1$s is the nuding user's long name, $2$s is the nudging user's nickname,
 #. TRANS: %3$s is a URL to post notices at, %4$s is the StatusNet sitename.
-#: lib/mail.php:492
+#: lib/mail.php:497
 #, php-format
 msgid ""
 "%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -8806,7 +8877,7 @@ msgstr ""
 
 #. TRANS: Subject for direct-message notification email.
 #. TRANS: %s is the sending user's nickname.
-#: lib/mail.php:539
+#: lib/mail.php:544
 #, php-format
 msgid "New private message from %s"
 msgstr "Nou missatge privat de %s"
@@ -8815,7 +8886,7 @@ msgstr "Nou missatge privat de %s"
 #. TRANS: %1$s is the sending user's long name, %2$s is the sending user's nickname,
 #. TRANS: %3$s is the message content, %4$s a URL to the message,
 #. TRANS: %5$s is the StatusNet sitename.
-#: lib/mail.php:547
+#: lib/mail.php:552
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -8850,7 +8921,7 @@ msgstr ""
 
 #. TRANS: Subject for favorite notification e-mail.
 #. TRANS: %1$s is the adding user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:599
+#: lib/mail.php:604
 #, php-format
 msgid "%1$s (@%2$s) added your notice as a favorite"
 msgstr "%1$s (@%2$s) ha afegit el vostre avís com a preferit"
@@ -8860,7 +8931,7 @@ msgstr "%1$s (@%2$s) ha afegit el vostre avís com a preferit"
 #. TRANS: %3$s is a URL to the faved notice, %4$s is the faved notice text,
 #. TRANS: %5$s is a URL to all faves of the adding user, %6$s is the StatusNet sitename,
 #. TRANS: %7$s is the adding user's nickname.
-#: lib/mail.php:606
+#: lib/mail.php:611
 #, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -8898,7 +8969,7 @@ msgstr ""
 "%6$s\n"
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:664
+#: lib/mail.php:669
 #, php-format
 msgid ""
 "The full conversation can be read here:\n"
@@ -8911,7 +8982,7 @@ msgstr ""
 
 #. TRANS: E-mail subject for notice notification.
 #. TRANS: %1$s is the sending user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:672
+#: lib/mail.php:677
 #, php-format
 msgid "%1$s (@%2$s) sent a notice to your attention"
 msgstr "%1$s (@%2$s) us ha enviat un avís a la vostra atenció"
@@ -8922,7 +8993,7 @@ msgstr "%1$s (@%2$s) us ha enviat un avís a la vostra atenció"
 #. TRANS: %5$s is a URL to the full conversion if it exists (otherwise empty),
 #. TRANS: %6$s is a URL to reply to the notice, %7$s is a URL to all @-replied for the addressed user,
 #. TRANS: %8$s is a URL to the addressed user's e-mail settings, %9$s is the sender's nickname.
-#: lib/mail.php:680
+#: lib/mail.php:685
 #, php-format
 msgid ""
 "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -9067,11 +9138,7 @@ msgstr "No teniu subscriptors mutus."
 msgid "To"
 msgstr "A"
 
-#: lib/messageform.php:166 lib/noticeform.php:186
-msgid "Available characters"
-msgstr "Caràcters disponibles"
-
-#: lib/messageform.php:185 lib/noticeform.php:237
+#: lib/messageform.php:184 lib/noticeform.php:236
 msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr "Envia"
@@ -9080,17 +9147,10 @@ msgstr "Envia"
 msgid "Messages"
 msgstr "Missatges"
 
-#: lib/messagelistitem.php:123 lib/noticelist.php:522
+#: lib/messagelistitem.php:123 lib/noticelist.php:527
 msgid "from"
 msgstr "de"
 
-#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:165
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr ""
-"El sobrenom ha de tenir només lletres minúscules i números i no pot tenir "
-"espais."
-
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 #: lib/nickname.php:178
 msgid "Nickname cannot be empty."
@@ -9113,23 +9173,23 @@ msgstr "Envia un avís"
 msgid "What's up, %s?"
 msgstr "Què tal, %s?"
 
-#: lib/noticeform.php:194
+#: lib/noticeform.php:193
 msgid "Attach"
 msgstr "Adjunta"
 
-#: lib/noticeform.php:198
+#: lib/noticeform.php:197
 msgid "Attach a file"
 msgstr "Adjunta un fitxer"
 
-#: lib/noticeform.php:213
+#: lib/noticeform.php:212
 msgid "Share my location"
 msgstr "Comparteix la ubicació on estic"
 
-#: lib/noticeform.php:216
+#: lib/noticeform.php:215
 msgid "Do not share my location"
 msgstr "Amaga la ubicació on estic"
 
-#: lib/noticeform.php:217
+#: lib/noticeform.php:216
 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
 "try again later"
@@ -9138,55 +9198,59 @@ msgstr ""
 "l'esperat; torneu-ho a provar més tard"
 
 #. TRANS: Used in coordinates as abbreviation of north
-#: lib/noticelist.php:452
+#: lib/noticelist.php:457
 msgid "N"
 msgstr "N"
 
 #. TRANS: Used in coordinates as abbreviation of south
-#: lib/noticelist.php:454
+#: lib/noticelist.php:459
 msgid "S"
 msgstr "S"
 
 #. TRANS: Used in coordinates as abbreviation of east
-#: lib/noticelist.php:456
+#: lib/noticelist.php:461
 msgid "E"
 msgstr "E"
 
 #. TRANS: Used in coordinates as abbreviation of west
-#: lib/noticelist.php:458
+#: lib/noticelist.php:463
 msgid "W"
 msgstr "O"
 
-#: lib/noticelist.php:460
+#: lib/noticelist.php:465
 #, php-format
 msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 
-#: lib/noticelist.php:469
+#: lib/noticelist.php:474
 msgid "at"
 msgstr "a"
 
-#: lib/noticelist.php:518
+#: lib/noticelist.php:523
 msgid "web"
 msgstr "web"
 
-#: lib/noticelist.php:584
+#: lib/noticelist.php:589
 msgid "in context"
 msgstr "en context"
 
-#: lib/noticelist.php:619
+#: lib/noticelist.php:624
 msgid "Repeated by"
 msgstr "Repetit per"
 
-#: lib/noticelist.php:646
+#: lib/noticelist.php:651
 msgid "Reply to this notice"
 msgstr "Respon a aquest avís"
 
-#: lib/noticelist.php:647
+#: lib/noticelist.php:652
 msgid "Reply"
 msgstr "Respon"
 
-#: lib/noticelist.php:691
+#: lib/noticelist.php:678
+msgid "Delete this notice"
+msgstr "Elimina aquest avís"
+
+#: lib/noticelist.php:696
 msgid "Notice repeated"
 msgstr "Avís repetit"
 
@@ -9223,43 +9287,31 @@ msgstr "Avís duplicat."
 msgid "Couldn't insert new subscription."
 msgstr "No s'ha pogut inserir una nova subscripció."
 
-#. TRANS: Personal group navigation menu option when logged in for viewing @-replies.
-#: lib/personalgroupnav.php:107
-msgctxt "MENU"
+#: lib/personalgroupnav.php:104
+#, fuzzy
 msgid "Replies"
 msgstr "Respostes"
 
-#. TRANS: Personal group navigation menu option when logged in for seeing own profile.
-#: lib/personalgroupnav.php:114
-msgctxt "MENU"
-msgid "Profile"
-msgstr "Perfil"
-
-#. TRANS: Personal group navigation menu option when logged in for viewing own favourited notices.
-#: lib/personalgroupnav.php:120
-msgctxt "MENU"
+#: lib/personalgroupnav.php:109
+#, fuzzy
 msgid "Favorites"
 msgstr "Preferits"
 
-#. TRANS: Personal group navigation menu option when logged in for viewing recieved personal messages.
-#: lib/personalgroupnav.php:133
-msgctxt "MENU"
+#: lib/personalgroupnav.php:120
+#, fuzzy
 msgid "Inbox"
 msgstr "Safata d'entrada"
 
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing recieved personal messages.
-#: lib/personalgroupnav.php:135
+#: lib/personalgroupnav.php:121
 msgid "Your incoming messages"
 msgstr "Els teus missatges rebuts"
 
-#. TRANS: Personal group navigation menu option when logged in for viewing senet personal messages.
-#: lib/personalgroupnav.php:140
-msgctxt "MENU"
+#: lib/personalgroupnav.php:125
+#, fuzzy
 msgid "Outbox"
 msgstr "Safata de sortida"
 
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing senet personal messages.
-#: lib/personalgroupnav.php:142
+#: lib/personalgroupnav.php:126
 msgid "Your sent messages"
 msgstr "Els teus missatges enviats"
 
@@ -9274,9 +9326,26 @@ msgstr "Etiquetes en els avisos de %s"
 msgid "Unknown"
 msgstr "Desconegut"
 
+#. TRANS: Plugin admin panel controls
+#: lib/plugindisableform.php:90
+msgctxt "plugin"
+msgid "Disable"
+msgstr ""
+
+#. TRANS: Plugin admin panel controls
+#: lib/pluginenableform.php:112
+msgctxt "plugin"
+msgid "Enable"
+msgstr ""
+
+#: lib/pluginlist.php:196
+msgctxt "plugin-description"
+msgid "(Plugin descriptions unavailable when disabled.)"
+msgstr ""
+
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:82
+#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:88
 msgid "Subscriptions"
 msgstr "Subscripcions"
 
@@ -9287,7 +9356,7 @@ msgstr "Totes les subscripcions"
 
 #. TRANS: H2 text for user subscriber statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:90
+#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:96
 msgid "Subscribers"
 msgstr "Subscriptors"
 
@@ -9309,7 +9378,7 @@ msgstr "Membre des de"
 #. TRANS: Label for user statistics.
 #. TRANS: H2 text for user group membership statistics.
 #: lib/profileaction.php:239 lib/profileaction.php:290
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:104
 msgid "Groups"
 msgstr "Grups"
 
@@ -9329,10 +9398,6 @@ msgstr "Tots els grups"
 msgid "Unimplemented method."
 msgstr "Mètode no implementat"
 
-#: lib/publicgroupnav.php:78
-msgid "Public"
-msgstr "Públic"
-
 #: lib/publicgroupnav.php:82
 msgid "User groups"
 msgstr "Grups d'usuaris"
@@ -9371,7 +9436,7 @@ msgid "Revoke the \"%s\" role from this user"
 msgstr "Revoca el rol «%s» de l'usuari"
 
 #. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:974
+#: lib/router.php:1001
 msgid "Page not found."
 msgstr "No s'ha trobat la pàgina."
 
@@ -9400,11 +9465,6 @@ msgctxt "BUTTON"
 msgid "Search"
 msgstr "Cerca"
 
-#. TRANS: Definition list item with instructions on how to get (better) search results.
-#: lib/searchaction.php:170
-msgid "Search help"
-msgstr "Ajuda de la cerca"
-
 #: lib/searchgroupnav.php:80
 msgid "People"
 msgstr "Gent"
@@ -9429,6 +9489,51 @@ msgstr "Secció sense títol"
 msgid "More..."
 msgstr "Més..."
 
+#: lib/settingsnav.php:78
+msgid "Change your profile settings"
+msgstr "Canvieu els paràmetres del vostre perfil"
+
+#: lib/settingsnav.php:83
+msgid "Upload an avatar"
+msgstr "Puja un avatar"
+
+#: lib/settingsnav.php:88
+msgid "Change your password"
+msgstr "Canvieu la vostra contrasenya"
+
+#: lib/settingsnav.php:93
+msgid "Change email handling"
+msgstr "Canvieu la gestió del correu"
+
+#: lib/settingsnav.php:98
+msgid "Design your profile"
+msgstr "Dissenyeu el vostre perfil"
+
+#: lib/settingsnav.php:102
+msgid "URL"
+msgstr "URL"
+
+#: lib/settingsnav.php:103
+msgid "URL shorteners"
+msgstr ""
+
+#: lib/settingsnav.php:111
+msgid "Updates by instant messenger (IM)"
+msgstr "Actualitzacions per missatgeria instantània (MI)"
+
+#: lib/settingsnav.php:118
+msgid "Updates by SMS"
+msgstr "Actualitzacions per SMS"
+
+#: lib/settingsnav.php:123
+#, fuzzy
+msgid "Connections"
+msgstr "Connexions"
+
+#: lib/settingsnav.php:124
+msgid "Authorized connected applications"
+msgstr "Aplicacions de connexió autoritzades"
+
 #: lib/silenceform.php:67
 msgid "Silence"
 msgstr "Silencia"
@@ -9437,30 +9542,34 @@ msgstr "Silencia"
 msgid "Silence this user"
 msgstr "Silencia l'usuari"
 
-#: lib/subgroupnav.php:83
+#: lib/subgroupnav.php:89
 #, php-format
 msgid "People %s subscribes to"
 msgstr "Persones %s subscrites a"
 
-#: lib/subgroupnav.php:91
+#: lib/subgroupnav.php:97
 #, php-format
 msgid "People subscribed to %s"
 msgstr "Gent subscrita a %s"
 
-#: lib/subgroupnav.php:99
+#: lib/subgroupnav.php:105
 #, php-format
 msgid "Groups %s is a member of"
 msgstr "%s grups són membres de"
 
-#: lib/subgroupnav.php:105
+#: lib/subgroupnav.php:111
 msgid "Invite"
 msgstr "Convida"
 
-#: lib/subgroupnav.php:106
+#: lib/subgroupnav.php:112
 #, php-format
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Convida amics i companys perquè participin a %s"
 
+#: lib/subscribeform.php:115 lib/subscribeform.php:139
+msgid "Subscribe to this user"
+msgstr "Subscriu-me a aquest usuari"
+
 #: lib/subscriberspeopleselftagcloudsection.php:48
 #: lib/subscriptionspeopleselftagcloudsection.php:48
 msgid "People Tagcloud as self-tagged"
@@ -9533,6 +9642,13 @@ msgstr "El tema conté un tipus de fitxer «.%s», que no està permès."
 msgid "Error opening theme archive."
 msgstr "S'ha produït un error en obrir l'arxiu del tema."
 
+#: lib/threadednoticelist.php:270
+#, php-format
+msgid "Show all %d comment"
+msgid_plural "Show all %d comments"
+msgstr[0] ""
+msgstr[1] ""
+
 #: lib/topposterssection.php:74
 msgid "Top posters"
 msgstr "Qui més publica"
@@ -9574,76 +9690,79 @@ msgstr "Cancel·la la subscripció"
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "L'usuari %1$s (%2$d) no té un registre de perfil."
 
-#. TRANS: Link text for changeing the avatar of the logged in user.
-#: lib/userprofile.php:121
+#: lib/userprofile.php:116
 msgid "Edit Avatar"
 msgstr "Edita l'avatar"
 
 #. TRANS: H2 for user actions in a profile.
 #. TRANS: H2 for entity actions in a profile.
-#: lib/userprofile.php:245 lib/userprofile.php:261
+#: lib/userprofile.php:216 lib/userprofile.php:232
 msgid "User actions"
 msgstr "Accions de l'usuari"
 
 #. TRANS: Text shown in user profile of not yet compeltely deleted users.
-#: lib/userprofile.php:249
+#: lib/userprofile.php:220
 msgid "User deletion in progress..."
 msgstr "S'està eliminant l'usuari..."
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:277
+#: lib/userprofile.php:248
 msgid "Edit profile settings"
 msgstr "Edita la configuració del perfil"
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:279
+#: lib/userprofile.php:250
 msgid "Edit"
 msgstr "Edita"
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:303
+#: lib/userprofile.php:274
 msgid "Send a direct message to this user"
 msgstr "Envia un missatge directe a aquest usuari"
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:305
+#: lib/userprofile.php:276
 msgid "Message"
 msgstr "Missatge"
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:347
+#: lib/userprofile.php:318
 msgid "Moderate"
 msgstr "Modera"
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:386
+#: lib/userprofile.php:357
 msgid "User role"
 msgstr "Rol de l'usuari"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:389
+#: lib/userprofile.php:360
 msgctxt "role"
 msgid "Administrator"
 msgstr "Administrador"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:391
+#: lib/userprofile.php:362
 msgctxt "role"
 msgid "Moderator"
 msgstr "Moderador"
 
+#: lib/util.php:321
+msgid "Not allowed to log in."
+msgstr "No es permet iniciar una sessió."
+
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1306
+#: lib/util.php:1337
 msgid "a few seconds ago"
 msgstr "fa pocs segons"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1309
+#: lib/util.php:1340
 msgid "about a minute ago"
 msgstr "fa un minut"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1313
+#: lib/util.php:1344
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
@@ -9651,12 +9770,12 @@ msgstr[0] "aproximadament fa un minut"
 msgstr[1] "aproximadament fa %d minuts"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1316
+#: lib/util.php:1347
 msgid "about an hour ago"
 msgstr "fa una hora"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1320
+#: lib/util.php:1351
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
@@ -9664,12 +9783,12 @@ msgstr[0] "aproximadament fa una hora"
 msgstr[1] "aproximadament fa %d hores"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1323
+#: lib/util.php:1354
 msgid "about a day ago"
 msgstr "fa un dia"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1327
+#: lib/util.php:1358
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
@@ -9677,12 +9796,12 @@ msgstr[0] "aproximadament fa un dia"
 msgstr[1] "aproximadament fa %d dies"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1330
+#: lib/util.php:1361
 msgid "about a month ago"
 msgstr "fa un mes"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1334
+#: lib/util.php:1365
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
@@ -9690,7 +9809,7 @@ msgstr[0] "aproximadament fa un mes"
 msgstr[1] "aproximadament fa %d mesos"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1337
+#: lib/util.php:1368
 msgid "about a year ago"
 msgstr "fa un any"
 
@@ -9701,23 +9820,6 @@ msgstr "fa un any"
 msgid "%s is not a valid color! Use 3 or 6 hex characters."
 msgstr "%s no és un color vàlid! Feu servir 3 o 6 caràcters hexadecimals."
 
-#. TRANS: %s is the URL to the StatusNet site's Instant Messaging settings.
-#: lib/xmppmanager.php:287
-#, php-format
-msgid "Unknown user. Go to %s to add your address to your account"
-msgstr "Usuari desconegut. Aneu a %s per afegir una adreça al vostre compte"
-
-#. TRANS: Response to XMPP source when it sent too long a message.
-#. TRANS: %1$d the maximum number of allowed characters (used for plural), %2$d is the sent number.
-#: lib/xmppmanager.php:406
-#, php-format
-msgid "Message too long. Maximum is %1$d character, you sent %2$d."
-msgid_plural "Message too long. Maximum is %1$d characters, you sent %2$d."
-msgstr[0] ""
-"El missatge és massa llarg - el màxim és %1$d caràcter, i n'heu enviat %2$d."
-msgstr[1] ""
-"El missatge és massa llarg - el màxim és %1$d caràcters, i n'heu enviat %2$d."
-
 #. TRANS: Exception.
 #: lib/xrd.php:63
 msgid "Invalid XML."
@@ -9734,64 +9836,176 @@ msgstr "L'XML no és vàlid, hi manca l'arrel XRD."
 msgid "Getting backup from file '%s'."
 msgstr "Es recupera la còpia de seguretat del fitxer '%s'."
 
-#~ msgid "Block this user."
-#~ msgstr "Bloca l'usuari."
+#~ msgid "Could not generate feed for group - %s"
+#~ msgstr "No s'ha pogut generar un canal per al grup - %s."
 
-#~ msgid "Delete this notice."
-#~ msgstr "Elimina l'avís."
+#~ msgid "Current confirmed Jabber/Google Talk address."
+#~ msgstr "Adreça actual Jabber/Gtalk confirmada."
 
-#~ msgid "Delete this user."
-#~ msgstr "Elimina l'usuari."
-
-#~ msgid "Restore default designs."
-#~ msgstr "Restaura els dissenys per defecte."
-
-#~ msgid "Reset back to default."
-#~ msgstr "Torna a restaurar els paràmetres per defecte."
-
-#~ msgid "Save design."
-#~ msgstr "Desa el disseny."
-
-#~ msgid "Disfavor favorite."
-#~ msgstr "Fes que deixi de ser preferit."
-
-#~ msgid "\"%s\" not found."
-#~ msgstr "No s'ha trobat «%s»."
-
-#~ msgid "Notice %s not found."
-#~ msgstr "No s'ha trobat l'avís «%s»."
-
-#~ msgid "Attachment %s not found."
-#~ msgstr "No s'ha trobat l'adjunció %s."
-
-#~ msgid "\"%s\" not supported for oembed requests."
-#~ msgstr "No es permet «%s» per a sol·licituds oembed."
-
-#~ msgid "Invalid tag: \"%s\"."
-#~ msgstr "Etiqueta no vàlida: «%s»."
-
-#~ msgid "%s updates from everyone."
-#~ msgstr "%s actualitzacions de tothom."
-
-#~ msgid "Password saved"
-#~ msgstr "Contrasenya desada"
-
-#~ msgid "Where you are, like \"City, State (or Region), Country\"."
-#~ msgstr "On us trobeu, per exemple «ciutat, comarca (o illa), país»."
-
-#~ msgid "Subscribe to this user."
-#~ msgstr "Subscriu-me a aquest usuari"
-
-#, fuzzy
 #~ msgid ""
-#~ "Listenee stream license \"%1$s\" is not compatible with site license \"%2"
-#~ "$s\"."
+#~ "Jabber or Google Talk address, like \"UserName@example.org\". First, make "
+#~ "sure to add %s to your buddy list in your IM client or on Google Talk."
 #~ msgstr ""
-#~ "La llicència del flux de qui escolteu, «%1$s», no és compatible amb la "
-#~ "llicència del lloc, «%2$s»."
+#~ "Adreça Jabber o GTalk, per exemple «NomUsuari@example.org». Primer, "
+#~ "assegureu-vos d'afegir %s a la vostra llista d'amics en el vostre client "
+#~ "de missatgeria instantània o al GTalk."
 
-#~ msgid "Not allowed to use API."
-#~ msgstr "No es permet l'ús de l'API."
+#~ msgid "Send me notices through Jabber/Google Talk."
+#~ msgstr "Envia'm avisos per Jabber/GTalk."
 
-#~ msgid "Not allowed to log in."
-#~ msgstr "No es permet iniciar una sessió."
+#~ msgid "Publish a MicroID for my Jabber/Google Talk address."
+#~ msgstr "Publica una MicroID per a la meva adreça de Jabber/GTalk."
+
+#~ msgid "No Jabber ID."
+#~ msgstr "Cap Jabber ID."
+
+#~ msgid "Not a valid Jabber ID."
+#~ msgstr "No és un ID de Jabber vàlid."
+
+#~ msgid "That is already your Jabber ID."
+#~ msgstr "Aquest ja és el teu Jabber ID."
+
+#~ msgid "That is not your Jabber ID."
+#~ msgstr "Aquest no és el teu Jabber ID."
+
+#~ msgid "Other settings"
+#~ msgstr "Altres paràmetres"
+
+#~ msgid "Tag cloud"
+#~ msgstr "Núvol d'etiquetes"
+
+#~ msgid "Consumer key"
+#~ msgstr "Clau del consumidor"
+
+#~ msgid "Consumer secret"
+#~ msgstr "Secreta del consumidor"
+
+#~ msgid "Request token URL"
+#~ msgstr "Sol·licita l'URL del testimoni"
+
+#~ msgid "Access token URL"
+#~ msgstr "Accedeix a l'URL del testimoni"
+
+#~ msgid "Authorize URL"
+#~ msgstr "Autoritza l'URL"
+
+#~ msgid "Jabber"
+#~ msgstr "Jabber"
+
+#~ msgid "Photo"
+#~ msgstr "Foto"
+
+#~ msgid "Other options"
+#~ msgstr "Altres opcions"
+
+#~ msgid "Other"
+#~ msgstr "Altres"
+
+#~ msgid "Primary site navigation"
+#~ msgstr "Navegació primària del lloc"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Personal profile and friends timeline"
+#~ msgstr "Perfil personal i línia temporal dels amics"
+
+#~ msgctxt "MENU"
+#~ msgid "Personal"
+#~ msgstr "Personal"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Change your email, avatar, password, profile"
+#~ msgstr "Canvia l'adreça electrònica, l'avatar, la contrasenya o el perfil"
+
+#~ msgid "Account"
+#~ msgstr "Compte"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Connect to services"
+#~ msgstr "Connecta als serveis"
+
+#~ msgid "Connect"
+#~ msgstr "Connexió"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Change site configuration"
+#~ msgstr "Canvia la configuració del lloc"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Invite friends and colleagues to join you on %s"
+#~ msgstr "Convida amics i coneguts perquè participin a %s"
+
+#~ msgctxt "MENU"
+#~ msgid "Invite"
+#~ msgstr "Convida"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Create an account"
+#~ msgstr "Crea un compte"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Help me!"
+#~ msgstr "Ajuda'm!"
+
+#~ msgctxt "MENU"
+#~ msgid "Help"
+#~ msgstr "Ajuda"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Search for people or text"
+#~ msgstr "Cerca gent o text"
+
+#~ msgid "Local views"
+#~ msgstr "Vistes locals"
+
+#~ msgid "Page notice"
+#~ msgstr "Avís de pàgina"
+
+#~ msgid "Secondary site navigation"
+#~ msgstr "Navegació del lloc secundària"
+
+#~ msgid "StatusNet software license"
+#~ msgstr "Llicència del programari StatusNet"
+
+#~ msgid "Site content license"
+#~ msgstr "Llicència de contingut del lloc"
+
+#~ msgid "Pagination"
+#~ msgstr "Paginació"
+
+#~ msgid "Author"
+#~ msgstr "Autoria"
+
+#~ msgid "Provider"
+#~ msgstr "Proveïdor"
+
+#~ msgctxt "MENU"
+#~ msgid "SMS"
+#~ msgstr "SMS"
+
+#~ msgid "Filter tags"
+#~ msgstr "Filtre d'etiquetes"
+
+#~ msgid "[%s]"
+#~ msgstr "[%s]"
+
+#~ msgid "Available characters"
+#~ msgstr "Caràcters disponibles"
+
+#~ msgctxt "MENU"
+#~ msgid "Profile"
+#~ msgstr "Perfil"
+
+#~ msgid "Search help"
+#~ msgstr "Ajuda de la cerca"
+
+#~ msgid "Unknown user. Go to %s to add your address to your account"
+#~ msgstr "Usuari desconegut. Aneu a %s per afegir una adreça al vostre compte"
+
+#~ msgid "Message too long. Maximum is %1$d character, you sent %2$d."
+#~ msgid_plural "Message too long. Maximum is %1$d characters, you sent %2$d."
+#~ msgstr[0] ""
+#~ "El missatge és massa llarg - el màxim és %1$d caràcter, i n'heu enviat %2"
+#~ "$d."
+#~ msgstr[1] ""
+#~ "El missatge és massa llarg - el màxim és %1$d caràcters, i n'heu enviat %2"
+#~ "$d."
diff --git a/locale/cs/LC_MESSAGES/statusnet.po b/locale/cs/LC_MESSAGES/statusnet.po
index 9d02365b1e..b60c98a351 100644
--- a/locale/cs/LC_MESSAGES/statusnet.po
+++ b/locale/cs/LC_MESSAGES/statusnet.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 15:58+0000\n"
-"PO-Revision-Date: 2011-03-03 16:00:18+0000\n"
+"POT-Creation-Date: 2011-03-03 17:23+0000\n"
+"PO-Revision-Date: 2011-03-03 17:25:45+0000\n"
 "Language-Team: Czech <http://translatewiki.net/wiki/Portal:cs>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -79,23 +79,23 @@ msgstr "uložit nastavení přístupu"
 #. TRANS: Tooltip for button to save access settings in site admin panel.
 #. TRANS: Button text for saving theme settings.
 #. TRANS: Button label to save e-mail preferences.
-#. TRANS: Button label to save Instant Messaging preferences.
-#. TRANS: Button text for saving "Other settings" in profile.
+#. TRANS: Button label to save IM preferences.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
 #. TRANS: Button text for saving site notice in admin panel.
 #. TRANS: Button label to save SMS preferences.
 #. TRANS: Save button for settings for a profile in a subscriptions list.
+#. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
 #. TRANS: Button text on profile design page to save settings.
 #: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
-#: actions/emailsettings.php:250 actions/imsettings.php:183
-#: actions/othersettings.php:136 actions/pathsadminpanel.php:512
-#: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
-#: actions/smssettings.php:205 actions/subscriptions.php:259
+#: actions/emailsettings.php:251 actions/imsettings.php:199
+#: actions/pathsadminpanel.php:512 actions/profilesettings.php:198
+#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:204
+#: actions/subscriptions.php:261 actions/urlsettings.php:152
 #: actions/useradminpanel.php:298 lib/applicationeditform.php:355
-#: lib/designsettings.php:270 lib/groupeditform.php:201
+#: lib/designform.php:320 lib/groupeditform.php:201
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Uložit"
@@ -134,7 +134,11 @@ msgstr "Tady žádná taková stránka není."
 #. 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 use "one time password login" without using an existing user.
+#. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
+#. TRANS: Client error displayed trying to find a user by ID for a non-existing ID.
+#. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when calling a profile action without specifying a user.
 #: actions/all.php:80 actions/allrss.php:69
@@ -146,19 +150,19 @@ msgstr "Tady žádná taková stránka není."
 #: actions/apidirectmessage.php:75 actions/apidirectmessagenew.php:72
 #: actions/apigroupcreate.php:111 actions/apigroupismember.php:89
 #: actions/apigroupjoin.php:98 actions/apigroupleave.php:98
-#: actions/apigrouplist.php:70 actions/apistatusesupdate.php:230
-#: actions/apisubscriptions.php:85 actions/apitimelinefavorites.php:70
-#: actions/apitimelinefriends.php:173 actions/apitimelinehome.php:78
-#: actions/apitimelinementions.php:77 actions/apitimelineuser.php:79
-#: actions/avatarbynickname.php:79 actions/favoritesrss.php:72
-#: actions/foaf.php:42 actions/foaf.php:61 actions/hcard.php:67
-#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
-#: actions/remotesubscribe.php:144 actions/remotesubscribe.php:153
-#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
-#: actions/showfavorites.php:106 actions/userbyid.php:74
-#: actions/usergroups.php:93 actions/userrss.php:40 actions/userxrd.php:59
-#: actions/xrds.php:71 lib/command.php:509 lib/galleryaction.php:59
-#: lib/mailbox.php:80 lib/profileaction.php:77
+#: actions/apigrouplist.php:70 actions/apigroupprofileupdate.php:108
+#: actions/apistatusesupdate.php:230 actions/apisubscriptions.php:85
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:173
+#: actions/apitimelinehome.php:78 actions/apitimelinementions.php:77
+#: actions/apitimelineuser.php:79 actions/avatarbynickname.php:79
+#: actions/favoritesrss.php:72 actions/foaf.php:42 actions/foaf.php:61
+#: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116
+#: actions/otp.php:78 actions/remotesubscribe.php:144
+#: actions/remotesubscribe.php:153 actions/replies.php:73
+#: actions/repliesrss.php:38 actions/rsd.php:113 actions/showfavorites.php:106
+#: actions/userbyid.php:75 actions/usergroups.php:93 actions/userrss.php:40
+#: actions/userxrd.php:59 actions/xrds.php:71 lib/command.php:509
+#: lib/galleryaction.php:59 lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Uživatel neexistuje."
 
@@ -172,10 +176,9 @@ msgstr "%1$s a přátelé, strana %2$d"
 #. TRANS: H1 text for page. %s is a user nickname.
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Timeline title for user and friends. %s is a user nickname.
-#. TRANS: Tooltop for personal group navigation menu option when logged in for viewing timeline of self and friends.
 #: actions/all.php:94 actions/all.php:191 actions/allrss.php:117
 #: actions/apitimelinefriends.php:207 actions/apitimelinehome.php:113
-#: lib/personalgroupnav.php:102
+#: lib/personalgroupnav.php:100
 #, php-format
 msgid "%s and friends"
 msgstr "%s a přátelé"
@@ -233,7 +236,7 @@ msgstr ""
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
 #. TRANS: Second sentence of empty message for anonymous users. %s is a user nickname.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:227
+#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:221
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -282,19 +285,20 @@ msgstr "Novinky od uživatele %1$s a přátel na %2$s!"
 #: actions/apifavoritecreate.php:98 actions/apifavoritedestroy.php:98
 #: actions/apifriendshipscreate.php:99 actions/apifriendshipsdestroy.php:99
 #: actions/apifriendshipsshow.php:124 actions/apigroupcreate.php:138
-#: actions/apigroupismember.php:115 actions/apigroupjoin.php:160
-#: actions/apigroupleave.php:145 actions/apigrouplist.php:134
+#: actions/apigroupismember.php:115 actions/apigroupjoin.php:151
+#: actions/apigroupleave.php:141 actions/apigrouplist.php:134
 #: actions/apigrouplistall.php:120 actions/apigroupmembership.php:105
+#: actions/apigroupprofileupdate.php:100 actions/apigroupprofileupdate.php:213
 #: actions/apigroupshow.php:114 actions/apihelptest.php:84
 #: actions/apistatusesdestroy.php:101 actions/apistatusesretweets.php:110
 #: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:139
 #: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
-#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:268
-#: actions/apitimelinegroup.php:147 actions/apitimelinehome.php:173
-#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:239
-#: actions/apitimelineretweetedtome.php:118
-#: actions/apitimelineretweetsofme.php:150 actions/apitimelinetag.php:159
-#: actions/apitimelineuser.php:206 actions/apiusershow.php:100
+#: actions/apitimelinefavorites.php:182 actions/apitimelinefriends.php:276
+#: actions/apitimelinegroup.php:148 actions/apitimelinehome.php:181
+#: actions/apitimelinementions.php:182 actions/apitimelinepublic.php:247
+#: actions/apitimelineretweetedtome.php:147
+#: actions/apitimelineretweetsofme.php:147 actions/apitimelinetag.php:165
+#: actions/apitimelineuser.php:217 actions/apiusershow.php:100
 msgid "API method not found."
 msgstr " API metoda nebyla nalezena."
 
@@ -309,8 +313,9 @@ msgstr " API metoda nebyla nalezena."
 #: actions/apifavoritecreate.php:88 actions/apifavoritedestroy.php:88
 #: actions/apifriendshipscreate.php:89 actions/apifriendshipsdestroy.php:89
 #: actions/apigroupcreate.php:102 actions/apigroupjoin.php:89
-#: actions/apigroupleave.php:89 actions/apimediaupload.php:66
-#: actions/apistatusesretweet.php:63 actions/apistatusesupdate.php:194
+#: actions/apigroupleave.php:89 actions/apigroupprofileupdate.php:92
+#: actions/apimediaupload.php:66 actions/apistatusesretweet.php:63
+#: actions/apistatusesupdate.php:194
 msgid "This method requires a POST."
 msgstr "Tato metoda vyžaduje POST."
 
@@ -323,21 +328,16 @@ msgstr ""
 "Je nutné zadat parametr s názvem 'device' s jednou z hodnot: sms, im, none."
 
 #. TRANS: Server error displayed when a user's delivery device cannot be updated.
-#. TRANS: Server error displayed when a user update to the database fails in the contact address confirmation action.
 #. TRANS: Server error thrown on database error updating e-mail preferences.
 #. TRANS: Server error thrown on database error removing a registered e-mail address.
-#. TRANS: Server error thrown on database error updating Instant Messaging preferences.
-#. TRANS: Server error thrown on database error removing a registered Instant Messaging address.
-#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
 #. TRANS: Server error thrown when user profile settings could not be updated.
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
-#: actions/apiaccountupdatedeliverydevice.php:130
-#: actions/confirmaddress.php:118 actions/emailsettings.php:352
-#: actions/emailsettings.php:498 actions/imsettings.php:276
-#: actions/imsettings.php:432 actions/othersettings.php:186
-#: actions/profilesettings.php:322 actions/smssettings.php:301
-#: actions/smssettings.php:454
+#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
+#: actions/apiaccountupdatedeliverydevice.php:136
+#: actions/emailsettings.php:353 actions/emailsettings.php:499
+#: actions/profilesettings.php:323 actions/smssettings.php:300
+#: actions/smssettings.php:453 actions/urlsettings.php:211
 msgid "Could not update user."
 msgstr "Nepodařilo se aktualizovat nastavení uživatele"
 
@@ -363,7 +363,7 @@ msgstr "Uživatel nemá profil."
 
 #. TRANS: Server error displayed if a user profile could not be saved.
 #. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:418
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:419
 msgid "Could not save profile."
 msgstr "Nepodařilo se uložit profil."
 
@@ -375,7 +375,7 @@ msgstr "Nepodařilo se uložit profil."
 #: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
 #: actions/designadminpanel.php:120 actions/editapplication.php:121
 #: actions/newapplication.php:102 actions/newnotice.php:95
-#: lib/designsettings.php:298
+#: lib/designsettings.php:110
 #, fuzzy, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s byte) due to its "
@@ -403,8 +403,8 @@ msgstr[2] ""
 #: actions/apiaccountupdateprofilecolors.php:160
 #: actions/apiaccountupdateprofilecolors.php:171
 #: actions/groupdesignsettings.php:285 actions/groupdesignsettings.php:296
-#: actions/userdesignsettings.php:201 actions/userdesignsettings.php:211
-#: actions/userdesignsettings.php:253 actions/userdesignsettings.php:263
+#: actions/userdesignsettings.php:218 actions/userdesignsettings.php:228
+#: actions/userdesignsettings.php:270 actions/userdesignsettings.php:280
 msgid "Unable to save your design settings."
 msgstr "Nelze uložit vaše nastavení designu."
 
@@ -412,7 +412,7 @@ msgstr "Nelze uložit vaše nastavení designu."
 #. TRANS: Client error displayed when a database error occurs updating profile colours.
 #: actions/apiaccountupdateprofilebackgroundimage.php:191
 #: actions/apiaccountupdateprofilecolors.php:139
-#: actions/userdesignsettings.php:179
+#: actions/userdesignsettings.php:196
 msgid "Could not update your design."
 msgstr "Nelze uložit design."
 
@@ -522,7 +522,7 @@ msgstr "Příjemce nebyl nalezen."
 #. TRANS: Client error displayed trying to direct message another user who's not a friend (403).
 #: actions/apidirectmessagenew.php:144
 #, fuzzy
-msgid "Can't send direct messages to users who aren't your friend."
+msgid "Cannot send direct messages to users who aren't your friend."
 msgstr "Nelze odesílat zprávy uživatelům, kteří nejsou vašimi přáteli."
 
 #. TRANS: Client error displayed trying to direct message self (403).
@@ -605,9 +605,9 @@ msgstr "Nepodařilo se najít cílového uživatele."
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:156 actions/editgroup.php:191
-#: actions/newgroup.php:137 actions/profilesettings.php:273
-#: actions/register.php:214
+#: actions/apigroupcreate.php:156 actions/apigroupprofileupdate.php:255
+#: actions/editgroup.php:191 actions/newgroup.php:137
+#: actions/profilesettings.php:274 actions/register.php:199
 msgid "Nickname already in use. Try another one."
 msgstr "Přezdívku již někdo používá. Zkuste jinou."
 
@@ -615,9 +615,9 @@ msgstr "Přezdívku již někdo používá. Zkuste jinou."
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:164 actions/editgroup.php:195
-#: actions/newgroup.php:141 actions/profilesettings.php:243
-#: actions/register.php:216
+#: actions/apigroupcreate.php:164 actions/apigroupprofileupdate.php:259
+#: actions/editgroup.php:195 actions/newgroup.php:141
+#: actions/profilesettings.php:244 actions/register.php:201
 msgid "Not a valid nickname."
 msgstr "Není platnou přezdívkou."
 
@@ -627,10 +627,10 @@ msgstr "Není platnou přezdívkou."
 #. TRANS: Validation error shown when providing an invalid homepage URL in the "New application" form.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:181 actions/editapplication.php:235
-#: actions/editgroup.php:202 actions/newapplication.php:221
-#: actions/newgroup.php:148 actions/profilesettings.php:248
-#: actions/register.php:223
+#: actions/apigroupcreate.php:181 actions/apigroupprofileupdate.php:277
+#: actions/editapplication.php:235 actions/editgroup.php:202
+#: actions/newapplication.php:221 actions/newgroup.php:148
+#: actions/profilesettings.php:249 actions/register.php:208
 msgid "Homepage is not a valid URL."
 msgstr "Domovská stránka není platná URL."
 
@@ -639,8 +639,8 @@ msgstr "Domovská stránka není platná URL."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:191 actions/editgroup.php:206
-#: actions/newgroup.php:152 actions/profilesettings.php:252
-#: actions/register.php:226
+#: actions/newgroup.php:152 actions/profilesettings.php:253
+#: actions/register.php:211
 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "Celé jméno je moc dlouhé (maximální délka je 255 znaků)."
@@ -669,8 +669,8 @@ msgstr[2] "Popis je příliš dlouhý (maximálně %d znaků)."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:215 actions/editgroup.php:218
-#: actions/newgroup.php:164 actions/profilesettings.php:265
-#: actions/register.php:235
+#: actions/newgroup.php:164 actions/profilesettings.php:266
+#: actions/register.php:220
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
 msgstr "Umístění je příliš dlouhé (maximálně 255 znaků)."
@@ -701,15 +701,16 @@ msgstr "Neplatný alias: \"%s\"."
 #. TRANS: %s is the alias that is already in use.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error. %s is the already used alias.
-#: actions/apigroupcreate.php:264 actions/editgroup.php:246
-#: actions/newgroup.php:193
+#: actions/apigroupcreate.php:264 actions/apigroupprofileupdate.php:351
+#: actions/editgroup.php:246 actions/newgroup.php:193
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "Alias \"%s\" se již používá. Zkuste jiný."
 
 #. TRANS: Client error displayed when trying to use an alias during group creation that is the same as the group's nickname.
 #. TRANS: Group edit form validation error.
-#: actions/apigroupcreate.php:278 actions/editgroup.php:253
+#: actions/apigroupcreate.php:278 actions/apigroupprofileupdate.php:359
+#: actions/editgroup.php:253
 msgid "Alias can't be the same as nickname."
 msgstr "Alias nemůže být stejný jako přezdívka."
 
@@ -721,7 +722,8 @@ msgstr "Alias nemůže být stejný jako přezdívka."
 #. TRANS: Client error displayed requesting most recent notices to a group for a non-existing group.
 #: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
 #: actions/apigroupleave.php:104 actions/apigroupmembership.php:71
-#: actions/apigroupshow.php:81 actions/apitimelinegroup.php:89
+#: actions/apigroupprofileupdate.php:113 actions/apigroupshow.php:81
+#: actions/apitimelinegroup.php:89
 msgid "Group not found."
 msgstr "Skupina nebyla nalezena."
 
@@ -739,13 +741,11 @@ msgstr "Jste již členem této skupiny."
 msgid "You have been blocked from that group by the admin."
 msgstr "Z této skupiny jste byl zablokován adminem."
 
-#. TRANS: Server error displayed when joining a group fails.
-#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
 #. 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.
 #. TRANS: Message given having failed to add a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:362
+#: actions/apigroupjoin.php:136 actions/joingroup.php:139 lib/command.php:362
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "Nemohu připojit uživatele %1$s do skupiny %2$s."
@@ -755,8 +755,6 @@ msgstr "Nemohu připojit uživatele %1$s do skupiny %2$s."
 msgid "You are not a member of this group."
 msgstr "Nejste členem této skupiny."
 
-#. TRANS: Server error displayed when leaving a group fails.
-#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
 #. TRANS: Server error displayed when leaving a group failed in the database.
 #. TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
 #. TRANS: Message given having failed to remove a user from a group.
@@ -792,6 +790,61 @@ msgstr "skupiny uživatele %s"
 msgid "groups on %s"
 msgstr "skupiny na %s"
 
+#. TRANS: Client error displayed trying to edit a group while not being a group admin.
+#. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
+#. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
+#: actions/apigroupprofileupdate.php:118 actions/editgroup.php:110
+#: actions/editgroup.php:176 actions/groupdesignsettings.php:109
+#: actions/grouplogo.php:111
+msgid "You must be an admin to edit the group."
+msgstr "K úpravě skupiny musíte být admin."
+
+#. TRANS: Server error displayed when editing a group fails.
+#: actions/apigroupprofileupdate.php:171 actions/editgroup.php:274
+msgid "Could not update group."
+msgstr "Nelze aktualizovat skupinu."
+
+#. TRANS: Server error displayed when group aliases could not be added.
+#. TRANS: Server exception thrown when creating group aliases failed.
+#: actions/apigroupprofileupdate.php:194 actions/editgroup.php:281
+#: classes/User_group.php:540
+msgid "Could not create aliases."
+msgstr "Nelze vytvořit aliasy."
+
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: actions/apigroupprofileupdate.php:249 lib/nickname.php:165
+msgid "Nickname must have only lowercase letters and numbers and no spaces."
+msgstr "Přezdívka může obsahovat pouze malá písmena a čísla a žádné mezery."
+
+#: actions/apigroupprofileupdate.php:286
+#, fuzzy
+msgid "Full name is too long (max 255 chars)."
+msgstr "Celé jméno je moc dlouhé (maximální délka je 255 znaků)."
+
+#: actions/apigroupprofileupdate.php:296
+#, fuzzy, php-format
+msgid "description is too long (max %d chars)."
+msgstr "Popis je příliš dlouhý (maximálně %d znaků)."
+
+#: actions/apigroupprofileupdate.php:307
+#, fuzzy
+msgid "Location is too long (max 255 chars)."
+msgstr "Umístění je příliš dlouhé (maximálně 255 znaků)."
+
+#: actions/apigroupprofileupdate.php:326
+#, fuzzy, php-format
+msgid "Too many aliases! Maximum %d."
+msgstr "Příliš mnoho aliasů! Maximálně %d."
+
+#. TRANS: Group edit form validation error.
+#. TRANS: Group create form validation error.
+#. TRANS: %s is the invalid alias.
+#: actions/apigroupprofileupdate.php:342 actions/editgroup.php:241
+#: actions/newgroup.php:188
+#, php-format
+msgid "Invalid alias: \"%s\""
+msgstr "Neplatný alias: \"%s\""
+
 #. TRANS: Client error displayed when uploading a media file has failed.
 #: actions/apimediaupload.php:101
 msgid "Upload failed."
@@ -825,21 +878,22 @@ msgstr "Nejste autorizován."
 #. TRANS: Form validation error message.
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
+#. TRANS: Client error displayed when the session token is not okay.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
 #: actions/deletenotice.php:177 actions/disfavor.php:75
-#: actions/emailsettings.php:291 actions/favor.php:75 actions/geocode.php:55
+#: actions/emailsettings.php:292 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:65 actions/grouplogo.php:321
-#: actions/groupunblock.php:65 actions/imsettings.php:224
-#: actions/invite.php:60 actions/login.php:137 actions/makeadmin.php:66
-#: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
-#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
-#: actions/othersettings.php:155 actions/passwordsettings.php:138
-#: actions/profilesettings.php:217 actions/recoverpassword.php:383
-#: actions/register.php:172 actions/remotesubscribe.php:76
-#: actions/repeat.php:82 actions/smssettings.php:250 actions/subedit.php:40
-#: actions/subscribe.php:86 actions/tagother.php:166
-#: actions/unsubscribe.php:69 actions/userauthorization.php:52
-#: lib/designsettings.php:310
+#: actions/groupunblock.php:65 actions/imsettings.php:241
+#: actions/invite.php:60 actions/makeadmin.php:66 actions/newmessage.php:135
+#: actions/newnotice.php:105 actions/nudge.php:80
+#: actions/oauthappssettings.php:162 actions/oauthconnectionssettings.php:135
+#: actions/passwordsettings.php:137 actions/pluginenable.php:87
+#: actions/profilesettings.php:218 actions/recoverpassword.php:383
+#: actions/register.php:157 actions/remotesubscribe.php:76
+#: actions/repeat.php:82 actions/smssettings.php:249 actions/subedit.php:40
+#: actions/subscribe.php:87 actions/tagother.php:145
+#: actions/unsubscribe.php:69 actions/urlsettings.php:171
+#: actions/userauthorization.php:53 lib/designsettings.php:122
 msgid "There was a problem with your session token. Try again, please."
 msgstr "Nastal problém s vaším session tokenem. Zkuste to znovu, prosím."
 
@@ -868,10 +922,10 @@ msgstr "Chyba databáze při vkládání uživatele aplikace OAuth."
 #. TRANS: Unknown form validation error in design settings form.
 #: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
 #: actions/designadminpanel.php:100 actions/editapplication.php:144
-#: actions/emailsettings.php:310 actions/grouplogo.php:332
-#: actions/imsettings.php:239 actions/newapplication.php:124
-#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
-#: actions/smssettings.php:271 lib/designsettings.php:321
+#: actions/emailsettings.php:311 actions/grouplogo.php:332
+#: actions/imsettings.php:256 actions/newapplication.php:124
+#: actions/oauthconnectionssettings.php:144 actions/recoverpassword.php:46
+#: actions/smssettings.php:270 lib/designsettings.php:133
 msgid "Unexpected form submission."
 msgstr "Nečekaný požadavek."
 
@@ -921,31 +975,26 @@ msgstr "Účet"
 
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Field label in form for profile settings.
-#. TRANS: Label for group nickname (dt). Text hidden by default.
-#. TRANS: DT for nick name in a profile.
-#: actions/apioauthauthorize.php:459 actions/login.php:252
-#: actions/profilesettings.php:106 actions/register.php:432
-#: actions/showgroup.php:243 actions/tagother.php:94
+#: actions/apioauthauthorize.php:459 actions/login.php:225
+#: actions/profilesettings.php:107 actions/register.php:411
 #: actions/userauthorization.php:145 lib/groupeditform.php:145
-#: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "Přezdívka"
 
 #. TRANS: Field label on OAuth API authorisation form.
-#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:463 actions/login.php:255
-#: actions/register.php:436 lib/accountsettingsaction.php:120
+#: actions/apioauthauthorize.php:463 actions/login.php:228
+#: actions/register.php:415 lib/settingsnav.php:87
 msgid "Password"
 msgstr "Heslo"
 
 #. TRANS: Button text that when clicked will cancel the process of allowing access to an account
 #. TRANS: by an external application.
 #. TRANS: Button label to cancel an e-mail address confirmation procedure.
-#. TRANS: Button label to cancel an Instant Messaging address confirmation procedure.
+#. TRANS: Button label to cancel an IM address confirmation procedure.
 #. TRANS: Button label to cancel a SMS address confirmation procedure.
 #. TRANS: Button label in the "Edit application" form.
-#: actions/apioauthauthorize.php:478 actions/emailsettings.php:124
-#: actions/imsettings.php:127 actions/smssettings.php:133
+#: actions/apioauthauthorize.php:478 actions/emailsettings.php:125
+#: actions/imsettings.php:136 actions/smssettings.php:132
 #: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Cancel"
@@ -1058,7 +1107,7 @@ msgstr " API metoda nebyla nalezena."
 #. TRANS: %s is the requested output format.
 #: actions/apistatusesshow.php:144
 #, fuzzy, php-format
-msgid "Unsupported format: %s"
+msgid "Unsupported format: %s."
 msgstr "Nepodporovaný formát."
 
 #. TRANS: Client error displayed requesting a deleted status.
@@ -1142,13 +1191,6 @@ msgstr "%1$s / Oblíbené z %2$s"
 msgid "%1$s updates favorited by %2$s / %3$s."
 msgstr "Updaty na %1$s od %2$s / %2$s."
 
-#. TRANS: Server error displayed when generating an Atom feed fails.
-#. TRANS: %s is the error.
-#: actions/apitimelinegroup.php:134
-#, fuzzy, php-format
-msgid "Could not generate feed for group - %s"
-msgstr "Nelze aktualizovat skupinu."
-
 #. TRANS: Title for timeline of most recent mentions of a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname.
 #: actions/apitimelinementions.php:115
@@ -1165,13 +1207,14 @@ msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr "updaty na %1$s odpovídající na updaty od %2$s / %3$s."
 
 #. TRANS: Title for site timeline. %s is the StatusNet sitename.
+#. TRANS: Public RSS feed title. %s is the StatusNet site name.
 #: actions/apitimelinepublic.php:193 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "Veřejná časová osa %s"
 
 #. TRANS: Subtitle for site timeline. %s is the StatusNet sitename.
-#: actions/apitimelinepublic.php:199 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:199
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "Všechny updaty na %s!"
@@ -1183,21 +1226,33 @@ msgid "Unimplemented."
 msgstr "Neimplementovaná metoda."
 
 #. TRANS: Title for Atom feed "repeated to me". %s is the user nickname.
-#: actions/apitimelineretweetedtome.php:108
+#: actions/apitimelineretweetedtome.php:96
 #, php-format
 msgid "Repeated to %s"
 msgstr "Opakováno uživatelem %s"
 
+#: actions/apitimelineretweetedtome.php:98
+#, fuzzy, php-format
+msgid "%1$s notices that were to repeated to %2$s / %3$s."
+msgstr "updaty na %1$s odpovídající na updaty od %2$s / %3$s."
+
 #. TRANS: Title of list of repeated notices of the logged in user.
 #. TRANS: %s is the nickname of the logged in user.
-#: actions/apitimelineretweetsofme.php:112
+#: actions/apitimelineretweetsofme.php:98
 #, php-format
 msgid "Repeats of %s"
 msgstr "Opakování %s"
 
+#: actions/apitimelineretweetsofme.php:104
+#, fuzzy, php-format
+msgid "%1$s notices that %2$s / %3$s has repeated."
+msgstr "%s (@%s) přidal vaše oznámení jako oblíbené"
+
 #. TRANS: Title for timeline with lastest notices with a given tag.
 #. TRANS: %s is the tag.
-#: actions/apitimelinetag.php:101 actions/tag.php:67
+#. TRANS: Title for first page of notices with tags.
+#. TRANS: %s is the tag.
+#: actions/apitimelinetag.php:101 actions/tag.php:69
 #, php-format
 msgid "Notices tagged with %s"
 msgstr "Noticy taglé %s"
@@ -1210,54 +1265,55 @@ msgid "Updates tagged with %1$s on %2$s!"
 msgstr "Aktualizace označené %1$s na %2$s!"
 
 #. TRANS: Client error displayed trying to add a notice to another user's timeline.
-#: actions/apitimelineuser.php:297
+#: actions/apitimelineuser.php:308
 #, fuzzy
 msgid "Only the user can add to their own timeline."
 msgstr "Pouze uživatel může přečíst své vlastní schránky."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:304
+#: actions/apitimelineuser.php:315
 msgid "Only accept AtomPub for Atom feeds."
 msgstr ""
 
 #. TRANS: Client error displayed attempting to post an empty API notice.
-#: actions/apitimelineuser.php:311
+#: actions/apitimelineuser.php:322
 msgid "Atom post must not be empty."
 msgstr ""
 
 #. TRANS: Client error displayed attempting to post an API that is not well-formed XML.
-#: actions/apitimelineuser.php:317
+#: actions/apitimelineuser.php:328
 msgid "Atom post must be well-formed XML."
 msgstr ""
 
 #. TRANS: Client error displayed when not using an Atom entry.
-#: actions/apitimelineuser.php:323 actions/atompubfavoritefeed.php:228
+#: actions/apitimelineuser.php:334 actions/atompubfavoritefeed.php:228
 #: actions/atompubmembershipfeed.php:230
 #: actions/atompubsubscriptionfeed.php:236
 msgid "Atom post must be an Atom entry."
 msgstr ""
 
 #. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
-#: actions/apitimelineuser.php:335
+#: actions/apitimelineuser.php:345
 msgid "Can only handle POST activities."
 msgstr ""
 
 #. TRANS: Client error displayed when using an unsupported activity object type.
 #. TRANS: %s is the unsupported activity object type.
-#: actions/apitimelineuser.php:346
+#: actions/apitimelineuser.php:356
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
 #. TRANS: %d is the notice ID (number).
-#: actions/apitimelineuser.php:380
+#: actions/apitimelineuser.php:390
 #, fuzzy, php-format
 msgid "No content for notice %d."
 msgstr "Najít v obsahu oznámení"
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:408
+#. TRANS: %s is the notice URI.
+#: actions/apitimelineuser.php:419
 #, fuzzy, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "Oznámení s tímto id neexistuje."
@@ -1275,9 +1331,10 @@ msgstr " API metoda nebyla nalezena."
 
 #. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
 #. TRANS: Client exception.
+#. TRANS: Client error displayed trying to subscribe to a non-existing profile.
 #: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
 #: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
-#: actions/subscribe.php:107
+#: actions/subscribe.php:110
 msgid "No such profile."
 msgstr "Žádný takový profil."
 
@@ -1424,7 +1481,7 @@ msgid "Not a member."
 msgstr "Všichni členové"
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
-#: actions/atompubshowmembership.php:151
+#: actions/atompubshowmembership.php:150
 #, fuzzy
 msgid "Cannot delete someone else's membership."
 msgstr "Nelze smazat odebírání sebe sama"
@@ -1513,10 +1570,7 @@ msgid "Invalid size."
 msgstr "Neplatná velikost"
 
 #. TRANS: Title for avatar upload page.
-#. TRANS: Label for group avatar (dt). Text hidden by default.
-#. TRANS: Link description in user account settings menu.
-#: actions/avatarsettings.php:66 actions/showgroup.php:227
-#: lib/accountsettingsaction.php:113
+#: actions/avatarsettings.php:66 lib/settingsnav.php:82
 msgid "Avatar"
 msgstr "Avatar"
 
@@ -1529,9 +1583,11 @@ msgstr "Můžete nahrát váš osobní avatar. Maximální velikost souboru je %
 
 #. TRANS: Server error displayed in avatar upload page when no matching profile can be found for a user.
 #. TRANS: Server error displayed coming across a request from a user without a profile.
+#. TRANS: Server error displayed when trying to authorise a remote subscription request
+#. TRANS: while the user has no profile.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
 #: actions/grouplogo.php:184 actions/remotesubscribe.php:190
-#: actions/userauthorization.php:72 actions/userrss.php:108
+#: actions/userauthorization.php:75 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr "Uživatel bez odpovídajícího profilu."
 
@@ -1589,10 +1645,10 @@ msgstr "Oříznout"
 msgid "No file uploaded."
 msgstr "žádný soubor nebyl nahrán."
 
-#. TRANS: Avatar upload form unstruction after uploading a file.
+#. TRANS: Avatar upload form instruction after uploading a file.
 #: actions/avatarsettings.php:345
 #, fuzzy
-msgid "Pick a square area of the image to be your avatar"
+msgid "Pick a square area of the image to be your avatar."
 msgstr "Vyberte čtvercovou plochu obrázku, která bude váš avatar"
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
@@ -1618,7 +1674,7 @@ msgstr "Avatar smazán."
 
 #. TRANS: Title for backup account page.
 #. TRANS: Option in profile settings to create a backup of the account of the currently logged in user.
-#: actions/backupaccount.php:61 actions/profilesettings.php:467
+#: actions/backupaccount.php:61 actions/profilesettings.php:468
 msgid "Backup account"
 msgstr ""
 
@@ -1652,7 +1708,7 @@ msgstr "Pozadí"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
 #: actions/backupaccount.php:254
-msgid "Backup your account"
+msgid "Backup your account."
 msgstr ""
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
@@ -1694,7 +1750,7 @@ msgstr "Poznámka"
 #. TRANS: Submit button title for 'No' when blocking a user.
 #: actions/block.php:158
 #, fuzzy
-msgid "Do not block this user"
+msgid "Do not block this user."
 msgstr "Zablokovat tohoto uživatele"
 
 #. TRANS: Button label on the user block form.
@@ -1711,9 +1767,9 @@ msgid "Yes"
 msgstr "Ano"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#. TRANS: Description of the form to block a user.
-#: actions/block.php:165 lib/blockform.php:79
-msgid "Block this user"
+#: actions/block.php:165
+#, fuzzy
+msgid "Block this user."
 msgstr "Zablokovat tohoto uživatele"
 
 #. TRANS: Server error displayed when blocking a user fails.
@@ -1780,32 +1836,48 @@ msgstr "Potvrzující kód nebyl nalezen"
 msgid "That confirmation code is not for you!"
 msgstr "Tento potvrzující kód vám nepatří!"
 
-#. TRANS: Server error for a unknow address type %s, which can be 'email', 'jabber', or 'sms'.
-#: actions/confirmaddress.php:92
-#, php-format
-msgid "Unrecognized address type %s."
+#. TRANS: Server error for an unknown address type, which can be 'email', 'sms', or the name of an IM network (such as 'xmpp' or 'aim')
+#: actions/confirmaddress.php:94
+#, fuzzy, php-format
+msgid "Unrecognized address type %s"
 msgstr "Neznámý typ adresy %s."
 
 #. TRANS: Client error for an already confirmed email/jabber/sms address.
-#: actions/confirmaddress.php:97
+#: actions/confirmaddress.php:103 actions/confirmaddress.php:136
 msgid "That address has already been confirmed."
 msgstr "Adresa již byla potvrzena"
 
+#: actions/confirmaddress.php:121 actions/imsettings.php:444
+#: actions/userdesignsettings.php:306
+#, fuzzy
+msgid "Couldn't update user."
+msgstr "Nepodařilo se aktualizovat nastavení uživatele"
+
+#: actions/confirmaddress.php:144
+#, fuzzy
+msgid "Couldn't update user im preferences."
+msgstr "Nelze aktualizovat záznam uživatele."
+
+#: actions/confirmaddress.php:156
+#, fuzzy
+msgid "Couldn't insert user im preferences."
+msgstr "Nelze vložit odebírání"
+
 #. TRANS: Server error displayed when an address confirmation code deletion from the
 #. TRANS: database fails in the contact address confirmation action.
-#: actions/confirmaddress.php:132
+#: actions/confirmaddress.php:169
 #, fuzzy
 msgid "Could not delete address confirmation."
 msgstr "Nelze smazat potvrzení IM"
 
 #. TRANS: Title for the contact address confirmation action.
-#: actions/confirmaddress.php:150
+#: actions/confirmaddress.php:185
 msgid "Confirm address"
 msgstr "Heslo znovu"
 
 #. TRANS: Success message for the contact address confirmation action.
 #. TRANS: %s can be 'email', 'jabber', or 'sms'.
-#: actions/confirmaddress.php:166
+#: actions/confirmaddress.php:200
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "Adresa \"%s\" byla potvrzena pro váš účet"
@@ -1819,6 +1891,7 @@ msgstr "Konverzace"
 #. TRANS: Label for user statistics.
 #: actions/conversation.php:149 lib/noticelist.php:87
 #: lib/profileaction.php:246 lib/searchgroupnav.php:82
+#: lib/threadednoticelist.php:66
 msgid "Notices"
 msgstr "Sdělení"
 
@@ -1854,7 +1927,7 @@ msgstr "Avatar smazán."
 
 #. TRANS: Page title for page on which a user account can be deleted.
 #. TRANS: Option in profile settings to delete the account of the currently logged in user.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:475
+#: actions/deleteaccount.php:228 actions/profilesettings.php:476
 #, fuzzy
 msgid "Delete account"
 msgstr "Zaregistrujte se"
@@ -1878,7 +1951,7 @@ msgstr ""
 #. TRANS: Field label for delete account confirmation entry.
 #. TRANS: Field label for password reset form where the password has to be typed again.
 #: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:262 actions/register.php:440
+#: actions/recoverpassword.php:262 actions/register.php:419
 msgid "Confirm"
 msgstr "Potvrdit"
 
@@ -1908,14 +1981,14 @@ msgstr "Aplikace nebyla nalezena."
 #. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
 #: actions/deleteapplication.php:79 actions/editapplication.php:78
-#: actions/showapplication.php:94
+#: actions/showapplication.php:90
 msgid "You are not the owner of this application."
 msgstr "Nejste vlastníkem této aplikace."
 
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
-#: actions/newapplication.php:112 actions/showapplication.php:118
-#: lib/action.php:1425
+#: actions/newapplication.php:112 actions/showapplication.php:113
+#: lib/action.php:1391
 msgid "There was a problem with your session token."
 msgstr "Nastal problém s vaším session tokenem."
 
@@ -1938,13 +2011,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting an application.
 #: actions/deleteapplication.php:161
 #, fuzzy
-msgid "Do not delete this application"
+msgid "Do not delete this application."
 msgstr "Neodstraňujte tuto aplikaci"
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
 #: actions/deleteapplication.php:167
 #, fuzzy
-msgid "Delete this application"
+msgid "Delete this application."
 msgstr "Odstranit tuto aplikaci"
 
 #. TRANS: Client error when trying to delete group while not logged in.
@@ -2002,13 +2075,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting a group.
 #: actions/deletegroup.php:224
 #, fuzzy
-msgid "Do not delete this group"
+msgid "Do not delete this group."
 msgstr "Neodstraňujte toto oznámení"
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
 #: actions/deletegroup.php:231
 #, fuzzy
-msgid "Delete this group"
+msgid "Delete this group."
 msgstr "Odstranit tohoto uživatele"
 
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
@@ -2016,14 +2089,16 @@ msgstr "Odstranit tohoto uživatele"
 #. TRANS: Client error displayed when trying to mark a notice as favorite without being logged in.
 #. TRANS: Client error displayed trying to block a user from a group while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
+#. TRANS: Client error displayed trying to log out when not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
+#. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
 #. TRANS: Client error displayed when trying to change user options while not logged in.
 #: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
-#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:69
+#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:70
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
-#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
-#: actions/tagother.php:33 actions/unsubscribe.php:52
+#: actions/nudge.php:63 actions/pluginenable.php:97 actions/subedit.php:33
+#: actions/subscribe.php:98 actions/tagother.php:33 actions/unsubscribe.php:52
 #: lib/adminpanelaction.php:71 lib/profileformaction.php:63
 #: lib/settingsaction.php:72
 msgid "Not logged in."
@@ -2052,12 +2127,13 @@ msgstr "Jste si jisti, že chcete smazat tohoto oznámení?"
 #. TRANS: Submit button title for 'No' when deleting a notice.
 #: actions/deletenotice.php:159
 #, fuzzy
-msgid "Do not delete this notice"
+msgid "Do not delete this notice."
 msgstr "Neodstraňujte toto oznámení"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:166 lib/noticelist.php:673
-msgid "Delete this notice"
+#: actions/deletenotice.php:166
+#, fuzzy
+msgid "Delete this notice."
 msgstr "Odstranit toto oznámení"
 
 #. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
@@ -2094,18 +2170,17 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting a user.
 #: actions/deleteuser.php:158
 #, fuzzy
-msgid "Do not delete this user"
+msgid "Do not delete this user."
 msgstr "Neodstraňujte toto oznámení"
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
-#. TRANS: Description of form for deleting a user.
-#: actions/deleteuser.php:165 lib/deleteuserform.php:75
-msgid "Delete this user"
+#: actions/deleteuser.php:165
+#, fuzzy
+msgid "Delete this user."
 msgstr "Odstranit tohoto uživatele"
 
 #. TRANS: Message used as title for design settings for the site.
-#. TRANS: Link description in user account settings menu.
-#: actions/designadminpanel.php:60 lib/accountsettingsaction.php:134
+#: actions/designadminpanel.php:60 lib/settingsnav.php:97
 msgid "Design"
 msgstr "Vzhled"
 
@@ -2174,8 +2249,7 @@ msgid "You can upload a custom StatusNet theme as a .ZIP archive."
 msgstr "Můžete nahrát vlastní StatusNet téma jako .ZIP archiv."
 
 #. TRANS: Fieldset legend for theme background image.
-#. TRANS: Fieldset legend on profile design page.
-#: actions/designadminpanel.php:515 lib/designsettings.php:98
+#: actions/designadminpanel.php:515
 msgid "Change background image"
 msgstr "Změnit obrázek na pozadí"
 
@@ -2183,7 +2257,7 @@ msgstr "Změnit obrázek na pozadí"
 #. TRANS: Field label for background color selector.
 #. TRANS: Label on profile design page for setting a profile page background colour.
 #: actions/designadminpanel.php:525 actions/designadminpanel.php:609
-#: lib/designsettings.php:183
+#: lib/designform.php:238
 msgid "Background"
 msgstr "Pozadí"
 
@@ -2209,13 +2283,13 @@ msgstr "vyp."
 #. TRANS: Form guide for turning background image on or off on theme designer page.
 #. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
 #. TRANS: use of the uploaded profile image.
-#: actions/designadminpanel.php:577 lib/designsettings.php:159
+#: actions/designadminpanel.php:577 lib/designform.php:214
 msgid "Turn background image on or off."
 msgstr "Zapněte nebů vypněte obrázek na pozadí."
 
 #. TRANS: Checkbox label to title background image on theme designer page.
 #. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-#: actions/designadminpanel.php:583 lib/designsettings.php:165
+#: actions/designadminpanel.php:583 lib/designform.php:220
 msgid "Tile background image"
 msgstr "Dlaždicovat obrázek na pozadí"
 
@@ -2227,25 +2301,25 @@ msgstr "Změnit barvy"
 
 #. TRANS: Field label for content color selector.
 #. TRANS: Label on profile design page for setting a profile page content colour.
-#: actions/designadminpanel.php:623 lib/designsettings.php:197
+#: actions/designadminpanel.php:623 lib/designform.php:252
 msgid "Content"
 msgstr "Obsah"
 
 #. TRANS: Field label for sidebar color selector.
 #. TRANS: Label on profile design page for setting a profile page sidebar colour.
-#: actions/designadminpanel.php:637 lib/designsettings.php:211
+#: actions/designadminpanel.php:637 lib/designform.php:266
 msgid "Sidebar"
 msgstr "Boční panel"
 
 #. TRANS: Field label for text color selector.
 #. TRANS: Label on profile design page for setting a profile page text colour.
-#: actions/designadminpanel.php:651 lib/designsettings.php:225
+#: actions/designadminpanel.php:651 lib/designform.php:280
 msgid "Text"
 msgstr "Text"
 
 #. TRANS: Field label for link color selector.
 #. TRANS: Label on profile design page for setting a profile page links colour.
-#: actions/designadminpanel.php:665 lib/designsettings.php:239
+#: actions/designadminpanel.php:665 lib/designform.php:294
 msgid "Links"
 msgstr "Odkazy"
 
@@ -2267,21 +2341,21 @@ msgid "Use defaults"
 msgstr "Použít výchozí"
 
 #. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: actions/designadminpanel.php:720 lib/designsettings.php:259
-msgid "Restore default designs"
+#: actions/designadminpanel.php:720
+#, fuzzy
+msgid "Restore default designs."
 msgstr "Obnovit výchozí vzhledy"
 
 #. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: actions/designadminpanel.php:728 lib/designsettings.php:267
-msgid "Reset back to default"
+#: actions/designadminpanel.php:728
+#, fuzzy
+msgid "Reset back to default."
 msgstr "Reset zpět do výchozího"
 
 #. TRANS: Title for button for saving theme settings.
-#. TRANS: Title for button on profile design page to save settings.
-#: actions/designadminpanel.php:736 lib/designsettings.php:272
-msgid "Save design"
+#: actions/designadminpanel.php:736
+#, fuzzy
+msgid "Save design."
 msgstr "Uložit vzhled"
 
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
@@ -2313,7 +2387,7 @@ msgid "You must be logged in to edit an application."
 msgstr "Pro úpravy aplikace musíte být přihlášen."
 
 #. TRANS: Client error displayed trying to edit an application that does not exist.
-#: actions/editapplication.php:83 actions/showapplication.php:87
+#: actions/editapplication.php:83 actions/showapplication.php:83
 msgid "No such application."
 msgstr "Aplikace neexistuje."
 
@@ -2406,80 +2480,53 @@ msgstr "Upravit skupinu %s"
 msgid "You must be logged in to create a group."
 msgstr "K vytvoření skupiny musíte být přihlášen."
 
-#. TRANS: Client error displayed trying to edit a group while not being a group admin.
-#. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
-#. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
-#: actions/editgroup.php:110 actions/editgroup.php:176
-#: actions/groupdesignsettings.php:109 actions/grouplogo.php:111
-msgid "You must be an admin to edit the group."
-msgstr "K úpravě skupiny musíte být admin."
-
 #. TRANS: Form instructions for group edit form.
 #: actions/editgroup.php:161
 msgid "Use this form to edit the group."
 msgstr "Použijte tento formulář k úpravám skupiny."
 
-#. TRANS: Group edit form validation error.
-#. TRANS: Group create form validation error.
-#. TRANS: %s is the invalid alias.
-#: actions/editgroup.php:241 actions/newgroup.php:188
-#, php-format
-msgid "Invalid alias: \"%s\""
-msgstr "Neplatný alias: \"%s\""
-
-#. TRANS: Server error displayed when editing a group fails.
-#: actions/editgroup.php:274
-msgid "Could not update group."
-msgstr "Nelze aktualizovat skupinu."
-
-#. TRANS: Server error displayed when group aliases could not be added.
-#. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/editgroup.php:281 classes/User_group.php:540
-msgid "Could not create aliases."
-msgstr "Nelze vytvořit aliasy."
-
 #. TRANS: Group edit form success message.
 #: actions/editgroup.php:301
 msgid "Options saved."
 msgstr "Nastavení uloženo."
 
 #. TRANS: Title for e-mail settings.
-#: actions/emailsettings.php:59
+#: actions/emailsettings.php:60
 msgid "Email settings"
 msgstr "Nastavení e-mailu"
 
 #. TRANS: E-mail settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/emailsettings.php:73
+#: actions/emailsettings.php:74
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 msgstr "Spravovat posílání e-mailů z %%site.name%%."
 
 #. TRANS: Form legend for e-mail settings form.
 #. TRANS: Field label for e-mail address input in e-mail settings form.
-#: actions/emailsettings.php:103 actions/emailsettings.php:129
+#: actions/emailsettings.php:104 actions/emailsettings.php:130
 msgid "Email address"
 msgstr "E-mailová adresa"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:109
+#: actions/emailsettings.php:110
 msgid "Current confirmed email address."
 msgstr "Aktuální potvrzená e-mailová adresa."
 
 #. TRANS: Button label to remove a confirmed e-mail address.
 #. TRANS: Button label for removing a set sender e-mail address to post notices from.
-#. TRANS: Button label to remove a confirmed Instant Messaging address.
+#. TRANS: Button label to remove a confirmed IM address.
 #. TRANS: Button label to remove a confirmed SMS address.
 #. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
-#: actions/emailsettings.php:112 actions/emailsettings.php:179
-#: actions/imsettings.php:112 actions/smssettings.php:120
-#: actions/smssettings.php:176
+#: actions/emailsettings.php:113 actions/emailsettings.php:180
+#: actions/imsettings.php:119 actions/smssettings.php:119
+#: actions/smssettings.php:175
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Odstranit"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:119
+#: actions/emailsettings.php:120
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -2492,44 +2539,44 @@ msgstr ""
 #. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
 #. TRANS: Any other domain may be owned by a legitimate person or
 #. TRANS: organization.
-#: actions/emailsettings.php:136
+#: actions/emailsettings.php:137
 msgid "Email address, like \"UserName@example.org\""
 msgstr "E-mailová adresa, ve stylu \"UzivatelskeJmeno@example.org\""
 
 #. TRANS: Button label for adding an e-mail address in e-mail settings form.
-#. TRANS: Button label for adding an Instant Messaging address in Instant Messaging settings form.
+#. TRANS: Button label for adding an IM address in IM settings form.
 #. TRANS: Button label for adding a SMS phone number in SMS settings form.
-#: actions/emailsettings.php:140 actions/imsettings.php:147
-#: actions/smssettings.php:158
+#: actions/emailsettings.php:141 actions/imsettings.php:147
+#: actions/smssettings.php:157
 msgctxt "BUTTON"
 msgid "Add"
 msgstr "Přidat"
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:148 actions/smssettings.php:167
+#: actions/emailsettings.php:149 actions/smssettings.php:166
 msgid "Incoming email"
 msgstr "Příchozí e-mail"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:154
+#: actions/emailsettings.php:155
 msgid "I want to post notices by email."
 msgstr "Chci posílat oznámení e-mailem."
 
 #. TRANS: Form instructions for incoming e-mail form in e-mail settings.
 #. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
-#: actions/emailsettings.php:176 actions/smssettings.php:174
+#: actions/emailsettings.php:177 actions/smssettings.php:173
 msgid "Send email to this address to post new notices."
 msgstr "Pošlete e-mail na tuto adresu pro poslání nového oznámení."
 
 #. TRANS: Instructions for incoming e-mail address input form, when an address has already been assigned.
 #. TRANS: Instructions for incoming SMS e-mail address input form.
-#: actions/emailsettings.php:185 actions/smssettings.php:182
+#: actions/emailsettings.php:186 actions/smssettings.php:181
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr "Vytvoření nové e-mailové adresy pro zasílání, ruší starou."
 
 #. TRANS: Instructions for incoming e-mail address input form.
-#: actions/emailsettings.php:189
+#: actions/emailsettings.php:190
 msgid ""
 "To send notices via email, we need to create a unique email address for you "
 "on this server:"
@@ -2537,89 +2584,89 @@ msgstr ""
 
 #. TRANS: Button label for adding an e-mail address to send notices from.
 #. TRANS: Button label for adding an SMS e-mail address to send notices from.
-#: actions/emailsettings.php:195 actions/smssettings.php:185
+#: actions/emailsettings.php:196 actions/smssettings.php:184
 msgctxt "BUTTON"
 msgid "New"
 msgstr "Nová"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:204
+#: actions/emailsettings.php:205
 msgid "Email preferences"
 msgstr "Nastavení e-mailu"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:212
+#: actions/emailsettings.php:213
 msgid "Send me notices of new subscriptions through email."
 msgstr "Pošlete mi oznámení o nových přihlášeních e-mailem."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:218
+#: actions/emailsettings.php:219
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr "Pošlete mi e-mail, když někdo přidá moje oznámení mezi oblíbené."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:225
+#: actions/emailsettings.php:226
 msgid "Send me email when someone sends me a private message."
 msgstr "Pošlete mi e-mail, když mi někdo pošle soukromou zprávu."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:231
+#: actions/emailsettings.php:232
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr "Pošlete mi e-mail, když mi někdo pošle \"@-odpověď\"."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:237
+#: actions/emailsettings.php:238
 msgid "Allow friends to nudge me and send me an email."
 msgstr "Povolit přátelům mě pošťouchnout a poslat mi email."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:243
+#: actions/emailsettings.php:244
 msgid "Publish a MicroID for my email address."
 msgstr "Publikovat MicroID pro mou e-mailovou adresu."
 
 #. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:361
+#: actions/emailsettings.php:362
 msgid "Email preferences saved."
 msgstr "Email nastavení uloženo."
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:380
+#: actions/emailsettings.php:381
 msgid "No email address."
 msgstr "Chybí e-mailová adresa."
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:388
+#: actions/emailsettings.php:389
 #, fuzzy
 msgid "Cannot normalize that email address."
 msgstr "Nepodařilo se normalizovat (kanonizovat) e-mailovou adresu."
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:393 actions/register.php:212
+#: actions/emailsettings.php:394 actions/register.php:197
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "Není platnou mailovou adresou."
 
 #. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:397
+#: actions/emailsettings.php:398
 msgid "That is already your email address."
 msgstr "To je již vaší e-mailovou adresou."
 
 #. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:401
+#: actions/emailsettings.php:402
 msgid "That email address already belongs to another user."
 msgstr "Tato e-mailová adresa již patří jinému uživateli."
 
 #. TRANS: Server error thrown on database error adding e-mail confirmation code.
 #. TRANS: Server error thrown on database error adding Instant Messaging confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:418 actions/imsettings.php:343
-#: actions/smssettings.php:365
+#: actions/emailsettings.php:419 actions/imsettings.php:362
+#: actions/smssettings.php:364
 #, fuzzy
 msgid "Could not insert confirmation code."
 msgstr "Nelze vložit potvrzující kód."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:425
+#: actions/emailsettings.php:426
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
@@ -2631,59 +2678,62 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling Instant Messaging address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:445 actions/imsettings.php:377
-#: actions/smssettings.php:399
+#: actions/emailsettings.php:446 actions/imsettings.php:391
+#: actions/smssettings.php:398
 msgid "No pending confirmation to cancel."
 msgstr "Žádné potvrzení ke zrušení."
 
 #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:450
+#: actions/emailsettings.php:451
 msgid "That is the wrong email address."
 msgstr "Toto je špatná e-mailová adresa."
 
 #. TRANS: Server error thrown on database error canceling e-mail address confirmation.
 #. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
-#: actions/emailsettings.php:459 actions/smssettings.php:413
+#: actions/emailsettings.php:460 actions/smssettings.php:412
 #, fuzzy
 msgid "Could not delete email confirmation."
 msgstr "Nelze smazat potvrzení emailu"
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:464
+#: actions/emailsettings.php:465
 msgid "Email confirmation cancelled."
 msgstr "Potvrzení e-mailu zrušeno."
 
 #. TRANS: Message given trying to remove an e-mail address that is not
 #. TRANS: registered for the active user.
-#: actions/emailsettings.php:483
+#: actions/emailsettings.php:484
 msgid "That is not your email address."
 msgstr "To není vaše e-mailová adresa."
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:504
+#: actions/emailsettings.php:505
 msgid "The email address was removed."
 msgstr "E-mailová adresa byla odstraněna."
 
 #. TRANS: Form validation error displayed when trying to remove an incoming e-mail address while no address has been set.
-#: actions/emailsettings.php:518 actions/smssettings.php:555
+#: actions/emailsettings.php:519 actions/smssettings.php:554
 msgid "No incoming email address."
 msgstr "Nemáte příchozí e-mailovou adresu."
 
 #. TRANS: Server error thrown on database error removing incoming e-mail address.
 #. TRANS: Server error thrown on database error adding incoming e-mail address.
-#: actions/emailsettings.php:530 actions/emailsettings.php:554
-#: actions/smssettings.php:565 actions/smssettings.php:588
+#. TRANS: Server error displayed when the user could not be updated in SMS settings.
+#: actions/emailsettings.php:531 actions/emailsettings.php:555
+#: actions/smssettings.php:565 actions/smssettings.php:590
 #, fuzzy
 msgid "Could not update user record."
 msgstr "Nelze aktualizovat záznam uživatele."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:534 actions/smssettings.php:568
+#. TRANS: Confirmation text after updating SMS settings.
+#: actions/emailsettings.php:535 actions/smssettings.php:569
 msgid "Incoming email address removed."
 msgstr "Příchozí e-mailová adresa odstraněna."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:558 actions/smssettings.php:591
+#. TRANS: Confirmation text after updating SMS settings.
+#: actions/emailsettings.php:559 actions/smssettings.php:594
 msgid "New incoming email address added."
 msgstr "Přidána nová příchozí e-mailová adresa."
 
@@ -2695,7 +2745,7 @@ msgstr "Tuto hlášku již máte v oblíbených."
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
 #: actions/favor.php:95
 #, fuzzy
-msgid "Disfavor favorite"
+msgid "Disfavor favorite."
 msgstr "Znemilostnit oblíbenou"
 
 #. TRANS: Page title for first page of favorited notices.
@@ -2748,9 +2798,8 @@ msgstr ""
 #. TRANS: %s is a user's nickname.
 #. TRANS: Title for first page of favourite notices of a user.
 #. TRANS: %s is the user for whom the favourite notices are displayed.
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing own favourited notices.
 #: actions/favoritesrss.php:111 actions/showfavorites.php:76
-#: lib/personalgroupnav.php:122
+#: lib/personalgroupnav.php:110
 #, php-format
 msgid "%s's favorite notices"
 msgstr "oblíbená oznámení uživatele %s"
@@ -2936,13 +2985,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
 #: actions/groupblock.php:191
 #, fuzzy
-msgid "Do not block this user from this group"
+msgid "Do not block this user from this group."
 msgstr "Neblokujte tohoto uživatele z této skupiny"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
 #: actions/groupblock.php:198
 #, fuzzy
-msgid "Block this user from this group"
+msgid "Block this user from this group."
 msgstr "Blokovat tohoto uživatele z této skupiny"
 
 #. TRANS: Server error displayed when trying to block a user from a group fails because of an application error.
@@ -2951,6 +3000,7 @@ msgid "Database error blocking user from group."
 msgstr "Chyba databáze při blokování uživatele ze skupiny."
 
 #. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
+#. TRANS: Client error displayed trying to find a user by ID without providing an ID.
 #: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr "Chybí ID."
@@ -2981,7 +3031,7 @@ msgid "Unable to update your design settings."
 msgstr "Nelze uložit vaše nastavení designu."
 
 #. TRANS: Form text to confirm saved group design settings.
-#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:222
+#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:239
 msgid "Design preferences saved."
 msgstr "Nastavení vzhledu uloženo."
 
@@ -3046,7 +3096,7 @@ msgid "A list of the users in this group."
 msgstr "Seznam uživatelů v této skupině."
 
 #. TRANS: Indicator in group members list that this user is a group administrator.
-#: actions/groupmembers.php:190
+#: actions/groupmembers.php:190 lib/action.php:581
 msgid "Admin"
 msgstr "Admin"
 
@@ -3139,8 +3189,10 @@ msgid "Group search"
 msgstr "Hledání skupin"
 
 #. TRANS: Text on page where groups can be searched if no results were found for a query.
-#: actions/groupsearch.php:82 actions/noticesearch.php:117
-#: actions/peoplesearch.php:83
+#. TRANS: Text for notice search results is the query had no results.
+#. TRANS: Message on the "People search" page where a query has no results.
+#: actions/groupsearch.php:82 actions/noticesearch.php:122
+#: actions/peoplesearch.php:87
 msgid "No results."
 msgstr "Žádné výsledky."
 
@@ -3177,167 +3229,169 @@ msgid "User is not blocked from group."
 msgstr "Uživatel není blokován ze skupiny."
 
 #. TRANS: Server error displayed when unblocking a user from a group fails because of an unknown error.
+#. TRANS: Server error displayed when removing a user block.
 #: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "Chyba při odstraňování bloku."
 
 #. TRANS: Title for Instant Messaging settings.
-#: actions/imsettings.php:58
+#: actions/imsettings.php:56
 msgid "IM settings"
 msgstr "Nastavení 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.
-#: actions/imsettings.php:71
+#: actions/imsettings.php:69
 #, fuzzy, php-format
 msgid ""
-"You can send and receive notices through Jabber/Google Talk [instant "
-"messages](%%doc.im%%). Configure your address and settings below."
+"You can send and receive notices through instant messaging [instant messages]"
+"(%%doc.im%%). Configure your addresses and settings below."
 msgstr ""
 "Můžete odesílat nebo přijámat oznámení pomocí Jabber/GTalk [zpráv](%%doc.im%"
 "%) .Zadejte svou adresu a nastavení níže."
 
-#. TRANS: Message given in the Instant Messaging settings if XMPP is not enabled on the site.
+#. TRANS: Message given in the IM settings if IM is not enabled on the site.
 #: actions/imsettings.php:90
 msgid "IM is not available."
 msgstr "IM není k dispozici."
 
-#. TRANS: Form legend for Instant Messaging settings form.
-#. TRANS: Field label for Instant Messaging address input in Instant Messaging settings form.
-#: actions/imsettings.php:102 actions/imsettings.php:132
-msgid "IM address"
-msgstr "IM adresa"
+#: actions/imsettings.php:116
+#, fuzzy, php-format
+msgid "Current confirmed %s address."
+msgstr "Aktuální potvrzená e-mailová adresa."
 
-#: actions/imsettings.php:109
-#, fuzzy
-msgid "Current confirmed Jabber/Google Talk address."
-msgstr "Aktuální potvrzená Jabber / GTalk adresa."
-
-#. TRANS: Form note in Instant Messaging settings form.
-#. TRANS: %s is the Instant Messaging address set for the site.
-#: actions/imsettings.php:120
+#. TRANS: Form note in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:128
 #, fuzzy, php-format
 msgid ""
-"Awaiting confirmation on this address. Check your Jabber/Google Talk account "
-"for a message with further instructions. (Did you add %s to your buddy list?)"
+"Awaiting confirmation on this address. Check your %s account for a message "
+"with further instructions. (Did you add %s to your buddy list?)"
 msgstr ""
 "Čakám na potvrzení této adresy. Hledejte zprávu s dalšími instrukcemi na "
 "vašem Jabber/GTalk účtu. (Přidal jste si %s do vašich kontaktů?)"
 
-#. TRANS: IM address input field instructions in Instant Messaging settings form.
-#. TRANS: %s is the Instant Messaging address set for the site.
-#. TRANS: Do not translate "example.org". It is one of the domain names reserved for use in examples by
-#. TRANS: http://www.rfc-editor.org/rfc/rfc2606.txt. Any other domain may be owned by a legitimate
-#. TRANS: person or organization.
-#: actions/imsettings.php:139
-#, fuzzy, php-format
-msgid ""
-"Jabber or Google Talk address, like \"UserName@example.org\". First, make "
-"sure to add %s to your buddy list in your IM client or on Google Talk."
-msgstr ""
-"Jabber nebo GTalk adresa, například \"jmeno@example.org\". Neprve se "
-"ujistěte že jste přidal %s do vašeho seznamu kontaktů ve vašem IM klientu "
-"nebo na GTalku."
+#: actions/imsettings.php:140
+msgid "IM address"
+msgstr "IM adresa"
 
-#. TRANS: Form legend for Instant Messaging preferences form.
-#: actions/imsettings.php:154
-msgid "IM preferences"
+#: actions/imsettings.php:142
+#, php-format
+msgid "%s screenname."
+msgstr ""
+
+#. TRANS: Header for IM preferences form.
+#: actions/imsettings.php:163
+#, fuzzy
+msgid "IM Preferences"
 msgstr "Nastavení IM"
 
-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:159
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:174
 #, fuzzy
-msgid "Send me notices through Jabber/Google Talk."
-msgstr "Zasílat oznámení pomocí Jabber/GTalk"
+msgid "Send me notices"
+msgstr "Poslat oznámení"
 
-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:165
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:176
 #, fuzzy
-msgid "Post a notice when my Jabber/Google Talk status changes."
+msgid "Post a notice when my status changes."
 msgstr "Poslat oznámení, když se změní můj Jabber/Gtalk status."
 
-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:171
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:178
 #, fuzzy
-msgid ""
-"Send me replies through Jabber/Google Talk from people I'm not subscribed to."
+msgid "Send me replies from people I'm not subscribed to."
 msgstr ""
 "Pošlete mi odpovědi přes Jabber / GTalk od lidí, ke kterým nejsem přihlášen."
 
-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:178
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:181
 #, fuzzy
-msgid "Publish a MicroID for my Jabber/Google Talk address."
-msgstr "Publikovat MicroID pro mou Jabber / GTalk adresu."
+msgid "Publish a MicroID"
+msgstr "Publikovat MicroID pro mou e-mailovou adresu."
 
-#. TRANS: Confirmation message for successful Instant Messaging preferences save.
-#: actions/imsettings.php:283 actions/othersettings.php:192
+#. TRANS: Server error thrown on database error updating IM preferences.
+#: actions/imsettings.php:291
+#, fuzzy
+msgid "Couldn't update IM preferences."
+msgstr "Nepodařilo se aktualizovat nastavení uživatele"
+
+#. TRANS: Confirmation message for successful IM preferences save.
+#. TRANS: Confirmation message after saving preferences.
+#: actions/imsettings.php:298 actions/urlsettings.php:244
 msgid "Preferences saved."
 msgstr "Nastavení uloženo"
 
-#. TRANS: Message given saving Instant Messaging address without having provided one.
-#: actions/imsettings.php:304
-msgid "No Jabber ID."
-msgstr "Chybí Jabber ID."
-
-#. TRANS: Message given saving Instant Messaging address that cannot be normalised.
-#: actions/imsettings.php:312
+#. TRANS: Message given saving IM address without having provided one.
+#: actions/imsettings.php:320
 #, fuzzy
-msgid "Cannot normalize that Jabber ID."
+msgid "No screenname."
+msgstr "Žádná přezdívka."
+
+#: actions/imsettings.php:325
+#, fuzzy
+msgid "No transport."
+msgstr "Žádné takové oznámení."
+
+#. TRANS: Message given saving IM address that cannot be normalised.
+#: actions/imsettings.php:333
+#, fuzzy
+msgid "Cannot normalize that screenname"
 msgstr "Nelze normalizovat tento JabberID"
 
-#. TRANS: Message given saving Instant Messaging address that not valid.
-#: actions/imsettings.php:317
+#. TRANS: Message given saving IM address that not valid.
+#: actions/imsettings.php:340
 #, fuzzy
-msgid "Not a valid Jabber ID."
-msgstr "Není platným Jabber ID"
+msgid "Not a valid screenname"
+msgstr "Není platnou přezdívkou."
 
-#. TRANS: Message given saving Instant Messaging address that is already set.
-#: actions/imsettings.php:321
-msgid "That is already your Jabber ID."
-msgstr "Toto je již vaše Jabber ID"
-
-#. TRANS: Message given saving Instant Messaging address that is already set for another user.
-#: actions/imsettings.php:325
-msgid "Jabber ID already belongs to another user."
+#. TRANS: Message given saving IM address that is already set for another user.
+#: actions/imsettings.php:344
+#, fuzzy
+msgid "Screenname already belongs to another user."
 msgstr "Jabber ID již patří jinému uživateli"
 
-#. TRANS: Message given saving valid Instant Messaging address that is to be confirmed.
-#. TRANS: %s is the Instant Messaging address set for the site.
-#: actions/imsettings.php:353
-#, php-format
-msgid ""
-"A confirmation code was sent to the IM address you added. You must approve %"
-"s for sending messages to you."
+#. TRANS: Message given saving valid IM address that is to be confirmed.
+#: actions/imsettings.php:369
+#, fuzzy
+msgid "A confirmation code was sent to the IM address you added."
 msgstr ""
 "Ověřující kód byl poslán na vloženou IM adresu. Musíte povolit aby vám %s "
 "posílal zprávy."
 
-#. TRANS: Message given canceling Instant Messaging address confirmation for the wrong IM address.
-#: actions/imsettings.php:382
+#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#: actions/imsettings.php:396
 msgid "That is the wrong IM address."
 msgstr "Toto je špatná IM adresa"
 
-#. TRANS: Server error thrown on database error canceling Instant Messaging address confirmation.
-#: actions/imsettings.php:391
+#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#: actions/imsettings.php:405
 #, fuzzy
-msgid "Could not delete IM confirmation."
+msgid "Couldn't delete confirmation."
 msgstr "Nelze smazat potvrzení IM"
 
-#. TRANS: Message given after successfully canceling Instant Messaging address confirmation.
-#: actions/imsettings.php:396
+#. TRANS: Message given after successfully canceling IM address confirmation.
+#: actions/imsettings.php:410
 msgid "IM confirmation cancelled."
 msgstr "IM potvrzení zrušeno."
 
-#. TRANS: Message given trying to remove an Instant Messaging address that is not
+#. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.
-#: actions/imsettings.php:417
-msgid "That is not your Jabber ID."
-msgstr "Toto není váš Jabber ID"
+#: actions/imsettings.php:434
+#, fuzzy
+msgid "That is not your screenname."
+msgstr "To není vaše telefonní číslo."
+
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#: actions/imsettings.php:443
+#, fuzzy
+msgid "Couldn't update user im prefs."
+msgstr "Nelze aktualizovat záznam uživatele."
 
 #. TRANS: Message given after successfully removing a registered Instant Messaging address.
-#: actions/imsettings.php:440
+#: actions/imsettings.php:451
 msgid "The IM address was removed."
 msgstr "IM adresa byla odstraněna."
 
@@ -3553,7 +3607,7 @@ msgid "You must be logged in to join a group."
 msgstr "Musíte být přihlášen pro vstup do skupiny."
 
 #. TRANS: Title for join group page after joining.
-#: actions/joingroup.php:147
+#: actions/joingroup.php:148
 #, fuzzy, php-format
 msgctxt "TITLE"
 msgid "%1$s joined group %2$s"
@@ -3682,7 +3736,7 @@ msgstr ""
 #. TRANS: Submit button title.
 #: actions/licenseadminpanel.php:311 actions/sessionsadminpanel.php:199
 #: actions/siteadminpanel.php:292 actions/snapshotadminpanel.php:245
-#: actions/tagother.php:154 lib/applicationeditform.php:357
+#: actions/tagother.php:133 lib/applicationeditform.php:357
 msgid "Save"
 msgstr "Uložit"
 
@@ -3690,40 +3744,42 @@ msgstr "Uložit"
 msgid "Save license settings"
 msgstr ""
 
-#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
+#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
+#: actions/login.php:97 actions/otp.php:62 actions/register.php:130
 msgid "Already logged in."
 msgstr "Již přihlášen"
 
-#: actions/login.php:148
+#: actions/login.php:125
 msgid "Incorrect username or password."
 msgstr "Neplatné jméno nebo heslo"
 
-#: actions/login.php:154 actions/otp.php:120
+#. TRANS: Server error displayed when a user object could not be created trying to login using "one time password login".
+#: actions/login.php:131 actions/otp.php:127
 msgid "Error setting user. You are probably not authorized."
 msgstr "Chyba při nastavení uživatele. Pravděpodobně nejste autorizován."
 
-#: actions/login.php:210 actions/login.php:263
+#: actions/login.php:185 actions/login.php:236 lib/action.php:598
 msgid "Login"
 msgstr "Přihlásit"
 
-#: actions/login.php:249
+#: actions/login.php:222
 msgid "Login to site"
 msgstr "Přihlásit se na stránky"
 
-#: actions/login.php:258 actions/register.php:490
+#: actions/login.php:231 actions/register.php:469
 msgid "Remember me"
 msgstr "Zapamatuj si mě"
 
-#: actions/login.php:259 actions/register.php:492
+#: actions/login.php:232 actions/register.php:471
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 "Příště automaticky přihlásit; ne pro počítače, které používá více lidí! "
 
-#: actions/login.php:269
+#: actions/login.php:241
 msgid "Lost or forgotten password?"
 msgstr "Ztracené nebo zapomenuté heslo?"
 
-#: actions/login.php:288
+#: actions/login.php:259
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -3731,11 +3787,11 @@ msgstr ""
 "Z bezpečnostních důvodů, prosím zadejte znovu své jméno a heslo než budete "
 "měnit svá nastavení."
 
-#: actions/login.php:292
+#: actions/login.php:263
 msgid "Login with your username and password."
 msgstr "Přihlásit se pomocí svého uživatelského jména a hesla."
 
-#: actions/login.php:295
+#: actions/login.php:266
 #, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -3863,7 +3919,9 @@ msgstr "Nové sdělení"
 msgid "Notice posted"
 msgstr "Sdělení posláno"
 
-#: actions/noticesearch.php:68
+#. TRANS: Instructions for Notice search page.
+#. TRANS: %%site.name%% is the name of the StatusNet site.
+#: actions/noticesearch.php:69
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -3872,16 +3930,21 @@ msgstr ""
 "Hledej sdělení na %%site.name%% podle obsahu. Oddělte výrazy mezerami; musí "
 "mít alespoň 3 znaky"
 
-#: actions/noticesearch.php:78
+#. TRANS: Title of the page where users can search for notices.
+#: actions/noticesearch.php:80
 msgid "Text search"
 msgstr "Text vyhledávání"
 
-#: actions/noticesearch.php:91
+#. TRANS: Test in RSS notice search.
+#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
+#: actions/noticesearch.php:95
 #, php-format
 msgid "Search results for \"%1$s\" on %2$s"
 msgstr "Výsledky hledání \"%1$s\" na %2$s"
 
-#: actions/noticesearch.php:121
+#. TRANS: Text for logged in users making a query for notices without results.
+#. TRANS: This message contains a Markdown link.
+#: actions/noticesearch.php:128
 #, php-format
 msgid ""
 "Be the first to [post on this topic](%%%%action.newnotice%%%%?"
@@ -3890,7 +3953,9 @@ msgstr ""
 "Buďte první kdo [příspěje](%%%%action.newnotice%%%%?status_textarea=%s) na "
 "toto téma!"
 
-#: actions/noticesearch.php:124
+#. TRANS: Text for not logged in users making a query for notices without results.
+#. TRANS: This message contains Markdown links.
+#: actions/noticesearch.php:133
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and be the first to "
@@ -3899,14 +3964,17 @@ msgstr ""
 "Proč si ne [zaregistrovat účet](%%%%action.register%%%%) a být první, kdo "
 "[příspěje](%%%%action.newnotice %%%%?status_textarea =%s) na toto téma!"
 
-#: actions/noticesearchrss.php:96
+#. TRANS: RSS notice search feed title. %s is the query.
+#: actions/noticesearchrss.php:95
 #, php-format
 msgid "Updates with \"%s\""
 msgstr "Hlášky s \"%s\""
 
-#: actions/noticesearchrss.php:98
+#. TRANS: RSS notice search feed description.
+#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
+#: actions/noticesearchrss.php:99
 #, fuzzy, php-format
-msgid "Updates matching search term \"%1$s\" on %2$s!"
+msgid "Updates matching search term \"%1$s\" on %2$s."
 msgstr "Aktualizace odpovídající hledanému výrazu \"%1$s\" na %2$s!"
 
 #: actions/nudge.php:85
@@ -3927,51 +3995,51 @@ msgid "Nudge sent!"
 msgstr "Pošťouchnutí posláno!"
 
 #. TRANS: Message displayed to an anonymous user trying to view OAuth application list.
-#: actions/oauthappssettings.php:60
+#: actions/oauthappssettings.php:57
 msgid "You must be logged in to list your applications."
 msgstr "Musíte být přihlášen k vypsání seznamu aplikací."
 
 #. TRANS: Page title for OAuth applications
-#: actions/oauthappssettings.php:76
+#: actions/oauthappssettings.php:73
 msgid "OAuth applications"
 msgstr "OAuth aplikace"
 
 #. TRANS: Page instructions for OAuth applications
-#: actions/oauthappssettings.php:88
+#: actions/oauthappssettings.php:85
 msgid "Applications you have registered"
 msgstr "Aplikace které jste zaregistrovali"
 
 #. TRANS: Empty list message on page with OAuth applications.
-#: actions/oauthappssettings.php:141
+#: actions/oauthappssettings.php:138
 #, php-format
 msgid "You have not registered any applications yet."
 msgstr "Ještě jste nezaregistrovali žádné aplikace."
 
 #. TRANS: Title for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:71
+#: actions/oauthconnectionssettings.php:69
 msgid "Connected applications"
 msgstr "Propojené aplikace"
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:83
+#: actions/oauthconnectionssettings.php:80
 msgid "The following connections exist for your account."
 msgstr ""
 
 #. TRANS: Client error when trying to revoke access for an application while not being a user of it.
-#: actions/oauthconnectionssettings.php:168
+#: actions/oauthconnectionssettings.php:165
 msgid "You are not a user of that application."
 msgstr "Nejste uživatel této aplikace."
 
 #. TRANS: Client error when revoking access has failed for some reason.
 #. TRANS: %s is the application ID revoking access failed for.
-#: actions/oauthconnectionssettings.php:183
+#: actions/oauthconnectionssettings.php:180
 #, fuzzy, php-format
 msgid "Unable to revoke access for application: %s."
 msgstr "Nelze zrušit přístup aplikace %s."
 
 #. TRANS: Success message after revoking access for an application.
 #. TRANS: %1$s is the application name, %2$s is the first part of the user token.
-#: actions/oauthconnectionssettings.php:202
+#: actions/oauthconnectionssettings.php:199
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -3979,20 +4047,30 @@ msgid ""
 msgstr ""
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:213
+#: actions/oauthconnectionssettings.php:210
 msgid "You have not authorized any applications to use your account."
 msgstr "Žádným aplikacím jste nepovolili používat váš účet."
 
 #. TRANS: Note for developers in the OAuth connection settings form.
 #. TRANS: This message contains a Markdown link. Do not separate "](".
 #. TRANS: %s is the URL to the OAuth settings.
-#: actions/oauthconnectionssettings.php:233
+#: actions/oauthconnectionssettings.php:230
 #, php-format
 msgid ""
 "Are you a developer? [Register an OAuth client application](%s) to use with "
 "this instance of StatusNet."
 msgstr ""
 
+#: actions/oembed.php:64
+#, fuzzy, php-format
+msgid "\"%s\" not found."
+msgstr " API metoda nebyla nalezena."
+
+#: actions/oembed.php:76
+#, fuzzy, php-format
+msgid "Notice %s not found."
+msgstr " API metoda nebyla nalezena."
+
 #: actions/oembed.php:80 actions/shownotice.php:100
 msgid "Notice has no profile."
 msgstr "Uživatel nemá profil."
@@ -4002,6 +4080,16 @@ msgstr "Uživatel nemá profil."
 msgid "%1$s's status on %2$s"
 msgstr "status %1 na %2"
 
+#: actions/oembed.php:95
+#, fuzzy, php-format
+msgid "Attachment %s not found."
+msgstr "Příjemce nebyl nalezen."
+
+#: actions/oembed.php:136
+#, php-format
+msgid "\"%s\" not supported for oembed requests."
+msgstr ""
+
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
 #: actions/oembed.php:168
 #, php-format
@@ -4015,94 +4103,60 @@ msgid "Only %s URLs over plain HTTP please."
 msgstr "Only %s URLs over plain HTTP please."
 
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1205
-#: lib/apiaction.php:1232 lib/apiaction.php:1367
+#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1207
+#: lib/apiaction.php:1234 lib/apiaction.php:1369
 msgid "Not a supported data format."
 msgstr "Nepodporovaný formát dat."
 
+#. TRANS: ShortName in the OpenSearch interface when trying to find users.
 #: actions/opensearch.php:64
 msgid "People Search"
 msgstr "Hledání lidí"
 
-#: actions/opensearch.php:67
+#: actions/opensearch.php:68
 msgid "Notice Search"
 msgstr "Hledání oznámení"
 
-#: actions/othersettings.php:59
-msgid "Other settings"
-msgstr "Další nastavení"
-
-#. TRANS: Instructions for tab "Other" in user profile settings.
-#: actions/othersettings.php:71
-msgid "Manage various other options."
-msgstr "Správa různých dalších možností."
-
-#. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
-#. TRANS: user's profile settings. Use of "free" is as in "open", indicating that the
-#. TRANS: information on the shortener site is freely distributable.
-#. TRANS: This message has one space at the beginning. Use your language's word separator
-#. TRANS: here if it has one (most likely a single space).
-#: actions/othersettings.php:113
-msgid " (free service)"
-msgstr " (Služba zdarma)"
-
-#. TRANS: Label for dropdown with URL shortener services.
-#: actions/othersettings.php:122
-msgid "Shorten URLs with"
-msgstr "Zkrácovat URL s"
-
-#. TRANS: Tooltip for for dropdown with URL shortener services.
-#: actions/othersettings.php:124
-msgid "Automatic shortening service to use."
-msgstr "Služba automatického zkracování, kterou použít."
-
-#. TRANS: Label for checkbox.
-#: actions/othersettings.php:130
-msgid "View profile designs"
-msgstr "Zobrazit vzhledy profilu"
-
-#. TRANS: Tooltip for checkbox.
-#: actions/othersettings.php:132
-msgid "Show or hide profile designs."
-msgstr "Zobrazit nebo skrýt vzhledy profilu."
-
-#. TRANS: Form validation error for form "Other settings" in user profile.
-#: actions/othersettings.php:164
-#, fuzzy
-msgid "URL shortening service is too long (maximum 50 characters)."
-msgstr "adresa služby zkracování URL je příliš dlouhá (max. 50 znaků)."
-
-#: actions/otp.php:69
+#. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
+#: actions/otp.php:70
 msgid "No user ID specified."
 msgstr "Nebylo zadáno uživatelské ID."
 
-#: actions/otp.php:83
+#. TRANS: Client error displayed trying to use "one time password login" without specifying a login token.
+#: actions/otp.php:86
 msgid "No login token specified."
 msgstr "Přihlašovací token nezadán."
 
-#: actions/otp.php:90
+#. TRANS: Client error displayed trying to use "one time password login" without requesting a login token.
+#: actions/otp.php:94
 msgid "No login token requested."
 msgstr "Nepožadován přihlašovací token."
 
-#: actions/otp.php:95
+#. TRANS: Client error displayed trying to use "one time password login" while specifying an invalid login token.
+#: actions/otp.php:100
 msgid "Invalid login token specified."
 msgstr "Neplatný přihlašovací token."
 
-#: actions/otp.php:104
+#. TRANS: Client error displayed trying to use "one time password login" while specifying an expired login token.
+#: actions/otp.php:110
 msgid "Login token expired."
 msgstr "Přihlašovací token vypršel."
 
-#: actions/outbox.php:58
+#. TRANS: Title for outbox for any but the fist page.
+#. TRANS: %1$s is the user nickname, %2$d is the page number.
+#: actions/outbox.php:57
 #, php-format
 msgid "Outbox for %1$s - page %2$d"
 msgstr "Odeslaná pošta uživatele %1$s - strana %2$d"
 
+#. TRANS: Title for first page of outbox.
 #: actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
 msgstr "Odeslané uživatele %s"
 
-#: actions/outbox.php:104
+#. TRANS: Instructions for outbox.
+#: actions/outbox.php:103
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr ""
 "Toto je váš outbox, který obsahuje seznam soukromých zpráv které jste "
@@ -4130,43 +4184,45 @@ msgstr "Staré heslo"
 msgid "New password"
 msgstr "Nové heslo"
 
-#: actions/passwordsettings.php:109
+#: actions/passwordsettings.php:109 actions/register.php:416
 #, fuzzy
-msgid "6 or more characters"
+msgid "6 or more characters."
 msgstr "6 a více znaků"
 
-#: actions/passwordsettings.php:113
+#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#: actions/passwordsettings.php:113 actions/recoverpassword.php:264
+#: actions/register.php:420
 #, fuzzy
-msgid "Same as password above"
+msgid "Same as password above."
 msgstr "Stejné jako heslo výše"
 
 #: actions/passwordsettings.php:117
 msgid "Change"
 msgstr "Změnit"
 
-#: actions/passwordsettings.php:154 actions/register.php:238
+#: actions/passwordsettings.php:153 actions/register.php:223
 msgid "Password must be 6 or more characters."
 msgstr "Heslo musí být alespoň 6 znaků dlouhé"
 
-#: actions/passwordsettings.php:157 actions/register.php:241
+#: actions/passwordsettings.php:156 actions/register.php:226
 msgid "Passwords don't match."
 msgstr "Hesla nesouhlasí"
 
-#: actions/passwordsettings.php:165
+#: actions/passwordsettings.php:164
 msgid "Incorrect old password"
 msgstr "Nesprávné staré heslo"
 
-#: actions/passwordsettings.php:181
+#: actions/passwordsettings.php:180
 msgid "Error saving user; invalid."
 msgstr "Chyba při ukládaní uživatele; neplatný."
 
-#: actions/passwordsettings.php:186
+#. TRANS: Reset password form validation error message.
+#: actions/passwordsettings.php:185 actions/recoverpassword.php:418
 #, fuzzy
-msgid "Can't save new password."
+msgid "Cannot save new password."
 msgstr "Nelze uložit nové heslo"
 
-#. TRANS: Title for password recovery page in password saved mode.
-#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
+#: actions/passwordsettings.php:191
 msgid "Password saved."
 msgstr "Heslo uloženo"
 
@@ -4383,8 +4439,7 @@ msgid "Directory where backgrounds are located."
 msgstr "Cesta k adresáři locales"
 
 #. TRANS: Fieldset legens in Paths admin panel.
-#. TRANS: DT element label in attachment list.
-#: actions/pathsadminpanel.php:419 lib/attachmentlist.php:98
+#: actions/pathsadminpanel.php:419
 msgid "Attachments"
 msgstr "Přílohy"
 
@@ -4458,7 +4513,9 @@ msgstr "Server kam směrovat SSL žádosti"
 msgid "Save paths"
 msgstr "Uložit cesty"
 
-#: actions/peoplesearch.php:52
+#. TRANS: Instructions for the "People search" page.
+#. TRANS: %%site.name%% is the name of the StatusNet site.
+#: actions/peoplesearch.php:54
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
@@ -4467,7 +4524,8 @@ msgstr ""
 "Hledej uživatele na %%site.name%% podle jejich jména, místa, nebo zájmů. "
 "Minimální délka musí být alespoň 3 znaky"
 
-#: actions/peoplesearch.php:58
+#. TRANS: Title of a page where users can search for other users.
+#: actions/peoplesearch.php:61
 msgid "People search"
 msgstr "Hledání lidí"
 
@@ -4481,6 +4539,60 @@ msgstr "Není platný člověkotag: %s."
 msgid "Users self-tagged with %1$s - page %2$d"
 msgstr "Uživatelé kteří se sami otagovali %1$s - strana %2$d"
 
+#. TRANS: Page title for AJAX form return when a disabling a plugin.
+#: actions/plugindisable.php:69
+msgctxt "plugin"
+msgid "Disabled"
+msgstr ""
+
+#. TRANS: Client error displayed trying to perform any request method other than POST.
+#. TRANS: Do not translate POST.
+#: actions/pluginenable.php:78 actions/subscribe.php:77
+msgid "This action only accepts POST requests."
+msgstr "Tato akce přijímá pouze POST požadavky."
+
+#: actions/pluginenable.php:102
+#, fuzzy
+msgid "You cannot administer plugins."
+msgstr "Nemůžete odstranit uživatele."
+
+#: actions/pluginenable.php:109
+#, fuzzy
+msgid "No such plugin."
+msgstr "Tady žádná taková stránka není."
+
+#. TRANS: Page title for AJAX form return when enabling a plugin.
+#: actions/pluginenable.php:159
+msgctxt "plugin"
+msgid "Enabled"
+msgstr ""
+
+#. TRANS: Tab and title for plugins admin panel.
+#. TRANS: Menu item for site administration
+#: actions/pluginsadminpanel.php:56 actions/version.php:191
+#: lib/adminpanelaction.php:411
+msgid "Plugins"
+msgstr "Pluginy"
+
+#. TRANS: Instructions at top of plugin admin page.
+#: actions/pluginsadminpanel.php:68
+msgid ""
+"Additional plugins can be enabled and configured manually. See the <a href="
+"\"http://status.net/wiki/Plugins\">online plugin documentation</a> for more "
+"details."
+msgstr ""
+
+#. TRANS: Admin form section header
+#: actions/pluginsadminpanel.php:84
+#, fuzzy
+msgid "Default plugins"
+msgstr "Výchozí jazyk"
+
+#: actions/pluginsadminpanel.php:106
+msgid ""
+"All default plugins have been disabled from the site's configuration file."
+msgstr ""
+
 #: actions/postnotice.php:95
 msgid "Invalid notice content."
 msgstr "Neplatná velikost"
@@ -4491,12 +4603,12 @@ msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’.
 msgstr "Licence hlášky ‘%1$s’ není kompatibilní s licencí webu ‘%2$s’."
 
 #. TRANS: Page title for profile settings.
-#: actions/profilesettings.php:59
+#: actions/profilesettings.php:60
 msgid "Profile settings"
 msgstr "Nastavené Profilu"
 
 #. TRANS: Usage instructions for profile settings.
-#: actions/profilesettings.php:70
+#: actions/profilesettings.php:71
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
@@ -4504,34 +4616,31 @@ msgstr ""
 "více dozvědět."
 
 #. TRANS: Profile settings form legend.
-#: actions/profilesettings.php:98
+#: actions/profilesettings.php:99
 msgid "Profile information"
 msgstr "Nastavené Profilu"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109 actions/register.php:433
+#: actions/profilesettings.php:110 actions/register.php:412
 #, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr "1-64 znaků nebo čísel, bez teček, čárek a mezer"
 
 #. TRANS: Field label in form for profile settings.
-#. TRANS: Label for full group name (dt). Text hidden by default.
-#. TRANS: DT for full name in a profile.
-#: actions/profilesettings.php:113 actions/register.php:455
-#: actions/showgroup.php:255 actions/tagother.php:104
-#: lib/groupeditform.php:150 lib/userprofile.php:156
+#: actions/profilesettings.php:114 actions/register.php:434
+#: lib/groupeditform.php:150
 msgid "Full name"
 msgstr "Celé jméno"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:118 actions/register.php:460
+#: actions/profilesettings.php:119 actions/register.php:439
 #: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "Moje stránky"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:121
+#: actions/profilesettings.php:122 actions/register.php:441
 #, fuzzy
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr "Adresa vašich stránek, blogu nebo profilu na jiných stránkách."
@@ -4539,7 +4648,7 @@ msgstr "Adresa vašich stránek, blogu nebo profilu na jiných stránkách."
 #. TRANS: Tooltip for field label in form for profile settings. Plural
 #. TRANS: is decided by the number of characters available for the
 #. TRANS: biography (%d).
-#: actions/profilesettings.php:129 actions/register.php:471
+#: actions/profilesettings.php:130 actions/register.php:450
 #, fuzzy, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4548,77 +4657,73 @@ msgstr[1] "Popište sebe a své zájmy"
 msgstr[2] "Popište sebe a své zájmy"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:135 actions/register.php:476
+#: actions/profilesettings.php:136 actions/register.php:455
 msgid "Describe yourself and your interests"
 msgstr "Popište sebe a své zájmy"
 
 #. TRANS: Text area label in form for profile settings where users can provide.
 #. TRANS: their biography.
-#: actions/profilesettings.php:139 actions/register.php:478
+#: actions/profilesettings.php:140 actions/register.php:457
 msgid "Bio"
 msgstr "O mě"
 
 #. TRANS: Field label in form for profile settings.
-#. TRANS: Label for group location (dt). Text hidden by default.
-#. TRANS: DT for location in a profile.
-#: actions/profilesettings.php:145 actions/register.php:483
-#: actions/showgroup.php:265 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:173
-#: lib/userprofile.php:172
+#: actions/profilesettings.php:146 actions/register.php:462
+#: lib/groupeditform.php:173
 msgid "Location"
 msgstr "Umístění"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148 actions/register.php:485
+#: actions/profilesettings.php:149
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Místo. Město, stát."
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:153
+#: actions/profilesettings.php:154
 msgid "Share my current location when posting notices"
 msgstr "Sdělit mou aktuální polohu při posílání hlášek"
 
 #. TRANS: Field label in form for profile settings.
-#. TRANS: DT for tags in a profile.
-#: actions/profilesettings.php:161 actions/tagother.php:149
-#: actions/tagother.php:209 lib/subscriptionlist.php:106
-#: lib/subscriptionlist.php:108 lib/userprofile.php:220
+#: actions/profilesettings.php:162 actions/tagother.php:128
+#: actions/tagother.php:188 lib/subscriptionlist.php:104
+#: lib/subscriptionlist.php:106
 msgid "Tags"
 msgstr "Tagy"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:164
+#: actions/profilesettings.php:165
 #, fuzzy
 msgid ""
-"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- "
+"separated."
 msgstr "Otagujte se (písmena, čísla, -, . a _), oddělené čárkami nebo mezerami"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:169
+#: actions/profilesettings.php:170
 msgid "Language"
 msgstr "Jazyk"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:171
+#: actions/profilesettings.php:172
 #, fuzzy
-msgid "Preferred language"
+msgid "Preferred language."
 msgstr "Preferovaný jazyk"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:181
+#: actions/profilesettings.php:182
 msgid "Timezone"
 msgstr "Časové pásmo"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:183
+#: actions/profilesettings.php:184
 msgid "What timezone are you normally in?"
 msgstr "V jaké časové zóně se obyčejně nacházíte?"
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:189
+#: actions/profilesettings.php:190
 #, fuzzy
 msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)"
+"Automatically subscribe to whoever subscribes to me (best for non-humans)."
 msgstr ""
 "Automaticky se přihlásit k odběru toho kdo se přihlásil ke mně (nejlepší pro "
 "ne-lidi)"
@@ -4626,7 +4731,7 @@ msgstr ""
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Plural form is used based on the maximum number of allowed
 #. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:258 actions/register.php:229
+#: actions/profilesettings.php:259 actions/register.php:214
 #, fuzzy, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4635,50 +4740,50 @@ msgstr[1] "Umístění příliš dlouhé (maximálně %d znaků)"
 msgstr[2] "Umístění příliš dlouhé (maximálně %d znaků)"
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:269 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:270 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr "Časové pásmo není vybráno."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:277
+#: actions/profilesettings.php:278
 #, fuzzy
 msgid "Language is too long (maximum 50 characters)."
 msgstr "Jazyk je příliš dlouhý (max. 50 znaků)."
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:291 actions/tagother.php:178
-#, php-format
-msgid "Invalid tag: \"%s\""
+#: actions/profilesettings.php:292
+#, fuzzy, php-format
+msgid "Invalid tag: \"%s\"."
 msgstr "Neplatná velikost"
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:347
+#: actions/profilesettings.php:348
 #, fuzzy
 msgid "Could not update user for autosubscribe."
 msgstr "Nelze aktualizovat nastavení automatického přihlašování."
 
 #. TRANS: Server error thrown when user profile location preference settings could not be updated.
-#: actions/profilesettings.php:405
+#: actions/profilesettings.php:406
 #, fuzzy
 msgid "Could not save location prefs."
 msgstr "Nelze uložit nastavení umístění."
 
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:427 actions/tagother.php:200
+#: actions/profilesettings.php:428 actions/tagother.php:179
 msgid "Could not save tags."
 msgstr "Nelze uložit nálepky"
 
 #. TRANS: Confirmation shown when user profile settings are saved.
 #. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:436 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:437 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "Nastavení uloženo"
 
 #. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
 #. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:483 actions/restoreaccount.php:60
+#: actions/profilesettings.php:484 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "Zaregistrujte se"
@@ -4756,6 +4861,12 @@ msgstr ""
 "faq#mikroblog) služba založená na Free Software nástroji [StatusNet](http://"
 "status.net/)."
 
+#. TRANS: Public RSS feed description. %s is the StatusNet site name.
+#: actions/publicrss.php:106
+#, fuzzy, php-format
+msgid "%s updates from everyone."
+msgstr "Všechny updaty na %s!"
+
 #. TRANS: Title for public tag cloud.
 #: actions/publictagcloud.php:57
 msgid "Public tag cloud"
@@ -4795,10 +4906,6 @@ msgid ""
 msgstr ""
 "Proč ne [zaregistrovat účet](%%action.register%%) a poslat něco jako první!"
 
-#: actions/publictagcloud.php:146
-msgid "Tag cloud"
-msgstr "Tag cloud"
-
 #. TRANS: Client error displayed trying to recover password while already logged in.
 #: actions/recoverpassword.php:37
 msgid "You are already logged in!"
@@ -4890,6 +4997,12 @@ msgstr "Obnovit heslo"
 msgid "Password recovery requested"
 msgstr "Zažádáno o obnovu hesla"
 
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/recoverpassword.php:229
+#, fuzzy
+msgid "Password saved"
+msgstr "Heslo uloženo"
+
 #. TRANS: Title for password recovery page when an unknown action has been specified.
 #: actions/recoverpassword.php:232
 msgid "Unknown action"
@@ -4901,15 +5014,9 @@ msgstr "Neznámá akce"
 msgid "6 or more characters, and do not forget it!"
 msgstr "6 a více znaků, a nezapomeňte ho!"
 
-#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
-#: actions/recoverpassword.php:264 actions/register.php:441
-#, fuzzy
-msgid "Same as password above."
-msgstr "Stejné jako heslo výše"
-
 #. TRANS: Button text for password reset form.
 #. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: actions/recoverpassword.php:268 lib/designsettings.php:264
+#: actions/recoverpassword.php:268 lib/designform.php:145
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Reset"
@@ -4960,14 +5067,8 @@ msgstr "Heslo musí být alespoň 6 znaků dlouhé"
 msgid "Password and confirmation do not match."
 msgstr "Heslo a potvrzení nesouhlasí"
 
-#. TRANS: Reset password form validation error message.
-#: actions/recoverpassword.php:418
-#, fuzzy
-msgid "Cannot save new password."
-msgstr "Nelze uložit nové heslo"
-
 #. TRANS: Server error displayed when something does wrong with the user object during password reset.
-#: actions/recoverpassword.php:426 actions/register.php:256
+#: actions/recoverpassword.php:426 actions/register.php:241
 msgid "Error setting user."
 msgstr "Chyba nastavení uživatele"
 
@@ -4976,97 +5077,101 @@ msgstr "Chyba nastavení uživatele"
 msgid "New password successfully saved. You are now logged in."
 msgstr "Nové heslo bylo uloženo. Nyní jste přihlášen."
 
-#: actions/register.php:92 actions/register.php:196 actions/register.php:413
+#: actions/redirecturl.php:70
+#, fuzzy
+msgid "No id parameter"
+msgstr "Žádný argument ID."
+
+#: actions/redirecturl.php:76
+#, fuzzy, php-format
+msgid "No such file \"%d\""
+msgstr "Žádný takový soubor."
+
+#: actions/register.php:80 actions/register.php:181 actions/register.php:392
 msgid "Sorry, only invited people can register."
 msgstr "Litujeme, jen pozvaní se mohou registrovat."
 
-#: actions/register.php:99
+#: actions/register.php:87
 msgid "Sorry, invalid invitation code."
 msgstr "Litujeme, neplatný kód pozvánky."
 
-#: actions/register.php:119
+#: actions/register.php:106
 msgid "Registration successful"
 msgstr "Registrace úspěšná"
 
-#: actions/register.php:121 actions/register.php:511
+#: actions/register.php:108 actions/register.php:490
 msgid "Register"
 msgstr "Registrovat"
 
-#: actions/register.php:142
+#: actions/register.php:128
 msgid "Registration not allowed."
 msgstr "Registrace není povolena."
 
-#: actions/register.php:209
+#: actions/register.php:194
 #, fuzzy
-msgid "You can't register if you don't agree to the license."
+msgid "You cannot register if you don't agree to the license."
 msgstr "Nemůžete se registrovat, pokud nesouhlasíte s licencí."
 
-#: actions/register.php:218
+#: actions/register.php:203
 msgid "Email address already exists."
 msgstr "Emailová adresa již existuje"
 
-#: actions/register.php:251 actions/register.php:273
+#: actions/register.php:236 actions/register.php:258
 msgid "Invalid username or password."
 msgstr "Neplatné jméno nebo heslo"
 
-#: actions/register.php:351
+#: actions/register.php:333
 #, fuzzy
 msgid ""
 "With this form you can create a new account. You can then post notices and "
-"link up to friends and colleagues. "
+"link up to friends and colleagues."
 msgstr ""
 "Pomocí tohoto formuláře můžete vytvořit nový účet. Můžete pak posílat "
 "oznámení a propojit se s přáteli a kolegy. "
 
-#: actions/register.php:437
-#, fuzzy
-msgid "6 or more characters."
-msgstr "6 a více znaků"
-
-#. TRANS: Link description in user account settings menu.
-#: actions/register.php:445 actions/register.php:449
-#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
+#: actions/register.php:424 actions/register.php:428
+#: actions/siteadminpanel.php:238 lib/settingsnav.php:92
 msgid "Email"
 msgstr "Email"
 
-#: actions/register.php:446 actions/register.php:450
+#: actions/register.php:425 actions/register.php:429
 #, fuzzy
-msgid "Used only for updates, announcements, and password recovery"
+msgid "Used only for updates, announcements, and password recovery."
 msgstr "Použije se pouze pro aktualizace, oznámení a obnovu hesla."
 
-#: actions/register.php:457
+#: actions/register.php:436
 #, fuzzy
-msgid "Longer name, preferably your \"real\" name"
+msgid "Longer name, preferably your \"real\" name."
 msgstr "Delší jméno, nejlépe vaše \"skutečné\" jméno"
 
-#: actions/register.php:462
+#: actions/register.php:464
 #, fuzzy
-msgid "URL of your homepage, blog, or profile on another site"
-msgstr "Adresa vašich stránek, blogu nebo profilu na jiných stránkách."
+msgid "Where you are, like \"City, State (or Region), Country\"."
+msgstr "Místo. Město, stát."
 
-#: actions/register.php:523
+#: actions/register.php:503
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
 msgstr "Chápu, že obsah a data %1$S jsou soukromé a důvěrné."
 
-#: actions/register.php:533
+#: actions/register.php:513
 #, php-format
 msgid "My text and files are copyright by %1$s."
 msgstr "Můj text a soubory jsou copyrightovány %1$s."
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:537
+#: actions/register.php:517
 msgid "My text and files remain under my own copyright."
 msgstr "Můj text a soubory zůstanou pod mým vlastním copyrightem."
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:540
+#: actions/register.php:520
 msgid "All rights reserved."
 msgstr "Všechna práva vyhrazena."
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:545
+#: actions/register.php:525
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -5075,7 +5180,7 @@ msgstr ""
 "Můj text a soubory jsou k dispozici pod %s výjimkou těchto soukromých dat: "
 "heslo, e-mailová adresa, IM adresa a telefonní číslo."
 
-#: actions/register.php:588
+#: actions/register.php:566
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -5108,7 +5213,7 @@ msgstr ""
 "\n"
 "Díky za registraci a doufáme, že se vám používání této služby bude líbít."
 
-#: actions/register.php:612
+#: actions/register.php:590
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5141,7 +5246,7 @@ msgstr "Přezdívka uživatele"
 
 #: actions/remotesubscribe.php:129
 #, fuzzy
-msgid "Nickname of the user you want to follow"
+msgid "Nickname of the user you want to follow."
 msgstr "Přezdívka uživatele, kterého chcete sledovat"
 
 #: actions/remotesubscribe.php:132
@@ -5150,18 +5255,18 @@ msgstr "Adresa Profilu"
 
 #: actions/remotesubscribe.php:133
 #, fuzzy
-msgid "URL of your profile on another compatible microblogging service"
+msgid "URL of your profile on another compatible microblogging service."
 msgstr "Adresa profilu na jiných kompatibilních mikroblozích."
 
 #. TRANS: Link text for link that will subscribe to a remote profile.
 #: actions/remotesubscribe.php:136 lib/subscribeform.php:139
-#: lib/userprofile.php:431
+#: lib/userprofile.php:402
 msgid "Subscribe"
 msgstr "Odebírat"
 
 #: actions/remotesubscribe.php:158
 #, fuzzy
-msgid "Invalid profile URL (bad format)"
+msgid "Invalid profile URL (bad format)."
 msgstr "Neplatná adresa profilu (špatný formát)"
 
 #: actions/remotesubscribe.php:167
@@ -5197,7 +5302,7 @@ msgstr "Nemůžete opakovat své vlastní oznámení."
 msgid "You already repeated that notice."
 msgstr "Již jste zopakoval toto oznámení."
 
-#: actions/repeat.php:112 lib/noticelist.php:692
+#: actions/repeat.php:112 lib/noticelist.php:697
 msgid "Repeated"
 msgstr "Opakované"
 
@@ -5205,9 +5310,9 @@ msgstr "Opakované"
 msgid "Repeated!"
 msgstr "Opakované!"
 
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing @-replies.
+#. TRANS: RSS reply feed title. %s is a user nickname.
 #: actions/replies.php:126 actions/repliesrss.php:68
-#: lib/personalgroupnav.php:109
+#: lib/personalgroupnav.php:105
 #, php-format
 msgid "Replies to %s"
 msgstr "Odpovědi na %s"
@@ -5259,9 +5364,11 @@ msgstr ""
 "Můžete se pokusit uživatele [%1$s postrčit](../%2$s)  nebo [jim něco poslat]"
 "(%%%%action.newnotice%%%%?status_textarea=%3$s)."
 
-#: actions/repliesrss.php:72
+#. TRANS: RSS reply feed description.
+#. TRANS: %1$s is a user nickname, %2$s is the StatusNet site name.
+#: actions/repliesrss.php:74
 #, fuzzy, php-format
-msgid "Replies to %1$s on %2$s!"
+msgid "Replies to %1$s on %2$s."
 msgstr "Odpovědi na %1$s na %2$s!"
 
 #. TRANS: Client exception displayed when trying to restore an account while not logged in.
@@ -5364,7 +5471,7 @@ msgstr "Nemůžete rušit uživatelské role na této stránce."
 msgid "User doesn't have this role."
 msgstr "Uživatel nemá tuto roli."
 
-#: actions/rsd.php:146 actions/version.php:159
+#: actions/rsd.php:142 actions/version.php:159
 msgid "StatusNet"
 msgstr "StatusNet"
 
@@ -5406,94 +5513,45 @@ msgstr "Zapnout výstup pro debugování sessions"
 msgid "Save site settings"
 msgstr "Uložit Nastavení webu"
 
-#: actions/showapplication.php:82
+#: actions/showapplication.php:78
 msgid "You must be logged in to view an application."
 msgstr "Musíte být přihlášeni pro zobrazení aplikace."
 
-#: actions/showapplication.php:157
+#: actions/showapplication.php:151
 msgid "Application profile"
 msgstr "Profil aplikace"
 
-#. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:159 lib/applicationeditform.php:177
-msgid "Icon"
-msgstr "Ikona"
-
-#. TRANS: Form input field label for application name.
-#: actions/showapplication.php:169 actions/version.php:197
-#: lib/applicationeditform.php:190
-msgid "Name"
-msgstr "Název"
-
-#. TRANS: Form input field label.
-#: actions/showapplication.php:178 lib/applicationeditform.php:227
-msgid "Organization"
-msgstr "Organizace"
-
-#. TRANS: Form input field label.
-#: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:168
-msgid "Description"
-msgstr "Popis"
-
-#. TRANS: Header for group statistics on a group page (h2).
-#. TRANS: H2 text for user statistics.
-#: actions/showapplication.php:192 actions/showgroup.php:460
-#: lib/profileaction.php:205
-msgid "Statistics"
-msgstr "Statistiky"
-
-#: actions/showapplication.php:203
+#: actions/showapplication.php:179
 #, php-format
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr ""
 "Vytvořil %1$s - s \"%2$s\" přístupem ve výchozím nastavení - %3$d uživatelů"
 
-#: actions/showapplication.php:213
+#: actions/showapplication.php:189
 msgid "Application actions"
 msgstr "Akce aplikace"
 
-#: actions/showapplication.php:236
+#: actions/showapplication.php:212
 msgid "Reset key & secret"
 msgstr "Resetovat klíč a tajemství"
 
 #. TRANS: Title of form for deleting a user.
-#: actions/showapplication.php:252 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:64 lib/noticelist.php:673
+#: actions/showapplication.php:228 lib/deletegroupform.php:121
+#: lib/deleteuserform.php:64 lib/noticelist.php:678
 msgid "Delete"
 msgstr "Odstranit"
 
-#: actions/showapplication.php:261
+#: actions/showapplication.php:237
 msgid "Application info"
 msgstr "Info o aplikaci"
 
-#: actions/showapplication.php:263
-msgid "Consumer key"
-msgstr "Spotřebitelský klíč"
-
-#: actions/showapplication.php:268
-msgid "Consumer secret"
-msgstr "Spotřebitelské tajemství"
-
-#: actions/showapplication.php:273
-msgid "Request token URL"
-msgstr "Adresa řetězce požadavku"
-
-#: actions/showapplication.php:278
-msgid "Access token URL"
-msgstr "URL Access tokenu"
-
-#: actions/showapplication.php:283
-msgid "Authorize URL"
-msgstr "Authorizační URL"
-
-#: actions/showapplication.php:288
+#: actions/showapplication.php:255
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
 msgstr "Poznámka: podpora HMAC-SHA1 podpisů. Nepodporujeme plaintext."
 
-#: actions/showapplication.php:309
+#: actions/showapplication.php:275
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr ""
 "Jste si jisti, že chcete resetovat svůj spotřebitelský klíč a tajemství?"
@@ -5580,61 +5638,47 @@ msgstr "skupina %s"
 msgid "%1$s group, page %2$d"
 msgstr "skupina %1$s, str. %2$d"
 
-#. TRANS: Group profile header (h2). Text hidden by default.
-#: actions/showgroup.php:223
-msgid "Group profile"
-msgstr "Profil skupiny"
-
-#. TRANS: Label for group URL (dt). Text hidden by default.
-#. TRANS: DT for URL in a profile.
-#: actions/showgroup.php:273 actions/tagother.php:118
-#: actions/userauthorization.php:175 lib/userprofile.php:186
-msgid "URL"
-msgstr "URL"
-
 #. TRANS: Label for group description or group note (dt). Text hidden by default.
-#. TRANS: DT for note in a profile.
-#: actions/showgroup.php:285 actions/tagother.php:128
-#: actions/userauthorization.php:187 lib/userprofile.php:204
+#: actions/showgroup.php:266
 msgid "Note"
 msgstr "Poznámka"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:296 lib/groupeditform.php:180
+#: actions/showgroup.php:277 lib/groupeditform.php:180
 msgid "Aliases"
 msgstr "Aliasy"
 
 #. TRANS: Group actions header (h2). Text hidden by default.
-#: actions/showgroup.php:313
+#: actions/showgroup.php:294
 msgid "Group actions"
 msgstr "Akce skupiny"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:357
+#: actions/showgroup.php:338
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
 msgstr "Feed sdělení skupiny %s (RSS 1.0"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:364
+#: actions/showgroup.php:345
 #, php-format
 msgid "Notice feed for %s group (RSS 2.0)"
 msgstr "Feed sdělení skupiny %s (RSS 2.0)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:371
+#: actions/showgroup.php:352
 #, php-format
 msgid "Notice feed for %s group (Atom)"
 msgstr "Feed sdělení skupiny %s (Atom)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:377
+#: actions/showgroup.php:358
 #, php-format
 msgid "FOAF for %s group"
 msgstr "FOAF pro skupinu %s"
 
 #. TRANS: Header for mini list of group members on a group page (h2).
-#: actions/showgroup.php:414
+#: actions/showgroup.php:395
 msgid "Members"
 msgstr "Členové"
 
@@ -5642,26 +5686,31 @@ msgstr "Členové"
 #. TRANS: Text for user subscription statistics if the user has no subscriptions.
 #. TRANS: Text for user subscriber statistics if user has no subscribers.
 #. TRANS: Text for user user group membership statistics if user is not a member of any group.
-#: actions/showgroup.php:420 lib/profileaction.php:137
+#: actions/showgroup.php:401 lib/profileaction.php:137
 #: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
-#: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
+#: lib/subscriptionlist.php:123 lib/tagcloudsection.php:71
 msgid "(None)"
 msgstr "(nic)"
 
 #. TRANS: Link to all group members from mini list of group members if group has more than n members.
-#: actions/showgroup.php:429
+#: actions/showgroup.php:410
 msgid "All members"
 msgstr "Všichni členové"
 
-#. TRANS: Label for creation date in statistics on group page.
-#: actions/showgroup.php:465
+#. TRANS: Header for group statistics on a group page (h2).
+#. TRANS: H2 text for user statistics.
+#: actions/showgroup.php:441 lib/profileaction.php:205
+msgid "Statistics"
+msgstr "Statistiky"
+
+#: actions/showgroup.php:444
 #, fuzzy
 msgctxt "LABEL"
 msgid "Created"
 msgstr "Vytvořeno"
 
 #. TRANS: Label for member count in statistics on group page.
-#: actions/showgroup.php:473
+#: actions/showgroup.php:449
 #, fuzzy
 msgctxt "LABEL"
 msgid "Members"
@@ -5671,7 +5720,7 @@ msgstr "Členové"
 #. TRANS: **%s** is the group alias, %%%%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).
-#: actions/showgroup.php:488
+#: actions/showgroup.php:464
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5689,7 +5738,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: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
-#: actions/showgroup.php:498
+#: actions/showgroup.php:474
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5703,7 +5752,7 @@ msgstr ""
 "životě a zájmech.  "
 
 #. TRANS: Header for list of group administrators on a group page (h2).
-#: actions/showgroup.php:527
+#: actions/showgroup.php:503
 msgid "Admins"
 msgstr "Adminové"
 
@@ -5742,7 +5791,7 @@ msgid "%1$s tagged %2$s"
 msgstr "%1$s, strana %2$d"
 
 #. TRANS: Page title showing tagged notices in one user's stream.
-#. TRANS: %1$s is the username, %2$s is the hash tag, %1$d is the page number.
+#. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
 #: actions/showstream.php:74
 #, fuzzy, php-format
 msgid "%1$s tagged %2$s, page %3$d"
@@ -5789,13 +5838,13 @@ msgid "FOAF for %s"
 msgstr "FOAF pro %s"
 
 #. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
-#: actions/showstream.php:211
+#: actions/showstream.php:205
 #, fuzzy, php-format
 msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr "Toto je časová osa pro %1$s, ale %2$s zatím ničím nepřispěli."
 
 #. TRANS: Second sentence of empty list message for a stream for the user themselves.
-#: actions/showstream.php:217
+#: actions/showstream.php:211
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
@@ -5805,7 +5854,7 @@ msgstr ""
 
 #. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:221
+#: actions/showstream.php:215
 #, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
@@ -5816,7 +5865,7 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:264
+#: actions/showstream.php:258
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5831,7 +5880,7 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:271
+#: actions/showstream.php:265
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5843,7 +5892,7 @@ msgstr ""
 "(http://status.net/). "
 
 #. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
-#: actions/showstream.php:328
+#: actions/showstream.php:322
 #, php-format
 msgid "Repeat of %s"
 msgstr "Opakování %s"
@@ -5989,75 +6038,75 @@ msgstr "Celo-webové sdělení (255 znaků max., s HTML)"
 #. TRANS: Title for button to save site notice in admin panel.
 #: actions/sitenoticeadminpanel.php:201
 #, fuzzy
-msgid "Save site notice"
+msgid "Save site notice."
 msgstr "Uložit oznámení stránky"
 
 #. TRANS: Title for SMS settings.
-#: actions/smssettings.php:57
+#: actions/smssettings.php:56
 msgid "SMS settings"
 msgstr "nastavení SMS"
 
 #. TRANS: SMS settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/smssettings.php:71
+#: actions/smssettings.php:70
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr "Z %%site.name%% můžete přijímat SMS e-mailem."
 
 #. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
-#: actions/smssettings.php:93
+#: actions/smssettings.php:92
 msgid "SMS is not available."
 msgstr "SMS není k dispozici."
 
 #. TRANS: Form legend for SMS settings form.
-#: actions/smssettings.php:107
+#: actions/smssettings.php:106
 msgid "SMS address"
 msgstr "SMS adresa"
 
 #. TRANS: Form guide in SMS settings form.
-#: actions/smssettings.php:116
+#: actions/smssettings.php:115
 msgid "Current confirmed SMS-enabled phone number."
 msgstr "Aktuální potvrzené SMS-schopné telefonní číslo."
 
 #. TRANS: Form guide in IM settings form.
-#: actions/smssettings.php:129
+#: actions/smssettings.php:128
 msgid "Awaiting confirmation on this phone number."
 msgstr "Čeká na potvrzení na tomto telefonním čísle."
 
 #. TRANS: Field label for SMS address input in SMS settings form.
-#: actions/smssettings.php:138
+#: actions/smssettings.php:137
 msgid "Confirmation code"
 msgstr "Potvrzovací kód"
 
 #. TRANS: Form field instructions in SMS settings form.
-#: actions/smssettings.php:140
+#: actions/smssettings.php:139
 msgid "Enter the code you received on your phone."
 msgstr "Zadejte kód, který jste obdrželi na telefonu."
 
 #. TRANS: Button label to confirm SMS confirmation code in SMS settings.
-#: actions/smssettings.php:144
+#: actions/smssettings.php:143
 msgctxt "BUTTON"
 msgid "Confirm"
 msgstr "Potvrdit"
 
 #. TRANS: Field label for SMS phone number input in SMS settings form.
-#: actions/smssettings.php:149
+#: actions/smssettings.php:148
 msgid "SMS phone number"
 msgstr "SMS telefonní číslo"
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
-#: actions/smssettings.php:152
+#: actions/smssettings.php:151
 #, fuzzy
-msgid "Phone number, no punctuation or spaces, with area code"
+msgid "Phone number, no punctuation or spaces, with area code."
 msgstr "Telefonní číslo, Nepoužívej interpunkci nebo mezery, s předčíslím"
 
 #. TRANS: Form legend for SMS preferences form.
-#: actions/smssettings.php:191
+#: actions/smssettings.php:190
 msgid "SMS preferences"
 msgstr "Nastavení SMS"
 
 #. TRANS: Checkbox label in SMS preferences form.
-#: actions/smssettings.php:197
+#: actions/smssettings.php:196
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
@@ -6066,32 +6115,32 @@ msgstr ""
 "provider může naůčtovat nesmyslně vysoké částky."
 
 #. TRANS: Confirmation message for successful SMS preferences save.
-#: actions/smssettings.php:308
+#: actions/smssettings.php:307
 msgid "SMS preferences saved."
 msgstr "Nastavení SMS uloženo."
 
 #. TRANS: Message given saving SMS phone number without having provided one.
-#: actions/smssettings.php:330
+#: actions/smssettings.php:329
 msgid "No phone number."
 msgstr "Žádné telefonní číslo."
 
 #. TRANS: Message given saving SMS phone number without having selected a carrier.
-#: actions/smssettings.php:336
+#: actions/smssettings.php:335
 msgid "No carrier selected."
 msgstr "Nevybrán poskytovatel."
 
 #. TRANS: Message given saving SMS phone number that is already set.
-#: actions/smssettings.php:344
+#: actions/smssettings.php:343
 msgid "That is already your phone number."
 msgstr "Toto je již vaše telefonní číslo."
 
 #. TRANS: Message given saving SMS phone number that is already set for another user.
-#: actions/smssettings.php:348
+#: actions/smssettings.php:347
 msgid "That phone number already belongs to another user."
 msgstr "Toto telefonní číslo již patří jinému uživateli"
 
 #. TRANS: Message given saving valid SMS phone number that is to be confirmed.
-#: actions/smssettings.php:376
+#: actions/smssettings.php:375
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
 "for the code and instructions on how to use it."
@@ -6100,39 +6149,39 @@ msgstr ""
 "použít."
 
 #. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
-#: actions/smssettings.php:404
+#: actions/smssettings.php:403
 msgid "That is the wrong confirmation number."
 msgstr "Toto je špatné ověřovací číslo."
 
 #. TRANS: Message given after successfully canceling SMS phone number confirmation.
-#: actions/smssettings.php:418
+#: actions/smssettings.php:417
 msgid "SMS confirmation cancelled."
 msgstr "SMS potvrzení zrušeno."
 
 #. TRANS: Message given trying to remove an SMS phone number that is not
 #. TRANS: registered for the active user.
-#: actions/smssettings.php:438
+#: actions/smssettings.php:437
 msgid "That is not your phone number."
 msgstr "To není vaše telefonní číslo."
 
 #. TRANS: Message given after successfully removing a registered SMS phone number.
-#: actions/smssettings.php:460
+#: actions/smssettings.php:459
 msgid "The SMS phone number was removed."
 msgstr "SMS Telefonní číslo bylo odstraněno."
 
 #. TRANS: Label for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:499
+#: actions/smssettings.php:498
 msgid "Mobile carrier"
 msgstr "Mobilní operátor"
 
 #. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:504
+#: actions/smssettings.php:503
 msgid "Select a carrier"
 msgstr "Vyberte operátora"
 
 #. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
 #. TRANS: %s is an administrative contact's e-mail address.
-#: actions/smssettings.php:513
+#: actions/smssettings.php:512
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -6142,7 +6191,7 @@ msgstr ""
 "přes e-mail, ale zde není uveden, pošlete e-mail a dejte nám vědět na% s."
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
-#: actions/smssettings.php:535
+#: actions/smssettings.php:534
 #, fuzzy
 msgid "No code entered."
 msgstr "Nezadán kód"
@@ -6216,16 +6265,14 @@ msgstr "Nejste přihlášen k tomuto profilu."
 msgid "Could not save subscription."
 msgstr "Nelze uložit odebírání"
 
-#: actions/subscribe.php:77
-msgid "This action only accepts POST requests."
-msgstr "Tato akce přijímá pouze POST požadavky."
-
-#: actions/subscribe.php:117
+#. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
+#: actions/subscribe.php:121
 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
 msgstr ""
 "Touto akcí se nemůžete se přihlásit k odběru vzdáleného OMB 0.1 profilu."
 
-#: actions/subscribe.php:145
+#. TRANS: Page title when subscription succeeded.
+#: actions/subscribe.php:149
 msgid "Subscribed"
 msgstr "Prihlášen"
 
@@ -6342,31 +6389,34 @@ msgid "Subscription feed for %s (Atom)"
 msgstr "Feed oznámení pro %1$s (Atom)"
 
 #. TRANS: Checkbox label for enabling Jabber messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:239
-msgid "Jabber"
-msgstr "Jabber"
+#: actions/subscriptions.php:241 lib/settingsnav.php:110
+#, fuzzy
+msgid "IM"
+msgstr "IM"
 
 #. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:254
+#: actions/subscriptions.php:256 lib/settingsnav.php:117
 msgid "SMS"
 msgstr "SMS"
 
-#: actions/tag.php:69
+#. TRANS: Title for all but the first page of notices with tags.
+#. TRANS: %1$s is the tag, %2$d is the page number.
+#: actions/tag.php:73
 #, php-format
 msgid "Notices tagged with %1$s, page %2$d"
 msgstr "Oznámení označená %1$s, strana %2$d"
 
-#: actions/tag.php:87
+#: actions/tag.php:91
 #, php-format
 msgid "Notice feed for tag %s (RSS 1.0)"
 msgstr "Feed oznámení označených %s (RSS 1.0)"
 
-#: actions/tag.php:93
+#: actions/tag.php:97
 #, php-format
 msgid "Notice feed for tag %s (RSS 2.0)"
 msgstr "Feed oznámení označených %s (RSS 2.0)"
 
-#: actions/tag.php:99
+#: actions/tag.php:103
 #, php-format
 msgid "Notice feed for tag %s (Atom)"
 msgstr "Feed oznámení označených %s (Atom)"
@@ -6385,17 +6435,11 @@ msgstr "Otagujte %s"
 msgid "User profile"
 msgstr "Uživatelský profil"
 
-#. TRANS: DT element in area for user avatar.
-#: actions/tagother.php:81 actions/userauthorization.php:132
-#: lib/userprofile.php:108
-msgid "Photo"
-msgstr "Fotka"
-
-#: actions/tagother.php:141
+#: actions/tagother.php:120
 msgid "Tag user"
 msgstr "Otagujte uživatele"
 
-#: actions/tagother.php:151
+#: actions/tagother.php:130
 msgid ""
 "Tags for this user (letters, numbers, -, ., and _), comma- or space- "
 "separated"
@@ -6403,14 +6447,19 @@ msgstr ""
 "Tagy pro tohoto uživatele (písmena, číslice, -,., a _), oddělené čárkou nebo "
 "mezerou"
 
-#: actions/tagother.php:193
+#: actions/tagother.php:157
+#, php-format
+msgid "Invalid tag: \"%s\""
+msgstr "Neplatná velikost"
+
+#: actions/tagother.php:172
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 "Můžete označovat pouze lidi, ke kterým jste přihlášen nebo kteří jsou "
 "přihlášeni k vám."
 
-#: actions/tagother.php:236
+#: actions/tagother.php:215
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
 "Použijte tento formulář k přidání nálepek na vaše posluchače nebo ty které "
@@ -6420,6 +6469,7 @@ msgstr ""
 msgid "No such tag."
 msgstr "Žádná taková nálepka."
 
+#. TRANS: Client error displayed when trying to unblock a non-blocked user.
 #: actions/unblock.php:59
 msgid "You haven't blocked that user."
 msgstr "Nemáte zablokováno tohoto uživatele."
@@ -6440,13 +6490,85 @@ msgstr "CHybí ID profilu v žádosti."
 msgid "Unsubscribed"
 msgstr "Odhlášeno"
 
-#: actions/updateprofile.php:64 actions/userauthorization.php:337
+#: actions/updateprofile.php:64
 #, php-format
 msgid ""
 "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
 msgstr ""
 "Licence naslouchaného '%1$s' není kompatibilní s licencí stránky '%2$s'."
 
+#: actions/urlsettings.php:60
+#, fuzzy
+msgid "URL settings"
+msgstr "Nastavení IM"
+
+#. TRANS: Instructions for tab "Other" in user profile settings.
+#: actions/urlsettings.php:72
+msgid "Manage various other options."
+msgstr "Správa různých dalších možností."
+
+#. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
+#. TRANS: user's profile settings. This message has one space at the beginning. Use your
+#. TRANS: language's word separator here if it has one (most likely a single space).
+#: actions/urlsettings.php:115
+msgid " (free service)"
+msgstr " (Služba zdarma)"
+
+#: actions/urlsettings.php:121
+#, fuzzy
+msgid "[none]"
+msgstr "Nic"
+
+#: actions/urlsettings.php:122
+msgid "[internal]"
+msgstr ""
+
+#. TRANS: Label for dropdown with URL shortener services.
+#: actions/urlsettings.php:130
+msgid "Shorten URLs with"
+msgstr "Zkrácovat URL s"
+
+#. TRANS: Tooltip for for dropdown with URL shortener services.
+#: actions/urlsettings.php:132
+msgid "Automatic shortening service to use."
+msgstr "Služba automatického zkracování, kterou použít."
+
+#: actions/urlsettings.php:138
+msgid "URL longer than"
+msgstr ""
+
+#: actions/urlsettings.php:141
+msgid "URLs longer than this will be shortened, 0 means always shorten."
+msgstr ""
+
+#: actions/urlsettings.php:145
+msgid "Text longer than"
+msgstr ""
+
+#: actions/urlsettings.php:148
+msgid ""
+"URLs in notices longer than this will be shortened, 0 means always shorten."
+msgstr ""
+
+#. TRANS: Form validation error for form "Other settings" in user profile.
+#: actions/urlsettings.php:180
+#, fuzzy
+msgid "URL shortening service is too long (maximum 50 characters)."
+msgstr "adresa služby zkracování URL je příliš dlouhá (max. 50 znaků)."
+
+#: actions/urlsettings.php:187
+msgid "Invalid number for max url length."
+msgstr ""
+
+#: actions/urlsettings.php:193
+#, fuzzy
+msgid "Invalid number for max notice length."
+msgstr "Neplatná velikost"
+
+#: actions/urlsettings.php:238
+msgid "Error saving user URL shortening preferences."
+msgstr ""
+
 #. TRANS: User admin panel title
 #: actions/useradminpanel.php:58
 msgctxt "TITLE"
@@ -6473,11 +6595,11 @@ msgstr "Neplatné uvítací text. Max délka je 255 znaků."
 #. TRANS: users in user admin panel. %1$s is the invalid nickname.
 #: actions/useradminpanel.php:166
 #, fuzzy, php-format
-msgid "Invalid default subscripton: '%1$s' is not a user."
+msgid "Invalid default subscripton: \"%1$s\" is not a user."
 msgstr "Neplatné výchozí přihlášení: '%1$s' není uživatel."
 
-#. TRANS: Link description in user account settings menu.
-#: actions/useradminpanel.php:215 lib/accountsettingsaction.php:106
+#: actions/useradminpanel.php:215 lib/action.php:565 lib/settingsnav.php:77
+#: lib/subgroupnav.php:81
 msgid "Profile"
 msgstr "Profil"
 
@@ -6535,59 +6657,63 @@ msgstr "Zda chcete uživatelům umožnit pozvat nové uživatele."
 #. TRANS: Title for button to save user settings in user admin panel.
 #: actions/useradminpanel.php:302
 #, fuzzy
-msgid "Save user settings"
+msgid "Save user settings."
 msgstr "Uložit Nastavení webu"
 
-#: actions/userauthorization.php:105
+#. TRANS: Page title.
+#: actions/userauthorization.php:109
 msgid "Authorize subscription"
 msgstr "Autorizujte přihlášení"
 
-#: actions/userauthorization.php:110
+#. TRANS: Page notice on "Auhtorize subscription" page.
+#: actions/userauthorization.php:115
 #, fuzzy
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
 "user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
-"click “Reject”."
+"click \"Reject\"."
 msgstr ""
 "Prosím zkontrolujte tyto detailu, a ujistěte se že opravdu chcete odebírat "
 "sdělení tohoto uživatele. Pokud jste právě nepožádali o přihlášení k tomuto "
 "uživteli, klikněte na \"Zrušit\""
 
-#. TRANS: Menu item for site administration
-#: actions/userauthorization.php:196 actions/version.php:167
-#: lib/adminpanelaction.php:403
-msgid "License"
-msgstr "Licence"
-
-#: actions/userauthorization.php:217
+#. TRANS: Button text on Authorise Subscription page.
+#: actions/userauthorization.php:200
 #, fuzzy
+msgctxt "BUTTON"
 msgid "Accept"
 msgstr "Přijmout"
 
-#: actions/userauthorization.php:218 lib/subscribeform.php:115
-#: lib/subscribeform.php:139
-msgid "Subscribe to this user"
+#. TRANS: Title for button on Authorise Subscription page.
+#: actions/userauthorization.php:202
+#, fuzzy
+msgid "Subscribe to this user."
 msgstr "Přihlásit se k tomuto uživateli"
 
-#: actions/userauthorization.php:219
+#. TRANS: Button text on Authorise Subscription page.
+#: actions/userauthorization.php:204
 #, fuzzy
+msgctxt "BUTTON"
 msgid "Reject"
 msgstr "Odmítnout"
 
-#: actions/userauthorization.php:220
+#. TRANS: Title for button on Authorise Subscription page.
+#: actions/userauthorization.php:206
 #, fuzzy
-msgid "Reject this subscription"
+msgid "Reject this subscription."
 msgstr "Odmítnout toto přihlášení"
 
-#: actions/userauthorization.php:232
+#. TRANS: Client error displayed for an empty authorisation request.
+#: actions/userauthorization.php:219
 msgid "No authorization request!"
 msgstr "Žádná žádost o autorizaci!"
 
-#: actions/userauthorization.php:254
+#. TRANS: Accept message header from Authorise subscription page.
+#: actions/userauthorization.php:242
 msgid "Subscription authorized"
 msgstr "Odběr autorizován"
 
-#: actions/userauthorization.php:256
+#: actions/userauthorization.php:245
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to authorize the "
@@ -6597,11 +6723,12 @@ msgstr ""
 "nápovědě jak správně postupovat při autorizování odběru. Váš řetězec odběru "
 "je:"
 
-#: actions/userauthorization.php:266
+#. TRANS: Reject message header from Authorise subscription page.
+#: actions/userauthorization.php:256
 msgid "Subscription rejected"
 msgstr "Odběr odmítnut"
 
-#: actions/userauthorization.php:268
+#: actions/userauthorization.php:259
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to fully reject the "
@@ -6610,48 +6737,72 @@ msgstr ""
 "Odebírání bylo zamítnuto, ale nepřišla žádná callback adresa. Zkontrolujte v "
 "nápovědě jak správně postupovat pro plné zamítnutí odběru."
 
-#: actions/userauthorization.php:303
+#. TRANS: Exception thrown when no valid user is found for an authorisation request.
+#. TRANS: %s is a listener URI.
+#: actions/userauthorization.php:296
 #, fuzzy, php-format
-msgid "Listener URI ‘%s’ not found here."
+msgid "Listener URI \"%s\" not found here."
 msgstr "Naslouchací URI ‘%s’ zde nebyl nalezen."
 
-#: actions/userauthorization.php:308
+#. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
+#. TRANS: %s is a listenee URI.
+#: actions/userauthorization.php:303
 #, fuzzy, php-format
-msgid "Listenee URI ‘%s’ is too long."
+msgid "Listenee URI \"%s\" is too long."
 msgstr "Naslouchací URI ‘%s’ je příliš dlouhý."
 
-#: actions/userauthorization.php:314
+#. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
+#. TRANS: %s is a listenee URI.
+#: actions/userauthorization.php:311
 #, fuzzy, php-format
-msgid "Listenee URI ‘%s’ is a local user."
+msgid "Listenee URI \"%s\" is a local user."
 msgstr "Naslouchací URI ‘%s’ je místní uživatel."
 
+#. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
+#. TRANS: %s is a profile URL.
 #: actions/userauthorization.php:329
 #, fuzzy, php-format
-msgid "Profile URL ‘%s’ is for a local user."
+msgid "Profile URL \"%s\" is for a local user."
 msgstr "URL profilu '%s' je pro místního uživatele."
 
-#: actions/userauthorization.php:345
+#. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
+#. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
+#: actions/userauthorization.php:339
 #, fuzzy, php-format
-msgid "Avatar URL ‘%s’ is not valid."
+msgid ""
+"Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
+"\"."
+msgstr ""
+"Licence naslouchaného '%1$s' není kompatibilní s licencí stránky '%2$s'."
+
+#. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
+#. TRANS: %s is an avatar URL.
+#: actions/userauthorization.php:349
+#, fuzzy, php-format
+msgid "Avatar URL \"%s\" is not valid."
 msgstr "URL avataru ‘%s’ není platný."
 
-#: actions/userauthorization.php:350
+#. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
+#. TRANS: %s is an avatar URL.
+#: actions/userauthorization.php:356
 #, fuzzy, php-format
-msgid "Can’t read avatar URL ‘%s’."
+msgid "Cannot read avatar URL \"%s\"."
 msgstr "Nelze načíst avatara z URL '%s'"
 
-#: actions/userauthorization.php:355
+#. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
+#. TRANS: %s is an avatar URL.
+#: actions/userauthorization.php:363
 #, fuzzy, php-format
-msgid "Wrong image type for avatar URL ‘%s’."
+msgid "Wrong image type for avatar URL \"%s\"."
 msgstr "Špatný typ obrázku na URL '%s'"
 
 #. TRANS: Page title for profile design page.
-#: actions/userdesignsettings.php:74 lib/designsettings.php:63
+#: actions/userdesignsettings.php:74 lib/designsettings.php:61
 msgid "Profile design"
 msgstr "Vzhled profilu"
 
 #. TRANS: Instructions for profile design page.
-#: actions/userdesignsettings.php:84 lib/designsettings.php:74
+#: actions/userdesignsettings.php:84 lib/designsettings.php:72
 msgid ""
 "Customize the way your profile looks with a background image and a colour "
 "palette of your choice."
@@ -6659,10 +6810,28 @@ msgstr ""
 "Přizpůsobit vzhled vašeho profilu obrázkem na pozadí a barevnou paletou "
 "vašeho výběru."
 
-#: actions/userdesignsettings.php:272
+#: actions/userdesignsettings.php:289
 msgid "Enjoy your hotdog!"
 msgstr "Užijte si svůj párek v rohlíku!"
 
+#: actions/userdesignsettings.php:325
+#, fuzzy
+msgid "Design settings"
+msgstr "Uložit Nastavení webu"
+
+#: actions/userdesignsettings.php:340
+msgid "View profile designs"
+msgstr "Zobrazit vzhledy profilu"
+
+#: actions/userdesignsettings.php:341
+msgid "Show or hide profile designs."
+msgstr "Zobrazit nebo skrýt vzhledy profilu."
+
+#: actions/userdesignsettings.php:348
+#, fuzzy
+msgid "Background file"
+msgstr "Pozadí"
+
 #. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number.
 #: actions/usergroups.php:66
 #, php-format
@@ -6713,6 +6882,11 @@ msgstr ""
 msgid "Contributors"
 msgstr "Přispěvatelé"
 
+#. TRANS: Menu item for site administration
+#: actions/version.php:167 lib/adminpanelaction.php:403
+msgid "License"
+msgstr "Licence"
+
 #: actions/version.php:170
 msgid ""
 "StatusNet is free software: you can redistribute it and/or modify it under "
@@ -6746,12 +6920,13 @@ msgstr ""
 "Měli byste obdržet kopii GNU Affero General Public License spolu s tímto "
 "programem. Pokud ne, jděte na %s."
 
-#: actions/version.php:191
-msgid "Plugins"
-msgstr "Pluginy"
+#. TRANS: Form input field label for application name.
+#: actions/version.php:197 lib/applicationeditform.php:190
+msgid "Name"
+msgstr "Název"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:901
+#: actions/version.php:198 lib/action.php:885
 msgid "Version"
 msgstr "Verze"
 
@@ -6759,6 +6934,12 @@ msgstr "Verze"
 msgid "Author(s)"
 msgstr "Autoři"
 
+#. TRANS: Form input field label.
+#: actions/version.php:200 lib/applicationeditform.php:208
+#: lib/groupeditform.php:168
+msgid "Description"
+msgstr "Popis"
+
 #. TRANS: Activity title when marking a notice as favorite.
 #: classes/Fave.php:164
 msgid "Favor"
@@ -6882,7 +7063,7 @@ msgid "Could not create login token for %s"
 msgstr "Nelze vytvořit přihlašovací token pro %s"
 
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
-#: classes/Memcached_DataObject.php:542
+#: classes/Memcached_DataObject.php:556
 msgid "No database name or DSN found anywhere."
 msgstr "Nenalezeno jméno databáze ani DSN."
 
@@ -7057,18 +7238,18 @@ msgstr "%1$s od teď naslouchá tvým sdělením na %2$s."
 
 #. TRANS: Notice given on user registration.
 #. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:395
+#: classes/User.php:390
 #, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr "Vítejte na %1$s, @%2$s!"
 
 #. TRANS: Server exception.
-#: classes/User.php:918
+#: classes/User.php:923
 msgid "No single user defined for single-user mode."
 msgstr "Nenastaven uživatel pro jednouživatelský mód"
 
 #. TRANS: Server exception.
-#: classes/User.php:922
+#: classes/User.php:927
 msgid "Single-user mode code called when not enabled."
 msgstr ""
 
@@ -7113,41 +7294,6 @@ msgstr ""
 msgid "No AtomPub API service for %s."
 msgstr ""
 
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:104
-msgid "Change your profile settings"
-msgstr "Změňte nastavení profilu"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:111
-msgid "Upload an avatar"
-msgstr "Nahrát avatar"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:118
-msgid "Change your password"
-msgstr "Změňte své heslo"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:125
-msgid "Change email handling"
-msgstr "Změnit manipulaci emailu"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:132
-msgid "Design your profile"
-msgstr "Změňte vzhled svého profilu"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:139
-msgid "Other options"
-msgstr "Další možnosti"
-
-#. TRANS: Link description in user account settings menu.
-#: lib/accountsettingsaction.php:141
-msgid "Other"
-msgstr "Jiné"
-
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
 #: lib/action.php:161
 #, php-format
@@ -7165,206 +7311,128 @@ msgctxt "TOOLTIP"
 msgid "Show more"
 msgstr ""
 
-#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:544
-msgid "Primary site navigation"
-msgstr "Primární navigace na webu"
+#. TRANS: Inline reply form submit button: submits a reply comment.
+#: lib/action.php:328
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Comment"
+msgstr "Obsah"
 
-#. TRANS: Tooltip for main menu option "Personal".
-#: lib/action.php:550
-msgctxt "TOOLTIP"
-msgid "Personal profile and friends timeline"
-msgstr "Osobní profil a časová osa přátel"
+#. TRANS: Placeholder text for inline reply form. Clicking in this box will turn it into a mini notice form.
+#: lib/action.php:331
+msgid "Add a comment..."
+msgstr ""
 
-#. TRANS: Main menu option when logged in for access to personal profile and friends timeline.
-#. TRANS: Personal group navigation menu option when logged in for viewing timeline of self and friends.
-#: lib/action.php:553 lib/personalgroupnav.php:100
-msgctxt "MENU"
-msgid "Personal"
-msgstr "Osobní"
+#: lib/action.php:559 lib/personalgroupnav.php:99
+#, fuzzy
+msgid "Home"
+msgstr "Moje stránky"
 
-#. TRANS: Tooltip for main menu option "Account".
-#: lib/action.php:555
-msgctxt "TOOLTIP"
-msgid "Change your email, avatar, password, profile"
-msgstr "Změňte svůj e-mail, avatar, heslo, profil"
-
-#. TRANS: Main menu option when logged in for access to user settings.
-#: lib/action.php:558
-msgid "Account"
-msgstr "Účet"
-
-#. TRANS: Tooltip for main menu option "Services".
 #: lib/action.php:560
-msgctxt "TOOLTIP"
-msgid "Connect to services"
-msgstr "Připojení ke službám"
+#, fuzzy
+msgid "Friends timeline"
+msgstr "časová osa %s"
 
-#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services.
-#: lib/action.php:563
-msgid "Connect"
-msgstr "Připojit"
-
-#. TRANS: Tooltip for menu option "Admin".
 #: lib/action.php:566
-msgctxt "TOOLTIP"
-msgid "Change site configuration"
-msgstr "Změna konfigurace webu"
+#, fuzzy
+msgid "Your profile"
+msgstr "Profil skupiny"
 
-#. TRANS: Main menu option when logged in and site admin for access to site configuration.
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/action.php:569 lib/groupnav.php:117
-msgctxt "MENU"
-msgid "Admin"
-msgstr "Admin"
+#: lib/action.php:570 lib/action.php:593 lib/publicgroupnav.php:78
+msgid "Public"
+msgstr "Veřejné"
 
-#. TRANS: Tooltip for main menu option "Invite".
-#: lib/action.php:573
-#, php-format
-msgctxt "TOOLTIP"
-msgid "Invite friends and colleagues to join you on %s"
-msgstr "Pozvěte přátele a kolegy, aby se k vám připojili na %s"
+#: lib/action.php:571 lib/action.php:594
+#, fuzzy
+msgid "Everyone on this site"
+msgstr "Najít lidi na této stránce"
+
+#: lib/action.php:575
+#, fuzzy
+msgid "Settings"
+msgstr "nastavení SMS"
 
-#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users.
 #: lib/action.php:576
-msgctxt "MENU"
-msgid "Invite"
-msgstr "Pozvat"
+#, fuzzy
+msgid "Change your personal settings"
+msgstr "Změňte nastavení profilu"
 
-#. TRANS: Tooltip for main menu option "Logout"
 #: lib/action.php:582
-msgctxt "TOOLTIP"
-msgid "Logout from the site"
-msgstr "Odhlášení z webu"
+#, fuzzy
+msgid "Site configuration"
+msgstr "Akce uživatele"
 
-#. TRANS: Main menu option when logged in to log out the current user.
-#: lib/action.php:585
-msgctxt "MENU"
+#: lib/action.php:587
+#, fuzzy
 msgid "Logout"
 msgstr "Odhlásit se"
 
-#. TRANS: Tooltip for main menu option "Register".
-#: lib/action.php:590
-msgctxt "TOOLTIP"
-msgid "Create an account"
-msgstr "Zaregistrujte se"
+#: lib/action.php:588
+#, fuzzy
+msgid "Logout from the site"
+msgstr "Odhlášení z webu"
 
-#. TRANS: Main menu option when not logged in to register a new account.
-#. TRANS: Menu item for registering with the StatusNet site.
-#: lib/action.php:593 lib/logingroupnav.php:85
-msgctxt "MENU"
-msgid "Register"
-msgstr "Registrovat"
-
-#. TRANS: Tooltip for main menu option "Login".
-#: lib/action.php:596
-msgctxt "TOOLTIP"
+#: lib/action.php:599
+#, fuzzy
 msgid "Login to the site"
 msgstr "Přihlásit se na stránky"
 
-#. TRANS: Main menu option when not logged in to log in.
-#. TRANS: Menu item for logging in to the StatusNet site.
-#: lib/action.php:599 lib/logingroupnav.php:77
-msgctxt "MENU"
-msgid "Login"
-msgstr "Přihlásit"
-
-#. TRANS: Tooltip for main menu option "Help".
-#: lib/action.php:602
-msgctxt "TOOLTIP"
-msgid "Help me!"
-msgstr "Nápověda"
-
-#. TRANS: Main menu option for help on the StatusNet site.
-#: lib/action.php:605
-msgctxt "MENU"
-msgid "Help"
-msgstr "Nápověda"
-
-#. TRANS: Tooltip for main menu option "Search".
-#: lib/action.php:608
-msgctxt "TOOLTIP"
-msgid "Search for people or text"
-msgstr "Vyhledávání osob nebo textu"
-
-#. TRANS: Main menu option when logged in or when the StatusNet instance is not private.
-#: lib/action.php:611
-msgctxt "MENU"
+#: lib/action.php:606
+#, fuzzy
 msgid "Search"
 msgstr "Hledat"
 
-#. TRANS: DT element for site notice. String is hidden in default CSS.
-#. TRANS: Menu item for site administration
-#: lib/action.php:633 lib/adminpanelaction.php:387
-msgid "Site notice"
-msgstr "Sdělení"
-
-#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:700
-msgid "Local views"
-msgstr "Místní zobrazení"
-
-#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:770
-msgid "Page notice"
-msgstr "Sdělení stránky"
-
-#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:874
-msgid "Secondary site navigation"
-msgstr "Sekundární navigace na webu"
+#: lib/action.php:607
+#, fuzzy
+msgid "Search the site"
+msgstr "Prohledat stránky"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:880
+#: lib/action.php:864
 msgid "Help"
 msgstr "Nápověda"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:883
+#: lib/action.php:867
 msgid "About"
 msgstr "O nás"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:886
+#: lib/action.php:870
 msgid "FAQ"
 msgstr "FAQ"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:891
+#: lib/action.php:875
 msgid "TOS"
 msgstr "TOS (pravidla použití služby)"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:895
+#: lib/action.php:879
 msgid "Privacy"
 msgstr "Soukromí"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:898
+#: lib/action.php:882
 msgid "Source"
 msgstr "Zdroj"
 
 #. TRANS: Secondary navigation menu option leading to e-mail contact information on the
 #. TRANS: StatusNet site, where to report bugs, ...
-#: lib/action.php:905
+#: lib/action.php:889
 msgid "Contact"
 msgstr "Kontakt"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:908
+#: lib/action.php:892
 msgid "Badge"
 msgstr "Odznak"
 
-#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:937
-msgid "StatusNet software license"
-msgstr "Licence softwaru StatusNet"
-
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:944
+#: lib/action.php:921
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7374,7 +7442,7 @@ msgstr ""
 "broughtby%%](%%site.broughtbyurl%%)."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:947
+#: lib/action.php:924
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** je služba mikroblogů."
@@ -7383,7 +7451,7 @@ msgstr "**%%site.name%%** je služba mikroblogů."
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:954
+#: lib/action.php:931
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7394,51 +7462,41 @@ msgstr ""
 "dostupném pod [GNU Affero General Public License](http://www.fsf.org/"
 "licensing/licenses/agpl-3.0.html)."
 
-#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:970
-msgid "Site content license"
-msgstr "Licence k obsahu stránek"
-
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:977
+#: lib/action.php:949
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr "Obsah a data z %1$S jsou soukromé a důvěrné."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:984
+#: lib/action.php:956
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr "Obsah a data copyright %1$s. Všechna práva vyhrazena."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:988
+#: lib/action.php:960
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr "Obsah a data copyright přispěvatelů. Všechna práva vyhrazena."
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:1020
+#: lib/action.php:992
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr "Všechen obsah a data %1$s jsou k dispozici v rámci licence %2$s."
 
-#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1356
-msgid "Pagination"
-msgstr "Stránkování"
-
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1367
+#: lib/action.php:1335
 msgid "After"
 msgstr "Po"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1377
+#: lib/action.php:1345
 msgid "Before"
 msgstr "Před"
 
@@ -7592,7 +7650,7 @@ msgid "User configuration"
 msgstr "Akce uživatele"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:122
+#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:110
 msgid "User"
 msgstr "Uživatel"
 
@@ -7616,6 +7674,11 @@ msgstr "Nastavení sessions"
 msgid "Edit site notice"
 msgstr "Upravit oznámení stránky"
 
+#. TRANS: Menu item for site administration
+#: lib/adminpanelaction.php:387
+msgid "Site notice"
+msgstr "Sdělení"
+
 #. TRANS: Menu item title/tooltip
 #: lib/adminpanelaction.php:393
 msgid "Snapshots configuration"
@@ -7626,6 +7689,12 @@ msgstr "Konfigurace snímků"
 msgid "Set site license"
 msgstr ""
 
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:409
+#, fuzzy
+msgid "Plugins configuration"
+msgstr "Naastavení cest"
+
 #. TRANS: Client error 401.
 #: lib/apiauth.php:111
 msgid "API resource requires read-write access, but you only have read access."
@@ -7638,19 +7707,23 @@ msgstr ""
 msgid "No application for that consumer key."
 msgstr ""
 
+#: lib/apiauth.php:202 lib/apiauth.php:284
+msgid "Not allowed to use API."
+msgstr ""
+
 #. TRANS: OAuth exception given when an incorrect access token was given for a user.
-#: lib/apiauth.php:219
+#: lib/apiauth.php:225
 msgid "Bad access token."
 msgstr ""
 
 #. TRANS: OAuth exception given when no user was found for a given token (no token was found).
-#: lib/apiauth.php:224
+#: lib/apiauth.php:230
 msgid "No user for that token."
 msgstr ""
 
 #. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel".
 #. TRANS: Client error thrown when authentication fails.
-#: lib/apiauth.php:266 lib/apiauth.php:293
+#: lib/apiauth.php:272 lib/apiauth.php:302
 msgid "Could not authenticate you."
 msgstr ""
 
@@ -7697,6 +7770,11 @@ msgstr ""
 msgid "Failed to delete revoked token."
 msgstr ""
 
+#. TRANS: Form input field label for application icon.
+#: lib/applicationeditform.php:177
+msgid "Icon"
+msgstr "Ikona"
+
 #. TRANS: Form guide.
 #: lib/applicationeditform.php:182
 msgid "Icon for this application"
@@ -7732,6 +7810,11 @@ msgstr "Zdrojové URL"
 msgid "Organization responsible for this application"
 msgstr "Organizace odpovědná za tuto aplikaci"
 
+#. TRANS: Form input field label.
+#: lib/applicationeditform.php:227
+msgid "Organization"
+msgstr "Organizace"
+
 #. TRANS: Form input field instructions.
 #: lib/applicationeditform.php:234
 msgid "URL for the homepage of the organization"
@@ -7820,16 +7903,6 @@ msgstr ""
 msgid "Do not use this method!"
 msgstr "Neodstraňujte toto oznámení"
 
-#. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:293
-msgid "Author"
-msgstr "Autor"
-
-#. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:307
-msgid "Provider"
-msgstr "Poskytovatel"
-
 #. TRANS: Title.
 #: lib/attachmentnoticesection.php:67
 msgid "Notices where this attachment appears"
@@ -7857,24 +7930,29 @@ msgstr "Změna hesla není povolena"
 msgid "Block"
 msgstr "Blokovat"
 
+#. TRANS: Description of the form to block a user.
+#: lib/blockform.php:79
+msgid "Block this user"
+msgstr "Zablokovat tohoto uživatele"
+
 #. TRANS: Title for command results.
-#: lib/channel.php:160 lib/channel.php:181
+#: lib/channel.php:104 lib/channel.php:125
 msgid "Command results"
 msgstr "Výsledky příkazu"
 
 #. TRANS: Title for command results.
-#: lib/channel.php:194
+#: lib/channel.php:138
 #, fuzzy
 msgid "AJAX error"
 msgstr "Ajax Chyba"
 
 #. TRANS: E-mail subject when a command has completed.
-#: lib/channel.php:233 lib/mailhandler.php:143
+#: lib/channel.php:177 lib/mailhandler.php:143
 msgid "Command complete"
 msgstr "Příkaz dokončen"
 
 #. TRANS: E-mail subject when a command has failed.
-#: lib/channel.php:244
+#: lib/channel.php:188
 msgid "Command failed"
 msgstr "Příkaz selhal"
 
@@ -7977,7 +8055,7 @@ msgstr "Celé jméno %s"
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a location.
-#: lib/command.php:446 lib/mail.php:270
+#: lib/command.php:446 lib/mail.php:275
 #, php-format
 msgid "Location: %s"
 msgstr "Poloha: %s"
@@ -7985,7 +8063,7 @@ msgstr "Poloha: %s"
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a homepage.
-#: lib/command.php:450 lib/mail.php:274
+#: lib/command.php:450 lib/mail.php:279
 #, php-format
 msgid "Homepage: %s"
 msgstr "Domovská stránka: %s"
@@ -8260,115 +8338,105 @@ msgstr ""
 "tracking - Dosud neimplementován.\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:162
+#: lib/common.php:36
 #, fuzzy
 msgid "No configuration file found."
 msgstr "Žádný konfigurační soubor nalezen. "
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:165
+#: lib/common.php:39
 #, fuzzy
 msgid "I looked for configuration files in the following places:"
 msgstr "Díval jsem se po konfiguračních souborech na těchto místech: "
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:168
+#: lib/common.php:42
 msgid "You may wish to run the installer to fix this."
 msgstr "Možná budete chtít spustit instalační program abyste to vyřešili."
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:172
+#: lib/common.php:46
 msgid "Go to the installer."
 msgstr "Jdi na instalaci."
 
-#. TRANS: Menu item for Instant Messaging settings.
-#: lib/connectsettingsaction.php:106
-#, fuzzy
-msgctxt "MENU"
-msgid "IM"
-msgstr "IM"
-
-#. TRANS: Tooltip for Instant Messaging menu item.
-#: lib/connectsettingsaction.php:108
-msgid "Updates by instant messenger (IM)"
-msgstr "Aktualizace z a na instant messenger (IM)"
-
-#. TRANS: Menu item for Short Message Service settings.
-#: lib/connectsettingsaction.php:113
-#, fuzzy
-msgctxt "MENU"
-msgid "SMS"
-msgstr "SMS"
-
-#. TRANS: Tooltip for Short Message Service menu item.
-#: lib/connectsettingsaction.php:115
-msgid "Updates by SMS"
-msgstr "Aktualizace z a na SMS"
-
-#. TRANS: Menu item for OuAth connection settings.
-#: lib/connectsettingsaction.php:120
-#, fuzzy
-msgctxt "MENU"
-msgid "Connections"
-msgstr "Připojení"
-
-#. TRANS: Tooltip for connected applications (Connections through OAuth) menu item.
-#: lib/connectsettingsaction.php:122
-msgid "Authorized connected applications"
-msgstr "Autorizované propojené aplikace"
-
 #: lib/dberroraction.php:59
 msgid "Database error"
 msgstr "Chyba databáze"
 
+#. TRANS: Description of form for deleting a user.
+#: lib/deleteuserform.php:75
+msgid "Delete this user"
+msgstr "Odstranit tohoto uživatele"
+
+#: lib/designform.php:114
+#, fuzzy
+msgid "Change design"
+msgstr "Uložit vzhled"
+
+#. TRANS: Fieldset legend on profile design page to change profile page colours.
+#: lib/designform.php:131
+msgid "Change colours"
+msgstr "Změnit barvy"
+
+#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
+#: lib/designform.php:138
+msgid "Use defaults"
+msgstr "Použít výchozí"
+
+#. TRANS: Title for button on profile design page to reset all colour settings to default.
+#: lib/designform.php:140
+msgid "Restore default designs"
+msgstr "Obnovit výchozí vzhledy"
+
+#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
+#: lib/designform.php:148
+msgid "Reset back to default"
+msgstr "Reset zpět do výchozího"
+
 #. TRANS: Label in form on profile design page.
 #. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
-#: lib/designsettings.php:108
+#: lib/designform.php:158
 msgid "Upload file"
 msgstr "Nahrát soubor"
 
 #. TRANS: Instructions for form on profile design page.
-#: lib/designsettings.php:113
+#: lib/designform.php:163
+#, fuzzy
 msgid ""
-"You can upload your personal background image. The maximum file size is 2MB."
+"You can upload your personal background image. The maximum file size is 2Mb."
 msgstr ""
 "Můžete nahrát váš osobní obrázek na pozadí. Maximální velikost souboru je 2 "
 "MB."
 
 #. TRANS: Radio button on profile design page that will enable use of the uploaded profile image.
-#: lib/designsettings.php:139
+#: lib/designform.php:194
 #, fuzzy
 msgctxt "RADIO"
 msgid "On"
 msgstr "zap."
 
 #. TRANS: Radio button on profile design page that will disable use of the uploaded profile image.
-#: lib/designsettings.php:156
+#: lib/designform.php:211
 #, fuzzy
 msgctxt "RADIO"
 msgid "Off"
 msgstr "vyp."
 
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: lib/designsettings.php:175
-msgid "Change colours"
-msgstr "Změnit barvy"
-
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: lib/designsettings.php:257
-msgid "Use defaults"
-msgstr "Použít výchozí"
+#. TRANS: Title for button on profile design page to save settings.
+#: lib/designform.php:322
+msgid "Save design"
+msgstr "Uložit vzhled"
 
 #. TRANS: Error message displayed if design settings could not be saved.
 #. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
-#: lib/designsettings.php:405 lib/designsettings.php:427
+#: lib/designsettings.php:216 lib/designsettings.php:238
 msgid "Couldn't update your design."
 msgstr "Nelze uložit vzhled."
 
 #. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
-#: lib/designsettings.php:433
+#: lib/designsettings.php:244
 msgid "Design defaults restored."
 msgstr "Obnoveno výchozí nastavení vzhledu."
 
@@ -8438,27 +8506,23 @@ msgstr ""
 msgid "Feeds"
 msgstr ""
 
-#: lib/galleryaction.php:121
-msgid "Filter tags"
-msgstr "Filtrovat tagy"
-
-#: lib/galleryaction.php:131
+#: lib/galleryaction.php:128
 msgid "All"
 msgstr "Všechny"
 
-#: lib/galleryaction.php:139
+#: lib/galleryaction.php:136
 msgid "Select tag to filter"
 msgstr "Zvolte značku k filtrování"
 
-#: lib/galleryaction.php:140
+#: lib/galleryaction.php:137
 msgid "Tag"
 msgstr "Značka"
 
-#: lib/galleryaction.php:141
+#: lib/galleryaction.php:138
 msgid "Choose a tag to narrow list"
 msgstr "Vyberte si značku k zúžení seznamu"
 
-#: lib/galleryaction.php:143
+#: lib/galleryaction.php:140
 msgid "Go"
 msgstr "Jdi"
 
@@ -8550,6 +8614,12 @@ msgctxt "TOOLTIP"
 msgid "%s blocked users"
 msgstr ""
 
+#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
+#: lib/groupnav.php:117
+msgctxt "MENU"
+msgid "Admin"
+msgstr "Admin"
+
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
 #: lib/groupnav.php:120
@@ -8662,39 +8732,61 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: lib/jabber.php:387
+#: lib/implugin.php:262
 #, php-format
-msgid "[%s]"
-msgstr "[%s]"
+msgid ""
+"User \"%s\" on %s has said that your %s screenname belongs to them. If "
+"that's true, you can confirm by clicking on this URL: %s . (If you cannot "
+"click it, copy-and-paste it into the address bar of your browser). If that "
+"user isn't you, or if you didn't request this confirmation, just ignore this "
+"message."
+msgstr ""
 
-#: lib/jabber.php:567
+#: lib/implugin.php:349
 #, php-format
 msgid "Unknown inbox source %d."
 msgstr "Neznámý zdroj inboxu %d."
 
+#: lib/implugin.php:485
+#, fuzzy, php-format
+msgid "Message too long - maximum is %1$d characters, you sent %2$d."
+msgstr "Zpráva je příliš dlouhá - maximum je %1$d znaků, poslal jsi %2$d."
+
 #: lib/leaveform.php:114
 msgid "Leave"
 msgstr "Opustit"
 
+#. TRANS: Menu item for logging in to the StatusNet site.
+#: lib/logingroupnav.php:77
+msgctxt "MENU"
+msgid "Login"
+msgstr "Přihlásit"
+
 #. TRANS: Title for menu item for logging in to the StatusNet site.
 #: lib/logingroupnav.php:79
 msgid "Login with a username and password"
 msgstr "Přihlásit se pomocí svého uživatelského jména a hesla."
 
+#. TRANS: Menu item for registering with the StatusNet site.
+#: lib/logingroupnav.php:85
+msgctxt "MENU"
+msgid "Register"
+msgstr "Registrovat"
+
 #. TRANS: Title for menu item for registering with the StatusNet site.
 #: lib/logingroupnav.php:87
 msgid "Sign up for a new account"
 msgstr "Vytvořit nový účet"
 
 #. TRANS: Subject for address confirmation email.
-#: lib/mail.php:168
+#: lib/mail.php:172
 msgid "Email address confirmation"
 msgstr "Potvrzení emailové adresy"
 
 #. TRANS: Body for address confirmation email.
 #. TRANS: %1$s is the addressed user's nickname, %2$s is the StatusNet sitename,
 #. TRANS: %3$s is the URL to confirm at.
-#: lib/mail.php:173
+#: lib/mail.php:177
 #, fuzzy, php-format
 msgid ""
 "Hey, %1$s.\n"
@@ -8726,14 +8818,14 @@ msgstr ""
 
 #. TRANS: Subject of new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
-#: lib/mail.php:238
+#: lib/mail.php:243
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1$s od teď naslouchá tvým sdělením na %2$s."
 
 #. TRANS: This is a paragraph in a new-subscriber e-mail.
 #. TRANS: %s is a URL where the subscriber can be reported as abusive.
-#: lib/mail.php:245
+#: lib/mail.php:250
 #, php-format
 msgid ""
 "If you believe this account is being used abusively, you can block them from "
@@ -8747,7 +8839,7 @@ msgstr ""
 #. TRANS: %3$s is the subscriber's profile URL, %4$s is the subscriber's location (or empty)
 #. TRANS: %5$s is the subscriber's homepage URL (or empty), %6%s is the subscriber's bio (or empty)
 #. TRANS: %7$s is a link to the addressed user's e-mail settings.
-#: lib/mail.php:255
+#: lib/mail.php:260
 #, fuzzy, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -8774,14 +8866,14 @@ msgstr ""
 
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is biographical information.
-#: lib/mail.php:278
+#: lib/mail.php:283
 #, php-format
 msgid "Bio: %s"
 msgstr "O: %s"
 
 #. TRANS: Subject of notification mail for new posting email address.
 #. TRANS: %s is the StatusNet sitename.
-#: lib/mail.php:307
+#: lib/mail.php:312
 #, php-format
 msgid "New email address for posting to %s"
 msgstr "Nová e-mailová adresa pro psaní na %s"
@@ -8789,7 +8881,7 @@ msgstr "Nová e-mailová adresa pro psaní na %s"
 #. TRANS: Body of notification mail for new posting email address.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is the e-mail address to send
 #. TRANS: to to post by e-mail, %3$s is a URL to more instructions.
-#: lib/mail.php:313
+#: lib/mail.php:318
 #, fuzzy, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -8812,26 +8904,26 @@ msgstr ""
 
 #. TRANS: Subject line for SMS-by-email notification messages.
 #. TRANS: %s is the posting user's nickname.
-#: lib/mail.php:434
+#: lib/mail.php:439
 #, php-format
 msgid "%s status"
 msgstr "status %s"
 
 #. TRANS: Subject line for SMS-by-email address confirmation message.
-#: lib/mail.php:460
+#: lib/mail.php:465
 msgid "SMS confirmation"
 msgstr "SMS potvrzení"
 
 #. TRANS: Main body heading for SMS-by-email address confirmation message.
 #. TRANS: %s is the addressed user's nickname.
-#: lib/mail.php:464
+#: lib/mail.php:469
 #, php-format
 msgid "%s: confirm you own this phone number with this code:"
 msgstr "%s: potvrďte že vlastníte toto telefonní číslo tímto kódem:"
 
 #. TRANS: Subject for 'nudge' notification email.
 #. TRANS: %s is the nudging user.
-#: lib/mail.php:485
+#: lib/mail.php:490
 #, fuzzy, php-format
 msgid "You have been nudged by %s"
 msgstr "%s Vás pošťouchl"
@@ -8839,7 +8931,7 @@ msgstr "%s Vás pošťouchl"
 #. TRANS: Body for 'nudge' notification email.
 #. TRANS: %1$s is the nuding user's long name, $2$s is the nudging user's nickname,
 #. TRANS: %3$s is a URL to post notices at, %4$s is the StatusNet sitename.
-#: lib/mail.php:492
+#: lib/mail.php:497
 #, php-format
 msgid ""
 "%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -8868,7 +8960,7 @@ msgstr ""
 
 #. TRANS: Subject for direct-message notification email.
 #. TRANS: %s is the sending user's nickname.
-#: lib/mail.php:539
+#: lib/mail.php:544
 #, php-format
 msgid "New private message from %s"
 msgstr "Nová soukromá zpráva od %s"
@@ -8877,7 +8969,7 @@ msgstr "Nová soukromá zpráva od %s"
 #. TRANS: %1$s is the sending user's long name, %2$s is the sending user's nickname,
 #. TRANS: %3$s is the message content, %4$s a URL to the message,
 #. TRANS: %5$s is the StatusNet sitename.
-#: lib/mail.php:547
+#: lib/mail.php:552
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -8912,7 +9004,7 @@ msgstr ""
 
 #. TRANS: Subject for favorite notification e-mail.
 #. TRANS: %1$s is the adding user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:599
+#: lib/mail.php:604
 #, fuzzy, php-format
 msgid "%1$s (@%2$s) added your notice as a favorite"
 msgstr "%s (@%s) přidal vaše oznámení jako oblíbené"
@@ -8922,7 +9014,7 @@ msgstr "%s (@%s) přidal vaše oznámení jako oblíbené"
 #. TRANS: %3$s is a URL to the faved notice, %4$s is the faved notice text,
 #. TRANS: %5$s is a URL to all faves of the adding user, %6$s is the StatusNet sitename,
 #. TRANS: %7$s is the adding user's nickname.
-#: lib/mail.php:606
+#: lib/mail.php:611
 #, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -8961,7 +9053,7 @@ msgstr ""
 " %6$s \n"
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:664
+#: lib/mail.php:669
 #, php-format
 msgid ""
 "The full conversation can be read here:\n"
@@ -8974,7 +9066,7 @@ msgstr ""
 
 #. TRANS: E-mail subject for notice notification.
 #. TRANS: %1$s is the sending user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:672
+#: lib/mail.php:677
 #, fuzzy, php-format
 msgid "%1$s (@%2$s) sent a notice to your attention"
 msgstr "%s (@%s) poslal oznámení žádající o vaši pozornost"
@@ -8985,7 +9077,7 @@ msgstr "%s (@%s) poslal oznámení žádající o vaši pozornost"
 #. TRANS: %5$s is a URL to the full conversion if it exists (otherwise empty),
 #. TRANS: %6$s is a URL to reply to the notice, %7$s is a URL to all @-replied for the addressed user,
 #. TRANS: %8$s is a URL to the addressed user's e-mail settings, %9$s is the sender's nickname.
-#: lib/mail.php:680
+#: lib/mail.php:685
 #, php-format
 msgid ""
 "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -9128,11 +9220,7 @@ msgstr "Nepřihlášen!"
 msgid "To"
 msgstr "Komu:"
 
-#: lib/messageform.php:166 lib/noticeform.php:186
-msgid "Available characters"
-msgstr "Zbývá znaků"
-
-#: lib/messageform.php:185 lib/noticeform.php:237
+#: lib/messageform.php:184 lib/noticeform.php:236
 msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr "Odeslat"
@@ -9142,15 +9230,10 @@ msgstr "Odeslat"
 msgid "Messages"
 msgstr "Zpráva"
 
-#: lib/messagelistitem.php:123 lib/noticelist.php:522
+#: lib/messagelistitem.php:123 lib/noticelist.php:527
 msgid "from"
 msgstr "od"
 
-#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:165
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr "Přezdívka může obsahovat pouze malá písmena a čísla a žádné mezery."
-
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 #: lib/nickname.php:178
 msgid "Nickname cannot be empty."
@@ -9174,23 +9257,23 @@ msgstr "Poslat oznámení"
 msgid "What's up, %s?"
 msgstr "Co se děje, %s?"
 
-#: lib/noticeform.php:194
+#: lib/noticeform.php:193
 msgid "Attach"
 msgstr "Připojit"
 
-#: lib/noticeform.php:198
+#: lib/noticeform.php:197
 msgid "Attach a file"
 msgstr "Přiložit soubor"
 
-#: lib/noticeform.php:213
+#: lib/noticeform.php:212
 msgid "Share my location"
 msgstr "Sdílet mé umístění"
 
-#: lib/noticeform.php:216
+#: lib/noticeform.php:215
 msgid "Do not share my location"
 msgstr "Nesdílet moje umístění"
 
-#: lib/noticeform.php:217
+#: lib/noticeform.php:216
 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
 "try again later"
@@ -9199,55 +9282,59 @@ msgstr ""
 "prosím znovu později"
 
 #. TRANS: Used in coordinates as abbreviation of north
-#: lib/noticelist.php:452
+#: lib/noticelist.php:457
 msgid "N"
 msgstr "S"
 
 #. TRANS: Used in coordinates as abbreviation of south
-#: lib/noticelist.php:454
+#: lib/noticelist.php:459
 msgid "S"
 msgstr "J"
 
 #. TRANS: Used in coordinates as abbreviation of east
-#: lib/noticelist.php:456
+#: lib/noticelist.php:461
 msgid "E"
 msgstr "V"
 
 #. TRANS: Used in coordinates as abbreviation of west
-#: lib/noticelist.php:458
+#: lib/noticelist.php:463
 msgid "W"
 msgstr "Z"
 
-#: lib/noticelist.php:460
+#: lib/noticelist.php:465
 #, php-format
 msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 
-#: lib/noticelist.php:469
+#: lib/noticelist.php:474
 msgid "at"
 msgstr "v"
 
-#: lib/noticelist.php:518
+#: lib/noticelist.php:523
 msgid "web"
 msgstr "web"
 
-#: lib/noticelist.php:584
+#: lib/noticelist.php:589
 msgid "in context"
 msgstr "v kontextu"
 
-#: lib/noticelist.php:619
+#: lib/noticelist.php:624
 msgid "Repeated by"
 msgstr "Opakováno"
 
-#: lib/noticelist.php:646
+#: lib/noticelist.php:651
 msgid "Reply to this notice"
 msgstr "Odpovědět na toto oznámení"
 
-#: lib/noticelist.php:647
+#: lib/noticelist.php:652
 msgid "Reply"
 msgstr "Odpovědět"
 
-#: lib/noticelist.php:691
+#: lib/noticelist.php:678
+msgid "Delete this notice"
+msgstr "Odstranit toto oznámení"
+
+#: lib/noticelist.php:696
 msgid "Notice repeated"
 msgstr "Sdělení opakováno"
 
@@ -9284,48 +9371,31 @@ msgstr ""
 msgid "Couldn't insert new subscription."
 msgstr "Nelze vložit odebírání"
 
-#. TRANS: Personal group navigation menu option when logged in for viewing @-replies.
-#: lib/personalgroupnav.php:107
+#: lib/personalgroupnav.php:104
 #, fuzzy
-msgctxt "MENU"
 msgid "Replies"
 msgstr "Odpovědi"
 
-#. TRANS: Personal group navigation menu option when logged in for seeing own profile.
-#: lib/personalgroupnav.php:114
+#: lib/personalgroupnav.php:109
 #, fuzzy
-msgctxt "MENU"
-msgid "Profile"
-msgstr "Profil"
-
-#. TRANS: Personal group navigation menu option when logged in for viewing own favourited notices.
-#: lib/personalgroupnav.php:120
-#, fuzzy
-msgctxt "MENU"
 msgid "Favorites"
 msgstr "Oblíbené"
 
-#. TRANS: Personal group navigation menu option when logged in for viewing recieved personal messages.
-#: lib/personalgroupnav.php:133
+#: lib/personalgroupnav.php:120
 #, fuzzy
-msgctxt "MENU"
 msgid "Inbox"
 msgstr "Doručená pošta"
 
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing recieved personal messages.
-#: lib/personalgroupnav.php:135
+#: lib/personalgroupnav.php:121
 msgid "Your incoming messages"
 msgstr "Vaše příchozí zprávy"
 
-#. TRANS: Personal group navigation menu option when logged in for viewing senet personal messages.
-#: lib/personalgroupnav.php:140
+#: lib/personalgroupnav.php:125
 #, fuzzy
-msgctxt "MENU"
 msgid "Outbox"
 msgstr "Odeslaná pošta"
 
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing senet personal messages.
-#: lib/personalgroupnav.php:142
+#: lib/personalgroupnav.php:126
 msgid "Your sent messages"
 msgstr "Vaše odeslané zprávy"
 
@@ -9340,9 +9410,26 @@ msgstr "Značky v oznámeních %s"
 msgid "Unknown"
 msgstr "Neznámé"
 
+#. TRANS: Plugin admin panel controls
+#: lib/plugindisableform.php:90
+msgctxt "plugin"
+msgid "Disable"
+msgstr ""
+
+#. TRANS: Plugin admin panel controls
+#: lib/pluginenableform.php:112
+msgctxt "plugin"
+msgid "Enable"
+msgstr ""
+
+#: lib/pluginlist.php:196
+msgctxt "plugin-description"
+msgid "(Plugin descriptions unavailable when disabled.)"
+msgstr ""
+
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:82
+#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:88
 msgid "Subscriptions"
 msgstr "Odběry"
 
@@ -9353,7 +9440,7 @@ msgstr "Všechny odběry"
 
 #. TRANS: H2 text for user subscriber statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:90
+#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:96
 msgid "Subscribers"
 msgstr "Odběratelé"
 
@@ -9375,7 +9462,7 @@ msgstr "Členem od"
 #. TRANS: Label for user statistics.
 #. TRANS: H2 text for user group membership statistics.
 #: lib/profileaction.php:239 lib/profileaction.php:290
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:104
 msgid "Groups"
 msgstr "Skupiny"
 
@@ -9395,10 +9482,6 @@ msgstr "Všechny skupiny"
 msgid "Unimplemented method."
 msgstr "Neimplementovaná metoda."
 
-#: lib/publicgroupnav.php:78
-msgid "Public"
-msgstr "Veřejné"
-
 #: lib/publicgroupnav.php:82
 msgid "User groups"
 msgstr "Skupin uživatel"
@@ -9437,7 +9520,7 @@ msgid "Revoke the \"%s\" role from this user"
 msgstr "Odebrat uživateli roli \"%s\""
 
 #. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:974
+#: lib/router.php:1001
 #, fuzzy
 msgid "Page not found."
 msgstr " API metoda nebyla nalezena."
@@ -9467,11 +9550,6 @@ msgctxt "BUTTON"
 msgid "Search"
 msgstr ""
 
-#. TRANS: Definition list item with instructions on how to get (better) search results.
-#: lib/searchaction.php:170
-msgid "Search help"
-msgstr "Nápověda k hledání"
-
 #: lib/searchgroupnav.php:80
 msgid "People"
 msgstr "Lidé"
@@ -9496,6 +9574,51 @@ msgstr "Oddíl bez názvu"
 msgid "More..."
 msgstr "Další…"
 
+#: lib/settingsnav.php:78
+msgid "Change your profile settings"
+msgstr "Změňte nastavení profilu"
+
+#: lib/settingsnav.php:83
+msgid "Upload an avatar"
+msgstr "Nahrát avatar"
+
+#: lib/settingsnav.php:88
+msgid "Change your password"
+msgstr "Změňte své heslo"
+
+#: lib/settingsnav.php:93
+msgid "Change email handling"
+msgstr "Změnit manipulaci emailu"
+
+#: lib/settingsnav.php:98
+msgid "Design your profile"
+msgstr "Změňte vzhled svého profilu"
+
+#: lib/settingsnav.php:102
+msgid "URL"
+msgstr "URL"
+
+#: lib/settingsnav.php:103
+msgid "URL shorteners"
+msgstr ""
+
+#: lib/settingsnav.php:111
+msgid "Updates by instant messenger (IM)"
+msgstr "Aktualizace z a na instant messenger (IM)"
+
+#: lib/settingsnav.php:118
+msgid "Updates by SMS"
+msgstr "Aktualizace z a na SMS"
+
+#: lib/settingsnav.php:123
+#, fuzzy
+msgid "Connections"
+msgstr "Připojení"
+
+#: lib/settingsnav.php:124
+msgid "Authorized connected applications"
+msgstr "Autorizované propojené aplikace"
+
 #: lib/silenceform.php:67
 msgid "Silence"
 msgstr "Uťišit"
@@ -9504,30 +9627,34 @@ msgstr "Uťišit"
 msgid "Silence this user"
 msgstr "Utišit tohoto uživatele"
 
-#: lib/subgroupnav.php:83
+#: lib/subgroupnav.php:89
 #, php-format
 msgid "People %s subscribes to"
 msgstr "Lidé ke kterým je %s přihlášen"
 
-#: lib/subgroupnav.php:91
+#: lib/subgroupnav.php:97
 #, php-format
 msgid "People subscribed to %s"
 msgstr "Lidé přihlášení k %s"
 
-#: lib/subgroupnav.php:99
+#: lib/subgroupnav.php:105
 #, php-format
 msgid "Groups %s is a member of"
 msgstr "Skupiny kterých je %s členem"
 
-#: lib/subgroupnav.php:105
+#: lib/subgroupnav.php:111
 msgid "Invite"
 msgstr "Pozvat"
 
-#: lib/subgroupnav.php:106
+#: lib/subgroupnav.php:112
 #, php-format
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Pozvěte přátele a kolegy, aby se k vám připojili na %s"
 
+#: lib/subscribeform.php:115 lib/subscribeform.php:139
+msgid "Subscribe to this user"
+msgstr "Přihlásit se k tomuto uživateli"
+
 #: lib/subscriberspeopleselftagcloudsection.php:48
 #: lib/subscriptionspeopleselftagcloudsection.php:48
 msgid "People Tagcloud as self-tagged"
@@ -9603,6 +9730,14 @@ msgstr "Téma obsahuje soubor typu '.%s', což není povoleno."
 msgid "Error opening theme archive."
 msgstr "Chyba při otevírání archivu tématu."
 
+#: lib/threadednoticelist.php:270
+#, php-format
+msgid "Show all %d comment"
+msgid_plural "Show all %d comments"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
 #: lib/topposterssection.php:74
 msgid "Top posters"
 msgstr "Nejlepší pisálci"
@@ -9645,76 +9780,80 @@ msgstr "Odhlásit"
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "Uživatel nemá profil."
 
-#. TRANS: Link text for changeing the avatar of the logged in user.
-#: lib/userprofile.php:121
+#: lib/userprofile.php:116
 msgid "Edit Avatar"
 msgstr "Upravit avatar"
 
 #. TRANS: H2 for user actions in a profile.
 #. TRANS: H2 for entity actions in a profile.
-#: lib/userprofile.php:245 lib/userprofile.php:261
+#: lib/userprofile.php:216 lib/userprofile.php:232
 msgid "User actions"
 msgstr "Akce uživatele"
 
 #. TRANS: Text shown in user profile of not yet compeltely deleted users.
-#: lib/userprofile.php:249
+#: lib/userprofile.php:220
 msgid "User deletion in progress..."
 msgstr "Probíhá mazání uživatele..."
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:277
+#: lib/userprofile.php:248
 msgid "Edit profile settings"
 msgstr "Upravit nastavení profilu"
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:279
+#: lib/userprofile.php:250
 msgid "Edit"
 msgstr "Editovat"
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:303
+#: lib/userprofile.php:274
 msgid "Send a direct message to this user"
 msgstr "Odeslat přímou zprávu tomuto uživateli"
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:305
+#: lib/userprofile.php:276
 msgid "Message"
 msgstr "Zpráva"
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:347
+#: lib/userprofile.php:318
 msgid "Moderate"
 msgstr "Moderovat"
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:386
+#: lib/userprofile.php:357
 msgid "User role"
 msgstr "Role uživatele"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:389
+#: lib/userprofile.php:360
 msgctxt "role"
 msgid "Administrator"
 msgstr "Administrátor"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:391
+#: lib/userprofile.php:362
 msgctxt "role"
 msgid "Moderator"
 msgstr "Moderátor"
 
+#: lib/util.php:321
+#, fuzzy
+msgid "Not allowed to log in."
+msgstr "Nejste přihlášen(a)."
+
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1306
+#: lib/util.php:1337
 msgid "a few seconds ago"
 msgstr "před pár sekundami"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1309
+#: lib/util.php:1340
 msgid "about a minute ago"
 msgstr "asi před minutou"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1313
+#: lib/util.php:1344
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
@@ -9723,12 +9862,12 @@ msgstr[1] ""
 msgstr[2] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1316
+#: lib/util.php:1347
 msgid "about an hour ago"
 msgstr "asi před hodinou"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1320
+#: lib/util.php:1351
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
@@ -9737,12 +9876,12 @@ msgstr[1] ""
 msgstr[2] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1323
+#: lib/util.php:1354
 msgid "about a day ago"
 msgstr "asi přede dnem"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1327
+#: lib/util.php:1358
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
@@ -9751,12 +9890,12 @@ msgstr[1] ""
 msgstr[2] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1330
+#: lib/util.php:1361
 msgid "about a month ago"
 msgstr "asi před měsícem"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1334
+#: lib/util.php:1365
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
@@ -9765,7 +9904,7 @@ msgstr[1] ""
 msgstr[2] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1337
+#: lib/util.php:1368
 msgid "about a year ago"
 msgstr "asi před rokem"
 
@@ -9776,22 +9915,6 @@ msgstr "asi před rokem"
 msgid "%s is not a valid color! Use 3 or 6 hex characters."
 msgstr "%s není platná barva! Použijte 3 nebo 6 hex znaků."
 
-#. TRANS: %s is the URL to the StatusNet site's Instant Messaging settings.
-#: lib/xmppmanager.php:287
-#, php-format
-msgid "Unknown user. Go to %s to add your address to your account"
-msgstr ""
-
-#. TRANS: Response to XMPP source when it sent too long a message.
-#. TRANS: %1$d the maximum number of allowed characters (used for plural), %2$d is the sent number.
-#: lib/xmppmanager.php:406
-#, fuzzy, php-format
-msgid "Message too long. Maximum is %1$d character, you sent %2$d."
-msgid_plural "Message too long. Maximum is %1$d characters, you sent %2$d."
-msgstr[0] "Zpráva je příliš dlouhá - maximum je %1$d znaků, poslal jsi %2$d."
-msgstr[1] "Zpráva je příliš dlouhá - maximum je %1$d znaků, poslal jsi %2$d."
-msgstr[2] "Zpráva je příliš dlouhá - maximum je %1$d znaků, poslal jsi %2$d."
-
 #. TRANS: Exception.
 #: lib/xrd.php:63
 #, fuzzy
@@ -9810,72 +9933,181 @@ msgid "Getting backup from file '%s'."
 msgstr ""
 
 #, fuzzy
-#~ msgid "Block this user."
-#~ msgstr "Zablokovat tohoto uživatele"
+#~ msgid "Could not generate feed for group - %s"
+#~ msgstr "Nelze aktualizovat skupinu."
 
 #, fuzzy
-#~ msgid "Delete this notice."
-#~ msgstr "Odstranit toto oznámení"
-
-#, fuzzy
-#~ msgid "Delete this user."
-#~ msgstr "Odstranit tohoto uživatele"
-
-#, fuzzy
-#~ msgid "Restore default designs."
-#~ msgstr "Obnovit výchozí vzhledy"
-
-#, fuzzy
-#~ msgid "Reset back to default."
-#~ msgstr "Reset zpět do výchozího"
-
-#, fuzzy
-#~ msgid "Save design."
-#~ msgstr "Uložit vzhled"
-
-#, fuzzy
-#~ msgid "Disfavor favorite."
-#~ msgstr "Znemilostnit oblíbenou"
-
-#, fuzzy
-#~ msgid "\"%s\" not found."
-#~ msgstr " API metoda nebyla nalezena."
-
-#, fuzzy
-#~ msgid "Notice %s not found."
-#~ msgstr " API metoda nebyla nalezena."
-
-#, fuzzy
-#~ msgid "Attachment %s not found."
-#~ msgstr "Příjemce nebyl nalezen."
-
-#, fuzzy
-#~ msgid "Invalid tag: \"%s\"."
-#~ msgstr "Neplatná velikost"
-
-#, fuzzy
-#~ msgid "%s updates from everyone."
-#~ msgstr "Všechny updaty na %s!"
-
-#, fuzzy
-#~ msgid "Password saved"
-#~ msgstr "Heslo uloženo"
-
-#, fuzzy
-#~ msgid "Where you are, like \"City, State (or Region), Country\"."
-#~ msgstr "Místo. Město, stát."
-
-#, fuzzy
-#~ msgid "Subscribe to this user."
-#~ msgstr "Přihlásit se k tomuto uživateli"
+#~ msgid "Current confirmed Jabber/Google Talk address."
+#~ msgstr "Aktuální potvrzená Jabber / GTalk adresa."
 
 #, fuzzy
 #~ msgid ""
-#~ "Listenee stream license \"%1$s\" is not compatible with site license \"%2"
-#~ "$s\"."
+#~ "Jabber or Google Talk address, like \"UserName@example.org\". First, make "
+#~ "sure to add %s to your buddy list in your IM client or on Google Talk."
 #~ msgstr ""
-#~ "Licence naslouchaného '%1$s' není kompatibilní s licencí stránky '%2$s'."
+#~ "Jabber nebo GTalk adresa, například \"jmeno@example.org\". Neprve se "
+#~ "ujistěte že jste přidal %s do vašeho seznamu kontaktů ve vašem IM klientu "
+#~ "nebo na GTalku."
 
 #, fuzzy
-#~ msgid "Not allowed to log in."
-#~ msgstr "Nejste přihlášen(a)."
+#~ msgid "Send me notices through Jabber/Google Talk."
+#~ msgstr "Zasílat oznámení pomocí Jabber/GTalk"
+
+#, fuzzy
+#~ msgid "Publish a MicroID for my Jabber/Google Talk address."
+#~ msgstr "Publikovat MicroID pro mou Jabber / GTalk adresu."
+
+#~ msgid "No Jabber ID."
+#~ msgstr "Chybí Jabber ID."
+
+#, fuzzy
+#~ msgid "Not a valid Jabber ID."
+#~ msgstr "Není platným Jabber ID"
+
+#~ msgid "That is already your Jabber ID."
+#~ msgstr "Toto je již vaše Jabber ID"
+
+#~ msgid "That is not your Jabber ID."
+#~ msgstr "Toto není váš Jabber ID"
+
+#~ msgid "Other settings"
+#~ msgstr "Další nastavení"
+
+#~ msgid "Tag cloud"
+#~ msgstr "Tag cloud"
+
+#~ msgid "Consumer key"
+#~ msgstr "Spotřebitelský klíč"
+
+#~ msgid "Consumer secret"
+#~ msgstr "Spotřebitelské tajemství"
+
+#~ msgid "Request token URL"
+#~ msgstr "Adresa řetězce požadavku"
+
+#~ msgid "Access token URL"
+#~ msgstr "URL Access tokenu"
+
+#~ msgid "Authorize URL"
+#~ msgstr "Authorizační URL"
+
+#~ msgid "Jabber"
+#~ msgstr "Jabber"
+
+#~ msgid "Photo"
+#~ msgstr "Fotka"
+
+#~ msgid "Other options"
+#~ msgstr "Další možnosti"
+
+#~ msgid "Other"
+#~ msgstr "Jiné"
+
+#~ msgid "Primary site navigation"
+#~ msgstr "Primární navigace na webu"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Personal profile and friends timeline"
+#~ msgstr "Osobní profil a časová osa přátel"
+
+#~ msgctxt "MENU"
+#~ msgid "Personal"
+#~ msgstr "Osobní"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Change your email, avatar, password, profile"
+#~ msgstr "Změňte svůj e-mail, avatar, heslo, profil"
+
+#~ msgid "Account"
+#~ msgstr "Účet"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Connect to services"
+#~ msgstr "Připojení ke službám"
+
+#~ msgid "Connect"
+#~ msgstr "Připojit"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Change site configuration"
+#~ msgstr "Změna konfigurace webu"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Invite friends and colleagues to join you on %s"
+#~ msgstr "Pozvěte přátele a kolegy, aby se k vám připojili na %s"
+
+#~ msgctxt "MENU"
+#~ msgid "Invite"
+#~ msgstr "Pozvat"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Create an account"
+#~ msgstr "Zaregistrujte se"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Help me!"
+#~ msgstr "Nápověda"
+
+#~ msgctxt "MENU"
+#~ msgid "Help"
+#~ msgstr "Nápověda"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Search for people or text"
+#~ msgstr "Vyhledávání osob nebo textu"
+
+#~ msgid "Local views"
+#~ msgstr "Místní zobrazení"
+
+#~ msgid "Page notice"
+#~ msgstr "Sdělení stránky"
+
+#~ msgid "Secondary site navigation"
+#~ msgstr "Sekundární navigace na webu"
+
+#~ msgid "StatusNet software license"
+#~ msgstr "Licence softwaru StatusNet"
+
+#~ msgid "Site content license"
+#~ msgstr "Licence k obsahu stránek"
+
+#~ msgid "Pagination"
+#~ msgstr "Stránkování"
+
+#~ msgid "Author"
+#~ msgstr "Autor"
+
+#~ msgid "Provider"
+#~ msgstr "Poskytovatel"
+
+#, fuzzy
+#~ msgctxt "MENU"
+#~ msgid "SMS"
+#~ msgstr "SMS"
+
+#~ msgid "Filter tags"
+#~ msgstr "Filtrovat tagy"
+
+#~ msgid "[%s]"
+#~ msgstr "[%s]"
+
+#~ msgid "Available characters"
+#~ msgstr "Zbývá znaků"
+
+#, fuzzy
+#~ msgctxt "MENU"
+#~ msgid "Profile"
+#~ msgstr "Profil"
+
+#~ msgid "Search help"
+#~ msgstr "Nápověda k hledání"
+
+#, fuzzy
+#~ msgid "Message too long. Maximum is %1$d character, you sent %2$d."
+#~ msgid_plural "Message too long. Maximum is %1$d characters, you sent %2$d."
+#~ msgstr[0] ""
+#~ "Zpráva je příliš dlouhá - maximum je %1$d znaků, poslal jsi %2$d."
+#~ msgstr[1] ""
+#~ "Zpráva je příliš dlouhá - maximum je %1$d znaků, poslal jsi %2$d."
+#~ msgstr[2] ""
+#~ "Zpráva je příliš dlouhá - maximum je %1$d znaků, poslal jsi %2$d."
diff --git a/locale/de/LC_MESSAGES/statusnet.po b/locale/de/LC_MESSAGES/statusnet.po
index 06023822e9..7760f6f949 100644
--- a/locale/de/LC_MESSAGES/statusnet.po
+++ b/locale/de/LC_MESSAGES/statusnet.po
@@ -20,8 +20,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 15:58+0000\n"
-"PO-Revision-Date: 2011-03-03 16:00:19+0000\n"
+"POT-Creation-Date: 2011-03-03 17:23+0000\n"
+"PO-Revision-Date: 2011-03-03 17:25:46+0000\n"
 "Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -88,23 +88,23 @@ msgstr "Zugangs-Einstellungen speichern"
 #. TRANS: Tooltip for button to save access settings in site admin panel.
 #. TRANS: Button text for saving theme settings.
 #. TRANS: Button label to save e-mail preferences.
-#. TRANS: Button label to save Instant Messaging preferences.
-#. TRANS: Button text for saving "Other settings" in profile.
+#. TRANS: Button label to save IM preferences.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
 #. TRANS: Button text for saving site notice in admin panel.
 #. TRANS: Button label to save SMS preferences.
 #. TRANS: Save button for settings for a profile in a subscriptions list.
+#. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
 #. TRANS: Button text on profile design page to save settings.
 #: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
-#: actions/emailsettings.php:250 actions/imsettings.php:183
-#: actions/othersettings.php:136 actions/pathsadminpanel.php:512
-#: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
-#: actions/smssettings.php:205 actions/subscriptions.php:259
+#: actions/emailsettings.php:251 actions/imsettings.php:199
+#: actions/pathsadminpanel.php:512 actions/profilesettings.php:198
+#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:204
+#: actions/subscriptions.php:261 actions/urlsettings.php:152
 #: actions/useradminpanel.php:298 lib/applicationeditform.php:355
-#: lib/designsettings.php:270 lib/groupeditform.php:201
+#: lib/designform.php:320 lib/groupeditform.php:201
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Speichern"
@@ -143,7 +143,11 @@ msgstr "Seite nicht vorhanden"
 #. 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 use "one time password login" without using an existing user.
+#. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
+#. TRANS: Client error displayed trying to find a user by ID for a non-existing ID.
+#. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when calling a profile action without specifying a user.
 #: actions/all.php:80 actions/allrss.php:69
@@ -155,19 +159,19 @@ msgstr "Seite nicht vorhanden"
 #: actions/apidirectmessage.php:75 actions/apidirectmessagenew.php:72
 #: actions/apigroupcreate.php:111 actions/apigroupismember.php:89
 #: actions/apigroupjoin.php:98 actions/apigroupleave.php:98
-#: actions/apigrouplist.php:70 actions/apistatusesupdate.php:230
-#: actions/apisubscriptions.php:85 actions/apitimelinefavorites.php:70
-#: actions/apitimelinefriends.php:173 actions/apitimelinehome.php:78
-#: actions/apitimelinementions.php:77 actions/apitimelineuser.php:79
-#: actions/avatarbynickname.php:79 actions/favoritesrss.php:72
-#: actions/foaf.php:42 actions/foaf.php:61 actions/hcard.php:67
-#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
-#: actions/remotesubscribe.php:144 actions/remotesubscribe.php:153
-#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
-#: actions/showfavorites.php:106 actions/userbyid.php:74
-#: actions/usergroups.php:93 actions/userrss.php:40 actions/userxrd.php:59
-#: actions/xrds.php:71 lib/command.php:509 lib/galleryaction.php:59
-#: lib/mailbox.php:80 lib/profileaction.php:77
+#: actions/apigrouplist.php:70 actions/apigroupprofileupdate.php:108
+#: actions/apistatusesupdate.php:230 actions/apisubscriptions.php:85
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:173
+#: actions/apitimelinehome.php:78 actions/apitimelinementions.php:77
+#: actions/apitimelineuser.php:79 actions/avatarbynickname.php:79
+#: actions/favoritesrss.php:72 actions/foaf.php:42 actions/foaf.php:61
+#: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116
+#: actions/otp.php:78 actions/remotesubscribe.php:144
+#: actions/remotesubscribe.php:153 actions/replies.php:73
+#: actions/repliesrss.php:38 actions/rsd.php:113 actions/showfavorites.php:106
+#: actions/userbyid.php:75 actions/usergroups.php:93 actions/userrss.php:40
+#: actions/userxrd.php:59 actions/xrds.php:71 lib/command.php:509
+#: lib/galleryaction.php:59 lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Unbekannter Benutzer."
 
@@ -181,10 +185,9 @@ msgstr "%1$s und Freunde, Seite% 2$d"
 #. TRANS: H1 text for page. %s is a user nickname.
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Timeline title for user and friends. %s is a user nickname.
-#. TRANS: Tooltop for personal group navigation menu option when logged in for viewing timeline of self and friends.
 #: actions/all.php:94 actions/all.php:191 actions/allrss.php:117
 #: actions/apitimelinefriends.php:207 actions/apitimelinehome.php:113
-#: lib/personalgroupnav.php:102
+#: lib/personalgroupnav.php:100
 #, php-format
 msgid "%s and friends"
 msgstr "%s und Freunde"
@@ -242,7 +245,7 @@ msgstr ""
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
 #. TRANS: Second sentence of empty message for anonymous users. %s is a user nickname.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:227
+#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:221
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -291,19 +294,20 @@ msgstr "Aktualisierungen von %1$s und Freunden auf %2$s!"
 #: actions/apifavoritecreate.php:98 actions/apifavoritedestroy.php:98
 #: actions/apifriendshipscreate.php:99 actions/apifriendshipsdestroy.php:99
 #: actions/apifriendshipsshow.php:124 actions/apigroupcreate.php:138
-#: actions/apigroupismember.php:115 actions/apigroupjoin.php:160
-#: actions/apigroupleave.php:145 actions/apigrouplist.php:134
+#: actions/apigroupismember.php:115 actions/apigroupjoin.php:151
+#: actions/apigroupleave.php:141 actions/apigrouplist.php:134
 #: actions/apigrouplistall.php:120 actions/apigroupmembership.php:105
+#: actions/apigroupprofileupdate.php:100 actions/apigroupprofileupdate.php:213
 #: actions/apigroupshow.php:114 actions/apihelptest.php:84
 #: actions/apistatusesdestroy.php:101 actions/apistatusesretweets.php:110
 #: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:139
 #: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
-#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:268
-#: actions/apitimelinegroup.php:147 actions/apitimelinehome.php:173
-#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:239
-#: actions/apitimelineretweetedtome.php:118
-#: actions/apitimelineretweetsofme.php:150 actions/apitimelinetag.php:159
-#: actions/apitimelineuser.php:206 actions/apiusershow.php:100
+#: actions/apitimelinefavorites.php:182 actions/apitimelinefriends.php:276
+#: actions/apitimelinegroup.php:148 actions/apitimelinehome.php:181
+#: actions/apitimelinementions.php:182 actions/apitimelinepublic.php:247
+#: actions/apitimelineretweetedtome.php:147
+#: actions/apitimelineretweetsofme.php:147 actions/apitimelinetag.php:165
+#: actions/apitimelineuser.php:217 actions/apiusershow.php:100
 msgid "API method not found."
 msgstr "API-Methode nicht gefunden."
 
@@ -318,8 +322,9 @@ msgstr "API-Methode nicht gefunden."
 #: actions/apifavoritecreate.php:88 actions/apifavoritedestroy.php:88
 #: actions/apifriendshipscreate.php:89 actions/apifriendshipsdestroy.php:89
 #: actions/apigroupcreate.php:102 actions/apigroupjoin.php:89
-#: actions/apigroupleave.php:89 actions/apimediaupload.php:66
-#: actions/apistatusesretweet.php:63 actions/apistatusesupdate.php:194
+#: actions/apigroupleave.php:89 actions/apigroupprofileupdate.php:92
+#: actions/apimediaupload.php:66 actions/apistatusesretweet.php:63
+#: actions/apistatusesupdate.php:194
 msgid "This method requires a POST."
 msgstr "Diese Methode benötigt ein POST."
 
@@ -333,21 +338,16 @@ msgstr ""
 "sms, im, none."
 
 #. TRANS: Server error displayed when a user's delivery device cannot be updated.
-#. TRANS: Server error displayed when a user update to the database fails in the contact address confirmation action.
 #. TRANS: Server error thrown on database error updating e-mail preferences.
 #. TRANS: Server error thrown on database error removing a registered e-mail address.
-#. TRANS: Server error thrown on database error updating Instant Messaging preferences.
-#. TRANS: Server error thrown on database error removing a registered Instant Messaging address.
-#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
 #. TRANS: Server error thrown when user profile settings could not be updated.
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
-#: actions/apiaccountupdatedeliverydevice.php:130
-#: actions/confirmaddress.php:118 actions/emailsettings.php:352
-#: actions/emailsettings.php:498 actions/imsettings.php:276
-#: actions/imsettings.php:432 actions/othersettings.php:186
-#: actions/profilesettings.php:322 actions/smssettings.php:301
-#: actions/smssettings.php:454
+#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
+#: actions/apiaccountupdatedeliverydevice.php:136
+#: actions/emailsettings.php:353 actions/emailsettings.php:499
+#: actions/profilesettings.php:323 actions/smssettings.php:300
+#: actions/smssettings.php:453 actions/urlsettings.php:211
 msgid "Could not update user."
 msgstr "Konnte Benutzerdaten nicht aktualisieren."
 
@@ -373,7 +373,7 @@ msgstr "Benutzer hat kein Profil."
 
 #. TRANS: Server error displayed if a user profile could not be saved.
 #. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:418
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:419
 msgid "Could not save profile."
 msgstr "Konnte Profil nicht speichern."
 
@@ -385,7 +385,7 @@ msgstr "Konnte Profil nicht speichern."
 #: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
 #: actions/designadminpanel.php:120 actions/editapplication.php:121
 #: actions/newapplication.php:102 actions/newnotice.php:95
-#: lib/designsettings.php:298
+#: lib/designsettings.php:110
 #, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s byte) due to its "
@@ -410,8 +410,8 @@ msgstr[1] ""
 #: actions/apiaccountupdateprofilecolors.php:160
 #: actions/apiaccountupdateprofilecolors.php:171
 #: actions/groupdesignsettings.php:285 actions/groupdesignsettings.php:296
-#: actions/userdesignsettings.php:201 actions/userdesignsettings.php:211
-#: actions/userdesignsettings.php:253 actions/userdesignsettings.php:263
+#: actions/userdesignsettings.php:218 actions/userdesignsettings.php:228
+#: actions/userdesignsettings.php:270 actions/userdesignsettings.php:280
 msgid "Unable to save your design settings."
 msgstr "Konnte Twitter-Einstellungen nicht speichern."
 
@@ -419,7 +419,7 @@ msgstr "Konnte Twitter-Einstellungen nicht speichern."
 #. TRANS: Client error displayed when a database error occurs updating profile colours.
 #: actions/apiaccountupdateprofilebackgroundimage.php:191
 #: actions/apiaccountupdateprofilecolors.php:139
-#: actions/userdesignsettings.php:179
+#: actions/userdesignsettings.php:196
 msgid "Could not update your design."
 msgstr "Konnte Benutzerdesign nicht aktualisieren."
 
@@ -530,7 +530,7 @@ msgstr "Empfänger nicht gefunden."
 #. TRANS: Client error displayed trying to direct message another user who's not a friend (403).
 #: actions/apidirectmessagenew.php:144
 #, fuzzy
-msgid "Can't send direct messages to users who aren't your friend."
+msgid "Cannot send direct messages to users who aren't your friend."
 msgstr ""
 "Es können keine direkten Nachrichten an Benutzer geschickt werden mit denen "
 "du nicht befreundet bist."
@@ -615,9 +615,9 @@ msgstr "Konnte keine Statusmeldungen finden."
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:156 actions/editgroup.php:191
-#: actions/newgroup.php:137 actions/profilesettings.php:273
-#: actions/register.php:214
+#: actions/apigroupcreate.php:156 actions/apigroupprofileupdate.php:255
+#: actions/editgroup.php:191 actions/newgroup.php:137
+#: actions/profilesettings.php:274 actions/register.php:199
 msgid "Nickname already in use. Try another one."
 msgstr "Benutzername wird bereits verwendet. Suche dir einen anderen aus."
 
@@ -625,9 +625,9 @@ msgstr "Benutzername wird bereits verwendet. Suche dir einen anderen aus."
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:164 actions/editgroup.php:195
-#: actions/newgroup.php:141 actions/profilesettings.php:243
-#: actions/register.php:216
+#: actions/apigroupcreate.php:164 actions/apigroupprofileupdate.php:259
+#: actions/editgroup.php:195 actions/newgroup.php:141
+#: actions/profilesettings.php:244 actions/register.php:201
 msgid "Not a valid nickname."
 msgstr "Ungültiger Benutzername."
 
@@ -637,10 +637,10 @@ msgstr "Ungültiger Benutzername."
 #. TRANS: Validation error shown when providing an invalid homepage URL in the "New application" form.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:181 actions/editapplication.php:235
-#: actions/editgroup.php:202 actions/newapplication.php:221
-#: actions/newgroup.php:148 actions/profilesettings.php:248
-#: actions/register.php:223
+#: actions/apigroupcreate.php:181 actions/apigroupprofileupdate.php:277
+#: actions/editapplication.php:235 actions/editgroup.php:202
+#: actions/newapplication.php:221 actions/newgroup.php:148
+#: actions/profilesettings.php:249 actions/register.php:208
 msgid "Homepage is not a valid URL."
 msgstr ""
 "Homepage ist keine gültige URL. URLs müssen ein Präfix wie http enthalten."
@@ -650,8 +650,8 @@ msgstr ""
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:191 actions/editgroup.php:206
-#: actions/newgroup.php:152 actions/profilesettings.php:252
-#: actions/register.php:226
+#: actions/newgroup.php:152 actions/profilesettings.php:253
+#: actions/register.php:211
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "Der bürgerliche Name ist zu lang (maximal 255 Zeichen)."
 
@@ -678,8 +678,8 @@ msgstr[1] "Die Beschreibung ist zu lang (max. %d Zeichen)."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:215 actions/editgroup.php:218
-#: actions/newgroup.php:164 actions/profilesettings.php:265
-#: actions/register.php:235
+#: actions/newgroup.php:164 actions/profilesettings.php:266
+#: actions/register.php:220
 msgid "Location is too long (maximum 255 characters)."
 msgstr "Der eingegebene Aufenthaltsort ist zu lang (maximal 255 Zeichen)."
 
@@ -708,15 +708,16 @@ msgstr "Ungültiges Alias: „%s“"
 #. TRANS: %s is the alias that is already in use.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error. %s is the already used alias.
-#: actions/apigroupcreate.php:264 actions/editgroup.php:246
-#: actions/newgroup.php:193
+#: actions/apigroupcreate.php:264 actions/apigroupprofileupdate.php:351
+#: actions/editgroup.php:246 actions/newgroup.php:193
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "Benutzername „%s“ wird bereits verwendet. Suche dir einen anderen aus."
 
 #. TRANS: Client error displayed when trying to use an alias during group creation that is the same as the group's nickname.
 #. TRANS: Group edit form validation error.
-#: actions/apigroupcreate.php:278 actions/editgroup.php:253
+#: actions/apigroupcreate.php:278 actions/apigroupprofileupdate.php:359
+#: actions/editgroup.php:253
 msgid "Alias can't be the same as nickname."
 msgstr "Alias kann nicht das gleiche wie der Spitzname sein."
 
@@ -728,7 +729,8 @@ msgstr "Alias kann nicht das gleiche wie der Spitzname sein."
 #. TRANS: Client error displayed requesting most recent notices to a group for a non-existing group.
 #: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
 #: actions/apigroupleave.php:104 actions/apigroupmembership.php:71
-#: actions/apigroupshow.php:81 actions/apitimelinegroup.php:89
+#: actions/apigroupprofileupdate.php:113 actions/apigroupshow.php:81
+#: actions/apitimelinegroup.php:89
 msgid "Group not found."
 msgstr "Gruppe nicht gefunden!"
 
@@ -746,13 +748,11 @@ msgstr "Du bist bereits Mitglied dieser Gruppe"
 msgid "You have been blocked from that group by the admin."
 msgstr "Der Admin dieser Gruppe hat dich blockiert."
 
-#. TRANS: Server error displayed when joining a group fails.
-#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
 #. 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.
 #. TRANS: Message given having failed to add a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:362
+#: actions/apigroupjoin.php:136 actions/joingroup.php:139 lib/command.php:362
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "Konnte Benutzer %1$s nicht der Gruppe %2$s hinzufügen."
@@ -762,8 +762,6 @@ msgstr "Konnte Benutzer %1$s nicht der Gruppe %2$s hinzufügen."
 msgid "You are not a member of this group."
 msgstr "Du bist kein Mitglied dieser Gruppe."
 
-#. TRANS: Server error displayed when leaving a group fails.
-#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
 #. TRANS: Server error displayed when leaving a group failed in the database.
 #. TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
 #. TRANS: Message given having failed to remove a user from a group.
@@ -799,6 +797,63 @@ msgstr "%s Gruppen"
 msgid "groups on %s"
 msgstr "Gruppen von %s"
 
+#. TRANS: Client error displayed trying to edit a group while not being a group admin.
+#. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
+#. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
+#: actions/apigroupprofileupdate.php:118 actions/editgroup.php:110
+#: actions/editgroup.php:176 actions/groupdesignsettings.php:109
+#: actions/grouplogo.php:111
+msgid "You must be an admin to edit the group."
+msgstr "Du musst ein Admin sein, um die Gruppe zu bearbeiten"
+
+#. TRANS: Server error displayed when editing a group fails.
+#: actions/apigroupprofileupdate.php:171 actions/editgroup.php:274
+msgid "Could not update group."
+msgstr "Konnte Gruppe nicht aktualisieren."
+
+#. TRANS: Server error displayed when group aliases could not be added.
+#. TRANS: Server exception thrown when creating group aliases failed.
+#: actions/apigroupprofileupdate.php:194 actions/editgroup.php:281
+#: classes/User_group.php:540
+msgid "Could not create aliases."
+msgstr "Konnte keinen Favoriten erstellen."
+
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: actions/apigroupprofileupdate.php:249 lib/nickname.php:165
+msgid "Nickname must have only lowercase letters and numbers and no spaces."
+msgstr ""
+"Der Benutzername darf nur aus Kleinbuchstaben und Zahlen bestehen. "
+"Leerzeichen sind nicht erlaubt."
+
+#: actions/apigroupprofileupdate.php:286
+#, fuzzy
+msgid "Full name is too long (max 255 chars)."
+msgstr "Der bürgerliche Name ist zu lang (maximal 255 Zeichen)."
+
+#: actions/apigroupprofileupdate.php:296
+#, fuzzy, php-format
+msgid "description is too long (max %d chars)."
+msgstr "Die Beschreibung ist zu lang (max. %d Zeichen)."
+
+#: actions/apigroupprofileupdate.php:307
+#, fuzzy
+msgid "Location is too long (max 255 chars)."
+msgstr "Der eingegebene Aufenthaltsort ist zu lang (maximal 255 Zeichen)."
+
+#: actions/apigroupprofileupdate.php:326
+#, fuzzy, php-format
+msgid "Too many aliases! Maximum %d."
+msgstr "Zu viele Pseudonyme! Maximal eins ist erlaubt."
+
+#. TRANS: Group edit form validation error.
+#. TRANS: Group create form validation error.
+#. TRANS: %s is the invalid alias.
+#: actions/apigroupprofileupdate.php:342 actions/editgroup.php:241
+#: actions/newgroup.php:188
+#, php-format
+msgid "Invalid alias: \"%s\""
+msgstr "Ungültiges Stichwort: „%s“"
+
 #. TRANS: Client error displayed when uploading a media file has failed.
 #: actions/apimediaupload.php:101
 msgid "Upload failed."
@@ -829,21 +884,22 @@ msgstr "Anfrage-Token bereits autorisiert."
 #. TRANS: Form validation error message.
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
+#. TRANS: Client error displayed when the session token is not okay.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
 #: actions/deletenotice.php:177 actions/disfavor.php:75
-#: actions/emailsettings.php:291 actions/favor.php:75 actions/geocode.php:55
+#: actions/emailsettings.php:292 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:65 actions/grouplogo.php:321
-#: actions/groupunblock.php:65 actions/imsettings.php:224
-#: actions/invite.php:60 actions/login.php:137 actions/makeadmin.php:66
-#: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
-#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
-#: actions/othersettings.php:155 actions/passwordsettings.php:138
-#: actions/profilesettings.php:217 actions/recoverpassword.php:383
-#: actions/register.php:172 actions/remotesubscribe.php:76
-#: actions/repeat.php:82 actions/smssettings.php:250 actions/subedit.php:40
-#: actions/subscribe.php:86 actions/tagother.php:166
-#: actions/unsubscribe.php:69 actions/userauthorization.php:52
-#: lib/designsettings.php:310
+#: actions/groupunblock.php:65 actions/imsettings.php:241
+#: actions/invite.php:60 actions/makeadmin.php:66 actions/newmessage.php:135
+#: actions/newnotice.php:105 actions/nudge.php:80
+#: actions/oauthappssettings.php:162 actions/oauthconnectionssettings.php:135
+#: actions/passwordsettings.php:137 actions/pluginenable.php:87
+#: actions/profilesettings.php:218 actions/recoverpassword.php:383
+#: actions/register.php:157 actions/remotesubscribe.php:76
+#: actions/repeat.php:82 actions/smssettings.php:249 actions/subedit.php:40
+#: actions/subscribe.php:87 actions/tagother.php:145
+#: actions/unsubscribe.php:69 actions/urlsettings.php:171
+#: actions/userauthorization.php:53 lib/designsettings.php:122
 msgid "There was a problem with your session token. Try again, please."
 msgstr "Es gab ein Problem mit deinem Sitzungstoken. Bitte versuche es erneut."
 
@@ -871,10 +927,10 @@ msgstr "Datenbankfehler beim Einfügen von oauth_token_association."
 #. TRANS: Unknown form validation error in design settings form.
 #: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
 #: actions/designadminpanel.php:100 actions/editapplication.php:144
-#: actions/emailsettings.php:310 actions/grouplogo.php:332
-#: actions/imsettings.php:239 actions/newapplication.php:124
-#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
-#: actions/smssettings.php:271 lib/designsettings.php:321
+#: actions/emailsettings.php:311 actions/grouplogo.php:332
+#: actions/imsettings.php:256 actions/newapplication.php:124
+#: actions/oauthconnectionssettings.php:144 actions/recoverpassword.php:46
+#: actions/smssettings.php:270 lib/designsettings.php:133
 msgid "Unexpected form submission."
 msgstr "Unerwartete Formulareingabe."
 
@@ -923,31 +979,26 @@ msgstr "Profil"
 
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Field label in form for profile settings.
-#. TRANS: Label for group nickname (dt). Text hidden by default.
-#. TRANS: DT for nick name in a profile.
-#: actions/apioauthauthorize.php:459 actions/login.php:252
-#: actions/profilesettings.php:106 actions/register.php:432
-#: actions/showgroup.php:243 actions/tagother.php:94
+#: actions/apioauthauthorize.php:459 actions/login.php:225
+#: actions/profilesettings.php:107 actions/register.php:411
 #: actions/userauthorization.php:145 lib/groupeditform.php:145
-#: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "Benutzername"
 
 #. TRANS: Field label on OAuth API authorisation form.
-#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:463 actions/login.php:255
-#: actions/register.php:436 lib/accountsettingsaction.php:120
+#: actions/apioauthauthorize.php:463 actions/login.php:228
+#: actions/register.php:415 lib/settingsnav.php:87
 msgid "Password"
 msgstr "Passwort"
 
 #. TRANS: Button text that when clicked will cancel the process of allowing access to an account
 #. TRANS: by an external application.
 #. TRANS: Button label to cancel an e-mail address confirmation procedure.
-#. TRANS: Button label to cancel an Instant Messaging address confirmation procedure.
+#. TRANS: Button label to cancel an IM address confirmation procedure.
 #. TRANS: Button label to cancel a SMS address confirmation procedure.
 #. TRANS: Button label in the "Edit application" form.
-#: actions/apioauthauthorize.php:478 actions/emailsettings.php:124
-#: actions/imsettings.php:127 actions/smssettings.php:133
+#: actions/apioauthauthorize.php:478 actions/emailsettings.php:125
+#: actions/imsettings.php:136 actions/smssettings.php:132
 #: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Cancel"
@@ -1059,7 +1110,7 @@ msgstr "HTTP-Methode wird nicht unterstützt."
 #. TRANS: %s is the requested output format.
 #: actions/apistatusesshow.php:144
 #, fuzzy, php-format
-msgid "Unsupported format: %s"
+msgid "Unsupported format: %s."
 msgstr "Nicht unterstütztes Bildformat: %s"
 
 #. TRANS: Client error displayed requesting a deleted status.
@@ -1147,13 +1198,6 @@ msgstr "%1$s / Favoriten von %2$s"
 msgid "%1$s updates favorited by %2$s / %3$s."
 msgstr "%1$s-Aktualisierungen favorisiert von %2$s / %3$s."
 
-#. TRANS: Server error displayed when generating an Atom feed fails.
-#. TRANS: %s is the error.
-#: actions/apitimelinegroup.php:134
-#, php-format
-msgid "Could not generate feed for group - %s"
-msgstr "Konnte keinen Gruppen-Feed erstellen - %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.
 #: actions/apitimelinementions.php:115
@@ -1170,13 +1214,14 @@ msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr "Nachrichten von %1$s, die auf Nachrichten von %2$s / %3$s antworten."
 
 #. TRANS: Title for site timeline. %s is the StatusNet sitename.
+#. TRANS: Public RSS feed title. %s is the StatusNet site name.
 #: actions/apitimelinepublic.php:193 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "%s öffentliche Zeitleiste"
 
 #. TRANS: Subtitle for site timeline. %s is the StatusNet sitename.
-#: actions/apitimelinepublic.php:199 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:199
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "%s Nachrichten von allen!"
@@ -1187,21 +1232,33 @@ msgid "Unimplemented."
 msgstr "Nicht unterstützte Methode."
 
 #. TRANS: Title for Atom feed "repeated to me". %s is the user nickname.
-#: actions/apitimelineretweetedtome.php:108
+#: actions/apitimelineretweetedtome.php:96
 #, php-format
 msgid "Repeated to %s"
 msgstr "Antworten an %s"
 
+#: actions/apitimelineretweetedtome.php:98
+#, fuzzy, php-format
+msgid "%1$s notices that were to repeated to %2$s / %3$s."
+msgstr "Nachrichten von %1$s, die auf Nachrichten von %2$s / %3$s antworten."
+
 #. TRANS: Title of list of repeated notices of the logged in user.
 #. TRANS: %s is the nickname of the logged in user.
-#: actions/apitimelineretweetsofme.php:112
+#: actions/apitimelineretweetsofme.php:98
 #, php-format
 msgid "Repeats of %s"
 msgstr "Antworten von %s"
 
+#: actions/apitimelineretweetsofme.php:104
+#, fuzzy, php-format
+msgid "%1$s notices that %2$s / %3$s has repeated."
+msgstr "%1$s markierte Nachricht %2$s als Favorit."
+
 #. TRANS: Title for timeline with lastest notices with a given tag.
 #. TRANS: %s is the tag.
-#: actions/apitimelinetag.php:101 actions/tag.php:67
+#. TRANS: Title for first page of notices with tags.
+#. TRANS: %s is the tag.
+#: actions/apitimelinetag.php:101 actions/tag.php:69
 #, php-format
 msgid "Notices tagged with %s"
 msgstr "Mit „%s“ getaggte Nachrichten"
@@ -1214,53 +1271,54 @@ msgid "Updates tagged with %1$s on %2$s!"
 msgstr "Mit „%1$s“ getaggte Nachrichten auf „%2$s“!"
 
 #. TRANS: Client error displayed trying to add a notice to another user's timeline.
-#: actions/apitimelineuser.php:297
+#: actions/apitimelineuser.php:308
 msgid "Only the user can add to their own timeline."
 msgstr "Nur der Benutzer kann Nachrichten in die eigene Timeline hinzufügen."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:304
+#: actions/apitimelineuser.php:315
 msgid "Only accept AtomPub for Atom feeds."
 msgstr "Es wird nur AtomPub als Atom Feed akzeptiert"
 
 #. TRANS: Client error displayed attempting to post an empty API notice.
-#: actions/apitimelineuser.php:311
+#: actions/apitimelineuser.php:322
 msgid "Atom post must not be empty."
 msgstr "Atom Post darf nicht leer sein."
 
 #. TRANS: Client error displayed attempting to post an API that is not well-formed XML.
-#: actions/apitimelineuser.php:317
+#: actions/apitimelineuser.php:328
 msgid "Atom post must be well-formed XML."
 msgstr "Atom Post muss wohlgeformtes XML sein."
 
 #. TRANS: Client error displayed when not using an Atom entry.
-#: actions/apitimelineuser.php:323 actions/atompubfavoritefeed.php:228
+#: actions/apitimelineuser.php:334 actions/atompubfavoritefeed.php:228
 #: actions/atompubmembershipfeed.php:230
 #: actions/atompubsubscriptionfeed.php:236
 msgid "Atom post must be an Atom entry."
 msgstr "Atom-Post muss ein Atom-Eintrag sein."
 
 #. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
-#: actions/apitimelineuser.php:335
+#: actions/apitimelineuser.php:345
 msgid "Can only handle POST activities."
 msgstr "Nur POST verwenden"
 
 #. TRANS: Client error displayed when using an unsupported activity object type.
 #. TRANS: %s is the unsupported activity object type.
-#: actions/apitimelineuser.php:346
+#: actions/apitimelineuser.php:356
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
 #. TRANS: %d is the notice ID (number).
-#: actions/apitimelineuser.php:380
+#: actions/apitimelineuser.php:390
 #, php-format
 msgid "No content for notice %d."
 msgstr "Kein Inhalt für Nachricht %d."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:408
+#. TRANS: %s is the notice URI.
+#: actions/apitimelineuser.php:419
 #, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "Nachricht mit URI „%s“ existiert bereits."
@@ -1277,9 +1335,10 @@ msgstr "API-Methode nicht gefunden."
 
 #. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
 #. TRANS: Client exception.
+#. TRANS: Client error displayed trying to subscribe to a non-existing profile.
 #: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
 #: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
-#: actions/subscribe.php:107
+#: actions/subscribe.php:110
 msgid "No such profile."
 msgstr "Profil nicht gefunden."
 
@@ -1420,7 +1479,7 @@ msgid "Not a member."
 msgstr "Kein Mitglied"
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
-#: actions/atompubshowmembership.php:151
+#: actions/atompubshowmembership.php:150
 #, fuzzy
 msgid "Cannot delete someone else's membership."
 msgstr "Konnte Selbst-Abonnement nicht löschen."
@@ -1509,10 +1568,7 @@ msgid "Invalid size."
 msgstr "Ungültige Größe."
 
 #. TRANS: Title for avatar upload page.
-#. TRANS: Label for group avatar (dt). Text hidden by default.
-#. TRANS: Link description in user account settings menu.
-#: actions/avatarsettings.php:66 actions/showgroup.php:227
-#: lib/accountsettingsaction.php:113
+#: actions/avatarsettings.php:66 lib/settingsnav.php:82
 msgid "Avatar"
 msgstr "Avatar"
 
@@ -1526,9 +1582,11 @@ msgstr ""
 
 #. TRANS: Server error displayed in avatar upload page when no matching profile can be found for a user.
 #. TRANS: Server error displayed coming across a request from a user without a profile.
+#. TRANS: Server error displayed when trying to authorise a remote subscription request
+#. TRANS: while the user has no profile.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
 #: actions/grouplogo.php:184 actions/remotesubscribe.php:190
-#: actions/userauthorization.php:72 actions/userrss.php:108
+#: actions/userauthorization.php:75 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr "Benutzer ohne passendes Profil"
 
@@ -1583,10 +1641,10 @@ msgstr "Zuschneiden"
 msgid "No file uploaded."
 msgstr "Keine Datei hoch geladen."
 
-#. TRANS: Avatar upload form unstruction after uploading a file.
+#. TRANS: Avatar upload form instruction after uploading a file.
 #: actions/avatarsettings.php:345
 #, fuzzy
-msgid "Pick a square area of the image to be your avatar"
+msgid "Pick a square area of the image to be your avatar."
 msgstr ""
 "Wähle eine quadratische Fläche aus dem Bild, um dein Avatar zu speichern"
 
@@ -1613,7 +1671,7 @@ msgstr "Avatar gelöscht."
 
 #. TRANS: Title for backup account page.
 #. TRANS: Option in profile settings to create a backup of the account of the currently logged in user.
-#: actions/backupaccount.php:61 actions/profilesettings.php:467
+#: actions/backupaccount.php:61 actions/profilesettings.php:468
 msgid "Backup account"
 msgstr "Backup-Konto"
 
@@ -1647,7 +1705,7 @@ msgstr "Backup"
 #. TRANS: Title for submit button to backup an account on the backup account page.
 #: actions/backupaccount.php:254
 #, fuzzy
-msgid "Backup your account"
+msgid "Backup your account."
 msgstr "Backup-Konto"
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
@@ -1689,7 +1747,7 @@ msgstr "Nein"
 #. TRANS: Submit button title for 'No' when blocking a user.
 #: actions/block.php:158
 #, fuzzy
-msgid "Do not block this user"
+msgid "Do not block this user."
 msgstr "Diesen Benutzer freigeben"
 
 #. TRANS: Button label on the user block form.
@@ -1706,10 +1764,9 @@ msgid "Yes"
 msgstr "Ja"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#. TRANS: Description of the form to block a user.
-#: actions/block.php:165 lib/blockform.php:79
-msgid "Block this user"
-msgstr "Diesen Benutzer blockieren"
+#: actions/block.php:165
+msgid "Block this user."
+msgstr "Diesen Benutzer blockieren."
 
 #. TRANS: Server error displayed when blocking a user fails.
 #: actions/block.php:189
@@ -1774,31 +1831,47 @@ msgstr "Bestätigungscode nicht gefunden."
 msgid "That confirmation code is not for you!"
 msgstr "Dieser Bestätigungscode ist nicht für dich!"
 
-#. TRANS: Server error for a unknow address type %s, which can be 'email', 'jabber', or 'sms'.
-#: actions/confirmaddress.php:92
-#, php-format
-msgid "Unrecognized address type %s."
+#. TRANS: Server error for an unknown address type, which can be 'email', 'sms', or the name of an IM network (such as 'xmpp' or 'aim')
+#: actions/confirmaddress.php:94
+#, fuzzy, php-format
+msgid "Unrecognized address type %s"
 msgstr "Nicht erkannter Adresstyp %s"
 
 #. TRANS: Client error for an already confirmed email/jabber/sms address.
-#: actions/confirmaddress.php:97
+#: actions/confirmaddress.php:103 actions/confirmaddress.php:136
 msgid "That address has already been confirmed."
 msgstr "Diese Adresse wurde bereits bestätigt."
 
+#: actions/confirmaddress.php:121 actions/imsettings.php:444
+#: actions/userdesignsettings.php:306
+#, fuzzy
+msgid "Couldn't update user."
+msgstr "Konnte Benutzerdaten nicht aktualisieren."
+
+#: actions/confirmaddress.php:144
+#, fuzzy
+msgid "Couldn't update user im preferences."
+msgstr "Konnte Benutzereintrag nicht schreiben"
+
+#: actions/confirmaddress.php:156
+#, fuzzy
+msgid "Couldn't insert user im preferences."
+msgstr "Konnte neues Abonnement nicht eintragen."
+
 #. TRANS: Server error displayed when an address confirmation code deletion from the
 #. TRANS: database fails in the contact address confirmation action.
-#: actions/confirmaddress.php:132
+#: actions/confirmaddress.php:169
 msgid "Could not delete address confirmation."
 msgstr "Konnte Adressen-Bestätigung nicht löschen."
 
 #. TRANS: Title for the contact address confirmation action.
-#: actions/confirmaddress.php:150
+#: actions/confirmaddress.php:185
 msgid "Confirm address"
 msgstr "Adresse bestätigen"
 
 #. TRANS: Success message for the contact address confirmation action.
 #. TRANS: %s can be 'email', 'jabber', or 'sms'.
-#: actions/confirmaddress.php:166
+#: actions/confirmaddress.php:200
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "Die Adresse „%s“ wurde für dein Konto bestätigt."
@@ -1812,6 +1885,7 @@ msgstr "Unterhaltung"
 #. TRANS: Label for user statistics.
 #: actions/conversation.php:149 lib/noticelist.php:87
 #: lib/profileaction.php:246 lib/searchgroupnav.php:82
+#: lib/threadednoticelist.php:66
 msgid "Notices"
 msgstr "Nachrichten"
 
@@ -1845,7 +1919,7 @@ msgstr "Konto gelöscht."
 
 #. TRANS: Page title for page on which a user account can be deleted.
 #. TRANS: Option in profile settings to delete the account of the currently logged in user.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:475
+#: actions/deleteaccount.php:228 actions/profilesettings.php:476
 msgid "Delete account"
 msgstr "Konto löschen"
 
@@ -1868,7 +1942,7 @@ msgstr ""
 #. TRANS: Field label for delete account confirmation entry.
 #. TRANS: Field label for password reset form where the password has to be typed again.
 #: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:262 actions/register.php:440
+#: actions/recoverpassword.php:262 actions/register.php:419
 msgid "Confirm"
 msgstr "Bestätigen"
 
@@ -1898,14 +1972,14 @@ msgstr "Programm nicht gefunden."
 #. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
 #: actions/deleteapplication.php:79 actions/editapplication.php:78
-#: actions/showapplication.php:94
+#: actions/showapplication.php:90
 msgid "You are not the owner of this application."
 msgstr "Du bist Besitzer dieses Programms"
 
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
-#: actions/newapplication.php:112 actions/showapplication.php:118
-#: lib/action.php:1425
+#: actions/newapplication.php:112 actions/showapplication.php:113
+#: lib/action.php:1391
 msgid "There was a problem with your session token."
 msgstr "Es gab ein Problem mit deinem Sessiontoken."
 
@@ -1928,13 +2002,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting an application.
 #: actions/deleteapplication.php:161
 #, fuzzy
-msgid "Do not delete this application"
+msgid "Do not delete this application."
 msgstr "Dieses Programm nicht löschen"
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
 #: actions/deleteapplication.php:167
 #, fuzzy
-msgid "Delete this application"
+msgid "Delete this application."
 msgstr "Programm löschen"
 
 #. TRANS: Client error when trying to delete group while not logged in.
@@ -1989,13 +2063,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting a group.
 #: actions/deletegroup.php:224
 #, fuzzy
-msgid "Do not delete this group"
+msgid "Do not delete this group."
 msgstr "Diese Gruppe nicht löschen"
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
 #: actions/deletegroup.php:231
 #, fuzzy
-msgid "Delete this group"
+msgid "Delete this group."
 msgstr "Diese Gruppe löschen"
 
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
@@ -2003,14 +2077,16 @@ msgstr "Diese Gruppe löschen"
 #. TRANS: Client error displayed when trying to mark a notice as favorite without being logged in.
 #. TRANS: Client error displayed trying to block a user from a group while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
+#. TRANS: Client error displayed trying to log out when not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
+#. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
 #. TRANS: Client error displayed when trying to change user options while not logged in.
 #: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
-#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:69
+#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:70
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
-#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
-#: actions/tagother.php:33 actions/unsubscribe.php:52
+#: actions/nudge.php:63 actions/pluginenable.php:97 actions/subedit.php:33
+#: actions/subscribe.php:98 actions/tagother.php:33 actions/unsubscribe.php:52
 #: lib/adminpanelaction.php:71 lib/profileformaction.php:63
 #: lib/settingsaction.php:72
 msgid "Not logged in."
@@ -2039,12 +2115,13 @@ msgstr "Bist du sicher, dass du diese Nachricht löschen möchtest?"
 #. TRANS: Submit button title for 'No' when deleting a notice.
 #: actions/deletenotice.php:159
 #, fuzzy
-msgid "Do not delete this notice"
+msgid "Do not delete this notice."
 msgstr "Diese Nachricht nicht löschen"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:166 lib/noticelist.php:673
-msgid "Delete this notice"
+#: actions/deletenotice.php:166
+#, fuzzy
+msgid "Delete this notice."
 msgstr "Nachricht löschen"
 
 #. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
@@ -2080,18 +2157,17 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting a user.
 #: actions/deleteuser.php:158
 #, fuzzy
-msgid "Do not delete this user"
+msgid "Do not delete this user."
 msgstr "Diesen Benutzer nicht löschen"
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
-#. TRANS: Description of form for deleting a user.
-#: actions/deleteuser.php:165 lib/deleteuserform.php:75
-msgid "Delete this user"
+#: actions/deleteuser.php:165
+#, fuzzy
+msgid "Delete this user."
 msgstr "Diesen Benutzer löschen"
 
 #. TRANS: Message used as title for design settings for the site.
-#. TRANS: Link description in user account settings menu.
-#: actions/designadminpanel.php:60 lib/accountsettingsaction.php:134
+#: actions/designadminpanel.php:60 lib/settingsnav.php:97
 msgid "Design"
 msgstr "Design"
 
@@ -2158,8 +2234,7 @@ msgid "You can upload a custom StatusNet theme as a .ZIP archive."
 msgstr "Du kannst ein angepasstes StatusNet-Theme als .ZIP-Archiv hochladen."
 
 #. TRANS: Fieldset legend for theme background image.
-#. TRANS: Fieldset legend on profile design page.
-#: actions/designadminpanel.php:515 lib/designsettings.php:98
+#: actions/designadminpanel.php:515
 msgid "Change background image"
 msgstr "Hintergrundbild ändern"
 
@@ -2167,7 +2242,7 @@ msgstr "Hintergrundbild ändern"
 #. TRANS: Field label for background color selector.
 #. TRANS: Label on profile design page for setting a profile page background colour.
 #: actions/designadminpanel.php:525 actions/designadminpanel.php:609
-#: lib/designsettings.php:183
+#: lib/designform.php:238
 msgid "Background"
 msgstr "Hintergrund"
 
@@ -2194,13 +2269,13 @@ msgstr "Aus"
 #. TRANS: Form guide for turning background image on or off on theme designer page.
 #. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
 #. TRANS: use of the uploaded profile image.
-#: actions/designadminpanel.php:577 lib/designsettings.php:159
+#: actions/designadminpanel.php:577 lib/designform.php:214
 msgid "Turn background image on or off."
 msgstr "Hintergrundbild ein- oder ausschalten."
 
 #. TRANS: Checkbox label to title background image on theme designer page.
 #. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-#: actions/designadminpanel.php:583 lib/designsettings.php:165
+#: actions/designadminpanel.php:583 lib/designform.php:220
 msgid "Tile background image"
 msgstr "Hintergrundbild kacheln"
 
@@ -2211,25 +2286,25 @@ msgstr "Farben ändern"
 
 #. TRANS: Field label for content color selector.
 #. TRANS: Label on profile design page for setting a profile page content colour.
-#: actions/designadminpanel.php:623 lib/designsettings.php:197
+#: actions/designadminpanel.php:623 lib/designform.php:252
 msgid "Content"
 msgstr "Inhalt"
 
 #. TRANS: Field label for sidebar color selector.
 #. TRANS: Label on profile design page for setting a profile page sidebar colour.
-#: actions/designadminpanel.php:637 lib/designsettings.php:211
+#: actions/designadminpanel.php:637 lib/designform.php:266
 msgid "Sidebar"
 msgstr "Seitenleiste"
 
 #. TRANS: Field label for text color selector.
 #. TRANS: Label on profile design page for setting a profile page text colour.
-#: actions/designadminpanel.php:651 lib/designsettings.php:225
+#: actions/designadminpanel.php:651 lib/designform.php:280
 msgid "Text"
 msgstr "Text"
 
 #. TRANS: Field label for link color selector.
 #. TRANS: Label on profile design page for setting a profile page links colour.
-#: actions/designadminpanel.php:665 lib/designsettings.php:239
+#: actions/designadminpanel.php:665 lib/designform.php:294
 msgid "Links"
 msgstr "Links"
 
@@ -2251,21 +2326,21 @@ msgid "Use defaults"
 msgstr "Standardeinstellungen benutzen"
 
 #. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: actions/designadminpanel.php:720 lib/designsettings.php:259
-msgid "Restore default designs"
+#: actions/designadminpanel.php:720
+#, fuzzy
+msgid "Restore default designs."
 msgstr "Standard-Design wiederherstellen"
 
 #. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: actions/designadminpanel.php:728 lib/designsettings.php:267
-msgid "Reset back to default"
+#: actions/designadminpanel.php:728
+#, fuzzy
+msgid "Reset back to default."
 msgstr "Standard wiederherstellen"
 
 #. TRANS: Title for button for saving theme settings.
-#. TRANS: Title for button on profile design page to save settings.
-#: actions/designadminpanel.php:736 lib/designsettings.php:272
-msgid "Save design"
+#: actions/designadminpanel.php:736
+#, fuzzy
+msgid "Save design."
 msgstr "Design speichern"
 
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
@@ -2297,7 +2372,7 @@ msgid "You must be logged in to edit an application."
 msgstr "Du musst angemeldet sein, um eine Anwendung zu bearbeiten."
 
 #. TRANS: Client error displayed trying to edit an application that does not exist.
-#: actions/editapplication.php:83 actions/showapplication.php:87
+#: actions/editapplication.php:83 actions/showapplication.php:83
 msgid "No such application."
 msgstr "Anwendung nicht bekannt."
 
@@ -2389,80 +2464,53 @@ msgstr "Gruppe %s bearbeiten"
 msgid "You must be logged in to create a group."
 msgstr "Du musst angemeldet sein, um eine Gruppe zu erstellen."
 
-#. TRANS: Client error displayed trying to edit a group while not being a group admin.
-#. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
-#. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
-#: actions/editgroup.php:110 actions/editgroup.php:176
-#: actions/groupdesignsettings.php:109 actions/grouplogo.php:111
-msgid "You must be an admin to edit the group."
-msgstr "Du musst ein Admin sein, um die Gruppe zu bearbeiten"
-
 #. TRANS: Form instructions for group edit form.
 #: actions/editgroup.php:161
 msgid "Use this form to edit the group."
 msgstr "Benutze dieses Formular, um die Gruppe zu bearbeiten."
 
-#. TRANS: Group edit form validation error.
-#. TRANS: Group create form validation error.
-#. TRANS: %s is the invalid alias.
-#: actions/editgroup.php:241 actions/newgroup.php:188
-#, php-format
-msgid "Invalid alias: \"%s\""
-msgstr "Ungültiges Stichwort: „%s“"
-
-#. TRANS: Server error displayed when editing a group fails.
-#: actions/editgroup.php:274
-msgid "Could not update group."
-msgstr "Konnte Gruppe nicht aktualisieren."
-
-#. TRANS: Server error displayed when group aliases could not be added.
-#. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/editgroup.php:281 classes/User_group.php:540
-msgid "Could not create aliases."
-msgstr "Konnte keinen Favoriten erstellen."
-
 #. TRANS: Group edit form success message.
 #: actions/editgroup.php:301
 msgid "Options saved."
 msgstr "Einstellungen gespeichert."
 
 #. TRANS: Title for e-mail settings.
-#: actions/emailsettings.php:59
+#: actions/emailsettings.php:60
 msgid "Email settings"
 msgstr "E-Mail-Einstellungen"
 
 #. TRANS: E-mail settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/emailsettings.php:73
+#: actions/emailsettings.php:74
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 msgstr "Einstellen, wie und wann du E-Mails von %%site.name%% bekommst."
 
 #. TRANS: Form legend for e-mail settings form.
 #. TRANS: Field label for e-mail address input in e-mail settings form.
-#: actions/emailsettings.php:103 actions/emailsettings.php:129
+#: actions/emailsettings.php:104 actions/emailsettings.php:130
 msgid "Email address"
 msgstr "E-Mail-Adresse"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:109
+#: actions/emailsettings.php:110
 msgid "Current confirmed email address."
 msgstr "Aktuelle bestätigte E-Mail-Adresse."
 
 #. TRANS: Button label to remove a confirmed e-mail address.
 #. TRANS: Button label for removing a set sender e-mail address to post notices from.
-#. TRANS: Button label to remove a confirmed Instant Messaging address.
+#. TRANS: Button label to remove a confirmed IM address.
 #. TRANS: Button label to remove a confirmed SMS address.
 #. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
-#: actions/emailsettings.php:112 actions/emailsettings.php:179
-#: actions/imsettings.php:112 actions/smssettings.php:120
-#: actions/smssettings.php:176
+#: actions/emailsettings.php:113 actions/emailsettings.php:180
+#: actions/imsettings.php:119 actions/smssettings.php:119
+#: actions/smssettings.php:175
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Entfernen"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:119
+#: actions/emailsettings.php:120
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -2475,46 +2523,46 @@ msgstr ""
 #. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
 #. TRANS: Any other domain may be owned by a legitimate person or
 #. TRANS: organization.
-#: actions/emailsettings.php:136
+#: actions/emailsettings.php:137
 msgid "Email address, like \"UserName@example.org\""
 msgstr "E-Mail-Adresse, beispielsweise „Benutzername@example.org“"
 
 #. TRANS: Button label for adding an e-mail address in e-mail settings form.
-#. TRANS: Button label for adding an Instant Messaging address in Instant Messaging settings form.
+#. TRANS: Button label for adding an IM address in IM settings form.
 #. TRANS: Button label for adding a SMS phone number in SMS settings form.
-#: actions/emailsettings.php:140 actions/imsettings.php:147
-#: actions/smssettings.php:158
+#: actions/emailsettings.php:141 actions/imsettings.php:147
+#: actions/smssettings.php:157
 msgctxt "BUTTON"
 msgid "Add"
 msgstr "Hinzufügen"
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:148 actions/smssettings.php:167
+#: actions/emailsettings.php:149 actions/smssettings.php:166
 msgid "Incoming email"
 msgstr "Eingehende E-Mail"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:154
+#: actions/emailsettings.php:155
 msgid "I want to post notices by email."
 msgstr "Ich möchte Einträge per E-Mail veröffentlichen."
 
 #. TRANS: Form instructions for incoming e-mail form in e-mail settings.
 #. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
-#: actions/emailsettings.php:176 actions/smssettings.php:174
+#: actions/emailsettings.php:177 actions/smssettings.php:173
 msgid "Send email to this address to post new notices."
 msgstr "Schicke eine E-Mail an diese Adresse um eine Nachricht zu posten."
 
 #. TRANS: Instructions for incoming e-mail address input form, when an address has already been assigned.
 #. TRANS: Instructions for incoming SMS e-mail address input form.
-#: actions/emailsettings.php:185 actions/smssettings.php:182
+#: actions/emailsettings.php:186 actions/smssettings.php:181
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr ""
 "Neue E-Mail-Adresse für Postings aktivieren; die alte wird automatisch "
 "deaktiviert."
 
 #. TRANS: Instructions for incoming e-mail address input form.
-#: actions/emailsettings.php:189
+#: actions/emailsettings.php:190
 msgid ""
 "To send notices via email, we need to create a unique email address for you "
 "on this server:"
@@ -2522,91 +2570,91 @@ msgstr ""
 
 #. TRANS: Button label for adding an e-mail address to send notices from.
 #. TRANS: Button label for adding an SMS e-mail address to send notices from.
-#: actions/emailsettings.php:195 actions/smssettings.php:185
+#: actions/emailsettings.php:196 actions/smssettings.php:184
 msgctxt "BUTTON"
 msgid "New"
 msgstr "Neu"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:204
+#: actions/emailsettings.php:205
 msgid "Email preferences"
 msgstr "E-Mail Einstellungen"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:212
+#: actions/emailsettings.php:213
 msgid "Send me notices of new subscriptions through email."
 msgstr "Informiere mich über neues Abonnements per E-Mail."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:218
+#: actions/emailsettings.php:219
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr ""
 "Mir eine E-Mail schicken, wenn jemand meine Nachricht als Favorit speichert."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:225
+#: actions/emailsettings.php:226
 msgid "Send me email when someone sends me a private message."
 msgstr ""
 "Mir eine E-Mail schicken, wenn mir jemand eine private Nachricht schickt."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:231
+#: actions/emailsettings.php:232
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr "Schick mir eine E-Mail, wenn mir jemand eine @Nachricht schickt."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:237
+#: actions/emailsettings.php:238
 msgid "Allow friends to nudge me and send me an email."
 msgstr "Erlaube Freunden mich zu stupsen und mir E-Mails zu senden."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:243
+#: actions/emailsettings.php:244
 msgid "Publish a MicroID for my email address."
 msgstr "MicroID für meine E-Mail-Adresse veröffentlichen."
 
 #. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:361
+#: actions/emailsettings.php:362
 msgid "Email preferences saved."
 msgstr "E-Mail-Einstellungen gespeichert."
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:380
+#: actions/emailsettings.php:381
 msgid "No email address."
 msgstr "Keine E-Mail-Adresse."
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:388
+#: actions/emailsettings.php:389
 #, fuzzy
 msgid "Cannot normalize that email address."
 msgstr "Konnte diese E-Mail-Adresse nicht normalisieren"
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:393 actions/register.php:212
+#: actions/emailsettings.php:394 actions/register.php:197
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "Ungültige E-Mail-Adresse."
 
 #. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:397
+#: actions/emailsettings.php:398
 msgid "That is already your email address."
 msgstr "Dies ist bereits deine E-Mail-Adresse."
 
 #. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:401
+#: actions/emailsettings.php:402
 msgid "That email address already belongs to another user."
 msgstr "Diese E-Mail-Adresse gehört bereits einem anderen Benutzer."
 
 #. TRANS: Server error thrown on database error adding e-mail confirmation code.
 #. TRANS: Server error thrown on database error adding Instant Messaging confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:418 actions/imsettings.php:343
-#: actions/smssettings.php:365
+#: actions/emailsettings.php:419 actions/imsettings.php:362
+#: actions/smssettings.php:364
 #, fuzzy
 msgid "Could not insert confirmation code."
 msgstr "Konnte keinen Bestätigungscode einfügen."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:425
+#: actions/emailsettings.php:426
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
@@ -2618,59 +2666,62 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling Instant Messaging address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:445 actions/imsettings.php:377
-#: actions/smssettings.php:399
+#: actions/emailsettings.php:446 actions/imsettings.php:391
+#: actions/smssettings.php:398
 msgid "No pending confirmation to cancel."
 msgstr "Keine ausstehende Bestätigung, die abgebrochen werden kann."
 
 #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:450
+#: actions/emailsettings.php:451
 msgid "That is the wrong email address."
 msgstr "Dies ist die falsche E-Mail Adresse"
 
 #. TRANS: Server error thrown on database error canceling e-mail address confirmation.
 #. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
-#: actions/emailsettings.php:459 actions/smssettings.php:413
+#: actions/emailsettings.php:460 actions/smssettings.php:412
 #, fuzzy
 msgid "Could not delete email confirmation."
 msgstr "Konnte E-Mail-Bestätigung nicht löschen."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:464
+#: actions/emailsettings.php:465
 msgid "Email confirmation cancelled."
 msgstr "E-Mail-Bestätigung abgebrochen."
 
 #. TRANS: Message given trying to remove an e-mail address that is not
 #. TRANS: registered for the active user.
-#: actions/emailsettings.php:483
+#: actions/emailsettings.php:484
 msgid "That is not your email address."
 msgstr "Dies ist nicht deine E-Mail-Adresse."
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:504
+#: actions/emailsettings.php:505
 msgid "The email address was removed."
 msgstr "Die E-Mail-Adresse wurde entfernt."
 
 #. TRANS: Form validation error displayed when trying to remove an incoming e-mail address while no address has been set.
-#: actions/emailsettings.php:518 actions/smssettings.php:555
+#: actions/emailsettings.php:519 actions/smssettings.php:554
 msgid "No incoming email address."
 msgstr "Keine Eingangs-E-Mail-Adresse."
 
 #. TRANS: Server error thrown on database error removing incoming e-mail address.
 #. TRANS: Server error thrown on database error adding incoming e-mail address.
-#: actions/emailsettings.php:530 actions/emailsettings.php:554
-#: actions/smssettings.php:565 actions/smssettings.php:588
+#. TRANS: Server error displayed when the user could not be updated in SMS settings.
+#: actions/emailsettings.php:531 actions/emailsettings.php:555
+#: actions/smssettings.php:565 actions/smssettings.php:590
 #, fuzzy
 msgid "Could not update user record."
 msgstr "Konnte Benutzereintrag nicht schreiben"
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:534 actions/smssettings.php:568
+#. TRANS: Confirmation text after updating SMS settings.
+#: actions/emailsettings.php:535 actions/smssettings.php:569
 msgid "Incoming email address removed."
 msgstr "Eingehende E-Mail-Adresse entfernt"
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:558 actions/smssettings.php:591
+#. TRANS: Confirmation text after updating SMS settings.
+#: actions/emailsettings.php:559 actions/smssettings.php:594
 msgid "New incoming email address added."
 msgstr "Neue Eingangs-E-Mail-Adresse hinzugefügt."
 
@@ -2682,7 +2733,7 @@ msgstr "Diese Nachricht ist bereits ein Favorit!"
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
 #: actions/favor.php:95
 #, fuzzy
-msgid "Disfavor favorite"
+msgid "Disfavor favorite."
 msgstr "Aus Favoriten entfernen"
 
 #. TRANS: Page title for first page of favorited notices.
@@ -2735,9 +2786,8 @@ msgstr ""
 #. TRANS: %s is a user's nickname.
 #. TRANS: Title for first page of favourite notices of a user.
 #. TRANS: %s is the user for whom the favourite notices are displayed.
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing own favourited notices.
 #: actions/favoritesrss.php:111 actions/showfavorites.php:76
-#: lib/personalgroupnav.php:122
+#: lib/personalgroupnav.php:110
 #, php-format
 msgid "%s's favorite notices"
 msgstr "%ss favorisierte Nachrichten"
@@ -2924,13 +2974,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
 #: actions/groupblock.php:191
 #, fuzzy
-msgid "Do not block this user from this group"
+msgid "Do not block this user from this group."
 msgstr "Diesen Benutzerzugang nicht für diese Gruppe blockieren."
 
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
 #: actions/groupblock.php:198
 #, fuzzy
-msgid "Block this user from this group"
+msgid "Block this user from this group."
 msgstr "Diesen Benutzer von der Gruppe blockieren"
 
 #. TRANS: Server error displayed when trying to block a user from a group fails because of an application error.
@@ -2940,6 +2990,7 @@ msgstr ""
 "Datenbankfehler beim Versuch den Benutzer aus der Gruppe zu blockieren."
 
 #. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
+#. TRANS: Client error displayed trying to find a user by ID without providing an ID.
 #: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr "Keine ID"
@@ -2970,7 +3021,7 @@ msgid "Unable to update your design settings."
 msgstr "Konnte Twitter-Einstellungen nicht speichern."
 
 #. TRANS: Form text to confirm saved group design settings.
-#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:222
+#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:239
 msgid "Design preferences saved."
 msgstr "Design-Einstellungen gespeichert."
 
@@ -3035,7 +3086,7 @@ msgid "A list of the users in this group."
 msgstr "Liste der Benutzer in dieser Gruppe."
 
 #. TRANS: Indicator in group members list that this user is a group administrator.
-#: actions/groupmembers.php:190
+#: actions/groupmembers.php:190 lib/action.php:581
 msgid "Admin"
 msgstr "Admin"
 
@@ -3128,8 +3179,10 @@ msgid "Group search"
 msgstr "Gruppen-Suche"
 
 #. TRANS: Text on page where groups can be searched if no results were found for a query.
-#: actions/groupsearch.php:82 actions/noticesearch.php:117
-#: actions/peoplesearch.php:83
+#. TRANS: Text for notice search results is the query had no results.
+#. TRANS: Message on the "People search" page where a query has no results.
+#: actions/groupsearch.php:82 actions/noticesearch.php:122
+#: actions/peoplesearch.php:87
 msgid "No results."
 msgstr "Keine Ergebnisse."
 
@@ -3166,169 +3219,171 @@ msgid "User is not blocked from group."
 msgstr "Dieser Benutzer ist nicht von der Gruppe blockiert."
 
 #. TRANS: Server error displayed when unblocking a user from a group fails because of an unknown error.
+#. TRANS: Server error displayed when removing a user block.
 #: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "Fehler beim Freigeben des Benutzers."
 
 #. TRANS: Title for Instant Messaging settings.
-#: actions/imsettings.php:58
+#: actions/imsettings.php:56
 msgid "IM settings"
 msgstr "IM-Einstellungen"
 
 #. 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.
-#: actions/imsettings.php:71
+#: actions/imsettings.php:69
 #, fuzzy, php-format
 msgid ""
-"You can send and receive notices through Jabber/Google Talk [instant "
-"messages](%%doc.im%%). Configure your address and settings below."
+"You can send and receive notices through instant messaging [instant messages]"
+"(%%doc.im%%). Configure your addresses and settings below."
 msgstr ""
 "Du kannst Nachrichten mittels [Jabber/GTalk IM](%%doc.im%%) empfangen und "
 "senden. Stelle deine Adresse und Einstellungen unten ein."
 
-#. TRANS: Message given in the Instant Messaging settings if XMPP is not enabled on the site.
+#. TRANS: Message given in the IM settings if IM is not enabled on the site.
 #: actions/imsettings.php:90
 msgid "IM is not available."
 msgstr "IM ist nicht verfügbar."
 
-#. TRANS: Form legend for Instant Messaging settings form.
-#. TRANS: Field label for Instant Messaging address input in Instant Messaging settings form.
-#: actions/imsettings.php:102 actions/imsettings.php:132
-msgid "IM address"
-msgstr "IM-Adresse"
+#: actions/imsettings.php:116
+#, fuzzy, php-format
+msgid "Current confirmed %s address."
+msgstr "Aktuelle bestätigte E-Mail-Adresse."
 
-#: actions/imsettings.php:109
-#, fuzzy
-msgid "Current confirmed Jabber/Google Talk address."
-msgstr "Aktuelle bestätigte Jabber/GTalk-Adresse"
-
-#. TRANS: Form note in Instant Messaging settings form.
-#. TRANS: %s is the Instant Messaging address set for the site.
-#: actions/imsettings.php:120
+#. TRANS: Form note in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:128
 #, fuzzy, php-format
 msgid ""
-"Awaiting confirmation on this address. Check your Jabber/Google Talk account "
-"for a message with further instructions. (Did you add %s to your buddy list?)"
+"Awaiting confirmation on this address. Check your %s account for a message "
+"with further instructions. (Did you add %s to your buddy list?)"
 msgstr ""
 "Warte auf Bestätigung dieser Adresse. Eine Nachricht mit weiteren Anweisung "
 "sollte in deinem Jabber/GTalk-Konto eingehen. (Hast du %s zu deiner "
 "Freundesliste hinzugefügt?)"
 
-#. TRANS: IM address input field instructions in Instant Messaging settings form.
-#. TRANS: %s is the Instant Messaging address set for the site.
-#. TRANS: Do not translate "example.org". It is one of the domain names reserved for use in examples by
-#. TRANS: http://www.rfc-editor.org/rfc/rfc2606.txt. Any other domain may be owned by a legitimate
-#. TRANS: person or organization.
-#: actions/imsettings.php:139
-#, fuzzy, php-format
-msgid ""
-"Jabber or Google Talk address, like \"UserName@example.org\". First, make "
-"sure to add %s to your buddy list in your IM client or on Google Talk."
-msgstr ""
-"Jabber- oder GoogleTalk-Adresse, beispielsweise „Benutzername@example.org“. "
-"Aber versichere dich zuerst, dass du %s in deine Kontaktliste in deinem IM-"
-"Programm oder GTalk aufgenommen hast."
+#: actions/imsettings.php:140
+msgid "IM address"
+msgstr "IM-Adresse"
 
-#. TRANS: Form legend for Instant Messaging preferences form.
-#: actions/imsettings.php:154
-msgid "IM preferences"
+#: actions/imsettings.php:142
+#, php-format
+msgid "%s screenname."
+msgstr ""
+
+#. TRANS: Header for IM preferences form.
+#: actions/imsettings.php:163
+#, fuzzy
+msgid "IM Preferences"
 msgstr "IM-Einstellungen"
 
-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:159
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:174
 #, fuzzy
-msgid "Send me notices through Jabber/Google Talk."
-msgstr "Schicke mir Nachrichten mittels Jabber/GTalk."
+msgid "Send me notices"
+msgstr "Nachricht senden"
 
-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:165
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:176
 #, fuzzy
-msgid "Post a notice when my Jabber/Google Talk status changes."
+msgid "Post a notice when my status changes."
 msgstr "Schicke eine Nachricht, wenn sich mein Jabber/GTalk-Status verändert."
 
-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:171
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:178
 #, fuzzy
-msgid ""
-"Send me replies through Jabber/Google Talk from people I'm not subscribed to."
+msgid "Send me replies from people I'm not subscribed to."
 msgstr ""
 "Schicke mir Antworten von Leuten, die ich nicht abonniert habe, mit Jabber/"
 "GTalk."
 
-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:178
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:181
 #, fuzzy
-msgid "Publish a MicroID for my Jabber/Google Talk address."
-msgstr "MicroID für meine Jabber/GTalk-Adresse veröffentlichen."
+msgid "Publish a MicroID"
+msgstr "MicroID für meine E-Mail-Adresse veröffentlichen."
 
-#. TRANS: Confirmation message for successful Instant Messaging preferences save.
-#: actions/imsettings.php:283 actions/othersettings.php:192
+#. TRANS: Server error thrown on database error updating IM preferences.
+#: actions/imsettings.php:291
+#, fuzzy
+msgid "Couldn't update IM preferences."
+msgstr "Konnte Benutzerdaten nicht aktualisieren."
+
+#. TRANS: Confirmation message for successful IM preferences save.
+#. TRANS: Confirmation message after saving preferences.
+#: actions/imsettings.php:298 actions/urlsettings.php:244
 msgid "Preferences saved."
 msgstr "Einstellungen gesichert."
 
-#. TRANS: Message given saving Instant Messaging address without having provided one.
-#: actions/imsettings.php:304
-msgid "No Jabber ID."
-msgstr "Keine Jabber-ID"
-
-#. TRANS: Message given saving Instant Messaging address that cannot be normalised.
-#: actions/imsettings.php:312
+#. TRANS: Message given saving IM address without having provided one.
+#: actions/imsettings.php:320
 #, fuzzy
-msgid "Cannot normalize that Jabber ID."
+msgid "No screenname."
+msgstr "Kein Benutzername."
+
+#: actions/imsettings.php:325
+#, fuzzy
+msgid "No transport."
+msgstr "Keine Nachricht"
+
+#. TRANS: Message given saving IM address that cannot be normalised.
+#: actions/imsettings.php:333
+#, fuzzy
+msgid "Cannot normalize that screenname"
 msgstr "Konnte diese Jabber-ID nicht normalisieren"
 
-#. TRANS: Message given saving Instant Messaging address that not valid.
-#: actions/imsettings.php:317
+#. TRANS: Message given saving IM address that not valid.
+#: actions/imsettings.php:340
 #, fuzzy
-msgid "Not a valid Jabber ID."
-msgstr "Ungültige Jabber-ID"
+msgid "Not a valid screenname"
+msgstr "Ungültiger Benutzername."
 
-#. TRANS: Message given saving Instant Messaging address that is already set.
-#: actions/imsettings.php:321
-msgid "That is already your Jabber ID."
-msgstr "Diese Jabber-ID hast du schon angegeben."
-
-#. TRANS: Message given saving Instant Messaging address that is already set for another user.
-#: actions/imsettings.php:325
-msgid "Jabber ID already belongs to another user."
+#. TRANS: Message given saving IM address that is already set for another user.
+#: actions/imsettings.php:344
+#, fuzzy
+msgid "Screenname already belongs to another user."
 msgstr "Diese Jabber-ID wird bereits von einem anderen Benutzer verwendet."
 
-#. TRANS: Message given saving valid Instant Messaging address that is to be confirmed.
-#. TRANS: %s is the Instant Messaging address set for the site.
-#: actions/imsettings.php:353
-#, php-format
-msgid ""
-"A confirmation code was sent to the IM address you added. You must approve %"
-"s for sending messages to you."
+#. TRANS: Message given saving valid IM address that is to be confirmed.
+#: actions/imsettings.php:369
+#, fuzzy
+msgid "A confirmation code was sent to the IM address you added."
 msgstr ""
 "Ein Bestätigungscode wurde an die IM-Adresse geschickt, die du hinzugefügt "
 "hast. Du musst zulassen, dass %s dir Nachrichten schicken darf."
 
-#. TRANS: Message given canceling Instant Messaging address confirmation for the wrong IM address.
-#: actions/imsettings.php:382
+#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#: actions/imsettings.php:396
 msgid "That is the wrong IM address."
 msgstr "Das ist die falsche IM-Adresse."
 
-#. TRANS: Server error thrown on database error canceling Instant Messaging address confirmation.
-#: actions/imsettings.php:391
+#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#: actions/imsettings.php:405
 #, fuzzy
-msgid "Could not delete IM confirmation."
+msgid "Couldn't delete confirmation."
 msgstr "Konnte die IM-Bestätigung nicht löschen."
 
-#. TRANS: Message given after successfully canceling Instant Messaging address confirmation.
-#: actions/imsettings.php:396
+#. TRANS: Message given after successfully canceling IM address confirmation.
+#: actions/imsettings.php:410
 msgid "IM confirmation cancelled."
 msgstr "IM-Bestätigung abgebrochen."
 
-#. TRANS: Message given trying to remove an Instant Messaging address that is not
+#. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.
-#: actions/imsettings.php:417
-msgid "That is not your Jabber ID."
-msgstr "Dies ist nicht deine Jabber-ID."
+#: actions/imsettings.php:434
+#, fuzzy
+msgid "That is not your screenname."
+msgstr "Dies ist nicht deine Telefonnummer."
+
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#: actions/imsettings.php:443
+#, fuzzy
+msgid "Couldn't update user im prefs."
+msgstr "Konnte Benutzereintrag nicht schreiben"
 
 #. TRANS: Message given after successfully removing a registered Instant Messaging address.
-#: actions/imsettings.php:440
+#: actions/imsettings.php:451
 msgid "The IM address was removed."
 msgstr "Die IM-Adresse wurde entfernt."
 
@@ -3546,7 +3601,7 @@ msgid "You must be logged in to join a group."
 msgstr "Du musst angemeldet sein, um Mitglied einer Gruppe zu werden."
 
 #. TRANS: Title for join group page after joining.
-#: actions/joingroup.php:147
+#: actions/joingroup.php:148
 #, fuzzy, php-format
 msgctxt "TITLE"
 msgid "%1$s joined group %2$s"
@@ -3675,7 +3730,7 @@ msgstr "URL eines mit der Lizenz anzuzeigenden Bildes."
 #. TRANS: Submit button title.
 #: actions/licenseadminpanel.php:311 actions/sessionsadminpanel.php:199
 #: actions/siteadminpanel.php:292 actions/snapshotadminpanel.php:245
-#: actions/tagother.php:154 lib/applicationeditform.php:357
+#: actions/tagother.php:133 lib/applicationeditform.php:357
 msgid "Save"
 msgstr "Speichern"
 
@@ -3683,40 +3738,42 @@ msgstr "Speichern"
 msgid "Save license settings"
 msgstr "Lizenz-Einstellungen speichern"
 
-#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
+#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
+#: actions/login.php:97 actions/otp.php:62 actions/register.php:130
 msgid "Already logged in."
 msgstr "Bereits angemeldet."
 
-#: actions/login.php:148
+#: actions/login.php:125
 msgid "Incorrect username or password."
 msgstr "Falscher Benutzername oder Passwort."
 
-#: actions/login.php:154 actions/otp.php:120
+#. TRANS: Server error displayed when a user object could not be created trying to login using "one time password login".
+#: actions/login.php:131 actions/otp.php:127
 msgid "Error setting user. You are probably not authorized."
 msgstr ""
 "Fehler beim Setzen des Benutzers. Du bist vermutlich nicht autorisiert."
 
-#: actions/login.php:210 actions/login.php:263
+#: actions/login.php:185 actions/login.php:236 lib/action.php:598
 msgid "Login"
 msgstr "Anmelden"
 
-#: actions/login.php:249
+#: actions/login.php:222
 msgid "Login to site"
 msgstr "An Seite anmelden"
 
-#: actions/login.php:258 actions/register.php:490
+#: actions/login.php:231 actions/register.php:469
 msgid "Remember me"
 msgstr "Anmeldedaten merken"
 
-#: actions/login.php:259 actions/register.php:492
+#: actions/login.php:232 actions/register.php:471
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "Automatisch anmelden; nicht bei gemeinsam genutzten PCs einsetzen!"
 
-#: actions/login.php:269
+#: actions/login.php:241
 msgid "Lost or forgotten password?"
 msgstr "Passwort vergessen?"
 
-#: actions/login.php:288
+#: actions/login.php:259
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -3724,11 +3781,11 @@ msgstr ""
 "Bitte gebe aus Sicherheitsgründen deinen Benutzernamen und dein Passwort "
 "ein, bevor die Änderungen an deinen Einstellungen übernommen werden."
 
-#: actions/login.php:292
+#: actions/login.php:263
 msgid "Login with your username and password."
 msgstr "Mit Benutzernamen und Passwort anmelden."
 
-#: actions/login.php:295
+#: actions/login.php:266
 #, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -3856,7 +3913,9 @@ msgstr "Neue Nachricht"
 msgid "Notice posted"
 msgstr "Nachricht hinzugefügt"
 
-#: actions/noticesearch.php:68
+#. TRANS: Instructions for Notice search page.
+#. TRANS: %%site.name%% is the name of the StatusNet site.
+#: actions/noticesearch.php:69
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -3866,16 +3925,21 @@ msgstr ""
 "Suchbegriffe durch Leerzeichen. Ein Suchbegriff muss aus mindestens 3 "
 "Zeichen bestehen."
 
-#: actions/noticesearch.php:78
+#. TRANS: Title of the page where users can search for notices.
+#: actions/noticesearch.php:80
 msgid "Text search"
 msgstr "Volltextsuche"
 
-#: actions/noticesearch.php:91
+#. TRANS: Test in RSS notice search.
+#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
+#: actions/noticesearch.php:95
 #, php-format
 msgid "Search results for \"%1$s\" on %2$s"
 msgstr "Suchergebnisse für „%1$s“ auf %2$s"
 
-#: actions/noticesearch.php:121
+#. TRANS: Text for logged in users making a query for notices without results.
+#. TRANS: This message contains a Markdown link.
+#: actions/noticesearch.php:128
 #, php-format
 msgid ""
 "Be the first to [post on this topic](%%%%action.newnotice%%%%?"
@@ -3884,7 +3948,9 @@ msgstr ""
 "Sei der erste der [zu diesem Thema etwas schreibt](%%%%action.newnotice%%%%?"
 "status_textarea=%s)!"
 
-#: actions/noticesearch.php:124
+#. TRANS: Text for not logged in users making a query for notices without results.
+#. TRANS: This message contains Markdown links.
+#: actions/noticesearch.php:133
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and be the first to "
@@ -3894,14 +3960,17 @@ msgstr ""
 "bist der erste der [auf diese Nachricht antwortet](%%%%action.newnotice%%%%?"
 "status_textarea=%s)!"
 
-#: actions/noticesearchrss.php:96
+#. TRANS: RSS notice search feed title. %s is the query.
+#: actions/noticesearchrss.php:95
 #, php-format
 msgid "Updates with \"%s\""
 msgstr "Aktualisierungen mit „%s“"
 
-#: actions/noticesearchrss.php:98
+#. TRANS: RSS notice search feed description.
+#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
+#: actions/noticesearchrss.php:99
 #, fuzzy, php-format
-msgid "Updates matching search term \"%1$s\" on %2$s!"
+msgid "Updates matching search term \"%1$s\" on %2$s."
 msgstr "Alle Aktualisierungen, die den Suchbegriff „%s“ enthalten"
 
 #: actions/nudge.php:85
@@ -3921,52 +3990,52 @@ msgid "Nudge sent!"
 msgstr "Stups gesendet!"
 
 #. TRANS: Message displayed to an anonymous user trying to view OAuth application list.
-#: actions/oauthappssettings.php:60
+#: actions/oauthappssettings.php:57
 msgid "You must be logged in to list your applications."
 msgstr "Du musst angemeldet sein, um deine Programm anzuzeigen"
 
 #. TRANS: Page title for OAuth applications
-#: actions/oauthappssettings.php:76
+#: actions/oauthappssettings.php:73
 msgid "OAuth applications"
 msgstr "OAuth-Anwendungen"
 
 #. TRANS: Page instructions for OAuth applications
-#: actions/oauthappssettings.php:88
+#: actions/oauthappssettings.php:85
 msgid "Applications you have registered"
 msgstr "Registrierte Programme"
 
 #. TRANS: Empty list message on page with OAuth applications.
-#: actions/oauthappssettings.php:141
+#: actions/oauthappssettings.php:138
 #, php-format
 msgid "You have not registered any applications yet."
 msgstr "Du hast noch keine Programme registriert"
 
 #. TRANS: Title for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:71
+#: actions/oauthconnectionssettings.php:69
 msgid "Connected applications"
 msgstr "Verbundene Programme"
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:83
+#: actions/oauthconnectionssettings.php:80
 msgid "The following connections exist for your account."
 msgstr ""
 "Du hast den folgenden Programmen erlaubt, auf dein Benutzerkonto zuzugreifen."
 
 #. TRANS: Client error when trying to revoke access for an application while not being a user of it.
-#: actions/oauthconnectionssettings.php:168
+#: actions/oauthconnectionssettings.php:165
 msgid "You are not a user of that application."
 msgstr "Du bist kein Benutzer dieses Programms."
 
 #. TRANS: Client error when revoking access has failed for some reason.
 #. TRANS: %s is the application ID revoking access failed for.
-#: actions/oauthconnectionssettings.php:183
+#: actions/oauthconnectionssettings.php:180
 #, php-format
 msgid "Unable to revoke access for application: %s."
 msgstr "Kann Zugang dieses Programm nicht entfernen: %s."
 
 #. TRANS: Success message after revoking access for an application.
 #. TRANS: %1$s is the application name, %2$s is the first part of the user token.
-#: actions/oauthconnectionssettings.php:202
+#: actions/oauthconnectionssettings.php:199
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -3975,7 +4044,7 @@ msgstr ""
 "Sie haben den Zugang von %1$s und den Tokem mit %2$s erfolgreich entfernt."
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:213
+#: actions/oauthconnectionssettings.php:210
 msgid "You have not authorized any applications to use your account."
 msgstr ""
 "Du hast noch keinem Programm die Erlaubnis gegeben, dein Profil zu benutzen."
@@ -3983,7 +4052,7 @@ msgstr ""
 #. TRANS: Note for developers in the OAuth connection settings form.
 #. TRANS: This message contains a Markdown link. Do not separate "](".
 #. TRANS: %s is the URL to the OAuth settings.
-#: actions/oauthconnectionssettings.php:233
+#: actions/oauthconnectionssettings.php:230
 #, php-format
 msgid ""
 "Are you a developer? [Register an OAuth client application](%s) to use with "
@@ -3992,6 +4061,16 @@ msgstr ""
 "Sie sind Entwickler? [Registrieren einer OAuth-Client-Anwendung] (%s), um "
 "mit dieser Instanz von StatusNet zu verwenden."
 
+#: actions/oembed.php:64
+#, fuzzy, php-format
+msgid "\"%s\" not found."
+msgstr "API-Methode nicht gefunden."
+
+#: actions/oembed.php:76
+#, fuzzy, php-format
+msgid "Notice %s not found."
+msgstr "API-Methode nicht gefunden."
+
 #: actions/oembed.php:80 actions/shownotice.php:100
 msgid "Notice has no profile."
 msgstr "Nachricht hat kein Profil"
@@ -4001,6 +4080,16 @@ msgstr "Nachricht hat kein Profil"
 msgid "%1$s's status on %2$s"
 msgstr "Status von %1$s auf %2$s"
 
+#: actions/oembed.php:95
+#, fuzzy, php-format
+msgid "Attachment %s not found."
+msgstr "Empfänger nicht gefunden."
+
+#: actions/oembed.php:136
+#, php-format
+msgid "\"%s\" not supported for oembed requests."
+msgstr ""
+
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
 #: actions/oembed.php:168
 #, php-format
@@ -4014,93 +4103,60 @@ msgid "Only %s URLs over plain HTTP please."
 msgstr "Bitte nur %s URLs über einfaches HTTP."
 
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1205
-#: lib/apiaction.php:1232 lib/apiaction.php:1367
+#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1207
+#: lib/apiaction.php:1234 lib/apiaction.php:1369
 msgid "Not a supported data format."
 msgstr "Kein unterstütztes Datenformat."
 
+#. TRANS: ShortName in the OpenSearch interface when trying to find users.
 #: actions/opensearch.php:64
 msgid "People Search"
 msgstr "Suche nach Benutzern"
 
-#: actions/opensearch.php:67
+#: actions/opensearch.php:68
 msgid "Notice Search"
 msgstr "Nachrichtensuche"
 
-#: actions/othersettings.php:59
-msgid "Other settings"
-msgstr "Andere Einstellungen"
-
-#. TRANS: Instructions for tab "Other" in user profile settings.
-#: actions/othersettings.php:71
-msgid "Manage various other options."
-msgstr "Verwalte zahlreiche andere Einstellungen."
-
-#. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
-#. TRANS: user's profile settings. Use of "free" is as in "open", indicating that the
-#. TRANS: information on the shortener site is freely distributable.
-#. TRANS: This message has one space at the beginning. Use your language's word separator
-#. TRANS: here if it has one (most likely a single space).
-#: actions/othersettings.php:113
-msgid " (free service)"
-msgstr " (freier Dienst)"
-
-#. TRANS: Label for dropdown with URL shortener services.
-#: actions/othersettings.php:122
-msgid "Shorten URLs with"
-msgstr "URLs kürzen mit"
-
-#. TRANS: Tooltip for for dropdown with URL shortener services.
-#: actions/othersettings.php:124
-msgid "Automatic shortening service to use."
-msgstr "URL-Auto-Kürzungs-Dienst."
-
-#. TRANS: Label for checkbox.
-#: actions/othersettings.php:130
-msgid "View profile designs"
-msgstr "Profil-Designs ansehen"
-
-#. TRANS: Tooltip for checkbox.
-#: actions/othersettings.php:132
-msgid "Show or hide profile designs."
-msgstr "Profil-Designs anzeigen oder verstecken."
-
-#. TRANS: Form validation error for form "Other settings" in user profile.
-#: actions/othersettings.php:164
-msgid "URL shortening service is too long (maximum 50 characters)."
-msgstr "URL-Auto-Kürzungs-Dienst ist zu lang (maximal 50 Zeichen)."
-
-#: actions/otp.php:69
+#. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
+#: actions/otp.php:70
 msgid "No user ID specified."
 msgstr "Keine Benutzer-ID angegeben"
 
-#: actions/otp.php:83
+#. TRANS: Client error displayed trying to use "one time password login" without specifying a login token.
+#: actions/otp.php:86
 msgid "No login token specified."
 msgstr "Kein Zugangstoken angegeben."
 
-#: actions/otp.php:90
+#. TRANS: Client error displayed trying to use "one time password login" without requesting a login token.
+#: actions/otp.php:94
 msgid "No login token requested."
 msgstr "Kein Login-Token angefordert."
 
-#: actions/otp.php:95
+#. TRANS: Client error displayed trying to use "one time password login" while specifying an invalid login token.
+#: actions/otp.php:100
 msgid "Invalid login token specified."
 msgstr "Login-Token ungültig oder abgelaufen."
 
-#: actions/otp.php:104
+#. TRANS: Client error displayed trying to use "one time password login" while specifying an expired login token.
+#: actions/otp.php:110
 msgid "Login token expired."
 msgstr "Zugangstoken ist abgelaufen."
 
-#: actions/outbox.php:58
+#. TRANS: Title for outbox for any but the fist page.
+#. TRANS: %1$s is the user nickname, %2$d is the page number.
+#: actions/outbox.php:57
 #, php-format
 msgid "Outbox for %1$s - page %2$d"
 msgstr "Postausgang für %1$s - Seite %2$d"
 
+#. TRANS: Title for first page of outbox.
 #: actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
 msgstr "Postausgang von %s"
 
-#: actions/outbox.php:104
+#. TRANS: Instructions for outbox.
+#: actions/outbox.php:103
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr ""
 "Das hier ist dein Postausgang, er beinhaltet deine gesendeten Nachrichten."
@@ -4127,43 +4183,43 @@ msgstr "Altes Passwort"
 msgid "New password"
 msgstr "Neues Passwort"
 
-#: actions/passwordsettings.php:109
-#, fuzzy
-msgid "6 or more characters"
+#: actions/passwordsettings.php:109 actions/register.php:416
+msgid "6 or more characters."
 msgstr "6 oder mehr Zeichen"
 
-#: actions/passwordsettings.php:113
-#, fuzzy
-msgid "Same as password above"
+#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#: actions/passwordsettings.php:113 actions/recoverpassword.php:264
+#: actions/register.php:420
+msgid "Same as password above."
 msgstr "Gleiches Passwort wie zuvor"
 
 #: actions/passwordsettings.php:117
 msgid "Change"
 msgstr "Ändern"
 
-#: actions/passwordsettings.php:154 actions/register.php:238
+#: actions/passwordsettings.php:153 actions/register.php:223
 msgid "Password must be 6 or more characters."
 msgstr "Das Passwort muss aus 6 oder mehr Zeichen bestehen."
 
-#: actions/passwordsettings.php:157 actions/register.php:241
+#: actions/passwordsettings.php:156 actions/register.php:226
 msgid "Passwords don't match."
 msgstr "Passwörter stimmen nicht überein."
 
-#: actions/passwordsettings.php:165
+#: actions/passwordsettings.php:164
 msgid "Incorrect old password"
 msgstr "Altes Passwort falsch"
 
-#: actions/passwordsettings.php:181
+#: actions/passwordsettings.php:180
 msgid "Error saving user; invalid."
 msgstr "Fehler beim Speichern des Benutzers, ungültig."
 
-#: actions/passwordsettings.php:186
+#. TRANS: Reset password form validation error message.
+#: actions/passwordsettings.php:185 actions/recoverpassword.php:418
 #, fuzzy
-msgid "Can't save new password."
+msgid "Cannot save new password."
 msgstr "Konnte neues Passwort nicht speichern"
 
-#. TRANS: Title for password recovery page in password saved mode.
-#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
+#: actions/passwordsettings.php:191
 msgid "Password saved."
 msgstr "Passwort gespeichert."
 
@@ -4368,8 +4424,7 @@ msgid "Directory where backgrounds are located."
 msgstr "Verzeichnis, in dem sich die Hintergründe befinden."
 
 #. TRANS: Fieldset legens in Paths admin panel.
-#. TRANS: DT element label in attachment list.
-#: actions/pathsadminpanel.php:419 lib/attachmentlist.php:98
+#: actions/pathsadminpanel.php:419
 msgid "Attachments"
 msgstr "Anhänge"
 
@@ -4437,7 +4492,9 @@ msgstr "Server an den SSL Anfragen gerichtet werden sollen"
 msgid "Save paths"
 msgstr "Speicherpfade"
 
-#: actions/peoplesearch.php:52
+#. TRANS: Instructions for the "People search" page.
+#. TRANS: %%site.name%% is the name of the StatusNet site.
+#: actions/peoplesearch.php:54
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
@@ -4447,7 +4504,8 @@ msgstr ""
 "Trenne mehrere Suchbegriffe durch Leerzeichen. Ein Suchbegriff muss aus "
 "mindestens 3 Zeichen bestehen."
 
-#: actions/peoplesearch.php:58
+#. TRANS: Title of a page where users can search for other users.
+#: actions/peoplesearch.php:61
 msgid "People search"
 msgstr "Suche nach anderen Benutzern"
 
@@ -4461,6 +4519,60 @@ msgstr "Ungültiger Personen-Tag: „%s“."
 msgid "Users self-tagged with %1$s - page %2$d"
 msgstr "Benutzer, die sich selbst mit „%1$s“ getaggt haben - Seite %2$d"
 
+#. TRANS: Page title for AJAX form return when a disabling a plugin.
+#: actions/plugindisable.php:69
+msgctxt "plugin"
+msgid "Disabled"
+msgstr ""
+
+#. TRANS: Client error displayed trying to perform any request method other than POST.
+#. TRANS: Do not translate POST.
+#: actions/pluginenable.php:78 actions/subscribe.php:77
+msgid "This action only accepts POST requests."
+msgstr "Diese Aktion nimmt nur POST-Requests"
+
+#: actions/pluginenable.php:102
+#, fuzzy
+msgid "You cannot administer plugins."
+msgstr "Du kannst keine Benutzer löschen."
+
+#: actions/pluginenable.php:109
+#, fuzzy
+msgid "No such plugin."
+msgstr "Seite nicht vorhanden"
+
+#. TRANS: Page title for AJAX form return when enabling a plugin.
+#: actions/pluginenable.php:159
+msgctxt "plugin"
+msgid "Enabled"
+msgstr ""
+
+#. TRANS: Tab and title for plugins admin panel.
+#. TRANS: Menu item for site administration
+#: actions/pluginsadminpanel.php:56 actions/version.php:191
+#: lib/adminpanelaction.php:411
+msgid "Plugins"
+msgstr "Erweiterungen"
+
+#. TRANS: Instructions at top of plugin admin page.
+#: actions/pluginsadminpanel.php:68
+msgid ""
+"Additional plugins can be enabled and configured manually. See the <a href="
+"\"http://status.net/wiki/Plugins\">online plugin documentation</a> for more "
+"details."
+msgstr ""
+
+#. TRANS: Admin form section header
+#: actions/pluginsadminpanel.php:84
+#, fuzzy
+msgid "Default plugins"
+msgstr "Bevorzugte Sprache"
+
+#: actions/pluginsadminpanel.php:106
+msgid ""
+"All default plugins have been disabled from the site's configuration file."
+msgstr ""
+
 #: actions/postnotice.php:95
 msgid "Invalid notice content."
 msgstr "Ungültiger Nachrichteninhalt."
@@ -4473,12 +4585,12 @@ msgstr ""
 "2$s“."
 
 #. TRANS: Page title for profile settings.
-#: actions/profilesettings.php:59
+#: actions/profilesettings.php:60
 msgid "Profile settings"
 msgstr "Profil-Einstellungen"
 
 #. TRANS: Usage instructions for profile settings.
-#: actions/profilesettings.php:70
+#: actions/profilesettings.php:71
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
@@ -4486,33 +4598,30 @@ msgstr ""
 "über dich erfahren können."
 
 #. TRANS: Profile settings form legend.
-#: actions/profilesettings.php:98
+#: actions/profilesettings.php:99
 msgid "Profile information"
 msgstr "Profilinformation"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109 actions/register.php:433
+#: actions/profilesettings.php:110 actions/register.php:412
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr "1-64 Kleinbuchstaben oder Zahlen, keine Satz- oder Leerzeichen."
 
 #. TRANS: Field label in form for profile settings.
-#. TRANS: Label for full group name (dt). Text hidden by default.
-#. TRANS: DT for full name in a profile.
-#: actions/profilesettings.php:113 actions/register.php:455
-#: actions/showgroup.php:255 actions/tagother.php:104
-#: lib/groupeditform.php:150 lib/userprofile.php:156
+#: actions/profilesettings.php:114 actions/register.php:434
+#: lib/groupeditform.php:150
 msgid "Full name"
 msgstr "Bürgerlicher Name"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:118 actions/register.php:460
+#: actions/profilesettings.php:119 actions/register.php:439
 #: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "Homepage"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:121
+#: actions/profilesettings.php:122 actions/register.php:441
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr ""
 "URL deiner Homepage, deines Blogs, oder deines Profils auf einer anderen "
@@ -4521,7 +4630,7 @@ msgstr ""
 #. TRANS: Tooltip for field label in form for profile settings. Plural
 #. TRANS: is decided by the number of characters available for the
 #. TRANS: biography (%d).
-#: actions/profilesettings.php:129 actions/register.php:471
+#: actions/profilesettings.php:130 actions/register.php:450
 #, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4529,79 +4638,75 @@ msgstr[0] "Beschreibe dich selbst und deine Interessen in einem Zeichen"
 msgstr[1] "Beschreibe dich selbst und deine Interessen in %d Zeichen"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:135 actions/register.php:476
+#: actions/profilesettings.php:136 actions/register.php:455
 msgid "Describe yourself and your interests"
 msgstr "Beschreibe dich selbst und deine Interessen"
 
 #. TRANS: Text area label in form for profile settings where users can provide.
 #. TRANS: their biography.
-#: actions/profilesettings.php:139 actions/register.php:478
+#: actions/profilesettings.php:140 actions/register.php:457
 msgid "Bio"
 msgstr "Biografie"
 
 #. TRANS: Field label in form for profile settings.
-#. TRANS: Label for group location (dt). Text hidden by default.
-#. TRANS: DT for location in a profile.
-#: actions/profilesettings.php:145 actions/register.php:483
-#: actions/showgroup.php:265 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:173
-#: lib/userprofile.php:172
+#: actions/profilesettings.php:146 actions/register.php:462
+#: lib/groupeditform.php:173
 msgid "Location"
 msgstr "Aufenthaltsort"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148 actions/register.php:485
+#: actions/profilesettings.php:149
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Wo du bist, beispielsweise „Stadt, Region, Land“"
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:153
+#: actions/profilesettings.php:154
 msgid "Share my current location when posting notices"
 msgstr "Teile meine aktuelle Position, wenn ich Nachrichten sende"
 
 #. TRANS: Field label in form for profile settings.
-#. TRANS: DT for tags in a profile.
-#: actions/profilesettings.php:161 actions/tagother.php:149
-#: actions/tagother.php:209 lib/subscriptionlist.php:106
-#: lib/subscriptionlist.php:108 lib/userprofile.php:220
+#: actions/profilesettings.php:162 actions/tagother.php:128
+#: actions/tagother.php:188 lib/subscriptionlist.php:104
+#: lib/subscriptionlist.php:106
 msgid "Tags"
 msgstr "Tags"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:164
+#: actions/profilesettings.php:165
 #, fuzzy
 msgid ""
-"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- "
+"separated."
 msgstr ""
 "Tags über dich selbst (Buchstaben, Zahlen, -, ., und _) durch Kommas oder "
 "Leerzeichen getrennt"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:169
+#: actions/profilesettings.php:170
 msgid "Language"
 msgstr "Sprache"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:171
+#: actions/profilesettings.php:172
 #, fuzzy
-msgid "Preferred language"
+msgid "Preferred language."
 msgstr "Bevorzugte Sprache"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:181
+#: actions/profilesettings.php:182
 msgid "Timezone"
 msgstr "Zeitzone"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:183
+#: actions/profilesettings.php:184
 msgid "What timezone are you normally in?"
 msgstr "In welcher Zeitzone befindest du dich üblicherweise?"
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:189
+#: actions/profilesettings.php:190
 #, fuzzy
 msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)"
+"Automatically subscribe to whoever subscribes to me (best for non-humans)."
 msgstr ""
 "Abonniere automatisch alle Kontakte, die mich abonnieren (sinnvoll für Nicht-"
 "Menschen)"
@@ -4609,7 +4714,7 @@ msgstr ""
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Plural form is used based on the maximum number of allowed
 #. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:258 actions/register.php:229
+#: actions/profilesettings.php:259 actions/register.php:214
 #, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4617,49 +4722,49 @@ msgstr[0] "Die Biografie ist zu lang (maximal ein Zeichen)."
 msgstr[1] "Die Biografie ist zu lang (maximal %d Zeichen)."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:269 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:270 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr "Keine Zeitzone ausgewählt."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:277
+#: actions/profilesettings.php:278
 msgid "Language is too long (maximum 50 characters)."
 msgstr "Die eingegebene Sprache ist zu lang (maximal 50 Zeichen)."
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:291 actions/tagother.php:178
-#, php-format
-msgid "Invalid tag: \"%s\""
+#: actions/profilesettings.php:292
+#, fuzzy, php-format
+msgid "Invalid tag: \"%s\"."
 msgstr "Ungültiges Stichwort: „%s“"
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:347
+#: actions/profilesettings.php:348
 #, fuzzy
 msgid "Could not update user for autosubscribe."
 msgstr "Autosubscribe konnte nicht aktiviert werden."
 
 #. TRANS: Server error thrown when user profile location preference settings could not be updated.
-#: actions/profilesettings.php:405
+#: actions/profilesettings.php:406
 #, fuzzy
 msgid "Could not save location prefs."
 msgstr "Konnte Positions-Einstellungen nicht speichern."
 
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:427 actions/tagother.php:200
+#: actions/profilesettings.php:428 actions/tagother.php:179
 msgid "Could not save tags."
 msgstr "Konnte Tags nicht speichern."
 
 #. TRANS: Confirmation shown when user profile settings are saved.
 #. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:436 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:437 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "Einstellungen gespeichert."
 
 #. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
 #. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:483 actions/restoreaccount.php:60
+#: actions/profilesettings.php:484 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "Neues Benutzerkonto erstellen"
@@ -4740,6 +4845,12 @@ msgstr ""
 "Mikroblogging)-Dienst basierend auf der freien Software [StatusNet](http://"
 "status.net/)."
 
+#. TRANS: Public RSS feed description. %s is the StatusNet site name.
+#: actions/publicrss.php:106
+#, fuzzy, php-format
+msgid "%s updates from everyone."
+msgstr "%s Nachrichten von allen!"
+
 #. TRANS: Title for public tag cloud.
 #: actions/publictagcloud.php:57
 msgid "Public tag cloud"
@@ -4782,10 +4893,6 @@ msgstr ""
 "Warum [registrierst du nicht einen Account](%%%%action.register%%%%) und "
 "bist der erste der eine Nachricht abschickt!"
 
-#: actions/publictagcloud.php:146
-msgid "Tag cloud"
-msgstr "Tag-Wolke"
-
 #. TRANS: Client error displayed trying to recover password while already logged in.
 #: actions/recoverpassword.php:37
 msgid "You are already logged in!"
@@ -4877,6 +4984,12 @@ msgstr "Stelle Passwort wieder her"
 msgid "Password recovery requested"
 msgstr "Wiederherstellung des Passworts angefordert"
 
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/recoverpassword.php:229
+#, fuzzy
+msgid "Password saved"
+msgstr "Passwort gespeichert."
+
 #. TRANS: Title for password recovery page when an unknown action has been specified.
 #: actions/recoverpassword.php:232
 msgid "Unknown action"
@@ -4888,14 +5001,9 @@ msgstr "Unbekannter Befehl"
 msgid "6 or more characters, and do not forget it!"
 msgstr "6 oder mehr Zeichen, und nicht vergessen!"
 
-#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
-#: actions/recoverpassword.php:264 actions/register.php:441
-msgid "Same as password above."
-msgstr "Gleiches Passwort wie zuvor"
-
 #. TRANS: Button text for password reset form.
 #. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: actions/recoverpassword.php:268 lib/designsettings.php:264
+#: actions/recoverpassword.php:268 lib/designform.php:145
 msgctxt "BUTTON"
 msgid "Reset"
 msgstr "Zurücksetzen"
@@ -4944,14 +5052,8 @@ msgstr "Passwort muss mehr als 6 Zeichen enthalten."
 msgid "Password and confirmation do not match."
 msgstr "Passwort und seine Bestätigung stimmen nicht überein."
 
-#. TRANS: Reset password form validation error message.
-#: actions/recoverpassword.php:418
-#, fuzzy
-msgid "Cannot save new password."
-msgstr "Konnte neues Passwort nicht speichern"
-
 #. TRANS: Server error displayed when something does wrong with the user object during password reset.
-#: actions/recoverpassword.php:426 actions/register.php:256
+#: actions/recoverpassword.php:426 actions/register.php:241
 msgid "Error setting user."
 msgstr "Fehler bei den Benutzereinstellungen."
 
@@ -4960,102 +5062,105 @@ msgstr "Fehler bei den Benutzereinstellungen."
 msgid "New password successfully saved. You are now logged in."
 msgstr "Neues Passwort erfolgreich gespeichert. Du bist jetzt angemeldet."
 
-#: actions/register.php:92 actions/register.php:196 actions/register.php:413
+#: actions/redirecturl.php:70
+#, fuzzy
+msgid "No id parameter"
+msgstr "Kein ID-Argument."
+
+#: actions/redirecturl.php:76
+#, fuzzy, php-format
+msgid "No such file \"%d\""
+msgstr "Datei nicht gefunden."
+
+#: actions/register.php:80 actions/register.php:181 actions/register.php:392
 msgid "Sorry, only invited people can register."
 msgstr "Es tut uns leid, zum Registrieren benötigst du eine Einladung."
 
-#: actions/register.php:99
+#: actions/register.php:87
 msgid "Sorry, invalid invitation code."
 msgstr "Entschuldigung, ungültiger Einladungscode."
 
-#: actions/register.php:119
+#: actions/register.php:106
 msgid "Registration successful"
 msgstr "Registrierung erfolgreich"
 
-#: actions/register.php:121 actions/register.php:511
+#: actions/register.php:108 actions/register.php:490
 msgid "Register"
 msgstr "Registrieren"
 
-#: actions/register.php:142
+#: actions/register.php:128
 msgid "Registration not allowed."
 msgstr "Registrierung nicht erlaubt."
 
-#: actions/register.php:209
+#: actions/register.php:194
 #, fuzzy
-msgid "You can't register if you don't agree to the license."
+msgid "You cannot register if you don't agree to the license."
 msgstr ""
 "Du kannst dich nicht registrieren, wenn du die Lizenz nicht akzeptierst."
 
-#: actions/register.php:218
+#: actions/register.php:203
 msgid "Email address already exists."
 msgstr "Diese E-Mail-Adresse existiert bereits."
 
-#: actions/register.php:251 actions/register.php:273
+#: actions/register.php:236 actions/register.php:258
 msgid "Invalid username or password."
 msgstr "Benutzername oder Passwort falsch."
 
-#: actions/register.php:351
+#: actions/register.php:333
 #, fuzzy
 msgid ""
 "With this form you can create a new account. You can then post notices and "
-"link up to friends and colleagues. "
+"link up to friends and colleagues."
 msgstr ""
 "Hier kannst du einen neuen Zugang einrichten. Anschließend kannst du "
 "Nachrichten und Links mit deinen Freunden und Kollegen teilen. "
 
-#: actions/register.php:437
-msgid "6 or more characters."
-msgstr "6 oder mehr Zeichen"
-
-#. TRANS: Link description in user account settings menu.
-#: actions/register.php:445 actions/register.php:449
-#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
+#: actions/register.php:424 actions/register.php:428
+#: actions/siteadminpanel.php:238 lib/settingsnav.php:92
 msgid "Email"
 msgstr "E-Mail"
 
-#: actions/register.php:446 actions/register.php:450
+#: actions/register.php:425 actions/register.php:429
 #, fuzzy
-msgid "Used only for updates, announcements, and password recovery"
+msgid "Used only for updates, announcements, and password recovery."
 msgstr ""
 "Wird nur für Updates, wichtige Mitteilungen und zur "
 "Passwortwiederherstellung verwendet"
 
-#: actions/register.php:457
+#: actions/register.php:436
 #, fuzzy
-msgid "Longer name, preferably your \"real\" name"
+msgid "Longer name, preferably your \"real\" name."
 msgstr "Längerer Name, bevorzugt dein bürgerlicher Name"
 
-#: actions/register.php:462
+#: actions/register.php:464
 #, fuzzy
-msgid "URL of your homepage, blog, or profile on another site"
-msgstr ""
-"URL deiner Homepage, deines Blogs, oder deines Profils auf einer anderen "
-"Website."
+msgid "Where you are, like \"City, State (or Region), Country\"."
+msgstr "Wo du bist, beispielsweise „Stadt, Region, Land“"
 
-#: actions/register.php:523
+#: actions/register.php:503
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
 msgstr ""
 "Mir ist bewusst, dass Inhalte und Daten von %1$s privat und vertraulich sind."
 
-#: actions/register.php:533
+#: actions/register.php:513
 #, php-format
 msgid "My text and files are copyright by %1$s."
 msgstr "Meine Texte und Dateien sind urheberrechtlich geschützt durch %1$s."
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:537
+#: actions/register.php:517
 msgid "My text and files remain under my own copyright."
 msgstr "Meine Texte und Dateien verbleiben unter meinem eigenen Urheberrecht."
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:540
+#: actions/register.php:520
 msgid "All rights reserved."
 msgstr "Alle Rechte vorbehalten."
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:545
+#: actions/register.php:525
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -5064,7 +5169,7 @@ msgstr ""
 "Abgesehen von den folgenden Daten: Passwort, E-Mail-Adresse, IM-Adresse und "
 "Telefonnummer, sind all meine Texte und Dateien unter %s verfügbar."
 
-#: actions/register.php:588
+#: actions/register.php:566
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -5097,7 +5202,7 @@ msgstr ""
 "\n"
 "Danke für deine Anmeldung, wir hoffen, dass dir der Service gefällt."
 
-#: actions/register.php:612
+#: actions/register.php:590
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5131,7 +5236,7 @@ msgstr "Benutzername"
 
 #: actions/remotesubscribe.php:129
 #, fuzzy
-msgid "Nickname of the user you want to follow"
+msgid "Nickname of the user you want to follow."
 msgstr "Name des Benutzers, dem du folgen möchtest"
 
 #: actions/remotesubscribe.php:132
@@ -5140,18 +5245,18 @@ msgstr "Profil-URL"
 
 #: actions/remotesubscribe.php:133
 #, fuzzy
-msgid "URL of your profile on another compatible microblogging service"
+msgid "URL of your profile on another compatible microblogging service."
 msgstr "Profil-URL bei einem anderen kompatiblen Mikrobloggingdienst"
 
 #. TRANS: Link text for link that will subscribe to a remote profile.
 #: actions/remotesubscribe.php:136 lib/subscribeform.php:139
-#: lib/userprofile.php:431
+#: lib/userprofile.php:402
 msgid "Subscribe"
 msgstr "Abonnieren"
 
 #: actions/remotesubscribe.php:158
 #, fuzzy
-msgid "Invalid profile URL (bad format)"
+msgid "Invalid profile URL (bad format)."
 msgstr "Ungültige Profil-URL (falsches Format)"
 
 #: actions/remotesubscribe.php:167
@@ -5186,7 +5291,7 @@ msgstr "Du kannst deine eigene Nachricht nicht wiederholen."
 msgid "You already repeated that notice."
 msgstr "Nachricht bereits wiederholt"
 
-#: actions/repeat.php:112 lib/noticelist.php:692
+#: actions/repeat.php:112 lib/noticelist.php:697
 msgid "Repeated"
 msgstr "Wiederholt"
 
@@ -5194,9 +5299,9 @@ msgstr "Wiederholt"
 msgid "Repeated!"
 msgstr "Wiederholt!"
 
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing @-replies.
+#. TRANS: RSS reply feed title. %s is a user nickname.
 #: actions/replies.php:126 actions/repliesrss.php:68
-#: lib/personalgroupnav.php:109
+#: lib/personalgroupnav.php:105
 #, php-format
 msgid "Replies to %s"
 msgstr "Antworten an %s"
@@ -5248,9 +5353,11 @@ msgstr ""
 "Du kannst versuchen [%1$s einen Stups zu geben](../%s) oder [ihm etwas "
 "posten](%%%%action.newnotice%%%%?status_textarea=%s)."
 
-#: actions/repliesrss.php:72
+#. TRANS: RSS reply feed description.
+#. TRANS: %1$s is a user nickname, %2$s is the StatusNet site name.
+#: actions/repliesrss.php:74
 #, fuzzy, php-format
-msgid "Replies to %1$s on %2$s!"
+msgid "Replies to %1$s on %2$s."
 msgstr "Antworten an %1$s auf %2$s!"
 
 #. TRANS: Client exception displayed when trying to restore an account while not logged in.
@@ -5353,7 +5460,7 @@ msgstr "Du kannst die Rollen von Benutzern dieser Seite nicht widerrufen."
 msgid "User doesn't have this role."
 msgstr "Benutzer verfügt nicht über diese Rolle."
 
-#: actions/rsd.php:146 actions/version.php:159
+#: actions/rsd.php:142 actions/version.php:159
 msgid "StatusNet"
 msgstr "StatusNet"
 
@@ -5395,87 +5502,38 @@ msgstr "Fehleruntersuchung für Sitzungen aktivieren"
 msgid "Save site settings"
 msgstr "Website-Einstellungen speichern"
 
-#: actions/showapplication.php:82
+#: actions/showapplication.php:78
 msgid "You must be logged in to view an application."
 msgstr "Du musst angemeldet sein, um dieses Programm zu betrachten."
 
-#: actions/showapplication.php:157
+#: actions/showapplication.php:151
 msgid "Application profile"
 msgstr "Anwendungsprofil"
 
-#. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:159 lib/applicationeditform.php:177
-msgid "Icon"
-msgstr "Symbol"
-
-#. TRANS: Form input field label for application name.
-#: actions/showapplication.php:169 actions/version.php:197
-#: lib/applicationeditform.php:190
-msgid "Name"
-msgstr "Name"
-
-#. TRANS: Form input field label.
-#: actions/showapplication.php:178 lib/applicationeditform.php:227
-msgid "Organization"
-msgstr "Organisation"
-
-#. TRANS: Form input field label.
-#: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:168
-msgid "Description"
-msgstr "Beschreibung"
-
-#. TRANS: Header for group statistics on a group page (h2).
-#. TRANS: H2 text for user statistics.
-#: actions/showapplication.php:192 actions/showgroup.php:460
-#: lib/profileaction.php:205
-msgid "Statistics"
-msgstr "Statistik"
-
-#: actions/showapplication.php:203
+#: actions/showapplication.php:179
 #, php-format
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr "Erstellt von %1$s - %2$s Standard Zugang - %3$d Benutzer"
 
-#: actions/showapplication.php:213
+#: actions/showapplication.php:189
 msgid "Application actions"
 msgstr "Programmaktionen"
 
-#: actions/showapplication.php:236
+#: actions/showapplication.php:212
 msgid "Reset key & secret"
 msgstr "Schlüssel zurücksetzen"
 
 #. TRANS: Title of form for deleting a user.
-#: actions/showapplication.php:252 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:64 lib/noticelist.php:673
+#: actions/showapplication.php:228 lib/deletegroupform.php:121
+#: lib/deleteuserform.php:64 lib/noticelist.php:678
 msgid "Delete"
 msgstr "Löschen"
 
-#: actions/showapplication.php:261
+#: actions/showapplication.php:237
 msgid "Application info"
 msgstr "Programminformation"
 
-#: actions/showapplication.php:263
-msgid "Consumer key"
-msgstr "Anwender-Schlüssel"
-
-#: actions/showapplication.php:268
-msgid "Consumer secret"
-msgstr "Anwender-Geheimnis"
-
-#: actions/showapplication.php:273
-msgid "Request token URL"
-msgstr "Anfrage-Token Adresse"
-
-#: actions/showapplication.php:278
-msgid "Access token URL"
-msgstr "Zugriffs-Token-Adresse"
-
-#: actions/showapplication.php:283
-msgid "Authorize URL"
-msgstr "Autorisationadresse"
-
-#: actions/showapplication.php:288
+#: actions/showapplication.php:255
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
@@ -5483,7 +5541,7 @@ msgstr ""
 "Hinweis: Wir unterstützen HMAC-SHA1-Signaturen. Wir unterstützen keine "
 "Klartext-Signaturen."
 
-#: actions/showapplication.php:309
+#: actions/showapplication.php:275
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr "Bist du sicher, dass du den Schlüssel zurücksetzen willst?"
 
@@ -5570,61 +5628,47 @@ msgstr "%s-Gruppe"
 msgid "%1$s group, page %2$d"
 msgstr "%1$s Gruppe, Seite %d"
 
-#. TRANS: Group profile header (h2). Text hidden by default.
-#: actions/showgroup.php:223
-msgid "Group profile"
-msgstr "Gruppenprofil"
-
-#. TRANS: Label for group URL (dt). Text hidden by default.
-#. TRANS: DT for URL in a profile.
-#: actions/showgroup.php:273 actions/tagother.php:118
-#: actions/userauthorization.php:175 lib/userprofile.php:186
-msgid "URL"
-msgstr "URL"
-
 #. TRANS: Label for group description or group note (dt). Text hidden by default.
-#. TRANS: DT for note in a profile.
-#: actions/showgroup.php:285 actions/tagother.php:128
-#: actions/userauthorization.php:187 lib/userprofile.php:204
+#: actions/showgroup.php:266
 msgid "Note"
 msgstr "Nachricht"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:296 lib/groupeditform.php:180
+#: actions/showgroup.php:277 lib/groupeditform.php:180
 msgid "Aliases"
 msgstr "Pseudonyme"
 
 #. TRANS: Group actions header (h2). Text hidden by default.
-#: actions/showgroup.php:313
+#: actions/showgroup.php:294
 msgid "Group actions"
 msgstr "Gruppenaktionen"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:357
+#: actions/showgroup.php:338
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
 msgstr "Nachrichtenfeed der Gruppe %s (RSS 1.0)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:364
+#: actions/showgroup.php:345
 #, php-format
 msgid "Notice feed for %s group (RSS 2.0)"
 msgstr "Nachrichtenfeed der Gruppe %s (RSS 2.0)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:371
+#: actions/showgroup.php:352
 #, php-format
 msgid "Notice feed for %s group (Atom)"
 msgstr "Nachrichtenfeed der Gruppe %s (Atom)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:377
+#: actions/showgroup.php:358
 #, php-format
 msgid "FOAF for %s group"
 msgstr "Postausgang von %s"
 
 #. TRANS: Header for mini list of group members on a group page (h2).
-#: actions/showgroup.php:414
+#: actions/showgroup.php:395
 msgid "Members"
 msgstr "Mitglieder"
 
@@ -5632,25 +5676,30 @@ msgstr "Mitglieder"
 #. TRANS: Text for user subscription statistics if the user has no subscriptions.
 #. TRANS: Text for user subscriber statistics if user has no subscribers.
 #. TRANS: Text for user user group membership statistics if user is not a member of any group.
-#: actions/showgroup.php:420 lib/profileaction.php:137
+#: actions/showgroup.php:401 lib/profileaction.php:137
 #: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
-#: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
+#: lib/subscriptionlist.php:123 lib/tagcloudsection.php:71
 msgid "(None)"
 msgstr "(Kein)"
 
 #. TRANS: Link to all group members from mini list of group members if group has more than n members.
-#: actions/showgroup.php:429
+#: actions/showgroup.php:410
 msgid "All members"
 msgstr "Alle Mitglieder"
 
-#. TRANS: Label for creation date in statistics on group page.
-#: actions/showgroup.php:465
+#. TRANS: Header for group statistics on a group page (h2).
+#. TRANS: H2 text for user statistics.
+#: actions/showgroup.php:441 lib/profileaction.php:205
+msgid "Statistics"
+msgstr "Statistik"
+
+#: actions/showgroup.php:444
 msgctxt "LABEL"
 msgid "Created"
 msgstr "Erstellt"
 
 #. TRANS: Label for member count in statistics on group page.
-#: actions/showgroup.php:473
+#: actions/showgroup.php:449
 msgctxt "LABEL"
 msgid "Members"
 msgstr "Mitglieder"
@@ -5659,7 +5708,7 @@ msgstr "Mitglieder"
 #. TRANS: **%s** is the group alias, %%%%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).
-#: actions/showgroup.php:488
+#: actions/showgroup.php:464
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5677,7 +5726,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: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
-#: actions/showgroup.php:498
+#: actions/showgroup.php:474
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5691,7 +5740,7 @@ msgstr ""
 "Nachrichten über ihr Leben und Interessen. "
 
 #. TRANS: Header for list of group administrators on a group page (h2).
-#: actions/showgroup.php:527
+#: actions/showgroup.php:503
 msgid "Admins"
 msgstr "Admins"
 
@@ -5730,7 +5779,7 @@ msgid "%1$s tagged %2$s"
 msgstr "Von „%1$s“ mit „%2$s“ getaggte Nachrichten"
 
 #. TRANS: Page title showing tagged notices in one user's stream.
-#. TRANS: %1$s is the username, %2$s is the hash tag, %1$d is the page number.
+#. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
 #: actions/showstream.php:74
 #, php-format
 msgid "%1$s tagged %2$s, page %3$d"
@@ -5777,14 +5826,14 @@ msgid "FOAF for %s"
 msgstr "FOAF von %s"
 
 #. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
-#: actions/showstream.php:211
+#: actions/showstream.php:205
 #, php-format
 msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr ""
 "Dies ist die Zeitleiste von %1$s, aber bisher hat %1$s noch nichts gepostet."
 
 #. TRANS: Second sentence of empty list message for a stream for the user themselves.
-#: actions/showstream.php:217
+#: actions/showstream.php:211
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
@@ -5794,7 +5843,7 @@ msgstr ""
 
 #. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:221
+#: actions/showstream.php:215
 #, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
@@ -5805,7 +5854,7 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:264
+#: actions/showstream.php:258
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5821,7 +5870,7 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:271
+#: actions/showstream.php:265
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5833,7 +5882,7 @@ msgstr ""
 "[StatusNet](http://status.net/). "
 
 #. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
-#: actions/showstream.php:328
+#: actions/showstream.php:322
 #, php-format
 msgid "Repeat of %s"
 msgstr "Wiederholung von %s"
@@ -5982,75 +6031,75 @@ msgstr "Systembenachrichtigung (maximal 255 Zeichen; HTML erlaubt)"
 #. TRANS: Title for button to save site notice in admin panel.
 #: actions/sitenoticeadminpanel.php:201
 #, fuzzy
-msgid "Save site notice"
+msgid "Save site notice."
 msgstr "Systemnachricht speichern"
 
 #. TRANS: Title for SMS settings.
-#: actions/smssettings.php:57
+#: actions/smssettings.php:56
 msgid "SMS settings"
 msgstr "SMS-Einstellungen"
 
 #. TRANS: SMS settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/smssettings.php:71
+#: actions/smssettings.php:70
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr "Du kannst SMS von %%site.name%% per E-Mail empfangen."
 
 #. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
-#: actions/smssettings.php:93
+#: actions/smssettings.php:92
 msgid "SMS is not available."
 msgstr "SMS ist nicht verfügbar."
 
 #. TRANS: Form legend for SMS settings form.
-#: actions/smssettings.php:107
+#: actions/smssettings.php:106
 msgid "SMS address"
 msgstr "SMS-Adresse"
 
 #. TRANS: Form guide in SMS settings form.
-#: actions/smssettings.php:116
+#: actions/smssettings.php:115
 msgid "Current confirmed SMS-enabled phone number."
 msgstr "Aktuelle für den SMS-Dienst bestätigte Telefonnummer."
 
 #. TRANS: Form guide in IM settings form.
-#: actions/smssettings.php:129
+#: actions/smssettings.php:128
 msgid "Awaiting confirmation on this phone number."
 msgstr "Warte auf die Bestätigung dieser Telefonnummer."
 
 #. TRANS: Field label for SMS address input in SMS settings form.
-#: actions/smssettings.php:138
+#: actions/smssettings.php:137
 msgid "Confirmation code"
 msgstr "Bestätigungscode"
 
 #. TRANS: Form field instructions in SMS settings form.
-#: actions/smssettings.php:140
+#: actions/smssettings.php:139
 msgid "Enter the code you received on your phone."
 msgstr "Gib den Code ein, den du auf deinem Handy via SMS bekommen hast."
 
 #. TRANS: Button label to confirm SMS confirmation code in SMS settings.
-#: actions/smssettings.php:144
+#: actions/smssettings.php:143
 msgctxt "BUTTON"
 msgid "Confirm"
 msgstr "Bestätigen"
 
 #. TRANS: Field label for SMS phone number input in SMS settings form.
-#: actions/smssettings.php:149
+#: actions/smssettings.php:148
 msgid "SMS phone number"
 msgstr "SMS-Telefonnummer"
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
-#: actions/smssettings.php:152
+#: actions/smssettings.php:151
 #, fuzzy
-msgid "Phone number, no punctuation or spaces, with area code"
+msgid "Phone number, no punctuation or spaces, with area code."
 msgstr "Telefonnummer, keine Sonder- oder Leerzeichen mit Vorwahl"
 
 #. TRANS: Form legend for SMS preferences form.
-#: actions/smssettings.php:191
+#: actions/smssettings.php:190
 msgid "SMS preferences"
 msgstr "SMS-Einstellungen"
 
 #. TRANS: Checkbox label in SMS preferences form.
-#: actions/smssettings.php:197
+#: actions/smssettings.php:196
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
@@ -6059,32 +6108,32 @@ msgstr ""
 "meinem Netzbetreiber entstehen können."
 
 #. TRANS: Confirmation message for successful SMS preferences save.
-#: actions/smssettings.php:308
+#: actions/smssettings.php:307
 msgid "SMS preferences saved."
 msgstr "SMS-Einstellungen gesichert."
 
 #. TRANS: Message given saving SMS phone number without having provided one.
-#: actions/smssettings.php:330
+#: actions/smssettings.php:329
 msgid "No phone number."
 msgstr "Keine Telefonnummer."
 
 #. TRANS: Message given saving SMS phone number without having selected a carrier.
-#: actions/smssettings.php:336
+#: actions/smssettings.php:335
 msgid "No carrier selected."
 msgstr "Kein Netzanbieter ausgewählt."
 
 #. TRANS: Message given saving SMS phone number that is already set.
-#: actions/smssettings.php:344
+#: actions/smssettings.php:343
 msgid "That is already your phone number."
 msgstr "Dies ist bereits deine Telefonnummer."
 
 #. TRANS: Message given saving SMS phone number that is already set for another user.
-#: actions/smssettings.php:348
+#: actions/smssettings.php:347
 msgid "That phone number already belongs to another user."
 msgstr "Diese Telefonnummer wird bereits von einem anderen Benutzer verwendet."
 
 #. TRANS: Message given saving valid SMS phone number that is to be confirmed.
-#: actions/smssettings.php:376
+#: actions/smssettings.php:375
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
 "for the code and instructions on how to use it."
@@ -6094,39 +6143,39 @@ msgstr ""
 "die Anweisungen, um ihn zu benutzen."
 
 #. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
-#: actions/smssettings.php:404
+#: actions/smssettings.php:403
 msgid "That is the wrong confirmation number."
 msgstr "Die Bestätigungsnummer ist falsch."
 
 #. TRANS: Message given after successfully canceling SMS phone number confirmation.
-#: actions/smssettings.php:418
+#: actions/smssettings.php:417
 msgid "SMS confirmation cancelled."
 msgstr "SMS-Bestätigung abgebrochen."
 
 #. TRANS: Message given trying to remove an SMS phone number that is not
 #. TRANS: registered for the active user.
-#: actions/smssettings.php:438
+#: actions/smssettings.php:437
 msgid "That is not your phone number."
 msgstr "Dies ist nicht deine Telefonnummer."
 
 #. TRANS: Message given after successfully removing a registered SMS phone number.
-#: actions/smssettings.php:460
+#: actions/smssettings.php:459
 msgid "The SMS phone number was removed."
 msgstr "SMS-Telefonnummer wurde entfernt."
 
 #. TRANS: Label for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:499
+#: actions/smssettings.php:498
 msgid "Mobile carrier"
 msgstr "Netzanbieter"
 
 #. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:504
+#: actions/smssettings.php:503
 msgid "Select a carrier"
 msgstr "Wähle einen Netzanbieter"
 
 #. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
 #. TRANS: %s is an administrative contact's e-mail address.
-#: actions/smssettings.php:513
+#: actions/smssettings.php:512
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -6137,7 +6186,7 @@ msgstr ""
 "s."
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
-#: actions/smssettings.php:535
+#: actions/smssettings.php:534
 #, fuzzy
 msgid "No code entered."
 msgstr "Kein Code eingegeben"
@@ -6211,15 +6260,13 @@ msgstr "Du hast dieses Profil nicht abonniert."
 msgid "Could not save subscription."
 msgstr "Konnte Abonnement nicht erstellen."
 
-#: actions/subscribe.php:77
-msgid "This action only accepts POST requests."
-msgstr "Diese Aktion nimmt nur POST-Requests"
-
-#: actions/subscribe.php:117
+#. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
+#: actions/subscribe.php:121
 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
 msgstr "Du hast dieses OMB 0.1 Profil nicht abonniert."
 
-#: actions/subscribe.php:145
+#. TRANS: Page title when subscription succeeded.
+#: actions/subscribe.php:149
 msgid "Subscribed"
 msgstr "Abonniert"
 
@@ -6335,31 +6382,34 @@ msgid "Subscription feed for %s (Atom)"
 msgstr "Feed der Nachrichten von %s (Atom)"
 
 #. TRANS: Checkbox label for enabling Jabber messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:239
-msgid "Jabber"
-msgstr "Jabber"
+#: actions/subscriptions.php:241 lib/settingsnav.php:110
+#, fuzzy
+msgid "IM"
+msgstr "IM"
 
 #. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:254
+#: actions/subscriptions.php:256 lib/settingsnav.php:117
 msgid "SMS"
 msgstr "SMS"
 
-#: actions/tag.php:69
+#. TRANS: Title for all but the first page of notices with tags.
+#. TRANS: %1$s is the tag, %2$d is the page number.
+#: actions/tag.php:73
 #, php-format
 msgid "Notices tagged with %1$s, page %2$d"
 msgstr "Mit „%1$s“ getaggte Nachrichten, Seite %2$d"
 
-#: actions/tag.php:87
+#: actions/tag.php:91
 #, php-format
 msgid "Notice feed for tag %s (RSS 1.0)"
 msgstr "Nachrichten-Feed des Tags „%s“ (RSS 1.0)"
 
-#: actions/tag.php:93
+#: actions/tag.php:97
 #, php-format
 msgid "Notice feed for tag %s (RSS 2.0)"
 msgstr "Nachrichten-Feed des Tag „%s“ (RSS 2.0)"
 
-#: actions/tag.php:99
+#: actions/tag.php:103
 #, php-format
 msgid "Notice feed for tag %s (Atom)"
 msgstr "Nachrichten-Feed des Tags „%s“ (Atom)"
@@ -6378,17 +6428,11 @@ msgstr "Tag „%s“"
 msgid "User profile"
 msgstr "Benutzerprofil"
 
-#. TRANS: DT element in area for user avatar.
-#: actions/tagother.php:81 actions/userauthorization.php:132
-#: lib/userprofile.php:108
-msgid "Photo"
-msgstr "Foto"
-
-#: actions/tagother.php:141
+#: actions/tagother.php:120
 msgid "Tag user"
 msgstr "Benutzer taggen"
 
-#: actions/tagother.php:151
+#: actions/tagother.php:130
 msgid ""
 "Tags for this user (letters, numbers, -, ., and _), comma- or space- "
 "separated"
@@ -6396,14 +6440,19 @@ msgstr ""
 "Tags dieses Benutzers (Buchstaben, Nummer, -, ., und _), durch Komma oder "
 "Leerzeichen getrennt"
 
-#: actions/tagother.php:193
+#: actions/tagother.php:157
+#, php-format
+msgid "Invalid tag: \"%s\""
+msgstr "Ungültiges Stichwort: „%s“"
+
+#: actions/tagother.php:172
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 "Du kannst nur Benutzer taggen, die du abonniert hast oder die dich abonniert "
 "haben."
 
-#: actions/tagother.php:236
+#: actions/tagother.php:215
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
 "Benutze dieses Formular, um Tags deinen Abonnenten oder Abonnements "
@@ -6413,6 +6462,7 @@ msgstr ""
 msgid "No such tag."
 msgstr "Tag nicht vorhanden."
 
+#. TRANS: Client error displayed when trying to unblock a non-blocked user.
 #: actions/unblock.php:59
 msgid "You haven't blocked that user."
 msgstr "Du hast diesen Benutzer nicht blockiert."
@@ -6433,7 +6483,7 @@ msgstr "Keine Profil-ID in der Anfrage."
 msgid "Unsubscribed"
 msgstr "Abbestellt"
 
-#: actions/updateprofile.php:64 actions/userauthorization.php:337
+#: actions/updateprofile.php:64
 #, php-format
 msgid ""
 "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
@@ -6441,6 +6491,77 @@ msgstr ""
 "Die Benutzerlizenz „%1$s“ ist nicht kompatibel mit der Lizenz der Seite „%2"
 "$s“."
 
+#: actions/urlsettings.php:60
+#, fuzzy
+msgid "URL settings"
+msgstr "IM-Einstellungen"
+
+#. TRANS: Instructions for tab "Other" in user profile settings.
+#: actions/urlsettings.php:72
+msgid "Manage various other options."
+msgstr "Verwalte zahlreiche andere Einstellungen."
+
+#. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
+#. TRANS: user's profile settings. This message has one space at the beginning. Use your
+#. TRANS: language's word separator here if it has one (most likely a single space).
+#: actions/urlsettings.php:115
+msgid " (free service)"
+msgstr " (freier Dienst)"
+
+#: actions/urlsettings.php:121
+#, fuzzy
+msgid "[none]"
+msgstr "Nichts"
+
+#: actions/urlsettings.php:122
+msgid "[internal]"
+msgstr ""
+
+#. TRANS: Label for dropdown with URL shortener services.
+#: actions/urlsettings.php:130
+msgid "Shorten URLs with"
+msgstr "URLs kürzen mit"
+
+#. TRANS: Tooltip for for dropdown with URL shortener services.
+#: actions/urlsettings.php:132
+msgid "Automatic shortening service to use."
+msgstr "URL-Auto-Kürzungs-Dienst."
+
+#: actions/urlsettings.php:138
+msgid "URL longer than"
+msgstr ""
+
+#: actions/urlsettings.php:141
+msgid "URLs longer than this will be shortened, 0 means always shorten."
+msgstr ""
+
+#: actions/urlsettings.php:145
+msgid "Text longer than"
+msgstr ""
+
+#: actions/urlsettings.php:148
+msgid ""
+"URLs in notices longer than this will be shortened, 0 means always shorten."
+msgstr ""
+
+#. TRANS: Form validation error for form "Other settings" in user profile.
+#: actions/urlsettings.php:180
+msgid "URL shortening service is too long (maximum 50 characters)."
+msgstr "URL-Auto-Kürzungs-Dienst ist zu lang (maximal 50 Zeichen)."
+
+#: actions/urlsettings.php:187
+msgid "Invalid number for max url length."
+msgstr ""
+
+#: actions/urlsettings.php:193
+#, fuzzy
+msgid "Invalid number for max notice length."
+msgstr "Ungültiger Nachrichteninhalt."
+
+#: actions/urlsettings.php:238
+msgid "Error saving user URL shortening preferences."
+msgstr ""
+
 #. TRANS: User admin panel title
 #: actions/useradminpanel.php:58
 msgctxt "TITLE"
@@ -6466,11 +6587,11 @@ msgstr "Willkommens-Nachricht ungültig. Maximale Länge sind 255 Zeichen."
 #. TRANS: users in user admin panel. %1$s is the invalid nickname.
 #: actions/useradminpanel.php:166
 #, fuzzy, php-format
-msgid "Invalid default subscripton: '%1$s' is not a user."
+msgid "Invalid default subscripton: \"%1$s\" is not a user."
 msgstr "Ungültiges Standard-Abonnement: „%1$s“ ist kein Benutzer."
 
-#. TRANS: Link description in user account settings menu.
-#: actions/useradminpanel.php:215 lib/accountsettingsaction.php:106
+#: actions/useradminpanel.php:215 lib/action.php:565 lib/settingsnav.php:77
+#: lib/subgroupnav.php:81
 msgid "Profile"
 msgstr "Profil"
 
@@ -6527,59 +6648,63 @@ msgstr "Ist es Benutzern erlaubt, neue Benutzer einzuladen."
 #. TRANS: Title for button to save user settings in user admin panel.
 #: actions/useradminpanel.php:302
 #, fuzzy
-msgid "Save user settings"
+msgid "Save user settings."
 msgstr "Benutzer-Einstellungen speichern"
 
-#: actions/userauthorization.php:105
+#. TRANS: Page title.
+#: actions/userauthorization.php:109
 msgid "Authorize subscription"
 msgstr "Abonnement bestätigen"
 
-#: actions/userauthorization.php:110
+#. TRANS: Page notice on "Auhtorize subscription" page.
+#: actions/userauthorization.php:115
 #, fuzzy
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
 "user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
-"click “Reject”."
+"click \"Reject\"."
 msgstr ""
 "Bitte überprüfe diese Angaben, um sicher zu gehen, dass du die Nachrichten "
 "dieses Benutzers abonnieren möchtest. Wenn du das nicht wolltest, klicke auf "
 "„Abbrechen“."
 
-#. TRANS: Menu item for site administration
-#: actions/userauthorization.php:196 actions/version.php:167
-#: lib/adminpanelaction.php:403
-msgid "License"
-msgstr "Lizenz"
-
-#: actions/userauthorization.php:217
+#. TRANS: Button text on Authorise Subscription page.
+#: actions/userauthorization.php:200
 #, fuzzy
+msgctxt "BUTTON"
 msgid "Accept"
 msgstr "Akzeptieren"
 
-#: actions/userauthorization.php:218 lib/subscribeform.php:115
-#: lib/subscribeform.php:139
-msgid "Subscribe to this user"
+#. TRANS: Title for button on Authorise Subscription page.
+#: actions/userauthorization.php:202
+#, fuzzy
+msgid "Subscribe to this user."
 msgstr "Abonniere diesen Benutzer"
 
-#: actions/userauthorization.php:219
+#. TRANS: Button text on Authorise Subscription page.
+#: actions/userauthorization.php:204
 #, fuzzy
+msgctxt "BUTTON"
 msgid "Reject"
 msgstr "Ablehnen"
 
-#: actions/userauthorization.php:220
+#. TRANS: Title for button on Authorise Subscription page.
+#: actions/userauthorization.php:206
 #, fuzzy
-msgid "Reject this subscription"
+msgid "Reject this subscription."
 msgstr "Abonnement ablehnen"
 
-#: actions/userauthorization.php:232
+#. TRANS: Client error displayed for an empty authorisation request.
+#: actions/userauthorization.php:219
 msgid "No authorization request!"
 msgstr "Keine Bestätigungsanfrage!"
 
-#: actions/userauthorization.php:254
+#. TRANS: Accept message header from Authorise subscription page.
+#: actions/userauthorization.php:242
 msgid "Subscription authorized"
 msgstr "Abonnement autorisiert"
 
-#: actions/userauthorization.php:256
+#: actions/userauthorization.php:245
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to authorize the "
@@ -6589,11 +6714,12 @@ msgstr ""
 "Lies nochmal die Anweisungen auf der Seite wie Abonnements bestätigt werden. "
 "Dein Abonnement-Token ist:"
 
-#: actions/userauthorization.php:266
+#. TRANS: Reject message header from Authorise subscription page.
+#: actions/userauthorization.php:256
 msgid "Subscription rejected"
 msgstr "Abonnement abgelehnt"
 
-#: actions/userauthorization.php:268
+#: actions/userauthorization.php:259
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to fully reject the "
@@ -6603,48 +6729,73 @@ msgstr ""
 "zurückgegeben. Lies nochmal die Anweisungen der Seite, wie Abonnements "
 "vollständig abgelehnt werden. Dein Abonnement-Token ist:"
 
-#: actions/userauthorization.php:303
+#. TRANS: Exception thrown when no valid user is found for an authorisation request.
+#. TRANS: %s is a listener URI.
+#: actions/userauthorization.php:296
 #, fuzzy, php-format
-msgid "Listener URI ‘%s’ not found here."
+msgid "Listener URI \"%s\" not found here."
 msgstr "Eine Listener-URI „%s“ wurde hier nicht gefunden."
 
-#: actions/userauthorization.php:308
+#. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
+#. TRANS: %s is a listenee URI.
+#: actions/userauthorization.php:303
 #, fuzzy, php-format
-msgid "Listenee URI ‘%s’ is too long."
+msgid "Listenee URI \"%s\" is too long."
 msgstr "Die URI „%s“ für den Stream ist zu lang."
 
-#: actions/userauthorization.php:314
+#. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
+#. TRANS: %s is a listenee URI.
+#: actions/userauthorization.php:311
 #, fuzzy, php-format
-msgid "Listenee URI ‘%s’ is a local user."
+msgid "Listenee URI \"%s\" is a local user."
 msgstr "Die URI „%s“ für den Stream ist ein lokaler Benutzer."
 
+#. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
+#. TRANS: %s is a profile URL.
 #: actions/userauthorization.php:329
 #, fuzzy, php-format
-msgid "Profile URL ‘%s’ is for a local user."
+msgid "Profile URL \"%s\" is for a local user."
 msgstr "Profiladresse „%s“ ist für einen lokalen Benutzer."
 
-#: actions/userauthorization.php:345
+#. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
+#. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
+#: actions/userauthorization.php:339
 #, fuzzy, php-format
-msgid "Avatar URL ‘%s’ is not valid."
+msgid ""
+"Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
+"\"."
+msgstr ""
+"Die Benutzerlizenz „%1$s“ ist nicht kompatibel mit der Lizenz der Seite „%2"
+"$s“."
+
+#. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
+#. TRANS: %s is an avatar URL.
+#: actions/userauthorization.php:349
+#, fuzzy, php-format
+msgid "Avatar URL \"%s\" is not valid."
 msgstr "Avataradresse „%s“ ist nicht gültig."
 
-#: actions/userauthorization.php:350
+#. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
+#. TRANS: %s is an avatar URL.
+#: actions/userauthorization.php:356
 #, fuzzy, php-format
-msgid "Can’t read avatar URL ‘%s’."
+msgid "Cannot read avatar URL \"%s\"."
 msgstr "Konnte Avatar-URL nicht öffnen „%s“"
 
-#: actions/userauthorization.php:355
+#. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
+#. TRANS: %s is an avatar URL.
+#: actions/userauthorization.php:363
 #, fuzzy, php-format
-msgid "Wrong image type for avatar URL ‘%s’."
+msgid "Wrong image type for avatar URL \"%s\"."
 msgstr "Falscher Bildtyp für „%s“"
 
 #. TRANS: Page title for profile design page.
-#: actions/userdesignsettings.php:74 lib/designsettings.php:63
+#: actions/userdesignsettings.php:74 lib/designsettings.php:61
 msgid "Profile design"
 msgstr "Profil-Design-Einstellungen"
 
 #. TRANS: Instructions for profile design page.
-#: actions/userdesignsettings.php:84 lib/designsettings.php:74
+#: actions/userdesignsettings.php:84 lib/designsettings.php:72
 msgid ""
 "Customize the way your profile looks with a background image and a colour "
 "palette of your choice."
@@ -6652,10 +6803,28 @@ msgstr ""
 "Stelle ein wie deine Profilseite aussehen soll. Hintergrundbild und "
 "Farbpalette sind frei wählbar."
 
-#: actions/userdesignsettings.php:272
+#: actions/userdesignsettings.php:289
 msgid "Enjoy your hotdog!"
 msgstr "Hab Spaß!"
 
+#: actions/userdesignsettings.php:325
+#, fuzzy
+msgid "Design settings"
+msgstr "Website-Einstellungen speichern"
+
+#: actions/userdesignsettings.php:340
+msgid "View profile designs"
+msgstr "Profil-Designs ansehen"
+
+#: actions/userdesignsettings.php:341
+msgid "Show or hide profile designs."
+msgstr "Profil-Designs anzeigen oder verstecken."
+
+#: actions/userdesignsettings.php:348
+#, fuzzy
+msgid "Background file"
+msgstr "Hintergrund"
+
 #. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number.
 #: actions/usergroups.php:66
 #, php-format
@@ -6706,6 +6875,11 @@ msgstr ""
 msgid "Contributors"
 msgstr "Mitarbeiter"
 
+#. TRANS: Menu item for site administration
+#: actions/version.php:167 lib/adminpanelaction.php:403
+msgid "License"
+msgstr "Lizenz"
+
 #: actions/version.php:170
 msgid ""
 "StatusNet is free software: you can redistribute it and/or modify it under "
@@ -6739,12 +6913,13 @@ msgstr ""
 "Du hast eine Kopie der GNU Affero General Public License zusammen mit diesem "
 "Programm erhalten. Wenn nicht, siehe %s."
 
-#: actions/version.php:191
-msgid "Plugins"
-msgstr "Erweiterungen"
+#. TRANS: Form input field label for application name.
+#: actions/version.php:197 lib/applicationeditform.php:190
+msgid "Name"
+msgstr "Name"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:901
+#: actions/version.php:198 lib/action.php:885
 msgid "Version"
 msgstr "Version"
 
@@ -6752,6 +6927,12 @@ msgstr "Version"
 msgid "Author(s)"
 msgstr "Autor(en)"
 
+#. TRANS: Form input field label.
+#: actions/version.php:200 lib/applicationeditform.php:208
+#: lib/groupeditform.php:168
+msgid "Description"
+msgstr "Beschreibung"
+
 #. TRANS: Activity title when marking a notice as favorite.
 #: classes/Fave.php:164
 msgid "Favor"
@@ -6876,7 +7057,7 @@ msgid "Could not create login token for %s"
 msgstr "Konnte keinen Login-Token für %s erstellen"
 
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
-#: classes/Memcached_DataObject.php:542
+#: classes/Memcached_DataObject.php:556
 msgid "No database name or DSN found anywhere."
 msgstr "Nirgendwo einen Datenbanknamen oder DSN gefunden."
 
@@ -7057,18 +7238,18 @@ msgstr "%1$s folgt nun %2$s."
 
 #. TRANS: Notice given on user registration.
 #. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:395
+#: classes/User.php:390
 #, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr "Herzlich willkommen bei %1$s, @%2$s!"
 
 #. TRANS: Server exception.
-#: classes/User.php:918
+#: classes/User.php:923
 msgid "No single user defined for single-user mode."
 msgstr "Kein einzelner Benutzer für den Ein-Benutzer-Modus ausgewählt."
 
 #. TRANS: Server exception.
-#: classes/User.php:922
+#: classes/User.php:927
 msgid "Single-user mode code called when not enabled."
 msgstr ""
 
@@ -7113,41 +7294,6 @@ msgstr ""
 msgid "No AtomPub API service for %s."
 msgstr ""
 
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:104
-msgid "Change your profile settings"
-msgstr "Ändern der Profileinstellungen"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:111
-msgid "Upload an avatar"
-msgstr "Avatar hochladen"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:118
-msgid "Change your password"
-msgstr "Ändere dein Passwort"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:125
-msgid "Change email handling"
-msgstr "Ändere die E-Mail-Verarbeitung"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:132
-msgid "Design your profile"
-msgstr "Passe dein Profil an"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:139
-msgid "Other options"
-msgstr "Sonstige Optionen"
-
-#. TRANS: Link description in user account settings menu.
-#: lib/accountsettingsaction.php:141
-msgid "Other"
-msgstr "Sonstige"
-
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
 #: lib/action.php:161
 #, php-format
@@ -7165,206 +7311,128 @@ msgctxt "TOOLTIP"
 msgid "Show more"
 msgstr "Mehr anzeigen"
 
-#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:544
-msgid "Primary site navigation"
-msgstr "Hauptnavigation"
+#. TRANS: Inline reply form submit button: submits a reply comment.
+#: lib/action.php:328
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Comment"
+msgstr "Inhalt"
 
-#. TRANS: Tooltip for main menu option "Personal".
-#: lib/action.php:550
-msgctxt "TOOLTIP"
-msgid "Personal profile and friends timeline"
-msgstr "Persönliches Profil und Freundes-Zeitleiste"
+#. TRANS: Placeholder text for inline reply form. Clicking in this box will turn it into a mini notice form.
+#: lib/action.php:331
+msgid "Add a comment..."
+msgstr ""
 
-#. TRANS: Main menu option when logged in for access to personal profile and friends timeline.
-#. TRANS: Personal group navigation menu option when logged in for viewing timeline of self and friends.
-#: lib/action.php:553 lib/personalgroupnav.php:100
-msgctxt "MENU"
-msgid "Personal"
-msgstr "Eigene"
+#: lib/action.php:559 lib/personalgroupnav.php:99
+#, fuzzy
+msgid "Home"
+msgstr "Homepage"
 
-#. TRANS: Tooltip for main menu option "Account".
-#: lib/action.php:555
-msgctxt "TOOLTIP"
-msgid "Change your email, avatar, password, profile"
-msgstr "Ändere deine E-Mail, Avatar, Passwort und Profil"
-
-#. TRANS: Main menu option when logged in for access to user settings.
-#: lib/action.php:558
-msgid "Account"
-msgstr "Profil"
-
-#. TRANS: Tooltip for main menu option "Services".
 #: lib/action.php:560
-msgctxt "TOOLTIP"
-msgid "Connect to services"
-msgstr "Zum Dienst verbinden"
+#, fuzzy
+msgid "Friends timeline"
+msgstr "%s-Zeitleiste"
 
-#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services.
-#: lib/action.php:563
-msgid "Connect"
-msgstr "Verbinden"
-
-#. TRANS: Tooltip for menu option "Admin".
 #: lib/action.php:566
-msgctxt "TOOLTIP"
-msgid "Change site configuration"
-msgstr "Seiteneinstellung ändern"
+#, fuzzy
+msgid "Your profile"
+msgstr "Gruppenprofil"
 
-#. TRANS: Main menu option when logged in and site admin for access to site configuration.
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/action.php:569 lib/groupnav.php:117
-msgctxt "MENU"
-msgid "Admin"
-msgstr "Admin"
+#: lib/action.php:570 lib/action.php:593 lib/publicgroupnav.php:78
+msgid "Public"
+msgstr "Zeitleiste"
 
-#. TRANS: Tooltip for main menu option "Invite".
-#: lib/action.php:573
-#, php-format
-msgctxt "TOOLTIP"
-msgid "Invite friends and colleagues to join you on %s"
-msgstr "Lade Freunde und Kollegen ein dir auf %s zu folgen"
+#: lib/action.php:571 lib/action.php:594
+#, fuzzy
+msgid "Everyone on this site"
+msgstr "Finde Leute auf dieser Seite"
+
+#: lib/action.php:575
+#, fuzzy
+msgid "Settings"
+msgstr "SMS-Einstellungen"
 
-#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users.
 #: lib/action.php:576
-msgctxt "MENU"
-msgid "Invite"
-msgstr "Einladen"
+#, fuzzy
+msgid "Change your personal settings"
+msgstr "Ändern der Profileinstellungen"
 
-#. TRANS: Tooltip for main menu option "Logout"
 #: lib/action.php:582
-msgctxt "TOOLTIP"
-msgid "Logout from the site"
-msgstr "Von der Seite abmelden"
+#, fuzzy
+msgid "Site configuration"
+msgstr "Benutzereinstellung"
 
-#. TRANS: Main menu option when logged in to log out the current user.
-#: lib/action.php:585
-msgctxt "MENU"
+#: lib/action.php:587
+#, fuzzy
 msgid "Logout"
 msgstr "Abmelden"
 
-#. TRANS: Tooltip for main menu option "Register".
-#: lib/action.php:590
-msgctxt "TOOLTIP"
-msgid "Create an account"
-msgstr "Neues Benutzerkonto erstellen"
+#: lib/action.php:588
+#, fuzzy
+msgid "Logout from the site"
+msgstr "Von der Seite abmelden"
 
-#. TRANS: Main menu option when not logged in to register a new account.
-#. TRANS: Menu item for registering with the StatusNet site.
-#: lib/action.php:593 lib/logingroupnav.php:85
-msgctxt "MENU"
-msgid "Register"
-msgstr "Registrieren"
-
-#. TRANS: Tooltip for main menu option "Login".
-#: lib/action.php:596
-msgctxt "TOOLTIP"
+#: lib/action.php:599
+#, fuzzy
 msgid "Login to the site"
 msgstr "Auf der Seite anmelden"
 
-#. TRANS: Main menu option when not logged in to log in.
-#. TRANS: Menu item for logging in to the StatusNet site.
-#: lib/action.php:599 lib/logingroupnav.php:77
-msgctxt "MENU"
-msgid "Login"
-msgstr "Anmelden"
-
-#. TRANS: Tooltip for main menu option "Help".
-#: lib/action.php:602
-msgctxt "TOOLTIP"
-msgid "Help me!"
-msgstr "Hilf mir!"
-
-#. TRANS: Main menu option for help on the StatusNet site.
-#: lib/action.php:605
-msgctxt "MENU"
-msgid "Help"
-msgstr "Hilfe"
-
-#. TRANS: Tooltip for main menu option "Search".
-#: lib/action.php:608
-msgctxt "TOOLTIP"
-msgid "Search for people or text"
-msgstr "Suche nach Leuten oder Text"
-
-#. TRANS: Main menu option when logged in or when the StatusNet instance is not private.
-#: lib/action.php:611
-msgctxt "MENU"
+#: lib/action.php:606
+#, fuzzy
 msgid "Search"
 msgstr "Suchen"
 
-#. TRANS: DT element for site notice. String is hidden in default CSS.
-#. TRANS: Menu item for site administration
-#: lib/action.php:633 lib/adminpanelaction.php:387
-msgid "Site notice"
-msgstr "Seitennachricht"
-
-#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:700
-msgid "Local views"
-msgstr "Lokale Ansichten"
-
-#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:770
-msgid "Page notice"
-msgstr "Neue Nachricht"
-
-#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:874
-msgid "Secondary site navigation"
-msgstr "Unternavigation"
+#: lib/action.php:607
+#, fuzzy
+msgid "Search the site"
+msgstr "Website durchsuchen"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:880
+#: lib/action.php:864
 msgid "Help"
 msgstr "Hilfe"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:883
+#: lib/action.php:867
 msgid "About"
 msgstr "Über"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:886
+#: lib/action.php:870
 msgid "FAQ"
 msgstr "FAQ"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:891
+#: lib/action.php:875
 msgid "TOS"
 msgstr "AGB"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:895
+#: lib/action.php:879
 msgid "Privacy"
 msgstr "Privatsphäre"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:898
+#: lib/action.php:882
 msgid "Source"
 msgstr "Quellcode"
 
 #. TRANS: Secondary navigation menu option leading to e-mail contact information on the
 #. TRANS: StatusNet site, where to report bugs, ...
-#: lib/action.php:905
+#: lib/action.php:889
 msgid "Contact"
 msgstr "Kontakt"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:908
+#: lib/action.php:892
 msgid "Badge"
 msgstr "Plakette"
 
-#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:937
-msgid "StatusNet software license"
-msgstr "StatusNet-Software-Lizenz"
-
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:944
+#: lib/action.php:921
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7374,7 +7442,7 @@ msgstr ""
 "site.broughtbyurl%%)."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:947
+#: lib/action.php:924
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** ist ein Mikrobloggingdienst."
@@ -7383,7 +7451,7 @@ msgstr "**%%site.name%%** ist ein Mikrobloggingdienst."
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:954
+#: lib/action.php:931
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7394,21 +7462,16 @@ msgstr ""
 "(Version %s) betrieben, die unter der [GNU Affero General Public License]"
 "(http://www.fsf.org/licensing/licenses/agpl-3.0.html) erhältlich ist."
 
-#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:970
-msgid "Site content license"
-msgstr "StatusNet-Software-Lizenz"
-
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:977
+#: lib/action.php:949
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr "Inhalte und Daten von %1$s sind privat und vertraulich."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:984
+#: lib/action.php:956
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
@@ -7416,7 +7479,7 @@ msgstr ""
 "vorbehalten."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:988
+#: lib/action.php:960
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 "Urheberrecht von Inhalt und Daten liegt bei den Beteiligten. Alle Rechte "
@@ -7424,25 +7487,20 @@ msgstr ""
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:1020
+#: lib/action.php:992
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr "Alle Inhalte und Daten von %1$s sind unter der %2$s Lizenz verfügbar."
 
-#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1356
-msgid "Pagination"
-msgstr "Seitenerstellung"
-
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1367
+#: lib/action.php:1335
 msgid "After"
 msgstr "Später"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1377
+#: lib/action.php:1345
 msgid "Before"
 msgstr "Vorher"
 
@@ -7596,7 +7654,7 @@ msgid "User configuration"
 msgstr "Benutzereinstellung"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:122
+#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:110
 msgid "User"
 msgstr "Benutzer"
 
@@ -7620,6 +7678,11 @@ msgstr "Sitzungseinstellungen"
 msgid "Edit site notice"
 msgstr "Seitennachricht bearbeiten"
 
+#. TRANS: Menu item for site administration
+#: lib/adminpanelaction.php:387
+msgid "Site notice"
+msgstr "Seitennachricht"
+
 #. TRANS: Menu item title/tooltip
 #: lib/adminpanelaction.php:393
 msgid "Snapshots configuration"
@@ -7630,6 +7693,12 @@ msgstr "Snapshot-Konfiguration"
 msgid "Set site license"
 msgstr "Website-Lizenz einstellen"
 
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:409
+#, fuzzy
+msgid "Plugins configuration"
+msgstr "Pfadkonfiguration"
+
 #. TRANS: Client error 401.
 #: lib/apiauth.php:111
 msgid "API resource requires read-write access, but you only have read access."
@@ -7640,19 +7709,23 @@ msgstr "API-Ressource erfordert lesen/schreib Zugriff; du hast nur Leserechte."
 msgid "No application for that consumer key."
 msgstr "Kein Programm mit diesem Anwender-Schlüssel."
 
+#: lib/apiauth.php:202 lib/apiauth.php:284
+msgid "Not allowed to use API."
+msgstr ""
+
 #. TRANS: OAuth exception given when an incorrect access token was given for a user.
-#: lib/apiauth.php:219
+#: lib/apiauth.php:225
 msgid "Bad access token."
 msgstr "Schlechter Zugangstoken."
 
 #. TRANS: OAuth exception given when no user was found for a given token (no token was found).
-#: lib/apiauth.php:224
+#: lib/apiauth.php:230
 msgid "No user for that token."
 msgstr "Kein Benutzer mit diesem Token."
 
 #. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel".
 #. TRANS: Client error thrown when authentication fails.
-#: lib/apiauth.php:266 lib/apiauth.php:293
+#: lib/apiauth.php:272 lib/apiauth.php:302
 msgid "Could not authenticate you."
 msgstr "Konnte dich nicht authentifizieren."
 
@@ -7697,6 +7770,11 @@ msgstr "Versuchte, unbekanntes Token ungültig zu machen."
 msgid "Failed to delete revoked token."
 msgstr "Konnte ungültig gemachtes Token nicht löschen."
 
+#. TRANS: Form input field label for application icon.
+#: lib/applicationeditform.php:177
+msgid "Icon"
+msgstr "Symbol"
+
 #. TRANS: Form guide.
 #: lib/applicationeditform.php:182
 msgid "Icon for this application"
@@ -7731,6 +7809,11 @@ msgstr "Quelladresse"
 msgid "Organization responsible for this application"
 msgstr "Für diese Anwendung verantwortliche Organisation"
 
+#. TRANS: Form input field label.
+#: lib/applicationeditform.php:227
+msgid "Organization"
+msgstr "Organisation"
+
 #. TRANS: Form input field instructions.
 #: lib/applicationeditform.php:234
 msgid "URL for the homepage of the organization"
@@ -7822,16 +7905,6 @@ msgstr "Das „author“-Element muss ein „name“-Element erhaten."
 msgid "Do not use this method!"
 msgstr "Diese Gruppe nicht löschen"
 
-#. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:293
-msgid "Author"
-msgstr "Autor"
-
-#. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:307
-msgid "Provider"
-msgstr "Anbieter"
-
 #. TRANS: Title.
 #: lib/attachmentnoticesection.php:67
 msgid "Notices where this attachment appears"
@@ -7857,23 +7930,28 @@ msgstr "Passwort kann nicht geändert werden."
 msgid "Block"
 msgstr "Blockieren"
 
+#. TRANS: Description of the form to block a user.
+#: lib/blockform.php:79
+msgid "Block this user"
+msgstr "Diesen Benutzer blockieren"
+
 #. TRANS: Title for command results.
-#: lib/channel.php:160 lib/channel.php:181
+#: lib/channel.php:104 lib/channel.php:125
 msgid "Command results"
 msgstr "Befehl-Ergebnisse"
 
 #. TRANS: Title for command results.
-#: lib/channel.php:194
+#: lib/channel.php:138
 msgid "AJAX error"
 msgstr "Ajax-Fehler"
 
 #. TRANS: E-mail subject when a command has completed.
-#: lib/channel.php:233 lib/mailhandler.php:143
+#: lib/channel.php:177 lib/mailhandler.php:143
 msgid "Command complete"
 msgstr "Befehl ausgeführt"
 
 #. TRANS: E-mail subject when a command has failed.
-#: lib/channel.php:244
+#: lib/channel.php:188
 msgid "Command failed"
 msgstr "Befehl fehlgeschlagen"
 
@@ -7976,7 +8054,7 @@ msgstr "Bürgerlicher Name: %s"
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a location.
-#: lib/command.php:446 lib/mail.php:270
+#: lib/command.php:446 lib/mail.php:275
 #, php-format
 msgid "Location: %s"
 msgstr "Standort: %s"
@@ -7984,7 +8062,7 @@ msgstr "Standort: %s"
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a homepage.
-#: lib/command.php:450 lib/mail.php:274
+#: lib/command.php:450 lib/mail.php:279
 #, php-format
 msgid "Homepage: %s"
 msgstr "Homepage: %s"
@@ -8258,108 +8336,101 @@ msgstr ""
 "tracking - noch nicht implementiert\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:162
+#: lib/common.php:36
 msgid "No configuration file found."
 msgstr "Keine Konfigurationsdatei gefunden."
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:165
+#: lib/common.php:39
 msgid "I looked for configuration files in the following places:"
 msgstr "Ich habe an folgenden Stellen nach Konfigurationsdateien gesucht:"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:168
+#: lib/common.php:42
 msgid "You may wish to run the installer to fix this."
 msgstr "Bitte die Installation erneut starten, um das Problem zu beheben."
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:172
+#: lib/common.php:46
 msgid "Go to the installer."
 msgstr "Zur Installation gehen."
 
-#. TRANS: Menu item for Instant Messaging settings.
-#: lib/connectsettingsaction.php:106
-msgctxt "MENU"
-msgid "IM"
-msgstr "IM"
-
-#. TRANS: Tooltip for Instant Messaging menu item.
-#: lib/connectsettingsaction.php:108
-msgid "Updates by instant messenger (IM)"
-msgstr "Aktualisierungen via Instant Messenger (IM)"
-
-#. TRANS: Menu item for Short Message Service settings.
-#: lib/connectsettingsaction.php:113
-msgctxt "MENU"
-msgid "SMS"
-msgstr "SMS"
-
-#. TRANS: Tooltip for Short Message Service menu item.
-#: lib/connectsettingsaction.php:115
-msgid "Updates by SMS"
-msgstr "Aktualisierungen via SMS"
-
-#. TRANS: Menu item for OuAth connection settings.
-#: lib/connectsettingsaction.php:120
-msgctxt "MENU"
-msgid "Connections"
-msgstr "Verbindungen"
-
-#. TRANS: Tooltip for connected applications (Connections through OAuth) menu item.
-#: lib/connectsettingsaction.php:122
-msgid "Authorized connected applications"
-msgstr "Programme mit Zugriffserlaubnis"
-
 #: lib/dberroraction.php:59
 msgid "Database error"
 msgstr "Datenbankfehler."
 
+#. TRANS: Description of form for deleting a user.
+#: lib/deleteuserform.php:75
+msgid "Delete this user"
+msgstr "Diesen Benutzer löschen"
+
+#: lib/designform.php:114
+#, fuzzy
+msgid "Change design"
+msgstr "Design speichern"
+
+#. TRANS: Fieldset legend on profile design page to change profile page colours.
+#: lib/designform.php:131
+msgid "Change colours"
+msgstr "Farben ändern"
+
+#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
+#: lib/designform.php:138
+msgid "Use defaults"
+msgstr "Standardeinstellungen benutzen"
+
+#. TRANS: Title for button on profile design page to reset all colour settings to default.
+#: lib/designform.php:140
+msgid "Restore default designs"
+msgstr "Standard-Design wiederherstellen"
+
+#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
+#: lib/designform.php:148
+msgid "Reset back to default"
+msgstr "Standard wiederherstellen"
+
 #. TRANS: Label in form on profile design page.
 #. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
-#: lib/designsettings.php:108
+#: lib/designform.php:158
 msgid "Upload file"
 msgstr "Datei hochladen"
 
 #. TRANS: Instructions for form on profile design page.
-#: lib/designsettings.php:113
+#: lib/designform.php:163
+#, fuzzy
 msgid ""
-"You can upload your personal background image. The maximum file size is 2MB."
+"You can upload your personal background image. The maximum file size is 2Mb."
 msgstr ""
 "Du kannst dein persönliches Hintergrundbild hochladen. Die maximale "
 "Dateigröße ist 2 MB."
 
 #. TRANS: Radio button on profile design page that will enable use of the uploaded profile image.
-#: lib/designsettings.php:139
+#: lib/designform.php:194
 msgctxt "RADIO"
 msgid "On"
 msgstr "An"
 
 #. TRANS: Radio button on profile design page that will disable use of the uploaded profile image.
-#: lib/designsettings.php:156
+#: lib/designform.php:211
 msgctxt "RADIO"
 msgid "Off"
 msgstr "Aus"
 
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: lib/designsettings.php:175
-msgid "Change colours"
-msgstr "Farben ändern"
-
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: lib/designsettings.php:257
-msgid "Use defaults"
-msgstr "Standardeinstellungen benutzen"
+#. TRANS: Title for button on profile design page to save settings.
+#: lib/designform.php:322
+msgid "Save design"
+msgstr "Design speichern"
 
 #. TRANS: Error message displayed if design settings could not be saved.
 #. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
-#: lib/designsettings.php:405 lib/designsettings.php:427
+#: lib/designsettings.php:216 lib/designsettings.php:238
 msgid "Couldn't update your design."
 msgstr "Konnte dein Design nicht aktualisieren."
 
 #. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
-#: lib/designsettings.php:433
+#: lib/designsettings.php:244
 msgid "Design defaults restored."
 msgstr "Standard-Design wieder hergestellt."
 
@@ -8429,27 +8500,23 @@ msgstr ""
 msgid "Feeds"
 msgstr "Feeds"
 
-#: lib/galleryaction.php:121
-msgid "Filter tags"
-msgstr "Tags filtern"
-
-#: lib/galleryaction.php:131
+#: lib/galleryaction.php:128
 msgid "All"
 msgstr "Alle"
 
-#: lib/galleryaction.php:139
+#: lib/galleryaction.php:136
 msgid "Select tag to filter"
 msgstr "Wähle ein Tag, um die Liste einzuschränken"
 
-#: lib/galleryaction.php:140
+#: lib/galleryaction.php:137
 msgid "Tag"
 msgstr "Tag"
 
-#: lib/galleryaction.php:141
+#: lib/galleryaction.php:138
 msgid "Choose a tag to narrow list"
 msgstr "Wähle ein Tag, um die Liste einzuschränken"
 
-#: lib/galleryaction.php:143
+#: lib/galleryaction.php:140
 msgid "Go"
 msgstr "Los geht's"
 
@@ -8539,6 +8606,12 @@ msgctxt "TOOLTIP"
 msgid "%s blocked users"
 msgstr "Blockierte Benutzer der Gruppe „%s“"
 
+#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
+#: lib/groupnav.php:117
+msgctxt "MENU"
+msgid "Admin"
+msgstr "Admin"
+
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
 #: lib/groupnav.php:120
@@ -8648,39 +8721,62 @@ msgid_plural "%dB"
 msgstr[0] "%d Byte"
 msgstr[1] "%d Bytes"
 
-#: lib/jabber.php:387
+#: lib/implugin.php:262
 #, php-format
-msgid "[%s]"
-msgstr "[%s]"
+msgid ""
+"User \"%s\" on %s has said that your %s screenname belongs to them. If "
+"that's true, you can confirm by clicking on this URL: %s . (If you cannot "
+"click it, copy-and-paste it into the address bar of your browser). If that "
+"user isn't you, or if you didn't request this confirmation, just ignore this "
+"message."
+msgstr ""
 
-#: lib/jabber.php:567
+#: lib/implugin.php:349
 #, php-format
 msgid "Unknown inbox source %d."
 msgstr "Unbekannte inbox-Quelle %d."
 
+#: lib/implugin.php:485
+#, fuzzy, php-format
+msgid "Message too long - maximum is %1$d characters, you sent %2$d."
+msgstr ""
+"Nachricht zu lang - maximal ein Zeichen erlaubt, du hast %2$d gesendet."
+
 #: lib/leaveform.php:114
 msgid "Leave"
 msgstr "Verlassen"
 
+#. TRANS: Menu item for logging in to the StatusNet site.
+#: lib/logingroupnav.php:77
+msgctxt "MENU"
+msgid "Login"
+msgstr "Anmelden"
+
 #. TRANS: Title for menu item for logging in to the StatusNet site.
 #: lib/logingroupnav.php:79
 msgid "Login with a username and password"
 msgstr "Mit Benutzernamen und Passwort anmelden"
 
+#. TRANS: Menu item for registering with the StatusNet site.
+#: lib/logingroupnav.php:85
+msgctxt "MENU"
+msgid "Register"
+msgstr "Registrieren"
+
 #. TRANS: Title for menu item for registering with the StatusNet site.
 #: lib/logingroupnav.php:87
 msgid "Sign up for a new account"
 msgstr "Registriere ein neues Benutzerkonto"
 
 #. TRANS: Subject for address confirmation email.
-#: lib/mail.php:168
+#: lib/mail.php:172
 msgid "Email address confirmation"
 msgstr "Bestätigung der E-Mail-Adresse"
 
 #. TRANS: Body for address confirmation email.
 #. TRANS: %1$s is the addressed user's nickname, %2$s is the StatusNet sitename,
 #. TRANS: %3$s is the URL to confirm at.
-#: lib/mail.php:173
+#: lib/mail.php:177
 #, php-format
 msgid ""
 "Hey, %1$s.\n"
@@ -8712,14 +8808,14 @@ msgstr ""
 
 #. TRANS: Subject of new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
-#: lib/mail.php:238
+#: lib/mail.php:243
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1$s hat deine Nachrichten auf „%2$s“ abonniert."
 
 #. TRANS: This is a paragraph in a new-subscriber e-mail.
 #. TRANS: %s is a URL where the subscriber can be reported as abusive.
-#: lib/mail.php:245
+#: lib/mail.php:250
 #, php-format
 msgid ""
 "If you believe this account is being used abusively, you can block them from "
@@ -8734,7 +8830,7 @@ msgstr ""
 #. TRANS: %3$s is the subscriber's profile URL, %4$s is the subscriber's location (or empty)
 #. TRANS: %5$s is the subscriber's homepage URL (or empty), %6%s is the subscriber's bio (or empty)
 #. TRANS: %7$s is a link to the addressed user's e-mail settings.
-#: lib/mail.php:255
+#: lib/mail.php:260
 #, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -8762,14 +8858,14 @@ msgstr ""
 
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is biographical information.
-#: lib/mail.php:278
+#: lib/mail.php:283
 #, php-format
 msgid "Bio: %s"
 msgstr "Biografie: %s"
 
 #. TRANS: Subject of notification mail for new posting email address.
 #. TRANS: %s is the StatusNet sitename.
-#: lib/mail.php:307
+#: lib/mail.php:312
 #, php-format
 msgid "New email address for posting to %s"
 msgstr "Neue E-Mail-Adresse, um auf „%s“ zu schreiben"
@@ -8777,7 +8873,7 @@ msgstr "Neue E-Mail-Adresse, um auf „%s“ zu schreiben"
 #. TRANS: Body of notification mail for new posting email address.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is the e-mail address to send
 #. TRANS: to to post by e-mail, %3$s is a URL to more instructions.
-#: lib/mail.php:313
+#: lib/mail.php:318
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -8800,19 +8896,19 @@ msgstr ""
 
 #. TRANS: Subject line for SMS-by-email notification messages.
 #. TRANS: %s is the posting user's nickname.
-#: lib/mail.php:434
+#: lib/mail.php:439
 #, php-format
 msgid "%s status"
 msgstr "%s Status"
 
 #. TRANS: Subject line for SMS-by-email address confirmation message.
-#: lib/mail.php:460
+#: lib/mail.php:465
 msgid "SMS confirmation"
 msgstr "SMS-Konfiguration"
 
 #. TRANS: Main body heading for SMS-by-email address confirmation message.
 #. TRANS: %s is the addressed user's nickname.
-#: lib/mail.php:464
+#: lib/mail.php:469
 #, php-format
 msgid "%s: confirm you own this phone number with this code:"
 msgstr ""
@@ -8821,7 +8917,7 @@ msgstr ""
 
 #. TRANS: Subject for 'nudge' notification email.
 #. TRANS: %s is the nudging user.
-#: lib/mail.php:485
+#: lib/mail.php:490
 #, fuzzy, php-format
 msgid "You have been nudged by %s"
 msgstr "Du wurdest von „%s“ angestupst"
@@ -8829,7 +8925,7 @@ msgstr "Du wurdest von „%s“ angestupst"
 #. TRANS: Body for 'nudge' notification email.
 #. TRANS: %1$s is the nuding user's long name, $2$s is the nudging user's nickname,
 #. TRANS: %3$s is a URL to post notices at, %4$s is the StatusNet sitename.
-#: lib/mail.php:492
+#: lib/mail.php:497
 #, php-format
 msgid ""
 "%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -8858,7 +8954,7 @@ msgstr ""
 
 #. TRANS: Subject for direct-message notification email.
 #. TRANS: %s is the sending user's nickname.
-#: lib/mail.php:539
+#: lib/mail.php:544
 #, php-format
 msgid "New private message from %s"
 msgstr "Neue private Nachricht von „%s“"
@@ -8867,7 +8963,7 @@ msgstr "Neue private Nachricht von „%s“"
 #. TRANS: %1$s is the sending user's long name, %2$s is the sending user's nickname,
 #. TRANS: %3$s is the message content, %4$s a URL to the message,
 #. TRANS: %5$s is the StatusNet sitename.
-#: lib/mail.php:547
+#: lib/mail.php:552
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -8902,7 +8998,7 @@ msgstr ""
 
 #. TRANS: Subject for favorite notification e-mail.
 #. TRANS: %1$s is the adding user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:599
+#: lib/mail.php:604
 #, php-format
 msgid "%1$s (@%2$s) added your notice as a favorite"
 msgstr "%1$s (@%2$s) hat deine Nachricht als Favorit gespeichert"
@@ -8912,7 +9008,7 @@ msgstr "%1$s (@%2$s) hat deine Nachricht als Favorit gespeichert"
 #. TRANS: %3$s is a URL to the faved notice, %4$s is the faved notice text,
 #. TRANS: %5$s is a URL to all faves of the adding user, %6$s is the StatusNet sitename,
 #. TRANS: %7$s is the adding user's nickname.
-#: lib/mail.php:606
+#: lib/mail.php:611
 #, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -8944,7 +9040,7 @@ msgstr ""
 "%6$s\n"
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:664
+#: lib/mail.php:669
 #, php-format
 msgid ""
 "The full conversation can be read here:\n"
@@ -8957,7 +9053,7 @@ msgstr ""
 
 #. TRANS: E-mail subject for notice notification.
 #. TRANS: %1$s is the sending user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:672
+#: lib/mail.php:677
 #, php-format
 msgid "%1$s (@%2$s) sent a notice to your attention"
 msgstr ""
@@ -8970,7 +9066,7 @@ msgstr ""
 #. TRANS: %5$s is a URL to the full conversion if it exists (otherwise empty),
 #. TRANS: %6$s is a URL to reply to the notice, %7$s is a URL to all @-replied for the addressed user,
 #. TRANS: %8$s is a URL to the addressed user's e-mail settings, %9$s is the sender's nickname.
-#: lib/mail.php:680
+#: lib/mail.php:685
 #, php-format
 msgid ""
 "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -9116,11 +9212,7 @@ msgstr "Nicht abonniert!"
 msgid "To"
 msgstr "An"
 
-#: lib/messageform.php:166 lib/noticeform.php:186
-msgid "Available characters"
-msgstr "Verfügbare Zeichen"
-
-#: lib/messageform.php:185 lib/noticeform.php:237
+#: lib/messageform.php:184 lib/noticeform.php:236
 msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr "Senden"
@@ -9130,17 +9222,10 @@ msgstr "Senden"
 msgid "Messages"
 msgstr "Nachricht"
 
-#: lib/messagelistitem.php:123 lib/noticelist.php:522
+#: lib/messagelistitem.php:123 lib/noticelist.php:527
 msgid "from"
 msgstr "von"
 
-#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:165
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr ""
-"Der Benutzername darf nur aus Kleinbuchstaben und Zahlen bestehen. "
-"Leerzeichen sind nicht erlaubt."
-
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 #: lib/nickname.php:178
 msgid "Nickname cannot be empty."
@@ -9163,23 +9248,23 @@ msgstr "Nachricht senden"
 msgid "What's up, %s?"
 msgstr "Was geht, %s?"
 
-#: lib/noticeform.php:194
+#: lib/noticeform.php:193
 msgid "Attach"
 msgstr "Anhängen"
 
-#: lib/noticeform.php:198
+#: lib/noticeform.php:197
 msgid "Attach a file"
 msgstr "Datei anhängen"
 
-#: lib/noticeform.php:213
+#: lib/noticeform.php:212
 msgid "Share my location"
 msgstr "Teile meinen Aufenthaltsort"
 
-#: lib/noticeform.php:216
+#: lib/noticeform.php:215
 msgid "Do not share my location"
 msgstr "Teile meinen Aufenthaltsort nicht"
 
-#: lib/noticeform.php:217
+#: lib/noticeform.php:216
 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
 "try again later"
@@ -9188,55 +9273,59 @@ msgstr ""
 "Bitte versuche es später wieder."
 
 #. TRANS: Used in coordinates as abbreviation of north
-#: lib/noticelist.php:452
+#: lib/noticelist.php:457
 msgid "N"
 msgstr "N"
 
 #. TRANS: Used in coordinates as abbreviation of south
-#: lib/noticelist.php:454
+#: lib/noticelist.php:459
 msgid "S"
 msgstr "S"
 
 #. TRANS: Used in coordinates as abbreviation of east
-#: lib/noticelist.php:456
+#: lib/noticelist.php:461
 msgid "E"
 msgstr "O"
 
 #. TRANS: Used in coordinates as abbreviation of west
-#: lib/noticelist.php:458
+#: lib/noticelist.php:463
 msgid "W"
 msgstr "W"
 
-#: lib/noticelist.php:460
+#: lib/noticelist.php:465
 #, php-format
 msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 
-#: lib/noticelist.php:469
+#: lib/noticelist.php:474
 msgid "at"
 msgstr "in"
 
-#: lib/noticelist.php:518
+#: lib/noticelist.php:523
 msgid "web"
 msgstr "Web"
 
-#: lib/noticelist.php:584
+#: lib/noticelist.php:589
 msgid "in context"
 msgstr "im Zusammenhang"
 
-#: lib/noticelist.php:619
+#: lib/noticelist.php:624
 msgid "Repeated by"
 msgstr "Wiederholt von"
 
-#: lib/noticelist.php:646
+#: lib/noticelist.php:651
 msgid "Reply to this notice"
 msgstr "Auf diese Nachricht antworten"
 
-#: lib/noticelist.php:647
+#: lib/noticelist.php:652
 msgid "Reply"
 msgstr "Antworten"
 
-#: lib/noticelist.php:691
+#: lib/noticelist.php:678
+msgid "Delete this notice"
+msgstr "Nachricht löschen"
+
+#: lib/noticelist.php:696
 msgid "Notice repeated"
 msgstr "Nachricht wiederholt"
 
@@ -9273,47 +9362,31 @@ msgstr "Doppelte Nachricht."
 msgid "Couldn't insert new subscription."
 msgstr "Konnte neues Abonnement nicht eintragen."
 
-#. TRANS: Personal group navigation menu option when logged in for viewing @-replies.
-#: lib/personalgroupnav.php:107
+#: lib/personalgroupnav.php:104
 #, fuzzy
-msgctxt "MENU"
 msgid "Replies"
 msgstr "Antworten"
 
-#. TRANS: Personal group navigation menu option when logged in for seeing own profile.
-#: lib/personalgroupnav.php:114
+#: lib/personalgroupnav.php:109
 #, fuzzy
-msgctxt "MENU"
-msgid "Profile"
-msgstr "Profil"
-
-#. TRANS: Personal group navigation menu option when logged in for viewing own favourited notices.
-#: lib/personalgroupnav.php:120
-#, fuzzy
-msgctxt "MENU"
 msgid "Favorites"
 msgstr "Favoriten"
 
-#. TRANS: Personal group navigation menu option when logged in for viewing recieved personal messages.
-#: lib/personalgroupnav.php:133
-msgctxt "MENU"
+#: lib/personalgroupnav.php:120
+#, fuzzy
 msgid "Inbox"
 msgstr "Posteingang"
 
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing recieved personal messages.
-#: lib/personalgroupnav.php:135
+#: lib/personalgroupnav.php:121
 msgid "Your incoming messages"
 msgstr "Deine eingehenden Nachrichten"
 
-#. TRANS: Personal group navigation menu option when logged in for viewing senet personal messages.
-#: lib/personalgroupnav.php:140
+#: lib/personalgroupnav.php:125
 #, fuzzy
-msgctxt "MENU"
 msgid "Outbox"
 msgstr "Postausgang"
 
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing senet personal messages.
-#: lib/personalgroupnav.php:142
+#: lib/personalgroupnav.php:126
 msgid "Your sent messages"
 msgstr "Deine gesendeten Nachrichten"
 
@@ -9328,9 +9401,26 @@ msgstr "Tags in den Nachrichten von „%s“"
 msgid "Unknown"
 msgstr "Unbekannt"
 
+#. TRANS: Plugin admin panel controls
+#: lib/plugindisableform.php:90
+msgctxt "plugin"
+msgid "Disable"
+msgstr ""
+
+#. TRANS: Plugin admin panel controls
+#: lib/pluginenableform.php:112
+msgctxt "plugin"
+msgid "Enable"
+msgstr ""
+
+#: lib/pluginlist.php:196
+msgctxt "plugin-description"
+msgid "(Plugin descriptions unavailable when disabled.)"
+msgstr ""
+
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:82
+#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:88
 msgid "Subscriptions"
 msgstr "Abonnements"
 
@@ -9341,7 +9431,7 @@ msgstr "Alle Abonnements"
 
 #. TRANS: H2 text for user subscriber statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:90
+#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:96
 msgid "Subscribers"
 msgstr "Abonnenten"
 
@@ -9363,7 +9453,7 @@ msgstr "Mitglied seit"
 #. TRANS: Label for user statistics.
 #. TRANS: H2 text for user group membership statistics.
 #: lib/profileaction.php:239 lib/profileaction.php:290
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:104
 msgid "Groups"
 msgstr "Gruppen"
 
@@ -9383,10 +9473,6 @@ msgstr "Alle Gruppen"
 msgid "Unimplemented method."
 msgstr "Nicht unterstützte Methode."
 
-#: lib/publicgroupnav.php:78
-msgid "Public"
-msgstr "Zeitleiste"
-
 #: lib/publicgroupnav.php:82
 msgid "User groups"
 msgstr "Benutzer-Gruppen"
@@ -9425,7 +9511,7 @@ msgid "Revoke the \"%s\" role from this user"
 msgstr "Widerrufe die „%s“-Rolle von diesem Benutzer"
 
 #. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:974
+#: lib/router.php:1001
 msgid "Page not found."
 msgstr "Seite nicht gefunden."
 
@@ -9454,11 +9540,6 @@ msgctxt "BUTTON"
 msgid "Search"
 msgstr "Suchen"
 
-#. TRANS: Definition list item with instructions on how to get (better) search results.
-#: lib/searchaction.php:170
-msgid "Search help"
-msgstr "Hilfe suchen"
-
 #: lib/searchgroupnav.php:80
 msgid "People"
 msgstr "Leute"
@@ -9483,6 +9564,51 @@ msgstr "Abschnitt ohne Titel"
 msgid "More..."
 msgstr "Mehr …"
 
+#: lib/settingsnav.php:78
+msgid "Change your profile settings"
+msgstr "Ändern der Profileinstellungen"
+
+#: lib/settingsnav.php:83
+msgid "Upload an avatar"
+msgstr "Avatar hochladen"
+
+#: lib/settingsnav.php:88
+msgid "Change your password"
+msgstr "Ändere dein Passwort"
+
+#: lib/settingsnav.php:93
+msgid "Change email handling"
+msgstr "Ändere die E-Mail-Verarbeitung"
+
+#: lib/settingsnav.php:98
+msgid "Design your profile"
+msgstr "Passe dein Profil an"
+
+#: lib/settingsnav.php:102
+msgid "URL"
+msgstr "URL"
+
+#: lib/settingsnav.php:103
+msgid "URL shorteners"
+msgstr ""
+
+#: lib/settingsnav.php:111
+msgid "Updates by instant messenger (IM)"
+msgstr "Aktualisierungen via Instant Messenger (IM)"
+
+#: lib/settingsnav.php:118
+msgid "Updates by SMS"
+msgstr "Aktualisierungen via SMS"
+
+#: lib/settingsnav.php:123
+#, fuzzy
+msgid "Connections"
+msgstr "Verbindungen"
+
+#: lib/settingsnav.php:124
+msgid "Authorized connected applications"
+msgstr "Programme mit Zugriffserlaubnis"
+
 #: lib/silenceform.php:67
 msgid "Silence"
 msgstr "Stummschalten"
@@ -9491,30 +9617,34 @@ msgstr "Stummschalten"
 msgid "Silence this user"
 msgstr "Benutzer verstummen lassen"
 
-#: lib/subgroupnav.php:83
+#: lib/subgroupnav.php:89
 #, php-format
 msgid "People %s subscribes to"
 msgstr "Leute, die „%s“ abonniert hat"
 
-#: lib/subgroupnav.php:91
+#: lib/subgroupnav.php:97
 #, php-format
 msgid "People subscribed to %s"
 msgstr "Leute, die „%s“ abonniert haben"
 
-#: lib/subgroupnav.php:99
+#: lib/subgroupnav.php:105
 #, php-format
 msgid "Groups %s is a member of"
 msgstr "Gruppen, in denen „%s“ Mitglied ist"
 
-#: lib/subgroupnav.php:105
+#: lib/subgroupnav.php:111
 msgid "Invite"
 msgstr "Einladen"
 
-#: lib/subgroupnav.php:106
+#: lib/subgroupnav.php:112
 #, php-format
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Lade Freunde und Kollegen ein, dir auf „%s“ zu folgen"
 
+#: lib/subscribeform.php:115 lib/subscribeform.php:139
+msgid "Subscribe to this user"
+msgstr "Abonniere diesen Benutzer"
+
 #: lib/subscriberspeopleselftagcloudsection.php:48
 #: lib/subscriptionspeopleselftagcloudsection.php:48
 msgid "People Tagcloud as self-tagged"
@@ -9590,6 +9720,13 @@ msgstr "Das Theme enthält Dateien des Types „.%s“, die nicht erlaubt sind."
 msgid "Error opening theme archive."
 msgstr "Fehler beim Öffnen des Theme-Archives."
 
+#: lib/threadednoticelist.php:270
+#, php-format
+msgid "Show all %d comment"
+msgid_plural "Show all %d comments"
+msgstr[0] ""
+msgstr[1] ""
+
 #: lib/topposterssection.php:74
 msgid "Top posters"
 msgstr "Top-Schreiber"
@@ -9631,76 +9768,80 @@ msgstr "Abbestellen"
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "Benutzer „%1$s“ (%2$d) hat kein Profil."
 
-#. TRANS: Link text for changeing the avatar of the logged in user.
-#: lib/userprofile.php:121
+#: lib/userprofile.php:116
 msgid "Edit Avatar"
 msgstr "Avatar bearbeiten"
 
 #. TRANS: H2 for user actions in a profile.
 #. TRANS: H2 for entity actions in a profile.
-#: lib/userprofile.php:245 lib/userprofile.php:261
+#: lib/userprofile.php:216 lib/userprofile.php:232
 msgid "User actions"
 msgstr "Benutzeraktionen"
 
 #. TRANS: Text shown in user profile of not yet compeltely deleted users.
-#: lib/userprofile.php:249
+#: lib/userprofile.php:220
 msgid "User deletion in progress..."
 msgstr "Löschung des Benutzers in Arbeit …"
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:277
+#: lib/userprofile.php:248
 msgid "Edit profile settings"
 msgstr "Profil-Einstellungen ändern"
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:279
+#: lib/userprofile.php:250
 msgid "Edit"
 msgstr "Bearbeiten"
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:303
+#: lib/userprofile.php:274
 msgid "Send a direct message to this user"
 msgstr "Direkte Nachricht an Benutzer versenden"
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:305
+#: lib/userprofile.php:276
 msgid "Message"
 msgstr "Nachricht"
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:347
+#: lib/userprofile.php:318
 msgid "Moderate"
 msgstr "Moderieren"
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:386
+#: lib/userprofile.php:357
 msgid "User role"
 msgstr "Benutzerrolle"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:389
+#: lib/userprofile.php:360
 msgctxt "role"
 msgid "Administrator"
 msgstr "Administrator"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:391
+#: lib/userprofile.php:362
 msgctxt "role"
 msgid "Moderator"
 msgstr "Moderator"
 
+#: lib/util.php:321
+#, fuzzy
+msgid "Not allowed to log in."
+msgstr "Nicht angemeldet."
+
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1306
+#: lib/util.php:1337
 msgid "a few seconds ago"
 msgstr "vor wenigen Sekunden"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1309
+#: lib/util.php:1340
 msgid "about a minute ago"
 msgstr "vor einer Minute"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1313
+#: lib/util.php:1344
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
@@ -9708,12 +9849,12 @@ msgstr[0] "vor ca. einer Minute"
 msgstr[1] "vor ca. %d Minuten"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1316
+#: lib/util.php:1347
 msgid "about an hour ago"
 msgstr "vor einer Stunde"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1320
+#: lib/util.php:1351
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
@@ -9721,12 +9862,12 @@ msgstr[0] "vor ca. einer Stunde"
 msgstr[1] "vor ca. %d Stunden"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1323
+#: lib/util.php:1354
 msgid "about a day ago"
 msgstr "vor einem Tag"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1327
+#: lib/util.php:1358
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
@@ -9734,12 +9875,12 @@ msgstr[0] "vor ca. einem Tag"
 msgstr[1] "vor ca. %d Tagen"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1330
+#: lib/util.php:1361
 msgid "about a month ago"
 msgstr "vor einem Monat"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1334
+#: lib/util.php:1365
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
@@ -9747,7 +9888,7 @@ msgstr[0] "vor ca. einem Monat"
 msgstr[1] "vor ca. %d Monaten"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1337
+#: lib/util.php:1368
 msgid "about a year ago"
 msgstr "vor ca. einem Jahr"
 
@@ -9758,25 +9899,6 @@ msgstr "vor ca. einem Jahr"
 msgid "%s is not a valid color! Use 3 or 6 hex characters."
 msgstr "„%s“ ist keine gültige Farbe! Verwende 3 oder 6 Hex-Zeichen."
 
-#. TRANS: %s is the URL to the StatusNet site's Instant Messaging settings.
-#: lib/xmppmanager.php:287
-#, php-format
-msgid "Unknown user. Go to %s to add your address to your account"
-msgstr ""
-"Unbekannter Benutzer. Gehe zu %s, um deine Adresse deinem Benutzerkonto "
-"hinzuzufügen."
-
-#. TRANS: Response to XMPP source when it sent too long a message.
-#. TRANS: %1$d the maximum number of allowed characters (used for plural), %2$d is the sent number.
-#: lib/xmppmanager.php:406
-#, php-format
-msgid "Message too long. Maximum is %1$d character, you sent %2$d."
-msgid_plural "Message too long. Maximum is %1$d characters, you sent %2$d."
-msgstr[0] ""
-"Nachricht zu lang - maximal ein Zeichen erlaubt, du hast %2$d gesendet."
-msgstr[1] ""
-"Nachricht zu lang - maximal %1$d Zeichen erlaubt, du hast %2$d gesendet."
-
 #. TRANS: Exception.
 #: lib/xrd.php:63
 msgid "Invalid XML."
@@ -9793,73 +9915,182 @@ msgstr ""
 msgid "Getting backup from file '%s'."
 msgstr "Hole Backup von der Datei „%s“."
 
-#~ msgid "Block this user."
-#~ msgstr "Diesen Benutzer blockieren."
+#~ msgid "Could not generate feed for group - %s"
+#~ msgstr "Konnte keinen Gruppen-Feed erstellen - %s"
 
 #, fuzzy
-#~ msgid "Delete this notice."
-#~ msgstr "Nachricht löschen"
-
-#, fuzzy
-#~ msgid "Delete this user."
-#~ msgstr "Diesen Benutzer löschen"
-
-#, fuzzy
-#~ msgid "Restore default designs."
-#~ msgstr "Standard-Design wiederherstellen"
-
-#, fuzzy
-#~ msgid "Reset back to default."
-#~ msgstr "Standard wiederherstellen"
-
-#, fuzzy
-#~ msgid "Save design."
-#~ msgstr "Design speichern"
-
-#, fuzzy
-#~ msgid "Disfavor favorite."
-#~ msgstr "Aus Favoriten entfernen"
-
-#, fuzzy
-#~ msgid "\"%s\" not found."
-#~ msgstr "API-Methode nicht gefunden."
-
-#, fuzzy
-#~ msgid "Notice %s not found."
-#~ msgstr "API-Methode nicht gefunden."
-
-#, fuzzy
-#~ msgid "Attachment %s not found."
-#~ msgstr "Empfänger nicht gefunden."
-
-#, fuzzy
-#~ msgid "Invalid tag: \"%s\"."
-#~ msgstr "Ungültiges Stichwort: „%s“"
-
-#, fuzzy
-#~ msgid "%s updates from everyone."
-#~ msgstr "%s Nachrichten von allen!"
-
-#, fuzzy
-#~ msgid "Password saved"
-#~ msgstr "Passwort gespeichert."
-
-#, fuzzy
-#~ msgid "Where you are, like \"City, State (or Region), Country\"."
-#~ msgstr "Wo du bist, beispielsweise „Stadt, Region, Land“"
-
-#, fuzzy
-#~ msgid "Subscribe to this user."
-#~ msgstr "Abonniere diesen Benutzer"
+#~ msgid "Current confirmed Jabber/Google Talk address."
+#~ msgstr "Aktuelle bestätigte Jabber/GTalk-Adresse"
 
 #, fuzzy
 #~ msgid ""
-#~ "Listenee stream license \"%1$s\" is not compatible with site license \"%2"
-#~ "$s\"."
+#~ "Jabber or Google Talk address, like \"UserName@example.org\". First, make "
+#~ "sure to add %s to your buddy list in your IM client or on Google Talk."
 #~ msgstr ""
-#~ "Die Benutzerlizenz „%1$s“ ist nicht kompatibel mit der Lizenz der Seite „%"
-#~ "2$s“."
+#~ "Jabber- oder GoogleTalk-Adresse, beispielsweise „Benutzername@example."
+#~ "org“. Aber versichere dich zuerst, dass du %s in deine Kontaktliste in "
+#~ "deinem IM-Programm oder GTalk aufgenommen hast."
 
 #, fuzzy
-#~ msgid "Not allowed to log in."
-#~ msgstr "Nicht angemeldet."
+#~ msgid "Send me notices through Jabber/Google Talk."
+#~ msgstr "Schicke mir Nachrichten mittels Jabber/GTalk."
+
+#, fuzzy
+#~ msgid "Publish a MicroID for my Jabber/Google Talk address."
+#~ msgstr "MicroID für meine Jabber/GTalk-Adresse veröffentlichen."
+
+#~ msgid "No Jabber ID."
+#~ msgstr "Keine Jabber-ID"
+
+#, fuzzy
+#~ msgid "Not a valid Jabber ID."
+#~ msgstr "Ungültige Jabber-ID"
+
+#~ msgid "That is already your Jabber ID."
+#~ msgstr "Diese Jabber-ID hast du schon angegeben."
+
+#~ msgid "That is not your Jabber ID."
+#~ msgstr "Dies ist nicht deine Jabber-ID."
+
+#~ msgid "Other settings"
+#~ msgstr "Andere Einstellungen"
+
+#~ msgid "Tag cloud"
+#~ msgstr "Tag-Wolke"
+
+#~ msgid "Consumer key"
+#~ msgstr "Anwender-Schlüssel"
+
+#~ msgid "Consumer secret"
+#~ msgstr "Anwender-Geheimnis"
+
+#~ msgid "Request token URL"
+#~ msgstr "Anfrage-Token Adresse"
+
+#~ msgid "Access token URL"
+#~ msgstr "Zugriffs-Token-Adresse"
+
+#~ msgid "Authorize URL"
+#~ msgstr "Autorisationadresse"
+
+#~ msgid "Jabber"
+#~ msgstr "Jabber"
+
+#~ msgid "Photo"
+#~ msgstr "Foto"
+
+#~ msgid "Other options"
+#~ msgstr "Sonstige Optionen"
+
+#~ msgid "Other"
+#~ msgstr "Sonstige"
+
+#~ msgid "Primary site navigation"
+#~ msgstr "Hauptnavigation"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Personal profile and friends timeline"
+#~ msgstr "Persönliches Profil und Freundes-Zeitleiste"
+
+#~ msgctxt "MENU"
+#~ msgid "Personal"
+#~ msgstr "Eigene"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Change your email, avatar, password, profile"
+#~ msgstr "Ändere deine E-Mail, Avatar, Passwort und Profil"
+
+#~ msgid "Account"
+#~ msgstr "Profil"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Connect to services"
+#~ msgstr "Zum Dienst verbinden"
+
+#~ msgid "Connect"
+#~ msgstr "Verbinden"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Change site configuration"
+#~ msgstr "Seiteneinstellung ändern"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Invite friends and colleagues to join you on %s"
+#~ msgstr "Lade Freunde und Kollegen ein dir auf %s zu folgen"
+
+#~ msgctxt "MENU"
+#~ msgid "Invite"
+#~ msgstr "Einladen"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Create an account"
+#~ msgstr "Neues Benutzerkonto erstellen"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Help me!"
+#~ msgstr "Hilf mir!"
+
+#~ msgctxt "MENU"
+#~ msgid "Help"
+#~ msgstr "Hilfe"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Search for people or text"
+#~ msgstr "Suche nach Leuten oder Text"
+
+#~ msgid "Local views"
+#~ msgstr "Lokale Ansichten"
+
+#~ msgid "Page notice"
+#~ msgstr "Neue Nachricht"
+
+#~ msgid "Secondary site navigation"
+#~ msgstr "Unternavigation"
+
+#~ msgid "StatusNet software license"
+#~ msgstr "StatusNet-Software-Lizenz"
+
+#~ msgid "Site content license"
+#~ msgstr "StatusNet-Software-Lizenz"
+
+#~ msgid "Pagination"
+#~ msgstr "Seitenerstellung"
+
+#~ msgid "Author"
+#~ msgstr "Autor"
+
+#~ msgid "Provider"
+#~ msgstr "Anbieter"
+
+#~ msgctxt "MENU"
+#~ msgid "SMS"
+#~ msgstr "SMS"
+
+#~ msgid "Filter tags"
+#~ msgstr "Tags filtern"
+
+#~ msgid "[%s]"
+#~ msgstr "[%s]"
+
+#~ msgid "Available characters"
+#~ msgstr "Verfügbare Zeichen"
+
+#, fuzzy
+#~ msgctxt "MENU"
+#~ msgid "Profile"
+#~ msgstr "Profil"
+
+#~ msgid "Search help"
+#~ msgstr "Hilfe suchen"
+
+#~ msgid "Unknown user. Go to %s to add your address to your account"
+#~ msgstr ""
+#~ "Unbekannter Benutzer. Gehe zu %s, um deine Adresse deinem Benutzerkonto "
+#~ "hinzuzufügen."
+
+#~ msgid "Message too long. Maximum is %1$d character, you sent %2$d."
+#~ msgid_plural "Message too long. Maximum is %1$d characters, you sent %2$d."
+#~ msgstr[0] ""
+#~ "Nachricht zu lang - maximal ein Zeichen erlaubt, du hast %2$d gesendet."
+#~ msgstr[1] ""
+#~ "Nachricht zu lang - maximal %1$d Zeichen erlaubt, du hast %2$d gesendet."
diff --git a/locale/en_GB/LC_MESSAGES/statusnet.po b/locale/en_GB/LC_MESSAGES/statusnet.po
index d76f992885..2be861f699 100644
--- a/locale/en_GB/LC_MESSAGES/statusnet.po
+++ b/locale/en_GB/LC_MESSAGES/statusnet.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 15:58+0000\n"
-"PO-Revision-Date: 2011-03-03 16:00:21+0000\n"
+"POT-Creation-Date: 2011-03-03 17:23+0000\n"
+"PO-Revision-Date: 2011-03-03 17:25:52+0000\n"
 "Language-Team: British English <http://translatewiki.net/wiki/Portal:en-gb>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -80,23 +80,23 @@ msgstr "Save access settings"
 #. TRANS: Tooltip for button to save access settings in site admin panel.
 #. TRANS: Button text for saving theme settings.
 #. TRANS: Button label to save e-mail preferences.
-#. TRANS: Button label to save Instant Messaging preferences.
-#. TRANS: Button text for saving "Other settings" in profile.
+#. TRANS: Button label to save IM preferences.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
 #. TRANS: Button text for saving site notice in admin panel.
 #. TRANS: Button label to save SMS preferences.
 #. TRANS: Save button for settings for a profile in a subscriptions list.
+#. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
 #. TRANS: Button text on profile design page to save settings.
 #: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
-#: actions/emailsettings.php:250 actions/imsettings.php:183
-#: actions/othersettings.php:136 actions/pathsadminpanel.php:512
-#: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
-#: actions/smssettings.php:205 actions/subscriptions.php:259
+#: actions/emailsettings.php:251 actions/imsettings.php:199
+#: actions/pathsadminpanel.php:512 actions/profilesettings.php:198
+#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:204
+#: actions/subscriptions.php:261 actions/urlsettings.php:152
 #: actions/useradminpanel.php:298 lib/applicationeditform.php:355
-#: lib/designsettings.php:270 lib/groupeditform.php:201
+#: lib/designform.php:320 lib/groupeditform.php:201
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Save"
@@ -135,7 +135,11 @@ msgstr "No such page."
 #. 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 use "one time password login" without using an existing user.
+#. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
+#. TRANS: Client error displayed trying to find a user by ID for a non-existing ID.
+#. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when calling a profile action without specifying a user.
 #: actions/all.php:80 actions/allrss.php:69
@@ -147,19 +151,19 @@ msgstr "No such page."
 #: actions/apidirectmessage.php:75 actions/apidirectmessagenew.php:72
 #: actions/apigroupcreate.php:111 actions/apigroupismember.php:89
 #: actions/apigroupjoin.php:98 actions/apigroupleave.php:98
-#: actions/apigrouplist.php:70 actions/apistatusesupdate.php:230
-#: actions/apisubscriptions.php:85 actions/apitimelinefavorites.php:70
-#: actions/apitimelinefriends.php:173 actions/apitimelinehome.php:78
-#: actions/apitimelinementions.php:77 actions/apitimelineuser.php:79
-#: actions/avatarbynickname.php:79 actions/favoritesrss.php:72
-#: actions/foaf.php:42 actions/foaf.php:61 actions/hcard.php:67
-#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
-#: actions/remotesubscribe.php:144 actions/remotesubscribe.php:153
-#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
-#: actions/showfavorites.php:106 actions/userbyid.php:74
-#: actions/usergroups.php:93 actions/userrss.php:40 actions/userxrd.php:59
-#: actions/xrds.php:71 lib/command.php:509 lib/galleryaction.php:59
-#: lib/mailbox.php:80 lib/profileaction.php:77
+#: actions/apigrouplist.php:70 actions/apigroupprofileupdate.php:108
+#: actions/apistatusesupdate.php:230 actions/apisubscriptions.php:85
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:173
+#: actions/apitimelinehome.php:78 actions/apitimelinementions.php:77
+#: actions/apitimelineuser.php:79 actions/avatarbynickname.php:79
+#: actions/favoritesrss.php:72 actions/foaf.php:42 actions/foaf.php:61
+#: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116
+#: actions/otp.php:78 actions/remotesubscribe.php:144
+#: actions/remotesubscribe.php:153 actions/replies.php:73
+#: actions/repliesrss.php:38 actions/rsd.php:113 actions/showfavorites.php:106
+#: actions/userbyid.php:75 actions/usergroups.php:93 actions/userrss.php:40
+#: actions/userxrd.php:59 actions/xrds.php:71 lib/command.php:509
+#: lib/galleryaction.php:59 lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "No such user."
 
@@ -173,10 +177,9 @@ msgstr "%1$s and friends, page %2$d"
 #. TRANS: H1 text for page. %s is a user nickname.
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Timeline title for user and friends. %s is a user nickname.
-#. TRANS: Tooltop for personal group navigation menu option when logged in for viewing timeline of self and friends.
 #: actions/all.php:94 actions/all.php:191 actions/allrss.php:117
 #: actions/apitimelinefriends.php:207 actions/apitimelinehome.php:113
-#: lib/personalgroupnav.php:102
+#: lib/personalgroupnav.php:100
 #, php-format
 msgid "%s and friends"
 msgstr "%s and friends"
@@ -233,7 +236,7 @@ msgstr ""
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
 #. TRANS: Second sentence of empty message for anonymous users. %s is a user nickname.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:227
+#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:221
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -282,19 +285,20 @@ msgstr "Updates from %1$s and friends on %2$s!"
 #: actions/apifavoritecreate.php:98 actions/apifavoritedestroy.php:98
 #: actions/apifriendshipscreate.php:99 actions/apifriendshipsdestroy.php:99
 #: actions/apifriendshipsshow.php:124 actions/apigroupcreate.php:138
-#: actions/apigroupismember.php:115 actions/apigroupjoin.php:160
-#: actions/apigroupleave.php:145 actions/apigrouplist.php:134
+#: actions/apigroupismember.php:115 actions/apigroupjoin.php:151
+#: actions/apigroupleave.php:141 actions/apigrouplist.php:134
 #: actions/apigrouplistall.php:120 actions/apigroupmembership.php:105
+#: actions/apigroupprofileupdate.php:100 actions/apigroupprofileupdate.php:213
 #: actions/apigroupshow.php:114 actions/apihelptest.php:84
 #: actions/apistatusesdestroy.php:101 actions/apistatusesretweets.php:110
 #: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:139
 #: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
-#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:268
-#: actions/apitimelinegroup.php:147 actions/apitimelinehome.php:173
-#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:239
-#: actions/apitimelineretweetedtome.php:118
-#: actions/apitimelineretweetsofme.php:150 actions/apitimelinetag.php:159
-#: actions/apitimelineuser.php:206 actions/apiusershow.php:100
+#: actions/apitimelinefavorites.php:182 actions/apitimelinefriends.php:276
+#: actions/apitimelinegroup.php:148 actions/apitimelinehome.php:181
+#: actions/apitimelinementions.php:182 actions/apitimelinepublic.php:247
+#: actions/apitimelineretweetedtome.php:147
+#: actions/apitimelineretweetsofme.php:147 actions/apitimelinetag.php:165
+#: actions/apitimelineuser.php:217 actions/apiusershow.php:100
 msgid "API method not found."
 msgstr "API method not found."
 
@@ -309,8 +313,9 @@ msgstr "API method not found."
 #: actions/apifavoritecreate.php:88 actions/apifavoritedestroy.php:88
 #: actions/apifriendshipscreate.php:89 actions/apifriendshipsdestroy.php:89
 #: actions/apigroupcreate.php:102 actions/apigroupjoin.php:89
-#: actions/apigroupleave.php:89 actions/apimediaupload.php:66
-#: actions/apistatusesretweet.php:63 actions/apistatusesupdate.php:194
+#: actions/apigroupleave.php:89 actions/apigroupprofileupdate.php:92
+#: actions/apimediaupload.php:66 actions/apistatusesretweet.php:63
+#: actions/apistatusesupdate.php:194
 msgid "This method requires a POST."
 msgstr "This method requires a POST."
 
@@ -324,21 +329,16 @@ msgstr ""
 "none."
 
 #. TRANS: Server error displayed when a user's delivery device cannot be updated.
-#. TRANS: Server error displayed when a user update to the database fails in the contact address confirmation action.
 #. TRANS: Server error thrown on database error updating e-mail preferences.
 #. TRANS: Server error thrown on database error removing a registered e-mail address.
-#. TRANS: Server error thrown on database error updating Instant Messaging preferences.
-#. TRANS: Server error thrown on database error removing a registered Instant Messaging address.
-#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
 #. TRANS: Server error thrown when user profile settings could not be updated.
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
-#: actions/apiaccountupdatedeliverydevice.php:130
-#: actions/confirmaddress.php:118 actions/emailsettings.php:352
-#: actions/emailsettings.php:498 actions/imsettings.php:276
-#: actions/imsettings.php:432 actions/othersettings.php:186
-#: actions/profilesettings.php:322 actions/smssettings.php:301
-#: actions/smssettings.php:454
+#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
+#: actions/apiaccountupdatedeliverydevice.php:136
+#: actions/emailsettings.php:353 actions/emailsettings.php:499
+#: actions/profilesettings.php:323 actions/smssettings.php:300
+#: actions/smssettings.php:453 actions/urlsettings.php:211
 msgid "Could not update user."
 msgstr "Could not update user."
 
@@ -364,7 +364,7 @@ msgstr "User has no profile."
 
 #. TRANS: Server error displayed if a user profile could not be saved.
 #. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:418
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:419
 msgid "Could not save profile."
 msgstr "Could not save profile."
 
@@ -376,7 +376,7 @@ msgstr "Could not save profile."
 #: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
 #: actions/designadminpanel.php:120 actions/editapplication.php:121
 #: actions/newapplication.php:102 actions/newnotice.php:95
-#: lib/designsettings.php:298
+#: lib/designsettings.php:110
 #, fuzzy, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s byte) due to its "
@@ -401,8 +401,8 @@ msgstr[1] ""
 #: actions/apiaccountupdateprofilecolors.php:160
 #: actions/apiaccountupdateprofilecolors.php:171
 #: actions/groupdesignsettings.php:285 actions/groupdesignsettings.php:296
-#: actions/userdesignsettings.php:201 actions/userdesignsettings.php:211
-#: actions/userdesignsettings.php:253 actions/userdesignsettings.php:263
+#: actions/userdesignsettings.php:218 actions/userdesignsettings.php:228
+#: actions/userdesignsettings.php:270 actions/userdesignsettings.php:280
 msgid "Unable to save your design settings."
 msgstr "Unable to save your design settings."
 
@@ -410,7 +410,7 @@ msgstr "Unable to save your design settings."
 #. TRANS: Client error displayed when a database error occurs updating profile colours.
 #: actions/apiaccountupdateprofilebackgroundimage.php:191
 #: actions/apiaccountupdateprofilecolors.php:139
-#: actions/userdesignsettings.php:179
+#: actions/userdesignsettings.php:196
 msgid "Could not update your design."
 msgstr "Could not update your design."
 
@@ -519,7 +519,7 @@ msgstr "Recipient user not found."
 #. TRANS: Client error displayed trying to direct message another user who's not a friend (403).
 #: actions/apidirectmessagenew.php:144
 #, fuzzy
-msgid "Can't send direct messages to users who aren't your friend."
+msgid "Cannot send direct messages to users who aren't your friend."
 msgstr "Can't send direct messages to users who aren't your friend."
 
 #. TRANS: Client error displayed trying to direct message self (403).
@@ -602,9 +602,9 @@ msgstr "Could not find target user."
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:156 actions/editgroup.php:191
-#: actions/newgroup.php:137 actions/profilesettings.php:273
-#: actions/register.php:214
+#: actions/apigroupcreate.php:156 actions/apigroupprofileupdate.php:255
+#: actions/editgroup.php:191 actions/newgroup.php:137
+#: actions/profilesettings.php:274 actions/register.php:199
 msgid "Nickname already in use. Try another one."
 msgstr "Nickname already in use. Try another one."
 
@@ -612,9 +612,9 @@ msgstr "Nickname already in use. Try another one."
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:164 actions/editgroup.php:195
-#: actions/newgroup.php:141 actions/profilesettings.php:243
-#: actions/register.php:216
+#: actions/apigroupcreate.php:164 actions/apigroupprofileupdate.php:259
+#: actions/editgroup.php:195 actions/newgroup.php:141
+#: actions/profilesettings.php:244 actions/register.php:201
 msgid "Not a valid nickname."
 msgstr "Not a valid nickname."
 
@@ -624,10 +624,10 @@ msgstr "Not a valid nickname."
 #. TRANS: Validation error shown when providing an invalid homepage URL in the "New application" form.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:181 actions/editapplication.php:235
-#: actions/editgroup.php:202 actions/newapplication.php:221
-#: actions/newgroup.php:148 actions/profilesettings.php:248
-#: actions/register.php:223
+#: actions/apigroupcreate.php:181 actions/apigroupprofileupdate.php:277
+#: actions/editapplication.php:235 actions/editgroup.php:202
+#: actions/newapplication.php:221 actions/newgroup.php:148
+#: actions/profilesettings.php:249 actions/register.php:208
 msgid "Homepage is not a valid URL."
 msgstr "Homepage is not a valid URL."
 
@@ -636,8 +636,8 @@ msgstr "Homepage is not a valid URL."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:191 actions/editgroup.php:206
-#: actions/newgroup.php:152 actions/profilesettings.php:252
-#: actions/register.php:226
+#: actions/newgroup.php:152 actions/profilesettings.php:253
+#: actions/register.php:211
 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "Full name is too long (max 255 chars)."
@@ -665,8 +665,8 @@ msgstr[1] "Description is too long (max %d chars)"
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:215 actions/editgroup.php:218
-#: actions/newgroup.php:164 actions/profilesettings.php:265
-#: actions/register.php:235
+#: actions/newgroup.php:164 actions/profilesettings.php:266
+#: actions/register.php:220
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
 msgstr "Location is too long (max 255 chars)."
@@ -696,15 +696,16 @@ msgstr "Invalid alias: \"%s\"."
 #. TRANS: %s is the alias that is already in use.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error. %s is the already used alias.
-#: actions/apigroupcreate.php:264 actions/editgroup.php:246
-#: actions/newgroup.php:193
+#: actions/apigroupcreate.php:264 actions/apigroupprofileupdate.php:351
+#: actions/editgroup.php:246 actions/newgroup.php:193
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "Alias \"%s\" already in use. Try another one."
 
 #. TRANS: Client error displayed when trying to use an alias during group creation that is the same as the group's nickname.
 #. TRANS: Group edit form validation error.
-#: actions/apigroupcreate.php:278 actions/editgroup.php:253
+#: actions/apigroupcreate.php:278 actions/apigroupprofileupdate.php:359
+#: actions/editgroup.php:253
 msgid "Alias can't be the same as nickname."
 msgstr "Alias can't be the same as nickname."
 
@@ -716,7 +717,8 @@ msgstr "Alias can't be the same as nickname."
 #. TRANS: Client error displayed requesting most recent notices to a group for a non-existing group.
 #: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
 #: actions/apigroupleave.php:104 actions/apigroupmembership.php:71
-#: actions/apigroupshow.php:81 actions/apitimelinegroup.php:89
+#: actions/apigroupprofileupdate.php:113 actions/apigroupshow.php:81
+#: actions/apitimelinegroup.php:89
 msgid "Group not found."
 msgstr "Group not found."
 
@@ -734,13 +736,11 @@ msgstr "You are already a member of that group."
 msgid "You have been blocked from that group by the admin."
 msgstr "You have been blocked from that group by the admin."
 
-#. TRANS: Server error displayed when joining a group fails.
-#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
 #. 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.
 #. TRANS: Message given having failed to add a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:362
+#: actions/apigroupjoin.php:136 actions/joingroup.php:139 lib/command.php:362
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "Could not join user %1$s to group %2$s."
@@ -750,8 +750,6 @@ msgstr "Could not join user %1$s to group %2$s."
 msgid "You are not a member of this group."
 msgstr "You are not a member of this group."
 
-#. TRANS: Server error displayed when leaving a group fails.
-#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
 #. TRANS: Server error displayed when leaving a group failed in the database.
 #. TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
 #. TRANS: Message given having failed to remove a user from a group.
@@ -787,6 +785,61 @@ msgstr "%s groups"
 msgid "groups on %s"
 msgstr "groups on %s"
 
+#. TRANS: Client error displayed trying to edit a group while not being a group admin.
+#. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
+#. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
+#: actions/apigroupprofileupdate.php:118 actions/editgroup.php:110
+#: actions/editgroup.php:176 actions/groupdesignsettings.php:109
+#: actions/grouplogo.php:111
+msgid "You must be an admin to edit the group."
+msgstr "You must be an admin to edit the group."
+
+#. TRANS: Server error displayed when editing a group fails.
+#: actions/apigroupprofileupdate.php:171 actions/editgroup.php:274
+msgid "Could not update group."
+msgstr "Could not update group."
+
+#. TRANS: Server error displayed when group aliases could not be added.
+#. TRANS: Server exception thrown when creating group aliases failed.
+#: actions/apigroupprofileupdate.php:194 actions/editgroup.php:281
+#: classes/User_group.php:540
+msgid "Could not create aliases."
+msgstr "Could not create aliases."
+
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: actions/apigroupprofileupdate.php:249 lib/nickname.php:165
+msgid "Nickname must have only lowercase letters and numbers and no spaces."
+msgstr "Nickname must have only lowercase letters and numbers, and no spaces."
+
+#: actions/apigroupprofileupdate.php:286
+#, fuzzy
+msgid "Full name is too long (max 255 chars)."
+msgstr "Full name is too long (max 255 chars)."
+
+#: actions/apigroupprofileupdate.php:296
+#, fuzzy, php-format
+msgid "description is too long (max %d chars)."
+msgstr "Description is too long (max %d chars)"
+
+#: actions/apigroupprofileupdate.php:307
+#, fuzzy
+msgid "Location is too long (max 255 chars)."
+msgstr "Location is too long (max 255 chars)."
+
+#: actions/apigroupprofileupdate.php:326
+#, fuzzy, php-format
+msgid "Too many aliases! Maximum %d."
+msgstr "Too many aliases! Maximum %d."
+
+#. TRANS: Group edit form validation error.
+#. TRANS: Group create form validation error.
+#. TRANS: %s is the invalid alias.
+#: actions/apigroupprofileupdate.php:342 actions/editgroup.php:241
+#: actions/newgroup.php:188
+#, php-format
+msgid "Invalid alias: \"%s\""
+msgstr "Invalid alias: \"%s\""
+
 #. TRANS: Client error displayed when uploading a media file has failed.
 #: actions/apimediaupload.php:101
 msgid "Upload failed."
@@ -818,21 +871,22 @@ msgstr "You are not authorised."
 #. TRANS: Form validation error message.
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
+#. TRANS: Client error displayed when the session token is not okay.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
 #: actions/deletenotice.php:177 actions/disfavor.php:75
-#: actions/emailsettings.php:291 actions/favor.php:75 actions/geocode.php:55
+#: actions/emailsettings.php:292 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:65 actions/grouplogo.php:321
-#: actions/groupunblock.php:65 actions/imsettings.php:224
-#: actions/invite.php:60 actions/login.php:137 actions/makeadmin.php:66
-#: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
-#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
-#: actions/othersettings.php:155 actions/passwordsettings.php:138
-#: actions/profilesettings.php:217 actions/recoverpassword.php:383
-#: actions/register.php:172 actions/remotesubscribe.php:76
-#: actions/repeat.php:82 actions/smssettings.php:250 actions/subedit.php:40
-#: actions/subscribe.php:86 actions/tagother.php:166
-#: actions/unsubscribe.php:69 actions/userauthorization.php:52
-#: lib/designsettings.php:310
+#: actions/groupunblock.php:65 actions/imsettings.php:241
+#: actions/invite.php:60 actions/makeadmin.php:66 actions/newmessage.php:135
+#: actions/newnotice.php:105 actions/nudge.php:80
+#: actions/oauthappssettings.php:162 actions/oauthconnectionssettings.php:135
+#: actions/passwordsettings.php:137 actions/pluginenable.php:87
+#: actions/profilesettings.php:218 actions/recoverpassword.php:383
+#: actions/register.php:157 actions/remotesubscribe.php:76
+#: actions/repeat.php:82 actions/smssettings.php:249 actions/subedit.php:40
+#: actions/subscribe.php:87 actions/tagother.php:145
+#: actions/unsubscribe.php:69 actions/urlsettings.php:171
+#: actions/userauthorization.php:53 lib/designsettings.php:122
 msgid "There was a problem with your session token. Try again, please."
 msgstr "There was a problem with your session token. Try again, please."
 
@@ -861,10 +915,10 @@ msgstr "Database error inserting OAuth application user."
 #. TRANS: Unknown form validation error in design settings form.
 #: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
 #: actions/designadminpanel.php:100 actions/editapplication.php:144
-#: actions/emailsettings.php:310 actions/grouplogo.php:332
-#: actions/imsettings.php:239 actions/newapplication.php:124
-#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
-#: actions/smssettings.php:271 lib/designsettings.php:321
+#: actions/emailsettings.php:311 actions/grouplogo.php:332
+#: actions/imsettings.php:256 actions/newapplication.php:124
+#: actions/oauthconnectionssettings.php:144 actions/recoverpassword.php:46
+#: actions/smssettings.php:270 lib/designsettings.php:133
 msgid "Unexpected form submission."
 msgstr "Unexpected form submission."
 
@@ -914,31 +968,26 @@ msgstr "Account"
 
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Field label in form for profile settings.
-#. TRANS: Label for group nickname (dt). Text hidden by default.
-#. TRANS: DT for nick name in a profile.
-#: actions/apioauthauthorize.php:459 actions/login.php:252
-#: actions/profilesettings.php:106 actions/register.php:432
-#: actions/showgroup.php:243 actions/tagother.php:94
+#: actions/apioauthauthorize.php:459 actions/login.php:225
+#: actions/profilesettings.php:107 actions/register.php:411
 #: actions/userauthorization.php:145 lib/groupeditform.php:145
-#: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "Nickname"
 
 #. TRANS: Field label on OAuth API authorisation form.
-#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:463 actions/login.php:255
-#: actions/register.php:436 lib/accountsettingsaction.php:120
+#: actions/apioauthauthorize.php:463 actions/login.php:228
+#: actions/register.php:415 lib/settingsnav.php:87
 msgid "Password"
 msgstr "Password"
 
 #. TRANS: Button text that when clicked will cancel the process of allowing access to an account
 #. TRANS: by an external application.
 #. TRANS: Button label to cancel an e-mail address confirmation procedure.
-#. TRANS: Button label to cancel an Instant Messaging address confirmation procedure.
+#. TRANS: Button label to cancel an IM address confirmation procedure.
 #. TRANS: Button label to cancel a SMS address confirmation procedure.
 #. TRANS: Button label in the "Edit application" form.
-#: actions/apioauthauthorize.php:478 actions/emailsettings.php:124
-#: actions/imsettings.php:127 actions/smssettings.php:133
+#: actions/apioauthauthorize.php:478 actions/emailsettings.php:125
+#: actions/imsettings.php:136 actions/smssettings.php:132
 #: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Cancel"
@@ -1049,7 +1098,7 @@ msgstr "API method not found."
 #. TRANS: %s is the requested output format.
 #: actions/apistatusesshow.php:144
 #, fuzzy, php-format
-msgid "Unsupported format: %s"
+msgid "Unsupported format: %s."
 msgstr "Unsupported format."
 
 #. TRANS: Client error displayed requesting a deleted status.
@@ -1131,13 +1180,6 @@ msgstr "%1$s / Favourites from %2$s"
 msgid "%1$s updates favorited by %2$s / %3$s."
 msgstr "%1$s updates favourited by %2$s / %2$s."
 
-#. TRANS: Server error displayed when generating an Atom feed fails.
-#. TRANS: %s is the error.
-#: actions/apitimelinegroup.php:134
-#, fuzzy, php-format
-msgid "Could not generate feed for group - %s"
-msgstr "Could not delete group %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.
 #: actions/apitimelinementions.php:115
@@ -1154,13 +1196,14 @@ msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr "%1$s updates that reply to updates from %2$s / %3$s."
 
 #. TRANS: Title for site timeline. %s is the StatusNet sitename.
+#. TRANS: Public RSS feed title. %s is the StatusNet site name.
 #: actions/apitimelinepublic.php:193 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "%s public timeline"
 
 #. TRANS: Subtitle for site timeline. %s is the StatusNet sitename.
-#: actions/apitimelinepublic.php:199 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:199
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "%s updates from everyone!"
@@ -1172,21 +1215,33 @@ msgid "Unimplemented."
 msgstr "showForm() not implemented."
 
 #. TRANS: Title for Atom feed "repeated to me". %s is the user nickname.
-#: actions/apitimelineretweetedtome.php:108
+#: actions/apitimelineretweetedtome.php:96
 #, php-format
 msgid "Repeated to %s"
 msgstr "Repeated to %s"
 
+#: actions/apitimelineretweetedtome.php:98
+#, fuzzy, php-format
+msgid "%1$s notices that were to repeated to %2$s / %3$s."
+msgstr "%1$s updates that reply to updates from %2$s / %3$s."
+
 #. TRANS: Title of list of repeated notices of the logged in user.
 #. TRANS: %s is the nickname of the logged in user.
-#: actions/apitimelineretweetsofme.php:112
+#: actions/apitimelineretweetsofme.php:98
 #, php-format
 msgid "Repeats of %s"
 msgstr "Repeats of %s"
 
+#: actions/apitimelineretweetsofme.php:104
+#, fuzzy, php-format
+msgid "%1$s notices that %2$s / %3$s has repeated."
+msgstr "%1$s marked notice %2$s as a favourite."
+
 #. TRANS: Title for timeline with lastest notices with a given tag.
 #. TRANS: %s is the tag.
-#: actions/apitimelinetag.php:101 actions/tag.php:67
+#. TRANS: Title for first page of notices with tags.
+#. TRANS: %s is the tag.
+#: actions/apitimelinetag.php:101 actions/tag.php:69
 #, php-format
 msgid "Notices tagged with %s"
 msgstr "Notices tagged with %s"
@@ -1199,54 +1254,55 @@ msgid "Updates tagged with %1$s on %2$s!"
 msgstr "Updates tagged with %1$s on %2$s!"
 
 #. TRANS: Client error displayed trying to add a notice to another user's timeline.
-#: actions/apitimelineuser.php:297
+#: actions/apitimelineuser.php:308
 #, fuzzy
 msgid "Only the user can add to their own timeline."
 msgstr "Only the user can read their own mailboxes."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:304
+#: actions/apitimelineuser.php:315
 msgid "Only accept AtomPub for Atom feeds."
 msgstr ""
 
 #. TRANS: Client error displayed attempting to post an empty API notice.
-#: actions/apitimelineuser.php:311
+#: actions/apitimelineuser.php:322
 msgid "Atom post must not be empty."
 msgstr ""
 
 #. TRANS: Client error displayed attempting to post an API that is not well-formed XML.
-#: actions/apitimelineuser.php:317
+#: actions/apitimelineuser.php:328
 msgid "Atom post must be well-formed XML."
 msgstr ""
 
 #. TRANS: Client error displayed when not using an Atom entry.
-#: actions/apitimelineuser.php:323 actions/atompubfavoritefeed.php:228
+#: actions/apitimelineuser.php:334 actions/atompubfavoritefeed.php:228
 #: actions/atompubmembershipfeed.php:230
 #: actions/atompubsubscriptionfeed.php:236
 msgid "Atom post must be an Atom entry."
 msgstr ""
 
 #. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
-#: actions/apitimelineuser.php:335
+#: actions/apitimelineuser.php:345
 msgid "Can only handle POST activities."
 msgstr ""
 
 #. TRANS: Client error displayed when using an unsupported activity object type.
 #. TRANS: %s is the unsupported activity object type.
-#: actions/apitimelineuser.php:346
+#: actions/apitimelineuser.php:356
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
 #. TRANS: %d is the notice ID (number).
-#: actions/apitimelineuser.php:380
+#: actions/apitimelineuser.php:390
 #, fuzzy, php-format
 msgid "No content for notice %d."
 msgstr "Find content of notices"
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:408
+#. TRANS: %s is the notice URI.
+#: actions/apitimelineuser.php:419
 #, fuzzy, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "Notice with that id does not exist."
@@ -1263,9 +1319,10 @@ msgstr "API method not found."
 
 #. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
 #. TRANS: Client exception.
+#. TRANS: Client error displayed trying to subscribe to a non-existing profile.
 #: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
 #: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
-#: actions/subscribe.php:107
+#: actions/subscribe.php:110
 msgid "No such profile."
 msgstr "No such profile."
 
@@ -1412,7 +1469,7 @@ msgid "Not a member."
 msgstr "All members"
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
-#: actions/atompubshowmembership.php:151
+#: actions/atompubshowmembership.php:150
 #, fuzzy
 msgid "Cannot delete someone else's membership."
 msgstr "Could not delete self-subscription."
@@ -1501,10 +1558,7 @@ msgid "Invalid size."
 msgstr "Invalid size."
 
 #. TRANS: Title for avatar upload page.
-#. TRANS: Label for group avatar (dt). Text hidden by default.
-#. TRANS: Link description in user account settings menu.
-#: actions/avatarsettings.php:66 actions/showgroup.php:227
-#: lib/accountsettingsaction.php:113
+#: actions/avatarsettings.php:66 lib/settingsnav.php:82
 msgid "Avatar"
 msgstr "Avatar"
 
@@ -1517,9 +1571,11 @@ msgstr "You can upload your personal avatar. The maximum file size is %s."
 
 #. TRANS: Server error displayed in avatar upload page when no matching profile can be found for a user.
 #. TRANS: Server error displayed coming across a request from a user without a profile.
+#. TRANS: Server error displayed when trying to authorise a remote subscription request
+#. TRANS: while the user has no profile.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
 #: actions/grouplogo.php:184 actions/remotesubscribe.php:190
-#: actions/userauthorization.php:72 actions/userrss.php:108
+#: actions/userauthorization.php:75 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr "User without matching profile."
 
@@ -1577,10 +1633,10 @@ msgstr "Crop"
 msgid "No file uploaded."
 msgstr "No file uploaded."
 
-#. TRANS: Avatar upload form unstruction after uploading a file.
+#. TRANS: Avatar upload form instruction after uploading a file.
 #: actions/avatarsettings.php:345
 #, fuzzy
-msgid "Pick a square area of the image to be your avatar"
+msgid "Pick a square area of the image to be your avatar."
 msgstr "Pick a square area of the image to be your avatar"
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
@@ -1606,7 +1662,7 @@ msgstr "Avatar deleted."
 
 #. TRANS: Title for backup account page.
 #. TRANS: Option in profile settings to create a backup of the account of the currently logged in user.
-#: actions/backupaccount.php:61 actions/profilesettings.php:467
+#: actions/backupaccount.php:61 actions/profilesettings.php:468
 msgid "Backup account"
 msgstr ""
 
@@ -1640,7 +1696,7 @@ msgstr "Background"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
 #: actions/backupaccount.php:254
-msgid "Backup your account"
+msgid "Backup your account."
 msgstr ""
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
@@ -1682,7 +1738,7 @@ msgstr "No"
 #. TRANS: Submit button title for 'No' when blocking a user.
 #: actions/block.php:158
 #, fuzzy
-msgid "Do not block this user"
+msgid "Do not block this user."
 msgstr "Do not block this user"
 
 #. TRANS: Button label on the user block form.
@@ -1699,9 +1755,9 @@ msgid "Yes"
 msgstr "Yes"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#. TRANS: Description of the form to block a user.
-#: actions/block.php:165 lib/blockform.php:79
-msgid "Block this user"
+#: actions/block.php:165
+#, fuzzy
+msgid "Block this user."
 msgstr "Block this user"
 
 #. TRANS: Server error displayed when blocking a user fails.
@@ -1768,32 +1824,48 @@ msgstr "Confirmation code not found."
 msgid "That confirmation code is not for you!"
 msgstr "That confirmation code is not for you!"
 
-#. TRANS: Server error for a unknow address type %s, which can be 'email', 'jabber', or 'sms'.
-#: actions/confirmaddress.php:92
-#, php-format
-msgid "Unrecognized address type %s."
+#. TRANS: Server error for an unknown address type, which can be 'email', 'sms', or the name of an IM network (such as 'xmpp' or 'aim')
+#: actions/confirmaddress.php:94
+#, fuzzy, php-format
+msgid "Unrecognized address type %s"
 msgstr "Unrecognized address type %s."
 
 #. TRANS: Client error for an already confirmed email/jabber/sms address.
-#: actions/confirmaddress.php:97
+#: actions/confirmaddress.php:103 actions/confirmaddress.php:136
 msgid "That address has already been confirmed."
 msgstr "That address has already been confirmed."
 
+#: actions/confirmaddress.php:121 actions/imsettings.php:444
+#: actions/userdesignsettings.php:306
+#, fuzzy
+msgid "Couldn't update user."
+msgstr "Could not update user."
+
+#: actions/confirmaddress.php:144
+#, fuzzy
+msgid "Couldn't update user im preferences."
+msgstr "Couldn't update user record."
+
+#: actions/confirmaddress.php:156
+#, fuzzy
+msgid "Couldn't insert user im preferences."
+msgstr "Couldn't insert new subscription."
+
 #. TRANS: Server error displayed when an address confirmation code deletion from the
 #. TRANS: database fails in the contact address confirmation action.
-#: actions/confirmaddress.php:132
+#: actions/confirmaddress.php:169
 #, fuzzy
 msgid "Could not delete address confirmation."
 msgstr "Couldn't delete IM confirmation."
 
 #. TRANS: Title for the contact address confirmation action.
-#: actions/confirmaddress.php:150
+#: actions/confirmaddress.php:185
 msgid "Confirm address"
 msgstr "Confirm address"
 
 #. TRANS: Success message for the contact address confirmation action.
 #. TRANS: %s can be 'email', 'jabber', or 'sms'.
-#: actions/confirmaddress.php:166
+#: actions/confirmaddress.php:200
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "The address \"%s\" has been confirmed for your account."
@@ -1807,6 +1879,7 @@ msgstr "Conversation"
 #. TRANS: Label for user statistics.
 #: actions/conversation.php:149 lib/noticelist.php:87
 #: lib/profileaction.php:246 lib/searchgroupnav.php:82
+#: lib/threadednoticelist.php:66
 msgid "Notices"
 msgstr "Notices"
 
@@ -1842,7 +1915,7 @@ msgstr "Avatar deleted."
 
 #. TRANS: Page title for page on which a user account can be deleted.
 #. TRANS: Option in profile settings to delete the account of the currently logged in user.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:475
+#: actions/deleteaccount.php:228 actions/profilesettings.php:476
 #, fuzzy
 msgid "Delete account"
 msgstr "Create an account"
@@ -1866,7 +1939,7 @@ msgstr ""
 #. TRANS: Field label for delete account confirmation entry.
 #. TRANS: Field label for password reset form where the password has to be typed again.
 #: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:262 actions/register.php:440
+#: actions/recoverpassword.php:262 actions/register.php:419
 msgid "Confirm"
 msgstr "Confirm"
 
@@ -1896,14 +1969,14 @@ msgstr "Application not found."
 #. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
 #: actions/deleteapplication.php:79 actions/editapplication.php:78
-#: actions/showapplication.php:94
+#: actions/showapplication.php:90
 msgid "You are not the owner of this application."
 msgstr "You are not the owner of this application."
 
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
-#: actions/newapplication.php:112 actions/showapplication.php:118
-#: lib/action.php:1425
+#: actions/newapplication.php:112 actions/showapplication.php:113
+#: lib/action.php:1391
 msgid "There was a problem with your session token."
 msgstr "There was a problem with your session token."
 
@@ -1927,13 +2000,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting an application.
 #: actions/deleteapplication.php:161
 #, fuzzy
-msgid "Do not delete this application"
+msgid "Do not delete this application."
 msgstr "Do not delete this application"
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
 #: actions/deleteapplication.php:167
 #, fuzzy
-msgid "Delete this application"
+msgid "Delete this application."
 msgstr "Delete this application"
 
 #. TRANS: Client error when trying to delete group while not logged in.
@@ -1988,13 +2061,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting a group.
 #: actions/deletegroup.php:224
 #, fuzzy
-msgid "Do not delete this group"
+msgid "Do not delete this group."
 msgstr "Do not delete this group"
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
 #: actions/deletegroup.php:231
 #, fuzzy
-msgid "Delete this group"
+msgid "Delete this group."
 msgstr "Delete this group"
 
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
@@ -2002,14 +2075,16 @@ msgstr "Delete this group"
 #. TRANS: Client error displayed when trying to mark a notice as favorite without being logged in.
 #. TRANS: Client error displayed trying to block a user from a group while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
+#. TRANS: Client error displayed trying to log out when not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
+#. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
 #. TRANS: Client error displayed when trying to change user options while not logged in.
 #: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
-#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:69
+#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:70
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
-#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
-#: actions/tagother.php:33 actions/unsubscribe.php:52
+#: actions/nudge.php:63 actions/pluginenable.php:97 actions/subedit.php:33
+#: actions/subscribe.php:98 actions/tagother.php:33 actions/unsubscribe.php:52
 #: lib/adminpanelaction.php:71 lib/profileformaction.php:63
 #: lib/settingsaction.php:72
 msgid "Not logged in."
@@ -2038,12 +2113,13 @@ msgstr "Are you sure you want to delete this notice?"
 #. TRANS: Submit button title for 'No' when deleting a notice.
 #: actions/deletenotice.php:159
 #, fuzzy
-msgid "Do not delete this notice"
+msgid "Do not delete this notice."
 msgstr "Do not delete this notice"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:166 lib/noticelist.php:673
-msgid "Delete this notice"
+#: actions/deletenotice.php:166
+#, fuzzy
+msgid "Delete this notice."
 msgstr "Delete this notice"
 
 #. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
@@ -2080,18 +2156,17 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting a user.
 #: actions/deleteuser.php:158
 #, fuzzy
-msgid "Do not delete this user"
+msgid "Do not delete this user."
 msgstr "Do not delete this group"
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
-#. TRANS: Description of form for deleting a user.
-#: actions/deleteuser.php:165 lib/deleteuserform.php:75
-msgid "Delete this user"
+#: actions/deleteuser.php:165
+#, fuzzy
+msgid "Delete this user."
 msgstr "Delete this user"
 
 #. TRANS: Message used as title for design settings for the site.
-#. TRANS: Link description in user account settings menu.
-#: actions/designadminpanel.php:60 lib/accountsettingsaction.php:134
+#: actions/designadminpanel.php:60 lib/settingsnav.php:97
 msgid "Design"
 msgstr "Design"
 
@@ -2158,8 +2233,7 @@ msgid "You can upload a custom StatusNet theme as a .ZIP archive."
 msgstr ""
 
 #. TRANS: Fieldset legend for theme background image.
-#. TRANS: Fieldset legend on profile design page.
-#: actions/designadminpanel.php:515 lib/designsettings.php:98
+#: actions/designadminpanel.php:515
 msgid "Change background image"
 msgstr "Change background image"
 
@@ -2167,7 +2241,7 @@ msgstr "Change background image"
 #. TRANS: Field label for background color selector.
 #. TRANS: Label on profile design page for setting a profile page background colour.
 #: actions/designadminpanel.php:525 actions/designadminpanel.php:609
-#: lib/designsettings.php:183
+#: lib/designform.php:238
 msgid "Background"
 msgstr "Background"
 
@@ -2194,13 +2268,13 @@ msgstr "Off"
 #. TRANS: Form guide for turning background image on or off on theme designer page.
 #. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
 #. TRANS: use of the uploaded profile image.
-#: actions/designadminpanel.php:577 lib/designsettings.php:159
+#: actions/designadminpanel.php:577 lib/designform.php:214
 msgid "Turn background image on or off."
 msgstr "Turn background image on or off."
 
 #. TRANS: Checkbox label to title background image on theme designer page.
 #. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-#: actions/designadminpanel.php:583 lib/designsettings.php:165
+#: actions/designadminpanel.php:583 lib/designform.php:220
 msgid "Tile background image"
 msgstr "Tile background image"
 
@@ -2212,25 +2286,25 @@ msgstr "Change colours"
 
 #. TRANS: Field label for content color selector.
 #. TRANS: Label on profile design page for setting a profile page content colour.
-#: actions/designadminpanel.php:623 lib/designsettings.php:197
+#: actions/designadminpanel.php:623 lib/designform.php:252
 msgid "Content"
 msgstr "Content"
 
 #. TRANS: Field label for sidebar color selector.
 #. TRANS: Label on profile design page for setting a profile page sidebar colour.
-#: actions/designadminpanel.php:637 lib/designsettings.php:211
+#: actions/designadminpanel.php:637 lib/designform.php:266
 msgid "Sidebar"
 msgstr "Sidebar"
 
 #. TRANS: Field label for text color selector.
 #. TRANS: Label on profile design page for setting a profile page text colour.
-#: actions/designadminpanel.php:651 lib/designsettings.php:225
+#: actions/designadminpanel.php:651 lib/designform.php:280
 msgid "Text"
 msgstr "Text"
 
 #. TRANS: Field label for link color selector.
 #. TRANS: Label on profile design page for setting a profile page links colour.
-#: actions/designadminpanel.php:665 lib/designsettings.php:239
+#: actions/designadminpanel.php:665 lib/designform.php:294
 msgid "Links"
 msgstr "Links"
 
@@ -2252,21 +2326,21 @@ msgid "Use defaults"
 msgstr "Use defaults"
 
 #. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: actions/designadminpanel.php:720 lib/designsettings.php:259
-msgid "Restore default designs"
+#: actions/designadminpanel.php:720
+#, fuzzy
+msgid "Restore default designs."
 msgstr "Restore default designs"
 
 #. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: actions/designadminpanel.php:728 lib/designsettings.php:267
-msgid "Reset back to default"
+#: actions/designadminpanel.php:728
+#, fuzzy
+msgid "Reset back to default."
 msgstr "Reset back to default"
 
 #. TRANS: Title for button for saving theme settings.
-#. TRANS: Title for button on profile design page to save settings.
-#: actions/designadminpanel.php:736 lib/designsettings.php:272
-msgid "Save design"
+#: actions/designadminpanel.php:736
+#, fuzzy
+msgid "Save design."
 msgstr "Save design"
 
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
@@ -2298,7 +2372,7 @@ msgid "You must be logged in to edit an application."
 msgstr "You must be logged in to edit an application."
 
 #. TRANS: Client error displayed trying to edit an application that does not exist.
-#: actions/editapplication.php:83 actions/showapplication.php:87
+#: actions/editapplication.php:83 actions/showapplication.php:83
 msgid "No such application."
 msgstr "No such application."
 
@@ -2391,80 +2465,53 @@ msgstr "Edit %s group"
 msgid "You must be logged in to create a group."
 msgstr "You must be logged in to create a group."
 
-#. TRANS: Client error displayed trying to edit a group while not being a group admin.
-#. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
-#. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
-#: actions/editgroup.php:110 actions/editgroup.php:176
-#: actions/groupdesignsettings.php:109 actions/grouplogo.php:111
-msgid "You must be an admin to edit the group."
-msgstr "You must be an admin to edit the group."
-
 #. TRANS: Form instructions for group edit form.
 #: actions/editgroup.php:161
 msgid "Use this form to edit the group."
 msgstr "Use this form to edit the group."
 
-#. TRANS: Group edit form validation error.
-#. TRANS: Group create form validation error.
-#. TRANS: %s is the invalid alias.
-#: actions/editgroup.php:241 actions/newgroup.php:188
-#, php-format
-msgid "Invalid alias: \"%s\""
-msgstr "Invalid alias: \"%s\""
-
-#. TRANS: Server error displayed when editing a group fails.
-#: actions/editgroup.php:274
-msgid "Could not update group."
-msgstr "Could not update group."
-
-#. TRANS: Server error displayed when group aliases could not be added.
-#. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/editgroup.php:281 classes/User_group.php:540
-msgid "Could not create aliases."
-msgstr "Could not create aliases."
-
 #. TRANS: Group edit form success message.
 #: actions/editgroup.php:301
 msgid "Options saved."
 msgstr "Options saved."
 
 #. TRANS: Title for e-mail settings.
-#: actions/emailsettings.php:59
+#: actions/emailsettings.php:60
 msgid "Email settings"
 msgstr "E-mail settings"
 
 #. TRANS: E-mail settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/emailsettings.php:73
+#: actions/emailsettings.php:74
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 msgstr "Manage how you get e-mail from %%site.name%%."
 
 #. TRANS: Form legend for e-mail settings form.
 #. TRANS: Field label for e-mail address input in e-mail settings form.
-#: actions/emailsettings.php:103 actions/emailsettings.php:129
+#: actions/emailsettings.php:104 actions/emailsettings.php:130
 msgid "Email address"
 msgstr "E-mail address"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:109
+#: actions/emailsettings.php:110
 msgid "Current confirmed email address."
 msgstr "Current confirmed e-mail address."
 
 #. TRANS: Button label to remove a confirmed e-mail address.
 #. TRANS: Button label for removing a set sender e-mail address to post notices from.
-#. TRANS: Button label to remove a confirmed Instant Messaging address.
+#. TRANS: Button label to remove a confirmed IM address.
 #. TRANS: Button label to remove a confirmed SMS address.
 #. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
-#: actions/emailsettings.php:112 actions/emailsettings.php:179
-#: actions/imsettings.php:112 actions/smssettings.php:120
-#: actions/smssettings.php:176
+#: actions/emailsettings.php:113 actions/emailsettings.php:180
+#: actions/imsettings.php:119 actions/smssettings.php:119
+#: actions/smssettings.php:175
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Remove"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:119
+#: actions/emailsettings.php:120
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -2477,44 +2524,44 @@ msgstr ""
 #. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
 #. TRANS: Any other domain may be owned by a legitimate person or
 #. TRANS: organization.
-#: actions/emailsettings.php:136
+#: actions/emailsettings.php:137
 msgid "Email address, like \"UserName@example.org\""
 msgstr "E-mail address, like \"UserName@example.org\""
 
 #. TRANS: Button label for adding an e-mail address in e-mail settings form.
-#. TRANS: Button label for adding an Instant Messaging address in Instant Messaging settings form.
+#. TRANS: Button label for adding an IM address in IM settings form.
 #. TRANS: Button label for adding a SMS phone number in SMS settings form.
-#: actions/emailsettings.php:140 actions/imsettings.php:147
-#: actions/smssettings.php:158
+#: actions/emailsettings.php:141 actions/imsettings.php:147
+#: actions/smssettings.php:157
 msgctxt "BUTTON"
 msgid "Add"
 msgstr "Add"
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:148 actions/smssettings.php:167
+#: actions/emailsettings.php:149 actions/smssettings.php:166
 msgid "Incoming email"
 msgstr "Incoming e-mail"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:154
+#: actions/emailsettings.php:155
 msgid "I want to post notices by email."
 msgstr "I want to post notices by e-mail."
 
 #. TRANS: Form instructions for incoming e-mail form in e-mail settings.
 #. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
-#: actions/emailsettings.php:176 actions/smssettings.php:174
+#: actions/emailsettings.php:177 actions/smssettings.php:173
 msgid "Send email to this address to post new notices."
 msgstr "Send e-mail to this address to post new notices."
 
 #. TRANS: Instructions for incoming e-mail address input form, when an address has already been assigned.
 #. TRANS: Instructions for incoming SMS e-mail address input form.
-#: actions/emailsettings.php:185 actions/smssettings.php:182
+#: actions/emailsettings.php:186 actions/smssettings.php:181
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr "Make a new e-mail address for posting to - cancels the old one."
 
 #. TRANS: Instructions for incoming e-mail address input form.
-#: actions/emailsettings.php:189
+#: actions/emailsettings.php:190
 msgid ""
 "To send notices via email, we need to create a unique email address for you "
 "on this server:"
@@ -2522,89 +2569,89 @@ msgstr ""
 
 #. TRANS: Button label for adding an e-mail address to send notices from.
 #. TRANS: Button label for adding an SMS e-mail address to send notices from.
-#: actions/emailsettings.php:195 actions/smssettings.php:185
+#: actions/emailsettings.php:196 actions/smssettings.php:184
 msgctxt "BUTTON"
 msgid "New"
 msgstr "New"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:204
+#: actions/emailsettings.php:205
 msgid "Email preferences"
 msgstr "Email preferences"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:212
+#: actions/emailsettings.php:213
 msgid "Send me notices of new subscriptions through email."
 msgstr "Send me notices of new subscriptions through e-mail."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:218
+#: actions/emailsettings.php:219
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr "Send me e-mail when someone adds my notice as a favourite."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:225
+#: actions/emailsettings.php:226
 msgid "Send me email when someone sends me a private message."
 msgstr "Send me e-mail when someone sends me a private message."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:231
+#: actions/emailsettings.php:232
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr "Send me e-mail when someone sends me an \"@-reply\"."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:237
+#: actions/emailsettings.php:238
 msgid "Allow friends to nudge me and send me an email."
 msgstr "Allow friends to nudge me and send me an e-mail."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:243
+#: actions/emailsettings.php:244
 msgid "Publish a MicroID for my email address."
 msgstr "Publish a MicroID for my e-mail address."
 
 #. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:361
+#: actions/emailsettings.php:362
 msgid "Email preferences saved."
 msgstr "E-mail preferences saved."
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:380
+#: actions/emailsettings.php:381
 msgid "No email address."
 msgstr "No e-mail address."
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:388
+#: actions/emailsettings.php:389
 #, fuzzy
 msgid "Cannot normalize that email address."
 msgstr "Cannot normalise that e-mail address"
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:393 actions/register.php:212
+#: actions/emailsettings.php:394 actions/register.php:197
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "Not a valid e-mail address."
 
 #. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:397
+#: actions/emailsettings.php:398
 msgid "That is already your email address."
 msgstr "That is already your e-mail address."
 
 #. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:401
+#: actions/emailsettings.php:402
 msgid "That email address already belongs to another user."
 msgstr "That e-mail address already belongs to another user."
 
 #. TRANS: Server error thrown on database error adding e-mail confirmation code.
 #. TRANS: Server error thrown on database error adding Instant Messaging confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:418 actions/imsettings.php:343
-#: actions/smssettings.php:365
+#: actions/emailsettings.php:419 actions/imsettings.php:362
+#: actions/smssettings.php:364
 #, fuzzy
 msgid "Could not insert confirmation code."
 msgstr "Couldn't insert confirmation code."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:425
+#: actions/emailsettings.php:426
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
@@ -2615,59 +2662,62 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling Instant Messaging address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:445 actions/imsettings.php:377
-#: actions/smssettings.php:399
+#: actions/emailsettings.php:446 actions/imsettings.php:391
+#: actions/smssettings.php:398
 msgid "No pending confirmation to cancel."
 msgstr "No pending confirmation to cancel."
 
 #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:450
+#: actions/emailsettings.php:451
 msgid "That is the wrong email address."
 msgstr "That is the wrong e-mail address."
 
 #. TRANS: Server error thrown on database error canceling e-mail address confirmation.
 #. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
-#: actions/emailsettings.php:459 actions/smssettings.php:413
+#: actions/emailsettings.php:460 actions/smssettings.php:412
 #, fuzzy
 msgid "Could not delete email confirmation."
 msgstr "Couldn't delete email confirmation."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:464
+#: actions/emailsettings.php:465
 msgid "Email confirmation cancelled."
 msgstr "E-mail confirmation cancelled."
 
 #. TRANS: Message given trying to remove an e-mail address that is not
 #. TRANS: registered for the active user.
-#: actions/emailsettings.php:483
+#: actions/emailsettings.php:484
 msgid "That is not your email address."
 msgstr "That is not your e-mail address."
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:504
+#: actions/emailsettings.php:505
 msgid "The email address was removed."
 msgstr "The email address was removed."
 
 #. TRANS: Form validation error displayed when trying to remove an incoming e-mail address while no address has been set.
-#: actions/emailsettings.php:518 actions/smssettings.php:555
+#: actions/emailsettings.php:519 actions/smssettings.php:554
 msgid "No incoming email address."
 msgstr "No incoming e-mail address."
 
 #. TRANS: Server error thrown on database error removing incoming e-mail address.
 #. TRANS: Server error thrown on database error adding incoming e-mail address.
-#: actions/emailsettings.php:530 actions/emailsettings.php:554
-#: actions/smssettings.php:565 actions/smssettings.php:588
+#. TRANS: Server error displayed when the user could not be updated in SMS settings.
+#: actions/emailsettings.php:531 actions/emailsettings.php:555
+#: actions/smssettings.php:565 actions/smssettings.php:590
 #, fuzzy
 msgid "Could not update user record."
 msgstr "Couldn't update user record."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:534 actions/smssettings.php:568
+#. TRANS: Confirmation text after updating SMS settings.
+#: actions/emailsettings.php:535 actions/smssettings.php:569
 msgid "Incoming email address removed."
 msgstr "Incoming e-mail address removed."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:558 actions/smssettings.php:591
+#. TRANS: Confirmation text after updating SMS settings.
+#: actions/emailsettings.php:559 actions/smssettings.php:594
 msgid "New incoming email address added."
 msgstr "New incoming e-mail address added."
 
@@ -2679,7 +2729,7 @@ msgstr "This notice is already a favourite!"
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
 #: actions/favor.php:95
 #, fuzzy
-msgid "Disfavor favorite"
+msgid "Disfavor favorite."
 msgstr "Disfavor favourite"
 
 #. TRANS: Page title for first page of favorited notices.
@@ -2731,9 +2781,8 @@ msgstr ""
 #. TRANS: %s is a user's nickname.
 #. TRANS: Title for first page of favourite notices of a user.
 #. TRANS: %s is the user for whom the favourite notices are displayed.
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing own favourited notices.
 #: actions/favoritesrss.php:111 actions/showfavorites.php:76
-#: lib/personalgroupnav.php:122
+#: lib/personalgroupnav.php:110
 #, php-format
 msgid "%s's favorite notices"
 msgstr "%s's favourite notices"
@@ -2920,13 +2969,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
 #: actions/groupblock.php:191
 #, fuzzy
-msgid "Do not block this user from this group"
+msgid "Do not block this user from this group."
 msgstr "Do not block this user from this group"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
 #: actions/groupblock.php:198
 #, fuzzy
-msgid "Block this user from this group"
+msgid "Block this user from this group."
 msgstr "Block this user from this group"
 
 #. TRANS: Server error displayed when trying to block a user from a group fails because of an application error.
@@ -2935,6 +2984,7 @@ msgid "Database error blocking user from group."
 msgstr "Database error blocking user from group."
 
 #. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
+#. TRANS: Client error displayed trying to find a user by ID without providing an ID.
 #: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr "No ID."
@@ -2965,7 +3015,7 @@ msgid "Unable to update your design settings."
 msgstr "Unable to save your design settings."
 
 #. TRANS: Form text to confirm saved group design settings.
-#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:222
+#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:239
 msgid "Design preferences saved."
 msgstr "Design preferences saved."
 
@@ -3029,7 +3079,7 @@ msgid "A list of the users in this group."
 msgstr "A list of the users in this group."
 
 #. TRANS: Indicator in group members list that this user is a group administrator.
-#: actions/groupmembers.php:190
+#: actions/groupmembers.php:190 lib/action.php:581
 msgid "Admin"
 msgstr "Admin"
 
@@ -3122,8 +3172,10 @@ msgid "Group search"
 msgstr "Group search"
 
 #. TRANS: Text on page where groups can be searched if no results were found for a query.
-#: actions/groupsearch.php:82 actions/noticesearch.php:117
-#: actions/peoplesearch.php:83
+#. TRANS: Text for notice search results is the query had no results.
+#. TRANS: Message on the "People search" page where a query has no results.
+#: actions/groupsearch.php:82 actions/noticesearch.php:122
+#: actions/peoplesearch.php:87
 msgid "No results."
 msgstr "No results."
 
@@ -3160,166 +3212,169 @@ msgid "User is not blocked from group."
 msgstr "User is not blocked from group."
 
 #. TRANS: Server error displayed when unblocking a user from a group fails because of an unknown error.
+#. TRANS: Server error displayed when removing a user block.
 #: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "Error removing the block."
 
 #. TRANS: Title for Instant Messaging settings.
-#: actions/imsettings.php:58
+#: actions/imsettings.php:56
 msgid "IM settings"
 msgstr "IM settings"
 
 #. 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.
-#: actions/imsettings.php:71
+#: actions/imsettings.php:69
 #, fuzzy, php-format
 msgid ""
-"You can send and receive notices through Jabber/Google Talk [instant "
-"messages](%%doc.im%%). Configure your address and settings below."
+"You can send and receive notices through instant messaging [instant messages]"
+"(%%doc.im%%). Configure your addresses and settings below."
 msgstr ""
 "You can send and receive notices through Jabber/GTalk [instant messages](%%"
 "doc.im%%). Configure your address and settings below."
 
-#. TRANS: Message given in the Instant Messaging settings if XMPP is not enabled on the site.
+#. TRANS: Message given in the IM settings if IM is not enabled on the site.
 #: actions/imsettings.php:90
 msgid "IM is not available."
 msgstr "IM is not available."
 
-#. TRANS: Form legend for Instant Messaging settings form.
-#. TRANS: Field label for Instant Messaging address input in Instant Messaging settings form.
-#: actions/imsettings.php:102 actions/imsettings.php:132
-msgid "IM address"
-msgstr "IM address"
+#: actions/imsettings.php:116
+#, fuzzy, php-format
+msgid "Current confirmed %s address."
+msgstr "Current confirmed e-mail address."
 
-#: actions/imsettings.php:109
-#, fuzzy
-msgid "Current confirmed Jabber/Google Talk address."
-msgstr "Current confirmed Jabber/GTalk address."
-
-#. TRANS: Form note in Instant Messaging settings form.
-#. TRANS: %s is the Instant Messaging address set for the site.
-#: actions/imsettings.php:120
+#. TRANS: Form note in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:128
 #, fuzzy, php-format
 msgid ""
-"Awaiting confirmation on this address. Check your Jabber/Google Talk account "
-"for a message with further instructions. (Did you add %s to your buddy list?)"
+"Awaiting confirmation on this address. Check your %s account for a message "
+"with further instructions. (Did you add %s to your buddy list?)"
 msgstr ""
 "Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
 "message with further instructions. (Did you add %s to your buddy list?)"
 
-#. TRANS: IM address input field instructions in Instant Messaging settings form.
-#. TRANS: %s is the Instant Messaging address set for the site.
-#. TRANS: Do not translate "example.org". It is one of the domain names reserved for use in examples by
-#. TRANS: http://www.rfc-editor.org/rfc/rfc2606.txt. Any other domain may be owned by a legitimate
-#. TRANS: person or organization.
-#: actions/imsettings.php:139
-#, fuzzy, php-format
-msgid ""
-"Jabber or Google Talk address, like \"UserName@example.org\". First, make "
-"sure to add %s to your buddy list in your IM client or on Google Talk."
-msgstr ""
-"Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
-"add %s to your buddy list in your IM client or on GTalk."
+#: actions/imsettings.php:140
+msgid "IM address"
+msgstr "IM address"
 
-#. TRANS: Form legend for Instant Messaging preferences form.
-#: actions/imsettings.php:154
-msgid "IM preferences"
+#: actions/imsettings.php:142
+#, php-format
+msgid "%s screenname."
+msgstr ""
+
+#. TRANS: Header for IM preferences form.
+#: actions/imsettings.php:163
+#, fuzzy
+msgid "IM Preferences"
 msgstr "IM preferences"
 
-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:159
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:174
 #, fuzzy
-msgid "Send me notices through Jabber/Google Talk."
-msgstr "Send me notices through Jabber/GTalk."
+msgid "Send me notices"
+msgstr "Send a notice"
 
-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:165
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:176
 #, fuzzy
-msgid "Post a notice when my Jabber/Google Talk status changes."
+msgid "Post a notice when my status changes."
 msgstr "Post a notice when my Jabber/GTalk status changes."
 
-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:171
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:178
 #, fuzzy
-msgid ""
-"Send me replies through Jabber/Google Talk from people I'm not subscribed to."
+msgid "Send me replies from people I'm not subscribed to."
 msgstr ""
 "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 
-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:178
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:181
 #, fuzzy
-msgid "Publish a MicroID for my Jabber/Google Talk address."
-msgstr "Publish a MicroID for my Jabber/GTalk address."
+msgid "Publish a MicroID"
+msgstr "Publish a MicroID for my e-mail address."
 
-#. TRANS: Confirmation message for successful Instant Messaging preferences save.
-#: actions/imsettings.php:283 actions/othersettings.php:192
+#. TRANS: Server error thrown on database error updating IM preferences.
+#: actions/imsettings.php:291
+#, fuzzy
+msgid "Couldn't update IM preferences."
+msgstr "Could not update user."
+
+#. TRANS: Confirmation message for successful IM preferences save.
+#. TRANS: Confirmation message after saving preferences.
+#: actions/imsettings.php:298 actions/urlsettings.php:244
 msgid "Preferences saved."
 msgstr "Preferences saved."
 
-#. TRANS: Message given saving Instant Messaging address without having provided one.
-#: actions/imsettings.php:304
-msgid "No Jabber ID."
-msgstr "No Jabber ID."
-
-#. TRANS: Message given saving Instant Messaging address that cannot be normalised.
-#: actions/imsettings.php:312
+#. TRANS: Message given saving IM address without having provided one.
+#: actions/imsettings.php:320
 #, fuzzy
-msgid "Cannot normalize that Jabber ID."
+msgid "No screenname."
+msgstr "No nickname."
+
+#: actions/imsettings.php:325
+#, fuzzy
+msgid "No transport."
+msgstr "No notice."
+
+#. TRANS: Message given saving IM address that cannot be normalised.
+#: actions/imsettings.php:333
+#, fuzzy
+msgid "Cannot normalize that screenname"
 msgstr "Cannot normalize that Jabber ID"
 
-#. TRANS: Message given saving Instant Messaging address that not valid.
-#: actions/imsettings.php:317
+#. TRANS: Message given saving IM address that not valid.
+#: actions/imsettings.php:340
 #, fuzzy
-msgid "Not a valid Jabber ID."
-msgstr "Not a valid Jabber ID"
+msgid "Not a valid screenname"
+msgstr "Not a valid nickname."
 
-#. TRANS: Message given saving Instant Messaging address that is already set.
-#: actions/imsettings.php:321
-msgid "That is already your Jabber ID."
-msgstr "That is already your Jabber ID."
-
-#. TRANS: Message given saving Instant Messaging address that is already set for another user.
-#: actions/imsettings.php:325
-msgid "Jabber ID already belongs to another user."
+#. TRANS: Message given saving IM address that is already set for another user.
+#: actions/imsettings.php:344
+#, fuzzy
+msgid "Screenname already belongs to another user."
 msgstr "Jabber ID already belongs to another user."
 
-#. TRANS: Message given saving valid Instant Messaging address that is to be confirmed.
-#. TRANS: %s is the Instant Messaging address set for the site.
-#: actions/imsettings.php:353
-#, php-format
-msgid ""
-"A confirmation code was sent to the IM address you added. You must approve %"
-"s for sending messages to you."
+#. TRANS: Message given saving valid IM address that is to be confirmed.
+#: actions/imsettings.php:369
+#, fuzzy
+msgid "A confirmation code was sent to the IM address you added."
 msgstr ""
 "A confirmation code was sent to the IM address you added. You must approve %"
 "s for sending messages to you."
 
-#. TRANS: Message given canceling Instant Messaging address confirmation for the wrong IM address.
-#: actions/imsettings.php:382
+#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#: actions/imsettings.php:396
 msgid "That is the wrong IM address."
 msgstr "That is the wrong IM address."
 
-#. TRANS: Server error thrown on database error canceling Instant Messaging address confirmation.
-#: actions/imsettings.php:391
+#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#: actions/imsettings.php:405
 #, fuzzy
-msgid "Could not delete IM confirmation."
+msgid "Couldn't delete confirmation."
 msgstr "Couldn't delete IM confirmation."
 
-#. TRANS: Message given after successfully canceling Instant Messaging address confirmation.
-#: actions/imsettings.php:396
+#. TRANS: Message given after successfully canceling IM address confirmation.
+#: actions/imsettings.php:410
 msgid "IM confirmation cancelled."
 msgstr "IM confirmation cancelled."
 
-#. TRANS: Message given trying to remove an Instant Messaging address that is not
+#. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.
-#: actions/imsettings.php:417
-msgid "That is not your Jabber ID."
-msgstr "That is not your Jabber ID."
+#: actions/imsettings.php:434
+#, fuzzy
+msgid "That is not your screenname."
+msgstr "That is not your phone number."
+
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#: actions/imsettings.php:443
+#, fuzzy
+msgid "Couldn't update user im prefs."
+msgstr "Couldn't update user record."
 
 #. TRANS: Message given after successfully removing a registered Instant Messaging address.
-#: actions/imsettings.php:440
+#: actions/imsettings.php:451
 msgid "The IM address was removed."
 msgstr "The IM address was removed."
 
@@ -3534,7 +3589,7 @@ msgid "You must be logged in to join a group."
 msgstr "You must be logged in to join a group."
 
 #. TRANS: Title for join group page after joining.
-#: actions/joingroup.php:147
+#: actions/joingroup.php:148
 #, fuzzy, php-format
 msgctxt "TITLE"
 msgid "%1$s joined group %2$s"
@@ -3662,7 +3717,7 @@ msgstr ""
 #. TRANS: Submit button title.
 #: actions/licenseadminpanel.php:311 actions/sessionsadminpanel.php:199
 #: actions/siteadminpanel.php:292 actions/snapshotadminpanel.php:245
-#: actions/tagother.php:154 lib/applicationeditform.php:357
+#: actions/tagother.php:133 lib/applicationeditform.php:357
 msgid "Save"
 msgstr "Save"
 
@@ -3670,39 +3725,41 @@ msgstr "Save"
 msgid "Save license settings"
 msgstr ""
 
-#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
+#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
+#: actions/login.php:97 actions/otp.php:62 actions/register.php:130
 msgid "Already logged in."
 msgstr "Already logged in."
 
-#: actions/login.php:148
+#: actions/login.php:125
 msgid "Incorrect username or password."
 msgstr "Incorrect username or password."
 
-#: actions/login.php:154 actions/otp.php:120
+#. TRANS: Server error displayed when a user object could not be created trying to login using "one time password login".
+#: actions/login.php:131 actions/otp.php:127
 msgid "Error setting user. You are probably not authorized."
 msgstr "Error setting user. You are probably not authorised."
 
-#: actions/login.php:210 actions/login.php:263
+#: actions/login.php:185 actions/login.php:236 lib/action.php:598
 msgid "Login"
 msgstr "Login"
 
-#: actions/login.php:249
+#: actions/login.php:222
 msgid "Login to site"
 msgstr "Login to site"
 
-#: actions/login.php:258 actions/register.php:490
+#: actions/login.php:231 actions/register.php:469
 msgid "Remember me"
 msgstr "Remember me"
 
-#: actions/login.php:259 actions/register.php:492
+#: actions/login.php:232 actions/register.php:471
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "Automatically login in the future; not for shared computers!"
 
-#: actions/login.php:269
+#: actions/login.php:241
 msgid "Lost or forgotten password?"
 msgstr "Lost or forgotten password?"
 
-#: actions/login.php:288
+#: actions/login.php:259
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -3710,11 +3767,11 @@ msgstr ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
 
-#: actions/login.php:292
+#: actions/login.php:263
 msgid "Login with your username and password."
 msgstr "Login with your username and password."
 
-#: actions/login.php:295
+#: actions/login.php:266
 #, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -3842,7 +3899,9 @@ msgstr "New notice"
 msgid "Notice posted"
 msgstr "Notice posted"
 
-#: actions/noticesearch.php:68
+#. TRANS: Instructions for Notice search page.
+#. TRANS: %%site.name%% is the name of the StatusNet site.
+#: actions/noticesearch.php:69
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -3851,16 +3910,21 @@ msgstr ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
 "by spaces; they must be 3 characters or more."
 
-#: actions/noticesearch.php:78
+#. TRANS: Title of the page where users can search for notices.
+#: actions/noticesearch.php:80
 msgid "Text search"
 msgstr "Text search"
 
-#: actions/noticesearch.php:91
+#. TRANS: Test in RSS notice search.
+#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
+#: actions/noticesearch.php:95
 #, php-format
 msgid "Search results for \"%1$s\" on %2$s"
 msgstr "Search results for \"%1$s\" on %2$s"
 
-#: actions/noticesearch.php:121
+#. TRANS: Text for logged in users making a query for notices without results.
+#. TRANS: This message contains a Markdown link.
+#: actions/noticesearch.php:128
 #, php-format
 msgid ""
 "Be the first to [post on this topic](%%%%action.newnotice%%%%?"
@@ -3869,7 +3933,9 @@ msgstr ""
 "Be the first to [post on this topic](%%%%action.newnotice%%%%?"
 "status_textarea=%s)!"
 
-#: actions/noticesearch.php:124
+#. TRANS: Text for not logged in users making a query for notices without results.
+#. TRANS: This message contains Markdown links.
+#: actions/noticesearch.php:133
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and be the first to "
@@ -3878,14 +3944,17 @@ msgstr ""
 "Why not [register an account](%%%%action.register%%%%) and be the first to "
 "[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
 
-#: actions/noticesearchrss.php:96
+#. TRANS: RSS notice search feed title. %s is the query.
+#: actions/noticesearchrss.php:95
 #, php-format
 msgid "Updates with \"%s\""
 msgstr "Updates with \"%s\""
 
-#: actions/noticesearchrss.php:98
+#. TRANS: RSS notice search feed description.
+#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
+#: actions/noticesearchrss.php:99
 #, fuzzy, php-format
-msgid "Updates matching search term \"%1$s\" on %2$s!"
+msgid "Updates matching search term \"%1$s\" on %2$s."
 msgstr "Updates matching search term \"%1$s\" on %2$s!"
 
 #: actions/nudge.php:85
@@ -3906,51 +3975,51 @@ msgid "Nudge sent!"
 msgstr "Nudge sent!"
 
 #. TRANS: Message displayed to an anonymous user trying to view OAuth application list.
-#: actions/oauthappssettings.php:60
+#: actions/oauthappssettings.php:57
 msgid "You must be logged in to list your applications."
 msgstr "You must be logged in to list your applications."
 
 #. TRANS: Page title for OAuth applications
-#: actions/oauthappssettings.php:76
+#: actions/oauthappssettings.php:73
 msgid "OAuth applications"
 msgstr "OAuth applications"
 
 #. TRANS: Page instructions for OAuth applications
-#: actions/oauthappssettings.php:88
+#: actions/oauthappssettings.php:85
 msgid "Applications you have registered"
 msgstr "Applications you have registered"
 
 #. TRANS: Empty list message on page with OAuth applications.
-#: actions/oauthappssettings.php:141
+#: actions/oauthappssettings.php:138
 #, php-format
 msgid "You have not registered any applications yet."
 msgstr "You have not registered any applications yet."
 
 #. TRANS: Title for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:71
+#: actions/oauthconnectionssettings.php:69
 msgid "Connected applications"
 msgstr "Connected applications"
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:83
+#: actions/oauthconnectionssettings.php:80
 msgid "The following connections exist for your account."
 msgstr ""
 
 #. TRANS: Client error when trying to revoke access for an application while not being a user of it.
-#: actions/oauthconnectionssettings.php:168
+#: actions/oauthconnectionssettings.php:165
 msgid "You are not a user of that application."
 msgstr "You are not a user of that application."
 
 #. TRANS: Client error when revoking access has failed for some reason.
 #. TRANS: %s is the application ID revoking access failed for.
-#: actions/oauthconnectionssettings.php:183
+#: actions/oauthconnectionssettings.php:180
 #, fuzzy, php-format
 msgid "Unable to revoke access for application: %s."
 msgstr "Use this form to edit your application."
 
 #. TRANS: Success message after revoking access for an application.
 #. TRANS: %1$s is the application name, %2$s is the first part of the user token.
-#: actions/oauthconnectionssettings.php:202
+#: actions/oauthconnectionssettings.php:199
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -3958,20 +4027,30 @@ msgid ""
 msgstr ""
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:213
+#: actions/oauthconnectionssettings.php:210
 msgid "You have not authorized any applications to use your account."
 msgstr "You have not authorised any applications to use your account."
 
 #. TRANS: Note for developers in the OAuth connection settings form.
 #. TRANS: This message contains a Markdown link. Do not separate "](".
 #. TRANS: %s is the URL to the OAuth settings.
-#: actions/oauthconnectionssettings.php:233
+#: actions/oauthconnectionssettings.php:230
 #, php-format
 msgid ""
 "Are you a developer? [Register an OAuth client application](%s) to use with "
 "this instance of StatusNet."
 msgstr ""
 
+#: actions/oembed.php:64
+#, fuzzy, php-format
+msgid "\"%s\" not found."
+msgstr "API method not found."
+
+#: actions/oembed.php:76
+#, fuzzy, php-format
+msgid "Notice %s not found."
+msgstr "API method not found."
+
 #: actions/oembed.php:80 actions/shownotice.php:100
 msgid "Notice has no profile."
 msgstr "Notice has no profile."
@@ -3981,6 +4060,16 @@ msgstr "Notice has no profile."
 msgid "%1$s's status on %2$s"
 msgstr "%1$s's status on %2$s"
 
+#: actions/oembed.php:95
+#, fuzzy, php-format
+msgid "Attachment %s not found."
+msgstr "Recipient user not found."
+
+#: actions/oembed.php:136
+#, php-format
+msgid "\"%s\" not supported for oembed requests."
+msgstr ""
+
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
 #: actions/oembed.php:168
 #, php-format
@@ -3994,94 +4083,60 @@ msgid "Only %s URLs over plain HTTP please."
 msgstr ""
 
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1205
-#: lib/apiaction.php:1232 lib/apiaction.php:1367
+#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1207
+#: lib/apiaction.php:1234 lib/apiaction.php:1369
 msgid "Not a supported data format."
 msgstr "Not a supported data format."
 
+#. TRANS: ShortName in the OpenSearch interface when trying to find users.
 #: actions/opensearch.php:64
 msgid "People Search"
 msgstr "People Search"
 
-#: actions/opensearch.php:67
+#: actions/opensearch.php:68
 msgid "Notice Search"
 msgstr "Notice Search"
 
-#: actions/othersettings.php:59
-msgid "Other settings"
-msgstr "Other settings"
-
-#. TRANS: Instructions for tab "Other" in user profile settings.
-#: actions/othersettings.php:71
-msgid "Manage various other options."
-msgstr "Manage various other options."
-
-#. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
-#. TRANS: user's profile settings. Use of "free" is as in "open", indicating that the
-#. TRANS: information on the shortener site is freely distributable.
-#. TRANS: This message has one space at the beginning. Use your language's word separator
-#. TRANS: here if it has one (most likely a single space).
-#: actions/othersettings.php:113
-msgid " (free service)"
-msgstr ""
-
-#. TRANS: Label for dropdown with URL shortener services.
-#: actions/othersettings.php:122
-msgid "Shorten URLs with"
-msgstr "Shorten URLs with"
-
-#. TRANS: Tooltip for for dropdown with URL shortener services.
-#: actions/othersettings.php:124
-msgid "Automatic shortening service to use."
-msgstr "Automatic shortening service to use."
-
-#. TRANS: Label for checkbox.
-#: actions/othersettings.php:130
-msgid "View profile designs"
-msgstr "View profile designs"
-
-#. TRANS: Tooltip for checkbox.
-#: actions/othersettings.php:132
-msgid "Show or hide profile designs."
-msgstr "Show or hide profile designs."
-
-#. TRANS: Form validation error for form "Other settings" in user profile.
-#: actions/othersettings.php:164
-#, fuzzy
-msgid "URL shortening service is too long (maximum 50 characters)."
-msgstr "URL shortening service is too long (max 50 chars)."
-
-#: actions/otp.php:69
+#. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
+#: actions/otp.php:70
 msgid "No user ID specified."
 msgstr "No user ID specified."
 
-#: actions/otp.php:83
+#. TRANS: Client error displayed trying to use "one time password login" without specifying a login token.
+#: actions/otp.php:86
 msgid "No login token specified."
 msgstr "No login token specified."
 
-#: actions/otp.php:90
+#. TRANS: Client error displayed trying to use "one time password login" without requesting a login token.
+#: actions/otp.php:94
 msgid "No login token requested."
 msgstr "No login token requested."
 
-#: actions/otp.php:95
+#. TRANS: Client error displayed trying to use "one time password login" while specifying an invalid login token.
+#: actions/otp.php:100
 msgid "Invalid login token specified."
 msgstr "Invalid login token specified."
 
-#: actions/otp.php:104
+#. TRANS: Client error displayed trying to use "one time password login" while specifying an expired login token.
+#: actions/otp.php:110
 msgid "Login token expired."
 msgstr "Login token expired."
 
-#: actions/outbox.php:58
+#. TRANS: Title for outbox for any but the fist page.
+#. TRANS: %1$s is the user nickname, %2$d is the page number.
+#: actions/outbox.php:57
 #, php-format
 msgid "Outbox for %1$s - page %2$d"
 msgstr "Outbox for %1$s - page %2$d"
 
+#. TRANS: Title for first page of outbox.
 #: actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
 msgstr "Outbox for %s"
 
-#: actions/outbox.php:104
+#. TRANS: Instructions for outbox.
+#: actions/outbox.php:103
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr "This is your outbox, which lists private messages you have sent."
 
@@ -4107,43 +4162,45 @@ msgstr "Old password"
 msgid "New password"
 msgstr "New password"
 
-#: actions/passwordsettings.php:109
+#: actions/passwordsettings.php:109 actions/register.php:416
 #, fuzzy
-msgid "6 or more characters"
+msgid "6 or more characters."
 msgstr "6 or more characters"
 
-#: actions/passwordsettings.php:113
+#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#: actions/passwordsettings.php:113 actions/recoverpassword.php:264
+#: actions/register.php:420
 #, fuzzy
-msgid "Same as password above"
+msgid "Same as password above."
 msgstr "Same as password above"
 
 #: actions/passwordsettings.php:117
 msgid "Change"
 msgstr "Change"
 
-#: actions/passwordsettings.php:154 actions/register.php:238
+#: actions/passwordsettings.php:153 actions/register.php:223
 msgid "Password must be 6 or more characters."
 msgstr "Password must be 6 or more characters."
 
-#: actions/passwordsettings.php:157 actions/register.php:241
+#: actions/passwordsettings.php:156 actions/register.php:226
 msgid "Passwords don't match."
 msgstr "Passwords don't match."
 
-#: actions/passwordsettings.php:165
+#: actions/passwordsettings.php:164
 msgid "Incorrect old password"
 msgstr "Incorrect old password"
 
-#: actions/passwordsettings.php:181
+#: actions/passwordsettings.php:180
 msgid "Error saving user; invalid."
 msgstr "Error saving user; invalid."
 
-#: actions/passwordsettings.php:186
+#. TRANS: Reset password form validation error message.
+#: actions/passwordsettings.php:185 actions/recoverpassword.php:418
 #, fuzzy
-msgid "Can't save new password."
+msgid "Cannot save new password."
 msgstr "Can't save new password."
 
-#. TRANS: Title for password recovery page in password saved mode.
-#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
+#: actions/passwordsettings.php:191
 msgid "Password saved."
 msgstr "Password saved."
 
@@ -4354,8 +4411,7 @@ msgid "Directory where backgrounds are located."
 msgstr ""
 
 #. TRANS: Fieldset legens in Paths admin panel.
-#. TRANS: DT element label in attachment list.
-#: actions/pathsadminpanel.php:419 lib/attachmentlist.php:98
+#: actions/pathsadminpanel.php:419
 msgid "Attachments"
 msgstr "Attachments"
 
@@ -4426,7 +4482,9 @@ msgstr ""
 msgid "Save paths"
 msgstr "Save paths"
 
-#: actions/peoplesearch.php:52
+#. TRANS: Instructions for the "People search" page.
+#. TRANS: %%site.name%% is the name of the StatusNet site.
+#: actions/peoplesearch.php:54
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
@@ -4435,7 +4493,8 @@ msgstr ""
 "Search for people on %%site.name%% by their name, location, or interests. "
 "Separate the terms by spaces; they must be 3 characters or more."
 
-#: actions/peoplesearch.php:58
+#. TRANS: Title of a page where users can search for other users.
+#: actions/peoplesearch.php:61
 msgid "People search"
 msgstr "People search"
 
@@ -4449,6 +4508,60 @@ msgstr "Not a valid people tag: %s."
 msgid "Users self-tagged with %1$s - page %2$d"
 msgstr "Users self-tagged with %1$s - page %2$d"
 
+#. TRANS: Page title for AJAX form return when a disabling a plugin.
+#: actions/plugindisable.php:69
+msgctxt "plugin"
+msgid "Disabled"
+msgstr ""
+
+#. TRANS: Client error displayed trying to perform any request method other than POST.
+#. TRANS: Do not translate POST.
+#: actions/pluginenable.php:78 actions/subscribe.php:77
+msgid "This action only accepts POST requests."
+msgstr ""
+
+#: actions/pluginenable.php:102
+#, fuzzy
+msgid "You cannot administer plugins."
+msgstr "You cannot delete users."
+
+#: actions/pluginenable.php:109
+#, fuzzy
+msgid "No such plugin."
+msgstr "No such page."
+
+#. TRANS: Page title for AJAX form return when enabling a plugin.
+#: actions/pluginenable.php:159
+msgctxt "plugin"
+msgid "Enabled"
+msgstr ""
+
+#. TRANS: Tab and title for plugins admin panel.
+#. TRANS: Menu item for site administration
+#: actions/pluginsadminpanel.php:56 actions/version.php:191
+#: lib/adminpanelaction.php:411
+msgid "Plugins"
+msgstr ""
+
+#. TRANS: Instructions at top of plugin admin page.
+#: actions/pluginsadminpanel.php:68
+msgid ""
+"Additional plugins can be enabled and configured manually. See the <a href="
+"\"http://status.net/wiki/Plugins\">online plugin documentation</a> for more "
+"details."
+msgstr ""
+
+#. TRANS: Admin form section header
+#: actions/pluginsadminpanel.php:84
+#, fuzzy
+msgid "Default plugins"
+msgstr "Default language"
+
+#: actions/pluginsadminpanel.php:106
+msgid ""
+"All default plugins have been disabled from the site's configuration file."
+msgstr ""
+
 #: actions/postnotice.php:95
 msgid "Invalid notice content."
 msgstr "Invalid notice content."
@@ -4459,46 +4572,43 @@ msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’.
 msgstr "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’."
 
 #. TRANS: Page title for profile settings.
-#: actions/profilesettings.php:59
+#: actions/profilesettings.php:60
 msgid "Profile settings"
 msgstr "Profile settings"
 
 #. TRANS: Usage instructions for profile settings.
-#: actions/profilesettings.php:70
+#: actions/profilesettings.php:71
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
 "You can update your personal profile info here so people know more about you."
 
 #. TRANS: Profile settings form legend.
-#: actions/profilesettings.php:98
+#: actions/profilesettings.php:99
 msgid "Profile information"
 msgstr "Profile information"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109 actions/register.php:433
+#: actions/profilesettings.php:110 actions/register.php:412
 #, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr "1-64 lowercase letters or numbers, no punctuation or spaces"
 
 #. TRANS: Field label in form for profile settings.
-#. TRANS: Label for full group name (dt). Text hidden by default.
-#. TRANS: DT for full name in a profile.
-#: actions/profilesettings.php:113 actions/register.php:455
-#: actions/showgroup.php:255 actions/tagother.php:104
-#: lib/groupeditform.php:150 lib/userprofile.php:156
+#: actions/profilesettings.php:114 actions/register.php:434
+#: lib/groupeditform.php:150
 msgid "Full name"
 msgstr "Full name"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:118 actions/register.php:460
+#: actions/profilesettings.php:119 actions/register.php:439
 #: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "Homepage"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:121
+#: actions/profilesettings.php:122 actions/register.php:441
 #, fuzzy
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr "URL of your homepage, blog, or profile on another site"
@@ -4506,7 +4616,7 @@ msgstr "URL of your homepage, blog, or profile on another site"
 #. TRANS: Tooltip for field label in form for profile settings. Plural
 #. TRANS: is decided by the number of characters available for the
 #. TRANS: biography (%d).
-#: actions/profilesettings.php:129 actions/register.php:471
+#: actions/profilesettings.php:130 actions/register.php:450
 #, fuzzy, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4514,85 +4624,81 @@ msgstr[0] "Describe yourself and your interests in %d chars"
 msgstr[1] "Describe yourself and your interests in %d chars"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:135 actions/register.php:476
+#: actions/profilesettings.php:136 actions/register.php:455
 msgid "Describe yourself and your interests"
 msgstr "Describe yourself and your interests"
 
 #. TRANS: Text area label in form for profile settings where users can provide.
 #. TRANS: their biography.
-#: actions/profilesettings.php:139 actions/register.php:478
+#: actions/profilesettings.php:140 actions/register.php:457
 msgid "Bio"
 msgstr "Bio"
 
 #. TRANS: Field label in form for profile settings.
-#. TRANS: Label for group location (dt). Text hidden by default.
-#. TRANS: DT for location in a profile.
-#: actions/profilesettings.php:145 actions/register.php:483
-#: actions/showgroup.php:265 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:173
-#: lib/userprofile.php:172
+#: actions/profilesettings.php:146 actions/register.php:462
+#: lib/groupeditform.php:173
 msgid "Location"
 msgstr "Location"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148 actions/register.php:485
+#: actions/profilesettings.php:149
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Where you are, like \"City, State (or Region), Country\""
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:153
+#: actions/profilesettings.php:154
 msgid "Share my current location when posting notices"
 msgstr ""
 
 #. TRANS: Field label in form for profile settings.
-#. TRANS: DT for tags in a profile.
-#: actions/profilesettings.php:161 actions/tagother.php:149
-#: actions/tagother.php:209 lib/subscriptionlist.php:106
-#: lib/subscriptionlist.php:108 lib/userprofile.php:220
+#: actions/profilesettings.php:162 actions/tagother.php:128
+#: actions/tagother.php:188 lib/subscriptionlist.php:104
+#: lib/subscriptionlist.php:106
 msgid "Tags"
 msgstr "Tags"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:164
+#: actions/profilesettings.php:165
 #, fuzzy
 msgid ""
-"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- "
+"separated."
 msgstr ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:169
+#: actions/profilesettings.php:170
 msgid "Language"
 msgstr "Language"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:171
+#: actions/profilesettings.php:172
 #, fuzzy
-msgid "Preferred language"
+msgid "Preferred language."
 msgstr "Preferred language"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:181
+#: actions/profilesettings.php:182
 msgid "Timezone"
 msgstr "Timezone"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:183
+#: actions/profilesettings.php:184
 msgid "What timezone are you normally in?"
 msgstr "In which timezone are you?"
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:189
+#: actions/profilesettings.php:190
 #, fuzzy
 msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)"
+"Automatically subscribe to whoever subscribes to me (best for non-humans)."
 msgstr ""
 "Automatically subscribe to whoever subscribes to me (best for non-humans)"
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Plural form is used based on the maximum number of allowed
 #. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:258 actions/register.php:229
+#: actions/profilesettings.php:259 actions/register.php:214
 #, fuzzy, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4600,50 +4706,50 @@ msgstr[0] "Bio is too long (max %d chars)."
 msgstr[1] "Bio is too long (max %d chars)."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:269 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:270 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr "Timezone not selected."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:277
+#: actions/profilesettings.php:278
 #, fuzzy
 msgid "Language is too long (maximum 50 characters)."
 msgstr "Language is too long (max 50 chars)."
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:291 actions/tagother.php:178
-#, php-format
-msgid "Invalid tag: \"%s\""
+#: actions/profilesettings.php:292
+#, fuzzy, php-format
+msgid "Invalid tag: \"%s\"."
 msgstr "Invalid tag: \"%s\""
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:347
+#: actions/profilesettings.php:348
 #, fuzzy
 msgid "Could not update user for autosubscribe."
 msgstr "Couldn't update user for autosubscribe."
 
 #. TRANS: Server error thrown when user profile location preference settings could not be updated.
-#: actions/profilesettings.php:405
+#: actions/profilesettings.php:406
 #, fuzzy
 msgid "Could not save location prefs."
 msgstr "Couldn't save location prefs."
 
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:427 actions/tagother.php:200
+#: actions/profilesettings.php:428 actions/tagother.php:179
 msgid "Could not save tags."
 msgstr "Could not save tags."
 
 #. TRANS: Confirmation shown when user profile settings are saved.
 #. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:436 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:437 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "Settings saved."
 
 #. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
 #. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:483 actions/restoreaccount.php:60
+#: actions/profilesettings.php:484 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "Create an account"
@@ -4722,6 +4828,12 @@ msgstr ""
 "blogging) service based on the Free Software [StatusNet](http://status.net/) "
 "tool."
 
+#. TRANS: Public RSS feed description. %s is the StatusNet site name.
+#: actions/publicrss.php:106
+#, fuzzy, php-format
+msgid "%s updates from everyone."
+msgstr "%s updates from everyone!"
+
 #. TRANS: Title for public tag cloud.
 #: actions/publictagcloud.php:57
 msgid "Public tag cloud"
@@ -4762,10 +4874,6 @@ msgstr ""
 "Why not [register an account](%%action.register%%) and be the first to post "
 "one!"
 
-#: actions/publictagcloud.php:146
-msgid "Tag cloud"
-msgstr "Tag cloud"
-
 #. TRANS: Client error displayed trying to recover password while already logged in.
 #: actions/recoverpassword.php:37
 msgid "You are already logged in!"
@@ -4857,6 +4965,12 @@ msgstr "Recover password"
 msgid "Password recovery requested"
 msgstr "Password recovery requested"
 
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/recoverpassword.php:229
+#, fuzzy
+msgid "Password saved"
+msgstr "Password saved."
+
 #. TRANS: Title for password recovery page when an unknown action has been specified.
 #: actions/recoverpassword.php:232
 msgid "Unknown action"
@@ -4868,15 +4982,9 @@ msgstr "Unknown action"
 msgid "6 or more characters, and do not forget it!"
 msgstr "6 or more characters, and don't forget it!"
 
-#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
-#: actions/recoverpassword.php:264 actions/register.php:441
-#, fuzzy
-msgid "Same as password above."
-msgstr "Same as password above"
-
 #. TRANS: Button text for password reset form.
 #. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: actions/recoverpassword.php:268 lib/designsettings.php:264
+#: actions/recoverpassword.php:268 lib/designform.php:145
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Reset"
@@ -4927,14 +5035,8 @@ msgstr "Password must be 6 chars or more."
 msgid "Password and confirmation do not match."
 msgstr "Password and confirmation do not match."
 
-#. TRANS: Reset password form validation error message.
-#: actions/recoverpassword.php:418
-#, fuzzy
-msgid "Cannot save new password."
-msgstr "Can't save new password."
-
 #. TRANS: Server error displayed when something does wrong with the user object during password reset.
-#: actions/recoverpassword.php:426 actions/register.php:256
+#: actions/recoverpassword.php:426 actions/register.php:241
 msgid "Error setting user."
 msgstr "Error setting user."
 
@@ -4943,94 +5045,98 @@ msgstr "Error setting user."
 msgid "New password successfully saved. You are now logged in."
 msgstr "New password successfully saved. You are now logged in."
 
-#: actions/register.php:92 actions/register.php:196 actions/register.php:413
+#: actions/redirecturl.php:70
+#, fuzzy
+msgid "No id parameter"
+msgstr "No ID argument."
+
+#: actions/redirecturl.php:76
+#, fuzzy, php-format
+msgid "No such file \"%d\""
+msgstr "No such file."
+
+#: actions/register.php:80 actions/register.php:181 actions/register.php:392
 msgid "Sorry, only invited people can register."
 msgstr "Sorry, only invited people can register."
 
-#: actions/register.php:99
+#: actions/register.php:87
 msgid "Sorry, invalid invitation code."
 msgstr "Sorry, invalid invitation code."
 
-#: actions/register.php:119
+#: actions/register.php:106
 msgid "Registration successful"
 msgstr "Registration successful"
 
-#: actions/register.php:121 actions/register.php:511
+#: actions/register.php:108 actions/register.php:490
 msgid "Register"
 msgstr "Register"
 
-#: actions/register.php:142
+#: actions/register.php:128
 msgid "Registration not allowed."
 msgstr "Registration not allowed."
 
-#: actions/register.php:209
+#: actions/register.php:194
 #, fuzzy
-msgid "You can't register if you don't agree to the license."
+msgid "You cannot register if you don't agree to the license."
 msgstr "You can't register if you don't agree to the licence."
 
-#: actions/register.php:218
+#: actions/register.php:203
 msgid "Email address already exists."
 msgstr "E-mail address already exists."
 
-#: actions/register.php:251 actions/register.php:273
+#: actions/register.php:236 actions/register.php:258
 msgid "Invalid username or password."
 msgstr "Invalid username or password."
 
-#: actions/register.php:351
+#: actions/register.php:333
 msgid ""
 "With this form you can create a new account. You can then post notices and "
-"link up to friends and colleagues. "
+"link up to friends and colleagues."
 msgstr ""
 
-#: actions/register.php:437
-#, fuzzy
-msgid "6 or more characters."
-msgstr "6 or more characters"
-
-#. TRANS: Link description in user account settings menu.
-#: actions/register.php:445 actions/register.php:449
-#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
+#: actions/register.php:424 actions/register.php:428
+#: actions/siteadminpanel.php:238 lib/settingsnav.php:92
 msgid "Email"
 msgstr "E-mail"
 
-#: actions/register.php:446 actions/register.php:450
+#: actions/register.php:425 actions/register.php:429
 #, fuzzy
-msgid "Used only for updates, announcements, and password recovery"
+msgid "Used only for updates, announcements, and password recovery."
 msgstr "Used only for updates, announcements, and password recovery"
 
-#: actions/register.php:457
+#: actions/register.php:436
 #, fuzzy
-msgid "Longer name, preferably your \"real\" name"
+msgid "Longer name, preferably your \"real\" name."
 msgstr "Longer name, preferably your \"real\" name"
 
-#: actions/register.php:462
+#: actions/register.php:464
 #, fuzzy
-msgid "URL of your homepage, blog, or profile on another site"
-msgstr "URL of your homepage, blog, or profile on another site"
+msgid "Where you are, like \"City, State (or Region), Country\"."
+msgstr "Where you are, like \"City, State (or Region), Country\""
 
-#: actions/register.php:523
+#: actions/register.php:503
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
 msgstr ""
 
-#: actions/register.php:533
+#: actions/register.php:513
 #, php-format
 msgid "My text and files are copyright by %1$s."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:537
+#: actions/register.php:517
 msgid "My text and files remain under my own copyright."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:540
+#: actions/register.php:520
 msgid "All rights reserved."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:545
+#: actions/register.php:525
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -5039,7 +5145,7 @@ msgstr ""
 "My text and files are available under %s except this private data: password, "
 "email address, IM address, and phone number."
 
-#: actions/register.php:588
+#: actions/register.php:566
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -5072,7 +5178,7 @@ msgstr ""
 "\n"
 "Thanks for signing up and we hope you enjoy using this service."
 
-#: actions/register.php:612
+#: actions/register.php:590
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5105,7 +5211,7 @@ msgstr "User nickname"
 
 #: actions/remotesubscribe.php:129
 #, fuzzy
-msgid "Nickname of the user you want to follow"
+msgid "Nickname of the user you want to follow."
 msgstr "Nickname of the user you want to follow"
 
 #: actions/remotesubscribe.php:132
@@ -5114,18 +5220,18 @@ msgstr "Profile URL"
 
 #: actions/remotesubscribe.php:133
 #, fuzzy
-msgid "URL of your profile on another compatible microblogging service"
+msgid "URL of your profile on another compatible microblogging service."
 msgstr "URL of your profile on another compatible microblogging service"
 
 #. TRANS: Link text for link that will subscribe to a remote profile.
 #: actions/remotesubscribe.php:136 lib/subscribeform.php:139
-#: lib/userprofile.php:431
+#: lib/userprofile.php:402
 msgid "Subscribe"
 msgstr "Subscribe"
 
 #: actions/remotesubscribe.php:158
 #, fuzzy
-msgid "Invalid profile URL (bad format)"
+msgid "Invalid profile URL (bad format)."
 msgstr "Invalid profile URL (bad format)"
 
 #: actions/remotesubscribe.php:167
@@ -5159,7 +5265,7 @@ msgstr "You can't repeat your own notice."
 msgid "You already repeated that notice."
 msgstr "You already repeated that notice."
 
-#: actions/repeat.php:112 lib/noticelist.php:692
+#: actions/repeat.php:112 lib/noticelist.php:697
 msgid "Repeated"
 msgstr "Repeated"
 
@@ -5167,9 +5273,9 @@ msgstr "Repeated"
 msgid "Repeated!"
 msgstr "Repeated!"
 
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing @-replies.
+#. TRANS: RSS reply feed title. %s is a user nickname.
 #: actions/replies.php:126 actions/repliesrss.php:68
-#: lib/personalgroupnav.php:109
+#: lib/personalgroupnav.php:105
 #, php-format
 msgid "Replies to %s"
 msgstr "Replies to %s"
@@ -5219,9 +5325,11 @@ msgstr ""
 "You can try to [nudge %1$s](../%2$s) or [post something to them](%%%%action."
 "newnotice%%%%?status_textarea=%3$s)."
 
-#: actions/repliesrss.php:72
+#. TRANS: RSS reply feed description.
+#. TRANS: %1$s is a user nickname, %2$s is the StatusNet site name.
+#: actions/repliesrss.php:74
 #, fuzzy, php-format
-msgid "Replies to %1$s on %2$s!"
+msgid "Replies to %1$s on %2$s."
 msgstr "Replies to %1$s on %2$s!"
 
 #. TRANS: Client exception displayed when trying to restore an account while not logged in.
@@ -5321,7 +5429,7 @@ msgstr "You cannot revoke user roles on this site."
 msgid "User doesn't have this role."
 msgstr "User doesn't have this role."
 
-#: actions/rsd.php:146 actions/version.php:159
+#: actions/rsd.php:142 actions/version.php:159
 msgid "StatusNet"
 msgstr "StatusNet"
 
@@ -5363,93 +5471,44 @@ msgstr ""
 msgid "Save site settings"
 msgstr "Save site settings"
 
-#: actions/showapplication.php:82
+#: actions/showapplication.php:78
 msgid "You must be logged in to view an application."
 msgstr "You must be logged in to view an application."
 
-#: actions/showapplication.php:157
+#: actions/showapplication.php:151
 msgid "Application profile"
 msgstr "Application profile"
 
-#. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:159 lib/applicationeditform.php:177
-msgid "Icon"
-msgstr ""
-
-#. TRANS: Form input field label for application name.
-#: actions/showapplication.php:169 actions/version.php:197
-#: lib/applicationeditform.php:190
-msgid "Name"
-msgstr "Name"
-
-#. TRANS: Form input field label.
-#: actions/showapplication.php:178 lib/applicationeditform.php:227
-msgid "Organization"
-msgstr "Organization"
-
-#. TRANS: Form input field label.
-#: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:168
-msgid "Description"
-msgstr "Description"
-
-#. TRANS: Header for group statistics on a group page (h2).
-#. TRANS: H2 text for user statistics.
-#: actions/showapplication.php:192 actions/showgroup.php:460
-#: lib/profileaction.php:205
-msgid "Statistics"
-msgstr "Statistics"
-
-#: actions/showapplication.php:203
+#: actions/showapplication.php:179
 #, php-format
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr ""
 
-#: actions/showapplication.php:213
+#: actions/showapplication.php:189
 msgid "Application actions"
 msgstr "Application actions"
 
-#: actions/showapplication.php:236
+#: actions/showapplication.php:212
 msgid "Reset key & secret"
 msgstr ""
 
 #. TRANS: Title of form for deleting a user.
-#: actions/showapplication.php:252 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:64 lib/noticelist.php:673
+#: actions/showapplication.php:228 lib/deletegroupform.php:121
+#: lib/deleteuserform.php:64 lib/noticelist.php:678
 msgid "Delete"
 msgstr "Delete"
 
-#: actions/showapplication.php:261
+#: actions/showapplication.php:237
 msgid "Application info"
 msgstr "Application information"
 
-#: actions/showapplication.php:263
-msgid "Consumer key"
-msgstr ""
-
-#: actions/showapplication.php:268
-msgid "Consumer secret"
-msgstr ""
-
-#: actions/showapplication.php:273
-msgid "Request token URL"
-msgstr ""
-
-#: actions/showapplication.php:278
-msgid "Access token URL"
-msgstr ""
-
-#: actions/showapplication.php:283
-msgid "Authorize URL"
-msgstr "Authorise URL"
-
-#: actions/showapplication.php:288
+#: actions/showapplication.php:255
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
 msgstr ""
 
-#: actions/showapplication.php:309
+#: actions/showapplication.php:275
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr "Are you sure you want to reset your consumer key and secret?"
 
@@ -5535,61 +5594,47 @@ msgstr "%s group"
 msgid "%1$s group, page %2$d"
 msgstr "%1$s group, page %2$d"
 
-#. TRANS: Group profile header (h2). Text hidden by default.
-#: actions/showgroup.php:223
-msgid "Group profile"
-msgstr "Group profile"
-
-#. TRANS: Label for group URL (dt). Text hidden by default.
-#. TRANS: DT for URL in a profile.
-#: actions/showgroup.php:273 actions/tagother.php:118
-#: actions/userauthorization.php:175 lib/userprofile.php:186
-msgid "URL"
-msgstr "URL"
-
 #. TRANS: Label for group description or group note (dt). Text hidden by default.
-#. TRANS: DT for note in a profile.
-#: actions/showgroup.php:285 actions/tagother.php:128
-#: actions/userauthorization.php:187 lib/userprofile.php:204
+#: actions/showgroup.php:266
 msgid "Note"
 msgstr "Note"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:296 lib/groupeditform.php:180
+#: actions/showgroup.php:277 lib/groupeditform.php:180
 msgid "Aliases"
 msgstr ""
 
 #. TRANS: Group actions header (h2). Text hidden by default.
-#: actions/showgroup.php:313
+#: actions/showgroup.php:294
 msgid "Group actions"
 msgstr "Group actions"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:357
+#: actions/showgroup.php:338
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
 msgstr "Notice feed for %s group (RSS 1.0)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:364
+#: actions/showgroup.php:345
 #, php-format
 msgid "Notice feed for %s group (RSS 2.0)"
 msgstr "Notice feed for %s group (RSS 2.0)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:371
+#: actions/showgroup.php:352
 #, php-format
 msgid "Notice feed for %s group (Atom)"
 msgstr "Notice feed for %s group (Atom)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:377
+#: actions/showgroup.php:358
 #, php-format
 msgid "FOAF for %s group"
 msgstr "FOAF for %s group"
 
 #. TRANS: Header for mini list of group members on a group page (h2).
-#: actions/showgroup.php:414
+#: actions/showgroup.php:395
 msgid "Members"
 msgstr "Members"
 
@@ -5597,26 +5642,31 @@ msgstr "Members"
 #. TRANS: Text for user subscription statistics if the user has no subscriptions.
 #. TRANS: Text for user subscriber statistics if user has no subscribers.
 #. TRANS: Text for user user group membership statistics if user is not a member of any group.
-#: actions/showgroup.php:420 lib/profileaction.php:137
+#: actions/showgroup.php:401 lib/profileaction.php:137
 #: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
-#: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
+#: lib/subscriptionlist.php:123 lib/tagcloudsection.php:71
 msgid "(None)"
 msgstr "(None)"
 
 #. TRANS: Link to all group members from mini list of group members if group has more than n members.
-#: actions/showgroup.php:429
+#: actions/showgroup.php:410
 msgid "All members"
 msgstr "All members"
 
-#. TRANS: Label for creation date in statistics on group page.
-#: actions/showgroup.php:465
+#. TRANS: Header for group statistics on a group page (h2).
+#. TRANS: H2 text for user statistics.
+#: actions/showgroup.php:441 lib/profileaction.php:205
+msgid "Statistics"
+msgstr "Statistics"
+
+#: actions/showgroup.php:444
 #, fuzzy
 msgctxt "LABEL"
 msgid "Created"
 msgstr "Created"
 
 #. TRANS: Label for member count in statistics on group page.
-#: actions/showgroup.php:473
+#: actions/showgroup.php:449
 #, fuzzy
 msgctxt "LABEL"
 msgid "Members"
@@ -5626,7 +5676,7 @@ msgstr "Members"
 #. TRANS: **%s** is the group alias, %%%%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).
-#: actions/showgroup.php:488
+#: actions/showgroup.php:464
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5644,7 +5694,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: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
-#: actions/showgroup.php:498
+#: actions/showgroup.php:474
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5658,7 +5708,7 @@ msgstr ""
 "their life and interests. "
 
 #. TRANS: Header for list of group administrators on a group page (h2).
-#: actions/showgroup.php:527
+#: actions/showgroup.php:503
 msgid "Admins"
 msgstr "Admins"
 
@@ -5697,7 +5747,7 @@ msgid "%1$s tagged %2$s"
 msgstr "%1$s, page %2$d"
 
 #. TRANS: Page title showing tagged notices in one user's stream.
-#. TRANS: %1$s is the username, %2$s is the hash tag, %1$d is the page number.
+#. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
 #: actions/showstream.php:74
 #, fuzzy, php-format
 msgid "%1$s tagged %2$s, page %3$d"
@@ -5744,13 +5794,13 @@ msgid "FOAF for %s"
 msgstr "FOAF for %s"
 
 #. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
-#: actions/showstream.php:211
+#: actions/showstream.php:205
 #, fuzzy, php-format
 msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr "This is the timeline for %1$s but %2$s hasn't posted anything yet."
 
 #. TRANS: Second sentence of empty list message for a stream for the user themselves.
-#: actions/showstream.php:217
+#: actions/showstream.php:211
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
@@ -5758,7 +5808,7 @@ msgstr ""
 
 #. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:221
+#: actions/showstream.php:215
 #, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
@@ -5769,7 +5819,7 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:264
+#: actions/showstream.php:258
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5784,7 +5834,7 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:271
+#: actions/showstream.php:265
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5796,7 +5846,7 @@ msgstr ""
 "[StatusNet](http://status.net/) tool. "
 
 #. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
-#: actions/showstream.php:328
+#: actions/showstream.php:322
 #, php-format
 msgid "Repeat of %s"
 msgstr "Repeat of %s"
@@ -5939,75 +5989,75 @@ msgstr ""
 #. TRANS: Title for button to save site notice in admin panel.
 #: actions/sitenoticeadminpanel.php:201
 #, fuzzy
-msgid "Save site notice"
+msgid "Save site notice."
 msgstr "Save site notice"
 
 #. TRANS: Title for SMS settings.
-#: actions/smssettings.php:57
+#: actions/smssettings.php:56
 msgid "SMS settings"
 msgstr "SMS settings"
 
 #. TRANS: SMS settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/smssettings.php:71
+#: actions/smssettings.php:70
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr "You can receive SMS messages through e-mail from %%site.name%%."
 
 #. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
-#: actions/smssettings.php:93
+#: actions/smssettings.php:92
 msgid "SMS is not available."
 msgstr "SMS is not available."
 
 #. TRANS: Form legend for SMS settings form.
-#: actions/smssettings.php:107
+#: actions/smssettings.php:106
 msgid "SMS address"
 msgstr "SMS address"
 
 #. TRANS: Form guide in SMS settings form.
-#: actions/smssettings.php:116
+#: actions/smssettings.php:115
 msgid "Current confirmed SMS-enabled phone number."
 msgstr "Current confirmed SMS-enabled phone number."
 
 #. TRANS: Form guide in IM settings form.
-#: actions/smssettings.php:129
+#: actions/smssettings.php:128
 msgid "Awaiting confirmation on this phone number."
 msgstr "Awaiting confirmation on this phone number."
 
 #. TRANS: Field label for SMS address input in SMS settings form.
-#: actions/smssettings.php:138
+#: actions/smssettings.php:137
 msgid "Confirmation code"
 msgstr "Confirmation code"
 
 #. TRANS: Form field instructions in SMS settings form.
-#: actions/smssettings.php:140
+#: actions/smssettings.php:139
 msgid "Enter the code you received on your phone."
 msgstr "Enter the code you received on your phone."
 
 #. TRANS: Button label to confirm SMS confirmation code in SMS settings.
-#: actions/smssettings.php:144
+#: actions/smssettings.php:143
 msgctxt "BUTTON"
 msgid "Confirm"
 msgstr "Confirm"
 
 #. TRANS: Field label for SMS phone number input in SMS settings form.
-#: actions/smssettings.php:149
+#: actions/smssettings.php:148
 msgid "SMS phone number"
 msgstr "SMS phone number"
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
-#: actions/smssettings.php:152
+#: actions/smssettings.php:151
 #, fuzzy
-msgid "Phone number, no punctuation or spaces, with area code"
+msgid "Phone number, no punctuation or spaces, with area code."
 msgstr "Phone number, no punctuation or spaces, with area code"
 
 #. TRANS: Form legend for SMS preferences form.
-#: actions/smssettings.php:191
+#: actions/smssettings.php:190
 msgid "SMS preferences"
 msgstr "SMS preferences"
 
 #. TRANS: Checkbox label in SMS preferences form.
-#: actions/smssettings.php:197
+#: actions/smssettings.php:196
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
@@ -6016,32 +6066,32 @@ msgstr ""
 "from my carrier."
 
 #. TRANS: Confirmation message for successful SMS preferences save.
-#: actions/smssettings.php:308
+#: actions/smssettings.php:307
 msgid "SMS preferences saved."
 msgstr "SMS preferences saved."
 
 #. TRANS: Message given saving SMS phone number without having provided one.
-#: actions/smssettings.php:330
+#: actions/smssettings.php:329
 msgid "No phone number."
 msgstr "No phone number."
 
 #. TRANS: Message given saving SMS phone number without having selected a carrier.
-#: actions/smssettings.php:336
+#: actions/smssettings.php:335
 msgid "No carrier selected."
 msgstr "No carrier selected."
 
 #. TRANS: Message given saving SMS phone number that is already set.
-#: actions/smssettings.php:344
+#: actions/smssettings.php:343
 msgid "That is already your phone number."
 msgstr "That is already your phone number."
 
 #. TRANS: Message given saving SMS phone number that is already set for another user.
-#: actions/smssettings.php:348
+#: actions/smssettings.php:347
 msgid "That phone number already belongs to another user."
 msgstr "That phone number already belongs to another user."
 
 #. TRANS: Message given saving valid SMS phone number that is to be confirmed.
-#: actions/smssettings.php:376
+#: actions/smssettings.php:375
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
 "for the code and instructions on how to use it."
@@ -6050,39 +6100,39 @@ msgstr ""
 "for the code and instructions on how to use it."
 
 #. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
-#: actions/smssettings.php:404
+#: actions/smssettings.php:403
 msgid "That is the wrong confirmation number."
 msgstr "That is the wrong confirmation number."
 
 #. TRANS: Message given after successfully canceling SMS phone number confirmation.
-#: actions/smssettings.php:418
+#: actions/smssettings.php:417
 msgid "SMS confirmation cancelled."
 msgstr "SMS confirmation cancelled."
 
 #. TRANS: Message given trying to remove an SMS phone number that is not
 #. TRANS: registered for the active user.
-#: actions/smssettings.php:438
+#: actions/smssettings.php:437
 msgid "That is not your phone number."
 msgstr "That is not your phone number."
 
 #. TRANS: Message given after successfully removing a registered SMS phone number.
-#: actions/smssettings.php:460
+#: actions/smssettings.php:459
 msgid "The SMS phone number was removed."
 msgstr "The SMS phone number was removed."
 
 #. TRANS: Label for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:499
+#: actions/smssettings.php:498
 msgid "Mobile carrier"
 msgstr "Mobile carrier"
 
 #. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:504
+#: actions/smssettings.php:503
 msgid "Select a carrier"
 msgstr "Select a carrier"
 
 #. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
 #. TRANS: %s is an administrative contact's e-mail address.
-#: actions/smssettings.php:513
+#: actions/smssettings.php:512
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -6092,7 +6142,7 @@ msgstr ""
 "email but isn't listed here, send email to let us know at %s."
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
-#: actions/smssettings.php:535
+#: actions/smssettings.php:534
 #, fuzzy
 msgid "No code entered."
 msgstr "No code entered"
@@ -6166,15 +6216,13 @@ msgstr "You are not subscribed to that profile."
 msgid "Could not save subscription."
 msgstr "Could not save subscription."
 
-#: actions/subscribe.php:77
-msgid "This action only accepts POST requests."
-msgstr ""
-
-#: actions/subscribe.php:117
+#. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
+#: actions/subscribe.php:121
 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
 msgstr "You cannot subscribe to an OMB 0.1 remote profile with this action."
 
-#: actions/subscribe.php:145
+#. TRANS: Page title when subscription succeeded.
+#: actions/subscribe.php:149
 msgid "Subscribed"
 msgstr "Subscribed"
 
@@ -6286,31 +6334,34 @@ msgid "Subscription feed for %s (Atom)"
 msgstr "Notice feed for %s (Atom)"
 
 #. TRANS: Checkbox label for enabling Jabber messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:239
-msgid "Jabber"
-msgstr "Jabber"
+#: actions/subscriptions.php:241 lib/settingsnav.php:110
+#, fuzzy
+msgid "IM"
+msgstr "IM"
 
 #. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:254
+#: actions/subscriptions.php:256 lib/settingsnav.php:117
 msgid "SMS"
 msgstr "SMS"
 
-#: actions/tag.php:69
+#. TRANS: Title for all but the first page of notices with tags.
+#. TRANS: %1$s is the tag, %2$d is the page number.
+#: actions/tag.php:73
 #, php-format
 msgid "Notices tagged with %1$s, page %2$d"
 msgstr "Notices tagged with %1$s, page %2$d"
 
-#: actions/tag.php:87
+#: actions/tag.php:91
 #, php-format
 msgid "Notice feed for tag %s (RSS 1.0)"
 msgstr "Notice feed for tag %s (RSS 1.0)"
 
-#: actions/tag.php:93
+#: actions/tag.php:97
 #, php-format
 msgid "Notice feed for tag %s (RSS 2.0)"
 msgstr "Notice feed for tag %s (RSS 2.0)"
 
-#: actions/tag.php:99
+#: actions/tag.php:103
 #, php-format
 msgid "Notice feed for tag %s (Atom)"
 msgstr "Notice feed for tag %s (Atom)"
@@ -6329,17 +6380,11 @@ msgstr "Tag %s"
 msgid "User profile"
 msgstr "User profile"
 
-#. TRANS: DT element in area for user avatar.
-#: actions/tagother.php:81 actions/userauthorization.php:132
-#: lib/userprofile.php:108
-msgid "Photo"
-msgstr "Photo"
-
-#: actions/tagother.php:141
+#: actions/tagother.php:120
 msgid "Tag user"
 msgstr "Tag user"
 
-#: actions/tagother.php:151
+#: actions/tagother.php:130
 msgid ""
 "Tags for this user (letters, numbers, -, ., and _), comma- or space- "
 "separated"
@@ -6347,13 +6392,18 @@ msgstr ""
 "Tags for this user (letters, numbers, -, ., and _), comma- or space- "
 "separated"
 
-#: actions/tagother.php:193
+#: actions/tagother.php:157
+#, php-format
+msgid "Invalid tag: \"%s\""
+msgstr "Invalid tag: \"%s\""
+
+#: actions/tagother.php:172
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 
-#: actions/tagother.php:236
+#: actions/tagother.php:215
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr "Use this form to add tags to your subscribers or subscriptions."
 
@@ -6361,6 +6411,7 @@ msgstr "Use this form to add tags to your subscribers or subscriptions."
 msgid "No such tag."
 msgstr "No such tag."
 
+#. TRANS: Client error displayed when trying to unblock a non-blocked user.
 #: actions/unblock.php:59
 msgid "You haven't blocked that user."
 msgstr "You haven't blocked that user."
@@ -6381,13 +6432,85 @@ msgstr "No profile ID in request."
 msgid "Unsubscribed"
 msgstr "Unsubscribed"
 
-#: actions/updateprofile.php:64 actions/userauthorization.php:337
+#: actions/updateprofile.php:64
 #, php-format
 msgid ""
 "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
 msgstr ""
 "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
 
+#: actions/urlsettings.php:60
+#, fuzzy
+msgid "URL settings"
+msgstr "IM settings"
+
+#. TRANS: Instructions for tab "Other" in user profile settings.
+#: actions/urlsettings.php:72
+msgid "Manage various other options."
+msgstr "Manage various other options."
+
+#. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
+#. TRANS: user's profile settings. This message has one space at the beginning. Use your
+#. TRANS: language's word separator here if it has one (most likely a single space).
+#: actions/urlsettings.php:115
+msgid " (free service)"
+msgstr ""
+
+#: actions/urlsettings.php:121
+#, fuzzy
+msgid "[none]"
+msgstr "None"
+
+#: actions/urlsettings.php:122
+msgid "[internal]"
+msgstr ""
+
+#. TRANS: Label for dropdown with URL shortener services.
+#: actions/urlsettings.php:130
+msgid "Shorten URLs with"
+msgstr "Shorten URLs with"
+
+#. TRANS: Tooltip for for dropdown with URL shortener services.
+#: actions/urlsettings.php:132
+msgid "Automatic shortening service to use."
+msgstr "Automatic shortening service to use."
+
+#: actions/urlsettings.php:138
+msgid "URL longer than"
+msgstr ""
+
+#: actions/urlsettings.php:141
+msgid "URLs longer than this will be shortened, 0 means always shorten."
+msgstr ""
+
+#: actions/urlsettings.php:145
+msgid "Text longer than"
+msgstr ""
+
+#: actions/urlsettings.php:148
+msgid ""
+"URLs in notices longer than this will be shortened, 0 means always shorten."
+msgstr ""
+
+#. TRANS: Form validation error for form "Other settings" in user profile.
+#: actions/urlsettings.php:180
+#, fuzzy
+msgid "URL shortening service is too long (maximum 50 characters)."
+msgstr "URL shortening service is too long (max 50 chars)."
+
+#: actions/urlsettings.php:187
+msgid "Invalid number for max url length."
+msgstr ""
+
+#: actions/urlsettings.php:193
+#, fuzzy
+msgid "Invalid number for max notice length."
+msgstr "Invalid notice content."
+
+#: actions/urlsettings.php:238
+msgid "Error saving user URL shortening preferences."
+msgstr ""
+
 #. TRANS: User admin panel title
 #: actions/useradminpanel.php:58
 msgctxt "TITLE"
@@ -6413,11 +6536,11 @@ msgstr ""
 #. TRANS: users in user admin panel. %1$s is the invalid nickname.
 #: actions/useradminpanel.php:166
 #, php-format
-msgid "Invalid default subscripton: '%1$s' is not a user."
+msgid "Invalid default subscripton: \"%1$s\" is not a user."
 msgstr ""
 
-#. TRANS: Link description in user account settings menu.
-#: actions/useradminpanel.php:215 lib/accountsettingsaction.php:106
+#: actions/useradminpanel.php:215 lib/action.php:565 lib/settingsnav.php:77
+#: lib/subgroupnav.php:81
 msgid "Profile"
 msgstr "Profile"
 
@@ -6475,59 +6598,63 @@ msgstr ""
 #. TRANS: Title for button to save user settings in user admin panel.
 #: actions/useradminpanel.php:302
 #, fuzzy
-msgid "Save user settings"
+msgid "Save user settings."
 msgstr "Save site settings"
 
-#: actions/userauthorization.php:105
+#. TRANS: Page title.
+#: actions/userauthorization.php:109
 msgid "Authorize subscription"
 msgstr "Authorise subscription"
 
-#: actions/userauthorization.php:110
+#. TRANS: Page notice on "Auhtorize subscription" page.
+#: actions/userauthorization.php:115
 #, fuzzy
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
 "user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
-"click “Reject”."
+"click \"Reject\"."
 msgstr ""
 "Please check these details to make sure that you want to subscribe to this "
 "user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
 "click “Reject”."
 
-#. TRANS: Menu item for site administration
-#: actions/userauthorization.php:196 actions/version.php:167
-#: lib/adminpanelaction.php:403
-msgid "License"
-msgstr "License"
-
-#: actions/userauthorization.php:217
+#. TRANS: Button text on Authorise Subscription page.
+#: actions/userauthorization.php:200
 #, fuzzy
+msgctxt "BUTTON"
 msgid "Accept"
 msgstr "Accept"
 
-#: actions/userauthorization.php:218 lib/subscribeform.php:115
-#: lib/subscribeform.php:139
-msgid "Subscribe to this user"
+#. TRANS: Title for button on Authorise Subscription page.
+#: actions/userauthorization.php:202
+#, fuzzy
+msgid "Subscribe to this user."
 msgstr "Subscribe to this user"
 
-#: actions/userauthorization.php:219
+#. TRANS: Button text on Authorise Subscription page.
+#: actions/userauthorization.php:204
 #, fuzzy
+msgctxt "BUTTON"
 msgid "Reject"
 msgstr "Reject"
 
-#: actions/userauthorization.php:220
+#. TRANS: Title for button on Authorise Subscription page.
+#: actions/userauthorization.php:206
 #, fuzzy
-msgid "Reject this subscription"
+msgid "Reject this subscription."
 msgstr "Reject this subscription"
 
-#: actions/userauthorization.php:232
+#. TRANS: Client error displayed for an empty authorisation request.
+#: actions/userauthorization.php:219
 msgid "No authorization request!"
 msgstr "No authorisation request!"
 
-#: actions/userauthorization.php:254
+#. TRANS: Accept message header from Authorise subscription page.
+#: actions/userauthorization.php:242
 msgid "Subscription authorized"
 msgstr "Subscription authorised"
 
-#: actions/userauthorization.php:256
+#: actions/userauthorization.php:245
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to authorize the "
@@ -6537,11 +6664,12 @@ msgstr ""
 "with the site’s instructions for details on how to authorize the "
 "subscription. Your subscription token is:"
 
-#: actions/userauthorization.php:266
+#. TRANS: Reject message header from Authorise subscription page.
+#: actions/userauthorization.php:256
 msgid "Subscription rejected"
 msgstr "Subscription rejected"
 
-#: actions/userauthorization.php:268
+#: actions/userauthorization.php:259
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to fully reject the "
@@ -6551,48 +6679,72 @@ msgstr ""
 "with the site’s instructions for details on how to fully reject the "
 "subscription."
 
-#: actions/userauthorization.php:303
+#. TRANS: Exception thrown when no valid user is found for an authorisation request.
+#. TRANS: %s is a listener URI.
+#: actions/userauthorization.php:296
 #, php-format
-msgid "Listener URI ‘%s’ not found here."
+msgid "Listener URI \"%s\" not found here."
 msgstr ""
 
-#: actions/userauthorization.php:308
+#. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
+#. TRANS: %s is a listenee URI.
+#: actions/userauthorization.php:303
 #, fuzzy, php-format
-msgid "Listenee URI ‘%s’ is too long."
+msgid "Listenee URI \"%s\" is too long."
 msgstr "Source URL is too long."
 
-#: actions/userauthorization.php:314
-#, fuzzy, php-format
-msgid "Listenee URI ‘%s’ is a local user."
-msgstr "Source URL is too long."
+#. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
+#. TRANS: %s is a listenee URI.
+#: actions/userauthorization.php:311
+#, php-format
+msgid "Listenee URI \"%s\" is a local user."
+msgstr ""
 
+#. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
+#. TRANS: %s is a profile URL.
 #: actions/userauthorization.php:329
 #, php-format
-msgid "Profile URL ‘%s’ is for a local user."
+msgid "Profile URL \"%s\" is for a local user."
 msgstr ""
 
-#: actions/userauthorization.php:345
+#. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
+#. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
+#: actions/userauthorization.php:339
 #, fuzzy, php-format
-msgid "Avatar URL ‘%s’ is not valid."
+msgid ""
+"Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
+"\"."
+msgstr ""
+"Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
+
+#. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
+#. TRANS: %s is an avatar URL.
+#: actions/userauthorization.php:349
+#, fuzzy, php-format
+msgid "Avatar URL \"%s\" is not valid."
 msgstr "Avatar URL ‘%s’ is not valid."
 
-#: actions/userauthorization.php:350
+#. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
+#. TRANS: %s is an avatar URL.
+#: actions/userauthorization.php:356
 #, fuzzy, php-format
-msgid "Can’t read avatar URL ‘%s’."
+msgid "Cannot read avatar URL \"%s\"."
 msgstr "Can’t read avatar URL ‘%s’."
 
-#: actions/userauthorization.php:355
+#. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
+#. TRANS: %s is an avatar URL.
+#: actions/userauthorization.php:363
 #, fuzzy, php-format
-msgid "Wrong image type for avatar URL ‘%s’."
+msgid "Wrong image type for avatar URL \"%s\"."
 msgstr "Wrong image type for avatar URL ‘%s’."
 
 #. TRANS: Page title for profile design page.
-#: actions/userdesignsettings.php:74 lib/designsettings.php:63
+#: actions/userdesignsettings.php:74 lib/designsettings.php:61
 msgid "Profile design"
 msgstr "Profile design"
 
 #. TRANS: Instructions for profile design page.
-#: actions/userdesignsettings.php:84 lib/designsettings.php:74
+#: actions/userdesignsettings.php:84 lib/designsettings.php:72
 msgid ""
 "Customize the way your profile looks with a background image and a colour "
 "palette of your choice."
@@ -6600,10 +6752,28 @@ msgstr ""
 "Customise the way your profile looks with a background image and a colour "
 "palette of your choice."
 
-#: actions/userdesignsettings.php:272
+#: actions/userdesignsettings.php:289
 msgid "Enjoy your hotdog!"
 msgstr ""
 
+#: actions/userdesignsettings.php:325
+#, fuzzy
+msgid "Design settings"
+msgstr "Save site settings"
+
+#: actions/userdesignsettings.php:340
+msgid "View profile designs"
+msgstr "View profile designs"
+
+#: actions/userdesignsettings.php:341
+msgid "Show or hide profile designs."
+msgstr "Show or hide profile designs."
+
+#: actions/userdesignsettings.php:348
+#, fuzzy
+msgid "Background file"
+msgstr "Background"
+
 #. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number.
 #: actions/usergroups.php:66
 #, php-format
@@ -6651,6 +6821,11 @@ msgstr ""
 msgid "Contributors"
 msgstr "Contributors"
 
+#. TRANS: Menu item for site administration
+#: actions/version.php:167 lib/adminpanelaction.php:403
+msgid "License"
+msgstr "License"
+
 #: actions/version.php:170
 msgid ""
 "StatusNet is free software: you can redistribute it and/or modify it under "
@@ -6684,12 +6859,13 @@ msgstr ""
 "You should have received a copy of the GNU Affero General Public License "
 "along with this program.  If not, see %s."
 
-#: actions/version.php:191
-msgid "Plugins"
-msgstr ""
+#. TRANS: Form input field label for application name.
+#: actions/version.php:197 lib/applicationeditform.php:190
+msgid "Name"
+msgstr "Name"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:901
+#: actions/version.php:198 lib/action.php:885
 msgid "Version"
 msgstr "Version"
 
@@ -6697,6 +6873,12 @@ msgstr "Version"
 msgid "Author(s)"
 msgstr ""
 
+#. TRANS: Form input field label.
+#: actions/version.php:200 lib/applicationeditform.php:208
+#: lib/groupeditform.php:168
+msgid "Description"
+msgstr "Description"
+
 #. TRANS: Activity title when marking a notice as favorite.
 #: classes/Fave.php:164
 msgid "Favor"
@@ -6811,7 +6993,7 @@ msgid "Could not create login token for %s"
 msgstr "Could not create login token for %s"
 
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
-#: classes/Memcached_DataObject.php:542
+#: classes/Memcached_DataObject.php:556
 msgid "No database name or DSN found anywhere."
 msgstr ""
 
@@ -6984,18 +7166,18 @@ msgstr "%1$s is now following %2$s."
 
 #. TRANS: Notice given on user registration.
 #. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:395
+#: classes/User.php:390
 #, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr "Welcome to %1$s, @%2$s!"
 
 #. TRANS: Server exception.
-#: classes/User.php:918
+#: classes/User.php:923
 msgid "No single user defined for single-user mode."
 msgstr ""
 
 #. TRANS: Server exception.
-#: classes/User.php:922
+#: classes/User.php:927
 msgid "Single-user mode code called when not enabled."
 msgstr ""
 
@@ -7040,41 +7222,6 @@ msgstr ""
 msgid "No AtomPub API service for %s."
 msgstr ""
 
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:104
-msgid "Change your profile settings"
-msgstr "Change your profile settings"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:111
-msgid "Upload an avatar"
-msgstr "Upload an avatar"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:118
-msgid "Change your password"
-msgstr "Change your password"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:125
-msgid "Change email handling"
-msgstr "Change e-mail handling"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:132
-msgid "Design your profile"
-msgstr "Design your profile"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:139
-msgid "Other options"
-msgstr "Other options"
-
-#. TRANS: Link description in user account settings menu.
-#: lib/accountsettingsaction.php:141
-msgid "Other"
-msgstr "Other"
-
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
 #: lib/action.php:161
 #, php-format
@@ -7092,206 +7239,128 @@ msgctxt "TOOLTIP"
 msgid "Show more"
 msgstr ""
 
-#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:544
-msgid "Primary site navigation"
-msgstr "Primary site navigation"
+#. TRANS: Inline reply form submit button: submits a reply comment.
+#: lib/action.php:328
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Comment"
+msgstr "Content"
 
-#. TRANS: Tooltip for main menu option "Personal".
-#: lib/action.php:550
-msgctxt "TOOLTIP"
-msgid "Personal profile and friends timeline"
-msgstr "Personal profile and friends timeline"
+#. TRANS: Placeholder text for inline reply form. Clicking in this box will turn it into a mini notice form.
+#: lib/action.php:331
+msgid "Add a comment..."
+msgstr ""
 
-#. TRANS: Main menu option when logged in for access to personal profile and friends timeline.
-#. TRANS: Personal group navigation menu option when logged in for viewing timeline of self and friends.
-#: lib/action.php:553 lib/personalgroupnav.php:100
-msgctxt "MENU"
-msgid "Personal"
-msgstr "Personal"
+#: lib/action.php:559 lib/personalgroupnav.php:99
+#, fuzzy
+msgid "Home"
+msgstr "Homepage"
 
-#. TRANS: Tooltip for main menu option "Account".
-#: lib/action.php:555
-msgctxt "TOOLTIP"
-msgid "Change your email, avatar, password, profile"
-msgstr "Change your email, avatar, password, profile"
-
-#. TRANS: Main menu option when logged in for access to user settings.
-#: lib/action.php:558
-msgid "Account"
-msgstr "Account"
-
-#. TRANS: Tooltip for main menu option "Services".
 #: lib/action.php:560
-msgctxt "TOOLTIP"
-msgid "Connect to services"
-msgstr "Connect to services"
+#, fuzzy
+msgid "Friends timeline"
+msgstr "%s timeline"
 
-#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services.
-#: lib/action.php:563
-msgid "Connect"
-msgstr "Connect"
-
-#. TRANS: Tooltip for menu option "Admin".
 #: lib/action.php:566
-msgctxt "TOOLTIP"
-msgid "Change site configuration"
-msgstr "Change site configuration"
+#, fuzzy
+msgid "Your profile"
+msgstr "Group profile"
 
-#. TRANS: Main menu option when logged in and site admin for access to site configuration.
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/action.php:569 lib/groupnav.php:117
-msgctxt "MENU"
-msgid "Admin"
-msgstr "Admin"
+#: lib/action.php:570 lib/action.php:593 lib/publicgroupnav.php:78
+msgid "Public"
+msgstr "Public"
 
-#. TRANS: Tooltip for main menu option "Invite".
-#: lib/action.php:573
-#, php-format
-msgctxt "TOOLTIP"
-msgid "Invite friends and colleagues to join you on %s"
-msgstr "Invite friends and colleagues to join you on %s"
+#: lib/action.php:571 lib/action.php:594
+#, fuzzy
+msgid "Everyone on this site"
+msgstr "Find people on this site"
+
+#: lib/action.php:575
+#, fuzzy
+msgid "Settings"
+msgstr "SMS settings"
 
-#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users.
 #: lib/action.php:576
-msgctxt "MENU"
-msgid "Invite"
-msgstr "Invite"
+#, fuzzy
+msgid "Change your personal settings"
+msgstr "Change your profile settings"
 
-#. TRANS: Tooltip for main menu option "Logout"
 #: lib/action.php:582
-msgctxt "TOOLTIP"
-msgid "Logout from the site"
-msgstr "Logout from the site"
+#, fuzzy
+msgid "Site configuration"
+msgstr "User configuration"
 
-#. TRANS: Main menu option when logged in to log out the current user.
-#: lib/action.php:585
-msgctxt "MENU"
+#: lib/action.php:587
+#, fuzzy
 msgid "Logout"
 msgstr "Logout"
 
-#. TRANS: Tooltip for main menu option "Register".
-#: lib/action.php:590
-msgctxt "TOOLTIP"
-msgid "Create an account"
-msgstr "Create an account"
+#: lib/action.php:588
+#, fuzzy
+msgid "Logout from the site"
+msgstr "Logout from the site"
 
-#. TRANS: Main menu option when not logged in to register a new account.
-#. TRANS: Menu item for registering with the StatusNet site.
-#: lib/action.php:593 lib/logingroupnav.php:85
-msgctxt "MENU"
-msgid "Register"
-msgstr "Register"
-
-#. TRANS: Tooltip for main menu option "Login".
-#: lib/action.php:596
-msgctxt "TOOLTIP"
+#: lib/action.php:599
+#, fuzzy
 msgid "Login to the site"
 msgstr "Login to the site"
 
-#. TRANS: Main menu option when not logged in to log in.
-#. TRANS: Menu item for logging in to the StatusNet site.
-#: lib/action.php:599 lib/logingroupnav.php:77
-msgctxt "MENU"
-msgid "Login"
-msgstr "Login"
-
-#. TRANS: Tooltip for main menu option "Help".
-#: lib/action.php:602
-msgctxt "TOOLTIP"
-msgid "Help me!"
-msgstr "Help me!"
-
-#. TRANS: Main menu option for help on the StatusNet site.
-#: lib/action.php:605
-msgctxt "MENU"
-msgid "Help"
-msgstr "Help"
-
-#. TRANS: Tooltip for main menu option "Search".
-#: lib/action.php:608
-msgctxt "TOOLTIP"
-msgid "Search for people or text"
-msgstr "Search for people or text"
-
-#. TRANS: Main menu option when logged in or when the StatusNet instance is not private.
-#: lib/action.php:611
-msgctxt "MENU"
+#: lib/action.php:606
+#, fuzzy
 msgid "Search"
 msgstr "Search"
 
-#. TRANS: DT element for site notice. String is hidden in default CSS.
-#. TRANS: Menu item for site administration
-#: lib/action.php:633 lib/adminpanelaction.php:387
-msgid "Site notice"
-msgstr "Site notice"
-
-#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:700
-msgid "Local views"
-msgstr "Local views"
-
-#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:770
-msgid "Page notice"
-msgstr "Page notice"
-
-#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:874
-msgid "Secondary site navigation"
-msgstr "Secondary site navigation"
+#: lib/action.php:607
+#, fuzzy
+msgid "Search the site"
+msgstr "Search site"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:880
+#: lib/action.php:864
 msgid "Help"
 msgstr "Help"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:883
+#: lib/action.php:867
 msgid "About"
 msgstr "About"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:886
+#: lib/action.php:870
 msgid "FAQ"
 msgstr "F.A.Q."
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:891
+#: lib/action.php:875
 msgid "TOS"
 msgstr ""
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:895
+#: lib/action.php:879
 msgid "Privacy"
 msgstr "Privacy"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:898
+#: lib/action.php:882
 msgid "Source"
 msgstr "Source"
 
 #. TRANS: Secondary navigation menu option leading to e-mail contact information on the
 #. TRANS: StatusNet site, where to report bugs, ...
-#: lib/action.php:905
+#: lib/action.php:889
 msgid "Contact"
 msgstr "Contact"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:908
+#: lib/action.php:892
 msgid "Badge"
 msgstr "Badge"
 
-#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:937
-msgid "StatusNet software license"
-msgstr "StatusNet software licence"
-
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:944
+#: lib/action.php:921
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7301,7 +7370,7 @@ msgstr ""
 "broughtby%%](%%site.broughtbyurl%%)."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:947
+#: lib/action.php:924
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** is a microblogging service."
@@ -7310,7 +7379,7 @@ msgstr "**%%site.name%%** is a microblogging service."
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:954
+#: lib/action.php:931
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7321,51 +7390,41 @@ msgstr ""
 "s, available under the [GNU Affero General Public Licence](http://www.fsf."
 "org/licensing/licenses/agpl-3.0.html)."
 
-#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:970
-msgid "Site content license"
-msgstr "Site content licence"
-
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:977
+#: lib/action.php:949
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:984
+#: lib/action.php:956
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:988
+#: lib/action.php:960
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:1020
+#: lib/action.php:992
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr "All %1$s content and data are available under the %2$s licence."
 
-#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1356
-msgid "Pagination"
-msgstr "Pagination"
-
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1367
+#: lib/action.php:1335
 msgid "After"
 msgstr "After"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1377
+#: lib/action.php:1345
 msgid "Before"
 msgstr "Before"
 
@@ -7519,7 +7578,7 @@ msgid "User configuration"
 msgstr "User configuration"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:122
+#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:110
 msgid "User"
 msgstr "User"
 
@@ -7543,6 +7602,11 @@ msgstr "Sessions configuration"
 msgid "Edit site notice"
 msgstr "Edit site notice"
 
+#. TRANS: Menu item for site administration
+#: lib/adminpanelaction.php:387
+msgid "Site notice"
+msgstr "Site notice"
+
 #. TRANS: Menu item title/tooltip
 #: lib/adminpanelaction.php:393
 msgid "Snapshots configuration"
@@ -7553,6 +7617,12 @@ msgstr "Snapshots configuration"
 msgid "Set site license"
 msgstr ""
 
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:409
+#, fuzzy
+msgid "Plugins configuration"
+msgstr "Paths configuration"
+
 #. TRANS: Client error 401.
 #: lib/apiauth.php:111
 msgid "API resource requires read-write access, but you only have read access."
@@ -7563,19 +7633,23 @@ msgstr ""
 msgid "No application for that consumer key."
 msgstr ""
 
+#: lib/apiauth.php:202 lib/apiauth.php:284
+msgid "Not allowed to use API."
+msgstr ""
+
 #. TRANS: OAuth exception given when an incorrect access token was given for a user.
-#: lib/apiauth.php:219
+#: lib/apiauth.php:225
 msgid "Bad access token."
 msgstr ""
 
 #. TRANS: OAuth exception given when no user was found for a given token (no token was found).
-#: lib/apiauth.php:224
+#: lib/apiauth.php:230
 msgid "No user for that token."
 msgstr ""
 
 #. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel".
 #. TRANS: Client error thrown when authentication fails.
-#: lib/apiauth.php:266 lib/apiauth.php:293
+#: lib/apiauth.php:272 lib/apiauth.php:302
 msgid "Could not authenticate you."
 msgstr ""
 
@@ -7622,6 +7696,11 @@ msgstr ""
 msgid "Failed to delete revoked token."
 msgstr ""
 
+#. TRANS: Form input field label for application icon.
+#: lib/applicationeditform.php:177
+msgid "Icon"
+msgstr ""
+
 #. TRANS: Form guide.
 #: lib/applicationeditform.php:182
 msgid "Icon for this application"
@@ -7656,6 +7735,11 @@ msgstr "Source URL"
 msgid "Organization responsible for this application"
 msgstr "Organisation responsible for this application"
 
+#. TRANS: Form input field label.
+#: lib/applicationeditform.php:227
+msgid "Organization"
+msgstr "Organization"
+
 #. TRANS: Form input field instructions.
 #: lib/applicationeditform.php:234
 msgid "URL for the homepage of the organization"
@@ -7744,16 +7828,6 @@ msgstr ""
 msgid "Do not use this method!"
 msgstr "Do not delete this group"
 
-#. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:293
-msgid "Author"
-msgstr "Author"
-
-#. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:307
-msgid "Provider"
-msgstr "Provider"
-
 #. TRANS: Title.
 #: lib/attachmentnoticesection.php:67
 msgid "Notices where this attachment appears"
@@ -7779,23 +7853,28 @@ msgstr "Password changing is not allowed."
 msgid "Block"
 msgstr "Block"
 
+#. TRANS: Description of the form to block a user.
+#: lib/blockform.php:79
+msgid "Block this user"
+msgstr "Block this user"
+
 #. TRANS: Title for command results.
-#: lib/channel.php:160 lib/channel.php:181
+#: lib/channel.php:104 lib/channel.php:125
 msgid "Command results"
 msgstr "Command results"
 
 #. TRANS: Title for command results.
-#: lib/channel.php:194
+#: lib/channel.php:138
 msgid "AJAX error"
 msgstr "AJAX error"
 
 #. TRANS: E-mail subject when a command has completed.
-#: lib/channel.php:233 lib/mailhandler.php:143
+#: lib/channel.php:177 lib/mailhandler.php:143
 msgid "Command complete"
 msgstr "Command complete"
 
 #. TRANS: E-mail subject when a command has failed.
-#: lib/channel.php:244
+#: lib/channel.php:188
 msgid "Command failed"
 msgstr "Command failed"
 
@@ -7895,7 +7974,7 @@ msgstr "Fullname: %s"
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a location.
-#: lib/command.php:446 lib/mail.php:270
+#: lib/command.php:446 lib/mail.php:275
 #, php-format
 msgid "Location: %s"
 msgstr "Location: %s"
@@ -7903,7 +7982,7 @@ msgstr "Location: %s"
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a homepage.
-#: lib/command.php:450 lib/mail.php:274
+#: lib/command.php:450 lib/mail.php:279
 #, php-format
 msgid "Homepage: %s"
 msgstr "Homepage: %s"
@@ -8171,111 +8250,104 @@ msgstr ""
 "tracking - not yet implemented.\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:162
+#: lib/common.php:36
 #, fuzzy
 msgid "No configuration file found."
 msgstr "No configuration file found. "
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:165
+#: lib/common.php:39
 #, fuzzy
 msgid "I looked for configuration files in the following places:"
 msgstr "Invitation(s) sent to the following people:"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:168
+#: lib/common.php:42
 msgid "You may wish to run the installer to fix this."
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:172
+#: lib/common.php:46
 msgid "Go to the installer."
 msgstr "Go to the installer."
 
-#. TRANS: Menu item for Instant Messaging settings.
-#: lib/connectsettingsaction.php:106
-msgctxt "MENU"
-msgid "IM"
-msgstr "IM"
-
-#. TRANS: Tooltip for Instant Messaging menu item.
-#: lib/connectsettingsaction.php:108
-msgid "Updates by instant messenger (IM)"
-msgstr "Updates by instant messenger (IM)"
-
-#. TRANS: Menu item for Short Message Service settings.
-#: lib/connectsettingsaction.php:113
-msgctxt "MENU"
-msgid "SMS"
-msgstr "SMS"
-
-#. TRANS: Tooltip for Short Message Service menu item.
-#: lib/connectsettingsaction.php:115
-msgid "Updates by SMS"
-msgstr "Updates by SMS"
-
-#. TRANS: Menu item for OuAth connection settings.
-#: lib/connectsettingsaction.php:120
-msgctxt "MENU"
-msgid "Connections"
-msgstr "Connections"
-
-#. TRANS: Tooltip for connected applications (Connections through OAuth) menu item.
-#: lib/connectsettingsaction.php:122
-msgid "Authorized connected applications"
-msgstr "Authorised connected applications"
-
 #: lib/dberroraction.php:59
 msgid "Database error"
 msgstr ""
 
+#. TRANS: Description of form for deleting a user.
+#: lib/deleteuserform.php:75
+msgid "Delete this user"
+msgstr "Delete this user"
+
+#: lib/designform.php:114
+#, fuzzy
+msgid "Change design"
+msgstr "Save design"
+
+#. TRANS: Fieldset legend on profile design page to change profile page colours.
+#: lib/designform.php:131
+msgid "Change colours"
+msgstr "Change colours"
+
+#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
+#: lib/designform.php:138
+msgid "Use defaults"
+msgstr "Use defaults"
+
+#. TRANS: Title for button on profile design page to reset all colour settings to default.
+#: lib/designform.php:140
+msgid "Restore default designs"
+msgstr "Restore default designs"
+
+#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
+#: lib/designform.php:148
+msgid "Reset back to default"
+msgstr "Reset back to default"
+
 #. TRANS: Label in form on profile design page.
 #. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
-#: lib/designsettings.php:108
+#: lib/designform.php:158
 msgid "Upload file"
 msgstr "Upload file"
 
 #. TRANS: Instructions for form on profile design page.
-#: lib/designsettings.php:113
+#: lib/designform.php:163
+#, fuzzy
 msgid ""
-"You can upload your personal background image. The maximum file size is 2MB."
+"You can upload your personal background image. The maximum file size is 2Mb."
 msgstr ""
 "You can upload your personal background image. The maximum file size is 2MB."
 
 #. TRANS: Radio button on profile design page that will enable use of the uploaded profile image.
-#: lib/designsettings.php:139
+#: lib/designform.php:194
 #, fuzzy
 msgctxt "RADIO"
 msgid "On"
 msgstr "On"
 
 #. TRANS: Radio button on profile design page that will disable use of the uploaded profile image.
-#: lib/designsettings.php:156
+#: lib/designform.php:211
 #, fuzzy
 msgctxt "RADIO"
 msgid "Off"
 msgstr "Off"
 
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: lib/designsettings.php:175
-msgid "Change colours"
-msgstr "Change colours"
-
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: lib/designsettings.php:257
-msgid "Use defaults"
-msgstr "Use defaults"
+#. TRANS: Title for button on profile design page to save settings.
+#: lib/designform.php:322
+msgid "Save design"
+msgstr "Save design"
 
 #. TRANS: Error message displayed if design settings could not be saved.
 #. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
-#: lib/designsettings.php:405 lib/designsettings.php:427
+#: lib/designsettings.php:216 lib/designsettings.php:238
 msgid "Couldn't update your design."
 msgstr "Couldn't update your design."
 
 #. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
-#: lib/designsettings.php:433
+#: lib/designsettings.php:244
 msgid "Design defaults restored."
 msgstr "Design defaults restored."
 
@@ -8345,27 +8417,23 @@ msgstr ""
 msgid "Feeds"
 msgstr ""
 
-#: lib/galleryaction.php:121
-msgid "Filter tags"
-msgstr "Filter tags"
-
-#: lib/galleryaction.php:131
+#: lib/galleryaction.php:128
 msgid "All"
 msgstr "All"
 
-#: lib/galleryaction.php:139
+#: lib/galleryaction.php:136
 msgid "Select tag to filter"
 msgstr "Select tag to filter"
 
-#: lib/galleryaction.php:140
+#: lib/galleryaction.php:137
 msgid "Tag"
 msgstr "Tag"
 
-#: lib/galleryaction.php:141
+#: lib/galleryaction.php:138
 msgid "Choose a tag to narrow list"
 msgstr "Choose a tag to narrow list"
 
-#: lib/galleryaction.php:143
+#: lib/galleryaction.php:140
 msgid "Go"
 msgstr "Go"
 
@@ -8454,6 +8522,12 @@ msgctxt "TOOLTIP"
 msgid "%s blocked users"
 msgstr ""
 
+#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
+#: lib/groupnav.php:117
+msgctxt "MENU"
+msgid "Admin"
+msgstr "Admin"
+
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
 #: lib/groupnav.php:120
@@ -8563,39 +8637,61 @@ msgid_plural "%dB"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/jabber.php:387
+#: lib/implugin.php:262
 #, php-format
-msgid "[%s]"
+msgid ""
+"User \"%s\" on %s has said that your %s screenname belongs to them. If "
+"that's true, you can confirm by clicking on this URL: %s . (If you cannot "
+"click it, copy-and-paste it into the address bar of your browser). If that "
+"user isn't you, or if you didn't request this confirmation, just ignore this "
+"message."
 msgstr ""
 
-#: lib/jabber.php:567
+#: lib/implugin.php:349
 #, php-format
 msgid "Unknown inbox source %d."
 msgstr ""
 
+#: lib/implugin.php:485
+#, fuzzy, php-format
+msgid "Message too long - maximum is %1$d characters, you sent %2$d."
+msgstr "Message too long - maximum is %1$d characters, you sent %2$d."
+
 #: lib/leaveform.php:114
 msgid "Leave"
 msgstr "Leave"
 
+#. TRANS: Menu item for logging in to the StatusNet site.
+#: lib/logingroupnav.php:77
+msgctxt "MENU"
+msgid "Login"
+msgstr "Login"
+
 #. TRANS: Title for menu item for logging in to the StatusNet site.
 #: lib/logingroupnav.php:79
 msgid "Login with a username and password"
 msgstr "Login with a username and password"
 
+#. TRANS: Menu item for registering with the StatusNet site.
+#: lib/logingroupnav.php:85
+msgctxt "MENU"
+msgid "Register"
+msgstr "Register"
+
 #. TRANS: Title for menu item for registering with the StatusNet site.
 #: lib/logingroupnav.php:87
 msgid "Sign up for a new account"
 msgstr "Sign up for a new account"
 
 #. TRANS: Subject for address confirmation email.
-#: lib/mail.php:168
+#: lib/mail.php:172
 msgid "Email address confirmation"
 msgstr "E-mail address confirmation"
 
 #. TRANS: Body for address confirmation email.
 #. TRANS: %1$s is the addressed user's nickname, %2$s is the StatusNet sitename,
 #. TRANS: %3$s is the URL to confirm at.
-#: lib/mail.php:173
+#: lib/mail.php:177
 #, php-format
 msgid ""
 "Hey, %1$s.\n"
@@ -8614,14 +8710,14 @@ msgstr ""
 
 #. TRANS: Subject of new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
-#: lib/mail.php:238
+#: lib/mail.php:243
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1$s is now listening to your notices on %2$s."
 
 #. TRANS: This is a paragraph in a new-subscriber e-mail.
 #. TRANS: %s is a URL where the subscriber can be reported as abusive.
-#: lib/mail.php:245
+#: lib/mail.php:250
 #, php-format
 msgid ""
 "If you believe this account is being used abusively, you can block them from "
@@ -8633,7 +8729,7 @@ msgstr ""
 #. TRANS: %3$s is the subscriber's profile URL, %4$s is the subscriber's location (or empty)
 #. TRANS: %5$s is the subscriber's homepage URL (or empty), %6%s is the subscriber's bio (or empty)
 #. TRANS: %7$s is a link to the addressed user's e-mail settings.
-#: lib/mail.php:255
+#: lib/mail.php:260
 #, fuzzy, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -8660,14 +8756,14 @@ msgstr ""
 
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is biographical information.
-#: lib/mail.php:278
+#: lib/mail.php:283
 #, php-format
 msgid "Bio: %s"
 msgstr "Bio: %s"
 
 #. TRANS: Subject of notification mail for new posting email address.
 #. TRANS: %s is the StatusNet sitename.
-#: lib/mail.php:307
+#: lib/mail.php:312
 #, php-format
 msgid "New email address for posting to %s"
 msgstr "New e-mail address for posting to %s"
@@ -8675,7 +8771,7 @@ msgstr "New e-mail address for posting to %s"
 #. TRANS: Body of notification mail for new posting email address.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is the e-mail address to send
 #. TRANS: to to post by e-mail, %3$s is a URL to more instructions.
-#: lib/mail.php:313
+#: lib/mail.php:318
 #, fuzzy, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -8698,26 +8794,26 @@ msgstr ""
 
 #. TRANS: Subject line for SMS-by-email notification messages.
 #. TRANS: %s is the posting user's nickname.
-#: lib/mail.php:434
+#: lib/mail.php:439
 #, php-format
 msgid "%s status"
 msgstr "%s status"
 
 #. TRANS: Subject line for SMS-by-email address confirmation message.
-#: lib/mail.php:460
+#: lib/mail.php:465
 msgid "SMS confirmation"
 msgstr "SMS confirmation"
 
 #. TRANS: Main body heading for SMS-by-email address confirmation message.
 #. TRANS: %s is the addressed user's nickname.
-#: lib/mail.php:464
+#: lib/mail.php:469
 #, php-format
 msgid "%s: confirm you own this phone number with this code:"
 msgstr "%s: confirm you own this phone number with this code:"
 
 #. TRANS: Subject for 'nudge' notification email.
 #. TRANS: %s is the nudging user.
-#: lib/mail.php:485
+#: lib/mail.php:490
 #, fuzzy, php-format
 msgid "You have been nudged by %s"
 msgstr "You've been nudged by %s"
@@ -8725,7 +8821,7 @@ msgstr "You've been nudged by %s"
 #. TRANS: Body for 'nudge' notification email.
 #. TRANS: %1$s is the nuding user's long name, $2$s is the nudging user's nickname,
 #. TRANS: %3$s is a URL to post notices at, %4$s is the StatusNet sitename.
-#: lib/mail.php:492
+#: lib/mail.php:497
 #, php-format
 msgid ""
 "%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -8743,7 +8839,7 @@ msgstr ""
 
 #. TRANS: Subject for direct-message notification email.
 #. TRANS: %s is the sending user's nickname.
-#: lib/mail.php:539
+#: lib/mail.php:544
 #, php-format
 msgid "New private message from %s"
 msgstr "New private message from %s"
@@ -8752,7 +8848,7 @@ msgstr "New private message from %s"
 #. TRANS: %1$s is the sending user's long name, %2$s is the sending user's nickname,
 #. TRANS: %3$s is the message content, %4$s a URL to the message,
 #. TRANS: %5$s is the StatusNet sitename.
-#: lib/mail.php:547
+#: lib/mail.php:552
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -8773,7 +8869,7 @@ msgstr ""
 
 #. TRANS: Subject for favorite notification e-mail.
 #. TRANS: %1$s is the adding user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:599
+#: lib/mail.php:604
 #, fuzzy, php-format
 msgid "%1$s (@%2$s) added your notice as a favorite"
 msgstr "%s (@%s) added your notice as a favorite"
@@ -8783,7 +8879,7 @@ msgstr "%s (@%s) added your notice as a favorite"
 #. TRANS: %3$s is a URL to the faved notice, %4$s is the faved notice text,
 #. TRANS: %5$s is a URL to all faves of the adding user, %6$s is the StatusNet sitename,
 #. TRANS: %7$s is the adding user's nickname.
-#: lib/mail.php:606
+#: lib/mail.php:611
 #, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -8805,7 +8901,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:664
+#: lib/mail.php:669
 #, php-format
 msgid ""
 "The full conversation can be read here:\n"
@@ -8815,7 +8911,7 @@ msgstr ""
 
 #. TRANS: E-mail subject for notice notification.
 #. TRANS: %1$s is the sending user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:672
+#: lib/mail.php:677
 #, fuzzy, php-format
 msgid "%1$s (@%2$s) sent a notice to your attention"
 msgstr "%s (@%s) sent a notice to your attention"
@@ -8826,7 +8922,7 @@ msgstr "%s (@%s) sent a notice to your attention"
 #. TRANS: %5$s is a URL to the full conversion if it exists (otherwise empty),
 #. TRANS: %6$s is a URL to reply to the notice, %7$s is a URL to all @-replied for the addressed user,
 #. TRANS: %8$s is a URL to the addressed user's e-mail settings, %9$s is the sender's nickname.
-#: lib/mail.php:680
+#: lib/mail.php:685
 #, php-format
 msgid ""
 "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -8943,11 +9039,7 @@ msgstr "Not subscribed!"
 msgid "To"
 msgstr "To"
 
-#: lib/messageform.php:166 lib/noticeform.php:186
-msgid "Available characters"
-msgstr "Available characters"
-
-#: lib/messageform.php:185 lib/noticeform.php:237
+#: lib/messageform.php:184 lib/noticeform.php:236
 msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr "Send"
@@ -8957,15 +9049,10 @@ msgstr "Send"
 msgid "Messages"
 msgstr "Message"
 
-#: lib/messagelistitem.php:123 lib/noticelist.php:522
+#: lib/messagelistitem.php:123 lib/noticelist.php:527
 msgid "from"
 msgstr "from"
 
-#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:165
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr "Nickname must have only lowercase letters and numbers, and no spaces."
-
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 #: lib/nickname.php:178
 msgid "Nickname cannot be empty."
@@ -8988,78 +9075,82 @@ msgstr "Send a notice"
 msgid "What's up, %s?"
 msgstr "What's up, %s?"
 
-#: lib/noticeform.php:194
+#: lib/noticeform.php:193
 msgid "Attach"
 msgstr ""
 
-#: lib/noticeform.php:198
+#: lib/noticeform.php:197
 msgid "Attach a file"
 msgstr ""
 
-#: lib/noticeform.php:213
+#: lib/noticeform.php:212
 msgid "Share my location"
 msgstr "Share my location"
 
-#: lib/noticeform.php:216
+#: lib/noticeform.php:215
 msgid "Do not share my location"
 msgstr "Do not share my location"
 
-#: lib/noticeform.php:217
+#: lib/noticeform.php:216
 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
 "try again later"
 msgstr ""
 
 #. TRANS: Used in coordinates as abbreviation of north
-#: lib/noticelist.php:452
+#: lib/noticelist.php:457
 msgid "N"
 msgstr "N"
 
 #. TRANS: Used in coordinates as abbreviation of south
-#: lib/noticelist.php:454
+#: lib/noticelist.php:459
 msgid "S"
 msgstr ""
 
 #. TRANS: Used in coordinates as abbreviation of east
-#: lib/noticelist.php:456
+#: lib/noticelist.php:461
 msgid "E"
 msgstr ""
 
 #. TRANS: Used in coordinates as abbreviation of west
-#: lib/noticelist.php:458
+#: lib/noticelist.php:463
 msgid "W"
 msgstr ""
 
-#: lib/noticelist.php:460
+#: lib/noticelist.php:465
 #, php-format
 msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgstr ""
 
-#: lib/noticelist.php:469
+#: lib/noticelist.php:474
 msgid "at"
 msgstr ""
 
-#: lib/noticelist.php:518
+#: lib/noticelist.php:523
 msgid "web"
 msgstr ""
 
-#: lib/noticelist.php:584
+#: lib/noticelist.php:589
 msgid "in context"
 msgstr "in context"
 
-#: lib/noticelist.php:619
+#: lib/noticelist.php:624
 msgid "Repeated by"
 msgstr "Repeated by"
 
-#: lib/noticelist.php:646
+#: lib/noticelist.php:651
 msgid "Reply to this notice"
 msgstr "Reply to this notice"
 
-#: lib/noticelist.php:647
+#: lib/noticelist.php:652
 msgid "Reply"
 msgstr "Reply"
 
-#: lib/noticelist.php:691
+#: lib/noticelist.php:678
+msgid "Delete this notice"
+msgstr "Delete this notice"
+
+#: lib/noticelist.php:696
 msgid "Notice repeated"
 msgstr "Notice repeated"
 
@@ -9096,48 +9187,31 @@ msgstr ""
 msgid "Couldn't insert new subscription."
 msgstr "Couldn't insert new subscription."
 
-#. TRANS: Personal group navigation menu option when logged in for viewing @-replies.
-#: lib/personalgroupnav.php:107
+#: lib/personalgroupnav.php:104
 #, fuzzy
-msgctxt "MENU"
 msgid "Replies"
 msgstr "Replies"
 
-#. TRANS: Personal group navigation menu option when logged in for seeing own profile.
-#: lib/personalgroupnav.php:114
+#: lib/personalgroupnav.php:109
 #, fuzzy
-msgctxt "MENU"
-msgid "Profile"
-msgstr "Profile"
-
-#. TRANS: Personal group navigation menu option when logged in for viewing own favourited notices.
-#: lib/personalgroupnav.php:120
-#, fuzzy
-msgctxt "MENU"
 msgid "Favorites"
 msgstr "Favourites"
 
-#. TRANS: Personal group navigation menu option when logged in for viewing recieved personal messages.
-#: lib/personalgroupnav.php:133
+#: lib/personalgroupnav.php:120
 #, fuzzy
-msgctxt "MENU"
 msgid "Inbox"
 msgstr "Inbox"
 
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing recieved personal messages.
-#: lib/personalgroupnav.php:135
+#: lib/personalgroupnav.php:121
 msgid "Your incoming messages"
 msgstr "Your incoming messages"
 
-#. TRANS: Personal group navigation menu option when logged in for viewing senet personal messages.
-#: lib/personalgroupnav.php:140
+#: lib/personalgroupnav.php:125
 #, fuzzy
-msgctxt "MENU"
 msgid "Outbox"
 msgstr "Outbox"
 
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing senet personal messages.
-#: lib/personalgroupnav.php:142
+#: lib/personalgroupnav.php:126
 msgid "Your sent messages"
 msgstr "Your sent messages"
 
@@ -9152,9 +9226,26 @@ msgstr "Tags in %s's notices"
 msgid "Unknown"
 msgstr "Unknown"
 
+#. TRANS: Plugin admin panel controls
+#: lib/plugindisableform.php:90
+msgctxt "plugin"
+msgid "Disable"
+msgstr ""
+
+#. TRANS: Plugin admin panel controls
+#: lib/pluginenableform.php:112
+msgctxt "plugin"
+msgid "Enable"
+msgstr ""
+
+#: lib/pluginlist.php:196
+msgctxt "plugin-description"
+msgid "(Plugin descriptions unavailable when disabled.)"
+msgstr ""
+
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:82
+#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:88
 msgid "Subscriptions"
 msgstr "Subscriptions"
 
@@ -9165,7 +9256,7 @@ msgstr "All subscriptions"
 
 #. TRANS: H2 text for user subscriber statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:90
+#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:96
 msgid "Subscribers"
 msgstr "Subscribers"
 
@@ -9187,7 +9278,7 @@ msgstr "Member since"
 #. TRANS: Label for user statistics.
 #. TRANS: H2 text for user group membership statistics.
 #: lib/profileaction.php:239 lib/profileaction.php:290
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:104
 msgid "Groups"
 msgstr "Groups"
 
@@ -9207,10 +9298,6 @@ msgstr "All groups"
 msgid "Unimplemented method."
 msgstr ""
 
-#: lib/publicgroupnav.php:78
-msgid "Public"
-msgstr "Public"
-
 #: lib/publicgroupnav.php:82
 msgid "User groups"
 msgstr "User groups"
@@ -9249,7 +9336,7 @@ msgid "Revoke the \"%s\" role from this user"
 msgstr "Revoke the \"%s\" role from this user"
 
 #. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:974
+#: lib/router.php:1001
 #, fuzzy
 msgid "Page not found."
 msgstr "API method not found."
@@ -9279,11 +9366,6 @@ msgctxt "BUTTON"
 msgid "Search"
 msgstr ""
 
-#. TRANS: Definition list item with instructions on how to get (better) search results.
-#: lib/searchaction.php:170
-msgid "Search help"
-msgstr "Search help"
-
 #: lib/searchgroupnav.php:80
 msgid "People"
 msgstr "People"
@@ -9308,6 +9390,51 @@ msgstr "Untitled section"
 msgid "More..."
 msgstr ""
 
+#: lib/settingsnav.php:78
+msgid "Change your profile settings"
+msgstr "Change your profile settings"
+
+#: lib/settingsnav.php:83
+msgid "Upload an avatar"
+msgstr "Upload an avatar"
+
+#: lib/settingsnav.php:88
+msgid "Change your password"
+msgstr "Change your password"
+
+#: lib/settingsnav.php:93
+msgid "Change email handling"
+msgstr "Change e-mail handling"
+
+#: lib/settingsnav.php:98
+msgid "Design your profile"
+msgstr "Design your profile"
+
+#: lib/settingsnav.php:102
+msgid "URL"
+msgstr "URL"
+
+#: lib/settingsnav.php:103
+msgid "URL shorteners"
+msgstr ""
+
+#: lib/settingsnav.php:111
+msgid "Updates by instant messenger (IM)"
+msgstr "Updates by instant messenger (IM)"
+
+#: lib/settingsnav.php:118
+msgid "Updates by SMS"
+msgstr "Updates by SMS"
+
+#: lib/settingsnav.php:123
+#, fuzzy
+msgid "Connections"
+msgstr "Connections"
+
+#: lib/settingsnav.php:124
+msgid "Authorized connected applications"
+msgstr "Authorised connected applications"
+
 #: lib/silenceform.php:67
 msgid "Silence"
 msgstr "Silence"
@@ -9316,30 +9443,34 @@ msgstr "Silence"
 msgid "Silence this user"
 msgstr "Silence this user"
 
-#: lib/subgroupnav.php:83
+#: lib/subgroupnav.php:89
 #, php-format
 msgid "People %s subscribes to"
 msgstr "People %s subscribes to"
 
-#: lib/subgroupnav.php:91
+#: lib/subgroupnav.php:97
 #, php-format
 msgid "People subscribed to %s"
 msgstr "People subscribed to %s"
 
-#: lib/subgroupnav.php:99
+#: lib/subgroupnav.php:105
 #, php-format
 msgid "Groups %s is a member of"
 msgstr "Groups %s is a member of"
 
-#: lib/subgroupnav.php:105
+#: lib/subgroupnav.php:111
 msgid "Invite"
 msgstr "Invite"
 
-#: lib/subgroupnav.php:106
+#: lib/subgroupnav.php:112
 #, php-format
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Invite friends and colleagues to join you on %s"
 
+#: lib/subscribeform.php:115 lib/subscribeform.php:139
+msgid "Subscribe to this user"
+msgstr "Subscribe to this user"
+
 #: lib/subscriberspeopleselftagcloudsection.php:48
 #: lib/subscriptionspeopleselftagcloudsection.php:48
 msgid "People Tagcloud as self-tagged"
@@ -9409,6 +9540,13 @@ msgstr ""
 msgid "Error opening theme archive."
 msgstr "Error opening theme archive."
 
+#: lib/threadednoticelist.php:270
+#, php-format
+msgid "Show all %d comment"
+msgid_plural "Show all %d comments"
+msgstr[0] ""
+msgstr[1] ""
+
 #: lib/topposterssection.php:74
 msgid "Top posters"
 msgstr "Top posters"
@@ -9451,76 +9589,80 @@ msgstr "Unsubscribe"
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "User %1$s (%2$d) has no profile record."
 
-#. TRANS: Link text for changeing the avatar of the logged in user.
-#: lib/userprofile.php:121
+#: lib/userprofile.php:116
 msgid "Edit Avatar"
 msgstr "Edit Avatar"
 
 #. TRANS: H2 for user actions in a profile.
 #. TRANS: H2 for entity actions in a profile.
-#: lib/userprofile.php:245 lib/userprofile.php:261
+#: lib/userprofile.php:216 lib/userprofile.php:232
 msgid "User actions"
 msgstr "User actions"
 
 #. TRANS: Text shown in user profile of not yet compeltely deleted users.
-#: lib/userprofile.php:249
+#: lib/userprofile.php:220
 msgid "User deletion in progress..."
 msgstr ""
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:277
+#: lib/userprofile.php:248
 msgid "Edit profile settings"
 msgstr "Edit profile settings"
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:279
+#: lib/userprofile.php:250
 msgid "Edit"
 msgstr "Edit"
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:303
+#: lib/userprofile.php:274
 msgid "Send a direct message to this user"
 msgstr "Send a direct message to this user"
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:305
+#: lib/userprofile.php:276
 msgid "Message"
 msgstr "Message"
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:347
+#: lib/userprofile.php:318
 msgid "Moderate"
 msgstr "Moderate"
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:386
+#: lib/userprofile.php:357
 msgid "User role"
 msgstr "User role"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:389
+#: lib/userprofile.php:360
 msgctxt "role"
 msgid "Administrator"
 msgstr "Administrator"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:391
+#: lib/userprofile.php:362
 msgctxt "role"
 msgid "Moderator"
 msgstr "Moderator"
 
+#: lib/util.php:321
+#, fuzzy
+msgid "Not allowed to log in."
+msgstr "Not logged in."
+
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1306
+#: lib/util.php:1337
 msgid "a few seconds ago"
 msgstr "a few seconds ago"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1309
+#: lib/util.php:1340
 msgid "about a minute ago"
 msgstr "about a minute ago"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1313
+#: lib/util.php:1344
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
@@ -9528,12 +9670,12 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1316
+#: lib/util.php:1347
 msgid "about an hour ago"
 msgstr "about an hour ago"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1320
+#: lib/util.php:1351
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
@@ -9541,12 +9683,12 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1323
+#: lib/util.php:1354
 msgid "about a day ago"
 msgstr "about a day ago"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1327
+#: lib/util.php:1358
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
@@ -9554,12 +9696,12 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1330
+#: lib/util.php:1361
 msgid "about a month ago"
 msgstr "about a month ago"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1334
+#: lib/util.php:1365
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
@@ -9567,7 +9709,7 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1337
+#: lib/util.php:1368
 msgid "about a year ago"
 msgstr "about a year ago"
 
@@ -9578,21 +9720,6 @@ msgstr "about a year ago"
 msgid "%s is not a valid color! Use 3 or 6 hex characters."
 msgstr "%s is not a valid colour! Use 3 or 6 hex characters."
 
-#. TRANS: %s is the URL to the StatusNet site's Instant Messaging settings.
-#: lib/xmppmanager.php:287
-#, php-format
-msgid "Unknown user. Go to %s to add your address to your account"
-msgstr ""
-
-#. TRANS: Response to XMPP source when it sent too long a message.
-#. TRANS: %1$d the maximum number of allowed characters (used for plural), %2$d is the sent number.
-#: lib/xmppmanager.php:406
-#, fuzzy, php-format
-msgid "Message too long. Maximum is %1$d character, you sent %2$d."
-msgid_plural "Message too long. Maximum is %1$d characters, you sent %2$d."
-msgstr[0] "Message too long - maximum is %1$d characters, you sent %2$d."
-msgstr[1] "Message too long - maximum is %1$d characters, you sent %2$d."
-
 #. TRANS: Exception.
 #: lib/xrd.php:63
 #, fuzzy
@@ -9611,72 +9738,160 @@ msgid "Getting backup from file '%s'."
 msgstr ""
 
 #, fuzzy
-#~ msgid "Block this user."
-#~ msgstr "Block this user"
+#~ msgid "Could not generate feed for group - %s"
+#~ msgstr "Could not delete group %s."
 
 #, fuzzy
-#~ msgid "Delete this notice."
-#~ msgstr "Delete this notice"
-
-#, fuzzy
-#~ msgid "Delete this user."
-#~ msgstr "Delete this user"
-
-#, fuzzy
-#~ msgid "Restore default designs."
-#~ msgstr "Restore default designs"
-
-#, fuzzy
-#~ msgid "Reset back to default."
-#~ msgstr "Reset back to default"
-
-#, fuzzy
-#~ msgid "Save design."
-#~ msgstr "Save design"
-
-#, fuzzy
-#~ msgid "Disfavor favorite."
-#~ msgstr "Disfavor favourite"
-
-#, fuzzy
-#~ msgid "\"%s\" not found."
-#~ msgstr "API method not found."
-
-#, fuzzy
-#~ msgid "Notice %s not found."
-#~ msgstr "API method not found."
-
-#, fuzzy
-#~ msgid "Attachment %s not found."
-#~ msgstr "Recipient user not found."
-
-#, fuzzy
-#~ msgid "Invalid tag: \"%s\"."
-#~ msgstr "Invalid tag: \"%s\""
-
-#, fuzzy
-#~ msgid "%s updates from everyone."
-#~ msgstr "%s updates from everyone!"
-
-#, fuzzy
-#~ msgid "Password saved"
-#~ msgstr "Password saved."
-
-#, fuzzy
-#~ msgid "Where you are, like \"City, State (or Region), Country\"."
-#~ msgstr "Where you are, like \"City, State (or Region), Country\""
-
-#, fuzzy
-#~ msgid "Subscribe to this user."
-#~ msgstr "Subscribe to this user"
+#~ msgid "Current confirmed Jabber/Google Talk address."
+#~ msgstr "Current confirmed Jabber/GTalk address."
 
 #, fuzzy
 #~ msgid ""
-#~ "Listenee stream license \"%1$s\" is not compatible with site license \"%2"
-#~ "$s\"."
+#~ "Jabber or Google Talk address, like \"UserName@example.org\". First, make "
+#~ "sure to add %s to your buddy list in your IM client or on Google Talk."
 #~ msgstr ""
-#~ "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
+#~ "Jabber or GTalk address, like \"UserName@example.org\". First, make sure "
+#~ "to add %s to your buddy list in your IM client or on GTalk."
 
 #, fuzzy
-#~ msgid "Not allowed to log in."
-#~ msgstr "Not logged in."
+#~ msgid "Send me notices through Jabber/Google Talk."
+#~ msgstr "Send me notices through Jabber/GTalk."
+
+#, fuzzy
+#~ msgid "Publish a MicroID for my Jabber/Google Talk address."
+#~ msgstr "Publish a MicroID for my Jabber/GTalk address."
+
+#~ msgid "No Jabber ID."
+#~ msgstr "No Jabber ID."
+
+#, fuzzy
+#~ msgid "Not a valid Jabber ID."
+#~ msgstr "Not a valid Jabber ID"
+
+#~ msgid "That is already your Jabber ID."
+#~ msgstr "That is already your Jabber ID."
+
+#~ msgid "That is not your Jabber ID."
+#~ msgstr "That is not your Jabber ID."
+
+#~ msgid "Other settings"
+#~ msgstr "Other settings"
+
+#~ msgid "Tag cloud"
+#~ msgstr "Tag cloud"
+
+#~ msgid "Authorize URL"
+#~ msgstr "Authorise URL"
+
+#~ msgid "Jabber"
+#~ msgstr "Jabber"
+
+#~ msgid "Photo"
+#~ msgstr "Photo"
+
+#~ msgid "Other options"
+#~ msgstr "Other options"
+
+#~ msgid "Other"
+#~ msgstr "Other"
+
+#~ msgid "Primary site navigation"
+#~ msgstr "Primary site navigation"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Personal profile and friends timeline"
+#~ msgstr "Personal profile and friends timeline"
+
+#~ msgctxt "MENU"
+#~ msgid "Personal"
+#~ msgstr "Personal"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Change your email, avatar, password, profile"
+#~ msgstr "Change your email, avatar, password, profile"
+
+#~ msgid "Account"
+#~ msgstr "Account"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Connect to services"
+#~ msgstr "Connect to services"
+
+#~ msgid "Connect"
+#~ msgstr "Connect"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Change site configuration"
+#~ msgstr "Change site configuration"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Invite friends and colleagues to join you on %s"
+#~ msgstr "Invite friends and colleagues to join you on %s"
+
+#~ msgctxt "MENU"
+#~ msgid "Invite"
+#~ msgstr "Invite"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Create an account"
+#~ msgstr "Create an account"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Help me!"
+#~ msgstr "Help me!"
+
+#~ msgctxt "MENU"
+#~ msgid "Help"
+#~ msgstr "Help"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Search for people or text"
+#~ msgstr "Search for people or text"
+
+#~ msgid "Local views"
+#~ msgstr "Local views"
+
+#~ msgid "Page notice"
+#~ msgstr "Page notice"
+
+#~ msgid "Secondary site navigation"
+#~ msgstr "Secondary site navigation"
+
+#~ msgid "StatusNet software license"
+#~ msgstr "StatusNet software licence"
+
+#~ msgid "Site content license"
+#~ msgstr "Site content licence"
+
+#~ msgid "Pagination"
+#~ msgstr "Pagination"
+
+#~ msgid "Author"
+#~ msgstr "Author"
+
+#~ msgid "Provider"
+#~ msgstr "Provider"
+
+#~ msgctxt "MENU"
+#~ msgid "SMS"
+#~ msgstr "SMS"
+
+#~ msgid "Filter tags"
+#~ msgstr "Filter tags"
+
+#~ msgid "Available characters"
+#~ msgstr "Available characters"
+
+#, fuzzy
+#~ msgctxt "MENU"
+#~ msgid "Profile"
+#~ msgstr "Profile"
+
+#~ msgid "Search help"
+#~ msgstr "Search help"
+
+#, fuzzy
+#~ msgid "Message too long. Maximum is %1$d character, you sent %2$d."
+#~ msgid_plural "Message too long. Maximum is %1$d characters, you sent %2$d."
+#~ msgstr[0] "Message too long - maximum is %1$d characters, you sent %2$d."
+#~ msgstr[1] "Message too long - maximum is %1$d characters, you sent %2$d."
diff --git a/locale/eo/LC_MESSAGES/statusnet.po b/locale/eo/LC_MESSAGES/statusnet.po
index 6c88da49f1..9042b3116f 100644
--- a/locale/eo/LC_MESSAGES/statusnet.po
+++ b/locale/eo/LC_MESSAGES/statusnet.po
@@ -17,8 +17,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 15:58+0000\n"
-"PO-Revision-Date: 2011-03-03 16:00:23+0000\n"
+"POT-Creation-Date: 2011-03-03 17:23+0000\n"
+"PO-Revision-Date: 2011-03-03 17:25:54+0000\n"
 "Language-Team: Esperanto <http://translatewiki.net/wiki/Portal:eo>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -84,23 +84,23 @@ msgstr "Konservu atingan agordon"
 #. TRANS: Tooltip for button to save access settings in site admin panel.
 #. TRANS: Button text for saving theme settings.
 #. TRANS: Button label to save e-mail preferences.
-#. TRANS: Button label to save Instant Messaging preferences.
-#. TRANS: Button text for saving "Other settings" in profile.
+#. TRANS: Button label to save IM preferences.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
 #. TRANS: Button text for saving site notice in admin panel.
 #. TRANS: Button label to save SMS preferences.
 #. TRANS: Save button for settings for a profile in a subscriptions list.
+#. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
 #. TRANS: Button text on profile design page to save settings.
 #: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
-#: actions/emailsettings.php:250 actions/imsettings.php:183
-#: actions/othersettings.php:136 actions/pathsadminpanel.php:512
-#: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
-#: actions/smssettings.php:205 actions/subscriptions.php:259
+#: actions/emailsettings.php:251 actions/imsettings.php:199
+#: actions/pathsadminpanel.php:512 actions/profilesettings.php:198
+#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:204
+#: actions/subscriptions.php:261 actions/urlsettings.php:152
 #: actions/useradminpanel.php:298 lib/applicationeditform.php:355
-#: lib/designsettings.php:270 lib/groupeditform.php:201
+#: lib/designform.php:320 lib/groupeditform.php:201
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Konservu"
@@ -139,7 +139,11 @@ msgstr "Ne estas tiu paĝo."
 #. 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 use "one time password login" without using an existing user.
+#. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
+#. TRANS: Client error displayed trying to find a user by ID for a non-existing ID.
+#. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when calling a profile action without specifying a user.
 #: actions/all.php:80 actions/allrss.php:69
@@ -151,19 +155,19 @@ msgstr "Ne estas tiu paĝo."
 #: actions/apidirectmessage.php:75 actions/apidirectmessagenew.php:72
 #: actions/apigroupcreate.php:111 actions/apigroupismember.php:89
 #: actions/apigroupjoin.php:98 actions/apigroupleave.php:98
-#: actions/apigrouplist.php:70 actions/apistatusesupdate.php:230
-#: actions/apisubscriptions.php:85 actions/apitimelinefavorites.php:70
-#: actions/apitimelinefriends.php:173 actions/apitimelinehome.php:78
-#: actions/apitimelinementions.php:77 actions/apitimelineuser.php:79
-#: actions/avatarbynickname.php:79 actions/favoritesrss.php:72
-#: actions/foaf.php:42 actions/foaf.php:61 actions/hcard.php:67
-#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
-#: actions/remotesubscribe.php:144 actions/remotesubscribe.php:153
-#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
-#: actions/showfavorites.php:106 actions/userbyid.php:74
-#: actions/usergroups.php:93 actions/userrss.php:40 actions/userxrd.php:59
-#: actions/xrds.php:71 lib/command.php:509 lib/galleryaction.php:59
-#: lib/mailbox.php:80 lib/profileaction.php:77
+#: actions/apigrouplist.php:70 actions/apigroupprofileupdate.php:108
+#: actions/apistatusesupdate.php:230 actions/apisubscriptions.php:85
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:173
+#: actions/apitimelinehome.php:78 actions/apitimelinementions.php:77
+#: actions/apitimelineuser.php:79 actions/avatarbynickname.php:79
+#: actions/favoritesrss.php:72 actions/foaf.php:42 actions/foaf.php:61
+#: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116
+#: actions/otp.php:78 actions/remotesubscribe.php:144
+#: actions/remotesubscribe.php:153 actions/replies.php:73
+#: actions/repliesrss.php:38 actions/rsd.php:113 actions/showfavorites.php:106
+#: actions/userbyid.php:75 actions/usergroups.php:93 actions/userrss.php:40
+#: actions/userxrd.php:59 actions/xrds.php:71 lib/command.php:509
+#: lib/galleryaction.php:59 lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Ne ekzistas tiu uzanto."
 
@@ -177,10 +181,9 @@ msgstr "%1$s kaj amikoj, paĝo %2$d"
 #. TRANS: H1 text for page. %s is a user nickname.
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Timeline title for user and friends. %s is a user nickname.
-#. TRANS: Tooltop for personal group navigation menu option when logged in for viewing timeline of self and friends.
 #: actions/all.php:94 actions/all.php:191 actions/allrss.php:117
 #: actions/apitimelinefriends.php:207 actions/apitimelinehome.php:113
-#: lib/personalgroupnav.php:102
+#: lib/personalgroupnav.php:100
 #, php-format
 msgid "%s and friends"
 msgstr "%s kaj amikoj"
@@ -237,7 +240,7 @@ msgstr ""
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
 #. TRANS: Second sentence of empty message for anonymous users. %s is a user nickname.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:227
+#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:221
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -286,19 +289,20 @@ msgstr "Ĝisdatiĝoj de %1$s kaj amikoj ĉe %2$s!"
 #: actions/apifavoritecreate.php:98 actions/apifavoritedestroy.php:98
 #: actions/apifriendshipscreate.php:99 actions/apifriendshipsdestroy.php:99
 #: actions/apifriendshipsshow.php:124 actions/apigroupcreate.php:138
-#: actions/apigroupismember.php:115 actions/apigroupjoin.php:160
-#: actions/apigroupleave.php:145 actions/apigrouplist.php:134
+#: actions/apigroupismember.php:115 actions/apigroupjoin.php:151
+#: actions/apigroupleave.php:141 actions/apigrouplist.php:134
 #: actions/apigrouplistall.php:120 actions/apigroupmembership.php:105
+#: actions/apigroupprofileupdate.php:100 actions/apigroupprofileupdate.php:213
 #: actions/apigroupshow.php:114 actions/apihelptest.php:84
 #: actions/apistatusesdestroy.php:101 actions/apistatusesretweets.php:110
 #: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:139
 #: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
-#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:268
-#: actions/apitimelinegroup.php:147 actions/apitimelinehome.php:173
-#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:239
-#: actions/apitimelineretweetedtome.php:118
-#: actions/apitimelineretweetsofme.php:150 actions/apitimelinetag.php:159
-#: actions/apitimelineuser.php:206 actions/apiusershow.php:100
+#: actions/apitimelinefavorites.php:182 actions/apitimelinefriends.php:276
+#: actions/apitimelinegroup.php:148 actions/apitimelinehome.php:181
+#: actions/apitimelinementions.php:182 actions/apitimelinepublic.php:247
+#: actions/apitimelineretweetedtome.php:147
+#: actions/apitimelineretweetsofme.php:147 actions/apitimelinetag.php:165
+#: actions/apitimelineuser.php:217 actions/apiusershow.php:100
 msgid "API method not found."
 msgstr "Metodo de API ne troviĝas."
 
@@ -313,8 +317,9 @@ msgstr "Metodo de API ne troviĝas."
 #: actions/apifavoritecreate.php:88 actions/apifavoritedestroy.php:88
 #: actions/apifriendshipscreate.php:89 actions/apifriendshipsdestroy.php:89
 #: actions/apigroupcreate.php:102 actions/apigroupjoin.php:89
-#: actions/apigroupleave.php:89 actions/apimediaupload.php:66
-#: actions/apistatusesretweet.php:63 actions/apistatusesupdate.php:194
+#: actions/apigroupleave.php:89 actions/apigroupprofileupdate.php:92
+#: actions/apimediaupload.php:66 actions/apistatusesretweet.php:63
+#: actions/apistatusesupdate.php:194
 msgid "This method requires a POST."
 msgstr "Ĉi tiu metodo bezonas POST-on."
 
@@ -328,21 +333,16 @@ msgstr ""
 "'im', 'none'."
 
 #. TRANS: Server error displayed when a user's delivery device cannot be updated.
-#. TRANS: Server error displayed when a user update to the database fails in the contact address confirmation action.
 #. TRANS: Server error thrown on database error updating e-mail preferences.
 #. TRANS: Server error thrown on database error removing a registered e-mail address.
-#. TRANS: Server error thrown on database error updating Instant Messaging preferences.
-#. TRANS: Server error thrown on database error removing a registered Instant Messaging address.
-#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
 #. TRANS: Server error thrown when user profile settings could not be updated.
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
-#: actions/apiaccountupdatedeliverydevice.php:130
-#: actions/confirmaddress.php:118 actions/emailsettings.php:352
-#: actions/emailsettings.php:498 actions/imsettings.php:276
-#: actions/imsettings.php:432 actions/othersettings.php:186
-#: actions/profilesettings.php:322 actions/smssettings.php:301
-#: actions/smssettings.php:454
+#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
+#: actions/apiaccountupdatedeliverydevice.php:136
+#: actions/emailsettings.php:353 actions/emailsettings.php:499
+#: actions/profilesettings.php:323 actions/smssettings.php:300
+#: actions/smssettings.php:453 actions/urlsettings.php:211
 msgid "Could not update user."
 msgstr "Malsukcesis ĝisdatigi uzanton"
 
@@ -368,7 +368,7 @@ msgstr "La uzanto ne havas profilon."
 
 #. TRANS: Server error displayed if a user profile could not be saved.
 #. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:418
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:419
 msgid "Could not save profile."
 msgstr "Malsukcesis konservi la profilon."
 
@@ -380,7 +380,7 @@ msgstr "Malsukcesis konservi la profilon."
 #: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
 #: actions/designadminpanel.php:120 actions/editapplication.php:121
 #: actions/newapplication.php:102 actions/newnotice.php:95
-#: lib/designsettings.php:298
+#: lib/designsettings.php:110
 #, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s byte) due to its "
@@ -405,8 +405,8 @@ msgstr[1] ""
 #: actions/apiaccountupdateprofilecolors.php:160
 #: actions/apiaccountupdateprofilecolors.php:171
 #: actions/groupdesignsettings.php:285 actions/groupdesignsettings.php:296
-#: actions/userdesignsettings.php:201 actions/userdesignsettings.php:211
-#: actions/userdesignsettings.php:253 actions/userdesignsettings.php:263
+#: actions/userdesignsettings.php:218 actions/userdesignsettings.php:228
+#: actions/userdesignsettings.php:270 actions/userdesignsettings.php:280
 msgid "Unable to save your design settings."
 msgstr "Malsukcesis konservi vian desegnan agordon"
 
@@ -414,7 +414,7 @@ msgstr "Malsukcesis konservi vian desegnan agordon"
 #. TRANS: Client error displayed when a database error occurs updating profile colours.
 #: actions/apiaccountupdateprofilebackgroundimage.php:191
 #: actions/apiaccountupdateprofilecolors.php:139
-#: actions/userdesignsettings.php:179
+#: actions/userdesignsettings.php:196
 msgid "Could not update your design."
 msgstr "Malsukcesis ĝisdatigi vian desegnon."
 
@@ -524,7 +524,7 @@ msgstr "Ricevonta uzanto ne troviĝas."
 #. TRANS: Client error displayed trying to direct message another user who's not a friend (403).
 #: actions/apidirectmessagenew.php:144
 #, fuzzy
-msgid "Can't send direct messages to users who aren't your friend."
+msgid "Cannot send direct messages to users who aren't your friend."
 msgstr "Vi ne povas sendi rektan mesaĝon al uzanto kiu ne estas via amiko."
 
 #. TRANS: Client error displayed trying to direct message self (403).
@@ -605,9 +605,9 @@ msgstr "Malsukcesis trovi celan uzanton."
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:156 actions/editgroup.php:191
-#: actions/newgroup.php:137 actions/profilesettings.php:273
-#: actions/register.php:214
+#: actions/apigroupcreate.php:156 actions/apigroupprofileupdate.php:255
+#: actions/editgroup.php:191 actions/newgroup.php:137
+#: actions/profilesettings.php:274 actions/register.php:199
 msgid "Nickname already in use. Try another one."
 msgstr "La uzantnomo jam uziĝis. Provu ion alian."
 
@@ -615,9 +615,9 @@ msgstr "La uzantnomo jam uziĝis. Provu ion alian."
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:164 actions/editgroup.php:195
-#: actions/newgroup.php:141 actions/profilesettings.php:243
-#: actions/register.php:216
+#: actions/apigroupcreate.php:164 actions/apigroupprofileupdate.php:259
+#: actions/editgroup.php:195 actions/newgroup.php:141
+#: actions/profilesettings.php:244 actions/register.php:201
 msgid "Not a valid nickname."
 msgstr "Ne valida kromnomo."
 
@@ -627,10 +627,10 @@ msgstr "Ne valida kromnomo."
 #. TRANS: Validation error shown when providing an invalid homepage URL in the "New application" form.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:181 actions/editapplication.php:235
-#: actions/editgroup.php:202 actions/newapplication.php:221
-#: actions/newgroup.php:148 actions/profilesettings.php:248
-#: actions/register.php:223
+#: actions/apigroupcreate.php:181 actions/apigroupprofileupdate.php:277
+#: actions/editapplication.php:235 actions/editgroup.php:202
+#: actions/newapplication.php:221 actions/newgroup.php:148
+#: actions/profilesettings.php:249 actions/register.php:208
 msgid "Homepage is not a valid URL."
 msgstr "Ĉefpaĝo ne estas valida URL."
 
@@ -639,8 +639,8 @@ msgstr "Ĉefpaĝo ne estas valida URL."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:191 actions/editgroup.php:206
-#: actions/newgroup.php:152 actions/profilesettings.php:252
-#: actions/register.php:226
+#: actions/newgroup.php:152 actions/profilesettings.php:253
+#: actions/register.php:211
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "Kompleta nomo tro longas (maksimume 255 signoj)"
 
@@ -667,8 +667,8 @@ msgstr[1] "Priskribo estas tro longa (maksimume %d signoj)."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:215 actions/editgroup.php:218
-#: actions/newgroup.php:164 actions/profilesettings.php:265
-#: actions/register.php:235
+#: actions/newgroup.php:164 actions/profilesettings.php:266
+#: actions/register.php:220
 msgid "Location is too long (maximum 255 characters)."
 msgstr "Lokonomo tro longas (maksimume 255 signoj)"
 
@@ -697,15 +697,16 @@ msgstr "La alinomo estas nevalida: \"%*s\"."
 #. TRANS: %s is the alias that is already in use.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error. %s is the already used alias.
-#: actions/apigroupcreate.php:264 actions/editgroup.php:246
-#: actions/newgroup.php:193
+#: actions/apigroupcreate.php:264 actions/apigroupprofileupdate.php:351
+#: actions/editgroup.php:246 actions/newgroup.php:193
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "La alinomo \"%s\" estas jam okupita. Provu ion alian."
 
 #. TRANS: Client error displayed when trying to use an alias during group creation that is the same as the group's nickname.
 #. TRANS: Group edit form validation error.
-#: actions/apigroupcreate.php:278 actions/editgroup.php:253
+#: actions/apigroupcreate.php:278 actions/apigroupprofileupdate.php:359
+#: actions/editgroup.php:253
 msgid "Alias can't be the same as nickname."
 msgstr "La alinomo devas ne esti sama al la kromnomo."
 
@@ -717,7 +718,8 @@ msgstr "La alinomo devas ne esti sama al la kromnomo."
 #. TRANS: Client error displayed requesting most recent notices to a group for a non-existing group.
 #: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
 #: actions/apigroupleave.php:104 actions/apigroupmembership.php:71
-#: actions/apigroupshow.php:81 actions/apitimelinegroup.php:89
+#: actions/apigroupprofileupdate.php:113 actions/apigroupshow.php:81
+#: actions/apitimelinegroup.php:89
 msgid "Group not found."
 msgstr "Grupo ne troviĝas."
 
@@ -735,13 +737,11 @@ msgstr "Vi estas jam grupano."
 msgid "You have been blocked from that group by the admin."
 msgstr "La administranto blokis vin de tiu grupo."
 
-#. TRANS: Server error displayed when joining a group fails.
-#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
 #. 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.
 #. TRANS: Message given having failed to add a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:362
+#: actions/apigroupjoin.php:136 actions/joingroup.php:139 lib/command.php:362
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "La uzanto %1$*s ne povas aliĝi al la grupo %2$*s."
@@ -751,8 +751,6 @@ msgstr "La uzanto %1$*s ne povas aliĝi al la grupo %2$*s."
 msgid "You are not a member of this group."
 msgstr "Vi ne estas grupano."
 
-#. TRANS: Server error displayed when leaving a group fails.
-#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
 #. TRANS: Server error displayed when leaving a group failed in the database.
 #. TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
 #. TRANS: Message given having failed to remove a user from a group.
@@ -788,6 +786,62 @@ msgstr "Grupoj de %s"
 msgid "groups on %s"
 msgstr "grupoj ĉe %s"
 
+#. TRANS: Client error displayed trying to edit a group while not being a group admin.
+#. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
+#. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
+#: actions/apigroupprofileupdate.php:118 actions/editgroup.php:110
+#: actions/editgroup.php:176 actions/groupdesignsettings.php:109
+#: actions/grouplogo.php:111
+msgid "You must be an admin to edit the group."
+msgstr "Vi devas esti administranto por redakti la grupon."
+
+#. TRANS: Server error displayed when editing a group fails.
+#: actions/apigroupprofileupdate.php:171 actions/editgroup.php:274
+msgid "Could not update group."
+msgstr "Malsukcesis ĝisdatigi grupon."
+
+#. TRANS: Server error displayed when group aliases could not be added.
+#. TRANS: Server exception thrown when creating group aliases failed.
+#: actions/apigroupprofileupdate.php:194 actions/editgroup.php:281
+#: classes/User_group.php:540
+msgid "Could not create aliases."
+msgstr "Malsukcesis krei alinomon."
+
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: actions/apigroupprofileupdate.php:249 lib/nickname.php:165
+msgid "Nickname must have only lowercase letters and numbers and no spaces."
+msgstr ""
+"Kromnomo devas havi nur minuskulajn literojn kaj numerojn sed neniun spacon."
+
+#: actions/apigroupprofileupdate.php:286
+#, fuzzy
+msgid "Full name is too long (max 255 chars)."
+msgstr "Kompleta nomo tro longas (maksimume 255 signoj)"
+
+#: actions/apigroupprofileupdate.php:296
+#, fuzzy, php-format
+msgid "description is too long (max %d chars)."
+msgstr "Priskribo estas tro longa (maksimume %d signo)."
+
+#: actions/apigroupprofileupdate.php:307
+#, fuzzy
+msgid "Location is too long (max 255 chars)."
+msgstr "Lokonomo tro longas (maksimume 255 signoj)"
+
+#: actions/apigroupprofileupdate.php:326
+#, fuzzy, php-format
+msgid "Too many aliases! Maximum %d."
+msgstr "Tro da alinomoj! Maksimume %d."
+
+#. TRANS: Group edit form validation error.
+#. TRANS: Group create form validation error.
+#. TRANS: %s is the invalid alias.
+#: actions/apigroupprofileupdate.php:342 actions/editgroup.php:241
+#: actions/newgroup.php:188
+#, php-format
+msgid "Invalid alias: \"%s\""
+msgstr "Nevalida alinomo: \"%s\""
+
 #. TRANS: Client error displayed when uploading a media file has failed.
 #: actions/apimediaupload.php:101
 msgid "Upload failed."
@@ -818,21 +872,22 @@ msgstr ""
 #. TRANS: Form validation error message.
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
+#. TRANS: Client error displayed when the session token is not okay.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
 #: actions/deletenotice.php:177 actions/disfavor.php:75
-#: actions/emailsettings.php:291 actions/favor.php:75 actions/geocode.php:55
+#: actions/emailsettings.php:292 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:65 actions/grouplogo.php:321
-#: actions/groupunblock.php:65 actions/imsettings.php:224
-#: actions/invite.php:60 actions/login.php:137 actions/makeadmin.php:66
-#: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
-#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
-#: actions/othersettings.php:155 actions/passwordsettings.php:138
-#: actions/profilesettings.php:217 actions/recoverpassword.php:383
-#: actions/register.php:172 actions/remotesubscribe.php:76
-#: actions/repeat.php:82 actions/smssettings.php:250 actions/subedit.php:40
-#: actions/subscribe.php:86 actions/tagother.php:166
-#: actions/unsubscribe.php:69 actions/userauthorization.php:52
-#: lib/designsettings.php:310
+#: actions/groupunblock.php:65 actions/imsettings.php:241
+#: actions/invite.php:60 actions/makeadmin.php:66 actions/newmessage.php:135
+#: actions/newnotice.php:105 actions/nudge.php:80
+#: actions/oauthappssettings.php:162 actions/oauthconnectionssettings.php:135
+#: actions/passwordsettings.php:137 actions/pluginenable.php:87
+#: actions/profilesettings.php:218 actions/recoverpassword.php:383
+#: actions/register.php:157 actions/remotesubscribe.php:76
+#: actions/repeat.php:82 actions/smssettings.php:249 actions/subedit.php:40
+#: actions/subscribe.php:87 actions/tagother.php:145
+#: actions/unsubscribe.php:69 actions/urlsettings.php:171
+#: actions/userauthorization.php:53 lib/designsettings.php:122
 msgid "There was a problem with your session token. Try again, please."
 msgstr "Estis problemo pri via seanco. Bonvolu provi refoje."
 
@@ -861,10 +916,10 @@ msgstr "Datumbaza eraro enigi la uzanton de *OAuth-aplikaĵo."
 #. TRANS: Unknown form validation error in design settings form.
 #: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
 #: actions/designadminpanel.php:100 actions/editapplication.php:144
-#: actions/emailsettings.php:310 actions/grouplogo.php:332
-#: actions/imsettings.php:239 actions/newapplication.php:124
-#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
-#: actions/smssettings.php:271 lib/designsettings.php:321
+#: actions/emailsettings.php:311 actions/grouplogo.php:332
+#: actions/imsettings.php:256 actions/newapplication.php:124
+#: actions/oauthconnectionssettings.php:144 actions/recoverpassword.php:46
+#: actions/smssettings.php:270 lib/designsettings.php:133
 msgid "Unexpected form submission."
 msgstr "Neatendita formo-sendo."
 
@@ -913,31 +968,26 @@ msgstr "Konto"
 
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Field label in form for profile settings.
-#. TRANS: Label for group nickname (dt). Text hidden by default.
-#. TRANS: DT for nick name in a profile.
-#: actions/apioauthauthorize.php:459 actions/login.php:252
-#: actions/profilesettings.php:106 actions/register.php:432
-#: actions/showgroup.php:243 actions/tagother.php:94
+#: actions/apioauthauthorize.php:459 actions/login.php:225
+#: actions/profilesettings.php:107 actions/register.php:411
 #: actions/userauthorization.php:145 lib/groupeditform.php:145
-#: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "Kromnomo"
 
 #. TRANS: Field label on OAuth API authorisation form.
-#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:463 actions/login.php:255
-#: actions/register.php:436 lib/accountsettingsaction.php:120
+#: actions/apioauthauthorize.php:463 actions/login.php:228
+#: actions/register.php:415 lib/settingsnav.php:87
 msgid "Password"
 msgstr "Pasvorto"
 
 #. TRANS: Button text that when clicked will cancel the process of allowing access to an account
 #. TRANS: by an external application.
 #. TRANS: Button label to cancel an e-mail address confirmation procedure.
-#. TRANS: Button label to cancel an Instant Messaging address confirmation procedure.
+#. TRANS: Button label to cancel an IM address confirmation procedure.
 #. TRANS: Button label to cancel a SMS address confirmation procedure.
 #. TRANS: Button label in the "Edit application" form.
-#: actions/apioauthauthorize.php:478 actions/emailsettings.php:124
-#: actions/imsettings.php:127 actions/smssettings.php:133
+#: actions/apioauthauthorize.php:478 actions/emailsettings.php:125
+#: actions/imsettings.php:136 actions/smssettings.php:132
 #: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Cancel"
@@ -1050,7 +1100,7 @@ msgstr "Metodo de API ne troviĝas."
 #. TRANS: %s is the requested output format.
 #: actions/apistatusesshow.php:144
 #, fuzzy, php-format
-msgid "Unsupported format: %s"
+msgid "Unsupported format: %s."
 msgstr "Formato ne subtenata."
 
 #. TRANS: Client error displayed requesting a deleted status.
@@ -1134,13 +1184,6 @@ msgstr "%1$*s / Ŝatato de %2$*s"
 msgid "%1$s updates favorited by %2$s / %3$s."
 msgstr "%1$*s ĝisdatigoj ŝatataj de %2$*s / %2$*s."
 
-#. TRANS: Server error displayed when generating an Atom feed fails.
-#. TRANS: %s is the error.
-#: actions/apitimelinegroup.php:134
-#, fuzzy, php-format
-msgid "Could not generate feed for group - %s"
-msgstr "Malsukcesis ĝisdatigi grupon."
-
 #. TRANS: Title for timeline of most recent mentions of a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname.
 #: actions/apitimelinementions.php:115
@@ -1157,13 +1200,14 @@ msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr "%1$s ĝisdatigoj kiuj respondas al ĝisdatigoj de %2$s / %3$s."
 
 #. TRANS: Title for site timeline. %s is the StatusNet sitename.
+#. TRANS: Public RSS feed title. %s is the StatusNet site name.
 #: actions/apitimelinepublic.php:193 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "%s publika tempstrio"
 
 #. TRANS: Subtitle for site timeline. %s is the StatusNet sitename.
-#: actions/apitimelinepublic.php:199 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:199
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "%s ĝisdatigoj de ĉiuj!"
@@ -1175,21 +1219,33 @@ msgid "Unimplemented."
 msgstr "Nerealiĝita metodo"
 
 #. TRANS: Title for Atom feed "repeated to me". %s is the user nickname.
-#: actions/apitimelineretweetedtome.php:108
+#: actions/apitimelineretweetedtome.php:96
 #, php-format
 msgid "Repeated to %s"
 msgstr "Ripetita al %s"
 
+#: actions/apitimelineretweetedtome.php:98
+#, fuzzy, php-format
+msgid "%1$s notices that were to repeated to %2$s / %3$s."
+msgstr "%1$s ĝisdatigoj kiuj respondas al ĝisdatigoj de %2$s / %3$s."
+
 #. TRANS: Title of list of repeated notices of the logged in user.
 #. TRANS: %s is the nickname of the logged in user.
-#: actions/apitimelineretweetsofme.php:112
+#: actions/apitimelineretweetsofme.php:98
 #, php-format
 msgid "Repeats of %s"
 msgstr "Ripetoj de %s"
 
+#: actions/apitimelineretweetsofme.php:104
+#, fuzzy, php-format
+msgid "%1$s notices that %2$s / %3$s has repeated."
+msgstr "%s (@%s) ŝatis vian avizon"
+
 #. TRANS: Title for timeline with lastest notices with a given tag.
 #. TRANS: %s is the tag.
-#: actions/apitimelinetag.php:101 actions/tag.php:67
+#. TRANS: Title for first page of notices with tags.
+#. TRANS: %s is the tag.
+#: actions/apitimelinetag.php:101 actions/tag.php:69
 #, php-format
 msgid "Notices tagged with %s"
 msgstr "Avizoj etikeditaj %s"
@@ -1202,54 +1258,55 @@ msgid "Updates tagged with %1$s on %2$s!"
 msgstr "Ĝisdatigoj etikeditaj %1$s ĉe %2$s!"
 
 #. TRANS: Client error displayed trying to add a notice to another user's timeline.
-#: actions/apitimelineuser.php:297
+#: actions/apitimelineuser.php:308
 #, fuzzy
 msgid "Only the user can add to their own timeline."
 msgstr "Nur uzanto povas legi sian propran paŝton."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:304
+#: actions/apitimelineuser.php:315
 msgid "Only accept AtomPub for Atom feeds."
 msgstr ""
 
 #. TRANS: Client error displayed attempting to post an empty API notice.
-#: actions/apitimelineuser.php:311
+#: actions/apitimelineuser.php:322
 msgid "Atom post must not be empty."
 msgstr ""
 
 #. TRANS: Client error displayed attempting to post an API that is not well-formed XML.
-#: actions/apitimelineuser.php:317
+#: actions/apitimelineuser.php:328
 msgid "Atom post must be well-formed XML."
 msgstr ""
 
 #. TRANS: Client error displayed when not using an Atom entry.
-#: actions/apitimelineuser.php:323 actions/atompubfavoritefeed.php:228
+#: actions/apitimelineuser.php:334 actions/atompubfavoritefeed.php:228
 #: actions/atompubmembershipfeed.php:230
 #: actions/atompubsubscriptionfeed.php:236
 msgid "Atom post must be an Atom entry."
 msgstr ""
 
 #. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
-#: actions/apitimelineuser.php:335
+#: actions/apitimelineuser.php:345
 msgid "Can only handle POST activities."
 msgstr ""
 
 #. TRANS: Client error displayed when using an unsupported activity object type.
 #. TRANS: %s is the unsupported activity object type.
-#: actions/apitimelineuser.php:346
+#: actions/apitimelineuser.php:356
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
 #. TRANS: %d is the notice ID (number).
-#: actions/apitimelineuser.php:380
+#: actions/apitimelineuser.php:390
 #, fuzzy, php-format
 msgid "No content for notice %d."
 msgstr "Serĉi enhavon ĉe la retejo"
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:408
+#. TRANS: %s is the notice URI.
+#: actions/apitimelineuser.php:419
 #, fuzzy, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "Avizo kun tiu identigaĵo ne ekzistas."
@@ -1267,9 +1324,10 @@ msgstr "Metodo de API ne troviĝas."
 
 #. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
 #. TRANS: Client exception.
+#. TRANS: Client error displayed trying to subscribe to a non-existing profile.
 #: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
 #: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
-#: actions/subscribe.php:107
+#: actions/subscribe.php:110
 msgid "No such profile."
 msgstr "Ne ekzistas tia profilo."
 
@@ -1416,7 +1474,7 @@ msgid "Not a member."
 msgstr "Ne estas ano."
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
-#: actions/atompubshowmembership.php:151
+#: actions/atompubshowmembership.php:150
 #, fuzzy
 msgid "Cannot delete someone else's membership."
 msgstr "Ne eblas forigi abonon al vi mem."
@@ -1505,10 +1563,7 @@ msgid "Invalid size."
 msgstr "Grando nevalida."
 
 #. TRANS: Title for avatar upload page.
-#. TRANS: Label for group avatar (dt). Text hidden by default.
-#. TRANS: Link description in user account settings menu.
-#: actions/avatarsettings.php:66 actions/showgroup.php:227
-#: lib/accountsettingsaction.php:113
+#: actions/avatarsettings.php:66 lib/settingsnav.php:82
 msgid "Avatar"
 msgstr "Vizaĝbildo"
 
@@ -1521,9 +1576,11 @@ msgstr "Vi povas alŝuti vian personan vizaĝbildon. Dosiero-grandlimo estas %s.
 
 #. TRANS: Server error displayed in avatar upload page when no matching profile can be found for a user.
 #. TRANS: Server error displayed coming across a request from a user without a profile.
+#. TRANS: Server error displayed when trying to authorise a remote subscription request
+#. TRANS: while the user has no profile.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
 #: actions/grouplogo.php:184 actions/remotesubscribe.php:190
-#: actions/userauthorization.php:72 actions/userrss.php:108
+#: actions/userauthorization.php:75 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr "Uzanto sen egala profilo."
 
@@ -1581,10 +1638,10 @@ msgstr "Tranĉi"
 msgid "No file uploaded."
 msgstr "Neniu dosiero alŝutiĝas."
 
-#. TRANS: Avatar upload form unstruction after uploading a file.
+#. TRANS: Avatar upload form instruction after uploading a file.
 #: actions/avatarsettings.php:345
 #, fuzzy
-msgid "Pick a square area of the image to be your avatar"
+msgid "Pick a square area of the image to be your avatar."
 msgstr "Elektu kvadratan parton de la bildo kiel via vizaĝbildo"
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
@@ -1610,7 +1667,7 @@ msgstr "Vizaĝbildo forigita."
 
 #. TRANS: Title for backup account page.
 #. TRANS: Option in profile settings to create a backup of the account of the currently logged in user.
-#: actions/backupaccount.php:61 actions/profilesettings.php:467
+#: actions/backupaccount.php:61 actions/profilesettings.php:468
 msgid "Backup account"
 msgstr ""
 
@@ -1644,7 +1701,7 @@ msgstr "Fono"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
 #: actions/backupaccount.php:254
-msgid "Backup your account"
+msgid "Backup your account."
 msgstr ""
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
@@ -1685,7 +1742,7 @@ msgstr "Ne"
 #. TRANS: Submit button title for 'No' when blocking a user.
 #: actions/block.php:158
 #, fuzzy
-msgid "Do not block this user"
+msgid "Do not block this user."
 msgstr "Ne bloki la uzanton"
 
 #. TRANS: Button label on the user block form.
@@ -1702,9 +1759,9 @@ msgid "Yes"
 msgstr "Jes"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#. TRANS: Description of the form to block a user.
-#: actions/block.php:165 lib/blockform.php:79
-msgid "Block this user"
+#: actions/block.php:165
+#, fuzzy
+msgid "Block this user."
 msgstr "Bloki la uzanton"
 
 #. TRANS: Server error displayed when blocking a user fails.
@@ -1771,32 +1828,48 @@ msgstr "Konfirma kodo ne trovitas."
 msgid "That confirmation code is not for you!"
 msgstr "Tiu komfirmnumero ne estas por vi!"
 
-#. TRANS: Server error for a unknow address type %s, which can be 'email', 'jabber', or 'sms'.
-#: actions/confirmaddress.php:92
-#, php-format
-msgid "Unrecognized address type %s."
+#. TRANS: Server error for an unknown address type, which can be 'email', 'sms', or the name of an IM network (such as 'xmpp' or 'aim')
+#: actions/confirmaddress.php:94
+#, fuzzy, php-format
+msgid "Unrecognized address type %s"
 msgstr "Nerekonata adrestipo %s."
 
 #. TRANS: Client error for an already confirmed email/jabber/sms address.
-#: actions/confirmaddress.php:97
+#: actions/confirmaddress.php:103 actions/confirmaddress.php:136
 msgid "That address has already been confirmed."
 msgstr "La adreso jam estis konfirmita."
 
+#: actions/confirmaddress.php:121 actions/imsettings.php:444
+#: actions/userdesignsettings.php:306
+#, fuzzy
+msgid "Couldn't update user."
+msgstr "Malsukcesis ĝisdatigi uzanton"
+
+#: actions/confirmaddress.php:144
+#, fuzzy
+msgid "Couldn't update user im preferences."
+msgstr "Malsukcesis ĝisdatigi uzantan informon."
+
+#: actions/confirmaddress.php:156
+#, fuzzy
+msgid "Couldn't insert user im preferences."
+msgstr "Eraris enmeti novan abonon."
+
 #. TRANS: Server error displayed when an address confirmation code deletion from the
 #. TRANS: database fails in the contact address confirmation action.
-#: actions/confirmaddress.php:132
+#: actions/confirmaddress.php:169
 #, fuzzy
 msgid "Could not delete address confirmation."
 msgstr "Malsukcesis forigi tujmesaĝila agordo."
 
 #. TRANS: Title for the contact address confirmation action.
-#: actions/confirmaddress.php:150
+#: actions/confirmaddress.php:185
 msgid "Confirm address"
 msgstr "Konfirmi retadreson"
 
 #. TRANS: Success message for the contact address confirmation action.
 #. TRANS: %s can be 'email', 'jabber', or 'sms'.
-#: actions/confirmaddress.php:166
+#: actions/confirmaddress.php:200
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "Adreso \"%s\" nun konfirmitas je via konto."
@@ -1810,6 +1883,7 @@ msgstr "Konversacio"
 #. TRANS: Label for user statistics.
 #: actions/conversation.php:149 lib/noticelist.php:87
 #: lib/profileaction.php:246 lib/searchgroupnav.php:82
+#: lib/threadednoticelist.php:66
 msgid "Notices"
 msgstr "Avizoj"
 
@@ -1845,7 +1919,7 @@ msgstr "Vizaĝbildo forigita."
 
 #. TRANS: Page title for page on which a user account can be deleted.
 #. TRANS: Option in profile settings to delete the account of the currently logged in user.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:475
+#: actions/deleteaccount.php:228 actions/profilesettings.php:476
 #, fuzzy
 msgid "Delete account"
 msgstr "Krei konton"
@@ -1869,7 +1943,7 @@ msgstr ""
 #. TRANS: Field label for delete account confirmation entry.
 #. TRANS: Field label for password reset form where the password has to be typed again.
 #: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:262 actions/register.php:440
+#: actions/recoverpassword.php:262 actions/register.php:419
 msgid "Confirm"
 msgstr "Konfirmi"
 
@@ -1899,14 +1973,14 @@ msgstr "Aplikaĵo ne trovita."
 #. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
 #: actions/deleteapplication.php:79 actions/editapplication.php:78
-#: actions/showapplication.php:94
+#: actions/showapplication.php:90
 msgid "You are not the owner of this application."
 msgstr "Vi ne estas la posedanto de ĉi tiu aplikaĵo."
 
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
-#: actions/newapplication.php:112 actions/showapplication.php:118
-#: lib/action.php:1425
+#: actions/newapplication.php:112 actions/showapplication.php:113
+#: lib/action.php:1391
 msgid "There was a problem with your session token."
 msgstr "Problemo okazas pri via seancĵetono."
 
@@ -1929,13 +2003,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting an application.
 #: actions/deleteapplication.php:161
 #, fuzzy
-msgid "Do not delete this application"
+msgid "Do not delete this application."
 msgstr "Ne forigu ĉi tiun aplikaĵon."
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
 #: actions/deleteapplication.php:167
 #, fuzzy
-msgid "Delete this application"
+msgid "Delete this application."
 msgstr "Viŝi ĉi tiun aplikon"
 
 #. TRANS: Client error when trying to delete group while not logged in.
@@ -1993,13 +2067,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting a group.
 #: actions/deletegroup.php:224
 #, fuzzy
-msgid "Do not delete this group"
+msgid "Do not delete this group."
 msgstr "Ne forigi la avizon"
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
 #: actions/deletegroup.php:231
 #, fuzzy
-msgid "Delete this group"
+msgid "Delete this group."
 msgstr "Forigi la uzanton"
 
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
@@ -2007,14 +2081,16 @@ msgstr "Forigi la uzanton"
 #. TRANS: Client error displayed when trying to mark a notice as favorite without being logged in.
 #. TRANS: Client error displayed trying to block a user from a group while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
+#. TRANS: Client error displayed trying to log out when not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
+#. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
 #. TRANS: Client error displayed when trying to change user options while not logged in.
 #: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
-#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:69
+#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:70
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
-#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
-#: actions/tagother.php:33 actions/unsubscribe.php:52
+#: actions/nudge.php:63 actions/pluginenable.php:97 actions/subedit.php:33
+#: actions/subscribe.php:98 actions/tagother.php:33 actions/unsubscribe.php:52
 #: lib/adminpanelaction.php:71 lib/profileformaction.php:63
 #: lib/settingsaction.php:72
 msgid "Not logged in."
@@ -2042,12 +2118,13 @@ msgstr "Ĉu vi certe volas forigi la avizon?"
 #. TRANS: Submit button title for 'No' when deleting a notice.
 #: actions/deletenotice.php:159
 #, fuzzy
-msgid "Do not delete this notice"
+msgid "Do not delete this notice."
 msgstr "Ne forigi la avizon"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:166 lib/noticelist.php:673
-msgid "Delete this notice"
+#: actions/deletenotice.php:166
+#, fuzzy
+msgid "Delete this notice."
 msgstr "Forigi la avizon"
 
 #. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
@@ -2084,18 +2161,17 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting a user.
 #: actions/deleteuser.php:158
 #, fuzzy
-msgid "Do not delete this user"
+msgid "Do not delete this user."
 msgstr "Ne forigi la avizon"
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
-#. TRANS: Description of form for deleting a user.
-#: actions/deleteuser.php:165 lib/deleteuserform.php:75
-msgid "Delete this user"
+#: actions/deleteuser.php:165
+#, fuzzy
+msgid "Delete this user."
 msgstr "Forigi la uzanton"
 
 #. TRANS: Message used as title for design settings for the site.
-#. TRANS: Link description in user account settings menu.
-#: actions/designadminpanel.php:60 lib/accountsettingsaction.php:134
+#: actions/designadminpanel.php:60 lib/settingsnav.php:97
 msgid "Design"
 msgstr "Aspekto"
 
@@ -2164,8 +2240,7 @@ msgid "You can upload a custom StatusNet theme as a .ZIP archive."
 msgstr "Vi povas alŝuti propran StatusNet-desegnon kiel .zip-dosiero"
 
 #. TRANS: Fieldset legend for theme background image.
-#. TRANS: Fieldset legend on profile design page.
-#: actions/designadminpanel.php:515 lib/designsettings.php:98
+#: actions/designadminpanel.php:515
 msgid "Change background image"
 msgstr "Ŝanĝi fonbildon"
 
@@ -2173,7 +2248,7 @@ msgstr "Ŝanĝi fonbildon"
 #. TRANS: Field label for background color selector.
 #. TRANS: Label on profile design page for setting a profile page background colour.
 #: actions/designadminpanel.php:525 actions/designadminpanel.php:609
-#: lib/designsettings.php:183
+#: lib/designform.php:238
 msgid "Background"
 msgstr "Fono"
 
@@ -2198,13 +2273,13 @@ msgstr "For"
 #. TRANS: Form guide for turning background image on or off on theme designer page.
 #. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
 #. TRANS: use of the uploaded profile image.
-#: actions/designadminpanel.php:577 lib/designsettings.php:159
+#: actions/designadminpanel.php:577 lib/designform.php:214
 msgid "Turn background image on or off."
 msgstr "Aktivigi aŭ senaktivigi fonbildon"
 
 #. TRANS: Checkbox label to title background image on theme designer page.
 #. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-#: actions/designadminpanel.php:583 lib/designsettings.php:165
+#: actions/designadminpanel.php:583 lib/designform.php:220
 msgid "Tile background image"
 msgstr "Ripeti la fonbildon"
 
@@ -2216,25 +2291,25 @@ msgstr "Ŝanĝi kolorojn"
 
 #. TRANS: Field label for content color selector.
 #. TRANS: Label on profile design page for setting a profile page content colour.
-#: actions/designadminpanel.php:623 lib/designsettings.php:197
+#: actions/designadminpanel.php:623 lib/designform.php:252
 msgid "Content"
 msgstr "Enhavo"
 
 #. TRANS: Field label for sidebar color selector.
 #. TRANS: Label on profile design page for setting a profile page sidebar colour.
-#: actions/designadminpanel.php:637 lib/designsettings.php:211
+#: actions/designadminpanel.php:637 lib/designform.php:266
 msgid "Sidebar"
 msgstr "Flanka strio"
 
 #. TRANS: Field label for text color selector.
 #. TRANS: Label on profile design page for setting a profile page text colour.
-#: actions/designadminpanel.php:651 lib/designsettings.php:225
+#: actions/designadminpanel.php:651 lib/designform.php:280
 msgid "Text"
 msgstr "Teksto"
 
 #. TRANS: Field label for link color selector.
 #. TRANS: Label on profile design page for setting a profile page links colour.
-#: actions/designadminpanel.php:665 lib/designsettings.php:239
+#: actions/designadminpanel.php:665 lib/designform.php:294
 msgid "Links"
 msgstr "Ligiloj"
 
@@ -2256,21 +2331,21 @@ msgid "Use defaults"
 msgstr "Uzu defaŭlton"
 
 #. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: actions/designadminpanel.php:720 lib/designsettings.php:259
-msgid "Restore default designs"
+#: actions/designadminpanel.php:720
+#, fuzzy
+msgid "Restore default designs."
 msgstr "Restaŭri defaŭltajn desegnojn"
 
 #. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: actions/designadminpanel.php:728 lib/designsettings.php:267
-msgid "Reset back to default"
+#: actions/designadminpanel.php:728
+#, fuzzy
+msgid "Reset back to default."
 msgstr "Redefaŭltiĝi"
 
 #. TRANS: Title for button for saving theme settings.
-#. TRANS: Title for button on profile design page to save settings.
-#: actions/designadminpanel.php:736 lib/designsettings.php:272
-msgid "Save design"
+#: actions/designadminpanel.php:736
+#, fuzzy
+msgid "Save design."
 msgstr "Savi desegnon"
 
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
@@ -2302,7 +2377,7 @@ msgid "You must be logged in to edit an application."
 msgstr "Ensalutu por redakti la aplikaĵon."
 
 #. TRANS: Client error displayed trying to edit an application that does not exist.
-#: actions/editapplication.php:83 actions/showapplication.php:87
+#: actions/editapplication.php:83 actions/showapplication.php:83
 msgid "No such application."
 msgstr "Ne estas tia aplikaĵo."
 
@@ -2395,80 +2470,53 @@ msgstr "Redakti %s grupon"
 msgid "You must be logged in to create a group."
 msgstr "Ensalutu por krei grupon."
 
-#. TRANS: Client error displayed trying to edit a group while not being a group admin.
-#. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
-#. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
-#: actions/editgroup.php:110 actions/editgroup.php:176
-#: actions/groupdesignsettings.php:109 actions/grouplogo.php:111
-msgid "You must be an admin to edit the group."
-msgstr "Vi devas esti administranto por redakti la grupon."
-
 #. TRANS: Form instructions for group edit form.
 #: actions/editgroup.php:161
 msgid "Use this form to edit the group."
 msgstr "Uzas ĉi tiun formularon por redakti la grupon."
 
-#. TRANS: Group edit form validation error.
-#. TRANS: Group create form validation error.
-#. TRANS: %s is the invalid alias.
-#: actions/editgroup.php:241 actions/newgroup.php:188
-#, php-format
-msgid "Invalid alias: \"%s\""
-msgstr "Nevalida alinomo: \"%s\""
-
-#. TRANS: Server error displayed when editing a group fails.
-#: actions/editgroup.php:274
-msgid "Could not update group."
-msgstr "Malsukcesis ĝisdatigi grupon."
-
-#. TRANS: Server error displayed when group aliases could not be added.
-#. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/editgroup.php:281 classes/User_group.php:540
-msgid "Could not create aliases."
-msgstr "Malsukcesis krei alinomon."
-
 #. TRANS: Group edit form success message.
 #: actions/editgroup.php:301
 msgid "Options saved."
 msgstr "Elektoj konserviĝis."
 
 #. TRANS: Title for e-mail settings.
-#: actions/emailsettings.php:59
+#: actions/emailsettings.php:60
 msgid "Email settings"
 msgstr "Retpoŝta agordo"
 
 #. TRANS: E-mail settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/emailsettings.php:73
+#: actions/emailsettings.php:74
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 msgstr "Administri kiel ricevi mesaĝon de  %%site.name%%."
 
 #. TRANS: Form legend for e-mail settings form.
 #. TRANS: Field label for e-mail address input in e-mail settings form.
-#: actions/emailsettings.php:103 actions/emailsettings.php:129
+#: actions/emailsettings.php:104 actions/emailsettings.php:130
 msgid "Email address"
 msgstr "Retpoŝtadreso"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:109
+#: actions/emailsettings.php:110
 msgid "Current confirmed email address."
 msgstr "Nuna konfirmita retpoŝtadreso."
 
 #. TRANS: Button label to remove a confirmed e-mail address.
 #. TRANS: Button label for removing a set sender e-mail address to post notices from.
-#. TRANS: Button label to remove a confirmed Instant Messaging address.
+#. TRANS: Button label to remove a confirmed IM address.
 #. TRANS: Button label to remove a confirmed SMS address.
 #. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
-#: actions/emailsettings.php:112 actions/emailsettings.php:179
-#: actions/imsettings.php:112 actions/smssettings.php:120
-#: actions/smssettings.php:176
+#: actions/emailsettings.php:113 actions/emailsettings.php:180
+#: actions/imsettings.php:119 actions/smssettings.php:119
+#: actions/smssettings.php:175
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Forigi"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:119
+#: actions/emailsettings.php:120
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -2481,44 +2529,44 @@ msgstr ""
 #. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
 #. TRANS: Any other domain may be owned by a legitimate person or
 #. TRANS: organization.
-#: actions/emailsettings.php:136
+#: actions/emailsettings.php:137
 msgid "Email address, like \"UserName@example.org\""
 msgstr "Retpoŝtadreso, ekzemple \"ViaNomo@example.org\""
 
 #. TRANS: Button label for adding an e-mail address in e-mail settings form.
-#. TRANS: Button label for adding an Instant Messaging address in Instant Messaging settings form.
+#. TRANS: Button label for adding an IM address in IM settings form.
 #. TRANS: Button label for adding a SMS phone number in SMS settings form.
-#: actions/emailsettings.php:140 actions/imsettings.php:147
-#: actions/smssettings.php:158
+#: actions/emailsettings.php:141 actions/imsettings.php:147
+#: actions/smssettings.php:157
 msgctxt "BUTTON"
 msgid "Add"
 msgstr "Aldoni"
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:148 actions/smssettings.php:167
+#: actions/emailsettings.php:149 actions/smssettings.php:166
 msgid "Incoming email"
 msgstr "Alveninta poŝto"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:154
+#: actions/emailsettings.php:155
 msgid "I want to post notices by email."
 msgstr "Mi volas afiŝi avizon per retpoŝto."
 
 #. TRANS: Form instructions for incoming e-mail form in e-mail settings.
 #. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
-#: actions/emailsettings.php:176 actions/smssettings.php:174
+#: actions/emailsettings.php:177 actions/smssettings.php:173
 msgid "Send email to this address to post new notices."
 msgstr "Sendu mesaĝon al la adreso por afiŝi novan avizon."
 
 #. TRANS: Instructions for incoming e-mail address input form, when an address has already been assigned.
 #. TRANS: Instructions for incoming SMS e-mail address input form.
-#: actions/emailsettings.php:185 actions/smssettings.php:182
+#: actions/emailsettings.php:186 actions/smssettings.php:181
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr "Krei novan retpoŝtadreson por afiŝado kaj nuligi la antaŭan."
 
 #. TRANS: Instructions for incoming e-mail address input form.
-#: actions/emailsettings.php:189
+#: actions/emailsettings.php:190
 msgid ""
 "To send notices via email, we need to create a unique email address for you "
 "on this server:"
@@ -2526,89 +2574,89 @@ msgstr ""
 
 #. TRANS: Button label for adding an e-mail address to send notices from.
 #. TRANS: Button label for adding an SMS e-mail address to send notices from.
-#: actions/emailsettings.php:195 actions/smssettings.php:185
+#: actions/emailsettings.php:196 actions/smssettings.php:184
 msgctxt "BUTTON"
 msgid "New"
 msgstr "Nova"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:204
+#: actions/emailsettings.php:205
 msgid "Email preferences"
 msgstr "Retpoŝta agordo."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:212
+#: actions/emailsettings.php:213
 msgid "Send me notices of new subscriptions through email."
 msgstr "Sendu al mi avizon pri nova abonado per retpoŝto."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:218
+#: actions/emailsettings.php:219
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr "Sendu al mi mesaĝon tiam, kiam iu ŝatas mian avizon ."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:225
+#: actions/emailsettings.php:226
 msgid "Send me email when someone sends me a private message."
 msgstr "Sendu al mi mesaĝon tiam, kiam iu sendas al mi privatan mesaĝon."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:231
+#: actions/emailsettings.php:232
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr "Sendu al mi mesaĝon tiam, kiam iu sendas al mi \"@-respondon\"."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:237
+#: actions/emailsettings.php:238
 msgid "Allow friends to nudge me and send me an email."
 msgstr "Permesi al amikoj puŝeti min kaj sendi al mi retpoŝtan mesaĝon."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:243
+#: actions/emailsettings.php:244
 msgid "Publish a MicroID for my email address."
 msgstr "Publikigi MikroID por mia retpoŝtadreso."
 
 #. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:361
+#: actions/emailsettings.php:362
 msgid "Email preferences saved."
 msgstr "Retpoŝta prefero konserviĝis."
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:380
+#: actions/emailsettings.php:381
 msgid "No email address."
 msgstr "Neniu retpoŝta adreso."
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:388
+#: actions/emailsettings.php:389
 #, fuzzy
 msgid "Cannot normalize that email address."
 msgstr "Malsukcesis normigi tiun retpoŝtadreson"
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:393 actions/register.php:212
+#: actions/emailsettings.php:394 actions/register.php:197
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "Retpoŝta adreso ne valida"
 
 #. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:397
+#: actions/emailsettings.php:398
 msgid "That is already your email address."
 msgstr "Tiu jam estas via retpoŝtadreso."
 
 #. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:401
+#: actions/emailsettings.php:402
 msgid "That email address already belongs to another user."
 msgstr "Tiu retpoŝtadreso jam apartenas al alia uzanto."
 
 #. TRANS: Server error thrown on database error adding e-mail confirmation code.
 #. TRANS: Server error thrown on database error adding Instant Messaging confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:418 actions/imsettings.php:343
-#: actions/smssettings.php:365
+#: actions/emailsettings.php:419 actions/imsettings.php:362
+#: actions/smssettings.php:364
 #, fuzzy
 msgid "Could not insert confirmation code."
 msgstr "Malsukcesis enmeti konfirmkodon."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:425
+#: actions/emailsettings.php:426
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
@@ -2619,59 +2667,62 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling Instant Messaging address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:445 actions/imsettings.php:377
-#: actions/smssettings.php:399
+#: actions/emailsettings.php:446 actions/imsettings.php:391
+#: actions/smssettings.php:398
 msgid "No pending confirmation to cancel."
 msgstr "Ne estas peto-konfirmo por nuligi."
 
 #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:450
+#: actions/emailsettings.php:451
 msgid "That is the wrong email address."
 msgstr "Tiu retpoŝtadreso estas malĝusta."
 
 #. TRANS: Server error thrown on database error canceling e-mail address confirmation.
 #. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
-#: actions/emailsettings.php:459 actions/smssettings.php:413
+#: actions/emailsettings.php:460 actions/smssettings.php:412
 #, fuzzy
 msgid "Could not delete email confirmation."
 msgstr "Ne povas forigi retpoŝtan konfirmon."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:464
+#: actions/emailsettings.php:465
 msgid "Email confirmation cancelled."
 msgstr "Retpoŝta konfirmo nuligita."
 
 #. TRANS: Message given trying to remove an e-mail address that is not
 #. TRANS: registered for the active user.
-#: actions/emailsettings.php:483
+#: actions/emailsettings.php:484
 msgid "That is not your email address."
 msgstr "Tiu ne estas via retpoŝtadreso."
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:504
+#: actions/emailsettings.php:505
 msgid "The email address was removed."
 msgstr "La retpoŝtadreso estas forigita."
 
 #. TRANS: Form validation error displayed when trying to remove an incoming e-mail address while no address has been set.
-#: actions/emailsettings.php:518 actions/smssettings.php:555
+#: actions/emailsettings.php:519 actions/smssettings.php:554
 msgid "No incoming email address."
 msgstr "Ne estas alvena retpoŝtadreso"
 
 #. TRANS: Server error thrown on database error removing incoming e-mail address.
 #. TRANS: Server error thrown on database error adding incoming e-mail address.
-#: actions/emailsettings.php:530 actions/emailsettings.php:554
-#: actions/smssettings.php:565 actions/smssettings.php:588
+#. TRANS: Server error displayed when the user could not be updated in SMS settings.
+#: actions/emailsettings.php:531 actions/emailsettings.php:555
+#: actions/smssettings.php:565 actions/smssettings.php:590
 #, fuzzy
 msgid "Could not update user record."
 msgstr "Malsukcesis ĝisdatigi uzantan informon."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:534 actions/smssettings.php:568
+#. TRANS: Confirmation text after updating SMS settings.
+#: actions/emailsettings.php:535 actions/smssettings.php:569
 msgid "Incoming email address removed."
 msgstr "Alvena retpoŝtadreso forigita."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:558 actions/smssettings.php:591
+#. TRANS: Confirmation text after updating SMS settings.
+#: actions/emailsettings.php:559 actions/smssettings.php:594
 msgid "New incoming email address added."
 msgstr "Nova alvena retpoŝtadreso aldonita."
 
@@ -2683,7 +2734,7 @@ msgstr "Ĉi tiu avizo jam estas ŝatata."
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
 #: actions/favor.php:95
 #, fuzzy
-msgid "Disfavor favorite"
+msgid "Disfavor favorite."
 msgstr "Malŝati ŝataton."
 
 #. TRANS: Page title for first page of favorited notices.
@@ -2734,9 +2785,8 @@ msgstr ""
 #. TRANS: %s is a user's nickname.
 #. TRANS: Title for first page of favourite notices of a user.
 #. TRANS: %s is the user for whom the favourite notices are displayed.
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing own favourited notices.
 #: actions/favoritesrss.php:111 actions/showfavorites.php:76
-#: lib/personalgroupnav.php:122
+#: lib/personalgroupnav.php:110
 #, php-format
 msgid "%s's favorite notices"
 msgstr "Ŝatataj avizoj de %s"
@@ -2922,13 +2972,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
 #: actions/groupblock.php:191
 #, fuzzy
-msgid "Do not block this user from this group"
+msgid "Do not block this user from this group."
 msgstr "Ne bloki la uzanton de la grupo"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
 #: actions/groupblock.php:198
 #, fuzzy
-msgid "Block this user from this group"
+msgid "Block this user from this group."
 msgstr "Bloki la uzanton de la grupo"
 
 #. TRANS: Server error displayed when trying to block a user from a group fails because of an application error.
@@ -2937,6 +2987,7 @@ msgid "Database error blocking user from group."
 msgstr "Malsukcesis forbari uzanton de la grupo pro datumbaza eraro."
 
 #. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
+#. TRANS: Client error displayed trying to find a user by ID without providing an ID.
 #: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr "Neniu ID."
@@ -2965,7 +3016,7 @@ msgid "Unable to update your design settings."
 msgstr "Malsukcesis konservi vian desegnan agordon"
 
 #. TRANS: Form text to confirm saved group design settings.
-#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:222
+#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:239
 msgid "Design preferences saved."
 msgstr "Desegna agordo konservita."
 
@@ -3029,7 +3080,7 @@ msgid "A list of the users in this group."
 msgstr "Listo de uzantoj en tiu ĉi grupo"
 
 #. TRANS: Indicator in group members list that this user is a group administrator.
-#: actions/groupmembers.php:190
+#: actions/groupmembers.php:190 lib/action.php:581
 msgid "Admin"
 msgstr "Administranto"
 
@@ -3122,8 +3173,10 @@ msgid "Group search"
 msgstr "Grup-serĉo"
 
 #. TRANS: Text on page where groups can be searched if no results were found for a query.
-#: actions/groupsearch.php:82 actions/noticesearch.php:117
-#: actions/peoplesearch.php:83
+#. TRANS: Text for notice search results is the query had no results.
+#. TRANS: Message on the "People search" page where a query has no results.
+#: actions/groupsearch.php:82 actions/noticesearch.php:122
+#: actions/peoplesearch.php:87
 msgid "No results."
 msgstr "Neniu rezulto."
 
@@ -3160,166 +3213,169 @@ msgid "User is not blocked from group."
 msgstr "La uzanto ne estas blokita de grupo."
 
 #. TRANS: Server error displayed when unblocking a user from a group fails because of an unknown error.
+#. TRANS: Server error displayed when removing a user block.
 #: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "Eraro ĉe provo malbloki."
 
 #. TRANS: Title for Instant Messaging settings.
-#: actions/imsettings.php:58
+#: actions/imsettings.php:56
 msgid "IM settings"
 msgstr "Tujmesaĝila agordo."
 
 #. 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.
-#: actions/imsettings.php:71
+#: actions/imsettings.php:69
 #, fuzzy, php-format
 msgid ""
-"You can send and receive notices through Jabber/Google Talk [instant "
-"messages](%%doc.im%%). Configure your address and settings below."
+"You can send and receive notices through instant messaging [instant messages]"
+"(%%doc.im%%). Configure your addresses and settings below."
 msgstr ""
 "Vi povas sendi kaj ricevi avizojn per Jabber/GTalk-[tujmesaĝiloj](%%doc.im%"
 "%). Jen agordu vian adreson kaj ceteron."
 
-#. TRANS: Message given in the Instant Messaging settings if XMPP is not enabled on the site.
+#. TRANS: Message given in the IM settings if IM is not enabled on the site.
 #: actions/imsettings.php:90
 msgid "IM is not available."
 msgstr "Tujmesaĝilo ne estas disponebla."
 
-#. TRANS: Form legend for Instant Messaging settings form.
-#. TRANS: Field label for Instant Messaging address input in Instant Messaging settings form.
-#: actions/imsettings.php:102 actions/imsettings.php:132
-msgid "IM address"
-msgstr "Tujmesaĝila adreso"
+#: actions/imsettings.php:116
+#, fuzzy, php-format
+msgid "Current confirmed %s address."
+msgstr "Nuna konfirmita retpoŝtadreso."
 
-#: actions/imsettings.php:109
-#, fuzzy
-msgid "Current confirmed Jabber/Google Talk address."
-msgstr "Nuna konfirmita Jabber/GTalk-adreso."
-
-#. TRANS: Form note in Instant Messaging settings form.
-#. TRANS: %s is the Instant Messaging address set for the site.
-#: actions/imsettings.php:120
+#. TRANS: Form note in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:128
 #, fuzzy, php-format
 msgid ""
-"Awaiting confirmation on this address. Check your Jabber/Google Talk account "
-"for a message with further instructions. (Did you add %s to your buddy list?)"
+"Awaiting confirmation on this address. Check your %s account for a message "
+"with further instructions. (Did you add %s to your buddy list?)"
 msgstr ""
 "Atendante konfirmon por la adreso. Kontrolu vian Jabber/GTalk-konton por "
 "mesaĝo kun pli da gvido. (Ĉu vi aldonis %s al via amikolisto?)"
 
-#. TRANS: IM address input field instructions in Instant Messaging settings form.
-#. TRANS: %s is the Instant Messaging address set for the site.
-#. TRANS: Do not translate "example.org". It is one of the domain names reserved for use in examples by
-#. TRANS: http://www.rfc-editor.org/rfc/rfc2606.txt. Any other domain may be owned by a legitimate
-#. TRANS: person or organization.
-#: actions/imsettings.php:139
-#, fuzzy, php-format
-msgid ""
-"Jabber or Google Talk address, like \"UserName@example.org\". First, make "
-"sure to add %s to your buddy list in your IM client or on Google Talk."
-msgstr ""
-"Jabber/GTalk-adreso, ekzemple \"UserName@example.org\". Unue, certe aldonu %"
-"s al via amikolisto je via tujmesaĝilo-kliento aŭ je GTalk."
+#: actions/imsettings.php:140
+msgid "IM address"
+msgstr "Tujmesaĝila adreso"
 
-#. TRANS: Form legend for Instant Messaging preferences form.
-#: actions/imsettings.php:154
-msgid "IM preferences"
+#: actions/imsettings.php:142
+#, php-format
+msgid "%s screenname."
+msgstr ""
+
+#. TRANS: Header for IM preferences form.
+#: actions/imsettings.php:163
+#, fuzzy
+msgid "IM Preferences"
 msgstr "Tujmesaĝilaj preferoj"
 
-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:159
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:174
 #, fuzzy
-msgid "Send me notices through Jabber/Google Talk."
-msgstr "Sendu al mi avizojn per Jabber/GTalk."
+msgid "Send me notices"
+msgstr "Sendi avizon"
 
-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:165
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:176
 #, fuzzy
-msgid "Post a notice when my Jabber/Google Talk status changes."
+msgid "Post a notice when my status changes."
 msgstr "Afiŝu avizon tiam, kiam mia Jabber/GTalk-stato ŝanĝiĝas."
 
-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:171
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:178
 #, fuzzy
-msgid ""
-"Send me replies through Jabber/Google Talk from people I'm not subscribed to."
+msgid "Send me replies from people I'm not subscribed to."
 msgstr ""
 "Sendu al mi per Jabber/GTalk respondojn de personoj, kiujn mi ne abonas."
 
-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:178
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:181
 #, fuzzy
-msgid "Publish a MicroID for my Jabber/Google Talk address."
-msgstr "Publikigu MikroID por mia Jabber/GTalk-adreso."
+msgid "Publish a MicroID"
+msgstr "Publikigi MikroID por mia retpoŝtadreso."
 
-#. TRANS: Confirmation message for successful Instant Messaging preferences save.
-#: actions/imsettings.php:283 actions/othersettings.php:192
+#. TRANS: Server error thrown on database error updating IM preferences.
+#: actions/imsettings.php:291
+#, fuzzy
+msgid "Couldn't update IM preferences."
+msgstr "Malsukcesis ĝisdatigi uzanton"
+
+#. TRANS: Confirmation message for successful IM preferences save.
+#. TRANS: Confirmation message after saving preferences.
+#: actions/imsettings.php:298 actions/urlsettings.php:244
 msgid "Preferences saved."
 msgstr "Prefero konservita."
 
-#. TRANS: Message given saving Instant Messaging address without having provided one.
-#: actions/imsettings.php:304
-msgid "No Jabber ID."
-msgstr "Mankas Jabber-ID."
-
-#. TRANS: Message given saving Instant Messaging address that cannot be normalised.
-#: actions/imsettings.php:312
+#. TRANS: Message given saving IM address without having provided one.
+#: actions/imsettings.php:320
 #, fuzzy
-msgid "Cannot normalize that Jabber ID."
+msgid "No screenname."
+msgstr "Neniu kromnomo."
+
+#: actions/imsettings.php:325
+#, fuzzy
+msgid "No transport."
+msgstr "Ne estas avizo."
+
+#. TRANS: Message given saving IM address that cannot be normalised.
+#: actions/imsettings.php:333
+#, fuzzy
+msgid "Cannot normalize that screenname"
 msgstr "Malsukcesis normigi la Jabber-ID"
 
-#. TRANS: Message given saving Instant Messaging address that not valid.
-#: actions/imsettings.php:317
+#. TRANS: Message given saving IM address that not valid.
+#: actions/imsettings.php:340
 #, fuzzy
-msgid "Not a valid Jabber ID."
-msgstr "Tio ne estas valida Jabber-ID"
+msgid "Not a valid screenname"
+msgstr "Ne valida kromnomo."
 
-#. TRANS: Message given saving Instant Messaging address that is already set.
-#: actions/imsettings.php:321
-msgid "That is already your Jabber ID."
-msgstr "Tio estas jam via Jabber-ID."
-
-#. TRANS: Message given saving Instant Messaging address that is already set for another user.
-#: actions/imsettings.php:325
-msgid "Jabber ID already belongs to another user."
+#. TRANS: Message given saving IM address that is already set for another user.
+#: actions/imsettings.php:344
+#, fuzzy
+msgid "Screenname already belongs to another user."
 msgstr "Jabber-ID jam apartenas al alia uzanto."
 
-#. TRANS: Message given saving valid Instant Messaging address that is to be confirmed.
-#. TRANS: %s is the Instant Messaging address set for the site.
-#: actions/imsettings.php:353
-#, php-format
-msgid ""
-"A confirmation code was sent to the IM address you added. You must approve %"
-"s for sending messages to you."
+#. TRANS: Message given saving valid IM address that is to be confirmed.
+#: actions/imsettings.php:369
+#, fuzzy
+msgid "A confirmation code was sent to the IM address you added."
 msgstr ""
 "Konfirmo-kodo senditas al la tujmesaĝila adreso aldonita. Vi devas permesi "
 "al %s sendi mesaĝojn al vi."
 
-#. TRANS: Message given canceling Instant Messaging address confirmation for the wrong IM address.
-#: actions/imsettings.php:382
+#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#: actions/imsettings.php:396
 msgid "That is the wrong IM address."
 msgstr "Tiu tujmesaĝila adreso estas malĝusta."
 
-#. TRANS: Server error thrown on database error canceling Instant Messaging address confirmation.
-#: actions/imsettings.php:391
+#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#: actions/imsettings.php:405
 #, fuzzy
-msgid "Could not delete IM confirmation."
+msgid "Couldn't delete confirmation."
 msgstr "Malsukcesis forigi tujmesaĝila agordo."
 
-#. TRANS: Message given after successfully canceling Instant Messaging address confirmation.
-#: actions/imsettings.php:396
+#. TRANS: Message given after successfully canceling IM address confirmation.
+#: actions/imsettings.php:410
 msgid "IM confirmation cancelled."
 msgstr "Tujmesaĝila konfirmo nuligita."
 
-#. TRANS: Message given trying to remove an Instant Messaging address that is not
+#. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.
-#: actions/imsettings.php:417
-msgid "That is not your Jabber ID."
-msgstr "Tio ne estas via Jabber-ID."
+#: actions/imsettings.php:434
+#, fuzzy
+msgid "That is not your screenname."
+msgstr "Tio ne estas via telefonnumero."
+
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#: actions/imsettings.php:443
+#, fuzzy
+msgid "Couldn't update user im prefs."
+msgstr "Malsukcesis ĝisdatigi uzantan informon."
 
 #. TRANS: Message given after successfully removing a registered Instant Messaging address.
-#: actions/imsettings.php:440
+#: actions/imsettings.php:451
 msgid "The IM address was removed."
 msgstr "La tujmesaĝila adreso estas forigita."
 
@@ -3531,7 +3587,7 @@ msgid "You must be logged in to join a group."
 msgstr "Ensalutu por aniĝi al grupo."
 
 #. TRANS: Title for join group page after joining.
-#: actions/joingroup.php:147
+#: actions/joingroup.php:148
 #, fuzzy, php-format
 msgctxt "TITLE"
 msgid "%1$s joined group %2$s"
@@ -3659,7 +3715,7 @@ msgstr ""
 #. TRANS: Submit button title.
 #: actions/licenseadminpanel.php:311 actions/sessionsadminpanel.php:199
 #: actions/siteadminpanel.php:292 actions/snapshotadminpanel.php:245
-#: actions/tagother.php:154 lib/applicationeditform.php:357
+#: actions/tagother.php:133 lib/applicationeditform.php:357
 msgid "Save"
 msgstr "Konservi"
 
@@ -3667,39 +3723,41 @@ msgstr "Konservi"
 msgid "Save license settings"
 msgstr ""
 
-#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
+#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
+#: actions/login.php:97 actions/otp.php:62 actions/register.php:130
 msgid "Already logged in."
 msgstr "Vi jam ensalutis."
 
-#: actions/login.php:148
+#: actions/login.php:125
 msgid "Incorrect username or password."
 msgstr "Malĝusta uzantnomo aŭ pasvorto."
 
-#: actions/login.php:154 actions/otp.php:120
+#. TRANS: Server error displayed when a user object could not be created trying to login using "one time password login".
+#: actions/login.php:131 actions/otp.php:127
 msgid "Error setting user. You are probably not authorized."
 msgstr "Eraras agordi uzanton. Vi verŝajne ne rajtiĝas."
 
-#: actions/login.php:210 actions/login.php:263
+#: actions/login.php:185 actions/login.php:236 lib/action.php:598
 msgid "Login"
 msgstr "Ensaluti"
 
-#: actions/login.php:249
+#: actions/login.php:222
 msgid "Login to site"
 msgstr "Ensaluti al la retejo"
 
-#: actions/login.php:258 actions/register.php:490
+#: actions/login.php:231 actions/register.php:469
 msgid "Remember me"
 msgstr "Memoru min"
 
-#: actions/login.php:259 actions/register.php:492
+#: actions/login.php:232 actions/register.php:471
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "Aŭtomate ensaluti estonte; ne taŭge por komuna komputilo!"
 
-#: actions/login.php:269
+#: actions/login.php:241
 msgid "Lost or forgotten password?"
 msgstr "Ĉi via pasvorto perdiĝas?"
 
-#: actions/login.php:288
+#: actions/login.php:259
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -3707,11 +3765,11 @@ msgstr ""
 "Por sekureca kialo, bonvole re-entajpi vian uzantnomon kaj pasvorton antaŭ "
 "ŝanĝi vian agordon."
 
-#: actions/login.php:292
+#: actions/login.php:263
 msgid "Login with your username and password."
 msgstr "Ensaluti per via uzantnomo kaj pasvorto."
 
-#: actions/login.php:295
+#: actions/login.php:266
 #, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -3837,7 +3895,9 @@ msgstr "Nova avizo"
 msgid "Notice posted"
 msgstr "Avizo afiŝiĝas"
 
-#: actions/noticesearch.php:68
+#. TRANS: Instructions for Notice search page.
+#. TRANS: %%site.name%% is the name of the StatusNet site.
+#: actions/noticesearch.php:69
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -3846,16 +3906,21 @@ msgstr ""
 "Serĉi avizon ĉe %%site.name%% per ĝia enhavo. Dividu serĉvortojn per spaco; "
 "ili estu almenaŭ 3 literojn longaj."
 
-#: actions/noticesearch.php:78
+#. TRANS: Title of the page where users can search for notices.
+#: actions/noticesearch.php:80
 msgid "Text search"
 msgstr "Teksta serĉado"
 
-#: actions/noticesearch.php:91
+#. TRANS: Test in RSS notice search.
+#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
+#: actions/noticesearch.php:95
 #, php-format
 msgid "Search results for \"%1$s\" on %2$s"
 msgstr "Trovito per \"%1$s\" ĉe %2$s"
 
-#: actions/noticesearch.php:121
+#. TRANS: Text for logged in users making a query for notices without results.
+#. TRANS: This message contains a Markdown link.
+#: actions/noticesearch.php:128
 #, php-format
 msgid ""
 "Be the first to [post on this topic](%%%%action.newnotice%%%%?"
@@ -3864,7 +3929,9 @@ msgstr ""
 "Estu la unua [afiŝi pri la temo](%%%%action.newnotice%%%%?status_textarea=%"
 "s)!"
 
-#: actions/noticesearch.php:124
+#. TRANS: Text for not logged in users making a query for notices without results.
+#. TRANS: This message contains Markdown links.
+#: actions/noticesearch.php:133
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and be the first to "
@@ -3873,14 +3940,17 @@ msgstr ""
 "Kial ne [krei konton](%%%%action.register%%%%) kaj esti la unua [afiŝi pri "
 "la temo](%%%%action.newnotice%%%%?status_textarea=%s)!"
 
-#: actions/noticesearchrss.php:96
+#. TRANS: RSS notice search feed title. %s is the query.
+#: actions/noticesearchrss.php:95
 #, php-format
 msgid "Updates with \"%s\""
 msgstr "Ĝisdatiĝo enhavante \"%s\""
 
-#: actions/noticesearchrss.php:98
+#. TRANS: RSS notice search feed description.
+#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
+#: actions/noticesearchrss.php:99
 #, fuzzy, php-format
-msgid "Updates matching search term \"%1$s\" on %2$s!"
+msgid "Updates matching search term \"%1$s\" on %2$s."
 msgstr "Ĝisdatiĝo kongruanta al serĉvorto \"%1$s\" ĉe %2$s!"
 
 #: actions/nudge.php:85
@@ -3901,51 +3971,51 @@ msgid "Nudge sent!"
 msgstr "Puŝeto sendiĝis!"
 
 #. TRANS: Message displayed to an anonymous user trying to view OAuth application list.
-#: actions/oauthappssettings.php:60
+#: actions/oauthappssettings.php:57
 msgid "You must be logged in to list your applications."
 msgstr "Ensalutu por listigi viajn aplikaĵojn."
 
 #. TRANS: Page title for OAuth applications
-#: actions/oauthappssettings.php:76
+#: actions/oauthappssettings.php:73
 msgid "OAuth applications"
 msgstr "OAuth aplikoj"
 
 #. TRANS: Page instructions for OAuth applications
-#: actions/oauthappssettings.php:88
+#: actions/oauthappssettings.php:85
 msgid "Applications you have registered"
 msgstr "Aplikoj kiujn vi enskribis"
 
 #. TRANS: Empty list message on page with OAuth applications.
-#: actions/oauthappssettings.php:141
+#: actions/oauthappssettings.php:138
 #, php-format
 msgid "You have not registered any applications yet."
 msgstr "Vi ankoraŭ neniun aplikaĵon registris."
 
 #. TRANS: Title for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:71
+#: actions/oauthconnectionssettings.php:69
 msgid "Connected applications"
 msgstr "Konektita aplikaĵo"
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:83
+#: actions/oauthconnectionssettings.php:80
 msgid "The following connections exist for your account."
 msgstr ""
 
 #. TRANS: Client error when trying to revoke access for an application while not being a user of it.
-#: actions/oauthconnectionssettings.php:168
+#: actions/oauthconnectionssettings.php:165
 msgid "You are not a user of that application."
 msgstr "Mi ne estas uzanto de tiu aplikaĵo."
 
 #. TRANS: Client error when revoking access has failed for some reason.
 #. TRANS: %s is the application ID revoking access failed for.
-#: actions/oauthconnectionssettings.php:183
+#: actions/oauthconnectionssettings.php:180
 #, fuzzy, php-format
 msgid "Unable to revoke access for application: %s."
 msgstr "Maleble revoki aliradon al aplikaĵo: %s."
 
 #. TRANS: Success message after revoking access for an application.
 #. TRANS: %1$s is the application name, %2$s is the first part of the user token.
-#: actions/oauthconnectionssettings.php:202
+#: actions/oauthconnectionssettings.php:199
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -3953,20 +4023,30 @@ msgid ""
 msgstr ""
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:213
+#: actions/oauthconnectionssettings.php:210
 msgid "You have not authorized any applications to use your account."
 msgstr "Vi ne rajtigis iun ajn aplikaĵon uzi vian konton."
 
 #. TRANS: Note for developers in the OAuth connection settings form.
 #. TRANS: This message contains a Markdown link. Do not separate "](".
 #. TRANS: %s is the URL to the OAuth settings.
-#: actions/oauthconnectionssettings.php:233
+#: actions/oauthconnectionssettings.php:230
 #, php-format
 msgid ""
 "Are you a developer? [Register an OAuth client application](%s) to use with "
 "this instance of StatusNet."
 msgstr ""
 
+#: actions/oembed.php:64
+#, fuzzy, php-format
+msgid "\"%s\" not found."
+msgstr "Metodo de API ne troviĝas."
+
+#: actions/oembed.php:76
+#, fuzzy, php-format
+msgid "Notice %s not found."
+msgstr "Metodo de API ne troviĝas."
+
 #: actions/oembed.php:80 actions/shownotice.php:100
 msgid "Notice has no profile."
 msgstr "Avizo sen profilo"
@@ -3976,6 +4056,16 @@ msgstr "Avizo sen profilo"
 msgid "%1$s's status on %2$s"
 msgstr "Stato de %1$s ĉe %2$s"
 
+#: actions/oembed.php:95
+#, fuzzy, php-format
+msgid "Attachment %s not found."
+msgstr "Ricevonta uzanto ne troviĝas."
+
+#: actions/oembed.php:136
+#, php-format
+msgid "\"%s\" not supported for oembed requests."
+msgstr ""
+
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
 #: actions/oembed.php:168
 #, php-format
@@ -3989,94 +4079,60 @@ msgid "Only %s URLs over plain HTTP please."
 msgstr "Bonvolu, nur %s-URL per plata HTTP."
 
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1205
-#: lib/apiaction.php:1232 lib/apiaction.php:1367
+#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1207
+#: lib/apiaction.php:1234 lib/apiaction.php:1369
 msgid "Not a supported data format."
 msgstr "Datumformato ne subteniĝas."
 
+#. TRANS: ShortName in the OpenSearch interface when trying to find users.
 #: actions/opensearch.php:64
 msgid "People Search"
 msgstr "Homserĉo"
 
-#: actions/opensearch.php:67
+#: actions/opensearch.php:68
 msgid "Notice Search"
 msgstr "Avizoserĉo"
 
-#: actions/othersettings.php:59
-msgid "Other settings"
-msgstr "Aliaj agordoj"
-
-#. TRANS: Instructions for tab "Other" in user profile settings.
-#: actions/othersettings.php:71
-msgid "Manage various other options."
-msgstr "Agordi diversajn aliajn elektojn."
-
-#. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
-#. TRANS: user's profile settings. Use of "free" is as in "open", indicating that the
-#. TRANS: information on the shortener site is freely distributable.
-#. TRANS: This message has one space at the beginning. Use your language's word separator
-#. TRANS: here if it has one (most likely a single space).
-#: actions/othersettings.php:113
-msgid " (free service)"
-msgstr " (libera servo)"
-
-#. TRANS: Label for dropdown with URL shortener services.
-#: actions/othersettings.php:122
-msgid "Shorten URLs with"
-msgstr "Mallongigu URLojn per"
-
-#. TRANS: Tooltip for for dropdown with URL shortener services.
-#: actions/othersettings.php:124
-msgid "Automatic shortening service to use."
-msgstr "Uzota aŭtomata mallongigad-servo."
-
-#. TRANS: Label for checkbox.
-#: actions/othersettings.php:130
-msgid "View profile designs"
-msgstr "Vidi profilo-desegnon"
-
-#. TRANS: Tooltip for checkbox.
-#: actions/othersettings.php:132
-msgid "Show or hide profile designs."
-msgstr "Montri aŭ kaŝi profilo-desegnon."
-
-#. TRANS: Form validation error for form "Other settings" in user profile.
-#: actions/othersettings.php:164
-#, fuzzy
-msgid "URL shortening service is too long (maximum 50 characters)."
-msgstr "URL-mallongigado-servo tro longas (maksimume 50 literojn)."
-
-#: actions/otp.php:69
+#. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
+#: actions/otp.php:70
 msgid "No user ID specified."
 msgstr "Neniu uzanto-ID specifiĝas."
 
-#: actions/otp.php:83
+#. TRANS: Client error displayed trying to use "one time password login" without specifying a login token.
+#: actions/otp.php:86
 msgid "No login token specified."
 msgstr "Neniu ensalutado-ĵetono specifiĝas."
 
-#: actions/otp.php:90
+#. TRANS: Client error displayed trying to use "one time password login" without requesting a login token.
+#: actions/otp.php:94
 msgid "No login token requested."
 msgstr "Neniu ensalutad-ĵetono bezoniĝas."
 
-#: actions/otp.php:95
+#. TRANS: Client error displayed trying to use "one time password login" while specifying an invalid login token.
+#: actions/otp.php:100
 msgid "Invalid login token specified."
 msgstr "Specifita ensalutado-ĵetono nevalidas."
 
-#: actions/otp.php:104
+#. TRANS: Client error displayed trying to use "one time password login" while specifying an expired login token.
+#: actions/otp.php:110
 msgid "Login token expired."
 msgstr "Ensalutado-ĵetono eksvalidiĝas."
 
-#: actions/outbox.php:58
+#. TRANS: Title for outbox for any but the fist page.
+#. TRANS: %1$s is the user nickname, %2$d is the page number.
+#: actions/outbox.php:57
 #, php-format
 msgid "Outbox for %1$s - page %2$d"
 msgstr "elirkesto de %1$s - paĝo %2$d"
 
+#. TRANS: Title for first page of outbox.
 #: actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
 msgstr "Elirkesto de %s"
 
-#: actions/outbox.php:104
+#. TRANS: Instructions for outbox.
+#: actions/outbox.php:103
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr ""
 "Tio ĉi estas via elirkesto, kie listiĝas privataj mesaĝoj, kiujn vi sendis."
@@ -4103,43 +4159,45 @@ msgstr "Malnova pasvorto"
 msgid "New password"
 msgstr "Nova pasvorto"
 
-#: actions/passwordsettings.php:109
+#: actions/passwordsettings.php:109 actions/register.php:416
 #, fuzzy
-msgid "6 or more characters"
+msgid "6 or more characters."
 msgstr "6 aŭ pli da literoj"
 
-#: actions/passwordsettings.php:113
+#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#: actions/passwordsettings.php:113 actions/recoverpassword.php:264
+#: actions/register.php:420
 #, fuzzy
-msgid "Same as password above"
+msgid "Same as password above."
 msgstr "Same kiel pasvorto supra"
 
 #: actions/passwordsettings.php:117
 msgid "Change"
 msgstr "Ŝanĝi"
 
-#: actions/passwordsettings.php:154 actions/register.php:238
+#: actions/passwordsettings.php:153 actions/register.php:223
 msgid "Password must be 6 or more characters."
 msgstr "Pasvorto devas esti 6-litera aŭ pli longa."
 
-#: actions/passwordsettings.php:157 actions/register.php:241
+#: actions/passwordsettings.php:156 actions/register.php:226
 msgid "Passwords don't match."
 msgstr "La pasvortoj diferencas."
 
-#: actions/passwordsettings.php:165
+#: actions/passwordsettings.php:164
 msgid "Incorrect old password"
 msgstr "Neĝusta malnova pasvorto"
 
-#: actions/passwordsettings.php:181
+#: actions/passwordsettings.php:180
 msgid "Error saving user; invalid."
 msgstr "Eraris konservi uzanton: nevalida."
 
-#: actions/passwordsettings.php:186
+#. TRANS: Reset password form validation error message.
+#: actions/passwordsettings.php:185 actions/recoverpassword.php:418
 #, fuzzy
-msgid "Can't save new password."
+msgid "Cannot save new password."
 msgstr "Malsukcesis konservi novan pasvorton."
 
-#. TRANS: Title for password recovery page in password saved mode.
-#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
+#: actions/passwordsettings.php:191
 msgid "Password saved."
 msgstr "Pasvorto konservitas."
 
@@ -4345,8 +4403,7 @@ msgid "Directory where backgrounds are located."
 msgstr "Dosierujo kie fonoj estas."
 
 #. TRANS: Fieldset legens in Paths admin panel.
-#. TRANS: DT element label in attachment list.
-#: actions/pathsadminpanel.php:419 lib/attachmentlist.php:98
+#: actions/pathsadminpanel.php:419
 msgid "Attachments"
 msgstr "Aldonaĵo"
 
@@ -4414,7 +4471,9 @@ msgstr "Servilo, kien direkti \"SSL\"-petojn"
 msgid "Save paths"
 msgstr "Konservu lokigilon"
 
-#: actions/peoplesearch.php:52
+#. TRANS: Instructions for the "People search" page.
+#. TRANS: %%site.name%% is the name of the StatusNet site.
+#: actions/peoplesearch.php:54
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
@@ -4423,7 +4482,8 @@ msgstr ""
 "Serĉi personon ĉe %%site.name%% per ĝia nomo, loko, aŭ intereso. Dividu "
 "serĉvortojn per spacoj; ili estu almenaŭ 3 literojn longaj."
 
-#: actions/peoplesearch.php:58
+#. TRANS: Title of a page where users can search for other users.
+#: actions/peoplesearch.php:61
 msgid "People search"
 msgstr "Persona serĉado"
 
@@ -4437,6 +4497,60 @@ msgstr "Ne valida persona markilo: %s."
 msgid "Users self-tagged with %1$s - page %2$d"
 msgstr "Uzantoj sinmarkitaj per %1$s - paĝo %2$d"
 
+#. TRANS: Page title for AJAX form return when a disabling a plugin.
+#: actions/plugindisable.php:69
+msgctxt "plugin"
+msgid "Disabled"
+msgstr ""
+
+#. TRANS: Client error displayed trying to perform any request method other than POST.
+#. TRANS: Do not translate POST.
+#: actions/pluginenable.php:78 actions/subscribe.php:77
+msgid "This action only accepts POST requests."
+msgstr "La ago akceptas nur POST-an peton."
+
+#: actions/pluginenable.php:102
+#, fuzzy
+msgid "You cannot administer plugins."
+msgstr "Vi ne povas forigi uzantojn."
+
+#: actions/pluginenable.php:109
+#, fuzzy
+msgid "No such plugin."
+msgstr "Ne estas tiu paĝo."
+
+#. TRANS: Page title for AJAX form return when enabling a plugin.
+#: actions/pluginenable.php:159
+msgctxt "plugin"
+msgid "Enabled"
+msgstr ""
+
+#. TRANS: Tab and title for plugins admin panel.
+#. TRANS: Menu item for site administration
+#: actions/pluginsadminpanel.php:56 actions/version.php:191
+#: lib/adminpanelaction.php:411
+msgid "Plugins"
+msgstr "Kromprogramo"
+
+#. TRANS: Instructions at top of plugin admin page.
+#: actions/pluginsadminpanel.php:68
+msgid ""
+"Additional plugins can be enabled and configured manually. See the <a href="
+"\"http://status.net/wiki/Plugins\">online plugin documentation</a> for more "
+"details."
+msgstr ""
+
+#. TRANS: Admin form section header
+#: actions/pluginsadminpanel.php:84
+#, fuzzy
+msgid "Default plugins"
+msgstr "Defaŭlta lingvo"
+
+#: actions/pluginsadminpanel.php:106
+msgid ""
+"All default plugins have been disabled from the site's configuration file."
+msgstr ""
+
 #: actions/postnotice.php:95
 msgid "Invalid notice content."
 msgstr "Nevalida avizo-enhavo"
@@ -4447,12 +4561,12 @@ msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’.
 msgstr "Aviza permesilo ‘%1$s’ ne konformas al reteja permesilo ‘%2$s’."
 
 #. TRANS: Page title for profile settings.
-#: actions/profilesettings.php:59
+#: actions/profilesettings.php:60
 msgid "Profile settings"
 msgstr "Profila agordo"
 
 #. TRANS: Usage instructions for profile settings.
-#: actions/profilesettings.php:70
+#: actions/profilesettings.php:71
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
@@ -4460,34 +4574,31 @@ msgstr ""
 "vi."
 
 #. TRANS: Profile settings form legend.
-#: actions/profilesettings.php:98
+#: actions/profilesettings.php:99
 msgid "Profile information"
 msgstr "Profila informo"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109 actions/register.php:433
+#: actions/profilesettings.php:110 actions/register.php:412
 #, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr "1-64 minusklaj literoj aŭ ciferoj, neniu interpunkcio aŭ spaco"
 
 #. TRANS: Field label in form for profile settings.
-#. TRANS: Label for full group name (dt). Text hidden by default.
-#. TRANS: DT for full name in a profile.
-#: actions/profilesettings.php:113 actions/register.php:455
-#: actions/showgroup.php:255 actions/tagother.php:104
-#: lib/groupeditform.php:150 lib/userprofile.php:156
+#: actions/profilesettings.php:114 actions/register.php:434
+#: lib/groupeditform.php:150
 msgid "Full name"
 msgstr "Plena nomo"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:118 actions/register.php:460
+#: actions/profilesettings.php:119 actions/register.php:439
 #: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "Hejmpaĝo"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:121
+#: actions/profilesettings.php:122 actions/register.php:441
 #, fuzzy
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr "URL de via hejmpaĝo, blogo aŭ profilo ĉe alia retejo"
@@ -4495,7 +4606,7 @@ msgstr "URL de via hejmpaĝo, blogo aŭ profilo ĉe alia retejo"
 #. TRANS: Tooltip for field label in form for profile settings. Plural
 #. TRANS: is decided by the number of characters available for the
 #. TRANS: biography (%d).
-#: actions/profilesettings.php:129 actions/register.php:471
+#: actions/profilesettings.php:130 actions/register.php:450
 #, fuzzy, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4503,85 +4614,81 @@ msgstr[0] "Priskribu vin mem kaj viajn ŝatokupojn per ne pli ol %d signoj"
 msgstr[1] "Priskribu vin mem kaj viajn ŝatokupojn per ne pli ol %d signoj"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:135 actions/register.php:476
+#: actions/profilesettings.php:136 actions/register.php:455
 msgid "Describe yourself and your interests"
 msgstr "Priskribu vin mem kaj viajn ŝatokupojn"
 
 #. TRANS: Text area label in form for profile settings where users can provide.
 #. TRANS: their biography.
-#: actions/profilesettings.php:139 actions/register.php:478
+#: actions/profilesettings.php:140 actions/register.php:457
 msgid "Bio"
 msgstr "Biografio"
 
 #. TRANS: Field label in form for profile settings.
-#. TRANS: Label for group location (dt). Text hidden by default.
-#. TRANS: DT for location in a profile.
-#: actions/profilesettings.php:145 actions/register.php:483
-#: actions/showgroup.php:265 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:173
-#: lib/userprofile.php:172
+#: actions/profilesettings.php:146 actions/register.php:462
+#: lib/groupeditform.php:173
 msgid "Location"
 msgstr "Loko"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148 actions/register.php:485
+#: actions/profilesettings.php:149
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Kie vi estas, ekzemple \"Urbo, Ŝtato (aŭ Regiono), Lando\""
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:153
+#: actions/profilesettings.php:154
 msgid "Share my current location when posting notices"
 msgstr "Sciigu mian nunan lokon, kiam mi sendas avizon."
 
 #. TRANS: Field label in form for profile settings.
-#. TRANS: DT for tags in a profile.
-#: actions/profilesettings.php:161 actions/tagother.php:149
-#: actions/tagother.php:209 lib/subscriptionlist.php:106
-#: lib/subscriptionlist.php:108 lib/userprofile.php:220
+#: actions/profilesettings.php:162 actions/tagother.php:128
+#: actions/tagother.php:188 lib/subscriptionlist.php:104
+#: lib/subscriptionlist.php:106
 msgid "Tags"
 msgstr "Markiloj"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:164
+#: actions/profilesettings.php:165
 #, fuzzy
 msgid ""
-"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- "
+"separated."
 msgstr ""
 "Markiloj por vi mem (literoj, ciferoj, \"-\", \".\", kaj \"_\"), dividite "
 "per komoj aŭ spacoj"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:169
+#: actions/profilesettings.php:170
 msgid "Language"
 msgstr "Lingvo"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:171
+#: actions/profilesettings.php:172
 #, fuzzy
-msgid "Preferred language"
+msgid "Preferred language."
 msgstr "Preferata lingvo"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:181
+#: actions/profilesettings.php:182
 msgid "Timezone"
 msgstr "Horzono"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:183
+#: actions/profilesettings.php:184
 msgid "What timezone are you normally in?"
 msgstr "En kiu horzono vi kutime troviĝas?"
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:189
+#: actions/profilesettings.php:190
 #, fuzzy
 msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)"
+"Automatically subscribe to whoever subscribes to me (best for non-humans)."
 msgstr "Aŭtomate aboni iun ajn, kiu abonas min (prefereble por ne-homoj)"
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Plural form is used based on the maximum number of allowed
 #. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:258 actions/register.php:229
+#: actions/profilesettings.php:259 actions/register.php:214
 #, fuzzy, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4589,50 +4696,50 @@ msgstr[0] "Biografio tro longas (maksimume %d literoj)"
 msgstr[1] "Biografio tro longas (maksimume %d literoj)"
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:269 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:270 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr "Horzono ne elektita"
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:277
+#: actions/profilesettings.php:278
 #, fuzzy
 msgid "Language is too long (maximum 50 characters)."
 msgstr "Lingvo tro longas (maksimume 50 literoj)"
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:291 actions/tagother.php:178
-#, php-format
-msgid "Invalid tag: \"%s\""
+#: actions/profilesettings.php:292
+#, fuzzy, php-format
+msgid "Invalid tag: \"%s\"."
 msgstr "Nevalida markilo: \"%s\""
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:347
+#: actions/profilesettings.php:348
 #, fuzzy
 msgid "Could not update user for autosubscribe."
 msgstr "Malsukcesis ĝisdatigi uzanton por aŭtomatabonado."
 
 #. TRANS: Server error thrown when user profile location preference settings could not be updated.
-#: actions/profilesettings.php:405
+#: actions/profilesettings.php:406
 #, fuzzy
 msgid "Could not save location prefs."
 msgstr "Malsukcesis konservi lokan preferon."
 
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:427 actions/tagother.php:200
+#: actions/profilesettings.php:428 actions/tagother.php:179
 msgid "Could not save tags."
 msgstr "Malsukcesis konservi etikedojn."
 
 #. TRANS: Confirmation shown when user profile settings are saved.
 #. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:436 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:437 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "Agordo konservitas."
 
 #. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
 #. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:483 actions/restoreaccount.php:60
+#: actions/profilesettings.php:484 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "Krei konton"
@@ -4710,6 +4817,12 @@ msgstr ""
 "blogging) servo surbaze de libera servila programo [StatusNet](http://status."
 "net/)."
 
+#. TRANS: Public RSS feed description. %s is the StatusNet site name.
+#: actions/publicrss.php:106
+#, fuzzy, php-format
+msgid "%s updates from everyone."
+msgstr "%s ĝisdatigoj de ĉiuj!"
+
 #. TRANS: Title for public tag cloud.
 #: actions/publictagcloud.php:57
 msgid "Public tag cloud"
@@ -4748,10 +4861,6 @@ msgid ""
 "one!"
 msgstr "Kial ne [krei konton](%%action.register%%) kaj esti la unua afiŝanto!"
 
-#: actions/publictagcloud.php:146
-msgid "Tag cloud"
-msgstr "Entikedo-nubo"
-
 #. TRANS: Client error displayed trying to recover password while already logged in.
 #: actions/recoverpassword.php:37
 msgid "You are already logged in!"
@@ -4843,6 +4952,12 @@ msgstr "Refari pasvorton"
 msgid "Password recovery requested"
 msgstr "Petiĝas pasvorton rehavado"
 
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/recoverpassword.php:229
+#, fuzzy
+msgid "Password saved"
+msgstr "Pasvorto konservitas."
+
 #. TRANS: Title for password recovery page when an unknown action has been specified.
 #: actions/recoverpassword.php:232
 msgid "Unknown action"
@@ -4854,15 +4969,9 @@ msgstr "Nekonata ago"
 msgid "6 or more characters, and do not forget it!"
 msgstr "Almenaŭ 6 signoj, kaj ne forgesu ĝin!"
 
-#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
-#: actions/recoverpassword.php:264 actions/register.php:441
-#, fuzzy
-msgid "Same as password above."
-msgstr "Same kiel pasvorto supra"
-
 #. TRANS: Button text for password reset form.
 #. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: actions/recoverpassword.php:268 lib/designsettings.php:264
+#: actions/recoverpassword.php:268 lib/designform.php:145
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Reset"
@@ -4913,14 +5022,8 @@ msgstr "Pasvorto devas enhavi 6 signojn aŭ pli."
 msgid "Password and confirmation do not match."
 msgstr "Pasvorto kaj komfirmo ne kongruas."
 
-#. TRANS: Reset password form validation error message.
-#: actions/recoverpassword.php:418
-#, fuzzy
-msgid "Cannot save new password."
-msgstr "Malsukcesis konservi novan pasvorton."
-
 #. TRANS: Server error displayed when something does wrong with the user object during password reset.
-#: actions/recoverpassword.php:426 actions/register.php:256
+#: actions/recoverpassword.php:426 actions/register.php:241
 msgid "Error setting user."
 msgstr "Eraris agordi uzanton."
 
@@ -4929,98 +5032,102 @@ msgstr "Eraris agordi uzanton."
 msgid "New password successfully saved. You are now logged in."
 msgstr "Nova pasvorto sukcese konserviĝas. Vi nun estas ensalutinta."
 
-#: actions/register.php:92 actions/register.php:196 actions/register.php:413
+#: actions/redirecturl.php:70
+#, fuzzy
+msgid "No id parameter"
+msgstr "Neniu ID-argumento"
+
+#: actions/redirecturl.php:76
+#, fuzzy, php-format
+msgid "No such file \"%d\""
+msgstr "Ne ekzistas tia dosiero."
+
+#: actions/register.php:80 actions/register.php:181 actions/register.php:392
 msgid "Sorry, only invited people can register."
 msgstr "Pardonon, nur invito rajtas registri."
 
-#: actions/register.php:99
+#: actions/register.php:87
 msgid "Sorry, invalid invitation code."
 msgstr "Pardonon, nevalida invitkodo."
 
-#: actions/register.php:119
+#: actions/register.php:106
 msgid "Registration successful"
 msgstr "Registriĝo sukcesa"
 
-#: actions/register.php:121 actions/register.php:511
+#: actions/register.php:108 actions/register.php:490
 msgid "Register"
 msgstr "Registri"
 
-#: actions/register.php:142
+#: actions/register.php:128
 msgid "Registration not allowed."
 msgstr "Registriĝo ne permesita."
 
-#: actions/register.php:209
+#: actions/register.php:194
 #, fuzzy
-msgid "You can't register if you don't agree to the license."
+msgid "You cannot register if you don't agree to the license."
 msgstr "Vi ne povas registriĝi, se vi ne konsentas kun la permesilo."
 
-#: actions/register.php:218
+#: actions/register.php:203
 msgid "Email address already exists."
 msgstr "Retpoŝta adreso jam ekzistas."
 
-#: actions/register.php:251 actions/register.php:273
+#: actions/register.php:236 actions/register.php:258
 msgid "Invalid username or password."
 msgstr "Nevalida uzantnomo aŭ pasvorto."
 
-#: actions/register.php:351
+#: actions/register.php:333
 #, fuzzy
 msgid ""
 "With this form you can create a new account. You can then post notices and "
-"link up to friends and colleagues. "
+"link up to friends and colleagues."
 msgstr ""
 "Per tiu ĉi formularo vi povas krei novan konton. Poste povos vi afiŝi avizon "
 "kaj komuniki kun amikoj kaj kolegoj. "
 
-#: actions/register.php:437
-#, fuzzy
-msgid "6 or more characters."
-msgstr "6 aŭ pli da literoj"
-
-#. TRANS: Link description in user account settings menu.
-#: actions/register.php:445 actions/register.php:449
-#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
+#: actions/register.php:424 actions/register.php:428
+#: actions/siteadminpanel.php:238 lib/settingsnav.php:92
 msgid "Email"
 msgstr "Retpoŝto"
 
-#: actions/register.php:446 actions/register.php:450
+#: actions/register.php:425 actions/register.php:429
 #, fuzzy
-msgid "Used only for updates, announcements, and password recovery"
+msgid "Used only for updates, announcements, and password recovery."
 msgstr "Uzu nur por ĝisdatigo, anonco, kaj rehavi pasvorton."
 
-#: actions/register.php:457
+#: actions/register.php:436
 #, fuzzy
-msgid "Longer name, preferably your \"real\" name"
+msgid "Longer name, preferably your \"real\" name."
 msgstr "Pli longa nomo, prefere via \"vera\" nomo."
 
-#: actions/register.php:462
+#: actions/register.php:464
 #, fuzzy
-msgid "URL of your homepage, blog, or profile on another site"
-msgstr "URL de via hejmpaĝo, blogo aŭ profilo ĉe alia retejo"
+msgid "Where you are, like \"City, State (or Region), Country\"."
+msgstr "Kie vi estas, ekzemple \"Urbo, Ŝtato (aŭ Regiono), Lando\""
 
-#: actions/register.php:523
+#: actions/register.php:503
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
 msgstr ""
 "Mi komprenas ke enhavo kaj datumo de %1$s estas privataj kaj sekretigita."
 
-#: actions/register.php:533
+#: actions/register.php:513
 #, php-format
 msgid "My text and files are copyright by %1$s."
 msgstr "Mia teksto kaj dosiero estas aŭtorrajtigita de %1$s."
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:537
+#: actions/register.php:517
 msgid "My text and files remain under my own copyright."
 msgstr "Mia teksto kaj dosiero restu en mia propra aŭtorrajto."
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:540
+#: actions/register.php:520
 msgid "All rights reserved."
 msgstr "Ĉiuj rajtoj rezervitaj."
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:545
+#: actions/register.php:525
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -5029,7 +5136,7 @@ msgstr ""
 "Mia teksto kaj dosiero estas atingebla per %s  krom jene: pasvorto, "
 "retpoŝtadreso, tujmesaĝilo-adreso, kaj telefonnumero."
 
-#: actions/register.php:588
+#: actions/register.php:566
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -5061,7 +5168,7 @@ msgstr ""
 "\n"
 "Dankon pro registriĝo, kaj ni esperas al vi ĝuon de uzi ĉi servon."
 
-#: actions/register.php:612
+#: actions/register.php:590
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5093,7 +5200,7 @@ msgstr "Uzanta alinomo"
 
 #: actions/remotesubscribe.php:129
 #, fuzzy
-msgid "Nickname of the user you want to follow"
+msgid "Nickname of the user you want to follow."
 msgstr "Alnomo de la uzanto, kiun vi volas aboni."
 
 #: actions/remotesubscribe.php:132
@@ -5102,18 +5209,18 @@ msgstr "Profila URL"
 
 #: actions/remotesubscribe.php:133
 #, fuzzy
-msgid "URL of your profile on another compatible microblogging service"
+msgid "URL of your profile on another compatible microblogging service."
 msgstr "URL de via profilo ĉe alia kongrua mikroblogilo-servo"
 
 #. TRANS: Link text for link that will subscribe to a remote profile.
 #: actions/remotesubscribe.php:136 lib/subscribeform.php:139
-#: lib/userprofile.php:431
+#: lib/userprofile.php:402
 msgid "Subscribe"
 msgstr "Aboni"
 
 #: actions/remotesubscribe.php:158
 #, fuzzy
-msgid "Invalid profile URL (bad format)"
+msgid "Invalid profile URL (bad format)."
 msgstr "Nevalida profila URL (fuŝa formato)"
 
 #: actions/remotesubscribe.php:167
@@ -5148,7 +5255,7 @@ msgstr "Vi ne povas ripeti vian propran avizon."
 msgid "You already repeated that notice."
 msgstr "La avizo jam ripetiĝis."
 
-#: actions/repeat.php:112 lib/noticelist.php:692
+#: actions/repeat.php:112 lib/noticelist.php:697
 msgid "Repeated"
 msgstr "Ripetita"
 
@@ -5156,9 +5263,9 @@ msgstr "Ripetita"
 msgid "Repeated!"
 msgstr "Ripetita!"
 
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing @-replies.
+#. TRANS: RSS reply feed title. %s is a user nickname.
 #: actions/replies.php:126 actions/repliesrss.php:68
-#: lib/personalgroupnav.php:109
+#: lib/personalgroupnav.php:105
 #, php-format
 msgid "Replies to %s"
 msgstr "Respondoj al %s"
@@ -5210,9 +5317,11 @@ msgstr ""
 "Vi povas provi  [puŝeti %1$s](../%2$s) aŭ[afiŝi ion al li](%%%%action."
 "newnotice%%%%?status_textarea=%3$s)."
 
-#: actions/repliesrss.php:72
+#. TRANS: RSS reply feed description.
+#. TRANS: %1$s is a user nickname, %2$s is the StatusNet site name.
+#: actions/repliesrss.php:74
 #, fuzzy, php-format
-msgid "Replies to %1$s on %2$s!"
+msgid "Replies to %1$s on %2$s."
 msgstr "Respondoj al %1$s ĉe %2$s!"
 
 #. TRANS: Client exception displayed when trying to restore an account while not logged in.
@@ -5316,7 +5425,7 @@ msgstr "Vi ne rajtas revoki de uzanto rolon ĉe ĉi tiu retejo."
 msgid "User doesn't have this role."
 msgstr "La uzanto ne havas la rolon."
 
-#: actions/rsd.php:146 actions/version.php:159
+#: actions/rsd.php:142 actions/version.php:159
 msgid "StatusNet"
 msgstr "StatusNet"
 
@@ -5358,87 +5467,38 @@ msgstr "Ŝalti sencimigadan eligon por seanco."
 msgid "Save site settings"
 msgstr "Konservi retejan agordon"
 
-#: actions/showapplication.php:82
+#: actions/showapplication.php:78
 msgid "You must be logged in to view an application."
 msgstr "Ensalutu por vidi la aplikaĵon."
 
-#: actions/showapplication.php:157
+#: actions/showapplication.php:151
 msgid "Application profile"
 msgstr "Aplikaĵa profilo"
 
-#. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:159 lib/applicationeditform.php:177
-msgid "Icon"
-msgstr "Bildsimbolo"
-
-#. TRANS: Form input field label for application name.
-#: actions/showapplication.php:169 actions/version.php:197
-#: lib/applicationeditform.php:190
-msgid "Name"
-msgstr "Nomo"
-
-#. TRANS: Form input field label.
-#: actions/showapplication.php:178 lib/applicationeditform.php:227
-msgid "Organization"
-msgstr "Organizaĵo"
-
-#. TRANS: Form input field label.
-#: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:168
-msgid "Description"
-msgstr "Priskribo"
-
-#. TRANS: Header for group statistics on a group page (h2).
-#. TRANS: H2 text for user statistics.
-#: actions/showapplication.php:192 actions/showgroup.php:460
-#: lib/profileaction.php:205
-msgid "Statistics"
-msgstr "Statistiko"
-
-#: actions/showapplication.php:203
+#: actions/showapplication.php:179
 #, php-format
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr "Kreita de %1$s - %2$s defaŭlta aliroj  - %3$d uzantoj"
 
-#: actions/showapplication.php:213
+#: actions/showapplication.php:189
 msgid "Application actions"
 msgstr "Aplikaĵa ago"
 
-#: actions/showapplication.php:236
+#: actions/showapplication.php:212
 msgid "Reset key & secret"
 msgstr "Rekomencigi ŝlosilon & sekreton"
 
 #. TRANS: Title of form for deleting a user.
-#: actions/showapplication.php:252 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:64 lib/noticelist.php:673
+#: actions/showapplication.php:228 lib/deletegroupform.php:121
+#: lib/deleteuserform.php:64 lib/noticelist.php:678
 msgid "Delete"
 msgstr "Forigi"
 
-#: actions/showapplication.php:261
+#: actions/showapplication.php:237
 msgid "Application info"
 msgstr "Aplikaĵa informo"
 
-#: actions/showapplication.php:263
-msgid "Consumer key"
-msgstr "Konsumanta ŝlosilo"
-
-#: actions/showapplication.php:268
-msgid "Consumer secret"
-msgstr "Konsumanta sekreto"
-
-#: actions/showapplication.php:273
-msgid "Request token URL"
-msgstr "Pet-ĵetona URL"
-
-#: actions/showapplication.php:278
-msgid "Access token URL"
-msgstr "Alir-ĵetona URL"
-
-#: actions/showapplication.php:283
-msgid "Authorize URL"
-msgstr "Rajtigi URL"
-
-#: actions/showapplication.php:288
+#: actions/showapplication.php:255
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
@@ -5446,7 +5506,7 @@ msgstr ""
 "Rimarku: Ni subtenas HMAC-SHA1-subskribo. Ni ne subtenas platteksta "
 "subskribado-metodon."
 
-#: actions/showapplication.php:309
+#: actions/showapplication.php:275
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr "Ĉu vi certe volas rekomencigi vian konsumantan ŝlosilon kaj sekreton?"
 
@@ -5530,61 +5590,47 @@ msgstr "Grupo %s"
 msgid "%1$s group, page %2$d"
 msgstr "Grupo %1$s, paĝo %2$d"
 
-#. TRANS: Group profile header (h2). Text hidden by default.
-#: actions/showgroup.php:223
-msgid "Group profile"
-msgstr "Grupa profilo"
-
-#. TRANS: Label for group URL (dt). Text hidden by default.
-#. TRANS: DT for URL in a profile.
-#: actions/showgroup.php:273 actions/tagother.php:118
-#: actions/userauthorization.php:175 lib/userprofile.php:186
-msgid "URL"
-msgstr "URL"
-
 #. TRANS: Label for group description or group note (dt). Text hidden by default.
-#. TRANS: DT for note in a profile.
-#: actions/showgroup.php:285 actions/tagother.php:128
-#: actions/userauthorization.php:187 lib/userprofile.php:204
+#: actions/showgroup.php:266
 msgid "Note"
 msgstr "Noto"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:296 lib/groupeditform.php:180
+#: actions/showgroup.php:277 lib/groupeditform.php:180
 msgid "Aliases"
 msgstr "Alnomo"
 
 #. TRANS: Group actions header (h2). Text hidden by default.
-#: actions/showgroup.php:313
+#: actions/showgroup.php:294
 msgid "Group actions"
 msgstr "Grupaj agoj"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:357
+#: actions/showgroup.php:338
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
 msgstr "Avizofluo de grupo %s (RSS 1.0)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:364
+#: actions/showgroup.php:345
 #, php-format
 msgid "Notice feed for %s group (RSS 2.0)"
 msgstr "Avizofluo de grupo %s (RSS 2.0)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:371
+#: actions/showgroup.php:352
 #, php-format
 msgid "Notice feed for %s group (Atom)"
 msgstr "Avizofluo de grupo %s (Atom)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:377
+#: actions/showgroup.php:358
 #, php-format
 msgid "FOAF for %s group"
 msgstr "Foramiko de grupo %s"
 
 #. TRANS: Header for mini list of group members on a group page (h2).
-#: actions/showgroup.php:414
+#: actions/showgroup.php:395
 msgid "Members"
 msgstr "Grupanoj"
 
@@ -5592,26 +5638,31 @@ msgstr "Grupanoj"
 #. TRANS: Text for user subscription statistics if the user has no subscriptions.
 #. TRANS: Text for user subscriber statistics if user has no subscribers.
 #. TRANS: Text for user user group membership statistics if user is not a member of any group.
-#: actions/showgroup.php:420 lib/profileaction.php:137
+#: actions/showgroup.php:401 lib/profileaction.php:137
 #: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
-#: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
+#: lib/subscriptionlist.php:123 lib/tagcloudsection.php:71
 msgid "(None)"
 msgstr "(nenio)"
 
 #. TRANS: Link to all group members from mini list of group members if group has more than n members.
-#: actions/showgroup.php:429
+#: actions/showgroup.php:410
 msgid "All members"
 msgstr "Ĉiuj grupanoj"
 
-#. TRANS: Label for creation date in statistics on group page.
-#: actions/showgroup.php:465
+#. TRANS: Header for group statistics on a group page (h2).
+#. TRANS: H2 text for user statistics.
+#: actions/showgroup.php:441 lib/profileaction.php:205
+msgid "Statistics"
+msgstr "Statistiko"
+
+#: actions/showgroup.php:444
 #, fuzzy
 msgctxt "LABEL"
 msgid "Created"
 msgstr "Kreita"
 
 #. TRANS: Label for member count in statistics on group page.
-#: actions/showgroup.php:473
+#: actions/showgroup.php:449
 #, fuzzy
 msgctxt "LABEL"
 msgid "Members"
@@ -5621,7 +5672,7 @@ msgstr "Grupanoj"
 #. TRANS: **%s** is the group alias, %%%%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).
-#: actions/showgroup.php:488
+#: actions/showgroup.php:464
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5638,7 +5689,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: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
-#: actions/showgroup.php:498
+#: actions/showgroup.php:474
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5652,7 +5703,7 @@ msgstr ""
 "siaj vivoj kaj ŝatokupoj. "
 
 #. TRANS: Header for list of group administrators on a group page (h2).
-#: actions/showgroup.php:527
+#: actions/showgroup.php:503
 msgid "Admins"
 msgstr "Administrantoj"
 
@@ -5691,7 +5742,7 @@ msgid "%1$s tagged %2$s"
 msgstr "%1$s, paĝo %2$d"
 
 #. TRANS: Page title showing tagged notices in one user's stream.
-#. TRANS: %1$s is the username, %2$s is the hash tag, %1$d is the page number.
+#. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
 #: actions/showstream.php:74
 #, fuzzy, php-format
 msgid "%1$s tagged %2$s, page %3$d"
@@ -5738,13 +5789,13 @@ msgid "FOAF for %s"
 msgstr "Foramiko de  %s"
 
 #. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
-#: actions/showstream.php:211
+#: actions/showstream.php:205
 #, fuzzy, php-format
 msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr "Tie ĉi estus tempstrio de %1$s sed %2$s ankoraŭ afiŝis nenion."
 
 #. TRANS: Second sentence of empty list message for a stream for the user themselves.
-#: actions/showstream.php:217
+#: actions/showstream.php:211
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
@@ -5753,7 +5804,7 @@ msgstr ""
 
 #. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:221
+#: actions/showstream.php:215
 #, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
@@ -5764,7 +5815,7 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:264
+#: actions/showstream.php:258
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5779,7 +5830,7 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:271
+#: actions/showstream.php:265
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5791,7 +5842,7 @@ msgstr ""
 "(http://status.net/). "
 
 #. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
-#: actions/showstream.php:328
+#: actions/showstream.php:322
 #, php-format
 msgid "Repeat of %s"
 msgstr "Ripeto de %s"
@@ -5937,75 +5988,75 @@ msgstr "Teksto de reteja anonco (apenaŭ 255 literoj; HTML eblas)"
 #. TRANS: Title for button to save site notice in admin panel.
 #: actions/sitenoticeadminpanel.php:201
 #, fuzzy
-msgid "Save site notice"
+msgid "Save site notice."
 msgstr "Konservi retejan agordon"
 
 #. TRANS: Title for SMS settings.
-#: actions/smssettings.php:57
+#: actions/smssettings.php:56
 msgid "SMS settings"
 msgstr "SMM-a agordo"
 
 #. TRANS: SMS settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/smssettings.php:71
+#: actions/smssettings.php:70
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr "Vi povos ricevi SMM-mesaĝon per retpoŝto de %%site.name%%."
 
 #. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
-#: actions/smssettings.php:93
+#: actions/smssettings.php:92
 msgid "SMS is not available."
 msgstr "SMM ne estas disponebla."
 
 #. TRANS: Form legend for SMS settings form.
-#: actions/smssettings.php:107
+#: actions/smssettings.php:106
 msgid "SMS address"
 msgstr "SMM-a adreso"
 
 #. TRANS: Form guide in SMS settings form.
-#: actions/smssettings.php:116
+#: actions/smssettings.php:115
 msgid "Current confirmed SMS-enabled phone number."
 msgstr "Nuna konfirmita SMM-pova telefonnumero"
 
 #. TRANS: Form guide in IM settings form.
-#: actions/smssettings.php:129
+#: actions/smssettings.php:128
 msgid "Awaiting confirmation on this phone number."
 msgstr "Atendante konfirmon por la telefonnumero."
 
 #. TRANS: Field label for SMS address input in SMS settings form.
-#: actions/smssettings.php:138
+#: actions/smssettings.php:137
 msgid "Confirmation code"
 msgstr "Konfirma kodo."
 
 #. TRANS: Form field instructions in SMS settings form.
-#: actions/smssettings.php:140
+#: actions/smssettings.php:139
 msgid "Enter the code you received on your phone."
 msgstr "Entajpu la kodon, kiu vi ricevis per poŝtelefono."
 
 #. TRANS: Button label to confirm SMS confirmation code in SMS settings.
-#: actions/smssettings.php:144
+#: actions/smssettings.php:143
 msgctxt "BUTTON"
 msgid "Confirm"
 msgstr "Konfirmi"
 
 #. TRANS: Field label for SMS phone number input in SMS settings form.
-#: actions/smssettings.php:149
+#: actions/smssettings.php:148
 msgid "SMS phone number"
 msgstr "SMM-a telefonnumero"
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
-#: actions/smssettings.php:152
+#: actions/smssettings.php:151
 #, fuzzy
-msgid "Phone number, no punctuation or spaces, with area code"
+msgid "Phone number, no punctuation or spaces, with area code."
 msgstr "Telefonnumero, sen interpunkcio aŭ spacoj, kun loka kodo"
 
 #. TRANS: Form legend for SMS preferences form.
-#: actions/smssettings.php:191
+#: actions/smssettings.php:190
 msgid "SMS preferences"
 msgstr "SMM-aj preferoj"
 
 #. TRANS: Checkbox label in SMS preferences form.
-#: actions/smssettings.php:197
+#: actions/smssettings.php:196
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
@@ -6014,32 +6065,32 @@ msgstr ""
 "peranto."
 
 #. TRANS: Confirmation message for successful SMS preferences save.
-#: actions/smssettings.php:308
+#: actions/smssettings.php:307
 msgid "SMS preferences saved."
 msgstr "SMM-prefero konserviĝas."
 
 #. TRANS: Message given saving SMS phone number without having provided one.
-#: actions/smssettings.php:330
+#: actions/smssettings.php:329
 msgid "No phone number."
 msgstr "Mankas la telefononumero."
 
 #. TRANS: Message given saving SMS phone number without having selected a carrier.
-#: actions/smssettings.php:336
+#: actions/smssettings.php:335
 msgid "No carrier selected."
 msgstr "Neniu peranto elektiĝas."
 
 #. TRANS: Message given saving SMS phone number that is already set.
-#: actions/smssettings.php:344
+#: actions/smssettings.php:343
 msgid "That is already your phone number."
 msgstr "Tio estas jam via telefonnumero."
 
 #. TRANS: Message given saving SMS phone number that is already set for another user.
-#: actions/smssettings.php:348
+#: actions/smssettings.php:347
 msgid "That phone number already belongs to another user."
 msgstr "Tiu telefonnumero jam apartenas al alia uzanto."
 
 #. TRANS: Message given saving valid SMS phone number that is to be confirmed.
-#: actions/smssettings.php:376
+#: actions/smssettings.php:375
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
 "for the code and instructions on how to use it."
@@ -6048,39 +6099,39 @@ msgstr ""
 "poŝtelefonon pri la kodo kaj gvido pri kiel uzi ĝin."
 
 #. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
-#: actions/smssettings.php:404
+#: actions/smssettings.php:403
 msgid "That is the wrong confirmation number."
 msgstr "Tiu konfirma kodo estas malĝusta."
 
 #. TRANS: Message given after successfully canceling SMS phone number confirmation.
-#: actions/smssettings.php:418
+#: actions/smssettings.php:417
 msgid "SMS confirmation cancelled."
 msgstr "SMM-a konfirmo nuliĝas."
 
 #. TRANS: Message given trying to remove an SMS phone number that is not
 #. TRANS: registered for the active user.
-#: actions/smssettings.php:438
+#: actions/smssettings.php:437
 msgid "That is not your phone number."
 msgstr "Tio ne estas via telefonnumero."
 
 #. TRANS: Message given after successfully removing a registered SMS phone number.
-#: actions/smssettings.php:460
+#: actions/smssettings.php:459
 msgid "The SMS phone number was removed."
 msgstr "La SMM-numreo estas forigita."
 
 #. TRANS: Label for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:499
+#: actions/smssettings.php:498
 msgid "Mobile carrier"
 msgstr "Poŝtelefona peranto"
 
 #. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:504
+#: actions/smssettings.php:503
 msgid "Select a carrier"
 msgstr "Elektu peranton"
 
 #. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
 #. TRANS: %s is an administrative contact's e-mail address.
-#: actions/smssettings.php:513
+#: actions/smssettings.php:512
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -6090,7 +6141,7 @@ msgstr ""
 "per retpoŝto sed ne listiĝas tie ĉi, sendu mesaĝon al ni sciigi, je %s."
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
-#: actions/smssettings.php:535
+#: actions/smssettings.php:534
 #, fuzzy
 msgid "No code entered."
 msgstr "Neniu kodo entajpita"
@@ -6164,15 +6215,13 @@ msgstr "Vi ne abonis tiun profilon."
 msgid "Could not save subscription."
 msgstr "Malsukcesis konservi abonon."
 
-#: actions/subscribe.php:77
-msgid "This action only accepts POST requests."
-msgstr "La ago akceptas nur POST-an peton."
-
-#: actions/subscribe.php:117
+#. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
+#: actions/subscribe.php:121
 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
 msgstr "Vi ne povas aboni foran  OMB 0.1-an profilon per ĉi tiu ago."
 
-#: actions/subscribe.php:145
+#. TRANS: Page title when subscription succeeded.
+#: actions/subscribe.php:149
 msgid "Subscribed"
 msgstr "Abonita"
 
@@ -6286,31 +6335,34 @@ msgid "Subscription feed for %s (Atom)"
 msgstr "Avizofluo pri %1$s  (Atom)"
 
 #. TRANS: Checkbox label for enabling Jabber messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:239
-msgid "Jabber"
-msgstr "Jabber"
+#: actions/subscriptions.php:241 lib/settingsnav.php:110
+#, fuzzy
+msgid "IM"
+msgstr "Tujmesaĝilo"
 
 #. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:254
+#: actions/subscriptions.php:256 lib/settingsnav.php:117
 msgid "SMS"
 msgstr "SMS"
 
-#: actions/tag.php:69
+#. TRANS: Title for all but the first page of notices with tags.
+#. TRANS: %1$s is the tag, %2$d is the page number.
+#: actions/tag.php:73
 #, php-format
 msgid "Notices tagged with %1$s, page %2$d"
 msgstr "Avizoj etikeditaj per %1$s - paĝo %2$d"
 
-#: actions/tag.php:87
+#: actions/tag.php:91
 #, php-format
 msgid "Notice feed for tag %s (RSS 1.0)"
 msgstr "Avizofluo pri etikedo %s (RSS 1.0)"
 
-#: actions/tag.php:93
+#: actions/tag.php:97
 #, php-format
 msgid "Notice feed for tag %s (RSS 2.0)"
 msgstr "Avizofluo pri etikedo %s (RSS 2.0)"
 
-#: actions/tag.php:99
+#: actions/tag.php:103
 #, php-format
 msgid "Notice feed for tag %s (Atom)"
 msgstr "Avizofluo pri etikedo %s (Atom)"
@@ -6329,17 +6381,11 @@ msgstr "Etikedo %s"
 msgid "User profile"
 msgstr "Uzanta profilo"
 
-#. TRANS: DT element in area for user avatar.
-#: actions/tagother.php:81 actions/userauthorization.php:132
-#: lib/userprofile.php:108
-msgid "Photo"
-msgstr "Foto"
-
-#: actions/tagother.php:141
+#: actions/tagother.php:120
 msgid "Tag user"
 msgstr "Etikedi uzanton"
 
-#: actions/tagother.php:151
+#: actions/tagother.php:130
 msgid ""
 "Tags for this user (letters, numbers, -, ., and _), comma- or space- "
 "separated"
@@ -6347,12 +6393,17 @@ msgstr ""
 "Etikedoj por ĉi tiuj uzanto (literoj, ciferoj, -, . Kaj _), apartigu per "
 "komo aŭ spaco."
 
-#: actions/tagother.php:193
+#: actions/tagother.php:157
+#, php-format
+msgid "Invalid tag: \"%s\""
+msgstr "Nevalida markilo: \"%s\""
+
+#: actions/tagother.php:172
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr "Vi rajtas entikedi nur abonanton aŭ abonaton."
 
-#: actions/tagother.php:236
+#: actions/tagother.php:215
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr "Uzu ĉi tiun formularon por etikedi viajn abonantojn aŭ abonatojn."
 
@@ -6360,6 +6411,7 @@ msgstr "Uzu ĉi tiun formularon por etikedi viajn abonantojn aŭ abonatojn."
 msgid "No such tag."
 msgstr "Ne estas tiu etikedo."
 
+#. TRANS: Client error displayed when trying to unblock a non-blocked user.
 #: actions/unblock.php:59
 msgid "You haven't blocked that user."
 msgstr "Vi ne jam blokis la uzanton."
@@ -6380,13 +6432,85 @@ msgstr "Neniu profila ID petiĝas."
 msgid "Unsubscribed"
 msgstr "Malabonita"
 
-#: actions/updateprofile.php:64 actions/userauthorization.php:337
+#: actions/updateprofile.php:64
 #, php-format
 msgid ""
 "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
 msgstr ""
 "Rigardato-flua permesilo \"%1$s\" ne konformas al reteja permesilo \"%2$s\"."
 
+#: actions/urlsettings.php:60
+#, fuzzy
+msgid "URL settings"
+msgstr "Tujmesaĝila agordo."
+
+#. TRANS: Instructions for tab "Other" in user profile settings.
+#: actions/urlsettings.php:72
+msgid "Manage various other options."
+msgstr "Agordi diversajn aliajn elektojn."
+
+#. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
+#. TRANS: user's profile settings. This message has one space at the beginning. Use your
+#. TRANS: language's word separator here if it has one (most likely a single space).
+#: actions/urlsettings.php:115
+msgid " (free service)"
+msgstr " (libera servo)"
+
+#: actions/urlsettings.php:121
+#, fuzzy
+msgid "[none]"
+msgstr "Nenio"
+
+#: actions/urlsettings.php:122
+msgid "[internal]"
+msgstr ""
+
+#. TRANS: Label for dropdown with URL shortener services.
+#: actions/urlsettings.php:130
+msgid "Shorten URLs with"
+msgstr "Mallongigu URLojn per"
+
+#. TRANS: Tooltip for for dropdown with URL shortener services.
+#: actions/urlsettings.php:132
+msgid "Automatic shortening service to use."
+msgstr "Uzota aŭtomata mallongigad-servo."
+
+#: actions/urlsettings.php:138
+msgid "URL longer than"
+msgstr ""
+
+#: actions/urlsettings.php:141
+msgid "URLs longer than this will be shortened, 0 means always shorten."
+msgstr ""
+
+#: actions/urlsettings.php:145
+msgid "Text longer than"
+msgstr ""
+
+#: actions/urlsettings.php:148
+msgid ""
+"URLs in notices longer than this will be shortened, 0 means always shorten."
+msgstr ""
+
+#. TRANS: Form validation error for form "Other settings" in user profile.
+#: actions/urlsettings.php:180
+#, fuzzy
+msgid "URL shortening service is too long (maximum 50 characters)."
+msgstr "URL-mallongigado-servo tro longas (maksimume 50 literojn)."
+
+#: actions/urlsettings.php:187
+msgid "Invalid number for max url length."
+msgstr ""
+
+#: actions/urlsettings.php:193
+#, fuzzy
+msgid "Invalid number for max notice length."
+msgstr "Nevalida avizo-enhavo"
+
+#: actions/urlsettings.php:238
+msgid "Error saving user URL shortening preferences."
+msgstr ""
+
 #. TRANS: User admin panel title
 #: actions/useradminpanel.php:58
 msgctxt "TITLE"
@@ -6413,11 +6537,11 @@ msgstr "Nevalida bonvena teksto. La longlimo estas 225 literoj."
 #. TRANS: users in user admin panel. %1$s is the invalid nickname.
 #: actions/useradminpanel.php:166
 #, fuzzy, php-format
-msgid "Invalid default subscripton: '%1$s' is not a user."
+msgid "Invalid default subscripton: \"%1$s\" is not a user."
 msgstr "Nevalida defaŭlta abono: '%1$s' ne estas uzanto."
 
-#. TRANS: Link description in user account settings menu.
-#: actions/useradminpanel.php:215 lib/accountsettingsaction.php:106
+#: actions/useradminpanel.php:215 lib/action.php:565 lib/settingsnav.php:77
+#: lib/subgroupnav.php:81
 msgid "Profile"
 msgstr "Profilo"
 
@@ -6475,58 +6599,62 @@ msgstr "Ĉu permesi al uzantoj inviti novan uzantojn."
 #. TRANS: Title for button to save user settings in user admin panel.
 #: actions/useradminpanel.php:302
 #, fuzzy
-msgid "Save user settings"
+msgid "Save user settings."
 msgstr "Konservi retejan agordon"
 
-#: actions/userauthorization.php:105
+#. TRANS: Page title.
+#: actions/userauthorization.php:109
 msgid "Authorize subscription"
 msgstr "Rajtigi abonon"
 
-#: actions/userauthorization.php:110
+#. TRANS: Page notice on "Auhtorize subscription" page.
+#: actions/userauthorization.php:115
 #, fuzzy
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
 "user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
-"click “Reject”."
+"click \"Reject\"."
 msgstr ""
 "Bonvolu kontroli la detalojn por certigi ĉu vi deziras aboni la avizoj de ĉi "
 "tiu uzanto. Se ne simple alklaku “Rifuzi\"."
 
-#. TRANS: Menu item for site administration
-#: actions/userauthorization.php:196 actions/version.php:167
-#: lib/adminpanelaction.php:403
-msgid "License"
-msgstr "Licenco"
-
-#: actions/userauthorization.php:217
+#. TRANS: Button text on Authorise Subscription page.
+#: actions/userauthorization.php:200
 #, fuzzy
+msgctxt "BUTTON"
 msgid "Accept"
 msgstr "Akcepti"
 
-#: actions/userauthorization.php:218 lib/subscribeform.php:115
-#: lib/subscribeform.php:139
-msgid "Subscribe to this user"
+#. TRANS: Title for button on Authorise Subscription page.
+#: actions/userauthorization.php:202
+#, fuzzy
+msgid "Subscribe to this user."
 msgstr "Aboni la uzanton"
 
-#: actions/userauthorization.php:219
+#. TRANS: Button text on Authorise Subscription page.
+#: actions/userauthorization.php:204
 #, fuzzy
+msgctxt "BUTTON"
 msgid "Reject"
 msgstr "Malakcepti"
 
-#: actions/userauthorization.php:220
+#. TRANS: Title for button on Authorise Subscription page.
+#: actions/userauthorization.php:206
 #, fuzzy
-msgid "Reject this subscription"
+msgid "Reject this subscription."
 msgstr "Rifuzi la abonon"
 
-#: actions/userauthorization.php:232
+#. TRANS: Client error displayed for an empty authorisation request.
+#: actions/userauthorization.php:219
 msgid "No authorization request!"
 msgstr "Ne bezonas permesado!"
 
-#: actions/userauthorization.php:254
+#. TRANS: Accept message header from Authorise subscription page.
+#: actions/userauthorization.php:242
 msgid "Subscription authorized"
 msgstr "Abono permesiĝis"
 
-#: actions/userauthorization.php:256
+#: actions/userauthorization.php:245
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to authorize the "
@@ -6535,11 +6663,12 @@ msgstr ""
 "La abono permesiĝis, sed ne pasiĝis revoka URL. Legu gvidon de la retejo pro "
 "detaloj pri kiel rajtigi abonon. Via abono-ĵetono jenas:"
 
-#: actions/userauthorization.php:266
+#. TRANS: Reject message header from Authorise subscription page.
+#: actions/userauthorization.php:256
 msgid "Subscription rejected"
 msgstr "Abono rifuziĝis"
 
-#: actions/userauthorization.php:268
+#: actions/userauthorization.php:259
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to fully reject the "
@@ -6548,57 +6677,99 @@ msgstr ""
 "La abono rifuziĝis sed ne pasiĝis revoka URL. Legu gvidon de la retejo pro "
 "detaloj pri kiel rajtigi abonon. Via abono-ĵetono jenas:"
 
-#: actions/userauthorization.php:303
+#. TRANS: Exception thrown when no valid user is found for an authorisation request.
+#. TRANS: %s is a listener URI.
+#: actions/userauthorization.php:296
 #, fuzzy, php-format
-msgid "Listener URI ‘%s’ not found here."
+msgid "Listener URI \"%s\" not found here."
 msgstr "URL de aboninto ‘%s’ ne troviĝas tie ĉi."
 
-#: actions/userauthorization.php:308
+#. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
+#. TRANS: %s is a listenee URI.
+#: actions/userauthorization.php:303
 #, fuzzy, php-format
-msgid "Listenee URI ‘%s’ is too long."
+msgid "Listenee URI \"%s\" is too long."
 msgstr "URL de abonito ‘%s’ tro longas."
 
-#: actions/userauthorization.php:314
+#. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
+#. TRANS: %s is a listenee URI.
+#: actions/userauthorization.php:311
 #, fuzzy, php-format
-msgid "Listenee URI ‘%s’ is a local user."
+msgid "Listenee URI \"%s\" is a local user."
 msgstr "URL de abonito ‘%s’ estas de loka uzanto."
 
+#. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
+#. TRANS: %s is a profile URL.
 #: actions/userauthorization.php:329
 #, fuzzy, php-format
-msgid "Profile URL ‘%s’ is for a local user."
+msgid "Profile URL \"%s\" is for a local user."
 msgstr "Profila URL ‘%s’ estas de loka uzanto."
 
-#: actions/userauthorization.php:345
+#. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
+#. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
+#: actions/userauthorization.php:339
 #, fuzzy, php-format
-msgid "Avatar URL ‘%s’ is not valid."
+msgid ""
+"Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
+"\"."
+msgstr ""
+"Rigardato-flua permesilo \"%1$s\" ne konformas al reteja permesilo \"%2$s\"."
+
+#. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
+#. TRANS: %s is an avatar URL.
+#: actions/userauthorization.php:349
+#, fuzzy, php-format
+msgid "Avatar URL \"%s\" is not valid."
 msgstr "Vizaĝbilda URL ‘%s' ne estas valida."
 
-#: actions/userauthorization.php:350
+#. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
+#. TRANS: %s is an avatar URL.
+#: actions/userauthorization.php:356
 #, fuzzy, php-format
-msgid "Can’t read avatar URL ‘%s’."
+msgid "Cannot read avatar URL \"%s\"."
 msgstr "Malsukcesis legi vizaĝbildan URL ‘%s’."
 
-#: actions/userauthorization.php:355
+#. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
+#. TRANS: %s is an avatar URL.
+#: actions/userauthorization.php:363
 #, fuzzy, php-format
-msgid "Wrong image type for avatar URL ‘%s’."
+msgid "Wrong image type for avatar URL \"%s\"."
 msgstr "Malĝusta bildotipo por vizaĝbilda URL ‘%s'."
 
 #. TRANS: Page title for profile design page.
-#: actions/userdesignsettings.php:74 lib/designsettings.php:63
+#: actions/userdesignsettings.php:74 lib/designsettings.php:61
 msgid "Profile design"
 msgstr "Profila desegno"
 
 #. TRANS: Instructions for profile design page.
-#: actions/userdesignsettings.php:84 lib/designsettings.php:74
+#: actions/userdesignsettings.php:84 lib/designsettings.php:72
 msgid ""
 "Customize the way your profile looks with a background image and a colour "
 "palette of your choice."
 msgstr "Agodi kiel aspektu via profilo, per elekto de fonbildo kaj koloraro."
 
-#: actions/userdesignsettings.php:272
+#: actions/userdesignsettings.php:289
 msgid "Enjoy your hotdog!"
 msgstr "Ĝuu vian kolbasobulkon!"
 
+#: actions/userdesignsettings.php:325
+#, fuzzy
+msgid "Design settings"
+msgstr "Konservi retejan agordon"
+
+#: actions/userdesignsettings.php:340
+msgid "View profile designs"
+msgstr "Vidi profilo-desegnon"
+
+#: actions/userdesignsettings.php:341
+msgid "Show or hide profile designs."
+msgstr "Montri aŭ kaŝi profilo-desegnon."
+
+#: actions/userdesignsettings.php:348
+#, fuzzy
+msgid "Background file"
+msgstr "Fono"
+
 #. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number.
 #: actions/usergroups.php:66
 #, php-format
@@ -6648,6 +6819,11 @@ msgstr ""
 msgid "Contributors"
 msgstr "Kontribuantoj"
 
+#. TRANS: Menu item for site administration
+#: actions/version.php:167 lib/adminpanelaction.php:403
+msgid "License"
+msgstr "Licenco"
+
 #: actions/version.php:170
 msgid ""
 "StatusNet is free software: you can redistribute it and/or modify it under "
@@ -6680,12 +6856,13 @@ msgstr ""
 "Vi laŭe jam ricevis eldonon de la GNU Affero Ĝenerala Publika Permesilo. "
 "Nekaze, legu %s."
 
-#: actions/version.php:191
-msgid "Plugins"
-msgstr "Kromprogramo"
+#. TRANS: Form input field label for application name.
+#: actions/version.php:197 lib/applicationeditform.php:190
+msgid "Name"
+msgstr "Nomo"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:901
+#: actions/version.php:198 lib/action.php:885
 msgid "Version"
 msgstr "Versio"
 
@@ -6693,6 +6870,12 @@ msgstr "Versio"
 msgid "Author(s)"
 msgstr "Aŭtoro(j)"
 
+#. TRANS: Form input field label.
+#: actions/version.php:200 lib/applicationeditform.php:208
+#: lib/groupeditform.php:168
+msgid "Description"
+msgstr "Priskribo"
+
 #. TRANS: Activity title when marking a notice as favorite.
 #: classes/Fave.php:164
 msgid "Favor"
@@ -6811,7 +6994,7 @@ msgid "Could not create login token for %s"
 msgstr "Malsukcesis krei ensalut-ĵetonon por %s"
 
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
-#: classes/Memcached_DataObject.php:542
+#: classes/Memcached_DataObject.php:556
 msgid "No database name or DSN found anywhere."
 msgstr "Ne troviĝas datumbaza nomo aŭ DSN ie ajn."
 
@@ -6984,18 +7167,18 @@ msgstr "%1$s nun rigardas viajn avizojn ĉe %2$s."
 
 #. TRANS: Notice given on user registration.
 #. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:395
+#: classes/User.php:390
 #, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr "Bonvenon al %1$s, @%2$s!"
 
 #. TRANS: Server exception.
-#: classes/User.php:918
+#: classes/User.php:923
 msgid "No single user defined for single-user mode."
 msgstr "Neniu difinata uzanto por sol-uzanta reĝimo."
 
 #. TRANS: Server exception.
-#: classes/User.php:922
+#: classes/User.php:927
 msgid "Single-user mode code called when not enabled."
 msgstr ""
 
@@ -7040,41 +7223,6 @@ msgstr ""
 msgid "No AtomPub API service for %s."
 msgstr ""
 
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:104
-msgid "Change your profile settings"
-msgstr "Ŝanĝi vian profilan agordon."
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:111
-msgid "Upload an avatar"
-msgstr "Alŝuti vizaĝbildon"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:118
-msgid "Change your password"
-msgstr "Ŝanĝi vian pasvorton."
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:125
-msgid "Change email handling"
-msgstr "Ŝanĝi retpoŝtan disponadon."
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:132
-msgid "Design your profile"
-msgstr "Desegni vian profilon"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:139
-msgid "Other options"
-msgstr "Aliaj"
-
-#. TRANS: Link description in user account settings menu.
-#: lib/accountsettingsaction.php:141
-msgid "Other"
-msgstr "Alia"
-
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
 #: lib/action.php:161
 #, php-format
@@ -7092,206 +7240,128 @@ msgctxt "TOOLTIP"
 msgid "Show more"
 msgstr ""
 
-#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:544
-msgid "Primary site navigation"
-msgstr "Unua reteja navigado"
+#. TRANS: Inline reply form submit button: submits a reply comment.
+#: lib/action.php:328
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Comment"
+msgstr "Enhavo"
 
-#. TRANS: Tooltip for main menu option "Personal".
-#: lib/action.php:550
-msgctxt "TOOLTIP"
-msgid "Personal profile and friends timeline"
-msgstr "Tempstrio pri vi kaj amikoj"
+#. TRANS: Placeholder text for inline reply form. Clicking in this box will turn it into a mini notice form.
+#: lib/action.php:331
+msgid "Add a comment..."
+msgstr ""
 
-#. TRANS: Main menu option when logged in for access to personal profile and friends timeline.
-#. TRANS: Personal group navigation menu option when logged in for viewing timeline of self and friends.
-#: lib/action.php:553 lib/personalgroupnav.php:100
-msgctxt "MENU"
-msgid "Personal"
-msgstr "Persona"
+#: lib/action.php:559 lib/personalgroupnav.php:99
+#, fuzzy
+msgid "Home"
+msgstr "Hejmpaĝo"
 
-#. TRANS: Tooltip for main menu option "Account".
-#: lib/action.php:555
-msgctxt "TOOLTIP"
-msgid "Change your email, avatar, password, profile"
-msgstr "Ŝanĝu la retpoŝtadreson, vizaĝbildon, pasvorton aŭ la profilon"
-
-#. TRANS: Main menu option when logged in for access to user settings.
-#: lib/action.php:558
-msgid "Account"
-msgstr "Konto"
-
-#. TRANS: Tooltip for main menu option "Services".
 #: lib/action.php:560
-msgctxt "TOOLTIP"
-msgid "Connect to services"
-msgstr "Konekti al servoj"
+#, fuzzy
+msgid "Friends timeline"
+msgstr "Tempstrio de %s"
 
-#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services.
-#: lib/action.php:563
-msgid "Connect"
-msgstr "Konekti"
-
-#. TRANS: Tooltip for menu option "Admin".
 #: lib/action.php:566
-msgctxt "TOOLTIP"
-msgid "Change site configuration"
-msgstr "Ŝanĝi agordojn de la retejo"
+#, fuzzy
+msgid "Your profile"
+msgstr "Grupa profilo"
 
-#. TRANS: Main menu option when logged in and site admin for access to site configuration.
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/action.php:569 lib/groupnav.php:117
-msgctxt "MENU"
-msgid "Admin"
-msgstr "Administri"
+#: lib/action.php:570 lib/action.php:593 lib/publicgroupnav.php:78
+msgid "Public"
+msgstr "Publika"
 
-#. TRANS: Tooltip for main menu option "Invite".
-#: lib/action.php:573
-#, php-format
-msgctxt "TOOLTIP"
-msgid "Invite friends and colleagues to join you on %s"
-msgstr "Inviti amikojn kaj kolegojn al %s kun vi"
+#: lib/action.php:571 lib/action.php:594
+#, fuzzy
+msgid "Everyone on this site"
+msgstr "Serĉi homon ĉe la retejo"
+
+#: lib/action.php:575
+#, fuzzy
+msgid "Settings"
+msgstr "SMM-a agordo"
 
-#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users.
 #: lib/action.php:576
-msgctxt "MENU"
-msgid "Invite"
-msgstr "Inviti"
+#, fuzzy
+msgid "Change your personal settings"
+msgstr "Ŝanĝi vian profilan agordon."
 
-#. TRANS: Tooltip for main menu option "Logout"
 #: lib/action.php:582
-msgctxt "TOOLTIP"
-msgid "Logout from the site"
-msgstr "Elsaluti el la retejo"
+#, fuzzy
+msgid "Site configuration"
+msgstr "Uzanta agordo"
 
-#. TRANS: Main menu option when logged in to log out the current user.
-#: lib/action.php:585
-msgctxt "MENU"
+#: lib/action.php:587
+#, fuzzy
 msgid "Logout"
 msgstr " Elsaluti"
 
-#. TRANS: Tooltip for main menu option "Register".
-#: lib/action.php:590
-msgctxt "TOOLTIP"
-msgid "Create an account"
-msgstr "Krei konton"
+#: lib/action.php:588
+#, fuzzy
+msgid "Logout from the site"
+msgstr "Elsaluti el la retejo"
 
-#. TRANS: Main menu option when not logged in to register a new account.
-#. TRANS: Menu item for registering with the StatusNet site.
-#: lib/action.php:593 lib/logingroupnav.php:85
-msgctxt "MENU"
-msgid "Register"
-msgstr "Registriĝi"
-
-#. TRANS: Tooltip for main menu option "Login".
-#: lib/action.php:596
-msgctxt "TOOLTIP"
+#: lib/action.php:599
+#, fuzzy
 msgid "Login to the site"
 msgstr "Ensaluti al la retejo"
 
-#. TRANS: Main menu option when not logged in to log in.
-#. TRANS: Menu item for logging in to the StatusNet site.
-#: lib/action.php:599 lib/logingroupnav.php:77
-msgctxt "MENU"
-msgid "Login"
-msgstr "Ensaluti"
-
-#. TRANS: Tooltip for main menu option "Help".
-#: lib/action.php:602
-msgctxt "TOOLTIP"
-msgid "Help me!"
-msgstr "Helpu min!"
-
-#. TRANS: Main menu option for help on the StatusNet site.
-#: lib/action.php:605
-msgctxt "MENU"
-msgid "Help"
-msgstr "Helpo"
-
-#. TRANS: Tooltip for main menu option "Search".
-#: lib/action.php:608
-msgctxt "TOOLTIP"
-msgid "Search for people or text"
-msgstr "Serĉi homon aŭ tekston"
-
-#. TRANS: Main menu option when logged in or when the StatusNet instance is not private.
-#: lib/action.php:611
-msgctxt "MENU"
+#: lib/action.php:606
+#, fuzzy
 msgid "Search"
 msgstr "Serĉi"
 
-#. TRANS: DT element for site notice. String is hidden in default CSS.
-#. TRANS: Menu item for site administration
-#: lib/action.php:633 lib/adminpanelaction.php:387
-msgid "Site notice"
-msgstr "Reteja anonco"
-
-#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:700
-msgid "Local views"
-msgstr "Loka vido"
-
-#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:770
-msgid "Page notice"
-msgstr "Paĝa anonco"
-
-#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:874
-msgid "Secondary site navigation"
-msgstr "Dua reteja navigado"
+#: lib/action.php:607
+#, fuzzy
+msgid "Search the site"
+msgstr "Serĉi ĉe retejo"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:880
+#: lib/action.php:864
 msgid "Help"
 msgstr "Helpo"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:883
+#: lib/action.php:867
 msgid "About"
 msgstr "Enkonduko"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:886
+#: lib/action.php:870
 msgid "FAQ"
 msgstr "Oftaj demandoj"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:891
+#: lib/action.php:875
 msgid "TOS"
 msgstr "Serva Kondiĉo"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:895
+#: lib/action.php:879
 msgid "Privacy"
 msgstr "Privateco"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:898
+#: lib/action.php:882
 msgid "Source"
 msgstr "Fontkodo"
 
 #. TRANS: Secondary navigation menu option leading to e-mail contact information on the
 #. TRANS: StatusNet site, where to report bugs, ...
-#: lib/action.php:905
+#: lib/action.php:889
 msgid "Contact"
 msgstr "Kontakto"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:908
+#: lib/action.php:892
 msgid "Badge"
 msgstr "Insigno"
 
-#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:937
-msgid "StatusNet software license"
-msgstr "Permesilo de la programaro StatusNet"
-
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:944
+#: lib/action.php:921
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7301,7 +7371,7 @@ msgstr ""
 "site.broughtbyurl%%)."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:947
+#: lib/action.php:924
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** estas mikrobloga servo."
@@ -7310,7 +7380,7 @@ msgstr "**%%site.name%%** estas mikrobloga servo."
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:954
+#: lib/action.php:931
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7321,28 +7391,23 @@ msgstr ""
 "havebla sub la [GNU Affero Ĝenerala Publika Permesilo](http://www.fsf.org/"
 "licensing/licenses/agpl-3.0.html)."
 
-#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:970
-msgid "Site content license"
-msgstr "Reteja enhava permesilo"
-
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:977
+#: lib/action.php:949
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr "Enhavo kaj datumo de %1$s estas privata kaj konfidenca."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:984
+#: lib/action.php:956
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
 "Enhava kaj datuma aŭtorrajto apartenas al %1$s. Ĉiuj rajtoj rezervitaj."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:988
+#: lib/action.php:960
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 "Enhava kaj datuma aŭtorrajto apartenas al kontribuintoj. Ĉiuj rajtoj "
@@ -7350,25 +7415,20 @@ msgstr ""
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:1020
+#: lib/action.php:992
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr "Ĉiuj enhavo kaj datumo ĉe %1$s estas havebla sub permesilo %2$s."
 
-#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1356
-msgid "Pagination"
-msgstr "Paĝado"
-
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1367
+#: lib/action.php:1335
 msgid "After"
 msgstr "Poste"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1377
+#: lib/action.php:1345
 msgid "Before"
 msgstr "Antaŭe"
 
@@ -7522,7 +7582,7 @@ msgid "User configuration"
 msgstr "Uzanta agordo"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:122
+#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:110
 msgid "User"
 msgstr "Uzanto"
 
@@ -7546,6 +7606,11 @@ msgstr "Seanca agodo"
 msgid "Edit site notice"
 msgstr "Redakti retejan anoncon"
 
+#. TRANS: Menu item for site administration
+#: lib/adminpanelaction.php:387
+msgid "Site notice"
+msgstr "Reteja anonco"
+
 #. TRANS: Menu item title/tooltip
 #: lib/adminpanelaction.php:393
 msgid "Snapshots configuration"
@@ -7556,6 +7621,12 @@ msgstr "Momentfota Agordo"
 msgid "Set site license"
 msgstr ""
 
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:409
+#, fuzzy
+msgid "Plugins configuration"
+msgstr "Voja agordo"
+
 #. TRANS: Client error 401.
 #: lib/apiauth.php:111
 msgid "API resource requires read-write access, but you only have read access."
@@ -7566,19 +7637,23 @@ msgstr "API-fonto bezonas leg-skriba aliro, sed vi nur rajtas legi."
 msgid "No application for that consumer key."
 msgstr "Ne estas aplikaĵo kun la kosumanta ŝlosilo."
 
+#: lib/apiauth.php:202 lib/apiauth.php:284
+msgid "Not allowed to use API."
+msgstr ""
+
 #. TRANS: OAuth exception given when an incorrect access token was given for a user.
-#: lib/apiauth.php:219
+#: lib/apiauth.php:225
 msgid "Bad access token."
 msgstr "Fuŝa aliro-ĵetono."
 
 #. TRANS: OAuth exception given when no user was found for a given token (no token was found).
-#: lib/apiauth.php:224
+#: lib/apiauth.php:230
 msgid "No user for that token."
 msgstr "Ne estas uzanto kun tiu ĵetono."
 
 #. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel".
 #. TRANS: Client error thrown when authentication fails.
-#: lib/apiauth.php:266 lib/apiauth.php:293
+#: lib/apiauth.php:272 lib/apiauth.php:302
 msgid "Could not authenticate you."
 msgstr "Malsukcesis aŭtentigi vin."
 
@@ -7625,6 +7700,11 @@ msgstr "Provis revoki nekonatan ĵetonon."
 msgid "Failed to delete revoked token."
 msgstr "Malsukcesis forigi revokitan ĵetonon."
 
+#. TRANS: Form input field label for application icon.
+#: lib/applicationeditform.php:177
+msgid "Icon"
+msgstr "Bildsimbolo"
+
 #. TRANS: Form guide.
 #: lib/applicationeditform.php:182
 msgid "Icon for this application"
@@ -7659,6 +7739,11 @@ msgstr "Fonta URL"
 msgid "Organization responsible for this application"
 msgstr "Organizo, kiu prizorgi la aplikaĵon"
 
+#. TRANS: Form input field label.
+#: lib/applicationeditform.php:227
+msgid "Organization"
+msgstr "Organizaĵo"
+
 #. TRANS: Form input field instructions.
 #: lib/applicationeditform.php:234
 msgid "URL for the homepage of the organization"
@@ -7747,16 +7832,6 @@ msgstr ""
 msgid "Do not use this method!"
 msgstr "Ne forigi la avizon"
 
-#. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:293
-msgid "Author"
-msgstr "Aŭtoro"
-
-#. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:307
-msgid "Provider"
-msgstr "Donanto"
-
 #. TRANS: Title.
 #: lib/attachmentnoticesection.php:67
 msgid "Notices where this attachment appears"
@@ -7784,24 +7859,29 @@ msgstr "Ne estas permesita ŝanĝi la pasvorton"
 msgid "Block"
 msgstr "Bloki"
 
+#. TRANS: Description of the form to block a user.
+#: lib/blockform.php:79
+msgid "Block this user"
+msgstr "Bloki la uzanton"
+
 #. TRANS: Title for command results.
-#: lib/channel.php:160 lib/channel.php:181
+#: lib/channel.php:104 lib/channel.php:125
 msgid "Command results"
 msgstr "Komandaj rezultoj"
 
 #. TRANS: Title for command results.
-#: lib/channel.php:194
+#: lib/channel.php:138
 #, fuzzy
 msgid "AJAX error"
 msgstr "Eraro de Ajax"
 
 #. TRANS: E-mail subject when a command has completed.
-#: lib/channel.php:233 lib/mailhandler.php:143
+#: lib/channel.php:177 lib/mailhandler.php:143
 msgid "Command complete"
 msgstr "Komando kompleta"
 
 #. TRANS: E-mail subject when a command has failed.
-#: lib/channel.php:244
+#: lib/channel.php:188
 msgid "Command failed"
 msgstr "Komando maltrafis"
 
@@ -7904,7 +7984,7 @@ msgstr "Plennomo: %s"
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a location.
-#: lib/command.php:446 lib/mail.php:270
+#: lib/command.php:446 lib/mail.php:275
 #, php-format
 msgid "Location: %s"
 msgstr "Loko: %s"
@@ -7912,7 +7992,7 @@ msgstr "Loko: %s"
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a homepage.
-#: lib/command.php:450 lib/mail.php:274
+#: lib/command.php:450 lib/mail.php:279
 #, php-format
 msgid "Homepage: %s"
 msgstr "Hejmpaĝo: %s"
@@ -8186,114 +8266,104 @@ msgstr ""
 "tracking — ankoraŭ ne realigita;\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:162
+#: lib/common.php:36
 #, fuzzy
 msgid "No configuration file found."
 msgstr "Ne troviĝas agorda dosiero. "
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:165
+#: lib/common.php:39
 #, fuzzy
 msgid "I looked for configuration files in the following places:"
 msgstr "Mi serĉis agordan dosieron je jenaj lokoj: "
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:168
+#: lib/common.php:42
 msgid "You may wish to run the installer to fix this."
 msgstr "Vi eble volas uzi instalilon por ripari tiun ĉi."
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:172
+#: lib/common.php:46
 msgid "Go to the installer."
 msgstr "Al la instalilo."
 
-#. TRANS: Menu item for Instant Messaging settings.
-#: lib/connectsettingsaction.php:106
-#, fuzzy
-msgctxt "MENU"
-msgid "IM"
-msgstr "Tujmesaĝilo"
-
-#. TRANS: Tooltip for Instant Messaging menu item.
-#: lib/connectsettingsaction.php:108
-msgid "Updates by instant messenger (IM)"
-msgstr "Ĝisdatiĝo per tujmesaĝilo."
-
-#. TRANS: Menu item for Short Message Service settings.
-#: lib/connectsettingsaction.php:113
-#, fuzzy
-msgctxt "MENU"
-msgid "SMS"
-msgstr "SMS"
-
-#. TRANS: Tooltip for Short Message Service menu item.
-#: lib/connectsettingsaction.php:115
-msgid "Updates by SMS"
-msgstr "Ĝisdatiĝo per SMM"
-
-#. TRANS: Menu item for OuAth connection settings.
-#: lib/connectsettingsaction.php:120
-#, fuzzy
-msgctxt "MENU"
-msgid "Connections"
-msgstr "Konektoj"
-
-#. TRANS: Tooltip for connected applications (Connections through OAuth) menu item.
-#: lib/connectsettingsaction.php:122
-msgid "Authorized connected applications"
-msgstr "Konektitaj aplikaĵoj rajtigitaj"
-
 #: lib/dberroraction.php:59
 msgid "Database error"
 msgstr "Datumbaza eraro"
 
+#. TRANS: Description of form for deleting a user.
+#: lib/deleteuserform.php:75
+msgid "Delete this user"
+msgstr "Forigi la uzanton"
+
+#: lib/designform.php:114
+#, fuzzy
+msgid "Change design"
+msgstr "Savi desegnon"
+
+#. TRANS: Fieldset legend on profile design page to change profile page colours.
+#: lib/designform.php:131
+msgid "Change colours"
+msgstr "Ŝanĝi kolorojn"
+
+#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
+#: lib/designform.php:138
+msgid "Use defaults"
+msgstr "Uzu defaŭlton"
+
+#. TRANS: Title for button on profile design page to reset all colour settings to default.
+#: lib/designform.php:140
+msgid "Restore default designs"
+msgstr "Restaŭri defaŭltajn desegnojn"
+
+#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
+#: lib/designform.php:148
+msgid "Reset back to default"
+msgstr "Redefaŭltiĝi"
+
 #. TRANS: Label in form on profile design page.
 #. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
-#: lib/designsettings.php:108
+#: lib/designform.php:158
 msgid "Upload file"
 msgstr "Alŝuti dosieron"
 
 #. TRANS: Instructions for form on profile design page.
-#: lib/designsettings.php:113
+#: lib/designform.php:163
+#, fuzzy
 msgid ""
-"You can upload your personal background image. The maximum file size is 2MB."
+"You can upload your personal background image. The maximum file size is 2Mb."
 msgstr ""
 "Vi povas alŝuti vian propran fonbildon. La dosiera grandlimo estas 2MB."
 
 #. TRANS: Radio button on profile design page that will enable use of the uploaded profile image.
-#: lib/designsettings.php:139
+#: lib/designform.php:194
 #, fuzzy
 msgctxt "RADIO"
 msgid "On"
 msgstr "En"
 
 #. TRANS: Radio button on profile design page that will disable use of the uploaded profile image.
-#: lib/designsettings.php:156
+#: lib/designform.php:211
 #, fuzzy
 msgctxt "RADIO"
 msgid "Off"
 msgstr "For"
 
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: lib/designsettings.php:175
-msgid "Change colours"
-msgstr "Ŝanĝi kolorojn"
-
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: lib/designsettings.php:257
-msgid "Use defaults"
-msgstr "Uzu defaŭlton"
+#. TRANS: Title for button on profile design page to save settings.
+#: lib/designform.php:322
+msgid "Save design"
+msgstr "Savi desegnon"
 
 #. TRANS: Error message displayed if design settings could not be saved.
 #. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
-#: lib/designsettings.php:405 lib/designsettings.php:427
+#: lib/designsettings.php:216 lib/designsettings.php:238
 msgid "Couldn't update your design."
 msgstr "Malsukcesis ĝisdatigi vian desegnon."
 
 #. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
-#: lib/designsettings.php:433
+#: lib/designsettings.php:244
 msgid "Design defaults restored."
 msgstr "Desegnaj defaŭltoj konserviĝas."
 
@@ -8363,27 +8433,23 @@ msgstr ""
 msgid "Feeds"
 msgstr "Fluoj"
 
-#: lib/galleryaction.php:121
-msgid "Filter tags"
-msgstr "Filtrilo-etikedoj"
-
-#: lib/galleryaction.php:131
+#: lib/galleryaction.php:128
 msgid "All"
 msgstr "Ĉiuj"
 
-#: lib/galleryaction.php:139
+#: lib/galleryaction.php:136
 msgid "Select tag to filter"
 msgstr "Eletu etikedon por filtrado"
 
-#: lib/galleryaction.php:140
+#: lib/galleryaction.php:137
 msgid "Tag"
 msgstr "Etikedo"
 
-#: lib/galleryaction.php:141
+#: lib/galleryaction.php:138
 msgid "Choose a tag to narrow list"
 msgstr ""
 
-#: lib/galleryaction.php:143
+#: lib/galleryaction.php:140
 msgid "Go"
 msgstr "Iri"
 
@@ -8474,6 +8540,12 @@ msgctxt "TOOLTIP"
 msgid "%s blocked users"
 msgstr "Blokito de %s"
 
+#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
+#: lib/groupnav.php:117
+msgctxt "MENU"
+msgid "Admin"
+msgstr "Administri"
+
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
 #: lib/groupnav.php:120
@@ -8584,39 +8656,61 @@ msgid_plural "%dB"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/jabber.php:387
+#: lib/implugin.php:262
 #, php-format
-msgid "[%s]"
-msgstr "[%s]"
+msgid ""
+"User \"%s\" on %s has said that your %s screenname belongs to them. If "
+"that's true, you can confirm by clicking on this URL: %s . (If you cannot "
+"click it, copy-and-paste it into the address bar of your browser). If that "
+"user isn't you, or if you didn't request this confirmation, just ignore this "
+"message."
+msgstr ""
 
-#: lib/jabber.php:567
+#: lib/implugin.php:349
 #, php-format
 msgid "Unknown inbox source %d."
 msgstr "Nekonata alvenkesta fonto %d"
 
+#: lib/implugin.php:485
+#, fuzzy, php-format
+msgid "Message too long - maximum is %1$d characters, you sent %2$d."
+msgstr "Mesaĝo tro longas - longlimo estas %1$d, via estas %2$d"
+
 #: lib/leaveform.php:114
 msgid "Leave"
 msgstr "Forlasi"
 
+#. TRANS: Menu item for logging in to the StatusNet site.
+#: lib/logingroupnav.php:77
+msgctxt "MENU"
+msgid "Login"
+msgstr "Ensaluti"
+
 #. TRANS: Title for menu item for logging in to the StatusNet site.
 #: lib/logingroupnav.php:79
 msgid "Login with a username and password"
 msgstr "Ensaluti per via uzantnomo kaj pasvorto."
 
+#. TRANS: Menu item for registering with the StatusNet site.
+#: lib/logingroupnav.php:85
+msgctxt "MENU"
+msgid "Register"
+msgstr "Registriĝi"
+
 #. TRANS: Title for menu item for registering with the StatusNet site.
 #: lib/logingroupnav.php:87
 msgid "Sign up for a new account"
 msgstr "Krei novan konton"
 
 #. TRANS: Subject for address confirmation email.
-#: lib/mail.php:168
+#: lib/mail.php:172
 msgid "Email address confirmation"
 msgstr "Retpoŝtadresa konfirmo"
 
 #. TRANS: Body for address confirmation email.
 #. TRANS: %1$s is the addressed user's nickname, %2$s is the StatusNet sitename,
 #. TRANS: %3$s is the URL to confirm at.
-#: lib/mail.php:173
+#: lib/mail.php:177
 #, fuzzy, php-format
 msgid ""
 "Hey, %1$s.\n"
@@ -8647,14 +8741,14 @@ msgstr ""
 
 #. TRANS: Subject of new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
-#: lib/mail.php:238
+#: lib/mail.php:243
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1$s nun rigardas viajn avizojn ĉe %2$s."
 
 #. TRANS: This is a paragraph in a new-subscriber e-mail.
 #. TRANS: %s is a URL where the subscriber can be reported as abusive.
-#: lib/mail.php:245
+#: lib/mail.php:250
 #, php-format
 msgid ""
 "If you believe this account is being used abusively, you can block them from "
@@ -8668,7 +8762,7 @@ msgstr ""
 #. TRANS: %3$s is the subscriber's profile URL, %4$s is the subscriber's location (or empty)
 #. TRANS: %5$s is the subscriber's homepage URL (or empty), %6%s is the subscriber's bio (or empty)
 #. TRANS: %7$s is a link to the addressed user's e-mail settings.
-#: lib/mail.php:255
+#: lib/mail.php:260
 #, fuzzy, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -8695,14 +8789,14 @@ msgstr ""
 
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is biographical information.
-#: lib/mail.php:278
+#: lib/mail.php:283
 #, php-format
 msgid "Bio: %s"
 msgstr "Biografio: %s"
 
 #. TRANS: Subject of notification mail for new posting email address.
 #. TRANS: %s is the StatusNet sitename.
-#: lib/mail.php:307
+#: lib/mail.php:312
 #, php-format
 msgid "New email address for posting to %s"
 msgstr "Nova retpoŝta adreso por afiŝi ĉe %s"
@@ -8710,7 +8804,7 @@ msgstr "Nova retpoŝta adreso por afiŝi ĉe %s"
 #. TRANS: Body of notification mail for new posting email address.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is the e-mail address to send
 #. TRANS: to to post by e-mail, %3$s is a URL to more instructions.
-#: lib/mail.php:313
+#: lib/mail.php:318
 #, fuzzy, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -8733,26 +8827,26 @@ msgstr ""
 
 #. TRANS: Subject line for SMS-by-email notification messages.
 #. TRANS: %s is the posting user's nickname.
-#: lib/mail.php:434
+#: lib/mail.php:439
 #, php-format
 msgid "%s status"
 msgstr "%s stato"
 
 #. TRANS: Subject line for SMS-by-email address confirmation message.
-#: lib/mail.php:460
+#: lib/mail.php:465
 msgid "SMS confirmation"
 msgstr "SMS-a konfirmo"
 
 #. TRANS: Main body heading for SMS-by-email address confirmation message.
 #. TRANS: %s is the addressed user's nickname.
-#: lib/mail.php:464
+#: lib/mail.php:469
 #, php-format
 msgid "%s: confirm you own this phone number with this code:"
 msgstr "%s: konfirmi ke vi havas la telefonnumeron per tiu ĉi kodo:"
 
 #. TRANS: Subject for 'nudge' notification email.
 #. TRANS: %s is the nudging user.
-#: lib/mail.php:485
+#: lib/mail.php:490
 #, fuzzy, php-format
 msgid "You have been nudged by %s"
 msgstr "Vin puŝetis %s"
@@ -8760,7 +8854,7 @@ msgstr "Vin puŝetis %s"
 #. TRANS: Body for 'nudge' notification email.
 #. TRANS: %1$s is the nuding user's long name, $2$s is the nudging user's nickname,
 #. TRANS: %3$s is a URL to post notices at, %4$s is the StatusNet sitename.
-#: lib/mail.php:492
+#: lib/mail.php:497
 #, php-format
 msgid ""
 "%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -8789,7 +8883,7 @@ msgstr ""
 
 #. TRANS: Subject for direct-message notification email.
 #. TRANS: %s is the sending user's nickname.
-#: lib/mail.php:539
+#: lib/mail.php:544
 #, php-format
 msgid "New private message from %s"
 msgstr "Nova privata mesaĝo de %s"
@@ -8798,7 +8892,7 @@ msgstr "Nova privata mesaĝo de %s"
 #. TRANS: %1$s is the sending user's long name, %2$s is the sending user's nickname,
 #. TRANS: %3$s is the message content, %4$s a URL to the message,
 #. TRANS: %5$s is the StatusNet sitename.
-#: lib/mail.php:547
+#: lib/mail.php:552
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -8833,7 +8927,7 @@ msgstr ""
 
 #. TRANS: Subject for favorite notification e-mail.
 #. TRANS: %1$s is the adding user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:599
+#: lib/mail.php:604
 #, fuzzy, php-format
 msgid "%1$s (@%2$s) added your notice as a favorite"
 msgstr "%s (@%s) ŝatis vian avizon"
@@ -8843,7 +8937,7 @@ msgstr "%s (@%s) ŝatis vian avizon"
 #. TRANS: %3$s is a URL to the faved notice, %4$s is the faved notice text,
 #. TRANS: %5$s is a URL to all faves of the adding user, %6$s is the StatusNet sitename,
 #. TRANS: %7$s is the adding user's nickname.
-#: lib/mail.php:606
+#: lib/mail.php:611
 #, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -8881,7 +8975,7 @@ msgstr ""
 "%6$s\n"
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:664
+#: lib/mail.php:669
 #, php-format
 msgid ""
 "The full conversation can be read here:\n"
@@ -8894,7 +8988,7 @@ msgstr ""
 
 #. TRANS: E-mail subject for notice notification.
 #. TRANS: %1$s is the sending user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:672
+#: lib/mail.php:677
 #, fuzzy, php-format
 msgid "%1$s (@%2$s) sent a notice to your attention"
 msgstr "%s (@%s) afiŝis avizon al vi"
@@ -8905,7 +8999,7 @@ msgstr "%s (@%s) afiŝis avizon al vi"
 #. TRANS: %5$s is a URL to the full conversion if it exists (otherwise empty),
 #. TRANS: %6$s is a URL to reply to the notice, %7$s is a URL to all @-replied for the addressed user,
 #. TRANS: %8$s is a URL to the addressed user's e-mail settings, %9$s is the sender's nickname.
-#: lib/mail.php:680
+#: lib/mail.php:685
 #, php-format
 msgid ""
 "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -9049,11 +9143,7 @@ msgstr "Ne abonato!"
 msgid "To"
 msgstr "Al"
 
-#: lib/messageform.php:166 lib/noticeform.php:186
-msgid "Available characters"
-msgstr "Haveblaj karakteroj"
-
-#: lib/messageform.php:185 lib/noticeform.php:237
+#: lib/messageform.php:184 lib/noticeform.php:236
 msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr "Sendi"
@@ -9063,16 +9153,10 @@ msgstr "Sendi"
 msgid "Messages"
 msgstr "Mesaĝo"
 
-#: lib/messagelistitem.php:123 lib/noticelist.php:522
+#: lib/messagelistitem.php:123 lib/noticelist.php:527
 msgid "from"
 msgstr "de"
 
-#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:165
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr ""
-"Kromnomo devas havi nur minuskulajn literojn kaj numerojn sed neniun spacon."
-
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 #: lib/nickname.php:178
 msgid "Nickname cannot be empty."
@@ -9095,23 +9179,23 @@ msgstr "Sendi avizon"
 msgid "What's up, %s?"
 msgstr "Kio novas, %s?"
 
-#: lib/noticeform.php:194
+#: lib/noticeform.php:193
 msgid "Attach"
 msgstr "Aldoni"
 
-#: lib/noticeform.php:198
+#: lib/noticeform.php:197
 msgid "Attach a file"
 msgstr "Aldoni dosieron"
 
-#: lib/noticeform.php:213
+#: lib/noticeform.php:212
 msgid "Share my location"
 msgstr "Sciigi mian lokon"
 
-#: lib/noticeform.php:216
+#: lib/noticeform.php:215
 msgid "Do not share my location"
 msgstr "Ne sciigi mian lokon"
 
-#: lib/noticeform.php:217
+#: lib/noticeform.php:216
 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
 "try again later"
@@ -9120,55 +9204,59 @@ msgstr ""
 "poste."
 
 #. TRANS: Used in coordinates as abbreviation of north
-#: lib/noticelist.php:452
+#: lib/noticelist.php:457
 msgid "N"
 msgstr "N"
 
 #. TRANS: Used in coordinates as abbreviation of south
-#: lib/noticelist.php:454
+#: lib/noticelist.php:459
 msgid "S"
 msgstr "S"
 
 #. TRANS: Used in coordinates as abbreviation of east
-#: lib/noticelist.php:456
+#: lib/noticelist.php:461
 msgid "E"
 msgstr "E"
 
 #. TRANS: Used in coordinates as abbreviation of west
-#: lib/noticelist.php:458
+#: lib/noticelist.php:463
 msgid "W"
 msgstr "W"
 
-#: lib/noticelist.php:460
+#: lib/noticelist.php:465
 #, php-format
 msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 
-#: lib/noticelist.php:469
+#: lib/noticelist.php:474
 msgid "at"
 msgstr "al"
 
-#: lib/noticelist.php:518
+#: lib/noticelist.php:523
 msgid "web"
 msgstr "TTT"
 
-#: lib/noticelist.php:584
+#: lib/noticelist.php:589
 msgid "in context"
 msgstr "kuntekste"
 
-#: lib/noticelist.php:619
+#: lib/noticelist.php:624
 msgid "Repeated by"
 msgstr "Ripetita de"
 
-#: lib/noticelist.php:646
+#: lib/noticelist.php:651
 msgid "Reply to this notice"
 msgstr "Respondi ĉi tiun avizon"
 
-#: lib/noticelist.php:647
+#: lib/noticelist.php:652
 msgid "Reply"
 msgstr "Respondi"
 
-#: lib/noticelist.php:691
+#: lib/noticelist.php:678
+msgid "Delete this notice"
+msgstr "Forigi la avizon"
+
+#: lib/noticelist.php:696
 msgid "Notice repeated"
 msgstr "Avizo ripetiĝas"
 
@@ -9205,48 +9293,31 @@ msgstr "Refoja avizo."
 msgid "Couldn't insert new subscription."
 msgstr "Eraris enmeti novan abonon."
 
-#. TRANS: Personal group navigation menu option when logged in for viewing @-replies.
-#: lib/personalgroupnav.php:107
+#: lib/personalgroupnav.php:104
 #, fuzzy
-msgctxt "MENU"
 msgid "Replies"
 msgstr "Respondoj"
 
-#. TRANS: Personal group navigation menu option when logged in for seeing own profile.
-#: lib/personalgroupnav.php:114
+#: lib/personalgroupnav.php:109
 #, fuzzy
-msgctxt "MENU"
-msgid "Profile"
-msgstr "Profilo"
-
-#. TRANS: Personal group navigation menu option when logged in for viewing own favourited notices.
-#: lib/personalgroupnav.php:120
-#, fuzzy
-msgctxt "MENU"
 msgid "Favorites"
 msgstr "Ŝatolisto"
 
-#. TRANS: Personal group navigation menu option when logged in for viewing recieved personal messages.
-#: lib/personalgroupnav.php:133
+#: lib/personalgroupnav.php:120
 #, fuzzy
-msgctxt "MENU"
 msgid "Inbox"
 msgstr "Alvenkesto"
 
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing recieved personal messages.
-#: lib/personalgroupnav.php:135
+#: lib/personalgroupnav.php:121
 msgid "Your incoming messages"
 msgstr "Viaj alvenaj mesaĝoj"
 
-#. TRANS: Personal group navigation menu option when logged in for viewing senet personal messages.
-#: lib/personalgroupnav.php:140
+#: lib/personalgroupnav.php:125
 #, fuzzy
-msgctxt "MENU"
 msgid "Outbox"
 msgstr "Elirkesto"
 
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing senet personal messages.
-#: lib/personalgroupnav.php:142
+#: lib/personalgroupnav.php:126
 msgid "Your sent messages"
 msgstr "Viaj senditaj mesaĝoj"
 
@@ -9261,9 +9332,26 @@ msgstr "Etikedoj en avizoj de %s"
 msgid "Unknown"
 msgstr "Nekonata"
 
+#. TRANS: Plugin admin panel controls
+#: lib/plugindisableform.php:90
+msgctxt "plugin"
+msgid "Disable"
+msgstr ""
+
+#. TRANS: Plugin admin panel controls
+#: lib/pluginenableform.php:112
+msgctxt "plugin"
+msgid "Enable"
+msgstr ""
+
+#: lib/pluginlist.php:196
+msgctxt "plugin-description"
+msgid "(Plugin descriptions unavailable when disabled.)"
+msgstr ""
+
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:82
+#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:88
 msgid "Subscriptions"
 msgstr "Abonatoj"
 
@@ -9274,7 +9362,7 @@ msgstr "Ĉiuj abonatoj"
 
 #. TRANS: H2 text for user subscriber statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:90
+#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:96
 msgid "Subscribers"
 msgstr "Abonantoj"
 
@@ -9296,7 +9384,7 @@ msgstr "Ano ekde"
 #. TRANS: Label for user statistics.
 #. TRANS: H2 text for user group membership statistics.
 #: lib/profileaction.php:239 lib/profileaction.php:290
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:104
 msgid "Groups"
 msgstr "Grupoj"
 
@@ -9316,10 +9404,6 @@ msgstr "Ĉiuj grupoj"
 msgid "Unimplemented method."
 msgstr "Nerealiĝita metodo"
 
-#: lib/publicgroupnav.php:78
-msgid "Public"
-msgstr "Publika"
-
 #: lib/publicgroupnav.php:82
 msgid "User groups"
 msgstr "Uzantaj grupoj"
@@ -9359,7 +9443,7 @@ msgid "Revoke the \"%s\" role from this user"
 msgstr "Revoki rolon %s de la uzanto"
 
 #. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:974
+#: lib/router.php:1001
 #, fuzzy
 msgid "Page not found."
 msgstr "Metodo de API ne troviĝas."
@@ -9389,11 +9473,6 @@ msgctxt "BUTTON"
 msgid "Search"
 msgstr "Serĉi"
 
-#. TRANS: Definition list item with instructions on how to get (better) search results.
-#: lib/searchaction.php:170
-msgid "Search help"
-msgstr "Serĉa gvido"
-
 #: lib/searchgroupnav.php:80
 msgid "People"
 msgstr "Homon"
@@ -9418,6 +9497,51 @@ msgstr "Sentitola sekcio"
 msgid "More..."
 msgstr "Pli..."
 
+#: lib/settingsnav.php:78
+msgid "Change your profile settings"
+msgstr "Ŝanĝi vian profilan agordon."
+
+#: lib/settingsnav.php:83
+msgid "Upload an avatar"
+msgstr "Alŝuti vizaĝbildon"
+
+#: lib/settingsnav.php:88
+msgid "Change your password"
+msgstr "Ŝanĝi vian pasvorton."
+
+#: lib/settingsnav.php:93
+msgid "Change email handling"
+msgstr "Ŝanĝi retpoŝtan disponadon."
+
+#: lib/settingsnav.php:98
+msgid "Design your profile"
+msgstr "Desegni vian profilon"
+
+#: lib/settingsnav.php:102
+msgid "URL"
+msgstr "URL"
+
+#: lib/settingsnav.php:103
+msgid "URL shorteners"
+msgstr ""
+
+#: lib/settingsnav.php:111
+msgid "Updates by instant messenger (IM)"
+msgstr "Ĝisdatiĝo per tujmesaĝilo."
+
+#: lib/settingsnav.php:118
+msgid "Updates by SMS"
+msgstr "Ĝisdatiĝo per SMM"
+
+#: lib/settingsnav.php:123
+#, fuzzy
+msgid "Connections"
+msgstr "Konektoj"
+
+#: lib/settingsnav.php:124
+msgid "Authorized connected applications"
+msgstr "Konektitaj aplikaĵoj rajtigitaj"
+
 #: lib/silenceform.php:67
 msgid "Silence"
 msgstr "Silento"
@@ -9426,30 +9550,34 @@ msgstr "Silento"
 msgid "Silence this user"
 msgstr "Silentigi la uzanton"
 
-#: lib/subgroupnav.php:83
+#: lib/subgroupnav.php:89
 #, php-format
 msgid "People %s subscribes to"
 msgstr "Abonatoj de %s"
 
-#: lib/subgroupnav.php:91
+#: lib/subgroupnav.php:97
 #, php-format
 msgid "People subscribed to %s"
 msgstr "Abonantoj de %s"
 
-#: lib/subgroupnav.php:99
+#: lib/subgroupnav.php:105
 #, php-format
 msgid "Groups %s is a member of"
 msgstr "Grupoj de %s"
 
-#: lib/subgroupnav.php:105
+#: lib/subgroupnav.php:111
 msgid "Invite"
 msgstr "Inviti"
 
-#: lib/subgroupnav.php:106
+#: lib/subgroupnav.php:112
 #, php-format
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Inviti amikojn kaj kolegojn al %s kun vi"
 
+#: lib/subscribeform.php:115 lib/subscribeform.php:139
+msgid "Subscribe to this user"
+msgstr "Aboni la uzanton"
+
 #: lib/subscriberspeopleselftagcloudsection.php:48
 #: lib/subscriptionspeopleselftagcloudsection.php:48
 msgid "People Tagcloud as self-tagged"
@@ -9523,6 +9651,13 @@ msgstr "Desegno enhavas dosieron de tipo \".%s\", kiu malpermesiĝas."
 msgid "Error opening theme archive."
 msgstr "Eraris malfermi desegnan arkivon."
 
+#: lib/threadednoticelist.php:270
+#, php-format
+msgid "Show all %d comment"
+msgid_plural "Show all %d comments"
+msgstr[0] ""
+msgstr[1] ""
+
 #: lib/topposterssection.php:74
 msgid "Top posters"
 msgstr "Pintaj afiŝantoj"
@@ -9565,76 +9700,80 @@ msgstr "Malaboni"
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "La uzanto ne havas profilon."
 
-#. TRANS: Link text for changeing the avatar of the logged in user.
-#: lib/userprofile.php:121
+#: lib/userprofile.php:116
 msgid "Edit Avatar"
 msgstr "Redakti vizaĝbildon"
 
 #. TRANS: H2 for user actions in a profile.
 #. TRANS: H2 for entity actions in a profile.
-#: lib/userprofile.php:245 lib/userprofile.php:261
+#: lib/userprofile.php:216 lib/userprofile.php:232
 msgid "User actions"
 msgstr "Nekonata ago"
 
 #. TRANS: Text shown in user profile of not yet compeltely deleted users.
-#: lib/userprofile.php:249
+#: lib/userprofile.php:220
 msgid "User deletion in progress..."
 msgstr "Forigante uzanton..."
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:277
+#: lib/userprofile.php:248
 msgid "Edit profile settings"
 msgstr "Redakti profilan agordon"
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:279
+#: lib/userprofile.php:250
 msgid "Edit"
 msgstr "Redakti"
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:303
+#: lib/userprofile.php:274
 msgid "Send a direct message to this user"
 msgstr "Sendi rektan mesaĝon a ĉi tiu uzanto"
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:305
+#: lib/userprofile.php:276
 msgid "Message"
 msgstr "Mesaĝo"
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:347
+#: lib/userprofile.php:318
 msgid "Moderate"
 msgstr "Moderigi"
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:386
+#: lib/userprofile.php:357
 msgid "User role"
 msgstr "Uzanta rolo"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:389
+#: lib/userprofile.php:360
 msgctxt "role"
 msgid "Administrator"
 msgstr "Administranto"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:391
+#: lib/userprofile.php:362
 msgctxt "role"
 msgid "Moderator"
 msgstr "Moderanto"
 
+#: lib/util.php:321
+#, fuzzy
+msgid "Not allowed to log in."
+msgstr "Ne konektita."
+
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1306
+#: lib/util.php:1337
 msgid "a few seconds ago"
 msgstr "antaŭ kelkaj sekundoj"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1309
+#: lib/util.php:1340
 msgid "about a minute ago"
 msgstr "antaŭ ĉirkaŭ unu minuto"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1313
+#: lib/util.php:1344
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
@@ -9642,12 +9781,12 @@ msgstr[0] "antaŭ ĉirkaŭ unu minuto"
 msgstr[1] "antaŭ ĉirkaŭ %d minutoj"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1316
+#: lib/util.php:1347
 msgid "about an hour ago"
 msgstr "antaŭ ĉirkaŭ unu horo"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1320
+#: lib/util.php:1351
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
@@ -9655,12 +9794,12 @@ msgstr[0] "antaŭ ĉirkaŭ unu horo"
 msgstr[1] "antaŭ ĉirkaŭ %d horoj"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1323
+#: lib/util.php:1354
 msgid "about a day ago"
 msgstr "antaŭ ĉirkaŭ unu tago"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1327
+#: lib/util.php:1358
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
@@ -9668,12 +9807,12 @@ msgstr[0] "antaŭ ĉirkaŭ unu tago"
 msgstr[1] "antaŭ ĉirkaŭ %d tagoj"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1330
+#: lib/util.php:1361
 msgid "about a month ago"
 msgstr "Antaŭ ĉrikaŭ unu monato"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1334
+#: lib/util.php:1365
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
@@ -9681,7 +9820,7 @@ msgstr[0] "antaŭ ĉirkaŭ unu monato"
 msgstr[1] "antaŭ ĉirkaŭ %d monatoj"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1337
+#: lib/util.php:1368
 msgid "about a year ago"
 msgstr "antaŭ ĉirkaŭ unu jaro"
 
@@ -9692,21 +9831,6 @@ msgstr "antaŭ ĉirkaŭ unu jaro"
 msgid "%s is not a valid color! Use 3 or 6 hex characters."
 msgstr "%s ne estas valida koloro! Uzu 3 aŭ 6 deksesumaĵojn."
 
-#. TRANS: %s is the URL to the StatusNet site's Instant Messaging settings.
-#: lib/xmppmanager.php:287
-#, php-format
-msgid "Unknown user. Go to %s to add your address to your account"
-msgstr ""
-
-#. TRANS: Response to XMPP source when it sent too long a message.
-#. TRANS: %1$d the maximum number of allowed characters (used for plural), %2$d is the sent number.
-#: lib/xmppmanager.php:406
-#, fuzzy, php-format
-msgid "Message too long. Maximum is %1$d character, you sent %2$d."
-msgid_plural "Message too long. Maximum is %1$d characters, you sent %2$d."
-msgstr[0] "Mesaĝo tro longas - longlimo estas %1$d, via estas %2$d"
-msgstr[1] "Mesaĝo tro longas - longlimo estas %1$d, via estas %2$d"
-
 #. TRANS: Exception.
 #: lib/xrd.php:63
 #, fuzzy
@@ -9725,73 +9849,176 @@ msgid "Getting backup from file '%s'."
 msgstr ""
 
 #, fuzzy
-#~ msgid "Block this user."
-#~ msgstr "Bloki la uzanton"
+#~ msgid "Could not generate feed for group - %s"
+#~ msgstr "Malsukcesis ĝisdatigi grupon."
 
 #, fuzzy
-#~ msgid "Delete this notice."
-#~ msgstr "Forigi la avizon"
-
-#, fuzzy
-#~ msgid "Delete this user."
-#~ msgstr "Forigi la uzanton"
-
-#, fuzzy
-#~ msgid "Restore default designs."
-#~ msgstr "Restaŭri defaŭltajn desegnojn"
-
-#, fuzzy
-#~ msgid "Reset back to default."
-#~ msgstr "Redefaŭltiĝi"
-
-#, fuzzy
-#~ msgid "Save design."
-#~ msgstr "Savi desegnon"
-
-#, fuzzy
-#~ msgid "Disfavor favorite."
-#~ msgstr "Malŝati ŝataton."
-
-#, fuzzy
-#~ msgid "\"%s\" not found."
-#~ msgstr "Metodo de API ne troviĝas."
-
-#, fuzzy
-#~ msgid "Notice %s not found."
-#~ msgstr "Metodo de API ne troviĝas."
-
-#, fuzzy
-#~ msgid "Attachment %s not found."
-#~ msgstr "Ricevonta uzanto ne troviĝas."
-
-#, fuzzy
-#~ msgid "Invalid tag: \"%s\"."
-#~ msgstr "Nevalida markilo: \"%s\""
-
-#, fuzzy
-#~ msgid "%s updates from everyone."
-#~ msgstr "%s ĝisdatigoj de ĉiuj!"
-
-#, fuzzy
-#~ msgid "Password saved"
-#~ msgstr "Pasvorto konservitas."
-
-#, fuzzy
-#~ msgid "Where you are, like \"City, State (or Region), Country\"."
-#~ msgstr "Kie vi estas, ekzemple \"Urbo, Ŝtato (aŭ Regiono), Lando\""
-
-#, fuzzy
-#~ msgid "Subscribe to this user."
-#~ msgstr "Aboni la uzanton"
+#~ msgid "Current confirmed Jabber/Google Talk address."
+#~ msgstr "Nuna konfirmita Jabber/GTalk-adreso."
 
 #, fuzzy
 #~ msgid ""
-#~ "Listenee stream license \"%1$s\" is not compatible with site license \"%2"
-#~ "$s\"."
+#~ "Jabber or Google Talk address, like \"UserName@example.org\". First, make "
+#~ "sure to add %s to your buddy list in your IM client or on Google Talk."
 #~ msgstr ""
-#~ "Rigardato-flua permesilo \"%1$s\" ne konformas al reteja permesilo \"%2$s"
-#~ "\"."
+#~ "Jabber/GTalk-adreso, ekzemple \"UserName@example.org\". Unue, certe "
+#~ "aldonu %s al via amikolisto je via tujmesaĝilo-kliento aŭ je GTalk."
 
 #, fuzzy
-#~ msgid "Not allowed to log in."
-#~ msgstr "Ne konektita."
+#~ msgid "Send me notices through Jabber/Google Talk."
+#~ msgstr "Sendu al mi avizojn per Jabber/GTalk."
+
+#, fuzzy
+#~ msgid "Publish a MicroID for my Jabber/Google Talk address."
+#~ msgstr "Publikigu MikroID por mia Jabber/GTalk-adreso."
+
+#~ msgid "No Jabber ID."
+#~ msgstr "Mankas Jabber-ID."
+
+#, fuzzy
+#~ msgid "Not a valid Jabber ID."
+#~ msgstr "Tio ne estas valida Jabber-ID"
+
+#~ msgid "That is already your Jabber ID."
+#~ msgstr "Tio estas jam via Jabber-ID."
+
+#~ msgid "That is not your Jabber ID."
+#~ msgstr "Tio ne estas via Jabber-ID."
+
+#~ msgid "Other settings"
+#~ msgstr "Aliaj agordoj"
+
+#~ msgid "Tag cloud"
+#~ msgstr "Entikedo-nubo"
+
+#~ msgid "Consumer key"
+#~ msgstr "Konsumanta ŝlosilo"
+
+#~ msgid "Consumer secret"
+#~ msgstr "Konsumanta sekreto"
+
+#~ msgid "Request token URL"
+#~ msgstr "Pet-ĵetona URL"
+
+#~ msgid "Access token URL"
+#~ msgstr "Alir-ĵetona URL"
+
+#~ msgid "Authorize URL"
+#~ msgstr "Rajtigi URL"
+
+#~ msgid "Jabber"
+#~ msgstr "Jabber"
+
+#~ msgid "Photo"
+#~ msgstr "Foto"
+
+#~ msgid "Other options"
+#~ msgstr "Aliaj"
+
+#~ msgid "Other"
+#~ msgstr "Alia"
+
+#~ msgid "Primary site navigation"
+#~ msgstr "Unua reteja navigado"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Personal profile and friends timeline"
+#~ msgstr "Tempstrio pri vi kaj amikoj"
+
+#~ msgctxt "MENU"
+#~ msgid "Personal"
+#~ msgstr "Persona"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Change your email, avatar, password, profile"
+#~ msgstr "Ŝanĝu la retpoŝtadreson, vizaĝbildon, pasvorton aŭ la profilon"
+
+#~ msgid "Account"
+#~ msgstr "Konto"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Connect to services"
+#~ msgstr "Konekti al servoj"
+
+#~ msgid "Connect"
+#~ msgstr "Konekti"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Change site configuration"
+#~ msgstr "Ŝanĝi agordojn de la retejo"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Invite friends and colleagues to join you on %s"
+#~ msgstr "Inviti amikojn kaj kolegojn al %s kun vi"
+
+#~ msgctxt "MENU"
+#~ msgid "Invite"
+#~ msgstr "Inviti"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Create an account"
+#~ msgstr "Krei konton"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Help me!"
+#~ msgstr "Helpu min!"
+
+#~ msgctxt "MENU"
+#~ msgid "Help"
+#~ msgstr "Helpo"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Search for people or text"
+#~ msgstr "Serĉi homon aŭ tekston"
+
+#~ msgid "Local views"
+#~ msgstr "Loka vido"
+
+#~ msgid "Page notice"
+#~ msgstr "Paĝa anonco"
+
+#~ msgid "Secondary site navigation"
+#~ msgstr "Dua reteja navigado"
+
+#~ msgid "StatusNet software license"
+#~ msgstr "Permesilo de la programaro StatusNet"
+
+#~ msgid "Site content license"
+#~ msgstr "Reteja enhava permesilo"
+
+#~ msgid "Pagination"
+#~ msgstr "Paĝado"
+
+#~ msgid "Author"
+#~ msgstr "Aŭtoro"
+
+#~ msgid "Provider"
+#~ msgstr "Donanto"
+
+#, fuzzy
+#~ msgctxt "MENU"
+#~ msgid "SMS"
+#~ msgstr "SMS"
+
+#~ msgid "Filter tags"
+#~ msgstr "Filtrilo-etikedoj"
+
+#~ msgid "[%s]"
+#~ msgstr "[%s]"
+
+#~ msgid "Available characters"
+#~ msgstr "Haveblaj karakteroj"
+
+#, fuzzy
+#~ msgctxt "MENU"
+#~ msgid "Profile"
+#~ msgstr "Profilo"
+
+#~ msgid "Search help"
+#~ msgstr "Serĉa gvido"
+
+#, fuzzy
+#~ msgid "Message too long. Maximum is %1$d character, you sent %2$d."
+#~ msgid_plural "Message too long. Maximum is %1$d characters, you sent %2$d."
+#~ msgstr[0] "Mesaĝo tro longas - longlimo estas %1$d, via estas %2$d"
+#~ msgstr[1] "Mesaĝo tro longas - longlimo estas %1$d, via estas %2$d"
diff --git a/locale/es/LC_MESSAGES/statusnet.po b/locale/es/LC_MESSAGES/statusnet.po
index 76a4d50d1d..5efac6b410 100644
--- a/locale/es/LC_MESSAGES/statusnet.po
+++ b/locale/es/LC_MESSAGES/statusnet.po
@@ -18,8 +18,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 15:58+0000\n"
-"PO-Revision-Date: 2011-03-03 16:00:25+0000\n"
+"POT-Creation-Date: 2011-03-03 17:23+0000\n"
+"PO-Revision-Date: 2011-03-03 17:25:55+0000\n"
 "Language-Team: Spanish <http://translatewiki.net/wiki/Portal:es>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -85,23 +85,23 @@ msgstr "Guardar la configuración de acceso"
 #. TRANS: Tooltip for button to save access settings in site admin panel.
 #. TRANS: Button text for saving theme settings.
 #. TRANS: Button label to save e-mail preferences.
-#. TRANS: Button label to save Instant Messaging preferences.
-#. TRANS: Button text for saving "Other settings" in profile.
+#. TRANS: Button label to save IM preferences.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
 #. TRANS: Button text for saving site notice in admin panel.
 #. TRANS: Button label to save SMS preferences.
 #. TRANS: Save button for settings for a profile in a subscriptions list.
+#. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
 #. TRANS: Button text on profile design page to save settings.
 #: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
-#: actions/emailsettings.php:250 actions/imsettings.php:183
-#: actions/othersettings.php:136 actions/pathsadminpanel.php:512
-#: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
-#: actions/smssettings.php:205 actions/subscriptions.php:259
+#: actions/emailsettings.php:251 actions/imsettings.php:199
+#: actions/pathsadminpanel.php:512 actions/profilesettings.php:198
+#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:204
+#: actions/subscriptions.php:261 actions/urlsettings.php:152
 #: actions/useradminpanel.php:298 lib/applicationeditform.php:355
-#: lib/designsettings.php:270 lib/groupeditform.php:201
+#: lib/designform.php:320 lib/groupeditform.php:201
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Guardar"
@@ -140,7 +140,11 @@ msgstr "No existe tal página."
 #. 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 use "one time password login" without using an existing user.
+#. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
+#. TRANS: Client error displayed trying to find a user by ID for a non-existing ID.
+#. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when calling a profile action without specifying a user.
 #: actions/all.php:80 actions/allrss.php:69
@@ -152,19 +156,19 @@ msgstr "No existe tal página."
 #: actions/apidirectmessage.php:75 actions/apidirectmessagenew.php:72
 #: actions/apigroupcreate.php:111 actions/apigroupismember.php:89
 #: actions/apigroupjoin.php:98 actions/apigroupleave.php:98
-#: actions/apigrouplist.php:70 actions/apistatusesupdate.php:230
-#: actions/apisubscriptions.php:85 actions/apitimelinefavorites.php:70
-#: actions/apitimelinefriends.php:173 actions/apitimelinehome.php:78
-#: actions/apitimelinementions.php:77 actions/apitimelineuser.php:79
-#: actions/avatarbynickname.php:79 actions/favoritesrss.php:72
-#: actions/foaf.php:42 actions/foaf.php:61 actions/hcard.php:67
-#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
-#: actions/remotesubscribe.php:144 actions/remotesubscribe.php:153
-#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
-#: actions/showfavorites.php:106 actions/userbyid.php:74
-#: actions/usergroups.php:93 actions/userrss.php:40 actions/userxrd.php:59
-#: actions/xrds.php:71 lib/command.php:509 lib/galleryaction.php:59
-#: lib/mailbox.php:80 lib/profileaction.php:77
+#: actions/apigrouplist.php:70 actions/apigroupprofileupdate.php:108
+#: actions/apistatusesupdate.php:230 actions/apisubscriptions.php:85
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:173
+#: actions/apitimelinehome.php:78 actions/apitimelinementions.php:77
+#: actions/apitimelineuser.php:79 actions/avatarbynickname.php:79
+#: actions/favoritesrss.php:72 actions/foaf.php:42 actions/foaf.php:61
+#: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116
+#: actions/otp.php:78 actions/remotesubscribe.php:144
+#: actions/remotesubscribe.php:153 actions/replies.php:73
+#: actions/repliesrss.php:38 actions/rsd.php:113 actions/showfavorites.php:106
+#: actions/userbyid.php:75 actions/usergroups.php:93 actions/userrss.php:40
+#: actions/userxrd.php:59 actions/xrds.php:71 lib/command.php:509
+#: lib/galleryaction.php:59 lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "No existe ese usuario."
 
@@ -178,10 +182,9 @@ msgstr "%1$s y sus amistades, página %2$d"
 #. TRANS: H1 text for page. %s is a user nickname.
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Timeline title for user and friends. %s is a user nickname.
-#. TRANS: Tooltop for personal group navigation menu option when logged in for viewing timeline of self and friends.
 #: actions/all.php:94 actions/all.php:191 actions/allrss.php:117
 #: actions/apitimelinefriends.php:207 actions/apitimelinehome.php:113
-#: lib/personalgroupnav.php:102
+#: lib/personalgroupnav.php:100
 #, php-format
 msgid "%s and friends"
 msgstr "%s y sus amistades"
@@ -239,7 +242,7 @@ msgstr ""
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
 #. TRANS: Second sentence of empty message for anonymous users. %s is a user nickname.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:227
+#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:221
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -288,19 +291,20 @@ msgstr "¡Actualizaciones de %1$s y sus amistades en %2$s!"
 #: actions/apifavoritecreate.php:98 actions/apifavoritedestroy.php:98
 #: actions/apifriendshipscreate.php:99 actions/apifriendshipsdestroy.php:99
 #: actions/apifriendshipsshow.php:124 actions/apigroupcreate.php:138
-#: actions/apigroupismember.php:115 actions/apigroupjoin.php:160
-#: actions/apigroupleave.php:145 actions/apigrouplist.php:134
+#: actions/apigroupismember.php:115 actions/apigroupjoin.php:151
+#: actions/apigroupleave.php:141 actions/apigrouplist.php:134
 #: actions/apigrouplistall.php:120 actions/apigroupmembership.php:105
+#: actions/apigroupprofileupdate.php:100 actions/apigroupprofileupdate.php:213
 #: actions/apigroupshow.php:114 actions/apihelptest.php:84
 #: actions/apistatusesdestroy.php:101 actions/apistatusesretweets.php:110
 #: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:139
 #: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
-#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:268
-#: actions/apitimelinegroup.php:147 actions/apitimelinehome.php:173
-#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:239
-#: actions/apitimelineretweetedtome.php:118
-#: actions/apitimelineretweetsofme.php:150 actions/apitimelinetag.php:159
-#: actions/apitimelineuser.php:206 actions/apiusershow.php:100
+#: actions/apitimelinefavorites.php:182 actions/apitimelinefriends.php:276
+#: actions/apitimelinegroup.php:148 actions/apitimelinehome.php:181
+#: actions/apitimelinementions.php:182 actions/apitimelinepublic.php:247
+#: actions/apitimelineretweetedtome.php:147
+#: actions/apitimelineretweetsofme.php:147 actions/apitimelinetag.php:165
+#: actions/apitimelineuser.php:217 actions/apiusershow.php:100
 msgid "API method not found."
 msgstr "Método de API no encontrado."
 
@@ -315,8 +319,9 @@ msgstr "Método de API no encontrado."
 #: actions/apifavoritecreate.php:88 actions/apifavoritedestroy.php:88
 #: actions/apifriendshipscreate.php:89 actions/apifriendshipsdestroy.php:89
 #: actions/apigroupcreate.php:102 actions/apigroupjoin.php:89
-#: actions/apigroupleave.php:89 actions/apimediaupload.php:66
-#: actions/apistatusesretweet.php:63 actions/apistatusesupdate.php:194
+#: actions/apigroupleave.php:89 actions/apigroupprofileupdate.php:92
+#: actions/apimediaupload.php:66 actions/apistatusesretweet.php:63
+#: actions/apistatusesupdate.php:194
 msgid "This method requires a POST."
 msgstr "Este método requiere un POST."
 
@@ -330,21 +335,16 @@ msgstr ""
 "elegir entre: sms, im, ninguno."
 
 #. TRANS: Server error displayed when a user's delivery device cannot be updated.
-#. TRANS: Server error displayed when a user update to the database fails in the contact address confirmation action.
 #. TRANS: Server error thrown on database error updating e-mail preferences.
 #. TRANS: Server error thrown on database error removing a registered e-mail address.
-#. TRANS: Server error thrown on database error updating Instant Messaging preferences.
-#. TRANS: Server error thrown on database error removing a registered Instant Messaging address.
-#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
 #. TRANS: Server error thrown when user profile settings could not be updated.
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
-#: actions/apiaccountupdatedeliverydevice.php:130
-#: actions/confirmaddress.php:118 actions/emailsettings.php:352
-#: actions/emailsettings.php:498 actions/imsettings.php:276
-#: actions/imsettings.php:432 actions/othersettings.php:186
-#: actions/profilesettings.php:322 actions/smssettings.php:301
-#: actions/smssettings.php:454
+#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
+#: actions/apiaccountupdatedeliverydevice.php:136
+#: actions/emailsettings.php:353 actions/emailsettings.php:499
+#: actions/profilesettings.php:323 actions/smssettings.php:300
+#: actions/smssettings.php:453 actions/urlsettings.php:211
 msgid "Could not update user."
 msgstr "No se pudo actualizar el usuario."
 
@@ -370,7 +370,7 @@ msgstr "El usuario no tiene un perfil."
 
 #. TRANS: Server error displayed if a user profile could not be saved.
 #. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:418
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:419
 msgid "Could not save profile."
 msgstr "No se pudo guardar el perfil."
 
@@ -382,7 +382,7 @@ msgstr "No se pudo guardar el perfil."
 #: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
 #: actions/designadminpanel.php:120 actions/editapplication.php:121
 #: actions/newapplication.php:102 actions/newnotice.php:95
-#: lib/designsettings.php:298
+#: lib/designsettings.php:110
 #, fuzzy, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s byte) due to its "
@@ -407,8 +407,8 @@ msgstr[1] ""
 #: actions/apiaccountupdateprofilecolors.php:160
 #: actions/apiaccountupdateprofilecolors.php:171
 #: actions/groupdesignsettings.php:285 actions/groupdesignsettings.php:296
-#: actions/userdesignsettings.php:201 actions/userdesignsettings.php:211
-#: actions/userdesignsettings.php:253 actions/userdesignsettings.php:263
+#: actions/userdesignsettings.php:218 actions/userdesignsettings.php:228
+#: actions/userdesignsettings.php:270 actions/userdesignsettings.php:280
 msgid "Unable to save your design settings."
 msgstr "No se pudo grabar tu configuración de diseño."
 
@@ -416,7 +416,7 @@ msgstr "No se pudo grabar tu configuración de diseño."
 #. TRANS: Client error displayed when a database error occurs updating profile colours.
 #: actions/apiaccountupdateprofilebackgroundimage.php:191
 #: actions/apiaccountupdateprofilecolors.php:139
-#: actions/userdesignsettings.php:179
+#: actions/userdesignsettings.php:196
 msgid "Could not update your design."
 msgstr "No se pudo actualizar tu diseño."
 
@@ -525,7 +525,7 @@ msgstr "No se encuentra usuario receptor."
 #. TRANS: Client error displayed trying to direct message another user who's not a friend (403).
 #: actions/apidirectmessagenew.php:144
 #, fuzzy
-msgid "Can't send direct messages to users who aren't your friend."
+msgid "Cannot send direct messages to users who aren't your friend."
 msgstr "No se puede enviar mensajes directos a usuarios que no son tu amigo."
 
 #. TRANS: Client error displayed trying to direct message self (403).
@@ -608,9 +608,9 @@ msgstr "No se pudo encontrar ningún usuario de destino."
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:156 actions/editgroup.php:191
-#: actions/newgroup.php:137 actions/profilesettings.php:273
-#: actions/register.php:214
+#: actions/apigroupcreate.php:156 actions/apigroupprofileupdate.php:255
+#: actions/editgroup.php:191 actions/newgroup.php:137
+#: actions/profilesettings.php:274 actions/register.php:199
 msgid "Nickname already in use. Try another one."
 msgstr "El usuario ya existe. Prueba con otro."
 
@@ -618,9 +618,9 @@ msgstr "El usuario ya existe. Prueba con otro."
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:164 actions/editgroup.php:195
-#: actions/newgroup.php:141 actions/profilesettings.php:243
-#: actions/register.php:216
+#: actions/apigroupcreate.php:164 actions/apigroupprofileupdate.php:259
+#: actions/editgroup.php:195 actions/newgroup.php:141
+#: actions/profilesettings.php:244 actions/register.php:201
 msgid "Not a valid nickname."
 msgstr "Usuario inválido"
 
@@ -630,10 +630,10 @@ msgstr "Usuario inválido"
 #. TRANS: Validation error shown when providing an invalid homepage URL in the "New application" form.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:181 actions/editapplication.php:235
-#: actions/editgroup.php:202 actions/newapplication.php:221
-#: actions/newgroup.php:148 actions/profilesettings.php:248
-#: actions/register.php:223
+#: actions/apigroupcreate.php:181 actions/apigroupprofileupdate.php:277
+#: actions/editapplication.php:235 actions/editgroup.php:202
+#: actions/newapplication.php:221 actions/newgroup.php:148
+#: actions/profilesettings.php:249 actions/register.php:208
 msgid "Homepage is not a valid URL."
 msgstr "La página de inicio no es un URL válido."
 
@@ -642,8 +642,8 @@ msgstr "La página de inicio no es un URL válido."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:191 actions/editgroup.php:206
-#: actions/newgroup.php:152 actions/profilesettings.php:252
-#: actions/register.php:226
+#: actions/newgroup.php:152 actions/profilesettings.php:253
+#: actions/register.php:211
 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "Tu nombre es demasiado largo (max. 255 carac.)"
@@ -671,8 +671,8 @@ msgstr[1] "La descripción es demasiado larga (máx. %d caracteres)."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:215 actions/editgroup.php:218
-#: actions/newgroup.php:164 actions/profilesettings.php:265
-#: actions/register.php:235
+#: actions/newgroup.php:164 actions/profilesettings.php:266
+#: actions/register.php:220
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
 msgstr "La ubicación es demasiado larga (máx. 255 caracteres)."
@@ -702,15 +702,16 @@ msgstr "Alias inválido: \"%s\"."
 #. TRANS: %s is the alias that is already in use.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error. %s is the already used alias.
-#: actions/apigroupcreate.php:264 actions/editgroup.php:246
-#: actions/newgroup.php:193
+#: actions/apigroupcreate.php:264 actions/apigroupprofileupdate.php:351
+#: actions/editgroup.php:246 actions/newgroup.php:193
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "El alias \"%s\" ya está en uso. Intenta usar otro."
 
 #. TRANS: Client error displayed when trying to use an alias during group creation that is the same as the group's nickname.
 #. TRANS: Group edit form validation error.
-#: actions/apigroupcreate.php:278 actions/editgroup.php:253
+#: actions/apigroupcreate.php:278 actions/apigroupprofileupdate.php:359
+#: actions/editgroup.php:253
 msgid "Alias can't be the same as nickname."
 msgstr "El alias no puede ser el mismo que el usuario."
 
@@ -722,7 +723,8 @@ msgstr "El alias no puede ser el mismo que el usuario."
 #. TRANS: Client error displayed requesting most recent notices to a group for a non-existing group.
 #: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
 #: actions/apigroupleave.php:104 actions/apigroupmembership.php:71
-#: actions/apigroupshow.php:81 actions/apitimelinegroup.php:89
+#: actions/apigroupprofileupdate.php:113 actions/apigroupshow.php:81
+#: actions/apitimelinegroup.php:89
 msgid "Group not found."
 msgstr "Grupo no encontrado."
 
@@ -740,13 +742,11 @@ msgstr "Ya eres miembro de ese grupo"
 msgid "You have been blocked from that group by the admin."
 msgstr "Has sido bloqueado de ese grupo por el administrador."
 
-#. TRANS: Server error displayed when joining a group fails.
-#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
 #. 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.
 #. TRANS: Message given having failed to add a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:362
+#: actions/apigroupjoin.php:136 actions/joingroup.php:139 lib/command.php:362
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "No se pudo unir el usuario %s al grupo %s"
@@ -756,8 +756,6 @@ msgstr "No se pudo unir el usuario %s al grupo %s"
 msgid "You are not a member of this group."
 msgstr "No eres miembro de este grupo."
 
-#. TRANS: Server error displayed when leaving a group fails.
-#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
 #. TRANS: Server error displayed when leaving a group failed in the database.
 #. TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
 #. TRANS: Message given having failed to remove a user from a group.
@@ -793,6 +791,63 @@ msgstr "Grupos %s"
 msgid "groups on %s"
 msgstr "Grupos en %s"
 
+#. TRANS: Client error displayed trying to edit a group while not being a group admin.
+#. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
+#. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
+#: actions/apigroupprofileupdate.php:118 actions/editgroup.php:110
+#: actions/editgroup.php:176 actions/groupdesignsettings.php:109
+#: actions/grouplogo.php:111
+msgid "You must be an admin to edit the group."
+msgstr "Para editar el grupo debes ser administrador."
+
+#. TRANS: Server error displayed when editing a group fails.
+#: actions/apigroupprofileupdate.php:171 actions/editgroup.php:274
+msgid "Could not update group."
+msgstr "No se pudo actualizar el grupo."
+
+#. TRANS: Server error displayed when group aliases could not be added.
+#. TRANS: Server exception thrown when creating group aliases failed.
+#: actions/apigroupprofileupdate.php:194 actions/editgroup.php:281
+#: classes/User_group.php:540
+msgid "Could not create aliases."
+msgstr "No fue posible crear alias."
+
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: actions/apigroupprofileupdate.php:249 lib/nickname.php:165
+msgid "Nickname must have only lowercase letters and numbers and no spaces."
+msgstr ""
+"El usuario debe tener solamente letras minúsculas y números y no puede tener "
+"espacios."
+
+#: actions/apigroupprofileupdate.php:286
+#, fuzzy
+msgid "Full name is too long (max 255 chars)."
+msgstr "Tu nombre es demasiado largo (max. 255 carac.)"
+
+#: actions/apigroupprofileupdate.php:296
+#, fuzzy, php-format
+msgid "description is too long (max %d chars)."
+msgstr "La descripción es demasiado larga (máx. %d caracteres)."
+
+#: actions/apigroupprofileupdate.php:307
+#, fuzzy
+msgid "Location is too long (max 255 chars)."
+msgstr "La ubicación es demasiado larga (máx. 255 caracteres)."
+
+#: actions/apigroupprofileupdate.php:326
+#, fuzzy, php-format
+msgid "Too many aliases! Maximum %d."
+msgstr "¡Muchos seudónimos! El máximo es %d."
+
+#. TRANS: Group edit form validation error.
+#. TRANS: Group create form validation error.
+#. TRANS: %s is the invalid alias.
+#: actions/apigroupprofileupdate.php:342 actions/editgroup.php:241
+#: actions/newgroup.php:188
+#, php-format
+msgid "Invalid alias: \"%s\""
+msgstr "Alias inválido: \"%s\""
+
 #. TRANS: Client error displayed when uploading a media file has failed.
 #: actions/apimediaupload.php:101
 msgid "Upload failed."
@@ -826,21 +881,22 @@ msgstr "No estás autorizado."
 #. TRANS: Form validation error message.
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
+#. TRANS: Client error displayed when the session token is not okay.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
 #: actions/deletenotice.php:177 actions/disfavor.php:75
-#: actions/emailsettings.php:291 actions/favor.php:75 actions/geocode.php:55
+#: actions/emailsettings.php:292 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:65 actions/grouplogo.php:321
-#: actions/groupunblock.php:65 actions/imsettings.php:224
-#: actions/invite.php:60 actions/login.php:137 actions/makeadmin.php:66
-#: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
-#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
-#: actions/othersettings.php:155 actions/passwordsettings.php:138
-#: actions/profilesettings.php:217 actions/recoverpassword.php:383
-#: actions/register.php:172 actions/remotesubscribe.php:76
-#: actions/repeat.php:82 actions/smssettings.php:250 actions/subedit.php:40
-#: actions/subscribe.php:86 actions/tagother.php:166
-#: actions/unsubscribe.php:69 actions/userauthorization.php:52
-#: lib/designsettings.php:310
+#: actions/groupunblock.php:65 actions/imsettings.php:241
+#: actions/invite.php:60 actions/makeadmin.php:66 actions/newmessage.php:135
+#: actions/newnotice.php:105 actions/nudge.php:80
+#: actions/oauthappssettings.php:162 actions/oauthconnectionssettings.php:135
+#: actions/passwordsettings.php:137 actions/pluginenable.php:87
+#: actions/profilesettings.php:218 actions/recoverpassword.php:383
+#: actions/register.php:157 actions/remotesubscribe.php:76
+#: actions/repeat.php:82 actions/smssettings.php:249 actions/subedit.php:40
+#: actions/subscribe.php:87 actions/tagother.php:145
+#: actions/unsubscribe.php:69 actions/urlsettings.php:171
+#: actions/userauthorization.php:53 lib/designsettings.php:122
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 "Hubo un problema con tu clave de sesión.  Por favor, intenta nuevamente."
@@ -870,10 +926,10 @@ msgstr "Error de base de datos al insertar usuario de la aplicación OAuth."
 #. TRANS: Unknown form validation error in design settings form.
 #: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
 #: actions/designadminpanel.php:100 actions/editapplication.php:144
-#: actions/emailsettings.php:310 actions/grouplogo.php:332
-#: actions/imsettings.php:239 actions/newapplication.php:124
-#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
-#: actions/smssettings.php:271 lib/designsettings.php:321
+#: actions/emailsettings.php:311 actions/grouplogo.php:332
+#: actions/imsettings.php:256 actions/newapplication.php:124
+#: actions/oauthconnectionssettings.php:144 actions/recoverpassword.php:46
+#: actions/smssettings.php:270 lib/designsettings.php:133
 msgid "Unexpected form submission."
 msgstr "Envío de formulario inesperado."
 
@@ -922,31 +978,26 @@ msgstr "Cuenta"
 
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Field label in form for profile settings.
-#. TRANS: Label for group nickname (dt). Text hidden by default.
-#. TRANS: DT for nick name in a profile.
-#: actions/apioauthauthorize.php:459 actions/login.php:252
-#: actions/profilesettings.php:106 actions/register.php:432
-#: actions/showgroup.php:243 actions/tagother.php:94
+#: actions/apioauthauthorize.php:459 actions/login.php:225
+#: actions/profilesettings.php:107 actions/register.php:411
 #: actions/userauthorization.php:145 lib/groupeditform.php:145
-#: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "Usuario"
 
 #. TRANS: Field label on OAuth API authorisation form.
-#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:463 actions/login.php:255
-#: actions/register.php:436 lib/accountsettingsaction.php:120
+#: actions/apioauthauthorize.php:463 actions/login.php:228
+#: actions/register.php:415 lib/settingsnav.php:87
 msgid "Password"
 msgstr "Contraseña"
 
 #. TRANS: Button text that when clicked will cancel the process of allowing access to an account
 #. TRANS: by an external application.
 #. TRANS: Button label to cancel an e-mail address confirmation procedure.
-#. TRANS: Button label to cancel an Instant Messaging address confirmation procedure.
+#. TRANS: Button label to cancel an IM address confirmation procedure.
 #. TRANS: Button label to cancel a SMS address confirmation procedure.
 #. TRANS: Button label in the "Edit application" form.
-#: actions/apioauthauthorize.php:478 actions/emailsettings.php:124
-#: actions/imsettings.php:127 actions/smssettings.php:133
+#: actions/apioauthauthorize.php:478 actions/emailsettings.php:125
+#: actions/imsettings.php:136 actions/smssettings.php:132
 #: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Cancel"
@@ -1059,7 +1110,7 @@ msgstr "Método de API no encontrado."
 #. TRANS: %s is the requested output format.
 #: actions/apistatusesshow.php:144
 #, fuzzy, php-format
-msgid "Unsupported format: %s"
+msgid "Unsupported format: %s."
 msgstr "Formato no soportado."
 
 #. TRANS: Client error displayed requesting a deleted status.
@@ -1143,13 +1194,6 @@ msgstr "%1$s / Favoritos de %2$s"
 msgid "%1$s updates favorited by %2$s / %3$s."
 msgstr "%1$s actualizaciones favoritas de %2$s / %2$s."
 
-#. TRANS: Server error displayed when generating an Atom feed fails.
-#. TRANS: %s is the error.
-#: actions/apitimelinegroup.php:134
-#, fuzzy, php-format
-msgid "Could not generate feed for group - %s"
-msgstr "No se pudo actualizar el grupo."
-
 #. TRANS: Title for timeline of most recent mentions of a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname.
 #: actions/apitimelinementions.php:115
@@ -1166,13 +1210,14 @@ msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr "actualizaciones de %1$s en respuesta a las de %2$s / %3$s"
 
 #. TRANS: Title for site timeline. %s is the StatusNet sitename.
+#. TRANS: Public RSS feed title. %s is the StatusNet site name.
 #: actions/apitimelinepublic.php:193 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "línea temporal pública de %s"
 
 #. TRANS: Subtitle for site timeline. %s is the StatusNet sitename.
-#: actions/apitimelinepublic.php:199 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:199
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "¡Actualizaciones de todos en %s!"
@@ -1184,21 +1229,33 @@ msgid "Unimplemented."
 msgstr "Método no implementado."
 
 #. TRANS: Title for Atom feed "repeated to me". %s is the user nickname.
-#: actions/apitimelineretweetedtome.php:108
+#: actions/apitimelineretweetedtome.php:96
 #, php-format
 msgid "Repeated to %s"
 msgstr "Repetido a %s"
 
+#: actions/apitimelineretweetedtome.php:98
+#, fuzzy, php-format
+msgid "%1$s notices that were to repeated to %2$s / %3$s."
+msgstr "actualizaciones de %1$s en respuesta a las de %2$s / %3$s"
+
 #. TRANS: Title of list of repeated notices of the logged in user.
 #. TRANS: %s is the nickname of the logged in user.
-#: actions/apitimelineretweetsofme.php:112
+#: actions/apitimelineretweetsofme.php:98
 #, php-format
 msgid "Repeats of %s"
 msgstr "Repeticiones de %s"
 
+#: actions/apitimelineretweetsofme.php:104
+#, fuzzy, php-format
+msgid "%1$s notices that %2$s / %3$s has repeated."
+msgstr "%s (@%s) agregó tu mensaje a los favoritos"
+
 #. TRANS: Title for timeline with lastest notices with a given tag.
 #. TRANS: %s is the tag.
-#: actions/apitimelinetag.php:101 actions/tag.php:67
+#. TRANS: Title for first page of notices with tags.
+#. TRANS: %s is the tag.
+#: actions/apitimelinetag.php:101 actions/tag.php:69
 #, php-format
 msgid "Notices tagged with %s"
 msgstr "Mensajes etiquetados con %s"
@@ -1211,54 +1268,55 @@ msgid "Updates tagged with %1$s on %2$s!"
 msgstr "Actualizaciones etiquetadas con %1$s en %2$s!"
 
 #. TRANS: Client error displayed trying to add a notice to another user's timeline.
-#: actions/apitimelineuser.php:297
+#: actions/apitimelineuser.php:308
 #, fuzzy
 msgid "Only the user can add to their own timeline."
 msgstr "Sólo el usuario puede leer sus bandejas de correo."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:304
+#: actions/apitimelineuser.php:315
 msgid "Only accept AtomPub for Atom feeds."
 msgstr ""
 
 #. TRANS: Client error displayed attempting to post an empty API notice.
-#: actions/apitimelineuser.php:311
+#: actions/apitimelineuser.php:322
 msgid "Atom post must not be empty."
 msgstr ""
 
 #. TRANS: Client error displayed attempting to post an API that is not well-formed XML.
-#: actions/apitimelineuser.php:317
+#: actions/apitimelineuser.php:328
 msgid "Atom post must be well-formed XML."
 msgstr ""
 
 #. TRANS: Client error displayed when not using an Atom entry.
-#: actions/apitimelineuser.php:323 actions/atompubfavoritefeed.php:228
+#: actions/apitimelineuser.php:334 actions/atompubfavoritefeed.php:228
 #: actions/atompubmembershipfeed.php:230
 #: actions/atompubsubscriptionfeed.php:236
 msgid "Atom post must be an Atom entry."
 msgstr "La publicación Atom debe ser una entrada Atom."
 
 #. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
-#: actions/apitimelineuser.php:335
+#: actions/apitimelineuser.php:345
 msgid "Can only handle POST activities."
 msgstr ""
 
 #. TRANS: Client error displayed when using an unsupported activity object type.
 #. TRANS: %s is the unsupported activity object type.
-#: actions/apitimelineuser.php:346
+#: actions/apitimelineuser.php:356
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr "No se puede gestionar actividad del tipo «%s»."
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
 #. TRANS: %d is the notice ID (number).
-#: actions/apitimelineuser.php:380
+#: actions/apitimelineuser.php:390
 #, php-format
 msgid "No content for notice %d."
 msgstr "No hay contenido para el aviso %d."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:408
+#. TRANS: %s is the notice URI.
+#: actions/apitimelineuser.php:419
 #, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "El aviso con la URI «%s» ya existe."
@@ -1275,9 +1333,10 @@ msgstr "Método de API no encontrado."
 
 #. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
 #. TRANS: Client exception.
+#. TRANS: Client error displayed trying to subscribe to a non-existing profile.
 #: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
 #: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
-#: actions/subscribe.php:107
+#: actions/subscribe.php:110
 msgid "No such profile."
 msgstr "No existe tal perfil."
 
@@ -1419,7 +1478,7 @@ msgid "Not a member."
 msgstr "Todos los miembros"
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
-#: actions/atompubshowmembership.php:151
+#: actions/atompubshowmembership.php:150
 #, fuzzy
 msgid "Cannot delete someone else's membership."
 msgstr "No se pudo eliminar la auto-suscripción."
@@ -1508,10 +1567,7 @@ msgid "Invalid size."
 msgstr "Tamaño inválido."
 
 #. TRANS: Title for avatar upload page.
-#. TRANS: Label for group avatar (dt). Text hidden by default.
-#. TRANS: Link description in user account settings menu.
-#: actions/avatarsettings.php:66 actions/showgroup.php:227
-#: lib/accountsettingsaction.php:113
+#: actions/avatarsettings.php:66 lib/settingsnav.php:82
 msgid "Avatar"
 msgstr "Imagen"
 
@@ -1524,9 +1580,11 @@ msgstr "Puedes subir tu imagen personal. El tamaño máximo de archivo es %s."
 
 #. TRANS: Server error displayed in avatar upload page when no matching profile can be found for a user.
 #. TRANS: Server error displayed coming across a request from a user without a profile.
+#. TRANS: Server error displayed when trying to authorise a remote subscription request
+#. TRANS: while the user has no profile.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
 #: actions/grouplogo.php:184 actions/remotesubscribe.php:190
-#: actions/userauthorization.php:72 actions/userrss.php:108
+#: actions/userauthorization.php:75 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr "Usuario sin perfil coincidente."
 
@@ -1582,10 +1640,10 @@ msgstr "Cortar"
 msgid "No file uploaded."
 msgstr "Ningún archivo fue subido."
 
-#. TRANS: Avatar upload form unstruction after uploading a file.
+#. TRANS: Avatar upload form instruction after uploading a file.
 #: actions/avatarsettings.php:345
 #, fuzzy
-msgid "Pick a square area of the image to be your avatar"
+msgid "Pick a square area of the image to be your avatar."
 msgstr "Elige un área cuadrada para que sea tu imagen"
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
@@ -1611,7 +1669,7 @@ msgstr "Imagen borrada."
 
 #. TRANS: Title for backup account page.
 #. TRANS: Option in profile settings to create a backup of the account of the currently logged in user.
-#: actions/backupaccount.php:61 actions/profilesettings.php:467
+#: actions/backupaccount.php:61 actions/profilesettings.php:468
 msgid "Backup account"
 msgstr ""
 
@@ -1645,7 +1703,7 @@ msgstr "Fondo"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
 #: actions/backupaccount.php:254
-msgid "Backup your account"
+msgid "Backup your account."
 msgstr ""
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
@@ -1687,7 +1745,7 @@ msgstr "No"
 #. TRANS: Submit button title for 'No' when blocking a user.
 #: actions/block.php:158
 #, fuzzy
-msgid "Do not block this user"
+msgid "Do not block this user."
 msgstr "No bloquear a este usuario"
 
 #. TRANS: Button label on the user block form.
@@ -1704,9 +1762,9 @@ msgid "Yes"
 msgstr "Sí"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#. TRANS: Description of the form to block a user.
-#: actions/block.php:165 lib/blockform.php:79
-msgid "Block this user"
+#: actions/block.php:165
+#, fuzzy
+msgid "Block this user."
 msgstr "Bloquear este usuario."
 
 #. TRANS: Server error displayed when blocking a user fails.
@@ -1774,32 +1832,48 @@ msgstr "Código de confirmación no encontrado."
 msgid "That confirmation code is not for you!"
 msgstr "¡Ese código de confirmación no es para ti!"
 
-#. TRANS: Server error for a unknow address type %s, which can be 'email', 'jabber', or 'sms'.
-#: actions/confirmaddress.php:92
-#, php-format
-msgid "Unrecognized address type %s."
+#. TRANS: Server error for an unknown address type, which can be 'email', 'sms', or the name of an IM network (such as 'xmpp' or 'aim')
+#: actions/confirmaddress.php:94
+#, fuzzy, php-format
+msgid "Unrecognized address type %s"
 msgstr "Tipo de dirección %s desconocida."
 
 #. TRANS: Client error for an already confirmed email/jabber/sms address.
-#: actions/confirmaddress.php:97
+#: actions/confirmaddress.php:103 actions/confirmaddress.php:136
 msgid "That address has already been confirmed."
 msgstr "Esa dirección ya fue confirmada."
 
+#: actions/confirmaddress.php:121 actions/imsettings.php:444
+#: actions/userdesignsettings.php:306
+#, fuzzy
+msgid "Couldn't update user."
+msgstr "No se pudo actualizar el usuario."
+
+#: actions/confirmaddress.php:144
+#, fuzzy
+msgid "Couldn't update user im preferences."
+msgstr "No se pudo actualizar información de usuario."
+
+#: actions/confirmaddress.php:156
+#, fuzzy
+msgid "Couldn't insert user im preferences."
+msgstr "No se pudo insertar una nueva suscripción."
+
 #. TRANS: Server error displayed when an address confirmation code deletion from the
 #. TRANS: database fails in the contact address confirmation action.
-#: actions/confirmaddress.php:132
+#: actions/confirmaddress.php:169
 #, fuzzy
 msgid "Could not delete address confirmation."
 msgstr "No se pudo eliminar la confirmación de mensajería instantánea."
 
 #. TRANS: Title for the contact address confirmation action.
-#: actions/confirmaddress.php:150
+#: actions/confirmaddress.php:185
 msgid "Confirm address"
 msgstr "Confirmar la dirección"
 
 #. TRANS: Success message for the contact address confirmation action.
 #. TRANS: %s can be 'email', 'jabber', or 'sms'.
-#: actions/confirmaddress.php:166
+#: actions/confirmaddress.php:200
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "La dirección \"%s\" fue confirmada para tu cuenta."
@@ -1813,6 +1887,7 @@ msgstr "Conversación"
 #. TRANS: Label for user statistics.
 #: actions/conversation.php:149 lib/noticelist.php:87
 #: lib/profileaction.php:246 lib/searchgroupnav.php:82
+#: lib/threadednoticelist.php:66
 msgid "Notices"
 msgstr "Mensajes"
 
@@ -1847,7 +1922,7 @@ msgstr "Cuenta eliminada."
 
 #. TRANS: Page title for page on which a user account can be deleted.
 #. TRANS: Option in profile settings to delete the account of the currently logged in user.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:475
+#: actions/deleteaccount.php:228 actions/profilesettings.php:476
 msgid "Delete account"
 msgstr "Eliminar cuenta"
 
@@ -1874,7 +1949,7 @@ msgstr ""
 #. TRANS: Field label for delete account confirmation entry.
 #. TRANS: Field label for password reset form where the password has to be typed again.
 #: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:262 actions/register.php:440
+#: actions/recoverpassword.php:262 actions/register.php:419
 msgid "Confirm"
 msgstr "Confirmar"
 
@@ -1903,14 +1978,14 @@ msgstr "Aplicación no encontrada."
 #. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
 #: actions/deleteapplication.php:79 actions/editapplication.php:78
-#: actions/showapplication.php:94
+#: actions/showapplication.php:90
 msgid "You are not the owner of this application."
 msgstr "No eres el propietario de esta aplicación."
 
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
-#: actions/newapplication.php:112 actions/showapplication.php:118
-#: lib/action.php:1425
+#: actions/newapplication.php:112 actions/showapplication.php:113
+#: lib/action.php:1391
 msgid "There was a problem with your session token."
 msgstr "Hubo problemas con tu clave de sesión."
 
@@ -1934,13 +2009,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting an application.
 #: actions/deleteapplication.php:161
 #, fuzzy
-msgid "Do not delete this application"
+msgid "Do not delete this application."
 msgstr "No eliminar esta aplicación"
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
 #: actions/deleteapplication.php:167
 #, fuzzy
-msgid "Delete this application"
+msgid "Delete this application."
 msgstr "Borrar esta aplicación"
 
 #. TRANS: Client error when trying to delete group while not logged in.
@@ -1995,13 +2070,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting a group.
 #: actions/deletegroup.php:224
 #, fuzzy
-msgid "Do not delete this group"
+msgid "Do not delete this group."
 msgstr "No eliminar este grupo"
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
 #: actions/deletegroup.php:231
 #, fuzzy
-msgid "Delete this group"
+msgid "Delete this group."
 msgstr "Borrar este grupo"
 
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
@@ -2009,14 +2084,16 @@ msgstr "Borrar este grupo"
 #. TRANS: Client error displayed when trying to mark a notice as favorite without being logged in.
 #. TRANS: Client error displayed trying to block a user from a group while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
+#. TRANS: Client error displayed trying to log out when not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
+#. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
 #. TRANS: Client error displayed when trying to change user options while not logged in.
 #: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
-#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:69
+#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:70
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
-#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
-#: actions/tagother.php:33 actions/unsubscribe.php:52
+#: actions/nudge.php:63 actions/pluginenable.php:97 actions/subedit.php:33
+#: actions/subscribe.php:98 actions/tagother.php:33 actions/unsubscribe.php:52
 #: lib/adminpanelaction.php:71 lib/profileformaction.php:63
 #: lib/settingsaction.php:72
 msgid "Not logged in."
@@ -2045,12 +2122,13 @@ msgstr "¿Estás seguro de que quieres eliminar este aviso?"
 #. TRANS: Submit button title for 'No' when deleting a notice.
 #: actions/deletenotice.php:159
 #, fuzzy
-msgid "Do not delete this notice"
+msgid "Do not delete this notice."
 msgstr "No eliminar este mensaje"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:166 lib/noticelist.php:673
-msgid "Delete this notice"
+#: actions/deletenotice.php:166
+#, fuzzy
+msgid "Delete this notice."
 msgstr "Borrar este mensaje"
 
 #. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
@@ -2086,18 +2164,17 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting a user.
 #: actions/deleteuser.php:158
 #, fuzzy
-msgid "Do not delete this user"
+msgid "Do not delete this user."
 msgstr "No eliminar este usuario"
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
-#. TRANS: Description of form for deleting a user.
-#: actions/deleteuser.php:165 lib/deleteuserform.php:75
-msgid "Delete this user"
+#: actions/deleteuser.php:165
+#, fuzzy
+msgid "Delete this user."
 msgstr "Borrar este usuario"
 
 #. TRANS: Message used as title for design settings for the site.
-#. TRANS: Link description in user account settings menu.
-#: actions/designadminpanel.php:60 lib/accountsettingsaction.php:134
+#: actions/designadminpanel.php:60 lib/settingsnav.php:97
 msgid "Design"
 msgstr "Diseño"
 
@@ -2164,8 +2241,7 @@ msgid "You can upload a custom StatusNet theme as a .ZIP archive."
 msgstr "Puedes subir un tema personalizado StatusNet como un archivo .ZIP."
 
 #. TRANS: Fieldset legend for theme background image.
-#. TRANS: Fieldset legend on profile design page.
-#: actions/designadminpanel.php:515 lib/designsettings.php:98
+#: actions/designadminpanel.php:515
 msgid "Change background image"
 msgstr "Cambiar la imagen de fondo"
 
@@ -2173,7 +2249,7 @@ msgstr "Cambiar la imagen de fondo"
 #. TRANS: Field label for background color selector.
 #. TRANS: Label on profile design page for setting a profile page background colour.
 #: actions/designadminpanel.php:525 actions/designadminpanel.php:609
-#: lib/designsettings.php:183
+#: lib/designform.php:238
 msgid "Background"
 msgstr "Fondo"
 
@@ -2200,13 +2276,13 @@ msgstr "Desactivar"
 #. TRANS: Form guide for turning background image on or off on theme designer page.
 #. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
 #. TRANS: use of the uploaded profile image.
-#: actions/designadminpanel.php:577 lib/designsettings.php:159
+#: actions/designadminpanel.php:577 lib/designform.php:214
 msgid "Turn background image on or off."
 msgstr "Activar o desactivar la imagen de fondo."
 
 #. TRANS: Checkbox label to title background image on theme designer page.
 #. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-#: actions/designadminpanel.php:583 lib/designsettings.php:165
+#: actions/designadminpanel.php:583 lib/designform.php:220
 msgid "Tile background image"
 msgstr "Imagen de fondo en mosaico"
 
@@ -2217,25 +2293,25 @@ msgstr "Cambiar colores"
 
 #. TRANS: Field label for content color selector.
 #. TRANS: Label on profile design page for setting a profile page content colour.
-#: actions/designadminpanel.php:623 lib/designsettings.php:197
+#: actions/designadminpanel.php:623 lib/designform.php:252
 msgid "Content"
 msgstr "Contenido"
 
 #. TRANS: Field label for sidebar color selector.
 #. TRANS: Label on profile design page for setting a profile page sidebar colour.
-#: actions/designadminpanel.php:637 lib/designsettings.php:211
+#: actions/designadminpanel.php:637 lib/designform.php:266
 msgid "Sidebar"
 msgstr "Barra lateral"
 
 #. TRANS: Field label for text color selector.
 #. TRANS: Label on profile design page for setting a profile page text colour.
-#: actions/designadminpanel.php:651 lib/designsettings.php:225
+#: actions/designadminpanel.php:651 lib/designform.php:280
 msgid "Text"
 msgstr "Texto"
 
 #. TRANS: Field label for link color selector.
 #. TRANS: Label on profile design page for setting a profile page links colour.
-#: actions/designadminpanel.php:665 lib/designsettings.php:239
+#: actions/designadminpanel.php:665 lib/designform.php:294
 msgid "Links"
 msgstr "Vínculos"
 
@@ -2256,21 +2332,21 @@ msgid "Use defaults"
 msgstr "Usar los valores predeterminados"
 
 #. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: actions/designadminpanel.php:720 lib/designsettings.php:259
-msgid "Restore default designs"
+#: actions/designadminpanel.php:720
+#, fuzzy
+msgid "Restore default designs."
 msgstr "Restaurar los diseños predeterminados"
 
 #. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: actions/designadminpanel.php:728 lib/designsettings.php:267
-msgid "Reset back to default"
+#: actions/designadminpanel.php:728
+#, fuzzy
+msgid "Reset back to default."
 msgstr "Volver a los valores predeterminados"
 
 #. TRANS: Title for button for saving theme settings.
-#. TRANS: Title for button on profile design page to save settings.
-#: actions/designadminpanel.php:736 lib/designsettings.php:272
-msgid "Save design"
+#: actions/designadminpanel.php:736
+#, fuzzy
+msgid "Save design."
 msgstr "Guardar el diseño"
 
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
@@ -2302,7 +2378,7 @@ msgid "You must be logged in to edit an application."
 msgstr "Debes haber iniciado sesión para editar una aplicación."
 
 #. TRANS: Client error displayed trying to edit an application that does not exist.
-#: actions/editapplication.php:83 actions/showapplication.php:87
+#: actions/editapplication.php:83 actions/showapplication.php:83
 msgid "No such application."
 msgstr "No existe tal aplicación."
 
@@ -2395,80 +2471,53 @@ msgstr "Editar grupo %s"
 msgid "You must be logged in to create a group."
 msgstr "Debes estar conectado para crear un grupo"
 
-#. TRANS: Client error displayed trying to edit a group while not being a group admin.
-#. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
-#. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
-#: actions/editgroup.php:110 actions/editgroup.php:176
-#: actions/groupdesignsettings.php:109 actions/grouplogo.php:111
-msgid "You must be an admin to edit the group."
-msgstr "Para editar el grupo debes ser administrador."
-
 #. TRANS: Form instructions for group edit form.
 #: actions/editgroup.php:161
 msgid "Use this form to edit the group."
 msgstr "Usa este formulario para editar el grupo."
 
-#. TRANS: Group edit form validation error.
-#. TRANS: Group create form validation error.
-#. TRANS: %s is the invalid alias.
-#: actions/editgroup.php:241 actions/newgroup.php:188
-#, php-format
-msgid "Invalid alias: \"%s\""
-msgstr "Alias inválido: \"%s\""
-
-#. TRANS: Server error displayed when editing a group fails.
-#: actions/editgroup.php:274
-msgid "Could not update group."
-msgstr "No se pudo actualizar el grupo."
-
-#. TRANS: Server error displayed when group aliases could not be added.
-#. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/editgroup.php:281 classes/User_group.php:540
-msgid "Could not create aliases."
-msgstr "No fue posible crear alias."
-
 #. TRANS: Group edit form success message.
 #: actions/editgroup.php:301
 msgid "Options saved."
 msgstr "Se guardó Opciones."
 
 #. TRANS: Title for e-mail settings.
-#: actions/emailsettings.php:59
+#: actions/emailsettings.php:60
 msgid "Email settings"
 msgstr "Configuración del correo electrónico"
 
 #. TRANS: E-mail settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/emailsettings.php:73
+#: actions/emailsettings.php:74
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 msgstr "Gestiona la forma en que recibes correo desde %%site.name%%"
 
 #. TRANS: Form legend for e-mail settings form.
 #. TRANS: Field label for e-mail address input in e-mail settings form.
-#: actions/emailsettings.php:103 actions/emailsettings.php:129
+#: actions/emailsettings.php:104 actions/emailsettings.php:130
 msgid "Email address"
 msgstr "Dirección de correo electrónico"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:109
+#: actions/emailsettings.php:110
 msgid "Current confirmed email address."
 msgstr "Actual dirección de correo electrónico confirmada"
 
 #. TRANS: Button label to remove a confirmed e-mail address.
 #. TRANS: Button label for removing a set sender e-mail address to post notices from.
-#. TRANS: Button label to remove a confirmed Instant Messaging address.
+#. TRANS: Button label to remove a confirmed IM address.
 #. TRANS: Button label to remove a confirmed SMS address.
 #. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
-#: actions/emailsettings.php:112 actions/emailsettings.php:179
-#: actions/imsettings.php:112 actions/smssettings.php:120
-#: actions/smssettings.php:176
+#: actions/emailsettings.php:113 actions/emailsettings.php:180
+#: actions/imsettings.php:119 actions/smssettings.php:119
+#: actions/smssettings.php:175
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Eliminar"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:119
+#: actions/emailsettings.php:120
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -2481,44 +2530,44 @@ msgstr ""
 #. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
 #. TRANS: Any other domain may be owned by a legitimate person or
 #. TRANS: organization.
-#: actions/emailsettings.php:136
+#: actions/emailsettings.php:137
 msgid "Email address, like \"UserName@example.org\""
 msgstr "Correo electrónico, como \"NombredeUsuario@example.org\""
 
 #. TRANS: Button label for adding an e-mail address in e-mail settings form.
-#. TRANS: Button label for adding an Instant Messaging address in Instant Messaging settings form.
+#. TRANS: Button label for adding an IM address in IM settings form.
 #. TRANS: Button label for adding a SMS phone number in SMS settings form.
-#: actions/emailsettings.php:140 actions/imsettings.php:147
-#: actions/smssettings.php:158
+#: actions/emailsettings.php:141 actions/imsettings.php:147
+#: actions/smssettings.php:157
 msgctxt "BUTTON"
 msgid "Add"
 msgstr "Añadir"
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:148 actions/smssettings.php:167
+#: actions/emailsettings.php:149 actions/smssettings.php:166
 msgid "Incoming email"
 msgstr "Correo entrante"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:154
+#: actions/emailsettings.php:155
 msgid "I want to post notices by email."
 msgstr "Quiero publicar mensajes por correo electrónico."
 
 #. TRANS: Form instructions for incoming e-mail form in e-mail settings.
 #. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
-#: actions/emailsettings.php:176 actions/smssettings.php:174
+#: actions/emailsettings.php:177 actions/smssettings.php:173
 msgid "Send email to this address to post new notices."
 msgstr "Envie emails a esta dirección para ingresar nuevos avisos"
 
 #. TRANS: Instructions for incoming e-mail address input form, when an address has already been assigned.
 #. TRANS: Instructions for incoming SMS e-mail address input form.
-#: actions/emailsettings.php:185 actions/smssettings.php:182
+#: actions/emailsettings.php:186 actions/smssettings.php:181
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr "Hace una nueva dirección de correo para postear; cancela la anterior."
 
 #. TRANS: Instructions for incoming e-mail address input form.
-#: actions/emailsettings.php:189
+#: actions/emailsettings.php:190
 msgid ""
 "To send notices via email, we need to create a unique email address for you "
 "on this server:"
@@ -2526,92 +2575,92 @@ msgstr ""
 
 #. TRANS: Button label for adding an e-mail address to send notices from.
 #. TRANS: Button label for adding an SMS e-mail address to send notices from.
-#: actions/emailsettings.php:195 actions/smssettings.php:185
+#: actions/emailsettings.php:196 actions/smssettings.php:184
 msgctxt "BUTTON"
 msgid "New"
 msgstr "Nuevo"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:204
+#: actions/emailsettings.php:205
 msgid "Email preferences"
 msgstr "Preferencias de correo electrónico"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:212
+#: actions/emailsettings.php:213
 msgid "Send me notices of new subscriptions through email."
 msgstr "Enviarme mensajes de nuevas suscripciones por correo electrónico."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:218
+#: actions/emailsettings.php:219
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr ""
 "Enviarme un correo electrónico cuando alguien agrega mi aviso a favoritos."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:225
+#: actions/emailsettings.php:226
 msgid "Send me email when someone sends me a private message."
 msgstr ""
 "Enviarme un correo electrónico cuando alguien me envía un mensaje privado."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:231
+#: actions/emailsettings.php:232
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr ""
 "Enviarme un correo electrónico cuando alguien me envíe una \"@-respuesta\"."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:237
+#: actions/emailsettings.php:238
 msgid "Allow friends to nudge me and send me an email."
 msgstr "Permitir que amigos me den un toque y me envien un correo electrónico."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:243
+#: actions/emailsettings.php:244
 msgid "Publish a MicroID for my email address."
 msgstr "Publicar un MicroID para mi dirección de correo."
 
 #. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:361
+#: actions/emailsettings.php:362
 msgid "Email preferences saved."
 msgstr "Preferencias de correo electrónico guardadas."
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:380
+#: actions/emailsettings.php:381
 msgid "No email address."
 msgstr "Sin dirección de correo electrónico"
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:388
+#: actions/emailsettings.php:389
 #, fuzzy
 msgid "Cannot normalize that email address."
 msgstr "No se puede normalizar esta dirección de correo electrónico."
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:393 actions/register.php:212
+#: actions/emailsettings.php:394 actions/register.php:197
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "Correo electrónico no válido"
 
 #. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:397
+#: actions/emailsettings.php:398
 msgid "That is already your email address."
 msgstr "Esa ya es tu dirección de correo electrónico"
 
 #. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:401
+#: actions/emailsettings.php:402
 msgid "That email address already belongs to another user."
 msgstr "Esa dirección de correo pertenece a otro usuario."
 
 #. TRANS: Server error thrown on database error adding e-mail confirmation code.
 #. TRANS: Server error thrown on database error adding Instant Messaging confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:418 actions/imsettings.php:343
-#: actions/smssettings.php:365
+#: actions/emailsettings.php:419 actions/imsettings.php:362
+#: actions/smssettings.php:364
 #, fuzzy
 msgid "Could not insert confirmation code."
 msgstr "No se pudo insertar el código de confirmación."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:425
+#: actions/emailsettings.php:426
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
@@ -2623,59 +2672,62 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling Instant Messaging address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:445 actions/imsettings.php:377
-#: actions/smssettings.php:399
+#: actions/emailsettings.php:446 actions/imsettings.php:391
+#: actions/smssettings.php:398
 msgid "No pending confirmation to cancel."
 msgstr "Ninguna confirmación pendiente para cancelar."
 
 #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:450
+#: actions/emailsettings.php:451
 msgid "That is the wrong email address."
 msgstr "Esa es la dirección de correo electrónico incorrecta."
 
 #. TRANS: Server error thrown on database error canceling e-mail address confirmation.
 #. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
-#: actions/emailsettings.php:459 actions/smssettings.php:413
+#: actions/emailsettings.php:460 actions/smssettings.php:412
 #, fuzzy
 msgid "Could not delete email confirmation."
 msgstr "No se pudo eliminar la confirmación de correo electrónico."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:464
+#: actions/emailsettings.php:465
 msgid "Email confirmation cancelled."
 msgstr "Confirmación de correo electrónico cancelada."
 
 #. TRANS: Message given trying to remove an e-mail address that is not
 #. TRANS: registered for the active user.
-#: actions/emailsettings.php:483
+#: actions/emailsettings.php:484
 msgid "That is not your email address."
 msgstr "Esa no es tu dirección de correo electrónico"
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:504
+#: actions/emailsettings.php:505
 msgid "The email address was removed."
 msgstr "La dirección de correo electrónico ha sido eliminada."
 
 #. TRANS: Form validation error displayed when trying to remove an incoming e-mail address while no address has been set.
-#: actions/emailsettings.php:518 actions/smssettings.php:555
+#: actions/emailsettings.php:519 actions/smssettings.php:554
 msgid "No incoming email address."
 msgstr "No hay dirección de correo entrante."
 
 #. TRANS: Server error thrown on database error removing incoming e-mail address.
 #. TRANS: Server error thrown on database error adding incoming e-mail address.
-#: actions/emailsettings.php:530 actions/emailsettings.php:554
-#: actions/smssettings.php:565 actions/smssettings.php:588
+#. TRANS: Server error displayed when the user could not be updated in SMS settings.
+#: actions/emailsettings.php:531 actions/emailsettings.php:555
+#: actions/smssettings.php:565 actions/smssettings.php:590
 #, fuzzy
 msgid "Could not update user record."
 msgstr "No se pudo actualizar información de usuario."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:534 actions/smssettings.php:568
+#. TRANS: Confirmation text after updating SMS settings.
+#: actions/emailsettings.php:535 actions/smssettings.php:569
 msgid "Incoming email address removed."
 msgstr "Dirección de correo entrante removida."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:558 actions/smssettings.php:591
+#. TRANS: Confirmation text after updating SMS settings.
+#: actions/emailsettings.php:559 actions/smssettings.php:594
 msgid "New incoming email address added."
 msgstr "Nueva dirección de correo entrante agregada."
 
@@ -2687,7 +2739,7 @@ msgstr "¡Este mensaje ya está en favoritos!"
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
 #: actions/favor.php:95
 #, fuzzy
-msgid "Disfavor favorite"
+msgid "Disfavor favorite."
 msgstr "Sacar favorito"
 
 #. TRANS: Page title for first page of favorited notices.
@@ -2740,9 +2792,8 @@ msgstr ""
 #. TRANS: %s is a user's nickname.
 #. TRANS: Title for first page of favourite notices of a user.
 #. TRANS: %s is the user for whom the favourite notices are displayed.
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing own favourited notices.
 #: actions/favoritesrss.php:111 actions/showfavorites.php:76
-#: lib/personalgroupnav.php:122
+#: lib/personalgroupnav.php:110
 #, php-format
 msgid "%s's favorite notices"
 msgstr "Mensajes favoritos de %s"
@@ -2929,13 +2980,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
 #: actions/groupblock.php:191
 #, fuzzy
-msgid "Do not block this user from this group"
+msgid "Do not block this user from this group."
 msgstr "No bloquear este usuario de este grupo"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
 #: actions/groupblock.php:198
 #, fuzzy
-msgid "Block this user from this group"
+msgid "Block this user from this group."
 msgstr "Bloquear este usuario de este grupo"
 
 #. TRANS: Server error displayed when trying to block a user from a group fails because of an application error.
@@ -2946,6 +2997,7 @@ msgstr ""
 "grupo."
 
 #. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
+#. TRANS: Client error displayed trying to find a user by ID without providing an ID.
 #: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr "Sin ID."
@@ -2976,7 +3028,7 @@ msgid "Unable to update your design settings."
 msgstr "No se pudo grabar tu configuración de diseño."
 
 #. TRANS: Form text to confirm saved group design settings.
-#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:222
+#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:239
 msgid "Design preferences saved."
 msgstr "Preferencias de diseño guardadas."
 
@@ -3041,7 +3093,7 @@ msgid "A list of the users in this group."
 msgstr "Lista de los usuarios en este grupo."
 
 #. TRANS: Indicator in group members list that this user is a group administrator.
-#: actions/groupmembers.php:190
+#: actions/groupmembers.php:190 lib/action.php:581
 msgid "Admin"
 msgstr "Admin"
 
@@ -3134,8 +3186,10 @@ msgid "Group search"
 msgstr "Búsqueda en grupos"
 
 #. TRANS: Text on page where groups can be searched if no results were found for a query.
-#: actions/groupsearch.php:82 actions/noticesearch.php:117
-#: actions/peoplesearch.php:83
+#. TRANS: Text for notice search results is the query had no results.
+#. TRANS: Message on the "People search" page where a query has no results.
+#: actions/groupsearch.php:82 actions/noticesearch.php:122
+#: actions/peoplesearch.php:87
 msgid "No results."
 msgstr "No se obtuvo resultados."
 
@@ -3172,169 +3226,171 @@ msgid "User is not blocked from group."
 msgstr "El usuario no está bloqueado del grupo."
 
 #. TRANS: Server error displayed when unblocking a user from a group fails because of an unknown error.
+#. TRANS: Server error displayed when removing a user block.
 #: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "Se ha producido un error al eliminar el bloque."
 
 #. TRANS: Title for Instant Messaging settings.
-#: actions/imsettings.php:58
+#: actions/imsettings.php:56
 msgid "IM settings"
 msgstr "Configuración de mensajería instantánea"
 
 #. 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.
-#: actions/imsettings.php:71
+#: actions/imsettings.php:69
 #, fuzzy, php-format
 msgid ""
-"You can send and receive notices through Jabber/Google Talk [instant "
-"messages](%%doc.im%%). Configure your address and settings below."
+"You can send and receive notices through instant messaging [instant messages]"
+"(%%doc.im%%). Configure your addresses and settings below."
 msgstr ""
 "Puedes enviar y recibir avisos vía [mensajes instantáneos](%%doc.im%%) de "
 "Jabber/GTalk. Configura tu dirección y opciones abajo."
 
-#. TRANS: Message given in the Instant Messaging settings if XMPP is not enabled on the site.
+#. TRANS: Message given in the IM settings if IM is not enabled on the site.
 #: actions/imsettings.php:90
 msgid "IM is not available."
 msgstr "La mensajería instantánea no está disponible."
 
-#. TRANS: Form legend for Instant Messaging settings form.
-#. TRANS: Field label for Instant Messaging address input in Instant Messaging settings form.
-#: actions/imsettings.php:102 actions/imsettings.php:132
-msgid "IM address"
-msgstr "Dirección de mensajería instantánea"
+#: actions/imsettings.php:116
+#, fuzzy, php-format
+msgid "Current confirmed %s address."
+msgstr "Actual dirección de correo electrónico confirmada"
 
-#: actions/imsettings.php:109
-#, fuzzy
-msgid "Current confirmed Jabber/Google Talk address."
-msgstr "Dirección actual Jabber/Gtalk confirmada."
-
-#. TRANS: Form note in Instant Messaging settings form.
-#. TRANS: %s is the Instant Messaging address set for the site.
-#: actions/imsettings.php:120
+#. TRANS: Form note in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:128
 #, fuzzy, php-format
 msgid ""
-"Awaiting confirmation on this address. Check your Jabber/Google Talk account "
-"for a message with further instructions. (Did you add %s to your buddy list?)"
+"Awaiting confirmation on this address. Check your %s account for a message "
+"with further instructions. (Did you add %s to your buddy list?)"
 msgstr ""
 "A la espera de una confirmación para esta dirección. Busca en tu cuenta "
 "Jabber/GTalk un mensaje con más instrucciones. (¿Has añadido a %s a tu lista "
 "de amigos?)"
 
-#. TRANS: IM address input field instructions in Instant Messaging settings form.
-#. TRANS: %s is the Instant Messaging address set for the site.
-#. TRANS: Do not translate "example.org". It is one of the domain names reserved for use in examples by
-#. TRANS: http://www.rfc-editor.org/rfc/rfc2606.txt. Any other domain may be owned by a legitimate
-#. TRANS: person or organization.
-#: actions/imsettings.php:139
-#, fuzzy, php-format
-msgid ""
-"Jabber or Google Talk address, like \"UserName@example.org\". First, make "
-"sure to add %s to your buddy list in your IM client or on Google Talk."
-msgstr ""
-"Dirección Jabber o GTalk, por ejemplo \"NombreUsuario@example.org\". "
-"Primero, asegúrate de agregar a %s a tu lista de amigos en tu cliente de "
-"mensajería instantánea o en GTalk."
+#: actions/imsettings.php:140
+msgid "IM address"
+msgstr "Dirección de mensajería instantánea"
 
-#. TRANS: Form legend for Instant Messaging preferences form.
-#: actions/imsettings.php:154
-msgid "IM preferences"
+#: actions/imsettings.php:142
+#, php-format
+msgid "%s screenname."
+msgstr ""
+
+#. TRANS: Header for IM preferences form.
+#: actions/imsettings.php:163
+#, fuzzy
+msgid "IM Preferences"
 msgstr "Preferencias de mensajería instantánea"
 
-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:159
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:174
 #, fuzzy
-msgid "Send me notices through Jabber/Google Talk."
-msgstr "Enviarme mensajes por Jabber/GTalk"
+msgid "Send me notices"
+msgstr "Enviar un mensaje"
 
-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:165
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:176
 #, fuzzy
-msgid "Post a notice when my Jabber/Google Talk status changes."
+msgid "Post a notice when my status changes."
 msgstr "Publicar un mensaje cuando el estado de mi Jabber/GTalk cambie."
 
-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:171
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:178
 #, fuzzy
-msgid ""
-"Send me replies through Jabber/Google Talk from people I'm not subscribed to."
+msgid "Send me replies from people I'm not subscribed to."
 msgstr ""
 "Enviarme respuestas por medio de Jabber/GTalk de gente a la cual no sigo."
 
-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:178
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:181
 #, fuzzy
-msgid "Publish a MicroID for my Jabber/Google Talk address."
-msgstr "Publicar un MicroID para mi cuenta Jabber/GTalk."
+msgid "Publish a MicroID"
+msgstr "Publicar un MicroID para mi dirección de correo."
 
-#. TRANS: Confirmation message for successful Instant Messaging preferences save.
-#: actions/imsettings.php:283 actions/othersettings.php:192
+#. TRANS: Server error thrown on database error updating IM preferences.
+#: actions/imsettings.php:291
+#, fuzzy
+msgid "Couldn't update IM preferences."
+msgstr "No se pudo actualizar el usuario."
+
+#. TRANS: Confirmation message for successful IM preferences save.
+#. TRANS: Confirmation message after saving preferences.
+#: actions/imsettings.php:298 actions/urlsettings.php:244
 msgid "Preferences saved."
 msgstr "Preferencias guardadas."
 
-#. TRANS: Message given saving Instant Messaging address without having provided one.
-#: actions/imsettings.php:304
-msgid "No Jabber ID."
-msgstr "Ningún Jabber ID."
-
-#. TRANS: Message given saving Instant Messaging address that cannot be normalised.
-#: actions/imsettings.php:312
+#. TRANS: Message given saving IM address without having provided one.
+#: actions/imsettings.php:320
 #, fuzzy
-msgid "Cannot normalize that Jabber ID."
+msgid "No screenname."
+msgstr "Ningún nombre de usuario."
+
+#: actions/imsettings.php:325
+#, fuzzy
+msgid "No transport."
+msgstr "Sin mensaje."
+
+#. TRANS: Message given saving IM address that cannot be normalised.
+#: actions/imsettings.php:333
+#, fuzzy
+msgid "Cannot normalize that screenname"
 msgstr "No se puede normalizar este Jabber ID"
 
-#. TRANS: Message given saving Instant Messaging address that not valid.
-#: actions/imsettings.php:317
+#. TRANS: Message given saving IM address that not valid.
+#: actions/imsettings.php:340
 #, fuzzy
-msgid "Not a valid Jabber ID."
-msgstr "Jabber ID no válido"
+msgid "Not a valid screenname"
+msgstr "Usuario inválido"
 
-#. TRANS: Message given saving Instant Messaging address that is already set.
-#: actions/imsettings.php:321
-msgid "That is already your Jabber ID."
-msgstr "Ese ya es tu Jabber ID."
-
-#. TRANS: Message given saving Instant Messaging address that is already set for another user.
-#: actions/imsettings.php:325
-msgid "Jabber ID already belongs to another user."
+#. TRANS: Message given saving IM address that is already set for another user.
+#: actions/imsettings.php:344
+#, fuzzy
+msgid "Screenname already belongs to another user."
 msgstr "El Jabber ID ya pertenece a otro usuario."
 
-#. TRANS: Message given saving valid Instant Messaging address that is to be confirmed.
-#. TRANS: %s is the Instant Messaging address set for the site.
-#: actions/imsettings.php:353
-#, php-format
-msgid ""
-"A confirmation code was sent to the IM address you added. You must approve %"
-"s for sending messages to you."
+#. TRANS: Message given saving valid IM address that is to be confirmed.
+#: actions/imsettings.php:369
+#, fuzzy
+msgid "A confirmation code was sent to the IM address you added."
 msgstr ""
 "Un código de confirmación fue enviado a la dirección de mensajería "
 "instantánea que agregaste. Debes aprobar a %s para que pueda enviarte "
 "mensajes."
 
-#. TRANS: Message given canceling Instant Messaging address confirmation for the wrong IM address.
-#: actions/imsettings.php:382
+#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#: actions/imsettings.php:396
 msgid "That is the wrong IM address."
 msgstr "Esa dirección de mensajería instantánea es incorrecta."
 
-#. TRANS: Server error thrown on database error canceling Instant Messaging address confirmation.
-#: actions/imsettings.php:391
+#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#: actions/imsettings.php:405
 #, fuzzy
-msgid "Could not delete IM confirmation."
+msgid "Couldn't delete confirmation."
 msgstr "No se pudo eliminar la confirmación de mensajería instantánea."
 
-#. TRANS: Message given after successfully canceling Instant Messaging address confirmation.
-#: actions/imsettings.php:396
+#. TRANS: Message given after successfully canceling IM address confirmation.
+#: actions/imsettings.php:410
 msgid "IM confirmation cancelled."
 msgstr "Confirmación de mensajería instantánea cancelada."
 
-#. TRANS: Message given trying to remove an Instant Messaging address that is not
+#. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.
-#: actions/imsettings.php:417
-msgid "That is not your Jabber ID."
-msgstr "Ese no es tu Jabber ID."
+#: actions/imsettings.php:434
+#, fuzzy
+msgid "That is not your screenname."
+msgstr "Ese no es tu número telefónico"
+
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#: actions/imsettings.php:443
+#, fuzzy
+msgid "Couldn't update user im prefs."
+msgstr "No se pudo actualizar información de usuario."
 
 #. TRANS: Message given after successfully removing a registered Instant Messaging address.
-#: actions/imsettings.php:440
+#: actions/imsettings.php:451
 msgid "The IM address was removed."
 msgstr "La dirección de mensajería instantánea ha sido eliminada."
 
@@ -3550,7 +3606,7 @@ msgid "You must be logged in to join a group."
 msgstr "Debes estar conectado para unirte a un grupo."
 
 #. TRANS: Title for join group page after joining.
-#: actions/joingroup.php:147
+#: actions/joingroup.php:148
 #, fuzzy, php-format
 msgctxt "TITLE"
 msgid "%1$s joined group %2$s"
@@ -3678,7 +3734,7 @@ msgstr ""
 #. TRANS: Submit button title.
 #: actions/licenseadminpanel.php:311 actions/sessionsadminpanel.php:199
 #: actions/siteadminpanel.php:292 actions/snapshotadminpanel.php:245
-#: actions/tagother.php:154 lib/applicationeditform.php:357
+#: actions/tagother.php:133 lib/applicationeditform.php:357
 msgid "Save"
 msgstr "Guardar"
 
@@ -3686,41 +3742,43 @@ msgstr "Guardar"
 msgid "Save license settings"
 msgstr ""
 
-#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
+#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
+#: actions/login.php:97 actions/otp.php:62 actions/register.php:130
 msgid "Already logged in."
 msgstr "Ya estás conectado."
 
-#: actions/login.php:148
+#: actions/login.php:125
 msgid "Incorrect username or password."
 msgstr "Nombre de usuario o contraseña incorrectos."
 
-#: actions/login.php:154 actions/otp.php:120
+#. TRANS: Server error displayed when a user object could not be created trying to login using "one time password login".
+#: actions/login.php:131 actions/otp.php:127
 msgid "Error setting user. You are probably not authorized."
 msgstr "Error al configurar el usuario. Posiblemente no tengas autorización."
 
-#: actions/login.php:210 actions/login.php:263
+#: actions/login.php:185 actions/login.php:236 lib/action.php:598
 msgid "Login"
 msgstr "Inicio de sesión"
 
-#: actions/login.php:249
+#: actions/login.php:222
 msgid "Login to site"
 msgstr "Ingresar a sitio"
 
-#: actions/login.php:258 actions/register.php:490
+#: actions/login.php:231 actions/register.php:469
 msgid "Remember me"
 msgstr "Recordarme"
 
-#: actions/login.php:259 actions/register.php:492
+#: actions/login.php:232 actions/register.php:471
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 "Iniciar sesión automáticamente en el futuro. ¡No usar en ordenadores "
 "compartidos! "
 
-#: actions/login.php:269
+#: actions/login.php:241
 msgid "Lost or forgotten password?"
 msgstr "¿Contraseña olvidada o perdida?"
 
-#: actions/login.php:288
+#: actions/login.php:259
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -3728,11 +3786,11 @@ msgstr ""
 "Por razones de seguridad, por favor vuelve a escribir tu nombre de usuario y "
 "contraseña antes de cambiar tu configuración."
 
-#: actions/login.php:292
+#: actions/login.php:263
 msgid "Login with your username and password."
 msgstr "Ingresar con tu nombre de usuario y contraseña."
 
-#: actions/login.php:295
+#: actions/login.php:266
 #, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -3861,7 +3919,9 @@ msgstr "Nuevo mensaje"
 msgid "Notice posted"
 msgstr "Mensaje publicado"
 
-#: actions/noticesearch.php:68
+#. TRANS: Instructions for Notice search page.
+#. TRANS: %%site.name%% is the name of the StatusNet site.
+#: actions/noticesearch.php:69
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -3870,16 +3930,21 @@ msgstr ""
 "Buscar mensajes en %%site.name%% por contenido. Separa los términos de "
 "búsqueda con espacios; deben tener una longitud mínima de 3 caracteres."
 
-#: actions/noticesearch.php:78
+#. TRANS: Title of the page where users can search for notices.
+#: actions/noticesearch.php:80
 msgid "Text search"
 msgstr "Búsqueda de texto"
 
-#: actions/noticesearch.php:91
+#. TRANS: Test in RSS notice search.
+#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
+#: actions/noticesearch.php:95
 #, php-format
 msgid "Search results for \"%1$s\" on %2$s"
 msgstr "Resultados de la búsqueda de \"%1$s\" en %2$s"
 
-#: actions/noticesearch.php:121
+#. TRANS: Text for logged in users making a query for notices without results.
+#. TRANS: This message contains a Markdown link.
+#: actions/noticesearch.php:128
 #, php-format
 msgid ""
 "Be the first to [post on this topic](%%%%action.newnotice%%%%?"
@@ -3888,7 +3953,9 @@ msgstr ""
 "Sé la primera persona en [publicar algo en este tema](%%%%action.newnotice%%%"
 "%?status_textarea=%s)!"
 
-#: actions/noticesearch.php:124
+#. TRANS: Text for not logged in users making a query for notices without results.
+#. TRANS: This message contains Markdown links.
+#: actions/noticesearch.php:133
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and be the first to "
@@ -3898,14 +3965,17 @@ msgstr ""
 "en la primera persona en [publicar algo en este tema](%%%%action.newnotice%%%"
 "%?status_textarea=%s)?"
 
-#: actions/noticesearchrss.php:96
+#. TRANS: RSS notice search feed title. %s is the query.
+#: actions/noticesearchrss.php:95
 #, php-format
 msgid "Updates with \"%s\""
 msgstr "Actualizaciones con \"%s\""
 
-#: actions/noticesearchrss.php:98
+#. TRANS: RSS notice search feed description.
+#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
+#: actions/noticesearchrss.php:99
 #, fuzzy, php-format
-msgid "Updates matching search term \"%1$s\" on %2$s!"
+msgid "Updates matching search term \"%1$s\" on %2$s."
 msgstr ""
 "¡Actualizaciones que contienen el término de búsqueda \"%1$s\" en %2$s!"
 
@@ -3927,51 +3997,51 @@ msgid "Nudge sent!"
 msgstr "¡Toque enviado!"
 
 #. TRANS: Message displayed to an anonymous user trying to view OAuth application list.
-#: actions/oauthappssettings.php:60
+#: actions/oauthappssettings.php:57
 msgid "You must be logged in to list your applications."
 msgstr "Debes estar conectado para listar tus aplicaciones."
 
 #. TRANS: Page title for OAuth applications
-#: actions/oauthappssettings.php:76
+#: actions/oauthappssettings.php:73
 msgid "OAuth applications"
 msgstr "Aplicaciones OAuth"
 
 #. TRANS: Page instructions for OAuth applications
-#: actions/oauthappssettings.php:88
+#: actions/oauthappssettings.php:85
 msgid "Applications you have registered"
 msgstr "Aplicaciones que has registrado"
 
 #. TRANS: Empty list message on page with OAuth applications.
-#: actions/oauthappssettings.php:141
+#: actions/oauthappssettings.php:138
 #, php-format
 msgid "You have not registered any applications yet."
 msgstr "Aún no has registrado aplicación alguna."
 
 #. TRANS: Title for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:71
+#: actions/oauthconnectionssettings.php:69
 msgid "Connected applications"
 msgstr "Aplicaciones conectadas"
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:83
+#: actions/oauthconnectionssettings.php:80
 msgid "The following connections exist for your account."
 msgstr ""
 
 #. TRANS: Client error when trying to revoke access for an application while not being a user of it.
-#: actions/oauthconnectionssettings.php:168
+#: actions/oauthconnectionssettings.php:165
 msgid "You are not a user of that application."
 msgstr "No eres un usuario de esa aplicación."
 
 #. TRANS: Client error when revoking access has failed for some reason.
 #. TRANS: %s is the application ID revoking access failed for.
-#: actions/oauthconnectionssettings.php:183
+#: actions/oauthconnectionssettings.php:180
 #, fuzzy, php-format
 msgid "Unable to revoke access for application: %s."
 msgstr "No se puede revocar el acceso para la aplicación: %s."
 
 #. TRANS: Success message after revoking access for an application.
 #. TRANS: %1$s is the application name, %2$s is the first part of the user token.
-#: actions/oauthconnectionssettings.php:202
+#: actions/oauthconnectionssettings.php:199
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -3979,20 +4049,30 @@ msgid ""
 msgstr ""
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:213
+#: actions/oauthconnectionssettings.php:210
 msgid "You have not authorized any applications to use your account."
 msgstr "No has autorizado a ninguna aplicación utilizar tu cuenta."
 
 #. TRANS: Note for developers in the OAuth connection settings form.
 #. TRANS: This message contains a Markdown link. Do not separate "](".
 #. TRANS: %s is the URL to the OAuth settings.
-#: actions/oauthconnectionssettings.php:233
+#: actions/oauthconnectionssettings.php:230
 #, php-format
 msgid ""
 "Are you a developer? [Register an OAuth client application](%s) to use with "
 "this instance of StatusNet."
 msgstr ""
 
+#: actions/oembed.php:64
+#, fuzzy, php-format
+msgid "\"%s\" not found."
+msgstr "Método de API no encontrado."
+
+#: actions/oembed.php:76
+#, fuzzy, php-format
+msgid "Notice %s not found."
+msgstr "Método de API no encontrado."
+
 #: actions/oembed.php:80 actions/shownotice.php:100
 msgid "Notice has no profile."
 msgstr "Mensaje sin perfil."
@@ -4002,6 +4082,16 @@ msgstr "Mensaje sin perfil."
 msgid "%1$s's status on %2$s"
 msgstr "estado de %1$s en %2$s"
 
+#: actions/oembed.php:95
+#, fuzzy, php-format
+msgid "Attachment %s not found."
+msgstr "No se encuentra usuario receptor."
+
+#: actions/oembed.php:136
+#, php-format
+msgid "\"%s\" not supported for oembed requests."
+msgstr ""
+
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
 #: actions/oembed.php:168
 #, php-format
@@ -4015,94 +4105,60 @@ msgid "Only %s URLs over plain HTTP please."
 msgstr "Solamente %s URL sobre HTTP simples, por favor."
 
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1205
-#: lib/apiaction.php:1232 lib/apiaction.php:1367
+#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1207
+#: lib/apiaction.php:1234 lib/apiaction.php:1369
 msgid "Not a supported data format."
 msgstr "No es un formato de datos compatible."
 
+#. TRANS: ShortName in the OpenSearch interface when trying to find users.
 #: actions/opensearch.php:64
 msgid "People Search"
 msgstr "Búsqueda de gente"
 
-#: actions/opensearch.php:67
+#: actions/opensearch.php:68
 msgid "Notice Search"
 msgstr "Búsqueda de mensajes"
 
-#: actions/othersettings.php:59
-msgid "Other settings"
-msgstr "Otros ajustes"
-
-#. TRANS: Instructions for tab "Other" in user profile settings.
-#: actions/othersettings.php:71
-msgid "Manage various other options."
-msgstr "Manejo de varias opciones adicionales."
-
-#. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
-#. TRANS: user's profile settings. Use of "free" is as in "open", indicating that the
-#. TRANS: information on the shortener site is freely distributable.
-#. TRANS: This message has one space at the beginning. Use your language's word separator
-#. TRANS: here if it has one (most likely a single space).
-#: actions/othersettings.php:113
-msgid " (free service)"
-msgstr " (servicio libre)"
-
-#. TRANS: Label for dropdown with URL shortener services.
-#: actions/othersettings.php:122
-msgid "Shorten URLs with"
-msgstr "Acortar los URL con"
-
-#. TRANS: Tooltip for for dropdown with URL shortener services.
-#: actions/othersettings.php:124
-msgid "Automatic shortening service to use."
-msgstr "Servicio de acorte automático a usar."
-
-#. TRANS: Label for checkbox.
-#: actions/othersettings.php:130
-msgid "View profile designs"
-msgstr "Ver diseños de perfil"
-
-#. TRANS: Tooltip for checkbox.
-#: actions/othersettings.php:132
-msgid "Show or hide profile designs."
-msgstr "Ocultar o mostrar diseños de perfil."
-
-#. TRANS: Form validation error for form "Other settings" in user profile.
-#: actions/othersettings.php:164
-#, fuzzy
-msgid "URL shortening service is too long (maximum 50 characters)."
-msgstr "El servicio de acortamiento de URL es muy largo (máx. 50 caracteres)."
-
-#: actions/otp.php:69
+#. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
+#: actions/otp.php:70
 msgid "No user ID specified."
 msgstr "No se ha especificado ID de usuario."
 
-#: actions/otp.php:83
+#. TRANS: Client error displayed trying to use "one time password login" without specifying a login token.
+#: actions/otp.php:86
 msgid "No login token specified."
 msgstr "No se ha especificado un token de acceso."
 
-#: actions/otp.php:90
+#. TRANS: Client error displayed trying to use "one time password login" without requesting a login token.
+#: actions/otp.php:94
 msgid "No login token requested."
 msgstr "Token de acceso solicitado."
 
-#: actions/otp.php:95
+#. TRANS: Client error displayed trying to use "one time password login" while specifying an invalid login token.
+#: actions/otp.php:100
 msgid "Invalid login token specified."
 msgstr "Token de acceso inválido especificado."
 
-#: actions/otp.php:104
+#. TRANS: Client error displayed trying to use "one time password login" while specifying an expired login token.
+#: actions/otp.php:110
 msgid "Login token expired."
 msgstr "Token de acceso caducado."
 
-#: actions/outbox.php:58
+#. TRANS: Title for outbox for any but the fist page.
+#. TRANS: %1$s is the user nickname, %2$d is the page number.
+#: actions/outbox.php:57
 #, php-format
 msgid "Outbox for %1$s - page %2$d"
 msgstr "Bandeja de salida de %1$s - página %2$d"
 
+#. TRANS: Title for first page of outbox.
 #: actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
 msgstr "Bandeja de salida para %s"
 
-#: actions/outbox.php:104
+#. TRANS: Instructions for outbox.
+#: actions/outbox.php:103
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr ""
 "Ésta es tu bandeja de salida, incluye la lista de mensajes privados enviados."
@@ -4129,43 +4185,45 @@ msgstr "Antigua contraseña"
 msgid "New password"
 msgstr "Nueva contraseña"
 
-#: actions/passwordsettings.php:109
+#: actions/passwordsettings.php:109 actions/register.php:416
 #, fuzzy
-msgid "6 or more characters"
+msgid "6 or more characters."
 msgstr "6 o más caracteres"
 
-#: actions/passwordsettings.php:113
+#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#: actions/passwordsettings.php:113 actions/recoverpassword.php:264
+#: actions/register.php:420
 #, fuzzy
-msgid "Same as password above"
+msgid "Same as password above."
 msgstr "Igual a la contraseña de arriba"
 
 #: actions/passwordsettings.php:117
 msgid "Change"
 msgstr "Cambiar"
 
-#: actions/passwordsettings.php:154 actions/register.php:238
+#: actions/passwordsettings.php:153 actions/register.php:223
 msgid "Password must be 6 or more characters."
 msgstr "La contraseña debe tener 6 o más caracteres."
 
-#: actions/passwordsettings.php:157 actions/register.php:241
+#: actions/passwordsettings.php:156 actions/register.php:226
 msgid "Passwords don't match."
 msgstr "Las contraseñas no coinciden"
 
-#: actions/passwordsettings.php:165
+#: actions/passwordsettings.php:164
 msgid "Incorrect old password"
 msgstr "Contraseña antigua incorrecta."
 
-#: actions/passwordsettings.php:181
+#: actions/passwordsettings.php:180
 msgid "Error saving user; invalid."
 msgstr "Error al guardar el usuario; inválido."
 
-#: actions/passwordsettings.php:186
+#. TRANS: Reset password form validation error message.
+#: actions/passwordsettings.php:185 actions/recoverpassword.php:418
 #, fuzzy
-msgid "Can't save new password."
+msgid "Cannot save new password."
 msgstr "No se puede guardar la nueva contraseña."
 
-#. TRANS: Title for password recovery page in password saved mode.
-#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
+#: actions/passwordsettings.php:191
 msgid "Password saved."
 msgstr "Se guardó la contraseña."
 
@@ -4382,8 +4440,7 @@ msgid "Directory where backgrounds are located."
 msgstr "Ruta del directorio de las configuraciones locales"
 
 #. TRANS: Fieldset legens in Paths admin panel.
-#. TRANS: DT element label in attachment list.
-#: actions/pathsadminpanel.php:419 lib/attachmentlist.php:98
+#: actions/pathsadminpanel.php:419
 msgid "Attachments"
 msgstr "Adjuntos"
 
@@ -4457,7 +4514,9 @@ msgstr "Servidor hacia el cual dirigir las solicitudes SSL"
 msgid "Save paths"
 msgstr "Guardar rutas"
 
-#: actions/peoplesearch.php:52
+#. TRANS: Instructions for the "People search" page.
+#. TRANS: %%site.name%% is the name of the StatusNet site.
+#: actions/peoplesearch.php:54
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
@@ -4466,7 +4525,8 @@ msgstr ""
 "Buscar personas en %%site.name%% por nombre, ubicación o intereses. Separa "
 "los términos con espacios; deben tener una longitud mínima de 3 caracteres."
 
-#: actions/peoplesearch.php:58
+#. TRANS: Title of a page where users can search for other users.
+#: actions/peoplesearch.php:61
 msgid "People search"
 msgstr "Buscador de gente"
 
@@ -4480,6 +4540,60 @@ msgstr "No es una etiqueta válida para personas: %s."
 msgid "Users self-tagged with %1$s - page %2$d"
 msgstr "Usuarios auto etiquetados con %1$s - página %2$d"
 
+#. TRANS: Page title for AJAX form return when a disabling a plugin.
+#: actions/plugindisable.php:69
+msgctxt "plugin"
+msgid "Disabled"
+msgstr ""
+
+#. TRANS: Client error displayed trying to perform any request method other than POST.
+#. TRANS: Do not translate POST.
+#: actions/pluginenable.php:78 actions/subscribe.php:77
+msgid "This action only accepts POST requests."
+msgstr "Esta acción sólo acepta solicitudes POST."
+
+#: actions/pluginenable.php:102
+#, fuzzy
+msgid "You cannot administer plugins."
+msgstr "No puedes borrar usuarios."
+
+#: actions/pluginenable.php:109
+#, fuzzy
+msgid "No such plugin."
+msgstr "No existe tal página."
+
+#. TRANS: Page title for AJAX form return when enabling a plugin.
+#: actions/pluginenable.php:159
+msgctxt "plugin"
+msgid "Enabled"
+msgstr ""
+
+#. TRANS: Tab and title for plugins admin panel.
+#. TRANS: Menu item for site administration
+#: actions/pluginsadminpanel.php:56 actions/version.php:191
+#: lib/adminpanelaction.php:411
+msgid "Plugins"
+msgstr "Complementos"
+
+#. TRANS: Instructions at top of plugin admin page.
+#: actions/pluginsadminpanel.php:68
+msgid ""
+"Additional plugins can be enabled and configured manually. See the <a href="
+"\"http://status.net/wiki/Plugins\">online plugin documentation</a> for more "
+"details."
+msgstr ""
+
+#. TRANS: Admin form section header
+#: actions/pluginsadminpanel.php:84
+#, fuzzy
+msgid "Default plugins"
+msgstr "!Idioma predeterminado"
+
+#: actions/pluginsadminpanel.php:106
+msgid ""
+"All default plugins have been disabled from the site's configuration file."
+msgstr ""
+
 #: actions/postnotice.php:95
 msgid "Invalid notice content."
 msgstr "Contenido de mensaje inválido."
@@ -4492,12 +4606,12 @@ msgstr ""
 "$s’."
 
 #. TRANS: Page title for profile settings.
-#: actions/profilesettings.php:59
+#: actions/profilesettings.php:60
 msgid "Profile settings"
 msgstr "Configuración del perfil"
 
 #. TRANS: Usage instructions for profile settings.
-#: actions/profilesettings.php:70
+#: actions/profilesettings.php:71
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
@@ -4505,35 +4619,32 @@ msgstr ""
 "sepa más sobre ti."
 
 #. TRANS: Profile settings form legend.
-#: actions/profilesettings.php:98
+#: actions/profilesettings.php:99
 msgid "Profile information"
 msgstr "Información del perfil"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109 actions/register.php:433
+#: actions/profilesettings.php:110 actions/register.php:412
 #, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr ""
 "1-64 letras en minúscula o números, sin signos de puntuación o espacios"
 
 #. TRANS: Field label in form for profile settings.
-#. TRANS: Label for full group name (dt). Text hidden by default.
-#. TRANS: DT for full name in a profile.
-#: actions/profilesettings.php:113 actions/register.php:455
-#: actions/showgroup.php:255 actions/tagother.php:104
-#: lib/groupeditform.php:150 lib/userprofile.php:156
+#: actions/profilesettings.php:114 actions/register.php:434
+#: lib/groupeditform.php:150
 msgid "Full name"
 msgstr "Nombre completo"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:118 actions/register.php:460
+#: actions/profilesettings.php:119 actions/register.php:439
 #: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "Página de inicio"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:121
+#: actions/profilesettings.php:122 actions/register.php:441
 #, fuzzy
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr "El URL de tu página de inicio, blog o perfil en otro sitio"
@@ -4541,7 +4652,7 @@ msgstr "El URL de tu página de inicio, blog o perfil en otro sitio"
 #. TRANS: Tooltip for field label in form for profile settings. Plural
 #. TRANS: is decided by the number of characters available for the
 #. TRANS: biography (%d).
-#: actions/profilesettings.php:129 actions/register.php:471
+#: actions/profilesettings.php:130 actions/register.php:450
 #, fuzzy, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4549,79 +4660,75 @@ msgstr[0] "Descríbete y cuéntanos tus intereses en %d caracteres"
 msgstr[1] "Descríbete y cuéntanos tus intereses en %d caracteres"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:135 actions/register.php:476
+#: actions/profilesettings.php:136 actions/register.php:455
 msgid "Describe yourself and your interests"
 msgstr "Descríbete y cuéntanos acerca de tus intereses"
 
 #. TRANS: Text area label in form for profile settings where users can provide.
 #. TRANS: their biography.
-#: actions/profilesettings.php:139 actions/register.php:478
+#: actions/profilesettings.php:140 actions/register.php:457
 msgid "Bio"
 msgstr "Biografía"
 
 #. TRANS: Field label in form for profile settings.
-#. TRANS: Label for group location (dt). Text hidden by default.
-#. TRANS: DT for location in a profile.
-#: actions/profilesettings.php:145 actions/register.php:483
-#: actions/showgroup.php:265 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:173
-#: lib/userprofile.php:172
+#: actions/profilesettings.php:146 actions/register.php:462
+#: lib/groupeditform.php:173
 msgid "Location"
 msgstr "Ubicación"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148 actions/register.php:485
+#: actions/profilesettings.php:149
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Dónde estás, por ejemplo \"Ciudad, Estado (o Región), País\""
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:153
+#: actions/profilesettings.php:154
 msgid "Share my current location when posting notices"
 msgstr "Compartir mi ubicación actual al publicar los mensajes"
 
 #. TRANS: Field label in form for profile settings.
-#. TRANS: DT for tags in a profile.
-#: actions/profilesettings.php:161 actions/tagother.php:149
-#: actions/tagother.php:209 lib/subscriptionlist.php:106
-#: lib/subscriptionlist.php:108 lib/userprofile.php:220
+#: actions/profilesettings.php:162 actions/tagother.php:128
+#: actions/tagother.php:188 lib/subscriptionlist.php:104
+#: lib/subscriptionlist.php:106
 msgid "Tags"
 msgstr "Etiquetas"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:164
+#: actions/profilesettings.php:165
 #, fuzzy
 msgid ""
-"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- "
+"separated."
 msgstr ""
 "Etiquetas para ti (letras, números, -, ., y _), separadas por comas o "
 "espacios"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:169
+#: actions/profilesettings.php:170
 msgid "Language"
 msgstr "Idioma"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:171
+#: actions/profilesettings.php:172
 #, fuzzy
-msgid "Preferred language"
+msgid "Preferred language."
 msgstr "Lenguaje de preferencia"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:181
+#: actions/profilesettings.php:182
 msgid "Timezone"
 msgstr "Zona horaria"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:183
+#: actions/profilesettings.php:184
 msgid "What timezone are you normally in?"
 msgstr "En que zona horaria se encuentra normalmente?"
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:189
+#: actions/profilesettings.php:190
 #, fuzzy
 msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)"
+"Automatically subscribe to whoever subscribes to me (best for non-humans)."
 msgstr ""
 "Suscribirse automáticamente a quien quiera que se suscriba a mí (es mejor "
 "para no-humanos)"
@@ -4629,7 +4736,7 @@ msgstr ""
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Plural form is used based on the maximum number of allowed
 #. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:258 actions/register.php:229
+#: actions/profilesettings.php:259 actions/register.php:214
 #, fuzzy, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4637,50 +4744,50 @@ msgstr[0] "La biografía es muy larga (máx. %d caracteres)."
 msgstr[1] "La biografía es muy larga (máx. %d caracteres)."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:269 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:270 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr "Zona horaria no seleccionada"
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:277
+#: actions/profilesettings.php:278
 #, fuzzy
 msgid "Language is too long (maximum 50 characters)."
 msgstr "Idioma es muy largo ( max 50 car.)"
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:291 actions/tagother.php:178
-#, php-format
-msgid "Invalid tag: \"%s\""
+#: actions/profilesettings.php:292
+#, fuzzy, php-format
+msgid "Invalid tag: \"%s\"."
 msgstr "Etiqueta inválida: \"% s\""
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:347
+#: actions/profilesettings.php:348
 #, fuzzy
 msgid "Could not update user for autosubscribe."
 msgstr "No se pudo actualizar el usuario para autosuscribirse."
 
 #. TRANS: Server error thrown when user profile location preference settings could not be updated.
-#: actions/profilesettings.php:405
+#: actions/profilesettings.php:406
 #, fuzzy
 msgid "Could not save location prefs."
 msgstr "No se han podido guardar las preferencias de ubicación."
 
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:427 actions/tagother.php:200
+#: actions/profilesettings.php:428 actions/tagother.php:179
 msgid "Could not save tags."
 msgstr "No se han podido guardar las etiquetas."
 
 #. TRANS: Confirmation shown when user profile settings are saved.
 #. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:436 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:437 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "Se guardó configuración."
 
 #. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
 #. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:483 actions/restoreaccount.php:60
+#: actions/profilesettings.php:484 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "Crear una cuenta"
@@ -4761,6 +4868,12 @@ msgstr ""
 "org/wiki/Microblogging) basada en la herramienta de software libre  "
 "[StatusNet](http://status.net/) tool."
 
+#. TRANS: Public RSS feed description. %s is the StatusNet site name.
+#: actions/publicrss.php:106
+#, fuzzy, php-format
+msgid "%s updates from everyone."
+msgstr "¡Actualizaciones de todos en %s!"
+
 #. TRANS: Title for public tag cloud.
 #: actions/publictagcloud.php:57
 msgid "Public tag cloud"
@@ -4802,10 +4915,6 @@ msgstr ""
 "¿Por qué no [registras una cuenta](%%action.register%%) y te conviertes en "
 "la primera persona en publicar uno?"
 
-#: actions/publictagcloud.php:146
-msgid "Tag cloud"
-msgstr "Nube de etiquetas"
-
 #. TRANS: Client error displayed trying to recover password while already logged in.
 #: actions/recoverpassword.php:37
 msgid "You are already logged in!"
@@ -4903,6 +5012,12 @@ msgstr "Recuperar contraseña"
 msgid "Password recovery requested"
 msgstr "Recuperación de contraseña solicitada"
 
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/recoverpassword.php:229
+#, fuzzy
+msgid "Password saved"
+msgstr "Se guardó la contraseña."
+
 #. TRANS: Title for password recovery page when an unknown action has been specified.
 #: actions/recoverpassword.php:232
 msgid "Unknown action"
@@ -4914,15 +5029,9 @@ msgstr "Acción desconocida"
 msgid "6 or more characters, and do not forget it!"
 msgstr "6 o más caracteres, ¡no te olvides!"
 
-#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
-#: actions/recoverpassword.php:264 actions/register.php:441
-#, fuzzy
-msgid "Same as password above."
-msgstr "Igual a la contraseña de arriba"
-
 #. TRANS: Button text for password reset form.
 #. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: actions/recoverpassword.php:268 lib/designsettings.php:264
+#: actions/recoverpassword.php:268 lib/designform.php:145
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Reset"
@@ -4973,14 +5082,8 @@ msgstr "La contraseña debe tener 6 o más caracteres."
 msgid "Password and confirmation do not match."
 msgstr "La contraseña y la confirmación no coinciden."
 
-#. TRANS: Reset password form validation error message.
-#: actions/recoverpassword.php:418
-#, fuzzy
-msgid "Cannot save new password."
-msgstr "No se puede guardar la nueva contraseña."
-
 #. TRANS: Server error displayed when something does wrong with the user object during password reset.
-#: actions/recoverpassword.php:426 actions/register.php:256
+#: actions/recoverpassword.php:426 actions/register.php:241
 msgid "Error setting user."
 msgstr "Error al configurar el usuario."
 
@@ -4989,100 +5092,104 @@ msgstr "Error al configurar el usuario."
 msgid "New password successfully saved. You are now logged in."
 msgstr "Nueva contraseña guardada correctamente. Has iniciado una sesión."
 
-#: actions/register.php:92 actions/register.php:196 actions/register.php:413
+#: actions/redirecturl.php:70
+#, fuzzy
+msgid "No id parameter"
+msgstr "No existe argumento de ID."
+
+#: actions/redirecturl.php:76
+#, fuzzy, php-format
+msgid "No such file \"%d\""
+msgstr "No existe tal archivo."
+
+#: actions/register.php:80 actions/register.php:181 actions/register.php:392
 msgid "Sorry, only invited people can register."
 msgstr "Disculpa, sólo personas invitadas pueden registrarse."
 
-#: actions/register.php:99
+#: actions/register.php:87
 msgid "Sorry, invalid invitation code."
 msgstr "El código de invitación no es válido."
 
-#: actions/register.php:119
+#: actions/register.php:106
 msgid "Registration successful"
 msgstr "Registro exitoso."
 
-#: actions/register.php:121 actions/register.php:511
+#: actions/register.php:108 actions/register.php:490
 msgid "Register"
 msgstr "Registrarse"
 
-#: actions/register.php:142
+#: actions/register.php:128
 msgid "Registration not allowed."
 msgstr "Registro de usuario no permitido."
 
-#: actions/register.php:209
+#: actions/register.php:194
 #, fuzzy
-msgid "You can't register if you don't agree to the license."
+msgid "You cannot register if you don't agree to the license."
 msgstr "No puedes registrarte si no estás de acuerdo con la licencia."
 
-#: actions/register.php:218
+#: actions/register.php:203
 msgid "Email address already exists."
 msgstr "La dirección de correo electrónico ya existe."
 
-#: actions/register.php:251 actions/register.php:273
+#: actions/register.php:236 actions/register.php:258
 msgid "Invalid username or password."
 msgstr "Usuario o contraseña inválidos."
 
-#: actions/register.php:351
+#: actions/register.php:333
 #, fuzzy
 msgid ""
 "With this form you can create a new account. You can then post notices and "
-"link up to friends and colleagues. "
+"link up to friends and colleagues."
 msgstr ""
 "Con este formulario puedes crear una nueva cuenta. Después podrás publicar "
 "avisos y enviar vínculos de ellos a tus amigos y colegas. "
 
-#: actions/register.php:437
-#, fuzzy
-msgid "6 or more characters."
-msgstr "6 o más caracteres"
-
-#. TRANS: Link description in user account settings menu.
-#: actions/register.php:445 actions/register.php:449
-#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
+#: actions/register.php:424 actions/register.php:428
+#: actions/siteadminpanel.php:238 lib/settingsnav.php:92
 msgid "Email"
 msgstr "Correo electrónico"
 
-#: actions/register.php:446 actions/register.php:450
+#: actions/register.php:425 actions/register.php:429
 #, fuzzy
-msgid "Used only for updates, announcements, and password recovery"
+msgid "Used only for updates, announcements, and password recovery."
 msgstr ""
 "Se usa sólo para actualizaciones, anuncios y recuperación de contraseñas"
 
-#: actions/register.php:457
+#: actions/register.php:436
 #, fuzzy
-msgid "Longer name, preferably your \"real\" name"
+msgid "Longer name, preferably your \"real\" name."
 msgstr "Nombre más largo, preferiblemente tu nombre \"real\""
 
-#: actions/register.php:462
+#: actions/register.php:464
 #, fuzzy
-msgid "URL of your homepage, blog, or profile on another site"
-msgstr "El URL de tu página de inicio, blog o perfil en otro sitio"
+msgid "Where you are, like \"City, State (or Region), Country\"."
+msgstr "Dónde estás, por ejemplo \"Ciudad, Estado (o Región), País\""
 
-#: actions/register.php:523
+#: actions/register.php:503
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
 msgstr ""
 "Entiendo que el contenido y los datos de %1$s son privados y confidenciales."
 
-#: actions/register.php:533
+#: actions/register.php:513
 #, php-format
 msgid "My text and files are copyright by %1$s."
 msgstr ""
 "Mi texto y archivos est'an protegidos por los derecho de autor de %1$s."
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:537
+#: actions/register.php:517
 msgid "My text and files remain under my own copyright."
 msgstr "Mi texto y archivos permanecen bajo mi propio derecho de autor."
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:540
+#: actions/register.php:520
 msgid "All rights reserved."
 msgstr "Todos los derechos reservados."
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:545
+#: actions/register.php:525
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -5092,7 +5199,7 @@ msgstr ""
 "información privada: contraseña, dirección de correo electrónico, dirección "
 "de mensajería instantánea y número de teléfono."
 
-#: actions/register.php:588
+#: actions/register.php:566
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -5125,7 +5232,7 @@ msgstr ""
 "\n"
 "¡Gracias por apuntarte! Esperamos que disfrutes usando este servicio."
 
-#: actions/register.php:612
+#: actions/register.php:590
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5159,7 +5266,7 @@ msgstr "Usuario"
 
 #: actions/remotesubscribe.php:129
 #, fuzzy
-msgid "Nickname of the user you want to follow"
+msgid "Nickname of the user you want to follow."
 msgstr "Usuario a quien quieres seguir"
 
 #: actions/remotesubscribe.php:132
@@ -5168,18 +5275,18 @@ msgstr "URL del perfil"
 
 #: actions/remotesubscribe.php:133
 #, fuzzy
-msgid "URL of your profile on another compatible microblogging service"
+msgid "URL of your profile on another compatible microblogging service."
 msgstr "El URL de tu perfil en otro servicio de microblogueo compatible"
 
 #. TRANS: Link text for link that will subscribe to a remote profile.
 #: actions/remotesubscribe.php:136 lib/subscribeform.php:139
-#: lib/userprofile.php:431
+#: lib/userprofile.php:402
 msgid "Subscribe"
 msgstr "Suscribirse"
 
 #: actions/remotesubscribe.php:158
 #, fuzzy
-msgid "Invalid profile URL (bad format)"
+msgid "Invalid profile URL (bad format)."
 msgstr "El URL del perfil es inválido (formato incorrecto)"
 
 #: actions/remotesubscribe.php:167
@@ -5215,7 +5322,7 @@ msgstr "No puedes repetir tus propios mensajes."
 msgid "You already repeated that notice."
 msgstr "Ya has repetido este mensaje."
 
-#: actions/repeat.php:112 lib/noticelist.php:692
+#: actions/repeat.php:112 lib/noticelist.php:697
 msgid "Repeated"
 msgstr "Repetido"
 
@@ -5223,9 +5330,9 @@ msgstr "Repetido"
 msgid "Repeated!"
 msgstr "¡Repetido!"
 
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing @-replies.
+#. TRANS: RSS reply feed title. %s is a user nickname.
 #: actions/replies.php:126 actions/repliesrss.php:68
-#: lib/personalgroupnav.php:109
+#: lib/personalgroupnav.php:105
 #, php-format
 msgid "Replies to %s"
 msgstr "Respuestas a %s"
@@ -5277,9 +5384,11 @@ msgstr ""
 "Puedes intentar [darle un toque a %1$s](../%2$s) o [publicar algo a su "
 "atención](%%%%action.newnotice%%%%?status_textarea=%3$s)."
 
-#: actions/repliesrss.php:72
+#. TRANS: RSS reply feed description.
+#. TRANS: %1$s is a user nickname, %2$s is the StatusNet site name.
+#: actions/repliesrss.php:74
 #, fuzzy, php-format
-msgid "Replies to %1$s on %2$s!"
+msgid "Replies to %1$s on %2$s."
 msgstr "Respuestas a %1$s en %2$s!"
 
 #. TRANS: Client exception displayed when trying to restore an account while not logged in.
@@ -5382,7 +5491,7 @@ msgstr "No puedes revocar funciones de usuario en este sitio."
 msgid "User doesn't have this role."
 msgstr "El usuario no tiene esta función."
 
-#: actions/rsd.php:146 actions/version.php:159
+#: actions/rsd.php:142 actions/version.php:159
 msgid "StatusNet"
 msgstr "StatusNet"
 
@@ -5424,87 +5533,38 @@ msgstr "Activar la salida de depuración para sesiones."
 msgid "Save site settings"
 msgstr "Guardar la configuración del sitio"
 
-#: actions/showapplication.php:82
+#: actions/showapplication.php:78
 msgid "You must be logged in to view an application."
 msgstr "Tienes que haber iniciado sesión para poder ver aplicaciones."
 
-#: actions/showapplication.php:157
+#: actions/showapplication.php:151
 msgid "Application profile"
 msgstr "Perfil de la aplicación"
 
-#. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:159 lib/applicationeditform.php:177
-msgid "Icon"
-msgstr "Icono"
-
-#. TRANS: Form input field label for application name.
-#: actions/showapplication.php:169 actions/version.php:197
-#: lib/applicationeditform.php:190
-msgid "Name"
-msgstr "Nombre"
-
-#. TRANS: Form input field label.
-#: actions/showapplication.php:178 lib/applicationeditform.php:227
-msgid "Organization"
-msgstr "Organización"
-
-#. TRANS: Form input field label.
-#: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:168
-msgid "Description"
-msgstr "Descripción"
-
-#. TRANS: Header for group statistics on a group page (h2).
-#. TRANS: H2 text for user statistics.
-#: actions/showapplication.php:192 actions/showgroup.php:460
-#: lib/profileaction.php:205
-msgid "Statistics"
-msgstr "Estadísticas"
-
-#: actions/showapplication.php:203
+#: actions/showapplication.php:179
 #, php-format
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr "Creado por %1$s - acceso predeterminado %2$s - %3$d usuarios"
 
-#: actions/showapplication.php:213
+#: actions/showapplication.php:189
 msgid "Application actions"
 msgstr "Acciones de la aplicación"
 
-#: actions/showapplication.php:236
+#: actions/showapplication.php:212
 msgid "Reset key & secret"
 msgstr "Reiniciar clave y secreto"
 
 #. TRANS: Title of form for deleting a user.
-#: actions/showapplication.php:252 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:64 lib/noticelist.php:673
+#: actions/showapplication.php:228 lib/deletegroupform.php:121
+#: lib/deleteuserform.php:64 lib/noticelist.php:678
 msgid "Delete"
 msgstr "Borrar"
 
-#: actions/showapplication.php:261
+#: actions/showapplication.php:237
 msgid "Application info"
 msgstr "Información de la aplicación"
 
-#: actions/showapplication.php:263
-msgid "Consumer key"
-msgstr "Clave del consumidor"
-
-#: actions/showapplication.php:268
-msgid "Consumer secret"
-msgstr "Secreto del consumidor"
-
-#: actions/showapplication.php:273
-msgid "Request token URL"
-msgstr "URL del token de solicitud"
-
-#: actions/showapplication.php:278
-msgid "Access token URL"
-msgstr "URL del token de acceso"
-
-#: actions/showapplication.php:283
-msgid "Authorize URL"
-msgstr "Autorizar URL"
-
-#: actions/showapplication.php:288
+#: actions/showapplication.php:255
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
@@ -5512,7 +5572,7 @@ msgstr ""
 "Nota: Nuestro sistema sólo es compatible con firmas HMAC-SHA1. No son "
 "compatibles las firmas de texto sin formato."
 
-#: actions/showapplication.php:309
+#: actions/showapplication.php:275
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr "¿realmente deseas reiniciar tu clave y secreto de consumidor?"
 
@@ -5598,61 +5658,47 @@ msgstr "Grupo %s"
 msgid "%1$s group, page %2$d"
 msgstr "grupo %1$s, página %2$d"
 
-#. TRANS: Group profile header (h2). Text hidden by default.
-#: actions/showgroup.php:223
-msgid "Group profile"
-msgstr "Perfil del grupo"
-
-#. TRANS: Label for group URL (dt). Text hidden by default.
-#. TRANS: DT for URL in a profile.
-#: actions/showgroup.php:273 actions/tagother.php:118
-#: actions/userauthorization.php:175 lib/userprofile.php:186
-msgid "URL"
-msgstr "URL"
-
 #. TRANS: Label for group description or group note (dt). Text hidden by default.
-#. TRANS: DT for note in a profile.
-#: actions/showgroup.php:285 actions/tagother.php:128
-#: actions/userauthorization.php:187 lib/userprofile.php:204
+#: actions/showgroup.php:266
 msgid "Note"
 msgstr "Nota"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:296 lib/groupeditform.php:180
+#: actions/showgroup.php:277 lib/groupeditform.php:180
 msgid "Aliases"
 msgstr "Alias"
 
 #. TRANS: Group actions header (h2). Text hidden by default.
-#: actions/showgroup.php:313
+#: actions/showgroup.php:294
 msgid "Group actions"
 msgstr "Acciones del grupo"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:357
+#: actions/showgroup.php:338
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
 msgstr "Canal de mensajes del grupo %s (RSS 1.0)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:364
+#: actions/showgroup.php:345
 #, php-format
 msgid "Notice feed for %s group (RSS 2.0)"
 msgstr "Canal de mensajes del grupo %s (RSS 2.0)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:371
+#: actions/showgroup.php:352
 #, php-format
 msgid "Notice feed for %s group (Atom)"
 msgstr "Canal de mensajes del grupo %s (Atom)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:377
+#: actions/showgroup.php:358
 #, php-format
 msgid "FOAF for %s group"
 msgstr "Amistades de amistades del grupo %s"
 
 #. TRANS: Header for mini list of group members on a group page (h2).
-#: actions/showgroup.php:414
+#: actions/showgroup.php:395
 msgid "Members"
 msgstr "Miembros"
 
@@ -5660,26 +5706,31 @@ msgstr "Miembros"
 #. TRANS: Text for user subscription statistics if the user has no subscriptions.
 #. TRANS: Text for user subscriber statistics if user has no subscribers.
 #. TRANS: Text for user user group membership statistics if user is not a member of any group.
-#: actions/showgroup.php:420 lib/profileaction.php:137
+#: actions/showgroup.php:401 lib/profileaction.php:137
 #: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
-#: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
+#: lib/subscriptionlist.php:123 lib/tagcloudsection.php:71
 msgid "(None)"
 msgstr "(Ninguno)"
 
 #. TRANS: Link to all group members from mini list of group members if group has more than n members.
-#: actions/showgroup.php:429
+#: actions/showgroup.php:410
 msgid "All members"
 msgstr "Todos los miembros"
 
-#. TRANS: Label for creation date in statistics on group page.
-#: actions/showgroup.php:465
+#. TRANS: Header for group statistics on a group page (h2).
+#. TRANS: H2 text for user statistics.
+#: actions/showgroup.php:441 lib/profileaction.php:205
+msgid "Statistics"
+msgstr "Estadísticas"
+
+#: actions/showgroup.php:444
 #, fuzzy
 msgctxt "LABEL"
 msgid "Created"
 msgstr "Creado"
 
 #. TRANS: Label for member count in statistics on group page.
-#: actions/showgroup.php:473
+#: actions/showgroup.php:449
 msgctxt "LABEL"
 msgid "Members"
 msgstr "Miembros"
@@ -5688,7 +5739,7 @@ msgstr "Miembros"
 #. TRANS: **%s** is the group alias, %%%%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).
-#: actions/showgroup.php:488
+#: actions/showgroup.php:464
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5707,7 +5758,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: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
-#: actions/showgroup.php:498
+#: actions/showgroup.php:474
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5721,7 +5772,7 @@ msgstr ""
 "comparten mensajes cortos acerca de su vida e intereses. "
 
 #. TRANS: Header for list of group administrators on a group page (h2).
-#: actions/showgroup.php:527
+#: actions/showgroup.php:503
 msgid "Admins"
 msgstr "Administradores"
 
@@ -5760,7 +5811,7 @@ msgid "%1$s tagged %2$s"
 msgstr "%1$s, página %2$s"
 
 #. TRANS: Page title showing tagged notices in one user's stream.
-#. TRANS: %1$s is the username, %2$s is the hash tag, %1$d is the page number.
+#. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
 #: actions/showstream.php:74
 #, fuzzy, php-format
 msgid "%1$s tagged %2$s, page %3$d"
@@ -5807,13 +5858,13 @@ msgid "FOAF for %s"
 msgstr "Amistades de amistades de %s"
 
 #. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
-#: actions/showstream.php:211
+#: actions/showstream.php:205
 #, fuzzy, php-format
 msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr "Esta es la línea temporal de %1$s, pero %2$s aún no ha publicado nada."
 
 #. TRANS: Second sentence of empty list message for a stream for the user themselves.
-#: actions/showstream.php:217
+#: actions/showstream.php:211
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
@@ -5823,7 +5874,7 @@ msgstr ""
 
 #. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:221
+#: actions/showstream.php:215
 #, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
@@ -5834,7 +5885,7 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:264
+#: actions/showstream.php:258
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5850,7 +5901,7 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:271
+#: actions/showstream.php:265
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5862,7 +5913,7 @@ msgstr ""
 "software libre [StatusNet](http://status.net/). "
 
 #. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
-#: actions/showstream.php:328
+#: actions/showstream.php:322
 #, php-format
 msgid "Repeat of %s"
 msgstr "Repetición de %s"
@@ -6013,76 +6064,76 @@ msgstr ""
 #. TRANS: Title for button to save site notice in admin panel.
 #: actions/sitenoticeadminpanel.php:201
 #, fuzzy
-msgid "Save site notice"
+msgid "Save site notice."
 msgstr "Guardar el mensaje del sitio"
 
 #. TRANS: Title for SMS settings.
-#: actions/smssettings.php:57
+#: actions/smssettings.php:56
 msgid "SMS settings"
 msgstr "Configuración de SMS"
 
 #. TRANS: SMS settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/smssettings.php:71
+#: actions/smssettings.php:70
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr ""
 "Puedes recibir mensajes SMS por correo electrónico desde %%site.name%%."
 
 #. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
-#: actions/smssettings.php:93
+#: actions/smssettings.php:92
 msgid "SMS is not available."
 msgstr "SMS no está disponible."
 
 #. TRANS: Form legend for SMS settings form.
-#: actions/smssettings.php:107
+#: actions/smssettings.php:106
 msgid "SMS address"
 msgstr "Dirección de SMS"
 
 #. TRANS: Form guide in SMS settings form.
-#: actions/smssettings.php:116
+#: actions/smssettings.php:115
 msgid "Current confirmed SMS-enabled phone number."
 msgstr "Actual número telefónico para SMS confirmado."
 
 #. TRANS: Form guide in IM settings form.
-#: actions/smssettings.php:129
+#: actions/smssettings.php:128
 msgid "Awaiting confirmation on this phone number."
 msgstr "Esperando confirmación de este número de teléfono."
 
 #. TRANS: Field label for SMS address input in SMS settings form.
-#: actions/smssettings.php:138
+#: actions/smssettings.php:137
 msgid "Confirmation code"
 msgstr "Código de confirmación"
 
 #. TRANS: Form field instructions in SMS settings form.
-#: actions/smssettings.php:140
+#: actions/smssettings.php:139
 msgid "Enter the code you received on your phone."
 msgstr "Ingrese el código recibido en su teléfono"
 
 #. TRANS: Button label to confirm SMS confirmation code in SMS settings.
-#: actions/smssettings.php:144
+#: actions/smssettings.php:143
 msgctxt "BUTTON"
 msgid "Confirm"
 msgstr "Confirmar"
 
 #. TRANS: Field label for SMS phone number input in SMS settings form.
-#: actions/smssettings.php:149
+#: actions/smssettings.php:148
 msgid "SMS phone number"
 msgstr "Número de teléfono de SMS"
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
-#: actions/smssettings.php:152
+#: actions/smssettings.php:151
 #, fuzzy
-msgid "Phone number, no punctuation or spaces, with area code"
+msgid "Phone number, no punctuation or spaces, with area code."
 msgstr "Número telefónico, sin puntuación ni espacios, incluya código de área"
 
 #. TRANS: Form legend for SMS preferences form.
-#: actions/smssettings.php:191
+#: actions/smssettings.php:190
 msgid "SMS preferences"
 msgstr "Preferencias de SMS"
 
 #. TRANS: Checkbox label in SMS preferences form.
-#: actions/smssettings.php:197
+#: actions/smssettings.php:196
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
@@ -6091,32 +6142,32 @@ msgstr ""
 "por mi operador móvil"
 
 #. TRANS: Confirmation message for successful SMS preferences save.
-#: actions/smssettings.php:308
+#: actions/smssettings.php:307
 msgid "SMS preferences saved."
 msgstr "Preferencias de SMS guardadas."
 
 #. TRANS: Message given saving SMS phone number without having provided one.
-#: actions/smssettings.php:330
+#: actions/smssettings.php:329
 msgid "No phone number."
 msgstr "Sin número telefónico"
 
 #. TRANS: Message given saving SMS phone number without having selected a carrier.
-#: actions/smssettings.php:336
+#: actions/smssettings.php:335
 msgid "No carrier selected."
 msgstr "No se seleccionó un operador móvil."
 
 #. TRANS: Message given saving SMS phone number that is already set.
-#: actions/smssettings.php:344
+#: actions/smssettings.php:343
 msgid "That is already your phone number."
 msgstr "Ese ya es tu número telefónico"
 
 #. TRANS: Message given saving SMS phone number that is already set for another user.
-#: actions/smssettings.php:348
+#: actions/smssettings.php:347
 msgid "That phone number already belongs to another user."
 msgstr "Ese número telefónico ya pertenece a otro usuario"
 
 #. TRANS: Message given saving valid SMS phone number that is to be confirmed.
-#: actions/smssettings.php:376
+#: actions/smssettings.php:375
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
 "for the code and instructions on how to use it."
@@ -6126,39 +6177,39 @@ msgstr ""
 "cómo usarlo."
 
 #. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
-#: actions/smssettings.php:404
+#: actions/smssettings.php:403
 msgid "That is the wrong confirmation number."
 msgstr "Ese no es el número de confirmación"
 
 #. TRANS: Message given after successfully canceling SMS phone number confirmation.
-#: actions/smssettings.php:418
+#: actions/smssettings.php:417
 msgid "SMS confirmation cancelled."
 msgstr "Confirmación de SMS cancelada."
 
 #. TRANS: Message given trying to remove an SMS phone number that is not
 #. TRANS: registered for the active user.
-#: actions/smssettings.php:438
+#: actions/smssettings.php:437
 msgid "That is not your phone number."
 msgstr "Ese no es tu número telefónico"
 
 #. TRANS: Message given after successfully removing a registered SMS phone number.
-#: actions/smssettings.php:460
+#: actions/smssettings.php:459
 msgid "The SMS phone number was removed."
 msgstr "El número de teléfono para SMS ha sido eliminado."
 
 #. TRANS: Label for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:499
+#: actions/smssettings.php:498
 msgid "Mobile carrier"
 msgstr "Operador de telefonía móvil"
 
 #. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:504
+#: actions/smssettings.php:503
 msgid "Select a carrier"
 msgstr "Seleccione un operador móvil"
 
 #. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
 #. TRANS: %s is an administrative contact's e-mail address.
-#: actions/smssettings.php:513
+#: actions/smssettings.php:512
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -6169,7 +6220,7 @@ msgstr ""
 "informarnos al %s."
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
-#: actions/smssettings.php:535
+#: actions/smssettings.php:534
 #, fuzzy
 msgid "No code entered."
 msgstr "No ingresó código"
@@ -6243,15 +6294,13 @@ msgstr "No te has suscrito a ese perfil."
 msgid "Could not save subscription."
 msgstr "No se ha podido guardar la suscripción."
 
-#: actions/subscribe.php:77
-msgid "This action only accepts POST requests."
-msgstr "Esta acción sólo acepta solicitudes POST."
-
-#: actions/subscribe.php:117
+#. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
+#: actions/subscribe.php:121
 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
 msgstr "No puedes suscribirte a un perfil remoto 0.1 de OMB con esta acción."
 
-#: actions/subscribe.php:145
+#. TRANS: Page title when subscription succeeded.
+#: actions/subscribe.php:149
 msgid "Subscribed"
 msgstr "Suscrito"
 
@@ -6369,31 +6418,34 @@ msgid "Subscription feed for %s (Atom)"
 msgstr "Canal de mensajes para %s (Atom)"
 
 #. TRANS: Checkbox label for enabling Jabber messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:239
-msgid "Jabber"
-msgstr "Jabber"
+#: actions/subscriptions.php:241 lib/settingsnav.php:110
+#, fuzzy
+msgid "IM"
+msgstr "IM"
 
 #. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:254
+#: actions/subscriptions.php:256 lib/settingsnav.php:117
 msgid "SMS"
 msgstr "SMS"
 
-#: actions/tag.php:69
+#. TRANS: Title for all but the first page of notices with tags.
+#. TRANS: %1$s is the tag, %2$d is the page number.
+#: actions/tag.php:73
 #, php-format
 msgid "Notices tagged with %1$s, page %2$d"
 msgstr "Mensajes etiquetados con %1$s, página %2$d"
 
-#: actions/tag.php:87
+#: actions/tag.php:91
 #, php-format
 msgid "Notice feed for tag %s (RSS 1.0)"
 msgstr "Canal de mensajes con etiqueta %s (RSS 1.0)"
 
-#: actions/tag.php:93
+#: actions/tag.php:97
 #, php-format
 msgid "Notice feed for tag %s (RSS 2.0)"
 msgstr "Canal de mensajes con etiqueta %s (RSS 2.0)"
 
-#: actions/tag.php:99
+#: actions/tag.php:103
 #, php-format
 msgid "Notice feed for tag %s (Atom)"
 msgstr "Canal de mensajes con etiqueta %s (Atom)"
@@ -6412,17 +6464,11 @@ msgstr "%s etiqueta"
 msgid "User profile"
 msgstr "Perfil de usuario"
 
-#. TRANS: DT element in area for user avatar.
-#: actions/tagother.php:81 actions/userauthorization.php:132
-#: lib/userprofile.php:108
-msgid "Photo"
-msgstr "Foto"
-
-#: actions/tagother.php:141
+#: actions/tagother.php:120
 msgid "Tag user"
 msgstr "Etiquetar usuario"
 
-#: actions/tagother.php:151
+#: actions/tagother.php:130
 msgid ""
 "Tags for this user (letters, numbers, -, ., and _), comma- or space- "
 "separated"
@@ -6430,14 +6476,19 @@ msgstr ""
 "Etiquetas para este usuario (letras, números, -, ., y _), separadas por "
 "comas o espacios"
 
-#: actions/tagother.php:193
+#: actions/tagother.php:157
+#, php-format
+msgid "Invalid tag: \"%s\""
+msgstr "Etiqueta inválida: \"% s\""
+
+#: actions/tagother.php:172
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 "Sólo puedes marcar a las personas a quienes estás suscrito o que están "
 "suscritas a ti."
 
-#: actions/tagother.php:236
+#: actions/tagother.php:215
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
 "Usa este formulario para agregar etiquetas a tus suscriptores o "
@@ -6447,6 +6498,7 @@ msgstr ""
 msgid "No such tag."
 msgstr "No existe tal etiqueta."
 
+#. TRANS: Client error displayed when trying to unblock a non-blocked user.
 #: actions/unblock.php:59
 msgid "You haven't blocked that user."
 msgstr "No has bloqueado ese usuario."
@@ -6467,7 +6519,7 @@ msgstr "No hay id de perfil en solicitud."
 msgid "Unsubscribed"
 msgstr "Desuscrito"
 
-#: actions/updateprofile.php:64 actions/userauthorization.php:337
+#: actions/updateprofile.php:64
 #, php-format
 msgid ""
 "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
@@ -6475,6 +6527,78 @@ msgstr ""
 "Licencia de flujo del emisor ‘%1$s’ es incompatible con la licencia del "
 "sitio ‘%2$s’."
 
+#: actions/urlsettings.php:60
+#, fuzzy
+msgid "URL settings"
+msgstr "Configuración de mensajería instantánea"
+
+#. TRANS: Instructions for tab "Other" in user profile settings.
+#: actions/urlsettings.php:72
+msgid "Manage various other options."
+msgstr "Manejo de varias opciones adicionales."
+
+#. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
+#. TRANS: user's profile settings. This message has one space at the beginning. Use your
+#. TRANS: language's word separator here if it has one (most likely a single space).
+#: actions/urlsettings.php:115
+msgid " (free service)"
+msgstr " (servicio libre)"
+
+#: actions/urlsettings.php:121
+#, fuzzy
+msgid "[none]"
+msgstr "Ninguno"
+
+#: actions/urlsettings.php:122
+msgid "[internal]"
+msgstr ""
+
+#. TRANS: Label for dropdown with URL shortener services.
+#: actions/urlsettings.php:130
+msgid "Shorten URLs with"
+msgstr "Acortar los URL con"
+
+#. TRANS: Tooltip for for dropdown with URL shortener services.
+#: actions/urlsettings.php:132
+msgid "Automatic shortening service to use."
+msgstr "Servicio de acorte automático a usar."
+
+#: actions/urlsettings.php:138
+msgid "URL longer than"
+msgstr ""
+
+#: actions/urlsettings.php:141
+msgid "URLs longer than this will be shortened, 0 means always shorten."
+msgstr ""
+
+#: actions/urlsettings.php:145
+msgid "Text longer than"
+msgstr ""
+
+#: actions/urlsettings.php:148
+msgid ""
+"URLs in notices longer than this will be shortened, 0 means always shorten."
+msgstr ""
+
+#. TRANS: Form validation error for form "Other settings" in user profile.
+#: actions/urlsettings.php:180
+#, fuzzy
+msgid "URL shortening service is too long (maximum 50 characters)."
+msgstr "El servicio de acortamiento de URL es muy largo (máx. 50 caracteres)."
+
+#: actions/urlsettings.php:187
+msgid "Invalid number for max url length."
+msgstr ""
+
+#: actions/urlsettings.php:193
+#, fuzzy
+msgid "Invalid number for max notice length."
+msgstr "Contenido de mensaje inválido."
+
+#: actions/urlsettings.php:238
+msgid "Error saving user URL shortening preferences."
+msgstr ""
+
 #. TRANS: User admin panel title
 #: actions/useradminpanel.php:58
 msgctxt "TITLE"
@@ -6501,11 +6625,11 @@ msgstr "Texto de bienvenida inválido. La longitud máx. es de 255 caracteres."
 #. TRANS: users in user admin panel. %1$s is the invalid nickname.
 #: actions/useradminpanel.php:166
 #, fuzzy, php-format
-msgid "Invalid default subscripton: '%1$s' is not a user."
+msgid "Invalid default subscripton: \"%1$s\" is not a user."
 msgstr "Suscripción predeterminada inválida : '%1$s' no es un usuario"
 
-#. TRANS: Link description in user account settings menu.
-#: actions/useradminpanel.php:215 lib/accountsettingsaction.php:106
+#: actions/useradminpanel.php:215 lib/action.php:565 lib/settingsnav.php:77
+#: lib/subgroupnav.php:81
 msgid "Profile"
 msgstr "Perfil"
 
@@ -6563,59 +6687,63 @@ msgstr "Si permitir a los usuarios invitar nuevos usuarios."
 #. TRANS: Title for button to save user settings in user admin panel.
 #: actions/useradminpanel.php:302
 #, fuzzy
-msgid "Save user settings"
+msgid "Save user settings."
 msgstr "Guardar la configuración del sitio"
 
-#: actions/userauthorization.php:105
+#. TRANS: Page title.
+#: actions/userauthorization.php:109
 msgid "Authorize subscription"
 msgstr "Autorizar la suscripción"
 
-#: actions/userauthorization.php:110
+#. TRANS: Page notice on "Auhtorize subscription" page.
+#: actions/userauthorization.php:115
 #, fuzzy
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
 "user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
-"click “Reject”."
+"click \"Reject\"."
 msgstr ""
 "Por favor revisa estos detalles para asegurar que deseas suscribirte a los "
 "avisos de este usuario. Si no pediste suscribirte a los avisos de alguien, "
 "haz clic en \"Cancelar\"."
 
-#. TRANS: Menu item for site administration
-#: actions/userauthorization.php:196 actions/version.php:167
-#: lib/adminpanelaction.php:403
-msgid "License"
-msgstr "Licencia"
-
-#: actions/userauthorization.php:217
+#. TRANS: Button text on Authorise Subscription page.
+#: actions/userauthorization.php:200
 #, fuzzy
+msgctxt "BUTTON"
 msgid "Accept"
 msgstr "Aceptar"
 
-#: actions/userauthorization.php:218 lib/subscribeform.php:115
-#: lib/subscribeform.php:139
-msgid "Subscribe to this user"
+#. TRANS: Title for button on Authorise Subscription page.
+#: actions/userauthorization.php:202
+#, fuzzy
+msgid "Subscribe to this user."
 msgstr "Suscribirse a este usuario"
 
-#: actions/userauthorization.php:219
+#. TRANS: Button text on Authorise Subscription page.
+#: actions/userauthorization.php:204
 #, fuzzy
+msgctxt "BUTTON"
 msgid "Reject"
 msgstr "Rechazar"
 
-#: actions/userauthorization.php:220
+#. TRANS: Title for button on Authorise Subscription page.
+#: actions/userauthorization.php:206
 #, fuzzy
-msgid "Reject this subscription"
+msgid "Reject this subscription."
 msgstr "Rechazar esta suscripción"
 
-#: actions/userauthorization.php:232
+#. TRANS: Client error displayed for an empty authorisation request.
+#: actions/userauthorization.php:219
 msgid "No authorization request!"
 msgstr "¡Ninguna petición de autorización!"
 
-#: actions/userauthorization.php:254
+#. TRANS: Accept message header from Authorise subscription page.
+#: actions/userauthorization.php:242
 msgid "Subscription authorized"
 msgstr "Suscripción autorizada"
 
-#: actions/userauthorization.php:256
+#: actions/userauthorization.php:245
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to authorize the "
@@ -6625,11 +6753,12 @@ msgstr ""
 "Consulte con las instrucciones del sitio para obtener detalles acerca de "
 "cómo autorizar la suscripción. Tu token de suscripción es:"
 
-#: actions/userauthorization.php:266
+#. TRANS: Reject message header from Authorise subscription page.
+#: actions/userauthorization.php:256
 msgid "Subscription rejected"
 msgstr "Suscripción rechazada"
 
-#: actions/userauthorization.php:268
+#: actions/userauthorization.php:259
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to fully reject the "
@@ -6639,48 +6768,73 @@ msgstr ""
 "de nuevo las instrucciones para saber cómo rechazar la suscripción "
 "completamente."
 
-#: actions/userauthorization.php:303
+#. TRANS: Exception thrown when no valid user is found for an authorisation request.
+#. TRANS: %s is a listener URI.
+#: actions/userauthorization.php:296
 #, fuzzy, php-format
-msgid "Listener URI ‘%s’ not found here."
+msgid "Listener URI \"%s\" not found here."
 msgstr "No se ha encontrado aquí el URI del oyente ‘%s’."
 
-#: actions/userauthorization.php:308
+#. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
+#. TRANS: %s is a listenee URI.
+#: actions/userauthorization.php:303
 #, fuzzy, php-format
-msgid "Listenee URI ‘%s’ is too long."
+msgid "Listenee URI \"%s\" is too long."
 msgstr "El URI ‘%s’ del receptor es muy largo."
 
-#: actions/userauthorization.php:314
+#. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
+#. TRANS: %s is a listenee URI.
+#: actions/userauthorization.php:311
 #, fuzzy, php-format
-msgid "Listenee URI ‘%s’ is a local user."
+msgid "Listenee URI \"%s\" is a local user."
 msgstr "El URI ‘%s’  del receptor es un usuario local."
 
+#. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
+#. TRANS: %s is a profile URL.
 #: actions/userauthorization.php:329
 #, fuzzy, php-format
-msgid "Profile URL ‘%s’ is for a local user."
+msgid "Profile URL \"%s\" is for a local user."
 msgstr "El URL ‘%s’ de perfil es para un usuario local."
 
-#: actions/userauthorization.php:345
+#. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
+#. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
+#: actions/userauthorization.php:339
 #, fuzzy, php-format
-msgid "Avatar URL ‘%s’ is not valid."
+msgid ""
+"Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
+"\"."
+msgstr ""
+"Licencia de flujo del emisor ‘%1$s’ es incompatible con la licencia del "
+"sitio ‘%2$s’."
+
+#. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
+#. TRANS: %s is an avatar URL.
+#: actions/userauthorization.php:349
+#, fuzzy, php-format
+msgid "Avatar URL \"%s\" is not valid."
 msgstr "La URL ‘%s’ de la imagen no es válida."
 
-#: actions/userauthorization.php:350
+#. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
+#. TRANS: %s is an avatar URL.
+#: actions/userauthorization.php:356
 #, fuzzy, php-format
-msgid "Can’t read avatar URL ‘%s’."
+msgid "Cannot read avatar URL \"%s\"."
 msgstr "No se puede leer la URL de la imagen ‘%s’."
 
-#: actions/userauthorization.php:355
+#. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
+#. TRANS: %s is an avatar URL.
+#: actions/userauthorization.php:363
 #, fuzzy, php-format
-msgid "Wrong image type for avatar URL ‘%s’."
+msgid "Wrong image type for avatar URL \"%s\"."
 msgstr "Tipo de imagen incorrecto para la URL de imagen ‘%s’."
 
 #. TRANS: Page title for profile design page.
-#: actions/userdesignsettings.php:74 lib/designsettings.php:63
+#: actions/userdesignsettings.php:74 lib/designsettings.php:61
 msgid "Profile design"
 msgstr "Diseño del perfil"
 
 #. TRANS: Instructions for profile design page.
-#: actions/userdesignsettings.php:84 lib/designsettings.php:74
+#: actions/userdesignsettings.php:84 lib/designsettings.php:72
 msgid ""
 "Customize the way your profile looks with a background image and a colour "
 "palette of your choice."
@@ -6688,10 +6842,28 @@ msgstr ""
 "Personaliza la vista de tu perfil con una imagen de fondo y la paelta de "
 "colores que quieras."
 
-#: actions/userdesignsettings.php:272
+#: actions/userdesignsettings.php:289
 msgid "Enjoy your hotdog!"
 msgstr "¡Disfruta de tu perrito caliente!"
 
+#: actions/userdesignsettings.php:325
+#, fuzzy
+msgid "Design settings"
+msgstr "Guardar la configuración del sitio"
+
+#: actions/userdesignsettings.php:340
+msgid "View profile designs"
+msgstr "Ver diseños de perfil"
+
+#: actions/userdesignsettings.php:341
+msgid "Show or hide profile designs."
+msgstr "Ocultar o mostrar diseños de perfil."
+
+#: actions/userdesignsettings.php:348
+#, fuzzy
+msgid "Background file"
+msgstr "Fondo"
+
 #. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number.
 #: actions/usergroups.php:66
 #, php-format
@@ -6741,6 +6913,11 @@ msgstr ""
 msgid "Contributors"
 msgstr "Colaboradores"
 
+#. TRANS: Menu item for site administration
+#: actions/version.php:167 lib/adminpanelaction.php:403
+msgid "License"
+msgstr "Licencia"
+
 #: actions/version.php:170
 msgid ""
 "StatusNet is free software: you can redistribute it and/or modify it under "
@@ -6774,12 +6951,13 @@ msgstr ""
 "Debes haber recibido una copia de la Licencia Pública General de Affero GNU "
 "con este programa. Si no la recibiste, visita %s."
 
-#: actions/version.php:191
-msgid "Plugins"
-msgstr "Complementos"
+#. TRANS: Form input field label for application name.
+#: actions/version.php:197 lib/applicationeditform.php:190
+msgid "Name"
+msgstr "Nombre"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:901
+#: actions/version.php:198 lib/action.php:885
 msgid "Version"
 msgstr "Versión"
 
@@ -6787,6 +6965,12 @@ msgstr "Versión"
 msgid "Author(s)"
 msgstr "Autor(es)"
 
+#. TRANS: Form input field label.
+#: actions/version.php:200 lib/applicationeditform.php:208
+#: lib/groupeditform.php:168
+msgid "Description"
+msgstr "Descripción"
+
 #. TRANS: Activity title when marking a notice as favorite.
 #: classes/Fave.php:164
 msgid "Favor"
@@ -6909,7 +7093,7 @@ msgid "Could not create login token for %s"
 msgstr "No se pudo crear el token de acceso para %s"
 
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
-#: classes/Memcached_DataObject.php:542
+#: classes/Memcached_DataObject.php:556
 msgid "No database name or DSN found anywhere."
 msgstr "Ningún nombre de base de datos o DSN encontrado."
 
@@ -7086,18 +7270,18 @@ msgstr "%1$s ahora está escuchando tus avisos en %2$s"
 
 #. TRANS: Notice given on user registration.
 #. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:395
+#: classes/User.php:390
 #, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr "Bienvenido a %1$s, @%2$s!"
 
 #. TRANS: Server exception.
-#: classes/User.php:918
+#: classes/User.php:923
 msgid "No single user defined for single-user mode."
 msgstr "Ningún usuario sólo definido para modo monousuario."
 
 #. TRANS: Server exception.
-#: classes/User.php:922
+#: classes/User.php:927
 msgid "Single-user mode code called when not enabled."
 msgstr ""
 
@@ -7142,41 +7326,6 @@ msgstr ""
 msgid "No AtomPub API service for %s."
 msgstr ""
 
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:104
-msgid "Change your profile settings"
-msgstr "Cambia tus opciones de perfil"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:111
-msgid "Upload an avatar"
-msgstr "Subir una imagen."
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:118
-msgid "Change your password"
-msgstr "Cambia tu contraseña"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:125
-msgid "Change email handling"
-msgstr "Cambiar el manejo del correo."
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:132
-msgid "Design your profile"
-msgstr "Diseñar tu perfil"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:139
-msgid "Other options"
-msgstr "Otras opciones"
-
-#. TRANS: Link description in user account settings menu.
-#: lib/accountsettingsaction.php:141
-msgid "Other"
-msgstr "Otro"
-
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
 #: lib/action.php:161
 #, php-format
@@ -7194,206 +7343,128 @@ msgctxt "TOOLTIP"
 msgid "Show more"
 msgstr ""
 
-#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:544
-msgid "Primary site navigation"
-msgstr "Navegación de sitio primario"
+#. TRANS: Inline reply form submit button: submits a reply comment.
+#: lib/action.php:328
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Comment"
+msgstr "Contenido"
 
-#. TRANS: Tooltip for main menu option "Personal".
-#: lib/action.php:550
-msgctxt "TOOLTIP"
-msgid "Personal profile and friends timeline"
-msgstr "Perfil personal y línea temporal de amistades"
+#. TRANS: Placeholder text for inline reply form. Clicking in this box will turn it into a mini notice form.
+#: lib/action.php:331
+msgid "Add a comment..."
+msgstr ""
 
-#. TRANS: Main menu option when logged in for access to personal profile and friends timeline.
-#. TRANS: Personal group navigation menu option when logged in for viewing timeline of self and friends.
-#: lib/action.php:553 lib/personalgroupnav.php:100
-msgctxt "MENU"
-msgid "Personal"
-msgstr "Personal"
+#: lib/action.php:559 lib/personalgroupnav.php:99
+#, fuzzy
+msgid "Home"
+msgstr "Página de inicio"
 
-#. TRANS: Tooltip for main menu option "Account".
-#: lib/action.php:555
-msgctxt "TOOLTIP"
-msgid "Change your email, avatar, password, profile"
-msgstr "Cambia tu correo electrónico, imagen, contraseña, perfil"
-
-#. TRANS: Main menu option when logged in for access to user settings.
-#: lib/action.php:558
-msgid "Account"
-msgstr "Cuenta"
-
-#. TRANS: Tooltip for main menu option "Services".
 #: lib/action.php:560
-msgctxt "TOOLTIP"
-msgid "Connect to services"
-msgstr "Conectar a los servicios"
+#, fuzzy
+msgid "Friends timeline"
+msgstr "línea temporal de %s"
 
-#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services.
-#: lib/action.php:563
-msgid "Connect"
-msgstr "Conectarse"
-
-#. TRANS: Tooltip for menu option "Admin".
 #: lib/action.php:566
-msgctxt "TOOLTIP"
-msgid "Change site configuration"
-msgstr "Cambiar la configuración del sitio"
+#, fuzzy
+msgid "Your profile"
+msgstr "Perfil del grupo"
 
-#. TRANS: Main menu option when logged in and site admin for access to site configuration.
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/action.php:569 lib/groupnav.php:117
-msgctxt "MENU"
-msgid "Admin"
-msgstr "Admin"
+#: lib/action.php:570 lib/action.php:593 lib/publicgroupnav.php:78
+msgid "Public"
+msgstr "Público"
 
-#. TRANS: Tooltip for main menu option "Invite".
-#: lib/action.php:573
-#, php-format
-msgctxt "TOOLTIP"
-msgid "Invite friends and colleagues to join you on %s"
-msgstr "Invita a amistades y compañeros a unirse a tí en %s"
+#: lib/action.php:571 lib/action.php:594
+#, fuzzy
+msgid "Everyone on this site"
+msgstr "Encontrar gente en este sitio"
+
+#: lib/action.php:575
+#, fuzzy
+msgid "Settings"
+msgstr "Configuración de SMS"
 
-#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users.
 #: lib/action.php:576
-msgctxt "MENU"
-msgid "Invite"
-msgstr "Invitar"
+#, fuzzy
+msgid "Change your personal settings"
+msgstr "Cambia tus opciones de perfil"
 
-#. TRANS: Tooltip for main menu option "Logout"
 #: lib/action.php:582
-msgctxt "TOOLTIP"
-msgid "Logout from the site"
-msgstr "Cerrar sesión en el sitio"
+#, fuzzy
+msgid "Site configuration"
+msgstr "Configuración de usuario"
 
-#. TRANS: Main menu option when logged in to log out the current user.
-#: lib/action.php:585
-msgctxt "MENU"
+#: lib/action.php:587
+#, fuzzy
 msgid "Logout"
 msgstr "Cerrar sesión"
 
-#. TRANS: Tooltip for main menu option "Register".
-#: lib/action.php:590
-msgctxt "TOOLTIP"
-msgid "Create an account"
-msgstr "Crear una cuenta"
+#: lib/action.php:588
+#, fuzzy
+msgid "Logout from the site"
+msgstr "Cerrar sesión en el sitio"
 
-#. TRANS: Main menu option when not logged in to register a new account.
-#. TRANS: Menu item for registering with the StatusNet site.
-#: lib/action.php:593 lib/logingroupnav.php:85
-msgctxt "MENU"
-msgid "Register"
-msgstr "Registrarse"
-
-#. TRANS: Tooltip for main menu option "Login".
-#: lib/action.php:596
-msgctxt "TOOLTIP"
+#: lib/action.php:599
+#, fuzzy
 msgid "Login to the site"
 msgstr "Iniciar sesión en el sitio"
 
-#. TRANS: Main menu option when not logged in to log in.
-#. TRANS: Menu item for logging in to the StatusNet site.
-#: lib/action.php:599 lib/logingroupnav.php:77
-msgctxt "MENU"
-msgid "Login"
-msgstr "Inicio de sesión"
-
-#. TRANS: Tooltip for main menu option "Help".
-#: lib/action.php:602
-msgctxt "TOOLTIP"
-msgid "Help me!"
-msgstr "¡Ayúdame!"
-
-#. TRANS: Main menu option for help on the StatusNet site.
-#: lib/action.php:605
-msgctxt "MENU"
-msgid "Help"
-msgstr "Ayuda"
-
-#. TRANS: Tooltip for main menu option "Search".
-#: lib/action.php:608
-msgctxt "TOOLTIP"
-msgid "Search for people or text"
-msgstr "Buscar personas o texto"
-
-#. TRANS: Main menu option when logged in or when the StatusNet instance is not private.
-#: lib/action.php:611
-msgctxt "MENU"
+#: lib/action.php:606
+#, fuzzy
 msgid "Search"
 msgstr "Buscar"
 
-#. TRANS: DT element for site notice. String is hidden in default CSS.
-#. TRANS: Menu item for site administration
-#: lib/action.php:633 lib/adminpanelaction.php:387
-msgid "Site notice"
-msgstr "Mensaje de sitio"
-
-#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:700
-msgid "Local views"
-msgstr "Vistas locales"
-
-#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:770
-msgid "Page notice"
-msgstr "Mensaje de página"
-
-#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:874
-msgid "Secondary site navigation"
-msgstr "Navegación de sitio secundario"
+#: lib/action.php:607
+#, fuzzy
+msgid "Search the site"
+msgstr "Buscar sitio"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:880
+#: lib/action.php:864
 msgid "Help"
 msgstr "Ayuda"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:883
+#: lib/action.php:867
 msgid "About"
 msgstr "Acerca de"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:886
+#: lib/action.php:870
 msgid "FAQ"
 msgstr "Preguntas Frecuentes"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:891
+#: lib/action.php:875
 msgid "TOS"
 msgstr "TOS"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:895
+#: lib/action.php:879
 msgid "Privacy"
 msgstr "Privacidad"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:898
+#: lib/action.php:882
 msgid "Source"
 msgstr "Fuente"
 
 #. TRANS: Secondary navigation menu option leading to e-mail contact information on the
 #. TRANS: StatusNet site, where to report bugs, ...
-#: lib/action.php:905
+#: lib/action.php:889
 msgid "Contact"
 msgstr "Ponerse en contacto"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:908
+#: lib/action.php:892
 msgid "Badge"
 msgstr "Insignia"
 
-#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:937
-msgid "StatusNet software license"
-msgstr "Licencia de software de StatusNet"
-
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:944
+#: lib/action.php:921
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7403,7 +7474,7 @@ msgstr ""
 "[%%site.broughtby%%**](%%site.broughtbyurl%%)."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:947
+#: lib/action.php:924
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** es un servicio de microblogueo."
@@ -7412,7 +7483,7 @@ msgstr "**%%site.name%%** es un servicio de microblogueo."
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:954
+#: lib/action.php:931
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7423,28 +7494,23 @@ msgstr ""
 "disponible bajo la [GNU Affero General Public License](http://www.fsf.org/"
 "licensing/licenses/agpl-3.0.html)."
 
-#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:970
-msgid "Site content license"
-msgstr "Licencia de contenido del sitio"
-
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:977
+#: lib/action.php:949
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr "El contenido y datos de %1$s son privados y confidenciales."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:984
+#: lib/action.php:956
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
 "Copyright del contenido y los datos de%1$s. Todos los derechos reservados."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:988
+#: lib/action.php:960
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 "Derechos de autor de contenido y datos por los colaboradores. Todos los "
@@ -7452,27 +7518,22 @@ msgstr ""
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:1020
+#: lib/action.php:992
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
 "Todo el contenido%1$s y la información están disponibles bajo la licencia 2%"
 "$s."
 
-#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1356
-msgid "Pagination"
-msgstr "Paginación"
-
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1367
+#: lib/action.php:1335
 msgid "After"
 msgstr "Después"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1377
+#: lib/action.php:1345
 msgid "Before"
 msgstr "Antes"
 
@@ -7628,7 +7689,7 @@ msgid "User configuration"
 msgstr "Configuración de usuario"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:122
+#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:110
 msgid "User"
 msgstr "Usuario"
 
@@ -7652,6 +7713,11 @@ msgstr "Configuración de sesiones"
 msgid "Edit site notice"
 msgstr "Editar el mensaje del sitio"
 
+#. TRANS: Menu item for site administration
+#: lib/adminpanelaction.php:387
+msgid "Site notice"
+msgstr "Mensaje de sitio"
+
 #. TRANS: Menu item title/tooltip
 #: lib/adminpanelaction.php:393
 msgid "Snapshots configuration"
@@ -7662,6 +7728,12 @@ msgstr "Configuración de instantáneas"
 msgid "Set site license"
 msgstr ""
 
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:409
+#, fuzzy
+msgid "Plugins configuration"
+msgstr "Configuración de rutas"
+
 #. TRANS: Client error 401.
 #: lib/apiauth.php:111
 msgid "API resource requires read-write access, but you only have read access."
@@ -7674,19 +7746,23 @@ msgstr ""
 msgid "No application for that consumer key."
 msgstr "No hay ninguna aplicación para esa clave de consumidor."
 
+#: lib/apiauth.php:202 lib/apiauth.php:284
+msgid "Not allowed to use API."
+msgstr ""
+
 #. TRANS: OAuth exception given when an incorrect access token was given for a user.
-#: lib/apiauth.php:219
+#: lib/apiauth.php:225
 msgid "Bad access token."
 msgstr "Token de acceso erróneo."
 
 #. TRANS: OAuth exception given when no user was found for a given token (no token was found).
-#: lib/apiauth.php:224
+#: lib/apiauth.php:230
 msgid "No user for that token."
 msgstr "No hay ningún usuario para ese token."
 
 #. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel".
 #. TRANS: Client error thrown when authentication fails.
-#: lib/apiauth.php:266 lib/apiauth.php:293
+#: lib/apiauth.php:272 lib/apiauth.php:302
 msgid "Could not authenticate you."
 msgstr "No ha sido posible autenticarte."
 
@@ -7733,6 +7809,11 @@ msgstr "Se intentó revocar un token desconocido."
 msgid "Failed to delete revoked token."
 msgstr "No se pudo eliminar el token revocado."
 
+#. TRANS: Form input field label for application icon.
+#: lib/applicationeditform.php:177
+msgid "Icon"
+msgstr "Icono"
+
 #. TRANS: Form guide.
 #: lib/applicationeditform.php:182
 msgid "Icon for this application"
@@ -7767,6 +7848,11 @@ msgstr "La URL de origen"
 msgid "Organization responsible for this application"
 msgstr "Organización responsable de esta aplicación"
 
+#. TRANS: Form input field label.
+#: lib/applicationeditform.php:227
+msgid "Organization"
+msgstr "Organización"
+
 #. TRANS: Form input field instructions.
 #: lib/applicationeditform.php:234
 msgid "URL for the homepage of the organization"
@@ -7856,16 +7942,6 @@ msgstr ""
 msgid "Do not use this method!"
 msgstr "No eliminar este mensaje"
 
-#. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:293
-msgid "Author"
-msgstr "Autor"
-
-#. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:307
-msgid "Provider"
-msgstr "Proveedor"
-
 #. TRANS: Title.
 #: lib/attachmentnoticesection.php:67
 msgid "Notices where this attachment appears"
@@ -7893,24 +7969,29 @@ msgstr "No está permitido cambiar la contraseña"
 msgid "Block"
 msgstr "Bloquear"
 
+#. TRANS: Description of the form to block a user.
+#: lib/blockform.php:79
+msgid "Block this user"
+msgstr "Bloquear este usuario."
+
 #. TRANS: Title for command results.
-#: lib/channel.php:160 lib/channel.php:181
+#: lib/channel.php:104 lib/channel.php:125
 msgid "Command results"
 msgstr "Resultados de comando"
 
 #. TRANS: Title for command results.
-#: lib/channel.php:194
+#: lib/channel.php:138
 #, fuzzy
 msgid "AJAX error"
 msgstr "Error de Ajax"
 
 #. TRANS: E-mail subject when a command has completed.
-#: lib/channel.php:233 lib/mailhandler.php:143
+#: lib/channel.php:177 lib/mailhandler.php:143
 msgid "Command complete"
 msgstr "Comando completo"
 
 #. TRANS: E-mail subject when a command has failed.
-#: lib/channel.php:244
+#: lib/channel.php:188
 msgid "Command failed"
 msgstr "Comando falló"
 
@@ -8014,7 +8095,7 @@ msgstr "Nombre completo: %s"
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a location.
-#: lib/command.php:446 lib/mail.php:270
+#: lib/command.php:446 lib/mail.php:275
 #, php-format
 msgid "Location: %s"
 msgstr "Lugar: %s"
@@ -8022,7 +8103,7 @@ msgstr "Lugar: %s"
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a homepage.
-#: lib/command.php:450 lib/mail.php:274
+#: lib/command.php:450 lib/mail.php:279
 #, php-format
 msgid "Homepage: %s"
 msgstr "Página de inicio: %s"
@@ -8296,115 +8377,105 @@ msgstr ""
 "tracking - aún sin implementar.\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:162
+#: lib/common.php:36
 #, fuzzy
 msgid "No configuration file found."
 msgstr "Ningún archivo de configuración encontrado. "
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:165
+#: lib/common.php:39
 #, fuzzy
 msgid "I looked for configuration files in the following places:"
 msgstr "He buscado archivos de configuración en los siguientes lugares: "
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:168
+#: lib/common.php:42
 msgid "You may wish to run the installer to fix this."
 msgstr "Quizá desees ejecutar el instalador para solucionar este problema."
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:172
+#: lib/common.php:46
 msgid "Go to the installer."
 msgstr "Ir al instalador."
 
-#. TRANS: Menu item for Instant Messaging settings.
-#: lib/connectsettingsaction.php:106
-#, fuzzy
-msgctxt "MENU"
-msgid "IM"
-msgstr "IM"
-
-#. TRANS: Tooltip for Instant Messaging menu item.
-#: lib/connectsettingsaction.php:108
-msgid "Updates by instant messenger (IM)"
-msgstr "Actualizaciones por mensajería instantánea"
-
-#. TRANS: Menu item for Short Message Service settings.
-#: lib/connectsettingsaction.php:113
-#, fuzzy
-msgctxt "MENU"
-msgid "SMS"
-msgstr "SMS"
-
-#. TRANS: Tooltip for Short Message Service menu item.
-#: lib/connectsettingsaction.php:115
-msgid "Updates by SMS"
-msgstr "Actualizaciones por sms"
-
-#. TRANS: Menu item for OuAth connection settings.
-#: lib/connectsettingsaction.php:120
-#, fuzzy
-msgctxt "MENU"
-msgid "Connections"
-msgstr "Conecciones"
-
-#. TRANS: Tooltip for connected applications (Connections through OAuth) menu item.
-#: lib/connectsettingsaction.php:122
-msgid "Authorized connected applications"
-msgstr "Aplicaciones conectadas autorizadas"
-
 #: lib/dberroraction.php:59
 msgid "Database error"
 msgstr "Error de la base de datos"
 
+#. TRANS: Description of form for deleting a user.
+#: lib/deleteuserform.php:75
+msgid "Delete this user"
+msgstr "Borrar este usuario"
+
+#: lib/designform.php:114
+#, fuzzy
+msgid "Change design"
+msgstr "Guardar el diseño"
+
+#. TRANS: Fieldset legend on profile design page to change profile page colours.
+#: lib/designform.php:131
+msgid "Change colours"
+msgstr "Cambiar colores"
+
+#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
+#: lib/designform.php:138
+msgid "Use defaults"
+msgstr "Utilizar los valores predeterminados"
+
+#. TRANS: Title for button on profile design page to reset all colour settings to default.
+#: lib/designform.php:140
+msgid "Restore default designs"
+msgstr "Restaurar los diseños predeterminados"
+
+#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
+#: lib/designform.php:148
+msgid "Reset back to default"
+msgstr "Volver a los valores predeterminados"
+
 #. TRANS: Label in form on profile design page.
 #. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
-#: lib/designsettings.php:108
+#: lib/designform.php:158
 msgid "Upload file"
 msgstr "Subir archivo"
 
 #. TRANS: Instructions for form on profile design page.
-#: lib/designsettings.php:113
+#: lib/designform.php:163
+#, fuzzy
 msgid ""
-"You can upload your personal background image. The maximum file size is 2MB."
+"You can upload your personal background image. The maximum file size is 2Mb."
 msgstr ""
 "Puedes subir tu imagen de fondo personal. El tamaño de archivo máximo "
 "permitido es 2 MB."
 
 #. TRANS: Radio button on profile design page that will enable use of the uploaded profile image.
-#: lib/designsettings.php:139
+#: lib/designform.php:194
 #, fuzzy
 msgctxt "RADIO"
 msgid "On"
 msgstr "Activar"
 
 #. TRANS: Radio button on profile design page that will disable use of the uploaded profile image.
-#: lib/designsettings.php:156
+#: lib/designform.php:211
 #, fuzzy
 msgctxt "RADIO"
 msgid "Off"
 msgstr "Desactivar"
 
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: lib/designsettings.php:175
-msgid "Change colours"
-msgstr "Cambiar colores"
-
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: lib/designsettings.php:257
-msgid "Use defaults"
-msgstr "Utilizar los valores predeterminados"
+#. TRANS: Title for button on profile design page to save settings.
+#: lib/designform.php:322
+msgid "Save design"
+msgstr "Guardar el diseño"
 
 #. TRANS: Error message displayed if design settings could not be saved.
 #. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
-#: lib/designsettings.php:405 lib/designsettings.php:427
+#: lib/designsettings.php:216 lib/designsettings.php:238
 msgid "Couldn't update your design."
 msgstr "No fue posible actualizar tu diseño."
 
 #. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
-#: lib/designsettings.php:433
+#: lib/designsettings.php:244
 msgid "Design defaults restored."
 msgstr "Diseño predeterminado restaurado."
 
@@ -8474,27 +8545,23 @@ msgstr ""
 msgid "Feeds"
 msgstr ""
 
-#: lib/galleryaction.php:121
-msgid "Filter tags"
-msgstr "Filtrar etiquetas"
-
-#: lib/galleryaction.php:131
+#: lib/galleryaction.php:128
 msgid "All"
 msgstr "Todo"
 
-#: lib/galleryaction.php:139
+#: lib/galleryaction.php:136
 msgid "Select tag to filter"
 msgstr "Seleccione una etiqueta a filtrar"
 
-#: lib/galleryaction.php:140
+#: lib/galleryaction.php:137
 msgid "Tag"
 msgstr "Etiqueta"
 
-#: lib/galleryaction.php:141
+#: lib/galleryaction.php:138
 msgid "Choose a tag to narrow list"
 msgstr "Elegir una etiqueta para reducir la lista"
 
-#: lib/galleryaction.php:143
+#: lib/galleryaction.php:140
 msgid "Go"
 msgstr "Ir"
 
@@ -8587,6 +8654,12 @@ msgctxt "TOOLTIP"
 msgid "%s blocked users"
 msgstr "%s usuarios bloqueados"
 
+#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
+#: lib/groupnav.php:117
+msgctxt "MENU"
+msgid "Admin"
+msgstr "Admin"
+
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
 #: lib/groupnav.php:120
@@ -8696,39 +8769,61 @@ msgid_plural "%dB"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/jabber.php:387
+#: lib/implugin.php:262
 #, php-format
-msgid "[%s]"
-msgstr "[%s]"
+msgid ""
+"User \"%s\" on %s has said that your %s screenname belongs to them. If "
+"that's true, you can confirm by clicking on this URL: %s . (If you cannot "
+"click it, copy-and-paste it into the address bar of your browser). If that "
+"user isn't you, or if you didn't request this confirmation, just ignore this "
+"message."
+msgstr ""
 
-#: lib/jabber.php:567
+#: lib/implugin.php:349
 #, php-format
 msgid "Unknown inbox source %d."
 msgstr "Origen de bandeja de entrada %d desconocido."
 
+#: lib/implugin.php:485
+#, fuzzy, php-format
+msgid "Message too long - maximum is %1$d characters, you sent %2$d."
+msgstr "Mensaje muy largo - máximo %1$d caracteres, enviaste %2$d"
+
 #: lib/leaveform.php:114
 msgid "Leave"
 msgstr "Abandonar"
 
+#. TRANS: Menu item for logging in to the StatusNet site.
+#: lib/logingroupnav.php:77
+msgctxt "MENU"
+msgid "Login"
+msgstr "Inicio de sesión"
+
 #. TRANS: Title for menu item for logging in to the StatusNet site.
 #: lib/logingroupnav.php:79
 msgid "Login with a username and password"
 msgstr "Ingresar con un nombre de usuario y contraseña."
 
+#. TRANS: Menu item for registering with the StatusNet site.
+#: lib/logingroupnav.php:85
+msgctxt "MENU"
+msgid "Register"
+msgstr "Registrarse"
+
 #. TRANS: Title for menu item for registering with the StatusNet site.
 #: lib/logingroupnav.php:87
 msgid "Sign up for a new account"
 msgstr "Registrarse para una nueva cuenta"
 
 #. TRANS: Subject for address confirmation email.
-#: lib/mail.php:168
+#: lib/mail.php:172
 msgid "Email address confirmation"
 msgstr "Confirmación de correo electrónico"
 
 #. TRANS: Body for address confirmation email.
 #. TRANS: %1$s is the addressed user's nickname, %2$s is the StatusNet sitename,
 #. TRANS: %3$s is the URL to confirm at.
-#: lib/mail.php:173
+#: lib/mail.php:177
 #, fuzzy, php-format
 msgid ""
 "Hey, %1$s.\n"
@@ -8760,14 +8855,14 @@ msgstr ""
 
 #. TRANS: Subject of new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
-#: lib/mail.php:238
+#: lib/mail.php:243
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1$s ahora está escuchando tus avisos en %2$s"
 
 #. TRANS: This is a paragraph in a new-subscriber e-mail.
 #. TRANS: %s is a URL where the subscriber can be reported as abusive.
-#: lib/mail.php:245
+#: lib/mail.php:250
 #, php-format
 msgid ""
 "If you believe this account is being used abusively, you can block them from "
@@ -8782,7 +8877,7 @@ msgstr ""
 #. TRANS: %3$s is the subscriber's profile URL, %4$s is the subscriber's location (or empty)
 #. TRANS: %5$s is the subscriber's homepage URL (or empty), %6%s is the subscriber's bio (or empty)
 #. TRANS: %7$s is a link to the addressed user's e-mail settings.
-#: lib/mail.php:255
+#: lib/mail.php:260
 #, fuzzy, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -8811,14 +8906,14 @@ msgstr ""
 
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is biographical information.
-#: lib/mail.php:278
+#: lib/mail.php:283
 #, php-format
 msgid "Bio: %s"
 msgstr "Bio: %s"
 
 #. TRANS: Subject of notification mail for new posting email address.
 #. TRANS: %s is the StatusNet sitename.
-#: lib/mail.php:307
+#: lib/mail.php:312
 #, php-format
 msgid "New email address for posting to %s"
 msgstr "Nueva dirección de correo para postear a %s"
@@ -8826,7 +8921,7 @@ msgstr "Nueva dirección de correo para postear a %s"
 #. TRANS: Body of notification mail for new posting email address.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is the e-mail address to send
 #. TRANS: to to post by e-mail, %3$s is a URL to more instructions.
-#: lib/mail.php:313
+#: lib/mail.php:318
 #, fuzzy, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -8849,26 +8944,26 @@ msgstr ""
 
 #. TRANS: Subject line for SMS-by-email notification messages.
 #. TRANS: %s is the posting user's nickname.
-#: lib/mail.php:434
+#: lib/mail.php:439
 #, php-format
 msgid "%s status"
 msgstr "estado de %s"
 
 #. TRANS: Subject line for SMS-by-email address confirmation message.
-#: lib/mail.php:460
+#: lib/mail.php:465
 msgid "SMS confirmation"
 msgstr "SMS confirmación"
 
 #. TRANS: Main body heading for SMS-by-email address confirmation message.
 #. TRANS: %s is the addressed user's nickname.
-#: lib/mail.php:464
+#: lib/mail.php:469
 #, php-format
 msgid "%s: confirm you own this phone number with this code:"
 msgstr "%s: Confirma que este es tu número de teléfono mediante este código:"
 
 #. TRANS: Subject for 'nudge' notification email.
 #. TRANS: %s is the nudging user.
-#: lib/mail.php:485
+#: lib/mail.php:490
 #, fuzzy, php-format
 msgid "You have been nudged by %s"
 msgstr "%s te ha dado un toque"
@@ -8876,7 +8971,7 @@ msgstr "%s te ha dado un toque"
 #. TRANS: Body for 'nudge' notification email.
 #. TRANS: %1$s is the nuding user's long name, $2$s is the nudging user's nickname,
 #. TRANS: %3$s is a URL to post notices at, %4$s is the StatusNet sitename.
-#: lib/mail.php:492
+#: lib/mail.php:497
 #, php-format
 msgid ""
 "%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -8905,7 +9000,7 @@ msgstr ""
 
 #. TRANS: Subject for direct-message notification email.
 #. TRANS: %s is the sending user's nickname.
-#: lib/mail.php:539
+#: lib/mail.php:544
 #, php-format
 msgid "New private message from %s"
 msgstr "Nuevo mensaje privado de %s"
@@ -8914,7 +9009,7 @@ msgstr "Nuevo mensaje privado de %s"
 #. TRANS: %1$s is the sending user's long name, %2$s is the sending user's nickname,
 #. TRANS: %3$s is the message content, %4$s a URL to the message,
 #. TRANS: %5$s is the StatusNet sitename.
-#: lib/mail.php:547
+#: lib/mail.php:552
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -8949,7 +9044,7 @@ msgstr ""
 
 #. TRANS: Subject for favorite notification e-mail.
 #. TRANS: %1$s is the adding user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:599
+#: lib/mail.php:604
 #, fuzzy, php-format
 msgid "%1$s (@%2$s) added your notice as a favorite"
 msgstr "%s (@%s) agregó tu mensaje a los favoritos"
@@ -8959,7 +9054,7 @@ msgstr "%s (@%s) agregó tu mensaje a los favoritos"
 #. TRANS: %3$s is a URL to the faved notice, %4$s is the faved notice text,
 #. TRANS: %5$s is a URL to all faves of the adding user, %6$s is the StatusNet sitename,
 #. TRANS: %7$s is the adding user's nickname.
-#: lib/mail.php:606
+#: lib/mail.php:611
 #, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -8997,7 +9092,7 @@ msgstr ""
 "%6$s\n"
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:664
+#: lib/mail.php:669
 #, php-format
 msgid ""
 "The full conversation can be read here:\n"
@@ -9010,7 +9105,7 @@ msgstr ""
 
 #. TRANS: E-mail subject for notice notification.
 #. TRANS: %1$s is the sending user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:672
+#: lib/mail.php:677
 #, fuzzy, php-format
 msgid "%1$s (@%2$s) sent a notice to your attention"
 msgstr "%s (@%s) ha enviado un aviso a tu atención"
@@ -9021,7 +9116,7 @@ msgstr "%s (@%s) ha enviado un aviso a tu atención"
 #. TRANS: %5$s is a URL to the full conversion if it exists (otherwise empty),
 #. TRANS: %6$s is a URL to reply to the notice, %7$s is a URL to all @-replied for the addressed user,
 #. TRANS: %8$s is a URL to the addressed user's e-mail settings, %9$s is the sender's nickname.
-#: lib/mail.php:680
+#: lib/mail.php:685
 #, php-format
 msgid ""
 "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -9168,11 +9263,7 @@ msgstr "¡No estás suscrito!"
 msgid "To"
 msgstr "Para"
 
-#: lib/messageform.php:166 lib/noticeform.php:186
-msgid "Available characters"
-msgstr "Caracteres disponibles"
-
-#: lib/messageform.php:185 lib/noticeform.php:237
+#: lib/messageform.php:184 lib/noticeform.php:236
 msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr "Enviar"
@@ -9182,17 +9273,10 @@ msgstr "Enviar"
 msgid "Messages"
 msgstr "Mensaje"
 
-#: lib/messagelistitem.php:123 lib/noticelist.php:522
+#: lib/messagelistitem.php:123 lib/noticelist.php:527
 msgid "from"
 msgstr "desde"
 
-#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:165
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr ""
-"El usuario debe tener solamente letras minúsculas y números y no puede tener "
-"espacios."
-
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 #: lib/nickname.php:178
 msgid "Nickname cannot be empty."
@@ -9215,23 +9299,23 @@ msgstr "Enviar un mensaje"
 msgid "What's up, %s?"
 msgstr "¿Qué tal, %s?"
 
-#: lib/noticeform.php:194
+#: lib/noticeform.php:193
 msgid "Attach"
 msgstr "Adjuntar"
 
-#: lib/noticeform.php:198
+#: lib/noticeform.php:197
 msgid "Attach a file"
 msgstr "Adjuntar un archivo"
 
-#: lib/noticeform.php:213
+#: lib/noticeform.php:212
 msgid "Share my location"
 msgstr "Compartir mi ubicación"
 
-#: lib/noticeform.php:216
+#: lib/noticeform.php:215
 msgid "Do not share my location"
 msgstr "No compartir mi ubicación"
 
-#: lib/noticeform.php:217
+#: lib/noticeform.php:216
 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
 "try again later"
@@ -9240,55 +9324,59 @@ msgstr ""
 "favor, inténtalo más tarde."
 
 #. TRANS: Used in coordinates as abbreviation of north
-#: lib/noticelist.php:452
+#: lib/noticelist.php:457
 msgid "N"
 msgstr "N"
 
 #. TRANS: Used in coordinates as abbreviation of south
-#: lib/noticelist.php:454
+#: lib/noticelist.php:459
 msgid "S"
 msgstr "S"
 
 #. TRANS: Used in coordinates as abbreviation of east
-#: lib/noticelist.php:456
+#: lib/noticelist.php:461
 msgid "E"
 msgstr "E"
 
 #. TRANS: Used in coordinates as abbreviation of west
-#: lib/noticelist.php:458
+#: lib/noticelist.php:463
 msgid "W"
 msgstr "W"
 
-#: lib/noticelist.php:460
+#: lib/noticelist.php:465
 #, php-format
 msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 
-#: lib/noticelist.php:469
+#: lib/noticelist.php:474
 msgid "at"
 msgstr "en"
 
-#: lib/noticelist.php:518
+#: lib/noticelist.php:523
 msgid "web"
 msgstr "red"
 
-#: lib/noticelist.php:584
+#: lib/noticelist.php:589
 msgid "in context"
 msgstr "en contexto"
 
-#: lib/noticelist.php:619
+#: lib/noticelist.php:624
 msgid "Repeated by"
 msgstr "Repetido por"
 
-#: lib/noticelist.php:646
+#: lib/noticelist.php:651
 msgid "Reply to this notice"
 msgstr "Responder a este mensaje."
 
-#: lib/noticelist.php:647
+#: lib/noticelist.php:652
 msgid "Reply"
 msgstr "Responder"
 
-#: lib/noticelist.php:691
+#: lib/noticelist.php:678
+msgid "Delete this notice"
+msgstr "Borrar este mensaje"
+
+#: lib/noticelist.php:696
 msgid "Notice repeated"
 msgstr "Mensaje repetido"
 
@@ -9325,48 +9413,31 @@ msgstr "Mensaje duplicado."
 msgid "Couldn't insert new subscription."
 msgstr "No se pudo insertar una nueva suscripción."
 
-#. TRANS: Personal group navigation menu option when logged in for viewing @-replies.
-#: lib/personalgroupnav.php:107
+#: lib/personalgroupnav.php:104
 #, fuzzy
-msgctxt "MENU"
 msgid "Replies"
 msgstr "Respuestas"
 
-#. TRANS: Personal group navigation menu option when logged in for seeing own profile.
-#: lib/personalgroupnav.php:114
+#: lib/personalgroupnav.php:109
 #, fuzzy
-msgctxt "MENU"
-msgid "Profile"
-msgstr "Perfil"
-
-#. TRANS: Personal group navigation menu option when logged in for viewing own favourited notices.
-#: lib/personalgroupnav.php:120
-#, fuzzy
-msgctxt "MENU"
 msgid "Favorites"
 msgstr "Favoritos"
 
-#. TRANS: Personal group navigation menu option when logged in for viewing recieved personal messages.
-#: lib/personalgroupnav.php:133
+#: lib/personalgroupnav.php:120
 #, fuzzy
-msgctxt "MENU"
 msgid "Inbox"
 msgstr "Bandeja de Entrada"
 
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing recieved personal messages.
-#: lib/personalgroupnav.php:135
+#: lib/personalgroupnav.php:121
 msgid "Your incoming messages"
 msgstr "Mensajes entrantes"
 
-#. TRANS: Personal group navigation menu option when logged in for viewing senet personal messages.
-#: lib/personalgroupnav.php:140
+#: lib/personalgroupnav.php:125
 #, fuzzy
-msgctxt "MENU"
 msgid "Outbox"
 msgstr "Bandeja de Salida"
 
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing senet personal messages.
-#: lib/personalgroupnav.php:142
+#: lib/personalgroupnav.php:126
 msgid "Your sent messages"
 msgstr "Mensajes enviados"
 
@@ -9381,9 +9452,26 @@ msgstr "Etiquetas en mensajes de %s"
 msgid "Unknown"
 msgstr "Desconocido"
 
+#. TRANS: Plugin admin panel controls
+#: lib/plugindisableform.php:90
+msgctxt "plugin"
+msgid "Disable"
+msgstr ""
+
+#. TRANS: Plugin admin panel controls
+#: lib/pluginenableform.php:112
+msgctxt "plugin"
+msgid "Enable"
+msgstr ""
+
+#: lib/pluginlist.php:196
+msgctxt "plugin-description"
+msgid "(Plugin descriptions unavailable when disabled.)"
+msgstr ""
+
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:82
+#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:88
 msgid "Subscriptions"
 msgstr "Suscripciones"
 
@@ -9394,7 +9482,7 @@ msgstr "Todas las suscripciones"
 
 #. TRANS: H2 text for user subscriber statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:90
+#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:96
 msgid "Subscribers"
 msgstr "Suscriptores"
 
@@ -9416,7 +9504,7 @@ msgstr "Miembro desde"
 #. TRANS: Label for user statistics.
 #. TRANS: H2 text for user group membership statistics.
 #: lib/profileaction.php:239 lib/profileaction.php:290
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:104
 msgid "Groups"
 msgstr "Grupos"
 
@@ -9436,10 +9524,6 @@ msgstr "Todos los grupos"
 msgid "Unimplemented method."
 msgstr "Método no implementado."
 
-#: lib/publicgroupnav.php:78
-msgid "Public"
-msgstr "Público"
-
 #: lib/publicgroupnav.php:82
 msgid "User groups"
 msgstr "Grupos de usuario"
@@ -9478,7 +9562,7 @@ msgid "Revoke the \"%s\" role from this user"
 msgstr "Revocar el rol \"%s\" de este usuario"
 
 #. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:974
+#: lib/router.php:1001
 #, fuzzy
 msgid "Page not found."
 msgstr "Método de API no encontrado."
@@ -9508,11 +9592,6 @@ msgctxt "BUTTON"
 msgid "Search"
 msgstr "Buscar"
 
-#. TRANS: Definition list item with instructions on how to get (better) search results.
-#: lib/searchaction.php:170
-msgid "Search help"
-msgstr "Buscar ayuda"
-
 #: lib/searchgroupnav.php:80
 msgid "People"
 msgstr "Gente"
@@ -9537,6 +9616,51 @@ msgstr "Sección sin título"
 msgid "More..."
 msgstr "Más..."
 
+#: lib/settingsnav.php:78
+msgid "Change your profile settings"
+msgstr "Cambia tus opciones de perfil"
+
+#: lib/settingsnav.php:83
+msgid "Upload an avatar"
+msgstr "Subir una imagen."
+
+#: lib/settingsnav.php:88
+msgid "Change your password"
+msgstr "Cambia tu contraseña"
+
+#: lib/settingsnav.php:93
+msgid "Change email handling"
+msgstr "Cambiar el manejo del correo."
+
+#: lib/settingsnav.php:98
+msgid "Design your profile"
+msgstr "Diseñar tu perfil"
+
+#: lib/settingsnav.php:102
+msgid "URL"
+msgstr "URL"
+
+#: lib/settingsnav.php:103
+msgid "URL shorteners"
+msgstr ""
+
+#: lib/settingsnav.php:111
+msgid "Updates by instant messenger (IM)"
+msgstr "Actualizaciones por mensajería instantánea"
+
+#: lib/settingsnav.php:118
+msgid "Updates by SMS"
+msgstr "Actualizaciones por sms"
+
+#: lib/settingsnav.php:123
+#, fuzzy
+msgid "Connections"
+msgstr "Conecciones"
+
+#: lib/settingsnav.php:124
+msgid "Authorized connected applications"
+msgstr "Aplicaciones conectadas autorizadas"
+
 #: lib/silenceform.php:67
 msgid "Silence"
 msgstr "Silenciar"
@@ -9545,30 +9669,34 @@ msgstr "Silenciar"
 msgid "Silence this user"
 msgstr "Silenciar a este usuario"
 
-#: lib/subgroupnav.php:83
+#: lib/subgroupnav.php:89
 #, php-format
 msgid "People %s subscribes to"
 msgstr "Personas a las que %s está suscrito"
 
-#: lib/subgroupnav.php:91
+#: lib/subgroupnav.php:97
 #, php-format
 msgid "People subscribed to %s"
 msgstr "Personas suscritas a %s"
 
-#: lib/subgroupnav.php:99
+#: lib/subgroupnav.php:105
 #, php-format
 msgid "Groups %s is a member of"
 msgstr "%s es miembro de los grupos"
 
-#: lib/subgroupnav.php:105
+#: lib/subgroupnav.php:111
 msgid "Invite"
 msgstr "Invitar"
 
-#: lib/subgroupnav.php:106
+#: lib/subgroupnav.php:112
 #, php-format
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Invita a amigos y colegas a unirse a %s"
 
+#: lib/subscribeform.php:115 lib/subscribeform.php:139
+msgid "Subscribe to this user"
+msgstr "Suscribirse a este usuario"
+
 #: lib/subscriberspeopleselftagcloudsection.php:48
 #: lib/subscriptionspeopleselftagcloudsection.php:48
 msgid "People Tagcloud as self-tagged"
@@ -9644,6 +9772,13 @@ msgstr "El tema contiene archivo de tipo '.%s', que no está permitido."
 msgid "Error opening theme archive."
 msgstr "Error al abrir archivo de tema."
 
+#: lib/threadednoticelist.php:270
+#, php-format
+msgid "Show all %d comment"
+msgid_plural "Show all %d comments"
+msgstr[0] ""
+msgstr[1] ""
+
 #: lib/topposterssection.php:74
 msgid "Top posters"
 msgstr "Principales posteadores"
@@ -9686,76 +9821,80 @@ msgstr "Cancelar suscripción"
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "El usuario no tiene un perfil."
 
-#. TRANS: Link text for changeing the avatar of the logged in user.
-#: lib/userprofile.php:121
+#: lib/userprofile.php:116
 msgid "Edit Avatar"
 msgstr "Editar imagen"
 
 #. TRANS: H2 for user actions in a profile.
 #. TRANS: H2 for entity actions in a profile.
-#: lib/userprofile.php:245 lib/userprofile.php:261
+#: lib/userprofile.php:216 lib/userprofile.php:232
 msgid "User actions"
 msgstr "Acciones de usuario"
 
 #. TRANS: Text shown in user profile of not yet compeltely deleted users.
-#: lib/userprofile.php:249
+#: lib/userprofile.php:220
 msgid "User deletion in progress..."
 msgstr "Eliminación de usuario en curso..."
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:277
+#: lib/userprofile.php:248
 msgid "Edit profile settings"
 msgstr "Editar configuración del perfil"
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:279
+#: lib/userprofile.php:250
 msgid "Edit"
 msgstr "Editar"
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:303
+#: lib/userprofile.php:274
 msgid "Send a direct message to this user"
 msgstr "Enviar un mensaje directo a este usuario"
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:305
+#: lib/userprofile.php:276
 msgid "Message"
 msgstr "Mensaje"
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:347
+#: lib/userprofile.php:318
 msgid "Moderate"
 msgstr "Moderar"
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:386
+#: lib/userprofile.php:357
 msgid "User role"
 msgstr "Rol de usuario"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:389
+#: lib/userprofile.php:360
 msgctxt "role"
 msgid "Administrator"
 msgstr "Administrador"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:391
+#: lib/userprofile.php:362
 msgctxt "role"
 msgid "Moderator"
 msgstr "Moderador"
 
+#: lib/util.php:321
+#, fuzzy
+msgid "Not allowed to log in."
+msgstr "No conectado."
+
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1306
+#: lib/util.php:1337
 msgid "a few seconds ago"
 msgstr "hace unos segundos"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1309
+#: lib/util.php:1340
 msgid "about a minute ago"
 msgstr "hace un minuto"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1313
+#: lib/util.php:1344
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
@@ -9763,12 +9902,12 @@ msgstr[0] "hace aproximadamente un minuto"
 msgstr[1] "hace aproximadamente %d minutos"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1316
+#: lib/util.php:1347
 msgid "about an hour ago"
 msgstr "hace una hora"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1320
+#: lib/util.php:1351
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
@@ -9776,12 +9915,12 @@ msgstr[0] "hace aproximadamente una hora"
 msgstr[1] "hace aproximadamente %d horas"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1323
+#: lib/util.php:1354
 msgid "about a day ago"
 msgstr "hace un día"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1327
+#: lib/util.php:1358
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
@@ -9789,12 +9928,12 @@ msgstr[0] "hace aproximadamente un día"
 msgstr[1] "hace aproximadamente %d días"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1330
+#: lib/util.php:1361
 msgid "about a month ago"
 msgstr "hace un mes"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1334
+#: lib/util.php:1365
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
@@ -9802,7 +9941,7 @@ msgstr[0] "hace aproximadamente un mes"
 msgstr[1] "hace aproximadamente %d meses"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1337
+#: lib/util.php:1368
 msgid "about a year ago"
 msgstr "hace un año"
 
@@ -9813,21 +9952,6 @@ msgstr "hace un año"
 msgid "%s is not a valid color! Use 3 or 6 hex characters."
 msgstr "%s no es un color válido! Usar 3 o 6 caracteres hexagesimales"
 
-#. TRANS: %s is the URL to the StatusNet site's Instant Messaging settings.
-#: lib/xmppmanager.php:287
-#, php-format
-msgid "Unknown user. Go to %s to add your address to your account"
-msgstr ""
-
-#. TRANS: Response to XMPP source when it sent too long a message.
-#. TRANS: %1$d the maximum number of allowed characters (used for plural), %2$d is the sent number.
-#: lib/xmppmanager.php:406
-#, fuzzy, php-format
-msgid "Message too long. Maximum is %1$d character, you sent %2$d."
-msgid_plural "Message too long. Maximum is %1$d characters, you sent %2$d."
-msgstr[0] "Mensaje muy largo - máximo %1$d caracteres, enviaste %2$d"
-msgstr[1] "Mensaje muy largo - máximo %1$d caracteres, enviaste %2$d"
-
 #. TRANS: Exception.
 #: lib/xrd.php:63
 #, fuzzy
@@ -9846,73 +9970,177 @@ msgid "Getting backup from file '%s'."
 msgstr ""
 
 #, fuzzy
-#~ msgid "Block this user."
-#~ msgstr "Bloquear este usuario."
+#~ msgid "Could not generate feed for group - %s"
+#~ msgstr "No se pudo actualizar el grupo."
 
 #, fuzzy
-#~ msgid "Delete this notice."
-#~ msgstr "Borrar este mensaje"
-
-#, fuzzy
-#~ msgid "Delete this user."
-#~ msgstr "Borrar este usuario"
-
-#, fuzzy
-#~ msgid "Restore default designs."
-#~ msgstr "Restaurar los diseños predeterminados"
-
-#, fuzzy
-#~ msgid "Reset back to default."
-#~ msgstr "Volver a los valores predeterminados"
-
-#, fuzzy
-#~ msgid "Save design."
-#~ msgstr "Guardar el diseño"
-
-#, fuzzy
-#~ msgid "Disfavor favorite."
-#~ msgstr "Sacar favorito"
-
-#, fuzzy
-#~ msgid "\"%s\" not found."
-#~ msgstr "Método de API no encontrado."
-
-#, fuzzy
-#~ msgid "Notice %s not found."
-#~ msgstr "Método de API no encontrado."
-
-#, fuzzy
-#~ msgid "Attachment %s not found."
-#~ msgstr "No se encuentra usuario receptor."
-
-#, fuzzy
-#~ msgid "Invalid tag: \"%s\"."
-#~ msgstr "Etiqueta inválida: \"% s\""
-
-#, fuzzy
-#~ msgid "%s updates from everyone."
-#~ msgstr "¡Actualizaciones de todos en %s!"
-
-#, fuzzy
-#~ msgid "Password saved"
-#~ msgstr "Se guardó la contraseña."
-
-#, fuzzy
-#~ msgid "Where you are, like \"City, State (or Region), Country\"."
-#~ msgstr "Dónde estás, por ejemplo \"Ciudad, Estado (o Región), País\""
-
-#, fuzzy
-#~ msgid "Subscribe to this user."
-#~ msgstr "Suscribirse a este usuario"
+#~ msgid "Current confirmed Jabber/Google Talk address."
+#~ msgstr "Dirección actual Jabber/Gtalk confirmada."
 
 #, fuzzy
 #~ msgid ""
-#~ "Listenee stream license \"%1$s\" is not compatible with site license \"%2"
-#~ "$s\"."
+#~ "Jabber or Google Talk address, like \"UserName@example.org\". First, make "
+#~ "sure to add %s to your buddy list in your IM client or on Google Talk."
 #~ msgstr ""
-#~ "Licencia de flujo del emisor ‘%1$s’ es incompatible con la licencia del "
-#~ "sitio ‘%2$s’."
+#~ "Dirección Jabber o GTalk, por ejemplo \"NombreUsuario@example.org\". "
+#~ "Primero, asegúrate de agregar a %s a tu lista de amigos en tu cliente de "
+#~ "mensajería instantánea o en GTalk."
 
 #, fuzzy
-#~ msgid "Not allowed to log in."
-#~ msgstr "No conectado."
+#~ msgid "Send me notices through Jabber/Google Talk."
+#~ msgstr "Enviarme mensajes por Jabber/GTalk"
+
+#, fuzzy
+#~ msgid "Publish a MicroID for my Jabber/Google Talk address."
+#~ msgstr "Publicar un MicroID para mi cuenta Jabber/GTalk."
+
+#~ msgid "No Jabber ID."
+#~ msgstr "Ningún Jabber ID."
+
+#, fuzzy
+#~ msgid "Not a valid Jabber ID."
+#~ msgstr "Jabber ID no válido"
+
+#~ msgid "That is already your Jabber ID."
+#~ msgstr "Ese ya es tu Jabber ID."
+
+#~ msgid "That is not your Jabber ID."
+#~ msgstr "Ese no es tu Jabber ID."
+
+#~ msgid "Other settings"
+#~ msgstr "Otros ajustes"
+
+#~ msgid "Tag cloud"
+#~ msgstr "Nube de etiquetas"
+
+#~ msgid "Consumer key"
+#~ msgstr "Clave del consumidor"
+
+#~ msgid "Consumer secret"
+#~ msgstr "Secreto del consumidor"
+
+#~ msgid "Request token URL"
+#~ msgstr "URL del token de solicitud"
+
+#~ msgid "Access token URL"
+#~ msgstr "URL del token de acceso"
+
+#~ msgid "Authorize URL"
+#~ msgstr "Autorizar URL"
+
+#~ msgid "Jabber"
+#~ msgstr "Jabber"
+
+#~ msgid "Photo"
+#~ msgstr "Foto"
+
+#~ msgid "Other options"
+#~ msgstr "Otras opciones"
+
+#~ msgid "Other"
+#~ msgstr "Otro"
+
+#~ msgid "Primary site navigation"
+#~ msgstr "Navegación de sitio primario"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Personal profile and friends timeline"
+#~ msgstr "Perfil personal y línea temporal de amistades"
+
+#~ msgctxt "MENU"
+#~ msgid "Personal"
+#~ msgstr "Personal"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Change your email, avatar, password, profile"
+#~ msgstr "Cambia tu correo electrónico, imagen, contraseña, perfil"
+
+#~ msgid "Account"
+#~ msgstr "Cuenta"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Connect to services"
+#~ msgstr "Conectar a los servicios"
+
+#~ msgid "Connect"
+#~ msgstr "Conectarse"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Change site configuration"
+#~ msgstr "Cambiar la configuración del sitio"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Invite friends and colleagues to join you on %s"
+#~ msgstr "Invita a amistades y compañeros a unirse a tí en %s"
+
+#~ msgctxt "MENU"
+#~ msgid "Invite"
+#~ msgstr "Invitar"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Create an account"
+#~ msgstr "Crear una cuenta"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Help me!"
+#~ msgstr "¡Ayúdame!"
+
+#~ msgctxt "MENU"
+#~ msgid "Help"
+#~ msgstr "Ayuda"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Search for people or text"
+#~ msgstr "Buscar personas o texto"
+
+#~ msgid "Local views"
+#~ msgstr "Vistas locales"
+
+#~ msgid "Page notice"
+#~ msgstr "Mensaje de página"
+
+#~ msgid "Secondary site navigation"
+#~ msgstr "Navegación de sitio secundario"
+
+#~ msgid "StatusNet software license"
+#~ msgstr "Licencia de software de StatusNet"
+
+#~ msgid "Site content license"
+#~ msgstr "Licencia de contenido del sitio"
+
+#~ msgid "Pagination"
+#~ msgstr "Paginación"
+
+#~ msgid "Author"
+#~ msgstr "Autor"
+
+#~ msgid "Provider"
+#~ msgstr "Proveedor"
+
+#, fuzzy
+#~ msgctxt "MENU"
+#~ msgid "SMS"
+#~ msgstr "SMS"
+
+#~ msgid "Filter tags"
+#~ msgstr "Filtrar etiquetas"
+
+#~ msgid "[%s]"
+#~ msgstr "[%s]"
+
+#~ msgid "Available characters"
+#~ msgstr "Caracteres disponibles"
+
+#, fuzzy
+#~ msgctxt "MENU"
+#~ msgid "Profile"
+#~ msgstr "Perfil"
+
+#~ msgid "Search help"
+#~ msgstr "Buscar ayuda"
+
+#, fuzzy
+#~ msgid "Message too long. Maximum is %1$d character, you sent %2$d."
+#~ msgid_plural "Message too long. Maximum is %1$d characters, you sent %2$d."
+#~ msgstr[0] "Mensaje muy largo - máximo %1$d caracteres, enviaste %2$d"
+#~ msgstr[1] "Mensaje muy largo - máximo %1$d caracteres, enviaste %2$d"
diff --git a/locale/fa/LC_MESSAGES/statusnet.po b/locale/fa/LC_MESSAGES/statusnet.po
index 7f3372bc60..f316c5ce1b 100644
--- a/locale/fa/LC_MESSAGES/statusnet.po
+++ b/locale/fa/LC_MESSAGES/statusnet.po
@@ -15,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 15:58+0000\n"
-"PO-Revision-Date: 2011-03-03 16:00:26+0000\n"
+"POT-Creation-Date: 2011-03-03 17:23+0000\n"
+"PO-Revision-Date: 2011-03-03 17:25:57+0000\n"
 "Last-Translator: Ahmad Sufi Mahmudi\n"
 "Language-Team: Persian <http://translatewiki.net/wiki/Portal:fa>\n"
 "MIME-Version: 1.0\n"
@@ -84,23 +84,23 @@ msgstr "ذخیرهٔ تنظیمات دسترسی"
 #. TRANS: Tooltip for button to save access settings in site admin panel.
 #. TRANS: Button text for saving theme settings.
 #. TRANS: Button label to save e-mail preferences.
-#. TRANS: Button label to save Instant Messaging preferences.
-#. TRANS: Button text for saving "Other settings" in profile.
+#. TRANS: Button label to save IM preferences.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
 #. TRANS: Button text for saving site notice in admin panel.
 #. TRANS: Button label to save SMS preferences.
 #. TRANS: Save button for settings for a profile in a subscriptions list.
+#. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
 #. TRANS: Button text on profile design page to save settings.
 #: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
-#: actions/emailsettings.php:250 actions/imsettings.php:183
-#: actions/othersettings.php:136 actions/pathsadminpanel.php:512
-#: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
-#: actions/smssettings.php:205 actions/subscriptions.php:259
+#: actions/emailsettings.php:251 actions/imsettings.php:199
+#: actions/pathsadminpanel.php:512 actions/profilesettings.php:198
+#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:204
+#: actions/subscriptions.php:261 actions/urlsettings.php:152
 #: actions/useradminpanel.php:298 lib/applicationeditform.php:355
-#: lib/designsettings.php:270 lib/groupeditform.php:201
+#: lib/designform.php:320 lib/groupeditform.php:201
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "ذخیره"
@@ -139,7 +139,11 @@ msgstr "چنین صفحه‌ای وجود ندارد."
 #. 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 use "one time password login" without using an existing user.
+#. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
+#. TRANS: Client error displayed trying to find a user by ID for a non-existing ID.
+#. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when calling a profile action without specifying a user.
 #: actions/all.php:80 actions/allrss.php:69
@@ -151,19 +155,19 @@ msgstr "چنین صفحه‌ای وجود ندارد."
 #: actions/apidirectmessage.php:75 actions/apidirectmessagenew.php:72
 #: actions/apigroupcreate.php:111 actions/apigroupismember.php:89
 #: actions/apigroupjoin.php:98 actions/apigroupleave.php:98
-#: actions/apigrouplist.php:70 actions/apistatusesupdate.php:230
-#: actions/apisubscriptions.php:85 actions/apitimelinefavorites.php:70
-#: actions/apitimelinefriends.php:173 actions/apitimelinehome.php:78
-#: actions/apitimelinementions.php:77 actions/apitimelineuser.php:79
-#: actions/avatarbynickname.php:79 actions/favoritesrss.php:72
-#: actions/foaf.php:42 actions/foaf.php:61 actions/hcard.php:67
-#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
-#: actions/remotesubscribe.php:144 actions/remotesubscribe.php:153
-#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
-#: actions/showfavorites.php:106 actions/userbyid.php:74
-#: actions/usergroups.php:93 actions/userrss.php:40 actions/userxrd.php:59
-#: actions/xrds.php:71 lib/command.php:509 lib/galleryaction.php:59
-#: lib/mailbox.php:80 lib/profileaction.php:77
+#: actions/apigrouplist.php:70 actions/apigroupprofileupdate.php:108
+#: actions/apistatusesupdate.php:230 actions/apisubscriptions.php:85
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:173
+#: actions/apitimelinehome.php:78 actions/apitimelinementions.php:77
+#: actions/apitimelineuser.php:79 actions/avatarbynickname.php:79
+#: actions/favoritesrss.php:72 actions/foaf.php:42 actions/foaf.php:61
+#: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116
+#: actions/otp.php:78 actions/remotesubscribe.php:144
+#: actions/remotesubscribe.php:153 actions/replies.php:73
+#: actions/repliesrss.php:38 actions/rsd.php:113 actions/showfavorites.php:106
+#: actions/userbyid.php:75 actions/usergroups.php:93 actions/userrss.php:40
+#: actions/userxrd.php:59 actions/xrds.php:71 lib/command.php:509
+#: lib/galleryaction.php:59 lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "چنین کاربری وجود ندارد."
 
@@ -177,10 +181,9 @@ msgstr "%1$s و دوستان، صفحهٔ %2$d"
 #. TRANS: H1 text for page. %s is a user nickname.
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Timeline title for user and friends. %s is a user nickname.
-#. TRANS: Tooltop for personal group navigation menu option when logged in for viewing timeline of self and friends.
 #: actions/all.php:94 actions/all.php:191 actions/allrss.php:117
 #: actions/apitimelinefriends.php:207 actions/apitimelinehome.php:113
-#: lib/personalgroupnav.php:102
+#: lib/personalgroupnav.php:100
 #, php-format
 msgid "%s and friends"
 msgstr "%s و دوستان"
@@ -236,7 +239,7 @@ msgstr ""
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
 #. TRANS: Second sentence of empty message for anonymous users. %s is a user nickname.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:227
+#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:221
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -285,19 +288,20 @@ msgstr "به روز رسانی از %1$s و دوستان در %2$s"
 #: actions/apifavoritecreate.php:98 actions/apifavoritedestroy.php:98
 #: actions/apifriendshipscreate.php:99 actions/apifriendshipsdestroy.php:99
 #: actions/apifriendshipsshow.php:124 actions/apigroupcreate.php:138
-#: actions/apigroupismember.php:115 actions/apigroupjoin.php:160
-#: actions/apigroupleave.php:145 actions/apigrouplist.php:134
+#: actions/apigroupismember.php:115 actions/apigroupjoin.php:151
+#: actions/apigroupleave.php:141 actions/apigrouplist.php:134
 #: actions/apigrouplistall.php:120 actions/apigroupmembership.php:105
+#: actions/apigroupprofileupdate.php:100 actions/apigroupprofileupdate.php:213
 #: actions/apigroupshow.php:114 actions/apihelptest.php:84
 #: actions/apistatusesdestroy.php:101 actions/apistatusesretweets.php:110
 #: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:139
 #: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
-#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:268
-#: actions/apitimelinegroup.php:147 actions/apitimelinehome.php:173
-#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:239
-#: actions/apitimelineretweetedtome.php:118
-#: actions/apitimelineretweetsofme.php:150 actions/apitimelinetag.php:159
-#: actions/apitimelineuser.php:206 actions/apiusershow.php:100
+#: actions/apitimelinefavorites.php:182 actions/apitimelinefriends.php:276
+#: actions/apitimelinegroup.php:148 actions/apitimelinehome.php:181
+#: actions/apitimelinementions.php:182 actions/apitimelinepublic.php:247
+#: actions/apitimelineretweetedtome.php:147
+#: actions/apitimelineretweetsofme.php:147 actions/apitimelinetag.php:165
+#: actions/apitimelineuser.php:217 actions/apiusershow.php:100
 msgid "API method not found."
 msgstr "رابط مورد نظر پیدا نشد."
 
@@ -312,8 +316,9 @@ msgstr "رابط مورد نظر پیدا نشد."
 #: actions/apifavoritecreate.php:88 actions/apifavoritedestroy.php:88
 #: actions/apifriendshipscreate.php:89 actions/apifriendshipsdestroy.php:89
 #: actions/apigroupcreate.php:102 actions/apigroupjoin.php:89
-#: actions/apigroupleave.php:89 actions/apimediaupload.php:66
-#: actions/apistatusesretweet.php:63 actions/apistatusesupdate.php:194
+#: actions/apigroupleave.php:89 actions/apigroupprofileupdate.php:92
+#: actions/apimediaupload.php:66 actions/apistatusesretweet.php:63
+#: actions/apistatusesupdate.php:194
 msgid "This method requires a POST."
 msgstr "برای استفاده از این روش باید اطلاعات را به صورت پست بفرستید"
 
@@ -326,21 +331,16 @@ msgstr ""
 "شما باید یک پارامتر را به نام device و مقدار sms، im یا none مشخص کنید."
 
 #. TRANS: Server error displayed when a user's delivery device cannot be updated.
-#. TRANS: Server error displayed when a user update to the database fails in the contact address confirmation action.
 #. TRANS: Server error thrown on database error updating e-mail preferences.
 #. TRANS: Server error thrown on database error removing a registered e-mail address.
-#. TRANS: Server error thrown on database error updating Instant Messaging preferences.
-#. TRANS: Server error thrown on database error removing a registered Instant Messaging address.
-#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
 #. TRANS: Server error thrown when user profile settings could not be updated.
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
-#: actions/apiaccountupdatedeliverydevice.php:130
-#: actions/confirmaddress.php:118 actions/emailsettings.php:352
-#: actions/emailsettings.php:498 actions/imsettings.php:276
-#: actions/imsettings.php:432 actions/othersettings.php:186
-#: actions/profilesettings.php:322 actions/smssettings.php:301
-#: actions/smssettings.php:454
+#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
+#: actions/apiaccountupdatedeliverydevice.php:136
+#: actions/emailsettings.php:353 actions/emailsettings.php:499
+#: actions/profilesettings.php:323 actions/smssettings.php:300
+#: actions/smssettings.php:453 actions/urlsettings.php:211
 msgid "Could not update user."
 msgstr "نمی‌توان کاربر را به‌هنگام‌سازی کرد."
 
@@ -366,7 +366,7 @@ msgstr "کاربر هیچ نمایه‌ای ندارد."
 
 #. TRANS: Server error displayed if a user profile could not be saved.
 #. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:418
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:419
 msgid "Could not save profile."
 msgstr "نمی‌توان نمایه را ذخیره کرد."
 
@@ -378,7 +378,7 @@ msgstr "نمی‌توان نمایه را ذخیره کرد."
 #: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
 #: actions/designadminpanel.php:120 actions/editapplication.php:121
 #: actions/newapplication.php:102 actions/newnotice.php:95
-#: lib/designsettings.php:298
+#: lib/designsettings.php:110
 #, fuzzy, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s byte) due to its "
@@ -399,8 +399,8 @@ msgstr[0] ""
 #: actions/apiaccountupdateprofilecolors.php:160
 #: actions/apiaccountupdateprofilecolors.php:171
 #: actions/groupdesignsettings.php:285 actions/groupdesignsettings.php:296
-#: actions/userdesignsettings.php:201 actions/userdesignsettings.php:211
-#: actions/userdesignsettings.php:253 actions/userdesignsettings.php:263
+#: actions/userdesignsettings.php:218 actions/userdesignsettings.php:228
+#: actions/userdesignsettings.php:270 actions/userdesignsettings.php:280
 msgid "Unable to save your design settings."
 msgstr "نمی‌توان تنظیمات طرح‌تان را ذخیره کرد."
 
@@ -408,7 +408,7 @@ msgstr "نمی‌توان تنظیمات طرح‌تان را ذخیره کرد.
 #. TRANS: Client error displayed when a database error occurs updating profile colours.
 #: actions/apiaccountupdateprofilebackgroundimage.php:191
 #: actions/apiaccountupdateprofilecolors.php:139
-#: actions/userdesignsettings.php:179
+#: actions/userdesignsettings.php:196
 msgid "Could not update your design."
 msgstr "نمی‌توان طرح‌تان به‌هنگام‌سازی کرد."
 
@@ -517,7 +517,7 @@ msgstr "کاربر گیرنده یافت نشد."
 #. TRANS: Client error displayed trying to direct message another user who's not a friend (403).
 #: actions/apidirectmessagenew.php:144
 #, fuzzy
-msgid "Can't send direct messages to users who aren't your friend."
+msgid "Cannot send direct messages to users who aren't your friend."
 msgstr "نمی‌توان پیام مستقیم را به کاربرانی که دوست شما نیستند، فرستاد."
 
 #. TRANS: Client error displayed trying to direct message self (403).
@@ -600,9 +600,9 @@ msgstr "نمی‌توان کاربر هدف را پیدا کرد."
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:156 actions/editgroup.php:191
-#: actions/newgroup.php:137 actions/profilesettings.php:273
-#: actions/register.php:214
+#: actions/apigroupcreate.php:156 actions/apigroupprofileupdate.php:255
+#: actions/editgroup.php:191 actions/newgroup.php:137
+#: actions/profilesettings.php:274 actions/register.php:199
 msgid "Nickname already in use. Try another one."
 msgstr "این لقب در حال حاضر ثبت شده است. لطفا یکی دیگر انتخاب کنید."
 
@@ -610,9 +610,9 @@ msgstr "این لقب در حال حاضر ثبت شده است. لطفا یکی
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:164 actions/editgroup.php:195
-#: actions/newgroup.php:141 actions/profilesettings.php:243
-#: actions/register.php:216
+#: actions/apigroupcreate.php:164 actions/apigroupprofileupdate.php:259
+#: actions/editgroup.php:195 actions/newgroup.php:141
+#: actions/profilesettings.php:244 actions/register.php:201
 msgid "Not a valid nickname."
 msgstr "لقب نا معتبر."
 
@@ -622,10 +622,10 @@ msgstr "لقب نا معتبر."
 #. TRANS: Validation error shown when providing an invalid homepage URL in the "New application" form.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:181 actions/editapplication.php:235
-#: actions/editgroup.php:202 actions/newapplication.php:221
-#: actions/newgroup.php:148 actions/profilesettings.php:248
-#: actions/register.php:223
+#: actions/apigroupcreate.php:181 actions/apigroupprofileupdate.php:277
+#: actions/editapplication.php:235 actions/editgroup.php:202
+#: actions/newapplication.php:221 actions/newgroup.php:148
+#: actions/profilesettings.php:249 actions/register.php:208
 msgid "Homepage is not a valid URL."
 msgstr "صفحهٔ خانگی یک نشانی معتبر نیست."
 
@@ -634,8 +634,8 @@ msgstr "صفحهٔ خانگی یک نشانی معتبر نیست."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:191 actions/editgroup.php:206
-#: actions/newgroup.php:152 actions/profilesettings.php:252
-#: actions/register.php:226
+#: actions/newgroup.php:152 actions/profilesettings.php:253
+#: actions/register.php:211
 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "نام کامل خیلی طولانی است (حداکثر ۲۵۵ نویسه)."
@@ -662,8 +662,8 @@ msgstr[0] "توصیف خیلی طولانی است (حداکثر %d نویسه)"
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:215 actions/editgroup.php:218
-#: actions/newgroup.php:164 actions/profilesettings.php:265
-#: actions/register.php:235
+#: actions/newgroup.php:164 actions/profilesettings.php:266
+#: actions/register.php:220
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
 msgstr "نام مکان خیلی طولانی است (حداکثر ۲۵۵ نویسه)"
@@ -692,15 +692,16 @@ msgstr "نام مستعار نامعتبر است: «%s»."
 #. TRANS: %s is the alias that is already in use.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error. %s is the already used alias.
-#: actions/apigroupcreate.php:264 actions/editgroup.php:246
-#: actions/newgroup.php:193
+#: actions/apigroupcreate.php:264 actions/apigroupprofileupdate.php:351
+#: actions/editgroup.php:246 actions/newgroup.php:193
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "نام‌مستعار «%s» ازپیش گرفته‌شده‌است. یکی دیگر را امتحان کنید."
 
 #. TRANS: Client error displayed when trying to use an alias during group creation that is the same as the group's nickname.
 #. TRANS: Group edit form validation error.
-#: actions/apigroupcreate.php:278 actions/editgroup.php:253
+#: actions/apigroupcreate.php:278 actions/apigroupprofileupdate.php:359
+#: actions/editgroup.php:253
 msgid "Alias can't be the same as nickname."
 msgstr "نام و نام مستعار شما نمی تواند یکی باشد ."
 
@@ -712,7 +713,8 @@ msgstr "نام و نام مستعار شما نمی تواند یکی باشد .
 #. TRANS: Client error displayed requesting most recent notices to a group for a non-existing group.
 #: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
 #: actions/apigroupleave.php:104 actions/apigroupmembership.php:71
-#: actions/apigroupshow.php:81 actions/apitimelinegroup.php:89
+#: actions/apigroupprofileupdate.php:113 actions/apigroupshow.php:81
+#: actions/apitimelinegroup.php:89
 msgid "Group not found."
 msgstr "گروه یافت نشد."
 
@@ -730,13 +732,11 @@ msgstr "شما از پیش یک عضو این گروه هستید."
 msgid "You have been blocked from that group by the admin."
 msgstr "دسترسی شما به گروه توسط مدیر آن محدود شده است."
 
-#. TRANS: Server error displayed when joining a group fails.
-#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
 #. 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.
 #. TRANS: Message given having failed to add a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:362
+#: actions/apigroupjoin.php:136 actions/joingroup.php:139 lib/command.php:362
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "نمی‌توان کاربر %1$s را عضو گروه %2$s کرد."
@@ -746,8 +746,6 @@ msgstr "نمی‌توان کاربر %1$s را عضو گروه %2$s کرد."
 msgid "You are not a member of this group."
 msgstr "شما یک عضو این گروه نیستید."
 
-#. TRANS: Server error displayed when leaving a group fails.
-#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
 #. TRANS: Server error displayed when leaving a group failed in the database.
 #. TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
 #. TRANS: Message given having failed to remove a user from a group.
@@ -783,6 +781,61 @@ msgstr "%s گروه"
 msgid "groups on %s"
 msgstr "گروه‌ها در %s"
 
+#. TRANS: Client error displayed trying to edit a group while not being a group admin.
+#. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
+#. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
+#: actions/apigroupprofileupdate.php:118 actions/editgroup.php:110
+#: actions/editgroup.php:176 actions/groupdesignsettings.php:109
+#: actions/grouplogo.php:111
+msgid "You must be an admin to edit the group."
+msgstr "برای ویرایش گروه باید یک مدیر باشید."
+
+#. TRANS: Server error displayed when editing a group fails.
+#: actions/apigroupprofileupdate.php:171 actions/editgroup.php:274
+msgid "Could not update group."
+msgstr "نمی‌توان گروه را به‌هنگام‌سازی کرد."
+
+#. TRANS: Server error displayed when group aliases could not be added.
+#. TRANS: Server exception thrown when creating group aliases failed.
+#: actions/apigroupprofileupdate.php:194 actions/editgroup.php:281
+#: classes/User_group.php:540
+msgid "Could not create aliases."
+msgstr "نمی‌توان نام‌های مستعار را ساخت."
+
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: actions/apigroupprofileupdate.php:249 lib/nickname.php:165
+msgid "Nickname must have only lowercase letters and numbers and no spaces."
+msgstr "لقب باید شامل حروف کوچک و اعداد و بدون فاصله باشد."
+
+#: actions/apigroupprofileupdate.php:286
+#, fuzzy
+msgid "Full name is too long (max 255 chars)."
+msgstr "نام کامل خیلی طولانی است (حداکثر ۲۵۵ نویسه)."
+
+#: actions/apigroupprofileupdate.php:296
+#, fuzzy, php-format
+msgid "description is too long (max %d chars)."
+msgstr "توصیف خیلی طولانی است (حداکثر %d نویسه)"
+
+#: actions/apigroupprofileupdate.php:307
+#, fuzzy
+msgid "Location is too long (max 255 chars)."
+msgstr "نام مکان خیلی طولانی است (حداکثر ۲۵۵ نویسه)"
+
+#: actions/apigroupprofileupdate.php:326
+#, fuzzy, php-format
+msgid "Too many aliases! Maximum %d."
+msgstr "نام‌های مستعار بسیار زیاد هستند! حداکثر %d."
+
+#. TRANS: Group edit form validation error.
+#. TRANS: Group create form validation error.
+#. TRANS: %s is the invalid alias.
+#: actions/apigroupprofileupdate.php:342 actions/editgroup.php:241
+#: actions/newgroup.php:188
+#, php-format
+msgid "Invalid alias: \"%s\""
+msgstr "نام‌مستعار غیر مجاز: «%s»"
+
 #. TRANS: Client error displayed when uploading a media file has failed.
 #: actions/apimediaupload.php:101
 msgid "Upload failed."
@@ -816,21 +869,22 @@ msgstr "شما شناسایی نشده اید."
 #. TRANS: Form validation error message.
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
+#. TRANS: Client error displayed when the session token is not okay.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
 #: actions/deletenotice.php:177 actions/disfavor.php:75
-#: actions/emailsettings.php:291 actions/favor.php:75 actions/geocode.php:55
+#: actions/emailsettings.php:292 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:65 actions/grouplogo.php:321
-#: actions/groupunblock.php:65 actions/imsettings.php:224
-#: actions/invite.php:60 actions/login.php:137 actions/makeadmin.php:66
-#: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
-#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
-#: actions/othersettings.php:155 actions/passwordsettings.php:138
-#: actions/profilesettings.php:217 actions/recoverpassword.php:383
-#: actions/register.php:172 actions/remotesubscribe.php:76
-#: actions/repeat.php:82 actions/smssettings.php:250 actions/subedit.php:40
-#: actions/subscribe.php:86 actions/tagother.php:166
-#: actions/unsubscribe.php:69 actions/userauthorization.php:52
-#: lib/designsettings.php:310
+#: actions/groupunblock.php:65 actions/imsettings.php:241
+#: actions/invite.php:60 actions/makeadmin.php:66 actions/newmessage.php:135
+#: actions/newnotice.php:105 actions/nudge.php:80
+#: actions/oauthappssettings.php:162 actions/oauthconnectionssettings.php:135
+#: actions/passwordsettings.php:137 actions/pluginenable.php:87
+#: actions/profilesettings.php:218 actions/recoverpassword.php:383
+#: actions/register.php:157 actions/remotesubscribe.php:76
+#: actions/repeat.php:82 actions/smssettings.php:249 actions/subedit.php:40
+#: actions/subscribe.php:87 actions/tagother.php:145
+#: actions/unsubscribe.php:69 actions/urlsettings.php:171
+#: actions/userauthorization.php:53 lib/designsettings.php:122
 msgid "There was a problem with your session token. Try again, please."
 msgstr "مشکلی در دریافت نشست شما وجود دارد. لطفا بعدا سعی کنید."
 
@@ -859,10 +913,10 @@ msgstr "هنگام افزودن کاربر برنامهٔ OAuth در پایگا
 #. TRANS: Unknown form validation error in design settings form.
 #: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
 #: actions/designadminpanel.php:100 actions/editapplication.php:144
-#: actions/emailsettings.php:310 actions/grouplogo.php:332
-#: actions/imsettings.php:239 actions/newapplication.php:124
-#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
-#: actions/smssettings.php:271 lib/designsettings.php:321
+#: actions/emailsettings.php:311 actions/grouplogo.php:332
+#: actions/imsettings.php:256 actions/newapplication.php:124
+#: actions/oauthconnectionssettings.php:144 actions/recoverpassword.php:46
+#: actions/smssettings.php:270 lib/designsettings.php:133
 msgid "Unexpected form submission."
 msgstr "ارسال غیر قابل انتظار فرم."
 
@@ -914,31 +968,26 @@ msgstr "حساب کاربری"
 
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Field label in form for profile settings.
-#. TRANS: Label for group nickname (dt). Text hidden by default.
-#. TRANS: DT for nick name in a profile.
-#: actions/apioauthauthorize.php:459 actions/login.php:252
-#: actions/profilesettings.php:106 actions/register.php:432
-#: actions/showgroup.php:243 actions/tagother.php:94
+#: actions/apioauthauthorize.php:459 actions/login.php:225
+#: actions/profilesettings.php:107 actions/register.php:411
 #: actions/userauthorization.php:145 lib/groupeditform.php:145
-#: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "نام کاربری"
 
 #. TRANS: Field label on OAuth API authorisation form.
-#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:463 actions/login.php:255
-#: actions/register.php:436 lib/accountsettingsaction.php:120
+#: actions/apioauthauthorize.php:463 actions/login.php:228
+#: actions/register.php:415 lib/settingsnav.php:87
 msgid "Password"
 msgstr "گذرواژه"
 
 #. TRANS: Button text that when clicked will cancel the process of allowing access to an account
 #. TRANS: by an external application.
 #. TRANS: Button label to cancel an e-mail address confirmation procedure.
-#. TRANS: Button label to cancel an Instant Messaging address confirmation procedure.
+#. TRANS: Button label to cancel an IM address confirmation procedure.
 #. TRANS: Button label to cancel a SMS address confirmation procedure.
 #. TRANS: Button label in the "Edit application" form.
-#: actions/apioauthauthorize.php:478 actions/emailsettings.php:124
-#: actions/imsettings.php:127 actions/smssettings.php:133
+#: actions/apioauthauthorize.php:478 actions/emailsettings.php:125
+#: actions/imsettings.php:136 actions/smssettings.php:132
 #: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Cancel"
@@ -1051,7 +1100,7 @@ msgstr "رابط مورد نظر پیدا نشد."
 #. TRANS: %s is the requested output format.
 #: actions/apistatusesshow.php:144
 #, fuzzy, php-format
-msgid "Unsupported format: %s"
+msgid "Unsupported format: %s."
 msgstr "قالب پشتیبانی نشده."
 
 #. TRANS: Client error displayed requesting a deleted status.
@@ -1131,13 +1180,6 @@ msgstr "%1$s / برگزیده‌ها از %2$s"
 msgid "%1$s updates favorited by %2$s / %3$s."
 msgstr "به‌روزرسانی‌های %1$s که توسط %2$s برگزیده شده اند / %2$s."
 
-#. TRANS: Server error displayed when generating an Atom feed fails.
-#. TRANS: %s is the error.
-#: actions/apitimelinegroup.php:134
-#, fuzzy, php-format
-msgid "Could not generate feed for group - %s"
-msgstr "نمی‌توان گروه را به‌هنگام‌سازی کرد."
-
 #. TRANS: Title for timeline of most recent mentions of a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname.
 #: actions/apitimelinementions.php:115
@@ -1154,13 +1196,14 @@ msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr "%1$s به روز رسانی هایی که در پاسخ به $2$s / %3$s"
 
 #. TRANS: Title for site timeline. %s is the StatusNet sitename.
+#. TRANS: Public RSS feed title. %s is the StatusNet site name.
 #: actions/apitimelinepublic.php:193 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "%s خط‌زمانی عمومی"
 
 #. TRANS: Subtitle for site timeline. %s is the StatusNet sitename.
-#: actions/apitimelinepublic.php:199 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:199
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "%s به روز رسانی های عموم"
@@ -1172,21 +1215,33 @@ msgid "Unimplemented."
 msgstr "روش پیاده نشده است."
 
 #. TRANS: Title for Atom feed "repeated to me". %s is the user nickname.
-#: actions/apitimelineretweetedtome.php:108
+#: actions/apitimelineretweetedtome.php:96
 #, php-format
 msgid "Repeated to %s"
 msgstr "تکرار شده به %s"
 
+#: actions/apitimelineretweetedtome.php:98
+#, fuzzy, php-format
+msgid "%1$s notices that were to repeated to %2$s / %3$s."
+msgstr "%1$s به روز رسانی هایی که در پاسخ به $2$s / %3$s"
+
 #. TRANS: Title of list of repeated notices of the logged in user.
 #. TRANS: %s is the nickname of the logged in user.
-#: actions/apitimelineretweetsofme.php:112
+#: actions/apitimelineretweetsofme.php:98
 #, php-format
 msgid "Repeats of %s"
 msgstr "تکرار %s"
 
+#: actions/apitimelineretweetsofme.php:104
+#, fuzzy, php-format
+msgid "%1$s notices that %2$s / %3$s has repeated."
+msgstr "پیام شما را به برگزیده‌های خود اضافه کرد %s (@%s)"
+
 #. TRANS: Title for timeline with lastest notices with a given tag.
 #. TRANS: %s is the tag.
-#: actions/apitimelinetag.php:101 actions/tag.php:67
+#. TRANS: Title for first page of notices with tags.
+#. TRANS: %s is the tag.
+#: actions/apitimelinetag.php:101 actions/tag.php:69
 #, php-format
 msgid "Notices tagged with %s"
 msgstr "پیام‌هایی که با %s نشانه گزاری شده اند."
@@ -1199,54 +1254,55 @@ msgid "Updates tagged with %1$s on %2$s!"
 msgstr "پیام‌های نشانه گزاری شده با %1$s در %2$s"
 
 #. TRANS: Client error displayed trying to add a notice to another user's timeline.
-#: actions/apitimelineuser.php:297
+#: actions/apitimelineuser.php:308
 #, fuzzy
 msgid "Only the user can add to their own timeline."
 msgstr "تنها کاربران می تواند صندوق نامهٔ خودشان را بخوانند."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:304
+#: actions/apitimelineuser.php:315
 msgid "Only accept AtomPub for Atom feeds."
 msgstr ""
 
 #. TRANS: Client error displayed attempting to post an empty API notice.
-#: actions/apitimelineuser.php:311
+#: actions/apitimelineuser.php:322
 msgid "Atom post must not be empty."
 msgstr ""
 
 #. TRANS: Client error displayed attempting to post an API that is not well-formed XML.
-#: actions/apitimelineuser.php:317
+#: actions/apitimelineuser.php:328
 msgid "Atom post must be well-formed XML."
 msgstr ""
 
 #. TRANS: Client error displayed when not using an Atom entry.
-#: actions/apitimelineuser.php:323 actions/atompubfavoritefeed.php:228
+#: actions/apitimelineuser.php:334 actions/atompubfavoritefeed.php:228
 #: actions/atompubmembershipfeed.php:230
 #: actions/atompubsubscriptionfeed.php:236
 msgid "Atom post must be an Atom entry."
 msgstr ""
 
 #. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
-#: actions/apitimelineuser.php:335
+#: actions/apitimelineuser.php:345
 msgid "Can only handle POST activities."
 msgstr ""
 
 #. TRANS: Client error displayed when using an unsupported activity object type.
 #. TRANS: %s is the unsupported activity object type.
-#: actions/apitimelineuser.php:346
+#: actions/apitimelineuser.php:356
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
 #. TRANS: %d is the notice ID (number).
-#: actions/apitimelineuser.php:380
+#: actions/apitimelineuser.php:390
 #, fuzzy, php-format
 msgid "No content for notice %d."
 msgstr "پیدا کردن محتوای پیام‌ها"
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:408
+#. TRANS: %s is the notice URI.
+#: actions/apitimelineuser.php:419
 #, fuzzy, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "پیامی با آن شناسه وجود ندارد."
@@ -1264,9 +1320,10 @@ msgstr "رابط مورد نظر پیدا نشد."
 
 #. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
 #. TRANS: Client exception.
+#. TRANS: Client error displayed trying to subscribe to a non-existing profile.
 #: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
 #: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
-#: actions/subscribe.php:107
+#: actions/subscribe.php:110
 msgid "No such profile."
 msgstr "چنین نمایه‌ای وجود ندارد."
 
@@ -1413,7 +1470,7 @@ msgid "Not a member."
 msgstr "همهٔ اعضا"
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
-#: actions/atompubshowmembership.php:151
+#: actions/atompubshowmembership.php:150
 #, fuzzy
 msgid "Cannot delete someone else's membership."
 msgstr "نمی‌توان اشتراک را ذخیره کرد."
@@ -1502,10 +1559,7 @@ msgid "Invalid size."
 msgstr "اندازه نادرست است."
 
 #. TRANS: Title for avatar upload page.
-#. TRANS: Label for group avatar (dt). Text hidden by default.
-#. TRANS: Link description in user account settings menu.
-#: actions/avatarsettings.php:66 actions/showgroup.php:227
-#: lib/accountsettingsaction.php:113
+#: actions/avatarsettings.php:66 lib/settingsnav.php:82
 msgid "Avatar"
 msgstr "چهره"
 
@@ -1519,9 +1573,11 @@ msgstr ""
 
 #. TRANS: Server error displayed in avatar upload page when no matching profile can be found for a user.
 #. TRANS: Server error displayed coming across a request from a user without a profile.
+#. TRANS: Server error displayed when trying to authorise a remote subscription request
+#. TRANS: while the user has no profile.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
 #: actions/grouplogo.php:184 actions/remotesubscribe.php:190
-#: actions/userauthorization.php:72 actions/userrss.php:108
+#: actions/userauthorization.php:75 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr "کاربر نمایهٔ تطبیق ندارد."
 
@@ -1579,10 +1635,10 @@ msgstr "برش"
 msgid "No file uploaded."
 msgstr "هیچ پرونده‌ای بارگذاری نشد."
 
-#. TRANS: Avatar upload form unstruction after uploading a file.
+#. TRANS: Avatar upload form instruction after uploading a file.
 #: actions/avatarsettings.php:345
 #, fuzzy
-msgid "Pick a square area of the image to be your avatar"
+msgid "Pick a square area of the image to be your avatar."
 msgstr ""
 "یک مربع از عکس خود را انتخاب کنید تا به عنوان تصویر چهرهٔ شما انتخاب شود."
 
@@ -1609,7 +1665,7 @@ msgstr "چهره پاک شد."
 
 #. TRANS: Title for backup account page.
 #. TRANS: Option in profile settings to create a backup of the account of the currently logged in user.
-#: actions/backupaccount.php:61 actions/profilesettings.php:467
+#: actions/backupaccount.php:61 actions/profilesettings.php:468
 msgid "Backup account"
 msgstr ""
 
@@ -1643,7 +1699,7 @@ msgstr "پیش‌زمینه"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
 #: actions/backupaccount.php:254
-msgid "Backup your account"
+msgid "Backup your account."
 msgstr ""
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
@@ -1686,7 +1742,7 @@ msgstr "خیر"
 #. TRANS: Submit button title for 'No' when blocking a user.
 #: actions/block.php:158
 #, fuzzy
-msgid "Do not block this user"
+msgid "Do not block this user."
 msgstr "کاربر را مسدود نکن"
 
 #. TRANS: Button label on the user block form.
@@ -1703,9 +1759,9 @@ msgid "Yes"
 msgstr "بله"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#. TRANS: Description of the form to block a user.
-#: actions/block.php:165 lib/blockform.php:79
-msgid "Block this user"
+#: actions/block.php:165
+#, fuzzy
+msgid "Block this user."
 msgstr "کاربر را مسدود کن"
 
 #. TRANS: Server error displayed when blocking a user fails.
@@ -1772,32 +1828,48 @@ msgstr "کد تصدیق پیدا نشد."
 msgid "That confirmation code is not for you!"
 msgstr "آن کد تصدیق برای شما نیست!"
 
-#. TRANS: Server error for a unknow address type %s, which can be 'email', 'jabber', or 'sms'.
-#: actions/confirmaddress.php:92
-#, php-format
-msgid "Unrecognized address type %s."
+#. TRANS: Server error for an unknown address type, which can be 'email', 'sms', or the name of an IM network (such as 'xmpp' or 'aim')
+#: actions/confirmaddress.php:94
+#, fuzzy, php-format
+msgid "Unrecognized address type %s"
 msgstr "نوع نشانی نامشخص است %s."
 
 #. TRANS: Client error for an already confirmed email/jabber/sms address.
-#: actions/confirmaddress.php:97
+#: actions/confirmaddress.php:103 actions/confirmaddress.php:136
 msgid "That address has already been confirmed."
 msgstr "آن نشانی در حال حاضر تصدیق شده است."
 
+#: actions/confirmaddress.php:121 actions/imsettings.php:444
+#: actions/userdesignsettings.php:306
+#, fuzzy
+msgid "Couldn't update user."
+msgstr "نمی‌توان کاربر را به‌هنگام‌سازی کرد."
+
+#: actions/confirmaddress.php:144
+#, fuzzy
+msgid "Couldn't update user im preferences."
+msgstr "نمی‌توان اطلاعات کاربر را به روز کرد."
+
+#: actions/confirmaddress.php:156
+#, fuzzy
+msgid "Couldn't insert user im preferences."
+msgstr "نمی‌توان اشتراک تازه‌ای افزود."
+
 #. TRANS: Server error displayed when an address confirmation code deletion from the
 #. TRANS: database fails in the contact address confirmation action.
-#: actions/confirmaddress.php:132
+#: actions/confirmaddress.php:169
 #, fuzzy
 msgid "Could not delete address confirmation."
 msgstr "نمی‌توان تایید پیام‌رسان فوری را پاک کرد."
 
 #. TRANS: Title for the contact address confirmation action.
-#: actions/confirmaddress.php:150
+#: actions/confirmaddress.php:185
 msgid "Confirm address"
 msgstr "تایید نشانی"
 
 #. TRANS: Success message for the contact address confirmation action.
 #. TRANS: %s can be 'email', 'jabber', or 'sms'.
-#: actions/confirmaddress.php:166
+#: actions/confirmaddress.php:200
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "نشانی «%s« برای شما تصدیق شد."
@@ -1811,6 +1883,7 @@ msgstr "مکالمه"
 #. TRANS: Label for user statistics.
 #: actions/conversation.php:149 lib/noticelist.php:87
 #: lib/profileaction.php:246 lib/searchgroupnav.php:82
+#: lib/threadednoticelist.php:66
 msgid "Notices"
 msgstr "پیام‌ها"
 
@@ -1846,7 +1919,7 @@ msgstr "چهره پاک شد."
 
 #. TRANS: Page title for page on which a user account can be deleted.
 #. TRANS: Option in profile settings to delete the account of the currently logged in user.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:475
+#: actions/deleteaccount.php:228 actions/profilesettings.php:476
 #, fuzzy
 msgid "Delete account"
 msgstr "ساختن یک جساب‌کاربری"
@@ -1870,7 +1943,7 @@ msgstr ""
 #. TRANS: Field label for delete account confirmation entry.
 #. TRANS: Field label for password reset form where the password has to be typed again.
 #: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:262 actions/register.php:440
+#: actions/recoverpassword.php:262 actions/register.php:419
 msgid "Confirm"
 msgstr "تایید"
 
@@ -1900,14 +1973,14 @@ msgstr "برنامه یافت نشد."
 #. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
 #: actions/deleteapplication.php:79 actions/editapplication.php:78
-#: actions/showapplication.php:94
+#: actions/showapplication.php:90
 msgid "You are not the owner of this application."
 msgstr "شما مالک این برنامه نیستید."
 
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
-#: actions/newapplication.php:112 actions/showapplication.php:118
-#: lib/action.php:1425
+#: actions/newapplication.php:112 actions/showapplication.php:113
+#: lib/action.php:1391
 msgid "There was a problem with your session token."
 msgstr "یک مشکل با رمز نشست شما وجود داشت."
 
@@ -1931,13 +2004,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting an application.
 #: actions/deleteapplication.php:161
 #, fuzzy
-msgid "Do not delete this application"
+msgid "Do not delete this application."
 msgstr "این برنامه حذف نشود"
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
 #: actions/deleteapplication.php:167
 #, fuzzy
-msgid "Delete this application"
+msgid "Delete this application."
 msgstr "این برنامه حذف شود"
 
 #. TRANS: Client error when trying to delete group while not logged in.
@@ -1995,13 +2068,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting a group.
 #: actions/deletegroup.php:224
 #, fuzzy
-msgid "Do not delete this group"
+msgid "Do not delete this group."
 msgstr "این پیام را پاک نکن"
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
 #: actions/deletegroup.php:231
 #, fuzzy
-msgid "Delete this group"
+msgid "Delete this group."
 msgstr "حذف این کاربر"
 
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
@@ -2009,14 +2082,16 @@ msgstr "حذف این کاربر"
 #. TRANS: Client error displayed when trying to mark a notice as favorite without being logged in.
 #. TRANS: Client error displayed trying to block a user from a group while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
+#. TRANS: Client error displayed trying to log out when not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
+#. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
 #. TRANS: Client error displayed when trying to change user options while not logged in.
 #: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
-#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:69
+#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:70
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
-#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
-#: actions/tagother.php:33 actions/unsubscribe.php:52
+#: actions/nudge.php:63 actions/pluginenable.php:97 actions/subedit.php:33
+#: actions/subscribe.php:98 actions/tagother.php:33 actions/unsubscribe.php:52
 #: lib/adminpanelaction.php:71 lib/profileformaction.php:63
 #: lib/settingsaction.php:72
 msgid "Not logged in."
@@ -2045,12 +2120,13 @@ msgstr "آیا اطمینان دارید که می‌خواهید این پیا
 #. TRANS: Submit button title for 'No' when deleting a notice.
 #: actions/deletenotice.php:159
 #, fuzzy
-msgid "Do not delete this notice"
+msgid "Do not delete this notice."
 msgstr "این پیام را پاک نکن"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:166 lib/noticelist.php:673
-msgid "Delete this notice"
+#: actions/deletenotice.php:166
+#, fuzzy
+msgid "Delete this notice."
 msgstr "این پیام را پاک کن"
 
 #. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
@@ -2087,18 +2163,17 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting a user.
 #: actions/deleteuser.php:158
 #, fuzzy
-msgid "Do not delete this user"
+msgid "Do not delete this user."
 msgstr "این پیام را پاک نکن"
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
-#. TRANS: Description of form for deleting a user.
-#: actions/deleteuser.php:165 lib/deleteuserform.php:75
-msgid "Delete this user"
+#: actions/deleteuser.php:165
+#, fuzzy
+msgid "Delete this user."
 msgstr "حذف این کاربر"
 
 #. TRANS: Message used as title for design settings for the site.
-#. TRANS: Link description in user account settings menu.
-#: actions/designadminpanel.php:60 lib/accountsettingsaction.php:134
+#: actions/designadminpanel.php:60 lib/settingsnav.php:97
 msgid "Design"
 msgstr "طرح"
 
@@ -2169,8 +2244,7 @@ msgstr ""
 "کنید."
 
 #. TRANS: Fieldset legend for theme background image.
-#. TRANS: Fieldset legend on profile design page.
-#: actions/designadminpanel.php:515 lib/designsettings.php:98
+#: actions/designadminpanel.php:515
 msgid "Change background image"
 msgstr "تغییر تصویر پیش‌زمینه"
 
@@ -2178,7 +2252,7 @@ msgstr "تغییر تصویر پیش‌زمینه"
 #. TRANS: Field label for background color selector.
 #. TRANS: Label on profile design page for setting a profile page background colour.
 #: actions/designadminpanel.php:525 actions/designadminpanel.php:609
-#: lib/designsettings.php:183
+#: lib/designform.php:238
 msgid "Background"
 msgstr "پیش‌زمینه"
 
@@ -2205,13 +2279,13 @@ msgstr "خاموش"
 #. TRANS: Form guide for turning background image on or off on theme designer page.
 #. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
 #. TRANS: use of the uploaded profile image.
-#: actions/designadminpanel.php:577 lib/designsettings.php:159
+#: actions/designadminpanel.php:577 lib/designform.php:214
 msgid "Turn background image on or off."
 msgstr "تصویر پیش‌زمینه را فعال یا غیرفعال کنید."
 
 #. TRANS: Checkbox label to title background image on theme designer page.
 #. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-#: actions/designadminpanel.php:583 lib/designsettings.php:165
+#: actions/designadminpanel.php:583 lib/designform.php:220
 msgid "Tile background image"
 msgstr "تصویر پیش‌زمینهٔ موزاییکی"
 
@@ -2223,25 +2297,25 @@ msgstr "تغییر رنگ‌ها"
 
 #. TRANS: Field label for content color selector.
 #. TRANS: Label on profile design page for setting a profile page content colour.
-#: actions/designadminpanel.php:623 lib/designsettings.php:197
+#: actions/designadminpanel.php:623 lib/designform.php:252
 msgid "Content"
 msgstr "محتوا"
 
 #. TRANS: Field label for sidebar color selector.
 #. TRANS: Label on profile design page for setting a profile page sidebar colour.
-#: actions/designadminpanel.php:637 lib/designsettings.php:211
+#: actions/designadminpanel.php:637 lib/designform.php:266
 msgid "Sidebar"
 msgstr "ستون کناری"
 
 #. TRANS: Field label for text color selector.
 #. TRANS: Label on profile design page for setting a profile page text colour.
-#: actions/designadminpanel.php:651 lib/designsettings.php:225
+#: actions/designadminpanel.php:651 lib/designform.php:280
 msgid "Text"
 msgstr "متن"
 
 #. TRANS: Field label for link color selector.
 #. TRANS: Label on profile design page for setting a profile page links colour.
-#: actions/designadminpanel.php:665 lib/designsettings.php:239
+#: actions/designadminpanel.php:665 lib/designform.php:294
 msgid "Links"
 msgstr "پیوندها"
 
@@ -2263,21 +2337,21 @@ msgid "Use defaults"
 msgstr "استفاده‌کردن از پیش‌فرض‌ها"
 
 #. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: actions/designadminpanel.php:720 lib/designsettings.php:259
-msgid "Restore default designs"
+#: actions/designadminpanel.php:720
+#, fuzzy
+msgid "Restore default designs."
 msgstr "بازگرداندن طرح‌های پیش‌فرض"
 
 #. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: actions/designadminpanel.php:728 lib/designsettings.php:267
-msgid "Reset back to default"
+#: actions/designadminpanel.php:728
+#, fuzzy
+msgid "Reset back to default."
 msgstr "برگشت به حالت پیش گزیده"
 
 #. TRANS: Title for button for saving theme settings.
-#. TRANS: Title for button on profile design page to save settings.
-#: actions/designadminpanel.php:736 lib/designsettings.php:272
-msgid "Save design"
+#: actions/designadminpanel.php:736
+#, fuzzy
+msgid "Save design."
 msgstr "ذخیره‌کردن طرح"
 
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
@@ -2309,7 +2383,7 @@ msgid "You must be logged in to edit an application."
 msgstr "برای ویرایش یک برنامه باید وارد شده باشید."
 
 #. TRANS: Client error displayed trying to edit an application that does not exist.
-#: actions/editapplication.php:83 actions/showapplication.php:87
+#: actions/editapplication.php:83 actions/showapplication.php:83
 msgid "No such application."
 msgstr "چنین برنامه‌ای وجود ندارد."
 
@@ -2404,80 +2478,53 @@ msgstr "ویرایش گروه %s"
 msgid "You must be logged in to create a group."
 msgstr "برای ساخت یک گروه، باید وارد شده باشید."
 
-#. TRANS: Client error displayed trying to edit a group while not being a group admin.
-#. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
-#. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
-#: actions/editgroup.php:110 actions/editgroup.php:176
-#: actions/groupdesignsettings.php:109 actions/grouplogo.php:111
-msgid "You must be an admin to edit the group."
-msgstr "برای ویرایش گروه باید یک مدیر باشید."
-
 #. TRANS: Form instructions for group edit form.
 #: actions/editgroup.php:161
 msgid "Use this form to edit the group."
 msgstr "از این روش برای ویرایش گروه استفاده کنید."
 
-#. TRANS: Group edit form validation error.
-#. TRANS: Group create form validation error.
-#. TRANS: %s is the invalid alias.
-#: actions/editgroup.php:241 actions/newgroup.php:188
-#, php-format
-msgid "Invalid alias: \"%s\""
-msgstr "نام‌مستعار غیر مجاز: «%s»"
-
-#. TRANS: Server error displayed when editing a group fails.
-#: actions/editgroup.php:274
-msgid "Could not update group."
-msgstr "نمی‌توان گروه را به‌هنگام‌سازی کرد."
-
-#. TRANS: Server error displayed when group aliases could not be added.
-#. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/editgroup.php:281 classes/User_group.php:540
-msgid "Could not create aliases."
-msgstr "نمی‌توان نام‌های مستعار را ساخت."
-
 #. TRANS: Group edit form success message.
 #: actions/editgroup.php:301
 msgid "Options saved."
 msgstr "گزینه‌ها ذخیره شدند."
 
 #. TRANS: Title for e-mail settings.
-#: actions/emailsettings.php:59
+#: actions/emailsettings.php:60
 msgid "Email settings"
 msgstr "تنظیمات پست الکترونیک"
 
 #. TRANS: E-mail settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/emailsettings.php:73
+#: actions/emailsettings.php:74
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 msgstr "چگونگی دریافت نامه از %%site.name%% را اداره کنید."
 
 #. TRANS: Form legend for e-mail settings form.
 #. TRANS: Field label for e-mail address input in e-mail settings form.
-#: actions/emailsettings.php:103 actions/emailsettings.php:129
+#: actions/emailsettings.php:104 actions/emailsettings.php:130
 msgid "Email address"
 msgstr "نشانی پست الکترونیک"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:109
+#: actions/emailsettings.php:110
 msgid "Current confirmed email address."
 msgstr "نشانی پست الکترونیکی تایید شدهٔ کنونی"
 
 #. TRANS: Button label to remove a confirmed e-mail address.
 #. TRANS: Button label for removing a set sender e-mail address to post notices from.
-#. TRANS: Button label to remove a confirmed Instant Messaging address.
+#. TRANS: Button label to remove a confirmed IM address.
 #. TRANS: Button label to remove a confirmed SMS address.
 #. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
-#: actions/emailsettings.php:112 actions/emailsettings.php:179
-#: actions/imsettings.php:112 actions/smssettings.php:120
-#: actions/smssettings.php:176
+#: actions/emailsettings.php:113 actions/emailsettings.php:180
+#: actions/imsettings.php:119 actions/smssettings.php:119
+#: actions/smssettings.php:175
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "حذف"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:119
+#: actions/emailsettings.php:120
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -2490,45 +2537,45 @@ msgstr ""
 #. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
 #. TRANS: Any other domain may be owned by a legitimate person or
 #. TRANS: organization.
-#: actions/emailsettings.php:136
+#: actions/emailsettings.php:137
 msgid "Email address, like \"UserName@example.org\""
 msgstr "نشانی پست الکترونیکی، مانند «UserName@example.org»"
 
 #. TRANS: Button label for adding an e-mail address in e-mail settings form.
-#. TRANS: Button label for adding an Instant Messaging address in Instant Messaging settings form.
+#. TRANS: Button label for adding an IM address in IM settings form.
 #. TRANS: Button label for adding a SMS phone number in SMS settings form.
-#: actions/emailsettings.php:140 actions/imsettings.php:147
-#: actions/smssettings.php:158
+#: actions/emailsettings.php:141 actions/imsettings.php:147
+#: actions/smssettings.php:157
 msgctxt "BUTTON"
 msgid "Add"
 msgstr "افزودن"
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:148 actions/smssettings.php:167
+#: actions/emailsettings.php:149 actions/smssettings.php:166
 msgid "Incoming email"
 msgstr "پست الکترونیک ورودی"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:154
+#: actions/emailsettings.php:155
 msgid "I want to post notices by email."
 msgstr "می‌خواهم با نامه پیام بفرستم."
 
 #. TRANS: Form instructions for incoming e-mail form in e-mail settings.
 #. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
-#: actions/emailsettings.php:176 actions/smssettings.php:174
+#: actions/emailsettings.php:177 actions/smssettings.php:173
 msgid "Send email to this address to post new notices."
 msgstr ""
 "برای فرستادن پیام با استفاده از پست الکترونیک به این نشانی نامه بفرستید."
 
 #. TRANS: Instructions for incoming e-mail address input form, when an address has already been assigned.
 #. TRANS: Instructions for incoming SMS e-mail address input form.
-#: actions/emailsettings.php:185 actions/smssettings.php:182
+#: actions/emailsettings.php:186 actions/smssettings.php:181
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr "نشانی جدید برای فرستادن پیام ایجاد کن؛ نشانی قبلی لغو می‌شود."
 
 #. TRANS: Instructions for incoming e-mail address input form.
-#: actions/emailsettings.php:189
+#: actions/emailsettings.php:190
 msgid ""
 "To send notices via email, we need to create a unique email address for you "
 "on this server:"
@@ -2536,91 +2583,91 @@ msgstr ""
 
 #. TRANS: Button label for adding an e-mail address to send notices from.
 #. TRANS: Button label for adding an SMS e-mail address to send notices from.
-#: actions/emailsettings.php:195 actions/smssettings.php:185
+#: actions/emailsettings.php:196 actions/smssettings.php:184
 msgctxt "BUTTON"
 msgid "New"
 msgstr "تازه"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:204
+#: actions/emailsettings.php:205
 msgid "Email preferences"
 msgstr "ترجیحات پست الکترونیکی"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:212
+#: actions/emailsettings.php:213
 msgid "Send me notices of new subscriptions through email."
 msgstr "پیام‌های کسانی را که به تازگی دنبال می‌کنم با پست الکترونیک برایم بفرست."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:218
+#: actions/emailsettings.php:219
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr ""
 "هرگاه کسی پیام من را به عنوان برگزیده اضافه کرد، به من نامه فرستاده شود."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:225
+#: actions/emailsettings.php:226
 msgid "Send me email when someone sends me a private message."
 msgstr "هر وقت کسی برای من پیام خصوصی فرستاد، مرا با پست الکترونیک با خبر کن."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:231
+#: actions/emailsettings.php:232
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr "هرگاه کسی به من یک «@-پاسخ» می‌فرستد، به من نامه بفرست."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:237
+#: actions/emailsettings.php:238
 msgid "Allow friends to nudge me and send me an email."
 msgstr ""
 "به دوستان اجازه داده شود که به من یادآوری کنند و یک نامه به من بفرستند."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:243
+#: actions/emailsettings.php:244
 msgid "Publish a MicroID for my email address."
 msgstr "یک شناسه برای پست الکترونیک  من منتشر کن."
 
 #. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:361
+#: actions/emailsettings.php:362
 msgid "Email preferences saved."
 msgstr "ترجیحات پست الکترونیکی ذخیره شد."
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:380
+#: actions/emailsettings.php:381
 msgid "No email address."
 msgstr "پست الکترونیک وجود ندارد."
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:388
+#: actions/emailsettings.php:389
 #, fuzzy
 msgid "Cannot normalize that email address."
 msgstr "نمی‌توان نشانی را قانونی کرد"
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:393 actions/register.php:212
+#: actions/emailsettings.php:394 actions/register.php:197
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "یک نشانی پست الکترونیکی معتبر نیست."
 
 #. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:397
+#: actions/emailsettings.php:398
 msgid "That is already your email address."
 msgstr "هم اکنون نشانی شما همین است."
 
 #. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:401
+#: actions/emailsettings.php:402
 msgid "That email address already belongs to another user."
 msgstr "این نشانی در حال حاضر متعلق به فرد دیگری است."
 
 #. TRANS: Server error thrown on database error adding e-mail confirmation code.
 #. TRANS: Server error thrown on database error adding Instant Messaging confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:418 actions/imsettings.php:343
-#: actions/smssettings.php:365
+#: actions/emailsettings.php:419 actions/imsettings.php:362
+#: actions/smssettings.php:364
 #, fuzzy
 msgid "Could not insert confirmation code."
 msgstr "نمی‌توان کد تایید را اضافه کرد."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:425
+#: actions/emailsettings.php:426
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
@@ -2631,59 +2678,62 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling Instant Messaging address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:445 actions/imsettings.php:377
-#: actions/smssettings.php:399
+#: actions/emailsettings.php:446 actions/imsettings.php:391
+#: actions/smssettings.php:398
 msgid "No pending confirmation to cancel."
 msgstr "هیچ تاییدی برای فسخ کردن وجود ندارد."
 
 #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:450
+#: actions/emailsettings.php:451
 msgid "That is the wrong email address."
 msgstr "این نشانی پست الکترونیکی نادرست است."
 
 #. TRANS: Server error thrown on database error canceling e-mail address confirmation.
 #. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
-#: actions/emailsettings.php:459 actions/smssettings.php:413
+#: actions/emailsettings.php:460 actions/smssettings.php:412
 #, fuzzy
 msgid "Could not delete email confirmation."
 msgstr "نمی‌توان تصدیق پست الکترونیک را پاک کرد."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:464
+#: actions/emailsettings.php:465
 msgid "Email confirmation cancelled."
 msgstr "تایید پست الکترونیکی لغو شد."
 
 #. TRANS: Message given trying to remove an e-mail address that is not
 #. TRANS: registered for the active user.
-#: actions/emailsettings.php:483
+#: actions/emailsettings.php:484
 msgid "That is not your email address."
 msgstr "آن نشانی شما نیست."
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:504
+#: actions/emailsettings.php:505
 msgid "The email address was removed."
 msgstr "نشانی پست الکترونیکی پاک شده است."
 
 #. TRANS: Form validation error displayed when trying to remove an incoming e-mail address while no address has been set.
-#: actions/emailsettings.php:518 actions/smssettings.php:555
+#: actions/emailsettings.php:519 actions/smssettings.php:554
 msgid "No incoming email address."
 msgstr "هیچ نشانی ورودی وجود ندارد."
 
 #. TRANS: Server error thrown on database error removing incoming e-mail address.
 #. TRANS: Server error thrown on database error adding incoming e-mail address.
-#: actions/emailsettings.php:530 actions/emailsettings.php:554
-#: actions/smssettings.php:565 actions/smssettings.php:588
+#. TRANS: Server error displayed when the user could not be updated in SMS settings.
+#: actions/emailsettings.php:531 actions/emailsettings.php:555
+#: actions/smssettings.php:565 actions/smssettings.php:590
 #, fuzzy
 msgid "Could not update user record."
 msgstr "نمی‌توان اطلاعات کاربر را به روز کرد."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:534 actions/smssettings.php:568
+#. TRANS: Confirmation text after updating SMS settings.
+#: actions/emailsettings.php:535 actions/smssettings.php:569
 msgid "Incoming email address removed."
 msgstr "نشانی ورودی پاک شد."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:558 actions/smssettings.php:591
+#. TRANS: Confirmation text after updating SMS settings.
+#: actions/emailsettings.php:559 actions/smssettings.php:594
 msgid "New incoming email address added."
 msgstr "نشانی ورودی جدید اضافه شد."
 
@@ -2695,7 +2745,7 @@ msgstr "این پیام ازقبل برگزیده شده است!"
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
 #: actions/favor.php:95
 #, fuzzy
-msgid "Disfavor favorite"
+msgid "Disfavor favorite."
 msgstr "خارج‌کردن از برگزیده‌ها"
 
 #. TRANS: Page title for first page of favorited notices.
@@ -2748,9 +2798,8 @@ msgstr ""
 #. TRANS: %s is a user's nickname.
 #. TRANS: Title for first page of favourite notices of a user.
 #. TRANS: %s is the user for whom the favourite notices are displayed.
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing own favourited notices.
 #: actions/favoritesrss.php:111 actions/showfavorites.php:76
-#: lib/personalgroupnav.php:122
+#: lib/personalgroupnav.php:110
 #, php-format
 msgid "%s's favorite notices"
 msgstr "پیام‌های برگزیدهٔ %s"
@@ -2937,13 +2986,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
 #: actions/groupblock.php:191
 #, fuzzy
-msgid "Do not block this user from this group"
+msgid "Do not block this user from this group."
 msgstr "دسترسی کاربر به گروه مسدود نشود"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
 #: actions/groupblock.php:198
 #, fuzzy
-msgid "Block this user from this group"
+msgid "Block this user from this group."
 msgstr "دسترسی کاربر به گروه مسدود شود"
 
 #. TRANS: Server error displayed when trying to block a user from a group fails because of an application error.
@@ -2952,6 +3001,7 @@ msgid "Database error blocking user from group."
 msgstr "اشکال پایگاه داده در مسدود کردن کاربر"
 
 #. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
+#. TRANS: Client error displayed trying to find a user by ID without providing an ID.
 #: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr "هیچ ID وجود ندارد."
@@ -2980,7 +3030,7 @@ msgid "Unable to update your design settings."
 msgstr "نمی‌توان تنظیمات طرح‌تان را ذخیره کرد."
 
 #. TRANS: Form text to confirm saved group design settings.
-#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:222
+#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:239
 msgid "Design preferences saved."
 msgstr "ترجیحات طرح ذخیره شد."
 
@@ -3043,7 +3093,7 @@ msgid "A list of the users in this group."
 msgstr "یک فهرست از کاربران در این گروه"
 
 #. TRANS: Indicator in group members list that this user is a group administrator.
-#: actions/groupmembers.php:190
+#: actions/groupmembers.php:190 lib/action.php:581
 msgid "Admin"
 msgstr "مدیر"
 
@@ -3136,8 +3186,10 @@ msgid "Group search"
 msgstr "جست‌وجوی گروه"
 
 #. TRANS: Text on page where groups can be searched if no results were found for a query.
-#: actions/groupsearch.php:82 actions/noticesearch.php:117
-#: actions/peoplesearch.php:83
+#. TRANS: Text for notice search results is the query had no results.
+#. TRANS: Message on the "People search" page where a query has no results.
+#: actions/groupsearch.php:82 actions/noticesearch.php:122
+#: actions/peoplesearch.php:87
 msgid "No results."
 msgstr "نتیجه‌ای وجود ندارد."
 
@@ -3174,165 +3226,168 @@ msgid "User is not blocked from group."
 msgstr "کاربر از گروه منع نشده است."
 
 #. TRANS: Server error displayed when unblocking a user from a group fails because of an unknown error.
+#. TRANS: Server error displayed when removing a user block.
 #: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "اشکال در پاکسازی"
 
 #. TRANS: Title for Instant Messaging settings.
-#: actions/imsettings.php:58
+#: actions/imsettings.php:56
 msgid "IM settings"
 msgstr "تنظیمات پیام‌رسان فوری"
 
 #. 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.
-#: actions/imsettings.php:71
+#: actions/imsettings.php:69
 #, fuzzy, php-format
 msgid ""
-"You can send and receive notices through Jabber/Google Talk [instant "
-"messages](%%doc.im%%). Configure your address and settings below."
+"You can send and receive notices through instant messaging [instant messages]"
+"(%%doc.im%%). Configure your addresses and settings below."
 msgstr ""
 "شما می‌توانید پیام‌های خود را با استفاده از [پیام‌رسان‌های](%%doc.im%%) Jabber "
 "یا Gtalk ارسال/دریافت کنید. نشانی خود را در این قسمت تنظیم کنید"
 
-#. TRANS: Message given in the Instant Messaging settings if XMPP is not enabled on the site.
+#. TRANS: Message given in the IM settings if IM is not enabled on the site.
 #: actions/imsettings.php:90
 msgid "IM is not available."
 msgstr "پیام‌رسان فوری در دسترس نیست."
 
-#. TRANS: Form legend for Instant Messaging settings form.
-#. TRANS: Field label for Instant Messaging address input in Instant Messaging settings form.
-#: actions/imsettings.php:102 actions/imsettings.php:132
-msgid "IM address"
-msgstr "نشانی پیام‌رسان فوری"
+#: actions/imsettings.php:116
+#, fuzzy, php-format
+msgid "Current confirmed %s address."
+msgstr "نشانی پست الکترونیکی تایید شدهٔ کنونی"
 
-#: actions/imsettings.php:109
-#, fuzzy
-msgid "Current confirmed Jabber/Google Talk address."
-msgstr "نشانی Jabber/GTalk تایید شده کنونی"
-
-#. TRANS: Form note in Instant Messaging settings form.
-#. TRANS: %s is the Instant Messaging address set for the site.
-#: actions/imsettings.php:120
+#. TRANS: Form note in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:128
 #, fuzzy, php-format
 msgid ""
-"Awaiting confirmation on this address. Check your Jabber/Google Talk account "
-"for a message with further instructions. (Did you add %s to your buddy list?)"
+"Awaiting confirmation on this address. Check your %s account for a message "
+"with further instructions. (Did you add %s to your buddy list?)"
 msgstr ""
 "منتظر تایید این نشانی هستیم. لطفا Jabber/Gtalk خود را برای دریافت توضیحات "
 "بیش‌تر بررسی کنید. (آیا %s را به فهرست خود اضافه کرده اید؟) "
 
-#. TRANS: IM address input field instructions in Instant Messaging settings form.
-#. TRANS: %s is the Instant Messaging address set for the site.
-#. TRANS: Do not translate "example.org". It is one of the domain names reserved for use in examples by
-#. TRANS: http://www.rfc-editor.org/rfc/rfc2606.txt. Any other domain may be owned by a legitimate
-#. TRANS: person or organization.
-#: actions/imsettings.php:139
-#, fuzzy, php-format
-msgid ""
-"Jabber or Google Talk address, like \"UserName@example.org\". First, make "
-"sure to add %s to your buddy list in your IM client or on Google Talk."
-msgstr ""
-"نشانی Jabber یا GTalk، مانند «UserName@example.org». ابتدا از اضافه کردن %s "
-"به فهرست دوستان خود در کارگیر پیام‌رسان فوری‌تان یا در GTalk مطمئن شوید."
+#: actions/imsettings.php:140
+msgid "IM address"
+msgstr "نشانی پیام‌رسان فوری"
 
-#. TRANS: Form legend for Instant Messaging preferences form.
-#: actions/imsettings.php:154
-msgid "IM preferences"
+#: actions/imsettings.php:142
+#, php-format
+msgid "%s screenname."
+msgstr ""
+
+#. TRANS: Header for IM preferences form.
+#: actions/imsettings.php:163
+#, fuzzy
+msgid "IM Preferences"
 msgstr "ترجیحات پیام‌رسان فوری"
 
-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:159
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:174
 #, fuzzy
-msgid "Send me notices through Jabber/Google Talk."
-msgstr "پیام‌ها را از راه Jabber/GTalk برای من بفرست."
+msgid "Send me notices"
+msgstr "فرستادن یک پیام"
 
-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:165
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:176
 #, fuzzy
-msgid "Post a notice when my Jabber/Google Talk status changes."
+msgid "Post a notice when my status changes."
 msgstr "هر وقت که وضعیت Jabber/Gtalk من تغییر کرد، یک پیام بفرست."
 
-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:171
-#, fuzzy
-msgid ""
-"Send me replies through Jabber/Google Talk from people I'm not subscribed to."
-msgstr "پاسخ کسانی که من آن‌ها را دنبال نمی‌کنم را با Jabber/Gtalk برایم بفرست."
-
-#. TRANS: Checkbox label in Instant Messaging preferences form.
+#. TRANS: Checkbox label in IM preferences form.
 #: actions/imsettings.php:178
 #, fuzzy
-msgid "Publish a MicroID for my Jabber/Google Talk address."
-msgstr "یک شناسهٔ کوچک برای Jabber/Gtalk من منتشر کن."
+msgid "Send me replies from people I'm not subscribed to."
+msgstr "پاسخ کسانی که من آن‌ها را دنبال نمی‌کنم را با Jabber/Gtalk برایم بفرست."
 
-#. TRANS: Confirmation message for successful Instant Messaging preferences save.
-#: actions/imsettings.php:283 actions/othersettings.php:192
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:181
+#, fuzzy
+msgid "Publish a MicroID"
+msgstr "یک شناسه برای پست الکترونیک  من منتشر کن."
+
+#. TRANS: Server error thrown on database error updating IM preferences.
+#: actions/imsettings.php:291
+#, fuzzy
+msgid "Couldn't update IM preferences."
+msgstr "نمی‌توان کاربر را به‌هنگام‌سازی کرد."
+
+#. TRANS: Confirmation message for successful IM preferences save.
+#. TRANS: Confirmation message after saving preferences.
+#: actions/imsettings.php:298 actions/urlsettings.php:244
 msgid "Preferences saved."
 msgstr "تنظیمات ذخیره شد."
 
-#. TRANS: Message given saving Instant Messaging address without having provided one.
-#: actions/imsettings.php:304
-msgid "No Jabber ID."
-msgstr "هیچ شناسهٔ Jabber ای وجود ندارد."
-
-#. TRANS: Message given saving Instant Messaging address that cannot be normalised.
-#: actions/imsettings.php:312
+#. TRANS: Message given saving IM address without having provided one.
+#: actions/imsettings.php:320
 #, fuzzy
-msgid "Cannot normalize that Jabber ID."
+msgid "No screenname."
+msgstr "لقبی وجود ندارد."
+
+#: actions/imsettings.php:325
+#, fuzzy
+msgid "No transport."
+msgstr "هیچ پیامی وجود ندارد."
+
+#. TRANS: Message given saving IM address that cannot be normalised.
+#: actions/imsettings.php:333
+#, fuzzy
+msgid "Cannot normalize that screenname"
 msgstr "نمی‌توان شناسهٔ Jabber را تایید کرد"
 
-#. TRANS: Message given saving Instant Messaging address that not valid.
-#: actions/imsettings.php:317
+#. TRANS: Message given saving IM address that not valid.
+#: actions/imsettings.php:340
 #, fuzzy
-msgid "Not a valid Jabber ID."
-msgstr "شناسهٔ Jabber درست نیست"
+msgid "Not a valid screenname"
+msgstr "لقب نا معتبر."
 
-#. TRANS: Message given saving Instant Messaging address that is already set.
-#: actions/imsettings.php:321
-msgid "That is already your Jabber ID."
-msgstr "این شناسه Jabber کنونی شماست."
-
-#. TRANS: Message given saving Instant Messaging address that is already set for another user.
-#: actions/imsettings.php:325
-msgid "Jabber ID already belongs to another user."
+#. TRANS: Message given saving IM address that is already set for another user.
+#: actions/imsettings.php:344
+#, fuzzy
+msgid "Screenname already belongs to another user."
 msgstr "شناسهٔ Jabber به یک کاربر دیگر مربوط است."
 
-#. TRANS: Message given saving valid Instant Messaging address that is to be confirmed.
-#. TRANS: %s is the Instant Messaging address set for the site.
-#: actions/imsettings.php:353
-#, php-format
-msgid ""
-"A confirmation code was sent to the IM address you added. You must approve %"
-"s for sending messages to you."
+#. TRANS: Message given saving valid IM address that is to be confirmed.
+#: actions/imsettings.php:369
+#, fuzzy
+msgid "A confirmation code was sent to the IM address you added."
 msgstr ""
 "یک کد تایید به نشانی پیام‌رسانی که اضافه کرده‌اید، فرستاده شد. شما باید %s را "
 "برای فرستادن پیام به شما، تایید کنید."
 
-#. TRANS: Message given canceling Instant Messaging address confirmation for the wrong IM address.
-#: actions/imsettings.php:382
+#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#: actions/imsettings.php:396
 msgid "That is the wrong IM address."
 msgstr "نشانی پیام رسان اشتباه است."
 
-#. TRANS: Server error thrown on database error canceling Instant Messaging address confirmation.
-#: actions/imsettings.php:391
+#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#: actions/imsettings.php:405
 #, fuzzy
-msgid "Could not delete IM confirmation."
+msgid "Couldn't delete confirmation."
 msgstr "نمی‌توان تایید پیام‌رسان فوری را پاک کرد."
 
-#. TRANS: Message given after successfully canceling Instant Messaging address confirmation.
-#: actions/imsettings.php:396
+#. TRANS: Message given after successfully canceling IM address confirmation.
+#: actions/imsettings.php:410
 msgid "IM confirmation cancelled."
 msgstr "تایید پیام‌رسان فوری لغو شد."
 
-#. TRANS: Message given trying to remove an Instant Messaging address that is not
+#. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.
-#: actions/imsettings.php:417
-msgid "That is not your Jabber ID."
-msgstr "این شناسهٔ Jabber شما نیست."
+#: actions/imsettings.php:434
+#, fuzzy
+msgid "That is not your screenname."
+msgstr "این شمارهٔ تلفن شما نیست."
+
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#: actions/imsettings.php:443
+#, fuzzy
+msgid "Couldn't update user im prefs."
+msgstr "نمی‌توان اطلاعات کاربر را به روز کرد."
 
 #. TRANS: Message given after successfully removing a registered Instant Messaging address.
-#: actions/imsettings.php:440
+#: actions/imsettings.php:451
 msgid "The IM address was removed."
 msgstr "نشانی پیام‌رسان فوری پاک شده است."
 
@@ -3543,7 +3598,7 @@ msgid "You must be logged in to join a group."
 msgstr "برای پیوستن به یک گروه، باید وارد شده باشید."
 
 #. TRANS: Title for join group page after joining.
-#: actions/joingroup.php:147
+#: actions/joingroup.php:148
 #, fuzzy, php-format
 msgctxt "TITLE"
 msgid "%1$s joined group %2$s"
@@ -3671,7 +3726,7 @@ msgstr ""
 #. TRANS: Submit button title.
 #: actions/licenseadminpanel.php:311 actions/sessionsadminpanel.php:199
 #: actions/siteadminpanel.php:292 actions/snapshotadminpanel.php:245
-#: actions/tagother.php:154 lib/applicationeditform.php:357
+#: actions/tagother.php:133 lib/applicationeditform.php:357
 msgid "Save"
 msgstr "ذخیره‌کردن"
 
@@ -3679,39 +3734,41 @@ msgstr "ذخیره‌کردن"
 msgid "Save license settings"
 msgstr ""
 
-#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
+#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
+#: actions/login.php:97 actions/otp.php:62 actions/register.php:130
 msgid "Already logged in."
 msgstr "قبلا وارد شده"
 
-#: actions/login.php:148
+#: actions/login.php:125
 msgid "Incorrect username or password."
 msgstr "نام کاربری یا گذرواژه نادرست است."
 
-#: actions/login.php:154 actions/otp.php:120
+#. TRANS: Server error displayed when a user object could not be created trying to login using "one time password login".
+#: actions/login.php:131 actions/otp.php:127
 msgid "Error setting user. You are probably not authorized."
 msgstr "خطا در تنظیم کاربر. شما احتمالا اجازهٔ این کار را ندارید."
 
-#: actions/login.php:210 actions/login.php:263
+#: actions/login.php:185 actions/login.php:236 lib/action.php:598
 msgid "Login"
 msgstr "ورود"
 
-#: actions/login.php:249
+#: actions/login.php:222
 msgid "Login to site"
 msgstr "ورود به وب‌گاه"
 
-#: actions/login.php:258 actions/register.php:490
+#: actions/login.php:231 actions/register.php:469
 msgid "Remember me"
 msgstr "مرا به یاد بسپار"
 
-#: actions/login.php:259 actions/register.php:492
+#: actions/login.php:232 actions/register.php:471
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "وارد شدن خودکار. نه برای کامپیوترهای مشترک!"
 
-#: actions/login.php:269
+#: actions/login.php:241
 msgid "Lost or forgotten password?"
 msgstr "گذرواژهٔ خود را گم یا فراموش کرده‌اید؟"
 
-#: actions/login.php:288
+#: actions/login.php:259
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -3719,11 +3776,11 @@ msgstr ""
 "به دلایل امنیتی، لطفا نام کاربری و گذرواژهٔ خود را قبل از تغییر تنظیمات "
 "دوباره وارد نمایید."
 
-#: actions/login.php:292
+#: actions/login.php:263
 msgid "Login with your username and password."
 msgstr "با نام‌کاربری و گذرواژه‌تان وارد شوید."
 
-#: actions/login.php:295
+#: actions/login.php:266
 #, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -3850,7 +3907,9 @@ msgstr "پیام جدید"
 msgid "Notice posted"
 msgstr "پیام فرستاده‌شد."
 
-#: actions/noticesearch.php:68
+#. TRANS: Instructions for Notice search page.
+#. TRANS: %%site.name%% is the name of the StatusNet site.
+#: actions/noticesearch.php:69
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -3859,16 +3918,21 @@ msgstr ""
 "برای جست‌وجوی پیام‌ها در %%site.name%% از محتوایشان استفاده کنید. عبارت‌ها را "
 "با فاصله جدا کنید؛ آن‌ها باید ۳ نویسه یا بیش‌تر باشند."
 
-#: actions/noticesearch.php:78
+#. TRANS: Title of the page where users can search for notices.
+#: actions/noticesearch.php:80
 msgid "Text search"
 msgstr "جست‌وجوی متن"
 
-#: actions/noticesearch.php:91
+#. TRANS: Test in RSS notice search.
+#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
+#: actions/noticesearch.php:95
 #, php-format
 msgid "Search results for \"%1$s\" on %2$s"
 msgstr "پیام از %1$s در %2$s"
 
-#: actions/noticesearch.php:121
+#. TRANS: Text for logged in users making a query for notices without results.
+#. TRANS: This message contains a Markdown link.
+#: actions/noticesearch.php:128
 #, php-format
 msgid ""
 "Be the first to [post on this topic](%%%%action.newnotice%%%%?"
@@ -3877,7 +3941,9 @@ msgstr ""
 "اولین کسی باشید که در [این موضوع](%%%%action.newnotice%%%%?status_textarea=%"
 "s) پیام می‌فرستد."
 
-#: actions/noticesearch.php:124
+#. TRANS: Text for not logged in users making a query for notices without results.
+#. TRANS: This message contains Markdown links.
+#: actions/noticesearch.php:133
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and be the first to "
@@ -3886,14 +3952,17 @@ msgstr ""
 "چرا [ثبت نام](%%%%action.register%%%%) نمی‌کنید و اولین پیام را در [این موضوع]"
 "(%%%%action.newnotice%%%%?status_textarea=%s) نمی‌فرستید!"
 
-#: actions/noticesearchrss.php:96
+#. TRANS: RSS notice search feed title. %s is the query.
+#: actions/noticesearchrss.php:95
 #, php-format
 msgid "Updates with \"%s\""
 msgstr "پیام‌های با %s"
 
-#: actions/noticesearchrss.php:98
+#. TRANS: RSS notice search feed description.
+#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
+#: actions/noticesearchrss.php:99
 #, fuzzy, php-format
-msgid "Updates matching search term \"%1$s\" on %2$s!"
+msgid "Updates matching search term \"%1$s\" on %2$s."
 msgstr "پیام‌هایی که با جست‌و‌جوی عبارت »%1$s« در %s یافت شدند."
 
 #: actions/nudge.php:85
@@ -3914,51 +3983,51 @@ msgid "Nudge sent!"
 msgstr "یادآوری فرستاده‌شد!"
 
 #. TRANS: Message displayed to an anonymous user trying to view OAuth application list.
-#: actions/oauthappssettings.php:60
+#: actions/oauthappssettings.php:57
 msgid "You must be logged in to list your applications."
 msgstr "برای فهرست‌کردن برنامه‌هایتان باید وارد شده باشید."
 
 #. TRANS: Page title for OAuth applications
-#: actions/oauthappssettings.php:76
+#: actions/oauthappssettings.php:73
 msgid "OAuth applications"
 msgstr "برنامه‌های OAuth"
 
 #. TRANS: Page instructions for OAuth applications
-#: actions/oauthappssettings.php:88
+#: actions/oauthappssettings.php:85
 msgid "Applications you have registered"
 msgstr "برنامه‌هایی که ثبت کرده‌اید"
 
 #. TRANS: Empty list message on page with OAuth applications.
-#: actions/oauthappssettings.php:141
+#: actions/oauthappssettings.php:138
 #, php-format
 msgid "You have not registered any applications yet."
 msgstr "شما هنوز هیچ برنامه‌ای را ثبت نکرده‌اید."
 
 #. TRANS: Title for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:71
+#: actions/oauthconnectionssettings.php:69
 msgid "Connected applications"
 msgstr "برنامه‌های وصل‌شده"
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:83
+#: actions/oauthconnectionssettings.php:80
 msgid "The following connections exist for your account."
 msgstr ""
 
 #. TRANS: Client error when trying to revoke access for an application while not being a user of it.
-#: actions/oauthconnectionssettings.php:168
+#: actions/oauthconnectionssettings.php:165
 msgid "You are not a user of that application."
 msgstr "شما یک کاربر این برنامه نیستید."
 
 #. TRANS: Client error when revoking access has failed for some reason.
 #. TRANS: %s is the application ID revoking access failed for.
-#: actions/oauthconnectionssettings.php:183
+#: actions/oauthconnectionssettings.php:180
 #, fuzzy, php-format
 msgid "Unable to revoke access for application: %s."
 msgstr "نمی‌توان دسترسی را برای برنامهٔ %s لغو کرد."
 
 #. TRANS: Success message after revoking access for an application.
 #. TRANS: %1$s is the application name, %2$s is the first part of the user token.
-#: actions/oauthconnectionssettings.php:202
+#: actions/oauthconnectionssettings.php:199
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -3966,20 +4035,30 @@ msgid ""
 msgstr ""
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:213
+#: actions/oauthconnectionssettings.php:210
 msgid "You have not authorized any applications to use your account."
 msgstr "شما به هیچ برنامه‌ای اجازه نداده‌اید که از حساب‌تان استفاده کند."
 
 #. TRANS: Note for developers in the OAuth connection settings form.
 #. TRANS: This message contains a Markdown link. Do not separate "](".
 #. TRANS: %s is the URL to the OAuth settings.
-#: actions/oauthconnectionssettings.php:233
+#: actions/oauthconnectionssettings.php:230
 #, php-format
 msgid ""
 "Are you a developer? [Register an OAuth client application](%s) to use with "
 "this instance of StatusNet."
 msgstr ""
 
+#: actions/oembed.php:64
+#, fuzzy, php-format
+msgid "\"%s\" not found."
+msgstr "رابط مورد نظر پیدا نشد."
+
+#: actions/oembed.php:76
+#, fuzzy, php-format
+msgid "Notice %s not found."
+msgstr "رابط مورد نظر پیدا نشد."
+
 #: actions/oembed.php:80 actions/shownotice.php:100
 msgid "Notice has no profile."
 msgstr "این پیام نمایه‌ای ندارد."
@@ -3989,6 +4068,16 @@ msgstr "این پیام نمایه‌ای ندارد."
 msgid "%1$s's status on %2$s"
 msgstr "وضعیت %1$s در %2$s"
 
+#: actions/oembed.php:95
+#, fuzzy, php-format
+msgid "Attachment %s not found."
+msgstr "کاربر گیرنده یافت نشد."
+
+#: actions/oembed.php:136
+#, php-format
+msgid "\"%s\" not supported for oembed requests."
+msgstr ""
+
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
 #: actions/oembed.php:168
 #, php-format
@@ -4002,94 +4091,60 @@ msgid "Only %s URLs over plain HTTP please."
 msgstr "لطفا تنها از نشانی‌های اینترنتی %s از راه HTTP ساده استفاده کنید."
 
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1205
-#: lib/apiaction.php:1232 lib/apiaction.php:1367
+#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1207
+#: lib/apiaction.php:1234 lib/apiaction.php:1369
 msgid "Not a supported data format."
 msgstr "یک قالب دادهٔ پشتیبانی‌شده نیست."
 
+#. TRANS: ShortName in the OpenSearch interface when trying to find users.
 #: actions/opensearch.php:64
 msgid "People Search"
 msgstr "جست‌وجوی کاربران"
 
-#: actions/opensearch.php:67
+#: actions/opensearch.php:68
 msgid "Notice Search"
 msgstr "جست‌وجوی پیام‌ها"
 
-#: actions/othersettings.php:59
-msgid "Other settings"
-msgstr "تنظیمات دیگر"
-
-#. TRANS: Instructions for tab "Other" in user profile settings.
-#: actions/othersettings.php:71
-msgid "Manage various other options."
-msgstr "مدیریت انتخاب های مختلف دیگر."
-
-#. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
-#. TRANS: user's profile settings. Use of "free" is as in "open", indicating that the
-#. TRANS: information on the shortener site is freely distributable.
-#. TRANS: This message has one space at the beginning. Use your language's word separator
-#. TRANS: here if it has one (most likely a single space).
-#: actions/othersettings.php:113
-msgid " (free service)"
-msgstr " (سرویس‌ آزاد)"
-
-#. TRANS: Label for dropdown with URL shortener services.
-#: actions/othersettings.php:122
-msgid "Shorten URLs with"
-msgstr "کوتاه‌کردن نشانی‌های اینترنتی با"
-
-#. TRANS: Tooltip for for dropdown with URL shortener services.
-#: actions/othersettings.php:124
-msgid "Automatic shortening service to use."
-msgstr "کوتاه‌کنندهٔ نشانی مورد استفاده."
-
-#. TRANS: Label for checkbox.
-#: actions/othersettings.php:130
-msgid "View profile designs"
-msgstr "نمایش طراحی‌های نمایه"
-
-#. TRANS: Tooltip for checkbox.
-#: actions/othersettings.php:132
-msgid "Show or hide profile designs."
-msgstr "نمایش دادن یا پنهان کردن طراحی‌های نمایه."
-
-#. TRANS: Form validation error for form "Other settings" in user profile.
-#: actions/othersettings.php:164
-#, fuzzy
-msgid "URL shortening service is too long (maximum 50 characters)."
-msgstr "کوتاه کنندهٔ نشانی بسیار طولانی است (بیش‌تر از ۵۰ حرف)."
-
-#: actions/otp.php:69
+#. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
+#: actions/otp.php:70
 msgid "No user ID specified."
 msgstr "هیچ شناسهٔ کاربری مشخص نشده است."
 
-#: actions/otp.php:83
+#. TRANS: Client error displayed trying to use "one time password login" without specifying a login token.
+#: actions/otp.php:86
 msgid "No login token specified."
 msgstr "هیچ رمز ورودی مشخص نشده است."
 
-#: actions/otp.php:90
+#. TRANS: Client error displayed trying to use "one time password login" without requesting a login token.
+#: actions/otp.php:94
 msgid "No login token requested."
 msgstr "هیچ رمز ورودی درخواست نشده است."
 
-#: actions/otp.php:95
+#. TRANS: Client error displayed trying to use "one time password login" while specifying an invalid login token.
+#: actions/otp.php:100
 msgid "Invalid login token specified."
 msgstr "رمز ورود مشخص شده نامعتبر است."
 
-#: actions/otp.php:104
+#. TRANS: Client error displayed trying to use "one time password login" while specifying an expired login token.
+#: actions/otp.php:110
 msgid "Login token expired."
 msgstr "رمز ورود منسوخ شده است."
 
-#: actions/outbox.php:58
+#. TRANS: Title for outbox for any but the fist page.
+#. TRANS: %1$s is the user nickname, %2$d is the page number.
+#: actions/outbox.php:57
 #, php-format
 msgid "Outbox for %1$s - page %2$d"
 msgstr "صندوق خروجی %1$s - صفحهٔ %2$d"
 
+#. TRANS: Title for first page of outbox.
 #: actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
 msgstr "فرستاده‌های %s"
 
-#: actions/outbox.php:104
+#. TRANS: Instructions for outbox.
+#: actions/outbox.php:103
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr ""
 "این صندوق خروجی شماست، که پیام‌های خصوصی فرستاده شده به وسیلهٔ شما را فهرست "
@@ -4117,43 +4172,45 @@ msgstr "گذرواژهٔ پیشین"
 msgid "New password"
 msgstr "گذرواژهٔ تازه"
 
-#: actions/passwordsettings.php:109
+#: actions/passwordsettings.php:109 actions/register.php:416
 #, fuzzy
-msgid "6 or more characters"
+msgid "6 or more characters."
 msgstr "۶ نویسه یا بیش‌تر"
 
-#: actions/passwordsettings.php:113
+#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#: actions/passwordsettings.php:113 actions/recoverpassword.php:264
+#: actions/register.php:420
 #, fuzzy
-msgid "Same as password above"
+msgid "Same as password above."
 msgstr "مانند گذرواژهٔ بالا"
 
 #: actions/passwordsettings.php:117
 msgid "Change"
 msgstr "تغییر"
 
-#: actions/passwordsettings.php:154 actions/register.php:238
+#: actions/passwordsettings.php:153 actions/register.php:223
 msgid "Password must be 6 or more characters."
 msgstr "گذرواژه باید ۶ نویسه یا بیش‌تر باشد."
 
-#: actions/passwordsettings.php:157 actions/register.php:241
+#: actions/passwordsettings.php:156 actions/register.php:226
 msgid "Passwords don't match."
 msgstr "گذرواژه‌ها مطابقت ندارند."
 
-#: actions/passwordsettings.php:165
+#: actions/passwordsettings.php:164
 msgid "Incorrect old password"
 msgstr "گذرواژه پیشین اشتباه است"
 
-#: actions/passwordsettings.php:181
+#: actions/passwordsettings.php:180
 msgid "Error saving user; invalid."
 msgstr "هنگام ذخیرهٔ کاربر خطا رخ داد؛ نامعتبر است."
 
-#: actions/passwordsettings.php:186
+#. TRANS: Reset password form validation error message.
+#: actions/passwordsettings.php:185 actions/recoverpassword.php:418
 #, fuzzy
-msgid "Can't save new password."
+msgid "Cannot save new password."
 msgstr "نمی‌توان گذرواژهٔ جدید را ذخیره کرد."
 
-#. TRANS: Title for password recovery page in password saved mode.
-#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
+#: actions/passwordsettings.php:191
 msgid "Password saved."
 msgstr "گذرواژه ذخیره شد."
 
@@ -4370,8 +4427,7 @@ msgid "Directory where backgrounds are located."
 msgstr "مسیر پوشه برای زبان‌های محلی"
 
 #. TRANS: Fieldset legens in Paths admin panel.
-#. TRANS: DT element label in attachment list.
-#: actions/pathsadminpanel.php:419 lib/attachmentlist.php:98
+#: actions/pathsadminpanel.php:419
 msgid "Attachments"
 msgstr "ضمائم"
 
@@ -4445,7 +4501,9 @@ msgstr "کارگزار برای هدایت درخواست‌های SSL به"
 msgid "Save paths"
 msgstr "نشانی ذخیره سازی"
 
-#: actions/peoplesearch.php:52
+#. TRANS: Instructions for the "People search" page.
+#. TRANS: %%site.name%% is the name of the StatusNet site.
+#: actions/peoplesearch.php:54
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
@@ -4454,7 +4512,8 @@ msgstr ""
 "برای جست‌وجوی افراد در %%site.name%% از نام، مکان یا توصیف‌شان استفاده کنید. "
 "عبارت‌ها را با فاصله جدا کنید؛ آن‌ها باید ۳ نویسه یا بیش‌تر باشند."
 
-#: actions/peoplesearch.php:58
+#. TRANS: Title of a page where users can search for other users.
+#: actions/peoplesearch.php:61
 msgid "People search"
 msgstr "جست‌وجوی کاربران"
 
@@ -4468,6 +4527,60 @@ msgstr "یک برچسب کاربری معتبر نیست: %s."
 msgid "Users self-tagged with %1$s - page %2$d"
 msgstr "کاربران خود برچسب‌گذاری شده با %1$s - صفحهٔ %2$d"
 
+#. TRANS: Page title for AJAX form return when a disabling a plugin.
+#: actions/plugindisable.php:69
+msgctxt "plugin"
+msgid "Disabled"
+msgstr ""
+
+#. TRANS: Client error displayed trying to perform any request method other than POST.
+#. TRANS: Do not translate POST.
+#: actions/pluginenable.php:78 actions/subscribe.php:77
+msgid "This action only accepts POST requests."
+msgstr "این عمل تنها درخواست‌های POST را می‌پذیرد."
+
+#: actions/pluginenable.php:102
+#, fuzzy
+msgid "You cannot administer plugins."
+msgstr "شما نمی‌توانید کاربران را پاک کنید."
+
+#: actions/pluginenable.php:109
+#, fuzzy
+msgid "No such plugin."
+msgstr "چنین صفحه‌ای وجود ندارد."
+
+#. TRANS: Page title for AJAX form return when enabling a plugin.
+#: actions/pluginenable.php:159
+msgctxt "plugin"
+msgid "Enabled"
+msgstr ""
+
+#. TRANS: Tab and title for plugins admin panel.
+#. TRANS: Menu item for site administration
+#: actions/pluginsadminpanel.php:56 actions/version.php:191
+#: lib/adminpanelaction.php:411
+msgid "Plugins"
+msgstr "افزونه‌ها"
+
+#. TRANS: Instructions at top of plugin admin page.
+#: actions/pluginsadminpanel.php:68
+msgid ""
+"Additional plugins can be enabled and configured manually. See the <a href="
+"\"http://status.net/wiki/Plugins\">online plugin documentation</a> for more "
+"details."
+msgstr ""
+
+#. TRANS: Admin form section header
+#: actions/pluginsadminpanel.php:84
+#, fuzzy
+msgid "Default plugins"
+msgstr "زبان پیش‌فرض"
+
+#: actions/pluginsadminpanel.php:106
+msgid ""
+"All default plugins have been disabled from the site's configuration file."
+msgstr ""
+
 #: actions/postnotice.php:95
 msgid "Invalid notice content."
 msgstr "محتوای پیام نامعتبر است."
@@ -4478,12 +4591,12 @@ msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’.
 msgstr "مجوز پیام «%1$s» با مجوز وب‌گاه «%2$s» سازگار نیست."
 
 #. TRANS: Page title for profile settings.
-#: actions/profilesettings.php:59
+#: actions/profilesettings.php:60
 msgid "Profile settings"
 msgstr "تنظیمات نمایه"
 
 #. TRANS: Usage instructions for profile settings.
-#: actions/profilesettings.php:70
+#: actions/profilesettings.php:71
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
@@ -4491,34 +4604,31 @@ msgstr ""
 "در مورد شما بدانند."
 
 #. TRANS: Profile settings form legend.
-#: actions/profilesettings.php:98
+#: actions/profilesettings.php:99
 msgid "Profile information"
 msgstr "اطلاعات نمایه"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109 actions/register.php:433
+#: actions/profilesettings.php:110 actions/register.php:412
 #, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr "۱-۶۴ کاراکتر کوچک یا اعداد، بدون نقطه گذاری یا فاصله"
 
 #. TRANS: Field label in form for profile settings.
-#. TRANS: Label for full group name (dt). Text hidden by default.
-#. TRANS: DT for full name in a profile.
-#: actions/profilesettings.php:113 actions/register.php:455
-#: actions/showgroup.php:255 actions/tagother.php:104
-#: lib/groupeditform.php:150 lib/userprofile.php:156
+#: actions/profilesettings.php:114 actions/register.php:434
+#: lib/groupeditform.php:150
 msgid "Full name"
 msgstr "نام‌کامل"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:118 actions/register.php:460
+#: actions/profilesettings.php:119 actions/register.php:439
 #: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "صفحهٔ خانگی"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:121
+#: actions/profilesettings.php:122 actions/register.php:441
 #, fuzzy
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr "نشانی اینترنتی صفحهٔ خانگی، وبلاگ یا نمایه‌تان در یک وب‌گاه دیگر"
@@ -4526,142 +4636,138 @@ msgstr "نشانی اینترنتی صفحهٔ خانگی، وبلاگ یا نم
 #. TRANS: Tooltip for field label in form for profile settings. Plural
 #. TRANS: is decided by the number of characters available for the
 #. TRANS: biography (%d).
-#: actions/profilesettings.php:129 actions/register.php:471
+#: actions/profilesettings.php:130 actions/register.php:450
 #, fuzzy, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
 msgstr[0] "خودتان و علاقه‌مندی‌هایتان را در %d نویسه توصیف کنید"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:135 actions/register.php:476
+#: actions/profilesettings.php:136 actions/register.php:455
 msgid "Describe yourself and your interests"
 msgstr "خودتان و علاقه‌مندی‌هایتان را توصیف کنید"
 
 #. TRANS: Text area label in form for profile settings where users can provide.
 #. TRANS: their biography.
-#: actions/profilesettings.php:139 actions/register.php:478
+#: actions/profilesettings.php:140 actions/register.php:457
 msgid "Bio"
 msgstr "شرح‌حال"
 
 #. TRANS: Field label in form for profile settings.
-#. TRANS: Label for group location (dt). Text hidden by default.
-#. TRANS: DT for location in a profile.
-#: actions/profilesettings.php:145 actions/register.php:483
-#: actions/showgroup.php:265 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:173
-#: lib/userprofile.php:172
+#: actions/profilesettings.php:146 actions/register.php:462
+#: lib/groupeditform.php:173
 msgid "Location"
 msgstr "موقعیت"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148 actions/register.php:485
+#: actions/profilesettings.php:149
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "مکانی که شما در آن هستید، مانند «شهر، ایالت (یا استان)، کشور»"
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:153
+#: actions/profilesettings.php:154
 msgid "Share my current location when posting notices"
 msgstr "مکان کنونی من هنگام فرستادن پیام‌ها به اشتراک گذاشته شود"
 
 #. TRANS: Field label in form for profile settings.
-#. TRANS: DT for tags in a profile.
-#: actions/profilesettings.php:161 actions/tagother.php:149
-#: actions/tagother.php:209 lib/subscriptionlist.php:106
-#: lib/subscriptionlist.php:108 lib/userprofile.php:220
+#: actions/profilesettings.php:162 actions/tagother.php:128
+#: actions/tagother.php:188 lib/subscriptionlist.php:104
+#: lib/subscriptionlist.php:106
 msgid "Tags"
 msgstr "برچسب‌ها"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:164
+#: actions/profilesettings.php:165
 #, fuzzy
 msgid ""
-"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- "
+"separated."
 msgstr ""
 "برچسب‌ها برای خودتان (حروف، اعداد، -، .، و _) جدا شده با کاما- یا فاصله-"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:169
+#: actions/profilesettings.php:170
 msgid "Language"
 msgstr "زبان"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:171
+#: actions/profilesettings.php:172
 #, fuzzy
-msgid "Preferred language"
+msgid "Preferred language."
 msgstr "زبان برگزیده"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:181
+#: actions/profilesettings.php:182
 msgid "Timezone"
 msgstr "منطقهٔ‌زمانی"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:183
+#: actions/profilesettings.php:184
 msgid "What timezone are you normally in?"
 msgstr "شما معمولا در کدام منطقهٔ زمانی هستید؟"
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:189
+#: actions/profilesettings.php:190
 #, fuzzy
 msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)"
+"Automatically subscribe to whoever subscribes to me (best for non-humans)."
 msgstr ""
 "به صورت خودکار مشترک هر کسی بشو که مشترک من می‌شود (بهترین برای غیر انسان‌ها)"
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Plural form is used based on the maximum number of allowed
 #. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:258 actions/register.php:229
+#: actions/profilesettings.php:259 actions/register.php:214
 #, fuzzy, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
 msgstr[0] "شرح‌حال خیلی طولانی است (بیشینه %d نویسه)."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:269 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:270 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr "منطقهٔ زمانی انتخاب نشده است."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:277
+#: actions/profilesettings.php:278
 #, fuzzy
 msgid "Language is too long (maximum 50 characters)."
 msgstr "زبان بسیار طولانی است ( حداکثر ۵۰ نویسه)"
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:291 actions/tagother.php:178
-#, php-format
-msgid "Invalid tag: \"%s\""
+#: actions/profilesettings.php:292
+#, fuzzy, php-format
+msgid "Invalid tag: \"%s\"."
 msgstr "نشان نادرست »%s«"
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:347
+#: actions/profilesettings.php:348
 #, fuzzy
 msgid "Could not update user for autosubscribe."
 msgstr "نمی‌توان کاربر را برای اشتراک خودکار به‌هنگام‌سازی کرد."
 
 #. TRANS: Server error thrown when user profile location preference settings could not be updated.
-#: actions/profilesettings.php:405
+#: actions/profilesettings.php:406
 #, fuzzy
 msgid "Could not save location prefs."
 msgstr "نمی‌توان تنظیمات مکانی را تنظیم کرد."
 
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:427 actions/tagother.php:200
+#: actions/profilesettings.php:428 actions/tagother.php:179
 msgid "Could not save tags."
 msgstr "نمی‌توان برچسب‌ها را ذخیره کرد."
 
 #. TRANS: Confirmation shown when user profile settings are saved.
 #. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:436 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:437 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "تنظیمات ذخیره شد."
 
 #. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
 #. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:483 actions/restoreaccount.php:60
+#: actions/profilesettings.php:484 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "ساختن یک جساب‌کاربری"
@@ -4739,6 +4845,12 @@ 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: Public RSS feed description. %s is the StatusNet site name.
+#: actions/publicrss.php:106
+#, fuzzy, php-format
+msgid "%s updates from everyone."
+msgstr "%s به روز رسانی های عموم"
+
 #. TRANS: Title for public tag cloud.
 #: actions/publictagcloud.php:57
 msgid "Public tag cloud"
@@ -4779,10 +4891,6 @@ msgstr ""
 "چرا به [باز کردن یک حساب](%%action.register%%) اقدام نمی‌کنید و اولین نفری "
 "باشید که چیزی می‌فرستد!"
 
-#: actions/publictagcloud.php:146
-msgid "Tag cloud"
-msgstr "ابر برچسب"
-
 #. TRANS: Client error displayed trying to recover password while already logged in.
 #: actions/recoverpassword.php:37
 msgid "You are already logged in!"
@@ -4875,6 +4983,12 @@ msgstr "بازیابی گذرواژه"
 msgid "Password recovery requested"
 msgstr "بازیابی گذرواژه درخواست شد"
 
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/recoverpassword.php:229
+#, fuzzy
+msgid "Password saved"
+msgstr "گذرواژه ذخیره شد."
+
 #. TRANS: Title for password recovery page when an unknown action has been specified.
 #: actions/recoverpassword.php:232
 msgid "Unknown action"
@@ -4886,15 +5000,9 @@ msgstr "عمل نامعلوم"
 msgid "6 or more characters, and do not forget it!"
 msgstr "۶ نویسه یا بیش‌تر، و این را فراموش نکنید!"
 
-#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
-#: actions/recoverpassword.php:264 actions/register.php:441
-#, fuzzy
-msgid "Same as password above."
-msgstr "مانند گذرواژهٔ بالا"
-
 #. TRANS: Button text for password reset form.
 #. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: actions/recoverpassword.php:268 lib/designsettings.php:264
+#: actions/recoverpassword.php:268 lib/designform.php:145
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Reset"
@@ -4945,14 +5053,8 @@ msgstr "گذرواژه باید ۶ نویسه یا بیش‌تر باشد."
 msgid "Password and confirmation do not match."
 msgstr "گذرواژه و تاییدیهٔ آن با هم تطابق ندارند."
 
-#. TRANS: Reset password form validation error message.
-#: actions/recoverpassword.php:418
-#, fuzzy
-msgid "Cannot save new password."
-msgstr "نمی‌توان گذرواژهٔ جدید را ذخیره کرد."
-
 #. TRANS: Server error displayed when something does wrong with the user object during password reset.
-#: actions/recoverpassword.php:426 actions/register.php:256
+#: actions/recoverpassword.php:426 actions/register.php:241
 msgid "Error setting user."
 msgstr "هنگام گذاشتن کاربر خطا روی داد."
 
@@ -4961,97 +5063,101 @@ msgstr "هنگام گذاشتن کاربر خطا روی داد."
 msgid "New password successfully saved. You are now logged in."
 msgstr "گذرواژه تازه با موفقیت ذخیره شد. شما اکنون وارد شده‌اید."
 
-#: actions/register.php:92 actions/register.php:196 actions/register.php:413
+#: actions/redirecturl.php:70
+#, fuzzy
+msgid "No id parameter"
+msgstr "هیچ پیوستی وجود ندارد."
+
+#: actions/redirecturl.php:76
+#, fuzzy, php-format
+msgid "No such file \"%d\""
+msgstr "چنین پرونده‌ای وجود ندارد."
+
+#: actions/register.php:80 actions/register.php:181 actions/register.php:392
 msgid "Sorry, only invited people can register."
 msgstr "با عرض معذرت، تنها افراد دعوت شده می توانند ثبت نام کنند."
 
-#: actions/register.php:99
+#: actions/register.php:87
 msgid "Sorry, invalid invitation code."
 msgstr "با عرض تاسف، کد دعوت نا معتبر است."
 
-#: actions/register.php:119
+#: actions/register.php:106
 msgid "Registration successful"
 msgstr "ثبت نام با موفقیت انجام شد."
 
-#: actions/register.php:121 actions/register.php:511
+#: actions/register.php:108 actions/register.php:490
 msgid "Register"
 msgstr "ثبت نام"
 
-#: actions/register.php:142
+#: actions/register.php:128
 msgid "Registration not allowed."
 msgstr "اجازهٔ ثبت‌نام داده نشده است."
 
-#: actions/register.php:209
+#: actions/register.php:194
 #, fuzzy
-msgid "You can't register if you don't agree to the license."
+msgid "You cannot register if you don't agree to the license."
 msgstr "شما نمی توانید ثبت نام کنید اگر با لیسانس( جواز ) موافقت نکنید."
 
-#: actions/register.php:218
+#: actions/register.php:203
 msgid "Email address already exists."
 msgstr "نشانی پست الکترونیکی از قبل وجود دارد."
 
-#: actions/register.php:251 actions/register.php:273
+#: actions/register.php:236 actions/register.php:258
 msgid "Invalid username or password."
 msgstr "نام کاربری یا گذرواژه نا معتبر است."
 
-#: actions/register.php:351
+#: actions/register.php:333
 #, fuzzy
 msgid ""
 "With this form you can create a new account. You can then post notices and "
-"link up to friends and colleagues. "
+"link up to friends and colleagues."
 msgstr ""
 "با این فرم شما می‌توانید یک حساب تازه بسازید. سپس شما می‌توانید پیام بفرستید و "
 "به دوستان و همکارانتان بپیوندید. "
 
-#: actions/register.php:437
-#, fuzzy
-msgid "6 or more characters."
-msgstr "۶ نویسه یا بیش‌تر"
-
-#. TRANS: Link description in user account settings menu.
-#: actions/register.php:445 actions/register.php:449
-#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
+#: actions/register.php:424 actions/register.php:428
+#: actions/siteadminpanel.php:238 lib/settingsnav.php:92
 msgid "Email"
 msgstr "پست الکترونیکی"
 
-#: actions/register.php:446 actions/register.php:450
+#: actions/register.php:425 actions/register.php:429
 #, fuzzy
-msgid "Used only for updates, announcements, and password recovery"
+msgid "Used only for updates, announcements, and password recovery."
 msgstr "تنها برای به‌هنگام‌سازی‌ها، اعلامیه‌ها و بازیابی گذرواژه به کار می‌رود"
 
-#: actions/register.php:457
+#: actions/register.php:436
 #, fuzzy
-msgid "Longer name, preferably your \"real\" name"
+msgid "Longer name, preferably your \"real\" name."
 msgstr "نام بلند تر، به طور بهتر نام واقعیتان"
 
-#: actions/register.php:462
+#: actions/register.php:464
 #, fuzzy
-msgid "URL of your homepage, blog, or profile on another site"
-msgstr "نشانی اینترنتی صفحهٔ خانگی، وبلاگ یا نمایه‌تان در یک وب‌گاه دیگر"
+msgid "Where you are, like \"City, State (or Region), Country\"."
+msgstr "مکانی که شما در آن هستید، مانند «شهر، ایالت (یا استان)، کشور»"
 
-#: actions/register.php:523
+#: actions/register.php:503
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
 msgstr "من متوجه هستم که محتوا و داده‌های %1$s خصوصی و محرمانه هستند."
 
-#: actions/register.php:533
+#: actions/register.php:513
 #, php-format
 msgid "My text and files are copyright by %1$s."
 msgstr "متن و پرونده‌های من دارای حق تکثیر %1$s هستند."
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:537
+#: actions/register.php:517
 msgid "My text and files remain under my own copyright."
 msgstr "متن و پرونده‌های من زیر حق تکثیر خودم می‌مانند."
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:540
+#: actions/register.php:520
 msgid "All rights reserved."
 msgstr "تمام حقوق محفوظ است."
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:545
+#: actions/register.php:525
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -5060,7 +5166,7 @@ msgstr ""
 "نوشته‌ها و پرونده‌های من به جز داده‌های خصوصی گذرواژه، نشانی پست الکترونیک، "
 "نشانی پیام‌رسان فوری و شماره تلفن زیر مجوز %s هستند."
 
-#: actions/register.php:588
+#: actions/register.php:566
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -5094,7 +5200,7 @@ msgstr ""
 "از این‌که نام‌نویسی کرده‌اید، تشکر می‌کنیم و امیدواریم که از استفاده از این "
 "سرویس لذت ببرید."
 
-#: actions/register.php:612
+#: actions/register.php:590
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5127,7 +5233,7 @@ msgstr "نام کاربری کاربر"
 
 #: actions/remotesubscribe.php:129
 #, fuzzy
-msgid "Nickname of the user you want to follow"
+msgid "Nickname of the user you want to follow."
 msgstr "نام کاربری، کاربری که می خواهید او را دنبال کنید"
 
 #: actions/remotesubscribe.php:132
@@ -5136,18 +5242,18 @@ msgstr "نشانی نمایه"
 
 #: actions/remotesubscribe.php:133
 #, fuzzy
-msgid "URL of your profile on another compatible microblogging service"
+msgid "URL of your profile on another compatible microblogging service."
 msgstr "نشانی اینترنتی نمایهٔ شما در سرویس میکروبلاگینگ سازگار دیگری"
 
 #. TRANS: Link text for link that will subscribe to a remote profile.
 #: actions/remotesubscribe.php:136 lib/subscribeform.php:139
-#: lib/userprofile.php:431
+#: lib/userprofile.php:402
 msgid "Subscribe"
 msgstr "اشتراک"
 
 #: actions/remotesubscribe.php:158
 #, fuzzy
-msgid "Invalid profile URL (bad format)"
+msgid "Invalid profile URL (bad format)."
 msgstr "نشانی اینترنتی نمایه نامعتبر است (فرمت نامناسب است)"
 
 #: actions/remotesubscribe.php:167
@@ -5183,7 +5289,7 @@ msgstr "شما نمی‌توانید پیام خودتان را تکرار کن
 msgid "You already repeated that notice."
 msgstr "شما قبلا آن پیام را تکرار کرده‌اید."
 
-#: actions/repeat.php:112 lib/noticelist.php:692
+#: actions/repeat.php:112 lib/noticelist.php:697
 msgid "Repeated"
 msgstr "تکرار شده"
 
@@ -5191,9 +5297,9 @@ msgstr "تکرار شده"
 msgid "Repeated!"
 msgstr "تکرار شد!"
 
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing @-replies.
+#. TRANS: RSS reply feed title. %s is a user nickname.
 #: actions/replies.php:126 actions/repliesrss.php:68
-#: lib/personalgroupnav.php:109
+#: lib/personalgroupnav.php:105
 #, php-format
 msgid "Replies to %s"
 msgstr "پاسخ‌های به %s"
@@ -5243,9 +5349,11 @@ msgstr ""
 "اولین کسی باشید که در [این موضوع](%%%%action.newnotice%%%%?status_textarea=%"
 "s) پیام می‌فرستد."
 
-#: actions/repliesrss.php:72
+#. TRANS: RSS reply feed description.
+#. TRANS: %1$s is a user nickname, %2$s is the StatusNet site name.
+#: actions/repliesrss.php:74
 #, fuzzy, php-format
-msgid "Replies to %1$s on %2$s!"
+msgid "Replies to %1$s on %2$s."
 msgstr "پاسخ‌های به %1$s در %2$s!"
 
 #. TRANS: Client exception displayed when trying to restore an account while not logged in.
@@ -5345,7 +5453,7 @@ msgstr "شما نمی‌توانید نقش‌های کاربری را در ای
 msgid "User doesn't have this role."
 msgstr "کاربر این نقش را ندارد."
 
-#: actions/rsd.php:146 actions/version.php:159
+#: actions/rsd.php:142 actions/version.php:159
 msgid "StatusNet"
 msgstr "StatusNet"
 
@@ -5390,87 +5498,38 @@ msgstr "خروجی اشکال‌زدایی برای نشست‌ها روشن ش
 msgid "Save site settings"
 msgstr "ذخیرهٔ تنظیمات وب‌گاه"
 
-#: actions/showapplication.php:82
+#: actions/showapplication.php:78
 msgid "You must be logged in to view an application."
 msgstr "برای دیدن یک برنامه باید وارد شده باشید."
 
-#: actions/showapplication.php:157
+#: actions/showapplication.php:151
 msgid "Application profile"
 msgstr "نمایهٔ برنامه"
 
-#. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:159 lib/applicationeditform.php:177
-msgid "Icon"
-msgstr "شمایل"
-
-#. TRANS: Form input field label for application name.
-#: actions/showapplication.php:169 actions/version.php:197
-#: lib/applicationeditform.php:190
-msgid "Name"
-msgstr "نام"
-
-#. TRANS: Form input field label.
-#: actions/showapplication.php:178 lib/applicationeditform.php:227
-msgid "Organization"
-msgstr "سازمان"
-
-#. TRANS: Form input field label.
-#: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:168
-msgid "Description"
-msgstr "توصیف"
-
-#. TRANS: Header for group statistics on a group page (h2).
-#. TRANS: H2 text for user statistics.
-#: actions/showapplication.php:192 actions/showgroup.php:460
-#: lib/profileaction.php:205
-msgid "Statistics"
-msgstr "آمار"
-
-#: actions/showapplication.php:203
+#: actions/showapplication.php:179
 #, php-format
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr "ساخته شده توسط %1$s - دسترسی %2$s به صورت پیش‌فرض - %3$d کاربر"
 
-#: actions/showapplication.php:213
+#: actions/showapplication.php:189
 msgid "Application actions"
 msgstr "اعمال برنامه"
 
-#: actions/showapplication.php:236
+#: actions/showapplication.php:212
 msgid "Reset key & secret"
 msgstr ""
 
 #. TRANS: Title of form for deleting a user.
-#: actions/showapplication.php:252 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:64 lib/noticelist.php:673
+#: actions/showapplication.php:228 lib/deletegroupform.php:121
+#: lib/deleteuserform.php:64 lib/noticelist.php:678
 msgid "Delete"
 msgstr "حذف"
 
-#: actions/showapplication.php:261
+#: actions/showapplication.php:237
 msgid "Application info"
 msgstr "اطلاعات برنامه"
 
-#: actions/showapplication.php:263
-msgid "Consumer key"
-msgstr "کلید مصرف‌کننده"
-
-#: actions/showapplication.php:268
-msgid "Consumer secret"
-msgstr "رمز مصرف‌کننده"
-
-#: actions/showapplication.php:273
-msgid "Request token URL"
-msgstr "نشانی اینترنتی شناسهٔ درخواست"
-
-#: actions/showapplication.php:278
-msgid "Access token URL"
-msgstr "نشانی اینترنتی نشانهٔ درخواست"
-
-#: actions/showapplication.php:283
-msgid "Authorize URL"
-msgstr "نشانی اجازه‌دادن"
-
-#: actions/showapplication.php:288
+#: actions/showapplication.php:255
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
@@ -5478,7 +5537,7 @@ msgstr ""
 "توجه: ما امضاهای HMAC-SHA1 را پشتیبانی می‌کنیم. ما روش امضای plaintext را "
 "پشتیبانی نمی‌کنیم."
 
-#: actions/showapplication.php:309
+#: actions/showapplication.php:275
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr "آیا مطمئن هستید که می‌خواهید کلید و رمز خریدار را دوباره تعیین کنید؟"
 
@@ -5564,61 +5623,47 @@ msgstr "گروه %s"
 msgid "%1$s group, page %2$d"
 msgstr "گروه %1$s، صفحهٔ %2$d"
 
-#. TRANS: Group profile header (h2). Text hidden by default.
-#: actions/showgroup.php:223
-msgid "Group profile"
-msgstr "نمایهٔ گروه"
-
-#. TRANS: Label for group URL (dt). Text hidden by default.
-#. TRANS: DT for URL in a profile.
-#: actions/showgroup.php:273 actions/tagother.php:118
-#: actions/userauthorization.php:175 lib/userprofile.php:186
-msgid "URL"
-msgstr "نشانی اینترنتی"
-
 #. TRANS: Label for group description or group note (dt). Text hidden by default.
-#. TRANS: DT for note in a profile.
-#: actions/showgroup.php:285 actions/tagother.php:128
-#: actions/userauthorization.php:187 lib/userprofile.php:204
+#: actions/showgroup.php:266
 msgid "Note"
 msgstr "یادداشت"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:296 lib/groupeditform.php:180
+#: actions/showgroup.php:277 lib/groupeditform.php:180
 msgid "Aliases"
 msgstr "نام های مستعار"
 
 #. TRANS: Group actions header (h2). Text hidden by default.
-#: actions/showgroup.php:313
+#: actions/showgroup.php:294
 msgid "Group actions"
 msgstr "اعمال گروه"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:357
+#: actions/showgroup.php:338
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
 msgstr "خوراک پیام برای گروه %s (RSS 1.0)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:364
+#: actions/showgroup.php:345
 #, php-format
 msgid "Notice feed for %s group (RSS 2.0)"
 msgstr "خوراک پیام برای گروه %s (RSS 2.0)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:371
+#: actions/showgroup.php:352
 #, php-format
 msgid "Notice feed for %s group (Atom)"
 msgstr "خوراک پیام برای گروه %s (Atom)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:377
+#: actions/showgroup.php:358
 #, php-format
 msgid "FOAF for %s group"
 msgstr "FOAF برای گروه %s"
 
 #. TRANS: Header for mini list of group members on a group page (h2).
-#: actions/showgroup.php:414
+#: actions/showgroup.php:395
 msgid "Members"
 msgstr "اعضا"
 
@@ -5626,26 +5671,31 @@ msgstr "اعضا"
 #. TRANS: Text for user subscription statistics if the user has no subscriptions.
 #. TRANS: Text for user subscriber statistics if user has no subscribers.
 #. TRANS: Text for user user group membership statistics if user is not a member of any group.
-#: actions/showgroup.php:420 lib/profileaction.php:137
+#: actions/showgroup.php:401 lib/profileaction.php:137
 #: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
-#: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
+#: lib/subscriptionlist.php:123 lib/tagcloudsection.php:71
 msgid "(None)"
 msgstr "هیچ"
 
 #. TRANS: Link to all group members from mini list of group members if group has more than n members.
-#: actions/showgroup.php:429
+#: actions/showgroup.php:410
 msgid "All members"
 msgstr "همهٔ اعضا"
 
-#. TRANS: Label for creation date in statistics on group page.
-#: actions/showgroup.php:465
+#. TRANS: Header for group statistics on a group page (h2).
+#. TRANS: H2 text for user statistics.
+#: actions/showgroup.php:441 lib/profileaction.php:205
+msgid "Statistics"
+msgstr "آمار"
+
+#: actions/showgroup.php:444
 #, fuzzy
 msgctxt "LABEL"
 msgid "Created"
 msgstr "ساخته شد"
 
 #. TRANS: Label for member count in statistics on group page.
-#: actions/showgroup.php:473
+#: actions/showgroup.php:449
 #, fuzzy
 msgctxt "LABEL"
 msgid "Members"
@@ -5655,7 +5705,7 @@ msgstr "اعضا"
 #. TRANS: **%s** is the group alias, %%%%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).
-#: actions/showgroup.php:488
+#: actions/showgroup.php:464
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5674,7 +5724,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: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
-#: actions/showgroup.php:498
+#: actions/showgroup.php:474
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5689,7 +5739,7 @@ msgstr ""
 "می‌گذارند. "
 
 #. TRANS: Header for list of group administrators on a group page (h2).
-#: actions/showgroup.php:527
+#: actions/showgroup.php:503
 msgid "Admins"
 msgstr "مدیران"
 
@@ -5728,7 +5778,7 @@ msgid "%1$s tagged %2$s"
 msgstr "%1$s، صفحهٔ %2$d"
 
 #. TRANS: Page title showing tagged notices in one user's stream.
-#. TRANS: %1$s is the username, %2$s is the hash tag, %1$d is the page number.
+#. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
 #: actions/showstream.php:74
 #, fuzzy, php-format
 msgid "%1$s tagged %2$s, page %3$d"
@@ -5775,13 +5825,13 @@ msgid "FOAF for %s"
 msgstr "FOAF برای %s"
 
 #. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
-#: actions/showstream.php:211
+#: actions/showstream.php:205
 #, fuzzy, php-format
 msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr "این خط‌زمانی %1$s است، اما %2$s تاکنون چیزی نفرستاده است."
 
 #. TRANS: Second sentence of empty list message for a stream for the user themselves.
-#: actions/showstream.php:217
+#: actions/showstream.php:211
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
@@ -5791,7 +5841,7 @@ msgstr ""
 
 #. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:221
+#: actions/showstream.php:215
 #, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
@@ -5802,7 +5852,7 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:264
+#: actions/showstream.php:258
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5818,7 +5868,7 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:271
+#: actions/showstream.php:265
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5830,7 +5880,7 @@ msgstr ""
 "8C%D9%86%DA%AF) بر پایهٔ نرم‌افزار آزاد [StatusNet](http://status.net/) ،دارد. "
 
 #. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
-#: actions/showstream.php:328
+#: actions/showstream.php:322
 #, php-format
 msgid "Repeat of %s"
 msgstr "تکرار %s"
@@ -5977,76 +6027,76 @@ msgstr "متن پیام عمومی وب‌گاه (حداکثر ۲۵۵ نویسه
 #. TRANS: Title for button to save site notice in admin panel.
 #: actions/sitenoticeadminpanel.php:201
 #, fuzzy
-msgid "Save site notice"
+msgid "Save site notice."
 msgstr "ذخیرهٔ پیام وب‌گاه"
 
 #. TRANS: Title for SMS settings.
-#: actions/smssettings.php:57
+#: actions/smssettings.php:56
 msgid "SMS settings"
 msgstr "تنظیمات پیامک"
 
 #. TRANS: SMS settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/smssettings.php:71
+#: actions/smssettings.php:70
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr ""
 "شما می‌توانید پیامک‌ها را از راه پست الکترونیک از %%site.name%% دریافت کنید."
 
 #. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
-#: actions/smssettings.php:93
+#: actions/smssettings.php:92
 msgid "SMS is not available."
 msgstr "پیامک در دسترس نیست."
 
 #. TRANS: Form legend for SMS settings form.
-#: actions/smssettings.php:107
+#: actions/smssettings.php:106
 msgid "SMS address"
 msgstr "نشانی پیامک"
 
 #. TRANS: Form guide in SMS settings form.
-#: actions/smssettings.php:116
+#: actions/smssettings.php:115
 msgid "Current confirmed SMS-enabled phone number."
 msgstr "شمارهٔ تلفن با قابلیت فرستادن پیامک که در حال حاضر تایید شده است."
 
 #. TRANS: Form guide in IM settings form.
-#: actions/smssettings.php:129
+#: actions/smssettings.php:128
 msgid "Awaiting confirmation on this phone number."
 msgstr "منتظر تاییدیه برای این شماره تلفن."
 
 #. TRANS: Field label for SMS address input in SMS settings form.
-#: actions/smssettings.php:138
+#: actions/smssettings.php:137
 msgid "Confirmation code"
 msgstr "کد تاییدیه"
 
 #. TRANS: Form field instructions in SMS settings form.
-#: actions/smssettings.php:140
+#: actions/smssettings.php:139
 msgid "Enter the code you received on your phone."
 msgstr "کدی را که در گوشی‌تان دریافت کردید، وارد کنید"
 
 #. TRANS: Button label to confirm SMS confirmation code in SMS settings.
-#: actions/smssettings.php:144
+#: actions/smssettings.php:143
 msgctxt "BUTTON"
 msgid "Confirm"
 msgstr "تایید"
 
 #. TRANS: Field label for SMS phone number input in SMS settings form.
-#: actions/smssettings.php:149
+#: actions/smssettings.php:148
 msgid "SMS phone number"
 msgstr "شمارهٔ تماس پیامک"
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
-#: actions/smssettings.php:152
+#: actions/smssettings.php:151
 #, fuzzy
-msgid "Phone number, no punctuation or spaces, with area code"
+msgid "Phone number, no punctuation or spaces, with area code."
 msgstr "شماره تلفن، بدون نشانه گذاری یا فاصله، با کد منطقه"
 
 #. TRANS: Form legend for SMS preferences form.
-#: actions/smssettings.php:191
+#: actions/smssettings.php:190
 msgid "SMS preferences"
 msgstr "ترجیحات پیامک"
 
 #. TRANS: Checkbox label in SMS preferences form.
-#: actions/smssettings.php:197
+#: actions/smssettings.php:196
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
@@ -6055,32 +6105,32 @@ msgstr ""
 "زیادی از طرف اپراتورم بشوم."
 
 #. TRANS: Confirmation message for successful SMS preferences save.
-#: actions/smssettings.php:308
+#: actions/smssettings.php:307
 msgid "SMS preferences saved."
 msgstr "تنظیمات پیامک ذخیره شد."
 
 #. TRANS: Message given saving SMS phone number without having provided one.
-#: actions/smssettings.php:330
+#: actions/smssettings.php:329
 msgid "No phone number."
 msgstr "بدون شماره تلفن."
 
 #. TRANS: Message given saving SMS phone number without having selected a carrier.
-#: actions/smssettings.php:336
+#: actions/smssettings.php:335
 msgid "No carrier selected."
 msgstr "هیچ اپراتوری انتخاب نشده است."
 
 #. TRANS: Message given saving SMS phone number that is already set.
-#: actions/smssettings.php:344
+#: actions/smssettings.php:343
 msgid "That is already your phone number."
 msgstr "آن قبلا شماره تلفن شما بوده است."
 
 #. TRANS: Message given saving SMS phone number that is already set for another user.
-#: actions/smssettings.php:348
+#: actions/smssettings.php:347
 msgid "That phone number already belongs to another user."
 msgstr "أن شماره تلفن پیش از این به کاربر دیگری تعلق داشته است."
 
 #. TRANS: Message given saving valid SMS phone number that is to be confirmed.
-#: actions/smssettings.php:376
+#: actions/smssettings.php:375
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
 "for the code and instructions on how to use it."
@@ -6089,39 +6139,39 @@ msgstr ""
 "کد و راهنمای استفاده از آن بررسی کنید."
 
 #. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
-#: actions/smssettings.php:404
+#: actions/smssettings.php:403
 msgid "That is the wrong confirmation number."
 msgstr "این کد تاییدیه نادرست است."
 
 #. TRANS: Message given after successfully canceling SMS phone number confirmation.
-#: actions/smssettings.php:418
+#: actions/smssettings.php:417
 msgid "SMS confirmation cancelled."
 msgstr "تایید پیامک لغو شد."
 
 #. TRANS: Message given trying to remove an SMS phone number that is not
 #. TRANS: registered for the active user.
-#: actions/smssettings.php:438
+#: actions/smssettings.php:437
 msgid "That is not your phone number."
 msgstr "این شمارهٔ تلفن شما نیست."
 
 #. TRANS: Message given after successfully removing a registered SMS phone number.
-#: actions/smssettings.php:460
+#: actions/smssettings.php:459
 msgid "The SMS phone number was removed."
 msgstr "شماره تماس پیامک پاک شد."
 
 #. TRANS: Label for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:499
+#: actions/smssettings.php:498
 msgid "Mobile carrier"
 msgstr "اپراتور موبایل"
 
 #. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:504
+#: actions/smssettings.php:503
 msgid "Select a carrier"
 msgstr "یک اپراتور را انتخاب کنید"
 
 #. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
 #. TRANS: %s is an administrative contact's e-mail address.
-#: actions/smssettings.php:513
+#: actions/smssettings.php:512
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -6132,7 +6182,7 @@ msgstr ""
 "بفرستید تا ما باخبر شویم."
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
-#: actions/smssettings.php:535
+#: actions/smssettings.php:534
 #, fuzzy
 msgid "No code entered."
 msgstr "کدی وارد نشد"
@@ -6207,15 +6257,13 @@ msgstr "شما مشترک آن نمایه نیستید."
 msgid "Could not save subscription."
 msgstr "نمی‌توان اشتراک را ذخیره کرد."
 
-#: actions/subscribe.php:77
-msgid "This action only accepts POST requests."
-msgstr "این عمل تنها درخواست‌های POST را می‌پذیرد."
-
-#: actions/subscribe.php:117
+#. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
+#: actions/subscribe.php:121
 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
 msgstr "نمی‌توان با این کار مشترک یک نمایهٔ از راه دور OMB 0.1شد."
 
-#: actions/subscribe.php:145
+#. TRANS: Page title when subscription succeeded.
+#: actions/subscribe.php:149
 msgid "Subscribed"
 msgstr "مشترک‌شده"
 
@@ -6333,31 +6381,34 @@ msgid "Subscription feed for %s (Atom)"
 msgstr "خوراک پیام‌های %s (Atom)"
 
 #. TRANS: Checkbox label for enabling Jabber messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:239
-msgid "Jabber"
-msgstr "Jabber"
+#: actions/subscriptions.php:241 lib/settingsnav.php:110
+#, fuzzy
+msgid "IM"
+msgstr "پیام‌رسان فوری"
 
 #. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:254
+#: actions/subscriptions.php:256 lib/settingsnav.php:117
 msgid "SMS"
 msgstr "پیامک"
 
-#: actions/tag.php:69
+#. TRANS: Title for all but the first page of notices with tags.
+#. TRANS: %1$s is the tag, %2$d is the page number.
+#: actions/tag.php:73
 #, php-format
 msgid "Notices tagged with %1$s, page %2$d"
 msgstr "پیام‌های برچسب‌دار شده با %1$s، صفحهٔ %2$d"
 
-#: actions/tag.php:87
+#: actions/tag.php:91
 #, php-format
 msgid "Notice feed for tag %s (RSS 1.0)"
 msgstr "خوراک پیام برای برچسب %s (RSS 1.0)"
 
-#: actions/tag.php:93
+#: actions/tag.php:97
 #, php-format
 msgid "Notice feed for tag %s (RSS 2.0)"
 msgstr "خوراک پیام برای برچسب %s (RSS 2.0)"
 
-#: actions/tag.php:99
+#: actions/tag.php:103
 #, php-format
 msgid "Notice feed for tag %s (Atom)"
 msgstr "خوراک پیام برای برچسب %s (Atom)"
@@ -6377,31 +6428,30 @@ msgstr "برچسب %s"
 msgid "User profile"
 msgstr "نمایهٔ کاربر"
 
-#. TRANS: DT element in area for user avatar.
-#: actions/tagother.php:81 actions/userauthorization.php:132
-#: lib/userprofile.php:108
-msgid "Photo"
-msgstr "تصویر"
-
-#: actions/tagother.php:141
+#: actions/tagother.php:120
 msgid "Tag user"
 msgstr "برچسب‌گذاری کاربر"
 
-#: actions/tagother.php:151
+#: actions/tagother.php:130
 msgid ""
 "Tags for this user (letters, numbers, -, ., and _), comma- or space- "
 "separated"
 msgstr ""
 "برچسب‌ها برای این کاربر (حروف، اعداد، -، .، و _)، جدا شده با کاما- یا فاصله-"
 
-#: actions/tagother.php:193
+#: actions/tagother.php:157
+#, php-format
+msgid "Invalid tag: \"%s\""
+msgstr "نشان نادرست »%s«"
+
+#: actions/tagother.php:172
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 "شما تنها می‌توانید افرادی را برچسب‌دار کنید که مشترک آن‌ها هستید یا آن‌ها مشترک "
 "شما هستند."
 
-#: actions/tagother.php:236
+#: actions/tagother.php:215
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr "از این روش برای افزودن برچسب به مشترک‌ها یا اشتراک‌هایتان استفاده کنید."
 
@@ -6409,6 +6459,7 @@ msgstr "از این روش برای افزودن برچسب به مشترک‌ه
 msgid "No such tag."
 msgstr "چنین برچسبی وجود ندارد."
 
+#. TRANS: Client error displayed when trying to unblock a non-blocked user.
 #: actions/unblock.php:59
 msgid "You haven't blocked that user."
 msgstr "شما آن کاربر را مسدود نکرده اید."
@@ -6430,12 +6481,84 @@ msgstr "هیچ شناسهٔ نمایه‌ای درخواست نشده است."
 msgid "Unsubscribed"
 msgstr "لغو اشتراک شده"
 
-#: actions/updateprofile.php:64 actions/userauthorization.php:337
+#: actions/updateprofile.php:64
 #, fuzzy, php-format
 msgid ""
 "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
 msgstr "مجوز پیام «%1$s» با مجوز وب‌گاه «%2$s» سازگار نیست."
 
+#: actions/urlsettings.php:60
+#, fuzzy
+msgid "URL settings"
+msgstr "تنظیمات پیام‌رسان فوری"
+
+#. TRANS: Instructions for tab "Other" in user profile settings.
+#: actions/urlsettings.php:72
+msgid "Manage various other options."
+msgstr "مدیریت انتخاب های مختلف دیگر."
+
+#. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
+#. TRANS: user's profile settings. This message has one space at the beginning. Use your
+#. TRANS: language's word separator here if it has one (most likely a single space).
+#: actions/urlsettings.php:115
+msgid " (free service)"
+msgstr " (سرویس‌ آزاد)"
+
+#: actions/urlsettings.php:121
+#, fuzzy
+msgid "[none]"
+msgstr "هیچ"
+
+#: actions/urlsettings.php:122
+msgid "[internal]"
+msgstr ""
+
+#. TRANS: Label for dropdown with URL shortener services.
+#: actions/urlsettings.php:130
+msgid "Shorten URLs with"
+msgstr "کوتاه‌کردن نشانی‌های اینترنتی با"
+
+#. TRANS: Tooltip for for dropdown with URL shortener services.
+#: actions/urlsettings.php:132
+msgid "Automatic shortening service to use."
+msgstr "کوتاه‌کنندهٔ نشانی مورد استفاده."
+
+#: actions/urlsettings.php:138
+msgid "URL longer than"
+msgstr ""
+
+#: actions/urlsettings.php:141
+msgid "URLs longer than this will be shortened, 0 means always shorten."
+msgstr ""
+
+#: actions/urlsettings.php:145
+msgid "Text longer than"
+msgstr ""
+
+#: actions/urlsettings.php:148
+msgid ""
+"URLs in notices longer than this will be shortened, 0 means always shorten."
+msgstr ""
+
+#. TRANS: Form validation error for form "Other settings" in user profile.
+#: actions/urlsettings.php:180
+#, fuzzy
+msgid "URL shortening service is too long (maximum 50 characters)."
+msgstr "کوتاه کنندهٔ نشانی بسیار طولانی است (بیش‌تر از ۵۰ حرف)."
+
+#: actions/urlsettings.php:187
+msgid "Invalid number for max url length."
+msgstr ""
+
+#: actions/urlsettings.php:193
+#, fuzzy
+msgid "Invalid number for max notice length."
+msgstr "محتوای پیام نامعتبر است."
+
+#: actions/urlsettings.php:238
+msgid "Error saving user URL shortening preferences."
+msgstr ""
+
 #. TRANS: User admin panel title
 #: actions/useradminpanel.php:58
 msgctxt "TITLE"
@@ -6462,11 +6585,11 @@ msgstr "متن خوشامدگویی نامعتبر است. بیشینهٔ طول
 #. TRANS: users in user admin panel. %1$s is the invalid nickname.
 #: actions/useradminpanel.php:166
 #, fuzzy, php-format
-msgid "Invalid default subscripton: '%1$s' is not a user."
+msgid "Invalid default subscripton: \"%1$s\" is not a user."
 msgstr "اشتراک پیش‌فرض نامعتبر است: «%1$s» کاربر نیست."
 
-#. TRANS: Link description in user account settings menu.
-#: actions/useradminpanel.php:215 lib/accountsettingsaction.php:106
+#: actions/useradminpanel.php:215 lib/action.php:565 lib/settingsnav.php:77
+#: lib/subgroupnav.php:81
 msgid "Profile"
 msgstr "نمایه"
 
@@ -6524,118 +6647,146 @@ msgstr "چنان‌که به کاربران اجازهٔ دعوت‌کردن ک
 #. TRANS: Title for button to save user settings in user admin panel.
 #: actions/useradminpanel.php:302
 #, fuzzy
-msgid "Save user settings"
+msgid "Save user settings."
 msgstr "ذخیرهٔ تنظیمات وب‌گاه"
 
-#: actions/userauthorization.php:105
+#. TRANS: Page title.
+#: actions/userauthorization.php:109
 msgid "Authorize subscription"
 msgstr "تصدیق اشتراک"
 
-#: actions/userauthorization.php:110
+#. TRANS: Page notice on "Auhtorize subscription" page.
+#: actions/userauthorization.php:115
 #, fuzzy
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
 "user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
-"click “Reject”."
+"click \"Reject\"."
 msgstr ""
 "لطفا این جزئیات را برای اطمینان از این‌که می‌خواهید مشترک پیام‌های این کاربر "
 "شوید، بررسی کنید. اگر شما درخواست اشتراک پیام‌های کسی را نداده‌اید، روی «رد "
 "کردن» کلیک کنید."
 
-#. TRANS: Menu item for site administration
-#: actions/userauthorization.php:196 actions/version.php:167
-#: lib/adminpanelaction.php:403
-msgid "License"
-msgstr "مجوز"
-
-#: actions/userauthorization.php:217
+#. TRANS: Button text on Authorise Subscription page.
+#: actions/userauthorization.php:200
 #, fuzzy
+msgctxt "BUTTON"
 msgid "Accept"
 msgstr "پذیرفتن"
 
-#: actions/userauthorization.php:218 lib/subscribeform.php:115
-#: lib/subscribeform.php:139
-msgid "Subscribe to this user"
+#. TRANS: Title for button on Authorise Subscription page.
+#: actions/userauthorization.php:202
+#, fuzzy
+msgid "Subscribe to this user."
 msgstr "مشترک شدن این کاربر"
 
-#: actions/userauthorization.php:219
+#. TRANS: Button text on Authorise Subscription page.
+#: actions/userauthorization.php:204
 #, fuzzy
+msgctxt "BUTTON"
 msgid "Reject"
 msgstr "رد کردن"
 
-#: actions/userauthorization.php:220
+#. TRANS: Title for button on Authorise Subscription page.
+#: actions/userauthorization.php:206
 #, fuzzy
-msgid "Reject this subscription"
+msgid "Reject this subscription."
 msgstr "رد کردن این اشتراک"
 
-#: actions/userauthorization.php:232
+#. TRANS: Client error displayed for an empty authorisation request.
+#: actions/userauthorization.php:219
 msgid "No authorization request!"
 msgstr "هیچ درخواست اجازه‌ای وجود ندارد!"
 
-#: actions/userauthorization.php:254
+#. TRANS: Accept message header from Authorise subscription page.
+#: actions/userauthorization.php:242
 msgid "Subscription authorized"
 msgstr "اشتراک تصدیق شد"
 
-#: actions/userauthorization.php:256
+#: actions/userauthorization.php:245
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to authorize the "
 "subscription. Your subscription token is:"
 msgstr ""
 
-#: actions/userauthorization.php:266
+#. TRANS: Reject message header from Authorise subscription page.
+#: actions/userauthorization.php:256
 msgid "Subscription rejected"
 msgstr "اشتراک پذیرفته نشد"
 
-#: actions/userauthorization.php:268
+#: actions/userauthorization.php:259
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to fully reject the "
 "subscription."
 msgstr ""
 
+#. TRANS: Exception thrown when no valid user is found for an authorisation request.
+#. TRANS: %s is a listener URI.
+#: actions/userauthorization.php:296
+#, fuzzy, php-format
+msgid "Listener URI \"%s\" not found here."
+msgstr "نشانی تصویر چهره «%s» معتبر نیست."
+
+#. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
+#. TRANS: %s is a listenee URI.
 #: actions/userauthorization.php:303
 #, fuzzy, php-format
-msgid "Listener URI ‘%s’ not found here."
+msgid "Listenee URI \"%s\" is too long."
 msgstr "نشانی تصویر چهره «%s» معتبر نیست."
 
-#: actions/userauthorization.php:308
+#. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
+#. TRANS: %s is a listenee URI.
+#: actions/userauthorization.php:311
 #, fuzzy, php-format
-msgid "Listenee URI ‘%s’ is too long."
-msgstr "نشانی تصویر چهره «%s» معتبر نیست."
-
-#: actions/userauthorization.php:314
-#, fuzzy, php-format
-msgid "Listenee URI ‘%s’ is a local user."
+msgid "Listenee URI \"%s\" is a local user."
 msgstr "نشانی اینترنتی نمایهٔ «%s» برای یک کاربر محلی است."
 
+#. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
+#. TRANS: %s is a profile URL.
 #: actions/userauthorization.php:329
 #, fuzzy, php-format
-msgid "Profile URL ‘%s’ is for a local user."
+msgid "Profile URL \"%s\" is for a local user."
 msgstr "نشانی اینترنتی نمایهٔ «%s» برای یک کاربر محلی است."
 
-#: actions/userauthorization.php:345
+#. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
+#. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
+#: actions/userauthorization.php:339
 #, fuzzy, php-format
-msgid "Avatar URL ‘%s’ is not valid."
+msgid ""
+"Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
+"\"."
+msgstr "مجوز پیام «%1$s» با مجوز وب‌گاه «%2$s» سازگار نیست."
+
+#. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
+#. TRANS: %s is an avatar URL.
+#: actions/userauthorization.php:349
+#, fuzzy, php-format
+msgid "Avatar URL \"%s\" is not valid."
 msgstr "نشانی تصویر چهره «%s» معتبر نیست."
 
-#: actions/userauthorization.php:350
+#. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
+#. TRANS: %s is an avatar URL.
+#: actions/userauthorization.php:356
 #, fuzzy, php-format
-msgid "Can’t read avatar URL ‘%s’."
+msgid "Cannot read avatar URL \"%s\"."
 msgstr "نمی‌توان نشانی اینترنتی چهره را خواند«%s»."
 
-#: actions/userauthorization.php:355
+#. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
+#. TRANS: %s is an avatar URL.
+#: actions/userauthorization.php:363
 #, fuzzy, php-format
-msgid "Wrong image type for avatar URL ‘%s’."
+msgid "Wrong image type for avatar URL \"%s\"."
 msgstr "نوع تصویر برای نشانی اینترنتی چهره نادرست است «%s»."
 
 #. TRANS: Page title for profile design page.
-#: actions/userdesignsettings.php:74 lib/designsettings.php:63
+#: actions/userdesignsettings.php:74 lib/designsettings.php:61
 msgid "Profile design"
 msgstr "طراحی نمایه"
 
 #. TRANS: Instructions for profile design page.
-#: actions/userdesignsettings.php:84 lib/designsettings.php:74
+#: actions/userdesignsettings.php:84 lib/designsettings.php:72
 msgid ""
 "Customize the way your profile looks with a background image and a colour "
 "palette of your choice."
@@ -6643,10 +6794,28 @@ msgstr ""
 "شیوهٔ نمایش نمایهٔ خود را با یک تصویر پیش‌زمینه و یک رنگ از جعبهٔ رنگ‌ها به "
 "انتخاب خودتان سفارشی‌سازی کنید."
 
-#: actions/userdesignsettings.php:272
+#: actions/userdesignsettings.php:289
 msgid "Enjoy your hotdog!"
 msgstr "از هات داگ خود لذت ببرید!"
 
+#: actions/userdesignsettings.php:325
+#, fuzzy
+msgid "Design settings"
+msgstr "ذخیرهٔ تنظیمات وب‌گاه"
+
+#: actions/userdesignsettings.php:340
+msgid "View profile designs"
+msgstr "نمایش طراحی‌های نمایه"
+
+#: actions/userdesignsettings.php:341
+msgid "Show or hide profile designs."
+msgstr "نمایش دادن یا پنهان کردن طراحی‌های نمایه."
+
+#: actions/userdesignsettings.php:348
+#, fuzzy
+msgid "Background file"
+msgstr "پیش‌زمینه"
+
 #. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number.
 #: actions/usergroups.php:66
 #, php-format
@@ -6697,6 +6866,11 @@ msgstr ""
 msgid "Contributors"
 msgstr "مشارکت‌کنندگان"
 
+#. TRANS: Menu item for site administration
+#: actions/version.php:167 lib/adminpanelaction.php:403
+msgid "License"
+msgstr "مجوز"
+
 #: actions/version.php:170
 msgid ""
 "StatusNet is free software: you can redistribute it and/or modify it under "
@@ -6728,12 +6902,13 @@ msgstr ""
 "شما باید یک رونوشت از مجوز GNU Affero General Public License را همراه این "
 "برنامه دریافت کرده باشید. اگر چنین نیست، %s را ببینید."
 
-#: actions/version.php:191
-msgid "Plugins"
-msgstr "افزونه‌ها"
+#. TRANS: Form input field label for application name.
+#: actions/version.php:197 lib/applicationeditform.php:190
+msgid "Name"
+msgstr "نام"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:901
+#: actions/version.php:198 lib/action.php:885
 msgid "Version"
 msgstr "نسخه"
 
@@ -6741,6 +6916,12 @@ msgstr "نسخه"
 msgid "Author(s)"
 msgstr "مؤلف(ها)"
 
+#. TRANS: Form input field label.
+#: actions/version.php:200 lib/applicationeditform.php:208
+#: lib/groupeditform.php:168
+msgid "Description"
+msgstr "توصیف"
+
 #. TRANS: Activity title when marking a notice as favorite.
 #: classes/Fave.php:164
 msgid "Favor"
@@ -6857,7 +7038,7 @@ msgid "Could not create login token for %s"
 msgstr "نمی‌توان رمز ورود را برای %s ایجاد کرد"
 
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
-#: classes/Memcached_DataObject.php:542
+#: classes/Memcached_DataObject.php:556
 msgid "No database name or DSN found anywhere."
 msgstr "هیچ پایگاه‌داده یا DSN هیچ‌جا پیدا نشد."
 
@@ -7034,18 +7215,18 @@ msgstr "%1$s اکنون پیام‌های شما را در %2$s دنبال می
 
 #. TRANS: Notice given on user registration.
 #. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:395
+#: classes/User.php:390
 #, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr "@%2$s، به %1$s خوش آمدید!"
 
 #. TRANS: Server exception.
-#: classes/User.php:918
+#: classes/User.php:923
 msgid "No single user defined for single-user mode."
 msgstr "هیچ کاربر تنهایی برای حالت تک کاربره مشخص نشده است."
 
 #. TRANS: Server exception.
-#: classes/User.php:922
+#: classes/User.php:927
 msgid "Single-user mode code called when not enabled."
 msgstr ""
 
@@ -7091,41 +7272,6 @@ msgstr ""
 msgid "No AtomPub API service for %s."
 msgstr ""
 
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:104
-msgid "Change your profile settings"
-msgstr "تنظیمات نمایه‌تان را تغییر دهید"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:111
-msgid "Upload an avatar"
-msgstr "بارگذاری یک چهره"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:118
-msgid "Change your password"
-msgstr "تغییر گذرواژهٔ شما"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:125
-msgid "Change email handling"
-msgstr "تغیر تنظیمات ایمل ."
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:132
-msgid "Design your profile"
-msgstr "نمایهٔ خود را طراحی کنید"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:139
-msgid "Other options"
-msgstr "انتخابات دیگر"
-
-#. TRANS: Link description in user account settings menu.
-#: lib/accountsettingsaction.php:141
-msgid "Other"
-msgstr "دیگر"
-
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
 #: lib/action.php:161
 #, php-format
@@ -7143,206 +7289,128 @@ msgctxt "TOOLTIP"
 msgid "Show more"
 msgstr ""
 
-#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:544
-msgid "Primary site navigation"
-msgstr "مسیریابی اصلی وب‌گاه"
+#. TRANS: Inline reply form submit button: submits a reply comment.
+#: lib/action.php:328
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Comment"
+msgstr "محتوا"
 
-#. TRANS: Tooltip for main menu option "Personal".
-#: lib/action.php:550
-msgctxt "TOOLTIP"
-msgid "Personal profile and friends timeline"
-msgstr "نمایهٔ شخصی و خط‌زمانی دوستان"
+#. TRANS: Placeholder text for inline reply form. Clicking in this box will turn it into a mini notice form.
+#: lib/action.php:331
+msgid "Add a comment..."
+msgstr ""
 
-#. TRANS: Main menu option when logged in for access to personal profile and friends timeline.
-#. TRANS: Personal group navigation menu option when logged in for viewing timeline of self and friends.
-#: lib/action.php:553 lib/personalgroupnav.php:100
-msgctxt "MENU"
-msgid "Personal"
-msgstr "شخصی"
+#: lib/action.php:559 lib/personalgroupnav.php:99
+#, fuzzy
+msgid "Home"
+msgstr "صفحهٔ خانگی"
 
-#. TRANS: Tooltip for main menu option "Account".
-#: lib/action.php:555
-msgctxt "TOOLTIP"
-msgid "Change your email, avatar, password, profile"
-msgstr "پست الکترونیکی، تصویر، گذرواژه یا نمایهٔ خودتان را تغییر دهید"
-
-#. TRANS: Main menu option when logged in for access to user settings.
-#: lib/action.php:558
-msgid "Account"
-msgstr "حساب کاربری"
-
-#. TRANS: Tooltip for main menu option "Services".
 #: lib/action.php:560
-msgctxt "TOOLTIP"
-msgid "Connect to services"
-msgstr "اتصال به سرویس‌ها"
+#, fuzzy
+msgid "Friends timeline"
+msgstr "خط‌زمانی %s"
 
-#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services.
-#: lib/action.php:563
-msgid "Connect"
-msgstr "وصل‌شدن"
-
-#. TRANS: Tooltip for menu option "Admin".
 #: lib/action.php:566
-msgctxt "TOOLTIP"
-msgid "Change site configuration"
-msgstr "تغییر پیکربندی وب‌گاه"
+#, fuzzy
+msgid "Your profile"
+msgstr "نمایهٔ گروه"
 
-#. TRANS: Main menu option when logged in and site admin for access to site configuration.
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/action.php:569 lib/groupnav.php:117
-msgctxt "MENU"
-msgid "Admin"
-msgstr "مدیر"
+#: lib/action.php:570 lib/action.php:593 lib/publicgroupnav.php:78
+msgid "Public"
+msgstr "عمومی"
 
-#. TRANS: Tooltip for main menu option "Invite".
-#: lib/action.php:573
-#, php-format
-msgctxt "TOOLTIP"
-msgid "Invite friends and colleagues to join you on %s"
-msgstr "دوستان و همکاران‌تان را دعوت کنید تا به شما در %s بپیوندند"
+#: lib/action.php:571 lib/action.php:594
+#, fuzzy
+msgid "Everyone on this site"
+msgstr "پیدا کردن افراد در این وب‌گاه"
+
+#: lib/action.php:575
+#, fuzzy
+msgid "Settings"
+msgstr "تنظیمات پیامک"
 
-#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users.
 #: lib/action.php:576
-msgctxt "MENU"
-msgid "Invite"
-msgstr "دعوت‌کردن"
+#, fuzzy
+msgid "Change your personal settings"
+msgstr "تنظیمات نمایه‌تان را تغییر دهید"
 
-#. TRANS: Tooltip for main menu option "Logout"
 #: lib/action.php:582
-msgctxt "TOOLTIP"
-msgid "Logout from the site"
-msgstr "خارج‌شدن از وب‌گاه"
+#, fuzzy
+msgid "Site configuration"
+msgstr "پیکربندی کاربر"
 
-#. TRANS: Main menu option when logged in to log out the current user.
-#: lib/action.php:585
-msgctxt "MENU"
+#: lib/action.php:587
+#, fuzzy
 msgid "Logout"
 msgstr "خروج"
 
-#. TRANS: Tooltip for main menu option "Register".
-#: lib/action.php:590
-msgctxt "TOOLTIP"
-msgid "Create an account"
-msgstr "ساختن یک جساب‌کاربری"
+#: lib/action.php:588
+#, fuzzy
+msgid "Logout from the site"
+msgstr "خارج‌شدن از وب‌گاه"
 
-#. TRANS: Main menu option when not logged in to register a new account.
-#. TRANS: Menu item for registering with the StatusNet site.
-#: lib/action.php:593 lib/logingroupnav.php:85
-msgctxt "MENU"
-msgid "Register"
-msgstr "ثبت‌نام"
-
-#. TRANS: Tooltip for main menu option "Login".
-#: lib/action.php:596
-msgctxt "TOOLTIP"
+#: lib/action.php:599
+#, fuzzy
 msgid "Login to the site"
 msgstr "ورود به وب‌گاه"
 
-#. TRANS: Main menu option when not logged in to log in.
-#. TRANS: Menu item for logging in to the StatusNet site.
-#: lib/action.php:599 lib/logingroupnav.php:77
-msgctxt "MENU"
-msgid "Login"
-msgstr "ورود"
-
-#. TRANS: Tooltip for main menu option "Help".
-#: lib/action.php:602
-msgctxt "TOOLTIP"
-msgid "Help me!"
-msgstr "به من کمک کنید!"
-
-#. TRANS: Main menu option for help on the StatusNet site.
-#: lib/action.php:605
-msgctxt "MENU"
-msgid "Help"
-msgstr "کمک"
-
-#. TRANS: Tooltip for main menu option "Search".
-#: lib/action.php:608
-msgctxt "TOOLTIP"
-msgid "Search for people or text"
-msgstr "جست‌وجو برای افراد یا متن"
-
-#. TRANS: Main menu option when logged in or when the StatusNet instance is not private.
-#: lib/action.php:611
-msgctxt "MENU"
+#: lib/action.php:606
+#, fuzzy
 msgid "Search"
 msgstr "جست‌وجو"
 
-#. TRANS: DT element for site notice. String is hidden in default CSS.
-#. TRANS: Menu item for site administration
-#: lib/action.php:633 lib/adminpanelaction.php:387
-msgid "Site notice"
-msgstr "پیام وب‌گاه"
-
-#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:700
-msgid "Local views"
-msgstr "دید محلی"
-
-#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:770
-msgid "Page notice"
-msgstr "پیام صفحه"
-
-#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:874
-msgid "Secondary site navigation"
-msgstr "مسیریابی فرعی وب‌گاه"
+#: lib/action.php:607
+#, fuzzy
+msgid "Search the site"
+msgstr "جست‌وجوی وب‌گاه"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:880
+#: lib/action.php:864
 msgid "Help"
 msgstr "کمک"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:883
+#: lib/action.php:867
 msgid "About"
 msgstr "دربارهٔ"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:886
+#: lib/action.php:870
 msgid "FAQ"
 msgstr "سوال‌های رایج"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:891
+#: lib/action.php:875
 msgid "TOS"
 msgstr "شرایط سرویس"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:895
+#: lib/action.php:879
 msgid "Privacy"
 msgstr "خصوصی"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:898
+#: lib/action.php:882
 msgid "Source"
 msgstr "منبع"
 
 #. TRANS: Secondary navigation menu option leading to e-mail contact information on the
 #. TRANS: StatusNet site, where to report bugs, ...
-#: lib/action.php:905
+#: lib/action.php:889
 msgid "Contact"
 msgstr "تماس"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:908
+#: lib/action.php:892
 msgid "Badge"
 msgstr "نشان"
 
-#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:937
-msgid "StatusNet software license"
-msgstr "StatusNet مجوز نرم افزار"
-
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:944
+#: lib/action.php:921
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7352,7 +7420,7 @@ msgstr ""
 "broughtbyurl%%) برای شما راه‌اندازی شده است."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:947
+#: lib/action.php:924
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** یک سرویس میکروبلاگینگ است."
@@ -7361,7 +7429,7 @@ msgstr "**%%site.name%%** یک سرویس میکروبلاگینگ است."
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:954
+#: lib/action.php:931
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7372,51 +7440,41 @@ msgstr ""
 "اجرا می‌کند که زیر مجوز [GNU Affero General Public License](http://www.fsf."
 "org/licensing/licenses/agpl-3.0.html) در دسترس است."
 
-#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:970
-msgid "Site content license"
-msgstr "مجوز محتویات وب‌گاه"
-
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:977
+#: lib/action.php:949
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr "محتویات و داده‌های %1$s خصوصی و محرمانه هستند."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:984
+#: lib/action.php:956
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr "حق تکثیر محتوا و داده‌ها با %1$s است. تمام حقوق محفوظ است."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:988
+#: lib/action.php:960
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr "حق تکثیر محتوا و داده‌ها با مشارکت‌کنندگان است. تمام حقوق محفوظ است."
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:1020
+#: lib/action.php:992
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr "تمام محتویات و داده‌های %1$s زیر مجوز %2$s در دسترس هستند."
 
-#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1356
-msgid "Pagination"
-msgstr "صفحه بندى"
-
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1367
+#: lib/action.php:1335
 msgid "After"
 msgstr "پس از"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1377
+#: lib/action.php:1345
 msgid "Before"
 msgstr "قبل از"
 
@@ -7571,7 +7629,7 @@ msgid "User configuration"
 msgstr "پیکربندی کاربر"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:122
+#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:110
 msgid "User"
 msgstr "کاربر"
 
@@ -7595,6 +7653,11 @@ msgstr "پیکربندی نشست‌ها"
 msgid "Edit site notice"
 msgstr "ویرایش پیام وب‌گاه"
 
+#. TRANS: Menu item for site administration
+#: lib/adminpanelaction.php:387
+msgid "Site notice"
+msgstr "پیام وب‌گاه"
+
 #. TRANS: Menu item title/tooltip
 #: lib/adminpanelaction.php:393
 msgid "Snapshots configuration"
@@ -7605,6 +7668,12 @@ msgstr "پیکربندی تصاویر لحظه‌ای"
 msgid "Set site license"
 msgstr ""
 
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:409
+#, fuzzy
+msgid "Plugins configuration"
+msgstr "پیکربندی مسیرها"
+
 #. TRANS: Client error 401.
 #: lib/apiauth.php:111
 msgid "API resource requires read-write access, but you only have read access."
@@ -7617,19 +7686,23 @@ msgstr ""
 msgid "No application for that consumer key."
 msgstr ""
 
+#: lib/apiauth.php:202 lib/apiauth.php:284
+msgid "Not allowed to use API."
+msgstr ""
+
 #. TRANS: OAuth exception given when an incorrect access token was given for a user.
-#: lib/apiauth.php:219
+#: lib/apiauth.php:225
 msgid "Bad access token."
 msgstr ""
 
 #. TRANS: OAuth exception given when no user was found for a given token (no token was found).
-#: lib/apiauth.php:224
+#: lib/apiauth.php:230
 msgid "No user for that token."
 msgstr ""
 
 #. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel".
 #. TRANS: Client error thrown when authentication fails.
-#: lib/apiauth.php:266 lib/apiauth.php:293
+#: lib/apiauth.php:272 lib/apiauth.php:302
 msgid "Could not authenticate you."
 msgstr ""
 
@@ -7676,6 +7749,11 @@ msgstr ""
 msgid "Failed to delete revoked token."
 msgstr ""
 
+#. TRANS: Form input field label for application icon.
+#: lib/applicationeditform.php:177
+msgid "Icon"
+msgstr "شمایل"
+
 #. TRANS: Form guide.
 #: lib/applicationeditform.php:182
 msgid "Icon for this application"
@@ -7709,6 +7787,11 @@ msgstr "نشانی اینترنتی منبع"
 msgid "Organization responsible for this application"
 msgstr "سازمان مسئول این برنامه"
 
+#. TRANS: Form input field label.
+#: lib/applicationeditform.php:227
+msgid "Organization"
+msgstr "سازمان"
+
 #. TRANS: Form input field instructions.
 #: lib/applicationeditform.php:234
 msgid "URL for the homepage of the organization"
@@ -7797,16 +7880,6 @@ msgstr ""
 msgid "Do not use this method!"
 msgstr "این پیام را پاک نکن"
 
-#. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:293
-msgid "Author"
-msgstr "مؤلف"
-
-#. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:307
-msgid "Provider"
-msgstr "مهیا کننده"
-
 #. TRANS: Title.
 #: lib/attachmentnoticesection.php:67
 msgid "Notices where this attachment appears"
@@ -7834,24 +7907,29 @@ msgstr "تغییر گذرواژه مجاز نیست"
 msgid "Block"
 msgstr "بازداشتن"
 
+#. TRANS: Description of the form to block a user.
+#: lib/blockform.php:79
+msgid "Block this user"
+msgstr "کاربر را مسدود کن"
+
 #. TRANS: Title for command results.
-#: lib/channel.php:160 lib/channel.php:181
+#: lib/channel.php:104 lib/channel.php:125
 msgid "Command results"
 msgstr "نتیجه دستور"
 
 #. TRANS: Title for command results.
-#: lib/channel.php:194
+#: lib/channel.php:138
 #, fuzzy
 msgid "AJAX error"
 msgstr "خطای آژاکس"
 
 #. TRANS: E-mail subject when a command has completed.
-#: lib/channel.php:233 lib/mailhandler.php:143
+#: lib/channel.php:177 lib/mailhandler.php:143
 msgid "Command complete"
 msgstr "دستور انجام شد"
 
 #. TRANS: E-mail subject when a command has failed.
-#: lib/channel.php:244
+#: lib/channel.php:188
 msgid "Command failed"
 msgstr "فرمان شکست خورد"
 
@@ -7955,7 +8033,7 @@ msgstr "نام کامل : %s"
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a location.
-#: lib/command.php:446 lib/mail.php:270
+#: lib/command.php:446 lib/mail.php:275
 #, php-format
 msgid "Location: %s"
 msgstr "موقعیت : %s"
@@ -7963,7 +8041,7 @@ msgstr "موقعیت : %s"
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a homepage.
-#: lib/command.php:450 lib/mail.php:274
+#: lib/command.php:450 lib/mail.php:279
 #, php-format
 msgid "Homepage: %s"
 msgstr "صفحه خانگی : %s"
@@ -8233,115 +8311,105 @@ msgstr ""
 "tracking - هنوز پیاده نشده است.\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:162
+#: lib/common.php:36
 #, fuzzy
 msgid "No configuration file found."
 msgstr "بدون کد تصدیق."
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:165
+#: lib/common.php:39
 #, fuzzy
 msgid "I looked for configuration files in the following places:"
 msgstr "من به دنبال پرونده‌های پیکربندی در مکان‌های زیر بودم: "
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:168
+#: lib/common.php:42
 msgid "You may wish to run the installer to fix this."
 msgstr "شما ممکن است بخواهید نصاب را اجرا کنید تا این را تعمیر کند."
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:172
+#: lib/common.php:46
 msgid "Go to the installer."
 msgstr "برو به نصاب."
 
-#. TRANS: Menu item for Instant Messaging settings.
-#: lib/connectsettingsaction.php:106
-#, fuzzy
-msgctxt "MENU"
-msgid "IM"
-msgstr "پیام‌رسان فوری"
-
-#. TRANS: Tooltip for Instant Messaging menu item.
-#: lib/connectsettingsaction.php:108
-msgid "Updates by instant messenger (IM)"
-msgstr "به‌هنگام‌سازی‌های انجام‌شده با پیام‌رسان فوری (IM)"
-
-#. TRANS: Menu item for Short Message Service settings.
-#: lib/connectsettingsaction.php:113
-#, fuzzy
-msgctxt "MENU"
-msgid "SMS"
-msgstr "پیامک"
-
-#. TRANS: Tooltip for Short Message Service menu item.
-#: lib/connectsettingsaction.php:115
-msgid "Updates by SMS"
-msgstr "به‌روزرسانی با پیامک"
-
-#. TRANS: Menu item for OuAth connection settings.
-#: lib/connectsettingsaction.php:120
-#, fuzzy
-msgctxt "MENU"
-msgid "Connections"
-msgstr "اتصال‌ها"
-
-#. TRANS: Tooltip for connected applications (Connections through OAuth) menu item.
-#: lib/connectsettingsaction.php:122
-msgid "Authorized connected applications"
-msgstr "برنامه‌های وصل‌شدهٔ مجاز"
-
 #: lib/dberroraction.php:59
 msgid "Database error"
 msgstr "خطای پایگاه داده"
 
+#. TRANS: Description of form for deleting a user.
+#: lib/deleteuserform.php:75
+msgid "Delete this user"
+msgstr "حذف این کاربر"
+
+#: lib/designform.php:114
+#, fuzzy
+msgid "Change design"
+msgstr "ذخیره‌کردن طرح"
+
+#. TRANS: Fieldset legend on profile design page to change profile page colours.
+#: lib/designform.php:131
+msgid "Change colours"
+msgstr "تغییر رنگ‌ها"
+
+#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
+#: lib/designform.php:138
+msgid "Use defaults"
+msgstr "استفاده‌کردن از پیش‌فرض‌ها"
+
+#. TRANS: Title for button on profile design page to reset all colour settings to default.
+#: lib/designform.php:140
+msgid "Restore default designs"
+msgstr "بازگرداندن طرح‌های پیش‌فرض"
+
+#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
+#: lib/designform.php:148
+msgid "Reset back to default"
+msgstr "برگشت به حالت پیش گزیده"
+
 #. TRANS: Label in form on profile design page.
 #. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
-#: lib/designsettings.php:108
+#: lib/designform.php:158
 msgid "Upload file"
 msgstr "بارگذاری پرونده"
 
 #. TRANS: Instructions for form on profile design page.
-#: lib/designsettings.php:113
+#: lib/designform.php:163
+#, fuzzy
 msgid ""
-"You can upload your personal background image. The maximum file size is 2MB."
+"You can upload your personal background image. The maximum file size is 2Mb."
 msgstr ""
 "شما می‌توانید تصویر پیش‌زمینهٔ شخصی خود را بارگذاری کنید. بیشینهٔ اندازهٔ پرونده "
 "۲ مگابایت است."
 
 #. TRANS: Radio button on profile design page that will enable use of the uploaded profile image.
-#: lib/designsettings.php:139
+#: lib/designform.php:194
 #, fuzzy
 msgctxt "RADIO"
 msgid "On"
 msgstr "روشن"
 
 #. TRANS: Radio button on profile design page that will disable use of the uploaded profile image.
-#: lib/designsettings.php:156
+#: lib/designform.php:211
 #, fuzzy
 msgctxt "RADIO"
 msgid "Off"
 msgstr "خاموش"
 
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: lib/designsettings.php:175
-msgid "Change colours"
-msgstr "تغییر رنگ‌ها"
-
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: lib/designsettings.php:257
-msgid "Use defaults"
-msgstr "استفاده‌کردن از پیش‌فرض‌ها"
+#. TRANS: Title for button on profile design page to save settings.
+#: lib/designform.php:322
+msgid "Save design"
+msgstr "ذخیره‌کردن طرح"
 
 #. TRANS: Error message displayed if design settings could not be saved.
 #. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
-#: lib/designsettings.php:405 lib/designsettings.php:427
+#: lib/designsettings.php:216 lib/designsettings.php:238
 msgid "Couldn't update your design."
 msgstr "نمی‌توان ظاهر را به روز کرد."
 
 #. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
-#: lib/designsettings.php:433
+#: lib/designsettings.php:244
 msgid "Design defaults restored."
 msgstr "پیش‌فرض‌های طراحی برگردانده شدند."
 
@@ -8412,27 +8480,23 @@ msgstr ""
 msgid "Feeds"
 msgstr ""
 
-#: lib/galleryaction.php:121
-msgid "Filter tags"
-msgstr "پالایهٔ برچسب‌ها"
-
-#: lib/galleryaction.php:131
+#: lib/galleryaction.php:128
 msgid "All"
 msgstr "همه"
 
-#: lib/galleryaction.php:139
+#: lib/galleryaction.php:136
 msgid "Select tag to filter"
 msgstr "برچسب را برای پالودن انتخاب کنید"
 
-#: lib/galleryaction.php:140
+#: lib/galleryaction.php:137
 msgid "Tag"
 msgstr "برچسب"
 
-#: lib/galleryaction.php:141
+#: lib/galleryaction.php:138
 msgid "Choose a tag to narrow list"
 msgstr "یک برچسب را برای محدود کردن فهرست انتخاب کنید"
 
-#: lib/galleryaction.php:143
+#: lib/galleryaction.php:140
 msgid "Go"
 msgstr "برو"
 
@@ -8519,6 +8583,12 @@ msgctxt "TOOLTIP"
 msgid "%s blocked users"
 msgstr ""
 
+#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
+#: lib/groupnav.php:117
+msgctxt "MENU"
+msgid "Admin"
+msgstr "مدیر"
+
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
 #: lib/groupnav.php:120
@@ -8626,39 +8696,63 @@ msgid "%dB"
 msgid_plural "%dB"
 msgstr[0] ""
 
-#: lib/jabber.php:387
+#: lib/implugin.php:262
 #, php-format
-msgid "[%s]"
+msgid ""
+"User \"%s\" on %s has said that your %s screenname belongs to them. If "
+"that's true, you can confirm by clicking on this URL: %s . (If you cannot "
+"click it, copy-and-paste it into the address bar of your browser). If that "
+"user isn't you, or if you didn't request this confirmation, just ignore this "
+"message."
 msgstr ""
 
-#: lib/jabber.php:567
+#: lib/implugin.php:349
 #, php-format
 msgid "Unknown inbox source %d."
 msgstr "منبع صندوق ورودی نامعلوم است %d."
 
+#: lib/implugin.php:485
+#, fuzzy, php-format
+msgid "Message too long - maximum is %1$d characters, you sent %2$d."
+msgstr ""
+"پیام خیلی طولانی است - حداکثر تعداد مجاز %1$d نویسه است که شما %2$d نویسه را "
+"فرستادید."
+
 #: lib/leaveform.php:114
 msgid "Leave"
 msgstr "ترک کردن"
 
+#. TRANS: Menu item for logging in to the StatusNet site.
+#: lib/logingroupnav.php:77
+msgctxt "MENU"
+msgid "Login"
+msgstr "ورود"
+
 #. TRANS: Title for menu item for logging in to the StatusNet site.
 #: lib/logingroupnav.php:79
 msgid "Login with a username and password"
 msgstr "وارد شدن با یک نام کاربری و گذرواژه"
 
+#. TRANS: Menu item for registering with the StatusNet site.
+#: lib/logingroupnav.php:85
+msgctxt "MENU"
+msgid "Register"
+msgstr "ثبت‌نام"
+
 #. TRANS: Title for menu item for registering with the StatusNet site.
 #: lib/logingroupnav.php:87
 msgid "Sign up for a new account"
 msgstr "عضویت برای حساب کاربری جدید"
 
 #. TRANS: Subject for address confirmation email.
-#: lib/mail.php:168
+#: lib/mail.php:172
 msgid "Email address confirmation"
 msgstr "تایید نشانی پست الکترونیکی"
 
 #. TRANS: Body for address confirmation email.
 #. TRANS: %1$s is the addressed user's nickname, %2$s is the StatusNet sitename,
 #. TRANS: %3$s is the URL to confirm at.
-#: lib/mail.php:173
+#: lib/mail.php:177
 #, fuzzy, php-format
 msgid ""
 "Hey, %1$s.\n"
@@ -8690,14 +8784,14 @@ msgstr ""
 
 #. TRANS: Subject of new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
-#: lib/mail.php:238
+#: lib/mail.php:243
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1$s اکنون پیام‌های شما را در %2$s دنبال می‌کند."
 
 #. TRANS: This is a paragraph in a new-subscriber e-mail.
 #. TRANS: %s is a URL where the subscriber can be reported as abusive.
-#: lib/mail.php:245
+#: lib/mail.php:250
 #, php-format
 msgid ""
 "If you believe this account is being used abusively, you can block them from "
@@ -8709,7 +8803,7 @@ msgstr ""
 #. TRANS: %3$s is the subscriber's profile URL, %4$s is the subscriber's location (or empty)
 #. TRANS: %5$s is the subscriber's homepage URL (or empty), %6%s is the subscriber's bio (or empty)
 #. TRANS: %7$s is a link to the addressed user's e-mail settings.
-#: lib/mail.php:255
+#: lib/mail.php:260
 #, fuzzy, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -8736,14 +8830,14 @@ msgstr ""
 
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is biographical information.
-#: lib/mail.php:278
+#: lib/mail.php:283
 #, php-format
 msgid "Bio: %s"
 msgstr "شرح‌حال: %s"
 
 #. TRANS: Subject of notification mail for new posting email address.
 #. TRANS: %s is the StatusNet sitename.
-#: lib/mail.php:307
+#: lib/mail.php:312
 #, php-format
 msgid "New email address for posting to %s"
 msgstr "%s ادرس ایمیل جدید برای"
@@ -8751,7 +8845,7 @@ msgstr "%s ادرس ایمیل جدید برای"
 #. TRANS: Body of notification mail for new posting email address.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is the e-mail address to send
 #. TRANS: to to post by e-mail, %3$s is a URL to more instructions.
-#: lib/mail.php:313
+#: lib/mail.php:318
 #, fuzzy, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -8774,26 +8868,26 @@ msgstr ""
 
 #. TRANS: Subject line for SMS-by-email notification messages.
 #. TRANS: %s is the posting user's nickname.
-#: lib/mail.php:434
+#: lib/mail.php:439
 #, php-format
 msgid "%s status"
 msgstr "وضعیت %s"
 
 #. TRANS: Subject line for SMS-by-email address confirmation message.
-#: lib/mail.php:460
+#: lib/mail.php:465
 msgid "SMS confirmation"
 msgstr "تأیید پیامک"
 
 #. TRANS: Main body heading for SMS-by-email address confirmation message.
 #. TRANS: %s is the addressed user's nickname.
-#: lib/mail.php:464
+#: lib/mail.php:469
 #, php-format
 msgid "%s: confirm you own this phone number with this code:"
 msgstr "%s: شماره تلفن خود را با این کد تایید کنید:"
 
 #. TRANS: Subject for 'nudge' notification email.
 #. TRANS: %s is the nudging user.
-#: lib/mail.php:485
+#: lib/mail.php:490
 #, fuzzy, php-format
 msgid "You have been nudged by %s"
 msgstr "شما توسط %s یادآوری شدید."
@@ -8801,7 +8895,7 @@ msgstr "شما توسط %s یادآوری شدید."
 #. TRANS: Body for 'nudge' notification email.
 #. TRANS: %1$s is the nuding user's long name, $2$s is the nudging user's nickname,
 #. TRANS: %3$s is a URL to post notices at, %4$s is the StatusNet sitename.
-#: lib/mail.php:492
+#: lib/mail.php:497
 #, php-format
 msgid ""
 "%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -8830,7 +8924,7 @@ msgstr ""
 
 #. TRANS: Subject for direct-message notification email.
 #. TRANS: %s is the sending user's nickname.
-#: lib/mail.php:539
+#: lib/mail.php:544
 #, php-format
 msgid "New private message from %s"
 msgstr "پیام خصوصی تازه از %s"
@@ -8839,7 +8933,7 @@ msgstr "پیام خصوصی تازه از %s"
 #. TRANS: %1$s is the sending user's long name, %2$s is the sending user's nickname,
 #. TRANS: %3$s is the message content, %4$s a URL to the message,
 #. TRANS: %5$s is the StatusNet sitename.
-#: lib/mail.php:547
+#: lib/mail.php:552
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -8874,7 +8968,7 @@ msgstr ""
 
 #. TRANS: Subject for favorite notification e-mail.
 #. TRANS: %1$s is the adding user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:599
+#: lib/mail.php:604
 #, fuzzy, php-format
 msgid "%1$s (@%2$s) added your notice as a favorite"
 msgstr "پیام شما را به برگزیده‌های خود اضافه کرد %s (@%s)"
@@ -8884,7 +8978,7 @@ msgstr "پیام شما را به برگزیده‌های خود اضافه کر
 #. TRANS: %3$s is a URL to the faved notice, %4$s is the faved notice text,
 #. TRANS: %5$s is a URL to all faves of the adding user, %6$s is the StatusNet sitename,
 #. TRANS: %7$s is the adding user's nickname.
-#: lib/mail.php:606
+#: lib/mail.php:611
 #, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -8926,7 +9020,7 @@ msgstr ""
 "%6$s\n"
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:664
+#: lib/mail.php:669
 #, php-format
 msgid ""
 "The full conversation can be read here:\n"
@@ -8939,7 +9033,7 @@ msgstr ""
 
 #. TRANS: E-mail subject for notice notification.
 #. TRANS: %1$s is the sending user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:672
+#: lib/mail.php:677
 #, fuzzy, php-format
 msgid "%1$s (@%2$s) sent a notice to your attention"
 msgstr "%s (@%s) به توجه شما یک پیام فرستاد"
@@ -8950,7 +9044,7 @@ msgstr "%s (@%s) به توجه شما یک پیام فرستاد"
 #. TRANS: %5$s is a URL to the full conversion if it exists (otherwise empty),
 #. TRANS: %6$s is a URL to reply to the notice, %7$s is a URL to all @-replied for the addressed user,
 #. TRANS: %8$s is a URL to the addressed user's e-mail settings, %9$s is the sender's nickname.
-#: lib/mail.php:680
+#: lib/mail.php:685
 #, php-format
 msgid ""
 "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -9090,11 +9184,7 @@ msgstr "تایید نشده!"
 msgid "To"
 msgstr "به"
 
-#: lib/messageform.php:166 lib/noticeform.php:186
-msgid "Available characters"
-msgstr "کاراکترهای موجود"
-
-#: lib/messageform.php:185 lib/noticeform.php:237
+#: lib/messageform.php:184 lib/noticeform.php:236
 msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr "فرستادن"
@@ -9104,15 +9194,10 @@ msgstr "فرستادن"
 msgid "Messages"
 msgstr "پیام"
 
-#: lib/messagelistitem.php:123 lib/noticelist.php:522
+#: lib/messagelistitem.php:123 lib/noticelist.php:527
 msgid "from"
 msgstr "از"
 
-#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:165
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr "لقب باید شامل حروف کوچک و اعداد و بدون فاصله باشد."
-
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 #: lib/nickname.php:178
 msgid "Nickname cannot be empty."
@@ -9134,23 +9219,23 @@ msgstr "فرستادن یک پیام"
 msgid "What's up, %s?"
 msgstr "چه خبر، %s؟"
 
-#: lib/noticeform.php:194
+#: lib/noticeform.php:193
 msgid "Attach"
 msgstr "پیوست کردن"
 
-#: lib/noticeform.php:198
+#: lib/noticeform.php:197
 msgid "Attach a file"
 msgstr "یک فایل پیوست کنید"
 
-#: lib/noticeform.php:213
+#: lib/noticeform.php:212
 msgid "Share my location"
 msgstr "مکان من به اشتراک گذاشته شود"
 
-#: lib/noticeform.php:216
+#: lib/noticeform.php:215
 msgid "Do not share my location"
 msgstr "موقعیت من به اشتراک گذاشته نشود"
 
-#: lib/noticeform.php:217
+#: lib/noticeform.php:216
 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
 "try again later"
@@ -9159,56 +9244,60 @@ msgstr ""
 "دوباره تلاش کنید."
 
 #. TRANS: Used in coordinates as abbreviation of north
-#: lib/noticelist.php:452
+#: lib/noticelist.php:457
 #, fuzzy
 msgid "N"
 msgstr "خیر"
 
 #. TRANS: Used in coordinates as abbreviation of south
-#: lib/noticelist.php:454
+#: lib/noticelist.php:459
 msgid "S"
 msgstr ""
 
 #. TRANS: Used in coordinates as abbreviation of east
-#: lib/noticelist.php:456
+#: lib/noticelist.php:461
 msgid "E"
 msgstr ""
 
 #. TRANS: Used in coordinates as abbreviation of west
-#: lib/noticelist.php:458
+#: lib/noticelist.php:463
 msgid "W"
 msgstr ""
 
-#: lib/noticelist.php:460
+#: lib/noticelist.php:465
 #, php-format
 msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgstr ""
 
-#: lib/noticelist.php:469
+#: lib/noticelist.php:474
 msgid "at"
 msgstr "در"
 
-#: lib/noticelist.php:518
+#: lib/noticelist.php:523
 msgid "web"
 msgstr ""
 
-#: lib/noticelist.php:584
+#: lib/noticelist.php:589
 msgid "in context"
 msgstr "در زمینه"
 
-#: lib/noticelist.php:619
+#: lib/noticelist.php:624
 msgid "Repeated by"
 msgstr "تکرار از"
 
-#: lib/noticelist.php:646
+#: lib/noticelist.php:651
 msgid "Reply to this notice"
 msgstr "به این پیام پاسخ دهید"
 
-#: lib/noticelist.php:647
+#: lib/noticelist.php:652
 msgid "Reply"
 msgstr "پاسخ"
 
-#: lib/noticelist.php:691
+#: lib/noticelist.php:678
+msgid "Delete this notice"
+msgstr "این پیام را پاک کن"
+
+#: lib/noticelist.php:696
 msgid "Notice repeated"
 msgstr "پیام تکرار شد"
 
@@ -9245,48 +9334,31 @@ msgstr ""
 msgid "Couldn't insert new subscription."
 msgstr "نمی‌توان اشتراک تازه‌ای افزود."
 
-#. TRANS: Personal group navigation menu option when logged in for viewing @-replies.
-#: lib/personalgroupnav.php:107
+#: lib/personalgroupnav.php:104
 #, fuzzy
-msgctxt "MENU"
 msgid "Replies"
 msgstr "پاسخ ها"
 
-#. TRANS: Personal group navigation menu option when logged in for seeing own profile.
-#: lib/personalgroupnav.php:114
+#: lib/personalgroupnav.php:109
 #, fuzzy
-msgctxt "MENU"
-msgid "Profile"
-msgstr "نمایه"
-
-#. TRANS: Personal group navigation menu option when logged in for viewing own favourited notices.
-#: lib/personalgroupnav.php:120
-#, fuzzy
-msgctxt "MENU"
 msgid "Favorites"
 msgstr "برگزیده‌ها"
 
-#. TRANS: Personal group navigation menu option when logged in for viewing recieved personal messages.
-#: lib/personalgroupnav.php:133
+#: lib/personalgroupnav.php:120
 #, fuzzy
-msgctxt "MENU"
 msgid "Inbox"
 msgstr "صندوق دریافتی"
 
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing recieved personal messages.
-#: lib/personalgroupnav.php:135
+#: lib/personalgroupnav.php:121
 msgid "Your incoming messages"
 msgstr "پیام های وارد شونده ی شما"
 
-#. TRANS: Personal group navigation menu option when logged in for viewing senet personal messages.
-#: lib/personalgroupnav.php:140
+#: lib/personalgroupnav.php:125
 #, fuzzy
-msgctxt "MENU"
 msgid "Outbox"
 msgstr "صندوق خروجی"
 
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing senet personal messages.
-#: lib/personalgroupnav.php:142
+#: lib/personalgroupnav.php:126
 msgid "Your sent messages"
 msgstr "پیام‌های فرستاده شدهٔ شما"
 
@@ -9301,9 +9373,26 @@ msgstr "برچسب‌ها در پیام‌های %s"
 msgid "Unknown"
 msgstr "ناشناخته"
 
+#. TRANS: Plugin admin panel controls
+#: lib/plugindisableform.php:90
+msgctxt "plugin"
+msgid "Disable"
+msgstr ""
+
+#. TRANS: Plugin admin panel controls
+#: lib/pluginenableform.php:112
+msgctxt "plugin"
+msgid "Enable"
+msgstr ""
+
+#: lib/pluginlist.php:196
+msgctxt "plugin-description"
+msgid "(Plugin descriptions unavailable when disabled.)"
+msgstr ""
+
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:82
+#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:88
 msgid "Subscriptions"
 msgstr "اشتراک‌ها"
 
@@ -9314,7 +9403,7 @@ msgstr "تمام اشتراک‌ها"
 
 #. TRANS: H2 text for user subscriber statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:90
+#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:96
 msgid "Subscribers"
 msgstr "مشترک‌ها"
 
@@ -9336,7 +9425,7 @@ msgstr "عضو شده از"
 #. TRANS: Label for user statistics.
 #. TRANS: H2 text for user group membership statistics.
 #: lib/profileaction.php:239 lib/profileaction.php:290
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:104
 msgid "Groups"
 msgstr "گروه‌ها"
 
@@ -9356,10 +9445,6 @@ msgstr "تمام گروه‌ها"
 msgid "Unimplemented method."
 msgstr "روش پیاده نشده است."
 
-#: lib/publicgroupnav.php:78
-msgid "Public"
-msgstr "عمومی"
-
 #: lib/publicgroupnav.php:82
 msgid "User groups"
 msgstr "گروه‌های کاربر"
@@ -9399,7 +9484,7 @@ msgid "Revoke the \"%s\" role from this user"
 msgstr "دسترسی کاربر به گروه مسدود شود"
 
 #. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:974
+#: lib/router.php:1001
 #, fuzzy
 msgid "Page not found."
 msgstr "رابط مورد نظر پیدا نشد."
@@ -9431,11 +9516,6 @@ msgctxt "BUTTON"
 msgid "Search"
 msgstr ""
 
-#. TRANS: Definition list item with instructions on how to get (better) search results.
-#: lib/searchaction.php:170
-msgid "Search help"
-msgstr "راهنمای جستجو"
-
 #: lib/searchgroupnav.php:80
 msgid "People"
 msgstr "افراد"
@@ -9460,6 +9540,51 @@ msgstr "بخش بی‌نام"
 msgid "More..."
 msgstr "بیش‌تر..."
 
+#: lib/settingsnav.php:78
+msgid "Change your profile settings"
+msgstr "تنظیمات نمایه‌تان را تغییر دهید"
+
+#: lib/settingsnav.php:83
+msgid "Upload an avatar"
+msgstr "بارگذاری یک چهره"
+
+#: lib/settingsnav.php:88
+msgid "Change your password"
+msgstr "تغییر گذرواژهٔ شما"
+
+#: lib/settingsnav.php:93
+msgid "Change email handling"
+msgstr "تغیر تنظیمات ایمل ."
+
+#: lib/settingsnav.php:98
+msgid "Design your profile"
+msgstr "نمایهٔ خود را طراحی کنید"
+
+#: lib/settingsnav.php:102
+msgid "URL"
+msgstr "نشانی اینترنتی"
+
+#: lib/settingsnav.php:103
+msgid "URL shorteners"
+msgstr ""
+
+#: lib/settingsnav.php:111
+msgid "Updates by instant messenger (IM)"
+msgstr "به‌هنگام‌سازی‌های انجام‌شده با پیام‌رسان فوری (IM)"
+
+#: lib/settingsnav.php:118
+msgid "Updates by SMS"
+msgstr "به‌روزرسانی با پیامک"
+
+#: lib/settingsnav.php:123
+#, fuzzy
+msgid "Connections"
+msgstr "اتصال‌ها"
+
+#: lib/settingsnav.php:124
+msgid "Authorized connected applications"
+msgstr "برنامه‌های وصل‌شدهٔ مجاز"
+
 #: lib/silenceform.php:67
 msgid "Silence"
 msgstr "ساکت کردن"
@@ -9468,30 +9593,34 @@ msgstr "ساکت کردن"
 msgid "Silence this user"
 msgstr "ساکت کردن این کاربر"
 
-#: lib/subgroupnav.php:83
+#: lib/subgroupnav.php:89
 #, fuzzy, php-format
 msgid "People %s subscribes to"
 msgstr "افراد مشترک %s"
 
-#: lib/subgroupnav.php:91
+#: lib/subgroupnav.php:97
 #, php-format
 msgid "People subscribed to %s"
 msgstr "افراد مشترک %s"
 
-#: lib/subgroupnav.php:99
+#: lib/subgroupnav.php:105
 #, php-format
 msgid "Groups %s is a member of"
 msgstr "هست عضو %s گروه"
 
-#: lib/subgroupnav.php:105
+#: lib/subgroupnav.php:111
 msgid "Invite"
 msgstr "دعوت‌کردن"
 
-#: lib/subgroupnav.php:106
+#: lib/subgroupnav.php:112
 #, php-format
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "به شما ملحق شوند  %s دوستان و همکاران را دعوت کنید تا در"
 
+#: lib/subscribeform.php:115 lib/subscribeform.php:139
+msgid "Subscribe to this user"
+msgstr "مشترک شدن این کاربر"
+
 #: lib/subscriberspeopleselftagcloudsection.php:48
 #: lib/subscriptionspeopleselftagcloudsection.php:48
 msgid "People Tagcloud as self-tagged"
@@ -9562,6 +9691,12 @@ msgstr ""
 msgid "Error opening theme archive."
 msgstr "خطا هنگام به‌هنگام‌سازی نمایهٔ از راه دور."
 
+#: lib/threadednoticelist.php:270
+#, php-format
+msgid "Show all %d comment"
+msgid_plural "Show all %d comments"
+msgstr[0] ""
+
 #: lib/topposterssection.php:74
 msgid "Top posters"
 msgstr "اعلان های بالا"
@@ -9605,119 +9740,123 @@ msgstr "لغو اشتراک"
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "کاربر هیچ نمایه‌ای ندارد."
 
-#. TRANS: Link text for changeing the avatar of the logged in user.
-#: lib/userprofile.php:121
+#: lib/userprofile.php:116
 msgid "Edit Avatar"
 msgstr "ویرایش اواتور"
 
 #. TRANS: H2 for user actions in a profile.
 #. TRANS: H2 for entity actions in a profile.
-#: lib/userprofile.php:245 lib/userprofile.php:261
+#: lib/userprofile.php:216 lib/userprofile.php:232
 msgid "User actions"
 msgstr "اعمال کاربر"
 
 #. TRANS: Text shown in user profile of not yet compeltely deleted users.
-#: lib/userprofile.php:249
+#: lib/userprofile.php:220
 msgid "User deletion in progress..."
 msgstr "پاک‌کردن کاربر در حالت اجرا است..."
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:277
+#: lib/userprofile.php:248
 msgid "Edit profile settings"
 msgstr "ویرایش تنظیمات نمایه"
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:279
+#: lib/userprofile.php:250
 msgid "Edit"
 msgstr "ویرایش"
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:303
+#: lib/userprofile.php:274
 msgid "Send a direct message to this user"
 msgstr "پیام مستقیم به این کاربر بفرستید"
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:305
+#: lib/userprofile.php:276
 msgid "Message"
 msgstr "پیام"
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:347
+#: lib/userprofile.php:318
 msgid "Moderate"
 msgstr "اداره کردن"
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:386
+#: lib/userprofile.php:357
 msgid "User role"
 msgstr "وظیفهٔ کاربر"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:389
+#: lib/userprofile.php:360
 msgctxt "role"
 msgid "Administrator"
 msgstr "رئیس"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:391
+#: lib/userprofile.php:362
 msgctxt "role"
 msgid "Moderator"
 msgstr "مدیر"
 
+#: lib/util.php:321
+#, fuzzy
+msgid "Not allowed to log in."
+msgstr "شما به سیستم وارد نشده اید."
+
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1306
+#: lib/util.php:1337
 msgid "a few seconds ago"
 msgstr "چند ثانیه پیش"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1309
+#: lib/util.php:1340
 msgid "about a minute ago"
 msgstr "حدود یک دقیقه پیش"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1313
+#: lib/util.php:1344
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
 msgstr[0] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1316
+#: lib/util.php:1347
 msgid "about an hour ago"
 msgstr "حدود یک ساعت پیش"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1320
+#: lib/util.php:1351
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
 msgstr[0] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1323
+#: lib/util.php:1354
 msgid "about a day ago"
 msgstr "حدود یک روز پیش"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1327
+#: lib/util.php:1358
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
 msgstr[0] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1330
+#: lib/util.php:1361
 msgid "about a month ago"
 msgstr "حدود یک ماه پیش"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1334
+#: lib/util.php:1365
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
 msgstr[0] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1337
+#: lib/util.php:1368
 msgid "about a year ago"
 msgstr "حدود یک سال پیش"
 
@@ -9728,22 +9867,6 @@ msgstr "حدود یک سال پیش"
 msgid "%s is not a valid color! Use 3 or 6 hex characters."
 msgstr "%s یک رنگ صحیح نیست! از ۳ یا ۶ نویسه مبنای شانزده استفاده کنید"
 
-#. TRANS: %s is the URL to the StatusNet site's Instant Messaging settings.
-#: lib/xmppmanager.php:287
-#, php-format
-msgid "Unknown user. Go to %s to add your address to your account"
-msgstr ""
-
-#. TRANS: Response to XMPP source when it sent too long a message.
-#. TRANS: %1$d the maximum number of allowed characters (used for plural), %2$d is the sent number.
-#: lib/xmppmanager.php:406
-#, fuzzy, php-format
-msgid "Message too long. Maximum is %1$d character, you sent %2$d."
-msgid_plural "Message too long. Maximum is %1$d characters, you sent %2$d."
-msgstr[0] ""
-"پیام خیلی طولانی است - حداکثر تعداد مجاز %1$d نویسه است که شما %2$d نویسه را "
-"فرستادید."
-
 #. TRANS: Exception.
 #: lib/xrd.php:63
 #, fuzzy
@@ -9762,71 +9885,174 @@ msgid "Getting backup from file '%s'."
 msgstr ""
 
 #, fuzzy
-#~ msgid "Block this user."
-#~ msgstr "کاربر را مسدود کن"
+#~ msgid "Could not generate feed for group - %s"
+#~ msgstr "نمی‌توان گروه را به‌هنگام‌سازی کرد."
 
 #, fuzzy
-#~ msgid "Delete this notice."
-#~ msgstr "این پیام را پاک کن"
-
-#, fuzzy
-#~ msgid "Delete this user."
-#~ msgstr "حذف این کاربر"
-
-#, fuzzy
-#~ msgid "Restore default designs."
-#~ msgstr "بازگرداندن طرح‌های پیش‌فرض"
-
-#, fuzzy
-#~ msgid "Reset back to default."
-#~ msgstr "برگشت به حالت پیش گزیده"
-
-#, fuzzy
-#~ msgid "Save design."
-#~ msgstr "ذخیره‌کردن طرح"
-
-#, fuzzy
-#~ msgid "Disfavor favorite."
-#~ msgstr "خارج‌کردن از برگزیده‌ها"
-
-#, fuzzy
-#~ msgid "\"%s\" not found."
-#~ msgstr "رابط مورد نظر پیدا نشد."
-
-#, fuzzy
-#~ msgid "Notice %s not found."
-#~ msgstr "رابط مورد نظر پیدا نشد."
-
-#, fuzzy
-#~ msgid "Attachment %s not found."
-#~ msgstr "کاربر گیرنده یافت نشد."
-
-#, fuzzy
-#~ msgid "Invalid tag: \"%s\"."
-#~ msgstr "نشان نادرست »%s«"
-
-#, fuzzy
-#~ msgid "%s updates from everyone."
-#~ msgstr "%s به روز رسانی های عموم"
-
-#, fuzzy
-#~ msgid "Password saved"
-#~ msgstr "گذرواژه ذخیره شد."
-
-#, fuzzy
-#~ msgid "Where you are, like \"City, State (or Region), Country\"."
-#~ msgstr "مکانی که شما در آن هستید، مانند «شهر، ایالت (یا استان)، کشور»"
-
-#, fuzzy
-#~ msgid "Subscribe to this user."
-#~ msgstr "مشترک شدن این کاربر"
+#~ msgid "Current confirmed Jabber/Google Talk address."
+#~ msgstr "نشانی Jabber/GTalk تایید شده کنونی"
 
 #, fuzzy
 #~ msgid ""
-#~ "Listenee stream license \"%1$s\" is not compatible with site license \"%2"
-#~ "$s\"."
-#~ msgstr "مجوز پیام «%1$s» با مجوز وب‌گاه «%2$s» سازگار نیست."
+#~ "Jabber or Google Talk address, like \"UserName@example.org\". First, make "
+#~ "sure to add %s to your buddy list in your IM client or on Google Talk."
+#~ msgstr ""
+#~ "نشانی Jabber یا GTalk، مانند «UserName@example.org». ابتدا از اضافه کردن %"
+#~ "s به فهرست دوستان خود در کارگیر پیام‌رسان فوری‌تان یا در GTalk مطمئن شوید."
 
 #, fuzzy
-#~ msgid "Not allowed to log in."
-#~ msgstr "شما به سیستم وارد نشده اید."
+#~ msgid "Send me notices through Jabber/Google Talk."
+#~ msgstr "پیام‌ها را از راه Jabber/GTalk برای من بفرست."
+
+#, fuzzy
+#~ msgid "Publish a MicroID for my Jabber/Google Talk address."
+#~ msgstr "یک شناسهٔ کوچک برای Jabber/Gtalk من منتشر کن."
+
+#~ msgid "No Jabber ID."
+#~ msgstr "هیچ شناسهٔ Jabber ای وجود ندارد."
+
+#, fuzzy
+#~ msgid "Not a valid Jabber ID."
+#~ msgstr "شناسهٔ Jabber درست نیست"
+
+#~ msgid "That is already your Jabber ID."
+#~ msgstr "این شناسه Jabber کنونی شماست."
+
+#~ msgid "That is not your Jabber ID."
+#~ msgstr "این شناسهٔ Jabber شما نیست."
+
+#~ msgid "Other settings"
+#~ msgstr "تنظیمات دیگر"
+
+#~ msgid "Tag cloud"
+#~ msgstr "ابر برچسب"
+
+#~ msgid "Consumer key"
+#~ msgstr "کلید مصرف‌کننده"
+
+#~ msgid "Consumer secret"
+#~ msgstr "رمز مصرف‌کننده"
+
+#~ msgid "Request token URL"
+#~ msgstr "نشانی اینترنتی شناسهٔ درخواست"
+
+#~ msgid "Access token URL"
+#~ msgstr "نشانی اینترنتی نشانهٔ درخواست"
+
+#~ msgid "Authorize URL"
+#~ msgstr "نشانی اجازه‌دادن"
+
+#~ msgid "Jabber"
+#~ msgstr "Jabber"
+
+#~ msgid "Photo"
+#~ msgstr "تصویر"
+
+#~ msgid "Other options"
+#~ msgstr "انتخابات دیگر"
+
+#~ msgid "Other"
+#~ msgstr "دیگر"
+
+#~ msgid "Primary site navigation"
+#~ msgstr "مسیریابی اصلی وب‌گاه"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Personal profile and friends timeline"
+#~ msgstr "نمایهٔ شخصی و خط‌زمانی دوستان"
+
+#~ msgctxt "MENU"
+#~ msgid "Personal"
+#~ msgstr "شخصی"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Change your email, avatar, password, profile"
+#~ msgstr "پست الکترونیکی، تصویر، گذرواژه یا نمایهٔ خودتان را تغییر دهید"
+
+#~ msgid "Account"
+#~ msgstr "حساب کاربری"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Connect to services"
+#~ msgstr "اتصال به سرویس‌ها"
+
+#~ msgid "Connect"
+#~ msgstr "وصل‌شدن"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Change site configuration"
+#~ msgstr "تغییر پیکربندی وب‌گاه"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Invite friends and colleagues to join you on %s"
+#~ msgstr "دوستان و همکاران‌تان را دعوت کنید تا به شما در %s بپیوندند"
+
+#~ msgctxt "MENU"
+#~ msgid "Invite"
+#~ msgstr "دعوت‌کردن"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Create an account"
+#~ msgstr "ساختن یک جساب‌کاربری"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Help me!"
+#~ msgstr "به من کمک کنید!"
+
+#~ msgctxt "MENU"
+#~ msgid "Help"
+#~ msgstr "کمک"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Search for people or text"
+#~ msgstr "جست‌وجو برای افراد یا متن"
+
+#~ msgid "Local views"
+#~ msgstr "دید محلی"
+
+#~ msgid "Page notice"
+#~ msgstr "پیام صفحه"
+
+#~ msgid "Secondary site navigation"
+#~ msgstr "مسیریابی فرعی وب‌گاه"
+
+#~ msgid "StatusNet software license"
+#~ msgstr "StatusNet مجوز نرم افزار"
+
+#~ msgid "Site content license"
+#~ msgstr "مجوز محتویات وب‌گاه"
+
+#~ msgid "Pagination"
+#~ msgstr "صفحه بندى"
+
+#~ msgid "Author"
+#~ msgstr "مؤلف"
+
+#~ msgid "Provider"
+#~ msgstr "مهیا کننده"
+
+#, fuzzy
+#~ msgctxt "MENU"
+#~ msgid "SMS"
+#~ msgstr "پیامک"
+
+#~ msgid "Filter tags"
+#~ msgstr "پالایهٔ برچسب‌ها"
+
+#~ msgid "Available characters"
+#~ msgstr "کاراکترهای موجود"
+
+#, fuzzy
+#~ msgctxt "MENU"
+#~ msgid "Profile"
+#~ msgstr "نمایه"
+
+#~ msgid "Search help"
+#~ msgstr "راهنمای جستجو"
+
+#, fuzzy
+#~ msgid "Message too long. Maximum is %1$d character, you sent %2$d."
+#~ msgid_plural "Message too long. Maximum is %1$d characters, you sent %2$d."
+#~ msgstr[0] ""
+#~ "پیام خیلی طولانی است - حداکثر تعداد مجاز %1$d نویسه است که شما %2$d نویسه "
+#~ "را فرستادید."
diff --git a/locale/fi/LC_MESSAGES/statusnet.po b/locale/fi/LC_MESSAGES/statusnet.po
index 0fc354c901..28cf56ad14 100644
--- a/locale/fi/LC_MESSAGES/statusnet.po
+++ b/locale/fi/LC_MESSAGES/statusnet.po
@@ -15,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 15:58+0000\n"
-"PO-Revision-Date: 2011-03-03 16:00:28+0000\n"
+"POT-Creation-Date: 2011-03-03 17:23+0000\n"
+"PO-Revision-Date: 2011-03-03 17:25:58+0000\n"
 "Language-Team: Finnish <http://translatewiki.net/wiki/Portal:fi>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -83,23 +83,23 @@ msgstr "Tallenna käyttöoikeusasetukset"
 #. TRANS: Tooltip for button to save access settings in site admin panel.
 #. TRANS: Button text for saving theme settings.
 #. TRANS: Button label to save e-mail preferences.
-#. TRANS: Button label to save Instant Messaging preferences.
-#. TRANS: Button text for saving "Other settings" in profile.
+#. TRANS: Button label to save IM preferences.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
 #. TRANS: Button text for saving site notice in admin panel.
 #. TRANS: Button label to save SMS preferences.
 #. TRANS: Save button for settings for a profile in a subscriptions list.
+#. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
 #. TRANS: Button text on profile design page to save settings.
 #: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
-#: actions/emailsettings.php:250 actions/imsettings.php:183
-#: actions/othersettings.php:136 actions/pathsadminpanel.php:512
-#: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
-#: actions/smssettings.php:205 actions/subscriptions.php:259
+#: actions/emailsettings.php:251 actions/imsettings.php:199
+#: actions/pathsadminpanel.php:512 actions/profilesettings.php:198
+#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:204
+#: actions/subscriptions.php:261 actions/urlsettings.php:152
 #: actions/useradminpanel.php:298 lib/applicationeditform.php:355
-#: lib/designsettings.php:270 lib/groupeditform.php:201
+#: lib/designform.php:320 lib/groupeditform.php:201
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Tallenna"
@@ -138,7 +138,11 @@ msgstr "Sivua ei ole."
 #. 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 use "one time password login" without using an existing user.
+#. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
+#. TRANS: Client error displayed trying to find a user by ID for a non-existing ID.
+#. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when calling a profile action without specifying a user.
 #: actions/all.php:80 actions/allrss.php:69
@@ -150,19 +154,19 @@ msgstr "Sivua ei ole."
 #: actions/apidirectmessage.php:75 actions/apidirectmessagenew.php:72
 #: actions/apigroupcreate.php:111 actions/apigroupismember.php:89
 #: actions/apigroupjoin.php:98 actions/apigroupleave.php:98
-#: actions/apigrouplist.php:70 actions/apistatusesupdate.php:230
-#: actions/apisubscriptions.php:85 actions/apitimelinefavorites.php:70
-#: actions/apitimelinefriends.php:173 actions/apitimelinehome.php:78
-#: actions/apitimelinementions.php:77 actions/apitimelineuser.php:79
-#: actions/avatarbynickname.php:79 actions/favoritesrss.php:72
-#: actions/foaf.php:42 actions/foaf.php:61 actions/hcard.php:67
-#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
-#: actions/remotesubscribe.php:144 actions/remotesubscribe.php:153
-#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
-#: actions/showfavorites.php:106 actions/userbyid.php:74
-#: actions/usergroups.php:93 actions/userrss.php:40 actions/userxrd.php:59
-#: actions/xrds.php:71 lib/command.php:509 lib/galleryaction.php:59
-#: lib/mailbox.php:80 lib/profileaction.php:77
+#: actions/apigrouplist.php:70 actions/apigroupprofileupdate.php:108
+#: actions/apistatusesupdate.php:230 actions/apisubscriptions.php:85
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:173
+#: actions/apitimelinehome.php:78 actions/apitimelinementions.php:77
+#: actions/apitimelineuser.php:79 actions/avatarbynickname.php:79
+#: actions/favoritesrss.php:72 actions/foaf.php:42 actions/foaf.php:61
+#: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116
+#: actions/otp.php:78 actions/remotesubscribe.php:144
+#: actions/remotesubscribe.php:153 actions/replies.php:73
+#: actions/repliesrss.php:38 actions/rsd.php:113 actions/showfavorites.php:106
+#: actions/userbyid.php:75 actions/usergroups.php:93 actions/userrss.php:40
+#: actions/userxrd.php:59 actions/xrds.php:71 lib/command.php:509
+#: lib/galleryaction.php:59 lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Käyttäjää ei ole."
 
@@ -176,10 +180,9 @@ msgstr "%1$s ja kaverit, sivu %2$d"
 #. TRANS: H1 text for page. %s is a user nickname.
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Timeline title for user and friends. %s is a user nickname.
-#. TRANS: Tooltop for personal group navigation menu option when logged in for viewing timeline of self and friends.
 #: actions/all.php:94 actions/all.php:191 actions/allrss.php:117
 #: actions/apitimelinefriends.php:207 actions/apitimelinehome.php:113
-#: lib/personalgroupnav.php:102
+#: lib/personalgroupnav.php:100
 #, php-format
 msgid "%s and friends"
 msgstr "%s ja kaverit"
@@ -237,7 +240,7 @@ msgstr ""
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
 #. TRANS: Second sentence of empty message for anonymous users. %s is a user nickname.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:227
+#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:221
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -284,19 +287,20 @@ msgstr "Käyttäjän %1$s ja kavereiden päivitykset palvelussa %2$s!"
 #: actions/apifavoritecreate.php:98 actions/apifavoritedestroy.php:98
 #: actions/apifriendshipscreate.php:99 actions/apifriendshipsdestroy.php:99
 #: actions/apifriendshipsshow.php:124 actions/apigroupcreate.php:138
-#: actions/apigroupismember.php:115 actions/apigroupjoin.php:160
-#: actions/apigroupleave.php:145 actions/apigrouplist.php:134
+#: actions/apigroupismember.php:115 actions/apigroupjoin.php:151
+#: actions/apigroupleave.php:141 actions/apigrouplist.php:134
 #: actions/apigrouplistall.php:120 actions/apigroupmembership.php:105
+#: actions/apigroupprofileupdate.php:100 actions/apigroupprofileupdate.php:213
 #: actions/apigroupshow.php:114 actions/apihelptest.php:84
 #: actions/apistatusesdestroy.php:101 actions/apistatusesretweets.php:110
 #: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:139
 #: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
-#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:268
-#: actions/apitimelinegroup.php:147 actions/apitimelinehome.php:173
-#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:239
-#: actions/apitimelineretweetedtome.php:118
-#: actions/apitimelineretweetsofme.php:150 actions/apitimelinetag.php:159
-#: actions/apitimelineuser.php:206 actions/apiusershow.php:100
+#: actions/apitimelinefavorites.php:182 actions/apitimelinefriends.php:276
+#: actions/apitimelinegroup.php:148 actions/apitimelinehome.php:181
+#: actions/apitimelinementions.php:182 actions/apitimelinepublic.php:247
+#: actions/apitimelineretweetedtome.php:147
+#: actions/apitimelineretweetsofme.php:147 actions/apitimelinetag.php:165
+#: actions/apitimelineuser.php:217 actions/apiusershow.php:100
 msgid "API method not found."
 msgstr "API-metodia ei löytynyt."
 
@@ -311,8 +315,9 @@ msgstr "API-metodia ei löytynyt."
 #: actions/apifavoritecreate.php:88 actions/apifavoritedestroy.php:88
 #: actions/apifriendshipscreate.php:89 actions/apifriendshipsdestroy.php:89
 #: actions/apigroupcreate.php:102 actions/apigroupjoin.php:89
-#: actions/apigroupleave.php:89 actions/apimediaupload.php:66
-#: actions/apistatusesretweet.php:63 actions/apistatusesupdate.php:194
+#: actions/apigroupleave.php:89 actions/apigroupprofileupdate.php:92
+#: actions/apimediaupload.php:66 actions/apistatusesretweet.php:63
+#: actions/apistatusesupdate.php:194
 msgid "This method requires a POST."
 msgstr "Tämä metodi edellyttää POST-pyynnön."
 
@@ -325,21 +330,16 @@ msgstr ""
 "Sinun pitää antaa parametri 'device', jonka arvona on 'sms', 'im' tai 'none'."
 
 #. TRANS: Server error displayed when a user's delivery device cannot be updated.
-#. TRANS: Server error displayed when a user update to the database fails in the contact address confirmation action.
 #. TRANS: Server error thrown on database error updating e-mail preferences.
 #. TRANS: Server error thrown on database error removing a registered e-mail address.
-#. TRANS: Server error thrown on database error updating Instant Messaging preferences.
-#. TRANS: Server error thrown on database error removing a registered Instant Messaging address.
-#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
 #. TRANS: Server error thrown when user profile settings could not be updated.
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
-#: actions/apiaccountupdatedeliverydevice.php:130
-#: actions/confirmaddress.php:118 actions/emailsettings.php:352
-#: actions/emailsettings.php:498 actions/imsettings.php:276
-#: actions/imsettings.php:432 actions/othersettings.php:186
-#: actions/profilesettings.php:322 actions/smssettings.php:301
-#: actions/smssettings.php:454
+#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
+#: actions/apiaccountupdatedeliverydevice.php:136
+#: actions/emailsettings.php:353 actions/emailsettings.php:499
+#: actions/profilesettings.php:323 actions/smssettings.php:300
+#: actions/smssettings.php:453 actions/urlsettings.php:211
 msgid "Could not update user."
 msgstr "Käyttäjän päivitys epäonnistui."
 
@@ -365,7 +365,7 @@ msgstr "Käyttäjällä ei ole profiilia."
 
 #. TRANS: Server error displayed if a user profile could not be saved.
 #. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:418
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:419
 msgid "Could not save profile."
 msgstr "Profiilin tallennus epäonnistui."
 
@@ -377,7 +377,7 @@ msgstr "Profiilin tallennus epäonnistui."
 #: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
 #: actions/designadminpanel.php:120 actions/editapplication.php:121
 #: actions/newapplication.php:102 actions/newnotice.php:95
-#: lib/designsettings.php:298
+#: lib/designsettings.php:110
 #, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s byte) due to its "
@@ -398,8 +398,8 @@ msgstr[1] ""
 #: actions/apiaccountupdateprofilecolors.php:160
 #: actions/apiaccountupdateprofilecolors.php:171
 #: actions/groupdesignsettings.php:285 actions/groupdesignsettings.php:296
-#: actions/userdesignsettings.php:201 actions/userdesignsettings.php:211
-#: actions/userdesignsettings.php:253 actions/userdesignsettings.php:263
+#: actions/userdesignsettings.php:218 actions/userdesignsettings.php:228
+#: actions/userdesignsettings.php:270 actions/userdesignsettings.php:280
 msgid "Unable to save your design settings."
 msgstr "Ulkoasun tallennus epäonnistui."
 
@@ -407,7 +407,7 @@ msgstr "Ulkoasun tallennus epäonnistui."
 #. TRANS: Client error displayed when a database error occurs updating profile colours.
 #: actions/apiaccountupdateprofilebackgroundimage.php:191
 #: actions/apiaccountupdateprofilecolors.php:139
-#: actions/userdesignsettings.php:179
+#: actions/userdesignsettings.php:196
 msgid "Could not update your design."
 msgstr "Ulkoasua ei voitu päivittää."
 
@@ -515,8 +515,7 @@ msgstr "Vastaanottajaa ei löytynyt."
 
 #. TRANS: Client error displayed trying to direct message another user who's not a friend (403).
 #: actions/apidirectmessagenew.php:144
-#, fuzzy
-msgid "Can't send direct messages to users who aren't your friend."
+msgid "Cannot send direct messages to users who aren't your friend."
 msgstr ""
 "Et voi lähettää suoraa viestiä käyttäjälle, jonka kanssa et ole vielä kaveri."
 
@@ -598,9 +597,9 @@ msgstr "Ei voitu päivittää käyttäjää."
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:156 actions/editgroup.php:191
-#: actions/newgroup.php:137 actions/profilesettings.php:273
-#: actions/register.php:214
+#: actions/apigroupcreate.php:156 actions/apigroupprofileupdate.php:255
+#: actions/editgroup.php:191 actions/newgroup.php:137
+#: actions/profilesettings.php:274 actions/register.php:199
 msgid "Nickname already in use. Try another one."
 msgstr "Tunnus on jo käytössä. Yritä toista tunnusta."
 
@@ -608,9 +607,9 @@ msgstr "Tunnus on jo käytössä. Yritä toista tunnusta."
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:164 actions/editgroup.php:195
-#: actions/newgroup.php:141 actions/profilesettings.php:243
-#: actions/register.php:216
+#: actions/apigroupcreate.php:164 actions/apigroupprofileupdate.php:259
+#: actions/editgroup.php:195 actions/newgroup.php:141
+#: actions/profilesettings.php:244 actions/register.php:201
 msgid "Not a valid nickname."
 msgstr "Tuo ei ole kelvollinen tunnus."
 
@@ -620,10 +619,10 @@ msgstr "Tuo ei ole kelvollinen tunnus."
 #. TRANS: Validation error shown when providing an invalid homepage URL in the "New application" form.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:181 actions/editapplication.php:235
-#: actions/editgroup.php:202 actions/newapplication.php:221
-#: actions/newgroup.php:148 actions/profilesettings.php:248
-#: actions/register.php:223
+#: actions/apigroupcreate.php:181 actions/apigroupprofileupdate.php:277
+#: actions/editapplication.php:235 actions/editgroup.php:202
+#: actions/newapplication.php:221 actions/newgroup.php:148
+#: actions/profilesettings.php:249 actions/register.php:208
 msgid "Homepage is not a valid URL."
 msgstr "Kotisivun verkko-osoite ei ole toimiva."
 
@@ -632,8 +631,8 @@ msgstr "Kotisivun verkko-osoite ei ole toimiva."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:191 actions/editgroup.php:206
-#: actions/newgroup.php:152 actions/profilesettings.php:252
-#: actions/register.php:226
+#: actions/newgroup.php:152 actions/profilesettings.php:253
+#: actions/register.php:211
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "Koko nimi on liian pitkä (max 255 merkkiä)."
 
@@ -660,8 +659,8 @@ msgstr[1] "kuvaus on liian pitkä (max %d merkkiä)."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:215 actions/editgroup.php:218
-#: actions/newgroup.php:164 actions/profilesettings.php:265
-#: actions/register.php:235
+#: actions/newgroup.php:164 actions/profilesettings.php:266
+#: actions/register.php:220
 msgid "Location is too long (maximum 255 characters)."
 msgstr "Kotipaikka on liian pitkä (enintään 255 merkkiä)."
 
@@ -690,15 +689,16 @@ msgstr "Virheellinen alias: %s"
 #. TRANS: %s is the alias that is already in use.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error. %s is the already used alias.
-#: actions/apigroupcreate.php:264 actions/editgroup.php:246
-#: actions/newgroup.php:193
+#: actions/apigroupcreate.php:264 actions/apigroupprofileupdate.php:351
+#: actions/editgroup.php:246 actions/newgroup.php:193
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "Alias \"%s\" on jo käytössä. Yritä toista aliasta."
 
 #. TRANS: Client error displayed when trying to use an alias during group creation that is the same as the group's nickname.
 #. TRANS: Group edit form validation error.
-#: actions/apigroupcreate.php:278 actions/editgroup.php:253
+#: actions/apigroupcreate.php:278 actions/apigroupprofileupdate.php:359
+#: actions/editgroup.php:253
 msgid "Alias can't be the same as nickname."
 msgstr "Alias ei voi olla sama kuin ryhmätunnus."
 
@@ -710,7 +710,8 @@ msgstr "Alias ei voi olla sama kuin ryhmätunnus."
 #. TRANS: Client error displayed requesting most recent notices to a group for a non-existing group.
 #: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
 #: actions/apigroupleave.php:104 actions/apigroupmembership.php:71
-#: actions/apigroupshow.php:81 actions/apitimelinegroup.php:89
+#: actions/apigroupprofileupdate.php:113 actions/apigroupshow.php:81
+#: actions/apitimelinegroup.php:89
 msgid "Group not found."
 msgstr "Ei löytynyt."
 
@@ -728,13 +729,11 @@ msgstr "Sinä kuulut jo tähän ryhmään."
 msgid "You have been blocked from that group by the admin."
 msgstr "Sinut on estetty osallistumasta tähän ryhmään ylläpitäjän toimesta."
 
-#. TRANS: Server error displayed when joining a group fails.
-#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
 #. 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.
 #. TRANS: Message given having failed to add a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:362
+#: actions/apigroupjoin.php:136 actions/joingroup.php:139 lib/command.php:362
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "Käyttäjä %1$s ei voinut liittyä ryhmään %2$s."
@@ -744,8 +743,6 @@ msgstr "Käyttäjä %1$s ei voinut liittyä ryhmään %2$s."
 msgid "You are not a member of this group."
 msgstr "Sinä et kuulu tähän ryhmään."
 
-#. TRANS: Server error displayed when leaving a group fails.
-#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
 #. TRANS: Server error displayed when leaving a group failed in the database.
 #. TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
 #. TRANS: Message given having failed to remove a user from a group.
@@ -781,6 +778,64 @@ msgstr "Käyttäjän %s ryhmät"
 msgid "groups on %s"
 msgstr "sivun %s ryhmiä"
 
+#. TRANS: Client error displayed trying to edit a group while not being a group admin.
+#. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
+#. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
+#: actions/apigroupprofileupdate.php:118 actions/editgroup.php:110
+#: actions/editgroup.php:176 actions/groupdesignsettings.php:109
+#: actions/grouplogo.php:111
+msgid "You must be an admin to edit the group."
+msgstr ""
+"Sinun pitää olla kirjautunut sisään, jotta voit muuttaa ryhmän tietoja."
+
+#. TRANS: Server error displayed when editing a group fails.
+#: actions/apigroupprofileupdate.php:171 actions/editgroup.php:274
+msgid "Could not update group."
+msgstr "Ei voitu päivittää ryhmää."
+
+#. TRANS: Server error displayed when group aliases could not be added.
+#. TRANS: Server exception thrown when creating group aliases failed.
+#: actions/apigroupprofileupdate.php:194 actions/editgroup.php:281
+#: classes/User_group.php:540
+msgid "Could not create aliases."
+msgstr "Ei voitu lisätä aliasta."
+
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: actions/apigroupprofileupdate.php:249 lib/nickname.php:165
+msgid "Nickname must have only lowercase letters and numbers and no spaces."
+msgstr ""
+"Käyttäjätunnuksessa voi olla ainoastaan pieniä kirjaimia ja numeroita ilman "
+"välilyöntiä."
+
+#: actions/apigroupprofileupdate.php:286
+#, fuzzy
+msgid "Full name is too long (max 255 chars)."
+msgstr "Koko nimi on liian pitkä (max 255 merkkiä)."
+
+#: actions/apigroupprofileupdate.php:296
+#, fuzzy, php-format
+msgid "description is too long (max %d chars)."
+msgstr "kuvaus on liian pitkä (max %d merkkiä)."
+
+#: actions/apigroupprofileupdate.php:307
+#, fuzzy
+msgid "Location is too long (max 255 chars)."
+msgstr "Kotipaikka on liian pitkä (enintään 255 merkkiä)."
+
+#: actions/apigroupprofileupdate.php:326
+#, fuzzy, php-format
+msgid "Too many aliases! Maximum %d."
+msgstr "Liikaa aliaksia. Maksimimäärä on %d."
+
+#. TRANS: Group edit form validation error.
+#. TRANS: Group create form validation error.
+#. TRANS: %s is the invalid alias.
+#: actions/apigroupprofileupdate.php:342 actions/editgroup.php:241
+#: actions/newgroup.php:188
+#, php-format
+msgid "Invalid alias: \"%s\""
+msgstr "Virheellinen alias: \"%s\""
+
 #. TRANS: Client error displayed when uploading a media file has failed.
 #: actions/apimediaupload.php:101
 msgid "Upload failed."
@@ -811,21 +866,22 @@ msgstr "Pyyntötunniste on jo hyväksytty."
 #. TRANS: Form validation error message.
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
+#. TRANS: Client error displayed when the session token is not okay.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
 #: actions/deletenotice.php:177 actions/disfavor.php:75
-#: actions/emailsettings.php:291 actions/favor.php:75 actions/geocode.php:55
+#: actions/emailsettings.php:292 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:65 actions/grouplogo.php:321
-#: actions/groupunblock.php:65 actions/imsettings.php:224
-#: actions/invite.php:60 actions/login.php:137 actions/makeadmin.php:66
-#: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
-#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
-#: actions/othersettings.php:155 actions/passwordsettings.php:138
-#: actions/profilesettings.php:217 actions/recoverpassword.php:383
-#: actions/register.php:172 actions/remotesubscribe.php:76
-#: actions/repeat.php:82 actions/smssettings.php:250 actions/subedit.php:40
-#: actions/subscribe.php:86 actions/tagother.php:166
-#: actions/unsubscribe.php:69 actions/userauthorization.php:52
-#: lib/designsettings.php:310
+#: actions/groupunblock.php:65 actions/imsettings.php:241
+#: actions/invite.php:60 actions/makeadmin.php:66 actions/newmessage.php:135
+#: actions/newnotice.php:105 actions/nudge.php:80
+#: actions/oauthappssettings.php:162 actions/oauthconnectionssettings.php:135
+#: actions/passwordsettings.php:137 actions/pluginenable.php:87
+#: actions/profilesettings.php:218 actions/recoverpassword.php:383
+#: actions/register.php:157 actions/remotesubscribe.php:76
+#: actions/repeat.php:82 actions/smssettings.php:249 actions/subedit.php:40
+#: actions/subscribe.php:87 actions/tagother.php:145
+#: actions/unsubscribe.php:69 actions/urlsettings.php:171
+#: actions/userauthorization.php:53 lib/designsettings.php:122
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 "Istuntosi avaimen kanssa oli ongelmia. Olisitko ystävällinen ja kokeilisit "
@@ -855,10 +911,10 @@ msgstr "Tietokantavirhe lisättäessä oauth_token_association-arvoa."
 #. TRANS: Unknown form validation error in design settings form.
 #: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
 #: actions/designadminpanel.php:100 actions/editapplication.php:144
-#: actions/emailsettings.php:310 actions/grouplogo.php:332
-#: actions/imsettings.php:239 actions/newapplication.php:124
-#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
-#: actions/smssettings.php:271 lib/designsettings.php:321
+#: actions/emailsettings.php:311 actions/grouplogo.php:332
+#: actions/imsettings.php:256 actions/newapplication.php:124
+#: actions/oauthconnectionssettings.php:144 actions/recoverpassword.php:46
+#: actions/smssettings.php:270 lib/designsettings.php:133
 msgid "Unexpected form submission."
 msgstr "Odottamaton lomakkeen lähetys."
 
@@ -907,31 +963,26 @@ msgstr "Käyttäjätili"
 
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Field label in form for profile settings.
-#. TRANS: Label for group nickname (dt). Text hidden by default.
-#. TRANS: DT for nick name in a profile.
-#: actions/apioauthauthorize.php:459 actions/login.php:252
-#: actions/profilesettings.php:106 actions/register.php:432
-#: actions/showgroup.php:243 actions/tagother.php:94
+#: actions/apioauthauthorize.php:459 actions/login.php:225
+#: actions/profilesettings.php:107 actions/register.php:411
 #: actions/userauthorization.php:145 lib/groupeditform.php:145
-#: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "Tunnus"
 
 #. TRANS: Field label on OAuth API authorisation form.
-#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:463 actions/login.php:255
-#: actions/register.php:436 lib/accountsettingsaction.php:120
+#: actions/apioauthauthorize.php:463 actions/login.php:228
+#: actions/register.php:415 lib/settingsnav.php:87
 msgid "Password"
 msgstr "Salasana"
 
 #. TRANS: Button text that when clicked will cancel the process of allowing access to an account
 #. TRANS: by an external application.
 #. TRANS: Button label to cancel an e-mail address confirmation procedure.
-#. TRANS: Button label to cancel an Instant Messaging address confirmation procedure.
+#. TRANS: Button label to cancel an IM address confirmation procedure.
 #. TRANS: Button label to cancel a SMS address confirmation procedure.
 #. TRANS: Button label in the "Edit application" form.
-#: actions/apioauthauthorize.php:478 actions/emailsettings.php:124
-#: actions/imsettings.php:127 actions/smssettings.php:133
+#: actions/apioauthauthorize.php:478 actions/emailsettings.php:125
+#: actions/imsettings.php:136 actions/smssettings.php:132
 #: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Cancel"
@@ -1042,8 +1093,8 @@ msgstr "HTTP-metodia ei tueta."
 #. TRANS: Exception thrown requesting an unsupported notice output format.
 #. TRANS: %s is the requested output format.
 #: actions/apistatusesshow.php:144
-#, fuzzy, php-format
-msgid "Unsupported format: %s"
+#, php-format
+msgid "Unsupported format: %s."
 msgstr "Formaatti %s ei ole tuettu."
 
 #. TRANS: Client error displayed requesting a deleted status.
@@ -1123,13 +1174,6 @@ msgstr "Käyttäjän %1$s päivitys %2$s"
 msgid "%1$s updates favorited by %2$s / %3$s."
 msgstr "Käyttäjän %1$s suosikit palvelussa %2$s!"
 
-#. TRANS: Server error displayed when generating an Atom feed fails.
-#. TRANS: %s is the error.
-#: actions/apitimelinegroup.php:134
-#, php-format
-msgid "Could not generate feed for group - %s"
-msgstr "Ryhmän %s syötettä ei voitu muodostaa."
-
 #. TRANS: Title for timeline of most recent mentions of a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname.
 #: actions/apitimelinementions.php:115
@@ -1147,13 +1191,14 @@ msgstr ""
 "%1$s -päivitykset, jotka on vastauksia käyttäjän %2$s / %3$s päivityksiin."
 
 #. TRANS: Title for site timeline. %s is the StatusNet sitename.
+#. TRANS: Public RSS feed title. %s is the StatusNet site name.
 #: actions/apitimelinepublic.php:193 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "%s julkinen aikajana"
 
 #. TRANS: Subtitle for site timeline. %s is the StatusNet sitename.
-#: actions/apitimelinepublic.php:199 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:199
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "Sivuston %s päivitykset kaikilta!"
@@ -1164,21 +1209,34 @@ msgid "Unimplemented."
 msgstr "Toimintoa ei ole vielä toteutettu."
 
 #. TRANS: Title for Atom feed "repeated to me". %s is the user nickname.
-#: actions/apitimelineretweetedtome.php:108
+#: actions/apitimelineretweetedtome.php:96
 #, fuzzy, php-format
 msgid "Repeated to %s"
 msgstr "Vastaukset käyttäjälle %s"
 
+#: actions/apitimelineretweetedtome.php:98
+#, fuzzy, php-format
+msgid "%1$s notices that were to repeated to %2$s / %3$s."
+msgstr ""
+"%1$s -päivitykset, jotka on vastauksia käyttäjän %2$s / %3$s päivityksiin."
+
 #. TRANS: Title of list of repeated notices of the logged in user.
 #. TRANS: %s is the nickname of the logged in user.
-#: actions/apitimelineretweetsofme.php:112
+#: actions/apitimelineretweetsofme.php:98
 #, fuzzy, php-format
 msgid "Repeats of %s"
 msgstr "Vastaukset käyttäjälle %s"
 
+#: actions/apitimelineretweetsofme.php:104
+#, fuzzy, php-format
+msgid "%1$s notices that %2$s / %3$s has repeated."
+msgstr "Lähetä sähköpostia, jos joku lisää päivitykseni suosikiksi."
+
 #. TRANS: Title for timeline with lastest notices with a given tag.
 #. TRANS: %s is the tag.
-#: actions/apitimelinetag.php:101 actions/tag.php:67
+#. TRANS: Title for first page of notices with tags.
+#. TRANS: %s is the tag.
+#: actions/apitimelinetag.php:101 actions/tag.php:69
 #, php-format
 msgid "Notices tagged with %s"
 msgstr "Päivitykset joilla on tagi %s"
@@ -1191,54 +1249,55 @@ msgid "Updates tagged with %1$s on %2$s!"
 msgstr "Käyttäjän %1$s suosikit palvelussa %2$s!"
 
 #. TRANS: Client error displayed trying to add a notice to another user's timeline.
-#: actions/apitimelineuser.php:297
+#: actions/apitimelineuser.php:308
 #, fuzzy
 msgid "Only the user can add to their own timeline."
 msgstr "Vain käyttäjä voi lukea omaa postilaatikkoaan."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:304
+#: actions/apitimelineuser.php:315
 msgid "Only accept AtomPub for Atom feeds."
 msgstr "Atom-syötteistä tuetaan vain AtomPub-muotoa."
 
 #. TRANS: Client error displayed attempting to post an empty API notice.
-#: actions/apitimelineuser.php:311
+#: actions/apitimelineuser.php:322
 msgid "Atom post must not be empty."
 msgstr "Atom-viesti ei saa olla tyhjä."
 
 #. TRANS: Client error displayed attempting to post an API that is not well-formed XML.
-#: actions/apitimelineuser.php:317
+#: actions/apitimelineuser.php:328
 msgid "Atom post must be well-formed XML."
 msgstr "Atom-viestin XML-rakenteen tulee olla hyvin muodostettu."
 
 #. TRANS: Client error displayed when not using an Atom entry.
-#: actions/apitimelineuser.php:323 actions/atompubfavoritefeed.php:228
+#: actions/apitimelineuser.php:334 actions/atompubfavoritefeed.php:228
 #: actions/atompubmembershipfeed.php:230
 #: actions/atompubsubscriptionfeed.php:236
 msgid "Atom post must be an Atom entry."
 msgstr "Atom-viestin tulee olla Atom-kohteen muodossa."
 
 #. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
-#: actions/apitimelineuser.php:335
+#: actions/apitimelineuser.php:345
 msgid "Can only handle POST activities."
 msgstr "Vain POST-toiminnot ovat tuettuja."
 
 #. TRANS: Client error displayed when using an unsupported activity object type.
 #. TRANS: %s is the unsupported activity object type.
-#: actions/apitimelineuser.php:346
+#: actions/apitimelineuser.php:356
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr "Toiminto-objektityyppi \"%s\" ei ole tuettu."
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
 #. TRANS: %d is the notice ID (number).
-#: actions/apitimelineuser.php:380
+#: actions/apitimelineuser.php:390
 #, php-format
 msgid "No content for notice %d."
 msgstr "Päivityksen %d sisältö puuttuu."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:408
+#. TRANS: %s is the notice URI.
+#: actions/apitimelineuser.php:419
 #, fuzzy, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "Ei profiilia tuolla id:llä."
@@ -1255,9 +1314,10 @@ msgstr "API-metodia ei löytynyt."
 
 #. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
 #. TRANS: Client exception.
+#. TRANS: Client error displayed trying to subscribe to a non-existing profile.
 #: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
 #: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
-#: actions/subscribe.php:107
+#: actions/subscribe.php:110
 msgid "No such profile."
 msgstr "Profiilia ei löydy."
 
@@ -1394,7 +1454,7 @@ msgid "Not a member."
 msgstr "Et ole jäsen."
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
-#: actions/atompubshowmembership.php:151
+#: actions/atompubshowmembership.php:150
 #, fuzzy
 msgid "Cannot delete someone else's membership."
 msgstr "Tilausta ei onnistuttu tallentamaan."
@@ -1483,10 +1543,7 @@ msgid "Invalid size."
 msgstr "Koko ei kelpaa."
 
 #. TRANS: Title for avatar upload page.
-#. TRANS: Label for group avatar (dt). Text hidden by default.
-#. TRANS: Link description in user account settings menu.
-#: actions/avatarsettings.php:66 actions/showgroup.php:227
-#: lib/accountsettingsaction.php:113
+#: actions/avatarsettings.php:66 lib/settingsnav.php:82
 msgid "Avatar"
 msgstr "Kuva"
 
@@ -1499,9 +1556,11 @@ msgstr "Voit ladata oman profiilikuvasi. Maksimikoko on %s."
 
 #. TRANS: Server error displayed in avatar upload page when no matching profile can be found for a user.
 #. TRANS: Server error displayed coming across a request from a user without a profile.
+#. TRANS: Server error displayed when trying to authorise a remote subscription request
+#. TRANS: while the user has no profile.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
 #: actions/grouplogo.php:184 actions/remotesubscribe.php:190
-#: actions/userauthorization.php:72 actions/userrss.php:108
+#: actions/userauthorization.php:75 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr "Käyttäjällä ei ole profiilia."
 
@@ -1557,10 +1616,9 @@ msgstr "Rajaa"
 msgid "No file uploaded."
 msgstr "Profiilia ei ole määritelty."
 
-#. TRANS: Avatar upload form unstruction after uploading a file.
+#. TRANS: Avatar upload form instruction after uploading a file.
 #: actions/avatarsettings.php:345
-#, fuzzy
-msgid "Pick a square area of the image to be your avatar"
+msgid "Pick a square area of the image to be your avatar."
 msgstr "Valitse neliön muotoinen alue kuvasta profiilikuvaksi."
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
@@ -1586,7 +1644,7 @@ msgstr "Kuva poistettu."
 
 #. TRANS: Title for backup account page.
 #. TRANS: Option in profile settings to create a backup of the account of the currently logged in user.
-#: actions/backupaccount.php:61 actions/profilesettings.php:467
+#: actions/backupaccount.php:61 actions/profilesettings.php:468
 msgid "Backup account"
 msgstr "Tilin varmuuskopiointi"
 
@@ -1623,8 +1681,7 @@ msgstr "Varmuuskopioi"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
 #: actions/backupaccount.php:254
-#, fuzzy
-msgid "Backup your account"
+msgid "Backup your account."
 msgstr "Varmuuskopioi käyttäjätili"
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
@@ -1665,8 +1722,7 @@ msgstr "Ei"
 
 #. TRANS: Submit button title for 'No' when blocking a user.
 #: actions/block.php:158
-#, fuzzy
-msgid "Do not block this user"
+msgid "Do not block this user."
 msgstr "Älä estä tätä käyttäjää."
 
 #. TRANS: Button label on the user block form.
@@ -1683,10 +1739,9 @@ msgid "Yes"
 msgstr "Kyllä"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#. TRANS: Description of the form to block a user.
-#: actions/block.php:165 lib/blockform.php:79
-msgid "Block this user"
-msgstr "Estä tämä käyttäjä"
+#: actions/block.php:165
+msgid "Block this user."
+msgstr "Estä tämä käyttäjä."
 
 #. TRANS: Server error displayed when blocking a user fails.
 #: actions/block.php:189
@@ -1751,31 +1806,47 @@ msgstr "Vahvistuskoodia ei löytynyt."
 msgid "That confirmation code is not for you!"
 msgstr "Tämä vahvistuskoodi ei ole sinun!"
 
-#. TRANS: Server error for a unknow address type %s, which can be 'email', 'jabber', or 'sms'.
-#: actions/confirmaddress.php:92
+#. TRANS: Server error for an unknown address type, which can be 'email', 'sms', or the name of an IM network (such as 'xmpp' or 'aim')
+#: actions/confirmaddress.php:94
 #, fuzzy, php-format
-msgid "Unrecognized address type %s."
+msgid "Unrecognized address type %s"
 msgstr "Tuntematon osoitetyyppi %s "
 
 #. TRANS: Client error for an already confirmed email/jabber/sms address.
-#: actions/confirmaddress.php:97
+#: actions/confirmaddress.php:103 actions/confirmaddress.php:136
 msgid "That address has already been confirmed."
 msgstr "Tämä osoite on jo vahvistettu."
 
+#: actions/confirmaddress.php:121 actions/imsettings.php:444
+#: actions/userdesignsettings.php:306
+#, fuzzy
+msgid "Couldn't update user."
+msgstr "Käyttäjän päivitys epäonnistui."
+
+#: actions/confirmaddress.php:144
+#, fuzzy
+msgid "Couldn't update user im preferences."
+msgstr "Ei voitu päivittää käyttäjätietoja."
+
+#: actions/confirmaddress.php:156
+#, fuzzy
+msgid "Couldn't insert user im preferences."
+msgstr "Ei voitu lisätä uutta tilausta."
+
 #. TRANS: Server error displayed when an address confirmation code deletion from the
 #. TRANS: database fails in the contact address confirmation action.
-#: actions/confirmaddress.php:132
+#: actions/confirmaddress.php:169
 msgid "Could not delete address confirmation."
 msgstr "Osoitteen vahvistusta ei voitu poistaa."
 
 #. TRANS: Title for the contact address confirmation action.
-#: actions/confirmaddress.php:150
+#: actions/confirmaddress.php:185
 msgid "Confirm address"
 msgstr "Tämän hetken vahvistettu sähköpostiosoite."
 
 #. TRANS: Success message for the contact address confirmation action.
 #. TRANS: %s can be 'email', 'jabber', or 'sms'.
-#: actions/confirmaddress.php:166
+#: actions/confirmaddress.php:200
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "Osoite \"%s\" on vahvistettu sinun käyttäjätunnuksellesi."
@@ -1789,6 +1860,7 @@ msgstr "Keskustelu"
 #. TRANS: Label for user statistics.
 #: actions/conversation.php:149 lib/noticelist.php:87
 #: lib/profileaction.php:246 lib/searchgroupnav.php:82
+#: lib/threadednoticelist.php:66
 msgid "Notices"
 msgstr "Päivitykset"
 
@@ -1822,7 +1894,7 @@ msgstr "Käyttäjätili poistettu."
 
 #. TRANS: Page title for page on which a user account can be deleted.
 #. TRANS: Option in profile settings to delete the account of the currently logged in user.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:475
+#: actions/deleteaccount.php:228 actions/profilesettings.php:476
 msgid "Delete account"
 msgstr "Poista käyttäjätili"
 
@@ -1849,7 +1921,7 @@ msgstr ""
 #. TRANS: Field label for delete account confirmation entry.
 #. TRANS: Field label for password reset form where the password has to be typed again.
 #: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:262 actions/register.php:440
+#: actions/recoverpassword.php:262 actions/register.php:419
 msgid "Confirm"
 msgstr "Vahvista"
 
@@ -1878,14 +1950,14 @@ msgstr "Vahvistuskoodia ei löytynyt."
 #. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
 #: actions/deleteapplication.php:79 actions/editapplication.php:78
-#: actions/showapplication.php:94
+#: actions/showapplication.php:90
 msgid "You are not the owner of this application."
 msgstr "Et ole tämän sovelluksen omistaja."
 
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
-#: actions/newapplication.php:112 actions/showapplication.php:118
-#: lib/action.php:1425
+#: actions/newapplication.php:112 actions/showapplication.php:113
+#: lib/action.php:1391
 msgid "There was a problem with your session token."
 msgstr "Istuntoavaimesi kanssa oli ongelma."
 
@@ -1908,14 +1980,12 @@ msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting an application.
 #: actions/deleteapplication.php:161
-#, fuzzy
-msgid "Do not delete this application"
+msgid "Do not delete this application."
 msgstr "Älä poista tätä sovellusta."
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
 #: actions/deleteapplication.php:167
-#, fuzzy
-msgid "Delete this application"
+msgid "Delete this application."
 msgstr "Poista tämä sovellus."
 
 #. TRANS: Client error when trying to delete group while not logged in.
@@ -1970,14 +2040,12 @@ msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting a group.
 #: actions/deletegroup.php:224
-#, fuzzy
-msgid "Do not delete this group"
+msgid "Do not delete this group."
 msgstr "Älä poista tätä ryhmää."
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
 #: actions/deletegroup.php:231
-#, fuzzy
-msgid "Delete this group"
+msgid "Delete this group."
 msgstr "Poista tämä ryhmä."
 
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
@@ -1985,14 +2053,16 @@ msgstr "Poista tämä ryhmä."
 #. TRANS: Client error displayed when trying to mark a notice as favorite without being logged in.
 #. TRANS: Client error displayed trying to block a user from a group while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
+#. TRANS: Client error displayed trying to log out when not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
+#. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
 #. TRANS: Client error displayed when trying to change user options while not logged in.
 #: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
-#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:69
+#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:70
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
-#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
-#: actions/tagother.php:33 actions/unsubscribe.php:52
+#: actions/nudge.php:63 actions/pluginenable.php:97 actions/subedit.php:33
+#: actions/subscribe.php:98 actions/tagother.php:33 actions/unsubscribe.php:52
 #: lib/adminpanelaction.php:71 lib/profileformaction.php:63
 #: lib/settingsaction.php:72
 msgid "Not logged in."
@@ -2020,14 +2090,13 @@ msgstr "Oletko varma että haluat poistaa tämän päivityksen?"
 
 #. TRANS: Submit button title for 'No' when deleting a notice.
 #: actions/deletenotice.php:159
-#, fuzzy
-msgid "Do not delete this notice"
+msgid "Do not delete this notice."
 msgstr "Älä poista tätä päivitystä."
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:166 lib/noticelist.php:673
-msgid "Delete this notice"
-msgstr "Poista tämä päivitys"
+#: actions/deletenotice.php:166
+msgid "Delete this notice."
+msgstr "Poista tämä päivitys."
 
 #. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
 #: actions/deleteuser.php:66
@@ -2062,18 +2131,16 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting a user.
 #: actions/deleteuser.php:158
 #, fuzzy
-msgid "Do not delete this user"
+msgid "Do not delete this user."
 msgstr "Älä poista tätä päivitystä"
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
-#. TRANS: Description of form for deleting a user.
-#: actions/deleteuser.php:165 lib/deleteuserform.php:75
-msgid "Delete this user"
-msgstr "Poista käyttäjä"
+#: actions/deleteuser.php:165
+msgid "Delete this user."
+msgstr "Poista tämä käyttäjä."
 
 #. TRANS: Message used as title for design settings for the site.
-#. TRANS: Link description in user account settings menu.
-#: actions/designadminpanel.php:60 lib/accountsettingsaction.php:134
+#: actions/designadminpanel.php:60 lib/settingsnav.php:97
 msgid "Design"
 msgstr "Ulkoasu"
 
@@ -2143,8 +2210,7 @@ msgid "You can upload a custom StatusNet theme as a .ZIP archive."
 msgstr "Voit ladata mukautetun StatusNet-teeman .ZIP-pakettina."
 
 #. TRANS: Fieldset legend for theme background image.
-#. TRANS: Fieldset legend on profile design page.
-#: actions/designadminpanel.php:515 lib/designsettings.php:98
+#: actions/designadminpanel.php:515
 msgid "Change background image"
 msgstr "Vaihda tautakuva"
 
@@ -2152,7 +2218,7 @@ msgstr "Vaihda tautakuva"
 #. TRANS: Field label for background color selector.
 #. TRANS: Label on profile design page for setting a profile page background colour.
 #: actions/designadminpanel.php:525 actions/designadminpanel.php:609
-#: lib/designsettings.php:183
+#: lib/designform.php:238
 msgid "Background"
 msgstr "Tausta"
 
@@ -2177,13 +2243,13 @@ msgstr "Off"
 #. TRANS: Form guide for turning background image on or off on theme designer page.
 #. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
 #. TRANS: use of the uploaded profile image.
-#: actions/designadminpanel.php:577 lib/designsettings.php:159
+#: actions/designadminpanel.php:577 lib/designform.php:214
 msgid "Turn background image on or off."
 msgstr "Kytke taustakuva päälle tai pois päältä."
 
 #. TRANS: Checkbox label to title background image on theme designer page.
 #. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-#: actions/designadminpanel.php:583 lib/designsettings.php:165
+#: actions/designadminpanel.php:583 lib/designform.php:220
 msgid "Tile background image"
 msgstr "Taustakuvan toisto vierekkäin"
 
@@ -2194,25 +2260,25 @@ msgstr "Vaihda värejä"
 
 #. TRANS: Field label for content color selector.
 #. TRANS: Label on profile design page for setting a profile page content colour.
-#: actions/designadminpanel.php:623 lib/designsettings.php:197
+#: actions/designadminpanel.php:623 lib/designform.php:252
 msgid "Content"
 msgstr "Sisältö"
 
 #. TRANS: Field label for sidebar color selector.
 #. TRANS: Label on profile design page for setting a profile page sidebar colour.
-#: actions/designadminpanel.php:637 lib/designsettings.php:211
+#: actions/designadminpanel.php:637 lib/designform.php:266
 msgid "Sidebar"
 msgstr "Sivupalkki"
 
 #. TRANS: Field label for text color selector.
 #. TRANS: Label on profile design page for setting a profile page text colour.
-#: actions/designadminpanel.php:651 lib/designsettings.php:225
+#: actions/designadminpanel.php:651 lib/designform.php:280
 msgid "Text"
 msgstr "Teksti"
 
 #. TRANS: Field label for link color selector.
 #. TRANS: Label on profile design page for setting a profile page links colour.
-#: actions/designadminpanel.php:665 lib/designsettings.php:239
+#: actions/designadminpanel.php:665 lib/designform.php:294
 msgid "Links"
 msgstr "Linkit"
 
@@ -2233,25 +2299,19 @@ msgid "Use defaults"
 msgstr "Käytä oletusasetuksia"
 
 #. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: actions/designadminpanel.php:720 lib/designsettings.php:259
-#, fuzzy
-msgid "Restore default designs"
-msgstr "Käytä oletusasetuksia"
+#: actions/designadminpanel.php:720
+msgid "Restore default designs."
+msgstr "Palauta oletusulkonäkö."
 
 #. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: actions/designadminpanel.php:728 lib/designsettings.php:267
-#, fuzzy
-msgid "Reset back to default"
-msgstr "Käytä oletusasetuksia"
+#: actions/designadminpanel.php:728
+msgid "Reset back to default."
+msgstr "Palauta oletusulkoasu."
 
 #. TRANS: Title for button for saving theme settings.
-#. TRANS: Title for button on profile design page to save settings.
-#: actions/designadminpanel.php:736 lib/designsettings.php:272
-#, fuzzy
-msgid "Save design"
-msgstr "Ryhmän ulkoasu"
+#: actions/designadminpanel.php:736
+msgid "Save design."
+msgstr "Tallenna ulkoasu."
 
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
 #: actions/disfavor.php:83
@@ -2284,7 +2344,7 @@ msgstr ""
 "Sinun pitää olla kirjautunut sisään, jotta voit muuttaa ryhmän tietoja."
 
 #. TRANS: Client error displayed trying to edit an application that does not exist.
-#: actions/editapplication.php:83 actions/showapplication.php:87
+#: actions/editapplication.php:83 actions/showapplication.php:83
 msgid "No such application."
 msgstr "Sovellusta ei ole."
 
@@ -2375,81 +2435,53 @@ msgstr "Muokkaa ryhmää %s"
 msgid "You must be logged in to create a group."
 msgstr "Sinun pitää olla kirjautunut sisään jotta voit luoda ryhmän."
 
-#. TRANS: Client error displayed trying to edit a group while not being a group admin.
-#. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
-#. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
-#: actions/editgroup.php:110 actions/editgroup.php:176
-#: actions/groupdesignsettings.php:109 actions/grouplogo.php:111
-msgid "You must be an admin to edit the group."
-msgstr ""
-"Sinun pitää olla kirjautunut sisään, jotta voit muuttaa ryhmän tietoja."
-
 #. TRANS: Form instructions for group edit form.
 #: actions/editgroup.php:161
 msgid "Use this form to edit the group."
 msgstr "Käytä tätä lomaketta muokataksesi ryhmää."
 
-#. TRANS: Group edit form validation error.
-#. TRANS: Group create form validation error.
-#. TRANS: %s is the invalid alias.
-#: actions/editgroup.php:241 actions/newgroup.php:188
-#, php-format
-msgid "Invalid alias: \"%s\""
-msgstr "Virheellinen alias: \"%s\""
-
-#. TRANS: Server error displayed when editing a group fails.
-#: actions/editgroup.php:274
-msgid "Could not update group."
-msgstr "Ei voitu päivittää ryhmää."
-
-#. TRANS: Server error displayed when group aliases could not be added.
-#. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/editgroup.php:281 classes/User_group.php:540
-msgid "Could not create aliases."
-msgstr "Ei voitu lisätä aliasta."
-
 #. TRANS: Group edit form success message.
 #: actions/editgroup.php:301
 msgid "Options saved."
 msgstr "Asetukset tallennettu."
 
 #. TRANS: Title for e-mail settings.
-#: actions/emailsettings.php:59
+#: actions/emailsettings.php:60
 msgid "Email settings"
 msgstr "Profiiliasetukset"
 
 #. TRANS: E-mail settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/emailsettings.php:73
+#: actions/emailsettings.php:74
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 msgstr "Määritä miten saat sähköpostin palvelusta %%site.name%%."
 
 #. TRANS: Form legend for e-mail settings form.
 #. TRANS: Field label for e-mail address input in e-mail settings form.
-#: actions/emailsettings.php:103 actions/emailsettings.php:129
+#: actions/emailsettings.php:104 actions/emailsettings.php:130
 msgid "Email address"
 msgstr "Sähköpostiosoite"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:109
+#: actions/emailsettings.php:110
 msgid "Current confirmed email address."
 msgstr "Tämän hetken vahvistettu sähköpostiosoite."
 
 #. TRANS: Button label to remove a confirmed e-mail address.
 #. TRANS: Button label for removing a set sender e-mail address to post notices from.
-#. TRANS: Button label to remove a confirmed Instant Messaging address.
+#. TRANS: Button label to remove a confirmed IM address.
 #. TRANS: Button label to remove a confirmed SMS address.
 #. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
-#: actions/emailsettings.php:112 actions/emailsettings.php:179
-#: actions/imsettings.php:112 actions/smssettings.php:120
-#: actions/smssettings.php:176
+#: actions/emailsettings.php:113 actions/emailsettings.php:180
+#: actions/imsettings.php:119 actions/smssettings.php:119
+#: actions/smssettings.php:175
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Poista"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:119
+#: actions/emailsettings.php:120
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -2463,46 +2495,46 @@ msgstr ""
 #. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
 #. TRANS: Any other domain may be owned by a legitimate person or
 #. TRANS: organization.
-#: actions/emailsettings.php:136
+#: actions/emailsettings.php:137
 msgid "Email address, like \"UserName@example.org\""
 msgstr "Sähköpostiosoite, esimerkiksi \"käyttäjätunnus@example.org\""
 
 #. TRANS: Button label for adding an e-mail address in e-mail settings form.
-#. TRANS: Button label for adding an Instant Messaging address in Instant Messaging settings form.
+#. TRANS: Button label for adding an IM address in IM settings form.
 #. TRANS: Button label for adding a SMS phone number in SMS settings form.
-#: actions/emailsettings.php:140 actions/imsettings.php:147
-#: actions/smssettings.php:158
+#: actions/emailsettings.php:141 actions/imsettings.php:147
+#: actions/smssettings.php:157
 msgctxt "BUTTON"
 msgid "Add"
 msgstr "Lisää"
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:148 actions/smssettings.php:167
+#: actions/emailsettings.php:149 actions/smssettings.php:166
 msgid "Incoming email"
 msgstr "Saapuva sähköposti"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:154
+#: actions/emailsettings.php:155
 msgid "I want to post notices by email."
 msgstr "Haluan lähettää päivityksiä sähköpostilla."
 
 #. TRANS: Form instructions for incoming e-mail form in e-mail settings.
 #. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
-#: actions/emailsettings.php:176 actions/smssettings.php:174
+#: actions/emailsettings.php:177 actions/smssettings.php:173
 msgid "Send email to this address to post new notices."
 msgstr "Lähetä sähköpostia tähän osoitteeseen tehdäksesi päivityksiä."
 
 #. TRANS: Instructions for incoming e-mail address input form, when an address has already been assigned.
 #. TRANS: Instructions for incoming SMS e-mail address input form.
-#: actions/emailsettings.php:185 actions/smssettings.php:182
+#: actions/emailsettings.php:186 actions/smssettings.php:181
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr ""
 "Tee uusi sähköpostiosoite johon lähettää päivityksiä; tämä poistaa vanhan "
 "osoitteen"
 
 #. TRANS: Instructions for incoming e-mail address input form.
-#: actions/emailsettings.php:189
+#: actions/emailsettings.php:190
 msgid ""
 "To send notices via email, we need to create a unique email address for you "
 "on this server:"
@@ -2512,89 +2544,89 @@ msgstr ""
 
 #. TRANS: Button label for adding an e-mail address to send notices from.
 #. TRANS: Button label for adding an SMS e-mail address to send notices from.
-#: actions/emailsettings.php:195 actions/smssettings.php:185
+#: actions/emailsettings.php:196 actions/smssettings.php:184
 msgctxt "BUTTON"
 msgid "New"
 msgstr "Uusi"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:204
+#: actions/emailsettings.php:205
 msgid "Email preferences"
 msgstr "Sähköpostiosoitteet"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:212
+#: actions/emailsettings.php:213
 msgid "Send me notices of new subscriptions through email."
 msgstr "Lähetä sähköpostilla tieto uusista tilaajista."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:218
+#: actions/emailsettings.php:219
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr "Lähetä sähköpostia, jos joku lisää päivitykseni suosikiksi."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:225
+#: actions/emailsettings.php:226
 msgid "Send me email when someone sends me a private message."
 msgstr "Lähetä sähköpostia, jos joku lähettää minulle yksityisviestin."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:231
+#: actions/emailsettings.php:232
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr "Lähetä sähköpostia, jos joku lähettää minulle \"@-vastauksen\"."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:237
+#: actions/emailsettings.php:238
 msgid "Allow friends to nudge me and send me an email."
 msgstr "Salli kavereiden tönäistä minua ja lähetä sähköpostilla ilmoitus."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:243
+#: actions/emailsettings.php:244
 msgid "Publish a MicroID for my email address."
 msgstr "Julkaise MicroID sähköpostiosoitteelleni."
 
 #. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:361
+#: actions/emailsettings.php:362
 msgid "Email preferences saved."
 msgstr "Sähköpostiasetukset tallennettu."
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:380
+#: actions/emailsettings.php:381
 msgid "No email address."
 msgstr "Sähköpostiosoitetta ei ole."
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:388
+#: actions/emailsettings.php:389
 #, fuzzy
 msgid "Cannot normalize that email address."
 msgstr "Ei voida normalisoida sähköpostiosoitetta"
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:393 actions/register.php:212
+#: actions/emailsettings.php:394 actions/register.php:197
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "Tuo ei ole kelvollinen sähköpostiosoite."
 
 #. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:397
+#: actions/emailsettings.php:398
 msgid "That is already your email address."
 msgstr "Tämä on jo sähköpostiosoitteesi."
 
 #. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:401
+#: actions/emailsettings.php:402
 msgid "That email address already belongs to another user."
 msgstr "Tämä sähköpostiosoite kuuluu jo toisella käyttäjällä."
 
 #. TRANS: Server error thrown on database error adding e-mail confirmation code.
 #. TRANS: Server error thrown on database error adding Instant Messaging confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:418 actions/imsettings.php:343
-#: actions/smssettings.php:365
+#: actions/emailsettings.php:419 actions/imsettings.php:362
+#: actions/smssettings.php:364
 #, fuzzy
 msgid "Could not insert confirmation code."
 msgstr "Ei voitu asettaa vahvistuskoodia."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:425
+#: actions/emailsettings.php:426
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
@@ -2606,57 +2638,60 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling Instant Messaging address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:445 actions/imsettings.php:377
-#: actions/smssettings.php:399
+#: actions/emailsettings.php:446 actions/imsettings.php:391
+#: actions/smssettings.php:398
 msgid "No pending confirmation to cancel."
 msgstr "Avoimia vahvistuksia ei ole peruutettavana."
 
 #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:450
+#: actions/emailsettings.php:451
 msgid "That is the wrong email address."
 msgstr "Tämä on väärä sähköpostiosoite."
 
 #. TRANS: Server error thrown on database error canceling e-mail address confirmation.
 #. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
-#: actions/emailsettings.php:459 actions/smssettings.php:413
+#: actions/emailsettings.php:460 actions/smssettings.php:412
 msgid "Could not delete email confirmation."
 msgstr "Ei voitu poistaa sähköpostivahvistusta."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:464
+#: actions/emailsettings.php:465
 msgid "Email confirmation cancelled."
 msgstr "Avoimia vahvistuksia ei ole peruutettavana."
 
 #. TRANS: Message given trying to remove an e-mail address that is not
 #. TRANS: registered for the active user.
-#: actions/emailsettings.php:483
+#: actions/emailsettings.php:484
 msgid "That is not your email address."
 msgstr "Tämä ei ole sähköpostiosoitteesi."
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:504
+#: actions/emailsettings.php:505
 msgid "The email address was removed."
 msgstr "Saapuvan sähköpostin osoite poistettu."
 
 #. TRANS: Form validation error displayed when trying to remove an incoming e-mail address while no address has been set.
-#: actions/emailsettings.php:518 actions/smssettings.php:555
+#: actions/emailsettings.php:519 actions/smssettings.php:554
 msgid "No incoming email address."
 msgstr "Saapuvan sähköpostin osoitetta ei ole."
 
 #. TRANS: Server error thrown on database error removing incoming e-mail address.
 #. TRANS: Server error thrown on database error adding incoming e-mail address.
-#: actions/emailsettings.php:530 actions/emailsettings.php:554
-#: actions/smssettings.php:565 actions/smssettings.php:588
+#. TRANS: Server error displayed when the user could not be updated in SMS settings.
+#: actions/emailsettings.php:531 actions/emailsettings.php:555
+#: actions/smssettings.php:565 actions/smssettings.php:590
 msgid "Could not update user record."
 msgstr "Ei voitu päivittää käyttäjätietoja."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:534 actions/smssettings.php:568
+#. TRANS: Confirmation text after updating SMS settings.
+#: actions/emailsettings.php:535 actions/smssettings.php:569
 msgid "Incoming email address removed."
 msgstr "Saapuvan sähköpostin osoite poistettu."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:558 actions/smssettings.php:591
+#. TRANS: Confirmation text after updating SMS settings.
+#: actions/emailsettings.php:559 actions/smssettings.php:594
 msgid "New incoming email address added."
 msgstr "Uusi saapuvan sähköpostin osoite lisätty."
 
@@ -2667,9 +2702,8 @@ msgstr "Tämä päivitys on jo suosikki!"
 
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
 #: actions/favor.php:95
-#, fuzzy
-msgid "Disfavor favorite"
-msgstr "Poista suosikeista"
+msgid "Disfavor favorite."
+msgstr "Poista suosikeista."
 
 #. TRANS: Page title for first page of favorited notices.
 #. TRANS: Title for favourited notices section.
@@ -2715,9 +2749,8 @@ msgstr ""
 #. TRANS: %s is a user's nickname.
 #. TRANS: Title for first page of favourite notices of a user.
 #. TRANS: %s is the user for whom the favourite notices are displayed.
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing own favourited notices.
 #: actions/favoritesrss.php:111 actions/showfavorites.php:76
-#: lib/personalgroupnav.php:122
+#: lib/personalgroupnav.php:110
 #, php-format
 msgid "%s's favorite notices"
 msgstr "Käyttäjän %s suosikkipäivitykset"
@@ -2904,14 +2937,12 @@ msgstr ""
 
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
 #: actions/groupblock.php:191
-#, fuzzy
-msgid "Do not block this user from this group"
+msgid "Do not block this user from this group."
 msgstr "Älä estä tätä käyttäjää tästä ryhmästä."
 
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
 #: actions/groupblock.php:198
-#, fuzzy
-msgid "Block this user from this group"
+msgid "Block this user from this group."
 msgstr "Estä tätä käyttäjää osallistumassa tähän ryhmään."
 
 #. TRANS: Server error displayed when trying to block a user from a group fails because of an application error.
@@ -2920,6 +2951,7 @@ msgid "Database error blocking user from group."
 msgstr "Tietokantavirhe estettäessä käyttäjää ryhmästä."
 
 #. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
+#. TRANS: Client error displayed trying to find a user by ID without providing an ID.
 #: actions/groupbyid.php:73 actions/userbyid.php:70
 #, fuzzy
 msgid "No ID."
@@ -2950,7 +2982,7 @@ msgid "Unable to update your design settings."
 msgstr "Ulkoasun tallennus epäonnistui."
 
 #. TRANS: Form text to confirm saved group design settings.
-#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:222
+#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:239
 msgid "Design preferences saved."
 msgstr "Ulkoasuasetukset tallennettu."
 
@@ -3013,7 +3045,7 @@ msgid "A list of the users in this group."
 msgstr "Lista ryhmän käyttäjistä."
 
 #. TRANS: Indicator in group members list that this user is a group administrator.
-#: actions/groupmembers.php:190
+#: actions/groupmembers.php:190 lib/action.php:581
 msgid "Admin"
 msgstr "Ylläpito"
 
@@ -3102,8 +3134,10 @@ msgid "Group search"
 msgstr "Ryhmähaku"
 
 #. TRANS: Text on page where groups can be searched if no results were found for a query.
-#: actions/groupsearch.php:82 actions/noticesearch.php:117
-#: actions/peoplesearch.php:83
+#. TRANS: Text for notice search results is the query had no results.
+#. TRANS: Message on the "People search" page where a query has no results.
+#: actions/groupsearch.php:82 actions/noticesearch.php:122
+#: actions/peoplesearch.php:87
 msgid "No results."
 msgstr "Ei tuloksia"
 
@@ -3136,169 +3170,171 @@ msgid "User is not blocked from group."
 msgstr "Käyttäjää ei ole estetty ryhmästä."
 
 #. TRANS: Server error displayed when unblocking a user from a group fails because of an unknown error.
+#. TRANS: Server error displayed when removing a user block.
 #: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "Tapahtui virhe, kun estoa poistettiin."
 
 #. TRANS: Title for Instant Messaging settings.
-#: actions/imsettings.php:58
+#: actions/imsettings.php:56
 msgid "IM settings"
 msgstr "Profiilikuva-asetukset"
 
 #. 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.
-#: actions/imsettings.php:71
+#: actions/imsettings.php:69
 #, fuzzy, php-format
 msgid ""
-"You can send and receive notices through Jabber/Google Talk [instant "
-"messages](%%doc.im%%). Configure your address and settings below."
+"You can send and receive notices through instant messaging [instant messages]"
+"(%%doc.im%%). Configure your addresses and settings below."
 msgstr ""
 "Voit lähettää ja vastaanottaa päivityksiä Jabber/GTalk-[pikaviestintä](%%doc."
 "im%%) käyttäen. Alla voit määrittää osoitteesi ja asetuksesi. "
 
-#. TRANS: Message given in the Instant Messaging settings if XMPP is not enabled on the site.
+#. TRANS: Message given in the IM settings if IM is not enabled on the site.
 #: actions/imsettings.php:90
 msgid "IM is not available."
 msgstr "Pikaviestin ei ole käytettävissä."
 
-#. TRANS: Form legend for Instant Messaging settings form.
-#. TRANS: Field label for Instant Messaging address input in Instant Messaging settings form.
-#: actions/imsettings.php:102 actions/imsettings.php:132
-msgid "IM address"
-msgstr "Sähköpostiosoitteet"
+#: actions/imsettings.php:116
+#, fuzzy, php-format
+msgid "Current confirmed %s address."
+msgstr "Tämän hetken vahvistettu sähköpostiosoite."
 
-#: actions/imsettings.php:109
-#, fuzzy
-msgid "Current confirmed Jabber/Google Talk address."
-msgstr "Tämän hetken vahvistettu Jabber/GTalk -osoite."
-
-#. TRANS: Form note in Instant Messaging settings form.
-#. TRANS: %s is the Instant Messaging address set for the site.
-#: actions/imsettings.php:120
+#. TRANS: Form note in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:128
 #, fuzzy, php-format
 msgid ""
-"Awaiting confirmation on this address. Check your Jabber/Google Talk account "
-"for a message with further instructions. (Did you add %s to your buddy list?)"
+"Awaiting confirmation on this address. Check your %s account for a message "
+"with further instructions. (Did you add %s to your buddy list?)"
 msgstr ""
 "Odotetaan vahvistusta tälle osoitteelle. Katso Jabber/GTalk "
 "käyttäjätililtäsi viesti, jossa on lisäohjeet. (Lisäsitkö %s:n "
 "ystävälistaasi?)"
 
-#. TRANS: IM address input field instructions in Instant Messaging settings form.
-#. TRANS: %s is the Instant Messaging address set for the site.
-#. TRANS: Do not translate "example.org". It is one of the domain names reserved for use in examples by
-#. TRANS: http://www.rfc-editor.org/rfc/rfc2606.txt. Any other domain may be owned by a legitimate
-#. TRANS: person or organization.
-#: actions/imsettings.php:139
-#, fuzzy, php-format
-msgid ""
-"Jabber or Google Talk address, like \"UserName@example.org\". First, make "
-"sure to add %s to your buddy list in your IM client or on Google Talk."
-msgstr ""
-"Jabber ja GTalk -osoite, esimerkiksi \"käyttäjätunnus@example.org\". "
-"Varmista että olet lisännyt %s kaverilistaasi pikaviestiohjelmassasi tai "
-"GTalkissa."
+#: actions/imsettings.php:140
+msgid "IM address"
+msgstr "Sähköpostiosoitteet"
 
-#. TRANS: Form legend for Instant Messaging preferences form.
-#: actions/imsettings.php:154
-msgid "IM preferences"
+#: actions/imsettings.php:142
+#, php-format
+msgid "%s screenname."
+msgstr ""
+
+#. TRANS: Header for IM preferences form.
+#: actions/imsettings.php:163
+#, fuzzy
+msgid "IM Preferences"
 msgstr "Asetukset tallennettu."
 
-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:159
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:174
 #, fuzzy
-msgid "Send me notices through Jabber/Google Talk."
-msgstr "Lähetä minulle päivityksiä Jabberilla/GTalkilla."
+msgid "Send me notices"
+msgstr "Lähetä päivitys"
 
-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:165
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:176
 #, fuzzy
-msgid "Post a notice when my Jabber/Google Talk status changes."
+msgid "Post a notice when my status changes."
 msgstr "Lähetä päivitys kun Jabber/GTalk -tilatietoni vaihtuu."
 
-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:171
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:178
 #, fuzzy
-msgid ""
-"Send me replies through Jabber/Google Talk from people I'm not subscribed to."
+msgid "Send me replies from people I'm not subscribed to."
 msgstr ""
 "Lähetä Jabberilla/GTalkilla sellaistenkin ihmisten vastaukset, joita en ole "
 "tilannut. "
 
-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:178
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:181
 #, fuzzy
-msgid "Publish a MicroID for my Jabber/Google Talk address."
-msgstr "Julkaise MicroID Jabber/GTalk-osoitteelleni."
+msgid "Publish a MicroID"
+msgstr "Julkaise MicroID sähköpostiosoitteelleni."
 
-#. TRANS: Confirmation message for successful Instant Messaging preferences save.
-#: actions/imsettings.php:283 actions/othersettings.php:192
+#. TRANS: Server error thrown on database error updating IM preferences.
+#: actions/imsettings.php:291
+#, fuzzy
+msgid "Couldn't update IM preferences."
+msgstr "Käyttäjän päivitys epäonnistui."
+
+#. TRANS: Confirmation message for successful IM preferences save.
+#. TRANS: Confirmation message after saving preferences.
+#: actions/imsettings.php:298 actions/urlsettings.php:244
 msgid "Preferences saved."
 msgstr "Asetukset tallennettu."
 
-#. TRANS: Message given saving Instant Messaging address without having provided one.
-#: actions/imsettings.php:304
-msgid "No Jabber ID."
-msgstr "Ei Jabber ID -osoitetta"
-
-#. TRANS: Message given saving Instant Messaging address that cannot be normalised.
-#: actions/imsettings.php:312
+#. TRANS: Message given saving IM address without having provided one.
+#: actions/imsettings.php:320
 #, fuzzy
-msgid "Cannot normalize that Jabber ID."
+msgid "No screenname."
+msgstr "Tunnusta ei ole."
+
+#: actions/imsettings.php:325
+#, fuzzy
+msgid "No transport."
+msgstr "Päivitystä ei ole."
+
+#. TRANS: Message given saving IM address that cannot be normalised.
+#: actions/imsettings.php:333
+#, fuzzy
+msgid "Cannot normalize that screenname"
 msgstr "Ei voida normalisoida Jabber ID -tunnusta"
 
-#. TRANS: Message given saving Instant Messaging address that not valid.
-#: actions/imsettings.php:317
+#. TRANS: Message given saving IM address that not valid.
+#: actions/imsettings.php:340
 #, fuzzy
-msgid "Not a valid Jabber ID."
-msgstr "Tuo ei ole kelvollinen Jabber ID."
+msgid "Not a valid screenname"
+msgstr "Tuo ei ole kelvollinen tunnus."
 
-#. TRANS: Message given saving Instant Messaging address that is already set.
-#: actions/imsettings.php:321
-msgid "That is already your Jabber ID."
-msgstr "Tämä on jo Jabber ID -tunnuksesi."
-
-#. TRANS: Message given saving Instant Messaging address that is already set for another user.
-#: actions/imsettings.php:325
-msgid "Jabber ID already belongs to another user."
+#. TRANS: Message given saving IM address that is already set for another user.
+#: actions/imsettings.php:344
+#, fuzzy
+msgid "Screenname already belongs to another user."
 msgstr "Jabber ID kuuluu jo toiselle käyttäjälle."
 
-#. TRANS: Message given saving valid Instant Messaging address that is to be confirmed.
-#. TRANS: %s is the Instant Messaging address set for the site.
-#: actions/imsettings.php:353
-#, php-format
-msgid ""
-"A confirmation code was sent to the IM address you added. You must approve %"
-"s for sending messages to you."
+#. TRANS: Message given saving valid IM address that is to be confirmed.
+#: actions/imsettings.php:369
+#, fuzzy
+msgid "A confirmation code was sent to the IM address you added."
 msgstr ""
 "Vahvistuskoodi lähetettiin antamaasi pikaviestinosoitteeseen. Sinun täytyy "
 "antaa osoitteelle %s oikeus lähettää viestejä sinulle."
 
-#. TRANS: Message given canceling Instant Messaging address confirmation for the wrong IM address.
-#: actions/imsettings.php:382
+#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#: actions/imsettings.php:396
 msgid "That is the wrong IM address."
 msgstr "Tämä on väärä pikaviestiosoite."
 
-#. TRANS: Server error thrown on database error canceling Instant Messaging address confirmation.
-#: actions/imsettings.php:391
+#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#: actions/imsettings.php:405
 #, fuzzy
-msgid "Could not delete IM confirmation."
+msgid "Couldn't delete confirmation."
 msgstr "Ei voitu poistaa sähköpostivahvistusta."
 
-#. TRANS: Message given after successfully canceling Instant Messaging address confirmation.
-#: actions/imsettings.php:396
+#. TRANS: Message given after successfully canceling IM address confirmation.
+#: actions/imsettings.php:410
 msgid "IM confirmation cancelled."
 msgstr "Varmistuskoodia ei ole annettu."
 
-#. TRANS: Message given trying to remove an Instant Messaging address that is not
+#. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.
-#: actions/imsettings.php:417
-msgid "That is not your Jabber ID."
-msgstr "Tämä ei ole Jabber ID-tunnuksesi."
+#: actions/imsettings.php:434
+#, fuzzy
+msgid "That is not your screenname."
+msgstr "Tämä ei ole puhelinnumerosi."
+
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#: actions/imsettings.php:443
+#, fuzzy
+msgid "Couldn't update user im prefs."
+msgstr "Ei voitu päivittää käyttäjätietoja."
 
 #. TRANS: Message given after successfully removing a registered Instant Messaging address.
-#: actions/imsettings.php:440
+#: actions/imsettings.php:451
 msgid "The IM address was removed."
 msgstr "Saapuvan sähköpostin osoite poistettu."
 
@@ -3517,7 +3553,7 @@ msgid "You must be logged in to join a group."
 msgstr "Sinun pitää olla kirjautunut sisään, jos haluat liittyä ryhmään."
 
 #. TRANS: Title for join group page after joining.
-#: actions/joingroup.php:147
+#: actions/joingroup.php:148
 #, fuzzy, php-format
 msgctxt "TITLE"
 msgid "%1$s joined group %2$s"
@@ -3646,7 +3682,7 @@ msgstr ""
 #. TRANS: Submit button title.
 #: actions/licenseadminpanel.php:311 actions/sessionsadminpanel.php:199
 #: actions/siteadminpanel.php:292 actions/snapshotadminpanel.php:245
-#: actions/tagother.php:154 lib/applicationeditform.php:357
+#: actions/tagother.php:133 lib/applicationeditform.php:357
 msgid "Save"
 msgstr "Tallenna"
 
@@ -3654,42 +3690,44 @@ msgstr "Tallenna"
 msgid "Save license settings"
 msgstr ""
 
-#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
+#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
+#: actions/login.php:97 actions/otp.php:62 actions/register.php:130
 msgid "Already logged in."
 msgstr "Olet jo kirjautunut sisään."
 
-#: actions/login.php:148
+#: actions/login.php:125
 msgid "Incorrect username or password."
 msgstr "Väärä käyttäjätunnus tai salasana"
 
-#: actions/login.php:154 actions/otp.php:120
+#. TRANS: Server error displayed when a user object could not be created trying to login using "one time password login".
+#: actions/login.php:131 actions/otp.php:127
 #, fuzzy
 msgid "Error setting user. You are probably not authorized."
 msgstr "Sinulla ei ole valtuutusta tähän."
 
-#: actions/login.php:210 actions/login.php:263
+#: actions/login.php:185 actions/login.php:236 lib/action.php:598
 msgid "Login"
 msgstr "Kirjaudu sisään"
 
-#: actions/login.php:249
+#: actions/login.php:222
 msgid "Login to site"
 msgstr "Kirjaudu sisään"
 
-#: actions/login.php:258 actions/register.php:490
+#: actions/login.php:231 actions/register.php:469
 msgid "Remember me"
 msgstr "Muista minut"
 
-#: actions/login.php:259 actions/register.php:492
+#: actions/login.php:232 actions/register.php:471
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 "Kirjaudu sisään automaattisesti tulevaisuudessa; ei tietokoneille joilla "
 "useampi käyttäjä!"
 
-#: actions/login.php:269
+#: actions/login.php:241
 msgid "Lost or forgotten password?"
 msgstr "Oletko hukannut tai unohtanut salasanasi?"
 
-#: actions/login.php:288
+#: actions/login.php:259
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -3697,12 +3735,12 @@ msgstr ""
 "Syötä turvallisuussyistä käyttäjätunnuksesi ja salasanasi uudelleen ennen "
 "asetuksiesi muuttamista."
 
-#: actions/login.php:292
+#: actions/login.php:263
 #, fuzzy
 msgid "Login with your username and password."
 msgstr "Kirjaudu sisään käyttäjätunnuksella ja salasanalla"
 
-#: actions/login.php:295
+#: actions/login.php:266
 #, fuzzy, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -3833,7 +3871,9 @@ msgstr "Uusi päivitys"
 msgid "Notice posted"
 msgstr "Päivitys lähetetty"
 
-#: actions/noticesearch.php:68
+#. TRANS: Instructions for Notice search page.
+#. TRANS: %%site.name%% is the name of the StatusNet site.
+#: actions/noticesearch.php:69
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -3842,16 +3882,21 @@ msgstr ""
 "Hae päivityksiä palvelun %%site.name%% sisällöistä. Erota hakutermit "
 "välilyönnillä; hakutermien pitää olla 3 tai useamman merkin pituisia."
 
-#: actions/noticesearch.php:78
+#. TRANS: Title of the page where users can search for notices.
+#: actions/noticesearch.php:80
 msgid "Text search"
 msgstr "Tekstihaku"
 
-#: actions/noticesearch.php:91
+#. TRANS: Test in RSS notice search.
+#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
+#: actions/noticesearch.php:95
 #, php-format
 msgid "Search results for \"%1$s\" on %2$s"
 msgstr "Viesti käyttäjältä %1$s, %2$s"
 
-#: actions/noticesearch.php:121
+#. TRANS: Text for logged in users making a query for notices without results.
+#. TRANS: This message contains a Markdown link.
+#: actions/noticesearch.php:128
 #, php-format
 msgid ""
 "Be the first to [post on this topic](%%%%action.newnotice%%%%?"
@@ -3860,7 +3905,9 @@ msgstr ""
 "Ole ensimmäinen joka [lähettää päivityksen tästä aiheesta](%%%%action."
 "newnotice%%%%?status_textarea=%s)!"
 
-#: actions/noticesearch.php:124
+#. TRANS: Text for not logged in users making a query for notices without results.
+#. TRANS: This message contains Markdown links.
+#: actions/noticesearch.php:133
 #, fuzzy, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and be the first to "
@@ -3869,14 +3916,17 @@ msgstr ""
 "Ole ensimmäinen joka [lähettää päivityksen tästä aiheesta](%%%%action."
 "newnotice%%%%?status_textarea=%s)!"
 
-#: actions/noticesearchrss.php:96
+#. TRANS: RSS notice search feed title. %s is the query.
+#: actions/noticesearchrss.php:95
 #, fuzzy, php-format
 msgid "Updates with \"%s\""
 msgstr "Käyttäjän %1$s päivitykset palvelussa %2$s!"
 
-#: actions/noticesearchrss.php:98
+#. TRANS: RSS notice search feed description.
+#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
+#: actions/noticesearchrss.php:99
 #, fuzzy, php-format
-msgid "Updates matching search term \"%1$s\" on %2$s!"
+msgid "Updates matching search term \"%1$s\" on %2$s."
 msgstr "Käyttäjän %1$s päivitykset palvelussa %2$s!"
 
 #: actions/nudge.php:85
@@ -3897,55 +3947,55 @@ msgid "Nudge sent!"
 msgstr "Tönäisy lähetetty!"
 
 #. TRANS: Message displayed to an anonymous user trying to view OAuth application list.
-#: actions/oauthappssettings.php:60
+#: actions/oauthappssettings.php:57
 #, fuzzy
 msgid "You must be logged in to list your applications."
 msgstr ""
 "Sinun pitää olla kirjautunut sisään, jotta voit muuttaa ryhmän tietoja."
 
 #. TRANS: Page title for OAuth applications
-#: actions/oauthappssettings.php:76
+#: actions/oauthappssettings.php:73
 #, fuzzy
 msgid "OAuth applications"
 msgstr "Muita asetuksia"
 
 #. TRANS: Page instructions for OAuth applications
-#: actions/oauthappssettings.php:88
+#: actions/oauthappssettings.php:85
 msgid "Applications you have registered"
 msgstr ""
 
 #. TRANS: Empty list message on page with OAuth applications.
-#: actions/oauthappssettings.php:141
+#: actions/oauthappssettings.php:138
 #, php-format
 msgid "You have not registered any applications yet."
 msgstr ""
 
 #. TRANS: Title for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:71
+#: actions/oauthconnectionssettings.php:69
 msgid "Connected applications"
 msgstr ""
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:83
+#: actions/oauthconnectionssettings.php:80
 msgid "The following connections exist for your account."
 msgstr ""
 
 #. TRANS: Client error when trying to revoke access for an application while not being a user of it.
-#: actions/oauthconnectionssettings.php:168
+#: actions/oauthconnectionssettings.php:165
 #, fuzzy
 msgid "You are not a user of that application."
 msgstr "Sinä et kuulu tähän ryhmään."
 
 #. TRANS: Client error when revoking access has failed for some reason.
 #. TRANS: %s is the application ID revoking access failed for.
-#: actions/oauthconnectionssettings.php:183
+#: actions/oauthconnectionssettings.php:180
 #, fuzzy, php-format
 msgid "Unable to revoke access for application: %s."
 msgstr "Käytä tätä lomaketta muokataksesi ryhmää."
 
 #. TRANS: Success message after revoking access for an application.
 #. TRANS: %1$s is the application name, %2$s is the first part of the user token.
-#: actions/oauthconnectionssettings.php:202
+#: actions/oauthconnectionssettings.php:199
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -3953,20 +4003,30 @@ msgid ""
 msgstr ""
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:213
+#: actions/oauthconnectionssettings.php:210
 msgid "You have not authorized any applications to use your account."
 msgstr ""
 
 #. TRANS: Note for developers in the OAuth connection settings form.
 #. TRANS: This message contains a Markdown link. Do not separate "](".
 #. TRANS: %s is the URL to the OAuth settings.
-#: actions/oauthconnectionssettings.php:233
+#: actions/oauthconnectionssettings.php:230
 #, php-format
 msgid ""
 "Are you a developer? [Register an OAuth client application](%s) to use with "
 "this instance of StatusNet."
 msgstr ""
 
+#: actions/oembed.php:64
+#, fuzzy, php-format
+msgid "\"%s\" not found."
+msgstr "API-metodia ei löytynyt."
+
+#: actions/oembed.php:76
+#, fuzzy, php-format
+msgid "Notice %s not found."
+msgstr "API-metodia ei löytynyt."
+
 #: actions/oembed.php:80 actions/shownotice.php:100
 msgid "Notice has no profile."
 msgstr "Käyttäjällä ei ole profiilia."
@@ -3976,6 +4036,16 @@ msgstr "Käyttäjällä ei ole profiilia."
 msgid "%1$s's status on %2$s"
 msgstr "Käyttäjän %1$s päivitys %2$s"
 
+#: actions/oembed.php:95
+#, fuzzy, php-format
+msgid "Attachment %s not found."
+msgstr "Vastaanottajaa ei löytynyt."
+
+#: actions/oembed.php:136
+#, php-format
+msgid "\"%s\" not supported for oembed requests."
+msgstr ""
+
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
 #: actions/oembed.php:168
 #, fuzzy, php-format
@@ -3989,98 +4059,64 @@ msgid "Only %s URLs over plain HTTP please."
 msgstr ""
 
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1205
-#: lib/apiaction.php:1232 lib/apiaction.php:1367
+#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1207
+#: lib/apiaction.php:1234 lib/apiaction.php:1369
 msgid "Not a supported data format."
 msgstr "Tuo ei ole tuettu tietomuoto."
 
+#. TRANS: ShortName in the OpenSearch interface when trying to find users.
 #: actions/opensearch.php:64
 msgid "People Search"
 msgstr "Etsi ihmisiä"
 
-#: actions/opensearch.php:67
+#: actions/opensearch.php:68
 msgid "Notice Search"
 msgstr "Etsi Päivityksistä"
 
-#: actions/othersettings.php:59
-msgid "Other settings"
-msgstr "Profiilikuva-asetukset"
-
-#. TRANS: Instructions for tab "Other" in user profile settings.
-#: actions/othersettings.php:71
-msgid "Manage various other options."
-msgstr "Hallinnoi muita asetuksia."
-
-#. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
-#. TRANS: user's profile settings. Use of "free" is as in "open", indicating that the
-#. TRANS: information on the shortener site is freely distributable.
-#. TRANS: This message has one space at the beginning. Use your language's word separator
-#. TRANS: here if it has one (most likely a single space).
-#: actions/othersettings.php:113
-msgid " (free service)"
-msgstr ""
-
-#. TRANS: Label for dropdown with URL shortener services.
-#: actions/othersettings.php:122
-msgid "Shorten URLs with"
-msgstr "Lyhennä URL-osoitteita"
-
-#. TRANS: Tooltip for for dropdown with URL shortener services.
-#: actions/othersettings.php:124
-msgid "Automatic shortening service to use."
-msgstr "Käytettävä automaattinen lyhennyspalvelu."
-
-#. TRANS: Label for checkbox.
-#: actions/othersettings.php:130
-msgid "View profile designs"
-msgstr "Näytä tai piillota profiilin ulkoasu."
-
-#. TRANS: Tooltip for checkbox.
-#: actions/othersettings.php:132
-msgid "Show or hide profile designs."
-msgstr "Näytä tai piillota profiilin ulkoasu."
-
-#. TRANS: Form validation error for form "Other settings" in user profile.
-#: actions/othersettings.php:164
-#, fuzzy
-msgid "URL shortening service is too long (maximum 50 characters)."
-msgstr "URL-lyhennyspalvelun nimi on liian pitkä (max 50 merkkiä)."
-
-#: actions/otp.php:69
+#. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
+#: actions/otp.php:70
 #, fuzzy
 msgid "No user ID specified."
 msgstr "Ryhmää ei ole määritelty."
 
-#: actions/otp.php:83
+#. TRANS: Client error displayed trying to use "one time password login" without specifying a login token.
+#: actions/otp.php:86
 #, fuzzy
 msgid "No login token specified."
 msgstr "Profiilia ei ole määritelty."
 
-#: actions/otp.php:90
+#. TRANS: Client error displayed trying to use "one time password login" without requesting a login token.
+#: actions/otp.php:94
 msgid "No login token requested."
 msgstr "Ei valtuutuspyyntöä!"
 
-#: actions/otp.php:95
+#. TRANS: Client error displayed trying to use "one time password login" while specifying an invalid login token.
+#: actions/otp.php:100
 #, fuzzy
 msgid "Invalid login token specified."
 msgstr "Päivityksen sisältö ei kelpaa"
 
-#: actions/otp.php:104
+#. TRANS: Client error displayed trying to use "one time password login" while specifying an expired login token.
+#: actions/otp.php:110
 #, fuzzy
 msgid "Login token expired."
 msgstr "Kirjaudu sisään"
 
-#: actions/outbox.php:58
+#. TRANS: Title for outbox for any but the fist page.
+#. TRANS: %1$s is the user nickname, %2$d is the page number.
+#: actions/outbox.php:57
 #, fuzzy, php-format
 msgid "Outbox for %1$s - page %2$d"
 msgstr "Käyttäjän %s lähetetyt viestit"
 
+#. TRANS: Title for first page of outbox.
 #: actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
 msgstr "Käyttäjän %s lähetetyt viestit"
 
-#: actions/outbox.php:104
+#. TRANS: Instructions for outbox.
+#: actions/outbox.php:103
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr "Tämä on postilaatikkosi, jossa on lähettämäsi yksityisviestit."
 
@@ -4106,43 +4142,45 @@ msgstr "Vanha salasana"
 msgid "New password"
 msgstr "Uusi salasana"
 
-#: actions/passwordsettings.php:109
+#: actions/passwordsettings.php:109 actions/register.php:416
 #, fuzzy
-msgid "6 or more characters"
+msgid "6 or more characters."
 msgstr "6 tai useampia merkkejä"
 
-#: actions/passwordsettings.php:113
+#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#: actions/passwordsettings.php:113 actions/recoverpassword.php:264
+#: actions/register.php:420
 #, fuzzy
-msgid "Same as password above"
+msgid "Same as password above."
 msgstr "Sama kuin ylläoleva salasana"
 
 #: actions/passwordsettings.php:117
 msgid "Change"
 msgstr "Vaihda"
 
-#: actions/passwordsettings.php:154 actions/register.php:238
+#: actions/passwordsettings.php:153 actions/register.php:223
 msgid "Password must be 6 or more characters."
 msgstr "Salasanassa pitää olla 6 tai useampia merkkejä."
 
-#: actions/passwordsettings.php:157 actions/register.php:241
+#: actions/passwordsettings.php:156 actions/register.php:226
 msgid "Passwords don't match."
 msgstr "Salasanat eivät täsmää."
 
-#: actions/passwordsettings.php:165
+#: actions/passwordsettings.php:164
 msgid "Incorrect old password"
 msgstr "Väärä vanha salasana"
 
-#: actions/passwordsettings.php:181
+#: actions/passwordsettings.php:180
 msgid "Error saving user; invalid."
 msgstr "Virhe tapahtui käyttäjän tallentamisessa; epäkelpo."
 
-#: actions/passwordsettings.php:186
+#. TRANS: Reset password form validation error message.
+#: actions/passwordsettings.php:185 actions/recoverpassword.php:418
 #, fuzzy
-msgid "Can't save new password."
+msgid "Cannot save new password."
 msgstr "Uutta salasanaa ei voida tallentaa."
 
-#. TRANS: Title for password recovery page in password saved mode.
-#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
+#: actions/passwordsettings.php:191
 msgid "Password saved."
 msgstr "Salasana tallennettu."
 
@@ -4362,8 +4400,7 @@ msgid "Directory where backgrounds are located."
 msgstr ""
 
 #. TRANS: Fieldset legens in Paths admin panel.
-#. TRANS: DT element label in attachment list.
-#: actions/pathsadminpanel.php:419 lib/attachmentlist.php:98
+#: actions/pathsadminpanel.php:419
 msgid "Attachments"
 msgstr "Liitteet"
 
@@ -4439,7 +4476,9 @@ msgstr ""
 msgid "Save paths"
 msgstr "Palvelun ilmoitus"
 
-#: actions/peoplesearch.php:52
+#. TRANS: Instructions for the "People search" page.
+#. TRANS: %%site.name%% is the name of the StatusNet site.
+#: actions/peoplesearch.php:54
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
@@ -4449,7 +4488,8 @@ msgstr ""
 "kiinnostuksen kohteista. Erota hakutermit välilyönnillä; hakutermien pitää "
 "olla 3 tai useamman merkin pituisia."
 
-#: actions/peoplesearch.php:58
+#. TRANS: Title of a page where users can search for other users.
+#: actions/peoplesearch.php:61
 msgid "People search"
 msgstr "Etsi ihmisiä"
 
@@ -4463,6 +4503,60 @@ msgstr "Tuo ei ole kelvollinen sähköpostiosoite."
 msgid "Users self-tagged with %1$s - page %2$d"
 msgstr "Käyttäjät joilla henkilötagi %s - sivu %d"
 
+#. TRANS: Page title for AJAX form return when a disabling a plugin.
+#: actions/plugindisable.php:69
+msgctxt "plugin"
+msgid "Disabled"
+msgstr ""
+
+#. TRANS: Client error displayed trying to perform any request method other than POST.
+#. TRANS: Do not translate POST.
+#: actions/pluginenable.php:78 actions/subscribe.php:77
+msgid "This action only accepts POST requests."
+msgstr ""
+
+#: actions/pluginenable.php:102
+#, fuzzy
+msgid "You cannot administer plugins."
+msgstr "Sinä et voi poistaa käyttäjiä."
+
+#: actions/pluginenable.php:109
+#, fuzzy
+msgid "No such plugin."
+msgstr "Sivua ei ole."
+
+#. TRANS: Page title for AJAX form return when enabling a plugin.
+#: actions/pluginenable.php:159
+msgctxt "plugin"
+msgid "Enabled"
+msgstr ""
+
+#. TRANS: Tab and title for plugins admin panel.
+#. TRANS: Menu item for site administration
+#: actions/pluginsadminpanel.php:56 actions/version.php:191
+#: lib/adminpanelaction.php:411
+msgid "Plugins"
+msgstr ""
+
+#. TRANS: Instructions at top of plugin admin page.
+#: actions/pluginsadminpanel.php:68
+msgid ""
+"Additional plugins can be enabled and configured manually. See the <a href="
+"\"http://status.net/wiki/Plugins\">online plugin documentation</a> for more "
+"details."
+msgstr ""
+
+#. TRANS: Admin form section header
+#: actions/pluginsadminpanel.php:84
+#, fuzzy
+msgid "Default plugins"
+msgstr "Ensisijainen kieli"
+
+#: actions/pluginsadminpanel.php:106
+msgid ""
+"All default plugins have been disabled from the site's configuration file."
+msgstr ""
+
 #: actions/postnotice.php:95
 msgid "Invalid notice content."
 msgstr "Koko ei kelpaa."
@@ -4473,12 +4567,12 @@ msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’.
 msgstr ""
 
 #. TRANS: Page title for profile settings.
-#: actions/profilesettings.php:59
+#: actions/profilesettings.php:60
 msgid "Profile settings"
 msgstr "Profiiliasetukset"
 
 #. TRANS: Usage instructions for profile settings.
-#: actions/profilesettings.php:70
+#: actions/profilesettings.php:71
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
@@ -4486,12 +4580,12 @@ msgstr ""
 "enemmän."
 
 #. TRANS: Profile settings form legend.
-#: actions/profilesettings.php:98
+#: actions/profilesettings.php:99
 msgid "Profile information"
 msgstr "Profiilitieto"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109 actions/register.php:433
+#: actions/profilesettings.php:110 actions/register.php:412
 #, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr ""
@@ -4499,23 +4593,20 @@ msgstr ""
 "välilyöntejä"
 
 #. TRANS: Field label in form for profile settings.
-#. TRANS: Label for full group name (dt). Text hidden by default.
-#. TRANS: DT for full name in a profile.
-#: actions/profilesettings.php:113 actions/register.php:455
-#: actions/showgroup.php:255 actions/tagother.php:104
-#: lib/groupeditform.php:150 lib/userprofile.php:156
+#: actions/profilesettings.php:114 actions/register.php:434
+#: lib/groupeditform.php:150
 msgid "Full name"
 msgstr "Koko nimi"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:118 actions/register.php:460
+#: actions/profilesettings.php:119 actions/register.php:439
 #: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "Kotisivu"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:121
+#: actions/profilesettings.php:122 actions/register.php:441
 #, fuzzy
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr "Kotisivusi, blogisi tai toisella sivustolla olevan profiilisi osoite."
@@ -4523,7 +4614,7 @@ msgstr "Kotisivusi, blogisi tai toisella sivustolla olevan profiilisi osoite."
 #. TRANS: Tooltip for field label in form for profile settings. Plural
 #. TRANS: is decided by the number of characters available for the
 #. TRANS: biography (%d).
-#: actions/profilesettings.php:129 actions/register.php:471
+#: actions/profilesettings.php:130 actions/register.php:450
 #, fuzzy, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4531,80 +4622,76 @@ msgstr[0] "Kuvaile itseäsi ja kiinnostuksen kohteitasi %d merkillä"
 msgstr[1] "Kuvaile itseäsi ja kiinnostuksen kohteitasi %d merkillä"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:135 actions/register.php:476
+#: actions/profilesettings.php:136 actions/register.php:455
 msgid "Describe yourself and your interests"
 msgstr "Kuvaile itseäsi ja kiinnostuksen kohteitasi"
 
 #. TRANS: Text area label in form for profile settings where users can provide.
 #. TRANS: their biography.
-#: actions/profilesettings.php:139 actions/register.php:478
+#: actions/profilesettings.php:140 actions/register.php:457
 msgid "Bio"
 msgstr "Tietoja"
 
 #. TRANS: Field label in form for profile settings.
-#. TRANS: Label for group location (dt). Text hidden by default.
-#. TRANS: DT for location in a profile.
-#: actions/profilesettings.php:145 actions/register.php:483
-#: actions/showgroup.php:265 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:173
-#: lib/userprofile.php:172
+#: actions/profilesettings.php:146 actions/register.php:462
+#: lib/groupeditform.php:173
 msgid "Location"
 msgstr "Kotipaikka"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148 actions/register.php:485
+#: actions/profilesettings.php:149
 #, fuzzy
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Olinpaikka kuten \"Kaupunki, Maakunta (tai Lääni), Maa\""
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:153
+#: actions/profilesettings.php:154
 msgid "Share my current location when posting notices"
 msgstr ""
 
 #. TRANS: Field label in form for profile settings.
-#. TRANS: DT for tags in a profile.
-#: actions/profilesettings.php:161 actions/tagother.php:149
-#: actions/tagother.php:209 lib/subscriptionlist.php:106
-#: lib/subscriptionlist.php:108 lib/userprofile.php:220
+#: actions/profilesettings.php:162 actions/tagother.php:128
+#: actions/tagother.php:188 lib/subscriptionlist.php:104
+#: lib/subscriptionlist.php:106
 msgid "Tags"
 msgstr "Tagit"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:164
+#: actions/profilesettings.php:165
 #, fuzzy
 msgid ""
-"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- "
+"separated."
 msgstr ""
 "Kuvaa itseäsi henkilötageilla (sanoja joissa voi olla muita kirjaimia kuin "
 "ääkköset, numeroita, -, ., ja _), pilkulla tai välilyönnillä erotettuna"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:169
+#: actions/profilesettings.php:170
 msgid "Language"
 msgstr "Kieli"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:171
+#: actions/profilesettings.php:172
 #, fuzzy
-msgid "Preferred language"
+msgid "Preferred language."
 msgstr "Ensisijainen kieli"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:181
+#: actions/profilesettings.php:182
 msgid "Timezone"
 msgstr "Aikavyöhyke"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:183
+#: actions/profilesettings.php:184
 msgid "What timezone are you normally in?"
 msgstr "Millä aikavyöhykkeellä olet tavallisesti?"
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:189
+#: actions/profilesettings.php:190
 #, fuzzy
 msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)"
+"Automatically subscribe to whoever subscribes to me (best for non-humans)."
 msgstr ""
 "Tilaa automaattisesti kaikki, jotka tilaavat päivitykseni (ei sovi hyvin "
 "ihmiskäyttäjille)"
@@ -4612,7 +4699,7 @@ msgstr ""
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Plural form is used based on the maximum number of allowed
 #. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:258 actions/register.php:229
+#: actions/profilesettings.php:259 actions/register.php:214
 #, fuzzy, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4620,50 +4707,50 @@ msgstr[0] "kuvaus on liian pitkä (max %d merkkiä)."
 msgstr[1] "kuvaus on liian pitkä (max %d merkkiä)."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:269 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:270 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr "Aikavyöhykettä ei ole valittu."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:277
+#: actions/profilesettings.php:278
 #, fuzzy
 msgid "Language is too long (maximum 50 characters)."
 msgstr "Kieli on liian pitkä (enintään 50 merkkiä)."
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:291 actions/tagother.php:178
-#, php-format
-msgid "Invalid tag: \"%s\""
+#: actions/profilesettings.php:292
+#, fuzzy, php-format
+msgid "Invalid tag: \"%s\"."
 msgstr "Virheellinen tagi: \"%s\""
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:347
+#: actions/profilesettings.php:348
 #, fuzzy
 msgid "Could not update user for autosubscribe."
 msgstr "Ei voitu asettaa käyttäjälle automaattista tilausta."
 
 #. TRANS: Server error thrown when user profile location preference settings could not be updated.
-#: actions/profilesettings.php:405
+#: actions/profilesettings.php:406
 #, fuzzy
 msgid "Could not save location prefs."
 msgstr "Tageja ei voitu tallentaa."
 
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:427 actions/tagother.php:200
+#: actions/profilesettings.php:428 actions/tagother.php:179
 msgid "Could not save tags."
 msgstr "Tagien tallennus epäonnistui."
 
 #. TRANS: Confirmation shown when user profile settings are saved.
 #. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:436 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:437 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "Asetukset tallennettu."
 
 #. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
 #. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:483 actions/restoreaccount.php:60
+#: actions/profilesettings.php:484 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "Luo uusi ryhmä"
@@ -4736,6 +4823,12 @@ msgstr ""
 "Tämä on %%site.name%%, [mikroblogaus](http://en.wikipedia.org/wiki/Micro-"
 "blogging)palvelu "
 
+#. TRANS: Public RSS feed description. %s is the StatusNet site name.
+#: actions/publicrss.php:106
+#, fuzzy, php-format
+msgid "%s updates from everyone."
+msgstr "%s päivitykset kaikilta!"
+
 #. TRANS: Title for public tag cloud.
 #: actions/publictagcloud.php:57
 msgid "Public tag cloud"
@@ -4776,10 +4869,6 @@ msgid ""
 "one!"
 msgstr ""
 
-#: actions/publictagcloud.php:146
-msgid "Tag cloud"
-msgstr "Tagipilvi"
-
 #. TRANS: Client error displayed trying to recover password while already logged in.
 #: actions/recoverpassword.php:37
 msgid "You are already logged in!"
@@ -4873,6 +4962,12 @@ msgstr "Salasanan palautus"
 msgid "Password recovery requested"
 msgstr "Salasanan palautuspyyntö lähetetty."
 
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/recoverpassword.php:229
+#, fuzzy
+msgid "Password saved"
+msgstr "Salasana tallennettu."
+
 #. TRANS: Title for password recovery page when an unknown action has been specified.
 #: actions/recoverpassword.php:232
 msgid "Unknown action"
@@ -4884,15 +4979,9 @@ msgstr "Tuntematon toiminto"
 msgid "6 or more characters, and do not forget it!"
 msgstr "6 tai useampia merkkejä äläkä unohda mitä kirjoitit!"
 
-#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
-#: actions/recoverpassword.php:264 actions/register.php:441
-#, fuzzy
-msgid "Same as password above."
-msgstr "Sama kuin ylläoleva salasana"
-
 #. TRANS: Button text for password reset form.
 #. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: actions/recoverpassword.php:268 lib/designsettings.php:264
+#: actions/recoverpassword.php:268 lib/designform.php:145
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Reset"
@@ -4943,14 +5032,8 @@ msgstr "Salasanassa pitää olla 6 tai useampia merkkejä."
 msgid "Password and confirmation do not match."
 msgstr "Salasana ja salasanan vahvistus eivät täsmää."
 
-#. TRANS: Reset password form validation error message.
-#: actions/recoverpassword.php:418
-#, fuzzy
-msgid "Cannot save new password."
-msgstr "Uutta salasanaa ei voida tallentaa."
-
 #. TRANS: Server error displayed when something does wrong with the user object during password reset.
-#: actions/recoverpassword.php:426 actions/register.php:256
+#: actions/recoverpassword.php:426 actions/register.php:241
 msgid "Error setting user."
 msgstr "Virhe tapahtui käyttäjän asettamisessa."
 
@@ -4960,96 +5043,100 @@ msgid "New password successfully saved. You are now logged in."
 msgstr ""
 "Uusi salasana tallennettiin onnistuneesti. Olet nyt kirjautunut sisään."
 
-#: actions/register.php:92 actions/register.php:196 actions/register.php:413
+#: actions/redirecturl.php:70
+#, fuzzy
+msgid "No id parameter"
+msgstr "Ei id parametria."
+
+#: actions/redirecturl.php:76
+#, fuzzy, php-format
+msgid "No such file \"%d\""
+msgstr "Tiedostoa ei ole."
+
+#: actions/register.php:80 actions/register.php:181 actions/register.php:392
 msgid "Sorry, only invited people can register."
 msgstr "Valitettavasti vain kutsutut ihmiset voivat rekisteröityä."
 
-#: actions/register.php:99
+#: actions/register.php:87
 msgid "Sorry, invalid invitation code."
 msgstr "Virheellinen kutsukoodin."
 
-#: actions/register.php:119
+#: actions/register.php:106
 msgid "Registration successful"
 msgstr "Rekisteröityminen onnistui"
 
-#: actions/register.php:121 actions/register.php:511
+#: actions/register.php:108 actions/register.php:490
 msgid "Register"
 msgstr "Rekisteröidy"
 
-#: actions/register.php:142
+#: actions/register.php:128
 msgid "Registration not allowed."
 msgstr "Rekisteröityminen ei ole sallittu."
 
-#: actions/register.php:209
+#: actions/register.php:194
 #, fuzzy
-msgid "You can't register if you don't agree to the license."
+msgid "You cannot register if you don't agree to the license."
 msgstr "Et voi rekisteröityä, jos et hyväksy lisenssiehtoja."
 
-#: actions/register.php:218
+#: actions/register.php:203
 msgid "Email address already exists."
 msgstr "Sähköpostiosoite on jo käytössä."
 
-#: actions/register.php:251 actions/register.php:273
+#: actions/register.php:236 actions/register.php:258
 msgid "Invalid username or password."
 msgstr "Käyttäjätunnus tai salasana ei kelpaa."
 
-#: actions/register.php:351
+#: actions/register.php:333
 msgid ""
 "With this form you can create a new account. You can then post notices and "
-"link up to friends and colleagues. "
+"link up to friends and colleagues."
 msgstr ""
 
-#: actions/register.php:437
-#, fuzzy
-msgid "6 or more characters."
-msgstr "6 tai useampia merkkejä"
-
-#. TRANS: Link description in user account settings menu.
-#: actions/register.php:445 actions/register.php:449
-#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
+#: actions/register.php:424 actions/register.php:428
+#: actions/siteadminpanel.php:238 lib/settingsnav.php:92
 msgid "Email"
 msgstr "Sähköposti"
 
-#: actions/register.php:446 actions/register.php:450
+#: actions/register.php:425 actions/register.php:429
 #, fuzzy
-msgid "Used only for updates, announcements, and password recovery"
+msgid "Used only for updates, announcements, and password recovery."
 msgstr ""
 "Käytetään ainoastaan päivityksien lähettämiseen, ilmoitusasioihin ja "
 "salasanan uudelleen käyttöönottoon."
 
-#: actions/register.php:457
+#: actions/register.php:436
 #, fuzzy
-msgid "Longer name, preferably your \"real\" name"
+msgid "Longer name, preferably your \"real\" name."
 msgstr "Pitempi nimi, mieluiten oikea nimesi"
 
-#: actions/register.php:462
+#: actions/register.php:464
 #, fuzzy
-msgid "URL of your homepage, blog, or profile on another site"
-msgstr "Kotisivusi, blogisi tai toisella sivustolla olevan profiilisi osoite."
+msgid "Where you are, like \"City, State (or Region), Country\"."
+msgstr "Olinpaikka kuten \"Kaupunki, Maakunta (tai Lääni), Maa\""
 
-#: actions/register.php:523
+#: actions/register.php:503
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
 msgstr ""
 
-#: actions/register.php:533
+#: actions/register.php:513
 #, php-format
 msgid "My text and files are copyright by %1$s."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:537
+#: actions/register.php:517
 msgid "My text and files remain under my own copyright."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:540
+#: actions/register.php:520
 msgid "All rights reserved."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:545
+#: actions/register.php:525
 #, fuzzy, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -5058,7 +5145,7 @@ msgstr ""
 "poislukien yksityinen tieto: salasana, sähköpostiosoite, IM-osoite, "
 "puhelinnumero."
 
-#: actions/register.php:588
+#: actions/register.php:566
 #, fuzzy, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -5091,7 +5178,7 @@ msgstr ""
 "\n"
 "Kiitokset rekisteröitymisestäsi ja toivomme että pidät palvelustamme."
 
-#: actions/register.php:612
+#: actions/register.php:590
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5125,7 +5212,7 @@ msgstr "Käyttäjätunnus"
 
 #: actions/remotesubscribe.php:129
 #, fuzzy
-msgid "Nickname of the user you want to follow"
+msgid "Nickname of the user you want to follow."
 msgstr "Käyttäjän, jota haluat seurata, käyttäjätunnus"
 
 #: actions/remotesubscribe.php:132
@@ -5134,18 +5221,18 @@ msgstr "Profiilin URL"
 
 #: actions/remotesubscribe.php:133
 #, fuzzy
-msgid "URL of your profile on another compatible microblogging service"
+msgid "URL of your profile on another compatible microblogging service."
 msgstr "Profiilisi URL-osoite toisessa yhteensopivassa mikroblogauspalvelussa"
 
 #. TRANS: Link text for link that will subscribe to a remote profile.
 #: actions/remotesubscribe.php:136 lib/subscribeform.php:139
-#: lib/userprofile.php:431
+#: lib/userprofile.php:402
 msgid "Subscribe"
 msgstr "Tilaa"
 
 #: actions/remotesubscribe.php:158
 #, fuzzy
-msgid "Invalid profile URL (bad format)"
+msgid "Invalid profile URL (bad format)."
 msgstr "Profiilin URL-osoite '%s' ei kelpaa (virheellinen muoto)."
 
 #: actions/remotesubscribe.php:167
@@ -5185,7 +5272,7 @@ msgstr "Et voi rekisteröityä, jos et hyväksy lisenssiehtoja."
 msgid "You already repeated that notice."
 msgstr "Sinä kuulut jo tähän ryhmään."
 
-#: actions/repeat.php:112 lib/noticelist.php:692
+#: actions/repeat.php:112 lib/noticelist.php:697
 #, fuzzy
 msgid "Repeated"
 msgstr "Luotu"
@@ -5195,9 +5282,9 @@ msgstr "Luotu"
 msgid "Repeated!"
 msgstr "Luotu"
 
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing @-replies.
+#. TRANS: RSS reply feed title. %s is a user nickname.
 #: actions/replies.php:126 actions/repliesrss.php:68
-#: lib/personalgroupnav.php:109
+#: lib/personalgroupnav.php:105
 #, php-format
 msgid "Replies to %s"
 msgstr "Vastaukset käyttäjälle %s"
@@ -5247,9 +5334,11 @@ msgstr ""
 "Ole ensimmäinen joka [lähettää päivityksen tästä aiheesta](%%%%action."
 "newnotice%%%%?status_textarea=%s)!"
 
-#: actions/repliesrss.php:72
+#. TRANS: RSS reply feed description.
+#. TRANS: %1$s is a user nickname, %2$s is the StatusNet site name.
+#: actions/repliesrss.php:74
 #, fuzzy, php-format
-msgid "Replies to %1$s on %2$s!"
+msgid "Replies to %1$s on %2$s."
 msgstr "Viesti käyttäjälle %1$s, %2$s"
 
 #. TRANS: Client exception displayed when trying to restore an account while not logged in.
@@ -5350,7 +5439,7 @@ msgstr "Päivityksesi tähän palveluun on estetty."
 msgid "User doesn't have this role."
 msgstr "Käyttäjälle ei löydy profiilia"
 
-#: actions/rsd.php:146 actions/version.php:159
+#: actions/rsd.php:142 actions/version.php:159
 #, fuzzy
 msgid "StatusNet"
 msgstr "Päivitys poistettu."
@@ -5396,97 +5485,46 @@ msgstr ""
 msgid "Save site settings"
 msgstr "Profiilikuva-asetukset"
 
-#: actions/showapplication.php:82
+#: actions/showapplication.php:78
 #, fuzzy
 msgid "You must be logged in to view an application."
 msgstr "Sinun pitää olla kirjautunut sisään, jotta voit erota ryhmästä."
 
-#: actions/showapplication.php:157
+#: actions/showapplication.php:151
 #, fuzzy
 msgid "Application profile"
 msgstr "Päivitykselle ei ole profiilia"
 
-#. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:159 lib/applicationeditform.php:177
-msgid "Icon"
-msgstr ""
-
-#. TRANS: Form input field label for application name.
-#: actions/showapplication.php:169 actions/version.php:197
-#: lib/applicationeditform.php:190
-#, fuzzy
-msgid "Name"
-msgstr "Tunnus"
-
-#. TRANS: Form input field label.
-#: actions/showapplication.php:178 lib/applicationeditform.php:227
-#, fuzzy
-msgid "Organization"
-msgstr "Sivutus"
-
-#. TRANS: Form input field label.
-#: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:168
-msgid "Description"
-msgstr "Kuvaus"
-
-#. TRANS: Header for group statistics on a group page (h2).
-#. TRANS: H2 text for user statistics.
-#: actions/showapplication.php:192 actions/showgroup.php:460
-#: lib/profileaction.php:205
-msgid "Statistics"
-msgstr "Tilastot"
-
-#: actions/showapplication.php:203
+#: actions/showapplication.php:179
 #, php-format
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr ""
 
-#: actions/showapplication.php:213
+#: actions/showapplication.php:189
 msgid "Application actions"
 msgstr ""
 
-#: actions/showapplication.php:236
+#: actions/showapplication.php:212
 msgid "Reset key & secret"
 msgstr ""
 
 #. TRANS: Title of form for deleting a user.
-#: actions/showapplication.php:252 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:64 lib/noticelist.php:673
+#: actions/showapplication.php:228 lib/deletegroupform.php:121
+#: lib/deleteuserform.php:64 lib/noticelist.php:678
 msgid "Delete"
 msgstr "Poista"
 
-#: actions/showapplication.php:261
+#: actions/showapplication.php:237
 msgid "Application info"
 msgstr ""
 
-#: actions/showapplication.php:263
-msgid "Consumer key"
-msgstr ""
-
-#: actions/showapplication.php:268
-msgid "Consumer secret"
-msgstr ""
-
-#: actions/showapplication.php:273
-msgid "Request token URL"
-msgstr ""
-
-#: actions/showapplication.php:278
-msgid "Access token URL"
-msgstr ""
-
-#: actions/showapplication.php:283
-msgid "Authorize URL"
-msgstr ""
-
-#: actions/showapplication.php:288
+#: actions/showapplication.php:255
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
 msgstr ""
 
-#: actions/showapplication.php:309
+#: actions/showapplication.php:275
 #, fuzzy
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr "Oletko varma että haluat poistaa tämän päivityksen?"
@@ -5566,61 +5604,47 @@ msgstr "Ryhmä %s"
 msgid "%1$s group, page %2$d"
 msgstr "Ryhmät, sivu %d"
 
-#. TRANS: Group profile header (h2). Text hidden by default.
-#: actions/showgroup.php:223
-msgid "Group profile"
-msgstr "Ryhmän profiili"
-
-#. TRANS: Label for group URL (dt). Text hidden by default.
-#. TRANS: DT for URL in a profile.
-#: actions/showgroup.php:273 actions/tagother.php:118
-#: actions/userauthorization.php:175 lib/userprofile.php:186
-msgid "URL"
-msgstr "URL"
-
 #. TRANS: Label for group description or group note (dt). Text hidden by default.
-#. TRANS: DT for note in a profile.
-#: actions/showgroup.php:285 actions/tagother.php:128
-#: actions/userauthorization.php:187 lib/userprofile.php:204
+#: actions/showgroup.php:266
 msgid "Note"
 msgstr "Huomaa"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:296 lib/groupeditform.php:180
+#: actions/showgroup.php:277 lib/groupeditform.php:180
 msgid "Aliases"
 msgstr "Aliakset"
 
 #. TRANS: Group actions header (h2). Text hidden by default.
-#: actions/showgroup.php:313
+#: actions/showgroup.php:294
 msgid "Group actions"
 msgstr "Ryhmän toiminnot"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:357
+#: actions/showgroup.php:338
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
 msgstr "Syöte ryhmän %s päivityksille (RSS 1.0)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:364
+#: actions/showgroup.php:345
 #, php-format
 msgid "Notice feed for %s group (RSS 2.0)"
 msgstr "Syöte ryhmän %s päivityksille (RSS 2.0)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:371
+#: actions/showgroup.php:352
 #, php-format
 msgid "Notice feed for %s group (Atom)"
 msgstr "Syöte ryhmän %s päivityksille (Atom)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:377
+#: actions/showgroup.php:358
 #, php-format
 msgid "FOAF for %s group"
 msgstr "Käyttäjän %s lähetetyt viestit"
 
 #. TRANS: Header for mini list of group members on a group page (h2).
-#: actions/showgroup.php:414
+#: actions/showgroup.php:395
 msgid "Members"
 msgstr "Jäsenet"
 
@@ -5628,27 +5652,32 @@ msgstr "Jäsenet"
 #. TRANS: Text for user subscription statistics if the user has no subscriptions.
 #. TRANS: Text for user subscriber statistics if user has no subscribers.
 #. TRANS: Text for user user group membership statistics if user is not a member of any group.
-#: actions/showgroup.php:420 lib/profileaction.php:137
+#: actions/showgroup.php:401 lib/profileaction.php:137
 #: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
-#: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
+#: lib/subscriptionlist.php:123 lib/tagcloudsection.php:71
 #, fuzzy
 msgid "(None)"
 msgstr "(Tyhjä)"
 
 #. TRANS: Link to all group members from mini list of group members if group has more than n members.
-#: actions/showgroup.php:429
+#: actions/showgroup.php:410
 msgid "All members"
 msgstr "Kaikki jäsenet"
 
-#. TRANS: Label for creation date in statistics on group page.
-#: actions/showgroup.php:465
+#. TRANS: Header for group statistics on a group page (h2).
+#. TRANS: H2 text for user statistics.
+#: actions/showgroup.php:441 lib/profileaction.php:205
+msgid "Statistics"
+msgstr "Tilastot"
+
+#: actions/showgroup.php:444
 #, fuzzy
 msgctxt "LABEL"
 msgid "Created"
 msgstr "Luotu"
 
 #. TRANS: Label for member count in statistics on group page.
-#: actions/showgroup.php:473
+#: actions/showgroup.php:449
 #, fuzzy
 msgctxt "LABEL"
 msgid "Members"
@@ -5658,7 +5687,7 @@ msgstr "Jäsenet"
 #. TRANS: **%s** is the group alias, %%%%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).
-#: actions/showgroup.php:488
+#: actions/showgroup.php:464
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5671,7 +5700,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: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
-#: actions/showgroup.php:498
+#: actions/showgroup.php:474
 #, fuzzy, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5683,7 +5712,7 @@ msgstr ""
 "(http://en.wikipedia.org/wiki/Micro-blogging)"
 
 #. TRANS: Header for list of group administrators on a group page (h2).
-#: actions/showgroup.php:527
+#: actions/showgroup.php:503
 msgid "Admins"
 msgstr "Ylläpitäjät"
 
@@ -5722,7 +5751,7 @@ msgid "%1$s tagged %2$s"
 msgstr "Ryhmät, sivu %d"
 
 #. TRANS: Page title showing tagged notices in one user's stream.
-#. TRANS: %1$s is the username, %2$s is the hash tag, %1$d is the page number.
+#. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
 #: actions/showstream.php:74
 #, fuzzy, php-format
 msgid "%1$s tagged %2$s, page %3$d"
@@ -5769,7 +5798,7 @@ msgid "FOAF for %s"
 msgstr "Käyttäjän %s lähetetyt viestit"
 
 #. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
-#: actions/showstream.php:211
+#: actions/showstream.php:205
 #, fuzzy, php-format
 msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr ""
@@ -5777,7 +5806,7 @@ msgstr ""
 "vielä mitään."
 
 #. TRANS: Second sentence of empty list message for a stream for the user themselves.
-#: actions/showstream.php:217
+#: actions/showstream.php:211
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
@@ -5785,7 +5814,7 @@ msgstr ""
 
 #. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:221
+#: actions/showstream.php:215
 #, fuzzy, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
@@ -5796,7 +5825,7 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:264
+#: actions/showstream.php:258
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5807,7 +5836,7 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:271
+#: actions/showstream.php:265
 #, fuzzy, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5818,7 +5847,7 @@ msgstr ""
 "[mikroblogauspalvelu](http://en.wikipedia.org/wiki/Micro-blogging)"
 
 #. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
-#: actions/showstream.php:328
+#: actions/showstream.php:322
 #, fuzzy, php-format
 msgid "Repeat of %s"
 msgstr "Vastaukset käyttäjälle %s"
@@ -5972,77 +6001,77 @@ msgstr ""
 #. TRANS: Title for button to save site notice in admin panel.
 #: actions/sitenoticeadminpanel.php:201
 #, fuzzy
-msgid "Save site notice"
+msgid "Save site notice."
 msgstr "Palvelun ilmoitus"
 
 #. TRANS: Title for SMS settings.
-#: actions/smssettings.php:57
+#: actions/smssettings.php:56
 msgid "SMS settings"
 msgstr "Profiilikuva-asetukset"
 
 #. TRANS: SMS settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/smssettings.php:71
+#: actions/smssettings.php:70
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr ""
 "Voit saada SMS viestit sähköpostin välityksellä %%site.name%% -palvelusta."
 
 #. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
-#: actions/smssettings.php:93
+#: actions/smssettings.php:92
 msgid "SMS is not available."
 msgstr "SMS ei ole käytettävissä."
 
 #. TRANS: Form legend for SMS settings form.
-#: actions/smssettings.php:107
+#: actions/smssettings.php:106
 msgid "SMS address"
 msgstr "Sähköpostiosoitteet"
 
 #. TRANS: Form guide in SMS settings form.
-#: actions/smssettings.php:116
+#: actions/smssettings.php:115
 msgid "Current confirmed SMS-enabled phone number."
 msgstr "Tämän hetken vahvistettu SMS puhelinnumero."
 
 #. TRANS: Form guide in IM settings form.
-#: actions/smssettings.php:129
+#: actions/smssettings.php:128
 msgid "Awaiting confirmation on this phone number."
 msgstr "Odotetaan vahvistusta tälle puhelinnumerolle."
 
 #. TRANS: Field label for SMS address input in SMS settings form.
-#: actions/smssettings.php:138
+#: actions/smssettings.php:137
 msgid "Confirmation code"
 msgstr "Vahvistuskoodi"
 
 #. TRANS: Form field instructions in SMS settings form.
-#: actions/smssettings.php:140
+#: actions/smssettings.php:139
 msgid "Enter the code you received on your phone."
 msgstr "Syötä koodi jonka sait puhelimeesi."
 
 #. TRANS: Button label to confirm SMS confirmation code in SMS settings.
-#: actions/smssettings.php:144
+#: actions/smssettings.php:143
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Confirm"
 msgstr "Vahvista"
 
 #. TRANS: Field label for SMS phone number input in SMS settings form.
-#: actions/smssettings.php:149
+#: actions/smssettings.php:148
 msgid "SMS phone number"
 msgstr "Puhelinnumeroa ei ole."
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
-#: actions/smssettings.php:152
+#: actions/smssettings.php:151
 #, fuzzy
-msgid "Phone number, no punctuation or spaces, with area code"
+msgid "Phone number, no punctuation or spaces, with area code."
 msgstr "Puhelinnumero, ei välimerkkejä tai välilyöntejä, suuntanumerollinen"
 
 #. TRANS: Form legend for SMS preferences form.
-#: actions/smssettings.php:191
+#: actions/smssettings.php:190
 msgid "SMS preferences"
 msgstr "Asetukset tallennettu."
 
 #. TRANS: Checkbox label in SMS preferences form.
-#: actions/smssettings.php:197
+#: actions/smssettings.php:196
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
@@ -6051,33 +6080,33 @@ msgstr ""
 "tästä matkapuhelinoperaattoriltani."
 
 #. TRANS: Confirmation message for successful SMS preferences save.
-#: actions/smssettings.php:308
+#: actions/smssettings.php:307
 #, fuzzy
 msgid "SMS preferences saved."
 msgstr "Asetukset tallennettu."
 
 #. TRANS: Message given saving SMS phone number without having provided one.
-#: actions/smssettings.php:330
+#: actions/smssettings.php:329
 msgid "No phone number."
 msgstr "Puhelinnumeroa ei ole."
 
 #. TRANS: Message given saving SMS phone number without having selected a carrier.
-#: actions/smssettings.php:336
+#: actions/smssettings.php:335
 msgid "No carrier selected."
 msgstr "Operaattoria ei ole valittu."
 
 #. TRANS: Message given saving SMS phone number that is already set.
-#: actions/smssettings.php:344
+#: actions/smssettings.php:343
 msgid "That is already your phone number."
 msgstr "Tämä on jo puhelinnumerosi."
 
 #. TRANS: Message given saving SMS phone number that is already set for another user.
-#: actions/smssettings.php:348
+#: actions/smssettings.php:347
 msgid "That phone number already belongs to another user."
 msgstr "Tämä puhelinnumero kuuluu jo toiselle käyttäjälle."
 
 #. TRANS: Message given saving valid SMS phone number that is to be confirmed.
-#: actions/smssettings.php:376
+#: actions/smssettings.php:375
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
 "for the code and instructions on how to use it."
@@ -6086,40 +6115,40 @@ msgstr ""
 "vahvistuskoodisi ja ohjeet miten sitä käytetään."
 
 #. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
-#: actions/smssettings.php:404
+#: actions/smssettings.php:403
 msgid "That is the wrong confirmation number."
 msgstr "Tämä on väärä vahvistukoodi."
 
 #. TRANS: Message given after successfully canceling SMS phone number confirmation.
-#: actions/smssettings.php:418
+#: actions/smssettings.php:417
 msgid "SMS confirmation cancelled."
 msgstr "SMS vahvistus"
 
 #. TRANS: Message given trying to remove an SMS phone number that is not
 #. TRANS: registered for the active user.
-#: actions/smssettings.php:438
+#: actions/smssettings.php:437
 msgid "That is not your phone number."
 msgstr "Tämä ei ole puhelinnumerosi."
 
 #. TRANS: Message given after successfully removing a registered SMS phone number.
-#: actions/smssettings.php:460
+#: actions/smssettings.php:459
 #, fuzzy
 msgid "The SMS phone number was removed."
 msgstr "SMS puhelinnumero"
 
 #. TRANS: Label for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:499
+#: actions/smssettings.php:498
 msgid "Mobile carrier"
 msgstr "Matkapuhelinoperaattori"
 
 #. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:504
+#: actions/smssettings.php:503
 msgid "Select a carrier"
 msgstr "Valitse operaattori"
 
 #. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
 #. TRANS: %s is an administrative contact's e-mail address.
-#: actions/smssettings.php:513
+#: actions/smssettings.php:512
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -6130,7 +6159,7 @@ msgstr ""
 "sähköpostia meille osoitteeseen %s."
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
-#: actions/smssettings.php:535
+#: actions/smssettings.php:534
 #, fuzzy
 msgid "No code entered."
 msgstr "Koodia ei ole syötetty."
@@ -6205,16 +6234,14 @@ msgstr "Et ole tilannut tämän käyttäjän päivityksiä."
 msgid "Could not save subscription."
 msgstr "Tilausta ei onnistuttu tallentamaan."
 
-#: actions/subscribe.php:77
-msgid "This action only accepts POST requests."
-msgstr ""
-
-#: actions/subscribe.php:117
+#. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
+#: actions/subscribe.php:121
 #, fuzzy
 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
 msgstr "Et ole tilannut tämän käyttäjän päivityksiä."
 
-#: actions/subscribe.php:145
+#. TRANS: Page title when subscription succeeded.
+#: actions/subscribe.php:149
 msgid "Subscribed"
 msgstr "Tilattu"
 
@@ -6321,31 +6348,34 @@ msgid "Subscription feed for %s (Atom)"
 msgstr "Syöte ryhmän %s päivityksille (Atom)"
 
 #. TRANS: Checkbox label for enabling Jabber messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:239
-msgid "Jabber"
-msgstr "Jabber"
+#: actions/subscriptions.php:241 lib/settingsnav.php:110
+#, fuzzy
+msgid "IM"
+msgstr "Pikaviestin"
 
 #. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:254
+#: actions/subscriptions.php:256 lib/settingsnav.php:117
 msgid "SMS"
 msgstr "SMS"
 
-#: actions/tag.php:69
+#. TRANS: Title for all but the first page of notices with tags.
+#. TRANS: %1$s is the tag, %2$d is the page number.
+#: actions/tag.php:73
 #, php-format
 msgid "Notices tagged with %1$s, page %2$d"
 msgstr "Päivitykset joilla on tagi %s"
 
-#: actions/tag.php:87
+#: actions/tag.php:91
 #, php-format
 msgid "Notice feed for tag %s (RSS 1.0)"
 msgstr "Syöte ryhmän %s päivityksille (RSS 1.0)"
 
-#: actions/tag.php:93
+#: actions/tag.php:97
 #, php-format
 msgid "Notice feed for tag %s (RSS 2.0)"
 msgstr "Syöte ryhmän %s päivityksille (RSS 2.0)"
 
-#: actions/tag.php:99
+#: actions/tag.php:103
 #, php-format
 msgid "Notice feed for tag %s (Atom)"
 msgstr "Syöte ryhmän %s päivityksille (Atom)"
@@ -6365,17 +6395,11 @@ msgstr "Tagi %s"
 msgid "User profile"
 msgstr "Käyttäjän profiili"
 
-#. TRANS: DT element in area for user avatar.
-#: actions/tagother.php:81 actions/userauthorization.php:132
-#: lib/userprofile.php:108
-msgid "Photo"
-msgstr "Kuva"
-
-#: actions/tagother.php:141
+#: actions/tagother.php:120
 msgid "Tag user"
 msgstr "Tagaa käyttäjä"
 
-#: actions/tagother.php:151
+#: actions/tagother.php:130
 msgid ""
 "Tags for this user (letters, numbers, -, ., and _), comma- or space- "
 "separated"
@@ -6383,14 +6407,19 @@ msgstr ""
 "Käyttäjän tagit (kirjaimet, numerot, -, ., ja _), pilkulla tai välilyönnillä "
 "erotettuna"
 
-#: actions/tagother.php:193
+#: actions/tagother.php:157
+#, php-format
+msgid "Invalid tag: \"%s\""
+msgstr "Virheellinen tagi: \"%s\""
+
+#: actions/tagother.php:172
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 "Voit tagata ainoastaan ihmisiä, joita tilaat tai jotka tilaavat sinun "
 "päivityksiäsi."
 
-#: actions/tagother.php:236
+#: actions/tagother.php:215
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
 "Käytä tätä lomaketta lisätäksesi tageja tilaajillesi ja käyttäjille jotka "
@@ -6400,6 +6429,7 @@ msgstr ""
 msgid "No such tag."
 msgstr "Tuota tagia ei ole."
 
+#. TRANS: Client error displayed when trying to unblock a non-blocked user.
 #: actions/unblock.php:59
 msgid "You haven't blocked that user."
 msgstr "Älä estä tätä käyttäjää"
@@ -6422,12 +6452,84 @@ msgstr "Ei profiilia tuolle ID:lle."
 msgid "Unsubscribed"
 msgstr "Tilaus lopetettu"
 
-#: actions/updateprofile.php:64 actions/userauthorization.php:337
+#: actions/updateprofile.php:64
 #, php-format
 msgid ""
 "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
 msgstr ""
 
+#: actions/urlsettings.php:60
+#, fuzzy
+msgid "URL settings"
+msgstr "Profiilikuva-asetukset"
+
+#. TRANS: Instructions for tab "Other" in user profile settings.
+#: actions/urlsettings.php:72
+msgid "Manage various other options."
+msgstr "Hallinnoi muita asetuksia."
+
+#. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
+#. TRANS: user's profile settings. This message has one space at the beginning. Use your
+#. TRANS: language's word separator here if it has one (most likely a single space).
+#: actions/urlsettings.php:115
+msgid " (free service)"
+msgstr ""
+
+#: actions/urlsettings.php:121
+#, fuzzy
+msgid "[none]"
+msgstr "Ei mitään"
+
+#: actions/urlsettings.php:122
+msgid "[internal]"
+msgstr ""
+
+#. TRANS: Label for dropdown with URL shortener services.
+#: actions/urlsettings.php:130
+msgid "Shorten URLs with"
+msgstr "Lyhennä URL-osoitteita"
+
+#. TRANS: Tooltip for for dropdown with URL shortener services.
+#: actions/urlsettings.php:132
+msgid "Automatic shortening service to use."
+msgstr "Käytettävä automaattinen lyhennyspalvelu."
+
+#: actions/urlsettings.php:138
+msgid "URL longer than"
+msgstr ""
+
+#: actions/urlsettings.php:141
+msgid "URLs longer than this will be shortened, 0 means always shorten."
+msgstr ""
+
+#: actions/urlsettings.php:145
+msgid "Text longer than"
+msgstr ""
+
+#: actions/urlsettings.php:148
+msgid ""
+"URLs in notices longer than this will be shortened, 0 means always shorten."
+msgstr ""
+
+#. TRANS: Form validation error for form "Other settings" in user profile.
+#: actions/urlsettings.php:180
+#, fuzzy
+msgid "URL shortening service is too long (maximum 50 characters)."
+msgstr "URL-lyhennyspalvelun nimi on liian pitkä (max 50 merkkiä)."
+
+#: actions/urlsettings.php:187
+msgid "Invalid number for max url length."
+msgstr ""
+
+#: actions/urlsettings.php:193
+#, fuzzy
+msgid "Invalid number for max notice length."
+msgstr "Koko ei kelpaa."
+
+#: actions/urlsettings.php:238
+msgid "Error saving user URL shortening preferences."
+msgstr ""
+
 #. TRANS: User admin panel title
 #: actions/useradminpanel.php:58
 #, fuzzy
@@ -6454,11 +6556,11 @@ msgstr ""
 #. TRANS: users in user admin panel. %1$s is the invalid nickname.
 #: actions/useradminpanel.php:166
 #, php-format
-msgid "Invalid default subscripton: '%1$s' is not a user."
+msgid "Invalid default subscripton: \"%1$s\" is not a user."
 msgstr ""
 
-#. TRANS: Link description in user account settings menu.
-#: actions/useradminpanel.php:215 lib/accountsettingsaction.php:106
+#: actions/useradminpanel.php:215 lib/action.php:565 lib/settingsnav.php:77
+#: lib/subgroupnav.php:81
 msgid "Profile"
 msgstr "Profiili"
 
@@ -6523,59 +6625,63 @@ msgstr ""
 #. TRANS: Title for button to save user settings in user admin panel.
 #: actions/useradminpanel.php:302
 #, fuzzy
-msgid "Save user settings"
+msgid "Save user settings."
 msgstr "Profiilikuva-asetukset"
 
-#: actions/userauthorization.php:105
+#. TRANS: Page title.
+#: actions/userauthorization.php:109
 msgid "Authorize subscription"
 msgstr "Valtuuta tilaus"
 
-#: actions/userauthorization.php:110
+#. TRANS: Page notice on "Auhtorize subscription" page.
+#: actions/userauthorization.php:115
 #, fuzzy
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
 "user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
-"click “Reject”."
+"click \"Reject\"."
 msgstr ""
 "Tarkista nämä tiedot varmistaaksesi, että haluat tilata tämän käyttäjän "
 "päivitykset. Jos et valinnut haluavasi tilata jonkin käyttäjän päivityksiä, "
 "paina \"Peruuta\"."
 
-#. TRANS: Menu item for site administration
-#: actions/userauthorization.php:196 actions/version.php:167
-#: lib/adminpanelaction.php:403
-msgid "License"
-msgstr "Lisenssi"
-
-#: actions/userauthorization.php:217
+#. TRANS: Button text on Authorise Subscription page.
+#: actions/userauthorization.php:200
 #, fuzzy
+msgctxt "BUTTON"
 msgid "Accept"
 msgstr "Hyväksy"
 
-#: actions/userauthorization.php:218 lib/subscribeform.php:115
-#: lib/subscribeform.php:139
-msgid "Subscribe to this user"
+#. TRANS: Title for button on Authorise Subscription page.
+#: actions/userauthorization.php:202
+#, fuzzy
+msgid "Subscribe to this user."
 msgstr "Tilaa tämä käyttäjä"
 
-#: actions/userauthorization.php:219
+#. TRANS: Button text on Authorise Subscription page.
+#: actions/userauthorization.php:204
 #, fuzzy
+msgctxt "BUTTON"
 msgid "Reject"
 msgstr "Hylkää"
 
-#: actions/userauthorization.php:220
+#. TRANS: Title for button on Authorise Subscription page.
+#: actions/userauthorization.php:206
 #, fuzzy
-msgid "Reject this subscription"
+msgid "Reject this subscription."
 msgstr "Käyttäjän %s tilaukset"
 
-#: actions/userauthorization.php:232
+#. TRANS: Client error displayed for an empty authorisation request.
+#: actions/userauthorization.php:219
 msgid "No authorization request!"
 msgstr "Ei valtuutuspyyntöä!"
 
-#: actions/userauthorization.php:254
+#. TRANS: Accept message header from Authorise subscription page.
+#: actions/userauthorization.php:242
 msgid "Subscription authorized"
 msgstr "Tilaus sallittu"
 
-#: actions/userauthorization.php:256
+#: actions/userauthorization.php:245
 #, fuzzy
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
@@ -6586,11 +6692,12 @@ msgstr ""
 "saatu. Tarkista sivuston ohjeet miten päivityksen tilaus hyväksytään. "
 "Tilauskoodisi on:"
 
-#: actions/userauthorization.php:266
+#. TRANS: Reject message header from Authorise subscription page.
+#: actions/userauthorization.php:256
 msgid "Subscription rejected"
 msgstr "Tilaus hylätty"
 
-#: actions/userauthorization.php:268
+#: actions/userauthorization.php:259
 #, fuzzy
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
@@ -6600,58 +6707,99 @@ msgstr ""
 "Päivityksen tilaus on hylätty, mutta callback-osoitetta palveluun ei ole "
 "saatu. Tarkista sivuston ohjeet miten päivityksen tilaus hylätään kokonaan."
 
+#. TRANS: Exception thrown when no valid user is found for an authorisation request.
+#. TRANS: %s is a listener URI.
+#: actions/userauthorization.php:296
+#, php-format
+msgid "Listener URI \"%s\" not found here."
+msgstr ""
+
+#. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
+#. TRANS: %s is a listenee URI.
 #: actions/userauthorization.php:303
 #, php-format
-msgid "Listener URI ‘%s’ not found here."
+msgid "Listenee URI \"%s\" is too long."
 msgstr ""
 
-#: actions/userauthorization.php:308
+#. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
+#. TRANS: %s is a listenee URI.
+#: actions/userauthorization.php:311
 #, php-format
-msgid "Listenee URI ‘%s’ is too long."
-msgstr ""
-
-#: actions/userauthorization.php:314
-#, php-format
-msgid "Listenee URI ‘%s’ is a local user."
+msgid "Listenee URI \"%s\" is a local user."
 msgstr ""
 
+#. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
+#. TRANS: %s is a profile URL.
 #: actions/userauthorization.php:329
 #, php-format
-msgid "Profile URL ‘%s’ is for a local user."
+msgid "Profile URL \"%s\" is for a local user."
 msgstr ""
 
-#: actions/userauthorization.php:345
+#. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
+#. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
+#: actions/userauthorization.php:339
+#, php-format
+msgid ""
+"Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
+"\"."
+msgstr ""
+
+#. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
+#. TRANS: %s is an avatar URL.
+#: actions/userauthorization.php:349
 #, fuzzy, php-format
-msgid "Avatar URL ‘%s’ is not valid."
+msgid "Avatar URL \"%s\" is not valid."
 msgstr "Kotisivun verkko-osoite ei ole toimiva."
 
-#: actions/userauthorization.php:350
+#. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
+#. TRANS: %s is an avatar URL.
+#: actions/userauthorization.php:356
 #, fuzzy, php-format
-msgid "Can’t read avatar URL ‘%s’."
+msgid "Cannot read avatar URL \"%s\"."
 msgstr "Kuvan URL-osoitetta '%s' ei voi avata."
 
-#: actions/userauthorization.php:355
+#. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
+#. TRANS: %s is an avatar URL.
+#: actions/userauthorization.php:363
 #, fuzzy, php-format
-msgid "Wrong image type for avatar URL ‘%s’."
+msgid "Wrong image type for avatar URL \"%s\"."
 msgstr "Kuvan '%s' tyyppi on väärä"
 
 #. TRANS: Page title for profile design page.
-#: actions/userdesignsettings.php:74 lib/designsettings.php:63
+#: actions/userdesignsettings.php:74 lib/designsettings.php:61
 #, fuzzy
 msgid "Profile design"
 msgstr "Profiiliasetukset"
 
 #. TRANS: Instructions for profile design page.
-#: actions/userdesignsettings.php:84 lib/designsettings.php:74
+#: actions/userdesignsettings.php:84 lib/designsettings.php:72
 msgid ""
 "Customize the way your profile looks with a background image and a colour "
 "palette of your choice."
 msgstr ""
 
-#: actions/userdesignsettings.php:272
+#: actions/userdesignsettings.php:289
 msgid "Enjoy your hotdog!"
 msgstr ""
 
+#: actions/userdesignsettings.php:325
+#, fuzzy
+msgid "Design settings"
+msgstr "Profiilikuva-asetukset"
+
+#: actions/userdesignsettings.php:340
+msgid "View profile designs"
+msgstr "Näytä tai piillota profiilin ulkoasu."
+
+#: actions/userdesignsettings.php:341
+msgid "Show or hide profile designs."
+msgstr "Näytä tai piillota profiilin ulkoasu."
+
+#: actions/userdesignsettings.php:348
+#, fuzzy
+msgid "Background file"
+msgstr "Tausta"
+
 #. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number.
 #: actions/usergroups.php:66
 #, php-format
@@ -6699,6 +6847,11 @@ msgstr ""
 msgid "Contributors"
 msgstr ""
 
+#. TRANS: Menu item for site administration
+#: actions/version.php:167 lib/adminpanelaction.php:403
+msgid "License"
+msgstr "Lisenssi"
+
 #: actions/version.php:170
 msgid ""
 "StatusNet is free software: you can redistribute it and/or modify it under "
@@ -6722,12 +6875,14 @@ msgid ""
 "along with this program.  If not, see %s."
 msgstr ""
 
-#: actions/version.php:191
-msgid "Plugins"
-msgstr ""
+#. TRANS: Form input field label for application name.
+#: actions/version.php:197 lib/applicationeditform.php:190
+#, fuzzy
+msgid "Name"
+msgstr "Tunnus"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:901
+#: actions/version.php:198 lib/action.php:885
 #, fuzzy
 msgid "Version"
 msgstr "Omat"
@@ -6736,6 +6891,12 @@ msgstr "Omat"
 msgid "Author(s)"
 msgstr ""
 
+#. TRANS: Form input field label.
+#: actions/version.php:200 lib/applicationeditform.php:208
+#: lib/groupeditform.php:168
+msgid "Description"
+msgstr "Kuvaus"
+
 #. TRANS: Activity title when marking a notice as favorite.
 #: classes/Fave.php:164
 msgid "Favor"
@@ -6855,7 +7016,7 @@ msgid "Could not create login token for %s"
 msgstr "Ei voitu lisätä aliasta."
 
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
-#: classes/Memcached_DataObject.php:542
+#: classes/Memcached_DataObject.php:556
 msgid "No database name or DSN found anywhere."
 msgstr ""
 
@@ -7036,18 +7197,18 @@ msgstr "%1$s seuraa nyt päivityksiäsi palvelussa %2$s."
 
 #. TRANS: Notice given on user registration.
 #. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:395
+#: classes/User.php:390
 #, fuzzy, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr "Viesti käyttäjälle %1$s, %2$s"
 
 #. TRANS: Server exception.
-#: classes/User.php:918
+#: classes/User.php:923
 msgid "No single user defined for single-user mode."
 msgstr ""
 
 #. TRANS: Server exception.
-#: classes/User.php:922
+#: classes/User.php:927
 msgid "Single-user mode code called when not enabled."
 msgstr ""
 
@@ -7093,42 +7254,6 @@ msgstr ""
 msgid "No AtomPub API service for %s."
 msgstr ""
 
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:104
-msgid "Change your profile settings"
-msgstr "Vaihda profiiliasetuksesi"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:111
-msgid "Upload an avatar"
-msgstr "Lataa kuva"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:118
-msgid "Change your password"
-msgstr "Vaihda salasanasi"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:125
-msgid "Change email handling"
-msgstr "Muuta sähköpostin käsittelyasetuksia."
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:132
-#, fuzzy
-msgid "Design your profile"
-msgstr "Käyttäjän profiili"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:139
-msgid "Other options"
-msgstr "Muita asetuksia"
-
-#. TRANS: Link description in user account settings menu.
-#: lib/accountsettingsaction.php:141
-msgid "Other"
-msgstr "Muut"
-
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
 #: lib/action.php:161
 #, fuzzy, php-format
@@ -7146,216 +7271,129 @@ msgctxt "TOOLTIP"
 msgid "Show more"
 msgstr ""
 
-#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:544
-msgid "Primary site navigation"
-msgstr "Ensisijainen sivunavigointi"
-
-#. TRANS: Tooltip for main menu option "Personal".
-#: lib/action.php:550
+#. TRANS: Inline reply form submit button: submits a reply comment.
+#: lib/action.php:328
 #, fuzzy
-msgctxt "TOOLTIP"
-msgid "Personal profile and friends timeline"
-msgstr "Henkilökohtainen profiili ja kavereiden aikajana"
+msgctxt "BUTTON"
+msgid "Comment"
+msgstr "Sisältö"
 
-#. TRANS: Main menu option when logged in for access to personal profile and friends timeline.
-#. TRANS: Personal group navigation menu option when logged in for viewing timeline of self and friends.
-#: lib/action.php:553 lib/personalgroupnav.php:100
+#. TRANS: Placeholder text for inline reply form. Clicking in this box will turn it into a mini notice form.
+#: lib/action.php:331
+msgid "Add a comment..."
+msgstr ""
+
+#: lib/action.php:559 lib/personalgroupnav.php:99
 #, fuzzy
-msgctxt "MENU"
-msgid "Personal"
-msgstr "Omat"
+msgid "Home"
+msgstr "Kotisivu"
 
-#. TRANS: Tooltip for main menu option "Account".
-#: lib/action.php:555
-msgctxt "TOOLTIP"
-msgid "Change your email, avatar, password, profile"
-msgstr "Vaihda salasanasi"
-
-#. TRANS: Main menu option when logged in for access to user settings.
-#: lib/action.php:558
-msgid "Account"
-msgstr "Käyttäjätili"
-
-#. TRANS: Tooltip for main menu option "Services".
 #: lib/action.php:560
 #, fuzzy
-msgctxt "TOOLTIP"
-msgid "Connect to services"
-msgstr "Ei voitu uudelleenohjata palvelimelle: %s"
+msgid "Friends timeline"
+msgstr "%s aikajana"
 
-#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services.
-#: lib/action.php:563
-msgid "Connect"
-msgstr "Yhdistä"
-
-#. TRANS: Tooltip for menu option "Admin".
 #: lib/action.php:566
 #, fuzzy
-msgctxt "TOOLTIP"
-msgid "Change site configuration"
-msgstr "Ensisijainen sivunavigointi"
+msgid "Your profile"
+msgstr "Ryhmän profiili"
 
-#. TRANS: Main menu option when logged in and site admin for access to site configuration.
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/action.php:569 lib/groupnav.php:117
+#: lib/action.php:570 lib/action.php:593 lib/publicgroupnav.php:78
+msgid "Public"
+msgstr "Julkinen"
+
+#: lib/action.php:571 lib/action.php:594
 #, fuzzy
-msgctxt "MENU"
-msgid "Admin"
-msgstr "Ylläpito"
+msgid "Everyone on this site"
+msgstr "Hae ihmisiä tältä sivustolta"
 
-#. TRANS: Tooltip for main menu option "Invite".
-#: lib/action.php:573
-#, fuzzy, php-format
-msgctxt "TOOLTIP"
-msgid "Invite friends and colleagues to join you on %s"
-msgstr "Kutsu kavereita ja työkavereita liittymään palveluun %s"
+#: lib/action.php:575
+#, fuzzy
+msgid "Settings"
+msgstr "Profiilikuva-asetukset"
 
-#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users.
 #: lib/action.php:576
 #, fuzzy
-msgctxt "MENU"
-msgid "Invite"
-msgstr "Kutsu"
+msgid "Change your personal settings"
+msgstr "Vaihda profiiliasetuksesi"
 
-#. TRANS: Tooltip for main menu option "Logout"
 #: lib/action.php:582
-msgctxt "TOOLTIP"
-msgid "Logout from the site"
-msgstr "Kirjaudu sisään"
+#, fuzzy
+msgid "Site configuration"
+msgstr "SMS vahvistus"
 
-#. TRANS: Main menu option when logged in to log out the current user.
-#: lib/action.php:585
-msgctxt "MENU"
+#: lib/action.php:587
+#, fuzzy
 msgid "Logout"
 msgstr "Kirjaudu ulos"
 
-#. TRANS: Tooltip for main menu option "Register".
-#: lib/action.php:590
-msgctxt "TOOLTIP"
-msgid "Create an account"
-msgstr "Luo uusi ryhmä"
-
-#. TRANS: Main menu option when not logged in to register a new account.
-#. TRANS: Menu item for registering with the StatusNet site.
-#: lib/action.php:593 lib/logingroupnav.php:85
+#: lib/action.php:588
 #, fuzzy
-msgctxt "MENU"
-msgid "Register"
-msgstr "Rekisteröidy"
+msgid "Logout from the site"
+msgstr "Kirjaudu sisään"
 
-#. TRANS: Tooltip for main menu option "Login".
-#: lib/action.php:596
-msgctxt "TOOLTIP"
+#: lib/action.php:599
+#, fuzzy
 msgid "Login to the site"
 msgstr "Kirjaudu sisään"
 
-#. TRANS: Main menu option when not logged in to log in.
-#. TRANS: Menu item for logging in to the StatusNet site.
-#: lib/action.php:599 lib/logingroupnav.php:77
+#: lib/action.php:606
 #, fuzzy
-msgctxt "MENU"
-msgid "Login"
-msgstr "Kirjaudu sisään"
-
-#. TRANS: Tooltip for main menu option "Help".
-#: lib/action.php:602
-msgctxt "TOOLTIP"
-msgid "Help me!"
-msgstr "Ohjeet"
-
-#. TRANS: Main menu option for help on the StatusNet site.
-#: lib/action.php:605
-msgctxt "MENU"
-msgid "Help"
-msgstr "Ohje"
-
-#. TRANS: Tooltip for main menu option "Search".
-#: lib/action.php:608
-msgctxt "TOOLTIP"
-msgid "Search for people or text"
-msgstr "Hae lisää ryhmiä"
-
-#. TRANS: Main menu option when logged in or when the StatusNet instance is not private.
-#: lib/action.php:611
-#, fuzzy
-msgctxt "MENU"
 msgid "Search"
 msgstr "Haku"
 
-#. TRANS: DT element for site notice. String is hidden in default CSS.
-#. TRANS: Menu item for site administration
-#: lib/action.php:633 lib/adminpanelaction.php:387
-msgid "Site notice"
-msgstr "Palvelun ilmoitus"
-
-#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:700
-msgid "Local views"
-msgstr "Paikalliset näkymät"
-
-#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:770
-msgid "Page notice"
-msgstr "Sivuilmoitus"
-
-#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:874
-msgid "Secondary site navigation"
-msgstr "Toissijainen sivunavigointi"
+#: lib/action.php:607
+#, fuzzy
+msgid "Search the site"
+msgstr "Haku"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:880
+#: lib/action.php:864
 msgid "Help"
 msgstr "Ohjeet"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:883
+#: lib/action.php:867
 msgid "About"
 msgstr "Tietoa"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:886
+#: lib/action.php:870
 msgid "FAQ"
 msgstr "UKK"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:891
+#: lib/action.php:875
 msgid "TOS"
 msgstr ""
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:895
+#: lib/action.php:879
 msgid "Privacy"
 msgstr "Yksityisyys"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:898
+#: lib/action.php:882
 msgid "Source"
 msgstr "Lähdekoodi"
 
 #. TRANS: Secondary navigation menu option leading to e-mail contact information on the
 #. TRANS: StatusNet site, where to report bugs, ...
-#: lib/action.php:905
+#: lib/action.php:889
 msgid "Contact"
 msgstr "Ota yhteyttä"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:908
+#: lib/action.php:892
 #, fuzzy
 msgid "Badge"
 msgstr "Tönäise"
 
-#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:937
-msgid "StatusNet software license"
-msgstr "StatusNet-ohjelmiston lisenssi"
-
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:944
+#: lib/action.php:921
 #, fuzzy, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7365,7 +7403,7 @@ msgstr ""
 "site.broughtbyurl%%). "
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:947
+#: lib/action.php:924
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** on mikroblogipalvelu."
@@ -7374,7 +7412,7 @@ msgstr "**%%site.name%%** on mikroblogipalvelu."
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:954
+#: lib/action.php:931
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7385,52 +7423,41 @@ msgstr ""
 "versio %s, saatavilla lisenssillä [GNU Affero General Public License](http://"
 "www.fsf.org/licensing/licenses/agpl-3.0.html)."
 
-#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:970
-#, fuzzy
-msgid "Site content license"
-msgstr "StatusNet-ohjelmiston lisenssi"
-
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:977
+#: lib/action.php:949
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:984
+#: lib/action.php:956
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:988
+#: lib/action.php:960
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:1020
+#: lib/action.php:992
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
 
-#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1356
-msgid "Pagination"
-msgstr "Sivutus"
-
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1367
+#: lib/action.php:1335
 msgid "After"
 msgstr "Myöhemmin"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1377
+#: lib/action.php:1345
 msgid "Before"
 msgstr "Aiemmin"
 
@@ -7594,7 +7621,7 @@ msgid "User configuration"
 msgstr "SMS vahvistus"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:122
+#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:110
 msgid "User"
 msgstr "Käyttäjä"
 
@@ -7622,6 +7649,11 @@ msgstr "SMS vahvistus"
 msgid "Edit site notice"
 msgstr "Palvelun ilmoitus"
 
+#. TRANS: Menu item for site administration
+#: lib/adminpanelaction.php:387
+msgid "Site notice"
+msgstr "Palvelun ilmoitus"
+
 #. TRANS: Menu item title/tooltip
 #: lib/adminpanelaction.php:393
 #, fuzzy
@@ -7633,6 +7665,12 @@ msgstr "SMS vahvistus"
 msgid "Set site license"
 msgstr ""
 
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:409
+#, fuzzy
+msgid "Plugins configuration"
+msgstr "SMS vahvistus"
+
 #. TRANS: Client error 401.
 #: lib/apiauth.php:111
 msgid "API resource requires read-write access, but you only have read access."
@@ -7643,19 +7681,23 @@ msgstr ""
 msgid "No application for that consumer key."
 msgstr ""
 
+#: lib/apiauth.php:202 lib/apiauth.php:284
+msgid "Not allowed to use API."
+msgstr ""
+
 #. TRANS: OAuth exception given when an incorrect access token was given for a user.
-#: lib/apiauth.php:219
+#: lib/apiauth.php:225
 msgid "Bad access token."
 msgstr ""
 
 #. TRANS: OAuth exception given when no user was found for a given token (no token was found).
-#: lib/apiauth.php:224
+#: lib/apiauth.php:230
 msgid "No user for that token."
 msgstr ""
 
 #. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel".
 #. TRANS: Client error thrown when authentication fails.
-#: lib/apiauth.php:266 lib/apiauth.php:293
+#: lib/apiauth.php:272 lib/apiauth.php:302
 msgid "Could not authenticate you."
 msgstr ""
 
@@ -7703,6 +7745,11 @@ msgstr ""
 msgid "Failed to delete revoked token."
 msgstr ""
 
+#. TRANS: Form input field label for application icon.
+#: lib/applicationeditform.php:177
+msgid "Icon"
+msgstr ""
+
 #. TRANS: Form guide.
 #: lib/applicationeditform.php:182
 msgid "Icon for this application"
@@ -7739,6 +7786,12 @@ msgstr "Lähdekoodi"
 msgid "Organization responsible for this application"
 msgstr ""
 
+#. TRANS: Form input field label.
+#: lib/applicationeditform.php:227
+#, fuzzy
+msgid "Organization"
+msgstr "Sivutus"
+
 #. TRANS: Form input field instructions.
 #: lib/applicationeditform.php:234
 #, fuzzy
@@ -7829,17 +7882,6 @@ msgstr ""
 msgid "Do not use this method!"
 msgstr "Älä poista tätä päivitystä"
 
-#. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:293
-#, fuzzy
-msgid "Author"
-msgstr "Atom"
-
-#. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:307
-msgid "Provider"
-msgstr "Esikatselu"
-
 #. TRANS: Title.
 #: lib/attachmentnoticesection.php:67
 msgid "Notices where this attachment appears"
@@ -7868,24 +7910,29 @@ msgstr "Salasanan vaihto"
 msgid "Block"
 msgstr "Estä"
 
+#. TRANS: Description of the form to block a user.
+#: lib/blockform.php:79
+msgid "Block this user"
+msgstr "Estä tämä käyttäjä"
+
 #. TRANS: Title for command results.
-#: lib/channel.php:160 lib/channel.php:181
+#: lib/channel.php:104 lib/channel.php:125
 msgid "Command results"
 msgstr "Komennon tulos"
 
 #. TRANS: Title for command results.
-#: lib/channel.php:194
+#: lib/channel.php:138
 #, fuzzy
 msgid "AJAX error"
 msgstr "Ajax-virhe"
 
 #. TRANS: E-mail subject when a command has completed.
-#: lib/channel.php:233 lib/mailhandler.php:143
+#: lib/channel.php:177 lib/mailhandler.php:143
 msgid "Command complete"
 msgstr "Komento suoritettu"
 
 #. TRANS: E-mail subject when a command has failed.
-#: lib/channel.php:244
+#: lib/channel.php:188
 msgid "Command failed"
 msgstr "Komento epäonnistui"
 
@@ -7987,7 +8034,7 @@ msgstr "Koko nimi: %s"
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a location.
-#: lib/command.php:446 lib/mail.php:270
+#: lib/command.php:446 lib/mail.php:275
 #, php-format
 msgid "Location: %s"
 msgstr "Kotipaikka: %s"
@@ -7995,7 +8042,7 @@ msgstr "Kotipaikka: %s"
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a homepage.
-#: lib/command.php:450 lib/mail.php:274
+#: lib/command.php:450 lib/mail.php:279
 #, php-format
 msgid "Homepage: %s"
 msgstr "Kotisivu: %s"
@@ -8234,116 +8281,108 @@ msgid ""
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:162
+#: lib/common.php:36
 #, fuzzy
 msgid "No configuration file found."
 msgstr "Varmistuskoodia ei ole annettu."
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:165
+#: lib/common.php:39
 #, fuzzy
 msgid "I looked for configuration files in the following places:"
 msgstr "Kutsu(t) lähetettiin seuraaville henkilöille:"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:168
+#: lib/common.php:42
 msgid "You may wish to run the installer to fix this."
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:172
+#: lib/common.php:46
 #, fuzzy
 msgid "Go to the installer."
 msgstr "Kirjaudu sisään palveluun"
 
-#. TRANS: Menu item for Instant Messaging settings.
-#: lib/connectsettingsaction.php:106
-#, fuzzy
-msgctxt "MENU"
-msgid "IM"
-msgstr "Pikaviestin"
-
-#. TRANS: Tooltip for Instant Messaging menu item.
-#: lib/connectsettingsaction.php:108
-msgid "Updates by instant messenger (IM)"
-msgstr "Päivitykset pikaviestintä käyttäen (IM)"
-
-#. TRANS: Menu item for Short Message Service settings.
-#: lib/connectsettingsaction.php:113
-#, fuzzy
-msgctxt "MENU"
-msgid "SMS"
-msgstr "SMS"
-
-#. TRANS: Tooltip for Short Message Service menu item.
-#: lib/connectsettingsaction.php:115
-msgid "Updates by SMS"
-msgstr "Päivitykset SMS:llä"
-
-#. TRANS: Menu item for OuAth connection settings.
-#: lib/connectsettingsaction.php:120
-#, fuzzy
-msgctxt "MENU"
-msgid "Connections"
-msgstr "Yhdistä"
-
-#. TRANS: Tooltip for connected applications (Connections through OAuth) menu item.
-#: lib/connectsettingsaction.php:122
-msgid "Authorized connected applications"
-msgstr ""
-
 #: lib/dberroraction.php:59
 msgid "Database error"
 msgstr "Tietokantavirhe"
 
+#. TRANS: Description of form for deleting a user.
+#: lib/deleteuserform.php:75
+msgid "Delete this user"
+msgstr "Poista käyttäjä"
+
+#: lib/designform.php:114
+#, fuzzy
+msgid "Change design"
+msgstr "Ryhmän ulkoasu"
+
+#. TRANS: Fieldset legend on profile design page to change profile page colours.
+#: lib/designform.php:131
+msgid "Change colours"
+msgstr "Vaihda väriä"
+
+#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
+#: lib/designform.php:138
+msgid "Use defaults"
+msgstr "Käytä oletusasetuksia"
+
+#. TRANS: Title for button on profile design page to reset all colour settings to default.
+#: lib/designform.php:140
+#, fuzzy
+msgid "Restore default designs"
+msgstr "Käytä oletusasetuksia"
+
+#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
+#: lib/designform.php:148
+#, fuzzy
+msgid "Reset back to default"
+msgstr "Käytä oletusasetuksia"
+
 #. TRANS: Label in form on profile design page.
 #. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
-#: lib/designsettings.php:108
+#: lib/designform.php:158
 #, fuzzy
 msgid "Upload file"
 msgstr "Lataa"
 
 #. TRANS: Instructions for form on profile design page.
-#: lib/designsettings.php:113
+#: lib/designform.php:163
 #, fuzzy
 msgid ""
-"You can upload your personal background image. The maximum file size is 2MB."
+"You can upload your personal background image. The maximum file size is 2Mb."
 msgstr "Voit ladata oman profiilikuvasi. Maksimikoko on %s."
 
 #. TRANS: Radio button on profile design page that will enable use of the uploaded profile image.
-#: lib/designsettings.php:139
+#: lib/designform.php:194
 #, fuzzy
 msgctxt "RADIO"
 msgid "On"
 msgstr "On"
 
 #. TRANS: Radio button on profile design page that will disable use of the uploaded profile image.
-#: lib/designsettings.php:156
+#: lib/designform.php:211
 #, fuzzy
 msgctxt "RADIO"
 msgid "Off"
 msgstr "Off"
 
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: lib/designsettings.php:175
-msgid "Change colours"
-msgstr "Vaihda väriä"
-
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: lib/designsettings.php:257
-msgid "Use defaults"
-msgstr "Käytä oletusasetuksia"
+#. TRANS: Title for button on profile design page to save settings.
+#: lib/designform.php:322
+#, fuzzy
+msgid "Save design"
+msgstr "Ryhmän ulkoasu"
 
 #. TRANS: Error message displayed if design settings could not be saved.
 #. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
-#: lib/designsettings.php:405 lib/designsettings.php:427
+#: lib/designsettings.php:216 lib/designsettings.php:238
 msgid "Couldn't update your design."
 msgstr "Ei voitu päivittää sinun sivusi ulkoasua."
 
 #. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
-#: lib/designsettings.php:433
+#: lib/designsettings.php:244
 #, fuzzy
 msgid "Design defaults restored."
 msgstr "Ulkoasuasetukset tallennettu."
@@ -8414,28 +8453,24 @@ msgstr ""
 msgid "Feeds"
 msgstr ""
 
-#: lib/galleryaction.php:121
-msgid "Filter tags"
-msgstr "Suodata tagien perusteella"
-
-#: lib/galleryaction.php:131
+#: lib/galleryaction.php:128
 msgid "All"
 msgstr "Kaikki"
 
-#: lib/galleryaction.php:139
+#: lib/galleryaction.php:136
 #, fuzzy
 msgid "Select tag to filter"
 msgstr "Valitse operaattori"
 
-#: lib/galleryaction.php:140
+#: lib/galleryaction.php:137
 msgid "Tag"
 msgstr "Tagi"
 
-#: lib/galleryaction.php:141
+#: lib/galleryaction.php:138
 msgid "Choose a tag to narrow list"
 msgstr "Valitse tagi lyhentääksesi listaa"
 
-#: lib/galleryaction.php:143
+#: lib/galleryaction.php:140
 msgid "Go"
 msgstr "Mene"
 
@@ -8528,6 +8563,13 @@ msgctxt "TOOLTIP"
 msgid "%s blocked users"
 msgstr ""
 
+#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
+#: lib/groupnav.php:117
+#, fuzzy
+msgctxt "MENU"
+msgid "Admin"
+msgstr "Ylläpito"
+
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
 #: lib/groupnav.php:120
@@ -8637,39 +8679,63 @@ msgid_plural "%dB"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/jabber.php:387
+#: lib/implugin.php:262
 #, php-format
-msgid "[%s]"
+msgid ""
+"User \"%s\" on %s has said that your %s screenname belongs to them. If "
+"that's true, you can confirm by clicking on this URL: %s . (If you cannot "
+"click it, copy-and-paste it into the address bar of your browser). If that "
+"user isn't you, or if you didn't request this confirmation, just ignore this "
+"message."
 msgstr ""
 
-#: lib/jabber.php:567
+#: lib/implugin.php:349
 #, php-format
 msgid "Unknown inbox source %d."
 msgstr ""
 
+#: lib/implugin.php:485
+#, fuzzy, php-format
+msgid "Message too long - maximum is %1$d characters, you sent %2$d."
+msgstr "Viesti oli liian pitkä - maksimikoko on 140 merkkiä, lähetit %d"
+
 #: lib/leaveform.php:114
 msgid "Leave"
 msgstr "Eroa"
 
+#. TRANS: Menu item for logging in to the StatusNet site.
+#: lib/logingroupnav.php:77
+#, fuzzy
+msgctxt "MENU"
+msgid "Login"
+msgstr "Kirjaudu sisään"
+
 #. TRANS: Title for menu item for logging in to the StatusNet site.
 #: lib/logingroupnav.php:79
 msgid "Login with a username and password"
 msgstr "Kirjaudu sisään käyttäjätunnuksella ja salasanalla"
 
+#. TRANS: Menu item for registering with the StatusNet site.
+#: lib/logingroupnav.php:85
+#, fuzzy
+msgctxt "MENU"
+msgid "Register"
+msgstr "Rekisteröidy"
+
 #. TRANS: Title for menu item for registering with the StatusNet site.
 #: lib/logingroupnav.php:87
 msgid "Sign up for a new account"
 msgstr "Luo uusi käyttäjätili"
 
 #. TRANS: Subject for address confirmation email.
-#: lib/mail.php:168
+#: lib/mail.php:172
 msgid "Email address confirmation"
 msgstr "Sähköpostiosoitteen vahvistus"
 
 #. TRANS: Body for address confirmation email.
 #. TRANS: %1$s is the addressed user's nickname, %2$s is the StatusNet sitename,
 #. TRANS: %3$s is the URL to confirm at.
-#: lib/mail.php:173
+#: lib/mail.php:177
 #, php-format
 msgid ""
 "Hey, %1$s.\n"
@@ -8688,14 +8754,14 @@ msgstr ""
 
 #. TRANS: Subject of new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
-#: lib/mail.php:238
+#: lib/mail.php:243
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1$s seuraa nyt päivityksiäsi palvelussa %2$s."
 
 #. TRANS: This is a paragraph in a new-subscriber e-mail.
 #. TRANS: %s is a URL where the subscriber can be reported as abusive.
-#: lib/mail.php:245
+#: lib/mail.php:250
 #, php-format
 msgid ""
 "If you believe this account is being used abusively, you can block them from "
@@ -8707,7 +8773,7 @@ msgstr ""
 #. TRANS: %3$s is the subscriber's profile URL, %4$s is the subscriber's location (or empty)
 #. TRANS: %5$s is the subscriber's homepage URL (or empty), %6%s is the subscriber's bio (or empty)
 #. TRANS: %7$s is a link to the addressed user's e-mail settings.
-#: lib/mail.php:255
+#: lib/mail.php:260
 #, fuzzy, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -8734,14 +8800,14 @@ msgstr ""
 
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is biographical information.
-#: lib/mail.php:278
+#: lib/mail.php:283
 #, php-format
 msgid "Bio: %s"
 msgstr "Kotipaikka: %s"
 
 #. TRANS: Subject of notification mail for new posting email address.
 #. TRANS: %s is the StatusNet sitename.
-#: lib/mail.php:307
+#: lib/mail.php:312
 #, php-format
 msgid "New email address for posting to %s"
 msgstr "Uusi sähköpostiosoite päivityksien lähettämiseen palveluun %s"
@@ -8749,7 +8815,7 @@ msgstr "Uusi sähköpostiosoite päivityksien lähettämiseen palveluun %s"
 #. TRANS: Body of notification mail for new posting email address.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is the e-mail address to send
 #. TRANS: to to post by e-mail, %3$s is a URL to more instructions.
-#: lib/mail.php:313
+#: lib/mail.php:318
 #, fuzzy, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -8772,26 +8838,26 @@ msgstr ""
 
 #. TRANS: Subject line for SMS-by-email notification messages.
 #. TRANS: %s is the posting user's nickname.
-#: lib/mail.php:434
+#: lib/mail.php:439
 #, php-format
 msgid "%s status"
 msgstr "%s päivitys"
 
 #. TRANS: Subject line for SMS-by-email address confirmation message.
-#: lib/mail.php:460
+#: lib/mail.php:465
 msgid "SMS confirmation"
 msgstr "SMS-vahvistus"
 
 #. TRANS: Main body heading for SMS-by-email address confirmation message.
 #. TRANS: %s is the addressed user's nickname.
-#: lib/mail.php:464
+#: lib/mail.php:469
 #, fuzzy, php-format
 msgid "%s: confirm you own this phone number with this code:"
 msgstr "Odotetaan vahvistusta tälle puhelinnumerolle."
 
 #. TRANS: Subject for 'nudge' notification email.
 #. TRANS: %s is the nudging user.
-#: lib/mail.php:485
+#: lib/mail.php:490
 #, fuzzy, php-format
 msgid "You have been nudged by %s"
 msgstr "%s tönäisi sinua"
@@ -8799,7 +8865,7 @@ msgstr "%s tönäisi sinua"
 #. TRANS: Body for 'nudge' notification email.
 #. TRANS: %1$s is the nuding user's long name, $2$s is the nudging user's nickname,
 #. TRANS: %3$s is a URL to post notices at, %4$s is the StatusNet sitename.
-#: lib/mail.php:492
+#: lib/mail.php:497
 #, php-format
 msgid ""
 "%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -8817,7 +8883,7 @@ msgstr ""
 
 #. TRANS: Subject for direct-message notification email.
 #. TRANS: %s is the sending user's nickname.
-#: lib/mail.php:539
+#: lib/mail.php:544
 #, php-format
 msgid "New private message from %s"
 msgstr "Uusi yksityisviesti käyttäjältä %s"
@@ -8826,7 +8892,7 @@ msgstr "Uusi yksityisviesti käyttäjältä %s"
 #. TRANS: %1$s is the sending user's long name, %2$s is the sending user's nickname,
 #. TRANS: %3$s is the message content, %4$s a URL to the message,
 #. TRANS: %5$s is the StatusNet sitename.
-#: lib/mail.php:547
+#: lib/mail.php:552
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -8847,7 +8913,7 @@ msgstr ""
 
 #. TRANS: Subject for favorite notification e-mail.
 #. TRANS: %1$s is the adding user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:599
+#: lib/mail.php:604
 #, fuzzy, php-format
 msgid "%1$s (@%2$s) added your notice as a favorite"
 msgstr "Lähetä sähköpostia, jos joku lisää päivitykseni suosikiksi."
@@ -8857,7 +8923,7 @@ msgstr "Lähetä sähköpostia, jos joku lisää päivitykseni suosikiksi."
 #. TRANS: %3$s is a URL to the faved notice, %4$s is the faved notice text,
 #. TRANS: %5$s is a URL to all faves of the adding user, %6$s is the StatusNet sitename,
 #. TRANS: %7$s is the adding user's nickname.
-#: lib/mail.php:606
+#: lib/mail.php:611
 #, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -8879,7 +8945,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:664
+#: lib/mail.php:669
 #, php-format
 msgid ""
 "The full conversation can be read here:\n"
@@ -8889,7 +8955,7 @@ msgstr ""
 
 #. TRANS: E-mail subject for notice notification.
 #. TRANS: %1$s is the sending user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:672
+#: lib/mail.php:677
 #, php-format
 msgid "%1$s (@%2$s) sent a notice to your attention"
 msgstr ""
@@ -8900,7 +8966,7 @@ msgstr ""
 #. TRANS: %5$s is a URL to the full conversion if it exists (otherwise empty),
 #. TRANS: %6$s is a URL to reply to the notice, %7$s is a URL to all @-replied for the addressed user,
 #. TRANS: %8$s is a URL to the addressed user's e-mail settings, %9$s is the sender's nickname.
-#: lib/mail.php:680
+#: lib/mail.php:685
 #, php-format
 msgid ""
 "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -9017,11 +9083,7 @@ msgstr "Ei ole tilattu!."
 msgid "To"
 msgstr "Vastaanottaja"
 
-#: lib/messageform.php:166 lib/noticeform.php:186
-msgid "Available characters"
-msgstr "Sallitut merkit"
-
-#: lib/messageform.php:185 lib/noticeform.php:237
+#: lib/messageform.php:184 lib/noticeform.php:236
 msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr "Lähetä"
@@ -9031,18 +9093,11 @@ msgstr "Lähetä"
 msgid "Messages"
 msgstr "Viesti"
 
-#: lib/messagelistitem.php:123 lib/noticelist.php:522
+#: lib/messagelistitem.php:123 lib/noticelist.php:527
 #, fuzzy
 msgid "from"
 msgstr " lähteestä "
 
-#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:165
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr ""
-"Käyttäjätunnuksessa voi olla ainoastaan pieniä kirjaimia ja numeroita ilman "
-"välilyöntiä."
-
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 #: lib/nickname.php:178
 msgid "Nickname cannot be empty."
@@ -9065,83 +9120,87 @@ msgstr "Lähetä päivitys"
 msgid "What's up, %s?"
 msgstr "Mitä teet juuri nyt, %s?"
 
-#: lib/noticeform.php:194
+#: lib/noticeform.php:193
 msgid "Attach"
 msgstr ""
 
-#: lib/noticeform.php:198
+#: lib/noticeform.php:197
 msgid "Attach a file"
 msgstr ""
 
-#: lib/noticeform.php:213
+#: lib/noticeform.php:212
 #, fuzzy
 msgid "Share my location"
 msgstr "Tageja ei voitu tallentaa."
 
-#: lib/noticeform.php:216
+#: lib/noticeform.php:215
 #, fuzzy
 msgid "Do not share my location"
 msgstr "Tageja ei voitu tallentaa."
 
-#: lib/noticeform.php:217
+#: lib/noticeform.php:216
 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
 "try again later"
 msgstr ""
 
 #. TRANS: Used in coordinates as abbreviation of north
-#: lib/noticelist.php:452
+#: lib/noticelist.php:457
 #, fuzzy
 msgid "N"
 msgstr "Ei"
 
 #. TRANS: Used in coordinates as abbreviation of south
-#: lib/noticelist.php:454
+#: lib/noticelist.php:459
 msgid "S"
 msgstr ""
 
 #. TRANS: Used in coordinates as abbreviation of east
-#: lib/noticelist.php:456
+#: lib/noticelist.php:461
 msgid "E"
 msgstr ""
 
 #. TRANS: Used in coordinates as abbreviation of west
-#: lib/noticelist.php:458
+#: lib/noticelist.php:463
 msgid "W"
 msgstr ""
 
-#: lib/noticelist.php:460
+#: lib/noticelist.php:465
 #, php-format
 msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgstr ""
 
-#: lib/noticelist.php:469
+#: lib/noticelist.php:474
 msgid "at"
 msgstr ""
 
-#: lib/noticelist.php:518
+#: lib/noticelist.php:523
 msgid "web"
 msgstr ""
 
-#: lib/noticelist.php:584
+#: lib/noticelist.php:589
 #, fuzzy
 msgid "in context"
 msgstr "Ei sisältöä!"
 
-#: lib/noticelist.php:619
+#: lib/noticelist.php:624
 #, fuzzy
 msgid "Repeated by"
 msgstr "Luotu"
 
-#: lib/noticelist.php:646
+#: lib/noticelist.php:651
 msgid "Reply to this notice"
 msgstr "Vastaa tähän päivitykseen"
 
-#: lib/noticelist.php:647
+#: lib/noticelist.php:652
 msgid "Reply"
 msgstr "Vastaus"
 
-#: lib/noticelist.php:691
+#: lib/noticelist.php:678
+msgid "Delete this notice"
+msgstr "Poista tämä päivitys"
+
+#: lib/noticelist.php:696
 #, fuzzy
 msgid "Notice repeated"
 msgstr "Päivitys on poistettu."
@@ -9179,48 +9238,31 @@ msgstr ""
 msgid "Couldn't insert new subscription."
 msgstr "Ei voitu lisätä uutta tilausta."
 
-#. TRANS: Personal group navigation menu option when logged in for viewing @-replies.
-#: lib/personalgroupnav.php:107
+#: lib/personalgroupnav.php:104
 #, fuzzy
-msgctxt "MENU"
 msgid "Replies"
 msgstr "Vastaukset"
 
-#. TRANS: Personal group navigation menu option when logged in for seeing own profile.
-#: lib/personalgroupnav.php:114
+#: lib/personalgroupnav.php:109
 #, fuzzy
-msgctxt "MENU"
-msgid "Profile"
-msgstr "Profiili"
-
-#. TRANS: Personal group navigation menu option when logged in for viewing own favourited notices.
-#: lib/personalgroupnav.php:120
-#, fuzzy
-msgctxt "MENU"
 msgid "Favorites"
 msgstr "Suosikit"
 
-#. TRANS: Personal group navigation menu option when logged in for viewing recieved personal messages.
-#: lib/personalgroupnav.php:133
+#: lib/personalgroupnav.php:120
 #, fuzzy
-msgctxt "MENU"
 msgid "Inbox"
 msgstr "Saapuneet"
 
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing recieved personal messages.
-#: lib/personalgroupnav.php:135
+#: lib/personalgroupnav.php:121
 msgid "Your incoming messages"
 msgstr "Sinulle saapuneet viestit"
 
-#. TRANS: Personal group navigation menu option when logged in for viewing senet personal messages.
-#: lib/personalgroupnav.php:140
+#: lib/personalgroupnav.php:125
 #, fuzzy
-msgctxt "MENU"
 msgid "Outbox"
 msgstr "Lähetetyt"
 
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing senet personal messages.
-#: lib/personalgroupnav.php:142
+#: lib/personalgroupnav.php:126
 msgid "Your sent messages"
 msgstr "Lähettämäsi viestit"
 
@@ -9236,9 +9278,26 @@ msgstr "Tagit käyttäjän %s päivityksissä"
 msgid "Unknown"
 msgstr "Tuntematon toiminto"
 
+#. TRANS: Plugin admin panel controls
+#: lib/plugindisableform.php:90
+msgctxt "plugin"
+msgid "Disable"
+msgstr ""
+
+#. TRANS: Plugin admin panel controls
+#: lib/pluginenableform.php:112
+msgctxt "plugin"
+msgid "Enable"
+msgstr ""
+
+#: lib/pluginlist.php:196
+msgctxt "plugin-description"
+msgid "(Plugin descriptions unavailable when disabled.)"
+msgstr ""
+
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:82
+#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:88
 msgid "Subscriptions"
 msgstr "Tilaukset"
 
@@ -9249,7 +9308,7 @@ msgstr "Kaikki tilaukset"
 
 #. TRANS: H2 text for user subscriber statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:90
+#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:96
 msgid "Subscribers"
 msgstr "Tilaajat"
 
@@ -9272,7 +9331,7 @@ msgstr "Käyttäjänä alkaen"
 #. TRANS: Label for user statistics.
 #. TRANS: H2 text for user group membership statistics.
 #: lib/profileaction.php:239 lib/profileaction.php:290
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:104
 msgid "Groups"
 msgstr "Ryhmät"
 
@@ -9292,10 +9351,6 @@ msgstr "Kaikki ryhmät"
 msgid "Unimplemented method."
 msgstr ""
 
-#: lib/publicgroupnav.php:78
-msgid "Public"
-msgstr "Julkinen"
-
 #: lib/publicgroupnav.php:82
 msgid "User groups"
 msgstr "Käyttäjäryhmät"
@@ -9337,7 +9392,7 @@ msgid "Revoke the \"%s\" role from this user"
 msgstr "Estä tätä käyttäjää osallistumassa tähän ryhmään"
 
 #. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:974
+#: lib/router.php:1001
 #, fuzzy
 msgid "Page not found."
 msgstr "API-metodia ei löytynyt."
@@ -9370,12 +9425,6 @@ msgctxt "BUTTON"
 msgid "Search"
 msgstr ""
 
-#. TRANS: Definition list item with instructions on how to get (better) search results.
-#: lib/searchaction.php:170
-#, fuzzy
-msgid "Search help"
-msgstr "Haku"
-
 #: lib/searchgroupnav.php:80
 msgid "People"
 msgstr "Henkilö"
@@ -9400,6 +9449,52 @@ msgstr "Nimetön osa"
 msgid "More..."
 msgstr "Lisää..."
 
+#: lib/settingsnav.php:78
+msgid "Change your profile settings"
+msgstr "Vaihda profiiliasetuksesi"
+
+#: lib/settingsnav.php:83
+msgid "Upload an avatar"
+msgstr "Lataa kuva"
+
+#: lib/settingsnav.php:88
+msgid "Change your password"
+msgstr "Vaihda salasanasi"
+
+#: lib/settingsnav.php:93
+msgid "Change email handling"
+msgstr "Muuta sähköpostin käsittelyasetuksia."
+
+#: lib/settingsnav.php:98
+#, fuzzy
+msgid "Design your profile"
+msgstr "Käyttäjän profiili"
+
+#: lib/settingsnav.php:102
+msgid "URL"
+msgstr "URL"
+
+#: lib/settingsnav.php:103
+msgid "URL shorteners"
+msgstr ""
+
+#: lib/settingsnav.php:111
+msgid "Updates by instant messenger (IM)"
+msgstr "Päivitykset pikaviestintä käyttäen (IM)"
+
+#: lib/settingsnav.php:118
+msgid "Updates by SMS"
+msgstr "Päivitykset SMS:llä"
+
+#: lib/settingsnav.php:123
+#, fuzzy
+msgid "Connections"
+msgstr "Yhdistä"
+
+#: lib/settingsnav.php:124
+msgid "Authorized connected applications"
+msgstr ""
+
 #: lib/silenceform.php:67
 #, fuzzy
 msgid "Silence"
@@ -9410,30 +9505,34 @@ msgstr "Palvelun ilmoitus"
 msgid "Silence this user"
 msgstr "Estä tämä käyttäjä"
 
-#: lib/subgroupnav.php:83
+#: lib/subgroupnav.php:89
 #, php-format
 msgid "People %s subscribes to"
 msgstr "Ihmiset joiden tilaaja %s on"
 
-#: lib/subgroupnav.php:91
+#: lib/subgroupnav.php:97
 #, php-format
 msgid "People subscribed to %s"
 msgstr "Ihmiset jotka ovat käyttäjän %s tilaajia"
 
-#: lib/subgroupnav.php:99
+#: lib/subgroupnav.php:105
 #, php-format
 msgid "Groups %s is a member of"
 msgstr "Ryhmät, joiden jäsen %s on"
 
-#: lib/subgroupnav.php:105
+#: lib/subgroupnav.php:111
 msgid "Invite"
 msgstr "Kutsu"
 
-#: lib/subgroupnav.php:106
+#: lib/subgroupnav.php:112
 #, php-format
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Kutsu kavereita ja työkavereita liittymään palveluun %s"
 
+#: lib/subscribeform.php:115 lib/subscribeform.php:139
+msgid "Subscribe to this user"
+msgstr "Tilaa tämä käyttäjä"
+
 #: lib/subscriberspeopleselftagcloudsection.php:48
 #: lib/subscriptionspeopleselftagcloudsection.php:48
 msgid "People Tagcloud as self-tagged"
@@ -9504,6 +9603,13 @@ msgstr ""
 msgid "Error opening theme archive."
 msgstr "Tapahtui virhe, kun estoa poistettiin."
 
+#: lib/threadednoticelist.php:270
+#, php-format
+msgid "Show all %d comment"
+msgid_plural "Show all %d comments"
+msgstr[0] ""
+msgstr[1] ""
+
 #: lib/topposterssection.php:74
 msgid "Top posters"
 msgstr "Eniten päivityksiä"
@@ -9548,80 +9654,84 @@ msgstr "Peruuta tilaus"
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "Käyttäjällä ei ole profiilia."
 
-#. TRANS: Link text for changeing the avatar of the logged in user.
-#: lib/userprofile.php:121
+#: lib/userprofile.php:116
 #, fuzzy
 msgid "Edit Avatar"
 msgstr "Kuva"
 
 #. TRANS: H2 for user actions in a profile.
 #. TRANS: H2 for entity actions in a profile.
-#: lib/userprofile.php:245 lib/userprofile.php:261
+#: lib/userprofile.php:216 lib/userprofile.php:232
 msgid "User actions"
 msgstr "Käyttäjän toiminnot"
 
 #. TRANS: Text shown in user profile of not yet compeltely deleted users.
-#: lib/userprofile.php:249
+#: lib/userprofile.php:220
 msgid "User deletion in progress..."
 msgstr ""
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:277
+#: lib/userprofile.php:248
 #, fuzzy
 msgid "Edit profile settings"
 msgstr "Profiiliasetukset"
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:279
+#: lib/userprofile.php:250
 msgid "Edit"
 msgstr ""
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:303
+#: lib/userprofile.php:274
 msgid "Send a direct message to this user"
 msgstr "Lähetä suora viesti tälle käyttäjälle"
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:305
+#: lib/userprofile.php:276
 msgid "Message"
 msgstr "Viesti"
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:347
+#: lib/userprofile.php:318
 msgid "Moderate"
 msgstr ""
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:386
+#: lib/userprofile.php:357
 #, fuzzy
 msgid "User role"
 msgstr "Käyttäjän profiili"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:389
+#: lib/userprofile.php:360
 #, fuzzy
 msgctxt "role"
 msgid "Administrator"
 msgstr "Ylläpitäjät"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:391
+#: lib/userprofile.php:362
 msgctxt "role"
 msgid "Moderator"
 msgstr ""
 
+#: lib/util.php:321
+#, fuzzy
+msgid "Not allowed to log in."
+msgstr "Et ole kirjautunut sisään."
+
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1306
+#: lib/util.php:1337
 msgid "a few seconds ago"
 msgstr "muutama sekunti sitten"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1309
+#: lib/util.php:1340
 msgid "about a minute ago"
 msgstr "noin minuutti sitten"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1313
+#: lib/util.php:1344
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
@@ -9629,12 +9739,12 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1316
+#: lib/util.php:1347
 msgid "about an hour ago"
 msgstr "noin tunti sitten"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1320
+#: lib/util.php:1351
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
@@ -9642,12 +9752,12 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1323
+#: lib/util.php:1354
 msgid "about a day ago"
 msgstr "noin päivä sitten"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1327
+#: lib/util.php:1358
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
@@ -9655,12 +9765,12 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1330
+#: lib/util.php:1361
 msgid "about a month ago"
 msgstr "noin kuukausi sitten"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1334
+#: lib/util.php:1365
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
@@ -9668,7 +9778,7 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1337
+#: lib/util.php:1368
 msgid "about a year ago"
 msgstr "noin vuosi sitten"
 
@@ -9679,21 +9789,6 @@ msgstr "noin vuosi sitten"
 msgid "%s is not a valid color! Use 3 or 6 hex characters."
 msgstr "Kotisivun verkko-osoite ei ole toimiva."
 
-#. TRANS: %s is the URL to the StatusNet site's Instant Messaging settings.
-#: lib/xmppmanager.php:287
-#, php-format
-msgid "Unknown user. Go to %s to add your address to your account"
-msgstr ""
-
-#. TRANS: Response to XMPP source when it sent too long a message.
-#. TRANS: %1$d the maximum number of allowed characters (used for plural), %2$d is the sent number.
-#: lib/xmppmanager.php:406
-#, fuzzy, php-format
-msgid "Message too long. Maximum is %1$d character, you sent %2$d."
-msgid_plural "Message too long. Maximum is %1$d characters, you sent %2$d."
-msgstr[0] "Viesti oli liian pitkä - maksimikoko on 140 merkkiä, lähetit %d"
-msgstr[1] "Viesti oli liian pitkä - maksimikoko on 140 merkkiä, lähetit %d"
-
 #. TRANS: Exception.
 #: lib/xrd.php:63
 #, fuzzy
@@ -9711,59 +9806,168 @@ msgstr ""
 msgid "Getting backup from file '%s'."
 msgstr ""
 
-#~ msgid "Block this user."
-#~ msgstr "Estä tämä käyttäjä."
-
-#~ msgid "Delete this notice."
-#~ msgstr "Poista tämä päivitys."
-
-#~ msgid "Delete this user."
-#~ msgstr "Poista tämä käyttäjä."
-
-#~ msgid "Restore default designs."
-#~ msgstr "Palauta oletusulkonäkö."
-
-#~ msgid "Reset back to default."
-#~ msgstr "Palauta oletusulkoasu."
-
-#~ msgid "Save design."
-#~ msgstr "Tallenna ulkoasu."
-
-#~ msgid "Disfavor favorite."
-#~ msgstr "Poista suosikeista."
+#~ msgid "Could not generate feed for group - %s"
+#~ msgstr "Ryhmän %s syötettä ei voitu muodostaa."
 
 #, fuzzy
-#~ msgid "\"%s\" not found."
-#~ msgstr "API-metodia ei löytynyt."
+#~ msgid "Current confirmed Jabber/Google Talk address."
+#~ msgstr "Tämän hetken vahvistettu Jabber/GTalk -osoite."
 
 #, fuzzy
-#~ msgid "Notice %s not found."
-#~ msgstr "API-metodia ei löytynyt."
+#~ msgid ""
+#~ "Jabber or Google Talk address, like \"UserName@example.org\". First, make "
+#~ "sure to add %s to your buddy list in your IM client or on Google Talk."
+#~ msgstr ""
+#~ "Jabber ja GTalk -osoite, esimerkiksi \"käyttäjätunnus@example.org\". "
+#~ "Varmista että olet lisännyt %s kaverilistaasi pikaviestiohjelmassasi tai "
+#~ "GTalkissa."
 
 #, fuzzy
-#~ msgid "Attachment %s not found."
-#~ msgstr "Vastaanottajaa ei löytynyt."
+#~ msgid "Send me notices through Jabber/Google Talk."
+#~ msgstr "Lähetä minulle päivityksiä Jabberilla/GTalkilla."
 
 #, fuzzy
-#~ msgid "Invalid tag: \"%s\"."
-#~ msgstr "Virheellinen tagi: \"%s\""
+#~ msgid "Publish a MicroID for my Jabber/Google Talk address."
+#~ msgstr "Julkaise MicroID Jabber/GTalk-osoitteelleni."
+
+#~ msgid "No Jabber ID."
+#~ msgstr "Ei Jabber ID -osoitetta"
 
 #, fuzzy
-#~ msgid "%s updates from everyone."
-#~ msgstr "%s päivitykset kaikilta!"
+#~ msgid "Not a valid Jabber ID."
+#~ msgstr "Tuo ei ole kelvollinen Jabber ID."
+
+#~ msgid "That is already your Jabber ID."
+#~ msgstr "Tämä on jo Jabber ID -tunnuksesi."
+
+#~ msgid "That is not your Jabber ID."
+#~ msgstr "Tämä ei ole Jabber ID-tunnuksesi."
+
+#~ msgid "Other settings"
+#~ msgstr "Profiilikuva-asetukset"
+
+#~ msgid "Tag cloud"
+#~ msgstr "Tagipilvi"
+
+#~ msgid "Jabber"
+#~ msgstr "Jabber"
+
+#~ msgid "Photo"
+#~ msgstr "Kuva"
+
+#~ msgid "Other options"
+#~ msgstr "Muita asetuksia"
+
+#~ msgid "Other"
+#~ msgstr "Muut"
+
+#~ msgid "Primary site navigation"
+#~ msgstr "Ensisijainen sivunavigointi"
 
 #, fuzzy
-#~ msgid "Password saved"
-#~ msgstr "Salasana tallennettu."
+#~ msgctxt "TOOLTIP"
+#~ msgid "Personal profile and friends timeline"
+#~ msgstr "Henkilökohtainen profiili ja kavereiden aikajana"
 
 #, fuzzy
-#~ msgid "Where you are, like \"City, State (or Region), Country\"."
-#~ msgstr "Olinpaikka kuten \"Kaupunki, Maakunta (tai Lääni), Maa\""
+#~ msgctxt "MENU"
+#~ msgid "Personal"
+#~ msgstr "Omat"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Change your email, avatar, password, profile"
+#~ msgstr "Vaihda salasanasi"
+
+#~ msgid "Account"
+#~ msgstr "Käyttäjätili"
 
 #, fuzzy
-#~ msgid "Subscribe to this user."
-#~ msgstr "Tilaa tämä käyttäjä"
+#~ msgctxt "TOOLTIP"
+#~ msgid "Connect to services"
+#~ msgstr "Ei voitu uudelleenohjata palvelimelle: %s"
+
+#~ msgid "Connect"
+#~ msgstr "Yhdistä"
 
 #, fuzzy
-#~ msgid "Not allowed to log in."
-#~ msgstr "Et ole kirjautunut sisään."
+#~ msgctxt "TOOLTIP"
+#~ msgid "Change site configuration"
+#~ msgstr "Ensisijainen sivunavigointi"
+
+#, fuzzy
+#~ msgctxt "TOOLTIP"
+#~ msgid "Invite friends and colleagues to join you on %s"
+#~ msgstr "Kutsu kavereita ja työkavereita liittymään palveluun %s"
+
+#, fuzzy
+#~ msgctxt "MENU"
+#~ msgid "Invite"
+#~ msgstr "Kutsu"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Create an account"
+#~ msgstr "Luo uusi ryhmä"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Help me!"
+#~ msgstr "Ohjeet"
+
+#~ msgctxt "MENU"
+#~ msgid "Help"
+#~ msgstr "Ohje"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Search for people or text"
+#~ msgstr "Hae lisää ryhmiä"
+
+#~ msgid "Local views"
+#~ msgstr "Paikalliset näkymät"
+
+#~ msgid "Page notice"
+#~ msgstr "Sivuilmoitus"
+
+#~ msgid "Secondary site navigation"
+#~ msgstr "Toissijainen sivunavigointi"
+
+#~ msgid "StatusNet software license"
+#~ msgstr "StatusNet-ohjelmiston lisenssi"
+
+#, fuzzy
+#~ msgid "Site content license"
+#~ msgstr "StatusNet-ohjelmiston lisenssi"
+
+#~ msgid "Pagination"
+#~ msgstr "Sivutus"
+
+#, fuzzy
+#~ msgid "Author"
+#~ msgstr "Atom"
+
+#~ msgid "Provider"
+#~ msgstr "Esikatselu"
+
+#, fuzzy
+#~ msgctxt "MENU"
+#~ msgid "SMS"
+#~ msgstr "SMS"
+
+#~ msgid "Filter tags"
+#~ msgstr "Suodata tagien perusteella"
+
+#~ msgid "Available characters"
+#~ msgstr "Sallitut merkit"
+
+#, fuzzy
+#~ msgctxt "MENU"
+#~ msgid "Profile"
+#~ msgstr "Profiili"
+
+#, fuzzy
+#~ msgid "Search help"
+#~ msgstr "Haku"
+
+#, fuzzy
+#~ msgid "Message too long. Maximum is %1$d character, you sent %2$d."
+#~ msgid_plural "Message too long. Maximum is %1$d characters, you sent %2$d."
+#~ msgstr[0] "Viesti oli liian pitkä - maksimikoko on 140 merkkiä, lähetit %d"
+#~ msgstr[1] "Viesti oli liian pitkä - maksimikoko on 140 merkkiä, lähetit %d"
diff --git a/locale/fr/LC_MESSAGES/statusnet.po b/locale/fr/LC_MESSAGES/statusnet.po
index 63f48c3914..ee3668c591 100644
--- a/locale/fr/LC_MESSAGES/statusnet.po
+++ b/locale/fr/LC_MESSAGES/statusnet.po
@@ -21,8 +21,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 15:58+0000\n"
-"PO-Revision-Date: 2011-03-03 16:00:29+0000\n"
+"POT-Creation-Date: 2011-03-03 17:23+0000\n"
+"PO-Revision-Date: 2011-03-03 17:25:59+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -88,23 +88,23 @@ msgstr "Sauvegarder les paramètres d’accès"
 #. TRANS: Tooltip for button to save access settings in site admin panel.
 #. TRANS: Button text for saving theme settings.
 #. TRANS: Button label to save e-mail preferences.
-#. TRANS: Button label to save Instant Messaging preferences.
-#. TRANS: Button text for saving "Other settings" in profile.
+#. TRANS: Button label to save IM preferences.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
 #. TRANS: Button text for saving site notice in admin panel.
 #. TRANS: Button label to save SMS preferences.
 #. TRANS: Save button for settings for a profile in a subscriptions list.
+#. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
 #. TRANS: Button text on profile design page to save settings.
 #: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
-#: actions/emailsettings.php:250 actions/imsettings.php:183
-#: actions/othersettings.php:136 actions/pathsadminpanel.php:512
-#: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
-#: actions/smssettings.php:205 actions/subscriptions.php:259
+#: actions/emailsettings.php:251 actions/imsettings.php:199
+#: actions/pathsadminpanel.php:512 actions/profilesettings.php:198
+#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:204
+#: actions/subscriptions.php:261 actions/urlsettings.php:152
 #: actions/useradminpanel.php:298 lib/applicationeditform.php:355
-#: lib/designsettings.php:270 lib/groupeditform.php:201
+#: lib/designform.php:320 lib/groupeditform.php:201
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Enregistrer"
@@ -143,7 +143,11 @@ msgstr "Page non trouvée."
 #. 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 use "one time password login" without using an existing user.
+#. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
+#. TRANS: Client error displayed trying to find a user by ID for a non-existing ID.
+#. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when calling a profile action without specifying a user.
 #: actions/all.php:80 actions/allrss.php:69
@@ -155,19 +159,19 @@ msgstr "Page non trouvée."
 #: actions/apidirectmessage.php:75 actions/apidirectmessagenew.php:72
 #: actions/apigroupcreate.php:111 actions/apigroupismember.php:89
 #: actions/apigroupjoin.php:98 actions/apigroupleave.php:98
-#: actions/apigrouplist.php:70 actions/apistatusesupdate.php:230
-#: actions/apisubscriptions.php:85 actions/apitimelinefavorites.php:70
-#: actions/apitimelinefriends.php:173 actions/apitimelinehome.php:78
-#: actions/apitimelinementions.php:77 actions/apitimelineuser.php:79
-#: actions/avatarbynickname.php:79 actions/favoritesrss.php:72
-#: actions/foaf.php:42 actions/foaf.php:61 actions/hcard.php:67
-#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
-#: actions/remotesubscribe.php:144 actions/remotesubscribe.php:153
-#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
-#: actions/showfavorites.php:106 actions/userbyid.php:74
-#: actions/usergroups.php:93 actions/userrss.php:40 actions/userxrd.php:59
-#: actions/xrds.php:71 lib/command.php:509 lib/galleryaction.php:59
-#: lib/mailbox.php:80 lib/profileaction.php:77
+#: actions/apigrouplist.php:70 actions/apigroupprofileupdate.php:108
+#: actions/apistatusesupdate.php:230 actions/apisubscriptions.php:85
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:173
+#: actions/apitimelinehome.php:78 actions/apitimelinementions.php:77
+#: actions/apitimelineuser.php:79 actions/avatarbynickname.php:79
+#: actions/favoritesrss.php:72 actions/foaf.php:42 actions/foaf.php:61
+#: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116
+#: actions/otp.php:78 actions/remotesubscribe.php:144
+#: actions/remotesubscribe.php:153 actions/replies.php:73
+#: actions/repliesrss.php:38 actions/rsd.php:113 actions/showfavorites.php:106
+#: actions/userbyid.php:75 actions/usergroups.php:93 actions/userrss.php:40
+#: actions/userxrd.php:59 actions/xrds.php:71 lib/command.php:509
+#: lib/galleryaction.php:59 lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Utilisateur non trouvé."
 
@@ -181,10 +185,9 @@ msgstr "%1$s et ses amis, page %2$d"
 #. TRANS: H1 text for page. %s is a user nickname.
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Timeline title for user and friends. %s is a user nickname.
-#. TRANS: Tooltop for personal group navigation menu option when logged in for viewing timeline of self and friends.
 #: actions/all.php:94 actions/all.php:191 actions/allrss.php:117
 #: actions/apitimelinefriends.php:207 actions/apitimelinehome.php:113
-#: lib/personalgroupnav.php:102
+#: lib/personalgroupnav.php:100
 #, php-format
 msgid "%s and friends"
 msgstr "%s et ses amis"
@@ -243,7 +246,7 @@ msgstr ""
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
 #. TRANS: Second sentence of empty message for anonymous users. %s is a user nickname.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:227
+#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:221
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -292,19 +295,20 @@ msgstr "Statuts de %1$s et ses amis dans %2$s!"
 #: actions/apifavoritecreate.php:98 actions/apifavoritedestroy.php:98
 #: actions/apifriendshipscreate.php:99 actions/apifriendshipsdestroy.php:99
 #: actions/apifriendshipsshow.php:124 actions/apigroupcreate.php:138
-#: actions/apigroupismember.php:115 actions/apigroupjoin.php:160
-#: actions/apigroupleave.php:145 actions/apigrouplist.php:134
+#: actions/apigroupismember.php:115 actions/apigroupjoin.php:151
+#: actions/apigroupleave.php:141 actions/apigrouplist.php:134
 #: actions/apigrouplistall.php:120 actions/apigroupmembership.php:105
+#: actions/apigroupprofileupdate.php:100 actions/apigroupprofileupdate.php:213
 #: actions/apigroupshow.php:114 actions/apihelptest.php:84
 #: actions/apistatusesdestroy.php:101 actions/apistatusesretweets.php:110
 #: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:139
 #: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
-#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:268
-#: actions/apitimelinegroup.php:147 actions/apitimelinehome.php:173
-#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:239
-#: actions/apitimelineretweetedtome.php:118
-#: actions/apitimelineretweetsofme.php:150 actions/apitimelinetag.php:159
-#: actions/apitimelineuser.php:206 actions/apiusershow.php:100
+#: actions/apitimelinefavorites.php:182 actions/apitimelinefriends.php:276
+#: actions/apitimelinegroup.php:148 actions/apitimelinehome.php:181
+#: actions/apitimelinementions.php:182 actions/apitimelinepublic.php:247
+#: actions/apitimelineretweetedtome.php:147
+#: actions/apitimelineretweetsofme.php:147 actions/apitimelinetag.php:165
+#: actions/apitimelineuser.php:217 actions/apiusershow.php:100
 msgid "API method not found."
 msgstr "Méthode API non trouvée !"
 
@@ -319,8 +323,9 @@ msgstr "Méthode API non trouvée !"
 #: actions/apifavoritecreate.php:88 actions/apifavoritedestroy.php:88
 #: actions/apifriendshipscreate.php:89 actions/apifriendshipsdestroy.php:89
 #: actions/apigroupcreate.php:102 actions/apigroupjoin.php:89
-#: actions/apigroupleave.php:89 actions/apimediaupload.php:66
-#: actions/apistatusesretweet.php:63 actions/apistatusesupdate.php:194
+#: actions/apigroupleave.php:89 actions/apigroupprofileupdate.php:92
+#: actions/apimediaupload.php:66 actions/apistatusesretweet.php:63
+#: actions/apistatusesupdate.php:194
 msgid "This method requires a POST."
 msgstr "Ce processus requiert un POST."
 
@@ -334,21 +339,16 @@ msgstr ""
 "sms, im, none."
 
 #. TRANS: Server error displayed when a user's delivery device cannot be updated.
-#. TRANS: Server error displayed when a user update to the database fails in the contact address confirmation action.
 #. TRANS: Server error thrown on database error updating e-mail preferences.
 #. TRANS: Server error thrown on database error removing a registered e-mail address.
-#. TRANS: Server error thrown on database error updating Instant Messaging preferences.
-#. TRANS: Server error thrown on database error removing a registered Instant Messaging address.
-#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
 #. TRANS: Server error thrown when user profile settings could not be updated.
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
-#: actions/apiaccountupdatedeliverydevice.php:130
-#: actions/confirmaddress.php:118 actions/emailsettings.php:352
-#: actions/emailsettings.php:498 actions/imsettings.php:276
-#: actions/imsettings.php:432 actions/othersettings.php:186
-#: actions/profilesettings.php:322 actions/smssettings.php:301
-#: actions/smssettings.php:454
+#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
+#: actions/apiaccountupdatedeliverydevice.php:136
+#: actions/emailsettings.php:353 actions/emailsettings.php:499
+#: actions/profilesettings.php:323 actions/smssettings.php:300
+#: actions/smssettings.php:453 actions/urlsettings.php:211
 msgid "Could not update user."
 msgstr "Impossible de mettre à jour l’utilisateur."
 
@@ -374,7 +374,7 @@ msgstr "Aucun profil ne correspond à cet utilisateur."
 
 #. TRANS: Server error displayed if a user profile could not be saved.
 #. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:418
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:419
 msgid "Could not save profile."
 msgstr "Impossible d’enregistrer le profil."
 
@@ -386,7 +386,7 @@ msgstr "Impossible d’enregistrer le profil."
 #: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
 #: actions/designadminpanel.php:120 actions/editapplication.php:121
 #: actions/newapplication.php:102 actions/newnotice.php:95
-#: lib/designsettings.php:298
+#: lib/designsettings.php:110
 #, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s byte) due to its "
@@ -411,8 +411,8 @@ msgstr[1] ""
 #: actions/apiaccountupdateprofilecolors.php:160
 #: actions/apiaccountupdateprofilecolors.php:171
 #: actions/groupdesignsettings.php:285 actions/groupdesignsettings.php:296
-#: actions/userdesignsettings.php:201 actions/userdesignsettings.php:211
-#: actions/userdesignsettings.php:253 actions/userdesignsettings.php:263
+#: actions/userdesignsettings.php:218 actions/userdesignsettings.php:228
+#: actions/userdesignsettings.php:270 actions/userdesignsettings.php:280
 msgid "Unable to save your design settings."
 msgstr "Impossible de sauvegarder les parmètres de la conception."
 
@@ -420,7 +420,7 @@ msgstr "Impossible de sauvegarder les parmètres de la conception."
 #. TRANS: Client error displayed when a database error occurs updating profile colours.
 #: actions/apiaccountupdateprofilebackgroundimage.php:191
 #: actions/apiaccountupdateprofilecolors.php:139
-#: actions/userdesignsettings.php:179
+#: actions/userdesignsettings.php:196
 msgid "Could not update your design."
 msgstr "Impossible de mettre à jour votre conception."
 
@@ -529,7 +529,7 @@ msgstr "Destinataire non trouvé."
 #. TRANS: Client error displayed trying to direct message another user who's not a friend (403).
 #: actions/apidirectmessagenew.php:144
 #, fuzzy
-msgid "Can't send direct messages to users who aren't your friend."
+msgid "Cannot send direct messages to users who aren't your friend."
 msgstr ""
 "Vous ne pouvez envoyer des messages personnels qu’aux utilisateurs inscrits "
 "comme amis."
@@ -614,9 +614,9 @@ msgstr "Impossible de trouver l’utilisateur cible."
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:156 actions/editgroup.php:191
-#: actions/newgroup.php:137 actions/profilesettings.php:273
-#: actions/register.php:214
+#: actions/apigroupcreate.php:156 actions/apigroupprofileupdate.php:255
+#: actions/editgroup.php:191 actions/newgroup.php:137
+#: actions/profilesettings.php:274 actions/register.php:199
 msgid "Nickname already in use. Try another one."
 msgstr "Pseudo déjà utilisé. Essayez-en un autre."
 
@@ -624,9 +624,9 @@ msgstr "Pseudo déjà utilisé. Essayez-en un autre."
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:164 actions/editgroup.php:195
-#: actions/newgroup.php:141 actions/profilesettings.php:243
-#: actions/register.php:216
+#: actions/apigroupcreate.php:164 actions/apigroupprofileupdate.php:259
+#: actions/editgroup.php:195 actions/newgroup.php:141
+#: actions/profilesettings.php:244 actions/register.php:201
 msgid "Not a valid nickname."
 msgstr "Pseudo invalide."
 
@@ -636,10 +636,10 @@ msgstr "Pseudo invalide."
 #. TRANS: Validation error shown when providing an invalid homepage URL in the "New application" form.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:181 actions/editapplication.php:235
-#: actions/editgroup.php:202 actions/newapplication.php:221
-#: actions/newgroup.php:148 actions/profilesettings.php:248
-#: actions/register.php:223
+#: actions/apigroupcreate.php:181 actions/apigroupprofileupdate.php:277
+#: actions/editapplication.php:235 actions/editgroup.php:202
+#: actions/newapplication.php:221 actions/newgroup.php:148
+#: actions/profilesettings.php:249 actions/register.php:208
 msgid "Homepage is not a valid URL."
 msgstr "L’adresse du site personnel n’est pas un URL valide. "
 
@@ -648,8 +648,8 @@ msgstr "L’adresse du site personnel n’est pas un URL valide. "
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:191 actions/editgroup.php:206
-#: actions/newgroup.php:152 actions/profilesettings.php:252
-#: actions/register.php:226
+#: actions/newgroup.php:152 actions/profilesettings.php:253
+#: actions/register.php:211
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "Le nom complet est trop long (limité à 255 caractères maximum)."
 
@@ -676,8 +676,8 @@ msgstr[1] "La description est trop longue (limitée à %d caractères maximum)."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:215 actions/editgroup.php:218
-#: actions/newgroup.php:164 actions/profilesettings.php:265
-#: actions/register.php:235
+#: actions/newgroup.php:164 actions/profilesettings.php:266
+#: actions/register.php:220
 msgid "Location is too long (maximum 255 characters)."
 msgstr "L’emplacement est trop long (limité à 255 caractères maximum)."
 
@@ -706,15 +706,16 @@ msgstr "Alias invalide : « %s »."
 #. TRANS: %s is the alias that is already in use.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error. %s is the already used alias.
-#: actions/apigroupcreate.php:264 actions/editgroup.php:246
-#: actions/newgroup.php:193
+#: actions/apigroupcreate.php:264 actions/apigroupprofileupdate.php:351
+#: actions/editgroup.php:246 actions/newgroup.php:193
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "Alias « %s » déjà utilisé. Essayez-en un autre."
 
 #. TRANS: Client error displayed when trying to use an alias during group creation that is the same as the group's nickname.
 #. TRANS: Group edit form validation error.
-#: actions/apigroupcreate.php:278 actions/editgroup.php:253
+#: actions/apigroupcreate.php:278 actions/apigroupprofileupdate.php:359
+#: actions/editgroup.php:253
 msgid "Alias can't be the same as nickname."
 msgstr "L’alias ne peut pas être le même que le pseudo."
 
@@ -726,7 +727,8 @@ msgstr "L’alias ne peut pas être le même que le pseudo."
 #. TRANS: Client error displayed requesting most recent notices to a group for a non-existing group.
 #: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
 #: actions/apigroupleave.php:104 actions/apigroupmembership.php:71
-#: actions/apigroupshow.php:81 actions/apitimelinegroup.php:89
+#: actions/apigroupprofileupdate.php:113 actions/apigroupshow.php:81
+#: actions/apitimelinegroup.php:89
 msgid "Group not found."
 msgstr "Groupe non trouvé."
 
@@ -744,13 +746,11 @@ msgstr "Vous êtes déjà membre de ce groupe."
 msgid "You have been blocked from that group by the admin."
 msgstr "Vous avez été bloqué de ce groupe par l’administrateur."
 
-#. TRANS: Server error displayed when joining a group fails.
-#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
 #. 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.
 #. TRANS: Message given having failed to add a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:362
+#: actions/apigroupjoin.php:136 actions/joingroup.php:139 lib/command.php:362
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "Impossible d’inscrire l’utilisateur %1$s au groupe %2$s."
@@ -760,8 +760,6 @@ msgstr "Impossible d’inscrire l’utilisateur %1$s au groupe %2$s."
 msgid "You are not a member of this group."
 msgstr "Vous n’êtes pas membre de ce groupe."
 
-#. TRANS: Server error displayed when leaving a group fails.
-#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
 #. TRANS: Server error displayed when leaving a group failed in the database.
 #. TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
 #. TRANS: Message given having failed to remove a user from a group.
@@ -797,6 +795,63 @@ msgstr "Groupes de %s"
 msgid "groups on %s"
 msgstr "groupes sur %s"
 
+#. TRANS: Client error displayed trying to edit a group while not being a group admin.
+#. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
+#. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
+#: actions/apigroupprofileupdate.php:118 actions/editgroup.php:110
+#: actions/editgroup.php:176 actions/groupdesignsettings.php:109
+#: actions/grouplogo.php:111
+msgid "You must be an admin to edit the group."
+msgstr "Vous devez être administrateur pour modifier le groupe."
+
+#. TRANS: Server error displayed when editing a group fails.
+#: actions/apigroupprofileupdate.php:171 actions/editgroup.php:274
+msgid "Could not update group."
+msgstr "Impossible de mettre à jour le groupe."
+
+#. TRANS: Server error displayed when group aliases could not be added.
+#. TRANS: Server exception thrown when creating group aliases failed.
+#: actions/apigroupprofileupdate.php:194 actions/editgroup.php:281
+#: classes/User_group.php:540
+msgid "Could not create aliases."
+msgstr "Impossible de créer les alias."
+
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: actions/apigroupprofileupdate.php:249 lib/nickname.php:165
+msgid "Nickname must have only lowercase letters and numbers and no spaces."
+msgstr ""
+"Les pseudos ne peuvent contenir que des caractères minuscules et des "
+"chiffres, sans espaces."
+
+#: actions/apigroupprofileupdate.php:286
+#, fuzzy
+msgid "Full name is too long (max 255 chars)."
+msgstr "Le nom complet est trop long (limité à 255 caractères maximum)."
+
+#: actions/apigroupprofileupdate.php:296
+#, fuzzy, php-format
+msgid "description is too long (max %d chars)."
+msgstr "La description est trop longue (limitée à %d caractère maximum)."
+
+#: actions/apigroupprofileupdate.php:307
+#, fuzzy
+msgid "Location is too long (max 255 chars)."
+msgstr "L’emplacement est trop long (limité à 255 caractères maximum)."
+
+#: actions/apigroupprofileupdate.php:326
+#, fuzzy, php-format
+msgid "Too many aliases! Maximum %d."
+msgstr "Trop d’alias ! Un maximum de %d est autorisé."
+
+#. TRANS: Group edit form validation error.
+#. TRANS: Group create form validation error.
+#. TRANS: %s is the invalid alias.
+#: actions/apigroupprofileupdate.php:342 actions/editgroup.php:241
+#: actions/newgroup.php:188
+#, php-format
+msgid "Invalid alias: \"%s\""
+msgstr "Alias invalide : « %s »"
+
 #. TRANS: Client error displayed when uploading a media file has failed.
 #: actions/apimediaupload.php:101
 msgid "Upload failed."
@@ -827,21 +882,22 @@ msgstr "Le jeton de requête a déjà été autorisé."
 #. TRANS: Form validation error message.
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
+#. TRANS: Client error displayed when the session token is not okay.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
 #: actions/deletenotice.php:177 actions/disfavor.php:75
-#: actions/emailsettings.php:291 actions/favor.php:75 actions/geocode.php:55
+#: actions/emailsettings.php:292 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:65 actions/grouplogo.php:321
-#: actions/groupunblock.php:65 actions/imsettings.php:224
-#: actions/invite.php:60 actions/login.php:137 actions/makeadmin.php:66
-#: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
-#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
-#: actions/othersettings.php:155 actions/passwordsettings.php:138
-#: actions/profilesettings.php:217 actions/recoverpassword.php:383
-#: actions/register.php:172 actions/remotesubscribe.php:76
-#: actions/repeat.php:82 actions/smssettings.php:250 actions/subedit.php:40
-#: actions/subscribe.php:86 actions/tagother.php:166
-#: actions/unsubscribe.php:69 actions/userauthorization.php:52
-#: lib/designsettings.php:310
+#: actions/groupunblock.php:65 actions/imsettings.php:241
+#: actions/invite.php:60 actions/makeadmin.php:66 actions/newmessage.php:135
+#: actions/newnotice.php:105 actions/nudge.php:80
+#: actions/oauthappssettings.php:162 actions/oauthconnectionssettings.php:135
+#: actions/passwordsettings.php:137 actions/pluginenable.php:87
+#: actions/profilesettings.php:218 actions/recoverpassword.php:383
+#: actions/register.php:157 actions/remotesubscribe.php:76
+#: actions/repeat.php:82 actions/smssettings.php:249 actions/subedit.php:40
+#: actions/subscribe.php:87 actions/tagother.php:145
+#: actions/unsubscribe.php:69 actions/urlsettings.php:171
+#: actions/userauthorization.php:53 lib/designsettings.php:122
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 "Un problème est survenu avec votre jeton de session. Veuillez essayer à "
@@ -873,10 +929,10 @@ msgstr ""
 #. TRANS: Unknown form validation error in design settings form.
 #: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
 #: actions/designadminpanel.php:100 actions/editapplication.php:144
-#: actions/emailsettings.php:310 actions/grouplogo.php:332
-#: actions/imsettings.php:239 actions/newapplication.php:124
-#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
-#: actions/smssettings.php:271 lib/designsettings.php:321
+#: actions/emailsettings.php:311 actions/grouplogo.php:332
+#: actions/imsettings.php:256 actions/newapplication.php:124
+#: actions/oauthconnectionssettings.php:144 actions/recoverpassword.php:46
+#: actions/smssettings.php:270 lib/designsettings.php:133
 msgid "Unexpected form submission."
 msgstr "Soumission de formulaire inattendue."
 
@@ -927,31 +983,26 @@ msgstr "Compte"
 
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Field label in form for profile settings.
-#. TRANS: Label for group nickname (dt). Text hidden by default.
-#. TRANS: DT for nick name in a profile.
-#: actions/apioauthauthorize.php:459 actions/login.php:252
-#: actions/profilesettings.php:106 actions/register.php:432
-#: actions/showgroup.php:243 actions/tagother.php:94
+#: actions/apioauthauthorize.php:459 actions/login.php:225
+#: actions/profilesettings.php:107 actions/register.php:411
 #: actions/userauthorization.php:145 lib/groupeditform.php:145
-#: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "Pseudo"
 
 #. TRANS: Field label on OAuth API authorisation form.
-#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:463 actions/login.php:255
-#: actions/register.php:436 lib/accountsettingsaction.php:120
+#: actions/apioauthauthorize.php:463 actions/login.php:228
+#: actions/register.php:415 lib/settingsnav.php:87
 msgid "Password"
 msgstr "Mot de passe"
 
 #. TRANS: Button text that when clicked will cancel the process of allowing access to an account
 #. TRANS: by an external application.
 #. TRANS: Button label to cancel an e-mail address confirmation procedure.
-#. TRANS: Button label to cancel an Instant Messaging address confirmation procedure.
+#. TRANS: Button label to cancel an IM address confirmation procedure.
 #. TRANS: Button label to cancel a SMS address confirmation procedure.
 #. TRANS: Button label in the "Edit application" form.
-#: actions/apioauthauthorize.php:478 actions/emailsettings.php:124
-#: actions/imsettings.php:127 actions/smssettings.php:133
+#: actions/apioauthauthorize.php:478 actions/emailsettings.php:125
+#: actions/imsettings.php:136 actions/smssettings.php:132
 #: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Cancel"
@@ -1063,7 +1114,7 @@ msgstr "Méthode HTTP non trouvée !"
 #. TRANS: %s is the requested output format.
 #: actions/apistatusesshow.php:144
 #, fuzzy, php-format
-msgid "Unsupported format: %s"
+msgid "Unsupported format: %s."
 msgstr "Format non supporté : %s"
 
 #. TRANS: Client error displayed requesting a deleted status.
@@ -1149,13 +1200,6 @@ msgstr "%1$s / Favoris de %2$s"
 msgid "%1$s updates favorited by %2$s / %3$s."
 msgstr "%1$s annonces favorites de %2$s, alias %3$s."
 
-#. TRANS: Server error displayed when generating an Atom feed fails.
-#. TRANS: %s is the error.
-#: actions/apitimelinegroup.php:134
-#, php-format
-msgid "Could not generate feed for group - %s"
-msgstr "Impossible de générer le flux pour le groupe — %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.
 #: actions/apitimelinementions.php:115
@@ -1172,13 +1216,14 @@ msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr "%1$s statuts en réponses aux statuts de %2$s / %3$s."
 
 #. TRANS: Title for site timeline. %s is the StatusNet sitename.
+#. TRANS: Public RSS feed title. %s is the StatusNet site name.
 #: actions/apitimelinepublic.php:193 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "Activité publique %s"
 
 #. TRANS: Subtitle for site timeline. %s is the StatusNet sitename.
-#: actions/apitimelinepublic.php:199 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:199
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "%s statuts de tout le monde !"
@@ -1189,21 +1234,33 @@ msgid "Unimplemented."
 msgstr "Non implémenté."
 
 #. TRANS: Title for Atom feed "repeated to me". %s is the user nickname.
-#: actions/apitimelineretweetedtome.php:108
+#: actions/apitimelineretweetedtome.php:96
 #, php-format
 msgid "Repeated to %s"
 msgstr "Repris pour %s"
 
+#: actions/apitimelineretweetedtome.php:98
+#, fuzzy, php-format
+msgid "%1$s notices that were to repeated to %2$s / %3$s."
+msgstr "%1$s statuts en réponses aux statuts de %2$s / %3$s."
+
 #. TRANS: Title of list of repeated notices of the logged in user.
 #. TRANS: %s is the nickname of the logged in user.
-#: actions/apitimelineretweetsofme.php:112
+#: actions/apitimelineretweetsofme.php:98
 #, php-format
 msgid "Repeats of %s"
 msgstr "Reprises de %s"
 
+#: actions/apitimelineretweetsofme.php:104
+#, fuzzy, php-format
+msgid "%1$s notices that %2$s / %3$s has repeated."
+msgstr "%1$s a marqué l’avis %2$s comme favori."
+
 #. TRANS: Title for timeline with lastest notices with a given tag.
 #. TRANS: %s is the tag.
-#: actions/apitimelinetag.php:101 actions/tag.php:67
+#. TRANS: Title for first page of notices with tags.
+#. TRANS: %s is the tag.
+#: actions/apitimelinetag.php:101 actions/tag.php:69
 #, php-format
 msgid "Notices tagged with %s"
 msgstr "Avis marqués avec %s"
@@ -1216,56 +1273,57 @@ msgid "Updates tagged with %1$s on %2$s!"
 msgstr "Mises à jour marquées avec %1$s dans %2$s !"
 
 #. TRANS: Client error displayed trying to add a notice to another user's timeline.
-#: actions/apitimelineuser.php:297
+#: actions/apitimelineuser.php:308
 msgid "Only the user can add to their own timeline."
 msgstr "Seul l’utilisateur peut ajouter des éléments son flux."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:304
+#: actions/apitimelineuser.php:315
 msgid "Only accept AtomPub for Atom feeds."
 msgstr "N’accepte que AtomPub pour les flux atom."
 
 #. TRANS: Client error displayed attempting to post an empty API notice.
-#: actions/apitimelineuser.php:311
+#: actions/apitimelineuser.php:322
 #, fuzzy
 msgid "Atom post must not be empty."
 msgstr "Une publication Atom doit être une entrée « Atom »."
 
 #. TRANS: Client error displayed attempting to post an API that is not well-formed XML.
-#: actions/apitimelineuser.php:317
+#: actions/apitimelineuser.php:328
 #, fuzzy
 msgid "Atom post must be well-formed XML."
 msgstr "Une publication Atom doit être une entrée « Atom »."
 
 #. TRANS: Client error displayed when not using an Atom entry.
-#: actions/apitimelineuser.php:323 actions/atompubfavoritefeed.php:228
+#: actions/apitimelineuser.php:334 actions/atompubfavoritefeed.php:228
 #: actions/atompubmembershipfeed.php:230
 #: actions/atompubsubscriptionfeed.php:236
 msgid "Atom post must be an Atom entry."
 msgstr "Une publication Atom doit être une entrée « Atom »."
 
 #. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
-#: actions/apitimelineuser.php:335
+#: actions/apitimelineuser.php:345
 #, fuzzy
 msgid "Can only handle POST activities."
 msgstr "Ne peut gérer que les activités de publication."
 
 #. TRANS: Client error displayed when using an unsupported activity object type.
 #. TRANS: %s is the unsupported activity object type.
-#: actions/apitimelineuser.php:346
+#: actions/apitimelineuser.php:356
 #, fuzzy, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr "Ne peut gérer l’objet d’activité de type « %s »"
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
 #. TRANS: %d is the notice ID (number).
-#: actions/apitimelineuser.php:380
+#: actions/apitimelineuser.php:390
 #, fuzzy, php-format
 msgid "No content for notice %d."
 msgstr "Chercher dans le contenu des avis"
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:408
+#. TRANS: %s is the notice URI.
+#: actions/apitimelineuser.php:419
 #, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "L’avis d’URI « %s » existe déjà."
@@ -1282,9 +1340,10 @@ msgstr "Page non trouvée."
 
 #. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
 #. TRANS: Client exception.
+#. TRANS: Client error displayed trying to subscribe to a non-existing profile.
 #: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
 #: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
-#: actions/subscribe.php:107
+#: actions/subscribe.php:110
 msgid "No such profile."
 msgstr "Profil non-trouvé."
 
@@ -1431,7 +1490,7 @@ msgid "Not a member."
 msgstr "Tous les membres"
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
-#: actions/atompubshowmembership.php:151
+#: actions/atompubshowmembership.php:150
 #, fuzzy
 msgid "Cannot delete someone else's membership."
 msgstr "Impossible de supprimer l’abonnement à soi-même."
@@ -1521,10 +1580,7 @@ msgid "Invalid size."
 msgstr "Taille incorrecte."
 
 #. TRANS: Title for avatar upload page.
-#. TRANS: Label for group avatar (dt). Text hidden by default.
-#. TRANS: Link description in user account settings menu.
-#: actions/avatarsettings.php:66 actions/showgroup.php:227
-#: lib/accountsettingsaction.php:113
+#: actions/avatarsettings.php:66 lib/settingsnav.php:82
 msgid "Avatar"
 msgstr "Avatar"
 
@@ -1539,9 +1595,11 @@ msgstr ""
 
 #. TRANS: Server error displayed in avatar upload page when no matching profile can be found for a user.
 #. TRANS: Server error displayed coming across a request from a user without a profile.
+#. TRANS: Server error displayed when trying to authorise a remote subscription request
+#. TRANS: while the user has no profile.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
 #: actions/grouplogo.php:184 actions/remotesubscribe.php:190
-#: actions/userauthorization.php:72 actions/userrss.php:108
+#: actions/userauthorization.php:75 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr "Utilisateur sans profil correspondant."
 
@@ -1596,10 +1654,10 @@ msgstr "Recadrer"
 msgid "No file uploaded."
 msgstr "Aucun fichier n’a été téléversé."
 
-#. TRANS: Avatar upload form unstruction after uploading a file.
+#. TRANS: Avatar upload form instruction after uploading a file.
 #: actions/avatarsettings.php:345
 #, fuzzy
-msgid "Pick a square area of the image to be your avatar"
+msgid "Pick a square area of the image to be your avatar."
 msgstr "Sélectionnez une zone de forme carrée pour définir votre avatar"
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
@@ -1625,7 +1683,7 @@ msgstr "Avatar supprimé."
 
 #. TRANS: Title for backup account page.
 #. TRANS: Option in profile settings to create a backup of the account of the currently logged in user.
-#: actions/backupaccount.php:61 actions/profilesettings.php:467
+#: actions/backupaccount.php:61 actions/profilesettings.php:468
 msgid "Backup account"
 msgstr ""
 
@@ -1659,7 +1717,7 @@ msgstr "Arrière plan"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
 #: actions/backupaccount.php:254
-msgid "Backup your account"
+msgid "Backup your account."
 msgstr ""
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
@@ -1701,7 +1759,7 @@ msgstr "Non"
 #. TRANS: Submit button title for 'No' when blocking a user.
 #: actions/block.php:158
 #, fuzzy
-msgid "Do not block this user"
+msgid "Do not block this user."
 msgstr "Ne pas bloquer cet utilisateur"
 
 #. TRANS: Button label on the user block form.
@@ -1718,9 +1776,9 @@ msgid "Yes"
 msgstr "Oui"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#. TRANS: Description of the form to block a user.
-#: actions/block.php:165 lib/blockform.php:79
-msgid "Block this user"
+#: actions/block.php:165
+#, fuzzy
+msgid "Block this user."
 msgstr "Bloquer cet utilisateur"
 
 #. TRANS: Server error displayed when blocking a user fails.
@@ -1786,31 +1844,47 @@ msgstr "Code de confirmation non trouvé."
 msgid "That confirmation code is not for you!"
 msgstr "Ce code de confirmation n’est pas pour vous !"
 
-#. TRANS: Server error for a unknow address type %s, which can be 'email', 'jabber', or 'sms'.
-#: actions/confirmaddress.php:92
-#, php-format
-msgid "Unrecognized address type %s."
+#. TRANS: Server error for an unknown address type, which can be 'email', 'sms', or the name of an IM network (such as 'xmpp' or 'aim')
+#: actions/confirmaddress.php:94
+#, fuzzy, php-format
+msgid "Unrecognized address type %s"
 msgstr "Type d’adresse non reconnu : %s."
 
 #. TRANS: Client error for an already confirmed email/jabber/sms address.
-#: actions/confirmaddress.php:97
+#: actions/confirmaddress.php:103 actions/confirmaddress.php:136
 msgid "That address has already been confirmed."
 msgstr "Cette adresse a déjà été confirmée."
 
+#: actions/confirmaddress.php:121 actions/imsettings.php:444
+#: actions/userdesignsettings.php:306
+#, fuzzy
+msgid "Couldn't update user."
+msgstr "Impossible de mettre à jour l’utilisateur."
+
+#: actions/confirmaddress.php:144
+#, fuzzy
+msgid "Couldn't update user im preferences."
+msgstr "Impossible de mettre à jour le dossier de l’utilisateur."
+
+#: actions/confirmaddress.php:156
+#, fuzzy
+msgid "Couldn't insert user im preferences."
+msgstr "Impossible d’insérer un nouvel abonnement."
+
 #. TRANS: Server error displayed when an address confirmation code deletion from the
 #. TRANS: database fails in the contact address confirmation action.
-#: actions/confirmaddress.php:132
+#: actions/confirmaddress.php:169
 msgid "Could not delete address confirmation."
 msgstr "Impossible de supprimer la confirmation de l’adresse de contact."
 
 #. TRANS: Title for the contact address confirmation action.
-#: actions/confirmaddress.php:150
+#: actions/confirmaddress.php:185
 msgid "Confirm address"
 msgstr "Confirmer l’adresse"
 
 #. TRANS: Success message for the contact address confirmation action.
 #. TRANS: %s can be 'email', 'jabber', or 'sms'.
-#: actions/confirmaddress.php:166
+#: actions/confirmaddress.php:200
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "L'adresse \"%s\" a été validée pour votre compte."
@@ -1824,6 +1898,7 @@ msgstr "Conversation"
 #. TRANS: Label for user statistics.
 #: actions/conversation.php:149 lib/noticelist.php:87
 #: lib/profileaction.php:246 lib/searchgroupnav.php:82
+#: lib/threadednoticelist.php:66
 msgid "Notices"
 msgstr "Avis"
 
@@ -1859,7 +1934,7 @@ msgstr "Avatar supprimé."
 
 #. TRANS: Page title for page on which a user account can be deleted.
 #. TRANS: Option in profile settings to delete the account of the currently logged in user.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:475
+#: actions/deleteaccount.php:228 actions/profilesettings.php:476
 #, fuzzy
 msgid "Delete account"
 msgstr "Créer un compte"
@@ -1883,7 +1958,7 @@ msgstr ""
 #. TRANS: Field label for delete account confirmation entry.
 #. TRANS: Field label for password reset form where the password has to be typed again.
 #: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:262 actions/register.php:440
+#: actions/recoverpassword.php:262 actions/register.php:419
 msgid "Confirm"
 msgstr "Confirmer"
 
@@ -1913,14 +1988,14 @@ msgstr "Application non trouvée."
 #. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
 #: actions/deleteapplication.php:79 actions/editapplication.php:78
-#: actions/showapplication.php:94
+#: actions/showapplication.php:90
 msgid "You are not the owner of this application."
 msgstr "Vous n’êtes pas le propriétaire de cette application."
 
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
-#: actions/newapplication.php:112 actions/showapplication.php:118
-#: lib/action.php:1425
+#: actions/newapplication.php:112 actions/showapplication.php:113
+#: lib/action.php:1391
 msgid "There was a problem with your session token."
 msgstr "Un problème est survenu avec votre jeton de session."
 
@@ -1944,13 +2019,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting an application.
 #: actions/deleteapplication.php:161
 #, fuzzy
-msgid "Do not delete this application"
+msgid "Do not delete this application."
 msgstr "Ne pas supprimer cette application"
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
 #: actions/deleteapplication.php:167
 #, fuzzy
-msgid "Delete this application"
+msgid "Delete this application."
 msgstr "Supprimer cette application"
 
 #. TRANS: Client error when trying to delete group while not logged in.
@@ -2006,13 +2081,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting a group.
 #: actions/deletegroup.php:224
 #, fuzzy
-msgid "Do not delete this group"
+msgid "Do not delete this group."
 msgstr "Ne pas supprimer ce groupe"
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
 #: actions/deletegroup.php:231
 #, fuzzy
-msgid "Delete this group"
+msgid "Delete this group."
 msgstr "Supprimer ce groupe"
 
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
@@ -2020,14 +2095,16 @@ msgstr "Supprimer ce groupe"
 #. TRANS: Client error displayed when trying to mark a notice as favorite without being logged in.
 #. TRANS: Client error displayed trying to block a user from a group while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
+#. TRANS: Client error displayed trying to log out when not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
+#. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
 #. TRANS: Client error displayed when trying to change user options while not logged in.
 #: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
-#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:69
+#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:70
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
-#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
-#: actions/tagother.php:33 actions/unsubscribe.php:52
+#: actions/nudge.php:63 actions/pluginenable.php:97 actions/subedit.php:33
+#: actions/subscribe.php:98 actions/tagother.php:33 actions/unsubscribe.php:52
 #: lib/adminpanelaction.php:71 lib/profileformaction.php:63
 #: lib/settingsaction.php:72
 msgid "Not logged in."
@@ -2056,12 +2133,13 @@ msgstr "Voulez-vous vraiment supprimer cet avis ?"
 #. TRANS: Submit button title for 'No' when deleting a notice.
 #: actions/deletenotice.php:159
 #, fuzzy
-msgid "Do not delete this notice"
+msgid "Do not delete this notice."
 msgstr "Ne pas supprimer cet avis"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:166 lib/noticelist.php:673
-msgid "Delete this notice"
+#: actions/deletenotice.php:166
+#, fuzzy
+msgid "Delete this notice."
 msgstr "Supprimer cet avis"
 
 #. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
@@ -2098,18 +2176,17 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting a user.
 #: actions/deleteuser.php:158
 #, fuzzy
-msgid "Do not delete this user"
+msgid "Do not delete this user."
 msgstr "Ne pas supprimer ce groupe"
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
-#. TRANS: Description of form for deleting a user.
-#: actions/deleteuser.php:165 lib/deleteuserform.php:75
-msgid "Delete this user"
+#: actions/deleteuser.php:165
+#, fuzzy
+msgid "Delete this user."
 msgstr "Supprimer cet utilisateur"
 
 #. TRANS: Message used as title for design settings for the site.
-#. TRANS: Link description in user account settings menu.
-#: actions/designadminpanel.php:60 lib/accountsettingsaction.php:134
+#: actions/designadminpanel.php:60 lib/settingsnav.php:97
 msgid "Design"
 msgstr "Conception"
 
@@ -2177,8 +2254,7 @@ msgstr ""
 "Vous pouvez importer un thème StatusNet personnalisé dans une archive .ZIP."
 
 #. TRANS: Fieldset legend for theme background image.
-#. TRANS: Fieldset legend on profile design page.
-#: actions/designadminpanel.php:515 lib/designsettings.php:98
+#: actions/designadminpanel.php:515
 msgid "Change background image"
 msgstr "Changer l’image d’arrière plan"
 
@@ -2186,7 +2262,7 @@ msgstr "Changer l’image d’arrière plan"
 #. TRANS: Field label for background color selector.
 #. TRANS: Label on profile design page for setting a profile page background colour.
 #: actions/designadminpanel.php:525 actions/designadminpanel.php:609
-#: lib/designsettings.php:183
+#: lib/designform.php:238
 msgid "Background"
 msgstr "Arrière plan"
 
@@ -2213,13 +2289,13 @@ msgstr "Désactivé"
 #. TRANS: Form guide for turning background image on or off on theme designer page.
 #. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
 #. TRANS: use of the uploaded profile image.
-#: actions/designadminpanel.php:577 lib/designsettings.php:159
+#: actions/designadminpanel.php:577 lib/designform.php:214
 msgid "Turn background image on or off."
 msgstr "Activer ou désactiver l’image d’arrière plan."
 
 #. TRANS: Checkbox label to title background image on theme designer page.
 #. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-#: actions/designadminpanel.php:583 lib/designsettings.php:165
+#: actions/designadminpanel.php:583 lib/designform.php:220
 msgid "Tile background image"
 msgstr "Répéter l’image d’arrière plan"
 
@@ -2231,25 +2307,25 @@ msgstr "Modifier les couleurs"
 
 #. TRANS: Field label for content color selector.
 #. TRANS: Label on profile design page for setting a profile page content colour.
-#: actions/designadminpanel.php:623 lib/designsettings.php:197
+#: actions/designadminpanel.php:623 lib/designform.php:252
 msgid "Content"
 msgstr "Contenu"
 
 #. TRANS: Field label for sidebar color selector.
 #. TRANS: Label on profile design page for setting a profile page sidebar colour.
-#: actions/designadminpanel.php:637 lib/designsettings.php:211
+#: actions/designadminpanel.php:637 lib/designform.php:266
 msgid "Sidebar"
 msgstr "Barre latérale"
 
 #. TRANS: Field label for text color selector.
 #. TRANS: Label on profile design page for setting a profile page text colour.
-#: actions/designadminpanel.php:651 lib/designsettings.php:225
+#: actions/designadminpanel.php:651 lib/designform.php:280
 msgid "Text"
 msgstr "Texte"
 
 #. TRANS: Field label for link color selector.
 #. TRANS: Label on profile design page for setting a profile page links colour.
-#: actions/designadminpanel.php:665 lib/designsettings.php:239
+#: actions/designadminpanel.php:665 lib/designform.php:294
 msgid "Links"
 msgstr "Liens"
 
@@ -2271,21 +2347,21 @@ msgid "Use defaults"
 msgstr "Utiliser les valeurs par défaut"
 
 #. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: actions/designadminpanel.php:720 lib/designsettings.php:259
-msgid "Restore default designs"
+#: actions/designadminpanel.php:720
+#, fuzzy
+msgid "Restore default designs."
 msgstr "Restaurer les conceptions par défaut"
 
 #. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: actions/designadminpanel.php:728 lib/designsettings.php:267
-msgid "Reset back to default"
+#: actions/designadminpanel.php:728
+#, fuzzy
+msgid "Reset back to default."
 msgstr "Revenir aux valeurs par défaut"
 
 #. TRANS: Title for button for saving theme settings.
-#. TRANS: Title for button on profile design page to save settings.
-#: actions/designadminpanel.php:736 lib/designsettings.php:272
-msgid "Save design"
+#: actions/designadminpanel.php:736
+#, fuzzy
+msgid "Save design."
 msgstr "Sauvegarder la conception"
 
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
@@ -2317,7 +2393,7 @@ msgid "You must be logged in to edit an application."
 msgstr "Vous devez être connecté pour modifier une application."
 
 #. TRANS: Client error displayed trying to edit an application that does not exist.
-#: actions/editapplication.php:83 actions/showapplication.php:87
+#: actions/editapplication.php:83 actions/showapplication.php:83
 msgid "No such application."
 msgstr "Application non trouvée."
 
@@ -2408,80 +2484,53 @@ msgstr "Modifier le groupe %s"
 msgid "You must be logged in to create a group."
 msgstr "Vous devez ouvrir une session pour créer un groupe."
 
-#. TRANS: Client error displayed trying to edit a group while not being a group admin.
-#. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
-#. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
-#: actions/editgroup.php:110 actions/editgroup.php:176
-#: actions/groupdesignsettings.php:109 actions/grouplogo.php:111
-msgid "You must be an admin to edit the group."
-msgstr "Vous devez être administrateur pour modifier le groupe."
-
 #. TRANS: Form instructions for group edit form.
 #: actions/editgroup.php:161
 msgid "Use this form to edit the group."
 msgstr "Remplissez ce formulaire pour modifier les options du groupe."
 
-#. TRANS: Group edit form validation error.
-#. TRANS: Group create form validation error.
-#. TRANS: %s is the invalid alias.
-#: actions/editgroup.php:241 actions/newgroup.php:188
-#, php-format
-msgid "Invalid alias: \"%s\""
-msgstr "Alias invalide : « %s »"
-
-#. TRANS: Server error displayed when editing a group fails.
-#: actions/editgroup.php:274
-msgid "Could not update group."
-msgstr "Impossible de mettre à jour le groupe."
-
-#. TRANS: Server error displayed when group aliases could not be added.
-#. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/editgroup.php:281 classes/User_group.php:540
-msgid "Could not create aliases."
-msgstr "Impossible de créer les alias."
-
 #. TRANS: Group edit form success message.
 #: actions/editgroup.php:301
 msgid "Options saved."
 msgstr "Vos options ont été enregistrées."
 
 #. TRANS: Title for e-mail settings.
-#: actions/emailsettings.php:59
+#: actions/emailsettings.php:60
 msgid "Email settings"
 msgstr "Paramètres du courriel"
 
 #. TRANS: E-mail settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/emailsettings.php:73
+#: actions/emailsettings.php:74
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 msgstr "Configurez les courriels que vous souhaitez recevoir de %%site.name%%."
 
 #. TRANS: Form legend for e-mail settings form.
 #. TRANS: Field label for e-mail address input in e-mail settings form.
-#: actions/emailsettings.php:103 actions/emailsettings.php:129
+#: actions/emailsettings.php:104 actions/emailsettings.php:130
 msgid "Email address"
 msgstr "Adresse électronique"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:109
+#: actions/emailsettings.php:110
 msgid "Current confirmed email address."
 msgstr "Adresse courriel actuellement confirmée."
 
 #. TRANS: Button label to remove a confirmed e-mail address.
 #. TRANS: Button label for removing a set sender e-mail address to post notices from.
-#. TRANS: Button label to remove a confirmed Instant Messaging address.
+#. TRANS: Button label to remove a confirmed IM address.
 #. TRANS: Button label to remove a confirmed SMS address.
 #. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
-#: actions/emailsettings.php:112 actions/emailsettings.php:179
-#: actions/imsettings.php:112 actions/smssettings.php:120
-#: actions/smssettings.php:176
+#: actions/emailsettings.php:113 actions/emailsettings.php:180
+#: actions/imsettings.php:119 actions/smssettings.php:119
+#: actions/smssettings.php:175
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Enlever"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:119
+#: actions/emailsettings.php:120
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -2494,44 +2543,44 @@ msgstr ""
 #. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
 #. TRANS: Any other domain may be owned by a legitimate person or
 #. TRANS: organization.
-#: actions/emailsettings.php:136
+#: actions/emailsettings.php:137
 msgid "Email address, like \"UserName@example.org\""
 msgstr "Adresse de courriel (ex : nom@example.org)"
 
 #. TRANS: Button label for adding an e-mail address in e-mail settings form.
-#. TRANS: Button label for adding an Instant Messaging address in Instant Messaging settings form.
+#. TRANS: Button label for adding an IM address in IM settings form.
 #. TRANS: Button label for adding a SMS phone number in SMS settings form.
-#: actions/emailsettings.php:140 actions/imsettings.php:147
-#: actions/smssettings.php:158
+#: actions/emailsettings.php:141 actions/imsettings.php:147
+#: actions/smssettings.php:157
 msgctxt "BUTTON"
 msgid "Add"
 msgstr "Ajouter"
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:148 actions/smssettings.php:167
+#: actions/emailsettings.php:149 actions/smssettings.php:166
 msgid "Incoming email"
 msgstr "Courriel entrant"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:154
+#: actions/emailsettings.php:155
 msgid "I want to post notices by email."
 msgstr "Je veux envoyer mes avis par courriel."
 
 #. TRANS: Form instructions for incoming e-mail form in e-mail settings.
 #. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
-#: actions/emailsettings.php:176 actions/smssettings.php:174
+#: actions/emailsettings.php:177 actions/smssettings.php:173
 msgid "Send email to this address to post new notices."
 msgstr "Écrivez à cette adresse courriel pour poster de nouveaux avis."
 
 #. TRANS: Instructions for incoming e-mail address input form, when an address has already been assigned.
 #. TRANS: Instructions for incoming SMS e-mail address input form.
-#: actions/emailsettings.php:185 actions/smssettings.php:182
+#: actions/emailsettings.php:186 actions/smssettings.php:181
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr "Nouvelle adresse courriel pour poster ; annule l’ancienne."
 
 #. TRANS: Instructions for incoming e-mail address input form.
-#: actions/emailsettings.php:189
+#: actions/emailsettings.php:190
 msgid ""
 "To send notices via email, we need to create a unique email address for you "
 "on this server:"
@@ -2539,91 +2588,91 @@ msgstr ""
 
 #. TRANS: Button label for adding an e-mail address to send notices from.
 #. TRANS: Button label for adding an SMS e-mail address to send notices from.
-#: actions/emailsettings.php:195 actions/smssettings.php:185
+#: actions/emailsettings.php:196 actions/smssettings.php:184
 msgctxt "BUTTON"
 msgid "New"
 msgstr "Nouveau"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:204
+#: actions/emailsettings.php:205
 msgid "Email preferences"
 msgstr "Préférences de courrier électronique"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:212
+#: actions/emailsettings.php:213
 msgid "Send me notices of new subscriptions through email."
 msgstr "Avertissez-moi par courriel des nouveaux abonnements."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:218
+#: actions/emailsettings.php:219
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr ""
 "Envoyez-moi un courriel quand un utilisateur ajoute un de mes avis à ses "
 "favoris."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:225
+#: actions/emailsettings.php:226
 msgid "Send me email when someone sends me a private message."
 msgstr "Envoyez-moi un courriel quand quelqu’un m’envoie un message personnel."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:231
+#: actions/emailsettings.php:232
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr "Envoyez-moi un courriel quand quelqu’un m’envoie une réponse « @ »."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:237
+#: actions/emailsettings.php:238
 msgid "Allow friends to nudge me and send me an email."
 msgstr "Autoriser mes amis à m’envoyer des courriels et des clins d’œil."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:243
+#: actions/emailsettings.php:244
 msgid "Publish a MicroID for my email address."
 msgstr "Publier un MicroID pour mon adresse courriel."
 
 #. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:361
+#: actions/emailsettings.php:362
 msgid "Email preferences saved."
 msgstr "Préférences de courrier électronique enregistrées."
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:380
+#: actions/emailsettings.php:381
 msgid "No email address."
 msgstr "Aucune adresse électronique."
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:388
+#: actions/emailsettings.php:389
 #, fuzzy
 msgid "Cannot normalize that email address."
 msgstr "Impossible d’utiliser cette adresse courriel"
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:393 actions/register.php:212
+#: actions/emailsettings.php:394 actions/register.php:197
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "Adresse courriel invalide."
 
 #. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:397
+#: actions/emailsettings.php:398
 msgid "That is already your email address."
 msgstr "Vous utilisez déjà cette adresse courriel."
 
 #. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:401
+#: actions/emailsettings.php:402
 msgid "That email address already belongs to another user."
 msgstr "Cette adresse courriel appartient déjà à un autre utilisateur."
 
 #. TRANS: Server error thrown on database error adding e-mail confirmation code.
 #. TRANS: Server error thrown on database error adding Instant Messaging confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:418 actions/imsettings.php:343
-#: actions/smssettings.php:365
+#: actions/emailsettings.php:419 actions/imsettings.php:362
+#: actions/smssettings.php:364
 #, fuzzy
 msgid "Could not insert confirmation code."
 msgstr "Impossible d’insérer le code de confirmation."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:425
+#: actions/emailsettings.php:426
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
@@ -2634,59 +2683,62 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling Instant Messaging address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:445 actions/imsettings.php:377
-#: actions/smssettings.php:399
+#: actions/emailsettings.php:446 actions/imsettings.php:391
+#: actions/smssettings.php:398
 msgid "No pending confirmation to cancel."
 msgstr "Aucune confirmation à annuler."
 
 #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:450
+#: actions/emailsettings.php:451
 msgid "That is the wrong email address."
 msgstr "Cette adresse de messagerie électronique est erronée."
 
 #. TRANS: Server error thrown on database error canceling e-mail address confirmation.
 #. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
-#: actions/emailsettings.php:459 actions/smssettings.php:413
+#: actions/emailsettings.php:460 actions/smssettings.php:412
 #, fuzzy
 msgid "Could not delete email confirmation."
 msgstr "Impossible de supprimer le courriel de confirmation."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:464
+#: actions/emailsettings.php:465
 msgid "Email confirmation cancelled."
 msgstr "Confirmation de courrier électronique annulée."
 
 #. TRANS: Message given trying to remove an e-mail address that is not
 #. TRANS: registered for the active user.
-#: actions/emailsettings.php:483
+#: actions/emailsettings.php:484
 msgid "That is not your email address."
 msgstr "Ceci n’est pas votre adresse courriel."
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:504
+#: actions/emailsettings.php:505
 msgid "The email address was removed."
 msgstr "L’adresse électronique a été supprimée."
 
 #. TRANS: Form validation error displayed when trying to remove an incoming e-mail address while no address has been set.
-#: actions/emailsettings.php:518 actions/smssettings.php:555
+#: actions/emailsettings.php:519 actions/smssettings.php:554
 msgid "No incoming email address."
 msgstr "Aucune adresse de courriel entrant."
 
 #. TRANS: Server error thrown on database error removing incoming e-mail address.
 #. TRANS: Server error thrown on database error adding incoming e-mail address.
-#: actions/emailsettings.php:530 actions/emailsettings.php:554
-#: actions/smssettings.php:565 actions/smssettings.php:588
+#. TRANS: Server error displayed when the user could not be updated in SMS settings.
+#: actions/emailsettings.php:531 actions/emailsettings.php:555
+#: actions/smssettings.php:565 actions/smssettings.php:590
 #, fuzzy
 msgid "Could not update user record."
 msgstr "Impossible de mettre à jour le dossier de l’utilisateur."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:534 actions/smssettings.php:568
+#. TRANS: Confirmation text after updating SMS settings.
+#: actions/emailsettings.php:535 actions/smssettings.php:569
 msgid "Incoming email address removed."
 msgstr "L’adresse de courriel entrant a été supprimée."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:558 actions/smssettings.php:591
+#. TRANS: Confirmation text after updating SMS settings.
+#: actions/emailsettings.php:559 actions/smssettings.php:594
 msgid "New incoming email address added."
 msgstr "Nouvelle adresse de courriel entrant ajoutée."
 
@@ -2698,7 +2750,7 @@ msgstr "Cet avis a déjà été ajouté à vos favoris !"
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
 #: actions/favor.php:95
 #, fuzzy
-msgid "Disfavor favorite"
+msgid "Disfavor favorite."
 msgstr "Retirer ce favori"
 
 #. TRANS: Page title for first page of favorited notices.
@@ -2751,9 +2803,8 @@ msgstr ""
 #. TRANS: %s is a user's nickname.
 #. TRANS: Title for first page of favourite notices of a user.
 #. TRANS: %s is the user for whom the favourite notices are displayed.
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing own favourited notices.
 #: actions/favoritesrss.php:111 actions/showfavorites.php:76
-#: lib/personalgroupnav.php:122
+#: lib/personalgroupnav.php:110
 #, php-format
 msgid "%s's favorite notices"
 msgstr "Avis favoris de %s"
@@ -2940,13 +2991,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
 #: actions/groupblock.php:191
 #, fuzzy
-msgid "Do not block this user from this group"
+msgid "Do not block this user from this group."
 msgstr "Ne pas bloquer cet utilisateur pour ce groupe"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
 #: actions/groupblock.php:198
 #, fuzzy
-msgid "Block this user from this group"
+msgid "Block this user from this group."
 msgstr "Bloquer cet utilisateur de de groupe"
 
 #. TRANS: Server error displayed when trying to block a user from a group fails because of an application error.
@@ -2956,6 +3007,7 @@ msgstr ""
 "Erreur de la base de données lors du blocage de l’utilisateur du groupe."
 
 #. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
+#. TRANS: Client error displayed trying to find a user by ID without providing an ID.
 #: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr "Aucun identifiant."
@@ -2986,7 +3038,7 @@ msgid "Unable to update your design settings."
 msgstr "Impossible de sauvegarder les parmètres de la conception."
 
 #. TRANS: Form text to confirm saved group design settings.
-#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:222
+#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:239
 msgid "Design preferences saved."
 msgstr "Préférences de conception enregistrées."
 
@@ -3051,7 +3103,7 @@ msgid "A list of the users in this group."
 msgstr "Liste des utilisateurs inscrits à ce groupe."
 
 #. TRANS: Indicator in group members list that this user is a group administrator.
-#: actions/groupmembers.php:190
+#: actions/groupmembers.php:190 lib/action.php:581
 msgid "Admin"
 msgstr "Administrer"
 
@@ -3146,8 +3198,10 @@ msgid "Group search"
 msgstr "Rechercher des groupes"
 
 #. TRANS: Text on page where groups can be searched if no results were found for a query.
-#: actions/groupsearch.php:82 actions/noticesearch.php:117
-#: actions/peoplesearch.php:83
+#. TRANS: Text for notice search results is the query had no results.
+#. TRANS: Message on the "People search" page where a query has no results.
+#: actions/groupsearch.php:82 actions/noticesearch.php:122
+#: actions/peoplesearch.php:87
 msgid "No results."
 msgstr "Aucun résultat."
 
@@ -3184,171 +3238,173 @@ msgid "User is not blocked from group."
 msgstr "Cet utilisateur n’est pas bloqué du groupe."
 
 #. TRANS: Server error displayed when unblocking a user from a group fails because of an unknown error.
+#. TRANS: Server error displayed when removing a user block.
 #: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "Erreur lors de l’annulation du blocage."
 
 #. TRANS: Title for Instant Messaging settings.
-#: actions/imsettings.php:58
+#: actions/imsettings.php:56
 msgid "IM settings"
 msgstr "Paramètres de messagerie instantanée"
 
 #. 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.
-#: actions/imsettings.php:71
+#: actions/imsettings.php:69
 #, fuzzy, php-format
 msgid ""
-"You can send and receive notices through Jabber/Google Talk [instant "
-"messages](%%doc.im%%). Configure your address and settings below."
+"You can send and receive notices through instant messaging [instant messages]"
+"(%%doc.im%%). Configure your addresses and settings below."
 msgstr ""
 "Vous pouvez envoyer et recevoir des messages via [la messagerie instantanée]"
 "(%%doc.im%%) Jabber/GTalk. Configurez votre adresse et vos paramètres ci-"
 "dessous."
 
-#. TRANS: Message given in the Instant Messaging settings if XMPP is not enabled on the site.
+#. TRANS: Message given in the IM settings if IM is not enabled on the site.
 #: actions/imsettings.php:90
 msgid "IM is not available."
 msgstr "La messagerie instantanée n’est pas disponible."
 
-#. TRANS: Form legend for Instant Messaging settings form.
-#. TRANS: Field label for Instant Messaging address input in Instant Messaging settings form.
-#: actions/imsettings.php:102 actions/imsettings.php:132
-msgid "IM address"
-msgstr "Adresse de messagerie instantanée"
+#: actions/imsettings.php:116
+#, fuzzy, php-format
+msgid "Current confirmed %s address."
+msgstr "Adresse courriel actuellement confirmée."
 
-#: actions/imsettings.php:109
-#, fuzzy
-msgid "Current confirmed Jabber/Google Talk address."
-msgstr "Adresse Jabber/GTalk actuellement confirmée."
-
-#. TRANS: Form note in Instant Messaging settings form.
-#. TRANS: %s is the Instant Messaging address set for the site.
-#: actions/imsettings.php:120
+#. TRANS: Form note in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:128
 #, fuzzy, php-format
 msgid ""
-"Awaiting confirmation on this address. Check your Jabber/Google Talk account "
-"for a message with further instructions. (Did you add %s to your buddy list?)"
+"Awaiting confirmation on this address. Check your %s account for a message "
+"with further instructions. (Did you add %s to your buddy list?)"
 msgstr ""
 "En attente d’une confirmation pour cette adresse. Vérifiez votre compte "
 "Jabber/GTalk pour recevoir de nouvelles instructions. (Avez-vous ajouté %s à "
 "votre liste de contacts ?)"
 
-#. TRANS: IM address input field instructions in Instant Messaging settings form.
-#. TRANS: %s is the Instant Messaging address set for the site.
-#. TRANS: Do not translate "example.org". It is one of the domain names reserved for use in examples by
-#. TRANS: http://www.rfc-editor.org/rfc/rfc2606.txt. Any other domain may be owned by a legitimate
-#. TRANS: person or organization.
-#: actions/imsettings.php:139
-#, fuzzy, php-format
-msgid ""
-"Jabber or Google Talk address, like \"UserName@example.org\". First, make "
-"sure to add %s to your buddy list in your IM client or on Google Talk."
-msgstr ""
-"Adresse Jabber ou GTalk (ex : nom@exemple.org). Assurez-vous d’ajouter %s à "
-"votre liste d’amis dans votre logiciel de messagerie instantanée ou dans "
-"GTalk."
+#: actions/imsettings.php:140
+msgid "IM address"
+msgstr "Adresse de messagerie instantanée"
 
-#. TRANS: Form legend for Instant Messaging preferences form.
-#: actions/imsettings.php:154
-msgid "IM preferences"
+#: actions/imsettings.php:142
+#, php-format
+msgid "%s screenname."
+msgstr ""
+
+#. TRANS: Header for IM preferences form.
+#: actions/imsettings.php:163
+#, fuzzy
+msgid "IM Preferences"
 msgstr "Préférences de messagerie instantanée"
 
-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:159
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:174
 #, fuzzy
-msgid "Send me notices through Jabber/Google Talk."
-msgstr "Envoyez-moi les avis par Jabber/GTalk."
+msgid "Send me notices"
+msgstr "Envoyer un avis"
 
-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:165
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:176
 #, fuzzy
-msgid "Post a notice when my Jabber/Google Talk status changes."
+msgid "Post a notice when my status changes."
 msgstr ""
 "Poster un avis chaque fois que mon statut est modifié dans Jabber/GTalk"
 
-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:171
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:178
 #, fuzzy
-msgid ""
-"Send me replies through Jabber/Google Talk from people I'm not subscribed to."
+msgid "Send me replies from people I'm not subscribed to."
 msgstr ""
 "Envoyez-moi par Jabber/GTalk les réponses des personnes auxquelles je ne "
 "suis pas abonné."
 
-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:178
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:181
 #, fuzzy
-msgid "Publish a MicroID for my Jabber/Google Talk address."
-msgstr "Publier un MicroID pour mon adresse Jabber/GTalk."
+msgid "Publish a MicroID"
+msgstr "Publier un MicroID pour mon adresse courriel."
 
-#. TRANS: Confirmation message for successful Instant Messaging preferences save.
-#: actions/imsettings.php:283 actions/othersettings.php:192
+#. TRANS: Server error thrown on database error updating IM preferences.
+#: actions/imsettings.php:291
+#, fuzzy
+msgid "Couldn't update IM preferences."
+msgstr "Impossible de mettre à jour l’utilisateur."
+
+#. TRANS: Confirmation message for successful IM preferences save.
+#. TRANS: Confirmation message after saving preferences.
+#: actions/imsettings.php:298 actions/urlsettings.php:244
 msgid "Preferences saved."
 msgstr "Préférences enregistrées"
 
-#. TRANS: Message given saving Instant Messaging address without having provided one.
-#: actions/imsettings.php:304
-msgid "No Jabber ID."
-msgstr "Aucun identifiant Jabber"
-
-#. TRANS: Message given saving Instant Messaging address that cannot be normalised.
-#: actions/imsettings.php:312
+#. TRANS: Message given saving IM address without having provided one.
+#: actions/imsettings.php:320
 #, fuzzy
-msgid "Cannot normalize that Jabber ID."
+msgid "No screenname."
+msgstr "Aucun pseudo."
+
+#: actions/imsettings.php:325
+#, fuzzy
+msgid "No transport."
+msgstr "Aucun avis."
+
+#. TRANS: Message given saving IM address that cannot be normalised.
+#: actions/imsettings.php:333
+#, fuzzy
+msgid "Cannot normalize that screenname"
 msgstr "Impossible d’utiliser cet identifiant Jabber"
 
-#. TRANS: Message given saving Instant Messaging address that not valid.
-#: actions/imsettings.php:317
+#. TRANS: Message given saving IM address that not valid.
+#: actions/imsettings.php:340
 #, fuzzy
-msgid "Not a valid Jabber ID."
-msgstr "Identifiant Jabber invalide."
+msgid "Not a valid screenname"
+msgstr "Pseudo invalide."
 
-#. TRANS: Message given saving Instant Messaging address that is already set.
-#: actions/imsettings.php:321
-msgid "That is already your Jabber ID."
-msgstr "Vous utilisez déjà cet idenfiant Jabber."
-
-#. TRANS: Message given saving Instant Messaging address that is already set for another user.
-#: actions/imsettings.php:325
-msgid "Jabber ID already belongs to another user."
+#. TRANS: Message given saving IM address that is already set for another user.
+#: actions/imsettings.php:344
+#, fuzzy
+msgid "Screenname already belongs to another user."
 msgstr "Identifiant Jabber déjà utilisé par un autre utilisateur."
 
-#. TRANS: Message given saving valid Instant Messaging address that is to be confirmed.
-#. TRANS: %s is the Instant Messaging address set for the site.
-#: actions/imsettings.php:353
-#, php-format
-msgid ""
-"A confirmation code was sent to the IM address you added. You must approve %"
-"s for sending messages to you."
+#. TRANS: Message given saving valid IM address that is to be confirmed.
+#: actions/imsettings.php:369
+#, fuzzy
+msgid "A confirmation code was sent to the IM address you added."
 msgstr ""
 "Un code de confirmation a été envoyé à votre adresse de messagerie "
 "instantanée. Vous devez approuver %s pour recevoir des messages."
 
-#. TRANS: Message given canceling Instant Messaging address confirmation for the wrong IM address.
-#: actions/imsettings.php:382
+#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#: actions/imsettings.php:396
 msgid "That is the wrong IM address."
 msgstr "Cette adresse de messagerie instantanée est erronée."
 
-#. TRANS: Server error thrown on database error canceling Instant Messaging address confirmation.
-#: actions/imsettings.php:391
+#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#: actions/imsettings.php:405
 #, fuzzy
-msgid "Could not delete IM confirmation."
+msgid "Couldn't delete confirmation."
 msgstr "Impossible de supprimer la confirmation de messagerie instantanée."
 
-#. TRANS: Message given after successfully canceling Instant Messaging address confirmation.
-#: actions/imsettings.php:396
+#. TRANS: Message given after successfully canceling IM address confirmation.
+#: actions/imsettings.php:410
 msgid "IM confirmation cancelled."
 msgstr "Confirmation de messagerie instantanée annulée."
 
-#. TRANS: Message given trying to remove an Instant Messaging address that is not
+#. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.
-#: actions/imsettings.php:417
-msgid "That is not your Jabber ID."
-msgstr "Ceci n’est pas votre identifiant Jabber."
+#: actions/imsettings.php:434
+#, fuzzy
+msgid "That is not your screenname."
+msgstr "Ceci n’est pas votre numéro de téléphone."
+
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#: actions/imsettings.php:443
+#, fuzzy
+msgid "Couldn't update user im prefs."
+msgstr "Impossible de mettre à jour le dossier de l’utilisateur."
 
 #. TRANS: Message given after successfully removing a registered Instant Messaging address.
-#: actions/imsettings.php:440
+#: actions/imsettings.php:451
 msgid "The IM address was removed."
 msgstr "L’adresse de messagerie instantanée a été supprimée."
 
@@ -3568,7 +3624,7 @@ msgid "You must be logged in to join a group."
 msgstr "Vous devez ouvrir une session pour rejoindre un groupe."
 
 #. TRANS: Title for join group page after joining.
-#: actions/joingroup.php:147
+#: actions/joingroup.php:148
 #, fuzzy, php-format
 msgctxt "TITLE"
 msgid "%1$s joined group %2$s"
@@ -3697,7 +3753,7 @@ msgstr "URL d’une image à afficher avec la licence."
 #. TRANS: Submit button title.
 #: actions/licenseadminpanel.php:311 actions/sessionsadminpanel.php:199
 #: actions/siteadminpanel.php:292 actions/snapshotadminpanel.php:245
-#: actions/tagother.php:154 lib/applicationeditform.php:357
+#: actions/tagother.php:133 lib/applicationeditform.php:357
 msgid "Save"
 msgstr "Enregistrer"
 
@@ -3705,43 +3761,45 @@ msgstr "Enregistrer"
 msgid "Save license settings"
 msgstr "Enregistrer les paramètres de licence"
 
-#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
+#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
+#: actions/login.php:97 actions/otp.php:62 actions/register.php:130
 msgid "Already logged in."
 msgstr "Déjà connecté."
 
-#: actions/login.php:148
+#: actions/login.php:125
 msgid "Incorrect username or password."
 msgstr "Identifiant ou mot de passe incorrect."
 
-#: actions/login.php:154 actions/otp.php:120
+#. TRANS: Server error displayed when a user object could not be created trying to login using "one time password login".
+#: actions/login.php:131 actions/otp.php:127
 msgid "Error setting user. You are probably not authorized."
 msgstr ""
 "Erreur lors de la mise en place de l’utilisateur. Vous n’y êtes probablement "
 "pas autorisé."
 
-#: actions/login.php:210 actions/login.php:263
+#: actions/login.php:185 actions/login.php:236 lib/action.php:598
 msgid "Login"
 msgstr "Ouvrir une session"
 
-#: actions/login.php:249
+#: actions/login.php:222
 msgid "Login to site"
 msgstr "Ouverture de session"
 
-#: actions/login.php:258 actions/register.php:490
+#: actions/login.php:231 actions/register.php:469
 msgid "Remember me"
 msgstr "Se souvenir de moi"
 
-#: actions/login.php:259 actions/register.php:492
+#: actions/login.php:232 actions/register.php:471
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 "Ouvrir automatiquement ma session à l’avenir (déconseillé pour les "
 "ordinateurs publics ou partagés)"
 
-#: actions/login.php:269
+#: actions/login.php:241
 msgid "Lost or forgotten password?"
 msgstr "Mot de passe perdu ?"
 
-#: actions/login.php:288
+#: actions/login.php:259
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -3749,11 +3807,11 @@ msgstr ""
 "Pour des raisons de sécurité, veuillez entrer à nouveau votre identifiant et "
 "votre mot de passe afin d’enregistrer vos préférences."
 
-#: actions/login.php:292
+#: actions/login.php:263
 msgid "Login with your username and password."
 msgstr "Ouvrez une session avec un identifiant et un mot de passe."
 
-#: actions/login.php:295
+#: actions/login.php:266
 #, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -3884,7 +3942,9 @@ msgstr "Nouvel avis"
 msgid "Notice posted"
 msgstr "Avis publié"
 
-#: actions/noticesearch.php:68
+#. TRANS: Instructions for Notice search page.
+#. TRANS: %%site.name%% is the name of the StatusNet site.
+#: actions/noticesearch.php:69
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -3893,16 +3953,21 @@ msgstr ""
 "Recherchez les avis %%site.name%% par leur contenu. Séparez les termes de "
 "recherche par des espaces. Ils doivent contenir au moins 3 caractères."
 
-#: actions/noticesearch.php:78
+#. TRANS: Title of the page where users can search for notices.
+#: actions/noticesearch.php:80
 msgid "Text search"
 msgstr "Recherche de texte"
 
-#: actions/noticesearch.php:91
+#. TRANS: Test in RSS notice search.
+#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
+#: actions/noticesearch.php:95
 #, php-format
 msgid "Search results for \"%1$s\" on %2$s"
 msgstr "Résultats de la recherche pour « %1$s » sur %2$s"
 
-#: actions/noticesearch.php:121
+#. TRANS: Text for logged in users making a query for notices without results.
+#. TRANS: This message contains a Markdown link.
+#: actions/noticesearch.php:128
 #, php-format
 msgid ""
 "Be the first to [post on this topic](%%%%action.newnotice%%%%?"
@@ -3911,7 +3976,9 @@ msgstr ""
 "Soyez le premier à [poster sur ce sujet](%%%%action.newnotice%%%%?"
 "status_textarea=%s) !"
 
-#: actions/noticesearch.php:124
+#. TRANS: Text for not logged in users making a query for notices without results.
+#. TRANS: This message contains Markdown links.
+#: actions/noticesearch.php:133
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and be the first to "
@@ -3921,14 +3988,17 @@ msgstr ""
 "premier à [poster sur ce sujet](%%%%action.newnotice%%%%?status_textarea=%"
 "s) !"
 
-#: actions/noticesearchrss.php:96
+#. TRANS: RSS notice search feed title. %s is the query.
+#: actions/noticesearchrss.php:95
 #, php-format
 msgid "Updates with \"%s\""
 msgstr "Mises à jour avec « %s »"
 
-#: actions/noticesearchrss.php:98
+#. TRANS: RSS notice search feed description.
+#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
+#: actions/noticesearchrss.php:99
 #, fuzzy, php-format
-msgid "Updates matching search term \"%1$s\" on %2$s!"
+msgid "Updates matching search term \"%1$s\" on %2$s."
 msgstr "mises à jour correspondant au(x) terme(s) « %1$s » sur %2$s !"
 
 #: actions/nudge.php:85
@@ -3948,52 +4018,52 @@ msgid "Nudge sent!"
 msgstr "Clin d’œil envoyé !"
 
 #. TRANS: Message displayed to an anonymous user trying to view OAuth application list.
-#: actions/oauthappssettings.php:60
+#: actions/oauthappssettings.php:57
 msgid "You must be logged in to list your applications."
 msgstr "Vous devez être connecté pour lister vos applications."
 
 #. TRANS: Page title for OAuth applications
-#: actions/oauthappssettings.php:76
+#: actions/oauthappssettings.php:73
 msgid "OAuth applications"
 msgstr "Applications OAuth"
 
 #. TRANS: Page instructions for OAuth applications
-#: actions/oauthappssettings.php:88
+#: actions/oauthappssettings.php:85
 msgid "Applications you have registered"
 msgstr "Applications que vous avez enregistré"
 
 #. TRANS: Empty list message on page with OAuth applications.
-#: actions/oauthappssettings.php:141
+#: actions/oauthappssettings.php:138
 #, php-format
 msgid "You have not registered any applications yet."
 msgstr "Vous n’avez encore enregistré aucune application."
 
 #. TRANS: Title for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:71
+#: actions/oauthconnectionssettings.php:69
 msgid "Connected applications"
 msgstr "Applications connectées."
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:83
+#: actions/oauthconnectionssettings.php:80
 msgid "The following connections exist for your account."
 msgstr ""
 "Vous avez autorisé les applications suivantes à se connecter à votre compte."
 
 #. TRANS: Client error when trying to revoke access for an application while not being a user of it.
-#: actions/oauthconnectionssettings.php:168
+#: actions/oauthconnectionssettings.php:165
 msgid "You are not a user of that application."
 msgstr "Vous n’êtes pas un utilisateur de cette application."
 
 #. TRANS: Client error when revoking access has failed for some reason.
 #. TRANS: %s is the application ID revoking access failed for.
-#: actions/oauthconnectionssettings.php:183
+#: actions/oauthconnectionssettings.php:180
 #, php-format
 msgid "Unable to revoke access for application: %s."
 msgstr "Impossible de révoquer l’accès par l’application : %s."
 
 #. TRANS: Success message after revoking access for an application.
 #. TRANS: %1$s is the application name, %2$s is the first part of the user token.
-#: actions/oauthconnectionssettings.php:202
+#: actions/oauthconnectionssettings.php:199
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -4003,14 +4073,14 @@ msgstr ""
 "jeton personnel d’accès commençant par %2$s."
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:213
+#: actions/oauthconnectionssettings.php:210
 msgid "You have not authorized any applications to use your account."
 msgstr "Vous n’avez autorisé aucune application à utiliser votre compte."
 
 #. TRANS: Note for developers in the OAuth connection settings form.
 #. TRANS: This message contains a Markdown link. Do not separate "](".
 #. TRANS: %s is the URL to the OAuth settings.
-#: actions/oauthconnectionssettings.php:233
+#: actions/oauthconnectionssettings.php:230
 #, php-format
 msgid ""
 "Are you a developer? [Register an OAuth client application](%s) to use with "
@@ -4019,6 +4089,16 @@ msgstr ""
 "Êtes-vous un développeur ? [Inscrivez une application cliente OAuth](%s) à "
 "utiliser avec cette instance de StatusNet."
 
+#: actions/oembed.php:64
+#, fuzzy, php-format
+msgid "\"%s\" not found."
+msgstr "Page non trouvée."
+
+#: actions/oembed.php:76
+#, fuzzy, php-format
+msgid "Notice %s not found."
+msgstr "L’avis parent correspondant à cette réponse n’a pas été trouvé."
+
 #: actions/oembed.php:80 actions/shownotice.php:100
 msgid "Notice has no profile."
 msgstr "L’avis n’a pas de profil."
@@ -4028,6 +4108,16 @@ msgstr "L’avis n’a pas de profil."
 msgid "%1$s's status on %2$s"
 msgstr "Statut de %1$s sur %2$s"
 
+#: actions/oembed.php:95
+#, fuzzy, php-format
+msgid "Attachment %s not found."
+msgstr "Destinataire non trouvé."
+
+#: actions/oembed.php:136
+#, php-format
+msgid "\"%s\" not supported for oembed requests."
+msgstr ""
+
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
 #: actions/oembed.php:168
 #, php-format
@@ -4041,93 +4131,60 @@ msgid "Only %s URLs over plain HTTP please."
 msgstr "Veuillez n'utiliser que des URL HTTP complètes en %s."
 
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1205
-#: lib/apiaction.php:1232 lib/apiaction.php:1367
+#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1207
+#: lib/apiaction.php:1234 lib/apiaction.php:1369
 msgid "Not a supported data format."
 msgstr "Format de données non supporté."
 
+#. TRANS: ShortName in the OpenSearch interface when trying to find users.
 #: actions/opensearch.php:64
 msgid "People Search"
 msgstr "Recherche de personnes"
 
-#: actions/opensearch.php:67
+#: actions/opensearch.php:68
 msgid "Notice Search"
 msgstr "Recherche d’avis"
 
-#: actions/othersettings.php:59
-msgid "Other settings"
-msgstr "Autres paramètres"
-
-#. TRANS: Instructions for tab "Other" in user profile settings.
-#: actions/othersettings.php:71
-msgid "Manage various other options."
-msgstr "Autres options à configurer"
-
-#. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
-#. TRANS: user's profile settings. Use of "free" is as in "open", indicating that the
-#. TRANS: information on the shortener site is freely distributable.
-#. TRANS: This message has one space at the beginning. Use your language's word separator
-#. TRANS: here if it has one (most likely a single space).
-#: actions/othersettings.php:113
-msgid " (free service)"
-msgstr " (service libre)"
-
-#. TRANS: Label for dropdown with URL shortener services.
-#: actions/othersettings.php:122
-msgid "Shorten URLs with"
-msgstr "Raccourcir les URL avec"
-
-#. TRANS: Tooltip for for dropdown with URL shortener services.
-#: actions/othersettings.php:124
-msgid "Automatic shortening service to use."
-msgstr "Sélectionnez un service de réduction d’URL."
-
-#. TRANS: Label for checkbox.
-#: actions/othersettings.php:130
-msgid "View profile designs"
-msgstr "Afficher les conceptions de profils"
-
-#. TRANS: Tooltip for checkbox.
-#: actions/othersettings.php:132
-msgid "Show or hide profile designs."
-msgstr "Afficher ou masquer les paramètres de conception."
-
-#. TRANS: Form validation error for form "Other settings" in user profile.
-#: actions/othersettings.php:164
-msgid "URL shortening service is too long (maximum 50 characters)."
-msgstr "Le service de réduction d’URL est trop long (50 caractères maximum)."
-
-#: actions/otp.php:69
+#. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
+#: actions/otp.php:70
 msgid "No user ID specified."
 msgstr "Aucun identifiant d’utilisateur n’a été spécifié."
 
-#: actions/otp.php:83
+#. TRANS: Client error displayed trying to use "one time password login" without specifying a login token.
+#: actions/otp.php:86
 msgid "No login token specified."
 msgstr "Aucun jeton d’identification n’a été spécifié."
 
-#: actions/otp.php:90
+#. TRANS: Client error displayed trying to use "one time password login" without requesting a login token.
+#: actions/otp.php:94
 msgid "No login token requested."
 msgstr "Aucun jeton d’identification n’a été demandé."
 
-#: actions/otp.php:95
+#. TRANS: Client error displayed trying to use "one time password login" while specifying an invalid login token.
+#: actions/otp.php:100
 msgid "Invalid login token specified."
 msgstr "Jeton d’identification invalide."
 
-#: actions/otp.php:104
+#. TRANS: Client error displayed trying to use "one time password login" while specifying an expired login token.
+#: actions/otp.php:110
 msgid "Login token expired."
 msgstr "Jeton d’identification périmé."
 
-#: actions/outbox.php:58
+#. TRANS: Title for outbox for any but the fist page.
+#. TRANS: %1$s is the user nickname, %2$d is the page number.
+#: actions/outbox.php:57
 #, php-format
 msgid "Outbox for %1$s - page %2$d"
 msgstr "Boîte d’envoi de %1$s - page %2$d"
 
+#. TRANS: Title for first page of outbox.
 #: actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
 msgstr "Boîte d’envoi de %s"
 
-#: actions/outbox.php:104
+#. TRANS: Instructions for outbox.
+#: actions/outbox.php:103
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr ""
 "Cette boîte d’envoi regroupe les messages personnels que vous avez envoyés."
@@ -4154,43 +4211,45 @@ msgstr "Ancien mot de passe"
 msgid "New password"
 msgstr "Nouveau mot de passe"
 
-#: actions/passwordsettings.php:109
+#: actions/passwordsettings.php:109 actions/register.php:416
 #, fuzzy
-msgid "6 or more characters"
+msgid "6 or more characters."
 msgstr "6 caractères ou plus"
 
-#: actions/passwordsettings.php:113
+#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#: actions/passwordsettings.php:113 actions/recoverpassword.php:264
+#: actions/register.php:420
 #, fuzzy
-msgid "Same as password above"
+msgid "Same as password above."
 msgstr "Identique au mot de passe ci-dessus"
 
 #: actions/passwordsettings.php:117
 msgid "Change"
 msgstr "Modifier"
 
-#: actions/passwordsettings.php:154 actions/register.php:238
+#: actions/passwordsettings.php:153 actions/register.php:223
 msgid "Password must be 6 or more characters."
 msgstr "Votre mot de passe doit contenir au moins 6 caractères."
 
-#: actions/passwordsettings.php:157 actions/register.php:241
+#: actions/passwordsettings.php:156 actions/register.php:226
 msgid "Passwords don't match."
 msgstr "Les mots de passe ne correspondent pas."
 
-#: actions/passwordsettings.php:165
+#: actions/passwordsettings.php:164
 msgid "Incorrect old password"
 msgstr "Ancien mot de passe incorrect"
 
-#: actions/passwordsettings.php:181
+#: actions/passwordsettings.php:180
 msgid "Error saving user; invalid."
 msgstr "Erreur lors de l’enregistrement de l’utilisateur ; invalide."
 
-#: actions/passwordsettings.php:186
+#. TRANS: Reset password form validation error message.
+#: actions/passwordsettings.php:185 actions/recoverpassword.php:418
 #, fuzzy
-msgid "Can't save new password."
+msgid "Cannot save new password."
 msgstr "Impossible de sauvegarder le nouveau mot de passe."
 
-#. TRANS: Title for password recovery page in password saved mode.
-#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
+#: actions/passwordsettings.php:191
 msgid "Password saved."
 msgstr "Mot de passe enregistré."
 
@@ -4395,8 +4454,7 @@ msgid "Directory where backgrounds are located."
 msgstr "Le répertoire où les fonds d’écran sont stockés."
 
 #. TRANS: Fieldset legens in Paths admin panel.
-#. TRANS: DT element label in attachment list.
-#: actions/pathsadminpanel.php:419 lib/attachmentlist.php:98
+#: actions/pathsadminpanel.php:419
 msgid "Attachments"
 msgstr "Pièces jointes"
 
@@ -4464,7 +4522,9 @@ msgstr "Serveur vers lequel diriger les requêtes SSL."
 msgid "Save paths"
 msgstr "Enregistrer les chemins."
 
-#: actions/peoplesearch.php:52
+#. TRANS: Instructions for the "People search" page.
+#. TRANS: %%site.name%% is the name of the StatusNet site.
+#: actions/peoplesearch.php:54
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
@@ -4474,7 +4534,8 @@ msgstr ""
 "ou leurs intérêts. Séparez les termes de recherche par des espaces. Ils "
 "doivent contenir au moins 3 caractères."
 
-#: actions/peoplesearch.php:58
+#. TRANS: Title of a page where users can search for other users.
+#: actions/peoplesearch.php:61
 msgid "People search"
 msgstr "Recherche de personnes"
 
@@ -4488,6 +4549,60 @@ msgstr "Cette marque est invalide : %s."
 msgid "Users self-tagged with %1$s - page %2$d"
 msgstr "Utilisateurs marqués par eux-mêmes avec %1$s - page %2$d"
 
+#. TRANS: Page title for AJAX form return when a disabling a plugin.
+#: actions/plugindisable.php:69
+msgctxt "plugin"
+msgid "Disabled"
+msgstr ""
+
+#. TRANS: Client error displayed trying to perform any request method other than POST.
+#. TRANS: Do not translate POST.
+#: actions/pluginenable.php:78 actions/subscribe.php:77
+msgid "This action only accepts POST requests."
+msgstr "Cette action n'accepte que les requêtes de type POST."
+
+#: actions/pluginenable.php:102
+#, fuzzy
+msgid "You cannot administer plugins."
+msgstr "Vous ne pouvez pas supprimer des utilisateurs."
+
+#: actions/pluginenable.php:109
+#, fuzzy
+msgid "No such plugin."
+msgstr "Page non trouvée."
+
+#. TRANS: Page title for AJAX form return when enabling a plugin.
+#: actions/pluginenable.php:159
+msgctxt "plugin"
+msgid "Enabled"
+msgstr ""
+
+#. TRANS: Tab and title for plugins admin panel.
+#. TRANS: Menu item for site administration
+#: actions/pluginsadminpanel.php:56 actions/version.php:191
+#: lib/adminpanelaction.php:411
+msgid "Plugins"
+msgstr "Extensions"
+
+#. TRANS: Instructions at top of plugin admin page.
+#: actions/pluginsadminpanel.php:68
+msgid ""
+"Additional plugins can be enabled and configured manually. See the <a href="
+"\"http://status.net/wiki/Plugins\">online plugin documentation</a> for more "
+"details."
+msgstr ""
+
+#. TRANS: Admin form section header
+#: actions/pluginsadminpanel.php:84
+#, fuzzy
+msgid "Default plugins"
+msgstr "Langue par défaut"
+
+#: actions/pluginsadminpanel.php:106
+msgid ""
+"All default plugins have been disabled from the site's configuration file."
+msgstr ""
+
 #: actions/postnotice.php:95
 msgid "Invalid notice content."
 msgstr "Contenu de l’avis invalide."
@@ -4500,12 +4615,12 @@ msgstr ""
 "$s »."
 
 #. TRANS: Page title for profile settings.
-#: actions/profilesettings.php:59
+#: actions/profilesettings.php:60
 msgid "Profile settings"
 msgstr "Paramètres du profil"
 
 #. TRANS: Usage instructions for profile settings.
-#: actions/profilesettings.php:70
+#: actions/profilesettings.php:71
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
@@ -4513,33 +4628,30 @@ msgstr ""
 "sache plus à votre sujet."
 
 #. TRANS: Profile settings form legend.
-#: actions/profilesettings.php:98
+#: actions/profilesettings.php:99
 msgid "Profile information"
 msgstr "Information de profil"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109 actions/register.php:433
+#: actions/profilesettings.php:110 actions/register.php:412
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr "1 à 64 lettres minuscules ou chiffres, sans ponctuation ni espaces."
 
 #. TRANS: Field label in form for profile settings.
-#. TRANS: Label for full group name (dt). Text hidden by default.
-#. TRANS: DT for full name in a profile.
-#: actions/profilesettings.php:113 actions/register.php:455
-#: actions/showgroup.php:255 actions/tagother.php:104
-#: lib/groupeditform.php:150 lib/userprofile.php:156
+#: actions/profilesettings.php:114 actions/register.php:434
+#: lib/groupeditform.php:150
 msgid "Full name"
 msgstr "Nom complet"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:118 actions/register.php:460
+#: actions/profilesettings.php:119 actions/register.php:439
 #: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "Site personnel"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:121
+#: actions/profilesettings.php:122 actions/register.php:441
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr ""
 "Adresse URL de votre page personnelle, blogue ou profil sur un autre site."
@@ -4547,7 +4659,7 @@ msgstr ""
 #. TRANS: Tooltip for field label in form for profile settings. Plural
 #. TRANS: is decided by the number of characters available for the
 #. TRANS: biography (%d).
-#: actions/profilesettings.php:129 actions/register.php:471
+#: actions/profilesettings.php:130 actions/register.php:450
 #, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4555,79 +4667,75 @@ msgstr[0] "Décrivez-vous avec vos intérêts en %d caractère"
 msgstr[1] "Décrivez-vous avec vos intérêts en %d caractères"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:135 actions/register.php:476
+#: actions/profilesettings.php:136 actions/register.php:455
 msgid "Describe yourself and your interests"
 msgstr "Décrivez vous et vos interêts"
 
 #. TRANS: Text area label in form for profile settings where users can provide.
 #. TRANS: their biography.
-#: actions/profilesettings.php:139 actions/register.php:478
+#: actions/profilesettings.php:140 actions/register.php:457
 msgid "Bio"
 msgstr "Bio"
 
 #. TRANS: Field label in form for profile settings.
-#. TRANS: Label for group location (dt). Text hidden by default.
-#. TRANS: DT for location in a profile.
-#: actions/profilesettings.php:145 actions/register.php:483
-#: actions/showgroup.php:265 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:173
-#: lib/userprofile.php:172
+#: actions/profilesettings.php:146 actions/register.php:462
+#: lib/groupeditform.php:173
 msgid "Location"
 msgstr "Emplacement"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148 actions/register.php:485
+#: actions/profilesettings.php:149
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Indiquez votre emplacement, ex.: « Ville, État (ou région), Pays »"
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:153
+#: actions/profilesettings.php:154
 msgid "Share my current location when posting notices"
 msgstr "Partager ma localisation lorsque je poste des avis"
 
 #. TRANS: Field label in form for profile settings.
-#. TRANS: DT for tags in a profile.
-#: actions/profilesettings.php:161 actions/tagother.php:149
-#: actions/tagother.php:209 lib/subscriptionlist.php:106
-#: lib/subscriptionlist.php:108 lib/userprofile.php:220
+#: actions/profilesettings.php:162 actions/tagother.php:128
+#: actions/tagother.php:188 lib/subscriptionlist.php:104
+#: lib/subscriptionlist.php:106
 msgid "Tags"
 msgstr "Balises"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:164
+#: actions/profilesettings.php:165
 #, fuzzy
 msgid ""
-"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- "
+"separated."
 msgstr ""
 "Marques pour vous-même (lettres, chiffres, -, ., et _), séparées par des "
 "virgules ou des espaces"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:169
+#: actions/profilesettings.php:170
 msgid "Language"
 msgstr "Langue"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:171
+#: actions/profilesettings.php:172
 #, fuzzy
-msgid "Preferred language"
+msgid "Preferred language."
 msgstr "Langue préférée"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:181
+#: actions/profilesettings.php:182
 msgid "Timezone"
 msgstr "Fuseau horaire"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:183
+#: actions/profilesettings.php:184
 msgid "What timezone are you normally in?"
 msgstr "Quel est votre fuseau horaire habituel ?"
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:189
+#: actions/profilesettings.php:190
 #, fuzzy
 msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)"
+"Automatically subscribe to whoever subscribes to me (best for non-humans)."
 msgstr ""
 "M’abonner automatiquement à tous ceux qui s’abonnent à moi (recommandé pour "
 "les utilisateurs non-humains)"
@@ -4635,7 +4743,7 @@ msgstr ""
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Plural form is used based on the maximum number of allowed
 #. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:258 actions/register.php:229
+#: actions/profilesettings.php:259 actions/register.php:214
 #, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4643,49 +4751,49 @@ msgstr[0] "La biographie est trop longue (limitée à %d caractère maximum)."
 msgstr[1] "La biographie est trop longue (limitée à %d caractères maximum)."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:269 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:270 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr "Aucun fuseau horaire n’a été choisi."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:277
+#: actions/profilesettings.php:278
 msgid "Language is too long (maximum 50 characters)."
 msgstr "La langue est trop longue (limitée à 50 caractères maximum)."
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:291 actions/tagother.php:178
-#, php-format
-msgid "Invalid tag: \"%s\""
+#: actions/profilesettings.php:292
+#, fuzzy, php-format
+msgid "Invalid tag: \"%s\"."
 msgstr "Marque invalide : « %s »"
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:347
+#: actions/profilesettings.php:348
 #, fuzzy
 msgid "Could not update user for autosubscribe."
 msgstr "Impossible de mettre à jour l’auto-abonnement."
 
 #. TRANS: Server error thrown when user profile location preference settings could not be updated.
-#: actions/profilesettings.php:405
+#: actions/profilesettings.php:406
 #, fuzzy
 msgid "Could not save location prefs."
 msgstr "Impossible d’enregistrer les préférences de localisation."
 
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:427 actions/tagother.php:200
+#: actions/profilesettings.php:428 actions/tagother.php:179
 msgid "Could not save tags."
 msgstr "Impossible d’enregistrer les marques."
 
 #. TRANS: Confirmation shown when user profile settings are saved.
 #. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:436 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:437 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "Préférences enregistrées."
 
 #. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
 #. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:483 actions/restoreaccount.php:60
+#: actions/profilesettings.php:484 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "Créer un compte"
@@ -4765,6 +4873,12 @@ msgstr ""
 "%%site.name%% est un service de [micro-blogging](http://fr.wikipedia.org/"
 "wiki/Microblog) basé sur le logiciel libre [StatusNet](http://status.net/)."
 
+#. TRANS: Public RSS feed description. %s is the StatusNet site name.
+#: actions/publicrss.php:106
+#, fuzzy, php-format
+msgid "%s updates from everyone."
+msgstr "%s statuts de tout le monde !"
+
 #. TRANS: Title for public tag cloud.
 #: actions/publictagcloud.php:57
 msgid "Public tag cloud"
@@ -4806,10 +4920,6 @@ msgstr ""
 "Pourquoi ne pas [créer un compte](%%action.register%%) et être le premier à "
 "en poster un !"
 
-#: actions/publictagcloud.php:146
-msgid "Tag cloud"
-msgstr "Nuage de marques"
-
 #. TRANS: Client error displayed trying to recover password while already logged in.
 #: actions/recoverpassword.php:37
 msgid "You are already logged in!"
@@ -4904,6 +5014,12 @@ msgstr "Récupérer le mot de passe"
 msgid "Password recovery requested"
 msgstr "Récupération de mot de passe demandée"
 
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/recoverpassword.php:229
+#, fuzzy
+msgid "Password saved"
+msgstr "Mot de passe enregistré."
+
 #. TRANS: Title for password recovery page when an unknown action has been specified.
 #: actions/recoverpassword.php:232
 msgid "Unknown action"
@@ -4915,15 +5031,9 @@ msgstr "Action inconnue"
 msgid "6 or more characters, and do not forget it!"
 msgstr "6 caractères ou plus, et ne l’oubliez pas !"
 
-#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
-#: actions/recoverpassword.php:264 actions/register.php:441
-#, fuzzy
-msgid "Same as password above."
-msgstr "Identique au mot de passe ci-dessus"
-
 #. TRANS: Button text for password reset form.
 #. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: actions/recoverpassword.php:268 lib/designsettings.php:264
+#: actions/recoverpassword.php:268 lib/designform.php:145
 msgctxt "BUTTON"
 msgid "Reset"
 msgstr "Réinitialiser"
@@ -4972,14 +5082,8 @@ msgstr "Le mot de passe doit contenir au moins 6 caractères."
 msgid "Password and confirmation do not match."
 msgstr "Le mot de passe et sa confirmation ne correspondent pas."
 
-#. TRANS: Reset password form validation error message.
-#: actions/recoverpassword.php:418
-#, fuzzy
-msgid "Cannot save new password."
-msgstr "Impossible de sauvegarder le nouveau mot de passe."
-
 #. TRANS: Server error displayed when something does wrong with the user object during password reset.
-#: actions/recoverpassword.php:426 actions/register.php:256
+#: actions/recoverpassword.php:426 actions/register.php:241
 msgid "Error setting user."
 msgstr "Erreur lors de la configuration de l’utilisateur."
 
@@ -4989,78 +5093,81 @@ msgid "New password successfully saved. You are now logged in."
 msgstr ""
 "Nouveau mot de passe créé avec succès. Votre session est maintenant ouverte."
 
-#: actions/register.php:92 actions/register.php:196 actions/register.php:413
+#: actions/redirecturl.php:70
+#, fuzzy
+msgid "No id parameter"
+msgstr "Aucun argument d’identifiant."
+
+#: actions/redirecturl.php:76
+#, fuzzy, php-format
+msgid "No such file \"%d\""
+msgstr "Fichier non trouvé."
+
+#: actions/register.php:80 actions/register.php:181 actions/register.php:392
 msgid "Sorry, only invited people can register."
 msgstr "Désolé ! Seules les personnes invitées peuvent s’inscrire."
 
-#: actions/register.php:99
+#: actions/register.php:87
 msgid "Sorry, invalid invitation code."
 msgstr "Désolé, code d’invitation invalide."
 
-#: actions/register.php:119
+#: actions/register.php:106
 msgid "Registration successful"
 msgstr "Compte créé avec succès"
 
-#: actions/register.php:121 actions/register.php:511
+#: actions/register.php:108 actions/register.php:490
 msgid "Register"
 msgstr "Créer un compte"
 
-#: actions/register.php:142
+#: actions/register.php:128
 msgid "Registration not allowed."
 msgstr "Inscription non autorisée."
 
-#: actions/register.php:209
+#: actions/register.php:194
 #, fuzzy
-msgid "You can't register if you don't agree to the license."
+msgid "You cannot register if you don't agree to the license."
 msgstr "Vous ne pouvez pas vous inscrire si vous n’acceptez pas la licence."
 
-#: actions/register.php:218
+#: actions/register.php:203
 msgid "Email address already exists."
 msgstr "Cette adresse courriel est déjà utilisée."
 
-#: actions/register.php:251 actions/register.php:273
+#: actions/register.php:236 actions/register.php:258
 msgid "Invalid username or password."
 msgstr "Identifiant ou mot de passe incorrect."
 
-#: actions/register.php:351
+#: actions/register.php:333
 #, fuzzy
 msgid ""
 "With this form you can create a new account. You can then post notices and "
-"link up to friends and colleagues. "
+"link up to friends and colleagues."
 msgstr ""
 "Avec ce formulaire vous pouvez créer un nouveau compte. Vous pourrez ensuite "
 "poster des avis and et vous relier à des amis et collègues. "
 
-#: actions/register.php:437
-#, fuzzy
-msgid "6 or more characters."
-msgstr "6 caractères ou plus"
-
-#. TRANS: Link description in user account settings menu.
-#: actions/register.php:445 actions/register.php:449
-#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
+#: actions/register.php:424 actions/register.php:428
+#: actions/siteadminpanel.php:238 lib/settingsnav.php:92
 msgid "Email"
 msgstr "Courriel"
 
-#: actions/register.php:446 actions/register.php:450
+#: actions/register.php:425 actions/register.php:429
 #, fuzzy
-msgid "Used only for updates, announcements, and password recovery"
+msgid "Used only for updates, announcements, and password recovery."
 msgstr ""
 "Utilisé uniquement pour les mises à jour, les notifications, et la "
 "récupération de mot de passe"
 
-#: actions/register.php:457
+#: actions/register.php:436
 #, fuzzy
-msgid "Longer name, preferably your \"real\" name"
+msgid "Longer name, preferably your \"real\" name."
 msgstr "Nom plus long, votre \"vrai\" nom de préférence"
 
-#: actions/register.php:462
+#: actions/register.php:464
 #, fuzzy
-msgid "URL of your homepage, blog, or profile on another site"
-msgstr ""
-"Adresse URL de votre page personnelle, blogue ou profil sur un autre site."
+msgid "Where you are, like \"City, State (or Region), Country\"."
+msgstr "Indiquez votre emplacement, ex.: « Ville, État (ou région), Pays »"
 
-#: actions/register.php:523
+#: actions/register.php:503
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
@@ -5068,23 +5175,23 @@ msgstr ""
 "Je comprends que le contenu et les données de %1$s sont privés et "
 "confidentiels."
 
-#: actions/register.php:533
+#: actions/register.php:513
 #, php-format
 msgid "My text and files are copyright by %1$s."
 msgstr "Mon texte et les fichiers sont protégés par copyright par %1$s."
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:537
+#: actions/register.php:517
 msgid "My text and files remain under my own copyright."
 msgstr "Mon texte et les fichiers restent sous mon propre droit d'auteur."
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:540
+#: actions/register.php:520
 msgid "All rights reserved."
 msgstr "Tous droits réservés."
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:545
+#: actions/register.php:525
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -5094,7 +5201,7 @@ msgstr ""
 "données personnelles : mot de passe, adresse électronique, adresse de "
 "messagerie instantanée, numéro de téléphone."
 
-#: actions/register.php:588
+#: actions/register.php:566
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -5128,7 +5235,7 @@ msgstr ""
 "Merci pour votre inscription ! Nous vous souhaitons d’apprécier notre "
 "service."
 
-#: actions/register.php:612
+#: actions/register.php:590
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5162,7 +5269,7 @@ msgstr "Pseudo de l’utilisateur"
 
 #: actions/remotesubscribe.php:129
 #, fuzzy
-msgid "Nickname of the user you want to follow"
+msgid "Nickname of the user you want to follow."
 msgstr "Pseudo de l’utilisateur que vous voulez suivre"
 
 #: actions/remotesubscribe.php:132
@@ -5171,18 +5278,18 @@ msgstr "URL du profil"
 
 #: actions/remotesubscribe.php:133
 #, fuzzy
-msgid "URL of your profile on another compatible microblogging service"
+msgid "URL of your profile on another compatible microblogging service."
 msgstr "URL de votre profil sur un autre service de micro-blogging compatible"
 
 #. TRANS: Link text for link that will subscribe to a remote profile.
 #: actions/remotesubscribe.php:136 lib/subscribeform.php:139
-#: lib/userprofile.php:431
+#: lib/userprofile.php:402
 msgid "Subscribe"
 msgstr "S’abonner"
 
 #: actions/remotesubscribe.php:158
 #, fuzzy
-msgid "Invalid profile URL (bad format)"
+msgid "Invalid profile URL (bad format)."
 msgstr "URL du profil invalide (mauvais format)"
 
 #: actions/remotesubscribe.php:167
@@ -5217,7 +5324,7 @@ msgstr "Vous ne pouvez pas reprendre votre propre avis."
 msgid "You already repeated that notice."
 msgstr "Vous avez déjà repris cet avis."
 
-#: actions/repeat.php:112 lib/noticelist.php:692
+#: actions/repeat.php:112 lib/noticelist.php:697
 msgid "Repeated"
 msgstr "Repris"
 
@@ -5225,9 +5332,9 @@ msgstr "Repris"
 msgid "Repeated!"
 msgstr "Repris !"
 
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing @-replies.
+#. TRANS: RSS reply feed title. %s is a user nickname.
 #: actions/replies.php:126 actions/repliesrss.php:68
-#: lib/personalgroupnav.php:109
+#: lib/personalgroupnav.php:105
 #, php-format
 msgid "Replies to %s"
 msgstr "Réponses à %s"
@@ -5281,9 +5388,11 @@ msgstr ""
 "quelque chose à son intention](%%%%action.newnotice%%%%?status_textarea=%3"
 "$s)."
 
-#: actions/repliesrss.php:72
+#. TRANS: RSS reply feed description.
+#. TRANS: %1$s is a user nickname, %2$s is the StatusNet site name.
+#: actions/repliesrss.php:74
 #, fuzzy, php-format
-msgid "Replies to %1$s on %2$s!"
+msgid "Replies to %1$s on %2$s."
 msgstr "Réponses à %1$s sur %2$s !"
 
 #. TRANS: Client exception displayed when trying to restore an account while not logged in.
@@ -5385,7 +5494,7 @@ msgstr "Vous ne pouvez pas révoquer les rôles des utilisateurs sur ce site."
 msgid "User doesn't have this role."
 msgstr "L'utilisateur ne possède pas ce rôle."
 
-#: actions/rsd.php:146 actions/version.php:159
+#: actions/rsd.php:142 actions/version.php:159
 msgid "StatusNet"
 msgstr "StatusNet"
 
@@ -5428,87 +5537,38 @@ msgstr "Activer la sortie de déboguage pour les sessions."
 msgid "Save site settings"
 msgstr "Sauvegarder les paramètres du site"
 
-#: actions/showapplication.php:82
+#: actions/showapplication.php:78
 msgid "You must be logged in to view an application."
 msgstr "Vous devez être connecté pour voir une application."
 
-#: actions/showapplication.php:157
+#: actions/showapplication.php:151
 msgid "Application profile"
 msgstr "Profil de l’application"
 
-#. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:159 lib/applicationeditform.php:177
-msgid "Icon"
-msgstr "Icône"
-
-#. TRANS: Form input field label for application name.
-#: actions/showapplication.php:169 actions/version.php:197
-#: lib/applicationeditform.php:190
-msgid "Name"
-msgstr "Nom"
-
-#. TRANS: Form input field label.
-#: actions/showapplication.php:178 lib/applicationeditform.php:227
-msgid "Organization"
-msgstr "Organisation"
-
-#. TRANS: Form input field label.
-#: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:168
-msgid "Description"
-msgstr "Description"
-
-#. TRANS: Header for group statistics on a group page (h2).
-#. TRANS: H2 text for user statistics.
-#: actions/showapplication.php:192 actions/showgroup.php:460
-#: lib/profileaction.php:205
-msgid "Statistics"
-msgstr "Statistiques"
-
-#: actions/showapplication.php:203
+#: actions/showapplication.php:179
 #, php-format
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr "Créé par %1$s - accès %2$s par défaut - %3$d utilisateurs"
 
-#: actions/showapplication.php:213
+#: actions/showapplication.php:189
 msgid "Application actions"
 msgstr "Actions de l’application"
 
-#: actions/showapplication.php:236
+#: actions/showapplication.php:212
 msgid "Reset key & secret"
 msgstr "Réinitialiser la clé et le secret"
 
 #. TRANS: Title of form for deleting a user.
-#: actions/showapplication.php:252 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:64 lib/noticelist.php:673
+#: actions/showapplication.php:228 lib/deletegroupform.php:121
+#: lib/deleteuserform.php:64 lib/noticelist.php:678
 msgid "Delete"
 msgstr "Supprimer"
 
-#: actions/showapplication.php:261
+#: actions/showapplication.php:237
 msgid "Application info"
 msgstr "Informations sur l’application"
 
-#: actions/showapplication.php:263
-msgid "Consumer key"
-msgstr "Clé de l’utilisateur"
-
-#: actions/showapplication.php:268
-msgid "Consumer secret"
-msgstr "Secret de l’utilisateur"
-
-#: actions/showapplication.php:273
-msgid "Request token URL"
-msgstr "URL du jeton de requête"
-
-#: actions/showapplication.php:278
-msgid "Access token URL"
-msgstr "URL du jeton d’accès"
-
-#: actions/showapplication.php:283
-msgid "Authorize URL"
-msgstr "Autoriser l’URL"
-
-#: actions/showapplication.php:288
+#: actions/showapplication.php:255
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
@@ -5516,7 +5576,7 @@ msgstr ""
 "Note : Nous utilisons les signatures HMAC-SHA1. Nous n’utilisons pas la "
 "méthode de signature en texte clair."
 
-#: actions/showapplication.php:309
+#: actions/showapplication.php:275
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr "Voulez-vous vraiment réinitialiser votre clé consommateur et secrète ?"
 
@@ -5603,61 +5663,47 @@ msgstr "Groupe %s"
 msgid "%1$s group, page %2$d"
 msgstr "Groupe %1$s, page %2$d"
 
-#. TRANS: Group profile header (h2). Text hidden by default.
-#: actions/showgroup.php:223
-msgid "Group profile"
-msgstr "Profil du groupe"
-
-#. TRANS: Label for group URL (dt). Text hidden by default.
-#. TRANS: DT for URL in a profile.
-#: actions/showgroup.php:273 actions/tagother.php:118
-#: actions/userauthorization.php:175 lib/userprofile.php:186
-msgid "URL"
-msgstr "URL"
-
 #. TRANS: Label for group description or group note (dt). Text hidden by default.
-#. TRANS: DT for note in a profile.
-#: actions/showgroup.php:285 actions/tagother.php:128
-#: actions/userauthorization.php:187 lib/userprofile.php:204
+#: actions/showgroup.php:266
 msgid "Note"
 msgstr "Note"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:296 lib/groupeditform.php:180
+#: actions/showgroup.php:277 lib/groupeditform.php:180
 msgid "Aliases"
 msgstr "Alias"
 
 #. TRANS: Group actions header (h2). Text hidden by default.
-#: actions/showgroup.php:313
+#: actions/showgroup.php:294
 msgid "Group actions"
 msgstr "Actions du groupe"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:357
+#: actions/showgroup.php:338
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
 msgstr "Fil des avis du groupe %s (RSS 1.0)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:364
+#: actions/showgroup.php:345
 #, php-format
 msgid "Notice feed for %s group (RSS 2.0)"
 msgstr "Fil des avis du groupe %s (RSS 2.0)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:371
+#: actions/showgroup.php:352
 #, php-format
 msgid "Notice feed for %s group (Atom)"
 msgstr "Fil des avis du groupe %s (Atom)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:377
+#: actions/showgroup.php:358
 #, php-format
 msgid "FOAF for %s group"
 msgstr "ami d’un ami pour le groupe %s"
 
 #. TRANS: Header for mini list of group members on a group page (h2).
-#: actions/showgroup.php:414
+#: actions/showgroup.php:395
 msgid "Members"
 msgstr "Membres"
 
@@ -5665,25 +5711,30 @@ msgstr "Membres"
 #. TRANS: Text for user subscription statistics if the user has no subscriptions.
 #. TRANS: Text for user subscriber statistics if user has no subscribers.
 #. TRANS: Text for user user group membership statistics if user is not a member of any group.
-#: actions/showgroup.php:420 lib/profileaction.php:137
+#: actions/showgroup.php:401 lib/profileaction.php:137
 #: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
-#: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
+#: lib/subscriptionlist.php:123 lib/tagcloudsection.php:71
 msgid "(None)"
 msgstr "(aucun)"
 
 #. TRANS: Link to all group members from mini list of group members if group has more than n members.
-#: actions/showgroup.php:429
+#: actions/showgroup.php:410
 msgid "All members"
 msgstr "Tous les membres"
 
-#. TRANS: Label for creation date in statistics on group page.
-#: actions/showgroup.php:465
+#. TRANS: Header for group statistics on a group page (h2).
+#. TRANS: H2 text for user statistics.
+#: actions/showgroup.php:441 lib/profileaction.php:205
+msgid "Statistics"
+msgstr "Statistiques"
+
+#: actions/showgroup.php:444
 msgctxt "LABEL"
 msgid "Created"
 msgstr "Créé"
 
 #. TRANS: Label for member count in statistics on group page.
-#: actions/showgroup.php:473
+#: actions/showgroup.php:449
 msgctxt "LABEL"
 msgid "Members"
 msgstr "Membres"
@@ -5692,7 +5743,7 @@ msgstr "Membres"
 #. TRANS: **%s** is the group alias, %%%%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).
-#: actions/showgroup.php:488
+#: actions/showgroup.php:464
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5711,7 +5762,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: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
-#: actions/showgroup.php:498
+#: actions/showgroup.php:474
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5725,7 +5776,7 @@ msgstr ""
 "messages courts à propos de leur vie et leurs intérêts. "
 
 #. TRANS: Header for list of group administrators on a group page (h2).
-#: actions/showgroup.php:527
+#: actions/showgroup.php:503
 msgid "Admins"
 msgstr "Administrateurs"
 
@@ -5766,7 +5817,7 @@ msgid "%1$s tagged %2$s"
 msgstr "%1$s a marqué « %2$s »"
 
 #. TRANS: Page title showing tagged notices in one user's stream.
-#. TRANS: %1$s is the username, %2$s is the hash tag, %1$d is the page number.
+#. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
 #: actions/showstream.php:74
 #, php-format
 msgid "%1$s tagged %2$s, page %3$d"
@@ -5813,14 +5864,14 @@ msgid "FOAF for %s"
 msgstr "ami d’un ami pour %s"
 
 #. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
-#: actions/showstream.php:211
+#: actions/showstream.php:205
 #, php-format
 msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr ""
 "Ceci est la chronologie de %1$s mais %1$s n’a rien publié pour le moment."
 
 #. TRANS: Second sentence of empty list message for a stream for the user themselves.
-#: actions/showstream.php:217
+#: actions/showstream.php:211
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
@@ -5830,7 +5881,7 @@ msgstr ""
 
 #. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:221
+#: actions/showstream.php:215
 #, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
@@ -5841,7 +5892,7 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:264
+#: actions/showstream.php:258
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5857,7 +5908,7 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:271
+#: actions/showstream.php:265
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5869,7 +5920,7 @@ msgstr ""
 "status.net/). "
 
 #. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
-#: actions/showstream.php:328
+#: actions/showstream.php:322
 #, php-format
 msgid "Repeat of %s"
 msgstr "Reprises de %s"
@@ -6020,17 +6071,17 @@ msgstr ""
 #. TRANS: Title for button to save site notice in admin panel.
 #: actions/sitenoticeadminpanel.php:201
 #, fuzzy
-msgid "Save site notice"
+msgid "Save site notice."
 msgstr "Enregistrer l'avis du site"
 
 #. TRANS: Title for SMS settings.
-#: actions/smssettings.php:57
+#: actions/smssettings.php:56
 msgid "SMS settings"
 msgstr "Paramètres SMS"
 
 #. TRANS: SMS settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/smssettings.php:71
+#: actions/smssettings.php:70
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr ""
@@ -6038,60 +6089,60 @@ msgstr ""
 "name%%."
 
 #. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
-#: actions/smssettings.php:93
+#: actions/smssettings.php:92
 msgid "SMS is not available."
 msgstr "Les SMS ne sont pas disponibles."
 
 #. TRANS: Form legend for SMS settings form.
-#: actions/smssettings.php:107
+#: actions/smssettings.php:106
 msgid "SMS address"
 msgstr "Adresse SMS"
 
 #. TRANS: Form guide in SMS settings form.
-#: actions/smssettings.php:116
+#: actions/smssettings.php:115
 msgid "Current confirmed SMS-enabled phone number."
 msgstr "Numéro de téléphone actuellement confirmé pour recevoir les SMS."
 
 #. TRANS: Form guide in IM settings form.
-#: actions/smssettings.php:129
+#: actions/smssettings.php:128
 msgid "Awaiting confirmation on this phone number."
 msgstr "Numéro de téléphone en attente de confirmation."
 
 #. TRANS: Field label for SMS address input in SMS settings form.
-#: actions/smssettings.php:138
+#: actions/smssettings.php:137
 msgid "Confirmation code"
 msgstr "Code de confirmation"
 
 #. TRANS: Form field instructions in SMS settings form.
-#: actions/smssettings.php:140
+#: actions/smssettings.php:139
 msgid "Enter the code you received on your phone."
 msgstr "Entrez le code que vous avez reçu sur votre téléphone."
 
 #. TRANS: Button label to confirm SMS confirmation code in SMS settings.
-#: actions/smssettings.php:144
+#: actions/smssettings.php:143
 msgctxt "BUTTON"
 msgid "Confirm"
 msgstr "Confirmer"
 
 #. TRANS: Field label for SMS phone number input in SMS settings form.
-#: actions/smssettings.php:149
+#: actions/smssettings.php:148
 msgid "SMS phone number"
 msgstr "Numéro de téléphone pour les SMS"
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
-#: actions/smssettings.php:152
+#: actions/smssettings.php:151
 #, fuzzy
-msgid "Phone number, no punctuation or spaces, with area code"
+msgid "Phone number, no punctuation or spaces, with area code."
 msgstr ""
 "Numéro de téléphone, sans ponctuation ni espaces, incluant le code régional"
 
 #. TRANS: Form legend for SMS preferences form.
-#: actions/smssettings.php:191
+#: actions/smssettings.php:190
 msgid "SMS preferences"
 msgstr "Préférences pour les SMS"
 
 #. TRANS: Checkbox label in SMS preferences form.
-#: actions/smssettings.php:197
+#: actions/smssettings.php:196
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
@@ -6100,32 +6151,32 @@ msgstr ""
 "facture de téléphonie mobile."
 
 #. TRANS: Confirmation message for successful SMS preferences save.
-#: actions/smssettings.php:308
+#: actions/smssettings.php:307
 msgid "SMS preferences saved."
 msgstr "Préférences pour les SMS enregistrées."
 
 #. TRANS: Message given saving SMS phone number without having provided one.
-#: actions/smssettings.php:330
+#: actions/smssettings.php:329
 msgid "No phone number."
 msgstr "Aucun numéro de téléphone."
 
 #. TRANS: Message given saving SMS phone number without having selected a carrier.
-#: actions/smssettings.php:336
+#: actions/smssettings.php:335
 msgid "No carrier selected."
 msgstr "Aucun fournisseur sélectionné."
 
 #. TRANS: Message given saving SMS phone number that is already set.
-#: actions/smssettings.php:344
+#: actions/smssettings.php:343
 msgid "That is already your phone number."
 msgstr "Vous utilisez déjà ce numéro de téléphone."
 
 #. TRANS: Message given saving SMS phone number that is already set for another user.
-#: actions/smssettings.php:348
+#: actions/smssettings.php:347
 msgid "That phone number already belongs to another user."
 msgstr "Ce numéro de téléphone est déjà utilisé."
 
 #. TRANS: Message given saving valid SMS phone number that is to be confirmed.
-#: actions/smssettings.php:376
+#: actions/smssettings.php:375
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
 "for the code and instructions on how to use it."
@@ -6135,39 +6186,39 @@ msgstr ""
 "pour son utilisation."
 
 #. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
-#: actions/smssettings.php:404
+#: actions/smssettings.php:403
 msgid "That is the wrong confirmation number."
 msgstr "Ce code de confirmation est incorrect."
 
 #. TRANS: Message given after successfully canceling SMS phone number confirmation.
-#: actions/smssettings.php:418
+#: actions/smssettings.php:417
 msgid "SMS confirmation cancelled."
 msgstr "Confirmation de SMS annulée."
 
 #. TRANS: Message given trying to remove an SMS phone number that is not
 #. TRANS: registered for the active user.
-#: actions/smssettings.php:438
+#: actions/smssettings.php:437
 msgid "That is not your phone number."
 msgstr "Ceci n’est pas votre numéro de téléphone."
 
 #. TRANS: Message given after successfully removing a registered SMS phone number.
-#: actions/smssettings.php:460
+#: actions/smssettings.php:459
 msgid "The SMS phone number was removed."
 msgstr "Le numéro de téléphone pour les SMS a été retiré."
 
 #. TRANS: Label for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:499
+#: actions/smssettings.php:498
 msgid "Mobile carrier"
 msgstr "Fournisseur de téléphonie mobile"
 
 #. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:504
+#: actions/smssettings.php:503
 msgid "Select a carrier"
 msgstr "Sélectionnez un fournisseur de téléphone mobile"
 
 #. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
 #. TRANS: %s is an administrative contact's e-mail address.
-#: actions/smssettings.php:513
+#: actions/smssettings.php:512
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -6178,7 +6229,7 @@ msgstr ""
 "écrivez-nous à %s."
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
-#: actions/smssettings.php:535
+#: actions/smssettings.php:534
 #, fuzzy
 msgid "No code entered."
 msgstr "Aucun code entré"
@@ -6252,17 +6303,15 @@ msgstr "Vous n’êtes pas abonné(e) à ce profil."
 msgid "Could not save subscription."
 msgstr "Impossible d’enregistrer l’abonnement."
 
-#: actions/subscribe.php:77
-msgid "This action only accepts POST requests."
-msgstr "Cette action n'accepte que les requêtes de type POST."
-
-#: actions/subscribe.php:117
+#. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
+#: actions/subscribe.php:121
 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
 msgstr ""
 "Vous ne pouvez pas vous abonner  à un profil OMB 0.1 distant par cette "
 "action."
 
-#: actions/subscribe.php:145
+#. TRANS: Page title when subscription succeeded.
+#: actions/subscribe.php:149
 msgid "Subscribed"
 msgstr "Abonné"
 
@@ -6379,31 +6428,34 @@ msgid "Subscription feed for %s (Atom)"
 msgstr "Flux des avis de %s (Atom)"
 
 #. TRANS: Checkbox label for enabling Jabber messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:239
-msgid "Jabber"
-msgstr "Jabber"
+#: actions/subscriptions.php:241 lib/settingsnav.php:110
+#, fuzzy
+msgid "IM"
+msgstr "IM"
 
 #. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:254
+#: actions/subscriptions.php:256 lib/settingsnav.php:117
 msgid "SMS"
 msgstr "SMS"
 
-#: actions/tag.php:69
+#. TRANS: Title for all but the first page of notices with tags.
+#. TRANS: %1$s is the tag, %2$d is the page number.
+#: actions/tag.php:73
 #, php-format
 msgid "Notices tagged with %1$s, page %2$d"
 msgstr "Avis marqués avec %1$s, page %2$d"
 
-#: actions/tag.php:87
+#: actions/tag.php:91
 #, php-format
 msgid "Notice feed for tag %s (RSS 1.0)"
 msgstr "Flux des avis pour la marque %s (RSS 1.0)"
 
-#: actions/tag.php:93
+#: actions/tag.php:97
 #, php-format
 msgid "Notice feed for tag %s (RSS 2.0)"
 msgstr "Flux des avis pour la marque %s (RSS 2.0)"
 
-#: actions/tag.php:99
+#: actions/tag.php:103
 #, php-format
 msgid "Notice feed for tag %s (Atom)"
 msgstr "Flux des avis pour la marque %s (Atom)"
@@ -6422,17 +6474,11 @@ msgstr "Marque %s"
 msgid "User profile"
 msgstr "Profil de l’utilisateur"
 
-#. TRANS: DT element in area for user avatar.
-#: actions/tagother.php:81 actions/userauthorization.php:132
-#: lib/userprofile.php:108
-msgid "Photo"
-msgstr "Photo"
-
-#: actions/tagother.php:141
+#: actions/tagother.php:120
 msgid "Tag user"
 msgstr "Marquer l’utilisateur"
 
-#: actions/tagother.php:151
+#: actions/tagother.php:130
 msgid ""
 "Tags for this user (letters, numbers, -, ., and _), comma- or space- "
 "separated"
@@ -6440,14 +6486,19 @@ msgstr ""
 "Marques pour cet utilisateur (lettres, chiffres, -, ., et _), séparées par "
 "des virgules ou des espaces"
 
-#: actions/tagother.php:193
+#: actions/tagother.php:157
+#, php-format
+msgid "Invalid tag: \"%s\""
+msgstr "Marque invalide : « %s »"
+
+#: actions/tagother.php:172
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 "Vous pouvez seulement marquer les personnes auxquelles vous êtes abonné(e) "
 "ou qui sont abonnées à vous."
 
-#: actions/tagother.php:236
+#: actions/tagother.php:215
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
 "Remplissez les champs suivants pour marquer vos abonnés ou vos abonnements."
@@ -6456,6 +6507,7 @@ msgstr ""
 msgid "No such tag."
 msgstr "Cette marque n’existe pas."
 
+#. TRANS: Client error displayed when trying to unblock a non-blocked user.
 #: actions/unblock.php:59
 msgid "You haven't blocked that user."
 msgstr "Vous n’avez pas bloqué cet utilisateur."
@@ -6476,7 +6528,7 @@ msgstr "Aucun identifiant de profil dans la requête."
 msgid "Unsubscribed"
 msgstr "Désabonné"
 
-#: actions/updateprofile.php:64 actions/userauthorization.php:337
+#: actions/updateprofile.php:64
 #, php-format
 msgid ""
 "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
@@ -6484,6 +6536,77 @@ msgstr ""
 "La licence du flux auquel vous êtes abonné(e), « %1$s », n’est pas compatible "
 "avec la licence du site « %2$s »."
 
+#: actions/urlsettings.php:60
+#, fuzzy
+msgid "URL settings"
+msgstr "Paramètres de messagerie instantanée"
+
+#. TRANS: Instructions for tab "Other" in user profile settings.
+#: actions/urlsettings.php:72
+msgid "Manage various other options."
+msgstr "Autres options à configurer"
+
+#. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
+#. TRANS: user's profile settings. This message has one space at the beginning. Use your
+#. TRANS: language's word separator here if it has one (most likely a single space).
+#: actions/urlsettings.php:115
+msgid " (free service)"
+msgstr " (service libre)"
+
+#: actions/urlsettings.php:121
+#, fuzzy
+msgid "[none]"
+msgstr "Aucun"
+
+#: actions/urlsettings.php:122
+msgid "[internal]"
+msgstr ""
+
+#. TRANS: Label for dropdown with URL shortener services.
+#: actions/urlsettings.php:130
+msgid "Shorten URLs with"
+msgstr "Raccourcir les URL avec"
+
+#. TRANS: Tooltip for for dropdown with URL shortener services.
+#: actions/urlsettings.php:132
+msgid "Automatic shortening service to use."
+msgstr "Sélectionnez un service de réduction d’URL."
+
+#: actions/urlsettings.php:138
+msgid "URL longer than"
+msgstr ""
+
+#: actions/urlsettings.php:141
+msgid "URLs longer than this will be shortened, 0 means always shorten."
+msgstr ""
+
+#: actions/urlsettings.php:145
+msgid "Text longer than"
+msgstr ""
+
+#: actions/urlsettings.php:148
+msgid ""
+"URLs in notices longer than this will be shortened, 0 means always shorten."
+msgstr ""
+
+#. TRANS: Form validation error for form "Other settings" in user profile.
+#: actions/urlsettings.php:180
+msgid "URL shortening service is too long (maximum 50 characters)."
+msgstr "Le service de réduction d’URL est trop long (50 caractères maximum)."
+
+#: actions/urlsettings.php:187
+msgid "Invalid number for max url length."
+msgstr ""
+
+#: actions/urlsettings.php:193
+#, fuzzy
+msgid "Invalid number for max notice length."
+msgstr "Contenu de l’avis invalide."
+
+#: actions/urlsettings.php:238
+msgid "Error saving user URL shortening preferences."
+msgstr ""
+
 #. TRANS: User admin panel title
 #: actions/useradminpanel.php:58
 msgctxt "TITLE"
@@ -6509,11 +6632,11 @@ msgstr "Texte de bienvenue invalide. La taille maximale est de 255 caractères."
 #. TRANS: users in user admin panel. %1$s is the invalid nickname.
 #: actions/useradminpanel.php:166
 #, fuzzy, php-format
-msgid "Invalid default subscripton: '%1$s' is not a user."
+msgid "Invalid default subscripton: \"%1$s\" is not a user."
 msgstr "Abonnement par défaut invalide : « %1$s » n’est pas un utilisateur."
 
-#. TRANS: Link description in user account settings menu.
-#: actions/useradminpanel.php:215 lib/accountsettingsaction.php:106
+#: actions/useradminpanel.php:215 lib/action.php:565 lib/settingsnav.php:77
+#: lib/subgroupnav.php:81
 msgid "Profile"
 msgstr "Profil"
 
@@ -6572,59 +6695,63 @@ msgstr ""
 #. TRANS: Title for button to save user settings in user admin panel.
 #: actions/useradminpanel.php:302
 #, fuzzy
-msgid "Save user settings"
+msgid "Save user settings."
 msgstr "Sauvegarder les paramètres utilisateur"
 
-#: actions/userauthorization.php:105
+#. TRANS: Page title.
+#: actions/userauthorization.php:109
 msgid "Authorize subscription"
 msgstr "Autoriser l’abonnement"
 
-#: actions/userauthorization.php:110
+#. TRANS: Page notice on "Auhtorize subscription" page.
+#: actions/userauthorization.php:115
 #, fuzzy
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
 "user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
-"click “Reject”."
+"click \"Reject\"."
 msgstr ""
 "Veuillez vérifier ces détails pour vous assurer que vous souhaitez vous "
 "abonner aux avis de cet utilisateur. Si vous n’avez pas demandé à vous "
 "abonner aux avis de quelqu’un, cliquez « Rejeter »."
 
-#. TRANS: Menu item for site administration
-#: actions/userauthorization.php:196 actions/version.php:167
-#: lib/adminpanelaction.php:403
-msgid "License"
-msgstr "Licence"
-
-#: actions/userauthorization.php:217
+#. TRANS: Button text on Authorise Subscription page.
+#: actions/userauthorization.php:200
 #, fuzzy
+msgctxt "BUTTON"
 msgid "Accept"
 msgstr "Accepter"
 
-#: actions/userauthorization.php:218 lib/subscribeform.php:115
-#: lib/subscribeform.php:139
-msgid "Subscribe to this user"
+#. TRANS: Title for button on Authorise Subscription page.
+#: actions/userauthorization.php:202
+#, fuzzy
+msgid "Subscribe to this user."
 msgstr "S’abonner à cet utilisateur"
 
-#: actions/userauthorization.php:219
+#. TRANS: Button text on Authorise Subscription page.
+#: actions/userauthorization.php:204
 #, fuzzy
+msgctxt "BUTTON"
 msgid "Reject"
 msgstr "Refuser"
 
-#: actions/userauthorization.php:220
+#. TRANS: Title for button on Authorise Subscription page.
+#: actions/userauthorization.php:206
 #, fuzzy
-msgid "Reject this subscription"
+msgid "Reject this subscription."
 msgstr "Rejeter cet abonnement"
 
-#: actions/userauthorization.php:232
+#. TRANS: Client error displayed for an empty authorisation request.
+#: actions/userauthorization.php:219
 msgid "No authorization request!"
 msgstr "Pas de requête d’autorisation !"
 
-#: actions/userauthorization.php:254
+#. TRANS: Accept message header from Authorise subscription page.
+#: actions/userauthorization.php:242
 msgid "Subscription authorized"
 msgstr "Abonnement autorisé"
 
-#: actions/userauthorization.php:256
+#: actions/userauthorization.php:245
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to authorize the "
@@ -6634,11 +6761,12 @@ msgstr ""
 "Vérifiez les instructions du site pour savoir comment compléter "
 "l’autorisation de l’abonnement. Votre jeton d’abonnement est :"
 
-#: actions/userauthorization.php:266
+#. TRANS: Reject message header from Authorise subscription page.
+#: actions/userauthorization.php:256
 msgid "Subscription rejected"
 msgstr "Abonnement refusé"
 
-#: actions/userauthorization.php:268
+#: actions/userauthorization.php:259
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to fully reject the "
@@ -6648,49 +6776,74 @@ msgstr ""
 "Vérifiez les instructions du site pour savoir comment refuser pleinement "
 "l’abonnement."
 
-#: actions/userauthorization.php:303
+#. TRANS: Exception thrown when no valid user is found for an authorisation request.
+#. TRANS: %s is a listener URI.
+#: actions/userauthorization.php:296
 #, fuzzy, php-format
-msgid "Listener URI ‘%s’ not found here."
+msgid "Listener URI \"%s\" not found here."
 msgstr "L’URI de l’auditeur ‘%s’ n’a pas été trouvée ici."
 
-#: actions/userauthorization.php:308
+#. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
+#. TRANS: %s is a listenee URI.
+#: actions/userauthorization.php:303
 #, fuzzy, php-format
-msgid "Listenee URI ‘%s’ is too long."
+msgid "Listenee URI \"%s\" is too long."
 msgstr "L’URI à laquelle vous vous êtes abonné(e) ‘%s’ est trop longue."
 
-#: actions/userauthorization.php:314
+#. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
+#. TRANS: %s is a listenee URI.
+#: actions/userauthorization.php:311
 #, fuzzy, php-format
-msgid "Listenee URI ‘%s’ is a local user."
+msgid "Listenee URI \"%s\" is a local user."
 msgstr ""
 "L’URI à laquelle vous vous êtes abonné(e) ‘%s’ est un utilisateur local."
 
+#. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
+#. TRANS: %s is a profile URL.
 #: actions/userauthorization.php:329
 #, fuzzy, php-format
-msgid "Profile URL ‘%s’ is for a local user."
+msgid "Profile URL \"%s\" is for a local user."
 msgstr "L’URL du profil ‘%s’ est pour un utilisateur local."
 
-#: actions/userauthorization.php:345
+#. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
+#. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
+#: actions/userauthorization.php:339
 #, fuzzy, php-format
-msgid "Avatar URL ‘%s’ is not valid."
+msgid ""
+"Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
+"\"."
+msgstr ""
+"La licence du flux auquel vous êtes abonné(e), « %1$s », n’est pas compatible "
+"avec la licence du site « %2$s »."
+
+#. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
+#. TRANS: %s is an avatar URL.
+#: actions/userauthorization.php:349
+#, fuzzy, php-format
+msgid "Avatar URL \"%s\" is not valid."
 msgstr "L’URL de l’avatar ‘%s’ n’est pas valide."
 
-#: actions/userauthorization.php:350
+#. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
+#. TRANS: %s is an avatar URL.
+#: actions/userauthorization.php:356
 #, fuzzy, php-format
-msgid "Can’t read avatar URL ‘%s’."
+msgid "Cannot read avatar URL \"%s\"."
 msgstr "Impossible de lire l’URL de l’avatar « %s »."
 
-#: actions/userauthorization.php:355
+#. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
+#. TRANS: %s is an avatar URL.
+#: actions/userauthorization.php:363
 #, fuzzy, php-format
-msgid "Wrong image type for avatar URL ‘%s’."
+msgid "Wrong image type for avatar URL \"%s\"."
 msgstr "Format d’image invalide pour l’URL de l’avatar « %s »."
 
 #. TRANS: Page title for profile design page.
-#: actions/userdesignsettings.php:74 lib/designsettings.php:63
+#: actions/userdesignsettings.php:74 lib/designsettings.php:61
 msgid "Profile design"
 msgstr "Conception de profil"
 
 #. TRANS: Instructions for profile design page.
-#: actions/userdesignsettings.php:84 lib/designsettings.php:74
+#: actions/userdesignsettings.php:84 lib/designsettings.php:72
 msgid ""
 "Customize the way your profile looks with a background image and a colour "
 "palette of your choice."
@@ -6698,10 +6851,28 @@ msgstr ""
 "Personnalisez l’apparence de votre profil avec une image d’arrière plan et "
 "une palette de couleurs de votre choix."
 
-#: actions/userdesignsettings.php:272
+#: actions/userdesignsettings.php:289
 msgid "Enjoy your hotdog!"
 msgstr "Bon appétit !"
 
+#: actions/userdesignsettings.php:325
+#, fuzzy
+msgid "Design settings"
+msgstr "Sauvegarder les paramètres du site"
+
+#: actions/userdesignsettings.php:340
+msgid "View profile designs"
+msgstr "Afficher les conceptions de profils"
+
+#: actions/userdesignsettings.php:341
+msgid "Show or hide profile designs."
+msgstr "Afficher ou masquer les paramètres de conception."
+
+#: actions/userdesignsettings.php:348
+#, fuzzy
+msgid "Background file"
+msgstr "Arrière plan"
+
 #. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number.
 #: actions/usergroups.php:66
 #, php-format
@@ -6753,6 +6924,11 @@ msgstr ""
 msgid "Contributors"
 msgstr "Contributeurs"
 
+#. TRANS: Menu item for site administration
+#: actions/version.php:167 lib/adminpanelaction.php:403
+msgid "License"
+msgstr "Licence"
+
 #: actions/version.php:170
 msgid ""
 "StatusNet is free software: you can redistribute it and/or modify it under "
@@ -6786,12 +6962,13 @@ msgstr ""
 "Vous avez dû recevoir une copie de la Licence Publique Générale GNU Affero "
 "avec ce programme. Si ce n’est pas le cas, consultez %s."
 
-#: actions/version.php:191
-msgid "Plugins"
-msgstr "Extensions"
+#. TRANS: Form input field label for application name.
+#: actions/version.php:197 lib/applicationeditform.php:190
+msgid "Name"
+msgstr "Nom"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:901
+#: actions/version.php:198 lib/action.php:885
 msgid "Version"
 msgstr "Version"
 
@@ -6799,6 +6976,12 @@ msgstr "Version"
 msgid "Author(s)"
 msgstr "Auteur(s)"
 
+#. TRANS: Form input field label.
+#: actions/version.php:200 lib/applicationeditform.php:208
+#: lib/groupeditform.php:168
+msgid "Description"
+msgstr "Description"
+
 #. TRANS: Activity title when marking a notice as favorite.
 #: classes/Fave.php:164
 msgid "Favor"
@@ -6921,7 +7104,7 @@ msgid "Could not create login token for %s"
 msgstr "Impossible de créer le jeton d’identification pour %s"
 
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
-#: classes/Memcached_DataObject.php:542
+#: classes/Memcached_DataObject.php:556
 msgid "No database name or DSN found anywhere."
 msgstr "Aucun nom de base de données ou DSN trouvé nulle part."
 
@@ -7099,18 +7282,18 @@ msgstr "%1$s suit à présent %2$s."
 
 #. TRANS: Notice given on user registration.
 #. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:395
+#: classes/User.php:390
 #, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr "Bienvenue à %1$s, @%2$s !"
 
 #. TRANS: Server exception.
-#: classes/User.php:918
+#: classes/User.php:923
 msgid "No single user defined for single-user mode."
 msgstr "Aucun utilisateur unique défini pour le mode mono-utilisateur."
 
 #. TRANS: Server exception.
-#: classes/User.php:922
+#: classes/User.php:927
 msgid "Single-user mode code called when not enabled."
 msgstr "Code en mode mono-utilisateur appelé quand ce n’est pas autorisé."
 
@@ -7155,41 +7338,6 @@ msgstr ""
 msgid "No AtomPub API service for %s."
 msgstr ""
 
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:104
-msgid "Change your profile settings"
-msgstr "Modifier vos paramètres de profil"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:111
-msgid "Upload an avatar"
-msgstr "Ajouter un avatar"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:118
-msgid "Change your password"
-msgstr "Modifier votre mot de passe"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:125
-msgid "Change email handling"
-msgstr "Modifier le traitement des courriels"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:132
-msgid "Design your profile"
-msgstr "Concevez votre profil"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:139
-msgid "Other options"
-msgstr "Autres options"
-
-#. TRANS: Link description in user account settings menu.
-#: lib/accountsettingsaction.php:141
-msgid "Other"
-msgstr "Autres"
-
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
 #: lib/action.php:161
 #, php-format
@@ -7207,206 +7355,128 @@ msgctxt "TOOLTIP"
 msgid "Show more"
 msgstr "Voir davantage"
 
-#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:544
-msgid "Primary site navigation"
-msgstr "Navigation primaire du site"
+#. TRANS: Inline reply form submit button: submits a reply comment.
+#: lib/action.php:328
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Comment"
+msgstr "Contenu"
 
-#. TRANS: Tooltip for main menu option "Personal".
-#: lib/action.php:550
-msgctxt "TOOLTIP"
-msgid "Personal profile and friends timeline"
-msgstr "Profil personnel et flux des amis"
+#. TRANS: Placeholder text for inline reply form. Clicking in this box will turn it into a mini notice form.
+#: lib/action.php:331
+msgid "Add a comment..."
+msgstr ""
 
-#. TRANS: Main menu option when logged in for access to personal profile and friends timeline.
-#. TRANS: Personal group navigation menu option when logged in for viewing timeline of self and friends.
-#: lib/action.php:553 lib/personalgroupnav.php:100
-msgctxt "MENU"
-msgid "Personal"
-msgstr "Personnel"
+#: lib/action.php:559 lib/personalgroupnav.php:99
+#, fuzzy
+msgid "Home"
+msgstr "Site personnel"
 
-#. TRANS: Tooltip for main menu option "Account".
-#: lib/action.php:555
-msgctxt "TOOLTIP"
-msgid "Change your email, avatar, password, profile"
-msgstr "Modifier votre adresse électronique, avatar, mot de passe, profil"
-
-#. TRANS: Main menu option when logged in for access to user settings.
-#: lib/action.php:558
-msgid "Account"
-msgstr "Compte"
-
-#. TRANS: Tooltip for main menu option "Services".
 #: lib/action.php:560
-msgctxt "TOOLTIP"
-msgid "Connect to services"
-msgstr "Se connecter aux services"
+#, fuzzy
+msgid "Friends timeline"
+msgstr "Activité de %s"
 
-#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services.
-#: lib/action.php:563
-msgid "Connect"
-msgstr "Connexion"
-
-#. TRANS: Tooltip for menu option "Admin".
 #: lib/action.php:566
-msgctxt "TOOLTIP"
-msgid "Change site configuration"
-msgstr "Modifier la configuration du site"
+#, fuzzy
+msgid "Your profile"
+msgstr "Profil du groupe"
 
-#. TRANS: Main menu option when logged in and site admin for access to site configuration.
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/action.php:569 lib/groupnav.php:117
-msgctxt "MENU"
-msgid "Admin"
-msgstr "Administrer"
+#: lib/action.php:570 lib/action.php:593 lib/publicgroupnav.php:78
+msgid "Public"
+msgstr "Public"
 
-#. TRANS: Tooltip for main menu option "Invite".
-#: lib/action.php:573
-#, php-format
-msgctxt "TOOLTIP"
-msgid "Invite friends and colleagues to join you on %s"
-msgstr "Inviter des amis et collègues à vous rejoindre sur %s"
+#: lib/action.php:571 lib/action.php:594
+#, fuzzy
+msgid "Everyone on this site"
+msgstr "Chercher des personnes sur ce site"
+
+#: lib/action.php:575
+#, fuzzy
+msgid "Settings"
+msgstr "Paramètres SMS"
 
-#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users.
 #: lib/action.php:576
-msgctxt "MENU"
-msgid "Invite"
-msgstr "Inviter"
+#, fuzzy
+msgid "Change your personal settings"
+msgstr "Modifier vos paramètres de profil"
 
-#. TRANS: Tooltip for main menu option "Logout"
 #: lib/action.php:582
-msgctxt "TOOLTIP"
-msgid "Logout from the site"
-msgstr "Fermer la session"
+#, fuzzy
+msgid "Site configuration"
+msgstr "Configuration utilisateur"
 
-#. TRANS: Main menu option when logged in to log out the current user.
-#: lib/action.php:585
-msgctxt "MENU"
+#: lib/action.php:587
+#, fuzzy
 msgid "Logout"
 msgstr "Déconnexion"
 
-#. TRANS: Tooltip for main menu option "Register".
-#: lib/action.php:590
-msgctxt "TOOLTIP"
-msgid "Create an account"
-msgstr "Créer un compte"
+#: lib/action.php:588
+#, fuzzy
+msgid "Logout from the site"
+msgstr "Fermer la session"
 
-#. TRANS: Main menu option when not logged in to register a new account.
-#. TRANS: Menu item for registering with the StatusNet site.
-#: lib/action.php:593 lib/logingroupnav.php:85
-msgctxt "MENU"
-msgid "Register"
-msgstr "S’inscrire"
-
-#. TRANS: Tooltip for main menu option "Login".
-#: lib/action.php:596
-msgctxt "TOOLTIP"
+#: lib/action.php:599
+#, fuzzy
 msgid "Login to the site"
 msgstr "Ouvrir une session"
 
-#. TRANS: Main menu option when not logged in to log in.
-#. TRANS: Menu item for logging in to the StatusNet site.
-#: lib/action.php:599 lib/logingroupnav.php:77
-msgctxt "MENU"
-msgid "Login"
-msgstr "Connexion"
-
-#. TRANS: Tooltip for main menu option "Help".
-#: lib/action.php:602
-msgctxt "TOOLTIP"
-msgid "Help me!"
-msgstr "À l’aide !"
-
-#. TRANS: Main menu option for help on the StatusNet site.
-#: lib/action.php:605
-msgctxt "MENU"
-msgid "Help"
-msgstr "Aide"
-
-#. TRANS: Tooltip for main menu option "Search".
-#: lib/action.php:608
-msgctxt "TOOLTIP"
-msgid "Search for people or text"
-msgstr "Rechercher des personnes ou du texte"
-
-#. TRANS: Main menu option when logged in or when the StatusNet instance is not private.
-#: lib/action.php:611
-msgctxt "MENU"
+#: lib/action.php:606
+#, fuzzy
 msgid "Search"
 msgstr "Rechercher"
 
-#. TRANS: DT element for site notice. String is hidden in default CSS.
-#. TRANS: Menu item for site administration
-#: lib/action.php:633 lib/adminpanelaction.php:387
-msgid "Site notice"
-msgstr "Notice du site"
-
-#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:700
-msgid "Local views"
-msgstr "Vues locales"
-
-#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:770
-msgid "Page notice"
-msgstr "Avis de la page"
-
-#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:874
-msgid "Secondary site navigation"
-msgstr "Navigation secondaire du site"
+#: lib/action.php:607
+#, fuzzy
+msgid "Search the site"
+msgstr "Rechercher sur le site"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:880
+#: lib/action.php:864
 msgid "Help"
 msgstr "Aide"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:883
+#: lib/action.php:867
 msgid "About"
 msgstr "À propos"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:886
+#: lib/action.php:870
 msgid "FAQ"
 msgstr "FAQ"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:891
+#: lib/action.php:875
 msgid "TOS"
 msgstr "CGU"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:895
+#: lib/action.php:879
 msgid "Privacy"
 msgstr "Confidentialité"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:898
+#: lib/action.php:882
 msgid "Source"
 msgstr "Source"
 
 #. TRANS: Secondary navigation menu option leading to e-mail contact information on the
 #. TRANS: StatusNet site, where to report bugs, ...
-#: lib/action.php:905
+#: lib/action.php:889
 msgid "Contact"
 msgstr "Contact"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:908
+#: lib/action.php:892
 msgid "Badge"
 msgstr "Insigne"
 
-#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:937
-msgid "StatusNet software license"
-msgstr "Licence du logiciel StatusNet"
-
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:944
+#: lib/action.php:921
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7416,7 +7486,7 @@ msgstr ""
 "%site.broughtby%%](%%site.broughtbyurl%%)."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:947
+#: lib/action.php:924
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** est un service de micro-blogging."
@@ -7425,7 +7495,7 @@ msgstr "**%%site.name%%** est un service de micro-blogging."
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:954
+#: lib/action.php:931
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7436,21 +7506,16 @@ msgstr ""
 "version %s, disponible sous la licence [GNU Affero General Public License]"
 "(http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
 
-#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:970
-msgid "Site content license"
-msgstr "Licence du contenu du site"
-
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:977
+#: lib/action.php:949
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr "Le contenu et les données de %1$s sont privés et confidentiels."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:984
+#: lib/action.php:956
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
@@ -7458,7 +7523,7 @@ msgstr ""
 "réservés."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:988
+#: lib/action.php:960
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 "Le contenu et les données sont sous le droit d’auteur du contributeur. Tous "
@@ -7466,26 +7531,21 @@ msgstr ""
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:1020
+#: lib/action.php:992
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
 "Tous les contenus %1$s et les données sont disponibles sous la licence %2$s."
 
-#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1356
-msgid "Pagination"
-msgstr "Pagination"
-
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1367
+#: lib/action.php:1335
 msgid "After"
 msgstr "Après"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1377
+#: lib/action.php:1345
 msgid "Before"
 msgstr "Avant"
 
@@ -7639,7 +7699,7 @@ msgid "User configuration"
 msgstr "Configuration utilisateur"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:122
+#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:110
 msgid "User"
 msgstr "Utilisateur"
 
@@ -7663,6 +7723,11 @@ msgstr "Configuration des sessions"
 msgid "Edit site notice"
 msgstr "Modifier l'avis du site"
 
+#. TRANS: Menu item for site administration
+#: lib/adminpanelaction.php:387
+msgid "Site notice"
+msgstr "Notice du site"
+
 #. TRANS: Menu item title/tooltip
 #: lib/adminpanelaction.php:393
 msgid "Snapshots configuration"
@@ -7673,6 +7738,12 @@ msgstr "Configuration des instantanés"
 msgid "Set site license"
 msgstr "Définir la licence du site"
 
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:409
+#, fuzzy
+msgid "Plugins configuration"
+msgstr "Configuration des chemins"
+
 #. TRANS: Client error 401.
 #: lib/apiauth.php:111
 msgid "API resource requires read-write access, but you only have read access."
@@ -7685,19 +7756,23 @@ msgstr ""
 msgid "No application for that consumer key."
 msgstr "Aucune demande trouvée pour cette clé de consommateur."
 
+#: lib/apiauth.php:202 lib/apiauth.php:284
+msgid "Not allowed to use API."
+msgstr ""
+
 #. TRANS: OAuth exception given when an incorrect access token was given for a user.
-#: lib/apiauth.php:219
+#: lib/apiauth.php:225
 msgid "Bad access token."
 msgstr "Jeton d’accès erroné."
 
 #. TRANS: OAuth exception given when no user was found for a given token (no token was found).
-#: lib/apiauth.php:224
+#: lib/apiauth.php:230
 msgid "No user for that token."
 msgstr "Aucun utilisateur associé à ce jeton."
 
 #. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel".
 #. TRANS: Client error thrown when authentication fails.
-#: lib/apiauth.php:266 lib/apiauth.php:293
+#: lib/apiauth.php:272 lib/apiauth.php:302
 msgid "Could not authenticate you."
 msgstr "Impossible de vous authentifier."
 
@@ -7745,6 +7820,11 @@ msgstr "Révocation essayée d’un jeton inconnu."
 msgid "Failed to delete revoked token."
 msgstr "Impossible de supprimer un jeton révoqué."
 
+#. TRANS: Form input field label for application icon.
+#: lib/applicationeditform.php:177
+msgid "Icon"
+msgstr "Icône"
+
 #. TRANS: Form guide.
 #: lib/applicationeditform.php:182
 msgid "Icon for this application"
@@ -7779,6 +7859,11 @@ msgstr "URL source"
 msgid "Organization responsible for this application"
 msgstr "Organisation responsable de cette application"
 
+#. TRANS: Form input field label.
+#: lib/applicationeditform.php:227
+msgid "Organization"
+msgstr "Organisation"
+
 #. TRANS: Form input field instructions.
 #: lib/applicationeditform.php:234
 msgid "URL for the homepage of the organization"
@@ -7870,16 +7955,6 @@ msgstr "l’élément « author » doit contenir un élément « name »."
 msgid "Do not use this method!"
 msgstr "Ne pas supprimer ce groupe"
 
-#. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:293
-msgid "Author"
-msgstr "Auteur"
-
-#. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:307
-msgid "Provider"
-msgstr "Fournisseur"
-
 #. TRANS: Title.
 #: lib/attachmentnoticesection.php:67
 msgid "Notices where this attachment appears"
@@ -7905,23 +7980,28 @@ msgstr "La modification du mot de passe n’est pas autorisée."
 msgid "Block"
 msgstr "Bloquer"
 
+#. TRANS: Description of the form to block a user.
+#: lib/blockform.php:79
+msgid "Block this user"
+msgstr "Bloquer cet utilisateur"
+
 #. TRANS: Title for command results.
-#: lib/channel.php:160 lib/channel.php:181
+#: lib/channel.php:104 lib/channel.php:125
 msgid "Command results"
 msgstr "Résultats de la commande"
 
 #. TRANS: Title for command results.
-#: lib/channel.php:194
+#: lib/channel.php:138
 msgid "AJAX error"
 msgstr "Erreur AJAX"
 
 #. TRANS: E-mail subject when a command has completed.
-#: lib/channel.php:233 lib/mailhandler.php:143
+#: lib/channel.php:177 lib/mailhandler.php:143
 msgid "Command complete"
 msgstr "Commande complétée"
 
 #. TRANS: E-mail subject when a command has failed.
-#: lib/channel.php:244
+#: lib/channel.php:188
 msgid "Command failed"
 msgstr "Échec de la commande"
 
@@ -8024,7 +8104,7 @@ msgstr "Nom complet : %s"
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a location.
-#: lib/command.php:446 lib/mail.php:270
+#: lib/command.php:446 lib/mail.php:275
 #, php-format
 msgid "Location: %s"
 msgstr "Emplacement : %s"
@@ -8032,7 +8112,7 @@ msgstr "Emplacement : %s"
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a homepage.
-#: lib/command.php:450 lib/mail.php:274
+#: lib/command.php:450 lib/mail.php:279
 #, php-format
 msgid "Homepage: %s"
 msgstr "Site Web : %s"
@@ -8314,109 +8394,102 @@ msgstr ""
 "tracking - pas encore implémenté.\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:162
+#: lib/common.php:36
 msgid "No configuration file found."
 msgstr "Aucun fichier de configuration n’a été trouvé."
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:165
+#: lib/common.php:39
 msgid "I looked for configuration files in the following places:"
 msgstr ""
 "Les fichiers de configuration ont été cherchés aux emplacements suivants :"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:168
+#: lib/common.php:42
 msgid "You may wish to run the installer to fix this."
 msgstr "Vous pouvez essayer de lancer l’installeur pour régler ce problème."
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:172
+#: lib/common.php:46
 msgid "Go to the installer."
 msgstr "Aller au programme d’installation"
 
-#. TRANS: Menu item for Instant Messaging settings.
-#: lib/connectsettingsaction.php:106
-msgctxt "MENU"
-msgid "IM"
-msgstr "IM"
-
-#. TRANS: Tooltip for Instant Messaging menu item.
-#: lib/connectsettingsaction.php:108
-msgid "Updates by instant messenger (IM)"
-msgstr "Suivi des avis par messagerie instantanée"
-
-#. TRANS: Menu item for Short Message Service settings.
-#: lib/connectsettingsaction.php:113
-msgctxt "MENU"
-msgid "SMS"
-msgstr "SMS"
-
-#. TRANS: Tooltip for Short Message Service menu item.
-#: lib/connectsettingsaction.php:115
-msgid "Updates by SMS"
-msgstr "Suivi des avis par SMS"
-
-#. TRANS: Menu item for OuAth connection settings.
-#: lib/connectsettingsaction.php:120
-msgctxt "MENU"
-msgid "Connections"
-msgstr "Connexions"
-
-#. TRANS: Tooltip for connected applications (Connections through OAuth) menu item.
-#: lib/connectsettingsaction.php:122
-msgid "Authorized connected applications"
-msgstr "Applications autorisées connectées"
-
 #: lib/dberroraction.php:59
 msgid "Database error"
 msgstr "Erreur de la base de données"
 
+#. TRANS: Description of form for deleting a user.
+#: lib/deleteuserform.php:75
+msgid "Delete this user"
+msgstr "Supprimer cet utilisateur"
+
+#: lib/designform.php:114
+#, fuzzy
+msgid "Change design"
+msgstr "Sauvegarder la conception"
+
+#. TRANS: Fieldset legend on profile design page to change profile page colours.
+#: lib/designform.php:131
+msgid "Change colours"
+msgstr "Modifier les couleurs"
+
+#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
+#: lib/designform.php:138
+msgid "Use defaults"
+msgstr "Utiliser les valeurs par défaut"
+
+#. TRANS: Title for button on profile design page to reset all colour settings to default.
+#: lib/designform.php:140
+msgid "Restore default designs"
+msgstr "Restaurer les conceptions par défaut"
+
+#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
+#: lib/designform.php:148
+msgid "Reset back to default"
+msgstr "Revenir aux valeurs par défaut"
+
 #. TRANS: Label in form on profile design page.
 #. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
-#: lib/designsettings.php:108
+#: lib/designform.php:158
 msgid "Upload file"
 msgstr "Importer un fichier"
 
 #. TRANS: Instructions for form on profile design page.
-#: lib/designsettings.php:113
+#: lib/designform.php:163
+#, fuzzy
 msgid ""
-"You can upload your personal background image. The maximum file size is 2MB."
+"You can upload your personal background image. The maximum file size is 2Mb."
 msgstr ""
 "Vous pouvez importer votre image d’arrière plan personnelle. La taille "
 "maximale du fichier est de 2 Mo."
 
 #. TRANS: Radio button on profile design page that will enable use of the uploaded profile image.
-#: lib/designsettings.php:139
+#: lib/designform.php:194
 msgctxt "RADIO"
 msgid "On"
 msgstr "Activé"
 
 #. TRANS: Radio button on profile design page that will disable use of the uploaded profile image.
-#: lib/designsettings.php:156
+#: lib/designform.php:211
 msgctxt "RADIO"
 msgid "Off"
 msgstr "Désactivé"
 
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: lib/designsettings.php:175
-msgid "Change colours"
-msgstr "Modifier les couleurs"
-
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: lib/designsettings.php:257
-msgid "Use defaults"
-msgstr "Utiliser les valeurs par défaut"
+#. TRANS: Title for button on profile design page to save settings.
+#: lib/designform.php:322
+msgid "Save design"
+msgstr "Sauvegarder la conception"
 
 #. TRANS: Error message displayed if design settings could not be saved.
 #. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
-#: lib/designsettings.php:405 lib/designsettings.php:427
+#: lib/designsettings.php:216 lib/designsettings.php:238
 msgid "Couldn't update your design."
 msgstr "Impossible de mettre à jour votre conception."
 
 #. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
-#: lib/designsettings.php:433
+#: lib/designsettings.php:244
 msgid "Design defaults restored."
 msgstr "Les paramètre par défaut de la conception ont été restaurés."
 
@@ -8486,27 +8559,23 @@ msgstr ""
 msgid "Feeds"
 msgstr "Flux d’informations"
 
-#: lib/galleryaction.php:121
-msgid "Filter tags"
-msgstr "Filtrer les marques"
-
-#: lib/galleryaction.php:131
+#: lib/galleryaction.php:128
 msgid "All"
 msgstr "Tous"
 
-#: lib/galleryaction.php:139
+#: lib/galleryaction.php:136
 msgid "Select tag to filter"
 msgstr "Sélectionner une marque à filtrer"
 
-#: lib/galleryaction.php:140
+#: lib/galleryaction.php:137
 msgid "Tag"
 msgstr "Marque"
 
-#: lib/galleryaction.php:141
+#: lib/galleryaction.php:138
 msgid "Choose a tag to narrow list"
 msgstr "Choissez une marque pour réduire la liste"
 
-#: lib/galleryaction.php:143
+#: lib/galleryaction.php:140
 msgid "Go"
 msgstr "Aller"
 
@@ -8598,6 +8667,12 @@ msgctxt "TOOLTIP"
 msgid "%s blocked users"
 msgstr "Utilisateurs bloqués du groupe « %s »"
 
+#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
+#: lib/groupnav.php:117
+msgctxt "MENU"
+msgid "Admin"
+msgstr "Administrer"
+
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
 #: lib/groupnav.php:120
@@ -8708,39 +8783,63 @@ msgid_plural "%dB"
 msgstr[0] "%d&nbsp;o"
 msgstr[1] "%d&nbsp;o"
 
-#: lib/jabber.php:387
+#: lib/implugin.php:262
 #, php-format
-msgid "[%s]"
-msgstr "[%s]"
+msgid ""
+"User \"%s\" on %s has said that your %s screenname belongs to them. If "
+"that's true, you can confirm by clicking on this URL: %s . (If you cannot "
+"click it, copy-and-paste it into the address bar of your browser). If that "
+"user isn't you, or if you didn't request this confirmation, just ignore this "
+"message."
+msgstr ""
 
-#: lib/jabber.php:567
+#: lib/implugin.php:349
 #, php-format
 msgid "Unknown inbox source %d."
 msgstr "Source %d inconnue pour la boîte de réception."
 
+#: lib/implugin.php:485
+#, fuzzy, php-format
+msgid "Message too long - maximum is %1$d characters, you sent %2$d."
+msgstr ""
+"Message trop long ! La taille maximale est de %1$d caractère ; vous en avez "
+"entré %2$d."
+
 #: lib/leaveform.php:114
 msgid "Leave"
 msgstr "Quitter"
 
+#. TRANS: Menu item for logging in to the StatusNet site.
+#: lib/logingroupnav.php:77
+msgctxt "MENU"
+msgid "Login"
+msgstr "Connexion"
+
 #. TRANS: Title for menu item for logging in to the StatusNet site.
 #: lib/logingroupnav.php:79
 msgid "Login with a username and password"
 msgstr "Ouvrez une session avec un identifiant et un mot de passe"
 
+#. TRANS: Menu item for registering with the StatusNet site.
+#: lib/logingroupnav.php:85
+msgctxt "MENU"
+msgid "Register"
+msgstr "S’inscrire"
+
 #. TRANS: Title for menu item for registering with the StatusNet site.
 #: lib/logingroupnav.php:87
 msgid "Sign up for a new account"
 msgstr "Créer un nouveau compte"
 
 #. TRANS: Subject for address confirmation email.
-#: lib/mail.php:168
+#: lib/mail.php:172
 msgid "Email address confirmation"
 msgstr "Confirmation de l’adresse courriel"
 
 #. TRANS: Body for address confirmation email.
 #. TRANS: %1$s is the addressed user's nickname, %2$s is the StatusNet sitename,
 #. TRANS: %3$s is the URL to confirm at.
-#: lib/mail.php:173
+#: lib/mail.php:177
 #, php-format
 msgid ""
 "Hey, %1$s.\n"
@@ -8772,14 +8871,14 @@ msgstr ""
 
 #. TRANS: Subject of new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
-#: lib/mail.php:238
+#: lib/mail.php:243
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1$s suit maintenant vos avis sur %2$s."
 
 #. TRANS: This is a paragraph in a new-subscriber e-mail.
 #. TRANS: %s is a URL where the subscriber can be reported as abusive.
-#: lib/mail.php:245
+#: lib/mail.php:250
 #, php-format
 msgid ""
 "If you believe this account is being used abusively, you can block them from "
@@ -8794,7 +8893,7 @@ msgstr ""
 #. TRANS: %3$s is the subscriber's profile URL, %4$s is the subscriber's location (or empty)
 #. TRANS: %5$s is the subscriber's homepage URL (or empty), %6%s is the subscriber's bio (or empty)
 #. TRANS: %7$s is a link to the addressed user's e-mail settings.
-#: lib/mail.php:255
+#: lib/mail.php:260
 #, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -8822,14 +8921,14 @@ msgstr ""
 
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is biographical information.
-#: lib/mail.php:278
+#: lib/mail.php:283
 #, php-format
 msgid "Bio: %s"
 msgstr "Bio : %s"
 
 #. TRANS: Subject of notification mail for new posting email address.
 #. TRANS: %s is the StatusNet sitename.
-#: lib/mail.php:307
+#: lib/mail.php:312
 #, php-format
 msgid "New email address for posting to %s"
 msgstr "Nouvelle adresse courriel pour poster dans %s"
@@ -8837,7 +8936,7 @@ msgstr "Nouvelle adresse courriel pour poster dans %s"
 #. TRANS: Body of notification mail for new posting email address.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is the e-mail address to send
 #. TRANS: to to post by e-mail, %3$s is a URL to more instructions.
-#: lib/mail.php:313
+#: lib/mail.php:318
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -8860,19 +8959,19 @@ msgstr ""
 
 #. TRANS: Subject line for SMS-by-email notification messages.
 #. TRANS: %s is the posting user's nickname.
-#: lib/mail.php:434
+#: lib/mail.php:439
 #, php-format
 msgid "%s status"
 msgstr "Statut de %s"
 
 #. TRANS: Subject line for SMS-by-email address confirmation message.
-#: lib/mail.php:460
+#: lib/mail.php:465
 msgid "SMS confirmation"
 msgstr "Confirmation SMS"
 
 #. TRANS: Main body heading for SMS-by-email address confirmation message.
 #. TRANS: %s is the addressed user's nickname.
-#: lib/mail.php:464
+#: lib/mail.php:469
 #, php-format
 msgid "%s: confirm you own this phone number with this code:"
 msgstr ""
@@ -8880,7 +8979,7 @@ msgstr ""
 
 #. TRANS: Subject for 'nudge' notification email.
 #. TRANS: %s is the nudging user.
-#: lib/mail.php:485
+#: lib/mail.php:490
 #, fuzzy, php-format
 msgid "You have been nudged by %s"
 msgstr "Vous avez reçu un clin d’œil de %s"
@@ -8888,7 +8987,7 @@ msgstr "Vous avez reçu un clin d’œil de %s"
 #. TRANS: Body for 'nudge' notification email.
 #. TRANS: %1$s is the nuding user's long name, $2$s is the nudging user's nickname,
 #. TRANS: %3$s is a URL to post notices at, %4$s is the StatusNet sitename.
-#: lib/mail.php:492
+#: lib/mail.php:497
 #, php-format
 msgid ""
 "%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -8917,7 +9016,7 @@ msgstr ""
 
 #. TRANS: Subject for direct-message notification email.
 #. TRANS: %s is the sending user's nickname.
-#: lib/mail.php:539
+#: lib/mail.php:544
 #, php-format
 msgid "New private message from %s"
 msgstr "Nouveau message personnel de %s"
@@ -8926,7 +9025,7 @@ msgstr "Nouveau message personnel de %s"
 #. TRANS: %1$s is the sending user's long name, %2$s is the sending user's nickname,
 #. TRANS: %3$s is the message content, %4$s a URL to the message,
 #. TRANS: %5$s is the StatusNet sitename.
-#: lib/mail.php:547
+#: lib/mail.php:552
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -8961,7 +9060,7 @@ msgstr ""
 
 #. TRANS: Subject for favorite notification e-mail.
 #. TRANS: %1$s is the adding user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:599
+#: lib/mail.php:604
 #, php-format
 msgid "%1$s (@%2$s) added your notice as a favorite"
 msgstr "%1$s (@%2$s) a ajouté votre avis à ses favoris"
@@ -8971,7 +9070,7 @@ msgstr "%1$s (@%2$s) a ajouté votre avis à ses favoris"
 #. TRANS: %3$s is a URL to the faved notice, %4$s is the faved notice text,
 #. TRANS: %5$s is a URL to all faves of the adding user, %6$s is the StatusNet sitename,
 #. TRANS: %7$s is the adding user's nickname.
-#: lib/mail.php:606
+#: lib/mail.php:611
 #, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -9010,7 +9109,7 @@ msgstr ""
 "%6$s\n"
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:664
+#: lib/mail.php:669
 #, php-format
 msgid ""
 "The full conversation can be read here:\n"
@@ -9023,7 +9122,7 @@ msgstr ""
 
 #. TRANS: E-mail subject for notice notification.
 #. TRANS: %1$s is the sending user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:672
+#: lib/mail.php:677
 #, php-format
 msgid "%1$s (@%2$s) sent a notice to your attention"
 msgstr "%1$s (@%2$s) a envoyé un avis à votre attention"
@@ -9034,7 +9133,7 @@ msgstr "%1$s (@%2$s) a envoyé un avis à votre attention"
 #. TRANS: %5$s is a URL to the full conversion if it exists (otherwise empty),
 #. TRANS: %6$s is a URL to reply to the notice, %7$s is a URL to all @-replied for the addressed user,
 #. TRANS: %8$s is a URL to the addressed user's e-mail settings, %9$s is the sender's nickname.
-#: lib/mail.php:680
+#: lib/mail.php:685
 #, php-format
 msgid ""
 "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -9179,11 +9278,7 @@ msgstr "Aucun abonné réciproque."
 msgid "To"
 msgstr "À"
 
-#: lib/messageform.php:166 lib/noticeform.php:186
-msgid "Available characters"
-msgstr "Caractères restants"
-
-#: lib/messageform.php:185 lib/noticeform.php:237
+#: lib/messageform.php:184 lib/noticeform.php:236
 msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr "Envoyer"
@@ -9193,17 +9288,10 @@ msgstr "Envoyer"
 msgid "Messages"
 msgstr "Message"
 
-#: lib/messagelistitem.php:123 lib/noticelist.php:522
+#: lib/messagelistitem.php:123 lib/noticelist.php:527
 msgid "from"
 msgstr "de"
 
-#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:165
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr ""
-"Les pseudos ne peuvent contenir que des caractères minuscules et des "
-"chiffres, sans espaces."
-
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 #: lib/nickname.php:178
 msgid "Nickname cannot be empty."
@@ -9226,23 +9314,23 @@ msgstr "Envoyer un avis"
 msgid "What's up, %s?"
 msgstr "Quoi de neuf, %s ?"
 
-#: lib/noticeform.php:194
+#: lib/noticeform.php:193
 msgid "Attach"
 msgstr "Attacher"
 
-#: lib/noticeform.php:198
+#: lib/noticeform.php:197
 msgid "Attach a file"
 msgstr "Joindre un fichier"
 
-#: lib/noticeform.php:213
+#: lib/noticeform.php:212
 msgid "Share my location"
 msgstr "Partager ma localisation."
 
-#: lib/noticeform.php:216
+#: lib/noticeform.php:215
 msgid "Do not share my location"
 msgstr "Ne pas partager ma localisation"
 
-#: lib/noticeform.php:217
+#: lib/noticeform.php:216
 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
 "try again later"
@@ -9251,55 +9339,59 @@ msgstr ""
 "Veuillez réessayer plus tard."
 
 #. TRANS: Used in coordinates as abbreviation of north
-#: lib/noticelist.php:452
+#: lib/noticelist.php:457
 msgid "N"
 msgstr "N"
 
 #. TRANS: Used in coordinates as abbreviation of south
-#: lib/noticelist.php:454
+#: lib/noticelist.php:459
 msgid "S"
 msgstr "S"
 
 #. TRANS: Used in coordinates as abbreviation of east
-#: lib/noticelist.php:456
+#: lib/noticelist.php:461
 msgid "E"
 msgstr "E"
 
 #. TRANS: Used in coordinates as abbreviation of west
-#: lib/noticelist.php:458
+#: lib/noticelist.php:463
 msgid "W"
 msgstr "O"
 
-#: lib/noticelist.php:460
+#: lib/noticelist.php:465
 #, php-format
 msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgstr "%1$u° %2$u' %3$u\" %4$s %5$u° %6$u' %7$u\" %8$s"
 
-#: lib/noticelist.php:469
+#: lib/noticelist.php:474
 msgid "at"
 msgstr "chez"
 
-#: lib/noticelist.php:518
+#: lib/noticelist.php:523
 msgid "web"
 msgstr "web"
 
-#: lib/noticelist.php:584
+#: lib/noticelist.php:589
 msgid "in context"
 msgstr "dans le contexte"
 
-#: lib/noticelist.php:619
+#: lib/noticelist.php:624
 msgid "Repeated by"
 msgstr "Repris par"
 
-#: lib/noticelist.php:646
+#: lib/noticelist.php:651
 msgid "Reply to this notice"
 msgstr "Répondre à cet avis"
 
-#: lib/noticelist.php:647
+#: lib/noticelist.php:652
 msgid "Reply"
 msgstr "Répondre"
 
-#: lib/noticelist.php:691
+#: lib/noticelist.php:678
+msgid "Delete this notice"
+msgstr "Supprimer cet avis"
+
+#: lib/noticelist.php:696
 msgid "Notice repeated"
 msgstr "Avis repris"
 
@@ -9336,48 +9428,31 @@ msgstr "Avis en doublon."
 msgid "Couldn't insert new subscription."
 msgstr "Impossible d’insérer un nouvel abonnement."
 
-#. TRANS: Personal group navigation menu option when logged in for viewing @-replies.
-#: lib/personalgroupnav.php:107
+#: lib/personalgroupnav.php:104
 #, fuzzy
-msgctxt "MENU"
 msgid "Replies"
 msgstr "Réponses"
 
-#. TRANS: Personal group navigation menu option when logged in for seeing own profile.
-#: lib/personalgroupnav.php:114
+#: lib/personalgroupnav.php:109
 #, fuzzy
-msgctxt "MENU"
-msgid "Profile"
-msgstr "Profil"
-
-#. TRANS: Personal group navigation menu option when logged in for viewing own favourited notices.
-#: lib/personalgroupnav.php:120
-#, fuzzy
-msgctxt "MENU"
 msgid "Favorites"
 msgstr "Favoris"
 
-#. TRANS: Personal group navigation menu option when logged in for viewing recieved personal messages.
-#: lib/personalgroupnav.php:133
+#: lib/personalgroupnav.php:120
 #, fuzzy
-msgctxt "MENU"
 msgid "Inbox"
 msgstr "Boîte de réception"
 
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing recieved personal messages.
-#: lib/personalgroupnav.php:135
+#: lib/personalgroupnav.php:121
 msgid "Your incoming messages"
 msgstr "Vos messages reçus"
 
-#. TRANS: Personal group navigation menu option when logged in for viewing senet personal messages.
-#: lib/personalgroupnav.php:140
+#: lib/personalgroupnav.php:125
 #, fuzzy
-msgctxt "MENU"
 msgid "Outbox"
 msgstr "Boîte d’envoi"
 
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing senet personal messages.
-#: lib/personalgroupnav.php:142
+#: lib/personalgroupnav.php:126
 msgid "Your sent messages"
 msgstr "Vos messages envoyés"
 
@@ -9392,9 +9467,26 @@ msgstr "Marques dans les avis de %s"
 msgid "Unknown"
 msgstr "Inconnu"
 
+#. TRANS: Plugin admin panel controls
+#: lib/plugindisableform.php:90
+msgctxt "plugin"
+msgid "Disable"
+msgstr ""
+
+#. TRANS: Plugin admin panel controls
+#: lib/pluginenableform.php:112
+msgctxt "plugin"
+msgid "Enable"
+msgstr ""
+
+#: lib/pluginlist.php:196
+msgctxt "plugin-description"
+msgid "(Plugin descriptions unavailable when disabled.)"
+msgstr ""
+
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:82
+#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:88
 msgid "Subscriptions"
 msgstr "Abonnements"
 
@@ -9405,7 +9497,7 @@ msgstr "Tous les abonnements"
 
 #. TRANS: H2 text for user subscriber statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:90
+#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:96
 msgid "Subscribers"
 msgstr "Abonnés"
 
@@ -9427,7 +9519,7 @@ msgstr "Membre depuis"
 #. TRANS: Label for user statistics.
 #. TRANS: H2 text for user group membership statistics.
 #: lib/profileaction.php:239 lib/profileaction.php:290
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:104
 msgid "Groups"
 msgstr "Groupes"
 
@@ -9447,10 +9539,6 @@ msgstr "Tous les groupes"
 msgid "Unimplemented method."
 msgstr "Méthode non implémentée."
 
-#: lib/publicgroupnav.php:78
-msgid "Public"
-msgstr "Public"
-
 #: lib/publicgroupnav.php:82
 msgid "User groups"
 msgstr "Groupes d’utilisateurs"
@@ -9489,7 +9577,7 @@ msgid "Revoke the \"%s\" role from this user"
 msgstr "Révoquer le rôle « %s » de cet utilisateur"
 
 #. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:974
+#: lib/router.php:1001
 msgid "Page not found."
 msgstr "Page non trouvée."
 
@@ -9518,11 +9606,6 @@ msgctxt "BUTTON"
 msgid "Search"
 msgstr "Rechercher"
 
-#. TRANS: Definition list item with instructions on how to get (better) search results.
-#: lib/searchaction.php:170
-msgid "Search help"
-msgstr "Aide sur la recherche"
-
 #: lib/searchgroupnav.php:80
 msgid "People"
 msgstr "Personnes"
@@ -9547,6 +9630,51 @@ msgstr "Section sans titre"
 msgid "More..."
 msgstr "Plus..."
 
+#: lib/settingsnav.php:78
+msgid "Change your profile settings"
+msgstr "Modifier vos paramètres de profil"
+
+#: lib/settingsnav.php:83
+msgid "Upload an avatar"
+msgstr "Ajouter un avatar"
+
+#: lib/settingsnav.php:88
+msgid "Change your password"
+msgstr "Modifier votre mot de passe"
+
+#: lib/settingsnav.php:93
+msgid "Change email handling"
+msgstr "Modifier le traitement des courriels"
+
+#: lib/settingsnav.php:98
+msgid "Design your profile"
+msgstr "Concevez votre profil"
+
+#: lib/settingsnav.php:102
+msgid "URL"
+msgstr "URL"
+
+#: lib/settingsnav.php:103
+msgid "URL shorteners"
+msgstr ""
+
+#: lib/settingsnav.php:111
+msgid "Updates by instant messenger (IM)"
+msgstr "Suivi des avis par messagerie instantanée"
+
+#: lib/settingsnav.php:118
+msgid "Updates by SMS"
+msgstr "Suivi des avis par SMS"
+
+#: lib/settingsnav.php:123
+#, fuzzy
+msgid "Connections"
+msgstr "Connexions"
+
+#: lib/settingsnav.php:124
+msgid "Authorized connected applications"
+msgstr "Applications autorisées connectées"
+
 #: lib/silenceform.php:67
 msgid "Silence"
 msgstr "Silence"
@@ -9555,30 +9683,34 @@ msgstr "Silence"
 msgid "Silence this user"
 msgstr "Réduire cet utilisateur au silence"
 
-#: lib/subgroupnav.php:83
+#: lib/subgroupnav.php:89
 #, php-format
 msgid "People %s subscribes to"
 msgstr "Abonnements de %s"
 
-#: lib/subgroupnav.php:91
+#: lib/subgroupnav.php:97
 #, php-format
 msgid "People subscribed to %s"
 msgstr "Abonnés de %s"
 
-#: lib/subgroupnav.php:99
+#: lib/subgroupnav.php:105
 #, php-format
 msgid "Groups %s is a member of"
 msgstr "Groupes de %s"
 
-#: lib/subgroupnav.php:105
+#: lib/subgroupnav.php:111
 msgid "Invite"
 msgstr "Inviter"
 
-#: lib/subgroupnav.php:106
+#: lib/subgroupnav.php:112
 #, php-format
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Inviter des amis et collègues à vous rejoindre dans %s"
 
+#: lib/subscribeform.php:115 lib/subscribeform.php:139
+msgid "Subscribe to this user"
+msgstr "S’abonner à cet utilisateur"
+
 #: lib/subscriberspeopleselftagcloudsection.php:48
 #: lib/subscriptionspeopleselftagcloudsection.php:48
 msgid "People Tagcloud as self-tagged"
@@ -9657,6 +9789,13 @@ msgstr "Le thème contient un fichier de type « .%s », qui n'est pas autorisé
 msgid "Error opening theme archive."
 msgstr "Erreur lors de l’ouverture de l’archive du thème."
 
+#: lib/threadednoticelist.php:270
+#, php-format
+msgid "Show all %d comment"
+msgid_plural "Show all %d comments"
+msgstr[0] ""
+msgstr[1] ""
+
 #: lib/topposterssection.php:74
 msgid "Top posters"
 msgstr "Utilisateurs les plus actifs"
@@ -9698,76 +9837,80 @@ msgstr "Désabonnement"
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "L’utilisateur %1$s (%2$d) n’a pas de profil."
 
-#. TRANS: Link text for changeing the avatar of the logged in user.
-#: lib/userprofile.php:121
+#: lib/userprofile.php:116
 msgid "Edit Avatar"
 msgstr "Modifier l’avatar"
 
 #. TRANS: H2 for user actions in a profile.
 #. TRANS: H2 for entity actions in a profile.
-#: lib/userprofile.php:245 lib/userprofile.php:261
+#: lib/userprofile.php:216 lib/userprofile.php:232
 msgid "User actions"
 msgstr "Actions de l’utilisateur"
 
 #. TRANS: Text shown in user profile of not yet compeltely deleted users.
-#: lib/userprofile.php:249
+#: lib/userprofile.php:220
 msgid "User deletion in progress..."
 msgstr "Suppression de l'utilisateur en cours..."
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:277
+#: lib/userprofile.php:248
 msgid "Edit profile settings"
 msgstr "Modifier les paramètres du profil"
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:279
+#: lib/userprofile.php:250
 msgid "Edit"
 msgstr "Modifier"
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:303
+#: lib/userprofile.php:274
 msgid "Send a direct message to this user"
 msgstr "Envoyer un message à cet utilisateur"
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:305
+#: lib/userprofile.php:276
 msgid "Message"
 msgstr "Message"
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:347
+#: lib/userprofile.php:318
 msgid "Moderate"
 msgstr "Modérer"
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:386
+#: lib/userprofile.php:357
 msgid "User role"
 msgstr "Rôle de l'utilisateur"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:389
+#: lib/userprofile.php:360
 msgctxt "role"
 msgid "Administrator"
 msgstr "Administrateur"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:391
+#: lib/userprofile.php:362
 msgctxt "role"
 msgid "Moderator"
 msgstr "Modérateur"
 
+#: lib/util.php:321
+#, fuzzy
+msgid "Not allowed to log in."
+msgstr "Non connecté."
+
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1306
+#: lib/util.php:1337
 msgid "a few seconds ago"
 msgstr "il y a quelques secondes"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1309
+#: lib/util.php:1340
 msgid "about a minute ago"
 msgstr "il y a 1 minute"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1313
+#: lib/util.php:1344
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
@@ -9775,12 +9918,12 @@ msgstr[0] "il y a environ une minute"
 msgstr[1] "il y a environ %d minutes"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1316
+#: lib/util.php:1347
 msgid "about an hour ago"
 msgstr "il y a 1 heure"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1320
+#: lib/util.php:1351
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
@@ -9788,12 +9931,12 @@ msgstr[0] "il y a environ une heure"
 msgstr[1] "il y a environ %d heures"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1323
+#: lib/util.php:1354
 msgid "about a day ago"
 msgstr "il y a 1 jour"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1327
+#: lib/util.php:1358
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
@@ -9801,12 +9944,12 @@ msgstr[0] "il y a environ un jour"
 msgstr[1] "il y a environ %d jours"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1330
+#: lib/util.php:1361
 msgid "about a month ago"
 msgstr "il y a 1 mois"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1334
+#: lib/util.php:1365
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
@@ -9814,7 +9957,7 @@ msgstr[0] "il y a environ un mois"
 msgstr[1] "il y a environ %d mois"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1337
+#: lib/util.php:1368
 msgid "about a year ago"
 msgstr "il y a environ 1 an"
 
@@ -9826,26 +9969,6 @@ msgid "%s is not a valid color! Use 3 or 6 hex characters."
 msgstr ""
 "%s n’est pas une couleur valide ! Utilisez 3 ou 6 caractères hexadécimaux."
 
-#. TRANS: %s is the URL to the StatusNet site's Instant Messaging settings.
-#: lib/xmppmanager.php:287
-#, php-format
-msgid "Unknown user. Go to %s to add your address to your account"
-msgstr ""
-"Utilisateur inconnu. Aller à %s pour ajouter votre adresse à votre compte."
-
-#. TRANS: Response to XMPP source when it sent too long a message.
-#. TRANS: %1$d the maximum number of allowed characters (used for plural), %2$d is the sent number.
-#: lib/xmppmanager.php:406
-#, php-format
-msgid "Message too long. Maximum is %1$d character, you sent %2$d."
-msgid_plural "Message too long. Maximum is %1$d characters, you sent %2$d."
-msgstr[0] ""
-"Message trop long ! La taille maximale est de %1$d caractère ; vous en avez "
-"envoyé %2$d."
-msgstr[1] ""
-"Message trop long ! La taille maximale est de %1$d caractères ; vous en avez "
-"envoyé %2$d."
-
 #. TRANS: Exception.
 #: lib/xrd.php:63
 msgid "Invalid XML."
@@ -9862,74 +9985,183 @@ msgstr "XML invalide, racine XRD manquante."
 msgid "Getting backup from file '%s'."
 msgstr "Obtention de la sauvegarde depuis le fichier « %s »."
 
-#, fuzzy
-#~ msgid "Block this user."
-#~ msgstr "Bloquer cet utilisateur"
+#~ msgid "Could not generate feed for group - %s"
+#~ msgstr "Impossible de générer le flux pour le groupe — %s"
 
 #, fuzzy
-#~ msgid "Delete this notice."
-#~ msgstr "Supprimer cet avis"
-
-#, fuzzy
-#~ msgid "Delete this user."
-#~ msgstr "Supprimer cet utilisateur"
-
-#, fuzzy
-#~ msgid "Restore default designs."
-#~ msgstr "Restaurer les conceptions par défaut"
-
-#, fuzzy
-#~ msgid "Reset back to default."
-#~ msgstr "Revenir aux valeurs par défaut"
-
-#, fuzzy
-#~ msgid "Save design."
-#~ msgstr "Sauvegarder la conception"
-
-#, fuzzy
-#~ msgid "Disfavor favorite."
-#~ msgstr "Retirer ce favori"
-
-#, fuzzy
-#~ msgid "\"%s\" not found."
-#~ msgstr "Page non trouvée."
-
-#, fuzzy
-#~ msgid "Notice %s not found."
-#~ msgstr "L’avis parent correspondant à cette réponse n’a pas été trouvé."
-
-#, fuzzy
-#~ msgid "Attachment %s not found."
-#~ msgstr "Destinataire non trouvé."
-
-#, fuzzy
-#~ msgid "Invalid tag: \"%s\"."
-#~ msgstr "Marque invalide : « %s »"
-
-#, fuzzy
-#~ msgid "%s updates from everyone."
-#~ msgstr "%s statuts de tout le monde !"
-
-#, fuzzy
-#~ msgid "Password saved"
-#~ msgstr "Mot de passe enregistré."
-
-#, fuzzy
-#~ msgid "Where you are, like \"City, State (or Region), Country\"."
-#~ msgstr "Indiquez votre emplacement, ex.: « Ville, État (ou région), Pays »"
-
-#, fuzzy
-#~ msgid "Subscribe to this user."
-#~ msgstr "S’abonner à cet utilisateur"
+#~ msgid "Current confirmed Jabber/Google Talk address."
+#~ msgstr "Adresse Jabber/GTalk actuellement confirmée."
 
 #, fuzzy
 #~ msgid ""
-#~ "Listenee stream license \"%1$s\" is not compatible with site license \"%2"
-#~ "$s\"."
+#~ "Jabber or Google Talk address, like \"UserName@example.org\". First, make "
+#~ "sure to add %s to your buddy list in your IM client or on Google Talk."
 #~ msgstr ""
-#~ "La licence du flux auquel vous êtes abonné(e), « %1$s », n’est pas "
-#~ "compatible avec la licence du site « %2$s »."
+#~ "Adresse Jabber ou GTalk (ex : nom@exemple.org). Assurez-vous d’ajouter %s "
+#~ "à votre liste d’amis dans votre logiciel de messagerie instantanée ou "
+#~ "dans GTalk."
 
 #, fuzzy
-#~ msgid "Not allowed to log in."
-#~ msgstr "Non connecté."
+#~ msgid "Send me notices through Jabber/Google Talk."
+#~ msgstr "Envoyez-moi les avis par Jabber/GTalk."
+
+#, fuzzy
+#~ msgid "Publish a MicroID for my Jabber/Google Talk address."
+#~ msgstr "Publier un MicroID pour mon adresse Jabber/GTalk."
+
+#~ msgid "No Jabber ID."
+#~ msgstr "Aucun identifiant Jabber"
+
+#, fuzzy
+#~ msgid "Not a valid Jabber ID."
+#~ msgstr "Identifiant Jabber invalide."
+
+#~ msgid "That is already your Jabber ID."
+#~ msgstr "Vous utilisez déjà cet idenfiant Jabber."
+
+#~ msgid "That is not your Jabber ID."
+#~ msgstr "Ceci n’est pas votre identifiant Jabber."
+
+#~ msgid "Other settings"
+#~ msgstr "Autres paramètres"
+
+#~ msgid "Tag cloud"
+#~ msgstr "Nuage de marques"
+
+#~ msgid "Consumer key"
+#~ msgstr "Clé de l’utilisateur"
+
+#~ msgid "Consumer secret"
+#~ msgstr "Secret de l’utilisateur"
+
+#~ msgid "Request token URL"
+#~ msgstr "URL du jeton de requête"
+
+#~ msgid "Access token URL"
+#~ msgstr "URL du jeton d’accès"
+
+#~ msgid "Authorize URL"
+#~ msgstr "Autoriser l’URL"
+
+#~ msgid "Jabber"
+#~ msgstr "Jabber"
+
+#~ msgid "Photo"
+#~ msgstr "Photo"
+
+#~ msgid "Other options"
+#~ msgstr "Autres options"
+
+#~ msgid "Other"
+#~ msgstr "Autres"
+
+#~ msgid "Primary site navigation"
+#~ msgstr "Navigation primaire du site"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Personal profile and friends timeline"
+#~ msgstr "Profil personnel et flux des amis"
+
+#~ msgctxt "MENU"
+#~ msgid "Personal"
+#~ msgstr "Personnel"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Change your email, avatar, password, profile"
+#~ msgstr "Modifier votre adresse électronique, avatar, mot de passe, profil"
+
+#~ msgid "Account"
+#~ msgstr "Compte"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Connect to services"
+#~ msgstr "Se connecter aux services"
+
+#~ msgid "Connect"
+#~ msgstr "Connexion"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Change site configuration"
+#~ msgstr "Modifier la configuration du site"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Invite friends and colleagues to join you on %s"
+#~ msgstr "Inviter des amis et collègues à vous rejoindre sur %s"
+
+#~ msgctxt "MENU"
+#~ msgid "Invite"
+#~ msgstr "Inviter"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Create an account"
+#~ msgstr "Créer un compte"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Help me!"
+#~ msgstr "À l’aide !"
+
+#~ msgctxt "MENU"
+#~ msgid "Help"
+#~ msgstr "Aide"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Search for people or text"
+#~ msgstr "Rechercher des personnes ou du texte"
+
+#~ msgid "Local views"
+#~ msgstr "Vues locales"
+
+#~ msgid "Page notice"
+#~ msgstr "Avis de la page"
+
+#~ msgid "Secondary site navigation"
+#~ msgstr "Navigation secondaire du site"
+
+#~ msgid "StatusNet software license"
+#~ msgstr "Licence du logiciel StatusNet"
+
+#~ msgid "Site content license"
+#~ msgstr "Licence du contenu du site"
+
+#~ msgid "Pagination"
+#~ msgstr "Pagination"
+
+#~ msgid "Author"
+#~ msgstr "Auteur"
+
+#~ msgid "Provider"
+#~ msgstr "Fournisseur"
+
+#~ msgctxt "MENU"
+#~ msgid "SMS"
+#~ msgstr "SMS"
+
+#~ msgid "Filter tags"
+#~ msgstr "Filtrer les marques"
+
+#~ msgid "[%s]"
+#~ msgstr "[%s]"
+
+#~ msgid "Available characters"
+#~ msgstr "Caractères restants"
+
+#, fuzzy
+#~ msgctxt "MENU"
+#~ msgid "Profile"
+#~ msgstr "Profil"
+
+#~ msgid "Search help"
+#~ msgstr "Aide sur la recherche"
+
+#~ msgid "Unknown user. Go to %s to add your address to your account"
+#~ msgstr ""
+#~ "Utilisateur inconnu. Aller à %s pour ajouter votre adresse à votre compte."
+
+#~ msgid "Message too long. Maximum is %1$d character, you sent %2$d."
+#~ msgid_plural "Message too long. Maximum is %1$d characters, you sent %2$d."
+#~ msgstr[0] ""
+#~ "Message trop long ! La taille maximale est de %1$d caractère ; vous en "
+#~ "avez envoyé %2$d."
+#~ msgstr[1] ""
+#~ "Message trop long ! La taille maximale est de %1$d caractères ; vous en "
+#~ "avez envoyé %2$d."
diff --git a/locale/fur/LC_MESSAGES/statusnet.po b/locale/fur/LC_MESSAGES/statusnet.po
index d4c5b35ee2..83e8336715 100644
--- a/locale/fur/LC_MESSAGES/statusnet.po
+++ b/locale/fur/LC_MESSAGES/statusnet.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 15:58+0000\n"
-"PO-Revision-Date: 2011-03-03 16:00:31+0000\n"
+"POT-Creation-Date: 2011-03-03 17:23+0000\n"
+"PO-Revision-Date: 2011-03-03 17:26:01+0000\n"
 "Language-Team: Friulian <http://translatewiki.net/wiki/Portal:fur>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -76,23 +76,23 @@ msgstr ""
 #. TRANS: Tooltip for button to save access settings in site admin panel.
 #. TRANS: Button text for saving theme settings.
 #. TRANS: Button label to save e-mail preferences.
-#. TRANS: Button label to save Instant Messaging preferences.
-#. TRANS: Button text for saving "Other settings" in profile.
+#. TRANS: Button label to save IM preferences.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
 #. TRANS: Button text for saving site notice in admin panel.
 #. TRANS: Button label to save SMS preferences.
 #. TRANS: Save button for settings for a profile in a subscriptions list.
+#. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
 #. TRANS: Button text on profile design page to save settings.
 #: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
-#: actions/emailsettings.php:250 actions/imsettings.php:183
-#: actions/othersettings.php:136 actions/pathsadminpanel.php:512
-#: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
-#: actions/smssettings.php:205 actions/subscriptions.php:259
+#: actions/emailsettings.php:251 actions/imsettings.php:199
+#: actions/pathsadminpanel.php:512 actions/profilesettings.php:198
+#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:204
+#: actions/subscriptions.php:261 actions/urlsettings.php:152
 #: actions/useradminpanel.php:298 lib/applicationeditform.php:355
-#: lib/designsettings.php:270 lib/groupeditform.php:201
+#: lib/designform.php:320 lib/groupeditform.php:201
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Salve"
@@ -131,7 +131,11 @@ msgstr "La pagjine no esist."
 #. 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 use "one time password login" without using an existing user.
+#. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
+#. TRANS: Client error displayed trying to find a user by ID for a non-existing ID.
+#. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when calling a profile action without specifying a user.
 #: actions/all.php:80 actions/allrss.php:69
@@ -143,19 +147,19 @@ msgstr "La pagjine no esist."
 #: actions/apidirectmessage.php:75 actions/apidirectmessagenew.php:72
 #: actions/apigroupcreate.php:111 actions/apigroupismember.php:89
 #: actions/apigroupjoin.php:98 actions/apigroupleave.php:98
-#: actions/apigrouplist.php:70 actions/apistatusesupdate.php:230
-#: actions/apisubscriptions.php:85 actions/apitimelinefavorites.php:70
-#: actions/apitimelinefriends.php:173 actions/apitimelinehome.php:78
-#: actions/apitimelinementions.php:77 actions/apitimelineuser.php:79
-#: actions/avatarbynickname.php:79 actions/favoritesrss.php:72
-#: actions/foaf.php:42 actions/foaf.php:61 actions/hcard.php:67
-#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
-#: actions/remotesubscribe.php:144 actions/remotesubscribe.php:153
-#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
-#: actions/showfavorites.php:106 actions/userbyid.php:74
-#: actions/usergroups.php:93 actions/userrss.php:40 actions/userxrd.php:59
-#: actions/xrds.php:71 lib/command.php:509 lib/galleryaction.php:59
-#: lib/mailbox.php:80 lib/profileaction.php:77
+#: actions/apigrouplist.php:70 actions/apigroupprofileupdate.php:108
+#: actions/apistatusesupdate.php:230 actions/apisubscriptions.php:85
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:173
+#: actions/apitimelinehome.php:78 actions/apitimelinementions.php:77
+#: actions/apitimelineuser.php:79 actions/avatarbynickname.php:79
+#: actions/favoritesrss.php:72 actions/foaf.php:42 actions/foaf.php:61
+#: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116
+#: actions/otp.php:78 actions/remotesubscribe.php:144
+#: actions/remotesubscribe.php:153 actions/replies.php:73
+#: actions/repliesrss.php:38 actions/rsd.php:113 actions/showfavorites.php:106
+#: actions/userbyid.php:75 actions/usergroups.php:93 actions/userrss.php:40
+#: actions/userxrd.php:59 actions/xrds.php:71 lib/command.php:509
+#: lib/galleryaction.php:59 lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Utent no cjatât."
 
@@ -169,10 +173,9 @@ msgstr "%1$s e ams, page %2$d"
 #. TRANS: H1 text for page. %s is a user nickname.
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Timeline title for user and friends. %s is a user nickname.
-#. TRANS: Tooltop for personal group navigation menu option when logged in for viewing timeline of self and friends.
 #: actions/all.php:94 actions/all.php:191 actions/allrss.php:117
 #: actions/apitimelinefriends.php:207 actions/apitimelinehome.php:113
-#: lib/personalgroupnav.php:102
+#: lib/personalgroupnav.php:100
 #, php-format
 msgid "%s and friends"
 msgstr "%s e amîs"
@@ -226,7 +229,7 @@ msgstr ""
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
 #. TRANS: Second sentence of empty message for anonymous users. %s is a user nickname.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:227
+#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:221
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -273,19 +276,20 @@ msgstr "Inzornaments di %1$s e dai siei amîs su %2$s!"
 #: actions/apifavoritecreate.php:98 actions/apifavoritedestroy.php:98
 #: actions/apifriendshipscreate.php:99 actions/apifriendshipsdestroy.php:99
 #: actions/apifriendshipsshow.php:124 actions/apigroupcreate.php:138
-#: actions/apigroupismember.php:115 actions/apigroupjoin.php:160
-#: actions/apigroupleave.php:145 actions/apigrouplist.php:134
+#: actions/apigroupismember.php:115 actions/apigroupjoin.php:151
+#: actions/apigroupleave.php:141 actions/apigrouplist.php:134
 #: actions/apigrouplistall.php:120 actions/apigroupmembership.php:105
+#: actions/apigroupprofileupdate.php:100 actions/apigroupprofileupdate.php:213
 #: actions/apigroupshow.php:114 actions/apihelptest.php:84
 #: actions/apistatusesdestroy.php:101 actions/apistatusesretweets.php:110
 #: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:139
 #: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
-#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:268
-#: actions/apitimelinegroup.php:147 actions/apitimelinehome.php:173
-#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:239
-#: actions/apitimelineretweetedtome.php:118
-#: actions/apitimelineretweetsofme.php:150 actions/apitimelinetag.php:159
-#: actions/apitimelineuser.php:206 actions/apiusershow.php:100
+#: actions/apitimelinefavorites.php:182 actions/apitimelinefriends.php:276
+#: actions/apitimelinegroup.php:148 actions/apitimelinehome.php:181
+#: actions/apitimelinementions.php:182 actions/apitimelinepublic.php:247
+#: actions/apitimelineretweetedtome.php:147
+#: actions/apitimelineretweetsofme.php:147 actions/apitimelinetag.php:165
+#: actions/apitimelineuser.php:217 actions/apiusershow.php:100
 msgid "API method not found."
 msgstr ""
 
@@ -300,8 +304,9 @@ msgstr ""
 #: actions/apifavoritecreate.php:88 actions/apifavoritedestroy.php:88
 #: actions/apifriendshipscreate.php:89 actions/apifriendshipsdestroy.php:89
 #: actions/apigroupcreate.php:102 actions/apigroupjoin.php:89
-#: actions/apigroupleave.php:89 actions/apimediaupload.php:66
-#: actions/apistatusesretweet.php:63 actions/apistatusesupdate.php:194
+#: actions/apigroupleave.php:89 actions/apigroupprofileupdate.php:92
+#: actions/apimediaupload.php:66 actions/apistatusesretweet.php:63
+#: actions/apistatusesupdate.php:194
 msgid "This method requires a POST."
 msgstr ""
 
@@ -313,21 +318,16 @@ msgid ""
 msgstr ""
 
 #. TRANS: Server error displayed when a user's delivery device cannot be updated.
-#. TRANS: Server error displayed when a user update to the database fails in the contact address confirmation action.
 #. TRANS: Server error thrown on database error updating e-mail preferences.
 #. TRANS: Server error thrown on database error removing a registered e-mail address.
-#. TRANS: Server error thrown on database error updating Instant Messaging preferences.
-#. TRANS: Server error thrown on database error removing a registered Instant Messaging address.
-#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
 #. TRANS: Server error thrown when user profile settings could not be updated.
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
-#: actions/apiaccountupdatedeliverydevice.php:130
-#: actions/confirmaddress.php:118 actions/emailsettings.php:352
-#: actions/emailsettings.php:498 actions/imsettings.php:276
-#: actions/imsettings.php:432 actions/othersettings.php:186
-#: actions/profilesettings.php:322 actions/smssettings.php:301
-#: actions/smssettings.php:454
+#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
+#: actions/apiaccountupdatedeliverydevice.php:136
+#: actions/emailsettings.php:353 actions/emailsettings.php:499
+#: actions/profilesettings.php:323 actions/smssettings.php:300
+#: actions/smssettings.php:453 actions/urlsettings.php:211
 msgid "Could not update user."
 msgstr ""
 
@@ -353,7 +353,7 @@ msgstr "L'utent nol à un profîl."
 
 #. TRANS: Server error displayed if a user profile could not be saved.
 #. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:418
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:419
 msgid "Could not save profile."
 msgstr ""
 
@@ -365,7 +365,7 @@ msgstr ""
 #: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
 #: actions/designadminpanel.php:120 actions/editapplication.php:121
 #: actions/newapplication.php:102 actions/newnotice.php:95
-#: lib/designsettings.php:298
+#: lib/designsettings.php:110
 #, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s byte) due to its "
@@ -386,8 +386,8 @@ msgstr[1] ""
 #: actions/apiaccountupdateprofilecolors.php:160
 #: actions/apiaccountupdateprofilecolors.php:171
 #: actions/groupdesignsettings.php:285 actions/groupdesignsettings.php:296
-#: actions/userdesignsettings.php:201 actions/userdesignsettings.php:211
-#: actions/userdesignsettings.php:253 actions/userdesignsettings.php:263
+#: actions/userdesignsettings.php:218 actions/userdesignsettings.php:228
+#: actions/userdesignsettings.php:270 actions/userdesignsettings.php:280
 msgid "Unable to save your design settings."
 msgstr ""
 
@@ -395,7 +395,7 @@ msgstr ""
 #. TRANS: Client error displayed when a database error occurs updating profile colours.
 #: actions/apiaccountupdateprofilebackgroundimage.php:191
 #: actions/apiaccountupdateprofilecolors.php:139
-#: actions/userdesignsettings.php:179
+#: actions/userdesignsettings.php:196
 msgid "Could not update your design."
 msgstr ""
 
@@ -505,7 +505,7 @@ msgstr ""
 
 #. TRANS: Client error displayed trying to direct message another user who's not a friend (403).
 #: actions/apidirectmessagenew.php:144
-msgid "Can't send direct messages to users who aren't your friend."
+msgid "Cannot send direct messages to users who aren't your friend."
 msgstr ""
 
 #. TRANS: Client error displayed trying to direct message self (403).
@@ -586,9 +586,9 @@ msgstr ""
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:156 actions/editgroup.php:191
-#: actions/newgroup.php:137 actions/profilesettings.php:273
-#: actions/register.php:214
+#: actions/apigroupcreate.php:156 actions/apigroupprofileupdate.php:255
+#: actions/editgroup.php:191 actions/newgroup.php:137
+#: actions/profilesettings.php:274 actions/register.php:199
 msgid "Nickname already in use. Try another one."
 msgstr "Il sorenon al è za doprât. Provent un altri."
 
@@ -596,9 +596,9 @@ msgstr "Il sorenon al è za doprât. Provent un altri."
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:164 actions/editgroup.php:195
-#: actions/newgroup.php:141 actions/profilesettings.php:243
-#: actions/register.php:216
+#: actions/apigroupcreate.php:164 actions/apigroupprofileupdate.php:259
+#: actions/editgroup.php:195 actions/newgroup.php:141
+#: actions/profilesettings.php:244 actions/register.php:201
 msgid "Not a valid nickname."
 msgstr "Nol è un sorenon valit."
 
@@ -608,10 +608,10 @@ msgstr "Nol è un sorenon valit."
 #. TRANS: Validation error shown when providing an invalid homepage URL in the "New application" form.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:181 actions/editapplication.php:235
-#: actions/editgroup.php:202 actions/newapplication.php:221
-#: actions/newgroup.php:148 actions/profilesettings.php:248
-#: actions/register.php:223
+#: actions/apigroupcreate.php:181 actions/apigroupprofileupdate.php:277
+#: actions/editapplication.php:235 actions/editgroup.php:202
+#: actions/newapplication.php:221 actions/newgroup.php:148
+#: actions/profilesettings.php:249 actions/register.php:208
 msgid "Homepage is not a valid URL."
 msgstr "La pagjine web no je une direzion valide."
 
@@ -620,8 +620,8 @@ msgstr "La pagjine web no je une direzion valide."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:191 actions/editgroup.php:206
-#: actions/newgroup.php:152 actions/profilesettings.php:252
-#: actions/register.php:226
+#: actions/newgroup.php:152 actions/profilesettings.php:253
+#: actions/register.php:211
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "Il non complet al è masse lunc (max 255 caratars)."
 
@@ -648,8 +648,8 @@ msgstr[1] "La descrizion e je masse lungje (massim %d caratars)."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:215 actions/editgroup.php:218
-#: actions/newgroup.php:164 actions/profilesettings.php:265
-#: actions/register.php:235
+#: actions/newgroup.php:164 actions/profilesettings.php:266
+#: actions/register.php:220
 msgid "Location is too long (maximum 255 characters)."
 msgstr "Il lûc al è masse lunc (max 255 caratars)."
 
@@ -678,15 +678,16 @@ msgstr ""
 #. TRANS: %s is the alias that is already in use.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error. %s is the already used alias.
-#: actions/apigroupcreate.php:264 actions/editgroup.php:246
-#: actions/newgroup.php:193
+#: actions/apigroupcreate.php:264 actions/apigroupprofileupdate.php:351
+#: actions/editgroup.php:246 actions/newgroup.php:193
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to use an alias during group creation that is the same as the group's nickname.
 #. TRANS: Group edit form validation error.
-#: actions/apigroupcreate.php:278 actions/editgroup.php:253
+#: actions/apigroupcreate.php:278 actions/apigroupprofileupdate.php:359
+#: actions/editgroup.php:253
 msgid "Alias can't be the same as nickname."
 msgstr ""
 
@@ -698,7 +699,8 @@ msgstr ""
 #. TRANS: Client error displayed requesting most recent notices to a group for a non-existing group.
 #: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
 #: actions/apigroupleave.php:104 actions/apigroupmembership.php:71
-#: actions/apigroupshow.php:81 actions/apitimelinegroup.php:89
+#: actions/apigroupprofileupdate.php:113 actions/apigroupshow.php:81
+#: actions/apitimelinegroup.php:89
 msgid "Group not found."
 msgstr "Grup no cjatât."
 
@@ -716,13 +718,11 @@ msgstr "Tu fasis za part di chest grup."
 msgid "You have been blocked from that group by the admin."
 msgstr ""
 
-#. TRANS: Server error displayed when joining a group fails.
-#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
 #. 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.
 #. TRANS: Message given having failed to add a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:362
+#: actions/apigroupjoin.php:136 actions/joingroup.php:139 lib/command.php:362
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "No si à podût zontâ l'utent %1$s al grup %2$s."
@@ -732,8 +732,6 @@ msgstr "No si à podût zontâ l'utent %1$s al grup %2$s."
 msgid "You are not a member of this group."
 msgstr "No tu fasis part di chest grup."
 
-#. TRANS: Server error displayed when leaving a group fails.
-#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
 #. TRANS: Server error displayed when leaving a group failed in the database.
 #. TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
 #. TRANS: Message given having failed to remove a user from a group.
@@ -769,6 +767,61 @@ msgstr "Grups di %s"
 msgid "groups on %s"
 msgstr "grups su %s"
 
+#. TRANS: Client error displayed trying to edit a group while not being a group admin.
+#. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
+#. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
+#: actions/apigroupprofileupdate.php:118 actions/editgroup.php:110
+#: actions/editgroup.php:176 actions/groupdesignsettings.php:109
+#: actions/grouplogo.php:111
+msgid "You must be an admin to edit the group."
+msgstr ""
+
+#. TRANS: Server error displayed when editing a group fails.
+#: actions/apigroupprofileupdate.php:171 actions/editgroup.php:274
+msgid "Could not update group."
+msgstr ""
+
+#. TRANS: Server error displayed when group aliases could not be added.
+#. TRANS: Server exception thrown when creating group aliases failed.
+#: actions/apigroupprofileupdate.php:194 actions/editgroup.php:281
+#: classes/User_group.php:540
+msgid "Could not create aliases."
+msgstr ""
+
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: actions/apigroupprofileupdate.php:249 lib/nickname.php:165
+msgid "Nickname must have only lowercase letters and numbers and no spaces."
+msgstr ""
+
+#: actions/apigroupprofileupdate.php:286
+#, fuzzy
+msgid "Full name is too long (max 255 chars)."
+msgstr "Il non complet al è masse lunc (max 255 caratars)."
+
+#: actions/apigroupprofileupdate.php:296
+#, fuzzy, php-format
+msgid "description is too long (max %d chars)."
+msgstr "La descrizion e je masse lungje (massim %d caratar)."
+
+#: actions/apigroupprofileupdate.php:307
+#, fuzzy
+msgid "Location is too long (max 255 chars)."
+msgstr "Il lûc al è masse lunc (max 255 caratars)."
+
+#: actions/apigroupprofileupdate.php:326
+#, php-format
+msgid "Too many aliases! Maximum %d."
+msgstr ""
+
+#. TRANS: Group edit form validation error.
+#. TRANS: Group create form validation error.
+#. TRANS: %s is the invalid alias.
+#: actions/apigroupprofileupdate.php:342 actions/editgroup.php:241
+#: actions/newgroup.php:188
+#, php-format
+msgid "Invalid alias: \"%s\""
+msgstr ""
+
 #. TRANS: Client error displayed when uploading a media file has failed.
 #: actions/apimediaupload.php:101
 msgid "Upload failed."
@@ -799,21 +852,22 @@ msgstr ""
 #. TRANS: Form validation error message.
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
+#. TRANS: Client error displayed when the session token is not okay.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
 #: actions/deletenotice.php:177 actions/disfavor.php:75
-#: actions/emailsettings.php:291 actions/favor.php:75 actions/geocode.php:55
+#: actions/emailsettings.php:292 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:65 actions/grouplogo.php:321
-#: actions/groupunblock.php:65 actions/imsettings.php:224
-#: actions/invite.php:60 actions/login.php:137 actions/makeadmin.php:66
-#: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
-#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
-#: actions/othersettings.php:155 actions/passwordsettings.php:138
-#: actions/profilesettings.php:217 actions/recoverpassword.php:383
-#: actions/register.php:172 actions/remotesubscribe.php:76
-#: actions/repeat.php:82 actions/smssettings.php:250 actions/subedit.php:40
-#: actions/subscribe.php:86 actions/tagother.php:166
-#: actions/unsubscribe.php:69 actions/userauthorization.php:52
-#: lib/designsettings.php:310
+#: actions/groupunblock.php:65 actions/imsettings.php:241
+#: actions/invite.php:60 actions/makeadmin.php:66 actions/newmessage.php:135
+#: actions/newnotice.php:105 actions/nudge.php:80
+#: actions/oauthappssettings.php:162 actions/oauthconnectionssettings.php:135
+#: actions/passwordsettings.php:137 actions/pluginenable.php:87
+#: actions/profilesettings.php:218 actions/recoverpassword.php:383
+#: actions/register.php:157 actions/remotesubscribe.php:76
+#: actions/repeat.php:82 actions/smssettings.php:249 actions/subedit.php:40
+#: actions/subscribe.php:87 actions/tagother.php:145
+#: actions/unsubscribe.php:69 actions/urlsettings.php:171
+#: actions/userauthorization.php:53 lib/designsettings.php:122
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 
@@ -841,10 +895,10 @@ msgstr ""
 #. TRANS: Unknown form validation error in design settings form.
 #: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
 #: actions/designadminpanel.php:100 actions/editapplication.php:144
-#: actions/emailsettings.php:310 actions/grouplogo.php:332
-#: actions/imsettings.php:239 actions/newapplication.php:124
-#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
-#: actions/smssettings.php:271 lib/designsettings.php:321
+#: actions/emailsettings.php:311 actions/grouplogo.php:332
+#: actions/imsettings.php:256 actions/newapplication.php:124
+#: actions/oauthconnectionssettings.php:144 actions/recoverpassword.php:46
+#: actions/smssettings.php:270 lib/designsettings.php:133
 msgid "Unexpected form submission."
 msgstr ""
 
@@ -887,31 +941,26 @@ msgstr "Identitât"
 
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Field label in form for profile settings.
-#. TRANS: Label for group nickname (dt). Text hidden by default.
-#. TRANS: DT for nick name in a profile.
-#: actions/apioauthauthorize.php:459 actions/login.php:252
-#: actions/profilesettings.php:106 actions/register.php:432
-#: actions/showgroup.php:243 actions/tagother.php:94
+#: actions/apioauthauthorize.php:459 actions/login.php:225
+#: actions/profilesettings.php:107 actions/register.php:411
 #: actions/userauthorization.php:145 lib/groupeditform.php:145
-#: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "Sorenon"
 
 #. TRANS: Field label on OAuth API authorisation form.
-#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:463 actions/login.php:255
-#: actions/register.php:436 lib/accountsettingsaction.php:120
+#: actions/apioauthauthorize.php:463 actions/login.php:228
+#: actions/register.php:415 lib/settingsnav.php:87
 msgid "Password"
 msgstr "Password"
 
 #. TRANS: Button text that when clicked will cancel the process of allowing access to an account
 #. TRANS: by an external application.
 #. TRANS: Button label to cancel an e-mail address confirmation procedure.
-#. TRANS: Button label to cancel an Instant Messaging address confirmation procedure.
+#. TRANS: Button label to cancel an IM address confirmation procedure.
 #. TRANS: Button label to cancel a SMS address confirmation procedure.
 #. TRANS: Button label in the "Edit application" form.
-#: actions/apioauthauthorize.php:478 actions/emailsettings.php:124
-#: actions/imsettings.php:127 actions/smssettings.php:133
+#: actions/apioauthauthorize.php:478 actions/emailsettings.php:125
+#: actions/imsettings.php:136 actions/smssettings.php:132
 #: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Cancel"
@@ -1018,9 +1067,9 @@ msgstr ""
 #. TRANS: Exception thrown requesting an unsupported notice output format.
 #. TRANS: %s is the requested output format.
 #: actions/apistatusesshow.php:144
-#, fuzzy, php-format
-msgid "Unsupported format: %s"
-msgstr "No tu sês plui sotscrit a %s."
+#, php-format
+msgid "Unsupported format: %s."
+msgstr ""
 
 #. TRANS: Client error displayed requesting a deleted status.
 #: actions/apistatusesshow.php:155
@@ -1101,13 +1150,6 @@ msgstr "%1$s / Preferîts di %2$s"
 msgid "%1$s updates favorited by %2$s / %3$s."
 msgstr "%1$s inzornaments preferîts di %2$s / %3$s."
 
-#. TRANS: Server error displayed when generating an Atom feed fails.
-#. TRANS: %s is the error.
-#: actions/apitimelinegroup.php:134
-#, php-format
-msgid "Could not generate feed for group - %s"
-msgstr ""
-
 #. TRANS: Title for timeline of most recent mentions of a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname.
 #: actions/apitimelinementions.php:115
@@ -1124,13 +1166,14 @@ msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr "Inzornaments di %1$s che a rispuindin a inzornaments di %2$s / %3$s."
 
 #. TRANS: Title for site timeline. %s is the StatusNet sitename.
+#. TRANS: Public RSS feed title. %s is the StatusNet site name.
 #: actions/apitimelinepublic.php:193 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "Ativitât publiche di %s"
 
 #. TRANS: Subtitle for site timeline. %s is the StatusNet sitename.
-#: actions/apitimelinepublic.php:199 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:199
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "Inzornaments di %s di ducj cuancj!"
@@ -1141,21 +1184,33 @@ msgid "Unimplemented."
 msgstr ""
 
 #. TRANS: Title for Atom feed "repeated to me". %s is the user nickname.
-#: actions/apitimelineretweetedtome.php:108
+#: actions/apitimelineretweetedtome.php:96
 #, php-format
 msgid "Repeated to %s"
 msgstr "Ripetût a %s"
 
+#: actions/apitimelineretweetedtome.php:98
+#, fuzzy, php-format
+msgid "%1$s notices that were to repeated to %2$s / %3$s."
+msgstr "Inzornaments di %1$s che a rispuindin a inzornaments di %2$s / %3$s."
+
 #. TRANS: Title of list of repeated notices of the logged in user.
 #. TRANS: %s is the nickname of the logged in user.
-#: actions/apitimelineretweetsofme.php:112
+#: actions/apitimelineretweetsofme.php:98
 #, php-format
 msgid "Repeats of %s"
 msgstr "Ripetizions di %s"
 
+#: actions/apitimelineretweetsofme.php:104
+#, fuzzy, php-format
+msgid "%1$s notices that %2$s / %3$s has repeated."
+msgstr "%1$s al à segnât l'avîs %2$s come preferît."
+
 #. TRANS: Title for timeline with lastest notices with a given tag.
 #. TRANS: %s is the tag.
-#: actions/apitimelinetag.php:101 actions/tag.php:67
+#. TRANS: Title for first page of notices with tags.
+#. TRANS: %s is the tag.
+#: actions/apitimelinetag.php:101 actions/tag.php:69
 #, php-format
 msgid "Notices tagged with %s"
 msgstr "Avîs etichetâts cun %s"
@@ -1168,53 +1223,54 @@ msgid "Updates tagged with %1$s on %2$s!"
 msgstr "Inzornaments etichetâts cun %1$s su %2$s!"
 
 #. TRANS: Client error displayed trying to add a notice to another user's timeline.
-#: actions/apitimelineuser.php:297
+#: actions/apitimelineuser.php:308
 msgid "Only the user can add to their own timeline."
 msgstr ""
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:304
+#: actions/apitimelineuser.php:315
 msgid "Only accept AtomPub for Atom feeds."
 msgstr ""
 
 #. TRANS: Client error displayed attempting to post an empty API notice.
-#: actions/apitimelineuser.php:311
+#: actions/apitimelineuser.php:322
 msgid "Atom post must not be empty."
 msgstr ""
 
 #. TRANS: Client error displayed attempting to post an API that is not well-formed XML.
-#: actions/apitimelineuser.php:317
+#: actions/apitimelineuser.php:328
 msgid "Atom post must be well-formed XML."
 msgstr ""
 
 #. TRANS: Client error displayed when not using an Atom entry.
-#: actions/apitimelineuser.php:323 actions/atompubfavoritefeed.php:228
+#: actions/apitimelineuser.php:334 actions/atompubfavoritefeed.php:228
 #: actions/atompubmembershipfeed.php:230
 #: actions/atompubsubscriptionfeed.php:236
 msgid "Atom post must be an Atom entry."
 msgstr ""
 
 #. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
-#: actions/apitimelineuser.php:335
+#: actions/apitimelineuser.php:345
 msgid "Can only handle POST activities."
 msgstr ""
 
 #. TRANS: Client error displayed when using an unsupported activity object type.
 #. TRANS: %s is the unsupported activity object type.
-#: actions/apitimelineuser.php:346
+#: actions/apitimelineuser.php:356
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
 #. TRANS: %d is the notice ID (number).
-#: actions/apitimelineuser.php:380
+#: actions/apitimelineuser.php:390
 #, php-format
 msgid "No content for notice %d."
 msgstr ""
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:408
+#. TRANS: %s is the notice URI.
+#: actions/apitimelineuser.php:419
 #, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr ""
@@ -1231,9 +1287,10 @@ msgstr "L'utent nol è stât cjatât."
 
 #. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
 #. TRANS: Client exception.
+#. TRANS: Client error displayed trying to subscribe to a non-existing profile.
 #: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
 #: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
-#: actions/subscribe.php:107
+#: actions/subscribe.php:110
 msgid "No such profile."
 msgstr "Il profîl nol esist."
 
@@ -1368,7 +1425,7 @@ msgid "Not a member."
 msgstr ""
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
-#: actions/atompubshowmembership.php:151
+#: actions/atompubshowmembership.php:150
 msgid "Cannot delete someone else's membership."
 msgstr ""
 
@@ -1455,10 +1512,7 @@ msgid "Invalid size."
 msgstr "La dimension no je valide."
 
 #. TRANS: Title for avatar upload page.
-#. TRANS: Label for group avatar (dt). Text hidden by default.
-#. TRANS: Link description in user account settings menu.
-#: actions/avatarsettings.php:66 actions/showgroup.php:227
-#: lib/accountsettingsaction.php:113
+#: actions/avatarsettings.php:66 lib/settingsnav.php:82
 msgid "Avatar"
 msgstr "Avatar"
 
@@ -1472,9 +1526,11 @@ msgstr ""
 
 #. TRANS: Server error displayed in avatar upload page when no matching profile can be found for a user.
 #. TRANS: Server error displayed coming across a request from a user without a profile.
+#. TRANS: Server error displayed when trying to authorise a remote subscription request
+#. TRANS: while the user has no profile.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
 #: actions/grouplogo.php:184 actions/remotesubscribe.php:190
-#: actions/userauthorization.php:72 actions/userrss.php:108
+#: actions/userauthorization.php:75 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr ""
 
@@ -1529,10 +1585,9 @@ msgstr "Taie"
 msgid "No file uploaded."
 msgstr "No si à cjamât nissun file."
 
-#. TRANS: Avatar upload form unstruction after uploading a file.
+#. TRANS: Avatar upload form instruction after uploading a file.
 #: actions/avatarsettings.php:345
-#, fuzzy
-msgid "Pick a square area of the image to be your avatar"
+msgid "Pick a square area of the image to be your avatar."
 msgstr "Cjape une aree retangolâr de figure par doprâle come avatar."
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
@@ -1558,7 +1613,7 @@ msgstr "Avatar eliminât."
 
 #. TRANS: Title for backup account page.
 #. TRANS: Option in profile settings to create a backup of the account of the currently logged in user.
-#: actions/backupaccount.php:61 actions/profilesettings.php:467
+#: actions/backupaccount.php:61 actions/profilesettings.php:468
 msgid "Backup account"
 msgstr ""
 
@@ -1590,7 +1645,7 @@ msgstr ""
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
 #: actions/backupaccount.php:254
-msgid "Backup your account"
+msgid "Backup your account."
 msgstr ""
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
@@ -1628,8 +1683,7 @@ msgstr "No"
 
 #. TRANS: Submit button title for 'No' when blocking a user.
 #: actions/block.php:158
-#, fuzzy
-msgid "Do not block this user"
+msgid "Do not block this user."
 msgstr "No stâ blocâ chest utent"
 
 #. TRANS: Button label on the user block form.
@@ -1646,9 +1700,8 @@ msgid "Yes"
 msgstr "Sì"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#. TRANS: Description of the form to block a user.
-#: actions/block.php:165 lib/blockform.php:79
-msgid "Block this user"
+#: actions/block.php:165
+msgid "Block this user."
 msgstr "Bloche chest utent"
 
 #. TRANS: Server error displayed when blocking a user fails.
@@ -1714,31 +1767,44 @@ msgstr ""
 msgid "That confirmation code is not for you!"
 msgstr ""
 
-#. TRANS: Server error for a unknow address type %s, which can be 'email', 'jabber', or 'sms'.
-#: actions/confirmaddress.php:92
+#. TRANS: Server error for an unknown address type, which can be 'email', 'sms', or the name of an IM network (such as 'xmpp' or 'aim')
+#: actions/confirmaddress.php:94
 #, php-format
-msgid "Unrecognized address type %s."
+msgid "Unrecognized address type %s"
 msgstr ""
 
 #. TRANS: Client error for an already confirmed email/jabber/sms address.
-#: actions/confirmaddress.php:97
+#: actions/confirmaddress.php:103 actions/confirmaddress.php:136
 msgid "That address has already been confirmed."
 msgstr ""
 
+#: actions/confirmaddress.php:121 actions/imsettings.php:444
+#: actions/userdesignsettings.php:306
+msgid "Couldn't update user."
+msgstr ""
+
+#: actions/confirmaddress.php:144
+msgid "Couldn't update user im preferences."
+msgstr ""
+
+#: actions/confirmaddress.php:156
+msgid "Couldn't insert user im preferences."
+msgstr ""
+
 #. TRANS: Server error displayed when an address confirmation code deletion from the
 #. TRANS: database fails in the contact address confirmation action.
-#: actions/confirmaddress.php:132
+#: actions/confirmaddress.php:169
 msgid "Could not delete address confirmation."
 msgstr ""
 
 #. TRANS: Title for the contact address confirmation action.
-#: actions/confirmaddress.php:150
+#: actions/confirmaddress.php:185
 msgid "Confirm address"
 msgstr "Conferme la direzion"
 
 #. TRANS: Success message for the contact address confirmation action.
 #. TRANS: %s can be 'email', 'jabber', or 'sms'.
-#: actions/confirmaddress.php:166
+#: actions/confirmaddress.php:200
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "La direzion \"%s\" e je stade confermade pe tô identitât."
@@ -1752,6 +1818,7 @@ msgstr "Tabaiade"
 #. TRANS: Label for user statistics.
 #: actions/conversation.php:149 lib/noticelist.php:87
 #: lib/profileaction.php:246 lib/searchgroupnav.php:82
+#: lib/threadednoticelist.php:66
 msgid "Notices"
 msgstr "Avîs"
 
@@ -1784,7 +1851,7 @@ msgstr "La identitât e je stade eliminade."
 
 #. TRANS: Page title for page on which a user account can be deleted.
 #. TRANS: Option in profile settings to delete the account of the currently logged in user.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:475
+#: actions/deleteaccount.php:228 actions/profilesettings.php:476
 msgid "Delete account"
 msgstr "Elimine la identitât"
 
@@ -1807,7 +1874,7 @@ msgstr ""
 #. TRANS: Field label for delete account confirmation entry.
 #. TRANS: Field label for password reset form where the password has to be typed again.
 #: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:262 actions/register.php:440
+#: actions/recoverpassword.php:262 actions/register.php:419
 msgid "Confirm"
 msgstr "Conferme"
 
@@ -1836,14 +1903,14 @@ msgstr ""
 #. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
 #: actions/deleteapplication.php:79 actions/editapplication.php:78
-#: actions/showapplication.php:94
+#: actions/showapplication.php:90
 msgid "You are not the owner of this application."
 msgstr ""
 
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
-#: actions/newapplication.php:112 actions/showapplication.php:118
-#: lib/action.php:1425
+#: actions/newapplication.php:112 actions/showapplication.php:113
+#: lib/action.php:1391
 msgid "There was a problem with your session token."
 msgstr ""
 
@@ -1863,14 +1930,12 @@ msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting an application.
 #: actions/deleteapplication.php:161
-#, fuzzy
-msgid "Do not delete this application"
-msgstr "Elimine cheste aplicazion"
+msgid "Do not delete this application."
+msgstr ""
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
 #: actions/deleteapplication.php:167
-#, fuzzy
-msgid "Delete this application"
+msgid "Delete this application."
 msgstr "Elimine cheste aplicazion"
 
 #. TRANS: Client error when trying to delete group while not logged in.
@@ -1921,14 +1986,12 @@ msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting a group.
 #: actions/deletegroup.php:224
-#, fuzzy
-msgid "Do not delete this group"
-msgstr "No stâ eliminâ chest utent"
+msgid "Do not delete this group."
+msgstr ""
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
 #: actions/deletegroup.php:231
-#, fuzzy
-msgid "Delete this group"
+msgid "Delete this group."
 msgstr "Elimine chest grup."
 
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
@@ -1936,14 +1999,16 @@ msgstr "Elimine chest grup."
 #. TRANS: Client error displayed when trying to mark a notice as favorite without being logged in.
 #. TRANS: Client error displayed trying to block a user from a group while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
+#. TRANS: Client error displayed trying to log out when not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
+#. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
 #. TRANS: Client error displayed when trying to change user options while not logged in.
 #: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
-#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:69
+#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:70
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
-#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
-#: actions/tagother.php:33 actions/unsubscribe.php:52
+#: actions/nudge.php:63 actions/pluginenable.php:97 actions/subedit.php:33
+#: actions/subscribe.php:98 actions/tagother.php:33 actions/unsubscribe.php:52
 #: lib/adminpanelaction.php:71 lib/profileformaction.php:63
 #: lib/settingsaction.php:72
 msgid "Not logged in."
@@ -1971,13 +2036,12 @@ msgstr "Sêstu sigûr di volê eliminâ chest avîs?"
 
 #. TRANS: Submit button title for 'No' when deleting a notice.
 #: actions/deletenotice.php:159
-#, fuzzy
-msgid "Do not delete this notice"
+msgid "Do not delete this notice."
 msgstr "No stâ eliminâ chest avîs"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:166 lib/noticelist.php:673
-msgid "Delete this notice"
+#: actions/deletenotice.php:166
+msgid "Delete this notice."
 msgstr "Elimine chest avîs"
 
 #. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
@@ -2010,19 +2074,16 @@ msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting a user.
 #: actions/deleteuser.php:158
-#, fuzzy
-msgid "Do not delete this user"
+msgid "Do not delete this user."
 msgstr "No stâ eliminâ chest utent"
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
-#. TRANS: Description of form for deleting a user.
-#: actions/deleteuser.php:165 lib/deleteuserform.php:75
-msgid "Delete this user"
+#: actions/deleteuser.php:165
+msgid "Delete this user."
 msgstr "Elimine chest utent"
 
 #. TRANS: Message used as title for design settings for the site.
-#. TRANS: Link description in user account settings menu.
-#: actions/designadminpanel.php:60 lib/accountsettingsaction.php:134
+#: actions/designadminpanel.php:60 lib/settingsnav.php:97
 msgid "Design"
 msgstr ""
 
@@ -2089,8 +2150,7 @@ msgid "You can upload a custom StatusNet theme as a .ZIP archive."
 msgstr ""
 
 #. TRANS: Fieldset legend for theme background image.
-#. TRANS: Fieldset legend on profile design page.
-#: actions/designadminpanel.php:515 lib/designsettings.php:98
+#: actions/designadminpanel.php:515
 msgid "Change background image"
 msgstr ""
 
@@ -2098,7 +2158,7 @@ msgstr ""
 #. TRANS: Field label for background color selector.
 #. TRANS: Label on profile design page for setting a profile page background colour.
 #: actions/designadminpanel.php:525 actions/designadminpanel.php:609
-#: lib/designsettings.php:183
+#: lib/designform.php:238
 msgid "Background"
 msgstr ""
 
@@ -2123,13 +2183,13 @@ msgstr "Disativade"
 #. TRANS: Form guide for turning background image on or off on theme designer page.
 #. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
 #. TRANS: use of the uploaded profile image.
-#: actions/designadminpanel.php:577 lib/designsettings.php:159
+#: actions/designadminpanel.php:577 lib/designform.php:214
 msgid "Turn background image on or off."
 msgstr ""
 
 #. TRANS: Checkbox label to title background image on theme designer page.
 #. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-#: actions/designadminpanel.php:583 lib/designsettings.php:165
+#: actions/designadminpanel.php:583 lib/designform.php:220
 msgid "Tile background image"
 msgstr ""
 
@@ -2140,25 +2200,25 @@ msgstr "Cambie i colôrs"
 
 #. TRANS: Field label for content color selector.
 #. TRANS: Label on profile design page for setting a profile page content colour.
-#: actions/designadminpanel.php:623 lib/designsettings.php:197
+#: actions/designadminpanel.php:623 lib/designform.php:252
 msgid "Content"
 msgstr "Contignût"
 
 #. TRANS: Field label for sidebar color selector.
 #. TRANS: Label on profile design page for setting a profile page sidebar colour.
-#: actions/designadminpanel.php:637 lib/designsettings.php:211
+#: actions/designadminpanel.php:637 lib/designform.php:266
 msgid "Sidebar"
 msgstr "Bare in bande"
 
 #. TRANS: Field label for text color selector.
 #. TRANS: Label on profile design page for setting a profile page text colour.
-#: actions/designadminpanel.php:651 lib/designsettings.php:225
+#: actions/designadminpanel.php:651 lib/designform.php:280
 msgid "Text"
 msgstr "Test"
 
 #. TRANS: Field label for link color selector.
 #. TRANS: Label on profile design page for setting a profile page links colour.
-#: actions/designadminpanel.php:665 lib/designsettings.php:239
+#: actions/designadminpanel.php:665 lib/designform.php:294
 msgid "Links"
 msgstr "Leams"
 
@@ -2179,21 +2239,18 @@ msgid "Use defaults"
 msgstr "Dopre i parametris predeterminâts"
 
 #. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: actions/designadminpanel.php:720 lib/designsettings.php:259
-msgid "Restore default designs"
+#: actions/designadminpanel.php:720
+msgid "Restore default designs."
 msgstr ""
 
 #. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: actions/designadminpanel.php:728 lib/designsettings.php:267
-msgid "Reset back to default"
+#: actions/designadminpanel.php:728
+msgid "Reset back to default."
 msgstr ""
 
 #. TRANS: Title for button for saving theme settings.
-#. TRANS: Title for button on profile design page to save settings.
-#: actions/designadminpanel.php:736 lib/designsettings.php:272
-msgid "Save design"
+#: actions/designadminpanel.php:736
+msgid "Save design."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
@@ -2225,7 +2282,7 @@ msgid "You must be logged in to edit an application."
 msgstr ""
 
 #. TRANS: Client error displayed trying to edit an application that does not exist.
-#: actions/editapplication.php:83 actions/showapplication.php:87
+#: actions/editapplication.php:83 actions/showapplication.php:83
 msgid "No such application."
 msgstr ""
 
@@ -2316,80 +2373,53 @@ msgstr "Cambie il grup %s"
 msgid "You must be logged in to create a group."
 msgstr ""
 
-#. TRANS: Client error displayed trying to edit a group while not being a group admin.
-#. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
-#. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
-#: actions/editgroup.php:110 actions/editgroup.php:176
-#: actions/groupdesignsettings.php:109 actions/grouplogo.php:111
-msgid "You must be an admin to edit the group."
-msgstr ""
-
 #. TRANS: Form instructions for group edit form.
 #: actions/editgroup.php:161
 msgid "Use this form to edit the group."
 msgstr ""
 
-#. TRANS: Group edit form validation error.
-#. TRANS: Group create form validation error.
-#. TRANS: %s is the invalid alias.
-#: actions/editgroup.php:241 actions/newgroup.php:188
-#, php-format
-msgid "Invalid alias: \"%s\""
-msgstr ""
-
-#. TRANS: Server error displayed when editing a group fails.
-#: actions/editgroup.php:274
-msgid "Could not update group."
-msgstr ""
-
-#. TRANS: Server error displayed when group aliases could not be added.
-#. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/editgroup.php:281 classes/User_group.php:540
-msgid "Could not create aliases."
-msgstr ""
-
 #. TRANS: Group edit form success message.
 #: actions/editgroup.php:301
 msgid "Options saved."
 msgstr "Opzions salvadis."
 
 #. TRANS: Title for e-mail settings.
-#: actions/emailsettings.php:59
+#: actions/emailsettings.php:60
 msgid "Email settings"
 msgstr "Impuestazions pe pueste eletroniche"
 
 #. TRANS: E-mail settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/emailsettings.php:73
+#: actions/emailsettings.php:74
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 msgstr "Gjestìs cemût che tu ricevis la pueste di %%site.name%%."
 
 #. TRANS: Form legend for e-mail settings form.
 #. TRANS: Field label for e-mail address input in e-mail settings form.
-#: actions/emailsettings.php:103 actions/emailsettings.php:129
+#: actions/emailsettings.php:104 actions/emailsettings.php:130
 msgid "Email address"
 msgstr "Direzion di pueste eletroniche"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:109
+#: actions/emailsettings.php:110
 msgid "Current confirmed email address."
 msgstr "Atuâl direzion di pueste confermade."
 
 #. TRANS: Button label to remove a confirmed e-mail address.
 #. TRANS: Button label for removing a set sender e-mail address to post notices from.
-#. TRANS: Button label to remove a confirmed Instant Messaging address.
+#. TRANS: Button label to remove a confirmed IM address.
 #. TRANS: Button label to remove a confirmed SMS address.
 #. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
-#: actions/emailsettings.php:112 actions/emailsettings.php:179
-#: actions/imsettings.php:112 actions/smssettings.php:120
-#: actions/smssettings.php:176
+#: actions/emailsettings.php:113 actions/emailsettings.php:180
+#: actions/imsettings.php:119 actions/smssettings.php:119
+#: actions/smssettings.php:175
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Gjave"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:119
+#: actions/emailsettings.php:120
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -2402,44 +2432,44 @@ msgstr ""
 #. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
 #. TRANS: Any other domain may be owned by a legitimate person or
 #. TRANS: organization.
-#: actions/emailsettings.php:136
+#: actions/emailsettings.php:137
 msgid "Email address, like \"UserName@example.org\""
 msgstr "Direzion di pueste eletroniche, come \"nonutent@example.org\""
 
 #. TRANS: Button label for adding an e-mail address in e-mail settings form.
-#. TRANS: Button label for adding an Instant Messaging address in Instant Messaging settings form.
+#. TRANS: Button label for adding an IM address in IM settings form.
 #. TRANS: Button label for adding a SMS phone number in SMS settings form.
-#: actions/emailsettings.php:140 actions/imsettings.php:147
-#: actions/smssettings.php:158
+#: actions/emailsettings.php:141 actions/imsettings.php:147
+#: actions/smssettings.php:157
 msgctxt "BUTTON"
 msgid "Add"
 msgstr "Zonte"
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:148 actions/smssettings.php:167
+#: actions/emailsettings.php:149 actions/smssettings.php:166
 msgid "Incoming email"
 msgstr "Pueste in jentrade"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:154
+#: actions/emailsettings.php:155
 msgid "I want to post notices by email."
 msgstr "O vuei publicâ avîs par pueste eletroniche."
 
 #. TRANS: Form instructions for incoming e-mail form in e-mail settings.
 #. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
-#: actions/emailsettings.php:176 actions/smssettings.php:174
+#: actions/emailsettings.php:177 actions/smssettings.php:173
 msgid "Send email to this address to post new notices."
 msgstr ""
 
 #. TRANS: Instructions for incoming e-mail address input form, when an address has already been assigned.
 #. TRANS: Instructions for incoming SMS e-mail address input form.
-#: actions/emailsettings.php:185 actions/smssettings.php:182
+#: actions/emailsettings.php:186 actions/smssettings.php:181
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr ""
 
 #. TRANS: Instructions for incoming e-mail address input form.
-#: actions/emailsettings.php:189
+#: actions/emailsettings.php:190
 msgid ""
 "To send notices via email, we need to create a unique email address for you "
 "on this server:"
@@ -2447,87 +2477,87 @@ msgstr ""
 
 #. TRANS: Button label for adding an e-mail address to send notices from.
 #. TRANS: Button label for adding an SMS e-mail address to send notices from.
-#: actions/emailsettings.php:195 actions/smssettings.php:185
+#: actions/emailsettings.php:196 actions/smssettings.php:184
 msgctxt "BUTTON"
 msgid "New"
 msgstr "Gnûf"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:204
+#: actions/emailsettings.php:205
 msgid "Email preferences"
 msgstr "Preferencis de pueste eletroniche"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:212
+#: actions/emailsettings.php:213
 msgid "Send me notices of new subscriptions through email."
 msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:218
+#: actions/emailsettings.php:219
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:225
+#: actions/emailsettings.php:226
 msgid "Send me email when someone sends me a private message."
 msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:231
+#: actions/emailsettings.php:232
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:237
+#: actions/emailsettings.php:238
 msgid "Allow friends to nudge me and send me an email."
 msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:243
+#: actions/emailsettings.php:244
 msgid "Publish a MicroID for my email address."
 msgstr ""
 
 #. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:361
+#: actions/emailsettings.php:362
 msgid "Email preferences saved."
 msgstr ""
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:380
+#: actions/emailsettings.php:381
 msgid "No email address."
 msgstr "Nissune direzion di pueste eletroniche."
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:388
+#: actions/emailsettings.php:389
 msgid "Cannot normalize that email address."
 msgstr ""
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:393 actions/register.php:212
+#: actions/emailsettings.php:394 actions/register.php:197
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "La direzion di pueste eletroniche no je valide."
 
 #. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:397
+#: actions/emailsettings.php:398
 msgid "That is already your email address."
 msgstr ""
 
 #. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:401
+#: actions/emailsettings.php:402
 msgid "That email address already belongs to another user."
 msgstr ""
 
 #. TRANS: Server error thrown on database error adding e-mail confirmation code.
 #. TRANS: Server error thrown on database error adding Instant Messaging confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:418 actions/imsettings.php:343
-#: actions/smssettings.php:365
+#: actions/emailsettings.php:419 actions/imsettings.php:362
+#: actions/smssettings.php:364
 msgid "Could not insert confirmation code."
 msgstr ""
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:425
+#: actions/emailsettings.php:426
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
@@ -2536,57 +2566,60 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling Instant Messaging address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:445 actions/imsettings.php:377
-#: actions/smssettings.php:399
+#: actions/emailsettings.php:446 actions/imsettings.php:391
+#: actions/smssettings.php:398
 msgid "No pending confirmation to cancel."
 msgstr ""
 
 #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:450
+#: actions/emailsettings.php:451
 msgid "That is the wrong email address."
 msgstr ""
 
 #. TRANS: Server error thrown on database error canceling e-mail address confirmation.
 #. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
-#: actions/emailsettings.php:459 actions/smssettings.php:413
+#: actions/emailsettings.php:460 actions/smssettings.php:412
 msgid "Could not delete email confirmation."
 msgstr ""
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:464
+#: actions/emailsettings.php:465
 msgid "Email confirmation cancelled."
 msgstr ""
 
 #. TRANS: Message given trying to remove an e-mail address that is not
 #. TRANS: registered for the active user.
-#: actions/emailsettings.php:483
+#: actions/emailsettings.php:484
 msgid "That is not your email address."
 msgstr ""
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:504
+#: actions/emailsettings.php:505
 msgid "The email address was removed."
 msgstr ""
 
 #. TRANS: Form validation error displayed when trying to remove an incoming e-mail address while no address has been set.
-#: actions/emailsettings.php:518 actions/smssettings.php:555
+#: actions/emailsettings.php:519 actions/smssettings.php:554
 msgid "No incoming email address."
 msgstr ""
 
 #. TRANS: Server error thrown on database error removing incoming e-mail address.
 #. TRANS: Server error thrown on database error adding incoming e-mail address.
-#: actions/emailsettings.php:530 actions/emailsettings.php:554
-#: actions/smssettings.php:565 actions/smssettings.php:588
+#. TRANS: Server error displayed when the user could not be updated in SMS settings.
+#: actions/emailsettings.php:531 actions/emailsettings.php:555
+#: actions/smssettings.php:565 actions/smssettings.php:590
 msgid "Could not update user record."
 msgstr ""
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:534 actions/smssettings.php:568
+#. TRANS: Confirmation text after updating SMS settings.
+#: actions/emailsettings.php:535 actions/smssettings.php:569
 msgid "Incoming email address removed."
 msgstr ""
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:558 actions/smssettings.php:591
+#. TRANS: Confirmation text after updating SMS settings.
+#: actions/emailsettings.php:559 actions/smssettings.php:594
 msgid "New incoming email address added."
 msgstr ""
 
@@ -2597,9 +2630,8 @@ msgstr ""
 
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
 #: actions/favor.php:95
-#, fuzzy
-msgid "Disfavor favorite"
-msgstr "Gjave dai preferîts"
+msgid "Disfavor favorite."
+msgstr ""
 
 #. TRANS: Page title for first page of favorited notices.
 #. TRANS: Title for favourited notices section.
@@ -2645,9 +2677,8 @@ msgstr ""
 #. TRANS: %s is a user's nickname.
 #. TRANS: Title for first page of favourite notices of a user.
 #. TRANS: %s is the user for whom the favourite notices are displayed.
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing own favourited notices.
 #: actions/favoritesrss.php:111 actions/showfavorites.php:76
-#: lib/personalgroupnav.php:122
+#: lib/personalgroupnav.php:110
 #, php-format
 msgid "%s's favorite notices"
 msgstr "Avîs preferîts di %s"
@@ -2830,15 +2861,13 @@ msgstr ""
 
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
 #: actions/groupblock.php:191
-#, fuzzy
-msgid "Do not block this user from this group"
-msgstr "No stâ blocâ chest utent"
+msgid "Do not block this user from this group."
+msgstr ""
 
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
 #: actions/groupblock.php:198
-#, fuzzy
-msgid "Block this user from this group"
-msgstr "Une liste dai utents in chest grup."
+msgid "Block this user from this group."
+msgstr ""
 
 #. TRANS: Server error displayed when trying to block a user from a group fails because of an application error.
 #: actions/groupblock.php:215
@@ -2846,6 +2875,7 @@ msgid "Database error blocking user from group."
 msgstr ""
 
 #. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
+#. TRANS: Client error displayed trying to find a user by ID without providing an ID.
 #: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr ""
@@ -2873,7 +2903,7 @@ msgid "Unable to update your design settings."
 msgstr ""
 
 #. TRANS: Form text to confirm saved group design settings.
-#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:222
+#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:239
 msgid "Design preferences saved."
 msgstr ""
 
@@ -2936,7 +2966,7 @@ msgid "A list of the users in this group."
 msgstr "Une liste dai utents in chest grup."
 
 #. TRANS: Indicator in group members list that this user is a group administrator.
-#: actions/groupmembers.php:190
+#: actions/groupmembers.php:190 lib/action.php:581
 msgid "Admin"
 msgstr "Aministradôr"
 
@@ -3028,8 +3058,10 @@ msgid "Group search"
 msgstr "Ricercje di grups"
 
 #. TRANS: Text on page where groups can be searched if no results were found for a query.
-#: actions/groupsearch.php:82 actions/noticesearch.php:117
-#: actions/peoplesearch.php:83
+#. TRANS: Text for notice search results is the query had no results.
+#. TRANS: Message on the "People search" page where a query has no results.
+#: actions/groupsearch.php:82 actions/noticesearch.php:122
+#: actions/peoplesearch.php:87
 msgid "No results."
 msgstr "Nissun risultât."
 
@@ -3064,149 +3096,156 @@ msgid "User is not blocked from group."
 msgstr ""
 
 #. TRANS: Server error displayed when unblocking a user from a group fails because of an unknown error.
+#. TRANS: Server error displayed when removing a user block.
 #: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr ""
 
 #. TRANS: Title for Instant Messaging settings.
-#: actions/imsettings.php:58
+#: actions/imsettings.php:56
 msgid "IM settings"
 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.
-#: actions/imsettings.php:71
+#: actions/imsettings.php:69
 #, php-format
 msgid ""
-"You can send and receive notices through Jabber/Google Talk [instant "
-"messages](%%doc.im%%). Configure your address and settings below."
+"You can send and receive notices through instant messaging [instant messages]"
+"(%%doc.im%%). Configure your addresses and settings below."
 msgstr ""
 
-#. TRANS: Message given in the Instant Messaging settings if XMPP is not enabled on the site.
+#. TRANS: Message given in the IM settings if IM is not enabled on the site.
 #: actions/imsettings.php:90
 msgid "IM is not available."
 msgstr ""
 
-#. TRANS: Form legend for Instant Messaging settings form.
-#. TRANS: Field label for Instant Messaging address input in Instant Messaging settings form.
-#: actions/imsettings.php:102 actions/imsettings.php:132
+#: actions/imsettings.php:116
+#, fuzzy, php-format
+msgid "Current confirmed %s address."
+msgstr "Atuâl direzion di pueste confermade."
+
+#. TRANS: Form note in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:128
+#, fuzzy, php-format
+msgid ""
+"Awaiting confirmation on this address. Check your %s account for a message "
+"with further instructions. (Did you add %s to your buddy list?)"
+msgstr ""
+"In spiete de conferme par cheste direzion. Controle la tô pueste in jentrade "
+"(e la cartele dal spam!) par un messaç cun altris istruzions."
+
+#: actions/imsettings.php:140
 msgid "IM address"
 msgstr "Direzion pai messaçs istantanis"
 
-#: actions/imsettings.php:109
-msgid "Current confirmed Jabber/Google Talk address."
-msgstr ""
-
-#. TRANS: Form note in Instant Messaging settings form.
-#. TRANS: %s is the Instant Messaging address set for the site.
-#: actions/imsettings.php:120
+#: actions/imsettings.php:142
 #, php-format
-msgid ""
-"Awaiting confirmation on this address. Check your Jabber/Google Talk account "
-"for a message with further instructions. (Did you add %s to your buddy list?)"
+msgid "%s screenname."
 msgstr ""
 
-#. TRANS: IM address input field instructions in Instant Messaging settings form.
-#. TRANS: %s is the Instant Messaging address set for the site.
-#. TRANS: Do not translate "example.org". It is one of the domain names reserved for use in examples by
-#. TRANS: http://www.rfc-editor.org/rfc/rfc2606.txt. Any other domain may be owned by a legitimate
-#. TRANS: person or organization.
-#: actions/imsettings.php:139
-#, php-format
-msgid ""
-"Jabber or Google Talk address, like \"UserName@example.org\". First, make "
-"sure to add %s to your buddy list in your IM client or on Google Talk."
-msgstr ""
-
-#. TRANS: Form legend for Instant Messaging preferences form.
-#: actions/imsettings.php:154
-msgid "IM preferences"
+#. TRANS: Header for IM preferences form.
+#: actions/imsettings.php:163
+#, fuzzy
+msgid "IM Preferences"
 msgstr "Preferencis IM"
 
-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:159
-msgid "Send me notices through Jabber/Google Talk."
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:174
+#, fuzzy
+msgid "Send me notices"
+msgstr "Mande un avîs"
+
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:176
+msgid "Post a notice when my status changes."
 msgstr ""
 
-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:165
-msgid "Post a notice when my Jabber/Google Talk status changes."
-msgstr ""
-
-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:171
-msgid ""
-"Send me replies through Jabber/Google Talk from people I'm not subscribed to."
-msgstr ""
-
-#. TRANS: Checkbox label in Instant Messaging preferences form.
+#. TRANS: Checkbox label in IM preferences form.
 #: actions/imsettings.php:178
-msgid "Publish a MicroID for my Jabber/Google Talk address."
+msgid "Send me replies from people I'm not subscribed to."
 msgstr ""
 
-#. TRANS: Confirmation message for successful Instant Messaging preferences save.
-#: actions/imsettings.php:283 actions/othersettings.php:192
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:181
+#, fuzzy
+msgid "Publish a MicroID"
+msgstr "Nûl public des etichetis"
+
+#. TRANS: Server error thrown on database error updating IM preferences.
+#: actions/imsettings.php:291
+#, fuzzy
+msgid "Couldn't update IM preferences."
+msgstr "Preferencis IM"
+
+#. TRANS: Confirmation message for successful IM preferences save.
+#. TRANS: Confirmation message after saving preferences.
+#: actions/imsettings.php:298 actions/urlsettings.php:244
 msgid "Preferences saved."
 msgstr "Preferencis salvadis."
 
-#. TRANS: Message given saving Instant Messaging address without having provided one.
-#: actions/imsettings.php:304
-msgid "No Jabber ID."
+#. TRANS: Message given saving IM address without having provided one.
+#: actions/imsettings.php:320
+msgid "No screenname."
 msgstr ""
 
-#. TRANS: Message given saving Instant Messaging address that cannot be normalised.
-#: actions/imsettings.php:312
-msgid "Cannot normalize that Jabber ID."
-msgstr ""
-
-#. TRANS: Message given saving Instant Messaging address that not valid.
-#: actions/imsettings.php:317
-msgid "Not a valid Jabber ID."
-msgstr ""
-
-#. TRANS: Message given saving Instant Messaging address that is already set.
-#: actions/imsettings.php:321
-msgid "That is already your Jabber ID."
-msgstr ""
-
-#. TRANS: Message given saving Instant Messaging address that is already set for another user.
 #: actions/imsettings.php:325
-msgid "Jabber ID already belongs to another user."
+msgid "No transport."
 msgstr ""
 
-#. TRANS: Message given saving valid Instant Messaging address that is to be confirmed.
-#. TRANS: %s is the Instant Messaging address set for the site.
-#: actions/imsettings.php:353
-#, php-format
-msgid ""
-"A confirmation code was sent to the IM address you added. You must approve %"
-"s for sending messages to you."
+#. TRANS: Message given saving IM address that cannot be normalised.
+#: actions/imsettings.php:333
+msgid "Cannot normalize that screenname"
 msgstr ""
 
-#. TRANS: Message given canceling Instant Messaging address confirmation for the wrong IM address.
-#: actions/imsettings.php:382
+#. TRANS: Message given saving IM address that not valid.
+#: actions/imsettings.php:340
+#, fuzzy
+msgid "Not a valid screenname"
+msgstr "Nol è un sorenon valit."
+
+#. TRANS: Message given saving IM address that is already set for another user.
+#: actions/imsettings.php:344
+#, fuzzy
+msgid "Screenname already belongs to another user."
+msgstr "Il sorenon al è za doprât. Provent un altri."
+
+#. TRANS: Message given saving valid IM address that is to be confirmed.
+#: actions/imsettings.php:369
+msgid "A confirmation code was sent to the IM address you added."
+msgstr ""
+
+#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#: actions/imsettings.php:396
 msgid "That is the wrong IM address."
 msgstr ""
 
-#. TRANS: Server error thrown on database error canceling Instant Messaging address confirmation.
-#: actions/imsettings.php:391
-msgid "Could not delete IM confirmation."
-msgstr ""
+#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#: actions/imsettings.php:405
+#, fuzzy
+msgid "Couldn't delete confirmation."
+msgstr "Cambie la configurazion dal sît"
 
-#. TRANS: Message given after successfully canceling Instant Messaging address confirmation.
-#: actions/imsettings.php:396
+#. TRANS: Message given after successfully canceling IM address confirmation.
+#: actions/imsettings.php:410
 msgid "IM confirmation cancelled."
 msgstr ""
 
-#. TRANS: Message given trying to remove an Instant Messaging address that is not
+#. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.
-#: actions/imsettings.php:417
-msgid "That is not your Jabber ID."
+#: actions/imsettings.php:434
+msgid "That is not your screenname."
+msgstr ""
+
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#: actions/imsettings.php:443
+msgid "Couldn't update user im prefs."
 msgstr ""
 
 #. TRANS: Message given after successfully removing a registered Instant Messaging address.
-#: actions/imsettings.php:440
+#: actions/imsettings.php:451
 msgid "The IM address was removed."
 msgstr ""
 
@@ -3387,7 +3426,7 @@ msgid "You must be logged in to join a group."
 msgstr ""
 
 #. TRANS: Title for join group page after joining.
-#: actions/joingroup.php:147
+#: actions/joingroup.php:148
 #, php-format
 msgctxt "TITLE"
 msgid "%1$s joined group %2$s"
@@ -3514,7 +3553,7 @@ msgstr ""
 #. TRANS: Submit button title.
 #: actions/licenseadminpanel.php:311 actions/sessionsadminpanel.php:199
 #: actions/siteadminpanel.php:292 actions/snapshotadminpanel.php:245
-#: actions/tagother.php:154 lib/applicationeditform.php:357
+#: actions/tagother.php:133 lib/applicationeditform.php:357
 msgid "Save"
 msgstr "Salve"
 
@@ -3522,40 +3561,42 @@ msgstr "Salve"
 msgid "Save license settings"
 msgstr ""
 
-#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
+#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
+#: actions/login.php:97 actions/otp.php:62 actions/register.php:130
 msgid "Already logged in."
 msgstr "Tu sês za jentrât."
 
-#: actions/login.php:148
+#: actions/login.php:125
 msgid "Incorrect username or password."
 msgstr "Il non utent o la password no son juscj."
 
-#: actions/login.php:154 actions/otp.php:120
+#. TRANS: Server error displayed when a user object could not be created trying to login using "one time password login".
+#: actions/login.php:131 actions/otp.php:127
 msgid "Error setting user. You are probably not authorized."
 msgstr ""
 
-#: actions/login.php:210 actions/login.php:263
+#: actions/login.php:185 actions/login.php:236 lib/action.php:598
 msgid "Login"
 msgstr "Jentre"
 
-#: actions/login.php:249
+#: actions/login.php:222
 msgid "Login to site"
 msgstr "Jentre tal sît"
 
-#: actions/login.php:258 actions/register.php:490
+#: actions/login.php:231 actions/register.php:469
 msgid "Remember me"
 msgstr "Visiti di me"
 
-#: actions/login.php:259 actions/register.php:492
+#: actions/login.php:232 actions/register.php:471
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 "Jentre in automatic tal futûr; no stâ doprâlu par ordenadôrs condividûts!"
 
-#: actions/login.php:269
+#: actions/login.php:241
 msgid "Lost or forgotten password?"
 msgstr "Password pierdude o dismenteade?"
 
-#: actions/login.php:288
+#: actions/login.php:259
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -3563,11 +3604,11 @@ msgstr ""
 "Par motîfs di sigurece, torne par plasê a inserî non utent e password prime "
 "di cambiâ lis tôs impuestazions."
 
-#: actions/login.php:292
+#: actions/login.php:263
 msgid "Login with your username and password."
 msgstr "Jentre cul to non utent e password"
 
-#: actions/login.php:295
+#: actions/login.php:266
 #, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -3692,7 +3733,9 @@ msgstr "Gnûf avîs"
 msgid "Notice posted"
 msgstr "L'avîs al è stât publicât"
 
-#: actions/noticesearch.php:68
+#. TRANS: Instructions for Notice search page.
+#. TRANS: %%site.name%% is the name of the StatusNet site.
+#: actions/noticesearch.php:69
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -3701,37 +3744,47 @@ msgstr ""
 "Cîr avîs su %%site.name%% par contignût. Divît i tiermins cun spazis; ogni "
 "tiermin al à di sei lunc almancul trê caratars."
 
-#: actions/noticesearch.php:78
+#. TRANS: Title of the page where users can search for notices.
+#: actions/noticesearch.php:80
 msgid "Text search"
 msgstr "Ricercje testuâl"
 
-#: actions/noticesearch.php:91
+#. TRANS: Test in RSS notice search.
+#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
+#: actions/noticesearch.php:95
 #, php-format
 msgid "Search results for \"%1$s\" on %2$s"
 msgstr "Risultâts de ricercje di \"%1$s\" su %2$s"
 
-#: actions/noticesearch.php:121
+#. TRANS: Text for logged in users making a query for notices without results.
+#. TRANS: This message contains a Markdown link.
+#: actions/noticesearch.php:128
 #, php-format
 msgid ""
 "Be the first to [post on this topic](%%%%action.newnotice%%%%?"
 "status_textarea=%s)!"
 msgstr ""
 
-#: actions/noticesearch.php:124
+#. TRANS: Text for not logged in users making a query for notices without results.
+#. TRANS: This message contains Markdown links.
+#: actions/noticesearch.php:133
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and be the first to "
 "[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
 msgstr ""
 
-#: actions/noticesearchrss.php:96
+#. TRANS: RSS notice search feed title. %s is the query.
+#: actions/noticesearchrss.php:95
 #, php-format
 msgid "Updates with \"%s\""
 msgstr "Inzornaments cun \"%s\""
 
-#: actions/noticesearchrss.php:98
+#. TRANS: RSS notice search feed description.
+#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
+#: actions/noticesearchrss.php:99
 #, fuzzy, php-format
-msgid "Updates matching search term \"%1$s\" on %2$s!"
+msgid "Updates matching search term \"%1$s\" on %2$s."
 msgstr "Inzornaments etichetâts cun %1$s su %2$s!"
 
 #: actions/nudge.php:85
@@ -3749,51 +3802,51 @@ msgid "Nudge sent!"
 msgstr ""
 
 #. TRANS: Message displayed to an anonymous user trying to view OAuth application list.
-#: actions/oauthappssettings.php:60
+#: actions/oauthappssettings.php:57
 msgid "You must be logged in to list your applications."
 msgstr ""
 
 #. TRANS: Page title for OAuth applications
-#: actions/oauthappssettings.php:76
+#: actions/oauthappssettings.php:73
 msgid "OAuth applications"
 msgstr ""
 
 #. TRANS: Page instructions for OAuth applications
-#: actions/oauthappssettings.php:88
+#: actions/oauthappssettings.php:85
 msgid "Applications you have registered"
 msgstr ""
 
 #. TRANS: Empty list message on page with OAuth applications.
-#: actions/oauthappssettings.php:141
+#: actions/oauthappssettings.php:138
 #, php-format
 msgid "You have not registered any applications yet."
 msgstr ""
 
 #. TRANS: Title for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:71
+#: actions/oauthconnectionssettings.php:69
 msgid "Connected applications"
 msgstr ""
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:83
+#: actions/oauthconnectionssettings.php:80
 msgid "The following connections exist for your account."
 msgstr ""
 
 #. TRANS: Client error when trying to revoke access for an application while not being a user of it.
-#: actions/oauthconnectionssettings.php:168
+#: actions/oauthconnectionssettings.php:165
 msgid "You are not a user of that application."
 msgstr ""
 
 #. TRANS: Client error when revoking access has failed for some reason.
 #. TRANS: %s is the application ID revoking access failed for.
-#: actions/oauthconnectionssettings.php:183
+#: actions/oauthconnectionssettings.php:180
 #, php-format
 msgid "Unable to revoke access for application: %s."
 msgstr ""
 
 #. TRANS: Success message after revoking access for an application.
 #. TRANS: %1$s is the application name, %2$s is the first part of the user token.
-#: actions/oauthconnectionssettings.php:202
+#: actions/oauthconnectionssettings.php:199
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -3801,20 +3854,30 @@ msgid ""
 msgstr ""
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:213
+#: actions/oauthconnectionssettings.php:210
 msgid "You have not authorized any applications to use your account."
 msgstr ""
 
 #. TRANS: Note for developers in the OAuth connection settings form.
 #. TRANS: This message contains a Markdown link. Do not separate "](".
 #. TRANS: %s is the URL to the OAuth settings.
-#: actions/oauthconnectionssettings.php:233
+#: actions/oauthconnectionssettings.php:230
 #, php-format
 msgid ""
 "Are you a developer? [Register an OAuth client application](%s) to use with "
 "this instance of StatusNet."
 msgstr ""
 
+#: actions/oembed.php:64
+#, php-format
+msgid "\"%s\" not found."
+msgstr ""
+
+#: actions/oembed.php:76
+#, php-format
+msgid "Notice %s not found."
+msgstr ""
+
 #: actions/oembed.php:80 actions/shownotice.php:100
 msgid "Notice has no profile."
 msgstr ""
@@ -3824,6 +3887,16 @@ msgstr ""
 msgid "%1$s's status on %2$s"
 msgstr "Stât di %1$s su %2$s"
 
+#: actions/oembed.php:95
+#, php-format
+msgid "Attachment %s not found."
+msgstr ""
+
+#: actions/oembed.php:136
+#, php-format
+msgid "\"%s\" not supported for oembed requests."
+msgstr ""
+
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
 #: actions/oembed.php:168
 #, php-format
@@ -3837,93 +3910,60 @@ msgid "Only %s URLs over plain HTTP please."
 msgstr ""
 
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1205
-#: lib/apiaction.php:1232 lib/apiaction.php:1367
+#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1207
+#: lib/apiaction.php:1234 lib/apiaction.php:1369
 msgid "Not a supported data format."
 msgstr ""
 
+#. TRANS: ShortName in the OpenSearch interface when trying to find users.
 #: actions/opensearch.php:64
 msgid "People Search"
 msgstr "Cîr personis"
 
-#: actions/opensearch.php:67
+#: actions/opensearch.php:68
 msgid "Notice Search"
 msgstr ""
 
-#: actions/othersettings.php:59
-msgid "Other settings"
-msgstr "Altris impuestazions"
-
-#. TRANS: Instructions for tab "Other" in user profile settings.
-#: actions/othersettings.php:71
-msgid "Manage various other options."
-msgstr ""
-
-#. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
-#. TRANS: user's profile settings. Use of "free" is as in "open", indicating that the
-#. TRANS: information on the shortener site is freely distributable.
-#. TRANS: This message has one space at the beginning. Use your language's word separator
-#. TRANS: here if it has one (most likely a single space).
-#: actions/othersettings.php:113
-msgid " (free service)"
-msgstr ""
-
-#. TRANS: Label for dropdown with URL shortener services.
-#: actions/othersettings.php:122
-msgid "Shorten URLs with"
-msgstr "Scurte lis URL cun"
-
-#. TRANS: Tooltip for for dropdown with URL shortener services.
-#: actions/othersettings.php:124
-msgid "Automatic shortening service to use."
-msgstr "Servizi di scurte automatic di doprâ."
-
-#. TRANS: Label for checkbox.
-#: actions/othersettings.php:130
-msgid "View profile designs"
-msgstr ""
-
-#. TRANS: Tooltip for checkbox.
-#: actions/othersettings.php:132
-msgid "Show or hide profile designs."
-msgstr ""
-
-#. TRANS: Form validation error for form "Other settings" in user profile.
-#: actions/othersettings.php:164
-msgid "URL shortening service is too long (maximum 50 characters)."
-msgstr ""
-
-#: actions/otp.php:69
+#. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
+#: actions/otp.php:70
 msgid "No user ID specified."
 msgstr ""
 
-#: actions/otp.php:83
+#. TRANS: Client error displayed trying to use "one time password login" without specifying a login token.
+#: actions/otp.php:86
 msgid "No login token specified."
 msgstr ""
 
-#: actions/otp.php:90
+#. TRANS: Client error displayed trying to use "one time password login" without requesting a login token.
+#: actions/otp.php:94
 msgid "No login token requested."
 msgstr ""
 
-#: actions/otp.php:95
+#. TRANS: Client error displayed trying to use "one time password login" while specifying an invalid login token.
+#: actions/otp.php:100
 msgid "Invalid login token specified."
 msgstr ""
 
-#: actions/otp.php:104
+#. TRANS: Client error displayed trying to use "one time password login" while specifying an expired login token.
+#: actions/otp.php:110
 msgid "Login token expired."
 msgstr ""
 
-#: actions/outbox.php:58
+#. TRANS: Title for outbox for any but the fist page.
+#. TRANS: %1$s is the user nickname, %2$d is the page number.
+#: actions/outbox.php:57
 #, php-format
 msgid "Outbox for %1$s - page %2$d"
 msgstr "Pueste in jessude par %1$s - pagjine %2$d"
 
+#. TRANS: Title for first page of outbox.
 #: actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
 msgstr "Pueste in jessude par %s"
 
-#: actions/outbox.php:104
+#. TRANS: Instructions for outbox.
+#: actions/outbox.php:103
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr ""
 "Cheste e je la tô pueste in jessude, dulà che tu cjatis i messaçs privâts "
@@ -3951,43 +3991,42 @@ msgstr "Vecje password"
 msgid "New password"
 msgstr "Gnove password"
 
-#: actions/passwordsettings.php:109
-#, fuzzy
-msgid "6 or more characters"
+#: actions/passwordsettings.php:109 actions/register.php:416
+msgid "6 or more characters."
 msgstr "6 o plui caratars."
 
-#: actions/passwordsettings.php:113
-#, fuzzy
-msgid "Same as password above"
+#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#: actions/passwordsettings.php:113 actions/recoverpassword.php:264
+#: actions/register.php:420
+msgid "Same as password above."
 msgstr "Compagn che la password parsore"
 
 #: actions/passwordsettings.php:117
 msgid "Change"
 msgstr "Cambie"
 
-#: actions/passwordsettings.php:154 actions/register.php:238
+#: actions/passwordsettings.php:153 actions/register.php:223
 msgid "Password must be 6 or more characters."
 msgstr "La password e à di sei di sîs o plui caratars."
 
-#: actions/passwordsettings.php:157 actions/register.php:241
+#: actions/passwordsettings.php:156 actions/register.php:226
 msgid "Passwords don't match."
 msgstr "Lis passwords no corispuindin."
 
-#: actions/passwordsettings.php:165
+#: actions/passwordsettings.php:164
 msgid "Incorrect old password"
 msgstr "La vecje password e je sbaliade"
 
-#: actions/passwordsettings.php:181
+#: actions/passwordsettings.php:180
 msgid "Error saving user; invalid."
 msgstr ""
 
-#: actions/passwordsettings.php:186
-#, fuzzy
-msgid "Can't save new password."
-msgstr "Cambie la password"
+#. TRANS: Reset password form validation error message.
+#: actions/passwordsettings.php:185 actions/recoverpassword.php:418
+msgid "Cannot save new password."
+msgstr ""
 
-#. TRANS: Title for password recovery page in password saved mode.
-#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
+#: actions/passwordsettings.php:191
 msgid "Password saved."
 msgstr "Password salvade"
 
@@ -4192,8 +4231,7 @@ msgid "Directory where backgrounds are located."
 msgstr ""
 
 #. TRANS: Fieldset legens in Paths admin panel.
-#. TRANS: DT element label in attachment list.
-#: actions/pathsadminpanel.php:419 lib/attachmentlist.php:98
+#: actions/pathsadminpanel.php:419
 msgid "Attachments"
 msgstr "Alegâts"
 
@@ -4261,7 +4299,9 @@ msgstr ""
 msgid "Save paths"
 msgstr ""
 
-#: actions/peoplesearch.php:52
+#. TRANS: Instructions for the "People search" page.
+#. TRANS: %%site.name%% is the name of the StatusNet site.
+#: actions/peoplesearch.php:54
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
@@ -4270,7 +4310,8 @@ msgstr ""
 "Cîr int su %%site.name%% par non, lûc o interès. Divît i tiermins cun "
 "spazis; ogni tiermin al à di sei lunc almancul trê caratars."
 
-#: actions/peoplesearch.php:58
+#. TRANS: Title of a page where users can search for other users.
+#: actions/peoplesearch.php:61
 msgid "People search"
 msgstr "Cîr personis"
 
@@ -4284,6 +4325,59 @@ msgstr ""
 msgid "Users self-tagged with %1$s - page %2$d"
 msgstr ""
 
+#. TRANS: Page title for AJAX form return when a disabling a plugin.
+#: actions/plugindisable.php:69
+msgctxt "plugin"
+msgid "Disabled"
+msgstr ""
+
+#. TRANS: Client error displayed trying to perform any request method other than POST.
+#. TRANS: Do not translate POST.
+#: actions/pluginenable.php:78 actions/subscribe.php:77
+msgid "This action only accepts POST requests."
+msgstr ""
+
+#: actions/pluginenable.php:102
+msgid "You cannot administer plugins."
+msgstr ""
+
+#: actions/pluginenable.php:109
+#, fuzzy
+msgid "No such plugin."
+msgstr "La pagjine no esist."
+
+#. TRANS: Page title for AJAX form return when enabling a plugin.
+#: actions/pluginenable.php:159
+msgctxt "plugin"
+msgid "Enabled"
+msgstr ""
+
+#. TRANS: Tab and title for plugins admin panel.
+#. TRANS: Menu item for site administration
+#: actions/pluginsadminpanel.php:56 actions/version.php:191
+#: lib/adminpanelaction.php:411
+msgid "Plugins"
+msgstr ""
+
+#. TRANS: Instructions at top of plugin admin page.
+#: actions/pluginsadminpanel.php:68
+msgid ""
+"Additional plugins can be enabled and configured manually. See the <a href="
+"\"http://status.net/wiki/Plugins\">online plugin documentation</a> for more "
+"details."
+msgstr ""
+
+#. TRANS: Admin form section header
+#: actions/pluginsadminpanel.php:84
+#, fuzzy
+msgid "Default plugins"
+msgstr "Lenghe predeterminade"
+
+#: actions/pluginsadminpanel.php:106
+msgid ""
+"All default plugins have been disabled from the site's configuration file."
+msgstr ""
+
 #: actions/postnotice.php:95
 msgid "Invalid notice content."
 msgstr ""
@@ -4294,12 +4388,12 @@ msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’.
 msgstr ""
 
 #. TRANS: Page title for profile settings.
-#: actions/profilesettings.php:59
+#: actions/profilesettings.php:60
 msgid "Profile settings"
 msgstr "Impuestazions dal profîl"
 
 #. TRANS: Usage instructions for profile settings.
-#: actions/profilesettings.php:70
+#: actions/profilesettings.php:71
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
@@ -4307,40 +4401,37 @@ msgstr ""
 "cognossiti miôr."
 
 #. TRANS: Profile settings form legend.
-#: actions/profilesettings.php:98
+#: actions/profilesettings.php:99
 msgid "Profile information"
 msgstr "Informazions sul profîl"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109 actions/register.php:433
+#: actions/profilesettings.php:110 actions/register.php:412
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr ""
 
 #. TRANS: Field label in form for profile settings.
-#. TRANS: Label for full group name (dt). Text hidden by default.
-#. TRANS: DT for full name in a profile.
-#: actions/profilesettings.php:113 actions/register.php:455
-#: actions/showgroup.php:255 actions/tagother.php:104
-#: lib/groupeditform.php:150 lib/userprofile.php:156
+#: actions/profilesettings.php:114 actions/register.php:434
+#: lib/groupeditform.php:150
 msgid "Full name"
 msgstr "Non complet"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:118 actions/register.php:460
+#: actions/profilesettings.php:119 actions/register.php:439
 #: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "Pagjine web"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:121
+#: actions/profilesettings.php:122 actions/register.php:441
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr "URL de tô pagjine web, blog o profîl suntun altri sît."
 
 #. TRANS: Tooltip for field label in form for profile settings. Plural
 #. TRANS: is decided by the number of characters available for the
 #. TRANS: biography (%d).
-#: actions/profilesettings.php:129 actions/register.php:471
+#: actions/profilesettings.php:130 actions/register.php:450
 #, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4348,81 +4439,76 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:135 actions/register.php:476
+#: actions/profilesettings.php:136 actions/register.php:455
 msgid "Describe yourself and your interests"
 msgstr "Descrîf te e i tiei interès"
 
 #. TRANS: Text area label in form for profile settings where users can provide.
 #. TRANS: their biography.
-#: actions/profilesettings.php:139 actions/register.php:478
+#: actions/profilesettings.php:140 actions/register.php:457
 msgid "Bio"
 msgstr "Biografie"
 
 #. TRANS: Field label in form for profile settings.
-#. TRANS: Label for group location (dt). Text hidden by default.
-#. TRANS: DT for location in a profile.
-#: actions/profilesettings.php:145 actions/register.php:483
-#: actions/showgroup.php:265 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:173
-#: lib/userprofile.php:172
+#: actions/profilesettings.php:146 actions/register.php:462
+#: lib/groupeditform.php:173
 msgid "Location"
 msgstr "Lûc"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148 actions/register.php:485
+#: actions/profilesettings.php:149
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Dulà che tu sês, par esempli \"Citât, Provincie, Stât\""
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:153
+#: actions/profilesettings.php:154
 msgid "Share my current location when posting notices"
 msgstr "Condivît il lûc dulà che mi cjati cuant che o publichi avîs"
 
 #. TRANS: Field label in form for profile settings.
-#. TRANS: DT for tags in a profile.
-#: actions/profilesettings.php:161 actions/tagother.php:149
-#: actions/tagother.php:209 lib/subscriptionlist.php:106
-#: lib/subscriptionlist.php:108 lib/userprofile.php:220
+#: actions/profilesettings.php:162 actions/tagother.php:128
+#: actions/tagother.php:188 lib/subscriptionlist.php:104
+#: lib/subscriptionlist.php:106
 msgid "Tags"
 msgstr "Etichetis"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:164
+#: actions/profilesettings.php:165
 msgid ""
-"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- "
+"separated."
 msgstr ""
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:169
+#: actions/profilesettings.php:170
 msgid "Language"
 msgstr "Lenghe"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:171
-#, fuzzy
-msgid "Preferred language"
+#: actions/profilesettings.php:172
+msgid "Preferred language."
 msgstr "Lenghe preferide"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:181
+#: actions/profilesettings.php:182
 msgid "Timezone"
 msgstr "Fûs orari"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:183
+#: actions/profilesettings.php:184
 msgid "What timezone are you normally in?"
 msgstr "In ce fûs orari ti cjatistu par solit?"
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:189
+#: actions/profilesettings.php:190
 msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)"
+"Automatically subscribe to whoever subscribes to me (best for non-humans)."
 msgstr ""
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Plural form is used based on the maximum number of allowed
 #. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:258 actions/register.php:229
+#: actions/profilesettings.php:259 actions/register.php:214
 #, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4430,47 +4516,47 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:269 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:270 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr "No tu âs sielt il fûs orari."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:277
+#: actions/profilesettings.php:278
 msgid "Language is too long (maximum 50 characters)."
 msgstr "La lenghe e je masse lungje (max 50 caratars)."
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:291 actions/tagother.php:178
+#: actions/profilesettings.php:292
 #, php-format
-msgid "Invalid tag: \"%s\""
-msgstr "La etichete no je valide: \"%s\""
+msgid "Invalid tag: \"%s\"."
+msgstr ""
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:347
+#: actions/profilesettings.php:348
 msgid "Could not update user for autosubscribe."
 msgstr ""
 
 #. TRANS: Server error thrown when user profile location preference settings could not be updated.
-#: actions/profilesettings.php:405
+#: actions/profilesettings.php:406
 msgid "Could not save location prefs."
 msgstr ""
 
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:427 actions/tagother.php:200
+#: actions/profilesettings.php:428 actions/tagother.php:179
 msgid "Could not save tags."
 msgstr ""
 
 #. TRANS: Confirmation shown when user profile settings are saved.
 #. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:436 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:437 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "Impuestazions salvadis."
 
 #. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
 #. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:483 actions/restoreaccount.php:60
+#: actions/profilesettings.php:484 actions/restoreaccount.php:60
 msgid "Restore account"
 msgstr ""
 
@@ -4545,6 +4631,12 @@ msgstr ""
 "org/wiki/Micro-blogging) basât sul imprest libar [StatusNet](http://status."
 "net/)."
 
+#. TRANS: Public RSS feed description. %s is the StatusNet site name.
+#: actions/publicrss.php:106
+#, fuzzy, php-format
+msgid "%s updates from everyone."
+msgstr "Inzornaments di %s di ducj cuancj!"
+
 #. TRANS: Title for public tag cloud.
 #: actions/publictagcloud.php:57
 msgid "Public tag cloud"
@@ -4583,10 +4675,6 @@ msgid ""
 "one!"
 msgstr ""
 
-#: actions/publictagcloud.php:146
-msgid "Tag cloud"
-msgstr "Nûl di etichetis"
-
 #. TRANS: Client error displayed trying to recover password while already logged in.
 #: actions/recoverpassword.php:37
 msgid "You are already logged in!"
@@ -4675,6 +4763,11 @@ msgstr ""
 msgid "Password recovery requested"
 msgstr ""
 
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/recoverpassword.php:229
+msgid "Password saved"
+msgstr "Password salvade"
+
 #. TRANS: Title for password recovery page when an unknown action has been specified.
 #: actions/recoverpassword.php:232
 msgid "Unknown action"
@@ -4685,14 +4778,9 @@ msgstr ""
 msgid "6 or more characters, and do not forget it!"
 msgstr ""
 
-#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
-#: actions/recoverpassword.php:264 actions/register.php:441
-msgid "Same as password above."
-msgstr "Compagn che la password parsore"
-
 #. TRANS: Button text for password reset form.
 #. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: actions/recoverpassword.php:268 lib/designsettings.php:264
+#: actions/recoverpassword.php:268 lib/designform.php:145
 msgctxt "BUTTON"
 msgid "Reset"
 msgstr ""
@@ -4739,13 +4827,8 @@ msgstr "La password e à di jessi di sîs o plui caratars."
 msgid "Password and confirmation do not match."
 msgstr "La password e la conferme no corispuindin."
 
-#. TRANS: Reset password form validation error message.
-#: actions/recoverpassword.php:418
-msgid "Cannot save new password."
-msgstr ""
-
 #. TRANS: Server error displayed when something does wrong with the user object during password reset.
-#: actions/recoverpassword.php:426 actions/register.php:256
+#: actions/recoverpassword.php:426 actions/register.php:241
 msgid "Error setting user."
 msgstr ""
 
@@ -4754,97 +4837,100 @@ msgstr ""
 msgid "New password successfully saved. You are now logged in."
 msgstr "La gnove password e je stade salvade cun sucès. Cumò tu sês jentrât."
 
-#: actions/register.php:92 actions/register.php:196 actions/register.php:413
+#: actions/redirecturl.php:70
+msgid "No id parameter"
+msgstr ""
+
+#: actions/redirecturl.php:76
+#, fuzzy, php-format
+msgid "No such file \"%d\""
+msgstr "Il file nol esist."
+
+#: actions/register.php:80 actions/register.php:181 actions/register.php:392
 msgid "Sorry, only invited people can register."
 msgstr ""
 
-#: actions/register.php:99
+#: actions/register.php:87
 msgid "Sorry, invalid invitation code."
 msgstr ""
 
-#: actions/register.php:119
+#: actions/register.php:106
 msgid "Registration successful"
 msgstr "Regjistrât cun sucès"
 
-#: actions/register.php:121 actions/register.php:511
+#: actions/register.php:108 actions/register.php:490
 msgid "Register"
 msgstr "Regjistriti"
 
-#: actions/register.php:142
+#: actions/register.php:128
 msgid "Registration not allowed."
 msgstr ""
 
-#: actions/register.php:209
-msgid "You can't register if you don't agree to the license."
+#: actions/register.php:194
+msgid "You cannot register if you don't agree to the license."
 msgstr ""
 
-#: actions/register.php:218
+#: actions/register.php:203
 msgid "Email address already exists."
 msgstr ""
 
-#: actions/register.php:251 actions/register.php:273
+#: actions/register.php:236 actions/register.php:258
 msgid "Invalid username or password."
 msgstr "Il non utent o la password no son valits."
 
-#: actions/register.php:351
+#: actions/register.php:333
 msgid ""
 "With this form you can create a new account. You can then post notices and "
-"link up to friends and colleagues. "
+"link up to friends and colleagues."
 msgstr ""
 
-#: actions/register.php:437
-msgid "6 or more characters."
-msgstr "6 o plui caratars."
-
-#. TRANS: Link description in user account settings menu.
-#: actions/register.php:445 actions/register.php:449
-#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
+#: actions/register.php:424 actions/register.php:428
+#: actions/siteadminpanel.php:238 lib/settingsnav.php:92
 msgid "Email"
 msgstr "Pueste eletroniche"
 
-#: actions/register.php:446 actions/register.php:450
-msgid "Used only for updates, announcements, and password recovery"
+#: actions/register.php:425 actions/register.php:429
+msgid "Used only for updates, announcements, and password recovery."
 msgstr ""
 
-#: actions/register.php:457
-msgid "Longer name, preferably your \"real\" name"
+#: actions/register.php:436
+msgid "Longer name, preferably your \"real\" name."
 msgstr ""
 
-#: actions/register.php:462
-#, fuzzy
-msgid "URL of your homepage, blog, or profile on another site"
-msgstr "URL de tô pagjine web, blog o profîl suntun altri sît."
+#: actions/register.php:464
+msgid "Where you are, like \"City, State (or Region), Country\"."
+msgstr "Dulà che tu sês, par esempli \"Citât, Provincie, Stât\"."
 
-#: actions/register.php:523
+#: actions/register.php:503
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
 msgstr ""
 
-#: actions/register.php:533
+#: actions/register.php:513
 #, php-format
 msgid "My text and files are copyright by %1$s."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:537
+#: actions/register.php:517
 msgid "My text and files remain under my own copyright."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:540
+#: actions/register.php:520
 msgid "All rights reserved."
 msgstr "Ducj i dirits riservâts"
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:545
+#: actions/register.php:525
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
 "email address, IM address, and phone number."
 msgstr ""
 
-#: actions/register.php:588
+#: actions/register.php:566
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -4877,7 +4963,7 @@ msgstr ""
 "Graziis par jessiti regjistrât e o sperìn che tu gjoldarâs a doprâ chest "
 "servizi."
 
-#: actions/register.php:612
+#: actions/register.php:590
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -4906,8 +4992,7 @@ msgid "User nickname"
 msgstr "Sorenon dal utent"
 
 #: actions/remotesubscribe.php:129
-#, fuzzy
-msgid "Nickname of the user you want to follow"
+msgid "Nickname of the user you want to follow."
 msgstr "Sorenon dal utent che tu vuelis seguî."
 
 #: actions/remotesubscribe.php:132
@@ -4915,17 +5000,17 @@ msgid "Profile URL"
 msgstr "URL dal profîl"
 
 #: actions/remotesubscribe.php:133
-msgid "URL of your profile on another compatible microblogging service"
+msgid "URL of your profile on another compatible microblogging service."
 msgstr ""
 
 #. TRANS: Link text for link that will subscribe to a remote profile.
 #: actions/remotesubscribe.php:136 lib/subscribeform.php:139
-#: lib/userprofile.php:431
+#: lib/userprofile.php:402
 msgid "Subscribe"
 msgstr "Sotscrivimi"
 
 #: actions/remotesubscribe.php:158
-msgid "Invalid profile URL (bad format)"
+msgid "Invalid profile URL (bad format)."
 msgstr ""
 
 #: actions/remotesubscribe.php:167
@@ -4956,7 +5041,7 @@ msgstr ""
 msgid "You already repeated that notice."
 msgstr ""
 
-#: actions/repeat.php:112 lib/noticelist.php:692
+#: actions/repeat.php:112 lib/noticelist.php:697
 msgid "Repeated"
 msgstr "Ripetût"
 
@@ -4964,9 +5049,9 @@ msgstr "Ripetût"
 msgid "Repeated!"
 msgstr "Ripetût!"
 
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing @-replies.
+#. TRANS: RSS reply feed title. %s is a user nickname.
 #: actions/replies.php:126 actions/repliesrss.php:68
-#: lib/personalgroupnav.php:109
+#: lib/personalgroupnav.php:105
 #, php-format
 msgid "Replies to %s"
 msgstr "Rispuestis a %s"
@@ -5012,9 +5097,11 @@ msgid ""
 "newnotice%%%%?status_textarea=%3$s)."
 msgstr ""
 
-#: actions/repliesrss.php:72
+#. TRANS: RSS reply feed description.
+#. TRANS: %1$s is a user nickname, %2$s is the StatusNet site name.
+#: actions/repliesrss.php:74
 #, fuzzy, php-format
-msgid "Replies to %1$s on %2$s!"
+msgid "Replies to %1$s on %2$s."
 msgstr "Rispuestis a %1$s su %2$s!"
 
 #. TRANS: Client exception displayed when trying to restore an account while not logged in.
@@ -5109,7 +5196,7 @@ msgstr ""
 msgid "User doesn't have this role."
 msgstr ""
 
-#: actions/rsd.php:146 actions/version.php:159
+#: actions/rsd.php:142 actions/version.php:159
 msgid "StatusNet"
 msgstr "StatusNet"
 
@@ -5151,93 +5238,44 @@ msgstr ""
 msgid "Save site settings"
 msgstr "Salve lis impuestazions dal sît"
 
-#: actions/showapplication.php:82
+#: actions/showapplication.php:78
 msgid "You must be logged in to view an application."
 msgstr ""
 
-#: actions/showapplication.php:157
+#: actions/showapplication.php:151
 msgid "Application profile"
 msgstr ""
 
-#. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:159 lib/applicationeditform.php:177
-msgid "Icon"
-msgstr "Icone"
-
-#. TRANS: Form input field label for application name.
-#: actions/showapplication.php:169 actions/version.php:197
-#: lib/applicationeditform.php:190
-msgid "Name"
-msgstr "Non"
-
-#. TRANS: Form input field label.
-#: actions/showapplication.php:178 lib/applicationeditform.php:227
-msgid "Organization"
-msgstr "Organizazion"
-
-#. TRANS: Form input field label.
-#: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:168
-msgid "Description"
-msgstr "Descrizion"
-
-#. TRANS: Header for group statistics on a group page (h2).
-#. TRANS: H2 text for user statistics.
-#: actions/showapplication.php:192 actions/showgroup.php:460
-#: lib/profileaction.php:205
-msgid "Statistics"
-msgstr "Statistichis"
-
-#: actions/showapplication.php:203
+#: actions/showapplication.php:179
 #, php-format
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr ""
 
-#: actions/showapplication.php:213
+#: actions/showapplication.php:189
 msgid "Application actions"
 msgstr ""
 
-#: actions/showapplication.php:236
+#: actions/showapplication.php:212
 msgid "Reset key & secret"
 msgstr ""
 
 #. TRANS: Title of form for deleting a user.
-#: actions/showapplication.php:252 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:64 lib/noticelist.php:673
+#: actions/showapplication.php:228 lib/deletegroupform.php:121
+#: lib/deleteuserform.php:64 lib/noticelist.php:678
 msgid "Delete"
 msgstr "Elimine"
 
-#: actions/showapplication.php:261
+#: actions/showapplication.php:237
 msgid "Application info"
 msgstr ""
 
-#: actions/showapplication.php:263
-msgid "Consumer key"
-msgstr ""
-
-#: actions/showapplication.php:268
-msgid "Consumer secret"
-msgstr ""
-
-#: actions/showapplication.php:273
-msgid "Request token URL"
-msgstr ""
-
-#: actions/showapplication.php:278
-msgid "Access token URL"
-msgstr ""
-
-#: actions/showapplication.php:283
-msgid "Authorize URL"
-msgstr ""
-
-#: actions/showapplication.php:288
+#: actions/showapplication.php:255
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
 msgstr ""
 
-#: actions/showapplication.php:309
+#: actions/showapplication.php:275
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr ""
 
@@ -5316,61 +5354,47 @@ msgstr "Grup %s"
 msgid "%1$s group, page %2$d"
 msgstr "Grup %1$s, pagjine %2$d"
 
-#. TRANS: Group profile header (h2). Text hidden by default.
-#: actions/showgroup.php:223
-msgid "Group profile"
-msgstr "Profîl dal grup"
-
-#. TRANS: Label for group URL (dt). Text hidden by default.
-#. TRANS: DT for URL in a profile.
-#: actions/showgroup.php:273 actions/tagother.php:118
-#: actions/userauthorization.php:175 lib/userprofile.php:186
-msgid "URL"
-msgstr "URL"
-
 #. TRANS: Label for group description or group note (dt). Text hidden by default.
-#. TRANS: DT for note in a profile.
-#: actions/showgroup.php:285 actions/tagother.php:128
-#: actions/userauthorization.php:187 lib/userprofile.php:204
+#: actions/showgroup.php:266
 msgid "Note"
 msgstr "Note"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:296 lib/groupeditform.php:180
+#: actions/showgroup.php:277 lib/groupeditform.php:180
 msgid "Aliases"
 msgstr ""
 
 #. TRANS: Group actions header (h2). Text hidden by default.
-#: actions/showgroup.php:313
+#: actions/showgroup.php:294
 msgid "Group actions"
 msgstr "Azions dal grup"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:357
+#: actions/showgroup.php:338
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
 msgstr "Canâl dai avîs pal grup %s (RSS 1.0)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:364
+#: actions/showgroup.php:345
 #, php-format
 msgid "Notice feed for %s group (RSS 2.0)"
 msgstr "Canâl dai avîs pal grup %s (RSS 2.0)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:371
+#: actions/showgroup.php:352
 #, php-format
 msgid "Notice feed for %s group (Atom)"
 msgstr "Canâl dai avîs pal grup %s (Atom)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:377
+#: actions/showgroup.php:358
 #, php-format
 msgid "FOAF for %s group"
 msgstr "FOAF pal grup %s"
 
 #. TRANS: Header for mini list of group members on a group page (h2).
-#: actions/showgroup.php:414
+#: actions/showgroup.php:395
 msgid "Members"
 msgstr "Membris"
 
@@ -5378,25 +5402,30 @@ msgstr "Membris"
 #. TRANS: Text for user subscription statistics if the user has no subscriptions.
 #. TRANS: Text for user subscriber statistics if user has no subscribers.
 #. TRANS: Text for user user group membership statistics if user is not a member of any group.
-#: actions/showgroup.php:420 lib/profileaction.php:137
+#: actions/showgroup.php:401 lib/profileaction.php:137
 #: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
-#: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
+#: lib/subscriptionlist.php:123 lib/tagcloudsection.php:71
 msgid "(None)"
 msgstr "(Nissun)"
 
 #. TRANS: Link to all group members from mini list of group members if group has more than n members.
-#: actions/showgroup.php:429
+#: actions/showgroup.php:410
 msgid "All members"
 msgstr "Ducj i membris"
 
-#. TRANS: Label for creation date in statistics on group page.
-#: actions/showgroup.php:465
+#. TRANS: Header for group statistics on a group page (h2).
+#. TRANS: H2 text for user statistics.
+#: actions/showgroup.php:441 lib/profileaction.php:205
+msgid "Statistics"
+msgstr "Statistichis"
+
+#: actions/showgroup.php:444
 msgctxt "LABEL"
 msgid "Created"
 msgstr "Creât"
 
 #. TRANS: Label for member count in statistics on group page.
-#: actions/showgroup.php:473
+#: actions/showgroup.php:449
 msgctxt "LABEL"
 msgid "Members"
 msgstr "Membris"
@@ -5405,7 +5434,7 @@ msgstr "Membris"
 #. TRANS: **%s** is the group alias, %%%%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).
-#: actions/showgroup.php:488
+#: actions/showgroup.php:464
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5424,7 +5453,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: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
-#: actions/showgroup.php:498
+#: actions/showgroup.php:474
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5438,7 +5467,7 @@ msgstr ""
 "su la vite e i lôr interès. "
 
 #. TRANS: Header for list of group administrators on a group page (h2).
-#: actions/showgroup.php:527
+#: actions/showgroup.php:503
 msgid "Admins"
 msgstr "Aministradôrs"
 
@@ -5477,7 +5506,7 @@ msgid "%1$s tagged %2$s"
 msgstr "%1$s cun etichete %2$s"
 
 #. TRANS: Page title showing tagged notices in one user's stream.
-#. TRANS: %1$s is the username, %2$s is the hash tag, %1$d is the page number.
+#. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
 #: actions/showstream.php:74
 #, php-format
 msgid "%1$s tagged %2$s, page %3$d"
@@ -5524,13 +5553,13 @@ msgid "FOAF for %s"
 msgstr "FOAF di %s"
 
 #. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
-#: actions/showstream.php:211
+#: actions/showstream.php:205
 #, php-format
 msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr ""
 
 #. TRANS: Second sentence of empty list message for a stream for the user themselves.
-#: actions/showstream.php:217
+#: actions/showstream.php:211
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
@@ -5540,7 +5569,7 @@ msgstr ""
 
 #. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:221
+#: actions/showstream.php:215
 #, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
@@ -5549,7 +5578,7 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:264
+#: actions/showstream.php:258
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5564,7 +5593,7 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:271
+#: actions/showstream.php:265
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5576,7 +5605,7 @@ msgstr ""
 "[StatusNet](http://status.net/)."
 
 #. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
-#: actions/showstream.php:328
+#: actions/showstream.php:322
 #, php-format
 msgid "Repeat of %s"
 msgstr "Ripetizion di %s"
@@ -5718,146 +5747,145 @@ msgstr ""
 
 #. TRANS: Title for button to save site notice in admin panel.
 #: actions/sitenoticeadminpanel.php:201
-#, fuzzy
-msgid "Save site notice"
-msgstr "Salve lis impuestazions dal sît"
+msgid "Save site notice."
+msgstr ""
 
 #. TRANS: Title for SMS settings.
-#: actions/smssettings.php:57
+#: actions/smssettings.php:56
 msgid "SMS settings"
 msgstr ""
 
 #. TRANS: SMS settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/smssettings.php:71
+#: actions/smssettings.php:70
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr ""
 
 #. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
-#: actions/smssettings.php:93
+#: actions/smssettings.php:92
 msgid "SMS is not available."
 msgstr ""
 
 #. TRANS: Form legend for SMS settings form.
-#: actions/smssettings.php:107
+#: actions/smssettings.php:106
 msgid "SMS address"
 msgstr ""
 
 #. TRANS: Form guide in SMS settings form.
-#: actions/smssettings.php:116
+#: actions/smssettings.php:115
 msgid "Current confirmed SMS-enabled phone number."
 msgstr ""
 
 #. TRANS: Form guide in IM settings form.
-#: actions/smssettings.php:129
+#: actions/smssettings.php:128
 msgid "Awaiting confirmation on this phone number."
 msgstr ""
 
 #. TRANS: Field label for SMS address input in SMS settings form.
-#: actions/smssettings.php:138
+#: actions/smssettings.php:137
 msgid "Confirmation code"
 msgstr "Codiç di conferme"
 
 #. TRANS: Form field instructions in SMS settings form.
-#: actions/smssettings.php:140
+#: actions/smssettings.php:139
 msgid "Enter the code you received on your phone."
 msgstr ""
 
 #. TRANS: Button label to confirm SMS confirmation code in SMS settings.
-#: actions/smssettings.php:144
+#: actions/smssettings.php:143
 msgctxt "BUTTON"
 msgid "Confirm"
 msgstr "Conferme"
 
 #. TRANS: Field label for SMS phone number input in SMS settings form.
-#: actions/smssettings.php:149
+#: actions/smssettings.php:148
 msgid "SMS phone number"
 msgstr ""
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
-#: actions/smssettings.php:152
-msgid "Phone number, no punctuation or spaces, with area code"
+#: actions/smssettings.php:151
+msgid "Phone number, no punctuation or spaces, with area code."
 msgstr ""
 
 #. TRANS: Form legend for SMS preferences form.
-#: actions/smssettings.php:191
+#: actions/smssettings.php:190
 msgid "SMS preferences"
 msgstr ""
 
 #. TRANS: Checkbox label in SMS preferences form.
-#: actions/smssettings.php:197
+#: actions/smssettings.php:196
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
 msgstr ""
 
 #. TRANS: Confirmation message for successful SMS preferences save.
-#: actions/smssettings.php:308
+#: actions/smssettings.php:307
 msgid "SMS preferences saved."
 msgstr ""
 
 #. TRANS: Message given saving SMS phone number without having provided one.
-#: actions/smssettings.php:330
+#: actions/smssettings.php:329
 msgid "No phone number."
 msgstr ""
 
 #. TRANS: Message given saving SMS phone number without having selected a carrier.
-#: actions/smssettings.php:336
+#: actions/smssettings.php:335
 msgid "No carrier selected."
 msgstr ""
 
 #. TRANS: Message given saving SMS phone number that is already set.
-#: actions/smssettings.php:344
+#: actions/smssettings.php:343
 msgid "That is already your phone number."
 msgstr ""
 
 #. TRANS: Message given saving SMS phone number that is already set for another user.
-#: actions/smssettings.php:348
+#: actions/smssettings.php:347
 msgid "That phone number already belongs to another user."
 msgstr ""
 
 #. TRANS: Message given saving valid SMS phone number that is to be confirmed.
-#: actions/smssettings.php:376
+#: actions/smssettings.php:375
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
 "for the code and instructions on how to use it."
 msgstr ""
 
 #. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
-#: actions/smssettings.php:404
+#: actions/smssettings.php:403
 msgid "That is the wrong confirmation number."
 msgstr ""
 
 #. TRANS: Message given after successfully canceling SMS phone number confirmation.
-#: actions/smssettings.php:418
+#: actions/smssettings.php:417
 msgid "SMS confirmation cancelled."
 msgstr ""
 
 #. TRANS: Message given trying to remove an SMS phone number that is not
 #. TRANS: registered for the active user.
-#: actions/smssettings.php:438
+#: actions/smssettings.php:437
 msgid "That is not your phone number."
 msgstr ""
 
 #. TRANS: Message given after successfully removing a registered SMS phone number.
-#: actions/smssettings.php:460
+#: actions/smssettings.php:459
 msgid "The SMS phone number was removed."
 msgstr ""
 
 #. TRANS: Label for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:499
+#: actions/smssettings.php:498
 msgid "Mobile carrier"
 msgstr ""
 
 #. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:504
+#: actions/smssettings.php:503
 msgid "Select a carrier"
 msgstr ""
 
 #. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
 #. TRANS: %s is an administrative contact's e-mail address.
-#: actions/smssettings.php:513
+#: actions/smssettings.php:512
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -5865,7 +5893,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
-#: actions/smssettings.php:535
+#: actions/smssettings.php:534
 msgid "No code entered."
 msgstr ""
 
@@ -5938,15 +5966,13 @@ msgstr "No tu sês sotscrit a chest profîl."
 msgid "Could not save subscription."
 msgstr ""
 
-#: actions/subscribe.php:77
-msgid "This action only accepts POST requests."
-msgstr ""
-
-#: actions/subscribe.php:117
+#. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
+#: actions/subscribe.php:121
 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
 msgstr ""
 
-#: actions/subscribe.php:145
+#. TRANS: Page title when subscription succeeded.
+#: actions/subscribe.php:149
 msgid "Subscribed"
 msgstr "Sotscrit"
 
@@ -6055,31 +6081,34 @@ msgid "Subscription feed for %s (Atom)"
 msgstr "Canâl des sotscrizions di %s (Atom)"
 
 #. TRANS: Checkbox label for enabling Jabber messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:239
-msgid "Jabber"
-msgstr "Jabber"
+#: actions/subscriptions.php:241 lib/settingsnav.php:110
+#, fuzzy
+msgid "IM"
+msgstr "IM"
 
 #. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:254
+#: actions/subscriptions.php:256 lib/settingsnav.php:117
 msgid "SMS"
 msgstr "SMS"
 
-#: actions/tag.php:69
+#. TRANS: Title for all but the first page of notices with tags.
+#. TRANS: %1$s is the tag, %2$d is the page number.
+#: actions/tag.php:73
 #, php-format
 msgid "Notices tagged with %1$s, page %2$d"
 msgstr "Avîs etichetâts cun %1$s, pagjine %2$d"
 
-#: actions/tag.php:87
+#: actions/tag.php:91
 #, php-format
 msgid "Notice feed for tag %s (RSS 1.0)"
 msgstr "Canâl dai avîs pe etichete %s (RSS 1.0)"
 
-#: actions/tag.php:93
+#: actions/tag.php:97
 #, php-format
 msgid "Notice feed for tag %s (RSS 2.0)"
 msgstr "Canâl dai avîs pe etichete %s (RSS 2.0)"
 
-#: actions/tag.php:99
+#: actions/tag.php:103
 #, php-format
 msgid "Notice feed for tag %s (Atom)"
 msgstr "Canâl dai avîs pe etichete %s (Atom)"
@@ -6098,28 +6127,27 @@ msgstr "Etichete %s"
 msgid "User profile"
 msgstr "Profîl dal utent"
 
-#. TRANS: DT element in area for user avatar.
-#: actions/tagother.php:81 actions/userauthorization.php:132
-#: lib/userprofile.php:108
-msgid "Photo"
-msgstr "Foto"
-
-#: actions/tagother.php:141
+#: actions/tagother.php:120
 msgid "Tag user"
 msgstr "Etichete utent"
 
-#: actions/tagother.php:151
+#: actions/tagother.php:130
 msgid ""
 "Tags for this user (letters, numbers, -, ., and _), comma- or space- "
 "separated"
 msgstr ""
 
-#: actions/tagother.php:193
+#: actions/tagother.php:157
+#, php-format
+msgid "Invalid tag: \"%s\""
+msgstr "La etichete no je valide: \"%s\""
+
+#: actions/tagother.php:172
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 
-#: actions/tagother.php:236
+#: actions/tagother.php:215
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
 
@@ -6127,6 +6155,7 @@ msgstr ""
 msgid "No such tag."
 msgstr ""
 
+#. TRANS: Client error displayed when trying to unblock a non-blocked user.
 #: actions/unblock.php:59
 msgid "You haven't blocked that user."
 msgstr ""
@@ -6147,12 +6176,81 @@ msgstr ""
 msgid "Unsubscribed"
 msgstr "No tu sês sotscrit"
 
-#: actions/updateprofile.php:64 actions/userauthorization.php:337
+#: actions/updateprofile.php:64
 #, php-format
 msgid ""
 "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
 msgstr ""
 
+#: actions/urlsettings.php:60
+#, fuzzy
+msgid "URL settings"
+msgstr "Impuestazions IM"
+
+#. TRANS: Instructions for tab "Other" in user profile settings.
+#: actions/urlsettings.php:72
+msgid "Manage various other options."
+msgstr ""
+
+#. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
+#. TRANS: user's profile settings. This message has one space at the beginning. Use your
+#. TRANS: language's word separator here if it has one (most likely a single space).
+#: actions/urlsettings.php:115
+msgid " (free service)"
+msgstr ""
+
+#: actions/urlsettings.php:121
+msgid "[none]"
+msgstr ""
+
+#: actions/urlsettings.php:122
+msgid "[internal]"
+msgstr ""
+
+#. TRANS: Label for dropdown with URL shortener services.
+#: actions/urlsettings.php:130
+msgid "Shorten URLs with"
+msgstr "Scurte lis URL cun"
+
+#. TRANS: Tooltip for for dropdown with URL shortener services.
+#: actions/urlsettings.php:132
+msgid "Automatic shortening service to use."
+msgstr "Servizi di scurte automatic di doprâ."
+
+#: actions/urlsettings.php:138
+msgid "URL longer than"
+msgstr ""
+
+#: actions/urlsettings.php:141
+msgid "URLs longer than this will be shortened, 0 means always shorten."
+msgstr ""
+
+#: actions/urlsettings.php:145
+msgid "Text longer than"
+msgstr ""
+
+#: actions/urlsettings.php:148
+msgid ""
+"URLs in notices longer than this will be shortened, 0 means always shorten."
+msgstr ""
+
+#. TRANS: Form validation error for form "Other settings" in user profile.
+#: actions/urlsettings.php:180
+msgid "URL shortening service is too long (maximum 50 characters)."
+msgstr ""
+
+#: actions/urlsettings.php:187
+msgid "Invalid number for max url length."
+msgstr ""
+
+#: actions/urlsettings.php:193
+msgid "Invalid number for max notice length."
+msgstr ""
+
+#: actions/urlsettings.php:238
+msgid "Error saving user URL shortening preferences."
+msgstr ""
+
 #. TRANS: User admin panel title
 #: actions/useradminpanel.php:58
 msgctxt "TITLE"
@@ -6178,11 +6276,11 @@ msgstr ""
 #. TRANS: users in user admin panel. %1$s is the invalid nickname.
 #: actions/useradminpanel.php:166
 #, php-format
-msgid "Invalid default subscripton: '%1$s' is not a user."
+msgid "Invalid default subscripton: \"%1$s\" is not a user."
 msgstr ""
 
-#. TRANS: Link description in user account settings menu.
-#: actions/useradminpanel.php:215 lib/accountsettingsaction.php:106
+#: actions/useradminpanel.php:215 lib/action.php:565 lib/settingsnav.php:77
+#: lib/subgroupnav.php:81
 msgid "Profile"
 msgstr "Profîl"
 
@@ -6238,124 +6336,164 @@ msgstr ""
 
 #. TRANS: Title for button to save user settings in user admin panel.
 #: actions/useradminpanel.php:302
-#, fuzzy
-msgid "Save user settings"
+msgid "Save user settings."
 msgstr "Salve lis impuestazions dal utent"
 
-#: actions/userauthorization.php:105
+#. TRANS: Page title.
+#: actions/userauthorization.php:109
 msgid "Authorize subscription"
 msgstr "Autorize la sotscrizion"
 
-#: actions/userauthorization.php:110
+#. TRANS: Page notice on "Auhtorize subscription" page.
+#: actions/userauthorization.php:115
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
 "user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
-"click “Reject”."
+"click \"Reject\"."
 msgstr ""
 
-#. TRANS: Menu item for site administration
-#: actions/userauthorization.php:196 actions/version.php:167
-#: lib/adminpanelaction.php:403
-msgid "License"
-msgstr "Licence"
-
-#: actions/userauthorization.php:217
-#, fuzzy
+#. TRANS: Button text on Authorise Subscription page.
+#: actions/userauthorization.php:200
+msgctxt "BUTTON"
 msgid "Accept"
 msgstr "Acete"
 
-#: actions/userauthorization.php:218 lib/subscribeform.php:115
-#: lib/subscribeform.php:139
-msgid "Subscribe to this user"
-msgstr "Sotscrivimi a chest utent"
+#. TRANS: Title for button on Authorise Subscription page.
+#: actions/userauthorization.php:202
+msgid "Subscribe to this user."
+msgstr "Sotscrivimi a chest utent."
 
-#: actions/userauthorization.php:219
-#, fuzzy
+#. TRANS: Button text on Authorise Subscription page.
+#: actions/userauthorization.php:204
+msgctxt "BUTTON"
 msgid "Reject"
 msgstr "Refude"
 
-#: actions/userauthorization.php:220
-#, fuzzy
-msgid "Reject this subscription"
+#. TRANS: Title for button on Authorise Subscription page.
+#: actions/userauthorization.php:206
+msgid "Reject this subscription."
 msgstr "Refude la sotscrizion"
 
-#: actions/userauthorization.php:232
+#. TRANS: Client error displayed for an empty authorisation request.
+#: actions/userauthorization.php:219
 msgid "No authorization request!"
 msgstr ""
 
-#: actions/userauthorization.php:254
+#. TRANS: Accept message header from Authorise subscription page.
+#: actions/userauthorization.php:242
 msgid "Subscription authorized"
 msgstr "Sotscrizion autorizade"
 
-#: actions/userauthorization.php:256
+#: actions/userauthorization.php:245
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to authorize the "
 "subscription. Your subscription token is:"
 msgstr ""
 
-#: actions/userauthorization.php:266
+#. TRANS: Reject message header from Authorise subscription page.
+#: actions/userauthorization.php:256
 msgid "Subscription rejected"
 msgstr "Sotscrizion refudade"
 
-#: actions/userauthorization.php:268
+#: actions/userauthorization.php:259
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to fully reject the "
 "subscription."
 msgstr ""
 
+#. TRANS: Exception thrown when no valid user is found for an authorisation request.
+#. TRANS: %s is a listener URI.
+#: actions/userauthorization.php:296
+#, php-format
+msgid "Listener URI \"%s\" not found here."
+msgstr ""
+
+#. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
+#. TRANS: %s is a listenee URI.
 #: actions/userauthorization.php:303
 #, php-format
-msgid "Listener URI ‘%s’ not found here."
+msgid "Listenee URI \"%s\" is too long."
 msgstr ""
 
-#: actions/userauthorization.php:308
+#. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
+#. TRANS: %s is a listenee URI.
+#: actions/userauthorization.php:311
 #, php-format
-msgid "Listenee URI ‘%s’ is too long."
-msgstr ""
-
-#: actions/userauthorization.php:314
-#, php-format
-msgid "Listenee URI ‘%s’ is a local user."
+msgid "Listenee URI \"%s\" is a local user."
 msgstr ""
 
+#. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
+#. TRANS: %s is a profile URL.
 #: actions/userauthorization.php:329
 #, php-format
-msgid "Profile URL ‘%s’ is for a local user."
+msgid "Profile URL \"%s\" is for a local user."
 msgstr ""
 
-#: actions/userauthorization.php:345
-#, fuzzy, php-format
-msgid "Avatar URL ‘%s’ is not valid."
-msgstr "La URL sorzint no je valide."
-
-#: actions/userauthorization.php:350
+#. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
+#. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
+#: actions/userauthorization.php:339
 #, php-format
-msgid "Can’t read avatar URL ‘%s’."
+msgid ""
+"Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
+"\"."
 msgstr ""
 
-#: actions/userauthorization.php:355
+#. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
+#. TRANS: %s is an avatar URL.
+#: actions/userauthorization.php:349
 #, php-format
-msgid "Wrong image type for avatar URL ‘%s’."
+msgid "Avatar URL \"%s\" is not valid."
+msgstr ""
+
+#. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
+#. TRANS: %s is an avatar URL.
+#: actions/userauthorization.php:356
+#, php-format
+msgid "Cannot read avatar URL \"%s\"."
+msgstr ""
+
+#. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
+#. TRANS: %s is an avatar URL.
+#: actions/userauthorization.php:363
+#, php-format
+msgid "Wrong image type for avatar URL \"%s\"."
 msgstr ""
 
 #. TRANS: Page title for profile design page.
-#: actions/userdesignsettings.php:74 lib/designsettings.php:63
+#: actions/userdesignsettings.php:74 lib/designsettings.php:61
 msgid "Profile design"
 msgstr ""
 
 #. TRANS: Instructions for profile design page.
-#: actions/userdesignsettings.php:84 lib/designsettings.php:74
+#: actions/userdesignsettings.php:84 lib/designsettings.php:72
 msgid ""
 "Customize the way your profile looks with a background image and a colour "
 "palette of your choice."
 msgstr ""
 
-#: actions/userdesignsettings.php:272
+#: actions/userdesignsettings.php:289
 msgid "Enjoy your hotdog!"
 msgstr ""
 
+#: actions/userdesignsettings.php:325
+#, fuzzy
+msgid "Design settings"
+msgstr "Salve lis impuestazions dal sît"
+
+#: actions/userdesignsettings.php:340
+msgid "View profile designs"
+msgstr ""
+
+#: actions/userdesignsettings.php:341
+msgid "Show or hide profile designs."
+msgstr ""
+
+#: actions/userdesignsettings.php:348
+msgid "Background file"
+msgstr ""
+
 #. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number.
 #: actions/usergroups.php:66
 #, php-format
@@ -6405,6 +6543,11 @@ msgstr ""
 msgid "Contributors"
 msgstr "Colaboradôrs"
 
+#. TRANS: Menu item for site administration
+#: actions/version.php:167 lib/adminpanelaction.php:403
+msgid "License"
+msgstr "Licence"
+
 #: actions/version.php:170
 msgid ""
 "StatusNet is free software: you can redistribute it and/or modify it under "
@@ -6430,12 +6573,13 @@ msgstr ""
 "Tu varessis di vê ricevût une copie de GNU Affero General Public License "
 "insieme cun chest program. Se nol è cussì, cjale %s."
 
-#: actions/version.php:191
-msgid "Plugins"
-msgstr ""
+#. TRANS: Form input field label for application name.
+#: actions/version.php:197 lib/applicationeditform.php:190
+msgid "Name"
+msgstr "Non"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:901
+#: actions/version.php:198 lib/action.php:885
 msgid "Version"
 msgstr "Version"
 
@@ -6443,6 +6587,12 @@ msgstr "Version"
 msgid "Author(s)"
 msgstr "Autôr(s)"
 
+#. TRANS: Form input field label.
+#: actions/version.php:200 lib/applicationeditform.php:208
+#: lib/groupeditform.php:168
+msgid "Description"
+msgstr "Descrizion"
+
 #. TRANS: Activity title when marking a notice as favorite.
 #: classes/Fave.php:164
 msgid "Favor"
@@ -6557,7 +6707,7 @@ msgid "Could not create login token for %s"
 msgstr ""
 
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
-#: classes/Memcached_DataObject.php:542
+#: classes/Memcached_DataObject.php:556
 msgid "No database name or DSN found anywhere."
 msgstr ""
 
@@ -6727,18 +6877,18 @@ msgstr "%1$s al seguìs cumò %2$s."
 
 #. TRANS: Notice given on user registration.
 #. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:395
+#: classes/User.php:390
 #, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr "Benvignût su %1$s, @%2$s!"
 
 #. TRANS: Server exception.
-#: classes/User.php:918
+#: classes/User.php:923
 msgid "No single user defined for single-user mode."
 msgstr ""
 
 #. TRANS: Server exception.
-#: classes/User.php:922
+#: classes/User.php:927
 msgid "Single-user mode code called when not enabled."
 msgstr ""
 
@@ -6783,41 +6933,6 @@ msgstr ""
 msgid "No AtomPub API service for %s."
 msgstr ""
 
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:104
-msgid "Change your profile settings"
-msgstr "Cambie lis impuestazions dal to profîl"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:111
-msgid "Upload an avatar"
-msgstr "Cjame un avatar"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:118
-msgid "Change your password"
-msgstr "Cambie la tô password"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:125
-msgid "Change email handling"
-msgstr "Cambie la gjestion de pueste eletroniche"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:132
-msgid "Design your profile"
-msgstr ""
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:139
-msgid "Other options"
-msgstr "Altris opzions"
-
-#. TRANS: Link description in user account settings menu.
-#: lib/accountsettingsaction.php:141
-msgid "Other"
-msgstr "Altris"
-
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
 #: lib/action.php:161
 #, php-format
@@ -6835,206 +6950,128 @@ msgctxt "TOOLTIP"
 msgid "Show more"
 msgstr "Mostre di plui"
 
-#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:544
-msgid "Primary site navigation"
+#. TRANS: Inline reply form submit button: submits a reply comment.
+#: lib/action.php:328
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Comment"
+msgstr "Contignût"
+
+#. TRANS: Placeholder text for inline reply form. Clicking in this box will turn it into a mini notice form.
+#: lib/action.php:331
+msgid "Add a comment..."
 msgstr ""
 
-#. TRANS: Tooltip for main menu option "Personal".
-#: lib/action.php:550
-msgctxt "TOOLTIP"
-msgid "Personal profile and friends timeline"
-msgstr "Profîl personâl e ativitât dai amîs"
+#: lib/action.php:559 lib/personalgroupnav.php:99
+#, fuzzy
+msgid "Home"
+msgstr "Pagjine web"
 
-#. TRANS: Main menu option when logged in for access to personal profile and friends timeline.
-#. TRANS: Personal group navigation menu option when logged in for viewing timeline of self and friends.
-#: lib/action.php:553 lib/personalgroupnav.php:100
-msgctxt "MENU"
-msgid "Personal"
-msgstr "Personâl"
-
-#. TRANS: Tooltip for main menu option "Account".
-#: lib/action.php:555
-msgctxt "TOOLTIP"
-msgid "Change your email, avatar, password, profile"
-msgstr "Cambie la direzion di pueste, l'avatar, la password o il profîl"
-
-#. TRANS: Main menu option when logged in for access to user settings.
-#: lib/action.php:558
-msgid "Account"
-msgstr "Identitât"
-
-#. TRANS: Tooltip for main menu option "Services".
 #: lib/action.php:560
-msgctxt "TOOLTIP"
-msgid "Connect to services"
-msgstr ""
+#, fuzzy
+msgid "Friends timeline"
+msgstr "Ativitât di %s"
 
-#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services.
-#: lib/action.php:563
-msgid "Connect"
-msgstr ""
-
-#. TRANS: Tooltip for menu option "Admin".
 #: lib/action.php:566
-msgctxt "TOOLTIP"
-msgid "Change site configuration"
+#, fuzzy
+msgid "Your profile"
+msgstr "Profîl dal grup"
+
+#: lib/action.php:570 lib/action.php:593 lib/publicgroupnav.php:78
+msgid "Public"
+msgstr "Public"
+
+#: lib/action.php:571 lib/action.php:594
+#, fuzzy
+msgid "Everyone on this site"
+msgstr "Cjate int in chest sît"
+
+#: lib/action.php:575
+#, fuzzy
+msgid "Settings"
+msgstr "Impuestazions IM"
+
+#: lib/action.php:576
+#, fuzzy
+msgid "Change your personal settings"
+msgstr "Cambie lis impuestazions dal to profîl"
+
+#: lib/action.php:582
+#, fuzzy
+msgid "Site configuration"
 msgstr "Cambie la configurazion dal sît"
 
-#. TRANS: Main menu option when logged in and site admin for access to site configuration.
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/action.php:569 lib/groupnav.php:117
-msgctxt "MENU"
-msgid "Admin"
-msgstr "Aministradôr"
-
-#. TRANS: Tooltip for main menu option "Invite".
-#: lib/action.php:573
-#, php-format
-msgctxt "TOOLTIP"
-msgid "Invite friends and colleagues to join you on %s"
-msgstr "Invide amîs e compagns di lavôr a partecipâ a %s"
-
-#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users.
-#: lib/action.php:576
-msgctxt "MENU"
-msgid "Invite"
-msgstr "Invide"
-
-#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:582
-msgctxt "TOOLTIP"
-msgid "Logout from the site"
-msgstr "Jes dal sît"
-
-#. TRANS: Main menu option when logged in to log out the current user.
-#: lib/action.php:585
-msgctxt "MENU"
+#: lib/action.php:587
+#, fuzzy
 msgid "Logout"
 msgstr "Jes"
 
-#. TRANS: Tooltip for main menu option "Register".
-#: lib/action.php:590
-msgctxt "TOOLTIP"
-msgid "Create an account"
-msgstr "Cree une identitât"
+#: lib/action.php:588
+#, fuzzy
+msgid "Logout from the site"
+msgstr "Jes dal sît"
 
-#. TRANS: Main menu option when not logged in to register a new account.
-#. TRANS: Menu item for registering with the StatusNet site.
-#: lib/action.php:593 lib/logingroupnav.php:85
-msgctxt "MENU"
-msgid "Register"
-msgstr "Regjistriti"
-
-#. TRANS: Tooltip for main menu option "Login".
-#: lib/action.php:596
-msgctxt "TOOLTIP"
+#: lib/action.php:599
+#, fuzzy
 msgid "Login to the site"
 msgstr "Jentre tal sît"
 
-#. TRANS: Main menu option when not logged in to log in.
-#. TRANS: Menu item for logging in to the StatusNet site.
-#: lib/action.php:599 lib/logingroupnav.php:77
-msgctxt "MENU"
-msgid "Login"
-msgstr "Jentre"
-
-#. TRANS: Tooltip for main menu option "Help".
-#: lib/action.php:602
-msgctxt "TOOLTIP"
-msgid "Help me!"
-msgstr "Judimi!"
-
-#. TRANS: Main menu option for help on the StatusNet site.
-#: lib/action.php:605
-msgctxt "MENU"
-msgid "Help"
-msgstr "Jutori"
-
-#. TRANS: Tooltip for main menu option "Search".
-#: lib/action.php:608
-msgctxt "TOOLTIP"
-msgid "Search for people or text"
-msgstr "Cîr int o test"
-
-#. TRANS: Main menu option when logged in or when the StatusNet instance is not private.
-#: lib/action.php:611
-msgctxt "MENU"
+#: lib/action.php:606
+#, fuzzy
 msgid "Search"
 msgstr "Cîr"
 
-#. TRANS: DT element for site notice. String is hidden in default CSS.
-#. TRANS: Menu item for site administration
-#: lib/action.php:633 lib/adminpanelaction.php:387
-msgid "Site notice"
-msgstr ""
-
-#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:700
-msgid "Local views"
-msgstr "Viodudis locâls"
-
-#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:770
-msgid "Page notice"
-msgstr ""
-
-#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:874
-msgid "Secondary site navigation"
-msgstr ""
+#: lib/action.php:607
+#, fuzzy
+msgid "Search the site"
+msgstr "Cîr tal sît"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:880
+#: lib/action.php:864
 msgid "Help"
 msgstr "Jutori"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:883
+#: lib/action.php:867
 msgid "About"
 msgstr "Informazions"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:886
+#: lib/action.php:870
 msgid "FAQ"
 msgstr ""
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:891
+#: lib/action.php:875
 msgid "TOS"
 msgstr ""
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:895
+#: lib/action.php:879
 msgid "Privacy"
 msgstr ""
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:898
+#: lib/action.php:882
 msgid "Source"
 msgstr "Sorzint"
 
 #. TRANS: Secondary navigation menu option leading to e-mail contact information on the
 #. TRANS: StatusNet site, where to report bugs, ...
-#: lib/action.php:905
+#: lib/action.php:889
 msgid "Contact"
 msgstr "Contats"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:908
+#: lib/action.php:892
 msgid "Badge"
 msgstr ""
 
-#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:937
-msgid "StatusNet software license"
-msgstr "Licence dal software StatusNet"
-
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:944
+#: lib/action.php:921
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7044,7 +7081,7 @@ msgstr ""
 "broughtby%%](%%site.broughtbyurl%%)."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:947
+#: lib/action.php:924
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** al è un servizi di microblogging."
@@ -7053,7 +7090,7 @@ msgstr "**%%site.name%%** al è un servizi di microblogging."
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:954
+#: lib/action.php:931
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7064,28 +7101,23 @@ msgstr ""
 "version %s, disponibil sot de [GNU Affero General Public License](http://www."
 "fsf.org/licensing/licenses/agpl-3.0.html)."
 
-#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:970
-msgid "Site content license"
-msgstr "Licence dal contignût dal sît"
-
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:977
+#: lib/action.php:949
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr "I contignûts e i dâts di %1$s a son privâts e confidenziâi."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:984
+#: lib/action.php:956
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
 "I contignûts e i dâts a son copyright di %1$s. Ducj i dirits riservâts."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:988
+#: lib/action.php:960
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 "I contignûts e i dâts a son copyright dai colaboradôrs Ducj i dirits "
@@ -7093,26 +7125,21 @@ msgstr ""
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:1020
+#: lib/action.php:992
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
 "Dut il contignût e i dâts di %1$s a son disponibii sot de licence %2$s."
 
-#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1356
-msgid "Pagination"
-msgstr "Paginazion"
-
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1367
+#: lib/action.php:1335
 msgid "After"
 msgstr "Sucessîfs"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1377
+#: lib/action.php:1345
 msgid "Before"
 msgstr "Precedents"
 
@@ -7263,7 +7290,7 @@ msgid "User configuration"
 msgstr ""
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:122
+#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:110
 msgid "User"
 msgstr "Utent"
 
@@ -7287,6 +7314,11 @@ msgstr ""
 msgid "Edit site notice"
 msgstr ""
 
+#. TRANS: Menu item for site administration
+#: lib/adminpanelaction.php:387
+msgid "Site notice"
+msgstr ""
+
 #. TRANS: Menu item title/tooltip
 #: lib/adminpanelaction.php:393
 msgid "Snapshots configuration"
@@ -7297,6 +7329,12 @@ msgstr ""
 msgid "Set site license"
 msgstr ""
 
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:409
+#, fuzzy
+msgid "Plugins configuration"
+msgstr "Cambie la configurazion dal sît"
+
 #. TRANS: Client error 401.
 #: lib/apiauth.php:111
 msgid "API resource requires read-write access, but you only have read access."
@@ -7307,19 +7345,23 @@ msgstr ""
 msgid "No application for that consumer key."
 msgstr ""
 
+#: lib/apiauth.php:202 lib/apiauth.php:284
+msgid "Not allowed to use API."
+msgstr ""
+
 #. TRANS: OAuth exception given when an incorrect access token was given for a user.
-#: lib/apiauth.php:219
+#: lib/apiauth.php:225
 msgid "Bad access token."
 msgstr ""
 
 #. TRANS: OAuth exception given when no user was found for a given token (no token was found).
-#: lib/apiauth.php:224
+#: lib/apiauth.php:230
 msgid "No user for that token."
 msgstr ""
 
 #. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel".
 #. TRANS: Client error thrown when authentication fails.
-#: lib/apiauth.php:266 lib/apiauth.php:293
+#: lib/apiauth.php:272 lib/apiauth.php:302
 msgid "Could not authenticate you."
 msgstr ""
 
@@ -7362,6 +7404,11 @@ msgstr ""
 msgid "Failed to delete revoked token."
 msgstr ""
 
+#. TRANS: Form input field label for application icon.
+#: lib/applicationeditform.php:177
+msgid "Icon"
+msgstr "Icone"
+
 #. TRANS: Form guide.
 #: lib/applicationeditform.php:182
 msgid "Icon for this application"
@@ -7396,6 +7443,11 @@ msgstr ""
 msgid "Organization responsible for this application"
 msgstr ""
 
+#. TRANS: Form input field label.
+#: lib/applicationeditform.php:227
+msgid "Organization"
+msgstr "Organizazion"
+
 #. TRANS: Form input field instructions.
 #: lib/applicationeditform.php:234
 msgid "URL for the homepage of the organization"
@@ -7483,16 +7535,6 @@ msgstr ""
 msgid "Do not use this method!"
 msgstr ""
 
-#. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:293
-msgid "Author"
-msgstr "Autôr"
-
-#. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:307
-msgid "Provider"
-msgstr ""
-
 #. TRANS: Title.
 #: lib/attachmentnoticesection.php:67
 msgid "Notices where this attachment appears"
@@ -7518,23 +7560,28 @@ msgstr ""
 msgid "Block"
 msgstr "Bloche"
 
+#. TRANS: Description of the form to block a user.
+#: lib/blockform.php:79
+msgid "Block this user"
+msgstr "Bloche chest utent"
+
 #. TRANS: Title for command results.
-#: lib/channel.php:160 lib/channel.php:181
+#: lib/channel.php:104 lib/channel.php:125
 msgid "Command results"
 msgstr ""
 
 #. TRANS: Title for command results.
-#: lib/channel.php:194
+#: lib/channel.php:138
 msgid "AJAX error"
 msgstr ""
 
 #. TRANS: E-mail subject when a command has completed.
-#: lib/channel.php:233 lib/mailhandler.php:143
+#: lib/channel.php:177 lib/mailhandler.php:143
 msgid "Command complete"
 msgstr ""
 
 #. TRANS: E-mail subject when a command has failed.
-#: lib/channel.php:244
+#: lib/channel.php:188
 msgid "Command failed"
 msgstr ""
 
@@ -7636,7 +7683,7 @@ msgstr "Non complet: %s"
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a location.
-#: lib/command.php:446 lib/mail.php:270
+#: lib/command.php:446 lib/mail.php:275
 #, php-format
 msgid "Location: %s"
 msgstr "Lûc: %s"
@@ -7644,7 +7691,7 @@ msgstr "Lûc: %s"
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a homepage.
-#: lib/command.php:450 lib/mail.php:274
+#: lib/command.php:450 lib/mail.php:279
 #, php-format
 msgid "Homepage: %s"
 msgstr "Pagjine web: %s"
@@ -7882,106 +7929,100 @@ msgid ""
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:162
+#: lib/common.php:36
 msgid "No configuration file found."
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:165
+#: lib/common.php:39
 msgid "I looked for configuration files in the following places:"
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:168
+#: lib/common.php:42
 msgid "You may wish to run the installer to fix this."
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:172
+#: lib/common.php:46
 msgid "Go to the installer."
 msgstr ""
 
-#. TRANS: Menu item for Instant Messaging settings.
-#: lib/connectsettingsaction.php:106
-msgctxt "MENU"
-msgid "IM"
-msgstr "IM"
-
-#. TRANS: Tooltip for Instant Messaging menu item.
-#: lib/connectsettingsaction.php:108
-msgid "Updates by instant messenger (IM)"
-msgstr "Inzornaments par mieç di messaçs istantaniis (IM)"
-
-#. TRANS: Menu item for Short Message Service settings.
-#: lib/connectsettingsaction.php:113
-msgctxt "MENU"
-msgid "SMS"
-msgstr "SMS"
-
-#. TRANS: Tooltip for Short Message Service menu item.
-#: lib/connectsettingsaction.php:115
-msgid "Updates by SMS"
-msgstr "Inzornaments par mieç di SMS"
-
-#. TRANS: Menu item for OuAth connection settings.
-#: lib/connectsettingsaction.php:120
-msgctxt "MENU"
-msgid "Connections"
-msgstr ""
-
-#. TRANS: Tooltip for connected applications (Connections through OAuth) menu item.
-#: lib/connectsettingsaction.php:122
-msgid "Authorized connected applications"
-msgstr ""
-
 #: lib/dberroraction.php:59
 msgid "Database error"
 msgstr "Erôr de base di dâts"
 
+#. TRANS: Description of form for deleting a user.
+#: lib/deleteuserform.php:75
+msgid "Delete this user"
+msgstr "Elimine chest utent"
+
+#: lib/designform.php:114
+#, fuzzy
+msgid "Change design"
+msgstr "Cambie il teme"
+
+#. TRANS: Fieldset legend on profile design page to change profile page colours.
+#: lib/designform.php:131
+msgid "Change colours"
+msgstr "Cambie i colôrs"
+
+#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
+#: lib/designform.php:138
+msgid "Use defaults"
+msgstr ""
+
+#. TRANS: Title for button on profile design page to reset all colour settings to default.
+#: lib/designform.php:140
+msgid "Restore default designs"
+msgstr ""
+
+#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
+#: lib/designform.php:148
+msgid "Reset back to default"
+msgstr ""
+
 #. TRANS: Label in form on profile design page.
 #. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
-#: lib/designsettings.php:108
+#: lib/designform.php:158
 msgid "Upload file"
 msgstr "Cjame sù un file"
 
 #. TRANS: Instructions for form on profile design page.
-#: lib/designsettings.php:113
+#: lib/designform.php:163
+#, fuzzy
 msgid ""
-"You can upload your personal background image. The maximum file size is 2MB."
+"You can upload your personal background image. The maximum file size is 2Mb."
 msgstr ""
+"Tu puedis cjamâ un avatar personâl. La dimension massime dal file e je di %s."
 
 #. TRANS: Radio button on profile design page that will enable use of the uploaded profile image.
-#: lib/designsettings.php:139
+#: lib/designform.php:194
 msgctxt "RADIO"
 msgid "On"
 msgstr "Ativade"
 
 #. TRANS: Radio button on profile design page that will disable use of the uploaded profile image.
-#: lib/designsettings.php:156
+#: lib/designform.php:211
 msgctxt "RADIO"
 msgid "Off"
 msgstr "Disativade"
 
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: lib/designsettings.php:175
-msgid "Change colours"
-msgstr "Cambie i colôrs"
-
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: lib/designsettings.php:257
-msgid "Use defaults"
+#. TRANS: Title for button on profile design page to save settings.
+#: lib/designform.php:322
+msgid "Save design"
 msgstr ""
 
 #. TRANS: Error message displayed if design settings could not be saved.
 #. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
-#: lib/designsettings.php:405 lib/designsettings.php:427
+#: lib/designsettings.php:216 lib/designsettings.php:238
 msgid "Couldn't update your design."
 msgstr ""
 
 #. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
-#: lib/designsettings.php:433
+#: lib/designsettings.php:244
 msgid "Design defaults restored."
 msgstr ""
 
@@ -8048,27 +8089,23 @@ msgstr ""
 msgid "Feeds"
 msgstr "Canâi"
 
-#: lib/galleryaction.php:121
-msgid "Filter tags"
-msgstr "Filtre lis etichetis"
-
-#: lib/galleryaction.php:131
+#: lib/galleryaction.php:128
 msgid "All"
 msgstr "Ducj"
 
-#: lib/galleryaction.php:139
+#: lib/galleryaction.php:136
 msgid "Select tag to filter"
 msgstr "Sielç la etichete di filtrâ"
 
-#: lib/galleryaction.php:140
+#: lib/galleryaction.php:137
 msgid "Tag"
 msgstr "Etichete"
 
-#: lib/galleryaction.php:141
+#: lib/galleryaction.php:138
 msgid "Choose a tag to narrow list"
 msgstr "Sielç une etichete par scurtâ la liste"
 
-#: lib/galleryaction.php:143
+#: lib/galleryaction.php:140
 msgid "Go"
 msgstr "Va"
 
@@ -8154,6 +8191,12 @@ msgctxt "TOOLTIP"
 msgid "%s blocked users"
 msgstr "Utents blocâts in %s"
 
+#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
+#: lib/groupnav.php:117
+msgctxt "MENU"
+msgid "Admin"
+msgstr "Aministradôr"
+
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
 #: lib/groupnav.php:120
@@ -8263,39 +8306,63 @@ msgid_plural "%dB"
 msgstr[0] "%dB"
 msgstr[1] "%dB"
 
-#: lib/jabber.php:387
+#: lib/implugin.php:262
 #, php-format
-msgid "[%s]"
-msgstr "[%s]"
+msgid ""
+"User \"%s\" on %s has said that your %s screenname belongs to them. If "
+"that's true, you can confirm by clicking on this URL: %s . (If you cannot "
+"click it, copy-and-paste it into the address bar of your browser). If that "
+"user isn't you, or if you didn't request this confirmation, just ignore this "
+"message."
+msgstr ""
 
-#: lib/jabber.php:567
+#: lib/implugin.php:349
 #, php-format
 msgid "Unknown inbox source %d."
 msgstr ""
 
+#: lib/implugin.php:485
+#, fuzzy, php-format
+msgid "Message too long - maximum is %1$d characters, you sent %2$d."
+msgstr ""
+"Il messaç al è masse lunc. Il massim al è %1$d caratar, tu tu'nd âs mandâts %"
+"2$d."
+
 #: lib/leaveform.php:114
 msgid "Leave"
 msgstr "Lasse"
 
+#. TRANS: Menu item for logging in to the StatusNet site.
+#: lib/logingroupnav.php:77
+msgctxt "MENU"
+msgid "Login"
+msgstr "Jentre"
+
 #. TRANS: Title for menu item for logging in to the StatusNet site.
 #: lib/logingroupnav.php:79
 msgid "Login with a username and password"
 msgstr "Jentre cun non utent e password"
 
+#. TRANS: Menu item for registering with the StatusNet site.
+#: lib/logingroupnav.php:85
+msgctxt "MENU"
+msgid "Register"
+msgstr "Regjistriti"
+
 #. TRANS: Title for menu item for registering with the StatusNet site.
 #: lib/logingroupnav.php:87
 msgid "Sign up for a new account"
 msgstr "Regjistre une gnove identitât"
 
 #. TRANS: Subject for address confirmation email.
-#: lib/mail.php:168
+#: lib/mail.php:172
 msgid "Email address confirmation"
 msgstr "Conferme de direzion di pueste eletroniche"
 
 #. TRANS: Body for address confirmation email.
 #. TRANS: %1$s is the addressed user's nickname, %2$s is the StatusNet sitename,
 #. TRANS: %3$s is the URL to confirm at.
-#: lib/mail.php:173
+#: lib/mail.php:177
 #, php-format
 msgid ""
 "Hey, %1$s.\n"
@@ -8314,14 +8381,14 @@ msgstr ""
 
 #. TRANS: Subject of new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
-#: lib/mail.php:238
+#: lib/mail.php:243
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr ""
 
 #. TRANS: This is a paragraph in a new-subscriber e-mail.
 #. TRANS: %s is a URL where the subscriber can be reported as abusive.
-#: lib/mail.php:245
+#: lib/mail.php:250
 #, php-format
 msgid ""
 "If you believe this account is being used abusively, you can block them from "
@@ -8333,7 +8400,7 @@ msgstr ""
 #. TRANS: %3$s is the subscriber's profile URL, %4$s is the subscriber's location (or empty)
 #. TRANS: %5$s is the subscriber's homepage URL (or empty), %6%s is the subscriber's bio (or empty)
 #. TRANS: %7$s is a link to the addressed user's e-mail settings.
-#: lib/mail.php:255
+#: lib/mail.php:260
 #, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -8350,14 +8417,14 @@ msgstr ""
 
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is biographical information.
-#: lib/mail.php:278
+#: lib/mail.php:283
 #, php-format
 msgid "Bio: %s"
 msgstr "Biografie: %s"
 
 #. TRANS: Subject of notification mail for new posting email address.
 #. TRANS: %s is the StatusNet sitename.
-#: lib/mail.php:307
+#: lib/mail.php:312
 #, php-format
 msgid "New email address for posting to %s"
 msgstr ""
@@ -8365,7 +8432,7 @@ msgstr ""
 #. TRANS: Body of notification mail for new posting email address.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is the e-mail address to send
 #. TRANS: to to post by e-mail, %3$s is a URL to more instructions.
-#: lib/mail.php:313
+#: lib/mail.php:318
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -8380,26 +8447,26 @@ msgstr ""
 
 #. TRANS: Subject line for SMS-by-email notification messages.
 #. TRANS: %s is the posting user's nickname.
-#: lib/mail.php:434
+#: lib/mail.php:439
 #, php-format
 msgid "%s status"
 msgstr "stât di %s"
 
 #. TRANS: Subject line for SMS-by-email address confirmation message.
-#: lib/mail.php:460
+#: lib/mail.php:465
 msgid "SMS confirmation"
 msgstr ""
 
 #. TRANS: Main body heading for SMS-by-email address confirmation message.
 #. TRANS: %s is the addressed user's nickname.
-#: lib/mail.php:464
+#: lib/mail.php:469
 #, php-format
 msgid "%s: confirm you own this phone number with this code:"
 msgstr ""
 
 #. TRANS: Subject for 'nudge' notification email.
 #. TRANS: %s is the nudging user.
-#: lib/mail.php:485
+#: lib/mail.php:490
 #, php-format
 msgid "You have been nudged by %s"
 msgstr ""
@@ -8407,7 +8474,7 @@ msgstr ""
 #. TRANS: Body for 'nudge' notification email.
 #. TRANS: %1$s is the nuding user's long name, $2$s is the nudging user's nickname,
 #. TRANS: %3$s is a URL to post notices at, %4$s is the StatusNet sitename.
-#: lib/mail.php:492
+#: lib/mail.php:497
 #, php-format
 msgid ""
 "%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -8425,7 +8492,7 @@ msgstr ""
 
 #. TRANS: Subject for direct-message notification email.
 #. TRANS: %s is the sending user's nickname.
-#: lib/mail.php:539
+#: lib/mail.php:544
 #, php-format
 msgid "New private message from %s"
 msgstr "Gnûf messaç privât di %s"
@@ -8434,7 +8501,7 @@ msgstr "Gnûf messaç privât di %s"
 #. TRANS: %1$s is the sending user's long name, %2$s is the sending user's nickname,
 #. TRANS: %3$s is the message content, %4$s a URL to the message,
 #. TRANS: %5$s is the StatusNet sitename.
-#: lib/mail.php:547
+#: lib/mail.php:552
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -8455,7 +8522,7 @@ msgstr ""
 
 #. TRANS: Subject for favorite notification e-mail.
 #. TRANS: %1$s is the adding user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:599
+#: lib/mail.php:604
 #, php-format
 msgid "%1$s (@%2$s) added your notice as a favorite"
 msgstr ""
@@ -8465,7 +8532,7 @@ msgstr ""
 #. TRANS: %3$s is a URL to the faved notice, %4$s is the faved notice text,
 #. TRANS: %5$s is a URL to all faves of the adding user, %6$s is the StatusNet sitename,
 #. TRANS: %7$s is the adding user's nickname.
-#: lib/mail.php:606
+#: lib/mail.php:611
 #, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -8487,7 +8554,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:664
+#: lib/mail.php:669
 #, php-format
 msgid ""
 "The full conversation can be read here:\n"
@@ -8497,7 +8564,7 @@ msgstr ""
 
 #. TRANS: E-mail subject for notice notification.
 #. TRANS: %1$s is the sending user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:672
+#: lib/mail.php:677
 #, php-format
 msgid "%1$s (@%2$s) sent a notice to your attention"
 msgstr ""
@@ -8508,7 +8575,7 @@ msgstr ""
 #. TRANS: %5$s is a URL to the full conversion if it exists (otherwise empty),
 #. TRANS: %6$s is a URL to reply to the notice, %7$s is a URL to all @-replied for the addressed user,
 #. TRANS: %8$s is a URL to the addressed user's e-mail settings, %9$s is the sender's nickname.
-#: lib/mail.php:680
+#: lib/mail.php:685
 #, php-format
 msgid ""
 "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -8623,11 +8690,7 @@ msgstr ""
 msgid "To"
 msgstr "A"
 
-#: lib/messageform.php:166 lib/noticeform.php:186
-msgid "Available characters"
-msgstr ""
-
-#: lib/messageform.php:185 lib/noticeform.php:237
+#: lib/messageform.php:184 lib/noticeform.php:236
 msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr "Mande"
@@ -8636,15 +8699,10 @@ msgstr "Mande"
 msgid "Messages"
 msgstr "Messaçs"
 
-#: lib/messagelistitem.php:123 lib/noticelist.php:522
+#: lib/messagelistitem.php:123 lib/noticelist.php:527
 msgid "from"
 msgstr "di"
 
-#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:165
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr ""
-
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 #: lib/nickname.php:178
 msgid "Nickname cannot be empty."
@@ -8667,78 +8725,82 @@ msgstr "Mande un avîs"
 msgid "What's up, %s?"
 msgstr "Ce sucedial, %s?"
 
-#: lib/noticeform.php:194
+#: lib/noticeform.php:193
 msgid "Attach"
 msgstr "Aleghe"
 
-#: lib/noticeform.php:198
+#: lib/noticeform.php:197
 msgid "Attach a file"
 msgstr "Aleghe un file"
 
-#: lib/noticeform.php:213
+#: lib/noticeform.php:212
 msgid "Share my location"
 msgstr "Condivît il lûc dulà che mi cjati"
 
-#: lib/noticeform.php:216
+#: lib/noticeform.php:215
 msgid "Do not share my location"
 msgstr "No stâ condividi il lûc dulà che mi cjati"
 
-#: lib/noticeform.php:217
+#: lib/noticeform.php:216
 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
 "try again later"
 msgstr ""
 
 #. TRANS: Used in coordinates as abbreviation of north
-#: lib/noticelist.php:452
+#: lib/noticelist.php:457
 msgid "N"
 msgstr "N"
 
 #. TRANS: Used in coordinates as abbreviation of south
-#: lib/noticelist.php:454
+#: lib/noticelist.php:459
 msgid "S"
 msgstr "S"
 
 #. TRANS: Used in coordinates as abbreviation of east
-#: lib/noticelist.php:456
+#: lib/noticelist.php:461
 msgid "E"
 msgstr "E"
 
 #. TRANS: Used in coordinates as abbreviation of west
-#: lib/noticelist.php:458
+#: lib/noticelist.php:463
 msgid "W"
 msgstr "O"
 
-#: lib/noticelist.php:460
+#: lib/noticelist.php:465
 #, php-format
 msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgstr ""
 
-#: lib/noticelist.php:469
+#: lib/noticelist.php:474
 msgid "at"
 msgstr "lì di"
 
-#: lib/noticelist.php:518
+#: lib/noticelist.php:523
 msgid "web"
 msgstr "web"
 
-#: lib/noticelist.php:584
+#: lib/noticelist.php:589
 msgid "in context"
 msgstr ""
 
-#: lib/noticelist.php:619
+#: lib/noticelist.php:624
 msgid "Repeated by"
 msgstr "Ripetût di"
 
-#: lib/noticelist.php:646
+#: lib/noticelist.php:651
 msgid "Reply to this notice"
 msgstr "Rispuint a chest avîs"
 
-#: lib/noticelist.php:647
+#: lib/noticelist.php:652
 msgid "Reply"
 msgstr "Rispuint"
 
-#: lib/noticelist.php:691
+#: lib/noticelist.php:678
+msgid "Delete this notice"
+msgstr "Elimine chest avîs"
+
+#: lib/noticelist.php:696
 msgid "Notice repeated"
 msgstr "Avîs ripetût"
 
@@ -8775,43 +8837,30 @@ msgstr ""
 msgid "Couldn't insert new subscription."
 msgstr ""
 
-#. TRANS: Personal group navigation menu option when logged in for viewing @-replies.
-#: lib/personalgroupnav.php:107
-msgctxt "MENU"
+#: lib/personalgroupnav.php:104
+#, fuzzy
 msgid "Replies"
 msgstr "Rispuestis"
 
-#. TRANS: Personal group navigation menu option when logged in for seeing own profile.
-#: lib/personalgroupnav.php:114
-msgctxt "MENU"
-msgid "Profile"
-msgstr "Profîl"
-
-#. TRANS: Personal group navigation menu option when logged in for viewing own favourited notices.
-#: lib/personalgroupnav.php:120
-msgctxt "MENU"
+#: lib/personalgroupnav.php:109
+#, fuzzy
 msgid "Favorites"
 msgstr "Preferîts"
 
-#. TRANS: Personal group navigation menu option when logged in for viewing recieved personal messages.
-#: lib/personalgroupnav.php:133
-msgctxt "MENU"
+#: lib/personalgroupnav.php:120
 msgid "Inbox"
 msgstr ""
 
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing recieved personal messages.
-#: lib/personalgroupnav.php:135
+#: lib/personalgroupnav.php:121
 msgid "Your incoming messages"
 msgstr ""
 
-#. TRANS: Personal group navigation menu option when logged in for viewing senet personal messages.
-#: lib/personalgroupnav.php:140
-msgctxt "MENU"
+#: lib/personalgroupnav.php:125
+#, fuzzy
 msgid "Outbox"
-msgstr ""
+msgstr "Pueste in jessude par %s"
 
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing senet personal messages.
-#: lib/personalgroupnav.php:142
+#: lib/personalgroupnav.php:126
 msgid "Your sent messages"
 msgstr ""
 
@@ -8826,9 +8875,26 @@ msgstr "Etichetis dai avîs di %s"
 msgid "Unknown"
 msgstr ""
 
+#. TRANS: Plugin admin panel controls
+#: lib/plugindisableform.php:90
+msgctxt "plugin"
+msgid "Disable"
+msgstr ""
+
+#. TRANS: Plugin admin panel controls
+#: lib/pluginenableform.php:112
+msgctxt "plugin"
+msgid "Enable"
+msgstr ""
+
+#: lib/pluginlist.php:196
+msgctxt "plugin-description"
+msgid "(Plugin descriptions unavailable when disabled.)"
+msgstr ""
+
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:82
+#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:88
 msgid "Subscriptions"
 msgstr "Sotscrizions"
 
@@ -8839,7 +8905,7 @@ msgstr "Dutis lis sotscrizions"
 
 #. TRANS: H2 text for user subscriber statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:90
+#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:96
 msgid "Subscribers"
 msgstr "Sotscritôrs"
 
@@ -8861,7 +8927,7 @@ msgstr "Membri dai"
 #. TRANS: Label for user statistics.
 #. TRANS: H2 text for user group membership statistics.
 #: lib/profileaction.php:239 lib/profileaction.php:290
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:104
 msgid "Groups"
 msgstr "Grups"
 
@@ -8881,10 +8947,6 @@ msgstr "Ducj i grups"
 msgid "Unimplemented method."
 msgstr ""
 
-#: lib/publicgroupnav.php:78
-msgid "Public"
-msgstr "Public"
-
 #: lib/publicgroupnav.php:82
 msgid "User groups"
 msgstr "Grups di utents"
@@ -8923,7 +8985,7 @@ msgid "Revoke the \"%s\" role from this user"
 msgstr ""
 
 #. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:974
+#: lib/router.php:1001
 msgid "Page not found."
 msgstr ""
 
@@ -8952,11 +9014,6 @@ msgctxt "BUTTON"
 msgid "Search"
 msgstr "Cîr"
 
-#. TRANS: Definition list item with instructions on how to get (better) search results.
-#: lib/searchaction.php:170
-msgid "Search help"
-msgstr "Jutori pe ricercje"
-
 #: lib/searchgroupnav.php:80
 msgid "People"
 msgstr "Int"
@@ -8981,6 +9038,51 @@ msgstr ""
 msgid "More..."
 msgstr "Plui..."
 
+#: lib/settingsnav.php:78
+msgid "Change your profile settings"
+msgstr "Cambie lis impuestazions dal to profîl"
+
+#: lib/settingsnav.php:83
+msgid "Upload an avatar"
+msgstr "Cjame un avatar"
+
+#: lib/settingsnav.php:88
+msgid "Change your password"
+msgstr "Cambie la tô password"
+
+#: lib/settingsnav.php:93
+msgid "Change email handling"
+msgstr "Cambie la gjestion de pueste eletroniche"
+
+#: lib/settingsnav.php:98
+msgid "Design your profile"
+msgstr ""
+
+#: lib/settingsnav.php:102
+msgid "URL"
+msgstr "URL"
+
+#: lib/settingsnav.php:103
+msgid "URL shorteners"
+msgstr ""
+
+#: lib/settingsnav.php:111
+msgid "Updates by instant messenger (IM)"
+msgstr "Inzornaments par mieç di messaçs istantaniis (IM)"
+
+#: lib/settingsnav.php:118
+msgid "Updates by SMS"
+msgstr "Inzornaments par mieç di SMS"
+
+#: lib/settingsnav.php:123
+#, fuzzy
+msgid "Connections"
+msgstr "Tabaiade"
+
+#: lib/settingsnav.php:124
+msgid "Authorized connected applications"
+msgstr ""
+
 #: lib/silenceform.php:67
 msgid "Silence"
 msgstr ""
@@ -8989,30 +9091,34 @@ msgstr ""
 msgid "Silence this user"
 msgstr ""
 
-#: lib/subgroupnav.php:83
+#: lib/subgroupnav.php:89
 #, php-format
 msgid "People %s subscribes to"
 msgstr ""
 
-#: lib/subgroupnav.php:91
+#: lib/subgroupnav.php:97
 #, php-format
 msgid "People subscribed to %s"
 msgstr ""
 
-#: lib/subgroupnav.php:99
+#: lib/subgroupnav.php:105
 #, php-format
 msgid "Groups %s is a member of"
 msgstr "%s al fâs part di chescj grups"
 
-#: lib/subgroupnav.php:105
+#: lib/subgroupnav.php:111
 msgid "Invite"
 msgstr "Invide"
 
-#: lib/subgroupnav.php:106
+#: lib/subgroupnav.php:112
 #, php-format
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Invide amîs e compagns di lavôr a partecipâ a %s"
 
+#: lib/subscribeform.php:115 lib/subscribeform.php:139
+msgid "Subscribe to this user"
+msgstr "Sotscrivimi a chest utent"
+
 #: lib/subscriberspeopleselftagcloudsection.php:48
 #: lib/subscriptionspeopleselftagcloudsection.php:48
 msgid "People Tagcloud as self-tagged"
@@ -9081,6 +9187,13 @@ msgstr ""
 msgid "Error opening theme archive."
 msgstr ""
 
+#: lib/threadednoticelist.php:270
+#, php-format
+msgid "Show all %d comment"
+msgid_plural "Show all %d comments"
+msgstr[0] ""
+msgstr[1] ""
+
 #: lib/topposterssection.php:74
 msgid "Top posters"
 msgstr "Cui che al publiche di plui"
@@ -9122,76 +9235,80 @@ msgstr ""
 msgid "User %1$s (%2$d) has no profile record."
 msgstr ""
 
-#. TRANS: Link text for changeing the avatar of the logged in user.
-#: lib/userprofile.php:121
+#: lib/userprofile.php:116
 msgid "Edit Avatar"
 msgstr "Modifiche l'avatar"
 
 #. TRANS: H2 for user actions in a profile.
 #. TRANS: H2 for entity actions in a profile.
-#: lib/userprofile.php:245 lib/userprofile.php:261
+#: lib/userprofile.php:216 lib/userprofile.php:232
 msgid "User actions"
 msgstr "Azions dal utent"
 
 #. TRANS: Text shown in user profile of not yet compeltely deleted users.
-#: lib/userprofile.php:249
+#: lib/userprofile.php:220
 msgid "User deletion in progress..."
 msgstr ""
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:277
+#: lib/userprofile.php:248
 msgid "Edit profile settings"
 msgstr "Cambie lis impuestazions dal profîl"
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:279
+#: lib/userprofile.php:250
 msgid "Edit"
 msgstr "Cambie"
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:303
+#: lib/userprofile.php:274
 msgid "Send a direct message to this user"
 msgstr "Mande un messaç diret a chest utent"
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:305
+#: lib/userprofile.php:276
 msgid "Message"
 msgstr "Messaç"
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:347
+#: lib/userprofile.php:318
 msgid "Moderate"
 msgstr ""
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:386
+#: lib/userprofile.php:357
 msgid "User role"
 msgstr "Rûl dal utent"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:389
+#: lib/userprofile.php:360
 msgctxt "role"
 msgid "Administrator"
 msgstr "Aministradôr"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:391
+#: lib/userprofile.php:362
 msgctxt "role"
 msgid "Moderator"
 msgstr "Moderatôr"
 
+#: lib/util.php:321
+#, fuzzy
+msgid "Not allowed to log in."
+msgstr "No tu sês jentrât."
+
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1306
+#: lib/util.php:1337
 msgid "a few seconds ago"
 msgstr "cualchi secont indaûr"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1309
+#: lib/util.php:1340
 msgid "about a minute ago"
 msgstr "cirche un minût indaûr"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1313
+#: lib/util.php:1344
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
@@ -9199,12 +9316,12 @@ msgstr[0] "cirche un minût indaûr"
 msgstr[1] "cirche %d minûts indaûr"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1316
+#: lib/util.php:1347
 msgid "about an hour ago"
 msgstr "cirche une ore indaûr"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1320
+#: lib/util.php:1351
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
@@ -9212,12 +9329,12 @@ msgstr[0] "cirche une ore indaûr"
 msgstr[1] "cirche %d oris indaûr"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1323
+#: lib/util.php:1354
 msgid "about a day ago"
 msgstr "cirche une zornade indaûr"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1327
+#: lib/util.php:1358
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
@@ -9225,12 +9342,12 @@ msgstr[0] "cirche une zornade indaûr"
 msgstr[1] "cirche %d zornadis indaûr"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1330
+#: lib/util.php:1361
 msgid "about a month ago"
 msgstr "cirche un mês indaûr"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1334
+#: lib/util.php:1365
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
@@ -9238,7 +9355,7 @@ msgstr[0] "cirche un mês indaûr"
 msgstr[1] "cirche %d mês indaûr"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1337
+#: lib/util.php:1368
 msgid "about a year ago"
 msgstr "cirche un an indaûr"
 
@@ -9249,25 +9366,6 @@ msgstr "cirche un an indaûr"
 msgid "%s is not a valid color! Use 3 or 6 hex characters."
 msgstr ""
 
-#. TRANS: %s is the URL to the StatusNet site's Instant Messaging settings.
-#: lib/xmppmanager.php:287
-#, php-format
-msgid "Unknown user. Go to %s to add your address to your account"
-msgstr ""
-
-#. TRANS: Response to XMPP source when it sent too long a message.
-#. TRANS: %1$d the maximum number of allowed characters (used for plural), %2$d is the sent number.
-#: lib/xmppmanager.php:406
-#, php-format
-msgid "Message too long. Maximum is %1$d character, you sent %2$d."
-msgid_plural "Message too long. Maximum is %1$d characters, you sent %2$d."
-msgstr[0] ""
-"Il messaç al masse lunc. Il massim al è %1$d caratar, tu tu'nd âs mandâts %2"
-"$d."
-msgstr[1] ""
-"Il messaç al masse lunc. Il massim a son %1$d caratars, tu tu'nd âs mandâts %"
-"2$d."
-
 #. TRANS: Exception.
 #: lib/xrd.php:63
 msgid "Invalid XML."
@@ -9284,28 +9382,100 @@ msgstr ""
 msgid "Getting backup from file '%s'."
 msgstr ""
 
-#~ msgid "Block this user."
-#~ msgstr "Bloche chest utent"
+#~ msgid "Other settings"
+#~ msgstr "Altris impuestazions"
 
-#~ msgid "Delete this notice."
-#~ msgstr "Elimine chest avîs"
+#~ msgid "Tag cloud"
+#~ msgstr "Nûl di etichetis"
 
-#~ msgid "Delete this user."
-#~ msgstr "Elimine chest utent"
+#~ msgid "Jabber"
+#~ msgstr "Jabber"
 
-#, fuzzy
-#~ msgid "%s updates from everyone."
-#~ msgstr "Inzornaments di %s di ducj cuancj!"
+#~ msgid "Photo"
+#~ msgstr "Foto"
 
-#~ msgid "Password saved"
-#~ msgstr "Password salvade"
+#~ msgid "Other options"
+#~ msgstr "Altris opzions"
 
-#~ msgid "Where you are, like \"City, State (or Region), Country\"."
-#~ msgstr "Dulà che tu sês, par esempli \"Citât, Provincie, Stât\"."
+#~ msgid "Other"
+#~ msgstr "Altris"
 
-#~ msgid "Subscribe to this user."
-#~ msgstr "Sotscrivimi a chest utent."
+#~ msgctxt "TOOLTIP"
+#~ msgid "Personal profile and friends timeline"
+#~ msgstr "Profîl personâl e ativitât dai amîs"
 
-#, fuzzy
-#~ msgid "Not allowed to log in."
-#~ msgstr "No tu sês jentrât."
+#~ msgctxt "MENU"
+#~ msgid "Personal"
+#~ msgstr "Personâl"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Change your email, avatar, password, profile"
+#~ msgstr "Cambie la direzion di pueste, l'avatar, la password o il profîl"
+
+#~ msgid "Account"
+#~ msgstr "Identitât"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Invite friends and colleagues to join you on %s"
+#~ msgstr "Invide amîs e compagns di lavôr a partecipâ a %s"
+
+#~ msgctxt "MENU"
+#~ msgid "Invite"
+#~ msgstr "Invide"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Create an account"
+#~ msgstr "Cree une identitât"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Help me!"
+#~ msgstr "Judimi!"
+
+#~ msgctxt "MENU"
+#~ msgid "Help"
+#~ msgstr "Jutori"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Search for people or text"
+#~ msgstr "Cîr int o test"
+
+#~ msgid "Local views"
+#~ msgstr "Viodudis locâls"
+
+#~ msgid "StatusNet software license"
+#~ msgstr "Licence dal software StatusNet"
+
+#~ msgid "Site content license"
+#~ msgstr "Licence dal contignût dal sît"
+
+#~ msgid "Pagination"
+#~ msgstr "Paginazion"
+
+#~ msgid "Author"
+#~ msgstr "Autôr"
+
+#~ msgctxt "MENU"
+#~ msgid "SMS"
+#~ msgstr "SMS"
+
+#~ msgid "Filter tags"
+#~ msgstr "Filtre lis etichetis"
+
+#~ msgid "[%s]"
+#~ msgstr "[%s]"
+
+#~ msgctxt "MENU"
+#~ msgid "Profile"
+#~ msgstr "Profîl"
+
+#~ msgid "Search help"
+#~ msgstr "Jutori pe ricercje"
+
+#~ msgid "Message too long. Maximum is %1$d character, you sent %2$d."
+#~ msgid_plural "Message too long. Maximum is %1$d characters, you sent %2$d."
+#~ msgstr[0] ""
+#~ "Il messaç al masse lunc. Il massim al è %1$d caratar, tu tu'nd âs mandâts "
+#~ "%2$d."
+#~ msgstr[1] ""
+#~ "Il messaç al masse lunc. Il massim a son %1$d caratars, tu tu'nd âs "
+#~ "mandâts %2$d."
diff --git a/locale/gl/LC_MESSAGES/statusnet.po b/locale/gl/LC_MESSAGES/statusnet.po
index 5710eaca2d..a81de11034 100644
--- a/locale/gl/LC_MESSAGES/statusnet.po
+++ b/locale/gl/LC_MESSAGES/statusnet.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 15:58+0000\n"
-"PO-Revision-Date: 2011-03-03 16:00:46+0000\n"
+"POT-Creation-Date: 2011-03-03 17:23+0000\n"
+"PO-Revision-Date: 2011-03-03 17:26:02+0000\n"
 "Language-Team: Galician <http://translatewiki.net/wiki/Portal:gl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -79,23 +79,23 @@ msgstr "Gardar a configuración de acceso"
 #. TRANS: Tooltip for button to save access settings in site admin panel.
 #. TRANS: Button text for saving theme settings.
 #. TRANS: Button label to save e-mail preferences.
-#. TRANS: Button label to save Instant Messaging preferences.
-#. TRANS: Button text for saving "Other settings" in profile.
+#. TRANS: Button label to save IM preferences.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
 #. TRANS: Button text for saving site notice in admin panel.
 #. TRANS: Button label to save SMS preferences.
 #. TRANS: Save button for settings for a profile in a subscriptions list.
+#. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
 #. TRANS: Button text on profile design page to save settings.
 #: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
-#: actions/emailsettings.php:250 actions/imsettings.php:183
-#: actions/othersettings.php:136 actions/pathsadminpanel.php:512
-#: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
-#: actions/smssettings.php:205 actions/subscriptions.php:259
+#: actions/emailsettings.php:251 actions/imsettings.php:199
+#: actions/pathsadminpanel.php:512 actions/profilesettings.php:198
+#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:204
+#: actions/subscriptions.php:261 actions/urlsettings.php:152
 #: actions/useradminpanel.php:298 lib/applicationeditform.php:355
-#: lib/designsettings.php:270 lib/groupeditform.php:201
+#: lib/designform.php:320 lib/groupeditform.php:201
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Gardar"
@@ -134,7 +134,11 @@ msgstr "Esa páxina non existe."
 #. 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 use "one time password login" without using an existing user.
+#. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
+#. TRANS: Client error displayed trying to find a user by ID for a non-existing ID.
+#. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when calling a profile action without specifying a user.
 #: actions/all.php:80 actions/allrss.php:69
@@ -146,19 +150,19 @@ msgstr "Esa páxina non existe."
 #: actions/apidirectmessage.php:75 actions/apidirectmessagenew.php:72
 #: actions/apigroupcreate.php:111 actions/apigroupismember.php:89
 #: actions/apigroupjoin.php:98 actions/apigroupleave.php:98
-#: actions/apigrouplist.php:70 actions/apistatusesupdate.php:230
-#: actions/apisubscriptions.php:85 actions/apitimelinefavorites.php:70
-#: actions/apitimelinefriends.php:173 actions/apitimelinehome.php:78
-#: actions/apitimelinementions.php:77 actions/apitimelineuser.php:79
-#: actions/avatarbynickname.php:79 actions/favoritesrss.php:72
-#: actions/foaf.php:42 actions/foaf.php:61 actions/hcard.php:67
-#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
-#: actions/remotesubscribe.php:144 actions/remotesubscribe.php:153
-#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
-#: actions/showfavorites.php:106 actions/userbyid.php:74
-#: actions/usergroups.php:93 actions/userrss.php:40 actions/userxrd.php:59
-#: actions/xrds.php:71 lib/command.php:509 lib/galleryaction.php:59
-#: lib/mailbox.php:80 lib/profileaction.php:77
+#: actions/apigrouplist.php:70 actions/apigroupprofileupdate.php:108
+#: actions/apistatusesupdate.php:230 actions/apisubscriptions.php:85
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:173
+#: actions/apitimelinehome.php:78 actions/apitimelinementions.php:77
+#: actions/apitimelineuser.php:79 actions/avatarbynickname.php:79
+#: actions/favoritesrss.php:72 actions/foaf.php:42 actions/foaf.php:61
+#: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116
+#: actions/otp.php:78 actions/remotesubscribe.php:144
+#: actions/remotesubscribe.php:153 actions/replies.php:73
+#: actions/repliesrss.php:38 actions/rsd.php:113 actions/showfavorites.php:106
+#: actions/userbyid.php:75 actions/usergroups.php:93 actions/userrss.php:40
+#: actions/userxrd.php:59 actions/xrds.php:71 lib/command.php:509
+#: lib/galleryaction.php:59 lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Non existe tal usuario."
 
@@ -172,10 +176,9 @@ msgstr "%1$s e amigos, páxina %2$d"
 #. TRANS: H1 text for page. %s is a user nickname.
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Timeline title for user and friends. %s is a user nickname.
-#. TRANS: Tooltop for personal group navigation menu option when logged in for viewing timeline of self and friends.
 #: actions/all.php:94 actions/all.php:191 actions/allrss.php:117
 #: actions/apitimelinefriends.php:207 actions/apitimelinehome.php:113
-#: lib/personalgroupnav.php:102
+#: lib/personalgroupnav.php:100
 #, php-format
 msgid "%s and friends"
 msgstr "%s e amigos"
@@ -233,7 +236,7 @@ msgstr ""
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
 #. TRANS: Second sentence of empty message for anonymous users. %s is a user nickname.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:227
+#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:221
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -282,19 +285,20 @@ msgstr "Actualizacións de %1$s e amigos en %2$s!"
 #: actions/apifavoritecreate.php:98 actions/apifavoritedestroy.php:98
 #: actions/apifriendshipscreate.php:99 actions/apifriendshipsdestroy.php:99
 #: actions/apifriendshipsshow.php:124 actions/apigroupcreate.php:138
-#: actions/apigroupismember.php:115 actions/apigroupjoin.php:160
-#: actions/apigroupleave.php:145 actions/apigrouplist.php:134
+#: actions/apigroupismember.php:115 actions/apigroupjoin.php:151
+#: actions/apigroupleave.php:141 actions/apigrouplist.php:134
 #: actions/apigrouplistall.php:120 actions/apigroupmembership.php:105
+#: actions/apigroupprofileupdate.php:100 actions/apigroupprofileupdate.php:213
 #: actions/apigroupshow.php:114 actions/apihelptest.php:84
 #: actions/apistatusesdestroy.php:101 actions/apistatusesretweets.php:110
 #: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:139
 #: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
-#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:268
-#: actions/apitimelinegroup.php:147 actions/apitimelinehome.php:173
-#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:239
-#: actions/apitimelineretweetedtome.php:118
-#: actions/apitimelineretweetsofme.php:150 actions/apitimelinetag.php:159
-#: actions/apitimelineuser.php:206 actions/apiusershow.php:100
+#: actions/apitimelinefavorites.php:182 actions/apitimelinefriends.php:276
+#: actions/apitimelinegroup.php:148 actions/apitimelinehome.php:181
+#: actions/apitimelinementions.php:182 actions/apitimelinepublic.php:247
+#: actions/apitimelineretweetedtome.php:147
+#: actions/apitimelineretweetsofme.php:147 actions/apitimelinetag.php:165
+#: actions/apitimelineuser.php:217 actions/apiusershow.php:100
 msgid "API method not found."
 msgstr "Non se atopou o método da API."
 
@@ -309,8 +313,9 @@ msgstr "Non se atopou o método da API."
 #: actions/apifavoritecreate.php:88 actions/apifavoritedestroy.php:88
 #: actions/apifriendshipscreate.php:89 actions/apifriendshipsdestroy.php:89
 #: actions/apigroupcreate.php:102 actions/apigroupjoin.php:89
-#: actions/apigroupleave.php:89 actions/apimediaupload.php:66
-#: actions/apistatusesretweet.php:63 actions/apistatusesupdate.php:194
+#: actions/apigroupleave.php:89 actions/apigroupprofileupdate.php:92
+#: actions/apimediaupload.php:66 actions/apistatusesretweet.php:63
+#: actions/apistatusesupdate.php:194
 msgid "This method requires a POST."
 msgstr "Este método require un POST."
 
@@ -324,21 +329,16 @@ msgstr ""
 "im, none."
 
 #. TRANS: Server error displayed when a user's delivery device cannot be updated.
-#. TRANS: Server error displayed when a user update to the database fails in the contact address confirmation action.
 #. TRANS: Server error thrown on database error updating e-mail preferences.
 #. TRANS: Server error thrown on database error removing a registered e-mail address.
-#. TRANS: Server error thrown on database error updating Instant Messaging preferences.
-#. TRANS: Server error thrown on database error removing a registered Instant Messaging address.
-#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
 #. TRANS: Server error thrown when user profile settings could not be updated.
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
-#: actions/apiaccountupdatedeliverydevice.php:130
-#: actions/confirmaddress.php:118 actions/emailsettings.php:352
-#: actions/emailsettings.php:498 actions/imsettings.php:276
-#: actions/imsettings.php:432 actions/othersettings.php:186
-#: actions/profilesettings.php:322 actions/smssettings.php:301
-#: actions/smssettings.php:454
+#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
+#: actions/apiaccountupdatedeliverydevice.php:136
+#: actions/emailsettings.php:353 actions/emailsettings.php:499
+#: actions/profilesettings.php:323 actions/smssettings.php:300
+#: actions/smssettings.php:453 actions/urlsettings.php:211
 msgid "Could not update user."
 msgstr "Non se puido actualizar o usuario."
 
@@ -364,7 +364,7 @@ msgstr "O usuario non ten perfil."
 
 #. TRANS: Server error displayed if a user profile could not be saved.
 #. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:418
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:419
 msgid "Could not save profile."
 msgstr "Non se puido gardar o perfil."
 
@@ -376,7 +376,7 @@ msgstr "Non se puido gardar o perfil."
 #: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
 #: actions/designadminpanel.php:120 actions/editapplication.php:121
 #: actions/newapplication.php:102 actions/newnotice.php:95
-#: lib/designsettings.php:298
+#: lib/designsettings.php:110
 #, fuzzy, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s byte) due to its "
@@ -401,8 +401,8 @@ msgstr[1] ""
 #: actions/apiaccountupdateprofilecolors.php:160
 #: actions/apiaccountupdateprofilecolors.php:171
 #: actions/groupdesignsettings.php:285 actions/groupdesignsettings.php:296
-#: actions/userdesignsettings.php:201 actions/userdesignsettings.php:211
-#: actions/userdesignsettings.php:253 actions/userdesignsettings.php:263
+#: actions/userdesignsettings.php:218 actions/userdesignsettings.php:228
+#: actions/userdesignsettings.php:270 actions/userdesignsettings.php:280
 msgid "Unable to save your design settings."
 msgstr "Non se puido gardar a súa configuración de deseño."
 
@@ -410,7 +410,7 @@ msgstr "Non se puido gardar a súa configuración de deseño."
 #. TRANS: Client error displayed when a database error occurs updating profile colours.
 #: actions/apiaccountupdateprofilebackgroundimage.php:191
 #: actions/apiaccountupdateprofilecolors.php:139
-#: actions/userdesignsettings.php:179
+#: actions/userdesignsettings.php:196
 msgid "Could not update your design."
 msgstr "Non se puido actualizar o seu deseño."
 
@@ -521,7 +521,7 @@ msgstr "Non se atopou o destinatario."
 #. TRANS: Client error displayed trying to direct message another user who's not a friend (403).
 #: actions/apidirectmessagenew.php:144
 #, fuzzy
-msgid "Can't send direct messages to users who aren't your friend."
+msgid "Cannot send direct messages to users who aren't your friend."
 msgstr ""
 "Non pode enviar mensaxes directas a usuarios que non sexan amigos seus."
 
@@ -605,9 +605,9 @@ msgstr "Non se puido atopar o usuario de destino."
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:156 actions/editgroup.php:191
-#: actions/newgroup.php:137 actions/profilesettings.php:273
-#: actions/register.php:214
+#: actions/apigroupcreate.php:156 actions/apigroupprofileupdate.php:255
+#: actions/editgroup.php:191 actions/newgroup.php:137
+#: actions/profilesettings.php:274 actions/register.php:199
 msgid "Nickname already in use. Try another one."
 msgstr "Ese alcume xa está en uso. Probe con outro."
 
@@ -615,9 +615,9 @@ msgstr "Ese alcume xa está en uso. Probe con outro."
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:164 actions/editgroup.php:195
-#: actions/newgroup.php:141 actions/profilesettings.php:243
-#: actions/register.php:216
+#: actions/apigroupcreate.php:164 actions/apigroupprofileupdate.php:259
+#: actions/editgroup.php:195 actions/newgroup.php:141
+#: actions/profilesettings.php:244 actions/register.php:201
 msgid "Not a valid nickname."
 msgstr "O formato do alcume non é correcto."
 
@@ -627,10 +627,10 @@ msgstr "O formato do alcume non é correcto."
 #. TRANS: Validation error shown when providing an invalid homepage URL in the "New application" form.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:181 actions/editapplication.php:235
-#: actions/editgroup.php:202 actions/newapplication.php:221
-#: actions/newgroup.php:148 actions/profilesettings.php:248
-#: actions/register.php:223
+#: actions/apigroupcreate.php:181 actions/apigroupprofileupdate.php:277
+#: actions/editapplication.php:235 actions/editgroup.php:202
+#: actions/newapplication.php:221 actions/newgroup.php:148
+#: actions/profilesettings.php:249 actions/register.php:208
 msgid "Homepage is not a valid URL."
 msgstr "O URL da páxina persoal non é correcto."
 
@@ -639,8 +639,8 @@ msgstr "O URL da páxina persoal non é correcto."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:191 actions/editgroup.php:206
-#: actions/newgroup.php:152 actions/profilesettings.php:252
-#: actions/register.php:226
+#: actions/newgroup.php:152 actions/profilesettings.php:253
+#: actions/register.php:211
 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "O nome completo é longo de máis (o máximo son 255 caracteres)."
@@ -668,8 +668,8 @@ msgstr[1] "A descrición é longa de máis (o máximo son %d caracteres)."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:215 actions/editgroup.php:218
-#: actions/newgroup.php:164 actions/profilesettings.php:265
-#: actions/register.php:235
+#: actions/newgroup.php:164 actions/profilesettings.php:266
+#: actions/register.php:220
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
 msgstr "A localidade é longa de máis (o máximo son 255 caracteres)."
@@ -699,15 +699,16 @@ msgstr "Pseudónimo incorrecto: \"%s\"."
 #. TRANS: %s is the alias that is already in use.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error. %s is the already used alias.
-#: actions/apigroupcreate.php:264 actions/editgroup.php:246
-#: actions/newgroup.php:193
+#: actions/apigroupcreate.php:264 actions/apigroupprofileupdate.php:351
+#: actions/editgroup.php:246 actions/newgroup.php:193
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "O pseudónimo \"%s\" xa se está a usar. Proba con outro."
 
 #. TRANS: Client error displayed when trying to use an alias during group creation that is the same as the group's nickname.
 #. TRANS: Group edit form validation error.
-#: actions/apigroupcreate.php:278 actions/editgroup.php:253
+#: actions/apigroupcreate.php:278 actions/apigroupprofileupdate.php:359
+#: actions/editgroup.php:253
 msgid "Alias can't be the same as nickname."
 msgstr "O pseudónimo non pode coincidir co alcume."
 
@@ -719,7 +720,8 @@ msgstr "O pseudónimo non pode coincidir co alcume."
 #. TRANS: Client error displayed requesting most recent notices to a group for a non-existing group.
 #: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
 #: actions/apigroupleave.php:104 actions/apigroupmembership.php:71
-#: actions/apigroupshow.php:81 actions/apitimelinegroup.php:89
+#: actions/apigroupprofileupdate.php:113 actions/apigroupshow.php:81
+#: actions/apitimelinegroup.php:89
 msgid "Group not found."
 msgstr "Non se atopou o grupo."
 
@@ -737,13 +739,11 @@ msgstr "Xa forma parte dese grupo."
 msgid "You have been blocked from that group by the admin."
 msgstr "O administrador bloqueouno nese grupo."
 
-#. TRANS: Server error displayed when joining a group fails.
-#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
 #. 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.
 #. TRANS: Message given having failed to add a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:362
+#: actions/apigroupjoin.php:136 actions/joingroup.php:139 lib/command.php:362
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "O usuario %1$s non se puido engadir ao grupo %2$s."
@@ -753,8 +753,6 @@ msgstr "O usuario %1$s non se puido engadir ao grupo %2$s."
 msgid "You are not a member of this group."
 msgstr "Vostede non pertence a este grupo."
 
-#. TRANS: Server error displayed when leaving a group fails.
-#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
 #. TRANS: Server error displayed when leaving a group failed in the database.
 #. TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
 #. TRANS: Message given having failed to remove a user from a group.
@@ -790,6 +788,63 @@ msgstr "grupos %s"
 msgid "groups on %s"
 msgstr "grupos en %s"
 
+#. TRANS: Client error displayed trying to edit a group while not being a group admin.
+#. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
+#. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
+#: actions/apigroupprofileupdate.php:118 actions/editgroup.php:110
+#: actions/editgroup.php:176 actions/groupdesignsettings.php:109
+#: actions/grouplogo.php:111
+msgid "You must be an admin to edit the group."
+msgstr "Ten que ser administrador para editar o grupo."
+
+#. TRANS: Server error displayed when editing a group fails.
+#: actions/apigroupprofileupdate.php:171 actions/editgroup.php:274
+msgid "Could not update group."
+msgstr "Non se puido actualizar o grupo."
+
+#. TRANS: Server error displayed when group aliases could not be added.
+#. TRANS: Server exception thrown when creating group aliases failed.
+#: actions/apigroupprofileupdate.php:194 actions/editgroup.php:281
+#: classes/User_group.php:540
+msgid "Could not create aliases."
+msgstr "Non se puideron crear os pseudónimos."
+
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: actions/apigroupprofileupdate.php:249 lib/nickname.php:165
+msgid "Nickname must have only lowercase letters and numbers and no spaces."
+msgstr ""
+"O alcume debe ter só letras en minúscula e números, e non pode ter espazos "
+"en branco."
+
+#: actions/apigroupprofileupdate.php:286
+#, fuzzy
+msgid "Full name is too long (max 255 chars)."
+msgstr "O nome completo é longo de máis (o máximo son 255 caracteres)."
+
+#: actions/apigroupprofileupdate.php:296
+#, fuzzy, php-format
+msgid "description is too long (max %d chars)."
+msgstr "A descrición é longa de máis (o máximo son %d caracteres)."
+
+#: actions/apigroupprofileupdate.php:307
+#, fuzzy
+msgid "Location is too long (max 255 chars)."
+msgstr "A localidade é longa de máis (o máximo son 255 caracteres)."
+
+#: actions/apigroupprofileupdate.php:326
+#, fuzzy, php-format
+msgid "Too many aliases! Maximum %d."
+msgstr "Demasiados pseudónimos! O número máximo é %d."
+
+#. TRANS: Group edit form validation error.
+#. TRANS: Group create form validation error.
+#. TRANS: %s is the invalid alias.
+#: actions/apigroupprofileupdate.php:342 actions/editgroup.php:241
+#: actions/newgroup.php:188
+#, php-format
+msgid "Invalid alias: \"%s\""
+msgstr "Pseudónimo inválido: \"%s\""
+
 #. TRANS: Client error displayed when uploading a media file has failed.
 #: actions/apimediaupload.php:101
 msgid "Upload failed."
@@ -822,21 +877,22 @@ msgstr "Non está autorizado."
 #. TRANS: Form validation error message.
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
+#. TRANS: Client error displayed when the session token is not okay.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
 #: actions/deletenotice.php:177 actions/disfavor.php:75
-#: actions/emailsettings.php:291 actions/favor.php:75 actions/geocode.php:55
+#: actions/emailsettings.php:292 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:65 actions/grouplogo.php:321
-#: actions/groupunblock.php:65 actions/imsettings.php:224
-#: actions/invite.php:60 actions/login.php:137 actions/makeadmin.php:66
-#: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
-#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
-#: actions/othersettings.php:155 actions/passwordsettings.php:138
-#: actions/profilesettings.php:217 actions/recoverpassword.php:383
-#: actions/register.php:172 actions/remotesubscribe.php:76
-#: actions/repeat.php:82 actions/smssettings.php:250 actions/subedit.php:40
-#: actions/subscribe.php:86 actions/tagother.php:166
-#: actions/unsubscribe.php:69 actions/userauthorization.php:52
-#: lib/designsettings.php:310
+#: actions/groupunblock.php:65 actions/imsettings.php:241
+#: actions/invite.php:60 actions/makeadmin.php:66 actions/newmessage.php:135
+#: actions/newnotice.php:105 actions/nudge.php:80
+#: actions/oauthappssettings.php:162 actions/oauthconnectionssettings.php:135
+#: actions/passwordsettings.php:137 actions/pluginenable.php:87
+#: actions/profilesettings.php:218 actions/recoverpassword.php:383
+#: actions/register.php:157 actions/remotesubscribe.php:76
+#: actions/repeat.php:82 actions/smssettings.php:249 actions/subedit.php:40
+#: actions/subscribe.php:87 actions/tagother.php:145
+#: actions/unsubscribe.php:69 actions/urlsettings.php:171
+#: actions/userauthorization.php:53 lib/designsettings.php:122
 msgid "There was a problem with your session token. Try again, please."
 msgstr "Houbo un erro co seu pase. Inténteo de novo."
 
@@ -867,10 +923,10 @@ msgstr ""
 #. TRANS: Unknown form validation error in design settings form.
 #: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
 #: actions/designadminpanel.php:100 actions/editapplication.php:144
-#: actions/emailsettings.php:310 actions/grouplogo.php:332
-#: actions/imsettings.php:239 actions/newapplication.php:124
-#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
-#: actions/smssettings.php:271 lib/designsettings.php:321
+#: actions/emailsettings.php:311 actions/grouplogo.php:332
+#: actions/imsettings.php:256 actions/newapplication.php:124
+#: actions/oauthconnectionssettings.php:144 actions/recoverpassword.php:46
+#: actions/smssettings.php:270 lib/designsettings.php:133
 msgid "Unexpected form submission."
 msgstr "Envío de formulario inesperado."
 
@@ -919,31 +975,26 @@ msgstr "Conta"
 
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Field label in form for profile settings.
-#. TRANS: Label for group nickname (dt). Text hidden by default.
-#. TRANS: DT for nick name in a profile.
-#: actions/apioauthauthorize.php:459 actions/login.php:252
-#: actions/profilesettings.php:106 actions/register.php:432
-#: actions/showgroup.php:243 actions/tagother.php:94
+#: actions/apioauthauthorize.php:459 actions/login.php:225
+#: actions/profilesettings.php:107 actions/register.php:411
 #: actions/userauthorization.php:145 lib/groupeditform.php:145
-#: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "Alcume"
 
 #. TRANS: Field label on OAuth API authorisation form.
-#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:463 actions/login.php:255
-#: actions/register.php:436 lib/accountsettingsaction.php:120
+#: actions/apioauthauthorize.php:463 actions/login.php:228
+#: actions/register.php:415 lib/settingsnav.php:87
 msgid "Password"
 msgstr "Contrasinal"
 
 #. TRANS: Button text that when clicked will cancel the process of allowing access to an account
 #. TRANS: by an external application.
 #. TRANS: Button label to cancel an e-mail address confirmation procedure.
-#. TRANS: Button label to cancel an Instant Messaging address confirmation procedure.
+#. TRANS: Button label to cancel an IM address confirmation procedure.
 #. TRANS: Button label to cancel a SMS address confirmation procedure.
 #. TRANS: Button label in the "Edit application" form.
-#: actions/apioauthauthorize.php:478 actions/emailsettings.php:124
-#: actions/imsettings.php:127 actions/smssettings.php:133
+#: actions/apioauthauthorize.php:478 actions/emailsettings.php:125
+#: actions/imsettings.php:136 actions/smssettings.php:132
 #: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Cancel"
@@ -1053,7 +1104,7 @@ msgstr "Non se atopou o método da API."
 #. TRANS: %s is the requested output format.
 #: actions/apistatusesshow.php:144
 #, fuzzy, php-format
-msgid "Unsupported format: %s"
+msgid "Unsupported format: %s."
 msgstr "Formato non soportado."
 
 #. TRANS: Client error displayed requesting a deleted status.
@@ -1139,13 +1190,6 @@ msgstr "%1$s / Favoritos de %2$s"
 msgid "%1$s updates favorited by %2$s / %3$s."
 msgstr "%1$s actualizacións marcadas como favoritas por %2$s / %2$s."
 
-#. TRANS: Server error displayed when generating an Atom feed fails.
-#. TRANS: %s is the error.
-#: actions/apitimelinegroup.php:134
-#, fuzzy, php-format
-msgid "Could not generate feed for group - %s"
-msgstr "Non se puido actualizar o grupo."
-
 #. TRANS: Title for timeline of most recent mentions of a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname.
 #: actions/apitimelinementions.php:115
@@ -1162,13 +1206,14 @@ msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr "%1$s actualizacións que responden a actualizacións de %2$s / %3$s."
 
 #. TRANS: Title for site timeline. %s is the StatusNet sitename.
+#. TRANS: Public RSS feed title. %s is the StatusNet site name.
 #: actions/apitimelinepublic.php:193 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "Liña do tempo pública de %s"
 
 #. TRANS: Subtitle for site timeline. %s is the StatusNet sitename.
-#: actions/apitimelinepublic.php:199 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:199
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "%s actualizacións de todos!"
@@ -1180,21 +1225,33 @@ msgid "Unimplemented."
 msgstr "Aínda non se implantou o método."
 
 #. TRANS: Title for Atom feed "repeated to me". %s is the user nickname.
-#: actions/apitimelineretweetedtome.php:108
+#: actions/apitimelineretweetedtome.php:96
 #, php-format
 msgid "Repeated to %s"
 msgstr "Repetiu a %s"
 
+#: actions/apitimelineretweetedtome.php:98
+#, fuzzy, php-format
+msgid "%1$s notices that were to repeated to %2$s / %3$s."
+msgstr "%1$s actualizacións que responden a actualizacións de %2$s / %3$s."
+
 #. TRANS: Title of list of repeated notices of the logged in user.
 #. TRANS: %s is the nickname of the logged in user.
-#: actions/apitimelineretweetsofme.php:112
+#: actions/apitimelineretweetsofme.php:98
 #, php-format
 msgid "Repeats of %s"
 msgstr "Repeticións de %s"
 
+#: actions/apitimelineretweetsofme.php:104
+#, fuzzy, php-format
+msgid "%1$s notices that %2$s / %3$s has repeated."
+msgstr "%1$s marcou a nota %2$s como favorita"
+
 #. TRANS: Title for timeline with lastest notices with a given tag.
 #. TRANS: %s is the tag.
-#: actions/apitimelinetag.php:101 actions/tag.php:67
+#. TRANS: Title for first page of notices with tags.
+#. TRANS: %s is the tag.
+#: actions/apitimelinetag.php:101 actions/tag.php:69
 #, php-format
 msgid "Notices tagged with %s"
 msgstr "Notas etiquetadas con %s"
@@ -1207,54 +1264,55 @@ msgid "Updates tagged with %1$s on %2$s!"
 msgstr "Actualizacións etiquetadas con %1$s en %2$s!"
 
 #. TRANS: Client error displayed trying to add a notice to another user's timeline.
-#: actions/apitimelineuser.php:297
+#: actions/apitimelineuser.php:308
 #, fuzzy
 msgid "Only the user can add to their own timeline."
 msgstr "Só o usuario pode ler as súas caixas de entrada."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:304
+#: actions/apitimelineuser.php:315
 msgid "Only accept AtomPub for Atom feeds."
 msgstr ""
 
 #. TRANS: Client error displayed attempting to post an empty API notice.
-#: actions/apitimelineuser.php:311
+#: actions/apitimelineuser.php:322
 msgid "Atom post must not be empty."
 msgstr ""
 
 #. TRANS: Client error displayed attempting to post an API that is not well-formed XML.
-#: actions/apitimelineuser.php:317
+#: actions/apitimelineuser.php:328
 msgid "Atom post must be well-formed XML."
 msgstr ""
 
 #. TRANS: Client error displayed when not using an Atom entry.
-#: actions/apitimelineuser.php:323 actions/atompubfavoritefeed.php:228
+#: actions/apitimelineuser.php:334 actions/atompubfavoritefeed.php:228
 #: actions/atompubmembershipfeed.php:230
 #: actions/atompubsubscriptionfeed.php:236
 msgid "Atom post must be an Atom entry."
 msgstr ""
 
 #. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
-#: actions/apitimelineuser.php:335
+#: actions/apitimelineuser.php:345
 msgid "Can only handle POST activities."
 msgstr ""
 
 #. TRANS: Client error displayed when using an unsupported activity object type.
 #. TRANS: %s is the unsupported activity object type.
-#: actions/apitimelineuser.php:346
+#: actions/apitimelineuser.php:356
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
 #. TRANS: %d is the notice ID (number).
-#: actions/apitimelineuser.php:380
+#: actions/apitimelineuser.php:390
 #, fuzzy, php-format
 msgid "No content for notice %d."
 msgstr "Buscar nos contidos das notas"
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:408
+#. TRANS: %s is the notice URI.
+#: actions/apitimelineuser.php:419
 #, fuzzy, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "Non hai ningunha nota con esa id."
@@ -1272,9 +1330,10 @@ msgstr "Non se atopou o método da API."
 
 #. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
 #. TRANS: Client exception.
+#. TRANS: Client error displayed trying to subscribe to a non-existing profile.
 #: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
 #: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
-#: actions/subscribe.php:107
+#: actions/subscribe.php:110
 msgid "No such profile."
 msgstr "Non existe ese perfil."
 
@@ -1421,7 +1480,7 @@ msgid "Not a member."
 msgstr "Todos os membros"
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
-#: actions/atompubshowmembership.php:151
+#: actions/atompubshowmembership.php:150
 #, fuzzy
 msgid "Cannot delete someone else's membership."
 msgstr "Non se puido borrar a subscrición a si mesmo."
@@ -1510,10 +1569,7 @@ msgid "Invalid size."
 msgstr "Tamaño non válido."
 
 #. TRANS: Title for avatar upload page.
-#. TRANS: Label for group avatar (dt). Text hidden by default.
-#. TRANS: Link description in user account settings menu.
-#: actions/avatarsettings.php:66 actions/showgroup.php:227
-#: lib/accountsettingsaction.php:113
+#: actions/avatarsettings.php:66 lib/settingsnav.php:82
 msgid "Avatar"
 msgstr "Avatar"
 
@@ -1528,9 +1584,11 @@ msgstr ""
 
 #. TRANS: Server error displayed in avatar upload page when no matching profile can be found for a user.
 #. TRANS: Server error displayed coming across a request from a user without a profile.
+#. TRANS: Server error displayed when trying to authorise a remote subscription request
+#. TRANS: while the user has no profile.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
 #: actions/grouplogo.php:184 actions/remotesubscribe.php:190
-#: actions/userauthorization.php:72 actions/userrss.php:108
+#: actions/userauthorization.php:75 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr "O usuario non ten perfil."
 
@@ -1585,10 +1643,10 @@ msgstr "Recortar"
 msgid "No file uploaded."
 msgstr "Non se subiu ficheiro ningún."
 
-#. TRANS: Avatar upload form unstruction after uploading a file.
+#. TRANS: Avatar upload form instruction after uploading a file.
 #: actions/avatarsettings.php:345
 #, fuzzy
-msgid "Pick a square area of the image to be your avatar"
+msgid "Pick a square area of the image to be your avatar."
 msgstr "Escolla unha zona cadrada da imaxe para usala como avatar"
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
@@ -1614,7 +1672,7 @@ msgstr "Borrouse o avatar."
 
 #. TRANS: Title for backup account page.
 #. TRANS: Option in profile settings to create a backup of the account of the currently logged in user.
-#: actions/backupaccount.php:61 actions/profilesettings.php:467
+#: actions/backupaccount.php:61 actions/profilesettings.php:468
 msgid "Backup account"
 msgstr ""
 
@@ -1648,7 +1706,7 @@ msgstr "Fondo"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
 #: actions/backupaccount.php:254
-msgid "Backup your account"
+msgid "Backup your account."
 msgstr ""
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
@@ -1690,7 +1748,7 @@ msgstr "Non"
 #. TRANS: Submit button title for 'No' when blocking a user.
 #: actions/block.php:158
 #, fuzzy
-msgid "Do not block this user"
+msgid "Do not block this user."
 msgstr "Non bloquear este usuario"
 
 #. TRANS: Button label on the user block form.
@@ -1707,9 +1765,9 @@ msgid "Yes"
 msgstr "Si"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#. TRANS: Description of the form to block a user.
-#: actions/block.php:165 lib/blockform.php:79
-msgid "Block this user"
+#: actions/block.php:165
+#, fuzzy
+msgid "Block this user."
 msgstr "Bloquear este usuario"
 
 #. TRANS: Server error displayed when blocking a user fails.
@@ -1775,32 +1833,48 @@ msgstr "Non se atopou o código de confirmación."
 msgid "That confirmation code is not for you!"
 msgstr "Ese código de confirmación non é para vostede!"
 
-#. TRANS: Server error for a unknow address type %s, which can be 'email', 'jabber', or 'sms'.
-#: actions/confirmaddress.php:92
-#, php-format
-msgid "Unrecognized address type %s."
+#. TRANS: Server error for an unknown address type, which can be 'email', 'sms', or the name of an IM network (such as 'xmpp' or 'aim')
+#: actions/confirmaddress.php:94
+#, fuzzy, php-format
+msgid "Unrecognized address type %s"
 msgstr "Non se recoñeceu o tipo de enderezo %s."
 
 #. TRANS: Client error for an already confirmed email/jabber/sms address.
-#: actions/confirmaddress.php:97
+#: actions/confirmaddress.php:103 actions/confirmaddress.php:136
 msgid "That address has already been confirmed."
 msgstr "Ese enderezo xa se confirmou."
 
+#: actions/confirmaddress.php:121 actions/imsettings.php:444
+#: actions/userdesignsettings.php:306
+#, fuzzy
+msgid "Couldn't update user."
+msgstr "Non se puido actualizar o usuario."
+
+#: actions/confirmaddress.php:144
+#, fuzzy
+msgid "Couldn't update user im preferences."
+msgstr "Non se puido actualizar o rexistro do usuario."
+
+#: actions/confirmaddress.php:156
+#, fuzzy
+msgid "Couldn't insert user im preferences."
+msgstr "Non se puido inserir unha subscrición nova."
+
 #. TRANS: Server error displayed when an address confirmation code deletion from the
 #. TRANS: database fails in the contact address confirmation action.
-#: actions/confirmaddress.php:132
+#: actions/confirmaddress.php:169
 #, fuzzy
 msgid "Could not delete address confirmation."
 msgstr "Non se puido borrar a confirmación por mensaxería instantánea."
 
 #. TRANS: Title for the contact address confirmation action.
-#: actions/confirmaddress.php:150
+#: actions/confirmaddress.php:185
 msgid "Confirm address"
 msgstr "Confirmar o enderezo"
 
 #. TRANS: Success message for the contact address confirmation action.
 #. TRANS: %s can be 'email', 'jabber', or 'sms'.
-#: actions/confirmaddress.php:166
+#: actions/confirmaddress.php:200
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "Confirmouse o enderezo \"%s\" para a súa conta."
@@ -1814,6 +1888,7 @@ msgstr "Conversa"
 #. TRANS: Label for user statistics.
 #: actions/conversation.php:149 lib/noticelist.php:87
 #: lib/profileaction.php:246 lib/searchgroupnav.php:82
+#: lib/threadednoticelist.php:66
 msgid "Notices"
 msgstr "Notas"
 
@@ -1849,7 +1924,7 @@ msgstr "Borrouse o avatar."
 
 #. TRANS: Page title for page on which a user account can be deleted.
 #. TRANS: Option in profile settings to delete the account of the currently logged in user.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:475
+#: actions/deleteaccount.php:228 actions/profilesettings.php:476
 #, fuzzy
 msgid "Delete account"
 msgstr "Crear unha conta"
@@ -1873,7 +1948,7 @@ msgstr ""
 #. TRANS: Field label for delete account confirmation entry.
 #. TRANS: Field label for password reset form where the password has to be typed again.
 #: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:262 actions/register.php:440
+#: actions/recoverpassword.php:262 actions/register.php:419
 msgid "Confirm"
 msgstr "Confirmar"
 
@@ -1903,14 +1978,14 @@ msgstr "Non se atopou a aplicación."
 #. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
 #: actions/deleteapplication.php:79 actions/editapplication.php:78
-#: actions/showapplication.php:94
+#: actions/showapplication.php:90
 msgid "You are not the owner of this application."
 msgstr "Non é o dono desa aplicación."
 
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
-#: actions/newapplication.php:112 actions/showapplication.php:118
-#: lib/action.php:1425
+#: actions/newapplication.php:112 actions/showapplication.php:113
+#: lib/action.php:1391
 msgid "There was a problem with your session token."
 msgstr "Houbo un problema co seu pase."
 
@@ -1934,13 +2009,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting an application.
 #: actions/deleteapplication.php:161
 #, fuzzy
-msgid "Do not delete this application"
+msgid "Do not delete this application."
 msgstr "Non borrar a aplicación"
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
 #: actions/deleteapplication.php:167
 #, fuzzy
-msgid "Delete this application"
+msgid "Delete this application."
 msgstr "Borrar a aplicación"
 
 #. TRANS: Client error when trying to delete group while not logged in.
@@ -1997,13 +2072,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting a group.
 #: actions/deletegroup.php:224
 #, fuzzy
-msgid "Do not delete this group"
+msgid "Do not delete this group."
 msgstr "Non borrar esta nota"
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
 #: actions/deletegroup.php:231
 #, fuzzy
-msgid "Delete this group"
+msgid "Delete this group."
 msgstr "Borrar o usuario"
 
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
@@ -2011,14 +2086,16 @@ msgstr "Borrar o usuario"
 #. TRANS: Client error displayed when trying to mark a notice as favorite without being logged in.
 #. TRANS: Client error displayed trying to block a user from a group while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
+#. TRANS: Client error displayed trying to log out when not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
+#. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
 #. TRANS: Client error displayed when trying to change user options while not logged in.
 #: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
-#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:69
+#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:70
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
-#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
-#: actions/tagother.php:33 actions/unsubscribe.php:52
+#: actions/nudge.php:63 actions/pluginenable.php:97 actions/subedit.php:33
+#: actions/subscribe.php:98 actions/tagother.php:33 actions/unsubscribe.php:52
 #: lib/adminpanelaction.php:71 lib/profileformaction.php:63
 #: lib/settingsaction.php:72
 msgid "Not logged in."
@@ -2047,12 +2124,13 @@ msgstr "Está seguro de querer borrar esta nota?"
 #. TRANS: Submit button title for 'No' when deleting a notice.
 #: actions/deletenotice.php:159
 #, fuzzy
-msgid "Do not delete this notice"
+msgid "Do not delete this notice."
 msgstr "Non borrar esta nota"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:166 lib/noticelist.php:673
-msgid "Delete this notice"
+#: actions/deletenotice.php:166
+#, fuzzy
+msgid "Delete this notice."
 msgstr "Borrar esta nota"
 
 #. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
@@ -2089,18 +2167,17 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting a user.
 #: actions/deleteuser.php:158
 #, fuzzy
-msgid "Do not delete this user"
+msgid "Do not delete this user."
 msgstr "Non borrar esta nota"
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
-#. TRANS: Description of form for deleting a user.
-#: actions/deleteuser.php:165 lib/deleteuserform.php:75
-msgid "Delete this user"
+#: actions/deleteuser.php:165
+#, fuzzy
+msgid "Delete this user."
 msgstr "Borrar o usuario"
 
 #. TRANS: Message used as title for design settings for the site.
-#. TRANS: Link description in user account settings menu.
-#: actions/designadminpanel.php:60 lib/accountsettingsaction.php:134
+#: actions/designadminpanel.php:60 lib/settingsnav.php:97
 msgid "Design"
 msgstr "Deseño"
 
@@ -2170,8 +2247,7 @@ msgstr ""
 "Pode cargar como arquivo .ZIP un tema visual personalizado para StatusNet"
 
 #. TRANS: Fieldset legend for theme background image.
-#. TRANS: Fieldset legend on profile design page.
-#: actions/designadminpanel.php:515 lib/designsettings.php:98
+#: actions/designadminpanel.php:515
 msgid "Change background image"
 msgstr "Cambiar a imaxe de fondo"
 
@@ -2179,7 +2255,7 @@ msgstr "Cambiar a imaxe de fondo"
 #. TRANS: Field label for background color selector.
 #. TRANS: Label on profile design page for setting a profile page background colour.
 #: actions/designadminpanel.php:525 actions/designadminpanel.php:609
-#: lib/designsettings.php:183
+#: lib/designform.php:238
 msgid "Background"
 msgstr "Fondo"
 
@@ -2206,13 +2282,13 @@ msgstr "Desactivado"
 #. TRANS: Form guide for turning background image on or off on theme designer page.
 #. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
 #. TRANS: use of the uploaded profile image.
-#: actions/designadminpanel.php:577 lib/designsettings.php:159
+#: actions/designadminpanel.php:577 lib/designform.php:214
 msgid "Turn background image on or off."
 msgstr "Activar ou desactivar a imaxe de fondo."
 
 #. TRANS: Checkbox label to title background image on theme designer page.
 #. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-#: actions/designadminpanel.php:583 lib/designsettings.php:165
+#: actions/designadminpanel.php:583 lib/designform.php:220
 msgid "Tile background image"
 msgstr "Imaxe de fondo en mosaico"
 
@@ -2224,25 +2300,25 @@ msgstr "Cambiar as cores"
 
 #. TRANS: Field label for content color selector.
 #. TRANS: Label on profile design page for setting a profile page content colour.
-#: actions/designadminpanel.php:623 lib/designsettings.php:197
+#: actions/designadminpanel.php:623 lib/designform.php:252
 msgid "Content"
 msgstr "Contido"
 
 #. TRANS: Field label for sidebar color selector.
 #. TRANS: Label on profile design page for setting a profile page sidebar colour.
-#: actions/designadminpanel.php:637 lib/designsettings.php:211
+#: actions/designadminpanel.php:637 lib/designform.php:266
 msgid "Sidebar"
 msgstr "Barra lateral"
 
 #. TRANS: Field label for text color selector.
 #. TRANS: Label on profile design page for setting a profile page text colour.
-#: actions/designadminpanel.php:651 lib/designsettings.php:225
+#: actions/designadminpanel.php:651 lib/designform.php:280
 msgid "Text"
 msgstr "Texto"
 
 #. TRANS: Field label for link color selector.
 #. TRANS: Label on profile design page for setting a profile page links colour.
-#: actions/designadminpanel.php:665 lib/designsettings.php:239
+#: actions/designadminpanel.php:665 lib/designform.php:294
 msgid "Links"
 msgstr "Ligazóns"
 
@@ -2264,21 +2340,21 @@ msgid "Use defaults"
 msgstr "Utilizar os valores por defecto"
 
 #. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: actions/designadminpanel.php:720 lib/designsettings.php:259
-msgid "Restore default designs"
+#: actions/designadminpanel.php:720
+#, fuzzy
+msgid "Restore default designs."
 msgstr "Restaurar o deseño por defecto"
 
 #. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: actions/designadminpanel.php:728 lib/designsettings.php:267
-msgid "Reset back to default"
+#: actions/designadminpanel.php:728
+#, fuzzy
+msgid "Reset back to default."
 msgstr "Volver ao deseño por defecto"
 
 #. TRANS: Title for button for saving theme settings.
-#. TRANS: Title for button on profile design page to save settings.
-#: actions/designadminpanel.php:736 lib/designsettings.php:272
-msgid "Save design"
+#: actions/designadminpanel.php:736
+#, fuzzy
+msgid "Save design."
 msgstr "Gardar o deseño"
 
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
@@ -2310,7 +2386,7 @@ msgid "You must be logged in to edit an application."
 msgstr "Ten que iniciar sesión para editar unha aplicación."
 
 #. TRANS: Client error displayed trying to edit an application that does not exist.
-#: actions/editapplication.php:83 actions/showapplication.php:87
+#: actions/editapplication.php:83 actions/showapplication.php:83
 msgid "No such application."
 msgstr "Non existe esa aplicación."
 
@@ -2403,80 +2479,53 @@ msgstr "Editar o grupo %s"
 msgid "You must be logged in to create a group."
 msgstr "Ten que iniciar sesión para crear un grupo."
 
-#. TRANS: Client error displayed trying to edit a group while not being a group admin.
-#. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
-#. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
-#: actions/editgroup.php:110 actions/editgroup.php:176
-#: actions/groupdesignsettings.php:109 actions/grouplogo.php:111
-msgid "You must be an admin to edit the group."
-msgstr "Ten que ser administrador para editar o grupo."
-
 #. TRANS: Form instructions for group edit form.
 #: actions/editgroup.php:161
 msgid "Use this form to edit the group."
 msgstr "Utilice este formulario para editar o grupo."
 
-#. TRANS: Group edit form validation error.
-#. TRANS: Group create form validation error.
-#. TRANS: %s is the invalid alias.
-#: actions/editgroup.php:241 actions/newgroup.php:188
-#, php-format
-msgid "Invalid alias: \"%s\""
-msgstr "Pseudónimo inválido: \"%s\""
-
-#. TRANS: Server error displayed when editing a group fails.
-#: actions/editgroup.php:274
-msgid "Could not update group."
-msgstr "Non se puido actualizar o grupo."
-
-#. TRANS: Server error displayed when group aliases could not be added.
-#. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/editgroup.php:281 classes/User_group.php:540
-msgid "Could not create aliases."
-msgstr "Non se puideron crear os pseudónimos."
-
 #. TRANS: Group edit form success message.
 #: actions/editgroup.php:301
 msgid "Options saved."
 msgstr "Gardáronse as preferencias."
 
 #. TRANS: Title for e-mail settings.
-#: actions/emailsettings.php:59
+#: actions/emailsettings.php:60
 msgid "Email settings"
 msgstr "Configuración do correo electrónico"
 
 #. TRANS: E-mail settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/emailsettings.php:73
+#: actions/emailsettings.php:74
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 msgstr "Xestiona a forma en que recibes correo electrónico de %%site.name%%."
 
 #. TRANS: Form legend for e-mail settings form.
 #. TRANS: Field label for e-mail address input in e-mail settings form.
-#: actions/emailsettings.php:103 actions/emailsettings.php:129
+#: actions/emailsettings.php:104 actions/emailsettings.php:130
 msgid "Email address"
 msgstr "Enderezo de correo electrónico"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:109
+#: actions/emailsettings.php:110
 msgid "Current confirmed email address."
 msgstr "Enderezo de correo electrónico confirmado actualmente."
 
 #. TRANS: Button label to remove a confirmed e-mail address.
 #. TRANS: Button label for removing a set sender e-mail address to post notices from.
-#. TRANS: Button label to remove a confirmed Instant Messaging address.
+#. TRANS: Button label to remove a confirmed IM address.
 #. TRANS: Button label to remove a confirmed SMS address.
 #. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
-#: actions/emailsettings.php:112 actions/emailsettings.php:179
-#: actions/imsettings.php:112 actions/smssettings.php:120
-#: actions/smssettings.php:176
+#: actions/emailsettings.php:113 actions/emailsettings.php:180
+#: actions/imsettings.php:119 actions/smssettings.php:119
+#: actions/smssettings.php:175
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Borrar"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:119
+#: actions/emailsettings.php:120
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -2489,47 +2538,47 @@ msgstr ""
 #. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
 #. TRANS: Any other domain may be owned by a legitimate person or
 #. TRANS: organization.
-#: actions/emailsettings.php:136
+#: actions/emailsettings.php:137
 msgid "Email address, like \"UserName@example.org\""
 msgstr "Enderezo de correo electrónico, coma \"nomedeusuario@example.org\""
 
 #. TRANS: Button label for adding an e-mail address in e-mail settings form.
-#. TRANS: Button label for adding an Instant Messaging address in Instant Messaging settings form.
+#. TRANS: Button label for adding an IM address in IM settings form.
 #. TRANS: Button label for adding a SMS phone number in SMS settings form.
-#: actions/emailsettings.php:140 actions/imsettings.php:147
-#: actions/smssettings.php:158
+#: actions/emailsettings.php:141 actions/imsettings.php:147
+#: actions/smssettings.php:157
 msgctxt "BUTTON"
 msgid "Add"
 msgstr "Engadir"
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:148 actions/smssettings.php:167
+#: actions/emailsettings.php:149 actions/smssettings.php:166
 msgid "Incoming email"
 msgstr "Correo entrante"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:154
+#: actions/emailsettings.php:155
 msgid "I want to post notices by email."
 msgstr "Quero publicar notas por correo electrónico."
 
 #. TRANS: Form instructions for incoming e-mail form in e-mail settings.
 #. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
-#: actions/emailsettings.php:176 actions/smssettings.php:174
+#: actions/emailsettings.php:177 actions/smssettings.php:173
 msgid "Send email to this address to post new notices."
 msgstr ""
 "Enviar un correo electrónico a este enderezo para publicar novas notas."
 
 #. TRANS: Instructions for incoming e-mail address input form, when an address has already been assigned.
 #. TRANS: Instructions for incoming SMS e-mail address input form.
-#: actions/emailsettings.php:185 actions/smssettings.php:182
+#: actions/emailsettings.php:186 actions/smssettings.php:181
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr ""
 "Establece un novo enderezo de correo electrónico no que publicar, e cancela "
 "o vello."
 
 #. TRANS: Instructions for incoming e-mail address input form.
-#: actions/emailsettings.php:189
+#: actions/emailsettings.php:190
 msgid ""
 "To send notices via email, we need to create a unique email address for you "
 "on this server:"
@@ -2537,93 +2586,93 @@ msgstr ""
 
 #. TRANS: Button label for adding an e-mail address to send notices from.
 #. TRANS: Button label for adding an SMS e-mail address to send notices from.
-#: actions/emailsettings.php:195 actions/smssettings.php:185
+#: actions/emailsettings.php:196 actions/smssettings.php:184
 msgctxt "BUTTON"
 msgid "New"
 msgstr "Novo"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:204
+#: actions/emailsettings.php:205
 msgid "Email preferences"
 msgstr "Preferencias de correo electrónico"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:212
+#: actions/emailsettings.php:213
 msgid "Send me notices of new subscriptions through email."
 msgstr "Enviarme notas acerca de novas subscricións por correo electrónico."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:218
+#: actions/emailsettings.php:219
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr ""
 "Enviádeme un correo electrónico cando alguén marque como favorito algunha "
 "das miñas notas."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:225
+#: actions/emailsettings.php:226
 msgid "Send me email when someone sends me a private message."
 msgstr ""
 "Enviádeme un correo electrónico cando alguén me envíe unha mensaxe privada."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:231
+#: actions/emailsettings.php:232
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr "Enviádeme un correo electrónico cando alguén me envíe unha resposta."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:237
+#: actions/emailsettings.php:238
 msgid "Allow friends to nudge me and send me an email."
 msgstr ""
 "Permitirlles aos meus amigos facerme acenos e enviarme correos electrónicos."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:243
+#: actions/emailsettings.php:244
 msgid "Publish a MicroID for my email address."
 msgstr "Publicar unha MicroID para o meu enderezo de correo electrónico."
 
 #. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:361
+#: actions/emailsettings.php:362
 msgid "Email preferences saved."
 msgstr "Gardáronse as preferencias de correo electrónico."
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:380
+#: actions/emailsettings.php:381
 msgid "No email address."
 msgstr "Non hai enderezo de correo electrónico."
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:388
+#: actions/emailsettings.php:389
 #, fuzzy
 msgid "Cannot normalize that email address."
 msgstr "Non se pode normalizar ese enderezo de correo electrónico"
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:393 actions/register.php:212
+#: actions/emailsettings.php:394 actions/register.php:197
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "O enderezo de correo electrónico é incorrecto."
 
 #. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:397
+#: actions/emailsettings.php:398
 msgid "That is already your email address."
 msgstr "Ese enderezo de correo electrónico é o que ten agora."
 
 #. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:401
+#: actions/emailsettings.php:402
 msgid "That email address already belongs to another user."
 msgstr "Ese enderezo de correo electrónico xa pertence a outro usuario."
 
 #. TRANS: Server error thrown on database error adding e-mail confirmation code.
 #. TRANS: Server error thrown on database error adding Instant Messaging confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:418 actions/imsettings.php:343
-#: actions/smssettings.php:365
+#: actions/emailsettings.php:419 actions/imsettings.php:362
+#: actions/smssettings.php:364
 #, fuzzy
 msgid "Could not insert confirmation code."
 msgstr "Non se puido inserir o código de confirmación."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:425
+#: actions/emailsettings.php:426
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
@@ -2635,59 +2684,62 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling Instant Messaging address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:445 actions/imsettings.php:377
-#: actions/smssettings.php:399
+#: actions/emailsettings.php:446 actions/imsettings.php:391
+#: actions/smssettings.php:398
 msgid "No pending confirmation to cancel."
 msgstr "Non hai ningunha confirmación pendente que cancelar."
 
 #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:450
+#: actions/emailsettings.php:451
 msgid "That is the wrong email address."
 msgstr "Ese enderezo de correo electrónico é incorrecto."
 
 #. TRANS: Server error thrown on database error canceling e-mail address confirmation.
 #. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
-#: actions/emailsettings.php:459 actions/smssettings.php:413
+#: actions/emailsettings.php:460 actions/smssettings.php:412
 #, fuzzy
 msgid "Could not delete email confirmation."
 msgstr "Non se puido borrar a confirmación por correo electrónico."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:464
+#: actions/emailsettings.php:465
 msgid "Email confirmation cancelled."
 msgstr "Cancelouse a confirmación por correo electrónico."
 
 #. TRANS: Message given trying to remove an e-mail address that is not
 #. TRANS: registered for the active user.
-#: actions/emailsettings.php:483
+#: actions/emailsettings.php:484
 msgid "That is not your email address."
 msgstr "Ese non é o seu enderezo de correo electrónico."
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:504
+#: actions/emailsettings.php:505
 msgid "The email address was removed."
 msgstr "Borrouse o enderezo de correo electrónico."
 
 #. TRANS: Form validation error displayed when trying to remove an incoming e-mail address while no address has been set.
-#: actions/emailsettings.php:518 actions/smssettings.php:555
+#: actions/emailsettings.php:519 actions/smssettings.php:554
 msgid "No incoming email address."
 msgstr "Non hai ningún enderezo ao que enviar."
 
 #. TRANS: Server error thrown on database error removing incoming e-mail address.
 #. TRANS: Server error thrown on database error adding incoming e-mail address.
-#: actions/emailsettings.php:530 actions/emailsettings.php:554
-#: actions/smssettings.php:565 actions/smssettings.php:588
+#. TRANS: Server error displayed when the user could not be updated in SMS settings.
+#: actions/emailsettings.php:531 actions/emailsettings.php:555
+#: actions/smssettings.php:565 actions/smssettings.php:590
 #, fuzzy
 msgid "Could not update user record."
 msgstr "Non se puido actualizar o rexistro do usuario."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:534 actions/smssettings.php:568
+#. TRANS: Confirmation text after updating SMS settings.
+#: actions/emailsettings.php:535 actions/smssettings.php:569
 msgid "Incoming email address removed."
 msgstr "Borrouse o enderezo de correo electrónico entrante."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:558 actions/smssettings.php:591
+#. TRANS: Confirmation text after updating SMS settings.
+#: actions/emailsettings.php:559 actions/smssettings.php:594
 msgid "New incoming email address added."
 msgstr "Engadiuse un novo enderezo de correo electrónico entrante."
 
@@ -2699,7 +2751,7 @@ msgstr "A nota xa é unha das súas favoritas!"
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
 #: actions/favor.php:95
 #, fuzzy
-msgid "Disfavor favorite"
+msgid "Disfavor favorite."
 msgstr "Desmarcar como favorita"
 
 #. TRANS: Page title for first page of favorited notices.
@@ -2750,9 +2802,8 @@ msgstr ""
 #. TRANS: %s is a user's nickname.
 #. TRANS: Title for first page of favourite notices of a user.
 #. TRANS: %s is the user for whom the favourite notices are displayed.
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing own favourited notices.
 #: actions/favoritesrss.php:111 actions/showfavorites.php:76
-#: lib/personalgroupnav.php:122
+#: lib/personalgroupnav.php:110
 #, php-format
 msgid "%s's favorite notices"
 msgstr "Notas favoritas de %s"
@@ -2939,13 +2990,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
 #: actions/groupblock.php:191
 #, fuzzy
-msgid "Do not block this user from this group"
+msgid "Do not block this user from this group."
 msgstr "Non excluír deste grupo a este usuario"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
 #: actions/groupblock.php:198
 #, fuzzy
-msgid "Block this user from this group"
+msgid "Block this user from this group."
 msgstr "Excluír deste grupo a este usuario"
 
 #. TRANS: Server error displayed when trying to block a user from a group fails because of an application error.
@@ -2954,6 +3005,7 @@ msgid "Database error blocking user from group."
 msgstr "Houbo un erro na base de datos ao excluír do grupo ao usuario."
 
 #. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
+#. TRANS: Client error displayed trying to find a user by ID without providing an ID.
 #: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr "Sen ID."
@@ -2984,7 +3036,7 @@ msgid "Unable to update your design settings."
 msgstr "Non se puido gardar a súa configuración de deseño."
 
 #. TRANS: Form text to confirm saved group design settings.
-#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:222
+#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:239
 msgid "Design preferences saved."
 msgstr "Gardáronse as preferencias de deseño."
 
@@ -3049,7 +3101,7 @@ msgid "A list of the users in this group."
 msgstr "Unha lista dos usuarios pertencentes a este grupo."
 
 #. TRANS: Indicator in group members list that this user is a group administrator.
-#: actions/groupmembers.php:190
+#: actions/groupmembers.php:190 lib/action.php:581
 msgid "Admin"
 msgstr "Administrador"
 
@@ -3143,8 +3195,10 @@ msgid "Group search"
 msgstr "Busca de grupos"
 
 #. TRANS: Text on page where groups can be searched if no results were found for a query.
-#: actions/groupsearch.php:82 actions/noticesearch.php:117
-#: actions/peoplesearch.php:83
+#. TRANS: Text for notice search results is the query had no results.
+#. TRANS: Message on the "People search" page where a query has no results.
+#: actions/groupsearch.php:82 actions/noticesearch.php:122
+#: actions/peoplesearch.php:87
 msgid "No results."
 msgstr "Non houbo resultados."
 
@@ -3179,169 +3233,171 @@ msgid "User is not blocked from group."
 msgstr "O usuario non está excluído do grupo."
 
 #. TRANS: Server error displayed when unblocking a user from a group fails because of an unknown error.
+#. TRANS: Server error displayed when removing a user block.
 #: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "Houbo un erro ao facer efectiva a readmisión."
 
 #. TRANS: Title for Instant Messaging settings.
-#: actions/imsettings.php:58
+#: actions/imsettings.php:56
 msgid "IM settings"
 msgstr "Configuración da mensaxería instantánea"
 
 #. 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.
-#: actions/imsettings.php:71
+#: actions/imsettings.php:69
 #, fuzzy, php-format
 msgid ""
-"You can send and receive notices through Jabber/Google Talk [instant "
-"messages](%%doc.im%%). Configure your address and settings below."
+"You can send and receive notices through instant messaging [instant messages]"
+"(%%doc.im%%). Configure your addresses and settings below."
 msgstr ""
 "Pode enviar e recibir notas mediante [mensaxes instantáneas](%%doc.im%%) de "
 "Jabber/GTalk. Configure a continuación o seu enderezo e preferencias."
 
-#. TRANS: Message given in the Instant Messaging settings if XMPP is not enabled on the site.
+#. TRANS: Message given in the IM settings if IM is not enabled on the site.
 #: actions/imsettings.php:90
 msgid "IM is not available."
 msgstr "A mensaxería instantánea non está dispoñible."
 
-#. TRANS: Form legend for Instant Messaging settings form.
-#. TRANS: Field label for Instant Messaging address input in Instant Messaging settings form.
-#: actions/imsettings.php:102 actions/imsettings.php:132
-msgid "IM address"
-msgstr "Enderezo de mensaxería instantánea"
+#: actions/imsettings.php:116
+#, fuzzy, php-format
+msgid "Current confirmed %s address."
+msgstr "Enderezo de correo electrónico confirmado actualmente."
 
-#: actions/imsettings.php:109
-#, fuzzy
-msgid "Current confirmed Jabber/Google Talk address."
-msgstr "Enderezo de Jabber/GTalk confirmado actualmente."
-
-#. TRANS: Form note in Instant Messaging settings form.
-#. TRANS: %s is the Instant Messaging address set for the site.
-#: actions/imsettings.php:120
+#. TRANS: Form note in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:128
 #, fuzzy, php-format
 msgid ""
-"Awaiting confirmation on this address. Check your Jabber/Google Talk account "
-"for a message with further instructions. (Did you add %s to your buddy list?)"
+"Awaiting confirmation on this address. Check your %s account for a message "
+"with further instructions. (Did you add %s to your buddy list?)"
 msgstr ""
 "Agardando pola confirmación deste enderezo. Busque na cúa conta de Jabber/"
 "GTalk unha mensaxe con máis instrucións. (Engadiu a %s á súa lista de "
 "amigos?)"
 
-#. TRANS: IM address input field instructions in Instant Messaging settings form.
-#. TRANS: %s is the Instant Messaging address set for the site.
-#. TRANS: Do not translate "example.org". It is one of the domain names reserved for use in examples by
-#. TRANS: http://www.rfc-editor.org/rfc/rfc2606.txt. Any other domain may be owned by a legitimate
-#. TRANS: person or organization.
-#: actions/imsettings.php:139
-#, fuzzy, php-format
-msgid ""
-"Jabber or Google Talk address, like \"UserName@example.org\". First, make "
-"sure to add %s to your buddy list in your IM client or on Google Talk."
-msgstr ""
-"Enderezo de Jabber ou GTalk, coma \"nomedeusuario@example.org\". Asegúrese "
-"primeiro de engadir a %s á súa lista de amigos no seu cliente de mensaxería "
-"instantánea ou en GTalk."
+#: actions/imsettings.php:140
+msgid "IM address"
+msgstr "Enderezo de mensaxería instantánea"
 
-#. TRANS: Form legend for Instant Messaging preferences form.
-#: actions/imsettings.php:154
-msgid "IM preferences"
+#: actions/imsettings.php:142
+#, php-format
+msgid "%s screenname."
+msgstr ""
+
+#. TRANS: Header for IM preferences form.
+#: actions/imsettings.php:163
+#, fuzzy
+msgid "IM Preferences"
 msgstr "Preferencias de mensaxería instantánea"
 
-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:159
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:174
 #, fuzzy
-msgid "Send me notices through Jabber/Google Talk."
-msgstr "Enviádeme as notas mediante Jabber ou GTalk."
+msgid "Send me notices"
+msgstr "Enviar unha nota"
 
-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:165
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:176
 #, fuzzy
-msgid "Post a notice when my Jabber/Google Talk status changes."
+msgid "Post a notice when my status changes."
 msgstr "Publicar unha nota cando cambie o meu estado en Jabber ou GTalk."
 
-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:171
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:178
 #, fuzzy
-msgid ""
-"Send me replies through Jabber/Google Talk from people I'm not subscribed to."
+msgid "Send me replies from people I'm not subscribed to."
 msgstr ""
 "Enviádeme as respostas mediante Jabber ou GTalk da xente á que non estou "
 "subscrita."
 
-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:178
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:181
 #, fuzzy
-msgid "Publish a MicroID for my Jabber/Google Talk address."
-msgstr "Publicar unha MicroID para o meu enderezo de Jabber ou GTalk."
+msgid "Publish a MicroID"
+msgstr "Publicar unha MicroID para o meu enderezo de correo electrónico."
 
-#. TRANS: Confirmation message for successful Instant Messaging preferences save.
-#: actions/imsettings.php:283 actions/othersettings.php:192
+#. TRANS: Server error thrown on database error updating IM preferences.
+#: actions/imsettings.php:291
+#, fuzzy
+msgid "Couldn't update IM preferences."
+msgstr "Non se puido actualizar o usuario."
+
+#. TRANS: Confirmation message for successful IM preferences save.
+#. TRANS: Confirmation message after saving preferences.
+#: actions/imsettings.php:298 actions/urlsettings.php:244
 msgid "Preferences saved."
 msgstr "Gardáronse as preferencias."
 
-#. TRANS: Message given saving Instant Messaging address without having provided one.
-#: actions/imsettings.php:304
-msgid "No Jabber ID."
-msgstr "Non existe ningunha ID de Jabber."
-
-#. TRANS: Message given saving Instant Messaging address that cannot be normalised.
-#: actions/imsettings.php:312
+#. TRANS: Message given saving IM address without having provided one.
+#: actions/imsettings.php:320
 #, fuzzy
-msgid "Cannot normalize that Jabber ID."
+msgid "No screenname."
+msgstr "Sen alcume."
+
+#: actions/imsettings.php:325
+#, fuzzy
+msgid "No transport."
+msgstr "Non hai ningunha nota."
+
+#. TRANS: Message given saving IM address that cannot be normalised.
+#: actions/imsettings.php:333
+#, fuzzy
+msgid "Cannot normalize that screenname"
 msgstr "Non se pode normalizar esa ID de Jabber"
 
-#. TRANS: Message given saving Instant Messaging address that not valid.
-#: actions/imsettings.php:317
+#. TRANS: Message given saving IM address that not valid.
+#: actions/imsettings.php:340
 #, fuzzy
-msgid "Not a valid Jabber ID."
-msgstr "A ID de Jabber non é correcta"
+msgid "Not a valid screenname"
+msgstr "O formato do alcume non é correcto."
 
-#. TRANS: Message given saving Instant Messaging address that is already set.
-#: actions/imsettings.php:321
-msgid "That is already your Jabber ID."
-msgstr "Esa xa é a súa ID de Jabber."
-
-#. TRANS: Message given saving Instant Messaging address that is already set for another user.
-#: actions/imsettings.php:325
-msgid "Jabber ID already belongs to another user."
+#. TRANS: Message given saving IM address that is already set for another user.
+#: actions/imsettings.php:344
+#, fuzzy
+msgid "Screenname already belongs to another user."
 msgstr "Esa ID de Jabber xa corresponde a un usuario."
 
-#. TRANS: Message given saving valid Instant Messaging address that is to be confirmed.
-#. TRANS: %s is the Instant Messaging address set for the site.
-#: actions/imsettings.php:353
-#, php-format
-msgid ""
-"A confirmation code was sent to the IM address you added. You must approve %"
-"s for sending messages to you."
+#. TRANS: Message given saving valid IM address that is to be confirmed.
+#: actions/imsettings.php:369
+#, fuzzy
+msgid "A confirmation code was sent to the IM address you added."
 msgstr ""
 "Enviouse un código de confirmación ao enderezo de mensaxería instantánea que "
 "engadiu. Ten que aprobar que %s lle envíe mensaxes."
 
-#. TRANS: Message given canceling Instant Messaging address confirmation for the wrong IM address.
-#: actions/imsettings.php:382
+#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#: actions/imsettings.php:396
 msgid "That is the wrong IM address."
 msgstr "Ese enderezo de mensaxería instantánea é incorrecto."
 
-#. TRANS: Server error thrown on database error canceling Instant Messaging address confirmation.
-#: actions/imsettings.php:391
+#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#: actions/imsettings.php:405
 #, fuzzy
-msgid "Could not delete IM confirmation."
+msgid "Couldn't delete confirmation."
 msgstr "Non se puido borrar a confirmación por mensaxería instantánea."
 
-#. TRANS: Message given after successfully canceling Instant Messaging address confirmation.
-#: actions/imsettings.php:396
+#. TRANS: Message given after successfully canceling IM address confirmation.
+#: actions/imsettings.php:410
 msgid "IM confirmation cancelled."
 msgstr "Cancelouse a confirmación por mensaxería instantánea."
 
-#. TRANS: Message given trying to remove an Instant Messaging address that is not
+#. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.
-#: actions/imsettings.php:417
-msgid "That is not your Jabber ID."
-msgstr "Esa ID de Jabber non é súa."
+#: actions/imsettings.php:434
+#, fuzzy
+msgid "That is not your screenname."
+msgstr "Ese número de teléfono non é seu."
+
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#: actions/imsettings.php:443
+#, fuzzy
+msgid "Couldn't update user im prefs."
+msgstr "Non se puido actualizar o rexistro do usuario."
 
 #. TRANS: Message given after successfully removing a registered Instant Messaging address.
-#: actions/imsettings.php:440
+#: actions/imsettings.php:451
 msgid "The IM address was removed."
 msgstr "Borrouse o enderezo de mensaxería instantánea."
 
@@ -3557,7 +3613,7 @@ msgid "You must be logged in to join a group."
 msgstr "Ten que identificarse para unirse a un grupo."
 
 #. TRANS: Title for join group page after joining.
-#: actions/joingroup.php:147
+#: actions/joingroup.php:148
 #, fuzzy, php-format
 msgctxt "TITLE"
 msgid "%1$s joined group %2$s"
@@ -3687,7 +3743,7 @@ msgstr "URL dunha imaxe a mostrar coa licenza."
 #. TRANS: Submit button title.
 #: actions/licenseadminpanel.php:311 actions/sessionsadminpanel.php:199
 #: actions/siteadminpanel.php:292 actions/snapshotadminpanel.php:245
-#: actions/tagother.php:154 lib/applicationeditform.php:357
+#: actions/tagother.php:133 lib/applicationeditform.php:357
 msgid "Save"
 msgstr "Gardar"
 
@@ -3695,43 +3751,45 @@ msgstr "Gardar"
 msgid "Save license settings"
 msgstr "Gardar a configuración de licenza"
 
-#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
+#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
+#: actions/login.php:97 actions/otp.php:62 actions/register.php:130
 msgid "Already logged in."
 msgstr "Xa se identificou."
 
-#: actions/login.php:148
+#: actions/login.php:125
 msgid "Incorrect username or password."
 msgstr "Nome de usuario ou contrasinal incorrectos."
 
-#: actions/login.php:154 actions/otp.php:120
+#. TRANS: Server error displayed when a user object could not be created trying to login using "one time password login".
+#: actions/login.php:131 actions/otp.php:127
 msgid "Error setting user. You are probably not authorized."
 msgstr ""
 "Houbo un erro ao configurar o usuario. Probablemente non estea autorizado "
 "para facelo."
 
-#: actions/login.php:210 actions/login.php:263
+#: actions/login.php:185 actions/login.php:236 lib/action.php:598
 msgid "Login"
 msgstr "Identificarse"
 
-#: actions/login.php:249
+#: actions/login.php:222
 msgid "Login to site"
 msgstr "Identificarse no sitio"
 
-#: actions/login.php:258 actions/register.php:490
+#: actions/login.php:231 actions/register.php:469
 msgid "Remember me"
 msgstr "Lembrádeme"
 
-#: actions/login.php:259 actions/register.php:492
+#: actions/login.php:232 actions/register.php:471
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 "Identificarse automaticamente no futuro. Non se aconsella en computadoras "
 "compartidas!"
 
-#: actions/login.php:269
+#: actions/login.php:241
 msgid "Lost or forgotten password?"
 msgstr "Esqueceu ou perdeu o contrasinal?"
 
-#: actions/login.php:288
+#: actions/login.php:259
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -3739,11 +3797,11 @@ msgstr ""
 "Por razóns de seguridade, volva introducir o seu nome de usuario e "
 "contrasinal antes de cambiar a súa configuración."
 
-#: actions/login.php:292
+#: actions/login.php:263
 msgid "Login with your username and password."
 msgstr "Identifíquese co seu nome de usuario e contrasinal."
 
-#: actions/login.php:295
+#: actions/login.php:266
 #, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -3872,7 +3930,9 @@ msgstr "Nova nota"
 msgid "Notice posted"
 msgstr "Publicouse a nota"
 
-#: actions/noticesearch.php:68
+#. TRANS: Instructions for Notice search page.
+#. TRANS: %%site.name%% is the name of the StatusNet site.
+#: actions/noticesearch.php:69
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -3881,16 +3941,21 @@ msgstr ""
 "Buscar notas en %%site.name%% polo seu contido. Separe os termos de busca "
 "con espazos en branco. Teñen que ter tres ou máis caracteres."
 
-#: actions/noticesearch.php:78
+#. TRANS: Title of the page where users can search for notices.
+#: actions/noticesearch.php:80
 msgid "Text search"
 msgstr "Busca de texto"
 
-#: actions/noticesearch.php:91
+#. TRANS: Test in RSS notice search.
+#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
+#: actions/noticesearch.php:95
 #, php-format
 msgid "Search results for \"%1$s\" on %2$s"
 msgstr "Resultados da busca de \"%1$s\" en %2$s"
 
-#: actions/noticesearch.php:121
+#. TRANS: Text for logged in users making a query for notices without results.
+#. TRANS: This message contains a Markdown link.
+#: actions/noticesearch.php:128
 #, php-format
 msgid ""
 "Be the first to [post on this topic](%%%%action.newnotice%%%%?"
@@ -3899,7 +3964,9 @@ msgstr ""
 "Sexa o primeiro en [publicar sobre este tema](%%%%action.newnotice%%%%?"
 "status_textarea=%s)!"
 
-#: actions/noticesearch.php:124
+#. TRANS: Text for not logged in users making a query for notices without results.
+#. TRANS: This message contains Markdown links.
+#: actions/noticesearch.php:133
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and be the first to "
@@ -3908,14 +3975,17 @@ msgstr ""
 "Por que non [rexistrar unha conta](%%%%action.register%%%%) e ser o primeiro "
 "en [publicar sobre este tema](%%%%action.newnotice%%%%?status_textarea=%s)?"
 
-#: actions/noticesearchrss.php:96
+#. TRANS: RSS notice search feed title. %s is the query.
+#: actions/noticesearchrss.php:95
 #, php-format
 msgid "Updates with \"%s\""
 msgstr "Actualizacións con \"%s\""
 
-#: actions/noticesearchrss.php:98
+#. TRANS: RSS notice search feed description.
+#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
+#: actions/noticesearchrss.php:99
 #, fuzzy, php-format
-msgid "Updates matching search term \"%1$s\" on %2$s!"
+msgid "Updates matching search term \"%1$s\" on %2$s."
 msgstr "Actualizacións que conteñen o termo \"%1$s\" en %2$s!"
 
 #: actions/nudge.php:85
@@ -3936,52 +4006,52 @@ msgid "Nudge sent!"
 msgstr "Enviouse o aceno!"
 
 #. TRANS: Message displayed to an anonymous user trying to view OAuth application list.
-#: actions/oauthappssettings.php:60
+#: actions/oauthappssettings.php:57
 msgid "You must be logged in to list your applications."
 msgstr "Ten que identificarse para listar as súas aplicacións."
 
 #. TRANS: Page title for OAuth applications
-#: actions/oauthappssettings.php:76
+#: actions/oauthappssettings.php:73
 msgid "OAuth applications"
 msgstr "Aplicacións de OAuth"
 
 #. TRANS: Page instructions for OAuth applications
-#: actions/oauthappssettings.php:88
+#: actions/oauthappssettings.php:85
 msgid "Applications you have registered"
 msgstr "Aplicacións que rexistrou"
 
 #. TRANS: Empty list message on page with OAuth applications.
-#: actions/oauthappssettings.php:141
+#: actions/oauthappssettings.php:138
 #, php-format
 msgid "You have not registered any applications yet."
 msgstr "Aínda non rexistrou ningunha aplicación."
 
 #. TRANS: Title for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:71
+#: actions/oauthconnectionssettings.php:69
 msgid "Connected applications"
 msgstr "Aplicacións conectadas"
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:83
+#: actions/oauthconnectionssettings.php:80
 #, fuzzy
 msgid "The following connections exist for your account."
 msgstr "Permitiulle o acceso á súa conta ás seguintes aplicacións."
 
 #. TRANS: Client error when trying to revoke access for an application while not being a user of it.
-#: actions/oauthconnectionssettings.php:168
+#: actions/oauthconnectionssettings.php:165
 msgid "You are not a user of that application."
 msgstr "Non é usuario desa aplicación."
 
 #. TRANS: Client error when revoking access has failed for some reason.
 #. TRANS: %s is the application ID revoking access failed for.
-#: actions/oauthconnectionssettings.php:183
+#: actions/oauthconnectionssettings.php:180
 #, fuzzy, php-format
 msgid "Unable to revoke access for application: %s."
 msgstr "Non se puido revogar o acceso da aplicación: %s."
 
 #. TRANS: Success message after revoking access for an application.
 #. TRANS: %1$s is the application name, %2$s is the first part of the user token.
-#: actions/oauthconnectionssettings.php:202
+#: actions/oauthconnectionssettings.php:199
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -3989,20 +4059,30 @@ msgid ""
 msgstr ""
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:213
+#: actions/oauthconnectionssettings.php:210
 msgid "You have not authorized any applications to use your account."
 msgstr "Non autorizou o acceso á súa conta para ningunha aplicación."
 
 #. TRANS: Note for developers in the OAuth connection settings form.
 #. TRANS: This message contains a Markdown link. Do not separate "](".
 #. TRANS: %s is the URL to the OAuth settings.
-#: actions/oauthconnectionssettings.php:233
+#: actions/oauthconnectionssettings.php:230
 #, php-format
 msgid ""
 "Are you a developer? [Register an OAuth client application](%s) to use with "
 "this instance of StatusNet."
 msgstr ""
 
+#: actions/oembed.php:64
+#, fuzzy, php-format
+msgid "\"%s\" not found."
+msgstr "Non se atopou o método da API."
+
+#: actions/oembed.php:76
+#, fuzzy, php-format
+msgid "Notice %s not found."
+msgstr "Non se atopou o método da API."
+
 #: actions/oembed.php:80 actions/shownotice.php:100
 msgid "Notice has no profile."
 msgstr "Non hai perfil para a nota."
@@ -4012,6 +4092,16 @@ msgstr "Non hai perfil para a nota."
 msgid "%1$s's status on %2$s"
 msgstr "Estado de %1$s en %2$s"
 
+#: actions/oembed.php:95
+#, fuzzy, php-format
+msgid "Attachment %s not found."
+msgstr "Non se atopou o destinatario."
+
+#: actions/oembed.php:136
+#, php-format
+msgid "\"%s\" not supported for oembed requests."
+msgstr ""
+
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
 #: actions/oembed.php:168
 #, php-format
@@ -4025,96 +4115,60 @@ msgid "Only %s URLs over plain HTTP please."
 msgstr "Só %s enderezos URL sobre HTTP simple."
 
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1205
-#: lib/apiaction.php:1232 lib/apiaction.php:1367
+#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1207
+#: lib/apiaction.php:1234 lib/apiaction.php:1369
 msgid "Not a supported data format."
 msgstr "Non se soporta ese formato de datos."
 
+#. TRANS: ShortName in the OpenSearch interface when trying to find users.
 #: actions/opensearch.php:64
 msgid "People Search"
 msgstr "Busca de xente"
 
-#: actions/opensearch.php:67
+#: actions/opensearch.php:68
 msgid "Notice Search"
 msgstr "Busca de notas"
 
-#: actions/othersettings.php:59
-msgid "Other settings"
-msgstr "Outras opcións"
-
-#. TRANS: Instructions for tab "Other" in user profile settings.
-#: actions/othersettings.php:71
-msgid "Manage various other options."
-msgstr "Configure outras tantas opcións."
-
-#. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
-#. TRANS: user's profile settings. Use of "free" is as in "open", indicating that the
-#. TRANS: information on the shortener site is freely distributable.
-#. TRANS: This message has one space at the beginning. Use your language's word separator
-#. TRANS: here if it has one (most likely a single space).
-#: actions/othersettings.php:113
-msgid " (free service)"
-msgstr " (servizo libre)"
-
-#. TRANS: Label for dropdown with URL shortener services.
-#: actions/othersettings.php:122
-msgid "Shorten URLs with"
-msgstr "Abreviar os enderezos URL con"
-
-#. TRANS: Tooltip for for dropdown with URL shortener services.
-#: actions/othersettings.php:124
-msgid "Automatic shortening service to use."
-msgstr "Servizo de abreviación automática a usar."
-
-#. TRANS: Label for checkbox.
-#: actions/othersettings.php:130
-msgid "View profile designs"
-msgstr "Deseños visuais do perfil"
-
-#. TRANS: Tooltip for checkbox.
-#: actions/othersettings.php:132
-msgid "Show or hide profile designs."
-msgstr "Amosar ou agochar os deseños do perfil."
-
-#. TRANS: Form validation error for form "Other settings" in user profile.
-#: actions/othersettings.php:164
-#, fuzzy
-msgid "URL shortening service is too long (maximum 50 characters)."
-msgstr ""
-"O servizo de abreviación de enderezos URL é longo de máis (o límite está en "
-"50 caracteres)."
-
-#: actions/otp.php:69
+#. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
+#: actions/otp.php:70
 msgid "No user ID specified."
 msgstr "Non se especificou ningunha ID de usuario."
 
-#: actions/otp.php:83
+#. TRANS: Client error displayed trying to use "one time password login" without specifying a login token.
+#: actions/otp.php:86
 msgid "No login token specified."
 msgstr "Non se especificou ningún pase."
 
-#: actions/otp.php:90
+#. TRANS: Client error displayed trying to use "one time password login" without requesting a login token.
+#: actions/otp.php:94
 msgid "No login token requested."
 msgstr "Non se solicitou ningún pase."
 
-#: actions/otp.php:95
+#. TRANS: Client error displayed trying to use "one time password login" while specifying an invalid login token.
+#: actions/otp.php:100
 msgid "Invalid login token specified."
 msgstr "O pase especificado é incorrecto."
 
-#: actions/otp.php:104
+#. TRANS: Client error displayed trying to use "one time password login" while specifying an expired login token.
+#: actions/otp.php:110
 msgid "Login token expired."
 msgstr "O pase caducou."
 
-#: actions/outbox.php:58
+#. TRANS: Title for outbox for any but the fist page.
+#. TRANS: %1$s is the user nickname, %2$d is the page number.
+#: actions/outbox.php:57
 #, php-format
 msgid "Outbox for %1$s - page %2$d"
 msgstr "Caixa de saída de %1$s - páxina %2$d"
 
+#. TRANS: Title for first page of outbox.
 #: actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
 msgstr "Caixa de saída de %s"
 
-#: actions/outbox.php:104
+#. TRANS: Instructions for outbox.
+#: actions/outbox.php:103
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr ""
 "Esta é a súa caixa de saída. Nela lístanse as mensaxes privadas que enviou."
@@ -4141,43 +4195,45 @@ msgstr "Contrasinal anterior"
 msgid "New password"
 msgstr "Novo contrasinal"
 
-#: actions/passwordsettings.php:109
+#: actions/passwordsettings.php:109 actions/register.php:416
 #, fuzzy
-msgid "6 or more characters"
+msgid "6 or more characters."
 msgstr "Seis ou máis caracteres"
 
-#: actions/passwordsettings.php:113
+#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#: actions/passwordsettings.php:113 actions/recoverpassword.php:264
+#: actions/register.php:420
 #, fuzzy
-msgid "Same as password above"
+msgid "Same as password above."
 msgstr "Igual ao contrasinal anterior"
 
 #: actions/passwordsettings.php:117
 msgid "Change"
 msgstr "Cambiar"
 
-#: actions/passwordsettings.php:154 actions/register.php:238
+#: actions/passwordsettings.php:153 actions/register.php:223
 msgid "Password must be 6 or more characters."
 msgstr "O contrasinal debe conter seis ou máis caracteres."
 
-#: actions/passwordsettings.php:157 actions/register.php:241
+#: actions/passwordsettings.php:156 actions/register.php:226
 msgid "Passwords don't match."
 msgstr "Os contrasinais non coinciden."
 
-#: actions/passwordsettings.php:165
+#: actions/passwordsettings.php:164
 msgid "Incorrect old password"
 msgstr "O contrasinal anterior non é correcto"
 
-#: actions/passwordsettings.php:181
+#: actions/passwordsettings.php:180
 msgid "Error saving user; invalid."
 msgstr "Houbo un erro ao gardar o usuario. Incorrecto."
 
-#: actions/passwordsettings.php:186
+#. TRANS: Reset password form validation error message.
+#: actions/passwordsettings.php:185 actions/recoverpassword.php:418
 #, fuzzy
-msgid "Can't save new password."
+msgid "Cannot save new password."
 msgstr "Non se puido gardar o novo contrasinal."
 
-#. TRANS: Title for password recovery page in password saved mode.
-#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
+#: actions/passwordsettings.php:191
 msgid "Password saved."
 msgstr "Gardouse o contrasinal."
 
@@ -4389,8 +4445,7 @@ msgid "Directory where backgrounds are located."
 msgstr "Ruta do directorio das traducións"
 
 #. TRANS: Fieldset legens in Paths admin panel.
-#. TRANS: DT element label in attachment list.
-#: actions/pathsadminpanel.php:419 lib/attachmentlist.php:98
+#: actions/pathsadminpanel.php:419
 msgid "Attachments"
 msgstr "Ficheiros anexos"
 
@@ -4464,7 +4519,9 @@ msgstr "Servidor ao que dirixir as solicitudes SSL"
 msgid "Save paths"
 msgstr "Gardar as rutas"
 
-#: actions/peoplesearch.php:52
+#. TRANS: Instructions for the "People search" page.
+#. TRANS: %%site.name%% is the name of the StatusNet site.
+#: actions/peoplesearch.php:54
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
@@ -4473,7 +4530,8 @@ msgstr ""
 "Buscar xente en %%site.name%% por nome, lugar ou intereses. Separe os termos "
 "con espazos en branco. Teñen que ter tres ou máis caracteres."
 
-#: actions/peoplesearch.php:58
+#. TRANS: Title of a page where users can search for other users.
+#: actions/peoplesearch.php:61
 msgid "People search"
 msgstr "Busca de xente"
 
@@ -4487,6 +4545,60 @@ msgstr "A etiqueta de persoa non é correcta: %s."
 msgid "Users self-tagged with %1$s - page %2$d"
 msgstr "Usuarios etiquetados por si mesmos con %1$s - páxina %2$d"
 
+#. TRANS: Page title for AJAX form return when a disabling a plugin.
+#: actions/plugindisable.php:69
+msgctxt "plugin"
+msgid "Disabled"
+msgstr ""
+
+#. TRANS: Client error displayed trying to perform any request method other than POST.
+#. TRANS: Do not translate POST.
+#: actions/pluginenable.php:78 actions/subscribe.php:77
+msgid "This action only accepts POST requests."
+msgstr "Esta acción só permite solicitudes POST."
+
+#: actions/pluginenable.php:102
+#, fuzzy
+msgid "You cannot administer plugins."
+msgstr "Non pode borrar usuarios."
+
+#: actions/pluginenable.php:109
+#, fuzzy
+msgid "No such plugin."
+msgstr "Esa páxina non existe."
+
+#. TRANS: Page title for AJAX form return when enabling a plugin.
+#: actions/pluginenable.php:159
+msgctxt "plugin"
+msgid "Enabled"
+msgstr ""
+
+#. TRANS: Tab and title for plugins admin panel.
+#. TRANS: Menu item for site administration
+#: actions/pluginsadminpanel.php:56 actions/version.php:191
+#: lib/adminpanelaction.php:411
+msgid "Plugins"
+msgstr "Complementos"
+
+#. TRANS: Instructions at top of plugin admin page.
+#: actions/pluginsadminpanel.php:68
+msgid ""
+"Additional plugins can be enabled and configured manually. See the <a href="
+"\"http://status.net/wiki/Plugins\">online plugin documentation</a> for more "
+"details."
+msgstr ""
+
+#. TRANS: Admin form section header
+#: actions/pluginsadminpanel.php:84
+#, fuzzy
+msgid "Default plugins"
+msgstr "Lingua por defecto"
+
+#: actions/pluginsadminpanel.php:106
+msgid ""
+"All default plugins have been disabled from the site's configuration file."
+msgstr ""
+
 #: actions/postnotice.php:95
 msgid "Invalid notice content."
 msgstr "O contido da nota é incorrecto."
@@ -4498,12 +4610,12 @@ msgstr ""
 "A licenza \"%1$s\" da nota non é compatible coa licenza \"%2$s\" do sitio."
 
 #. TRANS: Page title for profile settings.
-#: actions/profilesettings.php:59
+#: actions/profilesettings.php:60
 msgid "Profile settings"
 msgstr "Configuración do perfil"
 
 #. TRANS: Usage instructions for profile settings.
-#: actions/profilesettings.php:70
+#: actions/profilesettings.php:71
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
@@ -4511,12 +4623,12 @@ msgstr ""
 "coñeza mellor."
 
 #. TRANS: Profile settings form legend.
-#: actions/profilesettings.php:98
+#: actions/profilesettings.php:99
 msgid "Profile information"
 msgstr "Información do perfil"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109 actions/register.php:433
+#: actions/profilesettings.php:110 actions/register.php:412
 #, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr ""
@@ -4524,23 +4636,20 @@ msgstr ""
 "espazos, tiles ou eñes"
 
 #. TRANS: Field label in form for profile settings.
-#. TRANS: Label for full group name (dt). Text hidden by default.
-#. TRANS: DT for full name in a profile.
-#: actions/profilesettings.php:113 actions/register.php:455
-#: actions/showgroup.php:255 actions/tagother.php:104
-#: lib/groupeditform.php:150 lib/userprofile.php:156
+#: actions/profilesettings.php:114 actions/register.php:434
+#: lib/groupeditform.php:150
 msgid "Full name"
 msgstr "Nome completo"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:118 actions/register.php:460
+#: actions/profilesettings.php:119 actions/register.php:439
 #: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "Páxina persoal"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:121
+#: actions/profilesettings.php:122 actions/register.php:441
 #, fuzzy
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr "URL da súa páxina persoal, blogue ou perfil noutro sitio"
@@ -4548,7 +4657,7 @@ msgstr "URL da súa páxina persoal, blogue ou perfil noutro sitio"
 #. TRANS: Tooltip for field label in form for profile settings. Plural
 #. TRANS: is decided by the number of characters available for the
 #. TRANS: biography (%d).
-#: actions/profilesettings.php:129 actions/register.php:471
+#: actions/profilesettings.php:130 actions/register.php:450
 #, fuzzy, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4556,79 +4665,75 @@ msgstr[0] "Descríbase a vostede e mailos seus intereses en %d caracteres"
 msgstr[1] "Descríbase a vostede e mailos seus intereses en %d caracteres"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:135 actions/register.php:476
+#: actions/profilesettings.php:136 actions/register.php:455
 msgid "Describe yourself and your interests"
 msgstr "Descríbase a vostede e mailos seus intereses"
 
 #. TRANS: Text area label in form for profile settings where users can provide.
 #. TRANS: their biography.
-#: actions/profilesettings.php:139 actions/register.php:478
+#: actions/profilesettings.php:140 actions/register.php:457
 msgid "Bio"
 msgstr "Biografía"
 
 #. TRANS: Field label in form for profile settings.
-#. TRANS: Label for group location (dt). Text hidden by default.
-#. TRANS: DT for location in a profile.
-#: actions/profilesettings.php:145 actions/register.php:483
-#: actions/showgroup.php:265 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:173
-#: lib/userprofile.php:172
+#: actions/profilesettings.php:146 actions/register.php:462
+#: lib/groupeditform.php:173
 msgid "Location"
 msgstr "Lugar"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148 actions/register.php:485
+#: actions/profilesettings.php:149
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Onde está a vivir, coma “localidade, provincia (ou comunidade), país”"
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:153
+#: actions/profilesettings.php:154
 msgid "Share my current location when posting notices"
 msgstr "Compartir o lugar onde vivo ao publicar notas"
 
 #. TRANS: Field label in form for profile settings.
-#. TRANS: DT for tags in a profile.
-#: actions/profilesettings.php:161 actions/tagother.php:149
-#: actions/tagother.php:209 lib/subscriptionlist.php:106
-#: lib/subscriptionlist.php:108 lib/userprofile.php:220
+#: actions/profilesettings.php:162 actions/tagother.php:128
+#: actions/tagother.php:188 lib/subscriptionlist.php:104
+#: lib/subscriptionlist.php:106
 msgid "Tags"
 msgstr "Etiquetas"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:164
+#: actions/profilesettings.php:165
 #, fuzzy
 msgid ""
-"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- "
+"separated."
 msgstr ""
 "Etiquetas para vostede (letras salvo eñes e tiles, números, puntos, guións e "
 "guións baixos), separados por comas ou espazos"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:169
+#: actions/profilesettings.php:170
 msgid "Language"
 msgstr "Lingua"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:171
+#: actions/profilesettings.php:172
 #, fuzzy
-msgid "Preferred language"
+msgid "Preferred language."
 msgstr "Lingua escollida"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:181
+#: actions/profilesettings.php:182
 msgid "Timezone"
 msgstr "Fuso horario"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:183
+#: actions/profilesettings.php:184
 msgid "What timezone are you normally in?"
 msgstr "En que fuso horario adoita estar?"
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:189
+#: actions/profilesettings.php:190
 #, fuzzy
 msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)"
+"Automatically subscribe to whoever subscribes to me (best for non-humans)."
 msgstr ""
 "Subscribirse automaticamente a quen se subscriba a min (o mellor para os "
 "bots)"
@@ -4636,7 +4741,7 @@ msgstr ""
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Plural form is used based on the maximum number of allowed
 #. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:258 actions/register.php:229
+#: actions/profilesettings.php:259 actions/register.php:214
 #, fuzzy, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4644,50 +4749,50 @@ msgstr[0] "A biografía é longa de máis (o límite son %d caracteres)."
 msgstr[1] "A biografía é longa de máis (o límite son %d caracteres)."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:269 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:270 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr "Non se escolleu ningún fuso horario."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:277
+#: actions/profilesettings.php:278
 #, fuzzy
 msgid "Language is too long (maximum 50 characters)."
 msgstr "A lingua é longa de máis (o límite é de 50 caracteres)."
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:291 actions/tagother.php:178
-#, php-format
-msgid "Invalid tag: \"%s\""
+#: actions/profilesettings.php:292
+#, fuzzy, php-format
+msgid "Invalid tag: \"%s\"."
 msgstr "Etiqueta incorrecta: \"%s\""
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:347
+#: actions/profilesettings.php:348
 #, fuzzy
 msgid "Could not update user for autosubscribe."
 msgstr "Non se puido actualizar o usuario para subscribirse automaticamente."
 
 #. TRANS: Server error thrown when user profile location preference settings could not be updated.
-#: actions/profilesettings.php:405
+#: actions/profilesettings.php:406
 #, fuzzy
 msgid "Could not save location prefs."
 msgstr "Non se puideron gardar as preferencias de lugar."
 
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:427 actions/tagother.php:200
+#: actions/profilesettings.php:428 actions/tagother.php:179
 msgid "Could not save tags."
 msgstr "Non se puideron gardar as etiquetas."
 
 #. TRANS: Confirmation shown when user profile settings are saved.
 #. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:436 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:437 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "Gardouse a configuración."
 
 #. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
 #. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:483 actions/restoreaccount.php:60
+#: actions/profilesettings.php:484 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "Crear unha conta"
@@ -4768,6 +4873,12 @@ msgstr ""
 "wikipedia.org/wiki/Microblogging) (en inglés) baseado na ferramenta de "
 "software libre [StatusNet](http://status.net/)."
 
+#. TRANS: Public RSS feed description. %s is the StatusNet site name.
+#: actions/publicrss.php:106
+#, fuzzy, php-format
+msgid "%s updates from everyone."
+msgstr "%s actualizacións de todos!"
+
 #. TRANS: Title for public tag cloud.
 #: actions/publictagcloud.php:57
 msgid "Public tag cloud"
@@ -4808,10 +4919,6 @@ msgstr ""
 "Por que non [rexistrar unha conta](%%action.register%%) e ser o primeiro en "
 "publicar unha?"
 
-#: actions/publictagcloud.php:146
-msgid "Tag cloud"
-msgstr "Nube de etiquetas"
-
 #. TRANS: Client error displayed trying to recover password while already logged in.
 #: actions/recoverpassword.php:37
 msgid "You are already logged in!"
@@ -4907,6 +5014,12 @@ msgstr "Recuperar o contrasinal"
 msgid "Password recovery requested"
 msgstr "Solicitouse a recuperación do contrasinal"
 
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/recoverpassword.php:229
+#, fuzzy
+msgid "Password saved"
+msgstr "Gardouse o contrasinal."
+
 #. TRANS: Title for password recovery page when an unknown action has been specified.
 #: actions/recoverpassword.php:232
 msgid "Unknown action"
@@ -4918,15 +5031,9 @@ msgstr "Non se coñece esa acción"
 msgid "6 or more characters, and do not forget it!"
 msgstr "Seis ou máis caracteres, e non o esqueza!"
 
-#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
-#: actions/recoverpassword.php:264 actions/register.php:441
-#, fuzzy
-msgid "Same as password above."
-msgstr "Igual ao contrasinal anterior"
-
 #. TRANS: Button text for password reset form.
 #. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: actions/recoverpassword.php:268 lib/designsettings.php:264
+#: actions/recoverpassword.php:268 lib/designform.php:145
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Reset"
@@ -4979,14 +5086,8 @@ msgstr "O contrasinal debe ter seis ou máis caracteres."
 msgid "Password and confirmation do not match."
 msgstr "O contrasinal e a confirmación non coinciden."
 
-#. TRANS: Reset password form validation error message.
-#: actions/recoverpassword.php:418
-#, fuzzy
-msgid "Cannot save new password."
-msgstr "Non se puido gardar o novo contrasinal."
-
 #. TRANS: Server error displayed when something does wrong with the user object during password reset.
-#: actions/recoverpassword.php:426 actions/register.php:256
+#: actions/recoverpassword.php:426 actions/register.php:241
 msgid "Error setting user."
 msgstr "Houbo un erro ao configurar o usuario."
 
@@ -4995,101 +5096,105 @@ msgstr "Houbo un erro ao configurar o usuario."
 msgid "New password successfully saved. You are now logged in."
 msgstr "O novo contrasinal gardouse correctamente. Agora está identificado."
 
-#: actions/register.php:92 actions/register.php:196 actions/register.php:413
+#: actions/redirecturl.php:70
+#, fuzzy
+msgid "No id parameter"
+msgstr "Sen argumento ID."
+
+#: actions/redirecturl.php:76
+#, fuzzy, php-format
+msgid "No such file \"%d\""
+msgstr "Non existe tal ficheiro."
+
+#: actions/register.php:80 actions/register.php:181 actions/register.php:392
 msgid "Sorry, only invited people can register."
 msgstr "Só se pode rexistrar mediante invitación."
 
-#: actions/register.php:99
+#: actions/register.php:87
 msgid "Sorry, invalid invitation code."
 msgstr "O código da invitación é incorrecto."
 
-#: actions/register.php:119
+#: actions/register.php:106
 msgid "Registration successful"
 msgstr "Rexistrouse correctamente"
 
-#: actions/register.php:121 actions/register.php:511
+#: actions/register.php:108 actions/register.php:490
 msgid "Register"
 msgstr "Rexistrarse"
 
-#: actions/register.php:142
+#: actions/register.php:128
 msgid "Registration not allowed."
 msgstr "Non se permite o rexistro."
 
-#: actions/register.php:209
+#: actions/register.php:194
 #, fuzzy
-msgid "You can't register if you don't agree to the license."
+msgid "You cannot register if you don't agree to the license."
 msgstr "Non pode rexistrarse se non acepta a licenza."
 
-#: actions/register.php:218
+#: actions/register.php:203
 msgid "Email address already exists."
 msgstr "O enderezo de correo electrónico xa existe."
 
-#: actions/register.php:251 actions/register.php:273
+#: actions/register.php:236 actions/register.php:258
 msgid "Invalid username or password."
 msgstr "O nome de usuario ou contrasinal non son correctos."
 
-#: actions/register.php:351
+#: actions/register.php:333
 #, fuzzy
 msgid ""
 "With this form you can create a new account. You can then post notices and "
-"link up to friends and colleagues. "
+"link up to friends and colleagues."
 msgstr ""
 "Con este formulario pode crear unha conta nova. Entón poderá publicar notas "
 "e porse en contacto con amigos e compañeiros. "
 
-#: actions/register.php:437
-#, fuzzy
-msgid "6 or more characters."
-msgstr "Seis ou máis caracteres"
-
-#. TRANS: Link description in user account settings menu.
-#: actions/register.php:445 actions/register.php:449
-#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
+#: actions/register.php:424 actions/register.php:428
+#: actions/siteadminpanel.php:238 lib/settingsnav.php:92
 msgid "Email"
 msgstr "Correo electrónico"
 
-#: actions/register.php:446 actions/register.php:450
+#: actions/register.php:425 actions/register.php:429
 #, fuzzy
-msgid "Used only for updates, announcements, and password recovery"
+msgid "Used only for updates, announcements, and password recovery."
 msgstr ""
 "Só se utiliza para actualizacións, anuncios e recuperación de contrasinais"
 
-#: actions/register.php:457
+#: actions/register.php:436
 #, fuzzy
-msgid "Longer name, preferably your \"real\" name"
+msgid "Longer name, preferably your \"real\" name."
 msgstr "Nome longo, preferiblemente o seu nome \"real\""
 
-#: actions/register.php:462
+#: actions/register.php:464
 #, fuzzy
-msgid "URL of your homepage, blog, or profile on another site"
-msgstr "URL da súa páxina persoal, blogue ou perfil noutro sitio"
+msgid "Where you are, like \"City, State (or Region), Country\"."
+msgstr "Onde está a vivir, coma “localidade, provincia (ou comunidade), país”"
 
-#: actions/register.php:523
+#: actions/register.php:503
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
 msgstr "Entendo que o contido e os datos de %1$s son privados e confidenciais."
 
-#: actions/register.php:533
+#: actions/register.php:513
 #, php-format
 msgid "My text and files are copyright by %1$s."
 msgstr ""
 "Os meus textos e ficheiros están protexidos polos dereitos de autor de %1$s."
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:537
+#: actions/register.php:517
 msgid "My text and files remain under my own copyright."
 msgstr ""
 "Os meus textos e ficheiros están protexidos polos meus propios dereitos de "
 "autor."
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:540
+#: actions/register.php:520
 msgid "All rights reserved."
 msgstr "Todos os dereitos reservados."
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:545
+#: actions/register.php:525
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -5099,7 +5204,7 @@ msgstr ""
 "datos privados: contrasinais, enderezos de correo electrónico e mensaxería "
 "instantánea e números de teléfono."
 
-#: actions/register.php:588
+#: actions/register.php:566
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -5131,7 +5236,7 @@ msgstr ""
 "\n"
 "Grazas por rexistrarse. Esperamos que goce deste servizo."
 
-#: actions/register.php:612
+#: actions/register.php:590
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5165,7 +5270,7 @@ msgstr "Alcume do usuario"
 
 #: actions/remotesubscribe.php:129
 #, fuzzy
-msgid "Nickname of the user you want to follow"
+msgid "Nickname of the user you want to follow."
 msgstr "Alcume do usuario ao que quere seguir"
 
 #: actions/remotesubscribe.php:132
@@ -5174,19 +5279,19 @@ msgstr "URL do perfil"
 
 #: actions/remotesubscribe.php:133
 #, fuzzy
-msgid "URL of your profile on another compatible microblogging service"
+msgid "URL of your profile on another compatible microblogging service."
 msgstr ""
 "URL do seu perfil noutro servizo de mensaxes de blogue curtas compatible"
 
 #. TRANS: Link text for link that will subscribe to a remote profile.
 #: actions/remotesubscribe.php:136 lib/subscribeform.php:139
-#: lib/userprofile.php:431
+#: lib/userprofile.php:402
 msgid "Subscribe"
 msgstr "Subscribirse"
 
 #: actions/remotesubscribe.php:158
 #, fuzzy
-msgid "Invalid profile URL (bad format)"
+msgid "Invalid profile URL (bad format)."
 msgstr "O enderezo URL do perfil é incorrecto (formato erróneo)"
 
 #: actions/remotesubscribe.php:167
@@ -5222,7 +5327,7 @@ msgstr "Non pode repetir a súa propia nota."
 msgid "You already repeated that notice."
 msgstr "Xa repetiu esa nota."
 
-#: actions/repeat.php:112 lib/noticelist.php:692
+#: actions/repeat.php:112 lib/noticelist.php:697
 msgid "Repeated"
 msgstr "Repetida"
 
@@ -5230,9 +5335,9 @@ msgstr "Repetida"
 msgid "Repeated!"
 msgstr "Repetida!"
 
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing @-replies.
+#. TRANS: RSS reply feed title. %s is a user nickname.
 #: actions/replies.php:126 actions/repliesrss.php:68
-#: lib/personalgroupnav.php:109
+#: lib/personalgroupnav.php:105
 #, php-format
 msgid "Replies to %s"
 msgstr "Respostas a %s"
@@ -5284,9 +5389,11 @@ msgstr ""
 "Pode probar a [facerlle un aceno a %1$s](../%2$s) ou [publicar algo dirixido "
 "a el ou ela](%%%%action.newnotice%%%%?status_textarea=%3$s)."
 
-#: actions/repliesrss.php:72
+#. TRANS: RSS reply feed description.
+#. TRANS: %1$s is a user nickname, %2$s is the StatusNet site name.
+#: actions/repliesrss.php:74
 #, fuzzy, php-format
-msgid "Replies to %1$s on %2$s!"
+msgid "Replies to %1$s on %2$s."
 msgstr "Respostas a %1$s en %2$s!"
 
 #. TRANS: Client exception displayed when trying to restore an account while not logged in.
@@ -5388,7 +5495,7 @@ msgstr "Non pode revogar os roles dos usuarios neste sitio."
 msgid "User doesn't have this role."
 msgstr "O usuario non ten este rol."
 
-#: actions/rsd.php:146 actions/version.php:159
+#: actions/rsd.php:142 actions/version.php:159
 msgid "StatusNet"
 msgstr "StatusNet"
 
@@ -5430,87 +5537,38 @@ msgstr "Activar a saída de depuración para as sesións."
 msgid "Save site settings"
 msgstr "Gardar a configuración do sitio"
 
-#: actions/showapplication.php:82
+#: actions/showapplication.php:78
 msgid "You must be logged in to view an application."
 msgstr "Debe estar identificado para ver unha aplicación."
 
-#: actions/showapplication.php:157
+#: actions/showapplication.php:151
 msgid "Application profile"
 msgstr "Perfil da aplicación"
 
-#. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:159 lib/applicationeditform.php:177
-msgid "Icon"
-msgstr "Icona"
-
-#. TRANS: Form input field label for application name.
-#: actions/showapplication.php:169 actions/version.php:197
-#: lib/applicationeditform.php:190
-msgid "Name"
-msgstr "Nome"
-
-#. TRANS: Form input field label.
-#: actions/showapplication.php:178 lib/applicationeditform.php:227
-msgid "Organization"
-msgstr "Organización"
-
-#. TRANS: Form input field label.
-#: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:168
-msgid "Description"
-msgstr "Descrición"
-
-#. TRANS: Header for group statistics on a group page (h2).
-#. TRANS: H2 text for user statistics.
-#: actions/showapplication.php:192 actions/showgroup.php:460
-#: lib/profileaction.php:205
-msgid "Statistics"
-msgstr "Estatísticas"
-
-#: actions/showapplication.php:203
+#: actions/showapplication.php:179
 #, php-format
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr "Creado por %1$s - acceso %2$s por defecto - %3$d usuarios"
 
-#: actions/showapplication.php:213
+#: actions/showapplication.php:189
 msgid "Application actions"
 msgstr "Accións da aplicación"
 
-#: actions/showapplication.php:236
+#: actions/showapplication.php:212
 msgid "Reset key & secret"
 msgstr "Restablecer o contrasinal ou a pregunta secreta"
 
 #. TRANS: Title of form for deleting a user.
-#: actions/showapplication.php:252 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:64 lib/noticelist.php:673
+#: actions/showapplication.php:228 lib/deletegroupform.php:121
+#: lib/deleteuserform.php:64 lib/noticelist.php:678
 msgid "Delete"
 msgstr "Borrar"
 
-#: actions/showapplication.php:261
+#: actions/showapplication.php:237
 msgid "Application info"
 msgstr "Información da aplicación"
 
-#: actions/showapplication.php:263
-msgid "Consumer key"
-msgstr "Clave do consumidor"
-
-#: actions/showapplication.php:268
-msgid "Consumer secret"
-msgstr "Pregunta secreta do consumidor"
-
-#: actions/showapplication.php:273
-msgid "Request token URL"
-msgstr "Solicitar un URL de pase"
-
-#: actions/showapplication.php:278
-msgid "Access token URL"
-msgstr "Acceder ao URL do pase"
-
-#: actions/showapplication.php:283
-msgid "Authorize URL"
-msgstr "Autorizar o URL"
-
-#: actions/showapplication.php:288
+#: actions/showapplication.php:255
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
@@ -5518,7 +5576,7 @@ msgstr ""
 "Nota: sopórtanse as sinaturas HMAC-SHA1. Non se soporta o método de asinado "
 "con texto sinxelo."
 
-#: actions/showapplication.php:309
+#: actions/showapplication.php:275
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr ""
 "Seguro que quere restablecer a súa clave e maila súa pregunta secreta de "
@@ -5606,61 +5664,47 @@ msgstr "Grupo %s"
 msgid "%1$s group, page %2$d"
 msgstr "Grupo %1$s, páxina %2$d"
 
-#. TRANS: Group profile header (h2). Text hidden by default.
-#: actions/showgroup.php:223
-msgid "Group profile"
-msgstr "Perfil do grupo"
-
-#. TRANS: Label for group URL (dt). Text hidden by default.
-#. TRANS: DT for URL in a profile.
-#: actions/showgroup.php:273 actions/tagother.php:118
-#: actions/userauthorization.php:175 lib/userprofile.php:186
-msgid "URL"
-msgstr "URL"
-
 #. TRANS: Label for group description or group note (dt). Text hidden by default.
-#. TRANS: DT for note in a profile.
-#: actions/showgroup.php:285 actions/tagother.php:128
-#: actions/userauthorization.php:187 lib/userprofile.php:204
+#: actions/showgroup.php:266
 msgid "Note"
 msgstr "Nota"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:296 lib/groupeditform.php:180
+#: actions/showgroup.php:277 lib/groupeditform.php:180
 msgid "Aliases"
 msgstr "Pseudónimos"
 
 #. TRANS: Group actions header (h2). Text hidden by default.
-#: actions/showgroup.php:313
+#: actions/showgroup.php:294
 msgid "Group actions"
 msgstr "Accións do grupo"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:357
+#: actions/showgroup.php:338
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
 msgstr "Fonte de novas das notas do grupo %s (RSS 1.0)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:364
+#: actions/showgroup.php:345
 #, php-format
 msgid "Notice feed for %s group (RSS 2.0)"
 msgstr "Fonte de novas das notas do grupo %s (RSS 2.0)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:371
+#: actions/showgroup.php:352
 #, php-format
 msgid "Notice feed for %s group (Atom)"
 msgstr "Fonte de novas das notas do grupo %s (Atom)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:377
+#: actions/showgroup.php:358
 #, php-format
 msgid "FOAF for %s group"
 msgstr "Amigo dun amigo para o grupo %s"
 
 #. TRANS: Header for mini list of group members on a group page (h2).
-#: actions/showgroup.php:414
+#: actions/showgroup.php:395
 msgid "Members"
 msgstr "Membros"
 
@@ -5668,26 +5712,31 @@ msgstr "Membros"
 #. TRANS: Text for user subscription statistics if the user has no subscriptions.
 #. TRANS: Text for user subscriber statistics if user has no subscribers.
 #. TRANS: Text for user user group membership statistics if user is not a member of any group.
-#: actions/showgroup.php:420 lib/profileaction.php:137
+#: actions/showgroup.php:401 lib/profileaction.php:137
 #: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
-#: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
+#: lib/subscriptionlist.php:123 lib/tagcloudsection.php:71
 msgid "(None)"
 msgstr "(Ningún)"
 
 #. TRANS: Link to all group members from mini list of group members if group has more than n members.
-#: actions/showgroup.php:429
+#: actions/showgroup.php:410
 msgid "All members"
 msgstr "Todos os membros"
 
-#. TRANS: Label for creation date in statistics on group page.
-#: actions/showgroup.php:465
+#. TRANS: Header for group statistics on a group page (h2).
+#. TRANS: H2 text for user statistics.
+#: actions/showgroup.php:441 lib/profileaction.php:205
+msgid "Statistics"
+msgstr "Estatísticas"
+
+#: actions/showgroup.php:444
 #, fuzzy
 msgctxt "LABEL"
 msgid "Created"
 msgstr "Creado"
 
 #. TRANS: Label for member count in statistics on group page.
-#: actions/showgroup.php:473
+#: actions/showgroup.php:449
 #, fuzzy
 msgctxt "LABEL"
 msgid "Members"
@@ -5697,7 +5746,7 @@ msgstr "Membros"
 #. TRANS: **%s** is the group alias, %%%%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).
-#: actions/showgroup.php:488
+#: actions/showgroup.php:464
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5716,7 +5765,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: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
-#: actions/showgroup.php:498
+#: actions/showgroup.php:474
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5730,7 +5779,7 @@ msgstr ""
 "seus membros comparten mensaxes curtas sobre as súas vidas e intereses. "
 
 #. TRANS: Header for list of group administrators on a group page (h2).
-#: actions/showgroup.php:527
+#: actions/showgroup.php:503
 msgid "Admins"
 msgstr "Administradores"
 
@@ -5769,7 +5818,7 @@ msgid "%1$s tagged %2$s"
 msgstr "%1$s, páxina %2$d"
 
 #. TRANS: Page title showing tagged notices in one user's stream.
-#. TRANS: %1$s is the username, %2$s is the hash tag, %1$d is the page number.
+#. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
 #: actions/showstream.php:74
 #, fuzzy, php-format
 msgid "%1$s tagged %2$s, page %3$d"
@@ -5816,13 +5865,13 @@ msgid "FOAF for %s"
 msgstr "Amigo dun amigo para %s"
 
 #. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
-#: actions/showstream.php:211
+#: actions/showstream.php:205
 #, fuzzy, php-format
 msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr "Esta é a liña do tempo para %1$s pero %2$s aínda non publicou nada."
 
 #. TRANS: Second sentence of empty list message for a stream for the user themselves.
-#: actions/showstream.php:217
+#: actions/showstream.php:211
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
@@ -5832,7 +5881,7 @@ msgstr ""
 
 #. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:221
+#: actions/showstream.php:215
 #, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
@@ -5843,7 +5892,7 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:264
+#: actions/showstream.php:258
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5859,7 +5908,7 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:271
+#: actions/showstream.php:265
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5871,7 +5920,7 @@ msgstr ""
 "baseado na ferramenta de software libre [StatusNet](http://status.net/). "
 
 #. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
-#: actions/showstream.php:328
+#: actions/showstream.php:322
 #, php-format
 msgid "Repeat of %s"
 msgstr "Repeticións de %s"
@@ -6023,77 +6072,77 @@ msgstr ""
 #. TRANS: Title for button to save site notice in admin panel.
 #: actions/sitenoticeadminpanel.php:201
 #, fuzzy
-msgid "Save site notice"
+msgid "Save site notice."
 msgstr "Gardar a nota do sitio"
 
 #. TRANS: Title for SMS settings.
-#: actions/smssettings.php:57
+#: actions/smssettings.php:56
 msgid "SMS settings"
 msgstr "Configuración dos SMS"
 
 #. TRANS: SMS settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/smssettings.php:71
+#: actions/smssettings.php:70
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr "Pode recibir mensaxes SMS de %%site.name%% por correo electrónico."
 
 #. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
-#: actions/smssettings.php:93
+#: actions/smssettings.php:92
 msgid "SMS is not available."
 msgstr "Os SMS non están dispoñibles."
 
 #. TRANS: Form legend for SMS settings form.
-#: actions/smssettings.php:107
+#: actions/smssettings.php:106
 msgid "SMS address"
 msgstr "Enderezo dos SMS"
 
 #. TRANS: Form guide in SMS settings form.
-#: actions/smssettings.php:116
+#: actions/smssettings.php:115
 msgid "Current confirmed SMS-enabled phone number."
 msgstr "Número de teléfono cos SMS activados confirmado actualmente."
 
 #. TRANS: Form guide in IM settings form.
-#: actions/smssettings.php:129
+#: actions/smssettings.php:128
 msgid "Awaiting confirmation on this phone number."
 msgstr "Agardando pola confirmación do número de teléfono."
 
 #. TRANS: Field label for SMS address input in SMS settings form.
-#: actions/smssettings.php:138
+#: actions/smssettings.php:137
 msgid "Confirmation code"
 msgstr "Código de confirmación"
 
 #. TRANS: Form field instructions in SMS settings form.
-#: actions/smssettings.php:140
+#: actions/smssettings.php:139
 msgid "Enter the code you received on your phone."
 msgstr "Introduza o código que recibiu no teléfono."
 
 #. TRANS: Button label to confirm SMS confirmation code in SMS settings.
-#: actions/smssettings.php:144
+#: actions/smssettings.php:143
 msgctxt "BUTTON"
 msgid "Confirm"
 msgstr "Confirmar"
 
 #. TRANS: Field label for SMS phone number input in SMS settings form.
-#: actions/smssettings.php:149
+#: actions/smssettings.php:148
 msgid "SMS phone number"
 msgstr "Número de teléfono para os SMS"
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
-#: actions/smssettings.php:152
+#: actions/smssettings.php:151
 #, fuzzy
-msgid "Phone number, no punctuation or spaces, with area code"
+msgid "Phone number, no punctuation or spaces, with area code."
 msgstr ""
 "Número de teléfono, sen signos de puntuación nin espazos en branco, co "
 "código da zona"
 
 #. TRANS: Form legend for SMS preferences form.
-#: actions/smssettings.php:191
+#: actions/smssettings.php:190
 msgid "SMS preferences"
 msgstr "Preferencias dos SMS"
 
 #. TRANS: Checkbox label in SMS preferences form.
-#: actions/smssettings.php:197
+#: actions/smssettings.php:196
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
@@ -6102,32 +6151,32 @@ msgstr ""
 "exorbitantes na factura da miña compañía."
 
 #. TRANS: Confirmation message for successful SMS preferences save.
-#: actions/smssettings.php:308
+#: actions/smssettings.php:307
 msgid "SMS preferences saved."
 msgstr "Gardáronse as preferencias dos SMS."
 
 #. TRANS: Message given saving SMS phone number without having provided one.
-#: actions/smssettings.php:330
+#: actions/smssettings.php:329
 msgid "No phone number."
 msgstr "Non hai ningún número de teléfono."
 
 #. TRANS: Message given saving SMS phone number without having selected a carrier.
-#: actions/smssettings.php:336
+#: actions/smssettings.php:335
 msgid "No carrier selected."
 msgstr "Non se escolleu unha compañía."
 
 #. TRANS: Message given saving SMS phone number that is already set.
-#: actions/smssettings.php:344
+#: actions/smssettings.php:343
 msgid "That is already your phone number."
 msgstr "Ese xa é o seu número de teléfono."
 
 #. TRANS: Message given saving SMS phone number that is already set for another user.
-#: actions/smssettings.php:348
+#: actions/smssettings.php:347
 msgid "That phone number already belongs to another user."
 msgstr "Ese número de teléfono xa pertence a outro usuario."
 
 #. TRANS: Message given saving valid SMS phone number that is to be confirmed.
-#: actions/smssettings.php:376
+#: actions/smssettings.php:375
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
 "for the code and instructions on how to use it."
@@ -6136,39 +6185,39 @@ msgstr ""
 "Comprobe no seu teléfono o código e as instrucións para utilizalo."
 
 #. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
-#: actions/smssettings.php:404
+#: actions/smssettings.php:403
 msgid "That is the wrong confirmation number."
 msgstr "Ese número de confirmación é incorrecto."
 
 #. TRANS: Message given after successfully canceling SMS phone number confirmation.
-#: actions/smssettings.php:418
+#: actions/smssettings.php:417
 msgid "SMS confirmation cancelled."
 msgstr "Cancelouse a confirmación para os SMS."
 
 #. TRANS: Message given trying to remove an SMS phone number that is not
 #. TRANS: registered for the active user.
-#: actions/smssettings.php:438
+#: actions/smssettings.php:437
 msgid "That is not your phone number."
 msgstr "Ese número de teléfono non é seu."
 
 #. TRANS: Message given after successfully removing a registered SMS phone number.
-#: actions/smssettings.php:460
+#: actions/smssettings.php:459
 msgid "The SMS phone number was removed."
 msgstr "Borrouse o número de teléfono para os SMS."
 
 #. TRANS: Label for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:499
+#: actions/smssettings.php:498
 msgid "Mobile carrier"
 msgstr "Compañía"
 
 #. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:504
+#: actions/smssettings.php:503
 msgid "Select a carrier"
 msgstr "Escolla unha compañía"
 
 #. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
 #. TRANS: %s is an administrative contact's e-mail address.
-#: actions/smssettings.php:513
+#: actions/smssettings.php:512
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -6179,7 +6228,7 @@ msgstr ""
 "nesta lista, envíenos un correo electrónico para notificárnolo a %s."
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
-#: actions/smssettings.php:535
+#: actions/smssettings.php:534
 #, fuzzy
 msgid "No code entered."
 msgstr "Non se introduciu ningún código"
@@ -6253,15 +6302,13 @@ msgstr "Non está subscrito a ese perfil."
 msgid "Could not save subscription."
 msgstr "Non se puido gardar a subscrición."
 
-#: actions/subscribe.php:77
-msgid "This action only accepts POST requests."
-msgstr "Esta acción só permite solicitudes POST."
-
-#: actions/subscribe.php:117
+#. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
+#: actions/subscribe.php:121
 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
 msgstr "Non se pode subscribir a un perfil remoto OMB 0.1 con esta acción."
 
-#: actions/subscribe.php:145
+#. TRANS: Page title when subscription succeeded.
+#: actions/subscribe.php:149
 msgid "Subscribed"
 msgstr "Subscrito"
 
@@ -6378,31 +6425,34 @@ msgid "Subscription feed for %s (Atom)"
 msgstr "Fonte de novas das notas para %s (Atom)"
 
 #. TRANS: Checkbox label for enabling Jabber messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:239
-msgid "Jabber"
-msgstr "Jabber"
+#: actions/subscriptions.php:241 lib/settingsnav.php:110
+#, fuzzy
+msgid "IM"
+msgstr "MI"
 
 #. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:254
+#: actions/subscriptions.php:256 lib/settingsnav.php:117
 msgid "SMS"
 msgstr "SMS"
 
-#: actions/tag.php:69
+#. TRANS: Title for all but the first page of notices with tags.
+#. TRANS: %1$s is the tag, %2$d is the page number.
+#: actions/tag.php:73
 #, php-format
 msgid "Notices tagged with %1$s, page %2$d"
 msgstr "Notas etiquetadas con %1$s, páxina %2$d"
 
-#: actions/tag.php:87
+#: actions/tag.php:91
 #, php-format
 msgid "Notice feed for tag %s (RSS 1.0)"
 msgstr "Fonte de novas das notas para a etiqueta %s (RSS 1.0)"
 
-#: actions/tag.php:93
+#: actions/tag.php:97
 #, php-format
 msgid "Notice feed for tag %s (RSS 2.0)"
 msgstr "Fonte de novas das notas para a etiqueta %s (RSS 2.0)"
 
-#: actions/tag.php:99
+#: actions/tag.php:103
 #, php-format
 msgid "Notice feed for tag %s (Atom)"
 msgstr "Fonte de novas das notas para a etiqueta %s (Atom)"
@@ -6421,17 +6471,11 @@ msgstr "Etiqueta %s"
 msgid "User profile"
 msgstr "Perfil do usuario"
 
-#. TRANS: DT element in area for user avatar.
-#: actions/tagother.php:81 actions/userauthorization.php:132
-#: lib/userprofile.php:108
-msgid "Photo"
-msgstr "Fotografía"
-
-#: actions/tagother.php:141
+#: actions/tagother.php:120
 msgid "Tag user"
 msgstr "Etiquetar ao usuario"
 
-#: actions/tagother.php:151
+#: actions/tagother.php:130
 msgid ""
 "Tags for this user (letters, numbers, -, ., and _), comma- or space- "
 "separated"
@@ -6439,14 +6483,19 @@ msgstr ""
 "Etiquetas para este usuario (letras, números, -, ., e _), separadas por "
 "comas ou espazos en branco"
 
-#: actions/tagother.php:193
+#: actions/tagother.php:157
+#, php-format
+msgid "Invalid tag: \"%s\""
+msgstr "Etiqueta incorrecta: \"%s\""
+
+#: actions/tagother.php:172
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 "Só pode etiquetar a xente á que estea subscrito ou que estean subscritos a "
 "vostede."
 
-#: actions/tagother.php:236
+#: actions/tagother.php:215
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
 "Utilice este formulario para engadir etiquetas aos seus subscritores ou "
@@ -6456,6 +6505,7 @@ msgstr ""
 msgid "No such tag."
 msgstr "Esa etiqueta non existe."
 
+#. TRANS: Client error displayed when trying to unblock a non-blocked user.
 #: actions/unblock.php:59
 msgid "You haven't blocked that user."
 msgstr "Non bloqueou a ese usuario."
@@ -6476,7 +6526,7 @@ msgstr "Á solicitude fáltalle o ID do perfil."
 msgid "Unsubscribed"
 msgstr "Cancelouse a subscrición"
 
-#: actions/updateprofile.php:64 actions/userauthorization.php:337
+#: actions/updateprofile.php:64
 #, php-format
 msgid ""
 "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
@@ -6484,6 +6534,80 @@ msgstr ""
 "A licenza \"%1$s\" das transmisións da persoa seguida non é compatible coa "
 "licenza deste sitio: \"%2$s\"."
 
+#: actions/urlsettings.php:60
+#, fuzzy
+msgid "URL settings"
+msgstr "Configuración da mensaxería instantánea"
+
+#. TRANS: Instructions for tab "Other" in user profile settings.
+#: actions/urlsettings.php:72
+msgid "Manage various other options."
+msgstr "Configure outras tantas opcións."
+
+#. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
+#. TRANS: user's profile settings. This message has one space at the beginning. Use your
+#. TRANS: language's word separator here if it has one (most likely a single space).
+#: actions/urlsettings.php:115
+msgid " (free service)"
+msgstr " (servizo libre)"
+
+#: actions/urlsettings.php:121
+#, fuzzy
+msgid "[none]"
+msgstr "Ningún"
+
+#: actions/urlsettings.php:122
+msgid "[internal]"
+msgstr ""
+
+#. TRANS: Label for dropdown with URL shortener services.
+#: actions/urlsettings.php:130
+msgid "Shorten URLs with"
+msgstr "Abreviar os enderezos URL con"
+
+#. TRANS: Tooltip for for dropdown with URL shortener services.
+#: actions/urlsettings.php:132
+msgid "Automatic shortening service to use."
+msgstr "Servizo de abreviación automática a usar."
+
+#: actions/urlsettings.php:138
+msgid "URL longer than"
+msgstr ""
+
+#: actions/urlsettings.php:141
+msgid "URLs longer than this will be shortened, 0 means always shorten."
+msgstr ""
+
+#: actions/urlsettings.php:145
+msgid "Text longer than"
+msgstr ""
+
+#: actions/urlsettings.php:148
+msgid ""
+"URLs in notices longer than this will be shortened, 0 means always shorten."
+msgstr ""
+
+#. TRANS: Form validation error for form "Other settings" in user profile.
+#: actions/urlsettings.php:180
+#, fuzzy
+msgid "URL shortening service is too long (maximum 50 characters)."
+msgstr ""
+"O servizo de abreviación de enderezos URL é longo de máis (o límite está en "
+"50 caracteres)."
+
+#: actions/urlsettings.php:187
+msgid "Invalid number for max url length."
+msgstr ""
+
+#: actions/urlsettings.php:193
+#, fuzzy
+msgid "Invalid number for max notice length."
+msgstr "O contido da nota é incorrecto."
+
+#: actions/urlsettings.php:238
+msgid "Error saving user URL shortening preferences."
+msgstr ""
+
 #. TRANS: User admin panel title
 #: actions/useradminpanel.php:58
 msgctxt "TITLE"
@@ -6510,11 +6634,11 @@ msgstr "Texto de benvida incorrecto. A extensión máxima é de 255 caracteres."
 #. TRANS: users in user admin panel. %1$s is the invalid nickname.
 #: actions/useradminpanel.php:166
 #, fuzzy, php-format
-msgid "Invalid default subscripton: '%1$s' is not a user."
+msgid "Invalid default subscripton: \"%1$s\" is not a user."
 msgstr "Subscrición por defecto incorrecta. \"%1$s\" non é un usuario."
 
-#. TRANS: Link description in user account settings menu.
-#: actions/useradminpanel.php:215 lib/accountsettingsaction.php:106
+#: actions/useradminpanel.php:215 lib/action.php:565 lib/settingsnav.php:77
+#: lib/subgroupnav.php:81
 msgid "Profile"
 msgstr "Perfil"
 
@@ -6572,59 +6696,63 @@ msgstr "Permitir ou non que os usuarios poidan invitar a novos usuarios."
 #. TRANS: Title for button to save user settings in user admin panel.
 #: actions/useradminpanel.php:302
 #, fuzzy
-msgid "Save user settings"
+msgid "Save user settings."
 msgstr "Gardar a configuración do usuario"
 
-#: actions/userauthorization.php:105
+#. TRANS: Page title.
+#: actions/userauthorization.php:109
 msgid "Authorize subscription"
 msgstr "Autorizar a subscrición"
 
-#: actions/userauthorization.php:110
+#. TRANS: Page notice on "Auhtorize subscription" page.
+#: actions/userauthorization.php:115
 #, fuzzy
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
 "user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
-"click “Reject”."
+"click \"Reject\"."
 msgstr ""
 "Verifique estes detalles para certificar que quere subscribirse ás notas "
 "deste usuario. Se non pediu a subscrición ás notas de alguén, prema en "
 "\"Rexeitar\"."
 
-#. TRANS: Menu item for site administration
-#: actions/userauthorization.php:196 actions/version.php:167
-#: lib/adminpanelaction.php:403
-msgid "License"
-msgstr "Licenza"
-
-#: actions/userauthorization.php:217
+#. TRANS: Button text on Authorise Subscription page.
+#: actions/userauthorization.php:200
 #, fuzzy
+msgctxt "BUTTON"
 msgid "Accept"
 msgstr "Aceptar"
 
-#: actions/userauthorization.php:218 lib/subscribeform.php:115
-#: lib/subscribeform.php:139
-msgid "Subscribe to this user"
+#. TRANS: Title for button on Authorise Subscription page.
+#: actions/userauthorization.php:202
+#, fuzzy
+msgid "Subscribe to this user."
 msgstr "Subscribirse a este usuario"
 
-#: actions/userauthorization.php:219
+#. TRANS: Button text on Authorise Subscription page.
+#: actions/userauthorization.php:204
 #, fuzzy
+msgctxt "BUTTON"
 msgid "Reject"
 msgstr "Rexeitar"
 
-#: actions/userauthorization.php:220
+#. TRANS: Title for button on Authorise Subscription page.
+#: actions/userauthorization.php:206
 #, fuzzy
-msgid "Reject this subscription"
+msgid "Reject this subscription."
 msgstr "Rexeitar esta subscrición"
 
-#: actions/userauthorization.php:232
+#. TRANS: Client error displayed for an empty authorisation request.
+#: actions/userauthorization.php:219
 msgid "No authorization request!"
 msgstr "Non se solicitou a autorización!"
 
-#: actions/userauthorization.php:254
+#. TRANS: Accept message header from Authorise subscription page.
+#: actions/userauthorization.php:242
 msgid "Subscription authorized"
 msgstr "Autorizouse a subscrición"
 
-#: actions/userauthorization.php:256
+#: actions/userauthorization.php:245
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to authorize the "
@@ -6634,11 +6762,12 @@ msgstr ""
 "ás instrucións do sitio para saber máis sobre como autorizar a subscrición. "
 "O pase da súa subscrición é:"
 
-#: actions/userauthorization.php:266
+#. TRANS: Reject message header from Authorise subscription page.
+#: actions/userauthorization.php:256
 msgid "Subscription rejected"
 msgstr "Rexeitouse a subscrición"
 
-#: actions/userauthorization.php:268
+#: actions/userauthorization.php:259
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to fully reject the "
@@ -6648,48 +6777,73 @@ msgstr ""
 "ás instrucións do sitio para obter máis información sobre como rexeitar "
 "completamente a subscrición."
 
-#: actions/userauthorization.php:303
+#. TRANS: Exception thrown when no valid user is found for an authorisation request.
+#. TRANS: %s is a listener URI.
+#: actions/userauthorization.php:296
 #, fuzzy, php-format
-msgid "Listener URI ‘%s’ not found here."
+msgid "Listener URI \"%s\" not found here."
 msgstr "Non se atopou o URI do seguidor, \"%s\", aquí."
 
-#: actions/userauthorization.php:308
+#. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
+#. TRANS: %s is a listenee URI.
+#: actions/userauthorization.php:303
 #, fuzzy, php-format
-msgid "Listenee URI ‘%s’ is too long."
+msgid "Listenee URI \"%s\" is too long."
 msgstr "O URI do seguidor, \"%s\", é longo de máis."
 
-#: actions/userauthorization.php:314
+#. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
+#. TRANS: %s is a listenee URI.
+#: actions/userauthorization.php:311
 #, fuzzy, php-format
-msgid "Listenee URI ‘%s’ is a local user."
+msgid "Listenee URI \"%s\" is a local user."
 msgstr "O URI do seguidor, \"%s\", é dun usuario local."
 
+#. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
+#. TRANS: %s is a profile URL.
 #: actions/userauthorization.php:329
 #, fuzzy, php-format
-msgid "Profile URL ‘%s’ is for a local user."
+msgid "Profile URL \"%s\" is for a local user."
 msgstr "O URL do perfil, \"%s\", pertence a un usuario local."
 
-#: actions/userauthorization.php:345
+#. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
+#. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
+#: actions/userauthorization.php:339
 #, fuzzy, php-format
-msgid "Avatar URL ‘%s’ is not valid."
+msgid ""
+"Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
+"\"."
+msgstr ""
+"A licenza \"%1$s\" das transmisións da persoa seguida non é compatible coa "
+"licenza deste sitio: \"%2$s\"."
+
+#. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
+#. TRANS: %s is an avatar URL.
+#: actions/userauthorization.php:349
+#, fuzzy, php-format
+msgid "Avatar URL \"%s\" is not valid."
 msgstr "O URL do avatar, \"%s\", é incorrecto."
 
-#: actions/userauthorization.php:350
+#. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
+#. TRANS: %s is an avatar URL.
+#: actions/userauthorization.php:356
 #, fuzzy, php-format
-msgid "Can’t read avatar URL ‘%s’."
+msgid "Cannot read avatar URL \"%s\"."
 msgstr "Non se puido ler o URL do avatar, \"%s\"."
 
-#: actions/userauthorization.php:355
+#. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
+#. TRANS: %s is an avatar URL.
+#: actions/userauthorization.php:363
 #, fuzzy, php-format
-msgid "Wrong image type for avatar URL ‘%s’."
+msgid "Wrong image type for avatar URL \"%s\"."
 msgstr "O tipo de imaxe do URL do avatar, \"%s\", é incorrecto."
 
 #. TRANS: Page title for profile design page.
-#: actions/userdesignsettings.php:74 lib/designsettings.php:63
+#: actions/userdesignsettings.php:74 lib/designsettings.php:61
 msgid "Profile design"
 msgstr "Deseño do perfil"
 
 #. TRANS: Instructions for profile design page.
-#: actions/userdesignsettings.php:84 lib/designsettings.php:74
+#: actions/userdesignsettings.php:84 lib/designsettings.php:72
 msgid ""
 "Customize the way your profile looks with a background image and a colour "
 "palette of your choice."
@@ -6697,10 +6851,28 @@ msgstr ""
 "Personalice a aparencia do seu perfil cunha imaxe de fondo e unha paleta de "
 "cores escollida por vostede."
 
-#: actions/userdesignsettings.php:272
+#: actions/userdesignsettings.php:289
 msgid "Enjoy your hotdog!"
 msgstr "Bo proveito!"
 
+#: actions/userdesignsettings.php:325
+#, fuzzy
+msgid "Design settings"
+msgstr "Gardar a configuración do sitio"
+
+#: actions/userdesignsettings.php:340
+msgid "View profile designs"
+msgstr "Deseños visuais do perfil"
+
+#: actions/userdesignsettings.php:341
+msgid "Show or hide profile designs."
+msgstr "Amosar ou agochar os deseños do perfil."
+
+#: actions/userdesignsettings.php:348
+#, fuzzy
+msgid "Background file"
+msgstr "Fondo"
+
 #. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number.
 #: actions/usergroups.php:66
 #, php-format
@@ -6750,6 +6922,11 @@ msgstr ""
 msgid "Contributors"
 msgstr "Colaboradores"
 
+#. TRANS: Menu item for site administration
+#: actions/version.php:167 lib/adminpanelaction.php:403
+msgid "License"
+msgstr "Licenza"
+
 #: actions/version.php:170
 msgid ""
 "StatusNet is free software: you can redistribute it and/or modify it under "
@@ -6783,12 +6960,13 @@ msgstr ""
 "Debeu recibir unha copia da Licenza Pública Xeral Affero de GNU xunto co "
 "programa. En caso contrario, vexa %s."
 
-#: actions/version.php:191
-msgid "Plugins"
-msgstr "Complementos"
+#. TRANS: Form input field label for application name.
+#: actions/version.php:197 lib/applicationeditform.php:190
+msgid "Name"
+msgstr "Nome"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:901
+#: actions/version.php:198 lib/action.php:885
 msgid "Version"
 msgstr "Versión"
 
@@ -6796,6 +6974,12 @@ msgstr "Versión"
 msgid "Author(s)"
 msgstr "Autores"
 
+#. TRANS: Form input field label.
+#: actions/version.php:200 lib/applicationeditform.php:208
+#: lib/groupeditform.php:168
+msgid "Description"
+msgstr "Descrición"
+
 #. TRANS: Activity title when marking a notice as favorite.
 #: classes/Fave.php:164
 msgid "Favor"
@@ -6916,7 +7100,7 @@ msgid "Could not create login token for %s"
 msgstr "Non se puido crear un pase de sesión para %s"
 
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
-#: classes/Memcached_DataObject.php:542
+#: classes/Memcached_DataObject.php:556
 msgid "No database name or DSN found anywhere."
 msgstr "Non se atopou por ningures o nome da base de datos ou DSN."
 
@@ -7093,18 +7277,18 @@ msgstr "%1$s xa segue a %2$s."
 
 #. TRANS: Notice given on user registration.
 #. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:395
+#: classes/User.php:390
 #, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr "Benvido a %1$s, @%2$s!"
 
 #. TRANS: Server exception.
-#: classes/User.php:918
+#: classes/User.php:923
 msgid "No single user defined for single-user mode."
 msgstr "Non se estableceu ningún usuario único para o modo de usuario único."
 
 #. TRANS: Server exception.
-#: classes/User.php:922
+#: classes/User.php:927
 msgid "Single-user mode code called when not enabled."
 msgstr ""
 
@@ -7149,41 +7333,6 @@ msgstr ""
 msgid "No AtomPub API service for %s."
 msgstr ""
 
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:104
-msgid "Change your profile settings"
-msgstr "Cambie a configuración do seu perfil"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:111
-msgid "Upload an avatar"
-msgstr "Cargue un avatar"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:118
-msgid "Change your password"
-msgstr "Cambie o seu contrasinal"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:125
-msgid "Change email handling"
-msgstr "Cambie a xestión do correo electrónico"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:132
-msgid "Design your profile"
-msgstr "Deseñe o seu perfil"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:139
-msgid "Other options"
-msgstr "Outras opcións"
-
-#. TRANS: Link description in user account settings menu.
-#: lib/accountsettingsaction.php:141
-msgid "Other"
-msgstr "Outros"
-
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
 #: lib/action.php:161
 #, php-format
@@ -7201,206 +7350,128 @@ msgctxt "TOOLTIP"
 msgid "Show more"
 msgstr "Mostrar máis"
 
-#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:544
-msgid "Primary site navigation"
-msgstr "Navegación principal do sitio"
+#. TRANS: Inline reply form submit button: submits a reply comment.
+#: lib/action.php:328
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Comment"
+msgstr "Contido"
 
-#. TRANS: Tooltip for main menu option "Personal".
-#: lib/action.php:550
-msgctxt "TOOLTIP"
-msgid "Personal profile and friends timeline"
-msgstr "Liña do tempo do perfil persoal e os amigos"
+#. TRANS: Placeholder text for inline reply form. Clicking in this box will turn it into a mini notice form.
+#: lib/action.php:331
+msgid "Add a comment..."
+msgstr ""
 
-#. TRANS: Main menu option when logged in for access to personal profile and friends timeline.
-#. TRANS: Personal group navigation menu option when logged in for viewing timeline of self and friends.
-#: lib/action.php:553 lib/personalgroupnav.php:100
-msgctxt "MENU"
-msgid "Personal"
-msgstr "Persoal"
+#: lib/action.php:559 lib/personalgroupnav.php:99
+#, fuzzy
+msgid "Home"
+msgstr "Páxina persoal"
 
-#. TRANS: Tooltip for main menu option "Account".
-#: lib/action.php:555
-msgctxt "TOOLTIP"
-msgid "Change your email, avatar, password, profile"
-msgstr "Cambie o seu correo electrónico, avatar, contrasinal ou perfil"
-
-#. TRANS: Main menu option when logged in for access to user settings.
-#: lib/action.php:558
-msgid "Account"
-msgstr "Conta"
-
-#. TRANS: Tooltip for main menu option "Services".
 #: lib/action.php:560
-msgctxt "TOOLTIP"
-msgid "Connect to services"
-msgstr "Conectarse aos servizos"
+#, fuzzy
+msgid "Friends timeline"
+msgstr "Liña do tempo de %s"
 
-#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services.
-#: lib/action.php:563
-msgid "Connect"
-msgstr "Conectarse"
-
-#. TRANS: Tooltip for menu option "Admin".
 #: lib/action.php:566
-msgctxt "TOOLTIP"
-msgid "Change site configuration"
-msgstr "Cambiar a configuración do sitio"
+#, fuzzy
+msgid "Your profile"
+msgstr "Perfil do grupo"
 
-#. TRANS: Main menu option when logged in and site admin for access to site configuration.
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/action.php:569 lib/groupnav.php:117
-msgctxt "MENU"
-msgid "Admin"
-msgstr "Administrador"
+#: lib/action.php:570 lib/action.php:593 lib/publicgroupnav.php:78
+msgid "Public"
+msgstr "Públicas"
 
-#. TRANS: Tooltip for main menu option "Invite".
-#: lib/action.php:573
-#, php-format
-msgctxt "TOOLTIP"
-msgid "Invite friends and colleagues to join you on %s"
-msgstr "Convide a amigos e compañeiros a unírselle en %s"
+#: lib/action.php:571 lib/action.php:594
+#, fuzzy
+msgid "Everyone on this site"
+msgstr "Atopar xente neste sitio"
+
+#: lib/action.php:575
+#, fuzzy
+msgid "Settings"
+msgstr "Configuración dos SMS"
 
-#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users.
 #: lib/action.php:576
-msgctxt "MENU"
-msgid "Invite"
-msgstr "Convidar"
+#, fuzzy
+msgid "Change your personal settings"
+msgstr "Cambie a configuración do seu perfil"
 
-#. TRANS: Tooltip for main menu option "Logout"
 #: lib/action.php:582
-msgctxt "TOOLTIP"
-msgid "Logout from the site"
-msgstr "Saír ao anonimato"
+#, fuzzy
+msgid "Site configuration"
+msgstr "Configuración do usuario"
 
-#. TRANS: Main menu option when logged in to log out the current user.
-#: lib/action.php:585
-msgctxt "MENU"
+#: lib/action.php:587
+#, fuzzy
 msgid "Logout"
 msgstr "Saír"
 
-#. TRANS: Tooltip for main menu option "Register".
-#: lib/action.php:590
-msgctxt "TOOLTIP"
-msgid "Create an account"
-msgstr "Crear unha conta"
+#: lib/action.php:588
+#, fuzzy
+msgid "Logout from the site"
+msgstr "Saír ao anonimato"
 
-#. TRANS: Main menu option when not logged in to register a new account.
-#. TRANS: Menu item for registering with the StatusNet site.
-#: lib/action.php:593 lib/logingroupnav.php:85
-msgctxt "MENU"
-msgid "Register"
-msgstr "Rexistrarse"
-
-#. TRANS: Tooltip for main menu option "Login".
-#: lib/action.php:596
-msgctxt "TOOLTIP"
+#: lib/action.php:599
+#, fuzzy
 msgid "Login to the site"
 msgstr "Identificarse no sitio"
 
-#. TRANS: Main menu option when not logged in to log in.
-#. TRANS: Menu item for logging in to the StatusNet site.
-#: lib/action.php:599 lib/logingroupnav.php:77
-msgctxt "MENU"
-msgid "Login"
-msgstr "Identificarse"
-
-#. TRANS: Tooltip for main menu option "Help".
-#: lib/action.php:602
-msgctxt "TOOLTIP"
-msgid "Help me!"
-msgstr "Axuda!"
-
-#. TRANS: Main menu option for help on the StatusNet site.
-#: lib/action.php:605
-msgctxt "MENU"
-msgid "Help"
-msgstr "Axuda"
-
-#. TRANS: Tooltip for main menu option "Search".
-#: lib/action.php:608
-msgctxt "TOOLTIP"
-msgid "Search for people or text"
-msgstr "Buscar persoas ou palabras"
-
-#. TRANS: Main menu option when logged in or when the StatusNet instance is not private.
-#: lib/action.php:611
-msgctxt "MENU"
+#: lib/action.php:606
+#, fuzzy
 msgid "Search"
 msgstr "Buscar"
 
-#. TRANS: DT element for site notice. String is hidden in default CSS.
-#. TRANS: Menu item for site administration
-#: lib/action.php:633 lib/adminpanelaction.php:387
-msgid "Site notice"
-msgstr "Nota do sitio"
-
-#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:700
-msgid "Local views"
-msgstr "Vistas locais"
-
-#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:770
-msgid "Page notice"
-msgstr "Nota da páxina"
-
-#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:874
-msgid "Secondary site navigation"
-msgstr "Navegación secundaria do sitio"
+#: lib/action.php:607
+#, fuzzy
+msgid "Search the site"
+msgstr "Buscar no sitio"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:880
+#: lib/action.php:864
 msgid "Help"
 msgstr "Axuda"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:883
+#: lib/action.php:867
 msgid "About"
 msgstr "Acerca de"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:886
+#: lib/action.php:870
 msgid "FAQ"
 msgstr "Preguntas máis frecuentes"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:891
+#: lib/action.php:875
 msgid "TOS"
 msgstr "Condicións do servicio"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:895
+#: lib/action.php:879
 msgid "Privacy"
 msgstr "Protección de datos"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:898
+#: lib/action.php:882
 msgid "Source"
 msgstr "Código fonte"
 
 #. TRANS: Secondary navigation menu option leading to e-mail contact information on the
 #. TRANS: StatusNet site, where to report bugs, ...
-#: lib/action.php:905
+#: lib/action.php:889
 msgid "Contact"
 msgstr "Contacto"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:908
+#: lib/action.php:892
 msgid "Badge"
 msgstr "Insignia"
 
-#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:937
-msgid "StatusNet software license"
-msgstr "Licenza do software StatusNet"
-
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:944
+#: lib/action.php:921
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7410,7 +7481,7 @@ msgstr ""
 "site.broughtby%%](%%site.broughtbyurl%%)."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:947
+#: lib/action.php:924
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** é un servizo de mensaxes de blogue curtas."
@@ -7419,7 +7490,7 @@ msgstr "**%%site.name%%** é un servizo de mensaxes de blogue curtas."
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:954
+#: lib/action.php:931
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7430,21 +7501,16 @@ msgstr ""
 "(http://status.net/), dispoñible baixo a [Licenza Pública Xeral Affero de "
 "GNU](http://www.fsf.org/licensing/licenses/agpl-3.0.html) (en inglés)."
 
-#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:970
-msgid "Site content license"
-msgstr "Licenza dos contidos do sitio"
-
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:977
+#: lib/action.php:949
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr "O contido e os datos de %1$s son privados e confidenciais."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:984
+#: lib/action.php:956
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
@@ -7452,7 +7518,7 @@ msgstr ""
 "todos os dereitos."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:988
+#: lib/action.php:960
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 "Os contidos e datos son propiedade intelectual dos colaboradores. Quedan "
@@ -7460,26 +7526,21 @@ msgstr ""
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:1020
+#: lib/action.php:992
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
 "Todos os contidos e datos de %1$s están dispoñibles baixo a licenza %2$s."
 
-#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1356
-msgid "Pagination"
-msgstr "Paxinación"
-
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1367
+#: lib/action.php:1335
 msgid "After"
 msgstr "Posteriores"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1377
+#: lib/action.php:1345
 msgid "Before"
 msgstr "Anteriores"
 
@@ -7634,7 +7695,7 @@ msgid "User configuration"
 msgstr "Configuración do usuario"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:122
+#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:110
 msgid "User"
 msgstr "Usuario"
 
@@ -7658,6 +7719,11 @@ msgstr "Configuración das sesións"
 msgid "Edit site notice"
 msgstr "Modificar a nota do sitio"
 
+#. TRANS: Menu item for site administration
+#: lib/adminpanelaction.php:387
+msgid "Site notice"
+msgstr "Nota do sitio"
+
 #. TRANS: Menu item title/tooltip
 #: lib/adminpanelaction.php:393
 msgid "Snapshots configuration"
@@ -7668,6 +7734,12 @@ msgstr "Configuración das instantáneas"
 msgid "Set site license"
 msgstr "Definir a licenza do sitio"
 
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:409
+#, fuzzy
+msgid "Plugins configuration"
+msgstr "Configuración das rutas"
+
 #. TRANS: Client error 401.
 #: lib/apiauth.php:111
 msgid "API resource requires read-write access, but you only have read access."
@@ -7680,19 +7752,23 @@ msgstr ""
 msgid "No application for that consumer key."
 msgstr "Non hai ningunha aplicación para esa clave."
 
+#: lib/apiauth.php:202 lib/apiauth.php:284
+msgid "Not allowed to use API."
+msgstr ""
+
 #. TRANS: OAuth exception given when an incorrect access token was given for a user.
-#: lib/apiauth.php:219
+#: lib/apiauth.php:225
 msgid "Bad access token."
 msgstr "Pase de acceso incorrecto."
 
 #. TRANS: OAuth exception given when no user was found for a given token (no token was found).
-#: lib/apiauth.php:224
+#: lib/apiauth.php:230
 msgid "No user for that token."
 msgstr "Non hai ningún usuario para ese pase."
 
 #. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel".
 #. TRANS: Client error thrown when authentication fails.
-#: lib/apiauth.php:266 lib/apiauth.php:293
+#: lib/apiauth.php:272 lib/apiauth.php:302
 msgid "Could not authenticate you."
 msgstr "Non puidemos autenticalo."
 
@@ -7743,6 +7819,11 @@ msgstr "Intentouse revogar un pase descoñecido."
 msgid "Failed to delete revoked token."
 msgstr "Erro ao borrar o pase revogado."
 
+#. TRANS: Form input field label for application icon.
+#: lib/applicationeditform.php:177
+msgid "Icon"
+msgstr "Icona"
+
 #. TRANS: Form guide.
 #: lib/applicationeditform.php:182
 msgid "Icon for this application"
@@ -7777,6 +7858,11 @@ msgstr "URL de orixe"
 msgid "Organization responsible for this application"
 msgstr "Organización responsable desta aplicación"
 
+#. TRANS: Form input field label.
+#: lib/applicationeditform.php:227
+msgid "Organization"
+msgstr "Organización"
+
 #. TRANS: Form input field instructions.
 #: lib/applicationeditform.php:234
 msgid "URL for the homepage of the organization"
@@ -7867,16 +7953,6 @@ msgstr "o elemento \"autor\" debe conter un nome."
 msgid "Do not use this method!"
 msgstr "Non borrar esta nota"
 
-#. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:293
-msgid "Author"
-msgstr "Autor"
-
-#. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:307
-msgid "Provider"
-msgstr "Provedor"
-
 #. TRANS: Title.
 #: lib/attachmentnoticesection.php:67
 msgid "Notices where this attachment appears"
@@ -7904,24 +7980,29 @@ msgstr "Non se permite cambiar o contrasinal"
 msgid "Block"
 msgstr "Excluír"
 
+#. TRANS: Description of the form to block a user.
+#: lib/blockform.php:79
+msgid "Block this user"
+msgstr "Bloquear este usuario"
+
 #. TRANS: Title for command results.
-#: lib/channel.php:160 lib/channel.php:181
+#: lib/channel.php:104 lib/channel.php:125
 msgid "Command results"
 msgstr "Resultados da orde"
 
 #. TRANS: Title for command results.
-#: lib/channel.php:194
+#: lib/channel.php:138
 #, fuzzy
 msgid "AJAX error"
 msgstr "Houbo un erro de AJAX"
 
 #. TRANS: E-mail subject when a command has completed.
-#: lib/channel.php:233 lib/mailhandler.php:143
+#: lib/channel.php:177 lib/mailhandler.php:143
 msgid "Command complete"
 msgstr "Completouse a orde"
 
 #. TRANS: E-mail subject when a command has failed.
-#: lib/channel.php:244
+#: lib/channel.php:188
 msgid "Command failed"
 msgstr "A orde fallou"
 
@@ -8024,7 +8105,7 @@ msgstr "Nome completo: %s"
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a location.
-#: lib/command.php:446 lib/mail.php:270
+#: lib/command.php:446 lib/mail.php:275
 #, php-format
 msgid "Location: %s"
 msgstr "Localidade: %s"
@@ -8032,7 +8113,7 @@ msgstr "Localidade: %s"
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a homepage.
-#: lib/command.php:450 lib/mail.php:274
+#: lib/command.php:450 lib/mail.php:279
 #, php-format
 msgid "Homepage: %s"
 msgstr "Sitio web: %s"
@@ -8308,115 +8389,105 @@ msgstr ""
 "tracking - aínda non se integrou\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:162
+#: lib/common.php:36
 #, fuzzy
 msgid "No configuration file found."
 msgstr "Non se atopou ningún ficheiro de configuración. "
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:165
+#: lib/common.php:39
 #, fuzzy
 msgid "I looked for configuration files in the following places:"
 msgstr "Buscáronse ficheiros de configuración nos seguintes lugares: "
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:168
+#: lib/common.php:42
 msgid "You may wish to run the installer to fix this."
 msgstr "Pode que queira executar o instalador para arranxalo."
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:172
+#: lib/common.php:46
 msgid "Go to the installer."
 msgstr "Ir ao instalador."
 
-#. TRANS: Menu item for Instant Messaging settings.
-#: lib/connectsettingsaction.php:106
-#, fuzzy
-msgctxt "MENU"
-msgid "IM"
-msgstr "MI"
-
-#. TRANS: Tooltip for Instant Messaging menu item.
-#: lib/connectsettingsaction.php:108
-msgid "Updates by instant messenger (IM)"
-msgstr "Actualizacións por mensaxería instantánea (MI)"
-
-#. TRANS: Menu item for Short Message Service settings.
-#: lib/connectsettingsaction.php:113
-#, fuzzy
-msgctxt "MENU"
-msgid "SMS"
-msgstr "SMS"
-
-#. TRANS: Tooltip for Short Message Service menu item.
-#: lib/connectsettingsaction.php:115
-msgid "Updates by SMS"
-msgstr "Actualizacións por SMS"
-
-#. TRANS: Menu item for OuAth connection settings.
-#: lib/connectsettingsaction.php:120
-#, fuzzy
-msgctxt "MENU"
-msgid "Connections"
-msgstr "Conexións"
-
-#. TRANS: Tooltip for connected applications (Connections through OAuth) menu item.
-#: lib/connectsettingsaction.php:122
-msgid "Authorized connected applications"
-msgstr "Aplicacións conectadas autorizadas"
-
 #: lib/dberroraction.php:59
 msgid "Database error"
 msgstr "Houbo un erro na base de datos"
 
+#. TRANS: Description of form for deleting a user.
+#: lib/deleteuserform.php:75
+msgid "Delete this user"
+msgstr "Borrar o usuario"
+
+#: lib/designform.php:114
+#, fuzzy
+msgid "Change design"
+msgstr "Gardar o deseño"
+
+#. TRANS: Fieldset legend on profile design page to change profile page colours.
+#: lib/designform.php:131
+msgid "Change colours"
+msgstr "Cambiar as cores"
+
+#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
+#: lib/designform.php:138
+msgid "Use defaults"
+msgstr "Utilizar os valores por defecto"
+
+#. TRANS: Title for button on profile design page to reset all colour settings to default.
+#: lib/designform.php:140
+msgid "Restore default designs"
+msgstr "Restaurar o deseño por defecto"
+
+#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
+#: lib/designform.php:148
+msgid "Reset back to default"
+msgstr "Volver ao deseño por defecto"
+
 #. TRANS: Label in form on profile design page.
 #. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
-#: lib/designsettings.php:108
+#: lib/designform.php:158
 msgid "Upload file"
 msgstr "Cargar un ficheiro"
 
 #. TRANS: Instructions for form on profile design page.
-#: lib/designsettings.php:113
+#: lib/designform.php:163
+#, fuzzy
 msgid ""
-"You can upload your personal background image. The maximum file size is 2MB."
+"You can upload your personal background image. The maximum file size is 2Mb."
 msgstr ""
 "Pode cargar a súa imaxe de fondo persoal. O ficheiro non pode ocupar máis de "
 "2MB."
 
 #. TRANS: Radio button on profile design page that will enable use of the uploaded profile image.
-#: lib/designsettings.php:139
+#: lib/designform.php:194
 #, fuzzy
 msgctxt "RADIO"
 msgid "On"
 msgstr "Activado"
 
 #. TRANS: Radio button on profile design page that will disable use of the uploaded profile image.
-#: lib/designsettings.php:156
+#: lib/designform.php:211
 #, fuzzy
 msgctxt "RADIO"
 msgid "Off"
 msgstr "Desactivado"
 
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: lib/designsettings.php:175
-msgid "Change colours"
-msgstr "Cambiar as cores"
-
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: lib/designsettings.php:257
-msgid "Use defaults"
-msgstr "Utilizar os valores por defecto"
+#. TRANS: Title for button on profile design page to save settings.
+#: lib/designform.php:322
+msgid "Save design"
+msgstr "Gardar o deseño"
 
 #. TRANS: Error message displayed if design settings could not be saved.
 #. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
-#: lib/designsettings.php:405 lib/designsettings.php:427
+#: lib/designsettings.php:216 lib/designsettings.php:238
 msgid "Couldn't update your design."
 msgstr "Non se puido actualizar o seu deseño."
 
 #. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
-#: lib/designsettings.php:433
+#: lib/designsettings.php:244
 msgid "Design defaults restored."
 msgstr "Restableceuse o deseño por defecto."
 
@@ -8486,27 +8557,23 @@ msgstr ""
 msgid "Feeds"
 msgstr "Fontes de novas"
 
-#: lib/galleryaction.php:121
-msgid "Filter tags"
-msgstr "Filtrar as etiquetas"
-
-#: lib/galleryaction.php:131
+#: lib/galleryaction.php:128
 msgid "All"
 msgstr "Todas"
 
-#: lib/galleryaction.php:139
+#: lib/galleryaction.php:136
 msgid "Select tag to filter"
 msgstr "Escolla unha etiqueta a filtrar"
 
-#: lib/galleryaction.php:140
+#: lib/galleryaction.php:137
 msgid "Tag"
 msgstr "Etiqueta"
 
-#: lib/galleryaction.php:141
+#: lib/galleryaction.php:138
 msgid "Choose a tag to narrow list"
 msgstr "Escolla unha etiqueta para reducir a lista"
 
-#: lib/galleryaction.php:143
+#: lib/galleryaction.php:140
 msgid "Go"
 msgstr "Continuar"
 
@@ -8602,6 +8669,12 @@ msgctxt "TOOLTIP"
 msgid "%s blocked users"
 msgstr "Usuarios bloqueados en %s"
 
+#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
+#: lib/groupnav.php:117
+msgctxt "MENU"
+msgid "Admin"
+msgstr "Administrador"
+
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
 #: lib/groupnav.php:120
@@ -8711,39 +8784,62 @@ msgid_plural "%dB"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/jabber.php:387
+#: lib/implugin.php:262
 #, php-format
-msgid "[%s]"
-msgstr "[%s]"
+msgid ""
+"User \"%s\" on %s has said that your %s screenname belongs to them. If "
+"that's true, you can confirm by clicking on this URL: %s . (If you cannot "
+"click it, copy-and-paste it into the address bar of your browser). If that "
+"user isn't you, or if you didn't request this confirmation, just ignore this "
+"message."
+msgstr ""
 
-#: lib/jabber.php:567
+#: lib/implugin.php:349
 #, php-format
 msgid "Unknown inbox source %d."
 msgstr "Non se coñece a fonte %d da caixa de entrada."
 
+#: lib/implugin.php:485
+#, fuzzy, php-format
+msgid "Message too long - maximum is %1$d characters, you sent %2$d."
+msgstr ""
+"A mensaxe é longa de máis, o límite de caracteres é de %1$d, e enviou %2$d."
+
 #: lib/leaveform.php:114
 msgid "Leave"
 msgstr "Deixar"
 
+#. TRANS: Menu item for logging in to the StatusNet site.
+#: lib/logingroupnav.php:77
+msgctxt "MENU"
+msgid "Login"
+msgstr "Identificarse"
+
 #. TRANS: Title for menu item for logging in to the StatusNet site.
 #: lib/logingroupnav.php:79
 msgid "Login with a username and password"
 msgstr "Identificarse cun nome de usuario e contrasinal"
 
+#. TRANS: Menu item for registering with the StatusNet site.
+#: lib/logingroupnav.php:85
+msgctxt "MENU"
+msgid "Register"
+msgstr "Rexistrarse"
+
 #. TRANS: Title for menu item for registering with the StatusNet site.
 #: lib/logingroupnav.php:87
 msgid "Sign up for a new account"
 msgstr "Rexistrar unha conta nova"
 
 #. TRANS: Subject for address confirmation email.
-#: lib/mail.php:168
+#: lib/mail.php:172
 msgid "Email address confirmation"
 msgstr "Confirmación do enderezo de correo electrónico"
 
 #. TRANS: Body for address confirmation email.
 #. TRANS: %1$s is the addressed user's nickname, %2$s is the StatusNet sitename,
 #. TRANS: %3$s is the URL to confirm at.
-#: lib/mail.php:173
+#: lib/mail.php:177
 #, fuzzy, php-format
 msgid ""
 "Hey, %1$s.\n"
@@ -8774,14 +8870,14 @@ msgstr ""
 
 #. TRANS: Subject of new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
-#: lib/mail.php:238
+#: lib/mail.php:243
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "Agora %1$s segue as súas notas en %2$s."
 
 #. TRANS: This is a paragraph in a new-subscriber e-mail.
 #. TRANS: %s is a URL where the subscriber can be reported as abusive.
-#: lib/mail.php:245
+#: lib/mail.php:250
 #, php-format
 msgid ""
 "If you believe this account is being used abusively, you can block them from "
@@ -8795,7 +8891,7 @@ msgstr ""
 #. TRANS: %3$s is the subscriber's profile URL, %4$s is the subscriber's location (or empty)
 #. TRANS: %5$s is the subscriber's homepage URL (or empty), %6%s is the subscriber's bio (or empty)
 #. TRANS: %7$s is a link to the addressed user's e-mail settings.
-#: lib/mail.php:255
+#: lib/mail.php:260
 #, fuzzy, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -8823,14 +8919,14 @@ msgstr ""
 
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is biographical information.
-#: lib/mail.php:278
+#: lib/mail.php:283
 #, php-format
 msgid "Bio: %s"
 msgstr "Biografía: %s"
 
 #. TRANS: Subject of notification mail for new posting email address.
 #. TRANS: %s is the StatusNet sitename.
-#: lib/mail.php:307
+#: lib/mail.php:312
 #, php-format
 msgid "New email address for posting to %s"
 msgstr "Novo enderezo de correo electrónico para publicar en %s"
@@ -8838,7 +8934,7 @@ msgstr "Novo enderezo de correo electrónico para publicar en %s"
 #. TRANS: Body of notification mail for new posting email address.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is the e-mail address to send
 #. TRANS: to to post by e-mail, %3$s is a URL to more instructions.
-#: lib/mail.php:313
+#: lib/mail.php:318
 #, fuzzy, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -8861,19 +8957,19 @@ msgstr ""
 
 #. TRANS: Subject line for SMS-by-email notification messages.
 #. TRANS: %s is the posting user's nickname.
-#: lib/mail.php:434
+#: lib/mail.php:439
 #, php-format
 msgid "%s status"
 msgstr "Estado de %s"
 
 #. TRANS: Subject line for SMS-by-email address confirmation message.
-#: lib/mail.php:460
+#: lib/mail.php:465
 msgid "SMS confirmation"
 msgstr "Confirmación dos SMS"
 
 #. TRANS: Main body heading for SMS-by-email address confirmation message.
 #. TRANS: %s is the addressed user's nickname.
-#: lib/mail.php:464
+#: lib/mail.php:469
 #, php-format
 msgid "%s: confirm you own this phone number with this code:"
 msgstr ""
@@ -8881,7 +8977,7 @@ msgstr ""
 
 #. TRANS: Subject for 'nudge' notification email.
 #. TRANS: %s is the nudging user.
-#: lib/mail.php:485
+#: lib/mail.php:490
 #, fuzzy, php-format
 msgid "You have been nudged by %s"
 msgstr "%s fíxolle un aceno"
@@ -8889,7 +8985,7 @@ msgstr "%s fíxolle un aceno"
 #. TRANS: Body for 'nudge' notification email.
 #. TRANS: %1$s is the nuding user's long name, $2$s is the nudging user's nickname,
 #. TRANS: %3$s is a URL to post notices at, %4$s is the StatusNet sitename.
-#: lib/mail.php:492
+#: lib/mail.php:497
 #, php-format
 msgid ""
 "%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -8918,7 +9014,7 @@ msgstr ""
 
 #. TRANS: Subject for direct-message notification email.
 #. TRANS: %s is the sending user's nickname.
-#: lib/mail.php:539
+#: lib/mail.php:544
 #, php-format
 msgid "New private message from %s"
 msgstr "Nova mensaxe privada de %s"
@@ -8927,7 +9023,7 @@ msgstr "Nova mensaxe privada de %s"
 #. TRANS: %1$s is the sending user's long name, %2$s is the sending user's nickname,
 #. TRANS: %3$s is the message content, %4$s a URL to the message,
 #. TRANS: %5$s is the StatusNet sitename.
-#: lib/mail.php:547
+#: lib/mail.php:552
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -8962,7 +9058,7 @@ msgstr ""
 
 #. TRANS: Subject for favorite notification e-mail.
 #. TRANS: %1$s is the adding user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:599
+#: lib/mail.php:604
 #, fuzzy, php-format
 msgid "%1$s (@%2$s) added your notice as a favorite"
 msgstr "%s (@%s) marcou a súa nota como favorita"
@@ -8972,7 +9068,7 @@ msgstr "%s (@%s) marcou a súa nota como favorita"
 #. TRANS: %3$s is a URL to the faved notice, %4$s is the faved notice text,
 #. TRANS: %5$s is a URL to all faves of the adding user, %6$s is the StatusNet sitename,
 #. TRANS: %7$s is the adding user's nickname.
-#: lib/mail.php:606
+#: lib/mail.php:611
 #, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -9011,7 +9107,7 @@ msgstr ""
 "%6$s\n"
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:664
+#: lib/mail.php:669
 #, php-format
 msgid ""
 "The full conversation can be read here:\n"
@@ -9024,7 +9120,7 @@ msgstr ""
 
 #. TRANS: E-mail subject for notice notification.
 #. TRANS: %1$s is the sending user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:672
+#: lib/mail.php:677
 #, fuzzy, php-format
 msgid "%1$s (@%2$s) sent a notice to your attention"
 msgstr "%s (@%s) enviou unha nota á súa atención"
@@ -9035,7 +9131,7 @@ msgstr "%s (@%s) enviou unha nota á súa atención"
 #. TRANS: %5$s is a URL to the full conversion if it exists (otherwise empty),
 #. TRANS: %6$s is a URL to reply to the notice, %7$s is a URL to all @-replied for the addressed user,
 #. TRANS: %8$s is a URL to the addressed user's e-mail settings, %9$s is the sender's nickname.
-#: lib/mail.php:680
+#: lib/mail.php:685
 #, php-format
 msgid ""
 "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -9180,11 +9276,7 @@ msgstr "Non está subscrito!"
 msgid "To"
 msgstr "A"
 
-#: lib/messageform.php:166 lib/noticeform.php:186
-msgid "Available characters"
-msgstr "Caracteres dispoñibles"
-
-#: lib/messageform.php:185 lib/noticeform.php:237
+#: lib/messageform.php:184 lib/noticeform.php:236
 msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr "Enviar"
@@ -9194,17 +9286,10 @@ msgstr "Enviar"
 msgid "Messages"
 msgstr "Mensaxe"
 
-#: lib/messagelistitem.php:123 lib/noticelist.php:522
+#: lib/messagelistitem.php:123 lib/noticelist.php:527
 msgid "from"
 msgstr "de"
 
-#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:165
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr ""
-"O alcume debe ter só letras en minúscula e números, e non pode ter espazos "
-"en branco."
-
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 #: lib/nickname.php:178
 msgid "Nickname cannot be empty."
@@ -9227,23 +9312,23 @@ msgstr "Enviar unha nota"
 msgid "What's up, %s?"
 msgstr "Que hai de novo, %s?"
 
-#: lib/noticeform.php:194
+#: lib/noticeform.php:193
 msgid "Attach"
 msgstr "Anexar"
 
-#: lib/noticeform.php:198
+#: lib/noticeform.php:197
 msgid "Attach a file"
 msgstr "Anexar un ficheiro"
 
-#: lib/noticeform.php:213
+#: lib/noticeform.php:212
 msgid "Share my location"
 msgstr "Publicar a miña localidade"
 
-#: lib/noticeform.php:216
+#: lib/noticeform.php:215
 msgid "Do not share my location"
 msgstr "Non publicar a miña localidade"
 
-#: lib/noticeform.php:217
+#: lib/noticeform.php:216
 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
 "try again later"
@@ -9252,55 +9337,59 @@ msgstr ""
 "intentar máis tarde"
 
 #. TRANS: Used in coordinates as abbreviation of north
-#: lib/noticelist.php:452
+#: lib/noticelist.php:457
 msgid "N"
 msgstr "N"
 
 #. TRANS: Used in coordinates as abbreviation of south
-#: lib/noticelist.php:454
+#: lib/noticelist.php:459
 msgid "S"
 msgstr "S"
 
 #. TRANS: Used in coordinates as abbreviation of east
-#: lib/noticelist.php:456
+#: lib/noticelist.php:461
 msgid "E"
 msgstr "L"
 
 #. TRANS: Used in coordinates as abbreviation of west
-#: lib/noticelist.php:458
+#: lib/noticelist.php:463
 msgid "W"
 msgstr "O"
 
-#: lib/noticelist.php:460
+#: lib/noticelist.php:465
 #, php-format
 msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 
-#: lib/noticelist.php:469
+#: lib/noticelist.php:474
 msgid "at"
 msgstr "en"
 
-#: lib/noticelist.php:518
+#: lib/noticelist.php:523
 msgid "web"
 msgstr "web"
 
-#: lib/noticelist.php:584
+#: lib/noticelist.php:589
 msgid "in context"
 msgstr "no contexto"
 
-#: lib/noticelist.php:619
+#: lib/noticelist.php:624
 msgid "Repeated by"
 msgstr "Repetida por"
 
-#: lib/noticelist.php:646
+#: lib/noticelist.php:651
 msgid "Reply to this notice"
 msgstr "Responder a esta nota"
 
-#: lib/noticelist.php:647
+#: lib/noticelist.php:652
 msgid "Reply"
 msgstr "Responder"
 
-#: lib/noticelist.php:691
+#: lib/noticelist.php:678
+msgid "Delete this notice"
+msgstr "Borrar esta nota"
+
+#: lib/noticelist.php:696
 msgid "Notice repeated"
 msgstr "Repetiuse a nota"
 
@@ -9337,48 +9426,31 @@ msgstr "Nota duplicada."
 msgid "Couldn't insert new subscription."
 msgstr "Non se puido inserir unha subscrición nova."
 
-#. TRANS: Personal group navigation menu option when logged in for viewing @-replies.
-#: lib/personalgroupnav.php:107
+#: lib/personalgroupnav.php:104
 #, fuzzy
-msgctxt "MENU"
 msgid "Replies"
 msgstr "Respostas"
 
-#. TRANS: Personal group navigation menu option when logged in for seeing own profile.
-#: lib/personalgroupnav.php:114
+#: lib/personalgroupnav.php:109
 #, fuzzy
-msgctxt "MENU"
-msgid "Profile"
-msgstr "Perfil"
-
-#. TRANS: Personal group navigation menu option when logged in for viewing own favourited notices.
-#: lib/personalgroupnav.php:120
-#, fuzzy
-msgctxt "MENU"
 msgid "Favorites"
 msgstr "Favoritas"
 
-#. TRANS: Personal group navigation menu option when logged in for viewing recieved personal messages.
-#: lib/personalgroupnav.php:133
+#: lib/personalgroupnav.php:120
 #, fuzzy
-msgctxt "MENU"
 msgid "Inbox"
 msgstr "Caixa de entrada"
 
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing recieved personal messages.
-#: lib/personalgroupnav.php:135
+#: lib/personalgroupnav.php:121
 msgid "Your incoming messages"
 msgstr "As mensaxes recibidas"
 
-#. TRANS: Personal group navigation menu option when logged in for viewing senet personal messages.
-#: lib/personalgroupnav.php:140
+#: lib/personalgroupnav.php:125
 #, fuzzy
-msgctxt "MENU"
 msgid "Outbox"
 msgstr "Caixa de saída"
 
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing senet personal messages.
-#: lib/personalgroupnav.php:142
+#: lib/personalgroupnav.php:126
 msgid "Your sent messages"
 msgstr "As mensaxes enviadas"
 
@@ -9393,9 +9465,26 @@ msgstr "Etiquetas nas notas de %s"
 msgid "Unknown"
 msgstr "Descoñecida"
 
+#. TRANS: Plugin admin panel controls
+#: lib/plugindisableform.php:90
+msgctxt "plugin"
+msgid "Disable"
+msgstr ""
+
+#. TRANS: Plugin admin panel controls
+#: lib/pluginenableform.php:112
+msgctxt "plugin"
+msgid "Enable"
+msgstr ""
+
+#: lib/pluginlist.php:196
+msgctxt "plugin-description"
+msgid "(Plugin descriptions unavailable when disabled.)"
+msgstr ""
+
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:82
+#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:88
 msgid "Subscriptions"
 msgstr "Subscricións"
 
@@ -9406,7 +9495,7 @@ msgstr "Todas as subscricións"
 
 #. TRANS: H2 text for user subscriber statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:90
+#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:96
 msgid "Subscribers"
 msgstr "Subscritores"
 
@@ -9428,7 +9517,7 @@ msgstr "Membro dende"
 #. TRANS: Label for user statistics.
 #. TRANS: H2 text for user group membership statistics.
 #: lib/profileaction.php:239 lib/profileaction.php:290
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:104
 msgid "Groups"
 msgstr "Grupos"
 
@@ -9448,10 +9537,6 @@ msgstr "Todos os grupos"
 msgid "Unimplemented method."
 msgstr "Aínda non se implantou o método."
 
-#: lib/publicgroupnav.php:78
-msgid "Public"
-msgstr "Públicas"
-
 #: lib/publicgroupnav.php:82
 msgid "User groups"
 msgstr "Grupos do usuario"
@@ -9490,7 +9575,7 @@ msgid "Revoke the \"%s\" role from this user"
 msgstr "Revogarlle o rol \"%s\" a este usuario"
 
 #. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:974
+#: lib/router.php:1001
 #, fuzzy
 msgid "Page not found."
 msgstr "Non se atopou o método da API."
@@ -9520,11 +9605,6 @@ msgctxt "BUTTON"
 msgid "Search"
 msgstr "Procurar"
 
-#. TRANS: Definition list item with instructions on how to get (better) search results.
-#: lib/searchaction.php:170
-msgid "Search help"
-msgstr "Buscar na axuda"
-
 #: lib/searchgroupnav.php:80
 msgid "People"
 msgstr "Xente"
@@ -9549,6 +9629,51 @@ msgstr "Sección sen título"
 msgid "More..."
 msgstr "Máis..."
 
+#: lib/settingsnav.php:78
+msgid "Change your profile settings"
+msgstr "Cambie a configuración do seu perfil"
+
+#: lib/settingsnav.php:83
+msgid "Upload an avatar"
+msgstr "Cargue un avatar"
+
+#: lib/settingsnav.php:88
+msgid "Change your password"
+msgstr "Cambie o seu contrasinal"
+
+#: lib/settingsnav.php:93
+msgid "Change email handling"
+msgstr "Cambie a xestión do correo electrónico"
+
+#: lib/settingsnav.php:98
+msgid "Design your profile"
+msgstr "Deseñe o seu perfil"
+
+#: lib/settingsnav.php:102
+msgid "URL"
+msgstr "URL"
+
+#: lib/settingsnav.php:103
+msgid "URL shorteners"
+msgstr ""
+
+#: lib/settingsnav.php:111
+msgid "Updates by instant messenger (IM)"
+msgstr "Actualizacións por mensaxería instantánea (MI)"
+
+#: lib/settingsnav.php:118
+msgid "Updates by SMS"
+msgstr "Actualizacións por SMS"
+
+#: lib/settingsnav.php:123
+#, fuzzy
+msgid "Connections"
+msgstr "Conexións"
+
+#: lib/settingsnav.php:124
+msgid "Authorized connected applications"
+msgstr "Aplicacións conectadas autorizadas"
+
 #: lib/silenceform.php:67
 msgid "Silence"
 msgstr "Silenciar"
@@ -9557,30 +9682,34 @@ msgstr "Silenciar"
 msgid "Silence this user"
 msgstr "Silenciar a este usuario"
 
-#: lib/subgroupnav.php:83
+#: lib/subgroupnav.php:89
 #, php-format
 msgid "People %s subscribes to"
 msgstr "Persoas ás que está subscrito %s"
 
-#: lib/subgroupnav.php:91
+#: lib/subgroupnav.php:97
 #, php-format
 msgid "People subscribed to %s"
 msgstr "Persoas subscritas a %s"
 
-#: lib/subgroupnav.php:99
+#: lib/subgroupnav.php:105
 #, php-format
 msgid "Groups %s is a member of"
 msgstr "Grupos aos que pertence %s"
 
-#: lib/subgroupnav.php:105
+#: lib/subgroupnav.php:111
 msgid "Invite"
 msgstr "Convidar"
 
-#: lib/subgroupnav.php:106
+#: lib/subgroupnav.php:112
 #, php-format
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Convide a amigos e compañeiros a unírselle en %s"
 
+#: lib/subscribeform.php:115 lib/subscribeform.php:139
+msgid "Subscribe to this user"
+msgstr "Subscribirse a este usuario"
+
 #: lib/subscriberspeopleselftagcloudsection.php:48
 #: lib/subscriptionspeopleselftagcloudsection.php:48
 msgid "People Tagcloud as self-tagged"
@@ -9658,6 +9787,13 @@ msgstr "O tema visual contén o tipo de ficheiro \".%s\". Non está permitido."
 msgid "Error opening theme archive."
 msgstr "Houbo un erro ao abrir o arquivo do tema visual."
 
+#: lib/threadednoticelist.php:270
+#, php-format
+msgid "Show all %d comment"
+msgid_plural "Show all %d comments"
+msgstr[0] ""
+msgstr[1] ""
+
 #: lib/topposterssection.php:74
 msgid "Top posters"
 msgstr "Os que máis publican"
@@ -9700,76 +9836,80 @@ msgstr "Cancelar a subscrición"
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "O usuario %1$s (%2$d) non ten perfil."
 
-#. TRANS: Link text for changeing the avatar of the logged in user.
-#: lib/userprofile.php:121
+#: lib/userprofile.php:116
 msgid "Edit Avatar"
 msgstr "Modificar o avatar"
 
 #. TRANS: H2 for user actions in a profile.
 #. TRANS: H2 for entity actions in a profile.
-#: lib/userprofile.php:245 lib/userprofile.php:261
+#: lib/userprofile.php:216 lib/userprofile.php:232
 msgid "User actions"
 msgstr "Accións do usuario"
 
 #. TRANS: Text shown in user profile of not yet compeltely deleted users.
-#: lib/userprofile.php:249
+#: lib/userprofile.php:220
 msgid "User deletion in progress..."
 msgstr "Procedendo a borrar o usuario..."
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:277
+#: lib/userprofile.php:248
 msgid "Edit profile settings"
 msgstr "Modificar a configuración do perfil"
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:279
+#: lib/userprofile.php:250
 msgid "Edit"
 msgstr "Modificar"
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:303
+#: lib/userprofile.php:274
 msgid "Send a direct message to this user"
 msgstr "Enviarlle unha mensaxe directa a este usuario"
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:305
+#: lib/userprofile.php:276
 msgid "Message"
 msgstr "Mensaxe"
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:347
+#: lib/userprofile.php:318
 msgid "Moderate"
 msgstr "Moderar"
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:386
+#: lib/userprofile.php:357
 msgid "User role"
 msgstr "Rol do usuario"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:389
+#: lib/userprofile.php:360
 msgctxt "role"
 msgid "Administrator"
 msgstr "Administrador"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:391
+#: lib/userprofile.php:362
 msgctxt "role"
 msgid "Moderator"
 msgstr "Moderador"
 
+#: lib/util.php:321
+#, fuzzy
+msgid "Not allowed to log in."
+msgstr "Non iniciou sesión."
+
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1306
+#: lib/util.php:1337
 msgid "a few seconds ago"
 msgstr "hai uns segundos"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1309
+#: lib/util.php:1340
 msgid "about a minute ago"
 msgstr "hai como un minuto"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1313
+#: lib/util.php:1344
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
@@ -9777,12 +9917,12 @@ msgstr[0] "hai un minuto"
 msgstr[1] "hai %d minutos"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1316
+#: lib/util.php:1347
 msgid "about an hour ago"
 msgstr "hai como unha hora"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1320
+#: lib/util.php:1351
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
@@ -9790,12 +9930,12 @@ msgstr[0] "hai unha hora"
 msgstr[1] "hai %d horas"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1323
+#: lib/util.php:1354
 msgid "about a day ago"
 msgstr "hai como un día"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1327
+#: lib/util.php:1358
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
@@ -9803,12 +9943,12 @@ msgstr[0] "hai un día"
 msgstr[1] "hai %d días"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1330
+#: lib/util.php:1361
 msgid "about a month ago"
 msgstr "hai como un mes"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1334
+#: lib/util.php:1365
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
@@ -9816,7 +9956,7 @@ msgstr[0] "hai un mes"
 msgstr[1] "hai %d meses"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1337
+#: lib/util.php:1368
 msgid "about a year ago"
 msgstr "hai como un ano"
 
@@ -9827,23 +9967,6 @@ msgstr "hai como un ano"
 msgid "%s is not a valid color! Use 3 or 6 hex characters."
 msgstr "%s non é unha cor correcta! Use 3 ou 6 caracteres hexadecimais."
 
-#. TRANS: %s is the URL to the StatusNet site's Instant Messaging settings.
-#: lib/xmppmanager.php:287
-#, php-format
-msgid "Unknown user. Go to %s to add your address to your account"
-msgstr ""
-
-#. TRANS: Response to XMPP source when it sent too long a message.
-#. TRANS: %1$d the maximum number of allowed characters (used for plural), %2$d is the sent number.
-#: lib/xmppmanager.php:406
-#, fuzzy, php-format
-msgid "Message too long. Maximum is %1$d character, you sent %2$d."
-msgid_plural "Message too long. Maximum is %1$d characters, you sent %2$d."
-msgstr[0] ""
-"A mensaxe é longa de máis, o límite de caracteres é de %1$d, e enviou %2$d."
-msgstr[1] ""
-"A mensaxe é longa de máis, o límite de caracteres é de %1$d, e enviou %2$d."
-
 #. TRANS: Exception.
 #: lib/xrd.php:63
 #, fuzzy
@@ -9862,74 +9985,181 @@ msgid "Getting backup from file '%s'."
 msgstr ""
 
 #, fuzzy
-#~ msgid "Block this user."
-#~ msgstr "Bloquear este usuario"
+#~ msgid "Could not generate feed for group - %s"
+#~ msgstr "Non se puido actualizar o grupo."
 
 #, fuzzy
-#~ msgid "Delete this notice."
-#~ msgstr "Borrar esta nota"
-
-#, fuzzy
-#~ msgid "Delete this user."
-#~ msgstr "Borrar o usuario"
-
-#, fuzzy
-#~ msgid "Restore default designs."
-#~ msgstr "Restaurar o deseño por defecto"
-
-#, fuzzy
-#~ msgid "Reset back to default."
-#~ msgstr "Volver ao deseño por defecto"
-
-#, fuzzy
-#~ msgid "Save design."
-#~ msgstr "Gardar o deseño"
-
-#, fuzzy
-#~ msgid "Disfavor favorite."
-#~ msgstr "Desmarcar como favorita"
-
-#, fuzzy
-#~ msgid "\"%s\" not found."
-#~ msgstr "Non se atopou o método da API."
-
-#, fuzzy
-#~ msgid "Notice %s not found."
-#~ msgstr "Non se atopou o método da API."
-
-#, fuzzy
-#~ msgid "Attachment %s not found."
-#~ msgstr "Non se atopou o destinatario."
-
-#, fuzzy
-#~ msgid "Invalid tag: \"%s\"."
-#~ msgstr "Etiqueta incorrecta: \"%s\""
-
-#, fuzzy
-#~ msgid "%s updates from everyone."
-#~ msgstr "%s actualizacións de todos!"
-
-#, fuzzy
-#~ msgid "Password saved"
-#~ msgstr "Gardouse o contrasinal."
-
-#, fuzzy
-#~ msgid "Where you are, like \"City, State (or Region), Country\"."
-#~ msgstr ""
-#~ "Onde está a vivir, coma “localidade, provincia (ou comunidade), país”"
-
-#, fuzzy
-#~ msgid "Subscribe to this user."
-#~ msgstr "Subscribirse a este usuario"
+#~ msgid "Current confirmed Jabber/Google Talk address."
+#~ msgstr "Enderezo de Jabber/GTalk confirmado actualmente."
 
 #, fuzzy
 #~ msgid ""
-#~ "Listenee stream license \"%1$s\" is not compatible with site license \"%2"
-#~ "$s\"."
+#~ "Jabber or Google Talk address, like \"UserName@example.org\". First, make "
+#~ "sure to add %s to your buddy list in your IM client or on Google Talk."
 #~ msgstr ""
-#~ "A licenza \"%1$s\" das transmisións da persoa seguida non é compatible "
-#~ "coa licenza deste sitio: \"%2$s\"."
+#~ "Enderezo de Jabber ou GTalk, coma \"nomedeusuario@example.org\". "
+#~ "Asegúrese primeiro de engadir a %s á súa lista de amigos no seu cliente "
+#~ "de mensaxería instantánea ou en GTalk."
 
 #, fuzzy
-#~ msgid "Not allowed to log in."
-#~ msgstr "Non iniciou sesión."
+#~ msgid "Send me notices through Jabber/Google Talk."
+#~ msgstr "Enviádeme as notas mediante Jabber ou GTalk."
+
+#, fuzzy
+#~ msgid "Publish a MicroID for my Jabber/Google Talk address."
+#~ msgstr "Publicar unha MicroID para o meu enderezo de Jabber ou GTalk."
+
+#~ msgid "No Jabber ID."
+#~ msgstr "Non existe ningunha ID de Jabber."
+
+#, fuzzy
+#~ msgid "Not a valid Jabber ID."
+#~ msgstr "A ID de Jabber non é correcta"
+
+#~ msgid "That is already your Jabber ID."
+#~ msgstr "Esa xa é a súa ID de Jabber."
+
+#~ msgid "That is not your Jabber ID."
+#~ msgstr "Esa ID de Jabber non é súa."
+
+#~ msgid "Other settings"
+#~ msgstr "Outras opcións"
+
+#~ msgid "Tag cloud"
+#~ msgstr "Nube de etiquetas"
+
+#~ msgid "Consumer key"
+#~ msgstr "Clave do consumidor"
+
+#~ msgid "Consumer secret"
+#~ msgstr "Pregunta secreta do consumidor"
+
+#~ msgid "Request token URL"
+#~ msgstr "Solicitar un URL de pase"
+
+#~ msgid "Access token URL"
+#~ msgstr "Acceder ao URL do pase"
+
+#~ msgid "Authorize URL"
+#~ msgstr "Autorizar o URL"
+
+#~ msgid "Jabber"
+#~ msgstr "Jabber"
+
+#~ msgid "Photo"
+#~ msgstr "Fotografía"
+
+#~ msgid "Other options"
+#~ msgstr "Outras opcións"
+
+#~ msgid "Other"
+#~ msgstr "Outros"
+
+#~ msgid "Primary site navigation"
+#~ msgstr "Navegación principal do sitio"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Personal profile and friends timeline"
+#~ msgstr "Liña do tempo do perfil persoal e os amigos"
+
+#~ msgctxt "MENU"
+#~ msgid "Personal"
+#~ msgstr "Persoal"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Change your email, avatar, password, profile"
+#~ msgstr "Cambie o seu correo electrónico, avatar, contrasinal ou perfil"
+
+#~ msgid "Account"
+#~ msgstr "Conta"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Connect to services"
+#~ msgstr "Conectarse aos servizos"
+
+#~ msgid "Connect"
+#~ msgstr "Conectarse"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Change site configuration"
+#~ msgstr "Cambiar a configuración do sitio"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Invite friends and colleagues to join you on %s"
+#~ msgstr "Convide a amigos e compañeiros a unírselle en %s"
+
+#~ msgctxt "MENU"
+#~ msgid "Invite"
+#~ msgstr "Convidar"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Create an account"
+#~ msgstr "Crear unha conta"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Help me!"
+#~ msgstr "Axuda!"
+
+#~ msgctxt "MENU"
+#~ msgid "Help"
+#~ msgstr "Axuda"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Search for people or text"
+#~ msgstr "Buscar persoas ou palabras"
+
+#~ msgid "Local views"
+#~ msgstr "Vistas locais"
+
+#~ msgid "Page notice"
+#~ msgstr "Nota da páxina"
+
+#~ msgid "Secondary site navigation"
+#~ msgstr "Navegación secundaria do sitio"
+
+#~ msgid "StatusNet software license"
+#~ msgstr "Licenza do software StatusNet"
+
+#~ msgid "Site content license"
+#~ msgstr "Licenza dos contidos do sitio"
+
+#~ msgid "Pagination"
+#~ msgstr "Paxinación"
+
+#~ msgid "Author"
+#~ msgstr "Autor"
+
+#~ msgid "Provider"
+#~ msgstr "Provedor"
+
+#, fuzzy
+#~ msgctxt "MENU"
+#~ msgid "SMS"
+#~ msgstr "SMS"
+
+#~ msgid "Filter tags"
+#~ msgstr "Filtrar as etiquetas"
+
+#~ msgid "[%s]"
+#~ msgstr "[%s]"
+
+#~ msgid "Available characters"
+#~ msgstr "Caracteres dispoñibles"
+
+#, fuzzy
+#~ msgctxt "MENU"
+#~ msgid "Profile"
+#~ msgstr "Perfil"
+
+#~ msgid "Search help"
+#~ msgstr "Buscar na axuda"
+
+#, fuzzy
+#~ msgid "Message too long. Maximum is %1$d character, you sent %2$d."
+#~ msgid_plural "Message too long. Maximum is %1$d characters, you sent %2$d."
+#~ msgstr[0] ""
+#~ "A mensaxe é longa de máis, o límite de caracteres é de %1$d, e enviou %2"
+#~ "$d."
+#~ msgstr[1] ""
+#~ "A mensaxe é longa de máis, o límite de caracteres é de %1$d, e enviou %2"
+#~ "$d."
diff --git a/locale/hsb/LC_MESSAGES/statusnet.po b/locale/hsb/LC_MESSAGES/statusnet.po
index 99e56d8808..a997da4039 100644
--- a/locale/hsb/LC_MESSAGES/statusnet.po
+++ b/locale/hsb/LC_MESSAGES/statusnet.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 15:58+0000\n"
-"PO-Revision-Date: 2011-03-03 16:00:48+0000\n"
+"POT-Creation-Date: 2011-03-03 17:23+0000\n"
+"PO-Revision-Date: 2011-03-03 17:26:04+0000\n"
 "Language-Team: Upper Sorbian <http://translatewiki.net/wiki/Portal:hsb>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -79,23 +79,23 @@ msgstr "Přistupne nastajenja składować"
 #. TRANS: Tooltip for button to save access settings in site admin panel.
 #. TRANS: Button text for saving theme settings.
 #. TRANS: Button label to save e-mail preferences.
-#. TRANS: Button label to save Instant Messaging preferences.
-#. TRANS: Button text for saving "Other settings" in profile.
+#. TRANS: Button label to save IM preferences.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
 #. TRANS: Button text for saving site notice in admin panel.
 #. TRANS: Button label to save SMS preferences.
 #. TRANS: Save button for settings for a profile in a subscriptions list.
+#. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
 #. TRANS: Button text on profile design page to save settings.
 #: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
-#: actions/emailsettings.php:250 actions/imsettings.php:183
-#: actions/othersettings.php:136 actions/pathsadminpanel.php:512
-#: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
-#: actions/smssettings.php:205 actions/subscriptions.php:259
+#: actions/emailsettings.php:251 actions/imsettings.php:199
+#: actions/pathsadminpanel.php:512 actions/profilesettings.php:198
+#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:204
+#: actions/subscriptions.php:261 actions/urlsettings.php:152
 #: actions/useradminpanel.php:298 lib/applicationeditform.php:355
-#: lib/designsettings.php:270 lib/groupeditform.php:201
+#: lib/designform.php:320 lib/groupeditform.php:201
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Składować"
@@ -134,7 +134,11 @@ msgstr "Strona njeeksistuje."
 #. 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 use "one time password login" without using an existing user.
+#. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
+#. TRANS: Client error displayed trying to find a user by ID for a non-existing ID.
+#. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when calling a profile action without specifying a user.
 #: actions/all.php:80 actions/allrss.php:69
@@ -146,19 +150,19 @@ msgstr "Strona njeeksistuje."
 #: actions/apidirectmessage.php:75 actions/apidirectmessagenew.php:72
 #: actions/apigroupcreate.php:111 actions/apigroupismember.php:89
 #: actions/apigroupjoin.php:98 actions/apigroupleave.php:98
-#: actions/apigrouplist.php:70 actions/apistatusesupdate.php:230
-#: actions/apisubscriptions.php:85 actions/apitimelinefavorites.php:70
-#: actions/apitimelinefriends.php:173 actions/apitimelinehome.php:78
-#: actions/apitimelinementions.php:77 actions/apitimelineuser.php:79
-#: actions/avatarbynickname.php:79 actions/favoritesrss.php:72
-#: actions/foaf.php:42 actions/foaf.php:61 actions/hcard.php:67
-#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
-#: actions/remotesubscribe.php:144 actions/remotesubscribe.php:153
-#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
-#: actions/showfavorites.php:106 actions/userbyid.php:74
-#: actions/usergroups.php:93 actions/userrss.php:40 actions/userxrd.php:59
-#: actions/xrds.php:71 lib/command.php:509 lib/galleryaction.php:59
-#: lib/mailbox.php:80 lib/profileaction.php:77
+#: actions/apigrouplist.php:70 actions/apigroupprofileupdate.php:108
+#: actions/apistatusesupdate.php:230 actions/apisubscriptions.php:85
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:173
+#: actions/apitimelinehome.php:78 actions/apitimelinementions.php:77
+#: actions/apitimelineuser.php:79 actions/avatarbynickname.php:79
+#: actions/favoritesrss.php:72 actions/foaf.php:42 actions/foaf.php:61
+#: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116
+#: actions/otp.php:78 actions/remotesubscribe.php:144
+#: actions/remotesubscribe.php:153 actions/replies.php:73
+#: actions/repliesrss.php:38 actions/rsd.php:113 actions/showfavorites.php:106
+#: actions/userbyid.php:75 actions/usergroups.php:93 actions/userrss.php:40
+#: actions/userxrd.php:59 actions/xrds.php:71 lib/command.php:509
+#: lib/galleryaction.php:59 lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Wužiwar njeeksistuje"
 
@@ -172,10 +176,9 @@ msgstr "%1$s a přećeljo, strona %2$d"
 #. TRANS: H1 text for page. %s is a user nickname.
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Timeline title for user and friends. %s is a user nickname.
-#. TRANS: Tooltop for personal group navigation menu option when logged in for viewing timeline of self and friends.
 #: actions/all.php:94 actions/all.php:191 actions/allrss.php:117
 #: actions/apitimelinefriends.php:207 actions/apitimelinehome.php:113
-#: lib/personalgroupnav.php:102
+#: lib/personalgroupnav.php:100
 #, php-format
 msgid "%s and friends"
 msgstr "%s a přećeljo"
@@ -227,7 +230,7 @@ msgstr ""
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
 #. TRANS: Second sentence of empty message for anonymous users. %s is a user nickname.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:227
+#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:221
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -274,19 +277,20 @@ msgstr "Aktualizacije wot %1$s a přećelow na %2$s!"
 #: actions/apifavoritecreate.php:98 actions/apifavoritedestroy.php:98
 #: actions/apifriendshipscreate.php:99 actions/apifriendshipsdestroy.php:99
 #: actions/apifriendshipsshow.php:124 actions/apigroupcreate.php:138
-#: actions/apigroupismember.php:115 actions/apigroupjoin.php:160
-#: actions/apigroupleave.php:145 actions/apigrouplist.php:134
+#: actions/apigroupismember.php:115 actions/apigroupjoin.php:151
+#: actions/apigroupleave.php:141 actions/apigrouplist.php:134
 #: actions/apigrouplistall.php:120 actions/apigroupmembership.php:105
+#: actions/apigroupprofileupdate.php:100 actions/apigroupprofileupdate.php:213
 #: actions/apigroupshow.php:114 actions/apihelptest.php:84
 #: actions/apistatusesdestroy.php:101 actions/apistatusesretweets.php:110
 #: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:139
 #: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
-#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:268
-#: actions/apitimelinegroup.php:147 actions/apitimelinehome.php:173
-#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:239
-#: actions/apitimelineretweetedtome.php:118
-#: actions/apitimelineretweetsofme.php:150 actions/apitimelinetag.php:159
-#: actions/apitimelineuser.php:206 actions/apiusershow.php:100
+#: actions/apitimelinefavorites.php:182 actions/apitimelinefriends.php:276
+#: actions/apitimelinegroup.php:148 actions/apitimelinehome.php:181
+#: actions/apitimelinementions.php:182 actions/apitimelinepublic.php:247
+#: actions/apitimelineretweetedtome.php:147
+#: actions/apitimelineretweetsofme.php:147 actions/apitimelinetag.php:165
+#: actions/apitimelineuser.php:217 actions/apiusershow.php:100
 msgid "API method not found."
 msgstr "API-metoda njenamakana."
 
@@ -301,8 +305,9 @@ msgstr "API-metoda njenamakana."
 #: actions/apifavoritecreate.php:88 actions/apifavoritedestroy.php:88
 #: actions/apifriendshipscreate.php:89 actions/apifriendshipsdestroy.php:89
 #: actions/apigroupcreate.php:102 actions/apigroupjoin.php:89
-#: actions/apigroupleave.php:89 actions/apimediaupload.php:66
-#: actions/apistatusesretweet.php:63 actions/apistatusesupdate.php:194
+#: actions/apigroupleave.php:89 actions/apigroupprofileupdate.php:92
+#: actions/apimediaupload.php:66 actions/apistatusesretweet.php:63
+#: actions/apistatusesupdate.php:194
 msgid "This method requires a POST."
 msgstr "Tuta metoda wužaduje sej POST."
 
@@ -316,21 +321,16 @@ msgstr ""
 "sms, im, none."
 
 #. TRANS: Server error displayed when a user's delivery device cannot be updated.
-#. TRANS: Server error displayed when a user update to the database fails in the contact address confirmation action.
 #. TRANS: Server error thrown on database error updating e-mail preferences.
 #. TRANS: Server error thrown on database error removing a registered e-mail address.
-#. TRANS: Server error thrown on database error updating Instant Messaging preferences.
-#. TRANS: Server error thrown on database error removing a registered Instant Messaging address.
-#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
 #. TRANS: Server error thrown when user profile settings could not be updated.
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
-#: actions/apiaccountupdatedeliverydevice.php:130
-#: actions/confirmaddress.php:118 actions/emailsettings.php:352
-#: actions/emailsettings.php:498 actions/imsettings.php:276
-#: actions/imsettings.php:432 actions/othersettings.php:186
-#: actions/profilesettings.php:322 actions/smssettings.php:301
-#: actions/smssettings.php:454
+#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
+#: actions/apiaccountupdatedeliverydevice.php:136
+#: actions/emailsettings.php:353 actions/emailsettings.php:499
+#: actions/profilesettings.php:323 actions/smssettings.php:300
+#: actions/smssettings.php:453 actions/urlsettings.php:211
 msgid "Could not update user."
 msgstr "Wužiwar njeje so dał aktualizować."
 
@@ -356,7 +356,7 @@ msgstr "Wužiwar nima profil."
 
 #. TRANS: Server error displayed if a user profile could not be saved.
 #. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:418
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:419
 msgid "Could not save profile."
 msgstr "Profil njeje so składować dał."
 
@@ -368,7 +368,7 @@ msgstr "Profil njeje so składować dał."
 #: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
 #: actions/designadminpanel.php:120 actions/editapplication.php:121
 #: actions/newapplication.php:102 actions/newnotice.php:95
-#: lib/designsettings.php:298
+#: lib/designsettings.php:110
 #, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s byte) due to its "
@@ -391,8 +391,8 @@ msgstr[3] ""
 #: actions/apiaccountupdateprofilecolors.php:160
 #: actions/apiaccountupdateprofilecolors.php:171
 #: actions/groupdesignsettings.php:285 actions/groupdesignsettings.php:296
-#: actions/userdesignsettings.php:201 actions/userdesignsettings.php:211
-#: actions/userdesignsettings.php:253 actions/userdesignsettings.php:263
+#: actions/userdesignsettings.php:218 actions/userdesignsettings.php:228
+#: actions/userdesignsettings.php:270 actions/userdesignsettings.php:280
 msgid "Unable to save your design settings."
 msgstr "Njeje móžno, designowe nastajenja składować."
 
@@ -400,7 +400,7 @@ msgstr "Njeje móžno, designowe nastajenja składować."
 #. TRANS: Client error displayed when a database error occurs updating profile colours.
 #: actions/apiaccountupdateprofilebackgroundimage.php:191
 #: actions/apiaccountupdateprofilecolors.php:139
-#: actions/userdesignsettings.php:179
+#: actions/userdesignsettings.php:196
 msgid "Could not update your design."
 msgstr "Design njeda so aktualizować."
 
@@ -510,8 +510,7 @@ msgstr "Přijimowar njenamakany."
 
 #. TRANS: Client error displayed trying to direct message another user who's not a friend (403).
 #: actions/apidirectmessagenew.php:144
-#, fuzzy
-msgid "Can't send direct messages to users who aren't your friend."
+msgid "Cannot send direct messages to users who aren't your friend."
 msgstr ""
 "Njeje móžno, direktne powěsće wužiwarjam pósłać, kotřiž twoji přećeljo "
 "njejsu."
@@ -594,9 +593,9 @@ msgstr "Cilowy wužiwar njeda so namakać."
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:156 actions/editgroup.php:191
-#: actions/newgroup.php:137 actions/profilesettings.php:273
-#: actions/register.php:214
+#: actions/apigroupcreate.php:156 actions/apigroupprofileupdate.php:255
+#: actions/editgroup.php:191 actions/newgroup.php:137
+#: actions/profilesettings.php:274 actions/register.php:199
 msgid "Nickname already in use. Try another one."
 msgstr "Přimjeno so hižo wužiwa. Spytaj druhe."
 
@@ -604,9 +603,9 @@ msgstr "Přimjeno so hižo wužiwa. Spytaj druhe."
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:164 actions/editgroup.php:195
-#: actions/newgroup.php:141 actions/profilesettings.php:243
-#: actions/register.php:216
+#: actions/apigroupcreate.php:164 actions/apigroupprofileupdate.php:259
+#: actions/editgroup.php:195 actions/newgroup.php:141
+#: actions/profilesettings.php:244 actions/register.php:201
 msgid "Not a valid nickname."
 msgstr "Žane płaćiwe přimjeno."
 
@@ -616,10 +615,10 @@ msgstr "Žane płaćiwe přimjeno."
 #. TRANS: Validation error shown when providing an invalid homepage URL in the "New application" form.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:181 actions/editapplication.php:235
-#: actions/editgroup.php:202 actions/newapplication.php:221
-#: actions/newgroup.php:148 actions/profilesettings.php:248
-#: actions/register.php:223
+#: actions/apigroupcreate.php:181 actions/apigroupprofileupdate.php:277
+#: actions/editapplication.php:235 actions/editgroup.php:202
+#: actions/newapplication.php:221 actions/newgroup.php:148
+#: actions/profilesettings.php:249 actions/register.php:208
 msgid "Homepage is not a valid URL."
 msgstr "Startowa strona njeje płaćiwy URL."
 
@@ -628,8 +627,8 @@ msgstr "Startowa strona njeje płaćiwy URL."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:191 actions/editgroup.php:206
-#: actions/newgroup.php:152 actions/profilesettings.php:252
-#: actions/register.php:226
+#: actions/newgroup.php:152 actions/profilesettings.php:253
+#: actions/register.php:211
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "Dospołne mjeno je předołho (maks. 255 znamješkow)."
 
@@ -658,8 +657,8 @@ msgstr[3] "Wopisanje je předołho (maks. %d znamješkow)."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:215 actions/editgroup.php:218
-#: actions/newgroup.php:164 actions/profilesettings.php:265
-#: actions/register.php:235
+#: actions/newgroup.php:164 actions/profilesettings.php:266
+#: actions/register.php:220
 msgid "Location is too long (maximum 255 characters)."
 msgstr "Městno je předołho (maks. 255 znamješkow)."
 
@@ -690,15 +689,16 @@ msgstr "Njepłaćiwy alias: \"%s\"."
 #. TRANS: %s is the alias that is already in use.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error. %s is the already used alias.
-#: actions/apigroupcreate.php:264 actions/editgroup.php:246
-#: actions/newgroup.php:193
+#: actions/apigroupcreate.php:264 actions/apigroupprofileupdate.php:351
+#: actions/editgroup.php:246 actions/newgroup.php:193
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "Alias \"%s\" so hižo wužiwa. Spytaj druhi."
 
 #. TRANS: Client error displayed when trying to use an alias during group creation that is the same as the group's nickname.
 #. TRANS: Group edit form validation error.
-#: actions/apigroupcreate.php:278 actions/editgroup.php:253
+#: actions/apigroupcreate.php:278 actions/apigroupprofileupdate.php:359
+#: actions/editgroup.php:253
 msgid "Alias can't be the same as nickname."
 msgstr "Alias njemóže samsny kaž přimjeno być."
 
@@ -710,7 +710,8 @@ msgstr "Alias njemóže samsny kaž přimjeno być."
 #. TRANS: Client error displayed requesting most recent notices to a group for a non-existing group.
 #: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
 #: actions/apigroupleave.php:104 actions/apigroupmembership.php:71
-#: actions/apigroupshow.php:81 actions/apitimelinegroup.php:89
+#: actions/apigroupprofileupdate.php:113 actions/apigroupshow.php:81
+#: actions/apitimelinegroup.php:89
 msgid "Group not found."
 msgstr "Skupina njenamakana."
 
@@ -728,13 +729,11 @@ msgstr "Sy hižo čłon teje skupiny."
 msgid "You have been blocked from that group by the admin."
 msgstr "Administratora tuteje skupiny je će zablokował."
 
-#. TRANS: Server error displayed when joining a group fails.
-#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
 #. 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.
 #. TRANS: Message given having failed to add a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:362
+#: actions/apigroupjoin.php:136 actions/joingroup.php:139 lib/command.php:362
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "Njebě móžno wužiwarja %1$s skupinje %2%s přidać."
@@ -744,8 +743,6 @@ msgstr "Njebě móžno wužiwarja %1$s skupinje %2%s přidać."
 msgid "You are not a member of this group."
 msgstr "Njejsy čłon tuteje skupiny."
 
-#. TRANS: Server error displayed when leaving a group fails.
-#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
 #. TRANS: Server error displayed when leaving a group failed in the database.
 #. TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
 #. TRANS: Message given having failed to remove a user from a group.
@@ -781,6 +778,62 @@ msgstr "%s skupinow"
 msgid "groups on %s"
 msgstr "skupiny na %s"
 
+#. TRANS: Client error displayed trying to edit a group while not being a group admin.
+#. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
+#. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
+#: actions/apigroupprofileupdate.php:118 actions/editgroup.php:110
+#: actions/editgroup.php:176 actions/groupdesignsettings.php:109
+#: actions/grouplogo.php:111
+msgid "You must be an admin to edit the group."
+msgstr "Dyrbiš administrator być, zo by skupinu wobdźěłał."
+
+#. TRANS: Server error displayed when editing a group fails.
+#: actions/apigroupprofileupdate.php:171 actions/editgroup.php:274
+msgid "Could not update group."
+msgstr "Skupina njeje so dała aktualizować."
+
+#. TRANS: Server error displayed when group aliases could not be added.
+#. TRANS: Server exception thrown when creating group aliases failed.
+#: actions/apigroupprofileupdate.php:194 actions/editgroup.php:281
+#: classes/User_group.php:540
+msgid "Could not create aliases."
+msgstr "Aliasy njejsu so dali wutworić."
+
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: actions/apigroupprofileupdate.php:249 lib/nickname.php:165
+msgid "Nickname must have only lowercase letters and numbers and no spaces."
+msgstr ""
+"Přimjeno smě jenož małe pismiki a cyfry wobsahować. Mjezery njejsu dowolene."
+
+#: actions/apigroupprofileupdate.php:286
+#, fuzzy
+msgid "Full name is too long (max 255 chars)."
+msgstr "Dospołne mjeno je předołho (maks. 255 znamješkow)."
+
+#: actions/apigroupprofileupdate.php:296
+#, fuzzy, php-format
+msgid "description is too long (max %d chars)."
+msgstr "Wopisanje je předołho (maks. %d znamješko)."
+
+#: actions/apigroupprofileupdate.php:307
+#, fuzzy
+msgid "Location is too long (max 255 chars)."
+msgstr "Městno je předołho (maks. 255 znamješkow)."
+
+#: actions/apigroupprofileupdate.php:326
+#, fuzzy, php-format
+msgid "Too many aliases! Maximum %d."
+msgstr "Přewjele aliasow! Maks. %d dowoleny."
+
+#. TRANS: Group edit form validation error.
+#. TRANS: Group create form validation error.
+#. TRANS: %s is the invalid alias.
+#: actions/apigroupprofileupdate.php:342 actions/editgroup.php:241
+#: actions/newgroup.php:188
+#, php-format
+msgid "Invalid alias: \"%s\""
+msgstr "Njepłaćiwy alias: \"%s\""
+
 #. TRANS: Client error displayed when uploading a media file has failed.
 #: actions/apimediaupload.php:101
 msgid "Upload failed."
@@ -811,21 +864,22 @@ msgstr "Naprašowanski token hižo awtorizowany."
 #. TRANS: Form validation error message.
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
+#. TRANS: Client error displayed when the session token is not okay.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
 #: actions/deletenotice.php:177 actions/disfavor.php:75
-#: actions/emailsettings.php:291 actions/favor.php:75 actions/geocode.php:55
+#: actions/emailsettings.php:292 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:65 actions/grouplogo.php:321
-#: actions/groupunblock.php:65 actions/imsettings.php:224
-#: actions/invite.php:60 actions/login.php:137 actions/makeadmin.php:66
-#: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
-#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
-#: actions/othersettings.php:155 actions/passwordsettings.php:138
-#: actions/profilesettings.php:217 actions/recoverpassword.php:383
-#: actions/register.php:172 actions/remotesubscribe.php:76
-#: actions/repeat.php:82 actions/smssettings.php:250 actions/subedit.php:40
-#: actions/subscribe.php:86 actions/tagother.php:166
-#: actions/unsubscribe.php:69 actions/userauthorization.php:52
-#: lib/designsettings.php:310
+#: actions/groupunblock.php:65 actions/imsettings.php:241
+#: actions/invite.php:60 actions/makeadmin.php:66 actions/newmessage.php:135
+#: actions/newnotice.php:105 actions/nudge.php:80
+#: actions/oauthappssettings.php:162 actions/oauthconnectionssettings.php:135
+#: actions/passwordsettings.php:137 actions/pluginenable.php:87
+#: actions/profilesettings.php:218 actions/recoverpassword.php:383
+#: actions/register.php:157 actions/remotesubscribe.php:76
+#: actions/repeat.php:82 actions/smssettings.php:249 actions/subedit.php:40
+#: actions/subscribe.php:87 actions/tagother.php:145
+#: actions/unsubscribe.php:69 actions/urlsettings.php:171
+#: actions/userauthorization.php:53 lib/designsettings.php:122
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 
@@ -853,10 +907,10 @@ msgstr "Zmylk datoweje banki při zasunjenju oauth_token_association."
 #. TRANS: Unknown form validation error in design settings form.
 #: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
 #: actions/designadminpanel.php:100 actions/editapplication.php:144
-#: actions/emailsettings.php:310 actions/grouplogo.php:332
-#: actions/imsettings.php:239 actions/newapplication.php:124
-#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
-#: actions/smssettings.php:271 lib/designsettings.php:321
+#: actions/emailsettings.php:311 actions/grouplogo.php:332
+#: actions/imsettings.php:256 actions/newapplication.php:124
+#: actions/oauthconnectionssettings.php:144 actions/recoverpassword.php:46
+#: actions/smssettings.php:270 lib/designsettings.php:133
 msgid "Unexpected form submission."
 msgstr "Njewočakowane wotpósłanje formulara."
 
@@ -899,31 +953,26 @@ msgstr "Konto"
 
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Field label in form for profile settings.
-#. TRANS: Label for group nickname (dt). Text hidden by default.
-#. TRANS: DT for nick name in a profile.
-#: actions/apioauthauthorize.php:459 actions/login.php:252
-#: actions/profilesettings.php:106 actions/register.php:432
-#: actions/showgroup.php:243 actions/tagother.php:94
+#: actions/apioauthauthorize.php:459 actions/login.php:225
+#: actions/profilesettings.php:107 actions/register.php:411
 #: actions/userauthorization.php:145 lib/groupeditform.php:145
-#: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "Přimjeno"
 
 #. TRANS: Field label on OAuth API authorisation form.
-#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:463 actions/login.php:255
-#: actions/register.php:436 lib/accountsettingsaction.php:120
+#: actions/apioauthauthorize.php:463 actions/login.php:228
+#: actions/register.php:415 lib/settingsnav.php:87
 msgid "Password"
 msgstr "Hesło"
 
 #. TRANS: Button text that when clicked will cancel the process of allowing access to an account
 #. TRANS: by an external application.
 #. TRANS: Button label to cancel an e-mail address confirmation procedure.
-#. TRANS: Button label to cancel an Instant Messaging address confirmation procedure.
+#. TRANS: Button label to cancel an IM address confirmation procedure.
 #. TRANS: Button label to cancel a SMS address confirmation procedure.
 #. TRANS: Button label in the "Edit application" form.
-#: actions/apioauthauthorize.php:478 actions/emailsettings.php:124
-#: actions/imsettings.php:127 actions/smssettings.php:133
+#: actions/apioauthauthorize.php:478 actions/emailsettings.php:125
+#: actions/imsettings.php:136 actions/smssettings.php:132
 #: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Cancel"
@@ -1030,8 +1079,8 @@ msgstr "HTTP-metoda so njepodpěruje."
 #. TRANS: Exception thrown requesting an unsupported notice output format.
 #. TRANS: %s is the requested output format.
 #: actions/apistatusesshow.php:144
-#, fuzzy, php-format
-msgid "Unsupported format: %s"
+#, php-format
+msgid "Unsupported format: %s."
 msgstr "Njepodpěrany format: %s."
 
 #. TRANS: Client error displayed requesting a deleted status.
@@ -1115,13 +1164,6 @@ msgstr "%1$s / Fawority z %2$s"
 msgid "%1$s updates favorited by %2$s / %3$s."
 msgstr "Aktualizacije z %1$s  wot %2$s / %3$s faworizowane"
 
-#. TRANS: Server error displayed when generating an Atom feed fails.
-#. TRANS: %s is the error.
-#: actions/apitimelinegroup.php:134
-#, php-format
-msgid "Could not generate feed for group - %s"
-msgstr "Njebě móžno kanal za skupinu wutworić - %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.
 #: actions/apitimelinementions.php:115
@@ -1138,13 +1180,14 @@ msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr ""
 
 #. TRANS: Title for site timeline. %s is the StatusNet sitename.
+#. TRANS: Public RSS feed title. %s is the StatusNet site name.
 #: actions/apitimelinepublic.php:193 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr ""
 
 #. TRANS: Subtitle for site timeline. %s is the StatusNet sitename.
-#: actions/apitimelinepublic.php:199 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:199
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "%s aktualizacijow wote wšěch!"
@@ -1155,21 +1198,33 @@ msgid "Unimplemented."
 msgstr "Njeimplementowana metoda."
 
 #. TRANS: Title for Atom feed "repeated to me". %s is the user nickname.
-#: actions/apitimelineretweetedtome.php:108
+#: actions/apitimelineretweetedtome.php:96
 #, php-format
 msgid "Repeated to %s"
 msgstr "Do %s wospjetowany"
 
+#: actions/apitimelineretweetedtome.php:98
+#, fuzzy, php-format
+msgid "%1$s notices that were to repeated to %2$s / %3$s."
+msgstr "Aktualizacije z %1$s  wot %2$s / %3$s faworizowane"
+
 #. TRANS: Title of list of repeated notices of the logged in user.
 #. TRANS: %s is the nickname of the logged in user.
-#: actions/apitimelineretweetsofme.php:112
+#: actions/apitimelineretweetsofme.php:98
 #, php-format
 msgid "Repeats of %s"
 msgstr "Wospjetowanja wot %s"
 
+#: actions/apitimelineretweetsofme.php:104
+#, fuzzy, php-format
+msgid "%1$s notices that %2$s / %3$s has repeated."
+msgstr "%1$s je zdźělenku %2$s jako faworit markěrował."
+
 #. TRANS: Title for timeline with lastest notices with a given tag.
 #. TRANS: %s is the tag.
-#: actions/apitimelinetag.php:101 actions/tag.php:67
+#. TRANS: Title for first page of notices with tags.
+#. TRANS: %s is the tag.
+#: actions/apitimelinetag.php:101 actions/tag.php:69
 #, php-format
 msgid "Notices tagged with %s"
 msgstr "Zdźělenki woznamjenjene z %s"
@@ -1182,53 +1237,54 @@ msgid "Updates tagged with %1$s on %2$s!"
 msgstr "Aktualizacije z %1$s na %2$s markěrowane!"
 
 #. TRANS: Client error displayed trying to add a notice to another user's timeline.
-#: actions/apitimelineuser.php:297
+#: actions/apitimelineuser.php:308
 msgid "Only the user can add to their own timeline."
 msgstr "Jenož wužiwar móže swojsku časowu lajstu přidać."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:304
+#: actions/apitimelineuser.php:315
 msgid "Only accept AtomPub for Atom feeds."
 msgstr "Jenož AtomPub za Atom-kanale akceptować."
 
 #. TRANS: Client error displayed attempting to post an empty API notice.
-#: actions/apitimelineuser.php:311
+#: actions/apitimelineuser.php:322
 msgid "Atom post must not be empty."
 msgstr "Póst z Atoma njesmě prózdny być."
 
 #. TRANS: Client error displayed attempting to post an API that is not well-formed XML.
-#: actions/apitimelineuser.php:317
+#: actions/apitimelineuser.php:328
 msgid "Atom post must be well-formed XML."
 msgstr "Póst za Atom dyrbi derje sformowany XML być."
 
 #. TRANS: Client error displayed when not using an Atom entry.
-#: actions/apitimelineuser.php:323 actions/atompubfavoritefeed.php:228
+#: actions/apitimelineuser.php:334 actions/atompubfavoritefeed.php:228
 #: actions/atompubmembershipfeed.php:230
 #: actions/atompubsubscriptionfeed.php:236
 msgid "Atom post must be an Atom entry."
 msgstr "Póst za Atom dyrbi  zapisk z Atoma być."
 
 #. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
-#: actions/apitimelineuser.php:335
+#: actions/apitimelineuser.php:345
 msgid "Can only handle POST activities."
 msgstr ""
 
 #. TRANS: Client error displayed when using an unsupported activity object type.
 #. TRANS: %s is the unsupported activity object type.
-#: actions/apitimelineuser.php:346
+#: actions/apitimelineuser.php:356
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
 #. TRANS: %d is the notice ID (number).
-#: actions/apitimelineuser.php:380
+#: actions/apitimelineuser.php:390
 #, php-format
 msgid "No content for notice %d."
 msgstr "Žadyn wobsah za zdźělenku %d."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:408
+#. TRANS: %s is the notice URI.
+#: actions/apitimelineuser.php:419
 #, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "Zdźělenka z URI \"%s\" hižo eksistuje."
@@ -1245,9 +1301,10 @@ msgstr "Wužiwar njenamakany."
 
 #. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
 #. TRANS: Client exception.
+#. TRANS: Client error displayed trying to subscribe to a non-existing profile.
 #: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
 #: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
-#: actions/subscribe.php:107
+#: actions/subscribe.php:110
 msgid "No such profile."
 msgstr "Profil njeeksistuje."
 
@@ -1382,7 +1439,7 @@ msgid "Not a member."
 msgstr "Njeje čłon."
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
-#: actions/atompubshowmembership.php:151
+#: actions/atompubshowmembership.php:150
 msgid "Cannot delete someone else's membership."
 msgstr "Čłonstwo druheho njeda so zhašeć."
 
@@ -1469,10 +1526,7 @@ msgid "Invalid size."
 msgstr "Njepłaćiwa wulkosć."
 
 #. TRANS: Title for avatar upload page.
-#. TRANS: Label for group avatar (dt). Text hidden by default.
-#. TRANS: Link description in user account settings menu.
-#: actions/avatarsettings.php:66 actions/showgroup.php:227
-#: lib/accountsettingsaction.php:113
+#: actions/avatarsettings.php:66 lib/settingsnav.php:82
 msgid "Avatar"
 msgstr "Awatar"
 
@@ -1486,9 +1540,11 @@ msgstr ""
 
 #. TRANS: Server error displayed in avatar upload page when no matching profile can be found for a user.
 #. TRANS: Server error displayed coming across a request from a user without a profile.
+#. TRANS: Server error displayed when trying to authorise a remote subscription request
+#. TRANS: while the user has no profile.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
 #: actions/grouplogo.php:184 actions/remotesubscribe.php:190
-#: actions/userauthorization.php:72 actions/userrss.php:108
+#: actions/userauthorization.php:75 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr "Wužiwar bjez hodźaceho so profila."
 
@@ -1543,9 +1599,9 @@ msgstr "Přirězać"
 msgid "No file uploaded."
 msgstr "Žana dataja nahrata."
 
-#. TRANS: Avatar upload form unstruction after uploading a file.
+#. TRANS: Avatar upload form instruction after uploading a file.
 #: actions/avatarsettings.php:345
-msgid "Pick a square area of the image to be your avatar"
+msgid "Pick a square area of the image to be your avatar."
 msgstr ""
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
@@ -1571,7 +1627,7 @@ msgstr "Awatar zničeny."
 
 #. TRANS: Title for backup account page.
 #. TRANS: Option in profile settings to create a backup of the account of the currently logged in user.
-#: actions/backupaccount.php:61 actions/profilesettings.php:467
+#: actions/backupaccount.php:61 actions/profilesettings.php:468
 msgid "Backup account"
 msgstr "Konto zawěsćić"
 
@@ -1603,8 +1659,7 @@ msgstr "Zawěsćenje"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
 #: actions/backupaccount.php:254
-#, fuzzy
-msgid "Backup your account"
+msgid "Backup your account."
 msgstr "Twoje konto zawěsćić."
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
@@ -1642,8 +1697,7 @@ msgstr "Ně"
 
 #. TRANS: Submit button title for 'No' when blocking a user.
 #: actions/block.php:158
-#, fuzzy
-msgid "Do not block this user"
+msgid "Do not block this user."
 msgstr "Tutoho wužiwarja njeblokować."
 
 #. TRANS: Button label on the user block form.
@@ -1660,10 +1714,9 @@ msgid "Yes"
 msgstr "Haj"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#. TRANS: Description of the form to block a user.
-#: actions/block.php:165 lib/blockform.php:79
-msgid "Block this user"
-msgstr "Tutoho wužiwarja blokować"
+#: actions/block.php:165
+msgid "Block this user."
+msgstr "Tutoho wužiwarja blokować."
 
 #. TRANS: Server error displayed when blocking a user fails.
 #: actions/block.php:189
@@ -1728,31 +1781,47 @@ msgstr "Wobkrućenski kod njenamakany."
 msgid "That confirmation code is not for you!"
 msgstr "Tutón wobkrućenski kod njeje za tebje!"
 
-#. TRANS: Server error for a unknow address type %s, which can be 'email', 'jabber', or 'sms'.
-#: actions/confirmaddress.php:92
-#, php-format
-msgid "Unrecognized address type %s."
+#. TRANS: Server error for an unknown address type, which can be 'email', 'sms', or the name of an IM network (such as 'xmpp' or 'aim')
+#: actions/confirmaddress.php:94
+#, fuzzy, php-format
+msgid "Unrecognized address type %s"
 msgstr "Njespóznaty adresowy typ %s."
 
 #. TRANS: Client error for an already confirmed email/jabber/sms address.
-#: actions/confirmaddress.php:97
+#: actions/confirmaddress.php:103 actions/confirmaddress.php:136
 msgid "That address has already been confirmed."
 msgstr "Tuta adresa bu hižo wobkrućena."
 
+#: actions/confirmaddress.php:121 actions/imsettings.php:444
+#: actions/userdesignsettings.php:306
+#, fuzzy
+msgid "Couldn't update user."
+msgstr "Wužiwar njeje so dał aktualizować."
+
+#: actions/confirmaddress.php:144
+#, fuzzy
+msgid "Couldn't update user im preferences."
+msgstr "Datowa sadźba wužiwarja njeda so aktualizować."
+
+#: actions/confirmaddress.php:156
+#, fuzzy
+msgid "Couldn't insert user im preferences."
+msgstr "Nowy abonement njeda so zasunyć."
+
 #. TRANS: Server error displayed when an address confirmation code deletion from the
 #. TRANS: database fails in the contact address confirmation action.
-#: actions/confirmaddress.php:132
+#: actions/confirmaddress.php:169
 msgid "Could not delete address confirmation."
 msgstr "Adresowe wobkrućenje njeda so zhašeć."
 
 #. TRANS: Title for the contact address confirmation action.
-#: actions/confirmaddress.php:150
+#: actions/confirmaddress.php:185
 msgid "Confirm address"
 msgstr "Adresu wobkrućić"
 
 #. TRANS: Success message for the contact address confirmation action.
 #. TRANS: %s can be 'email', 'jabber', or 'sms'.
-#: actions/confirmaddress.php:166
+#: actions/confirmaddress.php:200
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "Adresa \"%s\" bu za twoje konto wobkrućena."
@@ -1766,6 +1835,7 @@ msgstr "Konwersacija"
 #. TRANS: Label for user statistics.
 #: actions/conversation.php:149 lib/noticelist.php:87
 #: lib/profileaction.php:246 lib/searchgroupnav.php:82
+#: lib/threadednoticelist.php:66
 msgid "Notices"
 msgstr "Zdźělenki"
 
@@ -1798,7 +1868,7 @@ msgstr "Konto zhašene."
 
 #. TRANS: Page title for page on which a user account can be deleted.
 #. TRANS: Option in profile settings to delete the account of the currently logged in user.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:475
+#: actions/deleteaccount.php:228 actions/profilesettings.php:476
 msgid "Delete account"
 msgstr "Konto zhašeć"
 
@@ -1823,7 +1893,7 @@ msgstr ""
 #. TRANS: Field label for delete account confirmation entry.
 #. TRANS: Field label for password reset form where the password has to be typed again.
 #: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:262 actions/register.php:440
+#: actions/recoverpassword.php:262 actions/register.php:419
 msgid "Confirm"
 msgstr "Wobkrućić"
 
@@ -1852,14 +1922,14 @@ msgstr "Aplikaciska njenamakana."
 #. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
 #: actions/deleteapplication.php:79 actions/editapplication.php:78
-#: actions/showapplication.php:94
+#: actions/showapplication.php:90
 msgid "You are not the owner of this application."
 msgstr "Njejsy wobsedźer tuteje aplikacije."
 
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
-#: actions/newapplication.php:112 actions/showapplication.php:118
-#: lib/action.php:1425
+#: actions/newapplication.php:112 actions/showapplication.php:113
+#: lib/action.php:1391
 msgid "There was a problem with your session token."
 msgstr ""
 
@@ -1879,14 +1949,12 @@ msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting an application.
 #: actions/deleteapplication.php:161
-#, fuzzy
-msgid "Do not delete this application"
+msgid "Do not delete this application."
 msgstr "Tutu aplikaciju njezhašeć."
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
 #: actions/deleteapplication.php:167
-#, fuzzy
-msgid "Delete this application"
+msgid "Delete this application."
 msgstr "Tutu aplikaciju zhašeć."
 
 #. TRANS: Client error when trying to delete group while not logged in.
@@ -1937,14 +2005,12 @@ msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting a group.
 #: actions/deletegroup.php:224
-#, fuzzy
-msgid "Do not delete this group"
+msgid "Do not delete this group."
 msgstr "Tutu skupinu njezhašeć."
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
 #: actions/deletegroup.php:231
-#, fuzzy
-msgid "Delete this group"
+msgid "Delete this group."
 msgstr "Tutu skupinu zhašeć."
 
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
@@ -1952,14 +2018,16 @@ msgstr "Tutu skupinu zhašeć."
 #. TRANS: Client error displayed when trying to mark a notice as favorite without being logged in.
 #. TRANS: Client error displayed trying to block a user from a group while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
+#. TRANS: Client error displayed trying to log out when not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
+#. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
 #. TRANS: Client error displayed when trying to change user options while not logged in.
 #: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
-#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:69
+#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:70
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
-#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
-#: actions/tagother.php:33 actions/unsubscribe.php:52
+#: actions/nudge.php:63 actions/pluginenable.php:97 actions/subedit.php:33
+#: actions/subscribe.php:98 actions/tagother.php:33 actions/unsubscribe.php:52
 #: lib/adminpanelaction.php:71 lib/profileformaction.php:63
 #: lib/settingsaction.php:72
 msgid "Not logged in."
@@ -1986,14 +2054,13 @@ msgstr "Chceš woprawdźe tutu zdźělenku wušmórnyć?"
 
 #. TRANS: Submit button title for 'No' when deleting a notice.
 #: actions/deletenotice.php:159
-#, fuzzy
-msgid "Do not delete this notice"
+msgid "Do not delete this notice."
 msgstr "Tutu zdźělenku njezhašeć."
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:166 lib/noticelist.php:673
-msgid "Delete this notice"
-msgstr "Tutu zdźělenku wušmórnyć"
+#: actions/deletenotice.php:166
+msgid "Delete this notice."
+msgstr "Tutu zdźělenku zhašeć."
 
 #. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
 #: actions/deleteuser.php:66
@@ -2025,19 +2092,16 @@ msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting a user.
 #: actions/deleteuser.php:158
-#, fuzzy
-msgid "Do not delete this user"
+msgid "Do not delete this user."
 msgstr "Tutoho wužiwarja njezhašeć."
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
-#. TRANS: Description of form for deleting a user.
-#: actions/deleteuser.php:165 lib/deleteuserform.php:75
-msgid "Delete this user"
-msgstr "Tutoho wužiwarja wušmórnyć"
+#: actions/deleteuser.php:165
+msgid "Delete this user."
+msgstr "Tutoho wužiwarja zhašeć"
 
 #. TRANS: Message used as title for design settings for the site.
-#. TRANS: Link description in user account settings menu.
-#: actions/designadminpanel.php:60 lib/accountsettingsaction.php:134
+#: actions/designadminpanel.php:60 lib/settingsnav.php:97
 msgid "Design"
 msgstr "Design"
 
@@ -2104,8 +2168,7 @@ msgid "You can upload a custom StatusNet theme as a .ZIP archive."
 msgstr "Móžeš swójski šat StatusNet jako .ZIP-archiw nahrać."
 
 #. TRANS: Fieldset legend for theme background image.
-#. TRANS: Fieldset legend on profile design page.
-#: actions/designadminpanel.php:515 lib/designsettings.php:98
+#: actions/designadminpanel.php:515
 msgid "Change background image"
 msgstr "Pozadkowy wobraz změnić"
 
@@ -2113,7 +2176,7 @@ msgstr "Pozadkowy wobraz změnić"
 #. TRANS: Field label for background color selector.
 #. TRANS: Label on profile design page for setting a profile page background colour.
 #: actions/designadminpanel.php:525 actions/designadminpanel.php:609
-#: lib/designsettings.php:183
+#: lib/designform.php:238
 msgid "Background"
 msgstr "Pozadk"
 
@@ -2139,13 +2202,13 @@ msgstr "Wupinjeny"
 #. TRANS: Form guide for turning background image on or off on theme designer page.
 #. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
 #. TRANS: use of the uploaded profile image.
-#: actions/designadminpanel.php:577 lib/designsettings.php:159
+#: actions/designadminpanel.php:577 lib/designform.php:214
 msgid "Turn background image on or off."
 msgstr "Pozadkowy wobraz zmóžnić abo znjemóžnić."
 
 #. TRANS: Checkbox label to title background image on theme designer page.
 #. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-#: actions/designadminpanel.php:583 lib/designsettings.php:165
+#: actions/designadminpanel.php:583 lib/designform.php:220
 msgid "Tile background image"
 msgstr "Pozadkowy wobraz kachlicować"
 
@@ -2156,25 +2219,25 @@ msgstr "Barby změnić"
 
 #. TRANS: Field label for content color selector.
 #. TRANS: Label on profile design page for setting a profile page content colour.
-#: actions/designadminpanel.php:623 lib/designsettings.php:197
+#: actions/designadminpanel.php:623 lib/designform.php:252
 msgid "Content"
 msgstr "Wobsah"
 
 #. TRANS: Field label for sidebar color selector.
 #. TRANS: Label on profile design page for setting a profile page sidebar colour.
-#: actions/designadminpanel.php:637 lib/designsettings.php:211
+#: actions/designadminpanel.php:637 lib/designform.php:266
 msgid "Sidebar"
 msgstr "Bóčnica"
 
 #. TRANS: Field label for text color selector.
 #. TRANS: Label on profile design page for setting a profile page text colour.
-#: actions/designadminpanel.php:651 lib/designsettings.php:225
+#: actions/designadminpanel.php:651 lib/designform.php:280
 msgid "Text"
 msgstr "Tekst"
 
 #. TRANS: Field label for link color selector.
 #. TRANS: Label on profile design page for setting a profile page links colour.
-#: actions/designadminpanel.php:665 lib/designsettings.php:239
+#: actions/designadminpanel.php:665 lib/designform.php:294
 msgid "Links"
 msgstr "Wotkazy"
 
@@ -2195,22 +2258,19 @@ msgid "Use defaults"
 msgstr "Standardne hódnoty wužiwać"
 
 #. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: actions/designadminpanel.php:720 lib/designsettings.php:259
-msgid "Restore default designs"
-msgstr "Standardne designy wobnowić"
+#: actions/designadminpanel.php:720
+msgid "Restore default designs."
+msgstr "Standardne designy wobnowić."
 
 #. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: actions/designadminpanel.php:728 lib/designsettings.php:267
-msgid "Reset back to default"
-msgstr "Na standard wróćo stajić"
+#: actions/designadminpanel.php:728
+msgid "Reset back to default."
+msgstr "Na standard wróćo stajić."
 
 #. TRANS: Title for button for saving theme settings.
-#. TRANS: Title for button on profile design page to save settings.
-#: actions/designadminpanel.php:736 lib/designsettings.php:272
-msgid "Save design"
-msgstr "Design składować"
+#: actions/designadminpanel.php:736
+msgid "Save design."
+msgstr "Design składować."
 
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
 #: actions/disfavor.php:83
@@ -2241,7 +2301,7 @@ msgid "You must be logged in to edit an application."
 msgstr "Dyrbiš přizjewjeny być, zo by skupinu wobdźěłał."
 
 #. TRANS: Client error displayed trying to edit an application that does not exist.
-#: actions/editapplication.php:83 actions/showapplication.php:87
+#: actions/editapplication.php:83 actions/showapplication.php:83
 msgid "No such application."
 msgstr "Aplikacija njeeksistuje."
 
@@ -2332,80 +2392,53 @@ msgstr "Skupinu %s wobdźěłać"
 msgid "You must be logged in to create a group."
 msgstr "Dyrbiš přizjewjeny być, zo by skupinu wutworił."
 
-#. TRANS: Client error displayed trying to edit a group while not being a group admin.
-#. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
-#. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
-#: actions/editgroup.php:110 actions/editgroup.php:176
-#: actions/groupdesignsettings.php:109 actions/grouplogo.php:111
-msgid "You must be an admin to edit the group."
-msgstr "Dyrbiš administrator być, zo by skupinu wobdźěłał."
-
 #. TRANS: Form instructions for group edit form.
 #: actions/editgroup.php:161
 msgid "Use this form to edit the group."
 msgstr "Wuž tutón formular, zo by skupinu wobdźěłał."
 
-#. TRANS: Group edit form validation error.
-#. TRANS: Group create form validation error.
-#. TRANS: %s is the invalid alias.
-#: actions/editgroup.php:241 actions/newgroup.php:188
-#, php-format
-msgid "Invalid alias: \"%s\""
-msgstr "Njepłaćiwy alias: \"%s\""
-
-#. TRANS: Server error displayed when editing a group fails.
-#: actions/editgroup.php:274
-msgid "Could not update group."
-msgstr "Skupina njeje so dała aktualizować."
-
-#. TRANS: Server error displayed when group aliases could not be added.
-#. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/editgroup.php:281 classes/User_group.php:540
-msgid "Could not create aliases."
-msgstr "Aliasy njejsu so dali wutworić."
-
 #. TRANS: Group edit form success message.
 #: actions/editgroup.php:301
 msgid "Options saved."
 msgstr "Opcije składowane."
 
 #. TRANS: Title for e-mail settings.
-#: actions/emailsettings.php:59
+#: actions/emailsettings.php:60
 msgid "Email settings"
 msgstr "E-mejlowe nastajenja"
 
 #. TRANS: E-mail settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/emailsettings.php:73
+#: actions/emailsettings.php:74
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 msgstr ""
 
 #. TRANS: Form legend for e-mail settings form.
 #. TRANS: Field label for e-mail address input in e-mail settings form.
-#: actions/emailsettings.php:103 actions/emailsettings.php:129
+#: actions/emailsettings.php:104 actions/emailsettings.php:130
 msgid "Email address"
 msgstr "E-mejlowa adresa"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:109
+#: actions/emailsettings.php:110
 msgid "Current confirmed email address."
 msgstr "Aktualna wobkrućena e-mejlowa adresa."
 
 #. TRANS: Button label to remove a confirmed e-mail address.
 #. TRANS: Button label for removing a set sender e-mail address to post notices from.
-#. TRANS: Button label to remove a confirmed Instant Messaging address.
+#. TRANS: Button label to remove a confirmed IM address.
 #. TRANS: Button label to remove a confirmed SMS address.
 #. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
-#: actions/emailsettings.php:112 actions/emailsettings.php:179
-#: actions/imsettings.php:112 actions/smssettings.php:120
-#: actions/smssettings.php:176
+#: actions/emailsettings.php:113 actions/emailsettings.php:180
+#: actions/imsettings.php:119 actions/smssettings.php:119
+#: actions/smssettings.php:175
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Wotstronić"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:119
+#: actions/emailsettings.php:120
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -2416,44 +2449,44 @@ msgstr ""
 #. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
 #. TRANS: Any other domain may be owned by a legitimate person or
 #. TRANS: organization.
-#: actions/emailsettings.php:136
+#: actions/emailsettings.php:137
 msgid "Email address, like \"UserName@example.org\""
 msgstr "E-mejlowa adresa, kaž na př. \"WužiwarskeMjeno@example.org\""
 
 #. TRANS: Button label for adding an e-mail address in e-mail settings form.
-#. TRANS: Button label for adding an Instant Messaging address in Instant Messaging settings form.
+#. TRANS: Button label for adding an IM address in IM settings form.
 #. TRANS: Button label for adding a SMS phone number in SMS settings form.
-#: actions/emailsettings.php:140 actions/imsettings.php:147
-#: actions/smssettings.php:158
+#: actions/emailsettings.php:141 actions/imsettings.php:147
+#: actions/smssettings.php:157
 msgctxt "BUTTON"
 msgid "Add"
 msgstr "Přidać"
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:148 actions/smssettings.php:167
+#: actions/emailsettings.php:149 actions/smssettings.php:166
 msgid "Incoming email"
 msgstr "Dochadźaca e-mejl"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:154
+#: actions/emailsettings.php:155
 msgid "I want to post notices by email."
 msgstr "Chcu zdźělenki přez e-mejl pósłać."
 
 #. TRANS: Form instructions for incoming e-mail form in e-mail settings.
 #. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
-#: actions/emailsettings.php:176 actions/smssettings.php:174
+#: actions/emailsettings.php:177 actions/smssettings.php:173
 msgid "Send email to this address to post new notices."
 msgstr "Pósćel e-mejl na tutu adresu, zo by nowe zdźělenki pósłał."
 
 #. TRANS: Instructions for incoming e-mail address input form, when an address has already been assigned.
 #. TRANS: Instructions for incoming SMS e-mail address input form.
-#: actions/emailsettings.php:185 actions/smssettings.php:182
+#: actions/emailsettings.php:186 actions/smssettings.php:181
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr ""
 
 #. TRANS: Instructions for incoming e-mail address input form.
-#: actions/emailsettings.php:189
+#: actions/emailsettings.php:190
 msgid ""
 "To send notices via email, we need to create a unique email address for you "
 "on this server:"
@@ -2461,87 +2494,87 @@ msgstr ""
 
 #. TRANS: Button label for adding an e-mail address to send notices from.
 #. TRANS: Button label for adding an SMS e-mail address to send notices from.
-#: actions/emailsettings.php:195 actions/smssettings.php:185
+#: actions/emailsettings.php:196 actions/smssettings.php:184
 msgctxt "BUTTON"
 msgid "New"
 msgstr "Nowy"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:204
+#: actions/emailsettings.php:205
 msgid "Email preferences"
 msgstr "E-mejlowe nastajenja"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:212
+#: actions/emailsettings.php:213
 msgid "Send me notices of new subscriptions through email."
 msgstr "Pósćel mi zdźělenki wo nowych abonementach přez e-mejl."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:218
+#: actions/emailsettings.php:219
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr "E-mejl pósłać, hdyž něchtó moju powěsć jako faworit přidawa."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:225
+#: actions/emailsettings.php:226
 msgid "Send me email when someone sends me a private message."
 msgstr "E-mejl pósłać, hdyž něchtó priwatnu powěsć sćele."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:231
+#: actions/emailsettings.php:232
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr "E-mejl pósłać, hdyž něchtó mi \"@-reply\" sćele."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:237
+#: actions/emailsettings.php:238
 msgid "Allow friends to nudge me and send me an email."
 msgstr "Přećelam dowolić mje storkać a mi e-mejl pósłać."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:243
+#: actions/emailsettings.php:244
 msgid "Publish a MicroID for my email address."
 msgstr "MicroID za moju e-mejlowu adresu publikować"
 
 #. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:361
+#: actions/emailsettings.php:362
 msgid "Email preferences saved."
 msgstr "E-mejlowe nastajenja składowane."
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:380
+#: actions/emailsettings.php:381
 msgid "No email address."
 msgstr "Žana e-mejlowa adresa."
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:388
+#: actions/emailsettings.php:389
 msgid "Cannot normalize that email address."
 msgstr "Tuta e-mejlowa adresa njehodźi so normalizować."
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:393 actions/register.php:212
+#: actions/emailsettings.php:394 actions/register.php:197
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "Njepłaćiwa e-mejlowa adresa."
 
 #. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:397
+#: actions/emailsettings.php:398
 msgid "That is already your email address."
 msgstr "To je hižo twoja e-mejlowa adresa."
 
 #. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:401
+#: actions/emailsettings.php:402
 msgid "That email address already belongs to another user."
 msgstr "Ta e-mejlowa adresa hižo słuša k druhemu wužiwarjej."
 
 #. TRANS: Server error thrown on database error adding e-mail confirmation code.
 #. TRANS: Server error thrown on database error adding Instant Messaging confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:418 actions/imsettings.php:343
-#: actions/smssettings.php:365
+#: actions/emailsettings.php:419 actions/imsettings.php:362
+#: actions/smssettings.php:364
 msgid "Could not insert confirmation code."
 msgstr "Wobkrućenski kod njehodźi so zasunyć."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:425
+#: actions/emailsettings.php:426
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
@@ -2550,57 +2583,60 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling Instant Messaging address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:445 actions/imsettings.php:377
-#: actions/smssettings.php:399
+#: actions/emailsettings.php:446 actions/imsettings.php:391
+#: actions/smssettings.php:398
 msgid "No pending confirmation to cancel."
 msgstr "Njeje žane njesćinjene wobkrućenje, kotrež da so přetorhnyć,"
 
 #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:450
+#: actions/emailsettings.php:451
 msgid "That is the wrong email address."
 msgstr "To je wopačna e-mejlowa adresa."
 
 #. TRANS: Server error thrown on database error canceling e-mail address confirmation.
 #. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
-#: actions/emailsettings.php:459 actions/smssettings.php:413
+#: actions/emailsettings.php:460 actions/smssettings.php:412
 msgid "Could not delete email confirmation."
 msgstr "E-mejlowe wobkrućenje njeda so zhašeć."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:464
+#: actions/emailsettings.php:465
 msgid "Email confirmation cancelled."
 msgstr "E-mejlowe wobkrućenje přetorhnjene."
 
 #. TRANS: Message given trying to remove an e-mail address that is not
 #. TRANS: registered for the active user.
-#: actions/emailsettings.php:483
+#: actions/emailsettings.php:484
 msgid "That is not your email address."
 msgstr "To njeje twoja e-mejlowa adresa."
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:504
+#: actions/emailsettings.php:505
 msgid "The email address was removed."
 msgstr "E-mejlowa adresa bu wotstronjena."
 
 #. TRANS: Form validation error displayed when trying to remove an incoming e-mail address while no address has been set.
-#: actions/emailsettings.php:518 actions/smssettings.php:555
+#: actions/emailsettings.php:519 actions/smssettings.php:554
 msgid "No incoming email address."
 msgstr "Žana adresa za dochadźace e-mejle."
 
 #. TRANS: Server error thrown on database error removing incoming e-mail address.
 #. TRANS: Server error thrown on database error adding incoming e-mail address.
-#: actions/emailsettings.php:530 actions/emailsettings.php:554
-#: actions/smssettings.php:565 actions/smssettings.php:588
+#. TRANS: Server error displayed when the user could not be updated in SMS settings.
+#: actions/emailsettings.php:531 actions/emailsettings.php:555
+#: actions/smssettings.php:565 actions/smssettings.php:590
 msgid "Could not update user record."
 msgstr "Datowa sadźba wužiwarja njeda so aktualizować."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:534 actions/smssettings.php:568
+#. TRANS: Confirmation text after updating SMS settings.
+#: actions/emailsettings.php:535 actions/smssettings.php:569
 msgid "Incoming email address removed."
 msgstr "Adresa za dochadźaće e-mejle wotstronjena."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:558 actions/smssettings.php:591
+#. TRANS: Confirmation text after updating SMS settings.
+#: actions/emailsettings.php:559 actions/smssettings.php:594
 msgid "New incoming email address added."
 msgstr "Nowa adresa za dochadźace e-mejle přidata."
 
@@ -2611,9 +2647,8 @@ msgstr "Tuta zdźělenka je hižo faworit!"
 
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
 #: actions/favor.php:95
-#, fuzzy
-msgid "Disfavor favorite"
-msgstr "Z faworitow wotstronić"
+msgid "Disfavor favorite."
+msgstr "Z faworitow wotstronić."
 
 #. TRANS: Page title for first page of favorited notices.
 #. TRANS: Title for favourited notices section.
@@ -2659,9 +2694,8 @@ msgstr ""
 #. TRANS: %s is a user's nickname.
 #. TRANS: Title for first page of favourite notices of a user.
 #. TRANS: %s is the user for whom the favourite notices are displayed.
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing own favourited notices.
 #: actions/favoritesrss.php:111 actions/showfavorites.php:76
-#: lib/personalgroupnav.php:122
+#: lib/personalgroupnav.php:110
 #, php-format
 msgid "%s's favorite notices"
 msgstr "Fawority wužiwarja %s"
@@ -2844,14 +2878,12 @@ msgstr ""
 
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
 #: actions/groupblock.php:191
-#, fuzzy
-msgid "Do not block this user from this group"
+msgid "Do not block this user from this group."
 msgstr "Tutoho wužiwarja za tutu skupinu njeblokować."
 
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
 #: actions/groupblock.php:198
-#, fuzzy
-msgid "Block this user from this group"
+msgid "Block this user from this group."
 msgstr "Tutoho wužiwarja za tutu skupinu blokować."
 
 #. TRANS: Server error displayed when trying to block a user from a group fails because of an application error.
@@ -2860,6 +2892,7 @@ msgid "Database error blocking user from group."
 msgstr "Zmylk datoweje banki blokuje wužiwarja za skupinu."
 
 #. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
+#. TRANS: Client error displayed trying to find a user by ID without providing an ID.
 #: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr "Žadyn ID."
@@ -2887,7 +2920,7 @@ msgid "Unable to update your design settings."
 msgstr "Njeje móžno, twoje designowe nastajenja aktualizować."
 
 #. TRANS: Form text to confirm saved group design settings.
-#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:222
+#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:239
 msgid "Design preferences saved."
 msgstr "Designowe nastajenja składowane."
 
@@ -2952,7 +2985,7 @@ msgid "A list of the users in this group."
 msgstr "Lisćina wužiwarjow w tutej skupinje."
 
 #. TRANS: Indicator in group members list that this user is a group administrator.
-#: actions/groupmembers.php:190
+#: actions/groupmembers.php:190 lib/action.php:581
 msgid "Admin"
 msgstr "Administrator"
 
@@ -3037,8 +3070,10 @@ msgid "Group search"
 msgstr "Skupinske pytanje"
 
 #. TRANS: Text on page where groups can be searched if no results were found for a query.
-#: actions/groupsearch.php:82 actions/noticesearch.php:117
-#: actions/peoplesearch.php:83
+#. TRANS: Text for notice search results is the query had no results.
+#. TRANS: Message on the "People search" page where a query has no results.
+#: actions/groupsearch.php:82 actions/noticesearch.php:122
+#: actions/peoplesearch.php:87
 msgid "No results."
 msgstr "Žane wuslědki."
 
@@ -3073,151 +3108,164 @@ msgid "User is not blocked from group."
 msgstr "Wužiwar njeje zablokowany za skupinu."
 
 #. TRANS: Server error displayed when unblocking a user from a group fails because of an unknown error.
+#. TRANS: Server error displayed when removing a user block.
 #: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "Zmylk při wotstronjenju blokowanja."
 
 #. TRANS: Title for Instant Messaging settings.
-#: actions/imsettings.php:58
+#: actions/imsettings.php:56
 msgid "IM settings"
 msgstr "IM-nastajenja"
 
 #. 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.
-#: actions/imsettings.php:71
+#: actions/imsettings.php:69
 #, php-format
 msgid ""
-"You can send and receive notices through Jabber/Google Talk [instant "
-"messages](%%doc.im%%). Configure your address and settings below."
+"You can send and receive notices through instant messaging [instant messages]"
+"(%%doc.im%%). Configure your addresses and settings below."
 msgstr ""
 
-#. TRANS: Message given in the Instant Messaging settings if XMPP is not enabled on the site.
+#. TRANS: Message given in the IM settings if IM is not enabled on the site.
 #: actions/imsettings.php:90
 msgid "IM is not available."
 msgstr "IM k dispoziciji njesteji."
 
-#. TRANS: Form legend for Instant Messaging settings form.
-#. TRANS: Field label for Instant Messaging address input in Instant Messaging settings form.
-#: actions/imsettings.php:102 actions/imsettings.php:132
+#: actions/imsettings.php:116
+#, fuzzy, php-format
+msgid "Current confirmed %s address."
+msgstr "Aktualna wobkrućena e-mejlowa adresa."
+
+#. TRANS: Form note in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:128
+#, php-format
+msgid ""
+"Awaiting confirmation on this address. Check your %s account for a message "
+"with further instructions. (Did you add %s to your buddy list?)"
+msgstr ""
+
+#: actions/imsettings.php:140
 msgid "IM address"
 msgstr "IM-adresa"
 
-#: actions/imsettings.php:109
-msgid "Current confirmed Jabber/Google Talk address."
-msgstr "Aktualna wobkrućena adresa Jabber/Google Talk."
-
-#. TRANS: Form note in Instant Messaging settings form.
-#. TRANS: %s is the Instant Messaging address set for the site.
-#: actions/imsettings.php:120
+#: actions/imsettings.php:142
 #, php-format
-msgid ""
-"Awaiting confirmation on this address. Check your Jabber/Google Talk account "
-"for a message with further instructions. (Did you add %s to your buddy list?)"
+msgid "%s screenname."
 msgstr ""
 
-#. TRANS: IM address input field instructions in Instant Messaging settings form.
-#. TRANS: %s is the Instant Messaging address set for the site.
-#. TRANS: Do not translate "example.org". It is one of the domain names reserved for use in examples by
-#. TRANS: http://www.rfc-editor.org/rfc/rfc2606.txt. Any other domain may be owned by a legitimate
-#. TRANS: person or organization.
-#: actions/imsettings.php:139
-#, php-format
-msgid ""
-"Jabber or Google Talk address, like \"UserName@example.org\". First, make "
-"sure to add %s to your buddy list in your IM client or on Google Talk."
-msgstr ""
-
-#. TRANS: Form legend for Instant Messaging preferences form.
-#: actions/imsettings.php:154
-msgid "IM preferences"
+#. TRANS: Header for IM preferences form.
+#: actions/imsettings.php:163
+#, fuzzy
+msgid "IM Preferences"
 msgstr "IM-nastajenja"
 
-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:159
-msgid "Send me notices through Jabber/Google Talk."
-msgstr "Pósćel mi zdźělenki přez Jabber/Google Talk."
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:174
+#, fuzzy
+msgid "Send me notices"
+msgstr "Zdźělenku pósłać"
 
-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:165
-msgid "Post a notice when my Jabber/Google Talk status changes."
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:176
+#, fuzzy
+msgid "Post a notice when my status changes."
 msgstr "Powěsć pósłac, hdyž so mój status Jabber/Google Talk změni."
 
-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:171
-msgid ""
-"Send me replies through Jabber/Google Talk from people I'm not subscribed to."
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:178
+#, fuzzy
+msgid "Send me replies from people I'm not subscribed to."
 msgstr ""
 "Pósćel mi wotmołwy přez Jabber/Google Talk wot ludźi, kotrychž njejsym "
 "abonował."
 
-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:178
-msgid "Publish a MicroID for my Jabber/Google Talk address."
-msgstr "MicroID za moju adresu Jabber/Google Talk publikować."
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:181
+#, fuzzy
+msgid "Publish a MicroID"
+msgstr "MicroID za moju e-mejlowu adresu publikować"
 
-#. TRANS: Confirmation message for successful Instant Messaging preferences save.
-#: actions/imsettings.php:283 actions/othersettings.php:192
+#. TRANS: Server error thrown on database error updating IM preferences.
+#: actions/imsettings.php:291
+#, fuzzy
+msgid "Couldn't update IM preferences."
+msgstr "Wužiwar njeje so dał aktualizować."
+
+#. TRANS: Confirmation message for successful IM preferences save.
+#. TRANS: Confirmation message after saving preferences.
+#: actions/imsettings.php:298 actions/urlsettings.php:244
 msgid "Preferences saved."
 msgstr "Nastajenja składowane."
 
-#. TRANS: Message given saving Instant Messaging address without having provided one.
-#: actions/imsettings.php:304
-msgid "No Jabber ID."
-msgstr "Žadyn ID Jabber."
+#. TRANS: Message given saving IM address without having provided one.
+#: actions/imsettings.php:320
+#, fuzzy
+msgid "No screenname."
+msgstr "Žane přimjeno."
 
-#. TRANS: Message given saving Instant Messaging address that cannot be normalised.
-#: actions/imsettings.php:312
-msgid "Cannot normalize that Jabber ID."
+#: actions/imsettings.php:325
+#, fuzzy
+msgid "No transport."
+msgstr "Žana zdźělenka."
+
+#. TRANS: Message given saving IM address that cannot be normalised.
+#: actions/imsettings.php:333
+#, fuzzy
+msgid "Cannot normalize that screenname"
 msgstr "Tutón Jabber-ID njehodźi so normalizować"
 
-#. TRANS: Message given saving Instant Messaging address that not valid.
-#: actions/imsettings.php:317
-msgid "Not a valid Jabber ID."
-msgstr "Njepłaćiwy Jabber-ID."
+#. TRANS: Message given saving IM address that not valid.
+#: actions/imsettings.php:340
+#, fuzzy
+msgid "Not a valid screenname"
+msgstr "Žane płaćiwe přimjeno."
 
-#. TRANS: Message given saving Instant Messaging address that is already set.
-#: actions/imsettings.php:321
-msgid "That is already your Jabber ID."
-msgstr "To je hižo twój ID Jabber."
-
-#. TRANS: Message given saving Instant Messaging address that is already set for another user.
-#: actions/imsettings.php:325
-msgid "Jabber ID already belongs to another user."
+#. TRANS: Message given saving IM address that is already set for another user.
+#: actions/imsettings.php:344
+#, fuzzy
+msgid "Screenname already belongs to another user."
 msgstr "Jabber-ID hižo druhemu wužiwarjej słuša."
 
-#. TRANS: Message given saving valid Instant Messaging address that is to be confirmed.
-#. TRANS: %s is the Instant Messaging address set for the site.
-#: actions/imsettings.php:353
-#, php-format
-msgid ""
-"A confirmation code was sent to the IM address you added. You must approve %"
-"s for sending messages to you."
-msgstr ""
+#. TRANS: Message given saving valid IM address that is to be confirmed.
+#: actions/imsettings.php:369
+#, fuzzy
+msgid "A confirmation code was sent to the IM address you added."
+msgstr "Tutón wobkrućenski kod njeje za tebje!"
 
-#. TRANS: Message given canceling Instant Messaging address confirmation for the wrong IM address.
-#: actions/imsettings.php:382
+#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#: actions/imsettings.php:396
 msgid "That is the wrong IM address."
 msgstr "to je wopačna IM-adresa."
 
-#. TRANS: Server error thrown on database error canceling Instant Messaging address confirmation.
-#: actions/imsettings.php:391
-msgid "Could not delete IM confirmation."
+#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#: actions/imsettings.php:405
+#, fuzzy
+msgid "Couldn't delete confirmation."
 msgstr "IM-wobkrućenje njeda so zhašeć."
 
-#. TRANS: Message given after successfully canceling Instant Messaging address confirmation.
-#: actions/imsettings.php:396
+#. TRANS: Message given after successfully canceling IM address confirmation.
+#: actions/imsettings.php:410
 msgid "IM confirmation cancelled."
 msgstr "IM-wobkrućenje přetorhnjene."
 
-#. TRANS: Message given trying to remove an Instant Messaging address that is not
+#. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.
-#: actions/imsettings.php:417
-msgid "That is not your Jabber ID."
-msgstr "To njeje twój ID Jabber."
+#: actions/imsettings.php:434
+#, fuzzy
+msgid "That is not your screenname."
+msgstr "To twoje telefonowe čisło njeje."
+
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#: actions/imsettings.php:443
+#, fuzzy
+msgid "Couldn't update user im prefs."
+msgstr "Datowa sadźba wužiwarja njeda so aktualizować."
 
 #. TRANS: Message given after successfully removing a registered Instant Messaging address.
-#: actions/imsettings.php:440
+#: actions/imsettings.php:451
 msgid "The IM address was removed."
 msgstr "IM-adresa bu wotstronjena."
 
@@ -3408,7 +3456,7 @@ msgid "You must be logged in to join a group."
 msgstr "Dyrbiš přizjewjeny być, zo by do skupiny zastupił."
 
 #. TRANS: Title for join group page after joining.
-#: actions/joingroup.php:147
+#: actions/joingroup.php:148
 #, php-format
 msgctxt "TITLE"
 msgid "%1$s joined group %2$s"
@@ -3535,7 +3583,7 @@ msgstr "URL za wobraz, kotryž ma so z licencu zwobraznić."
 #. TRANS: Submit button title.
 #: actions/licenseadminpanel.php:311 actions/sessionsadminpanel.php:199
 #: actions/siteadminpanel.php:292 actions/snapshotadminpanel.php:245
-#: actions/tagother.php:154 lib/applicationeditform.php:357
+#: actions/tagother.php:133 lib/applicationeditform.php:357
 msgid "Save"
 msgstr "Składować"
 
@@ -3543,39 +3591,41 @@ msgstr "Składować"
 msgid "Save license settings"
 msgstr "Licencne nastajenja składować"
 
-#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
+#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
+#: actions/login.php:97 actions/otp.php:62 actions/register.php:130
 msgid "Already logged in."
 msgstr "Hižo přizjewjeny."
 
-#: actions/login.php:148
+#: actions/login.php:125
 msgid "Incorrect username or password."
 msgstr "Wopačne wužiwarske mjeno abo hesło."
 
-#: actions/login.php:154 actions/otp.php:120
+#. TRANS: Server error displayed when a user object could not be created trying to login using "one time password login".
+#: actions/login.php:131 actions/otp.php:127
 msgid "Error setting user. You are probably not authorized."
 msgstr "Zmylk při nastajenju wužiwarja. Snano njejsy awtorizowany."
 
-#: actions/login.php:210 actions/login.php:263
+#: actions/login.php:185 actions/login.php:236 lib/action.php:598
 msgid "Login"
 msgstr "Přizjewić"
 
-#: actions/login.php:249
+#: actions/login.php:222
 msgid "Login to site"
 msgstr "Při sydle přizjewić"
 
-#: actions/login.php:258 actions/register.php:490
+#: actions/login.php:231 actions/register.php:469
 msgid "Remember me"
 msgstr "Składować"
 
-#: actions/login.php:259 actions/register.php:492
+#: actions/login.php:232 actions/register.php:471
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 
-#: actions/login.php:269
+#: actions/login.php:241
 msgid "Lost or forgotten password?"
 msgstr "Hesło zhubjene abo zabyte?"
 
-#: actions/login.php:288
+#: actions/login.php:259
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -3583,11 +3633,11 @@ msgstr ""
 "Prošu zapodaj z přičinow wěstoty swoje wužiwarske mjeno znowa, prjedy hač "
 "změniš swoje nastajenja."
 
-#: actions/login.php:292
+#: actions/login.php:263
 msgid "Login with your username and password."
 msgstr "Přizjewjenje z twojim wužiwarskim mjenom a hesłom."
 
-#: actions/login.php:295
+#: actions/login.php:266
 #, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -3711,44 +3761,56 @@ msgstr "Nowa zdźělenka"
 msgid "Notice posted"
 msgstr "Zdźělenka wotpósłana"
 
-#: actions/noticesearch.php:68
+#. TRANS: Instructions for Notice search page.
+#. TRANS: %%site.name%% is the name of the StatusNet site.
+#: actions/noticesearch.php:69
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
 "by spaces; they must be 3 characters or more."
 msgstr ""
 
-#: actions/noticesearch.php:78
+#. TRANS: Title of the page where users can search for notices.
+#: actions/noticesearch.php:80
 msgid "Text search"
 msgstr "Tekstowe pytanje"
 
-#: actions/noticesearch.php:91
+#. TRANS: Test in RSS notice search.
+#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
+#: actions/noticesearch.php:95
 #, php-format
 msgid "Search results for \"%1$s\" on %2$s"
 msgstr "Pytanske wuslědki za \"%1$s\" na %2$s"
 
-#: actions/noticesearch.php:121
+#. TRANS: Text for logged in users making a query for notices without results.
+#. TRANS: This message contains a Markdown link.
+#: actions/noticesearch.php:128
 #, php-format
 msgid ""
 "Be the first to [post on this topic](%%%%action.newnotice%%%%?"
 "status_textarea=%s)!"
 msgstr ""
 
-#: actions/noticesearch.php:124
+#. TRANS: Text for not logged in users making a query for notices without results.
+#. TRANS: This message contains Markdown links.
+#: actions/noticesearch.php:133
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and be the first to "
 "[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
 msgstr ""
 
-#: actions/noticesearchrss.php:96
+#. TRANS: RSS notice search feed title. %s is the query.
+#: actions/noticesearchrss.php:95
 #, php-format
 msgid "Updates with \"%s\""
 msgstr "Aktualizacije z \"%s\""
 
-#: actions/noticesearchrss.php:98
-#, fuzzy, php-format
-msgid "Updates matching search term \"%1$s\" on %2$s!"
+#. TRANS: RSS notice search feed description.
+#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
+#: actions/noticesearchrss.php:99
+#, php-format
+msgid "Updates matching search term \"%1$s\" on %2$s."
 msgstr ""
 "Aktualizacije, kotrež pytanskemu zapřijeću \"%1$s\" na \"%2$s\" wotpowěduja."
 
@@ -3767,51 +3829,51 @@ msgid "Nudge sent!"
 msgstr "Stork wotpósłany!"
 
 #. TRANS: Message displayed to an anonymous user trying to view OAuth application list.
-#: actions/oauthappssettings.php:60
+#: actions/oauthappssettings.php:57
 msgid "You must be logged in to list your applications."
 msgstr "Dyrbiš přizjewjeny być, zo by swoje aplikacije nalistował."
 
 #. TRANS: Page title for OAuth applications
-#: actions/oauthappssettings.php:76
+#: actions/oauthappssettings.php:73
 msgid "OAuth applications"
 msgstr "Aplikacije OAuth"
 
 #. TRANS: Page instructions for OAuth applications
-#: actions/oauthappssettings.php:88
+#: actions/oauthappssettings.php:85
 msgid "Applications you have registered"
 msgstr "Aplikacije, za kotrež sy zregistrował"
 
 #. TRANS: Empty list message on page with OAuth applications.
-#: actions/oauthappssettings.php:141
+#: actions/oauthappssettings.php:138
 #, php-format
 msgid "You have not registered any applications yet."
 msgstr "Hišće njejsy aplikacije zregistrował."
 
 #. TRANS: Title for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:71
+#: actions/oauthconnectionssettings.php:69
 msgid "Connected applications"
 msgstr "Zwjazane aplikacije"
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:83
+#: actions/oauthconnectionssettings.php:80
 msgid "The following connections exist for your account."
 msgstr "Slědowace zwiski za twoje konto eksistuja."
 
 #. TRANS: Client error when trying to revoke access for an application while not being a user of it.
-#: actions/oauthconnectionssettings.php:168
+#: actions/oauthconnectionssettings.php:165
 msgid "You are not a user of that application."
 msgstr "Njejsy wužiwar tuteje aplikacije."
 
 #. TRANS: Client error when revoking access has failed for some reason.
 #. TRANS: %s is the application ID revoking access failed for.
-#: actions/oauthconnectionssettings.php:183
+#: actions/oauthconnectionssettings.php:180
 #, php-format
 msgid "Unable to revoke access for application: %s."
 msgstr "Njemóžno přistup za aplikaciju cofnyć: %s-"
 
 #. TRANS: Success message after revoking access for an application.
 #. TRANS: %1$s is the application name, %2$s is the first part of the user token.
-#: actions/oauthconnectionssettings.php:202
+#: actions/oauthconnectionssettings.php:199
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -3819,20 +3881,30 @@ msgid ""
 msgstr ""
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:213
+#: actions/oauthconnectionssettings.php:210
 msgid "You have not authorized any applications to use your account."
 msgstr "Njejsy aplikacije za wužiwanje wašeho konta awtorizował."
 
 #. TRANS: Note for developers in the OAuth connection settings form.
 #. TRANS: This message contains a Markdown link. Do not separate "](".
 #. TRANS: %s is the URL to the OAuth settings.
-#: actions/oauthconnectionssettings.php:233
+#: actions/oauthconnectionssettings.php:230
 #, php-format
 msgid ""
 "Are you a developer? [Register an OAuth client application](%s) to use with "
 "this instance of StatusNet."
 msgstr ""
 
+#: actions/oembed.php:64
+#, php-format
+msgid "\"%s\" not found."
+msgstr "\"%s\" njenamakany."
+
+#: actions/oembed.php:76
+#, php-format
+msgid "Notice %s not found."
+msgstr "Zdźělenka %s njenamakana."
+
 #: actions/oembed.php:80 actions/shownotice.php:100
 msgid "Notice has no profile."
 msgstr "Zdźělenka nima profil."
@@ -3842,6 +3914,16 @@ msgstr "Zdźělenka nima profil."
 msgid "%1$s's status on %2$s"
 msgstr "Status %1$s na %2$s"
 
+#: actions/oembed.php:95
+#, php-format
+msgid "Attachment %s not found."
+msgstr "Přiwěšk %s njenamakany."
+
+#: actions/oembed.php:136
+#, php-format
+msgid "\"%s\" not supported for oembed requests."
+msgstr ""
+
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
 #: actions/oembed.php:168
 #, php-format
@@ -3855,93 +3937,60 @@ msgid "Only %s URLs over plain HTTP please."
 msgstr ""
 
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1205
-#: lib/apiaction.php:1232 lib/apiaction.php:1367
+#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1207
+#: lib/apiaction.php:1234 lib/apiaction.php:1369
 msgid "Not a supported data format."
 msgstr "Njeje podpěrany datowy format."
 
+#. TRANS: ShortName in the OpenSearch interface when trying to find users.
 #: actions/opensearch.php:64
 msgid "People Search"
 msgstr "Ludźi pytać"
 
-#: actions/opensearch.php:67
+#: actions/opensearch.php:68
 msgid "Notice Search"
 msgstr "Zdźělenku pytać"
 
-#: actions/othersettings.php:59
-msgid "Other settings"
-msgstr "Druhe nastajenja"
-
-#. TRANS: Instructions for tab "Other" in user profile settings.
-#: actions/othersettings.php:71
-msgid "Manage various other options."
-msgstr "Wšelake druhe opcije zrjadować."
-
-#. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
-#. TRANS: user's profile settings. Use of "free" is as in "open", indicating that the
-#. TRANS: information on the shortener site is freely distributable.
-#. TRANS: This message has one space at the beginning. Use your language's word separator
-#. TRANS: here if it has one (most likely a single space).
-#: actions/othersettings.php:113
-msgid " (free service)"
-msgstr " (swobodna słužba)"
-
-#. TRANS: Label for dropdown with URL shortener services.
-#: actions/othersettings.php:122
-msgid "Shorten URLs with"
-msgstr "URL skrótšić z"
-
-#. TRANS: Tooltip for for dropdown with URL shortener services.
-#: actions/othersettings.php:124
-msgid "Automatic shortening service to use."
-msgstr ""
-
-#. TRANS: Label for checkbox.
-#: actions/othersettings.php:130
-msgid "View profile designs"
-msgstr "Profilowe designy sej wobhladać"
-
-#. TRANS: Tooltip for checkbox.
-#: actions/othersettings.php:132
-msgid "Show or hide profile designs."
-msgstr "Profilowe designy pokazać abo schować."
-
-#. TRANS: Form validation error for form "Other settings" in user profile.
-#: actions/othersettings.php:164
-msgid "URL shortening service is too long (maximum 50 characters)."
-msgstr "Krótšenska słužba za URL je předołha (maks. 50 znamješkow)."
-
-#: actions/otp.php:69
+#. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
+#: actions/otp.php:70
 msgid "No user ID specified."
 msgstr "Žadyn wužiwarski ID podaty."
 
-#: actions/otp.php:83
+#. TRANS: Client error displayed trying to use "one time password login" without specifying a login token.
+#: actions/otp.php:86
 msgid "No login token specified."
 msgstr "Žane přizjewjenske znamješko podate."
 
-#: actions/otp.php:90
+#. TRANS: Client error displayed trying to use "one time password login" without requesting a login token.
+#: actions/otp.php:94
 msgid "No login token requested."
 msgstr "Žadyn přizjewjenski token trěbny."
 
-#: actions/otp.php:95
+#. TRANS: Client error displayed trying to use "one time password login" while specifying an invalid login token.
+#: actions/otp.php:100
 msgid "Invalid login token specified."
 msgstr "Njepłaćiwe přizjewjenske znamješko podate."
 
-#: actions/otp.php:104
+#. TRANS: Client error displayed trying to use "one time password login" while specifying an expired login token.
+#: actions/otp.php:110
 msgid "Login token expired."
 msgstr "Přizjewjenske znamješko spadnjene."
 
-#: actions/outbox.php:58
+#. TRANS: Title for outbox for any but the fist page.
+#. TRANS: %1$s is the user nickname, %2$d is the page number.
+#: actions/outbox.php:57
 #, php-format
 msgid "Outbox for %1$s - page %2$d"
 msgstr "Wuchadny póst za %1$s - strona %2$d"
 
+#. TRANS: Title for first page of outbox.
 #: actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
 msgstr "Wuchadny póst za %s"
 
-#: actions/outbox.php:104
+#. TRANS: Instructions for outbox.
+#: actions/outbox.php:103
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr ""
 "To je twój wuchadny póst, kotryž twoje priwatne powěsće nalistuje, kotrež sy "
@@ -3969,43 +4018,42 @@ msgstr "Stare hesło"
 msgid "New password"
 msgstr "Nowe hesło"
 
-#: actions/passwordsettings.php:109
-#, fuzzy
-msgid "6 or more characters"
+#: actions/passwordsettings.php:109 actions/register.php:416
+msgid "6 or more characters."
 msgstr "6 abo wjace znamješkow."
 
-#: actions/passwordsettings.php:113
-#, fuzzy
-msgid "Same as password above"
+#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#: actions/passwordsettings.php:113 actions/recoverpassword.php:264
+#: actions/register.php:420
+msgid "Same as password above."
 msgstr "Samsne hesło kaž horjeka."
 
 #: actions/passwordsettings.php:117
 msgid "Change"
 msgstr "Změnić"
 
-#: actions/passwordsettings.php:154 actions/register.php:238
+#: actions/passwordsettings.php:153 actions/register.php:223
 msgid "Password must be 6 or more characters."
 msgstr "Hesło dyrbi 6 abo wjace znamješkow měć."
 
-#: actions/passwordsettings.php:157 actions/register.php:241
+#: actions/passwordsettings.php:156 actions/register.php:226
 msgid "Passwords don't match."
 msgstr "Hesle so njekryjetej."
 
-#: actions/passwordsettings.php:165
+#: actions/passwordsettings.php:164
 msgid "Incorrect old password"
 msgstr "Wopačne stare hesło"
 
-#: actions/passwordsettings.php:181
+#: actions/passwordsettings.php:180
 msgid "Error saving user; invalid."
 msgstr "Zmylk při składowanju wužiwarja; njepłaćiwy."
 
-#: actions/passwordsettings.php:186
-#, fuzzy
-msgid "Can't save new password."
+#. TRANS: Reset password form validation error message.
+#: actions/passwordsettings.php:185 actions/recoverpassword.php:418
+msgid "Cannot save new password."
 msgstr "Nowe hesło njeda so składować."
 
-#. TRANS: Title for password recovery page in password saved mode.
-#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
+#: actions/passwordsettings.php:191
 msgid "Password saved."
 msgstr "Hesło składowane."
 
@@ -4210,8 +4258,7 @@ msgid "Directory where backgrounds are located."
 msgstr "Zapis, hdźež pozadki su."
 
 #. TRANS: Fieldset legens in Paths admin panel.
-#. TRANS: DT element label in attachment list.
-#: actions/pathsadminpanel.php:419 lib/attachmentlist.php:98
+#: actions/pathsadminpanel.php:419
 msgid "Attachments"
 msgstr "Přiwěški"
 
@@ -4279,14 +4326,17 @@ msgstr ""
 msgid "Save paths"
 msgstr "Šćežki składować"
 
-#: actions/peoplesearch.php:52
+#. TRANS: Instructions for the "People search" page.
+#. TRANS: %%site.name%% is the name of the StatusNet site.
+#: actions/peoplesearch.php:54
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
 "Separate the terms by spaces; they must be 3 characters or more."
 msgstr ""
 
-#: actions/peoplesearch.php:58
+#. TRANS: Title of a page where users can search for other users.
+#: actions/peoplesearch.php:61
 msgid "People search"
 msgstr "Za ludźimi pytać"
 
@@ -4300,6 +4350,60 @@ msgstr "Njepłaćiwa wosobowa taflička: %s."
 msgid "Users self-tagged with %1$s - page %2$d"
 msgstr ""
 
+#. TRANS: Page title for AJAX form return when a disabling a plugin.
+#: actions/plugindisable.php:69
+msgctxt "plugin"
+msgid "Disabled"
+msgstr ""
+
+#. TRANS: Client error displayed trying to perform any request method other than POST.
+#. TRANS: Do not translate POST.
+#: actions/pluginenable.php:78 actions/subscribe.php:77
+msgid "This action only accepts POST requests."
+msgstr ""
+
+#: actions/pluginenable.php:102
+#, fuzzy
+msgid "You cannot administer plugins."
+msgstr "Njemóžeš wužiwarjow wušmórnyć."
+
+#: actions/pluginenable.php:109
+#, fuzzy
+msgid "No such plugin."
+msgstr "Strona njeeksistuje."
+
+#. TRANS: Page title for AJAX form return when enabling a plugin.
+#: actions/pluginenable.php:159
+msgctxt "plugin"
+msgid "Enabled"
+msgstr ""
+
+#. TRANS: Tab and title for plugins admin panel.
+#. TRANS: Menu item for site administration
+#: actions/pluginsadminpanel.php:56 actions/version.php:191
+#: lib/adminpanelaction.php:411
+msgid "Plugins"
+msgstr "Tykače"
+
+#. TRANS: Instructions at top of plugin admin page.
+#: actions/pluginsadminpanel.php:68
+msgid ""
+"Additional plugins can be enabled and configured manually. See the <a href="
+"\"http://status.net/wiki/Plugins\">online plugin documentation</a> for more "
+"details."
+msgstr ""
+
+#. TRANS: Admin form section header
+#: actions/pluginsadminpanel.php:84
+#, fuzzy
+msgid "Default plugins"
+msgstr "Standardna rěč"
+
+#: actions/pluginsadminpanel.php:106
+msgid ""
+"All default plugins have been disabled from the site's configuration file."
+msgstr ""
+
 #: actions/postnotice.php:95
 msgid "Invalid notice content."
 msgstr "Njepłaćiwy wobsah zdźělenki."
@@ -4310,12 +4414,12 @@ msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’.
 msgstr ""
 
 #. TRANS: Page title for profile settings.
-#: actions/profilesettings.php:59
+#: actions/profilesettings.php:60
 msgid "Profile settings"
 msgstr "Profilowe nastajenja"
 
 #. TRANS: Usage instructions for profile settings.
-#: actions/profilesettings.php:70
+#: actions/profilesettings.php:71
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
@@ -4323,42 +4427,39 @@ msgstr ""
 "wjace wo tebi zhonili."
 
 #. TRANS: Profile settings form legend.
-#: actions/profilesettings.php:98
+#: actions/profilesettings.php:99
 msgid "Profile information"
 msgstr "Profilowe informacije"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109 actions/register.php:433
+#: actions/profilesettings.php:110 actions/register.php:412
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr ""
 "1-64 małopisanych pismikow abo ličbow, žane interpunkciske znamješka abo "
 "mjezery."
 
 #. TRANS: Field label in form for profile settings.
-#. TRANS: Label for full group name (dt). Text hidden by default.
-#. TRANS: DT for full name in a profile.
-#: actions/profilesettings.php:113 actions/register.php:455
-#: actions/showgroup.php:255 actions/tagother.php:104
-#: lib/groupeditform.php:150 lib/userprofile.php:156
+#: actions/profilesettings.php:114 actions/register.php:434
+#: lib/groupeditform.php:150
 msgid "Full name"
 msgstr "Dospołne mjeno"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:118 actions/register.php:460
+#: actions/profilesettings.php:119 actions/register.php:439
 #: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "Startowa strona"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:121
+#: actions/profilesettings.php:122 actions/register.php:441
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr "URL twojeje startoweje strony, bloga abo profila na druhim sydle."
 
 #. TRANS: Tooltip for field label in form for profile settings. Plural
 #. TRANS: is decided by the number of characters available for the
 #. TRANS: biography (%d).
-#: actions/profilesettings.php:129 actions/register.php:471
+#: actions/profilesettings.php:130 actions/register.php:450
 #, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4368,83 +4469,77 @@ msgstr[2] "Wopisaj sebje a swoje zajimy z %d znamješkami"
 msgstr[3] "Wopisaj sebje a swoje zajimy z %d znamješkami"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:135 actions/register.php:476
+#: actions/profilesettings.php:136 actions/register.php:455
 msgid "Describe yourself and your interests"
 msgstr "Wopisaj sebje a swoje zajimy"
 
 #. TRANS: Text area label in form for profile settings where users can provide.
 #. TRANS: their biography.
-#: actions/profilesettings.php:139 actions/register.php:478
+#: actions/profilesettings.php:140 actions/register.php:457
 msgid "Bio"
 msgstr "Biografija"
 
 #. TRANS: Field label in form for profile settings.
-#. TRANS: Label for group location (dt). Text hidden by default.
-#. TRANS: DT for location in a profile.
-#: actions/profilesettings.php:145 actions/register.php:483
-#: actions/showgroup.php:265 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:173
-#: lib/userprofile.php:172
+#: actions/profilesettings.php:146 actions/register.php:462
+#: lib/groupeditform.php:173
 msgid "Location"
 msgstr "Městno"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148 actions/register.php:485
+#: actions/profilesettings.php:149
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Hdźež sy, na př. \"město, zwjazkowy kraj (abo region) , kraj\""
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:153
+#: actions/profilesettings.php:154
 msgid "Share my current location when posting notices"
 msgstr ""
 
 #. TRANS: Field label in form for profile settings.
-#. TRANS: DT for tags in a profile.
-#: actions/profilesettings.php:161 actions/tagother.php:149
-#: actions/tagother.php:209 lib/subscriptionlist.php:106
-#: lib/subscriptionlist.php:108 lib/userprofile.php:220
+#: actions/profilesettings.php:162 actions/tagother.php:128
+#: actions/tagother.php:188 lib/subscriptionlist.php:104
+#: lib/subscriptionlist.php:106
 msgid "Tags"
 msgstr ""
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:164
+#: actions/profilesettings.php:165
 msgid ""
-"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- "
+"separated."
 msgstr ""
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:169
+#: actions/profilesettings.php:170
 msgid "Language"
 msgstr "Rěč"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:171
-#, fuzzy
-msgid "Preferred language"
+#: actions/profilesettings.php:172
+msgid "Preferred language."
 msgstr "Preferowana rěč."
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:181
+#: actions/profilesettings.php:182
 msgid "Timezone"
 msgstr "Časowe pasmo"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:183
+#: actions/profilesettings.php:184
 msgid "What timezone are you normally in?"
 msgstr "W kotrym časowym pasmje sy zwjetša?"
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:189
-#, fuzzy
+#: actions/profilesettings.php:190
 msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)"
+"Automatically subscribe to whoever subscribes to me (best for non-humans)."
 msgstr ""
 "Awtomatisce kóždeho abonować, kotryž  mje abonuje (najlěpše za \"njeludźi\")."
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Plural form is used based on the maximum number of allowed
 #. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:258 actions/register.php:229
+#: actions/profilesettings.php:259 actions/register.php:214
 #, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4454,47 +4549,47 @@ msgstr[2] "Biografija je předołha (maks. %d znamješka)."
 msgstr[3] "Biografija je předołha (maks. %d znamješkow)."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:269 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:270 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr "Časowe pasmo njeje wubrane."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:277
+#: actions/profilesettings.php:278
 msgid "Language is too long (maximum 50 characters)."
 msgstr "Mjeno rěče je předołhe (maks. 50 znamješkow)."
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:291 actions/tagother.php:178
+#: actions/profilesettings.php:292
 #, php-format
-msgid "Invalid tag: \"%s\""
-msgstr "Njepłaćiwa taflička: \"%s\""
+msgid "Invalid tag: \"%s\"."
+msgstr "Njepłaćiwa taflička: \"%s\"."
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:347
+#: actions/profilesettings.php:348
 msgid "Could not update user for autosubscribe."
 msgstr "Wužiwar njeda so za awtomatiske abonowanje aktualizować."
 
 #. TRANS: Server error thrown when user profile location preference settings could not be updated.
-#: actions/profilesettings.php:405
+#: actions/profilesettings.php:406
 msgid "Could not save location prefs."
 msgstr "Nastajenja městna njedachu so składować."
 
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:427 actions/tagother.php:200
+#: actions/profilesettings.php:428 actions/tagother.php:179
 msgid "Could not save tags."
 msgstr "Taflički njedadźa so składować."
 
 #. TRANS: Confirmation shown when user profile settings are saved.
 #. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:436 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:437 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "Nastajenja składowane."
 
 #. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
 #. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:483 actions/restoreaccount.php:60
+#: actions/profilesettings.php:484 actions/restoreaccount.php:60
 msgid "Restore account"
 msgstr "Konto wobnowić"
 
@@ -4562,6 +4657,12 @@ msgid ""
 "tool."
 msgstr ""
 
+#. TRANS: Public RSS feed description. %s is the StatusNet site name.
+#: actions/publicrss.php:106
+#, php-format
+msgid "%s updates from everyone."
+msgstr "%s aktualizacijow wote wšěch."
+
 #. TRANS: Title for public tag cloud.
 #: actions/publictagcloud.php:57
 msgid "Public tag cloud"
@@ -4600,10 +4701,6 @@ msgid ""
 "one!"
 msgstr ""
 
-#: actions/publictagcloud.php:146
-msgid "Tag cloud"
-msgstr "Mróčel tafličkow"
-
 #. TRANS: Client error displayed trying to recover password while already logged in.
 #: actions/recoverpassword.php:37
 msgid "You are already logged in!"
@@ -4693,6 +4790,11 @@ msgstr "Hesło wobnowić"
 msgid "Password recovery requested"
 msgstr "Wobnowjenje hesła požadane"
 
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/recoverpassword.php:229
+msgid "Password saved"
+msgstr "Hesło składowane"
+
 #. TRANS: Title for password recovery page when an unknown action has been specified.
 #: actions/recoverpassword.php:232
 msgid "Unknown action"
@@ -4703,14 +4805,9 @@ msgstr "Njeznata akcija"
 msgid "6 or more characters, and do not forget it!"
 msgstr "6 abo wjace znamješkow, a njezabudź jo!"
 
-#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
-#: actions/recoverpassword.php:264 actions/register.php:441
-msgid "Same as password above."
-msgstr "Samsne hesło kaž horjeka."
-
 #. TRANS: Button text for password reset form.
 #. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: actions/recoverpassword.php:268 lib/designsettings.php:264
+#: actions/recoverpassword.php:268 lib/designform.php:145
 msgctxt "BUTTON"
 msgid "Reset"
 msgstr "Wróćo stajić"
@@ -4758,13 +4855,8 @@ msgstr "Hesło dyrbi 6 znamješkow abo wjace měć."
 msgid "Password and confirmation do not match."
 msgstr "Hesło a jeho wobkrućenje so njekryjetej."
 
-#. TRANS: Reset password form validation error message.
-#: actions/recoverpassword.php:418
-msgid "Cannot save new password."
-msgstr "Nowe hesło njeda so składować."
-
 #. TRANS: Server error displayed when something does wrong with the user object during password reset.
-#: actions/recoverpassword.php:426 actions/register.php:256
+#: actions/recoverpassword.php:426 actions/register.php:241
 msgid "Error setting user."
 msgstr "Zmylk při nastajenju wužiwarja."
 
@@ -4773,99 +4865,101 @@ msgstr "Zmylk při nastajenju wužiwarja."
 msgid "New password successfully saved. You are now logged in."
 msgstr "Nowe hesło bu wuspěšnje składowane. Sy nětko přizjewjeny."
 
-#: actions/register.php:92 actions/register.php:196 actions/register.php:413
+#: actions/redirecturl.php:70
+#, fuzzy
+msgid "No id parameter"
+msgstr "Žadyn argument ID."
+
+#: actions/redirecturl.php:76
+#, fuzzy, php-format
+msgid "No such file \"%d\""
+msgstr "Dataja njeeksistuje."
+
+#: actions/register.php:80 actions/register.php:181 actions/register.php:392
 msgid "Sorry, only invited people can register."
 msgstr "Wodaj, jenož přeprošeni ludźo móžeja so registrować."
 
-#: actions/register.php:99
+#: actions/register.php:87
 msgid "Sorry, invalid invitation code."
 msgstr "Wodaj, njepłaćiwy přeprošenski kod."
 
-#: actions/register.php:119
+#: actions/register.php:106
 msgid "Registration successful"
 msgstr "Registrowanje wuspěšne"
 
-#: actions/register.php:121 actions/register.php:511
+#: actions/register.php:108 actions/register.php:490
 msgid "Register"
 msgstr "Registrować"
 
-#: actions/register.php:142
+#: actions/register.php:128
 msgid "Registration not allowed."
 msgstr "Registracija njedowolena."
 
-#: actions/register.php:209
-#, fuzzy
-msgid "You can't register if you don't agree to the license."
+#: actions/register.php:194
+msgid "You cannot register if you don't agree to the license."
 msgstr "Njemóžeš so registrować, jeli njepřizwoleš do licency."
 
-#: actions/register.php:218
+#: actions/register.php:203
 msgid "Email address already exists."
 msgstr "E-mejlowa adresa hižo eksistuje."
 
-#: actions/register.php:251 actions/register.php:273
+#: actions/register.php:236 actions/register.php:258
 msgid "Invalid username or password."
 msgstr "Njepłaćiwe wužiwarske mjeno abo hesło."
 
-#: actions/register.php:351
+#: actions/register.php:333
 msgid ""
 "With this form you can create a new account. You can then post notices and "
-"link up to friends and colleagues. "
+"link up to friends and colleagues."
 msgstr ""
 
-#: actions/register.php:437
-msgid "6 or more characters."
-msgstr "6 abo wjace znamješkow."
-
-#. TRANS: Link description in user account settings menu.
-#: actions/register.php:445 actions/register.php:449
-#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
+#: actions/register.php:424 actions/register.php:428
+#: actions/siteadminpanel.php:238 lib/settingsnav.php:92
 msgid "Email"
 msgstr "E-mejl"
 
-#: actions/register.php:446 actions/register.php:450
-msgid "Used only for updates, announcements, and password recovery"
+#: actions/register.php:425 actions/register.php:429
+msgid "Used only for updates, announcements, and password recovery."
 msgstr ""
 
-#: actions/register.php:457
-#, fuzzy
-msgid "Longer name, preferably your \"real\" name"
+#: actions/register.php:436
+msgid "Longer name, preferably your \"real\" name."
 msgstr "Dlěše mjeno, wosebje twoje \"woprawdźite\" mjeno."
 
-#: actions/register.php:462
-#, fuzzy
-msgid "URL of your homepage, blog, or profile on another site"
-msgstr "URL twojeje startoweje strony, bloga abo profila na druhim sydle."
+#: actions/register.php:464
+msgid "Where you are, like \"City, State (or Region), Country\"."
+msgstr "Hdźež sy, na př. \"město, zwjazkowy kraj (abo region) , kraj\"."
 
-#: actions/register.php:523
+#: actions/register.php:503
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
 msgstr "Rozumju, zo wobsah a daty wot %1$s su priwatne a dowěrliwe."
 
-#: actions/register.php:533
+#: actions/register.php:513
 #, php-format
 msgid "My text and files are copyright by %1$s."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:537
+#: actions/register.php:517
 msgid "My text and files remain under my own copyright."
 msgstr "Mój tekst a moje dataje wostawaja pod mojim swójskim awtorskim prawom."
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:540
+#: actions/register.php:520
 msgid "All rights reserved."
 msgstr "Wšě prawa wuměnjenjene."
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:545
+#: actions/register.php:525
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
 "email address, IM address, and phone number."
 msgstr ""
 
-#: actions/register.php:588
+#: actions/register.php:566
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -4884,7 +4978,7 @@ msgid ""
 "Thanks for signing up and we hope you enjoy using this service."
 msgstr ""
 
-#: actions/register.php:612
+#: actions/register.php:590
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -4911,8 +5005,7 @@ msgid "User nickname"
 msgstr "Wužiwarske přimjeno"
 
 #: actions/remotesubscribe.php:129
-#, fuzzy
-msgid "Nickname of the user you want to follow"
+msgid "Nickname of the user you want to follow."
 msgstr "Přimjeno wužiwarja, kotremuž chceš slědować."
 
 #: actions/remotesubscribe.php:132
@@ -4920,20 +5013,18 @@ msgid "Profile URL"
 msgstr "URL profila"
 
 #: actions/remotesubscribe.php:133
-#, fuzzy
-msgid "URL of your profile on another compatible microblogging service"
+msgid "URL of your profile on another compatible microblogging service."
 msgstr ""
 "URL twojeho profila při druhej kompatibelnej mikroblogowanskej słužbje."
 
 #. TRANS: Link text for link that will subscribe to a remote profile.
 #: actions/remotesubscribe.php:136 lib/subscribeform.php:139
-#: lib/userprofile.php:431
+#: lib/userprofile.php:402
 msgid "Subscribe"
 msgstr "Abonować"
 
 #: actions/remotesubscribe.php:158
-#, fuzzy
-msgid "Invalid profile URL (bad format)"
+msgid "Invalid profile URL (bad format)."
 msgstr "Njepłaćiwy profilowy URL (wopačny format)."
 
 #: actions/remotesubscribe.php:167
@@ -4964,7 +5055,7 @@ msgstr "Njemóžeš swójsku zdźělenku wospjetować."
 msgid "You already repeated that notice."
 msgstr "Sy tutu zdźělenku hižo wospjetował."
 
-#: actions/repeat.php:112 lib/noticelist.php:692
+#: actions/repeat.php:112 lib/noticelist.php:697
 msgid "Repeated"
 msgstr "Wospjetowany"
 
@@ -4972,9 +5063,9 @@ msgstr "Wospjetowany"
 msgid "Repeated!"
 msgstr "Wospjetowany!"
 
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing @-replies.
+#. TRANS: RSS reply feed title. %s is a user nickname.
 #: actions/replies.php:126 actions/repliesrss.php:68
-#: lib/personalgroupnav.php:109
+#: lib/personalgroupnav.php:105
 #, php-format
 msgid "Replies to %s"
 msgstr "Wotmołwy na %s"
@@ -5020,9 +5111,11 @@ msgid ""
 "newnotice%%%%?status_textarea=%3$s)."
 msgstr ""
 
-#: actions/repliesrss.php:72
-#, fuzzy, php-format
-msgid "Replies to %1$s on %2$s!"
+#. TRANS: RSS reply feed description.
+#. TRANS: %1$s is a user nickname, %2$s is the StatusNet site name.
+#: actions/repliesrss.php:74
+#, php-format
+msgid "Replies to %1$s on %2$s."
 msgstr "Wotmołwy na %1$s na %2$s."
 
 #. TRANS: Client exception displayed when trying to restore an account while not logged in.
@@ -5117,7 +5210,7 @@ msgstr "Njemóžeš wužiwarske róle na tutym sydle wotwołać."
 msgid "User doesn't have this role."
 msgstr "Wužiwar nima tutu rólu."
 
-#: actions/rsd.php:146 actions/version.php:159
+#: actions/rsd.php:142 actions/version.php:159
 msgid "StatusNet"
 msgstr "StatusNet"
 
@@ -5159,93 +5252,44 @@ msgstr ""
 msgid "Save site settings"
 msgstr "Sydłowe nastajenja składować"
 
-#: actions/showapplication.php:82
+#: actions/showapplication.php:78
 msgid "You must be logged in to view an application."
 msgstr "Dyrbiš přizjewjeny być, zo by sej aplikaciju wobhladał."
 
-#: actions/showapplication.php:157
+#: actions/showapplication.php:151
 msgid "Application profile"
 msgstr "Aplikaciski profil"
 
-#. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:159 lib/applicationeditform.php:177
-msgid "Icon"
-msgstr "Symbol"
-
-#. TRANS: Form input field label for application name.
-#: actions/showapplication.php:169 actions/version.php:197
-#: lib/applicationeditform.php:190
-msgid "Name"
-msgstr "Mjeno"
-
-#. TRANS: Form input field label.
-#: actions/showapplication.php:178 lib/applicationeditform.php:227
-msgid "Organization"
-msgstr "Organizacija"
-
-#. TRANS: Form input field label.
-#: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:168
-msgid "Description"
-msgstr "Wopisanje"
-
-#. TRANS: Header for group statistics on a group page (h2).
-#. TRANS: H2 text for user statistics.
-#: actions/showapplication.php:192 actions/showgroup.php:460
-#: lib/profileaction.php:205
-msgid "Statistics"
-msgstr "Statistika"
-
-#: actions/showapplication.php:203
+#: actions/showapplication.php:179
 #, php-format
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr ""
 
-#: actions/showapplication.php:213
+#: actions/showapplication.php:189
 msgid "Application actions"
 msgstr "Aplikaciske akcije"
 
-#: actions/showapplication.php:236
+#: actions/showapplication.php:212
 msgid "Reset key & secret"
 msgstr ""
 
 #. TRANS: Title of form for deleting a user.
-#: actions/showapplication.php:252 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:64 lib/noticelist.php:673
+#: actions/showapplication.php:228 lib/deletegroupform.php:121
+#: lib/deleteuserform.php:64 lib/noticelist.php:678
 msgid "Delete"
 msgstr "Zničić"
 
-#: actions/showapplication.php:261
+#: actions/showapplication.php:237
 msgid "Application info"
 msgstr "Aplikaciske informacije"
 
-#: actions/showapplication.php:263
-msgid "Consumer key"
-msgstr "Kluč přetrjebowarja"
-
-#: actions/showapplication.php:268
-msgid "Consumer secret"
-msgstr "Potajnstwo přetrjebowarja"
-
-#: actions/showapplication.php:273
-msgid "Request token URL"
-msgstr ""
-
-#: actions/showapplication.php:278
-msgid "Access token URL"
-msgstr ""
-
-#: actions/showapplication.php:283
-msgid "Authorize URL"
-msgstr "URL awtorizować"
-
-#: actions/showapplication.php:288
+#: actions/showapplication.php:255
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
 msgstr ""
 
-#: actions/showapplication.php:309
+#: actions/showapplication.php:275
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr "Chceš woprawdźe swój přetrjebowarski kluč a potajny kod wróćo stajić?"
 
@@ -5324,61 +5368,47 @@ msgstr "skupina %s"
 msgid "%1$s group, page %2$d"
 msgstr "%1$s skupina, strona %2$d"
 
-#. TRANS: Group profile header (h2). Text hidden by default.
-#: actions/showgroup.php:223
-msgid "Group profile"
-msgstr "Skupinski profil"
-
-#. TRANS: Label for group URL (dt). Text hidden by default.
-#. TRANS: DT for URL in a profile.
-#: actions/showgroup.php:273 actions/tagother.php:118
-#: actions/userauthorization.php:175 lib/userprofile.php:186
-msgid "URL"
-msgstr "URL"
-
 #. TRANS: Label for group description or group note (dt). Text hidden by default.
-#. TRANS: DT for note in a profile.
-#: actions/showgroup.php:285 actions/tagother.php:128
-#: actions/userauthorization.php:187 lib/userprofile.php:204
+#: actions/showgroup.php:266
 msgid "Note"
 msgstr "Přispomnjenka"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:296 lib/groupeditform.php:180
+#: actions/showgroup.php:277 lib/groupeditform.php:180
 msgid "Aliases"
 msgstr "Aliasy"
 
 #. TRANS: Group actions header (h2). Text hidden by default.
-#: actions/showgroup.php:313
+#: actions/showgroup.php:294
 msgid "Group actions"
 msgstr "Skupinske akcije"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:357
+#: actions/showgroup.php:338
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
 msgstr "Zdźělenski kanal za skupinu %s (RSS 1.0)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:364
+#: actions/showgroup.php:345
 #, php-format
 msgid "Notice feed for %s group (RSS 2.0)"
 msgstr "Zdźělenski kanal za skupinu %s (RSS 2.0)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:371
+#: actions/showgroup.php:352
 #, php-format
 msgid "Notice feed for %s group (Atom)"
 msgstr "Zdźělenski kanal za skupinu %s (Atom)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:377
+#: actions/showgroup.php:358
 #, php-format
 msgid "FOAF for %s group"
 msgstr "FOAF za skupinu %s"
 
 #. TRANS: Header for mini list of group members on a group page (h2).
-#: actions/showgroup.php:414
+#: actions/showgroup.php:395
 msgid "Members"
 msgstr "Čłonojo"
 
@@ -5386,25 +5416,30 @@ msgstr "Čłonojo"
 #. TRANS: Text for user subscription statistics if the user has no subscriptions.
 #. TRANS: Text for user subscriber statistics if user has no subscribers.
 #. TRANS: Text for user user group membership statistics if user is not a member of any group.
-#: actions/showgroup.php:420 lib/profileaction.php:137
+#: actions/showgroup.php:401 lib/profileaction.php:137
 #: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
-#: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
+#: lib/subscriptionlist.php:123 lib/tagcloudsection.php:71
 msgid "(None)"
 msgstr "(Žadyn)"
 
 #. TRANS: Link to all group members from mini list of group members if group has more than n members.
-#: actions/showgroup.php:429
+#: actions/showgroup.php:410
 msgid "All members"
 msgstr "Wšitcy čłonojo"
 
-#. TRANS: Label for creation date in statistics on group page.
-#: actions/showgroup.php:465
+#. TRANS: Header for group statistics on a group page (h2).
+#. TRANS: H2 text for user statistics.
+#: actions/showgroup.php:441 lib/profileaction.php:205
+msgid "Statistics"
+msgstr "Statistika"
+
+#: actions/showgroup.php:444
 msgctxt "LABEL"
 msgid "Created"
 msgstr "Wutworjeny"
 
 #. TRANS: Label for member count in statistics on group page.
-#: actions/showgroup.php:473
+#: actions/showgroup.php:449
 msgctxt "LABEL"
 msgid "Members"
 msgstr "Čłonojo"
@@ -5413,7 +5448,7 @@ msgstr "Čłonojo"
 #. TRANS: **%s** is the group alias, %%%%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).
-#: actions/showgroup.php:488
+#: actions/showgroup.php:464
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5426,7 +5461,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: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
-#: actions/showgroup.php:498
+#: actions/showgroup.php:474
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5436,7 +5471,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: Header for list of group administrators on a group page (h2).
-#: actions/showgroup.php:527
+#: actions/showgroup.php:503
 msgid "Admins"
 msgstr "Administratorojo"
 
@@ -5475,7 +5510,7 @@ msgid "%1$s tagged %2$s"
 msgstr "%1$s z %2$s woznamjenjeny"
 
 #. TRANS: Page title showing tagged notices in one user's stream.
-#. TRANS: %1$s is the username, %2$s is the hash tag, %1$d is the page number.
+#. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
 #: actions/showstream.php:74
 #, php-format
 msgid "%1$s tagged %2$s, page %3$d"
@@ -5522,13 +5557,13 @@ msgid "FOAF for %s"
 msgstr "FOAF za %s"
 
 #. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
-#: actions/showstream.php:211
+#: actions/showstream.php:205
 #, php-format
 msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr ""
 
 #. TRANS: Second sentence of empty list message for a stream for the user themselves.
-#: actions/showstream.php:217
+#: actions/showstream.php:211
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
@@ -5536,7 +5571,7 @@ msgstr ""
 
 #. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:221
+#: actions/showstream.php:215
 #, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
@@ -5545,7 +5580,7 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:264
+#: actions/showstream.php:258
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5556,7 +5591,7 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:271
+#: actions/showstream.php:265
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5565,7 +5600,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
-#: actions/showstream.php:328
+#: actions/showstream.php:322
 #, php-format
 msgid "Repeat of %s"
 msgstr "Wospjetowanje wot %s"
@@ -5709,147 +5744,145 @@ msgstr ""
 
 #. TRANS: Title for button to save site notice in admin panel.
 #: actions/sitenoticeadminpanel.php:201
-#, fuzzy
-msgid "Save site notice"
+msgid "Save site notice."
 msgstr "Sydłowu zdźělenku składować."
 
 #. TRANS: Title for SMS settings.
-#: actions/smssettings.php:57
+#: actions/smssettings.php:56
 msgid "SMS settings"
 msgstr "SMS-nastajenja"
 
 #. TRANS: SMS settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/smssettings.php:71
+#: actions/smssettings.php:70
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr ""
 
 #. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
-#: actions/smssettings.php:93
+#: actions/smssettings.php:92
 msgid "SMS is not available."
 msgstr "SMS k dispoziciji njesteji."
 
 #. TRANS: Form legend for SMS settings form.
-#: actions/smssettings.php:107
+#: actions/smssettings.php:106
 msgid "SMS address"
 msgstr "SMS-adresa"
 
 #. TRANS: Form guide in SMS settings form.
-#: actions/smssettings.php:116
+#: actions/smssettings.php:115
 msgid "Current confirmed SMS-enabled phone number."
 msgstr "Aktualne wobkrućene telefonowe čisło z SMS-funkciju."
 
 #. TRANS: Form guide in IM settings form.
-#: actions/smssettings.php:129
+#: actions/smssettings.php:128
 msgid "Awaiting confirmation on this phone number."
 msgstr "Wobkrućenje za tute telefonowe čisło so wočakuje."
 
 #. TRANS: Field label for SMS address input in SMS settings form.
-#: actions/smssettings.php:138
+#: actions/smssettings.php:137
 msgid "Confirmation code"
 msgstr "Wobkrućenski kod"
 
 #. TRANS: Form field instructions in SMS settings form.
-#: actions/smssettings.php:140
+#: actions/smssettings.php:139
 msgid "Enter the code you received on your phone."
 msgstr "Zapodaj kod, kotryž sy přez telefon dóstał."
 
 #. TRANS: Button label to confirm SMS confirmation code in SMS settings.
-#: actions/smssettings.php:144
+#: actions/smssettings.php:143
 msgctxt "BUTTON"
 msgid "Confirm"
 msgstr "Wobkrućić"
 
 #. TRANS: Field label for SMS phone number input in SMS settings form.
-#: actions/smssettings.php:149
+#: actions/smssettings.php:148
 msgid "SMS phone number"
 msgstr "SMS telefonowe čisło"
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
-#: actions/smssettings.php:152
-#, fuzzy
-msgid "Phone number, no punctuation or spaces, with area code"
+#: actions/smssettings.php:151
+msgid "Phone number, no punctuation or spaces, with area code."
 msgstr "Telefonowe čisło, bjez interpunkcije abo mjezerow, z předwolenjom."
 
 #. TRANS: Form legend for SMS preferences form.
-#: actions/smssettings.php:191
+#: actions/smssettings.php:190
 msgid "SMS preferences"
 msgstr "SMS-nastajenja"
 
 #. TRANS: Checkbox label in SMS preferences form.
-#: actions/smssettings.php:197
+#: actions/smssettings.php:196
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
 msgstr ""
 
 #. TRANS: Confirmation message for successful SMS preferences save.
-#: actions/smssettings.php:308
+#: actions/smssettings.php:307
 msgid "SMS preferences saved."
 msgstr "SMS-nastajenja składowane."
 
 #. TRANS: Message given saving SMS phone number without having provided one.
-#: actions/smssettings.php:330
+#: actions/smssettings.php:329
 msgid "No phone number."
 msgstr "Žane telefonowe čisło."
 
 #. TRANS: Message given saving SMS phone number without having selected a carrier.
-#: actions/smssettings.php:336
+#: actions/smssettings.php:335
 msgid "No carrier selected."
 msgstr "Žadyn poskićowar wubrany."
 
 #. TRANS: Message given saving SMS phone number that is already set.
-#: actions/smssettings.php:344
+#: actions/smssettings.php:343
 msgid "That is already your phone number."
 msgstr "To je hižo twoje telefonowe čisło."
 
 #. TRANS: Message given saving SMS phone number that is already set for another user.
-#: actions/smssettings.php:348
+#: actions/smssettings.php:347
 msgid "That phone number already belongs to another user."
 msgstr "Te telefonowe čisło hižo druhemu wužiwarjej słuša."
 
 #. TRANS: Message given saving valid SMS phone number that is to be confirmed.
-#: actions/smssettings.php:376
+#: actions/smssettings.php:375
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
 "for the code and instructions on how to use it."
 msgstr ""
 
 #. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
-#: actions/smssettings.php:404
+#: actions/smssettings.php:403
 msgid "That is the wrong confirmation number."
 msgstr "To je wopačne wobkrućenske čisło."
 
 #. TRANS: Message given after successfully canceling SMS phone number confirmation.
-#: actions/smssettings.php:418
+#: actions/smssettings.php:417
 msgid "SMS confirmation cancelled."
 msgstr "SMS-wobkrućenje přetorhnjene."
 
 #. TRANS: Message given trying to remove an SMS phone number that is not
 #. TRANS: registered for the active user.
-#: actions/smssettings.php:438
+#: actions/smssettings.php:437
 msgid "That is not your phone number."
 msgstr "To twoje telefonowe čisło njeje."
 
 #. TRANS: Message given after successfully removing a registered SMS phone number.
-#: actions/smssettings.php:460
+#: actions/smssettings.php:459
 msgid "The SMS phone number was removed."
 msgstr "Telefonowe čisło za SMS bu wotstronjene."
 
 #. TRANS: Label for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:499
+#: actions/smssettings.php:498
 msgid "Mobile carrier"
 msgstr ""
 
 #. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:504
+#: actions/smssettings.php:503
 msgid "Select a carrier"
 msgstr ""
 
 #. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
 #. TRANS: %s is an administrative contact's e-mail address.
-#: actions/smssettings.php:513
+#: actions/smssettings.php:512
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -5857,7 +5890,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
-#: actions/smssettings.php:535
+#: actions/smssettings.php:534
 msgid "No code entered."
 msgstr "Žadyn kod zapodaty."
 
@@ -5930,15 +5963,13 @@ msgstr "Njejsy tón profil abonował."
 msgid "Could not save subscription."
 msgstr "Abonement njeda so składować."
 
-#: actions/subscribe.php:77
-msgid "This action only accepts POST requests."
-msgstr ""
-
-#: actions/subscribe.php:117
+#. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
+#: actions/subscribe.php:121
 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
 msgstr "Njemóžeš zdaleny profil OMB 0.1 z tutej akciju abonować."
 
-#: actions/subscribe.php:145
+#. TRANS: Page title when subscription succeeded.
+#: actions/subscribe.php:149
 msgid "Subscribed"
 msgstr "Abonowany"
 
@@ -6047,31 +6078,34 @@ msgid "Subscription feed for %s (Atom)"
 msgstr "Abonowanski kanal za %s (Atom)"
 
 #. TRANS: Checkbox label for enabling Jabber messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:239
-msgid "Jabber"
-msgstr "Jabber"
+#: actions/subscriptions.php:241 lib/settingsnav.php:110
+#, fuzzy
+msgid "IM"
+msgstr "IM"
 
 #. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:254
+#: actions/subscriptions.php:256 lib/settingsnav.php:117
 msgid "SMS"
 msgstr "SMS"
 
-#: actions/tag.php:69
+#. TRANS: Title for all but the first page of notices with tags.
+#. TRANS: %1$s is the tag, %2$d is the page number.
+#: actions/tag.php:73
 #, php-format
 msgid "Notices tagged with %1$s, page %2$d"
 msgstr "Zdźělenki su z %1$s woznamjenjene, strona %2$d"
 
-#: actions/tag.php:87
+#: actions/tag.php:91
 #, php-format
 msgid "Notice feed for tag %s (RSS 1.0)"
 msgstr "Zdźělenski kanal za tafličku %s (RSS 1.0)"
 
-#: actions/tag.php:93
+#: actions/tag.php:97
 #, php-format
 msgid "Notice feed for tag %s (RSS 2.0)"
 msgstr "Zdźělenski kanal za tafličku %s (RSS 2.0)"
 
-#: actions/tag.php:99
+#: actions/tag.php:103
 #, php-format
 msgid "Notice feed for tag %s (Atom)"
 msgstr "Zdźělenski kanal za tafličku %s (Atom)"
@@ -6090,28 +6124,27 @@ msgstr ""
 msgid "User profile"
 msgstr "Wužiwarski profil"
 
-#. TRANS: DT element in area for user avatar.
-#: actions/tagother.php:81 actions/userauthorization.php:132
-#: lib/userprofile.php:108
-msgid "Photo"
-msgstr "Foto"
-
-#: actions/tagother.php:141
+#: actions/tagother.php:120
 msgid "Tag user"
 msgstr ""
 
-#: actions/tagother.php:151
+#: actions/tagother.php:130
 msgid ""
 "Tags for this user (letters, numbers, -, ., and _), comma- or space- "
 "separated"
 msgstr ""
 
-#: actions/tagother.php:193
+#: actions/tagother.php:157
+#, php-format
+msgid "Invalid tag: \"%s\""
+msgstr "Njepłaćiwa taflička: \"%s\""
+
+#: actions/tagother.php:172
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 
-#: actions/tagother.php:236
+#: actions/tagother.php:215
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
 "wužij tutón formular, zo by swojim abonentam abo abonementam taflički přidał."
@@ -6120,6 +6153,7 @@ msgstr ""
 msgid "No such tag."
 msgstr "Taflička njeeksistuje."
 
+#. TRANS: Client error displayed when trying to unblock a non-blocked user.
 #: actions/unblock.php:59
 msgid "You haven't blocked that user."
 msgstr "Njejsy toho wužiwarja zablokował."
@@ -6140,12 +6174,83 @@ msgstr "Žadyn profilowy ID w naprašowanju."
 msgid "Unsubscribed"
 msgstr "Wotskazany"
 
-#: actions/updateprofile.php:64 actions/userauthorization.php:337
+#: actions/updateprofile.php:64
 #, php-format
 msgid ""
 "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
 msgstr ""
 
+#: actions/urlsettings.php:60
+#, fuzzy
+msgid "URL settings"
+msgstr "IM-nastajenja"
+
+#. TRANS: Instructions for tab "Other" in user profile settings.
+#: actions/urlsettings.php:72
+msgid "Manage various other options."
+msgstr "Wšelake druhe opcije zrjadować."
+
+#. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
+#. TRANS: user's profile settings. This message has one space at the beginning. Use your
+#. TRANS: language's word separator here if it has one (most likely a single space).
+#: actions/urlsettings.php:115
+msgid " (free service)"
+msgstr " (swobodna słužba)"
+
+#: actions/urlsettings.php:121
+#, fuzzy
+msgid "[none]"
+msgstr "Žadyn"
+
+#: actions/urlsettings.php:122
+msgid "[internal]"
+msgstr ""
+
+#. TRANS: Label for dropdown with URL shortener services.
+#: actions/urlsettings.php:130
+msgid "Shorten URLs with"
+msgstr "URL skrótšić z"
+
+#. TRANS: Tooltip for for dropdown with URL shortener services.
+#: actions/urlsettings.php:132
+msgid "Automatic shortening service to use."
+msgstr ""
+
+#: actions/urlsettings.php:138
+msgid "URL longer than"
+msgstr ""
+
+#: actions/urlsettings.php:141
+msgid "URLs longer than this will be shortened, 0 means always shorten."
+msgstr ""
+
+#: actions/urlsettings.php:145
+msgid "Text longer than"
+msgstr ""
+
+#: actions/urlsettings.php:148
+msgid ""
+"URLs in notices longer than this will be shortened, 0 means always shorten."
+msgstr ""
+
+#. TRANS: Form validation error for form "Other settings" in user profile.
+#: actions/urlsettings.php:180
+msgid "URL shortening service is too long (maximum 50 characters)."
+msgstr "Krótšenska słužba za URL je předołha (maks. 50 znamješkow)."
+
+#: actions/urlsettings.php:187
+msgid "Invalid number for max url length."
+msgstr ""
+
+#: actions/urlsettings.php:193
+#, fuzzy
+msgid "Invalid number for max notice length."
+msgstr "Njepłaćiwy wobsah zdźělenki."
+
+#: actions/urlsettings.php:238
+msgid "Error saving user URL shortening preferences."
+msgstr ""
+
 #. TRANS: User admin panel title
 #: actions/useradminpanel.php:58
 msgctxt "TITLE"
@@ -6170,12 +6275,12 @@ msgstr "Njepłaćiwy powitanski tekst. Maksimalna dołhosć je 255 znamješkow."
 #. TRANS: Client error displayed when trying to set a non-existing user as default subscription for new
 #. TRANS: users in user admin panel. %1$s is the invalid nickname.
 #: actions/useradminpanel.php:166
-#, fuzzy, php-format
-msgid "Invalid default subscripton: '%1$s' is not a user."
+#, php-format
+msgid "Invalid default subscripton: \"%1$s\" is not a user."
 msgstr "Njepłaćiwy standardny abonement: \"%1$s\" wužiwar njeje."
 
-#. TRANS: Link description in user account settings menu.
-#: actions/useradminpanel.php:215 lib/accountsettingsaction.php:106
+#: actions/useradminpanel.php:215 lib/action.php:565 lib/settingsnav.php:77
+#: lib/subgroupnav.php:81
 msgid "Profile"
 msgstr "Profil"
 
@@ -6231,124 +6336,165 @@ msgstr ""
 
 #. TRANS: Title for button to save user settings in user admin panel.
 #: actions/useradminpanel.php:302
-#, fuzzy
-msgid "Save user settings"
+msgid "Save user settings."
 msgstr "Wužiwarske nastajenja składować."
 
-#: actions/userauthorization.php:105
+#. TRANS: Page title.
+#: actions/userauthorization.php:109
 msgid "Authorize subscription"
 msgstr "Abonement awtorizować"
 
-#: actions/userauthorization.php:110
+#. TRANS: Page notice on "Auhtorize subscription" page.
+#: actions/userauthorization.php:115
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
 "user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
-"click “Reject”."
+"click \"Reject\"."
 msgstr ""
 
-#. TRANS: Menu item for site administration
-#: actions/userauthorization.php:196 actions/version.php:167
-#: lib/adminpanelaction.php:403
-msgid "License"
-msgstr "Licenca"
-
-#: actions/userauthorization.php:217
-#, fuzzy
+#. TRANS: Button text on Authorise Subscription page.
+#: actions/userauthorization.php:200
+msgctxt "BUTTON"
 msgid "Accept"
 msgstr "Akceptować"
 
-#: actions/userauthorization.php:218 lib/subscribeform.php:115
-#: lib/subscribeform.php:139
-msgid "Subscribe to this user"
-msgstr "Tutoho wužiwarja abonować"
+#. TRANS: Title for button on Authorise Subscription page.
+#: actions/userauthorization.php:202
+msgid "Subscribe to this user."
+msgstr "Tutoho wužiwarja abonować."
 
-#: actions/userauthorization.php:219
-#, fuzzy
+#. TRANS: Button text on Authorise Subscription page.
+#: actions/userauthorization.php:204
+msgctxt "BUTTON"
 msgid "Reject"
 msgstr "Wotpokazać"
 
-#: actions/userauthorization.php:220
-#, fuzzy
-msgid "Reject this subscription"
+#. TRANS: Title for button on Authorise Subscription page.
+#: actions/userauthorization.php:206
+msgid "Reject this subscription."
 msgstr "Tutón abonement wotpokazać."
 
-#: actions/userauthorization.php:232
+#. TRANS: Client error displayed for an empty authorisation request.
+#: actions/userauthorization.php:219
 msgid "No authorization request!"
 msgstr "Žane awtorizaciske naprašowanje!"
 
-#: actions/userauthorization.php:254
+#. TRANS: Accept message header from Authorise subscription page.
+#: actions/userauthorization.php:242
 msgid "Subscription authorized"
 msgstr "Abonement awtorizowany"
 
-#: actions/userauthorization.php:256
+#: actions/userauthorization.php:245
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to authorize the "
 "subscription. Your subscription token is:"
 msgstr ""
 
-#: actions/userauthorization.php:266
+#. TRANS: Reject message header from Authorise subscription page.
+#: actions/userauthorization.php:256
 msgid "Subscription rejected"
 msgstr "Abonement wotpokazany"
 
-#: actions/userauthorization.php:268
+#: actions/userauthorization.php:259
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to fully reject the "
 "subscription."
 msgstr ""
 
-#: actions/userauthorization.php:303
-#, fuzzy, php-format
-msgid "Listener URI ‘%s’ not found here."
+#. TRANS: Exception thrown when no valid user is found for an authorisation request.
+#. TRANS: %s is a listener URI.
+#: actions/userauthorization.php:296
+#, php-format
+msgid "Listener URI \"%s\" not found here."
 msgstr "URI posłucharja \"%s\" njebu tu namakany."
 
-#: actions/userauthorization.php:308
-#, fuzzy, php-format
-msgid "Listenee URI ‘%s’ is too long."
+#. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
+#. TRANS: %s is a listenee URI.
+#: actions/userauthorization.php:303
+#, php-format
+msgid "Listenee URI \"%s\" is too long."
 msgstr "URI posłucharki \"%s\" je předołhi."
 
-#: actions/userauthorization.php:314
-#, fuzzy, php-format
-msgid "Listenee URI ‘%s’ is a local user."
+#. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
+#. TRANS: %s is a listenee URI.
+#: actions/userauthorization.php:311
+#, php-format
+msgid "Listenee URI \"%s\" is a local user."
 msgstr "URI posłucharki \"%s\" je lokalny wužiwar.."
 
+#. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
+#. TRANS: %s is a profile URL.
 #: actions/userauthorization.php:329
-#, fuzzy, php-format
-msgid "Profile URL ‘%s’ is for a local user."
+#, php-format
+msgid "Profile URL \"%s\" is for a local user."
 msgstr "Profilowy URL \"%s\" je za lokalneho wužiwarja."
 
-#: actions/userauthorization.php:345
-#, fuzzy, php-format
-msgid "Avatar URL ‘%s’ is not valid."
+#. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
+#. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
+#: actions/userauthorization.php:339
+#, php-format
+msgid ""
+"Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
+"\"."
+msgstr ""
+
+#. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
+#. TRANS: %s is an avatar URL.
+#: actions/userauthorization.php:349
+#, php-format
+msgid "Avatar URL \"%s\" is not valid."
 msgstr "URL awatara \"%s\" njeje płaćiwy."
 
-#: actions/userauthorization.php:350
-#, fuzzy, php-format
-msgid "Can’t read avatar URL ‘%s’."
+#. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
+#. TRANS: %s is an avatar URL.
+#: actions/userauthorization.php:356
+#, php-format
+msgid "Cannot read avatar URL \"%s\"."
 msgstr "Awatarowy URL \"%s\" njeda so čitać."
 
-#: actions/userauthorization.php:355
-#, fuzzy, php-format
-msgid "Wrong image type for avatar URL ‘%s’."
+#. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
+#. TRANS: %s is an avatar URL.
+#: actions/userauthorization.php:363
+#, php-format
+msgid "Wrong image type for avatar URL \"%s\"."
 msgstr "Wopačny wobrazowy typ za awatarowy URL \"%s\"."
 
 #. TRANS: Page title for profile design page.
-#: actions/userdesignsettings.php:74 lib/designsettings.php:63
+#: actions/userdesignsettings.php:74 lib/designsettings.php:61
 msgid "Profile design"
 msgstr "Profilowy design"
 
 #. TRANS: Instructions for profile design page.
-#: actions/userdesignsettings.php:84 lib/designsettings.php:74
+#: actions/userdesignsettings.php:84 lib/designsettings.php:72
 msgid ""
 "Customize the way your profile looks with a background image and a colour "
 "palette of your choice."
 msgstr ""
 
-#: actions/userdesignsettings.php:272
+#: actions/userdesignsettings.php:289
 msgid "Enjoy your hotdog!"
 msgstr "Wjele wjesela!"
 
+#: actions/userdesignsettings.php:325
+#, fuzzy
+msgid "Design settings"
+msgstr "Sydłowe nastajenja składować"
+
+#: actions/userdesignsettings.php:340
+msgid "View profile designs"
+msgstr "Profilowe designy sej wobhladać"
+
+#: actions/userdesignsettings.php:341
+msgid "Show or hide profile designs."
+msgstr "Profilowe designy pokazać abo schować."
+
+#: actions/userdesignsettings.php:348
+#, fuzzy
+msgid "Background file"
+msgstr "Pozadk"
+
 #. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number.
 #: actions/usergroups.php:66
 #, php-format
@@ -6396,6 +6542,11 @@ msgstr ""
 msgid "Contributors"
 msgstr "Sobuskutkowarjo"
 
+#. TRANS: Menu item for site administration
+#: actions/version.php:167 lib/adminpanelaction.php:403
+msgid "License"
+msgstr "Licenca"
+
 #: actions/version.php:170
 msgid ""
 "StatusNet is free software: you can redistribute it and/or modify it under "
@@ -6419,12 +6570,13 @@ msgid ""
 "along with this program.  If not, see %s."
 msgstr ""
 
-#: actions/version.php:191
-msgid "Plugins"
-msgstr "Tykače"
+#. TRANS: Form input field label for application name.
+#: actions/version.php:197 lib/applicationeditform.php:190
+msgid "Name"
+msgstr "Mjeno"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:901
+#: actions/version.php:198 lib/action.php:885
 msgid "Version"
 msgstr "Wersija"
 
@@ -6432,6 +6584,12 @@ msgstr "Wersija"
 msgid "Author(s)"
 msgstr "Awtorojo"
 
+#. TRANS: Form input field label.
+#: actions/version.php:200 lib/applicationeditform.php:208
+#: lib/groupeditform.php:168
+msgid "Description"
+msgstr "Wopisanje"
+
 #. TRANS: Activity title when marking a notice as favorite.
 #: classes/Fave.php:164
 msgid "Favor"
@@ -6552,7 +6710,7 @@ msgid "Could not create login token for %s"
 msgstr "Njeje móžno było, přizjewjenske znamješko za %s wutworić"
 
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
-#: classes/Memcached_DataObject.php:542
+#: classes/Memcached_DataObject.php:556
 msgid "No database name or DSN found anywhere."
 msgstr "Žane mjeno datoweje banki namakane abo žadyn DSN namakany."
 
@@ -6722,18 +6880,18 @@ msgstr "%1$s nětko %2$s slěduje."
 
 #. TRANS: Notice given on user registration.
 #. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:395
+#: classes/User.php:390
 #, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr "Witaj do %1$s, @%2$s!"
 
 #. TRANS: Server exception.
-#: classes/User.php:918
+#: classes/User.php:923
 msgid "No single user defined for single-user mode."
 msgstr "Žadyn jednotliwy wužiwar za modus jednotliweho wužiwarja definowany."
 
 #. TRANS: Server exception.
-#: classes/User.php:922
+#: classes/User.php:927
 msgid "Single-user mode code called when not enabled."
 msgstr ""
 
@@ -6778,41 +6936,6 @@ msgstr "XRD za %s njeda so namakać."
 msgid "No AtomPub API service for %s."
 msgstr "Žana słužba AtomPub API za %s."
 
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:104
-msgid "Change your profile settings"
-msgstr "Twoje profilowe nastajenja změnić"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:111
-msgid "Upload an avatar"
-msgstr "Awatar nahrać"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:118
-msgid "Change your password"
-msgstr "Twoje hesło změnić"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:125
-msgid "Change email handling"
-msgstr ""
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:132
-msgid "Design your profile"
-msgstr "Twój profil wuhotować"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:139
-msgid "Other options"
-msgstr "Druhe opcije"
-
-#. TRANS: Link description in user account settings menu.
-#: lib/accountsettingsaction.php:141
-msgid "Other"
-msgstr "Druhe"
-
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
 #: lib/action.php:161
 #, php-format
@@ -6830,206 +6953,127 @@ msgctxt "TOOLTIP"
 msgid "Show more"
 msgstr "Wjace pokazać"
 
-#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:544
-msgid "Primary site navigation"
-msgstr "Primarna sydłowa nawigacija"
+#. TRANS: Inline reply form submit button: submits a reply comment.
+#: lib/action.php:328
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Comment"
+msgstr "Wobsah"
 
-#. TRANS: Tooltip for main menu option "Personal".
-#: lib/action.php:550
-msgctxt "TOOLTIP"
-msgid "Personal profile and friends timeline"
+#. TRANS: Placeholder text for inline reply form. Clicking in this box will turn it into a mini notice form.
+#: lib/action.php:331
+msgid "Add a comment..."
 msgstr ""
 
-#. TRANS: Main menu option when logged in for access to personal profile and friends timeline.
-#. TRANS: Personal group navigation menu option when logged in for viewing timeline of self and friends.
-#: lib/action.php:553 lib/personalgroupnav.php:100
-msgctxt "MENU"
-msgid "Personal"
-msgstr "Wosobinski"
+#: lib/action.php:559 lib/personalgroupnav.php:99
+#, fuzzy
+msgid "Home"
+msgstr "Startowa strona"
 
-#. TRANS: Tooltip for main menu option "Account".
-#: lib/action.php:555
-msgctxt "TOOLTIP"
-msgid "Change your email, avatar, password, profile"
-msgstr "Wašu e-mejl, waš awatar, waše hesło, waš profil změnić"
-
-#. TRANS: Main menu option when logged in for access to user settings.
-#: lib/action.php:558
-msgid "Account"
-msgstr "Konto"
-
-#. TRANS: Tooltip for main menu option "Services".
 #: lib/action.php:560
-msgctxt "TOOLTIP"
-msgid "Connect to services"
-msgstr "Ze słužbami zwjazać"
+msgid "Friends timeline"
+msgstr ""
 
-#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services.
-#: lib/action.php:563
-msgid "Connect"
-msgstr "Zwjazać"
-
-#. TRANS: Tooltip for menu option "Admin".
 #: lib/action.php:566
-msgctxt "TOOLTIP"
-msgid "Change site configuration"
-msgstr "Sydłowu konfiguraciju změnić"
+#, fuzzy
+msgid "Your profile"
+msgstr "Skupinski profil"
 
-#. TRANS: Main menu option when logged in and site admin for access to site configuration.
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/action.php:569 lib/groupnav.php:117
-msgctxt "MENU"
-msgid "Admin"
-msgstr "Administrator"
+#: lib/action.php:570 lib/action.php:593 lib/publicgroupnav.php:78
+msgid "Public"
+msgstr "Zjawny"
 
-#. TRANS: Tooltip for main menu option "Invite".
-#: lib/action.php:573
-#, php-format
-msgctxt "TOOLTIP"
-msgid "Invite friends and colleagues to join you on %s"
-msgstr "Přećelow a kolegow přeprosyć, so tebi na %s  přidružić"
+#: lib/action.php:571 lib/action.php:594
+#, fuzzy
+msgid "Everyone on this site"
+msgstr "Ludźi na tutym sydle pytać"
+
+#: lib/action.php:575
+#, fuzzy
+msgid "Settings"
+msgstr "SMS-nastajenja"
 
-#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users.
 #: lib/action.php:576
-msgctxt "MENU"
-msgid "Invite"
-msgstr "Přeprosyć"
+#, fuzzy
+msgid "Change your personal settings"
+msgstr "Twoje profilowe nastajenja změnić"
 
-#. TRANS: Tooltip for main menu option "Logout"
 #: lib/action.php:582
-msgctxt "TOOLTIP"
-msgid "Logout from the site"
-msgstr "Ze sydła wotzjewić"
+#, fuzzy
+msgid "Site configuration"
+msgstr "Wužiwarska konfiguracija"
 
-#. TRANS: Main menu option when logged in to log out the current user.
-#: lib/action.php:585
-msgctxt "MENU"
+#: lib/action.php:587
+#, fuzzy
 msgid "Logout"
 msgstr "Wotzjewić"
 
-#. TRANS: Tooltip for main menu option "Register".
-#: lib/action.php:590
-msgctxt "TOOLTIP"
-msgid "Create an account"
-msgstr "Konto załožić"
+#: lib/action.php:588
+#, fuzzy
+msgid "Logout from the site"
+msgstr "Ze sydła wotzjewić"
 
-#. TRANS: Main menu option when not logged in to register a new account.
-#. TRANS: Menu item for registering with the StatusNet site.
-#: lib/action.php:593 lib/logingroupnav.php:85
-msgctxt "MENU"
-msgid "Register"
-msgstr "Registrować"
-
-#. TRANS: Tooltip for main menu option "Login".
-#: lib/action.php:596
-msgctxt "TOOLTIP"
+#: lib/action.php:599
+#, fuzzy
 msgid "Login to the site"
 msgstr "Při sydle přizjewić"
 
-#. TRANS: Main menu option when not logged in to log in.
-#. TRANS: Menu item for logging in to the StatusNet site.
-#: lib/action.php:599 lib/logingroupnav.php:77
-msgctxt "MENU"
-msgid "Login"
-msgstr "Přizjewjenje"
-
-#. TRANS: Tooltip for main menu option "Help".
-#: lib/action.php:602
-msgctxt "TOOLTIP"
-msgid "Help me!"
-msgstr "Pomhaj!"
-
-#. TRANS: Main menu option for help on the StatusNet site.
-#: lib/action.php:605
-msgctxt "MENU"
-msgid "Help"
-msgstr "Pomoc"
-
-#. TRANS: Tooltip for main menu option "Search".
-#: lib/action.php:608
-msgctxt "TOOLTIP"
-msgid "Search for people or text"
-msgstr "Za ludźimi abo tekstom pytać"
-
-#. TRANS: Main menu option when logged in or when the StatusNet instance is not private.
-#: lib/action.php:611
-msgctxt "MENU"
+#: lib/action.php:606
+#, fuzzy
 msgid "Search"
 msgstr "Pytać"
 
-#. TRANS: DT element for site notice. String is hidden in default CSS.
-#. TRANS: Menu item for site administration
-#: lib/action.php:633 lib/adminpanelaction.php:387
-msgid "Site notice"
-msgstr "Sydłowa zdźělenka"
-
-#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:700
-msgid "Local views"
-msgstr "Lokalne napohlady"
-
-#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:770
-msgid "Page notice"
-msgstr "Zdźělenka strony"
-
-#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:874
-msgid "Secondary site navigation"
-msgstr "Sekundarna sydłowa nawigacija"
+#: lib/action.php:607
+#, fuzzy
+msgid "Search the site"
+msgstr "Pytanske sydło"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:880
+#: lib/action.php:864
 msgid "Help"
 msgstr "Pomoc"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:883
+#: lib/action.php:867
 msgid "About"
 msgstr "Wo"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:886
+#: lib/action.php:870
 msgid "FAQ"
 msgstr "Huste prašenja"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:891
+#: lib/action.php:875
 msgid "TOS"
 msgstr "Wužiwarske wuměnjenja"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:895
+#: lib/action.php:879
 msgid "Privacy"
 msgstr "Priwatnosć"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:898
+#: lib/action.php:882
 msgid "Source"
 msgstr "Žórło"
 
 #. TRANS: Secondary navigation menu option leading to e-mail contact information on the
 #. TRANS: StatusNet site, where to report bugs, ...
-#: lib/action.php:905
+#: lib/action.php:889
 msgid "Contact"
 msgstr "Kontakt"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:908
+#: lib/action.php:892
 msgid "Badge"
 msgstr "Plaketa"
 
-#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:937
-msgid "StatusNet software license"
-msgstr "Softwarowa licenca StatusNet"
-
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:944
+#: lib/action.php:921
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7037,7 +7081,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:947
+#: lib/action.php:924
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** je mikroblogowanska słužba."
@@ -7046,7 +7090,7 @@ msgstr "**%%site.name%%** je mikroblogowanska słužba."
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:954
+#: lib/action.php:931
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7054,51 +7098,41 @@ msgid ""
 "org/licensing/licenses/agpl-3.0.html)."
 msgstr ""
 
-#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:970
-msgid "Site content license"
-msgstr "Licenca sydłoweho wobsaha"
-
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:977
+#: lib/action.php:949
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr "Wobsah a daty wot %1$s su priwatne a dowěrliwe."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:984
+#: lib/action.php:956
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:988
+#: lib/action.php:960
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:1020
+#: lib/action.php:992
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr "Wobsah a daty wot %1$s su pod licencu %2$s."
 
-#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1356
-msgid "Pagination"
-msgstr "Paginowanje"
-
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1367
+#: lib/action.php:1335
 msgid "After"
 msgstr "Po"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1377
+#: lib/action.php:1345
 msgid "Before"
 msgstr "Před"
 
@@ -7249,7 +7283,7 @@ msgid "User configuration"
 msgstr "Wužiwarska konfiguracija"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:122
+#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:110
 msgid "User"
 msgstr "Wužiwar"
 
@@ -7273,6 +7307,11 @@ msgstr "Konfiguracija posedźenjow"
 msgid "Edit site notice"
 msgstr "Sydłowu zdźělenku wobdźěłać"
 
+#. TRANS: Menu item for site administration
+#: lib/adminpanelaction.php:387
+msgid "Site notice"
+msgstr "Sydłowa zdźělenka"
+
 #. TRANS: Menu item title/tooltip
 #: lib/adminpanelaction.php:393
 msgid "Snapshots configuration"
@@ -7283,6 +7322,12 @@ msgstr "Konfiguracija wobrazowkowych fotow"
 msgid "Set site license"
 msgstr "Licencu sydła nastajić"
 
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:409
+#, fuzzy
+msgid "Plugins configuration"
+msgstr "Konfiguracija šćežkow"
+
 #. TRANS: Client error 401.
 #: lib/apiauth.php:111
 msgid "API resource requires read-write access, but you only have read access."
@@ -7293,19 +7338,23 @@ msgstr ""
 msgid "No application for that consumer key."
 msgstr "Žana aplikacija za tón kluč přetrjebowarja."
 
+#: lib/apiauth.php:202 lib/apiauth.php:284
+msgid "Not allowed to use API."
+msgstr ""
+
 #. TRANS: OAuth exception given when an incorrect access token was given for a user.
-#: lib/apiauth.php:219
+#: lib/apiauth.php:225
 msgid "Bad access token."
 msgstr ""
 
 #. TRANS: OAuth exception given when no user was found for a given token (no token was found).
-#: lib/apiauth.php:224
+#: lib/apiauth.php:230
 msgid "No user for that token."
 msgstr ""
 
 #. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel".
 #. TRANS: Client error thrown when authentication fails.
-#: lib/apiauth.php:266 lib/apiauth.php:293
+#: lib/apiauth.php:272 lib/apiauth.php:302
 msgid "Could not authenticate you."
 msgstr "Njebě móžno će awtentifikować."
 
@@ -7348,6 +7397,11 @@ msgstr ""
 msgid "Failed to delete revoked token."
 msgstr ""
 
+#. TRANS: Form input field label for application icon.
+#: lib/applicationeditform.php:177
+msgid "Icon"
+msgstr "Symbol"
+
 #. TRANS: Form guide.
 #: lib/applicationeditform.php:182
 msgid "Icon for this application"
@@ -7384,6 +7438,11 @@ msgstr "URL žórła"
 msgid "Organization responsible for this application"
 msgstr "Organizacija, kotraž je za tutu aplikaciju zamołwita"
 
+#. TRANS: Form input field label.
+#: lib/applicationeditform.php:227
+msgid "Organization"
+msgstr "Organizacija"
+
 #. TRANS: Form input field instructions.
 #: lib/applicationeditform.php:234
 msgid "URL for the homepage of the organization"
@@ -7471,16 +7530,6 @@ msgstr "Element \"author\" dyrbi element \"name\" wobsahować."
 msgid "Do not use this method!"
 msgstr "Njewužij tutu metodu!"
 
-#. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:293
-msgid "Author"
-msgstr "Awtor"
-
-#. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:307
-msgid "Provider"
-msgstr "Poskićowar"
-
 #. TRANS: Title.
 #: lib/attachmentnoticesection.php:67
 msgid "Notices where this attachment appears"
@@ -7506,23 +7555,28 @@ msgstr "Změnjenje hesła njeje dowolene."
 msgid "Block"
 msgstr "Blokować"
 
+#. TRANS: Description of the form to block a user.
+#: lib/blockform.php:79
+msgid "Block this user"
+msgstr "Tutoho wužiwarja blokować"
+
 #. TRANS: Title for command results.
-#: lib/channel.php:160 lib/channel.php:181
+#: lib/channel.php:104 lib/channel.php:125
 msgid "Command results"
 msgstr "Přikazowe wuslědki"
 
 #. TRANS: Title for command results.
-#: lib/channel.php:194
+#: lib/channel.php:138
 msgid "AJAX error"
 msgstr "Zmylk Ajax"
 
 #. TRANS: E-mail subject when a command has completed.
-#: lib/channel.php:233 lib/mailhandler.php:143
+#: lib/channel.php:177 lib/mailhandler.php:143
 msgid "Command complete"
 msgstr "Přikaz wuwjedźeny"
 
 #. TRANS: E-mail subject when a command has failed.
-#: lib/channel.php:244
+#: lib/channel.php:188
 msgid "Command failed"
 msgstr "Přikaz je so njeporadźił"
 
@@ -7625,7 +7679,7 @@ msgstr "Dospołne mjeno: %s"
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a location.
-#: lib/command.php:446 lib/mail.php:270
+#: lib/command.php:446 lib/mail.php:275
 #, php-format
 msgid "Location: %s"
 msgstr "Městno: %s"
@@ -7633,7 +7687,7 @@ msgstr "Městno: %s"
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a homepage.
-#: lib/command.php:450 lib/mail.php:274
+#: lib/command.php:450 lib/mail.php:279
 #, php-format
 msgid "Homepage: %s"
 msgstr "Startowa strona: %s"
@@ -7887,108 +7941,101 @@ msgid ""
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:162
+#: lib/common.php:36
 msgid "No configuration file found."
 msgstr "Žana konfiguraciska dataja namakana."
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:165
+#: lib/common.php:39
 msgid "I looked for configuration files in the following places:"
 msgstr "Sym na slědowacych městnach konfiguraciske dataje pytał:"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:168
+#: lib/common.php:42
 msgid "You may wish to run the installer to fix this."
 msgstr "Móže być, zo chceš instalaciski program startować, zo by to porjedźił."
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:172
+#: lib/common.php:46
 msgid "Go to the installer."
 msgstr "K instalaciji"
 
-#. TRANS: Menu item for Instant Messaging settings.
-#: lib/connectsettingsaction.php:106
-msgctxt "MENU"
-msgid "IM"
-msgstr "IM"
-
-#. TRANS: Tooltip for Instant Messaging menu item.
-#: lib/connectsettingsaction.php:108
-msgid "Updates by instant messenger (IM)"
-msgstr "Aktualizacije přez Instant Messenger (IM)"
-
-#. TRANS: Menu item for Short Message Service settings.
-#: lib/connectsettingsaction.php:113
-msgctxt "MENU"
-msgid "SMS"
-msgstr "SMS"
-
-#. TRANS: Tooltip for Short Message Service menu item.
-#: lib/connectsettingsaction.php:115
-msgid "Updates by SMS"
-msgstr "Aktualizacije přez SMS"
-
-#. TRANS: Menu item for OuAth connection settings.
-#: lib/connectsettingsaction.php:120
-msgctxt "MENU"
-msgid "Connections"
-msgstr "Zwiski"
-
-#. TRANS: Tooltip for connected applications (Connections through OAuth) menu item.
-#: lib/connectsettingsaction.php:122
-msgid "Authorized connected applications"
-msgstr "Awtorizowane zwjazane aplikacije"
-
 #: lib/dberroraction.php:59
 msgid "Database error"
 msgstr "Zmylk w datowej bance"
 
+#. TRANS: Description of form for deleting a user.
+#: lib/deleteuserform.php:75
+msgid "Delete this user"
+msgstr "Tutoho wužiwarja wušmórnyć"
+
+#: lib/designform.php:114
+#, fuzzy
+msgid "Change design"
+msgstr "Design składować"
+
+#. TRANS: Fieldset legend on profile design page to change profile page colours.
+#: lib/designform.php:131
+msgid "Change colours"
+msgstr "Barby změnić"
+
+#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
+#: lib/designform.php:138
+msgid "Use defaults"
+msgstr "Standardne hódnoty wužiwać"
+
+#. TRANS: Title for button on profile design page to reset all colour settings to default.
+#: lib/designform.php:140
+msgid "Restore default designs"
+msgstr "Standardne designy wobnowić"
+
+#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
+#: lib/designform.php:148
+msgid "Reset back to default"
+msgstr "Na standard wróćo stajić"
+
 #. TRANS: Label in form on profile design page.
 #. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
-#: lib/designsettings.php:108
+#: lib/designform.php:158
 msgid "Upload file"
 msgstr "Dataju nahrać"
 
 #. TRANS: Instructions for form on profile design page.
-#: lib/designsettings.php:113
+#: lib/designform.php:163
+#, fuzzy
 msgid ""
-"You can upload your personal background image. The maximum file size is 2MB."
+"You can upload your personal background image. The maximum file size is 2Mb."
 msgstr ""
 "Móžeš swój wosobinski pozadkowy wobraz nahrać. Maksimalna datajowa wulkosć "
 "je 2 MB."
 
 #. TRANS: Radio button on profile design page that will enable use of the uploaded profile image.
-#: lib/designsettings.php:139
+#: lib/designform.php:194
 msgctxt "RADIO"
 msgid "On"
 msgstr "Zapinjeny"
 
 #. TRANS: Radio button on profile design page that will disable use of the uploaded profile image.
-#: lib/designsettings.php:156
+#: lib/designform.php:211
 msgctxt "RADIO"
 msgid "Off"
 msgstr "Wupinjeny"
 
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: lib/designsettings.php:175
-msgid "Change colours"
-msgstr "Barby změnić"
-
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: lib/designsettings.php:257
-msgid "Use defaults"
-msgstr "Standardne hódnoty wužiwać"
+#. TRANS: Title for button on profile design page to save settings.
+#: lib/designform.php:322
+msgid "Save design"
+msgstr "Design składować"
 
 #. TRANS: Error message displayed if design settings could not be saved.
 #. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
-#: lib/designsettings.php:405 lib/designsettings.php:427
+#: lib/designsettings.php:216 lib/designsettings.php:238
 msgid "Couldn't update your design."
 msgstr "Twój design njeda so aktualizować."
 
 #. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
-#: lib/designsettings.php:433
+#: lib/designsettings.php:244
 msgid "Design defaults restored."
 msgstr "Designowe standardne nastajenja wobnowjene."
 
@@ -8055,27 +8102,23 @@ msgstr "Import bjez wužiwarja njemóžno."
 msgid "Feeds"
 msgstr "Kanale"
 
-#: lib/galleryaction.php:121
-msgid "Filter tags"
-msgstr ""
-
-#: lib/galleryaction.php:131
+#: lib/galleryaction.php:128
 msgid "All"
 msgstr "Wšě"
 
-#: lib/galleryaction.php:139
+#: lib/galleryaction.php:136
 msgid "Select tag to filter"
 msgstr ""
 
-#: lib/galleryaction.php:140
+#: lib/galleryaction.php:137
 msgid "Tag"
 msgstr ""
 
-#: lib/galleryaction.php:141
+#: lib/galleryaction.php:138
 msgid "Choose a tag to narrow list"
 msgstr ""
 
-#: lib/galleryaction.php:143
+#: lib/galleryaction.php:140
 msgid "Go"
 msgstr "Start"
 
@@ -8169,6 +8212,12 @@ msgctxt "TOOLTIP"
 msgid "%s blocked users"
 msgstr "Zablokowani wužiwarjo skupiny %s"
 
+#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
+#: lib/groupnav.php:117
+msgctxt "MENU"
+msgid "Admin"
+msgstr "Administrator"
+
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
 #: lib/groupnav.php:120
@@ -8286,39 +8335,62 @@ msgstr[1] "%d B"
 msgstr[2] "%d B"
 msgstr[3] "%d B"
 
-#: lib/jabber.php:387
+#: lib/implugin.php:262
 #, php-format
-msgid "[%s]"
-msgstr "[%s]"
+msgid ""
+"User \"%s\" on %s has said that your %s screenname belongs to them. If "
+"that's true, you can confirm by clicking on this URL: %s . (If you cannot "
+"click it, copy-and-paste it into the address bar of your browser). If that "
+"user isn't you, or if you didn't request this confirmation, just ignore this "
+"message."
+msgstr ""
 
-#: lib/jabber.php:567
+#: lib/implugin.php:349
 #, php-format
 msgid "Unknown inbox source %d."
 msgstr "Njeznate žórło postoweho kašćika %d."
 
+#: lib/implugin.php:485
+#, fuzzy, php-format
+msgid "Message too long - maximum is %1$d characters, you sent %2$d."
+msgstr ""
+"Powěsć je předołho - maksimalna dołhosć je %1$d znamješko, ty sy %2$d pósłał."
+
 #: lib/leaveform.php:114
 msgid "Leave"
 msgstr "Wopušćić"
 
+#. TRANS: Menu item for logging in to the StatusNet site.
+#: lib/logingroupnav.php:77
+msgctxt "MENU"
+msgid "Login"
+msgstr "Přizjewjenje"
+
 #. TRANS: Title for menu item for logging in to the StatusNet site.
 #: lib/logingroupnav.php:79
 msgid "Login with a username and password"
 msgstr "Přizjewjenje z wužiwarskim mjenom a hesłom"
 
+#. TRANS: Menu item for registering with the StatusNet site.
+#: lib/logingroupnav.php:85
+msgctxt "MENU"
+msgid "Register"
+msgstr "Registrować"
+
 #. TRANS: Title for menu item for registering with the StatusNet site.
 #: lib/logingroupnav.php:87
 msgid "Sign up for a new account"
 msgstr "Nowe konto registrować"
 
 #. TRANS: Subject for address confirmation email.
-#: lib/mail.php:168
+#: lib/mail.php:172
 msgid "Email address confirmation"
 msgstr "Wobkrućenje e-mejloweje adresy"
 
 #. TRANS: Body for address confirmation email.
 #. TRANS: %1$s is the addressed user's nickname, %2$s is the StatusNet sitename,
 #. TRANS: %3$s is the URL to confirm at.
-#: lib/mail.php:173
+#: lib/mail.php:177
 #, php-format
 msgid ""
 "Hey, %1$s.\n"
@@ -8337,14 +8409,14 @@ msgstr ""
 
 #. TRANS: Subject of new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
-#: lib/mail.php:238
+#: lib/mail.php:243
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1$s slěduje twoje zdźělenki na %2$s."
 
 #. TRANS: This is a paragraph in a new-subscriber e-mail.
 #. TRANS: %s is a URL where the subscriber can be reported as abusive.
-#: lib/mail.php:245
+#: lib/mail.php:250
 #, php-format
 msgid ""
 "If you believe this account is being used abusively, you can block them from "
@@ -8356,7 +8428,7 @@ msgstr ""
 #. TRANS: %3$s is the subscriber's profile URL, %4$s is the subscriber's location (or empty)
 #. TRANS: %5$s is the subscriber's homepage URL (or empty), %6%s is the subscriber's bio (or empty)
 #. TRANS: %7$s is a link to the addressed user's e-mail settings.
-#: lib/mail.php:255
+#: lib/mail.php:260
 #, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -8373,14 +8445,14 @@ msgstr ""
 
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is biographical information.
-#: lib/mail.php:278
+#: lib/mail.php:283
 #, php-format
 msgid "Bio: %s"
 msgstr "Biografija: %s"
 
 #. TRANS: Subject of notification mail for new posting email address.
 #. TRANS: %s is the StatusNet sitename.
-#: lib/mail.php:307
+#: lib/mail.php:312
 #, php-format
 msgid "New email address for posting to %s"
 msgstr "Nowa e-mejlowa adresa za słanje do %s"
@@ -8388,7 +8460,7 @@ msgstr "Nowa e-mejlowa adresa za słanje do %s"
 #. TRANS: Body of notification mail for new posting email address.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is the e-mail address to send
 #. TRANS: to to post by e-mail, %3$s is a URL to more instructions.
-#: lib/mail.php:313
+#: lib/mail.php:318
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -8403,26 +8475,26 @@ msgstr ""
 
 #. TRANS: Subject line for SMS-by-email notification messages.
 #. TRANS: %s is the posting user's nickname.
-#: lib/mail.php:434
+#: lib/mail.php:439
 #, php-format
 msgid "%s status"
 msgstr "Status wužiwarja %s"
 
 #. TRANS: Subject line for SMS-by-email address confirmation message.
-#: lib/mail.php:460
+#: lib/mail.php:465
 msgid "SMS confirmation"
 msgstr "SMS-wobkrućenje"
 
 #. TRANS: Main body heading for SMS-by-email address confirmation message.
 #. TRANS: %s is the addressed user's nickname.
-#: lib/mail.php:464
+#: lib/mail.php:469
 #, php-format
 msgid "%s: confirm you own this phone number with this code:"
 msgstr "%s: wobkruć, zo tute telefonowe čisło ze slědowacym kodom tebi słuša:"
 
 #. TRANS: Subject for 'nudge' notification email.
 #. TRANS: %s is the nudging user.
-#: lib/mail.php:485
+#: lib/mail.php:490
 #, php-format
 msgid "You have been nudged by %s"
 msgstr "%s je će storčił"
@@ -8430,7 +8502,7 @@ msgstr "%s je će storčił"
 #. TRANS: Body for 'nudge' notification email.
 #. TRANS: %1$s is the nuding user's long name, $2$s is the nudging user's nickname,
 #. TRANS: %3$s is a URL to post notices at, %4$s is the StatusNet sitename.
-#: lib/mail.php:492
+#: lib/mail.php:497
 #, php-format
 msgid ""
 "%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -8448,7 +8520,7 @@ msgstr ""
 
 #. TRANS: Subject for direct-message notification email.
 #. TRANS: %s is the sending user's nickname.
-#: lib/mail.php:539
+#: lib/mail.php:544
 #, php-format
 msgid "New private message from %s"
 msgstr "Nowa priwatna powěsć wot %s"
@@ -8457,7 +8529,7 @@ msgstr "Nowa priwatna powěsć wot %s"
 #. TRANS: %1$s is the sending user's long name, %2$s is the sending user's nickname,
 #. TRANS: %3$s is the message content, %4$s a URL to the message,
 #. TRANS: %5$s is the StatusNet sitename.
-#: lib/mail.php:547
+#: lib/mail.php:552
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -8478,7 +8550,7 @@ msgstr ""
 
 #. TRANS: Subject for favorite notification e-mail.
 #. TRANS: %1$s is the adding user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:599
+#: lib/mail.php:604
 #, php-format
 msgid "%1$s (@%2$s) added your notice as a favorite"
 msgstr "%1$s (@%2$s) je twoju zdźělenku jako faworit přidał"
@@ -8488,7 +8560,7 @@ msgstr "%1$s (@%2$s) je twoju zdźělenku jako faworit přidał"
 #. TRANS: %3$s is a URL to the faved notice, %4$s is the faved notice text,
 #. TRANS: %5$s is a URL to all faves of the adding user, %6$s is the StatusNet sitename,
 #. TRANS: %7$s is the adding user's nickname.
-#: lib/mail.php:606
+#: lib/mail.php:611
 #, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -8510,7 +8582,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:664
+#: lib/mail.php:669
 #, php-format
 msgid ""
 "The full conversation can be read here:\n"
@@ -8523,7 +8595,7 @@ msgstr ""
 
 #. TRANS: E-mail subject for notice notification.
 #. TRANS: %1$s is the sending user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:672
+#: lib/mail.php:677
 #, php-format
 msgid "%1$s (@%2$s) sent a notice to your attention"
 msgstr "%1$s (@%2$s) je zdźělenku k twojej kedźbnosći pósłał"
@@ -8534,7 +8606,7 @@ msgstr "%1$s (@%2$s) je zdźělenku k twojej kedźbnosći pósłał"
 #. TRANS: %5$s is a URL to the full conversion if it exists (otherwise empty),
 #. TRANS: %6$s is a URL to reply to the notice, %7$s is a URL to all @-replied for the addressed user,
 #. TRANS: %8$s is a URL to the addressed user's e-mail settings, %9$s is the sender's nickname.
-#: lib/mail.php:680
+#: lib/mail.php:685
 #, php-format
 msgid ""
 "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -8656,11 +8728,7 @@ msgstr "Žani wzajomni abonenća."
 msgid "To"
 msgstr "Komu"
 
-#: lib/messageform.php:166 lib/noticeform.php:186
-msgid "Available characters"
-msgstr "K dispoziciji stejace znamješka"
-
-#: lib/messageform.php:185 lib/noticeform.php:237
+#: lib/messageform.php:184 lib/noticeform.php:236
 msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr "Pósłać"
@@ -8669,16 +8737,10 @@ msgstr "Pósłać"
 msgid "Messages"
 msgstr "Powěsće"
 
-#: lib/messagelistitem.php:123 lib/noticelist.php:522
+#: lib/messagelistitem.php:123 lib/noticelist.php:527
 msgid "from"
 msgstr "wot"
 
-#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:165
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr ""
-"Přimjeno smě jenož małe pismiki a cyfry wobsahować. Mjezery njejsu dowolene."
-
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 #: lib/nickname.php:178
 msgid "Nickname cannot be empty."
@@ -8703,78 +8765,82 @@ msgstr "Zdźělenku pósłać"
 msgid "What's up, %s?"
 msgstr "Što je, %s?"
 
-#: lib/noticeform.php:194
+#: lib/noticeform.php:193
 msgid "Attach"
 msgstr "Připowěsnyć"
 
-#: lib/noticeform.php:198
+#: lib/noticeform.php:197
 msgid "Attach a file"
 msgstr "Dataju připowěsnyć"
 
-#: lib/noticeform.php:213
+#: lib/noticeform.php:212
 msgid "Share my location"
 msgstr "Městno dźělić"
 
-#: lib/noticeform.php:216
+#: lib/noticeform.php:215
 msgid "Do not share my location"
 msgstr "Njedźěl moje městno"
 
-#: lib/noticeform.php:217
+#: lib/noticeform.php:216
 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
 "try again later"
 msgstr ""
 
 #. TRANS: Used in coordinates as abbreviation of north
-#: lib/noticelist.php:452
+#: lib/noticelist.php:457
 msgid "N"
 msgstr "S"
 
 #. TRANS: Used in coordinates as abbreviation of south
-#: lib/noticelist.php:454
+#: lib/noticelist.php:459
 msgid "S"
 msgstr "J"
 
 #. TRANS: Used in coordinates as abbreviation of east
-#: lib/noticelist.php:456
+#: lib/noticelist.php:461
 msgid "E"
 msgstr "W"
 
 #. TRANS: Used in coordinates as abbreviation of west
-#: lib/noticelist.php:458
+#: lib/noticelist.php:463
 msgid "W"
 msgstr "Z"
 
-#: lib/noticelist.php:460
+#: lib/noticelist.php:465
 #, php-format
 msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 
-#: lib/noticelist.php:469
+#: lib/noticelist.php:474
 msgid "at"
 msgstr "w"
 
-#: lib/noticelist.php:518
+#: lib/noticelist.php:523
 msgid "web"
 msgstr "Web"
 
-#: lib/noticelist.php:584
+#: lib/noticelist.php:589
 msgid "in context"
 msgstr "w konteksće"
 
-#: lib/noticelist.php:619
+#: lib/noticelist.php:624
 msgid "Repeated by"
 msgstr "Wospjetowany wot"
 
-#: lib/noticelist.php:646
+#: lib/noticelist.php:651
 msgid "Reply to this notice"
 msgstr "Na tutu zdźělenku wotmołwić"
 
-#: lib/noticelist.php:647
+#: lib/noticelist.php:652
 msgid "Reply"
 msgstr "Wotmołwić"
 
-#: lib/noticelist.php:691
+#: lib/noticelist.php:678
+msgid "Delete this notice"
+msgstr "Tutu zdźělenku wušmórnyć"
+
+#: lib/noticelist.php:696
 msgid "Notice repeated"
 msgstr "Zdźělenka wospjetowana"
 
@@ -8811,43 +8877,31 @@ msgstr "Dwójna zdźělenka."
 msgid "Couldn't insert new subscription."
 msgstr "Nowy abonement njeda so zasunyć."
 
-#. TRANS: Personal group navigation menu option when logged in for viewing @-replies.
-#: lib/personalgroupnav.php:107
-msgctxt "MENU"
+#: lib/personalgroupnav.php:104
+#, fuzzy
 msgid "Replies"
 msgstr "Wotmołwy"
 
-#. TRANS: Personal group navigation menu option when logged in for seeing own profile.
-#: lib/personalgroupnav.php:114
-msgctxt "MENU"
-msgid "Profile"
-msgstr "Profil"
-
-#. TRANS: Personal group navigation menu option when logged in for viewing own favourited notices.
-#: lib/personalgroupnav.php:120
-msgctxt "MENU"
+#: lib/personalgroupnav.php:109
+#, fuzzy
 msgid "Favorites"
 msgstr "Fawority"
 
-#. TRANS: Personal group navigation menu option when logged in for viewing recieved personal messages.
-#: lib/personalgroupnav.php:133
-msgctxt "MENU"
+#: lib/personalgroupnav.php:120
+#, fuzzy
 msgid "Inbox"
 msgstr "Dochadny póst"
 
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing recieved personal messages.
-#: lib/personalgroupnav.php:135
+#: lib/personalgroupnav.php:121
 msgid "Your incoming messages"
 msgstr "Twoje dochadźace powěsće"
 
-#. TRANS: Personal group navigation menu option when logged in for viewing senet personal messages.
-#: lib/personalgroupnav.php:140
-msgctxt "MENU"
+#: lib/personalgroupnav.php:125
+#, fuzzy
 msgid "Outbox"
 msgstr "Wuchadny póst"
 
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing senet personal messages.
-#: lib/personalgroupnav.php:142
+#: lib/personalgroupnav.php:126
 msgid "Your sent messages"
 msgstr "Twoje pósłane powěsće"
 
@@ -8862,9 +8916,26 @@ msgstr "Taflički w zdźělenkach wot %s"
 msgid "Unknown"
 msgstr "Njeznaty"
 
+#. TRANS: Plugin admin panel controls
+#: lib/plugindisableform.php:90
+msgctxt "plugin"
+msgid "Disable"
+msgstr ""
+
+#. TRANS: Plugin admin panel controls
+#: lib/pluginenableform.php:112
+msgctxt "plugin"
+msgid "Enable"
+msgstr ""
+
+#: lib/pluginlist.php:196
+msgctxt "plugin-description"
+msgid "(Plugin descriptions unavailable when disabled.)"
+msgstr ""
+
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:82
+#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:88
 msgid "Subscriptions"
 msgstr "Abonementy"
 
@@ -8875,7 +8946,7 @@ msgstr "Wšě abonementy"
 
 #. TRANS: H2 text for user subscriber statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:90
+#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:96
 msgid "Subscribers"
 msgstr "Abonenća"
 
@@ -8897,7 +8968,7 @@ msgstr "Čłon wot"
 #. TRANS: Label for user statistics.
 #. TRANS: H2 text for user group membership statistics.
 #: lib/profileaction.php:239 lib/profileaction.php:290
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:104
 msgid "Groups"
 msgstr "Skupiny"
 
@@ -8917,10 +8988,6 @@ msgstr "Wšě skupiny"
 msgid "Unimplemented method."
 msgstr "Njeimplementowana metoda."
 
-#: lib/publicgroupnav.php:78
-msgid "Public"
-msgstr "Zjawny"
-
 #: lib/publicgroupnav.php:82
 msgid "User groups"
 msgstr "Wužiwarske skupiny"
@@ -8959,7 +9026,7 @@ msgid "Revoke the \"%s\" role from this user"
 msgstr "Rólu \"%s\" tutoho wužiwarja wotwołać"
 
 #. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:974
+#: lib/router.php:1001
 msgid "Page not found."
 msgstr "Strona njenamakana."
 
@@ -8988,11 +9055,6 @@ msgctxt "BUTTON"
 msgid "Search"
 msgstr "Pytać"
 
-#. TRANS: Definition list item with instructions on how to get (better) search results.
-#: lib/searchaction.php:170
-msgid "Search help"
-msgstr "Pytanska pomoc"
-
 #: lib/searchgroupnav.php:80
 msgid "People"
 msgstr "Ludźo"
@@ -9017,6 +9079,51 @@ msgstr "Wotrězk bjez titula"
 msgid "More..."
 msgstr "Wjace..."
 
+#: lib/settingsnav.php:78
+msgid "Change your profile settings"
+msgstr "Twoje profilowe nastajenja změnić"
+
+#: lib/settingsnav.php:83
+msgid "Upload an avatar"
+msgstr "Awatar nahrać"
+
+#: lib/settingsnav.php:88
+msgid "Change your password"
+msgstr "Twoje hesło změnić"
+
+#: lib/settingsnav.php:93
+msgid "Change email handling"
+msgstr ""
+
+#: lib/settingsnav.php:98
+msgid "Design your profile"
+msgstr "Twój profil wuhotować"
+
+#: lib/settingsnav.php:102
+msgid "URL"
+msgstr "URL"
+
+#: lib/settingsnav.php:103
+msgid "URL shorteners"
+msgstr ""
+
+#: lib/settingsnav.php:111
+msgid "Updates by instant messenger (IM)"
+msgstr "Aktualizacije přez Instant Messenger (IM)"
+
+#: lib/settingsnav.php:118
+msgid "Updates by SMS"
+msgstr "Aktualizacije přez SMS"
+
+#: lib/settingsnav.php:123
+#, fuzzy
+msgid "Connections"
+msgstr "Zwiski"
+
+#: lib/settingsnav.php:124
+msgid "Authorized connected applications"
+msgstr "Awtorizowane zwjazane aplikacije"
+
 #: lib/silenceform.php:67
 msgid "Silence"
 msgstr "Hubu zatykać"
@@ -9025,30 +9132,34 @@ msgstr "Hubu zatykać"
 msgid "Silence this user"
 msgstr "Tutomu wužiwarjej hubu zatykać"
 
-#: lib/subgroupnav.php:83
+#: lib/subgroupnav.php:89
 #, php-format
 msgid "People %s subscribes to"
 msgstr "Ludźo, kotrychž %s abonuje"
 
-#: lib/subgroupnav.php:91
+#: lib/subgroupnav.php:97
 #, php-format
 msgid "People subscribed to %s"
 msgstr "Ludźo, kotřiž su %s abonowali"
 
-#: lib/subgroupnav.php:99
+#: lib/subgroupnav.php:105
 #, php-format
 msgid "Groups %s is a member of"
 msgstr "Skupiny, w kotrychž %s je čłon"
 
-#: lib/subgroupnav.php:105
+#: lib/subgroupnav.php:111
 msgid "Invite"
 msgstr "Přeprosyć"
 
-#: lib/subgroupnav.php:106
+#: lib/subgroupnav.php:112
 #, php-format
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Přećelow a kolegow přeprosyć, so tebi na %s  přidružić"
 
+#: lib/subscribeform.php:115 lib/subscribeform.php:139
+msgid "Subscribe to this user"
+msgstr "Tutoho wužiwarja abonować"
+
 #: lib/subscriberspeopleselftagcloudsection.php:48
 #: lib/subscriptionspeopleselftagcloudsection.php:48
 msgid "People Tagcloud as self-tagged"
@@ -9119,6 +9230,15 @@ msgstr "Šat wobsahuje dataju typa '.%s', kotryž njeje dowoleny."
 msgid "Error opening theme archive."
 msgstr "Zmylk při wočinjenju šatoweho archiwa."
 
+#: lib/threadednoticelist.php:270
+#, php-format
+msgid "Show all %d comment"
+msgid_plural "Show all %d comments"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
 #: lib/topposterssection.php:74
 msgid "Top posters"
 msgstr ""
@@ -9160,76 +9280,79 @@ msgstr "Wotskazać"
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "Wužiwar %1$s (%2$d) nima profilowu datowu sadźbu."
 
-#. TRANS: Link text for changeing the avatar of the logged in user.
-#: lib/userprofile.php:121
+#: lib/userprofile.php:116
 msgid "Edit Avatar"
 msgstr "Awatar wobdźěłać"
 
 #. TRANS: H2 for user actions in a profile.
 #. TRANS: H2 for entity actions in a profile.
-#: lib/userprofile.php:245 lib/userprofile.php:261
+#: lib/userprofile.php:216 lib/userprofile.php:232
 msgid "User actions"
 msgstr "Wužiwarske akcije"
 
 #. TRANS: Text shown in user profile of not yet compeltely deleted users.
-#: lib/userprofile.php:249
+#: lib/userprofile.php:220
 msgid "User deletion in progress..."
 msgstr "Wužiwar so haša..."
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:277
+#: lib/userprofile.php:248
 msgid "Edit profile settings"
 msgstr "Profilowe nastajenja wobdźěłać"
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:279
+#: lib/userprofile.php:250
 msgid "Edit"
 msgstr "Wobdźěłać"
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:303
+#: lib/userprofile.php:274
 msgid "Send a direct message to this user"
 msgstr "Tutomu wužiwarja direktnu powěsć pósłać"
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:305
+#: lib/userprofile.php:276
 msgid "Message"
 msgstr "Powěsć"
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:347
+#: lib/userprofile.php:318
 msgid "Moderate"
 msgstr "Moderěrować"
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:386
+#: lib/userprofile.php:357
 msgid "User role"
 msgstr "Wužiwarska róla"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:389
+#: lib/userprofile.php:360
 msgctxt "role"
 msgid "Administrator"
 msgstr "Administrator"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:391
+#: lib/userprofile.php:362
 msgctxt "role"
 msgid "Moderator"
 msgstr "Moderator"
 
+#: lib/util.php:321
+msgid "Not allowed to log in."
+msgstr "Přizjewjenje njedowolene."
+
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1306
+#: lib/util.php:1337
 msgid "a few seconds ago"
 msgstr "před něšto sekundami"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1309
+#: lib/util.php:1340
 msgid "about a minute ago"
 msgstr "před něhdźe jednej mjeńšinu"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1313
+#: lib/util.php:1344
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
@@ -9239,12 +9362,12 @@ msgstr[2] "před něhdźe %d mjeńšinami"
 msgstr[3] "před něhdźe %d mjeńšinami"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1316
+#: lib/util.php:1347
 msgid "about an hour ago"
 msgstr "před něhdźe jednej hodźinu"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1320
+#: lib/util.php:1351
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
@@ -9254,12 +9377,12 @@ msgstr[2] "před něhdźe %d hodźinami"
 msgstr[3] "před něhdźe %d hodźinami"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1323
+#: lib/util.php:1354
 msgid "about a day ago"
 msgstr "před něhdźe jednym dnjom"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1327
+#: lib/util.php:1358
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
@@ -9269,12 +9392,12 @@ msgstr[2] "před něhdźe %d dnjemi"
 msgstr[3] "před něhdźe %d dnjemi"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1330
+#: lib/util.php:1361
 msgid "about a month ago"
 msgstr "před něhdźe jednym měsacom"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1334
+#: lib/util.php:1365
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
@@ -9284,7 +9407,7 @@ msgstr[2] "před něhdźe %d měsacami"
 msgstr[3] "před něhdźe %d měacami"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1337
+#: lib/util.php:1368
 msgid "about a year ago"
 msgstr "před něhdźe jednym lětom"
 
@@ -9297,27 +9420,6 @@ msgstr ""
 "%s płaćiwa barba njeje! Wužij 3 heksadecimalne znamješka abo 6 "
 "heksadecimalnych znamješkow."
 
-#. TRANS: %s is the URL to the StatusNet site's Instant Messaging settings.
-#: lib/xmppmanager.php:287
-#, php-format
-msgid "Unknown user. Go to %s to add your address to your account"
-msgstr "Njeznaty wužiwar. Dźi k %s, zo by swoju adresu swojemu kontu přidał."
-
-#. TRANS: Response to XMPP source when it sent too long a message.
-#. TRANS: %1$d the maximum number of allowed characters (used for plural), %2$d is the sent number.
-#: lib/xmppmanager.php:406
-#, php-format
-msgid "Message too long. Maximum is %1$d character, you sent %2$d."
-msgid_plural "Message too long. Maximum is %1$d characters, you sent %2$d."
-msgstr[0] ""
-"Powěsć je předołho. Maksimalna dołhosć je %1$d znamješko, ty sy %2$d pósłał."
-msgstr[1] ""
-"Powěsć je předołho. Maksimalna dołhosć je %1$d znamješce, ty sy %2$d pósłał."
-msgstr[2] ""
-"Powěsć je předołho. Maksimalna dołhosć je %1$d znamješka, ty sy %2$d pósłał."
-msgstr[3] ""
-"Powěsć je předołho. Maksimalna dołhosć je %1$d znamješkow, ty sy %2$d pósłał."
-
 #. TRANS: Exception.
 #: lib/xrd.php:63
 msgid "Invalid XML."
@@ -9334,50 +9436,162 @@ msgstr "Njepłaćiwy XML, korjeń XRD faluje."
 msgid "Getting backup from file '%s'."
 msgstr "Wobstaruje so zawěsćenje z dataje \"%s\"-"
 
-#~ msgid "Block this user."
-#~ msgstr "Tutoho wužiwarja blokować."
+#~ msgid "Could not generate feed for group - %s"
+#~ msgstr "Njebě móžno kanal za skupinu wutworić - %s"
 
-#~ msgid "Delete this notice."
-#~ msgstr "Tutu zdźělenku zhašeć."
+#~ msgid "Current confirmed Jabber/Google Talk address."
+#~ msgstr "Aktualna wobkrućena adresa Jabber/Google Talk."
 
-#~ msgid "Delete this user."
-#~ msgstr "Tutoho wužiwarja zhašeć"
+#~ msgid "Send me notices through Jabber/Google Talk."
+#~ msgstr "Pósćel mi zdźělenki přez Jabber/Google Talk."
 
-#~ msgid "Restore default designs."
-#~ msgstr "Standardne designy wobnowić."
+#~ msgid "Publish a MicroID for my Jabber/Google Talk address."
+#~ msgstr "MicroID za moju adresu Jabber/Google Talk publikować."
 
-#~ msgid "Reset back to default."
-#~ msgstr "Na standard wróćo stajić."
+#~ msgid "No Jabber ID."
+#~ msgstr "Žadyn ID Jabber."
 
-#~ msgid "Save design."
-#~ msgstr "Design składować."
+#~ msgid "Not a valid Jabber ID."
+#~ msgstr "Njepłaćiwy Jabber-ID."
 
-#~ msgid "Disfavor favorite."
-#~ msgstr "Z faworitow wotstronić."
+#~ msgid "That is already your Jabber ID."
+#~ msgstr "To je hižo twój ID Jabber."
 
-#~ msgid "\"%s\" not found."
-#~ msgstr "\"%s\" njenamakany."
+#~ msgid "That is not your Jabber ID."
+#~ msgstr "To njeje twój ID Jabber."
 
-#~ msgid "Notice %s not found."
-#~ msgstr "Zdźělenka %s njenamakana."
+#~ msgid "Other settings"
+#~ msgstr "Druhe nastajenja"
 
-#~ msgid "Attachment %s not found."
-#~ msgstr "Přiwěšk %s njenamakany."
+#~ msgid "Tag cloud"
+#~ msgstr "Mróčel tafličkow"
 
-#~ msgid "Invalid tag: \"%s\"."
-#~ msgstr "Njepłaćiwa taflička: \"%s\"."
+#~ msgid "Consumer key"
+#~ msgstr "Kluč přetrjebowarja"
 
-#~ msgid "%s updates from everyone."
-#~ msgstr "%s aktualizacijow wote wšěch."
+#~ msgid "Consumer secret"
+#~ msgstr "Potajnstwo přetrjebowarja"
 
-#~ msgid "Password saved"
-#~ msgstr "Hesło składowane"
+#~ msgid "Authorize URL"
+#~ msgstr "URL awtorizować"
 
-#~ msgid "Where you are, like \"City, State (or Region), Country\"."
-#~ msgstr "Hdźež sy, na př. \"město, zwjazkowy kraj (abo region) , kraj\"."
+#~ msgid "Jabber"
+#~ msgstr "Jabber"
 
-#~ msgid "Subscribe to this user."
-#~ msgstr "Tutoho wužiwarja abonować."
+#~ msgid "Photo"
+#~ msgstr "Foto"
 
-#~ msgid "Not allowed to log in."
-#~ msgstr "Přizjewjenje njedowolene."
+#~ msgid "Other options"
+#~ msgstr "Druhe opcije"
+
+#~ msgid "Other"
+#~ msgstr "Druhe"
+
+#~ msgid "Primary site navigation"
+#~ msgstr "Primarna sydłowa nawigacija"
+
+#~ msgctxt "MENU"
+#~ msgid "Personal"
+#~ msgstr "Wosobinski"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Change your email, avatar, password, profile"
+#~ msgstr "Wašu e-mejl, waš awatar, waše hesło, waš profil změnić"
+
+#~ msgid "Account"
+#~ msgstr "Konto"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Connect to services"
+#~ msgstr "Ze słužbami zwjazać"
+
+#~ msgid "Connect"
+#~ msgstr "Zwjazać"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Change site configuration"
+#~ msgstr "Sydłowu konfiguraciju změnić"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Invite friends and colleagues to join you on %s"
+#~ msgstr "Přećelow a kolegow přeprosyć, so tebi na %s  přidružić"
+
+#~ msgctxt "MENU"
+#~ msgid "Invite"
+#~ msgstr "Přeprosyć"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Create an account"
+#~ msgstr "Konto załožić"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Help me!"
+#~ msgstr "Pomhaj!"
+
+#~ msgctxt "MENU"
+#~ msgid "Help"
+#~ msgstr "Pomoc"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Search for people or text"
+#~ msgstr "Za ludźimi abo tekstom pytać"
+
+#~ msgid "Local views"
+#~ msgstr "Lokalne napohlady"
+
+#~ msgid "Page notice"
+#~ msgstr "Zdźělenka strony"
+
+#~ msgid "Secondary site navigation"
+#~ msgstr "Sekundarna sydłowa nawigacija"
+
+#~ msgid "StatusNet software license"
+#~ msgstr "Softwarowa licenca StatusNet"
+
+#~ msgid "Site content license"
+#~ msgstr "Licenca sydłoweho wobsaha"
+
+#~ msgid "Pagination"
+#~ msgstr "Paginowanje"
+
+#~ msgid "Author"
+#~ msgstr "Awtor"
+
+#~ msgid "Provider"
+#~ msgstr "Poskićowar"
+
+#~ msgctxt "MENU"
+#~ msgid "SMS"
+#~ msgstr "SMS"
+
+#~ msgid "[%s]"
+#~ msgstr "[%s]"
+
+#~ msgid "Available characters"
+#~ msgstr "K dispoziciji stejace znamješka"
+
+#~ msgctxt "MENU"
+#~ msgid "Profile"
+#~ msgstr "Profil"
+
+#~ msgid "Search help"
+#~ msgstr "Pytanska pomoc"
+
+#~ msgid "Unknown user. Go to %s to add your address to your account"
+#~ msgstr ""
+#~ "Njeznaty wužiwar. Dźi k %s, zo by swoju adresu swojemu kontu přidał."
+
+#~ msgid "Message too long. Maximum is %1$d character, you sent %2$d."
+#~ msgid_plural "Message too long. Maximum is %1$d characters, you sent %2$d."
+#~ msgstr[0] ""
+#~ "Powěsć je předołho. Maksimalna dołhosć je %1$d znamješko, ty sy %2$d "
+#~ "pósłał."
+#~ msgstr[1] ""
+#~ "Powěsć je předołho. Maksimalna dołhosć je %1$d znamješce, ty sy %2$d "
+#~ "pósłał."
+#~ msgstr[2] ""
+#~ "Powěsć je předołho. Maksimalna dołhosć je %1$d znamješka, ty sy %2$d "
+#~ "pósłał."
+#~ msgstr[3] ""
+#~ "Powěsć je předołho. Maksimalna dołhosć je %1$d znamješkow, ty sy %2$d "
+#~ "pósłał."
diff --git a/locale/hu/LC_MESSAGES/statusnet.po b/locale/hu/LC_MESSAGES/statusnet.po
index 3470c26e08..edbdd47c13 100644
--- a/locale/hu/LC_MESSAGES/statusnet.po
+++ b/locale/hu/LC_MESSAGES/statusnet.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 15:58+0000\n"
-"PO-Revision-Date: 2011-03-03 16:00:50+0000\n"
+"POT-Creation-Date: 2011-03-03 17:23+0000\n"
+"PO-Revision-Date: 2011-03-03 17:26:05+0000\n"
 "Language-Team: Hungarian <http://translatewiki.net/wiki/Portal:hu>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -81,23 +81,23 @@ msgstr "Hozzáférések beállításainak mentése"
 #. TRANS: Tooltip for button to save access settings in site admin panel.
 #. TRANS: Button text for saving theme settings.
 #. TRANS: Button label to save e-mail preferences.
-#. TRANS: Button label to save Instant Messaging preferences.
-#. TRANS: Button text for saving "Other settings" in profile.
+#. TRANS: Button label to save IM preferences.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
 #. TRANS: Button text for saving site notice in admin panel.
 #. TRANS: Button label to save SMS preferences.
 #. TRANS: Save button for settings for a profile in a subscriptions list.
+#. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
 #. TRANS: Button text on profile design page to save settings.
 #: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
-#: actions/emailsettings.php:250 actions/imsettings.php:183
-#: actions/othersettings.php:136 actions/pathsadminpanel.php:512
-#: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
-#: actions/smssettings.php:205 actions/subscriptions.php:259
+#: actions/emailsettings.php:251 actions/imsettings.php:199
+#: actions/pathsadminpanel.php:512 actions/profilesettings.php:198
+#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:204
+#: actions/subscriptions.php:261 actions/urlsettings.php:152
 #: actions/useradminpanel.php:298 lib/applicationeditform.php:355
-#: lib/designsettings.php:270 lib/groupeditform.php:201
+#: lib/designform.php:320 lib/groupeditform.php:201
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Mentés"
@@ -136,7 +136,11 @@ msgstr "Nincs ilyen lap."
 #. 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 use "one time password login" without using an existing user.
+#. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
+#. TRANS: Client error displayed trying to find a user by ID for a non-existing ID.
+#. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when calling a profile action without specifying a user.
 #: actions/all.php:80 actions/allrss.php:69
@@ -148,19 +152,19 @@ msgstr "Nincs ilyen lap."
 #: actions/apidirectmessage.php:75 actions/apidirectmessagenew.php:72
 #: actions/apigroupcreate.php:111 actions/apigroupismember.php:89
 #: actions/apigroupjoin.php:98 actions/apigroupleave.php:98
-#: actions/apigrouplist.php:70 actions/apistatusesupdate.php:230
-#: actions/apisubscriptions.php:85 actions/apitimelinefavorites.php:70
-#: actions/apitimelinefriends.php:173 actions/apitimelinehome.php:78
-#: actions/apitimelinementions.php:77 actions/apitimelineuser.php:79
-#: actions/avatarbynickname.php:79 actions/favoritesrss.php:72
-#: actions/foaf.php:42 actions/foaf.php:61 actions/hcard.php:67
-#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
-#: actions/remotesubscribe.php:144 actions/remotesubscribe.php:153
-#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
-#: actions/showfavorites.php:106 actions/userbyid.php:74
-#: actions/usergroups.php:93 actions/userrss.php:40 actions/userxrd.php:59
-#: actions/xrds.php:71 lib/command.php:509 lib/galleryaction.php:59
-#: lib/mailbox.php:80 lib/profileaction.php:77
+#: actions/apigrouplist.php:70 actions/apigroupprofileupdate.php:108
+#: actions/apistatusesupdate.php:230 actions/apisubscriptions.php:85
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:173
+#: actions/apitimelinehome.php:78 actions/apitimelinementions.php:77
+#: actions/apitimelineuser.php:79 actions/avatarbynickname.php:79
+#: actions/favoritesrss.php:72 actions/foaf.php:42 actions/foaf.php:61
+#: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116
+#: actions/otp.php:78 actions/remotesubscribe.php:144
+#: actions/remotesubscribe.php:153 actions/replies.php:73
+#: actions/repliesrss.php:38 actions/rsd.php:113 actions/showfavorites.php:106
+#: actions/userbyid.php:75 actions/usergroups.php:93 actions/userrss.php:40
+#: actions/userxrd.php:59 actions/xrds.php:71 lib/command.php:509
+#: lib/galleryaction.php:59 lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Nincs ilyen felhasználó."
 
@@ -174,10 +178,9 @@ msgstr "%1$s és barátai, %2$d oldal"
 #. TRANS: H1 text for page. %s is a user nickname.
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Timeline title for user and friends. %s is a user nickname.
-#. TRANS: Tooltop for personal group navigation menu option when logged in for viewing timeline of self and friends.
 #: actions/all.php:94 actions/all.php:191 actions/allrss.php:117
 #: actions/apitimelinefriends.php:207 actions/apitimelinehome.php:113
-#: lib/personalgroupnav.php:102
+#: lib/personalgroupnav.php:100
 #, php-format
 msgid "%s and friends"
 msgstr "%s és barátai"
@@ -233,7 +236,7 @@ msgstr ""
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
 #. TRANS: Second sentence of empty message for anonymous users. %s is a user nickname.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:227
+#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:221
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -280,19 +283,20 @@ msgstr "Frissítések %1$s felhasználótól, és barátok a következő oldalon
 #: actions/apifavoritecreate.php:98 actions/apifavoritedestroy.php:98
 #: actions/apifriendshipscreate.php:99 actions/apifriendshipsdestroy.php:99
 #: actions/apifriendshipsshow.php:124 actions/apigroupcreate.php:138
-#: actions/apigroupismember.php:115 actions/apigroupjoin.php:160
-#: actions/apigroupleave.php:145 actions/apigrouplist.php:134
+#: actions/apigroupismember.php:115 actions/apigroupjoin.php:151
+#: actions/apigroupleave.php:141 actions/apigrouplist.php:134
 #: actions/apigrouplistall.php:120 actions/apigroupmembership.php:105
+#: actions/apigroupprofileupdate.php:100 actions/apigroupprofileupdate.php:213
 #: actions/apigroupshow.php:114 actions/apihelptest.php:84
 #: actions/apistatusesdestroy.php:101 actions/apistatusesretweets.php:110
 #: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:139
 #: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
-#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:268
-#: actions/apitimelinegroup.php:147 actions/apitimelinehome.php:173
-#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:239
-#: actions/apitimelineretweetedtome.php:118
-#: actions/apitimelineretweetsofme.php:150 actions/apitimelinetag.php:159
-#: actions/apitimelineuser.php:206 actions/apiusershow.php:100
+#: actions/apitimelinefavorites.php:182 actions/apitimelinefriends.php:276
+#: actions/apitimelinegroup.php:148 actions/apitimelinehome.php:181
+#: actions/apitimelinementions.php:182 actions/apitimelinepublic.php:247
+#: actions/apitimelineretweetedtome.php:147
+#: actions/apitimelineretweetsofme.php:147 actions/apitimelinetag.php:165
+#: actions/apitimelineuser.php:217 actions/apiusershow.php:100
 msgid "API method not found."
 msgstr "Az API-metódus nem található."
 
@@ -307,8 +311,9 @@ msgstr "Az API-metódus nem található."
 #: actions/apifavoritecreate.php:88 actions/apifavoritedestroy.php:88
 #: actions/apifriendshipscreate.php:89 actions/apifriendshipsdestroy.php:89
 #: actions/apigroupcreate.php:102 actions/apigroupjoin.php:89
-#: actions/apigroupleave.php:89 actions/apimediaupload.php:66
-#: actions/apistatusesretweet.php:63 actions/apistatusesupdate.php:194
+#: actions/apigroupleave.php:89 actions/apigroupprofileupdate.php:92
+#: actions/apimediaupload.php:66 actions/apistatusesretweet.php:63
+#: actions/apistatusesupdate.php:194
 msgid "This method requires a POST."
 msgstr "Ez a metódus POST-ot igényel."
 
@@ -320,21 +325,16 @@ msgid ""
 msgstr ""
 
 #. TRANS: Server error displayed when a user's delivery device cannot be updated.
-#. TRANS: Server error displayed when a user update to the database fails in the contact address confirmation action.
 #. TRANS: Server error thrown on database error updating e-mail preferences.
 #. TRANS: Server error thrown on database error removing a registered e-mail address.
-#. TRANS: Server error thrown on database error updating Instant Messaging preferences.
-#. TRANS: Server error thrown on database error removing a registered Instant Messaging address.
-#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
 #. TRANS: Server error thrown when user profile settings could not be updated.
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
-#: actions/apiaccountupdatedeliverydevice.php:130
-#: actions/confirmaddress.php:118 actions/emailsettings.php:352
-#: actions/emailsettings.php:498 actions/imsettings.php:276
-#: actions/imsettings.php:432 actions/othersettings.php:186
-#: actions/profilesettings.php:322 actions/smssettings.php:301
-#: actions/smssettings.php:454
+#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
+#: actions/apiaccountupdatedeliverydevice.php:136
+#: actions/emailsettings.php:353 actions/emailsettings.php:499
+#: actions/profilesettings.php:323 actions/smssettings.php:300
+#: actions/smssettings.php:453 actions/urlsettings.php:211
 msgid "Could not update user."
 msgstr "Nem sikerült frissíteni a felhasználót."
 
@@ -360,7 +360,7 @@ msgstr "A felhasználónak nincs profilja."
 
 #. TRANS: Server error displayed if a user profile could not be saved.
 #. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:418
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:419
 msgid "Could not save profile."
 msgstr "Nem sikerült menteni a profilt."
 
@@ -372,7 +372,7 @@ msgstr "Nem sikerült menteni a profilt."
 #: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
 #: actions/designadminpanel.php:120 actions/editapplication.php:121
 #: actions/newapplication.php:102 actions/newnotice.php:95
-#: lib/designsettings.php:298
+#: lib/designsettings.php:110
 #, fuzzy, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s byte) due to its "
@@ -397,8 +397,8 @@ msgstr[1] ""
 #: actions/apiaccountupdateprofilecolors.php:160
 #: actions/apiaccountupdateprofilecolors.php:171
 #: actions/groupdesignsettings.php:285 actions/groupdesignsettings.php:296
-#: actions/userdesignsettings.php:201 actions/userdesignsettings.php:211
-#: actions/userdesignsettings.php:253 actions/userdesignsettings.php:263
+#: actions/userdesignsettings.php:218 actions/userdesignsettings.php:228
+#: actions/userdesignsettings.php:270 actions/userdesignsettings.php:280
 msgid "Unable to save your design settings."
 msgstr "Nem sikerült elmenteni a megjelenítési beállításaid."
 
@@ -406,7 +406,7 @@ msgstr "Nem sikerült elmenteni a megjelenítési beállításaid."
 #. TRANS: Client error displayed when a database error occurs updating profile colours.
 #: actions/apiaccountupdateprofilebackgroundimage.php:191
 #: actions/apiaccountupdateprofilecolors.php:139
-#: actions/userdesignsettings.php:179
+#: actions/userdesignsettings.php:196
 msgid "Could not update your design."
 msgstr "Nem sikerült frissíteni a megjelenítést."
 
@@ -515,7 +515,7 @@ msgstr "A címzett felhasználó nem található."
 #. TRANS: Client error displayed trying to direct message another user who's not a friend (403).
 #: actions/apidirectmessagenew.php:144
 #, fuzzy
-msgid "Can't send direct messages to users who aren't your friend."
+msgid "Cannot send direct messages to users who aren't your friend."
 msgstr ""
 "Nem küldhetsz közvetlen üzenetet olyan felhasználóknak, akik nem a barátaid."
 
@@ -598,9 +598,9 @@ msgstr "A cél felhasználó nem található."
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:156 actions/editgroup.php:191
-#: actions/newgroup.php:137 actions/profilesettings.php:273
-#: actions/register.php:214
+#: actions/apigroupcreate.php:156 actions/apigroupprofileupdate.php:255
+#: actions/editgroup.php:191 actions/newgroup.php:137
+#: actions/profilesettings.php:274 actions/register.php:199
 msgid "Nickname already in use. Try another one."
 msgstr "A becenév már foglalt. Próbálj meg egy másikat."
 
@@ -608,9 +608,9 @@ msgstr "A becenév már foglalt. Próbálj meg egy másikat."
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:164 actions/editgroup.php:195
-#: actions/newgroup.php:141 actions/profilesettings.php:243
-#: actions/register.php:216
+#: actions/apigroupcreate.php:164 actions/apigroupprofileupdate.php:259
+#: actions/editgroup.php:195 actions/newgroup.php:141
+#: actions/profilesettings.php:244 actions/register.php:201
 msgid "Not a valid nickname."
 msgstr "Nem érvényes becenév."
 
@@ -620,10 +620,10 @@ msgstr "Nem érvényes becenév."
 #. TRANS: Validation error shown when providing an invalid homepage URL in the "New application" form.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:181 actions/editapplication.php:235
-#: actions/editgroup.php:202 actions/newapplication.php:221
-#: actions/newgroup.php:148 actions/profilesettings.php:248
-#: actions/register.php:223
+#: actions/apigroupcreate.php:181 actions/apigroupprofileupdate.php:277
+#: actions/editapplication.php:235 actions/editgroup.php:202
+#: actions/newapplication.php:221 actions/newgroup.php:148
+#: actions/profilesettings.php:249 actions/register.php:208
 msgid "Homepage is not a valid URL."
 msgstr "A honlap érvénytelen URL-cím."
 
@@ -632,8 +632,8 @@ msgstr "A honlap érvénytelen URL-cím."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:191 actions/editgroup.php:206
-#: actions/newgroup.php:152 actions/profilesettings.php:252
-#: actions/register.php:226
+#: actions/newgroup.php:152 actions/profilesettings.php:253
+#: actions/register.php:211
 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "A teljes név túl hosszú (legfeljebb 255 karakter lehet)."
@@ -661,8 +661,8 @@ msgstr[1] "A leírás túl hosszú (legfeljebb %d karakter lehet)."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:215 actions/editgroup.php:218
-#: actions/newgroup.php:164 actions/profilesettings.php:265
-#: actions/register.php:235
+#: actions/newgroup.php:164 actions/profilesettings.php:266
+#: actions/register.php:220
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
 msgstr "A hely túl hosszú (legfeljebb 255 karakter lehet)."
@@ -692,15 +692,16 @@ msgstr "Érvénytelen álnév: „%s”."
 #. TRANS: %s is the alias that is already in use.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error. %s is the already used alias.
-#: actions/apigroupcreate.php:264 actions/editgroup.php:246
-#: actions/newgroup.php:193
+#: actions/apigroupcreate.php:264 actions/apigroupprofileupdate.php:351
+#: actions/editgroup.php:246 actions/newgroup.php:193
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "A(z) „%s” álnév már használatban van. Próbálj meg egy másikat."
 
 #. TRANS: Client error displayed when trying to use an alias during group creation that is the same as the group's nickname.
 #. TRANS: Group edit form validation error.
-#: actions/apigroupcreate.php:278 actions/editgroup.php:253
+#: actions/apigroupcreate.php:278 actions/apigroupprofileupdate.php:359
+#: actions/editgroup.php:253
 msgid "Alias can't be the same as nickname."
 msgstr "Az álnév nem egyezhet meg a becenévvel."
 
@@ -712,7 +713,8 @@ msgstr "Az álnév nem egyezhet meg a becenévvel."
 #. TRANS: Client error displayed requesting most recent notices to a group for a non-existing group.
 #: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
 #: actions/apigroupleave.php:104 actions/apigroupmembership.php:71
-#: actions/apigroupshow.php:81 actions/apitimelinegroup.php:89
+#: actions/apigroupprofileupdate.php:113 actions/apigroupshow.php:81
+#: actions/apitimelinegroup.php:89
 msgid "Group not found."
 msgstr "A csoport nem található."
 
@@ -730,13 +732,11 @@ msgstr "Már tagja vagy ennek a csoportnak."
 msgid "You have been blocked from that group by the admin."
 msgstr "Az adminisztrátor blokkolt ebből a csoportból."
 
-#. TRANS: Server error displayed when joining a group fails.
-#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
 #. 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.
 #. TRANS: Message given having failed to add a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:362
+#: actions/apigroupjoin.php:136 actions/joingroup.php:139 lib/command.php:362
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "Nem sikerült %1$s felhasználót hozzáadni a %2$s csoporthoz."
@@ -746,8 +746,6 @@ msgstr "Nem sikerült %1$s felhasználót hozzáadni a %2$s csoporthoz."
 msgid "You are not a member of this group."
 msgstr "Nem vagy tagja ennek a csoportnak."
 
-#. TRANS: Server error displayed when leaving a group fails.
-#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
 #. TRANS: Server error displayed when leaving a group failed in the database.
 #. TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
 #. TRANS: Message given having failed to remove a user from a group.
@@ -783,6 +781,61 @@ msgstr "%s csoportok"
 msgid "groups on %s"
 msgstr "%s csoportok"
 
+#. TRANS: Client error displayed trying to edit a group while not being a group admin.
+#. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
+#. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
+#: actions/apigroupprofileupdate.php:118 actions/editgroup.php:110
+#: actions/editgroup.php:176 actions/groupdesignsettings.php:109
+#: actions/grouplogo.php:111
+msgid "You must be an admin to edit the group."
+msgstr ""
+
+#. TRANS: Server error displayed when editing a group fails.
+#: actions/apigroupprofileupdate.php:171 actions/editgroup.php:274
+msgid "Could not update group."
+msgstr "Nem sikerült a csoport frissítése."
+
+#. TRANS: Server error displayed when group aliases could not be added.
+#. TRANS: Server exception thrown when creating group aliases failed.
+#: actions/apigroupprofileupdate.php:194 actions/editgroup.php:281
+#: classes/User_group.php:540
+msgid "Could not create aliases."
+msgstr "Nem sikerült létrehozni az álneveket."
+
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: actions/apigroupprofileupdate.php:249 lib/nickname.php:165
+msgid "Nickname must have only lowercase letters and numbers and no spaces."
+msgstr "A becenév csak kisbetűket és számokat tartalmazhat, szóközök nélkül."
+
+#: actions/apigroupprofileupdate.php:286
+#, fuzzy
+msgid "Full name is too long (max 255 chars)."
+msgstr "A teljes név túl hosszú (legfeljebb 255 karakter lehet)."
+
+#: actions/apigroupprofileupdate.php:296
+#, fuzzy, php-format
+msgid "description is too long (max %d chars)."
+msgstr "A leírás túl hosszú (legfeljebb %d karakter lehet)."
+
+#: actions/apigroupprofileupdate.php:307
+#, fuzzy
+msgid "Location is too long (max 255 chars)."
+msgstr "A hely túl hosszú (legfeljebb 255 karakter lehet)."
+
+#: actions/apigroupprofileupdate.php:326
+#, fuzzy, php-format
+msgid "Too many aliases! Maximum %d."
+msgstr "Túl sok álnév! Legfeljebb %d lehet."
+
+#. TRANS: Group edit form validation error.
+#. TRANS: Group create form validation error.
+#. TRANS: %s is the invalid alias.
+#: actions/apigroupprofileupdate.php:342 actions/editgroup.php:241
+#: actions/newgroup.php:188
+#, php-format
+msgid "Invalid alias: \"%s\""
+msgstr "Érvénytelen álnév: „%s”"
+
 #. TRANS: Client error displayed when uploading a media file has failed.
 #: actions/apimediaupload.php:101
 msgid "Upload failed."
@@ -815,21 +868,22 @@ msgstr "Nincs jogosultságod."
 #. TRANS: Form validation error message.
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
+#. TRANS: Client error displayed when the session token is not okay.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
 #: actions/deletenotice.php:177 actions/disfavor.php:75
-#: actions/emailsettings.php:291 actions/favor.php:75 actions/geocode.php:55
+#: actions/emailsettings.php:292 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:65 actions/grouplogo.php:321
-#: actions/groupunblock.php:65 actions/imsettings.php:224
-#: actions/invite.php:60 actions/login.php:137 actions/makeadmin.php:66
-#: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
-#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
-#: actions/othersettings.php:155 actions/passwordsettings.php:138
-#: actions/profilesettings.php:217 actions/recoverpassword.php:383
-#: actions/register.php:172 actions/remotesubscribe.php:76
-#: actions/repeat.php:82 actions/smssettings.php:250 actions/subedit.php:40
-#: actions/subscribe.php:86 actions/tagother.php:166
-#: actions/unsubscribe.php:69 actions/userauthorization.php:52
-#: lib/designsettings.php:310
+#: actions/groupunblock.php:65 actions/imsettings.php:241
+#: actions/invite.php:60 actions/makeadmin.php:66 actions/newmessage.php:135
+#: actions/newnotice.php:105 actions/nudge.php:80
+#: actions/oauthappssettings.php:162 actions/oauthconnectionssettings.php:135
+#: actions/passwordsettings.php:137 actions/pluginenable.php:87
+#: actions/profilesettings.php:218 actions/recoverpassword.php:383
+#: actions/register.php:157 actions/remotesubscribe.php:76
+#: actions/repeat.php:82 actions/smssettings.php:249 actions/subedit.php:40
+#: actions/subscribe.php:87 actions/tagother.php:145
+#: actions/unsubscribe.php:69 actions/urlsettings.php:171
+#: actions/userauthorization.php:53 lib/designsettings.php:122
 msgid "There was a problem with your session token. Try again, please."
 msgstr "Probléma volt a munkameneted tokenjével. Kérlek, próbáld újra."
 
@@ -857,10 +911,10 @@ msgstr ""
 #. TRANS: Unknown form validation error in design settings form.
 #: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
 #: actions/designadminpanel.php:100 actions/editapplication.php:144
-#: actions/emailsettings.php:310 actions/grouplogo.php:332
-#: actions/imsettings.php:239 actions/newapplication.php:124
-#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
-#: actions/smssettings.php:271 lib/designsettings.php:321
+#: actions/emailsettings.php:311 actions/grouplogo.php:332
+#: actions/imsettings.php:256 actions/newapplication.php:124
+#: actions/oauthconnectionssettings.php:144 actions/recoverpassword.php:46
+#: actions/smssettings.php:270 lib/designsettings.php:133
 msgid "Unexpected form submission."
 msgstr "Váratlan űrlapbeküldés."
 
@@ -904,31 +958,26 @@ msgstr "Kontó"
 
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Field label in form for profile settings.
-#. TRANS: Label for group nickname (dt). Text hidden by default.
-#. TRANS: DT for nick name in a profile.
-#: actions/apioauthauthorize.php:459 actions/login.php:252
-#: actions/profilesettings.php:106 actions/register.php:432
-#: actions/showgroup.php:243 actions/tagother.php:94
+#: actions/apioauthauthorize.php:459 actions/login.php:225
+#: actions/profilesettings.php:107 actions/register.php:411
 #: actions/userauthorization.php:145 lib/groupeditform.php:145
-#: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "Becenév"
 
 #. TRANS: Field label on OAuth API authorisation form.
-#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:463 actions/login.php:255
-#: actions/register.php:436 lib/accountsettingsaction.php:120
+#: actions/apioauthauthorize.php:463 actions/login.php:228
+#: actions/register.php:415 lib/settingsnav.php:87
 msgid "Password"
 msgstr "Jelszó"
 
 #. TRANS: Button text that when clicked will cancel the process of allowing access to an account
 #. TRANS: by an external application.
 #. TRANS: Button label to cancel an e-mail address confirmation procedure.
-#. TRANS: Button label to cancel an Instant Messaging address confirmation procedure.
+#. TRANS: Button label to cancel an IM address confirmation procedure.
 #. TRANS: Button label to cancel a SMS address confirmation procedure.
 #. TRANS: Button label in the "Edit application" form.
-#: actions/apioauthauthorize.php:478 actions/emailsettings.php:124
-#: actions/imsettings.php:127 actions/smssettings.php:133
+#: actions/apioauthauthorize.php:478 actions/emailsettings.php:125
+#: actions/imsettings.php:136 actions/smssettings.php:132
 #: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Cancel"
@@ -1040,7 +1089,7 @@ msgstr "Az API-metódus nem található."
 #. TRANS: %s is the requested output format.
 #: actions/apistatusesshow.php:144
 #, fuzzy, php-format
-msgid "Unsupported format: %s"
+msgid "Unsupported format: %s."
 msgstr "Nem támogatott formátum."
 
 #. TRANS: Client error displayed requesting a deleted status.
@@ -1124,13 +1173,6 @@ msgstr "%1$s / %2$s kedvencei"
 msgid "%1$s updates favorited by %2$s / %3$s."
 msgstr ""
 
-#. TRANS: Server error displayed when generating an Atom feed fails.
-#. TRANS: %s is the error.
-#: actions/apitimelinegroup.php:134
-#, fuzzy, php-format
-msgid "Could not generate feed for group - %s"
-msgstr "Nem sikerült a csoport frissítése."
-
 #. TRANS: Title for timeline of most recent mentions of a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname.
 #: actions/apitimelinementions.php:115
@@ -1147,13 +1189,14 @@ msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr ""
 
 #. TRANS: Title for site timeline. %s is the StatusNet sitename.
+#. TRANS: Public RSS feed title. %s is the StatusNet site name.
 #: actions/apitimelinepublic.php:193 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "%s közösségi története"
 
 #. TRANS: Subtitle for site timeline. %s is the StatusNet sitename.
-#: actions/apitimelinepublic.php:199 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:199
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "%s-frissítések mindenki számára!"
@@ -1164,21 +1207,33 @@ msgid "Unimplemented."
 msgstr ""
 
 #. TRANS: Title for Atom feed "repeated to me". %s is the user nickname.
-#: actions/apitimelineretweetedtome.php:108
+#: actions/apitimelineretweetedtome.php:96
 #, php-format
 msgid "Repeated to %s"
 msgstr ""
 
+#: actions/apitimelineretweetedtome.php:98
+#, php-format
+msgid "%1$s notices that were to repeated to %2$s / %3$s."
+msgstr ""
+
 #. TRANS: Title of list of repeated notices of the logged in user.
 #. TRANS: %s is the nickname of the logged in user.
-#: actions/apitimelineretweetsofme.php:112
+#: actions/apitimelineretweetsofme.php:98
 #, php-format
 msgid "Repeats of %s"
 msgstr ""
 
+#: actions/apitimelineretweetsofme.php:104
+#, fuzzy, php-format
+msgid "%1$s notices that %2$s / %3$s has repeated."
+msgstr "%s (@%s) az általad küldött hírt hozzáadta a kedvenceihez"
+
 #. TRANS: Title for timeline with lastest notices with a given tag.
 #. TRANS: %s is the tag.
-#: actions/apitimelinetag.php:101 actions/tag.php:67
+#. TRANS: Title for first page of notices with tags.
+#. TRANS: %s is the tag.
+#: actions/apitimelinetag.php:101 actions/tag.php:69
 #, php-format
 msgid "Notices tagged with %s"
 msgstr "Hírek %s címkével"
@@ -1191,54 +1246,55 @@ msgid "Updates tagged with %1$s on %2$s!"
 msgstr ""
 
 #. TRANS: Client error displayed trying to add a notice to another user's timeline.
-#: actions/apitimelineuser.php:297
+#: actions/apitimelineuser.php:308
 #, fuzzy
 msgid "Only the user can add to their own timeline."
 msgstr "Csak a felhasználó láthatja a saját postaládáját."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:304
+#: actions/apitimelineuser.php:315
 msgid "Only accept AtomPub for Atom feeds."
 msgstr ""
 
 #. TRANS: Client error displayed attempting to post an empty API notice.
-#: actions/apitimelineuser.php:311
+#: actions/apitimelineuser.php:322
 msgid "Atom post must not be empty."
 msgstr ""
 
 #. TRANS: Client error displayed attempting to post an API that is not well-formed XML.
-#: actions/apitimelineuser.php:317
+#: actions/apitimelineuser.php:328
 msgid "Atom post must be well-formed XML."
 msgstr ""
 
 #. TRANS: Client error displayed when not using an Atom entry.
-#: actions/apitimelineuser.php:323 actions/atompubfavoritefeed.php:228
+#: actions/apitimelineuser.php:334 actions/atompubfavoritefeed.php:228
 #: actions/atompubmembershipfeed.php:230
 #: actions/atompubsubscriptionfeed.php:236
 msgid "Atom post must be an Atom entry."
 msgstr ""
 
 #. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
-#: actions/apitimelineuser.php:335
+#: actions/apitimelineuser.php:345
 msgid "Can only handle POST activities."
 msgstr ""
 
 #. TRANS: Client error displayed when using an unsupported activity object type.
 #. TRANS: %s is the unsupported activity object type.
-#: actions/apitimelineuser.php:346
+#: actions/apitimelineuser.php:356
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
 #. TRANS: %d is the notice ID (number).
-#: actions/apitimelineuser.php:380
+#: actions/apitimelineuser.php:390
 #, fuzzy, php-format
 msgid "No content for notice %d."
 msgstr "Keressünk a hírek tartalmában"
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:408
+#. TRANS: %s is the notice URI.
+#: actions/apitimelineuser.php:419
 #, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr ""
@@ -1256,9 +1312,10 @@ msgstr "Az API-metódus nem található."
 
 #. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
 #. TRANS: Client exception.
+#. TRANS: Client error displayed trying to subscribe to a non-existing profile.
 #: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
 #: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
-#: actions/subscribe.php:107
+#: actions/subscribe.php:110
 msgid "No such profile."
 msgstr "Nincs ilyen profil."
 
@@ -1405,7 +1462,7 @@ msgid "Not a member."
 msgstr "Összes tag"
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
-#: actions/atompubshowmembership.php:151
+#: actions/atompubshowmembership.php:150
 #, fuzzy
 msgid "Cannot delete someone else's membership."
 msgstr "Nem sikerült törölni a kedvencet."
@@ -1494,10 +1551,7 @@ msgid "Invalid size."
 msgstr "Érvénytelen méret."
 
 #. TRANS: Title for avatar upload page.
-#. TRANS: Label for group avatar (dt). Text hidden by default.
-#. TRANS: Link description in user account settings menu.
-#: actions/avatarsettings.php:66 actions/showgroup.php:227
-#: lib/accountsettingsaction.php:113
+#: actions/avatarsettings.php:66 lib/settingsnav.php:82
 msgid "Avatar"
 msgstr "Avatar"
 
@@ -1510,9 +1564,11 @@ msgstr "Feltöltheted a személyes avatarodat. A fájl maximális mérete %s leh
 
 #. TRANS: Server error displayed in avatar upload page when no matching profile can be found for a user.
 #. TRANS: Server error displayed coming across a request from a user without a profile.
+#. TRANS: Server error displayed when trying to authorise a remote subscription request
+#. TRANS: while the user has no profile.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
 #: actions/grouplogo.php:184 actions/remotesubscribe.php:190
-#: actions/userauthorization.php:72 actions/userrss.php:108
+#: actions/userauthorization.php:75 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr ""
 
@@ -1570,10 +1626,10 @@ msgstr "Levágás"
 msgid "No file uploaded."
 msgstr "Nincs feltöltve fájl."
 
-#. TRANS: Avatar upload form unstruction after uploading a file.
+#. TRANS: Avatar upload form instruction after uploading a file.
 #: actions/avatarsettings.php:345
 #, fuzzy
-msgid "Pick a square area of the image to be your avatar"
+msgid "Pick a square area of the image to be your avatar."
 msgstr "Válassz ki egy négyzet alakú területet a képből, ami az avatarod lesz"
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
@@ -1599,7 +1655,7 @@ msgstr "Avatar törölve."
 
 #. TRANS: Title for backup account page.
 #. TRANS: Option in profile settings to create a backup of the account of the currently logged in user.
-#: actions/backupaccount.php:61 actions/profilesettings.php:467
+#: actions/backupaccount.php:61 actions/profilesettings.php:468
 msgid "Backup account"
 msgstr ""
 
@@ -1633,7 +1689,7 @@ msgstr "Háttér"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
 #: actions/backupaccount.php:254
-msgid "Backup your account"
+msgid "Backup your account."
 msgstr ""
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
@@ -1672,7 +1728,7 @@ msgstr "Nem"
 #. TRANS: Submit button title for 'No' when blocking a user.
 #: actions/block.php:158
 #, fuzzy
-msgid "Do not block this user"
+msgid "Do not block this user."
 msgstr "Ne blokkoljuk ezt a felhasználót"
 
 #. TRANS: Button label on the user block form.
@@ -1689,9 +1745,9 @@ msgid "Yes"
 msgstr "Igen"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#. TRANS: Description of the form to block a user.
-#: actions/block.php:165 lib/blockform.php:79
-msgid "Block this user"
+#: actions/block.php:165
+#, fuzzy
+msgid "Block this user."
 msgstr "Felhasználó blokkolása"
 
 #. TRANS: Server error displayed when blocking a user fails.
@@ -1758,32 +1814,48 @@ msgstr "A megerősítő kód nem található."
 msgid "That confirmation code is not for you!"
 msgstr "Ez a megerősítő kód nem hozzád tartozik!"
 
-#. TRANS: Server error for a unknow address type %s, which can be 'email', 'jabber', or 'sms'.
-#: actions/confirmaddress.php:92
-#, php-format
-msgid "Unrecognized address type %s."
-msgstr ""
+#. TRANS: Server error for an unknown address type, which can be 'email', 'sms', or the name of an IM network (such as 'xmpp' or 'aim')
+#: actions/confirmaddress.php:94
+#, fuzzy, php-format
+msgid "Unrecognized address type %s"
+msgstr "Nem támogatott üzenet-típus: %s"
 
 #. TRANS: Client error for an already confirmed email/jabber/sms address.
-#: actions/confirmaddress.php:97
+#: actions/confirmaddress.php:103 actions/confirmaddress.php:136
 msgid "That address has already been confirmed."
 msgstr "Ez a cím már meg van erősítve."
 
+#: actions/confirmaddress.php:121 actions/imsettings.php:444
+#: actions/userdesignsettings.php:306
+#, fuzzy
+msgid "Couldn't update user."
+msgstr "Nem sikerült frissíteni a felhasználót."
+
+#: actions/confirmaddress.php:144
+#, fuzzy
+msgid "Couldn't update user im preferences."
+msgstr "Nem sikerült frissíteni a felhasználó rekordját."
+
+#: actions/confirmaddress.php:156
+#, fuzzy
+msgid "Couldn't insert user im preferences."
+msgstr "Nem sikerült a helyszín beállításait elmenteni."
+
 #. TRANS: Server error displayed when an address confirmation code deletion from the
 #. TRANS: database fails in the contact address confirmation action.
-#: actions/confirmaddress.php:132
+#: actions/confirmaddress.php:169
 #, fuzzy
 msgid "Could not delete address confirmation."
 msgstr "Nem sikerült törölni az e-mail cím megerősítését."
 
 #. TRANS: Title for the contact address confirmation action.
-#: actions/confirmaddress.php:150
+#: actions/confirmaddress.php:185
 msgid "Confirm address"
 msgstr "Cím ellenőrzése"
 
 #. TRANS: Success message for the contact address confirmation action.
 #. TRANS: %s can be 'email', 'jabber', or 'sms'.
-#: actions/confirmaddress.php:166
+#: actions/confirmaddress.php:200
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "A(z) „%s” cím meg van erősítve a fiókodhoz."
@@ -1797,6 +1869,7 @@ msgstr "Beszélgetés"
 #. TRANS: Label for user statistics.
 #: actions/conversation.php:149 lib/noticelist.php:87
 #: lib/profileaction.php:246 lib/searchgroupnav.php:82
+#: lib/threadednoticelist.php:66
 msgid "Notices"
 msgstr "Hírek"
 
@@ -1832,7 +1905,7 @@ msgstr "Avatar törölve."
 
 #. TRANS: Page title for page on which a user account can be deleted.
 #. TRANS: Option in profile settings to delete the account of the currently logged in user.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:475
+#: actions/deleteaccount.php:228 actions/profilesettings.php:476
 #, fuzzy
 msgid "Delete account"
 msgstr "Felhasználó törlése"
@@ -1856,7 +1929,7 @@ msgstr ""
 #. TRANS: Field label for delete account confirmation entry.
 #. TRANS: Field label for password reset form where the password has to be typed again.
 #: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:262 actions/register.php:440
+#: actions/recoverpassword.php:262 actions/register.php:419
 msgid "Confirm"
 msgstr "Megerősítés"
 
@@ -1886,14 +1959,14 @@ msgstr ""
 #. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
 #: actions/deleteapplication.php:79 actions/editapplication.php:78
-#: actions/showapplication.php:94
+#: actions/showapplication.php:90
 msgid "You are not the owner of this application."
 msgstr ""
 
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
-#: actions/newapplication.php:112 actions/showapplication.php:118
-#: lib/action.php:1425
+#: actions/newapplication.php:112 actions/showapplication.php:113
+#: lib/action.php:1391
 msgid "There was a problem with your session token."
 msgstr ""
 
@@ -1914,13 +1987,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting an application.
 #: actions/deleteapplication.php:161
 #, fuzzy
-msgid "Do not delete this application"
+msgid "Do not delete this application."
 msgstr "Ne töröljük ezt a hírt"
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
 #: actions/deleteapplication.php:167
 #, fuzzy
-msgid "Delete this application"
+msgid "Delete this application."
 msgstr "Alkalmazás törlése"
 
 #. TRANS: Client error when trying to delete group while not logged in.
@@ -1978,13 +2051,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting a group.
 #: actions/deletegroup.php:224
 #, fuzzy
-msgid "Do not delete this group"
+msgid "Do not delete this group."
 msgstr "Ne töröljük ezt a hírt"
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
 #: actions/deletegroup.php:231
 #, fuzzy
-msgid "Delete this group"
+msgid "Delete this group."
 msgstr "Töröljük ezt a felhasználót"
 
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
@@ -1992,14 +2065,16 @@ msgstr "Töröljük ezt a felhasználót"
 #. TRANS: Client error displayed when trying to mark a notice as favorite without being logged in.
 #. TRANS: Client error displayed trying to block a user from a group while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
+#. TRANS: Client error displayed trying to log out when not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
+#. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
 #. TRANS: Client error displayed when trying to change user options while not logged in.
 #: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
-#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:69
+#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:70
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
-#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
-#: actions/tagother.php:33 actions/unsubscribe.php:52
+#: actions/nudge.php:63 actions/pluginenable.php:97 actions/subedit.php:33
+#: actions/subscribe.php:98 actions/tagother.php:33 actions/unsubscribe.php:52
 #: lib/adminpanelaction.php:71 lib/profileformaction.php:63
 #: lib/settingsaction.php:72
 msgid "Not logged in."
@@ -2026,12 +2101,13 @@ msgstr "Biztosan törölni szeretnéd ezt a hírt?"
 #. TRANS: Submit button title for 'No' when deleting a notice.
 #: actions/deletenotice.php:159
 #, fuzzy
-msgid "Do not delete this notice"
+msgid "Do not delete this notice."
 msgstr "Ne töröljük ezt a hírt"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:166 lib/noticelist.php:673
-msgid "Delete this notice"
+#: actions/deletenotice.php:166
+#, fuzzy
+msgid "Delete this notice."
 msgstr "Töröljük ezt a hírt"
 
 #. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
@@ -2068,18 +2144,17 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting a user.
 #: actions/deleteuser.php:158
 #, fuzzy
-msgid "Do not delete this user"
+msgid "Do not delete this user."
 msgstr "Ne töröljük ezt a hírt"
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
-#. TRANS: Description of form for deleting a user.
-#: actions/deleteuser.php:165 lib/deleteuserform.php:75
-msgid "Delete this user"
+#: actions/deleteuser.php:165
+#, fuzzy
+msgid "Delete this user."
 msgstr "Töröljük ezt a felhasználót"
 
 #. TRANS: Message used as title for design settings for the site.
-#. TRANS: Link description in user account settings menu.
-#: actions/designadminpanel.php:60 lib/accountsettingsaction.php:134
+#: actions/designadminpanel.php:60 lib/settingsnav.php:97
 msgid "Design"
 msgstr "Megjelenés"
 
@@ -2148,8 +2223,7 @@ msgid "You can upload a custom StatusNet theme as a .ZIP archive."
 msgstr ""
 
 #. TRANS: Fieldset legend for theme background image.
-#. TRANS: Fieldset legend on profile design page.
-#: actions/designadminpanel.php:515 lib/designsettings.php:98
+#: actions/designadminpanel.php:515
 msgid "Change background image"
 msgstr "Háttérkép megváltoztatása"
 
@@ -2157,7 +2231,7 @@ msgstr "Háttérkép megváltoztatása"
 #. TRANS: Field label for background color selector.
 #. TRANS: Label on profile design page for setting a profile page background colour.
 #: actions/designadminpanel.php:525 actions/designadminpanel.php:609
-#: lib/designsettings.php:183
+#: lib/designform.php:238
 msgid "Background"
 msgstr "Háttér"
 
@@ -2182,13 +2256,13 @@ msgstr "Ki"
 #. TRANS: Form guide for turning background image on or off on theme designer page.
 #. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
 #. TRANS: use of the uploaded profile image.
-#: actions/designadminpanel.php:577 lib/designsettings.php:159
+#: actions/designadminpanel.php:577 lib/designform.php:214
 msgid "Turn background image on or off."
 msgstr "Háttérkép be- vagy kikapcsolása."
 
 #. TRANS: Checkbox label to title background image on theme designer page.
 #. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-#: actions/designadminpanel.php:583 lib/designsettings.php:165
+#: actions/designadminpanel.php:583 lib/designform.php:220
 msgid "Tile background image"
 msgstr "Háttérkép csempézése"
 
@@ -2200,25 +2274,25 @@ msgstr "Színek megváltoztatása"
 
 #. TRANS: Field label for content color selector.
 #. TRANS: Label on profile design page for setting a profile page content colour.
-#: actions/designadminpanel.php:623 lib/designsettings.php:197
+#: actions/designadminpanel.php:623 lib/designform.php:252
 msgid "Content"
 msgstr "Tartalom"
 
 #. TRANS: Field label for sidebar color selector.
 #. TRANS: Label on profile design page for setting a profile page sidebar colour.
-#: actions/designadminpanel.php:637 lib/designsettings.php:211
+#: actions/designadminpanel.php:637 lib/designform.php:266
 msgid "Sidebar"
 msgstr "Oldalsáv"
 
 #. TRANS: Field label for text color selector.
 #. TRANS: Label on profile design page for setting a profile page text colour.
-#: actions/designadminpanel.php:651 lib/designsettings.php:225
+#: actions/designadminpanel.php:651 lib/designform.php:280
 msgid "Text"
 msgstr "Szöveg"
 
 #. TRANS: Field label for link color selector.
 #. TRANS: Label on profile design page for setting a profile page links colour.
-#: actions/designadminpanel.php:665 lib/designsettings.php:239
+#: actions/designadminpanel.php:665 lib/designform.php:294
 msgid "Links"
 msgstr "Hivatkozások"
 
@@ -2240,21 +2314,21 @@ msgid "Use defaults"
 msgstr "Alapértelmezések használata"
 
 #. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: actions/designadminpanel.php:720 lib/designsettings.php:259
-msgid "Restore default designs"
-msgstr ""
+#: actions/designadminpanel.php:720
+#, fuzzy
+msgid "Restore default designs."
+msgstr "Alapértelmezések használata"
 
 #. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: actions/designadminpanel.php:728 lib/designsettings.php:267
-msgid "Reset back to default"
+#: actions/designadminpanel.php:728
+#, fuzzy
+msgid "Reset back to default."
 msgstr "Visszaállítás az alapértelmezettre"
 
 #. TRANS: Title for button for saving theme settings.
-#. TRANS: Title for button on profile design page to save settings.
-#: actions/designadminpanel.php:736 lib/designsettings.php:272
-msgid "Save design"
+#: actions/designadminpanel.php:736
+#, fuzzy
+msgid "Save design."
 msgstr "Design mentése"
 
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
@@ -2286,7 +2360,7 @@ msgid "You must be logged in to edit an application."
 msgstr ""
 
 #. TRANS: Client error displayed trying to edit an application that does not exist.
-#: actions/editapplication.php:83 actions/showapplication.php:87
+#: actions/editapplication.php:83 actions/showapplication.php:83
 msgid "No such application."
 msgstr "Nincs ilyen alkalmazás."
 
@@ -2379,80 +2453,53 @@ msgstr "%s csoport szerkesztése"
 msgid "You must be logged in to create a group."
 msgstr "Csoport létrehozásához be kell jelentkezned."
 
-#. TRANS: Client error displayed trying to edit a group while not being a group admin.
-#. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
-#. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
-#: actions/editgroup.php:110 actions/editgroup.php:176
-#: actions/groupdesignsettings.php:109 actions/grouplogo.php:111
-msgid "You must be an admin to edit the group."
-msgstr ""
-
 #. TRANS: Form instructions for group edit form.
 #: actions/editgroup.php:161
 msgid "Use this form to edit the group."
 msgstr "Ezen űrlap segítségével szerkesztheted a csoportot."
 
-#. TRANS: Group edit form validation error.
-#. TRANS: Group create form validation error.
-#. TRANS: %s is the invalid alias.
-#: actions/editgroup.php:241 actions/newgroup.php:188
-#, php-format
-msgid "Invalid alias: \"%s\""
-msgstr "Érvénytelen álnév: „%s”"
-
-#. TRANS: Server error displayed when editing a group fails.
-#: actions/editgroup.php:274
-msgid "Could not update group."
-msgstr "Nem sikerült a csoport frissítése."
-
-#. TRANS: Server error displayed when group aliases could not be added.
-#. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/editgroup.php:281 classes/User_group.php:540
-msgid "Could not create aliases."
-msgstr "Nem sikerült létrehozni az álneveket."
-
 #. TRANS: Group edit form success message.
 #: actions/editgroup.php:301
 msgid "Options saved."
 msgstr "Beállítások elmentve."
 
 #. TRANS: Title for e-mail settings.
-#: actions/emailsettings.php:59
+#: actions/emailsettings.php:60
 msgid "Email settings"
 msgstr "Email beállítások"
 
 #. TRANS: E-mail settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/emailsettings.php:73
+#: actions/emailsettings.php:74
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 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.
-#: actions/emailsettings.php:103 actions/emailsettings.php:129
+#: actions/emailsettings.php:104 actions/emailsettings.php:130
 msgid "Email address"
 msgstr "Email-cím"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:109
+#: actions/emailsettings.php:110
 msgid "Current confirmed email address."
 msgstr "A jelenleg megerősített e-mail cím."
 
 #. TRANS: Button label to remove a confirmed e-mail address.
 #. TRANS: Button label for removing a set sender e-mail address to post notices from.
-#. TRANS: Button label to remove a confirmed Instant Messaging address.
+#. TRANS: Button label to remove a confirmed IM address.
 #. TRANS: Button label to remove a confirmed SMS address.
 #. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
-#: actions/emailsettings.php:112 actions/emailsettings.php:179
-#: actions/imsettings.php:112 actions/smssettings.php:120
-#: actions/smssettings.php:176
+#: actions/emailsettings.php:113 actions/emailsettings.php:180
+#: actions/imsettings.php:119 actions/smssettings.php:119
+#: actions/smssettings.php:175
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Eltávolítás"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:119
+#: actions/emailsettings.php:120
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -2466,44 +2513,44 @@ msgstr ""
 #. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
 #. TRANS: Any other domain may be owned by a legitimate person or
 #. TRANS: organization.
-#: actions/emailsettings.php:136
+#: actions/emailsettings.php:137
 msgid "Email address, like \"UserName@example.org\""
 msgstr "E-mail cím, például „FelhasználóNév@example.org”"
 
 #. TRANS: Button label for adding an e-mail address in e-mail settings form.
-#. TRANS: Button label for adding an Instant Messaging address in Instant Messaging settings form.
+#. TRANS: Button label for adding an IM address in IM settings form.
 #. TRANS: Button label for adding a SMS phone number in SMS settings form.
-#: actions/emailsettings.php:140 actions/imsettings.php:147
-#: actions/smssettings.php:158
+#: actions/emailsettings.php:141 actions/imsettings.php:147
+#: actions/smssettings.php:157
 msgctxt "BUTTON"
 msgid "Add"
 msgstr "Hozzáadás"
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:148 actions/smssettings.php:167
+#: actions/emailsettings.php:149 actions/smssettings.php:166
 msgid "Incoming email"
 msgstr "Bejövő email"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:154
+#: actions/emailsettings.php:155
 msgid "I want to post notices by email."
 msgstr "Szeretnék email segítségével közzétenni."
 
 #. TRANS: Form instructions for incoming e-mail form in e-mail settings.
 #. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
-#: actions/emailsettings.php:176 actions/smssettings.php:174
+#: actions/emailsettings.php:177 actions/smssettings.php:173
 msgid "Send email to this address to post new notices."
 msgstr "Erre a címre küldj emailt új hír közzétételéhez."
 
 #. TRANS: Instructions for incoming e-mail address input form, when an address has already been assigned.
 #. TRANS: Instructions for incoming SMS e-mail address input form.
-#: actions/emailsettings.php:185 actions/smssettings.php:182
+#: actions/emailsettings.php:186 actions/smssettings.php:181
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr ""
 
 #. TRANS: Instructions for incoming e-mail address input form.
-#: actions/emailsettings.php:189
+#: actions/emailsettings.php:190
 msgid ""
 "To send notices via email, we need to create a unique email address for you "
 "on this server:"
@@ -2511,91 +2558,91 @@ msgstr ""
 
 #. TRANS: Button label for adding an e-mail address to send notices from.
 #. TRANS: Button label for adding an SMS e-mail address to send notices from.
-#: actions/emailsettings.php:195 actions/smssettings.php:185
+#: actions/emailsettings.php:196 actions/smssettings.php:184
 msgctxt "BUTTON"
 msgid "New"
 msgstr "Új"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:204
+#: actions/emailsettings.php:205
 msgid "Email preferences"
 msgstr "E-mail beállítások"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:212
+#: actions/emailsettings.php:213
 msgid "Send me notices of new subscriptions through email."
 msgstr "Kapjak email-t, ha valaki feliratkozott a híreimre."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:218
+#: actions/emailsettings.php:219
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr ""
 "Kapjak emailt róla, ha valaki kedvenceként jelöl meg egy általam küldött "
 "hírt."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:225
+#: actions/emailsettings.php:226
 msgid "Send me email when someone sends me a private message."
 msgstr "Kapjak emailt róla, ha valaki privát üzenetet küld nekem."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:231
+#: actions/emailsettings.php:232
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr "Kapjak emailt róla, ha valaki \"@-választ\" küld nekem."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:237
+#: actions/emailsettings.php:238
 msgid "Allow friends to nudge me and send me an email."
 msgstr "Megengedem a barátaimnak, hogy megbökjenek és emailt küldjenek nekem."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:243
+#: actions/emailsettings.php:244
 msgid "Publish a MicroID for my email address."
 msgstr "MicroID közzététele az e-mail címemhez."
 
 #. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:361
+#: actions/emailsettings.php:362
 msgid "Email preferences saved."
 msgstr "E-mail beállítások elmentve."
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:380
+#: actions/emailsettings.php:381
 msgid "No email address."
 msgstr "Nincs e-mail cím."
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:388
+#: actions/emailsettings.php:389
 #, fuzzy
 msgid "Cannot normalize that email address."
 msgstr "Nem sikerült normalizálni az e-mail címet"
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:393 actions/register.php:212
+#: actions/emailsettings.php:394 actions/register.php:197
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "Érvénytelen email cím."
 
 #. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:397
+#: actions/emailsettings.php:398
 msgid "That is already your email address."
 msgstr "Jelenleg is ez az e-mail címed."
 
 #. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:401
+#: actions/emailsettings.php:402
 msgid "That email address already belongs to another user."
 msgstr "Ez az e-mail cím egy másik felhasználóhoz tartozik."
 
 #. TRANS: Server error thrown on database error adding e-mail confirmation code.
 #. TRANS: Server error thrown on database error adding Instant Messaging confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:418 actions/imsettings.php:343
-#: actions/smssettings.php:365
+#: actions/emailsettings.php:419 actions/imsettings.php:362
+#: actions/smssettings.php:364
 #, fuzzy
 msgid "Could not insert confirmation code."
 msgstr "Nem sikerült beilleszteni a megerősítő kódot."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:425
+#: actions/emailsettings.php:426
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
@@ -2607,59 +2654,62 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling Instant Messaging address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:445 actions/imsettings.php:377
-#: actions/smssettings.php:399
+#: actions/emailsettings.php:446 actions/imsettings.php:391
+#: actions/smssettings.php:398
 msgid "No pending confirmation to cancel."
 msgstr "Nincs várakozó megerősítés, amit vissza lehetne vonni."
 
 #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:450
+#: actions/emailsettings.php:451
 msgid "That is the wrong email address."
 msgstr ""
 
 #. TRANS: Server error thrown on database error canceling e-mail address confirmation.
 #. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
-#: actions/emailsettings.php:459 actions/smssettings.php:413
+#: actions/emailsettings.php:460 actions/smssettings.php:412
 #, fuzzy
 msgid "Could not delete email confirmation."
 msgstr "Nem sikerült törölni az e-mail cím megerősítését."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:464
+#: actions/emailsettings.php:465
 msgid "Email confirmation cancelled."
 msgstr ""
 
 #. TRANS: Message given trying to remove an e-mail address that is not
 #. TRANS: registered for the active user.
-#: actions/emailsettings.php:483
+#: actions/emailsettings.php:484
 msgid "That is not your email address."
 msgstr "Ez nem a te e-mail címed."
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:504
+#: actions/emailsettings.php:505
 msgid "The email address was removed."
 msgstr ""
 
 #. TRANS: Form validation error displayed when trying to remove an incoming e-mail address while no address has been set.
-#: actions/emailsettings.php:518 actions/smssettings.php:555
+#: actions/emailsettings.php:519 actions/smssettings.php:554
 msgid "No incoming email address."
 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.
-#: actions/emailsettings.php:530 actions/emailsettings.php:554
-#: actions/smssettings.php:565 actions/smssettings.php:588
+#. TRANS: Server error displayed when the user could not be updated in SMS settings.
+#: actions/emailsettings.php:531 actions/emailsettings.php:555
+#: actions/smssettings.php:565 actions/smssettings.php:590
 #, fuzzy
 msgid "Could not update user record."
 msgstr "Nem sikerült frissíteni a felhasználó rekordját."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:534 actions/smssettings.php:568
+#. TRANS: Confirmation text after updating SMS settings.
+#: actions/emailsettings.php:535 actions/smssettings.php:569
 msgid "Incoming email address removed."
 msgstr "A bejövő email címet eltávolítottuk."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:558 actions/smssettings.php:591
+#. TRANS: Confirmation text after updating SMS settings.
+#: actions/emailsettings.php:559 actions/smssettings.php:594
 msgid "New incoming email address added."
 msgstr "Új bejövő e-mail cím hozzáadva."
 
@@ -2671,7 +2721,7 @@ msgstr "Ez a hír már a kedvenceid között van!"
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
 #: actions/favor.php:95
 #, fuzzy
-msgid "Disfavor favorite"
+msgid "Disfavor favorite."
 msgstr "Kedvenc eltávolítása"
 
 #. TRANS: Page title for first page of favorited notices.
@@ -2720,9 +2770,8 @@ msgstr ""
 #. TRANS: %s is a user's nickname.
 #. TRANS: Title for first page of favourite notices of a user.
 #. TRANS: %s is the user for whom the favourite notices are displayed.
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing own favourited notices.
 #: actions/favoritesrss.php:111 actions/showfavorites.php:76
-#: lib/personalgroupnav.php:122
+#: lib/personalgroupnav.php:110
 #, php-format
 msgid "%s's favorite notices"
 msgstr "%s kedvenc hírei"
@@ -2909,13 +2958,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
 #: actions/groupblock.php:191
 #, fuzzy
-msgid "Do not block this user from this group"
+msgid "Do not block this user from this group."
 msgstr "Ne blokkoljuk ezt a felhasználót ebből a csoportból"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
 #: actions/groupblock.php:198
 #, fuzzy
-msgid "Block this user from this group"
+msgid "Block this user from this group."
 msgstr "Felhasználó blokkolása a csoportból"
 
 #. TRANS: Server error displayed when trying to block a user from a group fails because of an application error.
@@ -2925,6 +2974,7 @@ msgstr ""
 "Adatbázishiba történt a felhasználó csoportból történő blokkolása során."
 
 #. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
+#. TRANS: Client error displayed trying to find a user by ID without providing an ID.
 #: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr "Nincs ID."
@@ -2953,7 +3003,7 @@ msgid "Unable to update your design settings."
 msgstr "Nem sikerült elmenteni a megjelenítési beállításaid."
 
 #. TRANS: Form text to confirm saved group design settings.
-#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:222
+#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:239
 msgid "Design preferences saved."
 msgstr "Design beállítások elmentve."
 
@@ -3016,7 +3066,7 @@ msgid "A list of the users in this group."
 msgstr "A csoportban lévő felhasználók listája."
 
 #. TRANS: Indicator in group members list that this user is a group administrator.
-#: actions/groupmembers.php:190
+#: actions/groupmembers.php:190 lib/action.php:581
 msgid "Admin"
 msgstr "Adminisztrátor"
 
@@ -3105,8 +3155,10 @@ msgid "Group search"
 msgstr "Csoport-keresés"
 
 #. TRANS: Text on page where groups can be searched if no results were found for a query.
-#: actions/groupsearch.php:82 actions/noticesearch.php:117
-#: actions/peoplesearch.php:83
+#. TRANS: Text for notice search results is the query had no results.
+#. TRANS: Message on the "People search" page where a query has no results.
+#: actions/groupsearch.php:82 actions/noticesearch.php:122
+#: actions/peoplesearch.php:87
 msgid "No results."
 msgstr "Nincs találat."
 
@@ -3141,157 +3193,163 @@ msgid "User is not blocked from group."
 msgstr "A felhasználó nincs blokkolva a csoportból."
 
 #. TRANS: Server error displayed when unblocking a user from a group fails because of an unknown error.
+#. TRANS: Server error displayed when removing a user block.
 #: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "Hiba a blokkolás feloldása közben."
 
 #. TRANS: Title for Instant Messaging settings.
-#: actions/imsettings.php:58
+#: actions/imsettings.php:56
 msgid "IM settings"
 msgstr "IM beállítások"
 
 #. 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.
-#: actions/imsettings.php:71
+#: actions/imsettings.php:69
 #, php-format
 msgid ""
-"You can send and receive notices through Jabber/Google Talk [instant "
-"messages](%%doc.im%%). Configure your address and settings below."
+"You can send and receive notices through instant messaging [instant messages]"
+"(%%doc.im%%). Configure your addresses and settings below."
 msgstr ""
 
-#. TRANS: Message given in the Instant Messaging settings if XMPP is not enabled on the site.
+#. TRANS: Message given in the IM settings if IM is not enabled on the site.
 #: actions/imsettings.php:90
 msgid "IM is not available."
 msgstr "IM nem elérhető."
 
-#. TRANS: Form legend for Instant Messaging settings form.
-#. TRANS: Field label for Instant Messaging address input in Instant Messaging settings form.
-#: actions/imsettings.php:102 actions/imsettings.php:132
-msgid "IM address"
-msgstr "IM-cím"
-
-#: actions/imsettings.php:109
-#, fuzzy
-msgid "Current confirmed Jabber/Google Talk address."
+#: actions/imsettings.php:116
+#, fuzzy, php-format
+msgid "Current confirmed %s address."
 msgstr "A jelenleg megerősített e-mail cím."
 
-#. TRANS: Form note in Instant Messaging settings form.
-#. TRANS: %s is the Instant Messaging address set for the site.
-#: actions/imsettings.php:120
+#. TRANS: Form note in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:128
 #, fuzzy, php-format
 msgid ""
-"Awaiting confirmation on this address. Check your Jabber/Google Talk account "
-"for a message with further instructions. (Did you add %s to your buddy list?)"
+"Awaiting confirmation on this address. Check your %s account for a message "
+"with further instructions. (Did you add %s to your buddy list?)"
 msgstr ""
 "Megerősítés várása a címről. Ellenőrizd a beérkező leveleidet (és a "
 "spameket!), hogy megkaptad-e az üzenetet, ami a további teendőket "
 "tartalmazza."
 
-#. TRANS: IM address input field instructions in Instant Messaging settings form.
-#. TRANS: %s is the Instant Messaging address set for the site.
-#. TRANS: Do not translate "example.org". It is one of the domain names reserved for use in examples by
-#. TRANS: http://www.rfc-editor.org/rfc/rfc2606.txt. Any other domain may be owned by a legitimate
-#. TRANS: person or organization.
-#: actions/imsettings.php:139
+#: actions/imsettings.php:140
+msgid "IM address"
+msgstr "IM-cím"
+
+#: actions/imsettings.php:142
 #, php-format
-msgid ""
-"Jabber or Google Talk address, like \"UserName@example.org\". First, make "
-"sure to add %s to your buddy list in your IM client or on Google Talk."
+msgid "%s screenname."
 msgstr ""
 
-#. TRANS: Form legend for Instant Messaging preferences form.
-#: actions/imsettings.php:154
-msgid "IM preferences"
+#. TRANS: Header for IM preferences form.
+#: actions/imsettings.php:163
+#, fuzzy
+msgid "IM Preferences"
 msgstr "Azonnali üzenetküldő beállításai"
 
-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:159
-msgid "Send me notices through Jabber/Google Talk."
-msgstr ""
-
-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:165
-msgid "Post a notice when my Jabber/Google Talk status changes."
-msgstr ""
-
-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:171
-msgid ""
-"Send me replies through Jabber/Google Talk from people I'm not subscribed to."
-msgstr ""
-
-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:178
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:174
 #, fuzzy
-msgid "Publish a MicroID for my Jabber/Google Talk address."
+msgid "Send me notices"
+msgstr "Küldjünk egy hírt"
+
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:176
+msgid "Post a notice when my status changes."
+msgstr ""
+
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:178
+msgid "Send me replies from people I'm not subscribed to."
+msgstr ""
+
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:181
+#, fuzzy
+msgid "Publish a MicroID"
 msgstr "MicroID közzététele az e-mail címemhez."
 
-#. TRANS: Confirmation message for successful Instant Messaging preferences save.
-#: actions/imsettings.php:283 actions/othersettings.php:192
+#. TRANS: Server error thrown on database error updating IM preferences.
+#: actions/imsettings.php:291
+#, fuzzy
+msgid "Couldn't update IM preferences."
+msgstr "Nem sikerült frissíteni a felhasználót."
+
+#. TRANS: Confirmation message for successful IM preferences save.
+#. TRANS: Confirmation message after saving preferences.
+#: actions/imsettings.php:298 actions/urlsettings.php:244
 msgid "Preferences saved."
 msgstr "Beállítások elmentve."
 
-#. TRANS: Message given saving Instant Messaging address without having provided one.
-#: actions/imsettings.php:304
-msgid "No Jabber ID."
-msgstr "Nincs Jabber-azonosító."
-
-#. TRANS: Message given saving Instant Messaging address that cannot be normalised.
-#: actions/imsettings.php:312
+#. TRANS: Message given saving IM address without having provided one.
+#: actions/imsettings.php:320
 #, fuzzy
-msgid "Cannot normalize that Jabber ID."
+msgid "No screenname."
+msgstr "Nincs becenév."
+
+#: actions/imsettings.php:325
+#, fuzzy
+msgid "No transport."
+msgstr "Nincs hír."
+
+#. TRANS: Message given saving IM address that cannot be normalised.
+#: actions/imsettings.php:333
+#, fuzzy
+msgid "Cannot normalize that screenname"
 msgstr "Nem lehet normalizálni a Jabber azonosítót"
 
-#. TRANS: Message given saving Instant Messaging address that not valid.
-#: actions/imsettings.php:317
+#. TRANS: Message given saving IM address that not valid.
+#: actions/imsettings.php:340
 #, fuzzy
-msgid "Not a valid Jabber ID."
-msgstr "Érvénytelen Jabber-azonosító"
+msgid "Not a valid screenname"
+msgstr "Nem érvényes becenév."
 
-#. TRANS: Message given saving Instant Messaging address that is already set.
-#: actions/imsettings.php:321
-msgid "That is already your Jabber ID."
-msgstr "Jelenleg is ez a Jabber-azonosítód."
-
-#. TRANS: Message given saving Instant Messaging address that is already set for another user.
-#: actions/imsettings.php:325
-msgid "Jabber ID already belongs to another user."
+#. TRANS: Message given saving IM address that is already set for another user.
+#: actions/imsettings.php:344
+#, fuzzy
+msgid "Screenname already belongs to another user."
 msgstr "Ez a Jabber-azonosító már egy másik felhasználóhoz tartozik."
 
-#. TRANS: Message given saving valid Instant Messaging address that is to be confirmed.
-#. TRANS: %s is the Instant Messaging address set for the site.
-#: actions/imsettings.php:353
-#, php-format
-msgid ""
-"A confirmation code was sent to the IM address you added. You must approve %"
-"s for sending messages to you."
-msgstr ""
+#. TRANS: Message given saving valid IM address that is to be confirmed.
+#: actions/imsettings.php:369
+#, fuzzy
+msgid "A confirmation code was sent to the IM address you added."
+msgstr "Ez a megerősítő kód nem hozzád tartozik!"
 
-#. TRANS: Message given canceling Instant Messaging address confirmation for the wrong IM address.
-#: actions/imsettings.php:382
+#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#: actions/imsettings.php:396
 msgid "That is the wrong IM address."
 msgstr "Ez a hibás IM-cím."
 
-#. TRANS: Server error thrown on database error canceling Instant Messaging address confirmation.
-#: actions/imsettings.php:391
+#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#: actions/imsettings.php:405
 #, fuzzy
-msgid "Could not delete IM confirmation."
+msgid "Couldn't delete confirmation."
 msgstr "Nem sikerült törölni az e-mail cím megerősítését."
 
-#. TRANS: Message given after successfully canceling Instant Messaging address confirmation.
-#: actions/imsettings.php:396
+#. TRANS: Message given after successfully canceling IM address confirmation.
+#: actions/imsettings.php:410
 msgid "IM confirmation cancelled."
 msgstr ""
 
-#. TRANS: Message given trying to remove an Instant Messaging address that is not
+#. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.
-#: actions/imsettings.php:417
-msgid "That is not your Jabber ID."
+#: actions/imsettings.php:434
+#, fuzzy
+msgid "That is not your screenname."
 msgstr "Ez nem a te Jabber-azonosítód."
 
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#: actions/imsettings.php:443
+#, fuzzy
+msgid "Couldn't update user im prefs."
+msgstr "Nem sikerült frissíteni a felhasználó rekordját."
+
 #. TRANS: Message given after successfully removing a registered Instant Messaging address.
-#: actions/imsettings.php:440
+#: actions/imsettings.php:451
 msgid "The IM address was removed."
 msgstr ""
 
@@ -3479,7 +3537,7 @@ msgid "You must be logged in to join a group."
 msgstr "Be kell jelentkezned, ha csatlakozni szeretnél a csoporthoz."
 
 #. TRANS: Title for join group page after joining.
-#: actions/joingroup.php:147
+#: actions/joingroup.php:148
 #, fuzzy, php-format
 msgctxt "TITLE"
 msgid "%1$s joined group %2$s"
@@ -3607,7 +3665,7 @@ msgstr ""
 #. TRANS: Submit button title.
 #: actions/licenseadminpanel.php:311 actions/sessionsadminpanel.php:199
 #: actions/siteadminpanel.php:292 actions/snapshotadminpanel.php:245
-#: actions/tagother.php:154 lib/applicationeditform.php:357
+#: actions/tagother.php:133 lib/applicationeditform.php:357
 msgid "Save"
 msgstr "Mentés"
 
@@ -3615,51 +3673,53 @@ msgstr "Mentés"
 msgid "Save license settings"
 msgstr ""
 
-#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
+#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
+#: actions/login.php:97 actions/otp.php:62 actions/register.php:130
 msgid "Already logged in."
 msgstr "Már be vagy jelentkezve."
 
-#: actions/login.php:148
+#: actions/login.php:125
 msgid "Incorrect username or password."
 msgstr "Rossz felhasználónév vagy jelszó."
 
-#: actions/login.php:154 actions/otp.php:120
+#. TRANS: Server error displayed when a user object could not be created trying to login using "one time password login".
+#: actions/login.php:131 actions/otp.php:127
 msgid "Error setting user. You are probably not authorized."
 msgstr ""
 
-#: actions/login.php:210 actions/login.php:263
+#: actions/login.php:185 actions/login.php:236 lib/action.php:598
 msgid "Login"
 msgstr "Bejelentkezés"
 
-#: actions/login.php:249
+#: actions/login.php:222
 msgid "Login to site"
 msgstr "Bejelentkezés az oldalra"
 
-#: actions/login.php:258 actions/register.php:490
+#: actions/login.php:231 actions/register.php:469
 msgid "Remember me"
 msgstr "Emlékezz rám"
 
-#: actions/login.php:259 actions/register.php:492
+#: actions/login.php:232 actions/register.php:471
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 "A jövőben legyen automatikus a bejelentkezés; csak ha egyedül használod a "
 "számítógépet!"
 
-#: actions/login.php:269
+#: actions/login.php:241
 msgid "Lost or forgotten password?"
 msgstr "Elvesztetted vagy elfelejtetted a jelszavad?"
 
-#: actions/login.php:288
+#: actions/login.php:259
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
 msgstr ""
 
-#: actions/login.php:292
+#: actions/login.php:263
 msgid "Login with your username and password."
 msgstr ""
 
-#: actions/login.php:295
+#: actions/login.php:266
 #, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -3785,44 +3845,56 @@ msgstr "Új hír"
 msgid "Notice posted"
 msgstr "Hír elküldve"
 
-#: actions/noticesearch.php:68
+#. TRANS: Instructions for Notice search page.
+#. TRANS: %%site.name%% is the name of the StatusNet site.
+#: actions/noticesearch.php:69
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
 "by spaces; they must be 3 characters or more."
 msgstr ""
 
-#: actions/noticesearch.php:78
+#. TRANS: Title of the page where users can search for notices.
+#: actions/noticesearch.php:80
 msgid "Text search"
 msgstr "Szöveg keresése"
 
-#: actions/noticesearch.php:91
+#. TRANS: Test in RSS notice search.
+#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
+#: actions/noticesearch.php:95
 #, php-format
 msgid "Search results for \"%1$s\" on %2$s"
 msgstr ""
 
-#: actions/noticesearch.php:121
+#. TRANS: Text for logged in users making a query for notices without results.
+#. TRANS: This message contains a Markdown link.
+#: actions/noticesearch.php:128
 #, php-format
 msgid ""
 "Be the first to [post on this topic](%%%%action.newnotice%%%%?"
 "status_textarea=%s)!"
 msgstr ""
 
-#: actions/noticesearch.php:124
+#. TRANS: Text for not logged in users making a query for notices without results.
+#. TRANS: This message contains Markdown links.
+#: actions/noticesearch.php:133
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and be the first to "
 "[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
 msgstr ""
 
-#: actions/noticesearchrss.php:96
+#. TRANS: RSS notice search feed title. %s is the query.
+#: actions/noticesearchrss.php:95
 #, php-format
 msgid "Updates with \"%s\""
 msgstr ""
 
-#: actions/noticesearchrss.php:98
+#. TRANS: RSS notice search feed description.
+#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
+#: actions/noticesearchrss.php:99
 #, php-format
-msgid "Updates matching search term \"%1$s\" on %2$s!"
+msgid "Updates matching search term \"%1$s\" on %2$s."
 msgstr ""
 
 #: actions/nudge.php:85
@@ -3840,51 +3912,51 @@ msgid "Nudge sent!"
 msgstr "Megböktük!"
 
 #. TRANS: Message displayed to an anonymous user trying to view OAuth application list.
-#: actions/oauthappssettings.php:60
+#: actions/oauthappssettings.php:57
 msgid "You must be logged in to list your applications."
 msgstr ""
 
 #. TRANS: Page title for OAuth applications
-#: actions/oauthappssettings.php:76
+#: actions/oauthappssettings.php:73
 msgid "OAuth applications"
 msgstr ""
 
 #. TRANS: Page instructions for OAuth applications
-#: actions/oauthappssettings.php:88
+#: actions/oauthappssettings.php:85
 msgid "Applications you have registered"
 msgstr ""
 
 #. TRANS: Empty list message on page with OAuth applications.
-#: actions/oauthappssettings.php:141
+#: actions/oauthappssettings.php:138
 #, php-format
 msgid "You have not registered any applications yet."
 msgstr ""
 
 #. TRANS: Title for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:71
+#: actions/oauthconnectionssettings.php:69
 msgid "Connected applications"
 msgstr ""
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:83
+#: actions/oauthconnectionssettings.php:80
 msgid "The following connections exist for your account."
 msgstr ""
 
 #. TRANS: Client error when trying to revoke access for an application while not being a user of it.
-#: actions/oauthconnectionssettings.php:168
+#: actions/oauthconnectionssettings.php:165
 msgid "You are not a user of that application."
 msgstr ""
 
 #. TRANS: Client error when revoking access has failed for some reason.
 #. TRANS: %s is the application ID revoking access failed for.
-#: actions/oauthconnectionssettings.php:183
+#: actions/oauthconnectionssettings.php:180
 #, php-format
 msgid "Unable to revoke access for application: %s."
 msgstr ""
 
 #. TRANS: Success message after revoking access for an application.
 #. TRANS: %1$s is the application name, %2$s is the first part of the user token.
-#: actions/oauthconnectionssettings.php:202
+#: actions/oauthconnectionssettings.php:199
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -3892,20 +3964,30 @@ msgid ""
 msgstr ""
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:213
+#: actions/oauthconnectionssettings.php:210
 msgid "You have not authorized any applications to use your account."
 msgstr ""
 
 #. TRANS: Note for developers in the OAuth connection settings form.
 #. TRANS: This message contains a Markdown link. Do not separate "](".
 #. TRANS: %s is the URL to the OAuth settings.
-#: actions/oauthconnectionssettings.php:233
+#: actions/oauthconnectionssettings.php:230
 #, php-format
 msgid ""
 "Are you a developer? [Register an OAuth client application](%s) to use with "
 "this instance of StatusNet."
 msgstr ""
 
+#: actions/oembed.php:64
+#, fuzzy, php-format
+msgid "\"%s\" not found."
+msgstr "Az API-metódus nem található."
+
+#: actions/oembed.php:76
+#, fuzzy, php-format
+msgid "Notice %s not found."
+msgstr "Az API-metódus nem található."
+
 #: actions/oembed.php:80 actions/shownotice.php:100
 msgid "Notice has no profile."
 msgstr ""
@@ -3915,6 +3997,16 @@ msgstr ""
 msgid "%1$s's status on %2$s"
 msgstr ""
 
+#: actions/oembed.php:95
+#, fuzzy, php-format
+msgid "Attachment %s not found."
+msgstr "A címzett felhasználó nem található."
+
+#: actions/oembed.php:136
+#, php-format
+msgid "\"%s\" not supported for oembed requests."
+msgstr ""
+
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
 #: actions/oembed.php:168
 #, php-format
@@ -3928,94 +4020,60 @@ msgid "Only %s URLs over plain HTTP please."
 msgstr ""
 
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1205
-#: lib/apiaction.php:1232 lib/apiaction.php:1367
+#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1207
+#: lib/apiaction.php:1234 lib/apiaction.php:1369
 msgid "Not a supported data format."
 msgstr "Nem támogatott adatformátum."
 
+#. TRANS: ShortName in the OpenSearch interface when trying to find users.
 #: actions/opensearch.php:64
 msgid "People Search"
 msgstr "Emberek keresése"
 
-#: actions/opensearch.php:67
+#: actions/opensearch.php:68
 msgid "Notice Search"
 msgstr "Hírek keresése"
 
-#: actions/othersettings.php:59
-msgid "Other settings"
-msgstr "Egyéb beállítások"
-
-#. TRANS: Instructions for tab "Other" in user profile settings.
-#: actions/othersettings.php:71
-msgid "Manage various other options."
-msgstr "Számos egyéb beállítás kezelése."
-
-#. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
-#. TRANS: user's profile settings. Use of "free" is as in "open", indicating that the
-#. TRANS: information on the shortener site is freely distributable.
-#. TRANS: This message has one space at the beginning. Use your language's word separator
-#. TRANS: here if it has one (most likely a single space).
-#: actions/othersettings.php:113
-msgid " (free service)"
-msgstr " (ingyenes szolgáltatás)"
-
-#. TRANS: Label for dropdown with URL shortener services.
-#: actions/othersettings.php:122
-msgid "Shorten URLs with"
-msgstr ""
-
-#. TRANS: Tooltip for for dropdown with URL shortener services.
-#: actions/othersettings.php:124
-msgid "Automatic shortening service to use."
-msgstr ""
-
-#. TRANS: Label for checkbox.
-#: actions/othersettings.php:130
-msgid "View profile designs"
-msgstr ""
-
-#. TRANS: Tooltip for checkbox.
-#: actions/othersettings.php:132
-msgid "Show or hide profile designs."
-msgstr ""
-
-#. TRANS: Form validation error for form "Other settings" in user profile.
-#: actions/othersettings.php:164
-#, fuzzy
-msgid "URL shortening service is too long (maximum 50 characters)."
-msgstr "A nyelv túl hosszú (legfeljebb 50 karakter lehet)."
-
-#: actions/otp.php:69
+#. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
+#: actions/otp.php:70
 msgid "No user ID specified."
 msgstr ""
 
-#: actions/otp.php:83
+#. TRANS: Client error displayed trying to use "one time password login" without specifying a login token.
+#: actions/otp.php:86
 msgid "No login token specified."
 msgstr ""
 
-#: actions/otp.php:90
+#. TRANS: Client error displayed trying to use "one time password login" without requesting a login token.
+#: actions/otp.php:94
 msgid "No login token requested."
 msgstr ""
 
-#: actions/otp.php:95
+#. TRANS: Client error displayed trying to use "one time password login" while specifying an invalid login token.
+#: actions/otp.php:100
 msgid "Invalid login token specified."
 msgstr ""
 
-#: actions/otp.php:104
+#. TRANS: Client error displayed trying to use "one time password login" while specifying an expired login token.
+#: actions/otp.php:110
 msgid "Login token expired."
 msgstr ""
 
-#: actions/outbox.php:58
+#. TRANS: Title for outbox for any but the fist page.
+#. TRANS: %1$s is the user nickname, %2$d is the page number.
+#: actions/outbox.php:57
 #, php-format
 msgid "Outbox for %1$s - page %2$d"
 msgstr "%1$s kimenő postafiókja - %2$d. oldal"
 
+#. TRANS: Title for first page of outbox.
 #: actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
 msgstr "%s kimenő postafiókja"
 
-#: actions/outbox.php:104
+#. TRANS: Instructions for outbox.
+#: actions/outbox.php:103
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr "Ez az elküldött privát üzeneteid postafiókja."
 
@@ -4041,43 +4099,45 @@ msgstr "Régi jelszó"
 msgid "New password"
 msgstr "Új jelszó"
 
-#: actions/passwordsettings.php:109
+#: actions/passwordsettings.php:109 actions/register.php:416
 #, fuzzy
-msgid "6 or more characters"
+msgid "6 or more characters."
 msgstr "6 vagy több karakter"
 
-#: actions/passwordsettings.php:113
+#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#: actions/passwordsettings.php:113 actions/recoverpassword.php:264
+#: actions/register.php:420
 #, fuzzy
-msgid "Same as password above"
+msgid "Same as password above."
 msgstr "Ugyanaz mint a fenti jelszó"
 
 #: actions/passwordsettings.php:117
 msgid "Change"
 msgstr "Változtassunk"
 
-#: actions/passwordsettings.php:154 actions/register.php:238
+#: actions/passwordsettings.php:153 actions/register.php:223
 msgid "Password must be 6 or more characters."
 msgstr "A jelszónak legalább 6 karakterből kell állnia."
 
-#: actions/passwordsettings.php:157 actions/register.php:241
+#: actions/passwordsettings.php:156 actions/register.php:226
 msgid "Passwords don't match."
 msgstr "A jelszavak nem egyeznek."
 
-#: actions/passwordsettings.php:165
+#: actions/passwordsettings.php:164
 msgid "Incorrect old password"
 msgstr "Érvénytelen a régi jelszó"
 
-#: actions/passwordsettings.php:181
+#: actions/passwordsettings.php:180
 msgid "Error saving user; invalid."
 msgstr "Hiba a felhasználó mentésekor; érvénytelen."
 
-#: actions/passwordsettings.php:186
+#. TRANS: Reset password form validation error message.
+#: actions/passwordsettings.php:185 actions/recoverpassword.php:418
 #, fuzzy
-msgid "Can't save new password."
+msgid "Cannot save new password."
 msgstr "Az új jelszót nem sikerült elmenteni."
 
-#. TRANS: Title for password recovery page in password saved mode.
-#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
+#: actions/passwordsettings.php:191
 msgid "Password saved."
 msgstr "Jelszó elmentve."
 
@@ -4294,8 +4354,7 @@ msgid "Directory where backgrounds are located."
 msgstr "A nyelvi fájlok elérési útvonala"
 
 #. TRANS: Fieldset legens in Paths admin panel.
-#. TRANS: DT element label in attachment list.
-#: actions/pathsadminpanel.php:419 lib/attachmentlist.php:98
+#: actions/pathsadminpanel.php:419
 msgid "Attachments"
 msgstr "Csatolmányok"
 
@@ -4368,7 +4427,9 @@ msgstr ""
 msgid "Save paths"
 msgstr "Elérési útvonalak mentése"
 
-#: actions/peoplesearch.php:52
+#. TRANS: Instructions for the "People search" page.
+#. TRANS: %%site.name%% is the name of the StatusNet site.
+#: actions/peoplesearch.php:54
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
@@ -4378,7 +4439,8 @@ msgstr ""
 "érdeklődési körük alapján. A kifejezéseket válaszd el szóközökkel; legalább "
 "3 betűből kell állniuk."
 
-#: actions/peoplesearch.php:58
+#. TRANS: Title of a page where users can search for other users.
+#: actions/peoplesearch.php:61
 msgid "People search"
 msgstr "Emberkereső"
 
@@ -4392,6 +4454,60 @@ msgstr ""
 msgid "Users self-tagged with %1$s - page %2$d"
 msgstr ""
 
+#. TRANS: Page title for AJAX form return when a disabling a plugin.
+#: actions/plugindisable.php:69
+msgctxt "plugin"
+msgid "Disabled"
+msgstr ""
+
+#. TRANS: Client error displayed trying to perform any request method other than POST.
+#. TRANS: Do not translate POST.
+#: actions/pluginenable.php:78 actions/subscribe.php:77
+msgid "This action only accepts POST requests."
+msgstr ""
+
+#: actions/pluginenable.php:102
+#, fuzzy
+msgid "You cannot administer plugins."
+msgstr "Nem törölhetsz felhasználókat."
+
+#: actions/pluginenable.php:109
+#, fuzzy
+msgid "No such plugin."
+msgstr "Nincs ilyen lap."
+
+#. TRANS: Page title for AJAX form return when enabling a plugin.
+#: actions/pluginenable.php:159
+msgctxt "plugin"
+msgid "Enabled"
+msgstr ""
+
+#. TRANS: Tab and title for plugins admin panel.
+#. TRANS: Menu item for site administration
+#: actions/pluginsadminpanel.php:56 actions/version.php:191
+#: lib/adminpanelaction.php:411
+msgid "Plugins"
+msgstr ""
+
+#. TRANS: Instructions at top of plugin admin page.
+#: actions/pluginsadminpanel.php:68
+msgid ""
+"Additional plugins can be enabled and configured manually. See the <a href="
+"\"http://status.net/wiki/Plugins\">online plugin documentation</a> for more "
+"details."
+msgstr ""
+
+#. TRANS: Admin form section header
+#: actions/pluginsadminpanel.php:84
+#, fuzzy
+msgid "Default plugins"
+msgstr "Alapértelmezett nyelv"
+
+#: actions/pluginsadminpanel.php:106
+msgid ""
+"All default plugins have been disabled from the site's configuration file."
+msgstr ""
+
 #: actions/postnotice.php:95
 msgid "Invalid notice content."
 msgstr "Érvénytelen megjegyzéstartalom."
@@ -4402,12 +4518,12 @@ msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’.
 msgstr "A hír licence ‘%1$s’ nem kompatibilis a webhely licencével ‘%2$s’."
 
 #. TRANS: Page title for profile settings.
-#: actions/profilesettings.php:59
+#: actions/profilesettings.php:60
 msgid "Profile settings"
 msgstr "Profilbeállítások"
 
 #. TRANS: Usage instructions for profile settings.
-#: actions/profilesettings.php:70
+#: actions/profilesettings.php:71
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
@@ -4415,34 +4531,31 @@ msgstr ""
 "többet tudhassanak rólad."
 
 #. TRANS: Profile settings form legend.
-#: actions/profilesettings.php:98
+#: actions/profilesettings.php:99
 msgid "Profile information"
 msgstr "Személyes profil"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109 actions/register.php:433
+#: actions/profilesettings.php:110 actions/register.php:412
 #, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr "1-64 kisbetű vagy számjegy, nem lehet benne írásjel vagy szóköz"
 
 #. TRANS: Field label in form for profile settings.
-#. TRANS: Label for full group name (dt). Text hidden by default.
-#. TRANS: DT for full name in a profile.
-#: actions/profilesettings.php:113 actions/register.php:455
-#: actions/showgroup.php:255 actions/tagother.php:104
-#: lib/groupeditform.php:150 lib/userprofile.php:156
+#: actions/profilesettings.php:114 actions/register.php:434
+#: lib/groupeditform.php:150
 msgid "Full name"
 msgstr "Teljes név"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:118 actions/register.php:460
+#: actions/profilesettings.php:119 actions/register.php:439
 #: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "Honlap"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:121
+#: actions/profilesettings.php:122 actions/register.php:441
 #, fuzzy
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr ""
@@ -4452,7 +4565,7 @@ msgstr ""
 #. TRANS: Tooltip for field label in form for profile settings. Plural
 #. TRANS: is decided by the number of characters available for the
 #. TRANS: biography (%d).
-#: actions/profilesettings.php:129 actions/register.php:471
+#: actions/profilesettings.php:130 actions/register.php:450
 #, fuzzy, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4460,79 +4573,75 @@ msgstr[0] "Jellemezd önmagad és az érdeklődési köröd %d karakterben"
 msgstr[1] "Jellemezd önmagad és az érdeklődési köröd %d karakterben"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:135 actions/register.php:476
+#: actions/profilesettings.php:136 actions/register.php:455
 msgid "Describe yourself and your interests"
 msgstr "Jellemezd önmagad és az érdeklődési köröd"
 
 #. TRANS: Text area label in form for profile settings where users can provide.
 #. TRANS: their biography.
-#: actions/profilesettings.php:139 actions/register.php:478
+#: actions/profilesettings.php:140 actions/register.php:457
 msgid "Bio"
 msgstr "Életrajz"
 
 #. TRANS: Field label in form for profile settings.
-#. TRANS: Label for group location (dt). Text hidden by default.
-#. TRANS: DT for location in a profile.
-#: actions/profilesettings.php:145 actions/register.php:483
-#: actions/showgroup.php:265 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:173
-#: lib/userprofile.php:172
+#: actions/profilesettings.php:146 actions/register.php:462
+#: lib/groupeditform.php:173
 msgid "Location"
 msgstr "Helyszín"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148 actions/register.php:485
+#: actions/profilesettings.php:149
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Merre vagy, mint pl. \"Város, Megye, Ország\""
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:153
+#: actions/profilesettings.php:154
 msgid "Share my current location when posting notices"
 msgstr "Tegyük közzé az aktuális tartózkodási helyem amikor híreket küldök"
 
 #. TRANS: Field label in form for profile settings.
-#. TRANS: DT for tags in a profile.
-#: actions/profilesettings.php:161 actions/tagother.php:149
-#: actions/tagother.php:209 lib/subscriptionlist.php:106
-#: lib/subscriptionlist.php:108 lib/userprofile.php:220
+#: actions/profilesettings.php:162 actions/tagother.php:128
+#: actions/tagother.php:188 lib/subscriptionlist.php:104
+#: lib/subscriptionlist.php:106
 msgid "Tags"
 msgstr "Címkék"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:164
+#: actions/profilesettings.php:165
 #, fuzzy
 msgid ""
-"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- "
+"separated."
 msgstr ""
 "Címkék magadhoz (betűk, számok, -, ., és _), vesszővel vagy szóközzel "
 "elválasztva"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:169
+#: actions/profilesettings.php:170
 msgid "Language"
 msgstr "Nyelv"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:171
+#: actions/profilesettings.php:172
 #, fuzzy
-msgid "Preferred language"
+msgid "Preferred language."
 msgstr "Előnyben részesített nyelv"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:181
+#: actions/profilesettings.php:182
 msgid "Timezone"
 msgstr "Időzóna"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:183
+#: actions/profilesettings.php:184
 msgid "What timezone are you normally in?"
 msgstr "Általában melyik időzónában vagy?"
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:189
+#: actions/profilesettings.php:190
 #, fuzzy
 msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)"
+"Automatically subscribe to whoever subscribes to me (best for non-humans)."
 msgstr ""
 "Automatikusan iratkozzunk fel mindazok híreire, aki feliratkoznak a mieinkre "
 "(nem embereknek való)"
@@ -4540,7 +4649,7 @@ msgstr ""
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Plural form is used based on the maximum number of allowed
 #. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:258 actions/register.php:229
+#: actions/profilesettings.php:259 actions/register.php:214
 #, fuzzy, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4548,50 +4657,50 @@ msgstr[0] "Az bemutatkozás túl hosszú (max %d karakter)."
 msgstr[1] "Az bemutatkozás túl hosszú (max %d karakter)."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:269 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:270 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr "Nem választottál időzónát."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:277
+#: actions/profilesettings.php:278
 #, fuzzy
 msgid "Language is too long (maximum 50 characters)."
 msgstr "A nyelv túl hosszú (legfeljebb 50 karakter lehet)."
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:291 actions/tagother.php:178
-#, php-format
-msgid "Invalid tag: \"%s\""
+#: actions/profilesettings.php:292
+#, fuzzy, php-format
+msgid "Invalid tag: \"%s\"."
 msgstr "Érvénytelen címke: \"%s\""
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:347
+#: actions/profilesettings.php:348
 #, fuzzy
 msgid "Could not update user for autosubscribe."
 msgstr "Nem sikerült a felhasználónak automatikus feliratkozást beállítani."
 
 #. TRANS: Server error thrown when user profile location preference settings could not be updated.
-#: actions/profilesettings.php:405
+#: actions/profilesettings.php:406
 #, fuzzy
 msgid "Could not save location prefs."
 msgstr "Nem sikerült a helyszín beállításait elmenteni."
 
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:427 actions/tagother.php:200
+#: actions/profilesettings.php:428 actions/tagother.php:179
 msgid "Could not save tags."
 msgstr ""
 
 #. TRANS: Confirmation shown when user profile settings are saved.
 #. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:436 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:437 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "A beállításokat elmentettük."
 
 #. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
 #. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:483 actions/restoreaccount.php:60
+#: actions/profilesettings.php:484 actions/restoreaccount.php:60
 msgid "Restore account"
 msgstr ""
 
@@ -4664,6 +4773,12 @@ msgid ""
 "tool."
 msgstr ""
 
+#. TRANS: Public RSS feed description. %s is the StatusNet site name.
+#: actions/publicrss.php:106
+#, fuzzy, php-format
+msgid "%s updates from everyone."
+msgstr "%s-frissítések mindenki számára!"
+
 #. TRANS: Title for public tag cloud.
 #: actions/publictagcloud.php:57
 msgid "Public tag cloud"
@@ -4702,10 +4817,6 @@ msgid ""
 "one!"
 msgstr ""
 
-#: actions/publictagcloud.php:146
-msgid "Tag cloud"
-msgstr "Címkefelhő"
-
 #. TRANS: Client error displayed trying to recover password while already logged in.
 #: actions/recoverpassword.php:37
 msgid "You are already logged in!"
@@ -4795,6 +4906,12 @@ msgstr "Elfelejtett jelszó"
 msgid "Password recovery requested"
 msgstr "Jelszó visszaállítás kérvényezve"
 
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/recoverpassword.php:229
+#, fuzzy
+msgid "Password saved"
+msgstr "Jelszó elmentve."
+
 #. TRANS: Title for password recovery page when an unknown action has been specified.
 #: actions/recoverpassword.php:232
 msgid "Unknown action"
@@ -4806,15 +4923,9 @@ msgstr "Ismeretlen művelet"
 msgid "6 or more characters, and do not forget it!"
 msgstr "6 vagy több karakter, és ne felejtsd el!"
 
-#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
-#: actions/recoverpassword.php:264 actions/register.php:441
-#, fuzzy
-msgid "Same as password above."
-msgstr "Ugyanaz mint a fenti jelszó"
-
 #. TRANS: Button text for password reset form.
 #. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: actions/recoverpassword.php:268 lib/designsettings.php:264
+#: actions/recoverpassword.php:268 lib/designform.php:145
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Reset"
@@ -4863,14 +4974,8 @@ msgstr "A jelszónak legalább 6 karakterből kell állnia."
 msgid "Password and confirmation do not match."
 msgstr "A jelszó és a megerősítése nem egyeznek meg."
 
-#. TRANS: Reset password form validation error message.
-#: actions/recoverpassword.php:418
-#, fuzzy
-msgid "Cannot save new password."
-msgstr "Az új jelszót nem sikerült elmenteni."
-
 #. TRANS: Server error displayed when something does wrong with the user object during password reset.
-#: actions/recoverpassword.php:426 actions/register.php:256
+#: actions/recoverpassword.php:426 actions/register.php:241
 msgid "Error setting user."
 msgstr "Hiba a felhasználó beállításakor."
 
@@ -4879,105 +4984,106 @@ msgstr "Hiba a felhasználó beállításakor."
 msgid "New password successfully saved. You are now logged in."
 msgstr ""
 
-#: actions/register.php:92 actions/register.php:196 actions/register.php:413
+#: actions/redirecturl.php:70
+msgid "No id parameter"
+msgstr ""
+
+#: actions/redirecturl.php:76
+#, fuzzy, php-format
+msgid "No such file \"%d\""
+msgstr "Nincs ilyen fájl."
+
+#: actions/register.php:80 actions/register.php:181 actions/register.php:392
 msgid "Sorry, only invited people can register."
 msgstr "Elnézést, de csak meghívóval lehet regisztrálni."
 
-#: actions/register.php:99
+#: actions/register.php:87
 msgid "Sorry, invalid invitation code."
 msgstr ""
 
-#: actions/register.php:119
+#: actions/register.php:106
 msgid "Registration successful"
 msgstr "A regisztráció sikeres"
 
-#: actions/register.php:121 actions/register.php:511
+#: actions/register.php:108 actions/register.php:490
 msgid "Register"
 msgstr "Regisztráció"
 
-#: actions/register.php:142
+#: actions/register.php:128
 msgid "Registration not allowed."
 msgstr "A regisztráció nem megengedett."
 
-#: actions/register.php:209
+#: actions/register.php:194
 #, fuzzy
-msgid "You can't register if you don't agree to the license."
+msgid "You cannot register if you don't agree to the license."
 msgstr "Nem tudsz regisztrálni ha nem fogadod el a licencet."
 
-#: actions/register.php:218
+#: actions/register.php:203
 msgid "Email address already exists."
 msgstr "Az e-mail cím már létezik."
 
-#: actions/register.php:251 actions/register.php:273
+#: actions/register.php:236 actions/register.php:258
 msgid "Invalid username or password."
 msgstr "Érvénytelen felhasználónév vagy jelszó."
 
-#: actions/register.php:351
+#: actions/register.php:333
 msgid ""
 "With this form you can create a new account. You can then post notices and "
-"link up to friends and colleagues. "
+"link up to friends and colleagues."
 msgstr ""
 
-#: actions/register.php:437
-#, fuzzy
-msgid "6 or more characters."
-msgstr "6 vagy több karakter"
-
-#. TRANS: Link description in user account settings menu.
-#: actions/register.php:445 actions/register.php:449
-#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
+#: actions/register.php:424 actions/register.php:428
+#: actions/siteadminpanel.php:238 lib/settingsnav.php:92
 msgid "Email"
 msgstr "E-mail"
 
-#: actions/register.php:446 actions/register.php:450
+#: actions/register.php:425 actions/register.php:429
 #, fuzzy
-msgid "Used only for updates, announcements, and password recovery"
+msgid "Used only for updates, announcements, and password recovery."
 msgstr ""
 "Csak frissítéskor, fontos közlemények esetén és jelszóproblémák orvoslására "
 "használjuk"
 
-#: actions/register.php:457
+#: actions/register.php:436
 #, fuzzy
-msgid "Longer name, preferably your \"real\" name"
+msgid "Longer name, preferably your \"real\" name."
 msgstr "Hosszabb név, célszerűen a \"valódi\" neved"
 
-#: actions/register.php:462
+#: actions/register.php:464
 #, fuzzy
-msgid "URL of your homepage, blog, or profile on another site"
-msgstr ""
-"A honlapodhoz, blogodhoz, vagy egy másik webhelyen lévő profilodhoz tartozó "
-"URL"
+msgid "Where you are, like \"City, State (or Region), Country\"."
+msgstr "Merre vagy, mint pl. \"Város, Megye, Ország\""
 
-#: actions/register.php:523
+#: actions/register.php:503
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
 msgstr ""
 
-#: actions/register.php:533
+#: actions/register.php:513
 #, php-format
 msgid "My text and files are copyright by %1$s."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:537
+#: actions/register.php:517
 msgid "My text and files remain under my own copyright."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:540
+#: actions/register.php:520
 msgid "All rights reserved."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:545
+#: actions/register.php:525
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
 "email address, IM address, and phone number."
 msgstr ""
 
-#: actions/register.php:588
+#: actions/register.php:566
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -4996,7 +5102,7 @@ msgid ""
 "Thanks for signing up and we hope you enjoy using this service."
 msgstr ""
 
-#: actions/register.php:612
+#: actions/register.php:590
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5025,7 +5131,7 @@ msgid "User nickname"
 msgstr "Felhasználó beceneve"
 
 #: actions/remotesubscribe.php:129
-msgid "Nickname of the user you want to follow"
+msgid "Nickname of the user you want to follow."
 msgstr ""
 
 #: actions/remotesubscribe.php:132
@@ -5033,17 +5139,17 @@ msgid "Profile URL"
 msgstr "Profil URL"
 
 #: actions/remotesubscribe.php:133
-msgid "URL of your profile on another compatible microblogging service"
+msgid "URL of your profile on another compatible microblogging service."
 msgstr ""
 
 #. TRANS: Link text for link that will subscribe to a remote profile.
 #: actions/remotesubscribe.php:136 lib/subscribeform.php:139
-#: lib/userprofile.php:431
+#: lib/userprofile.php:402
 msgid "Subscribe"
 msgstr "Kövessük"
 
 #: actions/remotesubscribe.php:158
-msgid "Invalid profile URL (bad format)"
+msgid "Invalid profile URL (bad format)."
 msgstr ""
 
 #: actions/remotesubscribe.php:167
@@ -5077,7 +5183,7 @@ msgstr "Nem ismételheted meg a saját híredet."
 msgid "You already repeated that notice."
 msgstr ""
 
-#: actions/repeat.php:112 lib/noticelist.php:692
+#: actions/repeat.php:112 lib/noticelist.php:697
 msgid "Repeated"
 msgstr ""
 
@@ -5085,9 +5191,9 @@ msgstr ""
 msgid "Repeated!"
 msgstr ""
 
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing @-replies.
+#. TRANS: RSS reply feed title. %s is a user nickname.
 #: actions/replies.php:126 actions/repliesrss.php:68
-#: lib/personalgroupnav.php:109
+#: lib/personalgroupnav.php:105
 #, php-format
 msgid "Replies to %s"
 msgstr ""
@@ -5133,10 +5239,12 @@ msgid ""
 "newnotice%%%%?status_textarea=%3$s)."
 msgstr ""
 
-#: actions/repliesrss.php:72
-#, fuzzy, php-format
-msgid "Replies to %1$s on %2$s!"
-msgstr "Frissítések %1$s felhasználótól, és barátok a következő oldalon: %2$s!"
+#. TRANS: RSS reply feed description.
+#. TRANS: %1$s is a user nickname, %2$s is the StatusNet site name.
+#: actions/repliesrss.php:74
+#, php-format
+msgid "Replies to %1$s on %2$s."
+msgstr ""
 
 #. TRANS: Client exception displayed when trying to restore an account while not logged in.
 #: actions/restoreaccount.php:78
@@ -5235,7 +5343,7 @@ msgstr ""
 msgid "User doesn't have this role."
 msgstr ""
 
-#: actions/rsd.php:146 actions/version.php:159
+#: actions/rsd.php:142 actions/version.php:159
 msgid "StatusNet"
 msgstr "StatusNet"
 
@@ -5277,93 +5385,44 @@ msgstr ""
 msgid "Save site settings"
 msgstr "Mentsük el a webhely beállításait"
 
-#: actions/showapplication.php:82
+#: actions/showapplication.php:78
 msgid "You must be logged in to view an application."
 msgstr ""
 
-#: actions/showapplication.php:157
+#: actions/showapplication.php:151
 msgid "Application profile"
 msgstr ""
 
-#. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:159 lib/applicationeditform.php:177
-msgid "Icon"
-msgstr "Ikon"
-
-#. TRANS: Form input field label for application name.
-#: actions/showapplication.php:169 actions/version.php:197
-#: lib/applicationeditform.php:190
-msgid "Name"
-msgstr "Név"
-
-#. TRANS: Form input field label.
-#: actions/showapplication.php:178 lib/applicationeditform.php:227
-msgid "Organization"
-msgstr "Szervezet"
-
-#. TRANS: Form input field label.
-#: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:168
-msgid "Description"
-msgstr "Leírás"
-
-#. TRANS: Header for group statistics on a group page (h2).
-#. TRANS: H2 text for user statistics.
-#: actions/showapplication.php:192 actions/showgroup.php:460
-#: lib/profileaction.php:205
-msgid "Statistics"
-msgstr "Statisztika"
-
-#: actions/showapplication.php:203
+#: actions/showapplication.php:179
 #, php-format
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr ""
 
-#: actions/showapplication.php:213
+#: actions/showapplication.php:189
 msgid "Application actions"
 msgstr ""
 
-#: actions/showapplication.php:236
+#: actions/showapplication.php:212
 msgid "Reset key & secret"
 msgstr ""
 
 #. TRANS: Title of form for deleting a user.
-#: actions/showapplication.php:252 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:64 lib/noticelist.php:673
+#: actions/showapplication.php:228 lib/deletegroupform.php:121
+#: lib/deleteuserform.php:64 lib/noticelist.php:678
 msgid "Delete"
 msgstr "Törlés"
 
-#: actions/showapplication.php:261
+#: actions/showapplication.php:237
 msgid "Application info"
 msgstr ""
 
-#: actions/showapplication.php:263
-msgid "Consumer key"
-msgstr ""
-
-#: actions/showapplication.php:268
-msgid "Consumer secret"
-msgstr ""
-
-#: actions/showapplication.php:273
-msgid "Request token URL"
-msgstr ""
-
-#: actions/showapplication.php:278
-msgid "Access token URL"
-msgstr ""
-
-#: actions/showapplication.php:283
-msgid "Authorize URL"
-msgstr ""
-
-#: actions/showapplication.php:288
+#: actions/showapplication.php:255
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
 msgstr ""
 
-#: actions/showapplication.php:309
+#: actions/showapplication.php:275
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr ""
 
@@ -5442,61 +5501,47 @@ msgstr "%s csoport"
 msgid "%1$s group, page %2$d"
 msgstr "%1$s csoport, %2$d. oldal"
 
-#. TRANS: Group profile header (h2). Text hidden by default.
-#: actions/showgroup.php:223
-msgid "Group profile"
-msgstr "Csoportprofil"
-
-#. TRANS: Label for group URL (dt). Text hidden by default.
-#. TRANS: DT for URL in a profile.
-#: actions/showgroup.php:273 actions/tagother.php:118
-#: actions/userauthorization.php:175 lib/userprofile.php:186
-msgid "URL"
-msgstr "URL-cím"
-
 #. TRANS: Label for group description or group note (dt). Text hidden by default.
-#. TRANS: DT for note in a profile.
-#: actions/showgroup.php:285 actions/tagother.php:128
-#: actions/userauthorization.php:187 lib/userprofile.php:204
+#: actions/showgroup.php:266
 msgid "Note"
 msgstr "Megjegyzés"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:296 lib/groupeditform.php:180
+#: actions/showgroup.php:277 lib/groupeditform.php:180
 msgid "Aliases"
 msgstr "Álnevek"
 
 #. TRANS: Group actions header (h2). Text hidden by default.
-#: actions/showgroup.php:313
+#: actions/showgroup.php:294
 msgid "Group actions"
 msgstr "Csoport-tevékenységek"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:357
+#: actions/showgroup.php:338
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
 msgstr "%s csoport RSS 1.0 hírcsatornája"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:364
+#: actions/showgroup.php:345
 #, php-format
 msgid "Notice feed for %s group (RSS 2.0)"
 msgstr "%s csoport RSS 2.0 hírcsatornája"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:371
+#: actions/showgroup.php:352
 #, php-format
 msgid "Notice feed for %s group (Atom)"
 msgstr "%s csoport Atom hírcsatornája"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:377
+#: actions/showgroup.php:358
 #, php-format
 msgid "FOAF for %s group"
 msgstr "FOAF a %s csoportnak"
 
 #. TRANS: Header for mini list of group members on a group page (h2).
-#: actions/showgroup.php:414
+#: actions/showgroup.php:395
 msgid "Members"
 msgstr "Tagok"
 
@@ -5504,26 +5549,31 @@ msgstr "Tagok"
 #. TRANS: Text for user subscription statistics if the user has no subscriptions.
 #. TRANS: Text for user subscriber statistics if user has no subscribers.
 #. TRANS: Text for user user group membership statistics if user is not a member of any group.
-#: actions/showgroup.php:420 lib/profileaction.php:137
+#: actions/showgroup.php:401 lib/profileaction.php:137
 #: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
-#: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
+#: lib/subscriptionlist.php:123 lib/tagcloudsection.php:71
 msgid "(None)"
 msgstr "(nincs)"
 
 #. TRANS: Link to all group members from mini list of group members if group has more than n members.
-#: actions/showgroup.php:429
+#: actions/showgroup.php:410
 msgid "All members"
 msgstr "Összes tag"
 
-#. TRANS: Label for creation date in statistics on group page.
-#: actions/showgroup.php:465
+#. TRANS: Header for group statistics on a group page (h2).
+#. TRANS: H2 text for user statistics.
+#: actions/showgroup.php:441 lib/profileaction.php:205
+msgid "Statistics"
+msgstr "Statisztika"
+
+#: actions/showgroup.php:444
 #, fuzzy
 msgctxt "LABEL"
 msgid "Created"
 msgstr "Létrehoztuk"
 
 #. TRANS: Label for member count in statistics on group page.
-#: actions/showgroup.php:473
+#: actions/showgroup.php:449
 #, fuzzy
 msgctxt "LABEL"
 msgid "Members"
@@ -5533,7 +5583,7 @@ msgstr "Tagok"
 #. TRANS: **%s** is the group alias, %%%%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).
-#: actions/showgroup.php:488
+#: actions/showgroup.php:464
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5552,7 +5602,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: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
-#: actions/showgroup.php:498
+#: actions/showgroup.php:474
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5562,7 +5612,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: Header for list of group administrators on a group page (h2).
-#: actions/showgroup.php:527
+#: actions/showgroup.php:503
 msgid "Admins"
 msgstr "Adminisztrátorok"
 
@@ -5601,7 +5651,7 @@ msgid "%1$s tagged %2$s"
 msgstr "  %s megcímkézve"
 
 #. TRANS: Page title showing tagged notices in one user's stream.
-#. TRANS: %1$s is the username, %2$s is the hash tag, %1$d is the page number.
+#. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
 #: actions/showstream.php:74
 #, fuzzy, php-format
 msgid "%1$s tagged %2$s, page %3$d"
@@ -5648,13 +5698,13 @@ msgid "FOAF for %s"
 msgstr ""
 
 #. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
-#: actions/showstream.php:211
+#: actions/showstream.php:205
 #, fuzzy, php-format
 msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr "Ez %1$s története, de %2$s még nem tett közzé hírt."
 
 #. TRANS: Second sentence of empty list message for a stream for the user themselves.
-#: actions/showstream.php:217
+#: actions/showstream.php:211
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
@@ -5662,7 +5712,7 @@ msgstr ""
 
 #. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:221
+#: actions/showstream.php:215
 #, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
@@ -5671,7 +5721,7 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:264
+#: actions/showstream.php:258
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5687,7 +5737,7 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:271
+#: actions/showstream.php:265
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5699,7 +5749,7 @@ msgstr ""
 "status.net/) szoftverre épült. "
 
 #. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
-#: actions/showstream.php:328
+#: actions/showstream.php:322
 #, php-format
 msgid "Repeat of %s"
 msgstr "%s ismétlése"
@@ -5842,146 +5892,146 @@ msgstr ""
 #. TRANS: Title for button to save site notice in admin panel.
 #: actions/sitenoticeadminpanel.php:201
 #, fuzzy
-msgid "Save site notice"
+msgid "Save site notice."
 msgstr "A webhely híre"
 
 #. TRANS: Title for SMS settings.
-#: actions/smssettings.php:57
+#: actions/smssettings.php:56
 msgid "SMS settings"
 msgstr "SMS beállítások"
 
 #. TRANS: SMS settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/smssettings.php:71
+#: actions/smssettings.php:70
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr ""
 
 #. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
-#: actions/smssettings.php:93
+#: actions/smssettings.php:92
 msgid "SMS is not available."
 msgstr "Az SMS nem elérhető."
 
 #. TRANS: Form legend for SMS settings form.
-#: actions/smssettings.php:107
+#: actions/smssettings.php:106
 msgid "SMS address"
 msgstr ""
 
 #. TRANS: Form guide in SMS settings form.
-#: actions/smssettings.php:116
+#: actions/smssettings.php:115
 msgid "Current confirmed SMS-enabled phone number."
 msgstr ""
 
 #. TRANS: Form guide in IM settings form.
-#: actions/smssettings.php:129
+#: actions/smssettings.php:128
 msgid "Awaiting confirmation on this phone number."
 msgstr "Ez a telefonszám ellenőrzésre vár."
 
 #. TRANS: Field label for SMS address input in SMS settings form.
-#: actions/smssettings.php:138
+#: actions/smssettings.php:137
 msgid "Confirmation code"
 msgstr ""
 
 #. TRANS: Form field instructions in SMS settings form.
-#: actions/smssettings.php:140
+#: actions/smssettings.php:139
 msgid "Enter the code you received on your phone."
 msgstr "Add meg a kódot amit a telefonodra kaptál."
 
 #. TRANS: Button label to confirm SMS confirmation code in SMS settings.
-#: actions/smssettings.php:144
+#: actions/smssettings.php:143
 msgctxt "BUTTON"
 msgid "Confirm"
 msgstr "Megerősítés"
 
 #. TRANS: Field label for SMS phone number input in SMS settings form.
-#: actions/smssettings.php:149
+#: actions/smssettings.php:148
 msgid "SMS phone number"
 msgstr "SMS telefonszám"
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
-#: actions/smssettings.php:152
+#: actions/smssettings.php:151
 #, fuzzy
-msgid "Phone number, no punctuation or spaces, with area code"
+msgid "Phone number, no punctuation or spaces, with area code."
 msgstr "1-64 kisbetű vagy számjegy, nem lehet benne írásjel vagy szóköz"
 
 #. TRANS: Form legend for SMS preferences form.
-#: actions/smssettings.php:191
+#: actions/smssettings.php:190
 msgid "SMS preferences"
 msgstr ""
 
 #. TRANS: Checkbox label in SMS preferences form.
-#: actions/smssettings.php:197
+#: actions/smssettings.php:196
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
 msgstr ""
 
 #. TRANS: Confirmation message for successful SMS preferences save.
-#: actions/smssettings.php:308
+#: actions/smssettings.php:307
 msgid "SMS preferences saved."
 msgstr ""
 
 #. TRANS: Message given saving SMS phone number without having provided one.
-#: actions/smssettings.php:330
+#: actions/smssettings.php:329
 msgid "No phone number."
 msgstr "Nincs telefonszám."
 
 #. TRANS: Message given saving SMS phone number without having selected a carrier.
-#: actions/smssettings.php:336
+#: actions/smssettings.php:335
 msgid "No carrier selected."
 msgstr ""
 
 #. TRANS: Message given saving SMS phone number that is already set.
-#: actions/smssettings.php:344
+#: actions/smssettings.php:343
 msgid "That is already your phone number."
 msgstr ""
 
 #. TRANS: Message given saving SMS phone number that is already set for another user.
-#: actions/smssettings.php:348
+#: actions/smssettings.php:347
 msgid "That phone number already belongs to another user."
 msgstr ""
 
 #. TRANS: Message given saving valid SMS phone number that is to be confirmed.
-#: actions/smssettings.php:376
+#: actions/smssettings.php:375
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
 "for the code and instructions on how to use it."
 msgstr ""
 
 #. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
-#: actions/smssettings.php:404
+#: actions/smssettings.php:403
 msgid "That is the wrong confirmation number."
 msgstr ""
 
 #. TRANS: Message given after successfully canceling SMS phone number confirmation.
-#: actions/smssettings.php:418
+#: actions/smssettings.php:417
 msgid "SMS confirmation cancelled."
 msgstr ""
 
 #. TRANS: Message given trying to remove an SMS phone number that is not
 #. TRANS: registered for the active user.
-#: actions/smssettings.php:438
+#: actions/smssettings.php:437
 msgid "That is not your phone number."
 msgstr ""
 
 #. TRANS: Message given after successfully removing a registered SMS phone number.
-#: actions/smssettings.php:460
+#: actions/smssettings.php:459
 msgid "The SMS phone number was removed."
 msgstr ""
 
 #. TRANS: Label for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:499
+#: actions/smssettings.php:498
 msgid "Mobile carrier"
 msgstr "Mobilszolgáltató"
 
 #. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:504
+#: actions/smssettings.php:503
 msgid "Select a carrier"
 msgstr "Válassz egy szolgáltatót"
 
 #. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
 #. TRANS: %s is an administrative contact's e-mail address.
-#: actions/smssettings.php:513
+#: actions/smssettings.php:512
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -5989,7 +6039,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
-#: actions/smssettings.php:535
+#: actions/smssettings.php:534
 #, fuzzy
 msgid "No code entered."
 msgstr "Nincs kód megadva"
@@ -6063,15 +6113,13 @@ msgstr ""
 msgid "Could not save subscription."
 msgstr ""
 
-#: actions/subscribe.php:77
-msgid "This action only accepts POST requests."
-msgstr ""
-
-#: actions/subscribe.php:117
+#. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
+#: actions/subscribe.php:121
 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
 msgstr ""
 
-#: actions/subscribe.php:145
+#. TRANS: Page title when subscription succeeded.
+#: actions/subscribe.php:149
 msgid "Subscribed"
 msgstr "Feliratkozott"
 
@@ -6178,31 +6226,33 @@ msgid "Subscription feed for %s (Atom)"
 msgstr "%s Atom hírcsatornája"
 
 #. TRANS: Checkbox label for enabling Jabber messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:239
-msgid "Jabber"
-msgstr "Jabber"
+#: actions/subscriptions.php:241 lib/settingsnav.php:110
+msgid "IM"
+msgstr ""
 
 #. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:254
+#: actions/subscriptions.php:256 lib/settingsnav.php:117
 msgid "SMS"
 msgstr "SMS"
 
-#: actions/tag.php:69
+#. TRANS: Title for all but the first page of notices with tags.
+#. TRANS: %1$s is the tag, %2$d is the page number.
+#: actions/tag.php:73
 #, php-format
 msgid "Notices tagged with %1$s, page %2$d"
 msgstr ""
 
-#: actions/tag.php:87
+#: actions/tag.php:91
 #, php-format
 msgid "Notice feed for tag %s (RSS 1.0)"
 msgstr "%s címke RSS 1.0 hírcsatornája"
 
-#: actions/tag.php:93
+#: actions/tag.php:97
 #, php-format
 msgid "Notice feed for tag %s (RSS 2.0)"
 msgstr "%s címke RSS 2.0 hírcsatornája"
 
-#: actions/tag.php:99
+#: actions/tag.php:103
 #, php-format
 msgid "Notice feed for tag %s (Atom)"
 msgstr "%s címke Atom hírcsatornája"
@@ -6221,28 +6271,27 @@ msgstr ""
 msgid "User profile"
 msgstr "Felhasználói profil"
 
-#. TRANS: DT element in area for user avatar.
-#: actions/tagother.php:81 actions/userauthorization.php:132
-#: lib/userprofile.php:108
-msgid "Photo"
-msgstr "Fénykép"
-
-#: actions/tagother.php:141
+#: actions/tagother.php:120
 msgid "Tag user"
 msgstr ""
 
-#: actions/tagother.php:151
+#: actions/tagother.php:130
 msgid ""
 "Tags for this user (letters, numbers, -, ., and _), comma- or space- "
 "separated"
 msgstr ""
 
-#: actions/tagother.php:193
+#: actions/tagother.php:157
+#, php-format
+msgid "Invalid tag: \"%s\""
+msgstr "Érvénytelen címke: \"%s\""
+
+#: actions/tagother.php:172
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 
-#: actions/tagother.php:236
+#: actions/tagother.php:215
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
 
@@ -6250,6 +6299,7 @@ msgstr ""
 msgid "No such tag."
 msgstr "Nincs ilyen címke."
 
+#. TRANS: Client error displayed when trying to unblock a non-blocked user.
 #: actions/unblock.php:59
 msgid "You haven't blocked that user."
 msgstr ""
@@ -6270,12 +6320,83 @@ msgstr ""
 msgid "Unsubscribed"
 msgstr ""
 
-#: actions/updateprofile.php:64 actions/userauthorization.php:337
+#: actions/updateprofile.php:64
 #, php-format
 msgid ""
 "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
 msgstr ""
 
+#: actions/urlsettings.php:60
+#, fuzzy
+msgid "URL settings"
+msgstr "IM beállítások"
+
+#. TRANS: Instructions for tab "Other" in user profile settings.
+#: actions/urlsettings.php:72
+msgid "Manage various other options."
+msgstr "Számos egyéb beállítás kezelése."
+
+#. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
+#. TRANS: user's profile settings. This message has one space at the beginning. Use your
+#. TRANS: language's word separator here if it has one (most likely a single space).
+#: actions/urlsettings.php:115
+msgid " (free service)"
+msgstr " (ingyenes szolgáltatás)"
+
+#: actions/urlsettings.php:121
+msgid "[none]"
+msgstr ""
+
+#: actions/urlsettings.php:122
+msgid "[internal]"
+msgstr ""
+
+#. TRANS: Label for dropdown with URL shortener services.
+#: actions/urlsettings.php:130
+msgid "Shorten URLs with"
+msgstr ""
+
+#. TRANS: Tooltip for for dropdown with URL shortener services.
+#: actions/urlsettings.php:132
+msgid "Automatic shortening service to use."
+msgstr ""
+
+#: actions/urlsettings.php:138
+msgid "URL longer than"
+msgstr ""
+
+#: actions/urlsettings.php:141
+msgid "URLs longer than this will be shortened, 0 means always shorten."
+msgstr ""
+
+#: actions/urlsettings.php:145
+msgid "Text longer than"
+msgstr ""
+
+#: actions/urlsettings.php:148
+msgid ""
+"URLs in notices longer than this will be shortened, 0 means always shorten."
+msgstr ""
+
+#. TRANS: Form validation error for form "Other settings" in user profile.
+#: actions/urlsettings.php:180
+#, fuzzy
+msgid "URL shortening service is too long (maximum 50 characters)."
+msgstr "A nyelv túl hosszú (legfeljebb 50 karakter lehet)."
+
+#: actions/urlsettings.php:187
+msgid "Invalid number for max url length."
+msgstr ""
+
+#: actions/urlsettings.php:193
+#, fuzzy
+msgid "Invalid number for max notice length."
+msgstr "Érvénytelen megjegyzéstartalom."
+
+#: actions/urlsettings.php:238
+msgid "Error saving user URL shortening preferences."
+msgstr ""
+
 #. TRANS: User admin panel title
 #: actions/useradminpanel.php:58
 msgctxt "TITLE"
@@ -6302,11 +6423,11 @@ msgstr "Érvénytelen SSL szerver. A maximális hossz 255 karakter."
 #. TRANS: users in user admin panel. %1$s is the invalid nickname.
 #: actions/useradminpanel.php:166
 #, php-format
-msgid "Invalid default subscripton: '%1$s' is not a user."
+msgid "Invalid default subscripton: \"%1$s\" is not a user."
 msgstr ""
 
-#. TRANS: Link description in user account settings menu.
-#: actions/useradminpanel.php:215 lib/accountsettingsaction.php:106
+#: actions/useradminpanel.php:215 lib/action.php:565 lib/settingsnav.php:77
+#: lib/subgroupnav.php:81
 msgid "Profile"
 msgstr "Profil"
 
@@ -6364,123 +6485,169 @@ msgstr ""
 #. TRANS: Title for button to save user settings in user admin panel.
 #: actions/useradminpanel.php:302
 #, fuzzy
-msgid "Save user settings"
+msgid "Save user settings."
 msgstr "Mentsük el a webhely beállításait"
 
-#: actions/userauthorization.php:105
+#. TRANS: Page title.
+#: actions/userauthorization.php:109
 msgid "Authorize subscription"
 msgstr "Feliratkozás engedélyezése"
 
-#: actions/userauthorization.php:110
+#. TRANS: Page notice on "Auhtorize subscription" page.
+#: actions/userauthorization.php:115
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
 "user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
-"click “Reject”."
+"click \"Reject\"."
 msgstr ""
 
-#. TRANS: Menu item for site administration
-#: actions/userauthorization.php:196 actions/version.php:167
-#: lib/adminpanelaction.php:403
-msgid "License"
-msgstr "Licenc"
-
-#: actions/userauthorization.php:217
+#. TRANS: Button text on Authorise Subscription page.
+#: actions/userauthorization.php:200
 #, fuzzy
+msgctxt "BUTTON"
 msgid "Accept"
 msgstr "Elfogadás"
 
-#: actions/userauthorization.php:218 lib/subscribeform.php:115
-#: lib/subscribeform.php:139
-msgid "Subscribe to this user"
-msgstr ""
-
-#: actions/userauthorization.php:219
+#. TRANS: Title for button on Authorise Subscription page.
+#: actions/userauthorization.php:202
 #, fuzzy
+msgid "Subscribe to this user."
+msgstr "Ezen felhasználók híreire már feliratkoztál:"
+
+#. TRANS: Button text on Authorise Subscription page.
+#: actions/userauthorization.php:204
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Reject"
 msgstr "Visszautasítás"
 
-#: actions/userauthorization.php:220
+#. TRANS: Title for button on Authorise Subscription page.
+#: actions/userauthorization.php:206
 #, fuzzy
-msgid "Reject this subscription"
+msgid "Reject this subscription."
 msgstr "Feliratkozás engedélyezése"
 
-#: actions/userauthorization.php:232
+#. TRANS: Client error displayed for an empty authorisation request.
+#: actions/userauthorization.php:219
 msgid "No authorization request!"
 msgstr ""
 
-#: actions/userauthorization.php:254
+#. TRANS: Accept message header from Authorise subscription page.
+#: actions/userauthorization.php:242
 msgid "Subscription authorized"
 msgstr ""
 
-#: actions/userauthorization.php:256
+#: actions/userauthorization.php:245
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to authorize the "
 "subscription. Your subscription token is:"
 msgstr ""
 
-#: actions/userauthorization.php:266
+#. TRANS: Reject message header from Authorise subscription page.
+#: actions/userauthorization.php:256
 msgid "Subscription rejected"
 msgstr ""
 
-#: actions/userauthorization.php:268
+#: actions/userauthorization.php:259
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to fully reject the "
 "subscription."
 msgstr ""
 
-#: actions/userauthorization.php:303
+#. TRANS: Exception thrown when no valid user is found for an authorisation request.
+#. TRANS: %s is a listener URI.
+#: actions/userauthorization.php:296
 #, php-format
-msgid "Listener URI ‘%s’ not found here."
+msgid "Listener URI \"%s\" not found here."
 msgstr ""
 
-#: actions/userauthorization.php:308
+#. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
+#. TRANS: %s is a listenee URI.
+#: actions/userauthorization.php:303
 #, fuzzy, php-format
-msgid "Listenee URI ‘%s’ is too long."
+msgid "Listenee URI \"%s\" is too long."
 msgstr "A forrás URL túl hosszú."
 
-#: actions/userauthorization.php:314
-#, fuzzy, php-format
-msgid "Listenee URI ‘%s’ is a local user."
-msgstr "A forrás URL túl hosszú."
+#. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
+#. TRANS: %s is a listenee URI.
+#: actions/userauthorization.php:311
+#, php-format
+msgid "Listenee URI \"%s\" is a local user."
+msgstr ""
 
+#. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
+#. TRANS: %s is a profile URL.
 #: actions/userauthorization.php:329
 #, php-format
-msgid "Profile URL ‘%s’ is for a local user."
+msgid "Profile URL \"%s\" is for a local user."
 msgstr ""
 
-#: actions/userauthorization.php:345
+#. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
+#. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
+#: actions/userauthorization.php:339
 #, fuzzy, php-format
-msgid "Avatar URL ‘%s’ is not valid."
+msgid ""
+"Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
+"\"."
+msgstr "A hír licence ‘%1$s’ nem kompatibilis a webhely licencével ‘%2$s’."
+
+#. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
+#. TRANS: %s is an avatar URL.
+#: actions/userauthorization.php:349
+#, fuzzy, php-format
+msgid "Avatar URL \"%s\" is not valid."
 msgstr "A forrás URL nem érvényes."
 
-#: actions/userauthorization.php:350
+#. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
+#. TRANS: %s is an avatar URL.
+#: actions/userauthorization.php:356
 #, php-format
-msgid "Can’t read avatar URL ‘%s’."
+msgid "Cannot read avatar URL \"%s\"."
 msgstr ""
 
-#: actions/userauthorization.php:355
+#. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
+#. TRANS: %s is an avatar URL.
+#: actions/userauthorization.php:363
 #, php-format
-msgid "Wrong image type for avatar URL ‘%s’."
+msgid "Wrong image type for avatar URL \"%s\"."
 msgstr ""
 
 #. TRANS: Page title for profile design page.
-#: actions/userdesignsettings.php:74 lib/designsettings.php:63
+#: actions/userdesignsettings.php:74 lib/designsettings.php:61
 msgid "Profile design"
 msgstr ""
 
 #. TRANS: Instructions for profile design page.
-#: actions/userdesignsettings.php:84 lib/designsettings.php:74
+#: actions/userdesignsettings.php:84 lib/designsettings.php:72
 msgid ""
 "Customize the way your profile looks with a background image and a colour "
 "palette of your choice."
 msgstr ""
 
-#: actions/userdesignsettings.php:272
+#: actions/userdesignsettings.php:289
 msgid "Enjoy your hotdog!"
 msgstr ""
 
+#: actions/userdesignsettings.php:325
+#, fuzzy
+msgid "Design settings"
+msgstr "Mentsük el a webhely beállításait"
+
+#: actions/userdesignsettings.php:340
+msgid "View profile designs"
+msgstr ""
+
+#: actions/userdesignsettings.php:341
+msgid "Show or hide profile designs."
+msgstr ""
+
+#: actions/userdesignsettings.php:348
+#, fuzzy
+msgid "Background file"
+msgstr "Háttér"
+
 #. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number.
 #: actions/usergroups.php:66
 #, php-format
@@ -6528,6 +6695,11 @@ msgstr ""
 msgid "Contributors"
 msgstr "Közreműködők"
 
+#. TRANS: Menu item for site administration
+#: actions/version.php:167 lib/adminpanelaction.php:403
+msgid "License"
+msgstr "Licenc"
+
 #: actions/version.php:170
 msgid ""
 "StatusNet is free software: you can redistribute it and/or modify it under "
@@ -6551,12 +6723,13 @@ msgid ""
 "along with this program.  If not, see %s."
 msgstr ""
 
-#: actions/version.php:191
-msgid "Plugins"
-msgstr ""
+#. TRANS: Form input field label for application name.
+#: actions/version.php:197 lib/applicationeditform.php:190
+msgid "Name"
+msgstr "Név"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:901
+#: actions/version.php:198 lib/action.php:885
 msgid "Version"
 msgstr ""
 
@@ -6564,6 +6737,12 @@ msgstr ""
 msgid "Author(s)"
 msgstr "Szerző(k)"
 
+#. TRANS: Form input field label.
+#: actions/version.php:200 lib/applicationeditform.php:208
+#: lib/groupeditform.php:168
+msgid "Description"
+msgstr "Leírás"
+
 #. TRANS: Activity title when marking a notice as favorite.
 #: classes/Fave.php:164
 msgid "Favor"
@@ -6678,7 +6857,7 @@ msgid "Could not create login token for %s"
 msgstr ""
 
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
-#: classes/Memcached_DataObject.php:542
+#: classes/Memcached_DataObject.php:556
 msgid "No database name or DSN found anywhere."
 msgstr ""
 
@@ -6848,18 +7027,18 @@ msgstr "%1$s feliratkozott a híreidre a %2$s webhelyen."
 
 #. TRANS: Notice given on user registration.
 #. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:395
+#: classes/User.php:390
 #, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr ""
 
 #. TRANS: Server exception.
-#: classes/User.php:918
+#: classes/User.php:923
 msgid "No single user defined for single-user mode."
 msgstr ""
 
 #. TRANS: Server exception.
-#: classes/User.php:922
+#: classes/User.php:927
 msgid "Single-user mode code called when not enabled."
 msgstr ""
 
@@ -6904,41 +7083,6 @@ msgstr ""
 msgid "No AtomPub API service for %s."
 msgstr ""
 
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:104
-msgid "Change your profile settings"
-msgstr ""
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:111
-msgid "Upload an avatar"
-msgstr "Avatar feltöltése"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:118
-msgid "Change your password"
-msgstr "Változtasd meg a jelszavad"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:125
-msgid "Change email handling"
-msgstr "Email kezelés megváltoztatása"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:132
-msgid "Design your profile"
-msgstr ""
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:139
-msgid "Other options"
-msgstr "További opciók"
-
-#. TRANS: Link description in user account settings menu.
-#: lib/accountsettingsaction.php:141
-msgid "Other"
-msgstr "Más egyéb"
-
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
 #: lib/action.php:161
 #, php-format
@@ -6956,206 +7100,128 @@ msgctxt "TOOLTIP"
 msgid "Show more"
 msgstr ""
 
-#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:544
-msgid "Primary site navigation"
-msgstr "Elsődleges navigáció"
+#. TRANS: Inline reply form submit button: submits a reply comment.
+#: lib/action.php:328
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Comment"
+msgstr "Tartalom"
 
-#. TRANS: Tooltip for main menu option "Personal".
-#: lib/action.php:550
-msgctxt "TOOLTIP"
-msgid "Personal profile and friends timeline"
+#. TRANS: Placeholder text for inline reply form. Clicking in this box will turn it into a mini notice form.
+#: lib/action.php:331
+msgid "Add a comment..."
 msgstr ""
 
-#. TRANS: Main menu option when logged in for access to personal profile and friends timeline.
-#. TRANS: Personal group navigation menu option when logged in for viewing timeline of self and friends.
-#: lib/action.php:553 lib/personalgroupnav.php:100
-msgctxt "MENU"
-msgid "Personal"
-msgstr ""
+#: lib/action.php:559 lib/personalgroupnav.php:99
+#, fuzzy
+msgid "Home"
+msgstr "Honlap"
 
-#. TRANS: Tooltip for main menu option "Account".
-#: lib/action.php:555
-msgctxt "TOOLTIP"
-msgid "Change your email, avatar, password, profile"
-msgstr ""
-
-#. TRANS: Main menu option when logged in for access to user settings.
-#: lib/action.php:558
-msgid "Account"
-msgstr "Kontó"
-
-#. TRANS: Tooltip for main menu option "Services".
 #: lib/action.php:560
-msgctxt "TOOLTIP"
-msgid "Connect to services"
-msgstr ""
+#, fuzzy
+msgid "Friends timeline"
+msgstr "%s története"
 
-#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services.
-#: lib/action.php:563
-msgid "Connect"
-msgstr "Kapcsolódás"
-
-#. TRANS: Tooltip for menu option "Admin".
 #: lib/action.php:566
-msgctxt "TOOLTIP"
-msgid "Change site configuration"
+#, fuzzy
+msgid "Your profile"
+msgstr "Csoportprofil"
+
+#: lib/action.php:570 lib/action.php:593 lib/publicgroupnav.php:78
+msgid "Public"
 msgstr ""
 
-#. TRANS: Main menu option when logged in and site admin for access to site configuration.
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/action.php:569 lib/groupnav.php:117
-msgctxt "MENU"
-msgid "Admin"
-msgstr ""
+#: lib/action.php:571 lib/action.php:594
+#, fuzzy
+msgid "Everyone on this site"
+msgstr "Emberek keresése az oldalon"
 
-#. TRANS: Tooltip for main menu option "Invite".
-#: lib/action.php:573
-#, php-format
-msgctxt "TOOLTIP"
-msgid "Invite friends and colleagues to join you on %s"
-msgstr ""
+#: lib/action.php:575
+#, fuzzy
+msgid "Settings"
+msgstr "SMS beállítások"
 
-#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users.
 #: lib/action.php:576
-msgctxt "MENU"
-msgid "Invite"
-msgstr ""
+#, fuzzy
+msgid "Change your personal settings"
+msgstr "Változtasd meg a jelszavad"
 
-#. TRANS: Tooltip for main menu option "Logout"
 #: lib/action.php:582
-msgctxt "TOOLTIP"
-msgid "Logout from the site"
-msgstr ""
+#, fuzzy
+msgid "Site configuration"
+msgstr "A felhasználók beállításai"
 
-#. TRANS: Main menu option when logged in to log out the current user.
-#: lib/action.php:585
-msgctxt "MENU"
+#: lib/action.php:587
+#, fuzzy
 msgid "Logout"
-msgstr ""
+msgstr "Logó frissítve."
 
-#. TRANS: Tooltip for main menu option "Register".
-#: lib/action.php:590
-msgctxt "TOOLTIP"
-msgid "Create an account"
-msgstr ""
+#: lib/action.php:588
+#, fuzzy
+msgid "Logout from the site"
+msgstr "A webhely témája."
 
-#. TRANS: Main menu option when not logged in to register a new account.
-#. TRANS: Menu item for registering with the StatusNet site.
-#: lib/action.php:593 lib/logingroupnav.php:85
-msgctxt "MENU"
-msgid "Register"
-msgstr ""
-
-#. TRANS: Tooltip for main menu option "Login".
-#: lib/action.php:596
-msgctxt "TOOLTIP"
+#: lib/action.php:599
+#, fuzzy
 msgid "Login to the site"
-msgstr ""
+msgstr "Bejelentkezés az oldalra"
 
-#. TRANS: Main menu option when not logged in to log in.
-#. TRANS: Menu item for logging in to the StatusNet site.
-#: lib/action.php:599 lib/logingroupnav.php:77
-msgctxt "MENU"
-msgid "Login"
-msgstr ""
-
-#. TRANS: Tooltip for main menu option "Help".
-#: lib/action.php:602
-msgctxt "TOOLTIP"
-msgid "Help me!"
-msgstr ""
-
-#. TRANS: Main menu option for help on the StatusNet site.
-#: lib/action.php:605
-msgctxt "MENU"
-msgid "Help"
-msgstr ""
-
-#. TRANS: Tooltip for main menu option "Search".
-#: lib/action.php:608
-msgctxt "TOOLTIP"
-msgid "Search for people or text"
-msgstr ""
-
-#. TRANS: Main menu option when logged in or when the StatusNet instance is not private.
-#: lib/action.php:611
-msgctxt "MENU"
+#: lib/action.php:606
+#, fuzzy
 msgid "Search"
-msgstr ""
+msgstr "Emberek keresése"
 
-#. TRANS: DT element for site notice. String is hidden in default CSS.
-#. TRANS: Menu item for site administration
-#: lib/action.php:633 lib/adminpanelaction.php:387
-msgid "Site notice"
-msgstr "A webhely híre"
-
-#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:700
-msgid "Local views"
-msgstr ""
-
-#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:770
-msgid "Page notice"
-msgstr ""
-
-#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:874
-msgid "Secondary site navigation"
-msgstr "Másodlagos navigáció"
+#: lib/action.php:607
+#, fuzzy
+msgid "Search the site"
+msgstr "A webhely témája."
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:880
+#: lib/action.php:864
 msgid "Help"
 msgstr "Súgó"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:883
+#: lib/action.php:867
 msgid "About"
 msgstr "Névjegy"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:886
+#: lib/action.php:870
 msgid "FAQ"
 msgstr "GyIK"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:891
+#: lib/action.php:875
 msgid "TOS"
 msgstr "Felhasználási feltételek"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:895
+#: lib/action.php:879
 msgid "Privacy"
 msgstr ""
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:898
+#: lib/action.php:882
 msgid "Source"
 msgstr "Forrás"
 
 #. TRANS: Secondary navigation menu option leading to e-mail contact information on the
 #. TRANS: StatusNet site, where to report bugs, ...
-#: lib/action.php:905
+#: lib/action.php:889
 msgid "Contact"
 msgstr "Kapcsolat"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:908
+#: lib/action.php:892
 msgid "Badge"
 msgstr ""
 
-#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:937
-msgid "StatusNet software license"
-msgstr "A StatusNet szoftver licence"
-
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:944
+#: lib/action.php:921
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7163,7 +7229,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:947
+#: lib/action.php:924
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr ""
@@ -7172,7 +7238,7 @@ msgstr ""
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:954
+#: lib/action.php:931
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7180,51 +7246,41 @@ msgid ""
 "org/licensing/licenses/agpl-3.0.html)."
 msgstr ""
 
-#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:970
-msgid "Site content license"
-msgstr "A webhely tartalmára vonatkozó licenc"
-
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:977
+#: lib/action.php:949
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:984
+#: lib/action.php:956
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:988
+#: lib/action.php:960
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:1020
+#: lib/action.php:992
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
 
-#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1356
-msgid "Pagination"
-msgstr ""
-
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1367
+#: lib/action.php:1335
 msgid "After"
 msgstr "Utána"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1377
+#: lib/action.php:1345
 msgid "Before"
 msgstr "Előtte"
 
@@ -7378,7 +7434,7 @@ msgid "User configuration"
 msgstr "A felhasználók beállításai"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:122
+#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:110
 msgid "User"
 msgstr "Felhasználó"
 
@@ -7402,6 +7458,11 @@ msgstr "Munkamenetek beállításai"
 msgid "Edit site notice"
 msgstr ""
 
+#. TRANS: Menu item for site administration
+#: lib/adminpanelaction.php:387
+msgid "Site notice"
+msgstr "A webhely híre"
+
 #. TRANS: Menu item title/tooltip
 #: lib/adminpanelaction.php:393
 msgid "Snapshots configuration"
@@ -7412,6 +7473,12 @@ msgstr ""
 msgid "Set site license"
 msgstr ""
 
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:409
+#, fuzzy
+msgid "Plugins configuration"
+msgstr "Az útvonalak beállításai"
+
 #. TRANS: Client error 401.
 #: lib/apiauth.php:111
 msgid "API resource requires read-write access, but you only have read access."
@@ -7422,19 +7489,23 @@ msgstr ""
 msgid "No application for that consumer key."
 msgstr ""
 
+#: lib/apiauth.php:202 lib/apiauth.php:284
+msgid "Not allowed to use API."
+msgstr ""
+
 #. TRANS: OAuth exception given when an incorrect access token was given for a user.
-#: lib/apiauth.php:219
+#: lib/apiauth.php:225
 msgid "Bad access token."
 msgstr ""
 
 #. TRANS: OAuth exception given when no user was found for a given token (no token was found).
-#: lib/apiauth.php:224
+#: lib/apiauth.php:230
 msgid "No user for that token."
 msgstr ""
 
 #. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel".
 #. TRANS: Client error thrown when authentication fails.
-#: lib/apiauth.php:266 lib/apiauth.php:293
+#: lib/apiauth.php:272 lib/apiauth.php:302
 msgid "Could not authenticate you."
 msgstr ""
 
@@ -7480,6 +7551,11 @@ msgstr ""
 msgid "Failed to delete revoked token."
 msgstr ""
 
+#. TRANS: Form input field label for application icon.
+#: lib/applicationeditform.php:177
+msgid "Icon"
+msgstr "Ikon"
+
 #. TRANS: Form guide.
 #: lib/applicationeditform.php:182
 msgid "Icon for this application"
@@ -7514,6 +7590,11 @@ msgstr ""
 msgid "Organization responsible for this application"
 msgstr ""
 
+#. TRANS: Form input field label.
+#: lib/applicationeditform.php:227
+msgid "Organization"
+msgstr "Szervezet"
+
 #. TRANS: Form input field instructions.
 #: lib/applicationeditform.php:234
 msgid "URL for the homepage of the organization"
@@ -7602,16 +7683,6 @@ msgstr ""
 msgid "Do not use this method!"
 msgstr "Ne töröljük ezt a hírt"
 
-#. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:293
-msgid "Author"
-msgstr "Szerző"
-
-#. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:307
-msgid "Provider"
-msgstr "Szolgáltató"
-
 #. TRANS: Title.
 #: lib/attachmentnoticesection.php:67
 msgid "Notices where this attachment appears"
@@ -7639,24 +7710,29 @@ msgstr "A jelszó megváltoztatása nem engedélyezett"
 msgid "Block"
 msgstr "Blokkolás"
 
+#. TRANS: Description of the form to block a user.
+#: lib/blockform.php:79
+msgid "Block this user"
+msgstr "Felhasználó blokkolása"
+
 #. TRANS: Title for command results.
-#: lib/channel.php:160 lib/channel.php:181
+#: lib/channel.php:104 lib/channel.php:125
 msgid "Command results"
 msgstr ""
 
 #. TRANS: Title for command results.
-#: lib/channel.php:194
+#: lib/channel.php:138
 #, fuzzy
 msgid "AJAX error"
 msgstr "Ajax-hiba"
 
 #. TRANS: E-mail subject when a command has completed.
-#: lib/channel.php:233 lib/mailhandler.php:143
+#: lib/channel.php:177 lib/mailhandler.php:143
 msgid "Command complete"
 msgstr ""
 
 #. TRANS: E-mail subject when a command has failed.
-#: lib/channel.php:244
+#: lib/channel.php:188
 msgid "Command failed"
 msgstr ""
 
@@ -7759,7 +7835,7 @@ msgstr "Teljes név: %s"
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a location.
-#: lib/command.php:446 lib/mail.php:270
+#: lib/command.php:446 lib/mail.php:275
 #, php-format
 msgid "Location: %s"
 msgstr "Helyszín: %s"
@@ -7767,7 +7843,7 @@ msgstr "Helyszín: %s"
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a homepage.
-#: lib/command.php:450 lib/mail.php:274
+#: lib/command.php:450 lib/mail.php:279
 #, php-format
 msgid "Homepage: %s"
 msgstr "Honlap: %s"
@@ -7997,112 +8073,103 @@ msgid ""
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:162
+#: lib/common.php:36
 #, fuzzy
 msgid "No configuration file found."
 msgstr "Nem találtunk konfigurációs fájlt. "
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:165
+#: lib/common.php:39
 #, fuzzy
 msgid "I looked for configuration files in the following places:"
 msgstr "A következő helyeken kerestem konfigurációs fájlokat: "
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:168
+#: lib/common.php:42
 msgid "You may wish to run the installer to fix this."
 msgstr "A telepítő futtatása kijavíthatja ezt."
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:172
+#: lib/common.php:46
 msgid "Go to the installer."
 msgstr "Menj a telepítőhöz."
 
-#. TRANS: Menu item for Instant Messaging settings.
-#: lib/connectsettingsaction.php:106
-msgctxt "MENU"
-msgid "IM"
-msgstr ""
-
-#. TRANS: Tooltip for Instant Messaging menu item.
-#: lib/connectsettingsaction.php:108
-msgid "Updates by instant messenger (IM)"
-msgstr ""
-
-#. TRANS: Menu item for Short Message Service settings.
-#: lib/connectsettingsaction.php:113
-#, fuzzy
-msgctxt "MENU"
-msgid "SMS"
-msgstr "SMS"
-
-#. TRANS: Tooltip for Short Message Service menu item.
-#: lib/connectsettingsaction.php:115
-msgid "Updates by SMS"
-msgstr ""
-
-#. TRANS: Menu item for OuAth connection settings.
-#: lib/connectsettingsaction.php:120
-#, fuzzy
-msgctxt "MENU"
-msgid "Connections"
-msgstr "Kapcsolatok"
-
-#. TRANS: Tooltip for connected applications (Connections through OAuth) menu item.
-#: lib/connectsettingsaction.php:122
-msgid "Authorized connected applications"
-msgstr ""
-
 #: lib/dberroraction.php:59
 msgid "Database error"
 msgstr "Adatbázishiba"
 
+#. TRANS: Description of form for deleting a user.
+#: lib/deleteuserform.php:75
+msgid "Delete this user"
+msgstr "Töröljük ezt a felhasználót"
+
+#: lib/designform.php:114
+#, fuzzy
+msgid "Change design"
+msgstr "Design mentése"
+
+#. TRANS: Fieldset legend on profile design page to change profile page colours.
+#: lib/designform.php:131
+msgid "Change colours"
+msgstr "Színek megváltoztatása"
+
+#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
+#: lib/designform.php:138
+msgid "Use defaults"
+msgstr "Alapértelmezések használata"
+
+#. TRANS: Title for button on profile design page to reset all colour settings to default.
+#: lib/designform.php:140
+msgid "Restore default designs"
+msgstr ""
+
+#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
+#: lib/designform.php:148
+msgid "Reset back to default"
+msgstr "Visszaállítás az alapértelmezettre"
+
 #. TRANS: Label in form on profile design page.
 #. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
-#: lib/designsettings.php:108
+#: lib/designform.php:158
 msgid "Upload file"
 msgstr "Fájl feltöltése"
 
 #. TRANS: Instructions for form on profile design page.
-#: lib/designsettings.php:113
+#: lib/designform.php:163
+#, fuzzy
 msgid ""
-"You can upload your personal background image. The maximum file size is 2MB."
-msgstr ""
+"You can upload your personal background image. The maximum file size is 2Mb."
+msgstr "Feltöltheted a személyes avatarodat. A fájl maximális mérete %s lehet."
 
 #. TRANS: Radio button on profile design page that will enable use of the uploaded profile image.
-#: lib/designsettings.php:139
+#: lib/designform.php:194
 #, fuzzy
 msgctxt "RADIO"
 msgid "On"
 msgstr "Be"
 
 #. TRANS: Radio button on profile design page that will disable use of the uploaded profile image.
-#: lib/designsettings.php:156
+#: lib/designform.php:211
 #, fuzzy
 msgctxt "RADIO"
 msgid "Off"
 msgstr "Ki"
 
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: lib/designsettings.php:175
-msgid "Change colours"
-msgstr "Színek megváltoztatása"
-
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: lib/designsettings.php:257
-msgid "Use defaults"
-msgstr "Alapértelmezések használata"
+#. TRANS: Title for button on profile design page to save settings.
+#: lib/designform.php:322
+msgid "Save design"
+msgstr "Design mentése"
 
 #. TRANS: Error message displayed if design settings could not be saved.
 #. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
-#: lib/designsettings.php:405 lib/designsettings.php:427
+#: lib/designsettings.php:216 lib/designsettings.php:238
 msgid "Couldn't update your design."
 msgstr "Nem sikerült frissíteni a designt."
 
 #. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
-#: lib/designsettings.php:433
+#: lib/designsettings.php:244
 msgid "Design defaults restored."
 msgstr ""
 
@@ -8172,27 +8239,23 @@ msgstr ""
 msgid "Feeds"
 msgstr ""
 
-#: lib/galleryaction.php:121
-msgid "Filter tags"
-msgstr "Szűrjük a címkéket"
-
-#: lib/galleryaction.php:131
+#: lib/galleryaction.php:128
 msgid "All"
 msgstr "Összes"
 
-#: lib/galleryaction.php:139
+#: lib/galleryaction.php:136
 msgid "Select tag to filter"
 msgstr "Válassz egy címkét amire szűrjünk"
 
-#: lib/galleryaction.php:140
+#: lib/galleryaction.php:137
 msgid "Tag"
 msgstr "Címke"
 
-#: lib/galleryaction.php:141
+#: lib/galleryaction.php:138
 msgid "Choose a tag to narrow list"
 msgstr "Válassz egy címkét hogy szűkítsük a listát"
 
-#: lib/galleryaction.php:143
+#: lib/galleryaction.php:140
 msgid "Go"
 msgstr "Menjünk"
 
@@ -8286,6 +8349,12 @@ msgctxt "TOOLTIP"
 msgid "%s blocked users"
 msgstr ""
 
+#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
+#: lib/groupnav.php:117
+msgctxt "MENU"
+msgid "Admin"
+msgstr ""
+
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
 #: lib/groupnav.php:120
@@ -8395,39 +8464,61 @@ msgid_plural "%dB"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/jabber.php:387
+#: lib/implugin.php:262
 #, php-format
-msgid "[%s]"
-msgstr "[%s]"
+msgid ""
+"User \"%s\" on %s has said that your %s screenname belongs to them. If "
+"that's true, you can confirm by clicking on this URL: %s . (If you cannot "
+"click it, copy-and-paste it into the address bar of your browser). If that "
+"user isn't you, or if you didn't request this confirmation, just ignore this "
+"message."
+msgstr ""
 
-#: lib/jabber.php:567
+#: lib/implugin.php:349
 #, php-format
 msgid "Unknown inbox source %d."
 msgstr ""
 
+#: lib/implugin.php:485
+#, fuzzy, php-format
+msgid "Message too long - maximum is %1$d characters, you sent %2$d."
+msgstr "Az túl hosszú. Egy hír legfeljebb %d karakterből állhat."
+
 #: lib/leaveform.php:114
 msgid "Leave"
 msgstr "Távozzunk"
 
+#. TRANS: Menu item for logging in to the StatusNet site.
+#: lib/logingroupnav.php:77
+msgctxt "MENU"
+msgid "Login"
+msgstr ""
+
 #. TRANS: Title for menu item for logging in to the StatusNet site.
 #: lib/logingroupnav.php:79
 msgid "Login with a username and password"
 msgstr "Bejelentkezés felhasználónévvel és jelszóval"
 
+#. TRANS: Menu item for registering with the StatusNet site.
+#: lib/logingroupnav.php:85
+msgctxt "MENU"
+msgid "Register"
+msgstr ""
+
 #. TRANS: Title for menu item for registering with the StatusNet site.
 #: lib/logingroupnav.php:87
 msgid "Sign up for a new account"
 msgstr "Új kontó igénylése"
 
 #. TRANS: Subject for address confirmation email.
-#: lib/mail.php:168
+#: lib/mail.php:172
 msgid "Email address confirmation"
 msgstr "E-mail cím megerősítése"
 
 #. TRANS: Body for address confirmation email.
 #. TRANS: %1$s is the addressed user's nickname, %2$s is the StatusNet sitename,
 #. TRANS: %3$s is the URL to confirm at.
-#: lib/mail.php:173
+#: lib/mail.php:177
 #, fuzzy, php-format
 msgid ""
 "Hey, %1$s.\n"
@@ -8459,14 +8550,14 @@ msgstr ""
 
 #. TRANS: Subject of new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
-#: lib/mail.php:238
+#: lib/mail.php:243
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1$s feliratkozott a híreidre a %2$s webhelyen."
 
 #. TRANS: This is a paragraph in a new-subscriber e-mail.
 #. TRANS: %s is a URL where the subscriber can be reported as abusive.
-#: lib/mail.php:245
+#: lib/mail.php:250
 #, php-format
 msgid ""
 "If you believe this account is being used abusively, you can block them from "
@@ -8478,7 +8569,7 @@ msgstr ""
 #. TRANS: %3$s is the subscriber's profile URL, %4$s is the subscriber's location (or empty)
 #. TRANS: %5$s is the subscriber's homepage URL (or empty), %6%s is the subscriber's bio (or empty)
 #. TRANS: %7$s is a link to the addressed user's e-mail settings.
-#: lib/mail.php:255
+#: lib/mail.php:260
 #, fuzzy, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -8506,14 +8597,14 @@ msgstr ""
 
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is biographical information.
-#: lib/mail.php:278
+#: lib/mail.php:283
 #, php-format
 msgid "Bio: %s"
 msgstr "Bemutatkozás: %s"
 
 #. TRANS: Subject of notification mail for new posting email address.
 #. TRANS: %s is the StatusNet sitename.
-#: lib/mail.php:307
+#: lib/mail.php:312
 #, php-format
 msgid "New email address for posting to %s"
 msgstr ""
@@ -8521,7 +8612,7 @@ msgstr ""
 #. TRANS: Body of notification mail for new posting email address.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is the e-mail address to send
 #. TRANS: to to post by e-mail, %3$s is a URL to more instructions.
-#: lib/mail.php:313
+#: lib/mail.php:318
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -8536,26 +8627,26 @@ msgstr ""
 
 #. TRANS: Subject line for SMS-by-email notification messages.
 #. TRANS: %s is the posting user's nickname.
-#: lib/mail.php:434
+#: lib/mail.php:439
 #, php-format
 msgid "%s status"
 msgstr "%s állapota"
 
 #. TRANS: Subject line for SMS-by-email address confirmation message.
-#: lib/mail.php:460
+#: lib/mail.php:465
 msgid "SMS confirmation"
 msgstr "SMS megerősítés"
 
 #. TRANS: Main body heading for SMS-by-email address confirmation message.
 #. TRANS: %s is the addressed user's nickname.
-#: lib/mail.php:464
+#: lib/mail.php:469
 #, php-format
 msgid "%s: confirm you own this phone number with this code:"
 msgstr ""
 
 #. TRANS: Subject for 'nudge' notification email.
 #. TRANS: %s is the nudging user.
-#: lib/mail.php:485
+#: lib/mail.php:490
 #, fuzzy, php-format
 msgid "You have been nudged by %s"
 msgstr "%s megbökött téged."
@@ -8563,7 +8654,7 @@ msgstr "%s megbökött téged."
 #. TRANS: Body for 'nudge' notification email.
 #. TRANS: %1$s is the nuding user's long name, $2$s is the nudging user's nickname,
 #. TRANS: %3$s is a URL to post notices at, %4$s is the StatusNet sitename.
-#: lib/mail.php:492
+#: lib/mail.php:497
 #, php-format
 msgid ""
 "%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -8592,7 +8683,7 @@ msgstr ""
 
 #. TRANS: Subject for direct-message notification email.
 #. TRANS: %s is the sending user's nickname.
-#: lib/mail.php:539
+#: lib/mail.php:544
 #, php-format
 msgid "New private message from %s"
 msgstr "Új privát üzenetet küldött neked %s"
@@ -8601,7 +8692,7 @@ msgstr "Új privát üzenetet küldött neked %s"
 #. TRANS: %1$s is the sending user's long name, %2$s is the sending user's nickname,
 #. TRANS: %3$s is the message content, %4$s a URL to the message,
 #. TRANS: %5$s is the StatusNet sitename.
-#: lib/mail.php:547
+#: lib/mail.php:552
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -8636,7 +8727,7 @@ msgstr ""
 
 #. TRANS: Subject for favorite notification e-mail.
 #. TRANS: %1$s is the adding user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:599
+#: lib/mail.php:604
 #, fuzzy, php-format
 msgid "%1$s (@%2$s) added your notice as a favorite"
 msgstr "%s (@%s) az általad küldött hírt hozzáadta a kedvenceihez"
@@ -8646,7 +8737,7 @@ msgstr "%s (@%s) az általad küldött hírt hozzáadta a kedvenceihez"
 #. TRANS: %3$s is a URL to the faved notice, %4$s is the faved notice text,
 #. TRANS: %5$s is a URL to all faves of the adding user, %6$s is the StatusNet sitename,
 #. TRANS: %7$s is the adding user's nickname.
-#: lib/mail.php:606
+#: lib/mail.php:611
 #, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -8684,7 +8775,7 @@ msgstr ""
 "%6$s\n"
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:664
+#: lib/mail.php:669
 #, php-format
 msgid ""
 "The full conversation can be read here:\n"
@@ -8694,7 +8785,7 @@ msgstr ""
 
 #. TRANS: E-mail subject for notice notification.
 #. TRANS: %1$s is the sending user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:672
+#: lib/mail.php:677
 #, fuzzy, php-format
 msgid "%1$s (@%2$s) sent a notice to your attention"
 msgstr "%s (@%s) figyelmedbe ajánlott egy hírt"
@@ -8705,7 +8796,7 @@ msgstr "%s (@%s) figyelmedbe ajánlott egy hírt"
 #. TRANS: %5$s is a URL to the full conversion if it exists (otherwise empty),
 #. TRANS: %6$s is a URL to reply to the notice, %7$s is a URL to all @-replied for the addressed user,
 #. TRANS: %8$s is a URL to the addressed user's e-mail settings, %9$s is the sender's nickname.
-#: lib/mail.php:680
+#: lib/mail.php:685
 #, php-format
 msgid ""
 "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -8825,11 +8916,7 @@ msgstr "Nem követed figyelemmel!"
 msgid "To"
 msgstr "Címzett"
 
-#: lib/messageform.php:166 lib/noticeform.php:186
-msgid "Available characters"
-msgstr "Használható karakterek"
-
-#: lib/messageform.php:185 lib/noticeform.php:237
+#: lib/messageform.php:184 lib/noticeform.php:236
 msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr ""
@@ -8839,15 +8926,10 @@ msgstr ""
 msgid "Messages"
 msgstr "Üzenet"
 
-#: lib/messagelistitem.php:123 lib/noticelist.php:522
+#: lib/messagelistitem.php:123 lib/noticelist.php:527
 msgid "from"
 msgstr "írta"
 
-#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:165
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr "A becenév csak kisbetűket és számokat tartalmazhat, szóközök nélkül."
-
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 #: lib/nickname.php:178
 msgid "Nickname cannot be empty."
@@ -8870,78 +8952,82 @@ msgstr "Küldjünk egy hírt"
 msgid "What's up, %s?"
 msgstr "Mi hír, %s?"
 
-#: lib/noticeform.php:194
+#: lib/noticeform.php:193
 msgid "Attach"
 msgstr "Csatolás"
 
-#: lib/noticeform.php:198
+#: lib/noticeform.php:197
 msgid "Attach a file"
 msgstr "Csatoljunk egy állományt"
 
-#: lib/noticeform.php:213
+#: lib/noticeform.php:212
 msgid "Share my location"
 msgstr "Tegyük közzé a hollétemet"
 
-#: lib/noticeform.php:216
+#: lib/noticeform.php:215
 msgid "Do not share my location"
 msgstr "Ne tegyük közzé a hollétemet"
 
-#: lib/noticeform.php:217
+#: lib/noticeform.php:216
 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
 "try again later"
 msgstr ""
 
 #. TRANS: Used in coordinates as abbreviation of north
-#: lib/noticelist.php:452
+#: lib/noticelist.php:457
 msgid "N"
 msgstr "É"
 
 #. TRANS: Used in coordinates as abbreviation of south
-#: lib/noticelist.php:454
+#: lib/noticelist.php:459
 msgid "S"
 msgstr "D"
 
 #. TRANS: Used in coordinates as abbreviation of east
-#: lib/noticelist.php:456
+#: lib/noticelist.php:461
 msgid "E"
 msgstr "K"
 
 #. TRANS: Used in coordinates as abbreviation of west
-#: lib/noticelist.php:458
+#: lib/noticelist.php:463
 msgid "W"
 msgstr "Ny"
 
-#: lib/noticelist.php:460
+#: lib/noticelist.php:465
 #, php-format
 msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgstr ""
 
-#: lib/noticelist.php:469
+#: lib/noticelist.php:474
 msgid "at"
 msgstr ""
 
-#: lib/noticelist.php:518
+#: lib/noticelist.php:523
 msgid "web"
 msgstr ""
 
-#: lib/noticelist.php:584
+#: lib/noticelist.php:589
 msgid "in context"
 msgstr "előzmény"
 
-#: lib/noticelist.php:619
+#: lib/noticelist.php:624
 msgid "Repeated by"
 msgstr "Megismételte:"
 
-#: lib/noticelist.php:646
+#: lib/noticelist.php:651
 msgid "Reply to this notice"
 msgstr "Válaszoljunk erre a hírre"
 
-#: lib/noticelist.php:647
+#: lib/noticelist.php:652
 msgid "Reply"
 msgstr "Válasz"
 
-#: lib/noticelist.php:691
+#: lib/noticelist.php:678
+msgid "Delete this notice"
+msgstr "Töröljük ezt a hírt"
+
+#: lib/noticelist.php:696
 msgid "Notice repeated"
 msgstr "A hírt megismételtük"
 
@@ -8978,48 +9064,31 @@ msgstr ""
 msgid "Couldn't insert new subscription."
 msgstr ""
 
-#. TRANS: Personal group navigation menu option when logged in for viewing @-replies.
-#: lib/personalgroupnav.php:107
+#: lib/personalgroupnav.php:104
 #, fuzzy
-msgctxt "MENU"
 msgid "Replies"
 msgstr "Válaszok"
 
-#. TRANS: Personal group navigation menu option when logged in for seeing own profile.
-#: lib/personalgroupnav.php:114
+#: lib/personalgroupnav.php:109
 #, fuzzy
-msgctxt "MENU"
-msgid "Profile"
-msgstr "Profil"
-
-#. TRANS: Personal group navigation menu option when logged in for viewing own favourited notices.
-#: lib/personalgroupnav.php:120
-#, fuzzy
-msgctxt "MENU"
 msgid "Favorites"
 msgstr "Kedvencek"
 
-#. TRANS: Personal group navigation menu option when logged in for viewing recieved personal messages.
-#: lib/personalgroupnav.php:133
+#: lib/personalgroupnav.php:120
 #, fuzzy
-msgctxt "MENU"
 msgid "Inbox"
 msgstr "Homokozó"
 
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing recieved personal messages.
-#: lib/personalgroupnav.php:135
+#: lib/personalgroupnav.php:121
 msgid "Your incoming messages"
 msgstr "A bejövő üzeneteid"
 
-#. TRANS: Personal group navigation menu option when logged in for viewing senet personal messages.
-#: lib/personalgroupnav.php:140
+#: lib/personalgroupnav.php:125
 #, fuzzy
-msgctxt "MENU"
 msgid "Outbox"
 msgstr "%s kimenő postafiókja"
 
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing senet personal messages.
-#: lib/personalgroupnav.php:142
+#: lib/personalgroupnav.php:126
 msgid "Your sent messages"
 msgstr "A küldött üzeneteid"
 
@@ -9034,9 +9103,26 @@ msgstr "Címkék %s híreiben"
 msgid "Unknown"
 msgstr ""
 
+#. TRANS: Plugin admin panel controls
+#: lib/plugindisableform.php:90
+msgctxt "plugin"
+msgid "Disable"
+msgstr ""
+
+#. TRANS: Plugin admin panel controls
+#: lib/pluginenableform.php:112
+msgctxt "plugin"
+msgid "Enable"
+msgstr ""
+
+#: lib/pluginlist.php:196
+msgctxt "plugin-description"
+msgid "(Plugin descriptions unavailable when disabled.)"
+msgstr ""
+
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:82
+#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:88
 msgid "Subscriptions"
 msgstr "Feliratkozások"
 
@@ -9047,7 +9133,7 @@ msgstr "Összes feliratkozás"
 
 #. TRANS: H2 text for user subscriber statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:90
+#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:96
 msgid "Subscribers"
 msgstr "Feliratkozók"
 
@@ -9069,7 +9155,7 @@ msgstr "Tagság kezdete:"
 #. TRANS: Label for user statistics.
 #. TRANS: H2 text for user group membership statistics.
 #: lib/profileaction.php:239 lib/profileaction.php:290
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:104
 msgid "Groups"
 msgstr "Csoportok"
 
@@ -9089,10 +9175,6 @@ msgstr "Összes csoport"
 msgid "Unimplemented method."
 msgstr ""
 
-#: lib/publicgroupnav.php:78
-msgid "Public"
-msgstr ""
-
 #: lib/publicgroupnav.php:82
 msgid "User groups"
 msgstr "A felhasználó csoportjai"
@@ -9131,7 +9213,7 @@ msgid "Revoke the \"%s\" role from this user"
 msgstr ""
 
 #. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:974
+#: lib/router.php:1001
 #, fuzzy
 msgid "Page not found."
 msgstr "Az API-metódus nem található."
@@ -9161,11 +9243,6 @@ msgctxt "BUTTON"
 msgid "Search"
 msgstr ""
 
-#. TRANS: Definition list item with instructions on how to get (better) search results.
-#: lib/searchaction.php:170
-msgid "Search help"
-msgstr ""
-
 #: lib/searchgroupnav.php:80
 msgid "People"
 msgstr ""
@@ -9190,6 +9267,51 @@ msgstr "Névtelen szakasz"
 msgid "More..."
 msgstr "Tovább…"
 
+#: lib/settingsnav.php:78
+msgid "Change your profile settings"
+msgstr ""
+
+#: lib/settingsnav.php:83
+msgid "Upload an avatar"
+msgstr "Avatar feltöltése"
+
+#: lib/settingsnav.php:88
+msgid "Change your password"
+msgstr "Változtasd meg a jelszavad"
+
+#: lib/settingsnav.php:93
+msgid "Change email handling"
+msgstr "Email kezelés megváltoztatása"
+
+#: lib/settingsnav.php:98
+msgid "Design your profile"
+msgstr ""
+
+#: lib/settingsnav.php:102
+msgid "URL"
+msgstr "URL-cím"
+
+#: lib/settingsnav.php:103
+msgid "URL shorteners"
+msgstr ""
+
+#: lib/settingsnav.php:111
+msgid "Updates by instant messenger (IM)"
+msgstr ""
+
+#: lib/settingsnav.php:118
+msgid "Updates by SMS"
+msgstr ""
+
+#: lib/settingsnav.php:123
+#, fuzzy
+msgid "Connections"
+msgstr "Kapcsolatok"
+
+#: lib/settingsnav.php:124
+msgid "Authorized connected applications"
+msgstr ""
+
 #: lib/silenceform.php:67
 msgid "Silence"
 msgstr ""
@@ -9198,30 +9320,34 @@ msgstr ""
 msgid "Silence this user"
 msgstr ""
 
-#: lib/subgroupnav.php:83
+#: lib/subgroupnav.php:89
 #, php-format
 msgid "People %s subscribes to"
 msgstr ""
 
-#: lib/subgroupnav.php:91
+#: lib/subgroupnav.php:97
 #, php-format
 msgid "People subscribed to %s"
 msgstr ""
 
-#: lib/subgroupnav.php:99
+#: lib/subgroupnav.php:105
 #, php-format
 msgid "Groups %s is a member of"
 msgstr ""
 
-#: lib/subgroupnav.php:105
+#: lib/subgroupnav.php:111
 msgid "Invite"
 msgstr "Meghívás"
 
-#: lib/subgroupnav.php:106
+#: lib/subgroupnav.php:112
 #, php-format
 msgid "Invite friends and colleagues to join you on %s"
 msgstr ""
 
+#: lib/subscribeform.php:115 lib/subscribeform.php:139
+msgid "Subscribe to this user"
+msgstr ""
+
 #: lib/subscriberspeopleselftagcloudsection.php:48
 #: lib/subscriptionspeopleselftagcloudsection.php:48
 msgid "People Tagcloud as self-tagged"
@@ -9291,6 +9417,13 @@ msgstr ""
 msgid "Error opening theme archive."
 msgstr ""
 
+#: lib/threadednoticelist.php:270
+#, php-format
+msgid "Show all %d comment"
+msgid_plural "Show all %d comments"
+msgstr[0] ""
+msgstr[1] ""
+
 #: lib/topposterssection.php:74
 msgid "Top posters"
 msgstr ""
@@ -9333,76 +9466,80 @@ msgstr ""
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "A felhasználónak nincs profilja."
 
-#. TRANS: Link text for changeing the avatar of the logged in user.
-#: lib/userprofile.php:121
+#: lib/userprofile.php:116
 msgid "Edit Avatar"
 msgstr ""
 
 #. TRANS: H2 for user actions in a profile.
 #. TRANS: H2 for entity actions in a profile.
-#: lib/userprofile.php:245 lib/userprofile.php:261
+#: lib/userprofile.php:216 lib/userprofile.php:232
 msgid "User actions"
 msgstr "Felhasználói műveletek"
 
 #. TRANS: Text shown in user profile of not yet compeltely deleted users.
-#: lib/userprofile.php:249
+#: lib/userprofile.php:220
 msgid "User deletion in progress..."
 msgstr ""
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:277
+#: lib/userprofile.php:248
 msgid "Edit profile settings"
 msgstr ""
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:279
+#: lib/userprofile.php:250
 msgid "Edit"
 msgstr "Szerkesztés"
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:303
+#: lib/userprofile.php:274
 msgid "Send a direct message to this user"
 msgstr ""
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:305
+#: lib/userprofile.php:276
 msgid "Message"
 msgstr "Üzenet"
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:347
+#: lib/userprofile.php:318
 msgid "Moderate"
 msgstr "Moderálás"
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:386
+#: lib/userprofile.php:357
 msgid "User role"
 msgstr "Felhasználói szerepkör"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:389
+#: lib/userprofile.php:360
 msgctxt "role"
 msgid "Administrator"
 msgstr "Adminisztrátor"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:391
+#: lib/userprofile.php:362
 msgctxt "role"
 msgid "Moderator"
 msgstr "Moderátor"
 
+#: lib/util.php:321
+#, fuzzy
+msgid "Not allowed to log in."
+msgstr "Nem vagy bejelentkezve."
+
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1306
+#: lib/util.php:1337
 msgid "a few seconds ago"
 msgstr "pár másodperce"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1309
+#: lib/util.php:1340
 msgid "about a minute ago"
 msgstr "körülbelül egy perce"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1313
+#: lib/util.php:1344
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
@@ -9410,12 +9547,12 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1316
+#: lib/util.php:1347
 msgid "about an hour ago"
 msgstr "körülbelül egy órája"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1320
+#: lib/util.php:1351
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
@@ -9423,12 +9560,12 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1323
+#: lib/util.php:1354
 msgid "about a day ago"
 msgstr "körülbelül egy napja"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1327
+#: lib/util.php:1358
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
@@ -9436,12 +9573,12 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1330
+#: lib/util.php:1361
 msgid "about a month ago"
 msgstr "körülbelül egy hónapja"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1334
+#: lib/util.php:1365
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
@@ -9449,7 +9586,7 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1337
+#: lib/util.php:1368
 msgid "about a year ago"
 msgstr "körülbelül egy éve"
 
@@ -9460,21 +9597,6 @@ msgstr "körülbelül egy éve"
 msgid "%s is not a valid color! Use 3 or 6 hex characters."
 msgstr ""
 
-#. TRANS: %s is the URL to the StatusNet site's Instant Messaging settings.
-#: lib/xmppmanager.php:287
-#, php-format
-msgid "Unknown user. Go to %s to add your address to your account"
-msgstr ""
-
-#. TRANS: Response to XMPP source when it sent too long a message.
-#. TRANS: %1$d the maximum number of allowed characters (used for plural), %2$d is the sent number.
-#: lib/xmppmanager.php:406
-#, fuzzy, php-format
-msgid "Message too long. Maximum is %1$d character, you sent %2$d."
-msgid_plural "Message too long. Maximum is %1$d characters, you sent %2$d."
-msgstr[0] "Az túl hosszú. Egy hír legfeljebb %d karakterből állhat."
-msgstr[1] "Az túl hosszú. Egy hír legfeljebb %d karakterből állhat."
-
 #. TRANS: Exception.
 #: lib/xrd.php:63
 #, fuzzy
@@ -9493,71 +9615,90 @@ msgid "Getting backup from file '%s'."
 msgstr ""
 
 #, fuzzy
-#~ msgid "Block this user."
-#~ msgstr "Felhasználó blokkolása"
+#~ msgid "Could not generate feed for group - %s"
+#~ msgstr "Nem sikerült a csoport frissítése."
 
 #, fuzzy
-#~ msgid "Delete this notice."
-#~ msgstr "Töröljük ezt a hírt"
+#~ msgid "Current confirmed Jabber/Google Talk address."
+#~ msgstr "A jelenleg megerősített e-mail cím."
 
 #, fuzzy
-#~ msgid "Delete this user."
-#~ msgstr "Töröljük ezt a felhasználót"
+#~ msgid "Publish a MicroID for my Jabber/Google Talk address."
+#~ msgstr "MicroID közzététele az e-mail címemhez."
+
+#~ msgid "No Jabber ID."
+#~ msgstr "Nincs Jabber-azonosító."
 
 #, fuzzy
-#~ msgid "Restore default designs."
-#~ msgstr "Alapértelmezések használata"
+#~ msgid "Not a valid Jabber ID."
+#~ msgstr "Érvénytelen Jabber-azonosító"
+
+#~ msgid "That is already your Jabber ID."
+#~ msgstr "Jelenleg is ez a Jabber-azonosítód."
+
+#~ msgid "Other settings"
+#~ msgstr "Egyéb beállítások"
+
+#~ msgid "Tag cloud"
+#~ msgstr "Címkefelhő"
+
+#~ msgid "Jabber"
+#~ msgstr "Jabber"
+
+#~ msgid "Photo"
+#~ msgstr "Fénykép"
+
+#~ msgid "Other options"
+#~ msgstr "További opciók"
+
+#~ msgid "Other"
+#~ msgstr "Más egyéb"
+
+#~ msgid "Primary site navigation"
+#~ msgstr "Elsődleges navigáció"
+
+#~ msgid "Account"
+#~ msgstr "Kontó"
+
+#~ msgid "Connect"
+#~ msgstr "Kapcsolódás"
+
+#~ msgid "Secondary site navigation"
+#~ msgstr "Másodlagos navigáció"
+
+#~ msgid "StatusNet software license"
+#~ msgstr "A StatusNet szoftver licence"
+
+#~ msgid "Site content license"
+#~ msgstr "A webhely tartalmára vonatkozó licenc"
+
+#~ msgid "Author"
+#~ msgstr "Szerző"
+
+#~ msgid "Provider"
+#~ msgstr "Szolgáltató"
 
 #, fuzzy
-#~ msgid "Reset back to default."
-#~ msgstr "Visszaállítás az alapértelmezettre"
+#~ msgctxt "MENU"
+#~ msgid "SMS"
+#~ msgstr "SMS"
+
+#~ msgid "Filter tags"
+#~ msgstr "Szűrjük a címkéket"
+
+#~ msgid "[%s]"
+#~ msgstr "[%s]"
+
+#~ msgid "Available characters"
+#~ msgstr "Használható karakterek"
 
 #, fuzzy
-#~ msgid "Save design."
-#~ msgstr "Design mentése"
+#~ msgctxt "MENU"
+#~ msgid "Profile"
+#~ msgstr "Profil"
 
 #, fuzzy
-#~ msgid "Disfavor favorite."
-#~ msgstr "Kedvenc eltávolítása"
-
-#, fuzzy
-#~ msgid "\"%s\" not found."
-#~ msgstr "Az API-metódus nem található."
-
-#, fuzzy
-#~ msgid "Notice %s not found."
-#~ msgstr "Az API-metódus nem található."
-
-#, fuzzy
-#~ msgid "Attachment %s not found."
-#~ msgstr "A címzett felhasználó nem található."
-
-#, fuzzy
-#~ msgid "Invalid tag: \"%s\"."
-#~ msgstr "Érvénytelen címke: \"%s\""
-
-#, fuzzy
-#~ msgid "%s updates from everyone."
-#~ msgstr "%s-frissítések mindenki számára!"
-
-#, fuzzy
-#~ msgid "Password saved"
-#~ msgstr "Jelszó elmentve."
-
-#, fuzzy
-#~ msgid "Where you are, like \"City, State (or Region), Country\"."
-#~ msgstr "Merre vagy, mint pl. \"Város, Megye, Ország\""
-
-#, fuzzy
-#~ msgid "Subscribe to this user."
-#~ msgstr "Ezen felhasználók híreire már feliratkoztál:"
-
-#, fuzzy
-#~ msgid ""
-#~ "Listenee stream license \"%1$s\" is not compatible with site license \"%2"
-#~ "$s\"."
-#~ msgstr "A hír licence ‘%1$s’ nem kompatibilis a webhely licencével ‘%2$s’."
-
-#, fuzzy
-#~ msgid "Not allowed to log in."
-#~ msgstr "Nem vagy bejelentkezve."
+#~ msgid "Message too long. Maximum is %1$d character, you sent %2$d."
+#~ msgid_plural "Message too long. Maximum is %1$d characters, you sent %2$d."
+#~ msgstr[0] "Az túl hosszú. Egy hír legfeljebb %d karakterből állhat."
+#~ msgstr[1] "Az túl hosszú. Egy hír legfeljebb %d karakterből állhat."
diff --git a/locale/ia/LC_MESSAGES/statusnet.po b/locale/ia/LC_MESSAGES/statusnet.po
index 0cff547124..2bc46254d4 100644
--- a/locale/ia/LC_MESSAGES/statusnet.po
+++ b/locale/ia/LC_MESSAGES/statusnet.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 15:58+0000\n"
-"PO-Revision-Date: 2011-03-03 16:00:51+0000\n"
+"POT-Creation-Date: 2011-03-03 17:23+0000\n"
+"PO-Revision-Date: 2011-03-03 17:26:06+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -76,23 +76,23 @@ msgstr "Salveguardar configurationes de accesso"
 #. TRANS: Tooltip for button to save access settings in site admin panel.
 #. TRANS: Button text for saving theme settings.
 #. TRANS: Button label to save e-mail preferences.
-#. TRANS: Button label to save Instant Messaging preferences.
-#. TRANS: Button text for saving "Other settings" in profile.
+#. TRANS: Button label to save IM preferences.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
 #. TRANS: Button text for saving site notice in admin panel.
 #. TRANS: Button label to save SMS preferences.
 #. TRANS: Save button for settings for a profile in a subscriptions list.
+#. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
 #. TRANS: Button text on profile design page to save settings.
 #: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
-#: actions/emailsettings.php:250 actions/imsettings.php:183
-#: actions/othersettings.php:136 actions/pathsadminpanel.php:512
-#: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
-#: actions/smssettings.php:205 actions/subscriptions.php:259
+#: actions/emailsettings.php:251 actions/imsettings.php:199
+#: actions/pathsadminpanel.php:512 actions/profilesettings.php:198
+#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:204
+#: actions/subscriptions.php:261 actions/urlsettings.php:152
 #: actions/useradminpanel.php:298 lib/applicationeditform.php:355
-#: lib/designsettings.php:270 lib/groupeditform.php:201
+#: lib/designform.php:320 lib/groupeditform.php:201
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Salveguardar"
@@ -131,7 +131,11 @@ msgstr "Pagina non existe."
 #. 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 use "one time password login" without using an existing user.
+#. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
+#. TRANS: Client error displayed trying to find a user by ID for a non-existing ID.
+#. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when calling a profile action without specifying a user.
 #: actions/all.php:80 actions/allrss.php:69
@@ -143,19 +147,19 @@ msgstr "Pagina non existe."
 #: actions/apidirectmessage.php:75 actions/apidirectmessagenew.php:72
 #: actions/apigroupcreate.php:111 actions/apigroupismember.php:89
 #: actions/apigroupjoin.php:98 actions/apigroupleave.php:98
-#: actions/apigrouplist.php:70 actions/apistatusesupdate.php:230
-#: actions/apisubscriptions.php:85 actions/apitimelinefavorites.php:70
-#: actions/apitimelinefriends.php:173 actions/apitimelinehome.php:78
-#: actions/apitimelinementions.php:77 actions/apitimelineuser.php:79
-#: actions/avatarbynickname.php:79 actions/favoritesrss.php:72
-#: actions/foaf.php:42 actions/foaf.php:61 actions/hcard.php:67
-#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
-#: actions/remotesubscribe.php:144 actions/remotesubscribe.php:153
-#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
-#: actions/showfavorites.php:106 actions/userbyid.php:74
-#: actions/usergroups.php:93 actions/userrss.php:40 actions/userxrd.php:59
-#: actions/xrds.php:71 lib/command.php:509 lib/galleryaction.php:59
-#: lib/mailbox.php:80 lib/profileaction.php:77
+#: actions/apigrouplist.php:70 actions/apigroupprofileupdate.php:108
+#: actions/apistatusesupdate.php:230 actions/apisubscriptions.php:85
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:173
+#: actions/apitimelinehome.php:78 actions/apitimelinementions.php:77
+#: actions/apitimelineuser.php:79 actions/avatarbynickname.php:79
+#: actions/favoritesrss.php:72 actions/foaf.php:42 actions/foaf.php:61
+#: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116
+#: actions/otp.php:78 actions/remotesubscribe.php:144
+#: actions/remotesubscribe.php:153 actions/replies.php:73
+#: actions/repliesrss.php:38 actions/rsd.php:113 actions/showfavorites.php:106
+#: actions/userbyid.php:75 actions/usergroups.php:93 actions/userrss.php:40
+#: actions/userxrd.php:59 actions/xrds.php:71 lib/command.php:509
+#: lib/galleryaction.php:59 lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Iste usator non existe."
 
@@ -169,10 +173,9 @@ msgstr "%1$s e amicos, pagina %2$d"
 #. TRANS: H1 text for page. %s is a user nickname.
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Timeline title for user and friends. %s is a user nickname.
-#. TRANS: Tooltop for personal group navigation menu option when logged in for viewing timeline of self and friends.
 #: actions/all.php:94 actions/all.php:191 actions/allrss.php:117
 #: actions/apitimelinefriends.php:207 actions/apitimelinehome.php:113
-#: lib/personalgroupnav.php:102
+#: lib/personalgroupnav.php:100
 #, php-format
 msgid "%s and friends"
 msgstr "%s e amicos"
@@ -230,7 +233,7 @@ msgstr ""
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
 #. TRANS: Second sentence of empty message for anonymous users. %s is a user nickname.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:227
+#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:221
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -279,19 +282,20 @@ msgstr "Actualisationes de %1$s e su amicos in %2$s!"
 #: actions/apifavoritecreate.php:98 actions/apifavoritedestroy.php:98
 #: actions/apifriendshipscreate.php:99 actions/apifriendshipsdestroy.php:99
 #: actions/apifriendshipsshow.php:124 actions/apigroupcreate.php:138
-#: actions/apigroupismember.php:115 actions/apigroupjoin.php:160
-#: actions/apigroupleave.php:145 actions/apigrouplist.php:134
+#: actions/apigroupismember.php:115 actions/apigroupjoin.php:151
+#: actions/apigroupleave.php:141 actions/apigrouplist.php:134
 #: actions/apigrouplistall.php:120 actions/apigroupmembership.php:105
+#: actions/apigroupprofileupdate.php:100 actions/apigroupprofileupdate.php:213
 #: actions/apigroupshow.php:114 actions/apihelptest.php:84
 #: actions/apistatusesdestroy.php:101 actions/apistatusesretweets.php:110
 #: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:139
 #: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
-#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:268
-#: actions/apitimelinegroup.php:147 actions/apitimelinehome.php:173
-#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:239
-#: actions/apitimelineretweetedtome.php:118
-#: actions/apitimelineretweetsofme.php:150 actions/apitimelinetag.php:159
-#: actions/apitimelineuser.php:206 actions/apiusershow.php:100
+#: actions/apitimelinefavorites.php:182 actions/apitimelinefriends.php:276
+#: actions/apitimelinegroup.php:148 actions/apitimelinehome.php:181
+#: actions/apitimelinementions.php:182 actions/apitimelinepublic.php:247
+#: actions/apitimelineretweetedtome.php:147
+#: actions/apitimelineretweetsofme.php:147 actions/apitimelinetag.php:165
+#: actions/apitimelineuser.php:217 actions/apiusershow.php:100
 msgid "API method not found."
 msgstr "Methodo API non trovate."
 
@@ -306,8 +310,9 @@ msgstr "Methodo API non trovate."
 #: actions/apifavoritecreate.php:88 actions/apifavoritedestroy.php:88
 #: actions/apifriendshipscreate.php:89 actions/apifriendshipsdestroy.php:89
 #: actions/apigroupcreate.php:102 actions/apigroupjoin.php:89
-#: actions/apigroupleave.php:89 actions/apimediaupload.php:66
-#: actions/apistatusesretweet.php:63 actions/apistatusesupdate.php:194
+#: actions/apigroupleave.php:89 actions/apigroupprofileupdate.php:92
+#: actions/apimediaupload.php:66 actions/apistatusesretweet.php:63
+#: actions/apistatusesupdate.php:194
 msgid "This method requires a POST."
 msgstr "Iste methodo require un POST."
 
@@ -321,21 +326,16 @@ msgstr ""
 "im, none."
 
 #. TRANS: Server error displayed when a user's delivery device cannot be updated.
-#. TRANS: Server error displayed when a user update to the database fails in the contact address confirmation action.
 #. TRANS: Server error thrown on database error updating e-mail preferences.
 #. TRANS: Server error thrown on database error removing a registered e-mail address.
-#. TRANS: Server error thrown on database error updating Instant Messaging preferences.
-#. TRANS: Server error thrown on database error removing a registered Instant Messaging address.
-#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
 #. TRANS: Server error thrown when user profile settings could not be updated.
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
-#: actions/apiaccountupdatedeliverydevice.php:130
-#: actions/confirmaddress.php:118 actions/emailsettings.php:352
-#: actions/emailsettings.php:498 actions/imsettings.php:276
-#: actions/imsettings.php:432 actions/othersettings.php:186
-#: actions/profilesettings.php:322 actions/smssettings.php:301
-#: actions/smssettings.php:454
+#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
+#: actions/apiaccountupdatedeliverydevice.php:136
+#: actions/emailsettings.php:353 actions/emailsettings.php:499
+#: actions/profilesettings.php:323 actions/smssettings.php:300
+#: actions/smssettings.php:453 actions/urlsettings.php:211
 msgid "Could not update user."
 msgstr "Non poteva actualisar le usator."
 
@@ -361,7 +361,7 @@ msgstr "Le usator non ha un profilo."
 
 #. TRANS: Server error displayed if a user profile could not be saved.
 #. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:418
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:419
 msgid "Could not save profile."
 msgstr "Non poteva salveguardar le profilo."
 
@@ -373,7 +373,7 @@ msgstr "Non poteva salveguardar le profilo."
 #: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
 #: actions/designadminpanel.php:120 actions/editapplication.php:121
 #: actions/newapplication.php:102 actions/newnotice.php:95
-#: lib/designsettings.php:298
+#: lib/designsettings.php:110
 #, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s byte) due to its "
@@ -398,8 +398,8 @@ msgstr[1] ""
 #: actions/apiaccountupdateprofilecolors.php:160
 #: actions/apiaccountupdateprofilecolors.php:171
 #: actions/groupdesignsettings.php:285 actions/groupdesignsettings.php:296
-#: actions/userdesignsettings.php:201 actions/userdesignsettings.php:211
-#: actions/userdesignsettings.php:253 actions/userdesignsettings.php:263
+#: actions/userdesignsettings.php:218 actions/userdesignsettings.php:228
+#: actions/userdesignsettings.php:270 actions/userdesignsettings.php:280
 msgid "Unable to save your design settings."
 msgstr "Impossibile salveguardar le configurationes del apparentia."
 
@@ -407,7 +407,7 @@ msgstr "Impossibile salveguardar le configurationes del apparentia."
 #. TRANS: Client error displayed when a database error occurs updating profile colours.
 #: actions/apiaccountupdateprofilebackgroundimage.php:191
 #: actions/apiaccountupdateprofilecolors.php:139
-#: actions/userdesignsettings.php:179
+#: actions/userdesignsettings.php:196
 msgid "Could not update your design."
 msgstr "Non poteva actualisar le apparentia."
 
@@ -517,8 +517,7 @@ msgstr "Usator destinatario non trovate."
 
 #. TRANS: Client error displayed trying to direct message another user who's not a friend (403).
 #: actions/apidirectmessagenew.php:144
-#, fuzzy
-msgid "Can't send direct messages to users who aren't your friend."
+msgid "Cannot send direct messages to users who aren't your friend."
 msgstr "Non pote inviar messages directe a usatores que non es tu amicos."
 
 #. TRANS: Client error displayed trying to direct message self (403).
@@ -599,9 +598,9 @@ msgstr "Non poteva trovar le usator de destination."
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:156 actions/editgroup.php:191
-#: actions/newgroup.php:137 actions/profilesettings.php:273
-#: actions/register.php:214
+#: actions/apigroupcreate.php:156 actions/apigroupprofileupdate.php:255
+#: actions/editgroup.php:191 actions/newgroup.php:137
+#: actions/profilesettings.php:274 actions/register.php:199
 msgid "Nickname already in use. Try another one."
 msgstr "Pseudonymo ja in uso. Proba un altere."
 
@@ -609,9 +608,9 @@ msgstr "Pseudonymo ja in uso. Proba un altere."
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:164 actions/editgroup.php:195
-#: actions/newgroup.php:141 actions/profilesettings.php:243
-#: actions/register.php:216
+#: actions/apigroupcreate.php:164 actions/apigroupprofileupdate.php:259
+#: actions/editgroup.php:195 actions/newgroup.php:141
+#: actions/profilesettings.php:244 actions/register.php:201
 msgid "Not a valid nickname."
 msgstr "Non un pseudonymo valide."
 
@@ -621,10 +620,10 @@ msgstr "Non un pseudonymo valide."
 #. TRANS: Validation error shown when providing an invalid homepage URL in the "New application" form.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:181 actions/editapplication.php:235
-#: actions/editgroup.php:202 actions/newapplication.php:221
-#: actions/newgroup.php:148 actions/profilesettings.php:248
-#: actions/register.php:223
+#: actions/apigroupcreate.php:181 actions/apigroupprofileupdate.php:277
+#: actions/editapplication.php:235 actions/editgroup.php:202
+#: actions/newapplication.php:221 actions/newgroup.php:148
+#: actions/profilesettings.php:249 actions/register.php:208
 msgid "Homepage is not a valid URL."
 msgstr "Le pagina personal non es un URL valide."
 
@@ -633,8 +632,8 @@ msgstr "Le pagina personal non es un URL valide."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:191 actions/editgroup.php:206
-#: actions/newgroup.php:152 actions/profilesettings.php:252
-#: actions/register.php:226
+#: actions/newgroup.php:152 actions/profilesettings.php:253
+#: actions/register.php:211
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "Le nomine complete es troppo longe (maximo 255 characteres)."
 
@@ -661,8 +660,8 @@ msgstr[1] "Description es troppo longe (maximo %d characteres)."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:215 actions/editgroup.php:218
-#: actions/newgroup.php:164 actions/profilesettings.php:265
-#: actions/register.php:235
+#: actions/newgroup.php:164 actions/profilesettings.php:266
+#: actions/register.php:220
 msgid "Location is too long (maximum 255 characters)."
 msgstr "Loco es troppo longe (maximo 255 characteres)."
 
@@ -691,15 +690,16 @@ msgstr "Alias invalide: \"%s\"."
 #. TRANS: %s is the alias that is already in use.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error. %s is the already used alias.
-#: actions/apigroupcreate.php:264 actions/editgroup.php:246
-#: actions/newgroup.php:193
+#: actions/apigroupcreate.php:264 actions/apigroupprofileupdate.php:351
+#: actions/editgroup.php:246 actions/newgroup.php:193
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "Le alias \"%s\" es ja in uso. Proba un altere."
 
 #. TRANS: Client error displayed when trying to use an alias during group creation that is the same as the group's nickname.
 #. TRANS: Group edit form validation error.
-#: actions/apigroupcreate.php:278 actions/editgroup.php:253
+#: actions/apigroupcreate.php:278 actions/apigroupprofileupdate.php:359
+#: actions/editgroup.php:253
 msgid "Alias can't be the same as nickname."
 msgstr "Le alias non pote esser identic al pseudonymo."
 
@@ -711,7 +711,8 @@ msgstr "Le alias non pote esser identic al pseudonymo."
 #. TRANS: Client error displayed requesting most recent notices to a group for a non-existing group.
 #: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
 #: actions/apigroupleave.php:104 actions/apigroupmembership.php:71
-#: actions/apigroupshow.php:81 actions/apitimelinegroup.php:89
+#: actions/apigroupprofileupdate.php:113 actions/apigroupshow.php:81
+#: actions/apitimelinegroup.php:89
 msgid "Group not found."
 msgstr "Gruppo non trovate."
 
@@ -729,13 +730,11 @@ msgstr "Tu es ja membro de iste gruppo."
 msgid "You have been blocked from that group by the admin."
 msgstr "Le administrator te ha blocate de iste gruppo."
 
-#. TRANS: Server error displayed when joining a group fails.
-#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
 #. 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.
 #. TRANS: Message given having failed to add a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:362
+#: actions/apigroupjoin.php:136 actions/joingroup.php:139 lib/command.php:362
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "Non poteva inscriber le usator %1$s in le gruppo %2$s."
@@ -745,8 +744,6 @@ msgstr "Non poteva inscriber le usator %1$s in le gruppo %2$s."
 msgid "You are not a member of this group."
 msgstr "Tu non es membro de iste gruppo."
 
-#. TRANS: Server error displayed when leaving a group fails.
-#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
 #. TRANS: Server error displayed when leaving a group failed in the database.
 #. TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
 #. TRANS: Message given having failed to remove a user from a group.
@@ -782,6 +779,61 @@ msgstr "Gruppos de %s"
 msgid "groups on %s"
 msgstr "gruppos in %s"
 
+#. TRANS: Client error displayed trying to edit a group while not being a group admin.
+#. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
+#. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
+#: actions/apigroupprofileupdate.php:118 actions/editgroup.php:110
+#: actions/editgroup.php:176 actions/groupdesignsettings.php:109
+#: actions/grouplogo.php:111
+msgid "You must be an admin to edit the group."
+msgstr "Tu debe esser administrator pro modificar le gruppo."
+
+#. TRANS: Server error displayed when editing a group fails.
+#: actions/apigroupprofileupdate.php:171 actions/editgroup.php:274
+msgid "Could not update group."
+msgstr "Non poteva actualisar gruppo."
+
+#. TRANS: Server error displayed when group aliases could not be added.
+#. TRANS: Server exception thrown when creating group aliases failed.
+#: actions/apigroupprofileupdate.php:194 actions/editgroup.php:281
+#: classes/User_group.php:540
+msgid "Could not create aliases."
+msgstr "Non poteva crear aliases."
+
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: actions/apigroupprofileupdate.php:249 lib/nickname.php:165
+msgid "Nickname must have only lowercase letters and numbers and no spaces."
+msgstr "Le pseudonymo pote solmente haber minusculas e numeros, sin spatios."
+
+#: actions/apigroupprofileupdate.php:286
+#, fuzzy
+msgid "Full name is too long (max 255 chars)."
+msgstr "Le nomine complete es troppo longe (maximo 255 characteres)."
+
+#: actions/apigroupprofileupdate.php:296
+#, fuzzy, php-format
+msgid "description is too long (max %d chars)."
+msgstr "Description es troppo longe (maximo %d characteres)."
+
+#: actions/apigroupprofileupdate.php:307
+#, fuzzy
+msgid "Location is too long (max 255 chars)."
+msgstr "Loco es troppo longe (maximo 255 characteres)."
+
+#: actions/apigroupprofileupdate.php:326
+#, fuzzy, php-format
+msgid "Too many aliases! Maximum %d."
+msgstr "Troppo de aliases! Solmente un es permittite."
+
+#. TRANS: Group edit form validation error.
+#. TRANS: Group create form validation error.
+#. TRANS: %s is the invalid alias.
+#: actions/apigroupprofileupdate.php:342 actions/editgroup.php:241
+#: actions/newgroup.php:188
+#, php-format
+msgid "Invalid alias: \"%s\""
+msgstr "Alias invalide: \"%s\""
+
 #. TRANS: Client error displayed when uploading a media file has failed.
 #: actions/apimediaupload.php:101
 msgid "Upload failed."
@@ -812,21 +864,22 @@ msgstr "Indicio de requesta jam autorisate."
 #. TRANS: Form validation error message.
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
+#. TRANS: Client error displayed when the session token is not okay.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
 #: actions/deletenotice.php:177 actions/disfavor.php:75
-#: actions/emailsettings.php:291 actions/favor.php:75 actions/geocode.php:55
+#: actions/emailsettings.php:292 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:65 actions/grouplogo.php:321
-#: actions/groupunblock.php:65 actions/imsettings.php:224
-#: actions/invite.php:60 actions/login.php:137 actions/makeadmin.php:66
-#: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
-#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
-#: actions/othersettings.php:155 actions/passwordsettings.php:138
-#: actions/profilesettings.php:217 actions/recoverpassword.php:383
-#: actions/register.php:172 actions/remotesubscribe.php:76
-#: actions/repeat.php:82 actions/smssettings.php:250 actions/subedit.php:40
-#: actions/subscribe.php:86 actions/tagother.php:166
-#: actions/unsubscribe.php:69 actions/userauthorization.php:52
-#: lib/designsettings.php:310
+#: actions/groupunblock.php:65 actions/imsettings.php:241
+#: actions/invite.php:60 actions/makeadmin.php:66 actions/newmessage.php:135
+#: actions/newnotice.php:105 actions/nudge.php:80
+#: actions/oauthappssettings.php:162 actions/oauthconnectionssettings.php:135
+#: actions/passwordsettings.php:137 actions/pluginenable.php:87
+#: actions/profilesettings.php:218 actions/recoverpassword.php:383
+#: actions/register.php:157 actions/remotesubscribe.php:76
+#: actions/repeat.php:82 actions/smssettings.php:249 actions/subedit.php:40
+#: actions/subscribe.php:87 actions/tagother.php:145
+#: actions/unsubscribe.php:69 actions/urlsettings.php:171
+#: actions/userauthorization.php:53 lib/designsettings.php:122
 msgid "There was a problem with your session token. Try again, please."
 msgstr "Occurreva un problema con le indicio de tu session. Per favor reproba."
 
@@ -855,10 +908,10 @@ msgstr ""
 #. TRANS: Unknown form validation error in design settings form.
 #: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
 #: actions/designadminpanel.php:100 actions/editapplication.php:144
-#: actions/emailsettings.php:310 actions/grouplogo.php:332
-#: actions/imsettings.php:239 actions/newapplication.php:124
-#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
-#: actions/smssettings.php:271 lib/designsettings.php:321
+#: actions/emailsettings.php:311 actions/grouplogo.php:332
+#: actions/imsettings.php:256 actions/newapplication.php:124
+#: actions/oauthconnectionssettings.php:144 actions/recoverpassword.php:46
+#: actions/smssettings.php:270 lib/designsettings.php:133
 msgid "Unexpected form submission."
 msgstr "Submission de formulario inexpectate."
 
@@ -907,31 +960,26 @@ msgstr "Conto"
 
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Field label in form for profile settings.
-#. TRANS: Label for group nickname (dt). Text hidden by default.
-#. TRANS: DT for nick name in a profile.
-#: actions/apioauthauthorize.php:459 actions/login.php:252
-#: actions/profilesettings.php:106 actions/register.php:432
-#: actions/showgroup.php:243 actions/tagother.php:94
+#: actions/apioauthauthorize.php:459 actions/login.php:225
+#: actions/profilesettings.php:107 actions/register.php:411
 #: actions/userauthorization.php:145 lib/groupeditform.php:145
-#: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "Pseudonymo"
 
 #. TRANS: Field label on OAuth API authorisation form.
-#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:463 actions/login.php:255
-#: actions/register.php:436 lib/accountsettingsaction.php:120
+#: actions/apioauthauthorize.php:463 actions/login.php:228
+#: actions/register.php:415 lib/settingsnav.php:87
 msgid "Password"
 msgstr "Contrasigno"
 
 #. TRANS: Button text that when clicked will cancel the process of allowing access to an account
 #. TRANS: by an external application.
 #. TRANS: Button label to cancel an e-mail address confirmation procedure.
-#. TRANS: Button label to cancel an Instant Messaging address confirmation procedure.
+#. TRANS: Button label to cancel an IM address confirmation procedure.
 #. TRANS: Button label to cancel a SMS address confirmation procedure.
 #. TRANS: Button label in the "Edit application" form.
-#: actions/apioauthauthorize.php:478 actions/emailsettings.php:124
-#: actions/imsettings.php:127 actions/smssettings.php:133
+#: actions/apioauthauthorize.php:478 actions/emailsettings.php:125
+#: actions/imsettings.php:136 actions/smssettings.php:132
 #: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Cancel"
@@ -1042,8 +1090,8 @@ msgstr "Methodo HTTP non supportate."
 #. TRANS: Exception thrown requesting an unsupported notice output format.
 #. TRANS: %s is the requested output format.
 #: actions/apistatusesshow.php:144
-#, fuzzy, php-format
-msgid "Unsupported format: %s"
+#, php-format
+msgid "Unsupported format: %s."
 msgstr "Formato non supportate: %s."
 
 #. TRANS: Client error displayed requesting a deleted status.
@@ -1127,13 +1175,6 @@ msgstr "%1$s / Favorites de %2$s"
 msgid "%1$s updates favorited by %2$s / %3$s."
 msgstr "%1$s actualisationes favoritisate per %2$s / %3$s."
 
-#. TRANS: Server error displayed when generating an Atom feed fails.
-#. TRANS: %s is the error.
-#: actions/apitimelinegroup.php:134
-#, php-format
-msgid "Could not generate feed for group - %s"
-msgstr "Non poteva generar un syndication pro le gruppo %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.
 #: actions/apitimelinementions.php:115
@@ -1151,13 +1192,14 @@ msgstr ""
 "Actualisationes de %1$s que responde al actualisationes de %2$s / %3$s."
 
 #. TRANS: Title for site timeline. %s is the StatusNet sitename.
+#. TRANS: Public RSS feed title. %s is the StatusNet site name.
 #: actions/apitimelinepublic.php:193 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "Chronologia public de %s"
 
 #. TRANS: Subtitle for site timeline. %s is the StatusNet sitename.
-#: actions/apitimelinepublic.php:199 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:199
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "Actualisationes de totes in %s!"
@@ -1168,21 +1210,34 @@ msgid "Unimplemented."
 msgstr "Non implementate."
 
 #. TRANS: Title for Atom feed "repeated to me". %s is the user nickname.
-#: actions/apitimelineretweetedtome.php:108
+#: actions/apitimelineretweetedtome.php:96
 #, php-format
 msgid "Repeated to %s"
 msgstr "Repetite a %s"
 
+#: actions/apitimelineretweetedtome.php:98
+#, fuzzy, php-format
+msgid "%1$s notices that were to repeated to %2$s / %3$s."
+msgstr ""
+"Actualisationes de %1$s que responde al actualisationes de %2$s / %3$s."
+
 #. TRANS: Title of list of repeated notices of the logged in user.
 #. TRANS: %s is the nickname of the logged in user.
-#: actions/apitimelineretweetsofme.php:112
+#: actions/apitimelineretweetsofme.php:98
 #, php-format
 msgid "Repeats of %s"
 msgstr "Repetitiones de %s"
 
+#: actions/apitimelineretweetsofme.php:104
+#, fuzzy, php-format
+msgid "%1$s notices that %2$s / %3$s has repeated."
+msgstr "%1$s marcava le nota %2$s como favorite."
+
 #. TRANS: Title for timeline with lastest notices with a given tag.
 #. TRANS: %s is the tag.
-#: actions/apitimelinetag.php:101 actions/tag.php:67
+#. TRANS: Title for first page of notices with tags.
+#. TRANS: %s is the tag.
+#: actions/apitimelinetag.php:101 actions/tag.php:69
 #, php-format
 msgid "Notices tagged with %s"
 msgstr "Notas con etiquetta %s"
@@ -1195,53 +1250,54 @@ msgid "Updates tagged with %1$s on %2$s!"
 msgstr "Actualisationes con etiquetta %1$s in %2$s!"
 
 #. TRANS: Client error displayed trying to add a notice to another user's timeline.
-#: actions/apitimelineuser.php:297
+#: actions/apitimelineuser.php:308
 msgid "Only the user can add to their own timeline."
 msgstr "Solmente le usator pote adder cosas a su proprie chronologia."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:304
+#: actions/apitimelineuser.php:315
 msgid "Only accept AtomPub for Atom feeds."
 msgstr "Solmente acceptar AtomPub pro syndicationes Atom."
 
 #. TRANS: Client error displayed attempting to post an empty API notice.
-#: actions/apitimelineuser.php:311
+#: actions/apitimelineuser.php:322
 msgid "Atom post must not be empty."
 msgstr "Le message Atom non pote esser vacue."
 
 #. TRANS: Client error displayed attempting to post an API that is not well-formed XML.
-#: actions/apitimelineuser.php:317
+#: actions/apitimelineuser.php:328
 msgid "Atom post must be well-formed XML."
 msgstr "Le message Atom debe esser in XML ben formate."
 
 #. TRANS: Client error displayed when not using an Atom entry.
-#: actions/apitimelineuser.php:323 actions/atompubfavoritefeed.php:228
+#: actions/apitimelineuser.php:334 actions/atompubfavoritefeed.php:228
 #: actions/atompubmembershipfeed.php:230
 #: actions/atompubsubscriptionfeed.php:236
 msgid "Atom post must be an Atom entry."
 msgstr "Message Atom debe esser un entrata Atom."
 
 #. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
-#: actions/apitimelineuser.php:335
+#: actions/apitimelineuser.php:345
 msgid "Can only handle POST activities."
 msgstr "Solmente le activitates POST es possibile."
 
 #. TRANS: Client error displayed when using an unsupported activity object type.
 #. TRANS: %s is the unsupported activity object type.
-#: actions/apitimelineuser.php:346
+#: actions/apitimelineuser.php:356
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr "Impossibile manear le typo de objecto de activitate \"%s\"."
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
 #. TRANS: %d is the notice ID (number).
-#: actions/apitimelineuser.php:380
+#: actions/apitimelineuser.php:390
 #, php-format
 msgid "No content for notice %d."
 msgstr "Nulle contento pro nota %d."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:408
+#. TRANS: %s is the notice URI.
+#: actions/apitimelineuser.php:419
 #, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "Un nota con le URI \"%s\" jam existe."
@@ -1258,9 +1314,10 @@ msgstr "Usator non trovate."
 
 #. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
 #. TRANS: Client exception.
+#. TRANS: Client error displayed trying to subscribe to a non-existing profile.
 #: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
 #: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
-#: actions/subscribe.php:107
+#: actions/subscribe.php:110
 msgid "No such profile."
 msgstr "Profilo non existe."
 
@@ -1395,7 +1452,7 @@ msgid "Not a member."
 msgstr "Non es membro."
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
-#: actions/atompubshowmembership.php:151
+#: actions/atompubshowmembership.php:150
 msgid "Cannot delete someone else's membership."
 msgstr "Non pote deler le membrato de un altere persona."
 
@@ -1482,10 +1539,7 @@ msgid "Invalid size."
 msgstr "Dimension invalide."
 
 #. TRANS: Title for avatar upload page.
-#. TRANS: Label for group avatar (dt). Text hidden by default.
-#. TRANS: Link description in user account settings menu.
-#: actions/avatarsettings.php:66 actions/showgroup.php:227
-#: lib/accountsettingsaction.php:113
+#: actions/avatarsettings.php:66 lib/settingsnav.php:82
 msgid "Avatar"
 msgstr "Avatar"
 
@@ -1499,9 +1553,11 @@ msgstr ""
 
 #. TRANS: Server error displayed in avatar upload page when no matching profile can be found for a user.
 #. TRANS: Server error displayed coming across a request from a user without a profile.
+#. TRANS: Server error displayed when trying to authorise a remote subscription request
+#. TRANS: while the user has no profile.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
 #: actions/grouplogo.php:184 actions/remotesubscribe.php:190
-#: actions/userauthorization.php:72 actions/userrss.php:108
+#: actions/userauthorization.php:75 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr "Usator sin profilo correspondente"
 
@@ -1556,10 +1612,9 @@ msgstr "Taliar"
 msgid "No file uploaded."
 msgstr "Nulle file incargate."
 
-#. TRANS: Avatar upload form unstruction after uploading a file.
+#. TRANS: Avatar upload form instruction after uploading a file.
 #: actions/avatarsettings.php:345
-#, fuzzy
-msgid "Pick a square area of the image to be your avatar"
+msgid "Pick a square area of the image to be your avatar."
 msgstr "Selige un area quadrate del imagine pro facer lo tu avatar."
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
@@ -1585,7 +1640,7 @@ msgstr "Avatar delite."
 
 #. TRANS: Title for backup account page.
 #. TRANS: Option in profile settings to create a backup of the account of the currently logged in user.
-#: actions/backupaccount.php:61 actions/profilesettings.php:467
+#: actions/backupaccount.php:61 actions/profilesettings.php:468
 msgid "Backup account"
 msgstr "Facer un copia de reserva del conto"
 
@@ -1623,8 +1678,7 @@ msgstr "Copia de reserva"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
 #: actions/backupaccount.php:254
-#, fuzzy
-msgid "Backup your account"
+msgid "Backup your account."
 msgstr "Facer un copia de reserva de tu conto."
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
@@ -1665,8 +1719,7 @@ msgstr "No"
 
 #. TRANS: Submit button title for 'No' when blocking a user.
 #: actions/block.php:158
-#, fuzzy
-msgid "Do not block this user"
+msgid "Do not block this user."
 msgstr "Non blocar iste usator."
 
 #. TRANS: Button label on the user block form.
@@ -1683,10 +1736,9 @@ msgid "Yes"
 msgstr "Si"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#. TRANS: Description of the form to block a user.
-#: actions/block.php:165 lib/blockform.php:79
-msgid "Block this user"
-msgstr "Blocar iste usator"
+#: actions/block.php:165
+msgid "Block this user."
+msgstr "Blocar iste usator."
 
 #. TRANS: Server error displayed when blocking a user fails.
 #: actions/block.php:189
@@ -1751,31 +1803,47 @@ msgstr "Codice de confirmation non trovate."
 msgid "That confirmation code is not for you!"
 msgstr "Iste codice de confirmation non es pro te!"
 
-#. TRANS: Server error for a unknow address type %s, which can be 'email', 'jabber', or 'sms'.
-#: actions/confirmaddress.php:92
-#, php-format
-msgid "Unrecognized address type %s."
+#. TRANS: Server error for an unknown address type, which can be 'email', 'sms', or the name of an IM network (such as 'xmpp' or 'aim')
+#: actions/confirmaddress.php:94
+#, fuzzy, php-format
+msgid "Unrecognized address type %s"
 msgstr "Le typo de adresse %s non es recognoscite."
 
 #. TRANS: Client error for an already confirmed email/jabber/sms address.
-#: actions/confirmaddress.php:97
+#: actions/confirmaddress.php:103 actions/confirmaddress.php:136
 msgid "That address has already been confirmed."
 msgstr "Iste adresse ha ja essite confirmate."
 
+#: actions/confirmaddress.php:121 actions/imsettings.php:444
+#: actions/userdesignsettings.php:306
+#, fuzzy
+msgid "Couldn't update user."
+msgstr "Non poteva actualisar le usator."
+
+#: actions/confirmaddress.php:144
+#, fuzzy
+msgid "Couldn't update user im preferences."
+msgstr "Non poteva actualisar le datos del usator."
+
+#: actions/confirmaddress.php:156
+#, fuzzy
+msgid "Couldn't insert user im preferences."
+msgstr "Non poteva inserer nove subscription."
+
 #. TRANS: Server error displayed when an address confirmation code deletion from the
 #. TRANS: database fails in the contact address confirmation action.
-#: actions/confirmaddress.php:132
+#: actions/confirmaddress.php:169
 msgid "Could not delete address confirmation."
 msgstr "Non poteva deler le confirmation de adresse."
 
 #. TRANS: Title for the contact address confirmation action.
-#: actions/confirmaddress.php:150
+#: actions/confirmaddress.php:185
 msgid "Confirm address"
 msgstr "Confirmar adresse"
 
 #. TRANS: Success message for the contact address confirmation action.
 #. TRANS: %s can be 'email', 'jabber', or 'sms'.
-#: actions/confirmaddress.php:166
+#: actions/confirmaddress.php:200
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "Le adresse \"%s\" ha essite confirmate pro tu conto."
@@ -1789,6 +1857,7 @@ msgstr "Conversation"
 #. TRANS: Label for user statistics.
 #: actions/conversation.php:149 lib/noticelist.php:87
 #: lib/profileaction.php:246 lib/searchgroupnav.php:82
+#: lib/threadednoticelist.php:66
 msgid "Notices"
 msgstr "Notas"
 
@@ -1821,7 +1890,7 @@ msgstr "Conto delite."
 
 #. TRANS: Page title for page on which a user account can be deleted.
 #. TRANS: Option in profile settings to delete the account of the currently logged in user.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:475
+#: actions/deleteaccount.php:228 actions/profilesettings.php:476
 msgid "Delete account"
 msgstr "Deler conto"
 
@@ -1848,7 +1917,7 @@ msgstr ""
 #. TRANS: Field label for delete account confirmation entry.
 #. TRANS: Field label for password reset form where the password has to be typed again.
 #: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:262 actions/register.php:440
+#: actions/recoverpassword.php:262 actions/register.php:419
 msgid "Confirm"
 msgstr "Confirmar"
 
@@ -1877,14 +1946,14 @@ msgstr "Application non trovate."
 #. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
 #: actions/deleteapplication.php:79 actions/editapplication.php:78
-#: actions/showapplication.php:94
+#: actions/showapplication.php:90
 msgid "You are not the owner of this application."
 msgstr "Tu non es le proprietario de iste application."
 
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
-#: actions/newapplication.php:112 actions/showapplication.php:118
-#: lib/action.php:1425
+#: actions/newapplication.php:112 actions/showapplication.php:113
+#: lib/action.php:1391
 msgid "There was a problem with your session token."
 msgstr "Il habeva un problema con tu indicio de session."
 
@@ -1907,14 +1976,12 @@ msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting an application.
 #: actions/deleteapplication.php:161
-#, fuzzy
-msgid "Do not delete this application"
+msgid "Do not delete this application."
 msgstr "Non deler iste application."
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
 #: actions/deleteapplication.php:167
-#, fuzzy
-msgid "Delete this application"
+msgid "Delete this application."
 msgstr "Deler iste application."
 
 #. TRANS: Client error when trying to delete group while not logged in.
@@ -1968,14 +2035,12 @@ msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting a group.
 #: actions/deletegroup.php:224
-#, fuzzy
-msgid "Do not delete this group"
+msgid "Do not delete this group."
 msgstr "Non deler iste gruppo."
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
 #: actions/deletegroup.php:231
-#, fuzzy
-msgid "Delete this group"
+msgid "Delete this group."
 msgstr "Deler iste gruppo."
 
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
@@ -1983,14 +2048,16 @@ msgstr "Deler iste gruppo."
 #. TRANS: Client error displayed when trying to mark a notice as favorite without being logged in.
 #. TRANS: Client error displayed trying to block a user from a group while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
+#. TRANS: Client error displayed trying to log out when not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
+#. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
 #. TRANS: Client error displayed when trying to change user options while not logged in.
 #: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
-#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:69
+#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:70
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
-#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
-#: actions/tagother.php:33 actions/unsubscribe.php:52
+#: actions/nudge.php:63 actions/pluginenable.php:97 actions/subedit.php:33
+#: actions/subscribe.php:98 actions/tagother.php:33 actions/unsubscribe.php:52
 #: lib/adminpanelaction.php:71 lib/profileformaction.php:63
 #: lib/settingsaction.php:72
 msgid "Not logged in."
@@ -2018,14 +2085,13 @@ msgstr "Es tu secur de voler deler iste nota?"
 
 #. TRANS: Submit button title for 'No' when deleting a notice.
 #: actions/deletenotice.php:159
-#, fuzzy
-msgid "Do not delete this notice"
+msgid "Do not delete this notice."
 msgstr "Non deler iste nota."
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:166 lib/noticelist.php:673
-msgid "Delete this notice"
-msgstr "Deler iste nota"
+#: actions/deletenotice.php:166
+msgid "Delete this notice."
+msgstr "Deler iste nota."
 
 #. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
 #: actions/deleteuser.php:66
@@ -2059,19 +2125,16 @@ msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting a user.
 #: actions/deleteuser.php:158
-#, fuzzy
-msgid "Do not delete this user"
+msgid "Do not delete this user."
 msgstr "Non deler iste usator."
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
-#. TRANS: Description of form for deleting a user.
-#: actions/deleteuser.php:165 lib/deleteuserform.php:75
-msgid "Delete this user"
-msgstr "Deler iste usator"
+#: actions/deleteuser.php:165
+msgid "Delete this user."
+msgstr "Deler iste usator."
 
 #. TRANS: Message used as title for design settings for the site.
-#. TRANS: Link description in user account settings menu.
-#: actions/designadminpanel.php:60 lib/accountsettingsaction.php:134
+#: actions/designadminpanel.php:60 lib/settingsnav.php:97
 msgid "Design"
 msgstr "Apparentia"
 
@@ -2140,8 +2203,7 @@ msgstr ""
 "archivo .ZIP."
 
 #. TRANS: Fieldset legend for theme background image.
-#. TRANS: Fieldset legend on profile design page.
-#: actions/designadminpanel.php:515 lib/designsettings.php:98
+#: actions/designadminpanel.php:515
 msgid "Change background image"
 msgstr "Cambiar imagine de fundo"
 
@@ -2149,7 +2211,7 @@ msgstr "Cambiar imagine de fundo"
 #. TRANS: Field label for background color selector.
 #. TRANS: Label on profile design page for setting a profile page background colour.
 #: actions/designadminpanel.php:525 actions/designadminpanel.php:609
-#: lib/designsettings.php:183
+#: lib/designform.php:238
 msgid "Background"
 msgstr "Fundo"
 
@@ -2176,13 +2238,13 @@ msgstr "Non active"
 #. TRANS: Form guide for turning background image on or off on theme designer page.
 #. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
 #. TRANS: use of the uploaded profile image.
-#: actions/designadminpanel.php:577 lib/designsettings.php:159
+#: actions/designadminpanel.php:577 lib/designform.php:214
 msgid "Turn background image on or off."
 msgstr "Activar o disactivar le imagine de fundo."
 
 #. TRANS: Checkbox label to title background image on theme designer page.
 #. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-#: actions/designadminpanel.php:583 lib/designsettings.php:165
+#: actions/designadminpanel.php:583 lib/designform.php:220
 msgid "Tile background image"
 msgstr "Tegular le imagine de fundo"
 
@@ -2193,25 +2255,25 @@ msgstr "Cambiar colores"
 
 #. TRANS: Field label for content color selector.
 #. TRANS: Label on profile design page for setting a profile page content colour.
-#: actions/designadminpanel.php:623 lib/designsettings.php:197
+#: actions/designadminpanel.php:623 lib/designform.php:252
 msgid "Content"
 msgstr "Contento"
 
 #. TRANS: Field label for sidebar color selector.
 #. TRANS: Label on profile design page for setting a profile page sidebar colour.
-#: actions/designadminpanel.php:637 lib/designsettings.php:211
+#: actions/designadminpanel.php:637 lib/designform.php:266
 msgid "Sidebar"
 msgstr "Barra lateral"
 
 #. TRANS: Field label for text color selector.
 #. TRANS: Label on profile design page for setting a profile page text colour.
-#: actions/designadminpanel.php:651 lib/designsettings.php:225
+#: actions/designadminpanel.php:651 lib/designform.php:280
 msgid "Text"
 msgstr "Texto"
 
 #. TRANS: Field label for link color selector.
 #. TRANS: Label on profile design page for setting a profile page links colour.
-#: actions/designadminpanel.php:665 lib/designsettings.php:239
+#: actions/designadminpanel.php:665 lib/designform.php:294
 msgid "Links"
 msgstr "Ligamines"
 
@@ -2232,22 +2294,19 @@ msgid "Use defaults"
 msgstr "Usar predefinitiones"
 
 #. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: actions/designadminpanel.php:720 lib/designsettings.php:259
-msgid "Restore default designs"
-msgstr "Restaurar apparentias predefinite"
+#: actions/designadminpanel.php:720
+msgid "Restore default designs."
+msgstr "Restaurar apparentias predefinite."
 
 #. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: actions/designadminpanel.php:728 lib/designsettings.php:267
-msgid "Reset back to default"
-msgstr "Revenir al predefinitiones"
+#: actions/designadminpanel.php:728
+msgid "Reset back to default."
+msgstr "Revenir al predefinitiones."
 
 #. TRANS: Title for button for saving theme settings.
-#. TRANS: Title for button on profile design page to save settings.
-#: actions/designadminpanel.php:736 lib/designsettings.php:272
-msgid "Save design"
-msgstr "Salveguardar apparentia"
+#: actions/designadminpanel.php:736
+msgid "Save design."
+msgstr "Salveguardar apparentia."
 
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
 #: actions/disfavor.php:83
@@ -2278,7 +2337,7 @@ msgid "You must be logged in to edit an application."
 msgstr "Tu debe aperir un session pro modificar un application."
 
 #. TRANS: Client error displayed trying to edit an application that does not exist.
-#: actions/editapplication.php:83 actions/showapplication.php:87
+#: actions/editapplication.php:83 actions/showapplication.php:83
 msgid "No such application."
 msgstr "Application non trovate."
 
@@ -2369,80 +2428,53 @@ msgstr "Modificar gruppo %s"
 msgid "You must be logged in to create a group."
 msgstr "Tu debe aperir un session pro crear un gruppo."
 
-#. TRANS: Client error displayed trying to edit a group while not being a group admin.
-#. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
-#. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
-#: actions/editgroup.php:110 actions/editgroup.php:176
-#: actions/groupdesignsettings.php:109 actions/grouplogo.php:111
-msgid "You must be an admin to edit the group."
-msgstr "Tu debe esser administrator pro modificar le gruppo."
-
 #. TRANS: Form instructions for group edit form.
 #: actions/editgroup.php:161
 msgid "Use this form to edit the group."
 msgstr "Usa iste formulario pro modificar le gruppo."
 
-#. TRANS: Group edit form validation error.
-#. TRANS: Group create form validation error.
-#. TRANS: %s is the invalid alias.
-#: actions/editgroup.php:241 actions/newgroup.php:188
-#, php-format
-msgid "Invalid alias: \"%s\""
-msgstr "Alias invalide: \"%s\""
-
-#. TRANS: Server error displayed when editing a group fails.
-#: actions/editgroup.php:274
-msgid "Could not update group."
-msgstr "Non poteva actualisar gruppo."
-
-#. TRANS: Server error displayed when group aliases could not be added.
-#. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/editgroup.php:281 classes/User_group.php:540
-msgid "Could not create aliases."
-msgstr "Non poteva crear aliases."
-
 #. TRANS: Group edit form success message.
 #: actions/editgroup.php:301
 msgid "Options saved."
 msgstr "Optiones salveguardate."
 
 #. TRANS: Title for e-mail settings.
-#: actions/emailsettings.php:59
+#: actions/emailsettings.php:60
 msgid "Email settings"
 msgstr "Configuration de e-mail"
 
 #. TRANS: E-mail settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/emailsettings.php:73
+#: actions/emailsettings.php:74
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 msgstr "Configurar como reciper e-mail de %%site.name%%."
 
 #. TRANS: Form legend for e-mail settings form.
 #. TRANS: Field label for e-mail address input in e-mail settings form.
-#: actions/emailsettings.php:103 actions/emailsettings.php:129
+#: actions/emailsettings.php:104 actions/emailsettings.php:130
 msgid "Email address"
 msgstr "Adresse de e-mail"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:109
+#: actions/emailsettings.php:110
 msgid "Current confirmed email address."
 msgstr "Adresse de e-mail actualmente confirmate."
 
 #. TRANS: Button label to remove a confirmed e-mail address.
 #. TRANS: Button label for removing a set sender e-mail address to post notices from.
-#. TRANS: Button label to remove a confirmed Instant Messaging address.
+#. TRANS: Button label to remove a confirmed IM address.
 #. TRANS: Button label to remove a confirmed SMS address.
 #. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
-#: actions/emailsettings.php:112 actions/emailsettings.php:179
-#: actions/imsettings.php:112 actions/smssettings.php:120
-#: actions/smssettings.php:176
+#: actions/emailsettings.php:113 actions/emailsettings.php:180
+#: actions/imsettings.php:119 actions/smssettings.php:119
+#: actions/smssettings.php:175
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Remover"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:119
+#: actions/emailsettings.php:120
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -2455,45 +2487,45 @@ msgstr ""
 #. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
 #. TRANS: Any other domain may be owned by a legitimate person or
 #. TRANS: organization.
-#: actions/emailsettings.php:136
+#: actions/emailsettings.php:137
 msgid "Email address, like \"UserName@example.org\""
 msgstr "Le adresse de e-mail, como \"nomine@example.org\""
 
 #. TRANS: Button label for adding an e-mail address in e-mail settings form.
-#. TRANS: Button label for adding an Instant Messaging address in Instant Messaging settings form.
+#. TRANS: Button label for adding an IM address in IM settings form.
 #. TRANS: Button label for adding a SMS phone number in SMS settings form.
-#: actions/emailsettings.php:140 actions/imsettings.php:147
-#: actions/smssettings.php:158
+#: actions/emailsettings.php:141 actions/imsettings.php:147
+#: actions/smssettings.php:157
 msgctxt "BUTTON"
 msgid "Add"
 msgstr "Adder"
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:148 actions/smssettings.php:167
+#: actions/emailsettings.php:149 actions/smssettings.php:166
 msgid "Incoming email"
 msgstr "E-mail entrante"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:154
+#: actions/emailsettings.php:155
 msgid "I want to post notices by email."
 msgstr "Io vole publicar notas per e-mail."
 
 #. TRANS: Form instructions for incoming e-mail form in e-mail settings.
 #. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
-#: actions/emailsettings.php:176 actions/smssettings.php:174
+#: actions/emailsettings.php:177 actions/smssettings.php:173
 msgid "Send email to this address to post new notices."
 msgstr "Invia e-mail a iste adresse pro publicar nove notas."
 
 #. TRANS: Instructions for incoming e-mail address input form, when an address has already been assigned.
 #. TRANS: Instructions for incoming SMS e-mail address input form.
-#: actions/emailsettings.php:185 actions/smssettings.php:182
+#: actions/emailsettings.php:186 actions/smssettings.php:181
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr ""
 "Face un nove adresse de e-mail per le qual publicar; cancella le vetule."
 
 #. TRANS: Instructions for incoming e-mail address input form.
-#: actions/emailsettings.php:189
+#: actions/emailsettings.php:190
 msgid ""
 "To send notices via email, we need to create a unique email address for you "
 "on this server:"
@@ -2503,87 +2535,87 @@ msgstr ""
 
 #. TRANS: Button label for adding an e-mail address to send notices from.
 #. TRANS: Button label for adding an SMS e-mail address to send notices from.
-#: actions/emailsettings.php:195 actions/smssettings.php:185
+#: actions/emailsettings.php:196 actions/smssettings.php:184
 msgctxt "BUTTON"
 msgid "New"
 msgstr "Nove"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:204
+#: actions/emailsettings.php:205
 msgid "Email preferences"
 msgstr "Preferentias de e-mail"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:212
+#: actions/emailsettings.php:213
 msgid "Send me notices of new subscriptions through email."
 msgstr "Inviar me notificationes de nove subscriptiones per e-mail."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:218
+#: actions/emailsettings.php:219
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr "Inviar me e-mail quando alcuno adde mi nota al favorites."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:225
+#: actions/emailsettings.php:226
 msgid "Send me email when someone sends me a private message."
 msgstr "Inviar me e-mail quando alcuno me invia un message private."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:231
+#: actions/emailsettings.php:232
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr "Inviar me e-mail quando alcuno me invia un \"responsa @\"."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:237
+#: actions/emailsettings.php:238
 msgid "Allow friends to nudge me and send me an email."
 msgstr "Permitte que amicos me pulsa e me invia e-mail."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:243
+#: actions/emailsettings.php:244
 msgid "Publish a MicroID for my email address."
 msgstr "Publicar un MicroID pro mi adresse de e-mail."
 
 #. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:361
+#: actions/emailsettings.php:362
 msgid "Email preferences saved."
 msgstr "Preferentias de e-mail salveguardate."
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:380
+#: actions/emailsettings.php:381
 msgid "No email address."
 msgstr "Nulle adresse de e-mail."
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:388
+#: actions/emailsettings.php:389
 msgid "Cannot normalize that email address."
 msgstr "Non pote normalisar iste adresse de e-mail."
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:393 actions/register.php:212
+#: actions/emailsettings.php:394 actions/register.php:197
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "Adresse de e-mail invalide."
 
 #. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:397
+#: actions/emailsettings.php:398
 msgid "That is already your email address."
 msgstr "Isto es ja tu adresse de e-mail."
 
 #. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:401
+#: actions/emailsettings.php:402
 msgid "That email address already belongs to another user."
 msgstr "Iste adresse de e-mail pertine ja a un altere usator."
 
 #. TRANS: Server error thrown on database error adding e-mail confirmation code.
 #. TRANS: Server error thrown on database error adding Instant Messaging confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:418 actions/imsettings.php:343
-#: actions/smssettings.php:365
+#: actions/emailsettings.php:419 actions/imsettings.php:362
+#: actions/smssettings.php:364
 msgid "Could not insert confirmation code."
 msgstr "Non poteva inserer le codice de confirmation."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:425
+#: actions/emailsettings.php:426
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
@@ -2595,57 +2627,60 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling Instant Messaging address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:445 actions/imsettings.php:377
-#: actions/smssettings.php:399
+#: actions/emailsettings.php:446 actions/imsettings.php:391
+#: actions/smssettings.php:398
 msgid "No pending confirmation to cancel."
 msgstr "Nulle confirmation pendente a cancellar."
 
 #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:450
+#: actions/emailsettings.php:451
 msgid "That is the wrong email address."
 msgstr "Iste adresse de e-mail es erronee."
 
 #. TRANS: Server error thrown on database error canceling e-mail address confirmation.
 #. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
-#: actions/emailsettings.php:459 actions/smssettings.php:413
+#: actions/emailsettings.php:460 actions/smssettings.php:412
 msgid "Could not delete email confirmation."
 msgstr "Non poteva deler confirmation de e-mail."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:464
+#: actions/emailsettings.php:465
 msgid "Email confirmation cancelled."
 msgstr "Confirmation de e-mail cancellate."
 
 #. TRANS: Message given trying to remove an e-mail address that is not
 #. TRANS: registered for the active user.
-#: actions/emailsettings.php:483
+#: actions/emailsettings.php:484
 msgid "That is not your email address."
 msgstr "Isto non es tu adresse de e-mail."
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:504
+#: actions/emailsettings.php:505
 msgid "The email address was removed."
 msgstr "Le adresse de e-mail ha essite removite."
 
 #. TRANS: Form validation error displayed when trying to remove an incoming e-mail address while no address has been set.
-#: actions/emailsettings.php:518 actions/smssettings.php:555
+#: actions/emailsettings.php:519 actions/smssettings.php:554
 msgid "No incoming email address."
 msgstr "Nulle adresse de e-mail entrante."
 
 #. TRANS: Server error thrown on database error removing incoming e-mail address.
 #. TRANS: Server error thrown on database error adding incoming e-mail address.
-#: actions/emailsettings.php:530 actions/emailsettings.php:554
-#: actions/smssettings.php:565 actions/smssettings.php:588
+#. TRANS: Server error displayed when the user could not be updated in SMS settings.
+#: actions/emailsettings.php:531 actions/emailsettings.php:555
+#: actions/smssettings.php:565 actions/smssettings.php:590
 msgid "Could not update user record."
 msgstr "Non poteva actualisar le datos del usator."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:534 actions/smssettings.php:568
+#. TRANS: Confirmation text after updating SMS settings.
+#: actions/emailsettings.php:535 actions/smssettings.php:569
 msgid "Incoming email address removed."
 msgstr "Adresse de e-mail entrante removite."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:558 actions/smssettings.php:591
+#. TRANS: Confirmation text after updating SMS settings.
+#: actions/emailsettings.php:559 actions/smssettings.php:594
 msgid "New incoming email address added."
 msgstr "Nove adresse de e-mail entrante addite."
 
@@ -2656,9 +2691,8 @@ msgstr "Iste nota es ja favorite!"
 
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
 #: actions/favor.php:95
-#, fuzzy
-msgid "Disfavor favorite"
-msgstr "Disfavorir favorite"
+msgid "Disfavor favorite."
+msgstr "Disfavorir favorite."
 
 #. TRANS: Page title for first page of favorited notices.
 #. TRANS: Title for favourited notices section.
@@ -2709,9 +2743,8 @@ msgstr ""
 #. TRANS: %s is a user's nickname.
 #. TRANS: Title for first page of favourite notices of a user.
 #. TRANS: %s is the user for whom the favourite notices are displayed.
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing own favourited notices.
 #: actions/favoritesrss.php:111 actions/showfavorites.php:76
-#: lib/personalgroupnav.php:122
+#: lib/personalgroupnav.php:110
 #, php-format
 msgid "%s's favorite notices"
 msgstr "Notas favorite de %s"
@@ -2897,14 +2930,12 @@ msgstr ""
 
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
 #: actions/groupblock.php:191
-#, fuzzy
-msgid "Do not block this user from this group"
+msgid "Do not block this user from this group."
 msgstr "Non blocar iste usator de iste gruppo."
 
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
 #: actions/groupblock.php:198
-#, fuzzy
-msgid "Block this user from this group"
+msgid "Block this user from this group."
 msgstr "Blocar iste usator de iste gruppo."
 
 #. TRANS: Server error displayed when trying to block a user from a group fails because of an application error.
@@ -2913,6 +2944,7 @@ msgid "Database error blocking user from group."
 msgstr "Error del base de datos al blocar le usator del gruppo."
 
 #. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
+#. TRANS: Client error displayed trying to find a user by ID without providing an ID.
 #: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr "Nulle ID."
@@ -2942,7 +2974,7 @@ msgid "Unable to update your design settings."
 msgstr "Impossibile actualisar le configurationes del apparentia."
 
 #. TRANS: Form text to confirm saved group design settings.
-#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:222
+#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:239
 msgid "Design preferences saved."
 msgstr "Preferentias de apparentia salveguardate."
 
@@ -3007,7 +3039,7 @@ msgid "A list of the users in this group."
 msgstr "Un lista de usatores in iste gruppo."
 
 #. TRANS: Indicator in group members list that this user is a group administrator.
-#: actions/groupmembers.php:190
+#: actions/groupmembers.php:190 lib/action.php:581
 msgid "Admin"
 msgstr "Administrator"
 
@@ -3099,8 +3131,10 @@ msgid "Group search"
 msgstr "Recerca de gruppos"
 
 #. TRANS: Text on page where groups can be searched if no results were found for a query.
-#: actions/groupsearch.php:82 actions/noticesearch.php:117
-#: actions/peoplesearch.php:83
+#. TRANS: Text for notice search results is the query had no results.
+#. TRANS: Message on the "People search" page where a query has no results.
+#: actions/groupsearch.php:82 actions/noticesearch.php:122
+#: actions/peoplesearch.php:87
 msgid "No results."
 msgstr "Nulle resultato."
 
@@ -3137,160 +3171,170 @@ msgid "User is not blocked from group."
 msgstr "Le usator non es blocate del gruppo."
 
 #. TRANS: Server error displayed when unblocking a user from a group fails because of an unknown error.
+#. TRANS: Server error displayed when removing a user block.
 #: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "Error de remover le blocada."
 
 #. TRANS: Title for Instant Messaging settings.
-#: actions/imsettings.php:58
+#: actions/imsettings.php:56
 msgid "IM settings"
 msgstr "Configuration de messageria instantanee"
 
 #. 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.
-#: actions/imsettings.php:71
-#, php-format
+#: actions/imsettings.php:69
+#, fuzzy, php-format
 msgid ""
-"You can send and receive notices through Jabber/Google Talk [instant "
-"messages](%%doc.im%%). Configure your address and settings below."
+"You can send and receive notices through instant messaging [instant messages]"
+"(%%doc.im%%). Configure your addresses and settings below."
 msgstr ""
 "Tu pote inviar e reciper notas per [messages instantanee](%%doc.im%%) de "
 "Jabber/Google Talk. Configura tu adresse e parametros hic infra."
 
-#. TRANS: Message given in the Instant Messaging settings if XMPP is not enabled on the site.
+#. TRANS: Message given in the IM settings if IM is not enabled on the site.
 #: actions/imsettings.php:90
 msgid "IM is not available."
 msgstr "Messageria instantanee non disponibile."
 
-#. TRANS: Form legend for Instant Messaging settings form.
-#. TRANS: Field label for Instant Messaging address input in Instant Messaging settings form.
-#: actions/imsettings.php:102 actions/imsettings.php:132
-msgid "IM address"
-msgstr "Adresse de messageria instantanee"
+#: actions/imsettings.php:116
+#, fuzzy, php-format
+msgid "Current confirmed %s address."
+msgstr "Adresse de e-mail actualmente confirmate."
 
-#: actions/imsettings.php:109
-msgid "Current confirmed Jabber/Google Talk address."
-msgstr "Adresse Jabber/Google Talk actualmente confirmate."
-
-#. TRANS: Form note in Instant Messaging settings form.
-#. TRANS: %s is the Instant Messaging address set for the site.
-#: actions/imsettings.php:120
-#, php-format
+#. TRANS: Form note in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:128
+#, fuzzy, php-format
 msgid ""
-"Awaiting confirmation on this address. Check your Jabber/Google Talk account "
-"for a message with further instructions. (Did you add %s to your buddy list?)"
+"Awaiting confirmation on this address. Check your %s account for a message "
+"with further instructions. (Did you add %s to your buddy list?)"
 msgstr ""
 "Iste adresse attende confirmation. Lege in tu conto Jabber/Google Talk un "
 "message con ulterior instructiones. (Ha tu addite %s a tu lista de amicos?)"
 
-#. TRANS: IM address input field instructions in Instant Messaging settings form.
-#. TRANS: %s is the Instant Messaging address set for the site.
-#. TRANS: Do not translate "example.org". It is one of the domain names reserved for use in examples by
-#. TRANS: http://www.rfc-editor.org/rfc/rfc2606.txt. Any other domain may be owned by a legitimate
-#. TRANS: person or organization.
-#: actions/imsettings.php:139
-#, php-format
-msgid ""
-"Jabber or Google Talk address, like \"UserName@example.org\". First, make "
-"sure to add %s to your buddy list in your IM client or on Google Talk."
-msgstr ""
-"Un adresse Jabber o Google Talk, como \"nomine@example.org\". Primo, "
-"assecura te de adder %s a tu lista de amicos in tu cliente de messageria "
-"instantanee o in Google Talk."
+#: actions/imsettings.php:140
+msgid "IM address"
+msgstr "Adresse de messageria instantanee"
 
-#. TRANS: Form legend for Instant Messaging preferences form.
-#: actions/imsettings.php:154
-msgid "IM preferences"
+#: actions/imsettings.php:142
+#, php-format
+msgid "%s screenname."
+msgstr ""
+
+#. TRANS: Header for IM preferences form.
+#: actions/imsettings.php:163
+#, fuzzy
+msgid "IM Preferences"
 msgstr "Preferentias de messageria instantanee"
 
-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:159
-msgid "Send me notices through Jabber/Google Talk."
-msgstr "Inviar me notas per Jabber/Google Talk."
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:174
+#, fuzzy
+msgid "Send me notices"
+msgstr "Inviar un nota"
 
-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:165
-msgid "Post a notice when my Jabber/Google Talk status changes."
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:176
+#, fuzzy
+msgid "Post a notice when my status changes."
 msgstr "Publicar un nota quando mi stato de Jabber/Google Talk cambia."
 
-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:171
-msgid ""
-"Send me replies through Jabber/Google Talk from people I'm not subscribed to."
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:178
+#, fuzzy
+msgid "Send me replies from people I'm not subscribed to."
 msgstr ""
 "Inviar me responsas per Jabber/Google Talk de personas al quales io non es "
 "subscribite."
 
-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:178
-msgid "Publish a MicroID for my Jabber/Google Talk address."
-msgstr "Publicar un MicroID pro mi adresse Jabber/Google Talk."
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:181
+#, fuzzy
+msgid "Publish a MicroID"
+msgstr "Publicar un MicroID pro mi adresse de e-mail."
 
-#. TRANS: Confirmation message for successful Instant Messaging preferences save.
-#: actions/imsettings.php:283 actions/othersettings.php:192
+#. TRANS: Server error thrown on database error updating IM preferences.
+#: actions/imsettings.php:291
+#, fuzzy
+msgid "Couldn't update IM preferences."
+msgstr "Non poteva actualisar le usator."
+
+#. TRANS: Confirmation message for successful IM preferences save.
+#. TRANS: Confirmation message after saving preferences.
+#: actions/imsettings.php:298 actions/urlsettings.php:244
 msgid "Preferences saved."
 msgstr "Preferentias confirmate."
 
-#. TRANS: Message given saving Instant Messaging address without having provided one.
-#: actions/imsettings.php:304
-msgid "No Jabber ID."
-msgstr "Nulle ID de Jabber."
+#. TRANS: Message given saving IM address without having provided one.
+#: actions/imsettings.php:320
+#, fuzzy
+msgid "No screenname."
+msgstr "Nulle pseudonymo."
 
-#. TRANS: Message given saving Instant Messaging address that cannot be normalised.
-#: actions/imsettings.php:312
-msgid "Cannot normalize that Jabber ID."
+#: actions/imsettings.php:325
+#, fuzzy
+msgid "No transport."
+msgstr "Nulle nota."
+
+#. TRANS: Message given saving IM address that cannot be normalised.
+#: actions/imsettings.php:333
+#, fuzzy
+msgid "Cannot normalize that screenname"
 msgstr "Impossibile normalisar iste ID de Jabber."
 
-#. TRANS: Message given saving Instant Messaging address that not valid.
-#: actions/imsettings.php:317
-msgid "Not a valid Jabber ID."
-msgstr "ID de Jabber non valide."
+#. TRANS: Message given saving IM address that not valid.
+#: actions/imsettings.php:340
+#, fuzzy
+msgid "Not a valid screenname"
+msgstr "Non un pseudonymo valide."
 
-#. TRANS: Message given saving Instant Messaging address that is already set.
-#: actions/imsettings.php:321
-msgid "That is already your Jabber ID."
-msgstr "Isto es ja tu ID de Jabber."
-
-#. TRANS: Message given saving Instant Messaging address that is already set for another user.
-#: actions/imsettings.php:325
-msgid "Jabber ID already belongs to another user."
+#. TRANS: Message given saving IM address that is already set for another user.
+#: actions/imsettings.php:344
+#, fuzzy
+msgid "Screenname already belongs to another user."
 msgstr "Le ID de Jabber pertine ja a un altere usator."
 
-#. TRANS: Message given saving valid Instant Messaging address that is to be confirmed.
-#. TRANS: %s is the Instant Messaging address set for the site.
-#: actions/imsettings.php:353
-#, php-format
-msgid ""
-"A confirmation code was sent to the IM address you added. You must approve %"
-"s for sending messages to you."
+#. TRANS: Message given saving valid IM address that is to be confirmed.
+#: actions/imsettings.php:369
+#, fuzzy
+msgid "A confirmation code was sent to the IM address you added."
 msgstr ""
 "Un codice de confirmation ha essite inviate al adresse de messageria "
 "instantanee specificate. Tu debe approbar que %s invia messages a te."
 
-#. TRANS: Message given canceling Instant Messaging address confirmation for the wrong IM address.
-#: actions/imsettings.php:382
+#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#: actions/imsettings.php:396
 msgid "That is the wrong IM address."
 msgstr "Iste adresse de messageria instantanee es erronee."
 
-#. TRANS: Server error thrown on database error canceling Instant Messaging address confirmation.
-#: actions/imsettings.php:391
-msgid "Could not delete IM confirmation."
+#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#: actions/imsettings.php:405
+#, fuzzy
+msgid "Couldn't delete confirmation."
 msgstr "Non poteva deler confirmation de messageria instantanee."
 
-#. TRANS: Message given after successfully canceling Instant Messaging address confirmation.
-#: actions/imsettings.php:396
+#. TRANS: Message given after successfully canceling IM address confirmation.
+#: actions/imsettings.php:410
 msgid "IM confirmation cancelled."
 msgstr "Confirmation de messageria instantanee cancellate."
 
-#. TRANS: Message given trying to remove an Instant Messaging address that is not
+#. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.
-#: actions/imsettings.php:417
-msgid "That is not your Jabber ID."
-msgstr "Isto non es tu ID de Jabber."
+#: actions/imsettings.php:434
+#, fuzzy
+msgid "That is not your screenname."
+msgstr "Isto non es tu numero de telephono."
+
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#: actions/imsettings.php:443
+#, fuzzy
+msgid "Couldn't update user im prefs."
+msgstr "Non poteva actualisar le datos del usator."
 
 #. TRANS: Message given after successfully removing a registered Instant Messaging address.
-#: actions/imsettings.php:440
+#: actions/imsettings.php:451
 msgid "The IM address was removed."
 msgstr "Le adresse de messageria instantanee ha essite removite."
 
@@ -3503,7 +3547,7 @@ msgid "You must be logged in to join a group."
 msgstr "Tu debe aperir un session pro facer te membro de un gruppo."
 
 #. TRANS: Title for join group page after joining.
-#: actions/joingroup.php:147
+#: actions/joingroup.php:148
 #, php-format
 msgctxt "TITLE"
 msgid "%1$s joined group %2$s"
@@ -3632,7 +3676,7 @@ msgstr "Le URL de un imagine a monstrar con le licentia."
 #. TRANS: Submit button title.
 #: actions/licenseadminpanel.php:311 actions/sessionsadminpanel.php:199
 #: actions/siteadminpanel.php:292 actions/snapshotadminpanel.php:245
-#: actions/tagother.php:154 lib/applicationeditform.php:357
+#: actions/tagother.php:133 lib/applicationeditform.php:357
 msgid "Save"
 msgstr "Salveguardar"
 
@@ -3640,42 +3684,44 @@ msgstr "Salveguardar"
 msgid "Save license settings"
 msgstr "Salveguardar configurationes de licentia"
 
-#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
+#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
+#: actions/login.php:97 actions/otp.php:62 actions/register.php:130
 msgid "Already logged in."
 msgstr "Tu es jam authenticate."
 
-#: actions/login.php:148
+#: actions/login.php:125
 msgid "Incorrect username or password."
 msgstr "Nomine de usator o contrasigno incorrecte."
 
-#: actions/login.php:154 actions/otp.php:120
+#. TRANS: Server error displayed when a user object could not be created trying to login using "one time password login".
+#: actions/login.php:131 actions/otp.php:127
 msgid "Error setting user. You are probably not authorized."
 msgstr ""
 "Error de acceder al conto de usator. Tu probabilemente non es autorisate."
 
-#: actions/login.php:210 actions/login.php:263
+#: actions/login.php:185 actions/login.php:236 lib/action.php:598
 msgid "Login"
 msgstr "Aperir session"
 
-#: actions/login.php:249
+#: actions/login.php:222
 msgid "Login to site"
 msgstr "Authenticar te a iste sito"
 
-#: actions/login.php:258 actions/register.php:490
+#: actions/login.php:231 actions/register.php:469
 msgid "Remember me"
 msgstr "Memorar me"
 
-#: actions/login.php:259 actions/register.php:492
+#: actions/login.php:232 actions/register.php:471
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 "Aperir session automaticamente in le futuro; non pro computatores usate in "
 "commun!"
 
-#: actions/login.php:269
+#: actions/login.php:241
 msgid "Lost or forgotten password?"
 msgstr "Contrasigno perdite o oblidate?"
 
-#: actions/login.php:288
+#: actions/login.php:259
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -3683,11 +3729,11 @@ msgstr ""
 "Pro motivos de securitate, per favor re-entra tu nomine de usator e "
 "contrasigno ante de cambiar tu configurationes."
 
-#: actions/login.php:292
+#: actions/login.php:263
 msgid "Login with your username and password."
 msgstr "Aperi un session con tu nomine de usator e contrasigno."
 
-#: actions/login.php:295
+#: actions/login.php:266
 #, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -3811,7 +3857,9 @@ msgstr "Nove nota"
 msgid "Notice posted"
 msgstr "Nota publicate"
 
-#: actions/noticesearch.php:68
+#. TRANS: Instructions for Notice search page.
+#. TRANS: %%site.name%% is the name of the StatusNet site.
+#: actions/noticesearch.php:69
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -3820,16 +3868,21 @@ msgstr ""
 "Cerca notas in %%site.name%% per contento. Separa terminos de recerca per "
 "spatios; illos debe haber al minus 3 characteres."
 
-#: actions/noticesearch.php:78
+#. TRANS: Title of the page where users can search for notices.
+#: actions/noticesearch.php:80
 msgid "Text search"
 msgstr "Recerca de texto"
 
-#: actions/noticesearch.php:91
+#. TRANS: Test in RSS notice search.
+#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
+#: actions/noticesearch.php:95
 #, php-format
 msgid "Search results for \"%1$s\" on %2$s"
 msgstr "Resultatos del recerca de \"%1$s\" in %2$s"
 
-#: actions/noticesearch.php:121
+#. TRANS: Text for logged in users making a query for notices without results.
+#. TRANS: This message contains a Markdown link.
+#: actions/noticesearch.php:128
 #, php-format
 msgid ""
 "Be the first to [post on this topic](%%%%action.newnotice%%%%?"
@@ -3838,7 +3891,9 @@ msgstr ""
 "Sia le prime a [publicar un nota super iste topico](%%%%action.newnotice%%%%?"
 "status_textarea=%s)!"
 
-#: actions/noticesearch.php:124
+#. TRANS: Text for not logged in users making a query for notices without results.
+#. TRANS: This message contains Markdown links.
+#: actions/noticesearch.php:133
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and be the first to "
@@ -3848,14 +3903,17 @@ msgstr ""
 "a [publicar un nota super iste topico](%%%%action.newnotice%%%%?"
 "status_textarea=%s)?"
 
-#: actions/noticesearchrss.php:96
+#. TRANS: RSS notice search feed title. %s is the query.
+#: actions/noticesearchrss.php:95
 #, php-format
 msgid "Updates with \"%s\""
 msgstr "Actualisationes con \"%s\""
 
-#: actions/noticesearchrss.php:98
-#, fuzzy, php-format
-msgid "Updates matching search term \"%1$s\" on %2$s!"
+#. TRANS: RSS notice search feed description.
+#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
+#: actions/noticesearchrss.php:99
+#, php-format
+msgid "Updates matching search term \"%1$s\" on %2$s."
 msgstr "Actualisationes correspondente al termino de recerca \"%1$s\" in %2$s."
 
 #: actions/nudge.php:85
@@ -3875,51 +3933,51 @@ msgid "Nudge sent!"
 msgstr "Pulsata inviate!"
 
 #. TRANS: Message displayed to an anonymous user trying to view OAuth application list.
-#: actions/oauthappssettings.php:60
+#: actions/oauthappssettings.php:57
 msgid "You must be logged in to list your applications."
 msgstr "Tu debe aperir un session pro listar tu applicationes."
 
 #. TRANS: Page title for OAuth applications
-#: actions/oauthappssettings.php:76
+#: actions/oauthappssettings.php:73
 msgid "OAuth applications"
 msgstr "Applicationes OAuth"
 
 #. TRANS: Page instructions for OAuth applications
-#: actions/oauthappssettings.php:88
+#: actions/oauthappssettings.php:85
 msgid "Applications you have registered"
 msgstr "Applicationes que tu ha registrate"
 
 #. TRANS: Empty list message on page with OAuth applications.
-#: actions/oauthappssettings.php:141
+#: actions/oauthappssettings.php:138
 #, php-format
 msgid "You have not registered any applications yet."
 msgstr "Tu non ha ancora registrate alcun application."
 
 #. TRANS: Title for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:71
+#: actions/oauthconnectionssettings.php:69
 msgid "Connected applications"
 msgstr "Applicationes connectite"
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:83
+#: actions/oauthconnectionssettings.php:80
 msgid "The following connections exist for your account."
 msgstr "Le sequente connexiones existe pro tu conto."
 
 #. TRANS: Client error when trying to revoke access for an application while not being a user of it.
-#: actions/oauthconnectionssettings.php:168
+#: actions/oauthconnectionssettings.php:165
 msgid "You are not a user of that application."
 msgstr "Tu non es usator de iste application."
 
 #. TRANS: Client error when revoking access has failed for some reason.
 #. TRANS: %s is the application ID revoking access failed for.
-#: actions/oauthconnectionssettings.php:183
+#: actions/oauthconnectionssettings.php:180
 #, php-format
 msgid "Unable to revoke access for application: %s."
 msgstr "Impossibile revocar le accesso del application: %s."
 
 #. TRANS: Success message after revoking access for an application.
 #. TRANS: %1$s is the application name, %2$s is the first part of the user token.
-#: actions/oauthconnectionssettings.php:202
+#: actions/oauthconnectionssettings.php:199
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -3929,14 +3987,14 @@ msgstr ""
 "comenciante con %2$s."
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:213
+#: actions/oauthconnectionssettings.php:210
 msgid "You have not authorized any applications to use your account."
 msgstr "Tu non ha autorisate alcun application a usar tu conto."
 
 #. TRANS: Note for developers in the OAuth connection settings form.
 #. TRANS: This message contains a Markdown link. Do not separate "](".
 #. TRANS: %s is the URL to the OAuth settings.
-#: actions/oauthconnectionssettings.php:233
+#: actions/oauthconnectionssettings.php:230
 #, php-format
 msgid ""
 "Are you a developer? [Register an OAuth client application](%s) to use with "
@@ -3945,6 +4003,16 @@ msgstr ""
 "Es tu un programmator? [Registra un application cliente OAuth](%s) a usar "
 "con iste installation de StatusNet."
 
+#: actions/oembed.php:64
+#, php-format
+msgid "\"%s\" not found."
+msgstr "\"%s\" non trovate."
+
+#: actions/oembed.php:76
+#, php-format
+msgid "Notice %s not found."
+msgstr "Nota %s non trovate."
+
 #: actions/oembed.php:80 actions/shownotice.php:100
 msgid "Notice has no profile."
 msgstr "Le nota ha nulle profilo."
@@ -3954,6 +4022,16 @@ msgstr "Le nota ha nulle profilo."
 msgid "%1$s's status on %2$s"
 msgstr "Le stato de %1$s in %2$s"
 
+#: actions/oembed.php:95
+#, php-format
+msgid "Attachment %s not found."
+msgstr "Annexo %s non trovate."
+
+#: actions/oembed.php:136
+#, php-format
+msgid "\"%s\" not supported for oembed requests."
+msgstr "\"%s\" non es supportate pro le requestas \"oembed\"."
+
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
 #: actions/oembed.php:168
 #, php-format
@@ -3967,94 +4045,60 @@ msgid "Only %s URLs over plain HTTP please."
 msgstr "Solmente le URLs %s es permittite super HTTP simple."
 
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1205
-#: lib/apiaction.php:1232 lib/apiaction.php:1367
+#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1207
+#: lib/apiaction.php:1234 lib/apiaction.php:1369
 msgid "Not a supported data format."
 msgstr "Formato de datos non supportate."
 
+#. TRANS: ShortName in the OpenSearch interface when trying to find users.
 #: actions/opensearch.php:64
 msgid "People Search"
 msgstr "Recerca de personas"
 
-#: actions/opensearch.php:67
+#: actions/opensearch.php:68
 msgid "Notice Search"
 msgstr "Rercerca de notas"
 
-#: actions/othersettings.php:59
-msgid "Other settings"
-msgstr "Altere configurationes"
-
-#. TRANS: Instructions for tab "Other" in user profile settings.
-#: actions/othersettings.php:71
-msgid "Manage various other options."
-msgstr "Gestion de varie altere optiones."
-
-#. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
-#. TRANS: user's profile settings. Use of "free" is as in "open", indicating that the
-#. TRANS: information on the shortener site is freely distributable.
-#. TRANS: This message has one space at the beginning. Use your language's word separator
-#. TRANS: here if it has one (most likely a single space).
-#: actions/othersettings.php:113
-msgid " (free service)"
-msgstr " (servicio libere)"
-
-#. TRANS: Label for dropdown with URL shortener services.
-#: actions/othersettings.php:122
-msgid "Shorten URLs with"
-msgstr "Accurtar URLs con"
-
-#. TRANS: Tooltip for for dropdown with URL shortener services.
-#: actions/othersettings.php:124
-msgid "Automatic shortening service to use."
-msgstr "Le servicio de accurtamento automatic a usar."
-
-#. TRANS: Label for checkbox.
-#: actions/othersettings.php:130
-msgid "View profile designs"
-msgstr "Vider apparentias de profilo"
-
-#. TRANS: Tooltip for checkbox.
-#: actions/othersettings.php:132
-msgid "Show or hide profile designs."
-msgstr "Monstrar o celar apparentias de profilo."
-
-#. TRANS: Form validation error for form "Other settings" in user profile.
-#: actions/othersettings.php:164
-msgid "URL shortening service is too long (maximum 50 characters)."
-msgstr ""
-"Le servicio de accurtamento de URL es troppo longe (maximo 50 characteres)."
-
-#: actions/otp.php:69
+#. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
+#: actions/otp.php:70
 msgid "No user ID specified."
 msgstr "Nulle identificator de usator specificate."
 
-#: actions/otp.php:83
+#. TRANS: Client error displayed trying to use "one time password login" without specifying a login token.
+#: actions/otp.php:86
 msgid "No login token specified."
 msgstr "Nulle indicio de identification specificate."
 
-#: actions/otp.php:90
+#. TRANS: Client error displayed trying to use "one time password login" without requesting a login token.
+#: actions/otp.php:94
 msgid "No login token requested."
 msgstr "Nulle indicio de identification requestate."
 
-#: actions/otp.php:95
+#. TRANS: Client error displayed trying to use "one time password login" while specifying an invalid login token.
+#: actions/otp.php:100
 msgid "Invalid login token specified."
 msgstr "Indicio de identification invalide specificate."
 
-#: actions/otp.php:104
+#. TRANS: Client error displayed trying to use "one time password login" while specifying an expired login token.
+#: actions/otp.php:110
 msgid "Login token expired."
 msgstr "Le indicio de identification ha expirate."
 
-#: actions/outbox.php:58
+#. TRANS: Title for outbox for any but the fist page.
+#. TRANS: %1$s is the user nickname, %2$d is the page number.
+#: actions/outbox.php:57
 #, php-format
 msgid "Outbox for %1$s - page %2$d"
 msgstr "Cassa de exito de %1$s - pagina %2$d"
 
+#. TRANS: Title for first page of outbox.
 #: actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
 msgstr "Cassa de exito pro %s"
 
-#: actions/outbox.php:104
+#. TRANS: Instructions for outbox.
+#: actions/outbox.php:103
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr ""
 "Isto es tu cassa de exito, que lista le messages private que tu ha inviate."
@@ -4081,43 +4125,42 @@ msgstr "Ancian contrasigno"
 msgid "New password"
 msgstr "Nove contrasigno"
 
-#: actions/passwordsettings.php:109
-#, fuzzy
-msgid "6 or more characters"
+#: actions/passwordsettings.php:109 actions/register.php:416
+msgid "6 or more characters."
 msgstr "6 o plus characteres."
 
-#: actions/passwordsettings.php:113
-#, fuzzy
-msgid "Same as password above"
+#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#: actions/passwordsettings.php:113 actions/recoverpassword.php:264
+#: actions/register.php:420
+msgid "Same as password above."
 msgstr "Identic al contrasigno hic supra."
 
 #: actions/passwordsettings.php:117
 msgid "Change"
 msgstr "Cambiar"
 
-#: actions/passwordsettings.php:154 actions/register.php:238
+#: actions/passwordsettings.php:153 actions/register.php:223
 msgid "Password must be 6 or more characters."
 msgstr "Le contrasigno debe haber al minus 6 characteres."
 
-#: actions/passwordsettings.php:157 actions/register.php:241
+#: actions/passwordsettings.php:156 actions/register.php:226
 msgid "Passwords don't match."
 msgstr "Le contrasignos non corresponde."
 
-#: actions/passwordsettings.php:165
+#: actions/passwordsettings.php:164
 msgid "Incorrect old password"
 msgstr "Ancian contrasigno incorrecte"
 
-#: actions/passwordsettings.php:181
+#: actions/passwordsettings.php:180
 msgid "Error saving user; invalid."
 msgstr "Error de salveguardar le usator; invalide."
 
-#: actions/passwordsettings.php:186
-#, fuzzy
-msgid "Can't save new password."
+#. TRANS: Reset password form validation error message.
+#: actions/passwordsettings.php:185 actions/recoverpassword.php:418
+msgid "Cannot save new password."
 msgstr "Non pote salveguardar le nove contrasigno."
 
-#. TRANS: Title for password recovery page in password saved mode.
-#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
+#: actions/passwordsettings.php:191
 msgid "Password saved."
 msgstr "Contrasigno salveguardate."
 
@@ -4322,8 +4365,7 @@ msgid "Directory where backgrounds are located."
 msgstr "Cammino a ubi se trova le fundos de schermo."
 
 #. TRANS: Fieldset legens in Paths admin panel.
-#. TRANS: DT element label in attachment list.
-#: actions/pathsadminpanel.php:419 lib/attachmentlist.php:98
+#: actions/pathsadminpanel.php:419
 msgid "Attachments"
 msgstr "Annexos"
 
@@ -4391,7 +4433,9 @@ msgstr "Servitor verso le qual diriger le requestas SSL."
 msgid "Save paths"
 msgstr "Salveguardar camminos"
 
-#: actions/peoplesearch.php:52
+#. TRANS: Instructions for the "People search" page.
+#. TRANS: %%site.name%% is the name of the StatusNet site.
+#: actions/peoplesearch.php:54
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
@@ -4400,7 +4444,8 @@ msgstr ""
 "Cerca personas in %%site.name%% per nomine, loco o interesses. Separa le "
 "terminos per spatios; illos debe haber 3 characteres o plus."
 
-#: actions/peoplesearch.php:58
+#. TRANS: Title of a page where users can search for other users.
+#: actions/peoplesearch.php:61
 msgid "People search"
 msgstr "Recerca de personas"
 
@@ -4414,6 +4459,60 @@ msgstr "Etiquetta de personas invalide: %s."
 msgid "Users self-tagged with %1$s - page %2$d"
 msgstr "Usatores auto-etiquettate con %1$s - pagina %2$d"
 
+#. TRANS: Page title for AJAX form return when a disabling a plugin.
+#: actions/plugindisable.php:69
+msgctxt "plugin"
+msgid "Disabled"
+msgstr ""
+
+#. TRANS: Client error displayed trying to perform any request method other than POST.
+#. TRANS: Do not translate POST.
+#: actions/pluginenable.php:78 actions/subscribe.php:77
+msgid "This action only accepts POST requests."
+msgstr "Iste action accepta solmente le requestas de typo POST."
+
+#: actions/pluginenable.php:102
+#, fuzzy
+msgid "You cannot administer plugins."
+msgstr "Tu non pote deler usatores."
+
+#: actions/pluginenable.php:109
+#, fuzzy
+msgid "No such plugin."
+msgstr "Pagina non existe."
+
+#. TRANS: Page title for AJAX form return when enabling a plugin.
+#: actions/pluginenable.php:159
+msgctxt "plugin"
+msgid "Enabled"
+msgstr ""
+
+#. TRANS: Tab and title for plugins admin panel.
+#. TRANS: Menu item for site administration
+#: actions/pluginsadminpanel.php:56 actions/version.php:191
+#: lib/adminpanelaction.php:411
+msgid "Plugins"
+msgstr "Plug-ins"
+
+#. TRANS: Instructions at top of plugin admin page.
+#: actions/pluginsadminpanel.php:68
+msgid ""
+"Additional plugins can be enabled and configured manually. See the <a href="
+"\"http://status.net/wiki/Plugins\">online plugin documentation</a> for more "
+"details."
+msgstr ""
+
+#. TRANS: Admin form section header
+#: actions/pluginsadminpanel.php:84
+#, fuzzy
+msgid "Default plugins"
+msgstr "Lingua predefinite"
+
+#: actions/pluginsadminpanel.php:106
+msgid ""
+"All default plugins have been disabled from the site's configuration file."
+msgstr ""
+
 #: actions/postnotice.php:95
 msgid "Invalid notice content."
 msgstr "Le contento del nota es invalide."
@@ -4426,12 +4525,12 @@ msgstr ""
 "$s’."
 
 #. TRANS: Page title for profile settings.
-#: actions/profilesettings.php:59
+#: actions/profilesettings.php:60
 msgid "Profile settings"
 msgstr "Configurationes del profilo"
 
 #. TRANS: Usage instructions for profile settings.
-#: actions/profilesettings.php:70
+#: actions/profilesettings.php:71
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
@@ -4439,40 +4538,37 @@ msgstr ""
 "gente pote facer plus de te."
 
 #. TRANS: Profile settings form legend.
-#: actions/profilesettings.php:98
+#: actions/profilesettings.php:99
 msgid "Profile information"
 msgstr "Informationes del profilo"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109 actions/register.php:433
+#: actions/profilesettings.php:110 actions/register.php:412
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr "1-64 minusculas o numeros, sin punctuation o spatios."
 
 #. TRANS: Field label in form for profile settings.
-#. TRANS: Label for full group name (dt). Text hidden by default.
-#. TRANS: DT for full name in a profile.
-#: actions/profilesettings.php:113 actions/register.php:455
-#: actions/showgroup.php:255 actions/tagother.php:104
-#: lib/groupeditform.php:150 lib/userprofile.php:156
+#: actions/profilesettings.php:114 actions/register.php:434
+#: lib/groupeditform.php:150
 msgid "Full name"
 msgstr "Nomine complete"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:118 actions/register.php:460
+#: actions/profilesettings.php:119 actions/register.php:439
 #: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "Pagina personal"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:121
+#: actions/profilesettings.php:122 actions/register.php:441
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr "URL de tu pagina personal, blog o profilo in un altere sito."
 
 #. TRANS: Tooltip for field label in form for profile settings. Plural
 #. TRANS: is decided by the number of characters available for the
 #. TRANS: biography (%d).
-#: actions/profilesettings.php:129 actions/register.php:471
+#: actions/profilesettings.php:130 actions/register.php:450
 #, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4480,79 +4576,72 @@ msgstr[0] "Describe te e tu interesses in %d character"
 msgstr[1] "Describe te e tu interesses in %d characteres"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:135 actions/register.php:476
+#: actions/profilesettings.php:136 actions/register.php:455
 msgid "Describe yourself and your interests"
 msgstr "Describe te e tu interesses"
 
 #. TRANS: Text area label in form for profile settings where users can provide.
 #. TRANS: their biography.
-#: actions/profilesettings.php:139 actions/register.php:478
+#: actions/profilesettings.php:140 actions/register.php:457
 msgid "Bio"
 msgstr "Bio"
 
 #. TRANS: Field label in form for profile settings.
-#. TRANS: Label for group location (dt). Text hidden by default.
-#. TRANS: DT for location in a profile.
-#: actions/profilesettings.php:145 actions/register.php:483
-#: actions/showgroup.php:265 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:173
-#: lib/userprofile.php:172
+#: actions/profilesettings.php:146 actions/register.php:462
+#: lib/groupeditform.php:173
 msgid "Location"
 msgstr "Loco"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148 actions/register.php:485
+#: actions/profilesettings.php:149
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Ubi tu es, como \"Citate, Stato (o Region), Pais\""
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:153
+#: actions/profilesettings.php:154
 msgid "Share my current location when posting notices"
 msgstr "Divulgar mi loco actual quando io publica notas"
 
 #. TRANS: Field label in form for profile settings.
-#. TRANS: DT for tags in a profile.
-#: actions/profilesettings.php:161 actions/tagother.php:149
-#: actions/tagother.php:209 lib/subscriptionlist.php:106
-#: lib/subscriptionlist.php:108 lib/userprofile.php:220
+#: actions/profilesettings.php:162 actions/tagother.php:128
+#: actions/tagother.php:188 lib/subscriptionlist.php:104
+#: lib/subscriptionlist.php:106
 msgid "Tags"
 msgstr "Etiquettas"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:164
-#, fuzzy
+#: actions/profilesettings.php:165
 msgid ""
-"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- "
+"separated."
 msgstr ""
 "Etiquettas pro te (litteras, numeros, -, ., e _), separate per commas o "
 "spatios."
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:169
+#: actions/profilesettings.php:170
 msgid "Language"
 msgstr "Lingua"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:171
-#, fuzzy
-msgid "Preferred language"
+#: actions/profilesettings.php:172
+msgid "Preferred language."
 msgstr "Lingua preferite."
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:181
+#: actions/profilesettings.php:182
 msgid "Timezone"
 msgstr "Fuso horari"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:183
+#: actions/profilesettings.php:184
 msgid "What timezone are you normally in?"
 msgstr "In que fuso horari es tu normalmente?"
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:189
-#, fuzzy
+#: actions/profilesettings.php:190
 msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)"
+"Automatically subscribe to whoever subscribes to me (best for non-humans)."
 msgstr ""
 "Subscriber me automaticamente a qui se subscribe a me (utile pro non-"
 "humanos)."
@@ -4560,7 +4649,7 @@ msgstr ""
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Plural form is used based on the maximum number of allowed
 #. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:258 actions/register.php:229
+#: actions/profilesettings.php:259 actions/register.php:214
 #, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4568,47 +4657,47 @@ msgstr[0] "Bio es troppo longe (maximo %d character)."
 msgstr[1] "Bio es troppo longe (maximo %d characteres)."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:269 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:270 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr "Fuso horari non seligite."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:277
+#: actions/profilesettings.php:278
 msgid "Language is too long (maximum 50 characters)."
 msgstr "Lingua es troppo longe (maximo 50 characteres)."
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:291 actions/tagother.php:178
+#: actions/profilesettings.php:292
 #, php-format
-msgid "Invalid tag: \"%s\""
-msgstr "Etiquetta invalide: \"%s\""
+msgid "Invalid tag: \"%s\"."
+msgstr "Etiquetta invalide: \"%s\"."
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:347
+#: actions/profilesettings.php:348
 msgid "Could not update user for autosubscribe."
 msgstr "Non poteva actualisar le usator pro autosubscription."
 
 #. TRANS: Server error thrown when user profile location preference settings could not be updated.
-#: actions/profilesettings.php:405
+#: actions/profilesettings.php:406
 msgid "Could not save location prefs."
 msgstr "Non poteva salveguardar le preferentias de loco."
 
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:427 actions/tagother.php:200
+#: actions/profilesettings.php:428 actions/tagother.php:179
 msgid "Could not save tags."
 msgstr "Non poteva salveguardar etiquettas."
 
 #. TRANS: Confirmation shown when user profile settings are saved.
 #. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:436 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:437 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "Preferentias confirmate."
 
 #. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
 #. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:483 actions/restoreaccount.php:60
+#: actions/profilesettings.php:484 actions/restoreaccount.php:60
 msgid "Restore account"
 msgstr "Restaurar conto"
 
@@ -4686,6 +4775,12 @@ 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: Public RSS feed description. %s is the StatusNet site name.
+#: actions/publicrss.php:106
+#, php-format
+msgid "%s updates from everyone."
+msgstr "Actualisationes de totes in %s."
+
 #. TRANS: Title for public tag cloud.
 #: actions/publictagcloud.php:57
 msgid "Public tag cloud"
@@ -4727,10 +4822,6 @@ msgstr ""
 "Proque non [registrar un conto](%%action.register%%) e devenir le prime a "
 "publicar un?"
 
-#: actions/publictagcloud.php:146
-msgid "Tag cloud"
-msgstr "Etiquettario"
-
 #. TRANS: Client error displayed trying to recover password while already logged in.
 #: actions/recoverpassword.php:37
 msgid "You are already logged in!"
@@ -4821,6 +4912,11 @@ msgstr "Recuperar contrasigno"
 msgid "Password recovery requested"
 msgstr "Recuperation de contrasigno requestate"
 
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/recoverpassword.php:229
+msgid "Password saved"
+msgstr "Contrasigno salveguardate"
+
 #. TRANS: Title for password recovery page when an unknown action has been specified.
 #: actions/recoverpassword.php:232
 msgid "Unknown action"
@@ -4831,14 +4927,9 @@ msgstr "Action incognite"
 msgid "6 or more characters, and do not forget it!"
 msgstr "6 o plus characteres, e non oblida lo!"
 
-#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
-#: actions/recoverpassword.php:264 actions/register.php:441
-msgid "Same as password above."
-msgstr "Identic al contrasigno hic supra."
-
 #. TRANS: Button text for password reset form.
 #. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: actions/recoverpassword.php:268 lib/designsettings.php:264
+#: actions/recoverpassword.php:268 lib/designform.php:145
 msgctxt "BUTTON"
 msgid "Reset"
 msgstr "Reinitialisar"
@@ -4887,13 +4978,8 @@ msgstr "Le contrasigno debe haber 6 characteres o plus."
 msgid "Password and confirmation do not match."
 msgstr "Contrasigno e confirmation non corresponde."
 
-#. TRANS: Reset password form validation error message.
-#: actions/recoverpassword.php:418
-msgid "Cannot save new password."
-msgstr "Non pote salveguardar le nove contrasigno."
-
 #. TRANS: Server error displayed when something does wrong with the user object during password reset.
-#: actions/recoverpassword.php:426 actions/register.php:256
+#: actions/recoverpassword.php:426 actions/register.php:241
 msgid "Error setting user."
 msgstr "Error durante le configuration del usator."
 
@@ -4902,99 +4988,99 @@ msgstr "Error durante le configuration del usator."
 msgid "New password successfully saved. You are now logged in."
 msgstr "Nove contrasigno salveguardate con successo. Tu session es ora aperte."
 
-#: actions/register.php:92 actions/register.php:196 actions/register.php:413
+#: actions/redirecturl.php:70
+#, fuzzy
+msgid "No id parameter"
+msgstr "Nulle parametro de ID."
+
+#: actions/redirecturl.php:76
+#, fuzzy, php-format
+msgid "No such file \"%d\""
+msgstr "File non existe."
+
+#: actions/register.php:80 actions/register.php:181 actions/register.php:392
 msgid "Sorry, only invited people can register."
 msgstr "Pardono, solmente le personas invitate pote registrar se."
 
-#: actions/register.php:99
+#: actions/register.php:87
 msgid "Sorry, invalid invitation code."
 msgstr "Pardono, le codice de invitation es invalide."
 
-#: actions/register.php:119
+#: actions/register.php:106
 msgid "Registration successful"
 msgstr "Registration succedite"
 
-#: actions/register.php:121 actions/register.php:511
+#: actions/register.php:108 actions/register.php:490
 msgid "Register"
 msgstr "Crear conto"
 
-#: actions/register.php:142
+#: actions/register.php:128
 msgid "Registration not allowed."
 msgstr "Creation de conto non permittite."
 
-#: actions/register.php:209
-#, fuzzy
-msgid "You can't register if you don't agree to the license."
+#: actions/register.php:194
+msgid "You cannot register if you don't agree to the license."
 msgstr "Tu non pote crear un conto si tu non accepta le licentia."
 
-#: actions/register.php:218
+#: actions/register.php:203
 msgid "Email address already exists."
 msgstr "Le adresse de e-mail existe ja."
 
-#: actions/register.php:251 actions/register.php:273
+#: actions/register.php:236 actions/register.php:258
 msgid "Invalid username or password."
 msgstr "Nomine de usator o contrasigno invalide."
 
-#: actions/register.php:351
-#, fuzzy
+#: actions/register.php:333
 msgid ""
 "With this form you can create a new account. You can then post notices and "
-"link up to friends and colleagues. "
+"link up to friends and colleagues."
 msgstr ""
 "Con iste formulario tu pote crear un nove conto. Postea, tu pote publicar "
 "notas e mitter te in contacto con amicos e collegas."
 
-#: actions/register.php:437
-msgid "6 or more characters."
-msgstr "6 o plus characteres."
-
-#. TRANS: Link description in user account settings menu.
-#: actions/register.php:445 actions/register.php:449
-#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
+#: actions/register.php:424 actions/register.php:428
+#: actions/siteadminpanel.php:238 lib/settingsnav.php:92
 msgid "Email"
 msgstr "E-mail"
 
-#: actions/register.php:446 actions/register.php:450
-#, fuzzy
-msgid "Used only for updates, announcements, and password recovery"
+#: actions/register.php:425 actions/register.php:429
+msgid "Used only for updates, announcements, and password recovery."
 msgstr ""
 "Usate solmente pro actualisationes, notificationes e recuperation de "
 "contrasigno."
 
-#: actions/register.php:457
-#, fuzzy
-msgid "Longer name, preferably your \"real\" name"
+#: actions/register.php:436
+msgid "Longer name, preferably your \"real\" name."
 msgstr "Nomine plus longe, preferibilemente tu nomine \"real\"."
 
-#: actions/register.php:462
-#, fuzzy
-msgid "URL of your homepage, blog, or profile on another site"
-msgstr "URL de tu pagina personal, blog o profilo in un altere sito."
+#: actions/register.php:464
+msgid "Where you are, like \"City, State (or Region), Country\"."
+msgstr "Ubi tu es, como \"Citate, Stato (o Region), Pais\"."
 
-#: actions/register.php:523
+#: actions/register.php:503
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
 msgstr ""
 "io comprende que le contento e datos de %1$s es private e confidential."
 
-#: actions/register.php:533
+#: actions/register.php:513
 #, php-format
 msgid "My text and files are copyright by %1$s."
 msgstr "Le derecto de autor pro mi texto e files es in possession de %1$s."
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:537
+#: actions/register.php:517
 msgid "My text and files remain under my own copyright."
 msgstr "Le derecto de autor pro mi texto e files resta in mi possession."
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:540
+#: actions/register.php:520
 msgid "All rights reserved."
 msgstr "Tote le derectos reservate."
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:545
+#: actions/register.php:525
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -5004,7 +5090,7 @@ msgstr ""
 "contrasigno, adresse de e-mail, adresse de messageria instantanee, numero de "
 "telephono."
 
-#: actions/register.php:588
+#: actions/register.php:566
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -5036,7 +5122,7 @@ msgstr ""
 "\n"
 "Gratias pro inscriber te, e nos spera que iste servicio te place."
 
-#: actions/register.php:612
+#: actions/register.php:590
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5069,8 +5155,7 @@ msgid "User nickname"
 msgstr "Pseudonymo del usator"
 
 #: actions/remotesubscribe.php:129
-#, fuzzy
-msgid "Nickname of the user you want to follow"
+msgid "Nickname of the user you want to follow."
 msgstr "Le pseudonymo del usator que tu vole sequer."
 
 #: actions/remotesubscribe.php:132
@@ -5078,19 +5163,17 @@ msgid "Profile URL"
 msgstr "URL del profilo"
 
 #: actions/remotesubscribe.php:133
-#, fuzzy
-msgid "URL of your profile on another compatible microblogging service"
+msgid "URL of your profile on another compatible microblogging service."
 msgstr "URL de tu profilo in un altere servicio de microblogging compatibile."
 
 #. TRANS: Link text for link that will subscribe to a remote profile.
 #: actions/remotesubscribe.php:136 lib/subscribeform.php:139
-#: lib/userprofile.php:431
+#: lib/userprofile.php:402
 msgid "Subscribe"
 msgstr "Subscriber"
 
 #: actions/remotesubscribe.php:158
-#, fuzzy
-msgid "Invalid profile URL (bad format)"
+msgid "Invalid profile URL (bad format)."
 msgstr "URL de profilo invalide (mal formato)."
 
 #: actions/remotesubscribe.php:167
@@ -5123,7 +5206,7 @@ msgstr "Tu non pote repeter tu proprie nota."
 msgid "You already repeated that notice."
 msgstr "Tu ha ja repetite iste nota."
 
-#: actions/repeat.php:112 lib/noticelist.php:692
+#: actions/repeat.php:112 lib/noticelist.php:697
 msgid "Repeated"
 msgstr "Repetite"
 
@@ -5131,9 +5214,9 @@ msgstr "Repetite"
 msgid "Repeated!"
 msgstr "Repetite!"
 
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing @-replies.
+#. TRANS: RSS reply feed title. %s is a user nickname.
 #: actions/replies.php:126 actions/repliesrss.php:68
-#: lib/personalgroupnav.php:109
+#: lib/personalgroupnav.php:105
 #, php-format
 msgid "Replies to %s"
 msgstr "Responsas a %s"
@@ -5185,9 +5268,11 @@ msgstr ""
 "Tu pote tentar [pulsar %1$s](../%2$s) o [publicar alique a su attention](%%%%"
 "action.newnotice%%%%?status_textarea=%3$s)."
 
-#: actions/repliesrss.php:72
-#, fuzzy, php-format
-msgid "Replies to %1$s on %2$s!"
+#. TRANS: RSS reply feed description.
+#. TRANS: %1$s is a user nickname, %2$s is the StatusNet site name.
+#: actions/repliesrss.php:74
+#, php-format
+msgid "Replies to %1$s on %2$s."
 msgstr "Responsas a %1$s in %2$s."
 
 #. TRANS: Client exception displayed when trying to restore an account while not logged in.
@@ -5288,7 +5373,7 @@ msgstr "Tu non pote revocar rolos de usatores in iste sito."
 msgid "User doesn't have this role."
 msgstr "Le usator non ha iste rolo."
 
-#: actions/rsd.php:146 actions/version.php:159
+#: actions/rsd.php:142 actions/version.php:159
 msgid "StatusNet"
 msgstr "StatusNet"
 
@@ -5330,87 +5415,38 @@ msgstr "Producer informationes technic pro cercar defectos in sessiones."
 msgid "Save site settings"
 msgstr "Salveguardar configurationes del sito"
 
-#: actions/showapplication.php:82
+#: actions/showapplication.php:78
 msgid "You must be logged in to view an application."
 msgstr "Tu debe aperir un session pro vider un application."
 
-#: actions/showapplication.php:157
+#: actions/showapplication.php:151
 msgid "Application profile"
 msgstr "Profilo del application"
 
-#. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:159 lib/applicationeditform.php:177
-msgid "Icon"
-msgstr "Icone"
-
-#. TRANS: Form input field label for application name.
-#: actions/showapplication.php:169 actions/version.php:197
-#: lib/applicationeditform.php:190
-msgid "Name"
-msgstr "Nomine"
-
-#. TRANS: Form input field label.
-#: actions/showapplication.php:178 lib/applicationeditform.php:227
-msgid "Organization"
-msgstr "Organisation"
-
-#. TRANS: Form input field label.
-#: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:168
-msgid "Description"
-msgstr "Description"
-
-#. TRANS: Header for group statistics on a group page (h2).
-#. TRANS: H2 text for user statistics.
-#: actions/showapplication.php:192 actions/showgroup.php:460
-#: lib/profileaction.php:205
-msgid "Statistics"
-msgstr "Statisticas"
-
-#: actions/showapplication.php:203
+#: actions/showapplication.php:179
 #, php-format
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr "Create per %1$s - accesso %2$s per predefinition - %3$d usatores"
 
-#: actions/showapplication.php:213
+#: actions/showapplication.php:189
 msgid "Application actions"
 msgstr "Actiones de application"
 
-#: actions/showapplication.php:236
+#: actions/showapplication.php:212
 msgid "Reset key & secret"
 msgstr "Reinitialisar clave e secreto"
 
 #. TRANS: Title of form for deleting a user.
-#: actions/showapplication.php:252 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:64 lib/noticelist.php:673
+#: actions/showapplication.php:228 lib/deletegroupform.php:121
+#: lib/deleteuserform.php:64 lib/noticelist.php:678
 msgid "Delete"
 msgstr "Deler"
 
-#: actions/showapplication.php:261
+#: actions/showapplication.php:237
 msgid "Application info"
 msgstr "Info del application"
 
-#: actions/showapplication.php:263
-msgid "Consumer key"
-msgstr "Clave de consumitor"
-
-#: actions/showapplication.php:268
-msgid "Consumer secret"
-msgstr "Secreto de consumitor"
-
-#: actions/showapplication.php:273
-msgid "Request token URL"
-msgstr "URL del indicio de requesta"
-
-#: actions/showapplication.php:278
-msgid "Access token URL"
-msgstr "URL del indicio de accesso"
-
-#: actions/showapplication.php:283
-msgid "Authorize URL"
-msgstr "URL de autorisation"
-
-#: actions/showapplication.php:288
+#: actions/showapplication.php:255
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
@@ -5418,7 +5454,7 @@ msgstr ""
 "Nota: Nos supporta le signaturas HMAC-SHA1. Nos non accepta signaturas in "
 "texto simple."
 
-#: actions/showapplication.php:309
+#: actions/showapplication.php:275
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr "Es tu secur de voler reinitialisar tu clave e secreto de consumitor?"
 
@@ -5505,61 +5541,47 @@ msgstr "Gruppo %s"
 msgid "%1$s group, page %2$d"
 msgstr "Gruppo %1$s, pagina %2$d"
 
-#. TRANS: Group profile header (h2). Text hidden by default.
-#: actions/showgroup.php:223
-msgid "Group profile"
-msgstr "Profilo del gruppo"
-
-#. TRANS: Label for group URL (dt). Text hidden by default.
-#. TRANS: DT for URL in a profile.
-#: actions/showgroup.php:273 actions/tagother.php:118
-#: actions/userauthorization.php:175 lib/userprofile.php:186
-msgid "URL"
-msgstr "URL"
-
 #. TRANS: Label for group description or group note (dt). Text hidden by default.
-#. TRANS: DT for note in a profile.
-#: actions/showgroup.php:285 actions/tagother.php:128
-#: actions/userauthorization.php:187 lib/userprofile.php:204
+#: actions/showgroup.php:266
 msgid "Note"
 msgstr "Nota"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:296 lib/groupeditform.php:180
+#: actions/showgroup.php:277 lib/groupeditform.php:180
 msgid "Aliases"
 msgstr "Aliases"
 
 #. TRANS: Group actions header (h2). Text hidden by default.
-#: actions/showgroup.php:313
+#: actions/showgroup.php:294
 msgid "Group actions"
 msgstr "Actiones del gruppo"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:357
+#: actions/showgroup.php:338
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
 msgstr "Syndication de notas pro le gruppo %s (RSS 1.0)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:364
+#: actions/showgroup.php:345
 #, php-format
 msgid "Notice feed for %s group (RSS 2.0)"
 msgstr "Syndication de notas pro le gruppo %s (RSS 2.0)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:371
+#: actions/showgroup.php:352
 #, php-format
 msgid "Notice feed for %s group (Atom)"
 msgstr "Syndication de notas pro le gruppo %s (Atom)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:377
+#: actions/showgroup.php:358
 #, php-format
 msgid "FOAF for %s group"
 msgstr "Amico de un amico pro le gruppo %s"
 
 #. TRANS: Header for mini list of group members on a group page (h2).
-#: actions/showgroup.php:414
+#: actions/showgroup.php:395
 msgid "Members"
 msgstr "Membros"
 
@@ -5567,25 +5589,30 @@ msgstr "Membros"
 #. TRANS: Text for user subscription statistics if the user has no subscriptions.
 #. TRANS: Text for user subscriber statistics if user has no subscribers.
 #. TRANS: Text for user user group membership statistics if user is not a member of any group.
-#: actions/showgroup.php:420 lib/profileaction.php:137
+#: actions/showgroup.php:401 lib/profileaction.php:137
 #: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
-#: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
+#: lib/subscriptionlist.php:123 lib/tagcloudsection.php:71
 msgid "(None)"
 msgstr "(Nulle)"
 
 #. TRANS: Link to all group members from mini list of group members if group has more than n members.
-#: actions/showgroup.php:429
+#: actions/showgroup.php:410
 msgid "All members"
 msgstr "Tote le membros"
 
-#. TRANS: Label for creation date in statistics on group page.
-#: actions/showgroup.php:465
+#. TRANS: Header for group statistics on a group page (h2).
+#. TRANS: H2 text for user statistics.
+#: actions/showgroup.php:441 lib/profileaction.php:205
+msgid "Statistics"
+msgstr "Statisticas"
+
+#: actions/showgroup.php:444
 msgctxt "LABEL"
 msgid "Created"
 msgstr "Create"
 
 #. TRANS: Label for member count in statistics on group page.
-#: actions/showgroup.php:473
+#: actions/showgroup.php:449
 msgctxt "LABEL"
 msgid "Members"
 msgstr "Membros"
@@ -5594,7 +5621,7 @@ msgstr "Membros"
 #. TRANS: **%s** is the group alias, %%%%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).
-#: actions/showgroup.php:488
+#: actions/showgroup.php:464
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5612,7 +5639,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: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
-#: actions/showgroup.php:498
+#: actions/showgroup.php:474
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5626,7 +5653,7 @@ msgstr ""
 "lor vita e interesses. "
 
 #. TRANS: Header for list of group administrators on a group page (h2).
-#: actions/showgroup.php:527
+#: actions/showgroup.php:503
 msgid "Admins"
 msgstr "Administratores"
 
@@ -5665,7 +5692,7 @@ msgid "%1$s tagged %2$s"
 msgstr "%1$s etiquettate con %2$s"
 
 #. TRANS: Page title showing tagged notices in one user's stream.
-#. TRANS: %1$s is the username, %2$s is the hash tag, %1$d is the page number.
+#. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
 #: actions/showstream.php:74
 #, php-format
 msgid "%1$s tagged %2$s, page %3$d"
@@ -5712,14 +5739,14 @@ msgid "FOAF for %s"
 msgstr "Amico de un amico pro %s"
 
 #. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
-#: actions/showstream.php:211
+#: actions/showstream.php:205
 #, php-format
 msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr ""
 "Isto es le chronologia pro %1$s, ma %1$s non ha ancora publicate alique."
 
 #. TRANS: Second sentence of empty list message for a stream for the user themselves.
-#: actions/showstream.php:217
+#: actions/showstream.php:211
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
@@ -5729,7 +5756,7 @@ msgstr ""
 
 #. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:221
+#: actions/showstream.php:215
 #, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
@@ -5740,7 +5767,7 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:264
+#: actions/showstream.php:258
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5756,7 +5783,7 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:271
+#: actions/showstream.php:265
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5768,7 +5795,7 @@ msgstr ""
 "[StatusNet](http://status.net/). "
 
 #. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
-#: actions/showstream.php:328
+#: actions/showstream.php:322
 #, php-format
 msgid "Repeat of %s"
 msgstr "Repetition de %s"
@@ -5915,76 +5942,74 @@ msgstr ""
 
 #. TRANS: Title for button to save site notice in admin panel.
 #: actions/sitenoticeadminpanel.php:201
-#, fuzzy
-msgid "Save site notice"
+msgid "Save site notice."
 msgstr "Salveguardar aviso del sito."
 
 #. TRANS: Title for SMS settings.
-#: actions/smssettings.php:57
+#: actions/smssettings.php:56
 msgid "SMS settings"
 msgstr "Parametros de SMS"
 
 #. TRANS: SMS settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/smssettings.php:71
+#: actions/smssettings.php:70
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr "Tu pote reciper messages SMS per e-mail ab %%site.name%%."
 
 #. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
-#: actions/smssettings.php:93
+#: actions/smssettings.php:92
 msgid "SMS is not available."
 msgstr "SMS non es disponibile."
 
 #. TRANS: Form legend for SMS settings form.
-#: actions/smssettings.php:107
+#: actions/smssettings.php:106
 msgid "SMS address"
 msgstr "Adresse SMS"
 
 #. TRANS: Form guide in SMS settings form.
-#: actions/smssettings.php:116
+#: actions/smssettings.php:115
 msgid "Current confirmed SMS-enabled phone number."
 msgstr "Numero de telephono actual e confirmate con servicio SMS."
 
 #. TRANS: Form guide in IM settings form.
-#: actions/smssettings.php:129
+#: actions/smssettings.php:128
 msgid "Awaiting confirmation on this phone number."
 msgstr "Iste numero de telephono attende confirmation."
 
 #. TRANS: Field label for SMS address input in SMS settings form.
-#: actions/smssettings.php:138
+#: actions/smssettings.php:137
 msgid "Confirmation code"
 msgstr "Codice de confirmation"
 
 #. TRANS: Form field instructions in SMS settings form.
-#: actions/smssettings.php:140
+#: actions/smssettings.php:139
 msgid "Enter the code you received on your phone."
 msgstr "Entra le codice que tu ha recipite in tu telephono."
 
 #. TRANS: Button label to confirm SMS confirmation code in SMS settings.
-#: actions/smssettings.php:144
+#: actions/smssettings.php:143
 msgctxt "BUTTON"
 msgid "Confirm"
 msgstr "Confirmar"
 
 #. TRANS: Field label for SMS phone number input in SMS settings form.
-#: actions/smssettings.php:149
+#: actions/smssettings.php:148
 msgid "SMS phone number"
 msgstr "Numero de telephono pro SMS"
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
-#: actions/smssettings.php:152
-#, fuzzy
-msgid "Phone number, no punctuation or spaces, with area code"
+#: actions/smssettings.php:151
+msgid "Phone number, no punctuation or spaces, with area code."
 msgstr "Numero de telephono, sin punctuation o spatios, con indicativo."
 
 #. TRANS: Form legend for SMS preferences form.
-#: actions/smssettings.php:191
+#: actions/smssettings.php:190
 msgid "SMS preferences"
 msgstr "Preferentias de SMS"
 
 #. TRANS: Checkbox label in SMS preferences form.
-#: actions/smssettings.php:197
+#: actions/smssettings.php:196
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
@@ -5993,32 +6018,32 @@ msgstr ""
 "de mi operator."
 
 #. TRANS: Confirmation message for successful SMS preferences save.
-#: actions/smssettings.php:308
+#: actions/smssettings.php:307
 msgid "SMS preferences saved."
 msgstr "Preferentias de SMS confirmate."
 
 #. TRANS: Message given saving SMS phone number without having provided one.
-#: actions/smssettings.php:330
+#: actions/smssettings.php:329
 msgid "No phone number."
 msgstr "Nulle numero de telephono."
 
 #. TRANS: Message given saving SMS phone number without having selected a carrier.
-#: actions/smssettings.php:336
+#: actions/smssettings.php:335
 msgid "No carrier selected."
 msgstr "Nulle operator seligite."
 
 #. TRANS: Message given saving SMS phone number that is already set.
-#: actions/smssettings.php:344
+#: actions/smssettings.php:343
 msgid "That is already your phone number."
 msgstr "Isto es ja tu numero de telephono."
 
 #. TRANS: Message given saving SMS phone number that is already set for another user.
-#: actions/smssettings.php:348
+#: actions/smssettings.php:347
 msgid "That phone number already belongs to another user."
 msgstr "Iste numero de telephono pertine ja a un altere usator."
 
 #. TRANS: Message given saving valid SMS phone number that is to be confirmed.
-#: actions/smssettings.php:376
+#: actions/smssettings.php:375
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
 "for the code and instructions on how to use it."
@@ -6027,39 +6052,39 @@ msgstr ""
 "addite. Vide in tu telephono le codice e le instructiones super como usar lo."
 
 #. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
-#: actions/smssettings.php:404
+#: actions/smssettings.php:403
 msgid "That is the wrong confirmation number."
 msgstr "Iste codice de confirmation es incorrecte."
 
 #. TRANS: Message given after successfully canceling SMS phone number confirmation.
-#: actions/smssettings.php:418
+#: actions/smssettings.php:417
 msgid "SMS confirmation cancelled."
 msgstr "Confirmation de SMS cancellate."
 
 #. TRANS: Message given trying to remove an SMS phone number that is not
 #. TRANS: registered for the active user.
-#: actions/smssettings.php:438
+#: actions/smssettings.php:437
 msgid "That is not your phone number."
 msgstr "Isto non es tu numero de telephono."
 
 #. TRANS: Message given after successfully removing a registered SMS phone number.
-#: actions/smssettings.php:460
+#: actions/smssettings.php:459
 msgid "The SMS phone number was removed."
 msgstr "Le numero de telephono pro SMS ha essite removite."
 
 #. TRANS: Label for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:499
+#: actions/smssettings.php:498
 msgid "Mobile carrier"
 msgstr "Operator de telephonia mobile"
 
 #. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:504
+#: actions/smssettings.php:503
 msgid "Select a carrier"
 msgstr "Selige un operator"
 
 #. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
 #. TRANS: %s is an administrative contact's e-mail address.
-#: actions/smssettings.php:513
+#: actions/smssettings.php:512
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -6070,7 +6095,7 @@ msgstr ""
 "nos a %s."
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
-#: actions/smssettings.php:535
+#: actions/smssettings.php:534
 msgid "No code entered."
 msgstr "Nulle codice entrate."
 
@@ -6143,15 +6168,13 @@ msgstr "Tu non es subscribite a iste profilo."
 msgid "Could not save subscription."
 msgstr "Non poteva salveguardar le subscription."
 
-#: actions/subscribe.php:77
-msgid "This action only accepts POST requests."
-msgstr "Iste action accepta solmente le requestas de typo POST."
-
-#: actions/subscribe.php:117
+#. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
+#: actions/subscribe.php:121
 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
 msgstr "Tu non pote subscriber te a un profilo remote OMB 0.1 con iste action."
 
-#: actions/subscribe.php:145
+#. TRANS: Page title when subscription succeeded.
+#: actions/subscribe.php:149
 msgid "Subscribed"
 msgstr "Subscribite"
 
@@ -6268,31 +6291,34 @@ msgid "Subscription feed for %s (Atom)"
 msgstr "Syndication de subscription pro %s (Atom)"
 
 #. TRANS: Checkbox label for enabling Jabber messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:239
-msgid "Jabber"
-msgstr "Jabber"
+#: actions/subscriptions.php:241 lib/settingsnav.php:110
+#, fuzzy
+msgid "IM"
+msgstr "MI"
 
 #. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:254
+#: actions/subscriptions.php:256 lib/settingsnav.php:117
 msgid "SMS"
 msgstr "SMS"
 
-#: actions/tag.php:69
+#. TRANS: Title for all but the first page of notices with tags.
+#. TRANS: %1$s is the tag, %2$d is the page number.
+#: actions/tag.php:73
 #, php-format
 msgid "Notices tagged with %1$s, page %2$d"
 msgstr "Notas etiquettate con %1$s, pagina %2$d"
 
-#: actions/tag.php:87
+#: actions/tag.php:91
 #, php-format
 msgid "Notice feed for tag %s (RSS 1.0)"
 msgstr "Syndication de notas pro le etiquetta %s (RSS 1.0)"
 
-#: actions/tag.php:93
+#: actions/tag.php:97
 #, php-format
 msgid "Notice feed for tag %s (RSS 2.0)"
 msgstr "Syndication de notas pro le etiquetta %s (RSS 2.0)"
 
-#: actions/tag.php:99
+#: actions/tag.php:103
 #, php-format
 msgid "Notice feed for tag %s (Atom)"
 msgstr "Syndication de notas pro le etiquetta %s (Atom)"
@@ -6311,17 +6337,11 @@ msgstr "Etiquetta %s"
 msgid "User profile"
 msgstr "Profilo del usator"
 
-#. TRANS: DT element in area for user avatar.
-#: actions/tagother.php:81 actions/userauthorization.php:132
-#: lib/userprofile.php:108
-msgid "Photo"
-msgstr "Photo"
-
-#: actions/tagother.php:141
+#: actions/tagother.php:120
 msgid "Tag user"
 msgstr "Etiquettar usator"
 
-#: actions/tagother.php:151
+#: actions/tagother.php:130
 msgid ""
 "Tags for this user (letters, numbers, -, ., and _), comma- or space- "
 "separated"
@@ -6329,14 +6349,19 @@ msgstr ""
 "Etiquettas pro iste usator (litteras, numeros, -, . e _), separate per "
 "commas o spatios"
 
-#: actions/tagother.php:193
+#: actions/tagother.php:157
+#, php-format
+msgid "Invalid tag: \"%s\""
+msgstr "Etiquetta invalide: \"%s\""
+
+#: actions/tagother.php:172
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 "Tu pote solmente etiquettar personas a qui tu es subscribite o qui es "
 "subscribite a te."
 
-#: actions/tagother.php:236
+#: actions/tagother.php:215
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
 "Usa iste formulario pro adder etiquettas a tu subscriptores o subscriptiones."
@@ -6345,6 +6370,7 @@ msgstr ""
 msgid "No such tag."
 msgstr "Etiquetta non existe."
 
+#. TRANS: Client error displayed when trying to unblock a non-blocked user.
 #: actions/unblock.php:59
 msgid "You haven't blocked that user."
 msgstr "Tu non ha blocate iste usator."
@@ -6365,7 +6391,7 @@ msgstr "Nulle ID de profilo in requesta."
 msgid "Unsubscribed"
 msgstr "Subscription cancellate"
 
-#: actions/updateprofile.php:64 actions/userauthorization.php:337
+#: actions/updateprofile.php:64
 #, php-format
 msgid ""
 "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
@@ -6373,6 +6399,78 @@ msgstr ""
 "Le licentia del fluxo que tu ascolta, ‘%1$s’, non es compatibile con le "
 "licentia del sito ‘%2$s’."
 
+#: actions/urlsettings.php:60
+#, fuzzy
+msgid "URL settings"
+msgstr "Configuration de messageria instantanee"
+
+#. TRANS: Instructions for tab "Other" in user profile settings.
+#: actions/urlsettings.php:72
+msgid "Manage various other options."
+msgstr "Gestion de varie altere optiones."
+
+#. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
+#. TRANS: user's profile settings. This message has one space at the beginning. Use your
+#. TRANS: language's word separator here if it has one (most likely a single space).
+#: actions/urlsettings.php:115
+msgid " (free service)"
+msgstr " (servicio libere)"
+
+#: actions/urlsettings.php:121
+#, fuzzy
+msgid "[none]"
+msgstr "Nulle"
+
+#: actions/urlsettings.php:122
+msgid "[internal]"
+msgstr ""
+
+#. TRANS: Label for dropdown with URL shortener services.
+#: actions/urlsettings.php:130
+msgid "Shorten URLs with"
+msgstr "Accurtar URLs con"
+
+#. TRANS: Tooltip for for dropdown with URL shortener services.
+#: actions/urlsettings.php:132
+msgid "Automatic shortening service to use."
+msgstr "Le servicio de accurtamento automatic a usar."
+
+#: actions/urlsettings.php:138
+msgid "URL longer than"
+msgstr ""
+
+#: actions/urlsettings.php:141
+msgid "URLs longer than this will be shortened, 0 means always shorten."
+msgstr ""
+
+#: actions/urlsettings.php:145
+msgid "Text longer than"
+msgstr ""
+
+#: actions/urlsettings.php:148
+msgid ""
+"URLs in notices longer than this will be shortened, 0 means always shorten."
+msgstr ""
+
+#. TRANS: Form validation error for form "Other settings" in user profile.
+#: actions/urlsettings.php:180
+msgid "URL shortening service is too long (maximum 50 characters)."
+msgstr ""
+"Le servicio de accurtamento de URL es troppo longe (maximo 50 characteres)."
+
+#: actions/urlsettings.php:187
+msgid "Invalid number for max url length."
+msgstr ""
+
+#: actions/urlsettings.php:193
+#, fuzzy
+msgid "Invalid number for max notice length."
+msgstr "Le contento del nota es invalide."
+
+#: actions/urlsettings.php:238
+msgid "Error saving user URL shortening preferences."
+msgstr ""
+
 #. TRANS: User admin panel title
 #: actions/useradminpanel.php:58
 msgctxt "TITLE"
@@ -6397,12 +6495,12 @@ msgstr "Texto de benvenita invalide. Longitude maxime es 255 characteres."
 #. TRANS: Client error displayed when trying to set a non-existing user as default subscription for new
 #. TRANS: users in user admin panel. %1$s is the invalid nickname.
 #: actions/useradminpanel.php:166
-#, fuzzy, php-format
-msgid "Invalid default subscripton: '%1$s' is not a user."
+#, php-format
+msgid "Invalid default subscripton: \"%1$s\" is not a user."
 msgstr "Subscription predefinite invalide: \"%1$s\" non es usator."
 
-#. TRANS: Link description in user account settings menu.
-#: actions/useradminpanel.php:215 lib/accountsettingsaction.php:106
+#: actions/useradminpanel.php:215 lib/action.php:565 lib/settingsnav.php:77
+#: lib/subgroupnav.php:81
 msgid "Profile"
 msgstr "Profilo"
 
@@ -6458,60 +6556,58 @@ msgstr "Si le usatores pote invitar nove usatores."
 
 #. TRANS: Title for button to save user settings in user admin panel.
 #: actions/useradminpanel.php:302
-#, fuzzy
-msgid "Save user settings"
+msgid "Save user settings."
 msgstr "Salveguardar configurationes de usator."
 
-#: actions/userauthorization.php:105
+#. TRANS: Page title.
+#: actions/userauthorization.php:109
 msgid "Authorize subscription"
 msgstr "Autorisar subscription"
 
-#: actions/userauthorization.php:110
-#, fuzzy
+#. TRANS: Page notice on "Auhtorize subscription" page.
+#: actions/userauthorization.php:115
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
 "user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
-"click “Reject”."
+"click \"Reject\"."
 msgstr ""
 "Per favor verifica iste detalios pro assecurar que tu vole subscriber al "
 "notas de iste usator. Si tu non ha justo requestate de subscriber al notas "
 "de alcuno, clicca \"Rejectar\"."
 
-#. TRANS: Menu item for site administration
-#: actions/userauthorization.php:196 actions/version.php:167
-#: lib/adminpanelaction.php:403
-msgid "License"
-msgstr "Licentia"
-
-#: actions/userauthorization.php:217
-#, fuzzy
+#. TRANS: Button text on Authorise Subscription page.
+#: actions/userauthorization.php:200
+msgctxt "BUTTON"
 msgid "Accept"
 msgstr "Acceptar"
 
-#: actions/userauthorization.php:218 lib/subscribeform.php:115
-#: lib/subscribeform.php:139
-msgid "Subscribe to this user"
-msgstr "Subscriber a iste usator"
+#. TRANS: Title for button on Authorise Subscription page.
+#: actions/userauthorization.php:202
+msgid "Subscribe to this user."
+msgstr "Subscriber a iste usator."
 
-#: actions/userauthorization.php:219
-#, fuzzy
+#. TRANS: Button text on Authorise Subscription page.
+#: actions/userauthorization.php:204
+msgctxt "BUTTON"
 msgid "Reject"
 msgstr "Rejectar"
 
-#: actions/userauthorization.php:220
-#, fuzzy
-msgid "Reject this subscription"
+#. TRANS: Title for button on Authorise Subscription page.
+#: actions/userauthorization.php:206
+msgid "Reject this subscription."
 msgstr "Rejectar iste subscription."
 
-#: actions/userauthorization.php:232
+#. TRANS: Client error displayed for an empty authorisation request.
+#: actions/userauthorization.php:219
 msgid "No authorization request!"
 msgstr "Nulle requesta de autorisation!"
 
-#: actions/userauthorization.php:254
+#. TRANS: Accept message header from Authorise subscription page.
+#: actions/userauthorization.php:242
 msgid "Subscription authorized"
 msgstr "Subscription autorisate"
 
-#: actions/userauthorization.php:256
+#: actions/userauthorization.php:245
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to authorize the "
@@ -6521,11 +6617,12 @@ msgstr ""
 "recipite. Lege in le instructiones del sito in question como autorisar le "
 "subscription. Tu indicio de subscription es:"
 
-#: actions/userauthorization.php:266
+#. TRANS: Reject message header from Authorise subscription page.
+#: actions/userauthorization.php:256
 msgid "Subscription rejected"
 msgstr "Subscription rejectate"
 
-#: actions/userauthorization.php:268
+#: actions/userauthorization.php:259
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to fully reject the "
@@ -6535,48 +6632,73 @@ msgstr ""
 "recipite. Lege in le instructiones del sito in question como rejectar "
 "completemente le subscription."
 
-#: actions/userauthorization.php:303
-#, fuzzy, php-format
-msgid "Listener URI ‘%s’ not found here."
+#. TRANS: Exception thrown when no valid user is found for an authorisation request.
+#. TRANS: %s is a listener URI.
+#: actions/userauthorization.php:296
+#, php-format
+msgid "Listener URI \"%s\" not found here."
 msgstr "URI de ascoltator \"%s\" non trovate hic."
 
-#: actions/userauthorization.php:308
-#, fuzzy, php-format
-msgid "Listenee URI ‘%s’ is too long."
+#. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
+#. TRANS: %s is a listenee URI.
+#: actions/userauthorization.php:303
+#, php-format
+msgid "Listenee URI \"%s\" is too long."
 msgstr "URI de ascoltato \"%s\" es troppo longe."
 
-#: actions/userauthorization.php:314
-#, fuzzy, php-format
-msgid "Listenee URI ‘%s’ is a local user."
+#. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
+#. TRANS: %s is a listenee URI.
+#: actions/userauthorization.php:311
+#, php-format
+msgid "Listenee URI \"%s\" is a local user."
 msgstr "URI de ascoltato \"%s\" es un usator local."
 
+#. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
+#. TRANS: %s is a profile URL.
 #: actions/userauthorization.php:329
-#, fuzzy, php-format
-msgid "Profile URL ‘%s’ is for a local user."
+#, php-format
+msgid "Profile URL \"%s\" is for a local user."
 msgstr "URL de profilo \"%s\" es de un usator local."
 
-#: actions/userauthorization.php:345
-#, fuzzy, php-format
-msgid "Avatar URL ‘%s’ is not valid."
+#. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
+#. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
+#: actions/userauthorization.php:339
+#, php-format
+msgid ""
+"Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
+"\"."
+msgstr ""
+"Le licentia del fluxo que tu ascolta, \"%1$s\", non es compatibile con le "
+"licentia del sito \"%2$s\"."
+
+#. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
+#. TRANS: %s is an avatar URL.
+#: actions/userauthorization.php:349
+#, php-format
+msgid "Avatar URL \"%s\" is not valid."
 msgstr "URL de avatar \"%s\" non es valide."
 
-#: actions/userauthorization.php:350
-#, fuzzy, php-format
-msgid "Can’t read avatar URL ‘%s’."
+#. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
+#. TRANS: %s is an avatar URL.
+#: actions/userauthorization.php:356
+#, php-format
+msgid "Cannot read avatar URL \"%s\"."
 msgstr "Non pote leger URL de avatar \"%s\"."
 
-#: actions/userauthorization.php:355
-#, fuzzy, php-format
-msgid "Wrong image type for avatar URL ‘%s’."
+#. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
+#. TRANS: %s is an avatar URL.
+#: actions/userauthorization.php:363
+#, php-format
+msgid "Wrong image type for avatar URL \"%s\"."
 msgstr "Typo de imagine incorrecte pro URL de avatar \"%s\"."
 
 #. TRANS: Page title for profile design page.
-#: actions/userdesignsettings.php:74 lib/designsettings.php:63
+#: actions/userdesignsettings.php:74 lib/designsettings.php:61
 msgid "Profile design"
 msgstr "Apparentia del profilo"
 
 #. TRANS: Instructions for profile design page.
-#: actions/userdesignsettings.php:84 lib/designsettings.php:74
+#: actions/userdesignsettings.php:84 lib/designsettings.php:72
 msgid ""
 "Customize the way your profile looks with a background image and a colour "
 "palette of your choice."
@@ -6584,10 +6706,28 @@ msgstr ""
 "Personalisa le apparentia de tu profilo con un imagine de fundo e un paletta "
 "de colores de tu preferentia."
 
-#: actions/userdesignsettings.php:272
+#: actions/userdesignsettings.php:289
 msgid "Enjoy your hotdog!"
 msgstr "Bon appetito!"
 
+#: actions/userdesignsettings.php:325
+#, fuzzy
+msgid "Design settings"
+msgstr "Salveguardar configurationes del sito"
+
+#: actions/userdesignsettings.php:340
+msgid "View profile designs"
+msgstr "Vider apparentias de profilo"
+
+#: actions/userdesignsettings.php:341
+msgid "Show or hide profile designs."
+msgstr "Monstrar o celar apparentias de profilo."
+
+#: actions/userdesignsettings.php:348
+#, fuzzy
+msgid "Background file"
+msgstr "Fundo"
+
 #. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number.
 #: actions/usergroups.php:66
 #, php-format
@@ -6638,6 +6778,11 @@ msgstr ""
 msgid "Contributors"
 msgstr "Contributores"
 
+#. TRANS: Menu item for site administration
+#: actions/version.php:167 lib/adminpanelaction.php:403
+msgid "License"
+msgstr "Licentia"
+
 #: actions/version.php:170
 msgid ""
 "StatusNet is free software: you can redistribute it and/or modify it under "
@@ -6671,12 +6816,13 @@ msgstr ""
 "Un copia del GNU Affero General Public License deberea esser disponibile "
 "insimul con iste programma. Si non, vide %s."
 
-#: actions/version.php:191
-msgid "Plugins"
-msgstr "Plug-ins"
+#. TRANS: Form input field label for application name.
+#: actions/version.php:197 lib/applicationeditform.php:190
+msgid "Name"
+msgstr "Nomine"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:901
+#: actions/version.php:198 lib/action.php:885
 msgid "Version"
 msgstr "Version"
 
@@ -6684,6 +6830,12 @@ msgstr "Version"
 msgid "Author(s)"
 msgstr "Autor(es)"
 
+#. TRANS: Form input field label.
+#: actions/version.php:200 lib/applicationeditform.php:208
+#: lib/groupeditform.php:168
+msgid "Description"
+msgstr "Description"
+
 #. TRANS: Activity title when marking a notice as favorite.
 #: classes/Fave.php:164
 msgid "Favor"
@@ -6802,7 +6954,7 @@ msgid "Could not create login token for %s"
 msgstr "Non poteva crear indicio de identification pro %s"
 
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
-#: classes/Memcached_DataObject.php:542
+#: classes/Memcached_DataObject.php:556
 msgid "No database name or DSN found anywhere."
 msgstr "Nulle nomine de base de datos o DSN trovate."
 
@@ -6978,18 +7130,18 @@ msgstr "%1$s seque ora %2$s."
 
 #. TRANS: Notice given on user registration.
 #. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:395
+#: classes/User.php:390
 #, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr "Benvenite a %1$s, @%2$s!"
 
 #. TRANS: Server exception.
-#: classes/User.php:918
+#: classes/User.php:923
 msgid "No single user defined for single-user mode."
 msgstr "Nulle signule usator definite pro le modo de singule usator."
 
 #. TRANS: Server exception.
-#: classes/User.php:922
+#: classes/User.php:927
 msgid "Single-user mode code called when not enabled."
 msgstr "Codice in modo de usator singule appellate sin esser activate."
 
@@ -7034,41 +7186,6 @@ msgstr "Non pote trovar XRD pro %s."
 msgid "No AtomPub API service for %s."
 msgstr "Il non ha un servicio API AtomPub pro %s."
 
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:104
-msgid "Change your profile settings"
-msgstr "Cambiar le optiones de tu profilo"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:111
-msgid "Upload an avatar"
-msgstr "Incargar un avatar"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:118
-msgid "Change your password"
-msgstr "Cambiar tu contrasigno"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:125
-msgid "Change email handling"
-msgstr "Modificar le tractamento de e-mail"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:132
-msgid "Design your profile"
-msgstr "Designar tu profilo"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:139
-msgid "Other options"
-msgstr "Altere optiones"
-
-#. TRANS: Link description in user account settings menu.
-#: lib/accountsettingsaction.php:141
-msgid "Other"
-msgstr "Altere"
-
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
 #: lib/action.php:161
 #, php-format
@@ -7086,206 +7203,128 @@ msgctxt "TOOLTIP"
 msgid "Show more"
 msgstr "Monstrar plus"
 
-#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:544
-msgid "Primary site navigation"
-msgstr "Navigation primari del sito"
+#. TRANS: Inline reply form submit button: submits a reply comment.
+#: lib/action.php:328
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Comment"
+msgstr "Contento"
 
-#. TRANS: Tooltip for main menu option "Personal".
-#: lib/action.php:550
-msgctxt "TOOLTIP"
-msgid "Personal profile and friends timeline"
-msgstr "Profilo personal e chronologia de amicos"
+#. TRANS: Placeholder text for inline reply form. Clicking in this box will turn it into a mini notice form.
+#: lib/action.php:331
+msgid "Add a comment..."
+msgstr ""
 
-#. TRANS: Main menu option when logged in for access to personal profile and friends timeline.
-#. TRANS: Personal group navigation menu option when logged in for viewing timeline of self and friends.
-#: lib/action.php:553 lib/personalgroupnav.php:100
-msgctxt "MENU"
-msgid "Personal"
-msgstr "Personal"
+#: lib/action.php:559 lib/personalgroupnav.php:99
+#, fuzzy
+msgid "Home"
+msgstr "Pagina personal"
 
-#. TRANS: Tooltip for main menu option "Account".
-#: lib/action.php:555
-msgctxt "TOOLTIP"
-msgid "Change your email, avatar, password, profile"
-msgstr "Cambiar tu e-mail, avatar, contrasigno, profilo"
-
-#. TRANS: Main menu option when logged in for access to user settings.
-#: lib/action.php:558
-msgid "Account"
-msgstr "Conto"
-
-#. TRANS: Tooltip for main menu option "Services".
 #: lib/action.php:560
-msgctxt "TOOLTIP"
-msgid "Connect to services"
-msgstr "Connecter a servicios"
+#, fuzzy
+msgid "Friends timeline"
+msgstr "Chronologia de %s"
 
-#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services.
-#: lib/action.php:563
-msgid "Connect"
-msgstr "Connecter"
-
-#. TRANS: Tooltip for menu option "Admin".
 #: lib/action.php:566
-msgctxt "TOOLTIP"
-msgid "Change site configuration"
-msgstr "Modificar le configuration del sito"
+#, fuzzy
+msgid "Your profile"
+msgstr "Profilo del gruppo"
 
-#. TRANS: Main menu option when logged in and site admin for access to site configuration.
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/action.php:569 lib/groupnav.php:117
-msgctxt "MENU"
-msgid "Admin"
-msgstr "Admin"
+#: lib/action.php:570 lib/action.php:593 lib/publicgroupnav.php:78
+msgid "Public"
+msgstr "Public"
 
-#. TRANS: Tooltip for main menu option "Invite".
-#: lib/action.php:573
-#, php-format
-msgctxt "TOOLTIP"
-msgid "Invite friends and colleagues to join you on %s"
-msgstr "Invitar amicos e collegas a accompaniar te in %s"
+#: lib/action.php:571 lib/action.php:594
+#, fuzzy
+msgid "Everyone on this site"
+msgstr "Cercar personas in iste sito"
+
+#: lib/action.php:575
+#, fuzzy
+msgid "Settings"
+msgstr "Parametros de SMS"
 
-#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users.
 #: lib/action.php:576
-msgctxt "MENU"
-msgid "Invite"
-msgstr "Invitar"
+#, fuzzy
+msgid "Change your personal settings"
+msgstr "Cambiar le optiones de tu profilo"
 
-#. TRANS: Tooltip for main menu option "Logout"
 #: lib/action.php:582
-msgctxt "TOOLTIP"
-msgid "Logout from the site"
-msgstr "Terminar le session del sito"
+#, fuzzy
+msgid "Site configuration"
+msgstr "Configuration del usator"
 
-#. TRANS: Main menu option when logged in to log out the current user.
-#: lib/action.php:585
-msgctxt "MENU"
+#: lib/action.php:587
+#, fuzzy
 msgid "Logout"
 msgstr "Clauder session"
 
-#. TRANS: Tooltip for main menu option "Register".
-#: lib/action.php:590
-msgctxt "TOOLTIP"
-msgid "Create an account"
-msgstr "Crear un conto"
+#: lib/action.php:588
+#, fuzzy
+msgid "Logout from the site"
+msgstr "Terminar le session del sito"
 
-#. TRANS: Main menu option when not logged in to register a new account.
-#. TRANS: Menu item for registering with the StatusNet site.
-#: lib/action.php:593 lib/logingroupnav.php:85
-msgctxt "MENU"
-msgid "Register"
-msgstr "Crear conto"
-
-#. TRANS: Tooltip for main menu option "Login".
-#: lib/action.php:596
-msgctxt "TOOLTIP"
+#: lib/action.php:599
+#, fuzzy
 msgid "Login to the site"
 msgstr "Authenticar te a iste sito"
 
-#. TRANS: Main menu option when not logged in to log in.
-#. TRANS: Menu item for logging in to the StatusNet site.
-#: lib/action.php:599 lib/logingroupnav.php:77
-msgctxt "MENU"
-msgid "Login"
-msgstr "Aperir session"
-
-#. TRANS: Tooltip for main menu option "Help".
-#: lib/action.php:602
-msgctxt "TOOLTIP"
-msgid "Help me!"
-msgstr "Adjuta me!"
-
-#. TRANS: Main menu option for help on the StatusNet site.
-#: lib/action.php:605
-msgctxt "MENU"
-msgid "Help"
-msgstr "Adjuta"
-
-#. TRANS: Tooltip for main menu option "Search".
-#: lib/action.php:608
-msgctxt "TOOLTIP"
-msgid "Search for people or text"
-msgstr "Cercar personas o texto"
-
-#. TRANS: Main menu option when logged in or when the StatusNet instance is not private.
-#: lib/action.php:611
-msgctxt "MENU"
+#: lib/action.php:606
+#, fuzzy
 msgid "Search"
 msgstr "Cercar"
 
-#. TRANS: DT element for site notice. String is hidden in default CSS.
-#. TRANS: Menu item for site administration
-#: lib/action.php:633 lib/adminpanelaction.php:387
-msgid "Site notice"
-msgstr "Aviso del sito"
-
-#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:700
-msgid "Local views"
-msgstr "Vistas local"
-
-#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:770
-msgid "Page notice"
-msgstr "Aviso de pagina"
-
-#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:874
-msgid "Secondary site navigation"
-msgstr "Navigation secundari del sito"
+#: lib/action.php:607
+#, fuzzy
+msgid "Search the site"
+msgstr "Cercar in sito"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:880
+#: lib/action.php:864
 msgid "Help"
 msgstr "Adjuta"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:883
+#: lib/action.php:867
 msgid "About"
 msgstr "A proposito"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:886
+#: lib/action.php:870
 msgid "FAQ"
 msgstr "FAQ"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:891
+#: lib/action.php:875
 msgid "TOS"
 msgstr "CdS"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:895
+#: lib/action.php:879
 msgid "Privacy"
 msgstr "Confidentialitate"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:898
+#: lib/action.php:882
 msgid "Source"
 msgstr "Fonte"
 
 #. TRANS: Secondary navigation menu option leading to e-mail contact information on the
 #. TRANS: StatusNet site, where to report bugs, ...
-#: lib/action.php:905
+#: lib/action.php:889
 msgid "Contact"
 msgstr "Contacto"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:908
+#: lib/action.php:892
 msgid "Badge"
 msgstr "Insignia"
 
-#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:937
-msgid "StatusNet software license"
-msgstr "Licentia del software StatusNet"
-
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:944
+#: lib/action.php:921
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7295,7 +7334,7 @@ msgstr ""
 "%](%%site.broughtbyurl%%)."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:947
+#: lib/action.php:924
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** es un servicio de microblog."
@@ -7304,7 +7343,7 @@ msgstr "**%%site.name%%** es un servicio de microblog."
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:954
+#: lib/action.php:931
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7315,52 +7354,42 @@ msgstr ""
 "net/), version %s, disponibile sub le [GNU Affero General Public License]"
 "(http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
 
-#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:970
-msgid "Site content license"
-msgstr "Licentia del contento del sito"
-
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:977
+#: lib/action.php:949
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr "Le contento e datos de %1$s es private e confidential."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:984
+#: lib/action.php:956
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr "Contento e datos sub copyright de %1$s. Tote le derectos reservate."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:988
+#: lib/action.php:960
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 "Contento e datos sub copyright del contributores. Tote le derectos reservate."
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:1020
+#: lib/action.php:992
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr "Tote le contento e datos de %1$s es disponibile sub le licentia %2$s."
 
-#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1356
-msgid "Pagination"
-msgstr "Pagination"
-
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1367
+#: lib/action.php:1335
 msgid "After"
 msgstr "Post"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1377
+#: lib/action.php:1345
 msgid "Before"
 msgstr "Ante"
 
@@ -7515,7 +7544,7 @@ msgid "User configuration"
 msgstr "Configuration del usator"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:122
+#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:110
 msgid "User"
 msgstr "Usator"
 
@@ -7539,6 +7568,11 @@ msgstr "Configuration del sessiones"
 msgid "Edit site notice"
 msgstr "Modificar aviso del sito"
 
+#. TRANS: Menu item for site administration
+#: lib/adminpanelaction.php:387
+msgid "Site notice"
+msgstr "Aviso del sito"
+
 #. TRANS: Menu item title/tooltip
 #: lib/adminpanelaction.php:393
 msgid "Snapshots configuration"
@@ -7549,6 +7583,12 @@ msgstr "Configuration del instantaneos"
 msgid "Set site license"
 msgstr "Definir licentia del sito"
 
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:409
+#, fuzzy
+msgid "Plugins configuration"
+msgstr "Configuration del camminos"
+
 #. TRANS: Client error 401.
 #: lib/apiauth.php:111
 msgid "API resource requires read-write access, but you only have read access."
@@ -7561,19 +7601,23 @@ msgstr ""
 msgid "No application for that consumer key."
 msgstr "Nulle application pro iste clave de consumitor."
 
+#: lib/apiauth.php:202 lib/apiauth.php:284
+msgid "Not allowed to use API."
+msgstr "Uso del API non permittite."
+
 #. TRANS: OAuth exception given when an incorrect access token was given for a user.
-#: lib/apiauth.php:219
+#: lib/apiauth.php:225
 msgid "Bad access token."
 msgstr "Mal indicio de accesso."
 
 #. TRANS: OAuth exception given when no user was found for a given token (no token was found).
-#: lib/apiauth.php:224
+#: lib/apiauth.php:230
 msgid "No user for that token."
 msgstr "Nulle usator pro iste indicio."
 
 #. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel".
 #. TRANS: Client error thrown when authentication fails.
-#: lib/apiauth.php:266 lib/apiauth.php:293
+#: lib/apiauth.php:272 lib/apiauth.php:302
 msgid "Could not authenticate you."
 msgstr "Non poteva authenticar te."
 
@@ -7622,6 +7666,11 @@ msgstr "Tentava revocar un indicio non cognoscite."
 msgid "Failed to delete revoked token."
 msgstr "Falleva de deler le indicio revocate."
 
+#. TRANS: Form input field label for application icon.
+#: lib/applicationeditform.php:177
+msgid "Icon"
+msgstr "Icone"
+
 #. TRANS: Form guide.
 #: lib/applicationeditform.php:182
 msgid "Icon for this application"
@@ -7656,6 +7705,11 @@ msgstr "URL de origine"
 msgid "Organization responsible for this application"
 msgstr "Organisation responsabile de iste application"
 
+#. TRANS: Form input field label.
+#: lib/applicationeditform.php:227
+msgid "Organization"
+msgstr "Organisation"
+
 #. TRANS: Form input field instructions.
 #: lib/applicationeditform.php:234
 msgid "URL for the homepage of the organization"
@@ -7745,16 +7799,6 @@ msgstr "Le elemento \"author\" debe continer un elemento \"name\"."
 msgid "Do not use this method!"
 msgstr "Non usa iste methodo!"
 
-#. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:293
-msgid "Author"
-msgstr "Autor"
-
-#. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:307
-msgid "Provider"
-msgstr "Providitor"
-
 #. TRANS: Title.
 #: lib/attachmentnoticesection.php:67
 msgid "Notices where this attachment appears"
@@ -7780,23 +7824,28 @@ msgstr "Cambio del contrasigno non permittite."
 msgid "Block"
 msgstr "Blocar"
 
+#. TRANS: Description of the form to block a user.
+#: lib/blockform.php:79
+msgid "Block this user"
+msgstr "Blocar iste usator"
+
 #. TRANS: Title for command results.
-#: lib/channel.php:160 lib/channel.php:181
+#: lib/channel.php:104 lib/channel.php:125
 msgid "Command results"
 msgstr "Resultatos del commando"
 
 #. TRANS: Title for command results.
-#: lib/channel.php:194
+#: lib/channel.php:138
 msgid "AJAX error"
 msgstr "Error de AJAX"
 
 #. TRANS: E-mail subject when a command has completed.
-#: lib/channel.php:233 lib/mailhandler.php:143
+#: lib/channel.php:177 lib/mailhandler.php:143
 msgid "Command complete"
 msgstr "Commando complete"
 
 #. TRANS: E-mail subject when a command has failed.
-#: lib/channel.php:244
+#: lib/channel.php:188
 msgid "Command failed"
 msgstr "Commando fallite"
 
@@ -7899,7 +7948,7 @@ msgstr "Nomine complete: %s"
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a location.
-#: lib/command.php:446 lib/mail.php:270
+#: lib/command.php:446 lib/mail.php:275
 #, php-format
 msgid "Location: %s"
 msgstr "Loco: %s"
@@ -7907,7 +7956,7 @@ msgstr "Loco: %s"
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a homepage.
-#: lib/command.php:450 lib/mail.php:274
+#: lib/command.php:450 lib/mail.php:279
 #, php-format
 msgid "Homepage: %s"
 msgstr "Pagina personal: %s"
@@ -8179,108 +8228,101 @@ msgstr ""
 "tracking - non ancora implementate.\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:162
+#: lib/common.php:36
 msgid "No configuration file found."
 msgstr "Nulle file de configuration trovate."
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:165
+#: lib/common.php:39
 msgid "I looked for configuration files in the following places:"
 msgstr "Io cercava files de configuration in le sequente locos:"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:168
+#: lib/common.php:42
 msgid "You may wish to run the installer to fix this."
 msgstr "Considera executar le installator pro reparar isto."
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:172
+#: lib/common.php:46
 msgid "Go to the installer."
 msgstr "Ir al installator."
 
-#. TRANS: Menu item for Instant Messaging settings.
-#: lib/connectsettingsaction.php:106
-msgctxt "MENU"
-msgid "IM"
-msgstr "MI"
-
-#. TRANS: Tooltip for Instant Messaging menu item.
-#: lib/connectsettingsaction.php:108
-msgid "Updates by instant messenger (IM)"
-msgstr "Actualisationes per messageria instantanee (MI)"
-
-#. TRANS: Menu item for Short Message Service settings.
-#: lib/connectsettingsaction.php:113
-msgctxt "MENU"
-msgid "SMS"
-msgstr "SMS"
-
-#. TRANS: Tooltip for Short Message Service menu item.
-#: lib/connectsettingsaction.php:115
-msgid "Updates by SMS"
-msgstr "Actualisationes per SMS"
-
-#. TRANS: Menu item for OuAth connection settings.
-#: lib/connectsettingsaction.php:120
-msgctxt "MENU"
-msgid "Connections"
-msgstr "Connexiones"
-
-#. TRANS: Tooltip for connected applications (Connections through OAuth) menu item.
-#: lib/connectsettingsaction.php:122
-msgid "Authorized connected applications"
-msgstr "Applicationes autorisate connectite"
-
 #: lib/dberroraction.php:59
 msgid "Database error"
 msgstr "Error de base de datos"
 
+#. TRANS: Description of form for deleting a user.
+#: lib/deleteuserform.php:75
+msgid "Delete this user"
+msgstr "Deler iste usator"
+
+#: lib/designform.php:114
+#, fuzzy
+msgid "Change design"
+msgstr "Salveguardar apparentia"
+
+#. TRANS: Fieldset legend on profile design page to change profile page colours.
+#: lib/designform.php:131
+msgid "Change colours"
+msgstr "Cambiar colores"
+
+#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
+#: lib/designform.php:138
+msgid "Use defaults"
+msgstr "Usar predefinitiones"
+
+#. TRANS: Title for button on profile design page to reset all colour settings to default.
+#: lib/designform.php:140
+msgid "Restore default designs"
+msgstr "Restaurar apparentias predefinite"
+
+#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
+#: lib/designform.php:148
+msgid "Reset back to default"
+msgstr "Revenir al predefinitiones"
+
 #. TRANS: Label in form on profile design page.
 #. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
-#: lib/designsettings.php:108
+#: lib/designform.php:158
 msgid "Upload file"
 msgstr "Incargar file"
 
 #. TRANS: Instructions for form on profile design page.
-#: lib/designsettings.php:113
+#: lib/designform.php:163
+#, fuzzy
 msgid ""
-"You can upload your personal background image. The maximum file size is 2MB."
+"You can upload your personal background image. The maximum file size is 2Mb."
 msgstr ""
 "Tu pote actualisar tu imagine de fundo personal. Le dimension maximal del "
 "file es 2MB."
 
 #. TRANS: Radio button on profile design page that will enable use of the uploaded profile image.
-#: lib/designsettings.php:139
+#: lib/designform.php:194
 msgctxt "RADIO"
 msgid "On"
 msgstr "Active"
 
 #. TRANS: Radio button on profile design page that will disable use of the uploaded profile image.
-#: lib/designsettings.php:156
+#: lib/designform.php:211
 msgctxt "RADIO"
 msgid "Off"
 msgstr "Non active"
 
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: lib/designsettings.php:175
-msgid "Change colours"
-msgstr "Cambiar colores"
-
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: lib/designsettings.php:257
-msgid "Use defaults"
-msgstr "Usar predefinitiones"
+#. TRANS: Title for button on profile design page to save settings.
+#: lib/designform.php:322
+msgid "Save design"
+msgstr "Salveguardar apparentia"
 
 #. TRANS: Error message displayed if design settings could not be saved.
 #. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
-#: lib/designsettings.php:405 lib/designsettings.php:427
+#: lib/designsettings.php:216 lib/designsettings.php:238
 msgid "Couldn't update your design."
 msgstr "Non poteva actualisar tu apparentia."
 
 #. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
-#: lib/designsettings.php:433
+#: lib/designsettings.php:244
 msgid "Design defaults restored."
 msgstr "Apparentia predefinite restaurate."
 
@@ -8347,27 +8389,23 @@ msgstr "Non pote importar sin usator."
 msgid "Feeds"
 msgstr "Syndicationes"
 
-#: lib/galleryaction.php:121
-msgid "Filter tags"
-msgstr "Filtrar etiquettas"
-
-#: lib/galleryaction.php:131
+#: lib/galleryaction.php:128
 msgid "All"
 msgstr "Totes"
 
-#: lib/galleryaction.php:139
+#: lib/galleryaction.php:136
 msgid "Select tag to filter"
 msgstr "Selige etiquetta a filtrar"
 
-#: lib/galleryaction.php:140
+#: lib/galleryaction.php:137
 msgid "Tag"
 msgstr "Etiquetta"
 
-#: lib/galleryaction.php:141
+#: lib/galleryaction.php:138
 msgid "Choose a tag to narrow list"
 msgstr "Selige etiquetta pro reducer lista"
 
-#: lib/galleryaction.php:143
+#: lib/galleryaction.php:140
 msgid "Go"
 msgstr "Ir"
 
@@ -8457,6 +8495,12 @@ msgctxt "TOOLTIP"
 msgid "%s blocked users"
 msgstr "%s usatores blocate"
 
+#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
+#: lib/groupnav.php:117
+msgctxt "MENU"
+msgid "Admin"
+msgstr "Admin"
+
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
 #: lib/groupnav.php:120
@@ -8566,39 +8610,61 @@ msgid_plural "%dB"
 msgstr[0] "%dB"
 msgstr[1] "%dB"
 
-#: lib/jabber.php:387
+#: lib/implugin.php:262
 #, php-format
-msgid "[%s]"
-msgstr "[%s]"
+msgid ""
+"User \"%s\" on %s has said that your %s screenname belongs to them. If "
+"that's true, you can confirm by clicking on this URL: %s . (If you cannot "
+"click it, copy-and-paste it into the address bar of your browser). If that "
+"user isn't you, or if you didn't request this confirmation, just ignore this "
+"message."
+msgstr ""
 
-#: lib/jabber.php:567
+#: lib/implugin.php:349
 #, php-format
 msgid "Unknown inbox source %d."
 msgstr "Fonte de cassa de entrata \"%s\" incognite"
 
+#: lib/implugin.php:485
+#, fuzzy, php-format
+msgid "Message too long - maximum is %1$d characters, you sent %2$d."
+msgstr "Message troppo longe - maximo es %1$d character, tu inviava %2$d."
+
 #: lib/leaveform.php:114
 msgid "Leave"
 msgstr "Quitar"
 
+#. TRANS: Menu item for logging in to the StatusNet site.
+#: lib/logingroupnav.php:77
+msgctxt "MENU"
+msgid "Login"
+msgstr "Aperir session"
+
 #. TRANS: Title for menu item for logging in to the StatusNet site.
 #: lib/logingroupnav.php:79
 msgid "Login with a username and password"
 msgstr "Aperir session con nomine de usator e contrasigno"
 
+#. TRANS: Menu item for registering with the StatusNet site.
+#: lib/logingroupnav.php:85
+msgctxt "MENU"
+msgid "Register"
+msgstr "Crear conto"
+
 #. TRANS: Title for menu item for registering with the StatusNet site.
 #: lib/logingroupnav.php:87
 msgid "Sign up for a new account"
 msgstr "Crear un nove conto"
 
 #. TRANS: Subject for address confirmation email.
-#: lib/mail.php:168
+#: lib/mail.php:172
 msgid "Email address confirmation"
 msgstr "Confirmation del adresse de e-mail"
 
 #. TRANS: Body for address confirmation email.
 #. TRANS: %1$s is the addressed user's nickname, %2$s is the StatusNet sitename,
 #. TRANS: %3$s is the URL to confirm at.
-#: lib/mail.php:173
+#: lib/mail.php:177
 #, php-format
 msgid ""
 "Hey, %1$s.\n"
@@ -8629,14 +8695,14 @@ msgstr ""
 
 #. TRANS: Subject of new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
-#: lib/mail.php:238
+#: lib/mail.php:243
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1$s seque ora tu notas in %2$s."
 
 #. TRANS: This is a paragraph in a new-subscriber e-mail.
 #. TRANS: %s is a URL where the subscriber can be reported as abusive.
-#: lib/mail.php:245
+#: lib/mail.php:250
 #, php-format
 msgid ""
 "If you believe this account is being used abusively, you can block them from "
@@ -8651,7 +8717,7 @@ msgstr ""
 #. TRANS: %3$s is the subscriber's profile URL, %4$s is the subscriber's location (or empty)
 #. TRANS: %5$s is the subscriber's homepage URL (or empty), %6%s is the subscriber's bio (or empty)
 #. TRANS: %7$s is a link to the addressed user's e-mail settings.
-#: lib/mail.php:255
+#: lib/mail.php:260
 #, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -8678,14 +8744,14 @@ msgstr ""
 
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is biographical information.
-#: lib/mail.php:278
+#: lib/mail.php:283
 #, php-format
 msgid "Bio: %s"
 msgstr "Bio: %s"
 
 #. TRANS: Subject of notification mail for new posting email address.
 #. TRANS: %s is the StatusNet sitename.
-#: lib/mail.php:307
+#: lib/mail.php:312
 #, php-format
 msgid "New email address for posting to %s"
 msgstr "Nove adresse de e-mail pro publicar in %s"
@@ -8693,7 +8759,7 @@ msgstr "Nove adresse de e-mail pro publicar in %s"
 #. TRANS: Body of notification mail for new posting email address.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is the e-mail address to send
 #. TRANS: to to post by e-mail, %3$s is a URL to more instructions.
-#: lib/mail.php:313
+#: lib/mail.php:318
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -8716,26 +8782,26 @@ msgstr ""
 
 #. TRANS: Subject line for SMS-by-email notification messages.
 #. TRANS: %s is the posting user's nickname.
-#: lib/mail.php:434
+#: lib/mail.php:439
 #, php-format
 msgid "%s status"
 msgstr "Stato de %s"
 
 #. TRANS: Subject line for SMS-by-email address confirmation message.
-#: lib/mail.php:460
+#: lib/mail.php:465
 msgid "SMS confirmation"
 msgstr "Confirmation SMS"
 
 #. TRANS: Main body heading for SMS-by-email address confirmation message.
 #. TRANS: %s is the addressed user's nickname.
-#: lib/mail.php:464
+#: lib/mail.php:469
 #, php-format
 msgid "%s: confirm you own this phone number with this code:"
 msgstr "%s: confirma que tu possede iste numero de telephono con iste codice:"
 
 #. TRANS: Subject for 'nudge' notification email.
 #. TRANS: %s is the nudging user.
-#: lib/mail.php:485
+#: lib/mail.php:490
 #, php-format
 msgid "You have been nudged by %s"
 msgstr "%s te ha pulsate"
@@ -8743,7 +8809,7 @@ msgstr "%s te ha pulsate"
 #. TRANS: Body for 'nudge' notification email.
 #. TRANS: %1$s is the nuding user's long name, $2$s is the nudging user's nickname,
 #. TRANS: %3$s is a URL to post notices at, %4$s is the StatusNet sitename.
-#: lib/mail.php:492
+#: lib/mail.php:497
 #, php-format
 msgid ""
 "%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -8772,7 +8838,7 @@ msgstr ""
 
 #. TRANS: Subject for direct-message notification email.
 #. TRANS: %s is the sending user's nickname.
-#: lib/mail.php:539
+#: lib/mail.php:544
 #, php-format
 msgid "New private message from %s"
 msgstr "Nove message private de %s"
@@ -8781,7 +8847,7 @@ msgstr "Nove message private de %s"
 #. TRANS: %1$s is the sending user's long name, %2$s is the sending user's nickname,
 #. TRANS: %3$s is the message content, %4$s a URL to the message,
 #. TRANS: %5$s is the StatusNet sitename.
-#: lib/mail.php:547
+#: lib/mail.php:552
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -8816,7 +8882,7 @@ msgstr ""
 
 #. TRANS: Subject for favorite notification e-mail.
 #. TRANS: %1$s is the adding user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:599
+#: lib/mail.php:604
 #, php-format
 msgid "%1$s (@%2$s) added your notice as a favorite"
 msgstr "%1$s (@%2$s) ha addite tu nota como favorite"
@@ -8826,7 +8892,7 @@ msgstr "%1$s (@%2$s) ha addite tu nota como favorite"
 #. TRANS: %3$s is a URL to the faved notice, %4$s is the faved notice text,
 #. TRANS: %5$s is a URL to all faves of the adding user, %6$s is the StatusNet sitename,
 #. TRANS: %7$s is the adding user's nickname.
-#: lib/mail.php:606
+#: lib/mail.php:611
 #, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -8865,7 +8931,7 @@ msgstr ""
 "%6$s\n"
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:664
+#: lib/mail.php:669
 #, php-format
 msgid ""
 "The full conversation can be read here:\n"
@@ -8878,7 +8944,7 @@ msgstr ""
 
 #. TRANS: E-mail subject for notice notification.
 #. TRANS: %1$s is the sending user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:672
+#: lib/mail.php:677
 #, php-format
 msgid "%1$s (@%2$s) sent a notice to your attention"
 msgstr "%1$s (@%2$s) ha inviate un nota a tu attention"
@@ -8889,7 +8955,7 @@ msgstr "%1$s (@%2$s) ha inviate un nota a tu attention"
 #. TRANS: %5$s is a URL to the full conversion if it exists (otherwise empty),
 #. TRANS: %6$s is a URL to reply to the notice, %7$s is a URL to all @-replied for the addressed user,
 #. TRANS: %8$s is a URL to the addressed user's e-mail settings, %9$s is the sender's nickname.
-#: lib/mail.php:680
+#: lib/mail.php:685
 #, php-format
 msgid ""
 "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -9033,11 +9099,7 @@ msgstr "Nulle subscriptores mutual."
 msgid "To"
 msgstr "A"
 
-#: lib/messageform.php:166 lib/noticeform.php:186
-msgid "Available characters"
-msgstr "Characteres disponibile"
-
-#: lib/messageform.php:185 lib/noticeform.php:237
+#: lib/messageform.php:184 lib/noticeform.php:236
 msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr "Inviar"
@@ -9046,15 +9108,10 @@ msgstr "Inviar"
 msgid "Messages"
 msgstr "Messages"
 
-#: lib/messagelistitem.php:123 lib/noticelist.php:522
+#: lib/messagelistitem.php:123 lib/noticelist.php:527
 msgid "from"
 msgstr "via"
 
-#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:165
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr "Le pseudonymo pote solmente haber minusculas e numeros, sin spatios."
-
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 #: lib/nickname.php:178
 msgid "Nickname cannot be empty."
@@ -9077,23 +9134,23 @@ msgstr "Inviar un nota"
 msgid "What's up, %s?"
 msgstr "Como sta, %s?"
 
-#: lib/noticeform.php:194
+#: lib/noticeform.php:193
 msgid "Attach"
 msgstr "Annexar"
 
-#: lib/noticeform.php:198
+#: lib/noticeform.php:197
 msgid "Attach a file"
 msgstr "Annexar un file"
 
-#: lib/noticeform.php:213
+#: lib/noticeform.php:212
 msgid "Share my location"
 msgstr "Divulgar mi loco"
 
-#: lib/noticeform.php:216
+#: lib/noticeform.php:215
 msgid "Do not share my location"
 msgstr "Non divulgar mi loco"
 
-#: lib/noticeform.php:217
+#: lib/noticeform.php:216
 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
 "try again later"
@@ -9102,55 +9159,59 @@ msgstr ""
 "previste. Per favor reproba plus tarde."
 
 #. TRANS: Used in coordinates as abbreviation of north
-#: lib/noticelist.php:452
+#: lib/noticelist.php:457
 msgid "N"
 msgstr "N"
 
 #. TRANS: Used in coordinates as abbreviation of south
-#: lib/noticelist.php:454
+#: lib/noticelist.php:459
 msgid "S"
 msgstr "S"
 
 #. TRANS: Used in coordinates as abbreviation of east
-#: lib/noticelist.php:456
+#: lib/noticelist.php:461
 msgid "E"
 msgstr "E"
 
 #. TRANS: Used in coordinates as abbreviation of west
-#: lib/noticelist.php:458
+#: lib/noticelist.php:463
 msgid "W"
 msgstr "W"
 
-#: lib/noticelist.php:460
+#: lib/noticelist.php:465
 #, php-format
 msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 
-#: lib/noticelist.php:469
+#: lib/noticelist.php:474
 msgid "at"
 msgstr "in"
 
-#: lib/noticelist.php:518
+#: lib/noticelist.php:523
 msgid "web"
 msgstr "web"
 
-#: lib/noticelist.php:584
+#: lib/noticelist.php:589
 msgid "in context"
 msgstr "in contexto"
 
-#: lib/noticelist.php:619
+#: lib/noticelist.php:624
 msgid "Repeated by"
 msgstr "Repetite per"
 
-#: lib/noticelist.php:646
+#: lib/noticelist.php:651
 msgid "Reply to this notice"
 msgstr "Responder a iste nota"
 
-#: lib/noticelist.php:647
+#: lib/noticelist.php:652
 msgid "Reply"
 msgstr "Responder"
 
-#: lib/noticelist.php:691
+#: lib/noticelist.php:678
+msgid "Delete this notice"
+msgstr "Deler iste nota"
+
+#: lib/noticelist.php:696
 msgid "Notice repeated"
 msgstr "Nota repetite"
 
@@ -9187,43 +9248,31 @@ msgstr "Nota duplicate."
 msgid "Couldn't insert new subscription."
 msgstr "Non poteva inserer nove subscription."
 
-#. TRANS: Personal group navigation menu option when logged in for viewing @-replies.
-#: lib/personalgroupnav.php:107
-msgctxt "MENU"
+#: lib/personalgroupnav.php:104
+#, fuzzy
 msgid "Replies"
 msgstr "Responsas"
 
-#. TRANS: Personal group navigation menu option when logged in for seeing own profile.
-#: lib/personalgroupnav.php:114
-msgctxt "MENU"
-msgid "Profile"
-msgstr "Profilo"
-
-#. TRANS: Personal group navigation menu option when logged in for viewing own favourited notices.
-#: lib/personalgroupnav.php:120
-msgctxt "MENU"
+#: lib/personalgroupnav.php:109
+#, fuzzy
 msgid "Favorites"
 msgstr "Favorites"
 
-#. TRANS: Personal group navigation menu option when logged in for viewing recieved personal messages.
-#: lib/personalgroupnav.php:133
-msgctxt "MENU"
+#: lib/personalgroupnav.php:120
+#, fuzzy
 msgid "Inbox"
 msgstr "Cassa de entrata"
 
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing recieved personal messages.
-#: lib/personalgroupnav.php:135
+#: lib/personalgroupnav.php:121
 msgid "Your incoming messages"
 msgstr "Tu messages recipite"
 
-#. TRANS: Personal group navigation menu option when logged in for viewing senet personal messages.
-#: lib/personalgroupnav.php:140
-msgctxt "MENU"
+#: lib/personalgroupnav.php:125
+#, fuzzy
 msgid "Outbox"
 msgstr "Cassa de exito"
 
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing senet personal messages.
-#: lib/personalgroupnav.php:142
+#: lib/personalgroupnav.php:126
 msgid "Your sent messages"
 msgstr "Tu messages inviate"
 
@@ -9238,9 +9287,26 @@ msgstr "Etiquettas in le notas de %s"
 msgid "Unknown"
 msgstr "Incognite"
 
+#. TRANS: Plugin admin panel controls
+#: lib/plugindisableform.php:90
+msgctxt "plugin"
+msgid "Disable"
+msgstr ""
+
+#. TRANS: Plugin admin panel controls
+#: lib/pluginenableform.php:112
+msgctxt "plugin"
+msgid "Enable"
+msgstr ""
+
+#: lib/pluginlist.php:196
+msgctxt "plugin-description"
+msgid "(Plugin descriptions unavailable when disabled.)"
+msgstr ""
+
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:82
+#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:88
 msgid "Subscriptions"
 msgstr "Subscriptiones"
 
@@ -9251,7 +9317,7 @@ msgstr "Tote le subscriptiones"
 
 #. TRANS: H2 text for user subscriber statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:90
+#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:96
 msgid "Subscribers"
 msgstr "Subscriptores"
 
@@ -9273,7 +9339,7 @@ msgstr "Membro depost"
 #. TRANS: Label for user statistics.
 #. TRANS: H2 text for user group membership statistics.
 #: lib/profileaction.php:239 lib/profileaction.php:290
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:104
 msgid "Groups"
 msgstr "Gruppos"
 
@@ -9293,10 +9359,6 @@ msgstr "Tote le gruppos"
 msgid "Unimplemented method."
 msgstr "Methodo non implementate."
 
-#: lib/publicgroupnav.php:78
-msgid "Public"
-msgstr "Public"
-
 #: lib/publicgroupnav.php:82
 msgid "User groups"
 msgstr "Gruppos de usatores"
@@ -9335,7 +9397,7 @@ msgid "Revoke the \"%s\" role from this user"
 msgstr "Revocar le rolo \"%s\" de iste usator"
 
 #. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:974
+#: lib/router.php:1001
 msgid "Page not found."
 msgstr "Pagina non trovate."
 
@@ -9364,11 +9426,6 @@ msgctxt "BUTTON"
 msgid "Search"
 msgstr "Cercar"
 
-#. TRANS: Definition list item with instructions on how to get (better) search results.
-#: lib/searchaction.php:170
-msgid "Search help"
-msgstr "Adjuta super le recerca"
-
 #: lib/searchgroupnav.php:80
 msgid "People"
 msgstr "Personas"
@@ -9393,6 +9450,51 @@ msgstr "Section sin titulo"
 msgid "More..."
 msgstr "Plus…"
 
+#: lib/settingsnav.php:78
+msgid "Change your profile settings"
+msgstr "Cambiar le optiones de tu profilo"
+
+#: lib/settingsnav.php:83
+msgid "Upload an avatar"
+msgstr "Incargar un avatar"
+
+#: lib/settingsnav.php:88
+msgid "Change your password"
+msgstr "Cambiar tu contrasigno"
+
+#: lib/settingsnav.php:93
+msgid "Change email handling"
+msgstr "Modificar le tractamento de e-mail"
+
+#: lib/settingsnav.php:98
+msgid "Design your profile"
+msgstr "Designar tu profilo"
+
+#: lib/settingsnav.php:102
+msgid "URL"
+msgstr "URL"
+
+#: lib/settingsnav.php:103
+msgid "URL shorteners"
+msgstr ""
+
+#: lib/settingsnav.php:111
+msgid "Updates by instant messenger (IM)"
+msgstr "Actualisationes per messageria instantanee (MI)"
+
+#: lib/settingsnav.php:118
+msgid "Updates by SMS"
+msgstr "Actualisationes per SMS"
+
+#: lib/settingsnav.php:123
+#, fuzzy
+msgid "Connections"
+msgstr "Connexiones"
+
+#: lib/settingsnav.php:124
+msgid "Authorized connected applications"
+msgstr "Applicationes autorisate connectite"
+
 #: lib/silenceform.php:67
 msgid "Silence"
 msgstr "Silentiar"
@@ -9401,30 +9503,34 @@ msgstr "Silentiar"
 msgid "Silence this user"
 msgstr "Silentiar iste usator"
 
-#: lib/subgroupnav.php:83
+#: lib/subgroupnav.php:89
 #, php-format
 msgid "People %s subscribes to"
 msgstr "Personas que %s seque"
 
-#: lib/subgroupnav.php:91
+#: lib/subgroupnav.php:97
 #, php-format
 msgid "People subscribed to %s"
 msgstr "Personas qui seque %s"
 
-#: lib/subgroupnav.php:99
+#: lib/subgroupnav.php:105
 #, php-format
 msgid "Groups %s is a member of"
 msgstr "Gruppos del quales %s es membro"
 
-#: lib/subgroupnav.php:105
+#: lib/subgroupnav.php:111
 msgid "Invite"
 msgstr "Invitar"
 
-#: lib/subgroupnav.php:106
+#: lib/subgroupnav.php:112
 #, php-format
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Invitar amicos e collegas a accompaniar te in %s"
 
+#: lib/subscribeform.php:115 lib/subscribeform.php:139
+msgid "Subscribe to this user"
+msgstr "Subscriber a iste usator"
+
 #: lib/subscriberspeopleselftagcloudsection.php:48
 #: lib/subscriptionspeopleselftagcloudsection.php:48
 msgid "People Tagcloud as self-tagged"
@@ -9503,6 +9609,13 @@ msgstr ""
 msgid "Error opening theme archive."
 msgstr "Error durante le apertura del archivo del apparentia."
 
+#: lib/threadednoticelist.php:270
+#, php-format
+msgid "Show all %d comment"
+msgid_plural "Show all %d comments"
+msgstr[0] ""
+msgstr[1] ""
+
 #: lib/topposterssection.php:74
 msgid "Top posters"
 msgstr "Qui scribe le plus"
@@ -9544,76 +9657,79 @@ msgstr "Cancellar subscription"
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "Le usator %1$s (%2$d) non ha un registro de profilo."
 
-#. TRANS: Link text for changeing the avatar of the logged in user.
-#: lib/userprofile.php:121
+#: lib/userprofile.php:116
 msgid "Edit Avatar"
 msgstr "Modificar avatar"
 
 #. TRANS: H2 for user actions in a profile.
 #. TRANS: H2 for entity actions in a profile.
-#: lib/userprofile.php:245 lib/userprofile.php:261
+#: lib/userprofile.php:216 lib/userprofile.php:232
 msgid "User actions"
 msgstr "Actiones de usator"
 
 #. TRANS: Text shown in user profile of not yet compeltely deleted users.
-#: lib/userprofile.php:249
+#: lib/userprofile.php:220
 msgid "User deletion in progress..."
 msgstr "Deletion del usator in curso…"
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:277
+#: lib/userprofile.php:248
 msgid "Edit profile settings"
 msgstr "Modificar configuration de profilo"
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:279
+#: lib/userprofile.php:250
 msgid "Edit"
 msgstr "Modificar"
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:303
+#: lib/userprofile.php:274
 msgid "Send a direct message to this user"
 msgstr "Inviar un message directe a iste usator"
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:305
+#: lib/userprofile.php:276
 msgid "Message"
 msgstr "Message"
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:347
+#: lib/userprofile.php:318
 msgid "Moderate"
 msgstr "Moderar"
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:386
+#: lib/userprofile.php:357
 msgid "User role"
 msgstr "Rolo de usator"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:389
+#: lib/userprofile.php:360
 msgctxt "role"
 msgid "Administrator"
 msgstr "Administrator"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:391
+#: lib/userprofile.php:362
 msgctxt "role"
 msgid "Moderator"
 msgstr "Moderator"
 
+#: lib/util.php:321
+msgid "Not allowed to log in."
+msgstr "Apertura de session non permittite."
+
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1306
+#: lib/util.php:1337
 msgid "a few seconds ago"
 msgstr "alcun secundas retro"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1309
+#: lib/util.php:1340
 msgid "about a minute ago"
 msgstr "circa un minuta retro"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1313
+#: lib/util.php:1344
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
@@ -9621,12 +9737,12 @@ msgstr[0] "circa un minuta retro"
 msgstr[1] "circa %d minutas retro"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1316
+#: lib/util.php:1347
 msgid "about an hour ago"
 msgstr "circa un hora retro"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1320
+#: lib/util.php:1351
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
@@ -9634,12 +9750,12 @@ msgstr[0] "circa un hora retro"
 msgstr[1] "circa %d horas retro"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1323
+#: lib/util.php:1354
 msgid "about a day ago"
 msgstr "circa un die retro"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1327
+#: lib/util.php:1358
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
@@ -9647,12 +9763,12 @@ msgstr[0] "circa un die retro"
 msgstr[1] "circa %d dies retro"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1330
+#: lib/util.php:1361
 msgid "about a month ago"
 msgstr "circa un mense retro"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1334
+#: lib/util.php:1365
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
@@ -9660,7 +9776,7 @@ msgstr[0] "circa un mense retro"
 msgstr[1] "circa %d menses retro"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1337
+#: lib/util.php:1368
 msgid "about a year ago"
 msgstr "circa un anno retro"
 
@@ -9671,21 +9787,6 @@ msgstr "circa un anno retro"
 msgid "%s is not a valid color! Use 3 or 6 hex characters."
 msgstr "%s non es un color valide! Usa 3 o 6 characteres hexadecimal."
 
-#. TRANS: %s is the URL to the StatusNet site's Instant Messaging settings.
-#: lib/xmppmanager.php:287
-#, php-format
-msgid "Unknown user. Go to %s to add your address to your account"
-msgstr "Usator incognite. Vade a %s pro adder tu adresse a tu conto."
-
-#. TRANS: Response to XMPP source when it sent too long a message.
-#. TRANS: %1$d the maximum number of allowed characters (used for plural), %2$d is the sent number.
-#: lib/xmppmanager.php:406
-#, php-format
-msgid "Message too long. Maximum is %1$d character, you sent %2$d."
-msgid_plural "Message too long. Maximum is %1$d characters, you sent %2$d."
-msgstr[0] "Message troppo longe. Maximo es %1$d character, tu inviava %2$d."
-msgstr[1] "Message troppo longe. Maximo es %1$d characteres, tu inviava %2$d."
-
 #. TRANS: Exception.
 #: lib/xrd.php:63
 msgid "Invalid XML."
@@ -9702,63 +9803,173 @@ msgstr "XML invalide, radice XRD mancante."
 msgid "Getting backup from file '%s'."
 msgstr "Obtene copia de reserva ex file '%s'."
 
-#~ msgid "Block this user."
-#~ msgstr "Blocar iste usator."
+#~ msgid "Could not generate feed for group - %s"
+#~ msgstr "Non poteva generar un syndication pro le gruppo %s."
 
-#~ msgid "Delete this notice."
-#~ msgstr "Deler iste nota."
-
-#~ msgid "Delete this user."
-#~ msgstr "Deler iste usator."
-
-#~ msgid "Restore default designs."
-#~ msgstr "Restaurar apparentias predefinite."
-
-#~ msgid "Reset back to default."
-#~ msgstr "Revenir al predefinitiones."
-
-#~ msgid "Save design."
-#~ msgstr "Salveguardar apparentia."
-
-#~ msgid "Disfavor favorite."
-#~ msgstr "Disfavorir favorite."
-
-#~ msgid "\"%s\" not found."
-#~ msgstr "\"%s\" non trovate."
-
-#~ msgid "Notice %s not found."
-#~ msgstr "Nota %s non trovate."
-
-#~ msgid "Attachment %s not found."
-#~ msgstr "Annexo %s non trovate."
-
-#~ msgid "\"%s\" not supported for oembed requests."
-#~ msgstr "\"%s\" non es supportate pro le requestas \"oembed\"."
-
-#~ msgid "Invalid tag: \"%s\"."
-#~ msgstr "Etiquetta invalide: \"%s\"."
-
-#~ msgid "%s updates from everyone."
-#~ msgstr "Actualisationes de totes in %s."
-
-#~ msgid "Password saved"
-#~ msgstr "Contrasigno salveguardate"
-
-#~ msgid "Where you are, like \"City, State (or Region), Country\"."
-#~ msgstr "Ubi tu es, como \"Citate, Stato (o Region), Pais\"."
-
-#~ msgid "Subscribe to this user."
-#~ msgstr "Subscriber a iste usator."
+#~ msgid "Current confirmed Jabber/Google Talk address."
+#~ msgstr "Adresse Jabber/Google Talk actualmente confirmate."
 
 #~ msgid ""
-#~ "Listenee stream license \"%1$s\" is not compatible with site license \"%2"
-#~ "$s\"."
+#~ "Jabber or Google Talk address, like \"UserName@example.org\". First, make "
+#~ "sure to add %s to your buddy list in your IM client or on Google Talk."
 #~ msgstr ""
-#~ "Le licentia del fluxo que tu ascolta, \"%1$s\", non es compatibile con le "
-#~ "licentia del sito \"%2$s\"."
+#~ "Un adresse Jabber o Google Talk, como \"nomine@example.org\". Primo, "
+#~ "assecura te de adder %s a tu lista de amicos in tu cliente de messageria "
+#~ "instantanee o in Google Talk."
 
-#~ msgid "Not allowed to use API."
-#~ msgstr "Uso del API non permittite."
+#~ msgid "Send me notices through Jabber/Google Talk."
+#~ msgstr "Inviar me notas per Jabber/Google Talk."
 
-#~ msgid "Not allowed to log in."
-#~ msgstr "Apertura de session non permittite."
+#~ msgid "Publish a MicroID for my Jabber/Google Talk address."
+#~ msgstr "Publicar un MicroID pro mi adresse Jabber/Google Talk."
+
+#~ msgid "No Jabber ID."
+#~ msgstr "Nulle ID de Jabber."
+
+#~ msgid "Not a valid Jabber ID."
+#~ msgstr "ID de Jabber non valide."
+
+#~ msgid "That is already your Jabber ID."
+#~ msgstr "Isto es ja tu ID de Jabber."
+
+#~ msgid "That is not your Jabber ID."
+#~ msgstr "Isto non es tu ID de Jabber."
+
+#~ msgid "Other settings"
+#~ msgstr "Altere configurationes"
+
+#~ msgid "Tag cloud"
+#~ msgstr "Etiquettario"
+
+#~ msgid "Consumer key"
+#~ msgstr "Clave de consumitor"
+
+#~ msgid "Consumer secret"
+#~ msgstr "Secreto de consumitor"
+
+#~ msgid "Request token URL"
+#~ msgstr "URL del indicio de requesta"
+
+#~ msgid "Access token URL"
+#~ msgstr "URL del indicio de accesso"
+
+#~ msgid "Authorize URL"
+#~ msgstr "URL de autorisation"
+
+#~ msgid "Jabber"
+#~ msgstr "Jabber"
+
+#~ msgid "Photo"
+#~ msgstr "Photo"
+
+#~ msgid "Other options"
+#~ msgstr "Altere optiones"
+
+#~ msgid "Other"
+#~ msgstr "Altere"
+
+#~ msgid "Primary site navigation"
+#~ msgstr "Navigation primari del sito"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Personal profile and friends timeline"
+#~ msgstr "Profilo personal e chronologia de amicos"
+
+#~ msgctxt "MENU"
+#~ msgid "Personal"
+#~ msgstr "Personal"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Change your email, avatar, password, profile"
+#~ msgstr "Cambiar tu e-mail, avatar, contrasigno, profilo"
+
+#~ msgid "Account"
+#~ msgstr "Conto"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Connect to services"
+#~ msgstr "Connecter a servicios"
+
+#~ msgid "Connect"
+#~ msgstr "Connecter"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Change site configuration"
+#~ msgstr "Modificar le configuration del sito"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Invite friends and colleagues to join you on %s"
+#~ msgstr "Invitar amicos e collegas a accompaniar te in %s"
+
+#~ msgctxt "MENU"
+#~ msgid "Invite"
+#~ msgstr "Invitar"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Create an account"
+#~ msgstr "Crear un conto"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Help me!"
+#~ msgstr "Adjuta me!"
+
+#~ msgctxt "MENU"
+#~ msgid "Help"
+#~ msgstr "Adjuta"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Search for people or text"
+#~ msgstr "Cercar personas o texto"
+
+#~ msgid "Local views"
+#~ msgstr "Vistas local"
+
+#~ msgid "Page notice"
+#~ msgstr "Aviso de pagina"
+
+#~ msgid "Secondary site navigation"
+#~ msgstr "Navigation secundari del sito"
+
+#~ msgid "StatusNet software license"
+#~ msgstr "Licentia del software StatusNet"
+
+#~ msgid "Site content license"
+#~ msgstr "Licentia del contento del sito"
+
+#~ msgid "Pagination"
+#~ msgstr "Pagination"
+
+#~ msgid "Author"
+#~ msgstr "Autor"
+
+#~ msgid "Provider"
+#~ msgstr "Providitor"
+
+#~ msgctxt "MENU"
+#~ msgid "SMS"
+#~ msgstr "SMS"
+
+#~ msgid "Filter tags"
+#~ msgstr "Filtrar etiquettas"
+
+#~ msgid "[%s]"
+#~ msgstr "[%s]"
+
+#~ msgid "Available characters"
+#~ msgstr "Characteres disponibile"
+
+#~ msgctxt "MENU"
+#~ msgid "Profile"
+#~ msgstr "Profilo"
+
+#~ msgid "Search help"
+#~ msgstr "Adjuta super le recerca"
+
+#~ msgid "Unknown user. Go to %s to add your address to your account"
+#~ msgstr "Usator incognite. Vade a %s pro adder tu adresse a tu conto."
+
+#~ msgid "Message too long. Maximum is %1$d character, you sent %2$d."
+#~ msgid_plural "Message too long. Maximum is %1$d characters, you sent %2$d."
+#~ msgstr[0] "Message troppo longe. Maximo es %1$d character, tu inviava %2$d."
+#~ msgstr[1] ""
+#~ "Message troppo longe. Maximo es %1$d characteres, tu inviava %2$d."
diff --git a/locale/it/LC_MESSAGES/statusnet.po b/locale/it/LC_MESSAGES/statusnet.po
index 3f0ab6fa0b..92e7821d6a 100644
--- a/locale/it/LC_MESSAGES/statusnet.po
+++ b/locale/it/LC_MESSAGES/statusnet.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 15:58+0000\n"
-"PO-Revision-Date: 2011-03-03 16:00:53+0000\n"
+"POT-Creation-Date: 2011-03-03 17:23+0000\n"
+"PO-Revision-Date: 2011-03-03 17:26:08+0000\n"
 "Language-Team: Italian <http://translatewiki.net/wiki/Portal:it>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -80,23 +80,23 @@ msgstr "Salva impostazioni di accesso"
 #. TRANS: Tooltip for button to save access settings in site admin panel.
 #. TRANS: Button text for saving theme settings.
 #. TRANS: Button label to save e-mail preferences.
-#. TRANS: Button label to save Instant Messaging preferences.
-#. TRANS: Button text for saving "Other settings" in profile.
+#. TRANS: Button label to save IM preferences.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
 #. TRANS: Button text for saving site notice in admin panel.
 #. TRANS: Button label to save SMS preferences.
 #. TRANS: Save button for settings for a profile in a subscriptions list.
+#. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
 #. TRANS: Button text on profile design page to save settings.
 #: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
-#: actions/emailsettings.php:250 actions/imsettings.php:183
-#: actions/othersettings.php:136 actions/pathsadminpanel.php:512
-#: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
-#: actions/smssettings.php:205 actions/subscriptions.php:259
+#: actions/emailsettings.php:251 actions/imsettings.php:199
+#: actions/pathsadminpanel.php:512 actions/profilesettings.php:198
+#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:204
+#: actions/subscriptions.php:261 actions/urlsettings.php:152
 #: actions/useradminpanel.php:298 lib/applicationeditform.php:355
-#: lib/designsettings.php:270 lib/groupeditform.php:201
+#: lib/designform.php:320 lib/groupeditform.php:201
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Salva"
@@ -135,7 +135,11 @@ msgstr "Pagina inesistente."
 #. 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 use "one time password login" without using an existing user.
+#. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
+#. TRANS: Client error displayed trying to find a user by ID for a non-existing ID.
+#. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when calling a profile action without specifying a user.
 #: actions/all.php:80 actions/allrss.php:69
@@ -147,19 +151,19 @@ msgstr "Pagina inesistente."
 #: actions/apidirectmessage.php:75 actions/apidirectmessagenew.php:72
 #: actions/apigroupcreate.php:111 actions/apigroupismember.php:89
 #: actions/apigroupjoin.php:98 actions/apigroupleave.php:98
-#: actions/apigrouplist.php:70 actions/apistatusesupdate.php:230
-#: actions/apisubscriptions.php:85 actions/apitimelinefavorites.php:70
-#: actions/apitimelinefriends.php:173 actions/apitimelinehome.php:78
-#: actions/apitimelinementions.php:77 actions/apitimelineuser.php:79
-#: actions/avatarbynickname.php:79 actions/favoritesrss.php:72
-#: actions/foaf.php:42 actions/foaf.php:61 actions/hcard.php:67
-#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
-#: actions/remotesubscribe.php:144 actions/remotesubscribe.php:153
-#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
-#: actions/showfavorites.php:106 actions/userbyid.php:74
-#: actions/usergroups.php:93 actions/userrss.php:40 actions/userxrd.php:59
-#: actions/xrds.php:71 lib/command.php:509 lib/galleryaction.php:59
-#: lib/mailbox.php:80 lib/profileaction.php:77
+#: actions/apigrouplist.php:70 actions/apigroupprofileupdate.php:108
+#: actions/apistatusesupdate.php:230 actions/apisubscriptions.php:85
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:173
+#: actions/apitimelinehome.php:78 actions/apitimelinementions.php:77
+#: actions/apitimelineuser.php:79 actions/avatarbynickname.php:79
+#: actions/favoritesrss.php:72 actions/foaf.php:42 actions/foaf.php:61
+#: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116
+#: actions/otp.php:78 actions/remotesubscribe.php:144
+#: actions/remotesubscribe.php:153 actions/replies.php:73
+#: actions/repliesrss.php:38 actions/rsd.php:113 actions/showfavorites.php:106
+#: actions/userbyid.php:75 actions/usergroups.php:93 actions/userrss.php:40
+#: actions/userxrd.php:59 actions/xrds.php:71 lib/command.php:509
+#: lib/galleryaction.php:59 lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Utente inesistente."
 
@@ -173,10 +177,9 @@ msgstr "%1$s e amici, pagina %2$d"
 #. TRANS: H1 text for page. %s is a user nickname.
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Timeline title for user and friends. %s is a user nickname.
-#. TRANS: Tooltop for personal group navigation menu option when logged in for viewing timeline of self and friends.
 #: actions/all.php:94 actions/all.php:191 actions/allrss.php:117
 #: actions/apitimelinefriends.php:207 actions/apitimelinehome.php:113
-#: lib/personalgroupnav.php:102
+#: lib/personalgroupnav.php:100
 #, php-format
 msgid "%s and friends"
 msgstr "%s e amici"
@@ -234,7 +237,7 @@ msgstr ""
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
 #. TRANS: Second sentence of empty message for anonymous users. %s is a user nickname.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:227
+#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:221
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -281,19 +284,20 @@ msgstr "Messaggi da %1$s e amici su %2$s!"
 #: actions/apifavoritecreate.php:98 actions/apifavoritedestroy.php:98
 #: actions/apifriendshipscreate.php:99 actions/apifriendshipsdestroy.php:99
 #: actions/apifriendshipsshow.php:124 actions/apigroupcreate.php:138
-#: actions/apigroupismember.php:115 actions/apigroupjoin.php:160
-#: actions/apigroupleave.php:145 actions/apigrouplist.php:134
+#: actions/apigroupismember.php:115 actions/apigroupjoin.php:151
+#: actions/apigroupleave.php:141 actions/apigrouplist.php:134
 #: actions/apigrouplistall.php:120 actions/apigroupmembership.php:105
+#: actions/apigroupprofileupdate.php:100 actions/apigroupprofileupdate.php:213
 #: actions/apigroupshow.php:114 actions/apihelptest.php:84
 #: actions/apistatusesdestroy.php:101 actions/apistatusesretweets.php:110
 #: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:139
 #: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
-#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:268
-#: actions/apitimelinegroup.php:147 actions/apitimelinehome.php:173
-#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:239
-#: actions/apitimelineretweetedtome.php:118
-#: actions/apitimelineretweetsofme.php:150 actions/apitimelinetag.php:159
-#: actions/apitimelineuser.php:206 actions/apiusershow.php:100
+#: actions/apitimelinefavorites.php:182 actions/apitimelinefriends.php:276
+#: actions/apitimelinegroup.php:148 actions/apitimelinehome.php:181
+#: actions/apitimelinementions.php:182 actions/apitimelinepublic.php:247
+#: actions/apitimelineretweetedtome.php:147
+#: actions/apitimelineretweetsofme.php:147 actions/apitimelinetag.php:165
+#: actions/apitimelineuser.php:217 actions/apiusershow.php:100
 msgid "API method not found."
 msgstr "Metodo delle API non trovato."
 
@@ -308,8 +312,9 @@ msgstr "Metodo delle API non trovato."
 #: actions/apifavoritecreate.php:88 actions/apifavoritedestroy.php:88
 #: actions/apifriendshipscreate.php:89 actions/apifriendshipsdestroy.php:89
 #: actions/apigroupcreate.php:102 actions/apigroupjoin.php:89
-#: actions/apigroupleave.php:89 actions/apimediaupload.php:66
-#: actions/apistatusesretweet.php:63 actions/apistatusesupdate.php:194
+#: actions/apigroupleave.php:89 actions/apigroupprofileupdate.php:92
+#: actions/apimediaupload.php:66 actions/apistatusesretweet.php:63
+#: actions/apistatusesupdate.php:194
 msgid "This method requires a POST."
 msgstr "Questo metodo richiede POST."
 
@@ -323,21 +328,16 @@ msgstr ""
 "\"sms\", \"im\" o \"none\"."
 
 #. TRANS: Server error displayed when a user's delivery device cannot be updated.
-#. TRANS: Server error displayed when a user update to the database fails in the contact address confirmation action.
 #. TRANS: Server error thrown on database error updating e-mail preferences.
 #. TRANS: Server error thrown on database error removing a registered e-mail address.
-#. TRANS: Server error thrown on database error updating Instant Messaging preferences.
-#. TRANS: Server error thrown on database error removing a registered Instant Messaging address.
-#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
 #. TRANS: Server error thrown when user profile settings could not be updated.
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
-#: actions/apiaccountupdatedeliverydevice.php:130
-#: actions/confirmaddress.php:118 actions/emailsettings.php:352
-#: actions/emailsettings.php:498 actions/imsettings.php:276
-#: actions/imsettings.php:432 actions/othersettings.php:186
-#: actions/profilesettings.php:322 actions/smssettings.php:301
-#: actions/smssettings.php:454
+#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
+#: actions/apiaccountupdatedeliverydevice.php:136
+#: actions/emailsettings.php:353 actions/emailsettings.php:499
+#: actions/profilesettings.php:323 actions/smssettings.php:300
+#: actions/smssettings.php:453 actions/urlsettings.php:211
 msgid "Could not update user."
 msgstr "Impossibile aggiornare l'utente."
 
@@ -363,7 +363,7 @@ msgstr "L'utente non ha un profilo."
 
 #. TRANS: Server error displayed if a user profile could not be saved.
 #. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:418
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:419
 msgid "Could not save profile."
 msgstr "Impossibile salvare il profilo."
 
@@ -375,7 +375,7 @@ msgstr "Impossibile salvare il profilo."
 #: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
 #: actions/designadminpanel.php:120 actions/editapplication.php:121
 #: actions/newapplication.php:102 actions/newnotice.php:95
-#: lib/designsettings.php:298
+#: lib/designsettings.php:110
 #, fuzzy, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s byte) due to its "
@@ -400,8 +400,8 @@ msgstr[1] ""
 #: actions/apiaccountupdateprofilecolors.php:160
 #: actions/apiaccountupdateprofilecolors.php:171
 #: actions/groupdesignsettings.php:285 actions/groupdesignsettings.php:296
-#: actions/userdesignsettings.php:201 actions/userdesignsettings.php:211
-#: actions/userdesignsettings.php:253 actions/userdesignsettings.php:263
+#: actions/userdesignsettings.php:218 actions/userdesignsettings.php:228
+#: actions/userdesignsettings.php:270 actions/userdesignsettings.php:280
 msgid "Unable to save your design settings."
 msgstr "Impossibile salvare la impostazioni dell'aspetto."
 
@@ -409,7 +409,7 @@ msgstr "Impossibile salvare la impostazioni dell'aspetto."
 #. TRANS: Client error displayed when a database error occurs updating profile colours.
 #: actions/apiaccountupdateprofilebackgroundimage.php:191
 #: actions/apiaccountupdateprofilecolors.php:139
-#: actions/userdesignsettings.php:179
+#: actions/userdesignsettings.php:196
 msgid "Could not update your design."
 msgstr "Impossibile aggiornare l'aspetto."
 
@@ -520,7 +520,7 @@ msgstr "Destinatario non trovato."
 #. TRANS: Client error displayed trying to direct message another user who's not a friend (403).
 #: actions/apidirectmessagenew.php:144
 #, fuzzy
-msgid "Can't send direct messages to users who aren't your friend."
+msgid "Cannot send direct messages to users who aren't your friend."
 msgstr "Non puoi inviare messaggi diretti a utenti che non sono tuoi amici."
 
 #. TRANS: Client error displayed trying to direct message self (403).
@@ -603,9 +603,9 @@ msgstr "Impossibile trovare l'utente destinazione."
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:156 actions/editgroup.php:191
-#: actions/newgroup.php:137 actions/profilesettings.php:273
-#: actions/register.php:214
+#: actions/apigroupcreate.php:156 actions/apigroupprofileupdate.php:255
+#: actions/editgroup.php:191 actions/newgroup.php:137
+#: actions/profilesettings.php:274 actions/register.php:199
 msgid "Nickname already in use. Try another one."
 msgstr "Soprannome già in uso. Prova con un altro."
 
@@ -613,9 +613,9 @@ msgstr "Soprannome già in uso. Prova con un altro."
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:164 actions/editgroup.php:195
-#: actions/newgroup.php:141 actions/profilesettings.php:243
-#: actions/register.php:216
+#: actions/apigroupcreate.php:164 actions/apigroupprofileupdate.php:259
+#: actions/editgroup.php:195 actions/newgroup.php:141
+#: actions/profilesettings.php:244 actions/register.php:201
 msgid "Not a valid nickname."
 msgstr "Non è un soprannome valido."
 
@@ -625,10 +625,10 @@ msgstr "Non è un soprannome valido."
 #. TRANS: Validation error shown when providing an invalid homepage URL in the "New application" form.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:181 actions/editapplication.php:235
-#: actions/editgroup.php:202 actions/newapplication.php:221
-#: actions/newgroup.php:148 actions/profilesettings.php:248
-#: actions/register.php:223
+#: actions/apigroupcreate.php:181 actions/apigroupprofileupdate.php:277
+#: actions/editapplication.php:235 actions/editgroup.php:202
+#: actions/newapplication.php:221 actions/newgroup.php:148
+#: actions/profilesettings.php:249 actions/register.php:208
 msgid "Homepage is not a valid URL."
 msgstr "L'indirizzo della pagina web non è valido."
 
@@ -637,8 +637,8 @@ msgstr "L'indirizzo della pagina web non è valido."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:191 actions/editgroup.php:206
-#: actions/newgroup.php:152 actions/profilesettings.php:252
-#: actions/register.php:226
+#: actions/newgroup.php:152 actions/profilesettings.php:253
+#: actions/register.php:211
 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "Nome troppo lungo (max 255 caratteri)."
@@ -666,8 +666,8 @@ msgstr[1] "La descrizione è troppo lunga (max %d caratteri)."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:215 actions/editgroup.php:218
-#: actions/newgroup.php:164 actions/profilesettings.php:265
-#: actions/register.php:235
+#: actions/newgroup.php:164 actions/profilesettings.php:266
+#: actions/register.php:220
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
 msgstr "Ubicazione troppo lunga (max 255 caratteri)."
@@ -697,15 +697,16 @@ msgstr "Alias non valido: \"%s\"."
 #. TRANS: %s is the alias that is already in use.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error. %s is the already used alias.
-#: actions/apigroupcreate.php:264 actions/editgroup.php:246
-#: actions/newgroup.php:193
+#: actions/apigroupcreate.php:264 actions/apigroupprofileupdate.php:351
+#: actions/editgroup.php:246 actions/newgroup.php:193
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "L'alias \"%s\" è già in uso. Prova con un altro."
 
 #. TRANS: Client error displayed when trying to use an alias during group creation that is the same as the group's nickname.
 #. TRANS: Group edit form validation error.
-#: actions/apigroupcreate.php:278 actions/editgroup.php:253
+#: actions/apigroupcreate.php:278 actions/apigroupprofileupdate.php:359
+#: actions/editgroup.php:253
 msgid "Alias can't be the same as nickname."
 msgstr "L'alias non può essere lo stesso del soprannome."
 
@@ -717,7 +718,8 @@ msgstr "L'alias non può essere lo stesso del soprannome."
 #. TRANS: Client error displayed requesting most recent notices to a group for a non-existing group.
 #: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
 #: actions/apigroupleave.php:104 actions/apigroupmembership.php:71
-#: actions/apigroupshow.php:81 actions/apitimelinegroup.php:89
+#: actions/apigroupprofileupdate.php:113 actions/apigroupshow.php:81
+#: actions/apitimelinegroup.php:89
 msgid "Group not found."
 msgstr "Gruppo non trovato."
 
@@ -735,13 +737,11 @@ msgstr "Fai già parte di quel gruppo."
 msgid "You have been blocked from that group by the admin."
 msgstr "L'amministratore ti ha bloccato l'accesso a quel gruppo."
 
-#. TRANS: Server error displayed when joining a group fails.
-#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
 #. 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.
 #. TRANS: Message given having failed to add a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:362
+#: actions/apigroupjoin.php:136 actions/joingroup.php:139 lib/command.php:362
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "Impossibile iscrivere l'utente %1$s al gruppo %2$s."
@@ -751,8 +751,6 @@ msgstr "Impossibile iscrivere l'utente %1$s al gruppo %2$s."
 msgid "You are not a member of this group."
 msgstr "Non fai parte di questo gruppo."
 
-#. TRANS: Server error displayed when leaving a group fails.
-#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
 #. TRANS: Server error displayed when leaving a group failed in the database.
 #. TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
 #. TRANS: Message given having failed to remove a user from a group.
@@ -788,6 +786,63 @@ msgstr "Gruppi di %s"
 msgid "groups on %s"
 msgstr "Gruppi su %s"
 
+#. TRANS: Client error displayed trying to edit a group while not being a group admin.
+#. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
+#. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
+#: actions/apigroupprofileupdate.php:118 actions/editgroup.php:110
+#: actions/editgroup.php:176 actions/groupdesignsettings.php:109
+#: actions/grouplogo.php:111
+msgid "You must be an admin to edit the group."
+msgstr "Devi essere amministratore per modificare il gruppo."
+
+#. TRANS: Server error displayed when editing a group fails.
+#: actions/apigroupprofileupdate.php:171 actions/editgroup.php:274
+msgid "Could not update group."
+msgstr "Impossibile aggiornare il gruppo."
+
+#. TRANS: Server error displayed when group aliases could not be added.
+#. TRANS: Server exception thrown when creating group aliases failed.
+#: actions/apigroupprofileupdate.php:194 actions/editgroup.php:281
+#: classes/User_group.php:540
+msgid "Could not create aliases."
+msgstr "Impossibile creare gli alias."
+
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: actions/apigroupprofileupdate.php:249 lib/nickname.php:165
+msgid "Nickname must have only lowercase letters and numbers and no spaces."
+msgstr ""
+"Il soprannome deve essere composto solo da lettere minuscole e numeri, senza "
+"spazi."
+
+#: actions/apigroupprofileupdate.php:286
+#, fuzzy
+msgid "Full name is too long (max 255 chars)."
+msgstr "Nome troppo lungo (max 255 caratteri)."
+
+#: actions/apigroupprofileupdate.php:296
+#, fuzzy, php-format
+msgid "description is too long (max %d chars)."
+msgstr "La descrizione è troppo lunga (max %d caratteri)."
+
+#: actions/apigroupprofileupdate.php:307
+#, fuzzy
+msgid "Location is too long (max 255 chars)."
+msgstr "Ubicazione troppo lunga (max 255 caratteri)."
+
+#: actions/apigroupprofileupdate.php:326
+#, fuzzy, php-format
+msgid "Too many aliases! Maximum %d."
+msgstr "Troppi alias! Massimo %d."
+
+#. TRANS: Group edit form validation error.
+#. TRANS: Group create form validation error.
+#. TRANS: %s is the invalid alias.
+#: actions/apigroupprofileupdate.php:342 actions/editgroup.php:241
+#: actions/newgroup.php:188
+#, php-format
+msgid "Invalid alias: \"%s\""
+msgstr "Alias non valido: \"%s\""
+
 #. TRANS: Client error displayed when uploading a media file has failed.
 #: actions/apimediaupload.php:101
 msgid "Upload failed."
@@ -821,21 +876,22 @@ msgstr "Autorizzazione non presente."
 #. TRANS: Form validation error message.
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
+#. TRANS: Client error displayed when the session token is not okay.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
 #: actions/deletenotice.php:177 actions/disfavor.php:75
-#: actions/emailsettings.php:291 actions/favor.php:75 actions/geocode.php:55
+#: actions/emailsettings.php:292 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:65 actions/grouplogo.php:321
-#: actions/groupunblock.php:65 actions/imsettings.php:224
-#: actions/invite.php:60 actions/login.php:137 actions/makeadmin.php:66
-#: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
-#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
-#: actions/othersettings.php:155 actions/passwordsettings.php:138
-#: actions/profilesettings.php:217 actions/recoverpassword.php:383
-#: actions/register.php:172 actions/remotesubscribe.php:76
-#: actions/repeat.php:82 actions/smssettings.php:250 actions/subedit.php:40
-#: actions/subscribe.php:86 actions/tagother.php:166
-#: actions/unsubscribe.php:69 actions/userauthorization.php:52
-#: lib/designsettings.php:310
+#: actions/groupunblock.php:65 actions/imsettings.php:241
+#: actions/invite.php:60 actions/makeadmin.php:66 actions/newmessage.php:135
+#: actions/newnotice.php:105 actions/nudge.php:80
+#: actions/oauthappssettings.php:162 actions/oauthconnectionssettings.php:135
+#: actions/passwordsettings.php:137 actions/pluginenable.php:87
+#: actions/profilesettings.php:218 actions/recoverpassword.php:383
+#: actions/register.php:157 actions/remotesubscribe.php:76
+#: actions/repeat.php:82 actions/smssettings.php:249 actions/subedit.php:40
+#: actions/subscribe.php:87 actions/tagother.php:145
+#: actions/unsubscribe.php:69 actions/urlsettings.php:171
+#: actions/userauthorization.php:53 lib/designsettings.php:122
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 "Si è verificato un problema con il tuo token di sessione. Prova di nuovo."
@@ -865,10 +921,10 @@ msgstr "Errore nel database nell'inserire l'applicazione utente OAuth."
 #. TRANS: Unknown form validation error in design settings form.
 #: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
 #: actions/designadminpanel.php:100 actions/editapplication.php:144
-#: actions/emailsettings.php:310 actions/grouplogo.php:332
-#: actions/imsettings.php:239 actions/newapplication.php:124
-#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
-#: actions/smssettings.php:271 lib/designsettings.php:321
+#: actions/emailsettings.php:311 actions/grouplogo.php:332
+#: actions/imsettings.php:256 actions/newapplication.php:124
+#: actions/oauthconnectionssettings.php:144 actions/recoverpassword.php:46
+#: actions/smssettings.php:270 lib/designsettings.php:133
 msgid "Unexpected form submission."
 msgstr "Invio del modulo inaspettato."
 
@@ -918,31 +974,26 @@ msgstr "Account"
 
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Field label in form for profile settings.
-#. TRANS: Label for group nickname (dt). Text hidden by default.
-#. TRANS: DT for nick name in a profile.
-#: actions/apioauthauthorize.php:459 actions/login.php:252
-#: actions/profilesettings.php:106 actions/register.php:432
-#: actions/showgroup.php:243 actions/tagother.php:94
+#: actions/apioauthauthorize.php:459 actions/login.php:225
+#: actions/profilesettings.php:107 actions/register.php:411
 #: actions/userauthorization.php:145 lib/groupeditform.php:145
-#: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "Soprannome"
 
 #. TRANS: Field label on OAuth API authorisation form.
-#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:463 actions/login.php:255
-#: actions/register.php:436 lib/accountsettingsaction.php:120
+#: actions/apioauthauthorize.php:463 actions/login.php:228
+#: actions/register.php:415 lib/settingsnav.php:87
 msgid "Password"
 msgstr "Password"
 
 #. TRANS: Button text that when clicked will cancel the process of allowing access to an account
 #. TRANS: by an external application.
 #. TRANS: Button label to cancel an e-mail address confirmation procedure.
-#. TRANS: Button label to cancel an Instant Messaging address confirmation procedure.
+#. TRANS: Button label to cancel an IM address confirmation procedure.
 #. TRANS: Button label to cancel a SMS address confirmation procedure.
 #. TRANS: Button label in the "Edit application" form.
-#: actions/apioauthauthorize.php:478 actions/emailsettings.php:124
-#: actions/imsettings.php:127 actions/smssettings.php:133
+#: actions/apioauthauthorize.php:478 actions/emailsettings.php:125
+#: actions/imsettings.php:136 actions/smssettings.php:132
 #: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Cancel"
@@ -1055,7 +1106,7 @@ msgstr "Metodo delle API non trovato."
 #. TRANS: %s is the requested output format.
 #: actions/apistatusesshow.php:144
 #, fuzzy, php-format
-msgid "Unsupported format: %s"
+msgid "Unsupported format: %s."
 msgstr "Formato non supportato."
 
 #. TRANS: Client error displayed requesting a deleted status.
@@ -1139,13 +1190,6 @@ msgstr "%1$s / Preferiti da %2$s"
 msgid "%1$s updates favorited by %2$s / %3$s."
 msgstr "%1$s aggiornamenti preferiti da %2$s / %3$s"
 
-#. TRANS: Server error displayed when generating an Atom feed fails.
-#. TRANS: %s is the error.
-#: actions/apitimelinegroup.php:134
-#, fuzzy, php-format
-msgid "Could not generate feed for group - %s"
-msgstr "Impossibile aggiornare il gruppo."
-
 #. TRANS: Title for timeline of most recent mentions of a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname.
 #: actions/apitimelinementions.php:115
@@ -1162,13 +1206,14 @@ msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr "%1$s messaggi in risposta a quelli da %2$s / %3$s"
 
 #. TRANS: Title for site timeline. %s is the StatusNet sitename.
+#. TRANS: Public RSS feed title. %s is the StatusNet site name.
 #: actions/apitimelinepublic.php:193 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "Attività pubblica di %s"
 
 #. TRANS: Subtitle for site timeline. %s is the StatusNet sitename.
-#: actions/apitimelinepublic.php:199 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:199
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "Aggiornamenti di %s da tutti!"
@@ -1180,21 +1225,33 @@ msgid "Unimplemented."
 msgstr "Metodo non implementato"
 
 #. TRANS: Title for Atom feed "repeated to me". %s is the user nickname.
-#: actions/apitimelineretweetedtome.php:108
+#: actions/apitimelineretweetedtome.php:96
 #, php-format
 msgid "Repeated to %s"
 msgstr "Ripetuto a %s"
 
+#: actions/apitimelineretweetedtome.php:98
+#, fuzzy, php-format
+msgid "%1$s notices that were to repeated to %2$s / %3$s."
+msgstr "%1$s messaggi in risposta a quelli da %2$s / %3$s"
+
 #. TRANS: Title of list of repeated notices of the logged in user.
 #. TRANS: %s is the nickname of the logged in user.
-#: actions/apitimelineretweetsofme.php:112
+#: actions/apitimelineretweetsofme.php:98
 #, php-format
 msgid "Repeats of %s"
 msgstr "Ripetizioni di %s"
 
+#: actions/apitimelineretweetsofme.php:104
+#, fuzzy, php-format
+msgid "%1$s notices that %2$s / %3$s has repeated."
+msgstr "%s (@%s) ha aggiunto il tuo messaggio tra i suoi preferiti"
+
 #. TRANS: Title for timeline with lastest notices with a given tag.
 #. TRANS: %s is the tag.
-#: actions/apitimelinetag.php:101 actions/tag.php:67
+#. TRANS: Title for first page of notices with tags.
+#. TRANS: %s is the tag.
+#: actions/apitimelinetag.php:101 actions/tag.php:69
 #, php-format
 msgid "Notices tagged with %s"
 msgstr "Messaggi etichettati con %s"
@@ -1207,54 +1264,55 @@ msgid "Updates tagged with %1$s on %2$s!"
 msgstr "Messaggi etichettati con %1$s su %2$s!"
 
 #. TRANS: Client error displayed trying to add a notice to another user's timeline.
-#: actions/apitimelineuser.php:297
+#: actions/apitimelineuser.php:308
 #, fuzzy
 msgid "Only the user can add to their own timeline."
 msgstr "Solo l'utente può leggere la propria casella di posta."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:304
+#: actions/apitimelineuser.php:315
 msgid "Only accept AtomPub for Atom feeds."
 msgstr ""
 
 #. TRANS: Client error displayed attempting to post an empty API notice.
-#: actions/apitimelineuser.php:311
+#: actions/apitimelineuser.php:322
 msgid "Atom post must not be empty."
 msgstr ""
 
 #. TRANS: Client error displayed attempting to post an API that is not well-formed XML.
-#: actions/apitimelineuser.php:317
+#: actions/apitimelineuser.php:328
 msgid "Atom post must be well-formed XML."
 msgstr ""
 
 #. TRANS: Client error displayed when not using an Atom entry.
-#: actions/apitimelineuser.php:323 actions/atompubfavoritefeed.php:228
+#: actions/apitimelineuser.php:334 actions/atompubfavoritefeed.php:228
 #: actions/atompubmembershipfeed.php:230
 #: actions/atompubsubscriptionfeed.php:236
 msgid "Atom post must be an Atom entry."
 msgstr ""
 
 #. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
-#: actions/apitimelineuser.php:335
+#: actions/apitimelineuser.php:345
 msgid "Can only handle POST activities."
 msgstr ""
 
 #. TRANS: Client error displayed when using an unsupported activity object type.
 #. TRANS: %s is the unsupported activity object type.
-#: actions/apitimelineuser.php:346
+#: actions/apitimelineuser.php:356
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
 #. TRANS: %d is the notice ID (number).
-#: actions/apitimelineuser.php:380
+#: actions/apitimelineuser.php:390
 #, fuzzy, php-format
 msgid "No content for notice %d."
 msgstr "Trova contenuto dei messaggi"
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:408
+#. TRANS: %s is the notice URI.
+#: actions/apitimelineuser.php:419
 #, fuzzy, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "Un messaggio con quel ID non esiste."
@@ -1271,9 +1329,10 @@ msgstr "Metodo delle API non trovato."
 
 #. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
 #. TRANS: Client exception.
+#. TRANS: Client error displayed trying to subscribe to a non-existing profile.
 #: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
 #: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
-#: actions/subscribe.php:107
+#: actions/subscribe.php:110
 msgid "No such profile."
 msgstr "Nessun profilo."
 
@@ -1420,7 +1479,7 @@ msgid "Not a member."
 msgstr "Tutti i membri"
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
-#: actions/atompubshowmembership.php:151
+#: actions/atompubshowmembership.php:150
 #, fuzzy
 msgid "Cannot delete someone else's membership."
 msgstr "Impossibile salvare l'abbonamento."
@@ -1509,10 +1568,7 @@ msgid "Invalid size."
 msgstr "Dimensione non valida."
 
 #. TRANS: Title for avatar upload page.
-#. TRANS: Label for group avatar (dt). Text hidden by default.
-#. TRANS: Link description in user account settings menu.
-#: actions/avatarsettings.php:66 actions/showgroup.php:227
-#: lib/accountsettingsaction.php:113
+#: actions/avatarsettings.php:66 lib/settingsnav.php:82
 msgid "Avatar"
 msgstr "Immagine"
 
@@ -1526,9 +1582,11 @@ msgstr ""
 
 #. TRANS: Server error displayed in avatar upload page when no matching profile can be found for a user.
 #. TRANS: Server error displayed coming across a request from a user without a profile.
+#. TRANS: Server error displayed when trying to authorise a remote subscription request
+#. TRANS: while the user has no profile.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
 #: actions/grouplogo.php:184 actions/remotesubscribe.php:190
-#: actions/userauthorization.php:72 actions/userrss.php:108
+#: actions/userauthorization.php:75 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr "Utente senza profilo corrispondente."
 
@@ -1586,10 +1644,10 @@ msgstr "Ritaglia"
 msgid "No file uploaded."
 msgstr "Nessun file caricato."
 
-#. TRANS: Avatar upload form unstruction after uploading a file.
+#. TRANS: Avatar upload form instruction after uploading a file.
 #: actions/avatarsettings.php:345
 #, fuzzy
-msgid "Pick a square area of the image to be your avatar"
+msgid "Pick a square area of the image to be your avatar."
 msgstr "Scegli un'area quadrata per la tua immagine personale"
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
@@ -1615,7 +1673,7 @@ msgstr "Immagine eliminata."
 
 #. TRANS: Title for backup account page.
 #. TRANS: Option in profile settings to create a backup of the account of the currently logged in user.
-#: actions/backupaccount.php:61 actions/profilesettings.php:467
+#: actions/backupaccount.php:61 actions/profilesettings.php:468
 msgid "Backup account"
 msgstr ""
 
@@ -1649,7 +1707,7 @@ msgstr "Sfondo"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
 #: actions/backupaccount.php:254
-msgid "Backup your account"
+msgid "Backup your account."
 msgstr ""
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
@@ -1691,7 +1749,7 @@ msgstr "No"
 #. TRANS: Submit button title for 'No' when blocking a user.
 #: actions/block.php:158
 #, fuzzy
-msgid "Do not block this user"
+msgid "Do not block this user."
 msgstr "Non bloccare questo utente"
 
 #. TRANS: Button label on the user block form.
@@ -1708,9 +1766,9 @@ msgid "Yes"
 msgstr "Sì"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#. TRANS: Description of the form to block a user.
-#: actions/block.php:165 lib/blockform.php:79
-msgid "Block this user"
+#: actions/block.php:165
+#, fuzzy
+msgid "Block this user."
 msgstr "Blocca questo utente"
 
 #. TRANS: Server error displayed when blocking a user fails.
@@ -1777,32 +1835,48 @@ msgstr "Codice di conferma non trovato."
 msgid "That confirmation code is not for you!"
 msgstr "Quel codice di conferma non è per te!"
 
-#. TRANS: Server error for a unknow address type %s, which can be 'email', 'jabber', or 'sms'.
-#: actions/confirmaddress.php:92
-#, php-format
-msgid "Unrecognized address type %s."
+#. TRANS: Server error for an unknown address type, which can be 'email', 'sms', or the name of an IM network (such as 'xmpp' or 'aim')
+#: actions/confirmaddress.php:94
+#, fuzzy, php-format
+msgid "Unrecognized address type %s"
 msgstr "Tipo di indirizzo %s non riconosciuto."
 
 #. TRANS: Client error for an already confirmed email/jabber/sms address.
-#: actions/confirmaddress.php:97
+#: actions/confirmaddress.php:103 actions/confirmaddress.php:136
 msgid "That address has already been confirmed."
 msgstr "Quell'indirizzo è già stato confermato."
 
+#: actions/confirmaddress.php:121 actions/imsettings.php:444
+#: actions/userdesignsettings.php:306
+#, fuzzy
+msgid "Couldn't update user."
+msgstr "Impossibile aggiornare l'utente."
+
+#: actions/confirmaddress.php:144
+#, fuzzy
+msgid "Couldn't update user im preferences."
+msgstr "Impossibile aggiornare il record dell'utente."
+
+#: actions/confirmaddress.php:156
+#, fuzzy
+msgid "Couldn't insert user im preferences."
+msgstr "Impossibile inserire un nuovo abbonamento."
+
 #. TRANS: Server error displayed when an address confirmation code deletion from the
 #. TRANS: database fails in the contact address confirmation action.
-#: actions/confirmaddress.php:132
+#: actions/confirmaddress.php:169
 #, fuzzy
 msgid "Could not delete address confirmation."
 msgstr "Impossibile eliminare la conferma della messaggistica."
 
 #. TRANS: Title for the contact address confirmation action.
-#: actions/confirmaddress.php:150
+#: actions/confirmaddress.php:185
 msgid "Confirm address"
 msgstr "Conferma indirizzo"
 
 #. TRANS: Success message for the contact address confirmation action.
 #. TRANS: %s can be 'email', 'jabber', or 'sms'.
-#: actions/confirmaddress.php:166
+#: actions/confirmaddress.php:200
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "L'indirizzo \"%s\" è stato confermato per il tuo account."
@@ -1816,6 +1890,7 @@ msgstr "Conversazione"
 #. TRANS: Label for user statistics.
 #: actions/conversation.php:149 lib/noticelist.php:87
 #: lib/profileaction.php:246 lib/searchgroupnav.php:82
+#: lib/threadednoticelist.php:66
 msgid "Notices"
 msgstr "Messaggi"
 
@@ -1851,7 +1926,7 @@ msgstr "Immagine eliminata."
 
 #. TRANS: Page title for page on which a user account can be deleted.
 #. TRANS: Option in profile settings to delete the account of the currently logged in user.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:475
+#: actions/deleteaccount.php:228 actions/profilesettings.php:476
 #, fuzzy
 msgid "Delete account"
 msgstr "Crea un account"
@@ -1875,7 +1950,7 @@ msgstr ""
 #. TRANS: Field label for delete account confirmation entry.
 #. TRANS: Field label for password reset form where the password has to be typed again.
 #: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:262 actions/register.php:440
+#: actions/recoverpassword.php:262 actions/register.php:419
 msgid "Confirm"
 msgstr "Conferma"
 
@@ -1905,14 +1980,14 @@ msgstr "Applicazione non trovata."
 #. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
 #: actions/deleteapplication.php:79 actions/editapplication.php:78
-#: actions/showapplication.php:94
+#: actions/showapplication.php:90
 msgid "You are not the owner of this application."
 msgstr "Questa applicazione non è di tua proprietà."
 
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
-#: actions/newapplication.php:112 actions/showapplication.php:118
-#: lib/action.php:1425
+#: actions/newapplication.php:112 actions/showapplication.php:113
+#: lib/action.php:1391
 msgid "There was a problem with your session token."
 msgstr "Si è verificato un problema con il tuo token di sessione."
 
@@ -1935,13 +2010,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting an application.
 #: actions/deleteapplication.php:161
 #, fuzzy
-msgid "Do not delete this application"
+msgid "Do not delete this application."
 msgstr "Non eliminare l'applicazione"
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
 #: actions/deleteapplication.php:167
 #, fuzzy
-msgid "Delete this application"
+msgid "Delete this application."
 msgstr "Elimina l'applicazione"
 
 #. TRANS: Client error when trying to delete group while not logged in.
@@ -1999,13 +2074,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting a group.
 #: actions/deletegroup.php:224
 #, fuzzy
-msgid "Do not delete this group"
+msgid "Do not delete this group."
 msgstr "Non eliminare il messaggio"
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
 #: actions/deletegroup.php:231
 #, fuzzy
-msgid "Delete this group"
+msgid "Delete this group."
 msgstr "Elimina questo utente"
 
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
@@ -2013,14 +2088,16 @@ msgstr "Elimina questo utente"
 #. TRANS: Client error displayed when trying to mark a notice as favorite without being logged in.
 #. TRANS: Client error displayed trying to block a user from a group while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
+#. TRANS: Client error displayed trying to log out when not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
+#. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
 #. TRANS: Client error displayed when trying to change user options while not logged in.
 #: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
-#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:69
+#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:70
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
-#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
-#: actions/tagother.php:33 actions/unsubscribe.php:52
+#: actions/nudge.php:63 actions/pluginenable.php:97 actions/subedit.php:33
+#: actions/subscribe.php:98 actions/tagother.php:33 actions/unsubscribe.php:52
 #: lib/adminpanelaction.php:71 lib/profileformaction.php:63
 #: lib/settingsaction.php:72
 msgid "Not logged in."
@@ -2049,12 +2126,13 @@ msgstr "Vuoi eliminare questo messaggio?"
 #. TRANS: Submit button title for 'No' when deleting a notice.
 #: actions/deletenotice.php:159
 #, fuzzy
-msgid "Do not delete this notice"
+msgid "Do not delete this notice."
 msgstr "Non eliminare il messaggio"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:166 lib/noticelist.php:673
-msgid "Delete this notice"
+#: actions/deletenotice.php:166
+#, fuzzy
+msgid "Delete this notice."
 msgstr "Elimina questo messaggio"
 
 #. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
@@ -2091,18 +2169,17 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting a user.
 #: actions/deleteuser.php:158
 #, fuzzy
-msgid "Do not delete this user"
+msgid "Do not delete this user."
 msgstr "Non eliminare il messaggio"
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
-#. TRANS: Description of form for deleting a user.
-#: actions/deleteuser.php:165 lib/deleteuserform.php:75
-msgid "Delete this user"
+#: actions/deleteuser.php:165
+#, fuzzy
+msgid "Delete this user."
 msgstr "Elimina questo utente"
 
 #. TRANS: Message used as title for design settings for the site.
-#. TRANS: Link description in user account settings menu.
-#: actions/designadminpanel.php:60 lib/accountsettingsaction.php:134
+#: actions/designadminpanel.php:60 lib/settingsnav.php:97
 msgid "Design"
 msgstr "Aspetto"
 
@@ -2171,8 +2248,7 @@ msgid "You can upload a custom StatusNet theme as a .ZIP archive."
 msgstr "Puoi caricare un tema per StatusNet personalizzato come un file ZIP."
 
 #. TRANS: Fieldset legend for theme background image.
-#. TRANS: Fieldset legend on profile design page.
-#: actions/designadminpanel.php:515 lib/designsettings.php:98
+#: actions/designadminpanel.php:515
 msgid "Change background image"
 msgstr "Modifica l'immagine di sfondo"
 
@@ -2180,7 +2256,7 @@ msgstr "Modifica l'immagine di sfondo"
 #. TRANS: Field label for background color selector.
 #. TRANS: Label on profile design page for setting a profile page background colour.
 #: actions/designadminpanel.php:525 actions/designadminpanel.php:609
-#: lib/designsettings.php:183
+#: lib/designform.php:238
 msgid "Background"
 msgstr "Sfondo"
 
@@ -2207,13 +2283,13 @@ msgstr "Off"
 #. TRANS: Form guide for turning background image on or off on theme designer page.
 #. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
 #. TRANS: use of the uploaded profile image.
-#: actions/designadminpanel.php:577 lib/designsettings.php:159
+#: actions/designadminpanel.php:577 lib/designform.php:214
 msgid "Turn background image on or off."
 msgstr "Abilita o disabilita l'immagine di sfondo."
 
 #. TRANS: Checkbox label to title background image on theme designer page.
 #. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-#: actions/designadminpanel.php:583 lib/designsettings.php:165
+#: actions/designadminpanel.php:583 lib/designform.php:220
 msgid "Tile background image"
 msgstr "Affianca l'immagine di sfondo"
 
@@ -2225,25 +2301,25 @@ msgstr "Modifica colori"
 
 #. TRANS: Field label for content color selector.
 #. TRANS: Label on profile design page for setting a profile page content colour.
-#: actions/designadminpanel.php:623 lib/designsettings.php:197
+#: actions/designadminpanel.php:623 lib/designform.php:252
 msgid "Content"
 msgstr "Contenuto"
 
 #. TRANS: Field label for sidebar color selector.
 #. TRANS: Label on profile design page for setting a profile page sidebar colour.
-#: actions/designadminpanel.php:637 lib/designsettings.php:211
+#: actions/designadminpanel.php:637 lib/designform.php:266
 msgid "Sidebar"
 msgstr "Barra laterale"
 
 #. TRANS: Field label for text color selector.
 #. TRANS: Label on profile design page for setting a profile page text colour.
-#: actions/designadminpanel.php:651 lib/designsettings.php:225
+#: actions/designadminpanel.php:651 lib/designform.php:280
 msgid "Text"
 msgstr "Testo"
 
 #. TRANS: Field label for link color selector.
 #. TRANS: Label on profile design page for setting a profile page links colour.
-#: actions/designadminpanel.php:665 lib/designsettings.php:239
+#: actions/designadminpanel.php:665 lib/designform.php:294
 msgid "Links"
 msgstr "Collegamenti"
 
@@ -2265,21 +2341,21 @@ msgid "Use defaults"
 msgstr "Usa predefiniti"
 
 #. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: actions/designadminpanel.php:720 lib/designsettings.php:259
-msgid "Restore default designs"
+#: actions/designadminpanel.php:720
+#, fuzzy
+msgid "Restore default designs."
 msgstr "Ripristina i valori predefiniti"
 
 #. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: actions/designadminpanel.php:728 lib/designsettings.php:267
-msgid "Reset back to default"
+#: actions/designadminpanel.php:728
+#, fuzzy
+msgid "Reset back to default."
 msgstr "Reimposta i valori predefiniti"
 
 #. TRANS: Title for button for saving theme settings.
-#. TRANS: Title for button on profile design page to save settings.
-#: actions/designadminpanel.php:736 lib/designsettings.php:272
-msgid "Save design"
+#: actions/designadminpanel.php:736
+#, fuzzy
+msgid "Save design."
 msgstr "Salva aspetto"
 
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
@@ -2311,7 +2387,7 @@ msgid "You must be logged in to edit an application."
 msgstr "Devi eseguire l'accesso per modificare un'applicazione."
 
 #. TRANS: Client error displayed trying to edit an application that does not exist.
-#: actions/editapplication.php:83 actions/showapplication.php:87
+#: actions/editapplication.php:83 actions/showapplication.php:83
 msgid "No such application."
 msgstr "Nessuna applicazione."
 
@@ -2404,80 +2480,53 @@ msgstr "Modifica il gruppo %s"
 msgid "You must be logged in to create a group."
 msgstr "Devi eseguire l'accesso per creare un gruppo."
 
-#. TRANS: Client error displayed trying to edit a group while not being a group admin.
-#. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
-#. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
-#: actions/editgroup.php:110 actions/editgroup.php:176
-#: actions/groupdesignsettings.php:109 actions/grouplogo.php:111
-msgid "You must be an admin to edit the group."
-msgstr "Devi essere amministratore per modificare il gruppo."
-
 #. TRANS: Form instructions for group edit form.
 #: actions/editgroup.php:161
 msgid "Use this form to edit the group."
 msgstr "Usa questo modulo per modificare il gruppo."
 
-#. TRANS: Group edit form validation error.
-#. TRANS: Group create form validation error.
-#. TRANS: %s is the invalid alias.
-#: actions/editgroup.php:241 actions/newgroup.php:188
-#, php-format
-msgid "Invalid alias: \"%s\""
-msgstr "Alias non valido: \"%s\""
-
-#. TRANS: Server error displayed when editing a group fails.
-#: actions/editgroup.php:274
-msgid "Could not update group."
-msgstr "Impossibile aggiornare il gruppo."
-
-#. TRANS: Server error displayed when group aliases could not be added.
-#. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/editgroup.php:281 classes/User_group.php:540
-msgid "Could not create aliases."
-msgstr "Impossibile creare gli alias."
-
 #. TRANS: Group edit form success message.
 #: actions/editgroup.php:301
 msgid "Options saved."
 msgstr "Opzioni salvate."
 
 #. TRANS: Title for e-mail settings.
-#: actions/emailsettings.php:59
+#: actions/emailsettings.php:60
 msgid "Email settings"
 msgstr "Impostazioni email"
 
 #. TRANS: E-mail settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/emailsettings.php:73
+#: actions/emailsettings.php:74
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 msgstr "Gestisci la ricezione delle email da %%site.name%%."
 
 #. TRANS: Form legend for e-mail settings form.
 #. TRANS: Field label for e-mail address input in e-mail settings form.
-#: actions/emailsettings.php:103 actions/emailsettings.php:129
+#: actions/emailsettings.php:104 actions/emailsettings.php:130
 msgid "Email address"
 msgstr "Indirizzo email"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:109
+#: actions/emailsettings.php:110
 msgid "Current confirmed email address."
 msgstr "Indirizzo email attualmente confermato."
 
 #. TRANS: Button label to remove a confirmed e-mail address.
 #. TRANS: Button label for removing a set sender e-mail address to post notices from.
-#. TRANS: Button label to remove a confirmed Instant Messaging address.
+#. TRANS: Button label to remove a confirmed IM address.
 #. TRANS: Button label to remove a confirmed SMS address.
 #. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
-#: actions/emailsettings.php:112 actions/emailsettings.php:179
-#: actions/imsettings.php:112 actions/smssettings.php:120
-#: actions/smssettings.php:176
+#: actions/emailsettings.php:113 actions/emailsettings.php:180
+#: actions/imsettings.php:119 actions/smssettings.php:119
+#: actions/smssettings.php:175
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Rimuovi"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:119
+#: actions/emailsettings.php:120
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -2491,46 +2540,46 @@ msgstr ""
 #. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
 #. TRANS: Any other domain may be owned by a legitimate person or
 #. TRANS: organization.
-#: actions/emailsettings.php:136
+#: actions/emailsettings.php:137
 msgid "Email address, like \"UserName@example.org\""
 msgstr "Indirizzo email, del tipo \"nomeutente@example.org\""
 
 #. TRANS: Button label for adding an e-mail address in e-mail settings form.
-#. TRANS: Button label for adding an Instant Messaging address in Instant Messaging settings form.
+#. TRANS: Button label for adding an IM address in IM settings form.
 #. TRANS: Button label for adding a SMS phone number in SMS settings form.
-#: actions/emailsettings.php:140 actions/imsettings.php:147
-#: actions/smssettings.php:158
+#: actions/emailsettings.php:141 actions/imsettings.php:147
+#: actions/smssettings.php:157
 msgctxt "BUTTON"
 msgid "Add"
 msgstr "Aggiungi"
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:148 actions/smssettings.php:167
+#: actions/emailsettings.php:149 actions/smssettings.php:166
 msgid "Incoming email"
 msgstr "Email di ricezione"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:154
+#: actions/emailsettings.php:155
 msgid "I want to post notices by email."
 msgstr "Voglio inviare i messaggi via email"
 
 #. TRANS: Form instructions for incoming e-mail form in e-mail settings.
 #. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
-#: actions/emailsettings.php:176 actions/smssettings.php:174
+#: actions/emailsettings.php:177 actions/smssettings.php:173
 msgid "Send email to this address to post new notices."
 msgstr "Invia le email a questo indirizzo per scrivere nuovi messaggi."
 
 #. TRANS: Instructions for incoming e-mail address input form, when an address has already been assigned.
 #. TRANS: Instructions for incoming SMS e-mail address input form.
-#: actions/emailsettings.php:185 actions/smssettings.php:182
+#: actions/emailsettings.php:186 actions/smssettings.php:181
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr ""
 "Crea un nuovo indirizzo email a cui inviare i messaggi e rimuovi quello "
 "vecchio."
 
 #. TRANS: Instructions for incoming e-mail address input form.
-#: actions/emailsettings.php:189
+#: actions/emailsettings.php:190
 msgid ""
 "To send notices via email, we need to create a unique email address for you "
 "on this server:"
@@ -2538,90 +2587,90 @@ msgstr ""
 
 #. TRANS: Button label for adding an e-mail address to send notices from.
 #. TRANS: Button label for adding an SMS e-mail address to send notices from.
-#: actions/emailsettings.php:195 actions/smssettings.php:185
+#: actions/emailsettings.php:196 actions/smssettings.php:184
 msgctxt "BUTTON"
 msgid "New"
 msgstr "Nuovo"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:204
+#: actions/emailsettings.php:205
 msgid "Email preferences"
 msgstr "Preferenze dell'email"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:212
+#: actions/emailsettings.php:213
 msgid "Send me notices of new subscriptions through email."
 msgstr "Inviami avvisi di nuovi abbonamenti via email"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:218
+#: actions/emailsettings.php:219
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr ""
 "Inviami un'email quando qualcuno aggiunge un mio messaggio ai preferiti"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:225
+#: actions/emailsettings.php:226
 msgid "Send me email when someone sends me a private message."
 msgstr "Inviami un'email quando qualcuno mi invia un messaggio privato"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:231
+#: actions/emailsettings.php:232
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr "Inviami un'email quando qualcuno mi invia una \"@-risposta\""
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:237
+#: actions/emailsettings.php:238
 msgid "Allow friends to nudge me and send me an email."
 msgstr "Consenti ai miei amici di richiamarmi e inviami un'email"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:243
+#: actions/emailsettings.php:244
 msgid "Publish a MicroID for my email address."
 msgstr "Pubblica un MicroID per il mio indirizzo email"
 
 #. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:361
+#: actions/emailsettings.php:362
 msgid "Email preferences saved."
 msgstr "Preferenze dell'email salvate."
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:380
+#: actions/emailsettings.php:381
 msgid "No email address."
 msgstr "Nessun indirizzo email."
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:388
+#: actions/emailsettings.php:389
 #, fuzzy
 msgid "Cannot normalize that email address."
 msgstr "Impossibile normalizzare quell'indirizzo email"
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:393 actions/register.php:212
+#: actions/emailsettings.php:394 actions/register.php:197
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "Non è un indirizzo email valido."
 
 #. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:397
+#: actions/emailsettings.php:398
 msgid "That is already your email address."
 msgstr "Quello è già il tuo indirizzo email."
 
 #. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:401
+#: actions/emailsettings.php:402
 msgid "That email address already belongs to another user."
 msgstr "Quell'indirizzo email appartiene già a un altro utente."
 
 #. TRANS: Server error thrown on database error adding e-mail confirmation code.
 #. TRANS: Server error thrown on database error adding Instant Messaging confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:418 actions/imsettings.php:343
-#: actions/smssettings.php:365
+#: actions/emailsettings.php:419 actions/imsettings.php:362
+#: actions/smssettings.php:364
 #, fuzzy
 msgid "Could not insert confirmation code."
 msgstr "Impossibile inserire il codice di conferma."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:425
+#: actions/emailsettings.php:426
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
@@ -2633,59 +2682,62 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling Instant Messaging address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:445 actions/imsettings.php:377
-#: actions/smssettings.php:399
+#: actions/emailsettings.php:446 actions/imsettings.php:391
+#: actions/smssettings.php:398
 msgid "No pending confirmation to cancel."
 msgstr "Nessuna conferma da annullare."
 
 #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:450
+#: actions/emailsettings.php:451
 msgid "That is the wrong email address."
 msgstr "Quello è l'indirizzo email sbagliato."
 
 #. TRANS: Server error thrown on database error canceling e-mail address confirmation.
 #. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
-#: actions/emailsettings.php:459 actions/smssettings.php:413
+#: actions/emailsettings.php:460 actions/smssettings.php:412
 #, fuzzy
 msgid "Could not delete email confirmation."
 msgstr "Impossibile eliminare l'email di conferma."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:464
+#: actions/emailsettings.php:465
 msgid "Email confirmation cancelled."
 msgstr "Conferma dell'email annullata."
 
 #. TRANS: Message given trying to remove an e-mail address that is not
 #. TRANS: registered for the active user.
-#: actions/emailsettings.php:483
+#: actions/emailsettings.php:484
 msgid "That is not your email address."
 msgstr "Quello non è il tuo indirizzo email."
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:504
+#: actions/emailsettings.php:505
 msgid "The email address was removed."
 msgstr "L'indirizzo email è stato rimosso."
 
 #. TRANS: Form validation error displayed when trying to remove an incoming e-mail address while no address has been set.
-#: actions/emailsettings.php:518 actions/smssettings.php:555
+#: actions/emailsettings.php:519 actions/smssettings.php:554
 msgid "No incoming email address."
 msgstr "Nessun indirizzo email di ricezione."
 
 #. TRANS: Server error thrown on database error removing incoming e-mail address.
 #. TRANS: Server error thrown on database error adding incoming e-mail address.
-#: actions/emailsettings.php:530 actions/emailsettings.php:554
-#: actions/smssettings.php:565 actions/smssettings.php:588
+#. TRANS: Server error displayed when the user could not be updated in SMS settings.
+#: actions/emailsettings.php:531 actions/emailsettings.php:555
+#: actions/smssettings.php:565 actions/smssettings.php:590
 #, fuzzy
 msgid "Could not update user record."
 msgstr "Impossibile aggiornare il record dell'utente."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:534 actions/smssettings.php:568
+#. TRANS: Confirmation text after updating SMS settings.
+#: actions/emailsettings.php:535 actions/smssettings.php:569
 msgid "Incoming email address removed."
 msgstr "Indirizzo email di ricezione rimosso."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:558 actions/smssettings.php:591
+#. TRANS: Confirmation text after updating SMS settings.
+#: actions/emailsettings.php:559 actions/smssettings.php:594
 msgid "New incoming email address added."
 msgstr "Nuovo indirizzo email di ricezione aggiunto."
 
@@ -2697,7 +2749,7 @@ msgstr "Questo messaggio è già un preferito!"
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
 #: actions/favor.php:95
 #, fuzzy
-msgid "Disfavor favorite"
+msgid "Disfavor favorite."
 msgstr "Rimuovi preferito"
 
 #. TRANS: Page title for first page of favorited notices.
@@ -2750,9 +2802,8 @@ msgstr ""
 #. TRANS: %s is a user's nickname.
 #. TRANS: Title for first page of favourite notices of a user.
 #. TRANS: %s is the user for whom the favourite notices are displayed.
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing own favourited notices.
 #: actions/favoritesrss.php:111 actions/showfavorites.php:76
-#: lib/personalgroupnav.php:122
+#: lib/personalgroupnav.php:110
 #, php-format
 msgid "%s's favorite notices"
 msgstr "Messaggi preferiti di %s"
@@ -2939,13 +2990,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
 #: actions/groupblock.php:191
 #, fuzzy
-msgid "Do not block this user from this group"
+msgid "Do not block this user from this group."
 msgstr "Non bloccare l'utente da questo gruppo"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
 #: actions/groupblock.php:198
 #, fuzzy
-msgid "Block this user from this group"
+msgid "Block this user from this group."
 msgstr "Blocca l'utente da questo gruppo"
 
 #. TRANS: Server error displayed when trying to block a user from a group fails because of an application error.
@@ -2954,6 +3005,7 @@ msgid "Database error blocking user from group."
 msgstr "Errore del database nel bloccare l'utente dal gruppo."
 
 #. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
+#. TRANS: Client error displayed trying to find a user by ID without providing an ID.
 #: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr "Nessun ID."
@@ -2984,7 +3036,7 @@ msgid "Unable to update your design settings."
 msgstr "Impossibile salvare la impostazioni dell'aspetto."
 
 #. TRANS: Form text to confirm saved group design settings.
-#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:222
+#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:239
 msgid "Design preferences saved."
 msgstr "Preferenze dell'aspetto salvate."
 
@@ -3049,7 +3101,7 @@ msgid "A list of the users in this group."
 msgstr "Un elenco degli utenti in questo gruppo."
 
 #. TRANS: Indicator in group members list that this user is a group administrator.
-#: actions/groupmembers.php:190
+#: actions/groupmembers.php:190 lib/action.php:581
 msgid "Admin"
 msgstr "Amministra"
 
@@ -3142,8 +3194,10 @@ msgid "Group search"
 msgstr "Cerca gruppi"
 
 #. TRANS: Text on page where groups can be searched if no results were found for a query.
-#: actions/groupsearch.php:82 actions/noticesearch.php:117
-#: actions/peoplesearch.php:83
+#. TRANS: Text for notice search results is the query had no results.
+#. TRANS: Message on the "People search" page where a query has no results.
+#: actions/groupsearch.php:82 actions/noticesearch.php:122
+#: actions/peoplesearch.php:87
 msgid "No results."
 msgstr "Nessun risultato."
 
@@ -3180,168 +3234,170 @@ msgid "User is not blocked from group."
 msgstr "L'utente non è bloccato dal gruppo."
 
 #. TRANS: Server error displayed when unblocking a user from a group fails because of an unknown error.
+#. TRANS: Server error displayed when removing a user block.
 #: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "Errore nel rimuovere il blocco."
 
 #. TRANS: Title for Instant Messaging settings.
-#: actions/imsettings.php:58
+#: actions/imsettings.php:56
 msgid "IM settings"
 msgstr "Impostazioni messaggistica istantanea"
 
 #. 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.
-#: actions/imsettings.php:71
+#: actions/imsettings.php:69
 #, fuzzy, php-format
 msgid ""
-"You can send and receive notices through Jabber/Google Talk [instant "
-"messages](%%doc.im%%). Configure your address and settings below."
+"You can send and receive notices through instant messaging [instant messages]"
+"(%%doc.im%%). Configure your addresses and settings below."
 msgstr ""
 "Puoi inviare e ricevere messaggi attraverso i servizi di [messaggistica "
 "istantanea](%%doc.im%%) Jabber/GTalk. Configura il tuo indirizzo e le "
 "impostazioni qui di seguito."
 
-#. TRANS: Message given in the Instant Messaging settings if XMPP is not enabled on the site.
+#. TRANS: Message given in the IM settings if IM is not enabled on the site.
 #: actions/imsettings.php:90
 msgid "IM is not available."
 msgstr "Messaggistica istantanea non disponibile."
 
-#. TRANS: Form legend for Instant Messaging settings form.
-#. TRANS: Field label for Instant Messaging address input in Instant Messaging settings form.
-#: actions/imsettings.php:102 actions/imsettings.php:132
-msgid "IM address"
-msgstr "Indirizzo di messaggistica istantanea"
+#: actions/imsettings.php:116
+#, fuzzy, php-format
+msgid "Current confirmed %s address."
+msgstr "Indirizzo email attualmente confermato."
 
-#: actions/imsettings.php:109
-#, fuzzy
-msgid "Current confirmed Jabber/Google Talk address."
-msgstr "Indirizzo Jabber/GTalk attualmente confermato."
-
-#. TRANS: Form note in Instant Messaging settings form.
-#. TRANS: %s is the Instant Messaging address set for the site.
-#: actions/imsettings.php:120
+#. TRANS: Form note in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:128
 #, fuzzy, php-format
 msgid ""
-"Awaiting confirmation on this address. Check your Jabber/Google Talk account "
-"for a message with further instructions. (Did you add %s to your buddy list?)"
+"Awaiting confirmation on this address. Check your %s account for a message "
+"with further instructions. (Did you add %s to your buddy list?)"
 msgstr ""
 "In attesa di conferma per questo indirizzo. Controlla il tuo account Jabber/"
 "GTalk per un messaggio con ulteriori istruzioni. Hai aggiunto %s al tuo "
 "elenco contatti?"
 
-#. TRANS: IM address input field instructions in Instant Messaging settings form.
-#. TRANS: %s is the Instant Messaging address set for the site.
-#. TRANS: Do not translate "example.org". It is one of the domain names reserved for use in examples by
-#. TRANS: http://www.rfc-editor.org/rfc/rfc2606.txt. Any other domain may be owned by a legitimate
-#. TRANS: person or organization.
-#: actions/imsettings.php:139
-#, fuzzy, php-format
-msgid ""
-"Jabber or Google Talk address, like \"UserName@example.org\". First, make "
-"sure to add %s to your buddy list in your IM client or on Google Talk."
-msgstr ""
-"Indirizzo Jabber o GTalk nella forma \"nomeutente@example.org\". Per prima "
-"cosa, assicurati di aggiungere %s all'elenco dei contatti nel tuo programma "
-"di messaggistica o su GTalk."
+#: actions/imsettings.php:140
+msgid "IM address"
+msgstr "Indirizzo di messaggistica istantanea"
 
-#. TRANS: Form legend for Instant Messaging preferences form.
-#: actions/imsettings.php:154
-msgid "IM preferences"
+#: actions/imsettings.php:142
+#, php-format
+msgid "%s screenname."
+msgstr ""
+
+#. TRANS: Header for IM preferences form.
+#: actions/imsettings.php:163
+#, fuzzy
+msgid "IM Preferences"
 msgstr "Preferenze messaggistica"
 
-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:159
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:174
 #, fuzzy
-msgid "Send me notices through Jabber/Google Talk."
-msgstr "Inviami i messaggi via Jabber/GTalk"
+msgid "Send me notices"
+msgstr "Invia un messaggio"
 
-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:165
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:176
 #, fuzzy
-msgid "Post a notice when my Jabber/Google Talk status changes."
+msgid "Post a notice when my status changes."
 msgstr "Pubblica un messaggio quando il mio stato Jabber/GTalk cambia"
 
-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:171
-#, fuzzy
-msgid ""
-"Send me replies through Jabber/Google Talk from people I'm not subscribed to."
-msgstr "Inviami le risposte delle persone a cui sono abbonato via Jabber/GTalk"
-
-#. TRANS: Checkbox label in Instant Messaging preferences form.
+#. TRANS: Checkbox label in IM preferences form.
 #: actions/imsettings.php:178
 #, fuzzy
-msgid "Publish a MicroID for my Jabber/Google Talk address."
-msgstr "Pubblica un MicroID per il mio indirizzo Jabber/GTalk"
+msgid "Send me replies from people I'm not subscribed to."
+msgstr "Inviami le risposte delle persone a cui sono abbonato via Jabber/GTalk"
 
-#. TRANS: Confirmation message for successful Instant Messaging preferences save.
-#: actions/imsettings.php:283 actions/othersettings.php:192
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:181
+#, fuzzy
+msgid "Publish a MicroID"
+msgstr "Pubblica un MicroID per il mio indirizzo email"
+
+#. TRANS: Server error thrown on database error updating IM preferences.
+#: actions/imsettings.php:291
+#, fuzzy
+msgid "Couldn't update IM preferences."
+msgstr "Impossibile aggiornare l'utente."
+
+#. TRANS: Confirmation message for successful IM preferences save.
+#. TRANS: Confirmation message after saving preferences.
+#: actions/imsettings.php:298 actions/urlsettings.php:244
 msgid "Preferences saved."
 msgstr "Preferenze salvate."
 
-#. TRANS: Message given saving Instant Messaging address without having provided one.
-#: actions/imsettings.php:304
-msgid "No Jabber ID."
-msgstr "Nessun ID di Jabber."
-
-#. TRANS: Message given saving Instant Messaging address that cannot be normalised.
-#: actions/imsettings.php:312
+#. TRANS: Message given saving IM address without having provided one.
+#: actions/imsettings.php:320
 #, fuzzy
-msgid "Cannot normalize that Jabber ID."
+msgid "No screenname."
+msgstr "Nessun soprannome."
+
+#: actions/imsettings.php:325
+#, fuzzy
+msgid "No transport."
+msgstr "Nessun messaggio."
+
+#. TRANS: Message given saving IM address that cannot be normalised.
+#: actions/imsettings.php:333
+#, fuzzy
+msgid "Cannot normalize that screenname"
 msgstr "Impossibile normalizzare quell'ID Jabber"
 
-#. TRANS: Message given saving Instant Messaging address that not valid.
-#: actions/imsettings.php:317
+#. TRANS: Message given saving IM address that not valid.
+#: actions/imsettings.php:340
 #, fuzzy
-msgid "Not a valid Jabber ID."
-msgstr "Non è un ID Jabber valido"
+msgid "Not a valid screenname"
+msgstr "Non è un soprannome valido."
 
-#. TRANS: Message given saving Instant Messaging address that is already set.
-#: actions/imsettings.php:321
-msgid "That is already your Jabber ID."
-msgstr "Quello è già il tuo ID di Jabber."
-
-#. TRANS: Message given saving Instant Messaging address that is already set for another user.
-#: actions/imsettings.php:325
-msgid "Jabber ID already belongs to another user."
+#. TRANS: Message given saving IM address that is already set for another user.
+#: actions/imsettings.php:344
+#, fuzzy
+msgid "Screenname already belongs to another user."
 msgstr "ID Jabber già assegnato a un altro utente."
 
-#. TRANS: Message given saving valid Instant Messaging address that is to be confirmed.
-#. TRANS: %s is the Instant Messaging address set for the site.
-#: actions/imsettings.php:353
-#, php-format
-msgid ""
-"A confirmation code was sent to the IM address you added. You must approve %"
-"s for sending messages to you."
+#. TRANS: Message given saving valid IM address that is to be confirmed.
+#: actions/imsettings.php:369
+#, fuzzy
+msgid "A confirmation code was sent to the IM address you added."
 msgstr ""
 "Un codice di conferma è stato inviato all'indirizzo di messaggistica "
 "istantanea che hai aggiunto. Devi approvare %s affinché ti invii messaggi."
 
-#. TRANS: Message given canceling Instant Messaging address confirmation for the wrong IM address.
-#: actions/imsettings.php:382
+#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#: actions/imsettings.php:396
 msgid "That is the wrong IM address."
 msgstr "Quello è l'indirizzo di messaggistica sbagliato."
 
-#. TRANS: Server error thrown on database error canceling Instant Messaging address confirmation.
-#: actions/imsettings.php:391
+#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#: actions/imsettings.php:405
 #, fuzzy
-msgid "Could not delete IM confirmation."
+msgid "Couldn't delete confirmation."
 msgstr "Impossibile eliminare la conferma della messaggistica."
 
-#. TRANS: Message given after successfully canceling Instant Messaging address confirmation.
-#: actions/imsettings.php:396
+#. TRANS: Message given after successfully canceling IM address confirmation.
+#: actions/imsettings.php:410
 msgid "IM confirmation cancelled."
 msgstr "Conferma della messaggistica annullata."
 
-#. TRANS: Message given trying to remove an Instant Messaging address that is not
+#. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.
-#: actions/imsettings.php:417
-msgid "That is not your Jabber ID."
-msgstr "Quello non è il tuo ID di Jabber."
+#: actions/imsettings.php:434
+#, fuzzy
+msgid "That is not your screenname."
+msgstr "Quello non è il tuo numero di telefono."
+
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#: actions/imsettings.php:443
+#, fuzzy
+msgid "Couldn't update user im prefs."
+msgstr "Impossibile aggiornare il record dell'utente."
 
 #. TRANS: Message given after successfully removing a registered Instant Messaging address.
-#: actions/imsettings.php:440
+#: actions/imsettings.php:451
 msgid "The IM address was removed."
 msgstr "L'indirizzo di messaggistica è stato rimosso."
 
@@ -3559,7 +3615,7 @@ msgid "You must be logged in to join a group."
 msgstr "Devi eseguire l'accesso per iscriverti a un gruppo."
 
 #. TRANS: Title for join group page after joining.
-#: actions/joingroup.php:147
+#: actions/joingroup.php:148
 #, fuzzy, php-format
 msgctxt "TITLE"
 msgid "%1$s joined group %2$s"
@@ -3689,7 +3745,7 @@ msgstr "Indirizzo di un'immagine da visualizzare con la licenza."
 #. TRANS: Submit button title.
 #: actions/licenseadminpanel.php:311 actions/sessionsadminpanel.php:199
 #: actions/siteadminpanel.php:292 actions/snapshotadminpanel.php:245
-#: actions/tagother.php:154 lib/applicationeditform.php:357
+#: actions/tagother.php:133 lib/applicationeditform.php:357
 msgid "Save"
 msgstr "Salva"
 
@@ -3697,39 +3753,41 @@ msgstr "Salva"
 msgid "Save license settings"
 msgstr "Salva impostazioni licenza"
 
-#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
+#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
+#: actions/login.php:97 actions/otp.php:62 actions/register.php:130
 msgid "Already logged in."
 msgstr "Accesso già effettuato."
 
-#: actions/login.php:148
+#: actions/login.php:125
 msgid "Incorrect username or password."
 msgstr "Nome utente o password non corretto."
 
-#: actions/login.php:154 actions/otp.php:120
+#. TRANS: Server error displayed when a user object could not be created trying to login using "one time password login".
+#: actions/login.php:131 actions/otp.php:127
 msgid "Error setting user. You are probably not authorized."
 msgstr "Errore nell'impostare l'utente. Forse non hai l'autorizzazione."
 
-#: actions/login.php:210 actions/login.php:263
+#: actions/login.php:185 actions/login.php:236 lib/action.php:598
 msgid "Login"
 msgstr "Accedi"
 
-#: actions/login.php:249
+#: actions/login.php:222
 msgid "Login to site"
 msgstr "Accedi al sito"
 
-#: actions/login.php:258 actions/register.php:490
+#: actions/login.php:231 actions/register.php:469
 msgid "Remember me"
 msgstr "Ricordami"
 
-#: actions/login.php:259 actions/register.php:492
+#: actions/login.php:232 actions/register.php:471
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "Accedi automaticamente in futuro; non per computer condivisi!"
 
-#: actions/login.php:269
+#: actions/login.php:241
 msgid "Lost or forgotten password?"
 msgstr "Password persa o dimenticata?"
 
-#: actions/login.php:288
+#: actions/login.php:259
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -3737,11 +3795,11 @@ msgstr ""
 "Per motivi di sicurezza, è necessario che tu inserisca il tuo nome utente e "
 "la tua password prima di modificare le impostazioni."
 
-#: actions/login.php:292
+#: actions/login.php:263
 msgid "Login with your username and password."
 msgstr "Accedi con nome utente e password."
 
-#: actions/login.php:295
+#: actions/login.php:266
 #, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -3869,7 +3927,9 @@ msgstr "Nuovo messaggio"
 msgid "Notice posted"
 msgstr "Messaggio inviato"
 
-#: actions/noticesearch.php:68
+#. TRANS: Instructions for Notice search page.
+#. TRANS: %%site.name%% is the name of the StatusNet site.
+#: actions/noticesearch.php:69
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -3878,16 +3938,21 @@ msgstr ""
 "Cerca tra i messaggi su %%site.name%% in base al contenuto. Separa i termini "
 "di ricerca con degli spazi; lunghezza minima 3 caratteri."
 
-#: actions/noticesearch.php:78
+#. TRANS: Title of the page where users can search for notices.
+#: actions/noticesearch.php:80
 msgid "Text search"
 msgstr "Cerca testo"
 
-#: actions/noticesearch.php:91
+#. TRANS: Test in RSS notice search.
+#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
+#: actions/noticesearch.php:95
 #, php-format
 msgid "Search results for \"%1$s\" on %2$s"
 msgstr "Risultati della ricerca per \"%1$s\" su %2$s"
 
-#: actions/noticesearch.php:121
+#. TRANS: Text for logged in users making a query for notices without results.
+#. TRANS: This message contains a Markdown link.
+#: actions/noticesearch.php:128
 #, php-format
 msgid ""
 "Be the first to [post on this topic](%%%%action.newnotice%%%%?"
@@ -3896,7 +3961,9 @@ msgstr ""
 "[Scrivi qualche cosa](%%%%action.newnotice%%%%?status_textarea=%s) su questo "
 "argomento!"
 
-#: actions/noticesearch.php:124
+#. TRANS: Text for not logged in users making a query for notices without results.
+#. TRANS: This message contains Markdown links.
+#: actions/noticesearch.php:133
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and be the first to "
@@ -3905,14 +3972,17 @@ msgstr ""
 "Perché non [crei un account](%%%%action.register%%%%) e [scrivi qualche cosa]"
 "(%%%%action.newnotice%%%%?status_textarea=%s) su questo argomento!"
 
-#: actions/noticesearchrss.php:96
+#. TRANS: RSS notice search feed title. %s is the query.
+#: actions/noticesearchrss.php:95
 #, php-format
 msgid "Updates with \"%s\""
 msgstr "Messaggi con \"%s\""
 
-#: actions/noticesearchrss.php:98
+#. TRANS: RSS notice search feed description.
+#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
+#: actions/noticesearchrss.php:99
 #, fuzzy, php-format
-msgid "Updates matching search term \"%1$s\" on %2$s!"
+msgid "Updates matching search term \"%1$s\" on %2$s."
 msgstr "Messaggi che corrispondono al termine \"%1$s\" su %2$s!"
 
 #: actions/nudge.php:85
@@ -3933,52 +4003,52 @@ msgid "Nudge sent!"
 msgstr "Richiamo inviato!"
 
 #. TRANS: Message displayed to an anonymous user trying to view OAuth application list.
-#: actions/oauthappssettings.php:60
+#: actions/oauthappssettings.php:57
 msgid "You must be logged in to list your applications."
 msgstr "Devi eseguire l'accesso per poter elencare le tue applicazioni."
 
 #. TRANS: Page title for OAuth applications
-#: actions/oauthappssettings.php:76
+#: actions/oauthappssettings.php:73
 msgid "OAuth applications"
 msgstr "Applicazioni OAuth"
 
 #. TRANS: Page instructions for OAuth applications
-#: actions/oauthappssettings.php:88
+#: actions/oauthappssettings.php:85
 msgid "Applications you have registered"
 msgstr "Applicazioni che hai registrato"
 
 #. TRANS: Empty list message on page with OAuth applications.
-#: actions/oauthappssettings.php:141
+#: actions/oauthappssettings.php:138
 #, php-format
 msgid "You have not registered any applications yet."
 msgstr "Non hai ancora registrato alcuna applicazione."
 
 #. TRANS: Title for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:71
+#: actions/oauthconnectionssettings.php:69
 msgid "Connected applications"
 msgstr "Applicazioni collegate"
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:83
+#: actions/oauthconnectionssettings.php:80
 #, fuzzy
 msgid "The following connections exist for your account."
 msgstr "Hai consentito alle seguenti applicazioni di accedere al tuo account."
 
 #. TRANS: Client error when trying to revoke access for an application while not being a user of it.
-#: actions/oauthconnectionssettings.php:168
+#: actions/oauthconnectionssettings.php:165
 msgid "You are not a user of that application."
 msgstr "Non sei un utente di quella applicazione."
 
 #. TRANS: Client error when revoking access has failed for some reason.
 #. TRANS: %s is the application ID revoking access failed for.
-#: actions/oauthconnectionssettings.php:183
+#: actions/oauthconnectionssettings.php:180
 #, fuzzy, php-format
 msgid "Unable to revoke access for application: %s."
 msgstr "Impossibile revocare l'accesso per l'applicazione: %s."
 
 #. TRANS: Success message after revoking access for an application.
 #. TRANS: %1$s is the application name, %2$s is the first part of the user token.
-#: actions/oauthconnectionssettings.php:202
+#: actions/oauthconnectionssettings.php:199
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -3986,20 +4056,30 @@ msgid ""
 msgstr ""
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:213
+#: actions/oauthconnectionssettings.php:210
 msgid "You have not authorized any applications to use your account."
 msgstr "Non hai autorizzato alcuna applicazione all'uso del tuo account."
 
 #. TRANS: Note for developers in the OAuth connection settings form.
 #. TRANS: This message contains a Markdown link. Do not separate "](".
 #. TRANS: %s is the URL to the OAuth settings.
-#: actions/oauthconnectionssettings.php:233
+#: actions/oauthconnectionssettings.php:230
 #, php-format
 msgid ""
 "Are you a developer? [Register an OAuth client application](%s) to use with "
 "this instance of StatusNet."
 msgstr ""
 
+#: actions/oembed.php:64
+#, fuzzy, php-format
+msgid "\"%s\" not found."
+msgstr "Metodo delle API non trovato."
+
+#: actions/oembed.php:76
+#, fuzzy, php-format
+msgid "Notice %s not found."
+msgstr "Metodo delle API non trovato."
+
 #: actions/oembed.php:80 actions/shownotice.php:100
 msgid "Notice has no profile."
 msgstr "Il messaggio non ha un profilo."
@@ -4009,6 +4089,16 @@ msgstr "Il messaggio non ha un profilo."
 msgid "%1$s's status on %2$s"
 msgstr "Stato di %1$s su %2$s"
 
+#: actions/oembed.php:95
+#, fuzzy, php-format
+msgid "Attachment %s not found."
+msgstr "Destinatario non trovato."
+
+#: actions/oembed.php:136
+#, php-format
+msgid "\"%s\" not supported for oembed requests."
+msgstr ""
+
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
 #: actions/oembed.php:168
 #, php-format
@@ -4022,94 +4112,60 @@ msgid "Only %s URLs over plain HTTP please."
 msgstr "Solo URL %s attraverso HTTP semplice."
 
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1205
-#: lib/apiaction.php:1232 lib/apiaction.php:1367
+#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1207
+#: lib/apiaction.php:1234 lib/apiaction.php:1369
 msgid "Not a supported data format."
 msgstr "Non è un formato di dati supportato."
 
+#. TRANS: ShortName in the OpenSearch interface when trying to find users.
 #: actions/opensearch.php:64
 msgid "People Search"
 msgstr "Cerca persone"
 
-#: actions/opensearch.php:67
+#: actions/opensearch.php:68
 msgid "Notice Search"
 msgstr "Cerca messaggi"
 
-#: actions/othersettings.php:59
-msgid "Other settings"
-msgstr "Altre impostazioni"
-
-#. TRANS: Instructions for tab "Other" in user profile settings.
-#: actions/othersettings.php:71
-msgid "Manage various other options."
-msgstr "Gestisci altre opzioni."
-
-#. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
-#. TRANS: user's profile settings. Use of "free" is as in "open", indicating that the
-#. TRANS: information on the shortener site is freely distributable.
-#. TRANS: This message has one space at the beginning. Use your language's word separator
-#. TRANS: here if it has one (most likely a single space).
-#: actions/othersettings.php:113
-msgid " (free service)"
-msgstr " (servizio libero)"
-
-#. TRANS: Label for dropdown with URL shortener services.
-#: actions/othersettings.php:122
-msgid "Shorten URLs with"
-msgstr "Accorcia gli URL con"
-
-#. TRANS: Tooltip for for dropdown with URL shortener services.
-#: actions/othersettings.php:124
-msgid "Automatic shortening service to use."
-msgstr "Servizio di autoriduzione da usare"
-
-#. TRANS: Label for checkbox.
-#: actions/othersettings.php:130
-msgid "View profile designs"
-msgstr "Visualizza aspetto"
-
-#. TRANS: Tooltip for checkbox.
-#: actions/othersettings.php:132
-msgid "Show or hide profile designs."
-msgstr "Mostra o nasconde gli aspetti del profilo"
-
-#. TRANS: Form validation error for form "Other settings" in user profile.
-#: actions/othersettings.php:164
-#, fuzzy
-msgid "URL shortening service is too long (maximum 50 characters)."
-msgstr "Il servizio di riduzione degli URL è troppo lungo (max 50 caratteri)."
-
-#: actions/otp.php:69
+#. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
+#: actions/otp.php:70
 msgid "No user ID specified."
 msgstr "Nessun ID utente specificato."
 
-#: actions/otp.php:83
+#. TRANS: Client error displayed trying to use "one time password login" without specifying a login token.
+#: actions/otp.php:86
 msgid "No login token specified."
 msgstr "Nessun token di accesso specificato."
 
-#: actions/otp.php:90
+#. TRANS: Client error displayed trying to use "one time password login" without requesting a login token.
+#: actions/otp.php:94
 msgid "No login token requested."
 msgstr "Nessun token di accesso richiesto."
 
-#: actions/otp.php:95
+#. TRANS: Client error displayed trying to use "one time password login" while specifying an invalid login token.
+#: actions/otp.php:100
 msgid "Invalid login token specified."
 msgstr "Token di accesso specificato non valido."
 
-#: actions/otp.php:104
+#. TRANS: Client error displayed trying to use "one time password login" while specifying an expired login token.
+#: actions/otp.php:110
 msgid "Login token expired."
 msgstr "Token di accesso scaduto."
 
-#: actions/outbox.php:58
+#. TRANS: Title for outbox for any but the fist page.
+#. TRANS: %1$s is the user nickname, %2$d is the page number.
+#: actions/outbox.php:57
 #, php-format
 msgid "Outbox for %1$s - page %2$d"
 msgstr "Casella posta inviata di %s - pagina %2$d"
 
+#. TRANS: Title for first page of outbox.
 #: actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
 msgstr "Casella posta inviata di %s"
 
-#: actions/outbox.php:104
+#. TRANS: Instructions for outbox.
+#: actions/outbox.php:103
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr ""
 "Questa è la casella della tua posta inviata, contiene i messaggi privati che "
@@ -4137,43 +4193,45 @@ msgstr "Vecchia password"
 msgid "New password"
 msgstr "Nuova password"
 
-#: actions/passwordsettings.php:109
+#: actions/passwordsettings.php:109 actions/register.php:416
 #, fuzzy
-msgid "6 or more characters"
+msgid "6 or more characters."
 msgstr "6 o più caratteri"
 
-#: actions/passwordsettings.php:113
+#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#: actions/passwordsettings.php:113 actions/recoverpassword.php:264
+#: actions/register.php:420
 #, fuzzy
-msgid "Same as password above"
+msgid "Same as password above."
 msgstr "Stessa password di sopra"
 
 #: actions/passwordsettings.php:117
 msgid "Change"
 msgstr "Modifica"
 
-#: actions/passwordsettings.php:154 actions/register.php:238
+#: actions/passwordsettings.php:153 actions/register.php:223
 msgid "Password must be 6 or more characters."
 msgstr "La password deve essere di 6 o più caratteri."
 
-#: actions/passwordsettings.php:157 actions/register.php:241
+#: actions/passwordsettings.php:156 actions/register.php:226
 msgid "Passwords don't match."
 msgstr "Le password non corrispondono."
 
-#: actions/passwordsettings.php:165
+#: actions/passwordsettings.php:164
 msgid "Incorrect old password"
 msgstr "Vecchia password non corretta"
 
-#: actions/passwordsettings.php:181
+#: actions/passwordsettings.php:180
 msgid "Error saving user; invalid."
 msgstr "Errore nel salvare l'utente; non valido."
 
-#: actions/passwordsettings.php:186
+#. TRANS: Reset password form validation error message.
+#: actions/passwordsettings.php:185 actions/recoverpassword.php:418
 #, fuzzy
-msgid "Can't save new password."
+msgid "Cannot save new password."
 msgstr "Impossibile salvare la nuova password."
 
-#. TRANS: Title for password recovery page in password saved mode.
-#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
+#: actions/passwordsettings.php:191
 msgid "Password saved."
 msgstr "Password salvata."
 
@@ -4390,8 +4448,7 @@ msgid "Directory where backgrounds are located."
 msgstr "Percorso della directory alle localizzazioni"
 
 #. TRANS: Fieldset legens in Paths admin panel.
-#. TRANS: DT element label in attachment list.
-#: actions/pathsadminpanel.php:419 lib/attachmentlist.php:98
+#: actions/pathsadminpanel.php:419
 msgid "Attachments"
 msgstr "Allegati"
 
@@ -4465,7 +4522,9 @@ msgstr "Server a cui dirigere le richieste SSL"
 msgid "Save paths"
 msgstr "Salva percorsi"
 
-#: actions/peoplesearch.php:52
+#. TRANS: Instructions for the "People search" page.
+#. TRANS: %%site.name%% is the name of the StatusNet site.
+#: actions/peoplesearch.php:54
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
@@ -4474,7 +4533,8 @@ msgstr ""
 "Cerca tra le persone su %%site.name%% per nome, ubicazione o interessi. "
 "Separa i termini di ricerca con degli spazi; lunghezza minima 3 caratteri."
 
-#: actions/peoplesearch.php:58
+#. TRANS: Title of a page where users can search for other users.
+#: actions/peoplesearch.php:61
 msgid "People search"
 msgstr "Cerca persone"
 
@@ -4488,6 +4548,60 @@ msgstr "Non è un'etichetta valida di persona: %s."
 msgid "Users self-tagged with %1$s - page %2$d"
 msgstr "Utenti auto-etichettati con %1$s - pagina %2$d"
 
+#. TRANS: Page title for AJAX form return when a disabling a plugin.
+#: actions/plugindisable.php:69
+msgctxt "plugin"
+msgid "Disabled"
+msgstr ""
+
+#. TRANS: Client error displayed trying to perform any request method other than POST.
+#. TRANS: Do not translate POST.
+#: actions/pluginenable.php:78 actions/subscribe.php:77
+msgid "This action only accepts POST requests."
+msgstr "Quest'azione accetta solo richieste POST."
+
+#: actions/pluginenable.php:102
+#, fuzzy
+msgid "You cannot administer plugins."
+msgstr "Non puoi eliminare utenti."
+
+#: actions/pluginenable.php:109
+#, fuzzy
+msgid "No such plugin."
+msgstr "Pagina inesistente."
+
+#. TRANS: Page title for AJAX form return when enabling a plugin.
+#: actions/pluginenable.php:159
+msgctxt "plugin"
+msgid "Enabled"
+msgstr ""
+
+#. TRANS: Tab and title for plugins admin panel.
+#. TRANS: Menu item for site administration
+#: actions/pluginsadminpanel.php:56 actions/version.php:191
+#: lib/adminpanelaction.php:411
+msgid "Plugins"
+msgstr "Plugin"
+
+#. TRANS: Instructions at top of plugin admin page.
+#: actions/pluginsadminpanel.php:68
+msgid ""
+"Additional plugins can be enabled and configured manually. See the <a href="
+"\"http://status.net/wiki/Plugins\">online plugin documentation</a> for more "
+"details."
+msgstr ""
+
+#. TRANS: Admin form section header
+#: actions/pluginsadminpanel.php:84
+#, fuzzy
+msgid "Default plugins"
+msgstr "Lingua predefinita"
+
+#: actions/pluginsadminpanel.php:106
+msgid ""
+"All default plugins have been disabled from the site's configuration file."
+msgstr ""
+
 #: actions/postnotice.php:95
 msgid "Invalid notice content."
 msgstr "Contenuto del messaggio non valido."
@@ -4500,12 +4614,12 @@ msgstr ""
 "\"%2$s\"."
 
 #. TRANS: Page title for profile settings.
-#: actions/profilesettings.php:59
+#: actions/profilesettings.php:60
 msgid "Profile settings"
 msgstr "Impostazioni del profilo"
 
 #. TRANS: Usage instructions for profile settings.
-#: actions/profilesettings.php:70
+#: actions/profilesettings.php:71
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
@@ -4513,35 +4627,32 @@ msgstr ""
 "altri potranno conoscere qualcosa in più su di te."
 
 #. TRANS: Profile settings form legend.
-#: actions/profilesettings.php:98
+#: actions/profilesettings.php:99
 msgid "Profile information"
 msgstr "Informazioni sul profilo"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109 actions/register.php:433
+#: actions/profilesettings.php:110 actions/register.php:412
 #, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr ""
 "1-64 lettere minuscole o numeri, senza spazi o simboli di punteggiatura"
 
 #. TRANS: Field label in form for profile settings.
-#. TRANS: Label for full group name (dt). Text hidden by default.
-#. TRANS: DT for full name in a profile.
-#: actions/profilesettings.php:113 actions/register.php:455
-#: actions/showgroup.php:255 actions/tagother.php:104
-#: lib/groupeditform.php:150 lib/userprofile.php:156
+#: actions/profilesettings.php:114 actions/register.php:434
+#: lib/groupeditform.php:150
 msgid "Full name"
 msgstr "Nome"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:118 actions/register.php:460
+#: actions/profilesettings.php:119 actions/register.php:439
 #: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "Pagina web"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:121
+#: actions/profilesettings.php:122 actions/register.php:441
 #, fuzzy
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr "URL della tua pagina web, blog o profilo su un altro sito"
@@ -4549,7 +4660,7 @@ msgstr "URL della tua pagina web, blog o profilo su un altro sito"
 #. TRANS: Tooltip for field label in form for profile settings. Plural
 #. TRANS: is decided by the number of characters available for the
 #. TRANS: biography (%d).
-#: actions/profilesettings.php:129 actions/register.php:471
+#: actions/profilesettings.php:130 actions/register.php:450
 #, fuzzy, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4557,78 +4668,74 @@ msgstr[0] "Descriviti assieme ai tuoi interessi in %d caratteri"
 msgstr[1] "Descriviti assieme ai tuoi interessi in %d caratteri"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:135 actions/register.php:476
+#: actions/profilesettings.php:136 actions/register.php:455
 msgid "Describe yourself and your interests"
 msgstr "Descrivi te e i tuoi interessi"
 
 #. TRANS: Text area label in form for profile settings where users can provide.
 #. TRANS: their biography.
-#: actions/profilesettings.php:139 actions/register.php:478
+#: actions/profilesettings.php:140 actions/register.php:457
 msgid "Bio"
 msgstr "Biografia"
 
 #. TRANS: Field label in form for profile settings.
-#. TRANS: Label for group location (dt). Text hidden by default.
-#. TRANS: DT for location in a profile.
-#: actions/profilesettings.php:145 actions/register.php:483
-#: actions/showgroup.php:265 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:173
-#: lib/userprofile.php:172
+#: actions/profilesettings.php:146 actions/register.php:462
+#: lib/groupeditform.php:173
 msgid "Location"
 msgstr "Ubicazione"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148 actions/register.php:485
+#: actions/profilesettings.php:149
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Dove ti trovi, tipo \"città, regione, stato\""
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:153
+#: actions/profilesettings.php:154
 msgid "Share my current location when posting notices"
 msgstr "Condividi la mia posizione attuale quando invio messaggi"
 
 #. TRANS: Field label in form for profile settings.
-#. TRANS: DT for tags in a profile.
-#: actions/profilesettings.php:161 actions/tagother.php:149
-#: actions/tagother.php:209 lib/subscriptionlist.php:106
-#: lib/subscriptionlist.php:108 lib/userprofile.php:220
+#: actions/profilesettings.php:162 actions/tagother.php:128
+#: actions/tagother.php:188 lib/subscriptionlist.php:104
+#: lib/subscriptionlist.php:106
 msgid "Tags"
 msgstr "Etichette"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:164
+#: actions/profilesettings.php:165
 #, fuzzy
 msgid ""
-"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- "
+"separated."
 msgstr ""
 "Le tue etichette (lettere, numeri, -, . e _), separate da virgole o spazi"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:169
+#: actions/profilesettings.php:170
 msgid "Language"
 msgstr "Lingua"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:171
+#: actions/profilesettings.php:172
 #, fuzzy
-msgid "Preferred language"
+msgid "Preferred language."
 msgstr "Lingua preferita"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:181
+#: actions/profilesettings.php:182
 msgid "Timezone"
 msgstr "Fuso orario"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:183
+#: actions/profilesettings.php:184
 msgid "What timezone are you normally in?"
 msgstr "In che fuso orario risiedi solitamente?"
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:189
+#: actions/profilesettings.php:190
 #, fuzzy
 msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)"
+"Automatically subscribe to whoever subscribes to me (best for non-humans)."
 msgstr ""
 "Abbonami automaticamente a chi si abbona ai miei messaggi (utile per i non-"
 "umani)"
@@ -4636,7 +4743,7 @@ msgstr ""
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Plural form is used based on the maximum number of allowed
 #. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:258 actions/register.php:229
+#: actions/profilesettings.php:259 actions/register.php:214
 #, fuzzy, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4644,50 +4751,50 @@ msgstr[0] "La biografia è troppo lunga (max %d caratteri)."
 msgstr[1] "La biografia è troppo lunga (max %d caratteri)."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:269 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:270 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr "Fuso orario non selezionato"
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:277
+#: actions/profilesettings.php:278
 #, fuzzy
 msgid "Language is too long (maximum 50 characters)."
 msgstr "La lingua è troppo lunga (max 50 caratteri)."
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:291 actions/tagother.php:178
-#, php-format
-msgid "Invalid tag: \"%s\""
+#: actions/profilesettings.php:292
+#, fuzzy, php-format
+msgid "Invalid tag: \"%s\"."
 msgstr "Etichetta non valida: \"%s\""
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:347
+#: actions/profilesettings.php:348
 #, fuzzy
 msgid "Could not update user for autosubscribe."
 msgstr "Impossibile aggiornare l'utente per auto-abbonarsi."
 
 #. TRANS: Server error thrown when user profile location preference settings could not be updated.
-#: actions/profilesettings.php:405
+#: actions/profilesettings.php:406
 #, fuzzy
 msgid "Could not save location prefs."
 msgstr "Impossibile salvare le preferenze della posizione."
 
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:427 actions/tagother.php:200
+#: actions/profilesettings.php:428 actions/tagother.php:179
 msgid "Could not save tags."
 msgstr "Impossibile salvare le etichette."
 
 #. TRANS: Confirmation shown when user profile settings are saved.
 #. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:436 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:437 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "Impostazioni salvate."
 
 #. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
 #. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:483 actions/restoreaccount.php:60
+#: actions/profilesettings.php:484 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "Crea un account"
@@ -4766,6 +4873,12 @@ msgstr ""
 "wiki/Microblogging) basato sul software libero [StatusNet](http://status."
 "net/)."
 
+#. TRANS: Public RSS feed description. %s is the StatusNet site name.
+#: actions/publicrss.php:106
+#, fuzzy, php-format
+msgid "%s updates from everyone."
+msgstr "Aggiornamenti di %s da tutti!"
+
 #. TRANS: Title for public tag cloud.
 #: actions/publictagcloud.php:57
 msgid "Public tag cloud"
@@ -4804,10 +4917,6 @@ msgid ""
 "one!"
 msgstr "Perché non [crei un accout](%%action.register%%) e ne scrivi uno tu!"
 
-#: actions/publictagcloud.php:146
-msgid "Tag cloud"
-msgstr "Insieme delle etichette"
-
 #. TRANS: Client error displayed trying to recover password while already logged in.
 #: actions/recoverpassword.php:37
 msgid "You are already logged in!"
@@ -4900,6 +5009,12 @@ msgstr "Recupera la password"
 msgid "Password recovery requested"
 msgstr "Richiesta password di ripristino"
 
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/recoverpassword.php:229
+#, fuzzy
+msgid "Password saved"
+msgstr "Password salvata."
+
 #. TRANS: Title for password recovery page when an unknown action has been specified.
 #: actions/recoverpassword.php:232
 msgid "Unknown action"
@@ -4911,15 +5026,9 @@ msgstr "Azione sconosciuta"
 msgid "6 or more characters, and do not forget it!"
 msgstr "6 o più caratteri, e non dimenticarla!"
 
-#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
-#: actions/recoverpassword.php:264 actions/register.php:441
-#, fuzzy
-msgid "Same as password above."
-msgstr "Stessa password di sopra"
-
 #. TRANS: Button text for password reset form.
 #. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: actions/recoverpassword.php:268 lib/designsettings.php:264
+#: actions/recoverpassword.php:268 lib/designform.php:145
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Reset"
@@ -4970,14 +5079,8 @@ msgstr "La password deve essere lunga almeno 6 caratteri."
 msgid "Password and confirmation do not match."
 msgstr "La password e la conferma non corrispondono."
 
-#. TRANS: Reset password form validation error message.
-#: actions/recoverpassword.php:418
-#, fuzzy
-msgid "Cannot save new password."
-msgstr "Impossibile salvare la nuova password."
-
 #. TRANS: Server error displayed when something does wrong with the user object during password reset.
-#: actions/recoverpassword.php:426 actions/register.php:256
+#: actions/recoverpassword.php:426 actions/register.php:241
 msgid "Error setting user."
 msgstr "Errore nell'impostare l'utente."
 
@@ -4986,99 +5089,103 @@ msgstr "Errore nell'impostare l'utente."
 msgid "New password successfully saved. You are now logged in."
 msgstr "Nuova password salvata con successo. Hai effettuato l'accesso."
 
-#: actions/register.php:92 actions/register.php:196 actions/register.php:413
+#: actions/redirecturl.php:70
+#, fuzzy
+msgid "No id parameter"
+msgstr "Nessun argomento ID."
+
+#: actions/redirecturl.php:76
+#, fuzzy, php-format
+msgid "No such file \"%d\""
+msgstr "Nessun file."
+
+#: actions/register.php:80 actions/register.php:181 actions/register.php:392
 msgid "Sorry, only invited people can register."
 msgstr "Solo le persone invitate possono registrarsi."
 
-#: actions/register.php:99
+#: actions/register.php:87
 msgid "Sorry, invalid invitation code."
 msgstr "Codice di invito non valido."
 
-#: actions/register.php:119
+#: actions/register.php:106
 msgid "Registration successful"
 msgstr "Registrazione riuscita"
 
-#: actions/register.php:121 actions/register.php:511
+#: actions/register.php:108 actions/register.php:490
 msgid "Register"
 msgstr "Registrati"
 
-#: actions/register.php:142
+#: actions/register.php:128
 msgid "Registration not allowed."
 msgstr "Registrazione non consentita."
 
-#: actions/register.php:209
+#: actions/register.php:194
 #, fuzzy
-msgid "You can't register if you don't agree to the license."
+msgid "You cannot register if you don't agree to the license."
 msgstr "Non puoi registrarti se non accetti la licenza."
 
-#: actions/register.php:218
+#: actions/register.php:203
 msgid "Email address already exists."
 msgstr "Indirizzo email già esistente."
 
-#: actions/register.php:251 actions/register.php:273
+#: actions/register.php:236 actions/register.php:258
 msgid "Invalid username or password."
 msgstr "Nome utente o password non valido."
 
-#: actions/register.php:351
+#: actions/register.php:333
 #, fuzzy
 msgid ""
 "With this form you can create a new account. You can then post notices and "
-"link up to friends and colleagues. "
+"link up to friends and colleagues."
 msgstr ""
 "Attraverso questo modulo puoi creare un nuovo account con cui potrai "
 "successivamente inviare messaggi e metterti in contatto con i tuoi amici e "
 "colleghi. "
 
-#: actions/register.php:437
-#, fuzzy
-msgid "6 or more characters."
-msgstr "6 o più caratteri"
-
-#. TRANS: Link description in user account settings menu.
-#: actions/register.php:445 actions/register.php:449
-#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
+#: actions/register.php:424 actions/register.php:428
+#: actions/siteadminpanel.php:238 lib/settingsnav.php:92
 msgid "Email"
 msgstr "Email"
 
-#: actions/register.php:446 actions/register.php:450
+#: actions/register.php:425 actions/register.php:429
 #, fuzzy
-msgid "Used only for updates, announcements, and password recovery"
+msgid "Used only for updates, announcements, and password recovery."
 msgstr "Usata solo per aggiornamenti, annunci e recupero password"
 
-#: actions/register.php:457
+#: actions/register.php:436
 #, fuzzy
-msgid "Longer name, preferably your \"real\" name"
+msgid "Longer name, preferably your \"real\" name."
 msgstr "Nome completo, preferibilmente il tuo \"vero\" nome"
 
-#: actions/register.php:462
+#: actions/register.php:464
 #, fuzzy
-msgid "URL of your homepage, blog, or profile on another site"
-msgstr "URL della tua pagina web, blog o profilo su un altro sito"
+msgid "Where you are, like \"City, State (or Region), Country\"."
+msgstr "Dove ti trovi, tipo \"città, regione, stato\""
 
-#: actions/register.php:523
+#: actions/register.php:503
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
 msgstr ""
 "Comprendo che i contenuti e i dati di %1$s sono privati e confidenziali."
 
-#: actions/register.php:533
+#: actions/register.php:513
 #, php-format
 msgid "My text and files are copyright by %1$s."
 msgstr "I miei testi e i miei file sono copyright di %1$s."
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:537
+#: actions/register.php:517
 msgid "My text and files remain under my own copyright."
 msgstr "I miei testi e file restano sotto il mio diretto copyright."
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:540
+#: actions/register.php:520
 msgid "All rights reserved."
 msgstr "Tutti i diritti riservati."
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:545
+#: actions/register.php:525
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -5088,7 +5195,7 @@ msgstr ""
 "dati personali: password, indirizzo email, indirizzo messaggistica "
 "istantanea e numero di telefono."
 
-#: actions/register.php:588
+#: actions/register.php:566
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -5122,7 +5229,7 @@ msgstr ""
 "Grazie per la tua iscrizione e speriamo tu possa divertiti usando questo "
 "servizio."
 
-#: actions/register.php:612
+#: actions/register.php:590
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5156,7 +5263,7 @@ msgstr "Soprannome dell'utente"
 
 #: actions/remotesubscribe.php:129
 #, fuzzy
-msgid "Nickname of the user you want to follow"
+msgid "Nickname of the user you want to follow."
 msgstr "Soprannome dell'utente che vuoi seguire"
 
 #: actions/remotesubscribe.php:132
@@ -5165,18 +5272,18 @@ msgstr "URL del profilo"
 
 #: actions/remotesubscribe.php:133
 #, fuzzy
-msgid "URL of your profile on another compatible microblogging service"
+msgid "URL of your profile on another compatible microblogging service."
 msgstr "URL del tuo profilo su un altro servizio di microblog compatibile"
 
 #. TRANS: Link text for link that will subscribe to a remote profile.
 #: actions/remotesubscribe.php:136 lib/subscribeform.php:139
-#: lib/userprofile.php:431
+#: lib/userprofile.php:402
 msgid "Subscribe"
 msgstr "Abbonati"
 
 #: actions/remotesubscribe.php:158
 #, fuzzy
-msgid "Invalid profile URL (bad format)"
+msgid "Invalid profile URL (bad format)."
 msgstr "URL del profilo non valido (formato errato)"
 
 #: actions/remotesubscribe.php:167
@@ -5212,7 +5319,7 @@ msgstr "Non puoi ripetere i tuoi stessi messaggi."
 msgid "You already repeated that notice."
 msgstr "Hai già ripetuto quel messaggio."
 
-#: actions/repeat.php:112 lib/noticelist.php:692
+#: actions/repeat.php:112 lib/noticelist.php:697
 msgid "Repeated"
 msgstr "Ripetuti"
 
@@ -5220,9 +5327,9 @@ msgstr "Ripetuti"
 msgid "Repeated!"
 msgstr "Ripetuti!"
 
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing @-replies.
+#. TRANS: RSS reply feed title. %s is a user nickname.
 #: actions/replies.php:126 actions/repliesrss.php:68
-#: lib/personalgroupnav.php:109
+#: lib/personalgroupnav.php:105
 #, php-format
 msgid "Replies to %s"
 msgstr "Risposte a %s"
@@ -5272,9 +5379,11 @@ msgstr ""
 "[Scrivi qualche cosa](%%%%action.newnotice%%%%?status_textarea=%s) su questo "
 "argomento!"
 
-#: actions/repliesrss.php:72
+#. TRANS: RSS reply feed description.
+#. TRANS: %1$s is a user nickname, %2$s is the StatusNet site name.
+#: actions/repliesrss.php:74
 #, fuzzy, php-format
-msgid "Replies to %1$s on %2$s!"
+msgid "Replies to %1$s on %2$s."
 msgstr "Risposte a %1$s su %2$s!"
 
 #. TRANS: Client exception displayed when trying to restore an account while not logged in.
@@ -5376,7 +5485,7 @@ msgstr "Non puoi revocare i ruoli degli utenti su questo sito."
 msgid "User doesn't have this role."
 msgstr "L'utente non ricopre questo ruolo."
 
-#: actions/rsd.php:146 actions/version.php:159
+#: actions/rsd.php:142 actions/version.php:159
 msgid "StatusNet"
 msgstr "StatusNet"
 
@@ -5418,87 +5527,38 @@ msgstr "Abilita il debug per le sessioni"
 msgid "Save site settings"
 msgstr "Salva impostazioni"
 
-#: actions/showapplication.php:82
+#: actions/showapplication.php:78
 msgid "You must be logged in to view an application."
 msgstr "Devi eseguire l'accesso per visualizzare un'applicazione."
 
-#: actions/showapplication.php:157
+#: actions/showapplication.php:151
 msgid "Application profile"
 msgstr "Profilo applicazione"
 
-#. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:159 lib/applicationeditform.php:177
-msgid "Icon"
-msgstr "Icona"
-
-#. TRANS: Form input field label for application name.
-#: actions/showapplication.php:169 actions/version.php:197
-#: lib/applicationeditform.php:190
-msgid "Name"
-msgstr "Nome"
-
-#. TRANS: Form input field label.
-#: actions/showapplication.php:178 lib/applicationeditform.php:227
-msgid "Organization"
-msgstr "Organizzazione"
-
-#. TRANS: Form input field label.
-#: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:168
-msgid "Description"
-msgstr "Descrizione"
-
-#. TRANS: Header for group statistics on a group page (h2).
-#. TRANS: H2 text for user statistics.
-#: actions/showapplication.php:192 actions/showgroup.php:460
-#: lib/profileaction.php:205
-msgid "Statistics"
-msgstr "Statistiche"
-
-#: actions/showapplication.php:203
+#: actions/showapplication.php:179
 #, php-format
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr "creata da %1$s - %2$s accessi predefiniti - %3$d utenti"
 
-#: actions/showapplication.php:213
+#: actions/showapplication.php:189
 msgid "Application actions"
 msgstr "Azioni applicazione"
 
-#: actions/showapplication.php:236
+#: actions/showapplication.php:212
 msgid "Reset key & secret"
 msgstr "Reimposta chiave e segreto"
 
 #. TRANS: Title of form for deleting a user.
-#: actions/showapplication.php:252 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:64 lib/noticelist.php:673
+#: actions/showapplication.php:228 lib/deletegroupform.php:121
+#: lib/deleteuserform.php:64 lib/noticelist.php:678
 msgid "Delete"
 msgstr "Elimina"
 
-#: actions/showapplication.php:261
+#: actions/showapplication.php:237
 msgid "Application info"
 msgstr "Informazioni applicazione"
 
-#: actions/showapplication.php:263
-msgid "Consumer key"
-msgstr "Chiave consumatore"
-
-#: actions/showapplication.php:268
-msgid "Consumer secret"
-msgstr "Segreto consumatore"
-
-#: actions/showapplication.php:273
-msgid "Request token URL"
-msgstr "URL token di richiesta"
-
-#: actions/showapplication.php:278
-msgid "Access token URL"
-msgstr "URL token di accesso"
-
-#: actions/showapplication.php:283
-msgid "Authorize URL"
-msgstr "URL di autorizzazione"
-
-#: actions/showapplication.php:288
+#: actions/showapplication.php:255
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
@@ -5506,7 +5566,7 @@ msgstr ""
 "Nota: sono supportate firme HMAC-SHA1, ma non è supportato il metodo di "
 "firma di testo in chiaro."
 
-#: actions/showapplication.php:309
+#: actions/showapplication.php:275
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr "Ripristinare la chiave e il segreto?"
 
@@ -5591,61 +5651,47 @@ msgstr "Gruppo %s"
 msgid "%1$s group, page %2$d"
 msgstr "Gruppi di %1$s, pagina %2$d"
 
-#. TRANS: Group profile header (h2). Text hidden by default.
-#: actions/showgroup.php:223
-msgid "Group profile"
-msgstr "Profilo del gruppo"
-
-#. TRANS: Label for group URL (dt). Text hidden by default.
-#. TRANS: DT for URL in a profile.
-#: actions/showgroup.php:273 actions/tagother.php:118
-#: actions/userauthorization.php:175 lib/userprofile.php:186
-msgid "URL"
-msgstr "URL"
-
 #. TRANS: Label for group description or group note (dt). Text hidden by default.
-#. TRANS: DT for note in a profile.
-#: actions/showgroup.php:285 actions/tagother.php:128
-#: actions/userauthorization.php:187 lib/userprofile.php:204
+#: actions/showgroup.php:266
 msgid "Note"
 msgstr "Nota"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:296 lib/groupeditform.php:180
+#: actions/showgroup.php:277 lib/groupeditform.php:180
 msgid "Aliases"
 msgstr "Alias"
 
 #. TRANS: Group actions header (h2). Text hidden by default.
-#: actions/showgroup.php:313
+#: actions/showgroup.php:294
 msgid "Group actions"
 msgstr "Azioni dei gruppi"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:357
+#: actions/showgroup.php:338
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
 msgstr "Feed dei messaggi per il gruppo %s (RSS 1.0)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:364
+#: actions/showgroup.php:345
 #, php-format
 msgid "Notice feed for %s group (RSS 2.0)"
 msgstr "Feed dei messaggi per il gruppo %s (RSS 2.0)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:371
+#: actions/showgroup.php:352
 #, php-format
 msgid "Notice feed for %s group (Atom)"
 msgstr "Feed dei messaggi per il gruppo %s (Atom)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:377
+#: actions/showgroup.php:358
 #, php-format
 msgid "FOAF for %s group"
 msgstr "FOAF per il gruppo %s"
 
 #. TRANS: Header for mini list of group members on a group page (h2).
-#: actions/showgroup.php:414
+#: actions/showgroup.php:395
 msgid "Members"
 msgstr "Membri"
 
@@ -5653,26 +5699,31 @@ msgstr "Membri"
 #. TRANS: Text for user subscription statistics if the user has no subscriptions.
 #. TRANS: Text for user subscriber statistics if user has no subscribers.
 #. TRANS: Text for user user group membership statistics if user is not a member of any group.
-#: actions/showgroup.php:420 lib/profileaction.php:137
+#: actions/showgroup.php:401 lib/profileaction.php:137
 #: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
-#: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
+#: lib/subscriptionlist.php:123 lib/tagcloudsection.php:71
 msgid "(None)"
 msgstr "(nessuno)"
 
 #. TRANS: Link to all group members from mini list of group members if group has more than n members.
-#: actions/showgroup.php:429
+#: actions/showgroup.php:410
 msgid "All members"
 msgstr "Tutti i membri"
 
-#. TRANS: Label for creation date in statistics on group page.
-#: actions/showgroup.php:465
+#. TRANS: Header for group statistics on a group page (h2).
+#. TRANS: H2 text for user statistics.
+#: actions/showgroup.php:441 lib/profileaction.php:205
+msgid "Statistics"
+msgstr "Statistiche"
+
+#: actions/showgroup.php:444
 #, fuzzy
 msgctxt "LABEL"
 msgid "Created"
 msgstr "Creato"
 
 #. TRANS: Label for member count in statistics on group page.
-#: actions/showgroup.php:473
+#: actions/showgroup.php:449
 #, fuzzy
 msgctxt "LABEL"
 msgid "Members"
@@ -5682,7 +5733,7 @@ msgstr "Membri"
 #. TRANS: **%s** is the group alias, %%%%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).
-#: actions/showgroup.php:488
+#: actions/showgroup.php:464
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5701,7 +5752,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: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
-#: actions/showgroup.php:498
+#: actions/showgroup.php:474
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5714,7 +5765,7 @@ msgstr ""
 "[StatusNet](http://status.net/)."
 
 #. TRANS: Header for list of group administrators on a group page (h2).
-#: actions/showgroup.php:527
+#: actions/showgroup.php:503
 msgid "Admins"
 msgstr "Amministratori"
 
@@ -5753,7 +5804,7 @@ msgid "%1$s tagged %2$s"
 msgstr "%1$s, pagina %2$s"
 
 #. TRANS: Page title showing tagged notices in one user's stream.
-#. TRANS: %1$s is the username, %2$s is the hash tag, %1$d is the page number.
+#. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
 #: actions/showstream.php:74
 #, fuzzy, php-format
 msgid "%1$s tagged %2$s, page %3$d"
@@ -5800,13 +5851,13 @@ msgid "FOAF for %s"
 msgstr "FOAF per %s"
 
 #. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
-#: actions/showstream.php:211
+#: actions/showstream.php:205
 #, fuzzy, php-format
 msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr "Questa è l'attività di %1$s, ma %2$s non ha ancora scritto nulla."
 
 #. TRANS: Second sentence of empty list message for a stream for the user themselves.
-#: actions/showstream.php:217
+#: actions/showstream.php:211
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
@@ -5816,7 +5867,7 @@ msgstr ""
 
 #. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:221
+#: actions/showstream.php:215
 #, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
@@ -5827,7 +5878,7 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:264
+#: actions/showstream.php:258
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5843,7 +5894,7 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:271
+#: actions/showstream.php:265
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5855,7 +5906,7 @@ msgstr ""
 "(http://status.net/). "
 
 #. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
-#: actions/showstream.php:328
+#: actions/showstream.php:322
 #, php-format
 msgid "Repeat of %s"
 msgstr "Ripetizione di %s"
@@ -6004,75 +6055,75 @@ msgstr "Testo messaggio del sito (massimo 255 caratteri, HTML consentito)"
 #. TRANS: Title for button to save site notice in admin panel.
 #: actions/sitenoticeadminpanel.php:201
 #, fuzzy
-msgid "Save site notice"
+msgid "Save site notice."
 msgstr "Salva messaggio"
 
 #. TRANS: Title for SMS settings.
-#: actions/smssettings.php:57
+#: actions/smssettings.php:56
 msgid "SMS settings"
 msgstr "Impostazioni SMS"
 
 #. TRANS: SMS settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/smssettings.php:71
+#: actions/smssettings.php:70
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr "Puoi ricevere messaggi SMS attraverso l'email da %%site.name%%."
 
 #. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
-#: actions/smssettings.php:93
+#: actions/smssettings.php:92
 msgid "SMS is not available."
 msgstr "Il servizio SMS non è disponibile."
 
 #. TRANS: Form legend for SMS settings form.
-#: actions/smssettings.php:107
+#: actions/smssettings.php:106
 msgid "SMS address"
 msgstr "Indirizzo SMS"
 
 #. TRANS: Form guide in SMS settings form.
-#: actions/smssettings.php:116
+#: actions/smssettings.php:115
 msgid "Current confirmed SMS-enabled phone number."
 msgstr "Numero di telefono attualmente confermato per gli SMS."
 
 #. TRANS: Form guide in IM settings form.
-#: actions/smssettings.php:129
+#: actions/smssettings.php:128
 msgid "Awaiting confirmation on this phone number."
 msgstr "In attesa della conferma per questo numero di telefono."
 
 #. TRANS: Field label for SMS address input in SMS settings form.
-#: actions/smssettings.php:138
+#: actions/smssettings.php:137
 msgid "Confirmation code"
 msgstr "Codice di conferma"
 
 #. TRANS: Form field instructions in SMS settings form.
-#: actions/smssettings.php:140
+#: actions/smssettings.php:139
 msgid "Enter the code you received on your phone."
 msgstr "Inserisci il codice che hai ricevuto sul tuo telefono."
 
 #. TRANS: Button label to confirm SMS confirmation code in SMS settings.
-#: actions/smssettings.php:144
+#: actions/smssettings.php:143
 msgctxt "BUTTON"
 msgid "Confirm"
 msgstr "Conferma"
 
 #. TRANS: Field label for SMS phone number input in SMS settings form.
-#: actions/smssettings.php:149
+#: actions/smssettings.php:148
 msgid "SMS phone number"
 msgstr "Numero di telefono per SMS"
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
-#: actions/smssettings.php:152
+#: actions/smssettings.php:151
 #, fuzzy
-msgid "Phone number, no punctuation or spaces, with area code"
+msgid "Phone number, no punctuation or spaces, with area code."
 msgstr "Numero di telefono, senza punteggiatura o spazi, con il prefisso"
 
 #. TRANS: Form legend for SMS preferences form.
-#: actions/smssettings.php:191
+#: actions/smssettings.php:190
 msgid "SMS preferences"
 msgstr "Preferenze dell'SMS"
 
 #. TRANS: Checkbox label in SMS preferences form.
-#: actions/smssettings.php:197
+#: actions/smssettings.php:196
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
@@ -6081,32 +6132,32 @@ msgstr ""
 "bollette da parte del mio operatore"
 
 #. TRANS: Confirmation message for successful SMS preferences save.
-#: actions/smssettings.php:308
+#: actions/smssettings.php:307
 msgid "SMS preferences saved."
 msgstr "Preferenze dell'SMS salvate."
 
 #. TRANS: Message given saving SMS phone number without having provided one.
-#: actions/smssettings.php:330
+#: actions/smssettings.php:329
 msgid "No phone number."
 msgstr "Nessun numero di telefono."
 
 #. TRANS: Message given saving SMS phone number without having selected a carrier.
-#: actions/smssettings.php:336
+#: actions/smssettings.php:335
 msgid "No carrier selected."
 msgstr "Nessun operatore selezionato."
 
 #. TRANS: Message given saving SMS phone number that is already set.
-#: actions/smssettings.php:344
+#: actions/smssettings.php:343
 msgid "That is already your phone number."
 msgstr "Quello è già il tuo numero di telefono."
 
 #. TRANS: Message given saving SMS phone number that is already set for another user.
-#: actions/smssettings.php:348
+#: actions/smssettings.php:347
 msgid "That phone number already belongs to another user."
 msgstr "Quel numero di telefono appartiene già a un altro utente."
 
 #. TRANS: Message given saving valid SMS phone number that is to be confirmed.
-#: actions/smssettings.php:376
+#: actions/smssettings.php:375
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
 "for the code and instructions on how to use it."
@@ -6116,39 +6167,39 @@ msgstr ""
 "usarlo."
 
 #. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
-#: actions/smssettings.php:404
+#: actions/smssettings.php:403
 msgid "That is the wrong confirmation number."
 msgstr "Quello è il numero di conferma errato."
 
 #. TRANS: Message given after successfully canceling SMS phone number confirmation.
-#: actions/smssettings.php:418
+#: actions/smssettings.php:417
 msgid "SMS confirmation cancelled."
 msgstr "Conferma dell'SMS annullata."
 
 #. TRANS: Message given trying to remove an SMS phone number that is not
 #. TRANS: registered for the active user.
-#: actions/smssettings.php:438
+#: actions/smssettings.php:437
 msgid "That is not your phone number."
 msgstr "Quello non è il tuo numero di telefono."
 
 #. TRANS: Message given after successfully removing a registered SMS phone number.
-#: actions/smssettings.php:460
+#: actions/smssettings.php:459
 msgid "The SMS phone number was removed."
 msgstr "Il numero di telefono per SMS è stato rimosso."
 
 #. TRANS: Label for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:499
+#: actions/smssettings.php:498
 msgid "Mobile carrier"
 msgstr "Operatore telefonico"
 
 #. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:504
+#: actions/smssettings.php:503
 msgid "Select a carrier"
 msgstr "Seleziona un operatore"
 
 #. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
 #. TRANS: %s is an administrative contact's e-mail address.
-#: actions/smssettings.php:513
+#: actions/smssettings.php:512
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -6158,7 +6209,7 @@ msgstr ""
 "via email, ma non è elencato qui, scrivici a %s."
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
-#: actions/smssettings.php:535
+#: actions/smssettings.php:534
 #, fuzzy
 msgid "No code entered."
 msgstr "Nessun codice inserito"
@@ -6232,16 +6283,14 @@ msgstr "Non hai una abbonamento a quel profilo."
 msgid "Could not save subscription."
 msgstr "Impossibile salvare l'abbonamento."
 
-#: actions/subscribe.php:77
-msgid "This action only accepts POST requests."
-msgstr "Quest'azione accetta solo richieste POST."
-
-#: actions/subscribe.php:117
+#. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
+#: actions/subscribe.php:121
 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
 msgstr ""
 "Non è possibile abbonarsi a un profilo remoto OMB 0.1 con quest'azione."
 
-#: actions/subscribe.php:145
+#. TRANS: Page title when subscription succeeded.
+#: actions/subscribe.php:149
 msgid "Subscribed"
 msgstr "Abbonati"
 
@@ -6358,31 +6407,34 @@ msgid "Subscription feed for %s (Atom)"
 msgstr "Feed dei messaggi per %s (Atom)"
 
 #. TRANS: Checkbox label for enabling Jabber messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:239
-msgid "Jabber"
-msgstr "Jabber"
+#: actions/subscriptions.php:241 lib/settingsnav.php:110
+#, fuzzy
+msgid "IM"
+msgstr "MI"
 
 #. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:254
+#: actions/subscriptions.php:256 lib/settingsnav.php:117
 msgid "SMS"
 msgstr "SMS"
 
-#: actions/tag.php:69
+#. TRANS: Title for all but the first page of notices with tags.
+#. TRANS: %1$s is the tag, %2$d is the page number.
+#: actions/tag.php:73
 #, php-format
 msgid "Notices tagged with %1$s, page %2$d"
 msgstr "Messaggi etichettati con %1$s, pagina %2$d"
 
-#: actions/tag.php:87
+#: actions/tag.php:91
 #, php-format
 msgid "Notice feed for tag %s (RSS 1.0)"
 msgstr "Feed dei messaggi per l'etichetta %s (RSS 1.0)"
 
-#: actions/tag.php:93
+#: actions/tag.php:97
 #, php-format
 msgid "Notice feed for tag %s (RSS 2.0)"
 msgstr "Feed dei messaggi per l'etichetta %s (RSS 2.0)"
 
-#: actions/tag.php:99
+#: actions/tag.php:103
 #, php-format
 msgid "Notice feed for tag %s (Atom)"
 msgstr "Feed dei messaggi per l'etichetta %s (Atom)"
@@ -6401,17 +6453,11 @@ msgstr "Etichetta %s"
 msgid "User profile"
 msgstr "Profilo utente"
 
-#. TRANS: DT element in area for user avatar.
-#: actions/tagother.php:81 actions/userauthorization.php:132
-#: lib/userprofile.php:108
-msgid "Photo"
-msgstr "Fotografia"
-
-#: actions/tagother.php:141
+#: actions/tagother.php:120
 msgid "Tag user"
 msgstr "Etichette utente"
 
-#: actions/tagother.php:151
+#: actions/tagother.php:130
 msgid ""
 "Tags for this user (letters, numbers, -, ., and _), comma- or space- "
 "separated"
@@ -6419,14 +6465,19 @@ msgstr ""
 "Etichette per questo utente (lettere, numeri, -, . e _), separate da virgole "
 "o spazi"
 
-#: actions/tagother.php:193
+#: actions/tagother.php:157
+#, php-format
+msgid "Invalid tag: \"%s\""
+msgstr "Etichetta non valida: \"%s\""
+
+#: actions/tagother.php:172
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 "Puoi etichettare sole le persone di cui hai un abbonamento o che sono "
 "abbonate a te."
 
-#: actions/tagother.php:236
+#: actions/tagother.php:215
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
 "Usa questo modulo per aggiungere etichette ai tuoi abbonati o ai tuoi "
@@ -6436,6 +6487,7 @@ msgstr ""
 msgid "No such tag."
 msgstr "Nessuna etichetta."
 
+#. TRANS: Client error displayed when trying to unblock a non-blocked user.
 #: actions/unblock.php:59
 msgid "You haven't blocked that user."
 msgstr "Non hai bloccato quell'utente."
@@ -6456,7 +6508,7 @@ msgstr "Nessun ID di profilo nella richiesta."
 msgid "Unsubscribed"
 msgstr "Abbonamento annullato"
 
-#: actions/updateprofile.php:64 actions/userauthorization.php:337
+#: actions/updateprofile.php:64
 #, php-format
 msgid ""
 "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
@@ -6464,6 +6516,78 @@ msgstr ""
 "La licenza \"%1$s\" dello stream di chi ascolti non è compatibile con la "
 "licenza \"%2$s\" di questo sito."
 
+#: actions/urlsettings.php:60
+#, fuzzy
+msgid "URL settings"
+msgstr "Impostazioni messaggistica istantanea"
+
+#. TRANS: Instructions for tab "Other" in user profile settings.
+#: actions/urlsettings.php:72
+msgid "Manage various other options."
+msgstr "Gestisci altre opzioni."
+
+#. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
+#. TRANS: user's profile settings. This message has one space at the beginning. Use your
+#. TRANS: language's word separator here if it has one (most likely a single space).
+#: actions/urlsettings.php:115
+msgid " (free service)"
+msgstr " (servizio libero)"
+
+#: actions/urlsettings.php:121
+#, fuzzy
+msgid "[none]"
+msgstr "Nessuno"
+
+#: actions/urlsettings.php:122
+msgid "[internal]"
+msgstr ""
+
+#. TRANS: Label for dropdown with URL shortener services.
+#: actions/urlsettings.php:130
+msgid "Shorten URLs with"
+msgstr "Accorcia gli URL con"
+
+#. TRANS: Tooltip for for dropdown with URL shortener services.
+#: actions/urlsettings.php:132
+msgid "Automatic shortening service to use."
+msgstr "Servizio di autoriduzione da usare"
+
+#: actions/urlsettings.php:138
+msgid "URL longer than"
+msgstr ""
+
+#: actions/urlsettings.php:141
+msgid "URLs longer than this will be shortened, 0 means always shorten."
+msgstr ""
+
+#: actions/urlsettings.php:145
+msgid "Text longer than"
+msgstr ""
+
+#: actions/urlsettings.php:148
+msgid ""
+"URLs in notices longer than this will be shortened, 0 means always shorten."
+msgstr ""
+
+#. TRANS: Form validation error for form "Other settings" in user profile.
+#: actions/urlsettings.php:180
+#, fuzzy
+msgid "URL shortening service is too long (maximum 50 characters)."
+msgstr "Il servizio di riduzione degli URL è troppo lungo (max 50 caratteri)."
+
+#: actions/urlsettings.php:187
+msgid "Invalid number for max url length."
+msgstr ""
+
+#: actions/urlsettings.php:193
+#, fuzzy
+msgid "Invalid number for max notice length."
+msgstr "Contenuto del messaggio non valido."
+
+#: actions/urlsettings.php:238
+msgid "Error saving user URL shortening preferences."
+msgstr ""
+
 #. TRANS: User admin panel title
 #: actions/useradminpanel.php:58
 msgctxt "TITLE"
@@ -6491,11 +6615,11 @@ msgstr ""
 #. TRANS: users in user admin panel. %1$s is the invalid nickname.
 #: actions/useradminpanel.php:166
 #, fuzzy, php-format
-msgid "Invalid default subscripton: '%1$s' is not a user."
+msgid "Invalid default subscripton: \"%1$s\" is not a user."
 msgstr "Abbonamento predefinito non valido: \"%1$s\" non è un utente."
 
-#. TRANS: Link description in user account settings menu.
-#: actions/useradminpanel.php:215 lib/accountsettingsaction.php:106
+#: actions/useradminpanel.php:215 lib/action.php:565 lib/settingsnav.php:77
+#: lib/subgroupnav.php:81
 msgid "Profile"
 msgstr "Profilo"
 
@@ -6553,58 +6677,62 @@ msgstr "Indica se consentire agli utenti di invitarne di nuovi"
 #. TRANS: Title for button to save user settings in user admin panel.
 #: actions/useradminpanel.php:302
 #, fuzzy
-msgid "Save user settings"
+msgid "Save user settings."
 msgstr "Salva impostazioni utente"
 
-#: actions/userauthorization.php:105
+#. TRANS: Page title.
+#: actions/userauthorization.php:109
 msgid "Authorize subscription"
 msgstr "Autorizza abbonamento"
 
-#: actions/userauthorization.php:110
+#. TRANS: Page notice on "Auhtorize subscription" page.
+#: actions/userauthorization.php:115
 #, fuzzy
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
 "user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
-"click “Reject”."
+"click \"Reject\"."
 msgstr ""
 "Controlla i dettagli seguenti per essere sicuro di volerti abbonare ai "
 "messaggi di questo utente. Se non hai richiesto ciò, fai clic su \"Rifiuta\"."
 
-#. TRANS: Menu item for site administration
-#: actions/userauthorization.php:196 actions/version.php:167
-#: lib/adminpanelaction.php:403
-msgid "License"
-msgstr "Licenza"
-
-#: actions/userauthorization.php:217
+#. TRANS: Button text on Authorise Subscription page.
+#: actions/userauthorization.php:200
 #, fuzzy
+msgctxt "BUTTON"
 msgid "Accept"
 msgstr "Accetta"
 
-#: actions/userauthorization.php:218 lib/subscribeform.php:115
-#: lib/subscribeform.php:139
-msgid "Subscribe to this user"
+#. TRANS: Title for button on Authorise Subscription page.
+#: actions/userauthorization.php:202
+#, fuzzy
+msgid "Subscribe to this user."
 msgstr "Abbonati a questo utente"
 
-#: actions/userauthorization.php:219
+#. TRANS: Button text on Authorise Subscription page.
+#: actions/userauthorization.php:204
 #, fuzzy
+msgctxt "BUTTON"
 msgid "Reject"
 msgstr "Rifiuta"
 
-#: actions/userauthorization.php:220
+#. TRANS: Title for button on Authorise Subscription page.
+#: actions/userauthorization.php:206
 #, fuzzy
-msgid "Reject this subscription"
+msgid "Reject this subscription."
 msgstr "Rifiuta questo abbonamento"
 
-#: actions/userauthorization.php:232
+#. TRANS: Client error displayed for an empty authorisation request.
+#: actions/userauthorization.php:219
 msgid "No authorization request!"
 msgstr "Nessuna richiesta di autorizzazione!"
 
-#: actions/userauthorization.php:254
+#. TRANS: Accept message header from Authorise subscription page.
+#: actions/userauthorization.php:242
 msgid "Subscription authorized"
 msgstr "Abbonamento autorizzato"
 
-#: actions/userauthorization.php:256
+#: actions/userauthorization.php:245
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to authorize the "
@@ -6614,11 +6742,12 @@ msgstr ""
 "richiamo. Controlla le istruzioni del sito per i dettagli su come "
 "autorizzare l'abbonamento. Il tuo token per l'abbonamento è:"
 
-#: actions/userauthorization.php:266
+#. TRANS: Reject message header from Authorise subscription page.
+#: actions/userauthorization.php:256
 msgid "Subscription rejected"
 msgstr "Abbonamento rifiutato"
 
-#: actions/userauthorization.php:268
+#: actions/userauthorization.php:259
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to fully reject the "
@@ -6628,48 +6757,73 @@ msgstr ""
 "richiamo. Controlla le istruzioni del sito per i dettagli su come rifiutare "
 "completamente l'abbonamento."
 
-#: actions/userauthorization.php:303
+#. TRANS: Exception thrown when no valid user is found for an authorisation request.
+#. TRANS: %s is a listener URI.
+#: actions/userauthorization.php:296
 #, fuzzy, php-format
-msgid "Listener URI ‘%s’ not found here."
+msgid "Listener URI \"%s\" not found here."
 msgstr "URL \"%s\" dell'ascoltatore non trovato qui."
 
-#: actions/userauthorization.php:308
+#. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
+#. TRANS: %s is a listenee URI.
+#: actions/userauthorization.php:303
 #, fuzzy, php-format
-msgid "Listenee URI ‘%s’ is too long."
+msgid "Listenee URI \"%s\" is too long."
 msgstr "L'URI \"%s\" di colui che si ascolta è troppo lungo."
 
-#: actions/userauthorization.php:314
+#. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
+#. TRANS: %s is a listenee URI.
+#: actions/userauthorization.php:311
 #, fuzzy, php-format
-msgid "Listenee URI ‘%s’ is a local user."
+msgid "Listenee URI \"%s\" is a local user."
 msgstr "L'URI \"%s\" di colui che si ascolta è un utente locale."
 
+#. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
+#. TRANS: %s is a profile URL.
 #: actions/userauthorization.php:329
 #, fuzzy, php-format
-msgid "Profile URL ‘%s’ is for a local user."
+msgid "Profile URL \"%s\" is for a local user."
 msgstr "L'URL \"%s\" del profilo è per un utente locale."
 
-#: actions/userauthorization.php:345
+#. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
+#. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
+#: actions/userauthorization.php:339
 #, fuzzy, php-format
-msgid "Avatar URL ‘%s’ is not valid."
+msgid ""
+"Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
+"\"."
+msgstr ""
+"La licenza \"%1$s\" dello stream di chi ascolti non è compatibile con la "
+"licenza \"%2$s\" di questo sito."
+
+#. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
+#. TRANS: %s is an avatar URL.
+#: actions/userauthorization.php:349
+#, fuzzy, php-format
+msgid "Avatar URL \"%s\" is not valid."
 msgstr "L'URL \"%s\" dell'immagine non è valido."
 
-#: actions/userauthorization.php:350
+#. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
+#. TRANS: %s is an avatar URL.
+#: actions/userauthorization.php:356
 #, fuzzy, php-format
-msgid "Can’t read avatar URL ‘%s’."
+msgid "Cannot read avatar URL \"%s\"."
 msgstr "Impossibile leggere l'URL \"%s\" dell'immagine."
 
-#: actions/userauthorization.php:355
+#. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
+#. TRANS: %s is an avatar URL.
+#: actions/userauthorization.php:363
 #, fuzzy, php-format
-msgid "Wrong image type for avatar URL ‘%s’."
+msgid "Wrong image type for avatar URL \"%s\"."
 msgstr "Tipo di immagine errata per l'URL \"%s\"."
 
 #. TRANS: Page title for profile design page.
-#: actions/userdesignsettings.php:74 lib/designsettings.php:63
+#: actions/userdesignsettings.php:74 lib/designsettings.php:61
 msgid "Profile design"
 msgstr "Aspetto del profilo"
 
 #. TRANS: Instructions for profile design page.
-#: actions/userdesignsettings.php:84 lib/designsettings.php:74
+#: actions/userdesignsettings.php:84 lib/designsettings.php:72
 msgid ""
 "Customize the way your profile looks with a background image and a colour "
 "palette of your choice."
@@ -6677,10 +6831,28 @@ msgstr ""
 "Personalizza l'aspetto del tuo profilo con un'immagine di sfondo e dei "
 "colori personalizzati."
 
-#: actions/userdesignsettings.php:272
+#: actions/userdesignsettings.php:289
 msgid "Enjoy your hotdog!"
 msgstr "Gustati il tuo hotdog!"
 
+#: actions/userdesignsettings.php:325
+#, fuzzy
+msgid "Design settings"
+msgstr "Salva impostazioni"
+
+#: actions/userdesignsettings.php:340
+msgid "View profile designs"
+msgstr "Visualizza aspetto"
+
+#: actions/userdesignsettings.php:341
+msgid "Show or hide profile designs."
+msgstr "Mostra o nasconde gli aspetti del profilo"
+
+#: actions/userdesignsettings.php:348
+#, fuzzy
+msgid "Background file"
+msgstr "Sfondo"
+
 #. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number.
 #: actions/usergroups.php:66
 #, php-format
@@ -6730,6 +6902,11 @@ msgstr ""
 msgid "Contributors"
 msgstr "Collaboratori"
 
+#. TRANS: Menu item for site administration
+#: actions/version.php:167 lib/adminpanelaction.php:403
+msgid "License"
+msgstr "Licenza"
+
 #: actions/version.php:170
 msgid ""
 "StatusNet is free software: you can redistribute it and/or modify it under "
@@ -6763,12 +6940,13 @@ msgstr ""
 "Una copia della GNU Affero General Plublic License dovrebbe essere "
 "disponibile assieme a questo programma. Se così non fosse, consultare %s."
 
-#: actions/version.php:191
-msgid "Plugins"
-msgstr "Plugin"
+#. TRANS: Form input field label for application name.
+#: actions/version.php:197 lib/applicationeditform.php:190
+msgid "Name"
+msgstr "Nome"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:901
+#: actions/version.php:198 lib/action.php:885
 msgid "Version"
 msgstr "Versione"
 
@@ -6776,6 +6954,12 @@ msgstr "Versione"
 msgid "Author(s)"
 msgstr "Autori"
 
+#. TRANS: Form input field label.
+#: actions/version.php:200 lib/applicationeditform.php:208
+#: lib/groupeditform.php:168
+msgid "Description"
+msgstr "Descrizione"
+
 #. TRANS: Activity title when marking a notice as favorite.
 #: classes/Fave.php:164
 msgid "Favor"
@@ -6898,7 +7082,7 @@ msgid "Could not create login token for %s"
 msgstr "Impossibile creare il token di accesso per %s"
 
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
-#: classes/Memcached_DataObject.php:542
+#: classes/Memcached_DataObject.php:556
 msgid "No database name or DSN found anywhere."
 msgstr "Non è stato trovato un nome di database o DNS."
 
@@ -7076,18 +7260,18 @@ msgstr "L'utente %1$s è entrato nel gruppo %2$s."
 
 #. TRANS: Notice given on user registration.
 #. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:395
+#: classes/User.php:390
 #, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr "Benvenuti su %1$s, @%2$s!"
 
 #. TRANS: Server exception.
-#: classes/User.php:918
+#: classes/User.php:923
 msgid "No single user defined for single-user mode."
 msgstr "Nessun utente singolo definito per la modalità single-user."
 
 #. TRANS: Server exception.
-#: classes/User.php:922
+#: classes/User.php:927
 msgid "Single-user mode code called when not enabled."
 msgstr ""
 
@@ -7132,41 +7316,6 @@ msgstr ""
 msgid "No AtomPub API service for %s."
 msgstr ""
 
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:104
-msgid "Change your profile settings"
-msgstr "Modifica le impostazioni del tuo profilo"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:111
-msgid "Upload an avatar"
-msgstr "Carica un'immagine"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:118
-msgid "Change your password"
-msgstr "Modifica la tua password"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:125
-msgid "Change email handling"
-msgstr "Modifica la gestione dell'email"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:132
-msgid "Design your profile"
-msgstr "Progetta il tuo profilo"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:139
-msgid "Other options"
-msgstr "Altre opzioni"
-
-#. TRANS: Link description in user account settings menu.
-#: lib/accountsettingsaction.php:141
-msgid "Other"
-msgstr "Altro"
-
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
 #: lib/action.php:161
 #, php-format
@@ -7184,206 +7333,128 @@ msgctxt "TOOLTIP"
 msgid "Show more"
 msgstr ""
 
-#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:544
-msgid "Primary site navigation"
-msgstr "Esplorazione sito primaria"
+#. TRANS: Inline reply form submit button: submits a reply comment.
+#: lib/action.php:328
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Comment"
+msgstr "Contenuto"
 
-#. TRANS: Tooltip for main menu option "Personal".
-#: lib/action.php:550
-msgctxt "TOOLTIP"
-msgid "Personal profile and friends timeline"
-msgstr "Profilo personale e attività degli amici"
+#. TRANS: Placeholder text for inline reply form. Clicking in this box will turn it into a mini notice form.
+#: lib/action.php:331
+msgid "Add a comment..."
+msgstr ""
 
-#. TRANS: Main menu option when logged in for access to personal profile and friends timeline.
-#. TRANS: Personal group navigation menu option when logged in for viewing timeline of self and friends.
-#: lib/action.php:553 lib/personalgroupnav.php:100
-msgctxt "MENU"
-msgid "Personal"
-msgstr "Personale"
+#: lib/action.php:559 lib/personalgroupnav.php:99
+#, fuzzy
+msgid "Home"
+msgstr "Pagina web"
 
-#. TRANS: Tooltip for main menu option "Account".
-#: lib/action.php:555
-msgctxt "TOOLTIP"
-msgid "Change your email, avatar, password, profile"
-msgstr "Modifica la tua email, immagine, password o il tuo profilo"
-
-#. TRANS: Main menu option when logged in for access to user settings.
-#: lib/action.php:558
-msgid "Account"
-msgstr "Account"
-
-#. TRANS: Tooltip for main menu option "Services".
 #: lib/action.php:560
-msgctxt "TOOLTIP"
-msgid "Connect to services"
-msgstr "Connettiti con altri servizi"
+#, fuzzy
+msgid "Friends timeline"
+msgstr "Attività di %s"
 
-#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services.
-#: lib/action.php:563
-msgid "Connect"
-msgstr "Connetti"
-
-#. TRANS: Tooltip for menu option "Admin".
 #: lib/action.php:566
-msgctxt "TOOLTIP"
-msgid "Change site configuration"
-msgstr "Modifica la configurazione del sito"
+#, fuzzy
+msgid "Your profile"
+msgstr "Profilo del gruppo"
 
-#. TRANS: Main menu option when logged in and site admin for access to site configuration.
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/action.php:569 lib/groupnav.php:117
-msgctxt "MENU"
-msgid "Admin"
-msgstr "Amministra"
+#: lib/action.php:570 lib/action.php:593 lib/publicgroupnav.php:78
+msgid "Public"
+msgstr "Pubblico"
 
-#. TRANS: Tooltip for main menu option "Invite".
-#: lib/action.php:573
-#, php-format
-msgctxt "TOOLTIP"
-msgid "Invite friends and colleagues to join you on %s"
-msgstr "Invita amici e colleghi a seguirti su %s"
+#: lib/action.php:571 lib/action.php:594
+#, fuzzy
+msgid "Everyone on this site"
+msgstr "Trova persone in questo sito"
+
+#: lib/action.php:575
+#, fuzzy
+msgid "Settings"
+msgstr "Impostazioni SMS"
 
-#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users.
 #: lib/action.php:576
-msgctxt "MENU"
-msgid "Invite"
-msgstr "Invita"
+#, fuzzy
+msgid "Change your personal settings"
+msgstr "Modifica le impostazioni del tuo profilo"
 
-#. TRANS: Tooltip for main menu option "Logout"
 #: lib/action.php:582
-msgctxt "TOOLTIP"
-msgid "Logout from the site"
-msgstr "Termina la tua sessione sul sito"
+#, fuzzy
+msgid "Site configuration"
+msgstr "Configurazione utente"
 
-#. TRANS: Main menu option when logged in to log out the current user.
-#: lib/action.php:585
-msgctxt "MENU"
+#: lib/action.php:587
+#, fuzzy
 msgid "Logout"
 msgstr "Esci"
 
-#. TRANS: Tooltip for main menu option "Register".
-#: lib/action.php:590
-msgctxt "TOOLTIP"
-msgid "Create an account"
-msgstr "Crea un account"
+#: lib/action.php:588
+#, fuzzy
+msgid "Logout from the site"
+msgstr "Termina la tua sessione sul sito"
 
-#. TRANS: Main menu option when not logged in to register a new account.
-#. TRANS: Menu item for registering with the StatusNet site.
-#: lib/action.php:593 lib/logingroupnav.php:85
-msgctxt "MENU"
-msgid "Register"
-msgstr "Registrati"
-
-#. TRANS: Tooltip for main menu option "Login".
-#: lib/action.php:596
-msgctxt "TOOLTIP"
+#: lib/action.php:599
+#, fuzzy
 msgid "Login to the site"
 msgstr "Accedi al sito"
 
-#. TRANS: Main menu option when not logged in to log in.
-#. TRANS: Menu item for logging in to the StatusNet site.
-#: lib/action.php:599 lib/logingroupnav.php:77
-msgctxt "MENU"
-msgid "Login"
-msgstr "Accedi"
-
-#. TRANS: Tooltip for main menu option "Help".
-#: lib/action.php:602
-msgctxt "TOOLTIP"
-msgid "Help me!"
-msgstr "Aiutami!"
-
-#. TRANS: Main menu option for help on the StatusNet site.
-#: lib/action.php:605
-msgctxt "MENU"
-msgid "Help"
-msgstr "Aiuto"
-
-#. TRANS: Tooltip for main menu option "Search".
-#: lib/action.php:608
-msgctxt "TOOLTIP"
-msgid "Search for people or text"
-msgstr "Cerca persone o del testo"
-
-#. TRANS: Main menu option when logged in or when the StatusNet instance is not private.
-#: lib/action.php:611
-msgctxt "MENU"
+#: lib/action.php:606
+#, fuzzy
 msgid "Search"
 msgstr "Cerca"
 
-#. TRANS: DT element for site notice. String is hidden in default CSS.
-#. TRANS: Menu item for site administration
-#: lib/action.php:633 lib/adminpanelaction.php:387
-msgid "Site notice"
-msgstr "Messaggio del sito"
-
-#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:700
-msgid "Local views"
-msgstr "Viste locali"
-
-#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:770
-msgid "Page notice"
-msgstr "Pagina messaggio"
-
-#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:874
-msgid "Secondary site navigation"
-msgstr "Esplorazione secondaria del sito"
+#: lib/action.php:607
+#, fuzzy
+msgid "Search the site"
+msgstr "Cerca nel sito"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:880
+#: lib/action.php:864
 msgid "Help"
 msgstr "Aiuto"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:883
+#: lib/action.php:867
 msgid "About"
 msgstr "Informazioni"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:886
+#: lib/action.php:870
 msgid "FAQ"
 msgstr "FAQ"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:891
+#: lib/action.php:875
 msgid "TOS"
 msgstr "TOS"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:895
+#: lib/action.php:879
 msgid "Privacy"
 msgstr "Privacy"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:898
+#: lib/action.php:882
 msgid "Source"
 msgstr "Sorgenti"
 
 #. TRANS: Secondary navigation menu option leading to e-mail contact information on the
 #. TRANS: StatusNet site, where to report bugs, ...
-#: lib/action.php:905
+#: lib/action.php:889
 msgid "Contact"
 msgstr "Contatti"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:908
+#: lib/action.php:892
 msgid "Badge"
 msgstr "Badge"
 
-#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:937
-msgid "StatusNet software license"
-msgstr "Licenza del software StatusNet"
-
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:944
+#: lib/action.php:921
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7393,7 +7464,7 @@ msgstr ""
 "(%%site.broughtbyurl%%)."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:947
+#: lib/action.php:924
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** è un servizio di microblog."
@@ -7402,7 +7473,7 @@ msgstr "**%%site.name%%** è un servizio di microblog."
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:954
+#: lib/action.php:931
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7413,28 +7484,23 @@ msgstr ""
 "s, disponibile nei termini della licenza [GNU Affero General Public License]"
 "(http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
 
-#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:970
-msgid "Site content license"
-msgstr "Licenza del contenuto del sito"
-
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:977
+#: lib/action.php:949
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr "I contenuti e i dati di %1$s sono privati e confidenziali."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:984
+#: lib/action.php:956
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
 "I contenuti e i dati sono copyright di %1$s. Tutti i diritti riservati."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:988
+#: lib/action.php:960
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 "I contenuti e i dati sono forniti dai collaboratori. Tutti i diritti "
@@ -7442,27 +7508,22 @@ msgstr ""
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:1020
+#: lib/action.php:992
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
 "Tutti i contenuti e i dati di %1$s sono disponibili nei termini della "
 "licenza %2$s."
 
-#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1356
-msgid "Pagination"
-msgstr "Paginazione"
-
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1367
+#: lib/action.php:1335
 msgid "After"
 msgstr "Successivi"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1377
+#: lib/action.php:1345
 msgid "Before"
 msgstr "Precedenti"
 
@@ -7616,7 +7677,7 @@ msgid "User configuration"
 msgstr "Configurazione utente"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:122
+#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:110
 msgid "User"
 msgstr "Utente"
 
@@ -7640,6 +7701,11 @@ msgstr "Configurazione sessioni"
 msgid "Edit site notice"
 msgstr "Modifica messaggio del sito"
 
+#. TRANS: Menu item for site administration
+#: lib/adminpanelaction.php:387
+msgid "Site notice"
+msgstr "Messaggio del sito"
+
 #. TRANS: Menu item title/tooltip
 #: lib/adminpanelaction.php:393
 msgid "Snapshots configuration"
@@ -7650,6 +7716,12 @@ msgstr "Configurazione snapshot"
 msgid "Set site license"
 msgstr "Imposta licenza"
 
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:409
+#, fuzzy
+msgid "Plugins configuration"
+msgstr "Configurazione percorsi"
+
 #. TRANS: Client error 401.
 #: lib/apiauth.php:111
 msgid "API resource requires read-write access, but you only have read access."
@@ -7662,19 +7734,23 @@ msgstr ""
 msgid "No application for that consumer key."
 msgstr "Nessuna applicazione per quella chiave."
 
+#: lib/apiauth.php:202 lib/apiauth.php:284
+msgid "Not allowed to use API."
+msgstr ""
+
 #. TRANS: OAuth exception given when an incorrect access token was given for a user.
-#: lib/apiauth.php:219
+#: lib/apiauth.php:225
 msgid "Bad access token."
 msgstr "Token di accesso errato."
 
 #. TRANS: OAuth exception given when no user was found for a given token (no token was found).
-#: lib/apiauth.php:224
+#: lib/apiauth.php:230
 msgid "No user for that token."
 msgstr "Nessun utente per quel token."
 
 #. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel".
 #. TRANS: Client error thrown when authentication fails.
-#: lib/apiauth.php:266 lib/apiauth.php:293
+#: lib/apiauth.php:272 lib/apiauth.php:302
 msgid "Could not authenticate you."
 msgstr "Impossibile autenticarti."
 
@@ -7721,6 +7797,11 @@ msgstr "Tentativo di revocare un token sconosciuto."
 msgid "Failed to delete revoked token."
 msgstr "Eliminazione del token revocato non riuscita."
 
+#. TRANS: Form input field label for application icon.
+#: lib/applicationeditform.php:177
+msgid "Icon"
+msgstr "Icona"
+
 #. TRANS: Form guide.
 #: lib/applicationeditform.php:182
 msgid "Icon for this application"
@@ -7755,6 +7836,11 @@ msgstr "URL sorgente"
 msgid "Organization responsible for this application"
 msgstr "Organizzazione responsabile per questa applicazione"
 
+#. TRANS: Form input field label.
+#: lib/applicationeditform.php:227
+msgid "Organization"
+msgstr "Organizzazione"
+
 #. TRANS: Form input field instructions.
 #: lib/applicationeditform.php:234
 msgid "URL for the homepage of the organization"
@@ -7845,16 +7931,6 @@ msgstr "L'elemento author deve contenere un elemento name."
 msgid "Do not use this method!"
 msgstr "Non eliminare il messaggio"
 
-#. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:293
-msgid "Author"
-msgstr "Autore"
-
-#. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:307
-msgid "Provider"
-msgstr "Provider"
-
 #. TRANS: Title.
 #: lib/attachmentnoticesection.php:67
 msgid "Notices where this attachment appears"
@@ -7882,24 +7958,29 @@ msgstr "La modifica della password non è permessa"
 msgid "Block"
 msgstr "Blocca"
 
+#. TRANS: Description of the form to block a user.
+#: lib/blockform.php:79
+msgid "Block this user"
+msgstr "Blocca questo utente"
+
 #. TRANS: Title for command results.
-#: lib/channel.php:160 lib/channel.php:181
+#: lib/channel.php:104 lib/channel.php:125
 msgid "Command results"
 msgstr "Risultati comando"
 
 #. TRANS: Title for command results.
-#: lib/channel.php:194
+#: lib/channel.php:138
 #, fuzzy
 msgid "AJAX error"
 msgstr "Errore di Ajax"
 
 #. TRANS: E-mail subject when a command has completed.
-#: lib/channel.php:233 lib/mailhandler.php:143
+#: lib/channel.php:177 lib/mailhandler.php:143
 msgid "Command complete"
 msgstr "Comando completato"
 
 #. TRANS: E-mail subject when a command has failed.
-#: lib/channel.php:244
+#: lib/channel.php:188
 msgid "Command failed"
 msgstr "Comando non riuscito"
 
@@ -8002,7 +8083,7 @@ msgstr "Nome completo: %s"
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a location.
-#: lib/command.php:446 lib/mail.php:270
+#: lib/command.php:446 lib/mail.php:275
 #, php-format
 msgid "Location: %s"
 msgstr "Posizione: %s"
@@ -8010,7 +8091,7 @@ msgstr "Posizione: %s"
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a homepage.
-#: lib/command.php:450 lib/mail.php:274
+#: lib/command.php:450 lib/mail.php:279
 #, php-format
 msgid "Homepage: %s"
 msgstr "Pagina web: %s"
@@ -8284,20 +8365,20 @@ msgstr ""
 "tracking - non ancora implementato\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:162
+#: lib/common.php:36
 #, fuzzy
 msgid "No configuration file found."
 msgstr "Non è stato trovato alcun file di configurazione. "
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:165
+#: lib/common.php:39
 #, fuzzy
 msgid "I looked for configuration files in the following places:"
 msgstr "I file di configurazione sono stati cercati in questi posti: "
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:168
+#: lib/common.php:42
 msgid "You may wish to run the installer to fix this."
 msgstr ""
 "Potrebbe essere necessario lanciare il programma d'installazione per "
@@ -8305,96 +8386,86 @@ msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:172
+#: lib/common.php:46
 msgid "Go to the installer."
 msgstr "Vai al programma d'installazione."
 
-#. TRANS: Menu item for Instant Messaging settings.
-#: lib/connectsettingsaction.php:106
-#, fuzzy
-msgctxt "MENU"
-msgid "IM"
-msgstr "MI"
-
-#. TRANS: Tooltip for Instant Messaging menu item.
-#: lib/connectsettingsaction.php:108
-msgid "Updates by instant messenger (IM)"
-msgstr "Messaggi via messaggistica istantanea (MI)"
-
-#. TRANS: Menu item for Short Message Service settings.
-#: lib/connectsettingsaction.php:113
-#, fuzzy
-msgctxt "MENU"
-msgid "SMS"
-msgstr "SMS"
-
-#. TRANS: Tooltip for Short Message Service menu item.
-#: lib/connectsettingsaction.php:115
-msgid "Updates by SMS"
-msgstr "Messaggi via SMS"
-
-#. TRANS: Menu item for OuAth connection settings.
-#: lib/connectsettingsaction.php:120
-#, fuzzy
-msgctxt "MENU"
-msgid "Connections"
-msgstr "Connessioni"
-
-#. TRANS: Tooltip for connected applications (Connections through OAuth) menu item.
-#: lib/connectsettingsaction.php:122
-msgid "Authorized connected applications"
-msgstr "Applicazioni collegate autorizzate"
-
 #: lib/dberroraction.php:59
 msgid "Database error"
 msgstr "Errore del database"
 
+#. TRANS: Description of form for deleting a user.
+#: lib/deleteuserform.php:75
+msgid "Delete this user"
+msgstr "Elimina questo utente"
+
+#: lib/designform.php:114
+#, fuzzy
+msgid "Change design"
+msgstr "Salva aspetto"
+
+#. TRANS: Fieldset legend on profile design page to change profile page colours.
+#: lib/designform.php:131
+msgid "Change colours"
+msgstr "Modifica colori"
+
+#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
+#: lib/designform.php:138
+msgid "Use defaults"
+msgstr "Usa predefiniti"
+
+#. TRANS: Title for button on profile design page to reset all colour settings to default.
+#: lib/designform.php:140
+msgid "Restore default designs"
+msgstr "Ripristina i valori predefiniti"
+
+#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
+#: lib/designform.php:148
+msgid "Reset back to default"
+msgstr "Reimposta i valori predefiniti"
+
 #. TRANS: Label in form on profile design page.
 #. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
-#: lib/designsettings.php:108
+#: lib/designform.php:158
 msgid "Upload file"
 msgstr "Carica file"
 
 #. TRANS: Instructions for form on profile design page.
-#: lib/designsettings.php:113
+#: lib/designform.php:163
+#, fuzzy
 msgid ""
-"You can upload your personal background image. The maximum file size is 2MB."
+"You can upload your personal background image. The maximum file size is 2Mb."
 msgstr ""
 "Puoi caricare la tua immagine di sfondo. La dimensione massima del file è di "
 "2MB."
 
 #. TRANS: Radio button on profile design page that will enable use of the uploaded profile image.
-#: lib/designsettings.php:139
+#: lib/designform.php:194
 #, fuzzy
 msgctxt "RADIO"
 msgid "On"
 msgstr "On"
 
 #. TRANS: Radio button on profile design page that will disable use of the uploaded profile image.
-#: lib/designsettings.php:156
+#: lib/designform.php:211
 #, fuzzy
 msgctxt "RADIO"
 msgid "Off"
 msgstr "Off"
 
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: lib/designsettings.php:175
-msgid "Change colours"
-msgstr "Modifica colori"
-
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: lib/designsettings.php:257
-msgid "Use defaults"
-msgstr "Usa predefiniti"
+#. TRANS: Title for button on profile design page to save settings.
+#: lib/designform.php:322
+msgid "Save design"
+msgstr "Salva aspetto"
 
 #. TRANS: Error message displayed if design settings could not be saved.
 #. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
-#: lib/designsettings.php:405 lib/designsettings.php:427
+#: lib/designsettings.php:216 lib/designsettings.php:238
 msgid "Couldn't update your design."
 msgstr "Impossibile aggiornare l'aspetto."
 
 #. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
-#: lib/designsettings.php:433
+#: lib/designsettings.php:244
 msgid "Design defaults restored."
 msgstr "Valori predefiniti ripristinati."
 
@@ -8464,27 +8535,23 @@ msgstr ""
 msgid "Feeds"
 msgstr "Feed"
 
-#: lib/galleryaction.php:121
-msgid "Filter tags"
-msgstr "Filtra etichette"
-
-#: lib/galleryaction.php:131
+#: lib/galleryaction.php:128
 msgid "All"
 msgstr "Tutto"
 
-#: lib/galleryaction.php:139
+#: lib/galleryaction.php:136
 msgid "Select tag to filter"
 msgstr "Seleziona un'etichetta da filtrare"
 
-#: lib/galleryaction.php:140
+#: lib/galleryaction.php:137
 msgid "Tag"
 msgstr "Etichetta"
 
-#: lib/galleryaction.php:141
+#: lib/galleryaction.php:138
 msgid "Choose a tag to narrow list"
 msgstr "Scegli un'etichetta per ridurre l'elenco"
 
-#: lib/galleryaction.php:143
+#: lib/galleryaction.php:140
 msgid "Go"
 msgstr "Vai"
 
@@ -8575,6 +8642,12 @@ msgctxt "TOOLTIP"
 msgid "%s blocked users"
 msgstr "Utenti bloccati di %s"
 
+#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
+#: lib/groupnav.php:117
+msgctxt "MENU"
+msgid "Admin"
+msgstr "Amministra"
+
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
 #: lib/groupnav.php:120
@@ -8684,39 +8757,61 @@ msgid_plural "%dB"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/jabber.php:387
+#: lib/implugin.php:262
 #, php-format
-msgid "[%s]"
-msgstr "[%s]"
+msgid ""
+"User \"%s\" on %s has said that your %s screenname belongs to them. If "
+"that's true, you can confirm by clicking on this URL: %s . (If you cannot "
+"click it, copy-and-paste it into the address bar of your browser). If that "
+"user isn't you, or if you didn't request this confirmation, just ignore this "
+"message."
+msgstr ""
 
-#: lib/jabber.php:567
+#: lib/implugin.php:349
 #, php-format
 msgid "Unknown inbox source %d."
 msgstr "Sorgente casella in arrivo %d sconosciuta."
 
+#: lib/implugin.php:485
+#, fuzzy, php-format
+msgid "Message too long - maximum is %1$d characters, you sent %2$d."
+msgstr "Messaggio troppo lungo: massimo %1$d caratteri, inviati %2$d."
+
 #: lib/leaveform.php:114
 msgid "Leave"
 msgstr "Lascia"
 
+#. TRANS: Menu item for logging in to the StatusNet site.
+#: lib/logingroupnav.php:77
+msgctxt "MENU"
+msgid "Login"
+msgstr "Accedi"
+
 #. TRANS: Title for menu item for logging in to the StatusNet site.
 #: lib/logingroupnav.php:79
 msgid "Login with a username and password"
 msgstr "Accedi con nome utente e password"
 
+#. TRANS: Menu item for registering with the StatusNet site.
+#: lib/logingroupnav.php:85
+msgctxt "MENU"
+msgid "Register"
+msgstr "Registrati"
+
 #. TRANS: Title for menu item for registering with the StatusNet site.
 #: lib/logingroupnav.php:87
 msgid "Sign up for a new account"
 msgstr "Iscriviti per un nuovo account"
 
 #. TRANS: Subject for address confirmation email.
-#: lib/mail.php:168
+#: lib/mail.php:172
 msgid "Email address confirmation"
 msgstr "Conferma indirizzo email"
 
 #. TRANS: Body for address confirmation email.
 #. TRANS: %1$s is the addressed user's nickname, %2$s is the StatusNet sitename,
 #. TRANS: %3$s is the URL to confirm at.
-#: lib/mail.php:173
+#: lib/mail.php:177
 #, fuzzy, php-format
 msgid ""
 "Hey, %1$s.\n"
@@ -8748,14 +8843,14 @@ msgstr ""
 
 #. TRANS: Subject of new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
-#: lib/mail.php:238
+#: lib/mail.php:243
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1$s sta ora seguendo i tuoi messaggi su %2$s."
 
 #. TRANS: This is a paragraph in a new-subscriber e-mail.
 #. TRANS: %s is a URL where the subscriber can be reported as abusive.
-#: lib/mail.php:245
+#: lib/mail.php:250
 #, php-format
 msgid ""
 "If you believe this account is being used abusively, you can block them from "
@@ -8770,7 +8865,7 @@ msgstr ""
 #. TRANS: %3$s is the subscriber's profile URL, %4$s is the subscriber's location (or empty)
 #. TRANS: %5$s is the subscriber's homepage URL (or empty), %6%s is the subscriber's bio (or empty)
 #. TRANS: %7$s is a link to the addressed user's e-mail settings.
-#: lib/mail.php:255
+#: lib/mail.php:260
 #, fuzzy, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -8797,14 +8892,14 @@ msgstr ""
 
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is biographical information.
-#: lib/mail.php:278
+#: lib/mail.php:283
 #, php-format
 msgid "Bio: %s"
 msgstr "Biografia: %s"
 
 #. TRANS: Subject of notification mail for new posting email address.
 #. TRANS: %s is the StatusNet sitename.
-#: lib/mail.php:307
+#: lib/mail.php:312
 #, php-format
 msgid "New email address for posting to %s"
 msgstr "Nuovo indirizzo email per inviare messaggi a %s"
@@ -8812,7 +8907,7 @@ msgstr "Nuovo indirizzo email per inviare messaggi a %s"
 #. TRANS: Body of notification mail for new posting email address.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is the e-mail address to send
 #. TRANS: to to post by e-mail, %3$s is a URL to more instructions.
-#: lib/mail.php:313
+#: lib/mail.php:318
 #, fuzzy, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -8835,19 +8930,19 @@ msgstr ""
 
 #. TRANS: Subject line for SMS-by-email notification messages.
 #. TRANS: %s is the posting user's nickname.
-#: lib/mail.php:434
+#: lib/mail.php:439
 #, php-format
 msgid "%s status"
 msgstr "stato di %s"
 
 #. TRANS: Subject line for SMS-by-email address confirmation message.
-#: lib/mail.php:460
+#: lib/mail.php:465
 msgid "SMS confirmation"
 msgstr "Conferma SMS"
 
 #. TRANS: Main body heading for SMS-by-email address confirmation message.
 #. TRANS: %s is the addressed user's nickname.
-#: lib/mail.php:464
+#: lib/mail.php:469
 #, php-format
 msgid "%s: confirm you own this phone number with this code:"
 msgstr ""
@@ -8855,7 +8950,7 @@ msgstr ""
 
 #. TRANS: Subject for 'nudge' notification email.
 #. TRANS: %s is the nudging user.
-#: lib/mail.php:485
+#: lib/mail.php:490
 #, fuzzy, php-format
 msgid "You have been nudged by %s"
 msgstr "%s ti ha richiamato"
@@ -8863,7 +8958,7 @@ msgstr "%s ti ha richiamato"
 #. TRANS: Body for 'nudge' notification email.
 #. TRANS: %1$s is the nuding user's long name, $2$s is the nudging user's nickname,
 #. TRANS: %3$s is a URL to post notices at, %4$s is the StatusNet sitename.
-#: lib/mail.php:492
+#: lib/mail.php:497
 #, php-format
 msgid ""
 "%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -8892,7 +8987,7 @@ msgstr ""
 
 #. TRANS: Subject for direct-message notification email.
 #. TRANS: %s is the sending user's nickname.
-#: lib/mail.php:539
+#: lib/mail.php:544
 #, php-format
 msgid "New private message from %s"
 msgstr "Nuovo messaggio privato da %s"
@@ -8901,7 +8996,7 @@ msgstr "Nuovo messaggio privato da %s"
 #. TRANS: %1$s is the sending user's long name, %2$s is the sending user's nickname,
 #. TRANS: %3$s is the message content, %4$s a URL to the message,
 #. TRANS: %5$s is the StatusNet sitename.
-#: lib/mail.php:547
+#: lib/mail.php:552
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -8936,7 +9031,7 @@ msgstr ""
 
 #. TRANS: Subject for favorite notification e-mail.
 #. TRANS: %1$s is the adding user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:599
+#: lib/mail.php:604
 #, fuzzy, php-format
 msgid "%1$s (@%2$s) added your notice as a favorite"
 msgstr "%s (@%s) ha aggiunto il tuo messaggio tra i suoi preferiti"
@@ -8946,7 +9041,7 @@ msgstr "%s (@%s) ha aggiunto il tuo messaggio tra i suoi preferiti"
 #. TRANS: %3$s is a URL to the faved notice, %4$s is the faved notice text,
 #. TRANS: %5$s is a URL to all faves of the adding user, %6$s is the StatusNet sitename,
 #. TRANS: %7$s is the adding user's nickname.
-#: lib/mail.php:606
+#: lib/mail.php:611
 #, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -8985,7 +9080,7 @@ msgstr ""
 "%6$s\n"
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:664
+#: lib/mail.php:669
 #, php-format
 msgid ""
 "The full conversation can be read here:\n"
@@ -8998,7 +9093,7 @@ msgstr ""
 
 #. TRANS: E-mail subject for notice notification.
 #. TRANS: %1$s is the sending user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:672
+#: lib/mail.php:677
 #, fuzzy, php-format
 msgid "%1$s (@%2$s) sent a notice to your attention"
 msgstr "%s (@%s) ti ha inviato un messaggio"
@@ -9009,7 +9104,7 @@ msgstr "%s (@%s) ti ha inviato un messaggio"
 #. TRANS: %5$s is a URL to the full conversion if it exists (otherwise empty),
 #. TRANS: %6$s is a URL to reply to the notice, %7$s is a URL to all @-replied for the addressed user,
 #. TRANS: %8$s is a URL to the addressed user's e-mail settings, %9$s is the sender's nickname.
-#: lib/mail.php:680
+#: lib/mail.php:685
 #, php-format
 msgid ""
 "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -9155,11 +9250,7 @@ msgstr "Non hai l'abbonamento!"
 msgid "To"
 msgstr "A"
 
-#: lib/messageform.php:166 lib/noticeform.php:186
-msgid "Available characters"
-msgstr "Caratteri disponibili"
-
-#: lib/messageform.php:185 lib/noticeform.php:237
+#: lib/messageform.php:184 lib/noticeform.php:236
 msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr "Invia"
@@ -9169,17 +9260,10 @@ msgstr "Invia"
 msgid "Messages"
 msgstr "Messaggio"
 
-#: lib/messagelistitem.php:123 lib/noticelist.php:522
+#: lib/messagelistitem.php:123 lib/noticelist.php:527
 msgid "from"
 msgstr "via"
 
-#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:165
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr ""
-"Il soprannome deve essere composto solo da lettere minuscole e numeri, senza "
-"spazi."
-
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 #: lib/nickname.php:178
 msgid "Nickname cannot be empty."
@@ -9202,23 +9286,23 @@ msgstr "Invia un messaggio"
 msgid "What's up, %s?"
 msgstr "Cosa succede, %s?"
 
-#: lib/noticeform.php:194
+#: lib/noticeform.php:193
 msgid "Attach"
 msgstr "Allega"
 
-#: lib/noticeform.php:198
+#: lib/noticeform.php:197
 msgid "Attach a file"
 msgstr "Allega un file"
 
-#: lib/noticeform.php:213
+#: lib/noticeform.php:212
 msgid "Share my location"
 msgstr "Condividi la mia posizione"
 
-#: lib/noticeform.php:216
+#: lib/noticeform.php:215
 msgid "Do not share my location"
 msgstr "Non condividere la mia posizione"
 
-#: lib/noticeform.php:217
+#: lib/noticeform.php:216
 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
 "try again later"
@@ -9227,55 +9311,59 @@ msgstr ""
 "previsto. Riprova più tardi."
 
 #. TRANS: Used in coordinates as abbreviation of north
-#: lib/noticelist.php:452
+#: lib/noticelist.php:457
 msgid "N"
 msgstr "N"
 
 #. TRANS: Used in coordinates as abbreviation of south
-#: lib/noticelist.php:454
+#: lib/noticelist.php:459
 msgid "S"
 msgstr "S"
 
 #. TRANS: Used in coordinates as abbreviation of east
-#: lib/noticelist.php:456
+#: lib/noticelist.php:461
 msgid "E"
 msgstr "E"
 
 #. TRANS: Used in coordinates as abbreviation of west
-#: lib/noticelist.php:458
+#: lib/noticelist.php:463
 msgid "W"
 msgstr "O"
 
-#: lib/noticelist.php:460
+#: lib/noticelist.php:465
 #, php-format
 msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 
-#: lib/noticelist.php:469
+#: lib/noticelist.php:474
 msgid "at"
 msgstr "presso"
 
-#: lib/noticelist.php:518
+#: lib/noticelist.php:523
 msgid "web"
 msgstr "web"
 
-#: lib/noticelist.php:584
+#: lib/noticelist.php:589
 msgid "in context"
 msgstr "in una discussione"
 
-#: lib/noticelist.php:619
+#: lib/noticelist.php:624
 msgid "Repeated by"
 msgstr "Ripetuto da"
 
-#: lib/noticelist.php:646
+#: lib/noticelist.php:651
 msgid "Reply to this notice"
 msgstr "Rispondi a questo messaggio"
 
-#: lib/noticelist.php:647
+#: lib/noticelist.php:652
 msgid "Reply"
 msgstr "Rispondi"
 
-#: lib/noticelist.php:691
+#: lib/noticelist.php:678
+msgid "Delete this notice"
+msgstr "Elimina questo messaggio"
+
+#: lib/noticelist.php:696
 msgid "Notice repeated"
 msgstr "Messaggio ripetuto"
 
@@ -9312,48 +9400,31 @@ msgstr "Messaggio duplicato."
 msgid "Couldn't insert new subscription."
 msgstr "Impossibile inserire un nuovo abbonamento."
 
-#. TRANS: Personal group navigation menu option when logged in for viewing @-replies.
-#: lib/personalgroupnav.php:107
+#: lib/personalgroupnav.php:104
 #, fuzzy
-msgctxt "MENU"
 msgid "Replies"
 msgstr "Risposte"
 
-#. TRANS: Personal group navigation menu option when logged in for seeing own profile.
-#: lib/personalgroupnav.php:114
+#: lib/personalgroupnav.php:109
 #, fuzzy
-msgctxt "MENU"
-msgid "Profile"
-msgstr "Profilo"
-
-#. TRANS: Personal group navigation menu option when logged in for viewing own favourited notices.
-#: lib/personalgroupnav.php:120
-#, fuzzy
-msgctxt "MENU"
 msgid "Favorites"
 msgstr "Preferiti"
 
-#. TRANS: Personal group navigation menu option when logged in for viewing recieved personal messages.
-#: lib/personalgroupnav.php:133
+#: lib/personalgroupnav.php:120
 #, fuzzy
-msgctxt "MENU"
 msgid "Inbox"
 msgstr "In arrivo"
 
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing recieved personal messages.
-#: lib/personalgroupnav.php:135
+#: lib/personalgroupnav.php:121
 msgid "Your incoming messages"
 msgstr "I tuoi messaggi in arrivo"
 
-#. TRANS: Personal group navigation menu option when logged in for viewing senet personal messages.
-#: lib/personalgroupnav.php:140
+#: lib/personalgroupnav.php:125
 #, fuzzy
-msgctxt "MENU"
 msgid "Outbox"
 msgstr "Inviati"
 
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing senet personal messages.
-#: lib/personalgroupnav.php:142
+#: lib/personalgroupnav.php:126
 msgid "Your sent messages"
 msgstr "I tuoi messaggi inviati"
 
@@ -9368,9 +9439,26 @@ msgstr "Etichette nei messaggi di %s"
 msgid "Unknown"
 msgstr "Sconosciuto"
 
+#. TRANS: Plugin admin panel controls
+#: lib/plugindisableform.php:90
+msgctxt "plugin"
+msgid "Disable"
+msgstr ""
+
+#. TRANS: Plugin admin panel controls
+#: lib/pluginenableform.php:112
+msgctxt "plugin"
+msgid "Enable"
+msgstr ""
+
+#: lib/pluginlist.php:196
+msgctxt "plugin-description"
+msgid "(Plugin descriptions unavailable when disabled.)"
+msgstr ""
+
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:82
+#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:88
 msgid "Subscriptions"
 msgstr "Abbonamenti"
 
@@ -9381,7 +9469,7 @@ msgstr "Tutti gli abbonamenti"
 
 #. TRANS: H2 text for user subscriber statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:90
+#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:96
 msgid "Subscribers"
 msgstr "Abbonati"
 
@@ -9403,7 +9491,7 @@ msgstr "Membro dal"
 #. TRANS: Label for user statistics.
 #. TRANS: H2 text for user group membership statistics.
 #: lib/profileaction.php:239 lib/profileaction.php:290
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:104
 msgid "Groups"
 msgstr "Gruppi"
 
@@ -9423,10 +9511,6 @@ msgstr "Tutti i gruppi"
 msgid "Unimplemented method."
 msgstr "Metodo non implementato"
 
-#: lib/publicgroupnav.php:78
-msgid "Public"
-msgstr "Pubblico"
-
 #: lib/publicgroupnav.php:82
 msgid "User groups"
 msgstr "Gruppi dell'utente"
@@ -9465,7 +9549,7 @@ msgid "Revoke the \"%s\" role from this user"
 msgstr "Revoca il ruolo \"%s\" a questo utente"
 
 #. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:974
+#: lib/router.php:1001
 #, fuzzy
 msgid "Page not found."
 msgstr "Metodo delle API non trovato."
@@ -9495,11 +9579,6 @@ msgctxt "BUTTON"
 msgid "Search"
 msgstr "Cerca"
 
-#. TRANS: Definition list item with instructions on how to get (better) search results.
-#: lib/searchaction.php:170
-msgid "Search help"
-msgstr "Aiuto sulla ricerca"
-
 #: lib/searchgroupnav.php:80
 msgid "People"
 msgstr "Persone"
@@ -9524,6 +9603,51 @@ msgstr "Sezione senza nome"
 msgid "More..."
 msgstr "Altro..."
 
+#: lib/settingsnav.php:78
+msgid "Change your profile settings"
+msgstr "Modifica le impostazioni del tuo profilo"
+
+#: lib/settingsnav.php:83
+msgid "Upload an avatar"
+msgstr "Carica un'immagine"
+
+#: lib/settingsnav.php:88
+msgid "Change your password"
+msgstr "Modifica la tua password"
+
+#: lib/settingsnav.php:93
+msgid "Change email handling"
+msgstr "Modifica la gestione dell'email"
+
+#: lib/settingsnav.php:98
+msgid "Design your profile"
+msgstr "Progetta il tuo profilo"
+
+#: lib/settingsnav.php:102
+msgid "URL"
+msgstr "URL"
+
+#: lib/settingsnav.php:103
+msgid "URL shorteners"
+msgstr ""
+
+#: lib/settingsnav.php:111
+msgid "Updates by instant messenger (IM)"
+msgstr "Messaggi via messaggistica istantanea (MI)"
+
+#: lib/settingsnav.php:118
+msgid "Updates by SMS"
+msgstr "Messaggi via SMS"
+
+#: lib/settingsnav.php:123
+#, fuzzy
+msgid "Connections"
+msgstr "Connessioni"
+
+#: lib/settingsnav.php:124
+msgid "Authorized connected applications"
+msgstr "Applicazioni collegate autorizzate"
+
 #: lib/silenceform.php:67
 msgid "Silence"
 msgstr "Zittisci"
@@ -9532,30 +9656,34 @@ msgstr "Zittisci"
 msgid "Silence this user"
 msgstr "Zittisci questo utente"
 
-#: lib/subgroupnav.php:83
+#: lib/subgroupnav.php:89
 #, php-format
 msgid "People %s subscribes to"
 msgstr "Persone di cui %s ha un abbonamento"
 
-#: lib/subgroupnav.php:91
+#: lib/subgroupnav.php:97
 #, php-format
 msgid "People subscribed to %s"
 msgstr "Persone abbonate a %s"
 
-#: lib/subgroupnav.php:99
+#: lib/subgroupnav.php:105
 #, php-format
 msgid "Groups %s is a member of"
 msgstr "Gruppi di cui %s fa parte"
 
-#: lib/subgroupnav.php:105
+#: lib/subgroupnav.php:111
 msgid "Invite"
 msgstr "Invita"
 
-#: lib/subgroupnav.php:106
+#: lib/subgroupnav.php:112
 #, php-format
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Invita amici e colleghi a seguirti su %s"
 
+#: lib/subscribeform.php:115 lib/subscribeform.php:139
+msgid "Subscribe to this user"
+msgstr "Abbonati a questo utente"
+
 #: lib/subscriberspeopleselftagcloudsection.php:48
 #: lib/subscriptionspeopleselftagcloudsection.php:48
 msgid "People Tagcloud as self-tagged"
@@ -9631,6 +9759,13 @@ msgstr "Il tema contiene file di tipo \".%s\" che non sono supportati."
 msgid "Error opening theme archive."
 msgstr "Errore nell'aprire il file del tema."
 
+#: lib/threadednoticelist.php:270
+#, php-format
+msgid "Show all %d comment"
+msgid_plural "Show all %d comments"
+msgstr[0] ""
+msgstr[1] ""
+
 #: lib/topposterssection.php:74
 msgid "Top posters"
 msgstr "Chi scrive più messaggi"
@@ -9673,76 +9808,80 @@ msgstr "Disabbonati"
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "L'utente non ha un profilo."
 
-#. TRANS: Link text for changeing the avatar of the logged in user.
-#: lib/userprofile.php:121
+#: lib/userprofile.php:116
 msgid "Edit Avatar"
 msgstr "Modifica immagine"
 
 #. TRANS: H2 for user actions in a profile.
 #. TRANS: H2 for entity actions in a profile.
-#: lib/userprofile.php:245 lib/userprofile.php:261
+#: lib/userprofile.php:216 lib/userprofile.php:232
 msgid "User actions"
 msgstr "Azioni utente"
 
 #. TRANS: Text shown in user profile of not yet compeltely deleted users.
-#: lib/userprofile.php:249
+#: lib/userprofile.php:220
 msgid "User deletion in progress..."
 msgstr "Eliminazione utente..."
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:277
+#: lib/userprofile.php:248
 msgid "Edit profile settings"
 msgstr "Modifica impostazioni del profilo"
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:279
+#: lib/userprofile.php:250
 msgid "Edit"
 msgstr "Modifica"
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:303
+#: lib/userprofile.php:274
 msgid "Send a direct message to this user"
 msgstr "Invia un messaggio diretto a questo utente"
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:305
+#: lib/userprofile.php:276
 msgid "Message"
 msgstr "Messaggio"
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:347
+#: lib/userprofile.php:318
 msgid "Moderate"
 msgstr "Modera"
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:386
+#: lib/userprofile.php:357
 msgid "User role"
 msgstr "Ruolo dell'utente"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:389
+#: lib/userprofile.php:360
 msgctxt "role"
 msgid "Administrator"
 msgstr "Amministratore"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:391
+#: lib/userprofile.php:362
 msgctxt "role"
 msgid "Moderator"
 msgstr "Moderatore"
 
+#: lib/util.php:321
+#, fuzzy
+msgid "Not allowed to log in."
+msgstr "Accesso non effettuato."
+
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1306
+#: lib/util.php:1337
 msgid "a few seconds ago"
 msgstr "pochi secondi fa"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1309
+#: lib/util.php:1340
 msgid "about a minute ago"
 msgstr "circa un minuto fa"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1313
+#: lib/util.php:1344
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
@@ -9750,12 +9889,12 @@ msgstr[0] "circa un minuto fa"
 msgstr[1] "circa %d minuti fa"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1316
+#: lib/util.php:1347
 msgid "about an hour ago"
 msgstr "circa un'ora fa"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1320
+#: lib/util.php:1351
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
@@ -9763,12 +9902,12 @@ msgstr[0] "circa un'ora fa"
 msgstr[1] "circa %d ore fa"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1323
+#: lib/util.php:1354
 msgid "about a day ago"
 msgstr "circa un giorno fa"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1327
+#: lib/util.php:1358
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
@@ -9776,12 +9915,12 @@ msgstr[0] "circa un giorno fa"
 msgstr[1] "circa %d giorni fa"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1330
+#: lib/util.php:1361
 msgid "about a month ago"
 msgstr "circa un mese fa"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1334
+#: lib/util.php:1365
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
@@ -9789,7 +9928,7 @@ msgstr[0] "circa un mese fa"
 msgstr[1] "circa %d mesi fa"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1337
+#: lib/util.php:1368
 msgid "about a year ago"
 msgstr "circa un anno fa"
 
@@ -9800,21 +9939,6 @@ msgstr "circa un anno fa"
 msgid "%s is not a valid color! Use 3 or 6 hex characters."
 msgstr "%s non è un colore valido. Usa 3 o 6 caratteri esadecimali."
 
-#. TRANS: %s is the URL to the StatusNet site's Instant Messaging settings.
-#: lib/xmppmanager.php:287
-#, php-format
-msgid "Unknown user. Go to %s to add your address to your account"
-msgstr ""
-
-#. TRANS: Response to XMPP source when it sent too long a message.
-#. TRANS: %1$d the maximum number of allowed characters (used for plural), %2$d is the sent number.
-#: lib/xmppmanager.php:406
-#, fuzzy, php-format
-msgid "Message too long. Maximum is %1$d character, you sent %2$d."
-msgid_plural "Message too long. Maximum is %1$d characters, you sent %2$d."
-msgstr[0] "Messaggio troppo lungo: massimo %1$d caratteri, inviati %2$d."
-msgstr[1] "Messaggio troppo lungo: massimo %1$d caratteri, inviati %2$d."
-
 #. TRANS: Exception.
 #: lib/xrd.php:63
 #, fuzzy
@@ -9833,73 +9957,177 @@ msgid "Getting backup from file '%s'."
 msgstr ""
 
 #, fuzzy
-#~ msgid "Block this user."
-#~ msgstr "Blocca questo utente"
+#~ msgid "Could not generate feed for group - %s"
+#~ msgstr "Impossibile aggiornare il gruppo."
 
 #, fuzzy
-#~ msgid "Delete this notice."
-#~ msgstr "Elimina questo messaggio"
-
-#, fuzzy
-#~ msgid "Delete this user."
-#~ msgstr "Elimina questo utente"
-
-#, fuzzy
-#~ msgid "Restore default designs."
-#~ msgstr "Ripristina i valori predefiniti"
-
-#, fuzzy
-#~ msgid "Reset back to default."
-#~ msgstr "Reimposta i valori predefiniti"
-
-#, fuzzy
-#~ msgid "Save design."
-#~ msgstr "Salva aspetto"
-
-#, fuzzy
-#~ msgid "Disfavor favorite."
-#~ msgstr "Rimuovi preferito"
-
-#, fuzzy
-#~ msgid "\"%s\" not found."
-#~ msgstr "Metodo delle API non trovato."
-
-#, fuzzy
-#~ msgid "Notice %s not found."
-#~ msgstr "Metodo delle API non trovato."
-
-#, fuzzy
-#~ msgid "Attachment %s not found."
-#~ msgstr "Destinatario non trovato."
-
-#, fuzzy
-#~ msgid "Invalid tag: \"%s\"."
-#~ msgstr "Etichetta non valida: \"%s\""
-
-#, fuzzy
-#~ msgid "%s updates from everyone."
-#~ msgstr "Aggiornamenti di %s da tutti!"
-
-#, fuzzy
-#~ msgid "Password saved"
-#~ msgstr "Password salvata."
-
-#, fuzzy
-#~ msgid "Where you are, like \"City, State (or Region), Country\"."
-#~ msgstr "Dove ti trovi, tipo \"città, regione, stato\""
-
-#, fuzzy
-#~ msgid "Subscribe to this user."
-#~ msgstr "Abbonati a questo utente"
+#~ msgid "Current confirmed Jabber/Google Talk address."
+#~ msgstr "Indirizzo Jabber/GTalk attualmente confermato."
 
 #, fuzzy
 #~ msgid ""
-#~ "Listenee stream license \"%1$s\" is not compatible with site license \"%2"
-#~ "$s\"."
+#~ "Jabber or Google Talk address, like \"UserName@example.org\". First, make "
+#~ "sure to add %s to your buddy list in your IM client or on Google Talk."
 #~ msgstr ""
-#~ "La licenza \"%1$s\" dello stream di chi ascolti non è compatibile con la "
-#~ "licenza \"%2$s\" di questo sito."
+#~ "Indirizzo Jabber o GTalk nella forma \"nomeutente@example.org\". Per "
+#~ "prima cosa, assicurati di aggiungere %s all'elenco dei contatti nel tuo "
+#~ "programma di messaggistica o su GTalk."
 
 #, fuzzy
-#~ msgid "Not allowed to log in."
-#~ msgstr "Accesso non effettuato."
+#~ msgid "Send me notices through Jabber/Google Talk."
+#~ msgstr "Inviami i messaggi via Jabber/GTalk"
+
+#, fuzzy
+#~ msgid "Publish a MicroID for my Jabber/Google Talk address."
+#~ msgstr "Pubblica un MicroID per il mio indirizzo Jabber/GTalk"
+
+#~ msgid "No Jabber ID."
+#~ msgstr "Nessun ID di Jabber."
+
+#, fuzzy
+#~ msgid "Not a valid Jabber ID."
+#~ msgstr "Non è un ID Jabber valido"
+
+#~ msgid "That is already your Jabber ID."
+#~ msgstr "Quello è già il tuo ID di Jabber."
+
+#~ msgid "That is not your Jabber ID."
+#~ msgstr "Quello non è il tuo ID di Jabber."
+
+#~ msgid "Other settings"
+#~ msgstr "Altre impostazioni"
+
+#~ msgid "Tag cloud"
+#~ msgstr "Insieme delle etichette"
+
+#~ msgid "Consumer key"
+#~ msgstr "Chiave consumatore"
+
+#~ msgid "Consumer secret"
+#~ msgstr "Segreto consumatore"
+
+#~ msgid "Request token URL"
+#~ msgstr "URL token di richiesta"
+
+#~ msgid "Access token URL"
+#~ msgstr "URL token di accesso"
+
+#~ msgid "Authorize URL"
+#~ msgstr "URL di autorizzazione"
+
+#~ msgid "Jabber"
+#~ msgstr "Jabber"
+
+#~ msgid "Photo"
+#~ msgstr "Fotografia"
+
+#~ msgid "Other options"
+#~ msgstr "Altre opzioni"
+
+#~ msgid "Other"
+#~ msgstr "Altro"
+
+#~ msgid "Primary site navigation"
+#~ msgstr "Esplorazione sito primaria"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Personal profile and friends timeline"
+#~ msgstr "Profilo personale e attività degli amici"
+
+#~ msgctxt "MENU"
+#~ msgid "Personal"
+#~ msgstr "Personale"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Change your email, avatar, password, profile"
+#~ msgstr "Modifica la tua email, immagine, password o il tuo profilo"
+
+#~ msgid "Account"
+#~ msgstr "Account"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Connect to services"
+#~ msgstr "Connettiti con altri servizi"
+
+#~ msgid "Connect"
+#~ msgstr "Connetti"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Change site configuration"
+#~ msgstr "Modifica la configurazione del sito"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Invite friends and colleagues to join you on %s"
+#~ msgstr "Invita amici e colleghi a seguirti su %s"
+
+#~ msgctxt "MENU"
+#~ msgid "Invite"
+#~ msgstr "Invita"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Create an account"
+#~ msgstr "Crea un account"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Help me!"
+#~ msgstr "Aiutami!"
+
+#~ msgctxt "MENU"
+#~ msgid "Help"
+#~ msgstr "Aiuto"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Search for people or text"
+#~ msgstr "Cerca persone o del testo"
+
+#~ msgid "Local views"
+#~ msgstr "Viste locali"
+
+#~ msgid "Page notice"
+#~ msgstr "Pagina messaggio"
+
+#~ msgid "Secondary site navigation"
+#~ msgstr "Esplorazione secondaria del sito"
+
+#~ msgid "StatusNet software license"
+#~ msgstr "Licenza del software StatusNet"
+
+#~ msgid "Site content license"
+#~ msgstr "Licenza del contenuto del sito"
+
+#~ msgid "Pagination"
+#~ msgstr "Paginazione"
+
+#~ msgid "Author"
+#~ msgstr "Autore"
+
+#~ msgid "Provider"
+#~ msgstr "Provider"
+
+#, fuzzy
+#~ msgctxt "MENU"
+#~ msgid "SMS"
+#~ msgstr "SMS"
+
+#~ msgid "Filter tags"
+#~ msgstr "Filtra etichette"
+
+#~ msgid "[%s]"
+#~ msgstr "[%s]"
+
+#~ msgid "Available characters"
+#~ msgstr "Caratteri disponibili"
+
+#, fuzzy
+#~ msgctxt "MENU"
+#~ msgid "Profile"
+#~ msgstr "Profilo"
+
+#~ msgid "Search help"
+#~ msgstr "Aiuto sulla ricerca"
+
+#, fuzzy
+#~ msgid "Message too long. Maximum is %1$d character, you sent %2$d."
+#~ msgid_plural "Message too long. Maximum is %1$d characters, you sent %2$d."
+#~ msgstr[0] "Messaggio troppo lungo: massimo %1$d caratteri, inviati %2$d."
+#~ msgstr[1] "Messaggio troppo lungo: massimo %1$d caratteri, inviati %2$d."
diff --git a/locale/ja/LC_MESSAGES/statusnet.po b/locale/ja/LC_MESSAGES/statusnet.po
index 73425f88d7..6647d44952 100644
--- a/locale/ja/LC_MESSAGES/statusnet.po
+++ b/locale/ja/LC_MESSAGES/statusnet.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 15:58+0000\n"
-"PO-Revision-Date: 2011-03-03 16:00:56+0000\n"
+"POT-Creation-Date: 2011-03-03 17:23+0000\n"
+"PO-Revision-Date: 2011-03-03 17:26:09+0000\n"
 "Language-Team: Japanese <http://translatewiki.net/wiki/Portal:ja>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -82,23 +82,23 @@ msgstr "アクセス設定の保存"
 #. TRANS: Tooltip for button to save access settings in site admin panel.
 #. TRANS: Button text for saving theme settings.
 #. TRANS: Button label to save e-mail preferences.
-#. TRANS: Button label to save Instant Messaging preferences.
-#. TRANS: Button text for saving "Other settings" in profile.
+#. TRANS: Button label to save IM preferences.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
 #. TRANS: Button text for saving site notice in admin panel.
 #. TRANS: Button label to save SMS preferences.
 #. TRANS: Save button for settings for a profile in a subscriptions list.
+#. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
 #. TRANS: Button text on profile design page to save settings.
 #: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
-#: actions/emailsettings.php:250 actions/imsettings.php:183
-#: actions/othersettings.php:136 actions/pathsadminpanel.php:512
-#: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
-#: actions/smssettings.php:205 actions/subscriptions.php:259
+#: actions/emailsettings.php:251 actions/imsettings.php:199
+#: actions/pathsadminpanel.php:512 actions/profilesettings.php:198
+#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:204
+#: actions/subscriptions.php:261 actions/urlsettings.php:152
 #: actions/useradminpanel.php:298 lib/applicationeditform.php:355
-#: lib/designsettings.php:270 lib/groupeditform.php:201
+#: lib/designform.php:320 lib/groupeditform.php:201
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "保存"
@@ -137,7 +137,11 @@ msgstr "そのようなページはありません。"
 #. 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 use "one time password login" without using an existing user.
+#. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
+#. TRANS: Client error displayed trying to find a user by ID for a non-existing ID.
+#. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when calling a profile action without specifying a user.
 #: actions/all.php:80 actions/allrss.php:69
@@ -149,19 +153,19 @@ msgstr "そのようなページはありません。"
 #: actions/apidirectmessage.php:75 actions/apidirectmessagenew.php:72
 #: actions/apigroupcreate.php:111 actions/apigroupismember.php:89
 #: actions/apigroupjoin.php:98 actions/apigroupleave.php:98
-#: actions/apigrouplist.php:70 actions/apistatusesupdate.php:230
-#: actions/apisubscriptions.php:85 actions/apitimelinefavorites.php:70
-#: actions/apitimelinefriends.php:173 actions/apitimelinehome.php:78
-#: actions/apitimelinementions.php:77 actions/apitimelineuser.php:79
-#: actions/avatarbynickname.php:79 actions/favoritesrss.php:72
-#: actions/foaf.php:42 actions/foaf.php:61 actions/hcard.php:67
-#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
-#: actions/remotesubscribe.php:144 actions/remotesubscribe.php:153
-#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
-#: actions/showfavorites.php:106 actions/userbyid.php:74
-#: actions/usergroups.php:93 actions/userrss.php:40 actions/userxrd.php:59
-#: actions/xrds.php:71 lib/command.php:509 lib/galleryaction.php:59
-#: lib/mailbox.php:80 lib/profileaction.php:77
+#: actions/apigrouplist.php:70 actions/apigroupprofileupdate.php:108
+#: actions/apistatusesupdate.php:230 actions/apisubscriptions.php:85
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:173
+#: actions/apitimelinehome.php:78 actions/apitimelinementions.php:77
+#: actions/apitimelineuser.php:79 actions/avatarbynickname.php:79
+#: actions/favoritesrss.php:72 actions/foaf.php:42 actions/foaf.php:61
+#: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116
+#: actions/otp.php:78 actions/remotesubscribe.php:144
+#: actions/remotesubscribe.php:153 actions/replies.php:73
+#: actions/repliesrss.php:38 actions/rsd.php:113 actions/showfavorites.php:106
+#: actions/userbyid.php:75 actions/usergroups.php:93 actions/userrss.php:40
+#: actions/userxrd.php:59 actions/xrds.php:71 lib/command.php:509
+#: lib/galleryaction.php:59 lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "そのようなユーザはいません。"
 
@@ -175,10 +179,9 @@ msgstr "%1$sとその友人、%2$dページ目"
 #. TRANS: H1 text for page. %s is a user nickname.
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Timeline title for user and friends. %s is a user nickname.
-#. TRANS: Tooltop for personal group navigation menu option when logged in for viewing timeline of self and friends.
 #: actions/all.php:94 actions/all.php:191 actions/allrss.php:117
 #: actions/apitimelinefriends.php:207 actions/apitimelinehome.php:113
-#: lib/personalgroupnav.php:102
+#: lib/personalgroupnav.php:100
 #, php-format
 msgid "%s and friends"
 msgstr "%sとその友人"
@@ -234,7 +237,7 @@ msgstr ""
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
 #. TRANS: Second sentence of empty message for anonymous users. %s is a user nickname.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:227
+#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:221
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -283,19 +286,20 @@ msgstr "%2$s に %1$s と友人からの更新があります！"
 #: actions/apifavoritecreate.php:98 actions/apifavoritedestroy.php:98
 #: actions/apifriendshipscreate.php:99 actions/apifriendshipsdestroy.php:99
 #: actions/apifriendshipsshow.php:124 actions/apigroupcreate.php:138
-#: actions/apigroupismember.php:115 actions/apigroupjoin.php:160
-#: actions/apigroupleave.php:145 actions/apigrouplist.php:134
+#: actions/apigroupismember.php:115 actions/apigroupjoin.php:151
+#: actions/apigroupleave.php:141 actions/apigrouplist.php:134
 #: actions/apigrouplistall.php:120 actions/apigroupmembership.php:105
+#: actions/apigroupprofileupdate.php:100 actions/apigroupprofileupdate.php:213
 #: actions/apigroupshow.php:114 actions/apihelptest.php:84
 #: actions/apistatusesdestroy.php:101 actions/apistatusesretweets.php:110
 #: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:139
 #: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
-#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:268
-#: actions/apitimelinegroup.php:147 actions/apitimelinehome.php:173
-#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:239
-#: actions/apitimelineretweetedtome.php:118
-#: actions/apitimelineretweetsofme.php:150 actions/apitimelinetag.php:159
-#: actions/apitimelineuser.php:206 actions/apiusershow.php:100
+#: actions/apitimelinefavorites.php:182 actions/apitimelinefriends.php:276
+#: actions/apitimelinegroup.php:148 actions/apitimelinehome.php:181
+#: actions/apitimelinementions.php:182 actions/apitimelinepublic.php:247
+#: actions/apitimelineretweetedtome.php:147
+#: actions/apitimelineretweetsofme.php:147 actions/apitimelinetag.php:165
+#: actions/apitimelineuser.php:217 actions/apiusershow.php:100
 msgid "API method not found."
 msgstr "API メソッドが見つかりません。"
 
@@ -310,8 +314,9 @@ msgstr "API メソッドが見つかりません。"
 #: actions/apifavoritecreate.php:88 actions/apifavoritedestroy.php:88
 #: actions/apifriendshipscreate.php:89 actions/apifriendshipsdestroy.php:89
 #: actions/apigroupcreate.php:102 actions/apigroupjoin.php:89
-#: actions/apigroupleave.php:89 actions/apimediaupload.php:66
-#: actions/apistatusesretweet.php:63 actions/apistatusesupdate.php:194
+#: actions/apigroupleave.php:89 actions/apigroupprofileupdate.php:92
+#: actions/apimediaupload.php:66 actions/apistatusesretweet.php:63
+#: actions/apistatusesupdate.php:194
 msgid "This method requires a POST."
 msgstr "このメソッドには POST が必要です。"
 
@@ -326,21 +331,16 @@ msgstr ""
 "sms, im, none"
 
 #. TRANS: Server error displayed when a user's delivery device cannot be updated.
-#. TRANS: Server error displayed when a user update to the database fails in the contact address confirmation action.
 #. TRANS: Server error thrown on database error updating e-mail preferences.
 #. TRANS: Server error thrown on database error removing a registered e-mail address.
-#. TRANS: Server error thrown on database error updating Instant Messaging preferences.
-#. TRANS: Server error thrown on database error removing a registered Instant Messaging address.
-#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
 #. TRANS: Server error thrown when user profile settings could not be updated.
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
-#: actions/apiaccountupdatedeliverydevice.php:130
-#: actions/confirmaddress.php:118 actions/emailsettings.php:352
-#: actions/emailsettings.php:498 actions/imsettings.php:276
-#: actions/imsettings.php:432 actions/othersettings.php:186
-#: actions/profilesettings.php:322 actions/smssettings.php:301
-#: actions/smssettings.php:454
+#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
+#: actions/apiaccountupdatedeliverydevice.php:136
+#: actions/emailsettings.php:353 actions/emailsettings.php:499
+#: actions/profilesettings.php:323 actions/smssettings.php:300
+#: actions/smssettings.php:453 actions/urlsettings.php:211
 msgid "Could not update user."
 msgstr "ユーザを更新できませんでした。"
 
@@ -366,7 +366,7 @@ msgstr "ユーザはプロフィールをもっていません。"
 
 #. TRANS: Server error displayed if a user profile could not be saved.
 #. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:418
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:419
 msgid "Could not save profile."
 msgstr "プロフィールを保存できませんでした。"
 
@@ -378,7 +378,7 @@ msgstr "プロフィールを保存できませんでした。"
 #: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
 #: actions/designadminpanel.php:120 actions/editapplication.php:121
 #: actions/newapplication.php:102 actions/newnotice.php:95
-#: lib/designsettings.php:298
+#: lib/designsettings.php:110
 #, fuzzy, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s byte) due to its "
@@ -400,8 +400,8 @@ msgstr[0] ""
 #: actions/apiaccountupdateprofilecolors.php:160
 #: actions/apiaccountupdateprofilecolors.php:171
 #: actions/groupdesignsettings.php:285 actions/groupdesignsettings.php:296
-#: actions/userdesignsettings.php:201 actions/userdesignsettings.php:211
-#: actions/userdesignsettings.php:253 actions/userdesignsettings.php:263
+#: actions/userdesignsettings.php:218 actions/userdesignsettings.php:228
+#: actions/userdesignsettings.php:270 actions/userdesignsettings.php:280
 msgid "Unable to save your design settings."
 msgstr "あなたのデザイン設定を保存できません。"
 
@@ -409,7 +409,7 @@ msgstr "あなたのデザイン設定を保存できません。"
 #. TRANS: Client error displayed when a database error occurs updating profile colours.
 #: actions/apiaccountupdateprofilebackgroundimage.php:191
 #: actions/apiaccountupdateprofilecolors.php:139
-#: actions/userdesignsettings.php:179
+#: actions/userdesignsettings.php:196
 msgid "Could not update your design."
 msgstr "デザインを更新できませんでした。"
 
@@ -517,7 +517,7 @@ msgstr "受け取り手のユーザが見つかりません。"
 #. TRANS: Client error displayed trying to direct message another user who's not a friend (403).
 #: actions/apidirectmessagenew.php:144
 #, fuzzy
-msgid "Can't send direct messages to users who aren't your friend."
+msgid "Cannot send direct messages to users who aren't your friend."
 msgstr "友人でないユーザにダイレクトメッセージを送ることはできません。"
 
 #. TRANS: Client error displayed trying to direct message self (403).
@@ -602,9 +602,9 @@ msgstr "ターゲットユーザーを見つけられません。"
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:156 actions/editgroup.php:191
-#: actions/newgroup.php:137 actions/profilesettings.php:273
-#: actions/register.php:214
+#: actions/apigroupcreate.php:156 actions/apigroupprofileupdate.php:255
+#: actions/editgroup.php:191 actions/newgroup.php:137
+#: actions/profilesettings.php:274 actions/register.php:199
 msgid "Nickname already in use. Try another one."
 msgstr "そのニックネームは既に使用されています。他のものを試してみて下さい。"
 
@@ -612,9 +612,9 @@ msgstr "そのニックネームは既に使用されています。他のもの
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:164 actions/editgroup.php:195
-#: actions/newgroup.php:141 actions/profilesettings.php:243
-#: actions/register.php:216
+#: actions/apigroupcreate.php:164 actions/apigroupprofileupdate.php:259
+#: actions/editgroup.php:195 actions/newgroup.php:141
+#: actions/profilesettings.php:244 actions/register.php:201
 msgid "Not a valid nickname."
 msgstr "有効なニックネームではありません。"
 
@@ -624,10 +624,10 @@ msgstr "有効なニックネームではありません。"
 #. TRANS: Validation error shown when providing an invalid homepage URL in the "New application" form.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:181 actions/editapplication.php:235
-#: actions/editgroup.php:202 actions/newapplication.php:221
-#: actions/newgroup.php:148 actions/profilesettings.php:248
-#: actions/register.php:223
+#: actions/apigroupcreate.php:181 actions/apigroupprofileupdate.php:277
+#: actions/editapplication.php:235 actions/editgroup.php:202
+#: actions/newapplication.php:221 actions/newgroup.php:148
+#: actions/profilesettings.php:249 actions/register.php:208
 msgid "Homepage is not a valid URL."
 msgstr "ホームページのURLが不適切です。"
 
@@ -636,8 +636,8 @@ msgstr "ホームページのURLが不適切です。"
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:191 actions/editgroup.php:206
-#: actions/newgroup.php:152 actions/profilesettings.php:252
-#: actions/register.php:226
+#: actions/newgroup.php:152 actions/profilesettings.php:253
+#: actions/register.php:211
 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "フルネームが長すぎます。（255字まで）"
@@ -664,8 +664,8 @@ msgstr[0] "記述が長すぎます。（最長%d字）"
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:215 actions/editgroup.php:218
-#: actions/newgroup.php:164 actions/profilesettings.php:265
-#: actions/register.php:235
+#: actions/newgroup.php:164 actions/profilesettings.php:266
+#: actions/register.php:220
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
 msgstr "場所が長すぎます。（255字まで）"
@@ -694,15 +694,16 @@ msgstr "不正な別名: \"%s\""
 #. TRANS: %s is the alias that is already in use.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error. %s is the already used alias.
-#: actions/apigroupcreate.php:264 actions/editgroup.php:246
-#: actions/newgroup.php:193
+#: actions/apigroupcreate.php:264 actions/apigroupprofileupdate.php:351
+#: actions/editgroup.php:246 actions/newgroup.php:193
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "別名 \"%s\" は既に使用されています。他のものを試してみて下さい。"
 
 #. TRANS: Client error displayed when trying to use an alias during group creation that is the same as the group's nickname.
 #. TRANS: Group edit form validation error.
-#: actions/apigroupcreate.php:278 actions/editgroup.php:253
+#: actions/apigroupcreate.php:278 actions/apigroupprofileupdate.php:359
+#: actions/editgroup.php:253
 msgid "Alias can't be the same as nickname."
 msgstr "別名はニックネームと同じではいけません。"
 
@@ -714,7 +715,8 @@ msgstr "別名はニックネームと同じではいけません。"
 #. TRANS: Client error displayed requesting most recent notices to a group for a non-existing group.
 #: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
 #: actions/apigroupleave.php:104 actions/apigroupmembership.php:71
-#: actions/apigroupshow.php:81 actions/apitimelinegroup.php:89
+#: actions/apigroupprofileupdate.php:113 actions/apigroupshow.php:81
+#: actions/apitimelinegroup.php:89
 msgid "Group not found."
 msgstr "見つかりません。"
 
@@ -732,13 +734,11 @@ msgstr "すでにこのグループのメンバーです。"
 msgid "You have been blocked from that group by the admin."
 msgstr "管理者によってこのグループからブロックされています。"
 
-#. TRANS: Server error displayed when joining a group fails.
-#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
 #. 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.
 #. TRANS: Message given having failed to add a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:362
+#: actions/apigroupjoin.php:136 actions/joingroup.php:139 lib/command.php:362
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "ユーザ %1$s はグループ %2$s に参加できません。"
@@ -748,8 +748,6 @@ msgstr "ユーザ %1$s はグループ %2$s に参加できません。"
 msgid "You are not a member of this group."
 msgstr "このグループのメンバーではありません。"
 
-#. TRANS: Server error displayed when leaving a group fails.
-#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
 #. TRANS: Server error displayed when leaving a group failed in the database.
 #. TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
 #. TRANS: Message given having failed to remove a user from a group.
@@ -785,6 +783,63 @@ msgstr "%s グループ"
 msgid "groups on %s"
 msgstr "%s 上のグループ"
 
+#. TRANS: Client error displayed trying to edit a group while not being a group admin.
+#. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
+#. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
+#: actions/apigroupprofileupdate.php:118 actions/editgroup.php:110
+#: actions/editgroup.php:176 actions/groupdesignsettings.php:109
+#: actions/grouplogo.php:111
+msgid "You must be an admin to edit the group."
+msgstr "グループを編集するには管理者である必要があります。"
+
+#. TRANS: Server error displayed when editing a group fails.
+#: actions/apigroupprofileupdate.php:171 actions/editgroup.php:274
+msgid "Could not update group."
+msgstr "グループを更新できません。"
+
+#. TRANS: Server error displayed when group aliases could not be added.
+#. TRANS: Server exception thrown when creating group aliases failed.
+#: actions/apigroupprofileupdate.php:194 actions/editgroup.php:281
+#: classes/User_group.php:540
+msgid "Could not create aliases."
+msgstr "別名を作成できません。"
+
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: actions/apigroupprofileupdate.php:249 lib/nickname.php:165
+msgid "Nickname must have only lowercase letters and numbers and no spaces."
+msgstr ""
+"ニックネームには、小文字アルファベットと数字のみ使用できます。スペースは使用"
+"できません。"
+
+#: actions/apigroupprofileupdate.php:286
+#, fuzzy
+msgid "Full name is too long (max 255 chars)."
+msgstr "フルネームが長すぎます。（255字まで）"
+
+#: actions/apigroupprofileupdate.php:296
+#, fuzzy, php-format
+msgid "description is too long (max %d chars)."
+msgstr "記述が長すぎます。（最長%d字）"
+
+#: actions/apigroupprofileupdate.php:307
+#, fuzzy
+msgid "Location is too long (max 255 chars)."
+msgstr "場所が長すぎます。（255字まで）"
+
+#: actions/apigroupprofileupdate.php:326
+#, fuzzy, php-format
+msgid "Too many aliases! Maximum %d."
+msgstr "別名が多すぎます! 最大 %d。"
+
+#. TRANS: Group edit form validation error.
+#. TRANS: Group create form validation error.
+#. TRANS: %s is the invalid alias.
+#: actions/apigroupprofileupdate.php:342 actions/editgroup.php:241
+#: actions/newgroup.php:188
+#, php-format
+msgid "Invalid alias: \"%s\""
+msgstr "不正な別名: \"%s\""
+
 #. TRANS: Client error displayed when uploading a media file has failed.
 #: actions/apimediaupload.php:101
 #, fuzzy
@@ -819,21 +874,22 @@ msgstr "認証されていません。"
 #. TRANS: Form validation error message.
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
+#. TRANS: Client error displayed when the session token is not okay.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
 #: actions/deletenotice.php:177 actions/disfavor.php:75
-#: actions/emailsettings.php:291 actions/favor.php:75 actions/geocode.php:55
+#: actions/emailsettings.php:292 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:65 actions/grouplogo.php:321
-#: actions/groupunblock.php:65 actions/imsettings.php:224
-#: actions/invite.php:60 actions/login.php:137 actions/makeadmin.php:66
-#: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
-#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
-#: actions/othersettings.php:155 actions/passwordsettings.php:138
-#: actions/profilesettings.php:217 actions/recoverpassword.php:383
-#: actions/register.php:172 actions/remotesubscribe.php:76
-#: actions/repeat.php:82 actions/smssettings.php:250 actions/subedit.php:40
-#: actions/subscribe.php:86 actions/tagother.php:166
-#: actions/unsubscribe.php:69 actions/userauthorization.php:52
-#: lib/designsettings.php:310
+#: actions/groupunblock.php:65 actions/imsettings.php:241
+#: actions/invite.php:60 actions/makeadmin.php:66 actions/newmessage.php:135
+#: actions/newnotice.php:105 actions/nudge.php:80
+#: actions/oauthappssettings.php:162 actions/oauthconnectionssettings.php:135
+#: actions/passwordsettings.php:137 actions/pluginenable.php:87
+#: actions/profilesettings.php:218 actions/recoverpassword.php:383
+#: actions/register.php:157 actions/remotesubscribe.php:76
+#: actions/repeat.php:82 actions/smssettings.php:249 actions/subedit.php:40
+#: actions/subscribe.php:87 actions/tagother.php:145
+#: actions/unsubscribe.php:69 actions/urlsettings.php:171
+#: actions/userauthorization.php:53 lib/designsettings.php:122
 msgid "There was a problem with your session token. Try again, please."
 msgstr "あなたのセッショントークンに問題がありました。再度お試しください。"
 
@@ -862,10 +918,10 @@ msgstr "OAuth アプリケーションユーザの追加時ＤＢエラー。"
 #. TRANS: Unknown form validation error in design settings form.
 #: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
 #: actions/designadminpanel.php:100 actions/editapplication.php:144
-#: actions/emailsettings.php:310 actions/grouplogo.php:332
-#: actions/imsettings.php:239 actions/newapplication.php:124
-#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
-#: actions/smssettings.php:271 lib/designsettings.php:321
+#: actions/emailsettings.php:311 actions/grouplogo.php:332
+#: actions/imsettings.php:256 actions/newapplication.php:124
+#: actions/oauthconnectionssettings.php:144 actions/recoverpassword.php:46
+#: actions/smssettings.php:270 lib/designsettings.php:133
 msgid "Unexpected form submission."
 msgstr "予期せぬフォーム送信です。"
 
@@ -909,31 +965,26 @@ msgstr "アカウント"
 
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Field label in form for profile settings.
-#. TRANS: Label for group nickname (dt). Text hidden by default.
-#. TRANS: DT for nick name in a profile.
-#: actions/apioauthauthorize.php:459 actions/login.php:252
-#: actions/profilesettings.php:106 actions/register.php:432
-#: actions/showgroup.php:243 actions/tagother.php:94
+#: actions/apioauthauthorize.php:459 actions/login.php:225
+#: actions/profilesettings.php:107 actions/register.php:411
 #: actions/userauthorization.php:145 lib/groupeditform.php:145
-#: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "ニックネーム"
 
 #. TRANS: Field label on OAuth API authorisation form.
-#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:463 actions/login.php:255
-#: actions/register.php:436 lib/accountsettingsaction.php:120
+#: actions/apioauthauthorize.php:463 actions/login.php:228
+#: actions/register.php:415 lib/settingsnav.php:87
 msgid "Password"
 msgstr "パスワード"
 
 #. TRANS: Button text that when clicked will cancel the process of allowing access to an account
 #. TRANS: by an external application.
 #. TRANS: Button label to cancel an e-mail address confirmation procedure.
-#. TRANS: Button label to cancel an Instant Messaging address confirmation procedure.
+#. TRANS: Button label to cancel an IM address confirmation procedure.
 #. TRANS: Button label to cancel a SMS address confirmation procedure.
 #. TRANS: Button label in the "Edit application" form.
-#: actions/apioauthauthorize.php:478 actions/emailsettings.php:124
-#: actions/imsettings.php:127 actions/smssettings.php:133
+#: actions/apioauthauthorize.php:478 actions/emailsettings.php:125
+#: actions/imsettings.php:136 actions/smssettings.php:132
 #: lib/applicationeditform.php:351
 #, fuzzy
 msgctxt "BUTTON"
@@ -1047,7 +1098,7 @@ msgstr "API メソッドが見つかりません。"
 #. TRANS: %s is the requested output format.
 #: actions/apistatusesshow.php:144
 #, fuzzy, php-format
-msgid "Unsupported format: %s"
+msgid "Unsupported format: %s."
 msgstr "サポート外の形式です。"
 
 #. TRANS: Client error displayed requesting a deleted status.
@@ -1127,13 +1178,6 @@ msgstr "%1$s / %2$s からのお気に入り"
 msgid "%1$s updates favorited by %2$s / %3$s."
 msgstr "%1$s は %2$s でお気に入りを更新しました / %2$s。"
 
-#. TRANS: Server error displayed when generating an Atom feed fails.
-#. TRANS: %s is the error.
-#: actions/apitimelinegroup.php:134
-#, fuzzy, php-format
-msgid "Could not generate feed for group - %s"
-msgstr "グループを更新できません。"
-
 #. TRANS: Title for timeline of most recent mentions of a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname.
 #: actions/apitimelinementions.php:115
@@ -1150,13 +1194,14 @@ msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr "%2$s からアップデートに答える %1$s アップデート"
 
 #. TRANS: Title for site timeline. %s is the StatusNet sitename.
+#. TRANS: Public RSS feed title. %s is the StatusNet site name.
 #: actions/apitimelinepublic.php:193 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "%s のパブリックタイムライン"
 
 #. TRANS: Subtitle for site timeline. %s is the StatusNet sitename.
-#: actions/apitimelinepublic.php:199 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:199
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "皆からの %s アップデート!"
@@ -1168,21 +1213,33 @@ msgid "Unimplemented."
 msgstr "未実装のメソッド。"
 
 #. TRANS: Title for Atom feed "repeated to me". %s is the user nickname.
-#: actions/apitimelineretweetedtome.php:108
+#: actions/apitimelineretweetedtome.php:96
 #, php-format
 msgid "Repeated to %s"
 msgstr "%s への返信"
 
+#: actions/apitimelineretweetedtome.php:98
+#, fuzzy, php-format
+msgid "%1$s notices that were to repeated to %2$s / %3$s."
+msgstr "%2$s からアップデートに答える %1$s アップデート"
+
 #. TRANS: Title of list of repeated notices of the logged in user.
 #. TRANS: %s is the nickname of the logged in user.
-#: actions/apitimelineretweetsofme.php:112
+#: actions/apitimelineretweetsofme.php:98
 #, php-format
 msgid "Repeats of %s"
 msgstr "%s の返信"
 
+#: actions/apitimelineretweetsofme.php:104
+#, fuzzy, php-format
+msgid "%1$s notices that %2$s / %3$s has repeated."
+msgstr "%s (@%s) はお気に入りとしてあなたのつぶやきを加えました"
+
 #. TRANS: Title for timeline with lastest notices with a given tag.
 #. TRANS: %s is the tag.
-#: actions/apitimelinetag.php:101 actions/tag.php:67
+#. TRANS: Title for first page of notices with tags.
+#. TRANS: %s is the tag.
+#: actions/apitimelinetag.php:101 actions/tag.php:69
 #, php-format
 msgid "Notices tagged with %s"
 msgstr "%s とタグ付けされたつぶやき"
@@ -1195,54 +1252,55 @@ msgid "Updates tagged with %1$s on %2$s!"
 msgstr "%2$s に %1$s による更新があります！"
 
 #. TRANS: Client error displayed trying to add a notice to another user's timeline.
-#: actions/apitimelineuser.php:297
+#: actions/apitimelineuser.php:308
 #, fuzzy
 msgid "Only the user can add to their own timeline."
 msgstr "ユーザだけがかれら自身のメールボックスを読むことができます。"
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:304
+#: actions/apitimelineuser.php:315
 msgid "Only accept AtomPub for Atom feeds."
 msgstr ""
 
 #. TRANS: Client error displayed attempting to post an empty API notice.
-#: actions/apitimelineuser.php:311
+#: actions/apitimelineuser.php:322
 msgid "Atom post must not be empty."
 msgstr ""
 
 #. TRANS: Client error displayed attempting to post an API that is not well-formed XML.
-#: actions/apitimelineuser.php:317
+#: actions/apitimelineuser.php:328
 msgid "Atom post must be well-formed XML."
 msgstr ""
 
 #. TRANS: Client error displayed when not using an Atom entry.
-#: actions/apitimelineuser.php:323 actions/atompubfavoritefeed.php:228
+#: actions/apitimelineuser.php:334 actions/atompubfavoritefeed.php:228
 #: actions/atompubmembershipfeed.php:230
 #: actions/atompubsubscriptionfeed.php:236
 msgid "Atom post must be an Atom entry."
 msgstr ""
 
 #. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
-#: actions/apitimelineuser.php:335
+#: actions/apitimelineuser.php:345
 msgid "Can only handle POST activities."
 msgstr ""
 
 #. TRANS: Client error displayed when using an unsupported activity object type.
 #. TRANS: %s is the unsupported activity object type.
-#: actions/apitimelineuser.php:346
+#: actions/apitimelineuser.php:356
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
 #. TRANS: %d is the notice ID (number).
-#: actions/apitimelineuser.php:380
+#: actions/apitimelineuser.php:390
 #, fuzzy, php-format
 msgid "No content for notice %d."
 msgstr "つぶやきの内容を探す"
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:408
+#. TRANS: %s is the notice URI.
+#: actions/apitimelineuser.php:419
 #, fuzzy, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "その ID によるつぶやきは存在していません"
@@ -1260,9 +1318,10 @@ msgstr "API メソッドが見つかりません。"
 
 #. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
 #. TRANS: Client exception.
+#. TRANS: Client error displayed trying to subscribe to a non-existing profile.
 #: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
 #: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
-#: actions/subscribe.php:107
+#: actions/subscribe.php:110
 #, fuzzy
 msgid "No such profile."
 msgstr "そのようなファイルはありません。"
@@ -1410,7 +1469,7 @@ msgid "Not a member."
 msgstr "全てのメンバー"
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
-#: actions/atompubshowmembership.php:151
+#: actions/atompubshowmembership.php:150
 #, fuzzy
 msgid "Cannot delete someone else's membership."
 msgstr "フォローを保存できません。"
@@ -1499,10 +1558,7 @@ msgid "Invalid size."
 msgstr "不正なサイズ。"
 
 #. TRANS: Title for avatar upload page.
-#. TRANS: Label for group avatar (dt). Text hidden by default.
-#. TRANS: Link description in user account settings menu.
-#: actions/avatarsettings.php:66 actions/showgroup.php:227
-#: lib/accountsettingsaction.php:113
+#: actions/avatarsettings.php:66 lib/settingsnav.php:82
 msgid "Avatar"
 msgstr "アバター"
 
@@ -1515,9 +1571,11 @@ msgstr "自分のアバターをアップロードできます。最大サイズ
 
 #. TRANS: Server error displayed in avatar upload page when no matching profile can be found for a user.
 #. TRANS: Server error displayed coming across a request from a user without a profile.
+#. TRANS: Server error displayed when trying to authorise a remote subscription request
+#. TRANS: while the user has no profile.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
 #: actions/grouplogo.php:184 actions/remotesubscribe.php:190
-#: actions/userauthorization.php:72 actions/userrss.php:108
+#: actions/userauthorization.php:75 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr "合っているプロフィールのないユーザ"
 
@@ -1576,10 +1634,10 @@ msgstr "切り取り"
 msgid "No file uploaded."
 msgstr "プロファイル記述がありません。"
 
-#. TRANS: Avatar upload form unstruction after uploading a file.
+#. TRANS: Avatar upload form instruction after uploading a file.
 #: actions/avatarsettings.php:345
 #, fuzzy
-msgid "Pick a square area of the image to be your avatar"
+msgid "Pick a square area of the image to be your avatar."
 msgstr "あなたのアバターとなるイメージを正方形で指定"
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
@@ -1605,7 +1663,7 @@ msgstr "アバターが削除されました。"
 
 #. TRANS: Title for backup account page.
 #. TRANS: Option in profile settings to create a backup of the account of the currently logged in user.
-#: actions/backupaccount.php:61 actions/profilesettings.php:467
+#: actions/backupaccount.php:61 actions/profilesettings.php:468
 msgid "Backup account"
 msgstr ""
 
@@ -1639,7 +1697,7 @@ msgstr "バックグラウンド"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
 #: actions/backupaccount.php:254
-msgid "Backup your account"
+msgid "Backup your account."
 msgstr ""
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
@@ -1682,7 +1740,7 @@ msgstr "ノート"
 #. TRANS: Submit button title for 'No' when blocking a user.
 #: actions/block.php:158
 #, fuzzy
-msgid "Do not block this user"
+msgid "Do not block this user."
 msgstr "このユーザをアンブロックする"
 
 #. TRANS: Button label on the user block form.
@@ -1699,9 +1757,9 @@ msgid "Yes"
 msgstr "はい"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#. TRANS: Description of the form to block a user.
-#: actions/block.php:165 lib/blockform.php:79
-msgid "Block this user"
+#: actions/block.php:165
+#, fuzzy
+msgid "Block this user."
 msgstr "このユーザをブロックする"
 
 #. TRANS: Server error displayed when blocking a user fails.
@@ -1768,32 +1826,48 @@ msgstr "確認コードが見つかりません。"
 msgid "That confirmation code is not for you!"
 msgstr "その確認コードはあなたのものではありません！"
 
-#. TRANS: Server error for a unknow address type %s, which can be 'email', 'jabber', or 'sms'.
-#: actions/confirmaddress.php:92
+#. TRANS: Server error for an unknown address type, which can be 'email', 'sms', or the name of an IM network (such as 'xmpp' or 'aim')
+#: actions/confirmaddress.php:94
 #, fuzzy, php-format
-msgid "Unrecognized address type %s."
+msgid "Unrecognized address type %s"
 msgstr "不明なアドレスタイプ %s"
 
 #. TRANS: Client error for an already confirmed email/jabber/sms address.
-#: actions/confirmaddress.php:97
+#: actions/confirmaddress.php:103 actions/confirmaddress.php:136
 msgid "That address has already been confirmed."
 msgstr "そのアドレスは既に承認されています。"
 
+#: actions/confirmaddress.php:121 actions/imsettings.php:444
+#: actions/userdesignsettings.php:306
+#, fuzzy
+msgid "Couldn't update user."
+msgstr "ユーザを更新できませんでした。"
+
+#: actions/confirmaddress.php:144
+#, fuzzy
+msgid "Couldn't update user im preferences."
+msgstr "ユーザレコードを更新できません。"
+
+#: actions/confirmaddress.php:156
+#, fuzzy
+msgid "Couldn't insert user im preferences."
+msgstr "サブスクリプションを追加できません"
+
 #. TRANS: Server error displayed when an address confirmation code deletion from the
 #. TRANS: database fails in the contact address confirmation action.
-#: actions/confirmaddress.php:132
+#: actions/confirmaddress.php:169
 #, fuzzy
 msgid "Could not delete address confirmation."
 msgstr "メール承認を削除できません"
 
 #. TRANS: Title for the contact address confirmation action.
-#: actions/confirmaddress.php:150
+#: actions/confirmaddress.php:185
 msgid "Confirm address"
 msgstr "アドレスの確認"
 
 #. TRANS: Success message for the contact address confirmation action.
 #. TRANS: %s can be 'email', 'jabber', or 'sms'.
-#: actions/confirmaddress.php:166
+#: actions/confirmaddress.php:200
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "アドレス \"%s\" はあなたのアカウントとして承認されています。"
@@ -1807,6 +1881,7 @@ msgstr "会話"
 #. TRANS: Label for user statistics.
 #: actions/conversation.php:149 lib/noticelist.php:87
 #: lib/profileaction.php:246 lib/searchgroupnav.php:82
+#: lib/threadednoticelist.php:66
 msgid "Notices"
 msgstr "つぶやき"
 
@@ -1842,7 +1917,7 @@ msgstr "アバターが削除されました。"
 
 #. TRANS: Page title for page on which a user account can be deleted.
 #. TRANS: Option in profile settings to delete the account of the currently logged in user.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:475
+#: actions/deleteaccount.php:228 actions/profilesettings.php:476
 #, fuzzy
 msgid "Delete account"
 msgstr "新しいグループを作成"
@@ -1866,7 +1941,7 @@ msgstr ""
 #. TRANS: Field label for delete account confirmation entry.
 #. TRANS: Field label for password reset form where the password has to be typed again.
 #: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:262 actions/register.php:440
+#: actions/recoverpassword.php:262 actions/register.php:419
 msgid "Confirm"
 msgstr "パスワード確認"
 
@@ -1896,14 +1971,14 @@ msgstr "アプリケーションが見つかりません。"
 #. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
 #: actions/deleteapplication.php:79 actions/editapplication.php:78
-#: actions/showapplication.php:94
+#: actions/showapplication.php:90
 msgid "You are not the owner of this application."
 msgstr "このアプリケーションのオーナーではありません。"
 
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
-#: actions/newapplication.php:112 actions/showapplication.php:118
-#: lib/action.php:1425
+#: actions/newapplication.php:112 actions/showapplication.php:113
+#: lib/action.php:1391
 msgid "There was a problem with your session token."
 msgstr "あなたのセッショントークンに関する問題がありました。"
 
@@ -1927,13 +2002,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting an application.
 #: actions/deleteapplication.php:161
 #, fuzzy
-msgid "Do not delete this application"
+msgid "Do not delete this application."
 msgstr "このアプリケーションを削除しないでください"
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
 #: actions/deleteapplication.php:167
 #, fuzzy
-msgid "Delete this application"
+msgid "Delete this application."
 msgstr "このアプリケーションを削除"
 
 #. TRANS: Client error when trying to delete group while not logged in.
@@ -1992,13 +2067,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting a group.
 #: actions/deletegroup.php:224
 #, fuzzy
-msgid "Do not delete this group"
+msgid "Do not delete this group."
 msgstr "このつぶやきを削除できません。"
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
 #: actions/deletegroup.php:231
 #, fuzzy
-msgid "Delete this group"
+msgid "Delete this group."
 msgstr "このユーザを削除"
 
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
@@ -2006,14 +2081,16 @@ msgstr "このユーザを削除"
 #. TRANS: Client error displayed when trying to mark a notice as favorite without being logged in.
 #. TRANS: Client error displayed trying to block a user from a group while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
+#. TRANS: Client error displayed trying to log out when not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
+#. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
 #. TRANS: Client error displayed when trying to change user options while not logged in.
 #: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
-#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:69
+#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:70
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
-#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
-#: actions/tagother.php:33 actions/unsubscribe.php:52
+#: actions/nudge.php:63 actions/pluginenable.php:97 actions/subedit.php:33
+#: actions/subscribe.php:98 actions/tagother.php:33 actions/unsubscribe.php:52
 #: lib/adminpanelaction.php:71 lib/profileformaction.php:63
 #: lib/settingsaction.php:72
 msgid "Not logged in."
@@ -2042,12 +2119,13 @@ msgstr "本当にこのつぶやきを削除しますか？"
 #. TRANS: Submit button title for 'No' when deleting a notice.
 #: actions/deletenotice.php:159
 #, fuzzy
-msgid "Do not delete this notice"
+msgid "Do not delete this notice."
 msgstr "このつぶやきを削除できません。"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:166 lib/noticelist.php:673
-msgid "Delete this notice"
+#: actions/deletenotice.php:166
+#, fuzzy
+msgid "Delete this notice."
 msgstr "このつぶやきを削除"
 
 #. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
@@ -2084,18 +2162,17 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting a user.
 #: actions/deleteuser.php:158
 #, fuzzy
-msgid "Do not delete this user"
+msgid "Do not delete this user."
 msgstr "このつぶやきを削除できません。"
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
-#. TRANS: Description of form for deleting a user.
-#: actions/deleteuser.php:165 lib/deleteuserform.php:75
-msgid "Delete this user"
+#: actions/deleteuser.php:165
+#, fuzzy
+msgid "Delete this user."
 msgstr "このユーザを削除"
 
 #. TRANS: Message used as title for design settings for the site.
-#. TRANS: Link description in user account settings menu.
-#: actions/designadminpanel.php:60 lib/accountsettingsaction.php:134
+#: actions/designadminpanel.php:60 lib/settingsnav.php:97
 msgid "Design"
 msgstr "デザイン"
 
@@ -2165,8 +2242,7 @@ msgid "You can upload a custom StatusNet theme as a .ZIP archive."
 msgstr ""
 
 #. TRANS: Fieldset legend for theme background image.
-#. TRANS: Fieldset legend on profile design page.
-#: actions/designadminpanel.php:515 lib/designsettings.php:98
+#: actions/designadminpanel.php:515
 msgid "Change background image"
 msgstr "バックグラウンドイメージの変更"
 
@@ -2174,7 +2250,7 @@ msgstr "バックグラウンドイメージの変更"
 #. TRANS: Field label for background color selector.
 #. TRANS: Label on profile design page for setting a profile page background colour.
 #: actions/designadminpanel.php:525 actions/designadminpanel.php:609
-#: lib/designsettings.php:183
+#: lib/designform.php:238
 msgid "Background"
 msgstr "バックグラウンド"
 
@@ -2201,13 +2277,13 @@ msgstr "オフ"
 #. TRANS: Form guide for turning background image on or off on theme designer page.
 #. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
 #. TRANS: use of the uploaded profile image.
-#: actions/designadminpanel.php:577 lib/designsettings.php:159
+#: actions/designadminpanel.php:577 lib/designform.php:214
 msgid "Turn background image on or off."
 msgstr "バックグラウンドイメージのオンまたはオフ。"
 
 #. TRANS: Checkbox label to title background image on theme designer page.
 #. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-#: actions/designadminpanel.php:583 lib/designsettings.php:165
+#: actions/designadminpanel.php:583 lib/designform.php:220
 msgid "Tile background image"
 msgstr "タイルバックグラウンドイメージ"
 
@@ -2219,25 +2295,25 @@ msgstr "色の変更"
 
 #. TRANS: Field label for content color selector.
 #. TRANS: Label on profile design page for setting a profile page content colour.
-#: actions/designadminpanel.php:623 lib/designsettings.php:197
+#: actions/designadminpanel.php:623 lib/designform.php:252
 msgid "Content"
 msgstr "内容"
 
 #. TRANS: Field label for sidebar color selector.
 #. TRANS: Label on profile design page for setting a profile page sidebar colour.
-#: actions/designadminpanel.php:637 lib/designsettings.php:211
+#: actions/designadminpanel.php:637 lib/designform.php:266
 msgid "Sidebar"
 msgstr "サイドバー"
 
 #. TRANS: Field label for text color selector.
 #. TRANS: Label on profile design page for setting a profile page text colour.
-#: actions/designadminpanel.php:651 lib/designsettings.php:225
+#: actions/designadminpanel.php:651 lib/designform.php:280
 msgid "Text"
 msgstr "テキスト"
 
 #. TRANS: Field label for link color selector.
 #. TRANS: Label on profile design page for setting a profile page links colour.
-#: actions/designadminpanel.php:665 lib/designsettings.php:239
+#: actions/designadminpanel.php:665 lib/designform.php:294
 msgid "Links"
 msgstr "リンク"
 
@@ -2259,21 +2335,21 @@ msgid "Use defaults"
 msgstr "デフォルトを使用"
 
 #. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: actions/designadminpanel.php:720 lib/designsettings.php:259
-msgid "Restore default designs"
+#: actions/designadminpanel.php:720
+#, fuzzy
+msgid "Restore default designs."
 msgstr "デフォルトデザインに戻す。"
 
 #. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: actions/designadminpanel.php:728 lib/designsettings.php:267
-msgid "Reset back to default"
+#: actions/designadminpanel.php:728
+#, fuzzy
+msgid "Reset back to default."
 msgstr "デフォルトへリセットする"
 
 #. TRANS: Title for button for saving theme settings.
-#. TRANS: Title for button on profile design page to save settings.
-#: actions/designadminpanel.php:736 lib/designsettings.php:272
-msgid "Save design"
+#: actions/designadminpanel.php:736
+#, fuzzy
+msgid "Save design."
 msgstr "デザインの保存"
 
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
@@ -2305,7 +2381,7 @@ msgid "You must be logged in to edit an application."
 msgstr "アプリケーションを編集するにはログインしていなければなりません。"
 
 #. TRANS: Client error displayed trying to edit an application that does not exist.
-#: actions/editapplication.php:83 actions/showapplication.php:87
+#: actions/editapplication.php:83 actions/showapplication.php:83
 msgid "No such application."
 msgstr "そのようなアプリケーションはありません。"
 
@@ -2398,80 +2474,53 @@ msgstr "%s グループを編集"
 msgid "You must be logged in to create a group."
 msgstr "グループを作るにはログインしていなければなりません。"
 
-#. TRANS: Client error displayed trying to edit a group while not being a group admin.
-#. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
-#. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
-#: actions/editgroup.php:110 actions/editgroup.php:176
-#: actions/groupdesignsettings.php:109 actions/grouplogo.php:111
-msgid "You must be an admin to edit the group."
-msgstr "グループを編集するには管理者である必要があります。"
-
 #. TRANS: Form instructions for group edit form.
 #: actions/editgroup.php:161
 msgid "Use this form to edit the group."
 msgstr "このフォームを使ってグループを編集します。"
 
-#. TRANS: Group edit form validation error.
-#. TRANS: Group create form validation error.
-#. TRANS: %s is the invalid alias.
-#: actions/editgroup.php:241 actions/newgroup.php:188
-#, php-format
-msgid "Invalid alias: \"%s\""
-msgstr "不正な別名: \"%s\""
-
-#. TRANS: Server error displayed when editing a group fails.
-#: actions/editgroup.php:274
-msgid "Could not update group."
-msgstr "グループを更新できません。"
-
-#. TRANS: Server error displayed when group aliases could not be added.
-#. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/editgroup.php:281 classes/User_group.php:540
-msgid "Could not create aliases."
-msgstr "別名を作成できません。"
-
 #. TRANS: Group edit form success message.
 #: actions/editgroup.php:301
 msgid "Options saved."
 msgstr "オプションが保存されました。"
 
 #. TRANS: Title for e-mail settings.
-#: actions/emailsettings.php:59
+#: actions/emailsettings.php:60
 msgid "Email settings"
 msgstr "メール設定"
 
 #. TRANS: E-mail settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/emailsettings.php:73
+#: actions/emailsettings.php:74
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 msgstr "%%site.name%% からのメールを管理。"
 
 #. TRANS: Form legend for e-mail settings form.
 #. TRANS: Field label for e-mail address input in e-mail settings form.
-#: actions/emailsettings.php:103 actions/emailsettings.php:129
+#: actions/emailsettings.php:104 actions/emailsettings.php:130
 msgid "Email address"
 msgstr "メールアドレス"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:109
+#: actions/emailsettings.php:110
 msgid "Current confirmed email address."
 msgstr "現在確認されているメールアドレス。"
 
 #. TRANS: Button label to remove a confirmed e-mail address.
 #. TRANS: Button label for removing a set sender e-mail address to post notices from.
-#. TRANS: Button label to remove a confirmed Instant Messaging address.
+#. TRANS: Button label to remove a confirmed IM address.
 #. TRANS: Button label to remove a confirmed SMS address.
 #. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
-#: actions/emailsettings.php:112 actions/emailsettings.php:179
-#: actions/imsettings.php:112 actions/smssettings.php:120
-#: actions/smssettings.php:176
+#: actions/emailsettings.php:113 actions/emailsettings.php:180
+#: actions/imsettings.php:119 actions/smssettings.php:119
+#: actions/smssettings.php:175
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "回復"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:119
+#: actions/emailsettings.php:120
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -2484,15 +2533,15 @@ msgstr ""
 #. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
 #. TRANS: Any other domain may be owned by a legitimate person or
 #. TRANS: organization.
-#: actions/emailsettings.php:136
+#: actions/emailsettings.php:137
 msgid "Email address, like \"UserName@example.org\""
 msgstr "メールアドレス、\"UserName@example.org\" のような"
 
 #. TRANS: Button label for adding an e-mail address in e-mail settings form.
-#. TRANS: Button label for adding an Instant Messaging address in Instant Messaging settings form.
+#. TRANS: Button label for adding an IM address in IM settings form.
 #. TRANS: Button label for adding a SMS phone number in SMS settings form.
-#: actions/emailsettings.php:140 actions/imsettings.php:147
-#: actions/smssettings.php:158
+#: actions/emailsettings.php:141 actions/imsettings.php:147
+#: actions/smssettings.php:157
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Add"
@@ -2500,29 +2549,29 @@ msgstr "追加"
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:148 actions/smssettings.php:167
+#: actions/emailsettings.php:149 actions/smssettings.php:166
 msgid "Incoming email"
 msgstr "入ってくるメール"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:154
+#: actions/emailsettings.php:155
 msgid "I want to post notices by email."
 msgstr "メールでつぶやきを投稿したい。"
 
 #. TRANS: Form instructions for incoming e-mail form in e-mail settings.
 #. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
-#: actions/emailsettings.php:176 actions/smssettings.php:174
+#: actions/emailsettings.php:177 actions/smssettings.php:173
 msgid "Send email to this address to post new notices."
 msgstr "新しいつぶやき投稿にこのアドレスへメールする"
 
 #. TRANS: Instructions for incoming e-mail address input form, when an address has already been assigned.
 #. TRANS: Instructions for incoming SMS e-mail address input form.
-#: actions/emailsettings.php:185 actions/smssettings.php:182
+#: actions/emailsettings.php:186 actions/smssettings.php:181
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr "投稿のための新しいEメールアドレスを作ります; 古い方を取り消します。"
 
 #. TRANS: Instructions for incoming e-mail address input form.
-#: actions/emailsettings.php:189
+#: actions/emailsettings.php:190
 msgid ""
 "To send notices via email, we need to create a unique email address for you "
 "on this server:"
@@ -2530,94 +2579,94 @@ msgstr ""
 
 #. TRANS: Button label for adding an e-mail address to send notices from.
 #. TRANS: Button label for adding an SMS e-mail address to send notices from.
-#: actions/emailsettings.php:195 actions/smssettings.php:185
+#: actions/emailsettings.php:196 actions/smssettings.php:184
 #, fuzzy
 msgctxt "BUTTON"
 msgid "New"
 msgstr "New"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:204
+#: actions/emailsettings.php:205
 msgid "Email preferences"
 msgstr "メールアドレス"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:212
+#: actions/emailsettings.php:213
 msgid "Send me notices of new subscriptions through email."
 msgstr "メールで新規フォローの通知を私に送ってください。"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:218
+#: actions/emailsettings.php:219
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr ""
 "だれかがお気に入りとして私のつぶやきを加えたら、メールを私に送ってください。"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:225
+#: actions/emailsettings.php:226
 msgid "Send me email when someone sends me a private message."
 msgstr ""
 "だれかがプライベート・メッセージを私に送るときには、メールを私に送ってくださ"
 "い。"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:231
+#: actions/emailsettings.php:232
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr "だれかが\"@-返信\"を私を送るときには、メールを私に送ってください、"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:237
+#: actions/emailsettings.php:238
 msgid "Allow friends to nudge me and send me an email."
 msgstr "友達が私に合図とメールを送ることを許可する。"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:243
+#: actions/emailsettings.php:244
 msgid "Publish a MicroID for my email address."
 msgstr "私のメールアドレスのためにMicroIDを発行してください。"
 
 #. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:361
+#: actions/emailsettings.php:362
 #, fuzzy
 msgid "Email preferences saved."
 msgstr "デザイン設定が保存されました。"
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:380
+#: actions/emailsettings.php:381
 msgid "No email address."
 msgstr "メールアドレスがありません。"
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:388
+#: actions/emailsettings.php:389
 #, fuzzy
 msgid "Cannot normalize that email address."
 msgstr "そのメールアドレスを正規化できません"
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:393 actions/register.php:212
+#: actions/emailsettings.php:394 actions/register.php:197
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "有効なメールアドレスではありません。"
 
 #. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:397
+#: actions/emailsettings.php:398
 msgid "That is already your email address."
 msgstr "これはすでにあなたのメールアドレスです。"
 
 #. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:401
+#: actions/emailsettings.php:402
 msgid "That email address already belongs to another user."
 msgstr "このメールアドレスは既に他の人が使っています。"
 
 #. TRANS: Server error thrown on database error adding e-mail confirmation code.
 #. TRANS: Server error thrown on database error adding Instant Messaging confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:418 actions/imsettings.php:343
-#: actions/smssettings.php:365
+#: actions/emailsettings.php:419 actions/imsettings.php:362
+#: actions/smssettings.php:364
 #, fuzzy
 msgid "Could not insert confirmation code."
 msgstr "承認コードを追加できません"
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:425
+#: actions/emailsettings.php:426
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
@@ -2629,60 +2678,63 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling Instant Messaging address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:445 actions/imsettings.php:377
-#: actions/smssettings.php:399
+#: actions/emailsettings.php:446 actions/imsettings.php:391
+#: actions/smssettings.php:398
 msgid "No pending confirmation to cancel."
 msgstr "承認待ちのものはありません。"
 
 #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:450
+#: actions/emailsettings.php:451
 #, fuzzy
 msgid "That is the wrong email address."
 msgstr "その IM アドレスは不正です。"
 
 #. TRANS: Server error thrown on database error canceling e-mail address confirmation.
 #. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
-#: actions/emailsettings.php:459 actions/smssettings.php:413
+#: actions/emailsettings.php:460 actions/smssettings.php:412
 #, fuzzy
 msgid "Could not delete email confirmation."
 msgstr "メール承認を削除できません"
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:464
+#: actions/emailsettings.php:465
 msgid "Email confirmation cancelled."
 msgstr "承認待ちのものはありません。"
 
 #. TRANS: Message given trying to remove an e-mail address that is not
 #. TRANS: registered for the active user.
-#: actions/emailsettings.php:483
+#: actions/emailsettings.php:484
 msgid "That is not your email address."
 msgstr "これはあなたのメールアドレスではありません。"
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:504
+#: actions/emailsettings.php:505
 msgid "The email address was removed."
 msgstr "入ってくるメールアドレスは削除されました。"
 
 #. TRANS: Form validation error displayed when trying to remove an incoming e-mail address while no address has been set.
-#: actions/emailsettings.php:518 actions/smssettings.php:555
+#: actions/emailsettings.php:519 actions/smssettings.php:554
 msgid "No incoming email address."
 msgstr "入ってくるメールアドレスではありません。"
 
 #. TRANS: Server error thrown on database error removing incoming e-mail address.
 #. TRANS: Server error thrown on database error adding incoming e-mail address.
-#: actions/emailsettings.php:530 actions/emailsettings.php:554
-#: actions/smssettings.php:565 actions/smssettings.php:588
+#. TRANS: Server error displayed when the user could not be updated in SMS settings.
+#: actions/emailsettings.php:531 actions/emailsettings.php:555
+#: actions/smssettings.php:565 actions/smssettings.php:590
 #, fuzzy
 msgid "Could not update user record."
 msgstr "ユーザレコードを更新できません。"
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:534 actions/smssettings.php:568
+#. TRANS: Confirmation text after updating SMS settings.
+#: actions/emailsettings.php:535 actions/smssettings.php:569
 msgid "Incoming email address removed."
 msgstr "入ってくるメールアドレスは削除されました。"
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:558 actions/smssettings.php:591
+#. TRANS: Confirmation text after updating SMS settings.
+#: actions/emailsettings.php:559 actions/smssettings.php:594
 msgid "New incoming email address added."
 msgstr "新しい入ってくるメールアドレスが追加されました。"
 
@@ -2694,7 +2746,7 @@ msgstr "このつぶやきはすでにお気に入りです!"
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
 #: actions/favor.php:95
 #, fuzzy
-msgid "Disfavor favorite"
+msgid "Disfavor favorite."
 msgstr "お気に入りをやめる"
 
 #. TRANS: Page title for first page of favorited notices.
@@ -2747,9 +2799,8 @@ msgstr ""
 #. TRANS: %s is a user's nickname.
 #. TRANS: Title for first page of favourite notices of a user.
 #. TRANS: %s is the user for whom the favourite notices are displayed.
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing own favourited notices.
 #: actions/favoritesrss.php:111 actions/showfavorites.php:76
-#: lib/personalgroupnav.php:122
+#: lib/personalgroupnav.php:110
 #, php-format
 msgid "%s's favorite notices"
 msgstr "%s のお気に入りのつぶやき"
@@ -2940,13 +2991,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
 #: actions/groupblock.php:191
 #, fuzzy
-msgid "Do not block this user from this group"
+msgid "Do not block this user from this group."
 msgstr "このグループからこのユーザをブロックしない"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
 #: actions/groupblock.php:198
 #, fuzzy
-msgid "Block this user from this group"
+msgid "Block this user from this group."
 msgstr "このグループからこのユーザをブロック"
 
 #. TRANS: Server error displayed when trying to block a user from a group fails because of an application error.
@@ -2955,6 +3006,7 @@ msgid "Database error blocking user from group."
 msgstr "グループからのブロックユーザのデータベースエラー"
 
 #. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
+#. TRANS: Client error displayed trying to find a user by ID without providing an ID.
 #: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr "ID がありません。"
@@ -2985,7 +3037,7 @@ msgid "Unable to update your design settings."
 msgstr "あなたのデザイン設定を保存できません。"
 
 #. TRANS: Form text to confirm saved group design settings.
-#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:222
+#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:239
 msgid "Design preferences saved."
 msgstr "デザイン設定が保存されました。"
 
@@ -3050,7 +3102,7 @@ msgid "A list of the users in this group."
 msgstr "このグループのユーザのリスト。"
 
 #. TRANS: Indicator in group members list that this user is a group administrator.
-#: actions/groupmembers.php:190
+#: actions/groupmembers.php:190 lib/action.php:581
 msgid "Admin"
 msgstr "管理者"
 
@@ -3143,8 +3195,10 @@ msgid "Group search"
 msgstr "グループの検索"
 
 #. TRANS: Text on page where groups can be searched if no results were found for a query.
-#: actions/groupsearch.php:82 actions/noticesearch.php:117
-#: actions/peoplesearch.php:83
+#. TRANS: Text for notice search results is the query had no results.
+#. TRANS: Message on the "People search" page where a query has no results.
+#: actions/groupsearch.php:82 actions/noticesearch.php:122
+#: actions/peoplesearch.php:87
 msgid "No results."
 msgstr "結果なし。"
 
@@ -3181,167 +3235,170 @@ msgid "User is not blocked from group."
 msgstr "ユーザはグループからブロックされていません。"
 
 #. TRANS: Server error displayed when unblocking a user from a group fails because of an unknown error.
+#. TRANS: Server error displayed when removing a user block.
 #: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "ブロックの削除エラー"
 
 #. TRANS: Title for Instant Messaging settings.
-#: actions/imsettings.php:58
+#: actions/imsettings.php:56
 msgid "IM settings"
 msgstr "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.
-#: actions/imsettings.php:71
+#: actions/imsettings.php:69
 #, fuzzy, php-format
 msgid ""
-"You can send and receive notices through Jabber/Google Talk [instant "
-"messages](%%doc.im%%). Configure your address and settings below."
+"You can send and receive notices through instant messaging [instant messages]"
+"(%%doc.im%%). Configure your addresses and settings below."
 msgstr ""
 "Jabber/GTalk [instant messages](%%doc.im%%)　経由で通知の送信、受信が可能で"
 "す。下のアドレスを設定して下さい。"
 
-#. TRANS: Message given in the Instant Messaging settings if XMPP is not enabled on the site.
+#. TRANS: Message given in the IM settings if IM is not enabled on the site.
 #: actions/imsettings.php:90
 msgid "IM is not available."
 msgstr "ＩＭ が利用不可。"
 
-#. TRANS: Form legend for Instant Messaging settings form.
-#. TRANS: Field label for Instant Messaging address input in Instant Messaging settings form.
-#: actions/imsettings.php:102 actions/imsettings.php:132
-msgid "IM address"
-msgstr "IMアドレス"
+#: actions/imsettings.php:116
+#, fuzzy, php-format
+msgid "Current confirmed %s address."
+msgstr "現在確認されているメールアドレス。"
 
-#: actions/imsettings.php:109
-#, fuzzy
-msgid "Current confirmed Jabber/Google Talk address."
-msgstr "確認された最新の　Jabber/GTakk アドレス"
-
-#. TRANS: Form note in Instant Messaging settings form.
-#. TRANS: %s is the Instant Messaging address set for the site.
-#: actions/imsettings.php:120
+#. TRANS: Form note in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:128
 #, fuzzy, php-format
 msgid ""
-"Awaiting confirmation on this address. Check your Jabber/Google Talk account "
-"for a message with further instructions. (Did you add %s to your buddy list?)"
+"Awaiting confirmation on this address. Check your %s account for a message "
+"with further instructions. (Did you add %s to your buddy list?)"
 msgstr ""
 "このアドレスは承認待ちです。Jabber か Gtalk のアカウントで追加の指示が書かれ"
 "たメッセージを確認してください。(%s を友人リストに追加しましたか？)"
 
-#. TRANS: IM address input field instructions in Instant Messaging settings form.
-#. TRANS: %s is the Instant Messaging address set for the site.
-#. TRANS: Do not translate "example.org". It is one of the domain names reserved for use in examples by
-#. TRANS: http://www.rfc-editor.org/rfc/rfc2606.txt. Any other domain may be owned by a legitimate
-#. TRANS: person or organization.
-#: actions/imsettings.php:139
-#, fuzzy, php-format
-msgid ""
-"Jabber or Google Talk address, like \"UserName@example.org\". First, make "
-"sure to add %s to your buddy list in your IM client or on Google Talk."
-msgstr ""
-"\"UserName@example.org\" といった Jabber または GTalk のアドレス。まず、%s を"
-"IMクライアントやGTalkに追加して下さい。"
+#: actions/imsettings.php:140
+msgid "IM address"
+msgstr "IMアドレス"
 
-#. TRANS: Form legend for Instant Messaging preferences form.
-#: actions/imsettings.php:154
-msgid "IM preferences"
+#: actions/imsettings.php:142
+#, php-format
+msgid "%s screenname."
+msgstr ""
+
+#. TRANS: Header for IM preferences form.
+#: actions/imsettings.php:163
+#, fuzzy
+msgid "IM Preferences"
 msgstr "設定が保存されました。"
 
-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:159
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:174
 #, fuzzy
-msgid "Send me notices through Jabber/Google Talk."
-msgstr "Jabber/GTalk で私に通知を送って下さい。"
+msgid "Send me notices"
+msgstr "つぶやきを送る"
 
-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:165
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:176
 #, fuzzy
-msgid "Post a notice when my Jabber/Google Talk status changes."
+msgid "Post a notice when my status changes."
 msgstr "Jabber/GTalkのステータスが変更された時に通知を送る。"
 
-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:171
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:178
 #, fuzzy
-msgid ""
-"Send me replies through Jabber/Google Talk from people I'm not subscribed to."
+msgid "Send me replies from people I'm not subscribed to."
 msgstr ""
 "Jabber/GTalkを通して回答を、私がフォローされていない人々から私に送ってくださ"
 "い。"
 
-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:178
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:181
 #, fuzzy
-msgid "Publish a MicroID for my Jabber/Google Talk address."
-msgstr "私のJabber/GTalkアドレスのためにMicroIDを発行してください。"
+msgid "Publish a MicroID"
+msgstr "私のメールアドレスのためにMicroIDを発行してください。"
 
-#. TRANS: Confirmation message for successful Instant Messaging preferences save.
-#: actions/imsettings.php:283 actions/othersettings.php:192
+#. TRANS: Server error thrown on database error updating IM preferences.
+#: actions/imsettings.php:291
+#, fuzzy
+msgid "Couldn't update IM preferences."
+msgstr "ユーザを更新できませんでした。"
+
+#. TRANS: Confirmation message for successful IM preferences save.
+#. TRANS: Confirmation message after saving preferences.
+#: actions/imsettings.php:298 actions/urlsettings.php:244
 msgid "Preferences saved."
 msgstr "設定が保存されました。"
 
-#. TRANS: Message given saving Instant Messaging address without having provided one.
-#: actions/imsettings.php:304
-msgid "No Jabber ID."
-msgstr "Jabbar ID はありません。"
-
-#. TRANS: Message given saving Instant Messaging address that cannot be normalised.
-#: actions/imsettings.php:312
+#. TRANS: Message given saving IM address without having provided one.
+#: actions/imsettings.php:320
 #, fuzzy
-msgid "Cannot normalize that Jabber ID."
+msgid "No screenname."
+msgstr "ニックネームがありません。"
+
+#: actions/imsettings.php:325
+#, fuzzy
+msgid "No transport."
+msgstr "つぶやきがありません。"
+
+#. TRANS: Message given saving IM address that cannot be normalised.
+#: actions/imsettings.php:333
+#, fuzzy
+msgid "Cannot normalize that screenname"
 msgstr "その Jabbar ID を正規化できません"
 
-#. TRANS: Message given saving Instant Messaging address that not valid.
-#: actions/imsettings.php:317
+#. TRANS: Message given saving IM address that not valid.
+#: actions/imsettings.php:340
 #, fuzzy
-msgid "Not a valid Jabber ID."
-msgstr "有効な Jabber ID ではありません。"
+msgid "Not a valid screenname"
+msgstr "有効なニックネームではありません。"
 
-#. TRANS: Message given saving Instant Messaging address that is already set.
-#: actions/imsettings.php:321
-msgid "That is already your Jabber ID."
-msgstr "その Jabber ID は既にあなたのものです。"
-
-#. TRANS: Message given saving Instant Messaging address that is already set for another user.
-#: actions/imsettings.php:325
-msgid "Jabber ID already belongs to another user."
+#. TRANS: Message given saving IM address that is already set for another user.
+#: actions/imsettings.php:344
+#, fuzzy
+msgid "Screenname already belongs to another user."
 msgstr "Jabber ID ｊは既に別のユーザが使用しています。"
 
-#. TRANS: Message given saving valid Instant Messaging address that is to be confirmed.
-#. TRANS: %s is the Instant Messaging address set for the site.
-#: actions/imsettings.php:353
-#, php-format
-msgid ""
-"A confirmation code was sent to the IM address you added. You must approve %"
-"s for sending messages to you."
+#. TRANS: Message given saving valid IM address that is to be confirmed.
+#: actions/imsettings.php:369
+#, fuzzy
+msgid "A confirmation code was sent to the IM address you added."
 msgstr ""
 "承認コードを入力された IM アドレスに送信しました。あなたにメッセージを送れる"
 "ようにするには%sを承認してください。"
 
-#. TRANS: Message given canceling Instant Messaging address confirmation for the wrong IM address.
-#: actions/imsettings.php:382
+#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#: actions/imsettings.php:396
 msgid "That is the wrong IM address."
 msgstr "その IM アドレスは不正です。"
 
-#. TRANS: Server error thrown on database error canceling Instant Messaging address confirmation.
-#: actions/imsettings.php:391
+#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#: actions/imsettings.php:405
 #, fuzzy
-msgid "Could not delete IM confirmation."
+msgid "Couldn't delete confirmation."
 msgstr "メール承認を削除できません"
 
-#. TRANS: Message given after successfully canceling Instant Messaging address confirmation.
-#: actions/imsettings.php:396
+#. TRANS: Message given after successfully canceling IM address confirmation.
+#: actions/imsettings.php:410
 msgid "IM confirmation cancelled."
 msgstr "確認コードがありません。"
 
-#. TRANS: Message given trying to remove an Instant Messaging address that is not
+#. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.
-#: actions/imsettings.php:417
-msgid "That is not your Jabber ID."
-msgstr "その Jabber ID はあなたのものではありません。"
+#: actions/imsettings.php:434
+#, fuzzy
+msgid "That is not your screenname."
+msgstr "それはあなたの電話番号ではありません。"
+
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#: actions/imsettings.php:443
+#, fuzzy
+msgid "Couldn't update user im prefs."
+msgstr "ユーザレコードを更新できません。"
 
 #. TRANS: Message given after successfully removing a registered Instant Messaging address.
-#: actions/imsettings.php:440
+#: actions/imsettings.php:451
 msgid "The IM address was removed."
 msgstr "入ってくるメールアドレスは削除されました。"
 
@@ -3555,7 +3612,7 @@ msgid "You must be logged in to join a group."
 msgstr "グループに入るためにはログインしなければなりません。"
 
 #. TRANS: Title for join group page after joining.
-#: actions/joingroup.php:147
+#: actions/joingroup.php:148
 #, fuzzy, php-format
 msgctxt "TITLE"
 msgid "%1$s joined group %2$s"
@@ -3683,7 +3740,7 @@ msgstr ""
 #. TRANS: Submit button title.
 #: actions/licenseadminpanel.php:311 actions/sessionsadminpanel.php:199
 #: actions/siteadminpanel.php:292 actions/snapshotadminpanel.php:245
-#: actions/tagother.php:154 lib/applicationeditform.php:357
+#: actions/tagother.php:133 lib/applicationeditform.php:357
 msgid "Save"
 msgstr "保存"
 
@@ -3691,39 +3748,41 @@ msgstr "保存"
 msgid "Save license settings"
 msgstr ""
 
-#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
+#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
+#: actions/login.php:97 actions/otp.php:62 actions/register.php:130
 msgid "Already logged in."
 msgstr "既にログインしています。"
 
-#: actions/login.php:148
+#: actions/login.php:125
 msgid "Incorrect username or password."
 msgstr "ユーザ名またはパスワードが間違っています。"
 
-#: actions/login.php:154 actions/otp.php:120
+#. TRANS: Server error displayed when a user object could not be created trying to login using "one time password login".
+#: actions/login.php:131 actions/otp.php:127
 msgid "Error setting user. You are probably not authorized."
 msgstr "ユーザ設定エラー。 あなたはたぶん承認されていません。"
 
-#: actions/login.php:210 actions/login.php:263
+#: actions/login.php:185 actions/login.php:236 lib/action.php:598
 msgid "Login"
 msgstr "ログイン"
 
-#: actions/login.php:249
+#: actions/login.php:222
 msgid "Login to site"
 msgstr "サイトへログイン"
 
-#: actions/login.php:258 actions/register.php:490
+#: actions/login.php:231 actions/register.php:469
 msgid "Remember me"
 msgstr "ログイン状態を保持"
 
-#: actions/login.php:259 actions/register.php:492
+#: actions/login.php:232 actions/register.php:471
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "以降は自動的にログインする。共用コンピューターでは避けましょう！"
 
-#: actions/login.php:269
+#: actions/login.php:241
 msgid "Lost or forgotten password?"
 msgstr "パスワードを紛失、忘れた？"
 
-#: actions/login.php:288
+#: actions/login.php:259
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -3731,12 +3790,12 @@ msgstr ""
 "セキュリティー上の理由により、設定を変更する前にユーザ名とパスワードを入力し"
 "て下さい。"
 
-#: actions/login.php:292
+#: actions/login.php:263
 #, fuzzy
 msgid "Login with your username and password."
 msgstr "ユーザ名とパスワードでログイン"
 
-#: actions/login.php:295
+#: actions/login.php:266
 #, fuzzy, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -3864,7 +3923,9 @@ msgstr "新しいつぶやき"
 msgid "Notice posted"
 msgstr "つぶやきを投稿しました"
 
-#: actions/noticesearch.php:68
+#. TRANS: Instructions for Notice search page.
+#. TRANS: %%site.name%% is the name of the StatusNet site.
+#: actions/noticesearch.php:69
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -3872,16 +3933,21 @@ msgid ""
 msgstr ""
 "%%site.name%% のつぶやきを内容から検索。検索語はスペース区切り。3字以上"
 
-#: actions/noticesearch.php:78
+#. TRANS: Title of the page where users can search for notices.
+#: actions/noticesearch.php:80
 msgid "Text search"
 msgstr "テキスト検索"
 
-#: actions/noticesearch.php:91
+#. TRANS: Test in RSS notice search.
+#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
+#: actions/noticesearch.php:95
 #, php-format
 msgid "Search results for \"%1$s\" on %2$s"
 msgstr "\"%1$s\" の %2$s 上の検索結果"
 
-#: actions/noticesearch.php:121
+#. TRANS: Text for logged in users making a query for notices without results.
+#. TRANS: This message contains a Markdown link.
+#: actions/noticesearch.php:128
 #, php-format
 msgid ""
 "Be the first to [post on this topic](%%%%action.newnotice%%%%?"
@@ -3890,7 +3956,9 @@ msgstr ""
 "最初の [このトピック投稿](%%%%action.newnotice%%%%?status_textarea=%s) をして"
 "ください!"
 
-#: actions/noticesearch.php:124
+#. TRANS: Text for not logged in users making a query for notices without results.
+#. TRANS: This message contains Markdown links.
+#: actions/noticesearch.php:133
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and be the first to "
@@ -3899,14 +3967,17 @@ msgstr ""
 "なぜ [アカウント登録](%%%%action.register%%%%) しないのですか、そして最初の"
 "[このトピック投稿](%%%%action.newnotice%%%%?status_textarea=%s)してください!"
 
-#: actions/noticesearchrss.php:96
+#. TRANS: RSS notice search feed title. %s is the query.
+#: actions/noticesearchrss.php:95
 #, php-format
 msgid "Updates with \"%s\""
 msgstr "%s で更新"
 
-#: actions/noticesearchrss.php:98
+#. TRANS: RSS notice search feed description.
+#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
+#: actions/noticesearchrss.php:99
 #, fuzzy, php-format
-msgid "Updates matching search term \"%1$s\" on %2$s!"
+msgid "Updates matching search term \"%1$s\" on %2$s."
 msgstr "\"%2$s\" 上の検索語 \"$1$s\" に一致するすべての更新"
 
 #: actions/nudge.php:85
@@ -3927,51 +3998,51 @@ msgid "Nudge sent!"
 msgstr "合図を送った!"
 
 #. TRANS: Message displayed to an anonymous user trying to view OAuth application list.
-#: actions/oauthappssettings.php:60
+#: actions/oauthappssettings.php:57
 msgid "You must be logged in to list your applications."
 msgstr "アプリケーションをリストするにはログインしていなければなりません。"
 
 #. TRANS: Page title for OAuth applications
-#: actions/oauthappssettings.php:76
+#: actions/oauthappssettings.php:73
 msgid "OAuth applications"
 msgstr "OAuth アプリケーション"
 
 #. TRANS: Page instructions for OAuth applications
-#: actions/oauthappssettings.php:88
+#: actions/oauthappssettings.php:85
 msgid "Applications you have registered"
 msgstr "あなたが登録したアプリケーション"
 
 #. TRANS: Empty list message on page with OAuth applications.
-#: actions/oauthappssettings.php:141
+#: actions/oauthappssettings.php:138
 #, php-format
 msgid "You have not registered any applications yet."
 msgstr "あなたはまだなんのアプリケーションも登録していません。"
 
 #. TRANS: Title for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:71
+#: actions/oauthconnectionssettings.php:69
 msgid "Connected applications"
 msgstr "接続されたアプリケーション"
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:83
+#: actions/oauthconnectionssettings.php:80
 msgid "The following connections exist for your account."
 msgstr ""
 
 #. TRANS: Client error when trying to revoke access for an application while not being a user of it.
-#: actions/oauthconnectionssettings.php:168
+#: actions/oauthconnectionssettings.php:165
 msgid "You are not a user of that application."
 msgstr "あなたはそのアプリケーションのユーザではありません。"
 
 #. TRANS: Client error when revoking access has failed for some reason.
 #. TRANS: %s is the application ID revoking access failed for.
-#: actions/oauthconnectionssettings.php:183
+#: actions/oauthconnectionssettings.php:180
 #, fuzzy, php-format
 msgid "Unable to revoke access for application: %s."
 msgstr "アプリケーションのための取消しアクセスができません: "
 
 #. TRANS: Success message after revoking access for an application.
 #. TRANS: %1$s is the application name, %2$s is the first part of the user token.
-#: actions/oauthconnectionssettings.php:202
+#: actions/oauthconnectionssettings.php:199
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -3979,7 +4050,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:213
+#: actions/oauthconnectionssettings.php:210
 msgid "You have not authorized any applications to use your account."
 msgstr ""
 "あなたは、どんなアプリケーションもあなたのアカウントを使用するのを認可してい"
@@ -3988,13 +4059,23 @@ msgstr ""
 #. TRANS: Note for developers in the OAuth connection settings form.
 #. TRANS: This message contains a Markdown link. Do not separate "](".
 #. TRANS: %s is the URL to the OAuth settings.
-#: actions/oauthconnectionssettings.php:233
+#: actions/oauthconnectionssettings.php:230
 #, php-format
 msgid ""
 "Are you a developer? [Register an OAuth client application](%s) to use with "
 "this instance of StatusNet."
 msgstr ""
 
+#: actions/oembed.php:64
+#, fuzzy, php-format
+msgid "\"%s\" not found."
+msgstr "API メソッドが見つかりません。"
+
+#: actions/oembed.php:76
+#, fuzzy, php-format
+msgid "Notice %s not found."
+msgstr "API メソッドが見つかりません。"
+
 #: actions/oembed.php:80 actions/shownotice.php:100
 msgid "Notice has no profile."
 msgstr "ユーザはプロフィールをもっていません。"
@@ -4004,6 +4085,16 @@ msgstr "ユーザはプロフィールをもっていません。"
 msgid "%1$s's status on %2$s"
 msgstr "%2$s における %1$s のステータス"
 
+#: actions/oembed.php:95
+#, fuzzy, php-format
+msgid "Attachment %s not found."
+msgstr "受け取り手のユーザが見つかりません。"
+
+#: actions/oembed.php:136
+#, php-format
+msgid "\"%s\" not supported for oembed requests."
+msgstr ""
+
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
 #: actions/oembed.php:168
 #, fuzzy, php-format
@@ -4017,94 +4108,60 @@ msgid "Only %s URLs over plain HTTP please."
 msgstr ""
 
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1205
-#: lib/apiaction.php:1232 lib/apiaction.php:1367
+#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1207
+#: lib/apiaction.php:1234 lib/apiaction.php:1369
 msgid "Not a supported data format."
 msgstr "サポートされていないデータ形式。"
 
+#. TRANS: ShortName in the OpenSearch interface when trying to find users.
 #: actions/opensearch.php:64
 msgid "People Search"
 msgstr "ピープル検索"
 
-#: actions/opensearch.php:67
+#: actions/opensearch.php:68
 msgid "Notice Search"
 msgstr "つぶやき検索"
 
-#: actions/othersettings.php:59
-msgid "Other settings"
-msgstr "その他の設定"
-
-#. TRANS: Instructions for tab "Other" in user profile settings.
-#: actions/othersettings.php:71
-msgid "Manage various other options."
-msgstr "他のオプションを管理。"
-
-#. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
-#. TRANS: user's profile settings. Use of "free" is as in "open", indicating that the
-#. TRANS: information on the shortener site is freely distributable.
-#. TRANS: This message has one space at the beginning. Use your language's word separator
-#. TRANS: here if it has one (most likely a single space).
-#: actions/othersettings.php:113
-msgid " (free service)"
-msgstr "(フリーサービス)"
-
-#. TRANS: Label for dropdown with URL shortener services.
-#: actions/othersettings.php:122
-msgid "Shorten URLs with"
-msgstr "URLを短くします"
-
-#. TRANS: Tooltip for for dropdown with URL shortener services.
-#: actions/othersettings.php:124
-msgid "Automatic shortening service to use."
-msgstr "使用する自動短縮サービス。"
-
-#. TRANS: Label for checkbox.
-#: actions/othersettings.php:130
-msgid "View profile designs"
-msgstr "プロファイルデザインを表示"
-
-#. TRANS: Tooltip for checkbox.
-#: actions/othersettings.php:132
-msgid "Show or hide profile designs."
-msgstr "プロファイルデザインの表示または非表示"
-
-#. TRANS: Form validation error for form "Other settings" in user profile.
-#: actions/othersettings.php:164
-#, fuzzy
-msgid "URL shortening service is too long (maximum 50 characters)."
-msgstr "URL 短縮サービスが長すぎます。（最大50字）"
-
-#: actions/otp.php:69
+#. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
+#: actions/otp.php:70
 msgid "No user ID specified."
 msgstr "ユーザIDの記述がありません。"
 
-#: actions/otp.php:83
+#. TRANS: Client error displayed trying to use "one time password login" without specifying a login token.
+#: actions/otp.php:86
 msgid "No login token specified."
 msgstr "ログイントークンの記述がありません。"
 
-#: actions/otp.php:90
+#. TRANS: Client error displayed trying to use "one time password login" without requesting a login token.
+#: actions/otp.php:94
 msgid "No login token requested."
 msgstr "ログイントークンが要求されていません。"
 
-#: actions/otp.php:95
+#. TRANS: Client error displayed trying to use "one time password login" while specifying an invalid login token.
+#: actions/otp.php:100
 msgid "Invalid login token specified."
 msgstr "不正なログイントークンが指定されています。"
 
-#: actions/otp.php:104
+#. TRANS: Client error displayed trying to use "one time password login" while specifying an expired login token.
+#: actions/otp.php:110
 msgid "Login token expired."
 msgstr "ログイントークンが期限切れです・"
 
-#: actions/outbox.php:58
+#. TRANS: Title for outbox for any but the fist page.
+#. TRANS: %1$s is the user nickname, %2$d is the page number.
+#: actions/outbox.php:57
 #, php-format
 msgid "Outbox for %1$s - page %2$d"
 msgstr "%1$s の送信箱 - ページ %2$d"
 
+#. TRANS: Title for first page of outbox.
 #: actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
 msgstr "%s の送信箱"
 
-#: actions/outbox.php:104
+#. TRANS: Instructions for outbox.
+#: actions/outbox.php:103
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr ""
 "これはあなたの送信箱です、あなたが送ったプライベート・メッセージをリストしま"
@@ -4132,43 +4189,45 @@ msgstr "古いパスワード"
 msgid "New password"
 msgstr "新しいパスワード"
 
-#: actions/passwordsettings.php:109
+#: actions/passwordsettings.php:109 actions/register.php:416
 #, fuzzy
-msgid "6 or more characters"
+msgid "6 or more characters."
 msgstr "6文字以上"
 
-#: actions/passwordsettings.php:113
+#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#: actions/passwordsettings.php:113 actions/recoverpassword.php:264
+#: actions/register.php:420
 #, fuzzy
-msgid "Same as password above"
+msgid "Same as password above."
 msgstr "上と同じパスワード"
 
 #: actions/passwordsettings.php:117
 msgid "Change"
 msgstr "変更"
 
-#: actions/passwordsettings.php:154 actions/register.php:238
+#: actions/passwordsettings.php:153 actions/register.php:223
 msgid "Password must be 6 or more characters."
 msgstr "パスワードは6文字以上にする必要があります。"
 
-#: actions/passwordsettings.php:157 actions/register.php:241
+#: actions/passwordsettings.php:156 actions/register.php:226
 msgid "Passwords don't match."
 msgstr "パスワードが一致しません。"
 
-#: actions/passwordsettings.php:165
+#: actions/passwordsettings.php:164
 msgid "Incorrect old password"
 msgstr "古いパスワードが間違っています。"
 
-#: actions/passwordsettings.php:181
+#: actions/passwordsettings.php:180
 msgid "Error saving user; invalid."
 msgstr "ユーザ保存エラー; 不正なユーザ"
 
-#: actions/passwordsettings.php:186
+#. TRANS: Reset password form validation error message.
+#: actions/passwordsettings.php:185 actions/recoverpassword.php:418
 #, fuzzy
-msgid "Can't save new password."
+msgid "Cannot save new password."
 msgstr "新しいパスワードを保存できません。"
 
-#. TRANS: Title for password recovery page in password saved mode.
-#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
+#: actions/passwordsettings.php:191
 msgid "Password saved."
 msgstr "パスワードが保存されました。"
 
@@ -4385,8 +4444,7 @@ msgid "Directory where backgrounds are located."
 msgstr "ロケールへのディレクトリパス"
 
 #. TRANS: Fieldset legens in Paths admin panel.
-#. TRANS: DT element label in attachment list.
-#: actions/pathsadminpanel.php:419 lib/attachmentlist.php:98
+#: actions/pathsadminpanel.php:419
 msgid "Attachments"
 msgstr "添付"
 
@@ -4460,7 +4518,9 @@ msgstr "ダイレクト SSL リクエストを向けるサーバ"
 msgid "Save paths"
 msgstr "保存パス"
 
-#: actions/peoplesearch.php:52
+#. TRANS: Instructions for the "People search" page.
+#. TRANS: %%site.name%% is the name of the StatusNet site.
+#: actions/peoplesearch.php:54
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
@@ -4469,7 +4529,8 @@ msgstr ""
 "%%site.name%% の人を名前、場所、興味から検索。検索語はスペース区切り。3字以"
 "上。"
 
-#: actions/peoplesearch.php:58
+#. TRANS: Title of a page where users can search for other users.
+#: actions/peoplesearch.php:61
 msgid "People search"
 msgstr "ピープルサーチ"
 
@@ -4483,6 +4544,60 @@ msgstr "有効なメールアドレスではありません。"
 msgid "Users self-tagged with %1$s - page %2$d"
 msgstr "ユーザ自身がつけたタグ %1$s  - ページ %2$d"
 
+#. TRANS: Page title for AJAX form return when a disabling a plugin.
+#: actions/plugindisable.php:69
+msgctxt "plugin"
+msgid "Disabled"
+msgstr ""
+
+#. TRANS: Client error displayed trying to perform any request method other than POST.
+#. TRANS: Do not translate POST.
+#: actions/pluginenable.php:78 actions/subscribe.php:77
+msgid "This action only accepts POST requests."
+msgstr ""
+
+#: actions/pluginenable.php:102
+#, fuzzy
+msgid "You cannot administer plugins."
+msgstr "ユーザを削除できません"
+
+#: actions/pluginenable.php:109
+#, fuzzy
+msgid "No such plugin."
+msgstr "そのようなページはありません。"
+
+#. TRANS: Page title for AJAX form return when enabling a plugin.
+#: actions/pluginenable.php:159
+msgctxt "plugin"
+msgid "Enabled"
+msgstr ""
+
+#. TRANS: Tab and title for plugins admin panel.
+#. TRANS: Menu item for site administration
+#: actions/pluginsadminpanel.php:56 actions/version.php:191
+#: lib/adminpanelaction.php:411
+msgid "Plugins"
+msgstr "プラグイン"
+
+#. TRANS: Instructions at top of plugin admin page.
+#: actions/pluginsadminpanel.php:68
+msgid ""
+"Additional plugins can be enabled and configured manually. See the <a href="
+"\"http://status.net/wiki/Plugins\">online plugin documentation</a> for more "
+"details."
+msgstr ""
+
+#. TRANS: Admin form section header
+#: actions/pluginsadminpanel.php:84
+#, fuzzy
+msgid "Default plugins"
+msgstr "ご希望の言語"
+
+#: actions/pluginsadminpanel.php:106
+msgid ""
+"All default plugins have been disabled from the site's configuration file."
+msgstr ""
+
 #: actions/postnotice.php:95
 msgid "Invalid notice content."
 msgstr "不正なトークン。"
@@ -4494,12 +4609,12 @@ msgstr ""
 "つぶやきライセンス ‘%1$s’ はサイトライセンス ‘%2$s’ と互換性がありません。"
 
 #. TRANS: Page title for profile settings.
-#: actions/profilesettings.php:59
+#: actions/profilesettings.php:60
 msgid "Profile settings"
 msgstr "プロファイル設定"
 
 #. TRANS: Usage instructions for profile settings.
-#: actions/profilesettings.php:70
+#: actions/profilesettings.php:71
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
@@ -4507,34 +4622,31 @@ msgstr ""
 "す。"
 
 #. TRANS: Profile settings form legend.
-#: actions/profilesettings.php:98
+#: actions/profilesettings.php:99
 msgid "Profile information"
 msgstr "プロファイル情報"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109 actions/register.php:433
+#: actions/profilesettings.php:110 actions/register.php:412
 #, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr "1-64文字の、小文字アルファベットか数字で、スペースや句読点は除く"
 
 #. TRANS: Field label in form for profile settings.
-#. TRANS: Label for full group name (dt). Text hidden by default.
-#. TRANS: DT for full name in a profile.
-#: actions/profilesettings.php:113 actions/register.php:455
-#: actions/showgroup.php:255 actions/tagother.php:104
-#: lib/groupeditform.php:150 lib/userprofile.php:156
+#: actions/profilesettings.php:114 actions/register.php:434
+#: lib/groupeditform.php:150
 msgid "Full name"
 msgstr "フルネーム"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:118 actions/register.php:460
+#: actions/profilesettings.php:119 actions/register.php:439
 #: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "ホームページ"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:121
+#: actions/profilesettings.php:122 actions/register.php:441
 #, fuzzy
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr "ホームページ、ブログ、プロファイル、その他サイトの URL"
@@ -4542,142 +4654,138 @@ msgstr "ホームページ、ブログ、プロファイル、その他サイト
 #. TRANS: Tooltip for field label in form for profile settings. Plural
 #. TRANS: is decided by the number of characters available for the
 #. TRANS: biography (%d).
-#: actions/profilesettings.php:129 actions/register.php:471
+#: actions/profilesettings.php:130 actions/register.php:450
 #, fuzzy, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
 msgstr[0] "%d字以内で自分自身と自分の興味について書いてください"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:135 actions/register.php:476
+#: actions/profilesettings.php:136 actions/register.php:455
 msgid "Describe yourself and your interests"
 msgstr "自分自身と自分の興味について書いてください"
 
 #. TRANS: Text area label in form for profile settings where users can provide.
 #. TRANS: their biography.
-#: actions/profilesettings.php:139 actions/register.php:478
+#: actions/profilesettings.php:140 actions/register.php:457
 msgid "Bio"
 msgstr "自己紹介"
 
 #. TRANS: Field label in form for profile settings.
-#. TRANS: Label for group location (dt). Text hidden by default.
-#. TRANS: DT for location in a profile.
-#: actions/profilesettings.php:145 actions/register.php:483
-#: actions/showgroup.php:265 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:173
-#: lib/userprofile.php:172
+#: actions/profilesettings.php:146 actions/register.php:462
+#: lib/groupeditform.php:173
 msgid "Location"
 msgstr "場所"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148 actions/register.php:485
+#: actions/profilesettings.php:149
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "自分のいる場所。例：「都市, 都道府県 (または地域), 国」"
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:153
+#: actions/profilesettings.php:154
 msgid "Share my current location when posting notices"
 msgstr "つぶやきを投稿するときには私の現在の場所を共有してください"
 
 #. TRANS: Field label in form for profile settings.
-#. TRANS: DT for tags in a profile.
-#: actions/profilesettings.php:161 actions/tagother.php:149
-#: actions/tagother.php:209 lib/subscriptionlist.php:106
-#: lib/subscriptionlist.php:108 lib/userprofile.php:220
+#: actions/profilesettings.php:162 actions/tagother.php:128
+#: actions/tagother.php:188 lib/subscriptionlist.php:104
+#: lib/subscriptionlist.php:106
 msgid "Tags"
 msgstr "タグ"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:164
+#: actions/profilesettings.php:165
 #, fuzzy
 msgid ""
-"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- "
+"separated."
 msgstr ""
 "自分自身についてのタグ (アルファベット、数字、-、.、_)、カンマまたは空白区切"
 "りで"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:169
+#: actions/profilesettings.php:170
 msgid "Language"
 msgstr "言語"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:171
+#: actions/profilesettings.php:172
 #, fuzzy
-msgid "Preferred language"
+msgid "Preferred language."
 msgstr "ご希望の言語"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:181
+#: actions/profilesettings.php:182
 msgid "Timezone"
 msgstr "タイムゾーン"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:183
+#: actions/profilesettings.php:184
 msgid "What timezone are you normally in?"
 msgstr "普段のタイムゾーンはどれですか？"
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:189
+#: actions/profilesettings.php:190
 #, fuzzy
 msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)"
+"Automatically subscribe to whoever subscribes to me (best for non-humans)."
 msgstr "自分をフォローしている者を自動的にフォローする (BOTに最適)"
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Plural form is used based on the maximum number of allowed
 #. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:258 actions/register.php:229
+#: actions/profilesettings.php:259 actions/register.php:214
 #, fuzzy, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
 msgstr[0] "自己紹介が長すぎます (最長%d文字)。"
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:269 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:270 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr "タイムゾーンが選ばれていません。"
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:277
+#: actions/profilesettings.php:278
 #, fuzzy
 msgid "Language is too long (maximum 50 characters)."
 msgstr "言語が長すぎます。(最大50字)"
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:291 actions/tagother.php:178
-#, php-format
-msgid "Invalid tag: \"%s\""
+#: actions/profilesettings.php:292
+#, fuzzy, php-format
+msgid "Invalid tag: \"%s\"."
 msgstr "不正なタグ: \"%s\""
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:347
+#: actions/profilesettings.php:348
 #, fuzzy
 msgid "Could not update user for autosubscribe."
 msgstr "自動フォローのためのユーザを更新できませんでした。"
 
 #. TRANS: Server error thrown when user profile location preference settings could not be updated.
-#: actions/profilesettings.php:405
+#: actions/profilesettings.php:406
 #, fuzzy
 msgid "Could not save location prefs."
 msgstr "場所情報を保存できません。"
 
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:427 actions/tagother.php:200
+#: actions/profilesettings.php:428 actions/tagother.php:179
 msgid "Could not save tags."
 msgstr "タグをを保存できません。"
 
 #. TRANS: Confirmation shown when user profile settings are saved.
 #. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:436 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:437 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "設定が保存されました。"
 
 #. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
 #. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:483 actions/restoreaccount.php:60
+#: actions/profilesettings.php:484 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "新しいグループを作成"
@@ -4758,6 +4866,12 @@ msgstr ""
 "net/)を基にした[マイクロブロギング](http://en.wikipedia.org/wiki/Micro-"
 "blogging) サービス。"
 
+#. TRANS: Public RSS feed description. %s is the StatusNet site name.
+#: actions/publicrss.php:106
+#, fuzzy, php-format
+msgid "%s updates from everyone."
+msgstr "皆からの %s アップデート!"
+
 #. TRANS: Title for public tag cloud.
 #: actions/publictagcloud.php:57
 msgid "Public tag cloud"
@@ -4799,10 +4913,6 @@ msgstr ""
 "なぜ [アカウント登録](%%action.register%%) しないのですか。そして最初の投稿を"
 "してください!"
 
-#: actions/publictagcloud.php:146
-msgid "Tag cloud"
-msgstr "タグクラウド"
-
 #. TRANS: Client error displayed trying to recover password while already logged in.
 #: actions/recoverpassword.php:37
 msgid "You are already logged in!"
@@ -4894,6 +5004,12 @@ msgstr "パスワードを回復"
 msgid "Password recovery requested"
 msgstr "パスワード回復がリクエストされました"
 
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/recoverpassword.php:229
+#, fuzzy
+msgid "Password saved"
+msgstr "パスワードが保存されました。"
+
 #. TRANS: Title for password recovery page when an unknown action has been specified.
 #: actions/recoverpassword.php:232
 msgid "Unknown action"
@@ -4905,15 +5021,9 @@ msgstr "不明なアクション"
 msgid "6 or more characters, and do not forget it!"
 msgstr "6文字以上。忘れないでください！"
 
-#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
-#: actions/recoverpassword.php:264 actions/register.php:441
-#, fuzzy
-msgid "Same as password above."
-msgstr "上と同じパスワード"
-
 #. TRANS: Button text for password reset form.
 #. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: actions/recoverpassword.php:268 lib/designsettings.php:264
+#: actions/recoverpassword.php:268 lib/designform.php:145
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Reset"
@@ -4962,14 +5072,8 @@ msgstr "パスワードは6字以上でなければいけません。"
 msgid "Password and confirmation do not match."
 msgstr "パスワードと確認が一致しません。"
 
-#. TRANS: Reset password form validation error message.
-#: actions/recoverpassword.php:418
-#, fuzzy
-msgid "Cannot save new password."
-msgstr "新しいパスワードを保存できません。"
-
 #. TRANS: Server error displayed when something does wrong with the user object during password reset.
-#: actions/recoverpassword.php:426 actions/register.php:256
+#: actions/recoverpassword.php:426 actions/register.php:241
 msgid "Error setting user."
 msgstr "ユーザ設定エラー"
 
@@ -4978,104 +5082,108 @@ msgstr "ユーザ設定エラー"
 msgid "New password successfully saved. You are now logged in."
 msgstr "新しいパスワードの保存に成功しました。ログインしています。"
 
-#: actions/register.php:92 actions/register.php:196 actions/register.php:413
+#: actions/redirecturl.php:70
+#, fuzzy
+msgid "No id parameter"
+msgstr "ID引数がありません。"
+
+#: actions/redirecturl.php:76
+#, fuzzy, php-format
+msgid "No such file \"%d\""
+msgstr "そのようなファイルはありません。"
+
+#: actions/register.php:80 actions/register.php:181 actions/register.php:392
 msgid "Sorry, only invited people can register."
 msgstr "すみません、招待された人々だけが登録できます。"
 
-#: actions/register.php:99
+#: actions/register.php:87
 msgid "Sorry, invalid invitation code."
 msgstr "すみません、不正な招待コード。"
 
-#: actions/register.php:119
+#: actions/register.php:106
 msgid "Registration successful"
 msgstr "登録成功"
 
-#: actions/register.php:121 actions/register.php:511
+#: actions/register.php:108 actions/register.php:490
 msgid "Register"
 msgstr "登録"
 
-#: actions/register.php:142
+#: actions/register.php:128
 msgid "Registration not allowed."
 msgstr "登録は許可されていません。"
 
-#: actions/register.php:209
+#: actions/register.php:194
 #, fuzzy
-msgid "You can't register if you don't agree to the license."
+msgid "You cannot register if you don't agree to the license."
 msgstr "ライセンスに同意頂けない場合は登録できません。"
 
-#: actions/register.php:218
+#: actions/register.php:203
 msgid "Email address already exists."
 msgstr "メールアドレスが既に存在します。"
 
-#: actions/register.php:251 actions/register.php:273
+#: actions/register.php:236 actions/register.php:258
 msgid "Invalid username or password."
 msgstr "不正なユーザ名またはパスワード。"
 
-#: actions/register.php:351
+#: actions/register.php:333
 #, fuzzy
 msgid ""
 "With this form you can create a new account. You can then post notices and "
-"link up to friends and colleagues. "
+"link up to friends and colleagues."
 msgstr ""
 "このフォームで新しいアカウントを作成できます。 次につぶやきを投稿して、友人や"
 "同僚にリンクできます。 "
 
-#: actions/register.php:437
-#, fuzzy
-msgid "6 or more characters."
-msgstr "6文字以上"
-
-#. TRANS: Link description in user account settings menu.
-#: actions/register.php:445 actions/register.php:449
-#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
+#: actions/register.php:424 actions/register.php:428
+#: actions/siteadminpanel.php:238 lib/settingsnav.php:92
 msgid "Email"
 msgstr "メール"
 
-#: actions/register.php:446 actions/register.php:450
+#: actions/register.php:425 actions/register.php:429
 #, fuzzy
-msgid "Used only for updates, announcements, and password recovery"
+msgid "Used only for updates, announcements, and password recovery."
 msgstr "更新、アナウンス、パスワードリカバリーでのみ使用されます。"
 
-#: actions/register.php:457
+#: actions/register.php:436
 #, fuzzy
-msgid "Longer name, preferably your \"real\" name"
+msgid "Longer name, preferably your \"real\" name."
 msgstr "長い名前"
 
-#: actions/register.php:462
+#: actions/register.php:464
 #, fuzzy
-msgid "URL of your homepage, blog, or profile on another site"
-msgstr "ホームページ、ブログ、プロファイル、その他サイトの URL"
+msgid "Where you are, like \"City, State (or Region), Country\"."
+msgstr "自分のいる場所。例：「都市, 都道府県 (または地域), 国」"
 
-#: actions/register.php:523
+#: actions/register.php:503
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
 msgstr ""
 
-#: actions/register.php:533
+#: actions/register.php:513
 #, php-format
 msgid "My text and files are copyright by %1$s."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:537
+#: actions/register.php:517
 msgid "My text and files remain under my own copyright."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:540
+#: actions/register.php:520
 msgid "All rights reserved."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:545
+#: actions/register.php:525
 #, fuzzy, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
 "email address, IM address, and phone number."
 msgstr "個人情報を除く: パスワード、メールアドレス、IMアドレス、電話番号"
 
-#: actions/register.php:588
+#: actions/register.php:566
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -5108,7 +5216,7 @@ msgstr ""
 "参加してくださってありがとうございます。私たちはあなたがこのサービスを楽しん"
 "で使ってくれることを願っています。"
 
-#: actions/register.php:612
+#: actions/register.php:590
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5142,7 +5250,7 @@ msgstr "ユーザのニックネーム"
 
 #: actions/remotesubscribe.php:129
 #, fuzzy
-msgid "Nickname of the user you want to follow"
+msgid "Nickname of the user you want to follow."
 msgstr "フォローしたいユーザのニックネーム"
 
 #: actions/remotesubscribe.php:132
@@ -5151,18 +5259,18 @@ msgstr "プロファイルURL"
 
 #: actions/remotesubscribe.php:133
 #, fuzzy
-msgid "URL of your profile on another compatible microblogging service"
+msgid "URL of your profile on another compatible microblogging service."
 msgstr "プロファイルサービスまたはマイクロブロギングサービスのURL"
 
 #. TRANS: Link text for link that will subscribe to a remote profile.
 #: actions/remotesubscribe.php:136 lib/subscribeform.php:139
-#: lib/userprofile.php:431
+#: lib/userprofile.php:402
 msgid "Subscribe"
 msgstr "フォロー"
 
 #: actions/remotesubscribe.php:158
 #, fuzzy
-msgid "Invalid profile URL (bad format)"
+msgid "Invalid profile URL (bad format)."
 msgstr "不正なプロファイルURL。（形式不備）"
 
 #: actions/remotesubscribe.php:167
@@ -5199,7 +5307,7 @@ msgstr "自分のつぶやきは繰り返せません。"
 msgid "You already repeated that notice."
 msgstr "すでにそのつぶやきを繰り返しています。"
 
-#: actions/repeat.php:112 lib/noticelist.php:692
+#: actions/repeat.php:112 lib/noticelist.php:697
 msgid "Repeated"
 msgstr "繰り返された"
 
@@ -5207,9 +5315,9 @@ msgstr "繰り返された"
 msgid "Repeated!"
 msgstr "繰り返されました!"
 
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing @-replies.
+#. TRANS: RSS reply feed title. %s is a user nickname.
 #: actions/replies.php:126 actions/repliesrss.php:68
-#: lib/personalgroupnav.php:109
+#: lib/personalgroupnav.php:105
 #, php-format
 msgid "Replies to %s"
 msgstr "%s への返信"
@@ -5259,9 +5367,11 @@ msgstr ""
 "最初の [このトピック投稿](%%%%action.newnotice%%%%?status_textarea=%s) をして"
 "ください!"
 
-#: actions/repliesrss.php:72
+#. TRANS: RSS reply feed description.
+#. TRANS: %1$s is a user nickname, %2$s is the StatusNet site name.
+#: actions/repliesrss.php:74
 #, fuzzy, php-format
-msgid "Replies to %1$s on %2$s!"
+msgid "Replies to %1$s on %2$s."
 msgstr "%2$s 上の %1$s への返信!"
 
 #. TRANS: Client exception displayed when trying to restore an account while not logged in.
@@ -5367,7 +5477,7 @@ msgstr "あなたはこのサイトでユーザを黙らせることができま
 msgid "User doesn't have this role."
 msgstr "合っているプロフィールのないユーザ"
 
-#: actions/rsd.php:146 actions/version.php:159
+#: actions/rsd.php:142 actions/version.php:159
 msgid "StatusNet"
 msgstr "StatusNet"
 
@@ -5409,87 +5519,38 @@ msgstr "セッションのためのデバッグ出力をオン。"
 msgid "Save site settings"
 msgstr "サイト設定の保存"
 
-#: actions/showapplication.php:82
+#: actions/showapplication.php:78
 msgid "You must be logged in to view an application."
 msgstr "!!アプリケーションを見るためにはログインしていなければなりません。"
 
-#: actions/showapplication.php:157
+#: actions/showapplication.php:151
 msgid "Application profile"
 msgstr "アプリケーションプロファイル"
 
-#. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:159 lib/applicationeditform.php:177
-msgid "Icon"
-msgstr "アイコン"
-
-#. TRANS: Form input field label for application name.
-#: actions/showapplication.php:169 actions/version.php:197
-#: lib/applicationeditform.php:190
-msgid "Name"
-msgstr "名前"
-
-#. TRANS: Form input field label.
-#: actions/showapplication.php:178 lib/applicationeditform.php:227
-msgid "Organization"
-msgstr "組織"
-
-#. TRANS: Form input field label.
-#: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:168
-msgid "Description"
-msgstr "概要"
-
-#. TRANS: Header for group statistics on a group page (h2).
-#. TRANS: H2 text for user statistics.
-#: actions/showapplication.php:192 actions/showgroup.php:460
-#: lib/profileaction.php:205
-msgid "Statistics"
-msgstr "統計データ"
-
-#: actions/showapplication.php:203
+#: actions/showapplication.php:179
 #, php-format
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr ""
 
-#: actions/showapplication.php:213
+#: actions/showapplication.php:189
 msgid "Application actions"
 msgstr "アプリケーションアクション"
 
-#: actions/showapplication.php:236
+#: actions/showapplication.php:212
 msgid "Reset key & secret"
 msgstr "key と secret のリセット"
 
 #. TRANS: Title of form for deleting a user.
-#: actions/showapplication.php:252 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:64 lib/noticelist.php:673
+#: actions/showapplication.php:228 lib/deletegroupform.php:121
+#: lib/deleteuserform.php:64 lib/noticelist.php:678
 msgid "Delete"
 msgstr "削除"
 
-#: actions/showapplication.php:261
+#: actions/showapplication.php:237
 msgid "Application info"
 msgstr "アプリケーション情報"
 
-#: actions/showapplication.php:263
-msgid "Consumer key"
-msgstr ""
-
-#: actions/showapplication.php:268
-msgid "Consumer secret"
-msgstr ""
-
-#: actions/showapplication.php:273
-msgid "Request token URL"
-msgstr "リクエストトークンURL"
-
-#: actions/showapplication.php:278
-msgid "Access token URL"
-msgstr "アクセストークンURL"
-
-#: actions/showapplication.php:283
-msgid "Authorize URL"
-msgstr "承認URL"
-
-#: actions/showapplication.php:288
+#: actions/showapplication.php:255
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
@@ -5497,7 +5558,7 @@ msgstr ""
 "注意: 私たちはHMAC-SHA1署名をサポートします。 私たちは平文署名メソッドをサ"
 "ポートしません。"
 
-#: actions/showapplication.php:309
+#: actions/showapplication.php:275
 #, fuzzy
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr "本当にこのつぶやきを削除しますか？"
@@ -5584,61 +5645,47 @@ msgstr "%s グループ"
 msgid "%1$s group, page %2$d"
 msgstr "%1$s グループ、ページ %2$d"
 
-#. TRANS: Group profile header (h2). Text hidden by default.
-#: actions/showgroup.php:223
-msgid "Group profile"
-msgstr "グループプロファイル"
-
-#. TRANS: Label for group URL (dt). Text hidden by default.
-#. TRANS: DT for URL in a profile.
-#: actions/showgroup.php:273 actions/tagother.php:118
-#: actions/userauthorization.php:175 lib/userprofile.php:186
-msgid "URL"
-msgstr "URL"
-
 #. TRANS: Label for group description or group note (dt). Text hidden by default.
-#. TRANS: DT for note in a profile.
-#: actions/showgroup.php:285 actions/tagother.php:128
-#: actions/userauthorization.php:187 lib/userprofile.php:204
+#: actions/showgroup.php:266
 msgid "Note"
 msgstr "ノート"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:296 lib/groupeditform.php:180
+#: actions/showgroup.php:277 lib/groupeditform.php:180
 msgid "Aliases"
 msgstr "別名"
 
 #. TRANS: Group actions header (h2). Text hidden by default.
-#: actions/showgroup.php:313
+#: actions/showgroup.php:294
 msgid "Group actions"
 msgstr "グループアクション"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:357
+#: actions/showgroup.php:338
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
 msgstr "%s グループのつぶやきフィード (RSS 1.0)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:364
+#: actions/showgroup.php:345
 #, php-format
 msgid "Notice feed for %s group (RSS 2.0)"
 msgstr "%s グループのつぶやきフィード (RSS 2.0)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:371
+#: actions/showgroup.php:352
 #, php-format
 msgid "Notice feed for %s group (Atom)"
 msgstr "%s グループのつぶやきフィード (Atom)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:377
+#: actions/showgroup.php:358
 #, php-format
 msgid "FOAF for %s group"
 msgstr "%s グループの FOAF"
 
 #. TRANS: Header for mini list of group members on a group page (h2).
-#: actions/showgroup.php:414
+#: actions/showgroup.php:395
 msgid "Members"
 msgstr "メンバー"
 
@@ -5646,26 +5693,31 @@ msgstr "メンバー"
 #. TRANS: Text for user subscription statistics if the user has no subscriptions.
 #. TRANS: Text for user subscriber statistics if user has no subscribers.
 #. TRANS: Text for user user group membership statistics if user is not a member of any group.
-#: actions/showgroup.php:420 lib/profileaction.php:137
+#: actions/showgroup.php:401 lib/profileaction.php:137
 #: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
-#: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
+#: lib/subscriptionlist.php:123 lib/tagcloudsection.php:71
 msgid "(None)"
 msgstr "(なし)"
 
 #. TRANS: Link to all group members from mini list of group members if group has more than n members.
-#: actions/showgroup.php:429
+#: actions/showgroup.php:410
 msgid "All members"
 msgstr "全てのメンバー"
 
-#. TRANS: Label for creation date in statistics on group page.
-#: actions/showgroup.php:465
+#. TRANS: Header for group statistics on a group page (h2).
+#. TRANS: H2 text for user statistics.
+#: actions/showgroup.php:441 lib/profileaction.php:205
+msgid "Statistics"
+msgstr "統計データ"
+
+#: actions/showgroup.php:444
 #, fuzzy
 msgctxt "LABEL"
 msgid "Created"
 msgstr "作成日"
 
 #. TRANS: Label for member count in statistics on group page.
-#: actions/showgroup.php:473
+#: actions/showgroup.php:449
 #, fuzzy
 msgctxt "LABEL"
 msgid "Members"
@@ -5675,7 +5727,7 @@ msgstr "メンバー"
 #. TRANS: **%s** is the group alias, %%%%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).
-#: actions/showgroup.php:488
+#: actions/showgroup.php:464
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5693,7 +5745,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: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
-#: actions/showgroup.php:498
+#: actions/showgroup.php:474
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5707,7 +5759,7 @@ msgstr ""
 "する短いメッセージを共有します。"
 
 #. TRANS: Header for list of group administrators on a group page (h2).
-#: actions/showgroup.php:527
+#: actions/showgroup.php:503
 msgid "Admins"
 msgstr "管理者"
 
@@ -5746,7 +5798,7 @@ msgid "%1$s tagged %2$s"
 msgstr "%1$s、ページ %2$d"
 
 #. TRANS: Page title showing tagged notices in one user's stream.
-#. TRANS: %1$s is the username, %2$s is the hash tag, %1$d is the page number.
+#. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
 #: actions/showstream.php:74
 #, fuzzy, php-format
 msgid "%1$s tagged %2$s, page %3$d"
@@ -5793,13 +5845,13 @@ msgid "FOAF for %s"
 msgstr "%s の FOAF"
 
 #. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
-#: actions/showstream.php:211
+#: actions/showstream.php:205
 #, fuzzy, php-format
 msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr "これは %1$s のタイムラインですが、%2$s はまだなにも投稿していません。"
 
 #. TRANS: Second sentence of empty list message for a stream for the user themselves.
-#: actions/showstream.php:217
+#: actions/showstream.php:211
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
@@ -5809,7 +5861,7 @@ msgstr ""
 
 #. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:221
+#: actions/showstream.php:215
 #, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
@@ -5820,7 +5872,7 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:264
+#: actions/showstream.php:258
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5836,7 +5888,7 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:271
+#: actions/showstream.php:265
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5848,7 +5900,7 @@ msgstr ""
 "wikipedia.org/wiki/Micro-blogging) サービス。"
 
 #. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
-#: actions/showstream.php:328
+#: actions/showstream.php:322
 #, php-format
 msgid "Repeat of %s"
 msgstr "%s の繰り返し"
@@ -6003,78 +6055,78 @@ msgstr ""
 #. TRANS: Title for button to save site notice in admin panel.
 #: actions/sitenoticeadminpanel.php:201
 #, fuzzy
-msgid "Save site notice"
+msgid "Save site notice."
 msgstr "サイトつぶやき"
 
 #. TRANS: Title for SMS settings.
-#: actions/smssettings.php:57
+#: actions/smssettings.php:56
 msgid "SMS settings"
 msgstr "SMS 設定"
 
 #. TRANS: SMS settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/smssettings.php:71
+#: actions/smssettings.php:70
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr ""
 "あなたは %%site.name%% からメールでSMSメッセージを受け取ることができます。"
 
 #. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
-#: actions/smssettings.php:93
+#: actions/smssettings.php:92
 msgid "SMS is not available."
 msgstr "SMS は利用できません。"
 
 #. TRANS: Form legend for SMS settings form.
-#: actions/smssettings.php:107
+#: actions/smssettings.php:106
 #, fuzzy
 msgid "SMS address"
 msgstr "IMアドレス"
 
 #. TRANS: Form guide in SMS settings form.
-#: actions/smssettings.php:116
+#: actions/smssettings.php:115
 msgid "Current confirmed SMS-enabled phone number."
 msgstr "現在の確認された SMS 可能な電話番号。"
 
 #. TRANS: Form guide in IM settings form.
-#: actions/smssettings.php:129
+#: actions/smssettings.php:128
 msgid "Awaiting confirmation on this phone number."
 msgstr "この電話番号は確認待ちです。"
 
 #. TRANS: Field label for SMS address input in SMS settings form.
-#: actions/smssettings.php:138
+#: actions/smssettings.php:137
 msgid "Confirmation code"
 msgstr "確認コード"
 
 #. TRANS: Form field instructions in SMS settings form.
-#: actions/smssettings.php:140
+#: actions/smssettings.php:139
 msgid "Enter the code you received on your phone."
 msgstr "あなたがあなたの電話で受け取ったコードを入れてください。"
 
 #. TRANS: Button label to confirm SMS confirmation code in SMS settings.
-#: actions/smssettings.php:144
+#: actions/smssettings.php:143
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Confirm"
 msgstr "パスワード確認"
 
 #. TRANS: Field label for SMS phone number input in SMS settings form.
-#: actions/smssettings.php:149
+#: actions/smssettings.php:148
 msgid "SMS phone number"
 msgstr "SMS 電話番号"
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
-#: actions/smssettings.php:152
+#: actions/smssettings.php:151
 #, fuzzy
-msgid "Phone number, no punctuation or spaces, with area code"
+msgid "Phone number, no punctuation or spaces, with area code."
 msgstr "電話番号、句読点またはスペースがない、市街番号付き"
 
 #. TRANS: Form legend for SMS preferences form.
-#: actions/smssettings.php:191
+#: actions/smssettings.php:190
 msgid "SMS preferences"
 msgstr "設定が保存されました。"
 
 #. TRANS: Checkbox label in SMS preferences form.
-#: actions/smssettings.php:197
+#: actions/smssettings.php:196
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
@@ -6083,33 +6135,33 @@ msgstr ""
 "るかもしれないのを理解しています。"
 
 #. TRANS: Confirmation message for successful SMS preferences save.
-#: actions/smssettings.php:308
+#: actions/smssettings.php:307
 #, fuzzy
 msgid "SMS preferences saved."
 msgstr "設定が保存されました。"
 
 #. TRANS: Message given saving SMS phone number without having provided one.
-#: actions/smssettings.php:330
+#: actions/smssettings.php:329
 msgid "No phone number."
 msgstr "電話番号がありません。"
 
 #. TRANS: Message given saving SMS phone number without having selected a carrier.
-#: actions/smssettings.php:336
+#: actions/smssettings.php:335
 msgid "No carrier selected."
 msgstr "キャリアが選択されていません。"
 
 #. TRANS: Message given saving SMS phone number that is already set.
-#: actions/smssettings.php:344
+#: actions/smssettings.php:343
 msgid "That is already your phone number."
 msgstr "これはすでにあなたの電話番号です。"
 
 #. TRANS: Message given saving SMS phone number that is already set for another user.
-#: actions/smssettings.php:348
+#: actions/smssettings.php:347
 msgid "That phone number already belongs to another user."
 msgstr "この電話番号はすでに他のユーザに使われています。"
 
 #. TRANS: Message given saving valid SMS phone number that is to be confirmed.
-#: actions/smssettings.php:376
+#: actions/smssettings.php:375
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
 "for the code and instructions on how to use it."
@@ -6118,40 +6170,40 @@ msgstr ""
 "コードと指示のために電話をチェックしてください。"
 
 #. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
-#: actions/smssettings.php:404
+#: actions/smssettings.php:403
 msgid "That is the wrong confirmation number."
 msgstr "それは間違った確認番号です。"
 
 #. TRANS: Message given after successfully canceling SMS phone number confirmation.
-#: actions/smssettings.php:418
+#: actions/smssettings.php:417
 msgid "SMS confirmation cancelled."
 msgstr "SMS確認"
 
 #. TRANS: Message given trying to remove an SMS phone number that is not
 #. TRANS: registered for the active user.
-#: actions/smssettings.php:438
+#: actions/smssettings.php:437
 msgid "That is not your phone number."
 msgstr "それはあなたの電話番号ではありません。"
 
 #. TRANS: Message given after successfully removing a registered SMS phone number.
-#: actions/smssettings.php:460
+#: actions/smssettings.php:459
 #, fuzzy
 msgid "The SMS phone number was removed."
 msgstr "SMS 電話番号"
 
 #. TRANS: Label for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:499
+#: actions/smssettings.php:498
 msgid "Mobile carrier"
 msgstr "携帯電話会社"
 
 #. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:504
+#: actions/smssettings.php:503
 msgid "Select a carrier"
 msgstr "キャリア選択"
 
 #. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
 #. TRANS: %s is an administrative contact's e-mail address.
-#: actions/smssettings.php:513
+#: actions/smssettings.php:512
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -6162,7 +6214,7 @@ msgstr ""
 "ください。"
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
-#: actions/smssettings.php:535
+#: actions/smssettings.php:534
 #, fuzzy
 msgid "No code entered."
 msgstr "コードが入力されていません"
@@ -6237,16 +6289,14 @@ msgstr "あなたはそのプロファイルにフォローされていません
 msgid "Could not save subscription."
 msgstr "フォローを保存できません。"
 
-#: actions/subscribe.php:77
-msgid "This action only accepts POST requests."
-msgstr ""
-
-#: actions/subscribe.php:117
+#. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
+#: actions/subscribe.php:121
 #, fuzzy
 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
 msgstr "あなたはそのプロファイルにフォローされていません。"
 
-#: actions/subscribe.php:145
+#. TRANS: Page title when subscription succeeded.
+#: actions/subscribe.php:149
 msgid "Subscribed"
 msgstr "フォローしている"
 
@@ -6364,31 +6414,34 @@ msgid "Subscription feed for %s (Atom)"
 msgstr "%sのつぶやきフィード (Atom)"
 
 #. TRANS: Checkbox label for enabling Jabber messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:239
-msgid "Jabber"
-msgstr "Jabber"
+#: actions/subscriptions.php:241 lib/settingsnav.php:110
+#, fuzzy
+msgid "IM"
+msgstr "IM"
 
 #. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:254
+#: actions/subscriptions.php:256 lib/settingsnav.php:117
 msgid "SMS"
 msgstr "SMS"
 
-#: actions/tag.php:69
+#. TRANS: Title for all but the first page of notices with tags.
+#. TRANS: %1$s is the tag, %2$d is the page number.
+#: actions/tag.php:73
 #, php-format
 msgid "Notices tagged with %1$s, page %2$d"
 msgstr "%1$s とタグ付けされたつぶやき、ページ %2$d"
 
-#: actions/tag.php:87
+#: actions/tag.php:91
 #, php-format
 msgid "Notice feed for tag %s (RSS 1.0)"
 msgstr "%s とタグ付けされたつぶやきフィード (RSS 1.0)"
 
-#: actions/tag.php:93
+#: actions/tag.php:97
 #, php-format
 msgid "Notice feed for tag %s (RSS 2.0)"
 msgstr "%s とタグ付けされたつぶやきフィード (RSS 2.0)"
 
-#: actions/tag.php:99
+#: actions/tag.php:103
 #, php-format
 msgid "Notice feed for tag %s (Atom)"
 msgstr "%s とタグ付けされたつぶやきフィード (Atom)"
@@ -6407,31 +6460,30 @@ msgstr "タグ %s"
 msgid "User profile"
 msgstr "ユーザプロファイル"
 
-#. TRANS: DT element in area for user avatar.
-#: actions/tagother.php:81 actions/userauthorization.php:132
-#: lib/userprofile.php:108
-msgid "Photo"
-msgstr "写真"
-
-#: actions/tagother.php:141
+#: actions/tagother.php:120
 msgid "Tag user"
 msgstr "タグユーザ"
 
-#: actions/tagother.php:151
+#: actions/tagother.php:130
 msgid ""
 "Tags for this user (letters, numbers, -, ., and _), comma- or space- "
 "separated"
 msgstr ""
 "このユーザのタグ (アルファベット、数字、-、.、_)、カンマかスペース区切り"
 
-#: actions/tagother.php:193
+#: actions/tagother.php:157
+#, php-format
+msgid "Invalid tag: \"%s\""
+msgstr "不正なタグ: \"%s\""
+
+#: actions/tagother.php:172
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 "あなたはフォローされる人々にタグ付けをすることができるだけか、あなたをフォ"
 "ローされているか。"
 
-#: actions/tagother.php:236
+#: actions/tagother.php:215
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr "このフォームを使用して、フォロー者かフォローにタグを加えてください。"
 
@@ -6439,6 +6491,7 @@ msgstr "このフォームを使用して、フォロー者かフォローにタ
 msgid "No such tag."
 msgstr "そのようなタグはありません。"
 
+#. TRANS: Client error displayed when trying to unblock a non-blocked user.
 #: actions/unblock.php:59
 msgid "You haven't blocked that user."
 msgstr "あなたはそのユーザをブロックしていません。"
@@ -6459,7 +6512,7 @@ msgstr "ログイントークンが要求されていません。"
 msgid "Unsubscribed"
 msgstr "フォロー解除済み"
 
-#: actions/updateprofile.php:64 actions/userauthorization.php:337
+#: actions/updateprofile.php:64
 #, php-format
 msgid ""
 "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
@@ -6467,6 +6520,78 @@ msgstr ""
 "リスニーストリームライセンス ‘%1$s’ は、サイトライセンス ‘%2$s’ と互換性があ"
 "りません。"
 
+#: actions/urlsettings.php:60
+#, fuzzy
+msgid "URL settings"
+msgstr "IM設定"
+
+#. TRANS: Instructions for tab "Other" in user profile settings.
+#: actions/urlsettings.php:72
+msgid "Manage various other options."
+msgstr "他のオプションを管理。"
+
+#. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
+#. TRANS: user's profile settings. This message has one space at the beginning. Use your
+#. TRANS: language's word separator here if it has one (most likely a single space).
+#: actions/urlsettings.php:115
+msgid " (free service)"
+msgstr "(フリーサービス)"
+
+#: actions/urlsettings.php:121
+#, fuzzy
+msgid "[none]"
+msgstr "なし"
+
+#: actions/urlsettings.php:122
+msgid "[internal]"
+msgstr ""
+
+#. TRANS: Label for dropdown with URL shortener services.
+#: actions/urlsettings.php:130
+msgid "Shorten URLs with"
+msgstr "URLを短くします"
+
+#. TRANS: Tooltip for for dropdown with URL shortener services.
+#: actions/urlsettings.php:132
+msgid "Automatic shortening service to use."
+msgstr "使用する自動短縮サービス。"
+
+#: actions/urlsettings.php:138
+msgid "URL longer than"
+msgstr ""
+
+#: actions/urlsettings.php:141
+msgid "URLs longer than this will be shortened, 0 means always shorten."
+msgstr ""
+
+#: actions/urlsettings.php:145
+msgid "Text longer than"
+msgstr ""
+
+#: actions/urlsettings.php:148
+msgid ""
+"URLs in notices longer than this will be shortened, 0 means always shorten."
+msgstr ""
+
+#. TRANS: Form validation error for form "Other settings" in user profile.
+#: actions/urlsettings.php:180
+#, fuzzy
+msgid "URL shortening service is too long (maximum 50 characters)."
+msgstr "URL 短縮サービスが長すぎます。（最大50字）"
+
+#: actions/urlsettings.php:187
+msgid "Invalid number for max url length."
+msgstr ""
+
+#: actions/urlsettings.php:193
+#, fuzzy
+msgid "Invalid number for max notice length."
+msgstr "不正なトークン。"
+
+#: actions/urlsettings.php:238
+msgid "Error saving user URL shortening preferences."
+msgstr ""
+
 #. TRANS: User admin panel title
 #: actions/useradminpanel.php:58
 #, fuzzy
@@ -6494,11 +6619,11 @@ msgstr "不正なウェルカムテキスト。最大長は255字です。"
 #. TRANS: users in user admin panel. %1$s is the invalid nickname.
 #: actions/useradminpanel.php:166
 #, fuzzy, php-format
-msgid "Invalid default subscripton: '%1$s' is not a user."
+msgid "Invalid default subscripton: \"%1$s\" is not a user."
 msgstr "不正なデフォルトフォローです: '%1$s'  はユーザではありません。"
 
-#. TRANS: Link description in user account settings menu.
-#: actions/useradminpanel.php:215 lib/accountsettingsaction.php:106
+#: actions/useradminpanel.php:215 lib/action.php:565 lib/settingsnav.php:77
+#: lib/subgroupnav.php:81
 msgid "Profile"
 msgstr "プロファイル"
 
@@ -6556,58 +6681,62 @@ msgstr "ユーザが新しいユーザを招待するのを許容するかどう
 #. TRANS: Title for button to save user settings in user admin panel.
 #: actions/useradminpanel.php:302
 #, fuzzy
-msgid "Save user settings"
+msgid "Save user settings."
 msgstr "サイト設定の保存"
 
-#: actions/userauthorization.php:105
+#. TRANS: Page title.
+#: actions/userauthorization.php:109
 msgid "Authorize subscription"
 msgstr "フォローを承認"
 
-#: actions/userauthorization.php:110
+#. TRANS: Page notice on "Auhtorize subscription" page.
+#: actions/userauthorization.php:115
 #, fuzzy
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
 "user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
-"click “Reject”."
+"click \"Reject\"."
 msgstr ""
 "ユーザのつぶやきをフォローするには詳細を確認して下さい。だれかのつぶやきを"
 "フォローするために尋ねない場合は、\"Reject\" をクリックして下さい。"
 
-#. TRANS: Menu item for site administration
-#: actions/userauthorization.php:196 actions/version.php:167
-#: lib/adminpanelaction.php:403
-msgid "License"
-msgstr "ライセンス"
-
-#: actions/userauthorization.php:217
+#. TRANS: Button text on Authorise Subscription page.
+#: actions/userauthorization.php:200
 #, fuzzy
+msgctxt "BUTTON"
 msgid "Accept"
 msgstr "承認"
 
-#: actions/userauthorization.php:218 lib/subscribeform.php:115
-#: lib/subscribeform.php:139
-msgid "Subscribe to this user"
+#. TRANS: Title for button on Authorise Subscription page.
+#: actions/userauthorization.php:202
+#, fuzzy
+msgid "Subscribe to this user."
 msgstr "このユーザーをフォロー"
 
-#: actions/userauthorization.php:219
+#. TRANS: Button text on Authorise Subscription page.
+#: actions/userauthorization.php:204
 #, fuzzy
+msgctxt "BUTTON"
 msgid "Reject"
 msgstr "拒否"
 
-#: actions/userauthorization.php:220
+#. TRANS: Title for button on Authorise Subscription page.
+#: actions/userauthorization.php:206
 #, fuzzy
-msgid "Reject this subscription"
+msgid "Reject this subscription."
 msgstr "このフォローを拒否"
 
-#: actions/userauthorization.php:232
+#. TRANS: Client error displayed for an empty authorisation request.
+#: actions/userauthorization.php:219
 msgid "No authorization request!"
 msgstr "認証のリクエストがありません。"
 
-#: actions/userauthorization.php:254
+#. TRANS: Accept message header from Authorise subscription page.
+#: actions/userauthorization.php:242
 msgid "Subscription authorized"
 msgstr "フォローが承認されました"
 
-#: actions/userauthorization.php:256
+#: actions/userauthorization.php:245
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to authorize the "
@@ -6617,11 +6746,12 @@ msgstr ""
 "フォローを承認するかに関する詳細のためのサイトの指示をチェックしてください。"
 "あなたのフォロートークンは:"
 
-#: actions/userauthorization.php:266
+#. TRANS: Reject message header from Authorise subscription page.
+#: actions/userauthorization.php:256
 msgid "Subscription rejected"
 msgstr "フォローが拒否"
 
-#: actions/userauthorization.php:268
+#: actions/userauthorization.php:259
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to fully reject the "
@@ -6631,48 +6761,73 @@ msgstr ""
 "フォローを完全に拒絶するかに関する詳細のためのサイトの指示をチェックしてくだ"
 "さい。"
 
-#: actions/userauthorization.php:303
+#. TRANS: Exception thrown when no valid user is found for an authorisation request.
+#. TRANS: %s is a listener URI.
+#: actions/userauthorization.php:296
 #, fuzzy, php-format
-msgid "Listener URI ‘%s’ not found here."
+msgid "Listener URI \"%s\" not found here."
 msgstr "リスナー URI  ‘%s’ はここでは見つかりません。"
 
-#: actions/userauthorization.php:308
+#. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
+#. TRANS: %s is a listenee URI.
+#: actions/userauthorization.php:303
 #, fuzzy, php-format
-msgid "Listenee URI ‘%s’ is too long."
+msgid "Listenee URI \"%s\" is too long."
 msgstr "リスニー URI  ‘%s’ が長すぎます。"
 
-#: actions/userauthorization.php:314
+#. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
+#. TRANS: %s is a listenee URI.
+#: actions/userauthorization.php:311
 #, fuzzy, php-format
-msgid "Listenee URI ‘%s’ is a local user."
+msgid "Listenee URI \"%s\" is a local user."
 msgstr "リスニー URI  ‘%s’ はローカルユーザーではありません。"
 
+#. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
+#. TRANS: %s is a profile URL.
 #: actions/userauthorization.php:329
 #, fuzzy, php-format
-msgid "Profile URL ‘%s’ is for a local user."
+msgid "Profile URL \"%s\" is for a local user."
 msgstr "プロファイル URL  ‘%s’ はローカルユーザーではありません。"
 
-#: actions/userauthorization.php:345
+#. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
+#. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
+#: actions/userauthorization.php:339
 #, fuzzy, php-format
-msgid "Avatar URL ‘%s’ is not valid."
+msgid ""
+"Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
+"\"."
+msgstr ""
+"リスニーストリームライセンス ‘%1$s’ は、サイトライセンス ‘%2$s’ と互換性があ"
+"りません。"
+
+#. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
+#. TRANS: %s is an avatar URL.
+#: actions/userauthorization.php:349
+#, fuzzy, php-format
+msgid "Avatar URL \"%s\" is not valid."
 msgstr "アバター URL  ‘%s’ が正しくありません。"
 
-#: actions/userauthorization.php:350
+#. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
+#. TRANS: %s is an avatar URL.
+#: actions/userauthorization.php:356
 #, fuzzy, php-format
-msgid "Can’t read avatar URL ‘%s’."
+msgid "Cannot read avatar URL \"%s\"."
 msgstr "アバターURL　を読み取れません '%s'"
 
-#: actions/userauthorization.php:355
+#. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
+#. TRANS: %s is an avatar URL.
+#: actions/userauthorization.php:363
 #, fuzzy, php-format
-msgid "Wrong image type for avatar URL ‘%s’."
+msgid "Wrong image type for avatar URL \"%s\"."
 msgstr "アバター URL '%s' は不正な画像形式。"
 
 #. TRANS: Page title for profile design page.
-#: actions/userdesignsettings.php:74 lib/designsettings.php:63
+#: actions/userdesignsettings.php:74 lib/designsettings.php:61
 msgid "Profile design"
 msgstr "プロファイルデザイン"
 
 #. TRANS: Instructions for profile design page.
-#: actions/userdesignsettings.php:84 lib/designsettings.php:74
+#: actions/userdesignsettings.php:84 lib/designsettings.php:72
 msgid ""
 "Customize the way your profile looks with a background image and a colour "
 "palette of your choice."
@@ -6680,11 +6835,29 @@ msgstr ""
 "あなたのプロフィールがバックグラウンド画像とあなたの選択の色のパレットで見る"
 "方法をカスタマイズしてください。"
 
-#: actions/userdesignsettings.php:272
+#: actions/userdesignsettings.php:289
 #, fuzzy
 msgid "Enjoy your hotdog!"
 msgstr "あなたのhotdogを楽しんでください!"
 
+#: actions/userdesignsettings.php:325
+#, fuzzy
+msgid "Design settings"
+msgstr "サイト設定の保存"
+
+#: actions/userdesignsettings.php:340
+msgid "View profile designs"
+msgstr "プロファイルデザインを表示"
+
+#: actions/userdesignsettings.php:341
+msgid "Show or hide profile designs."
+msgstr "プロファイルデザインの表示または非表示"
+
+#: actions/userdesignsettings.php:348
+#, fuzzy
+msgid "Background file"
+msgstr "バックグラウンド"
+
 #. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number.
 #: actions/usergroups.php:66
 #, php-format
@@ -6734,6 +6907,11 @@ msgstr ""
 msgid "Contributors"
 msgstr "コントリビュータ"
 
+#. TRANS: Menu item for site administration
+#: actions/version.php:167 lib/adminpanelaction.php:403
+msgid "License"
+msgstr "ライセンス"
+
 #: actions/version.php:170
 msgid ""
 "StatusNet is free software: you can redistribute it and/or modify it under "
@@ -6757,12 +6935,13 @@ msgid ""
 "along with this program.  If not, see %s."
 msgstr ""
 
-#: actions/version.php:191
-msgid "Plugins"
-msgstr "プラグイン"
+#. TRANS: Form input field label for application name.
+#: actions/version.php:197 lib/applicationeditform.php:190
+msgid "Name"
+msgstr "名前"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:901
+#: actions/version.php:198 lib/action.php:885
 msgid "Version"
 msgstr "バージョン"
 
@@ -6770,6 +6949,12 @@ msgstr "バージョン"
 msgid "Author(s)"
 msgstr "作者"
 
+#. TRANS: Form input field label.
+#: actions/version.php:200 lib/applicationeditform.php:208
+#: lib/groupeditform.php:168
+msgid "Description"
+msgstr "概要"
+
 #. TRANS: Activity title when marking a notice as favorite.
 #: classes/Fave.php:164
 msgid "Favor"
@@ -6888,7 +7073,7 @@ msgid "Could not create login token for %s"
 msgstr "%s 用のログイン・トークンを作成できませんでした"
 
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
-#: classes/Memcached_DataObject.php:542
+#: classes/Memcached_DataObject.php:556
 msgid "No database name or DSN found anywhere."
 msgstr ""
 
@@ -7062,18 +7247,18 @@ msgstr "%1$s は %2$s であなたのつぶやきを聞いています。"
 
 #. TRANS: Notice given on user registration.
 #. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:395
+#: classes/User.php:390
 #, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr "ようこそ %1$s、@%2$s!"
 
 #. TRANS: Server exception.
-#: classes/User.php:918
+#: classes/User.php:923
 msgid "No single user defined for single-user mode."
 msgstr "single-user　モードのためのシングルユーザが定義されていません。"
 
 #. TRANS: Server exception.
-#: classes/User.php:922
+#: classes/User.php:927
 msgid "Single-user mode code called when not enabled."
 msgstr ""
 
@@ -7119,41 +7304,6 @@ msgstr ""
 msgid "No AtomPub API service for %s."
 msgstr ""
 
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:104
-msgid "Change your profile settings"
-msgstr "プロファイル設定の変更"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:111
-msgid "Upload an avatar"
-msgstr "アバターのアップロード"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:118
-msgid "Change your password"
-msgstr "パスワードの変更"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:125
-msgid "Change email handling"
-msgstr "メールの扱いを変更"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:132
-msgid "Design your profile"
-msgstr "あなたのプロファイルをデザイン"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:139
-msgid "Other options"
-msgstr "その他のオプション"
-
-#. TRANS: Link description in user account settings menu.
-#: lib/accountsettingsaction.php:141
-msgid "Other"
-msgstr "その他"
-
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
 #: lib/action.php:161
 #, php-format
@@ -7171,215 +7321,128 @@ msgctxt "TOOLTIP"
 msgid "Show more"
 msgstr ""
 
-#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:544
-msgid "Primary site navigation"
-msgstr "プライマリサイトナビゲーション"
-
-#. TRANS: Tooltip for main menu option "Personal".
-#: lib/action.php:550
+#. TRANS: Inline reply form submit button: submits a reply comment.
+#: lib/action.php:328
 #, fuzzy
-msgctxt "TOOLTIP"
-msgid "Personal profile and friends timeline"
-msgstr "パーソナルプロファイルと友人のタイムライン"
+msgctxt "BUTTON"
+msgid "Comment"
+msgstr "内容"
 
-#. TRANS: Main menu option when logged in for access to personal profile and friends timeline.
-#. TRANS: Personal group navigation menu option when logged in for viewing timeline of self and friends.
-#: lib/action.php:553 lib/personalgroupnav.php:100
+#. TRANS: Placeholder text for inline reply form. Clicking in this box will turn it into a mini notice form.
+#: lib/action.php:331
+msgid "Add a comment..."
+msgstr ""
+
+#: lib/action.php:559 lib/personalgroupnav.php:99
 #, fuzzy
-msgctxt "MENU"
-msgid "Personal"
-msgstr "パーソナル"
+msgid "Home"
+msgstr "ホームページ"
 
-#. TRANS: Tooltip for main menu option "Account".
-#: lib/action.php:555
-msgctxt "TOOLTIP"
-msgid "Change your email, avatar, password, profile"
-msgstr "パスワードの変更"
-
-#. TRANS: Main menu option when logged in for access to user settings.
-#: lib/action.php:558
-msgid "Account"
-msgstr "アカウント"
-
-#. TRANS: Tooltip for main menu option "Services".
 #: lib/action.php:560
-msgctxt "TOOLTIP"
-msgid "Connect to services"
-msgstr "接続"
-
-#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services.
-#: lib/action.php:563
-msgid "Connect"
-msgstr "接続"
-
-#. TRANS: Tooltip for menu option "Admin".
-#: lib/action.php:566
-msgctxt "TOOLTIP"
-msgid "Change site configuration"
-msgstr "基本サイト設定"
-
-#. TRANS: Main menu option when logged in and site admin for access to site configuration.
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/action.php:569 lib/groupnav.php:117
 #, fuzzy
-msgctxt "MENU"
-msgid "Admin"
-msgstr "管理者"
+msgid "Friends timeline"
+msgstr "%s のタイムライン"
 
-#. TRANS: Tooltip for main menu option "Invite".
-#: lib/action.php:573
-#, fuzzy, php-format
-msgctxt "TOOLTIP"
-msgid "Invite friends and colleagues to join you on %s"
-msgstr "友人や同僚が %s で加わるよう誘ってください。"
+#: lib/action.php:566
+#, fuzzy
+msgid "Your profile"
+msgstr "グループプロファイル"
+
+#: lib/action.php:570 lib/action.php:593 lib/publicgroupnav.php:78
+msgid "Public"
+msgstr "パブリック"
+
+#: lib/action.php:571 lib/action.php:594
+#, fuzzy
+msgid "Everyone on this site"
+msgstr "このサイトの人々を探す"
+
+#: lib/action.php:575
+#, fuzzy
+msgid "Settings"
+msgstr "SMS 設定"
 
-#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users.
 #: lib/action.php:576
 #, fuzzy
-msgctxt "MENU"
-msgid "Invite"
-msgstr "招待"
+msgid "Change your personal settings"
+msgstr "プロファイル設定の変更"
 
-#. TRANS: Tooltip for main menu option "Logout"
 #: lib/action.php:582
-msgctxt "TOOLTIP"
-msgid "Logout from the site"
-msgstr "サイトのテーマ"
+#, fuzzy
+msgid "Site configuration"
+msgstr "ユーザ設定"
 
-#. TRANS: Main menu option when logged in to log out the current user.
-#: lib/action.php:585
-msgctxt "MENU"
+#: lib/action.php:587
+#, fuzzy
 msgid "Logout"
 msgstr "ロゴ"
 
-#. TRANS: Tooltip for main menu option "Register".
-#: lib/action.php:590
-msgctxt "TOOLTIP"
-msgid "Create an account"
-msgstr "新しいグループを作成"
-
-#. TRANS: Main menu option when not logged in to register a new account.
-#. TRANS: Menu item for registering with the StatusNet site.
-#: lib/action.php:593 lib/logingroupnav.php:85
+#: lib/action.php:588
 #, fuzzy
-msgctxt "MENU"
-msgid "Register"
-msgstr "登録"
+msgid "Logout from the site"
+msgstr "サイトのテーマ"
 
-#. TRANS: Tooltip for main menu option "Login".
-#: lib/action.php:596
+#: lib/action.php:599
 #, fuzzy
-msgctxt "TOOLTIP"
 msgid "Login to the site"
 msgstr "サイトへログイン"
 
-#. TRANS: Main menu option when not logged in to log in.
-#. TRANS: Menu item for logging in to the StatusNet site.
-#: lib/action.php:599 lib/logingroupnav.php:77
+#: lib/action.php:606
 #, fuzzy
-msgctxt "MENU"
-msgid "Login"
-msgstr "ログイン"
-
-#. TRANS: Tooltip for main menu option "Help".
-#: lib/action.php:602
-msgctxt "TOOLTIP"
-msgid "Help me!"
-msgstr "ヘルプ"
-
-#. TRANS: Main menu option for help on the StatusNet site.
-#: lib/action.php:605
-#, fuzzy
-msgctxt "MENU"
-msgid "Help"
-msgstr "ヘルプ"
-
-#. TRANS: Tooltip for main menu option "Search".
-#: lib/action.php:608
-msgctxt "TOOLTIP"
-msgid "Search for people or text"
-msgstr "もっとグループを検索"
-
-#. TRANS: Main menu option when logged in or when the StatusNet instance is not private.
-#: lib/action.php:611
-#, fuzzy
-msgctxt "MENU"
 msgid "Search"
 msgstr "検索"
 
-#. TRANS: DT element for site notice. String is hidden in default CSS.
-#. TRANS: Menu item for site administration
-#: lib/action.php:633 lib/adminpanelaction.php:387
-msgid "Site notice"
-msgstr "サイトつぶやき"
-
-#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:700
-msgid "Local views"
-msgstr "ローカルビュー"
-
-#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:770
-msgid "Page notice"
-msgstr "ページつぶやき"
-
-#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:874
-msgid "Secondary site navigation"
-msgstr "セカンダリサイトナビゲーション"
+#: lib/action.php:607
+#, fuzzy
+msgid "Search the site"
+msgstr "サイト検索"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:880
+#: lib/action.php:864
 msgid "Help"
 msgstr "ヘルプ"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:883
+#: lib/action.php:867
 msgid "About"
 msgstr "About"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:886
+#: lib/action.php:870
 msgid "FAQ"
 msgstr "よくある質問"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:891
+#: lib/action.php:875
 msgid "TOS"
 msgstr ""
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:895
+#: lib/action.php:879
 msgid "Privacy"
 msgstr "プライバシー"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:898
+#: lib/action.php:882
 msgid "Source"
 msgstr "ソース"
 
 #. TRANS: Secondary navigation menu option leading to e-mail contact information on the
 #. TRANS: StatusNet site, where to report bugs, ...
-#: lib/action.php:905
+#: lib/action.php:889
 msgid "Contact"
 msgstr "連絡先"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:908
+#: lib/action.php:892
 msgid "Badge"
 msgstr "バッジ"
 
-#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:937
-msgid "StatusNet software license"
-msgstr "StatusNet ソフトウェアライセンス"
-
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:944
+#: lib/action.php:921
 #, fuzzy, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7389,7 +7452,7 @@ msgstr ""
 "イクロブログサービスです。 "
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:947
+#: lib/action.php:924
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** はマイクロブログサービスです。"
@@ -7398,7 +7461,7 @@ msgstr "**%%site.name%%** はマイクロブログサービスです。"
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:954
+#: lib/action.php:931
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7409,51 +7472,41 @@ msgstr ""
 "いています。 ライセンス [GNU Affero General Public License](http://www.fsf."
 "org/licensing/licenses/agpl-3.0.html)。"
 
-#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:970
-msgid "Site content license"
-msgstr "サイト内容ライセンス"
-
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:977
+#: lib/action.php:949
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:984
+#: lib/action.php:956
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:988
+#: lib/action.php:960
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:1020
+#: lib/action.php:992
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
 
-#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1356
-msgid "Pagination"
-msgstr "ページ化"
-
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1367
+#: lib/action.php:1335
 msgid "After"
 msgstr "<<後"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1377
+#: lib/action.php:1345
 msgid "Before"
 msgstr "前>>"
 
@@ -7609,7 +7662,7 @@ msgid "User configuration"
 msgstr "ユーザ設定"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:122
+#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:110
 msgid "User"
 msgstr "ユーザ"
 
@@ -7634,6 +7687,11 @@ msgstr "セッション設定"
 msgid "Edit site notice"
 msgstr "サイトつぶやき"
 
+#. TRANS: Menu item for site administration
+#: lib/adminpanelaction.php:387
+msgid "Site notice"
+msgstr "サイトつぶやき"
+
 #. TRANS: Menu item title/tooltip
 #: lib/adminpanelaction.php:393
 #, fuzzy
@@ -7645,6 +7703,12 @@ msgstr "パス設定"
 msgid "Set site license"
 msgstr ""
 
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:409
+#, fuzzy
+msgid "Plugins configuration"
+msgstr "パス設定"
+
 #. TRANS: Client error 401.
 #: lib/apiauth.php:111
 msgid "API resource requires read-write access, but you only have read access."
@@ -7657,19 +7721,23 @@ msgstr ""
 msgid "No application for that consumer key."
 msgstr ""
 
+#: lib/apiauth.php:202 lib/apiauth.php:284
+msgid "Not allowed to use API."
+msgstr ""
+
 #. TRANS: OAuth exception given when an incorrect access token was given for a user.
-#: lib/apiauth.php:219
+#: lib/apiauth.php:225
 msgid "Bad access token."
 msgstr ""
 
 #. TRANS: OAuth exception given when no user was found for a given token (no token was found).
-#: lib/apiauth.php:224
+#: lib/apiauth.php:230
 msgid "No user for that token."
 msgstr ""
 
 #. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel".
 #. TRANS: Client error thrown when authentication fails.
-#: lib/apiauth.php:266 lib/apiauth.php:293
+#: lib/apiauth.php:272 lib/apiauth.php:302
 msgid "Could not authenticate you."
 msgstr ""
 
@@ -7716,6 +7784,11 @@ msgstr ""
 msgid "Failed to delete revoked token."
 msgstr ""
 
+#. TRANS: Form input field label for application icon.
+#: lib/applicationeditform.php:177
+msgid "Icon"
+msgstr "アイコン"
+
 #. TRANS: Form guide.
 #: lib/applicationeditform.php:182
 msgid "Icon for this application"
@@ -7749,6 +7822,11 @@ msgstr "ソース URL"
 msgid "Organization responsible for this application"
 msgstr "このアプリケーションに責任がある組織"
 
+#. TRANS: Form input field label.
+#: lib/applicationeditform.php:227
+msgid "Organization"
+msgstr "組織"
+
 #. TRANS: Form input field instructions.
 #: lib/applicationeditform.php:234
 msgid "URL for the homepage of the organization"
@@ -7841,16 +7919,6 @@ msgstr ""
 msgid "Do not use this method!"
 msgstr "このつぶやきを削除できません。"
 
-#. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:293
-msgid "Author"
-msgstr "作者"
-
-#. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:307
-msgid "Provider"
-msgstr "プロバイダ"
-
 #. TRANS: Title.
 #: lib/attachmentnoticesection.php:67
 msgid "Notices where this attachment appears"
@@ -7878,24 +7946,29 @@ msgstr "パスワード変更は許可されていません"
 msgid "Block"
 msgstr "ブロック"
 
+#. TRANS: Description of the form to block a user.
+#: lib/blockform.php:79
+msgid "Block this user"
+msgstr "このユーザをブロックする"
+
 #. TRANS: Title for command results.
-#: lib/channel.php:160 lib/channel.php:181
+#: lib/channel.php:104 lib/channel.php:125
 msgid "Command results"
 msgstr "コマンド結果"
 
 #. TRANS: Title for command results.
-#: lib/channel.php:194
+#: lib/channel.php:138
 #, fuzzy
 msgid "AJAX error"
 msgstr "Ajax エラー"
 
 #. TRANS: E-mail subject when a command has completed.
-#: lib/channel.php:233 lib/mailhandler.php:143
+#: lib/channel.php:177 lib/mailhandler.php:143
 msgid "Command complete"
 msgstr "コマンド完了"
 
 #. TRANS: E-mail subject when a command has failed.
-#: lib/channel.php:244
+#: lib/channel.php:188
 msgid "Command failed"
 msgstr "コマンド失敗"
 
@@ -8000,7 +8073,7 @@ msgstr "フルネーム： %s"
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a location.
-#: lib/command.php:446 lib/mail.php:270
+#: lib/command.php:446 lib/mail.php:275
 #, php-format
 msgid "Location: %s"
 msgstr "場所: %s"
@@ -8008,7 +8081,7 @@ msgstr "場所: %s"
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a homepage.
-#: lib/command.php:450 lib/mail.php:274
+#: lib/command.php:450 lib/mail.php:279
 #, php-format
 msgid "Homepage: %s"
 msgstr "ホームページ: %s"
@@ -8237,20 +8310,20 @@ msgid ""
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:162
+#: lib/common.php:36
 #, fuzzy
 msgid "No configuration file found."
 msgstr "コンフィギュレーションファイルがありません。 "
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:165
+#: lib/common.php:39
 #, fuzzy
 msgid "I looked for configuration files in the following places:"
 msgstr "私は以下の場所でコンフィギュレーションファイルを探しました: "
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:168
+#: lib/common.php:42
 msgid "You may wish to run the installer to fix this."
 msgstr ""
 "あなたは、これを修理するためにインストーラを動かしたがっているかもしれませ"
@@ -8258,96 +8331,86 @@ msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:172
+#: lib/common.php:46
 msgid "Go to the installer."
 msgstr "インストーラへ。"
 
-#. TRANS: Menu item for Instant Messaging settings.
-#: lib/connectsettingsaction.php:106
-#, fuzzy
-msgctxt "MENU"
-msgid "IM"
-msgstr "IM"
-
-#. TRANS: Tooltip for Instant Messaging menu item.
-#: lib/connectsettingsaction.php:108
-msgid "Updates by instant messenger (IM)"
-msgstr "インスタントメッセンジャー(IM)での更新"
-
-#. TRANS: Menu item for Short Message Service settings.
-#: lib/connectsettingsaction.php:113
-#, fuzzy
-msgctxt "MENU"
-msgid "SMS"
-msgstr "SMS"
-
-#. TRANS: Tooltip for Short Message Service menu item.
-#: lib/connectsettingsaction.php:115
-msgid "Updates by SMS"
-msgstr "SMSでの更新"
-
-#. TRANS: Menu item for OuAth connection settings.
-#: lib/connectsettingsaction.php:120
-#, fuzzy
-msgctxt "MENU"
-msgid "Connections"
-msgstr "接続"
-
-#. TRANS: Tooltip for connected applications (Connections through OAuth) menu item.
-#: lib/connectsettingsaction.php:122
-msgid "Authorized connected applications"
-msgstr "承認された接続アプリケーション"
-
 #: lib/dberroraction.php:59
 msgid "Database error"
 msgstr "データベースエラー"
 
+#. TRANS: Description of form for deleting a user.
+#: lib/deleteuserform.php:75
+msgid "Delete this user"
+msgstr "このユーザを削除"
+
+#: lib/designform.php:114
+#, fuzzy
+msgid "Change design"
+msgstr "デザインの保存"
+
+#. TRANS: Fieldset legend on profile design page to change profile page colours.
+#: lib/designform.php:131
+msgid "Change colours"
+msgstr "色の変更"
+
+#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
+#: lib/designform.php:138
+msgid "Use defaults"
+msgstr "デフォルトを使用"
+
+#. TRANS: Title for button on profile design page to reset all colour settings to default.
+#: lib/designform.php:140
+msgid "Restore default designs"
+msgstr "デフォルトデザインに戻す。"
+
+#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
+#: lib/designform.php:148
+msgid "Reset back to default"
+msgstr "デフォルトへリセットする"
+
 #. TRANS: Label in form on profile design page.
 #. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
-#: lib/designsettings.php:108
+#: lib/designform.php:158
 msgid "Upload file"
 msgstr "ファイルアップロード"
 
 #. TRANS: Instructions for form on profile design page.
-#: lib/designsettings.php:113
+#: lib/designform.php:163
+#, fuzzy
 msgid ""
-"You can upload your personal background image. The maximum file size is 2MB."
+"You can upload your personal background image. The maximum file size is 2Mb."
 msgstr ""
 "自分のバックグラウンド画像をアップロードできます。最大ファイルサイズは 2MB で"
 "す。"
 
 #. TRANS: Radio button on profile design page that will enable use of the uploaded profile image.
-#: lib/designsettings.php:139
+#: lib/designform.php:194
 #, fuzzy
 msgctxt "RADIO"
 msgid "On"
 msgstr "オン"
 
 #. TRANS: Radio button on profile design page that will disable use of the uploaded profile image.
-#: lib/designsettings.php:156
+#: lib/designform.php:211
 #, fuzzy
 msgctxt "RADIO"
 msgid "Off"
 msgstr "オフ"
 
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: lib/designsettings.php:175
-msgid "Change colours"
-msgstr "色の変更"
-
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: lib/designsettings.php:257
-msgid "Use defaults"
-msgstr "デフォルトを使用"
+#. TRANS: Title for button on profile design page to save settings.
+#: lib/designform.php:322
+msgid "Save design"
+msgstr "デザインの保存"
 
 #. TRANS: Error message displayed if design settings could not be saved.
 #. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
-#: lib/designsettings.php:405 lib/designsettings.php:427
+#: lib/designsettings.php:216 lib/designsettings.php:238
 msgid "Couldn't update your design."
 msgstr "あなたのデザインを更新できません。"
 
 #. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
-#: lib/designsettings.php:433
+#: lib/designsettings.php:244
 msgid "Design defaults restored."
 msgstr "デフォルトのデザインを回復。"
 
@@ -8417,27 +8480,23 @@ msgstr ""
 msgid "Feeds"
 msgstr ""
 
-#: lib/galleryaction.php:121
-msgid "Filter tags"
-msgstr "タグのフィルター"
-
-#: lib/galleryaction.php:131
+#: lib/galleryaction.php:128
 msgid "All"
 msgstr "全て"
 
-#: lib/galleryaction.php:139
+#: lib/galleryaction.php:136
 msgid "Select tag to filter"
 msgstr "フィルターにかけるタグを選択"
 
-#: lib/galleryaction.php:140
+#: lib/galleryaction.php:137
 msgid "Tag"
 msgstr "タグ"
 
-#: lib/galleryaction.php:141
+#: lib/galleryaction.php:138
 msgid "Choose a tag to narrow list"
 msgstr "タグを選んで、リストを狭くしてください"
 
-#: lib/galleryaction.php:143
+#: lib/galleryaction.php:140
 msgid "Go"
 msgstr "移動"
 
@@ -8524,6 +8583,13 @@ msgctxt "TOOLTIP"
 msgid "%s blocked users"
 msgstr ""
 
+#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
+#: lib/groupnav.php:117
+#, fuzzy
+msgctxt "MENU"
+msgid "Admin"
+msgstr "管理者"
+
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
 #: lib/groupnav.php:120
@@ -8630,39 +8696,63 @@ msgid "%dB"
 msgid_plural "%dB"
 msgstr[0] ""
 
-#: lib/jabber.php:387
+#: lib/implugin.php:262
 #, php-format
-msgid "[%s]"
+msgid ""
+"User \"%s\" on %s has said that your %s screenname belongs to them. If "
+"that's true, you can confirm by clicking on this URL: %s . (If you cannot "
+"click it, copy-and-paste it into the address bar of your browser). If that "
+"user isn't you, or if you didn't request this confirmation, just ignore this "
+"message."
 msgstr ""
 
-#: lib/jabber.php:567
+#: lib/implugin.php:349
 #, php-format
 msgid "Unknown inbox source %d."
 msgstr "不明な受信箱のソース %d。"
 
+#: lib/implugin.php:485
+#, fuzzy, php-format
+msgid "Message too long - maximum is %1$d characters, you sent %2$d."
+msgstr "メッセージが長すぎます - 最大 %1$d 字、あなたが送ったのは %2$d。"
+
 #: lib/leaveform.php:114
 msgid "Leave"
 msgstr "離れる"
 
+#. TRANS: Menu item for logging in to the StatusNet site.
+#: lib/logingroupnav.php:77
+#, fuzzy
+msgctxt "MENU"
+msgid "Login"
+msgstr "ログイン"
+
 #. TRANS: Title for menu item for logging in to the StatusNet site.
 #: lib/logingroupnav.php:79
 msgid "Login with a username and password"
 msgstr "ユーザ名とパスワードでログイン"
 
+#. TRANS: Menu item for registering with the StatusNet site.
+#: lib/logingroupnav.php:85
+#, fuzzy
+msgctxt "MENU"
+msgid "Register"
+msgstr "登録"
+
 #. TRANS: Title for menu item for registering with the StatusNet site.
 #: lib/logingroupnav.php:87
 msgid "Sign up for a new account"
 msgstr "新しいアカウントでサインアップ"
 
 #. TRANS: Subject for address confirmation email.
-#: lib/mail.php:168
+#: lib/mail.php:172
 msgid "Email address confirmation"
 msgstr "メールアドレス確認"
 
 #. TRANS: Body for address confirmation email.
 #. TRANS: %1$s is the addressed user's nickname, %2$s is the StatusNet sitename,
 #. TRANS: %3$s is the URL to confirm at.
-#: lib/mail.php:173
+#: lib/mail.php:177
 #, fuzzy, php-format
 msgid ""
 "Hey, %1$s.\n"
@@ -8693,14 +8783,14 @@ msgstr ""
 
 #. TRANS: Subject of new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
-#: lib/mail.php:238
+#: lib/mail.php:243
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1$s は %2$s であなたのつぶやきを聞いています。"
 
 #. TRANS: This is a paragraph in a new-subscriber e-mail.
 #. TRANS: %s is a URL where the subscriber can be reported as abusive.
-#: lib/mail.php:245
+#: lib/mail.php:250
 #, php-format
 msgid ""
 "If you believe this account is being used abusively, you can block them from "
@@ -8712,7 +8802,7 @@ msgstr ""
 #. TRANS: %3$s is the subscriber's profile URL, %4$s is the subscriber's location (or empty)
 #. TRANS: %5$s is the subscriber's homepage URL (or empty), %6%s is the subscriber's bio (or empty)
 #. TRANS: %7$s is a link to the addressed user's e-mail settings.
-#: lib/mail.php:255
+#: lib/mail.php:260
 #, fuzzy, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -8739,14 +8829,14 @@ msgstr ""
 
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is biographical information.
-#: lib/mail.php:278
+#: lib/mail.php:283
 #, php-format
 msgid "Bio: %s"
 msgstr "自己紹介: %s"
 
 #. TRANS: Subject of notification mail for new posting email address.
 #. TRANS: %s is the StatusNet sitename.
-#: lib/mail.php:307
+#: lib/mail.php:312
 #, php-format
 msgid "New email address for posting to %s"
 msgstr "%s へ投稿のための新しいメールアドレス"
@@ -8754,7 +8844,7 @@ msgstr "%s へ投稿のための新しいメールアドレス"
 #. TRANS: Body of notification mail for new posting email address.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is the e-mail address to send
 #. TRANS: to to post by e-mail, %3$s is a URL to more instructions.
-#: lib/mail.php:313
+#: lib/mail.php:318
 #, fuzzy, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -8777,26 +8867,26 @@ msgstr ""
 
 #. TRANS: Subject line for SMS-by-email notification messages.
 #. TRANS: %s is the posting user's nickname.
-#: lib/mail.php:434
+#: lib/mail.php:439
 #, php-format
 msgid "%s status"
 msgstr "%s の状態"
 
 #. TRANS: Subject line for SMS-by-email address confirmation message.
-#: lib/mail.php:460
+#: lib/mail.php:465
 msgid "SMS confirmation"
 msgstr "SMS確認"
 
 #. TRANS: Main body heading for SMS-by-email address confirmation message.
 #. TRANS: %s is the addressed user's nickname.
-#: lib/mail.php:464
+#: lib/mail.php:469
 #, fuzzy, php-format
 msgid "%s: confirm you own this phone number with this code:"
 msgstr "この電話番号は確認待ちです。"
 
 #. TRANS: Subject for 'nudge' notification email.
 #. TRANS: %s is the nudging user.
-#: lib/mail.php:485
+#: lib/mail.php:490
 #, fuzzy, php-format
 msgid "You have been nudged by %s"
 msgstr "あなたは %s に合図されています"
@@ -8804,7 +8894,7 @@ msgstr "あなたは %s に合図されています"
 #. TRANS: Body for 'nudge' notification email.
 #. TRANS: %1$s is the nuding user's long name, $2$s is the nudging user's nickname,
 #. TRANS: %3$s is a URL to post notices at, %4$s is the StatusNet sitename.
-#: lib/mail.php:492
+#: lib/mail.php:497
 #, fuzzy, php-format
 msgid ""
 "%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -8833,7 +8923,7 @@ msgstr ""
 
 #. TRANS: Subject for direct-message notification email.
 #. TRANS: %s is the sending user's nickname.
-#: lib/mail.php:539
+#: lib/mail.php:544
 #, php-format
 msgid "New private message from %s"
 msgstr "%s からの新しいプライベートメッセージ"
@@ -8842,7 +8932,7 @@ msgstr "%s からの新しいプライベートメッセージ"
 #. TRANS: %1$s is the sending user's long name, %2$s is the sending user's nickname,
 #. TRANS: %3$s is the message content, %4$s a URL to the message,
 #. TRANS: %5$s is the StatusNet sitename.
-#: lib/mail.php:547
+#: lib/mail.php:552
 #, fuzzy, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -8877,7 +8967,7 @@ msgstr ""
 
 #. TRANS: Subject for favorite notification e-mail.
 #. TRANS: %1$s is the adding user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:599
+#: lib/mail.php:604
 #, fuzzy, php-format
 msgid "%1$s (@%2$s) added your notice as a favorite"
 msgstr "%s (@%s) はお気に入りとしてあなたのつぶやきを加えました"
@@ -8887,7 +8977,7 @@ msgstr "%s (@%s) はお気に入りとしてあなたのつぶやきを加えま
 #. TRANS: %3$s is a URL to the faved notice, %4$s is the faved notice text,
 #. TRANS: %5$s is a URL to all faves of the adding user, %6$s is the StatusNet sitename,
 #. TRANS: %7$s is the adding user's nickname.
-#: lib/mail.php:606
+#: lib/mail.php:611
 #, fuzzy, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -8926,7 +9016,7 @@ msgstr ""
 "%6%s\n"
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:664
+#: lib/mail.php:669
 #, php-format
 msgid ""
 "The full conversation can be read here:\n"
@@ -8936,7 +9026,7 @@ msgstr ""
 
 #. TRANS: E-mail subject for notice notification.
 #. TRANS: %1$s is the sending user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:672
+#: lib/mail.php:677
 #, fuzzy, php-format
 msgid "%1$s (@%2$s) sent a notice to your attention"
 msgstr "%s (@%s) はあなた宛てにつぶやきを送りました"
@@ -8947,7 +9037,7 @@ msgstr "%s (@%s) はあなた宛てにつぶやきを送りました"
 #. TRANS: %5$s is a URL to the full conversion if it exists (otherwise empty),
 #. TRANS: %6$s is a URL to reply to the notice, %7$s is a URL to all @-replied for the addressed user,
 #. TRANS: %8$s is a URL to the addressed user's e-mail settings, %9$s is the sender's nickname.
-#: lib/mail.php:680
+#: lib/mail.php:685
 #, php-format
 msgid ""
 "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -9069,11 +9159,7 @@ msgstr "フォローしていません！"
 msgid "To"
 msgstr "To"
 
-#: lib/messageform.php:166 lib/noticeform.php:186
-msgid "Available characters"
-msgstr "利用可能な文字"
-
-#: lib/messageform.php:185 lib/noticeform.php:237
+#: lib/messageform.php:184 lib/noticeform.php:236
 #, fuzzy
 msgctxt "Send button for sending notice"
 msgid "Send"
@@ -9084,17 +9170,10 @@ msgstr "投稿"
 msgid "Messages"
 msgstr "メッセージ"
 
-#: lib/messagelistitem.php:123 lib/noticelist.php:522
+#: lib/messagelistitem.php:123 lib/noticelist.php:527
 msgid "from"
 msgstr "from"
 
-#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:165
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr ""
-"ニックネームには、小文字アルファベットと数字のみ使用できます。スペースは使用"
-"できません。"
-
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 #: lib/nickname.php:178
 msgid "Nickname cannot be empty."
@@ -9116,23 +9195,23 @@ msgstr "つぶやきを送る"
 msgid "What's up, %s?"
 msgstr "最近どう %s?"
 
-#: lib/noticeform.php:194
+#: lib/noticeform.php:193
 msgid "Attach"
 msgstr "添付"
 
-#: lib/noticeform.php:198
+#: lib/noticeform.php:197
 msgid "Attach a file"
 msgstr "ファイル添付"
 
-#: lib/noticeform.php:213
+#: lib/noticeform.php:212
 msgid "Share my location"
 msgstr "あなたの場所を共有する"
 
-#: lib/noticeform.php:216
+#: lib/noticeform.php:215
 msgid "Do not share my location"
 msgstr "あなたの場所を共有しない"
 
-#: lib/noticeform.php:217
+#: lib/noticeform.php:216
 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
 "try again later"
@@ -9141,59 +9220,63 @@ msgstr ""
 "度試みてください"
 
 #. TRANS: Used in coordinates as abbreviation of north
-#: lib/noticelist.php:452
+#: lib/noticelist.php:457
 #, fuzzy
 msgid "N"
 msgstr "北"
 
 #. TRANS: Used in coordinates as abbreviation of south
-#: lib/noticelist.php:454
+#: lib/noticelist.php:459
 #, fuzzy
 msgid "S"
 msgstr "南"
 
 #. TRANS: Used in coordinates as abbreviation of east
-#: lib/noticelist.php:456
+#: lib/noticelist.php:461
 #, fuzzy
 msgid "E"
 msgstr "東"
 
 #. TRANS: Used in coordinates as abbreviation of west
-#: lib/noticelist.php:458
+#: lib/noticelist.php:463
 #, fuzzy
 msgid "W"
 msgstr "西"
 
-#: lib/noticelist.php:460
+#: lib/noticelist.php:465
 #, php-format
 msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgstr ""
 
-#: lib/noticelist.php:469
+#: lib/noticelist.php:474
 msgid "at"
 msgstr "at"
 
-#: lib/noticelist.php:518
+#: lib/noticelist.php:523
 msgid "web"
 msgstr ""
 
-#: lib/noticelist.php:584
+#: lib/noticelist.php:589
 msgid "in context"
 msgstr ""
 
-#: lib/noticelist.php:619
+#: lib/noticelist.php:624
 msgid "Repeated by"
 msgstr ""
 
-#: lib/noticelist.php:646
+#: lib/noticelist.php:651
 msgid "Reply to this notice"
 msgstr "このつぶやきへ返信"
 
-#: lib/noticelist.php:647
+#: lib/noticelist.php:652
 msgid "Reply"
 msgstr "返信"
 
-#: lib/noticelist.php:691
+#: lib/noticelist.php:678
+msgid "Delete this notice"
+msgstr "このつぶやきを削除"
+
+#: lib/noticelist.php:696
 msgid "Notice repeated"
 msgstr "つぶやきを繰り返しました"
 
@@ -9230,48 +9313,31 @@ msgstr ""
 msgid "Couldn't insert new subscription."
 msgstr "サブスクリプションを追加できません"
 
-#. TRANS: Personal group navigation menu option when logged in for viewing @-replies.
-#: lib/personalgroupnav.php:107
+#: lib/personalgroupnav.php:104
 #, fuzzy
-msgctxt "MENU"
 msgid "Replies"
 msgstr "返信"
 
-#. TRANS: Personal group navigation menu option when logged in for seeing own profile.
-#: lib/personalgroupnav.php:114
+#: lib/personalgroupnav.php:109
 #, fuzzy
-msgctxt "MENU"
-msgid "Profile"
-msgstr "プロファイル"
-
-#. TRANS: Personal group navigation menu option when logged in for viewing own favourited notices.
-#: lib/personalgroupnav.php:120
-#, fuzzy
-msgctxt "MENU"
 msgid "Favorites"
 msgstr "お気に入り"
 
-#. TRANS: Personal group navigation menu option when logged in for viewing recieved personal messages.
-#: lib/personalgroupnav.php:133
+#: lib/personalgroupnav.php:120
 #, fuzzy
-msgctxt "MENU"
 msgid "Inbox"
 msgstr "受信箱"
 
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing recieved personal messages.
-#: lib/personalgroupnav.php:135
+#: lib/personalgroupnav.php:121
 msgid "Your incoming messages"
 msgstr "あなたの入ってくるメッセージ"
 
-#. TRANS: Personal group navigation menu option when logged in for viewing senet personal messages.
-#: lib/personalgroupnav.php:140
+#: lib/personalgroupnav.php:125
 #, fuzzy
-msgctxt "MENU"
 msgid "Outbox"
 msgstr "送信箱"
 
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing senet personal messages.
-#: lib/personalgroupnav.php:142
+#: lib/personalgroupnav.php:126
 msgid "Your sent messages"
 msgstr "あなたが送ったメッセージ"
 
@@ -9286,9 +9352,26 @@ msgstr "%s のつぶやきのタグ"
 msgid "Unknown"
 msgstr "不明"
 
+#. TRANS: Plugin admin panel controls
+#: lib/plugindisableform.php:90
+msgctxt "plugin"
+msgid "Disable"
+msgstr ""
+
+#. TRANS: Plugin admin panel controls
+#: lib/pluginenableform.php:112
+msgctxt "plugin"
+msgid "Enable"
+msgstr ""
+
+#: lib/pluginlist.php:196
+msgctxt "plugin-description"
+msgid "(Plugin descriptions unavailable when disabled.)"
+msgstr ""
+
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:82
+#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:88
 msgid "Subscriptions"
 msgstr "フォロー"
 
@@ -9299,7 +9382,7 @@ msgstr "すべてのフォロー"
 
 #. TRANS: H2 text for user subscriber statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:90
+#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:96
 msgid "Subscribers"
 msgstr "フォローされている"
 
@@ -9321,7 +9404,7 @@ msgstr "利用開始日"
 #. TRANS: Label for user statistics.
 #. TRANS: H2 text for user group membership statistics.
 #: lib/profileaction.php:239 lib/profileaction.php:290
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:104
 msgid "Groups"
 msgstr "グループ"
 
@@ -9341,10 +9424,6 @@ msgstr "全てのグループ"
 msgid "Unimplemented method."
 msgstr "未実装のメソッド。"
 
-#: lib/publicgroupnav.php:78
-msgid "Public"
-msgstr "パブリック"
-
 #: lib/publicgroupnav.php:82
 msgid "User groups"
 msgstr "ユーザグループ"
@@ -9383,7 +9462,7 @@ msgid "Revoke the \"%s\" role from this user"
 msgstr "このグループからこのユーザをブロック"
 
 #. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:974
+#: lib/router.php:1001
 #, fuzzy
 msgid "Page not found."
 msgstr "API メソッドが見つかりません。"
@@ -9413,11 +9492,6 @@ msgctxt "BUTTON"
 msgid "Search"
 msgstr ""
 
-#. TRANS: Definition list item with instructions on how to get (better) search results.
-#: lib/searchaction.php:170
-msgid "Search help"
-msgstr "ヘルプ検索"
-
 #: lib/searchgroupnav.php:80
 msgid "People"
 msgstr "人々"
@@ -9442,6 +9516,51 @@ msgstr "名称未設定のセクション"
 msgid "More..."
 msgstr "さらに..."
 
+#: lib/settingsnav.php:78
+msgid "Change your profile settings"
+msgstr "プロファイル設定の変更"
+
+#: lib/settingsnav.php:83
+msgid "Upload an avatar"
+msgstr "アバターのアップロード"
+
+#: lib/settingsnav.php:88
+msgid "Change your password"
+msgstr "パスワードの変更"
+
+#: lib/settingsnav.php:93
+msgid "Change email handling"
+msgstr "メールの扱いを変更"
+
+#: lib/settingsnav.php:98
+msgid "Design your profile"
+msgstr "あなたのプロファイルをデザイン"
+
+#: lib/settingsnav.php:102
+msgid "URL"
+msgstr "URL"
+
+#: lib/settingsnav.php:103
+msgid "URL shorteners"
+msgstr ""
+
+#: lib/settingsnav.php:111
+msgid "Updates by instant messenger (IM)"
+msgstr "インスタントメッセンジャー(IM)での更新"
+
+#: lib/settingsnav.php:118
+msgid "Updates by SMS"
+msgstr "SMSでの更新"
+
+#: lib/settingsnav.php:123
+#, fuzzy
+msgid "Connections"
+msgstr "接続"
+
+#: lib/settingsnav.php:124
+msgid "Authorized connected applications"
+msgstr "承認された接続アプリケーション"
+
 #: lib/silenceform.php:67
 msgid "Silence"
 msgstr "サイレンス"
@@ -9450,30 +9569,34 @@ msgstr "サイレンス"
 msgid "Silence this user"
 msgstr "このユーザをサイレンスに"
 
-#: lib/subgroupnav.php:83
+#: lib/subgroupnav.php:89
 #, php-format
 msgid "People %s subscribes to"
 msgstr "人々 %s はフォロー"
 
-#: lib/subgroupnav.php:91
+#: lib/subgroupnav.php:97
 #, php-format
 msgid "People subscribed to %s"
 msgstr "人々は %s をフォローしました。"
 
-#: lib/subgroupnav.php:99
+#: lib/subgroupnav.php:105
 #, php-format
 msgid "Groups %s is a member of"
 msgstr "グループ %s はメンバー"
 
-#: lib/subgroupnav.php:105
+#: lib/subgroupnav.php:111
 msgid "Invite"
 msgstr "招待"
 
-#: lib/subgroupnav.php:106
+#: lib/subgroupnav.php:112
 #, php-format
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "友人や同僚が %s で加わるよう誘ってください。"
 
+#: lib/subscribeform.php:115 lib/subscribeform.php:139
+msgid "Subscribe to this user"
+msgstr "このユーザーをフォロー"
+
 #: lib/subscriberspeopleselftagcloudsection.php:48
 #: lib/subscriptionspeopleselftagcloudsection.php:48
 msgid "People Tagcloud as self-tagged"
@@ -9543,6 +9666,12 @@ msgstr ""
 msgid "Error opening theme archive."
 msgstr "ブロックの削除エラー"
 
+#: lib/threadednoticelist.php:270
+#, php-format
+msgid "Show all %d comment"
+msgid_plural "Show all %d comments"
+msgstr[0] ""
+
 #: lib/topposterssection.php:74
 msgid "Top posters"
 msgstr "上位投稿者"
@@ -9585,123 +9714,127 @@ msgstr "フォロー解除"
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "ユーザはプロフィールをもっていません。"
 
-#. TRANS: Link text for changeing the avatar of the logged in user.
-#: lib/userprofile.php:121
+#: lib/userprofile.php:116
 msgid "Edit Avatar"
 msgstr "アバターを編集する"
 
 #. TRANS: H2 for user actions in a profile.
 #. TRANS: H2 for entity actions in a profile.
-#: lib/userprofile.php:245 lib/userprofile.php:261
+#: lib/userprofile.php:216 lib/userprofile.php:232
 msgid "User actions"
 msgstr "利用者アクション"
 
 #. TRANS: Text shown in user profile of not yet compeltely deleted users.
-#: lib/userprofile.php:249
+#: lib/userprofile.php:220
 msgid "User deletion in progress..."
 msgstr ""
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:277
+#: lib/userprofile.php:248
 msgid "Edit profile settings"
 msgstr "プロファイル設定編集"
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:279
+#: lib/userprofile.php:250
 msgid "Edit"
 msgstr "編集"
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:303
+#: lib/userprofile.php:274
 msgid "Send a direct message to this user"
 msgstr "この利用者にダイレクトメッセージを送る"
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:305
+#: lib/userprofile.php:276
 msgid "Message"
 msgstr "メッセージ"
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:347
+#: lib/userprofile.php:318
 #, fuzzy
 msgid "Moderate"
 msgstr "管理"
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:386
+#: lib/userprofile.php:357
 #, fuzzy
 msgid "User role"
 msgstr "ユーザプロファイル"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:389
+#: lib/userprofile.php:360
 #, fuzzy
 msgctxt "role"
 msgid "Administrator"
 msgstr "管理者"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:391
+#: lib/userprofile.php:362
 #, fuzzy
 msgctxt "role"
 msgid "Moderator"
 msgstr "管理"
 
+#: lib/util.php:321
+#, fuzzy
+msgid "Not allowed to log in."
+msgstr "ログインしていません。"
+
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1306
+#: lib/util.php:1337
 msgid "a few seconds ago"
 msgstr "数秒前"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1309
+#: lib/util.php:1340
 msgid "about a minute ago"
 msgstr "約 1 分前"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1313
+#: lib/util.php:1344
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
 msgstr[0] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1316
+#: lib/util.php:1347
 msgid "about an hour ago"
 msgstr "約 1 時間前"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1320
+#: lib/util.php:1351
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
 msgstr[0] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1323
+#: lib/util.php:1354
 msgid "about a day ago"
 msgstr "約 1 日前"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1327
+#: lib/util.php:1358
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
 msgstr[0] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1330
+#: lib/util.php:1361
 msgid "about a month ago"
 msgstr "約 1 ヵ月前"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1334
+#: lib/util.php:1365
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
 msgstr[0] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1337
+#: lib/util.php:1368
 msgid "about a year ago"
 msgstr "約 1 年前"
 
@@ -9712,20 +9845,6 @@ msgstr "約 1 年前"
 msgid "%s is not a valid color! Use 3 or 6 hex characters."
 msgstr "%s は有効な色ではありません! 3か6の16進数を使ってください。"
 
-#. TRANS: %s is the URL to the StatusNet site's Instant Messaging settings.
-#: lib/xmppmanager.php:287
-#, php-format
-msgid "Unknown user. Go to %s to add your address to your account"
-msgstr ""
-
-#. TRANS: Response to XMPP source when it sent too long a message.
-#. TRANS: %1$d the maximum number of allowed characters (used for plural), %2$d is the sent number.
-#: lib/xmppmanager.php:406
-#, fuzzy, php-format
-msgid "Message too long. Maximum is %1$d character, you sent %2$d."
-msgid_plural "Message too long. Maximum is %1$d characters, you sent %2$d."
-msgstr[0] "メッセージが長すぎます - 最大 %1$d 字、あなたが送ったのは %2$d。"
-
 #. TRANS: Exception.
 #: lib/xrd.php:63
 #, fuzzy
@@ -9744,73 +9863,171 @@ msgid "Getting backup from file '%s'."
 msgstr ""
 
 #, fuzzy
-#~ msgid "Block this user."
-#~ msgstr "このユーザをブロックする"
+#~ msgid "Could not generate feed for group - %s"
+#~ msgstr "グループを更新できません。"
 
 #, fuzzy
-#~ msgid "Delete this notice."
-#~ msgstr "このつぶやきを削除"
-
-#, fuzzy
-#~ msgid "Delete this user."
-#~ msgstr "このユーザを削除"
-
-#, fuzzy
-#~ msgid "Restore default designs."
-#~ msgstr "デフォルトデザインに戻す。"
-
-#, fuzzy
-#~ msgid "Reset back to default."
-#~ msgstr "デフォルトへリセットする"
-
-#, fuzzy
-#~ msgid "Save design."
-#~ msgstr "デザインの保存"
-
-#, fuzzy
-#~ msgid "Disfavor favorite."
-#~ msgstr "お気に入りをやめる"
-
-#, fuzzy
-#~ msgid "\"%s\" not found."
-#~ msgstr "API メソッドが見つかりません。"
-
-#, fuzzy
-#~ msgid "Notice %s not found."
-#~ msgstr "API メソッドが見つかりません。"
-
-#, fuzzy
-#~ msgid "Attachment %s not found."
-#~ msgstr "受け取り手のユーザが見つかりません。"
-
-#, fuzzy
-#~ msgid "Invalid tag: \"%s\"."
-#~ msgstr "不正なタグ: \"%s\""
-
-#, fuzzy
-#~ msgid "%s updates from everyone."
-#~ msgstr "皆からの %s アップデート!"
-
-#, fuzzy
-#~ msgid "Password saved"
-#~ msgstr "パスワードが保存されました。"
-
-#, fuzzy
-#~ msgid "Where you are, like \"City, State (or Region), Country\"."
-#~ msgstr "自分のいる場所。例：「都市, 都道府県 (または地域), 国」"
-
-#, fuzzy
-#~ msgid "Subscribe to this user."
-#~ msgstr "このユーザーをフォロー"
+#~ msgid "Current confirmed Jabber/Google Talk address."
+#~ msgstr "確認された最新の　Jabber/GTakk アドレス"
 
 #, fuzzy
 #~ msgid ""
-#~ "Listenee stream license \"%1$s\" is not compatible with site license \"%2"
-#~ "$s\"."
+#~ "Jabber or Google Talk address, like \"UserName@example.org\". First, make "
+#~ "sure to add %s to your buddy list in your IM client or on Google Talk."
 #~ msgstr ""
-#~ "リスニーストリームライセンス ‘%1$s’ は、サイトライセンス ‘%2$s’ と互換性が"
-#~ "ありません。"
+#~ "\"UserName@example.org\" といった Jabber または GTalk のアドレス。まず、%"
+#~ "s をIMクライアントやGTalkに追加して下さい。"
 
 #, fuzzy
-#~ msgid "Not allowed to log in."
-#~ msgstr "ログインしていません。"
+#~ msgid "Send me notices through Jabber/Google Talk."
+#~ msgstr "Jabber/GTalk で私に通知を送って下さい。"
+
+#, fuzzy
+#~ msgid "Publish a MicroID for my Jabber/Google Talk address."
+#~ msgstr "私のJabber/GTalkアドレスのためにMicroIDを発行してください。"
+
+#~ msgid "No Jabber ID."
+#~ msgstr "Jabbar ID はありません。"
+
+#, fuzzy
+#~ msgid "Not a valid Jabber ID."
+#~ msgstr "有効な Jabber ID ではありません。"
+
+#~ msgid "That is already your Jabber ID."
+#~ msgstr "その Jabber ID は既にあなたのものです。"
+
+#~ msgid "That is not your Jabber ID."
+#~ msgstr "その Jabber ID はあなたのものではありません。"
+
+#~ msgid "Other settings"
+#~ msgstr "その他の設定"
+
+#~ msgid "Tag cloud"
+#~ msgstr "タグクラウド"
+
+#~ msgid "Request token URL"
+#~ msgstr "リクエストトークンURL"
+
+#~ msgid "Access token URL"
+#~ msgstr "アクセストークンURL"
+
+#~ msgid "Authorize URL"
+#~ msgstr "承認URL"
+
+#~ msgid "Jabber"
+#~ msgstr "Jabber"
+
+#~ msgid "Photo"
+#~ msgstr "写真"
+
+#~ msgid "Other options"
+#~ msgstr "その他のオプション"
+
+#~ msgid "Other"
+#~ msgstr "その他"
+
+#~ msgid "Primary site navigation"
+#~ msgstr "プライマリサイトナビゲーション"
+
+#, fuzzy
+#~ msgctxt "TOOLTIP"
+#~ msgid "Personal profile and friends timeline"
+#~ msgstr "パーソナルプロファイルと友人のタイムライン"
+
+#, fuzzy
+#~ msgctxt "MENU"
+#~ msgid "Personal"
+#~ msgstr "パーソナル"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Change your email, avatar, password, profile"
+#~ msgstr "パスワードの変更"
+
+#~ msgid "Account"
+#~ msgstr "アカウント"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Connect to services"
+#~ msgstr "接続"
+
+#~ msgid "Connect"
+#~ msgstr "接続"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Change site configuration"
+#~ msgstr "基本サイト設定"
+
+#, fuzzy
+#~ msgctxt "TOOLTIP"
+#~ msgid "Invite friends and colleagues to join you on %s"
+#~ msgstr "友人や同僚が %s で加わるよう誘ってください。"
+
+#, fuzzy
+#~ msgctxt "MENU"
+#~ msgid "Invite"
+#~ msgstr "招待"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Create an account"
+#~ msgstr "新しいグループを作成"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Help me!"
+#~ msgstr "ヘルプ"
+
+#, fuzzy
+#~ msgctxt "MENU"
+#~ msgid "Help"
+#~ msgstr "ヘルプ"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Search for people or text"
+#~ msgstr "もっとグループを検索"
+
+#~ msgid "Local views"
+#~ msgstr "ローカルビュー"
+
+#~ msgid "Page notice"
+#~ msgstr "ページつぶやき"
+
+#~ msgid "Secondary site navigation"
+#~ msgstr "セカンダリサイトナビゲーション"
+
+#~ msgid "StatusNet software license"
+#~ msgstr "StatusNet ソフトウェアライセンス"
+
+#~ msgid "Site content license"
+#~ msgstr "サイト内容ライセンス"
+
+#~ msgid "Pagination"
+#~ msgstr "ページ化"
+
+#~ msgid "Author"
+#~ msgstr "作者"
+
+#~ msgid "Provider"
+#~ msgstr "プロバイダ"
+
+#, fuzzy
+#~ msgctxt "MENU"
+#~ msgid "SMS"
+#~ msgstr "SMS"
+
+#~ msgid "Filter tags"
+#~ msgstr "タグのフィルター"
+
+#~ msgid "Available characters"
+#~ msgstr "利用可能な文字"
+
+#, fuzzy
+#~ msgctxt "MENU"
+#~ msgid "Profile"
+#~ msgstr "プロファイル"
+
+#~ msgid "Search help"
+#~ msgstr "ヘルプ検索"
+
+#, fuzzy
+#~ msgid "Message too long. Maximum is %1$d character, you sent %2$d."
+#~ msgid_plural "Message too long. Maximum is %1$d characters, you sent %2$d."
+#~ msgstr[0] "メッセージが長すぎます - 最大 %1$d 字、あなたが送ったのは %2$d。"
diff --git a/locale/ka/LC_MESSAGES/statusnet.po b/locale/ka/LC_MESSAGES/statusnet.po
index 0b20a3bdcc..02c8e513d3 100644
--- a/locale/ka/LC_MESSAGES/statusnet.po
+++ b/locale/ka/LC_MESSAGES/statusnet.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 15:58+0000\n"
-"PO-Revision-Date: 2011-03-03 16:00:57+0000\n"
+"POT-Creation-Date: 2011-03-03 17:23+0000\n"
+"PO-Revision-Date: 2011-03-03 17:26:11+0000\n"
 "Language-Team: Georgian <http://translatewiki.net/wiki/Portal:ka>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -76,23 +76,23 @@ msgstr "შეინახე შესვლის პარამეტრე
 #. TRANS: Tooltip for button to save access settings in site admin panel.
 #. TRANS: Button text for saving theme settings.
 #. TRANS: Button label to save e-mail preferences.
-#. TRANS: Button label to save Instant Messaging preferences.
-#. TRANS: Button text for saving "Other settings" in profile.
+#. TRANS: Button label to save IM preferences.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
 #. TRANS: Button text for saving site notice in admin panel.
 #. TRANS: Button label to save SMS preferences.
 #. TRANS: Save button for settings for a profile in a subscriptions list.
+#. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
 #. TRANS: Button text on profile design page to save settings.
 #: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
-#: actions/emailsettings.php:250 actions/imsettings.php:183
-#: actions/othersettings.php:136 actions/pathsadminpanel.php:512
-#: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
-#: actions/smssettings.php:205 actions/subscriptions.php:259
+#: actions/emailsettings.php:251 actions/imsettings.php:199
+#: actions/pathsadminpanel.php:512 actions/profilesettings.php:198
+#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:204
+#: actions/subscriptions.php:261 actions/urlsettings.php:152
 #: actions/useradminpanel.php:298 lib/applicationeditform.php:355
-#: lib/designsettings.php:270 lib/groupeditform.php:201
+#: lib/designform.php:320 lib/groupeditform.php:201
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "შეინახე"
@@ -131,7 +131,11 @@ msgstr "ასეთი გვერდი არ არსებობს."
 #. 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 use "one time password login" without using an existing user.
+#. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
+#. TRANS: Client error displayed trying to find a user by ID for a non-existing ID.
+#. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when calling a profile action without specifying a user.
 #: actions/all.php:80 actions/allrss.php:69
@@ -143,19 +147,19 @@ msgstr "ასეთი გვერდი არ არსებობს."
 #: actions/apidirectmessage.php:75 actions/apidirectmessagenew.php:72
 #: actions/apigroupcreate.php:111 actions/apigroupismember.php:89
 #: actions/apigroupjoin.php:98 actions/apigroupleave.php:98
-#: actions/apigrouplist.php:70 actions/apistatusesupdate.php:230
-#: actions/apisubscriptions.php:85 actions/apitimelinefavorites.php:70
-#: actions/apitimelinefriends.php:173 actions/apitimelinehome.php:78
-#: actions/apitimelinementions.php:77 actions/apitimelineuser.php:79
-#: actions/avatarbynickname.php:79 actions/favoritesrss.php:72
-#: actions/foaf.php:42 actions/foaf.php:61 actions/hcard.php:67
-#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
-#: actions/remotesubscribe.php:144 actions/remotesubscribe.php:153
-#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
-#: actions/showfavorites.php:106 actions/userbyid.php:74
-#: actions/usergroups.php:93 actions/userrss.php:40 actions/userxrd.php:59
-#: actions/xrds.php:71 lib/command.php:509 lib/galleryaction.php:59
-#: lib/mailbox.php:80 lib/profileaction.php:77
+#: actions/apigrouplist.php:70 actions/apigroupprofileupdate.php:108
+#: actions/apistatusesupdate.php:230 actions/apisubscriptions.php:85
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:173
+#: actions/apitimelinehome.php:78 actions/apitimelinementions.php:77
+#: actions/apitimelineuser.php:79 actions/avatarbynickname.php:79
+#: actions/favoritesrss.php:72 actions/foaf.php:42 actions/foaf.php:61
+#: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116
+#: actions/otp.php:78 actions/remotesubscribe.php:144
+#: actions/remotesubscribe.php:153 actions/replies.php:73
+#: actions/repliesrss.php:38 actions/rsd.php:113 actions/showfavorites.php:106
+#: actions/userbyid.php:75 actions/usergroups.php:93 actions/userrss.php:40
+#: actions/userxrd.php:59 actions/xrds.php:71 lib/command.php:509
+#: lib/galleryaction.php:59 lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "ასეთი მომხმარებელი არ არსებობს."
 
@@ -169,10 +173,9 @@ msgstr "%1$s და მეგობრები, გვერდი %2$d"
 #. TRANS: H1 text for page. %s is a user nickname.
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Timeline title for user and friends. %s is a user nickname.
-#. TRANS: Tooltop for personal group navigation menu option when logged in for viewing timeline of self and friends.
 #: actions/all.php:94 actions/all.php:191 actions/allrss.php:117
 #: actions/apitimelinefriends.php:207 actions/apitimelinehome.php:113
-#: lib/personalgroupnav.php:102
+#: lib/personalgroupnav.php:100
 #, php-format
 msgid "%s and friends"
 msgstr " %s და მეგობრები"
@@ -228,7 +231,7 @@ msgstr ""
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
 #. TRANS: Second sentence of empty message for anonymous users. %s is a user nickname.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:227
+#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:221
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -277,19 +280,20 @@ msgstr " %1$s და მეგობრების განახლებე
 #: actions/apifavoritecreate.php:98 actions/apifavoritedestroy.php:98
 #: actions/apifriendshipscreate.php:99 actions/apifriendshipsdestroy.php:99
 #: actions/apifriendshipsshow.php:124 actions/apigroupcreate.php:138
-#: actions/apigroupismember.php:115 actions/apigroupjoin.php:160
-#: actions/apigroupleave.php:145 actions/apigrouplist.php:134
+#: actions/apigroupismember.php:115 actions/apigroupjoin.php:151
+#: actions/apigroupleave.php:141 actions/apigrouplist.php:134
 #: actions/apigrouplistall.php:120 actions/apigroupmembership.php:105
+#: actions/apigroupprofileupdate.php:100 actions/apigroupprofileupdate.php:213
 #: actions/apigroupshow.php:114 actions/apihelptest.php:84
 #: actions/apistatusesdestroy.php:101 actions/apistatusesretweets.php:110
 #: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:139
 #: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
-#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:268
-#: actions/apitimelinegroup.php:147 actions/apitimelinehome.php:173
-#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:239
-#: actions/apitimelineretweetedtome.php:118
-#: actions/apitimelineretweetsofme.php:150 actions/apitimelinetag.php:159
-#: actions/apitimelineuser.php:206 actions/apiusershow.php:100
+#: actions/apitimelinefavorites.php:182 actions/apitimelinefriends.php:276
+#: actions/apitimelinegroup.php:148 actions/apitimelinehome.php:181
+#: actions/apitimelinementions.php:182 actions/apitimelinepublic.php:247
+#: actions/apitimelineretweetedtome.php:147
+#: actions/apitimelineretweetsofme.php:147 actions/apitimelinetag.php:165
+#: actions/apitimelineuser.php:217 actions/apiusershow.php:100
 msgid "API method not found."
 msgstr "API მეთოდი ვერ მოიძებნა."
 
@@ -304,8 +308,9 @@ msgstr "API მეთოდი ვერ მოიძებნა."
 #: actions/apifavoritecreate.php:88 actions/apifavoritedestroy.php:88
 #: actions/apifriendshipscreate.php:89 actions/apifriendshipsdestroy.php:89
 #: actions/apigroupcreate.php:102 actions/apigroupjoin.php:89
-#: actions/apigroupleave.php:89 actions/apimediaupload.php:66
-#: actions/apistatusesretweet.php:63 actions/apistatusesupdate.php:194
+#: actions/apigroupleave.php:89 actions/apigroupprofileupdate.php:92
+#: actions/apimediaupload.php:66 actions/apistatusesretweet.php:63
+#: actions/apistatusesupdate.php:194
 msgid "This method requires a POST."
 msgstr "ეს მეთოდი მოითხოვს POST-ს."
 
@@ -319,21 +324,16 @@ msgstr ""
 "sms, im, none."
 
 #. TRANS: Server error displayed when a user's delivery device cannot be updated.
-#. TRANS: Server error displayed when a user update to the database fails in the contact address confirmation action.
 #. TRANS: Server error thrown on database error updating e-mail preferences.
 #. TRANS: Server error thrown on database error removing a registered e-mail address.
-#. TRANS: Server error thrown on database error updating Instant Messaging preferences.
-#. TRANS: Server error thrown on database error removing a registered Instant Messaging address.
-#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
 #. TRANS: Server error thrown when user profile settings could not be updated.
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
-#: actions/apiaccountupdatedeliverydevice.php:130
-#: actions/confirmaddress.php:118 actions/emailsettings.php:352
-#: actions/emailsettings.php:498 actions/imsettings.php:276
-#: actions/imsettings.php:432 actions/othersettings.php:186
-#: actions/profilesettings.php:322 actions/smssettings.php:301
-#: actions/smssettings.php:454
+#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
+#: actions/apiaccountupdatedeliverydevice.php:136
+#: actions/emailsettings.php:353 actions/emailsettings.php:499
+#: actions/profilesettings.php:323 actions/smssettings.php:300
+#: actions/smssettings.php:453 actions/urlsettings.php:211
 msgid "Could not update user."
 msgstr "მომხმარებლის განახლება ვერ მოხერხდა."
 
@@ -359,7 +359,7 @@ msgstr "მომხმარებელს პროფილი არ გა
 
 #. TRANS: Server error displayed if a user profile could not be saved.
 #. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:418
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:419
 msgid "Could not save profile."
 msgstr "პროფილის შენახვა ვერ მოხერხდა."
 
@@ -371,7 +371,7 @@ msgstr "პროფილის შენახვა ვერ მოხერ
 #: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
 #: actions/designadminpanel.php:120 actions/editapplication.php:121
 #: actions/newapplication.php:102 actions/newnotice.php:95
-#: lib/designsettings.php:298
+#: lib/designsettings.php:110
 #, fuzzy, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s byte) due to its "
@@ -393,8 +393,8 @@ msgstr[0] ""
 #: actions/apiaccountupdateprofilecolors.php:160
 #: actions/apiaccountupdateprofilecolors.php:171
 #: actions/groupdesignsettings.php:285 actions/groupdesignsettings.php:296
-#: actions/userdesignsettings.php:201 actions/userdesignsettings.php:211
-#: actions/userdesignsettings.php:253 actions/userdesignsettings.php:263
+#: actions/userdesignsettings.php:218 actions/userdesignsettings.php:228
+#: actions/userdesignsettings.php:270 actions/userdesignsettings.php:280
 msgid "Unable to save your design settings."
 msgstr "სამწუხაროდ თქვენი დიზაინის პარამეტრების შენახვა ვერ მოხერხდა."
 
@@ -402,7 +402,7 @@ msgstr "სამწუხაროდ თქვენი დიზაინი
 #. TRANS: Client error displayed when a database error occurs updating profile colours.
 #: actions/apiaccountupdateprofilebackgroundimage.php:191
 #: actions/apiaccountupdateprofilecolors.php:139
-#: actions/userdesignsettings.php:179
+#: actions/userdesignsettings.php:196
 msgid "Could not update your design."
 msgstr "დიზაინის განახლება ვერ მოხერხდა."
 
@@ -510,7 +510,7 @@ msgstr "მიმღები მომხმარებელი ვერ მ
 #. TRANS: Client error displayed trying to direct message another user who's not a friend (403).
 #: actions/apidirectmessagenew.php:144
 #, fuzzy
-msgid "Can't send direct messages to users who aren't your friend."
+msgid "Cannot send direct messages to users who aren't your friend."
 msgstr "ვერ გაუგზავნი პირდაპირ შეტყობინებას იმას, ვისთანაც არ მეგობრობ."
 
 #. TRANS: Client error displayed trying to direct message self (403).
@@ -593,9 +593,9 @@ msgstr "სასურველი მომხმარებელი ვე
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:156 actions/editgroup.php:191
-#: actions/newgroup.php:137 actions/profilesettings.php:273
-#: actions/register.php:214
+#: actions/apigroupcreate.php:156 actions/apigroupprofileupdate.php:255
+#: actions/editgroup.php:191 actions/newgroup.php:137
+#: actions/profilesettings.php:274 actions/register.php:199
 msgid "Nickname already in use. Try another one."
 msgstr "მეტსახელი უკვე გამოყენებულია. სცადე სხვა."
 
@@ -603,9 +603,9 @@ msgstr "მეტსახელი უკვე გამოყენებუ
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:164 actions/editgroup.php:195
-#: actions/newgroup.php:141 actions/profilesettings.php:243
-#: actions/register.php:216
+#: actions/apigroupcreate.php:164 actions/apigroupprofileupdate.php:259
+#: actions/editgroup.php:195 actions/newgroup.php:141
+#: actions/profilesettings.php:244 actions/register.php:201
 msgid "Not a valid nickname."
 msgstr "მეტსახელი არასწორია."
 
@@ -615,10 +615,10 @@ msgstr "მეტსახელი არასწორია."
 #. TRANS: Validation error shown when providing an invalid homepage URL in the "New application" form.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:181 actions/editapplication.php:235
-#: actions/editgroup.php:202 actions/newapplication.php:221
-#: actions/newgroup.php:148 actions/profilesettings.php:248
-#: actions/register.php:223
+#: actions/apigroupcreate.php:181 actions/apigroupprofileupdate.php:277
+#: actions/editapplication.php:235 actions/editgroup.php:202
+#: actions/newapplication.php:221 actions/newgroup.php:148
+#: actions/profilesettings.php:249 actions/register.php:208
 msgid "Homepage is not a valid URL."
 msgstr "სასტარტო გვერდი არასწორი URL-ია."
 
@@ -627,8 +627,8 @@ msgstr "სასტარტო გვერდი არასწორი URL
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:191 actions/editgroup.php:206
-#: actions/newgroup.php:152 actions/profilesettings.php:252
-#: actions/register.php:226
+#: actions/newgroup.php:152 actions/profilesettings.php:253
+#: actions/register.php:211
 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "სრული სახელი ძალიან გრძელია (არაუმეტეს 255 სიმბოლო)."
@@ -655,8 +655,8 @@ msgstr[0] "აღწერა ძალიან გრძელია (არ
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:215 actions/editgroup.php:218
-#: actions/newgroup.php:164 actions/profilesettings.php:265
-#: actions/register.php:235
+#: actions/newgroup.php:164 actions/profilesettings.php:266
+#: actions/register.php:220
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
 msgstr "ადგილმდებარეობა ძალიან გრძელია (არაუმეტეს 255 სიმბოლო)."
@@ -685,15 +685,16 @@ msgstr ""
 #. TRANS: %s is the alias that is already in use.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error. %s is the already used alias.
-#: actions/apigroupcreate.php:264 actions/editgroup.php:246
-#: actions/newgroup.php:193
+#: actions/apigroupcreate.php:264 actions/apigroupprofileupdate.php:351
+#: actions/editgroup.php:246 actions/newgroup.php:193
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to use an alias during group creation that is the same as the group's nickname.
 #. TRANS: Group edit form validation error.
-#: actions/apigroupcreate.php:278 actions/editgroup.php:253
+#: actions/apigroupcreate.php:278 actions/apigroupprofileupdate.php:359
+#: actions/editgroup.php:253
 msgid "Alias can't be the same as nickname."
 msgstr ""
 
@@ -705,7 +706,8 @@ msgstr ""
 #. TRANS: Client error displayed requesting most recent notices to a group for a non-existing group.
 #: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
 #: actions/apigroupleave.php:104 actions/apigroupmembership.php:71
-#: actions/apigroupshow.php:81 actions/apitimelinegroup.php:89
+#: actions/apigroupprofileupdate.php:113 actions/apigroupshow.php:81
+#: actions/apitimelinegroup.php:89
 msgid "Group not found."
 msgstr "ჯგუფი ვერ მოიძებნა."
 
@@ -723,13 +725,11 @@ msgstr "თქვენ უკვე ხართ ამ ჯგუფის წ
 msgid "You have been blocked from that group by the admin."
 msgstr "თქვენ დაბლოკილი ხართ ამ ჯგუფიდან ადმინისტრატორის მიერ."
 
-#. TRANS: Server error displayed when joining a group fails.
-#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
 #. 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.
 #. TRANS: Message given having failed to add a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:362
+#: actions/apigroupjoin.php:136 actions/joingroup.php:139 lib/command.php:362
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "ვერ მოხერხდა მომხმარებელ %1$s-სთან ერთად ჯგუფ %2$s-ში გაერთიანება."
@@ -739,8 +739,6 @@ msgstr "ვერ მოხერხდა მომხმარებელ %1$
 msgid "You are not a member of this group."
 msgstr "თვენ არ ხართ ამ ჯგუფის წევრი."
 
-#. TRANS: Server error displayed when leaving a group fails.
-#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
 #. TRANS: Server error displayed when leaving a group failed in the database.
 #. TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
 #. TRANS: Message given having failed to remove a user from a group.
@@ -776,6 +774,61 @@ msgstr "%s ჯგუფები"
 msgid "groups on %s"
 msgstr "ჯგუფები %s-ზე"
 
+#. TRANS: Client error displayed trying to edit a group while not being a group admin.
+#. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
+#. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
+#: actions/apigroupprofileupdate.php:118 actions/editgroup.php:110
+#: actions/editgroup.php:176 actions/groupdesignsettings.php:109
+#: actions/grouplogo.php:111
+msgid "You must be an admin to edit the group."
+msgstr "ჯგუფის რედაქტირებისათვის საჭიროა ადმინის უფლებები."
+
+#. TRANS: Server error displayed when editing a group fails.
+#: actions/apigroupprofileupdate.php:171 actions/editgroup.php:274
+msgid "Could not update group."
+msgstr "ჯგუფის განახლება ვერ მოხერხდა."
+
+#. TRANS: Server error displayed when group aliases could not be added.
+#. TRANS: Server exception thrown when creating group aliases failed.
+#: actions/apigroupprofileupdate.php:194 actions/editgroup.php:281
+#: classes/User_group.php:540
+msgid "Could not create aliases."
+msgstr ""
+
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: actions/apigroupprofileupdate.php:249 lib/nickname.php:165
+msgid "Nickname must have only lowercase letters and numbers and no spaces."
+msgstr "მეტსახელში დასაშვებია მხოლოდ პატარა ასოები და ციფრები."
+
+#: actions/apigroupprofileupdate.php:286
+#, fuzzy
+msgid "Full name is too long (max 255 chars)."
+msgstr "სრული სახელი ძალიან გრძელია (არაუმეტეს 255 სიმბოლო)."
+
+#: actions/apigroupprofileupdate.php:296
+#, fuzzy, php-format
+msgid "description is too long (max %d chars)."
+msgstr "აღწერა ძალიან გრძელია (არაუმეტეს %d სიმბოლო)."
+
+#: actions/apigroupprofileupdate.php:307
+#, fuzzy
+msgid "Location is too long (max 255 chars)."
+msgstr "ადგილმდებარეობა ძალიან გრძელია (არაუმეტეს 255 სიმბოლო)."
+
+#: actions/apigroupprofileupdate.php:326
+#, php-format
+msgid "Too many aliases! Maximum %d."
+msgstr ""
+
+#. TRANS: Group edit form validation error.
+#. TRANS: Group create form validation error.
+#. TRANS: %s is the invalid alias.
+#: actions/apigroupprofileupdate.php:342 actions/editgroup.php:241
+#: actions/newgroup.php:188
+#, php-format
+msgid "Invalid alias: \"%s\""
+msgstr ""
+
 #. TRANS: Client error displayed when uploading a media file has failed.
 #: actions/apimediaupload.php:101
 msgid "Upload failed."
@@ -808,21 +861,22 @@ msgstr "თქვენ არ ხართ ავტორიზირებუ
 #. TRANS: Form validation error message.
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
+#. TRANS: Client error displayed when the session token is not okay.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
 #: actions/deletenotice.php:177 actions/disfavor.php:75
-#: actions/emailsettings.php:291 actions/favor.php:75 actions/geocode.php:55
+#: actions/emailsettings.php:292 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:65 actions/grouplogo.php:321
-#: actions/groupunblock.php:65 actions/imsettings.php:224
-#: actions/invite.php:60 actions/login.php:137 actions/makeadmin.php:66
-#: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
-#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
-#: actions/othersettings.php:155 actions/passwordsettings.php:138
-#: actions/profilesettings.php:217 actions/recoverpassword.php:383
-#: actions/register.php:172 actions/remotesubscribe.php:76
-#: actions/repeat.php:82 actions/smssettings.php:250 actions/subedit.php:40
-#: actions/subscribe.php:86 actions/tagother.php:166
-#: actions/unsubscribe.php:69 actions/userauthorization.php:52
-#: lib/designsettings.php:310
+#: actions/groupunblock.php:65 actions/imsettings.php:241
+#: actions/invite.php:60 actions/makeadmin.php:66 actions/newmessage.php:135
+#: actions/newnotice.php:105 actions/nudge.php:80
+#: actions/oauthappssettings.php:162 actions/oauthconnectionssettings.php:135
+#: actions/passwordsettings.php:137 actions/pluginenable.php:87
+#: actions/profilesettings.php:218 actions/recoverpassword.php:383
+#: actions/register.php:157 actions/remotesubscribe.php:76
+#: actions/repeat.php:82 actions/smssettings.php:249 actions/subedit.php:40
+#: actions/subscribe.php:87 actions/tagother.php:145
+#: actions/unsubscribe.php:69 actions/urlsettings.php:171
+#: actions/userauthorization.php:53 lib/designsettings.php:122
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 
@@ -851,10 +905,10 @@ msgstr "ბაზამ დაუშვა შეცდომა OAuth აპლ
 #. TRANS: Unknown form validation error in design settings form.
 #: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
 #: actions/designadminpanel.php:100 actions/editapplication.php:144
-#: actions/emailsettings.php:310 actions/grouplogo.php:332
-#: actions/imsettings.php:239 actions/newapplication.php:124
-#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
-#: actions/smssettings.php:271 lib/designsettings.php:321
+#: actions/emailsettings.php:311 actions/grouplogo.php:332
+#: actions/imsettings.php:256 actions/newapplication.php:124
+#: actions/oauthconnectionssettings.php:144 actions/recoverpassword.php:46
+#: actions/smssettings.php:270 lib/designsettings.php:133
 msgid "Unexpected form submission."
 msgstr ""
 
@@ -898,31 +952,26 @@ msgstr "ანგარიში"
 
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Field label in form for profile settings.
-#. TRANS: Label for group nickname (dt). Text hidden by default.
-#. TRANS: DT for nick name in a profile.
-#: actions/apioauthauthorize.php:459 actions/login.php:252
-#: actions/profilesettings.php:106 actions/register.php:432
-#: actions/showgroup.php:243 actions/tagother.php:94
+#: actions/apioauthauthorize.php:459 actions/login.php:225
+#: actions/profilesettings.php:107 actions/register.php:411
 #: actions/userauthorization.php:145 lib/groupeditform.php:145
-#: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "მეტსახელი"
 
 #. TRANS: Field label on OAuth API authorisation form.
-#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:463 actions/login.php:255
-#: actions/register.php:436 lib/accountsettingsaction.php:120
+#: actions/apioauthauthorize.php:463 actions/login.php:228
+#: actions/register.php:415 lib/settingsnav.php:87
 msgid "Password"
 msgstr "პაროლი"
 
 #. TRANS: Button text that when clicked will cancel the process of allowing access to an account
 #. TRANS: by an external application.
 #. TRANS: Button label to cancel an e-mail address confirmation procedure.
-#. TRANS: Button label to cancel an Instant Messaging address confirmation procedure.
+#. TRANS: Button label to cancel an IM address confirmation procedure.
 #. TRANS: Button label to cancel a SMS address confirmation procedure.
 #. TRANS: Button label in the "Edit application" form.
-#: actions/apioauthauthorize.php:478 actions/emailsettings.php:124
-#: actions/imsettings.php:127 actions/smssettings.php:133
+#: actions/apioauthauthorize.php:478 actions/emailsettings.php:125
+#: actions/imsettings.php:136 actions/smssettings.php:132
 #: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Cancel"
@@ -1035,7 +1084,7 @@ msgstr "API მეთოდი ვერ მოიძებნა."
 #. TRANS: %s is the requested output format.
 #: actions/apistatusesshow.php:144
 #, fuzzy, php-format
-msgid "Unsupported format: %s"
+msgid "Unsupported format: %s."
 msgstr "ფორმატი არ არის მხარდაჭერილი."
 
 #. TRANS: Client error displayed requesting a deleted status.
@@ -1115,13 +1164,6 @@ msgstr ""
 msgid "%1$s updates favorited by %2$s / %3$s."
 msgstr "განახლებები არჩეული %1$s-ს მიერ %2$s-ზე!"
 
-#. TRANS: Server error displayed when generating an Atom feed fails.
-#. TRANS: %s is the error.
-#: actions/apitimelinegroup.php:134
-#, fuzzy, php-format
-msgid "Could not generate feed for group - %s"
-msgstr "ჯგუფის განახლება ვერ მოხერხდა."
-
 #. TRANS: Title for timeline of most recent mentions of a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname.
 #: actions/apitimelinementions.php:115
@@ -1138,13 +1180,14 @@ msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr ""
 
 #. TRANS: Title for site timeline. %s is the StatusNet sitename.
+#. TRANS: Public RSS feed title. %s is the StatusNet site name.
 #: actions/apitimelinepublic.php:193 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "%s საჯარო ნაკადი"
 
 #. TRANS: Subtitle for site timeline. %s is the StatusNet sitename.
-#: actions/apitimelinepublic.php:199 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:199
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "%s განახლებები ყველასგან!"
@@ -1156,21 +1199,33 @@ msgid "Unimplemented."
 msgstr "მეთოდი განუხორციელებელია."
 
 #. TRANS: Title for Atom feed "repeated to me". %s is the user nickname.
-#: actions/apitimelineretweetedtome.php:108
+#: actions/apitimelineretweetedtome.php:96
 #, php-format
 msgid "Repeated to %s"
 msgstr ""
 
+#: actions/apitimelineretweetedtome.php:98
+#, fuzzy, php-format
+msgid "%1$s notices that were to repeated to %2$s / %3$s."
+msgstr "განახლებები არჩეული %1$s-ს მიერ %2$s-ზე!"
+
 #. TRANS: Title of list of repeated notices of the logged in user.
 #. TRANS: %s is the nickname of the logged in user.
-#: actions/apitimelineretweetsofme.php:112
+#: actions/apitimelineretweetsofme.php:98
 #, php-format
 msgid "Repeats of %s"
 msgstr ""
 
+#: actions/apitimelineretweetsofme.php:104
+#, fuzzy, php-format
+msgid "%1$s notices that %2$s / %3$s has repeated."
+msgstr "%s-მა (@%s) დაამატა თქვენი შეტყობინება თავის რჩეულებში"
+
 #. TRANS: Title for timeline with lastest notices with a given tag.
 #. TRANS: %s is the tag.
-#: actions/apitimelinetag.php:101 actions/tag.php:67
+#. TRANS: Title for first page of notices with tags.
+#. TRANS: %s is the tag.
+#: actions/apitimelinetag.php:101 actions/tag.php:69
 #, php-format
 msgid "Notices tagged with %s"
 msgstr "შეტყობინებები მონიშნული როგორც %s"
@@ -1183,54 +1238,55 @@ msgid "Updates tagged with %1$s on %2$s!"
 msgstr "განახლებები მონიშნული როგორც %1$s %2$s-ზე!"
 
 #. TRANS: Client error displayed trying to add a notice to another user's timeline.
-#: actions/apitimelineuser.php:297
+#: actions/apitimelineuser.php:308
 #, fuzzy
 msgid "Only the user can add to their own timeline."
 msgstr "მხოლოდ მომხმარებელს შეუძლია თავისი ფოსტის წაკითხვა."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:304
+#: actions/apitimelineuser.php:315
 msgid "Only accept AtomPub for Atom feeds."
 msgstr ""
 
 #. TRANS: Client error displayed attempting to post an empty API notice.
-#: actions/apitimelineuser.php:311
+#: actions/apitimelineuser.php:322
 msgid "Atom post must not be empty."
 msgstr ""
 
 #. TRANS: Client error displayed attempting to post an API that is not well-formed XML.
-#: actions/apitimelineuser.php:317
+#: actions/apitimelineuser.php:328
 msgid "Atom post must be well-formed XML."
 msgstr ""
 
 #. TRANS: Client error displayed when not using an Atom entry.
-#: actions/apitimelineuser.php:323 actions/atompubfavoritefeed.php:228
+#: actions/apitimelineuser.php:334 actions/atompubfavoritefeed.php:228
 #: actions/atompubmembershipfeed.php:230
 #: actions/atompubsubscriptionfeed.php:236
 msgid "Atom post must be an Atom entry."
 msgstr ""
 
 #. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
-#: actions/apitimelineuser.php:335
+#: actions/apitimelineuser.php:345
 msgid "Can only handle POST activities."
 msgstr ""
 
 #. TRANS: Client error displayed when using an unsupported activity object type.
 #. TRANS: %s is the unsupported activity object type.
-#: actions/apitimelineuser.php:346
+#: actions/apitimelineuser.php:356
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
 #. TRANS: %d is the notice ID (number).
-#: actions/apitimelineuser.php:380
+#: actions/apitimelineuser.php:390
 #, fuzzy, php-format
 msgid "No content for notice %d."
 msgstr "მოძებნე შეტყობინებებში"
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:408
+#. TRANS: %s is the notice URI.
+#: actions/apitimelineuser.php:419
 #, fuzzy, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "შეტყობინებები ამ ID-თ არ არსებობს."
@@ -1248,9 +1304,10 @@ msgstr "API მეთოდი ვერ მოიძებნა."
 
 #. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
 #. TRANS: Client exception.
+#. TRANS: Client error displayed trying to subscribe to a non-existing profile.
 #: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
 #: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
-#: actions/subscribe.php:107
+#: actions/subscribe.php:110
 msgid "No such profile."
 msgstr "ასეთი პროფილი არ არსებობს."
 
@@ -1396,7 +1453,7 @@ msgid "Not a member."
 msgstr "ტელეფონის ნომერი არ არის."
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
-#: actions/atompubshowmembership.php:151
+#: actions/atompubshowmembership.php:150
 #, fuzzy
 msgid "Cannot delete someone else's membership."
 msgstr "საკუთარი გამოწერის წაშლა ვერ ხერხდება."
@@ -1485,10 +1542,7 @@ msgid "Invalid size."
 msgstr "ზომა არასწორია."
 
 #. TRANS: Title for avatar upload page.
-#. TRANS: Label for group avatar (dt). Text hidden by default.
-#. TRANS: Link description in user account settings menu.
-#: actions/avatarsettings.php:66 actions/showgroup.php:227
-#: lib/accountsettingsaction.php:113
+#: actions/avatarsettings.php:66 lib/settingsnav.php:82
 msgid "Avatar"
 msgstr "ავატარი"
 
@@ -1502,9 +1556,11 @@ msgstr ""
 
 #. TRANS: Server error displayed in avatar upload page when no matching profile can be found for a user.
 #. TRANS: Server error displayed coming across a request from a user without a profile.
+#. TRANS: Server error displayed when trying to authorise a remote subscription request
+#. TRANS: while the user has no profile.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
 #: actions/grouplogo.php:184 actions/remotesubscribe.php:190
-#: actions/userauthorization.php:72 actions/userrss.php:108
+#: actions/userauthorization.php:75 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr "მომხმარებელი შესაბამისი პროფილის გარეშე."
 
@@ -1562,10 +1618,10 @@ msgstr "მოჭრა"
 msgid "No file uploaded."
 msgstr "არცერთი ფაილი არ ატვირთულა"
 
-#. TRANS: Avatar upload form unstruction after uploading a file.
+#. TRANS: Avatar upload form instruction after uploading a file.
 #: actions/avatarsettings.php:345
 #, fuzzy
-msgid "Pick a square area of the image to be your avatar"
+msgid "Pick a square area of the image to be your avatar."
 msgstr "აირჩიეთ სურათის კვადრატული მონაკვეთი თქვენი ავატარისთვის"
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
@@ -1591,7 +1647,7 @@ msgstr "ავატარი წაიშალა."
 
 #. TRANS: Title for backup account page.
 #. TRANS: Option in profile settings to create a backup of the account of the currently logged in user.
-#: actions/backupaccount.php:61 actions/profilesettings.php:467
+#: actions/backupaccount.php:61 actions/profilesettings.php:468
 msgid "Backup account"
 msgstr ""
 
@@ -1625,7 +1681,7 @@ msgstr "ფონი"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
 #: actions/backupaccount.php:254
-msgid "Backup your account"
+msgid "Backup your account."
 msgstr ""
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
@@ -1664,7 +1720,7 @@ msgstr "არა"
 #. TRANS: Submit button title for 'No' when blocking a user.
 #: actions/block.php:158
 #, fuzzy
-msgid "Do not block this user"
+msgid "Do not block this user."
 msgstr "არ დაბლოკო ეს მომხმარებელი"
 
 #. TRANS: Button label on the user block form.
@@ -1681,9 +1737,9 @@ msgid "Yes"
 msgstr "დიახ"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#. TRANS: Description of the form to block a user.
-#: actions/block.php:165 lib/blockform.php:79
-msgid "Block this user"
+#: actions/block.php:165
+#, fuzzy
+msgid "Block this user."
 msgstr "დაბლოკე ეს მომხმარებელი"
 
 #. TRANS: Server error displayed when blocking a user fails.
@@ -1750,32 +1806,48 @@ msgstr "დასადასტურებელი კოდი ვერ მ
 msgid "That confirmation code is not for you!"
 msgstr "ეს დასადასტურებელი კოდი თქვენთვის არ არის!"
 
-#. TRANS: Server error for a unknow address type %s, which can be 'email', 'jabber', or 'sms'.
-#: actions/confirmaddress.php:92
-#, php-format
-msgid "Unrecognized address type %s."
+#. TRANS: Server error for an unknown address type, which can be 'email', 'sms', or the name of an IM network (such as 'xmpp' or 'aim')
+#: actions/confirmaddress.php:94
+#, fuzzy, php-format
+msgid "Unrecognized address type %s"
 msgstr "მისამართის ამოუცნობი ტიპი %s."
 
 #. TRANS: Client error for an already confirmed email/jabber/sms address.
-#: actions/confirmaddress.php:97
+#: actions/confirmaddress.php:103 actions/confirmaddress.php:136
 msgid "That address has already been confirmed."
 msgstr "ეს მისამართი უკვე დადასტურებულია."
 
+#: actions/confirmaddress.php:121 actions/imsettings.php:444
+#: actions/userdesignsettings.php:306
+#, fuzzy
+msgid "Couldn't update user."
+msgstr "მომხმარებლის განახლება ვერ მოხერხდა."
+
+#: actions/confirmaddress.php:144
+#, fuzzy
+msgid "Couldn't update user im preferences."
+msgstr "მომხმარებლის ჩანაწერის განახლება ვერ მოხერხდა."
+
+#: actions/confirmaddress.php:156
+#, fuzzy
+msgid "Couldn't insert user im preferences."
+msgstr "ახალი გამოწერის ჩასმა ვერ მოხერხდა."
+
 #. TRANS: Server error displayed when an address confirmation code deletion from the
 #. TRANS: database fails in the contact address confirmation action.
-#: actions/confirmaddress.php:132
+#: actions/confirmaddress.php:169
 #, fuzzy
 msgid "Could not delete address confirmation."
 msgstr "IM დასტურის წაშლა ვერ მოხერხდა."
 
 #. TRANS: Title for the contact address confirmation action.
-#: actions/confirmaddress.php:150
+#: actions/confirmaddress.php:185
 msgid "Confirm address"
 msgstr "მისამართის დასტური"
 
 #. TRANS: Success message for the contact address confirmation action.
 #. TRANS: %s can be 'email', 'jabber', or 'sms'.
-#: actions/confirmaddress.php:166
+#: actions/confirmaddress.php:200
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "მისამართი \"%s\" დადასტურდა თქვენი ანგარიშისთვის."
@@ -1789,6 +1861,7 @@ msgstr "საუბარი"
 #. TRANS: Label for user statistics.
 #: actions/conversation.php:149 lib/noticelist.php:87
 #: lib/profileaction.php:246 lib/searchgroupnav.php:82
+#: lib/threadednoticelist.php:66
 msgid "Notices"
 msgstr "შეტყობინებები"
 
@@ -1824,7 +1897,7 @@ msgstr "ავატარი წაიშალა."
 
 #. TRANS: Page title for page on which a user account can be deleted.
 #. TRANS: Option in profile settings to delete the account of the currently logged in user.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:475
+#: actions/deleteaccount.php:228 actions/profilesettings.php:476
 #, fuzzy
 msgid "Delete account"
 msgstr "გახსენი ანგარიში"
@@ -1848,7 +1921,7 @@ msgstr ""
 #. TRANS: Field label for delete account confirmation entry.
 #. TRANS: Field label for password reset form where the password has to be typed again.
 #: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:262 actions/register.php:440
+#: actions/recoverpassword.php:262 actions/register.php:419
 msgid "Confirm"
 msgstr "ვადასტურებ"
 
@@ -1878,14 +1951,14 @@ msgstr "აპლიკაცია ვერ მოიძებნა."
 #. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
 #: actions/deleteapplication.php:79 actions/editapplication.php:78
-#: actions/showapplication.php:94
+#: actions/showapplication.php:90
 msgid "You are not the owner of this application."
 msgstr "თქვენ არ ხართ ამ აპლიკაციის მფლობელი."
 
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
-#: actions/newapplication.php:112 actions/showapplication.php:118
-#: lib/action.php:1425
+#: actions/newapplication.php:112 actions/showapplication.php:113
+#: lib/action.php:1391
 msgid "There was a problem with your session token."
 msgstr ""
 
@@ -1908,13 +1981,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting an application.
 #: actions/deleteapplication.php:161
 #, fuzzy
-msgid "Do not delete this application"
+msgid "Do not delete this application."
 msgstr "არ წაშალო ეს აპლიკაცია"
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
 #: actions/deleteapplication.php:167
 #, fuzzy
-msgid "Delete this application"
+msgid "Delete this application."
 msgstr "აპლიკაციის წაშლა"
 
 #. TRANS: Client error when trying to delete group while not logged in.
@@ -1972,13 +2045,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting a group.
 #: actions/deletegroup.php:224
 #, fuzzy
-msgid "Do not delete this group"
+msgid "Do not delete this group."
 msgstr "არ წაშალო ეს შეტყობინება"
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
 #: actions/deletegroup.php:231
 #, fuzzy
-msgid "Delete this group"
+msgid "Delete this group."
 msgstr "ამ მომხმარებლის წაშლა"
 
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
@@ -1986,14 +2059,16 @@ msgstr "ამ მომხმარებლის წაშლა"
 #. TRANS: Client error displayed when trying to mark a notice as favorite without being logged in.
 #. TRANS: Client error displayed trying to block a user from a group while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
+#. TRANS: Client error displayed trying to log out when not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
+#. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
 #. TRANS: Client error displayed when trying to change user options while not logged in.
 #: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
-#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:69
+#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:70
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
-#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
-#: actions/tagother.php:33 actions/unsubscribe.php:52
+#: actions/nudge.php:63 actions/pluginenable.php:97 actions/subedit.php:33
+#: actions/subscribe.php:98 actions/tagother.php:33 actions/unsubscribe.php:52
 #: lib/adminpanelaction.php:71 lib/profileformaction.php:63
 #: lib/settingsaction.php:72
 msgid "Not logged in."
@@ -2020,12 +2095,13 @@ msgstr "ნამდვილად გსურთ ამ შეტყობი
 #. TRANS: Submit button title for 'No' when deleting a notice.
 #: actions/deletenotice.php:159
 #, fuzzy
-msgid "Do not delete this notice"
+msgid "Do not delete this notice."
 msgstr "არ წაშალო ეს შეტყობინება"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:166 lib/noticelist.php:673
-msgid "Delete this notice"
+#: actions/deletenotice.php:166
+#, fuzzy
+msgid "Delete this notice."
 msgstr "შეტყობინების წაშლა"
 
 #. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
@@ -2062,18 +2138,17 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting a user.
 #: actions/deleteuser.php:158
 #, fuzzy
-msgid "Do not delete this user"
+msgid "Do not delete this user."
 msgstr "არ წაშალო ეს შეტყობინება"
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
-#. TRANS: Description of form for deleting a user.
-#: actions/deleteuser.php:165 lib/deleteuserform.php:75
-msgid "Delete this user"
+#: actions/deleteuser.php:165
+#, fuzzy
+msgid "Delete this user."
 msgstr "ამ მომხმარებლის წაშლა"
 
 #. TRANS: Message used as title for design settings for the site.
-#. TRANS: Link description in user account settings menu.
-#: actions/designadminpanel.php:60 lib/accountsettingsaction.php:134
+#: actions/designadminpanel.php:60 lib/settingsnav.php:97
 msgid "Design"
 msgstr "ამ მომხმარებლის წაშლა"
 
@@ -2143,8 +2218,7 @@ msgstr ""
 "თქვენ შეგიძლიათ ატვირთოთ საკუთარი StatusNet–იერსახე .ZIP არქივის სახით."
 
 #. TRANS: Fieldset legend for theme background image.
-#. TRANS: Fieldset legend on profile design page.
-#: actions/designadminpanel.php:515 lib/designsettings.php:98
+#: actions/designadminpanel.php:515
 msgid "Change background image"
 msgstr "შეცვალე ფონური სურათი"
 
@@ -2152,7 +2226,7 @@ msgstr "შეცვალე ფონური სურათი"
 #. TRANS: Field label for background color selector.
 #. TRANS: Label on profile design page for setting a profile page background colour.
 #: actions/designadminpanel.php:525 actions/designadminpanel.php:609
-#: lib/designsettings.php:183
+#: lib/designform.php:238
 msgid "Background"
 msgstr "ფონი"
 
@@ -2179,13 +2253,13 @@ msgstr "გამორთვა"
 #. TRANS: Form guide for turning background image on or off on theme designer page.
 #. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
 #. TRANS: use of the uploaded profile image.
-#: actions/designadminpanel.php:577 lib/designsettings.php:159
+#: actions/designadminpanel.php:577 lib/designform.php:214
 msgid "Turn background image on or off."
 msgstr "ჩართე ან გამორთე ფონური სურათის ფუნქცია."
 
 #. TRANS: Checkbox label to title background image on theme designer page.
 #. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-#: actions/designadminpanel.php:583 lib/designsettings.php:165
+#: actions/designadminpanel.php:583 lib/designform.php:220
 msgid "Tile background image"
 msgstr "გაამრავლე ფონური სურათი"
 
@@ -2197,25 +2271,25 @@ msgstr "შეცვალე ფერები"
 
 #. TRANS: Field label for content color selector.
 #. TRANS: Label on profile design page for setting a profile page content colour.
-#: actions/designadminpanel.php:623 lib/designsettings.php:197
+#: actions/designadminpanel.php:623 lib/designform.php:252
 msgid "Content"
 msgstr "შიგთავსი"
 
 #. TRANS: Field label for sidebar color selector.
 #. TRANS: Label on profile design page for setting a profile page sidebar colour.
-#: actions/designadminpanel.php:637 lib/designsettings.php:211
+#: actions/designadminpanel.php:637 lib/designform.php:266
 msgid "Sidebar"
 msgstr "გვერდითი პანელი"
 
 #. TRANS: Field label for text color selector.
 #. TRANS: Label on profile design page for setting a profile page text colour.
-#: actions/designadminpanel.php:651 lib/designsettings.php:225
+#: actions/designadminpanel.php:651 lib/designform.php:280
 msgid "Text"
 msgstr "ტექსტი"
 
 #. TRANS: Field label for link color selector.
 #. TRANS: Label on profile design page for setting a profile page links colour.
-#: actions/designadminpanel.php:665 lib/designsettings.php:239
+#: actions/designadminpanel.php:665 lib/designform.php:294
 msgid "Links"
 msgstr "ბმულები"
 
@@ -2237,21 +2311,21 @@ msgid "Use defaults"
 msgstr "გამოიყენე პირვანდელი მდგომარეობა"
 
 #. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: actions/designadminpanel.php:720 lib/designsettings.php:259
-msgid "Restore default designs"
+#: actions/designadminpanel.php:720
+#, fuzzy
+msgid "Restore default designs."
 msgstr "დააბრუნე პირვანდელი დიზაინი"
 
 #. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: actions/designadminpanel.php:728 lib/designsettings.php:267
-msgid "Reset back to default"
+#: actions/designadminpanel.php:728
+#, fuzzy
+msgid "Reset back to default."
 msgstr "პირვანდელის პარამეტრების დაბრუნება"
 
 #. TRANS: Title for button for saving theme settings.
-#. TRANS: Title for button on profile design page to save settings.
-#: actions/designadminpanel.php:736 lib/designsettings.php:272
-msgid "Save design"
+#: actions/designadminpanel.php:736
+#, fuzzy
+msgid "Save design."
 msgstr "შეინახე დიზაინი"
 
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
@@ -2283,7 +2357,7 @@ msgid "You must be logged in to edit an application."
 msgstr "აპლიკაციის ჩასასწორებლად საჭიროა ავროტიზაცია."
 
 #. TRANS: Client error displayed trying to edit an application that does not exist.
-#: actions/editapplication.php:83 actions/showapplication.php:87
+#: actions/editapplication.php:83 actions/showapplication.php:83
 msgid "No such application."
 msgstr "ასეთი აპლიკაცია არ არის."
 
@@ -2376,80 +2450,53 @@ msgstr "%s ჯგუფის რედაქტირება"
 msgid "You must be logged in to create a group."
 msgstr "გჯუფის შესაქმნელად საჭიროა ავტორიზაცია."
 
-#. TRANS: Client error displayed trying to edit a group while not being a group admin.
-#. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
-#. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
-#: actions/editgroup.php:110 actions/editgroup.php:176
-#: actions/groupdesignsettings.php:109 actions/grouplogo.php:111
-msgid "You must be an admin to edit the group."
-msgstr "ჯგუფის რედაქტირებისათვის საჭიროა ადმინის უფლებები."
-
 #. TRANS: Form instructions for group edit form.
 #: actions/editgroup.php:161
 msgid "Use this form to edit the group."
 msgstr "ჯგუფის რედაქტირებისათვის გამოიყენეთ ეს ფორმა."
 
-#. TRANS: Group edit form validation error.
-#. TRANS: Group create form validation error.
-#. TRANS: %s is the invalid alias.
-#: actions/editgroup.php:241 actions/newgroup.php:188
-#, php-format
-msgid "Invalid alias: \"%s\""
-msgstr ""
-
-#. TRANS: Server error displayed when editing a group fails.
-#: actions/editgroup.php:274
-msgid "Could not update group."
-msgstr "ჯგუფის განახლება ვერ მოხერხდა."
-
-#. TRANS: Server error displayed when group aliases could not be added.
-#. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/editgroup.php:281 classes/User_group.php:540
-msgid "Could not create aliases."
-msgstr ""
-
 #. TRANS: Group edit form success message.
 #: actions/editgroup.php:301
 msgid "Options saved."
 msgstr "პარამეტრები შენახულია."
 
 #. TRANS: Title for e-mail settings.
-#: actions/emailsettings.php:59
+#: actions/emailsettings.php:60
 msgid "Email settings"
 msgstr "ელ. ფოსტის პარამეტრები"
 
 #. TRANS: E-mail settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/emailsettings.php:73
+#: actions/emailsettings.php:74
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 msgstr "%%site.name%%–სგან ელ. ფოსტის მიღების მართვა."
 
 #. TRANS: Form legend for e-mail settings form.
 #. TRANS: Field label for e-mail address input in e-mail settings form.
-#: actions/emailsettings.php:103 actions/emailsettings.php:129
+#: actions/emailsettings.php:104 actions/emailsettings.php:130
 msgid "Email address"
 msgstr "ელ. ფოსტის მისამართი"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:109
+#: actions/emailsettings.php:110
 msgid "Current confirmed email address."
 msgstr "მიმდინარე დადასტურებული ელ. ფოსტის მისამართი."
 
 #. TRANS: Button label to remove a confirmed e-mail address.
 #. TRANS: Button label for removing a set sender e-mail address to post notices from.
-#. TRANS: Button label to remove a confirmed Instant Messaging address.
+#. TRANS: Button label to remove a confirmed IM address.
 #. TRANS: Button label to remove a confirmed SMS address.
 #. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
-#: actions/emailsettings.php:112 actions/emailsettings.php:179
-#: actions/imsettings.php:112 actions/smssettings.php:120
-#: actions/smssettings.php:176
+#: actions/emailsettings.php:113 actions/emailsettings.php:180
+#: actions/imsettings.php:119 actions/smssettings.php:119
+#: actions/smssettings.php:175
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "წაშლა"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:119
+#: actions/emailsettings.php:120
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -2462,44 +2509,44 @@ msgstr ""
 #. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
 #. TRANS: Any other domain may be owned by a legitimate person or
 #. TRANS: organization.
-#: actions/emailsettings.php:136
+#: actions/emailsettings.php:137
 msgid "Email address, like \"UserName@example.org\""
 msgstr "ელ. ფოსტის მისამართი, როგორც \"UserName@example.org\""
 
 #. TRANS: Button label for adding an e-mail address in e-mail settings form.
-#. TRANS: Button label for adding an Instant Messaging address in Instant Messaging settings form.
+#. TRANS: Button label for adding an IM address in IM settings form.
 #. TRANS: Button label for adding a SMS phone number in SMS settings form.
-#: actions/emailsettings.php:140 actions/imsettings.php:147
-#: actions/smssettings.php:158
+#: actions/emailsettings.php:141 actions/imsettings.php:147
+#: actions/smssettings.php:157
 msgctxt "BUTTON"
 msgid "Add"
 msgstr "დამატება"
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:148 actions/smssettings.php:167
+#: actions/emailsettings.php:149 actions/smssettings.php:166
 msgid "Incoming email"
 msgstr "შემომავალი ელ. ფოსტა"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:154
+#: actions/emailsettings.php:155
 msgid "I want to post notices by email."
 msgstr "მინდა დავპოსტო შეტყობინებები ელ. ფოსტით."
 
 #. TRANS: Form instructions for incoming e-mail form in e-mail settings.
 #. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
-#: actions/emailsettings.php:176 actions/smssettings.php:174
+#: actions/emailsettings.php:177 actions/smssettings.php:173
 msgid "Send email to this address to post new notices."
 msgstr "გააგზავნე ელ. ფოსტა ამ მისამართზე ახალი შეტყობინებების დასაპოსტად."
 
 #. TRANS: Instructions for incoming e-mail address input form, when an address has already been assigned.
 #. TRANS: Instructions for incoming SMS e-mail address input form.
-#: actions/emailsettings.php:185 actions/smssettings.php:182
+#: actions/emailsettings.php:186 actions/smssettings.php:181
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr ""
 
 #. TRANS: Instructions for incoming e-mail address input form.
-#: actions/emailsettings.php:189
+#: actions/emailsettings.php:190
 msgid ""
 "To send notices via email, we need to create a unique email address for you "
 "on this server:"
@@ -2507,91 +2554,91 @@ msgstr ""
 
 #. TRANS: Button label for adding an e-mail address to send notices from.
 #. TRANS: Button label for adding an SMS e-mail address to send notices from.
-#: actions/emailsettings.php:195 actions/smssettings.php:185
+#: actions/emailsettings.php:196 actions/smssettings.php:184
 msgctxt "BUTTON"
 msgid "New"
 msgstr "ახალი"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:204
+#: actions/emailsettings.php:205
 msgid "Email preferences"
 msgstr "ელ. ფოსტის პარამეტრები"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:212
+#: actions/emailsettings.php:213
 msgid "Send me notices of new subscriptions through email."
 msgstr ""
 "გამომიგზავნე შეტყობინებები ახალი გამოწერების შესახებ ელ. ფოსტის საშუალებით."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:218
+#: actions/emailsettings.php:219
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr ""
 "გამომიგზავნე ელ. წერილი როდესაც ვინმე ჩემს შეტყობინებას რჩეულებში დაიმატებს."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:225
+#: actions/emailsettings.php:226
 msgid "Send me email when someone sends me a private message."
 msgstr "გამომიგზავნე ელ. წერილი როდესაც ვინმე პირად შეტყობინებას მომწერს."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:231
+#: actions/emailsettings.php:232
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr "გამომიგზავნე წერილი როდესაც ვინმე გამომიგზავნის \"@-პასუხს\"."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:237
+#: actions/emailsettings.php:238
 msgid "Allow friends to nudge me and send me an email."
 msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:243
+#: actions/emailsettings.php:244
 msgid "Publish a MicroID for my email address."
 msgstr "გამოაქვეყნე MicroID ჩემი ელ. ფოსტის მისამართისთვის."
 
 #. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:361
+#: actions/emailsettings.php:362
 msgid "Email preferences saved."
 msgstr "ელ. ფოსტის პარამეტრები შენახულია."
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:380
+#: actions/emailsettings.php:381
 msgid "No email address."
 msgstr " ელ. ფოსტის მისამართი მითითებული არ არის."
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:388
+#: actions/emailsettings.php:389
 #, fuzzy
 msgid "Cannot normalize that email address."
 msgstr "Jabber ID-ს ნორმალიზაცია ვერ ხერხდება"
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:393 actions/register.php:212
+#: actions/emailsettings.php:394 actions/register.php:197
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "არასწორი ელ. ფოსტის მისამართი."
 
 #. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:397
+#: actions/emailsettings.php:398
 msgid "That is already your email address."
 msgstr "ეს უკვე არის თქვენი ელ. ფოსტის მისამართი."
 
 #. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:401
+#: actions/emailsettings.php:402
 msgid "That email address already belongs to another user."
 msgstr "ეს ელ. ფოსტის მისამართი დაკავებულია."
 
 #. TRANS: Server error thrown on database error adding e-mail confirmation code.
 #. TRANS: Server error thrown on database error adding Instant Messaging confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:418 actions/imsettings.php:343
-#: actions/smssettings.php:365
+#: actions/emailsettings.php:419 actions/imsettings.php:362
+#: actions/smssettings.php:364
 #, fuzzy
 msgid "Could not insert confirmation code."
 msgstr "დასტურის კოდის ჩასმა ვერ მოხერხდა."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:425
+#: actions/emailsettings.php:426
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
@@ -2603,59 +2650,62 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling Instant Messaging address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:445 actions/imsettings.php:377
-#: actions/smssettings.php:399
+#: actions/emailsettings.php:446 actions/imsettings.php:391
+#: actions/smssettings.php:398
 msgid "No pending confirmation to cancel."
 msgstr "გასაუქმებელიარაფერია. არ არის მომლოდინე დასტური."
 
 #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:450
+#: actions/emailsettings.php:451
 msgid "That is the wrong email address."
 msgstr "ეს არასწორი ელ. ფოსტის მისამართია."
 
 #. TRANS: Server error thrown on database error canceling e-mail address confirmation.
 #. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
-#: actions/emailsettings.php:459 actions/smssettings.php:413
+#: actions/emailsettings.php:460 actions/smssettings.php:412
 #, fuzzy
 msgid "Could not delete email confirmation."
 msgstr "ელ. ფოსტის დადასტურების წაშლა ვერ მოხერხდა."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:464
+#: actions/emailsettings.php:465
 msgid "Email confirmation cancelled."
 msgstr "ელ. ფოსტის დადასტურება გაუქმებულია."
 
 #. TRANS: Message given trying to remove an e-mail address that is not
 #. TRANS: registered for the active user.
-#: actions/emailsettings.php:483
+#: actions/emailsettings.php:484
 msgid "That is not your email address."
 msgstr "ეს არ არის თქვენი ელ. ფოსტის მისამართი."
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:504
+#: actions/emailsettings.php:505
 msgid "The email address was removed."
 msgstr "ელ. ფოსტის მისამართი მოშორებულია."
 
 #. TRANS: Form validation error displayed when trying to remove an incoming e-mail address while no address has been set.
-#: actions/emailsettings.php:518 actions/smssettings.php:555
+#: actions/emailsettings.php:519 actions/smssettings.php:554
 msgid "No incoming email address."
 msgstr "შემომავალი ელ. ფოსტის მისამართი არ არის."
 
 #. TRANS: Server error thrown on database error removing incoming e-mail address.
 #. TRANS: Server error thrown on database error adding incoming e-mail address.
-#: actions/emailsettings.php:530 actions/emailsettings.php:554
-#: actions/smssettings.php:565 actions/smssettings.php:588
+#. TRANS: Server error displayed when the user could not be updated in SMS settings.
+#: actions/emailsettings.php:531 actions/emailsettings.php:555
+#: actions/smssettings.php:565 actions/smssettings.php:590
 #, fuzzy
 msgid "Could not update user record."
 msgstr "მომხმარებლის ჩანაწერის განახლება ვერ მოხერხდა."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:534 actions/smssettings.php:568
+#. TRANS: Confirmation text after updating SMS settings.
+#: actions/emailsettings.php:535 actions/smssettings.php:569
 msgid "Incoming email address removed."
 msgstr "შემომავალი ელ. ფოსტის მისამართი მოშორებულია."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:558 actions/smssettings.php:591
+#. TRANS: Confirmation text after updating SMS settings.
+#: actions/emailsettings.php:559 actions/smssettings.php:594
 msgid "New incoming email address added."
 msgstr "დამატებულია ახალი შემომავალი ელ. ფოსტა."
 
@@ -2667,7 +2717,7 @@ msgstr "ეს შეტყობინება უკვე რჩეული
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
 #: actions/favor.php:95
 #, fuzzy
-msgid "Disfavor favorite"
+msgid "Disfavor favorite."
 msgstr "რჩეულის გაუქმება"
 
 #. TRANS: Page title for first page of favorited notices.
@@ -2719,9 +2769,8 @@ msgstr ""
 #. TRANS: %s is a user's nickname.
 #. TRANS: Title for first page of favourite notices of a user.
 #. TRANS: %s is the user for whom the favourite notices are displayed.
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing own favourited notices.
 #: actions/favoritesrss.php:111 actions/showfavorites.php:76
-#: lib/personalgroupnav.php:122
+#: lib/personalgroupnav.php:110
 #, php-format
 msgid "%s's favorite notices"
 msgstr "%s-ს რჩეული შეტყობინებები"
@@ -2908,13 +2957,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
 #: actions/groupblock.php:191
 #, fuzzy
-msgid "Do not block this user from this group"
+msgid "Do not block this user from this group."
 msgstr "არ გარიცხო ემ მომხმარებელი ამ ჯგუფიდან"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
 #: actions/groupblock.php:198
 #, fuzzy
-msgid "Block this user from this group"
+msgid "Block this user from this group."
 msgstr "გარიცხე ეს მომხმარებელი ამ ჯგუფიდან"
 
 #. TRANS: Server error displayed when trying to block a user from a group fails because of an application error.
@@ -2923,6 +2972,7 @@ msgid "Database error blocking user from group."
 msgstr "მომხმარებლის ჯგუფიდან გარიცხვისას მოხდა შეცდომა ბაზაში."
 
 #. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
+#. TRANS: Client error displayed trying to find a user by ID without providing an ID.
 #: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr "ID უცნობია."
@@ -2953,7 +3003,7 @@ msgid "Unable to update your design settings."
 msgstr "სამწუხაროდ თქვენი დიზაინის პარამეტრების შენახვა ვერ მოხერხდა."
 
 #. TRANS: Form text to confirm saved group design settings.
-#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:222
+#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:239
 msgid "Design preferences saved."
 msgstr "დიზაინის პარამეტრები შენახულია."
 
@@ -3017,7 +3067,7 @@ msgid "A list of the users in this group."
 msgstr "ამ ჯგუფის წევრების სია."
 
 #. TRANS: Indicator in group members list that this user is a group administrator.
-#: actions/groupmembers.php:190
+#: actions/groupmembers.php:190 lib/action.php:581
 msgid "Admin"
 msgstr "ადმინი"
 
@@ -3111,8 +3161,10 @@ msgid "Group search"
 msgstr "ჯგუფის ძიება"
 
 #. TRANS: Text on page where groups can be searched if no results were found for a query.
-#: actions/groupsearch.php:82 actions/noticesearch.php:117
-#: actions/peoplesearch.php:83
+#. TRANS: Text for notice search results is the query had no results.
+#. TRANS: Message on the "People search" page where a query has no results.
+#: actions/groupsearch.php:82 actions/noticesearch.php:122
+#: actions/peoplesearch.php:87
 msgid "No results."
 msgstr "უშედეგოდ."
 
@@ -3149,166 +3201,169 @@ msgid "User is not blocked from group."
 msgstr "მომხმარებელი არ არის დაბლოკილი ჯგუფიდან."
 
 #. TRANS: Server error displayed when unblocking a user from a group fails because of an unknown error.
+#. TRANS: Server error displayed when removing a user block.
 #: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "შეცდომა ბლოკის მოხსნისას."
 
 #. TRANS: Title for Instant Messaging settings.
-#: actions/imsettings.php:58
+#: actions/imsettings.php:56
 msgid "IM settings"
 msgstr "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.
-#: actions/imsettings.php:71
+#: actions/imsettings.php:69
 #, fuzzy, php-format
 msgid ""
-"You can send and receive notices through Jabber/Google Talk [instant "
-"messages](%%doc.im%%). Configure your address and settings below."
+"You can send and receive notices through instant messaging [instant messages]"
+"(%%doc.im%%). Configure your addresses and settings below."
 msgstr ""
 "თქვენ შეგიძლიათ მიიღოთ და გააგზავნოთ შეტყობინებები Jabber/GTalk [ჩეთით](%%"
 "doc.im%%). მომართეთ თქვენი მისამართი და პარამეტრები ქვევით."
 
-#. TRANS: Message given in the Instant Messaging settings if XMPP is not enabled on the site.
+#. TRANS: Message given in the IM settings if IM is not enabled on the site.
 #: actions/imsettings.php:90
 msgid "IM is not available."
 msgstr "IM არ არის ხელმისაწვდომი."
 
-#. TRANS: Form legend for Instant Messaging settings form.
-#. TRANS: Field label for Instant Messaging address input in Instant Messaging settings form.
-#: actions/imsettings.php:102 actions/imsettings.php:132
-msgid "IM address"
-msgstr "IM მისამართი"
+#: actions/imsettings.php:116
+#, fuzzy, php-format
+msgid "Current confirmed %s address."
+msgstr "მიმდინარე დადასტურებული ელ. ფოსტის მისამართი."
 
-#: actions/imsettings.php:109
-#, fuzzy
-msgid "Current confirmed Jabber/Google Talk address."
-msgstr "მიმდინარე დადასტურებული Jabber/GTalk მისამართი."
-
-#. TRANS: Form note in Instant Messaging settings form.
-#. TRANS: %s is the Instant Messaging address set for the site.
-#: actions/imsettings.php:120
+#. TRANS: Form note in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:128
 #, fuzzy, php-format
 msgid ""
-"Awaiting confirmation on this address. Check your Jabber/Google Talk account "
-"for a message with further instructions. (Did you add %s to your buddy list?)"
+"Awaiting confirmation on this address. Check your %s account for a message "
+"with further instructions. (Did you add %s to your buddy list?)"
 msgstr ""
 "ამ მისამართის დადასტურება მოლოდინშია. შეამოწმეთ თქვენი Jabber/GTalk ანგარიში "
 "შეტყობინებისათვის შემდგომი ინსტრუქციებით. (დაიმატეთ %s მეგობრების სიაში?)"
 
-#. TRANS: IM address input field instructions in Instant Messaging settings form.
-#. TRANS: %s is the Instant Messaging address set for the site.
-#. TRANS: Do not translate "example.org". It is one of the domain names reserved for use in examples by
-#. TRANS: http://www.rfc-editor.org/rfc/rfc2606.txt. Any other domain may be owned by a legitimate
-#. TRANS: person or organization.
-#: actions/imsettings.php:139
-#, fuzzy, php-format
-msgid ""
-"Jabber or Google Talk address, like \"UserName@example.org\". First, make "
-"sure to add %s to your buddy list in your IM client or on Google Talk."
-msgstr ""
-"Jabber ან GTalk მისამართი, როგორც \"UserName@example.org\". პირველ რიგში "
-"დარწმუნდით, რომ დაიმატეთ %s მეგობრების სიაში თქვენს IM კლიენტში ან GTalk-ში."
+#: actions/imsettings.php:140
+msgid "IM address"
+msgstr "IM მისამართი"
 
-#. TRANS: Form legend for Instant Messaging preferences form.
-#: actions/imsettings.php:154
-msgid "IM preferences"
+#: actions/imsettings.php:142
+#, php-format
+msgid "%s screenname."
+msgstr ""
+
+#. TRANS: Header for IM preferences form.
+#: actions/imsettings.php:163
+#, fuzzy
+msgid "IM Preferences"
 msgstr "IM პარამეტრები"
 
-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:159
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:174
 #, fuzzy
-msgid "Send me notices through Jabber/Google Talk."
-msgstr "გამომიგზავნე შეტყობინებები  Jabber/GTalk-ის მეშვეობით."
+msgid "Send me notices"
+msgstr "შეტყობინების გაგზავნა"
 
-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:165
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:176
 #, fuzzy
-msgid "Post a notice when my Jabber/Google Talk status changes."
+msgid "Post a notice when my status changes."
 msgstr "დაპოსტე შეტყობინება, როდესაც ჩემი Jabber/GTalk სტატუსი შეიცვლება."
 
-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:171
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:178
 #, fuzzy
-msgid ""
-"Send me replies through Jabber/Google Talk from people I'm not subscribed to."
+msgid "Send me replies from people I'm not subscribed to."
 msgstr ""
 "გამომიგზავნე პასუხები Jabber/GTalk-ით ხალხისგან, რომლთა მიმდევარი არ ვარ."
 
-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:178
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:181
 #, fuzzy
-msgid "Publish a MicroID for my Jabber/Google Talk address."
-msgstr "გამოაქვეყნე  MicroID ჩემი Jabber/GTalk მისამართისთვის."
+msgid "Publish a MicroID"
+msgstr "გამოაქვეყნე MicroID ჩემი ელ. ფოსტის მისამართისთვის."
 
-#. TRANS: Confirmation message for successful Instant Messaging preferences save.
-#: actions/imsettings.php:283 actions/othersettings.php:192
+#. TRANS: Server error thrown on database error updating IM preferences.
+#: actions/imsettings.php:291
+#, fuzzy
+msgid "Couldn't update IM preferences."
+msgstr "მომხმარებლის განახლება ვერ მოხერხდა."
+
+#. TRANS: Confirmation message for successful IM preferences save.
+#. TRANS: Confirmation message after saving preferences.
+#: actions/imsettings.php:298 actions/urlsettings.php:244
 msgid "Preferences saved."
 msgstr "პარამეტრები შენახულია."
 
-#. TRANS: Message given saving Instant Messaging address without having provided one.
-#: actions/imsettings.php:304
-msgid "No Jabber ID."
-msgstr "Jabber ID უცნობია."
-
-#. TRANS: Message given saving Instant Messaging address that cannot be normalised.
-#: actions/imsettings.php:312
+#. TRANS: Message given saving IM address without having provided one.
+#: actions/imsettings.php:320
 #, fuzzy
-msgid "Cannot normalize that Jabber ID."
+msgid "No screenname."
+msgstr "მეტსახელი უცნობია."
+
+#: actions/imsettings.php:325
+#, fuzzy
+msgid "No transport."
+msgstr "შეტყობინება არ არის."
+
+#. TRANS: Message given saving IM address that cannot be normalised.
+#: actions/imsettings.php:333
+#, fuzzy
+msgid "Cannot normalize that screenname"
 msgstr "Jabber ID-ს ნორმალიზაცია ვერ ხერხდება"
 
-#. TRANS: Message given saving Instant Messaging address that not valid.
-#: actions/imsettings.php:317
+#. TRANS: Message given saving IM address that not valid.
+#: actions/imsettings.php:340
 #, fuzzy
-msgid "Not a valid Jabber ID."
-msgstr "არასწორი Jabber ID"
+msgid "Not a valid screenname"
+msgstr "მეტსახელი არასწორია."
 
-#. TRANS: Message given saving Instant Messaging address that is already set.
-#: actions/imsettings.php:321
-msgid "That is already your Jabber ID."
-msgstr "ეს უკვე არის თქვენი Jabber ID."
-
-#. TRANS: Message given saving Instant Messaging address that is already set for another user.
-#: actions/imsettings.php:325
-msgid "Jabber ID already belongs to another user."
+#. TRANS: Message given saving IM address that is already set for another user.
+#: actions/imsettings.php:344
+#, fuzzy
+msgid "Screenname already belongs to another user."
 msgstr "Jabber ID უკვე ეკუთვნის სხვა მომხმარებელს."
 
-#. TRANS: Message given saving valid Instant Messaging address that is to be confirmed.
-#. TRANS: %s is the Instant Messaging address set for the site.
-#: actions/imsettings.php:353
-#, php-format
-msgid ""
-"A confirmation code was sent to the IM address you added. You must approve %"
-"s for sending messages to you."
+#. TRANS: Message given saving valid IM address that is to be confirmed.
+#: actions/imsettings.php:369
+#, fuzzy
+msgid "A confirmation code was sent to the IM address you added."
 msgstr ""
 "დასტურის კოდი გამოგზავნილია თქვენს IM მისამართზე. თქვენ უნდა მისცეთ უფლება %"
 "s-ს გამოგიგზავნოთ შეტყობინებები."
 
-#. TRANS: Message given canceling Instant Messaging address confirmation for the wrong IM address.
-#: actions/imsettings.php:382
+#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#: actions/imsettings.php:396
 msgid "That is the wrong IM address."
 msgstr "ეს არასწორი IM მისამართია."
 
-#. TRANS: Server error thrown on database error canceling Instant Messaging address confirmation.
-#: actions/imsettings.php:391
+#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#: actions/imsettings.php:405
 #, fuzzy
-msgid "Could not delete IM confirmation."
+msgid "Couldn't delete confirmation."
 msgstr "IM დასტურის წაშლა ვერ მოხერხდა."
 
-#. TRANS: Message given after successfully canceling Instant Messaging address confirmation.
-#: actions/imsettings.php:396
+#. TRANS: Message given after successfully canceling IM address confirmation.
+#: actions/imsettings.php:410
 msgid "IM confirmation cancelled."
 msgstr "IM დასტური გაუქმდა."
 
-#. TRANS: Message given trying to remove an Instant Messaging address that is not
+#. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.
-#: actions/imsettings.php:417
-msgid "That is not your Jabber ID."
-msgstr "ეს არ არის თქვენი Jabber ID"
+#: actions/imsettings.php:434
+#, fuzzy
+msgid "That is not your screenname."
+msgstr "ეს არ არის თქვენი ნომერი."
+
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#: actions/imsettings.php:443
+#, fuzzy
+msgid "Couldn't update user im prefs."
+msgstr "მომხმარებლის ჩანაწერის განახლება ვერ მოხერხდა."
 
 #. TRANS: Message given after successfully removing a registered Instant Messaging address.
-#: actions/imsettings.php:440
+#: actions/imsettings.php:451
 msgid "The IM address was removed."
 msgstr "IM მისამართი მოშორებულია."
 
@@ -3523,7 +3578,7 @@ msgid "You must be logged in to join a group."
 msgstr "გჯუფში გაწევრიანებისათვის საჭიროა ავტორიზაცია."
 
 #. TRANS: Title for join group page after joining.
-#: actions/joingroup.php:147
+#: actions/joingroup.php:148
 #, fuzzy, php-format
 msgctxt "TITLE"
 msgid "%1$s joined group %2$s"
@@ -3651,7 +3706,7 @@ msgstr ""
 #. TRANS: Submit button title.
 #: actions/licenseadminpanel.php:311 actions/sessionsadminpanel.php:199
 #: actions/siteadminpanel.php:292 actions/snapshotadminpanel.php:245
-#: actions/tagother.php:154 lib/applicationeditform.php:357
+#: actions/tagother.php:133 lib/applicationeditform.php:357
 msgid "Save"
 msgstr "შენახვა"
 
@@ -3659,39 +3714,41 @@ msgstr "შენახვა"
 msgid "Save license settings"
 msgstr ""
 
-#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
+#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
+#: actions/login.php:97 actions/otp.php:62 actions/register.php:130
 msgid "Already logged in."
 msgstr "უკვე ავტორიზირებული ხართ."
 
-#: actions/login.php:148
+#: actions/login.php:125
 msgid "Incorrect username or password."
 msgstr "არასწორი მომხმარებლის სახელი ან პაროლი."
 
-#: actions/login.php:154 actions/otp.php:120
+#. TRANS: Server error displayed when a user object could not be created trying to login using "one time password login".
+#: actions/login.php:131 actions/otp.php:127
 msgid "Error setting user. You are probably not authorized."
 msgstr ""
 
-#: actions/login.php:210 actions/login.php:263
+#: actions/login.php:185 actions/login.php:236 lib/action.php:598
 msgid "Login"
 msgstr "შესვლა"
 
-#: actions/login.php:249
+#: actions/login.php:222
 msgid "Login to site"
 msgstr "საიტზე შესვლა"
 
-#: actions/login.php:258 actions/register.php:490
+#: actions/login.php:231 actions/register.php:469
 msgid "Remember me"
 msgstr "დამიმახსოვრე"
 
-#: actions/login.php:259 actions/register.php:492
+#: actions/login.php:232 actions/register.php:471
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "მომავალში ავტომატურად შემიყვანე; არა საზიარო კომპიუტერებისათვის!"
 
-#: actions/login.php:269
+#: actions/login.php:241
 msgid "Lost or forgotten password?"
 msgstr "დაკარგეთ ან დაგავიწყდათ პაროლი?"
 
-#: actions/login.php:288
+#: actions/login.php:259
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -3699,11 +3756,11 @@ msgstr ""
 "უსაფრთხოების მიზნებისათვის, გთხოვთ შეიყვანოთ თქვენი მომხ. სახელი და პაროლი "
 "პარამეტრების შეცვლამდე."
 
-#: actions/login.php:292
+#: actions/login.php:263
 msgid "Login with your username and password."
 msgstr "შედი საკუთარი მომხ. სახელით და პაროლით."
 
-#: actions/login.php:295
+#: actions/login.php:266
 #, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -3830,7 +3887,9 @@ msgstr "ახალი შეტყობინება"
 msgid "Notice posted"
 msgstr "შეტყობინება დაიპოსტა"
 
-#: actions/noticesearch.php:68
+#. TRANS: Instructions for Notice search page.
+#. TRANS: %%site.name%% is the name of the StatusNet site.
+#: actions/noticesearch.php:69
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -3839,16 +3898,21 @@ msgstr ""
 "მოძებნეთ შეტყობინებები %%site.name%%-ზე მათი შიგთავსის მიხედვით. გამოყავით "
 "ფრაზები სივრცით; საძიებო ფრაზა 3 სიმბოლოზე მეტი უნდა იყოს."
 
-#: actions/noticesearch.php:78
+#. TRANS: Title of the page where users can search for notices.
+#: actions/noticesearch.php:80
 msgid "Text search"
 msgstr "ტექსტური ძიება"
 
-#: actions/noticesearch.php:91
+#. TRANS: Test in RSS notice search.
+#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
+#: actions/noticesearch.php:95
 #, php-format
 msgid "Search results for \"%1$s\" on %2$s"
 msgstr "\"%1$s\"–ს ძიების შედეგები %2$s–ზე"
 
-#: actions/noticesearch.php:121
+#. TRANS: Text for logged in users making a query for notices without results.
+#. TRANS: This message contains a Markdown link.
+#: actions/noticesearch.php:128
 #, php-format
 msgid ""
 "Be the first to [post on this topic](%%%%action.newnotice%%%%?"
@@ -3856,7 +3920,9 @@ msgid ""
 msgstr ""
 "პირველმა [დაპოსტე ამ თემაზე](%%%%action.newnotice%%%%?status_textarea=%s)!"
 
-#: actions/noticesearch.php:124
+#. TRANS: Text for not logged in users making a query for notices without results.
+#. TRANS: This message contains Markdown links.
+#: actions/noticesearch.php:133
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and be the first to "
@@ -3865,14 +3931,17 @@ msgstr ""
 "[დარეგისტრირდი](%%%%action.register%%%%) და იყავი პირველი ვინც ამ თემაზე "
 "[დაპოსტავს](%%%%action.newnotice%%%%?status_textarea=%s)!"
 
-#: actions/noticesearchrss.php:96
+#. TRANS: RSS notice search feed title. %s is the query.
+#: actions/noticesearchrss.php:95
 #, php-format
 msgid "Updates with \"%s\""
 msgstr "განახლებები \"%s\"–თ"
 
-#: actions/noticesearchrss.php:98
+#. TRANS: RSS notice search feed description.
+#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
+#: actions/noticesearchrss.php:99
 #, fuzzy, php-format
-msgid "Updates matching search term \"%1$s\" on %2$s!"
+msgid "Updates matching search term \"%1$s\" on %2$s."
 msgstr "განახლებები, რომლებიც შეიცავენ საძიებო სიტყვას \"%1$s\" %2$s–ზე!"
 
 #: actions/nudge.php:85
@@ -3890,51 +3959,51 @@ msgid "Nudge sent!"
 msgstr ""
 
 #. TRANS: Message displayed to an anonymous user trying to view OAuth application list.
-#: actions/oauthappssettings.php:60
+#: actions/oauthappssettings.php:57
 msgid "You must be logged in to list your applications."
 msgstr "თქვენი აპლიკაციების სიის სანახავად საჭიროა ავროტიზაცია."
 
 #. TRANS: Page title for OAuth applications
-#: actions/oauthappssettings.php:76
+#: actions/oauthappssettings.php:73
 msgid "OAuth applications"
 msgstr "OAuth აპლიკაციები"
 
 #. TRANS: Page instructions for OAuth applications
-#: actions/oauthappssettings.php:88
+#: actions/oauthappssettings.php:85
 msgid "Applications you have registered"
 msgstr "თქვენს მიერ დარეგისტრირებული აპლიკაციები"
 
 #. TRANS: Empty list message on page with OAuth applications.
-#: actions/oauthappssettings.php:141
+#: actions/oauthappssettings.php:138
 #, php-format
 msgid "You have not registered any applications yet."
 msgstr "თქვენ ჯერჯერობით არცერთი აპლიკაცია არ დაგირეგისტრირებიათ."
 
 #. TRANS: Title for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:71
+#: actions/oauthconnectionssettings.php:69
 msgid "Connected applications"
 msgstr "მიერთებული აპლიკაციები"
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:83
+#: actions/oauthconnectionssettings.php:80
 msgid "The following connections exist for your account."
 msgstr ""
 
 #. TRANS: Client error when trying to revoke access for an application while not being a user of it.
-#: actions/oauthconnectionssettings.php:168
+#: actions/oauthconnectionssettings.php:165
 msgid "You are not a user of that application."
 msgstr "თქვენ არ ხართ ამ აპლიკაციის მომხმარებელი."
 
 #. TRANS: Client error when revoking access has failed for some reason.
 #. TRANS: %s is the application ID revoking access failed for.
-#: actions/oauthconnectionssettings.php:183
+#: actions/oauthconnectionssettings.php:180
 #, fuzzy, php-format
 msgid "Unable to revoke access for application: %s."
 msgstr "%s აპლიკაციის მიერ ზვდომის გაუქმება ვერ ხერხდება."
 
 #. TRANS: Success message after revoking access for an application.
 #. TRANS: %1$s is the application name, %2$s is the first part of the user token.
-#: actions/oauthconnectionssettings.php:202
+#: actions/oauthconnectionssettings.php:199
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -3942,7 +4011,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:213
+#: actions/oauthconnectionssettings.php:210
 msgid "You have not authorized any applications to use your account."
 msgstr ""
 "თქვენ არცერთი აპლიკაციისთვის არ მიგიციათ თქვენი ანგარიშის გამოყენების უფლება."
@@ -3950,13 +4019,23 @@ msgstr ""
 #. TRANS: Note for developers in the OAuth connection settings form.
 #. TRANS: This message contains a Markdown link. Do not separate "](".
 #. TRANS: %s is the URL to the OAuth settings.
-#: actions/oauthconnectionssettings.php:233
+#: actions/oauthconnectionssettings.php:230
 #, php-format
 msgid ""
 "Are you a developer? [Register an OAuth client application](%s) to use with "
 "this instance of StatusNet."
 msgstr ""
 
+#: actions/oembed.php:64
+#, fuzzy, php-format
+msgid "\"%s\" not found."
+msgstr "API მეთოდი ვერ მოიძებნა."
+
+#: actions/oembed.php:76
+#, fuzzy, php-format
+msgid "Notice %s not found."
+msgstr "API მეთოდი ვერ მოიძებნა."
+
 #: actions/oembed.php:80 actions/shownotice.php:100
 msgid "Notice has no profile."
 msgstr "შეტყობინებას პრფილი არ გააჩნია."
@@ -3966,6 +4045,16 @@ msgstr "შეტყობინებას პრფილი არ გაა
 msgid "%1$s's status on %2$s"
 msgstr "%1$s–ის სტატუსი %2$s–ზე"
 
+#: actions/oembed.php:95
+#, fuzzy, php-format
+msgid "Attachment %s not found."
+msgstr "მიმღები მომხმარებელი ვერ მოიძებნა."
+
+#: actions/oembed.php:136
+#, php-format
+msgid "\"%s\" not supported for oembed requests."
+msgstr ""
+
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
 #: actions/oembed.php:168
 #, php-format
@@ -3979,94 +4068,60 @@ msgid "Only %s URLs over plain HTTP please."
 msgstr "გთხოვთ გამოიყენოთ მხოლოდ %s URL–ები წმინდა HTTP მეთოდით."
 
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1205
-#: lib/apiaction.php:1232 lib/apiaction.php:1367
+#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1207
+#: lib/apiaction.php:1234 lib/apiaction.php:1369
 msgid "Not a supported data format."
 msgstr "მონაცემთა ფორმატი მხარდაჭერილი არ არის."
 
+#. TRANS: ShortName in the OpenSearch interface when trying to find users.
 #: actions/opensearch.php:64
 msgid "People Search"
 msgstr "პიროვნებების ძიება"
 
-#: actions/opensearch.php:67
+#: actions/opensearch.php:68
 msgid "Notice Search"
 msgstr "შეტყობინებების ძიება"
 
-#: actions/othersettings.php:59
-msgid "Other settings"
-msgstr "სხვა პარამეტრები"
-
-#. TRANS: Instructions for tab "Other" in user profile settings.
-#: actions/othersettings.php:71
-msgid "Manage various other options."
-msgstr "სხა მრავალნაირი პარამეტრების მართვა."
-
-#. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
-#. TRANS: user's profile settings. Use of "free" is as in "open", indicating that the
-#. TRANS: information on the shortener site is freely distributable.
-#. TRANS: This message has one space at the beginning. Use your language's word separator
-#. TRANS: here if it has one (most likely a single space).
-#: actions/othersettings.php:113
-msgid " (free service)"
-msgstr " (უფასო სერვისი)"
-
-#. TRANS: Label for dropdown with URL shortener services.
-#: actions/othersettings.php:122
-msgid "Shorten URLs with"
-msgstr "შეამოკლე URL–ები შემდეგით"
-
-#. TRANS: Tooltip for for dropdown with URL shortener services.
-#: actions/othersettings.php:124
-msgid "Automatic shortening service to use."
-msgstr "გამოსაყენებელი შემოკლების ავტომატური სერვისი."
-
-#. TRANS: Label for checkbox.
-#: actions/othersettings.php:130
-msgid "View profile designs"
-msgstr "პროფილის დიზაინების ნახვა"
-
-#. TRANS: Tooltip for checkbox.
-#: actions/othersettings.php:132
-msgid "Show or hide profile designs."
-msgstr "აჩვენე ან დამალე პროფილის დიზაინები."
-
-#. TRANS: Form validation error for form "Other settings" in user profile.
-#: actions/othersettings.php:164
-#, fuzzy
-msgid "URL shortening service is too long (maximum 50 characters)."
-msgstr "URL–ს შემოკლების სერვისი ძალიან გრძელია (მაქს. 50 სიმბოლო)."
-
-#: actions/otp.php:69
+#. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
+#: actions/otp.php:70
 msgid "No user ID specified."
 msgstr "მომხმარებლის ID მითითებული არ არის."
 
-#: actions/otp.php:83
+#. TRANS: Client error displayed trying to use "one time password login" without specifying a login token.
+#: actions/otp.php:86
 msgid "No login token specified."
 msgstr ""
 
-#: actions/otp.php:90
+#. TRANS: Client error displayed trying to use "one time password login" without requesting a login token.
+#: actions/otp.php:94
 msgid "No login token requested."
 msgstr ""
 
-#: actions/otp.php:95
+#. TRANS: Client error displayed trying to use "one time password login" while specifying an invalid login token.
+#: actions/otp.php:100
 msgid "Invalid login token specified."
 msgstr ""
 
-#: actions/otp.php:104
+#. TRANS: Client error displayed trying to use "one time password login" while specifying an expired login token.
+#: actions/otp.php:110
 msgid "Login token expired."
 msgstr ""
 
-#: actions/outbox.php:58
+#. TRANS: Title for outbox for any but the fist page.
+#. TRANS: %1$s is the user nickname, %2$d is the page number.
+#: actions/outbox.php:57
 #, php-format
 msgid "Outbox for %1$s - page %2$d"
 msgstr "%1$s-ის გამავალი ფოსტა - გვერდი %2$d"
 
+#. TRANS: Title for first page of outbox.
 #: actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
 msgstr "%s-ის გამავალი ფოსტა"
 
-#: actions/outbox.php:104
+#. TRANS: Instructions for outbox.
+#: actions/outbox.php:103
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr ""
 "ეს არის თქვენი გამავალი ფოსტა, რომელშიც ჩამოთვლილია პირადი შეტყობინებები "
@@ -4094,43 +4149,45 @@ msgstr "ძველი პაროლი"
 msgid "New password"
 msgstr "ახალი პაროლი"
 
-#: actions/passwordsettings.php:109
+#: actions/passwordsettings.php:109 actions/register.php:416
 #, fuzzy
-msgid "6 or more characters"
+msgid "6 or more characters."
 msgstr "6 ან მეტი სიმბოლო"
 
-#: actions/passwordsettings.php:113
+#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#: actions/passwordsettings.php:113 actions/recoverpassword.php:264
+#: actions/register.php:420
 #, fuzzy
-msgid "Same as password above"
+msgid "Same as password above."
 msgstr "იგივე რაც ზედა პაროლი"
 
 #: actions/passwordsettings.php:117
 msgid "Change"
 msgstr "შეცვლა"
 
-#: actions/passwordsettings.php:154 actions/register.php:238
+#: actions/passwordsettings.php:153 actions/register.php:223
 msgid "Password must be 6 or more characters."
 msgstr "პაროლი უნდა შედგებოდეს 6 ან მეტი სიმბოლოსგან."
 
-#: actions/passwordsettings.php:157 actions/register.php:241
+#: actions/passwordsettings.php:156 actions/register.php:226
 msgid "Passwords don't match."
 msgstr "პაროლები არ ემთხვევა."
 
-#: actions/passwordsettings.php:165
+#: actions/passwordsettings.php:164
 msgid "Incorrect old password"
 msgstr "არასწორი ძველი პაროლი"
 
-#: actions/passwordsettings.php:181
+#: actions/passwordsettings.php:180
 msgid "Error saving user; invalid."
 msgstr "შეცდომა მომხმარებლის შენახვისას; არასწორი."
 
-#: actions/passwordsettings.php:186
+#. TRANS: Reset password form validation error message.
+#: actions/passwordsettings.php:185 actions/recoverpassword.php:418
 #, fuzzy
-msgid "Can't save new password."
+msgid "Cannot save new password."
 msgstr "ვერ ვინახავ ახალ პაროლს."
 
-#. TRANS: Title for password recovery page in password saved mode.
-#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
+#: actions/passwordsettings.php:191
 msgid "Password saved."
 msgstr "პაროლი შენახულია."
 
@@ -4343,8 +4400,7 @@ msgid "Directory where backgrounds are located."
 msgstr ""
 
 #. TRANS: Fieldset legens in Paths admin panel.
-#. TRANS: DT element label in attachment list.
-#: actions/pathsadminpanel.php:419 lib/attachmentlist.php:98
+#: actions/pathsadminpanel.php:419
 msgid "Attachments"
 msgstr "მიმაგრებები"
 
@@ -4417,7 +4473,9 @@ msgstr "სერვერი რომელზეც მიემართო
 msgid "Save paths"
 msgstr "გზების დამახსოვრება"
 
-#: actions/peoplesearch.php:52
+#. TRANS: Instructions for the "People search" page.
+#. TRANS: %%site.name%% is the name of the StatusNet site.
+#: actions/peoplesearch.php:54
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
@@ -4427,7 +4485,8 @@ msgstr ""
 "მიხედვით. გამოყავით ფრაზები სივრცით; საძიებო ფრაზა 3 სიმბოლოზე მეტი უნდა "
 "იყოს."
 
-#: actions/peoplesearch.php:58
+#. TRANS: Title of a page where users can search for other users.
+#: actions/peoplesearch.php:61
 msgid "People search"
 msgstr "პიროვნებების ძიება"
 
@@ -4442,6 +4501,60 @@ msgid "Users self-tagged with %1$s - page %2$d"
 msgstr ""
 "მომხმარებლები რომლებმაც საკუთარი თავი მონიშნეს როგორც %1$s – გვერდი %2$d"
 
+#. TRANS: Page title for AJAX form return when a disabling a plugin.
+#: actions/plugindisable.php:69
+msgctxt "plugin"
+msgid "Disabled"
+msgstr ""
+
+#. TRANS: Client error displayed trying to perform any request method other than POST.
+#. TRANS: Do not translate POST.
+#: actions/pluginenable.php:78 actions/subscribe.php:77
+msgid "This action only accepts POST requests."
+msgstr "ეს მოქმედება მხოლოდ POST მოთხოვნებს იღებს."
+
+#: actions/pluginenable.php:102
+#, fuzzy
+msgid "You cannot administer plugins."
+msgstr "თქვენ ვერ შეძლებთ მომხმარებლების წაშლას."
+
+#: actions/pluginenable.php:109
+#, fuzzy
+msgid "No such plugin."
+msgstr "ასეთი გვერდი არ არსებობს."
+
+#. TRANS: Page title for AJAX form return when enabling a plugin.
+#: actions/pluginenable.php:159
+msgctxt "plugin"
+msgid "Enabled"
+msgstr ""
+
+#. TRANS: Tab and title for plugins admin panel.
+#. TRANS: Menu item for site administration
+#: actions/pluginsadminpanel.php:56 actions/version.php:191
+#: lib/adminpanelaction.php:411
+msgid "Plugins"
+msgstr "დამატებები"
+
+#. TRANS: Instructions at top of plugin admin page.
+#: actions/pluginsadminpanel.php:68
+msgid ""
+"Additional plugins can be enabled and configured manually. See the <a href="
+"\"http://status.net/wiki/Plugins\">online plugin documentation</a> for more "
+"details."
+msgstr ""
+
+#. TRANS: Admin form section header
+#: actions/pluginsadminpanel.php:84
+#, fuzzy
+msgid "Default plugins"
+msgstr "პირვანდელი ენა"
+
+#: actions/pluginsadminpanel.php:106
+msgid ""
+"All default plugins have been disabled from the site's configuration file."
+msgstr ""
+
 #: actions/postnotice.php:95
 msgid "Invalid notice content."
 msgstr "შეტყობინების არასწორი შიგთავსი."
@@ -4452,12 +4565,12 @@ msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’.
 msgstr "შეტყობინების ლიცენზია ‘%1$s’ შეუთავსებელია საიტის ლიცენზიასთან ‘%2$s’."
 
 #. TRANS: Page title for profile settings.
-#: actions/profilesettings.php:59
+#: actions/profilesettings.php:60
 msgid "Profile settings"
 msgstr "პროფილის პარამეტრები"
 
 #. TRANS: Usage instructions for profile settings.
-#: actions/profilesettings.php:70
+#: actions/profilesettings.php:71
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
@@ -4465,34 +4578,31 @@ msgstr ""
 "თქვენს შესახებ."
 
 #. TRANS: Profile settings form legend.
-#: actions/profilesettings.php:98
+#: actions/profilesettings.php:99
 msgid "Profile information"
 msgstr "ინფორმაცია პროფილზე"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109 actions/register.php:433
+#: actions/profilesettings.php:110 actions/register.php:412
 #, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr "1–64 პატარა ასოები ან ციფრები. პუნქტუაციები ან სივრცეები დაუშვებელია"
 
 #. TRANS: Field label in form for profile settings.
-#. TRANS: Label for full group name (dt). Text hidden by default.
-#. TRANS: DT for full name in a profile.
-#: actions/profilesettings.php:113 actions/register.php:455
-#: actions/showgroup.php:255 actions/tagother.php:104
-#: lib/groupeditform.php:150 lib/userprofile.php:156
+#: actions/profilesettings.php:114 actions/register.php:434
+#: lib/groupeditform.php:150
 msgid "Full name"
 msgstr "სრული სახელი"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:118 actions/register.php:460
+#: actions/profilesettings.php:119 actions/register.php:439
 #: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "ვებ. გვერსი"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:121
+#: actions/profilesettings.php:122 actions/register.php:441
 #, fuzzy
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr "თქვენი ვებ. გვერდის URL, ბლოგი, ან პროფილი სხვა საიტზე"
@@ -4500,143 +4610,139 @@ msgstr "თქვენი ვებ. გვერდის URL, ბლოგი
 #. TRANS: Tooltip for field label in form for profile settings. Plural
 #. TRANS: is decided by the number of characters available for the
 #. TRANS: biography (%d).
-#: actions/profilesettings.php:129 actions/register.php:471
+#: actions/profilesettings.php:130 actions/register.php:450
 #, fuzzy, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
 msgstr[0] "აღწერეთ საკუთარი თავი და თქვენი ინტერესები %d სიმბოლოთი"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:135 actions/register.php:476
+#: actions/profilesettings.php:136 actions/register.php:455
 msgid "Describe yourself and your interests"
 msgstr "აღწერეთ საკუთარი თავი და თქვენი ინტერესები"
 
 #. TRANS: Text area label in form for profile settings where users can provide.
 #. TRANS: their biography.
-#: actions/profilesettings.php:139 actions/register.php:478
+#: actions/profilesettings.php:140 actions/register.php:457
 msgid "Bio"
 msgstr "ბიოგრაფია"
 
 #. TRANS: Field label in form for profile settings.
-#. TRANS: Label for group location (dt). Text hidden by default.
-#. TRANS: DT for location in a profile.
-#: actions/profilesettings.php:145 actions/register.php:483
-#: actions/showgroup.php:265 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:173
-#: lib/userprofile.php:172
+#: actions/profilesettings.php:146 actions/register.php:462
+#: lib/groupeditform.php:173
 msgid "Location"
 msgstr "მდებარეობა"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148 actions/register.php:485
+#: actions/profilesettings.php:149
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "რომელ ქალაქში, რეგიონში, ქვეყანაში ხართ?"
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:153
+#: actions/profilesettings.php:154
 msgid "Share my current location when posting notices"
 msgstr "გააზიარე ჩემი მდებარეობა შეტყობინებების დაპოსტვისას"
 
 #. TRANS: Field label in form for profile settings.
-#. TRANS: DT for tags in a profile.
-#: actions/profilesettings.php:161 actions/tagother.php:149
-#: actions/tagother.php:209 lib/subscriptionlist.php:106
-#: lib/subscriptionlist.php:108 lib/userprofile.php:220
+#: actions/profilesettings.php:162 actions/tagother.php:128
+#: actions/tagother.php:188 lib/subscriptionlist.php:104
+#: lib/subscriptionlist.php:106
 msgid "Tags"
 msgstr "სანიშნეები"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:164
+#: actions/profilesettings.php:165
 #, fuzzy
 msgid ""
-"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- "
+"separated."
 msgstr ""
 "საკუთარი სანიშნეები (ასოები, ციფრები, -, ., და _). გამოყავით მძიმით ან "
 "სივრცით"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:169
+#: actions/profilesettings.php:170
 msgid "Language"
 msgstr "ენა"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:171
+#: actions/profilesettings.php:172
 #, fuzzy
-msgid "Preferred language"
+msgid "Preferred language."
 msgstr "სასურველი ენა"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:181
+#: actions/profilesettings.php:182
 msgid "Timezone"
 msgstr "დროის სარტყელი"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:183
+#: actions/profilesettings.php:184
 msgid "What timezone are you normally in?"
 msgstr "რომელ დროის სარტყელში ხართ ხომლე ჩვეულებრივ?"
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:189
+#: actions/profilesettings.php:190
 #, fuzzy
 msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)"
+"Automatically subscribe to whoever subscribes to me (best for non-humans)."
 msgstr ""
 "ავტომატურად გამოიწერე ის ვინც მე გამომიწერს (საუკეთესოა არა ადამიანებისთვის)"
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Plural form is used based on the maximum number of allowed
 #. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:258 actions/register.php:229
+#: actions/profilesettings.php:259 actions/register.php:214
 #, fuzzy, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
 msgstr[0] "ბიოგრაფია ძალიან გრძელია (არაუმეტეს %d სიმბოლო)."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:269 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:270 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr "დროის სარტყელი არ არის არჩეული."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:277
+#: actions/profilesettings.php:278
 #, fuzzy
 msgid "Language is too long (maximum 50 characters)."
 msgstr "ენა ძალიან გრძელია (არაუმეტეს 50 სიმბოლო)."
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:291 actions/tagother.php:178
-#, php-format
-msgid "Invalid tag: \"%s\""
+#: actions/profilesettings.php:292
+#, fuzzy, php-format
+msgid "Invalid tag: \"%s\"."
 msgstr "არასწორი სანიშნე: \"%s\""
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:347
+#: actions/profilesettings.php:348
 #, fuzzy
 msgid "Could not update user for autosubscribe."
 msgstr "მომხმარებლის განახლება ავტოგამოწერისათვის ვერ მოხერხდა."
 
 #. TRANS: Server error thrown when user profile location preference settings could not be updated.
-#: actions/profilesettings.php:405
+#: actions/profilesettings.php:406
 #, fuzzy
 msgid "Could not save location prefs."
 msgstr "მდებარეობის პარამეტრების შენახვა ვერ მოხერხდა."
 
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:427 actions/tagother.php:200
+#: actions/profilesettings.php:428 actions/tagother.php:179
 msgid "Could not save tags."
 msgstr "სანიშნეების შენახვა ვერ მოხერხდა."
 
 #. TRANS: Confirmation shown when user profile settings are saved.
 #. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:436 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:437 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "პარამეტრები შენახულია."
 
 #. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
 #. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:483 actions/restoreaccount.php:60
+#: actions/profilesettings.php:484 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "გახსენი ანგარიში"
@@ -4712,6 +4818,12 @@ msgstr ""
 "რს არის %%site.name%%, [მიკრო–ბლოგინგის](http://en.wikipedia.org/wiki/Micro-"
 "blogging) სერვისი, დაფუძნებული უფასო [StatusNet](http://status.net/) კოდზე."
 
+#. TRANS: Public RSS feed description. %s is the StatusNet site name.
+#: actions/publicrss.php:106
+#, fuzzy, php-format
+msgid "%s updates from everyone."
+msgstr "%s განახლებები ყველასგან!"
+
 #. TRANS: Title for public tag cloud.
 #: actions/publictagcloud.php:57
 msgid "Public tag cloud"
@@ -4750,10 +4862,6 @@ msgid ""
 "one!"
 msgstr "[დარეგისტრირდი](%%action.register%%) და დაპოსტე პირველმა!"
 
-#: actions/publictagcloud.php:146
-msgid "Tag cloud"
-msgstr "სანიშნეების ღრუბელი"
-
 #. TRANS: Client error displayed trying to recover password while already logged in.
 #: actions/recoverpassword.php:37
 msgid "You are already logged in!"
@@ -4846,6 +4954,12 @@ msgstr "პაროლის აღდგენა"
 msgid "Password recovery requested"
 msgstr "პაროლის აღდგენა მოთხოვნილია"
 
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/recoverpassword.php:229
+#, fuzzy
+msgid "Password saved"
+msgstr "პაროლი შენახულია."
+
 #. TRANS: Title for password recovery page when an unknown action has been specified.
 #: actions/recoverpassword.php:232
 msgid "Unknown action"
@@ -4857,15 +4971,9 @@ msgstr "უცნობი მოქმედება"
 msgid "6 or more characters, and do not forget it!"
 msgstr "6 ან მეტი სიმბოლო, და არ დაგავიწყდეთ!"
 
-#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
-#: actions/recoverpassword.php:264 actions/register.php:441
-#, fuzzy
-msgid "Same as password above."
-msgstr "იგივე რაც ზედა პაროლი"
-
 #. TRANS: Button text for password reset form.
 #. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: actions/recoverpassword.php:268 lib/designsettings.php:264
+#: actions/recoverpassword.php:268 lib/designform.php:145
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Reset"
@@ -4916,14 +5024,8 @@ msgstr "პაროლი უნდა შედგებოდეს 6 ან
 msgid "Password and confirmation do not match."
 msgstr "პაროლი და დასტური არ ემთხვევა."
 
-#. TRANS: Reset password form validation error message.
-#: actions/recoverpassword.php:418
-#, fuzzy
-msgid "Cannot save new password."
-msgstr "ვერ ვინახავ ახალ პაროლს."
-
 #. TRANS: Server error displayed when something does wrong with the user object during password reset.
-#: actions/recoverpassword.php:426 actions/register.php:256
+#: actions/recoverpassword.php:426 actions/register.php:241
 msgid "Error setting user."
 msgstr "მომხმარებელის დაყენებისას მოხდა შეცდომა."
 
@@ -4932,76 +5034,79 @@ msgstr "მომხმარებელის დაყენებისა
 msgid "New password successfully saved. You are now logged in."
 msgstr "ახალი პაროლი წარმატებით იქნა შენახული. თქვენ ახლა ავტორიზირებული ხართ."
 
-#: actions/register.php:92 actions/register.php:196 actions/register.php:413
+#: actions/redirecturl.php:70
+msgid "No id parameter"
+msgstr ""
+
+#: actions/redirecturl.php:76
+#, fuzzy, php-format
+msgid "No such file \"%d\""
+msgstr "ასეთი ფაილი არ არსებობს."
+
+#: actions/register.php:80 actions/register.php:181 actions/register.php:392
 msgid "Sorry, only invited people can register."
 msgstr "ბოდიშს გიხდით, დარეგისტრირება მხოლოდ მოწვევითაა შესაძლებელი."
 
-#: actions/register.php:99
+#: actions/register.php:87
 msgid "Sorry, invalid invitation code."
 msgstr "ბოდიშს გიხდით, მოსაწვევი კოდი არასწორია."
 
-#: actions/register.php:119
+#: actions/register.php:106
 msgid "Registration successful"
 msgstr "რეგისტრაცია წარმატებით დასრულდა"
 
-#: actions/register.php:121 actions/register.php:511
+#: actions/register.php:108 actions/register.php:490
 msgid "Register"
 msgstr "რეგისტრაცია"
 
-#: actions/register.php:142
+#: actions/register.php:128
 msgid "Registration not allowed."
 msgstr "რეგისტრაცია არ არის დაშვებული."
 
-#: actions/register.php:209
+#: actions/register.php:194
 #, fuzzy
-msgid "You can't register if you don't agree to the license."
+msgid "You cannot register if you don't agree to the license."
 msgstr "ვერ დარეგისტრირდებით თუ არ დაეთანხმებით ლიცენზიის პირობებს."
 
-#: actions/register.php:218
+#: actions/register.php:203
 msgid "Email address already exists."
 msgstr "ელ. ფოსტის მისამართი უკვე არსებობს."
 
-#: actions/register.php:251 actions/register.php:273
+#: actions/register.php:236 actions/register.php:258
 msgid "Invalid username or password."
 msgstr "არასწორი მომხმარებლის სახელი ან პაროლი."
 
-#: actions/register.php:351
+#: actions/register.php:333
 #, fuzzy
 msgid ""
 "With this form you can create a new account. You can then post notices and "
-"link up to friends and colleagues. "
+"link up to friends and colleagues."
 msgstr ""
 "ამ ფორმით შეგიძლიათ შექმნათ ახალი ანგარიში. შემდგომ შეძლებთ შეტყობინებების "
 "დაპოსტვას და მეგობრებთან და კოლეგებთან ურთიერთობას. "
 
-#: actions/register.php:437
-#, fuzzy
-msgid "6 or more characters."
-msgstr "6 ან მეტი სიმბოლო"
-
-#. TRANS: Link description in user account settings menu.
-#: actions/register.php:445 actions/register.php:449
-#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
+#: actions/register.php:424 actions/register.php:428
+#: actions/siteadminpanel.php:238 lib/settingsnav.php:92
 msgid "Email"
 msgstr "ელ. ფოსტა"
 
-#: actions/register.php:446 actions/register.php:450
+#: actions/register.php:425 actions/register.php:429
 #, fuzzy
-msgid "Used only for updates, announcements, and password recovery"
+msgid "Used only for updates, announcements, and password recovery."
 msgstr ""
 "გამოიყენება მხოლოდ განახლებებისთვის, განცხადებებისთვის და პაროლის აღსადგენად"
 
-#: actions/register.php:457
+#: actions/register.php:436
 #, fuzzy
-msgid "Longer name, preferably your \"real\" name"
+msgid "Longer name, preferably your \"real\" name."
 msgstr "გრძელი სახელი, სასურველია თქვენი ნამდვილი სახელი"
 
-#: actions/register.php:462
+#: actions/register.php:464
 #, fuzzy
-msgid "URL of your homepage, blog, or profile on another site"
-msgstr "თქვენი ვებ. გვერდის URL, ბლოგი, ან პროფილი სხვა საიტზე"
+msgid "Where you are, like \"City, State (or Region), Country\"."
+msgstr "რომელ ქალაქში, რეგიონში, ქვეყანაში ხართ?"
 
-#: actions/register.php:523
+#: actions/register.php:503
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
@@ -5009,23 +5114,23 @@ msgstr ""
 "მე ვაცნობიერებ, რომ %1$s–ის შიგთავსი და მონაცემები არის პირადული და "
 "კონციდენციალური."
 
-#: actions/register.php:533
+#: actions/register.php:513
 #, php-format
 msgid "My text and files are copyright by %1$s."
 msgstr "ჩემი ტექსტის და ფაილების საავტორო უფლება ეკუტვნის %1$s–ს."
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:537
+#: actions/register.php:517
 msgid "My text and files remain under my own copyright."
 msgstr "ჩემი ტექსტი და ფაილები ჩემივე საკუთრებაა."
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:540
+#: actions/register.php:520
 msgid "All rights reserved."
 msgstr "ყველა უფლება დაცულია."
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:545
+#: actions/register.php:525
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -5034,7 +5139,7 @@ msgstr ""
 "ჩემი ტექსტი და ფაილები ხელმისაწვდომია %s–ით, გარდა ამ პირადი ინფორმაციისა: "
 "პაროლი, ელ. ფოსტის მისამართი, IM მისამართი და ტელეფონის ნომერი."
 
-#: actions/register.php:588
+#: actions/register.php:566
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -5067,7 +5172,7 @@ msgstr ""
 "\n"
 "გმადლობთ რომ დარეგისტრირდით. იმედი გვაქვს ისიამოვნებთ ამ სერვისით."
 
-#: actions/register.php:612
+#: actions/register.php:590
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5101,7 +5206,7 @@ msgstr "მომხმარებლის მეტსახელი"
 
 #: actions/remotesubscribe.php:129
 #, fuzzy
-msgid "Nickname of the user you want to follow"
+msgid "Nickname of the user you want to follow."
 msgstr "მომხმარებლის მეტსახელი რომელსაც გინდათ რომ მიჰყვეთ"
 
 #: actions/remotesubscribe.php:132
@@ -5110,18 +5215,18 @@ msgstr "პროფილის URL"
 
 #: actions/remotesubscribe.php:133
 #, fuzzy
-msgid "URL of your profile on another compatible microblogging service"
+msgid "URL of your profile on another compatible microblogging service."
 msgstr "თქვენი პროფილის URL სხვა თავსებად მიკრობლოგინგის სერვისზე"
 
 #. TRANS: Link text for link that will subscribe to a remote profile.
 #: actions/remotesubscribe.php:136 lib/subscribeform.php:139
-#: lib/userprofile.php:431
+#: lib/userprofile.php:402
 msgid "Subscribe"
 msgstr "გამოწერა"
 
 #: actions/remotesubscribe.php:158
 #, fuzzy
-msgid "Invalid profile URL (bad format)"
+msgid "Invalid profile URL (bad format)."
 msgstr "პროფილის არასწორი URL (ცუდი ფორმატი)"
 
 #: actions/remotesubscribe.php:167
@@ -5157,7 +5262,7 @@ msgstr "საკუთარი შეტყობინების გამ
 msgid "You already repeated that notice."
 msgstr "თქვენ უკვე გაიმეორეთ ეს შეტყობინება."
 
-#: actions/repeat.php:112 lib/noticelist.php:692
+#: actions/repeat.php:112 lib/noticelist.php:697
 msgid "Repeated"
 msgstr "გამეორებული"
 
@@ -5165,9 +5270,9 @@ msgstr "გამეორებული"
 msgid "Repeated!"
 msgstr "გამეორებული!"
 
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing @-replies.
+#. TRANS: RSS reply feed title. %s is a user nickname.
 #: actions/replies.php:126 actions/repliesrss.php:68
-#: lib/personalgroupnav.php:109
+#: lib/personalgroupnav.php:105
 #, php-format
 msgid "Replies to %s"
 msgstr "პასუხები %s–ს"
@@ -5217,9 +5322,11 @@ msgid ""
 "newnotice%%%%?status_textarea=%3$s)."
 msgstr ""
 
-#: actions/repliesrss.php:72
+#. TRANS: RSS reply feed description.
+#. TRANS: %1$s is a user nickname, %2$s is the StatusNet site name.
+#: actions/repliesrss.php:74
 #, fuzzy, php-format
-msgid "Replies to %1$s on %2$s!"
+msgid "Replies to %1$s on %2$s."
 msgstr "პასუხები %1$s–ს %2$s–ზე!"
 
 #. TRANS: Client exception displayed when trying to restore an account while not logged in.
@@ -5322,7 +5429,7 @@ msgstr "თქვენ არ შეგიძლიათ მომხმარ
 msgid "User doesn't have this role."
 msgstr "მომხმარებელს არ გააჩნია ეს როლი."
 
-#: actions/rsd.php:146 actions/version.php:159
+#: actions/rsd.php:142 actions/version.php:159
 msgid "StatusNet"
 msgstr "StatusNet"
 
@@ -5364,87 +5471,38 @@ msgstr ""
 msgid "Save site settings"
 msgstr "საიტის პარამეტრების შენახვა"
 
-#: actions/showapplication.php:82
+#: actions/showapplication.php:78
 msgid "You must be logged in to view an application."
 msgstr "აპლიკაციის სანახავად საჭიროა ავროტიზაცია."
 
-#: actions/showapplication.php:157
+#: actions/showapplication.php:151
 msgid "Application profile"
 msgstr "აპლიკაციის პროფილი"
 
-#. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:159 lib/applicationeditform.php:177
-msgid "Icon"
-msgstr ""
-
-#. TRANS: Form input field label for application name.
-#: actions/showapplication.php:169 actions/version.php:197
-#: lib/applicationeditform.php:190
-msgid "Name"
-msgstr "დასახელება"
-
-#. TRANS: Form input field label.
-#: actions/showapplication.php:178 lib/applicationeditform.php:227
-msgid "Organization"
-msgstr "ორგანიზაცია"
-
-#. TRANS: Form input field label.
-#: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:168
-msgid "Description"
-msgstr "აღწერა"
-
-#. TRANS: Header for group statistics on a group page (h2).
-#. TRANS: H2 text for user statistics.
-#: actions/showapplication.php:192 actions/showgroup.php:460
-#: lib/profileaction.php:205
-msgid "Statistics"
-msgstr "სტატისტიკა"
-
-#: actions/showapplication.php:203
+#: actions/showapplication.php:179
 #, php-format
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr ""
 
-#: actions/showapplication.php:213
+#: actions/showapplication.php:189
 msgid "Application actions"
 msgstr "აპლიკაციის მოქმედებები"
 
-#: actions/showapplication.php:236
+#: actions/showapplication.php:212
 msgid "Reset key & secret"
 msgstr "გასაღების და საიდუმლოს გადაყენება"
 
 #. TRANS: Title of form for deleting a user.
-#: actions/showapplication.php:252 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:64 lib/noticelist.php:673
+#: actions/showapplication.php:228 lib/deletegroupform.php:121
+#: lib/deleteuserform.php:64 lib/noticelist.php:678
 msgid "Delete"
 msgstr "წაშლა"
 
-#: actions/showapplication.php:261
+#: actions/showapplication.php:237
 msgid "Application info"
 msgstr "ინფო აპლიკაციაზე"
 
-#: actions/showapplication.php:263
-msgid "Consumer key"
-msgstr "მომხმარებლის გასაღები"
-
-#: actions/showapplication.php:268
-msgid "Consumer secret"
-msgstr "მომხმარებლის საიდუმლო"
-
-#: actions/showapplication.php:273
-msgid "Request token URL"
-msgstr ""
-
-#: actions/showapplication.php:278
-msgid "Access token URL"
-msgstr ""
-
-#: actions/showapplication.php:283
-msgid "Authorize URL"
-msgstr "URL-ის ავტორიზაცია"
-
-#: actions/showapplication.php:288
+#: actions/showapplication.php:255
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
@@ -5452,7 +5510,7 @@ msgstr ""
 "შენიშვნა: ჩვენ მხარს ვუჭერთ HMAC-SHA1 ხელმოწერებს. ჩვენ არ ვუჭერთ მხარს "
 "მხოლოდ ტექსტური ხელმოწერის მეთოდს."
 
-#: actions/showapplication.php:309
+#: actions/showapplication.php:275
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr ""
 "დარწმუნებული ხართ რომ გნებავთ თქვენი მომხმარებლის გასაღების და საიდუმლოს "
@@ -5535,61 +5593,47 @@ msgstr ""
 msgid "%1$s group, page %2$d"
 msgstr ""
 
-#. TRANS: Group profile header (h2). Text hidden by default.
-#: actions/showgroup.php:223
-msgid "Group profile"
-msgstr ""
-
-#. TRANS: Label for group URL (dt). Text hidden by default.
-#. TRANS: DT for URL in a profile.
-#: actions/showgroup.php:273 actions/tagother.php:118
-#: actions/userauthorization.php:175 lib/userprofile.php:186
-msgid "URL"
-msgstr ""
-
 #. TRANS: Label for group description or group note (dt). Text hidden by default.
-#. TRANS: DT for note in a profile.
-#: actions/showgroup.php:285 actions/tagother.php:128
-#: actions/userauthorization.php:187 lib/userprofile.php:204
+#: actions/showgroup.php:266
 msgid "Note"
 msgstr "შენიშვნა"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:296 lib/groupeditform.php:180
+#: actions/showgroup.php:277 lib/groupeditform.php:180
 msgid "Aliases"
 msgstr ""
 
 #. TRANS: Group actions header (h2). Text hidden by default.
-#: actions/showgroup.php:313
+#: actions/showgroup.php:294
 msgid "Group actions"
 msgstr ""
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:357
+#: actions/showgroup.php:338
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
 msgstr ""
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:364
+#: actions/showgroup.php:345
 #, php-format
 msgid "Notice feed for %s group (RSS 2.0)"
 msgstr ""
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:371
+#: actions/showgroup.php:352
 #, php-format
 msgid "Notice feed for %s group (Atom)"
 msgstr ""
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:377
+#: actions/showgroup.php:358
 #, php-format
 msgid "FOAF for %s group"
 msgstr ""
 
 #. TRANS: Header for mini list of group members on a group page (h2).
-#: actions/showgroup.php:414
+#: actions/showgroup.php:395
 msgid "Members"
 msgstr "წევრები"
 
@@ -5597,26 +5641,31 @@ msgstr "წევრები"
 #. TRANS: Text for user subscription statistics if the user has no subscriptions.
 #. TRANS: Text for user subscriber statistics if user has no subscribers.
 #. TRANS: Text for user user group membership statistics if user is not a member of any group.
-#: actions/showgroup.php:420 lib/profileaction.php:137
+#: actions/showgroup.php:401 lib/profileaction.php:137
 #: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
-#: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
+#: lib/subscriptionlist.php:123 lib/tagcloudsection.php:71
 msgid "(None)"
 msgstr "(არცერთი)"
 
 #. TRANS: Link to all group members from mini list of group members if group has more than n members.
-#: actions/showgroup.php:429
+#: actions/showgroup.php:410
 msgid "All members"
 msgstr ""
 
-#. TRANS: Label for creation date in statistics on group page.
-#: actions/showgroup.php:465
+#. TRANS: Header for group statistics on a group page (h2).
+#. TRANS: H2 text for user statistics.
+#: actions/showgroup.php:441 lib/profileaction.php:205
+msgid "Statistics"
+msgstr "სტატისტიკა"
+
+#: actions/showgroup.php:444
 #, fuzzy
 msgctxt "LABEL"
 msgid "Created"
 msgstr "შექმნილია"
 
 #. TRANS: Label for member count in statistics on group page.
-#: actions/showgroup.php:473
+#: actions/showgroup.php:449
 #, fuzzy
 msgctxt "LABEL"
 msgid "Members"
@@ -5626,7 +5675,7 @@ msgstr "წევრები"
 #. TRANS: **%s** is the group alias, %%%%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).
-#: actions/showgroup.php:488
+#: actions/showgroup.php:464
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5639,7 +5688,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: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
-#: actions/showgroup.php:498
+#: actions/showgroup.php:474
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5649,7 +5698,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: Header for list of group administrators on a group page (h2).
-#: actions/showgroup.php:527
+#: actions/showgroup.php:503
 msgid "Admins"
 msgstr ""
 
@@ -5688,7 +5737,7 @@ msgid "%1$s tagged %2$s"
 msgstr "%1$s - %2$s"
 
 #. TRANS: Page title showing tagged notices in one user's stream.
-#. TRANS: %1$s is the username, %2$s is the hash tag, %1$d is the page number.
+#. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
 #: actions/showstream.php:74
 #, fuzzy, php-format
 msgid "%1$s tagged %2$s, page %3$d"
@@ -5735,7 +5784,7 @@ msgid "FOAF for %s"
 msgstr ""
 
 #. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
-#: actions/showstream.php:211
+#: actions/showstream.php:205
 #, fuzzy, php-format
 msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr ""
@@ -5743,7 +5792,7 @@ msgstr ""
 "დაუპოსტავს."
 
 #. TRANS: Second sentence of empty list message for a stream for the user themselves.
-#: actions/showstream.php:217
+#: actions/showstream.php:211
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
@@ -5751,7 +5800,7 @@ msgstr ""
 
 #. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:221
+#: actions/showstream.php:215
 #, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
@@ -5760,7 +5809,7 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:264
+#: actions/showstream.php:258
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5771,7 +5820,7 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:271
+#: actions/showstream.php:265
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5780,7 +5829,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
-#: actions/showstream.php:328
+#: actions/showstream.php:322
 #, php-format
 msgid "Repeat of %s"
 msgstr ""
@@ -5926,17 +5975,17 @@ msgstr "საერთო სასაიტო შეტყობინებ
 #. TRANS: Title for button to save site notice in admin panel.
 #: actions/sitenoticeadminpanel.php:201
 #, fuzzy
-msgid "Save site notice"
+msgid "Save site notice."
 msgstr "შეინახე საერთოსასაიტო შეტყობინება"
 
 #. TRANS: Title for SMS settings.
-#: actions/smssettings.php:57
+#: actions/smssettings.php:56
 msgid "SMS settings"
 msgstr "SMS პარამეტრები"
 
 #. TRANS: SMS settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/smssettings.php:71
+#: actions/smssettings.php:70
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr ""
@@ -5944,59 +5993,59 @@ msgstr ""
 "საშუალებით."
 
 #. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
-#: actions/smssettings.php:93
+#: actions/smssettings.php:92
 msgid "SMS is not available."
 msgstr "SMS არ არის ხელმისაწვდომი."
 
 #. TRANS: Form legend for SMS settings form.
-#: actions/smssettings.php:107
+#: actions/smssettings.php:106
 msgid "SMS address"
 msgstr "SMS მისამართი"
 
 #. TRANS: Form guide in SMS settings form.
-#: actions/smssettings.php:116
+#: actions/smssettings.php:115
 msgid "Current confirmed SMS-enabled phone number."
 msgstr "მიმდინარე დადასტურებული SMS გააქტიურებული ტელ. ნომერი."
 
 #. TRANS: Form guide in IM settings form.
-#: actions/smssettings.php:129
+#: actions/smssettings.php:128
 msgid "Awaiting confirmation on this phone number."
 msgstr "ამ ტელ. ნომრის დასტური მოლოდინშია."
 
 #. TRANS: Field label for SMS address input in SMS settings form.
-#: actions/smssettings.php:138
+#: actions/smssettings.php:137
 msgid "Confirmation code"
 msgstr "დასტურის კოდი"
 
 #. TRANS: Form field instructions in SMS settings form.
-#: actions/smssettings.php:140
+#: actions/smssettings.php:139
 msgid "Enter the code you received on your phone."
 msgstr "შეიყვანეთ კოდი, რომელიც მიიღეთ თქვენს ტელეფონზე."
 
 #. TRANS: Button label to confirm SMS confirmation code in SMS settings.
-#: actions/smssettings.php:144
+#: actions/smssettings.php:143
 msgctxt "BUTTON"
 msgid "Confirm"
 msgstr "დასტური"
 
 #. TRANS: Field label for SMS phone number input in SMS settings form.
-#: actions/smssettings.php:149
+#: actions/smssettings.php:148
 msgid "SMS phone number"
 msgstr "SMS ტელეფონის ნომერი"
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
-#: actions/smssettings.php:152
+#: actions/smssettings.php:151
 #, fuzzy
-msgid "Phone number, no punctuation or spaces, with area code"
+msgid "Phone number, no punctuation or spaces, with area code."
 msgstr "ტელ. ნომერი, პუნქტუაციის ან სივრცეების გარეშე, ქვეყნის კოდით."
 
 #. TRANS: Form legend for SMS preferences form.
-#: actions/smssettings.php:191
+#: actions/smssettings.php:190
 msgid "SMS preferences"
 msgstr "SMS კონფიგურაცია"
 
 #. TRANS: Checkbox label in SMS preferences form.
-#: actions/smssettings.php:197
+#: actions/smssettings.php:196
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
@@ -6005,32 +6054,32 @@ msgstr ""
 "საგრძნობი გადასახადები დამაკისროს."
 
 #. TRANS: Confirmation message for successful SMS preferences save.
-#: actions/smssettings.php:308
+#: actions/smssettings.php:307
 msgid "SMS preferences saved."
 msgstr "SMS კონფიგურაცია შენახულია."
 
 #. TRANS: Message given saving SMS phone number without having provided one.
-#: actions/smssettings.php:330
+#: actions/smssettings.php:329
 msgid "No phone number."
 msgstr "ტელეფონის ნომერი არ არის."
 
 #. TRANS: Message given saving SMS phone number without having selected a carrier.
-#: actions/smssettings.php:336
+#: actions/smssettings.php:335
 msgid "No carrier selected."
 msgstr "ოპერატორი შერჩეული არ არის."
 
 #. TRANS: Message given saving SMS phone number that is already set.
-#: actions/smssettings.php:344
+#: actions/smssettings.php:343
 msgid "That is already your phone number."
 msgstr "ეს უკვე არის ტქვენი ტელეფონის მისამართი."
 
 #. TRANS: Message given saving SMS phone number that is already set for another user.
-#: actions/smssettings.php:348
+#: actions/smssettings.php:347
 msgid "That phone number already belongs to another user."
 msgstr "ეს ტელეფონის ნომერი სხვას ეკუთვნის."
 
 #. TRANS: Message given saving valid SMS phone number that is to be confirmed.
-#: actions/smssettings.php:376
+#: actions/smssettings.php:375
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
 "for the code and instructions on how to use it."
@@ -6040,39 +6089,39 @@ msgstr ""
 "ინსტრუქცია გამოყენებისთვის."
 
 #. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
-#: actions/smssettings.php:404
+#: actions/smssettings.php:403
 msgid "That is the wrong confirmation number."
 msgstr "ეს დასტურის კოდი არასწორია."
 
 #. TRANS: Message given after successfully canceling SMS phone number confirmation.
-#: actions/smssettings.php:418
+#: actions/smssettings.php:417
 msgid "SMS confirmation cancelled."
 msgstr "SMS დადასტურება გაუქმებულია."
 
 #. TRANS: Message given trying to remove an SMS phone number that is not
 #. TRANS: registered for the active user.
-#: actions/smssettings.php:438
+#: actions/smssettings.php:437
 msgid "That is not your phone number."
 msgstr "ეს არ არის თქვენი ნომერი."
 
 #. TRANS: Message given after successfully removing a registered SMS phone number.
-#: actions/smssettings.php:460
+#: actions/smssettings.php:459
 msgid "The SMS phone number was removed."
 msgstr "SMS ტელეფონის ნომერი წაშლილია."
 
 #. TRANS: Label for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:499
+#: actions/smssettings.php:498
 msgid "Mobile carrier"
 msgstr "მობილური ოპერატორი"
 
 #. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:504
+#: actions/smssettings.php:503
 msgid "Select a carrier"
 msgstr "აირჩიეთ ოპერატორი"
 
 #. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
 #. TRANS: %s is an administrative contact's e-mail address.
-#: actions/smssettings.php:513
+#: actions/smssettings.php:512
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -6083,7 +6132,7 @@ msgstr ""
 "გაგვაგებინეთ ამის შესახებ, მოგვწერეთ მისამართზე - %s."
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
-#: actions/smssettings.php:535
+#: actions/smssettings.php:534
 #, fuzzy
 msgid "No code entered."
 msgstr "კოდი არ არის შეყვანილი"
@@ -6157,16 +6206,14 @@ msgstr "თქვენ არ გაქვთ გამოწერილი 
 msgid "Could not save subscription."
 msgstr "გამოწერის დამახსოვრება ვერ მოხერხდა."
 
-#: actions/subscribe.php:77
-msgid "This action only accepts POST requests."
-msgstr "ეს მოქმედება მხოლოდ POST მოთხოვნებს იღებს."
-
-#: actions/subscribe.php:117
+#. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
+#: actions/subscribe.php:121
 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
 msgstr ""
 "თქვენ არ შეგიძლიათ გამოიწეროთ 0მბ-იანი 0.1 დაშორებული პროფილი ამ მოქმედებით."
 
-#: actions/subscribe.php:145
+#. TRANS: Page title when subscription succeeded.
+#: actions/subscribe.php:149
 msgid "Subscribed"
 msgstr "გამოწერილია"
 
@@ -6284,31 +6331,34 @@ msgid "Subscription feed for %s (Atom)"
 msgstr "შეტყობინებების RSS მონიშნული %s-თ (Atom)"
 
 #. TRANS: Checkbox label for enabling Jabber messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:239
-msgid "Jabber"
-msgstr "Jabber"
+#: actions/subscriptions.php:241 lib/settingsnav.php:110
+#, fuzzy
+msgid "IM"
+msgstr "IM"
 
 #. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:254
+#: actions/subscriptions.php:256 lib/settingsnav.php:117
 msgid "SMS"
 msgstr "SMS"
 
-#: actions/tag.php:69
+#. TRANS: Title for all but the first page of notices with tags.
+#. TRANS: %1$s is the tag, %2$d is the page number.
+#: actions/tag.php:73
 #, php-format
 msgid "Notices tagged with %1$s, page %2$d"
 msgstr "შეტყობინებები მონიშნული %1$s-ით, გვერდი %2$d"
 
-#: actions/tag.php:87
+#: actions/tag.php:91
 #, php-format
 msgid "Notice feed for tag %s (RSS 1.0)"
 msgstr "შეტყობინებების RSS მონიშნული %s-თ (RSS 1.0)"
 
-#: actions/tag.php:93
+#: actions/tag.php:97
 #, php-format
 msgid "Notice feed for tag %s (RSS 2.0)"
 msgstr "შეტყობინებების RSS მონიშნული %s-თ (RSS 2.0)"
 
-#: actions/tag.php:99
+#: actions/tag.php:103
 #, php-format
 msgid "Notice feed for tag %s (Atom)"
 msgstr "შეტყობინებების RSS მონიშნული %s-თ (Atom)"
@@ -6327,17 +6377,11 @@ msgstr "სანიშნე %s"
 msgid "User profile"
 msgstr "მომხმარებლის პროფილი"
 
-#. TRANS: DT element in area for user avatar.
-#: actions/tagother.php:81 actions/userauthorization.php:132
-#: lib/userprofile.php:108
-msgid "Photo"
-msgstr "ფოტო"
-
-#: actions/tagother.php:141
+#: actions/tagother.php:120
 msgid "Tag user"
 msgstr "მონიშნე მომხმარებელი"
 
-#: actions/tagother.php:151
+#: actions/tagother.php:130
 msgid ""
 "Tags for this user (letters, numbers, -, ., and _), comma- or space- "
 "separated"
@@ -6345,14 +6389,19 @@ msgstr ""
 "სანიშნეები ამ მომხმარებლისთვის (ასოები, ციფრები, -, ., და _). გამოყავით "
 "მძიმით ან სივრცით"
 
-#: actions/tagother.php:193
+#: actions/tagother.php:157
+#, php-format
+msgid "Invalid tag: \"%s\""
+msgstr "არასწორი სანიშნე: \"%s\""
+
+#: actions/tagother.php:172
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 "ადამიანების მონიშვნა შესაძლებელია მხოლოდ მაშინ, როდესაც ან თქვენ გაქვთ "
 "გამოწერილი მისი განახლებები, ან იმას."
 
-#: actions/tagother.php:236
+#: actions/tagother.php:215
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
 "გამოიყენეთ ეს ფორმა, რომ მიანიჭოთ სანიშნეები თქვენს გამოწერებს ან "
@@ -6362,6 +6411,7 @@ msgstr ""
 msgid "No such tag."
 msgstr "ასეთი სანიშნე არ არსებობს."
 
+#. TRANS: Client error displayed when trying to unblock a non-blocked user.
 #: actions/unblock.php:59
 msgid "You haven't blocked that user."
 msgstr "თქვენ არ დაგიბლოკავთ ეს მომხმარებელი."
@@ -6382,7 +6432,7 @@ msgstr "არცერთი პროფილის ID არ არის 
 msgid "Unsubscribed"
 msgstr "გამოწერა გაუქმებულია"
 
-#: actions/updateprofile.php:64 actions/userauthorization.php:337
+#: actions/updateprofile.php:64
 #, php-format
 msgid ""
 "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
@@ -6390,6 +6440,78 @@ msgstr ""
 "გამოსაწერი მომხმარებლის ნაკადის ლიცენზია ‘%1$s’ შეუთავსებელია საიტის "
 "ლიცენზიასთან ‘%2$s’."
 
+#: actions/urlsettings.php:60
+#, fuzzy
+msgid "URL settings"
+msgstr "IM პარამეტრები"
+
+#. TRANS: Instructions for tab "Other" in user profile settings.
+#: actions/urlsettings.php:72
+msgid "Manage various other options."
+msgstr "სხა მრავალნაირი პარამეტრების მართვა."
+
+#. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
+#. TRANS: user's profile settings. This message has one space at the beginning. Use your
+#. TRANS: language's word separator here if it has one (most likely a single space).
+#: actions/urlsettings.php:115
+msgid " (free service)"
+msgstr " (უფასო სერვისი)"
+
+#: actions/urlsettings.php:121
+#, fuzzy
+msgid "[none]"
+msgstr "არაფერი"
+
+#: actions/urlsettings.php:122
+msgid "[internal]"
+msgstr ""
+
+#. TRANS: Label for dropdown with URL shortener services.
+#: actions/urlsettings.php:130
+msgid "Shorten URLs with"
+msgstr "შეამოკლე URL–ები შემდეგით"
+
+#. TRANS: Tooltip for for dropdown with URL shortener services.
+#: actions/urlsettings.php:132
+msgid "Automatic shortening service to use."
+msgstr "გამოსაყენებელი შემოკლების ავტომატური სერვისი."
+
+#: actions/urlsettings.php:138
+msgid "URL longer than"
+msgstr ""
+
+#: actions/urlsettings.php:141
+msgid "URLs longer than this will be shortened, 0 means always shorten."
+msgstr ""
+
+#: actions/urlsettings.php:145
+msgid "Text longer than"
+msgstr ""
+
+#: actions/urlsettings.php:148
+msgid ""
+"URLs in notices longer than this will be shortened, 0 means always shorten."
+msgstr ""
+
+#. TRANS: Form validation error for form "Other settings" in user profile.
+#: actions/urlsettings.php:180
+#, fuzzy
+msgid "URL shortening service is too long (maximum 50 characters)."
+msgstr "URL–ს შემოკლების სერვისი ძალიან გრძელია (მაქს. 50 სიმბოლო)."
+
+#: actions/urlsettings.php:187
+msgid "Invalid number for max url length."
+msgstr ""
+
+#: actions/urlsettings.php:193
+#, fuzzy
+msgid "Invalid number for max notice length."
+msgstr "შეტყობინების არასწორი შიგთავსი."
+
+#: actions/urlsettings.php:238
+msgid "Error saving user URL shortening preferences."
+msgstr ""
+
 #. TRANS: User admin panel title
 #: actions/useradminpanel.php:58
 msgctxt "TITLE"
@@ -6416,11 +6538,11 @@ msgstr "არასწორი მისასალმებელი ტე
 #. TRANS: users in user admin panel. %1$s is the invalid nickname.
 #: actions/useradminpanel.php:166
 #, php-format
-msgid "Invalid default subscripton: '%1$s' is not a user."
+msgid "Invalid default subscripton: \"%1$s\" is not a user."
 msgstr ""
 
-#. TRANS: Link description in user account settings menu.
-#: actions/useradminpanel.php:215 lib/accountsettingsaction.php:106
+#: actions/useradminpanel.php:215 lib/action.php:565 lib/settingsnav.php:77
+#: lib/subgroupnav.php:81
 msgid "Profile"
 msgstr "პროფილი"
 
@@ -6478,59 +6600,63 @@ msgstr "მიეცეთ თუ არა მომხმარებლებ
 #. TRANS: Title for button to save user settings in user admin panel.
 #: actions/useradminpanel.php:302
 #, fuzzy
-msgid "Save user settings"
+msgid "Save user settings."
 msgstr "საიტის პარამეტრების შენახვა"
 
-#: actions/userauthorization.php:105
+#. TRANS: Page title.
+#: actions/userauthorization.php:109
 msgid "Authorize subscription"
 msgstr "გამოწერის ავტორიზაცია"
 
-#: actions/userauthorization.php:110
+#. TRANS: Page notice on "Auhtorize subscription" page.
+#: actions/userauthorization.php:115
 #, fuzzy
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
 "user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
-"click “Reject”."
+"click \"Reject\"."
 msgstr ""
 "გთხოვთ გადახედოთ ამ დეტალებს, რომ დარწმუნდეთ რომ გინდათ ამ მომხმარებლის "
 "განახლებების გამოწერა. თუ თქვენ არ გინდოდათ გამოწერა, მაშინ გააჭირეთ ღილაკს "
 "\"უარყოფა\"."
 
-#. TRANS: Menu item for site administration
-#: actions/userauthorization.php:196 actions/version.php:167
-#: lib/adminpanelaction.php:403
-msgid "License"
-msgstr "ლიცენზია"
-
-#: actions/userauthorization.php:217
+#. TRANS: Button text on Authorise Subscription page.
+#: actions/userauthorization.php:200
 #, fuzzy
+msgctxt "BUTTON"
 msgid "Accept"
 msgstr "მიღება"
 
-#: actions/userauthorization.php:218 lib/subscribeform.php:115
-#: lib/subscribeform.php:139
-msgid "Subscribe to this user"
+#. TRANS: Title for button on Authorise Subscription page.
+#: actions/userauthorization.php:202
+#, fuzzy
+msgid "Subscribe to this user."
 msgstr "გამოიწერე ეს მომხმარებელი"
 
-#: actions/userauthorization.php:219
+#. TRANS: Button text on Authorise Subscription page.
+#: actions/userauthorization.php:204
 #, fuzzy
+msgctxt "BUTTON"
 msgid "Reject"
 msgstr "უარყოფა"
 
-#: actions/userauthorization.php:220
+#. TRANS: Title for button on Authorise Subscription page.
+#: actions/userauthorization.php:206
 #, fuzzy
-msgid "Reject this subscription"
+msgid "Reject this subscription."
 msgstr "ამ გამოწერის უარყოფა"
 
-#: actions/userauthorization.php:232
+#. TRANS: Client error displayed for an empty authorisation request.
+#: actions/userauthorization.php:219
 msgid "No authorization request!"
 msgstr "ავტორიზაციის მოთხოვნა არ არის!"
 
-#: actions/userauthorization.php:254
+#. TRANS: Accept message header from Authorise subscription page.
+#: actions/userauthorization.php:242
 msgid "Subscription authorized"
 msgstr "გამოწერა ავტორიზირებულია"
 
-#: actions/userauthorization.php:256
+#: actions/userauthorization.php:245
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to authorize the "
@@ -6540,11 +6666,12 @@ msgstr ""
 "გადაამოწმეთ საიტის ინსტრუქციებში გამოწერის ავტორიზირების დეტალები. თქვენი "
 "გამოწერის ტოკენია:"
 
-#: actions/userauthorization.php:266
+#. TRANS: Reject message header from Authorise subscription page.
+#: actions/userauthorization.php:256
 msgid "Subscription rejected"
 msgstr "გამოწერა უარყოფილია"
 
-#: actions/userauthorization.php:268
+#: actions/userauthorization.php:259
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to fully reject the "
@@ -6554,48 +6681,73 @@ msgstr ""
 "გადაამოწმეთ საიტის ინსტრუქციებში გამოწერის მთლიანად უარყოფის შესახებ "
 "დეტალები."
 
-#: actions/userauthorization.php:303
+#. TRANS: Exception thrown when no valid user is found for an authorisation request.
+#. TRANS: %s is a listener URI.
+#: actions/userauthorization.php:296
 #, fuzzy, php-format
-msgid "Listener URI ‘%s’ not found here."
+msgid "Listener URI \"%s\" not found here."
 msgstr "მსმენელის  URI ‘%s’ აქ ვერ მოიძებნა."
 
-#: actions/userauthorization.php:308
+#. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
+#. TRANS: %s is a listenee URI.
+#: actions/userauthorization.php:303
 #, fuzzy, php-format
-msgid "Listenee URI ‘%s’ is too long."
+msgid "Listenee URI \"%s\" is too long."
 msgstr "წყაროს URL ძალიან გრძელია."
 
-#: actions/userauthorization.php:314
+#. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
+#. TRANS: %s is a listenee URI.
+#: actions/userauthorization.php:311
 #, fuzzy, php-format
-msgid "Listenee URI ‘%s’ is a local user."
+msgid "Listenee URI \"%s\" is a local user."
 msgstr "პროფილის URL ‘%s’ ლოკალური მომხმარებლისთვისაა განკუთვნილი."
 
+#. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
+#. TRANS: %s is a profile URL.
 #: actions/userauthorization.php:329
 #, fuzzy, php-format
-msgid "Profile URL ‘%s’ is for a local user."
+msgid "Profile URL \"%s\" is for a local user."
 msgstr "პროფილის URL ‘%s’ ლოკალური მომხმარებლისთვისაა განკუთვნილი."
 
-#: actions/userauthorization.php:345
+#. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
+#. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
+#: actions/userauthorization.php:339
 #, fuzzy, php-format
-msgid "Avatar URL ‘%s’ is not valid."
+msgid ""
+"Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
+"\"."
+msgstr ""
+"გამოსაწერი მომხმარებლის ნაკადის ლიცენზია ‘%1$s’ შეუთავსებელია საიტის "
+"ლიცენზიასთან ‘%2$s’."
+
+#. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
+#. TRANS: %s is an avatar URL.
+#: actions/userauthorization.php:349
+#, fuzzy, php-format
+msgid "Avatar URL \"%s\" is not valid."
 msgstr "ავატარის URL ‘%s’ არ არის სწორი."
 
-#: actions/userauthorization.php:350
+#. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
+#. TRANS: %s is an avatar URL.
+#: actions/userauthorization.php:356
 #, fuzzy, php-format
-msgid "Can’t read avatar URL ‘%s’."
+msgid "Cannot read avatar URL \"%s\"."
 msgstr "ვერ ვკითხულობ ავატარის URL ‘%s’."
 
-#: actions/userauthorization.php:355
+#. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
+#. TRANS: %s is an avatar URL.
+#: actions/userauthorization.php:363
 #, fuzzy, php-format
-msgid "Wrong image type for avatar URL ‘%s’."
+msgid "Wrong image type for avatar URL \"%s\"."
 msgstr "ავატარის სურათის ფორმატი არასწორია URL ‘%s’."
 
 #. TRANS: Page title for profile design page.
-#: actions/userdesignsettings.php:74 lib/designsettings.php:63
+#: actions/userdesignsettings.php:74 lib/designsettings.php:61
 msgid "Profile design"
 msgstr "პროფილის დიზაინი"
 
 #. TRANS: Instructions for profile design page.
-#: actions/userdesignsettings.php:84 lib/designsettings.php:74
+#: actions/userdesignsettings.php:84 lib/designsettings.php:72
 msgid ""
 "Customize the way your profile looks with a background image and a colour "
 "palette of your choice."
@@ -6603,10 +6755,28 @@ msgstr ""
 "აირჩიეთ, როგორ გნებავთ გამოიყურებოდეს თქვენი პროფილი ფონური სურათისა და "
 "ფერთა პალიტრის შეცვლით."
 
-#: actions/userdesignsettings.php:272
+#: actions/userdesignsettings.php:289
 msgid "Enjoy your hotdog!"
 msgstr "ისიამოვნეთ ჰოთ დოგით!"
 
+#: actions/userdesignsettings.php:325
+#, fuzzy
+msgid "Design settings"
+msgstr "საიტის პარამეტრების შენახვა"
+
+#: actions/userdesignsettings.php:340
+msgid "View profile designs"
+msgstr "პროფილის დიზაინების ნახვა"
+
+#: actions/userdesignsettings.php:341
+msgid "Show or hide profile designs."
+msgstr "აჩვენე ან დამალე პროფილის დიზაინები."
+
+#: actions/userdesignsettings.php:348
+#, fuzzy
+msgid "Background file"
+msgstr "ფონი"
+
 #. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number.
 #: actions/usergroups.php:66
 #, php-format
@@ -6656,6 +6826,11 @@ msgstr ""
 msgid "Contributors"
 msgstr "წვლილის შემომტანები"
 
+#. TRANS: Menu item for site administration
+#: actions/version.php:167 lib/adminpanelaction.php:403
+msgid "License"
+msgstr "ლიცენზია"
+
 #: actions/version.php:170
 msgid ""
 "StatusNet is free software: you can redistribute it and/or modify it under "
@@ -6689,12 +6864,13 @@ msgstr ""
 "თქვენ უნდა მიგეღოთ GNU Affero ძირითადი საჯარო ლიცენზიის ასლი ამ პროგრამასთან "
 "ერთად. თუ არა, იხილეთ %s."
 
-#: actions/version.php:191
-msgid "Plugins"
-msgstr "დამატებები"
+#. TRANS: Form input field label for application name.
+#: actions/version.php:197 lib/applicationeditform.php:190
+msgid "Name"
+msgstr "დასახელება"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:901
+#: actions/version.php:198 lib/action.php:885
 msgid "Version"
 msgstr "ვერსია"
 
@@ -6702,6 +6878,12 @@ msgstr "ვერსია"
 msgid "Author(s)"
 msgstr "ავტორი(ები)"
 
+#. TRANS: Form input field label.
+#: actions/version.php:200 lib/applicationeditform.php:208
+#: lib/groupeditform.php:168
+msgid "Description"
+msgstr "აღწერა"
+
 #. TRANS: Activity title when marking a notice as favorite.
 #: classes/Fave.php:164
 msgid "Favor"
@@ -6818,7 +7000,7 @@ msgid "Could not create login token for %s"
 msgstr "შესასვლელი ტოკენის შექმნა %s-სთვის ვერ მოხერხდა."
 
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
-#: classes/Memcached_DataObject.php:542
+#: classes/Memcached_DataObject.php:556
 msgid "No database name or DSN found anywhere."
 msgstr "ბაზის სახელი ან DSN ვერსად ვერ მოიძებნა."
 
@@ -6996,18 +7178,18 @@ msgstr "%1$s ამიერიდან ყურს უგდებს თქ
 
 #. TRANS: Notice given on user registration.
 #. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:395
+#: classes/User.php:390
 #, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr "გამარჯობა @%2$s, კეთილი იყოს თქვენი მობრძანება %1$s-ზე!"
 
 #. TRANS: Server exception.
-#: classes/User.php:918
+#: classes/User.php:923
 msgid "No single user defined for single-user mode."
 msgstr "ერთი მომხმარებელი არ განსაზღვრულა ერთარედთი-მომხმარებლის რეჟიმისთვის."
 
 #. TRANS: Server exception.
-#: classes/User.php:922
+#: classes/User.php:927
 msgid "Single-user mode code called when not enabled."
 msgstr ""
 
@@ -7052,41 +7234,6 @@ msgstr ""
 msgid "No AtomPub API service for %s."
 msgstr ""
 
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:104
-msgid "Change your profile settings"
-msgstr "შეცვალე პროფილის პარამეტრები"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:111
-msgid "Upload an avatar"
-msgstr "ატვირთე ავატარი"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:118
-msgid "Change your password"
-msgstr "შეცვალე პაროლი"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:125
-msgid "Change email handling"
-msgstr "ელ. ფოსტის მართვა"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:132
-msgid "Design your profile"
-msgstr "პროფილის პარამეტრები"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:139
-msgid "Other options"
-msgstr "სხვა ოფციები"
-
-#. TRANS: Link description in user account settings menu.
-#: lib/accountsettingsaction.php:141
-msgid "Other"
-msgstr "სხვა"
-
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
 #: lib/action.php:161
 #, php-format
@@ -7104,206 +7251,128 @@ msgctxt "TOOLTIP"
 msgid "Show more"
 msgstr ""
 
-#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:544
-msgid "Primary site navigation"
-msgstr "საიტის ძირითადი ნავიგაცია"
+#. TRANS: Inline reply form submit button: submits a reply comment.
+#: lib/action.php:328
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Comment"
+msgstr "შიგთავსი"
 
-#. TRANS: Tooltip for main menu option "Personal".
-#: lib/action.php:550
-msgctxt "TOOLTIP"
-msgid "Personal profile and friends timeline"
-msgstr "პირადი პროფილი და მეგობრების ნაკადი"
+#. TRANS: Placeholder text for inline reply form. Clicking in this box will turn it into a mini notice form.
+#: lib/action.php:331
+msgid "Add a comment..."
+msgstr ""
 
-#. TRANS: Main menu option when logged in for access to personal profile and friends timeline.
-#. TRANS: Personal group navigation menu option when logged in for viewing timeline of self and friends.
-#: lib/action.php:553 lib/personalgroupnav.php:100
-msgctxt "MENU"
-msgid "Personal"
-msgstr "პირადი"
+#: lib/action.php:559 lib/personalgroupnav.php:99
+#, fuzzy
+msgid "Home"
+msgstr "ვებ. გვერსი"
 
-#. TRANS: Tooltip for main menu option "Account".
-#: lib/action.php:555
-msgctxt "TOOLTIP"
-msgid "Change your email, avatar, password, profile"
-msgstr "შეცვალე ელ. ფოსტა, ავატარი, პაროლი, პროფილი"
-
-#. TRANS: Main menu option when logged in for access to user settings.
-#: lib/action.php:558
-msgid "Account"
-msgstr "ანგარიში"
-
-#. TRANS: Tooltip for main menu option "Services".
 #: lib/action.php:560
-msgctxt "TOOLTIP"
-msgid "Connect to services"
-msgstr "სერვისებთან დაკავშირება"
+#, fuzzy
+msgid "Friends timeline"
+msgstr "%s-ის ნაკადი"
 
-#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services.
-#: lib/action.php:563
-msgid "Connect"
-msgstr "კავშირი"
-
-#. TRANS: Tooltip for menu option "Admin".
 #: lib/action.php:566
-msgctxt "TOOLTIP"
-msgid "Change site configuration"
-msgstr "საიტის კონფიგურაცია"
+#, fuzzy
+msgid "Your profile"
+msgstr "მომხმარებლის პროფილი"
 
-#. TRANS: Main menu option when logged in and site admin for access to site configuration.
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/action.php:569 lib/groupnav.php:117
-msgctxt "MENU"
-msgid "Admin"
-msgstr "ადმინი"
+#: lib/action.php:570 lib/action.php:593 lib/publicgroupnav.php:78
+msgid "Public"
+msgstr "საჯარო"
 
-#. TRANS: Tooltip for main menu option "Invite".
-#: lib/action.php:573
-#, php-format
-msgctxt "TOOLTIP"
-msgid "Invite friends and colleagues to join you on %s"
-msgstr "მოიწვიე მეგობრები და კოლეგები %s-ზე"
+#: lib/action.php:571 lib/action.php:594
+#, fuzzy
+msgid "Everyone on this site"
+msgstr "მოძებნე ადამიანები ამ საიტზე"
+
+#: lib/action.php:575
+#, fuzzy
+msgid "Settings"
+msgstr "SMS პარამეტრები"
 
-#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users.
 #: lib/action.php:576
-msgctxt "MENU"
-msgid "Invite"
-msgstr "მოწვევა"
+#, fuzzy
+msgid "Change your personal settings"
+msgstr "შეცვალე პროფილის პარამეტრები"
 
-#. TRANS: Tooltip for main menu option "Logout"
 #: lib/action.php:582
-msgctxt "TOOLTIP"
-msgid "Logout from the site"
-msgstr "გასვლა საიტიდან"
+#, fuzzy
+msgid "Site configuration"
+msgstr "მომხმარებლის კონფიგურაცია"
 
-#. TRANS: Main menu option when logged in to log out the current user.
-#: lib/action.php:585
-msgctxt "MENU"
+#: lib/action.php:587
+#, fuzzy
 msgid "Logout"
 msgstr "გასვლა"
 
-#. TRANS: Tooltip for main menu option "Register".
-#: lib/action.php:590
-msgctxt "TOOLTIP"
-msgid "Create an account"
-msgstr "გახსენი ანგარიში"
+#: lib/action.php:588
+#, fuzzy
+msgid "Logout from the site"
+msgstr "გასვლა საიტიდან"
 
-#. TRANS: Main menu option when not logged in to register a new account.
-#. TRANS: Menu item for registering with the StatusNet site.
-#: lib/action.php:593 lib/logingroupnav.php:85
-msgctxt "MENU"
-msgid "Register"
-msgstr "რეგისტრაცია"
-
-#. TRANS: Tooltip for main menu option "Login".
-#: lib/action.php:596
-msgctxt "TOOLTIP"
+#: lib/action.php:599
+#, fuzzy
 msgid "Login to the site"
 msgstr "საიტზე შესვლა"
 
-#. TRANS: Main menu option when not logged in to log in.
-#. TRANS: Menu item for logging in to the StatusNet site.
-#: lib/action.php:599 lib/logingroupnav.php:77
-msgctxt "MENU"
-msgid "Login"
-msgstr "შესვლა"
-
-#. TRANS: Tooltip for main menu option "Help".
-#: lib/action.php:602
-msgctxt "TOOLTIP"
-msgid "Help me!"
-msgstr "დამეხმარეთ!"
-
-#. TRANS: Main menu option for help on the StatusNet site.
-#: lib/action.php:605
-msgctxt "MENU"
-msgid "Help"
-msgstr "დახმარება"
-
-#. TRANS: Tooltip for main menu option "Search".
-#: lib/action.php:608
-msgctxt "TOOLTIP"
-msgid "Search for people or text"
-msgstr "მოძებნე ხალხი ან ტექსტი"
-
-#. TRANS: Main menu option when logged in or when the StatusNet instance is not private.
-#: lib/action.php:611
-msgctxt "MENU"
+#: lib/action.php:606
+#, fuzzy
 msgid "Search"
 msgstr "ძიება"
 
-#. TRANS: DT element for site notice. String is hidden in default CSS.
-#. TRANS: Menu item for site administration
-#: lib/action.php:633 lib/adminpanelaction.php:387
-msgid "Site notice"
-msgstr "საიტის შეტყობინება"
-
-#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:700
-msgid "Local views"
-msgstr "ლოკალური ხედები"
-
-#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:770
-msgid "Page notice"
-msgstr "გვერდის შეტყობინება"
-
-#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:874
-msgid "Secondary site navigation"
-msgstr "საიტის მეორადი ნავიგაცია"
+#: lib/action.php:607
+#, fuzzy
+msgid "Search the site"
+msgstr "ძიება საიტზე"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:880
+#: lib/action.php:864
 msgid "Help"
 msgstr "დახმარება"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:883
+#: lib/action.php:867
 msgid "About"
 msgstr "საიტის შესახებ"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:886
+#: lib/action.php:870
 msgid "FAQ"
 msgstr "ხდკ"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:891
+#: lib/action.php:875
 msgid "TOS"
 msgstr "მპ"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:895
+#: lib/action.php:879
 msgid "Privacy"
 msgstr "პირადი"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:898
+#: lib/action.php:882
 msgid "Source"
 msgstr "წყარო"
 
 #. TRANS: Secondary navigation menu option leading to e-mail contact information on the
 #. TRANS: StatusNet site, where to report bugs, ...
-#: lib/action.php:905
+#: lib/action.php:889
 msgid "Contact"
 msgstr "კონტაქტი"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:908
+#: lib/action.php:892
 msgid "Badge"
 msgstr "იარლიყი"
 
-#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:937
-msgid "StatusNet software license"
-msgstr "StatusNet კოდის ლიცენზია"
-
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:944
+#: lib/action.php:921
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7313,7 +7382,7 @@ msgstr ""
 "(%%site.broughtbyurl%%)-ს მიერ."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:947
+#: lib/action.php:924
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** არის მიკრობლოგინგის სერვისი."
@@ -7322,7 +7391,7 @@ msgstr "**%%site.name%%** არის მიკრობლოგინგი
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:954
+#: lib/action.php:931
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7333,52 +7402,42 @@ msgstr ""
 "რომელიც ხელმისაწვდომია [GNU Affero ძირითადი საჯარო ლიცენზიით](http://www.fsf."
 "org/licensing/licenses/agpl-3.0.html)."
 
-#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:970
-msgid "Site content license"
-msgstr "საიტის შიგთავსის ლიცენზია"
-
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:977
+#: lib/action.php:949
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr "%1$s ის შიგთავსი და მონაცემები არის პირადული და კონფიდენციალური."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:984
+#: lib/action.php:956
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr "შიგთავსი და მონაცემები %1$s-ის საკუთრებაა. ყველა უფლება დაცულია."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:988
+#: lib/action.php:960
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 "შიგთავსი და მონაცემები წვლილის შემტანების საკუთრებაა. ყველა უფლება დაცულია."
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:1020
+#: lib/action.php:992
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr "%1$s-ს მთლიანი შიგთავსი და მონაცემები ხელმისაწვდომია %2$s ლიცენზიით."
 
-#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1356
-msgid "Pagination"
-msgstr "გვერდებათ დაყოფა"
-
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1367
+#: lib/action.php:1335
 msgid "After"
 msgstr "შემდეგი"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1377
+#: lib/action.php:1345
 msgid "Before"
 msgstr "წინა"
 
@@ -7532,7 +7591,7 @@ msgid "User configuration"
 msgstr "მომხმარებლის კონფიგურაცია"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:122
+#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:110
 msgid "User"
 msgstr "მომხმარებელი"
 
@@ -7556,6 +7615,11 @@ msgstr "სესიების კონფიგურაცია"
 msgid "Edit site notice"
 msgstr "საიტის შეტყობინების რედაქტირება"
 
+#. TRANS: Menu item for site administration
+#: lib/adminpanelaction.php:387
+msgid "Site notice"
+msgstr "საიტის შეტყობინება"
+
 #. TRANS: Menu item title/tooltip
 #: lib/adminpanelaction.php:393
 msgid "Snapshots configuration"
@@ -7566,6 +7630,12 @@ msgstr "წინა ვერსიების კონფიგურაც
 msgid "Set site license"
 msgstr ""
 
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:409
+#, fuzzy
+msgid "Plugins configuration"
+msgstr "გზების კონფიგურაცია"
+
 #. TRANS: Client error 401.
 #: lib/apiauth.php:111
 msgid "API resource requires read-write access, but you only have read access."
@@ -7578,19 +7648,23 @@ msgstr ""
 msgid "No application for that consumer key."
 msgstr ""
 
+#: lib/apiauth.php:202 lib/apiauth.php:284
+msgid "Not allowed to use API."
+msgstr ""
+
 #. TRANS: OAuth exception given when an incorrect access token was given for a user.
-#: lib/apiauth.php:219
+#: lib/apiauth.php:225
 msgid "Bad access token."
 msgstr ""
 
 #. TRANS: OAuth exception given when no user was found for a given token (no token was found).
-#: lib/apiauth.php:224
+#: lib/apiauth.php:230
 msgid "No user for that token."
 msgstr ""
 
 #. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel".
 #. TRANS: Client error thrown when authentication fails.
-#: lib/apiauth.php:266 lib/apiauth.php:293
+#: lib/apiauth.php:272 lib/apiauth.php:302
 msgid "Could not authenticate you."
 msgstr ""
 
@@ -7637,6 +7711,11 @@ msgstr ""
 msgid "Failed to delete revoked token."
 msgstr ""
 
+#. TRANS: Form input field label for application icon.
+#: lib/applicationeditform.php:177
+msgid "Icon"
+msgstr ""
+
 #. TRANS: Form guide.
 #: lib/applicationeditform.php:182
 msgid "Icon for this application"
@@ -7670,6 +7749,11 @@ msgstr "წყაროს URL"
 msgid "Organization responsible for this application"
 msgstr "ამ აპლიკაციაზე პასუხისმგებელი ორგანიზაცია"
 
+#. TRANS: Form input field label.
+#: lib/applicationeditform.php:227
+msgid "Organization"
+msgstr "ორგანიზაცია"
+
 #. TRANS: Form input field instructions.
 #: lib/applicationeditform.php:234
 msgid "URL for the homepage of the organization"
@@ -7760,16 +7844,6 @@ msgstr ""
 msgid "Do not use this method!"
 msgstr "არ წაშალო ეს შეტყობინება"
 
-#. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:293
-msgid "Author"
-msgstr "ავტორი"
-
-#. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:307
-msgid "Provider"
-msgstr "მომწოდებელი"
-
 #. TRANS: Title.
 #: lib/attachmentnoticesection.php:67
 msgid "Notices where this attachment appears"
@@ -7797,24 +7871,29 @@ msgstr "პაროლის ცვლილება არ არის ნ
 msgid "Block"
 msgstr "ბლოკირება"
 
+#. TRANS: Description of the form to block a user.
+#: lib/blockform.php:79
+msgid "Block this user"
+msgstr "დაბლოკე ეს მომხმარებელი"
+
 #. TRANS: Title for command results.
-#: lib/channel.php:160 lib/channel.php:181
+#: lib/channel.php:104 lib/channel.php:125
 msgid "Command results"
 msgstr "ბრძანების შედეგები"
 
 #. TRANS: Title for command results.
-#: lib/channel.php:194
+#: lib/channel.php:138
 #, fuzzy
 msgid "AJAX error"
 msgstr "Ajax შეცდომა"
 
 #. TRANS: E-mail subject when a command has completed.
-#: lib/channel.php:233 lib/mailhandler.php:143
+#: lib/channel.php:177 lib/mailhandler.php:143
 msgid "Command complete"
 msgstr "ბრძანება დასრულდა"
 
 #. TRANS: E-mail subject when a command has failed.
-#: lib/channel.php:244
+#: lib/channel.php:188
 msgid "Command failed"
 msgstr "ბრძანება ჩაიშალა"
 
@@ -7917,7 +7996,7 @@ msgstr "სრული სახელი: %s"
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a location.
-#: lib/command.php:446 lib/mail.php:270
+#: lib/command.php:446 lib/mail.php:275
 #, php-format
 msgid "Location: %s"
 msgstr "მდებარეობა: %s"
@@ -7925,7 +8004,7 @@ msgstr "მდებარეობა: %s"
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a homepage.
-#: lib/command.php:450 lib/mail.php:274
+#: lib/command.php:450 lib/mail.php:279
 #, php-format
 msgid "Homepage: %s"
 msgstr "გვერდი: %s"
@@ -8156,115 +8235,105 @@ msgid ""
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:162
+#: lib/common.php:36
 #, fuzzy
 msgid "No configuration file found."
 msgstr "კონფიგურაციის ფაილი ვერ მოიძებნა. "
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:165
+#: lib/common.php:39
 #, fuzzy
 msgid "I looked for configuration files in the following places:"
 msgstr "კონფიგურაციის ფაილები შემდეგ ადგილებში ვეძებე: "
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:168
+#: lib/common.php:42
 msgid "You may wish to run the installer to fix this."
 msgstr "თუ გინდათ ინსტალატორი გაუშვით ამის გასასწორებლად."
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:172
+#: lib/common.php:46
 msgid "Go to the installer."
 msgstr "გადადი ამ ინსტალატორზე."
 
-#. TRANS: Menu item for Instant Messaging settings.
-#: lib/connectsettingsaction.php:106
-#, fuzzy
-msgctxt "MENU"
-msgid "IM"
-msgstr "IM"
-
-#. TRANS: Tooltip for Instant Messaging menu item.
-#: lib/connectsettingsaction.php:108
-msgid "Updates by instant messenger (IM)"
-msgstr "განახლებები ჩათ კლიენტისგან (IM)"
-
-#. TRANS: Menu item for Short Message Service settings.
-#: lib/connectsettingsaction.php:113
-#, fuzzy
-msgctxt "MENU"
-msgid "SMS"
-msgstr "SMS"
-
-#. TRANS: Tooltip for Short Message Service menu item.
-#: lib/connectsettingsaction.php:115
-msgid "Updates by SMS"
-msgstr "განახლებები SMS-თ"
-
-#. TRANS: Menu item for OuAth connection settings.
-#: lib/connectsettingsaction.php:120
-#, fuzzy
-msgctxt "MENU"
-msgid "Connections"
-msgstr "შეერთებები"
-
-#. TRANS: Tooltip for connected applications (Connections through OAuth) menu item.
-#: lib/connectsettingsaction.php:122
-msgid "Authorized connected applications"
-msgstr "ავტორიზირებული შეერთებული აპლიკაციები"
-
 #: lib/dberroraction.php:59
 msgid "Database error"
 msgstr "მონაცემთა ბაზის შეცდომა"
 
+#. TRANS: Description of form for deleting a user.
+#: lib/deleteuserform.php:75
+msgid "Delete this user"
+msgstr "ამ მომხმარებლის წაშლა"
+
+#: lib/designform.php:114
+#, fuzzy
+msgid "Change design"
+msgstr "შეინახე დიზაინი"
+
+#. TRANS: Fieldset legend on profile design page to change profile page colours.
+#: lib/designform.php:131
+msgid "Change colours"
+msgstr "შეცვალე ფერები"
+
+#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
+#: lib/designform.php:138
+msgid "Use defaults"
+msgstr "გამოიყენე პირვანდელი მდგომარეობა"
+
+#. TRANS: Title for button on profile design page to reset all colour settings to default.
+#: lib/designform.php:140
+msgid "Restore default designs"
+msgstr "დააბრუნე პირვანდელი დიზაინი"
+
+#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
+#: lib/designform.php:148
+msgid "Reset back to default"
+msgstr "პირვანდელის პარამეტრების დაბრუნება"
+
 #. TRANS: Label in form on profile design page.
 #. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
-#: lib/designsettings.php:108
+#: lib/designform.php:158
 msgid "Upload file"
 msgstr "ფაილის ატვირთვა"
 
 #. TRANS: Instructions for form on profile design page.
-#: lib/designsettings.php:113
+#: lib/designform.php:163
+#, fuzzy
 msgid ""
-"You can upload your personal background image. The maximum file size is 2MB."
+"You can upload your personal background image. The maximum file size is 2Mb."
 msgstr ""
 "თქვენ შეგიძლიათ ატვირთოთ პერსონალური ფონური სურათი. ფაილის დასაშვები ზომაა "
 "2მბ."
 
 #. TRANS: Radio button on profile design page that will enable use of the uploaded profile image.
-#: lib/designsettings.php:139
+#: lib/designform.php:194
 #, fuzzy
 msgctxt "RADIO"
 msgid "On"
 msgstr "ჩართვა"
 
 #. TRANS: Radio button on profile design page that will disable use of the uploaded profile image.
-#: lib/designsettings.php:156
+#: lib/designform.php:211
 #, fuzzy
 msgctxt "RADIO"
 msgid "Off"
 msgstr "გამორთვა"
 
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: lib/designsettings.php:175
-msgid "Change colours"
-msgstr "შეცვალე ფერები"
-
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: lib/designsettings.php:257
-msgid "Use defaults"
-msgstr "გამოიყენე პირვანდელი მდგომარეობა"
+#. TRANS: Title for button on profile design page to save settings.
+#: lib/designform.php:322
+msgid "Save design"
+msgstr "შეინახე დიზაინი"
 
 #. TRANS: Error message displayed if design settings could not be saved.
 #. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
-#: lib/designsettings.php:405 lib/designsettings.php:427
+#: lib/designsettings.php:216 lib/designsettings.php:238
 msgid "Couldn't update your design."
 msgstr "დიზაინის განახლება ვერ მოხერხდა."
 
 #. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
-#: lib/designsettings.php:433
+#: lib/designsettings.php:244
 msgid "Design defaults restored."
 msgstr "დიზაინის პირველადი პარამეტრები დაბრუნებულია."
 
@@ -8333,27 +8402,23 @@ msgstr ""
 msgid "Feeds"
 msgstr ""
 
-#: lib/galleryaction.php:121
-msgid "Filter tags"
-msgstr "სანიშნეების გაფილტვრა"
-
-#: lib/galleryaction.php:131
+#: lib/galleryaction.php:128
 msgid "All"
 msgstr "ყველა"
 
-#: lib/galleryaction.php:139
+#: lib/galleryaction.php:136
 msgid "Select tag to filter"
 msgstr "აირჩიე გასაფილტრი სანიშნე"
 
-#: lib/galleryaction.php:140
+#: lib/galleryaction.php:137
 msgid "Tag"
 msgstr "სანიშნე"
 
-#: lib/galleryaction.php:141
+#: lib/galleryaction.php:138
 msgid "Choose a tag to narrow list"
 msgstr "სიის გასაფილტრად აირჩიე სანიშნე"
 
-#: lib/galleryaction.php:143
+#: lib/galleryaction.php:140
 msgid "Go"
 msgstr "წინ"
 
@@ -8443,6 +8508,12 @@ msgctxt "TOOLTIP"
 msgid "%s blocked users"
 msgstr ""
 
+#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
+#: lib/groupnav.php:117
+msgctxt "MENU"
+msgid "Admin"
+msgstr "ადმინი"
+
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
 #: lib/groupnav.php:120
@@ -8549,39 +8620,63 @@ msgid "%dB"
 msgid_plural "%dB"
 msgstr[0] ""
 
-#: lib/jabber.php:387
+#: lib/implugin.php:262
 #, php-format
-msgid "[%s]"
-msgstr "[%s]"
+msgid ""
+"User \"%s\" on %s has said that your %s screenname belongs to them. If "
+"that's true, you can confirm by clicking on this URL: %s . (If you cannot "
+"click it, copy-and-paste it into the address bar of your browser). If that "
+"user isn't you, or if you didn't request this confirmation, just ignore this "
+"message."
+msgstr ""
 
-#: lib/jabber.php:567
+#: lib/implugin.php:349
 #, php-format
 msgid "Unknown inbox source %d."
 msgstr ""
 
+#: lib/implugin.php:485
+#, fuzzy, php-format
+msgid "Message too long - maximum is %1$d characters, you sent %2$d."
+msgstr ""
+"შეტყობინება ძალიან გრძელია - დასაშვები რაოდენობაა %1$d სიმბოლომდე, თქვენ "
+"გააგზავნეთ %2$d."
+
 #: lib/leaveform.php:114
 msgid "Leave"
 msgstr "დატოვება"
 
+#. TRANS: Menu item for logging in to the StatusNet site.
+#: lib/logingroupnav.php:77
+msgctxt "MENU"
+msgid "Login"
+msgstr "შესვლა"
+
 #. TRANS: Title for menu item for logging in to the StatusNet site.
 #: lib/logingroupnav.php:79
 msgid "Login with a username and password"
 msgstr "შედი მომხ. სახელით და პაროლით."
 
+#. TRANS: Menu item for registering with the StatusNet site.
+#: lib/logingroupnav.php:85
+msgctxt "MENU"
+msgid "Register"
+msgstr "რეგისტრაცია"
+
 #. TRANS: Title for menu item for registering with the StatusNet site.
 #: lib/logingroupnav.php:87
 msgid "Sign up for a new account"
 msgstr "ახალი ანგარიშის გერისტრაცია"
 
 #. TRANS: Subject for address confirmation email.
-#: lib/mail.php:168
+#: lib/mail.php:172
 msgid "Email address confirmation"
 msgstr "ელ. ფოსტის მისამართის დადასტურება"
 
 #. TRANS: Body for address confirmation email.
 #. TRANS: %1$s is the addressed user's nickname, %2$s is the StatusNet sitename,
 #. TRANS: %3$s is the URL to confirm at.
-#: lib/mail.php:173
+#: lib/mail.php:177
 #, fuzzy, php-format
 msgid ""
 "Hey, %1$s.\n"
@@ -8612,14 +8707,14 @@ msgstr ""
 
 #. TRANS: Subject of new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
-#: lib/mail.php:238
+#: lib/mail.php:243
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1$s ამიერიდან ყურს უგდებს თქვენს შეტყობინებებს %2$s-ზე."
 
 #. TRANS: This is a paragraph in a new-subscriber e-mail.
 #. TRANS: %s is a URL where the subscriber can be reported as abusive.
-#: lib/mail.php:245
+#: lib/mail.php:250
 #, php-format
 msgid ""
 "If you believe this account is being used abusively, you can block them from "
@@ -8634,7 +8729,7 @@ msgstr ""
 #. TRANS: %3$s is the subscriber's profile URL, %4$s is the subscriber's location (or empty)
 #. TRANS: %5$s is the subscriber's homepage URL (or empty), %6%s is the subscriber's bio (or empty)
 #. TRANS: %7$s is a link to the addressed user's e-mail settings.
-#: lib/mail.php:255
+#: lib/mail.php:260
 #, fuzzy, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -8661,14 +8756,14 @@ msgstr ""
 
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is biographical information.
-#: lib/mail.php:278
+#: lib/mail.php:283
 #, php-format
 msgid "Bio: %s"
 msgstr "ბიოგრაფია: %s"
 
 #. TRANS: Subject of notification mail for new posting email address.
 #. TRANS: %s is the StatusNet sitename.
-#: lib/mail.php:307
+#: lib/mail.php:312
 #, php-format
 msgid "New email address for posting to %s"
 msgstr "%s-ზე დასაპოსტი ახალი ელ. ფოსტის მისამართი"
@@ -8676,7 +8771,7 @@ msgstr "%s-ზე დასაპოსტი ახალი ელ. ფოს
 #. TRANS: Body of notification mail for new posting email address.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is the e-mail address to send
 #. TRANS: to to post by e-mail, %3$s is a URL to more instructions.
-#: lib/mail.php:313
+#: lib/mail.php:318
 #, fuzzy, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -8699,19 +8794,19 @@ msgstr ""
 
 #. TRANS: Subject line for SMS-by-email notification messages.
 #. TRANS: %s is the posting user's nickname.
-#: lib/mail.php:434
+#: lib/mail.php:439
 #, php-format
 msgid "%s status"
 msgstr "%s სტატუსი"
 
 #. TRANS: Subject line for SMS-by-email address confirmation message.
-#: lib/mail.php:460
+#: lib/mail.php:465
 msgid "SMS confirmation"
 msgstr "SMS დადასტურება"
 
 #. TRANS: Main body heading for SMS-by-email address confirmation message.
 #. TRANS: %s is the addressed user's nickname.
-#: lib/mail.php:464
+#: lib/mail.php:469
 #, php-format
 msgid "%s: confirm you own this phone number with this code:"
 msgstr ""
@@ -8719,7 +8814,7 @@ msgstr ""
 
 #. TRANS: Subject for 'nudge' notification email.
 #. TRANS: %s is the nudging user.
-#: lib/mail.php:485
+#: lib/mail.php:490
 #, fuzzy, php-format
 msgid "You have been nudged by %s"
 msgstr "თქვენ აგეკრძალათ გამოწერა."
@@ -8727,7 +8822,7 @@ msgstr "თქვენ აგეკრძალათ გამოწერა.
 #. TRANS: Body for 'nudge' notification email.
 #. TRANS: %1$s is the nuding user's long name, $2$s is the nudging user's nickname,
 #. TRANS: %3$s is a URL to post notices at, %4$s is the StatusNet sitename.
-#: lib/mail.php:492
+#: lib/mail.php:497
 #, php-format
 msgid ""
 "%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -8756,7 +8851,7 @@ msgstr ""
 
 #. TRANS: Subject for direct-message notification email.
 #. TRANS: %s is the sending user's nickname.
-#: lib/mail.php:539
+#: lib/mail.php:544
 #, php-format
 msgid "New private message from %s"
 msgstr "ახალი პირადი შეტყობინება %s-სგან"
@@ -8765,7 +8860,7 @@ msgstr "ახალი პირადი შეტყობინება %s-
 #. TRANS: %1$s is the sending user's long name, %2$s is the sending user's nickname,
 #. TRANS: %3$s is the message content, %4$s a URL to the message,
 #. TRANS: %5$s is the StatusNet sitename.
-#: lib/mail.php:547
+#: lib/mail.php:552
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -8800,7 +8895,7 @@ msgstr ""
 
 #. TRANS: Subject for favorite notification e-mail.
 #. TRANS: %1$s is the adding user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:599
+#: lib/mail.php:604
 #, fuzzy, php-format
 msgid "%1$s (@%2$s) added your notice as a favorite"
 msgstr "%s-მა (@%s) დაამატა თქვენი შეტყობინება თავის რჩეულებში"
@@ -8810,7 +8905,7 @@ msgstr "%s-მა (@%s) დაამატა თქვენი შეტყო
 #. TRANS: %3$s is a URL to the faved notice, %4$s is the faved notice text,
 #. TRANS: %5$s is a URL to all faves of the adding user, %6$s is the StatusNet sitename,
 #. TRANS: %7$s is the adding user's nickname.
-#: lib/mail.php:606
+#: lib/mail.php:611
 #, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -8849,7 +8944,7 @@ msgstr ""
 "%6$s\n"
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:664
+#: lib/mail.php:669
 #, php-format
 msgid ""
 "The full conversation can be read here:\n"
@@ -8862,7 +8957,7 @@ msgstr ""
 
 #. TRANS: E-mail subject for notice notification.
 #. TRANS: %1$s is the sending user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:672
+#: lib/mail.php:677
 #, fuzzy, php-format
 msgid "%1$s (@%2$s) sent a notice to your attention"
 msgstr "%s-მა (@%s) გამოაგზავნა შეტყობინება თქვენს საყურადღებოდ"
@@ -8873,7 +8968,7 @@ msgstr "%s-მა (@%s) გამოაგზავნა შეტყობი
 #. TRANS: %5$s is a URL to the full conversion if it exists (otherwise empty),
 #. TRANS: %6$s is a URL to reply to the notice, %7$s is a URL to all @-replied for the addressed user,
 #. TRANS: %8$s is a URL to the addressed user's e-mail settings, %9$s is the sender's nickname.
-#: lib/mail.php:680
+#: lib/mail.php:685
 #, php-format
 msgid ""
 "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -8995,11 +9090,7 @@ msgstr "არ გაქვთ გამოწერილი!"
 msgid "To"
 msgstr "ვის"
 
-#: lib/messageform.php:166 lib/noticeform.php:186
-msgid "Available characters"
-msgstr "ხელმისაწვდომი სიმბოლოები"
-
-#: lib/messageform.php:185 lib/noticeform.php:237
+#: lib/messageform.php:184 lib/noticeform.php:236
 msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr "გაგზავნა"
@@ -9009,15 +9100,10 @@ msgstr "გაგზავნა"
 msgid "Messages"
 msgstr "შეტყობინება"
 
-#: lib/messagelistitem.php:123 lib/noticelist.php:522
+#: lib/messagelistitem.php:123 lib/noticelist.php:527
 msgid "from"
 msgstr "ვისგან"
 
-#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:165
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr "მეტსახელში დასაშვებია მხოლოდ პატარა ასოები და ციფრები."
-
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 #: lib/nickname.php:178
 msgid "Nickname cannot be empty."
@@ -9039,23 +9125,23 @@ msgstr "შეტყობინების გაგზავნა"
 msgid "What's up, %s?"
 msgstr "რა არის ახალი %s?"
 
-#: lib/noticeform.php:194
+#: lib/noticeform.php:193
 msgid "Attach"
 msgstr "ფაილის მიმაგრება"
 
-#: lib/noticeform.php:198
+#: lib/noticeform.php:197
 msgid "Attach a file"
 msgstr "მიამაგრე ფაილი"
 
-#: lib/noticeform.php:213
+#: lib/noticeform.php:212
 msgid "Share my location"
 msgstr "გააზიარე ჩემი მდებარეობა"
 
-#: lib/noticeform.php:216
+#: lib/noticeform.php:215
 msgid "Do not share my location"
 msgstr "არ გააზიარო ჩემი მდებარეობა"
 
-#: lib/noticeform.php:217
+#: lib/noticeform.php:216
 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
 "try again later"
@@ -9064,55 +9150,59 @@ msgstr ""
 "სჭირდება, გთხოვთ სცადოთ მოგვიანებით"
 
 #. TRANS: Used in coordinates as abbreviation of north
-#: lib/noticelist.php:452
+#: lib/noticelist.php:457
 msgid "N"
 msgstr "ჩ"
 
 #. TRANS: Used in coordinates as abbreviation of south
-#: lib/noticelist.php:454
+#: lib/noticelist.php:459
 msgid "S"
 msgstr "ს"
 
 #. TRANS: Used in coordinates as abbreviation of east
-#: lib/noticelist.php:456
+#: lib/noticelist.php:461
 msgid "E"
 msgstr "ა"
 
 #. TRANS: Used in coordinates as abbreviation of west
-#: lib/noticelist.php:458
+#: lib/noticelist.php:463
 msgid "W"
 msgstr "დ"
 
-#: lib/noticelist.php:460
+#: lib/noticelist.php:465
 #, php-format
 msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 
-#: lib/noticelist.php:469
+#: lib/noticelist.php:474
 msgid "at"
 msgstr ""
 
-#: lib/noticelist.php:518
+#: lib/noticelist.php:523
 msgid "web"
 msgstr ""
 
-#: lib/noticelist.php:584
+#: lib/noticelist.php:589
 msgid "in context"
 msgstr ""
 
-#: lib/noticelist.php:619
+#: lib/noticelist.php:624
 msgid "Repeated by"
 msgstr ""
 
-#: lib/noticelist.php:646
+#: lib/noticelist.php:651
 msgid "Reply to this notice"
 msgstr "უპასუხე ამ შეტყობინებას"
 
-#: lib/noticelist.php:647
+#: lib/noticelist.php:652
 msgid "Reply"
 msgstr "პასუხი"
 
-#: lib/noticelist.php:691
+#: lib/noticelist.php:678
+msgid "Delete this notice"
+msgstr "შეტყობინების წაშლა"
+
+#: lib/noticelist.php:696
 msgid "Notice repeated"
 msgstr "შეტყობინება გამეორებულია"
 
@@ -9149,48 +9239,31 @@ msgstr ""
 msgid "Couldn't insert new subscription."
 msgstr "ახალი გამოწერის ჩასმა ვერ მოხერხდა."
 
-#. TRANS: Personal group navigation menu option when logged in for viewing @-replies.
-#: lib/personalgroupnav.php:107
+#: lib/personalgroupnav.php:104
 #, fuzzy
-msgctxt "MENU"
 msgid "Replies"
 msgstr "პასუხები"
 
-#. TRANS: Personal group navigation menu option when logged in for seeing own profile.
-#: lib/personalgroupnav.php:114
+#: lib/personalgroupnav.php:109
 #, fuzzy
-msgctxt "MENU"
-msgid "Profile"
-msgstr "პროფილი"
-
-#. TRANS: Personal group navigation menu option when logged in for viewing own favourited notices.
-#: lib/personalgroupnav.php:120
-#, fuzzy
-msgctxt "MENU"
 msgid "Favorites"
 msgstr "რჩეულები"
 
-#. TRANS: Personal group navigation menu option when logged in for viewing recieved personal messages.
-#: lib/personalgroupnav.php:133
+#: lib/personalgroupnav.php:120
 #, fuzzy
-msgctxt "MENU"
 msgid "Inbox"
 msgstr "შემომავალი წერილების ყუთი"
 
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing recieved personal messages.
-#: lib/personalgroupnav.php:135
+#: lib/personalgroupnav.php:121
 msgid "Your incoming messages"
 msgstr "თქვენი შემომავალი შეტყობინებები"
 
-#. TRANS: Personal group navigation menu option when logged in for viewing senet personal messages.
-#: lib/personalgroupnav.php:140
+#: lib/personalgroupnav.php:125
 #, fuzzy
-msgctxt "MENU"
 msgid "Outbox"
 msgstr "გამავალი წერილების ყუთი"
 
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing senet personal messages.
-#: lib/personalgroupnav.php:142
+#: lib/personalgroupnav.php:126
 msgid "Your sent messages"
 msgstr "თქვენი გაგზავნილი წერილები"
 
@@ -9205,9 +9278,26 @@ msgstr "%s-ს შეტყობინებებში გამოყენ
 msgid "Unknown"
 msgstr "უცნობი"
 
+#. TRANS: Plugin admin panel controls
+#: lib/plugindisableform.php:90
+msgctxt "plugin"
+msgid "Disable"
+msgstr ""
+
+#. TRANS: Plugin admin panel controls
+#: lib/pluginenableform.php:112
+msgctxt "plugin"
+msgid "Enable"
+msgstr ""
+
+#: lib/pluginlist.php:196
+msgctxt "plugin-description"
+msgid "(Plugin descriptions unavailable when disabled.)"
+msgstr ""
+
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:82
+#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:88
 msgid "Subscriptions"
 msgstr "გამოწერები"
 
@@ -9218,7 +9308,7 @@ msgstr "ყველა გამოწერა"
 
 #. TRANS: H2 text for user subscriber statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:90
+#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:96
 msgid "Subscribers"
 msgstr "გამომწერები"
 
@@ -9240,7 +9330,7 @@ msgstr ""
 #. TRANS: Label for user statistics.
 #. TRANS: H2 text for user group membership statistics.
 #: lib/profileaction.php:239 lib/profileaction.php:290
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:104
 msgid "Groups"
 msgstr "ჯგუფები"
 
@@ -9260,10 +9350,6 @@ msgstr "ყველა ჯგუფი"
 msgid "Unimplemented method."
 msgstr "მეთოდი განუხორციელებელია."
 
-#: lib/publicgroupnav.php:78
-msgid "Public"
-msgstr "საჯარო"
-
 #: lib/publicgroupnav.php:82
 msgid "User groups"
 msgstr ""
@@ -9302,7 +9388,7 @@ msgid "Revoke the \"%s\" role from this user"
 msgstr "ჩამოართვი \"%s\" როლი ამ მომხმარებელს"
 
 #. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:974
+#: lib/router.php:1001
 #, fuzzy
 msgid "Page not found."
 msgstr "API მეთოდი ვერ მოიძებნა."
@@ -9332,11 +9418,6 @@ msgctxt "BUTTON"
 msgid "Search"
 msgstr ""
 
-#. TRANS: Definition list item with instructions on how to get (better) search results.
-#: lib/searchaction.php:170
-msgid "Search help"
-msgstr "ძიება დახმარებაში"
-
 #: lib/searchgroupnav.php:80
 msgid "People"
 msgstr "ადამიანები"
@@ -9361,6 +9442,51 @@ msgstr "უსათაურო სექცია"
 msgid "More..."
 msgstr "მეტი..."
 
+#: lib/settingsnav.php:78
+msgid "Change your profile settings"
+msgstr "შეცვალე პროფილის პარამეტრები"
+
+#: lib/settingsnav.php:83
+msgid "Upload an avatar"
+msgstr "ატვირთე ავატარი"
+
+#: lib/settingsnav.php:88
+msgid "Change your password"
+msgstr "შეცვალე პაროლი"
+
+#: lib/settingsnav.php:93
+msgid "Change email handling"
+msgstr "ელ. ფოსტის მართვა"
+
+#: lib/settingsnav.php:98
+msgid "Design your profile"
+msgstr "პროფილის პარამეტრები"
+
+#: lib/settingsnav.php:102
+msgid "URL"
+msgstr ""
+
+#: lib/settingsnav.php:103
+msgid "URL shorteners"
+msgstr ""
+
+#: lib/settingsnav.php:111
+msgid "Updates by instant messenger (IM)"
+msgstr "განახლებები ჩათ კლიენტისგან (IM)"
+
+#: lib/settingsnav.php:118
+msgid "Updates by SMS"
+msgstr "განახლებები SMS-თ"
+
+#: lib/settingsnav.php:123
+#, fuzzy
+msgid "Connections"
+msgstr "შეერთებები"
+
+#: lib/settingsnav.php:124
+msgid "Authorized connected applications"
+msgstr "ავტორიზირებული შეერთებული აპლიკაციები"
+
 #: lib/silenceform.php:67
 msgid "Silence"
 msgstr "დადუმება"
@@ -9369,30 +9495,34 @@ msgstr "დადუმება"
 msgid "Silence this user"
 msgstr "ამ მომხმარებლის დადუმება"
 
-#: lib/subgroupnav.php:83
+#: lib/subgroupnav.php:89
 #, php-format
 msgid "People %s subscribes to"
 msgstr ""
 
-#: lib/subgroupnav.php:91
+#: lib/subgroupnav.php:97
 #, php-format
 msgid "People subscribed to %s"
 msgstr ""
 
-#: lib/subgroupnav.php:99
+#: lib/subgroupnav.php:105
 #, php-format
 msgid "Groups %s is a member of"
 msgstr ""
 
-#: lib/subgroupnav.php:105
+#: lib/subgroupnav.php:111
 msgid "Invite"
 msgstr "მოწვევა"
 
-#: lib/subgroupnav.php:106
+#: lib/subgroupnav.php:112
 #, php-format
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "მოიწვიე მეგობრები და კოლეგები %s-ზე"
 
+#: lib/subscribeform.php:115 lib/subscribeform.php:139
+msgid "Subscribe to this user"
+msgstr "გამოიწერე ეს მომხმარებელი"
+
 #: lib/subscriberspeopleselftagcloudsection.php:48
 #: lib/subscriptionspeopleselftagcloudsection.php:48
 msgid "People Tagcloud as self-tagged"
@@ -9465,6 +9595,12 @@ msgstr "თემა შეიცავს ფაილის ტიპს '.%s'
 msgid "Error opening theme archive."
 msgstr "თემის არქივის გახსნისას მოხდა შეცდომა."
 
+#: lib/threadednoticelist.php:270
+#, php-format
+msgid "Show all %d comment"
+msgid_plural "Show all %d comments"
+msgstr[0] ""
+
 #: lib/topposterssection.php:74
 msgid "Top posters"
 msgstr "საუკეთესო მპოსტავები"
@@ -9507,119 +9643,123 @@ msgstr "გამოწერის გაუქმება"
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "მომხმარებელს პროფილი არ გააჩნია."
 
-#. TRANS: Link text for changeing the avatar of the logged in user.
-#: lib/userprofile.php:121
+#: lib/userprofile.php:116
 msgid "Edit Avatar"
 msgstr "ავატარის რედაქტირება"
 
 #. TRANS: H2 for user actions in a profile.
 #. TRANS: H2 for entity actions in a profile.
-#: lib/userprofile.php:245 lib/userprofile.php:261
+#: lib/userprofile.php:216 lib/userprofile.php:232
 msgid "User actions"
 msgstr "მომხმარებლის მოქმედებები"
 
 #. TRANS: Text shown in user profile of not yet compeltely deleted users.
-#: lib/userprofile.php:249
+#: lib/userprofile.php:220
 msgid "User deletion in progress..."
 msgstr "მომხმარებლის წაშლა პროგრესშია..."
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:277
+#: lib/userprofile.php:248
 msgid "Edit profile settings"
 msgstr "პროფილის პარამეტრების რედაქტირება"
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:279
+#: lib/userprofile.php:250
 msgid "Edit"
 msgstr "რედაქტირება"
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:303
+#: lib/userprofile.php:274
 msgid "Send a direct message to this user"
 msgstr "გაუგზავნე პირდაპირი შეტყობინება ამ მომხმარებელს"
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:305
+#: lib/userprofile.php:276
 msgid "Message"
 msgstr "შეტყობინება"
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:347
+#: lib/userprofile.php:318
 msgid "Moderate"
 msgstr "მოდერაცია"
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:386
+#: lib/userprofile.php:357
 msgid "User role"
 msgstr "მომხმარებლის როლი"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:389
+#: lib/userprofile.php:360
 msgctxt "role"
 msgid "Administrator"
 msgstr "ადმინისტრატორი"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:391
+#: lib/userprofile.php:362
 msgctxt "role"
 msgid "Moderator"
 msgstr "მოდერატორი"
 
+#: lib/util.php:321
+#, fuzzy
+msgid "Not allowed to log in."
+msgstr "ავტორიზებული არ ხართ."
+
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1306
+#: lib/util.php:1337
 msgid "a few seconds ago"
 msgstr "რამდენიმე წამის წინ"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1309
+#: lib/util.php:1340
 msgid "about a minute ago"
 msgstr "დაახლოებით 1 წუთის წინ"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1313
+#: lib/util.php:1344
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
 msgstr[0] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1316
+#: lib/util.php:1347
 msgid "about an hour ago"
 msgstr "დაახლოებით 1 საათის წინ"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1320
+#: lib/util.php:1351
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
 msgstr[0] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1323
+#: lib/util.php:1354
 msgid "about a day ago"
 msgstr "დაახლოებით 1 დღის წინ"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1327
+#: lib/util.php:1358
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
 msgstr[0] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1330
+#: lib/util.php:1361
 msgid "about a month ago"
 msgstr "დაახლოებით 1 თვის წინ"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1334
+#: lib/util.php:1365
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
 msgstr[0] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1337
+#: lib/util.php:1368
 msgid "about a year ago"
 msgstr "დაახლოებით 1 წლის წინ"
 
@@ -9631,22 +9771,6 @@ msgid "%s is not a valid color! Use 3 or 6 hex characters."
 msgstr ""
 "%s არ არის სწორი ფერი! გამოიყენეთ 3 ან 6 სიმბოლოიანი თექვსმეტობითი ციფრი."
 
-#. TRANS: %s is the URL to the StatusNet site's Instant Messaging settings.
-#: lib/xmppmanager.php:287
-#, php-format
-msgid "Unknown user. Go to %s to add your address to your account"
-msgstr ""
-
-#. TRANS: Response to XMPP source when it sent too long a message.
-#. TRANS: %1$d the maximum number of allowed characters (used for plural), %2$d is the sent number.
-#: lib/xmppmanager.php:406
-#, fuzzy, php-format
-msgid "Message too long. Maximum is %1$d character, you sent %2$d."
-msgid_plural "Message too long. Maximum is %1$d characters, you sent %2$d."
-msgstr[0] ""
-"შეტყობინება ძალიან გრძელია - დასაშვები რაოდენობაა %1$d სიმბოლომდე, თქვენ "
-"გააგზავნეთ %2$d."
-
 #. TRANS: Exception.
 #: lib/xrd.php:63
 #, fuzzy
@@ -9665,73 +9789,172 @@ msgid "Getting backup from file '%s'."
 msgstr ""
 
 #, fuzzy
-#~ msgid "Block this user."
-#~ msgstr "დაბლოკე ეს მომხმარებელი"
+#~ msgid "Could not generate feed for group - %s"
+#~ msgstr "ჯგუფის განახლება ვერ მოხერხდა."
 
 #, fuzzy
-#~ msgid "Delete this notice."
-#~ msgstr "შეტყობინების წაშლა"
-
-#, fuzzy
-#~ msgid "Delete this user."
-#~ msgstr "ამ მომხმარებლის წაშლა"
-
-#, fuzzy
-#~ msgid "Restore default designs."
-#~ msgstr "დააბრუნე პირვანდელი დიზაინი"
-
-#, fuzzy
-#~ msgid "Reset back to default."
-#~ msgstr "პირვანდელის პარამეტრების დაბრუნება"
-
-#, fuzzy
-#~ msgid "Save design."
-#~ msgstr "შეინახე დიზაინი"
-
-#, fuzzy
-#~ msgid "Disfavor favorite."
-#~ msgstr "რჩეულის გაუქმება"
-
-#, fuzzy
-#~ msgid "\"%s\" not found."
-#~ msgstr "API მეთოდი ვერ მოიძებნა."
-
-#, fuzzy
-#~ msgid "Notice %s not found."
-#~ msgstr "API მეთოდი ვერ მოიძებნა."
-
-#, fuzzy
-#~ msgid "Attachment %s not found."
-#~ msgstr "მიმღები მომხმარებელი ვერ მოიძებნა."
-
-#, fuzzy
-#~ msgid "Invalid tag: \"%s\"."
-#~ msgstr "არასწორი სანიშნე: \"%s\""
-
-#, fuzzy
-#~ msgid "%s updates from everyone."
-#~ msgstr "%s განახლებები ყველასგან!"
-
-#, fuzzy
-#~ msgid "Password saved"
-#~ msgstr "პაროლი შენახულია."
-
-#, fuzzy
-#~ msgid "Where you are, like \"City, State (or Region), Country\"."
-#~ msgstr "რომელ ქალაქში, რეგიონში, ქვეყანაში ხართ?"
-
-#, fuzzy
-#~ msgid "Subscribe to this user."
-#~ msgstr "გამოიწერე ეს მომხმარებელი"
+#~ msgid "Current confirmed Jabber/Google Talk address."
+#~ msgstr "მიმდინარე დადასტურებული Jabber/GTalk მისამართი."
 
 #, fuzzy
 #~ msgid ""
-#~ "Listenee stream license \"%1$s\" is not compatible with site license \"%2"
-#~ "$s\"."
+#~ "Jabber or Google Talk address, like \"UserName@example.org\". First, make "
+#~ "sure to add %s to your buddy list in your IM client or on Google Talk."
 #~ msgstr ""
-#~ "გამოსაწერი მომხმარებლის ნაკადის ლიცენზია ‘%1$s’ შეუთავსებელია საიტის "
-#~ "ლიცენზიასთან ‘%2$s’."
+#~ "Jabber ან GTalk მისამართი, როგორც \"UserName@example.org\". პირველ რიგში "
+#~ "დარწმუნდით, რომ დაიმატეთ %s მეგობრების სიაში თქვენს IM კლიენტში ან GTalk-"
+#~ "ში."
 
 #, fuzzy
-#~ msgid "Not allowed to log in."
-#~ msgstr "ავტორიზებული არ ხართ."
+#~ msgid "Send me notices through Jabber/Google Talk."
+#~ msgstr "გამომიგზავნე შეტყობინებები  Jabber/GTalk-ის მეშვეობით."
+
+#, fuzzy
+#~ msgid "Publish a MicroID for my Jabber/Google Talk address."
+#~ msgstr "გამოაქვეყნე  MicroID ჩემი Jabber/GTalk მისამართისთვის."
+
+#~ msgid "No Jabber ID."
+#~ msgstr "Jabber ID უცნობია."
+
+#, fuzzy
+#~ msgid "Not a valid Jabber ID."
+#~ msgstr "არასწორი Jabber ID"
+
+#~ msgid "That is already your Jabber ID."
+#~ msgstr "ეს უკვე არის თქვენი Jabber ID."
+
+#~ msgid "That is not your Jabber ID."
+#~ msgstr "ეს არ არის თქვენი Jabber ID"
+
+#~ msgid "Other settings"
+#~ msgstr "სხვა პარამეტრები"
+
+#~ msgid "Tag cloud"
+#~ msgstr "სანიშნეების ღრუბელი"
+
+#~ msgid "Consumer key"
+#~ msgstr "მომხმარებლის გასაღები"
+
+#~ msgid "Consumer secret"
+#~ msgstr "მომხმარებლის საიდუმლო"
+
+#~ msgid "Authorize URL"
+#~ msgstr "URL-ის ავტორიზაცია"
+
+#~ msgid "Jabber"
+#~ msgstr "Jabber"
+
+#~ msgid "Photo"
+#~ msgstr "ფოტო"
+
+#~ msgid "Other options"
+#~ msgstr "სხვა ოფციები"
+
+#~ msgid "Other"
+#~ msgstr "სხვა"
+
+#~ msgid "Primary site navigation"
+#~ msgstr "საიტის ძირითადი ნავიგაცია"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Personal profile and friends timeline"
+#~ msgstr "პირადი პროფილი და მეგობრების ნაკადი"
+
+#~ msgctxt "MENU"
+#~ msgid "Personal"
+#~ msgstr "პირადი"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Change your email, avatar, password, profile"
+#~ msgstr "შეცვალე ელ. ფოსტა, ავატარი, პაროლი, პროფილი"
+
+#~ msgid "Account"
+#~ msgstr "ანგარიში"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Connect to services"
+#~ msgstr "სერვისებთან დაკავშირება"
+
+#~ msgid "Connect"
+#~ msgstr "კავშირი"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Change site configuration"
+#~ msgstr "საიტის კონფიგურაცია"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Invite friends and colleagues to join you on %s"
+#~ msgstr "მოიწვიე მეგობრები და კოლეგები %s-ზე"
+
+#~ msgctxt "MENU"
+#~ msgid "Invite"
+#~ msgstr "მოწვევა"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Create an account"
+#~ msgstr "გახსენი ანგარიში"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Help me!"
+#~ msgstr "დამეხმარეთ!"
+
+#~ msgctxt "MENU"
+#~ msgid "Help"
+#~ msgstr "დახმარება"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Search for people or text"
+#~ msgstr "მოძებნე ხალხი ან ტექსტი"
+
+#~ msgid "Local views"
+#~ msgstr "ლოკალური ხედები"
+
+#~ msgid "Page notice"
+#~ msgstr "გვერდის შეტყობინება"
+
+#~ msgid "Secondary site navigation"
+#~ msgstr "საიტის მეორადი ნავიგაცია"
+
+#~ msgid "StatusNet software license"
+#~ msgstr "StatusNet კოდის ლიცენზია"
+
+#~ msgid "Site content license"
+#~ msgstr "საიტის შიგთავსის ლიცენზია"
+
+#~ msgid "Pagination"
+#~ msgstr "გვერდებათ დაყოფა"
+
+#~ msgid "Author"
+#~ msgstr "ავტორი"
+
+#~ msgid "Provider"
+#~ msgstr "მომწოდებელი"
+
+#, fuzzy
+#~ msgctxt "MENU"
+#~ msgid "SMS"
+#~ msgstr "SMS"
+
+#~ msgid "Filter tags"
+#~ msgstr "სანიშნეების გაფილტვრა"
+
+#~ msgid "[%s]"
+#~ msgstr "[%s]"
+
+#~ msgid "Available characters"
+#~ msgstr "ხელმისაწვდომი სიმბოლოები"
+
+#, fuzzy
+#~ msgctxt "MENU"
+#~ msgid "Profile"
+#~ msgstr "პროფილი"
+
+#~ msgid "Search help"
+#~ msgstr "ძიება დახმარებაში"
+
+#, fuzzy
+#~ msgid "Message too long. Maximum is %1$d character, you sent %2$d."
+#~ msgid_plural "Message too long. Maximum is %1$d characters, you sent %2$d."
+#~ msgstr[0] ""
+#~ "შეტყობინება ძალიან გრძელია - დასაშვები რაოდენობაა %1$d სიმბოლომდე, თქვენ "
+#~ "გააგზავნეთ %2$d."
diff --git a/locale/ko/LC_MESSAGES/statusnet.po b/locale/ko/LC_MESSAGES/statusnet.po
index a65881d25b..ad6af84903 100644
--- a/locale/ko/LC_MESSAGES/statusnet.po
+++ b/locale/ko/LC_MESSAGES/statusnet.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 15:58+0000\n"
-"PO-Revision-Date: 2011-03-03 16:00:59+0000\n"
+"POT-Creation-Date: 2011-03-03 17:23+0000\n"
+"PO-Revision-Date: 2011-03-03 17:26:12+0000\n"
 "Language-Team: Korean <http://translatewiki.net/wiki/Portal:ko>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -78,23 +78,23 @@ msgstr "접근 설정을 저장"
 #. TRANS: Tooltip for button to save access settings in site admin panel.
 #. TRANS: Button text for saving theme settings.
 #. TRANS: Button label to save e-mail preferences.
-#. TRANS: Button label to save Instant Messaging preferences.
-#. TRANS: Button text for saving "Other settings" in profile.
+#. TRANS: Button label to save IM preferences.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
 #. TRANS: Button text for saving site notice in admin panel.
 #. TRANS: Button label to save SMS preferences.
 #. TRANS: Save button for settings for a profile in a subscriptions list.
+#. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
 #. TRANS: Button text on profile design page to save settings.
 #: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
-#: actions/emailsettings.php:250 actions/imsettings.php:183
-#: actions/othersettings.php:136 actions/pathsadminpanel.php:512
-#: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
-#: actions/smssettings.php:205 actions/subscriptions.php:259
+#: actions/emailsettings.php:251 actions/imsettings.php:199
+#: actions/pathsadminpanel.php:512 actions/profilesettings.php:198
+#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:204
+#: actions/subscriptions.php:261 actions/urlsettings.php:152
 #: actions/useradminpanel.php:298 lib/applicationeditform.php:355
-#: lib/designsettings.php:270 lib/groupeditform.php:201
+#: lib/designform.php:320 lib/groupeditform.php:201
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "저장"
@@ -133,7 +133,11 @@ msgstr "해당하는 페이지 없음"
 #. 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 use "one time password login" without using an existing user.
+#. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
+#. TRANS: Client error displayed trying to find a user by ID for a non-existing ID.
+#. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when calling a profile action without specifying a user.
 #: actions/all.php:80 actions/allrss.php:69
@@ -145,19 +149,19 @@ msgstr "해당하는 페이지 없음"
 #: actions/apidirectmessage.php:75 actions/apidirectmessagenew.php:72
 #: actions/apigroupcreate.php:111 actions/apigroupismember.php:89
 #: actions/apigroupjoin.php:98 actions/apigroupleave.php:98
-#: actions/apigrouplist.php:70 actions/apistatusesupdate.php:230
-#: actions/apisubscriptions.php:85 actions/apitimelinefavorites.php:70
-#: actions/apitimelinefriends.php:173 actions/apitimelinehome.php:78
-#: actions/apitimelinementions.php:77 actions/apitimelineuser.php:79
-#: actions/avatarbynickname.php:79 actions/favoritesrss.php:72
-#: actions/foaf.php:42 actions/foaf.php:61 actions/hcard.php:67
-#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
-#: actions/remotesubscribe.php:144 actions/remotesubscribe.php:153
-#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
-#: actions/showfavorites.php:106 actions/userbyid.php:74
-#: actions/usergroups.php:93 actions/userrss.php:40 actions/userxrd.php:59
-#: actions/xrds.php:71 lib/command.php:509 lib/galleryaction.php:59
-#: lib/mailbox.php:80 lib/profileaction.php:77
+#: actions/apigrouplist.php:70 actions/apigroupprofileupdate.php:108
+#: actions/apistatusesupdate.php:230 actions/apisubscriptions.php:85
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:173
+#: actions/apitimelinehome.php:78 actions/apitimelinementions.php:77
+#: actions/apitimelineuser.php:79 actions/avatarbynickname.php:79
+#: actions/favoritesrss.php:72 actions/foaf.php:42 actions/foaf.php:61
+#: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116
+#: actions/otp.php:78 actions/remotesubscribe.php:144
+#: actions/remotesubscribe.php:153 actions/replies.php:73
+#: actions/repliesrss.php:38 actions/rsd.php:113 actions/showfavorites.php:106
+#: actions/userbyid.php:75 actions/usergroups.php:93 actions/userrss.php:40
+#: actions/userxrd.php:59 actions/xrds.php:71 lib/command.php:509
+#: lib/galleryaction.php:59 lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "해당하는 이용자 없음"
 
@@ -171,10 +175,9 @@ msgstr "%s 및 친구들, %d 페이지"
 #. TRANS: H1 text for page. %s is a user nickname.
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Timeline title for user and friends. %s is a user nickname.
-#. TRANS: Tooltop for personal group navigation menu option when logged in for viewing timeline of self and friends.
 #: actions/all.php:94 actions/all.php:191 actions/allrss.php:117
 #: actions/apitimelinefriends.php:207 actions/apitimelinehome.php:113
-#: lib/personalgroupnav.php:102
+#: lib/personalgroupnav.php:100
 #, php-format
 msgid "%s and friends"
 msgstr "%s 및 친구들"
@@ -228,7 +231,7 @@ msgstr ""
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
 #. TRANS: Second sentence of empty message for anonymous users. %s is a user nickname.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:227
+#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:221
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -275,19 +278,20 @@ msgstr "%2$s에 있는 %1$s 및 친구들의 업데이트!"
 #: actions/apifavoritecreate.php:98 actions/apifavoritedestroy.php:98
 #: actions/apifriendshipscreate.php:99 actions/apifriendshipsdestroy.php:99
 #: actions/apifriendshipsshow.php:124 actions/apigroupcreate.php:138
-#: actions/apigroupismember.php:115 actions/apigroupjoin.php:160
-#: actions/apigroupleave.php:145 actions/apigrouplist.php:134
+#: actions/apigroupismember.php:115 actions/apigroupjoin.php:151
+#: actions/apigroupleave.php:141 actions/apigrouplist.php:134
 #: actions/apigrouplistall.php:120 actions/apigroupmembership.php:105
+#: actions/apigroupprofileupdate.php:100 actions/apigroupprofileupdate.php:213
 #: actions/apigroupshow.php:114 actions/apihelptest.php:84
 #: actions/apistatusesdestroy.php:101 actions/apistatusesretweets.php:110
 #: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:139
 #: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
-#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:268
-#: actions/apitimelinegroup.php:147 actions/apitimelinehome.php:173
-#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:239
-#: actions/apitimelineretweetedtome.php:118
-#: actions/apitimelineretweetsofme.php:150 actions/apitimelinetag.php:159
-#: actions/apitimelineuser.php:206 actions/apiusershow.php:100
+#: actions/apitimelinefavorites.php:182 actions/apitimelinefriends.php:276
+#: actions/apitimelinegroup.php:148 actions/apitimelinehome.php:181
+#: actions/apitimelinementions.php:182 actions/apitimelinepublic.php:247
+#: actions/apitimelineretweetedtome.php:147
+#: actions/apitimelineretweetsofme.php:147 actions/apitimelinetag.php:165
+#: actions/apitimelineuser.php:217 actions/apiusershow.php:100
 msgid "API method not found."
 msgstr "API 메서드 발견 안 됨."
 
@@ -302,8 +306,9 @@ msgstr "API 메서드 발견 안 됨."
 #: actions/apifavoritecreate.php:88 actions/apifavoritedestroy.php:88
 #: actions/apifriendshipscreate.php:89 actions/apifriendshipsdestroy.php:89
 #: actions/apigroupcreate.php:102 actions/apigroupjoin.php:89
-#: actions/apigroupleave.php:89 actions/apimediaupload.php:66
-#: actions/apistatusesretweet.php:63 actions/apistatusesupdate.php:194
+#: actions/apigroupleave.php:89 actions/apigroupprofileupdate.php:92
+#: actions/apimediaupload.php:66 actions/apistatusesretweet.php:63
+#: actions/apistatusesupdate.php:194
 msgid "This method requires a POST."
 msgstr "이 메서드는 POST를 요구합니다."
 
@@ -315,21 +320,16 @@ msgid ""
 msgstr ""
 
 #. TRANS: Server error displayed when a user's delivery device cannot be updated.
-#. TRANS: Server error displayed when a user update to the database fails in the contact address confirmation action.
 #. TRANS: Server error thrown on database error updating e-mail preferences.
 #. TRANS: Server error thrown on database error removing a registered e-mail address.
-#. TRANS: Server error thrown on database error updating Instant Messaging preferences.
-#. TRANS: Server error thrown on database error removing a registered Instant Messaging address.
-#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
 #. TRANS: Server error thrown when user profile settings could not be updated.
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
-#: actions/apiaccountupdatedeliverydevice.php:130
-#: actions/confirmaddress.php:118 actions/emailsettings.php:352
-#: actions/emailsettings.php:498 actions/imsettings.php:276
-#: actions/imsettings.php:432 actions/othersettings.php:186
-#: actions/profilesettings.php:322 actions/smssettings.php:301
-#: actions/smssettings.php:454
+#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
+#: actions/apiaccountupdatedeliverydevice.php:136
+#: actions/emailsettings.php:353 actions/emailsettings.php:499
+#: actions/profilesettings.php:323 actions/smssettings.php:300
+#: actions/smssettings.php:453 actions/urlsettings.php:211
 msgid "Could not update user."
 msgstr "이용자를 업데이트 할 수 없습니다."
 
@@ -355,7 +355,7 @@ msgstr "이용자가 프로필을 가지고 있지 않습니다."
 
 #. TRANS: Server error displayed if a user profile could not be saved.
 #. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:418
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:419
 msgid "Could not save profile."
 msgstr "프로필을 저장 할 수 없습니다."
 
@@ -367,7 +367,7 @@ msgstr "프로필을 저장 할 수 없습니다."
 #: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
 #: actions/designadminpanel.php:120 actions/editapplication.php:121
 #: actions/newapplication.php:102 actions/newnotice.php:95
-#: lib/designsettings.php:298
+#: lib/designsettings.php:110
 #, fuzzy, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s byte) due to its "
@@ -389,8 +389,8 @@ msgstr[0] ""
 #: actions/apiaccountupdateprofilecolors.php:160
 #: actions/apiaccountupdateprofilecolors.php:171
 #: actions/groupdesignsettings.php:285 actions/groupdesignsettings.php:296
-#: actions/userdesignsettings.php:201 actions/userdesignsettings.php:211
-#: actions/userdesignsettings.php:253 actions/userdesignsettings.php:263
+#: actions/userdesignsettings.php:218 actions/userdesignsettings.php:228
+#: actions/userdesignsettings.php:270 actions/userdesignsettings.php:280
 msgid "Unable to save your design settings."
 msgstr "디자인 설정을 저장할 수 없습니다."
 
@@ -398,7 +398,7 @@ msgstr "디자인 설정을 저장할 수 없습니다."
 #. TRANS: Client error displayed when a database error occurs updating profile colours.
 #: actions/apiaccountupdateprofilebackgroundimage.php:191
 #: actions/apiaccountupdateprofilecolors.php:139
-#: actions/userdesignsettings.php:179
+#: actions/userdesignsettings.php:196
 msgid "Could not update your design."
 msgstr "디자인을 업데이트 할 수 없습니다."
 
@@ -506,7 +506,7 @@ msgstr "받는 사용자가 없습니다."
 #. TRANS: Client error displayed trying to direct message another user who's not a friend (403).
 #: actions/apidirectmessagenew.php:144
 #, fuzzy
-msgid "Can't send direct messages to users who aren't your friend."
+msgid "Cannot send direct messages to users who aren't your friend."
 msgstr "당신의 친구가 아닌 사용자에게 직접 메시지를 보낼 수 없습니다."
 
 #. TRANS: Client error displayed trying to direct message self (403).
@@ -590,9 +590,9 @@ msgstr "타겟 이용자를 찾을 수 없습니다."
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:156 actions/editgroup.php:191
-#: actions/newgroup.php:137 actions/profilesettings.php:273
-#: actions/register.php:214
+#: actions/apigroupcreate.php:156 actions/apigroupprofileupdate.php:255
+#: actions/editgroup.php:191 actions/newgroup.php:137
+#: actions/profilesettings.php:274 actions/register.php:199
 msgid "Nickname already in use. Try another one."
 msgstr "별명이 이미 사용중 입니다. 다른 별명을 시도해 보십시오."
 
@@ -600,9 +600,9 @@ msgstr "별명이 이미 사용중 입니다. 다른 별명을 시도해 보십
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:164 actions/editgroup.php:195
-#: actions/newgroup.php:141 actions/profilesettings.php:243
-#: actions/register.php:216
+#: actions/apigroupcreate.php:164 actions/apigroupprofileupdate.php:259
+#: actions/editgroup.php:195 actions/newgroup.php:141
+#: actions/profilesettings.php:244 actions/register.php:201
 msgid "Not a valid nickname."
 msgstr "유효한 별명이 아닙니다"
 
@@ -612,10 +612,10 @@ msgstr "유효한 별명이 아닙니다"
 #. TRANS: Validation error shown when providing an invalid homepage URL in the "New application" form.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:181 actions/editapplication.php:235
-#: actions/editgroup.php:202 actions/newapplication.php:221
-#: actions/newgroup.php:148 actions/profilesettings.php:248
-#: actions/register.php:223
+#: actions/apigroupcreate.php:181 actions/apigroupprofileupdate.php:277
+#: actions/editapplication.php:235 actions/editgroup.php:202
+#: actions/newapplication.php:221 actions/newgroup.php:148
+#: actions/profilesettings.php:249 actions/register.php:208
 msgid "Homepage is not a valid URL."
 msgstr "홈페이지 주소형식이 올바르지 않습니다."
 
@@ -624,8 +624,8 @@ msgstr "홈페이지 주소형식이 올바르지 않습니다."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:191 actions/editgroup.php:206
-#: actions/newgroup.php:152 actions/profilesettings.php:252
-#: actions/register.php:226
+#: actions/newgroup.php:152 actions/profilesettings.php:253
+#: actions/register.php:211
 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "실명이 너무 깁니다. (최대 255글자)"
@@ -652,8 +652,8 @@ msgstr[0] "설명이 너무 깁니다. (최대 %d 글자)"
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:215 actions/editgroup.php:218
-#: actions/newgroup.php:164 actions/profilesettings.php:265
-#: actions/register.php:235
+#: actions/newgroup.php:164 actions/profilesettings.php:266
+#: actions/register.php:220
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
 msgstr "위치가 너무 깁니다. (최대 255글자)"
@@ -682,15 +682,16 @@ msgstr "사용할 수 없는 별명 : \"%s\""
 #. TRANS: %s is the alias that is already in use.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error. %s is the already used alias.
-#: actions/apigroupcreate.php:264 actions/editgroup.php:246
-#: actions/newgroup.php:193
+#: actions/apigroupcreate.php:264 actions/apigroupprofileupdate.php:351
+#: actions/editgroup.php:246 actions/newgroup.php:193
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "별명 \"%s\" 이 이미 사용중 입니다. 다른 별명을 시도해 보십시오."
 
 #. TRANS: Client error displayed when trying to use an alias during group creation that is the same as the group's nickname.
 #. TRANS: Group edit form validation error.
-#: actions/apigroupcreate.php:278 actions/editgroup.php:253
+#: actions/apigroupcreate.php:278 actions/apigroupprofileupdate.php:359
+#: actions/editgroup.php:253
 msgid "Alias can't be the same as nickname."
 msgstr ""
 
@@ -702,7 +703,8 @@ msgstr ""
 #. TRANS: Client error displayed requesting most recent notices to a group for a non-existing group.
 #: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
 #: actions/apigroupleave.php:104 actions/apigroupmembership.php:71
-#: actions/apigroupshow.php:81 actions/apitimelinegroup.php:89
+#: actions/apigroupprofileupdate.php:113 actions/apigroupshow.php:81
+#: actions/apitimelinegroup.php:89
 msgid "Group not found."
 msgstr "찾을 수가 없습니다."
 
@@ -720,13 +722,11 @@ msgstr "당신은 이미 이 그룹의 멤버입니다."
 msgid "You have been blocked from that group by the admin."
 msgstr "이미 차단된 이용자입니다."
 
-#. TRANS: Server error displayed when joining a group fails.
-#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
 #. 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.
 #. TRANS: Message given having failed to add a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:362
+#: actions/apigroupjoin.php:136 actions/joingroup.php:139 lib/command.php:362
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "이용자 %1$s 의 그룹 %2$s 가입에 실패했습니다."
@@ -736,8 +736,6 @@ msgstr "이용자 %1$s 의 그룹 %2$s 가입에 실패했습니다."
 msgid "You are not a member of this group."
 msgstr "당신은 해당 그룹의 멤버가 아닙니다."
 
-#. TRANS: Server error displayed when leaving a group fails.
-#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
 #. TRANS: Server error displayed when leaving a group failed in the database.
 #. TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
 #. TRANS: Message given having failed to remove a user from a group.
@@ -773,6 +771,63 @@ msgstr "%s 그룹"
 msgid "groups on %s"
 msgstr "%s 사이트의 그룹"
 
+#. TRANS: Client error displayed trying to edit a group while not being a group admin.
+#. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
+#. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
+#: actions/apigroupprofileupdate.php:118 actions/editgroup.php:110
+#: actions/editgroup.php:176 actions/groupdesignsettings.php:109
+#: actions/grouplogo.php:111
+msgid "You must be an admin to edit the group."
+msgstr "관리자만 그룹을 편집할 수 있습니다."
+
+#. TRANS: Server error displayed when editing a group fails.
+#: actions/apigroupprofileupdate.php:171 actions/editgroup.php:274
+msgid "Could not update group."
+msgstr "그룹을 업데이트 할 수 없습니다."
+
+#. TRANS: Server error displayed when group aliases could not be added.
+#. TRANS: Server exception thrown when creating group aliases failed.
+#: actions/apigroupprofileupdate.php:194 actions/editgroup.php:281
+#: classes/User_group.php:540
+msgid "Could not create aliases."
+msgstr "관심소식을 생성할 수 없습니다."
+
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: actions/apigroupprofileupdate.php:249 lib/nickname.php:165
+msgid "Nickname must have only lowercase letters and numbers and no spaces."
+msgstr ""
+"별명은 반드시 영소문자와 숫자로만 이루어져야 하며 스페이스의 사용이 불가 합니"
+"다."
+
+#: actions/apigroupprofileupdate.php:286
+#, fuzzy
+msgid "Full name is too long (max 255 chars)."
+msgstr "실명이 너무 깁니다. (최대 255글자)"
+
+#: actions/apigroupprofileupdate.php:296
+#, fuzzy, php-format
+msgid "description is too long (max %d chars)."
+msgstr "설명이 너무 깁니다. (최대 %d 글자)"
+
+#: actions/apigroupprofileupdate.php:307
+#, fuzzy
+msgid "Location is too long (max 255 chars)."
+msgstr "위치가 너무 깁니다. (최대 255글자)"
+
+#: actions/apigroupprofileupdate.php:326
+#, fuzzy, php-format
+msgid "Too many aliases! Maximum %d."
+msgstr "별명이 너무 많습니다! 최대 %d개."
+
+#. TRANS: Group edit form validation error.
+#. TRANS: Group create form validation error.
+#. TRANS: %s is the invalid alias.
+#: actions/apigroupprofileupdate.php:342 actions/editgroup.php:241
+#: actions/newgroup.php:188
+#, php-format
+msgid "Invalid alias: \"%s\""
+msgstr "사용할 수 없는 별명 : \"%s\""
+
 #. TRANS: Client error displayed when uploading a media file has failed.
 #: actions/apimediaupload.php:101
 msgid "Upload failed."
@@ -806,21 +861,22 @@ msgstr "당신은 이 프로필에 구독되지 않고있습니다."
 #. TRANS: Form validation error message.
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
+#. TRANS: Client error displayed when the session token is not okay.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
 #: actions/deletenotice.php:177 actions/disfavor.php:75
-#: actions/emailsettings.php:291 actions/favor.php:75 actions/geocode.php:55
+#: actions/emailsettings.php:292 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:65 actions/grouplogo.php:321
-#: actions/groupunblock.php:65 actions/imsettings.php:224
-#: actions/invite.php:60 actions/login.php:137 actions/makeadmin.php:66
-#: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
-#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
-#: actions/othersettings.php:155 actions/passwordsettings.php:138
-#: actions/profilesettings.php:217 actions/recoverpassword.php:383
-#: actions/register.php:172 actions/remotesubscribe.php:76
-#: actions/repeat.php:82 actions/smssettings.php:250 actions/subedit.php:40
-#: actions/subscribe.php:86 actions/tagother.php:166
-#: actions/unsubscribe.php:69 actions/userauthorization.php:52
-#: lib/designsettings.php:310
+#: actions/groupunblock.php:65 actions/imsettings.php:241
+#: actions/invite.php:60 actions/makeadmin.php:66 actions/newmessage.php:135
+#: actions/newnotice.php:105 actions/nudge.php:80
+#: actions/oauthappssettings.php:162 actions/oauthconnectionssettings.php:135
+#: actions/passwordsettings.php:137 actions/pluginenable.php:87
+#: actions/profilesettings.php:218 actions/recoverpassword.php:383
+#: actions/register.php:157 actions/remotesubscribe.php:76
+#: actions/repeat.php:82 actions/smssettings.php:249 actions/subedit.php:40
+#: actions/subscribe.php:87 actions/tagother.php:145
+#: actions/unsubscribe.php:69 actions/urlsettings.php:171
+#: actions/userauthorization.php:53 lib/designsettings.php:122
 msgid "There was a problem with your session token. Try again, please."
 msgstr "세션토큰에 문제가 있습니다. 다시 시도해주십시오."
 
@@ -849,10 +905,10 @@ msgstr "OAuth 응용 프로그램 사용자 추가 중 데이터베이스 오류
 #. TRANS: Unknown form validation error in design settings form.
 #: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
 #: actions/designadminpanel.php:100 actions/editapplication.php:144
-#: actions/emailsettings.php:310 actions/grouplogo.php:332
-#: actions/imsettings.php:239 actions/newapplication.php:124
-#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
-#: actions/smssettings.php:271 lib/designsettings.php:321
+#: actions/emailsettings.php:311 actions/grouplogo.php:332
+#: actions/imsettings.php:256 actions/newapplication.php:124
+#: actions/oauthconnectionssettings.php:144 actions/recoverpassword.php:46
+#: actions/smssettings.php:270 lib/designsettings.php:133
 msgid "Unexpected form submission."
 msgstr "잘못된 폼 제출"
 
@@ -902,31 +958,26 @@ msgstr "계정"
 
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Field label in form for profile settings.
-#. TRANS: Label for group nickname (dt). Text hidden by default.
-#. TRANS: DT for nick name in a profile.
-#: actions/apioauthauthorize.php:459 actions/login.php:252
-#: actions/profilesettings.php:106 actions/register.php:432
-#: actions/showgroup.php:243 actions/tagother.php:94
+#: actions/apioauthauthorize.php:459 actions/login.php:225
+#: actions/profilesettings.php:107 actions/register.php:411
 #: actions/userauthorization.php:145 lib/groupeditform.php:145
-#: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "별명"
 
 #. TRANS: Field label on OAuth API authorisation form.
-#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:463 actions/login.php:255
-#: actions/register.php:436 lib/accountsettingsaction.php:120
+#: actions/apioauthauthorize.php:463 actions/login.php:228
+#: actions/register.php:415 lib/settingsnav.php:87
 msgid "Password"
 msgstr "비밀 번호"
 
 #. TRANS: Button text that when clicked will cancel the process of allowing access to an account
 #. TRANS: by an external application.
 #. TRANS: Button label to cancel an e-mail address confirmation procedure.
-#. TRANS: Button label to cancel an Instant Messaging address confirmation procedure.
+#. TRANS: Button label to cancel an IM address confirmation procedure.
 #. TRANS: Button label to cancel a SMS address confirmation procedure.
 #. TRANS: Button label in the "Edit application" form.
-#: actions/apioauthauthorize.php:478 actions/emailsettings.php:124
-#: actions/imsettings.php:127 actions/smssettings.php:133
+#: actions/apioauthauthorize.php:478 actions/emailsettings.php:125
+#: actions/imsettings.php:136 actions/smssettings.php:132
 #: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Cancel"
@@ -1039,7 +1090,7 @@ msgstr "API 메서드 발견 안 됨."
 #. TRANS: %s is the requested output format.
 #: actions/apistatusesshow.php:144
 #, fuzzy, php-format
-msgid "Unsupported format: %s"
+msgid "Unsupported format: %s."
 msgstr "지원하지 않는 형식입니다."
 
 #. TRANS: Client error displayed requesting a deleted status.
@@ -1119,13 +1170,6 @@ msgstr "%s / %s의 좋아하는 글"
 msgid "%1$s updates favorited by %2$s / %3$s."
 msgstr "%1$s님이 %2$s/%3$s의 업데이트에 답변했습니다."
 
-#. TRANS: Server error displayed when generating an Atom feed fails.
-#. TRANS: %s is the error.
-#: actions/apitimelinegroup.php:134
-#, fuzzy, php-format
-msgid "Could not generate feed for group - %s"
-msgstr "그룹을 업데이트 할 수 없습니다."
-
 #. TRANS: Title for timeline of most recent mentions of a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname.
 #: actions/apitimelinementions.php:115
@@ -1142,13 +1186,14 @@ msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr "%1$s님이 %2$s/%3$s의 업데이트에 답변했습니다."
 
 #. TRANS: Title for site timeline. %s is the StatusNet sitename.
+#. TRANS: Public RSS feed title. %s is the StatusNet site name.
 #: actions/apitimelinepublic.php:193 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "%s 공개 타임라인"
 
 #. TRANS: Subtitle for site timeline. %s is the StatusNet sitename.
-#: actions/apitimelinepublic.php:199 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:199
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "모두로부터의 업데이트 %s개!"
@@ -1160,21 +1205,33 @@ msgid "Unimplemented."
 msgstr "명령이 아직 실행되지 않았습니다."
 
 #. TRANS: Title for Atom feed "repeated to me". %s is the user nickname.
-#: actions/apitimelineretweetedtome.php:108
+#: actions/apitimelineretweetedtome.php:96
 #, fuzzy, php-format
 msgid "Repeated to %s"
 msgstr "%s에 답신"
 
+#: actions/apitimelineretweetedtome.php:98
+#, fuzzy, php-format
+msgid "%1$s notices that were to repeated to %2$s / %3$s."
+msgstr "%1$s님이 %2$s/%3$s의 업데이트에 답변했습니다."
+
 #. TRANS: Title of list of repeated notices of the logged in user.
 #. TRANS: %s is the nickname of the logged in user.
-#: actions/apitimelineretweetsofme.php:112
+#: actions/apitimelineretweetsofme.php:98
 #, fuzzy, php-format
 msgid "Repeats of %s"
 msgstr "%s에 답신"
 
+#: actions/apitimelineretweetsofme.php:104
+#, fuzzy, php-format
+msgid "%1$s notices that %2$s / %3$s has repeated."
+msgstr "누군가 내 글을 좋아하는 게시글로 추가했을 때, 메일을 보냅니다."
+
 #. TRANS: Title for timeline with lastest notices with a given tag.
 #. TRANS: %s is the tag.
-#: actions/apitimelinetag.php:101 actions/tag.php:67
+#. TRANS: Title for first page of notices with tags.
+#. TRANS: %s is the tag.
+#: actions/apitimelinetag.php:101 actions/tag.php:69
 #, php-format
 msgid "Notices tagged with %s"
 msgstr "%s 태그된 통지"
@@ -1187,54 +1244,55 @@ msgid "Updates tagged with %1$s on %2$s!"
 msgstr "%2$s에 있는 %1$s의 업데이트!"
 
 #. TRANS: Client error displayed trying to add a notice to another user's timeline.
-#: actions/apitimelineuser.php:297
+#: actions/apitimelineuser.php:308
 #, fuzzy
 msgid "Only the user can add to their own timeline."
 msgstr "오직 해당 사용자만 자신의 메일박스를 열람할 수 있습니다."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:304
+#: actions/apitimelineuser.php:315
 msgid "Only accept AtomPub for Atom feeds."
 msgstr ""
 
 #. TRANS: Client error displayed attempting to post an empty API notice.
-#: actions/apitimelineuser.php:311
+#: actions/apitimelineuser.php:322
 msgid "Atom post must not be empty."
 msgstr ""
 
 #. TRANS: Client error displayed attempting to post an API that is not well-formed XML.
-#: actions/apitimelineuser.php:317
+#: actions/apitimelineuser.php:328
 msgid "Atom post must be well-formed XML."
 msgstr ""
 
 #. TRANS: Client error displayed when not using an Atom entry.
-#: actions/apitimelineuser.php:323 actions/atompubfavoritefeed.php:228
+#: actions/apitimelineuser.php:334 actions/atompubfavoritefeed.php:228
 #: actions/atompubmembershipfeed.php:230
 #: actions/atompubsubscriptionfeed.php:236
 msgid "Atom post must be an Atom entry."
 msgstr ""
 
 #. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
-#: actions/apitimelineuser.php:335
+#: actions/apitimelineuser.php:345
 msgid "Can only handle POST activities."
 msgstr ""
 
 #. TRANS: Client error displayed when using an unsupported activity object type.
 #. TRANS: %s is the unsupported activity object type.
-#: actions/apitimelineuser.php:346
+#: actions/apitimelineuser.php:356
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
 #. TRANS: %d is the notice ID (number).
-#: actions/apitimelineuser.php:380
+#: actions/apitimelineuser.php:390
 #, fuzzy, php-format
 msgid "No content for notice %d."
 msgstr "통지들의 내용 찾기"
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:408
+#. TRANS: %s is the notice URI.
+#: actions/apitimelineuser.php:419
 #, fuzzy, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "해당 id의 프로필이 없습니다."
@@ -1251,9 +1309,10 @@ msgstr "API 메서드 발견 안 됨."
 
 #. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
 #. TRANS: Client exception.
+#. TRANS: Client error displayed trying to subscribe to a non-existing profile.
 #: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
 #: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
-#: actions/subscribe.php:107
+#: actions/subscribe.php:110
 msgid "No such profile."
 msgstr "해당하는 파일이 없습니다."
 
@@ -1400,7 +1459,7 @@ msgid "Not a member."
 msgstr "모든 회원"
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
-#: actions/atompubshowmembership.php:151
+#: actions/atompubshowmembership.php:150
 #, fuzzy
 msgid "Cannot delete someone else's membership."
 msgstr "구독을 저장할 수 없습니다."
@@ -1489,10 +1548,7 @@ msgid "Invalid size."
 msgstr "옳지 않은 크기"
 
 #. TRANS: Title for avatar upload page.
-#. TRANS: Label for group avatar (dt). Text hidden by default.
-#. TRANS: Link description in user account settings menu.
-#: actions/avatarsettings.php:66 actions/showgroup.php:227
-#: lib/accountsettingsaction.php:113
+#: actions/avatarsettings.php:66 lib/settingsnav.php:82
 msgid "Avatar"
 msgstr "아바타"
 
@@ -1505,9 +1561,11 @@ msgstr "당신의 개인 아바타를 업로드할 수 있습니다. 최대 파
 
 #. TRANS: Server error displayed in avatar upload page when no matching profile can be found for a user.
 #. TRANS: Server error displayed coming across a request from a user without a profile.
+#. TRANS: Server error displayed when trying to authorise a remote subscription request
+#. TRANS: while the user has no profile.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
 #: actions/grouplogo.php:184 actions/remotesubscribe.php:190
-#: actions/userauthorization.php:72 actions/userrss.php:108
+#: actions/userauthorization.php:75 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr "이용자가 프로필을 가지고 있지 않습니다."
 
@@ -1565,10 +1623,10 @@ msgstr "자르기"
 msgid "No file uploaded."
 msgstr "파일을 업로드하지 않았습니다."
 
-#. TRANS: Avatar upload form unstruction after uploading a file.
+#. TRANS: Avatar upload form instruction after uploading a file.
 #: actions/avatarsettings.php:345
 #, fuzzy
-msgid "Pick a square area of the image to be your avatar"
+msgid "Pick a square area of the image to be your avatar."
 msgstr "그림에서 당신의 아바타로 사용할 영역을 지정하십시오."
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
@@ -1594,7 +1652,7 @@ msgstr "아바타가 삭제되었습니다."
 
 #. TRANS: Title for backup account page.
 #. TRANS: Option in profile settings to create a backup of the account of the currently logged in user.
-#: actions/backupaccount.php:61 actions/profilesettings.php:467
+#: actions/backupaccount.php:61 actions/profilesettings.php:468
 msgid "Backup account"
 msgstr ""
 
@@ -1628,7 +1686,7 @@ msgstr "배경"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
 #: actions/backupaccount.php:254
-msgid "Backup your account"
+msgid "Backup your account."
 msgstr ""
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
@@ -1669,7 +1727,7 @@ msgstr "아니오"
 #. TRANS: Submit button title for 'No' when blocking a user.
 #: actions/block.php:158
 #, fuzzy
-msgid "Do not block this user"
+msgid "Do not block this user."
 msgstr "이용자를 차단하지 않는다."
 
 #. TRANS: Button label on the user block form.
@@ -1686,9 +1744,9 @@ msgid "Yes"
 msgstr "예"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#. TRANS: Description of the form to block a user.
-#: actions/block.php:165 lib/blockform.php:79
-msgid "Block this user"
+#: actions/block.php:165
+#, fuzzy
+msgid "Block this user."
 msgstr "이 사용자 차단하기"
 
 #. TRANS: Server error displayed when blocking a user fails.
@@ -1756,32 +1814,48 @@ msgstr "인증 코드가 없습니다."
 msgid "That confirmation code is not for you!"
 msgstr "그 인증 코드는 귀하의 것이 아닙니다!"
 
-#. TRANS: Server error for a unknow address type %s, which can be 'email', 'jabber', or 'sms'.
-#: actions/confirmaddress.php:92
+#. TRANS: Server error for an unknown address type, which can be 'email', 'sms', or the name of an IM network (such as 'xmpp' or 'aim')
+#: actions/confirmaddress.php:94
 #, fuzzy, php-format
-msgid "Unrecognized address type %s."
+msgid "Unrecognized address type %s"
 msgstr "인식되지않은 주소유형 %s"
 
 #. TRANS: Client error for an already confirmed email/jabber/sms address.
-#: actions/confirmaddress.php:97
+#: actions/confirmaddress.php:103 actions/confirmaddress.php:136
 msgid "That address has already been confirmed."
 msgstr "그 주소는 이미 승인되었습니다."
 
+#: actions/confirmaddress.php:121 actions/imsettings.php:444
+#: actions/userdesignsettings.php:306
+#, fuzzy
+msgid "Couldn't update user."
+msgstr "이용자를 업데이트 할 수 없습니다."
+
+#: actions/confirmaddress.php:144
+#, fuzzy
+msgid "Couldn't update user im preferences."
+msgstr "사용자 기록을 업데이트 할 수 없습니다."
+
+#: actions/confirmaddress.php:156
+#, fuzzy
+msgid "Couldn't insert user im preferences."
+msgstr "예약 구독을 추가 할 수 없습니다."
+
 #. TRANS: Server error displayed when an address confirmation code deletion from the
 #. TRANS: database fails in the contact address confirmation action.
-#: actions/confirmaddress.php:132
+#: actions/confirmaddress.php:169
 #, fuzzy
 msgid "Could not delete address confirmation."
 msgstr "메신저 승인을 삭제 할 수 없습니다."
 
 #. TRANS: Title for the contact address confirmation action.
-#: actions/confirmaddress.php:150
+#: actions/confirmaddress.php:185
 msgid "Confirm address"
 msgstr "주소 확인"
 
 #. TRANS: Success message for the contact address confirmation action.
 #. TRANS: %s can be 'email', 'jabber', or 'sms'.
-#: actions/confirmaddress.php:166
+#: actions/confirmaddress.php:200
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "\"%s\" 는 귀하의 계정으로 승인되었습니다."
@@ -1795,6 +1869,7 @@ msgstr "대화"
 #. TRANS: Label for user statistics.
 #: actions/conversation.php:149 lib/noticelist.php:87
 #: lib/profileaction.php:246 lib/searchgroupnav.php:82
+#: lib/threadednoticelist.php:66
 msgid "Notices"
 msgstr "통지"
 
@@ -1830,7 +1905,7 @@ msgstr "아바타가 삭제되었습니다."
 
 #. TRANS: Page title for page on which a user account can be deleted.
 #. TRANS: Option in profile settings to delete the account of the currently logged in user.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:475
+#: actions/deleteaccount.php:228 actions/profilesettings.php:476
 #, fuzzy
 msgid "Delete account"
 msgstr "새 계정 만들기"
@@ -1854,7 +1929,7 @@ msgstr ""
 #. TRANS: Field label for delete account confirmation entry.
 #. TRANS: Field label for password reset form where the password has to be typed again.
 #: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:262 actions/register.php:440
+#: actions/recoverpassword.php:262 actions/register.php:419
 msgid "Confirm"
 msgstr "인증"
 
@@ -1884,14 +1959,14 @@ msgstr "인증 코드가 없습니다."
 #. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
 #: actions/deleteapplication.php:79 actions/editapplication.php:78
-#: actions/showapplication.php:94
+#: actions/showapplication.php:90
 msgid "You are not the owner of this application."
 msgstr "이 응용프로그램 삭제 않기"
 
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
-#: actions/newapplication.php:112 actions/showapplication.php:118
-#: lib/action.php:1425
+#: actions/newapplication.php:112 actions/showapplication.php:113
+#: lib/action.php:1391
 msgid "There was a problem with your session token."
 msgstr "당신의 세션토큰관련 문제가 있습니다."
 
@@ -1912,13 +1987,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting an application.
 #: actions/deleteapplication.php:161
 #, fuzzy
-msgid "Do not delete this application"
+msgid "Do not delete this application."
 msgstr "이 응용프로그램 삭제 않기"
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
 #: actions/deleteapplication.php:167
 #, fuzzy
-msgid "Delete this application"
+msgid "Delete this application."
 msgstr "이 응용프로그램 삭제"
 
 #. TRANS: Client error when trying to delete group while not logged in.
@@ -1974,13 +2049,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting a group.
 #: actions/deletegroup.php:224
 #, fuzzy
-msgid "Do not delete this group"
+msgid "Do not delete this group."
 msgstr "이 통지를 지울 수 없습니다."
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
 #: actions/deletegroup.php:231
 #, fuzzy
-msgid "Delete this group"
+msgid "Delete this group."
 msgstr "이 사용자 삭제"
 
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
@@ -1988,14 +2063,16 @@ msgstr "이 사용자 삭제"
 #. TRANS: Client error displayed when trying to mark a notice as favorite without being logged in.
 #. TRANS: Client error displayed trying to block a user from a group while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
+#. TRANS: Client error displayed trying to log out when not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
+#. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
 #. TRANS: Client error displayed when trying to change user options while not logged in.
 #: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
-#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:69
+#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:70
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
-#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
-#: actions/tagother.php:33 actions/unsubscribe.php:52
+#: actions/nudge.php:63 actions/pluginenable.php:97 actions/subedit.php:33
+#: actions/subscribe.php:98 actions/tagother.php:33 actions/unsubscribe.php:52
 #: lib/adminpanelaction.php:71 lib/profileformaction.php:63
 #: lib/settingsaction.php:72
 msgid "Not logged in."
@@ -2024,12 +2101,13 @@ msgstr "정말로 통지를 삭제하시겠습니까?"
 #. TRANS: Submit button title for 'No' when deleting a notice.
 #: actions/deletenotice.php:159
 #, fuzzy
-msgid "Do not delete this notice"
+msgid "Do not delete this notice."
 msgstr "이 통지를 지울 수 없습니다."
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:166 lib/noticelist.php:673
-msgid "Delete this notice"
+#: actions/deletenotice.php:166
+#, fuzzy
+msgid "Delete this notice."
 msgstr "이 게시글 삭제하기"
 
 #. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
@@ -2064,18 +2142,17 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting a user.
 #: actions/deleteuser.php:158
 #, fuzzy
-msgid "Do not delete this user"
+msgid "Do not delete this user."
 msgstr "이 통지를 지울 수 없습니다."
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
-#. TRANS: Description of form for deleting a user.
-#: actions/deleteuser.php:165 lib/deleteuserform.php:75
-msgid "Delete this user"
+#: actions/deleteuser.php:165
+#, fuzzy
+msgid "Delete this user."
 msgstr "이 사용자 삭제"
 
 #. TRANS: Message used as title for design settings for the site.
-#. TRANS: Link description in user account settings menu.
-#: actions/designadminpanel.php:60 lib/accountsettingsaction.php:134
+#: actions/designadminpanel.php:60 lib/settingsnav.php:97
 msgid "Design"
 msgstr "디자인"
 
@@ -2144,8 +2221,7 @@ msgid "You can upload a custom StatusNet theme as a .ZIP archive."
 msgstr ""
 
 #. TRANS: Fieldset legend for theme background image.
-#. TRANS: Fieldset legend on profile design page.
-#: actions/designadminpanel.php:515 lib/designsettings.php:98
+#: actions/designadminpanel.php:515
 msgid "Change background image"
 msgstr "배경 이미지 바꾸기"
 
@@ -2153,7 +2229,7 @@ msgstr "배경 이미지 바꾸기"
 #. TRANS: Field label for background color selector.
 #. TRANS: Label on profile design page for setting a profile page background colour.
 #: actions/designadminpanel.php:525 actions/designadminpanel.php:609
-#: lib/designsettings.php:183
+#: lib/designform.php:238
 msgid "Background"
 msgstr "배경"
 
@@ -2179,13 +2255,13 @@ msgstr "끄기"
 #. TRANS: Form guide for turning background image on or off on theme designer page.
 #. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
 #. TRANS: use of the uploaded profile image.
-#: actions/designadminpanel.php:577 lib/designsettings.php:159
+#: actions/designadminpanel.php:577 lib/designform.php:214
 msgid "Turn background image on or off."
 msgstr "배경 이미지를 켜거나 끈다."
 
 #. TRANS: Checkbox label to title background image on theme designer page.
 #. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-#: actions/designadminpanel.php:583 lib/designsettings.php:165
+#: actions/designadminpanel.php:583 lib/designform.php:220
 msgid "Tile background image"
 msgstr "배경 이미지를 반복 나열"
 
@@ -2197,25 +2273,25 @@ msgstr "색상 변경"
 
 #. TRANS: Field label for content color selector.
 #. TRANS: Label on profile design page for setting a profile page content colour.
-#: actions/designadminpanel.php:623 lib/designsettings.php:197
+#: actions/designadminpanel.php:623 lib/designform.php:252
 msgid "Content"
 msgstr "만족하는"
 
 #. TRANS: Field label for sidebar color selector.
 #. TRANS: Label on profile design page for setting a profile page sidebar colour.
-#: actions/designadminpanel.php:637 lib/designsettings.php:211
+#: actions/designadminpanel.php:637 lib/designform.php:266
 msgid "Sidebar"
 msgstr "가장자리 창"
 
 #. TRANS: Field label for text color selector.
 #. TRANS: Label on profile design page for setting a profile page text colour.
-#: actions/designadminpanel.php:651 lib/designsettings.php:225
+#: actions/designadminpanel.php:651 lib/designform.php:280
 msgid "Text"
 msgstr "문자"
 
 #. TRANS: Field label for link color selector.
 #. TRANS: Label on profile design page for setting a profile page links colour.
-#: actions/designadminpanel.php:665 lib/designsettings.php:239
+#: actions/designadminpanel.php:665 lib/designform.php:294
 msgid "Links"
 msgstr "링크"
 
@@ -2237,21 +2313,20 @@ msgid "Use defaults"
 msgstr "기본값 사용"
 
 #. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: actions/designadminpanel.php:720 lib/designsettings.php:259
-msgid "Restore default designs"
-msgstr ""
+#: actions/designadminpanel.php:720
+#, fuzzy
+msgid "Restore default designs."
+msgstr "기본값 사용"
 
 #. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: actions/designadminpanel.php:728 lib/designsettings.php:267
-msgid "Reset back to default"
+#: actions/designadminpanel.php:728
+msgid "Reset back to default."
 msgstr ""
 
 #. TRANS: Title for button for saving theme settings.
-#. TRANS: Title for button on profile design page to save settings.
-#: actions/designadminpanel.php:736 lib/designsettings.php:272
-msgid "Save design"
+#: actions/designadminpanel.php:736
+#, fuzzy
+msgid "Save design."
 msgstr "디자인 저장"
 
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
@@ -2283,7 +2358,7 @@ msgid "You must be logged in to edit an application."
 msgstr "응용 프로그램 수정을 위해서는 로그인해야 합니다."
 
 #. TRANS: Client error displayed trying to edit an application that does not exist.
-#: actions/editapplication.php:83 actions/showapplication.php:87
+#: actions/editapplication.php:83 actions/showapplication.php:83
 msgid "No such application."
 msgstr "신규 응용 프로그램"
 
@@ -2378,80 +2453,53 @@ msgstr "%s 그룹 편집"
 msgid "You must be logged in to create a group."
 msgstr "그룹을 만들기 위해서는 로그인해야 합니다."
 
-#. TRANS: Client error displayed trying to edit a group while not being a group admin.
-#. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
-#. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
-#: actions/editgroup.php:110 actions/editgroup.php:176
-#: actions/groupdesignsettings.php:109 actions/grouplogo.php:111
-msgid "You must be an admin to edit the group."
-msgstr "관리자만 그룹을 편집할 수 있습니다."
-
 #. TRANS: Form instructions for group edit form.
 #: actions/editgroup.php:161
 msgid "Use this form to edit the group."
 msgstr "다음 양식을 이용해 그룹을 편집하십시오."
 
-#. TRANS: Group edit form validation error.
-#. TRANS: Group create form validation error.
-#. TRANS: %s is the invalid alias.
-#: actions/editgroup.php:241 actions/newgroup.php:188
-#, php-format
-msgid "Invalid alias: \"%s\""
-msgstr "사용할 수 없는 별명 : \"%s\""
-
-#. TRANS: Server error displayed when editing a group fails.
-#: actions/editgroup.php:274
-msgid "Could not update group."
-msgstr "그룹을 업데이트 할 수 없습니다."
-
-#. TRANS: Server error displayed when group aliases could not be added.
-#. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/editgroup.php:281 classes/User_group.php:540
-msgid "Could not create aliases."
-msgstr "관심소식을 생성할 수 없습니다."
-
 #. TRANS: Group edit form success message.
 #: actions/editgroup.php:301
 msgid "Options saved."
 msgstr "옵션을 저장했습니다."
 
 #. TRANS: Title for e-mail settings.
-#: actions/emailsettings.php:59
+#: actions/emailsettings.php:60
 msgid "Email settings"
 msgstr "메일 설정"
 
 #. TRANS: E-mail settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/emailsettings.php:73
+#: actions/emailsettings.php:74
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 msgstr "%%site.name%%에서 어떻게 메일을 받을지 정하십시오."
 
 #. TRANS: Form legend for e-mail settings form.
 #. TRANS: Field label for e-mail address input in e-mail settings form.
-#: actions/emailsettings.php:103 actions/emailsettings.php:129
+#: actions/emailsettings.php:104 actions/emailsettings.php:130
 msgid "Email address"
 msgstr "메일 주소"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:109
+#: actions/emailsettings.php:110
 msgid "Current confirmed email address."
 msgstr "확인된 최신의 메일 계정"
 
 #. TRANS: Button label to remove a confirmed e-mail address.
 #. TRANS: Button label for removing a set sender e-mail address to post notices from.
-#. TRANS: Button label to remove a confirmed Instant Messaging address.
+#. TRANS: Button label to remove a confirmed IM address.
 #. TRANS: Button label to remove a confirmed SMS address.
 #. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
-#: actions/emailsettings.php:112 actions/emailsettings.php:179
-#: actions/imsettings.php:112 actions/smssettings.php:120
-#: actions/smssettings.php:176
+#: actions/emailsettings.php:113 actions/emailsettings.php:180
+#: actions/imsettings.php:119 actions/smssettings.php:119
+#: actions/smssettings.php:175
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "제거"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:119
+#: actions/emailsettings.php:120
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -2464,44 +2512,44 @@ msgstr ""
 #. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
 #. TRANS: Any other domain may be owned by a legitimate person or
 #. TRANS: organization.
-#: actions/emailsettings.php:136
+#: actions/emailsettings.php:137
 msgid "Email address, like \"UserName@example.org\""
 msgstr "\"사용자이름@예제.org\"와 같은 메일 계정"
 
 #. TRANS: Button label for adding an e-mail address in e-mail settings form.
-#. TRANS: Button label for adding an Instant Messaging address in Instant Messaging settings form.
+#. TRANS: Button label for adding an IM address in IM settings form.
 #. TRANS: Button label for adding a SMS phone number in SMS settings form.
-#: actions/emailsettings.php:140 actions/imsettings.php:147
-#: actions/smssettings.php:158
+#: actions/emailsettings.php:141 actions/imsettings.php:147
+#: actions/smssettings.php:157
 msgctxt "BUTTON"
 msgid "Add"
 msgstr "추가"
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:148 actions/smssettings.php:167
+#: actions/emailsettings.php:149 actions/smssettings.php:166
 msgid "Incoming email"
 msgstr "받은 메일"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:154
+#: actions/emailsettings.php:155
 msgid "I want to post notices by email."
 msgstr "메일로 통보를 포스트합니다."
 
 #. TRANS: Form instructions for incoming e-mail form in e-mail settings.
 #. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
-#: actions/emailsettings.php:176 actions/smssettings.php:174
+#: actions/emailsettings.php:177 actions/smssettings.php:173
 msgid "Send email to this address to post new notices."
 msgstr "새로운 통지를 올리려면 이 주소로 메일을 보내십시오."
 
 #. TRANS: Instructions for incoming e-mail address input form, when an address has already been assigned.
 #. TRANS: Instructions for incoming SMS e-mail address input form.
-#: actions/emailsettings.php:185 actions/smssettings.php:182
+#: actions/emailsettings.php:186 actions/smssettings.php:181
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr "포스팅을 위한 새 메일 계정의 생성; 전 메일 계정은 취소."
 
 #. TRANS: Instructions for incoming e-mail address input form.
-#: actions/emailsettings.php:189
+#: actions/emailsettings.php:190
 msgid ""
 "To send notices via email, we need to create a unique email address for you "
 "on this server:"
@@ -2509,89 +2557,89 @@ msgstr ""
 
 #. TRANS: Button label for adding an e-mail address to send notices from.
 #. TRANS: Button label for adding an SMS e-mail address to send notices from.
-#: actions/emailsettings.php:195 actions/smssettings.php:185
+#: actions/emailsettings.php:196 actions/smssettings.php:184
 msgctxt "BUTTON"
 msgid "New"
 msgstr "새 게임"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:204
+#: actions/emailsettings.php:205
 msgid "Email preferences"
 msgstr "메일 설정"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:212
+#: actions/emailsettings.php:213
 msgid "Send me notices of new subscriptions through email."
 msgstr "새로운 예약 구독의 통지를 메일로 보내주세요."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:218
+#: actions/emailsettings.php:219
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr "누군가 내 글을 좋아하는 게시글로 추가했을 때, 메일을 보냅니다."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:225
+#: actions/emailsettings.php:226
 msgid "Send me email when someone sends me a private message."
 msgstr "누군가 내게 비밀메시지를 보냈을 때, 메일을 보냅니다."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:231
+#: actions/emailsettings.php:232
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr "누군가 내게 @ 답장을 보냈을 때, 메일을 보냅니다."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:237
+#: actions/emailsettings.php:238
 msgid "Allow friends to nudge me and send me an email."
 msgstr "친구들이 내게 메일이나 쪽지를 보낼 수 있도록 허용합니다."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:243
+#: actions/emailsettings.php:244
 msgid "Publish a MicroID for my email address."
 msgstr "메일 주소를 위한 MicroID의 생성"
 
 #. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:361
+#: actions/emailsettings.php:362
 msgid "Email preferences saved."
 msgstr "메일 설정이 저장되었습니다."
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:380
+#: actions/emailsettings.php:381
 msgid "No email address."
 msgstr "메일 주소가 없습니다."
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:388
+#: actions/emailsettings.php:389
 #, fuzzy
 msgid "Cannot normalize that email address."
 msgstr "메일 주소를 정규화 할 수 없습니다."
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:393 actions/register.php:212
+#: actions/emailsettings.php:394 actions/register.php:197
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "올바른 메일 주소가 아닙니다."
 
 #. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:397
+#: actions/emailsettings.php:398
 msgid "That is already your email address."
 msgstr "그 메일 주소는 이미 귀하의 것입니다."
 
 #. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:401
+#: actions/emailsettings.php:402
 msgid "That email address already belongs to another user."
 msgstr "그 메일 주소는 이미 다른 사용자의 소유입니다."
 
 #. TRANS: Server error thrown on database error adding e-mail confirmation code.
 #. TRANS: Server error thrown on database error adding Instant Messaging confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:418 actions/imsettings.php:343
-#: actions/smssettings.php:365
+#: actions/emailsettings.php:419 actions/imsettings.php:362
+#: actions/smssettings.php:364
 #, fuzzy
 msgid "Could not insert confirmation code."
 msgstr "확인 코드를 추가 할 수 없습니다."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:425
+#: actions/emailsettings.php:426
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
@@ -2602,60 +2650,63 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling Instant Messaging address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:445 actions/imsettings.php:377
-#: actions/smssettings.php:399
+#: actions/emailsettings.php:446 actions/imsettings.php:391
+#: actions/smssettings.php:398
 msgid "No pending confirmation to cancel."
 msgstr "취소 할 대기중인 인증이 없습니다."
 
 #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:450
+#: actions/emailsettings.php:451
 #, fuzzy
 msgid "That is the wrong email address."
 msgstr "옳지 않은 메신저 계정 입니다."
 
 #. TRANS: Server error thrown on database error canceling e-mail address confirmation.
 #. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
-#: actions/emailsettings.php:459 actions/smssettings.php:413
+#: actions/emailsettings.php:460 actions/smssettings.php:412
 #, fuzzy
 msgid "Could not delete email confirmation."
 msgstr "메일 승인을 삭제 할 수 없습니다."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:464
+#: actions/emailsettings.php:465
 msgid "Email confirmation cancelled."
 msgstr "취소 할 대기중인 인증이 없습니다."
 
 #. TRANS: Message given trying to remove an e-mail address that is not
 #. TRANS: registered for the active user.
-#: actions/emailsettings.php:483
+#: actions/emailsettings.php:484
 msgid "That is not your email address."
 msgstr "그 메일 주소는 귀하의 것이 아닙니다."
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:504
+#: actions/emailsettings.php:505
 msgid "The email address was removed."
 msgstr "메일 주소를 지웠습니다."
 
 #. TRANS: Form validation error displayed when trying to remove an incoming e-mail address while no address has been set.
-#: actions/emailsettings.php:518 actions/smssettings.php:555
+#: actions/emailsettings.php:519 actions/smssettings.php:554
 msgid "No incoming email address."
 msgstr "받는 메일 주소가 없습니다."
 
 #. TRANS: Server error thrown on database error removing incoming e-mail address.
 #. TRANS: Server error thrown on database error adding incoming e-mail address.
-#: actions/emailsettings.php:530 actions/emailsettings.php:554
-#: actions/smssettings.php:565 actions/smssettings.php:588
+#. TRANS: Server error displayed when the user could not be updated in SMS settings.
+#: actions/emailsettings.php:531 actions/emailsettings.php:555
+#: actions/smssettings.php:565 actions/smssettings.php:590
 #, fuzzy
 msgid "Could not update user record."
 msgstr "사용자 기록을 업데이트 할 수 없습니다."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:534 actions/smssettings.php:568
+#. TRANS: Confirmation text after updating SMS settings.
+#: actions/emailsettings.php:535 actions/smssettings.php:569
 msgid "Incoming email address removed."
 msgstr "받는 메일 주소를 지웠습니다."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:558 actions/smssettings.php:591
+#. TRANS: Confirmation text after updating SMS settings.
+#: actions/emailsettings.php:559 actions/smssettings.php:594
 msgid "New incoming email address added."
 msgstr "새로운 받는 메일 주소를 추가했습니다."
 
@@ -2667,7 +2718,7 @@ msgstr "이 게시글은 이미 좋아하는 게시글입니다."
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
 #: actions/favor.php:95
 #, fuzzy
-msgid "Disfavor favorite"
+msgid "Disfavor favorite."
 msgstr "좋아하는글 취소"
 
 #. TRANS: Page title for first page of favorited notices.
@@ -2714,9 +2765,8 @@ msgstr ""
 #. TRANS: %s is a user's nickname.
 #. TRANS: Title for first page of favourite notices of a user.
 #. TRANS: %s is the user for whom the favourite notices are displayed.
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing own favourited notices.
 #: actions/favoritesrss.php:111 actions/showfavorites.php:76
-#: lib/personalgroupnav.php:122
+#: lib/personalgroupnav.php:110
 #, php-format
 msgid "%s's favorite notices"
 msgstr "%s 님의 좋아하는 글"
@@ -2908,13 +2958,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
 #: actions/groupblock.php:191
 #, fuzzy
-msgid "Do not block this user from this group"
+msgid "Do not block this user from this group."
 msgstr "이용자를 차단하지 않는다."
 
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
 #: actions/groupblock.php:198
 #, fuzzy
-msgid "Block this user from this group"
+msgid "Block this user from this group."
 msgstr "그룹 이용자는 차단해제"
 
 #. TRANS: Server error displayed when trying to block a user from a group fails because of an application error.
@@ -2924,6 +2974,7 @@ msgid "Database error blocking user from group."
 msgstr "그룹 이용자는 차단해제"
 
 #. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
+#. TRANS: Client error displayed trying to find a user by ID without providing an ID.
 #: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr "ID가 없습니다."
@@ -2953,7 +3004,7 @@ msgid "Unable to update your design settings."
 msgstr "디자인 설정을 저장할 수 없습니다."
 
 #. TRANS: Form text to confirm saved group design settings.
-#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:222
+#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:239
 msgid "Design preferences saved."
 msgstr "메일 설정이 저장되었습니다."
 
@@ -3017,7 +3068,7 @@ msgid "A list of the users in this group."
 msgstr "이 그룹의 회원리스트"
 
 #. TRANS: Indicator in group members list that this user is a group administrator.
-#: actions/groupmembers.php:190
+#: actions/groupmembers.php:190 lib/action.php:581
 msgid "Admin"
 msgstr "관리자"
 
@@ -3105,8 +3156,10 @@ msgid "Group search"
 msgstr "그룹 찾기"
 
 #. TRANS: Text on page where groups can be searched if no results were found for a query.
-#: actions/groupsearch.php:82 actions/noticesearch.php:117
-#: actions/peoplesearch.php:83
+#. TRANS: Text for notice search results is the query had no results.
+#. TRANS: Message on the "People search" page where a query has no results.
+#: actions/groupsearch.php:82 actions/noticesearch.php:122
+#: actions/peoplesearch.php:87
 msgid "No results."
 msgstr "결과 없음"
 
@@ -3139,166 +3192,169 @@ msgid "User is not blocked from group."
 msgstr "그룹 이용자는 차단해제"
 
 #. TRANS: Server error displayed when unblocking a user from a group fails because of an unknown error.
+#. TRANS: Server error displayed when removing a user block.
 #: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "차단 제거 에러!"
 
 #. TRANS: Title for Instant Messaging settings.
-#: actions/imsettings.php:58
+#: actions/imsettings.php:56
 msgid "IM settings"
 msgstr "메일 설정"
 
 #. 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.
-#: actions/imsettings.php:71
+#: actions/imsettings.php:69
 #, fuzzy, php-format
 msgid ""
-"You can send and receive notices through Jabber/Google Talk [instant "
-"messages](%%doc.im%%). Configure your address and settings below."
+"You can send and receive notices through instant messaging [instant messages]"
+"(%%doc.im%%). Configure your addresses and settings below."
 msgstr ""
 "당신은 Jabber나 구글토크(%%doc.im%%)를 통해 메시지를 주고받을 수 있습니다. 아"
 "래 당신의 주소와 환경설정을 조정하세요."
 
-#. TRANS: Message given in the Instant Messaging settings if XMPP is not enabled on the site.
+#. TRANS: Message given in the IM settings if IM is not enabled on the site.
 #: actions/imsettings.php:90
 msgid "IM is not available."
 msgstr "인스턴트 메신저를 사용할 수 없습니다."
 
-#. TRANS: Form legend for Instant Messaging settings form.
-#. TRANS: Field label for Instant Messaging address input in Instant Messaging settings form.
-#: actions/imsettings.php:102 actions/imsettings.php:132
-msgid "IM address"
-msgstr "SMS 주소"
+#: actions/imsettings.php:116
+#, fuzzy, php-format
+msgid "Current confirmed %s address."
+msgstr "확인된 최신의 메일 계정"
 
-#: actions/imsettings.php:109
-#, fuzzy
-msgid "Current confirmed Jabber/Google Talk address."
-msgstr "확인된 최신의 Jabber/GTalk 계정"
-
-#. TRANS: Form note in Instant Messaging settings form.
-#. TRANS: %s is the Instant Messaging address set for the site.
-#: actions/imsettings.php:120
+#. TRANS: Form note in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:128
 #, fuzzy, php-format
 msgid ""
-"Awaiting confirmation on this address. Check your Jabber/Google Talk account "
-"for a message with further instructions. (Did you add %s to your buddy list?)"
+"Awaiting confirmation on this address. Check your %s account for a message "
+"with further instructions. (Did you add %s to your buddy list?)"
 msgstr ""
 "이 주소는 인증 대기 중입니다. Jabber/Gtalk로 메시지를 확인해 주십시오.(%s 항"
 "목을 추가하셨습니까?)"
 
-#. TRANS: IM address input field instructions in Instant Messaging settings form.
-#. TRANS: %s is the Instant Messaging address set for the site.
-#. TRANS: Do not translate "example.org". It is one of the domain names reserved for use in examples by
-#. TRANS: http://www.rfc-editor.org/rfc/rfc2606.txt. Any other domain may be owned by a legitimate
-#. TRANS: person or organization.
-#: actions/imsettings.php:139
-#, fuzzy, php-format
-msgid ""
-"Jabber or Google Talk address, like \"UserName@example.org\". First, make "
-"sure to add %s to your buddy list in your IM client or on Google Talk."
-msgstr ""
-"\"UserName@example.org\" 와 같은 Jabber 또는 GTalk 계정은 귀하의 메신저나 "
-"GTalk 친구목록에 반드시 %s 주소를 추가하여 주십시오."
+#: actions/imsettings.php:140
+msgid "IM address"
+msgstr "SMS 주소"
 
-#. TRANS: Form legend for Instant Messaging preferences form.
-#: actions/imsettings.php:154
-msgid "IM preferences"
+#: actions/imsettings.php:142
+#, php-format
+msgid "%s screenname."
+msgstr ""
+
+#. TRANS: Header for IM preferences form.
+#: actions/imsettings.php:163
+#, fuzzy
+msgid "IM Preferences"
 msgstr "메일 설정"
 
-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:159
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:174
 #, fuzzy
-msgid "Send me notices through Jabber/Google Talk."
-msgstr "Jabber/GTalk 로 통지를 보내주세요."
+msgid "Send me notices"
+msgstr "게시글 보내기"
 
-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:165
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:176
 #, fuzzy
-msgid "Post a notice when my Jabber/Google Talk status changes."
+msgid "Post a notice when my status changes."
 msgstr "Jabber/GTalk의 상태가 변경되었을 때 통지를 보냅니다."
 
-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:171
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:178
 #, fuzzy
-msgid ""
-"Send me replies through Jabber/Google Talk from people I'm not subscribed to."
+msgid "Send me replies from people I'm not subscribed to."
 msgstr ""
 "내가 구독하지 않는 사람으로 부터의 답장을  Jabber/GTalk을 통해 보내주세요."
 
-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:178
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:181
 #, fuzzy
-msgid "Publish a MicroID for my Jabber/Google Talk address."
-msgstr "Jabber/GTalk 계정을 위한 MicroID의 생성"
+msgid "Publish a MicroID"
+msgstr "메일 주소를 위한 MicroID의 생성"
 
-#. TRANS: Confirmation message for successful Instant Messaging preferences save.
-#: actions/imsettings.php:283 actions/othersettings.php:192
+#. TRANS: Server error thrown on database error updating IM preferences.
+#: actions/imsettings.php:291
+#, fuzzy
+msgid "Couldn't update IM preferences."
+msgstr "이용자를 업데이트 할 수 없습니다."
+
+#. TRANS: Confirmation message for successful IM preferences save.
+#. TRANS: Confirmation message after saving preferences.
+#: actions/imsettings.php:298 actions/urlsettings.php:244
 msgid "Preferences saved."
 msgstr "설정이 저장되었습니다."
 
-#. TRANS: Message given saving Instant Messaging address without having provided one.
-#: actions/imsettings.php:304
-msgid "No Jabber ID."
-msgstr "Jabber ID가 아닙니다."
-
-#. TRANS: Message given saving Instant Messaging address that cannot be normalised.
-#: actions/imsettings.php:312
+#. TRANS: Message given saving IM address without having provided one.
+#: actions/imsettings.php:320
 #, fuzzy
-msgid "Cannot normalize that Jabber ID."
+msgid "No screenname."
+msgstr "별명이 없습니다."
+
+#: actions/imsettings.php:325
+#, fuzzy
+msgid "No transport."
+msgstr "그러한 통지는 없습니다."
+
+#. TRANS: Message given saving IM address that cannot be normalised.
+#: actions/imsettings.php:333
+#, fuzzy
+msgid "Cannot normalize that screenname"
 msgstr "그 Jabbar ID를 정규화 할 수 없습니다."
 
-#. TRANS: Message given saving Instant Messaging address that not valid.
-#: actions/imsettings.php:317
+#. TRANS: Message given saving IM address that not valid.
+#: actions/imsettings.php:340
 #, fuzzy
-msgid "Not a valid Jabber ID."
-msgstr "유효한 Jabber ID가 아닙니다."
+msgid "Not a valid screenname"
+msgstr "유효한 별명이 아닙니다"
 
-#. TRANS: Message given saving Instant Messaging address that is already set.
-#: actions/imsettings.php:321
-msgid "That is already your Jabber ID."
-msgstr "그 Jabber ID는 이미 귀하의 것입니다."
-
-#. TRANS: Message given saving Instant Messaging address that is already set for another user.
-#: actions/imsettings.php:325
-msgid "Jabber ID already belongs to another user."
+#. TRANS: Message given saving IM address that is already set for another user.
+#: actions/imsettings.php:344
+#, fuzzy
+msgid "Screenname already belongs to another user."
 msgstr "Jabber ID가 이미 다른 사용자에 의하여 사용되고 있습니다."
 
-#. TRANS: Message given saving valid Instant Messaging address that is to be confirmed.
-#. TRANS: %s is the Instant Messaging address set for the site.
-#: actions/imsettings.php:353
-#, php-format
-msgid ""
-"A confirmation code was sent to the IM address you added. You must approve %"
-"s for sending messages to you."
+#. TRANS: Message given saving valid IM address that is to be confirmed.
+#: actions/imsettings.php:369
+#, fuzzy
+msgid "A confirmation code was sent to the IM address you added."
 msgstr ""
 "추가한 메신저 주소로 인증 코드를 보냈습니다. %s 사용자를 허락해야 메시지를 전"
 "달할 수 있습니다."
 
-#. TRANS: Message given canceling Instant Messaging address confirmation for the wrong IM address.
-#: actions/imsettings.php:382
+#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#: actions/imsettings.php:396
 msgid "That is the wrong IM address."
 msgstr "옳지 않은 메신저 계정 입니다."
 
-#. TRANS: Server error thrown on database error canceling Instant Messaging address confirmation.
-#: actions/imsettings.php:391
+#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#: actions/imsettings.php:405
 #, fuzzy
-msgid "Could not delete IM confirmation."
+msgid "Couldn't delete confirmation."
 msgstr "메신저 승인을 삭제 할 수 없습니다."
 
-#. TRANS: Message given after successfully canceling Instant Messaging address confirmation.
-#: actions/imsettings.php:396
+#. TRANS: Message given after successfully canceling IM address confirmation.
+#: actions/imsettings.php:410
 msgid "IM confirmation cancelled."
 msgstr "확인 코드가 없습니다."
 
-#. TRANS: Message given trying to remove an Instant Messaging address that is not
+#. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.
-#: actions/imsettings.php:417
-msgid "That is not your Jabber ID."
-msgstr "그 Jabber ID는 귀하의 것이 아닙니다."
+#: actions/imsettings.php:434
+#, fuzzy
+msgid "That is not your screenname."
+msgstr "그 휴대폰 번호는 귀하의 것이 아닙니다."
+
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#: actions/imsettings.php:443
+#, fuzzy
+msgid "Couldn't update user im prefs."
+msgstr "사용자 기록을 업데이트 할 수 없습니다."
 
 #. TRANS: Message given after successfully removing a registered Instant Messaging address.
-#: actions/imsettings.php:440
+#: actions/imsettings.php:451
 msgid "The IM address was removed."
 msgstr "메일 주소를 지웠습니다."
 
@@ -3502,7 +3558,7 @@ msgid "You must be logged in to join a group."
 msgstr "그룹가입을 위해서는 로그인이 필요합니다."
 
 #. TRANS: Title for join group page after joining.
-#: actions/joingroup.php:147
+#: actions/joingroup.php:148
 #, fuzzy, php-format
 msgctxt "TITLE"
 msgid "%1$s joined group %2$s"
@@ -3631,7 +3687,7 @@ msgstr ""
 #. TRANS: Submit button title.
 #: actions/licenseadminpanel.php:311 actions/sessionsadminpanel.php:199
 #: actions/siteadminpanel.php:292 actions/snapshotadminpanel.php:245
-#: actions/tagother.php:154 lib/applicationeditform.php:357
+#: actions/tagother.php:133 lib/applicationeditform.php:357
 msgid "Save"
 msgstr "저장"
 
@@ -3639,51 +3695,53 @@ msgstr "저장"
 msgid "Save license settings"
 msgstr ""
 
-#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
+#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
+#: actions/login.php:97 actions/otp.php:62 actions/register.php:130
 msgid "Already logged in."
 msgstr "이미 로그인 하셨습니다."
 
-#: actions/login.php:148
+#: actions/login.php:125
 msgid "Incorrect username or password."
 msgstr "틀린 계정 또는 비밀 번호"
 
-#: actions/login.php:154 actions/otp.php:120
+#. TRANS: Server error displayed when a user object could not be created trying to login using "one time password login".
+#: actions/login.php:131 actions/otp.php:127
 msgid "Error setting user. You are probably not authorized."
 msgstr "당신은 이 프로필에 구독되지 않고있습니다."
 
-#: actions/login.php:210 actions/login.php:263
+#: actions/login.php:185 actions/login.php:236 lib/action.php:598
 msgid "Login"
 msgstr "로그인"
 
-#: actions/login.php:249
+#: actions/login.php:222
 msgid "Login to site"
 msgstr "사이트에 로그인하세요."
 
-#: actions/login.php:258 actions/register.php:490
+#: actions/login.php:231 actions/register.php:469
 msgid "Remember me"
 msgstr "자동 로그인"
 
-#: actions/login.php:259 actions/register.php:492
+#: actions/login.php:232 actions/register.php:471
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "앞으로는 자동으로 로그인합니다. 공용 컴퓨터에서는 이용하지 마십시오!"
 
-#: actions/login.php:269
+#: actions/login.php:241
 msgid "Lost or forgotten password?"
 msgstr "비밀 번호를 잊으셨나요?"
 
-#: actions/login.php:288
+#: actions/login.php:259
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
 msgstr ""
 "보안을 위해 세팅을 저장하기 전에 계정과 비밀 번호를 다시 입력 해 주십시오."
 
-#: actions/login.php:292
+#: actions/login.php:263
 #, fuzzy
 msgid "Login with your username and password."
 msgstr "사용자 이름과 비밀번호로 로그인"
 
-#: actions/login.php:295
+#: actions/login.php:266
 #, fuzzy, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -3813,7 +3871,9 @@ msgstr "새로운 통지"
 msgid "Notice posted"
 msgstr "게시글이 등록되었습니다."
 
-#: actions/noticesearch.php:68
+#. TRANS: Instructions for Notice search page.
+#. TRANS: %%site.name%% is the name of the StatusNet site.
+#: actions/noticesearch.php:69
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -3822,37 +3882,47 @@ msgstr ""
 "%%site.name%%의 글 내용을 검색합니다. 검색어는 공백으로 구분하고, 적어도 3글"
 "자 이상 필요합니다."
 
-#: actions/noticesearch.php:78
+#. TRANS: Title of the page where users can search for notices.
+#: actions/noticesearch.php:80
 msgid "Text search"
 msgstr "문자 검색"
 
-#: actions/noticesearch.php:91
+#. TRANS: Test in RSS notice search.
+#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
+#: actions/noticesearch.php:95
 #, php-format
 msgid "Search results for \"%1$s\" on %2$s"
 msgstr "%1$s에서 %2$s까지 메시지"
 
-#: actions/noticesearch.php:121
+#. TRANS: Text for logged in users making a query for notices without results.
+#. TRANS: This message contains a Markdown link.
+#: actions/noticesearch.php:128
 #, php-format
 msgid ""
 "Be the first to [post on this topic](%%%%action.newnotice%%%%?"
 "status_textarea=%s)!"
 msgstr ""
 
-#: actions/noticesearch.php:124
+#. TRANS: Text for not logged in users making a query for notices without results.
+#. TRANS: This message contains Markdown links.
+#: actions/noticesearch.php:133
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and be the first to "
 "[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
 msgstr ""
 
-#: actions/noticesearchrss.php:96
+#. TRANS: RSS notice search feed title. %s is the query.
+#: actions/noticesearchrss.php:95
 #, fuzzy, php-format
 msgid "Updates with \"%s\""
 msgstr "%2$s에 있는 %1$s의 업데이트!"
 
-#: actions/noticesearchrss.php:98
+#. TRANS: RSS notice search feed description.
+#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
+#: actions/noticesearchrss.php:99
 #, fuzzy, php-format
-msgid "Updates matching search term \"%1$s\" on %2$s!"
+msgid "Updates matching search term \"%1$s\" on %2$s."
 msgstr "%2$s에 있는 %1$s의 업데이트!"
 
 #: actions/nudge.php:85
@@ -3872,52 +3942,52 @@ msgid "Nudge sent!"
 msgstr "찔러 보기를 보냈습니다!"
 
 #. TRANS: Message displayed to an anonymous user trying to view OAuth application list.
-#: actions/oauthappssettings.php:60
+#: actions/oauthappssettings.php:57
 msgid "You must be logged in to list your applications."
 msgstr "응용 프로그램 수정을 위해서는 로그인해야 합니다."
 
 #. TRANS: Page title for OAuth applications
-#: actions/oauthappssettings.php:76
+#: actions/oauthappssettings.php:73
 msgid "OAuth applications"
 msgstr "응용프로그램 삭제"
 
 #. TRANS: Page instructions for OAuth applications
-#: actions/oauthappssettings.php:88
+#: actions/oauthappssettings.php:85
 msgid "Applications you have registered"
 msgstr ""
 
 #. TRANS: Empty list message on page with OAuth applications.
-#: actions/oauthappssettings.php:141
+#: actions/oauthappssettings.php:138
 #, fuzzy, php-format
 msgid "You have not registered any applications yet."
 msgstr "응용 프로그램 수정을 위해서는 로그인해야 합니다."
 
 #. TRANS: Title for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:71
+#: actions/oauthconnectionssettings.php:69
 msgid "Connected applications"
 msgstr "연결한 응용프로그램"
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:83
+#: actions/oauthconnectionssettings.php:80
 msgid "The following connections exist for your account."
 msgstr ""
 
 #. TRANS: Client error when trying to revoke access for an application while not being a user of it.
-#: actions/oauthconnectionssettings.php:168
+#: actions/oauthconnectionssettings.php:165
 #, fuzzy
 msgid "You are not a user of that application."
 msgstr "당신은 해당 그룹의 멤버가 아닙니다."
 
 #. TRANS: Client error when revoking access has failed for some reason.
 #. TRANS: %s is the application ID revoking access failed for.
-#: actions/oauthconnectionssettings.php:183
+#: actions/oauthconnectionssettings.php:180
 #, fuzzy, php-format
 msgid "Unable to revoke access for application: %s."
 msgstr "다음 양식을 이용해 그룹을 편집하십시오."
 
 #. TRANS: Success message after revoking access for an application.
 #. TRANS: %1$s is the application name, %2$s is the first part of the user token.
-#: actions/oauthconnectionssettings.php:202
+#: actions/oauthconnectionssettings.php:199
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -3925,20 +3995,30 @@ msgid ""
 msgstr ""
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:213
+#: actions/oauthconnectionssettings.php:210
 msgid "You have not authorized any applications to use your account."
 msgstr "계정에서 사용하도록 허용한 응용 프로그램이 없습니다."
 
 #. TRANS: Note for developers in the OAuth connection settings form.
 #. TRANS: This message contains a Markdown link. Do not separate "](".
 #. TRANS: %s is the URL to the OAuth settings.
-#: actions/oauthconnectionssettings.php:233
+#: actions/oauthconnectionssettings.php:230
 #, php-format
 msgid ""
 "Are you a developer? [Register an OAuth client application](%s) to use with "
 "this instance of StatusNet."
 msgstr ""
 
+#: actions/oembed.php:64
+#, fuzzy, php-format
+msgid "\"%s\" not found."
+msgstr "API 메서드 발견 안 됨."
+
+#: actions/oembed.php:76
+#, fuzzy, php-format
+msgid "Notice %s not found."
+msgstr "API 메서드 발견 안 됨."
+
 #: actions/oembed.php:80 actions/shownotice.php:100
 msgid "Notice has no profile."
 msgstr "이용자가 프로필을 가지고 있지 않습니다."
@@ -3948,6 +4028,16 @@ msgstr "이용자가 프로필을 가지고 있지 않습니다."
 msgid "%1$s's status on %2$s"
 msgstr "%1$s의 상태 (%2$s에서)"
 
+#: actions/oembed.php:95
+#, fuzzy, php-format
+msgid "Attachment %s not found."
+msgstr "받는 사용자가 없습니다."
+
+#: actions/oembed.php:136
+#, php-format
+msgid "\"%s\" not supported for oembed requests."
+msgstr ""
+
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
 #: actions/oembed.php:168
 #, fuzzy, php-format
@@ -3961,96 +4051,62 @@ msgid "Only %s URLs over plain HTTP please."
 msgstr ""
 
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1205
-#: lib/apiaction.php:1232 lib/apiaction.php:1367
+#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1207
+#: lib/apiaction.php:1234 lib/apiaction.php:1369
 msgid "Not a supported data format."
 msgstr "지원하는 형식의 데이터가 아닙니다."
 
+#. TRANS: ShortName in the OpenSearch interface when trying to find users.
 #: actions/opensearch.php:64
 msgid "People Search"
 msgstr "사람 찾기"
 
-#: actions/opensearch.php:67
+#: actions/opensearch.php:68
 msgid "Notice Search"
 msgstr "통지 검색"
 
-#: actions/othersettings.php:59
-msgid "Other settings"
-msgstr "아바타 설정"
-
-#. TRANS: Instructions for tab "Other" in user profile settings.
-#: actions/othersettings.php:71
-msgid "Manage various other options."
-msgstr "여러가지 기타 옵션을 관리합니다."
-
-#. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
-#. TRANS: user's profile settings. Use of "free" is as in "open", indicating that the
-#. TRANS: information on the shortener site is freely distributable.
-#. TRANS: This message has one space at the beginning. Use your language's word separator
-#. TRANS: here if it has one (most likely a single space).
-#: actions/othersettings.php:113
-msgid " (free service)"
-msgstr " (무료 서비스)"
-
-#. TRANS: Label for dropdown with URL shortener services.
-#: actions/othersettings.php:122
-msgid "Shorten URLs with"
-msgstr "URL 줄이기 기능"
-
-#. TRANS: Tooltip for for dropdown with URL shortener services.
-#: actions/othersettings.php:124
-msgid "Automatic shortening service to use."
-msgstr "사용할 URL 자동 줄이기 서비스."
-
-#. TRANS: Label for checkbox.
-#: actions/othersettings.php:130
-msgid "View profile designs"
-msgstr "프로필 디자인 보기"
-
-#. TRANS: Tooltip for checkbox.
-#: actions/othersettings.php:132
-msgid "Show or hide profile designs."
-msgstr "프로필 디자인 보이거나 감춥니다."
-
-#. TRANS: Form validation error for form "Other settings" in user profile.
-#: actions/othersettings.php:164
-#, fuzzy
-msgid "URL shortening service is too long (maximum 50 characters)."
-msgstr "URL 줄이기 서비스 너무 깁니다. (최대 50글자)"
-
-#: actions/otp.php:69
+#. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
+#: actions/otp.php:70
 #, fuzzy
 msgid "No user ID specified."
 msgstr "프로필을 지정하지 않았습니다."
 
-#: actions/otp.php:83
+#. TRANS: Client error displayed trying to use "one time password login" without specifying a login token.
+#: actions/otp.php:86
 msgid "No login token specified."
 msgstr "허용되지 않는 요청입니다."
 
-#: actions/otp.php:90
+#. TRANS: Client error displayed trying to use "one time password login" without requesting a login token.
+#: actions/otp.php:94
 msgid "No login token requested."
 msgstr "허용되지 않는 요청입니다."
 
-#: actions/otp.php:95
+#. TRANS: Client error displayed trying to use "one time password login" while specifying an invalid login token.
+#: actions/otp.php:100
 msgid "Invalid login token specified."
 msgstr "허용되지 않는 요청입니다."
 
-#: actions/otp.php:104
+#. TRANS: Client error displayed trying to use "one time password login" while specifying an expired login token.
+#: actions/otp.php:110
 #, fuzzy
 msgid "Login token expired."
 msgstr "사이트에 로그인하세요."
 
-#: actions/outbox.php:58
+#. TRANS: Title for outbox for any but the fist page.
+#. TRANS: %1$s is the user nickname, %2$d is the page number.
+#: actions/outbox.php:57
 #, php-format
 msgid "Outbox for %1$s - page %2$d"
 msgstr "%s 및 친구들, %d 페이지"
 
+#. TRANS: Title for first page of outbox.
 #: actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
 msgstr "%s의 보낸쪽지함"
 
-#: actions/outbox.php:104
+#. TRANS: Instructions for outbox.
+#: actions/outbox.php:103
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr "당신의 보낸 쪽지함입니다. 이곳엔 당신이 보냈던 비밀 쪽지가 있습니다."
 
@@ -4076,43 +4132,45 @@ msgstr "기존 비밀 번호"
 msgid "New password"
 msgstr "새로운 비밀 번호"
 
-#: actions/passwordsettings.php:109
+#: actions/passwordsettings.php:109 actions/register.php:416
 #, fuzzy
-msgid "6 or more characters"
+msgid "6 or more characters."
 msgstr "6글자 이상"
 
-#: actions/passwordsettings.php:113
+#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#: actions/passwordsettings.php:113 actions/recoverpassword.php:264
+#: actions/register.php:420
 #, fuzzy
-msgid "Same as password above"
+msgid "Same as password above."
 msgstr "위와 같은 비밀 번호"
 
 #: actions/passwordsettings.php:117
 msgid "Change"
 msgstr "변경"
 
-#: actions/passwordsettings.php:154 actions/register.php:238
+#: actions/passwordsettings.php:153 actions/register.php:223
 msgid "Password must be 6 or more characters."
 msgstr "비밀번호는 6자리 이상이어야 합니다."
 
-#: actions/passwordsettings.php:157 actions/register.php:241
+#: actions/passwordsettings.php:156 actions/register.php:226
 msgid "Passwords don't match."
 msgstr "비밀 번호가 일치하지 않습니다."
 
-#: actions/passwordsettings.php:165
+#: actions/passwordsettings.php:164
 msgid "Incorrect old password"
 msgstr "기존 비밀 번호가 틀렸습니다"
 
-#: actions/passwordsettings.php:181
+#: actions/passwordsettings.php:180
 msgid "Error saving user; invalid."
 msgstr "사용자 저장 오류; 무효한 사용자"
 
-#: actions/passwordsettings.php:186
+#. TRANS: Reset password form validation error message.
+#: actions/passwordsettings.php:185 actions/recoverpassword.php:418
 #, fuzzy
-msgid "Can't save new password."
+msgid "Cannot save new password."
 msgstr "새 비밀번호를 저장 할 수 없습니다."
 
-#. TRANS: Title for password recovery page in password saved mode.
-#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
+#: actions/passwordsettings.php:191
 msgid "Password saved."
 msgstr "비밀 번호 저장"
 
@@ -4325,8 +4383,7 @@ msgid "Directory where backgrounds are located."
 msgstr ""
 
 #. TRANS: Fieldset legens in Paths admin panel.
-#. TRANS: DT element label in attachment list.
-#: actions/pathsadminpanel.php:419 lib/attachmentlist.php:98
+#: actions/pathsadminpanel.php:419
 msgid "Attachments"
 msgstr "첨부파일"
 
@@ -4398,7 +4455,9 @@ msgstr ""
 msgid "Save paths"
 msgstr "사이트 테마"
 
-#: actions/peoplesearch.php:52
+#. TRANS: Instructions for the "People search" page.
+#. TRANS: %%site.name%% is the name of the StatusNet site.
+#: actions/peoplesearch.php:54
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
@@ -4407,7 +4466,8 @@ msgstr ""
 "%%site.name%%의 사람을 이름, 장소, 관심 거리로 검색합니다. 검색어는 공백으로 "
 "구분하고, 적어도 3글자 이상 필요합니다."
 
-#: actions/peoplesearch.php:58
+#. TRANS: Title of a page where users can search for other users.
+#: actions/peoplesearch.php:61
 msgid "People search"
 msgstr "사람 찾기"
 
@@ -4421,6 +4481,60 @@ msgstr "올바른 메일 주소가 아닙니다."
 msgid "Users self-tagged with %1$s - page %2$d"
 msgstr "%s 태그된 통지"
 
+#. TRANS: Page title for AJAX form return when a disabling a plugin.
+#: actions/plugindisable.php:69
+msgctxt "plugin"
+msgid "Disabled"
+msgstr ""
+
+#. TRANS: Client error displayed trying to perform any request method other than POST.
+#. TRANS: Do not translate POST.
+#: actions/pluginenable.php:78 actions/subscribe.php:77
+msgid "This action only accepts POST requests."
+msgstr ""
+
+#: actions/pluginenable.php:102
+#, fuzzy
+msgid "You cannot administer plugins."
+msgstr "이용자를 업데이트 할 수 없습니다."
+
+#: actions/pluginenable.php:109
+#, fuzzy
+msgid "No such plugin."
+msgstr "해당하는 페이지 없음"
+
+#. TRANS: Page title for AJAX form return when enabling a plugin.
+#: actions/pluginenable.php:159
+msgctxt "plugin"
+msgid "Enabled"
+msgstr ""
+
+#. TRANS: Tab and title for plugins admin panel.
+#. TRANS: Menu item for site administration
+#: actions/pluginsadminpanel.php:56 actions/version.php:191
+#: lib/adminpanelaction.php:411
+msgid "Plugins"
+msgstr "플러그인"
+
+#. TRANS: Instructions at top of plugin admin page.
+#: actions/pluginsadminpanel.php:68
+msgid ""
+"Additional plugins can be enabled and configured manually. See the <a href="
+"\"http://status.net/wiki/Plugins\">online plugin documentation</a> for more "
+"details."
+msgstr ""
+
+#. TRANS: Admin form section header
+#: actions/pluginsadminpanel.php:84
+#, fuzzy
+msgid "Default plugins"
+msgstr "기본 언어"
+
+#: actions/pluginsadminpanel.php:106
+msgid ""
+"All default plugins have been disabled from the site's configuration file."
+msgstr ""
+
 #: actions/postnotice.php:95
 msgid "Invalid notice content."
 msgstr "옳지 않은 크기"
@@ -4431,12 +4545,12 @@ msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’.
 msgstr ""
 
 #. TRANS: Page title for profile settings.
-#: actions/profilesettings.php:59
+#: actions/profilesettings.php:60
 msgid "Profile settings"
 msgstr "프로필 설정"
 
 #. TRANS: Usage instructions for profile settings.
-#: actions/profilesettings.php:70
+#: actions/profilesettings.php:71
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
@@ -4444,34 +4558,31 @@ msgstr ""
 "트 할 수 있습니다. "
 
 #. TRANS: Profile settings form legend.
-#: actions/profilesettings.php:98
+#: actions/profilesettings.php:99
 msgid "Profile information"
 msgstr "프로필 정보"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109 actions/register.php:433
+#: actions/profilesettings.php:110 actions/register.php:412
 #, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr "1-64자 사이에 영소문자, 숫자로만 씁니다. 기호나 공백을 쓰면 안 됩니다."
 
 #. TRANS: Field label in form for profile settings.
-#. TRANS: Label for full group name (dt). Text hidden by default.
-#. TRANS: DT for full name in a profile.
-#: actions/profilesettings.php:113 actions/register.php:455
-#: actions/showgroup.php:255 actions/tagother.php:104
-#: lib/groupeditform.php:150 lib/userprofile.php:156
+#: actions/profilesettings.php:114 actions/register.php:434
+#: lib/groupeditform.php:150
 msgid "Full name"
 msgstr "실명"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:118 actions/register.php:460
+#: actions/profilesettings.php:119 actions/register.php:439
 #: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "홈페이지"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:121
+#: actions/profilesettings.php:122 actions/register.php:441
 #, fuzzy
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr "귀하의 홈페이지, 블로그 혹은 다른 사이트의 프로필 페이지 URL"
@@ -4479,140 +4590,136 @@ msgstr "귀하의 홈페이지, 블로그 혹은 다른 사이트의 프로필 
 #. TRANS: Tooltip for field label in form for profile settings. Plural
 #. TRANS: is decided by the number of characters available for the
 #. TRANS: biography (%d).
-#: actions/profilesettings.php:129 actions/register.php:471
+#: actions/profilesettings.php:130 actions/register.php:450
 #, fuzzy, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
 msgstr[0] "%d자 이내에서 자기 소개 및 자기 관심사"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:135 actions/register.php:476
+#: actions/profilesettings.php:136 actions/register.php:455
 msgid "Describe yourself and your interests"
 msgstr "자기 소개 및 자기 관심사"
 
 #. TRANS: Text area label in form for profile settings where users can provide.
 #. TRANS: their biography.
-#: actions/profilesettings.php:139 actions/register.php:478
+#: actions/profilesettings.php:140 actions/register.php:457
 msgid "Bio"
 msgstr "자기소개"
 
 #. TRANS: Field label in form for profile settings.
-#. TRANS: Label for group location (dt). Text hidden by default.
-#. TRANS: DT for location in a profile.
-#: actions/profilesettings.php:145 actions/register.php:483
-#: actions/showgroup.php:265 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:173
-#: lib/userprofile.php:172
+#: actions/profilesettings.php:146 actions/register.php:462
+#: lib/groupeditform.php:173
 msgid "Location"
 msgstr "위치"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148 actions/register.php:485
+#: actions/profilesettings.php:149
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "당신은 어디에 삽니까? \"시, 도 (or 군,구), 나라\""
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:153
+#: actions/profilesettings.php:154
 msgid "Share my current location when posting notices"
 msgstr ""
 
 #. TRANS: Field label in form for profile settings.
-#. TRANS: DT for tags in a profile.
-#: actions/profilesettings.php:161 actions/tagother.php:149
-#: actions/tagother.php:209 lib/subscriptionlist.php:106
-#: lib/subscriptionlist.php:108 lib/userprofile.php:220
+#: actions/profilesettings.php:162 actions/tagother.php:128
+#: actions/tagother.php:188 lib/subscriptionlist.php:104
+#: lib/subscriptionlist.php:106
 msgid "Tags"
 msgstr "태그"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:164
+#: actions/profilesettings.php:165
 #, fuzzy
 msgid ""
-"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- "
+"separated."
 msgstr "당신을 위한 태그, (문자,숫자,-, ., _로 구성) 콤마 혹은 공백으로 구분."
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:169
+#: actions/profilesettings.php:170
 msgid "Language"
 msgstr "언어"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:171
+#: actions/profilesettings.php:172
 #, fuzzy
-msgid "Preferred language"
+msgid "Preferred language."
 msgstr "언어 설정"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:181
+#: actions/profilesettings.php:182
 msgid "Timezone"
 msgstr "시간대"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:183
+#: actions/profilesettings.php:184
 msgid "What timezone are you normally in?"
 msgstr "주로 생활하는 곳이 어느 시간대입니까?"
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:189
+#: actions/profilesettings.php:190
 #, fuzzy
 msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)"
+"Automatically subscribe to whoever subscribes to me (best for non-humans)."
 msgstr "나에게 구독하는 사람에게 자동 구독 신청"
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Plural form is used based on the maximum number of allowed
 #. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:258 actions/register.php:229
+#: actions/profilesettings.php:259 actions/register.php:214
 #, fuzzy, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
 msgstr[0] "설명이 너무 깁니다. (최대 %d 글자)"
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:269 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:270 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr "타임존이 설정 되지 않았습니다."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:277
+#: actions/profilesettings.php:278
 #, fuzzy
 msgid "Language is too long (maximum 50 characters)."
 msgstr "언어가 너무 깁니다. (최대 50글자)"
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:291 actions/tagother.php:178
-#, php-format
-msgid "Invalid tag: \"%s\""
+#: actions/profilesettings.php:292
+#, fuzzy, php-format
+msgid "Invalid tag: \"%s\"."
 msgstr "올바르지 않은 태그: \"%s\""
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:347
+#: actions/profilesettings.php:348
 #, fuzzy
 msgid "Could not update user for autosubscribe."
 msgstr "자동구독에 사용자를 업데이트 할 수 없습니다."
 
 #. TRANS: Server error thrown when user profile location preference settings could not be updated.
-#: actions/profilesettings.php:405
+#: actions/profilesettings.php:406
 #, fuzzy
 msgid "Could not save location prefs."
 msgstr "태그를 저장할 수 없습니다."
 
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:427 actions/tagother.php:200
+#: actions/profilesettings.php:428 actions/tagother.php:179
 msgid "Could not save tags."
 msgstr "태그를 저장할 수 없습니다."
 
 #. TRANS: Confirmation shown when user profile settings are saved.
 #. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:436 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:437 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "설정 저장"
 
 #. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
 #. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:483 actions/restoreaccount.php:60
+#: actions/profilesettings.php:484 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "새 계정 만들기"
@@ -4686,6 +4793,12 @@ msgstr ""
 "%%site.name%% 는 마이크로블로깅(http://en.wikipedia.org/wiki/Micro-blogging) "
 "서비스 입니다."
 
+#. TRANS: Public RSS feed description. %s is the StatusNet site name.
+#: actions/publicrss.php:106
+#, fuzzy, php-format
+msgid "%s updates from everyone."
+msgstr "모두로부터의 업데이트 %s개!"
+
 #. TRANS: Title for public tag cloud.
 #: actions/publictagcloud.php:57
 msgid "Public tag cloud"
@@ -4724,10 +4837,6 @@ msgid ""
 "one!"
 msgstr ""
 
-#: actions/publictagcloud.php:146
-msgid "Tag cloud"
-msgstr "태그 클라우드"
-
 #. TRANS: Client error displayed trying to recover password while already logged in.
 #: actions/recoverpassword.php:37
 msgid "You are already logged in!"
@@ -4819,6 +4928,12 @@ msgstr "비밀 번호 복구"
 msgid "Password recovery requested"
 msgstr "비밀 번호 복구가 요청되었습니다."
 
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/recoverpassword.php:229
+#, fuzzy
+msgid "Password saved"
+msgstr "비밀 번호 저장"
+
 #. TRANS: Title for password recovery page when an unknown action has been specified.
 #: actions/recoverpassword.php:232
 msgid "Unknown action"
@@ -4830,15 +4945,9 @@ msgstr "알려지지 않은 행동"
 msgid "6 or more characters, and do not forget it!"
 msgstr "6글자 이상, 잊어 버리지 마십시오!"
 
-#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
-#: actions/recoverpassword.php:264 actions/register.php:441
-#, fuzzy
-msgid "Same as password above."
-msgstr "위와 같은 비밀 번호"
-
 #. TRANS: Button text for password reset form.
 #. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: actions/recoverpassword.php:268 lib/designsettings.php:264
+#: actions/recoverpassword.php:268 lib/designform.php:145
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Reset"
@@ -4887,14 +4996,8 @@ msgstr "비밀 번호는 6자 이상이어야 합니다."
 msgid "Password and confirmation do not match."
 msgstr "비밀 번호가 일치하지 않습니다."
 
-#. TRANS: Reset password form validation error message.
-#: actions/recoverpassword.php:418
-#, fuzzy
-msgid "Cannot save new password."
-msgstr "새 비밀번호를 저장 할 수 없습니다."
-
 #. TRANS: Server error displayed when something does wrong with the user object during password reset.
-#: actions/recoverpassword.php:426 actions/register.php:256
+#: actions/recoverpassword.php:426 actions/register.php:241
 msgid "Error setting user."
 msgstr "사용자 세팅 오류"
 
@@ -4904,102 +5007,106 @@ msgid "New password successfully saved. You are now logged in."
 msgstr ""
 "새로운 비밀 번호를 성공적으로 저장했습니다. 귀하는 이제 로그인 되었습니다."
 
-#: actions/register.php:92 actions/register.php:196 actions/register.php:413
+#: actions/redirecturl.php:70
+#, fuzzy
+msgid "No id parameter"
+msgstr "첨부문서 없음"
+
+#: actions/redirecturl.php:76
+#, fuzzy, php-format
+msgid "No such file \"%d\""
+msgstr "해당하는 파일이 없습니다."
+
+#: actions/register.php:80 actions/register.php:181 actions/register.php:392
 msgid "Sorry, only invited people can register."
 msgstr "죄송합니다. 단지 초대된 사람들만 등록할 수 있습니다."
 
-#: actions/register.php:99
+#: actions/register.php:87
 #, fuzzy
 msgid "Sorry, invalid invitation code."
 msgstr "확인 코드 오류"
 
-#: actions/register.php:119
+#: actions/register.php:106
 msgid "Registration successful"
 msgstr "회원 가입이 성공적입니다."
 
-#: actions/register.php:121 actions/register.php:511
+#: actions/register.php:108 actions/register.php:490
 msgid "Register"
 msgstr "등록"
 
-#: actions/register.php:142
+#: actions/register.php:128
 msgid "Registration not allowed."
 msgstr "가입이 허용되지 않습니다."
 
-#: actions/register.php:209
+#: actions/register.php:194
 #, fuzzy
-msgid "You can't register if you don't agree to the license."
+msgid "You cannot register if you don't agree to the license."
 msgstr "라이선스에 동의하지 않는다면 등록할 수 없습니다."
 
-#: actions/register.php:218
+#: actions/register.php:203
 msgid "Email address already exists."
 msgstr "이메일 주소가 이미 존재 합니다."
 
-#: actions/register.php:251 actions/register.php:273
+#: actions/register.php:236 actions/register.php:258
 msgid "Invalid username or password."
 msgstr "사용자 이름이나 비밀 번호가 틀렸습니다."
 
-#: actions/register.php:351
+#: actions/register.php:333
 msgid ""
 "With this form you can create a new account. You can then post notices and "
-"link up to friends and colleagues. "
+"link up to friends and colleagues."
 msgstr ""
 
-#: actions/register.php:437
-#, fuzzy
-msgid "6 or more characters."
-msgstr "6글자 이상"
-
-#. TRANS: Link description in user account settings menu.
-#: actions/register.php:445 actions/register.php:449
-#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
+#: actions/register.php:424 actions/register.php:428
+#: actions/siteadminpanel.php:238 lib/settingsnav.php:92
 msgid "Email"
 msgstr "메일"
 
-#: actions/register.php:446 actions/register.php:450
+#: actions/register.php:425 actions/register.php:429
 #, fuzzy
-msgid "Used only for updates, announcements, and password recovery"
+msgid "Used only for updates, announcements, and password recovery."
 msgstr "업데이트나 공지, 비밀번호 찾기에 사용하세요."
 
-#: actions/register.php:457
+#: actions/register.php:436
 #, fuzzy
-msgid "Longer name, preferably your \"real\" name"
+msgid "Longer name, preferably your \"real\" name."
 msgstr "더욱 긴 이름을 요구합니다."
 
-#: actions/register.php:462
+#: actions/register.php:464
 #, fuzzy
-msgid "URL of your homepage, blog, or profile on another site"
-msgstr "귀하의 홈페이지, 블로그 혹은 다른 사이트의 프로필 페이지 URL"
+msgid "Where you are, like \"City, State (or Region), Country\"."
+msgstr "당신은 어디에 삽니까? \"시, 도 (or 군,구), 나라\""
 
-#: actions/register.php:523
+#: actions/register.php:503
 #, fuzzy, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
 msgstr "%1$s의 컨텐츠와 데이터는 외부 유출을 금지합니다."
 
-#: actions/register.php:533
+#: actions/register.php:513
 #, php-format
 msgid "My text and files are copyright by %1$s."
 msgstr "글과 파일의 저작권은 %1$s의 소유입니다"
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:537
+#: actions/register.php:517
 msgid "My text and files remain under my own copyright."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:540
+#: actions/register.php:520
 msgid "All rights reserved."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:545
+#: actions/register.php:525
 #, fuzzy, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
 "email address, IM address, and phone number."
 msgstr "다음 개인정보 제외: 비밀 번호, 메일 주소, 메신저 주소, 전화 번호"
 
-#: actions/register.php:588
+#: actions/register.php:566
 #, fuzzy, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -5032,7 +5139,7 @@ msgstr ""
 "\n"
 "다시 한번 가입하신 것을 환영하면서 즐거운 서비스가 되셨으면 합니다."
 
-#: actions/register.php:612
+#: actions/register.php:590
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5065,7 +5172,7 @@ msgstr "이용자 닉네임"
 
 #: actions/remotesubscribe.php:129
 #, fuzzy
-msgid "Nickname of the user you want to follow"
+msgid "Nickname of the user you want to follow."
 msgstr "따라가고 싶은 사용자의 별명"
 
 #: actions/remotesubscribe.php:132
@@ -5074,18 +5181,18 @@ msgstr "프로필 URL"
 
 #: actions/remotesubscribe.php:133
 #, fuzzy
-msgid "URL of your profile on another compatible microblogging service"
+msgid "URL of your profile on another compatible microblogging service."
 msgstr "다른 마이크로블로깅 서비스의 귀하의 프로필 URL"
 
 #. TRANS: Link text for link that will subscribe to a remote profile.
 #: actions/remotesubscribe.php:136 lib/subscribeform.php:139
-#: lib/userprofile.php:431
+#: lib/userprofile.php:402
 msgid "Subscribe"
 msgstr "구독"
 
 #: actions/remotesubscribe.php:158
 #, fuzzy
-msgid "Invalid profile URL (bad format)"
+msgid "Invalid profile URL (bad format)."
 msgstr "옳지 않은 프로필 URL (나쁜 포멧)"
 
 #: actions/remotesubscribe.php:167
@@ -5122,7 +5229,7 @@ msgstr "자신의 글은 재전송할 수 없습니다."
 msgid "You already repeated that notice."
 msgstr "이미 재전송된 소식입니다."
 
-#: actions/repeat.php:112 lib/noticelist.php:692
+#: actions/repeat.php:112 lib/noticelist.php:697
 msgid "Repeated"
 msgstr "재전송됨"
 
@@ -5130,9 +5237,9 @@ msgstr "재전송됨"
 msgid "Repeated!"
 msgstr "재전송됨!"
 
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing @-replies.
+#. TRANS: RSS reply feed title. %s is a user nickname.
 #: actions/replies.php:126 actions/repliesrss.php:68
-#: lib/personalgroupnav.php:109
+#: lib/personalgroupnav.php:105
 #, php-format
 msgid "Replies to %s"
 msgstr "%s에 답신"
@@ -5178,9 +5285,11 @@ msgid ""
 "newnotice%%%%?status_textarea=%3$s)."
 msgstr ""
 
-#: actions/repliesrss.php:72
+#. TRANS: RSS reply feed description.
+#. TRANS: %1$s is a user nickname, %2$s is the StatusNet site name.
+#: actions/repliesrss.php:74
 #, fuzzy, php-format
-msgid "Replies to %1$s on %2$s!"
+msgid "Replies to %1$s on %2$s."
 msgstr "%s에 답신"
 
 #. TRANS: Client exception displayed when trying to restore an account while not logged in.
@@ -5281,7 +5390,7 @@ msgstr "이 사이트의 이용자에 대해 권한정지 할 수 없습니다."
 msgid "User doesn't have this role."
 msgstr "이용자가 프로필을 가지고 있지 않습니다."
 
-#: actions/rsd.php:146 actions/version.php:159
+#: actions/rsd.php:142 actions/version.php:159
 msgid "StatusNet"
 msgstr "StatusNet %s"
 
@@ -5323,94 +5432,44 @@ msgstr ""
 msgid "Save site settings"
 msgstr "접근 설정을 저장"
 
-#: actions/showapplication.php:82
+#: actions/showapplication.php:78
 msgid "You must be logged in to view an application."
 msgstr "응용 프로그램 수정을 위해서는 로그인해야 합니다."
 
-#: actions/showapplication.php:157
+#: actions/showapplication.php:151
 msgid "Application profile"
 msgstr "신규 응용 프로그램"
 
-#. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:159 lib/applicationeditform.php:177
-msgid "Icon"
-msgstr "아이콘"
-
-#. TRANS: Form input field label for application name.
-#: actions/showapplication.php:169 actions/version.php:197
-#: lib/applicationeditform.php:190
-msgid "Name"
-msgstr "이름"
-
-#. TRANS: Form input field label.
-#: actions/showapplication.php:178 lib/applicationeditform.php:227
-msgid "Organization"
-msgstr "기관 이름이 필요합니다."
-
-#. TRANS: Form input field label.
-#: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:168
-msgid "Description"
-msgstr "설명"
-
-#. TRANS: Header for group statistics on a group page (h2).
-#. TRANS: H2 text for user statistics.
-#: actions/showapplication.php:192 actions/showgroup.php:460
-#: lib/profileaction.php:205
-msgid "Statistics"
-msgstr "통계"
-
-#: actions/showapplication.php:203
+#: actions/showapplication.php:179
 #, php-format
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr ""
 
-#: actions/showapplication.php:213
+#: actions/showapplication.php:189
 msgid "Application actions"
 msgstr "인증 코드가 없습니다."
 
-#: actions/showapplication.php:236
+#: actions/showapplication.php:212
 msgid "Reset key & secret"
 msgstr ""
 
 #. TRANS: Title of form for deleting a user.
-#: actions/showapplication.php:252 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:64 lib/noticelist.php:673
+#: actions/showapplication.php:228 lib/deletegroupform.php:121
+#: lib/deleteuserform.php:64 lib/noticelist.php:678
 msgid "Delete"
 msgstr "삭제"
 
-#: actions/showapplication.php:261
+#: actions/showapplication.php:237
 msgid "Application info"
 msgstr "인증 코드가 없습니다."
 
-#: actions/showapplication.php:263
-msgid "Consumer key"
-msgstr ""
-
-#: actions/showapplication.php:268
-msgid "Consumer secret"
-msgstr ""
-
-#: actions/showapplication.php:273
-msgid "Request token URL"
-msgstr ""
-
-#: actions/showapplication.php:278
-msgid "Access token URL"
-msgstr ""
-
-#: actions/showapplication.php:283
-#, fuzzy
-msgid "Authorize URL"
-msgstr "작성자"
-
-#: actions/showapplication.php:288
+#: actions/showapplication.php:255
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
 msgstr ""
 
-#: actions/showapplication.php:309
+#: actions/showapplication.php:275
 #, fuzzy
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr "정말로 통지를 삭제하시겠습니까?"
@@ -5490,61 +5549,47 @@ msgstr "%s 그룹"
 msgid "%1$s group, page %2$d"
 msgstr "그룹, %d페이지"
 
-#. TRANS: Group profile header (h2). Text hidden by default.
-#: actions/showgroup.php:223
-msgid "Group profile"
-msgstr "그룹 프로필"
-
-#. TRANS: Label for group URL (dt). Text hidden by default.
-#. TRANS: DT for URL in a profile.
-#: actions/showgroup.php:273 actions/tagother.php:118
-#: actions/userauthorization.php:175 lib/userprofile.php:186
-msgid "URL"
-msgstr "URL"
-
 #. TRANS: Label for group description or group note (dt). Text hidden by default.
-#. TRANS: DT for note in a profile.
-#: actions/showgroup.php:285 actions/tagother.php:128
-#: actions/userauthorization.php:187 lib/userprofile.php:204
+#: actions/showgroup.php:266
 msgid "Note"
 msgstr "설명"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:296 lib/groupeditform.php:180
+#: actions/showgroup.php:277 lib/groupeditform.php:180
 msgid "Aliases"
 msgstr ""
 
 #. TRANS: Group actions header (h2). Text hidden by default.
-#: actions/showgroup.php:313
+#: actions/showgroup.php:294
 msgid "Group actions"
 msgstr "그룹 행동"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:357
+#: actions/showgroup.php:338
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
 msgstr "%s 그룹을 위한 공지피드 (RSS 1.0)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:364
+#: actions/showgroup.php:345
 #, php-format
 msgid "Notice feed for %s group (RSS 2.0)"
 msgstr "%s 그룹을 위한 공지피드 (RSS 2.0)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:371
+#: actions/showgroup.php:352
 #, php-format
 msgid "Notice feed for %s group (Atom)"
 msgstr "%s 그룹을 위한 공지피드 (Atom)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:377
+#: actions/showgroup.php:358
 #, php-format
 msgid "FOAF for %s group"
 msgstr "%s의 보낸쪽지함"
 
 #. TRANS: Header for mini list of group members on a group page (h2).
-#: actions/showgroup.php:414
+#: actions/showgroup.php:395
 msgid "Members"
 msgstr "회원"
 
@@ -5552,26 +5597,31 @@ msgstr "회원"
 #. TRANS: Text for user subscription statistics if the user has no subscriptions.
 #. TRANS: Text for user subscriber statistics if user has no subscribers.
 #. TRANS: Text for user user group membership statistics if user is not a member of any group.
-#: actions/showgroup.php:420 lib/profileaction.php:137
+#: actions/showgroup.php:401 lib/profileaction.php:137
 #: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
-#: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
+#: lib/subscriptionlist.php:123 lib/tagcloudsection.php:71
 msgid "(None)"
 msgstr "(없음)"
 
 #. TRANS: Link to all group members from mini list of group members if group has more than n members.
-#: actions/showgroup.php:429
+#: actions/showgroup.php:410
 msgid "All members"
 msgstr "모든 회원"
 
-#. TRANS: Label for creation date in statistics on group page.
-#: actions/showgroup.php:465
+#. TRANS: Header for group statistics on a group page (h2).
+#. TRANS: H2 text for user statistics.
+#: actions/showgroup.php:441 lib/profileaction.php:205
+msgid "Statistics"
+msgstr "통계"
+
+#: actions/showgroup.php:444
 #, fuzzy
 msgctxt "LABEL"
 msgid "Created"
 msgstr "생성됨"
 
 #. TRANS: Label for member count in statistics on group page.
-#: actions/showgroup.php:473
+#: actions/showgroup.php:449
 #, fuzzy
 msgctxt "LABEL"
 msgid "Members"
@@ -5581,7 +5631,7 @@ msgstr "회원"
 #. TRANS: **%s** is the group alias, %%%%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).
-#: actions/showgroup.php:488
+#: actions/showgroup.php:464
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5594,7 +5644,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: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
-#: actions/showgroup.php:498
+#: actions/showgroup.php:474
 #, fuzzy, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5606,7 +5656,7 @@ msgstr ""
 "Micro-blogging)의 사용자 그룹입니다. "
 
 #. TRANS: Header for list of group administrators on a group page (h2).
-#: actions/showgroup.php:527
+#: actions/showgroup.php:503
 #, fuzzy
 msgid "Admins"
 msgstr "관리자"
@@ -5647,7 +5697,7 @@ msgid "%1$s tagged %2$s"
 msgstr "%s 및 친구들, %d 페이지"
 
 #. TRANS: Page title showing tagged notices in one user's stream.
-#. TRANS: %1$s is the username, %2$s is the hash tag, %1$d is the page number.
+#. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
 #: actions/showstream.php:74
 #, fuzzy, php-format
 msgid "%1$s tagged %2$s, page %3$d"
@@ -5694,13 +5744,13 @@ msgid "FOAF for %s"
 msgstr "%s의 보낸쪽지함"
 
 #. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
-#: actions/showstream.php:211
+#: actions/showstream.php:205
 #, fuzzy, php-format
 msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr "%s 및 친구들의 타임라인이지만, 아직 아무도 글을 작성하지 않았습니다."
 
 #. TRANS: Second sentence of empty list message for a stream for the user themselves.
-#: actions/showstream.php:217
+#: actions/showstream.php:211
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
@@ -5710,7 +5760,7 @@ msgstr ""
 
 #. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:221
+#: actions/showstream.php:215
 #, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
@@ -5719,7 +5769,7 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:264
+#: actions/showstream.php:258
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5730,7 +5780,7 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:271
+#: actions/showstream.php:265
 #, fuzzy, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5741,7 +5791,7 @@ msgstr ""
 "Micro-blogging) 서비스에 계정을 갖고 있습니다."
 
 #. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
-#: actions/showstream.php:328
+#: actions/showstream.php:322
 #, fuzzy, php-format
 msgid "Repeat of %s"
 msgstr "%s에 답신"
@@ -5889,76 +5939,76 @@ msgstr ""
 #. TRANS: Title for button to save site notice in admin panel.
 #: actions/sitenoticeadminpanel.php:201
 #, fuzzy
-msgid "Save site notice"
+msgid "Save site notice."
 msgstr "사이트 공지"
 
 #. TRANS: Title for SMS settings.
-#: actions/smssettings.php:57
+#: actions/smssettings.php:56
 msgid "SMS settings"
 msgstr "메일 설정"
 
 #. TRANS: SMS settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/smssettings.php:71
+#: actions/smssettings.php:70
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr ""
 "당신은 %%site.name%% 로부터 이메일을 통해 SMS메시지를 받을 수 있습니다."
 
 #. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
-#: actions/smssettings.php:93
+#: actions/smssettings.php:92
 msgid "SMS is not available."
 msgstr "인스턴트 메신저를 사용할 수 없습니다."
 
 #. TRANS: Form legend for SMS settings form.
-#: actions/smssettings.php:107
+#: actions/smssettings.php:106
 msgid "SMS address"
 msgstr "SMS 주소"
 
 #. TRANS: Form guide in SMS settings form.
-#: actions/smssettings.php:116
+#: actions/smssettings.php:115
 msgid "Current confirmed SMS-enabled phone number."
 msgstr "확인된 최신의 SMS가 가능한 휴대폰 번호"
 
 #. TRANS: Form guide in IM settings form.
-#: actions/smssettings.php:129
+#: actions/smssettings.php:128
 msgid "Awaiting confirmation on this phone number."
 msgstr "이 전화 번호는 인증 대기중입니다."
 
 #. TRANS: Field label for SMS address input in SMS settings form.
-#: actions/smssettings.php:138
+#: actions/smssettings.php:137
 msgid "Confirmation code"
 msgstr "인증 코드"
 
 #. TRANS: Form field instructions in SMS settings form.
-#: actions/smssettings.php:140
+#: actions/smssettings.php:139
 msgid "Enter the code you received on your phone."
 msgstr "휴대폰으로 받으신 인증번호를 입력하십시오."
 
 #. TRANS: Button label to confirm SMS confirmation code in SMS settings.
-#: actions/smssettings.php:144
+#: actions/smssettings.php:143
 msgctxt "BUTTON"
 msgid "Confirm"
 msgstr "확인"
 
 #. TRANS: Field label for SMS phone number input in SMS settings form.
-#: actions/smssettings.php:149
+#: actions/smssettings.php:148
 msgid "SMS phone number"
 msgstr "휴대폰 번호가 없습니다."
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
-#: actions/smssettings.php:152
+#: actions/smssettings.php:151
 #, fuzzy
-msgid "Phone number, no punctuation or spaces, with area code"
+msgid "Phone number, no punctuation or spaces, with area code."
 msgstr "지역번호와 함께 띄어쓰기 없이 번호를 적어 주세요."
 
 #. TRANS: Form legend for SMS preferences form.
-#: actions/smssettings.php:191
+#: actions/smssettings.php:190
 msgid "SMS preferences"
 msgstr "메일 설정"
 
 #. TRANS: Checkbox label in SMS preferences form.
-#: actions/smssettings.php:197
+#: actions/smssettings.php:196
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
@@ -5967,32 +6017,32 @@ msgstr ""
 "습니다."
 
 #. TRANS: Confirmation message for successful SMS preferences save.
-#: actions/smssettings.php:308
+#: actions/smssettings.php:307
 msgid "SMS preferences saved."
 msgstr "SMS 설정을 저장했습니다."
 
 #. TRANS: Message given saving SMS phone number without having provided one.
-#: actions/smssettings.php:330
+#: actions/smssettings.php:329
 msgid "No phone number."
 msgstr "휴대폰 번호가 없습니다."
 
 #. TRANS: Message given saving SMS phone number without having selected a carrier.
-#: actions/smssettings.php:336
+#: actions/smssettings.php:335
 msgid "No carrier selected."
 msgstr "통신회사가 선택 되지 않았습니다."
 
 #. TRANS: Message given saving SMS phone number that is already set.
-#: actions/smssettings.php:344
+#: actions/smssettings.php:343
 msgid "That is already your phone number."
 msgstr "그 휴대폰 번호는 이미 귀하의 것입니다."
 
 #. TRANS: Message given saving SMS phone number that is already set for another user.
-#: actions/smssettings.php:348
+#: actions/smssettings.php:347
 msgid "That phone number already belongs to another user."
 msgstr "그 휴대폰 번호는 이미 다른 사용자의 것입니다."
 
 #. TRANS: Message given saving valid SMS phone number that is to be confirmed.
-#: actions/smssettings.php:376
+#: actions/smssettings.php:375
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
 "for the code and instructions on how to use it."
@@ -6001,39 +6051,39 @@ msgstr ""
 "와 사용법을 확인하여 주시기 바랍니다."
 
 #. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
-#: actions/smssettings.php:404
+#: actions/smssettings.php:403
 msgid "That is the wrong confirmation number."
 msgstr "옳지 않은 인증 번호 입니다."
 
 #. TRANS: Message given after successfully canceling SMS phone number confirmation.
-#: actions/smssettings.php:418
+#: actions/smssettings.php:417
 msgid "SMS confirmation cancelled."
 msgstr "SMS 인증"
 
 #. TRANS: Message given trying to remove an SMS phone number that is not
 #. TRANS: registered for the active user.
-#: actions/smssettings.php:438
+#: actions/smssettings.php:437
 msgid "That is not your phone number."
 msgstr "그 휴대폰 번호는 귀하의 것이 아닙니다."
 
 #. TRANS: Message given after successfully removing a registered SMS phone number.
-#: actions/smssettings.php:460
+#: actions/smssettings.php:459
 msgid "The SMS phone number was removed."
 msgstr "메일 주소를 지웠습니다."
 
 #. TRANS: Label for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:499
+#: actions/smssettings.php:498
 msgid "Mobile carrier"
 msgstr "휴대전화 사업자"
 
 #. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:504
+#: actions/smssettings.php:503
 msgid "Select a carrier"
 msgstr "통신 회사를 선택 하세요."
 
 #. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
 #. TRANS: %s is an administrative contact's e-mail address.
-#: actions/smssettings.php:513
+#: actions/smssettings.php:512
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -6041,7 +6091,7 @@ msgid ""
 msgstr "귀하의 휴대폰의 통신회사는 무엇입니까?"
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
-#: actions/smssettings.php:535
+#: actions/smssettings.php:534
 #, fuzzy
 msgid "No code entered."
 msgstr "코드가 입력 되지 않았습니다."
@@ -6119,16 +6169,14 @@ msgstr "당신은 이 프로필에 구독되지 않고있습니다."
 msgid "Could not save subscription."
 msgstr "구독을 저장할 수 없습니다."
 
-#: actions/subscribe.php:77
-msgid "This action only accepts POST requests."
-msgstr ""
-
-#: actions/subscribe.php:117
+#. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
+#: actions/subscribe.php:121
 #, fuzzy
 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
 msgstr "당신은 이 프로필에 구독되지 않고있습니다."
 
-#: actions/subscribe.php:145
+#. TRANS: Page title when subscription succeeded.
+#: actions/subscribe.php:149
 msgid "Subscribed"
 msgstr "구독하였습니다."
 
@@ -6235,31 +6283,34 @@ msgid "Subscription feed for %s (Atom)"
 msgstr "%s 그룹을 위한 공지피드 (Atom)"
 
 #. TRANS: Checkbox label for enabling Jabber messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:239
-msgid "Jabber"
-msgstr "Jabber"
+#: actions/subscriptions.php:241 lib/settingsnav.php:110
+#, fuzzy
+msgid "IM"
+msgstr "메신저"
 
 #. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:254
+#: actions/subscriptions.php:256 lib/settingsnav.php:117
 msgid "SMS"
 msgstr "SMS"
 
-#: actions/tag.php:69
+#. TRANS: Title for all but the first page of notices with tags.
+#. TRANS: %1$s is the tag, %2$d is the page number.
+#: actions/tag.php:73
 #, php-format
 msgid "Notices tagged with %1$s, page %2$d"
 msgstr "%s 태그된 통지"
 
-#: actions/tag.php:87
+#: actions/tag.php:91
 #, php-format
 msgid "Notice feed for tag %s (RSS 1.0)"
 msgstr "%s 그룹을 위한 공지피드 (RSS 1.0)"
 
-#: actions/tag.php:93
+#: actions/tag.php:97
 #, php-format
 msgid "Notice feed for tag %s (RSS 2.0)"
 msgstr "%s 그룹을 위한 공지피드 (RSS 2.0)"
 
-#: actions/tag.php:99
+#: actions/tag.php:103
 #, php-format
 msgid "Notice feed for tag %s (Atom)"
 msgstr "%s 그룹을 위한 공지피드 (Atom)"
@@ -6278,17 +6329,11 @@ msgstr "태그 %s"
 msgid "User profile"
 msgstr "이용자 프로필"
 
-#. TRANS: DT element in area for user avatar.
-#: actions/tagother.php:81 actions/userauthorization.php:132
-#: lib/userprofile.php:108
-msgid "Photo"
-msgstr "사진"
-
-#: actions/tagother.php:141
+#: actions/tagother.php:120
 msgid "Tag user"
 msgstr "태그 사용자"
 
-#: actions/tagother.php:151
+#: actions/tagother.php:130
 msgid ""
 "Tags for this user (letters, numbers, -, ., and _), comma- or space- "
 "separated"
@@ -6296,13 +6341,18 @@ msgstr ""
 "사용자를 위한 태그 (문자,숫자, -, . ,그리고 _), 콤마 혹은 공백으로 분리하세"
 "요."
 
-#: actions/tagother.php:193
+#: actions/tagother.php:157
+#, php-format
+msgid "Invalid tag: \"%s\""
+msgstr "올바르지 않은 태그: \"%s\""
+
+#: actions/tagother.php:172
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 "당신이 구독하거나 당신을 구독하는 사람들에 대해서만 태그를 붙일 수 있습니다."
 
-#: actions/tagother.php:236
+#: actions/tagother.php:215
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr "당신의 구독자나 구독하는 사람에 태깅을 위해 이 양식을 사용하세요."
 
@@ -6310,6 +6360,7 @@ msgstr "당신의 구독자나 구독하는 사람에 태깅을 위해 이 양
 msgid "No such tag."
 msgstr "그러한 태그가 없습니다."
 
+#. TRANS: Client error displayed when trying to unblock a non-blocked user.
 #: actions/unblock.php:59
 msgid "You haven't blocked that user."
 msgstr "이미 차단된 이용자입니다."
@@ -6330,12 +6381,84 @@ msgstr "해당 ID의 프로필이 없습니다."
 msgid "Unsubscribed"
 msgstr "구독취소 되었습니다."
 
-#: actions/updateprofile.php:64 actions/userauthorization.php:337
+#: actions/updateprofile.php:64
 #, php-format
 msgid ""
 "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
 msgstr ""
 
+#: actions/urlsettings.php:60
+#, fuzzy
+msgid "URL settings"
+msgstr "메일 설정"
+
+#. TRANS: Instructions for tab "Other" in user profile settings.
+#: actions/urlsettings.php:72
+msgid "Manage various other options."
+msgstr "여러가지 기타 옵션을 관리합니다."
+
+#. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
+#. TRANS: user's profile settings. This message has one space at the beginning. Use your
+#. TRANS: language's word separator here if it has one (most likely a single space).
+#: actions/urlsettings.php:115
+msgid " (free service)"
+msgstr " (무료 서비스)"
+
+#: actions/urlsettings.php:121
+#, fuzzy
+msgid "[none]"
+msgstr "없음"
+
+#: actions/urlsettings.php:122
+msgid "[internal]"
+msgstr ""
+
+#. TRANS: Label for dropdown with URL shortener services.
+#: actions/urlsettings.php:130
+msgid "Shorten URLs with"
+msgstr "URL 줄이기 기능"
+
+#. TRANS: Tooltip for for dropdown with URL shortener services.
+#: actions/urlsettings.php:132
+msgid "Automatic shortening service to use."
+msgstr "사용할 URL 자동 줄이기 서비스."
+
+#: actions/urlsettings.php:138
+msgid "URL longer than"
+msgstr ""
+
+#: actions/urlsettings.php:141
+msgid "URLs longer than this will be shortened, 0 means always shorten."
+msgstr ""
+
+#: actions/urlsettings.php:145
+msgid "Text longer than"
+msgstr ""
+
+#: actions/urlsettings.php:148
+msgid ""
+"URLs in notices longer than this will be shortened, 0 means always shorten."
+msgstr ""
+
+#. TRANS: Form validation error for form "Other settings" in user profile.
+#: actions/urlsettings.php:180
+#, fuzzy
+msgid "URL shortening service is too long (maximum 50 characters)."
+msgstr "URL 줄이기 서비스 너무 깁니다. (최대 50글자)"
+
+#: actions/urlsettings.php:187
+msgid "Invalid number for max url length."
+msgstr ""
+
+#: actions/urlsettings.php:193
+#, fuzzy
+msgid "Invalid number for max notice length."
+msgstr "옳지 않은 크기"
+
+#: actions/urlsettings.php:238
+msgid "Error saving user URL shortening preferences."
+msgstr ""
+
 #. TRANS: User admin panel title
 #: actions/useradminpanel.php:58
 msgctxt "TITLE"
@@ -6361,11 +6484,11 @@ msgstr ""
 #. TRANS: users in user admin panel. %1$s is the invalid nickname.
 #: actions/useradminpanel.php:166
 #, php-format
-msgid "Invalid default subscripton: '%1$s' is not a user."
+msgid "Invalid default subscripton: \"%1$s\" is not a user."
 msgstr ""
 
-#. TRANS: Link description in user account settings menu.
-#: actions/useradminpanel.php:215 lib/accountsettingsaction.php:106
+#: actions/useradminpanel.php:215 lib/action.php:565 lib/settingsnav.php:77
+#: lib/subgroupnav.php:81
 msgid "Profile"
 msgstr "프로필"
 
@@ -6427,58 +6550,62 @@ msgstr ""
 #. TRANS: Title for button to save user settings in user admin panel.
 #: actions/useradminpanel.php:302
 #, fuzzy
-msgid "Save user settings"
+msgid "Save user settings."
 msgstr "접근 설정을 저장"
 
-#: actions/userauthorization.php:105
+#. TRANS: Page title.
+#: actions/userauthorization.php:109
 msgid "Authorize subscription"
 msgstr "구독을 허가"
 
-#: actions/userauthorization.php:110
+#. TRANS: Page notice on "Auhtorize subscription" page.
+#: actions/userauthorization.php:115
 #, fuzzy
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
 "user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
-"click “Reject”."
+"click \"Reject\"."
 msgstr ""
 "사용자의 통지를 구독하려면 상세를 확인해 주세요. 구독하지 않는 경우는, \"취소"
 "\"를 클릭해 주세요."
 
-#. TRANS: Menu item for site administration
-#: actions/userauthorization.php:196 actions/version.php:167
-#: lib/adminpanelaction.php:403
-msgid "License"
-msgstr "라이센스"
-
-#: actions/userauthorization.php:217
+#. TRANS: Button text on Authorise Subscription page.
+#: actions/userauthorization.php:200
 #, fuzzy
+msgctxt "BUTTON"
 msgid "Accept"
 msgstr "수락"
 
-#: actions/userauthorization.php:218 lib/subscribeform.php:115
-#: lib/subscribeform.php:139
-msgid "Subscribe to this user"
+#. TRANS: Title for button on Authorise Subscription page.
+#: actions/userauthorization.php:202
+#, fuzzy
+msgid "Subscribe to this user."
 msgstr "이 회원을 구독합니다."
 
-#: actions/userauthorization.php:219
+#. TRANS: Button text on Authorise Subscription page.
+#: actions/userauthorization.php:204
 #, fuzzy
+msgctxt "BUTTON"
 msgid "Reject"
 msgstr "거부"
 
-#: actions/userauthorization.php:220
+#. TRANS: Title for button on Authorise Subscription page.
+#: actions/userauthorization.php:206
 #, fuzzy
-msgid "Reject this subscription"
+msgid "Reject this subscription."
 msgstr "%s 구독"
 
-#: actions/userauthorization.php:232
+#. TRANS: Client error displayed for an empty authorisation request.
+#: actions/userauthorization.php:219
 msgid "No authorization request!"
 msgstr "허용되지 않는 요청입니다."
 
-#: actions/userauthorization.php:254
+#. TRANS: Accept message header from Authorise subscription page.
+#: actions/userauthorization.php:242
 msgid "Subscription authorized"
 msgstr "구독 허가"
 
-#: actions/userauthorization.php:256
+#: actions/userauthorization.php:245
 #, fuzzy
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
@@ -6488,11 +6615,12 @@ msgstr ""
 "구독이 승인 되었습니다. 하지만 콜백 URL이 통과 되지 않았습니다. 웹사이트의 지"
 "시를 찾아 구독 승인 방법에 대하여 읽어보십시오. 귀하의 구독 토큰은 : "
 
-#: actions/userauthorization.php:266
+#. TRANS: Reject message header from Authorise subscription page.
+#: actions/userauthorization.php:256
 msgid "Subscription rejected"
 msgstr "구독 거부"
 
-#: actions/userauthorization.php:268
+#: actions/userauthorization.php:259
 #, fuzzy
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
@@ -6502,57 +6630,98 @@ msgstr ""
 "구독이 해지 되었습니다. 하지만 콜백 URL이 통과 되지 않았습니다. 웹사이트의 지"
 "시를 찾아 구독 해지 방법에 대하여 읽어보십시오."
 
-#: actions/userauthorization.php:303
+#. TRANS: Exception thrown when no valid user is found for an authorisation request.
+#. TRANS: %s is a listener URI.
+#: actions/userauthorization.php:296
 #, php-format
-msgid "Listener URI ‘%s’ not found here."
+msgid "Listener URI \"%s\" not found here."
 msgstr ""
 
-#: actions/userauthorization.php:308
+#. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
+#. TRANS: %s is a listenee URI.
+#: actions/userauthorization.php:303
 #, fuzzy, php-format
-msgid "Listenee URI ‘%s’ is too long."
+msgid "Listenee URI \"%s\" is too long."
 msgstr "소스 URL이 너무 깁니다."
 
-#: actions/userauthorization.php:314
-#, fuzzy, php-format
-msgid "Listenee URI ‘%s’ is a local user."
-msgstr "소스 URL이 너무 깁니다."
+#. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
+#. TRANS: %s is a listenee URI.
+#: actions/userauthorization.php:311
+#, php-format
+msgid "Listenee URI \"%s\" is a local user."
+msgstr ""
 
+#. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
+#. TRANS: %s is a profile URL.
 #: actions/userauthorization.php:329
 #, php-format
-msgid "Profile URL ‘%s’ is for a local user."
+msgid "Profile URL \"%s\" is for a local user."
 msgstr ""
 
-#: actions/userauthorization.php:345
+#. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
+#. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
+#: actions/userauthorization.php:339
+#, php-format
+msgid ""
+"Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
+"\"."
+msgstr ""
+
+#. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
+#. TRANS: %s is an avatar URL.
+#: actions/userauthorization.php:349
 #, fuzzy, php-format
-msgid "Avatar URL ‘%s’ is not valid."
+msgid "Avatar URL \"%s\" is not valid."
 msgstr "소스 URL이 올바르지 않습니다."
 
-#: actions/userauthorization.php:350
+#. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
+#. TRANS: %s is an avatar URL.
+#: actions/userauthorization.php:356
 #, fuzzy, php-format
-msgid "Can’t read avatar URL ‘%s’."
+msgid "Cannot read avatar URL \"%s\"."
 msgstr "아바타 URL '%s'을(를) 읽어낼 수 없습니다."
 
-#: actions/userauthorization.php:355
+#. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
+#. TRANS: %s is an avatar URL.
+#: actions/userauthorization.php:363
 #, fuzzy, php-format
-msgid "Wrong image type for avatar URL ‘%s’."
+msgid "Wrong image type for avatar URL \"%s\"."
 msgstr "%S 잘못된 그림 파일 타입입니다. "
 
 #. TRANS: Page title for profile design page.
-#: actions/userdesignsettings.php:74 lib/designsettings.php:63
+#: actions/userdesignsettings.php:74 lib/designsettings.php:61
 msgid "Profile design"
 msgstr "프로필 디자인"
 
 #. TRANS: Instructions for profile design page.
-#: actions/userdesignsettings.php:84 lib/designsettings.php:74
+#: actions/userdesignsettings.php:84 lib/designsettings.php:72
 msgid ""
 "Customize the way your profile looks with a background image and a colour "
 "palette of your choice."
 msgstr ""
 
-#: actions/userdesignsettings.php:272
+#: actions/userdesignsettings.php:289
 msgid "Enjoy your hotdog!"
 msgstr ""
 
+#: actions/userdesignsettings.php:325
+#, fuzzy
+msgid "Design settings"
+msgstr "접근 설정을 저장"
+
+#: actions/userdesignsettings.php:340
+msgid "View profile designs"
+msgstr "프로필 디자인 보기"
+
+#: actions/userdesignsettings.php:341
+msgid "Show or hide profile designs."
+msgstr "프로필 디자인 보이거나 감춥니다."
+
+#: actions/userdesignsettings.php:348
+#, fuzzy
+msgid "Background file"
+msgstr "배경"
+
 #. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number.
 #: actions/usergroups.php:66
 #, php-format
@@ -6603,6 +6772,11 @@ msgstr ""
 msgid "Contributors"
 msgstr "편집자"
 
+#. TRANS: Menu item for site administration
+#: actions/version.php:167 lib/adminpanelaction.php:403
+msgid "License"
+msgstr "라이센스"
+
 #: actions/version.php:170
 msgid ""
 "StatusNet is free software: you can redistribute it and/or modify it under "
@@ -6635,12 +6809,13 @@ msgstr ""
 "GNU 일반 공중 사용 허가서는 이 프로그램과 함께 제공됩니다. 만약, 이 문서가 누"
 "락되어 있다면 %s 페이지를 보십시오."
 
-#: actions/version.php:191
-msgid "Plugins"
-msgstr "플러그인"
+#. TRANS: Form input field label for application name.
+#: actions/version.php:197 lib/applicationeditform.php:190
+msgid "Name"
+msgstr "이름"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:901
+#: actions/version.php:198 lib/action.php:885
 msgid "Version"
 msgstr "버전"
 
@@ -6648,6 +6823,12 @@ msgstr "버전"
 msgid "Author(s)"
 msgstr "작성자"
 
+#. TRANS: Form input field label.
+#: actions/version.php:200 lib/applicationeditform.php:208
+#: lib/groupeditform.php:168
+msgid "Description"
+msgstr "설명"
+
 #. TRANS: Activity title when marking a notice as favorite.
 #: classes/Fave.php:164
 msgid "Favor"
@@ -6762,7 +6943,7 @@ msgid "Could not create login token for %s"
 msgstr "%s 에 대한 로그인 토큰을 만들 수 없습니다."
 
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
-#: classes/Memcached_DataObject.php:542
+#: classes/Memcached_DataObject.php:556
 msgid "No database name or DSN found anywhere."
 msgstr ""
 
@@ -6942,18 +7123,18 @@ msgstr "%1$s님이 귀하의 알림 메시지를 %2$s에서 듣고 있습니다.
 
 #. TRANS: Notice given on user registration.
 #. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:395
+#: classes/User.php:390
 #, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr "%s에 답신"
 
 #. TRANS: Server exception.
-#: classes/User.php:918
+#: classes/User.php:923
 msgid "No single user defined for single-user mode."
 msgstr ""
 
 #. TRANS: Server exception.
-#: classes/User.php:922
+#: classes/User.php:927
 msgid "Single-user mode code called when not enabled."
 msgstr ""
 
@@ -6998,42 +7179,6 @@ msgstr ""
 msgid "No AtomPub API service for %s."
 msgstr ""
 
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:104
-msgid "Change your profile settings"
-msgstr "프로필 세팅 바꾸기"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:111
-msgid "Upload an avatar"
-msgstr "아바타를 업로드하세요."
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:118
-msgid "Change your password"
-msgstr "비밀번호 바꾸기"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:125
-msgid "Change email handling"
-msgstr "메일 처리 변경"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:132
-#, fuzzy
-msgid "Design your profile"
-msgstr "이용자 프로필"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:139
-msgid "Other options"
-msgstr "다른 옵션들"
-
-#. TRANS: Link description in user account settings menu.
-#: lib/accountsettingsaction.php:141
-msgid "Other"
-msgstr "기타"
-
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
 #: lib/action.php:161
 #, php-format
@@ -7051,207 +7196,128 @@ msgctxt "TOOLTIP"
 msgid "Show more"
 msgstr ""
 
-#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:544
-msgid "Primary site navigation"
-msgstr "주 사이트 네비게이션"
-
-#. TRANS: Tooltip for main menu option "Personal".
-#: lib/action.php:550
+#. TRANS: Inline reply form submit button: submits a reply comment.
+#: lib/action.php:328
 #, fuzzy
-msgctxt "TOOLTIP"
-msgid "Personal profile and friends timeline"
-msgstr "개인 프로필과 친구 타임라인"
+msgctxt "BUTTON"
+msgid "Comment"
+msgstr "만족하는"
 
-#. TRANS: Main menu option when logged in for access to personal profile and friends timeline.
-#. TRANS: Personal group navigation menu option when logged in for viewing timeline of self and friends.
-#: lib/action.php:553 lib/personalgroupnav.php:100
-msgctxt "MENU"
-msgid "Personal"
-msgstr "개인"
+#. TRANS: Placeholder text for inline reply form. Clicking in this box will turn it into a mini notice form.
+#: lib/action.php:331
+msgid "Add a comment..."
+msgstr ""
 
-#. TRANS: Tooltip for main menu option "Account".
-#: lib/action.php:555
-msgctxt "TOOLTIP"
-msgid "Change your email, avatar, password, profile"
-msgstr "당신의 메일, 아바타, 비밀 번호, 프로필을 변경하세요."
+#: lib/action.php:559 lib/personalgroupnav.php:99
+#, fuzzy
+msgid "Home"
+msgstr "홈페이지"
 
-#. TRANS: Main menu option when logged in for access to user settings.
-#: lib/action.php:558
-msgid "Account"
-msgstr "계정"
-
-#. TRANS: Tooltip for main menu option "Services".
 #: lib/action.php:560
-msgctxt "TOOLTIP"
-msgid "Connect to services"
-msgstr "연결"
+#, fuzzy
+msgid "Friends timeline"
+msgstr "%s 타임라인"
 
-#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services.
-#: lib/action.php:563
-msgid "Connect"
-msgstr "연결"
-
-#. TRANS: Tooltip for menu option "Admin".
 #: lib/action.php:566
-msgctxt "TOOLTIP"
-msgid "Change site configuration"
+#, fuzzy
+msgid "Your profile"
+msgstr "그룹 프로필"
+
+#: lib/action.php:570 lib/action.php:593 lib/publicgroupnav.php:78
+msgid "Public"
+msgstr "공개"
+
+#: lib/action.php:571 lib/action.php:594
+#, fuzzy
+msgid "Everyone on this site"
+msgstr "이 사이트에 있는 사람 찾기"
+
+#: lib/action.php:575
+#, fuzzy
+msgid "Settings"
+msgstr "메일 설정"
+
+#: lib/action.php:576
+#, fuzzy
+msgid "Change your personal settings"
+msgstr "프로필 세팅 바꾸기"
+
+#: lib/action.php:582
+#, fuzzy
+msgid "Site configuration"
 msgstr "메일 주소 확인"
 
-#. TRANS: Main menu option when logged in and site admin for access to site configuration.
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/action.php:569 lib/groupnav.php:117
-msgctxt "MENU"
-msgid "Admin"
-msgstr "관리"
-
-#. TRANS: Tooltip for main menu option "Invite".
-#: lib/action.php:573
-#, fuzzy, php-format
-msgctxt "TOOLTIP"
-msgid "Invite friends and colleagues to join you on %s"
-msgstr "%s에 친구를 가입시키기 위해 친구와 동료를 초대합니다."
-
-#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users.
-#: lib/action.php:576
-msgctxt "MENU"
-msgid "Invite"
-msgstr "초대"
-
-#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:582
-msgctxt "TOOLTIP"
-msgid "Logout from the site"
-msgstr "이 사이트에서 로그아웃"
-
-#. TRANS: Main menu option when logged in to log out the current user.
-#: lib/action.php:585
-msgctxt "MENU"
+#: lib/action.php:587
+#, fuzzy
 msgid "Logout"
 msgstr "로그아웃"
 
-#. TRANS: Tooltip for main menu option "Register".
-#: lib/action.php:590
-msgctxt "TOOLTIP"
-msgid "Create an account"
-msgstr "새 계정 만들기"
+#: lib/action.php:588
+#, fuzzy
+msgid "Logout from the site"
+msgstr "이 사이트에서 로그아웃"
 
-#. TRANS: Main menu option when not logged in to register a new account.
-#. TRANS: Menu item for registering with the StatusNet site.
-#: lib/action.php:593 lib/logingroupnav.php:85
-msgctxt "MENU"
-msgid "Register"
-msgstr "등록"
-
-#. TRANS: Tooltip for main menu option "Login".
-#: lib/action.php:596
-msgctxt "TOOLTIP"
+#: lib/action.php:599
+#, fuzzy
 msgid "Login to the site"
 msgstr "이 사이트에 로그인"
 
-#. TRANS: Main menu option when not logged in to log in.
-#. TRANS: Menu item for logging in to the StatusNet site.
-#: lib/action.php:599 lib/logingroupnav.php:77
-msgctxt "MENU"
-msgid "Login"
-msgstr "로그인"
-
-#. TRANS: Tooltip for main menu option "Help".
-#: lib/action.php:602
-msgctxt "TOOLTIP"
-msgid "Help me!"
-msgstr "도움말"
-
-#. TRANS: Main menu option for help on the StatusNet site.
-#: lib/action.php:605
-msgctxt "MENU"
-msgid "Help"
-msgstr "도움말"
-
-#. TRANS: Tooltip for main menu option "Search".
-#: lib/action.php:608
-msgctxt "TOOLTIP"
-msgid "Search for people or text"
-msgstr "사람이나 단어 검색"
-
-#. TRANS: Main menu option when logged in or when the StatusNet instance is not private.
-#: lib/action.php:611
-msgctxt "MENU"
+#: lib/action.php:606
+#, fuzzy
 msgid "Search"
 msgstr "검색"
 
-#. TRANS: DT element for site notice. String is hidden in default CSS.
-#. TRANS: Menu item for site administration
-#: lib/action.php:633 lib/adminpanelaction.php:387
-msgid "Site notice"
-msgstr "사이트 공지"
-
-#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:700
-msgid "Local views"
-msgstr "로컬 뷰"
-
-#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:770
-msgid "Page notice"
-msgstr "페이지 공지"
-
-#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:874
-msgid "Secondary site navigation"
-msgstr "보조 사이트 네비게이션"
+#: lib/action.php:607
+#, fuzzy
+msgid "Search the site"
+msgstr "검색 도움말"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:880
+#: lib/action.php:864
 msgid "Help"
 msgstr "도움말"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:883
+#: lib/action.php:867
 msgid "About"
 msgstr "정보"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:886
+#: lib/action.php:870
 msgid "FAQ"
 msgstr "자주 묻는 질문"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:891
+#: lib/action.php:875
 msgid "TOS"
 msgstr "서비스 약관"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:895
+#: lib/action.php:879
 msgid "Privacy"
 msgstr "개인정보 취급방침"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:898
+#: lib/action.php:882
 msgid "Source"
 msgstr "소스 코드"
 
 #. TRANS: Secondary navigation menu option leading to e-mail contact information on the
 #. TRANS: StatusNet site, where to report bugs, ...
-#: lib/action.php:905
+#: lib/action.php:889
 msgid "Contact"
 msgstr "연락하기"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:908
+#: lib/action.php:892
 msgid "Badge"
 msgstr "배지"
 
-#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:937
-msgid "StatusNet software license"
-msgstr "StatusNet 소프트웨어 라이선스"
-
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:944
+#: lib/action.php:921
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7261,7 +7327,7 @@ msgstr ""
 "공하는 마이크로블로깅서비스입니다."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:947
+#: lib/action.php:924
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** 는 마이크로블로깅서비스입니다."
@@ -7270,7 +7336,7 @@ msgstr "**%%site.name%%** 는 마이크로블로깅서비스입니다."
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:954
+#: lib/action.php:931
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7281,52 +7347,42 @@ msgstr ""
 "을 사용합니다. StatusNet는 [GNU Affero General Public License](http://www."
 "fsf.org/licensing/licenses/agpl-3.0.html) 라이선스에 따라 사용할 수 있습니다."
 
-#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:970
-msgid "Site content license"
-msgstr "사이트 컨텐츠 라이선스"
-
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:977
+#: lib/action.php:949
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr "%1$s의 컨텐츠와 데이터는 외부 유출을 금지합니다."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:984
+#: lib/action.php:956
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr "컨텐츠와 데이터의 저작권은 %1$s의 소유입니다. All rights reserved."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:988
+#: lib/action.php:960
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 "컨텐츠와 데이터의 저작권은 각 이용자의 소유입니다. All rights reserved."
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:1020
+#: lib/action.php:992
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr "%1$s의 모든 컨텐츠와 데이터는 %2$s 라이선스에 따라 이용할 수 있습니다."
 
-#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1356
-msgid "Pagination"
-msgstr "페이지수"
-
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1367
+#: lib/action.php:1335
 msgid "After"
 msgstr "뒷 페이지"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1377
+#: lib/action.php:1345
 msgid "Before"
 msgstr "앞 페이지"
 
@@ -7483,7 +7539,7 @@ msgid "User configuration"
 msgstr "메일 주소 확인"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:122
+#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:110
 msgid "User"
 msgstr "사용자"
 
@@ -7507,6 +7563,11 @@ msgstr "메일 주소 확인"
 msgid "Edit site notice"
 msgstr "사이트 공지 편집"
 
+#. TRANS: Menu item for site administration
+#: lib/adminpanelaction.php:387
+msgid "Site notice"
+msgstr "사이트 공지"
+
 #. TRANS: Menu item title/tooltip
 #: lib/adminpanelaction.php:393
 msgid "Snapshots configuration"
@@ -7517,6 +7578,12 @@ msgstr "메일 주소 확인"
 msgid "Set site license"
 msgstr ""
 
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:409
+#, fuzzy
+msgid "Plugins configuration"
+msgstr "메일 주소 확인"
+
 #. TRANS: Client error 401.
 #: lib/apiauth.php:111
 msgid "API resource requires read-write access, but you only have read access."
@@ -7527,19 +7594,23 @@ msgstr ""
 msgid "No application for that consumer key."
 msgstr ""
 
+#: lib/apiauth.php:202 lib/apiauth.php:284
+msgid "Not allowed to use API."
+msgstr ""
+
 #. TRANS: OAuth exception given when an incorrect access token was given for a user.
-#: lib/apiauth.php:219
+#: lib/apiauth.php:225
 msgid "Bad access token."
 msgstr ""
 
 #. TRANS: OAuth exception given when no user was found for a given token (no token was found).
-#: lib/apiauth.php:224
+#: lib/apiauth.php:230
 msgid "No user for that token."
 msgstr ""
 
 #. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel".
 #. TRANS: Client error thrown when authentication fails.
-#: lib/apiauth.php:266 lib/apiauth.php:293
+#: lib/apiauth.php:272 lib/apiauth.php:302
 msgid "Could not authenticate you."
 msgstr ""
 
@@ -7586,6 +7657,11 @@ msgstr ""
 msgid "Failed to delete revoked token."
 msgstr ""
 
+#. TRANS: Form input field label for application icon.
+#: lib/applicationeditform.php:177
+msgid "Icon"
+msgstr "아이콘"
+
 #. TRANS: Form guide.
 #: lib/applicationeditform.php:182
 msgid "Icon for this application"
@@ -7621,6 +7697,11 @@ msgstr "소스 코드 URL"
 msgid "Organization responsible for this application"
 msgstr "이 응용프로그램 삭제 않기"
 
+#. TRANS: Form input field label.
+#: lib/applicationeditform.php:227
+msgid "Organization"
+msgstr "기관 이름이 필요합니다."
+
 #. TRANS: Form input field instructions.
 #: lib/applicationeditform.php:234
 #, fuzzy
@@ -7710,16 +7791,6 @@ msgstr ""
 msgid "Do not use this method!"
 msgstr "이 통지를 지울 수 없습니다."
 
-#. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:293
-msgid "Author"
-msgstr "작성자"
-
-#. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:307
-msgid "Provider"
-msgstr "미리보기"
-
 #. TRANS: Title.
 #: lib/attachmentnoticesection.php:67
 msgid "Notices where this attachment appears"
@@ -7748,24 +7819,29 @@ msgstr "비밀번호 변경"
 msgid "Block"
 msgstr "차단하기"
 
+#. TRANS: Description of the form to block a user.
+#: lib/blockform.php:79
+msgid "Block this user"
+msgstr "이 사용자 차단하기"
+
 #. TRANS: Title for command results.
-#: lib/channel.php:160 lib/channel.php:181
+#: lib/channel.php:104 lib/channel.php:125
 msgid "Command results"
 msgstr "실행결과"
 
 #. TRANS: Title for command results.
-#: lib/channel.php:194
+#: lib/channel.php:138
 #, fuzzy
 msgid "AJAX error"
 msgstr "Ajax 에러입니다."
 
 #. TRANS: E-mail subject when a command has completed.
-#: lib/channel.php:233 lib/mailhandler.php:143
+#: lib/channel.php:177 lib/mailhandler.php:143
 msgid "Command complete"
 msgstr "실행 완료"
 
 #. TRANS: E-mail subject when a command has failed.
-#: lib/channel.php:244
+#: lib/channel.php:188
 msgid "Command failed"
 msgstr "실행 실패"
 
@@ -7867,7 +7943,7 @@ msgstr "전체이름: %s"
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a location.
-#: lib/command.php:446 lib/mail.php:270
+#: lib/command.php:446 lib/mail.php:275
 #, php-format
 msgid "Location: %s"
 msgstr "위치: %s"
@@ -7875,7 +7951,7 @@ msgstr "위치: %s"
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a homepage.
-#: lib/command.php:450 lib/mail.php:274
+#: lib/command.php:450 lib/mail.php:279
 #, php-format
 msgid "Homepage: %s"
 msgstr "홈페이지: %s"
@@ -8106,113 +8182,103 @@ msgid ""
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:162
+#: lib/common.php:36
 #, fuzzy
 msgid "No configuration file found."
 msgstr "확인 코드가 없습니다."
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:165
+#: lib/common.php:39
 #, fuzzy
 msgid "I looked for configuration files in the following places:"
 msgstr "다음 사람들에게 초대권을 보냈습니다:"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:168
+#: lib/common.php:42
 msgid "You may wish to run the installer to fix this."
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:172
+#: lib/common.php:46
 msgid "Go to the installer."
 msgstr "이 사이트에 로그인"
 
-#. TRANS: Menu item for Instant Messaging settings.
-#: lib/connectsettingsaction.php:106
-#, fuzzy
-msgctxt "MENU"
-msgid "IM"
-msgstr "메신저"
-
-#. TRANS: Tooltip for Instant Messaging menu item.
-#: lib/connectsettingsaction.php:108
-msgid "Updates by instant messenger (IM)"
-msgstr "인스턴트 메신저에 의한 업데이트"
-
-#. TRANS: Menu item for Short Message Service settings.
-#: lib/connectsettingsaction.php:113
-#, fuzzy
-msgctxt "MENU"
-msgid "SMS"
-msgstr "SMS"
-
-#. TRANS: Tooltip for Short Message Service menu item.
-#: lib/connectsettingsaction.php:115
-msgid "Updates by SMS"
-msgstr "SMS에 의한 업데이트"
-
-#. TRANS: Menu item for OuAth connection settings.
-#: lib/connectsettingsaction.php:120
-msgctxt "MENU"
-msgid "Connections"
-msgstr "연결"
-
-#. TRANS: Tooltip for connected applications (Connections through OAuth) menu item.
-#: lib/connectsettingsaction.php:122
-#, fuzzy
-msgid "Authorized connected applications"
-msgstr "응용프로그램 삭제"
-
 #: lib/dberroraction.php:59
 msgid "Database error"
 msgstr "데이터베이스 오류"
 
+#. TRANS: Description of form for deleting a user.
+#: lib/deleteuserform.php:75
+msgid "Delete this user"
+msgstr "이 사용자 삭제"
+
+#: lib/designform.php:114
+#, fuzzy
+msgid "Change design"
+msgstr "디자인 저장"
+
+#. TRANS: Fieldset legend on profile design page to change profile page colours.
+#: lib/designform.php:131
+msgid "Change colours"
+msgstr "색상 변경"
+
+#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
+#: lib/designform.php:138
+msgid "Use defaults"
+msgstr "기본값 사용"
+
+#. TRANS: Title for button on profile design page to reset all colour settings to default.
+#: lib/designform.php:140
+msgid "Restore default designs"
+msgstr ""
+
+#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
+#: lib/designform.php:148
+msgid "Reset back to default"
+msgstr ""
+
 #. TRANS: Label in form on profile design page.
 #. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
-#: lib/designsettings.php:108
+#: lib/designform.php:158
 msgid "Upload file"
 msgstr "실행 실패"
 
 #. TRANS: Instructions for form on profile design page.
-#: lib/designsettings.php:113
+#: lib/designform.php:163
+#, fuzzy
 msgid ""
-"You can upload your personal background image. The maximum file size is 2MB."
+"You can upload your personal background image. The maximum file size is 2Mb."
 msgstr "개인 아바타를 올릴 수 있습니다. 최대 파일 크기는 2MB입니다."
 
 #. TRANS: Radio button on profile design page that will enable use of the uploaded profile image.
-#: lib/designsettings.php:139
+#: lib/designform.php:194
 #, fuzzy
 msgctxt "RADIO"
 msgid "On"
 msgstr "켜기"
 
 #. TRANS: Radio button on profile design page that will disable use of the uploaded profile image.
-#: lib/designsettings.php:156
+#: lib/designform.php:211
 #, fuzzy
 msgctxt "RADIO"
 msgid "Off"
 msgstr "끄기"
 
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: lib/designsettings.php:175
-msgid "Change colours"
-msgstr "색상 변경"
-
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: lib/designsettings.php:257
-msgid "Use defaults"
-msgstr "기본값 사용"
+#. TRANS: Title for button on profile design page to save settings.
+#: lib/designform.php:322
+msgid "Save design"
+msgstr "디자인 저장"
 
 #. TRANS: Error message displayed if design settings could not be saved.
 #. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
-#: lib/designsettings.php:405 lib/designsettings.php:427
+#: lib/designsettings.php:216 lib/designsettings.php:238
 msgid "Couldn't update your design."
 msgstr "디자인을 수정할 수 없습니다."
 
 #. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
-#: lib/designsettings.php:433
+#: lib/designsettings.php:244
 #, fuzzy
 msgid "Design defaults restored."
 msgstr "메일 설정이 저장되었습니다."
@@ -8283,28 +8349,24 @@ msgstr ""
 msgid "Feeds"
 msgstr ""
 
-#: lib/galleryaction.php:121
-msgid "Filter tags"
-msgstr "태그 필터링하기"
-
-#: lib/galleryaction.php:131
+#: lib/galleryaction.php:128
 msgid "All"
 msgstr "모든 것"
 
-#: lib/galleryaction.php:139
+#: lib/galleryaction.php:136
 #, fuzzy
 msgid "Select tag to filter"
 msgstr "통신 회사를 선택 하세요."
 
-#: lib/galleryaction.php:140
+#: lib/galleryaction.php:137
 msgid "Tag"
 msgstr "태그"
 
-#: lib/galleryaction.php:141
+#: lib/galleryaction.php:138
 msgid "Choose a tag to narrow list"
 msgstr "좁은 리스트에서 태그 선택하기"
 
-#: lib/galleryaction.php:143
+#: lib/galleryaction.php:140
 msgid "Go"
 msgstr "이동"
 
@@ -8390,6 +8452,12 @@ msgctxt "TOOLTIP"
 msgid "%s blocked users"
 msgstr ""
 
+#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
+#: lib/groupnav.php:117
+msgctxt "MENU"
+msgid "Admin"
+msgstr "관리"
+
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
 #: lib/groupnav.php:120
@@ -8496,39 +8564,61 @@ msgid "%dB"
 msgid_plural "%dB"
 msgstr[0] ""
 
-#: lib/jabber.php:387
+#: lib/implugin.php:262
 #, php-format
-msgid "[%s]"
-msgstr "[%s]"
+msgid ""
+"User \"%s\" on %s has said that your %s screenname belongs to them. If "
+"that's true, you can confirm by clicking on this URL: %s . (If you cannot "
+"click it, copy-and-paste it into the address bar of your browser). If that "
+"user isn't you, or if you didn't request this confirmation, just ignore this "
+"message."
+msgstr ""
 
-#: lib/jabber.php:567
+#: lib/implugin.php:349
 #, php-format
 msgid "Unknown inbox source %d."
 msgstr ""
 
+#: lib/implugin.php:485
+#, fuzzy, php-format
+msgid "Message too long - maximum is %1$d characters, you sent %2$d."
+msgstr "당신이 보낸 메시지가 너무 길어요. 최대 140글자까지입니다."
+
 #: lib/leaveform.php:114
 msgid "Leave"
 msgstr "떠나기"
 
+#. TRANS: Menu item for logging in to the StatusNet site.
+#: lib/logingroupnav.php:77
+msgctxt "MENU"
+msgid "Login"
+msgstr "로그인"
+
 #. TRANS: Title for menu item for logging in to the StatusNet site.
 #: lib/logingroupnav.php:79
 msgid "Login with a username and password"
 msgstr "사용자 이름과 비밀번호로 로그인"
 
+#. TRANS: Menu item for registering with the StatusNet site.
+#: lib/logingroupnav.php:85
+msgctxt "MENU"
+msgid "Register"
+msgstr "등록"
+
 #. TRANS: Title for menu item for registering with the StatusNet site.
 #: lib/logingroupnav.php:87
 msgid "Sign up for a new account"
 msgstr "새 계정을 위한 회원가입"
 
 #. TRANS: Subject for address confirmation email.
-#: lib/mail.php:168
+#: lib/mail.php:172
 msgid "Email address confirmation"
 msgstr "메일 주소 확인"
 
 #. TRANS: Body for address confirmation email.
 #. TRANS: %1$s is the addressed user's nickname, %2$s is the StatusNet sitename,
 #. TRANS: %3$s is the URL to confirm at.
-#: lib/mail.php:173
+#: lib/mail.php:177
 #, php-format
 msgid ""
 "Hey, %1$s.\n"
@@ -8547,14 +8637,14 @@ msgstr ""
 
 #. TRANS: Subject of new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
-#: lib/mail.php:238
+#: lib/mail.php:243
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1$s님이 귀하의 알림 메시지를 %2$s에서 듣고 있습니다."
 
 #. TRANS: This is a paragraph in a new-subscriber e-mail.
 #. TRANS: %s is a URL where the subscriber can be reported as abusive.
-#: lib/mail.php:245
+#: lib/mail.php:250
 #, php-format
 msgid ""
 "If you believe this account is being used abusively, you can block them from "
@@ -8566,7 +8656,7 @@ msgstr ""
 #. TRANS: %3$s is the subscriber's profile URL, %4$s is the subscriber's location (or empty)
 #. TRANS: %5$s is the subscriber's homepage URL (or empty), %6%s is the subscriber's bio (or empty)
 #. TRANS: %7$s is a link to the addressed user's e-mail settings.
-#: lib/mail.php:255
+#: lib/mail.php:260
 #, fuzzy, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -8587,14 +8677,14 @@ msgstr ""
 
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is biographical information.
-#: lib/mail.php:278
+#: lib/mail.php:283
 #, php-format
 msgid "Bio: %s"
 msgstr "위치: %s"
 
 #. TRANS: Subject of notification mail for new posting email address.
 #. TRANS: %s is the StatusNet sitename.
-#: lib/mail.php:307
+#: lib/mail.php:312
 #, php-format
 msgid "New email address for posting to %s"
 msgstr "%s에 포스팅 할 새로운 메일 주소"
@@ -8602,7 +8692,7 @@ msgstr "%s에 포스팅 할 새로운 메일 주소"
 #. TRANS: Body of notification mail for new posting email address.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is the e-mail address to send
 #. TRANS: to to post by e-mail, %3$s is a URL to more instructions.
-#: lib/mail.php:313
+#: lib/mail.php:318
 #, fuzzy, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -8619,26 +8709,26 @@ msgstr ""
 
 #. TRANS: Subject line for SMS-by-email notification messages.
 #. TRANS: %s is the posting user's nickname.
-#: lib/mail.php:434
+#: lib/mail.php:439
 #, php-format
 msgid "%s status"
 msgstr "%s 상태"
 
 #. TRANS: Subject line for SMS-by-email address confirmation message.
-#: lib/mail.php:460
+#: lib/mail.php:465
 msgid "SMS confirmation"
 msgstr "SMS 인증"
 
 #. TRANS: Main body heading for SMS-by-email address confirmation message.
 #. TRANS: %s is the addressed user's nickname.
-#: lib/mail.php:464
+#: lib/mail.php:469
 #, fuzzy, php-format
 msgid "%s: confirm you own this phone number with this code:"
 msgstr "이 전화 번호는 인증 대기중입니다."
 
 #. TRANS: Subject for 'nudge' notification email.
 #. TRANS: %s is the nudging user.
-#: lib/mail.php:485
+#: lib/mail.php:490
 #, fuzzy, php-format
 msgid "You have been nudged by %s"
 msgstr "%s 사용자가 찔러 봤습니다."
@@ -8646,7 +8736,7 @@ msgstr "%s 사용자가 찔러 봤습니다."
 #. TRANS: Body for 'nudge' notification email.
 #. TRANS: %1$s is the nuding user's long name, $2$s is the nudging user's nickname,
 #. TRANS: %3$s is a URL to post notices at, %4$s is the StatusNet sitename.
-#: lib/mail.php:492
+#: lib/mail.php:497
 #, php-format
 msgid ""
 "%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -8664,7 +8754,7 @@ msgstr ""
 
 #. TRANS: Subject for direct-message notification email.
 #. TRANS: %s is the sending user's nickname.
-#: lib/mail.php:539
+#: lib/mail.php:544
 #, php-format
 msgid "New private message from %s"
 msgstr "%s로부터 새로운 비밀 메시지가 도착하였습니다."
@@ -8673,7 +8763,7 @@ msgstr "%s로부터 새로운 비밀 메시지가 도착하였습니다."
 #. TRANS: %1$s is the sending user's long name, %2$s is the sending user's nickname,
 #. TRANS: %3$s is the message content, %4$s a URL to the message,
 #. TRANS: %5$s is the StatusNet sitename.
-#: lib/mail.php:547
+#: lib/mail.php:552
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -8694,7 +8784,7 @@ msgstr ""
 
 #. TRANS: Subject for favorite notification e-mail.
 #. TRANS: %1$s is the adding user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:599
+#: lib/mail.php:604
 #, fuzzy, php-format
 msgid "%1$s (@%2$s) added your notice as a favorite"
 msgstr "누군가 내 글을 좋아하는 게시글로 추가했을 때, 메일을 보냅니다."
@@ -8704,7 +8794,7 @@ msgstr "누군가 내 글을 좋아하는 게시글로 추가했을 때, 메일
 #. TRANS: %3$s is a URL to the faved notice, %4$s is the faved notice text,
 #. TRANS: %5$s is a URL to all faves of the adding user, %6$s is the StatusNet sitename,
 #. TRANS: %7$s is the adding user's nickname.
-#: lib/mail.php:606
+#: lib/mail.php:611
 #, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -8726,7 +8816,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:664
+#: lib/mail.php:669
 #, php-format
 msgid ""
 "The full conversation can be read here:\n"
@@ -8736,7 +8826,7 @@ msgstr ""
 
 #. TRANS: E-mail subject for notice notification.
 #. TRANS: %1$s is the sending user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:672
+#: lib/mail.php:677
 #, fuzzy, php-format
 msgid "%1$s (@%2$s) sent a notice to your attention"
 msgstr "누군가 내 글을 좋아하는 게시글로 추가했을 때, 메일을 보냅니다."
@@ -8747,7 +8837,7 @@ msgstr "누군가 내 글을 좋아하는 게시글로 추가했을 때, 메일
 #. TRANS: %5$s is a URL to the full conversion if it exists (otherwise empty),
 #. TRANS: %6$s is a URL to reply to the notice, %7$s is a URL to all @-replied for the addressed user,
 #. TRANS: %8$s is a URL to the addressed user's e-mail settings, %9$s is the sender's nickname.
-#: lib/mail.php:680
+#: lib/mail.php:685
 #, php-format
 msgid ""
 "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -8864,11 +8954,7 @@ msgstr "구독하고 있지 않습니다!"
 msgid "To"
 msgstr "받는 이"
 
-#: lib/messageform.php:166 lib/noticeform.php:186
-msgid "Available characters"
-msgstr "사용 가능한 글자"
-
-#: lib/messageform.php:185 lib/noticeform.php:237
+#: lib/messageform.php:184 lib/noticeform.php:236
 msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr "보내기"
@@ -8878,17 +8964,10 @@ msgstr "보내기"
 msgid "Messages"
 msgstr "메시지"
 
-#: lib/messagelistitem.php:123 lib/noticelist.php:522
+#: lib/messagelistitem.php:123 lib/noticelist.php:527
 msgid "from"
 msgstr "방법"
 
-#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:165
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr ""
-"별명은 반드시 영소문자와 숫자로만 이루어져야 하며 스페이스의 사용이 불가 합니"
-"다."
-
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 #: lib/nickname.php:178
 msgid "Nickname cannot be empty."
@@ -8910,78 +8989,82 @@ msgstr "게시글 보내기"
 msgid "What's up, %s?"
 msgstr "뭐하세요 %s님?"
 
-#: lib/noticeform.php:194
+#: lib/noticeform.php:193
 msgid "Attach"
 msgstr "첨부"
 
-#: lib/noticeform.php:198
+#: lib/noticeform.php:197
 msgid "Attach a file"
 msgstr ""
 
-#: lib/noticeform.php:213
+#: lib/noticeform.php:212
 msgid "Share my location"
 msgstr "내 위치 공유"
 
-#: lib/noticeform.php:216
+#: lib/noticeform.php:215
 msgid "Do not share my location"
 msgstr "내 위치 공유하지 않기"
 
-#: lib/noticeform.php:217
+#: lib/noticeform.php:216
 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
 "try again later"
 msgstr ""
 
 #. TRANS: Used in coordinates as abbreviation of north
-#: lib/noticelist.php:452
+#: lib/noticelist.php:457
 msgid "N"
 msgstr "북"
 
 #. TRANS: Used in coordinates as abbreviation of south
-#: lib/noticelist.php:454
+#: lib/noticelist.php:459
 msgid "S"
 msgstr "남"
 
 #. TRANS: Used in coordinates as abbreviation of east
-#: lib/noticelist.php:456
+#: lib/noticelist.php:461
 msgid "E"
 msgstr "동"
 
 #. TRANS: Used in coordinates as abbreviation of west
-#: lib/noticelist.php:458
+#: lib/noticelist.php:463
 msgid "W"
 msgstr "서"
 
-#: lib/noticelist.php:460
+#: lib/noticelist.php:465
 #, php-format
 msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 
-#: lib/noticelist.php:469
+#: lib/noticelist.php:474
 msgid "at"
 msgstr "위치"
 
-#: lib/noticelist.php:518
+#: lib/noticelist.php:523
 msgid "web"
 msgstr "웹"
 
-#: lib/noticelist.php:584
+#: lib/noticelist.php:589
 msgid "in context"
 msgstr "문맥"
 
-#: lib/noticelist.php:619
+#: lib/noticelist.php:624
 msgid "Repeated by"
 msgstr "재전송됨"
 
-#: lib/noticelist.php:646
+#: lib/noticelist.php:651
 msgid "Reply to this notice"
 msgstr "이 게시글에 대해 답장하기"
 
-#: lib/noticelist.php:647
+#: lib/noticelist.php:652
 msgid "Reply"
 msgstr "답장하기"
 
-#: lib/noticelist.php:691
+#: lib/noticelist.php:678
+msgid "Delete this notice"
+msgstr "이 게시글 삭제하기"
+
+#: lib/noticelist.php:696
 #, fuzzy
 msgid "Notice repeated"
 msgstr "게시글이 등록되었습니다."
@@ -9019,48 +9102,31 @@ msgstr ""
 msgid "Couldn't insert new subscription."
 msgstr "예약 구독을 추가 할 수 없습니다."
 
-#. TRANS: Personal group navigation menu option when logged in for viewing @-replies.
-#: lib/personalgroupnav.php:107
+#: lib/personalgroupnav.php:104
 #, fuzzy
-msgctxt "MENU"
 msgid "Replies"
 msgstr "답신"
 
-#. TRANS: Personal group navigation menu option when logged in for seeing own profile.
-#: lib/personalgroupnav.php:114
+#: lib/personalgroupnav.php:109
 #, fuzzy
-msgctxt "MENU"
-msgid "Profile"
-msgstr "프로필"
-
-#. TRANS: Personal group navigation menu option when logged in for viewing own favourited notices.
-#: lib/personalgroupnav.php:120
-#, fuzzy
-msgctxt "MENU"
 msgid "Favorites"
 msgstr "좋아하는 글들"
 
-#. TRANS: Personal group navigation menu option when logged in for viewing recieved personal messages.
-#: lib/personalgroupnav.php:133
+#: lib/personalgroupnav.php:120
 #, fuzzy
-msgctxt "MENU"
 msgid "Inbox"
 msgstr "받은 쪽지함"
 
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing recieved personal messages.
-#: lib/personalgroupnav.php:135
+#: lib/personalgroupnav.php:121
 msgid "Your incoming messages"
 msgstr "받은 메시지"
 
-#. TRANS: Personal group navigation menu option when logged in for viewing senet personal messages.
-#: lib/personalgroupnav.php:140
+#: lib/personalgroupnav.php:125
 #, fuzzy
-msgctxt "MENU"
 msgid "Outbox"
 msgstr "보낸 쪽지함"
 
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing senet personal messages.
-#: lib/personalgroupnav.php:142
+#: lib/personalgroupnav.php:126
 msgid "Your sent messages"
 msgstr "보낸 메시지"
 
@@ -9076,9 +9142,26 @@ msgstr "%s의 게시글의 태그"
 msgid "Unknown"
 msgstr "알려지지 않은 행동"
 
+#. TRANS: Plugin admin panel controls
+#: lib/plugindisableform.php:90
+msgctxt "plugin"
+msgid "Disable"
+msgstr ""
+
+#. TRANS: Plugin admin panel controls
+#: lib/pluginenableform.php:112
+msgctxt "plugin"
+msgid "Enable"
+msgstr ""
+
+#: lib/pluginlist.php:196
+msgctxt "plugin-description"
+msgid "(Plugin descriptions unavailable when disabled.)"
+msgstr ""
+
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:82
+#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:88
 msgid "Subscriptions"
 msgstr "구독"
 
@@ -9089,7 +9172,7 @@ msgstr "모든 예약 구독"
 
 #. TRANS: H2 text for user subscriber statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:90
+#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:96
 msgid "Subscribers"
 msgstr "구독자"
 
@@ -9111,7 +9194,7 @@ msgstr "가입한 때"
 #. TRANS: Label for user statistics.
 #. TRANS: H2 text for user group membership statistics.
 #: lib/profileaction.php:239 lib/profileaction.php:290
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:104
 msgid "Groups"
 msgstr "그룹"
 
@@ -9131,10 +9214,6 @@ msgstr "모든 그룹"
 msgid "Unimplemented method."
 msgstr ""
 
-#: lib/publicgroupnav.php:78
-msgid "Public"
-msgstr "공개"
-
 #: lib/publicgroupnav.php:82
 msgid "User groups"
 msgstr "사용자 그룹"
@@ -9175,7 +9254,7 @@ msgid "Revoke the \"%s\" role from this user"
 msgstr "그룹 이용자는 차단해제"
 
 #. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:974
+#: lib/router.php:1001
 #, fuzzy
 msgid "Page not found."
 msgstr "API 메서드 발견 안 됨."
@@ -9207,11 +9286,6 @@ msgctxt "BUTTON"
 msgid "Search"
 msgstr "검색"
 
-#. TRANS: Definition list item with instructions on how to get (better) search results.
-#: lib/searchaction.php:170
-msgid "Search help"
-msgstr "검색 도움말"
-
 #: lib/searchgroupnav.php:80
 msgid "People"
 msgstr "사람들"
@@ -9236,6 +9310,53 @@ msgstr "제목없는 섹션"
 msgid "More..."
 msgstr "더 보기..."
 
+#: lib/settingsnav.php:78
+msgid "Change your profile settings"
+msgstr "프로필 세팅 바꾸기"
+
+#: lib/settingsnav.php:83
+msgid "Upload an avatar"
+msgstr "아바타를 업로드하세요."
+
+#: lib/settingsnav.php:88
+msgid "Change your password"
+msgstr "비밀번호 바꾸기"
+
+#: lib/settingsnav.php:93
+msgid "Change email handling"
+msgstr "메일 처리 변경"
+
+#: lib/settingsnav.php:98
+#, fuzzy
+msgid "Design your profile"
+msgstr "이용자 프로필"
+
+#: lib/settingsnav.php:102
+msgid "URL"
+msgstr "URL"
+
+#: lib/settingsnav.php:103
+msgid "URL shorteners"
+msgstr ""
+
+#: lib/settingsnav.php:111
+msgid "Updates by instant messenger (IM)"
+msgstr "인스턴트 메신저에 의한 업데이트"
+
+#: lib/settingsnav.php:118
+msgid "Updates by SMS"
+msgstr "SMS에 의한 업데이트"
+
+#: lib/settingsnav.php:123
+#, fuzzy
+msgid "Connections"
+msgstr "연결"
+
+#: lib/settingsnav.php:124
+#, fuzzy
+msgid "Authorized connected applications"
+msgstr "응용프로그램 삭제"
+
 #: lib/silenceform.php:67
 #, fuzzy
 msgid "Silence"
@@ -9245,30 +9366,34 @@ msgstr "사이트 공지"
 msgid "Silence this user"
 msgstr "이 사용자 삭제"
 
-#: lib/subgroupnav.php:83
+#: lib/subgroupnav.php:89
 #, php-format
 msgid "People %s subscribes to"
 msgstr "%s 사람들은 구독합니다."
 
-#: lib/subgroupnav.php:91
+#: lib/subgroupnav.php:97
 #, php-format
 msgid "People subscribed to %s"
 msgstr "%s에 의해 구독되는 사람들"
 
-#: lib/subgroupnav.php:99
+#: lib/subgroupnav.php:105
 #, php-format
 msgid "Groups %s is a member of"
 msgstr "%s 사용자가 멤버인 그룹"
 
-#: lib/subgroupnav.php:105
+#: lib/subgroupnav.php:111
 msgid "Invite"
 msgstr "초대"
 
-#: lib/subgroupnav.php:106
+#: lib/subgroupnav.php:112
 #, php-format
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "%s에 친구를 가입시키기 위해 친구와 동료를 초대합니다."
 
+#: lib/subscribeform.php:115 lib/subscribeform.php:139
+msgid "Subscribe to this user"
+msgstr "이 회원을 구독합니다."
+
 #: lib/subscriberspeopleselftagcloudsection.php:48
 #: lib/subscriptionspeopleselftagcloudsection.php:48
 msgid "People Tagcloud as self-tagged"
@@ -9338,6 +9463,12 @@ msgstr ""
 msgid "Error opening theme archive."
 msgstr "차단 제거 에러!"
 
+#: lib/threadednoticelist.php:270
+#, php-format
+msgid "Show all %d comment"
+msgid_plural "Show all %d comments"
+msgstr[0] ""
+
 #: lib/topposterssection.php:74
 msgid "Top posters"
 msgstr "상위 게시글 등록자"
@@ -9381,120 +9512,124 @@ msgstr "구독 해제"
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "이용자가 프로필을 가지고 있지 않습니다."
 
-#. TRANS: Link text for changeing the avatar of the logged in user.
-#: lib/userprofile.php:121
+#: lib/userprofile.php:116
 msgid "Edit Avatar"
 msgstr "아바타 편집"
 
 #. TRANS: H2 for user actions in a profile.
 #. TRANS: H2 for entity actions in a profile.
-#: lib/userprofile.php:245 lib/userprofile.php:261
+#: lib/userprofile.php:216 lib/userprofile.php:232
 msgid "User actions"
 msgstr "사용자 동작"
 
 #. TRANS: Text shown in user profile of not yet compeltely deleted users.
-#: lib/userprofile.php:249
+#: lib/userprofile.php:220
 msgid "User deletion in progress..."
 msgstr ""
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:277
+#: lib/userprofile.php:248
 msgid "Edit profile settings"
 msgstr "프로필 설정"
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:279
+#: lib/userprofile.php:250
 msgid "Edit"
 msgstr "편집"
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:303
+#: lib/userprofile.php:274
 msgid "Send a direct message to this user"
 msgstr "이 회원에게 직접 메시지를 보냅니다."
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:305
+#: lib/userprofile.php:276
 msgid "Message"
 msgstr "메시지"
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:347
+#: lib/userprofile.php:318
 msgid "Moderate"
 msgstr ""
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:386
+#: lib/userprofile.php:357
 #, fuzzy
 msgid "User role"
 msgstr "이용자 프로필"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:389
+#: lib/userprofile.php:360
 msgctxt "role"
 msgid "Administrator"
 msgstr "관리자"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:391
+#: lib/userprofile.php:362
 msgctxt "role"
 msgid "Moderator"
 msgstr ""
 
+#: lib/util.php:321
+#, fuzzy
+msgid "Not allowed to log in."
+msgstr "로그인하고 있지 않습니다."
+
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1306
+#: lib/util.php:1337
 msgid "a few seconds ago"
 msgstr "몇 초 전"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1309
+#: lib/util.php:1340
 msgid "about a minute ago"
 msgstr "1분 전"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1313
+#: lib/util.php:1344
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
 msgstr[0] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1316
+#: lib/util.php:1347
 msgid "about an hour ago"
 msgstr "1시간 전"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1320
+#: lib/util.php:1351
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
 msgstr[0] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1323
+#: lib/util.php:1354
 msgid "about a day ago"
 msgstr "하루 전"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1327
+#: lib/util.php:1358
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
 msgstr[0] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1330
+#: lib/util.php:1361
 msgid "about a month ago"
 msgstr "1달 전"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1334
+#: lib/util.php:1365
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
 msgstr[0] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1337
+#: lib/util.php:1368
 msgid "about a year ago"
 msgstr "1년 전"
 
@@ -9505,20 +9640,6 @@ msgstr "1년 전"
 msgid "%s is not a valid color! Use 3 or 6 hex characters."
 msgstr "홈페이지 주소형식이 올바르지 않습니다."
 
-#. TRANS: %s is the URL to the StatusNet site's Instant Messaging settings.
-#: lib/xmppmanager.php:287
-#, php-format
-msgid "Unknown user. Go to %s to add your address to your account"
-msgstr ""
-
-#. TRANS: Response to XMPP source when it sent too long a message.
-#. TRANS: %1$d the maximum number of allowed characters (used for plural), %2$d is the sent number.
-#: lib/xmppmanager.php:406
-#, fuzzy, php-format
-msgid "Message too long. Maximum is %1$d character, you sent %2$d."
-msgid_plural "Message too long. Maximum is %1$d characters, you sent %2$d."
-msgstr[0] "당신이 보낸 메시지가 너무 길어요. 최대 140글자까지입니다."
-
 #. TRANS: Exception.
 #: lib/xrd.php:63
 #, fuzzy
@@ -9537,61 +9658,166 @@ msgid "Getting backup from file '%s'."
 msgstr ""
 
 #, fuzzy
-#~ msgid "Block this user."
-#~ msgstr "이 사용자 차단하기"
+#~ msgid "Could not generate feed for group - %s"
+#~ msgstr "그룹을 업데이트 할 수 없습니다."
 
 #, fuzzy
-#~ msgid "Delete this notice."
-#~ msgstr "이 게시글 삭제하기"
+#~ msgid "Current confirmed Jabber/Google Talk address."
+#~ msgstr "확인된 최신의 Jabber/GTalk 계정"
 
 #, fuzzy
-#~ msgid "Delete this user."
-#~ msgstr "이 사용자 삭제"
+#~ msgid ""
+#~ "Jabber or Google Talk address, like \"UserName@example.org\". First, make "
+#~ "sure to add %s to your buddy list in your IM client or on Google Talk."
+#~ msgstr ""
+#~ "\"UserName@example.org\" 와 같은 Jabber 또는 GTalk 계정은 귀하의 메신저나 "
+#~ "GTalk 친구목록에 반드시 %s 주소를 추가하여 주십시오."
 
 #, fuzzy
-#~ msgid "Restore default designs."
-#~ msgstr "기본값 사용"
+#~ msgid "Send me notices through Jabber/Google Talk."
+#~ msgstr "Jabber/GTalk 로 통지를 보내주세요."
 
 #, fuzzy
-#~ msgid "Save design."
-#~ msgstr "디자인 저장"
+#~ msgid "Publish a MicroID for my Jabber/Google Talk address."
+#~ msgstr "Jabber/GTalk 계정을 위한 MicroID의 생성"
+
+#~ msgid "No Jabber ID."
+#~ msgstr "Jabber ID가 아닙니다."
 
 #, fuzzy
-#~ msgid "Disfavor favorite."
-#~ msgstr "좋아하는글 취소"
+#~ msgid "Not a valid Jabber ID."
+#~ msgstr "유효한 Jabber ID가 아닙니다."
+
+#~ msgid "That is already your Jabber ID."
+#~ msgstr "그 Jabber ID는 이미 귀하의 것입니다."
+
+#~ msgid "That is not your Jabber ID."
+#~ msgstr "그 Jabber ID는 귀하의 것이 아닙니다."
+
+#~ msgid "Other settings"
+#~ msgstr "아바타 설정"
+
+#~ msgid "Tag cloud"
+#~ msgstr "태그 클라우드"
 
 #, fuzzy
-#~ msgid "\"%s\" not found."
-#~ msgstr "API 메서드 발견 안 됨."
+#~ msgid "Authorize URL"
+#~ msgstr "작성자"
+
+#~ msgid "Jabber"
+#~ msgstr "Jabber"
+
+#~ msgid "Photo"
+#~ msgstr "사진"
+
+#~ msgid "Other options"
+#~ msgstr "다른 옵션들"
+
+#~ msgid "Other"
+#~ msgstr "기타"
+
+#~ msgid "Primary site navigation"
+#~ msgstr "주 사이트 네비게이션"
 
 #, fuzzy
-#~ msgid "Notice %s not found."
-#~ msgstr "API 메서드 발견 안 됨."
+#~ msgctxt "TOOLTIP"
+#~ msgid "Personal profile and friends timeline"
+#~ msgstr "개인 프로필과 친구 타임라인"
+
+#~ msgctxt "MENU"
+#~ msgid "Personal"
+#~ msgstr "개인"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Change your email, avatar, password, profile"
+#~ msgstr "당신의 메일, 아바타, 비밀 번호, 프로필을 변경하세요."
+
+#~ msgid "Account"
+#~ msgstr "계정"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Connect to services"
+#~ msgstr "연결"
+
+#~ msgid "Connect"
+#~ msgstr "연결"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Change site configuration"
+#~ msgstr "메일 주소 확인"
 
 #, fuzzy
-#~ msgid "Attachment %s not found."
-#~ msgstr "받는 사용자가 없습니다."
+#~ msgctxt "TOOLTIP"
+#~ msgid "Invite friends and colleagues to join you on %s"
+#~ msgstr "%s에 친구를 가입시키기 위해 친구와 동료를 초대합니다."
+
+#~ msgctxt "MENU"
+#~ msgid "Invite"
+#~ msgstr "초대"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Create an account"
+#~ msgstr "새 계정 만들기"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Help me!"
+#~ msgstr "도움말"
+
+#~ msgctxt "MENU"
+#~ msgid "Help"
+#~ msgstr "도움말"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Search for people or text"
+#~ msgstr "사람이나 단어 검색"
+
+#~ msgid "Local views"
+#~ msgstr "로컬 뷰"
+
+#~ msgid "Page notice"
+#~ msgstr "페이지 공지"
+
+#~ msgid "Secondary site navigation"
+#~ msgstr "보조 사이트 네비게이션"
+
+#~ msgid "StatusNet software license"
+#~ msgstr "StatusNet 소프트웨어 라이선스"
+
+#~ msgid "Site content license"
+#~ msgstr "사이트 컨텐츠 라이선스"
+
+#~ msgid "Pagination"
+#~ msgstr "페이지수"
+
+#~ msgid "Author"
+#~ msgstr "작성자"
+
+#~ msgid "Provider"
+#~ msgstr "미리보기"
 
 #, fuzzy
-#~ msgid "Invalid tag: \"%s\"."
-#~ msgstr "올바르지 않은 태그: \"%s\""
+#~ msgctxt "MENU"
+#~ msgid "SMS"
+#~ msgstr "SMS"
+
+#~ msgid "Filter tags"
+#~ msgstr "태그 필터링하기"
+
+#~ msgid "[%s]"
+#~ msgstr "[%s]"
+
+#~ msgid "Available characters"
+#~ msgstr "사용 가능한 글자"
 
 #, fuzzy
-#~ msgid "%s updates from everyone."
-#~ msgstr "모두로부터의 업데이트 %s개!"
+#~ msgctxt "MENU"
+#~ msgid "Profile"
+#~ msgstr "프로필"
+
+#~ msgid "Search help"
+#~ msgstr "검색 도움말"
 
 #, fuzzy
-#~ msgid "Password saved"
-#~ msgstr "비밀 번호 저장"
-
-#, fuzzy
-#~ msgid "Where you are, like \"City, State (or Region), Country\"."
-#~ msgstr "당신은 어디에 삽니까? \"시, 도 (or 군,구), 나라\""
-
-#, fuzzy
-#~ msgid "Subscribe to this user."
-#~ msgstr "이 회원을 구독합니다."
-
-#, fuzzy
-#~ msgid "Not allowed to log in."
-#~ msgstr "로그인하고 있지 않습니다."
+#~ msgid "Message too long. Maximum is %1$d character, you sent %2$d."
+#~ msgid_plural "Message too long. Maximum is %1$d characters, you sent %2$d."
+#~ msgstr[0] "당신이 보낸 메시지가 너무 길어요. 최대 140글자까지입니다."
diff --git a/locale/mk/LC_MESSAGES/statusnet.po b/locale/mk/LC_MESSAGES/statusnet.po
index f544daef51..d4516d7781 100644
--- a/locale/mk/LC_MESSAGES/statusnet.po
+++ b/locale/mk/LC_MESSAGES/statusnet.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 15:58+0000\n"
-"PO-Revision-Date: 2011-03-03 16:01:01+0000\n"
+"POT-Creation-Date: 2011-03-03 17:23+0000\n"
+"PO-Revision-Date: 2011-03-03 17:26:14+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -79,23 +79,23 @@ msgstr "Зачувај нагодувања на пристап"
 #. TRANS: Tooltip for button to save access settings in site admin panel.
 #. TRANS: Button text for saving theme settings.
 #. TRANS: Button label to save e-mail preferences.
-#. TRANS: Button label to save Instant Messaging preferences.
-#. TRANS: Button text for saving "Other settings" in profile.
+#. TRANS: Button label to save IM preferences.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
 #. TRANS: Button text for saving site notice in admin panel.
 #. TRANS: Button label to save SMS preferences.
 #. TRANS: Save button for settings for a profile in a subscriptions list.
+#. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
 #. TRANS: Button text on profile design page to save settings.
 #: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
-#: actions/emailsettings.php:250 actions/imsettings.php:183
-#: actions/othersettings.php:136 actions/pathsadminpanel.php:512
-#: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
-#: actions/smssettings.php:205 actions/subscriptions.php:259
+#: actions/emailsettings.php:251 actions/imsettings.php:199
+#: actions/pathsadminpanel.php:512 actions/profilesettings.php:198
+#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:204
+#: actions/subscriptions.php:261 actions/urlsettings.php:152
 #: actions/useradminpanel.php:298 lib/applicationeditform.php:355
-#: lib/designsettings.php:270 lib/groupeditform.php:201
+#: lib/designform.php:320 lib/groupeditform.php:201
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Зачувај"
@@ -134,7 +134,11 @@ msgstr "Нема таква страница."
 #. 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 use "one time password login" without using an existing user.
+#. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
+#. TRANS: Client error displayed trying to find a user by ID for a non-existing ID.
+#. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when calling a profile action without specifying a user.
 #: actions/all.php:80 actions/allrss.php:69
@@ -146,19 +150,19 @@ msgstr "Нема таква страница."
 #: actions/apidirectmessage.php:75 actions/apidirectmessagenew.php:72
 #: actions/apigroupcreate.php:111 actions/apigroupismember.php:89
 #: actions/apigroupjoin.php:98 actions/apigroupleave.php:98
-#: actions/apigrouplist.php:70 actions/apistatusesupdate.php:230
-#: actions/apisubscriptions.php:85 actions/apitimelinefavorites.php:70
-#: actions/apitimelinefriends.php:173 actions/apitimelinehome.php:78
-#: actions/apitimelinementions.php:77 actions/apitimelineuser.php:79
-#: actions/avatarbynickname.php:79 actions/favoritesrss.php:72
-#: actions/foaf.php:42 actions/foaf.php:61 actions/hcard.php:67
-#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
-#: actions/remotesubscribe.php:144 actions/remotesubscribe.php:153
-#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
-#: actions/showfavorites.php:106 actions/userbyid.php:74
-#: actions/usergroups.php:93 actions/userrss.php:40 actions/userxrd.php:59
-#: actions/xrds.php:71 lib/command.php:509 lib/galleryaction.php:59
-#: lib/mailbox.php:80 lib/profileaction.php:77
+#: actions/apigrouplist.php:70 actions/apigroupprofileupdate.php:108
+#: actions/apistatusesupdate.php:230 actions/apisubscriptions.php:85
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:173
+#: actions/apitimelinehome.php:78 actions/apitimelinementions.php:77
+#: actions/apitimelineuser.php:79 actions/avatarbynickname.php:79
+#: actions/favoritesrss.php:72 actions/foaf.php:42 actions/foaf.php:61
+#: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116
+#: actions/otp.php:78 actions/remotesubscribe.php:144
+#: actions/remotesubscribe.php:153 actions/replies.php:73
+#: actions/repliesrss.php:38 actions/rsd.php:113 actions/showfavorites.php:106
+#: actions/userbyid.php:75 actions/usergroups.php:93 actions/userrss.php:40
+#: actions/userxrd.php:59 actions/xrds.php:71 lib/command.php:509
+#: lib/galleryaction.php:59 lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Нема таков корисник."
 
@@ -172,10 +176,9 @@ msgstr "%1$s и пријателите, стр. %2$d"
 #. TRANS: H1 text for page. %s is a user nickname.
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Timeline title for user and friends. %s is a user nickname.
-#. TRANS: Tooltop for personal group navigation menu option when logged in for viewing timeline of self and friends.
 #: actions/all.php:94 actions/all.php:191 actions/allrss.php:117
 #: actions/apitimelinefriends.php:207 actions/apitimelinehome.php:113
-#: lib/personalgroupnav.php:102
+#: lib/personalgroupnav.php:100
 #, php-format
 msgid "%s and friends"
 msgstr "%s и пријатели"
@@ -232,7 +235,7 @@ msgstr ""
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
 #. TRANS: Second sentence of empty message for anonymous users. %s is a user nickname.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:227
+#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:221
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -281,19 +284,20 @@ msgstr "Подновувања од %1$s и пријатели на %2$s!"
 #: actions/apifavoritecreate.php:98 actions/apifavoritedestroy.php:98
 #: actions/apifriendshipscreate.php:99 actions/apifriendshipsdestroy.php:99
 #: actions/apifriendshipsshow.php:124 actions/apigroupcreate.php:138
-#: actions/apigroupismember.php:115 actions/apigroupjoin.php:160
-#: actions/apigroupleave.php:145 actions/apigrouplist.php:134
+#: actions/apigroupismember.php:115 actions/apigroupjoin.php:151
+#: actions/apigroupleave.php:141 actions/apigrouplist.php:134
 #: actions/apigrouplistall.php:120 actions/apigroupmembership.php:105
+#: actions/apigroupprofileupdate.php:100 actions/apigroupprofileupdate.php:213
 #: actions/apigroupshow.php:114 actions/apihelptest.php:84
 #: actions/apistatusesdestroy.php:101 actions/apistatusesretweets.php:110
 #: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:139
 #: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
-#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:268
-#: actions/apitimelinegroup.php:147 actions/apitimelinehome.php:173
-#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:239
-#: actions/apitimelineretweetedtome.php:118
-#: actions/apitimelineretweetsofme.php:150 actions/apitimelinetag.php:159
-#: actions/apitimelineuser.php:206 actions/apiusershow.php:100
+#: actions/apitimelinefavorites.php:182 actions/apitimelinefriends.php:276
+#: actions/apitimelinegroup.php:148 actions/apitimelinehome.php:181
+#: actions/apitimelinementions.php:182 actions/apitimelinepublic.php:247
+#: actions/apitimelineretweetedtome.php:147
+#: actions/apitimelineretweetsofme.php:147 actions/apitimelinetag.php:165
+#: actions/apitimelineuser.php:217 actions/apiusershow.php:100
 msgid "API method not found."
 msgstr "API методот не е пронајден."
 
@@ -308,8 +312,9 @@ msgstr "API методот не е пронајден."
 #: actions/apifavoritecreate.php:88 actions/apifavoritedestroy.php:88
 #: actions/apifriendshipscreate.php:89 actions/apifriendshipsdestroy.php:89
 #: actions/apigroupcreate.php:102 actions/apigroupjoin.php:89
-#: actions/apigroupleave.php:89 actions/apimediaupload.php:66
-#: actions/apistatusesretweet.php:63 actions/apistatusesupdate.php:194
+#: actions/apigroupleave.php:89 actions/apigroupprofileupdate.php:92
+#: actions/apimediaupload.php:66 actions/apistatusesretweet.php:63
+#: actions/apistatusesupdate.php:194
 msgid "This method requires a POST."
 msgstr "Овој метод бара POST."
 
@@ -323,21 +328,16 @@ msgstr ""
 "sms, im, none."
 
 #. TRANS: Server error displayed when a user's delivery device cannot be updated.
-#. TRANS: Server error displayed when a user update to the database fails in the contact address confirmation action.
 #. TRANS: Server error thrown on database error updating e-mail preferences.
 #. TRANS: Server error thrown on database error removing a registered e-mail address.
-#. TRANS: Server error thrown on database error updating Instant Messaging preferences.
-#. TRANS: Server error thrown on database error removing a registered Instant Messaging address.
-#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
 #. TRANS: Server error thrown when user profile settings could not be updated.
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
-#: actions/apiaccountupdatedeliverydevice.php:130
-#: actions/confirmaddress.php:118 actions/emailsettings.php:352
-#: actions/emailsettings.php:498 actions/imsettings.php:276
-#: actions/imsettings.php:432 actions/othersettings.php:186
-#: actions/profilesettings.php:322 actions/smssettings.php:301
-#: actions/smssettings.php:454
+#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
+#: actions/apiaccountupdatedeliverydevice.php:136
+#: actions/emailsettings.php:353 actions/emailsettings.php:499
+#: actions/profilesettings.php:323 actions/smssettings.php:300
+#: actions/smssettings.php:453 actions/urlsettings.php:211
 msgid "Could not update user."
 msgstr "Не можев да го подновам корисникот."
 
@@ -363,7 +363,7 @@ msgstr "Корисникот нема профил."
 
 #. TRANS: Server error displayed if a user profile could not be saved.
 #. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:418
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:419
 msgid "Could not save profile."
 msgstr "Не може да се зачува профил."
 
@@ -375,7 +375,7 @@ msgstr "Не може да се зачува профил."
 #: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
 #: actions/designadminpanel.php:120 actions/editapplication.php:121
 #: actions/newapplication.php:102 actions/newnotice.php:95
-#: lib/designsettings.php:298
+#: lib/designsettings.php:110
 #, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s byte) due to its "
@@ -400,8 +400,8 @@ msgstr[1] ""
 #: actions/apiaccountupdateprofilecolors.php:160
 #: actions/apiaccountupdateprofilecolors.php:171
 #: actions/groupdesignsettings.php:285 actions/groupdesignsettings.php:296
-#: actions/userdesignsettings.php:201 actions/userdesignsettings.php:211
-#: actions/userdesignsettings.php:253 actions/userdesignsettings.php:263
+#: actions/userdesignsettings.php:218 actions/userdesignsettings.php:228
+#: actions/userdesignsettings.php:270 actions/userdesignsettings.php:280
 msgid "Unable to save your design settings."
 msgstr "Не можам да ги зачувам Вашите нагодувања за изглед."
 
@@ -409,7 +409,7 @@ msgstr "Не можам да ги зачувам Вашите нагодувањ
 #. TRANS: Client error displayed when a database error occurs updating profile colours.
 #: actions/apiaccountupdateprofilebackgroundimage.php:191
 #: actions/apiaccountupdateprofilecolors.php:139
-#: actions/userdesignsettings.php:179
+#: actions/userdesignsettings.php:196
 msgid "Could not update your design."
 msgstr "Не може да се поднови Вашиот изглед."
 
@@ -517,8 +517,7 @@ msgstr "Примачот не е пронајден."
 
 #. TRANS: Client error displayed trying to direct message another user who's not a friend (403).
 #: actions/apidirectmessagenew.php:144
-#, fuzzy
-msgid "Can't send direct messages to users who aren't your friend."
+msgid "Cannot send direct messages to users who aren't your friend."
 msgstr ""
 "Не можете да испраќате непосредни пораки на корисници што не Ви се пријатели."
 
@@ -603,9 +602,9 @@ msgstr "Не можев да го пронајдам целниот корисн
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:156 actions/editgroup.php:191
-#: actions/newgroup.php:137 actions/profilesettings.php:273
-#: actions/register.php:214
+#: actions/apigroupcreate.php:156 actions/apigroupprofileupdate.php:255
+#: actions/editgroup.php:191 actions/newgroup.php:137
+#: actions/profilesettings.php:274 actions/register.php:199
 msgid "Nickname already in use. Try another one."
 msgstr "Тој прекар е во употреба. Одберете друг."
 
@@ -613,9 +612,9 @@ msgstr "Тој прекар е во употреба. Одберете друг.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:164 actions/editgroup.php:195
-#: actions/newgroup.php:141 actions/profilesettings.php:243
-#: actions/register.php:216
+#: actions/apigroupcreate.php:164 actions/apigroupprofileupdate.php:259
+#: actions/editgroup.php:195 actions/newgroup.php:141
+#: actions/profilesettings.php:244 actions/register.php:201
 msgid "Not a valid nickname."
 msgstr "Неправилен прекар."
 
@@ -625,10 +624,10 @@ msgstr "Неправилен прекар."
 #. TRANS: Validation error shown when providing an invalid homepage URL in the "New application" form.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:181 actions/editapplication.php:235
-#: actions/editgroup.php:202 actions/newapplication.php:221
-#: actions/newgroup.php:148 actions/profilesettings.php:248
-#: actions/register.php:223
+#: actions/apigroupcreate.php:181 actions/apigroupprofileupdate.php:277
+#: actions/editapplication.php:235 actions/editgroup.php:202
+#: actions/newapplication.php:221 actions/newgroup.php:148
+#: actions/profilesettings.php:249 actions/register.php:208
 msgid "Homepage is not a valid URL."
 msgstr "Главната страница не е важечка URL-адреса."
 
@@ -637,8 +636,8 @@ msgstr "Главната страница не е важечка URL-адрес
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:191 actions/editgroup.php:206
-#: actions/newgroup.php:152 actions/profilesettings.php:252
-#: actions/register.php:226
+#: actions/newgroup.php:152 actions/profilesettings.php:253
+#: actions/register.php:211
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "Полното име е предолго (највеќе 255 знаци)."
 
@@ -665,8 +664,8 @@ msgstr[1] "Описот е предолг (дозволено е највеќе
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:215 actions/editgroup.php:218
-#: actions/newgroup.php:164 actions/profilesettings.php:265
-#: actions/register.php:235
+#: actions/newgroup.php:164 actions/profilesettings.php:266
+#: actions/register.php:220
 msgid "Location is too long (maximum 255 characters)."
 msgstr "Местоположбата е предолга (највеќе 255 знаци)."
 
@@ -695,15 +694,16 @@ msgstr "Неважечки алијас: „%s“."
 #. TRANS: %s is the alias that is already in use.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error. %s is the already used alias.
-#: actions/apigroupcreate.php:264 actions/editgroup.php:246
-#: actions/newgroup.php:193
+#: actions/apigroupcreate.php:264 actions/apigroupprofileupdate.php:351
+#: actions/editgroup.php:246 actions/newgroup.php:193
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "Алијасот „%s“ е зафатен. Одберете друг."
 
 #. TRANS: Client error displayed when trying to use an alias during group creation that is the same as the group's nickname.
 #. TRANS: Group edit form validation error.
-#: actions/apigroupcreate.php:278 actions/editgroup.php:253
+#: actions/apigroupcreate.php:278 actions/apigroupprofileupdate.php:359
+#: actions/editgroup.php:253
 msgid "Alias can't be the same as nickname."
 msgstr "Алијасот не може да биде ист како прекарот."
 
@@ -715,7 +715,8 @@ msgstr "Алијасот не може да биде ист како прека
 #. TRANS: Client error displayed requesting most recent notices to a group for a non-existing group.
 #: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
 #: actions/apigroupleave.php:104 actions/apigroupmembership.php:71
-#: actions/apigroupshow.php:81 actions/apitimelinegroup.php:89
+#: actions/apigroupprofileupdate.php:113 actions/apigroupshow.php:81
+#: actions/apitimelinegroup.php:89
 msgid "Group not found."
 msgstr "Групата не е пронајдена."
 
@@ -733,13 +734,11 @@ msgstr "Веќе членувате во таа група."
 msgid "You have been blocked from that group by the admin."
 msgstr "Блокирани сте од таа група од администраторот."
 
-#. TRANS: Server error displayed when joining a group fails.
-#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
 #. 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.
 #. TRANS: Message given having failed to add a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:362
+#: actions/apigroupjoin.php:136 actions/joingroup.php:139 lib/command.php:362
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "Не можам да го зачленам корисникот %1$s во групата 2$s."
@@ -749,8 +748,6 @@ msgstr "Не можам да го зачленам корисникот %1$s в
 msgid "You are not a member of this group."
 msgstr "Не членувате во оваа група."
 
-#. TRANS: Server error displayed when leaving a group fails.
-#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
 #. TRANS: Server error displayed when leaving a group failed in the database.
 #. TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
 #. TRANS: Message given having failed to remove a user from a group.
@@ -786,6 +783,61 @@ msgstr "%s групи"
 msgid "groups on %s"
 msgstr "групи на %s"
 
+#. TRANS: Client error displayed trying to edit a group while not being a group admin.
+#. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
+#. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
+#: actions/apigroupprofileupdate.php:118 actions/editgroup.php:110
+#: actions/editgroup.php:176 actions/groupdesignsettings.php:109
+#: actions/grouplogo.php:111
+msgid "You must be an admin to edit the group."
+msgstr "Мора да сте администратор за да можете да ја уредите групата."
+
+#. TRANS: Server error displayed when editing a group fails.
+#: actions/apigroupprofileupdate.php:171 actions/editgroup.php:274
+msgid "Could not update group."
+msgstr "Не можев да ја подновам групата."
+
+#. TRANS: Server error displayed when group aliases could not be added.
+#. TRANS: Server exception thrown when creating group aliases failed.
+#: actions/apigroupprofileupdate.php:194 actions/editgroup.php:281
+#: classes/User_group.php:540
+msgid "Could not create aliases."
+msgstr "Не можеше да се создадат алијаси."
+
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: actions/apigroupprofileupdate.php:249 lib/nickname.php:165
+msgid "Nickname must have only lowercase letters and numbers and no spaces."
+msgstr "Прекарот мора да има само мали букви и бројки и да нема празни места."
+
+#: actions/apigroupprofileupdate.php:286
+#, fuzzy
+msgid "Full name is too long (max 255 chars)."
+msgstr "Полното име е предолго (највеќе 255 знаци)."
+
+#: actions/apigroupprofileupdate.php:296
+#, fuzzy, php-format
+msgid "description is too long (max %d chars)."
+msgstr "Описот е предолг (дозволено е највеќе %d знак."
+
+#: actions/apigroupprofileupdate.php:307
+#, fuzzy
+msgid "Location is too long (max 255 chars)."
+msgstr "Местоположбата е предолга (највеќе 255 знаци)."
+
+#: actions/apigroupprofileupdate.php:326
+#, fuzzy, php-format
+msgid "Too many aliases! Maximum %d."
+msgstr "Премногу алијаси! Дозволено е највеќе %d."
+
+#. TRANS: Group edit form validation error.
+#. TRANS: Group create form validation error.
+#. TRANS: %s is the invalid alias.
+#: actions/apigroupprofileupdate.php:342 actions/editgroup.php:241
+#: actions/newgroup.php:188
+#, php-format
+msgid "Invalid alias: \"%s\""
+msgstr "Неважечки алијас: „%s“"
+
 #. TRANS: Client error displayed when uploading a media file has failed.
 #: actions/apimediaupload.php:101
 msgid "Upload failed."
@@ -816,21 +868,22 @@ msgstr "Жетонот за барање е веќе овластен."
 #. TRANS: Form validation error message.
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
+#. TRANS: Client error displayed when the session token is not okay.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
 #: actions/deletenotice.php:177 actions/disfavor.php:75
-#: actions/emailsettings.php:291 actions/favor.php:75 actions/geocode.php:55
+#: actions/emailsettings.php:292 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:65 actions/grouplogo.php:321
-#: actions/groupunblock.php:65 actions/imsettings.php:224
-#: actions/invite.php:60 actions/login.php:137 actions/makeadmin.php:66
-#: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
-#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
-#: actions/othersettings.php:155 actions/passwordsettings.php:138
-#: actions/profilesettings.php:217 actions/recoverpassword.php:383
-#: actions/register.php:172 actions/remotesubscribe.php:76
-#: actions/repeat.php:82 actions/smssettings.php:250 actions/subedit.php:40
-#: actions/subscribe.php:86 actions/tagother.php:166
-#: actions/unsubscribe.php:69 actions/userauthorization.php:52
-#: lib/designsettings.php:310
+#: actions/groupunblock.php:65 actions/imsettings.php:241
+#: actions/invite.php:60 actions/makeadmin.php:66 actions/newmessage.php:135
+#: actions/newnotice.php:105 actions/nudge.php:80
+#: actions/oauthappssettings.php:162 actions/oauthconnectionssettings.php:135
+#: actions/passwordsettings.php:137 actions/pluginenable.php:87
+#: actions/profilesettings.php:218 actions/recoverpassword.php:383
+#: actions/register.php:157 actions/remotesubscribe.php:76
+#: actions/repeat.php:82 actions/smssettings.php:249 actions/subedit.php:40
+#: actions/subscribe.php:87 actions/tagother.php:145
+#: actions/unsubscribe.php:69 actions/urlsettings.php:171
+#: actions/userauthorization.php:53 lib/designsettings.php:122
 msgid "There was a problem with your session token. Try again, please."
 msgstr "Се поајви проблем со Вашиот сесиски жетон. Обидете се повторно."
 
@@ -858,10 +911,10 @@ msgstr "Грешка во базата при вметнувањето на auth
 #. TRANS: Unknown form validation error in design settings form.
 #: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
 #: actions/designadminpanel.php:100 actions/editapplication.php:144
-#: actions/emailsettings.php:310 actions/grouplogo.php:332
-#: actions/imsettings.php:239 actions/newapplication.php:124
-#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
-#: actions/smssettings.php:271 lib/designsettings.php:321
+#: actions/emailsettings.php:311 actions/grouplogo.php:332
+#: actions/imsettings.php:256 actions/newapplication.php:124
+#: actions/oauthconnectionssettings.php:144 actions/recoverpassword.php:46
+#: actions/smssettings.php:270 lib/designsettings.php:133
 msgid "Unexpected form submission."
 msgstr "Неочекувано поднесување на образец."
 
@@ -910,31 +963,26 @@ msgstr "Сметка"
 
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Field label in form for profile settings.
-#. TRANS: Label for group nickname (dt). Text hidden by default.
-#. TRANS: DT for nick name in a profile.
-#: actions/apioauthauthorize.php:459 actions/login.php:252
-#: actions/profilesettings.php:106 actions/register.php:432
-#: actions/showgroup.php:243 actions/tagother.php:94
+#: actions/apioauthauthorize.php:459 actions/login.php:225
+#: actions/profilesettings.php:107 actions/register.php:411
 #: actions/userauthorization.php:145 lib/groupeditform.php:145
-#: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "Прекар"
 
 #. TRANS: Field label on OAuth API authorisation form.
-#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:463 actions/login.php:255
-#: actions/register.php:436 lib/accountsettingsaction.php:120
+#: actions/apioauthauthorize.php:463 actions/login.php:228
+#: actions/register.php:415 lib/settingsnav.php:87
 msgid "Password"
 msgstr "Лозинка"
 
 #. TRANS: Button text that when clicked will cancel the process of allowing access to an account
 #. TRANS: by an external application.
 #. TRANS: Button label to cancel an e-mail address confirmation procedure.
-#. TRANS: Button label to cancel an Instant Messaging address confirmation procedure.
+#. TRANS: Button label to cancel an IM address confirmation procedure.
 #. TRANS: Button label to cancel a SMS address confirmation procedure.
 #. TRANS: Button label in the "Edit application" form.
-#: actions/apioauthauthorize.php:478 actions/emailsettings.php:124
-#: actions/imsettings.php:127 actions/smssettings.php:133
+#: actions/apioauthauthorize.php:478 actions/emailsettings.php:125
+#: actions/imsettings.php:136 actions/smssettings.php:132
 #: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Cancel"
@@ -1045,8 +1093,8 @@ msgstr "HTML-методот не е поддржан."
 #. TRANS: Exception thrown requesting an unsupported notice output format.
 #. TRANS: %s is the requested output format.
 #: actions/apistatusesshow.php:144
-#, fuzzy, php-format
-msgid "Unsupported format: %s"
+#, php-format
+msgid "Unsupported format: %s."
 msgstr "Неподдржан формат: %s."
 
 #. TRANS: Client error displayed requesting a deleted status.
@@ -1130,13 +1178,6 @@ msgstr "%1$s / Бендисани од %2$s"
 msgid "%1$s updates favorited by %2$s / %3$s."
 msgstr "Подновувања на %1$s бендисани од %2$s / %3$s."
 
-#. TRANS: Server error displayed when generating an Atom feed fails.
-#. TRANS: %s is the error.
-#: actions/apitimelinegroup.php:134
-#, php-format
-msgid "Could not generate feed for group - %s"
-msgstr "Не можев да создадам канал за групата - %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.
 #: actions/apitimelinementions.php:115
@@ -1153,13 +1194,14 @@ msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr "%1$s подновувања коишто се одговор на подновувањата од %2$s / %3$s."
 
 #. TRANS: Title for site timeline. %s is the StatusNet sitename.
+#. TRANS: Public RSS feed title. %s is the StatusNet site name.
 #: actions/apitimelinepublic.php:193 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "Јавна историја на %s"
 
 #. TRANS: Subtitle for site timeline. %s is the StatusNet sitename.
-#: actions/apitimelinepublic.php:199 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:199
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "%s подновуввања од сите!"
@@ -1170,21 +1212,33 @@ msgid "Unimplemented."
 msgstr "Неспроведено."
 
 #. TRANS: Title for Atom feed "repeated to me". %s is the user nickname.
-#: actions/apitimelineretweetedtome.php:108
+#: actions/apitimelineretweetedtome.php:96
 #, php-format
 msgid "Repeated to %s"
 msgstr "Повторено за %s"
 
+#: actions/apitimelineretweetedtome.php:98
+#, fuzzy, php-format
+msgid "%1$s notices that were to repeated to %2$s / %3$s."
+msgstr "%1$s подновувања коишто се одговор на подновувањата од %2$s / %3$s."
+
 #. TRANS: Title of list of repeated notices of the logged in user.
 #. TRANS: %s is the nickname of the logged in user.
-#: actions/apitimelineretweetsofme.php:112
+#: actions/apitimelineretweetsofme.php:98
 #, php-format
 msgid "Repeats of %s"
 msgstr "Повторувања на %s"
 
+#: actions/apitimelineretweetsofme.php:104
+#, fuzzy, php-format
+msgid "%1$s notices that %2$s / %3$s has repeated."
+msgstr "%1$s ја бендиса забелешката %2$s."
+
 #. TRANS: Title for timeline with lastest notices with a given tag.
 #. TRANS: %s is the tag.
-#: actions/apitimelinetag.php:101 actions/tag.php:67
+#. TRANS: Title for first page of notices with tags.
+#. TRANS: %s is the tag.
+#: actions/apitimelinetag.php:101 actions/tag.php:69
 #, php-format
 msgid "Notices tagged with %s"
 msgstr "Забелешки означени со %s"
@@ -1197,53 +1251,54 @@ msgid "Updates tagged with %1$s on %2$s!"
 msgstr "Подновувањата се означени со %1$s на %2$s!"
 
 #. TRANS: Client error displayed trying to add a notice to another user's timeline.
-#: actions/apitimelineuser.php:297
+#: actions/apitimelineuser.php:308
 msgid "Only the user can add to their own timeline."
 msgstr "Само корисникот може да ја надополнува својата хронологија."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:304
+#: actions/apitimelineuser.php:315
 msgid "Only accept AtomPub for Atom feeds."
 msgstr "Прифаќај само AtomPub за Atom-канали."
 
 #. TRANS: Client error displayed attempting to post an empty API notice.
-#: actions/apitimelineuser.php:311
+#: actions/apitimelineuser.php:322
 msgid "Atom post must not be empty."
 msgstr "Забелешката преку Atom не смее да биде празна."
 
 #. TRANS: Client error displayed attempting to post an API that is not well-formed XML.
-#: actions/apitimelineuser.php:317
+#: actions/apitimelineuser.php:328
 msgid "Atom post must be well-formed XML."
 msgstr "Забелешката преку Atom мора да биде добро-поставен XML."
 
 #. TRANS: Client error displayed when not using an Atom entry.
-#: actions/apitimelineuser.php:323 actions/atompubfavoritefeed.php:228
+#: actions/apitimelineuser.php:334 actions/atompubfavoritefeed.php:228
 #: actions/atompubmembershipfeed.php:230
 #: actions/atompubsubscriptionfeed.php:236
 msgid "Atom post must be an Atom entry."
 msgstr "Забелешката преку Atom мора да биде Atom-ставка."
 
 #. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
-#: actions/apitimelineuser.php:335
+#: actions/apitimelineuser.php:345
 msgid "Can only handle POST activities."
 msgstr "Може да работи само со POST-активности."
 
 #. TRANS: Client error displayed when using an unsupported activity object type.
 #. TRANS: %s is the unsupported activity object type.
-#: actions/apitimelineuser.php:346
+#: actions/apitimelineuser.php:356
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr "Не може да работи со предмети на активност од типот „%s“."
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
 #. TRANS: %d is the notice ID (number).
-#: actions/apitimelineuser.php:380
+#: actions/apitimelineuser.php:390
 #, php-format
 msgid "No content for notice %d."
 msgstr "Нема содржина за забелешката %d."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:408
+#. TRANS: %s is the notice URI.
+#: actions/apitimelineuser.php:419
 #, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "Веќе постои забелешка со URI „%s“."
@@ -1260,9 +1315,10 @@ msgstr "Корисникот не е пронајден."
 
 #. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
 #. TRANS: Client exception.
+#. TRANS: Client error displayed trying to subscribe to a non-existing profile.
 #: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
 #: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
-#: actions/subscribe.php:107
+#: actions/subscribe.php:110
 msgid "No such profile."
 msgstr "Нема таков профил."
 
@@ -1397,7 +1453,7 @@ msgid "Not a member."
 msgstr "Не членувате."
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
-#: actions/atompubshowmembership.php:151
+#: actions/atompubshowmembership.php:150
 msgid "Cannot delete someone else's membership."
 msgstr "Не можам да избришам туѓо членство."
 
@@ -1484,10 +1540,7 @@ msgid "Invalid size."
 msgstr "Погрешна големина."
 
 #. TRANS: Title for avatar upload page.
-#. TRANS: Label for group avatar (dt). Text hidden by default.
-#. TRANS: Link description in user account settings menu.
-#: actions/avatarsettings.php:66 actions/showgroup.php:227
-#: lib/accountsettingsaction.php:113
+#: actions/avatarsettings.php:66 lib/settingsnav.php:82
 msgid "Avatar"
 msgstr "Аватар"
 
@@ -1502,9 +1555,11 @@ msgstr ""
 
 #. TRANS: Server error displayed in avatar upload page when no matching profile can be found for a user.
 #. TRANS: Server error displayed coming across a request from a user without a profile.
+#. TRANS: Server error displayed when trying to authorise a remote subscription request
+#. TRANS: while the user has no profile.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
 #: actions/grouplogo.php:184 actions/remotesubscribe.php:190
-#: actions/userauthorization.php:72 actions/userrss.php:108
+#: actions/userauthorization.php:75 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr "Корисник без соодветен профил."
 
@@ -1559,10 +1614,9 @@ msgstr "Отсечи"
 msgid "No file uploaded."
 msgstr "Нема подигнато податотека."
 
-#. TRANS: Avatar upload form unstruction after uploading a file.
+#. TRANS: Avatar upload form instruction after uploading a file.
 #: actions/avatarsettings.php:345
-#, fuzzy
-msgid "Pick a square area of the image to be your avatar"
+msgid "Pick a square area of the image to be your avatar."
 msgstr "Одберете квадратна површина од сликата за аватар."
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
@@ -1588,7 +1642,7 @@ msgstr "Аватарот е избришан."
 
 #. TRANS: Title for backup account page.
 #. TRANS: Option in profile settings to create a backup of the account of the currently logged in user.
-#: actions/backupaccount.php:61 actions/profilesettings.php:467
+#: actions/backupaccount.php:61 actions/profilesettings.php:468
 msgid "Backup account"
 msgstr "Резервна сметка"
 
@@ -1625,8 +1679,7 @@ msgstr "Резерва"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
 #: actions/backupaccount.php:254
-#, fuzzy
-msgid "Backup your account"
+msgid "Backup your account."
 msgstr "Направете резервна верзија на сметката."
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
@@ -1668,8 +1721,7 @@ msgstr "Не"
 
 #. TRANS: Submit button title for 'No' when blocking a user.
 #: actions/block.php:158
-#, fuzzy
-msgid "Do not block this user"
+msgid "Do not block this user."
 msgstr "Не го блокирај корисников."
 
 #. TRANS: Button label on the user block form.
@@ -1686,10 +1738,9 @@ msgid "Yes"
 msgstr "Да"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#. TRANS: Description of the form to block a user.
-#: actions/block.php:165 lib/blockform.php:79
-msgid "Block this user"
-msgstr "Блокирај го корисников"
+#: actions/block.php:165
+msgid "Block this user."
+msgstr "Блокирај го корисников."
 
 #. TRANS: Server error displayed when blocking a user fails.
 #: actions/block.php:189
@@ -1754,31 +1805,47 @@ msgstr "Потврдниот код не е пронајден."
 msgid "That confirmation code is not for you!"
 msgstr "Овој потврден код не е за Вас!"
 
-#. TRANS: Server error for a unknow address type %s, which can be 'email', 'jabber', or 'sms'.
-#: actions/confirmaddress.php:92
-#, php-format
-msgid "Unrecognized address type %s."
+#. TRANS: Server error for an unknown address type, which can be 'email', 'sms', or the name of an IM network (such as 'xmpp' or 'aim')
+#: actions/confirmaddress.php:94
+#, fuzzy, php-format
+msgid "Unrecognized address type %s"
 msgstr "Непознат тип на адреса %s."
 
 #. TRANS: Client error for an already confirmed email/jabber/sms address.
-#: actions/confirmaddress.php:97
+#: actions/confirmaddress.php:103 actions/confirmaddress.php:136
 msgid "That address has already been confirmed."
 msgstr "Оваа адреса веќе е потврдена."
 
+#: actions/confirmaddress.php:121 actions/imsettings.php:444
+#: actions/userdesignsettings.php:306
+#, fuzzy
+msgid "Couldn't update user."
+msgstr "Не можев да го подновам корисникот."
+
+#: actions/confirmaddress.php:144
+#, fuzzy
+msgid "Couldn't update user im preferences."
+msgstr "Не можев да ја подновам корисничката евиденција."
+
+#: actions/confirmaddress.php:156
+#, fuzzy
+msgid "Couldn't insert user im preferences."
+msgstr "Не може да се внесе нова претплата."
+
 #. TRANS: Server error displayed when an address confirmation code deletion from the
 #. TRANS: database fails in the contact address confirmation action.
-#: actions/confirmaddress.php:132
+#: actions/confirmaddress.php:169
 msgid "Could not delete address confirmation."
 msgstr "Не можев да ја избришам потврдата на адреса."
 
 #. TRANS: Title for the contact address confirmation action.
-#: actions/confirmaddress.php:150
+#: actions/confirmaddress.php:185
 msgid "Confirm address"
 msgstr "Потврди адреса"
 
 #. TRANS: Success message for the contact address confirmation action.
 #. TRANS: %s can be 'email', 'jabber', or 'sms'.
-#: actions/confirmaddress.php:166
+#: actions/confirmaddress.php:200
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "Адресата  \"%s\" е потврдена за Вашата сметка."
@@ -1792,6 +1859,7 @@ msgstr "Разговор"
 #. TRANS: Label for user statistics.
 #: actions/conversation.php:149 lib/noticelist.php:87
 #: lib/profileaction.php:246 lib/searchgroupnav.php:82
+#: lib/threadednoticelist.php:66
 msgid "Notices"
 msgstr "Забелешки"
 
@@ -1824,7 +1892,7 @@ msgstr "Сметката е избришана."
 
 #. TRANS: Page title for page on which a user account can be deleted.
 #. TRANS: Option in profile settings to delete the account of the currently logged in user.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:475
+#: actions/deleteaccount.php:228 actions/profilesettings.php:476
 msgid "Delete account"
 msgstr "Избриши сметка"
 
@@ -1850,7 +1918,7 @@ msgstr ""
 #. TRANS: Field label for delete account confirmation entry.
 #. TRANS: Field label for password reset form where the password has to be typed again.
 #: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:262 actions/register.php:440
+#: actions/recoverpassword.php:262 actions/register.php:419
 msgid "Confirm"
 msgstr "Потврди"
 
@@ -1879,14 +1947,14 @@ msgstr "Програмот не е пронајден."
 #. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
 #: actions/deleteapplication.php:79 actions/editapplication.php:78
-#: actions/showapplication.php:94
+#: actions/showapplication.php:90
 msgid "You are not the owner of this application."
 msgstr "Не сте сопственик на овој програм."
 
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
-#: actions/newapplication.php:112 actions/showapplication.php:118
-#: lib/action.php:1425
+#: actions/newapplication.php:112 actions/showapplication.php:113
+#: lib/action.php:1391
 msgid "There was a problem with your session token."
 msgstr "Се појави проблем со Вашиот сесиски жетон."
 
@@ -1909,14 +1977,12 @@ msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting an application.
 #: actions/deleteapplication.php:161
-#, fuzzy
-msgid "Do not delete this application"
+msgid "Do not delete this application."
 msgstr "Не го бриши овој програм."
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
 #: actions/deleteapplication.php:167
-#, fuzzy
-msgid "Delete this application"
+msgid "Delete this application."
 msgstr "Избриши го програмов."
 
 #. TRANS: Client error when trying to delete group while not logged in.
@@ -1970,14 +2036,12 @@ msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting a group.
 #: actions/deletegroup.php:224
-#, fuzzy
-msgid "Do not delete this group"
+msgid "Do not delete this group."
 msgstr "Не ја бриши групава."
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
 #: actions/deletegroup.php:231
-#, fuzzy
-msgid "Delete this group"
+msgid "Delete this group."
 msgstr "Избриши ја групава."
 
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
@@ -1985,14 +2049,16 @@ msgstr "Избриши ја групава."
 #. TRANS: Client error displayed when trying to mark a notice as favorite without being logged in.
 #. TRANS: Client error displayed trying to block a user from a group while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
+#. TRANS: Client error displayed trying to log out when not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
+#. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
 #. TRANS: Client error displayed when trying to change user options while not logged in.
 #: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
-#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:69
+#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:70
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
-#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
-#: actions/tagother.php:33 actions/unsubscribe.php:52
+#: actions/nudge.php:63 actions/pluginenable.php:97 actions/subedit.php:33
+#: actions/subscribe.php:98 actions/tagother.php:33 actions/unsubscribe.php:52
 #: lib/adminpanelaction.php:71 lib/profileformaction.php:63
 #: lib/settingsaction.php:72
 msgid "Not logged in."
@@ -2020,14 +2086,13 @@ msgstr "Дали сте сигурни дека сакате да ја избр
 
 #. TRANS: Submit button title for 'No' when deleting a notice.
 #: actions/deletenotice.php:159
-#, fuzzy
-msgid "Do not delete this notice"
+msgid "Do not delete this notice."
 msgstr "Не ја бриши оваа забелешка."
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:166 lib/noticelist.php:673
-msgid "Delete this notice"
-msgstr "Избриши ја оваа забелешка"
+#: actions/deletenotice.php:166
+msgid "Delete this notice."
+msgstr "Избриши ја забелешкава."
 
 #. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
 #: actions/deleteuser.php:66
@@ -2061,19 +2126,16 @@ msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting a user.
 #: actions/deleteuser.php:158
-#, fuzzy
-msgid "Do not delete this user"
+msgid "Do not delete this user."
 msgstr "Не го бриши корисников."
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
-#. TRANS: Description of form for deleting a user.
-#: actions/deleteuser.php:165 lib/deleteuserform.php:75
-msgid "Delete this user"
-msgstr "Избриши овој корисник"
+#: actions/deleteuser.php:165
+msgid "Delete this user."
+msgstr "Избриши го корисников."
 
 #. TRANS: Message used as title for design settings for the site.
-#. TRANS: Link description in user account settings menu.
-#: actions/designadminpanel.php:60 lib/accountsettingsaction.php:134
+#: actions/designadminpanel.php:60 lib/settingsnav.php:97
 msgid "Design"
 msgstr "Изглед"
 
@@ -2140,8 +2202,7 @@ msgid "You can upload a custom StatusNet theme as a .ZIP archive."
 msgstr "Можете да подигнете свој изглед за StatusNet како .ZIP архив."
 
 #. TRANS: Fieldset legend for theme background image.
-#. TRANS: Fieldset legend on profile design page.
-#: actions/designadminpanel.php:515 lib/designsettings.php:98
+#: actions/designadminpanel.php:515
 msgid "Change background image"
 msgstr "Промена на слика за позадина"
 
@@ -2149,7 +2210,7 @@ msgstr "Промена на слика за позадина"
 #. TRANS: Field label for background color selector.
 #. TRANS: Label on profile design page for setting a profile page background colour.
 #: actions/designadminpanel.php:525 actions/designadminpanel.php:609
-#: lib/designsettings.php:183
+#: lib/designform.php:238
 msgid "Background"
 msgstr "Позадина"
 
@@ -2176,13 +2237,13 @@ msgstr "Искл."
 #. TRANS: Form guide for turning background image on or off on theme designer page.
 #. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
 #. TRANS: use of the uploaded profile image.
-#: actions/designadminpanel.php:577 lib/designsettings.php:159
+#: actions/designadminpanel.php:577 lib/designform.php:214
 msgid "Turn background image on or off."
 msgstr "Вклучи или исклучи позадинска слика."
 
 #. TRANS: Checkbox label to title background image on theme designer page.
 #. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-#: actions/designadminpanel.php:583 lib/designsettings.php:165
+#: actions/designadminpanel.php:583 lib/designform.php:220
 msgid "Tile background image"
 msgstr "Позадината во квадрати"
 
@@ -2193,25 +2254,25 @@ msgstr "Смени бои"
 
 #. TRANS: Field label for content color selector.
 #. TRANS: Label on profile design page for setting a profile page content colour.
-#: actions/designadminpanel.php:623 lib/designsettings.php:197
+#: actions/designadminpanel.php:623 lib/designform.php:252
 msgid "Content"
 msgstr "Содржина"
 
 #. TRANS: Field label for sidebar color selector.
 #. TRANS: Label on profile design page for setting a profile page sidebar colour.
-#: actions/designadminpanel.php:637 lib/designsettings.php:211
+#: actions/designadminpanel.php:637 lib/designform.php:266
 msgid "Sidebar"
 msgstr "Странична лента"
 
 #. TRANS: Field label for text color selector.
 #. TRANS: Label on profile design page for setting a profile page text colour.
-#: actions/designadminpanel.php:651 lib/designsettings.php:225
+#: actions/designadminpanel.php:651 lib/designform.php:280
 msgid "Text"
 msgstr "Текст"
 
 #. TRANS: Field label for link color selector.
 #. TRANS: Label on profile design page for setting a profile page links colour.
-#: actions/designadminpanel.php:665 lib/designsettings.php:239
+#: actions/designadminpanel.php:665 lib/designform.php:294
 msgid "Links"
 msgstr "Врски"
 
@@ -2232,22 +2293,19 @@ msgid "Use defaults"
 msgstr "Користи по основно"
 
 #. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: actions/designadminpanel.php:720 lib/designsettings.php:259
-msgid "Restore default designs"
-msgstr "Врати основно-зададени нагодувања"
+#: actions/designadminpanel.php:720
+msgid "Restore default designs."
+msgstr "Врати ги изгледите по основно."
 
 #. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: actions/designadminpanel.php:728 lib/designsettings.php:267
-msgid "Reset back to default"
-msgstr "Врати по основно"
+#: actions/designadminpanel.php:728
+msgid "Reset back to default."
+msgstr "Врати по основно."
 
 #. TRANS: Title for button for saving theme settings.
-#. TRANS: Title for button on profile design page to save settings.
-#: actions/designadminpanel.php:736 lib/designsettings.php:272
-msgid "Save design"
-msgstr "Зачувај изглед"
+#: actions/designadminpanel.php:736
+msgid "Save design."
+msgstr "Зачувај изглед."
 
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
 #: actions/disfavor.php:83
@@ -2278,7 +2336,7 @@ msgid "You must be logged in to edit an application."
 msgstr "Мора да сте најавени за да можете да уредувате програми."
 
 #. TRANS: Client error displayed trying to edit an application that does not exist.
-#: actions/editapplication.php:83 actions/showapplication.php:87
+#: actions/editapplication.php:83 actions/showapplication.php:83
 msgid "No such application."
 msgstr "Нема таков програм."
 
@@ -2369,80 +2427,53 @@ msgstr "Уреди ја групата %s"
 msgid "You must be logged in to create a group."
 msgstr "Мора да сте најавени за да можете да создавате групи."
 
-#. TRANS: Client error displayed trying to edit a group while not being a group admin.
-#. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
-#. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
-#: actions/editgroup.php:110 actions/editgroup.php:176
-#: actions/groupdesignsettings.php:109 actions/grouplogo.php:111
-msgid "You must be an admin to edit the group."
-msgstr "Мора да сте администратор за да можете да ја уредите групата."
-
 #. TRANS: Form instructions for group edit form.
 #: actions/editgroup.php:161
 msgid "Use this form to edit the group."
 msgstr "ОБразецов служи за уредување на групата."
 
-#. TRANS: Group edit form validation error.
-#. TRANS: Group create form validation error.
-#. TRANS: %s is the invalid alias.
-#: actions/editgroup.php:241 actions/newgroup.php:188
-#, php-format
-msgid "Invalid alias: \"%s\""
-msgstr "Неважечки алијас: „%s“"
-
-#. TRANS: Server error displayed when editing a group fails.
-#: actions/editgroup.php:274
-msgid "Could not update group."
-msgstr "Не можев да ја подновам групата."
-
-#. TRANS: Server error displayed when group aliases could not be added.
-#. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/editgroup.php:281 classes/User_group.php:540
-msgid "Could not create aliases."
-msgstr "Не можеше да се создадат алијаси."
-
 #. TRANS: Group edit form success message.
 #: actions/editgroup.php:301
 msgid "Options saved."
 msgstr "Нагодувањата се зачувани."
 
 #. TRANS: Title for e-mail settings.
-#: actions/emailsettings.php:59
+#: actions/emailsettings.php:60
 msgid "Email settings"
 msgstr "Нагодувања за е-пошта"
 
 #. TRANS: E-mail settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/emailsettings.php:73
+#: actions/emailsettings.php:74
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 msgstr "Раководење со начинот на кој добивате е-пошта од %%site.name%%."
 
 #. TRANS: Form legend for e-mail settings form.
 #. TRANS: Field label for e-mail address input in e-mail settings form.
-#: actions/emailsettings.php:103 actions/emailsettings.php:129
+#: actions/emailsettings.php:104 actions/emailsettings.php:130
 msgid "Email address"
 msgstr "Е-поштенска адреса"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:109
+#: actions/emailsettings.php:110
 msgid "Current confirmed email address."
 msgstr "Тековна потврдена е-поштенска адреса."
 
 #. TRANS: Button label to remove a confirmed e-mail address.
 #. TRANS: Button label for removing a set sender e-mail address to post notices from.
-#. TRANS: Button label to remove a confirmed Instant Messaging address.
+#. TRANS: Button label to remove a confirmed IM address.
 #. TRANS: Button label to remove a confirmed SMS address.
 #. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
-#: actions/emailsettings.php:112 actions/emailsettings.php:179
-#: actions/imsettings.php:112 actions/smssettings.php:120
-#: actions/smssettings.php:176
+#: actions/emailsettings.php:113 actions/emailsettings.php:180
+#: actions/imsettings.php:119 actions/smssettings.php:119
+#: actions/smssettings.php:175
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Отстрани"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:119
+#: actions/emailsettings.php:120
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -2455,45 +2486,45 @@ msgstr ""
 #. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
 #. TRANS: Any other domain may be owned by a legitimate person or
 #. TRANS: organization.
-#: actions/emailsettings.php:136
+#: actions/emailsettings.php:137
 msgid "Email address, like \"UserName@example.org\""
 msgstr "Е-пошта, од обликот „UserName@example.org“"
 
 #. TRANS: Button label for adding an e-mail address in e-mail settings form.
-#. TRANS: Button label for adding an Instant Messaging address in Instant Messaging settings form.
+#. TRANS: Button label for adding an IM address in IM settings form.
 #. TRANS: Button label for adding a SMS phone number in SMS settings form.
-#: actions/emailsettings.php:140 actions/imsettings.php:147
-#: actions/smssettings.php:158
+#: actions/emailsettings.php:141 actions/imsettings.php:147
+#: actions/smssettings.php:157
 msgctxt "BUTTON"
 msgid "Add"
 msgstr "Додај"
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:148 actions/smssettings.php:167
+#: actions/emailsettings.php:149 actions/smssettings.php:166
 msgid "Incoming email"
 msgstr "Приемна пошта"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:154
+#: actions/emailsettings.php:155
 msgid "I want to post notices by email."
 msgstr "Сакам да објавувам забелешки по е-пошта."
 
 #. TRANS: Form instructions for incoming e-mail form in e-mail settings.
 #. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
-#: actions/emailsettings.php:176 actions/smssettings.php:174
+#: actions/emailsettings.php:177 actions/smssettings.php:173
 msgid "Send email to this address to post new notices."
 msgstr "Испраќајте е-пошта на оваа адреса за да објавувате нови забелешки."
 
 #. TRANS: Instructions for incoming e-mail address input form, when an address has already been assigned.
 #. TRANS: Instructions for incoming SMS e-mail address input form.
-#: actions/emailsettings.php:185 actions/smssettings.php:182
+#: actions/emailsettings.php:186 actions/smssettings.php:181
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr ""
 "Создај нова е-поштенска адреса за примање објави; ја заменува старата адреса."
 
 #. TRANS: Instructions for incoming e-mail address input form.
-#: actions/emailsettings.php:189
+#: actions/emailsettings.php:190
 msgid ""
 "To send notices via email, we need to create a unique email address for you "
 "on this server:"
@@ -2503,89 +2534,89 @@ msgstr ""
 
 #. TRANS: Button label for adding an e-mail address to send notices from.
 #. TRANS: Button label for adding an SMS e-mail address to send notices from.
-#: actions/emailsettings.php:195 actions/smssettings.php:185
+#: actions/emailsettings.php:196 actions/smssettings.php:184
 msgctxt "BUTTON"
 msgid "New"
 msgstr "Нова"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:204
+#: actions/emailsettings.php:205
 msgid "Email preferences"
 msgstr "Нагодувања за е-пошта"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:212
+#: actions/emailsettings.php:213
 msgid "Send me notices of new subscriptions through email."
 msgstr "Испраќај ми известувања за нови претплати по е-пошта."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:218
+#: actions/emailsettings.php:219
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr "Испраќај ми е-пошта кога некој ќе бендиса моја забелешка."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:225
+#: actions/emailsettings.php:226
 msgid "Send me email when someone sends me a private message."
 msgstr "Испраќај ми е-пошта кога некој ќе ми испрати приватна порака."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:231
+#: actions/emailsettings.php:232
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr "Испраќај ми е-пошта кога некој ќе ми испрати „@-одговор“"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:237
+#: actions/emailsettings.php:238
 msgid "Allow friends to nudge me and send me an email."
 msgstr ""
 "Дозволи им на пријателите да можат да ме подбуцнуваат и да ми испраќаат е-"
 "пошта."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:243
+#: actions/emailsettings.php:244
 msgid "Publish a MicroID for my email address."
 msgstr "Објави MicroID за мојата е-поштенска адреса."
 
 #. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:361
+#: actions/emailsettings.php:362
 msgid "Email preferences saved."
 msgstr "Нагодувањата за е-пошта се зачувани."
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:380
+#: actions/emailsettings.php:381
 msgid "No email address."
 msgstr "Нема е-поштенска адреса."
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:388
+#: actions/emailsettings.php:389
 msgid "Cannot normalize that email address."
 msgstr "Не можам да ја нормализирам таа е-поштенска адреса."
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:393 actions/register.php:212
+#: actions/emailsettings.php:394 actions/register.php:197
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "Неправилна адреса за е-пошта."
 
 #. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:397
+#: actions/emailsettings.php:398
 msgid "That is already your email address."
 msgstr "Оваа е-поштенска адреса е веќе Ваша."
 
 #. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:401
+#: actions/emailsettings.php:402
 msgid "That email address already belongs to another user."
 msgstr "Таа е-поштенска адреса е веќе зафатена од друг корисник."
 
 #. TRANS: Server error thrown on database error adding e-mail confirmation code.
 #. TRANS: Server error thrown on database error adding Instant Messaging confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:418 actions/imsettings.php:343
-#: actions/smssettings.php:365
+#: actions/emailsettings.php:419 actions/imsettings.php:362
+#: actions/smssettings.php:364
 msgid "Could not insert confirmation code."
 msgstr "Не можев да го внесам потврдниот код."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:425
+#: actions/emailsettings.php:426
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
@@ -2597,57 +2628,60 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling Instant Messaging address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:445 actions/imsettings.php:377
-#: actions/smssettings.php:399
+#: actions/emailsettings.php:446 actions/imsettings.php:391
+#: actions/smssettings.php:398
 msgid "No pending confirmation to cancel."
 msgstr "Нема потврди кои може да се откажат."
 
 #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:450
+#: actions/emailsettings.php:451
 msgid "That is the wrong email address."
 msgstr "Ова е погрешна е-поштенска адреса."
 
 #. TRANS: Server error thrown on database error canceling e-mail address confirmation.
 #. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
-#: actions/emailsettings.php:459 actions/smssettings.php:413
+#: actions/emailsettings.php:460 actions/smssettings.php:412
 msgid "Could not delete email confirmation."
 msgstr "Не можев да ја избришам потврдата по е-пошта."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:464
+#: actions/emailsettings.php:465
 msgid "Email confirmation cancelled."
 msgstr "Потврдата на е-пошта е откажана."
 
 #. TRANS: Message given trying to remove an e-mail address that is not
 #. TRANS: registered for the active user.
-#: actions/emailsettings.php:483
+#: actions/emailsettings.php:484
 msgid "That is not your email address."
 msgstr "Ова не е Вашата е-поштенска адреса."
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:504
+#: actions/emailsettings.php:505
 msgid "The email address was removed."
 msgstr "Е-поштенската адреса е отстранета."
 
 #. TRANS: Form validation error displayed when trying to remove an incoming e-mail address while no address has been set.
-#: actions/emailsettings.php:518 actions/smssettings.php:555
+#: actions/emailsettings.php:519 actions/smssettings.php:554
 msgid "No incoming email address."
 msgstr "Нема приемна е-поштенска адреса."
 
 #. TRANS: Server error thrown on database error removing incoming e-mail address.
 #. TRANS: Server error thrown on database error adding incoming e-mail address.
-#: actions/emailsettings.php:530 actions/emailsettings.php:554
-#: actions/smssettings.php:565 actions/smssettings.php:588
+#. TRANS: Server error displayed when the user could not be updated in SMS settings.
+#: actions/emailsettings.php:531 actions/emailsettings.php:555
+#: actions/smssettings.php:565 actions/smssettings.php:590
 msgid "Could not update user record."
 msgstr "Не можев да ја подновам корисничката евиденција."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:534 actions/smssettings.php:568
+#. TRANS: Confirmation text after updating SMS settings.
+#: actions/emailsettings.php:535 actions/smssettings.php:569
 msgid "Incoming email address removed."
 msgstr "Приемната е-поштенска адреса е отстранета."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:558 actions/smssettings.php:591
+#. TRANS: Confirmation text after updating SMS settings.
+#: actions/emailsettings.php:559 actions/smssettings.php:594
 msgid "New incoming email address added."
 msgstr "Додадена е нова влезна е-поштенска адреса."
 
@@ -2658,9 +2692,8 @@ msgstr "Веќе сте ја бендисале оваа забелешка!"
 
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
 #: actions/favor.php:95
-#, fuzzy
-msgid "Disfavor favorite"
-msgstr "Тргни од бендисани"
+msgid "Disfavor favorite."
+msgstr "Тргни од бендисани."
 
 #. TRANS: Page title for first page of favorited notices.
 #. TRANS: Title for favourited notices section.
@@ -2712,9 +2745,8 @@ msgstr ""
 #. TRANS: %s is a user's nickname.
 #. TRANS: Title for first page of favourite notices of a user.
 #. TRANS: %s is the user for whom the favourite notices are displayed.
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing own favourited notices.
 #: actions/favoritesrss.php:111 actions/showfavorites.php:76
-#: lib/personalgroupnav.php:122
+#: lib/personalgroupnav.php:110
 #, php-format
 msgid "%s's favorite notices"
 msgstr "Бендисани забелешки на %s"
@@ -2900,14 +2932,12 @@ msgstr ""
 
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
 #: actions/groupblock.php:191
-#, fuzzy
-msgid "Do not block this user from this group"
+msgid "Do not block this user from this group."
 msgstr "Не го блокирај овој корисник од групава."
 
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
 #: actions/groupblock.php:198
-#, fuzzy
-msgid "Block this user from this group"
+msgid "Block this user from this group."
 msgstr "Блокирај го овој корисник од групава."
 
 #. TRANS: Server error displayed when trying to block a user from a group fails because of an application error.
@@ -2918,6 +2948,7 @@ msgstr ""
 "групата."
 
 #. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
+#. TRANS: Client error displayed trying to find a user by ID without providing an ID.
 #: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr "Нема ID."
@@ -2947,7 +2978,7 @@ msgid "Unable to update your design settings."
 msgstr "Не можам да ги подновам Вашите нагодувања за изглед."
 
 #. TRANS: Form text to confirm saved group design settings.
-#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:222
+#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:239
 msgid "Design preferences saved."
 msgstr "Нагодувањата се зачувани."
 
@@ -3012,7 +3043,7 @@ msgid "A list of the users in this group."
 msgstr "Список на корисниците на оваа група."
 
 #. TRANS: Indicator in group members list that this user is a group administrator.
-#: actions/groupmembers.php:190
+#: actions/groupmembers.php:190 lib/action.php:581
 msgid "Admin"
 msgstr "Администратор"
 
@@ -3105,8 +3136,10 @@ msgid "Group search"
 msgstr "Пребарување на групи"
 
 #. TRANS: Text on page where groups can be searched if no results were found for a query.
-#: actions/groupsearch.php:82 actions/noticesearch.php:117
-#: actions/peoplesearch.php:83
+#. TRANS: Text for notice search results is the query had no results.
+#. TRANS: Message on the "People search" page where a query has no results.
+#: actions/groupsearch.php:82 actions/noticesearch.php:122
+#: actions/peoplesearch.php:87
 msgid "No results."
 msgstr "Нема резултати."
 
@@ -3143,162 +3176,172 @@ msgid "User is not blocked from group."
 msgstr "Корисникот не е блокиран од групата."
 
 #. TRANS: Server error displayed when unblocking a user from a group fails because of an unknown error.
+#. TRANS: Server error displayed when removing a user block.
 #: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "Грешка при отстранување на блокот."
 
 #. TRANS: Title for Instant Messaging settings.
-#: actions/imsettings.php:58
+#: actions/imsettings.php:56
 msgid "IM settings"
 msgstr "Нагодувања за 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.
-#: actions/imsettings.php:71
-#, php-format
+#: actions/imsettings.php:69
+#, fuzzy, php-format
 msgid ""
-"You can send and receive notices through Jabber/Google Talk [instant "
-"messages](%%doc.im%%). Configure your address and settings below."
+"You can send and receive notices through instant messaging [instant messages]"
+"(%%doc.im%%). Configure your addresses and settings below."
 msgstr ""
 "Можете да праќате и примате забелешки преку [непосредни пораки](%%doc.im%%) "
 "на Jabber/Google Talk . Подолу ставете адреса и наместете ги нагодувањата."
 
-#. TRANS: Message given in the Instant Messaging settings if XMPP is not enabled on the site.
+#. TRANS: Message given in the IM settings if IM is not enabled on the site.
 #: actions/imsettings.php:90
 msgid "IM is not available."
 msgstr "IM е недостапно."
 
-#. TRANS: Form legend for Instant Messaging settings form.
-#. TRANS: Field label for Instant Messaging address input in Instant Messaging settings form.
-#: actions/imsettings.php:102 actions/imsettings.php:132
-msgid "IM address"
-msgstr "IM адреса"
+#: actions/imsettings.php:116
+#, fuzzy, php-format
+msgid "Current confirmed %s address."
+msgstr "Тековна потврдена е-поштенска адреса."
 
-#: actions/imsettings.php:109
-msgid "Current confirmed Jabber/Google Talk address."
-msgstr "Моментално потврдена адреса на Jabber/Google Talk."
-
-#. TRANS: Form note in Instant Messaging settings form.
-#. TRANS: %s is the Instant Messaging address set for the site.
-#: actions/imsettings.php:120
-#, php-format
+#. TRANS: Form note in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:128
+#, fuzzy, php-format
 msgid ""
-"Awaiting confirmation on this address. Check your Jabber/Google Talk account "
-"for a message with further instructions. (Did you add %s to your buddy list?)"
+"Awaiting confirmation on this address. Check your %s account for a message "
+"with further instructions. (Did you add %s to your buddy list?)"
 msgstr ""
 "Чекам потврда за оваа адреса. Проверете ја Вашата сметка на Jabber/Google "
 "Talk - треба да добиете порака со понатамошни напатствија. (Дали го/ја "
 "додадовте %s на Вашиот список со пријатели?)"
 
-#. TRANS: IM address input field instructions in Instant Messaging settings form.
-#. TRANS: %s is the Instant Messaging address set for the site.
-#. TRANS: Do not translate "example.org". It is one of the domain names reserved for use in examples by
-#. TRANS: http://www.rfc-editor.org/rfc/rfc2606.txt. Any other domain may be owned by a legitimate
-#. TRANS: person or organization.
-#: actions/imsettings.php:139
-#, php-format
-msgid ""
-"Jabber or Google Talk address, like \"UserName@example.org\". First, make "
-"sure to add %s to your buddy list in your IM client or on Google Talk."
-msgstr ""
-"Адреса на Jabber или Google Talk, како на пр. „KorisnickoIme@example.org“. "
-"Но прво додајте го/ја %s во Вашиот контактен список на Вашиот клиент за НП "
-"или Google Talk."
+#: actions/imsettings.php:140
+msgid "IM address"
+msgstr "IM адреса"
 
-#. TRANS: Form legend for Instant Messaging preferences form.
-#: actions/imsettings.php:154
-msgid "IM preferences"
+#: actions/imsettings.php:142
+#, php-format
+msgid "%s screenname."
+msgstr ""
+
+#. TRANS: Header for IM preferences form.
+#: actions/imsettings.php:163
+#, fuzzy
+msgid "IM Preferences"
 msgstr "IM нагодувања"
 
-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:159
-msgid "Send me notices through Jabber/Google Talk."
-msgstr "Испраќај ми забелешки преку Jabber/Google Talk."
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:174
+#, fuzzy
+msgid "Send me notices"
+msgstr "Испрати забелешка"
 
-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:165
-msgid "Post a notice when my Jabber/Google Talk status changes."
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:176
+#, fuzzy
+msgid "Post a notice when my status changes."
 msgstr ""
 "Објавувај забелешка кога ќе се промени мојот статус на Jabber/Google Talk."
 
-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:171
-msgid ""
-"Send me replies through Jabber/Google Talk from people I'm not subscribed to."
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:178
+#, fuzzy
+msgid "Send me replies from people I'm not subscribed to."
 msgstr ""
 "Испраќај ми одговори преку Jabber/Google Talk од луѓе на кои не се имам "
 "претплатено."
 
-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:178
-msgid "Publish a MicroID for my Jabber/Google Talk address."
-msgstr "Објави MicroID за мојата адреса на Jabber/Google Talk."
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:181
+#, fuzzy
+msgid "Publish a MicroID"
+msgstr "Објави MicroID за мојата е-поштенска адреса."
 
-#. TRANS: Confirmation message for successful Instant Messaging preferences save.
-#: actions/imsettings.php:283 actions/othersettings.php:192
+#. TRANS: Server error thrown on database error updating IM preferences.
+#: actions/imsettings.php:291
+#, fuzzy
+msgid "Couldn't update IM preferences."
+msgstr "Не можев да го подновам корисникот."
+
+#. TRANS: Confirmation message for successful IM preferences save.
+#. TRANS: Confirmation message after saving preferences.
+#: actions/imsettings.php:298 actions/urlsettings.php:244
 msgid "Preferences saved."
 msgstr "Нагодувањата се зачувани."
 
-#. TRANS: Message given saving Instant Messaging address without having provided one.
-#: actions/imsettings.php:304
-msgid "No Jabber ID."
-msgstr "Нема JabberID."
+#. TRANS: Message given saving IM address without having provided one.
+#: actions/imsettings.php:320
+#, fuzzy
+msgid "No screenname."
+msgstr "Нема прекар."
 
-#. TRANS: Message given saving Instant Messaging address that cannot be normalised.
-#: actions/imsettings.php:312
-msgid "Cannot normalize that Jabber ID."
+#: actions/imsettings.php:325
+#, fuzzy
+msgid "No transport."
+msgstr "Нема забелешка."
+
+#. TRANS: Message given saving IM address that cannot be normalised.
+#: actions/imsettings.php:333
+#, fuzzy
+msgid "Cannot normalize that screenname"
 msgstr "Не можам да го нормализирам овој ID за Jabber."
 
-#. TRANS: Message given saving Instant Messaging address that not valid.
-#: actions/imsettings.php:317
-msgid "Not a valid Jabber ID."
-msgstr "Ова не е важечки ID за Jabber."
+#. TRANS: Message given saving IM address that not valid.
+#: actions/imsettings.php:340
+#, fuzzy
+msgid "Not a valid screenname"
+msgstr "Неправилен прекар."
 
-#. TRANS: Message given saving Instant Messaging address that is already set.
-#: actions/imsettings.php:321
-msgid "That is already your Jabber ID."
-msgstr "Ова веќе е Вашиот Jabber ID."
-
-#. TRANS: Message given saving Instant Messaging address that is already set for another user.
-#: actions/imsettings.php:325
-msgid "Jabber ID already belongs to another user."
+#. TRANS: Message given saving IM address that is already set for another user.
+#: actions/imsettings.php:344
+#, fuzzy
+msgid "Screenname already belongs to another user."
 msgstr "Ова Jabber ID му припаѓа на друг корисник."
 
-#. TRANS: Message given saving valid Instant Messaging address that is to be confirmed.
-#. TRANS: %s is the Instant Messaging address set for the site.
-#: actions/imsettings.php:353
-#, php-format
-msgid ""
-"A confirmation code was sent to the IM address you added. You must approve %"
-"s for sending messages to you."
+#. TRANS: Message given saving valid IM address that is to be confirmed.
+#: actions/imsettings.php:369
+#, fuzzy
+msgid "A confirmation code was sent to the IM address you added."
 msgstr ""
 "Испративме потврден код на IM-адресата што ја додадовте. Ќе мора да му "
 "одобрите на %s да Ви испраќа пораки."
 
-#. TRANS: Message given canceling Instant Messaging address confirmation for the wrong IM address.
-#: actions/imsettings.php:382
+#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#: actions/imsettings.php:396
 msgid "That is the wrong IM address."
 msgstr "Ова е погрешната IM адреса."
 
-#. TRANS: Server error thrown on database error canceling Instant Messaging address confirmation.
-#: actions/imsettings.php:391
-msgid "Could not delete IM confirmation."
+#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#: actions/imsettings.php:405
+#, fuzzy
+msgid "Couldn't delete confirmation."
 msgstr "Не можев да ја избришам потврдата на IM."
 
-#. TRANS: Message given after successfully canceling Instant Messaging address confirmation.
-#: actions/imsettings.php:396
+#. TRANS: Message given after successfully canceling IM address confirmation.
+#: actions/imsettings.php:410
 msgid "IM confirmation cancelled."
 msgstr "Потврдата на IM е откажана."
 
-#. TRANS: Message given trying to remove an Instant Messaging address that is not
+#. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.
-#: actions/imsettings.php:417
-msgid "That is not your Jabber ID."
-msgstr "Ова не е Вашиот Jabber ID."
+#: actions/imsettings.php:434
+#, fuzzy
+msgid "That is not your screenname."
+msgstr "Тоа не е Вашиот телефонски број."
+
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#: actions/imsettings.php:443
+#, fuzzy
+msgid "Couldn't update user im prefs."
+msgstr "Не можев да ја подновам корисничката евиденција."
 
 #. TRANS: Message given after successfully removing a registered Instant Messaging address.
-#: actions/imsettings.php:440
+#: actions/imsettings.php:451
 msgid "The IM address was removed."
 msgstr "IM-адресата е отстранета."
 
@@ -3511,7 +3554,7 @@ msgid "You must be logged in to join a group."
 msgstr "Мора да сте најавени за да можете да се зачлените во група."
 
 #. TRANS: Title for join group page after joining.
-#: actions/joingroup.php:147
+#: actions/joingroup.php:148
 #, php-format
 msgctxt "TITLE"
 msgid "%1$s joined group %2$s"
@@ -3644,7 +3687,7 @@ msgstr "URL-адреса за слика што ќе се прикажува с
 #. TRANS: Submit button title.
 #: actions/licenseadminpanel.php:311 actions/sessionsadminpanel.php:199
 #: actions/siteadminpanel.php:292 actions/snapshotadminpanel.php:245
-#: actions/tagother.php:154 lib/applicationeditform.php:357
+#: actions/tagother.php:133 lib/applicationeditform.php:357
 msgid "Save"
 msgstr "Зачувај"
 
@@ -3652,40 +3695,42 @@ msgstr "Зачувај"
 msgid "Save license settings"
 msgstr "Зачувај нагодувања на лиценцата"
 
-#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
+#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
+#: actions/login.php:97 actions/otp.php:62 actions/register.php:130
 msgid "Already logged in."
 msgstr "Веќе сте најавени."
 
-#: actions/login.php:148
+#: actions/login.php:125
 msgid "Incorrect username or password."
 msgstr "Неточно корисничко име или лозинка"
 
-#: actions/login.php:154 actions/otp.php:120
+#. TRANS: Server error displayed when a user object could not be created trying to login using "one time password login".
+#: actions/login.php:131 actions/otp.php:127
 msgid "Error setting user. You are probably not authorized."
 msgstr "Грешка при поставувањето на корисникот. Веројатно не се заверени."
 
-#: actions/login.php:210 actions/login.php:263
+#: actions/login.php:185 actions/login.php:236 lib/action.php:598
 msgid "Login"
 msgstr "Најава"
 
-#: actions/login.php:249
+#: actions/login.php:222
 msgid "Login to site"
 msgstr "Најавете се"
 
-#: actions/login.php:258 actions/register.php:490
+#: actions/login.php:231 actions/register.php:469
 msgid "Remember me"
 msgstr "Запамети ме"
 
-#: actions/login.php:259 actions/register.php:492
+#: actions/login.php:232 actions/register.php:471
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 "Отсега врши автоматска најава. Не треба да се користи за јавни сметачи!"
 
-#: actions/login.php:269
+#: actions/login.php:241
 msgid "Lost or forgotten password?"
 msgstr "Ја загубивте или заборавивте лозинката?"
 
-#: actions/login.php:288
+#: actions/login.php:259
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -3693,11 +3738,11 @@ msgstr ""
 "Поради безбедносни причини треба повторно да го внесете Вашето корисничко "
 "име и лозинка пред да ги смените Вашите нагодувања."
 
-#: actions/login.php:292
+#: actions/login.php:263
 msgid "Login with your username and password."
 msgstr "Најавете се со корисничко име и лозинка."
 
-#: actions/login.php:295
+#: actions/login.php:266
 #, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -3823,7 +3868,9 @@ msgstr "Ново забелешка"
 msgid "Notice posted"
 msgstr "Забелешката е објавена"
 
-#: actions/noticesearch.php:68
+#. TRANS: Instructions for Notice search page.
+#. TRANS: %%site.name%% is the name of the StatusNet site.
+#: actions/noticesearch.php:69
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -3832,16 +3879,21 @@ msgstr ""
 "Пребарајте забелешки на %%site.name%% според нивната содржина. Поимите "
 "одделете ги со празни места; мора да имаат барем по 3 знаци."
 
-#: actions/noticesearch.php:78
+#. TRANS: Title of the page where users can search for notices.
+#: actions/noticesearch.php:80
 msgid "Text search"
 msgstr "Текстуално пребарување"
 
-#: actions/noticesearch.php:91
+#. TRANS: Test in RSS notice search.
+#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
+#: actions/noticesearch.php:95
 #, php-format
 msgid "Search results for \"%1$s\" on %2$s"
 msgstr "Резултати од пребарувањето за „%1$s“ на %2$s"
 
-#: actions/noticesearch.php:121
+#. TRANS: Text for logged in users making a query for notices without results.
+#. TRANS: This message contains a Markdown link.
+#: actions/noticesearch.php:128
 #, php-format
 msgid ""
 "Be the first to [post on this topic](%%%%action.newnotice%%%%?"
@@ -3850,7 +3902,9 @@ msgstr ""
 "Бидете први што ќе [објавите нешто на оваа тема](%%%%action.newnotice%%%%?"
 "status_textarea=%s)!"
 
-#: actions/noticesearch.php:124
+#. TRANS: Text for not logged in users making a query for notices without results.
+#. TRANS: This message contains Markdown links.
+#: actions/noticesearch.php:133
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and be the first to "
@@ -3860,14 +3914,17 @@ msgstr ""
 "што ќе [објави нешто на оваа тема](%%%%action.newnotice%%%%?status_textarea=%"
 "s)!"
 
-#: actions/noticesearchrss.php:96
+#. TRANS: RSS notice search feed title. %s is the query.
+#: actions/noticesearchrss.php:95
 #, php-format
 msgid "Updates with \"%s\""
 msgstr "Подновувања со „%s“"
 
-#: actions/noticesearchrss.php:98
-#, fuzzy, php-format
-msgid "Updates matching search term \"%1$s\" on %2$s!"
+#. TRANS: RSS notice search feed description.
+#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
+#: actions/noticesearchrss.php:99
+#, php-format
+msgid "Updates matching search term \"%1$s\" on %2$s."
 msgstr "Подновувања кои се совпаѓаат со пребараниот израз „%1$s“ на %2$s."
 
 #: actions/nudge.php:85
@@ -3887,51 +3944,51 @@ msgid "Nudge sent!"
 msgstr "Подбуцнувањето е испратено!"
 
 #. TRANS: Message displayed to an anonymous user trying to view OAuth application list.
-#: actions/oauthappssettings.php:60
+#: actions/oauthappssettings.php:57
 msgid "You must be logged in to list your applications."
 msgstr "Мора да сте најавени за да можете да ги наведете програмите."
 
 #. TRANS: Page title for OAuth applications
-#: actions/oauthappssettings.php:76
+#: actions/oauthappssettings.php:73
 msgid "OAuth applications"
 msgstr "OAuth програми"
 
 #. TRANS: Page instructions for OAuth applications
-#: actions/oauthappssettings.php:88
+#: actions/oauthappssettings.php:85
 msgid "Applications you have registered"
 msgstr "Програми што ги имате регистрирано"
 
 #. TRANS: Empty list message on page with OAuth applications.
-#: actions/oauthappssettings.php:141
+#: actions/oauthappssettings.php:138
 #, php-format
 msgid "You have not registered any applications yet."
 msgstr "Сè уште немате регистрирано ниеден програм,"
 
 #. TRANS: Title for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:71
+#: actions/oauthconnectionssettings.php:69
 msgid "Connected applications"
 msgstr "Поврзани програми"
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:83
+#: actions/oauthconnectionssettings.php:80
 msgid "The following connections exist for your account."
 msgstr "За Вашата сметка постојат следниве врски."
 
 #. TRANS: Client error when trying to revoke access for an application while not being a user of it.
-#: actions/oauthconnectionssettings.php:168
+#: actions/oauthconnectionssettings.php:165
 msgid "You are not a user of that application."
 msgstr "Не сте корисник на тој програм."
 
 #. TRANS: Client error when revoking access has failed for some reason.
 #. TRANS: %s is the application ID revoking access failed for.
-#: actions/oauthconnectionssettings.php:183
+#: actions/oauthconnectionssettings.php:180
 #, php-format
 msgid "Unable to revoke access for application: %s."
 msgstr "Не можам да му го одземам пристапот на програмот: %s."
 
 #. TRANS: Success message after revoking access for an application.
 #. TRANS: %1$s is the application name, %2$s is the first part of the user token.
-#: actions/oauthconnectionssettings.php:202
+#: actions/oauthconnectionssettings.php:199
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -3940,14 +3997,14 @@ msgstr ""
 "Успешно одземавте пристап за %1$s и пристапниот жетон што почнува со %2$s."
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:213
+#: actions/oauthconnectionssettings.php:210
 msgid "You have not authorized any applications to use your account."
 msgstr "Му немате дозволено пристап до Вашата сметка на ниеден програм."
 
 #. TRANS: Note for developers in the OAuth connection settings form.
 #. TRANS: This message contains a Markdown link. Do not separate "](".
 #. TRANS: %s is the URL to the OAuth settings.
-#: actions/oauthconnectionssettings.php:233
+#: actions/oauthconnectionssettings.php:230
 #, php-format
 msgid ""
 "Are you a developer? [Register an OAuth client application](%s) to use with "
@@ -3956,6 +4013,16 @@ msgstr ""
 "Дали сте програмер? [Регистрирајте клиентски програм за OAuth](%s) за да го "
 "користите овој примерок на StatusNet."
 
+#: actions/oembed.php:64
+#, php-format
+msgid "\"%s\" not found."
+msgstr "„%s“ не е пронајден."
+
+#: actions/oembed.php:76
+#, php-format
+msgid "Notice %s not found."
+msgstr "Забелешката %s не е пронајдена."
+
 #: actions/oembed.php:80 actions/shownotice.php:100
 msgid "Notice has no profile."
 msgstr "Забелешката нема профил."
@@ -3965,6 +4032,16 @@ msgstr "Забелешката нема профил."
 msgid "%1$s's status on %2$s"
 msgstr "%1$s статус на %2$s"
 
+#: actions/oembed.php:95
+#, php-format
+msgid "Attachment %s not found."
+msgstr "Прилогот %s не е пронајден."
+
+#: actions/oembed.php:136
+#, php-format
+msgid "\"%s\" not supported for oembed requests."
+msgstr "„%s“ не е поддржано за oembed-барања."
+
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
 #: actions/oembed.php:168
 #, php-format
@@ -3978,93 +4055,60 @@ msgid "Only %s URLs over plain HTTP please."
 msgstr "Ве молиме користете само %s URL-адреси врз прост HTTP-код."
 
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1205
-#: lib/apiaction.php:1232 lib/apiaction.php:1367
+#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1207
+#: lib/apiaction.php:1234 lib/apiaction.php:1369
 msgid "Not a supported data format."
 msgstr "Ова не е поддржан формат на податотека."
 
+#. TRANS: ShortName in the OpenSearch interface when trying to find users.
 #: actions/opensearch.php:64
 msgid "People Search"
 msgstr "Пребарување на луѓе"
 
-#: actions/opensearch.php:67
+#: actions/opensearch.php:68
 msgid "Notice Search"
 msgstr "Пребарување на забелешки"
 
-#: actions/othersettings.php:59
-msgid "Other settings"
-msgstr "Други нагодувања"
-
-#. TRANS: Instructions for tab "Other" in user profile settings.
-#: actions/othersettings.php:71
-msgid "Manage various other options."
-msgstr "Раководење со разни други можности."
-
-#. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
-#. TRANS: user's profile settings. Use of "free" is as in "open", indicating that the
-#. TRANS: information on the shortener site is freely distributable.
-#. TRANS: This message has one space at the beginning. Use your language's word separator
-#. TRANS: here if it has one (most likely a single space).
-#: actions/othersettings.php:113
-msgid " (free service)"
-msgstr " (слободна служба)"
-
-#. TRANS: Label for dropdown with URL shortener services.
-#: actions/othersettings.php:122
-msgid "Shorten URLs with"
-msgstr "Скратувај URL-адреси со"
-
-#. TRANS: Tooltip for for dropdown with URL shortener services.
-#: actions/othersettings.php:124
-msgid "Automatic shortening service to use."
-msgstr "Која автоматска служба за скратување да се користи."
-
-#. TRANS: Label for checkbox.
-#: actions/othersettings.php:130
-msgid "View profile designs"
-msgstr "Види изгледи на профилот"
-
-#. TRANS: Tooltip for checkbox.
-#: actions/othersettings.php:132
-msgid "Show or hide profile designs."
-msgstr "Прикажи или скриј изгледи на профилот."
-
-#. TRANS: Form validation error for form "Other settings" in user profile.
-#: actions/othersettings.php:164
-msgid "URL shortening service is too long (maximum 50 characters)."
-msgstr "Услугата за скратување на URL-адреси е предолга (највеќе до 50 знаци)."
-
-#: actions/otp.php:69
+#. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
+#: actions/otp.php:70
 msgid "No user ID specified."
 msgstr "Нема назначено кориснички ID."
 
-#: actions/otp.php:83
+#. TRANS: Client error displayed trying to use "one time password login" without specifying a login token.
+#: actions/otp.php:86
 msgid "No login token specified."
 msgstr "Нема назначено најавен жетон."
 
-#: actions/otp.php:90
+#. TRANS: Client error displayed trying to use "one time password login" without requesting a login token.
+#: actions/otp.php:94
 msgid "No login token requested."
 msgstr "Не е побаран најавен жетон."
 
-#: actions/otp.php:95
+#. TRANS: Client error displayed trying to use "one time password login" while specifying an invalid login token.
+#: actions/otp.php:100
 msgid "Invalid login token specified."
 msgstr "Назначен е неважечки најавен жетон."
 
-#: actions/otp.php:104
+#. TRANS: Client error displayed trying to use "one time password login" while specifying an expired login token.
+#: actions/otp.php:110
 msgid "Login token expired."
 msgstr "Најавниот жетон е истечен."
 
-#: actions/outbox.php:58
+#. TRANS: Title for outbox for any but the fist page.
+#. TRANS: %1$s is the user nickname, %2$d is the page number.
+#: actions/outbox.php:57
 #, php-format
 msgid "Outbox for %1$s - page %2$d"
 msgstr "Излезно сандаче за %1$s - стр. %2$d"
 
+#. TRANS: Title for first page of outbox.
 #: actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
 msgstr "Излезно сандаче за %s"
 
-#: actions/outbox.php:104
+#. TRANS: Instructions for outbox.
+#: actions/outbox.php:103
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr ""
 "Ова е Вашето излезно сандче, во кое се наведени приватните пораки кои ги "
@@ -4092,43 +4136,42 @@ msgstr "Стара лозинка"
 msgid "New password"
 msgstr "Нова лозинка"
 
-#: actions/passwordsettings.php:109
-#, fuzzy
-msgid "6 or more characters"
+#: actions/passwordsettings.php:109 actions/register.php:416
+msgid "6 or more characters."
 msgstr "6 или повеќе знаци."
 
-#: actions/passwordsettings.php:113
-#, fuzzy
-msgid "Same as password above"
+#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#: actions/passwordsettings.php:113 actions/recoverpassword.php:264
+#: actions/register.php:420
+msgid "Same as password above."
 msgstr "Исто како лозинката погоре."
 
 #: actions/passwordsettings.php:117
 msgid "Change"
 msgstr "Промени"
 
-#: actions/passwordsettings.php:154 actions/register.php:238
+#: actions/passwordsettings.php:153 actions/register.php:223
 msgid "Password must be 6 or more characters."
 msgstr "Лозинката мора да содржи барем 6 знаци."
 
-#: actions/passwordsettings.php:157 actions/register.php:241
+#: actions/passwordsettings.php:156 actions/register.php:226
 msgid "Passwords don't match."
 msgstr "Лозинките не се совпаѓаат."
 
-#: actions/passwordsettings.php:165
+#: actions/passwordsettings.php:164
 msgid "Incorrect old password"
 msgstr "Неточна стара лозинка"
 
-#: actions/passwordsettings.php:181
+#: actions/passwordsettings.php:180
 msgid "Error saving user; invalid."
 msgstr "Грешка во зачувувањето на корисникот; неправилен."
 
-#: actions/passwordsettings.php:186
-#, fuzzy
-msgid "Can't save new password."
+#. TRANS: Reset password form validation error message.
+#: actions/passwordsettings.php:185 actions/recoverpassword.php:418
+msgid "Cannot save new password."
 msgstr "Не можам да ја зачувам новата лозинка."
 
-#. TRANS: Title for password recovery page in password saved mode.
-#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
+#: actions/passwordsettings.php:191
 msgid "Password saved."
 msgstr "Лозинката е зачувана."
 
@@ -4333,8 +4376,7 @@ msgid "Directory where backgrounds are located."
 msgstr "Директориумот кадешто се сместени позадините."
 
 #. TRANS: Fieldset legens in Paths admin panel.
-#. TRANS: DT element label in attachment list.
-#: actions/pathsadminpanel.php:419 lib/attachmentlist.php:98
+#: actions/pathsadminpanel.php:419
 msgid "Attachments"
 msgstr "Прилози"
 
@@ -4402,7 +4444,9 @@ msgstr "Oпслужувач, кому ќе му се испраќаат SSL-ба
 msgid "Save paths"
 msgstr "Зачувај патеки"
 
-#: actions/peoplesearch.php:52
+#. TRANS: Instructions for the "People search" page.
+#. TRANS: %%site.name%% is the name of the StatusNet site.
+#: actions/peoplesearch.php:54
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
@@ -4412,7 +4456,8 @@ msgstr ""
 "одделете ги со празни места. Минималната должина на зборовите изнесува 3 "
 "знаци."
 
-#: actions/peoplesearch.php:58
+#. TRANS: Title of a page where users can search for other users.
+#: actions/peoplesearch.php:61
 msgid "People search"
 msgstr "Пребарување на луѓе"
 
@@ -4426,6 +4471,60 @@ msgstr "Не е важечка ознака за луѓе: %s."
 msgid "Users self-tagged with %1$s - page %2$d"
 msgstr "Користници самоозначени со %1$s - стр. %2$d"
 
+#. TRANS: Page title for AJAX form return when a disabling a plugin.
+#: actions/plugindisable.php:69
+msgctxt "plugin"
+msgid "Disabled"
+msgstr ""
+
+#. TRANS: Client error displayed trying to perform any request method other than POST.
+#. TRANS: Do not translate POST.
+#: actions/pluginenable.php:78 actions/subscribe.php:77
+msgid "This action only accepts POST requests."
+msgstr "Ова дејство прифаќа само POST-барања"
+
+#: actions/pluginenable.php:102
+#, fuzzy
+msgid "You cannot administer plugins."
+msgstr "Не можете да бришете корисници."
+
+#: actions/pluginenable.php:109
+#, fuzzy
+msgid "No such plugin."
+msgstr "Нема таква страница."
+
+#. TRANS: Page title for AJAX form return when enabling a plugin.
+#: actions/pluginenable.php:159
+msgctxt "plugin"
+msgid "Enabled"
+msgstr ""
+
+#. TRANS: Tab and title for plugins admin panel.
+#. TRANS: Menu item for site administration
+#: actions/pluginsadminpanel.php:56 actions/version.php:191
+#: lib/adminpanelaction.php:411
+msgid "Plugins"
+msgstr "Приклучоци"
+
+#. TRANS: Instructions at top of plugin admin page.
+#: actions/pluginsadminpanel.php:68
+msgid ""
+"Additional plugins can be enabled and configured manually. See the <a href="
+"\"http://status.net/wiki/Plugins\">online plugin documentation</a> for more "
+"details."
+msgstr ""
+
+#. TRANS: Admin form section header
+#: actions/pluginsadminpanel.php:84
+#, fuzzy
+msgid "Default plugins"
+msgstr "Основен јазик"
+
+#: actions/pluginsadminpanel.php:106
+msgid ""
+"All default plugins have been disabled from the site's configuration file."
+msgstr ""
+
 #: actions/postnotice.php:95
 msgid "Invalid notice content."
 msgstr "Неважечка содржина на забелешката."
@@ -4438,12 +4537,12 @@ msgstr ""
 "место „%2$s“."
 
 #. TRANS: Page title for profile settings.
-#: actions/profilesettings.php:59
+#: actions/profilesettings.php:60
 msgid "Profile settings"
 msgstr "Нагодувања на профилот"
 
 #. TRANS: Usage instructions for profile settings.
-#: actions/profilesettings.php:70
+#: actions/profilesettings.php:71
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
@@ -4451,33 +4550,30 @@ msgstr ""
 "повеќе за Вас."
 
 #. TRANS: Profile settings form legend.
-#: actions/profilesettings.php:98
+#: actions/profilesettings.php:99
 msgid "Profile information"
 msgstr "Информации за профил"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109 actions/register.php:433
+#: actions/profilesettings.php:110 actions/register.php:412
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr "1-64 мали букви или бројки, без интерпукциски знаци и празни места."
 
 #. TRANS: Field label in form for profile settings.
-#. TRANS: Label for full group name (dt). Text hidden by default.
-#. TRANS: DT for full name in a profile.
-#: actions/profilesettings.php:113 actions/register.php:455
-#: actions/showgroup.php:255 actions/tagother.php:104
-#: lib/groupeditform.php:150 lib/userprofile.php:156
+#: actions/profilesettings.php:114 actions/register.php:434
+#: lib/groupeditform.php:150
 msgid "Full name"
 msgstr "Име и презиме"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:118 actions/register.php:460
+#: actions/profilesettings.php:119 actions/register.php:439
 #: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "Домашна страница"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:121
+#: actions/profilesettings.php:122 actions/register.php:441
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr ""
 "URL-адреса на Вашата домашна страница, блог или профил на друго мрежно место."
@@ -4485,7 +4581,7 @@ msgstr ""
 #. TRANS: Tooltip for field label in form for profile settings. Plural
 #. TRANS: is decided by the number of characters available for the
 #. TRANS: biography (%d).
-#: actions/profilesettings.php:129 actions/register.php:471
+#: actions/profilesettings.php:130 actions/register.php:450
 #, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4493,80 +4589,73 @@ msgstr[0] "Опишете се себеси и своите интереси с
 msgstr[1] "Опишете се себеси и своите интереси со %d знаци."
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:135 actions/register.php:476
+#: actions/profilesettings.php:136 actions/register.php:455
 msgid "Describe yourself and your interests"
 msgstr "Опишете се себеси и Вашите интереси"
 
 #. TRANS: Text area label in form for profile settings where users can provide.
 #. TRANS: their biography.
-#: actions/profilesettings.php:139 actions/register.php:478
+#: actions/profilesettings.php:140 actions/register.php:457
 msgid "Bio"
 msgstr "Биографија"
 
 #. TRANS: Field label in form for profile settings.
-#. TRANS: Label for group location (dt). Text hidden by default.
-#. TRANS: DT for location in a profile.
-#: actions/profilesettings.php:145 actions/register.php:483
-#: actions/showgroup.php:265 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:173
-#: lib/userprofile.php:172
+#: actions/profilesettings.php:146 actions/register.php:462
+#: lib/groupeditform.php:173
 msgid "Location"
 msgstr "Местоположба"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148 actions/register.php:485
+#: actions/profilesettings.php:149
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Каде се наоѓате, на пр. „Град, Област, Земја“."
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:153
+#: actions/profilesettings.php:154
 msgid "Share my current location when posting notices"
 msgstr ""
 "Прикажувај ја мојата тековна местоположба при објавување на забелешките"
 
 #. TRANS: Field label in form for profile settings.
-#. TRANS: DT for tags in a profile.
-#: actions/profilesettings.php:161 actions/tagother.php:149
-#: actions/tagother.php:209 lib/subscriptionlist.php:106
-#: lib/subscriptionlist.php:108 lib/userprofile.php:220
+#: actions/profilesettings.php:162 actions/tagother.php:128
+#: actions/tagother.php:188 lib/subscriptionlist.php:104
+#: lib/subscriptionlist.php:106
 msgid "Tags"
 msgstr "Ознаки"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:164
-#, fuzzy
+#: actions/profilesettings.php:165
 msgid ""
-"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- "
+"separated."
 msgstr ""
 "Ознаки за Вас самите (букви, бројки, -, . и _), одделени со запирка или "
 "празно место."
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:169
+#: actions/profilesettings.php:170
 msgid "Language"
 msgstr "Јазик"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:171
-#, fuzzy
-msgid "Preferred language"
+#: actions/profilesettings.php:172
+msgid "Preferred language."
 msgstr "Претпочитан јазик"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:181
+#: actions/profilesettings.php:182
 msgid "Timezone"
 msgstr "Часовна зона"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:183
+#: actions/profilesettings.php:184
 msgid "What timezone are you normally in?"
 msgstr "Во која часовна зона обично се наоѓате?"
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:189
-#, fuzzy
+#: actions/profilesettings.php:190
 msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)"
+"Automatically subscribe to whoever subscribes to me (best for non-humans)."
 msgstr ""
 "Автоматски претплаќај ме на секој што се претплаќа на мене (најдобро за "
 "ботови и сл.)."
@@ -4574,7 +4663,7 @@ msgstr ""
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Plural form is used based on the maximum number of allowed
 #. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:258 actions/register.php:229
+#: actions/profilesettings.php:259 actions/register.php:214
 #, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4582,47 +4671,47 @@ msgstr[0] "Биографијата е предолга (највеќе до %d
 msgstr[1] "Биографијата е предолга (највеќе до %d знаци)."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:269 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:270 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr "Не е избрана часовна зона."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:277
+#: actions/profilesettings.php:278
 msgid "Language is too long (maximum 50 characters)."
 msgstr "Јазикот е предолг (највеќе до 50 знаци)."
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:291 actions/tagother.php:178
+#: actions/profilesettings.php:292
 #, php-format
-msgid "Invalid tag: \"%s\""
-msgstr "Неважечка ознака: „%s“"
+msgid "Invalid tag: \"%s\"."
+msgstr "Неважечка ознака: „%s“."
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:347
+#: actions/profilesettings.php:348
 msgid "Could not update user for autosubscribe."
 msgstr "Не можев да го подновам корисникот за автопретплата."
 
 #. TRANS: Server error thrown when user profile location preference settings could not be updated.
-#: actions/profilesettings.php:405
+#: actions/profilesettings.php:406
 msgid "Could not save location prefs."
 msgstr "Не можев да ги зачувам нагодувањата за местоположба."
 
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:427 actions/tagother.php:200
+#: actions/profilesettings.php:428 actions/tagother.php:179
 msgid "Could not save tags."
 msgstr "Не можев да ги зачувам ознаките."
 
 #. TRANS: Confirmation shown when user profile settings are saved.
 #. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:436 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:437 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "Нагодувањата се зачувани"
 
 #. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
 #. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:483 actions/restoreaccount.php:60
+#: actions/profilesettings.php:484 actions/restoreaccount.php:60
 msgid "Restore account"
 msgstr "Врати сметка"
 
@@ -4701,6 +4790,12 @@ msgstr ""
 "org/wiki/Микроблогирање) заснована на слободната програмска алатка "
 "[StatusNet](http://status.net/)."
 
+#. TRANS: Public RSS feed description. %s is the StatusNet site name.
+#: actions/publicrss.php:106
+#, php-format
+msgid "%s updates from everyone."
+msgstr "%s подновувања од сите."
+
 #. TRANS: Title for public tag cloud.
 #: actions/publictagcloud.php:57
 msgid "Public tag cloud"
@@ -4742,10 +4837,6 @@ msgstr ""
 "Зошто не [регистрирате сметка](%%action.register%%) и станете прв што ќе "
 "објави!"
 
-#: actions/publictagcloud.php:146
-msgid "Tag cloud"
-msgstr "Облак од ознаки"
-
 #. TRANS: Client error displayed trying to recover password while already logged in.
 #: actions/recoverpassword.php:37
 msgid "You are already logged in!"
@@ -4838,6 +4929,11 @@ msgstr "Пронаоѓање на лозинка"
 msgid "Password recovery requested"
 msgstr "Побарано е пронаоѓање на лозинката"
 
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/recoverpassword.php:229
+msgid "Password saved"
+msgstr "Лозинката е зачувана"
+
 #. TRANS: Title for password recovery page when an unknown action has been specified.
 #: actions/recoverpassword.php:232
 msgid "Unknown action"
@@ -4848,14 +4944,9 @@ msgstr "Непознато дејство"
 msgid "6 or more characters, and do not forget it!"
 msgstr "6 или повеќе знаци - не заборавајте!"
 
-#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
-#: actions/recoverpassword.php:264 actions/register.php:441
-msgid "Same as password above."
-msgstr "Исто како лозинката погоре."
-
 #. TRANS: Button text for password reset form.
 #. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: actions/recoverpassword.php:268 lib/designsettings.php:264
+#: actions/recoverpassword.php:268 lib/designform.php:145
 msgctxt "BUTTON"
 msgid "Reset"
 msgstr "Врати одново"
@@ -4904,13 +4995,8 @@ msgstr "Лозинката мора да има барем 6 знаци."
 msgid "Password and confirmation do not match."
 msgstr "Двете лозинки не се совпаѓаат."
 
-#. TRANS: Reset password form validation error message.
-#: actions/recoverpassword.php:418
-msgid "Cannot save new password."
-msgstr "Не можам да ја зачувам новата лозинка."
-
 #. TRANS: Server error displayed when something does wrong with the user object during password reset.
-#: actions/recoverpassword.php:426 actions/register.php:256
+#: actions/recoverpassword.php:426 actions/register.php:241
 msgid "Error setting user."
 msgstr "Грешка во поставувањето на корисникот."
 
@@ -4919,99 +5005,98 @@ msgstr "Грешка во поставувањето на корисникот."
 msgid "New password successfully saved. You are now logged in."
 msgstr "Новата лозинка е успешно зачувана. Сега сте најавени."
 
-#: actions/register.php:92 actions/register.php:196 actions/register.php:413
+#: actions/redirecturl.php:70
+#, fuzzy
+msgid "No id parameter"
+msgstr "Нема ID-аргумент."
+
+#: actions/redirecturl.php:76
+#, fuzzy, php-format
+msgid "No such file \"%d\""
+msgstr "Нема таква податотека."
+
+#: actions/register.php:80 actions/register.php:181 actions/register.php:392
 msgid "Sorry, only invited people can register."
 msgstr "Жалиме, регистрацијата е само со покана."
 
-#: actions/register.php:99
+#: actions/register.php:87
 msgid "Sorry, invalid invitation code."
 msgstr "Жалиме, неважечки код за поканата."
 
-#: actions/register.php:119
+#: actions/register.php:106
 msgid "Registration successful"
 msgstr "Регистрацијата е успешна"
 
-#: actions/register.php:121 actions/register.php:511
+#: actions/register.php:108 actions/register.php:490
 msgid "Register"
 msgstr "Регистрирај се"
 
-#: actions/register.php:142
+#: actions/register.php:128
 msgid "Registration not allowed."
 msgstr "Регистрирањето не е дозволено."
 
-#: actions/register.php:209
-#, fuzzy
-msgid "You can't register if you don't agree to the license."
+#: actions/register.php:194
+msgid "You cannot register if you don't agree to the license."
 msgstr "Не може да се регистрирате ако не ја прифаќате лиценцата."
 
-#: actions/register.php:218
+#: actions/register.php:203
 msgid "Email address already exists."
 msgstr "Адресата веќе постои."
 
-#: actions/register.php:251 actions/register.php:273
+#: actions/register.php:236 actions/register.php:258
 msgid "Invalid username or password."
 msgstr "Погрешно име или лозинка."
 
-#: actions/register.php:351
-#, fuzzy
+#: actions/register.php:333
 msgid ""
 "With this form you can create a new account. You can then post notices and "
-"link up to friends and colleagues. "
+"link up to friends and colleagues."
 msgstr ""
 "Со овој образец можете да создадете нова сметка. Потоа ќе можете да "
 "објавувате забелешки и да се поврзувате со пријатели и колеги."
 
-#: actions/register.php:437
-msgid "6 or more characters."
-msgstr "6 или повеќе знаци."
-
-#. TRANS: Link description in user account settings menu.
-#: actions/register.php:445 actions/register.php:449
-#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
+#: actions/register.php:424 actions/register.php:428
+#: actions/siteadminpanel.php:238 lib/settingsnav.php:92
 msgid "Email"
 msgstr "Е-пошта"
 
-#: actions/register.php:446 actions/register.php:450
-#, fuzzy
-msgid "Used only for updates, announcements, and password recovery"
+#: actions/register.php:425 actions/register.php:429
+msgid "Used only for updates, announcements, and password recovery."
 msgstr "Се користи само за подновувања, објави и повраќање на лозинка."
 
-#: actions/register.php:457
-#, fuzzy
-msgid "Longer name, preferably your \"real\" name"
+#: actions/register.php:436
+msgid "Longer name, preferably your \"real\" name."
 msgstr "Подолго име, по можност Вашето „вистинско“ име и презиме"
 
-#: actions/register.php:462
-#, fuzzy
-msgid "URL of your homepage, blog, or profile on another site"
-msgstr ""
-"URL-адреса на Вашата домашна страница, блог или профил на друго мрежно место."
+#: actions/register.php:464
+msgid "Where you are, like \"City, State (or Region), Country\"."
+msgstr "Каде се наоѓате, на пр. „Град, Сојуз. држава (или Област), Земја“."
 
-#: actions/register.php:523
+#: actions/register.php:503
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
 msgstr "Сфаќам дека содржината и податоците на %1$s се лични и доверливи."
 
-#: actions/register.php:533
+#: actions/register.php:513
 #, php-format
 msgid "My text and files are copyright by %1$s."
 msgstr "Авторското правво на мојот текст и податотеки го има %1$s."
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:537
+#: actions/register.php:517
 msgid "My text and files remain under my own copyright."
 msgstr ""
 "Јас ја задржувам сопственоста на авторското право врз мојот текст и "
 "податотеки."
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:540
+#: actions/register.php:520
 msgid "All rights reserved."
 msgstr "Сите права задржани."
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:545
+#: actions/register.php:525
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -5020,7 +5105,7 @@ msgstr ""
 "Мојот текст и податотеки се достапни под %s, освен следниве приватни "
 "податоци: лозинка, е-пошта, IM-адреса и телефонски број."
 
-#: actions/register.php:588
+#: actions/register.php:566
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -5054,7 +5139,7 @@ msgstr ""
 "Ви благодариме што се зачленивте и Ви пожелуваме пријатни мигови со оваа "
 "служба."
 
-#: actions/register.php:612
+#: actions/register.php:590
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5087,8 +5172,7 @@ msgid "User nickname"
 msgstr "Прекар на корисникот"
 
 #: actions/remotesubscribe.php:129
-#, fuzzy
-msgid "Nickname of the user you want to follow"
+msgid "Nickname of the user you want to follow."
 msgstr "Прекар на корисникот што сакате да го следите."
 
 #: actions/remotesubscribe.php:132
@@ -5096,19 +5180,17 @@ msgid "Profile URL"
 msgstr "URL на профилот"
 
 #: actions/remotesubscribe.php:133
-#, fuzzy
-msgid "URL of your profile on another compatible microblogging service"
+msgid "URL of your profile on another compatible microblogging service."
 msgstr "!URL на Вашиот профил на друга складна служба за микроблогирање."
 
 #. TRANS: Link text for link that will subscribe to a remote profile.
 #: actions/remotesubscribe.php:136 lib/subscribeform.php:139
-#: lib/userprofile.php:431
+#: lib/userprofile.php:402
 msgid "Subscribe"
 msgstr "Претплати се"
 
 #: actions/remotesubscribe.php:158
-#, fuzzy
-msgid "Invalid profile URL (bad format)"
+msgid "Invalid profile URL (bad format)."
 msgstr "Неправилна URL на профилот (лош формат)."
 
 #: actions/remotesubscribe.php:167
@@ -5141,7 +5223,7 @@ msgstr "Не можете да повторувате сопствена заб
 msgid "You already repeated that notice."
 msgstr "Веќе ја имате повторено таа забелешка."
 
-#: actions/repeat.php:112 lib/noticelist.php:692
+#: actions/repeat.php:112 lib/noticelist.php:697
 msgid "Repeated"
 msgstr "Повторено"
 
@@ -5149,9 +5231,9 @@ msgstr "Повторено"
 msgid "Repeated!"
 msgstr "Повторено!"
 
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing @-replies.
+#. TRANS: RSS reply feed title. %s is a user nickname.
 #: actions/replies.php:126 actions/repliesrss.php:68
-#: lib/personalgroupnav.php:109
+#: lib/personalgroupnav.php:105
 #, php-format
 msgid "Replies to %s"
 msgstr "Одговори испратени до %s"
@@ -5203,9 +5285,11 @@ msgstr ""
 "Можете да го [подбуцнете корисникот 1$s](../%2$s) или да [му испратите нешто]"
 "(%%%%action.newnotice%%%%?status_textarea=%3$s)."
 
-#: actions/repliesrss.php:72
-#, fuzzy, php-format
-msgid "Replies to %1$s on %2$s!"
+#. TRANS: RSS reply feed description.
+#. TRANS: %1$s is a user nickname, %2$s is the StatusNet site name.
+#: actions/repliesrss.php:74
+#, php-format
+msgid "Replies to %1$s on %2$s."
 msgstr "Одговори на %1$s на %2$s."
 
 #. TRANS: Client exception displayed when trying to restore an account while not logged in.
@@ -5309,7 +5393,7 @@ msgstr "На ова мрежно место не можете да одзема
 msgid "User doesn't have this role."
 msgstr "Корисникот ја нема оваа улога."
 
-#: actions/rsd.php:146 actions/version.php:159
+#: actions/rsd.php:142 actions/version.php:159
 msgid "StatusNet"
 msgstr "StatusNet"
 
@@ -5351,87 +5435,38 @@ msgstr "Вклучи извод од поправка на грешки за с
 msgid "Save site settings"
 msgstr "Зачувај нагодувања на мреж. место"
 
-#: actions/showapplication.php:82
+#: actions/showapplication.php:78
 msgid "You must be logged in to view an application."
 msgstr "Мора да сте најавени за да можете да го видите програмот."
 
-#: actions/showapplication.php:157
+#: actions/showapplication.php:151
 msgid "Application profile"
 msgstr "Профил на програмот"
 
-#. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:159 lib/applicationeditform.php:177
-msgid "Icon"
-msgstr "Икона"
-
-#. TRANS: Form input field label for application name.
-#: actions/showapplication.php:169 actions/version.php:197
-#: lib/applicationeditform.php:190
-msgid "Name"
-msgstr "Име"
-
-#. TRANS: Form input field label.
-#: actions/showapplication.php:178 lib/applicationeditform.php:227
-msgid "Organization"
-msgstr "Организација"
-
-#. TRANS: Form input field label.
-#: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:168
-msgid "Description"
-msgstr "Опис"
-
-#. TRANS: Header for group statistics on a group page (h2).
-#. TRANS: H2 text for user statistics.
-#: actions/showapplication.php:192 actions/showgroup.php:460
-#: lib/profileaction.php:205
-msgid "Statistics"
-msgstr "Статистики"
-
-#: actions/showapplication.php:203
+#: actions/showapplication.php:179
 #, php-format
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr "Создадено од %1$s - основен пристап: %2$s - %3$d корисници"
 
-#: actions/showapplication.php:213
+#: actions/showapplication.php:189
 msgid "Application actions"
 msgstr "Дејства на програмот"
 
-#: actions/showapplication.php:236
+#: actions/showapplication.php:212
 msgid "Reset key & secret"
 msgstr "Клуч за промена и тајна"
 
 #. TRANS: Title of form for deleting a user.
-#: actions/showapplication.php:252 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:64 lib/noticelist.php:673
+#: actions/showapplication.php:228 lib/deletegroupform.php:121
+#: lib/deleteuserform.php:64 lib/noticelist.php:678
 msgid "Delete"
 msgstr "Избриши"
 
-#: actions/showapplication.php:261
+#: actions/showapplication.php:237
 msgid "Application info"
 msgstr "Инфо за програмот"
 
-#: actions/showapplication.php:263
-msgid "Consumer key"
-msgstr "Потрошувачки клуч"
-
-#: actions/showapplication.php:268
-msgid "Consumer secret"
-msgstr "Потрошувачка тајна"
-
-#: actions/showapplication.php:273
-msgid "Request token URL"
-msgstr "URL на жетонот на барањето"
-
-#: actions/showapplication.php:278
-msgid "Access token URL"
-msgstr "URL на пристапниот жетон"
-
-#: actions/showapplication.php:283
-msgid "Authorize URL"
-msgstr "Одобри URL"
-
-#: actions/showapplication.php:288
+#: actions/showapplication.php:255
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
@@ -5439,7 +5474,7 @@ msgstr ""
 "Напомена: Поддржуваме HMAC-SHA1 потписи. Не поддржуваме потпишување со прост "
 "текст."
 
-#: actions/showapplication.php:309
+#: actions/showapplication.php:275
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr ""
 "Дали сте сигурни дека сакате да го смените Вашиот кориснички клуч и тајна?"
@@ -5527,61 +5562,47 @@ msgstr "Група %s"
 msgid "%1$s group, page %2$d"
 msgstr "Група %1$s, стр. %2$d"
 
-#. TRANS: Group profile header (h2). Text hidden by default.
-#: actions/showgroup.php:223
-msgid "Group profile"
-msgstr "Профил на група"
-
-#. TRANS: Label for group URL (dt). Text hidden by default.
-#. TRANS: DT for URL in a profile.
-#: actions/showgroup.php:273 actions/tagother.php:118
-#: actions/userauthorization.php:175 lib/userprofile.php:186
-msgid "URL"
-msgstr "URL"
-
 #. TRANS: Label for group description or group note (dt). Text hidden by default.
-#. TRANS: DT for note in a profile.
-#: actions/showgroup.php:285 actions/tagother.php:128
-#: actions/userauthorization.php:187 lib/userprofile.php:204
+#: actions/showgroup.php:266
 msgid "Note"
 msgstr "Забелешка"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:296 lib/groupeditform.php:180
+#: actions/showgroup.php:277 lib/groupeditform.php:180
 msgid "Aliases"
 msgstr "Алијаси"
 
 #. TRANS: Group actions header (h2). Text hidden by default.
-#: actions/showgroup.php:313
+#: actions/showgroup.php:294
 msgid "Group actions"
 msgstr "Групни дејства"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:357
+#: actions/showgroup.php:338
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
 msgstr "Канал со забелешки за групата %s (RSS 1.0)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:364
+#: actions/showgroup.php:345
 #, php-format
 msgid "Notice feed for %s group (RSS 2.0)"
 msgstr "Канал со забелешки за групата %s (RSS 2.0)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:371
+#: actions/showgroup.php:352
 #, php-format
 msgid "Notice feed for %s group (Atom)"
 msgstr "Канал со забелешки за групата%s (Atom)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:377
+#: actions/showgroup.php:358
 #, php-format
 msgid "FOAF for %s group"
 msgstr "FOAF за групата %s"
 
 #. TRANS: Header for mini list of group members on a group page (h2).
-#: actions/showgroup.php:414
+#: actions/showgroup.php:395
 msgid "Members"
 msgstr "Членови"
 
@@ -5589,25 +5610,30 @@ msgstr "Членови"
 #. TRANS: Text for user subscription statistics if the user has no subscriptions.
 #. TRANS: Text for user subscriber statistics if user has no subscribers.
 #. TRANS: Text for user user group membership statistics if user is not a member of any group.
-#: actions/showgroup.php:420 lib/profileaction.php:137
+#: actions/showgroup.php:401 lib/profileaction.php:137
 #: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
-#: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
+#: lib/subscriptionlist.php:123 lib/tagcloudsection.php:71
 msgid "(None)"
 msgstr "(Нема)"
 
 #. TRANS: Link to all group members from mini list of group members if group has more than n members.
-#: actions/showgroup.php:429
+#: actions/showgroup.php:410
 msgid "All members"
 msgstr "Сите членови"
 
-#. TRANS: Label for creation date in statistics on group page.
-#: actions/showgroup.php:465
+#. TRANS: Header for group statistics on a group page (h2).
+#. TRANS: H2 text for user statistics.
+#: actions/showgroup.php:441 lib/profileaction.php:205
+msgid "Statistics"
+msgstr "Статистики"
+
+#: actions/showgroup.php:444
 msgctxt "LABEL"
 msgid "Created"
 msgstr "Создадено"
 
 #. TRANS: Label for member count in statistics on group page.
-#: actions/showgroup.php:473
+#: actions/showgroup.php:449
 msgctxt "LABEL"
 msgid "Members"
 msgstr "Членови"
@@ -5616,7 +5642,7 @@ msgstr "Членови"
 #. TRANS: **%s** is the group alias, %%%%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).
-#: actions/showgroup.php:488
+#: actions/showgroup.php:464
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5635,7 +5661,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: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
-#: actions/showgroup.php:498
+#: actions/showgroup.php:474
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5649,7 +5675,7 @@ msgstr ""
 "членови си разменуваат кратки пораки за нивниот живот и интереси. "
 
 #. TRANS: Header for list of group administrators on a group page (h2).
-#: actions/showgroup.php:527
+#: actions/showgroup.php:503
 msgid "Admins"
 msgstr "Администратори"
 
@@ -5688,7 +5714,7 @@ msgid "%1$s tagged %2$s"
 msgstr "%1$s го/ја означи %2$s"
 
 #. TRANS: Page title showing tagged notices in one user's stream.
-#. TRANS: %1$s is the username, %2$s is the hash tag, %1$d is the page number.
+#. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
 #: actions/showstream.php:74
 #, php-format
 msgid "%1$s tagged %2$s, page %3$d"
@@ -5735,13 +5761,13 @@ msgid "FOAF for %s"
 msgstr "FOAF за %s"
 
 #. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
-#: actions/showstream.php:211
+#: actions/showstream.php:205
 #, php-format
 msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr "Ова е хронологијата за %1$s, но %1$s сè уште нема објавено ништо."
 
 #. TRANS: Second sentence of empty list message for a stream for the user themselves.
-#: actions/showstream.php:217
+#: actions/showstream.php:211
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
@@ -5751,7 +5777,7 @@ msgstr ""
 
 #. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:221
+#: actions/showstream.php:215
 #, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
@@ -5762,7 +5788,7 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:264
+#: actions/showstream.php:258
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5778,7 +5804,7 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:271
+#: actions/showstream.php:265
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5790,7 +5816,7 @@ msgstr ""
 "програмска алатка [StatusNet](http://status.net/). "
 
 #. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
-#: actions/showstream.php:328
+#: actions/showstream.php:322
 #, php-format
 msgid "Repeat of %s"
 msgstr "Повторувања на %s"
@@ -5940,78 +5966,76 @@ msgstr ""
 
 #. TRANS: Title for button to save site notice in admin panel.
 #: actions/sitenoticeadminpanel.php:201
-#, fuzzy
-msgid "Save site notice"
+msgid "Save site notice."
 msgstr "Зачувај ја објавата на мреж. место."
 
 #. TRANS: Title for SMS settings.
-#: actions/smssettings.php:57
+#: actions/smssettings.php:56
 msgid "SMS settings"
 msgstr "Нагодувања за СМС"
 
 #. TRANS: SMS settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/smssettings.php:71
+#: actions/smssettings.php:70
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr "Можете да примате СМС пораки по е-пошта од %%site.name%%."
 
 #. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
-#: actions/smssettings.php:93
+#: actions/smssettings.php:92
 msgid "SMS is not available."
 msgstr "СМС-пораките се недостапни."
 
 #. TRANS: Form legend for SMS settings form.
-#: actions/smssettings.php:107
+#: actions/smssettings.php:106
 msgid "SMS address"
 msgstr "СМС адреса"
 
 #. TRANS: Form guide in SMS settings form.
-#: actions/smssettings.php:116
+#: actions/smssettings.php:115
 msgid "Current confirmed SMS-enabled phone number."
 msgstr "Тековен потврден телефонски број со можност за СМС."
 
 #. TRANS: Form guide in IM settings form.
-#: actions/smssettings.php:129
+#: actions/smssettings.php:128
 msgid "Awaiting confirmation on this phone number."
 msgstr "Очекувам потврда за овој телефонски број."
 
 #. TRANS: Field label for SMS address input in SMS settings form.
-#: actions/smssettings.php:138
+#: actions/smssettings.php:137
 msgid "Confirmation code"
 msgstr "Потврден код"
 
 #. TRANS: Form field instructions in SMS settings form.
-#: actions/smssettings.php:140
+#: actions/smssettings.php:139
 msgid "Enter the code you received on your phone."
 msgstr "Внесете го кодот што го добивте по телефон."
 
 #. TRANS: Button label to confirm SMS confirmation code in SMS settings.
-#: actions/smssettings.php:144
+#: actions/smssettings.php:143
 msgctxt "BUTTON"
 msgid "Confirm"
 msgstr "Потврди"
 
 #. TRANS: Field label for SMS phone number input in SMS settings form.
-#: actions/smssettings.php:149
+#: actions/smssettings.php:148
 msgid "SMS phone number"
 msgstr "Телефонски број за СМС"
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
-#: actions/smssettings.php:152
-#, fuzzy
-msgid "Phone number, no punctuation or spaces, with area code"
+#: actions/smssettings.php:151
+msgid "Phone number, no punctuation or spaces, with area code."
 msgstr ""
 "Телефонски број, без интерпункциски знаци и празни места, со повикувачки "
 "број."
 
 #. TRANS: Form legend for SMS preferences form.
-#: actions/smssettings.php:191
+#: actions/smssettings.php:190
 msgid "SMS preferences"
 msgstr "СМС нагодувања"
 
 #. TRANS: Checkbox label in SMS preferences form.
-#: actions/smssettings.php:197
+#: actions/smssettings.php:196
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
@@ -6020,32 +6044,32 @@ msgstr ""
 "трошоци."
 
 #. TRANS: Confirmation message for successful SMS preferences save.
-#: actions/smssettings.php:308
+#: actions/smssettings.php:307
 msgid "SMS preferences saved."
 msgstr "СМС нагодувањата се зачувани."
 
 #. TRANS: Message given saving SMS phone number without having provided one.
-#: actions/smssettings.php:330
+#: actions/smssettings.php:329
 msgid "No phone number."
 msgstr "Нема телефонски број."
 
 #. TRANS: Message given saving SMS phone number without having selected a carrier.
-#: actions/smssettings.php:336
+#: actions/smssettings.php:335
 msgid "No carrier selected."
 msgstr "Немате избрано оператор."
 
 #. TRANS: Message given saving SMS phone number that is already set.
-#: actions/smssettings.php:344
+#: actions/smssettings.php:343
 msgid "That is already your phone number."
 msgstr "Ова и сега е Вашиот телефонски број."
 
 #. TRANS: Message given saving SMS phone number that is already set for another user.
-#: actions/smssettings.php:348
+#: actions/smssettings.php:347
 msgid "That phone number already belongs to another user."
 msgstr "Тој телефонски број е веќе во употреба од друг корисник."
 
 #. TRANS: Message given saving valid SMS phone number that is to be confirmed.
-#: actions/smssettings.php:376
+#: actions/smssettings.php:375
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
 "for the code and instructions on how to use it."
@@ -6054,39 +6078,39 @@ msgstr ""
 "го телефонот за да го видите кодот, заедно со напатствија за негова употреба."
 
 #. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
-#: actions/smssettings.php:404
+#: actions/smssettings.php:403
 msgid "That is the wrong confirmation number."
 msgstr "Ова е погрешен потврден број."
 
 #. TRANS: Message given after successfully canceling SMS phone number confirmation.
-#: actions/smssettings.php:418
+#: actions/smssettings.php:417
 msgid "SMS confirmation cancelled."
 msgstr "Потврдата за СМС е откажана."
 
 #. TRANS: Message given trying to remove an SMS phone number that is not
 #. TRANS: registered for the active user.
-#: actions/smssettings.php:438
+#: actions/smssettings.php:437
 msgid "That is not your phone number."
 msgstr "Тоа не е Вашиот телефонски број."
 
 #. TRANS: Message given after successfully removing a registered SMS phone number.
-#: actions/smssettings.php:460
+#: actions/smssettings.php:459
 msgid "The SMS phone number was removed."
 msgstr "Телефонскиот број за СМС е отстранет."
 
 #. TRANS: Label for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:499
+#: actions/smssettings.php:498
 msgid "Mobile carrier"
 msgstr "Мобилен оператор"
 
 #. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:504
+#: actions/smssettings.php:503
 msgid "Select a carrier"
 msgstr "Изберете оператор"
 
 #. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
 #. TRANS: %s is an administrative contact's e-mail address.
-#: actions/smssettings.php:513
+#: actions/smssettings.php:512
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -6096,7 +6120,7 @@ msgstr ""
 "пошта, но не фигурира овде, известете нè на %s."
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
-#: actions/smssettings.php:535
+#: actions/smssettings.php:534
 msgid "No code entered."
 msgstr "Нема внесено код."
 
@@ -6170,16 +6194,14 @@ msgstr "Не сте претплатени на тој профил."
 msgid "Could not save subscription."
 msgstr "Не можев да ја зачувам претплатата."
 
-#: actions/subscribe.php:77
-msgid "This action only accepts POST requests."
-msgstr "Ова дејство прифаќа само POST-барања"
-
-#: actions/subscribe.php:117
+#. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
+#: actions/subscribe.php:121
 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
 msgstr ""
 "Не можете да се претплатите на OMB 0.1 далечински профил со ова дејство."
 
-#: actions/subscribe.php:145
+#. TRANS: Page title when subscription succeeded.
+#: actions/subscribe.php:149
 msgid "Subscribed"
 msgstr "Претплатено"
 
@@ -6295,31 +6317,34 @@ msgid "Subscription feed for %s (Atom)"
 msgstr "Канал со забелешки за %s (Atom)"
 
 #. TRANS: Checkbox label for enabling Jabber messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:239
-msgid "Jabber"
-msgstr "Jabber"
+#: actions/subscriptions.php:241 lib/settingsnav.php:110
+#, fuzzy
+msgid "IM"
+msgstr "IM"
 
 #. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:254
+#: actions/subscriptions.php:256 lib/settingsnav.php:117
 msgid "SMS"
 msgstr "СМС"
 
-#: actions/tag.php:69
+#. TRANS: Title for all but the first page of notices with tags.
+#. TRANS: %1$s is the tag, %2$d is the page number.
+#: actions/tag.php:73
 #, php-format
 msgid "Notices tagged with %1$s, page %2$d"
 msgstr "Забелешки означени со %1$s, стр. %2$d"
 
-#: actions/tag.php:87
+#: actions/tag.php:91
 #, php-format
 msgid "Notice feed for tag %s (RSS 1.0)"
 msgstr "Канал со забелешки за ознаката %s (RSS 1.0)"
 
-#: actions/tag.php:93
+#: actions/tag.php:97
 #, php-format
 msgid "Notice feed for tag %s (RSS 2.0)"
 msgstr "Канал со забелешки за ознаката %s (RSS 2.0)"
 
-#: actions/tag.php:99
+#: actions/tag.php:103
 #, php-format
 msgid "Notice feed for tag %s (Atom)"
 msgstr "Канал со забелешки за ознаката %s (Atom)"
@@ -6338,17 +6363,11 @@ msgstr "Означи %s"
 msgid "User profile"
 msgstr "Кориснички профил"
 
-#. TRANS: DT element in area for user avatar.
-#: actions/tagother.php:81 actions/userauthorization.php:132
-#: lib/userprofile.php:108
-msgid "Photo"
-msgstr "Фото"
-
-#: actions/tagother.php:141
+#: actions/tagother.php:120
 msgid "Tag user"
 msgstr "Означи корисник"
 
-#: actions/tagother.php:151
+#: actions/tagother.php:130
 msgid ""
 "Tags for this user (letters, numbers, -, ., and _), comma- or space- "
 "separated"
@@ -6356,14 +6375,19 @@ msgstr ""
 "Ознаки за овој корисник (букви, бројки, -, . и _), одделени со запирка или "
 "празно место"
 
-#: actions/tagother.php:193
+#: actions/tagother.php:157
+#, php-format
+msgid "Invalid tag: \"%s\""
+msgstr "Неважечка ознака: „%s“"
+
+#: actions/tagother.php:172
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 "Можете да означувате само луѓе на коишто сте претплатени или луѓе "
 "претплатени на Вас."
 
-#: actions/tagother.php:236
+#: actions/tagother.php:215
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr "Со овој образец додавајте ознаки во Вашите претплатници или претплати."
 
@@ -6371,6 +6395,7 @@ msgstr "Со овој образец додавајте ознаки во Ваш
 msgid "No such tag."
 msgstr "Нема таква ознака."
 
+#. TRANS: Client error displayed when trying to unblock a non-blocked user.
 #: actions/unblock.php:59
 msgid "You haven't blocked that user."
 msgstr "Го немате блокирано тој корисник."
@@ -6391,7 +6416,7 @@ msgstr "!Во барањето нема ID на профилот."
 msgid "Unsubscribed"
 msgstr "Претплатата е откажана"
 
-#: actions/updateprofile.php:64 actions/userauthorization.php:337
+#: actions/updateprofile.php:64
 #, php-format
 msgid ""
 "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
@@ -6399,6 +6424,77 @@ msgstr ""
 "Лиценцата на каналот на следачот „%1$s“ не е соодветна на лиценцата на "
 "мрежното место „%2$s“."
 
+#: actions/urlsettings.php:60
+#, fuzzy
+msgid "URL settings"
+msgstr "Нагодувања за IM"
+
+#. TRANS: Instructions for tab "Other" in user profile settings.
+#: actions/urlsettings.php:72
+msgid "Manage various other options."
+msgstr "Раководење со разни други можности."
+
+#. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
+#. TRANS: user's profile settings. This message has one space at the beginning. Use your
+#. TRANS: language's word separator here if it has one (most likely a single space).
+#: actions/urlsettings.php:115
+msgid " (free service)"
+msgstr " (слободна служба)"
+
+#: actions/urlsettings.php:121
+#, fuzzy
+msgid "[none]"
+msgstr "Без ознаки"
+
+#: actions/urlsettings.php:122
+msgid "[internal]"
+msgstr ""
+
+#. TRANS: Label for dropdown with URL shortener services.
+#: actions/urlsettings.php:130
+msgid "Shorten URLs with"
+msgstr "Скратувај URL-адреси со"
+
+#. TRANS: Tooltip for for dropdown with URL shortener services.
+#: actions/urlsettings.php:132
+msgid "Automatic shortening service to use."
+msgstr "Која автоматска служба за скратување да се користи."
+
+#: actions/urlsettings.php:138
+msgid "URL longer than"
+msgstr ""
+
+#: actions/urlsettings.php:141
+msgid "URLs longer than this will be shortened, 0 means always shorten."
+msgstr ""
+
+#: actions/urlsettings.php:145
+msgid "Text longer than"
+msgstr ""
+
+#: actions/urlsettings.php:148
+msgid ""
+"URLs in notices longer than this will be shortened, 0 means always shorten."
+msgstr ""
+
+#. TRANS: Form validation error for form "Other settings" in user profile.
+#: actions/urlsettings.php:180
+msgid "URL shortening service is too long (maximum 50 characters)."
+msgstr "Услугата за скратување на URL-адреси е предолга (највеќе до 50 знаци)."
+
+#: actions/urlsettings.php:187
+msgid "Invalid number for max url length."
+msgstr ""
+
+#: actions/urlsettings.php:193
+#, fuzzy
+msgid "Invalid number for max notice length."
+msgstr "Неважечка содржина на забелешката."
+
+#: actions/urlsettings.php:238
+msgid "Error saving user URL shortening preferences."
+msgstr ""
+
 #. TRANS: User admin panel title
 #: actions/useradminpanel.php:58
 msgctxt "TITLE"
@@ -6423,12 +6519,12 @@ msgstr "Неважечки текст за добредојде. Дозволе
 #. TRANS: Client error displayed when trying to set a non-existing user as default subscription for new
 #. TRANS: users in user admin panel. %1$s is the invalid nickname.
 #: actions/useradminpanel.php:166
-#, fuzzy, php-format
-msgid "Invalid default subscripton: '%1$s' is not a user."
+#, php-format
+msgid "Invalid default subscripton: \"%1$s\" is not a user."
 msgstr "Неважечки опис по основно: „%1$s“ не е корисник."
 
-#. TRANS: Link description in user account settings menu.
-#: actions/useradminpanel.php:215 lib/accountsettingsaction.php:106
+#: actions/useradminpanel.php:215 lib/action.php:565 lib/settingsnav.php:77
+#: lib/subgroupnav.php:81
 msgid "Profile"
 msgstr "Профил"
 
@@ -6484,60 +6580,58 @@ msgstr "Дали да им е дозволено на корисниците д
 
 #. TRANS: Title for button to save user settings in user admin panel.
 #: actions/useradminpanel.php:302
-#, fuzzy
-msgid "Save user settings"
+msgid "Save user settings."
 msgstr "Зачувај кориснички нагодувања."
 
-#: actions/userauthorization.php:105
+#. TRANS: Page title.
+#: actions/userauthorization.php:109
 msgid "Authorize subscription"
 msgstr "Одобрете ја претплатата"
 
-#: actions/userauthorization.php:110
-#, fuzzy
+#. TRANS: Page notice on "Auhtorize subscription" page.
+#: actions/userauthorization.php:115
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
 "user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
-"click “Reject”."
+"click \"Reject\"."
 msgstr ""
 "Проверете ги овие податоци и видете дали сакате да се претплатите на "
 "забелешките на овој корисник. Ако не сакате да се претплатите, едноставно "
 "стиснете на „Одбиј“."
 
-#. TRANS: Menu item for site administration
-#: actions/userauthorization.php:196 actions/version.php:167
-#: lib/adminpanelaction.php:403
-msgid "License"
-msgstr "Лиценца"
-
-#: actions/userauthorization.php:217
-#, fuzzy
+#. TRANS: Button text on Authorise Subscription page.
+#: actions/userauthorization.php:200
+msgctxt "BUTTON"
 msgid "Accept"
 msgstr "Прифати"
 
-#: actions/userauthorization.php:218 lib/subscribeform.php:115
-#: lib/subscribeform.php:139
-msgid "Subscribe to this user"
-msgstr "Претплати се на корисников"
+#. TRANS: Title for button on Authorise Subscription page.
+#: actions/userauthorization.php:202
+msgid "Subscribe to this user."
+msgstr "Претплати се на корисников."
 
-#: actions/userauthorization.php:219
-#, fuzzy
+#. TRANS: Button text on Authorise Subscription page.
+#: actions/userauthorization.php:204
+msgctxt "BUTTON"
 msgid "Reject"
 msgstr "Одбиј"
 
-#: actions/userauthorization.php:220
-#, fuzzy
-msgid "Reject this subscription"
+#. TRANS: Title for button on Authorise Subscription page.
+#: actions/userauthorization.php:206
+msgid "Reject this subscription."
 msgstr "Одбиј ја оваа претплата."
 
-#: actions/userauthorization.php:232
+#. TRANS: Client error displayed for an empty authorisation request.
+#: actions/userauthorization.php:219
 msgid "No authorization request!"
 msgstr "Нема барање за проверка!"
 
-#: actions/userauthorization.php:254
+#. TRANS: Accept message header from Authorise subscription page.
+#: actions/userauthorization.php:242
 msgid "Subscription authorized"
 msgstr "Претплатата е одобрена"
 
-#: actions/userauthorization.php:256
+#: actions/userauthorization.php:245
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to authorize the "
@@ -6547,11 +6641,12 @@ msgstr ""
 "инструкциите на мрежното место за да дознаете како се одобрува претплата. "
 "Жетонот на Вашата претплата е:"
 
-#: actions/userauthorization.php:266
+#. TRANS: Reject message header from Authorise subscription page.
+#: actions/userauthorization.php:256
 msgid "Subscription rejected"
 msgstr "Претплатата е одбиена"
 
-#: actions/userauthorization.php:268
+#: actions/userauthorization.php:259
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to fully reject the "
@@ -6561,48 +6656,73 @@ msgstr ""
 "инструкциите на мрежното место за да дознаете како се одбива претплата во "
 "потполност."
 
-#: actions/userauthorization.php:303
-#, fuzzy, php-format
-msgid "Listener URI ‘%s’ not found here."
+#. TRANS: Exception thrown when no valid user is found for an authorisation request.
+#. TRANS: %s is a listener URI.
+#: actions/userauthorization.php:296
+#, php-format
+msgid "Listener URI \"%s\" not found here."
 msgstr "URI-то на следачот „%s“ не е пронајдено тука."
 
-#: actions/userauthorization.php:308
-#, fuzzy, php-format
-msgid "Listenee URI ‘%s’ is too long."
+#. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
+#. TRANS: %s is a listenee URI.
+#: actions/userauthorization.php:303
+#, php-format
+msgid "Listenee URI \"%s\" is too long."
 msgstr "Следеното URI „%s“ е предолго."
 
-#: actions/userauthorization.php:314
-#, fuzzy, php-format
-msgid "Listenee URI ‘%s’ is a local user."
+#. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
+#. TRANS: %s is a listenee URI.
+#: actions/userauthorization.php:311
+#, php-format
+msgid "Listenee URI \"%s\" is a local user."
 msgstr "Следеното URI „%s“ е локален корисник."
 
+#. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
+#. TRANS: %s is a profile URL.
 #: actions/userauthorization.php:329
-#, fuzzy, php-format
-msgid "Profile URL ‘%s’ is for a local user."
+#, php-format
+msgid "Profile URL \"%s\" is for a local user."
 msgstr "Профилната URL-адреса „%s“ е за локален корисник."
 
-#: actions/userauthorization.php:345
-#, fuzzy, php-format
-msgid "Avatar URL ‘%s’ is not valid."
+#. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
+#. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
+#: actions/userauthorization.php:339
+#, php-format
+msgid ""
+"Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
+"\"."
+msgstr ""
+"Лиценцата на каналот на следениот „%1$s“ не е складна на лиценцата на "
+"мрежното место „%2$s“."
+
+#. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
+#. TRANS: %s is an avatar URL.
+#: actions/userauthorization.php:349
+#, php-format
+msgid "Avatar URL \"%s\" is not valid."
 msgstr "URL-адресата „%s“ за аватар е неважечка."
 
-#: actions/userauthorization.php:350
-#, fuzzy, php-format
-msgid "Can’t read avatar URL ‘%s’."
+#. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
+#. TRANS: %s is an avatar URL.
+#: actions/userauthorization.php:356
+#, php-format
+msgid "Cannot read avatar URL \"%s\"."
 msgstr "Не можам да ја прочитам URL-адресата на аватарот „%s“."
 
-#: actions/userauthorization.php:355
-#, fuzzy, php-format
-msgid "Wrong image type for avatar URL ‘%s’."
+#. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
+#. TRANS: %s is an avatar URL.
+#: actions/userauthorization.php:363
+#, php-format
+msgid "Wrong image type for avatar URL \"%s\"."
 msgstr "Погрешен тип на слика за аватарот со URL „%s“."
 
 #. TRANS: Page title for profile design page.
-#: actions/userdesignsettings.php:74 lib/designsettings.php:63
+#: actions/userdesignsettings.php:74 lib/designsettings.php:61
 msgid "Profile design"
 msgstr "Изглед на профилот"
 
 #. TRANS: Instructions for profile design page.
-#: actions/userdesignsettings.php:84 lib/designsettings.php:74
+#: actions/userdesignsettings.php:84 lib/designsettings.php:72
 msgid ""
 "Customize the way your profile looks with a background image and a colour "
 "palette of your choice."
@@ -6610,10 +6730,28 @@ msgstr ""
 "Прилагодете го изгледот на Вашиот профил, со позадинска слика и палета од "
 "бои по Ваш избор."
 
-#: actions/userdesignsettings.php:272
+#: actions/userdesignsettings.php:289
 msgid "Enjoy your hotdog!"
 msgstr "Добар апетит!"
 
+#: actions/userdesignsettings.php:325
+#, fuzzy
+msgid "Design settings"
+msgstr "Зачувај нагодувања на мреж. место"
+
+#: actions/userdesignsettings.php:340
+msgid "View profile designs"
+msgstr "Види изгледи на профилот"
+
+#: actions/userdesignsettings.php:341
+msgid "Show or hide profile designs."
+msgstr "Прикажи или скриј изгледи на профилот."
+
+#: actions/userdesignsettings.php:348
+#, fuzzy
+msgid "Background file"
+msgstr "Позадина"
+
 #. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number.
 #: actions/usergroups.php:66
 #, php-format
@@ -6664,6 +6802,11 @@ msgstr ""
 msgid "Contributors"
 msgstr "Учесници"
 
+#. TRANS: Menu item for site administration
+#: actions/version.php:167 lib/adminpanelaction.php:403
+msgid "License"
+msgstr "Лиценца"
+
 #: actions/version.php:170
 msgid ""
 "StatusNet is free software: you can redistribute it and/or modify it under "
@@ -6697,12 +6840,13 @@ msgstr ""
 "Треба да имате добиено примерок од Општата јавна лиценца ГНУ Аферо заедно со "
 "овој програм.  Ако ја немате, погледајте %s."
 
-#: actions/version.php:191
-msgid "Plugins"
-msgstr "Приклучоци"
+#. TRANS: Form input field label for application name.
+#: actions/version.php:197 lib/applicationeditform.php:190
+msgid "Name"
+msgstr "Име"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:901
+#: actions/version.php:198 lib/action.php:885
 msgid "Version"
 msgstr "Верзија"
 
@@ -6710,6 +6854,12 @@ msgstr "Верзија"
 msgid "Author(s)"
 msgstr "Автор(и)"
 
+#. TRANS: Form input field label.
+#: actions/version.php:200 lib/applicationeditform.php:208
+#: lib/groupeditform.php:168
+msgid "Description"
+msgstr "Опис"
+
 #. TRANS: Activity title when marking a notice as favorite.
 #: classes/Fave.php:164
 msgid "Favor"
@@ -6833,7 +6983,7 @@ msgid "Could not create login token for %s"
 msgstr "Не можам да создадам најавен жетон за"
 
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
-#: classes/Memcached_DataObject.php:542
+#: classes/Memcached_DataObject.php:556
 msgid "No database name or DSN found anywhere."
 msgstr "Никаде не е пронајдено име на базата или DSN."
 
@@ -7011,18 +7161,18 @@ msgstr "%1$s сега го/ја следи %2$s."
 
 #. TRANS: Notice given on user registration.
 #. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:395
+#: classes/User.php:390
 #, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr "Добредојдовте на %1$s, @%2$s!"
 
 #. TRANS: Server exception.
-#: classes/User.php:918
+#: classes/User.php:923
 msgid "No single user defined for single-user mode."
 msgstr "Не е зададен корисник за еднокорисничкиот режим."
 
 #. TRANS: Server exception.
-#: classes/User.php:922
+#: classes/User.php:927
 msgid "Single-user mode code called when not enabled."
 msgstr "Повикан е еднокориснички режим, но не е овозможен."
 
@@ -7067,41 +7217,6 @@ msgstr "Не можам да најдам XRD за %s."
 msgid "No AtomPub API service for %s."
 msgstr "Нема служба за API на AtomPub за %s."
 
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:104
-msgid "Change your profile settings"
-msgstr "Смени профилни нагодувања"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:111
-msgid "Upload an avatar"
-msgstr "Подигни аватар"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:118
-msgid "Change your password"
-msgstr "Смени лозинка"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:125
-msgid "Change email handling"
-msgstr "Смени ракување со е-пошта"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:132
-msgid "Design your profile"
-msgstr "Наместете изглед на Вашиот профил"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:139
-msgid "Other options"
-msgstr "Други нагодувања"
-
-#. TRANS: Link description in user account settings menu.
-#: lib/accountsettingsaction.php:141
-msgid "Other"
-msgstr "Друго"
-
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
 #: lib/action.php:161
 #, php-format
@@ -7119,206 +7234,128 @@ msgctxt "TOOLTIP"
 msgid "Show more"
 msgstr "Повеќе"
 
-#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:544
-msgid "Primary site navigation"
-msgstr "Главна навигација"
+#. TRANS: Inline reply form submit button: submits a reply comment.
+#: lib/action.php:328
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Comment"
+msgstr "Содржина"
 
-#. TRANS: Tooltip for main menu option "Personal".
-#: lib/action.php:550
-msgctxt "TOOLTIP"
-msgid "Personal profile and friends timeline"
-msgstr "Личен профил и хронологија на пријатели"
+#. TRANS: Placeholder text for inline reply form. Clicking in this box will turn it into a mini notice form.
+#: lib/action.php:331
+msgid "Add a comment..."
+msgstr ""
 
-#. TRANS: Main menu option when logged in for access to personal profile and friends timeline.
-#. TRANS: Personal group navigation menu option when logged in for viewing timeline of self and friends.
-#: lib/action.php:553 lib/personalgroupnav.php:100
-msgctxt "MENU"
-msgid "Personal"
-msgstr "Лично"
+#: lib/action.php:559 lib/personalgroupnav.php:99
+#, fuzzy
+msgid "Home"
+msgstr "Домашна страница"
 
-#. TRANS: Tooltip for main menu option "Account".
-#: lib/action.php:555
-msgctxt "TOOLTIP"
-msgid "Change your email, avatar, password, profile"
-msgstr "Промена на е-пошта, аватар, лозинка, профил"
-
-#. TRANS: Main menu option when logged in for access to user settings.
-#: lib/action.php:558
-msgid "Account"
-msgstr "Сметка"
-
-#. TRANS: Tooltip for main menu option "Services".
 #: lib/action.php:560
-msgctxt "TOOLTIP"
-msgid "Connect to services"
-msgstr "Поврзи се со услуги"
+#, fuzzy
+msgid "Friends timeline"
+msgstr "Историја на %s"
 
-#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services.
-#: lib/action.php:563
-msgid "Connect"
-msgstr "Поврзи се"
-
-#. TRANS: Tooltip for menu option "Admin".
 #: lib/action.php:566
-msgctxt "TOOLTIP"
-msgid "Change site configuration"
-msgstr "Промена на поставките на мрежното место"
+#, fuzzy
+msgid "Your profile"
+msgstr "Профил на група"
 
-#. TRANS: Main menu option when logged in and site admin for access to site configuration.
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/action.php:569 lib/groupnav.php:117
-msgctxt "MENU"
-msgid "Admin"
-msgstr "Админ"
+#: lib/action.php:570 lib/action.php:593 lib/publicgroupnav.php:78
+msgid "Public"
+msgstr "Јавен"
 
-#. TRANS: Tooltip for main menu option "Invite".
-#: lib/action.php:573
-#, php-format
-msgctxt "TOOLTIP"
-msgid "Invite friends and colleagues to join you on %s"
-msgstr "Поканете пријатели и колеги да Ви се придружат на %s"
+#: lib/action.php:571 lib/action.php:594
+#, fuzzy
+msgid "Everyone on this site"
+msgstr "Пронајдете луѓе на ова мрежно место"
+
+#: lib/action.php:575
+#, fuzzy
+msgid "Settings"
+msgstr "Нагодувања за СМС"
 
-#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users.
 #: lib/action.php:576
-msgctxt "MENU"
-msgid "Invite"
-msgstr "Покани"
+#, fuzzy
+msgid "Change your personal settings"
+msgstr "Смени профилни нагодувања"
 
-#. TRANS: Tooltip for main menu option "Logout"
 #: lib/action.php:582
-msgctxt "TOOLTIP"
-msgid "Logout from the site"
-msgstr "Одјава"
+#, fuzzy
+msgid "Site configuration"
+msgstr "Кориснички поставки"
 
-#. TRANS: Main menu option when logged in to log out the current user.
-#: lib/action.php:585
-msgctxt "MENU"
+#: lib/action.php:587
+#, fuzzy
 msgid "Logout"
 msgstr "Одјава"
 
-#. TRANS: Tooltip for main menu option "Register".
-#: lib/action.php:590
-msgctxt "TOOLTIP"
-msgid "Create an account"
-msgstr "Создај сметка"
+#: lib/action.php:588
+#, fuzzy
+msgid "Logout from the site"
+msgstr "Одјава"
 
-#. TRANS: Main menu option when not logged in to register a new account.
-#. TRANS: Menu item for registering with the StatusNet site.
-#: lib/action.php:593 lib/logingroupnav.php:85
-msgctxt "MENU"
-msgid "Register"
-msgstr "Регистрација"
-
-#. TRANS: Tooltip for main menu option "Login".
-#: lib/action.php:596
-msgctxt "TOOLTIP"
+#: lib/action.php:599
+#, fuzzy
 msgid "Login to the site"
 msgstr "Најава"
 
-#. TRANS: Main menu option when not logged in to log in.
-#. TRANS: Menu item for logging in to the StatusNet site.
-#: lib/action.php:599 lib/logingroupnav.php:77
-msgctxt "MENU"
-msgid "Login"
-msgstr "Најава"
-
-#. TRANS: Tooltip for main menu option "Help".
-#: lib/action.php:602
-msgctxt "TOOLTIP"
-msgid "Help me!"
-msgstr "Напомош!"
-
-#. TRANS: Main menu option for help on the StatusNet site.
-#: lib/action.php:605
-msgctxt "MENU"
-msgid "Help"
-msgstr "Помош"
-
-#. TRANS: Tooltip for main menu option "Search".
-#: lib/action.php:608
-msgctxt "TOOLTIP"
-msgid "Search for people or text"
-msgstr "Пребарајте луѓе или текст"
-
-#. TRANS: Main menu option when logged in or when the StatusNet instance is not private.
-#: lib/action.php:611
-msgctxt "MENU"
+#: lib/action.php:606
+#, fuzzy
 msgid "Search"
 msgstr "Барај"
 
-#. TRANS: DT element for site notice. String is hidden in default CSS.
-#. TRANS: Menu item for site administration
-#: lib/action.php:633 lib/adminpanelaction.php:387
-msgid "Site notice"
-msgstr "Напомена за мрежното место"
-
-#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:700
-msgid "Local views"
-msgstr "Локални прегледи"
-
-#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:770
-msgid "Page notice"
-msgstr "Напомена за страницата"
-
-#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:874
-msgid "Secondary site navigation"
-msgstr "Споредна навигација"
+#: lib/action.php:607
+#, fuzzy
+msgid "Search the site"
+msgstr "Пребарај по мрежното место"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:880
+#: lib/action.php:864
 msgid "Help"
 msgstr "Помош"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:883
+#: lib/action.php:867
 msgid "About"
 msgstr "За нас"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:886
+#: lib/action.php:870
 msgid "FAQ"
 msgstr "ЧПП"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:891
+#: lib/action.php:875
 msgid "TOS"
 msgstr "Услови"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:895
+#: lib/action.php:879
 msgid "Privacy"
 msgstr "Приватност"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:898
+#: lib/action.php:882
 msgid "Source"
 msgstr "Изворен код"
 
 #. TRANS: Secondary navigation menu option leading to e-mail contact information on the
 #. TRANS: StatusNet site, where to report bugs, ...
-#: lib/action.php:905
+#: lib/action.php:889
 msgid "Contact"
 msgstr "Контакт"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:908
+#: lib/action.php:892
 msgid "Badge"
 msgstr "Значка"
 
-#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:937
-msgid "StatusNet software license"
-msgstr "Лиценца на програмот StatusNet"
-
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:944
+#: lib/action.php:921
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7328,7 +7365,7 @@ msgstr ""
 "%](%%site.broughtbyurl%%)."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:947
+#: lib/action.php:924
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** е сервис за микроблогирање."
@@ -7337,7 +7374,7 @@ msgstr "**%%site.name%%** е сервис за микроблогирање."
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:954
+#: lib/action.php:931
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7348,21 +7385,16 @@ msgstr ""
 "микроблогирање, верзија %s, достапна под [GNU Affero General Public License]"
 "(http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
 
-#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:970
-msgid "Site content license"
-msgstr "Лиценца на содржините на мрежното место"
-
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:977
+#: lib/action.php:949
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr "Содржината и податоците на %1$s се лични и доверливи."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:984
+#: lib/action.php:956
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
@@ -7370,7 +7402,7 @@ msgstr ""
 "права задржани."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:988
+#: lib/action.php:960
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 "Авторските права на содржината и податоците им припаѓаат на учесниците. Сите "
@@ -7378,25 +7410,20 @@ msgstr ""
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:1020
+#: lib/action.php:992
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr "Сите содржини и податоци на %1$s се достапни под лиценцата %2$s."
 
-#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1356
-msgid "Pagination"
-msgstr "Прелом на страници"
-
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1367
+#: lib/action.php:1335
 msgid "After"
 msgstr "Следно"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1377
+#: lib/action.php:1345
 msgid "Before"
 msgstr "Претходно"
 
@@ -7547,7 +7574,7 @@ msgid "User configuration"
 msgstr "Кориснички поставки"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:122
+#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:110
 msgid "User"
 msgstr "Корисник"
 
@@ -7571,6 +7598,11 @@ msgstr "Поставки на сесиите"
 msgid "Edit site notice"
 msgstr "Уреди објава за мрежното место"
 
+#. TRANS: Menu item for site administration
+#: lib/adminpanelaction.php:387
+msgid "Site notice"
+msgstr "Напомена за мрежното место"
+
 #. TRANS: Menu item title/tooltip
 #: lib/adminpanelaction.php:393
 msgid "Snapshots configuration"
@@ -7581,6 +7613,12 @@ msgstr "Поставки за снимки"
 msgid "Set site license"
 msgstr "Постави лиценца за мреж. место"
 
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:409
+#, fuzzy
+msgid "Plugins configuration"
+msgstr "Поставки на патеки"
+
 #. TRANS: Client error 401.
 #: lib/apiauth.php:111
 msgid "API resource requires read-write access, but you only have read access."
@@ -7593,19 +7631,23 @@ msgstr ""
 msgid "No application for that consumer key."
 msgstr "Нема програм за тој потрошувачки клуч."
 
+#: lib/apiauth.php:202 lib/apiauth.php:284
+msgid "Not allowed to use API."
+msgstr "Не е дозволено да се користи API."
+
 #. TRANS: OAuth exception given when an incorrect access token was given for a user.
-#: lib/apiauth.php:219
+#: lib/apiauth.php:225
 msgid "Bad access token."
 msgstr "Лош пристапен жетон."
 
 #. TRANS: OAuth exception given when no user was found for a given token (no token was found).
-#: lib/apiauth.php:224
+#: lib/apiauth.php:230
 msgid "No user for that token."
 msgstr "Нема корисник за тој жетон."
 
 #. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel".
 #. TRANS: Client error thrown when authentication fails.
-#: lib/apiauth.php:266 lib/apiauth.php:293
+#: lib/apiauth.php:272 lib/apiauth.php:302
 msgid "Could not authenticate you."
 msgstr "Не можевме да Ве потврдиме."
 
@@ -7651,6 +7693,11 @@ msgstr "Се обидовте да отповикате непознат жет
 msgid "Failed to delete revoked token."
 msgstr "Не успеав да го избришам отповиканиот жетон."
 
+#. TRANS: Form input field label for application icon.
+#: lib/applicationeditform.php:177
+msgid "Icon"
+msgstr "Икона"
+
 #. TRANS: Form guide.
 #: lib/applicationeditform.php:182
 msgid "Icon for this application"
@@ -7685,6 +7732,11 @@ msgstr "Изворна URL-адреса"
 msgid "Organization responsible for this application"
 msgstr "Организацијата одговорна за овој програм"
 
+#. TRANS: Form input field label.
+#: lib/applicationeditform.php:227
+msgid "Organization"
+msgstr "Организација"
+
 #. TRANS: Form input field instructions.
 #: lib/applicationeditform.php:234
 msgid "URL for the homepage of the organization"
@@ -7773,16 +7825,6 @@ msgstr "Авторскиот елемент мора да содржи елем
 msgid "Do not use this method!"
 msgstr "Не користете го овој метод!"
 
-#. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:293
-msgid "Author"
-msgstr "Автор"
-
-#. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:307
-msgid "Provider"
-msgstr "Обезбедувач"
-
 #. TRANS: Title.
 #: lib/attachmentnoticesection.php:67
 msgid "Notices where this attachment appears"
@@ -7808,23 +7850,28 @@ msgstr "Менувањето на лозинки не е дозволено."
 msgid "Block"
 msgstr "Блокирај"
 
+#. TRANS: Description of the form to block a user.
+#: lib/blockform.php:79
+msgid "Block this user"
+msgstr "Блокирај го корисников"
+
 #. TRANS: Title for command results.
-#: lib/channel.php:160 lib/channel.php:181
+#: lib/channel.php:104 lib/channel.php:125
 msgid "Command results"
 msgstr "Резултати од наредбата"
 
 #. TRANS: Title for command results.
-#: lib/channel.php:194
+#: lib/channel.php:138
 msgid "AJAX error"
 msgstr "AJAX-грешка"
 
 #. TRANS: E-mail subject when a command has completed.
-#: lib/channel.php:233 lib/mailhandler.php:143
+#: lib/channel.php:177 lib/mailhandler.php:143
 msgid "Command complete"
 msgstr "Наредбата е завршена"
 
 #. TRANS: E-mail subject when a command has failed.
-#: lib/channel.php:244
+#: lib/channel.php:188
 msgid "Command failed"
 msgstr "Наредбата не успеа"
 
@@ -7927,7 +7974,7 @@ msgstr "Име и презиме: %s"
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a location.
-#: lib/command.php:446 lib/mail.php:270
+#: lib/command.php:446 lib/mail.php:275
 #, php-format
 msgid "Location: %s"
 msgstr "Местоположба: %s"
@@ -7935,7 +7982,7 @@ msgstr "Местоположба: %s"
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a homepage.
-#: lib/command.php:450 lib/mail.php:274
+#: lib/command.php:450 lib/mail.php:279
 #, php-format
 msgid "Homepage: %s"
 msgstr "Домашна страница: %s"
@@ -8210,108 +8257,101 @@ msgstr ""
 "tracking - сè уште не е имплементирано.\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:162
+#: lib/common.php:36
 msgid "No configuration file found."
 msgstr "Нема пронајдено податотека со поставки."
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:165
+#: lib/common.php:39
 msgid "I looked for configuration files in the following places:"
 msgstr "Пребарав податотеки со поставки на следниве места:"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:168
+#: lib/common.php:42
 msgid "You may wish to run the installer to fix this."
 msgstr "Препорачуваме да го пуштите инсталатерот за да го поправите ова."
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:172
+#: lib/common.php:46
 msgid "Go to the installer."
 msgstr "Оди на инсталаторот."
 
-#. TRANS: Menu item for Instant Messaging settings.
-#: lib/connectsettingsaction.php:106
-msgctxt "MENU"
-msgid "IM"
-msgstr "IM"
-
-#. TRANS: Tooltip for Instant Messaging menu item.
-#: lib/connectsettingsaction.php:108
-msgid "Updates by instant messenger (IM)"
-msgstr "Подновувања преку инстант-пораки (IM)"
-
-#. TRANS: Menu item for Short Message Service settings.
-#: lib/connectsettingsaction.php:113
-msgctxt "MENU"
-msgid "SMS"
-msgstr "СМС"
-
-#. TRANS: Tooltip for Short Message Service menu item.
-#: lib/connectsettingsaction.php:115
-msgid "Updates by SMS"
-msgstr "Подновувања по СМС"
-
-#. TRANS: Menu item for OuAth connection settings.
-#: lib/connectsettingsaction.php:120
-msgctxt "MENU"
-msgid "Connections"
-msgstr "Поврзувања"
-
-#. TRANS: Tooltip for connected applications (Connections through OAuth) menu item.
-#: lib/connectsettingsaction.php:122
-msgid "Authorized connected applications"
-msgstr "Овластени поврзани програми"
-
 #: lib/dberroraction.php:59
 msgid "Database error"
 msgstr "Грешка во базата на податоци"
 
+#. TRANS: Description of form for deleting a user.
+#: lib/deleteuserform.php:75
+msgid "Delete this user"
+msgstr "Избриши овој корисник"
+
+#: lib/designform.php:114
+#, fuzzy
+msgid "Change design"
+msgstr "Зачувај изглед"
+
+#. TRANS: Fieldset legend on profile design page to change profile page colours.
+#: lib/designform.php:131
+msgid "Change colours"
+msgstr "Промена на бои"
+
+#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
+#: lib/designform.php:138
+msgid "Use defaults"
+msgstr "Користи по основно"
+
+#. TRANS: Title for button on profile design page to reset all colour settings to default.
+#: lib/designform.php:140
+msgid "Restore default designs"
+msgstr "Врати основно-зададени нагодувања"
+
+#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
+#: lib/designform.php:148
+msgid "Reset back to default"
+msgstr "Врати по основно"
+
 #. TRANS: Label in form on profile design page.
 #. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
-#: lib/designsettings.php:108
+#: lib/designform.php:158
 msgid "Upload file"
 msgstr "Подигање"
 
 #. TRANS: Instructions for form on profile design page.
-#: lib/designsettings.php:113
+#: lib/designform.php:163
+#, fuzzy
 msgid ""
-"You can upload your personal background image. The maximum file size is 2MB."
+"You can upload your personal background image. The maximum file size is 2Mb."
 msgstr ""
 "Можете да подигнете лична позадинска слика. Максималната дозволена големина "
 "изнесува 2МБ."
 
 #. TRANS: Radio button on profile design page that will enable use of the uploaded profile image.
-#: lib/designsettings.php:139
+#: lib/designform.php:194
 msgctxt "RADIO"
 msgid "On"
 msgstr "Вкл."
 
 #. TRANS: Radio button on profile design page that will disable use of the uploaded profile image.
-#: lib/designsettings.php:156
+#: lib/designform.php:211
 msgctxt "RADIO"
 msgid "Off"
 msgstr "Искл."
 
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: lib/designsettings.php:175
-msgid "Change colours"
-msgstr "Промена на бои"
-
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: lib/designsettings.php:257
-msgid "Use defaults"
-msgstr "Користи по основно"
+#. TRANS: Title for button on profile design page to save settings.
+#: lib/designform.php:322
+msgid "Save design"
+msgstr "Зачувај изглед"
 
 #. TRANS: Error message displayed if design settings could not be saved.
 #. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
-#: lib/designsettings.php:405 lib/designsettings.php:427
+#: lib/designsettings.php:216 lib/designsettings.php:238
 msgid "Couldn't update your design."
 msgstr "Не можев да го подновам Вашиот изглед."
 
 #. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
-#: lib/designsettings.php:433
+#: lib/designsettings.php:244
 msgid "Design defaults restored."
 msgstr "Основно-зададениот изглед е вратен."
 
@@ -8378,27 +8418,23 @@ msgstr "Не можам да увезам без корисник."
 msgid "Feeds"
 msgstr "Канали"
 
-#: lib/galleryaction.php:121
-msgid "Filter tags"
-msgstr "Филтрирај ознаки"
-
-#: lib/galleryaction.php:131
+#: lib/galleryaction.php:128
 msgid "All"
 msgstr "Сè"
 
-#: lib/galleryaction.php:139
+#: lib/galleryaction.php:136
 msgid "Select tag to filter"
 msgstr "Одберете ознака за филтрирање"
 
-#: lib/galleryaction.php:140
+#: lib/galleryaction.php:137
 msgid "Tag"
 msgstr "Ознака"
 
-#: lib/galleryaction.php:141
+#: lib/galleryaction.php:138
 msgid "Choose a tag to narrow list"
 msgstr "Одберете ознака за да го ограничите списокот"
 
-#: lib/galleryaction.php:143
+#: lib/galleryaction.php:140
 msgid "Go"
 msgstr "Оди"
 
@@ -8489,6 +8525,12 @@ msgctxt "TOOLTIP"
 msgid "%s blocked users"
 msgstr "Блокирани корисници од групата „%s“"
 
+#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
+#: lib/groupnav.php:117
+msgctxt "MENU"
+msgid "Admin"
+msgstr "Админ"
+
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
 #: lib/groupnav.php:120
@@ -8598,39 +8640,62 @@ msgid_plural "%dB"
 msgstr[0] "%d Б"
 msgstr[1] "%d Б"
 
-#: lib/jabber.php:387
+#: lib/implugin.php:262
 #, php-format
-msgid "[%s]"
-msgstr "[%s]"
+msgid ""
+"User \"%s\" on %s has said that your %s screenname belongs to them. If "
+"that's true, you can confirm by clicking on this URL: %s . (If you cannot "
+"click it, copy-and-paste it into the address bar of your browser). If that "
+"user isn't you, or if you didn't request this confirmation, just ignore this "
+"message."
+msgstr ""
 
-#: lib/jabber.php:567
+#: lib/implugin.php:349
 #, php-format
 msgid "Unknown inbox source %d."
 msgstr "Непознат извор на приемна пошта %d."
 
+#: lib/implugin.php:485
+#, fuzzy, php-format
+msgid "Message too long - maximum is %1$d characters, you sent %2$d."
+msgstr ""
+"Пораката е предолга - дозволен е највеќе %1$d знак, а Вие испративте %2$d."
+
 #: lib/leaveform.php:114
 msgid "Leave"
 msgstr "Напушти"
 
+#. TRANS: Menu item for logging in to the StatusNet site.
+#: lib/logingroupnav.php:77
+msgctxt "MENU"
+msgid "Login"
+msgstr "Најава"
+
 #. TRANS: Title for menu item for logging in to the StatusNet site.
 #: lib/logingroupnav.php:79
 msgid "Login with a username and password"
 msgstr "Најава со корисничко име и лозинка"
 
+#. TRANS: Menu item for registering with the StatusNet site.
+#: lib/logingroupnav.php:85
+msgctxt "MENU"
+msgid "Register"
+msgstr "Регистрација"
+
 #. TRANS: Title for menu item for registering with the StatusNet site.
 #: lib/logingroupnav.php:87
 msgid "Sign up for a new account"
 msgstr "Создај нова сметка"
 
 #. TRANS: Subject for address confirmation email.
-#: lib/mail.php:168
+#: lib/mail.php:172
 msgid "Email address confirmation"
 msgstr "Потврдување на адресата"
 
 #. TRANS: Body for address confirmation email.
 #. TRANS: %1$s is the addressed user's nickname, %2$s is the StatusNet sitename,
 #. TRANS: %3$s is the URL to confirm at.
-#: lib/mail.php:173
+#: lib/mail.php:177
 #, php-format
 msgid ""
 "Hey, %1$s.\n"
@@ -8662,14 +8727,14 @@ msgstr ""
 
 #. TRANS: Subject of new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
-#: lib/mail.php:238
+#: lib/mail.php:243
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1$s сега ги следи Вашите забелешки на %2$s."
 
 #. TRANS: This is a paragraph in a new-subscriber e-mail.
 #. TRANS: %s is a URL where the subscriber can be reported as abusive.
-#: lib/mail.php:245
+#: lib/mail.php:250
 #, php-format
 msgid ""
 "If you believe this account is being used abusively, you can block them from "
@@ -8684,7 +8749,7 @@ msgstr ""
 #. TRANS: %3$s is the subscriber's profile URL, %4$s is the subscriber's location (or empty)
 #. TRANS: %5$s is the subscriber's homepage URL (or empty), %6%s is the subscriber's bio (or empty)
 #. TRANS: %7$s is a link to the addressed user's e-mail settings.
-#: lib/mail.php:255
+#: lib/mail.php:260
 #, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -8712,14 +8777,14 @@ msgstr ""
 
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is biographical information.
-#: lib/mail.php:278
+#: lib/mail.php:283
 #, php-format
 msgid "Bio: %s"
 msgstr "Биографија: %s"
 
 #. TRANS: Subject of notification mail for new posting email address.
 #. TRANS: %s is the StatusNet sitename.
-#: lib/mail.php:307
+#: lib/mail.php:312
 #, php-format
 msgid "New email address for posting to %s"
 msgstr "Нова е-поштенска адреса за објавување на %s"
@@ -8727,7 +8792,7 @@ msgstr "Нова е-поштенска адреса за објавување н
 #. TRANS: Body of notification mail for new posting email address.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is the e-mail address to send
 #. TRANS: to to post by e-mail, %3$s is a URL to more instructions.
-#: lib/mail.php:313
+#: lib/mail.php:318
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -8750,26 +8815,26 @@ msgstr ""
 
 #. TRANS: Subject line for SMS-by-email notification messages.
 #. TRANS: %s is the posting user's nickname.
-#: lib/mail.php:434
+#: lib/mail.php:439
 #, php-format
 msgid "%s status"
 msgstr "Статус на %s"
 
 #. TRANS: Subject line for SMS-by-email address confirmation message.
-#: lib/mail.php:460
+#: lib/mail.php:465
 msgid "SMS confirmation"
 msgstr "Потврда за СМС"
 
 #. TRANS: Main body heading for SMS-by-email address confirmation message.
 #. TRANS: %s is the addressed user's nickname.
-#: lib/mail.php:464
+#: lib/mail.php:469
 #, php-format
 msgid "%s: confirm you own this phone number with this code:"
 msgstr "%s: потврдете го како свој телефонскиов број со следниов код:"
 
 #. TRANS: Subject for 'nudge' notification email.
 #. TRANS: %s is the nudging user.
-#: lib/mail.php:485
+#: lib/mail.php:490
 #, php-format
 msgid "You have been nudged by %s"
 msgstr "%s Ве подбуцна"
@@ -8777,7 +8842,7 @@ msgstr "%s Ве подбуцна"
 #. TRANS: Body for 'nudge' notification email.
 #. TRANS: %1$s is the nuding user's long name, $2$s is the nudging user's nickname,
 #. TRANS: %3$s is a URL to post notices at, %4$s is the StatusNet sitename.
-#: lib/mail.php:492
+#: lib/mail.php:497
 #, php-format
 msgid ""
 "%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -8806,7 +8871,7 @@ msgstr ""
 
 #. TRANS: Subject for direct-message notification email.
 #. TRANS: %s is the sending user's nickname.
-#: lib/mail.php:539
+#: lib/mail.php:544
 #, php-format
 msgid "New private message from %s"
 msgstr "Нова приватна порака од %s"
@@ -8815,7 +8880,7 @@ msgstr "Нова приватна порака од %s"
 #. TRANS: %1$s is the sending user's long name, %2$s is the sending user's nickname,
 #. TRANS: %3$s is the message content, %4$s a URL to the message,
 #. TRANS: %5$s is the StatusNet sitename.
-#: lib/mail.php:547
+#: lib/mail.php:552
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -8850,7 +8915,7 @@ msgstr ""
 
 #. TRANS: Subject for favorite notification e-mail.
 #. TRANS: %1$s is the adding user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:599
+#: lib/mail.php:604
 #, php-format
 msgid "%1$s (@%2$s) added your notice as a favorite"
 msgstr "%1$s (@%2$s) ја бендиса вашата забелешка"
@@ -8860,7 +8925,7 @@ msgstr "%1$s (@%2$s) ја бендиса вашата забелешка"
 #. TRANS: %3$s is a URL to the faved notice, %4$s is the faved notice text,
 #. TRANS: %5$s is a URL to all faves of the adding user, %6$s is the StatusNet sitename,
 #. TRANS: %7$s is the adding user's nickname.
-#: lib/mail.php:606
+#: lib/mail.php:611
 #, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -8898,7 +8963,7 @@ msgstr ""
 "%6$s\n"
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:664
+#: lib/mail.php:669
 #, php-format
 msgid ""
 "The full conversation can be read here:\n"
@@ -8911,7 +8976,7 @@ msgstr ""
 
 #. TRANS: E-mail subject for notice notification.
 #. TRANS: %1$s is the sending user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:672
+#: lib/mail.php:677
 #, php-format
 msgid "%1$s (@%2$s) sent a notice to your attention"
 msgstr "%1$s (@%2$s) Ви испрати забелешка што сака да ја прочитате"
@@ -8922,7 +8987,7 @@ msgstr "%1$s (@%2$s) Ви испрати забелешка што сака да
 #. TRANS: %5$s is a URL to the full conversion if it exists (otherwise empty),
 #. TRANS: %6$s is a URL to reply to the notice, %7$s is a URL to all @-replied for the addressed user,
 #. TRANS: %8$s is a URL to the addressed user's e-mail settings, %9$s is the sender's nickname.
-#: lib/mail.php:680
+#: lib/mail.php:685
 #, php-format
 msgid ""
 "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -9067,11 +9132,7 @@ msgstr "Нема заемни претплатници."
 msgid "To"
 msgstr "За"
 
-#: lib/messageform.php:166 lib/noticeform.php:186
-msgid "Available characters"
-msgstr "Расположиви знаци"
-
-#: lib/messageform.php:185 lib/noticeform.php:237
+#: lib/messageform.php:184 lib/noticeform.php:236
 msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr "Испрати"
@@ -9080,15 +9141,10 @@ msgstr "Испрати"
 msgid "Messages"
 msgstr "Пораки"
 
-#: lib/messagelistitem.php:123 lib/noticelist.php:522
+#: lib/messagelistitem.php:123 lib/noticelist.php:527
 msgid "from"
 msgstr "од"
 
-#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:165
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr "Прекарот мора да има само мали букви и бројки и да нема празни места."
-
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 #: lib/nickname.php:178
 msgid "Nickname cannot be empty."
@@ -9111,23 +9167,23 @@ msgstr "Испрати забелешка"
 msgid "What's up, %s?"
 msgstr "Што има ново, %s?"
 
-#: lib/noticeform.php:194
+#: lib/noticeform.php:193
 msgid "Attach"
 msgstr "Приложи"
 
-#: lib/noticeform.php:198
+#: lib/noticeform.php:197
 msgid "Attach a file"
 msgstr "Приложи податотека"
 
-#: lib/noticeform.php:213
+#: lib/noticeform.php:212
 msgid "Share my location"
 msgstr "Прикажи ја мојата местоположба."
 
-#: lib/noticeform.php:216
+#: lib/noticeform.php:215
 msgid "Do not share my location"
 msgstr "Не ја прикажувај мојата местоположба"
 
-#: lib/noticeform.php:217
+#: lib/noticeform.php:216
 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
 "try again later"
@@ -9136,55 +9192,59 @@ msgstr ""
 "Обидете се подоцна."
 
 #. TRANS: Used in coordinates as abbreviation of north
-#: lib/noticelist.php:452
+#: lib/noticelist.php:457
 msgid "N"
 msgstr "С"
 
 #. TRANS: Used in coordinates as abbreviation of south
-#: lib/noticelist.php:454
+#: lib/noticelist.php:459
 msgid "S"
 msgstr "Ј"
 
 #. TRANS: Used in coordinates as abbreviation of east
-#: lib/noticelist.php:456
+#: lib/noticelist.php:461
 msgid "E"
 msgstr "И"
 
 #. TRANS: Used in coordinates as abbreviation of west
-#: lib/noticelist.php:458
+#: lib/noticelist.php:463
 msgid "W"
 msgstr "З"
 
-#: lib/noticelist.php:460
+#: lib/noticelist.php:465
 #, php-format
 msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 
-#: lib/noticelist.php:469
+#: lib/noticelist.php:474
 msgid "at"
 msgstr "во"
 
-#: lib/noticelist.php:518
+#: lib/noticelist.php:523
 msgid "web"
 msgstr "интернет"
 
-#: lib/noticelist.php:584
+#: lib/noticelist.php:589
 msgid "in context"
 msgstr "во контекст"
 
-#: lib/noticelist.php:619
+#: lib/noticelist.php:624
 msgid "Repeated by"
 msgstr "Повторено од"
 
-#: lib/noticelist.php:646
+#: lib/noticelist.php:651
 msgid "Reply to this notice"
 msgstr "Одговори на забелешкава"
 
-#: lib/noticelist.php:647
+#: lib/noticelist.php:652
 msgid "Reply"
 msgstr "Одговор"
 
-#: lib/noticelist.php:691
+#: lib/noticelist.php:678
+msgid "Delete this notice"
+msgstr "Избриши ја оваа забелешка"
+
+#: lib/noticelist.php:696
 msgid "Notice repeated"
 msgstr "Забелешката е повторена"
 
@@ -9221,43 +9281,31 @@ msgstr "Дуплирана забелешка."
 msgid "Couldn't insert new subscription."
 msgstr "Не може да се внесе нова претплата."
 
-#. TRANS: Personal group navigation menu option when logged in for viewing @-replies.
-#: lib/personalgroupnav.php:107
-msgctxt "MENU"
+#: lib/personalgroupnav.php:104
+#, fuzzy
 msgid "Replies"
 msgstr "Одговори"
 
-#. TRANS: Personal group navigation menu option when logged in for seeing own profile.
-#: lib/personalgroupnav.php:114
-msgctxt "MENU"
-msgid "Profile"
-msgstr "Профил"
-
-#. TRANS: Personal group navigation menu option when logged in for viewing own favourited notices.
-#: lib/personalgroupnav.php:120
-msgctxt "MENU"
+#: lib/personalgroupnav.php:109
+#, fuzzy
 msgid "Favorites"
 msgstr "Бендисани"
 
-#. TRANS: Personal group navigation menu option when logged in for viewing recieved personal messages.
-#: lib/personalgroupnav.php:133
-msgctxt "MENU"
+#: lib/personalgroupnav.php:120
+#, fuzzy
 msgid "Inbox"
 msgstr "Примени"
 
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing recieved personal messages.
-#: lib/personalgroupnav.php:135
+#: lib/personalgroupnav.php:121
 msgid "Your incoming messages"
 msgstr "Ваши приемни пораки"
 
-#. TRANS: Personal group navigation menu option when logged in for viewing senet personal messages.
-#: lib/personalgroupnav.php:140
-msgctxt "MENU"
+#: lib/personalgroupnav.php:125
+#, fuzzy
 msgid "Outbox"
 msgstr "За праќање"
 
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing senet personal messages.
-#: lib/personalgroupnav.php:142
+#: lib/personalgroupnav.php:126
 msgid "Your sent messages"
 msgstr "Ваши испратени пораки"
 
@@ -9272,9 +9320,26 @@ msgstr "Ознаки во забелешките на %s"
 msgid "Unknown"
 msgstr "Непознато"
 
+#. TRANS: Plugin admin panel controls
+#: lib/plugindisableform.php:90
+msgctxt "plugin"
+msgid "Disable"
+msgstr ""
+
+#. TRANS: Plugin admin panel controls
+#: lib/pluginenableform.php:112
+msgctxt "plugin"
+msgid "Enable"
+msgstr ""
+
+#: lib/pluginlist.php:196
+msgctxt "plugin-description"
+msgid "(Plugin descriptions unavailable when disabled.)"
+msgstr ""
+
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:82
+#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:88
 msgid "Subscriptions"
 msgstr "Претплати"
 
@@ -9285,7 +9350,7 @@ msgstr "Сите претплати"
 
 #. TRANS: H2 text for user subscriber statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:90
+#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:96
 msgid "Subscribers"
 msgstr "Претплатници"
 
@@ -9307,7 +9372,7 @@ msgstr "Член од"
 #. TRANS: Label for user statistics.
 #. TRANS: H2 text for user group membership statistics.
 #: lib/profileaction.php:239 lib/profileaction.php:290
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:104
 msgid "Groups"
 msgstr "Групи"
 
@@ -9327,10 +9392,6 @@ msgstr "Сите групи"
 msgid "Unimplemented method."
 msgstr "Неимплементиран метод."
 
-#: lib/publicgroupnav.php:78
-msgid "Public"
-msgstr "Јавен"
-
 #: lib/publicgroupnav.php:82
 msgid "User groups"
 msgstr "Кориснички групи"
@@ -9369,7 +9430,7 @@ msgid "Revoke the \"%s\" role from this user"
 msgstr "Одземи му ја улогата „%s“ на корисников"
 
 #. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:974
+#: lib/router.php:1001
 msgid "Page not found."
 msgstr "Страницата не е пронајдена."
 
@@ -9398,11 +9459,6 @@ msgctxt "BUTTON"
 msgid "Search"
 msgstr "Пребарај"
 
-#. TRANS: Definition list item with instructions on how to get (better) search results.
-#: lib/searchaction.php:170
-msgid "Search help"
-msgstr "Помош со пребарување"
-
 #: lib/searchgroupnav.php:80
 msgid "People"
 msgstr "Луѓе"
@@ -9427,6 +9483,51 @@ msgstr "Заглавие без наслов"
 msgid "More..."
 msgstr "Повеќе..."
 
+#: lib/settingsnav.php:78
+msgid "Change your profile settings"
+msgstr "Смени профилни нагодувања"
+
+#: lib/settingsnav.php:83
+msgid "Upload an avatar"
+msgstr "Подигни аватар"
+
+#: lib/settingsnav.php:88
+msgid "Change your password"
+msgstr "Смени лозинка"
+
+#: lib/settingsnav.php:93
+msgid "Change email handling"
+msgstr "Смени ракување со е-пошта"
+
+#: lib/settingsnav.php:98
+msgid "Design your profile"
+msgstr "Наместете изглед на Вашиот профил"
+
+#: lib/settingsnav.php:102
+msgid "URL"
+msgstr "URL"
+
+#: lib/settingsnav.php:103
+msgid "URL shorteners"
+msgstr ""
+
+#: lib/settingsnav.php:111
+msgid "Updates by instant messenger (IM)"
+msgstr "Подновувања преку инстант-пораки (IM)"
+
+#: lib/settingsnav.php:118
+msgid "Updates by SMS"
+msgstr "Подновувања по СМС"
+
+#: lib/settingsnav.php:123
+#, fuzzy
+msgid "Connections"
+msgstr "Поврзувања"
+
+#: lib/settingsnav.php:124
+msgid "Authorized connected applications"
+msgstr "Овластени поврзани програми"
+
 #: lib/silenceform.php:67
 msgid "Silence"
 msgstr "Замолчи"
@@ -9435,30 +9536,34 @@ msgstr "Замолчи"
 msgid "Silence this user"
 msgstr "Замолчи го овој корисник"
 
-#: lib/subgroupnav.php:83
+#: lib/subgroupnav.php:89
 #, php-format
 msgid "People %s subscribes to"
 msgstr "Луѓе на кои е претплатен корисникот %s"
 
-#: lib/subgroupnav.php:91
+#: lib/subgroupnav.php:97
 #, php-format
 msgid "People subscribed to %s"
 msgstr "Луѓе претплатени на %s"
 
-#: lib/subgroupnav.php:99
+#: lib/subgroupnav.php:105
 #, php-format
 msgid "Groups %s is a member of"
 msgstr "Групи кадешто членува %s"
 
-#: lib/subgroupnav.php:105
+#: lib/subgroupnav.php:111
 msgid "Invite"
 msgstr "Покани"
 
-#: lib/subgroupnav.php:106
+#: lib/subgroupnav.php:112
 #, php-format
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Поканете пријатели и колеги да Ви се придружат на %s"
 
+#: lib/subscribeform.php:115 lib/subscribeform.php:139
+msgid "Subscribe to this user"
+msgstr "Претплати се на корисников"
+
 #: lib/subscriberspeopleselftagcloudsection.php:48
 #: lib/subscriptionspeopleselftagcloudsection.php:48
 msgid "People Tagcloud as self-tagged"
@@ -9532,6 +9637,13 @@ msgstr "Изгледот содржи податотека од типот „.%
 msgid "Error opening theme archive."
 msgstr "Грешка при отворањето на архивот за мотив."
 
+#: lib/threadednoticelist.php:270
+#, php-format
+msgid "Show all %d comment"
+msgid_plural "Show all %d comments"
+msgstr[0] ""
+msgstr[1] ""
+
 #: lib/topposterssection.php:74
 msgid "Top posters"
 msgstr "Најактивни објавувачи"
@@ -9573,76 +9685,79 @@ msgstr "Откажи ја претплатата"
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "Корисникот %1$s (%2$d) нема профилен запис."
 
-#. TRANS: Link text for changeing the avatar of the logged in user.
-#: lib/userprofile.php:121
+#: lib/userprofile.php:116
 msgid "Edit Avatar"
 msgstr "Уреди аватар"
 
 #. TRANS: H2 for user actions in a profile.
 #. TRANS: H2 for entity actions in a profile.
-#: lib/userprofile.php:245 lib/userprofile.php:261
+#: lib/userprofile.php:216 lib/userprofile.php:232
 msgid "User actions"
 msgstr "Кориснички дејства"
 
 #. TRANS: Text shown in user profile of not yet compeltely deleted users.
-#: lib/userprofile.php:249
+#: lib/userprofile.php:220
 msgid "User deletion in progress..."
 msgstr "Бришењето на корисникот е во тек..."
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:277
+#: lib/userprofile.php:248
 msgid "Edit profile settings"
 msgstr "Уреди нагодувања на профилот"
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:279
+#: lib/userprofile.php:250
 msgid "Edit"
 msgstr "Уреди"
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:303
+#: lib/userprofile.php:274
 msgid "Send a direct message to this user"
 msgstr "Испрати му директна порака на корисников"
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:305
+#: lib/userprofile.php:276
 msgid "Message"
 msgstr "Порака"
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:347
+#: lib/userprofile.php:318
 msgid "Moderate"
 msgstr "Модерирај"
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:386
+#: lib/userprofile.php:357
 msgid "User role"
 msgstr "Корисничка улога"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:389
+#: lib/userprofile.php:360
 msgctxt "role"
 msgid "Administrator"
 msgstr "Администратор"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:391
+#: lib/userprofile.php:362
 msgctxt "role"
 msgid "Moderator"
 msgstr "Модератор"
 
+#: lib/util.php:321
+msgid "Not allowed to log in."
+msgstr "Не Ви е дозволено да се најавите."
+
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1306
+#: lib/util.php:1337
 msgid "a few seconds ago"
 msgstr "пред неколку секунди"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1309
+#: lib/util.php:1340
 msgid "about a minute ago"
 msgstr "пред една минута"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1313
+#: lib/util.php:1344
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
@@ -9650,12 +9765,12 @@ msgstr[0] "пред околу една минута"
 msgstr[1] "пред околу %d минути"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1316
+#: lib/util.php:1347
 msgid "about an hour ago"
 msgstr "пред еден час"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1320
+#: lib/util.php:1351
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
@@ -9663,12 +9778,12 @@ msgstr[0] "пред околу еден час"
 msgstr[1] "пред околу %d часа"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1323
+#: lib/util.php:1354
 msgid "about a day ago"
 msgstr "пред еден ден"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1327
+#: lib/util.php:1358
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
@@ -9676,12 +9791,12 @@ msgstr[0] "пред околу еден ден"
 msgstr[1] "пред околу %d дена"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1330
+#: lib/util.php:1361
 msgid "about a month ago"
 msgstr "пред еден месец"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1334
+#: lib/util.php:1365
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
@@ -9689,7 +9804,7 @@ msgstr[0] "пред околу еден месец"
 msgstr[1] "пред околу %d месеци"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1337
+#: lib/util.php:1368
 msgid "about a year ago"
 msgstr "пред една година"
 
@@ -9701,23 +9816,6 @@ msgid "%s is not a valid color! Use 3 or 6 hex characters."
 msgstr ""
 "%s не претставува важечка боја! Користете 3 или 6 шеснаесетни (hex) знаци."
 
-#. TRANS: %s is the URL to the StatusNet site's Instant Messaging settings.
-#: lib/xmppmanager.php:287
-#, php-format
-msgid "Unknown user. Go to %s to add your address to your account"
-msgstr "Непознат корисник. Одете на %s за да внесете адреса во Вашата сметка."
-
-#. TRANS: Response to XMPP source when it sent too long a message.
-#. TRANS: %1$d the maximum number of allowed characters (used for plural), %2$d is the sent number.
-#: lib/xmppmanager.php:406
-#, php-format
-msgid "Message too long. Maximum is %1$d character, you sent %2$d."
-msgid_plural "Message too long. Maximum is %1$d characters, you sent %2$d."
-msgstr[0] ""
-"Пораката е предолга. Дозволен е највеќе %1$d знак, а вие испративте %2$d."
-msgstr[1] ""
-"Пораката е предолга - дозволени се највеќе %1$d знаци, а вие испративте %2$d."
-
 #. TRANS: Exception.
 #: lib/xrd.php:63
 msgid "Invalid XML."
@@ -9734,63 +9832,176 @@ msgstr "Неважечки XML. Нема XRD-корен."
 msgid "Getting backup from file '%s'."
 msgstr "Земам резерва на податотеката „%s“."
 
-#~ msgid "Block this user."
-#~ msgstr "Блокирај го корисников."
+#~ msgid "Could not generate feed for group - %s"
+#~ msgstr "Не можев да создадам канал за групата - %s"
 
-#~ msgid "Delete this notice."
-#~ msgstr "Избриши ја забелешкава."
-
-#~ msgid "Delete this user."
-#~ msgstr "Избриши го корисников."
-
-#~ msgid "Restore default designs."
-#~ msgstr "Врати ги изгледите по основно."
-
-#~ msgid "Reset back to default."
-#~ msgstr "Врати по основно."
-
-#~ msgid "Save design."
-#~ msgstr "Зачувај изглед."
-
-#~ msgid "Disfavor favorite."
-#~ msgstr "Тргни од бендисани."
-
-#~ msgid "\"%s\" not found."
-#~ msgstr "„%s“ не е пронајден."
-
-#~ msgid "Notice %s not found."
-#~ msgstr "Забелешката %s не е пронајдена."
-
-#~ msgid "Attachment %s not found."
-#~ msgstr "Прилогот %s не е пронајден."
-
-#~ msgid "\"%s\" not supported for oembed requests."
-#~ msgstr "„%s“ не е поддржано за oembed-барања."
-
-#~ msgid "Invalid tag: \"%s\"."
-#~ msgstr "Неважечка ознака: „%s“."
-
-#~ msgid "%s updates from everyone."
-#~ msgstr "%s подновувања од сите."
-
-#~ msgid "Password saved"
-#~ msgstr "Лозинката е зачувана"
-
-#~ msgid "Where you are, like \"City, State (or Region), Country\"."
-#~ msgstr "Каде се наоѓате, на пр. „Град, Сојуз. држава (или Област), Земја“."
-
-#~ msgid "Subscribe to this user."
-#~ msgstr "Претплати се на корисников."
+#~ msgid "Current confirmed Jabber/Google Talk address."
+#~ msgstr "Моментално потврдена адреса на Jabber/Google Talk."
 
 #~ msgid ""
-#~ "Listenee stream license \"%1$s\" is not compatible with site license \"%2"
-#~ "$s\"."
+#~ "Jabber or Google Talk address, like \"UserName@example.org\". First, make "
+#~ "sure to add %s to your buddy list in your IM client or on Google Talk."
 #~ msgstr ""
-#~ "Лиценцата на каналот на следениот „%1$s“ не е складна на лиценцата на "
-#~ "мрежното место „%2$s“."
+#~ "Адреса на Jabber или Google Talk, како на пр. „KorisnickoIme@example."
+#~ "org“. Но прво додајте го/ја %s во Вашиот контактен список на Вашиот "
+#~ "клиент за НП или Google Talk."
 
-#~ msgid "Not allowed to use API."
-#~ msgstr "Не е дозволено да се користи API."
+#~ msgid "Send me notices through Jabber/Google Talk."
+#~ msgstr "Испраќај ми забелешки преку Jabber/Google Talk."
 
-#~ msgid "Not allowed to log in."
-#~ msgstr "Не Ви е дозволено да се најавите."
+#~ msgid "Publish a MicroID for my Jabber/Google Talk address."
+#~ msgstr "Објави MicroID за мојата адреса на Jabber/Google Talk."
+
+#~ msgid "No Jabber ID."
+#~ msgstr "Нема JabberID."
+
+#~ msgid "Not a valid Jabber ID."
+#~ msgstr "Ова не е важечки ID за Jabber."
+
+#~ msgid "That is already your Jabber ID."
+#~ msgstr "Ова веќе е Вашиот Jabber ID."
+
+#~ msgid "That is not your Jabber ID."
+#~ msgstr "Ова не е Вашиот Jabber ID."
+
+#~ msgid "Other settings"
+#~ msgstr "Други нагодувања"
+
+#~ msgid "Tag cloud"
+#~ msgstr "Облак од ознаки"
+
+#~ msgid "Consumer key"
+#~ msgstr "Потрошувачки клуч"
+
+#~ msgid "Consumer secret"
+#~ msgstr "Потрошувачка тајна"
+
+#~ msgid "Request token URL"
+#~ msgstr "URL на жетонот на барањето"
+
+#~ msgid "Access token URL"
+#~ msgstr "URL на пристапниот жетон"
+
+#~ msgid "Authorize URL"
+#~ msgstr "Одобри URL"
+
+#~ msgid "Jabber"
+#~ msgstr "Jabber"
+
+#~ msgid "Photo"
+#~ msgstr "Фото"
+
+#~ msgid "Other options"
+#~ msgstr "Други нагодувања"
+
+#~ msgid "Other"
+#~ msgstr "Друго"
+
+#~ msgid "Primary site navigation"
+#~ msgstr "Главна навигација"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Personal profile and friends timeline"
+#~ msgstr "Личен профил и хронологија на пријатели"
+
+#~ msgctxt "MENU"
+#~ msgid "Personal"
+#~ msgstr "Лично"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Change your email, avatar, password, profile"
+#~ msgstr "Промена на е-пошта, аватар, лозинка, профил"
+
+#~ msgid "Account"
+#~ msgstr "Сметка"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Connect to services"
+#~ msgstr "Поврзи се со услуги"
+
+#~ msgid "Connect"
+#~ msgstr "Поврзи се"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Change site configuration"
+#~ msgstr "Промена на поставките на мрежното место"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Invite friends and colleagues to join you on %s"
+#~ msgstr "Поканете пријатели и колеги да Ви се придружат на %s"
+
+#~ msgctxt "MENU"
+#~ msgid "Invite"
+#~ msgstr "Покани"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Create an account"
+#~ msgstr "Создај сметка"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Help me!"
+#~ msgstr "Напомош!"
+
+#~ msgctxt "MENU"
+#~ msgid "Help"
+#~ msgstr "Помош"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Search for people or text"
+#~ msgstr "Пребарајте луѓе или текст"
+
+#~ msgid "Local views"
+#~ msgstr "Локални прегледи"
+
+#~ msgid "Page notice"
+#~ msgstr "Напомена за страницата"
+
+#~ msgid "Secondary site navigation"
+#~ msgstr "Споредна навигација"
+
+#~ msgid "StatusNet software license"
+#~ msgstr "Лиценца на програмот StatusNet"
+
+#~ msgid "Site content license"
+#~ msgstr "Лиценца на содржините на мрежното место"
+
+#~ msgid "Pagination"
+#~ msgstr "Прелом на страници"
+
+#~ msgid "Author"
+#~ msgstr "Автор"
+
+#~ msgid "Provider"
+#~ msgstr "Обезбедувач"
+
+#~ msgctxt "MENU"
+#~ msgid "SMS"
+#~ msgstr "СМС"
+
+#~ msgid "Filter tags"
+#~ msgstr "Филтрирај ознаки"
+
+#~ msgid "[%s]"
+#~ msgstr "[%s]"
+
+#~ msgid "Available characters"
+#~ msgstr "Расположиви знаци"
+
+#~ msgctxt "MENU"
+#~ msgid "Profile"
+#~ msgstr "Профил"
+
+#~ msgid "Search help"
+#~ msgstr "Помош со пребарување"
+
+#~ msgid "Unknown user. Go to %s to add your address to your account"
+#~ msgstr ""
+#~ "Непознат корисник. Одете на %s за да внесете адреса во Вашата сметка."
+
+#~ msgid "Message too long. Maximum is %1$d character, you sent %2$d."
+#~ msgid_plural "Message too long. Maximum is %1$d characters, you sent %2$d."
+#~ msgstr[0] ""
+#~ "Пораката е предолга. Дозволен е највеќе %1$d знак, а вие испративте %2$d."
+#~ msgstr[1] ""
+#~ "Пораката е предолга - дозволени се највеќе %1$d знаци, а вие испративте %2"
+#~ "$d."
diff --git a/locale/ml/LC_MESSAGES/statusnet.po b/locale/ml/LC_MESSAGES/statusnet.po
index d6cc5b405a..0a4a7502c5 100644
--- a/locale/ml/LC_MESSAGES/statusnet.po
+++ b/locale/ml/LC_MESSAGES/statusnet.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 15:58+0000\n"
-"PO-Revision-Date: 2011-03-03 16:01:03+0000\n"
+"POT-Creation-Date: 2011-03-03 17:23+0000\n"
+"PO-Revision-Date: 2011-03-03 17:26:15+0000\n"
 "Language-Team: Malayalam <http://translatewiki.net/wiki/Portal:ml>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -76,23 +76,23 @@ msgstr "അഭിഗമ്യതാ സജ്ജീകരണങ്ങൾ സേ
 #. TRANS: Tooltip for button to save access settings in site admin panel.
 #. TRANS: Button text for saving theme settings.
 #. TRANS: Button label to save e-mail preferences.
-#. TRANS: Button label to save Instant Messaging preferences.
-#. TRANS: Button text for saving "Other settings" in profile.
+#. TRANS: Button label to save IM preferences.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
 #. TRANS: Button text for saving site notice in admin panel.
 #. TRANS: Button label to save SMS preferences.
 #. TRANS: Save button for settings for a profile in a subscriptions list.
+#. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
 #. TRANS: Button text on profile design page to save settings.
 #: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
-#: actions/emailsettings.php:250 actions/imsettings.php:183
-#: actions/othersettings.php:136 actions/pathsadminpanel.php:512
-#: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
-#: actions/smssettings.php:205 actions/subscriptions.php:259
+#: actions/emailsettings.php:251 actions/imsettings.php:199
+#: actions/pathsadminpanel.php:512 actions/profilesettings.php:198
+#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:204
+#: actions/subscriptions.php:261 actions/urlsettings.php:152
 #: actions/useradminpanel.php:298 lib/applicationeditform.php:355
-#: lib/designsettings.php:270 lib/groupeditform.php:201
+#: lib/designform.php:320 lib/groupeditform.php:201
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "സേവ് ചെയ്യുക"
@@ -131,7 +131,11 @@ msgstr "അത്തരത്തിൽ ഒരു താളില്ല."
 #. 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 use "one time password login" without using an existing user.
+#. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
+#. TRANS: Client error displayed trying to find a user by ID for a non-existing ID.
+#. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when calling a profile action without specifying a user.
 #: actions/all.php:80 actions/allrss.php:69
@@ -143,19 +147,19 @@ msgstr "അത്തരത്തിൽ ഒരു താളില്ല."
 #: actions/apidirectmessage.php:75 actions/apidirectmessagenew.php:72
 #: actions/apigroupcreate.php:111 actions/apigroupismember.php:89
 #: actions/apigroupjoin.php:98 actions/apigroupleave.php:98
-#: actions/apigrouplist.php:70 actions/apistatusesupdate.php:230
-#: actions/apisubscriptions.php:85 actions/apitimelinefavorites.php:70
-#: actions/apitimelinefriends.php:173 actions/apitimelinehome.php:78
-#: actions/apitimelinementions.php:77 actions/apitimelineuser.php:79
-#: actions/avatarbynickname.php:79 actions/favoritesrss.php:72
-#: actions/foaf.php:42 actions/foaf.php:61 actions/hcard.php:67
-#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
-#: actions/remotesubscribe.php:144 actions/remotesubscribe.php:153
-#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
-#: actions/showfavorites.php:106 actions/userbyid.php:74
-#: actions/usergroups.php:93 actions/userrss.php:40 actions/userxrd.php:59
-#: actions/xrds.php:71 lib/command.php:509 lib/galleryaction.php:59
-#: lib/mailbox.php:80 lib/profileaction.php:77
+#: actions/apigrouplist.php:70 actions/apigroupprofileupdate.php:108
+#: actions/apistatusesupdate.php:230 actions/apisubscriptions.php:85
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:173
+#: actions/apitimelinehome.php:78 actions/apitimelinementions.php:77
+#: actions/apitimelineuser.php:79 actions/avatarbynickname.php:79
+#: actions/favoritesrss.php:72 actions/foaf.php:42 actions/foaf.php:61
+#: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116
+#: actions/otp.php:78 actions/remotesubscribe.php:144
+#: actions/remotesubscribe.php:153 actions/replies.php:73
+#: actions/repliesrss.php:38 actions/rsd.php:113 actions/showfavorites.php:106
+#: actions/userbyid.php:75 actions/usergroups.php:93 actions/userrss.php:40
+#: actions/userxrd.php:59 actions/xrds.php:71 lib/command.php:509
+#: lib/galleryaction.php:59 lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "അങ്ങനെ ഒരു ഉപയോക്താവില്ല."
 
@@ -169,10 +173,9 @@ msgstr "%1$s ഒപ്പം സുഹൃത്തുക്കളും, താ
 #. TRANS: H1 text for page. %s is a user nickname.
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Timeline title for user and friends. %s is a user nickname.
-#. TRANS: Tooltop for personal group navigation menu option when logged in for viewing timeline of self and friends.
 #: actions/all.php:94 actions/all.php:191 actions/allrss.php:117
 #: actions/apitimelinefriends.php:207 actions/apitimelinehome.php:113
-#: lib/personalgroupnav.php:102
+#: lib/personalgroupnav.php:100
 #, php-format
 msgid "%s and friends"
 msgstr "%s ഒപ്പം സുഹൃത്തുക്കളും"
@@ -224,7 +227,7 @@ msgstr ""
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
 #. TRANS: Second sentence of empty message for anonymous users. %s is a user nickname.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:227
+#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:221
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -271,19 +274,20 @@ msgstr ""
 #: actions/apifavoritecreate.php:98 actions/apifavoritedestroy.php:98
 #: actions/apifriendshipscreate.php:99 actions/apifriendshipsdestroy.php:99
 #: actions/apifriendshipsshow.php:124 actions/apigroupcreate.php:138
-#: actions/apigroupismember.php:115 actions/apigroupjoin.php:160
-#: actions/apigroupleave.php:145 actions/apigrouplist.php:134
+#: actions/apigroupismember.php:115 actions/apigroupjoin.php:151
+#: actions/apigroupleave.php:141 actions/apigrouplist.php:134
 #: actions/apigrouplistall.php:120 actions/apigroupmembership.php:105
+#: actions/apigroupprofileupdate.php:100 actions/apigroupprofileupdate.php:213
 #: actions/apigroupshow.php:114 actions/apihelptest.php:84
 #: actions/apistatusesdestroy.php:101 actions/apistatusesretweets.php:110
 #: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:139
 #: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
-#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:268
-#: actions/apitimelinegroup.php:147 actions/apitimelinehome.php:173
-#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:239
-#: actions/apitimelineretweetedtome.php:118
-#: actions/apitimelineretweetsofme.php:150 actions/apitimelinetag.php:159
-#: actions/apitimelineuser.php:206 actions/apiusershow.php:100
+#: actions/apitimelinefavorites.php:182 actions/apitimelinefriends.php:276
+#: actions/apitimelinegroup.php:148 actions/apitimelinehome.php:181
+#: actions/apitimelinementions.php:182 actions/apitimelinepublic.php:247
+#: actions/apitimelineretweetedtome.php:147
+#: actions/apitimelineretweetsofme.php:147 actions/apitimelinetag.php:165
+#: actions/apitimelineuser.php:217 actions/apiusershow.php:100
 msgid "API method not found."
 msgstr "എ.പി.ഐ. മെതേഡ് കണ്ടെത്താനായില്ല."
 
@@ -298,8 +302,9 @@ msgstr "എ.പി.ഐ. മെതേഡ് കണ്ടെത്താനായ
 #: actions/apifavoritecreate.php:88 actions/apifavoritedestroy.php:88
 #: actions/apifriendshipscreate.php:89 actions/apifriendshipsdestroy.php:89
 #: actions/apigroupcreate.php:102 actions/apigroupjoin.php:89
-#: actions/apigroupleave.php:89 actions/apimediaupload.php:66
-#: actions/apistatusesretweet.php:63 actions/apistatusesupdate.php:194
+#: actions/apigroupleave.php:89 actions/apigroupprofileupdate.php:92
+#: actions/apimediaupload.php:66 actions/apistatusesretweet.php:63
+#: actions/apistatusesupdate.php:194
 msgid "This method requires a POST."
 msgstr ""
 
@@ -311,21 +316,16 @@ msgid ""
 msgstr ""
 
 #. TRANS: Server error displayed when a user's delivery device cannot be updated.
-#. TRANS: Server error displayed when a user update to the database fails in the contact address confirmation action.
 #. TRANS: Server error thrown on database error updating e-mail preferences.
 #. TRANS: Server error thrown on database error removing a registered e-mail address.
-#. TRANS: Server error thrown on database error updating Instant Messaging preferences.
-#. TRANS: Server error thrown on database error removing a registered Instant Messaging address.
-#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
 #. TRANS: Server error thrown when user profile settings could not be updated.
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
-#: actions/apiaccountupdatedeliverydevice.php:130
-#: actions/confirmaddress.php:118 actions/emailsettings.php:352
-#: actions/emailsettings.php:498 actions/imsettings.php:276
-#: actions/imsettings.php:432 actions/othersettings.php:186
-#: actions/profilesettings.php:322 actions/smssettings.php:301
-#: actions/smssettings.php:454
+#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
+#: actions/apiaccountupdatedeliverydevice.php:136
+#: actions/emailsettings.php:353 actions/emailsettings.php:499
+#: actions/profilesettings.php:323 actions/smssettings.php:300
+#: actions/smssettings.php:453 actions/urlsettings.php:211
 msgid "Could not update user."
 msgstr "ഉപയോക്തൃ വിവരങ്ങൾ പുതുക്കാൻ കഴിഞ്ഞില്ല."
 
@@ -351,7 +351,7 @@ msgstr ""
 
 #. TRANS: Server error displayed if a user profile could not be saved.
 #. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:418
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:419
 msgid "Could not save profile."
 msgstr ""
 
@@ -363,7 +363,7 @@ msgstr ""
 #: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
 #: actions/designadminpanel.php:120 actions/editapplication.php:121
 #: actions/newapplication.php:102 actions/newnotice.php:95
-#: lib/designsettings.php:298
+#: lib/designsettings.php:110
 #, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s byte) due to its "
@@ -384,8 +384,8 @@ msgstr[1] ""
 #: actions/apiaccountupdateprofilecolors.php:160
 #: actions/apiaccountupdateprofilecolors.php:171
 #: actions/groupdesignsettings.php:285 actions/groupdesignsettings.php:296
-#: actions/userdesignsettings.php:201 actions/userdesignsettings.php:211
-#: actions/userdesignsettings.php:253 actions/userdesignsettings.php:263
+#: actions/userdesignsettings.php:218 actions/userdesignsettings.php:228
+#: actions/userdesignsettings.php:270 actions/userdesignsettings.php:280
 msgid "Unable to save your design settings."
 msgstr "താങ്കളുടെ രൂപകല്പനാ സജ്ജീകരണങ്ങൾ കാത്തുസൂക്ഷിക്കാനായില്ല."
 
@@ -393,7 +393,7 @@ msgstr "താങ്കളുടെ രൂപകല്പനാ സജ്ജീ
 #. TRANS: Client error displayed when a database error occurs updating profile colours.
 #: actions/apiaccountupdateprofilebackgroundimage.php:191
 #: actions/apiaccountupdateprofilecolors.php:139
-#: actions/userdesignsettings.php:179
+#: actions/userdesignsettings.php:196
 msgid "Could not update your design."
 msgstr "താങ്കളുടെ രൂപകല്പന പുതുക്കാനായില്ല."
 
@@ -501,8 +501,7 @@ msgstr "സ്വീകർത്താവായ ഉപയോക്താവി
 
 #. TRANS: Client error displayed trying to direct message another user who's not a friend (403).
 #: actions/apidirectmessagenew.php:144
-#, fuzzy
-msgid "Can't send direct messages to users who aren't your friend."
+msgid "Cannot send direct messages to users who aren't your friend."
 msgstr "താങ്കളുടെ സുഹൃത്തുക്കളല്ലാത്ത ഉപയോക്താക്കൾക്ക് നേരിട്ടുള്ള സന്ദേശങ്ങൾ അയയ്ക്കാൻ കഴിയില്ല."
 
 #. TRANS: Client error displayed trying to direct message self (403).
@@ -583,9 +582,9 @@ msgstr "ലക്ഷ്യമിട്ട ഉപയോക്താവിനെ 
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:156 actions/editgroup.php:191
-#: actions/newgroup.php:137 actions/profilesettings.php:273
-#: actions/register.php:214
+#: actions/apigroupcreate.php:156 actions/apigroupprofileupdate.php:255
+#: actions/editgroup.php:191 actions/newgroup.php:137
+#: actions/profilesettings.php:274 actions/register.php:199
 msgid "Nickname already in use. Try another one."
 msgstr "വിളിപ്പേര് മുമ്പേ ഉപയോഗത്തിലുണ്ട്. മറ്റൊരെണ്ണം ശ്രമിക്കുക."
 
@@ -593,9 +592,9 @@ msgstr "വിളിപ്പേര് മുമ്പേ ഉപയോഗത്
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:164 actions/editgroup.php:195
-#: actions/newgroup.php:141 actions/profilesettings.php:243
-#: actions/register.php:216
+#: actions/apigroupcreate.php:164 actions/apigroupprofileupdate.php:259
+#: actions/editgroup.php:195 actions/newgroup.php:141
+#: actions/profilesettings.php:244 actions/register.php:201
 msgid "Not a valid nickname."
 msgstr "സാധുവായ വിളിപ്പേര് അല്ല."
 
@@ -605,10 +604,10 @@ msgstr "സാധുവായ വിളിപ്പേര് അല്ല."
 #. TRANS: Validation error shown when providing an invalid homepage URL in the "New application" form.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:181 actions/editapplication.php:235
-#: actions/editgroup.php:202 actions/newapplication.php:221
-#: actions/newgroup.php:148 actions/profilesettings.php:248
-#: actions/register.php:223
+#: actions/apigroupcreate.php:181 actions/apigroupprofileupdate.php:277
+#: actions/editapplication.php:235 actions/editgroup.php:202
+#: actions/newapplication.php:221 actions/newgroup.php:148
+#: actions/profilesettings.php:249 actions/register.php:208
 msgid "Homepage is not a valid URL."
 msgstr "ഹോംപേജിന്റെ യൂ.ആർ.എൽ. സാധുവല്ല."
 
@@ -617,8 +616,8 @@ msgstr "ഹോംപേജിന്റെ യൂ.ആർ.എൽ. സാധുവ
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:191 actions/editgroup.php:206
-#: actions/newgroup.php:152 actions/profilesettings.php:252
-#: actions/register.php:226
+#: actions/newgroup.php:152 actions/profilesettings.php:253
+#: actions/register.php:211
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "പൂർണ്ണ നാമത്തിന്റെ നീളം വളരെ കൂടുതലാണ് (പരമാവധി 255 അക്ഷരങ്ങൾ)."
 
@@ -645,8 +644,8 @@ msgstr[1] "വിവരണത്തിനു നീളം കൂടുതലാ
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:215 actions/editgroup.php:218
-#: actions/newgroup.php:164 actions/profilesettings.php:265
-#: actions/register.php:235
+#: actions/newgroup.php:164 actions/profilesettings.php:266
+#: actions/register.php:220
 msgid "Location is too long (maximum 255 characters)."
 msgstr ""
 
@@ -675,15 +674,16 @@ msgstr ""
 #. TRANS: %s is the alias that is already in use.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error. %s is the already used alias.
-#: actions/apigroupcreate.php:264 actions/editgroup.php:246
-#: actions/newgroup.php:193
+#: actions/apigroupcreate.php:264 actions/apigroupprofileupdate.php:351
+#: actions/editgroup.php:246 actions/newgroup.php:193
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to use an alias during group creation that is the same as the group's nickname.
 #. TRANS: Group edit form validation error.
-#: actions/apigroupcreate.php:278 actions/editgroup.php:253
+#: actions/apigroupcreate.php:278 actions/apigroupprofileupdate.php:359
+#: actions/editgroup.php:253
 msgid "Alias can't be the same as nickname."
 msgstr ""
 
@@ -695,7 +695,8 @@ msgstr ""
 #. TRANS: Client error displayed requesting most recent notices to a group for a non-existing group.
 #: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
 #: actions/apigroupleave.php:104 actions/apigroupmembership.php:71
-#: actions/apigroupshow.php:81 actions/apitimelinegroup.php:89
+#: actions/apigroupprofileupdate.php:113 actions/apigroupshow.php:81
+#: actions/apitimelinegroup.php:89
 msgid "Group not found."
 msgstr "സംഘത്തെ കണ്ടെത്താനായില്ല."
 
@@ -713,13 +714,11 @@ msgstr "താങ്കൾ ആ സംഘത്തിൽ മുമ്പേ ത
 msgid "You have been blocked from that group by the admin."
 msgstr "ആ സംഘത്തിൽ നിന്നും കാര്യനിർവ്വാഹകൻ താങ്കളെ തടഞ്ഞിരിക്കുന്നു."
 
-#. TRANS: Server error displayed when joining a group fails.
-#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
 #. 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.
 #. TRANS: Message given having failed to add a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:362
+#: actions/apigroupjoin.php:136 actions/joingroup.php:139 lib/command.php:362
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "%2$s എന്ന സംഘത്തിൽ %1$s എന്ന ഉപയോക്താവിനെ ചേർക്കാൻ കഴിഞ്ഞില്ല."
@@ -729,8 +728,6 @@ msgstr "%2$s എന്ന സംഘത്തിൽ %1$s എന്ന ഉപയ
 msgid "You are not a member of this group."
 msgstr "താങ്കൾ ഈ സംഘത്തിൽ അംഗമല്ല."
 
-#. TRANS: Server error displayed when leaving a group fails.
-#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
 #. TRANS: Server error displayed when leaving a group failed in the database.
 #. TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
 #. TRANS: Message given having failed to remove a user from a group.
@@ -766,6 +763,61 @@ msgstr "%s സംഘങ്ങൾ"
 msgid "groups on %s"
 msgstr "%s സൈറ്റിലെ സംഘങ്ങൾ"
 
+#. TRANS: Client error displayed trying to edit a group while not being a group admin.
+#. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
+#. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
+#: actions/apigroupprofileupdate.php:118 actions/editgroup.php:110
+#: actions/editgroup.php:176 actions/groupdesignsettings.php:109
+#: actions/grouplogo.php:111
+msgid "You must be an admin to edit the group."
+msgstr "സംഘത്തിൽ മാറ്റം വരുത്താൻ താങ്കൾ ഒരു കാര്യനിർവ്വാഹകനായിരിക്കണം."
+
+#. TRANS: Server error displayed when editing a group fails.
+#: actions/apigroupprofileupdate.php:171 actions/editgroup.php:274
+msgid "Could not update group."
+msgstr ""
+
+#. TRANS: Server error displayed when group aliases could not be added.
+#. TRANS: Server exception thrown when creating group aliases failed.
+#: actions/apigroupprofileupdate.php:194 actions/editgroup.php:281
+#: classes/User_group.php:540
+msgid "Could not create aliases."
+msgstr ""
+
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: actions/apigroupprofileupdate.php:249 lib/nickname.php:165
+msgid "Nickname must have only lowercase letters and numbers and no spaces."
+msgstr "വിളിപ്പേരിൽ ഇംഗ്ലീഷ് ചെറിയക്ഷരങ്ങളും അക്കങ്ങളും ഇടവിടാതെ നൽകുക."
+
+#: actions/apigroupprofileupdate.php:286
+#, fuzzy
+msgid "Full name is too long (max 255 chars)."
+msgstr "പൂർണ്ണ നാമത്തിന്റെ നീളം വളരെ കൂടുതലാണ് (പരമാവധി 255 അക്ഷരങ്ങൾ)."
+
+#: actions/apigroupprofileupdate.php:296
+#, fuzzy, php-format
+msgid "description is too long (max %d chars)."
+msgstr "വിവരണത്തിനു നീളം കൂടുതലാണ് (പരമാവധി %d അക്ഷരം)."
+
+#: actions/apigroupprofileupdate.php:307
+#, fuzzy
+msgid "Location is too long (max 255 chars)."
+msgstr "സംഘടനയുടെ പേരിന്റെ നീളം വളരെക്കൂടുതലാണ് (പരമാവധി 255 അക്ഷരങ്ങൾ)."
+
+#: actions/apigroupprofileupdate.php:326
+#, php-format
+msgid "Too many aliases! Maximum %d."
+msgstr ""
+
+#. TRANS: Group edit form validation error.
+#. TRANS: Group create form validation error.
+#. TRANS: %s is the invalid alias.
+#: actions/apigroupprofileupdate.php:342 actions/editgroup.php:241
+#: actions/newgroup.php:188
+#, php-format
+msgid "Invalid alias: \"%s\""
+msgstr ""
+
 #. TRANS: Client error displayed when uploading a media file has failed.
 #: actions/apimediaupload.php:101
 msgid "Upload failed."
@@ -796,21 +848,22 @@ msgstr "അഭ്യർത്ഥനാ ചീട്ട് മുമ്പേ ത
 #. TRANS: Form validation error message.
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
+#. TRANS: Client error displayed when the session token is not okay.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
 #: actions/deletenotice.php:177 actions/disfavor.php:75
-#: actions/emailsettings.php:291 actions/favor.php:75 actions/geocode.php:55
+#: actions/emailsettings.php:292 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:65 actions/grouplogo.php:321
-#: actions/groupunblock.php:65 actions/imsettings.php:224
-#: actions/invite.php:60 actions/login.php:137 actions/makeadmin.php:66
-#: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
-#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
-#: actions/othersettings.php:155 actions/passwordsettings.php:138
-#: actions/profilesettings.php:217 actions/recoverpassword.php:383
-#: actions/register.php:172 actions/remotesubscribe.php:76
-#: actions/repeat.php:82 actions/smssettings.php:250 actions/subedit.php:40
-#: actions/subscribe.php:86 actions/tagother.php:166
-#: actions/unsubscribe.php:69 actions/userauthorization.php:52
-#: lib/designsettings.php:310
+#: actions/groupunblock.php:65 actions/imsettings.php:241
+#: actions/invite.php:60 actions/makeadmin.php:66 actions/newmessage.php:135
+#: actions/newnotice.php:105 actions/nudge.php:80
+#: actions/oauthappssettings.php:162 actions/oauthconnectionssettings.php:135
+#: actions/passwordsettings.php:137 actions/pluginenable.php:87
+#: actions/profilesettings.php:218 actions/recoverpassword.php:383
+#: actions/register.php:157 actions/remotesubscribe.php:76
+#: actions/repeat.php:82 actions/smssettings.php:249 actions/subedit.php:40
+#: actions/subscribe.php:87 actions/tagother.php:145
+#: actions/unsubscribe.php:69 actions/urlsettings.php:171
+#: actions/userauthorization.php:53 lib/designsettings.php:122
 msgid "There was a problem with your session token. Try again, please."
 msgstr "താങ്കളുടെ സെഷൻ ചീട്ടിൽ ഒരു ചെറിയ പ്രശ്നം. ദയവായി വീണ്ടും ശ്രമിക്കുക."
 
@@ -838,10 +891,10 @@ msgstr ""
 #. TRANS: Unknown form validation error in design settings form.
 #: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
 #: actions/designadminpanel.php:100 actions/editapplication.php:144
-#: actions/emailsettings.php:310 actions/grouplogo.php:332
-#: actions/imsettings.php:239 actions/newapplication.php:124
-#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
-#: actions/smssettings.php:271 lib/designsettings.php:321
+#: actions/emailsettings.php:311 actions/grouplogo.php:332
+#: actions/imsettings.php:256 actions/newapplication.php:124
+#: actions/oauthconnectionssettings.php:144 actions/recoverpassword.php:46
+#: actions/smssettings.php:270 lib/designsettings.php:133
 msgid "Unexpected form submission."
 msgstr "അപ്രതീക്ഷിത ഫോം സമർപ്പിക്കൽ."
 
@@ -884,31 +937,26 @@ msgstr "അംഗത്വം"
 
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Field label in form for profile settings.
-#. TRANS: Label for group nickname (dt). Text hidden by default.
-#. TRANS: DT for nick name in a profile.
-#: actions/apioauthauthorize.php:459 actions/login.php:252
-#: actions/profilesettings.php:106 actions/register.php:432
-#: actions/showgroup.php:243 actions/tagother.php:94
+#: actions/apioauthauthorize.php:459 actions/login.php:225
+#: actions/profilesettings.php:107 actions/register.php:411
 #: actions/userauthorization.php:145 lib/groupeditform.php:145
-#: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "വിളിപ്പേര്"
 
 #. TRANS: Field label on OAuth API authorisation form.
-#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:463 actions/login.php:255
-#: actions/register.php:436 lib/accountsettingsaction.php:120
+#: actions/apioauthauthorize.php:463 actions/login.php:228
+#: actions/register.php:415 lib/settingsnav.php:87
 msgid "Password"
 msgstr "രഹസ്യവാക്ക്"
 
 #. TRANS: Button text that when clicked will cancel the process of allowing access to an account
 #. TRANS: by an external application.
 #. TRANS: Button label to cancel an e-mail address confirmation procedure.
-#. TRANS: Button label to cancel an Instant Messaging address confirmation procedure.
+#. TRANS: Button label to cancel an IM address confirmation procedure.
 #. TRANS: Button label to cancel a SMS address confirmation procedure.
 #. TRANS: Button label in the "Edit application" form.
-#: actions/apioauthauthorize.php:478 actions/emailsettings.php:124
-#: actions/imsettings.php:127 actions/smssettings.php:133
+#: actions/apioauthauthorize.php:478 actions/emailsettings.php:125
+#: actions/imsettings.php:136 actions/smssettings.php:132
 #: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Cancel"
@@ -1015,8 +1063,8 @@ msgstr "എച്ച്.റ്റി.റ്റി.പി. രീതി പിന
 #. TRANS: Exception thrown requesting an unsupported notice output format.
 #. TRANS: %s is the requested output format.
 #: actions/apistatusesshow.php:144
-#, fuzzy, php-format
-msgid "Unsupported format: %s"
+#, php-format
+msgid "Unsupported format: %s."
 msgstr "പിന്തുണയ്ക്കാത്തയിനം തരം: %s."
 
 #. TRANS: Client error displayed requesting a deleted status.
@@ -1098,13 +1146,6 @@ msgstr "%1$s / %2$s എന്ന ഉപയോക്താവിന് പ്ര
 msgid "%1$s updates favorited by %2$s / %3$s."
 msgstr ""
 
-#. TRANS: Server error displayed when generating an Atom feed fails.
-#. TRANS: %s is the error.
-#: actions/apitimelinegroup.php:134
-#, php-format
-msgid "Could not generate feed for group - %s"
-msgstr "സംഘത്തിനുള്ള ഫീഡ് സൃഷ്ടിക്കാൻ കഴിഞ്ഞില്ല - %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.
 #: actions/apitimelinementions.php:115
@@ -1121,13 +1162,14 @@ msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr ""
 
 #. TRANS: Title for site timeline. %s is the StatusNet sitename.
+#. TRANS: Public RSS feed title. %s is the StatusNet site name.
 #: actions/apitimelinepublic.php:193 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "%s സാർവ്വജനിക സമയരേഖ"
 
 #. TRANS: Subtitle for site timeline. %s is the StatusNet sitename.
-#: actions/apitimelinepublic.php:199 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:199
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "%s പദ്ധതിയിൽ എല്ലാവരും അയച്ചിട്ടുള്ള പുതിയവാർത്തകൾ!"
@@ -1138,21 +1180,33 @@ msgid "Unimplemented."
 msgstr "പ്രാവർത്തികമാക്കിയിട്ടില്ല."
 
 #. TRANS: Title for Atom feed "repeated to me". %s is the user nickname.
-#: actions/apitimelineretweetedtome.php:108
+#: actions/apitimelineretweetedtome.php:96
 #, php-format
 msgid "Repeated to %s"
 msgstr "%s എന്ന ഉപയോക്താവിനായി ആവർത്തിച്ചത്"
 
+#: actions/apitimelineretweetedtome.php:98
+#, php-format
+msgid "%1$s notices that were to repeated to %2$s / %3$s."
+msgstr ""
+
 #. TRANS: Title of list of repeated notices of the logged in user.
 #. TRANS: %s is the nickname of the logged in user.
-#: actions/apitimelineretweetsofme.php:112
+#: actions/apitimelineretweetsofme.php:98
 #, php-format
 msgid "Repeats of %s"
 msgstr "%s എന്ന ഉപയോക്താവിന്റെ ആവർത്തനങ്ങൾ"
 
+#: actions/apitimelineretweetsofme.php:104
+#, php-format
+msgid "%1$s notices that %2$s / %3$s has repeated."
+msgstr ""
+
 #. TRANS: Title for timeline with lastest notices with a given tag.
 #. TRANS: %s is the tag.
-#: actions/apitimelinetag.php:101 actions/tag.php:67
+#. TRANS: Title for first page of notices with tags.
+#. TRANS: %s is the tag.
+#: actions/apitimelinetag.php:101 actions/tag.php:69
 #, php-format
 msgid "Notices tagged with %s"
 msgstr "%s എന്നു റ്റാഗ് ചെയ്തിട്ടുള്ള അറിയിപ്പുകൾ"
@@ -1165,53 +1219,54 @@ msgid "Updates tagged with %1$s on %2$s!"
 msgstr ""
 
 #. TRANS: Client error displayed trying to add a notice to another user's timeline.
-#: actions/apitimelineuser.php:297
+#: actions/apitimelineuser.php:308
 msgid "Only the user can add to their own timeline."
 msgstr "ഉപയോക്താവിനു മാത്രമേ അദ്ദേഹത്തിന്റെ സ്വന്തം സമയരേഖ ചേർക്കാൻ കഴിയൂ."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:304
+#: actions/apitimelineuser.php:315
 msgid "Only accept AtomPub for Atom feeds."
 msgstr ""
 
 #. TRANS: Client error displayed attempting to post an empty API notice.
-#: actions/apitimelineuser.php:311
+#: actions/apitimelineuser.php:322
 msgid "Atom post must not be empty."
 msgstr ""
 
 #. TRANS: Client error displayed attempting to post an API that is not well-formed XML.
-#: actions/apitimelineuser.php:317
+#: actions/apitimelineuser.php:328
 msgid "Atom post must be well-formed XML."
 msgstr ""
 
 #. TRANS: Client error displayed when not using an Atom entry.
-#: actions/apitimelineuser.php:323 actions/atompubfavoritefeed.php:228
+#: actions/apitimelineuser.php:334 actions/atompubfavoritefeed.php:228
 #: actions/atompubmembershipfeed.php:230
 #: actions/atompubsubscriptionfeed.php:236
 msgid "Atom post must be an Atom entry."
 msgstr ""
 
 #. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
-#: actions/apitimelineuser.php:335
+#: actions/apitimelineuser.php:345
 msgid "Can only handle POST activities."
 msgstr ""
 
 #. TRANS: Client error displayed when using an unsupported activity object type.
 #. TRANS: %s is the unsupported activity object type.
-#: actions/apitimelineuser.php:346
+#: actions/apitimelineuser.php:356
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
 #. TRANS: %d is the notice ID (number).
-#: actions/apitimelineuser.php:380
+#: actions/apitimelineuser.php:390
 #, php-format
 msgid "No content for notice %d."
 msgstr "%d എന്ന അറിയിപ്പിനു ഉള്ളടക്കമില്ല"
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:408
+#. TRANS: %s is the notice URI.
+#: actions/apitimelineuser.php:419
 #, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "\"%s\" എന്ന യൂ.ആർ.ഐ.യിൽ അറിയിപ്പ് മുമ്പേ നിലവിലുണ്ട്."
@@ -1228,9 +1283,10 @@ msgstr "ഉപയോക്താവിനെ കണ്ടത്താനായ
 
 #. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
 #. TRANS: Client exception.
+#. TRANS: Client error displayed trying to subscribe to a non-existing profile.
 #: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
 #: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
-#: actions/subscribe.php:107
+#: actions/subscribe.php:110
 msgid "No such profile."
 msgstr ""
 
@@ -1366,7 +1422,7 @@ msgid "Not a member."
 msgstr "അംഗം അല്ല"
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
-#: actions/atompubshowmembership.php:151
+#: actions/atompubshowmembership.php:150
 msgid "Cannot delete someone else's membership."
 msgstr "മറ്റൊരാളുടെ അംഗത്വം മായ്ക്കാനാവില്ല."
 
@@ -1453,10 +1509,7 @@ msgid "Invalid size."
 msgstr "അസാധുവായ വലിപ്പം."
 
 #. TRANS: Title for avatar upload page.
-#. TRANS: Label for group avatar (dt). Text hidden by default.
-#. TRANS: Link description in user account settings menu.
-#: actions/avatarsettings.php:66 actions/showgroup.php:227
-#: lib/accountsettingsaction.php:113
+#: actions/avatarsettings.php:66 lib/settingsnav.php:82
 msgid "Avatar"
 msgstr "അവതാരം"
 
@@ -1469,9 +1522,11 @@ msgstr ""
 
 #. TRANS: Server error displayed in avatar upload page when no matching profile can be found for a user.
 #. TRANS: Server error displayed coming across a request from a user without a profile.
+#. TRANS: Server error displayed when trying to authorise a remote subscription request
+#. TRANS: while the user has no profile.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
 #: actions/grouplogo.php:184 actions/remotesubscribe.php:190
-#: actions/userauthorization.php:72 actions/userrss.php:108
+#: actions/userauthorization.php:75 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr ""
 
@@ -1526,10 +1581,10 @@ msgstr "വെട്ടിച്ചെറുതാക്കുക"
 msgid "No file uploaded."
 msgstr "പ്രമാണമൊന്നും അപ്‌ലോഡ് ചെയ്തിട്ടില്ല."
 
-#. TRANS: Avatar upload form unstruction after uploading a file.
+#. TRANS: Avatar upload form instruction after uploading a file.
 #: actions/avatarsettings.php:345
 #, fuzzy
-msgid "Pick a square area of the image to be your avatar"
+msgid "Pick a square area of the image to be your avatar."
 msgstr "ലോഗോ ആക്കാൻ ചിത്രത്തിന്റെ ഒരു സമചതുരത്തിലുള്ള ഭാഗം തിരഞ്ഞെടുക്കുക."
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
@@ -1555,7 +1610,7 @@ msgstr ""
 
 #. TRANS: Title for backup account page.
 #. TRANS: Option in profile settings to create a backup of the account of the currently logged in user.
-#: actions/backupaccount.php:61 actions/profilesettings.php:467
+#: actions/backupaccount.php:61 actions/profilesettings.php:468
 msgid "Backup account"
 msgstr "അംഗത്വത്തിന്റെ ബാക്ക്അപ് എടുക്കുക"
 
@@ -1587,8 +1642,7 @@ msgstr "ബാക്ക്അപ്"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
 #: actions/backupaccount.php:254
-#, fuzzy
-msgid "Backup your account"
+msgid "Backup your account."
 msgstr "താങ്കളുടെ അംഗത്വത്തിന്റെ ബാക്ക്അപ് എടുക്കുക."
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
@@ -1626,8 +1680,7 @@ msgstr "അല്ല"
 
 #. TRANS: Submit button title for 'No' when blocking a user.
 #: actions/block.php:158
-#, fuzzy
-msgid "Do not block this user"
+msgid "Do not block this user."
 msgstr "ഈ ഉപയോക്താവിനെ തടയരുത്."
 
 #. TRANS: Button label on the user block form.
@@ -1644,10 +1697,9 @@ msgid "Yes"
 msgstr "അതെ"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#. TRANS: Description of the form to block a user.
-#: actions/block.php:165 lib/blockform.php:79
-msgid "Block this user"
-msgstr "ഈ ഉപയോക്താവിനെ തടയുക"
+#: actions/block.php:165
+msgid "Block this user."
+msgstr "ഈ ഉപയോക്താവിനെ തടയുക."
 
 #. TRANS: Server error displayed when blocking a user fails.
 #: actions/block.php:189
@@ -1712,31 +1764,47 @@ msgstr "സ്ഥിരീകരണ കോഡ് കണ്ടെത്താന
 msgid "That confirmation code is not for you!"
 msgstr "ആ സ്ഥിരീകരണ കോഡ് താങ്കൾക്കുള്ളതല്ല!"
 
-#. TRANS: Server error for a unknow address type %s, which can be 'email', 'jabber', or 'sms'.
-#: actions/confirmaddress.php:92
-#, php-format
-msgid "Unrecognized address type %s."
+#. TRANS: Server error for an unknown address type, which can be 'email', 'sms', or the name of an IM network (such as 'xmpp' or 'aim')
+#: actions/confirmaddress.php:94
+#, fuzzy, php-format
+msgid "Unrecognized address type %s"
 msgstr "തിരിച്ചറിയാവാത്ത തരം വിലാസം %s."
 
 #. TRANS: Client error for an already confirmed email/jabber/sms address.
-#: actions/confirmaddress.php:97
+#: actions/confirmaddress.php:103 actions/confirmaddress.php:136
 msgid "That address has already been confirmed."
 msgstr "ആ വിലാസം മുമ്പേ തന്നെ സ്ഥിരീകരിക്കപ്പെട്ടതാണ്."
 
+#: actions/confirmaddress.php:121 actions/imsettings.php:444
+#: actions/userdesignsettings.php:306
+#, fuzzy
+msgid "Couldn't update user."
+msgstr "ഉപയോക്തൃ വിവരങ്ങൾ പുതുക്കാൻ കഴിഞ്ഞില്ല."
+
+#: actions/confirmaddress.php:144
+#, fuzzy
+msgid "Couldn't update user im preferences."
+msgstr "ഉപയോക്തൃ രേഖകൾ പുതുക്കാൻ കഴിഞ്ഞില്ല."
+
+#: actions/confirmaddress.php:156
+#, fuzzy
+msgid "Couldn't insert user im preferences."
+msgstr "സന്ദേശം ഉൾപ്പെടുത്താൻ കഴിഞ്ഞില്ല."
+
 #. TRANS: Server error displayed when an address confirmation code deletion from the
 #. TRANS: database fails in the contact address confirmation action.
-#: actions/confirmaddress.php:132
+#: actions/confirmaddress.php:169
 msgid "Could not delete address confirmation."
 msgstr "ഇമെയിൽ സ്ഥിരീകരണം നീക്കം ചെയ്യാൻ കഴിഞ്ഞില്ല."
 
 #. TRANS: Title for the contact address confirmation action.
-#: actions/confirmaddress.php:150
+#: actions/confirmaddress.php:185
 msgid "Confirm address"
 msgstr "വിലാസം സ്ഥിരീകരിക്കുക"
 
 #. TRANS: Success message for the contact address confirmation action.
 #. TRANS: %s can be 'email', 'jabber', or 'sms'.
-#: actions/confirmaddress.php:166
+#: actions/confirmaddress.php:200
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "താങ്കളുടെ അംഗത്വത്തിന് \"%s\" എന്ന വിലാസം സ്ഥിരീകരിച്ചിരിക്കുന്നു."
@@ -1750,6 +1818,7 @@ msgstr "സംഭാഷണം"
 #. TRANS: Label for user statistics.
 #: actions/conversation.php:149 lib/noticelist.php:87
 #: lib/profileaction.php:246 lib/searchgroupnav.php:82
+#: lib/threadednoticelist.php:66
 msgid "Notices"
 msgstr "അറിയിപ്പുകൾ"
 
@@ -1782,7 +1851,7 @@ msgstr "അംഗത്വം മായ്ച്ചിരിക്കുന്
 
 #. TRANS: Page title for page on which a user account can be deleted.
 #. TRANS: Option in profile settings to delete the account of the currently logged in user.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:475
+#: actions/deleteaccount.php:228 actions/profilesettings.php:476
 msgid "Delete account"
 msgstr "അംഗത്വം മായ്ക്കുക"
 
@@ -1806,7 +1875,7 @@ msgstr ""
 #. TRANS: Field label for delete account confirmation entry.
 #. TRANS: Field label for password reset form where the password has to be typed again.
 #: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:262 actions/register.php:440
+#: actions/recoverpassword.php:262 actions/register.php:419
 msgid "Confirm"
 msgstr "സ്ഥിരീകരിക്കുക"
 
@@ -1835,14 +1904,14 @@ msgstr ""
 #. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
 #: actions/deleteapplication.php:79 actions/editapplication.php:78
-#: actions/showapplication.php:94
+#: actions/showapplication.php:90
 msgid "You are not the owner of this application."
 msgstr ""
 
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
-#: actions/newapplication.php:112 actions/showapplication.php:118
-#: lib/action.php:1425
+#: actions/newapplication.php:112 actions/showapplication.php:113
+#: lib/action.php:1391
 msgid "There was a problem with your session token."
 msgstr "താങ്കളുടെ സെഷൻ ചീട്ടിൽ ഒരു പ്രശ്നമുണ്ടായിരുന്നു."
 
@@ -1863,13 +1932,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting an application.
 #: actions/deleteapplication.php:161
 #, fuzzy
-msgid "Do not delete this application"
+msgid "Do not delete this application."
 msgstr "ഈ അറിയിപ്പ് മായ്ക്കരുത്"
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
 #: actions/deleteapplication.php:167
 #, fuzzy
-msgid "Delete this application"
+msgid "Delete this application."
 msgstr "ഈ അറിയിപ്പ് മായ്ക്കുക"
 
 #. TRANS: Client error when trying to delete group while not logged in.
@@ -1920,14 +1989,12 @@ msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting a group.
 #: actions/deletegroup.php:224
-#, fuzzy
-msgid "Do not delete this group"
+msgid "Do not delete this group."
 msgstr "ഈ സംഘത്തെ മായ്ക്കരുത്."
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
 #: actions/deletegroup.php:231
-#, fuzzy
-msgid "Delete this group"
+msgid "Delete this group."
 msgstr "ഈ സംഘത്തെ മായ്ക്കുക."
 
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
@@ -1935,14 +2002,16 @@ msgstr "ഈ സംഘത്തെ മായ്ക്കുക."
 #. TRANS: Client error displayed when trying to mark a notice as favorite without being logged in.
 #. TRANS: Client error displayed trying to block a user from a group while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
+#. TRANS: Client error displayed trying to log out when not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
+#. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
 #. TRANS: Client error displayed when trying to change user options while not logged in.
 #: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
-#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:69
+#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:70
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
-#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
-#: actions/tagother.php:33 actions/unsubscribe.php:52
+#: actions/nudge.php:63 actions/pluginenable.php:97 actions/subedit.php:33
+#: actions/subscribe.php:98 actions/tagother.php:33 actions/unsubscribe.php:52
 #: lib/adminpanelaction.php:71 lib/profileformaction.php:63
 #: lib/settingsaction.php:72
 msgid "Not logged in."
@@ -1970,14 +2039,13 @@ msgstr "ഈ അറിയിപ്പ് ഒഴിവാക്കണമെന്
 
 #. TRANS: Submit button title for 'No' when deleting a notice.
 #: actions/deletenotice.php:159
-#, fuzzy
-msgid "Do not delete this notice"
+msgid "Do not delete this notice."
 msgstr "ഈ അറിയിപ്പ് മായ്ക്കരുത്."
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:166 lib/noticelist.php:673
-msgid "Delete this notice"
-msgstr "ഈ അറിയിപ്പ് മായ്ക്കുക"
+#: actions/deletenotice.php:166
+msgid "Delete this notice."
+msgstr "ഈ അറിയിപ്പ് മായ്ക്കുക."
 
 #. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
 #: actions/deleteuser.php:66
@@ -2011,19 +2079,16 @@ msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting a user.
 #: actions/deleteuser.php:158
-#, fuzzy
-msgid "Do not delete this user"
+msgid "Do not delete this user."
 msgstr "ഈ ഉപയോക്താവിനെ നീക്കം ചെയ്യരുത്."
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
-#. TRANS: Description of form for deleting a user.
-#: actions/deleteuser.php:165 lib/deleteuserform.php:75
-msgid "Delete this user"
-msgstr "ഈ ഉപയോക്താവിനെ നീക്കം ചെയ്യുക"
+#: actions/deleteuser.php:165
+msgid "Delete this user."
+msgstr "ഈ ഉപയോക്താവിനെ നീക്കം ചെയ്യുക."
 
 #. TRANS: Message used as title for design settings for the site.
-#. TRANS: Link description in user account settings menu.
-#: actions/designadminpanel.php:60 lib/accountsettingsaction.php:134
+#: actions/designadminpanel.php:60 lib/settingsnav.php:97
 msgid "Design"
 msgstr "രൂപകല്പന"
 
@@ -2092,8 +2157,7 @@ msgstr ""
 "ചെയ്യാവുന്നതാണ്."
 
 #. TRANS: Fieldset legend for theme background image.
-#. TRANS: Fieldset legend on profile design page.
-#: actions/designadminpanel.php:515 lib/designsettings.php:98
+#: actions/designadminpanel.php:515
 msgid "Change background image"
 msgstr "പശ്ചാത്തലചിത്രം മാറ്റുക"
 
@@ -2101,7 +2165,7 @@ msgstr "പശ്ചാത്തലചിത്രം മാറ്റുക"
 #. TRANS: Field label for background color selector.
 #. TRANS: Label on profile design page for setting a profile page background colour.
 #: actions/designadminpanel.php:525 actions/designadminpanel.php:609
-#: lib/designsettings.php:183
+#: lib/designform.php:238
 msgid "Background"
 msgstr "പശ്ചാത്തലം"
 
@@ -2128,13 +2192,13 @@ msgstr "രഹിതം"
 #. TRANS: Form guide for turning background image on or off on theme designer page.
 #. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
 #. TRANS: use of the uploaded profile image.
-#: actions/designadminpanel.php:577 lib/designsettings.php:159
+#: actions/designadminpanel.php:577 lib/designform.php:214
 msgid "Turn background image on or off."
 msgstr "പശ്ചാത്തലചിത്രം പ്രവർത്തന സജ്ജമാക്കുക അല്ലെങ്കിൽ രഹിതമാക്കുക."
 
 #. TRANS: Checkbox label to title background image on theme designer page.
 #. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-#: actions/designadminpanel.php:583 lib/designsettings.php:165
+#: actions/designadminpanel.php:583 lib/designform.php:220
 msgid "Tile background image"
 msgstr "പശ്ചാത്തലചിത്രം ആവർത്തിച്ചു ചേർക്കുക"
 
@@ -2145,25 +2209,25 @@ msgstr "നിറങ്ങൾ മാറ്റുക"
 
 #. TRANS: Field label for content color selector.
 #. TRANS: Label on profile design page for setting a profile page content colour.
-#: actions/designadminpanel.php:623 lib/designsettings.php:197
+#: actions/designadminpanel.php:623 lib/designform.php:252
 msgid "Content"
 msgstr "ഉള്ളടക്കം"
 
 #. TRANS: Field label for sidebar color selector.
 #. TRANS: Label on profile design page for setting a profile page sidebar colour.
-#: actions/designadminpanel.php:637 lib/designsettings.php:211
+#: actions/designadminpanel.php:637 lib/designform.php:266
 msgid "Sidebar"
 msgstr "പാർശ്വഭിത്തി"
 
 #. TRANS: Field label for text color selector.
 #. TRANS: Label on profile design page for setting a profile page text colour.
-#: actions/designadminpanel.php:651 lib/designsettings.php:225
+#: actions/designadminpanel.php:651 lib/designform.php:280
 msgid "Text"
 msgstr "എഴുത്ത്"
 
 #. TRANS: Field label for link color selector.
 #. TRANS: Label on profile design page for setting a profile page links colour.
-#: actions/designadminpanel.php:665 lib/designsettings.php:239
+#: actions/designadminpanel.php:665 lib/designform.php:294
 msgid "Links"
 msgstr "കണ്ണികൾ"
 
@@ -2184,22 +2248,19 @@ msgid "Use defaults"
 msgstr "സ്വതേയുള്ളവ ഉപയോഗിക്കുക"
 
 #. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: actions/designadminpanel.php:720 lib/designsettings.php:259
-msgid "Restore default designs"
-msgstr "സ്വതേയുള്ള രൂപകല്പനകൾ പുനഃസ്ഥാപിക്കുക"
+#: actions/designadminpanel.php:720
+msgid "Restore default designs."
+msgstr "സ്വതേയുള്ള രൂപകല്പനകൾ പുനഃസ്ഥാപിക്കുക."
 
 #. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: actions/designadminpanel.php:728 lib/designsettings.php:267
-msgid "Reset back to default"
-msgstr "മുമ്പ് സ്വതേയുണ്ടായിരുന്നതിലേയ്ക്ക് പുനഃസ്ഥാപിക്കുക"
+#: actions/designadminpanel.php:728
+msgid "Reset back to default."
+msgstr "മുമ്പ് സ്വതേയുണ്ടായിരുന്നതിലേയ്ക്ക് പുനഃസ്ഥാപിക്കുക."
 
 #. TRANS: Title for button for saving theme settings.
-#. TRANS: Title for button on profile design page to save settings.
-#: actions/designadminpanel.php:736 lib/designsettings.php:272
-msgid "Save design"
-msgstr "രൂപകല്പന സേവ്‌ ചെയ്യുക"
+#: actions/designadminpanel.php:736
+msgid "Save design."
+msgstr "രൂപകല്പന സേവ്‌ ചെയ്യുക."
 
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
 #: actions/disfavor.php:83
@@ -2230,7 +2291,7 @@ msgid "You must be logged in to edit an application."
 msgstr ""
 
 #. TRANS: Client error displayed trying to edit an application that does not exist.
-#: actions/editapplication.php:83 actions/showapplication.php:87
+#: actions/editapplication.php:83 actions/showapplication.php:83
 msgid "No such application."
 msgstr ""
 
@@ -2321,80 +2382,53 @@ msgstr "%s എന്ന സംഘത്തിൽ മാറ്റം വരുത
 msgid "You must be logged in to create a group."
 msgstr "ഒരു സംഘം സൃഷ്ടിക്കാൻ താങ്കൾ ലോഗിൻ ചെയ്തിരിക്കണം."
 
-#. TRANS: Client error displayed trying to edit a group while not being a group admin.
-#. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
-#. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
-#: actions/editgroup.php:110 actions/editgroup.php:176
-#: actions/groupdesignsettings.php:109 actions/grouplogo.php:111
-msgid "You must be an admin to edit the group."
-msgstr "സംഘത്തിൽ മാറ്റം വരുത്താൻ താങ്കൾ ഒരു കാര്യനിർവ്വാഹകനായിരിക്കണം."
-
 #. TRANS: Form instructions for group edit form.
 #: actions/editgroup.php:161
 msgid "Use this form to edit the group."
 msgstr "സംഘത്തിൽ മാറ്റം വരുത്താൻ ഈ ഫോം ഉപയോഗിക്കുക."
 
-#. TRANS: Group edit form validation error.
-#. TRANS: Group create form validation error.
-#. TRANS: %s is the invalid alias.
-#: actions/editgroup.php:241 actions/newgroup.php:188
-#, php-format
-msgid "Invalid alias: \"%s\""
-msgstr ""
-
-#. TRANS: Server error displayed when editing a group fails.
-#: actions/editgroup.php:274
-msgid "Could not update group."
-msgstr ""
-
-#. TRANS: Server error displayed when group aliases could not be added.
-#. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/editgroup.php:281 classes/User_group.php:540
-msgid "Could not create aliases."
-msgstr ""
-
 #. TRANS: Group edit form success message.
 #: actions/editgroup.php:301
 msgid "Options saved."
 msgstr "ഐച്ഛികങ്ങൾ സേവ് ചെയ്തിരിക്കുന്നു."
 
 #. TRANS: Title for e-mail settings.
-#: actions/emailsettings.php:59
+#: actions/emailsettings.php:60
 msgid "Email settings"
 msgstr "ഇമെയിൽ സജ്ജീകരണങ്ങൾ"
 
 #. TRANS: E-mail settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/emailsettings.php:73
+#: actions/emailsettings.php:74
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 msgstr "%%site.name%% സൈറ്റിൽ നിന്നുള്ള ഇമെയിൽ എപ്രകാരമാണ് ലഭിക്കേണ്ടതെന്ന് ക്രമീകരിക്കുക."
 
 #. TRANS: Form legend for e-mail settings form.
 #. TRANS: Field label for e-mail address input in e-mail settings form.
-#: actions/emailsettings.php:103 actions/emailsettings.php:129
+#: actions/emailsettings.php:104 actions/emailsettings.php:130
 msgid "Email address"
 msgstr "ഇമെയിൽ വിലാസം"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:109
+#: actions/emailsettings.php:110
 msgid "Current confirmed email address."
 msgstr "ഇപ്പോൾ സ്ഥിരീകരിക്കപ്പെട്ടിട്ടുള്ള ഇമെയിൽ വിലാസം."
 
 #. TRANS: Button label to remove a confirmed e-mail address.
 #. TRANS: Button label for removing a set sender e-mail address to post notices from.
-#. TRANS: Button label to remove a confirmed Instant Messaging address.
+#. TRANS: Button label to remove a confirmed IM address.
 #. TRANS: Button label to remove a confirmed SMS address.
 #. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
-#: actions/emailsettings.php:112 actions/emailsettings.php:179
-#: actions/imsettings.php:112 actions/smssettings.php:120
-#: actions/smssettings.php:176
+#: actions/emailsettings.php:113 actions/emailsettings.php:180
+#: actions/imsettings.php:119 actions/smssettings.php:119
+#: actions/smssettings.php:175
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "നീക്കം ചെയ്യുക"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:119
+#: actions/emailsettings.php:120
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -2407,44 +2441,44 @@ msgstr ""
 #. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
 #. TRANS: Any other domain may be owned by a legitimate person or
 #. TRANS: organization.
-#: actions/emailsettings.php:136
+#: actions/emailsettings.php:137
 msgid "Email address, like \"UserName@example.org\""
 msgstr "\"UserName@example.org\" പോലെയുള്ള ഇമെയിൽ വിലാസം"
 
 #. TRANS: Button label for adding an e-mail address in e-mail settings form.
-#. TRANS: Button label for adding an Instant Messaging address in Instant Messaging settings form.
+#. TRANS: Button label for adding an IM address in IM settings form.
 #. TRANS: Button label for adding a SMS phone number in SMS settings form.
-#: actions/emailsettings.php:140 actions/imsettings.php:147
-#: actions/smssettings.php:158
+#: actions/emailsettings.php:141 actions/imsettings.php:147
+#: actions/smssettings.php:157
 msgctxt "BUTTON"
 msgid "Add"
 msgstr "കൂട്ടിച്ചേർക്കുക"
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:148 actions/smssettings.php:167
+#: actions/emailsettings.php:149 actions/smssettings.php:166
 msgid "Incoming email"
 msgstr "ഇങ്ങോട്ടുള്ള ഇമെയിൽ"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:154
+#: actions/emailsettings.php:155
 msgid "I want to post notices by email."
 msgstr "എനിക്ക് അറിയിപ്പുകൾ ഇമെയിൽ വഴി പ്രസിദ്ധീകരിക്കണം."
 
 #. TRANS: Form instructions for incoming e-mail form in e-mail settings.
 #. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
-#: actions/emailsettings.php:176 actions/smssettings.php:174
+#: actions/emailsettings.php:177 actions/smssettings.php:173
 msgid "Send email to this address to post new notices."
 msgstr "പുതിയ അറിയിപ്പുകൾ പ്രസിദ്ധീകരിക്കാൻ ഈ വിലാസത്തിൽ ഇമെയിൽ അയയ്ക്കുക."
 
 #. TRANS: Instructions for incoming e-mail address input form, when an address has already been assigned.
 #. TRANS: Instructions for incoming SMS e-mail address input form.
-#: actions/emailsettings.php:185 actions/smssettings.php:182
+#: actions/emailsettings.php:186 actions/smssettings.php:181
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr "പ്രസിദ്ധീകരിക്കാനായി പുതിയൊരു ഇമെയിൽ വിലാസം സൃഷ്ടിക്കുക; പഴയതു റദ്ദാക്കപ്പെടും."
 
 #. TRANS: Instructions for incoming e-mail address input form.
-#: actions/emailsettings.php:189
+#: actions/emailsettings.php:190
 msgid ""
 "To send notices via email, we need to create a unique email address for you "
 "on this server:"
@@ -2454,88 +2488,88 @@ msgstr ""
 
 #. TRANS: Button label for adding an e-mail address to send notices from.
 #. TRANS: Button label for adding an SMS e-mail address to send notices from.
-#: actions/emailsettings.php:195 actions/smssettings.php:185
+#: actions/emailsettings.php:196 actions/smssettings.php:184
 msgctxt "BUTTON"
 msgid "New"
 msgstr "പുതിയത്"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:204
+#: actions/emailsettings.php:205
 msgid "Email preferences"
 msgstr "ഇമെയിൽ ക്രമീകരണങ്ങൾ"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:212
+#: actions/emailsettings.php:213
 msgid "Send me notices of new subscriptions through email."
 msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:218
+#: actions/emailsettings.php:219
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:225
+#: actions/emailsettings.php:226
 msgid "Send me email when someone sends me a private message."
 msgstr "ആരെങ്കിലും എനിക്കൊരു സ്വകാര്യ സന്ദേശമയച്ചാൽ എനിക്ക് ഇമെയിൽ അയയ്ക്കുക."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:231
+#: actions/emailsettings.php:232
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr "ആരെങ്കിലും എനിക്കൊരു \"@-reply\" അയച്ചാൽ എനിക്ക് ഇമെയിൽ അയയ്ക്കുക."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:237
+#: actions/emailsettings.php:238
 msgid "Allow friends to nudge me and send me an email."
 msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:243
+#: actions/emailsettings.php:244
 msgid "Publish a MicroID for my email address."
 msgstr ""
 
 #. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:361
+#: actions/emailsettings.php:362
 msgid "Email preferences saved."
 msgstr "ഇമെയിൽ ക്രമീകരണങ്ങൾ സേവ് ചെയ്തിരിക്കുന്നു."
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:380
+#: actions/emailsettings.php:381
 msgid "No email address."
 msgstr "ഇമെയിൽ വിലാസം ഇല്ല."
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:388
+#: actions/emailsettings.php:389
 #, fuzzy
 msgid "Cannot normalize that email address."
 msgstr "സാധുവായ ഇമെയിൽ വിലാസം അല്ല."
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:393 actions/register.php:212
+#: actions/emailsettings.php:394 actions/register.php:197
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "സാധുവായ ഇമെയിൽ വിലാസം അല്ല."
 
 #. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:397
+#: actions/emailsettings.php:398
 msgid "That is already your email address."
 msgstr "അതാണ് താങ്കളുടെ ഇമെയിൽ വിലാസം."
 
 #. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:401
+#: actions/emailsettings.php:402
 msgid "That email address already belongs to another user."
 msgstr "ആ ഇമെയിൽ വിലാസം മറ്റൊരു ഉപയോക്താവ് മുമ്പേ ഉപയോഗിക്കുന്നു."
 
 #. TRANS: Server error thrown on database error adding e-mail confirmation code.
 #. TRANS: Server error thrown on database error adding Instant Messaging confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:418 actions/imsettings.php:343
-#: actions/smssettings.php:365
+#: actions/emailsettings.php:419 actions/imsettings.php:362
+#: actions/smssettings.php:364
 msgid "Could not insert confirmation code."
 msgstr "സ്ഥിരീകരണ കോഡ് ഉൾപ്പെടുത്താൻ കഴിഞ്ഞില്ല."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:425
+#: actions/emailsettings.php:426
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
@@ -2547,57 +2581,60 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling Instant Messaging address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:445 actions/imsettings.php:377
-#: actions/smssettings.php:399
+#: actions/emailsettings.php:446 actions/imsettings.php:391
+#: actions/smssettings.php:398
 msgid "No pending confirmation to cancel."
 msgstr "റദ്ദാക്കാനായി സ്ഥിരീകരണങ്ങളൊന്നും അവശേഷിക്കുന്നില്ല."
 
 #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:450
+#: actions/emailsettings.php:451
 msgid "That is the wrong email address."
 msgstr "അത് തെറ്റായ ഇമെയിൽ വിലാസമാണ്."
 
 #. TRANS: Server error thrown on database error canceling e-mail address confirmation.
 #. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
-#: actions/emailsettings.php:459 actions/smssettings.php:413
+#: actions/emailsettings.php:460 actions/smssettings.php:412
 msgid "Could not delete email confirmation."
 msgstr "ഇമെയിൽ സ്ഥിരീകരണം നീക്കം ചെയ്യാൻ കഴിഞ്ഞില്ല."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:464
+#: actions/emailsettings.php:465
 msgid "Email confirmation cancelled."
 msgstr "ഇമെയിൽ സ്ഥിരീകരണം റദ്ദാക്കി."
 
 #. TRANS: Message given trying to remove an e-mail address that is not
 #. TRANS: registered for the active user.
-#: actions/emailsettings.php:483
+#: actions/emailsettings.php:484
 msgid "That is not your email address."
 msgstr "അത് താങ്കളുടെ ഇമെയിൽ വിലാസമല്ല."
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:504
+#: actions/emailsettings.php:505
 msgid "The email address was removed."
 msgstr "ഇമെയിൽ വിലാസം നീക്കം ചെയ്തിരിക്കുന്നു."
 
 #. TRANS: Form validation error displayed when trying to remove an incoming e-mail address while no address has been set.
-#: actions/emailsettings.php:518 actions/smssettings.php:555
+#: actions/emailsettings.php:519 actions/smssettings.php:554
 msgid "No incoming email address."
 msgstr "സ്വീകരിക്കാനുള്ള ഇമെയിൽ വിലാസം ഇല്ല."
 
 #. TRANS: Server error thrown on database error removing incoming e-mail address.
 #. TRANS: Server error thrown on database error adding incoming e-mail address.
-#: actions/emailsettings.php:530 actions/emailsettings.php:554
-#: actions/smssettings.php:565 actions/smssettings.php:588
+#. TRANS: Server error displayed when the user could not be updated in SMS settings.
+#: actions/emailsettings.php:531 actions/emailsettings.php:555
+#: actions/smssettings.php:565 actions/smssettings.php:590
 msgid "Could not update user record."
 msgstr "ഉപയോക്തൃ രേഖകൾ പുതുക്കാൻ കഴിഞ്ഞില്ല."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:534 actions/smssettings.php:568
+#. TRANS: Confirmation text after updating SMS settings.
+#: actions/emailsettings.php:535 actions/smssettings.php:569
 msgid "Incoming email address removed."
 msgstr "സ്വീകരിക്കാനുള്ള ഇമെയിൽ വിലാസം നീക്കം ചെയ്തിരിക്കുന്നു."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:558 actions/smssettings.php:591
+#. TRANS: Confirmation text after updating SMS settings.
+#: actions/emailsettings.php:559 actions/smssettings.php:594
 msgid "New incoming email address added."
 msgstr "സ്വീകരിക്കാനുള്ള പുതിയ ഇമെയിൽ വിലാസം കൂട്ടിച്ചേർത്തിരിക്കുന്നു."
 
@@ -2608,8 +2645,7 @@ msgstr "ഈ അറിയിപ്പ് മുമ്പേ തന്നെ പ
 
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
 #: actions/favor.php:95
-#, fuzzy
-msgid "Disfavor favorite"
+msgid "Disfavor favorite."
 msgstr "പ്രിയങ്കരമാണ് എന്നത് നീക്കം ചെയ്യുക."
 
 #. TRANS: Page title for first page of favorited notices.
@@ -2658,9 +2694,8 @@ msgstr ""
 #. TRANS: %s is a user's nickname.
 #. TRANS: Title for first page of favourite notices of a user.
 #. TRANS: %s is the user for whom the favourite notices are displayed.
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing own favourited notices.
 #: actions/favoritesrss.php:111 actions/showfavorites.php:76
-#: lib/personalgroupnav.php:122
+#: lib/personalgroupnav.php:110
 #, php-format
 msgid "%s's favorite notices"
 msgstr "%s എന്ന ഉപയോക്താവിനു പ്രിയങ്കരങ്ങളായ അറിയിപ്പുകൾ"
@@ -2846,14 +2881,12 @@ msgstr ""
 
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
 #: actions/groupblock.php:191
-#, fuzzy
-msgid "Do not block this user from this group"
+msgid "Do not block this user from this group."
 msgstr "ഈ സംഘത്തിൽ നിന്നും ഈ ഉപയോക്താവിനെ തടയരുത്."
 
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
 #: actions/groupblock.php:198
-#, fuzzy
-msgid "Block this user from this group"
+msgid "Block this user from this group."
 msgstr "ഈ സംഘത്തിൽ നിന്നും ഈ ഉപയോക്താവിനെ തടയുക."
 
 #. TRANS: Server error displayed when trying to block a user from a group fails because of an application error.
@@ -2862,6 +2895,7 @@ msgid "Database error blocking user from group."
 msgstr "സംഘത്തിൽ നിന്നും ഉപയോക്താവിനെ തടയുമ്പോൾ ഡേറ്റാബേസ് പിഴവുണ്ടായി."
 
 #. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
+#. TRANS: Client error displayed trying to find a user by ID without providing an ID.
 #: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr "ഐ.ഡി. ഇല്ല."
@@ -2889,7 +2923,7 @@ msgid "Unable to update your design settings."
 msgstr "താങ്കളുടെ രൂപകല്പനാ സജ്ജീകരണങ്ങൾ പുതുക്കാനായില്ല."
 
 #. TRANS: Form text to confirm saved group design settings.
-#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:222
+#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:239
 msgid "Design preferences saved."
 msgstr "രൂപകല്പനാ ക്രമീകരണങ്ങൾ സേവ് ചെയ്തിരിക്കുന്നു."
 
@@ -2954,7 +2988,7 @@ msgid "A list of the users in this group."
 msgstr "ഈ സംഘത്തിലെ ഉപയോക്താക്കളുടെ പട്ടിക."
 
 #. TRANS: Indicator in group members list that this user is a group administrator.
-#: actions/groupmembers.php:190
+#: actions/groupmembers.php:190 lib/action.php:581
 msgid "Admin"
 msgstr "കാര്യനിർവാഹകൻ"
 
@@ -3047,8 +3081,10 @@ msgid "Group search"
 msgstr "സംഘത്തിൽ തിരയുക"
 
 #. TRANS: Text on page where groups can be searched if no results were found for a query.
-#: actions/groupsearch.php:82 actions/noticesearch.php:117
-#: actions/peoplesearch.php:83
+#. TRANS: Text for notice search results is the query had no results.
+#. TRANS: Message on the "People search" page where a query has no results.
+#: actions/groupsearch.php:82 actions/noticesearch.php:122
+#: actions/peoplesearch.php:87
 msgid "No results."
 msgstr "ഫലങ്ങൾ ഒന്നുമില്ല"
 
@@ -3085,160 +3121,167 @@ msgid "User is not blocked from group."
 msgstr "ഉപയോക്താവ് സംഘത്തിൽ നിന്നും തടയപ്പെട്ടിട്ടില്ല."
 
 #. TRANS: Server error displayed when unblocking a user from a group fails because of an unknown error.
+#. TRANS: Server error displayed when removing a user block.
 #: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "തടയൽ നീക്കുന്നതിൽ പിഴവുണ്ടായി."
 
 #. TRANS: Title for Instant Messaging settings.
-#: actions/imsettings.php:58
+#: actions/imsettings.php:56
 msgid "IM settings"
 msgstr "ഐ.എം. സജ്ജീകരണങ്ങൾ"
 
 #. 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.
-#: actions/imsettings.php:71
-#, php-format
+#: actions/imsettings.php:69
+#, fuzzy, php-format
 msgid ""
-"You can send and receive notices through Jabber/Google Talk [instant "
-"messages](%%doc.im%%). Configure your address and settings below."
+"You can send and receive notices through instant messaging [instant messages]"
+"(%%doc.im%%). Configure your addresses and settings below."
 msgstr ""
 "ജാബ്ബർ/ജിറ്റോക്  [തത്സമയ സന്ദേശങ്ങൾ - instant messages] ഉപയോഗിച്ച് താങ്കൾക്ക് അറിയിപ്പുകൾ "
 "അയയ്ക്കാനും സ്വീകരിക്കാനും കഴിയുന്നതാണ് (%%doc.im%%). താങ്കളുടെ വിലാസവും സജ്ജീകരണങ്ങളും "
 "താഴെ ക്രമീകരിക്കുക."
 
-#. TRANS: Message given in the Instant Messaging settings if XMPP is not enabled on the site.
+#. TRANS: Message given in the IM settings if IM is not enabled on the site.
 #: actions/imsettings.php:90
 msgid "IM is not available."
 msgstr "ഐ.എം. ലഭ്യമല്ല."
 
-#. TRANS: Form legend for Instant Messaging settings form.
-#. TRANS: Field label for Instant Messaging address input in Instant Messaging settings form.
-#: actions/imsettings.php:102 actions/imsettings.php:132
-msgid "IM address"
-msgstr "ഐ.എം. വിലാസം"
+#: actions/imsettings.php:116
+#, fuzzy, php-format
+msgid "Current confirmed %s address."
+msgstr "ഇപ്പോൾ സ്ഥിരീകരിക്കപ്പെട്ടിട്ടുള്ള ഇമെയിൽ വിലാസം."
 
-#: actions/imsettings.php:109
-msgid "Current confirmed Jabber/Google Talk address."
-msgstr "ഇപ്പോഴത്തെ സ്ഥിരീകരിക്കപ്പെട്ട ജാബ്ബർ/ജിറ്റോക് വിലാസം."
-
-#. TRANS: Form note in Instant Messaging settings form.
-#. TRANS: %s is the Instant Messaging address set for the site.
-#: actions/imsettings.php:120
-#, php-format
+#. TRANS: Form note in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:128
+#, fuzzy, php-format
 msgid ""
-"Awaiting confirmation on this address. Check your Jabber/Google Talk account "
-"for a message with further instructions. (Did you add %s to your buddy list?)"
+"Awaiting confirmation on this address. Check your %s account for a message "
+"with further instructions. (Did you add %s to your buddy list?)"
 msgstr ""
 "ഈ വിലാസം സ്ഥിരീകരണത്തിന് അവശേഷിക്കുന്നു. കൂടുതൽ നിർദ്ദേശങ്ങൾക്ക് താങ്കളുടെ ജാബ്ബർ/ജിറ്റോക് "
 "അംഗത്വത്തിലുള്ള സന്ദേശം പരിശോധിക്കുക. (%s ഒരു സുഹൃത്തായി താങ്കളുടെ പട്ടികയിലുണ്ടോ?)"
 
-#. TRANS: IM address input field instructions in Instant Messaging settings form.
-#. TRANS: %s is the Instant Messaging address set for the site.
-#. TRANS: Do not translate "example.org". It is one of the domain names reserved for use in examples by
-#. TRANS: http://www.rfc-editor.org/rfc/rfc2606.txt. Any other domain may be owned by a legitimate
-#. TRANS: person or organization.
-#: actions/imsettings.php:139
-#, php-format
-msgid ""
-"Jabber or Google Talk address, like \"UserName@example.org\". First, make "
-"sure to add %s to your buddy list in your IM client or on Google Talk."
-msgstr ""
-"ജാബ്ബർ അല്ലെങ്കിൽ ജിറ്റോക് വിലാസം, \"UserName@example.org\" എന്ന രീതിയിൽ. ആദ്യം %s "
-"താങ്കളുടെ ഐ.എം. ക്ലയന്റിലോ ജിറ്റോക്കിലോ സുഹൃത്തുക്കളുടെ പട്ടികയിലുണ്ടെന്നുറപ്പാക്കുക."
+#: actions/imsettings.php:140
+msgid "IM address"
+msgstr "ഐ.എം. വിലാസം"
 
-#. TRANS: Form legend for Instant Messaging preferences form.
-#: actions/imsettings.php:154
-msgid "IM preferences"
+#: actions/imsettings.php:142
+#, php-format
+msgid "%s screenname."
+msgstr ""
+
+#. TRANS: Header for IM preferences form.
+#: actions/imsettings.php:163
+#, fuzzy
+msgid "IM Preferences"
 msgstr "ഐ.എം. ക്രമീകരണങ്ങൾ"
 
-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:159
-msgid "Send me notices through Jabber/Google Talk."
-msgstr "ജാബ്ബർ/ജിറ്റോക് വഴി എനിക്ക് അറിയിപ്പുകൾ അയയ്ക്കുക."
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:174
+#, fuzzy
+msgid "Send me notices"
+msgstr "അറിയിപ്പ് അയയ്ക്കുക"
 
-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:165
-msgid "Post a notice when my Jabber/Google Talk status changes."
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:176
+#, fuzzy
+msgid "Post a notice when my status changes."
 msgstr "എന്റെ ജാബ്ബർ/ജിറ്റോക് സ്ഥിതിവിവരം മാറുമ്പോൾ അറിയിപ്പുകൾ പ്രസിദ്ധീകരിക്കുക."
 
-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:171
-msgid ""
-"Send me replies through Jabber/Google Talk from people I'm not subscribed to."
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:178
+msgid "Send me replies from people I'm not subscribed to."
 msgstr ""
 
-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:178
-#, fuzzy
-msgid "Publish a MicroID for my Jabber/Google Talk address."
-msgstr "ഇപ്പോഴത്തെ സ്ഥിരീകരിക്കപ്പെട്ട ജാബ്ബർ/ജിറ്റോക് വിലാസം"
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:181
+msgid "Publish a MicroID"
+msgstr ""
 
-#. TRANS: Confirmation message for successful Instant Messaging preferences save.
-#: actions/imsettings.php:283 actions/othersettings.php:192
+#. TRANS: Server error thrown on database error updating IM preferences.
+#: actions/imsettings.php:291
+#, fuzzy
+msgid "Couldn't update IM preferences."
+msgstr "ഉപയോക്തൃ വിവരങ്ങൾ പുതുക്കാൻ കഴിഞ്ഞില്ല."
+
+#. TRANS: Confirmation message for successful IM preferences save.
+#. TRANS: Confirmation message after saving preferences.
+#: actions/imsettings.php:298 actions/urlsettings.php:244
 msgid "Preferences saved."
 msgstr "ക്രമീകരണങ്ങൾ സേവ് ചെയ്തു."
 
-#. TRANS: Message given saving Instant Messaging address without having provided one.
-#: actions/imsettings.php:304
-msgid "No Jabber ID."
-msgstr "ജാബ്ബർ ഐ.ഡി. അല്ല."
-
-#. TRANS: Message given saving Instant Messaging address that cannot be normalised.
-#: actions/imsettings.php:312
+#. TRANS: Message given saving IM address without having provided one.
+#: actions/imsettings.php:320
 #, fuzzy
-msgid "Cannot normalize that Jabber ID."
+msgid "No screenname."
+msgstr "അങ്ങിനെ വിളിപ്പേര് ഇല്ല."
+
+#: actions/imsettings.php:325
+#, fuzzy
+msgid "No transport."
+msgstr "അറിയിപ്പ് ഇല്ല."
+
+#. TRANS: Message given saving IM address that cannot be normalised.
+#: actions/imsettings.php:333
+#, fuzzy
+msgid "Cannot normalize that screenname"
 msgstr "സാധുവായ ഇമെയിൽ വിലാസം അല്ല."
 
-#. TRANS: Message given saving Instant Messaging address that not valid.
-#: actions/imsettings.php:317
-msgid "Not a valid Jabber ID."
-msgstr "അസാധുവായ ജാബർ ഐ.ഡി.."
+#. TRANS: Message given saving IM address that not valid.
+#: actions/imsettings.php:340
+#, fuzzy
+msgid "Not a valid screenname"
+msgstr "സാധുവായ വിളിപ്പേര് അല്ല."
 
-#. TRANS: Message given saving Instant Messaging address that is already set.
-#: actions/imsettings.php:321
-msgid "That is already your Jabber ID."
-msgstr "അത് ഇപ്പോൾ തന്നെ താങ്കളുടെ ജാബ്ബർ ഐ.ഡി. ആണ്."
-
-#. TRANS: Message given saving Instant Messaging address that is already set for another user.
-#: actions/imsettings.php:325
-msgid "Jabber ID already belongs to another user."
+#. TRANS: Message given saving IM address that is already set for another user.
+#: actions/imsettings.php:344
+#, fuzzy
+msgid "Screenname already belongs to another user."
 msgstr "ജാബ്ബർ ഐ.ഡി. മുമ്പേ തന്നെ മറ്റൊരു ഉപയോക്താവിന്റേതാണ്."
 
-#. TRANS: Message given saving valid Instant Messaging address that is to be confirmed.
-#. TRANS: %s is the Instant Messaging address set for the site.
-#: actions/imsettings.php:353
-#, php-format
-msgid ""
-"A confirmation code was sent to the IM address you added. You must approve %"
-"s for sending messages to you."
+#. TRANS: Message given saving valid IM address that is to be confirmed.
+#: actions/imsettings.php:369
+#, fuzzy
+msgid "A confirmation code was sent to the IM address you added."
 msgstr ""
 "താങ്കൾ ചേർത്തിട്ടുള്ള ഐ.എം. വിലാസത്തിലേയ്ക്ക് ഒരു സ്ഥിരീകരണ കോഡ് അയച്ചിട്ടുണ്ട്. താങ്കൾക്ക് "
 "സന്ദേശങ്ങൾ അയയ്ക്കാൻ താങ്കൾ %s അയയ്ക്കേണ്ടതാണ്."
 
-#. TRANS: Message given canceling Instant Messaging address confirmation for the wrong IM address.
-#: actions/imsettings.php:382
+#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#: actions/imsettings.php:396
 msgid "That is the wrong IM address."
 msgstr "ഇത് തെറ്റായ ഐ.എം. വിലാസമാണ്."
 
-#. TRANS: Server error thrown on database error canceling Instant Messaging address confirmation.
-#: actions/imsettings.php:391
-msgid "Could not delete IM confirmation."
+#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#: actions/imsettings.php:405
+#, fuzzy
+msgid "Couldn't delete confirmation."
 msgstr "ഐ.എം. സ്ഥിരീകരണം നീക്കം ചെയ്യാൻ കഴിഞ്ഞില്ല."
 
-#. TRANS: Message given after successfully canceling Instant Messaging address confirmation.
-#: actions/imsettings.php:396
+#. TRANS: Message given after successfully canceling IM address confirmation.
+#: actions/imsettings.php:410
 msgid "IM confirmation cancelled."
 msgstr "ഐ.എം. സ്ഥിരീകരണം റദ്ദാക്കി."
 
-#. TRANS: Message given trying to remove an Instant Messaging address that is not
+#. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.
-#: actions/imsettings.php:417
-msgid "That is not your Jabber ID."
-msgstr "അത് താങ്കളുടെ ജാബ്ബർ ഐ.ഡി. അല്ല."
+#: actions/imsettings.php:434
+#, fuzzy
+msgid "That is not your screenname."
+msgstr "അത് താങ്കളുടെ ഫോൺ നമ്പരല്ല."
+
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#: actions/imsettings.php:443
+#, fuzzy
+msgid "Couldn't update user im prefs."
+msgstr "ഉപയോക്തൃ രേഖകൾ പുതുക്കാൻ കഴിഞ്ഞില്ല."
 
 #. TRANS: Message given after successfully removing a registered Instant Messaging address.
-#: actions/imsettings.php:440
+#: actions/imsettings.php:451
 msgid "The IM address was removed."
 msgstr "ഐ.എം. വിലാസം നീക്കം ചെയ്തിരിക്കുന്നു."
 
@@ -3420,7 +3463,7 @@ msgid "You must be logged in to join a group."
 msgstr "ഒരു സംഘത്തിൽ ചേരാൻ താങ്കൾ ലോഗിൻ ചെയ്തിരിക്കേണ്ടതാണ്."
 
 #. TRANS: Title for join group page after joining.
-#: actions/joingroup.php:147
+#: actions/joingroup.php:148
 #, php-format
 msgctxt "TITLE"
 msgid "%1$s joined group %2$s"
@@ -3548,7 +3591,7 @@ msgstr "അനുമതിയോടൊപ്പം പ്രദർശിപ്
 #. TRANS: Submit button title.
 #: actions/licenseadminpanel.php:311 actions/sessionsadminpanel.php:199
 #: actions/siteadminpanel.php:292 actions/snapshotadminpanel.php:245
-#: actions/tagother.php:154 lib/applicationeditform.php:357
+#: actions/tagother.php:133 lib/applicationeditform.php:357
 msgid "Save"
 msgstr "സേവ് ചെയ്യുക"
 
@@ -3556,39 +3599,41 @@ msgstr "സേവ് ചെയ്യുക"
 msgid "Save license settings"
 msgstr "അനുമതി സജ്ജീകരണങ്ങൾ സേവ് ചെയ്യുക"
 
-#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
+#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
+#: actions/login.php:97 actions/otp.php:62 actions/register.php:130
 msgid "Already logged in."
 msgstr "മുമ്പേ തന്നെ ലോഗിൻ ചെയ്തിട്ടുണ്ട്."
 
-#: actions/login.php:148
+#: actions/login.php:125
 msgid "Incorrect username or password."
 msgstr "ഉപയോക്തൃനാമമോ രഹസ്യവാക്കോ തെറ്റാണ്."
 
-#: actions/login.php:154 actions/otp.php:120
+#. TRANS: Server error displayed when a user object could not be created trying to login using "one time password login".
+#: actions/login.php:131 actions/otp.php:127
 msgid "Error setting user. You are probably not authorized."
 msgstr "ഉപയോക്തൃ സജ്ജീകരണത്തിൽ പിഴവുണ്ടായി. താങ്കൾക്ക് മിക്കവാറും അനുമതിയുണ്ടാവില്ല."
 
-#: actions/login.php:210 actions/login.php:263
+#: actions/login.php:185 actions/login.php:236 lib/action.php:598
 msgid "Login"
 msgstr "പ്രവേശിക്കുക"
 
-#: actions/login.php:249
+#: actions/login.php:222
 msgid "Login to site"
 msgstr "സൈറ്റിലേക്ക് പ്രവേശിക്കുക"
 
-#: actions/login.php:258 actions/register.php:490
+#: actions/login.php:231 actions/register.php:469
 msgid "Remember me"
 msgstr "എന്നെ ഓർത്തുവെയ്ക്കുക"
 
-#: actions/login.php:259 actions/register.php:492
+#: actions/login.php:232 actions/register.php:471
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "ഭാവിയിൽ സ്വയം ലോഗിൻ ചെയ്യുക; പങ്ക് വെച്ച് ഉപയോഗിക്കുന്ന കമ്പ്യൂട്ടറുകളിൽ പാടില്ല!"
 
-#: actions/login.php:269
+#: actions/login.php:241
 msgid "Lost or forgotten password?"
 msgstr "രഹസ്യവാക്ക് നഷ്ടപ്പെടുകയോ മറക്കുകയോ ചെയ്തോ?"
 
-#: actions/login.php:288
+#: actions/login.php:259
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -3596,11 +3641,11 @@ msgstr ""
 "സുരക്ഷാകാരണങ്ങളാൽ, താങ്കളുടെ ഉപയോക്തൃനാമവും രഹസ്യവാക്കും സജ്ജീകരണങ്ങളിൽ മാറ്റം വരുത്തുന്നതിനു "
 "മുമ്പ് ഒരു പ്രാവശ്യം നൽകേണ്ടതാണ്."
 
-#: actions/login.php:292
+#: actions/login.php:263
 msgid "Login with your username and password."
 msgstr "താങ്കളുടെ ഉപയോക്തൃനാമവും രഹസ്യവാക്കും ഉപയോഗിച്ച് ലോഗിൻ ചെയ്യുക."
 
-#: actions/login.php:295
+#: actions/login.php:266
 #, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -3723,23 +3768,30 @@ msgstr "പുതിയ അറിയിപ്പ്"
 msgid "Notice posted"
 msgstr "അറിയിപ്പ് പ്രസിദ്ധീകരിച്ചിരിക്കുന്നു"
 
-#: actions/noticesearch.php:68
+#. TRANS: Instructions for Notice search page.
+#. TRANS: %%site.name%% is the name of the StatusNet site.
+#: actions/noticesearch.php:69
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
 "by spaces; they must be 3 characters or more."
 msgstr ""
 
-#: actions/noticesearch.php:78
+#. TRANS: Title of the page where users can search for notices.
+#: actions/noticesearch.php:80
 msgid "Text search"
 msgstr "എഴുത്തുകളിലെ തിരച്ചിൽ"
 
-#: actions/noticesearch.php:91
+#. TRANS: Test in RSS notice search.
+#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
+#: actions/noticesearch.php:95
 #, php-format
 msgid "Search results for \"%1$s\" on %2$s"
 msgstr ""
 
-#: actions/noticesearch.php:121
+#. TRANS: Text for logged in users making a query for notices without results.
+#. TRANS: This message contains a Markdown link.
+#: actions/noticesearch.php:128
 #, php-format
 msgid ""
 "Be the first to [post on this topic](%%%%action.newnotice%%%%?"
@@ -3747,7 +3799,9 @@ msgid ""
 msgstr ""
 "[ഈ വിഷയത്തിൽ കുറിപ്പിടുന്ന](%%%%action.newnotice%%%%?status_textarea=%s) ആദ്യയാളാകൂ!"
 
-#: actions/noticesearch.php:124
+#. TRANS: Text for not logged in users making a query for notices without results.
+#. TRANS: This message contains Markdown links.
+#: actions/noticesearch.php:133
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and be the first to "
@@ -3756,14 +3810,17 @@ msgstr ""
 "എന്തുകൊണ്ട് [അംഗത്വമെടുക്കുകയും](%%%%action.register%%%%) [ഈ വിഷയത്തിൽ കുറിപ്പിടുന്ന](%%%%"
 "action.newnotice%%%%?status_textarea=%s) ആദ്യയാളാകുകയും ചെയ്തുകൂട!"
 
-#: actions/noticesearchrss.php:96
+#. TRANS: RSS notice search feed title. %s is the query.
+#: actions/noticesearchrss.php:95
 #, php-format
 msgid "Updates with \"%s\""
 msgstr ""
 
-#: actions/noticesearchrss.php:98
+#. TRANS: RSS notice search feed description.
+#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
+#: actions/noticesearchrss.php:99
 #, fuzzy, php-format
-msgid "Updates matching search term \"%1$s\" on %2$s!"
+msgid "Updates matching search term \"%1$s\" on %2$s."
 msgstr "%2$s സൈറ്റിലെ %1$s സംഘാങ്ങളുടെ പുതുക്കലുകൾ!"
 
 #: actions/nudge.php:85
@@ -3781,51 +3838,51 @@ msgid "Nudge sent!"
 msgstr ""
 
 #. TRANS: Message displayed to an anonymous user trying to view OAuth application list.
-#: actions/oauthappssettings.php:60
+#: actions/oauthappssettings.php:57
 msgid "You must be logged in to list your applications."
 msgstr ""
 
 #. TRANS: Page title for OAuth applications
-#: actions/oauthappssettings.php:76
+#: actions/oauthappssettings.php:73
 msgid "OAuth applications"
 msgstr ""
 
 #. TRANS: Page instructions for OAuth applications
-#: actions/oauthappssettings.php:88
+#: actions/oauthappssettings.php:85
 msgid "Applications you have registered"
 msgstr ""
 
 #. TRANS: Empty list message on page with OAuth applications.
-#: actions/oauthappssettings.php:141
+#: actions/oauthappssettings.php:138
 #, php-format
 msgid "You have not registered any applications yet."
 msgstr ""
 
 #. TRANS: Title for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:71
+#: actions/oauthconnectionssettings.php:69
 msgid "Connected applications"
 msgstr ""
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:83
+#: actions/oauthconnectionssettings.php:80
 msgid "The following connections exist for your account."
 msgstr ""
 
 #. TRANS: Client error when trying to revoke access for an application while not being a user of it.
-#: actions/oauthconnectionssettings.php:168
+#: actions/oauthconnectionssettings.php:165
 msgid "You are not a user of that application."
 msgstr ""
 
 #. TRANS: Client error when revoking access has failed for some reason.
 #. TRANS: %s is the application ID revoking access failed for.
-#: actions/oauthconnectionssettings.php:183
+#: actions/oauthconnectionssettings.php:180
 #, php-format
 msgid "Unable to revoke access for application: %s."
 msgstr ""
 
 #. TRANS: Success message after revoking access for an application.
 #. TRANS: %1$s is the application name, %2$s is the first part of the user token.
-#: actions/oauthconnectionssettings.php:202
+#: actions/oauthconnectionssettings.php:199
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -3833,20 +3890,30 @@ msgid ""
 msgstr ""
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:213
+#: actions/oauthconnectionssettings.php:210
 msgid "You have not authorized any applications to use your account."
 msgstr ""
 
 #. TRANS: Note for developers in the OAuth connection settings form.
 #. TRANS: This message contains a Markdown link. Do not separate "](".
 #. TRANS: %s is the URL to the OAuth settings.
-#: actions/oauthconnectionssettings.php:233
+#: actions/oauthconnectionssettings.php:230
 #, php-format
 msgid ""
 "Are you a developer? [Register an OAuth client application](%s) to use with "
 "this instance of StatusNet."
 msgstr ""
 
+#: actions/oembed.php:64
+#, fuzzy, php-format
+msgid "\"%s\" not found."
+msgstr "ഉപയോക്താവിനെ കണ്ടത്താനായില്ല."
+
+#: actions/oembed.php:76
+#, php-format
+msgid "Notice %s not found."
+msgstr "%s എന്ന അറിയിപ്പ് കണ്ടെത്താനായില്ല."
+
 #: actions/oembed.php:80 actions/shownotice.php:100
 msgid "Notice has no profile."
 msgstr ""
@@ -3856,6 +3923,16 @@ msgstr ""
 msgid "%1$s's status on %2$s"
 msgstr "%2$s പദ്ധതിയിൽ %1$s എന്ന ഉപയോക്താവിന്റെ സ്ഥിതിവിവരം"
 
+#: actions/oembed.php:95
+#, fuzzy, php-format
+msgid "Attachment %s not found."
+msgstr "സ്വീകർത്താവായ ഉപയോക്താവിനെ കണ്ടെത്താനായില്ല."
+
+#: actions/oembed.php:136
+#, php-format
+msgid "\"%s\" not supported for oembed requests."
+msgstr ""
+
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
 #: actions/oembed.php:168
 #, php-format
@@ -3869,93 +3946,60 @@ msgid "Only %s URLs over plain HTTP please."
 msgstr ""
 
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1205
-#: lib/apiaction.php:1232 lib/apiaction.php:1367
+#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1207
+#: lib/apiaction.php:1234 lib/apiaction.php:1369
 msgid "Not a supported data format."
 msgstr "പിന്തുണയില്ലാത്ത തരം ഡേറ്റ."
 
+#. TRANS: ShortName in the OpenSearch interface when trying to find users.
 #: actions/opensearch.php:64
 msgid "People Search"
 msgstr "ഉപയോക്താക്കളെ തിരയുക"
 
-#: actions/opensearch.php:67
+#: actions/opensearch.php:68
 msgid "Notice Search"
 msgstr "അറിയിപ്പുകൾ തിരയുക"
 
-#: actions/othersettings.php:59
-msgid "Other settings"
-msgstr "മറ്റ് സജ്ജീകരണങ്ങൾ"
-
-#. TRANS: Instructions for tab "Other" in user profile settings.
-#: actions/othersettings.php:71
-msgid "Manage various other options."
-msgstr "മറ്റ് നിരവധി ഐച്ഛികങ്ങൾ കൈകാര്യം ചെയ്യുക."
-
-#. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
-#. TRANS: user's profile settings. Use of "free" is as in "open", indicating that the
-#. TRANS: information on the shortener site is freely distributable.
-#. TRANS: This message has one space at the beginning. Use your language's word separator
-#. TRANS: here if it has one (most likely a single space).
-#: actions/othersettings.php:113
-msgid " (free service)"
-msgstr " (സൗജന്യ സേവനം)"
-
-#. TRANS: Label for dropdown with URL shortener services.
-#: actions/othersettings.php:122
-msgid "Shorten URLs with"
-msgstr "യൂ.ആർ.എൽ. ചെറുതാക്കാൻ ഇതുപയോഗിക്കുക"
-
-#. TRANS: Tooltip for for dropdown with URL shortener services.
-#: actions/othersettings.php:124
-msgid "Automatic shortening service to use."
-msgstr "ഉപയോഗിക്കാവുന്ന സ്വയംപ്രവർത്തിത ചെറുതാക്കൽ സേവനം."
-
-#. TRANS: Label for checkbox.
-#: actions/othersettings.php:130
-msgid "View profile designs"
-msgstr ""
-
-#. TRANS: Tooltip for checkbox.
-#: actions/othersettings.php:132
-msgid "Show or hide profile designs."
-msgstr ""
-
-#. TRANS: Form validation error for form "Other settings" in user profile.
-#: actions/othersettings.php:164
-msgid "URL shortening service is too long (maximum 50 characters)."
-msgstr "യൂ.ആർ.എൽ. ചെറുതാക്കൽ സേവനം വളരെ വലുതാണ് (പരമാവധി 50 അക്ഷരങ്ങൾ)."
-
-#: actions/otp.php:69
+#. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
+#: actions/otp.php:70
 msgid "No user ID specified."
 msgstr "ഉപയോക്തൃ ഐ.ഡി. വ്യക്തമാക്കിയിട്ടില്ല."
 
-#: actions/otp.php:83
+#. TRANS: Client error displayed trying to use "one time password login" without specifying a login token.
+#: actions/otp.php:86
 msgid "No login token specified."
 msgstr "ലോഗിൻ ചീട്ട് വ്യക്തമാക്കിയിട്ടില്ല."
 
-#: actions/otp.php:90
+#. TRANS: Client error displayed trying to use "one time password login" without requesting a login token.
+#: actions/otp.php:94
 msgid "No login token requested."
 msgstr "ലോഗിൻ ചീറ്റ് ആവശ്യപ്പെട്ടിട്ടില്ല."
 
-#: actions/otp.php:95
+#. TRANS: Client error displayed trying to use "one time password login" while specifying an invalid login token.
+#: actions/otp.php:100
 msgid "Invalid login token specified."
 msgstr "വ്യക്തമാക്കിയത് അസാധുവായ ലോഗിൻ ചീട്ട് ആണ്."
 
-#: actions/otp.php:104
+#. TRANS: Client error displayed trying to use "one time password login" while specifying an expired login token.
+#: actions/otp.php:110
 msgid "Login token expired."
 msgstr "ലോഗിൻ ചീട്ട് കാലഹരണപ്പെട്ടിരിക്കുന്നു."
 
-#: actions/outbox.php:58
+#. TRANS: Title for outbox for any but the fist page.
+#. TRANS: %1$s is the user nickname, %2$d is the page number.
+#: actions/outbox.php:57
 #, php-format
 msgid "Outbox for %1$s - page %2$d"
 msgstr "%1$s എന്ന ഉപയോക്താവിന്റെ ഔട്ട്ബോക്സ് - താൾ %2$d"
 
+#. TRANS: Title for first page of outbox.
 #: actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
 msgstr "%s എന്ന ഉപയോക്താവിന്റെ ഔട്ട്ബോക്സ്"
 
-#: actions/outbox.php:104
+#. TRANS: Instructions for outbox.
+#: actions/outbox.php:103
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr "ഇത് താങ്കളുടെ ഔട്ട്ബോക്സ് ആണ്, താങ്കൾ അയച്ച സ്വകാര്യ സന്ദേശങ്ങൾ ഇവിടെ കാണാം."
 
@@ -3981,43 +4025,42 @@ msgstr "പഴയ രഹസ്യവാക്ക്"
 msgid "New password"
 msgstr "പുതിയ രഹസ്യവാക്ക്"
 
-#: actions/passwordsettings.php:109
-#, fuzzy
-msgid "6 or more characters"
+#: actions/passwordsettings.php:109 actions/register.php:416
+msgid "6 or more characters."
 msgstr "ആറോ അതിലധികമോ അക്ഷരങ്ങൾ."
 
-#: actions/passwordsettings.php:113
-#, fuzzy
-msgid "Same as password above"
+#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#: actions/passwordsettings.php:113 actions/recoverpassword.php:264
+#: actions/register.php:420
+msgid "Same as password above."
 msgstr "മുകളിൽ നൽകിയ അതേ രഹസ്യവാക്ക്."
 
 #: actions/passwordsettings.php:117
 msgid "Change"
 msgstr "മാറ്റുക"
 
-#: actions/passwordsettings.php:154 actions/register.php:238
+#: actions/passwordsettings.php:153 actions/register.php:223
 msgid "Password must be 6 or more characters."
 msgstr "രഹസ്യവാക്കിന് ആറോ അതിലധികമോ അക്ഷരങ്ങളുണ്ടായിരിക്കണം."
 
-#: actions/passwordsettings.php:157 actions/register.php:241
+#: actions/passwordsettings.php:156 actions/register.php:226
 msgid "Passwords don't match."
 msgstr "രഹസ്യവാക്കുകൾ തമ്മിൽ യോജിക്കുന്നില്ല"
 
-#: actions/passwordsettings.php:165
+#: actions/passwordsettings.php:164
 msgid "Incorrect old password"
 msgstr "പഴയ രഹസ്യവാക്ക് തെറ്റാണ്"
 
-#: actions/passwordsettings.php:181
+#: actions/passwordsettings.php:180
 msgid "Error saving user; invalid."
 msgstr "ഉപയോക്താവിനെ സേവ് ചെയ്യുന്നതിൽ പിഴവുണ്ടായി; അസാധുവാണ്."
 
-#: actions/passwordsettings.php:186
-#, fuzzy
-msgid "Can't save new password."
+#. TRANS: Reset password form validation error message.
+#: actions/passwordsettings.php:185 actions/recoverpassword.php:418
+msgid "Cannot save new password."
 msgstr "പുതിയ രഹസ്യവാക്ക് സേവ് ചെയ്യാനാവില്ല."
 
-#. TRANS: Title for password recovery page in password saved mode.
-#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
+#: actions/passwordsettings.php:191
 msgid "Password saved."
 msgstr "രഹസ്യവാക്ക് സേവ് ചെയ്തിരിക്കുന്നു."
 
@@ -4222,8 +4265,7 @@ msgid "Directory where backgrounds are located."
 msgstr ""
 
 #. TRANS: Fieldset legens in Paths admin panel.
-#. TRANS: DT element label in attachment list.
-#: actions/pathsadminpanel.php:419 lib/attachmentlist.php:98
+#: actions/pathsadminpanel.php:419
 msgid "Attachments"
 msgstr ""
 
@@ -4291,14 +4333,17 @@ msgstr ""
 msgid "Save paths"
 msgstr ""
 
-#: actions/peoplesearch.php:52
+#. TRANS: Instructions for the "People search" page.
+#. TRANS: %%site.name%% is the name of the StatusNet site.
+#: actions/peoplesearch.php:54
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
 "Separate the terms by spaces; they must be 3 characters or more."
 msgstr ""
 
-#: actions/peoplesearch.php:58
+#. TRANS: Title of a page where users can search for other users.
+#: actions/peoplesearch.php:61
 msgid "People search"
 msgstr "ആൾക്കാരെ തിരയുക"
 
@@ -4312,6 +4357,60 @@ msgstr ""
 msgid "Users self-tagged with %1$s - page %2$d"
 msgstr ""
 
+#. TRANS: Page title for AJAX form return when a disabling a plugin.
+#: actions/plugindisable.php:69
+msgctxt "plugin"
+msgid "Disabled"
+msgstr ""
+
+#. TRANS: Client error displayed trying to perform any request method other than POST.
+#. TRANS: Do not translate POST.
+#: actions/pluginenable.php:78 actions/subscribe.php:77
+msgid "This action only accepts POST requests."
+msgstr ""
+
+#: actions/pluginenable.php:102
+#, fuzzy
+msgid "You cannot administer plugins."
+msgstr "താങ്കൾക്ക് ഉപയോക്താക്കളെ നീക്കം ചെയ്യാൻ കഴിയില്ല."
+
+#: actions/pluginenable.php:109
+#, fuzzy
+msgid "No such plugin."
+msgstr "അത്തരത്തിൽ ഒരു താളില്ല."
+
+#. TRANS: Page title for AJAX form return when enabling a plugin.
+#: actions/pluginenable.php:159
+msgctxt "plugin"
+msgid "Enabled"
+msgstr ""
+
+#. TRANS: Tab and title for plugins admin panel.
+#. TRANS: Menu item for site administration
+#: actions/pluginsadminpanel.php:56 actions/version.php:191
+#: lib/adminpanelaction.php:411
+msgid "Plugins"
+msgstr "പ്ലഗിനുകൾ"
+
+#. TRANS: Instructions at top of plugin admin page.
+#: actions/pluginsadminpanel.php:68
+msgid ""
+"Additional plugins can be enabled and configured manually. See the <a href="
+"\"http://status.net/wiki/Plugins\">online plugin documentation</a> for more "
+"details."
+msgstr ""
+
+#. TRANS: Admin form section header
+#: actions/pluginsadminpanel.php:84
+#, fuzzy
+msgid "Default plugins"
+msgstr "സ്വതേ വേണ്ട ഭാഷ"
+
+#: actions/pluginsadminpanel.php:106
+msgid ""
+"All default plugins have been disabled from the site's configuration file."
+msgstr ""
+
 #: actions/postnotice.php:95
 msgid "Invalid notice content."
 msgstr "അറിയിപ്പിന്റെ ഉള്ളടക്കം അസാധുവാണ്."
@@ -4324,44 +4423,41 @@ msgstr ""
 "ചേർന്നു പോകുന്നില്ല."
 
 #. TRANS: Page title for profile settings.
-#: actions/profilesettings.php:59
+#: actions/profilesettings.php:60
 msgid "Profile settings"
 msgstr ""
 
 #. TRANS: Usage instructions for profile settings.
-#: actions/profilesettings.php:70
+#: actions/profilesettings.php:71
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
 
 #. TRANS: Profile settings form legend.
-#: actions/profilesettings.php:98
+#: actions/profilesettings.php:99
 msgid "Profile information"
 msgstr ""
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109 actions/register.php:433
+#: actions/profilesettings.php:110 actions/register.php:412
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr ""
 
 #. TRANS: Field label in form for profile settings.
-#. TRANS: Label for full group name (dt). Text hidden by default.
-#. TRANS: DT for full name in a profile.
-#: actions/profilesettings.php:113 actions/register.php:455
-#: actions/showgroup.php:255 actions/tagother.php:104
-#: lib/groupeditform.php:150 lib/userprofile.php:156
+#: actions/profilesettings.php:114 actions/register.php:434
+#: lib/groupeditform.php:150
 msgid "Full name"
 msgstr "പൂർണ്ണനാമം"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:118 actions/register.php:460
+#: actions/profilesettings.php:119 actions/register.php:439
 #: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "ഹോംപേജ്"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:121
+#: actions/profilesettings.php:122 actions/register.php:441
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr ""
 "താങ്കളുടെ ഹോംപേജിന്റെ, ബ്ലോഗിന്റെ അല്ലെങ്കിൽ മറ്റൊരു സൈറ്റിലെ താങ്കളെക്കുറിച്ചുള്ള "
@@ -4370,7 +4466,7 @@ msgstr ""
 #. TRANS: Tooltip for field label in form for profile settings. Plural
 #. TRANS: is decided by the number of characters available for the
 #. TRANS: biography (%d).
-#: actions/profilesettings.php:129 actions/register.php:471
+#: actions/profilesettings.php:130 actions/register.php:450
 #, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4378,81 +4474,76 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:135 actions/register.php:476
+#: actions/profilesettings.php:136 actions/register.php:455
 msgid "Describe yourself and your interests"
 msgstr "താങ്കളെക്കുറിച്ചും താങ്കളുടെ ഇഷ്ടങ്ങളെക്കുറിച്ചും വിവരിക്കുക"
 
 #. TRANS: Text area label in form for profile settings where users can provide.
 #. TRANS: their biography.
-#: actions/profilesettings.php:139 actions/register.php:478
+#: actions/profilesettings.php:140 actions/register.php:457
 msgid "Bio"
 msgstr ""
 
 #. TRANS: Field label in form for profile settings.
-#. TRANS: Label for group location (dt). Text hidden by default.
-#. TRANS: DT for location in a profile.
-#: actions/profilesettings.php:145 actions/register.php:483
-#: actions/showgroup.php:265 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:173
-#: lib/userprofile.php:172
+#: actions/profilesettings.php:146 actions/register.php:462
+#: lib/groupeditform.php:173
 msgid "Location"
 msgstr "സ്ഥലം"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148 actions/register.php:485
+#: actions/profilesettings.php:149
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "താങ്കളെവിടെയാണ്, അതായത് \"നഗരം, സംസ്ഥാനം (അഥവ പ്രദേശം), രാജ്യം\" എന്ന്"
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:153
+#: actions/profilesettings.php:154
 msgid "Share my current location when posting notices"
 msgstr "അറിയിപ്പുകൾ പ്രസിദ്ധീകരിക്കുന്നതിനോടൊപ്പം എന്റെ ഇപ്പോഴത്തെ സ്ഥലവും പങ്കുവെയ്ക്കുക"
 
 #. TRANS: Field label in form for profile settings.
-#. TRANS: DT for tags in a profile.
-#: actions/profilesettings.php:161 actions/tagother.php:149
-#: actions/tagother.php:209 lib/subscriptionlist.php:106
-#: lib/subscriptionlist.php:108 lib/userprofile.php:220
+#: actions/profilesettings.php:162 actions/tagother.php:128
+#: actions/tagother.php:188 lib/subscriptionlist.php:104
+#: lib/subscriptionlist.php:106
 msgid "Tags"
 msgstr "റ്റാഗുകൾ"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:164
+#: actions/profilesettings.php:165
 msgid ""
-"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- "
+"separated."
 msgstr ""
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:169
+#: actions/profilesettings.php:170
 msgid "Language"
 msgstr "ഭാഷ"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:171
-#, fuzzy
-msgid "Preferred language"
+#: actions/profilesettings.php:172
+msgid "Preferred language."
 msgstr "പ്രിയങ്കര ഭാഷ."
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:181
+#: actions/profilesettings.php:182
 msgid "Timezone"
 msgstr "സമയ മേഖല"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:183
+#: actions/profilesettings.php:184
 msgid "What timezone are you normally in?"
 msgstr "താങ്കൾ സാധാരണയുണ്ടാകാറുള്ള സമയമേഖല ഏതാണ്?"
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:189
+#: actions/profilesettings.php:190
 msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)"
+"Automatically subscribe to whoever subscribes to me (best for non-humans)."
 msgstr ""
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Plural form is used based on the maximum number of allowed
 #. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:258 actions/register.php:229
+#: actions/profilesettings.php:259 actions/register.php:214
 #, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4460,48 +4551,48 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:269 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:270 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr "സമയമേഖല തിരഞ്ഞെടുത്തിട്ടില്ല."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:277
+#: actions/profilesettings.php:278
 msgid "Language is too long (maximum 50 characters)."
 msgstr "ഭാഷയുടെ നീളം വളരെ കൂടുതലാണ് (പരമാവധി 50 അക്ഷരങ്ങൾ)."
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:291 actions/tagother.php:178
-#, php-format
-msgid "Invalid tag: \"%s\""
+#: actions/profilesettings.php:292
+#, fuzzy, php-format
+msgid "Invalid tag: \"%s\"."
 msgstr "അസാധുവായ റ്റാഗ്: \"%s\""
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:347
+#: actions/profilesettings.php:348
 #, fuzzy
 msgid "Could not update user for autosubscribe."
 msgstr "ഉപയോക്തൃ വിവരങ്ങൾ പുതുക്കാൻ കഴിഞ്ഞില്ല."
 
 #. TRANS: Server error thrown when user profile location preference settings could not be updated.
-#: actions/profilesettings.php:405
+#: actions/profilesettings.php:406
 msgid "Could not save location prefs."
 msgstr "സ്ഥാനം സംബന്ധിച്ച ക്രമീകരണങ്ങൾ സേവ് ചെയ്യാൻ കഴിഞ്ഞില്ല."
 
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:427 actions/tagother.php:200
+#: actions/profilesettings.php:428 actions/tagother.php:179
 msgid "Could not save tags."
 msgstr "റ്റാഗുകൾ സേവ് ചെയ്യാൻ കഴിഞ്ഞില്ല."
 
 #. TRANS: Confirmation shown when user profile settings are saved.
 #. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:436 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:437 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "സജ്ജീകരണങ്ങൾ സേവ് ചെയ്തിരിക്കുന്നു."
 
 #. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
 #. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:483 actions/restoreaccount.php:60
+#: actions/profilesettings.php:484 actions/restoreaccount.php:60
 msgid "Restore account"
 msgstr "അംഗത്വം പുനഃക്രമീകരിക്കുക"
 
@@ -4576,6 +4667,12 @@ msgid ""
 "tool."
 msgstr ""
 
+#. TRANS: Public RSS feed description. %s is the StatusNet site name.
+#: actions/publicrss.php:106
+#, fuzzy, php-format
+msgid "%s updates from everyone."
+msgstr "%s പദ്ധതിയിൽ എല്ലാവരും അയച്ചിട്ടുള്ള പുതിയവാർത്തകൾ!"
+
 #. TRANS: Title for public tag cloud.
 #: actions/publictagcloud.php:57
 msgid "Public tag cloud"
@@ -4616,10 +4713,6 @@ msgstr ""
 "എന്തുകൊണ്ട് [അംഗത്വമെടുക്കുകയും](%%action.register%%) പ്രസിദ്ധീകരിക്കുന്ന ആദ്യ വ്യക്തിയാകുകയും "
 "ചെയ്തുകൂട!"
 
-#: actions/publictagcloud.php:146
-msgid "Tag cloud"
-msgstr ""
-
 #. TRANS: Client error displayed trying to recover password while already logged in.
 #: actions/recoverpassword.php:37
 msgid "You are already logged in!"
@@ -4711,6 +4804,11 @@ msgstr "രഹസ്യവാക്ക് വീണ്ടെടുക്കു
 msgid "Password recovery requested"
 msgstr "രഹസ്യവാക്ക് വീണ്ടെടുക്കൽ ആവശ്യപ്പെട്ടിരിക്കുന്നു"
 
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/recoverpassword.php:229
+msgid "Password saved"
+msgstr "രഹസ്യവാക്ക് സേവ് ചെയ്തിരിക്കുന്നു"
+
 #. TRANS: Title for password recovery page when an unknown action has been specified.
 #: actions/recoverpassword.php:232
 msgid "Unknown action"
@@ -4721,14 +4819,9 @@ msgstr "അജ്ഞാതമായ പ്രവൃത്തി"
 msgid "6 or more characters, and do not forget it!"
 msgstr "ആറോ അതിലധികമോ അക്ഷരങ്ങൾ, അത് മറക്കരുത്!"
 
-#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
-#: actions/recoverpassword.php:264 actions/register.php:441
-msgid "Same as password above."
-msgstr "മുകളിൽ നൽകിയ അതേ രഹസ്യവാക്ക്."
-
 #. TRANS: Button text for password reset form.
 #. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: actions/recoverpassword.php:268 lib/designsettings.php:264
+#: actions/recoverpassword.php:268 lib/designform.php:145
 msgctxt "BUTTON"
 msgid "Reset"
 msgstr "പുനഃക്രമീകരിക്കുക"
@@ -4777,13 +4870,8 @@ msgstr "രഹസ്യവാക്കിന് ആറോ അതിലധിക
 msgid "Password and confirmation do not match."
 msgstr "രഹസ്യവാക്കും സ്ഥിരീകരണവും യോജിക്കുന്നില്ല."
 
-#. TRANS: Reset password form validation error message.
-#: actions/recoverpassword.php:418
-msgid "Cannot save new password."
-msgstr "പുതിയ രഹസ്യവാക്ക് സേവ് ചെയ്യാനാവില്ല."
-
 #. TRANS: Server error displayed when something does wrong with the user object during password reset.
-#: actions/recoverpassword.php:426 actions/register.php:256
+#: actions/recoverpassword.php:426 actions/register.php:241
 msgid "Error setting user."
 msgstr "ഉപയോക്താവിനെ സജ്ജീകരിക്കുന്നതിൽ പിഴവുണ്ടായി."
 
@@ -4792,107 +4880,104 @@ msgstr "ഉപയോക്താവിനെ സജ്ജീകരിക്ക
 msgid "New password successfully saved. You are now logged in."
 msgstr "പുതിയ രഹസ്യവാക്ക് വിജയകരമായി സേവ് ചെയ്തു. താങ്കൾക്ക് ലോഗിൻ ചെയ്യാവുന്നതാണ്."
 
-#: actions/register.php:92 actions/register.php:196 actions/register.php:413
+#: actions/redirecturl.php:70
+msgid "No id parameter"
+msgstr ""
+
+#: actions/redirecturl.php:76
+#, fuzzy, php-format
+msgid "No such file \"%d\""
+msgstr "അത്തരത്തിൽ ഒരു അറിയിപ്പ് ഇല്ല."
+
+#: actions/register.php:80 actions/register.php:181 actions/register.php:392
 msgid "Sorry, only invited people can register."
 msgstr "ക്ഷമിക്കുക, ക്ഷണിക്കപ്പെട്ടവർക്കു മാത്രമേ അംഗത്വമെടുക്കാനാകൂ."
 
-#: actions/register.php:99
+#: actions/register.php:87
 msgid "Sorry, invalid invitation code."
 msgstr "ക്ഷമിക്കുക, ക്ഷണത്തിന്റെ കോഡ് അസാധുവാണ്."
 
-#: actions/register.php:119
+#: actions/register.php:106
 msgid "Registration successful"
 msgstr "അംഗത്വമെടുക്കൽ വിജയകരം"
 
-#: actions/register.php:121 actions/register.php:511
+#: actions/register.php:108 actions/register.php:490
 msgid "Register"
 msgstr "അംഗത്വമെടുക്കുക"
 
-#: actions/register.php:142
+#: actions/register.php:128
 msgid "Registration not allowed."
 msgstr "അംഗത്വമെടുക്കൽ അനുവദിച്ചിട്ടില്ല."
 
-#: actions/register.php:209
-#, fuzzy
-msgid "You can't register if you don't agree to the license."
+#: actions/register.php:194
+msgid "You cannot register if you don't agree to the license."
 msgstr "താങ്കൾ അനുവാദ പത്രം അംഗീകരിക്കുകയില്ലെങ്കിൽ ഭാഗമാകാനാകില്ല."
 
-#: actions/register.php:218
+#: actions/register.php:203
 msgid "Email address already exists."
 msgstr "ഇമെയിൽ വിലാസം മുമ്പേ നിലവിലുണ്ട്."
 
-#: actions/register.php:251 actions/register.php:273
+#: actions/register.php:236 actions/register.php:258
 msgid "Invalid username or password."
 msgstr "ഉപയോക്തൃനാമമോ രഹസ്യവാക്കോ അസാധുവാണ്."
 
-#: actions/register.php:351
-#, fuzzy
+#: actions/register.php:333
 msgid ""
 "With this form you can create a new account. You can then post notices and "
-"link up to friends and colleagues. "
+"link up to friends and colleagues."
 msgstr ""
 "ഈ ഫോം ഉപയോഗിച്ച് താങ്കൾക്ക് പുതിയൊരു അംഗത്വം സൃഷ്ടിക്കാനാകും. പിന്നീട് താങ്കൾക്ക് അറിയിപ്പുകൾ "
 "പ്രസിദ്ധീകരിക്കാനും സുഹൃത്തുക്കളേയും സഹപ്രവർത്തകരേയും കണ്ണിചേർക്കാനുമാകും."
 
-#: actions/register.php:437
-msgid "6 or more characters."
-msgstr "ആറോ അതിലധികമോ അക്ഷരങ്ങൾ."
-
-#. TRANS: Link description in user account settings menu.
-#: actions/register.php:445 actions/register.php:449
-#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
+#: actions/register.php:424 actions/register.php:428
+#: actions/siteadminpanel.php:238 lib/settingsnav.php:92
 msgid "Email"
 msgstr "ഇമെയിൽ"
 
-#: actions/register.php:446 actions/register.php:450
-#, fuzzy
-msgid "Used only for updates, announcements, and password recovery"
+#: actions/register.php:425 actions/register.php:429
+msgid "Used only for updates, announcements, and password recovery."
 msgstr ""
 "പുതുക്കൽ വിവരങ്ങൾക്കും, അറിയിപ്പുകൾക്കും, രഹസ്യവാക്ക് വീണ്ടെടുക്കൽ പ്രവർത്തനത്തിനും മാത്രം "
 "ഉപയോഗിച്ചത്."
 
-#: actions/register.php:457
-#, fuzzy
-msgid "Longer name, preferably your \"real\" name"
+#: actions/register.php:436
+msgid "Longer name, preferably your \"real\" name."
 msgstr "വലിയ പേര്, താങ്കളുടെ \"യഥാർത്ഥ\" പേര് നൽകാൻ താത്പര്യപ്പെടുന്നു."
 
-#: actions/register.php:462
-#, fuzzy
-msgid "URL of your homepage, blog, or profile on another site"
-msgstr ""
-"താങ്കളുടെ ഹോംപേജിന്റെ, ബ്ലോഗിന്റെ അല്ലെങ്കിൽ മറ്റൊരു സൈറ്റിലെ താങ്കളെക്കുറിച്ചുള്ള "
-"താളിലേയ്ക്കുള്ള യൂ.ആർ.എൽ."
+#: actions/register.php:464
+msgid "Where you are, like \"City, State (or Region), Country\"."
+msgstr "താങ്കളെവിടെയാണ്, അതായത് \"നഗരം, സംസ്ഥാനം (അഥവ പ്രദേശം), രാജ്യം\" എന്നിവ."
 
-#: actions/register.php:523
+#: actions/register.php:503
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
 msgstr ""
 
-#: actions/register.php:533
+#: actions/register.php:513
 #, php-format
 msgid "My text and files are copyright by %1$s."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:537
+#: actions/register.php:517
 msgid "My text and files remain under my own copyright."
 msgstr "എന്റെ എഴുത്തുകളും പ്രമാണങ്ങളും എന്റെ സ്വന്തം പകർപ്പവകാശത്തിലായിരിക്കും."
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:540
+#: actions/register.php:520
 msgid "All rights reserved."
 msgstr "എല്ലാ അവകാശങ്ങളും സംരക്ഷിതം."
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:545
+#: actions/register.php:525
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
 "email address, IM address, and phone number."
 msgstr ""
 
-#: actions/register.php:588
+#: actions/register.php:566
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -4911,7 +4996,7 @@ msgid ""
 "Thanks for signing up and we hope you enjoy using this service."
 msgstr ""
 
-#: actions/register.php:612
+#: actions/register.php:590
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -4940,8 +5025,7 @@ msgid "User nickname"
 msgstr "ഉപയോക്തൃ വിളിപ്പേര്"
 
 #: actions/remotesubscribe.php:129
-#, fuzzy
-msgid "Nickname of the user you want to follow"
+msgid "Nickname of the user you want to follow."
 msgstr "താങ്കൾക്ക് പിന്തുടരേണ്ട ഉപയോക്താവിന്റെ വിളിപ്പേര്."
 
 #: actions/remotesubscribe.php:132
@@ -4949,18 +5033,18 @@ msgid "Profile URL"
 msgstr ""
 
 #: actions/remotesubscribe.php:133
-msgid "URL of your profile on another compatible microblogging service"
+msgid "URL of your profile on another compatible microblogging service."
 msgstr ""
 
 #. TRANS: Link text for link that will subscribe to a remote profile.
 #: actions/remotesubscribe.php:136 lib/subscribeform.php:139
-#: lib/userprofile.php:431
+#: lib/userprofile.php:402
 msgid "Subscribe"
 msgstr "വരിക്കാരാകുക"
 
 #: actions/remotesubscribe.php:158
 #, fuzzy
-msgid "Invalid profile URL (bad format)"
+msgid "Invalid profile URL (bad format)."
 msgstr "പ്രമാണത്തിന്റെ പേര് അസാധുവാണ്."
 
 #: actions/remotesubscribe.php:167
@@ -4992,7 +5076,7 @@ msgstr "താങ്കൾക്ക് താങ്കളുടെ തന്ന
 msgid "You already repeated that notice."
 msgstr "താങ്കൾ ആ അറിയിപ്പ് മുമ്പേ തന്നെ ആവർത്തിച്ചിരിക്കുന്നു."
 
-#: actions/repeat.php:112 lib/noticelist.php:692
+#: actions/repeat.php:112 lib/noticelist.php:697
 msgid "Repeated"
 msgstr "ആവർത്തിച്ചു"
 
@@ -5000,9 +5084,9 @@ msgstr "ആവർത്തിച്ചു"
 msgid "Repeated!"
 msgstr "ആവർത്തിച്ചു!"
 
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing @-replies.
+#. TRANS: RSS reply feed title. %s is a user nickname.
 #: actions/replies.php:126 actions/repliesrss.php:68
-#: lib/personalgroupnav.php:109
+#: lib/personalgroupnav.php:105
 #, php-format
 msgid "Replies to %s"
 msgstr "%s എന്ന ഉപയോക്താവിനുള്ള മറുപടികൾ"
@@ -5048,9 +5132,11 @@ msgid ""
 "newnotice%%%%?status_textarea=%3$s)."
 msgstr ""
 
-#: actions/repliesrss.php:72
+#. TRANS: RSS reply feed description.
+#. TRANS: %1$s is a user nickname, %2$s is the StatusNet site name.
+#: actions/repliesrss.php:74
 #, fuzzy, php-format
-msgid "Replies to %1$s on %2$s!"
+msgid "Replies to %1$s on %2$s."
 msgstr "%2$s സംരംഭത്തിൽ %1$s എന്ന ഉപയോക്താവിന് അയച്ച മറുപടികൾ!"
 
 #. TRANS: Client exception displayed when trying to restore an account while not logged in.
@@ -5145,7 +5231,7 @@ msgstr ""
 msgid "User doesn't have this role."
 msgstr ""
 
-#: actions/rsd.php:146 actions/version.php:159
+#: actions/rsd.php:142 actions/version.php:159
 msgid "StatusNet"
 msgstr "സ്റ്റാറ്റസ്‌നെറ്റ്"
 
@@ -5187,87 +5273,38 @@ msgstr ""
 msgid "Save site settings"
 msgstr "സൈറ്റ് സജ്ജീകരണങ്ങൾ ചേവ് ചെയ്യുക"
 
-#: actions/showapplication.php:82
+#: actions/showapplication.php:78
 msgid "You must be logged in to view an application."
 msgstr ""
 
-#: actions/showapplication.php:157
+#: actions/showapplication.php:151
 msgid "Application profile"
 msgstr ""
 
-#. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:159 lib/applicationeditform.php:177
-msgid "Icon"
-msgstr "ഐകോൺ"
-
-#. TRANS: Form input field label for application name.
-#: actions/showapplication.php:169 actions/version.php:197
-#: lib/applicationeditform.php:190
-msgid "Name"
-msgstr "പേര്"
-
-#. TRANS: Form input field label.
-#: actions/showapplication.php:178 lib/applicationeditform.php:227
-msgid "Organization"
-msgstr "സംഘടന"
-
-#. TRANS: Form input field label.
-#: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:168
-msgid "Description"
-msgstr "വിവരണം"
-
-#. TRANS: Header for group statistics on a group page (h2).
-#. TRANS: H2 text for user statistics.
-#: actions/showapplication.php:192 actions/showgroup.php:460
-#: lib/profileaction.php:205
-msgid "Statistics"
-msgstr "സ്ഥിതിവിവരക്കണക്കുകൾ"
-
-#: actions/showapplication.php:203
+#: actions/showapplication.php:179
 #, php-format
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr ""
 
-#: actions/showapplication.php:213
+#: actions/showapplication.php:189
 msgid "Application actions"
 msgstr ""
 
-#: actions/showapplication.php:236
+#: actions/showapplication.php:212
 msgid "Reset key & secret"
 msgstr "പുനഃക്രമീകരണ ചാവിയും രഹസ്യവും"
 
 #. TRANS: Title of form for deleting a user.
-#: actions/showapplication.php:252 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:64 lib/noticelist.php:673
+#: actions/showapplication.php:228 lib/deletegroupform.php:121
+#: lib/deleteuserform.php:64 lib/noticelist.php:678
 msgid "Delete"
 msgstr "മായ്ക്കുക"
 
-#: actions/showapplication.php:261
+#: actions/showapplication.php:237
 msgid "Application info"
 msgstr ""
 
-#: actions/showapplication.php:263
-msgid "Consumer key"
-msgstr ""
-
-#: actions/showapplication.php:268
-msgid "Consumer secret"
-msgstr "ഉപയോക്തൃ രഹസ്യം"
-
-#: actions/showapplication.php:273
-msgid "Request token URL"
-msgstr "അഭ്യർത്ഥനാ ചീട്ടിന്റെ യൂ.ആർ.എൽ."
-
-#: actions/showapplication.php:278
-msgid "Access token URL"
-msgstr "അഭിഗമ്യതാ ചീട്ടിന്റെ യൂ.ആർ.എൽ."
-
-#: actions/showapplication.php:283
-msgid "Authorize URL"
-msgstr "അംഗീകരണത്തിനുള്ള യൂ.ആർ.എൽ."
-
-#: actions/showapplication.php:288
+#: actions/showapplication.php:255
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
@@ -5275,7 +5312,7 @@ msgstr ""
 "ശ്രദ്ധിക്കുക: HMAC-SHA1 ഒപ്പുകളാണ് ഞങ്ങൾ പിന്തുണയ്ക്കുന്നത്. പ്ലെയിൻ-ടെക്സ്റ്റ് ഒപ്പ് രീതി ഞങ്ങൾ "
 "പിന്തുണയ്ക്കുന്നില്ല."
 
-#: actions/showapplication.php:309
+#: actions/showapplication.php:275
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr "ഉപയോക്തൃ ചാവിയും രഹസ്യവും പുനഃക്രമീകരണം എന്ന് താങ്കൾക്ക് തീർച്ചയാണോ?"
 
@@ -5357,61 +5394,47 @@ msgstr "%s സംഘം"
 msgid "%1$s group, page %2$d"
 msgstr "%1$s സംഘം, താൾ %2$d"
 
-#. TRANS: Group profile header (h2). Text hidden by default.
-#: actions/showgroup.php:223
-msgid "Group profile"
-msgstr ""
-
-#. TRANS: Label for group URL (dt). Text hidden by default.
-#. TRANS: DT for URL in a profile.
-#: actions/showgroup.php:273 actions/tagother.php:118
-#: actions/userauthorization.php:175 lib/userprofile.php:186
-msgid "URL"
-msgstr "യൂ.ആർ.എൽ."
-
 #. TRANS: Label for group description or group note (dt). Text hidden by default.
-#. TRANS: DT for note in a profile.
-#: actions/showgroup.php:285 actions/tagother.php:128
-#: actions/userauthorization.php:187 lib/userprofile.php:204
+#: actions/showgroup.php:266
 msgid "Note"
 msgstr "കുറിപ്പ്"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:296 lib/groupeditform.php:180
+#: actions/showgroup.php:277 lib/groupeditform.php:180
 msgid "Aliases"
 msgstr ""
 
 #. TRANS: Group actions header (h2). Text hidden by default.
-#: actions/showgroup.php:313
+#: actions/showgroup.php:294
 msgid "Group actions"
 msgstr "സംഘത്തിന്റെ പ്രവൃത്തികൾ"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:357
+#: actions/showgroup.php:338
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
 msgstr ""
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:364
+#: actions/showgroup.php:345
 #, php-format
 msgid "Notice feed for %s group (RSS 2.0)"
 msgstr ""
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:371
+#: actions/showgroup.php:352
 #, php-format
 msgid "Notice feed for %s group (Atom)"
 msgstr ""
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:377
+#: actions/showgroup.php:358
 #, php-format
 msgid "FOAF for %s group"
 msgstr ""
 
 #. TRANS: Header for mini list of group members on a group page (h2).
-#: actions/showgroup.php:414
+#: actions/showgroup.php:395
 msgid "Members"
 msgstr "അംഗങ്ങൾ"
 
@@ -5419,25 +5442,30 @@ msgstr "അംഗങ്ങൾ"
 #. TRANS: Text for user subscription statistics if the user has no subscriptions.
 #. TRANS: Text for user subscriber statistics if user has no subscribers.
 #. TRANS: Text for user user group membership statistics if user is not a member of any group.
-#: actions/showgroup.php:420 lib/profileaction.php:137
+#: actions/showgroup.php:401 lib/profileaction.php:137
 #: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
-#: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
+#: lib/subscriptionlist.php:123 lib/tagcloudsection.php:71
 msgid "(None)"
 msgstr "(ഒന്നുമില്ല)"
 
 #. TRANS: Link to all group members from mini list of group members if group has more than n members.
-#: actions/showgroup.php:429
+#: actions/showgroup.php:410
 msgid "All members"
 msgstr "എല്ലാ അംഗങ്ങളും"
 
-#. TRANS: Label for creation date in statistics on group page.
-#: actions/showgroup.php:465
+#. TRANS: Header for group statistics on a group page (h2).
+#. TRANS: H2 text for user statistics.
+#: actions/showgroup.php:441 lib/profileaction.php:205
+msgid "Statistics"
+msgstr "സ്ഥിതിവിവരക്കണക്കുകൾ"
+
+#: actions/showgroup.php:444
 msgctxt "LABEL"
 msgid "Created"
 msgstr "സൃഷ്ടിച്ചിരിക്കുന്നു"
 
 #. TRANS: Label for member count in statistics on group page.
-#: actions/showgroup.php:473
+#: actions/showgroup.php:449
 msgctxt "LABEL"
 msgid "Members"
 msgstr "അംഗങ്ങൾ"
@@ -5446,7 +5474,7 @@ msgstr "അംഗങ്ങൾ"
 #. TRANS: **%s** is the group alias, %%%%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).
-#: actions/showgroup.php:488
+#: actions/showgroup.php:464
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5459,7 +5487,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: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
-#: actions/showgroup.php:498
+#: actions/showgroup.php:474
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5469,7 +5497,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: Header for list of group administrators on a group page (h2).
-#: actions/showgroup.php:527
+#: actions/showgroup.php:503
 msgid "Admins"
 msgstr "കാര്യനിർവാഹകർ"
 
@@ -5508,7 +5536,7 @@ msgid "%1$s tagged %2$s"
 msgstr ""
 
 #. TRANS: Page title showing tagged notices in one user's stream.
-#. TRANS: %1$s is the username, %2$s is the hash tag, %1$d is the page number.
+#. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
 #: actions/showstream.php:74
 #, php-format
 msgid "%1$s tagged %2$s, page %3$d"
@@ -5555,13 +5583,13 @@ msgid "FOAF for %s"
 msgstr ""
 
 #. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
-#: actions/showstream.php:211
+#: actions/showstream.php:205
 #, php-format
 msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr ""
 
 #. TRANS: Second sentence of empty list message for a stream for the user themselves.
-#: actions/showstream.php:217
+#: actions/showstream.php:211
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
@@ -5571,7 +5599,7 @@ msgstr ""
 
 #. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:221
+#: actions/showstream.php:215
 #, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
@@ -5580,7 +5608,7 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:264
+#: actions/showstream.php:258
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5596,7 +5624,7 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:271
+#: actions/showstream.php:265
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5608,7 +5636,7 @@ msgstr ""
 "% എന്ന സൈറ്റിൽ **%s** എന്നയാൾക്ക് അംഗത്വമുണ്ട്. "
 
 #. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
-#: actions/showstream.php:328
+#: actions/showstream.php:322
 #, php-format
 msgid "Repeat of %s"
 msgstr "%s എന്ന ഉപയോക്താവിന്റെ ആവർത്തനം"
@@ -5752,18 +5780,17 @@ msgstr ""
 
 #. TRANS: Title for button to save site notice in admin panel.
 #: actions/sitenoticeadminpanel.php:201
-#, fuzzy
-msgid "Save site notice"
+msgid "Save site notice."
 msgstr "സൈറ്റ് അറിയിപ്പ് സേവ് ചെയ്യുക."
 
 #. TRANS: Title for SMS settings.
-#: actions/smssettings.php:57
+#: actions/smssettings.php:56
 msgid "SMS settings"
 msgstr "എസ്.എം.എസ്. സജ്ജീകരണങ്ങൾ"
 
 #. TRANS: SMS settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/smssettings.php:71
+#: actions/smssettings.php:70
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr ""
@@ -5771,91 +5798,90 @@ msgstr ""
 "സ്വീകരിക്കാവുന്നതാണ്."
 
 #. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
-#: actions/smssettings.php:93
+#: actions/smssettings.php:92
 msgid "SMS is not available."
 msgstr "എസ്.എം.എസ്. ലഭ്യമല്ല."
 
 #. TRANS: Form legend for SMS settings form.
-#: actions/smssettings.php:107
+#: actions/smssettings.php:106
 msgid "SMS address"
 msgstr "എസ്.എം.എസ്. വിലാസം"
 
 #. TRANS: Form guide in SMS settings form.
-#: actions/smssettings.php:116
+#: actions/smssettings.php:115
 msgid "Current confirmed SMS-enabled phone number."
 msgstr "ഇപ്പോഴത്തെ സ്ഥിരീകരിച്ച എസ്.എം.എസ്. സജ്ജമായ ഫോൺ നമ്പർ."
 
 #. TRANS: Form guide in IM settings form.
-#: actions/smssettings.php:129
+#: actions/smssettings.php:128
 msgid "Awaiting confirmation on this phone number."
 msgstr "ഈ ഫോൺ നമ്പരിൽ നിന്നുള്ള സ്ഥിരീകരണത്തിനായി കാക്കുന്നു."
 
 #. TRANS: Field label for SMS address input in SMS settings form.
-#: actions/smssettings.php:138
+#: actions/smssettings.php:137
 msgid "Confirmation code"
 msgstr "സ്ഥിരീകരണ കോഡ്"
 
 #. TRANS: Form field instructions in SMS settings form.
-#: actions/smssettings.php:140
+#: actions/smssettings.php:139
 msgid "Enter the code you received on your phone."
 msgstr "താങ്കളുടെ ഫോണിൽ ലഭിച്ച കോഡ് നൽകുക."
 
 #. TRANS: Button label to confirm SMS confirmation code in SMS settings.
-#: actions/smssettings.php:144
+#: actions/smssettings.php:143
 msgctxt "BUTTON"
 msgid "Confirm"
 msgstr "സ്ഥിരീകരിക്കുക"
 
 #. TRANS: Field label for SMS phone number input in SMS settings form.
-#: actions/smssettings.php:149
+#: actions/smssettings.php:148
 msgid "SMS phone number"
 msgstr "എസ്.എം.എസ്. ഫോൺ നമ്പർ."
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
-#: actions/smssettings.php:152
-#, fuzzy
-msgid "Phone number, no punctuation or spaces, with area code"
+#: actions/smssettings.php:151
+msgid "Phone number, no punctuation or spaces, with area code."
 msgstr "ഫോൺ നമ്പർ, വിരാമചിഹ്നമോ ഇടയോ ചേർക്കാതെ പ്രദേശത്തിന്റെ കോഡിനോടൊപ്പം നൽകുക."
 
 #. TRANS: Form legend for SMS preferences form.
-#: actions/smssettings.php:191
+#: actions/smssettings.php:190
 msgid "SMS preferences"
 msgstr "എസ്.എം.എസ്. ക്രമീകരണങ്ങൾ"
 
 #. TRANS: Checkbox label in SMS preferences form.
-#: actions/smssettings.php:197
+#: actions/smssettings.php:196
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
 msgstr ""
 
 #. TRANS: Confirmation message for successful SMS preferences save.
-#: actions/smssettings.php:308
+#: actions/smssettings.php:307
 msgid "SMS preferences saved."
 msgstr "എസ്.എം.എസ്. ക്രമീകരണങ്ങൾ സേവ് ചെയ്യപ്പെട്ടിട്ടുണ്ട്."
 
 #. TRANS: Message given saving SMS phone number without having provided one.
-#: actions/smssettings.php:330
+#: actions/smssettings.php:329
 msgid "No phone number."
 msgstr "ഫോൺ നമ്പർ നൽകിയിട്ടില്ല."
 
 #. TRANS: Message given saving SMS phone number without having selected a carrier.
-#: actions/smssettings.php:336
+#: actions/smssettings.php:335
 msgid "No carrier selected."
 msgstr ""
 
 #. TRANS: Message given saving SMS phone number that is already set.
-#: actions/smssettings.php:344
+#: actions/smssettings.php:343
 msgid "That is already your phone number."
 msgstr "അതാണ് താങ്കളുടെ ഫോൺ നമ്പരായി മുമ്പേ ഉള്ളത്."
 
 #. TRANS: Message given saving SMS phone number that is already set for another user.
-#: actions/smssettings.php:348
+#: actions/smssettings.php:347
 msgid "That phone number already belongs to another user."
 msgstr "ആ ഫോൺ നമ്പർ മുമ്പേ തന്നെ മറ്റൊരു ഉപയോക്താവിന് അവകാശപ്പെട്ടതാണ്."
 
 #. TRANS: Message given saving valid SMS phone number that is to be confirmed.
-#: actions/smssettings.php:376
+#: actions/smssettings.php:375
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
 "for the code and instructions on how to use it."
@@ -5864,39 +5890,39 @@ msgstr ""
 "ഉപയോഗിക്കാമെന്ന മാർഗ്ഗനിർദ്ദേശങ്ങൾക്കും താങ്കളുടെ ഫോൺ പരിശോധിക്കുക."
 
 #. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
-#: actions/smssettings.php:404
+#: actions/smssettings.php:403
 msgid "That is the wrong confirmation number."
 msgstr "അത് തെറ്റായ സ്ഥിരീകരണ സംഖ്യയാണ്."
 
 #. TRANS: Message given after successfully canceling SMS phone number confirmation.
-#: actions/smssettings.php:418
+#: actions/smssettings.php:417
 msgid "SMS confirmation cancelled."
 msgstr "എസ്.എം.എസ്. സ്ഥിരീകരണം റദ്ദാക്കി."
 
 #. TRANS: Message given trying to remove an SMS phone number that is not
 #. TRANS: registered for the active user.
-#: actions/smssettings.php:438
+#: actions/smssettings.php:437
 msgid "That is not your phone number."
 msgstr "അത് താങ്കളുടെ ഫോൺ നമ്പരല്ല."
 
 #. TRANS: Message given after successfully removing a registered SMS phone number.
-#: actions/smssettings.php:460
+#: actions/smssettings.php:459
 msgid "The SMS phone number was removed."
 msgstr "എസ്.എം.എസ്. ഫോൺ നമ്പർ നീക്കം ചെയ്തിരിക്കുന്നു."
 
 #. TRANS: Label for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:499
+#: actions/smssettings.php:498
 msgid "Mobile carrier"
 msgstr ""
 
 #. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:504
+#: actions/smssettings.php:503
 msgid "Select a carrier"
 msgstr ""
 
 #. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
 #. TRANS: %s is an administrative contact's e-mail address.
-#: actions/smssettings.php:513
+#: actions/smssettings.php:512
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -5904,7 +5930,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
-#: actions/smssettings.php:535
+#: actions/smssettings.php:534
 msgid "No code entered."
 msgstr "യാതൊരു കോഡും നൽകിയിട്ടില്ല."
 
@@ -5977,15 +6003,13 @@ msgstr ""
 msgid "Could not save subscription."
 msgstr ""
 
-#: actions/subscribe.php:77
-msgid "This action only accepts POST requests."
-msgstr ""
-
-#: actions/subscribe.php:117
+#. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
+#: actions/subscribe.php:121
 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
 msgstr ""
 
-#: actions/subscribe.php:145
+#. TRANS: Page title when subscription succeeded.
+#: actions/subscribe.php:149
 msgid "Subscribed"
 msgstr ""
 
@@ -6096,31 +6120,33 @@ msgid "Subscription feed for %s (Atom)"
 msgstr ""
 
 #. TRANS: Checkbox label for enabling Jabber messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:239
-msgid "Jabber"
-msgstr "ജാബ്ബർ"
+#: actions/subscriptions.php:241 lib/settingsnav.php:110
+msgid "IM"
+msgstr ""
 
 #. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:254
+#: actions/subscriptions.php:256 lib/settingsnav.php:117
 msgid "SMS"
 msgstr "എസ്.എം.എസ്."
 
-#: actions/tag.php:69
+#. TRANS: Title for all but the first page of notices with tags.
+#. TRANS: %1$s is the tag, %2$d is the page number.
+#: actions/tag.php:73
 #, php-format
 msgid "Notices tagged with %1$s, page %2$d"
 msgstr ""
 
-#: actions/tag.php:87
+#: actions/tag.php:91
 #, php-format
 msgid "Notice feed for tag %s (RSS 1.0)"
 msgstr ""
 
-#: actions/tag.php:93
+#: actions/tag.php:97
 #, php-format
 msgid "Notice feed for tag %s (RSS 2.0)"
 msgstr ""
 
-#: actions/tag.php:99
+#: actions/tag.php:103
 #, php-format
 msgid "Notice feed for tag %s (Atom)"
 msgstr ""
@@ -6139,28 +6165,27 @@ msgstr "റ്റാഗ് %s"
 msgid "User profile"
 msgstr ""
 
-#. TRANS: DT element in area for user avatar.
-#: actions/tagother.php:81 actions/userauthorization.php:132
-#: lib/userprofile.php:108
-msgid "Photo"
-msgstr "ഛായാചിത്രം"
-
-#: actions/tagother.php:141
+#: actions/tagother.php:120
 msgid "Tag user"
 msgstr "ഉപയോക്താവിനെ റ്റാഗ് ചെയ്യുക"
 
-#: actions/tagother.php:151
+#: actions/tagother.php:130
 msgid ""
 "Tags for this user (letters, numbers, -, ., and _), comma- or space- "
 "separated"
 msgstr ""
 
-#: actions/tagother.php:193
+#: actions/tagother.php:157
+#, php-format
+msgid "Invalid tag: \"%s\""
+msgstr "അസാധുവായ റ്റാഗ്: \"%s\""
+
+#: actions/tagother.php:172
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 
-#: actions/tagother.php:236
+#: actions/tagother.php:215
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
 
@@ -6168,6 +6193,7 @@ msgstr ""
 msgid "No such tag."
 msgstr "അത്തരത്തിൽ ഒരു റ്റാഗില്ല."
 
+#. TRANS: Client error displayed when trying to unblock a non-blocked user.
 #: actions/unblock.php:59
 msgid "You haven't blocked that user."
 msgstr ""
@@ -6188,12 +6214,83 @@ msgstr ""
 msgid "Unsubscribed"
 msgstr ""
 
-#: actions/updateprofile.php:64 actions/userauthorization.php:337
+#: actions/updateprofile.php:64
 #, php-format
 msgid ""
 "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
 msgstr ""
 
+#: actions/urlsettings.php:60
+#, fuzzy
+msgid "URL settings"
+msgstr "ഐ.എം. സജ്ജീകരണങ്ങൾ"
+
+#. TRANS: Instructions for tab "Other" in user profile settings.
+#: actions/urlsettings.php:72
+msgid "Manage various other options."
+msgstr "മറ്റ് നിരവധി ഐച്ഛികങ്ങൾ കൈകാര്യം ചെയ്യുക."
+
+#. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
+#. TRANS: user's profile settings. This message has one space at the beginning. Use your
+#. TRANS: language's word separator here if it has one (most likely a single space).
+#: actions/urlsettings.php:115
+msgid " (free service)"
+msgstr " (സൗജന്യ സേവനം)"
+
+#: actions/urlsettings.php:121
+#, fuzzy
+msgid "[none]"
+msgstr "ഒന്നുമില്ല"
+
+#: actions/urlsettings.php:122
+msgid "[internal]"
+msgstr ""
+
+#. TRANS: Label for dropdown with URL shortener services.
+#: actions/urlsettings.php:130
+msgid "Shorten URLs with"
+msgstr "യൂ.ആർ.എൽ. ചെറുതാക്കാൻ ഇതുപയോഗിക്കുക"
+
+#. TRANS: Tooltip for for dropdown with URL shortener services.
+#: actions/urlsettings.php:132
+msgid "Automatic shortening service to use."
+msgstr "ഉപയോഗിക്കാവുന്ന സ്വയംപ്രവർത്തിത ചെറുതാക്കൽ സേവനം."
+
+#: actions/urlsettings.php:138
+msgid "URL longer than"
+msgstr ""
+
+#: actions/urlsettings.php:141
+msgid "URLs longer than this will be shortened, 0 means always shorten."
+msgstr ""
+
+#: actions/urlsettings.php:145
+msgid "Text longer than"
+msgstr ""
+
+#: actions/urlsettings.php:148
+msgid ""
+"URLs in notices longer than this will be shortened, 0 means always shorten."
+msgstr ""
+
+#. TRANS: Form validation error for form "Other settings" in user profile.
+#: actions/urlsettings.php:180
+msgid "URL shortening service is too long (maximum 50 characters)."
+msgstr "യൂ.ആർ.എൽ. ചെറുതാക്കൽ സേവനം വളരെ വലുതാണ് (പരമാവധി 50 അക്ഷരങ്ങൾ)."
+
+#: actions/urlsettings.php:187
+msgid "Invalid number for max url length."
+msgstr ""
+
+#: actions/urlsettings.php:193
+#, fuzzy
+msgid "Invalid number for max notice length."
+msgstr "അറിയിപ്പിന്റെ ഉള്ളടക്കം അസാധുവാണ്."
+
+#: actions/urlsettings.php:238
+msgid "Error saving user URL shortening preferences."
+msgstr ""
+
 #. TRANS: User admin panel title
 #: actions/useradminpanel.php:58
 msgctxt "TITLE"
@@ -6219,11 +6316,11 @@ msgstr ""
 #. TRANS: users in user admin panel. %1$s is the invalid nickname.
 #: actions/useradminpanel.php:166
 #, php-format
-msgid "Invalid default subscripton: '%1$s' is not a user."
+msgid "Invalid default subscripton: \"%1$s\" is not a user."
 msgstr ""
 
-#. TRANS: Link description in user account settings menu.
-#: actions/useradminpanel.php:215 lib/accountsettingsaction.php:106
+#: actions/useradminpanel.php:215 lib/action.php:565 lib/settingsnav.php:77
+#: lib/subgroupnav.php:81
 msgid "Profile"
 msgstr ""
 
@@ -6279,124 +6376,167 @@ msgstr "പുതിയ ഉപയോക്താക്കളെ ക്ഷണി
 
 #. TRANS: Title for button to save user settings in user admin panel.
 #: actions/useradminpanel.php:302
-#, fuzzy
-msgid "Save user settings"
+msgid "Save user settings."
 msgstr "ഉപയോക്തൃ സജ്ജീകരണങ്ങൾ സേവ് ചെയ്യുക."
 
-#: actions/userauthorization.php:105
+#. TRANS: Page title.
+#: actions/userauthorization.php:109
 msgid "Authorize subscription"
 msgstr "വരിക്കാരനാകൽ അംഗീകരിക്കുക"
 
-#: actions/userauthorization.php:110
+#. TRANS: Page notice on "Auhtorize subscription" page.
+#: actions/userauthorization.php:115
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
 "user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
-"click “Reject”."
+"click \"Reject\"."
 msgstr ""
 
-#. TRANS: Menu item for site administration
-#: actions/userauthorization.php:196 actions/version.php:167
-#: lib/adminpanelaction.php:403
-msgid "License"
-msgstr "അനുമതി"
-
-#: actions/userauthorization.php:217
-#, fuzzy
+#. TRANS: Button text on Authorise Subscription page.
+#: actions/userauthorization.php:200
+msgctxt "BUTTON"
 msgid "Accept"
 msgstr "സ്വീകരിക്കുക"
 
-#: actions/userauthorization.php:218 lib/subscribeform.php:115
-#: lib/subscribeform.php:139
-msgid "Subscribe to this user"
-msgstr "ഈ ഉപയോക്താവിന്റെ വരിക്കാരൻ/വരിക്കാരി ആകുക"
+#. TRANS: Title for button on Authorise Subscription page.
+#: actions/userauthorization.php:202
+msgid "Subscribe to this user."
+msgstr "ഈ ഉപയോക്താവിന്റെ വരിക്കാരൻ/വരിക്കാരി ആകുക."
 
-#: actions/userauthorization.php:219
-#, fuzzy
+#. TRANS: Button text on Authorise Subscription page.
+#: actions/userauthorization.php:204
+msgctxt "BUTTON"
 msgid "Reject"
 msgstr "നിരസിക്കുക"
 
-#: actions/userauthorization.php:220
-#, fuzzy
-msgid "Reject this subscription"
+#. TRANS: Title for button on Authorise Subscription page.
+#: actions/userauthorization.php:206
+msgid "Reject this subscription."
 msgstr "ഈ വരിക്കാരനാകൽ നിരസിക്കുക."
 
-#: actions/userauthorization.php:232
+#. TRANS: Client error displayed for an empty authorisation request.
+#: actions/userauthorization.php:219
 msgid "No authorization request!"
 msgstr ""
 
-#: actions/userauthorization.php:254
+#. TRANS: Accept message header from Authorise subscription page.
+#: actions/userauthorization.php:242
 msgid "Subscription authorized"
 msgstr "വരിക്കാരനാകൽ അംഗീകരിക്കപ്പെട്ടു"
 
-#: actions/userauthorization.php:256
+#: actions/userauthorization.php:245
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to authorize the "
 "subscription. Your subscription token is:"
 msgstr ""
 
-#: actions/userauthorization.php:266
+#. TRANS: Reject message header from Authorise subscription page.
+#: actions/userauthorization.php:256
 msgid "Subscription rejected"
 msgstr "വരിക്കാരനാകൽ നിരസിക്കപ്പെട്ടു"
 
-#: actions/userauthorization.php:268
+#: actions/userauthorization.php:259
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to fully reject the "
 "subscription."
 msgstr ""
 
-#: actions/userauthorization.php:303
+#. TRANS: Exception thrown when no valid user is found for an authorisation request.
+#. TRANS: %s is a listener URI.
+#: actions/userauthorization.php:296
 #, php-format
-msgid "Listener URI ‘%s’ not found here."
+msgid "Listener URI \"%s\" not found here."
 msgstr ""
 
-#: actions/userauthorization.php:308
+#. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
+#. TRANS: %s is a listenee URI.
+#: actions/userauthorization.php:303
 #, fuzzy, php-format
-msgid "Listenee URI ‘%s’ is too long."
+msgid "Listenee URI \"%s\" is too long."
 msgstr "സ്രോതസ്സ് യൂ.ആർ.എൽ. വളരെ വലുതാണ്."
 
-#: actions/userauthorization.php:314
-#, fuzzy, php-format
-msgid "Listenee URI ‘%s’ is a local user."
-msgstr "സ്രോതസ്സ് യൂ.ആർ.എൽ. വളരെ വലുതാണ്."
+#. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
+#. TRANS: %s is a listenee URI.
+#: actions/userauthorization.php:311
+#, php-format
+msgid "Listenee URI \"%s\" is a local user."
+msgstr ""
 
+#. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
+#. TRANS: %s is a profile URL.
 #: actions/userauthorization.php:329
 #, php-format
-msgid "Profile URL ‘%s’ is for a local user."
+msgid "Profile URL \"%s\" is for a local user."
 msgstr ""
 
-#: actions/userauthorization.php:345
+#. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
+#. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
+#: actions/userauthorization.php:339
 #, fuzzy, php-format
-msgid "Avatar URL ‘%s’ is not valid."
+msgid ""
+"Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
+"\"."
+msgstr ""
+"അറിയിപ്പിന്റെ ഉപയോഗാനുമതിയായ് ‘%1$s’ സൈറ്റിന്റെ ഉപയോഗാനുമതിയായ ‘%2$s’ എന്നതുമായി "
+"ചേർന്നു പോകുന്നില്ല."
+
+#. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
+#. TRANS: %s is an avatar URL.
+#: actions/userauthorization.php:349
+#, fuzzy, php-format
+msgid "Avatar URL \"%s\" is not valid."
 msgstr "സ്രോതസ്സ് യൂ.ആർ.എൽ. അസാധുവാണ്."
 
-#: actions/userauthorization.php:350
+#. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
+#. TRANS: %s is an avatar URL.
+#: actions/userauthorization.php:356
 #, php-format
-msgid "Can’t read avatar URL ‘%s’."
+msgid "Cannot read avatar URL \"%s\"."
 msgstr ""
 
-#: actions/userauthorization.php:355
+#. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
+#. TRANS: %s is an avatar URL.
+#: actions/userauthorization.php:363
 #, php-format
-msgid "Wrong image type for avatar URL ‘%s’."
+msgid "Wrong image type for avatar URL \"%s\"."
 msgstr ""
 
 #. TRANS: Page title for profile design page.
-#: actions/userdesignsettings.php:74 lib/designsettings.php:63
+#: actions/userdesignsettings.php:74 lib/designsettings.php:61
 msgid "Profile design"
 msgstr ""
 
 #. TRANS: Instructions for profile design page.
-#: actions/userdesignsettings.php:84 lib/designsettings.php:74
+#: actions/userdesignsettings.php:84 lib/designsettings.php:72
 msgid ""
 "Customize the way your profile looks with a background image and a colour "
 "palette of your choice."
 msgstr ""
 
-#: actions/userdesignsettings.php:272
+#: actions/userdesignsettings.php:289
 msgid "Enjoy your hotdog!"
 msgstr "താങ്കളുടെ ഹോട്ട്ഡോഗ് ആസ്വദിക്കൂ!"
 
+#: actions/userdesignsettings.php:325
+#, fuzzy
+msgid "Design settings"
+msgstr "സൈറ്റ് സജ്ജീകരണങ്ങൾ ചേവ് ചെയ്യുക"
+
+#: actions/userdesignsettings.php:340
+msgid "View profile designs"
+msgstr ""
+
+#: actions/userdesignsettings.php:341
+msgid "Show or hide profile designs."
+msgstr ""
+
+#: actions/userdesignsettings.php:348
+#, fuzzy
+msgid "Background file"
+msgstr "പശ്ചാത്തലം"
+
 #. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number.
 #: actions/usergroups.php:66
 #, php-format
@@ -6444,6 +6584,11 @@ msgstr ""
 msgid "Contributors"
 msgstr "സംഭാവന ചെയ്തവർ"
 
+#. TRANS: Menu item for site administration
+#: actions/version.php:167 lib/adminpanelaction.php:403
+msgid "License"
+msgstr "അനുമതി"
+
 #: actions/version.php:170
 msgid ""
 "StatusNet is free software: you can redistribute it and/or modify it under "
@@ -6467,12 +6612,13 @@ msgid ""
 "along with this program.  If not, see %s."
 msgstr ""
 
-#: actions/version.php:191
-msgid "Plugins"
-msgstr "പ്ലഗിനുകൾ"
+#. TRANS: Form input field label for application name.
+#: actions/version.php:197 lib/applicationeditform.php:190
+msgid "Name"
+msgstr "പേര്"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:901
+#: actions/version.php:198 lib/action.php:885
 msgid "Version"
 msgstr "പതിപ്പ്"
 
@@ -6480,6 +6626,12 @@ msgstr "പതിപ്പ്"
 msgid "Author(s)"
 msgstr "രചയിതാവ് (രചയിതാക്കൾ)"
 
+#. TRANS: Form input field label.
+#: actions/version.php:200 lib/applicationeditform.php:208
+#: lib/groupeditform.php:168
+msgid "Description"
+msgstr "വിവരണം"
+
 #. TRANS: Activity title when marking a notice as favorite.
 #: classes/Fave.php:164
 msgid "Favor"
@@ -6594,7 +6746,7 @@ msgid "Could not create login token for %s"
 msgstr ""
 
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
-#: classes/Memcached_DataObject.php:542
+#: classes/Memcached_DataObject.php:556
 msgid "No database name or DSN found anywhere."
 msgstr ""
 
@@ -6768,18 +6920,18 @@ msgstr "%1$s ഇപ്പോൾ %2$s എന്ന ഉപയോക്താവി
 
 #. TRANS: Notice given on user registration.
 #. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:395
+#: classes/User.php:390
 #, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr "%1$s സൈറ്റിലേയ്ക്ക് സ്വാഗതം, @%2$s!"
 
 #. TRANS: Server exception.
-#: classes/User.php:918
+#: classes/User.php:923
 msgid "No single user defined for single-user mode."
 msgstr ""
 
 #. TRANS: Server exception.
-#: classes/User.php:922
+#: classes/User.php:927
 msgid "Single-user mode code called when not enabled."
 msgstr ""
 
@@ -6824,41 +6976,6 @@ msgstr ""
 msgid "No AtomPub API service for %s."
 msgstr ""
 
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:104
-msgid "Change your profile settings"
-msgstr ""
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:111
-msgid "Upload an avatar"
-msgstr ""
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:118
-msgid "Change your password"
-msgstr "താങ്കളുടെ രഹസ്യവാക്ക് മാറ്റുക"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:125
-msgid "Change email handling"
-msgstr "ഇമെയിൽ കൈകാര്യരീതിയിൽ മാറ്റം വരുത്തുക"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:132
-msgid "Design your profile"
-msgstr ""
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:139
-msgid "Other options"
-msgstr "മറ്റ് ഐച്ഛികങ്ങൾ"
-
-#. TRANS: Link description in user account settings menu.
-#: lib/accountsettingsaction.php:141
-msgid "Other"
-msgstr "മറ്റുള്ളവ"
-
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
 #: lib/action.php:161
 #, php-format
@@ -6876,206 +6993,128 @@ msgctxt "TOOLTIP"
 msgid "Show more"
 msgstr "കൂടുതൽ പ്രദർശിപ്പിക്കുക"
 
-#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:544
-msgid "Primary site navigation"
+#. TRANS: Inline reply form submit button: submits a reply comment.
+#: lib/action.php:328
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Comment"
+msgstr "ഉള്ളടക്കം"
+
+#. TRANS: Placeholder text for inline reply form. Clicking in this box will turn it into a mini notice form.
+#: lib/action.php:331
+msgid "Add a comment..."
 msgstr ""
 
-#. TRANS: Tooltip for main menu option "Personal".
-#: lib/action.php:550
-msgctxt "TOOLTIP"
-msgid "Personal profile and friends timeline"
-msgstr ""
+#: lib/action.php:559 lib/personalgroupnav.php:99
+#, fuzzy
+msgid "Home"
+msgstr "ഹോംപേജ്"
 
-#. TRANS: Main menu option when logged in for access to personal profile and friends timeline.
-#. TRANS: Personal group navigation menu option when logged in for viewing timeline of self and friends.
-#: lib/action.php:553 lib/personalgroupnav.php:100
-msgctxt "MENU"
-msgid "Personal"
-msgstr "വ്യക്തിപരം"
-
-#. TRANS: Tooltip for main menu option "Account".
-#: lib/action.php:555
-msgctxt "TOOLTIP"
-msgid "Change your email, avatar, password, profile"
-msgstr ""
-
-#. TRANS: Main menu option when logged in for access to user settings.
-#: lib/action.php:558
-msgid "Account"
-msgstr "അംഗത്വം"
-
-#. TRANS: Tooltip for main menu option "Services".
 #: lib/action.php:560
-msgctxt "TOOLTIP"
-msgid "Connect to services"
-msgstr "സേവനങ്ങളിൽ ബന്ധപ്പെടുക"
+#, fuzzy
+msgid "Friends timeline"
+msgstr "%s എന്ന ഉപയോക്താവിന്റെ സമയരേഖ"
 
-#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services.
-#: lib/action.php:563
-msgid "Connect"
-msgstr "ബന്ധപ്പെടുക"
-
-#. TRANS: Tooltip for menu option "Admin".
 #: lib/action.php:566
-msgctxt "TOOLTIP"
-msgid "Change site configuration"
-msgstr "സൈറ്റ് ക്രമീകരണങ്ങൾ മാറ്റുക"
+#, fuzzy
+msgid "Your profile"
+msgstr "അജ്ഞാതമായ കുറിപ്പ്."
 
-#. TRANS: Main menu option when logged in and site admin for access to site configuration.
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/action.php:569 lib/groupnav.php:117
-msgctxt "MENU"
-msgid "Admin"
-msgstr "കാര്യനിർവാഹക(ൻ)"
+#: lib/action.php:570 lib/action.php:593 lib/publicgroupnav.php:78
+msgid "Public"
+msgstr "സാർവ്വജനികം"
 
-#. TRANS: Tooltip for main menu option "Invite".
-#: lib/action.php:573
-#, php-format
-msgctxt "TOOLTIP"
-msgid "Invite friends and colleagues to join you on %s"
-msgstr "%s-ൽ നമ്മോടൊപ്പം ചേരാൻ സുഹൃത്തുക്കളേയും സഹപ്രവർത്തകരേയും ക്ഷണിക്കുക"
+#: lib/action.php:571 lib/action.php:594
+#, fuzzy
+msgid "Everyone on this site"
+msgstr "ഈ സൈറ്റിലെ ആൾക്കാരെ കണ്ടെത്തുക"
+
+#: lib/action.php:575
+#, fuzzy
+msgid "Settings"
+msgstr "എസ്.എം.എസ്. സജ്ജീകരണങ്ങൾ"
 
-#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users.
 #: lib/action.php:576
-msgctxt "MENU"
-msgid "Invite"
-msgstr "ക്ഷണിക്കുക"
+#, fuzzy
+msgid "Change your personal settings"
+msgstr "താങ്കളുടെ രഹസ്യവാക്ക് മാറ്റുക"
 
-#. TRANS: Tooltip for main menu option "Logout"
 #: lib/action.php:582
-msgctxt "TOOLTIP"
-msgid "Logout from the site"
-msgstr "സൈറ്റിൽ നിന്നും പുറത്തുകടക്കുക"
+#, fuzzy
+msgid "Site configuration"
+msgstr "ഉപയോക്തൃ ക്രമീകരണം"
 
-#. TRANS: Main menu option when logged in to log out the current user.
-#: lib/action.php:585
-msgctxt "MENU"
+#: lib/action.php:587
+#, fuzzy
 msgid "Logout"
 msgstr "ലോഗൗട്ട്"
 
-#. TRANS: Tooltip for main menu option "Register".
-#: lib/action.php:590
-msgctxt "TOOLTIP"
-msgid "Create an account"
-msgstr "ഒരംഗത്വമെടുക്കുക"
+#: lib/action.php:588
+#, fuzzy
+msgid "Logout from the site"
+msgstr "സൈറ്റിൽ നിന്നും പുറത്തുകടക്കുക"
 
-#. TRANS: Main menu option when not logged in to register a new account.
-#. TRANS: Menu item for registering with the StatusNet site.
-#: lib/action.php:593 lib/logingroupnav.php:85
-msgctxt "MENU"
-msgid "Register"
-msgstr "രജിസ്റ്റർ"
-
-#. TRANS: Tooltip for main menu option "Login".
-#: lib/action.php:596
-msgctxt "TOOLTIP"
+#: lib/action.php:599
+#, fuzzy
 msgid "Login to the site"
 msgstr "സൈറ്റിലേക്ക് പ്രവേശിക്കുക"
 
-#. TRANS: Main menu option when not logged in to log in.
-#. TRANS: Menu item for logging in to the StatusNet site.
-#: lib/action.php:599 lib/logingroupnav.php:77
-msgctxt "MENU"
-msgid "Login"
-msgstr "പ്രവേശിക്കുക"
-
-#. TRANS: Tooltip for main menu option "Help".
-#: lib/action.php:602
-msgctxt "TOOLTIP"
-msgid "Help me!"
-msgstr "എന്നെ സഹായിക്കൂ!"
-
-#. TRANS: Main menu option for help on the StatusNet site.
-#: lib/action.php:605
-msgctxt "MENU"
-msgid "Help"
-msgstr "സഹായം"
-
-#. TRANS: Tooltip for main menu option "Search".
-#: lib/action.php:608
-msgctxt "TOOLTIP"
-msgid "Search for people or text"
-msgstr "ആൾക്കാരെയോ എഴുത്തോ തിരയുക"
-
-#. TRANS: Main menu option when logged in or when the StatusNet instance is not private.
-#: lib/action.php:611
-msgctxt "MENU"
+#: lib/action.php:606
+#, fuzzy
 msgid "Search"
 msgstr "തിരയുക"
 
-#. TRANS: DT element for site notice. String is hidden in default CSS.
-#. TRANS: Menu item for site administration
-#: lib/action.php:633 lib/adminpanelaction.php:387
-msgid "Site notice"
-msgstr "സൈറ്റ് അറിയിപ്പ്"
-
-#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:700
-msgid "Local views"
-msgstr "പ്രാദേശിക എടുത്തുനോക്കലുകൾ"
-
-#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:770
-msgid "Page notice"
-msgstr "താളിലെ അറിയിപ്പ്"
-
-#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:874
-msgid "Secondary site navigation"
-msgstr ""
+#: lib/action.php:607
+#, fuzzy
+msgid "Search the site"
+msgstr "സൈറ്റിൽ തിരയുക"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:880
+#: lib/action.php:864
 msgid "Help"
 msgstr "സഹായം"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:883
+#: lib/action.php:867
 msgid "About"
 msgstr "വിവരണം"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:886
+#: lib/action.php:870
 msgid "FAQ"
 msgstr "പതിവുചോദ്യങ്ങൾ"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:891
+#: lib/action.php:875
 msgid "TOS"
 msgstr ""
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:895
+#: lib/action.php:879
 msgid "Privacy"
 msgstr "സ്വകാര്യത"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:898
+#: lib/action.php:882
 msgid "Source"
 msgstr "സ്രോതസ്സ്"
 
 #. TRANS: Secondary navigation menu option leading to e-mail contact information on the
 #. TRANS: StatusNet site, where to report bugs, ...
-#: lib/action.php:905
+#: lib/action.php:889
 msgid "Contact"
 msgstr "സമ്പർക്കം"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:908
+#: lib/action.php:892
 msgid "Badge"
 msgstr ""
 
-#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:937
-msgid "StatusNet software license"
-msgstr "സ്റ്റാറ്റസ്‌നെറ്റ് സോഫ്റ്റ്‌വേർ അനുമതി"
-
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:944
+#: lib/action.php:921
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7083,7 +7122,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:947
+#: lib/action.php:924
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr ""
@@ -7092,7 +7131,7 @@ msgstr ""
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:954
+#: lib/action.php:931
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7100,51 +7139,41 @@ msgid ""
 "org/licensing/licenses/agpl-3.0.html)."
 msgstr ""
 
-#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:970
-msgid "Site content license"
-msgstr "സൈറ്റിന്റെ ഉള്ളടക്കത്തിന്റെ ഉപയോഗാനുമതി"
-
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:977
+#: lib/action.php:949
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr "%1$s സൈറ്റിന്റെ ഉള്ളടക്കം സ്വകാര്യവും രഹസ്യവുമാണ്."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:984
+#: lib/action.php:956
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:988
+#: lib/action.php:960
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr "ഉള്ളടക്കവും വിവരങ്ങളും സംഭാവകർക്ക് പകർപ്പവകാശമുള്ളതാണ്. എല്ലാ അവകാശങ്ങളും സംരക്ഷിതം."
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:1020
+#: lib/action.php:992
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
 
-#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1356
-msgid "Pagination"
-msgstr ""
-
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1367
+#: lib/action.php:1335
 msgid "After"
 msgstr "ശേഷം"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1377
+#: lib/action.php:1345
 msgid "Before"
 msgstr "മുമ്പ്"
 
@@ -7296,7 +7325,7 @@ msgid "User configuration"
 msgstr "ഉപയോക്തൃ ക്രമീകരണം"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:122
+#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:110
 msgid "User"
 msgstr "ഉപയോക്താവ്"
 
@@ -7320,6 +7349,11 @@ msgstr ""
 msgid "Edit site notice"
 msgstr "സൈറ്റ് അറിയിപ്പ് തിരുത്തുക"
 
+#. TRANS: Menu item for site administration
+#: lib/adminpanelaction.php:387
+msgid "Site notice"
+msgstr "സൈറ്റ് അറിയിപ്പ്"
+
 #. TRANS: Menu item title/tooltip
 #: lib/adminpanelaction.php:393
 msgid "Snapshots configuration"
@@ -7330,6 +7364,12 @@ msgstr ""
 msgid "Set site license"
 msgstr "സൈറ്റിന്റെ ഉപയോഗാനുമതി സജ്ജീകരിക്കുക"
 
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:409
+#, fuzzy
+msgid "Plugins configuration"
+msgstr "രൂപകല്പനാ ക്രമീകരണം"
+
 #. TRANS: Client error 401.
 #: lib/apiauth.php:111
 msgid "API resource requires read-write access, but you only have read access."
@@ -7340,19 +7380,23 @@ msgstr ""
 msgid "No application for that consumer key."
 msgstr ""
 
+#: lib/apiauth.php:202 lib/apiauth.php:284
+msgid "Not allowed to use API."
+msgstr ""
+
 #. TRANS: OAuth exception given when an incorrect access token was given for a user.
-#: lib/apiauth.php:219
+#: lib/apiauth.php:225
 msgid "Bad access token."
 msgstr ""
 
 #. TRANS: OAuth exception given when no user was found for a given token (no token was found).
-#: lib/apiauth.php:224
+#: lib/apiauth.php:230
 msgid "No user for that token."
 msgstr ""
 
 #. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel".
 #. TRANS: Client error thrown when authentication fails.
-#: lib/apiauth.php:266 lib/apiauth.php:293
+#: lib/apiauth.php:272 lib/apiauth.php:302
 msgid "Could not authenticate you."
 msgstr ""
 
@@ -7395,6 +7439,11 @@ msgstr ""
 msgid "Failed to delete revoked token."
 msgstr ""
 
+#. TRANS: Form input field label for application icon.
+#: lib/applicationeditform.php:177
+msgid "Icon"
+msgstr "ഐകോൺ"
+
 #. TRANS: Form guide.
 #: lib/applicationeditform.php:182
 msgid "Icon for this application"
@@ -7429,6 +7478,11 @@ msgstr "സ്രോതസ്സ് യു.ആർ.എൽ"
 msgid "Organization responsible for this application"
 msgstr ""
 
+#. TRANS: Form input field label.
+#: lib/applicationeditform.php:227
+msgid "Organization"
+msgstr "സംഘടന"
+
 #. TRANS: Form input field instructions.
 #: lib/applicationeditform.php:234
 msgid "URL for the homepage of the organization"
@@ -7516,16 +7570,6 @@ msgstr ""
 msgid "Do not use this method!"
 msgstr "ഈ മാർഗ്ഗം ഉപയോഗിക്കരുത്!"
 
-#. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:293
-msgid "Author"
-msgstr "രചയിതാവ്"
-
-#. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:307
-msgid "Provider"
-msgstr ""
-
 #. TRANS: Title.
 #: lib/attachmentnoticesection.php:67
 msgid "Notices where this attachment appears"
@@ -7551,23 +7595,28 @@ msgstr "രഹസ്യവാക്ക് മാറ്റൽ അനുവദി
 msgid "Block"
 msgstr "തടയുക"
 
+#. TRANS: Description of the form to block a user.
+#: lib/blockform.php:79
+msgid "Block this user"
+msgstr "ഈ ഉപയോക്താവിനെ തടയുക"
+
 #. TRANS: Title for command results.
-#: lib/channel.php:160 lib/channel.php:181
+#: lib/channel.php:104 lib/channel.php:125
 msgid "Command results"
 msgstr ""
 
 #. TRANS: Title for command results.
-#: lib/channel.php:194
+#: lib/channel.php:138
 msgid "AJAX error"
 msgstr "അജാക്സ് പിഴവ്"
 
 #. TRANS: E-mail subject when a command has completed.
-#: lib/channel.php:233 lib/mailhandler.php:143
+#: lib/channel.php:177 lib/mailhandler.php:143
 msgid "Command complete"
 msgstr ""
 
 #. TRANS: E-mail subject when a command has failed.
-#: lib/channel.php:244
+#: lib/channel.php:188
 msgid "Command failed"
 msgstr ""
 
@@ -7670,7 +7719,7 @@ msgstr "പൂർണ്ണനാമം: %s"
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a location.
-#: lib/command.php:446 lib/mail.php:270
+#: lib/command.php:446 lib/mail.php:275
 #, php-format
 msgid "Location: %s"
 msgstr "സ്ഥാനം: %s"
@@ -7678,7 +7727,7 @@ msgstr "സ്ഥാനം: %s"
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a homepage.
-#: lib/command.php:450 lib/mail.php:274
+#: lib/command.php:450 lib/mail.php:279
 #, php-format
 msgid "Homepage: %s"
 msgstr "പ്രധാനതാൾ: %s"
@@ -7910,106 +7959,101 @@ msgid ""
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:162
+#: lib/common.php:36
 msgid "No configuration file found."
 msgstr "ക്രമീകരണ പ്രമാണം കണ്ടെത്താനായില്ല."
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:165
+#: lib/common.php:39
 msgid "I looked for configuration files in the following places:"
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:168
+#: lib/common.php:42
 msgid "You may wish to run the installer to fix this."
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:172
+#: lib/common.php:46
 msgid "Go to the installer."
 msgstr ""
 
-#. TRANS: Menu item for Instant Messaging settings.
-#: lib/connectsettingsaction.php:106
-msgctxt "MENU"
-msgid "IM"
-msgstr ""
-
-#. TRANS: Tooltip for Instant Messaging menu item.
-#: lib/connectsettingsaction.php:108
-msgid "Updates by instant messenger (IM)"
-msgstr ""
-
-#. TRANS: Menu item for Short Message Service settings.
-#: lib/connectsettingsaction.php:113
-msgctxt "MENU"
-msgid "SMS"
-msgstr "എസ്.എം.എസ്."
-
-#. TRANS: Tooltip for Short Message Service menu item.
-#: lib/connectsettingsaction.php:115
-msgid "Updates by SMS"
-msgstr ""
-
-#. TRANS: Menu item for OuAth connection settings.
-#: lib/connectsettingsaction.php:120
-msgctxt "MENU"
-msgid "Connections"
-msgstr "ബന്ധങ്ങൾ"
-
-#. TRANS: Tooltip for connected applications (Connections through OAuth) menu item.
-#: lib/connectsettingsaction.php:122
-msgid "Authorized connected applications"
-msgstr ""
-
 #: lib/dberroraction.php:59
 msgid "Database error"
 msgstr "ഡാറ്റാബേസ് പിഴവ്"
 
+#. TRANS: Description of form for deleting a user.
+#: lib/deleteuserform.php:75
+msgid "Delete this user"
+msgstr "ഈ ഉപയോക്താവിനെ നീക്കം ചെയ്യുക"
+
+#: lib/designform.php:114
+#, fuzzy
+msgid "Change design"
+msgstr "രൂപകല്പന സേവ്‌ ചെയ്യുക"
+
+#. TRANS: Fieldset legend on profile design page to change profile page colours.
+#: lib/designform.php:131
+msgid "Change colours"
+msgstr "നിറങ്ങൾ മാറ്റുക"
+
+#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
+#: lib/designform.php:138
+msgid "Use defaults"
+msgstr "സ്വതേയുള്ളവ ഉപയോഗിക്കുക"
+
+#. TRANS: Title for button on profile design page to reset all colour settings to default.
+#: lib/designform.php:140
+msgid "Restore default designs"
+msgstr "സ്വതേയുള്ള രൂപകല്പനകൾ പുനഃസ്ഥാപിക്കുക"
+
+#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
+#: lib/designform.php:148
+msgid "Reset back to default"
+msgstr "മുമ്പ് സ്വതേയുണ്ടായിരുന്നതിലേയ്ക്ക് പുനഃസ്ഥാപിക്കുക"
+
 #. TRANS: Label in form on profile design page.
 #. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
-#: lib/designsettings.php:108
+#: lib/designform.php:158
 msgid "Upload file"
 msgstr "പ്രമാണം അപ്‌ലോഡ് ചെയ്യുക"
 
 #. TRANS: Instructions for form on profile design page.
-#: lib/designsettings.php:113
+#: lib/designform.php:163
+#, fuzzy
 msgid ""
-"You can upload your personal background image. The maximum file size is 2MB."
+"You can upload your personal background image. The maximum file size is 2Mb."
 msgstr ""
+"താങ്കൾക്ക് ഈ സൈറ്റിനുള്ള പശ്ചാത്തല ചിത്രം അപ്‌ലോഡ് ചെയ്യാവുന്നതാണ്. പ്രമാണത്തിന്റെ പരമാവധി "
+"വലിപ്പം %1$s ആയിരിക്കണം."
 
 #. TRANS: Radio button on profile design page that will enable use of the uploaded profile image.
-#: lib/designsettings.php:139
+#: lib/designform.php:194
 msgctxt "RADIO"
 msgid "On"
 msgstr "സജ്ജം"
 
 #. TRANS: Radio button on profile design page that will disable use of the uploaded profile image.
-#: lib/designsettings.php:156
+#: lib/designform.php:211
 msgctxt "RADIO"
 msgid "Off"
 msgstr "രഹിതം"
 
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: lib/designsettings.php:175
-msgid "Change colours"
-msgstr "നിറങ്ങൾ മാറ്റുക"
-
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: lib/designsettings.php:257
-msgid "Use defaults"
-msgstr "സ്വതേയുള്ളവ ഉപയോഗിക്കുക"
+#. TRANS: Title for button on profile design page to save settings.
+#: lib/designform.php:322
+msgid "Save design"
+msgstr "രൂപകല്പന സേവ്‌ ചെയ്യുക"
 
 #. TRANS: Error message displayed if design settings could not be saved.
 #. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
-#: lib/designsettings.php:405 lib/designsettings.php:427
+#: lib/designsettings.php:216 lib/designsettings.php:238
 msgid "Couldn't update your design."
 msgstr "താങ്കളുടെ രൂപകല്പന പുതുക്കാനായില്ല."
 
 #. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
-#: lib/designsettings.php:433
+#: lib/designsettings.php:244
 msgid "Design defaults restored."
 msgstr "സ്വതേയുള്ള രൂപകല്പന പുനഃസ്ഥാപിച്ചിരിക്കുന്നു."
 
@@ -8076,27 +8120,23 @@ msgstr ""
 msgid "Feeds"
 msgstr "ഫീഡ്"
 
-#: lib/galleryaction.php:121
-msgid "Filter tags"
-msgstr ""
-
-#: lib/galleryaction.php:131
+#: lib/galleryaction.php:128
 msgid "All"
 msgstr "എല്ലാം"
 
-#: lib/galleryaction.php:139
+#: lib/galleryaction.php:136
 msgid "Select tag to filter"
 msgstr ""
 
-#: lib/galleryaction.php:140
+#: lib/galleryaction.php:137
 msgid "Tag"
 msgstr "റ്റാഗ്"
 
-#: lib/galleryaction.php:141
+#: lib/galleryaction.php:138
 msgid "Choose a tag to narrow list"
 msgstr ""
 
-#: lib/galleryaction.php:143
+#: lib/galleryaction.php:140
 msgid "Go"
 msgstr "പോകൂ"
 
@@ -8184,6 +8224,12 @@ msgctxt "TOOLTIP"
 msgid "%s blocked users"
 msgstr "%s തടയപ്പെട്ട ഉപയോക്താക്കൾ"
 
+#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
+#: lib/groupnav.php:117
+msgctxt "MENU"
+msgid "Admin"
+msgstr "കാര്യനിർവാഹക(ൻ)"
+
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
 #: lib/groupnav.php:120
@@ -8293,39 +8339,62 @@ msgid_plural "%dB"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/jabber.php:387
+#: lib/implugin.php:262
 #, php-format
-msgid "[%s]"
+msgid ""
+"User \"%s\" on %s has said that your %s screenname belongs to them. If "
+"that's true, you can confirm by clicking on this URL: %s . (If you cannot "
+"click it, copy-and-paste it into the address bar of your browser). If that "
+"user isn't you, or if you didn't request this confirmation, just ignore this "
+"message."
 msgstr ""
 
-#: lib/jabber.php:567
+#: lib/implugin.php:349
 #, php-format
 msgid "Unknown inbox source %d."
 msgstr ""
 
+#: lib/implugin.php:485
+#, fuzzy, php-format
+msgid "Message too long - maximum is %1$d characters, you sent %2$d."
+msgstr ""
+"സന്ദേശത്തിന് നീളം കൂടുതലാണ്. പരമാവധി %1$d അക്ഷരം മാത്രം, താങ്കൾ അയച്ചത് %2$d അക്ഷരങ്ങൾ."
+
 #: lib/leaveform.php:114
 msgid "Leave"
 msgstr "ഒഴിവായി പോവുക"
 
+#. TRANS: Menu item for logging in to the StatusNet site.
+#: lib/logingroupnav.php:77
+msgctxt "MENU"
+msgid "Login"
+msgstr "പ്രവേശിക്കുക"
+
 #. TRANS: Title for menu item for logging in to the StatusNet site.
 #: lib/logingroupnav.php:79
 msgid "Login with a username and password"
 msgstr "ഉപയോക്തൃനാമവും രഹസ്യവാക്കും ഉപയോഗിച്ച് ലോഗിൻ ചെയ്യുക"
 
+#. TRANS: Menu item for registering with the StatusNet site.
+#: lib/logingroupnav.php:85
+msgctxt "MENU"
+msgid "Register"
+msgstr "രജിസ്റ്റർ"
+
 #. TRANS: Title for menu item for registering with the StatusNet site.
 #: lib/logingroupnav.php:87
 msgid "Sign up for a new account"
 msgstr "പുതിയൊരംഗത്വം എടുക്കുക"
 
 #. TRANS: Subject for address confirmation email.
-#: lib/mail.php:168
+#: lib/mail.php:172
 msgid "Email address confirmation"
 msgstr "ഇമെയിൽ വിലാസത്തിന്റെ സ്ഥിരീകരണം"
 
 #. TRANS: Body for address confirmation email.
 #. TRANS: %1$s is the addressed user's nickname, %2$s is the StatusNet sitename,
 #. TRANS: %3$s is the URL to confirm at.
-#: lib/mail.php:173
+#: lib/mail.php:177
 #, php-format
 msgid ""
 "Hey, %1$s.\n"
@@ -8344,14 +8413,14 @@ msgstr ""
 
 #. TRANS: Subject of new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
-#: lib/mail.php:238
+#: lib/mail.php:243
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr ""
 
 #. TRANS: This is a paragraph in a new-subscriber e-mail.
 #. TRANS: %s is a URL where the subscriber can be reported as abusive.
-#: lib/mail.php:245
+#: lib/mail.php:250
 #, php-format
 msgid ""
 "If you believe this account is being used abusively, you can block them from "
@@ -8363,7 +8432,7 @@ msgstr ""
 #. TRANS: %3$s is the subscriber's profile URL, %4$s is the subscriber's location (or empty)
 #. TRANS: %5$s is the subscriber's homepage URL (or empty), %6%s is the subscriber's bio (or empty)
 #. TRANS: %7$s is a link to the addressed user's e-mail settings.
-#: lib/mail.php:255
+#: lib/mail.php:260
 #, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -8380,14 +8449,14 @@ msgstr ""
 
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is biographical information.
-#: lib/mail.php:278
+#: lib/mail.php:283
 #, php-format
 msgid "Bio: %s"
 msgstr ""
 
 #. TRANS: Subject of notification mail for new posting email address.
 #. TRANS: %s is the StatusNet sitename.
-#: lib/mail.php:307
+#: lib/mail.php:312
 #, php-format
 msgid "New email address for posting to %s"
 msgstr "%s സൈറ്റിൽ പ്രസിദ്ധീകരിക്കാനുള്ള പുതിയ ഇമെയിൽ വിലാസം"
@@ -8395,7 +8464,7 @@ msgstr "%s സൈറ്റിൽ പ്രസിദ്ധീകരിക്ക
 #. TRANS: Body of notification mail for new posting email address.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is the e-mail address to send
 #. TRANS: to to post by e-mail, %3$s is a URL to more instructions.
-#: lib/mail.php:313
+#: lib/mail.php:318
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -8410,26 +8479,26 @@ msgstr ""
 
 #. TRANS: Subject line for SMS-by-email notification messages.
 #. TRANS: %s is the posting user's nickname.
-#: lib/mail.php:434
+#: lib/mail.php:439
 #, php-format
 msgid "%s status"
 msgstr "%s സ്ഥിതി"
 
 #. TRANS: Subject line for SMS-by-email address confirmation message.
-#: lib/mail.php:460
+#: lib/mail.php:465
 msgid "SMS confirmation"
 msgstr "എസ്.എം.എസ്. സ്ഥിരീകരണം"
 
 #. TRANS: Main body heading for SMS-by-email address confirmation message.
 #. TRANS: %s is the addressed user's nickname.
-#: lib/mail.php:464
+#: lib/mail.php:469
 #, php-format
 msgid "%s: confirm you own this phone number with this code:"
 msgstr "%s: താങ്കളുടെ സ്വന്തം ഫോൺ നമ്പർ ഈ കോഡ് ഉപയോഗിച്ച് സ്ഥിരീകരിക്കുക:"
 
 #. TRANS: Subject for 'nudge' notification email.
 #. TRANS: %s is the nudging user.
-#: lib/mail.php:485
+#: lib/mail.php:490
 #, php-format
 msgid "You have been nudged by %s"
 msgstr ""
@@ -8437,7 +8506,7 @@ msgstr ""
 #. TRANS: Body for 'nudge' notification email.
 #. TRANS: %1$s is the nuding user's long name, $2$s is the nudging user's nickname,
 #. TRANS: %3$s is a URL to post notices at, %4$s is the StatusNet sitename.
-#: lib/mail.php:492
+#: lib/mail.php:497
 #, php-format
 msgid ""
 "%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -8455,7 +8524,7 @@ msgstr ""
 
 #. TRANS: Subject for direct-message notification email.
 #. TRANS: %s is the sending user's nickname.
-#: lib/mail.php:539
+#: lib/mail.php:544
 #, php-format
 msgid "New private message from %s"
 msgstr "%s അയച്ച സ്വകാര്യ സന്ദേശങ്ങൾ"
@@ -8464,7 +8533,7 @@ msgstr "%s അയച്ച സ്വകാര്യ സന്ദേശങ്ങ
 #. TRANS: %1$s is the sending user's long name, %2$s is the sending user's nickname,
 #. TRANS: %3$s is the message content, %4$s a URL to the message,
 #. TRANS: %5$s is the StatusNet sitename.
-#: lib/mail.php:547
+#: lib/mail.php:552
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -8485,7 +8554,7 @@ msgstr ""
 
 #. TRANS: Subject for favorite notification e-mail.
 #. TRANS: %1$s is the adding user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:599
+#: lib/mail.php:604
 #, php-format
 msgid "%1$s (@%2$s) added your notice as a favorite"
 msgstr ""
@@ -8495,7 +8564,7 @@ msgstr ""
 #. TRANS: %3$s is a URL to the faved notice, %4$s is the faved notice text,
 #. TRANS: %5$s is a URL to all faves of the adding user, %6$s is the StatusNet sitename,
 #. TRANS: %7$s is the adding user's nickname.
-#: lib/mail.php:606
+#: lib/mail.php:611
 #, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -8517,7 +8586,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:664
+#: lib/mail.php:669
 #, php-format
 msgid ""
 "The full conversation can be read here:\n"
@@ -8530,7 +8599,7 @@ msgstr ""
 
 #. TRANS: E-mail subject for notice notification.
 #. TRANS: %1$s is the sending user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:672
+#: lib/mail.php:677
 #, php-format
 msgid "%1$s (@%2$s) sent a notice to your attention"
 msgstr "%1$s (@%2$s) താങ്കളുടെ ശ്രദ്ധയ്ക്കായി ഒരു അറിയിപ്പ് അയച്ചിരിക്കുന്നു"
@@ -8541,7 +8610,7 @@ msgstr "%1$s (@%2$s) താങ്കളുടെ ശ്രദ്ധയ്ക്
 #. TRANS: %5$s is a URL to the full conversion if it exists (otherwise empty),
 #. TRANS: %6$s is a URL to reply to the notice, %7$s is a URL to all @-replied for the addressed user,
 #. TRANS: %8$s is a URL to the addressed user's e-mail settings, %9$s is the sender's nickname.
-#: lib/mail.php:680
+#: lib/mail.php:685
 #, php-format
 msgid ""
 "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -8660,11 +8729,7 @@ msgstr ""
 msgid "To"
 msgstr "സ്വീകർത്താവ്"
 
-#: lib/messageform.php:166 lib/noticeform.php:186
-msgid "Available characters"
-msgstr "ലഭ്യമായ അക്ഷരങ്ങൾ"
-
-#: lib/messageform.php:185 lib/noticeform.php:237
+#: lib/messageform.php:184 lib/noticeform.php:236
 msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr "അയക്കുക"
@@ -8673,15 +8738,10 @@ msgstr "അയക്കുക"
 msgid "Messages"
 msgstr "സന്ദേശങ്ങൾ"
 
-#: lib/messagelistitem.php:123 lib/noticelist.php:522
+#: lib/messagelistitem.php:123 lib/noticelist.php:527
 msgid "from"
 msgstr "അയച്ചത്"
 
-#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:165
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr "വിളിപ്പേരിൽ ഇംഗ്ലീഷ് ചെറിയക്ഷരങ്ങളും അക്കങ്ങളും ഇടവിടാതെ നൽകുക."
-
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 #: lib/nickname.php:178
 msgid "Nickname cannot be empty."
@@ -8704,23 +8764,23 @@ msgstr "അറിയിപ്പ് അയയ്ക്കുക"
 msgid "What's up, %s?"
 msgstr "എന്തൊക്കെയുണ്ട്, %s?"
 
-#: lib/noticeform.php:194
+#: lib/noticeform.php:193
 msgid "Attach"
 msgstr "ചേർത്തുവെയ്ക്കുക"
 
-#: lib/noticeform.php:198
+#: lib/noticeform.php:197
 msgid "Attach a file"
 msgstr "പ്രമാണം ചേർത്തു വെയ്ക്കുക"
 
-#: lib/noticeform.php:213
+#: lib/noticeform.php:212
 msgid "Share my location"
 msgstr "എന്റെ സ്ഥാനം പങ്ക് വെയ്ക്കുക"
 
-#: lib/noticeform.php:216
+#: lib/noticeform.php:215
 msgid "Do not share my location"
 msgstr "എന്റെ സ്ഥാനം പങ്ക് വെയ്ക്കരുത്"
 
-#: lib/noticeform.php:217
+#: lib/noticeform.php:216
 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
 "try again later"
@@ -8729,55 +8789,59 @@ msgstr ""
 "വീണ്ടും ശ്രമിക്കുക"
 
 #. TRANS: Used in coordinates as abbreviation of north
-#: lib/noticelist.php:452
+#: lib/noticelist.php:457
 msgid "N"
 msgstr "വ"
 
 #. TRANS: Used in coordinates as abbreviation of south
-#: lib/noticelist.php:454
+#: lib/noticelist.php:459
 msgid "S"
 msgstr "തെ"
 
 #. TRANS: Used in coordinates as abbreviation of east
-#: lib/noticelist.php:456
+#: lib/noticelist.php:461
 msgid "E"
 msgstr "കി"
 
 #. TRANS: Used in coordinates as abbreviation of west
-#: lib/noticelist.php:458
+#: lib/noticelist.php:463
 msgid "W"
 msgstr "പ"
 
-#: lib/noticelist.php:460
+#: lib/noticelist.php:465
 #, php-format
 msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgstr ""
 
-#: lib/noticelist.php:469
+#: lib/noticelist.php:474
 msgid "at"
 msgstr ""
 
-#: lib/noticelist.php:518
+#: lib/noticelist.php:523
 msgid "web"
 msgstr "വെബ്"
 
-#: lib/noticelist.php:584
+#: lib/noticelist.php:589
 msgid "in context"
 msgstr ""
 
-#: lib/noticelist.php:619
+#: lib/noticelist.php:624
 msgid "Repeated by"
 msgstr "ആവർത്തിച്ചത്"
 
-#: lib/noticelist.php:646
+#: lib/noticelist.php:651
 msgid "Reply to this notice"
 msgstr "ഈ അറിയിപ്പിന് മറുപടിയിടുക"
 
-#: lib/noticelist.php:647
+#: lib/noticelist.php:652
 msgid "Reply"
 msgstr "മറുപടി"
 
-#: lib/noticelist.php:691
+#: lib/noticelist.php:678
+msgid "Delete this notice"
+msgstr "ഈ അറിയിപ്പ് മായ്ക്കുക"
+
+#: lib/noticelist.php:696
 msgid "Notice repeated"
 msgstr "അറിയിപ്പ് ആവർത്തിച്ചിരിക്കുന്നു"
 
@@ -8814,44 +8878,31 @@ msgstr "അറിയിപ്പിന്റെ പകർപ്പ്."
 msgid "Couldn't insert new subscription."
 msgstr ""
 
-#. TRANS: Personal group navigation menu option when logged in for viewing @-replies.
-#: lib/personalgroupnav.php:107
-msgctxt "MENU"
+#: lib/personalgroupnav.php:104
+#, fuzzy
 msgid "Replies"
 msgstr "മറുപടികൾ"
 
-#. TRANS: Personal group navigation menu option when logged in for seeing own profile.
-#: lib/personalgroupnav.php:114
+#: lib/personalgroupnav.php:109
 #, fuzzy
-msgctxt "MENU"
-msgid "Profile"
-msgstr "ജനങ്ങൾ"
-
-#. TRANS: Personal group navigation menu option when logged in for viewing own favourited notices.
-#: lib/personalgroupnav.php:120
-msgctxt "MENU"
 msgid "Favorites"
-msgstr ""
+msgstr "%s എന്ന ഉപയോക്താവിന് പ്രിയങ്കരമായവ"
 
-#. TRANS: Personal group navigation menu option when logged in for viewing recieved personal messages.
-#: lib/personalgroupnav.php:133
-msgctxt "MENU"
+#: lib/personalgroupnav.php:120
+#, fuzzy
 msgid "Inbox"
 msgstr "ഇൻബോക്സ്"
 
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing recieved personal messages.
-#: lib/personalgroupnav.php:135
+#: lib/personalgroupnav.php:121
 msgid "Your incoming messages"
 msgstr "താങ്കൾക്ക് വരുന്ന സന്ദേശങ്ങൾ"
 
-#. TRANS: Personal group navigation menu option when logged in for viewing senet personal messages.
-#: lib/personalgroupnav.php:140
-msgctxt "MENU"
+#: lib/personalgroupnav.php:125
+#, fuzzy
 msgid "Outbox"
 msgstr "ഔട്ട്ബോക്സ്"
 
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing senet personal messages.
-#: lib/personalgroupnav.php:142
+#: lib/personalgroupnav.php:126
 msgid "Your sent messages"
 msgstr "താങ്കൾ അയച്ച സന്ദേശങ്ങൾ"
 
@@ -8866,9 +8917,26 @@ msgstr ""
 msgid "Unknown"
 msgstr "അജ്ഞാതം"
 
+#. TRANS: Plugin admin panel controls
+#: lib/plugindisableform.php:90
+msgctxt "plugin"
+msgid "Disable"
+msgstr ""
+
+#. TRANS: Plugin admin panel controls
+#: lib/pluginenableform.php:112
+msgctxt "plugin"
+msgid "Enable"
+msgstr ""
+
+#: lib/pluginlist.php:196
+msgctxt "plugin-description"
+msgid "(Plugin descriptions unavailable when disabled.)"
+msgstr ""
+
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:82
+#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:88
 msgid "Subscriptions"
 msgstr ""
 
@@ -8879,7 +8947,7 @@ msgstr ""
 
 #. TRANS: H2 text for user subscriber statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:90
+#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:96
 msgid "Subscribers"
 msgstr "വരിക്കാർ"
 
@@ -8901,7 +8969,7 @@ msgstr "അംഗമായത്"
 #. TRANS: Label for user statistics.
 #. TRANS: H2 text for user group membership statistics.
 #: lib/profileaction.php:239 lib/profileaction.php:290
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:104
 msgid "Groups"
 msgstr "സംഘങ്ങൾ"
 
@@ -8921,10 +8989,6 @@ msgstr "എല്ലാ സംഘങ്ങളും"
 msgid "Unimplemented method."
 msgstr ""
 
-#: lib/publicgroupnav.php:78
-msgid "Public"
-msgstr "സാർവ്വജനികം"
-
 #: lib/publicgroupnav.php:82
 msgid "User groups"
 msgstr "ഉപയോക്തൃ സംഘങ്ങൾ"
@@ -8963,7 +9027,7 @@ msgid "Revoke the \"%s\" role from this user"
 msgstr ""
 
 #. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:974
+#: lib/router.php:1001
 msgid "Page not found."
 msgstr "താൾ കണ്ടെത്താനായില്ല."
 
@@ -8992,11 +9056,6 @@ msgctxt "BUTTON"
 msgid "Search"
 msgstr "തിരയുക"
 
-#. TRANS: Definition list item with instructions on how to get (better) search results.
-#: lib/searchaction.php:170
-msgid "Search help"
-msgstr "തിരച്ചിലിനുള്ള സഹായം"
-
 #: lib/searchgroupnav.php:80
 msgid "People"
 msgstr "ജനങ്ങൾ"
@@ -9021,6 +9080,51 @@ msgstr "തലക്കെട്ടില്ലാത്ത ഭാഗം"
 msgid "More..."
 msgstr "കൂടുതൽ..."
 
+#: lib/settingsnav.php:78
+msgid "Change your profile settings"
+msgstr ""
+
+#: lib/settingsnav.php:83
+msgid "Upload an avatar"
+msgstr ""
+
+#: lib/settingsnav.php:88
+msgid "Change your password"
+msgstr "താങ്കളുടെ രഹസ്യവാക്ക് മാറ്റുക"
+
+#: lib/settingsnav.php:93
+msgid "Change email handling"
+msgstr "ഇമെയിൽ കൈകാര്യരീതിയിൽ മാറ്റം വരുത്തുക"
+
+#: lib/settingsnav.php:98
+msgid "Design your profile"
+msgstr ""
+
+#: lib/settingsnav.php:102
+msgid "URL"
+msgstr "യൂ.ആർ.എൽ."
+
+#: lib/settingsnav.php:103
+msgid "URL shorteners"
+msgstr ""
+
+#: lib/settingsnav.php:111
+msgid "Updates by instant messenger (IM)"
+msgstr ""
+
+#: lib/settingsnav.php:118
+msgid "Updates by SMS"
+msgstr ""
+
+#: lib/settingsnav.php:123
+#, fuzzy
+msgid "Connections"
+msgstr "ബന്ധങ്ങൾ"
+
+#: lib/settingsnav.php:124
+msgid "Authorized connected applications"
+msgstr ""
+
 #: lib/silenceform.php:67
 msgid "Silence"
 msgstr "നിശബ്ദമാക്കുക"
@@ -9029,30 +9133,34 @@ msgstr "നിശബ്ദമാക്കുക"
 msgid "Silence this user"
 msgstr "ഈ ഉപയോക്താവിനെ നിശബ്ദനാക്കുക"
 
-#: lib/subgroupnav.php:83
+#: lib/subgroupnav.php:89
 #, php-format
 msgid "People %s subscribes to"
 msgstr ""
 
-#: lib/subgroupnav.php:91
+#: lib/subgroupnav.php:97
 #, php-format
 msgid "People subscribed to %s"
 msgstr ""
 
-#: lib/subgroupnav.php:99
+#: lib/subgroupnav.php:105
 #, php-format
 msgid "Groups %s is a member of"
 msgstr ""
 
-#: lib/subgroupnav.php:105
+#: lib/subgroupnav.php:111
 msgid "Invite"
 msgstr "ക്ഷണിക്കുക"
 
-#: lib/subgroupnav.php:106
+#: lib/subgroupnav.php:112
 #, php-format
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "%s-ൽ നമ്മോടൊപ്പം ചേരാൻ സുഹൃത്തുക്കളേയും സഹപ്രവർത്തകരേയും ക്ഷണിക്കുക"
 
+#: lib/subscribeform.php:115 lib/subscribeform.php:139
+msgid "Subscribe to this user"
+msgstr "ഈ ഉപയോക്താവിന്റെ വരിക്കാരൻ/വരിക്കാരി ആകുക"
+
 #: lib/subscriberspeopleselftagcloudsection.php:48
 #: lib/subscriptionspeopleselftagcloudsection.php:48
 msgid "People Tagcloud as self-tagged"
@@ -9121,6 +9229,13 @@ msgstr ""
 msgid "Error opening theme archive."
 msgstr ""
 
+#: lib/threadednoticelist.php:270
+#, php-format
+msgid "Show all %d comment"
+msgid_plural "Show all %d comments"
+msgstr[0] ""
+msgstr[1] ""
+
 #: lib/topposterssection.php:74
 msgid "Top posters"
 msgstr ""
@@ -9162,76 +9277,80 @@ msgstr ""
 msgid "User %1$s (%2$d) has no profile record."
 msgstr ""
 
-#. TRANS: Link text for changeing the avatar of the logged in user.
-#: lib/userprofile.php:121
+#: lib/userprofile.php:116
 msgid "Edit Avatar"
 msgstr ""
 
 #. TRANS: H2 for user actions in a profile.
 #. TRANS: H2 for entity actions in a profile.
-#: lib/userprofile.php:245 lib/userprofile.php:261
+#: lib/userprofile.php:216 lib/userprofile.php:232
 msgid "User actions"
 msgstr "ഉപയോക്തൃ പ്രവൃത്തികൾ"
 
 #. TRANS: Text shown in user profile of not yet compeltely deleted users.
-#: lib/userprofile.php:249
+#: lib/userprofile.php:220
 msgid "User deletion in progress..."
 msgstr "ഉപയോക്താവിനെ നീക്കം ചെയ്യൽ പുരോഗമിക്കുന്നു..."
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:277
+#: lib/userprofile.php:248
 msgid "Edit profile settings"
 msgstr "ക്രമീകരണങ്ങളുടെ സജ്ജീകരണം മാറ്റുക"
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:279
+#: lib/userprofile.php:250
 msgid "Edit"
 msgstr "തിരുത്തുക"
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:303
+#: lib/userprofile.php:274
 msgid "Send a direct message to this user"
 msgstr "ഈ ഉപയോക്താവിന് നേരിട്ട് സന്ദേശമയയ്ക്കുക"
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:305
+#: lib/userprofile.php:276
 msgid "Message"
 msgstr "സന്ദേശം"
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:347
+#: lib/userprofile.php:318
 msgid "Moderate"
 msgstr "മാദ്ധ്യസ്ഥം വഹിക്കുക"
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:386
+#: lib/userprofile.php:357
 msgid "User role"
 msgstr ""
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:389
+#: lib/userprofile.php:360
 msgctxt "role"
 msgid "Administrator"
 msgstr "കാര്യനിർവ്വാഹക(ൻ)"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:391
+#: lib/userprofile.php:362
 msgctxt "role"
 msgid "Moderator"
 msgstr "മദ്ധ്യസ്ഥ(ൻ)"
 
+#: lib/util.php:321
+#, fuzzy
+msgid "Not allowed to log in."
+msgstr "ലോഗിൻ ചെയ്തിട്ടില്ല"
+
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1306
+#: lib/util.php:1337
 msgid "a few seconds ago"
 msgstr "ഏതാനം സെക്കന്റുകൾ മുമ്പ്"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1309
+#: lib/util.php:1340
 msgid "about a minute ago"
 msgstr "ഏകദേശം ഒരു മിനിറ്റ് മുമ്പ്"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1313
+#: lib/util.php:1344
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
@@ -9239,12 +9358,12 @@ msgstr[0] "ഏകദേശം ഒരു മിനിറ്റ് മുമ്പ
 msgstr[1] "ഏകദേശം %d മിനിറ്റ് മുമ്പ്"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1316
+#: lib/util.php:1347
 msgid "about an hour ago"
 msgstr "ഏകദേശം ഒരു മണിക്കൂർ മുമ്പ്"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1320
+#: lib/util.php:1351
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
@@ -9252,12 +9371,12 @@ msgstr[0] "ഏകദേശം ഒരു മണിക്കൂർ മുമ്പ
 msgstr[1] "ഏകദേശം %d മണിക്കൂർ മുമ്പ്"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1323
+#: lib/util.php:1354
 msgid "about a day ago"
 msgstr "ഏകദേശം ഒരു ദിവസം മുമ്പ്"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1327
+#: lib/util.php:1358
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
@@ -9265,12 +9384,12 @@ msgstr[0] "ഏകദേശം ഒരു ദിവസം മുമ്പ്"
 msgstr[1] "ഏകദേശം %d ദിവസം മുമ്പ്"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1330
+#: lib/util.php:1361
 msgid "about a month ago"
 msgstr "ഏകദേഅം ഒരു മാസം മുമ്പ്"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1334
+#: lib/util.php:1365
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
@@ -9278,7 +9397,7 @@ msgstr[0] "ഏകദേശം ഒരു മാസം മുമ്പ്"
 msgstr[1] "ഏകദേശം %d മാസം മുമ്പ്"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1337
+#: lib/util.php:1368
 msgid "about a year ago"
 msgstr "ഏകദേശം ഒരു വർഷം മുമ്പ്"
 
@@ -9289,25 +9408,6 @@ msgstr "ഏകദേശം ഒരു വർഷം മുമ്പ്"
 msgid "%s is not a valid color! Use 3 or 6 hex characters."
 msgstr "%s സാധുതയുള്ള നിറമല്ല! 3 അല്ലെങ്കിൽ 6 ഹെക്സ് അക്ഷരങ്ങൾ ഉപയോഗിക്കുക."
 
-#. TRANS: %s is the URL to the StatusNet site's Instant Messaging settings.
-#: lib/xmppmanager.php:287
-#, php-format
-msgid "Unknown user. Go to %s to add your address to your account"
-msgstr ""
-"ഉപയോക്താവിനെക്കുറിച്ച് അറിവില്ല. %s എന്നതിൽ ചെന്ന് താങ്കളുടെ അംഗത്വത്തിൽ താങ്കളുടെ വിലാസം "
-"ചേർക്കുക."
-
-#. TRANS: Response to XMPP source when it sent too long a message.
-#. TRANS: %1$d the maximum number of allowed characters (used for plural), %2$d is the sent number.
-#: lib/xmppmanager.php:406
-#, php-format
-msgid "Message too long. Maximum is %1$d character, you sent %2$d."
-msgid_plural "Message too long. Maximum is %1$d characters, you sent %2$d."
-msgstr[0] ""
-"സന്ദേശത്തിന് നീളം കൂടുതലാണ്. പരമാവധി %1$d അക്ഷരം മാത്രം, താങ്കൾ അയച്ചത് %2$d അക്ഷരങ്ങൾ."
-msgstr[1] ""
-"സന്ദേശത്തിന് നീളം കൂടുതലാണ്. പരമാവധി %1$d അക്ഷരങ്ങൾ, താങ്കൾ അയച്ചത് %2$d അക്ഷരങ്ങൾ."
-
 #. TRANS: Exception.
 #: lib/xrd.php:63
 msgid "Invalid XML."
@@ -9324,60 +9424,138 @@ msgstr ""
 msgid "Getting backup from file '%s'."
 msgstr ""
 
-#~ msgid "Block this user."
-#~ msgstr "ഈ ഉപയോക്താവിനെ തടയുക."
+#~ msgid "Could not generate feed for group - %s"
+#~ msgstr "സംഘത്തിനുള്ള ഫീഡ് സൃഷ്ടിക്കാൻ കഴിഞ്ഞില്ല - %s"
 
-#~ msgid "Delete this notice."
-#~ msgstr "ഈ അറിയിപ്പ് മായ്ക്കുക."
+#~ msgid "Current confirmed Jabber/Google Talk address."
+#~ msgstr "ഇപ്പോഴത്തെ സ്ഥിരീകരിക്കപ്പെട്ട ജാബ്ബർ/ജിറ്റോക് വിലാസം."
 
-#~ msgid "Delete this user."
-#~ msgstr "ഈ ഉപയോക്താവിനെ നീക്കം ചെയ്യുക."
-
-#~ msgid "Restore default designs."
-#~ msgstr "സ്വതേയുള്ള രൂപകല്പനകൾ പുനഃസ്ഥാപിക്കുക."
-
-#~ msgid "Reset back to default."
-#~ msgstr "മുമ്പ് സ്വതേയുണ്ടായിരുന്നതിലേയ്ക്ക് പുനഃസ്ഥാപിക്കുക."
-
-#~ msgid "Save design."
-#~ msgstr "രൂപകല്പന സേവ്‌ ചെയ്യുക."
-
-#, fuzzy
-#~ msgid "\"%s\" not found."
-#~ msgstr "ഉപയോക്താവിനെ കണ്ടത്താനായില്ല."
-
-#~ msgid "Notice %s not found."
-#~ msgstr "%s എന്ന അറിയിപ്പ് കണ്ടെത്താനായില്ല."
-
-#, fuzzy
-#~ msgid "Attachment %s not found."
-#~ msgstr "സ്വീകർത്താവായ ഉപയോക്താവിനെ കണ്ടെത്താനായില്ല."
-
-#, fuzzy
-#~ msgid "Invalid tag: \"%s\"."
-#~ msgstr "അസാധുവായ റ്റാഗ്: \"%s\""
-
-#, fuzzy
-#~ msgid "%s updates from everyone."
-#~ msgstr "%s പദ്ധതിയിൽ എല്ലാവരും അയച്ചിട്ടുള്ള പുതിയവാർത്തകൾ!"
-
-#~ msgid "Password saved"
-#~ msgstr "രഹസ്യവാക്ക് സേവ് ചെയ്തിരിക്കുന്നു"
-
-#~ msgid "Where you are, like \"City, State (or Region), Country\"."
-#~ msgstr "താങ്കളെവിടെയാണ്, അതായത് \"നഗരം, സംസ്ഥാനം (അഥവ പ്രദേശം), രാജ്യം\" എന്നിവ."
-
-#~ msgid "Subscribe to this user."
-#~ msgstr "ഈ ഉപയോക്താവിന്റെ വരിക്കാരൻ/വരിക്കാരി ആകുക."
-
-#, fuzzy
 #~ msgid ""
-#~ "Listenee stream license \"%1$s\" is not compatible with site license \"%2"
-#~ "$s\"."
+#~ "Jabber or Google Talk address, like \"UserName@example.org\". First, make "
+#~ "sure to add %s to your buddy list in your IM client or on Google Talk."
 #~ msgstr ""
-#~ "അറിയിപ്പിന്റെ ഉപയോഗാനുമതിയായ് ‘%1$s’ സൈറ്റിന്റെ ഉപയോഗാനുമതിയായ ‘%2$s’ എന്നതുമായി "
-#~ "ചേർന്നു പോകുന്നില്ല."
+#~ "ജാബ്ബർ അല്ലെങ്കിൽ ജിറ്റോക് വിലാസം, \"UserName@example.org\" എന്ന രീതിയിൽ. ആദ്യം %"
+#~ "s താങ്കളുടെ ഐ.എം. ക്ലയന്റിലോ ജിറ്റോക്കിലോ സുഹൃത്തുക്കളുടെ പട്ടികയിലുണ്ടെന്നുറപ്പാക്കുക."
+
+#~ msgid "Send me notices through Jabber/Google Talk."
+#~ msgstr "ജാബ്ബർ/ജിറ്റോക് വഴി എനിക്ക് അറിയിപ്പുകൾ അയയ്ക്കുക."
 
 #, fuzzy
-#~ msgid "Not allowed to log in."
-#~ msgstr "ലോഗിൻ ചെയ്തിട്ടില്ല"
+#~ msgid "Publish a MicroID for my Jabber/Google Talk address."
+#~ msgstr "ഇപ്പോഴത്തെ സ്ഥിരീകരിക്കപ്പെട്ട ജാബ്ബർ/ജിറ്റോക് വിലാസം"
+
+#~ msgid "No Jabber ID."
+#~ msgstr "ജാബ്ബർ ഐ.ഡി. അല്ല."
+
+#~ msgid "Not a valid Jabber ID."
+#~ msgstr "അസാധുവായ ജാബർ ഐ.ഡി.."
+
+#~ msgid "That is already your Jabber ID."
+#~ msgstr "അത് ഇപ്പോൾ തന്നെ താങ്കളുടെ ജാബ്ബർ ഐ.ഡി. ആണ്."
+
+#~ msgid "That is not your Jabber ID."
+#~ msgstr "അത് താങ്കളുടെ ജാബ്ബർ ഐ.ഡി. അല്ല."
+
+#~ msgid "Other settings"
+#~ msgstr "മറ്റ് സജ്ജീകരണങ്ങൾ"
+
+#~ msgid "Consumer secret"
+#~ msgstr "ഉപയോക്തൃ രഹസ്യം"
+
+#~ msgid "Request token URL"
+#~ msgstr "അഭ്യർത്ഥനാ ചീട്ടിന്റെ യൂ.ആർ.എൽ."
+
+#~ msgid "Access token URL"
+#~ msgstr "അഭിഗമ്യതാ ചീട്ടിന്റെ യൂ.ആർ.എൽ."
+
+#~ msgid "Authorize URL"
+#~ msgstr "അംഗീകരണത്തിനുള്ള യൂ.ആർ.എൽ."
+
+#~ msgid "Jabber"
+#~ msgstr "ജാബ്ബർ"
+
+#~ msgid "Photo"
+#~ msgstr "ഛായാചിത്രം"
+
+#~ msgid "Other options"
+#~ msgstr "മറ്റ് ഐച്ഛികങ്ങൾ"
+
+#~ msgid "Other"
+#~ msgstr "മറ്റുള്ളവ"
+
+#~ msgctxt "MENU"
+#~ msgid "Personal"
+#~ msgstr "വ്യക്തിപരം"
+
+#~ msgid "Account"
+#~ msgstr "അംഗത്വം"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Connect to services"
+#~ msgstr "സേവനങ്ങളിൽ ബന്ധപ്പെടുക"
+
+#~ msgid "Connect"
+#~ msgstr "ബന്ധപ്പെടുക"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Change site configuration"
+#~ msgstr "സൈറ്റ് ക്രമീകരണങ്ങൾ മാറ്റുക"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Invite friends and colleagues to join you on %s"
+#~ msgstr "%s-ൽ നമ്മോടൊപ്പം ചേരാൻ സുഹൃത്തുക്കളേയും സഹപ്രവർത്തകരേയും ക്ഷണിക്കുക"
+
+#~ msgctxt "MENU"
+#~ msgid "Invite"
+#~ msgstr "ക്ഷണിക്കുക"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Create an account"
+#~ msgstr "ഒരംഗത്വമെടുക്കുക"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Help me!"
+#~ msgstr "എന്നെ സഹായിക്കൂ!"
+
+#~ msgctxt "MENU"
+#~ msgid "Help"
+#~ msgstr "സഹായം"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Search for people or text"
+#~ msgstr "ആൾക്കാരെയോ എഴുത്തോ തിരയുക"
+
+#~ msgid "Local views"
+#~ msgstr "പ്രാദേശിക എടുത്തുനോക്കലുകൾ"
+
+#~ msgid "Page notice"
+#~ msgstr "താളിലെ അറിയിപ്പ്"
+
+#~ msgid "StatusNet software license"
+#~ msgstr "സ്റ്റാറ്റസ്‌നെറ്റ് സോഫ്റ്റ്‌വേർ അനുമതി"
+
+#~ msgid "Site content license"
+#~ msgstr "സൈറ്റിന്റെ ഉള്ളടക്കത്തിന്റെ ഉപയോഗാനുമതി"
+
+#~ msgid "Author"
+#~ msgstr "രചയിതാവ്"
+
+#~ msgctxt "MENU"
+#~ msgid "SMS"
+#~ msgstr "എസ്.എം.എസ്."
+
+#~ msgid "Available characters"
+#~ msgstr "ലഭ്യമായ അക്ഷരങ്ങൾ"
+
+#, fuzzy
+#~ msgctxt "MENU"
+#~ msgid "Profile"
+#~ msgstr "ജനങ്ങൾ"
+
+#~ msgid "Search help"
+#~ msgstr "തിരച്ചിലിനുള്ള സഹായം"
+
+#~ msgid "Unknown user. Go to %s to add your address to your account"
+#~ msgstr ""
+#~ "ഉപയോക്താവിനെക്കുറിച്ച് അറിവില്ല. %s എന്നതിൽ ചെന്ന് താങ്കളുടെ അംഗത്വത്തിൽ താങ്കളുടെ "
+#~ "വിലാസം ചേർക്കുക."
diff --git a/locale/nb/LC_MESSAGES/statusnet.po b/locale/nb/LC_MESSAGES/statusnet.po
index 9105f3f80b..17f7235930 100644
--- a/locale/nb/LC_MESSAGES/statusnet.po
+++ b/locale/nb/LC_MESSAGES/statusnet.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 15:58+0000\n"
-"PO-Revision-Date: 2011-03-03 16:01:13+0000\n"
+"POT-Creation-Date: 2011-03-03 17:23+0000\n"
+"PO-Revision-Date: 2011-03-03 17:26:19+0000\n"
 "Language-Team: Norwegian (bokmål)‬ <http://translatewiki.net/wiki/Portal:no>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -79,23 +79,23 @@ msgstr "Lagre tilgangsinnstillinger"
 #. TRANS: Tooltip for button to save access settings in site admin panel.
 #. TRANS: Button text for saving theme settings.
 #. TRANS: Button label to save e-mail preferences.
-#. TRANS: Button label to save Instant Messaging preferences.
-#. TRANS: Button text for saving "Other settings" in profile.
+#. TRANS: Button label to save IM preferences.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
 #. TRANS: Button text for saving site notice in admin panel.
 #. TRANS: Button label to save SMS preferences.
 #. TRANS: Save button for settings for a profile in a subscriptions list.
+#. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
 #. TRANS: Button text on profile design page to save settings.
 #: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
-#: actions/emailsettings.php:250 actions/imsettings.php:183
-#: actions/othersettings.php:136 actions/pathsadminpanel.php:512
-#: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
-#: actions/smssettings.php:205 actions/subscriptions.php:259
+#: actions/emailsettings.php:251 actions/imsettings.php:199
+#: actions/pathsadminpanel.php:512 actions/profilesettings.php:198
+#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:204
+#: actions/subscriptions.php:261 actions/urlsettings.php:152
 #: actions/useradminpanel.php:298 lib/applicationeditform.php:355
-#: lib/designsettings.php:270 lib/groupeditform.php:201
+#: lib/designform.php:320 lib/groupeditform.php:201
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Lagre"
@@ -134,7 +134,11 @@ msgstr "Ingen slik side."
 #. 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 use "one time password login" without using an existing user.
+#. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
+#. TRANS: Client error displayed trying to find a user by ID for a non-existing ID.
+#. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when calling a profile action without specifying a user.
 #: actions/all.php:80 actions/allrss.php:69
@@ -146,19 +150,19 @@ msgstr "Ingen slik side."
 #: actions/apidirectmessage.php:75 actions/apidirectmessagenew.php:72
 #: actions/apigroupcreate.php:111 actions/apigroupismember.php:89
 #: actions/apigroupjoin.php:98 actions/apigroupleave.php:98
-#: actions/apigrouplist.php:70 actions/apistatusesupdate.php:230
-#: actions/apisubscriptions.php:85 actions/apitimelinefavorites.php:70
-#: actions/apitimelinefriends.php:173 actions/apitimelinehome.php:78
-#: actions/apitimelinementions.php:77 actions/apitimelineuser.php:79
-#: actions/avatarbynickname.php:79 actions/favoritesrss.php:72
-#: actions/foaf.php:42 actions/foaf.php:61 actions/hcard.php:67
-#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
-#: actions/remotesubscribe.php:144 actions/remotesubscribe.php:153
-#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
-#: actions/showfavorites.php:106 actions/userbyid.php:74
-#: actions/usergroups.php:93 actions/userrss.php:40 actions/userxrd.php:59
-#: actions/xrds.php:71 lib/command.php:509 lib/galleryaction.php:59
-#: lib/mailbox.php:80 lib/profileaction.php:77
+#: actions/apigrouplist.php:70 actions/apigroupprofileupdate.php:108
+#: actions/apistatusesupdate.php:230 actions/apisubscriptions.php:85
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:173
+#: actions/apitimelinehome.php:78 actions/apitimelinementions.php:77
+#: actions/apitimelineuser.php:79 actions/avatarbynickname.php:79
+#: actions/favoritesrss.php:72 actions/foaf.php:42 actions/foaf.php:61
+#: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116
+#: actions/otp.php:78 actions/remotesubscribe.php:144
+#: actions/remotesubscribe.php:153 actions/replies.php:73
+#: actions/repliesrss.php:38 actions/rsd.php:113 actions/showfavorites.php:106
+#: actions/userbyid.php:75 actions/usergroups.php:93 actions/userrss.php:40
+#: actions/userxrd.php:59 actions/xrds.php:71 lib/command.php:509
+#: lib/galleryaction.php:59 lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Ingen slik bruker."
 
@@ -172,10 +176,9 @@ msgstr "%1$s og venner, side %2$d"
 #. TRANS: H1 text for page. %s is a user nickname.
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Timeline title for user and friends. %s is a user nickname.
-#. TRANS: Tooltop for personal group navigation menu option when logged in for viewing timeline of self and friends.
 #: actions/all.php:94 actions/all.php:191 actions/allrss.php:117
 #: actions/apitimelinefriends.php:207 actions/apitimelinehome.php:113
-#: lib/personalgroupnav.php:102
+#: lib/personalgroupnav.php:100
 #, php-format
 msgid "%s and friends"
 msgstr "%s og venner"
@@ -231,7 +234,7 @@ msgstr ""
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
 #. TRANS: Second sentence of empty message for anonymous users. %s is a user nickname.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:227
+#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:221
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -280,19 +283,20 @@ msgstr "Oppdateringer fra %1$s og venner på %2$s!"
 #: actions/apifavoritecreate.php:98 actions/apifavoritedestroy.php:98
 #: actions/apifriendshipscreate.php:99 actions/apifriendshipsdestroy.php:99
 #: actions/apifriendshipsshow.php:124 actions/apigroupcreate.php:138
-#: actions/apigroupismember.php:115 actions/apigroupjoin.php:160
-#: actions/apigroupleave.php:145 actions/apigrouplist.php:134
+#: actions/apigroupismember.php:115 actions/apigroupjoin.php:151
+#: actions/apigroupleave.php:141 actions/apigrouplist.php:134
 #: actions/apigrouplistall.php:120 actions/apigroupmembership.php:105
+#: actions/apigroupprofileupdate.php:100 actions/apigroupprofileupdate.php:213
 #: actions/apigroupshow.php:114 actions/apihelptest.php:84
 #: actions/apistatusesdestroy.php:101 actions/apistatusesretweets.php:110
 #: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:139
 #: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
-#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:268
-#: actions/apitimelinegroup.php:147 actions/apitimelinehome.php:173
-#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:239
-#: actions/apitimelineretweetedtome.php:118
-#: actions/apitimelineretweetsofme.php:150 actions/apitimelinetag.php:159
-#: actions/apitimelineuser.php:206 actions/apiusershow.php:100
+#: actions/apitimelinefavorites.php:182 actions/apitimelinefriends.php:276
+#: actions/apitimelinegroup.php:148 actions/apitimelinehome.php:181
+#: actions/apitimelinementions.php:182 actions/apitimelinepublic.php:247
+#: actions/apitimelineretweetedtome.php:147
+#: actions/apitimelineretweetsofme.php:147 actions/apitimelinetag.php:165
+#: actions/apitimelineuser.php:217 actions/apiusershow.php:100
 msgid "API method not found."
 msgstr "API-metode ikke funnet."
 
@@ -307,8 +311,9 @@ msgstr "API-metode ikke funnet."
 #: actions/apifavoritecreate.php:88 actions/apifavoritedestroy.php:88
 #: actions/apifriendshipscreate.php:89 actions/apifriendshipsdestroy.php:89
 #: actions/apigroupcreate.php:102 actions/apigroupjoin.php:89
-#: actions/apigroupleave.php:89 actions/apimediaupload.php:66
-#: actions/apistatusesretweet.php:63 actions/apistatusesupdate.php:194
+#: actions/apigroupleave.php:89 actions/apigroupprofileupdate.php:92
+#: actions/apimediaupload.php:66 actions/apistatusesretweet.php:63
+#: actions/apistatusesupdate.php:194
 msgid "This method requires a POST."
 msgstr "Denne metoden krever en POST."
 
@@ -320,21 +325,16 @@ msgid ""
 msgstr "Du må angi en verdi for parameteren 'device' med en av: sms, im, none."
 
 #. TRANS: Server error displayed when a user's delivery device cannot be updated.
-#. TRANS: Server error displayed when a user update to the database fails in the contact address confirmation action.
 #. TRANS: Server error thrown on database error updating e-mail preferences.
 #. TRANS: Server error thrown on database error removing a registered e-mail address.
-#. TRANS: Server error thrown on database error updating Instant Messaging preferences.
-#. TRANS: Server error thrown on database error removing a registered Instant Messaging address.
-#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
 #. TRANS: Server error thrown when user profile settings could not be updated.
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
-#: actions/apiaccountupdatedeliverydevice.php:130
-#: actions/confirmaddress.php:118 actions/emailsettings.php:352
-#: actions/emailsettings.php:498 actions/imsettings.php:276
-#: actions/imsettings.php:432 actions/othersettings.php:186
-#: actions/profilesettings.php:322 actions/smssettings.php:301
-#: actions/smssettings.php:454
+#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
+#: actions/apiaccountupdatedeliverydevice.php:136
+#: actions/emailsettings.php:353 actions/emailsettings.php:499
+#: actions/profilesettings.php:323 actions/smssettings.php:300
+#: actions/smssettings.php:453 actions/urlsettings.php:211
 msgid "Could not update user."
 msgstr "Kunne ikke oppdatere bruker."
 
@@ -360,7 +360,7 @@ msgstr "Brukeren har ingen profil."
 
 #. TRANS: Server error displayed if a user profile could not be saved.
 #. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:418
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:419
 msgid "Could not save profile."
 msgstr "Kunne ikke lagre profil."
 
@@ -372,7 +372,7 @@ msgstr "Kunne ikke lagre profil."
 #: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
 #: actions/designadminpanel.php:120 actions/editapplication.php:121
 #: actions/newapplication.php:102 actions/newnotice.php:95
-#: lib/designsettings.php:298
+#: lib/designsettings.php:110
 #, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s byte) due to its "
@@ -397,8 +397,8 @@ msgstr[1] ""
 #: actions/apiaccountupdateprofilecolors.php:160
 #: actions/apiaccountupdateprofilecolors.php:171
 #: actions/groupdesignsettings.php:285 actions/groupdesignsettings.php:296
-#: actions/userdesignsettings.php:201 actions/userdesignsettings.php:211
-#: actions/userdesignsettings.php:253 actions/userdesignsettings.php:263
+#: actions/userdesignsettings.php:218 actions/userdesignsettings.php:228
+#: actions/userdesignsettings.php:270 actions/userdesignsettings.php:280
 msgid "Unable to save your design settings."
 msgstr "Kunne ikke lagre dine innstillinger for utseende."
 
@@ -406,7 +406,7 @@ msgstr "Kunne ikke lagre dine innstillinger for utseende."
 #. TRANS: Client error displayed when a database error occurs updating profile colours.
 #: actions/apiaccountupdateprofilebackgroundimage.php:191
 #: actions/apiaccountupdateprofilecolors.php:139
-#: actions/userdesignsettings.php:179
+#: actions/userdesignsettings.php:196
 msgid "Could not update your design."
 msgstr "Kunne ikke oppdatere din profils utseende."
 
@@ -516,7 +516,7 @@ msgstr "Fant ikke mottakeren."
 #. TRANS: Client error displayed trying to direct message another user who's not a friend (403).
 #: actions/apidirectmessagenew.php:144
 #, fuzzy
-msgid "Can't send direct messages to users who aren't your friend."
+msgid "Cannot send direct messages to users who aren't your friend."
 msgstr "Kan ikke sende direktemeldinger til brukere du ikke er venn med."
 
 #. TRANS: Client error displayed trying to direct message self (403).
@@ -598,9 +598,9 @@ msgstr "Kunne ikke finne målbruker."
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:156 actions/editgroup.php:191
-#: actions/newgroup.php:137 actions/profilesettings.php:273
-#: actions/register.php:214
+#: actions/apigroupcreate.php:156 actions/apigroupprofileupdate.php:255
+#: actions/editgroup.php:191 actions/newgroup.php:137
+#: actions/profilesettings.php:274 actions/register.php:199
 msgid "Nickname already in use. Try another one."
 msgstr "Det nicket er allerede i bruk. Prøv et annet."
 
@@ -608,9 +608,9 @@ msgstr "Det nicket er allerede i bruk. Prøv et annet."
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:164 actions/editgroup.php:195
-#: actions/newgroup.php:141 actions/profilesettings.php:243
-#: actions/register.php:216
+#: actions/apigroupcreate.php:164 actions/apigroupprofileupdate.php:259
+#: actions/editgroup.php:195 actions/newgroup.php:141
+#: actions/profilesettings.php:244 actions/register.php:201
 msgid "Not a valid nickname."
 msgstr "Ugyldig nick."
 
@@ -620,10 +620,10 @@ msgstr "Ugyldig nick."
 #. TRANS: Validation error shown when providing an invalid homepage URL in the "New application" form.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:181 actions/editapplication.php:235
-#: actions/editgroup.php:202 actions/newapplication.php:221
-#: actions/newgroup.php:148 actions/profilesettings.php:248
-#: actions/register.php:223
+#: actions/apigroupcreate.php:181 actions/apigroupprofileupdate.php:277
+#: actions/editapplication.php:235 actions/editgroup.php:202
+#: actions/newapplication.php:221 actions/newgroup.php:148
+#: actions/profilesettings.php:249 actions/register.php:208
 msgid "Homepage is not a valid URL."
 msgstr "Hjemmesiden er ikke en gyldig URL."
 
@@ -632,8 +632,8 @@ msgstr "Hjemmesiden er ikke en gyldig URL."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:191 actions/editgroup.php:206
-#: actions/newgroup.php:152 actions/profilesettings.php:252
-#: actions/register.php:226
+#: actions/newgroup.php:152 actions/profilesettings.php:253
+#: actions/register.php:211
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "Fullt navn er for langt (maks 255 tegn)."
 
@@ -660,8 +660,8 @@ msgstr[1] "Beskrivelsen er for lang (maks %d tegn)."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:215 actions/editgroup.php:218
-#: actions/newgroup.php:164 actions/profilesettings.php:265
-#: actions/register.php:235
+#: actions/newgroup.php:164 actions/profilesettings.php:266
+#: actions/register.php:220
 msgid "Location is too long (maximum 255 characters)."
 msgstr "Plasseringen er for lang (maks 255 tegn)."
 
@@ -690,15 +690,16 @@ msgstr "Ugyldig alias: «%s»."
 #. TRANS: %s is the alias that is already in use.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error. %s is the already used alias.
-#: actions/apigroupcreate.php:264 actions/editgroup.php:246
-#: actions/newgroup.php:193
+#: actions/apigroupcreate.php:264 actions/apigroupprofileupdate.php:351
+#: actions/editgroup.php:246 actions/newgroup.php:193
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "Aliaset «%s» er allerede i bruk. Prøv et annet."
 
 #. TRANS: Client error displayed when trying to use an alias during group creation that is the same as the group's nickname.
 #. TRANS: Group edit form validation error.
-#: actions/apigroupcreate.php:278 actions/editgroup.php:253
+#: actions/apigroupcreate.php:278 actions/apigroupprofileupdate.php:359
+#: actions/editgroup.php:253
 msgid "Alias can't be the same as nickname."
 msgstr "Alias kan ikke være det samme som kallenavn."
 
@@ -710,7 +711,8 @@ msgstr "Alias kan ikke være det samme som kallenavn."
 #. TRANS: Client error displayed requesting most recent notices to a group for a non-existing group.
 #: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
 #: actions/apigroupleave.php:104 actions/apigroupmembership.php:71
-#: actions/apigroupshow.php:81 actions/apitimelinegroup.php:89
+#: actions/apigroupprofileupdate.php:113 actions/apigroupshow.php:81
+#: actions/apitimelinegroup.php:89
 msgid "Group not found."
 msgstr "Gruppe ikke funnet."
 
@@ -728,13 +730,11 @@ msgstr "Du er allerede medlem av den gruppen."
 msgid "You have been blocked from that group by the admin."
 msgstr "Du har blitt blokkert fra den gruppen av administratoren."
 
-#. TRANS: Server error displayed when joining a group fails.
-#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
 #. 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.
 #. TRANS: Message given having failed to add a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:362
+#: actions/apigroupjoin.php:136 actions/joingroup.php:139 lib/command.php:362
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "Kunne ikke legge bruker %1$s til gruppe %2$s."
@@ -744,8 +744,6 @@ msgstr "Kunne ikke legge bruker %1$s til gruppe %2$s."
 msgid "You are not a member of this group."
 msgstr "Du er ikke et medlem av denne gruppen."
 
-#. TRANS: Server error displayed when leaving a group fails.
-#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
 #. TRANS: Server error displayed when leaving a group failed in the database.
 #. TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
 #. TRANS: Message given having failed to remove a user from a group.
@@ -781,6 +779,61 @@ msgstr "%s grupper"
 msgid "groups on %s"
 msgstr "grupper på %s"
 
+#. TRANS: Client error displayed trying to edit a group while not being a group admin.
+#. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
+#. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
+#: actions/apigroupprofileupdate.php:118 actions/editgroup.php:110
+#: actions/editgroup.php:176 actions/groupdesignsettings.php:109
+#: actions/grouplogo.php:111
+msgid "You must be an admin to edit the group."
+msgstr "Du må være en administrator for å redigere gruppen."
+
+#. TRANS: Server error displayed when editing a group fails.
+#: actions/apigroupprofileupdate.php:171 actions/editgroup.php:274
+msgid "Could not update group."
+msgstr "Kunne ikke oppdatere gruppe."
+
+#. TRANS: Server error displayed when group aliases could not be added.
+#. TRANS: Server exception thrown when creating group aliases failed.
+#: actions/apigroupprofileupdate.php:194 actions/editgroup.php:281
+#: classes/User_group.php:540
+msgid "Could not create aliases."
+msgstr "Kunne ikke opprette alias."
+
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: actions/apigroupprofileupdate.php:249 lib/nickname.php:165
+msgid "Nickname must have only lowercase letters and numbers and no spaces."
+msgstr "Kallenavn kan kun ha små bokstaver og tall og ingen mellomrom."
+
+#: actions/apigroupprofileupdate.php:286
+#, fuzzy
+msgid "Full name is too long (max 255 chars)."
+msgstr "Fullt navn er for langt (maks 255 tegn)."
+
+#: actions/apigroupprofileupdate.php:296
+#, fuzzy, php-format
+msgid "description is too long (max %d chars)."
+msgstr "Beskrivelsen er for lang (maks %d tegn)."
+
+#: actions/apigroupprofileupdate.php:307
+#, fuzzy
+msgid "Location is too long (max 255 chars)."
+msgstr "Plasseringen er for lang (maks 255 tegn)."
+
+#: actions/apigroupprofileupdate.php:326
+#, fuzzy, php-format
+msgid "Too many aliases! Maximum %d."
+msgstr "For mange alias. Maks %d er tillatt."
+
+#. TRANS: Group edit form validation error.
+#. TRANS: Group create form validation error.
+#. TRANS: %s is the invalid alias.
+#: actions/apigroupprofileupdate.php:342 actions/editgroup.php:241
+#: actions/newgroup.php:188
+#, php-format
+msgid "Invalid alias: \"%s\""
+msgstr "Ugyldig alias: «%s»"
+
 #. TRANS: Client error displayed when uploading a media file has failed.
 #: actions/apimediaupload.php:101
 msgid "Upload failed."
@@ -814,21 +867,22 @@ msgstr "Du er ikke autorisert."
 #. TRANS: Form validation error message.
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
+#. TRANS: Client error displayed when the session token is not okay.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
 #: actions/deletenotice.php:177 actions/disfavor.php:75
-#: actions/emailsettings.php:291 actions/favor.php:75 actions/geocode.php:55
+#: actions/emailsettings.php:292 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:65 actions/grouplogo.php:321
-#: actions/groupunblock.php:65 actions/imsettings.php:224
-#: actions/invite.php:60 actions/login.php:137 actions/makeadmin.php:66
-#: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
-#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
-#: actions/othersettings.php:155 actions/passwordsettings.php:138
-#: actions/profilesettings.php:217 actions/recoverpassword.php:383
-#: actions/register.php:172 actions/remotesubscribe.php:76
-#: actions/repeat.php:82 actions/smssettings.php:250 actions/subedit.php:40
-#: actions/subscribe.php:86 actions/tagother.php:166
-#: actions/unsubscribe.php:69 actions/userauthorization.php:52
-#: lib/designsettings.php:310
+#: actions/groupunblock.php:65 actions/imsettings.php:241
+#: actions/invite.php:60 actions/makeadmin.php:66 actions/newmessage.php:135
+#: actions/newnotice.php:105 actions/nudge.php:80
+#: actions/oauthappssettings.php:162 actions/oauthconnectionssettings.php:135
+#: actions/passwordsettings.php:137 actions/pluginenable.php:87
+#: actions/profilesettings.php:218 actions/recoverpassword.php:383
+#: actions/register.php:157 actions/remotesubscribe.php:76
+#: actions/repeat.php:82 actions/smssettings.php:249 actions/subedit.php:40
+#: actions/subscribe.php:87 actions/tagother.php:145
+#: actions/unsubscribe.php:69 actions/urlsettings.php:171
+#: actions/userauthorization.php:53 lib/designsettings.php:122
 msgid "There was a problem with your session token. Try again, please."
 msgstr "Det var et problem med din sesjons-autentisering. Prøv igjen."
 
@@ -856,10 +910,10 @@ msgstr "Databasefeil ved innsetting av oauth_token_association."
 #. TRANS: Unknown form validation error in design settings form.
 #: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
 #: actions/designadminpanel.php:100 actions/editapplication.php:144
-#: actions/emailsettings.php:310 actions/grouplogo.php:332
-#: actions/imsettings.php:239 actions/newapplication.php:124
-#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
-#: actions/smssettings.php:271 lib/designsettings.php:321
+#: actions/emailsettings.php:311 actions/grouplogo.php:332
+#: actions/imsettings.php:256 actions/newapplication.php:124
+#: actions/oauthconnectionssettings.php:144 actions/recoverpassword.php:46
+#: actions/smssettings.php:270 lib/designsettings.php:133
 msgid "Unexpected form submission."
 msgstr "Uventet skjemainnsending."
 
@@ -908,31 +962,26 @@ msgstr "Konto"
 
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Field label in form for profile settings.
-#. TRANS: Label for group nickname (dt). Text hidden by default.
-#. TRANS: DT for nick name in a profile.
-#: actions/apioauthauthorize.php:459 actions/login.php:252
-#: actions/profilesettings.php:106 actions/register.php:432
-#: actions/showgroup.php:243 actions/tagother.php:94
+#: actions/apioauthauthorize.php:459 actions/login.php:225
+#: actions/profilesettings.php:107 actions/register.php:411
 #: actions/userauthorization.php:145 lib/groupeditform.php:145
-#: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "Nick"
 
 #. TRANS: Field label on OAuth API authorisation form.
-#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:463 actions/login.php:255
-#: actions/register.php:436 lib/accountsettingsaction.php:120
+#: actions/apioauthauthorize.php:463 actions/login.php:228
+#: actions/register.php:415 lib/settingsnav.php:87
 msgid "Password"
 msgstr "Passord"
 
 #. TRANS: Button text that when clicked will cancel the process of allowing access to an account
 #. TRANS: by an external application.
 #. TRANS: Button label to cancel an e-mail address confirmation procedure.
-#. TRANS: Button label to cancel an Instant Messaging address confirmation procedure.
+#. TRANS: Button label to cancel an IM address confirmation procedure.
 #. TRANS: Button label to cancel a SMS address confirmation procedure.
 #. TRANS: Button label in the "Edit application" form.
-#: actions/apioauthauthorize.php:478 actions/emailsettings.php:124
-#: actions/imsettings.php:127 actions/smssettings.php:133
+#: actions/apioauthauthorize.php:478 actions/emailsettings.php:125
+#: actions/imsettings.php:136 actions/smssettings.php:132
 #: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Cancel"
@@ -1044,7 +1093,7 @@ msgstr "HTTP-metoden støttes ikke."
 #. TRANS: %s is the requested output format.
 #: actions/apistatusesshow.php:144
 #, fuzzy, php-format
-msgid "Unsupported format: %s"
+msgid "Unsupported format: %s."
 msgstr "Formatet støttes ikke: %s"
 
 #. TRANS: Client error displayed requesting a deleted status.
@@ -1125,13 +1174,6 @@ msgstr "%1$s / Favoritter fra %2$s"
 msgid "%1$s updates favorited by %2$s / %3$s."
 msgstr "%1$s-oppdateringer markert som favoritt av %2$s / %3$s."
 
-#. TRANS: Server error displayed when generating an Atom feed fails.
-#. TRANS: %s is the error.
-#: actions/apitimelinegroup.php:134
-#, php-format
-msgid "Could not generate feed for group - %s"
-msgstr "Kunne ikke generere mating for gruppe - %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.
 #: actions/apitimelinementions.php:115
@@ -1148,13 +1190,14 @@ msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr "%1$s oppdateringer som svarer på oppdateringer fra %2$s / %3$s."
 
 #. TRANS: Title for site timeline. %s is the StatusNet sitename.
+#. TRANS: Public RSS feed title. %s is the StatusNet site name.
 #: actions/apitimelinepublic.php:193 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "%s offentlig tidslinje"
 
 #. TRANS: Subtitle for site timeline. %s is the StatusNet sitename.
-#: actions/apitimelinepublic.php:199 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:199
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "%s oppdateringer fra alle sammen!"
@@ -1165,21 +1208,33 @@ msgid "Unimplemented."
 msgstr "Ikke-implementert."
 
 #. TRANS: Title for Atom feed "repeated to me". %s is the user nickname.
-#: actions/apitimelineretweetedtome.php:108
+#: actions/apitimelineretweetedtome.php:96
 #, php-format
 msgid "Repeated to %s"
 msgstr "Gjentatt til %s"
 
+#: actions/apitimelineretweetedtome.php:98
+#, fuzzy, php-format
+msgid "%1$s notices that were to repeated to %2$s / %3$s."
+msgstr "%1$s oppdateringer som svarer på oppdateringer fra %2$s / %3$s."
+
 #. TRANS: Title of list of repeated notices of the logged in user.
 #. TRANS: %s is the nickname of the logged in user.
-#: actions/apitimelineretweetsofme.php:112
+#: actions/apitimelineretweetsofme.php:98
 #, php-format
 msgid "Repeats of %s"
 msgstr "Repetisjoner av %s"
 
+#: actions/apitimelineretweetsofme.php:104
+#, fuzzy, php-format
+msgid "%1$s notices that %2$s / %3$s has repeated."
+msgstr "%s /@%s) la din notis til som en favoritt"
+
 #. TRANS: Title for timeline with lastest notices with a given tag.
 #. TRANS: %s is the tag.
-#: actions/apitimelinetag.php:101 actions/tag.php:67
+#. TRANS: Title for first page of notices with tags.
+#. TRANS: %s is the tag.
+#: actions/apitimelinetag.php:101 actions/tag.php:69
 #, php-format
 msgid "Notices tagged with %s"
 msgstr "Notiser merket med %s"
@@ -1192,53 +1247,54 @@ msgid "Updates tagged with %1$s on %2$s!"
 msgstr "Oppdateringer merket med %1$s på %2$s!"
 
 #. TRANS: Client error displayed trying to add a notice to another user's timeline.
-#: actions/apitimelineuser.php:297
+#: actions/apitimelineuser.php:308
 msgid "Only the user can add to their own timeline."
 msgstr "Bare brukeren kan legge til sin egen tidslinje."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:304
+#: actions/apitimelineuser.php:315
 msgid "Only accept AtomPub for Atom feeds."
 msgstr "Aksepterer kun AtomPub for Atom-matinger."
 
 #. TRANS: Client error displayed attempting to post an empty API notice.
-#: actions/apitimelineuser.php:311
+#: actions/apitimelineuser.php:322
 msgid "Atom post must not be empty."
 msgstr "Atom-innlegget kan ikke være tomt."
 
 #. TRANS: Client error displayed attempting to post an API that is not well-formed XML.
-#: actions/apitimelineuser.php:317
+#: actions/apitimelineuser.php:328
 msgid "Atom post must be well-formed XML."
 msgstr "Atom-innlegget må være velformatert XML."
 
 #. TRANS: Client error displayed when not using an Atom entry.
-#: actions/apitimelineuser.php:323 actions/atompubfavoritefeed.php:228
+#: actions/apitimelineuser.php:334 actions/atompubfavoritefeed.php:228
 #: actions/atompubmembershipfeed.php:230
 #: actions/atompubsubscriptionfeed.php:236
 msgid "Atom post must be an Atom entry."
 msgstr "Atom-innlegget må være en Atom-oppføring."
 
 #. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
-#: actions/apitimelineuser.php:335
+#: actions/apitimelineuser.php:345
 msgid "Can only handle POST activities."
 msgstr "Kan bare håndtere POST-handlinger."
 
 #. TRANS: Client error displayed when using an unsupported activity object type.
 #. TRANS: %s is the unsupported activity object type.
-#: actions/apitimelineuser.php:346
+#: actions/apitimelineuser.php:356
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr "Kan ikke håndtere handlingsobjekttype «%s»."
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
 #. TRANS: %d is the notice ID (number).
-#: actions/apitimelineuser.php:380
+#: actions/apitimelineuser.php:390
 #, php-format
 msgid "No content for notice %d."
 msgstr "Inget innhold for notis %d."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:408
+#. TRANS: %s is the notice URI.
+#: actions/apitimelineuser.php:419
 #, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "Notis med URI «%s» finnes allerede."
@@ -1255,9 +1311,10 @@ msgstr "Bruker ikke funnet."
 
 #. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
 #. TRANS: Client exception.
+#. TRANS: Client error displayed trying to subscribe to a non-existing profile.
 #: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
 #: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
-#: actions/subscribe.php:107
+#: actions/subscribe.php:110
 msgid "No such profile."
 msgstr "Ingen slik profil."
 
@@ -1403,7 +1460,7 @@ msgid "Not a member."
 msgstr "Alle medlemmer"
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
-#: actions/atompubshowmembership.php:151
+#: actions/atompubshowmembership.php:150
 #, fuzzy
 msgid "Cannot delete someone else's membership."
 msgstr "Kunne ikke slette favoritt."
@@ -1492,10 +1549,7 @@ msgid "Invalid size."
 msgstr "Ugyldig størrelse"
 
 #. TRANS: Title for avatar upload page.
-#. TRANS: Label for group avatar (dt). Text hidden by default.
-#. TRANS: Link description in user account settings menu.
-#: actions/avatarsettings.php:66 actions/showgroup.php:227
-#: lib/accountsettingsaction.php:113
+#: actions/avatarsettings.php:66 lib/settingsnav.php:82
 msgid "Avatar"
 msgstr "Brukerbilde"
 
@@ -1508,9 +1562,11 @@ msgstr "Du kan laste opp en personlig avatar. Maks filstørrelse er %s."
 
 #. TRANS: Server error displayed in avatar upload page when no matching profile can be found for a user.
 #. TRANS: Server error displayed coming across a request from a user without a profile.
+#. TRANS: Server error displayed when trying to authorise a remote subscription request
+#. TRANS: while the user has no profile.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
 #: actions/grouplogo.php:184 actions/remotesubscribe.php:190
-#: actions/userauthorization.php:72 actions/userrss.php:108
+#: actions/userauthorization.php:75 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr "Bruker uten samsvarende profil."
 
@@ -1565,10 +1621,10 @@ msgstr "Beskjær"
 msgid "No file uploaded."
 msgstr "Ingen fil lastet opp."
 
-#. TRANS: Avatar upload form unstruction after uploading a file.
+#. TRANS: Avatar upload form instruction after uploading a file.
 #: actions/avatarsettings.php:345
 #, fuzzy
-msgid "Pick a square area of the image to be your avatar"
+msgid "Pick a square area of the image to be your avatar."
 msgstr "Velg et kvadratisk utsnitt av bildet som din avatar."
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
@@ -1594,7 +1650,7 @@ msgstr "Avatar slettet."
 
 #. TRANS: Title for backup account page.
 #. TRANS: Option in profile settings to create a backup of the account of the currently logged in user.
-#: actions/backupaccount.php:61 actions/profilesettings.php:467
+#: actions/backupaccount.php:61 actions/profilesettings.php:468
 msgid "Backup account"
 msgstr ""
 
@@ -1628,7 +1684,7 @@ msgstr "Bakgrunn"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
 #: actions/backupaccount.php:254
-msgid "Backup your account"
+msgid "Backup your account."
 msgstr ""
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
@@ -1670,7 +1726,7 @@ msgstr "Nei"
 #. TRANS: Submit button title for 'No' when blocking a user.
 #: actions/block.php:158
 #, fuzzy
-msgid "Do not block this user"
+msgid "Do not block this user."
 msgstr "Ikke blokker denne brukeren"
 
 #. TRANS: Button label on the user block form.
@@ -1687,9 +1743,9 @@ msgid "Yes"
 msgstr "Ja"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#. TRANS: Description of the form to block a user.
-#: actions/block.php:165 lib/blockform.php:79
-msgid "Block this user"
+#: actions/block.php:165
+#, fuzzy
+msgid "Block this user."
 msgstr "Blokker denne brukeren"
 
 #. TRANS: Server error displayed when blocking a user fails.
@@ -1755,31 +1811,47 @@ msgstr "Fant ikke bekreftelseskode."
 msgid "That confirmation code is not for you!"
 msgstr "Den bekreftelseskoden er ikke til deg."
 
-#. TRANS: Server error for a unknow address type %s, which can be 'email', 'jabber', or 'sms'.
-#: actions/confirmaddress.php:92
-#, php-format
-msgid "Unrecognized address type %s."
+#. TRANS: Server error for an unknown address type, which can be 'email', 'sms', or the name of an IM network (such as 'xmpp' or 'aim')
+#: actions/confirmaddress.php:94
+#, fuzzy, php-format
+msgid "Unrecognized address type %s"
 msgstr "Ukjent adressetype %s."
 
 #. TRANS: Client error for an already confirmed email/jabber/sms address.
-#: actions/confirmaddress.php:97
+#: actions/confirmaddress.php:103 actions/confirmaddress.php:136
 msgid "That address has already been confirmed."
 msgstr "Den adressen har allerede blitt bekreftet."
 
+#: actions/confirmaddress.php:121 actions/imsettings.php:444
+#: actions/userdesignsettings.php:306
+#, fuzzy
+msgid "Couldn't update user."
+msgstr "Kunne ikke oppdatere bruker."
+
+#: actions/confirmaddress.php:144
+#, fuzzy
+msgid "Couldn't update user im preferences."
+msgstr "Kunne ikke oppdatere brukeroppføring."
+
+#: actions/confirmaddress.php:156
+#, fuzzy
+msgid "Couldn't insert user im preferences."
+msgstr "Kunne ikke sette inn bekreftelseskode."
+
 #. TRANS: Server error displayed when an address confirmation code deletion from the
 #. TRANS: database fails in the contact address confirmation action.
-#: actions/confirmaddress.php:132
+#: actions/confirmaddress.php:169
 msgid "Could not delete address confirmation."
 msgstr "Kunne ikke slette adressebekreftelse."
 
 #. TRANS: Title for the contact address confirmation action.
-#: actions/confirmaddress.php:150
+#: actions/confirmaddress.php:185
 msgid "Confirm address"
 msgstr "Bekreft adresse"
 
 #. TRANS: Success message for the contact address confirmation action.
 #. TRANS: %s can be 'email', 'jabber', or 'sms'.
-#: actions/confirmaddress.php:166
+#: actions/confirmaddress.php:200
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "Adressen «%s» har blitt bekreftet for din konto."
@@ -1793,6 +1865,7 @@ msgstr "Samtale"
 #. TRANS: Label for user statistics.
 #: actions/conversation.php:149 lib/noticelist.php:87
 #: lib/profileaction.php:246 lib/searchgroupnav.php:82
+#: lib/threadednoticelist.php:66
 msgid "Notices"
 msgstr "Notiser"
 
@@ -1828,7 +1901,7 @@ msgstr "Avatar slettet."
 
 #. TRANS: Page title for page on which a user account can be deleted.
 #. TRANS: Option in profile settings to delete the account of the currently logged in user.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:475
+#: actions/deleteaccount.php:228 actions/profilesettings.php:476
 #, fuzzy
 msgid "Delete account"
 msgstr "Opprett en konto"
@@ -1852,7 +1925,7 @@ msgstr ""
 #. TRANS: Field label for delete account confirmation entry.
 #. TRANS: Field label for password reset form where the password has to be typed again.
 #: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:262 actions/register.php:440
+#: actions/recoverpassword.php:262 actions/register.php:419
 msgid "Confirm"
 msgstr "Bekreft"
 
@@ -1882,14 +1955,14 @@ msgstr "Program ikke funnet."
 #. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
 #: actions/deleteapplication.php:79 actions/editapplication.php:78
-#: actions/showapplication.php:94
+#: actions/showapplication.php:90
 msgid "You are not the owner of this application."
 msgstr "Du er ikke eieren av dette programmet."
 
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
-#: actions/newapplication.php:112 actions/showapplication.php:118
-#: lib/action.php:1425
+#: actions/newapplication.php:112 actions/showapplication.php:113
+#: lib/action.php:1391
 #, fuzzy
 msgid "There was a problem with your session token."
 msgstr "Det var et problem med din sesjons-autentisering. Prøv igjen."
@@ -1914,13 +1987,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting an application.
 #: actions/deleteapplication.php:161
 #, fuzzy
-msgid "Do not delete this application"
+msgid "Do not delete this application."
 msgstr "Ikke slett dette programmet"
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
 #: actions/deleteapplication.php:167
 #, fuzzy
-msgid "Delete this application"
+msgid "Delete this application."
 msgstr "Slett dette programmet"
 
 #. TRANS: Client error when trying to delete group while not logged in.
@@ -1975,13 +2048,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting a group.
 #: actions/deletegroup.php:224
 #, fuzzy
-msgid "Do not delete this group"
+msgid "Do not delete this group."
 msgstr "Ikke slett denne gruppen"
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
 #: actions/deletegroup.php:231
 #, fuzzy
-msgid "Delete this group"
+msgid "Delete this group."
 msgstr "Slett denne gruppen"
 
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
@@ -1989,14 +2062,16 @@ msgstr "Slett denne gruppen"
 #. TRANS: Client error displayed when trying to mark a notice as favorite without being logged in.
 #. TRANS: Client error displayed trying to block a user from a group while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
+#. TRANS: Client error displayed trying to log out when not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
+#. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
 #. TRANS: Client error displayed when trying to change user options while not logged in.
 #: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
-#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:69
+#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:70
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
-#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
-#: actions/tagother.php:33 actions/unsubscribe.php:52
+#: actions/nudge.php:63 actions/pluginenable.php:97 actions/subedit.php:33
+#: actions/subscribe.php:98 actions/tagother.php:33 actions/unsubscribe.php:52
 #: lib/adminpanelaction.php:71 lib/profileformaction.php:63
 #: lib/settingsaction.php:72
 msgid "Not logged in."
@@ -2025,12 +2100,13 @@ msgstr "Er du sikker på at du vil slette denne notisen?"
 #. TRANS: Submit button title for 'No' when deleting a notice.
 #: actions/deletenotice.php:159
 #, fuzzy
-msgid "Do not delete this notice"
+msgid "Do not delete this notice."
 msgstr "Ikke slett denne notisen"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:166 lib/noticelist.php:673
-msgid "Delete this notice"
+#: actions/deletenotice.php:166
+#, fuzzy
+msgid "Delete this notice."
 msgstr "Slett denne notisen"
 
 #. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
@@ -2067,18 +2143,17 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting a user.
 #: actions/deleteuser.php:158
 #, fuzzy
-msgid "Do not delete this user"
+msgid "Do not delete this user."
 msgstr "Ikke slett denne gruppen"
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
-#. TRANS: Description of form for deleting a user.
-#: actions/deleteuser.php:165 lib/deleteuserform.php:75
-msgid "Delete this user"
+#: actions/deleteuser.php:165
+#, fuzzy
+msgid "Delete this user."
 msgstr "Slett denne brukeren"
 
 #. TRANS: Message used as title for design settings for the site.
-#. TRANS: Link description in user account settings menu.
-#: actions/designadminpanel.php:60 lib/accountsettingsaction.php:134
+#: actions/designadminpanel.php:60 lib/settingsnav.php:97
 msgid "Design"
 msgstr "Utseende"
 
@@ -2145,8 +2220,7 @@ msgid "You can upload a custom StatusNet theme as a .ZIP archive."
 msgstr "Du kan laste opp et egendefinert StatusNet-tema som et .ZIP-arkiv."
 
 #. TRANS: Fieldset legend for theme background image.
-#. TRANS: Fieldset legend on profile design page.
-#: actions/designadminpanel.php:515 lib/designsettings.php:98
+#: actions/designadminpanel.php:515
 msgid "Change background image"
 msgstr "Endre bakgrunnsbilde"
 
@@ -2154,7 +2228,7 @@ msgstr "Endre bakgrunnsbilde"
 #. TRANS: Field label for background color selector.
 #. TRANS: Label on profile design page for setting a profile page background colour.
 #: actions/designadminpanel.php:525 actions/designadminpanel.php:609
-#: lib/designsettings.php:183
+#: lib/designform.php:238
 msgid "Background"
 msgstr "Bakgrunn"
 
@@ -2180,13 +2254,13 @@ msgstr "Av"
 #. TRANS: Form guide for turning background image on or off on theme designer page.
 #. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
 #. TRANS: use of the uploaded profile image.
-#: actions/designadminpanel.php:577 lib/designsettings.php:159
+#: actions/designadminpanel.php:577 lib/designform.php:214
 msgid "Turn background image on or off."
 msgstr "Slå på eller av bakgrunnsbilde."
 
 #. TRANS: Checkbox label to title background image on theme designer page.
 #. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-#: actions/designadminpanel.php:583 lib/designsettings.php:165
+#: actions/designadminpanel.php:583 lib/designform.php:220
 msgid "Tile background image"
 msgstr "Gjenta bakgrunnsbildet"
 
@@ -2198,25 +2272,25 @@ msgstr "Endre farger"
 
 #. TRANS: Field label for content color selector.
 #. TRANS: Label on profile design page for setting a profile page content colour.
-#: actions/designadminpanel.php:623 lib/designsettings.php:197
+#: actions/designadminpanel.php:623 lib/designform.php:252
 msgid "Content"
 msgstr "Innhold"
 
 #. TRANS: Field label for sidebar color selector.
 #. TRANS: Label on profile design page for setting a profile page sidebar colour.
-#: actions/designadminpanel.php:637 lib/designsettings.php:211
+#: actions/designadminpanel.php:637 lib/designform.php:266
 msgid "Sidebar"
 msgstr "Sidelinje"
 
 #. TRANS: Field label for text color selector.
 #. TRANS: Label on profile design page for setting a profile page text colour.
-#: actions/designadminpanel.php:651 lib/designsettings.php:225
+#: actions/designadminpanel.php:651 lib/designform.php:280
 msgid "Text"
 msgstr "Tekst"
 
 #. TRANS: Field label for link color selector.
 #. TRANS: Label on profile design page for setting a profile page links colour.
-#: actions/designadminpanel.php:665 lib/designsettings.php:239
+#: actions/designadminpanel.php:665 lib/designform.php:294
 msgid "Links"
 msgstr "Lenker"
 
@@ -2238,21 +2312,21 @@ msgid "Use defaults"
 msgstr "Bruk standard"
 
 #. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: actions/designadminpanel.php:720 lib/designsettings.php:259
-msgid "Restore default designs"
+#: actions/designadminpanel.php:720
+#, fuzzy
+msgid "Restore default designs."
 msgstr "Gjenopprett standardutseende"
 
 #. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: actions/designadminpanel.php:728 lib/designsettings.php:267
-msgid "Reset back to default"
+#: actions/designadminpanel.php:728
+#, fuzzy
+msgid "Reset back to default."
 msgstr "Tilbakestill til standardverdier"
 
 #. TRANS: Title for button for saving theme settings.
-#. TRANS: Title for button on profile design page to save settings.
-#: actions/designadminpanel.php:736 lib/designsettings.php:272
-msgid "Save design"
+#: actions/designadminpanel.php:736
+#, fuzzy
+msgid "Save design."
 msgstr "Lagre utseende"
 
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
@@ -2284,7 +2358,7 @@ msgid "You must be logged in to edit an application."
 msgstr "Du må være innlogget for å redigere et program."
 
 #. TRANS: Client error displayed trying to edit an application that does not exist.
-#: actions/editapplication.php:83 actions/showapplication.php:87
+#: actions/editapplication.php:83 actions/showapplication.php:83
 msgid "No such application."
 msgstr "Inget slikt program."
 
@@ -2375,80 +2449,53 @@ msgstr "Rediger %s gruppe"
 msgid "You must be logged in to create a group."
 msgstr "Du må være innlogget for å opprette en gruppe."
 
-#. TRANS: Client error displayed trying to edit a group while not being a group admin.
-#. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
-#. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
-#: actions/editgroup.php:110 actions/editgroup.php:176
-#: actions/groupdesignsettings.php:109 actions/grouplogo.php:111
-msgid "You must be an admin to edit the group."
-msgstr "Du må være en administrator for å redigere gruppen."
-
 #. TRANS: Form instructions for group edit form.
 #: actions/editgroup.php:161
 msgid "Use this form to edit the group."
 msgstr "Bruk dette skjemaet for å redigere gruppen."
 
-#. TRANS: Group edit form validation error.
-#. TRANS: Group create form validation error.
-#. TRANS: %s is the invalid alias.
-#: actions/editgroup.php:241 actions/newgroup.php:188
-#, php-format
-msgid "Invalid alias: \"%s\""
-msgstr "Ugyldig alias: «%s»"
-
-#. TRANS: Server error displayed when editing a group fails.
-#: actions/editgroup.php:274
-msgid "Could not update group."
-msgstr "Kunne ikke oppdatere gruppe."
-
-#. TRANS: Server error displayed when group aliases could not be added.
-#. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/editgroup.php:281 classes/User_group.php:540
-msgid "Could not create aliases."
-msgstr "Kunne ikke opprette alias."
-
 #. TRANS: Group edit form success message.
 #: actions/editgroup.php:301
 msgid "Options saved."
 msgstr "Lagret valg."
 
 #. TRANS: Title for e-mail settings.
-#: actions/emailsettings.php:59
+#: actions/emailsettings.php:60
 msgid "Email settings"
 msgstr "E-postinnstillinger"
 
 #. TRANS: E-mail settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/emailsettings.php:73
+#: actions/emailsettings.php:74
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 msgstr "Velg hvordan du mottar e-post fra %%site.name%%."
 
 #. TRANS: Form legend for e-mail settings form.
 #. TRANS: Field label for e-mail address input in e-mail settings form.
-#: actions/emailsettings.php:103 actions/emailsettings.php:129
+#: actions/emailsettings.php:104 actions/emailsettings.php:130
 msgid "Email address"
 msgstr "E-postadresse"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:109
+#: actions/emailsettings.php:110
 msgid "Current confirmed email address."
 msgstr "Nåværende bekreftede e-postadresse"
 
 #. TRANS: Button label to remove a confirmed e-mail address.
 #. TRANS: Button label for removing a set sender e-mail address to post notices from.
-#. TRANS: Button label to remove a confirmed Instant Messaging address.
+#. TRANS: Button label to remove a confirmed IM address.
 #. TRANS: Button label to remove a confirmed SMS address.
 #. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
-#: actions/emailsettings.php:112 actions/emailsettings.php:179
-#: actions/imsettings.php:112 actions/smssettings.php:120
-#: actions/smssettings.php:176
+#: actions/emailsettings.php:113 actions/emailsettings.php:180
+#: actions/imsettings.php:119 actions/smssettings.php:119
+#: actions/smssettings.php:175
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Fjern"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:119
+#: actions/emailsettings.php:120
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -2461,44 +2508,44 @@ msgstr ""
 #. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
 #. TRANS: Any other domain may be owned by a legitimate person or
 #. TRANS: organization.
-#: actions/emailsettings.php:136
+#: actions/emailsettings.php:137
 msgid "Email address, like \"UserName@example.org\""
 msgstr "E-postadresse («brukernavn@eksempel.org»)"
 
 #. TRANS: Button label for adding an e-mail address in e-mail settings form.
-#. TRANS: Button label for adding an Instant Messaging address in Instant Messaging settings form.
+#. TRANS: Button label for adding an IM address in IM settings form.
 #. TRANS: Button label for adding a SMS phone number in SMS settings form.
-#: actions/emailsettings.php:140 actions/imsettings.php:147
-#: actions/smssettings.php:158
+#: actions/emailsettings.php:141 actions/imsettings.php:147
+#: actions/smssettings.php:157
 msgctxt "BUTTON"
 msgid "Add"
 msgstr "Legg til"
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:148 actions/smssettings.php:167
+#: actions/emailsettings.php:149 actions/smssettings.php:166
 msgid "Incoming email"
 msgstr "innkommende e-post"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:154
+#: actions/emailsettings.php:155
 msgid "I want to post notices by email."
 msgstr "Jeg vil poste notiser med e-post."
 
 #. TRANS: Form instructions for incoming e-mail form in e-mail settings.
 #. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
-#: actions/emailsettings.php:176 actions/smssettings.php:174
+#: actions/emailsettings.php:177 actions/smssettings.php:173
 msgid "Send email to this address to post new notices."
 msgstr "Send e-post til denne adressen for å poste nye notiser."
 
 #. TRANS: Instructions for incoming e-mail address input form, when an address has already been assigned.
 #. TRANS: Instructions for incoming SMS e-mail address input form.
-#: actions/emailsettings.php:185 actions/smssettings.php:182
+#: actions/emailsettings.php:186 actions/smssettings.php:181
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr "Angi en ny e-postadresse for å poste til; fjerner den gamle."
 
 #. TRANS: Instructions for incoming e-mail address input form.
-#: actions/emailsettings.php:189
+#: actions/emailsettings.php:190
 msgid ""
 "To send notices via email, we need to create a unique email address for you "
 "on this server:"
@@ -2506,89 +2553,89 @@ msgstr ""
 
 #. TRANS: Button label for adding an e-mail address to send notices from.
 #. TRANS: Button label for adding an SMS e-mail address to send notices from.
-#: actions/emailsettings.php:195 actions/smssettings.php:185
+#: actions/emailsettings.php:196 actions/smssettings.php:184
 msgctxt "BUTTON"
 msgid "New"
 msgstr "Ny"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:204
+#: actions/emailsettings.php:205
 msgid "Email preferences"
 msgstr "E-postinnstillinger"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:212
+#: actions/emailsettings.php:213
 msgid "Send me notices of new subscriptions through email."
 msgstr "Send meg varsler om nye abonnementer gjennom e-post."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:218
+#: actions/emailsettings.php:219
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr "Send meg en e-post når noen legger min notis til som favoritt."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:225
+#: actions/emailsettings.php:226
 msgid "Send me email when someone sends me a private message."
 msgstr "Send meg en e-post når noen sender meg en privat melding."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:231
+#: actions/emailsettings.php:232
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr "Send meg en e-post når noen sender meg et «@-svar»."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:237
+#: actions/emailsettings.php:238
 msgid "Allow friends to nudge me and send me an email."
 msgstr "Tillat venner å knuffe meg og sende meg en e-post."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:243
+#: actions/emailsettings.php:244
 msgid "Publish a MicroID for my email address."
 msgstr "Publiser en MicroID for min e-postadresse."
 
 #. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:361
+#: actions/emailsettings.php:362
 msgid "Email preferences saved."
 msgstr "E-postinnstillinger lagret."
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:380
+#: actions/emailsettings.php:381
 msgid "No email address."
 msgstr "Ingen e-postadresse."
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:388
+#: actions/emailsettings.php:389
 #, fuzzy
 msgid "Cannot normalize that email address."
 msgstr "Klarer ikke normalisere epostadressen"
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:393 actions/register.php:212
+#: actions/emailsettings.php:394 actions/register.php:197
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "Ugyldig e-postadresse."
 
 #. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:397
+#: actions/emailsettings.php:398
 msgid "That is already your email address."
 msgstr "Det er allerede din e-postadresse."
 
 #. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:401
+#: actions/emailsettings.php:402
 msgid "That email address already belongs to another user."
 msgstr "Den e-postadressen tilhører allerede en annen bruker."
 
 #. TRANS: Server error thrown on database error adding e-mail confirmation code.
 #. TRANS: Server error thrown on database error adding Instant Messaging confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:418 actions/imsettings.php:343
-#: actions/smssettings.php:365
+#: actions/emailsettings.php:419 actions/imsettings.php:362
+#: actions/smssettings.php:364
 #, fuzzy
 msgid "Could not insert confirmation code."
 msgstr "Kunne ikke sette inn bekreftelseskode."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:425
+#: actions/emailsettings.php:426
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
@@ -2599,59 +2646,62 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling Instant Messaging address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:445 actions/imsettings.php:377
-#: actions/smssettings.php:399
+#: actions/emailsettings.php:446 actions/imsettings.php:391
+#: actions/smssettings.php:398
 msgid "No pending confirmation to cancel."
 msgstr "Ingen ventende bekreftelse å avbryte."
 
 #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:450
+#: actions/emailsettings.php:451
 msgid "That is the wrong email address."
 msgstr "Dette er feil e-postadresse."
 
 #. TRANS: Server error thrown on database error canceling e-mail address confirmation.
 #. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
-#: actions/emailsettings.php:459 actions/smssettings.php:413
+#: actions/emailsettings.php:460 actions/smssettings.php:412
 #, fuzzy
 msgid "Could not delete email confirmation."
 msgstr "Kunne ikke slette e-postbekreftelse."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:464
+#: actions/emailsettings.php:465
 msgid "Email confirmation cancelled."
 msgstr "E-postbekreftelse avbrutt."
 
 #. TRANS: Message given trying to remove an e-mail address that is not
 #. TRANS: registered for the active user.
-#: actions/emailsettings.php:483
+#: actions/emailsettings.php:484
 msgid "That is not your email address."
 msgstr "Det er ikke din e-postadresse."
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:504
+#: actions/emailsettings.php:505
 msgid "The email address was removed."
 msgstr "E-postadressen ble fjernet."
 
 #. TRANS: Form validation error displayed when trying to remove an incoming e-mail address while no address has been set.
-#: actions/emailsettings.php:518 actions/smssettings.php:555
+#: actions/emailsettings.php:519 actions/smssettings.php:554
 msgid "No incoming email address."
 msgstr "Ingen innkommende e-postadresse."
 
 #. TRANS: Server error thrown on database error removing incoming e-mail address.
 #. TRANS: Server error thrown on database error adding incoming e-mail address.
-#: actions/emailsettings.php:530 actions/emailsettings.php:554
-#: actions/smssettings.php:565 actions/smssettings.php:588
+#. TRANS: Server error displayed when the user could not be updated in SMS settings.
+#: actions/emailsettings.php:531 actions/emailsettings.php:555
+#: actions/smssettings.php:565 actions/smssettings.php:590
 #, fuzzy
 msgid "Could not update user record."
 msgstr "Kunne ikke oppdatere brukeroppføring."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:534 actions/smssettings.php:568
+#. TRANS: Confirmation text after updating SMS settings.
+#: actions/emailsettings.php:535 actions/smssettings.php:569
 msgid "Incoming email address removed."
 msgstr "Inkommende e-postadresse fjernet."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:558 actions/smssettings.php:591
+#. TRANS: Confirmation text after updating SMS settings.
+#: actions/emailsettings.php:559 actions/smssettings.php:594
 msgid "New incoming email address added."
 msgstr "Ny innkommende e-postadresse lagt til."
 
@@ -2663,7 +2713,7 @@ msgstr "Denne notisen er allerede en favoritt."
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
 #: actions/favor.php:95
 #, fuzzy
-msgid "Disfavor favorite"
+msgid "Disfavor favorite."
 msgstr "Fjern favoritt"
 
 #. TRANS: Page title for first page of favorited notices.
@@ -2716,9 +2766,8 @@ msgstr ""
 #. TRANS: %s is a user's nickname.
 #. TRANS: Title for first page of favourite notices of a user.
 #. TRANS: %s is the user for whom the favourite notices are displayed.
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing own favourited notices.
 #: actions/favoritesrss.php:111 actions/showfavorites.php:76
-#: lib/personalgroupnav.php:122
+#: lib/personalgroupnav.php:110
 #, php-format
 msgid "%s's favorite notices"
 msgstr "%s sine favorittnotiser"
@@ -2905,13 +2954,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
 #: actions/groupblock.php:191
 #, fuzzy
-msgid "Do not block this user from this group"
+msgid "Do not block this user from this group."
 msgstr "Ikke blokker denne brukeren fra denne gruppa"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
 #: actions/groupblock.php:198
 #, fuzzy
-msgid "Block this user from this group"
+msgid "Block this user from this group."
 msgstr "Blokker denne brukeren fra denne gruppen"
 
 #. TRANS: Server error displayed when trying to block a user from a group fails because of an application error.
@@ -2920,6 +2969,7 @@ msgid "Database error blocking user from group."
 msgstr "Databasefeil ved blokkering av bruker fra gruppe."
 
 #. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
+#. TRANS: Client error displayed trying to find a user by ID without providing an ID.
 #: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr "Ingen ID."
@@ -2950,7 +3000,7 @@ msgid "Unable to update your design settings."
 msgstr "Kunne ikke lagre dine innstillinger for utseende."
 
 #. TRANS: Form text to confirm saved group design settings.
-#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:222
+#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:239
 msgid "Design preferences saved."
 msgstr "Utseende lagret."
 
@@ -3013,7 +3063,7 @@ msgid "A list of the users in this group."
 msgstr "En liste over brukerne i denne gruppen."
 
 #. TRANS: Indicator in group members list that this user is a group administrator.
-#: actions/groupmembers.php:190
+#: actions/groupmembers.php:190 lib/action.php:581
 msgid "Admin"
 msgstr "Administrator"
 
@@ -3106,8 +3156,10 @@ msgid "Group search"
 msgstr "Gruppesøk"
 
 #. TRANS: Text on page where groups can be searched if no results were found for a query.
-#: actions/groupsearch.php:82 actions/noticesearch.php:117
-#: actions/peoplesearch.php:83
+#. TRANS: Text for notice search results is the query had no results.
+#. TRANS: Message on the "People search" page where a query has no results.
+#: actions/groupsearch.php:82 actions/noticesearch.php:122
+#: actions/peoplesearch.php:87
 msgid "No results."
 msgstr "Ingen resultat."
 
@@ -3144,165 +3196,168 @@ msgid "User is not blocked from group."
 msgstr "Bruker er ikke blokkert fra gruppe."
 
 #. TRANS: Server error displayed when unblocking a user from a group fails because of an unknown error.
+#. TRANS: Server error displayed when removing a user block.
 #: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "Feil under oppheving av blokkering."
 
 #. TRANS: Title for Instant Messaging settings.
-#: actions/imsettings.php:58
+#: actions/imsettings.php:56
 msgid "IM settings"
 msgstr "Innstillinger for direktemeldinger"
 
 #. 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.
-#: actions/imsettings.php:71
+#: actions/imsettings.php:69
 #, fuzzy, php-format
 msgid ""
-"You can send and receive notices through Jabber/Google Talk [instant "
-"messages](%%doc.im%%). Configure your address and settings below."
+"You can send and receive notices through instant messaging [instant messages]"
+"(%%doc.im%%). Configure your addresses and settings below."
 msgstr ""
 "Du kan sende og motta notiser gjennom Jabber/GTalk [direktemeldinger](%%doc."
 "im%%). Konfigurer adresse og innstillinger under."
 
-#. TRANS: Message given in the Instant Messaging settings if XMPP is not enabled on the site.
+#. TRANS: Message given in the IM settings if IM is not enabled on the site.
 #: actions/imsettings.php:90
 msgid "IM is not available."
 msgstr "Direktemeldinger ikke tilgjengelig."
 
-#. TRANS: Form legend for Instant Messaging settings form.
-#. TRANS: Field label for Instant Messaging address input in Instant Messaging settings form.
-#: actions/imsettings.php:102 actions/imsettings.php:132
-msgid "IM address"
-msgstr "Direktemeldingsadresse"
+#: actions/imsettings.php:116
+#, fuzzy, php-format
+msgid "Current confirmed %s address."
+msgstr "Nåværende bekreftede e-postadresse"
 
-#: actions/imsettings.php:109
-#, fuzzy
-msgid "Current confirmed Jabber/Google Talk address."
-msgstr "Nåværende bekreftede Jabber/GTak-adresse."
-
-#. TRANS: Form note in Instant Messaging settings form.
-#. TRANS: %s is the Instant Messaging address set for the site.
-#: actions/imsettings.php:120
+#. TRANS: Form note in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:128
 #, fuzzy, php-format
 msgid ""
-"Awaiting confirmation on this address. Check your Jabber/Google Talk account "
-"for a message with further instructions. (Did you add %s to your buddy list?)"
+"Awaiting confirmation on this address. Check your %s account for a message "
+"with further instructions. (Did you add %s to your buddy list?)"
 msgstr ""
 "Venter på godkjenning. Sjekk din Jabber/GTalk-konto for en melding med "
 "instruksjoner (la du %s til vennelisten din?)"
 
-#. TRANS: IM address input field instructions in Instant Messaging settings form.
-#. TRANS: %s is the Instant Messaging address set for the site.
-#. TRANS: Do not translate "example.org". It is one of the domain names reserved for use in examples by
-#. TRANS: http://www.rfc-editor.org/rfc/rfc2606.txt. Any other domain may be owned by a legitimate
-#. TRANS: person or organization.
-#: actions/imsettings.php:139
-#, fuzzy, php-format
-msgid ""
-"Jabber or Google Talk address, like \"UserName@example.org\". First, make "
-"sure to add %s to your buddy list in your IM client or on Google Talk."
-msgstr ""
-"Jabber- og GTalk-adresse, som «brukernavn@example.org». Husk å legge %s til "
-"vennelisten din i direktemeldingsklienten din eller på GTalk."
+#: actions/imsettings.php:140
+msgid "IM address"
+msgstr "Direktemeldingsadresse"
 
-#. TRANS: Form legend for Instant Messaging preferences form.
-#: actions/imsettings.php:154
-msgid "IM preferences"
+#: actions/imsettings.php:142
+#, php-format
+msgid "%s screenname."
+msgstr ""
+
+#. TRANS: Header for IM preferences form.
+#: actions/imsettings.php:163
+#, fuzzy
+msgid "IM Preferences"
 msgstr "Direktemeldingsinnstillinger"
 
-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:159
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:174
 #, fuzzy
-msgid "Send me notices through Jabber/Google Talk."
-msgstr "Send meg notiser gjennom Jabber/GTalk."
+msgid "Send me notices"
+msgstr "Send en notis"
 
-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:165
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:176
 #, fuzzy
-msgid "Post a notice when my Jabber/Google Talk status changes."
+msgid "Post a notice when my status changes."
 msgstr "Post en notis når min Jabber/Gtalk-status endres."
 
-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:171
-#, fuzzy
-msgid ""
-"Send me replies through Jabber/Google Talk from people I'm not subscribed to."
-msgstr "Send meg svar gjennom Jabber/GTalk fra personer jeg ikke abonnerer på."
-
-#. TRANS: Checkbox label in Instant Messaging preferences form.
+#. TRANS: Checkbox label in IM preferences form.
 #: actions/imsettings.php:178
 #, fuzzy
-msgid "Publish a MicroID for my Jabber/Google Talk address."
-msgstr "Publiser en MicroID for min Jabber/Gtalk-adresse."
+msgid "Send me replies from people I'm not subscribed to."
+msgstr "Send meg svar gjennom Jabber/GTalk fra personer jeg ikke abonnerer på."
 
-#. TRANS: Confirmation message for successful Instant Messaging preferences save.
-#: actions/imsettings.php:283 actions/othersettings.php:192
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:181
+#, fuzzy
+msgid "Publish a MicroID"
+msgstr "Publiser en MicroID for min e-postadresse."
+
+#. TRANS: Server error thrown on database error updating IM preferences.
+#: actions/imsettings.php:291
+#, fuzzy
+msgid "Couldn't update IM preferences."
+msgstr "Kunne ikke oppdatere bruker."
+
+#. TRANS: Confirmation message for successful IM preferences save.
+#. TRANS: Confirmation message after saving preferences.
+#: actions/imsettings.php:298 actions/urlsettings.php:244
 msgid "Preferences saved."
 msgstr "Innstillinger lagret."
 
-#. TRANS: Message given saving Instant Messaging address without having provided one.
-#: actions/imsettings.php:304
-msgid "No Jabber ID."
-msgstr "Ingen Jabber ID."
-
-#. TRANS: Message given saving Instant Messaging address that cannot be normalised.
-#: actions/imsettings.php:312
+#. TRANS: Message given saving IM address without having provided one.
+#: actions/imsettings.php:320
 #, fuzzy
-msgid "Cannot normalize that Jabber ID."
+msgid "No screenname."
+msgstr "Ingen kallenavn."
+
+#: actions/imsettings.php:325
+#, fuzzy
+msgid "No transport."
+msgstr "Ingen notis."
+
+#. TRANS: Message given saving IM address that cannot be normalised.
+#: actions/imsettings.php:333
+#, fuzzy
+msgid "Cannot normalize that screenname"
 msgstr "Klarer ikke normalisere Jabber-IDen"
 
-#. TRANS: Message given saving Instant Messaging address that not valid.
-#: actions/imsettings.php:317
+#. TRANS: Message given saving IM address that not valid.
+#: actions/imsettings.php:340
 #, fuzzy
-msgid "Not a valid Jabber ID."
-msgstr "Ugyldig Jabber ID"
+msgid "Not a valid screenname"
+msgstr "Ugyldig nick."
 
-#. TRANS: Message given saving Instant Messaging address that is already set.
-#: actions/imsettings.php:321
-msgid "That is already your Jabber ID."
-msgstr "Det er allerede din Jabber ID."
-
-#. TRANS: Message given saving Instant Messaging address that is already set for another user.
-#: actions/imsettings.php:325
-msgid "Jabber ID already belongs to another user."
+#. TRANS: Message given saving IM address that is already set for another user.
+#: actions/imsettings.php:344
+#, fuzzy
+msgid "Screenname already belongs to another user."
 msgstr "Jabber-ID tilhører allerede en annen bruker."
 
-#. TRANS: Message given saving valid Instant Messaging address that is to be confirmed.
-#. TRANS: %s is the Instant Messaging address set for the site.
-#: actions/imsettings.php:353
-#, php-format
-msgid ""
-"A confirmation code was sent to the IM address you added. You must approve %"
-"s for sending messages to you."
+#. TRANS: Message given saving valid IM address that is to be confirmed.
+#: actions/imsettings.php:369
+#, fuzzy
+msgid "A confirmation code was sent to the IM address you added."
 msgstr ""
 "En bekreftelseskode ble sendt til lynmeldingsadressen du la til. Du må "
 "godkjenne %s for å sende meldinger til deg."
 
-#. TRANS: Message given canceling Instant Messaging address confirmation for the wrong IM address.
-#: actions/imsettings.php:382
+#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#: actions/imsettings.php:396
 msgid "That is the wrong IM address."
 msgstr "Det er feil IM-adresse."
 
-#. TRANS: Server error thrown on database error canceling Instant Messaging address confirmation.
-#: actions/imsettings.php:391
+#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#: actions/imsettings.php:405
 #, fuzzy
-msgid "Could not delete IM confirmation."
+msgid "Couldn't delete confirmation."
 msgstr "Kunne ikke slette direktemeldingsbekreftelse."
 
-#. TRANS: Message given after successfully canceling Instant Messaging address confirmation.
-#: actions/imsettings.php:396
+#. TRANS: Message given after successfully canceling IM address confirmation.
+#: actions/imsettings.php:410
 msgid "IM confirmation cancelled."
 msgstr "Direktemeldingsbekreftelse avbrutt."
 
-#. TRANS: Message given trying to remove an Instant Messaging address that is not
+#. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.
-#: actions/imsettings.php:417
-msgid "That is not your Jabber ID."
-msgstr "Det er ikke din Jabber ID."
+#: actions/imsettings.php:434
+#, fuzzy
+msgid "That is not your screenname."
+msgstr "Det er ikke ditt telefonnummer."
+
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#: actions/imsettings.php:443
+#, fuzzy
+msgid "Couldn't update user im prefs."
+msgstr "Kunne ikke oppdatere brukeroppføring."
 
 #. TRANS: Message given after successfully removing a registered Instant Messaging address.
-#: actions/imsettings.php:440
+#: actions/imsettings.php:451
 msgid "The IM address was removed."
 msgstr "Direktemeldingsadressen ble fjernet."
 
@@ -3511,7 +3566,7 @@ msgid "You must be logged in to join a group."
 msgstr "Du må være innlogget for å bli med i en gruppe."
 
 #. TRANS: Title for join group page after joining.
-#: actions/joingroup.php:147
+#: actions/joingroup.php:148
 #, fuzzy, php-format
 msgctxt "TITLE"
 msgid "%1$s joined group %2$s"
@@ -3638,7 +3693,7 @@ msgstr "Adresse til et bilde som vises med lisensen."
 #. TRANS: Submit button title.
 #: actions/licenseadminpanel.php:311 actions/sessionsadminpanel.php:199
 #: actions/siteadminpanel.php:292 actions/snapshotadminpanel.php:245
-#: actions/tagother.php:154 lib/applicationeditform.php:357
+#: actions/tagother.php:133 lib/applicationeditform.php:357
 msgid "Save"
 msgstr "Lagre"
 
@@ -3646,40 +3701,42 @@ msgstr "Lagre"
 msgid "Save license settings"
 msgstr "Lagre lisensinnstillinger"
 
-#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
+#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
+#: actions/login.php:97 actions/otp.php:62 actions/register.php:130
 msgid "Already logged in."
 msgstr "Allerede innlogget."
 
-#: actions/login.php:148
+#: actions/login.php:125
 msgid "Incorrect username or password."
 msgstr "Feil brukernavn eller passord."
 
-#: actions/login.php:154 actions/otp.php:120
+#. TRANS: Server error displayed when a user object could not be created trying to login using "one time password login".
+#: actions/login.php:131 actions/otp.php:127
 msgid "Error setting user. You are probably not authorized."
 msgstr "Feil ved innstilling av bruker. Du er mest sannsynlig kke autorisert."
 
-#: actions/login.php:210 actions/login.php:263
+#: actions/login.php:185 actions/login.php:236 lib/action.php:598
 msgid "Login"
 msgstr "Logg inn"
 
-#: actions/login.php:249
+#: actions/login.php:222
 msgid "Login to site"
 msgstr "Logg inn på nettstedet"
 
-#: actions/login.php:258 actions/register.php:490
+#: actions/login.php:231 actions/register.php:469
 msgid "Remember me"
 msgstr "Husk meg"
 
-#: actions/login.php:259 actions/register.php:492
+#: actions/login.php:232 actions/register.php:471
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 "Logg inn automatisk i framtiden. Ikke for datamaskiner du deler med andre!"
 
-#: actions/login.php:269
+#: actions/login.php:241
 msgid "Lost or forgotten password?"
 msgstr "Mistet eller glemt passordet?"
 
-#: actions/login.php:288
+#: actions/login.php:259
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -3687,11 +3744,11 @@ msgstr ""
 "Av sikkerhetsmessige årsaker, skriv inn brukernavn og passord på nytt før du "
 "endrer innstillingene dine."
 
-#: actions/login.php:292
+#: actions/login.php:263
 msgid "Login with your username and password."
 msgstr "Logg inn med brukernavn og passord."
 
-#: actions/login.php:295
+#: actions/login.php:266
 #, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -3818,7 +3875,9 @@ msgstr "Ny notis"
 msgid "Notice posted"
 msgstr "Notis postet"
 
-#: actions/noticesearch.php:68
+#. TRANS: Instructions for Notice search page.
+#. TRANS: %%site.name%% is the name of the StatusNet site.
+#: actions/noticesearch.php:69
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -3827,16 +3886,21 @@ msgstr ""
 "Søk i notiser på %%site.name%% etter deres innhold. Separer nøkkelord med "
 "mellomrom; de må være minst 3 tegn lange."
 
-#: actions/noticesearch.php:78
+#. TRANS: Title of the page where users can search for notices.
+#: actions/noticesearch.php:80
 msgid "Text search"
 msgstr "Tekst-søk"
 
-#: actions/noticesearch.php:91
+#. TRANS: Test in RSS notice search.
+#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
+#: actions/noticesearch.php:95
 #, php-format
 msgid "Search results for \"%1$s\" on %2$s"
 msgstr "Søkeresultat for «%1$s» på %2$s"
 
-#: actions/noticesearch.php:121
+#. TRANS: Text for logged in users making a query for notices without results.
+#. TRANS: This message contains a Markdown link.
+#: actions/noticesearch.php:128
 #, php-format
 msgid ""
 "Be the first to [post on this topic](%%%%action.newnotice%%%%?"
@@ -3845,7 +3909,9 @@ msgstr ""
 "Vær den første til å [poste om dette emnet](%%%%action.newnotice%%%%?"
 "status_textarea=%s)!"
 
-#: actions/noticesearch.php:124
+#. TRANS: Text for not logged in users making a query for notices without results.
+#. TRANS: This message contains Markdown links.
+#: actions/noticesearch.php:133
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and be the first to "
@@ -3855,14 +3921,17 @@ msgstr ""
 "første til å [poste om dette emnet](%%%%action.newnotice%%%%?status_textarea="
 "%s)!"
 
-#: actions/noticesearchrss.php:96
+#. TRANS: RSS notice search feed title. %s is the query.
+#: actions/noticesearchrss.php:95
 #, php-format
 msgid "Updates with \"%s\""
 msgstr "Oppdateringer med «%s»"
 
-#: actions/noticesearchrss.php:98
+#. TRANS: RSS notice search feed description.
+#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
+#: actions/noticesearchrss.php:99
 #, fuzzy, php-format
-msgid "Updates matching search term \"%1$s\" on %2$s!"
+msgid "Updates matching search term \"%1$s\" on %2$s."
 msgstr "Oppdateringer som samsvarer søkestrengen «%1$s» på %2$s."
 
 #: actions/nudge.php:85
@@ -3882,51 +3951,51 @@ msgid "Nudge sent!"
 msgstr "Knuff sendt!"
 
 #. TRANS: Message displayed to an anonymous user trying to view OAuth application list.
-#: actions/oauthappssettings.php:60
+#: actions/oauthappssettings.php:57
 msgid "You must be logged in to list your applications."
 msgstr "Du må være logget inn for å liste opp programmene dine."
 
 #. TRANS: Page title for OAuth applications
-#: actions/oauthappssettings.php:76
+#: actions/oauthappssettings.php:73
 msgid "OAuth applications"
 msgstr "OAuth-program"
 
 #. TRANS: Page instructions for OAuth applications
-#: actions/oauthappssettings.php:88
+#: actions/oauthappssettings.php:85
 msgid "Applications you have registered"
 msgstr "Program du har registrert"
 
 #. TRANS: Empty list message on page with OAuth applications.
-#: actions/oauthappssettings.php:141
+#: actions/oauthappssettings.php:138
 #, php-format
 msgid "You have not registered any applications yet."
 msgstr "Du har ikke registrert noen program ennå."
 
 #. TRANS: Title for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:71
+#: actions/oauthconnectionssettings.php:69
 msgid "Connected applications"
 msgstr "Tilkoblede program"
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:83
+#: actions/oauthconnectionssettings.php:80
 msgid "The following connections exist for your account."
 msgstr "Følgende tilkoblinger finnes for kontoen din."
 
 #. TRANS: Client error when trying to revoke access for an application while not being a user of it.
-#: actions/oauthconnectionssettings.php:168
+#: actions/oauthconnectionssettings.php:165
 msgid "You are not a user of that application."
 msgstr "Du er ikke bruker av dette programmet."
 
 #. TRANS: Client error when revoking access has failed for some reason.
 #. TRANS: %s is the application ID revoking access failed for.
-#: actions/oauthconnectionssettings.php:183
+#: actions/oauthconnectionssettings.php:180
 #, fuzzy, php-format
 msgid "Unable to revoke access for application: %s."
 msgstr "Kunne ikke fjerne tilgang for applikasjonen: %s."
 
 #. TRANS: Success message after revoking access for an application.
 #. TRANS: %1$s is the application name, %2$s is the first part of the user token.
-#: actions/oauthconnectionssettings.php:202
+#: actions/oauthconnectionssettings.php:199
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -3935,20 +4004,30 @@ msgstr ""
 "Du har fjernet tilgangen for %1$s og tilgangstegnet som begynner med %2$s."
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:213
+#: actions/oauthconnectionssettings.php:210
 msgid "You have not authorized any applications to use your account."
 msgstr "Du har ikke tillatt noen programmer å bruke din konto."
 
 #. TRANS: Note for developers in the OAuth connection settings form.
 #. TRANS: This message contains a Markdown link. Do not separate "](".
 #. TRANS: %s is the URL to the OAuth settings.
-#: actions/oauthconnectionssettings.php:233
+#: actions/oauthconnectionssettings.php:230
 #, php-format
 msgid ""
 "Are you a developer? [Register an OAuth client application](%s) to use with "
 "this instance of StatusNet."
 msgstr ""
 
+#: actions/oembed.php:64
+#, fuzzy, php-format
+msgid "\"%s\" not found."
+msgstr "Bruker ikke funnet."
+
+#: actions/oembed.php:76
+#, fuzzy, php-format
+msgid "Notice %s not found."
+msgstr "Foreldrenotis ikke funnet."
+
 #: actions/oembed.php:80 actions/shownotice.php:100
 msgid "Notice has no profile."
 msgstr "Notisen har ingen profil."
@@ -3958,6 +4037,16 @@ msgstr "Notisen har ingen profil."
 msgid "%1$s's status on %2$s"
 msgstr "%1$s sin status på %2$s"
 
+#: actions/oembed.php:95
+#, fuzzy, php-format
+msgid "Attachment %s not found."
+msgstr "Fant ikke mottakeren."
+
+#: actions/oembed.php:136
+#, php-format
+msgid "\"%s\" not supported for oembed requests."
+msgstr ""
+
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
 #: actions/oembed.php:168
 #, php-format
@@ -3971,94 +4060,61 @@ msgid "Only %s URLs over plain HTTP please."
 msgstr "Bare %s-nettadresser over vanlig HTTP."
 
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1205
-#: lib/apiaction.php:1232 lib/apiaction.php:1367
+#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1207
+#: lib/apiaction.php:1234 lib/apiaction.php:1369
 msgid "Not a supported data format."
 msgstr "Ikke et støttet dataformat."
 
+#. TRANS: ShortName in the OpenSearch interface when trying to find users.
 #: actions/opensearch.php:64
 msgid "People Search"
 msgstr "Personsøk"
 
-#: actions/opensearch.php:67
+#: actions/opensearch.php:68
 msgid "Notice Search"
 msgstr "Notissøk"
 
-#: actions/othersettings.php:59
-msgid "Other settings"
-msgstr "Andre innstillinger"
-
-#. TRANS: Instructions for tab "Other" in user profile settings.
-#: actions/othersettings.php:71
-msgid "Manage various other options."
-msgstr "Håndter diverse andre alternativ."
-
-#. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
-#. TRANS: user's profile settings. Use of "free" is as in "open", indicating that the
-#. TRANS: information on the shortener site is freely distributable.
-#. TRANS: This message has one space at the beginning. Use your language's word separator
-#. TRANS: here if it has one (most likely a single space).
-#: actions/othersettings.php:113
-msgid " (free service)"
-msgstr " (fri tjeneste)"
-
-#. TRANS: Label for dropdown with URL shortener services.
-#: actions/othersettings.php:122
-msgid "Shorten URLs with"
-msgstr "Forkort nettadresser med"
-
-#. TRANS: Tooltip for for dropdown with URL shortener services.
-#: actions/othersettings.php:124
-msgid "Automatic shortening service to use."
-msgstr "Automatisk fortkortelsestjeneste å bruke."
-
-#. TRANS: Label for checkbox.
-#: actions/othersettings.php:130
-msgid "View profile designs"
-msgstr "Vis profilutseender"
-
-#. TRANS: Tooltip for checkbox.
-#: actions/othersettings.php:132
-msgid "Show or hide profile designs."
-msgstr "Vis eller skjul profilutseender."
-
-#. TRANS: Form validation error for form "Other settings" in user profile.
-#: actions/othersettings.php:164
-msgid "URL shortening service is too long (maximum 50 characters)."
-msgstr "Adresseforkortelsestjenesten er for lang (maks 50 tegn)."
-
-#: actions/otp.php:69
+#. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
+#: actions/otp.php:70
 msgid "No user ID specified."
 msgstr "Ingen bruker-ID spesifisert."
 
-#: actions/otp.php:83
+#. TRANS: Client error displayed trying to use "one time password login" without specifying a login token.
+#: actions/otp.php:86
 msgid "No login token specified."
 msgstr "Ingen notis spesifisert."
 
-#: actions/otp.php:90
+#. TRANS: Client error displayed trying to use "one time password login" without requesting a login token.
+#: actions/otp.php:94
 msgid "No login token requested."
 msgstr ""
 
-#: actions/otp.php:95
+#. TRANS: Client error displayed trying to use "one time password login" while specifying an invalid login token.
+#: actions/otp.php:100
 msgid "Invalid login token specified."
 msgstr "Ugyldig symbol."
 
-#: actions/otp.php:104
+#. TRANS: Client error displayed trying to use "one time password login" while specifying an expired login token.
+#: actions/otp.php:110
 #, fuzzy
 msgid "Login token expired."
 msgstr "Logg inn på nettstedet"
 
-#: actions/outbox.php:58
+#. TRANS: Title for outbox for any but the fist page.
+#. TRANS: %1$s is the user nickname, %2$d is the page number.
+#: actions/outbox.php:57
 #, php-format
 msgid "Outbox for %1$s - page %2$d"
 msgstr "Utboks for %1$s - side %2$d"
 
+#. TRANS: Title for first page of outbox.
 #: actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
 msgstr "Utboks for %s"
 
-#: actions/outbox.php:104
+#. TRANS: Instructions for outbox.
+#: actions/outbox.php:103
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr "Dette er utboksen din som viser alle private meldinger du har sendt."
 
@@ -4084,43 +4140,45 @@ msgstr "Gammelt passord"
 msgid "New password"
 msgstr "Nytt passord"
 
-#: actions/passwordsettings.php:109
+#: actions/passwordsettings.php:109 actions/register.php:416
 #, fuzzy
-msgid "6 or more characters"
+msgid "6 or more characters."
 msgstr "6 eller flere tegn"
 
-#: actions/passwordsettings.php:113
+#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#: actions/passwordsettings.php:113 actions/recoverpassword.php:264
+#: actions/register.php:420
 #, fuzzy
-msgid "Same as password above"
+msgid "Same as password above."
 msgstr "Samme som passord ovenfor"
 
 #: actions/passwordsettings.php:117
 msgid "Change"
 msgstr "Endre"
 
-#: actions/passwordsettings.php:154 actions/register.php:238
+#: actions/passwordsettings.php:153 actions/register.php:223
 msgid "Password must be 6 or more characters."
 msgstr "Passord må være minst 6 tegn."
 
-#: actions/passwordsettings.php:157 actions/register.php:241
+#: actions/passwordsettings.php:156 actions/register.php:226
 msgid "Passwords don't match."
 msgstr "Passordene var ikke like."
 
-#: actions/passwordsettings.php:165
+#: actions/passwordsettings.php:164
 msgid "Incorrect old password"
 msgstr "Feil gammelt passord"
 
-#: actions/passwordsettings.php:181
+#: actions/passwordsettings.php:180
 msgid "Error saving user; invalid."
 msgstr "Feil ved lagring av bruker; ugyldig."
 
-#: actions/passwordsettings.php:186
+#. TRANS: Reset password form validation error message.
+#: actions/passwordsettings.php:185 actions/recoverpassword.php:418
 #, fuzzy
-msgid "Can't save new password."
+msgid "Cannot save new password."
 msgstr "Klarer ikke å lagre nytt passord."
 
-#. TRANS: Title for password recovery page in password saved mode.
-#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
+#: actions/passwordsettings.php:191
 msgid "Password saved."
 msgstr "Passordet ble lagret"
 
@@ -4327,8 +4385,7 @@ msgid "Directory where backgrounds are located."
 msgstr "Mappen bakgrunner er plassert i."
 
 #. TRANS: Fieldset legens in Paths admin panel.
-#. TRANS: DT element label in attachment list.
-#: actions/pathsadminpanel.php:419 lib/attachmentlist.php:98
+#: actions/pathsadminpanel.php:419
 msgid "Attachments"
 msgstr "Vedlegg"
 
@@ -4396,7 +4453,9 @@ msgstr "Tjener SSL-forespørsler skal rettes til."
 msgid "Save paths"
 msgstr "Lagre stier"
 
-#: actions/peoplesearch.php:52
+#. TRANS: Instructions for the "People search" page.
+#. TRANS: %%site.name%% is the name of the StatusNet site.
+#: actions/peoplesearch.php:54
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
@@ -4405,7 +4464,8 @@ msgstr ""
 "Søk etter personer på %%site.name%% etter deres navn, lokasjon eller "
 "interesser. Skill nøkkelord med mellomrom; de må være 3 tegn eller lengre."
 
-#: actions/peoplesearch.php:58
+#. TRANS: Title of a page where users can search for other users.
+#: actions/peoplesearch.php:61
 msgid "People search"
 msgstr "Personsøk"
 
@@ -4419,6 +4479,60 @@ msgstr "Ikke en gyldig personmerkelapp: %s."
 msgid "Users self-tagged with %1$s - page %2$d"
 msgstr "Brukere som har merket seg selv med %1$s - side %2$d"
 
+#. TRANS: Page title for AJAX form return when a disabling a plugin.
+#: actions/plugindisable.php:69
+msgctxt "plugin"
+msgid "Disabled"
+msgstr ""
+
+#. TRANS: Client error displayed trying to perform any request method other than POST.
+#. TRANS: Do not translate POST.
+#: actions/pluginenable.php:78 actions/subscribe.php:77
+msgid "This action only accepts POST requests."
+msgstr ""
+
+#: actions/pluginenable.php:102
+#, fuzzy
+msgid "You cannot administer plugins."
+msgstr "Du kan ikke slette brukere."
+
+#: actions/pluginenable.php:109
+#, fuzzy
+msgid "No such plugin."
+msgstr "Ingen slik side."
+
+#. TRANS: Page title for AJAX form return when enabling a plugin.
+#: actions/pluginenable.php:159
+msgctxt "plugin"
+msgid "Enabled"
+msgstr ""
+
+#. TRANS: Tab and title for plugins admin panel.
+#. TRANS: Menu item for site administration
+#: actions/pluginsadminpanel.php:56 actions/version.php:191
+#: lib/adminpanelaction.php:411
+msgid "Plugins"
+msgstr "Programtillegg"
+
+#. TRANS: Instructions at top of plugin admin page.
+#: actions/pluginsadminpanel.php:68
+msgid ""
+"Additional plugins can be enabled and configured manually. See the <a href="
+"\"http://status.net/wiki/Plugins\">online plugin documentation</a> for more "
+"details."
+msgstr ""
+
+#. TRANS: Admin form section header
+#: actions/pluginsadminpanel.php:84
+#, fuzzy
+msgid "Default plugins"
+msgstr "Standardspråk"
+
+#: actions/pluginsadminpanel.php:106
+msgid ""
+"All default plugins have been disabled from the site's configuration file."
+msgstr ""
+
 #: actions/postnotice.php:95
 msgid "Invalid notice content."
 msgstr "Ugyldig notisinnhold."
@@ -4429,12 +4543,12 @@ msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’.
 msgstr "Notislisensen ‘%1$s’ er ikke kompatibel med nettstedslisensen ‘%2$s’."
 
 #. TRANS: Page title for profile settings.
-#: actions/profilesettings.php:59
+#: actions/profilesettings.php:60
 msgid "Profile settings"
 msgstr "Profilinnstillinger"
 
 #. TRANS: Usage instructions for profile settings.
-#: actions/profilesettings.php:70
+#: actions/profilesettings.php:71
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
@@ -4442,40 +4556,37 @@ msgstr ""
 "mer om deg."
 
 #. TRANS: Profile settings form legend.
-#: actions/profilesettings.php:98
+#: actions/profilesettings.php:99
 msgid "Profile information"
 msgstr "Profilinformasjon"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109 actions/register.php:433
+#: actions/profilesettings.php:110 actions/register.php:412
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr "1‒64 små bokstaver eller tall, ingen tegnsetting eller mellomrom."
 
 #. TRANS: Field label in form for profile settings.
-#. TRANS: Label for full group name (dt). Text hidden by default.
-#. TRANS: DT for full name in a profile.
-#: actions/profilesettings.php:113 actions/register.php:455
-#: actions/showgroup.php:255 actions/tagother.php:104
-#: lib/groupeditform.php:150 lib/userprofile.php:156
+#: actions/profilesettings.php:114 actions/register.php:434
+#: lib/groupeditform.php:150
 msgid "Full name"
 msgstr "Fullt navn"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:118 actions/register.php:460
+#: actions/profilesettings.php:119 actions/register.php:439
 #: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "Hjemmesiden"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:121
+#: actions/profilesettings.php:122 actions/register.php:441
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr "Adressen til din hjemmeside, blogg eller profil på et annet nettsted."
 
 #. TRANS: Tooltip for field label in form for profile settings. Plural
 #. TRANS: is decided by the number of characters available for the
 #. TRANS: biography (%d).
-#: actions/profilesettings.php:129 actions/register.php:471
+#: actions/profilesettings.php:130 actions/register.php:450
 #, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4483,86 +4594,82 @@ msgstr[0] "Beskriv deg selv og dine interesser på %d tegn"
 msgstr[1] "Beskriv deg selv og dine interesser på %d tegn"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:135 actions/register.php:476
+#: actions/profilesettings.php:136 actions/register.php:455
 msgid "Describe yourself and your interests"
 msgstr "Beskriv degselv og dine interesser"
 
 #. TRANS: Text area label in form for profile settings where users can provide.
 #. TRANS: their biography.
-#: actions/profilesettings.php:139 actions/register.php:478
+#: actions/profilesettings.php:140 actions/register.php:457
 msgid "Bio"
 msgstr "Om meg"
 
 #. TRANS: Field label in form for profile settings.
-#. TRANS: Label for group location (dt). Text hidden by default.
-#. TRANS: DT for location in a profile.
-#: actions/profilesettings.php:145 actions/register.php:483
-#: actions/showgroup.php:265 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:173
-#: lib/userprofile.php:172
+#: actions/profilesettings.php:146 actions/register.php:462
+#: lib/groupeditform.php:173
 msgid "Location"
 msgstr "Plassering"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148 actions/register.php:485
+#: actions/profilesettings.php:149
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Hvor du er, for eksempel «By, fylke (eller region), land»"
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:153
+#: actions/profilesettings.php:154
 msgid "Share my current location when posting notices"
 msgstr "Del min nåværende plassering når jeg poster notiser"
 
 #. TRANS: Field label in form for profile settings.
-#. TRANS: DT for tags in a profile.
-#: actions/profilesettings.php:161 actions/tagother.php:149
-#: actions/tagother.php:209 lib/subscriptionlist.php:106
-#: lib/subscriptionlist.php:108 lib/userprofile.php:220
+#: actions/profilesettings.php:162 actions/tagother.php:128
+#: actions/tagother.php:188 lib/subscriptionlist.php:104
+#: lib/subscriptionlist.php:106
 msgid "Tags"
 msgstr "Tagger"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:164
+#: actions/profilesettings.php:165
 #, fuzzy
 msgid ""
-"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- "
+"separated."
 msgstr ""
 "Merkelapper for degselv (bokstaver, nummer, -, ., og _), adskilt med komma "
 "eller mellomrom"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:169
+#: actions/profilesettings.php:170
 msgid "Language"
 msgstr "Språk"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:171
+#: actions/profilesettings.php:172
 #, fuzzy
-msgid "Preferred language"
+msgid "Preferred language."
 msgstr "Foretrukket språk"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:181
+#: actions/profilesettings.php:182
 msgid "Timezone"
 msgstr "Tidssone"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:183
+#: actions/profilesettings.php:184
 msgid "What timezone are you normally in?"
 msgstr "Hvilken tidssone er du vanligvis i?"
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:189
+#: actions/profilesettings.php:190
 #, fuzzy
 msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)"
+"Automatically subscribe to whoever subscribes to me (best for non-humans)."
 msgstr ""
 "Abonner automatisk på de som abonnerer på meg (best for ikke-mennesker)"
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Plural form is used based on the maximum number of allowed
 #. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:258 actions/register.php:229
+#: actions/profilesettings.php:259 actions/register.php:214
 #, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4570,49 +4677,49 @@ msgstr[0] "Biografien er for lang (maks %d tegn)."
 msgstr[1] "Biografien er for lang (maks %d tegn)."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:269 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:270 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr "Tidssone ikke valgt."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:277
+#: actions/profilesettings.php:278
 msgid "Language is too long (maximum 50 characters)."
 msgstr "Språknavnet er for langt (maks 50 tegn)."
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:291 actions/tagother.php:178
-#, php-format
-msgid "Invalid tag: \"%s\""
+#: actions/profilesettings.php:292
+#, fuzzy, php-format
+msgid "Invalid tag: \"%s\"."
 msgstr "Ugyldig merkelapp: «%s»"
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:347
+#: actions/profilesettings.php:348
 #, fuzzy
 msgid "Could not update user for autosubscribe."
 msgstr "Kunne ikke oppdatere bruker for autoabonnering."
 
 #. TRANS: Server error thrown when user profile location preference settings could not be updated.
-#: actions/profilesettings.php:405
+#: actions/profilesettings.php:406
 #, fuzzy
 msgid "Could not save location prefs."
 msgstr "Kunne ikke lagre plasseringsinnstillinger."
 
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:427 actions/tagother.php:200
+#: actions/profilesettings.php:428 actions/tagother.php:179
 msgid "Could not save tags."
 msgstr "Kunne ikke lagre merkelapper."
 
 #. TRANS: Confirmation shown when user profile settings are saved.
 #. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:436 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:437 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "Innstillinger lagret."
 
 #. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
 #. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:483 actions/restoreaccount.php:60
+#: actions/profilesettings.php:484 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "Opprett en konto"
@@ -4692,6 +4799,12 @@ msgstr ""
 "Mikroblogg)tjeneste basert på det frie programvareverktøyet [StatusNet]"
 "(http://status.net)."
 
+#. TRANS: Public RSS feed description. %s is the StatusNet site name.
+#: actions/publicrss.php:106
+#, fuzzy, php-format
+msgid "%s updates from everyone."
+msgstr "%s oppdateringer fra alle sammen!"
+
 #. TRANS: Title for public tag cloud.
 #: actions/publictagcloud.php:57
 msgid "Public tag cloud"
@@ -4732,10 +4845,6 @@ msgstr ""
 "Hvorfor ikke [registrere en konto](%%action.register%%) og vær den første "
 "til å poste en!"
 
-#: actions/publictagcloud.php:146
-msgid "Tag cloud"
-msgstr "Merkelappsky"
-
 #. TRANS: Client error displayed trying to recover password while already logged in.
 #: actions/recoverpassword.php:37
 msgid "You are already logged in!"
@@ -4827,6 +4936,12 @@ msgstr "Gjenopprett passord"
 msgid "Password recovery requested"
 msgstr "Passordgjenoppretting forespurt"
 
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/recoverpassword.php:229
+#, fuzzy
+msgid "Password saved"
+msgstr "Passordet ble lagret"
+
 #. TRANS: Title for password recovery page when an unknown action has been specified.
 #: actions/recoverpassword.php:232
 msgid "Unknown action"
@@ -4838,15 +4953,9 @@ msgstr "Ukjent handling"
 msgid "6 or more characters, and do not forget it!"
 msgstr "6 eller flere tegn. Og ikke glem det!"
 
-#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
-#: actions/recoverpassword.php:264 actions/register.php:441
-#, fuzzy
-msgid "Same as password above."
-msgstr "Samme som passord ovenfor"
-
 #. TRANS: Button text for password reset form.
 #. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: actions/recoverpassword.php:268 lib/designsettings.php:264
+#: actions/recoverpassword.php:268 lib/designform.php:145
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Reset"
@@ -4896,14 +5005,8 @@ msgstr "Passordet må bestå av 6 eller flere tegn."
 msgid "Password and confirmation do not match."
 msgstr "Passord og bekreftelse samsvarer ikke."
 
-#. TRANS: Reset password form validation error message.
-#: actions/recoverpassword.php:418
-#, fuzzy
-msgid "Cannot save new password."
-msgstr "Klarer ikke å lagre nytt passord."
-
 #. TRANS: Server error displayed when something does wrong with the user object during password reset.
-#: actions/recoverpassword.php:426 actions/register.php:256
+#: actions/recoverpassword.php:426 actions/register.php:241
 msgid "Error setting user."
 msgstr "Feil ved innstilling av bruker."
 
@@ -4912,97 +5015,101 @@ msgstr "Feil ved innstilling av bruker."
 msgid "New password successfully saved. You are now logged in."
 msgstr "Nytt passord ble lagret. Du er nå logget inn."
 
-#: actions/register.php:92 actions/register.php:196 actions/register.php:413
+#: actions/redirecturl.php:70
+#, fuzzy
+msgid "No id parameter"
+msgstr "Ingen vedlegg."
+
+#: actions/redirecturl.php:76
+#, fuzzy, php-format
+msgid "No such file \"%d\""
+msgstr "Ingen slik fil."
+
+#: actions/register.php:80 actions/register.php:181 actions/register.php:392
 msgid "Sorry, only invited people can register."
 msgstr "Beklager, kun inviterte personer kan registrere seg."
 
-#: actions/register.php:99
+#: actions/register.php:87
 msgid "Sorry, invalid invitation code."
 msgstr "Beklager, ugyldig invitasjonskode."
 
-#: actions/register.php:119
+#: actions/register.php:106
 msgid "Registration successful"
 msgstr "Registrering vellykket"
 
-#: actions/register.php:121 actions/register.php:511
+#: actions/register.php:108 actions/register.php:490
 msgid "Register"
 msgstr "Registrer"
 
-#: actions/register.php:142
+#: actions/register.php:128
 msgid "Registration not allowed."
 msgstr "Registrering ikke tillatt."
 
-#: actions/register.php:209
+#: actions/register.php:194
 #, fuzzy
-msgid "You can't register if you don't agree to the license."
+msgid "You cannot register if you don't agree to the license."
 msgstr "Du kan ikke registrere deg om du ikke godtar lisensvilkårene."
 
-#: actions/register.php:218
+#: actions/register.php:203
 msgid "Email address already exists."
 msgstr "E-postadressen finnes allerede."
 
-#: actions/register.php:251 actions/register.php:273
+#: actions/register.php:236 actions/register.php:258
 msgid "Invalid username or password."
 msgstr "Ugyldig brukernavn eller passord."
 
-#: actions/register.php:351
+#: actions/register.php:333
 #, fuzzy
 msgid ""
 "With this form you can create a new account. You can then post notices and "
-"link up to friends and colleagues. "
+"link up to friends and colleagues."
 msgstr ""
 "Med dette skjemaet kan du opprette en ny konto. Du kan så poste notiser og "
 "knytte deg til venner og kollegaer. "
 
-#: actions/register.php:437
-#, fuzzy
-msgid "6 or more characters."
-msgstr "6 eller flere tegn"
-
-#. TRANS: Link description in user account settings menu.
-#: actions/register.php:445 actions/register.php:449
-#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
+#: actions/register.php:424 actions/register.php:428
+#: actions/siteadminpanel.php:238 lib/settingsnav.php:92
 msgid "Email"
 msgstr "E-post"
 
-#: actions/register.php:446 actions/register.php:450
+#: actions/register.php:425 actions/register.php:429
 #, fuzzy
-msgid "Used only for updates, announcements, and password recovery"
+msgid "Used only for updates, announcements, and password recovery."
 msgstr "Kun brukt for oppdateringer, kunngjøringer og passordgjenoppretting"
 
-#: actions/register.php:457
+#: actions/register.php:436
 #, fuzzy
-msgid "Longer name, preferably your \"real\" name"
+msgid "Longer name, preferably your \"real\" name."
 msgstr "Lengre navn, helst ditt \"ekte\" navn"
 
-#: actions/register.php:462
+#: actions/register.php:464
 #, fuzzy
-msgid "URL of your homepage, blog, or profile on another site"
-msgstr "Adressen til din hjemmeside, blogg eller profil på et annet nettsted."
+msgid "Where you are, like \"City, State (or Region), Country\"."
+msgstr "Hvor du er, for eksempel «By, fylke (eller region), land»"
 
-#: actions/register.php:523
+#: actions/register.php:503
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
 msgstr ""
 
-#: actions/register.php:533
+#: actions/register.php:513
 #, php-format
 msgid "My text and files are copyright by %1$s."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:537
+#: actions/register.php:517
 msgid "My text and files remain under my own copyright."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:540
+#: actions/register.php:520
 msgid "All rights reserved."
 msgstr "Alle rettigheter reservert."
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:545
+#: actions/register.php:525
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -5011,7 +5118,7 @@ msgstr ""
 "Mine tekster og filer er tilgjengelig under %s med unntak av disse private "
 "dataene: passord, e-postadresse, direktemeldingsadresse og telefonnummer."
 
-#: actions/register.php:588
+#: actions/register.php:566
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -5044,7 +5151,7 @@ msgstr ""
 "\n"
 "Takk for at du registrerte deg og vi håper du kommer til å like tjenesten."
 
-#: actions/register.php:612
+#: actions/register.php:590
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5078,7 +5185,7 @@ msgstr "Brukerens kallenavn"
 
 #: actions/remotesubscribe.php:129
 #, fuzzy
-msgid "Nickname of the user you want to follow"
+msgid "Nickname of the user you want to follow."
 msgstr "Kallenavn på brukeren du vil følge"
 
 #: actions/remotesubscribe.php:132
@@ -5087,19 +5194,19 @@ msgstr "Profilnettadresse"
 
 #: actions/remotesubscribe.php:133
 #, fuzzy
-msgid "URL of your profile on another compatible microblogging service"
+msgid "URL of your profile on another compatible microblogging service."
 msgstr ""
 "Nettadresse til profilen din på en annen kompatibel mikrobloggingstjeneste"
 
 #. TRANS: Link text for link that will subscribe to a remote profile.
 #: actions/remotesubscribe.php:136 lib/subscribeform.php:139
-#: lib/userprofile.php:431
+#: lib/userprofile.php:402
 msgid "Subscribe"
 msgstr "Abonner"
 
 #: actions/remotesubscribe.php:158
 #, fuzzy
-msgid "Invalid profile URL (bad format)"
+msgid "Invalid profile URL (bad format)."
 msgstr "Ugyldig profilnettadresse (dårlig format)"
 
 #: actions/remotesubscribe.php:167
@@ -5135,7 +5242,7 @@ msgstr "Du kan ikke gjenta din egen notis."
 msgid "You already repeated that notice."
 msgstr "Du har allerede gjentatt den notisen."
 
-#: actions/repeat.php:112 lib/noticelist.php:692
+#: actions/repeat.php:112 lib/noticelist.php:697
 msgid "Repeated"
 msgstr "Gjentatt"
 
@@ -5143,9 +5250,9 @@ msgstr "Gjentatt"
 msgid "Repeated!"
 msgstr "Gjentatt!"
 
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing @-replies.
+#. TRANS: RSS reply feed title. %s is a user nickname.
 #: actions/replies.php:126 actions/repliesrss.php:68
-#: lib/personalgroupnav.php:109
+#: lib/personalgroupnav.php:105
 #, php-format
 msgid "Replies to %s"
 msgstr "Svar til %s"
@@ -5195,9 +5302,11 @@ msgstr ""
 "Vær den første til å [poste om dette emnet](%%%%action.newnotice%%%%?"
 "status_textarea=%s)!"
 
-#: actions/repliesrss.php:72
+#. TRANS: RSS reply feed description.
+#. TRANS: %1$s is a user nickname, %2$s is the StatusNet site name.
+#: actions/repliesrss.php:74
 #, fuzzy, php-format
-msgid "Replies to %1$s on %2$s!"
+msgid "Replies to %1$s on %2$s."
 msgstr "Svar til %1$s på %2$s!"
 
 #. TRANS: Client exception displayed when trying to restore an account while not logged in.
@@ -5297,7 +5406,7 @@ msgstr "Du kan ikke trekke tilbake brukerroller på dette nettstedet."
 msgid "User doesn't have this role."
 msgstr "Brukeren har ikke denne rollen."
 
-#: actions/rsd.php:146 actions/version.php:159
+#: actions/rsd.php:142 actions/version.php:159
 msgid "StatusNet"
 msgstr "StatusNet"
 
@@ -5339,88 +5448,38 @@ msgstr "Slå på feilsøkingsutdata for økter."
 msgid "Save site settings"
 msgstr "Lagre nettstedsinnstillinger"
 
-#: actions/showapplication.php:82
+#: actions/showapplication.php:78
 msgid "You must be logged in to view an application."
 msgstr "Du må være innlogget for å se et program."
 
-#: actions/showapplication.php:157
+#: actions/showapplication.php:151
 msgid "Application profile"
 msgstr "Programprofil"
 
-#. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:159 lib/applicationeditform.php:177
-msgid "Icon"
-msgstr "Ikon"
-
-#. TRANS: Form input field label for application name.
-#: actions/showapplication.php:169 actions/version.php:197
-#: lib/applicationeditform.php:190
-msgid "Name"
-msgstr "Navn"
-
-#. TRANS: Form input field label.
-#: actions/showapplication.php:178 lib/applicationeditform.php:227
-msgid "Organization"
-msgstr "Organisasjon"
-
-#. TRANS: Form input field label.
-#: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:168
-msgid "Description"
-msgstr "Beskrivelse"
-
-#. TRANS: Header for group statistics on a group page (h2).
-#. TRANS: H2 text for user statistics.
-#: actions/showapplication.php:192 actions/showgroup.php:460
-#: lib/profileaction.php:205
-msgid "Statistics"
-msgstr "Statistikk"
-
-#: actions/showapplication.php:203
+#: actions/showapplication.php:179
 #, php-format
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr "Opprettet av %1$s - %2$s standardtilgang - %3$d brukere"
 
-#: actions/showapplication.php:213
+#: actions/showapplication.php:189
 msgid "Application actions"
 msgstr "Programhandlinger"
 
-#: actions/showapplication.php:236
+#: actions/showapplication.php:212
 msgid "Reset key & secret"
 msgstr "Tilbakestill nøkkel & hemmelighet"
 
 #. TRANS: Title of form for deleting a user.
-#: actions/showapplication.php:252 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:64 lib/noticelist.php:673
+#: actions/showapplication.php:228 lib/deletegroupform.php:121
+#: lib/deleteuserform.php:64 lib/noticelist.php:678
 msgid "Delete"
 msgstr "Slett"
 
-#: actions/showapplication.php:261
+#: actions/showapplication.php:237
 msgid "Application info"
 msgstr "Programinformasjon"
 
-#: actions/showapplication.php:263
-msgid "Consumer key"
-msgstr "Forbrukernøkkel"
-
-#: actions/showapplication.php:268
-msgid "Consumer secret"
-msgstr "Forbrukerhemmelighet"
-
-#: actions/showapplication.php:273
-msgid "Request token URL"
-msgstr ""
-
-#: actions/showapplication.php:278
-msgid "Access token URL"
-msgstr ""
-
-#: actions/showapplication.php:283
-#, fuzzy
-msgid "Authorize URL"
-msgstr "Forfatter"
-
-#: actions/showapplication.php:288
+#: actions/showapplication.php:255
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
@@ -5428,7 +5487,7 @@ msgstr ""
 "Merk: Vi støtter HMAC-SHA1-signaturer. Vi støtter ikke metoden for "
 "klartekstsignatur."
 
-#: actions/showapplication.php:309
+#: actions/showapplication.php:275
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr ""
 "Er du sikker på at du vil tilbakestille din forbrukernøkkel og -hemmelighet?"
@@ -5515,61 +5574,47 @@ msgstr "%s gruppe"
 msgid "%1$s group, page %2$d"
 msgstr "%1$s gruppe, side %2$d"
 
-#. TRANS: Group profile header (h2). Text hidden by default.
-#: actions/showgroup.php:223
-msgid "Group profile"
-msgstr "Gruppeprofil"
-
-#. TRANS: Label for group URL (dt). Text hidden by default.
-#. TRANS: DT for URL in a profile.
-#: actions/showgroup.php:273 actions/tagother.php:118
-#: actions/userauthorization.php:175 lib/userprofile.php:186
-msgid "URL"
-msgstr "Nettadresse"
-
 #. TRANS: Label for group description or group note (dt). Text hidden by default.
-#. TRANS: DT for note in a profile.
-#: actions/showgroup.php:285 actions/tagother.php:128
-#: actions/userauthorization.php:187 lib/userprofile.php:204
+#: actions/showgroup.php:266
 msgid "Note"
 msgstr "Merk"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:296 lib/groupeditform.php:180
+#: actions/showgroup.php:277 lib/groupeditform.php:180
 msgid "Aliases"
 msgstr "Alias"
 
 #. TRANS: Group actions header (h2). Text hidden by default.
-#: actions/showgroup.php:313
+#: actions/showgroup.php:294
 msgid "Group actions"
 msgstr "Gruppehandlinger"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:357
+#: actions/showgroup.php:338
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
 msgstr "Notismating for %s gruppe (RSS 1.0)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:364
+#: actions/showgroup.php:345
 #, php-format
 msgid "Notice feed for %s group (RSS 2.0)"
 msgstr "Notismating for %s gruppe (RSS 2.0)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:371
+#: actions/showgroup.php:352
 #, php-format
 msgid "Notice feed for %s group (Atom)"
 msgstr "Notismating for %s gruppe (Atom)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:377
+#: actions/showgroup.php:358
 #, php-format
 msgid "FOAF for %s group"
 msgstr "FOAF for gruppen %s"
 
 #. TRANS: Header for mini list of group members on a group page (h2).
-#: actions/showgroup.php:414
+#: actions/showgroup.php:395
 msgid "Members"
 msgstr "Medlemmer"
 
@@ -5577,25 +5622,30 @@ msgstr "Medlemmer"
 #. TRANS: Text for user subscription statistics if the user has no subscriptions.
 #. TRANS: Text for user subscriber statistics if user has no subscribers.
 #. TRANS: Text for user user group membership statistics if user is not a member of any group.
-#: actions/showgroup.php:420 lib/profileaction.php:137
+#: actions/showgroup.php:401 lib/profileaction.php:137
 #: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
-#: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
+#: lib/subscriptionlist.php:123 lib/tagcloudsection.php:71
 msgid "(None)"
 msgstr "(Ingen)"
 
 #. TRANS: Link to all group members from mini list of group members if group has more than n members.
-#: actions/showgroup.php:429
+#: actions/showgroup.php:410
 msgid "All members"
 msgstr "Alle medlemmer"
 
-#. TRANS: Label for creation date in statistics on group page.
-#: actions/showgroup.php:465
+#. TRANS: Header for group statistics on a group page (h2).
+#. TRANS: H2 text for user statistics.
+#: actions/showgroup.php:441 lib/profileaction.php:205
+msgid "Statistics"
+msgstr "Statistikk"
+
+#: actions/showgroup.php:444
 msgctxt "LABEL"
 msgid "Created"
 msgstr "Opprettet"
 
 #. TRANS: Label for member count in statistics on group page.
-#: actions/showgroup.php:473
+#: actions/showgroup.php:449
 msgctxt "LABEL"
 msgid "Members"
 msgstr "Medlemmer"
@@ -5604,7 +5654,7 @@ msgstr "Medlemmer"
 #. TRANS: **%s** is the group alias, %%%%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).
-#: actions/showgroup.php:488
+#: actions/showgroup.php:464
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5623,7 +5673,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: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
-#: actions/showgroup.php:498
+#: actions/showgroup.php:474
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5637,7 +5687,7 @@ msgstr ""
 "korte meldinger om deres liv og interesser. "
 
 #. TRANS: Header for list of group administrators on a group page (h2).
-#: actions/showgroup.php:527
+#: actions/showgroup.php:503
 msgid "Admins"
 msgstr "Administratorer"
 
@@ -5676,7 +5726,7 @@ msgid "%1$s tagged %2$s"
 msgstr "%1$s, side %2$d"
 
 #. TRANS: Page title showing tagged notices in one user's stream.
-#. TRANS: %1$s is the username, %2$s is the hash tag, %1$d is the page number.
+#. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
 #: actions/showstream.php:74
 #, fuzzy, php-format
 msgid "%1$s tagged %2$s, page %3$d"
@@ -5723,13 +5773,13 @@ msgid "FOAF for %s"
 msgstr "FOAF for %s"
 
 #. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
-#: actions/showstream.php:211
+#: actions/showstream.php:205
 #, fuzzy, php-format
 msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr "Dette er tidslinjen for %1$s men %2$s har ikke postet noe ennå."
 
 #. TRANS: Second sentence of empty list message for a stream for the user themselves.
-#: actions/showstream.php:217
+#: actions/showstream.php:211
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
@@ -5739,7 +5789,7 @@ msgstr ""
 
 #. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:221
+#: actions/showstream.php:215
 #, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
@@ -5750,7 +5800,7 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:264
+#: actions/showstream.php:258
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5765,7 +5815,7 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:271
+#: actions/showstream.php:265
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5777,7 +5827,7 @@ msgstr ""
 "[StatusNet](http://status.net/). "
 
 #. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
-#: actions/showstream.php:328
+#: actions/showstream.php:322
 #, php-format
 msgid "Repeat of %s"
 msgstr "Repetisjon av %s"
@@ -5923,75 +5973,75 @@ msgstr ""
 #. TRANS: Title for button to save site notice in admin panel.
 #: actions/sitenoticeadminpanel.php:201
 #, fuzzy
-msgid "Save site notice"
+msgid "Save site notice."
 msgstr "Lagre nettstedsnotis"
 
 #. TRANS: Title for SMS settings.
-#: actions/smssettings.php:57
+#: actions/smssettings.php:56
 msgid "SMS settings"
 msgstr "SMS-innstillinger"
 
 #. TRANS: SMS settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/smssettings.php:71
+#: actions/smssettings.php:70
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr "Du kan motta SMS-meldinger gjennom e-post fra %%site.name%%."
 
 #. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
-#: actions/smssettings.php:93
+#: actions/smssettings.php:92
 msgid "SMS is not available."
 msgstr "SMS er ikke tilgjengelig."
 
 #. TRANS: Form legend for SMS settings form.
-#: actions/smssettings.php:107
+#: actions/smssettings.php:106
 msgid "SMS address"
 msgstr "SMS-adresse"
 
 #. TRANS: Form guide in SMS settings form.
-#: actions/smssettings.php:116
+#: actions/smssettings.php:115
 msgid "Current confirmed SMS-enabled phone number."
 msgstr "Nåværende bekreftede telefonnummer med mulighet for å motta SMS."
 
 #. TRANS: Form guide in IM settings form.
-#: actions/smssettings.php:129
+#: actions/smssettings.php:128
 msgid "Awaiting confirmation on this phone number."
 msgstr "Venter på bekreftelse for dette telefonnummeret."
 
 #. TRANS: Field label for SMS address input in SMS settings form.
-#: actions/smssettings.php:138
+#: actions/smssettings.php:137
 msgid "Confirmation code"
 msgstr "Bekreftelseskode"
 
 #. TRANS: Form field instructions in SMS settings form.
-#: actions/smssettings.php:140
+#: actions/smssettings.php:139
 msgid "Enter the code you received on your phone."
 msgstr "Skriv inn koden du mottok på telefonen din."
 
 #. TRANS: Button label to confirm SMS confirmation code in SMS settings.
-#: actions/smssettings.php:144
+#: actions/smssettings.php:143
 msgctxt "BUTTON"
 msgid "Confirm"
 msgstr "Bekreft"
 
 #. TRANS: Field label for SMS phone number input in SMS settings form.
-#: actions/smssettings.php:149
+#: actions/smssettings.php:148
 msgid "SMS phone number"
 msgstr "Telefonnummer for SMS"
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
-#: actions/smssettings.php:152
+#: actions/smssettings.php:151
 #, fuzzy
-msgid "Phone number, no punctuation or spaces, with area code"
+msgid "Phone number, no punctuation or spaces, with area code."
 msgstr "Telefonnummer, ingen tegnsetting eller mellomrom, med retningsnummer"
 
 #. TRANS: Form legend for SMS preferences form.
-#: actions/smssettings.php:191
+#: actions/smssettings.php:190
 msgid "SMS preferences"
 msgstr "SMS-innstillinger"
 
 #. TRANS: Checkbox label in SMS preferences form.
-#: actions/smssettings.php:197
+#: actions/smssettings.php:196
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
@@ -6000,32 +6050,32 @@ msgstr ""
 "min teleoperatør."
 
 #. TRANS: Confirmation message for successful SMS preferences save.
-#: actions/smssettings.php:308
+#: actions/smssettings.php:307
 msgid "SMS preferences saved."
 msgstr "SMS-innstillinger lagret."
 
 #. TRANS: Message given saving SMS phone number without having provided one.
-#: actions/smssettings.php:330
+#: actions/smssettings.php:329
 msgid "No phone number."
 msgstr "Ingen telefonnummer."
 
 #. TRANS: Message given saving SMS phone number without having selected a carrier.
-#: actions/smssettings.php:336
+#: actions/smssettings.php:335
 msgid "No carrier selected."
 msgstr "Ingen operatør valgt."
 
 #. TRANS: Message given saving SMS phone number that is already set.
-#: actions/smssettings.php:344
+#: actions/smssettings.php:343
 msgid "That is already your phone number."
 msgstr "Det er allerede din ditt telefonnummer."
 
 #. TRANS: Message given saving SMS phone number that is already set for another user.
-#: actions/smssettings.php:348
+#: actions/smssettings.php:347
 msgid "That phone number already belongs to another user."
 msgstr "Telefonnummeret tilhører allerede en annen bruker."
 
 #. TRANS: Message given saving valid SMS phone number that is to be confirmed.
-#: actions/smssettings.php:376
+#: actions/smssettings.php:375
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
 "for the code and instructions on how to use it."
@@ -6034,39 +6084,39 @@ msgstr ""
 "din for koden og hvordan du skal bruke den."
 
 #. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
-#: actions/smssettings.php:404
+#: actions/smssettings.php:403
 msgid "That is the wrong confirmation number."
 msgstr "Dette er feil bekreftelsesnummer."
 
 #. TRANS: Message given after successfully canceling SMS phone number confirmation.
-#: actions/smssettings.php:418
+#: actions/smssettings.php:417
 msgid "SMS confirmation cancelled."
 msgstr "SMS-bekreftelse avbrutt."
 
 #. TRANS: Message given trying to remove an SMS phone number that is not
 #. TRANS: registered for the active user.
-#: actions/smssettings.php:438
+#: actions/smssettings.php:437
 msgid "That is not your phone number."
 msgstr "Det er ikke ditt telefonnummer."
 
 #. TRANS: Message given after successfully removing a registered SMS phone number.
-#: actions/smssettings.php:460
+#: actions/smssettings.php:459
 msgid "The SMS phone number was removed."
 msgstr "Telefonnummeret for SMS ble fjernet."
 
 #. TRANS: Label for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:499
+#: actions/smssettings.php:498
 msgid "Mobile carrier"
 msgstr "Mobiloperatør"
 
 #. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:504
+#: actions/smssettings.php:503
 msgid "Select a carrier"
 msgstr "Velg en operatør"
 
 #. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
 #. TRANS: %s is an administrative contact's e-mail address.
-#: actions/smssettings.php:513
+#: actions/smssettings.php:512
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -6077,7 +6127,7 @@ msgstr ""
 "fortell oss."
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
-#: actions/smssettings.php:535
+#: actions/smssettings.php:534
 #, fuzzy
 msgid "No code entered."
 msgstr "Ingen kode skrevet inn"
@@ -6156,15 +6206,13 @@ msgstr "Ikke autorisert."
 msgid "Could not save subscription."
 msgstr "Kunne ikke lagre merkelapper."
 
-#: actions/subscribe.php:77
-msgid "This action only accepts POST requests."
-msgstr ""
-
-#: actions/subscribe.php:117
+#. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
+#: actions/subscribe.php:121
 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
 msgstr ""
 
-#: actions/subscribe.php:145
+#. TRANS: Page title when subscription succeeded.
+#: actions/subscribe.php:149
 #, fuzzy
 msgid "Subscribed"
 msgstr "Abonner"
@@ -6274,31 +6322,33 @@ msgid "Subscription feed for %s (Atom)"
 msgstr "Notismating for %s (Atom)"
 
 #. TRANS: Checkbox label for enabling Jabber messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:239
-msgid "Jabber"
-msgstr "Jabber"
+#: actions/subscriptions.php:241 lib/settingsnav.php:110
+msgid "IM"
+msgstr ""
 
 #. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:254
+#: actions/subscriptions.php:256 lib/settingsnav.php:117
 msgid "SMS"
 msgstr "SMS"
 
-#: actions/tag.php:69
+#. TRANS: Title for all but the first page of notices with tags.
+#. TRANS: %1$s is the tag, %2$d is the page number.
+#: actions/tag.php:73
 #, php-format
 msgid "Notices tagged with %1$s, page %2$d"
 msgstr "Brukere som har merket seg selv med %1$s - side %2$d"
 
-#: actions/tag.php:87
+#: actions/tag.php:91
 #, php-format
 msgid "Notice feed for tag %s (RSS 1.0)"
 msgstr "Notismating for merkelapp %s (RSS 1.0)"
 
-#: actions/tag.php:93
+#: actions/tag.php:97
 #, php-format
 msgid "Notice feed for tag %s (RSS 2.0)"
 msgstr "Notismating for merkelapp %s (RSS 2.0)"
 
-#: actions/tag.php:99
+#: actions/tag.php:103
 #, php-format
 msgid "Notice feed for tag %s (Atom)"
 msgstr "Notismating for merkelapp %s (Atom)"
@@ -6318,17 +6368,11 @@ msgstr "Merk %s"
 msgid "User profile"
 msgstr "Brukerprofil"
 
-#. TRANS: DT element in area for user avatar.
-#: actions/tagother.php:81 actions/userauthorization.php:132
-#: lib/userprofile.php:108
-msgid "Photo"
-msgstr "Foto"
-
-#: actions/tagother.php:141
+#: actions/tagother.php:120
 msgid "Tag user"
 msgstr "Merk bruker"
 
-#: actions/tagother.php:151
+#: actions/tagother.php:130
 #, fuzzy
 msgid ""
 "Tags for this user (letters, numbers, -, ., and _), comma- or space- "
@@ -6337,12 +6381,17 @@ msgstr ""
 "Merkelapper for degselv (bokstaver, nummer, -, ., og _), adskilt med komma "
 "eller mellomrom"
 
-#: actions/tagother.php:193
+#: actions/tagother.php:157
+#, php-format
+msgid "Invalid tag: \"%s\""
+msgstr "Ugyldig merkelapp: «%s»"
+
+#: actions/tagother.php:172
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 
-#: actions/tagother.php:236
+#: actions/tagother.php:215
 #, fuzzy
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr "Bruk dette skjemaet for å redigere programmet ditt."
@@ -6352,6 +6401,7 @@ msgstr "Bruk dette skjemaet for å redigere programmet ditt."
 msgid "No such tag."
 msgstr "Ingen slik side."
 
+#. TRANS: Client error displayed when trying to unblock a non-blocked user.
 #: actions/unblock.php:59
 msgid "You haven't blocked that user."
 msgstr "Du har ikke blokkert den brukeren."
@@ -6376,12 +6426,83 @@ msgstr "Ingen profil med den ID'en."
 msgid "Unsubscribed"
 msgstr "Abonner"
 
-#: actions/updateprofile.php:64 actions/userauthorization.php:337
+#: actions/updateprofile.php:64
 #, fuzzy, php-format
 msgid ""
 "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
 msgstr "Notislisensen ‘%1$s’ er ikke kompatibel med nettstedslisensen ‘%2$s’."
 
+#: actions/urlsettings.php:60
+#, fuzzy
+msgid "URL settings"
+msgstr "Innstillinger for direktemeldinger"
+
+#. TRANS: Instructions for tab "Other" in user profile settings.
+#: actions/urlsettings.php:72
+msgid "Manage various other options."
+msgstr "Håndter diverse andre alternativ."
+
+#. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
+#. TRANS: user's profile settings. This message has one space at the beginning. Use your
+#. TRANS: language's word separator here if it has one (most likely a single space).
+#: actions/urlsettings.php:115
+msgid " (free service)"
+msgstr " (fri tjeneste)"
+
+#: actions/urlsettings.php:121
+#, fuzzy
+msgid "[none]"
+msgstr "Ingen"
+
+#: actions/urlsettings.php:122
+msgid "[internal]"
+msgstr ""
+
+#. TRANS: Label for dropdown with URL shortener services.
+#: actions/urlsettings.php:130
+msgid "Shorten URLs with"
+msgstr "Forkort nettadresser med"
+
+#. TRANS: Tooltip for for dropdown with URL shortener services.
+#: actions/urlsettings.php:132
+msgid "Automatic shortening service to use."
+msgstr "Automatisk fortkortelsestjeneste å bruke."
+
+#: actions/urlsettings.php:138
+msgid "URL longer than"
+msgstr ""
+
+#: actions/urlsettings.php:141
+msgid "URLs longer than this will be shortened, 0 means always shorten."
+msgstr ""
+
+#: actions/urlsettings.php:145
+msgid "Text longer than"
+msgstr ""
+
+#: actions/urlsettings.php:148
+msgid ""
+"URLs in notices longer than this will be shortened, 0 means always shorten."
+msgstr ""
+
+#. TRANS: Form validation error for form "Other settings" in user profile.
+#: actions/urlsettings.php:180
+msgid "URL shortening service is too long (maximum 50 characters)."
+msgstr "Adresseforkortelsestjenesten er for lang (maks 50 tegn)."
+
+#: actions/urlsettings.php:187
+msgid "Invalid number for max url length."
+msgstr ""
+
+#: actions/urlsettings.php:193
+#, fuzzy
+msgid "Invalid number for max notice length."
+msgstr "Ugyldig notisinnhold."
+
+#: actions/urlsettings.php:238
+msgid "Error saving user URL shortening preferences."
+msgstr ""
+
 #. TRANS: User admin panel title
 #: actions/useradminpanel.php:58
 msgctxt "TITLE"
@@ -6408,11 +6529,11 @@ msgstr "Ugyldig velkomsttekst. Maks lengde er 255 tegn."
 #. TRANS: users in user admin panel. %1$s is the invalid nickname.
 #: actions/useradminpanel.php:166
 #, fuzzy, php-format
-msgid "Invalid default subscripton: '%1$s' is not a user."
+msgid "Invalid default subscripton: \"%1$s\" is not a user."
 msgstr "Ugyldig standardabonnement: '%1$s' er ikke bruker."
 
-#. TRANS: Link description in user account settings menu.
-#: actions/useradminpanel.php:215 lib/accountsettingsaction.php:106
+#: actions/useradminpanel.php:215 lib/action.php:565 lib/settingsnav.php:77
+#: lib/subgroupnav.php:81
 msgid "Profile"
 msgstr "Profil"
 
@@ -6470,116 +6591,144 @@ msgstr "Hvorvidt brukere tillates å invitere nye brukere."
 #. TRANS: Title for button to save user settings in user admin panel.
 #: actions/useradminpanel.php:302
 #, fuzzy
-msgid "Save user settings"
+msgid "Save user settings."
 msgstr "Lagre nettstedsinnstillinger"
 
-#: actions/userauthorization.php:105
+#. TRANS: Page title.
+#: actions/userauthorization.php:109
 msgid "Authorize subscription"
 msgstr "Autoriser abonnementet"
 
-#: actions/userauthorization.php:110
+#. TRANS: Page notice on "Auhtorize subscription" page.
+#: actions/userauthorization.php:115
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
 "user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
-"click “Reject”."
+"click \"Reject\"."
 msgstr ""
 
-#. TRANS: Menu item for site administration
-#: actions/userauthorization.php:196 actions/version.php:167
-#: lib/adminpanelaction.php:403
-msgid "License"
-msgstr "Lisens"
-
-#: actions/userauthorization.php:217
+#. TRANS: Button text on Authorise Subscription page.
+#: actions/userauthorization.php:200
 #, fuzzy
+msgctxt "BUTTON"
 msgid "Accept"
 msgstr "Godta"
 
-#: actions/userauthorization.php:218 lib/subscribeform.php:115
-#: lib/subscribeform.php:139
-msgid "Subscribe to this user"
+#. TRANS: Title for button on Authorise Subscription page.
+#: actions/userauthorization.php:202
+#, fuzzy
+msgid "Subscribe to this user."
 msgstr "Abonner på denne brukeren"
 
-#: actions/userauthorization.php:219
+#. TRANS: Button text on Authorise Subscription page.
+#: actions/userauthorization.php:204
 #, fuzzy
+msgctxt "BUTTON"
 msgid "Reject"
 msgstr "Avvis"
 
-#: actions/userauthorization.php:220
+#. TRANS: Title for button on Authorise Subscription page.
+#: actions/userauthorization.php:206
 #, fuzzy
-msgid "Reject this subscription"
+msgid "Reject this subscription."
 msgstr "Avvis dette abonnementet"
 
-#: actions/userauthorization.php:232
+#. TRANS: Client error displayed for an empty authorisation request.
+#: actions/userauthorization.php:219
 msgid "No authorization request!"
 msgstr ""
 
-#: actions/userauthorization.php:254
+#. TRANS: Accept message header from Authorise subscription page.
+#: actions/userauthorization.php:242
 #, fuzzy
 msgid "Subscription authorized"
 msgstr "Abonnement"
 
-#: actions/userauthorization.php:256
+#: actions/userauthorization.php:245
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to authorize the "
 "subscription. Your subscription token is:"
 msgstr ""
 
-#: actions/userauthorization.php:266
+#. TRANS: Reject message header from Authorise subscription page.
+#: actions/userauthorization.php:256
 #, fuzzy
 msgid "Subscription rejected"
 msgstr "Abonnement"
 
-#: actions/userauthorization.php:268
+#: actions/userauthorization.php:259
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to fully reject the "
 "subscription."
 msgstr ""
 
-#: actions/userauthorization.php:303
+#. TRANS: Exception thrown when no valid user is found for an authorisation request.
+#. TRANS: %s is a listener URI.
+#: actions/userauthorization.php:296
 #, php-format
-msgid "Listener URI ‘%s’ not found here."
+msgid "Listener URI \"%s\" not found here."
 msgstr ""
 
-#: actions/userauthorization.php:308
+#. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
+#. TRANS: %s is a listenee URI.
+#: actions/userauthorization.php:303
 #, fuzzy, php-format
-msgid "Listenee URI ‘%s’ is too long."
+msgid "Listenee URI \"%s\" is too long."
 msgstr "Kilde-URL er for lang."
 
-#: actions/userauthorization.php:314
+#. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
+#. TRANS: %s is a listenee URI.
+#: actions/userauthorization.php:311
 #, fuzzy, php-format
-msgid "Listenee URI ‘%s’ is a local user."
+msgid "Listenee URI \"%s\" is a local user."
 msgstr "Profil-URL ‘%s’ er for en lokal bruker."
 
+#. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
+#. TRANS: %s is a profile URL.
 #: actions/userauthorization.php:329
 #, fuzzy, php-format
-msgid "Profile URL ‘%s’ is for a local user."
+msgid "Profile URL \"%s\" is for a local user."
 msgstr "Profil-URL ‘%s’ er for en lokal bruker."
 
-#: actions/userauthorization.php:345
+#. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
+#. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
+#: actions/userauthorization.php:339
 #, fuzzy, php-format
-msgid "Avatar URL ‘%s’ is not valid."
+msgid ""
+"Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
+"\"."
+msgstr "Notislisensen ‘%1$s’ er ikke kompatibel med nettstedslisensen ‘%2$s’."
+
+#. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
+#. TRANS: %s is an avatar URL.
+#: actions/userauthorization.php:349
+#, fuzzy, php-format
+msgid "Avatar URL \"%s\" is not valid."
 msgstr "Avatar-URL ‘%s’ er ikke gyldig."
 
-#: actions/userauthorization.php:350
+#. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
+#. TRANS: %s is an avatar URL.
+#: actions/userauthorization.php:356
 #, fuzzy, php-format
-msgid "Can’t read avatar URL ‘%s’."
+msgid "Cannot read avatar URL \"%s\"."
 msgstr "Kan ikke lese avatar-URL ‘%s’"
 
-#: actions/userauthorization.php:355
+#. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
+#. TRANS: %s is an avatar URL.
+#: actions/userauthorization.php:363
 #, fuzzy, php-format
-msgid "Wrong image type for avatar URL ‘%s’."
+msgid "Wrong image type for avatar URL \"%s\"."
 msgstr "Feil bildetype for avatar-URL ‘%s’."
 
 #. TRANS: Page title for profile design page.
-#: actions/userdesignsettings.php:74 lib/designsettings.php:63
+#: actions/userdesignsettings.php:74 lib/designsettings.php:61
 msgid "Profile design"
 msgstr "Vis profilutseender"
 
 #. TRANS: Instructions for profile design page.
-#: actions/userdesignsettings.php:84 lib/designsettings.php:74
+#: actions/userdesignsettings.php:84 lib/designsettings.php:72
 #, fuzzy
 msgid ""
 "Customize the way your profile looks with a background image and a colour "
@@ -6588,10 +6737,28 @@ msgstr ""
 "Tilpass hvordan gruppen din ser ut med et bakgrunnsbilde og en fargepalett "
 "av ditt valg."
 
-#: actions/userdesignsettings.php:272
+#: actions/userdesignsettings.php:289
 msgid "Enjoy your hotdog!"
 msgstr "Bon appétit."
 
+#: actions/userdesignsettings.php:325
+#, fuzzy
+msgid "Design settings"
+msgstr "Lagre nettstedsinnstillinger"
+
+#: actions/userdesignsettings.php:340
+msgid "View profile designs"
+msgstr "Vis profilutseender"
+
+#: actions/userdesignsettings.php:341
+msgid "Show or hide profile designs."
+msgstr "Vis eller skjul profilutseender."
+
+#: actions/userdesignsettings.php:348
+#, fuzzy
+msgid "Background file"
+msgstr "Bakgrunn"
+
 #. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number.
 #: actions/usergroups.php:66
 #, php-format
@@ -6641,6 +6808,11 @@ msgstr ""
 msgid "Contributors"
 msgstr "Bidragsytere"
 
+#. TRANS: Menu item for site administration
+#: actions/version.php:167 lib/adminpanelaction.php:403
+msgid "License"
+msgstr "Lisens"
+
 #: actions/version.php:170
 msgid ""
 "StatusNet is free software: you can redistribute it and/or modify it under "
@@ -6664,12 +6836,13 @@ msgid ""
 "along with this program.  If not, see %s."
 msgstr ""
 
-#: actions/version.php:191
-msgid "Plugins"
-msgstr "Programtillegg"
+#. TRANS: Form input field label for application name.
+#: actions/version.php:197 lib/applicationeditform.php:190
+msgid "Name"
+msgstr "Navn"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:901
+#: actions/version.php:198 lib/action.php:885
 msgid "Version"
 msgstr "Versjon"
 
@@ -6677,6 +6850,12 @@ msgstr "Versjon"
 msgid "Author(s)"
 msgstr "Forfatter(e)"
 
+#. TRANS: Form input field label.
+#: actions/version.php:200 lib/applicationeditform.php:208
+#: lib/groupeditform.php:168
+msgid "Description"
+msgstr "Beskrivelse"
+
 #. TRANS: Activity title when marking a notice as favorite.
 #: classes/Fave.php:164
 #, fuzzy
@@ -6792,7 +6971,7 @@ msgid "Could not create login token for %s"
 msgstr "Kunne ikke opprette alias."
 
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
-#: classes/Memcached_DataObject.php:542
+#: classes/Memcached_DataObject.php:556
 msgid "No database name or DSN found anywhere."
 msgstr ""
 
@@ -6968,18 +7147,18 @@ msgstr "%1$s lytter nå til dine notiser på %2$s."
 
 #. TRANS: Notice given on user registration.
 #. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:395
+#: classes/User.php:390
 #, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr "Velkommen til %1$s, @%2$s."
 
 #. TRANS: Server exception.
-#: classes/User.php:918
+#: classes/User.php:923
 msgid "No single user defined for single-user mode."
 msgstr ""
 
 #. TRANS: Server exception.
-#: classes/User.php:922
+#: classes/User.php:927
 msgid "Single-user mode code called when not enabled."
 msgstr ""
 
@@ -7024,41 +7203,6 @@ msgstr ""
 msgid "No AtomPub API service for %s."
 msgstr ""
 
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:104
-msgid "Change your profile settings"
-msgstr "Endre profilinnstillingene dine"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:111
-msgid "Upload an avatar"
-msgstr "Last opp en avatar"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:118
-msgid "Change your password"
-msgstr "Endre passordet ditt"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:125
-msgid "Change email handling"
-msgstr "Endre eposthåndtering"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:132
-msgid "Design your profile"
-msgstr "Brukerprofil"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:139
-msgid "Other options"
-msgstr "Andre valg"
-
-#. TRANS: Link description in user account settings menu.
-#: lib/accountsettingsaction.php:141
-msgid "Other"
-msgstr "Andre"
-
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
 #: lib/action.php:161
 #, php-format
@@ -7076,209 +7220,130 @@ msgctxt "TOOLTIP"
 msgid "Show more"
 msgstr ""
 
-#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:544
+#. TRANS: Inline reply form submit button: submits a reply comment.
+#: lib/action.php:328
 #, fuzzy
-msgid "Primary site navigation"
-msgstr "Endre nettstedskonfigurasjon"
+msgctxt "BUTTON"
+msgid "Comment"
+msgstr "Innhold"
 
-#. TRANS: Tooltip for main menu option "Personal".
-#: lib/action.php:550
-msgctxt "TOOLTIP"
-msgid "Personal profile and friends timeline"
+#. TRANS: Placeholder text for inline reply form. Clicking in this box will turn it into a mini notice form.
+#: lib/action.php:331
+msgid "Add a comment..."
 msgstr ""
 
-#. TRANS: Main menu option when logged in for access to personal profile and friends timeline.
-#. TRANS: Personal group navigation menu option when logged in for viewing timeline of self and friends.
-#: lib/action.php:553 lib/personalgroupnav.php:100
-msgctxt "MENU"
-msgid "Personal"
-msgstr "Personlig"
+#: lib/action.php:559 lib/personalgroupnav.php:99
+#, fuzzy
+msgid "Home"
+msgstr "Hjemmesiden"
 
-#. TRANS: Tooltip for main menu option "Account".
-#: lib/action.php:555
-msgctxt "TOOLTIP"
-msgid "Change your email, avatar, password, profile"
-msgstr "Endre e-posten, avateren, passordet og profilen din"
-
-#. TRANS: Main menu option when logged in for access to user settings.
-#: lib/action.php:558
-msgid "Account"
-msgstr "Konto"
-
-#. TRANS: Tooltip for main menu option "Services".
 #: lib/action.php:560
-msgctxt "TOOLTIP"
-msgid "Connect to services"
-msgstr "Koble til tjenester"
+#, fuzzy
+msgid "Friends timeline"
+msgstr "%s tidslinje"
 
-#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services.
-#: lib/action.php:563
-msgid "Connect"
-msgstr "Koble til"
-
-#. TRANS: Tooltip for menu option "Admin".
 #: lib/action.php:566
-msgctxt "TOOLTIP"
-msgid "Change site configuration"
-msgstr "Endre nettstedskonfigurasjon"
+#, fuzzy
+msgid "Your profile"
+msgstr "Gruppeprofil"
 
-#. TRANS: Main menu option when logged in and site admin for access to site configuration.
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/action.php:569 lib/groupnav.php:117
-msgctxt "MENU"
-msgid "Admin"
-msgstr "Administrator"
+#: lib/action.php:570 lib/action.php:593 lib/publicgroupnav.php:78
+msgid "Public"
+msgstr "Offentlig"
 
-#. TRANS: Tooltip for main menu option "Invite".
-#: lib/action.php:573
-#, php-format
-msgctxt "TOOLTIP"
-msgid "Invite friends and colleagues to join you on %s"
-msgstr "Inviter venner og kollegaer til å bli med deg på %s"
+#: lib/action.php:571 lib/action.php:594
+#, fuzzy
+msgid "Everyone on this site"
+msgstr "Finn personer på dette nettstedet"
+
+#: lib/action.php:575
+#, fuzzy
+msgid "Settings"
+msgstr "SMS-innstillinger"
 
-#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users.
 #: lib/action.php:576
-msgctxt "MENU"
-msgid "Invite"
-msgstr "Inviter"
+#, fuzzy
+msgid "Change your personal settings"
+msgstr "Endre profilinnstillingene dine"
 
-#. TRANS: Tooltip for main menu option "Logout"
 #: lib/action.php:582
-msgctxt "TOOLTIP"
-msgid "Logout from the site"
-msgstr "Logg ut fra nettstedet"
+#, fuzzy
+msgid "Site configuration"
+msgstr "Brukerkonfigurasjon"
 
-#. TRANS: Main menu option when logged in to log out the current user.
-#: lib/action.php:585
-msgctxt "MENU"
+#: lib/action.php:587
+#, fuzzy
 msgid "Logout"
 msgstr "Logg ut"
 
-#. TRANS: Tooltip for main menu option "Register".
-#: lib/action.php:590
-msgctxt "TOOLTIP"
-msgid "Create an account"
-msgstr "Opprett en konto"
+#: lib/action.php:588
+#, fuzzy
+msgid "Logout from the site"
+msgstr "Logg ut fra nettstedet"
 
-#. TRANS: Main menu option when not logged in to register a new account.
-#. TRANS: Menu item for registering with the StatusNet site.
-#: lib/action.php:593 lib/logingroupnav.php:85
-msgctxt "MENU"
-msgid "Register"
-msgstr "Registrer"
-
-#. TRANS: Tooltip for main menu option "Login".
-#: lib/action.php:596
-msgctxt "TOOLTIP"
+#: lib/action.php:599
+#, fuzzy
 msgid "Login to the site"
 msgstr "Log inn på nettstedet"
 
-#. TRANS: Main menu option when not logged in to log in.
-#. TRANS: Menu item for logging in to the StatusNet site.
-#: lib/action.php:599 lib/logingroupnav.php:77
-msgctxt "MENU"
-msgid "Login"
-msgstr "Logg inn"
-
-#. TRANS: Tooltip for main menu option "Help".
-#: lib/action.php:602
-msgctxt "TOOLTIP"
-msgid "Help me!"
-msgstr "Hjelp meg."
-
-#. TRANS: Main menu option for help on the StatusNet site.
-#: lib/action.php:605
-msgctxt "MENU"
-msgid "Help"
-msgstr "Hjelp"
-
-#. TRANS: Tooltip for main menu option "Search".
-#: lib/action.php:608
-msgctxt "TOOLTIP"
-msgid "Search for people or text"
-msgstr "Søk etter personer eller tekst"
-
-#. TRANS: Main menu option when logged in or when the StatusNet instance is not private.
-#: lib/action.php:611
-msgctxt "MENU"
+#: lib/action.php:606
+#, fuzzy
 msgid "Search"
 msgstr "Søk"
 
-#. TRANS: DT element for site notice. String is hidden in default CSS.
-#. TRANS: Menu item for site administration
-#: lib/action.php:633 lib/adminpanelaction.php:387
-msgid "Site notice"
-msgstr "Nettstedsnotis"
-
-#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:700
-msgid "Local views"
-msgstr "Lokale visninger"
-
-#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:770
-msgid "Page notice"
-msgstr "Sidenotis"
-
-#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:874
-msgid "Secondary site navigation"
-msgstr ""
+#: lib/action.php:607
+#, fuzzy
+msgid "Search the site"
+msgstr "Søk nettsted"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:880
+#: lib/action.php:864
 msgid "Help"
 msgstr "Hjelp"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:883
+#: lib/action.php:867
 msgid "About"
 msgstr "Om"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:886
+#: lib/action.php:870
 msgid "FAQ"
 msgstr "OSS/FAQ"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:891
+#: lib/action.php:875
 msgid "TOS"
 msgstr ""
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:895
+#: lib/action.php:879
 #, fuzzy
 msgid "Privacy"
 msgstr "Privat"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:898
+#: lib/action.php:882
 msgid "Source"
 msgstr "Kilde"
 
 #. TRANS: Secondary navigation menu option leading to e-mail contact information on the
 #. TRANS: StatusNet site, where to report bugs, ...
-#: lib/action.php:905
+#: lib/action.php:889
 msgid "Contact"
 msgstr "Kontakt"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:908
+#: lib/action.php:892
 #, fuzzy
 msgid "Badge"
 msgstr "Knuff"
 
-#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:937
-msgid "StatusNet software license"
-msgstr "Programvarelisens for StatusNet"
-
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:944
+#: lib/action.php:921
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7288,7 +7353,7 @@ msgstr ""
 "broughtby%%](%%site.broughtbyurl%%)."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:947
+#: lib/action.php:924
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** er en mikrobloggingtjeneste."
@@ -7297,7 +7362,7 @@ msgstr "**%%site.name%%** er en mikrobloggingtjeneste."
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:954
+#: lib/action.php:931
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7305,53 +7370,41 @@ msgid ""
 "org/licensing/licenses/agpl-3.0.html)."
 msgstr ""
 
-#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:970
-#, fuzzy
-msgid "Site content license"
-msgstr "Programvarelisens for StatusNet"
-
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:977
+#: lib/action.php:949
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:984
+#: lib/action.php:956
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:988
+#: lib/action.php:960
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:1020
+#: lib/action.php:992
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
 
-#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1356
-#, fuzzy
-msgid "Pagination"
-msgstr "Registrering"
-
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1367
+#: lib/action.php:1335
 msgid "After"
 msgstr "Etter"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1377
+#: lib/action.php:1345
 msgid "Before"
 msgstr "Før"
 
@@ -7509,7 +7562,7 @@ msgid "User configuration"
 msgstr "Brukerkonfigurasjon"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:122
+#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:110
 msgid "User"
 msgstr "Bruker"
 
@@ -7534,6 +7587,11 @@ msgstr "Tilgangskonfigurasjon"
 msgid "Edit site notice"
 msgstr "Rediger nettstedsnotis"
 
+#. TRANS: Menu item for site administration
+#: lib/adminpanelaction.php:387
+msgid "Site notice"
+msgstr "Nettstedsnotis"
+
 #. TRANS: Menu item title/tooltip
 #: lib/adminpanelaction.php:393
 #, fuzzy
@@ -7545,6 +7603,12 @@ msgstr "Stikonfigurasjon"
 msgid "Set site license"
 msgstr ""
 
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:409
+#, fuzzy
+msgid "Plugins configuration"
+msgstr "Stikonfigurasjon"
+
 #. TRANS: Client error 401.
 #: lib/apiauth.php:111
 msgid "API resource requires read-write access, but you only have read access."
@@ -7555,19 +7619,23 @@ msgstr ""
 msgid "No application for that consumer key."
 msgstr ""
 
+#: lib/apiauth.php:202 lib/apiauth.php:284
+msgid "Not allowed to use API."
+msgstr ""
+
 #. TRANS: OAuth exception given when an incorrect access token was given for a user.
-#: lib/apiauth.php:219
+#: lib/apiauth.php:225
 msgid "Bad access token."
 msgstr ""
 
 #. TRANS: OAuth exception given when no user was found for a given token (no token was found).
-#: lib/apiauth.php:224
+#: lib/apiauth.php:230
 msgid "No user for that token."
 msgstr ""
 
 #. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel".
 #. TRANS: Client error thrown when authentication fails.
-#: lib/apiauth.php:266 lib/apiauth.php:293
+#: lib/apiauth.php:272 lib/apiauth.php:302
 msgid "Could not authenticate you."
 msgstr ""
 
@@ -7614,6 +7682,11 @@ msgstr ""
 msgid "Failed to delete revoked token."
 msgstr ""
 
+#. TRANS: Form input field label for application icon.
+#: lib/applicationeditform.php:177
+msgid "Icon"
+msgstr "Ikon"
+
 #. TRANS: Form guide.
 #: lib/applicationeditform.php:182
 msgid "Icon for this application"
@@ -7649,6 +7722,11 @@ msgstr "Nettadresse til kilde"
 msgid "Organization responsible for this application"
 msgstr "Ikon for dette programmet"
 
+#. TRANS: Form input field label.
+#: lib/applicationeditform.php:227
+msgid "Organization"
+msgstr "Organisasjon"
+
 #. TRANS: Form input field instructions.
 #: lib/applicationeditform.php:234
 msgid "URL for the homepage of the organization"
@@ -7739,16 +7817,6 @@ msgstr ""
 msgid "Do not use this method!"
 msgstr "Ikke slett denne gruppen"
 
-#. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:293
-msgid "Author"
-msgstr "Forfatter"
-
-#. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:307
-msgid "Provider"
-msgstr "Leverandør"
-
 #. TRANS: Title.
 #: lib/attachmentnoticesection.php:67
 msgid "Notices where this attachment appears"
@@ -7777,24 +7845,29 @@ msgstr "Endring av passord er ikke tillatt"
 msgid "Block"
 msgstr "Blokkér"
 
+#. TRANS: Description of the form to block a user.
+#: lib/blockform.php:79
+msgid "Block this user"
+msgstr "Blokker denne brukeren"
+
 #. TRANS: Title for command results.
-#: lib/channel.php:160 lib/channel.php:181
+#: lib/channel.php:104 lib/channel.php:125
 msgid "Command results"
 msgstr "Kommandoresultat"
 
 #. TRANS: Title for command results.
-#: lib/channel.php:194
+#: lib/channel.php:138
 #, fuzzy
 msgid "AJAX error"
 msgstr "Ajax-feil"
 
 #. TRANS: E-mail subject when a command has completed.
-#: lib/channel.php:233 lib/mailhandler.php:143
+#: lib/channel.php:177 lib/mailhandler.php:143
 msgid "Command complete"
 msgstr "Kommando fullført"
 
 #. TRANS: E-mail subject when a command has failed.
-#: lib/channel.php:244
+#: lib/channel.php:188
 msgid "Command failed"
 msgstr "Kommando feilet"
 
@@ -7898,7 +7971,7 @@ msgstr "Fullt navn: %s"
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a location.
-#: lib/command.php:446 lib/mail.php:270
+#: lib/command.php:446 lib/mail.php:275
 #, php-format
 msgid "Location: %s"
 msgstr "Posisjon: %s"
@@ -7906,7 +7979,7 @@ msgstr "Posisjon: %s"
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a homepage.
-#: lib/command.php:450 lib/mail.php:274
+#: lib/command.php:450 lib/mail.php:279
 #, php-format
 msgid "Homepage: %s"
 msgstr "Hjemmeside: %s"
@@ -8142,115 +8215,104 @@ msgid ""
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:162
+#: lib/common.php:36
 #, fuzzy
 msgid "No configuration file found."
 msgstr "Ingen konfigurasjonsfil funnet. "
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:165
+#: lib/common.php:39
 #, fuzzy
 msgid "I looked for configuration files in the following places:"
 msgstr "Jeg så etter konfigurasjonfiler på følgende seter: "
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:168
+#: lib/common.php:42
 msgid "You may wish to run the installer to fix this."
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:172
+#: lib/common.php:46
 #, fuzzy
 msgid "Go to the installer."
 msgstr "Log inn på nettstedet"
 
-#. TRANS: Menu item for Instant Messaging settings.
-#: lib/connectsettingsaction.php:106
-msgctxt "MENU"
-msgid "IM"
-msgstr ""
-
-#. TRANS: Tooltip for Instant Messaging menu item.
-#: lib/connectsettingsaction.php:108
-msgid "Updates by instant messenger (IM)"
-msgstr ""
-
-#. TRANS: Menu item for Short Message Service settings.
-#: lib/connectsettingsaction.php:113
-#, fuzzy
-msgctxt "MENU"
-msgid "SMS"
-msgstr "SMS"
-
-#. TRANS: Tooltip for Short Message Service menu item.
-#: lib/connectsettingsaction.php:115
-msgid "Updates by SMS"
-msgstr "Oppdatert med SMS"
-
-#. TRANS: Menu item for OuAth connection settings.
-#: lib/connectsettingsaction.php:120
-#, fuzzy
-msgctxt "MENU"
-msgid "Connections"
-msgstr "Tilkoblinger"
-
-#. TRANS: Tooltip for connected applications (Connections through OAuth) menu item.
-#: lib/connectsettingsaction.php:122
-#, fuzzy
-msgid "Authorized connected applications"
-msgstr "Tilkoblede program"
-
 #: lib/dberroraction.php:59
 msgid "Database error"
 msgstr "Databasefeil"
 
+#. TRANS: Description of form for deleting a user.
+#: lib/deleteuserform.php:75
+msgid "Delete this user"
+msgstr "Slett denne brukeren"
+
+#: lib/designform.php:114
+#, fuzzy
+msgid "Change design"
+msgstr "Lagre utseende"
+
+#. TRANS: Fieldset legend on profile design page to change profile page colours.
+#: lib/designform.php:131
+msgid "Change colours"
+msgstr "Endre farger"
+
+#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
+#: lib/designform.php:138
+msgid "Use defaults"
+msgstr "Bruk standard"
+
+#. TRANS: Title for button on profile design page to reset all colour settings to default.
+#: lib/designform.php:140
+msgid "Restore default designs"
+msgstr "Gjenopprett standardutseende"
+
+#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
+#: lib/designform.php:148
+msgid "Reset back to default"
+msgstr "Tilbakestill til standardverdier"
+
 #. TRANS: Label in form on profile design page.
 #. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
-#: lib/designsettings.php:108
+#: lib/designform.php:158
 msgid "Upload file"
 msgstr "Last opp fil"
 
 #. TRANS: Instructions for form on profile design page.
-#: lib/designsettings.php:113
+#: lib/designform.php:163
 #, fuzzy
 msgid ""
-"You can upload your personal background image. The maximum file size is 2MB."
+"You can upload your personal background image. The maximum file size is 2Mb."
 msgstr "Du kan laste opp en personlig avatar. Maks filstørrelse er %s."
 
 #. TRANS: Radio button on profile design page that will enable use of the uploaded profile image.
-#: lib/designsettings.php:139
+#: lib/designform.php:194
 #, fuzzy
 msgctxt "RADIO"
 msgid "On"
 msgstr "På"
 
 #. TRANS: Radio button on profile design page that will disable use of the uploaded profile image.
-#: lib/designsettings.php:156
+#: lib/designform.php:211
 #, fuzzy
 msgctxt "RADIO"
 msgid "Off"
 msgstr "Av"
 
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: lib/designsettings.php:175
-msgid "Change colours"
-msgstr "Endre farger"
-
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: lib/designsettings.php:257
-msgid "Use defaults"
-msgstr "Bruk standard"
+#. TRANS: Title for button on profile design page to save settings.
+#: lib/designform.php:322
+msgid "Save design"
+msgstr "Lagre utseende"
 
 #. TRANS: Error message displayed if design settings could not be saved.
 #. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
-#: lib/designsettings.php:405 lib/designsettings.php:427
+#: lib/designsettings.php:216 lib/designsettings.php:238
 msgid "Couldn't update your design."
 msgstr "Kunne ikke oppdatere utseende."
 
 #. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
-#: lib/designsettings.php:433
+#: lib/designsettings.php:244
 #, fuzzy
 msgid "Design defaults restored."
 msgstr "Utseende lagret."
@@ -8323,30 +8385,25 @@ msgstr ""
 msgid "Feeds"
 msgstr ""
 
-#: lib/galleryaction.php:121
-#, fuzzy
-msgid "Filter tags"
-msgstr "Feed for taggen %s"
-
-#: lib/galleryaction.php:131
+#: lib/galleryaction.php:128
 msgid "All"
 msgstr "Alle"
 
-#: lib/galleryaction.php:139
+#: lib/galleryaction.php:136
 #, fuzzy
 msgid "Select tag to filter"
 msgstr "Velg en operatør"
 
-#: lib/galleryaction.php:140
+#: lib/galleryaction.php:137
 #, fuzzy
 msgid "Tag"
 msgstr "Tagger"
 
-#: lib/galleryaction.php:141
+#: lib/galleryaction.php:138
 msgid "Choose a tag to narrow list"
 msgstr ""
 
-#: lib/galleryaction.php:143
+#: lib/galleryaction.php:140
 msgid "Go"
 msgstr "Gå"
 
@@ -8434,6 +8491,12 @@ msgctxt "TOOLTIP"
 msgid "%s blocked users"
 msgstr ""
 
+#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
+#: lib/groupnav.php:117
+msgctxt "MENU"
+msgid "Admin"
+msgstr "Administrator"
+
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
 #: lib/groupnav.php:120
@@ -8543,39 +8606,61 @@ msgid_plural "%dB"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/jabber.php:387
+#: lib/implugin.php:262
 #, php-format
-msgid "[%s]"
-msgstr "[%s]"
+msgid ""
+"User \"%s\" on %s has said that your %s screenname belongs to them. If "
+"that's true, you can confirm by clicking on this URL: %s . (If you cannot "
+"click it, copy-and-paste it into the address bar of your browser). If that "
+"user isn't you, or if you didn't request this confirmation, just ignore this "
+"message."
+msgstr ""
 
-#: lib/jabber.php:567
+#: lib/implugin.php:349
 #, php-format
 msgid "Unknown inbox source %d."
 msgstr "Ukjent innbokskilde %d."
 
+#: lib/implugin.php:485
+#, fuzzy, php-format
+msgid "Message too long - maximum is %1$d characters, you sent %2$d."
+msgstr "Melding for lang - maks er %1$d tegn, du sendte %2$d."
+
 #: lib/leaveform.php:114
 msgid "Leave"
 msgstr "Forlat"
 
+#. TRANS: Menu item for logging in to the StatusNet site.
+#: lib/logingroupnav.php:77
+msgctxt "MENU"
+msgid "Login"
+msgstr "Logg inn"
+
 #. TRANS: Title for menu item for logging in to the StatusNet site.
 #: lib/logingroupnav.php:79
 msgid "Login with a username and password"
 msgstr "Logg inn med brukernavn og passord"
 
+#. TRANS: Menu item for registering with the StatusNet site.
+#: lib/logingroupnav.php:85
+msgctxt "MENU"
+msgid "Register"
+msgstr "Registrer"
+
 #. TRANS: Title for menu item for registering with the StatusNet site.
 #: lib/logingroupnav.php:87
 msgid "Sign up for a new account"
 msgstr "Registrer deg for en ny konto"
 
 #. TRANS: Subject for address confirmation email.
-#: lib/mail.php:168
+#: lib/mail.php:172
 msgid "Email address confirmation"
 msgstr "Bekreftelse av e-postadresse"
 
 #. TRANS: Body for address confirmation email.
 #. TRANS: %1$s is the addressed user's nickname, %2$s is the StatusNet sitename,
 #. TRANS: %3$s is the URL to confirm at.
-#: lib/mail.php:173
+#: lib/mail.php:177
 #, fuzzy, php-format
 msgid ""
 "Hey, %1$s.\n"
@@ -8606,14 +8691,14 @@ msgstr ""
 
 #. TRANS: Subject of new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
-#: lib/mail.php:238
+#: lib/mail.php:243
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1$s lytter nå til dine notiser på %2$s."
 
 #. TRANS: This is a paragraph in a new-subscriber e-mail.
 #. TRANS: %s is a URL where the subscriber can be reported as abusive.
-#: lib/mail.php:245
+#: lib/mail.php:250
 #, php-format
 msgid ""
 "If you believe this account is being used abusively, you can block them from "
@@ -8625,7 +8710,7 @@ msgstr ""
 #. TRANS: %3$s is the subscriber's profile URL, %4$s is the subscriber's location (or empty)
 #. TRANS: %5$s is the subscriber's homepage URL (or empty), %6%s is the subscriber's bio (or empty)
 #. TRANS: %7$s is a link to the addressed user's e-mail settings.
-#: lib/mail.php:255
+#: lib/mail.php:260
 #, fuzzy, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -8652,14 +8737,14 @@ msgstr ""
 
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is biographical information.
-#: lib/mail.php:278
+#: lib/mail.php:283
 #, php-format
 msgid "Bio: %s"
 msgstr "Biografi: %s"
 
 #. TRANS: Subject of notification mail for new posting email address.
 #. TRANS: %s is the StatusNet sitename.
-#: lib/mail.php:307
+#: lib/mail.php:312
 #, php-format
 msgid "New email address for posting to %s"
 msgstr "Ny e-postadresse for posting til %s"
@@ -8667,7 +8752,7 @@ msgstr "Ny e-postadresse for posting til %s"
 #. TRANS: Body of notification mail for new posting email address.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is the e-mail address to send
 #. TRANS: to to post by e-mail, %3$s is a URL to more instructions.
-#: lib/mail.php:313
+#: lib/mail.php:318
 #, fuzzy, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -8690,26 +8775,26 @@ msgstr ""
 
 #. TRANS: Subject line for SMS-by-email notification messages.
 #. TRANS: %s is the posting user's nickname.
-#: lib/mail.php:434
+#: lib/mail.php:439
 #, php-format
 msgid "%s status"
 msgstr "%s status"
 
 #. TRANS: Subject line for SMS-by-email address confirmation message.
-#: lib/mail.php:460
+#: lib/mail.php:465
 msgid "SMS confirmation"
 msgstr "SMS-bekreftelse"
 
 #. TRANS: Main body heading for SMS-by-email address confirmation message.
 #. TRANS: %s is the addressed user's nickname.
-#: lib/mail.php:464
+#: lib/mail.php:469
 #, php-format
 msgid "%s: confirm you own this phone number with this code:"
 msgstr "%s: bekreft telefonnummeret ditt med denne koden:"
 
 #. TRANS: Subject for 'nudge' notification email.
 #. TRANS: %s is the nudging user.
-#: lib/mail.php:485
+#: lib/mail.php:490
 #, fuzzy, php-format
 msgid "You have been nudged by %s"
 msgstr "Du har blitt knuffet av %s"
@@ -8717,7 +8802,7 @@ msgstr "Du har blitt knuffet av %s"
 #. TRANS: Body for 'nudge' notification email.
 #. TRANS: %1$s is the nuding user's long name, $2$s is the nudging user's nickname,
 #. TRANS: %3$s is a URL to post notices at, %4$s is the StatusNet sitename.
-#: lib/mail.php:492
+#: lib/mail.php:497
 #, php-format
 msgid ""
 "%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -8746,7 +8831,7 @@ msgstr ""
 
 #. TRANS: Subject for direct-message notification email.
 #. TRANS: %s is the sending user's nickname.
-#: lib/mail.php:539
+#: lib/mail.php:544
 #, php-format
 msgid "New private message from %s"
 msgstr "Ny privat melding fra %s"
@@ -8755,7 +8840,7 @@ msgstr "Ny privat melding fra %s"
 #. TRANS: %1$s is the sending user's long name, %2$s is the sending user's nickname,
 #. TRANS: %3$s is the message content, %4$s a URL to the message,
 #. TRANS: %5$s is the StatusNet sitename.
-#: lib/mail.php:547
+#: lib/mail.php:552
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -8790,7 +8875,7 @@ msgstr ""
 
 #. TRANS: Subject for favorite notification e-mail.
 #. TRANS: %1$s is the adding user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:599
+#: lib/mail.php:604
 #, fuzzy, php-format
 msgid "%1$s (@%2$s) added your notice as a favorite"
 msgstr "%s /@%s) la din notis til som en favoritt"
@@ -8800,7 +8885,7 @@ msgstr "%s /@%s) la din notis til som en favoritt"
 #. TRANS: %3$s is a URL to the faved notice, %4$s is the faved notice text,
 #. TRANS: %5$s is a URL to all faves of the adding user, %6$s is the StatusNet sitename,
 #. TRANS: %7$s is the adding user's nickname.
-#: lib/mail.php:606
+#: lib/mail.php:611
 #, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -8838,7 +8923,7 @@ msgstr ""
 "%6$s\n"
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:664
+#: lib/mail.php:669
 #, php-format
 msgid ""
 "The full conversation can be read here:\n"
@@ -8851,7 +8936,7 @@ msgstr ""
 
 #. TRANS: E-mail subject for notice notification.
 #. TRANS: %1$s is the sending user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:672
+#: lib/mail.php:677
 #, fuzzy, php-format
 msgid "%1$s (@%2$s) sent a notice to your attention"
 msgstr "%s (@%s) sendte en notis for din oppmerksomhet"
@@ -8862,7 +8947,7 @@ msgstr "%s (@%s) sendte en notis for din oppmerksomhet"
 #. TRANS: %5$s is a URL to the full conversion if it exists (otherwise empty),
 #. TRANS: %6$s is a URL to reply to the notice, %7$s is a URL to all @-replied for the addressed user,
 #. TRANS: %8$s is a URL to the addressed user's e-mail settings, %9$s is the sender's nickname.
-#: lib/mail.php:680
+#: lib/mail.php:685
 #, php-format
 msgid ""
 "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -9007,11 +9092,7 @@ msgstr "Alle abonnementer"
 msgid "To"
 msgstr "Til"
 
-#: lib/messageform.php:166 lib/noticeform.php:186
-msgid "Available characters"
-msgstr "Tilgjengelige tegn"
-
-#: lib/messageform.php:185 lib/noticeform.php:237
+#: lib/messageform.php:184 lib/noticeform.php:236
 msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr "Send"
@@ -9021,15 +9102,10 @@ msgstr "Send"
 msgid "Messages"
 msgstr "Melding"
 
-#: lib/messagelistitem.php:123 lib/noticelist.php:522
+#: lib/messagelistitem.php:123 lib/noticelist.php:527
 msgid "from"
 msgstr "fra"
 
-#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:165
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr "Kallenavn kan kun ha små bokstaver og tall og ingen mellomrom."
-
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 #: lib/nickname.php:178
 msgid "Nickname cannot be empty."
@@ -9052,23 +9128,23 @@ msgstr "Send en notis"
 msgid "What's up, %s?"
 msgstr "Hva skjer %s?"
 
-#: lib/noticeform.php:194
+#: lib/noticeform.php:193
 msgid "Attach"
 msgstr "Legg ved"
 
-#: lib/noticeform.php:198
+#: lib/noticeform.php:197
 msgid "Attach a file"
 msgstr "Legg ved en fil"
 
-#: lib/noticeform.php:213
+#: lib/noticeform.php:212
 msgid "Share my location"
 msgstr "Del min posisjon"
 
-#: lib/noticeform.php:216
+#: lib/noticeform.php:215
 msgid "Do not share my location"
 msgstr "Ikke del min posisjon"
 
-#: lib/noticeform.php:217
+#: lib/noticeform.php:216
 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
 "try again later"
@@ -9077,56 +9153,60 @@ msgstr ""
 "igjen senere"
 
 #. TRANS: Used in coordinates as abbreviation of north
-#: lib/noticelist.php:452
+#: lib/noticelist.php:457
 msgid "N"
 msgstr "N"
 
 #. TRANS: Used in coordinates as abbreviation of south
-#: lib/noticelist.php:454
+#: lib/noticelist.php:459
 msgid "S"
 msgstr "S"
 
 #. TRANS: Used in coordinates as abbreviation of east
-#: lib/noticelist.php:456
+#: lib/noticelist.php:461
 msgid "E"
 msgstr "Ø"
 
 #. TRANS: Used in coordinates as abbreviation of west
-#: lib/noticelist.php:458
+#: lib/noticelist.php:463
 msgid "W"
 msgstr "V"
 
-#: lib/noticelist.php:460
+#: lib/noticelist.php:465
 #, php-format
 msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 
-#: lib/noticelist.php:469
+#: lib/noticelist.php:474
 msgid "at"
 msgstr "på"
 
-#: lib/noticelist.php:518
+#: lib/noticelist.php:523
 msgid "web"
 msgstr ""
 
-#: lib/noticelist.php:584
+#: lib/noticelist.php:589
 #, fuzzy
 msgid "in context"
 msgstr "Inget innhold."
 
-#: lib/noticelist.php:619
+#: lib/noticelist.php:624
 msgid "Repeated by"
 msgstr "Repetert av"
 
-#: lib/noticelist.php:646
+#: lib/noticelist.php:651
 msgid "Reply to this notice"
 msgstr "Svar på denne notisen"
 
-#: lib/noticelist.php:647
+#: lib/noticelist.php:652
 msgid "Reply"
 msgstr "Svar"
 
-#: lib/noticelist.php:691
+#: lib/noticelist.php:678
+msgid "Delete this notice"
+msgstr "Slett denne notisen"
+
+#: lib/noticelist.php:696
 msgid "Notice repeated"
 msgstr "Notis repetert"
 
@@ -9164,48 +9244,31 @@ msgstr ""
 msgid "Couldn't insert new subscription."
 msgstr "Kunne ikke sette inn bekreftelseskode."
 
-#. TRANS: Personal group navigation menu option when logged in for viewing @-replies.
-#: lib/personalgroupnav.php:107
+#: lib/personalgroupnav.php:104
 #, fuzzy
-msgctxt "MENU"
 msgid "Replies"
 msgstr "Svar"
 
-#. TRANS: Personal group navigation menu option when logged in for seeing own profile.
-#: lib/personalgroupnav.php:114
+#: lib/personalgroupnav.php:109
 #, fuzzy
-msgctxt "MENU"
-msgid "Profile"
-msgstr "Profil"
-
-#. TRANS: Personal group navigation menu option when logged in for viewing own favourited notices.
-#: lib/personalgroupnav.php:120
-#, fuzzy
-msgctxt "MENU"
 msgid "Favorites"
 msgstr "Favoritter"
 
-#. TRANS: Personal group navigation menu option when logged in for viewing recieved personal messages.
-#: lib/personalgroupnav.php:133
+#: lib/personalgroupnav.php:120
 #, fuzzy
-msgctxt "MENU"
 msgid "Inbox"
 msgstr "Innboks"
 
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing recieved personal messages.
-#: lib/personalgroupnav.php:135
+#: lib/personalgroupnav.php:121
 msgid "Your incoming messages"
 msgstr "Dine innkommende meldinger"
 
-#. TRANS: Personal group navigation menu option when logged in for viewing senet personal messages.
-#: lib/personalgroupnav.php:140
+#: lib/personalgroupnav.php:125
 #, fuzzy
-msgctxt "MENU"
 msgid "Outbox"
 msgstr "Utboks"
 
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing senet personal messages.
-#: lib/personalgroupnav.php:142
+#: lib/personalgroupnav.php:126
 msgid "Your sent messages"
 msgstr "Dine sendte meldinger"
 
@@ -9220,9 +9283,26 @@ msgstr "Bruker har ingen siste notis"
 msgid "Unknown"
 msgstr "Ukjent"
 
+#. TRANS: Plugin admin panel controls
+#: lib/plugindisableform.php:90
+msgctxt "plugin"
+msgid "Disable"
+msgstr ""
+
+#. TRANS: Plugin admin panel controls
+#: lib/pluginenableform.php:112
+msgctxt "plugin"
+msgid "Enable"
+msgstr ""
+
+#: lib/pluginlist.php:196
+msgctxt "plugin-description"
+msgid "(Plugin descriptions unavailable when disabled.)"
+msgstr ""
+
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:82
+#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:88
 msgid "Subscriptions"
 msgstr "Abonnement"
 
@@ -9233,7 +9313,7 @@ msgstr "Alle abonnementer"
 
 #. TRANS: H2 text for user subscriber statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:90
+#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:96
 msgid "Subscribers"
 msgstr "Abonnenter"
 
@@ -9255,7 +9335,7 @@ msgstr "Medlem siden"
 #. TRANS: Label for user statistics.
 #. TRANS: H2 text for user group membership statistics.
 #: lib/profileaction.php:239 lib/profileaction.php:290
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:104
 msgid "Groups"
 msgstr "Grupper"
 
@@ -9275,10 +9355,6 @@ msgstr "Alle grupper"
 msgid "Unimplemented method."
 msgstr "Ikke-implementert metode."
 
-#: lib/publicgroupnav.php:78
-msgid "Public"
-msgstr "Offentlig"
-
 #: lib/publicgroupnav.php:82
 msgid "User groups"
 msgstr "Brukergrupper"
@@ -9321,7 +9397,7 @@ msgid "Revoke the \"%s\" role from this user"
 msgstr "Blokker denne brukeren fra denne gruppen"
 
 #. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:974
+#: lib/router.php:1001
 #, fuzzy
 msgid "Page not found."
 msgstr "API-metode ikke funnet!"
@@ -9352,11 +9428,6 @@ msgctxt "BUTTON"
 msgid "Search"
 msgstr ""
 
-#. TRANS: Definition list item with instructions on how to get (better) search results.
-#: lib/searchaction.php:170
-msgid "Search help"
-msgstr "Søkehjelp"
-
 #: lib/searchgroupnav.php:80
 msgid "People"
 msgstr "Personer"
@@ -9382,6 +9453,52 @@ msgstr "Side uten tittel"
 msgid "More..."
 msgstr "Mer..."
 
+#: lib/settingsnav.php:78
+msgid "Change your profile settings"
+msgstr "Endre profilinnstillingene dine"
+
+#: lib/settingsnav.php:83
+msgid "Upload an avatar"
+msgstr "Last opp en avatar"
+
+#: lib/settingsnav.php:88
+msgid "Change your password"
+msgstr "Endre passordet ditt"
+
+#: lib/settingsnav.php:93
+msgid "Change email handling"
+msgstr "Endre eposthåndtering"
+
+#: lib/settingsnav.php:98
+msgid "Design your profile"
+msgstr "Brukerprofil"
+
+#: lib/settingsnav.php:102
+msgid "URL"
+msgstr "Nettadresse"
+
+#: lib/settingsnav.php:103
+msgid "URL shorteners"
+msgstr ""
+
+#: lib/settingsnav.php:111
+msgid "Updates by instant messenger (IM)"
+msgstr ""
+
+#: lib/settingsnav.php:118
+msgid "Updates by SMS"
+msgstr "Oppdatert med SMS"
+
+#: lib/settingsnav.php:123
+#, fuzzy
+msgid "Connections"
+msgstr "Tilkoblinger"
+
+#: lib/settingsnav.php:124
+#, fuzzy
+msgid "Authorized connected applications"
+msgstr "Tilkoblede program"
+
 #: lib/silenceform.php:67
 #, fuzzy
 msgid "Silence"
@@ -9391,30 +9508,34 @@ msgstr "Nettstedsnotis"
 msgid "Silence this user"
 msgstr "Slett denne brukeren"
 
-#: lib/subgroupnav.php:83
+#: lib/subgroupnav.php:89
 #, fuzzy, php-format
 msgid "People %s subscribes to"
 msgstr "Fjernabonner"
 
-#: lib/subgroupnav.php:91
+#: lib/subgroupnav.php:97
 #, php-format
 msgid "People subscribed to %s"
 msgstr "Fjernabonner"
 
-#: lib/subgroupnav.php:99
+#: lib/subgroupnav.php:105
 #, fuzzy, php-format
 msgid "Groups %s is a member of"
 msgstr "%1$s grupper %2$s er et medlem av."
 
-#: lib/subgroupnav.php:105
+#: lib/subgroupnav.php:111
 msgid "Invite"
 msgstr "Inviter"
 
-#: lib/subgroupnav.php:106
+#: lib/subgroupnav.php:112
 #, fuzzy, php-format
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Inviter venner og kollegaer til å bli med deg på %s"
 
+#: lib/subscribeform.php:115 lib/subscribeform.php:139
+msgid "Subscribe to this user"
+msgstr "Abonner på denne brukeren"
+
 #: lib/subscriberspeopleselftagcloudsection.php:48
 #: lib/subscriptionspeopleselftagcloudsection.php:48
 msgid "People Tagcloud as self-tagged"
@@ -9486,6 +9607,13 @@ msgstr ""
 msgid "Error opening theme archive."
 msgstr "Feil ved oppdatering av fjernprofil."
 
+#: lib/threadednoticelist.php:270
+#, php-format
+msgid "Show all %d comment"
+msgid_plural "Show all %d comments"
+msgstr[0] ""
+msgstr[1] ""
+
 #: lib/topposterssection.php:74
 msgid "Top posters"
 msgstr ""
@@ -9530,78 +9658,82 @@ msgstr "Abonner"
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "Brukeren har ingen profil."
 
-#. TRANS: Link text for changeing the avatar of the logged in user.
-#: lib/userprofile.php:121
+#: lib/userprofile.php:116
 #, fuzzy
 msgid "Edit Avatar"
 msgstr "Brukerbilde"
 
 #. TRANS: H2 for user actions in a profile.
 #. TRANS: H2 for entity actions in a profile.
-#: lib/userprofile.php:245 lib/userprofile.php:261
+#: lib/userprofile.php:216 lib/userprofile.php:232
 #, fuzzy
 msgid "User actions"
 msgstr "Gruppehandlinger"
 
 #. TRANS: Text shown in user profile of not yet compeltely deleted users.
-#: lib/userprofile.php:249
+#: lib/userprofile.php:220
 msgid "User deletion in progress..."
 msgstr ""
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:277
+#: lib/userprofile.php:248
 msgid "Edit profile settings"
 msgstr "Endre profilinnstillinger"
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:279
+#: lib/userprofile.php:250
 msgid "Edit"
 msgstr "Rediger"
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:303
+#: lib/userprofile.php:274
 msgid "Send a direct message to this user"
 msgstr "Send en direktemelding til denne brukeren"
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:305
+#: lib/userprofile.php:276
 msgid "Message"
 msgstr "Melding"
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:347
+#: lib/userprofile.php:318
 msgid "Moderate"
 msgstr "Moderer"
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:386
+#: lib/userprofile.php:357
 msgid "User role"
 msgstr "Brukerrolle"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:389
+#: lib/userprofile.php:360
 msgctxt "role"
 msgid "Administrator"
 msgstr "Administrator"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:391
+#: lib/userprofile.php:362
 msgctxt "role"
 msgid "Moderator"
 msgstr "Moderator"
 
+#: lib/util.php:321
+#, fuzzy
+msgid "Not allowed to log in."
+msgstr "Ikke logget inn."
+
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1306
+#: lib/util.php:1337
 msgid "a few seconds ago"
 msgstr "noen få sekunder siden"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1309
+#: lib/util.php:1340
 msgid "about a minute ago"
 msgstr "omtrent ett minutt siden"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1313
+#: lib/util.php:1344
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
@@ -9609,12 +9741,12 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1316
+#: lib/util.php:1347
 msgid "about an hour ago"
 msgstr "omtrent én time siden"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1320
+#: lib/util.php:1351
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
@@ -9622,12 +9754,12 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1323
+#: lib/util.php:1354
 msgid "about a day ago"
 msgstr "omtrent én dag siden"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1327
+#: lib/util.php:1358
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
@@ -9635,12 +9767,12 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1330
+#: lib/util.php:1361
 msgid "about a month ago"
 msgstr "omtrent én måned siden"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1334
+#: lib/util.php:1365
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
@@ -9648,7 +9780,7 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1337
+#: lib/util.php:1368
 msgid "about a year ago"
 msgstr "omtrent ett år siden"
 
@@ -9659,21 +9791,6 @@ msgstr "omtrent ett år siden"
 msgid "%s is not a valid color! Use 3 or 6 hex characters."
 msgstr "%s er ikke en gyldig farge. Bruk 3 eller 6 heksadesimale tegn."
 
-#. TRANS: %s is the URL to the StatusNet site's Instant Messaging settings.
-#: lib/xmppmanager.php:287
-#, php-format
-msgid "Unknown user. Go to %s to add your address to your account"
-msgstr ""
-
-#. TRANS: Response to XMPP source when it sent too long a message.
-#. TRANS: %1$d the maximum number of allowed characters (used for plural), %2$d is the sent number.
-#: lib/xmppmanager.php:406
-#, fuzzy, php-format
-msgid "Message too long. Maximum is %1$d character, you sent %2$d."
-msgid_plural "Message too long. Maximum is %1$d characters, you sent %2$d."
-msgstr[0] "Melding for lang - maks er %1$d tegn, du sendte %2$d."
-msgstr[1] "Melding for lang - maks er %1$d tegn, du sendte %2$d."
-
 #. TRANS: Exception.
 #: lib/xrd.php:63
 #, fuzzy
@@ -9691,73 +9808,168 @@ msgstr ""
 msgid "Getting backup from file '%s'."
 msgstr ""
 
-#, fuzzy
-#~ msgid "Block this user."
-#~ msgstr "Blokker denne brukeren"
+#~ msgid "Could not generate feed for group - %s"
+#~ msgstr "Kunne ikke generere mating for gruppe - %s"
 
 #, fuzzy
-#~ msgid "Delete this notice."
-#~ msgstr "Slett denne notisen"
-
-#, fuzzy
-#~ msgid "Delete this user."
-#~ msgstr "Slett denne brukeren"
-
-#, fuzzy
-#~ msgid "Restore default designs."
-#~ msgstr "Gjenopprett standardutseende"
-
-#, fuzzy
-#~ msgid "Reset back to default."
-#~ msgstr "Tilbakestill til standardverdier"
-
-#, fuzzy
-#~ msgid "Save design."
-#~ msgstr "Lagre utseende"
-
-#, fuzzy
-#~ msgid "Disfavor favorite."
-#~ msgstr "Fjern favoritt"
-
-#, fuzzy
-#~ msgid "\"%s\" not found."
-#~ msgstr "Bruker ikke funnet."
-
-#, fuzzy
-#~ msgid "Notice %s not found."
-#~ msgstr "Foreldrenotis ikke funnet."
-
-#, fuzzy
-#~ msgid "Attachment %s not found."
-#~ msgstr "Fant ikke mottakeren."
-
-#, fuzzy
-#~ msgid "Invalid tag: \"%s\"."
-#~ msgstr "Ugyldig merkelapp: «%s»"
-
-#, fuzzy
-#~ msgid "%s updates from everyone."
-#~ msgstr "%s oppdateringer fra alle sammen!"
-
-#, fuzzy
-#~ msgid "Password saved"
-#~ msgstr "Passordet ble lagret"
-
-#, fuzzy
-#~ msgid "Where you are, like \"City, State (or Region), Country\"."
-#~ msgstr "Hvor du er, for eksempel «By, fylke (eller region), land»"
-
-#, fuzzy
-#~ msgid "Subscribe to this user."
-#~ msgstr "Abonner på denne brukeren"
+#~ msgid "Current confirmed Jabber/Google Talk address."
+#~ msgstr "Nåværende bekreftede Jabber/GTak-adresse."
 
 #, fuzzy
 #~ msgid ""
-#~ "Listenee stream license \"%1$s\" is not compatible with site license \"%2"
-#~ "$s\"."
+#~ "Jabber or Google Talk address, like \"UserName@example.org\". First, make "
+#~ "sure to add %s to your buddy list in your IM client or on Google Talk."
 #~ msgstr ""
-#~ "Notislisensen ‘%1$s’ er ikke kompatibel med nettstedslisensen ‘%2$s’."
+#~ "Jabber- og GTalk-adresse, som «brukernavn@example.org». Husk å legge %s "
+#~ "til vennelisten din i direktemeldingsklienten din eller på GTalk."
 
 #, fuzzy
-#~ msgid "Not allowed to log in."
-#~ msgstr "Ikke logget inn."
+#~ msgid "Send me notices through Jabber/Google Talk."
+#~ msgstr "Send meg notiser gjennom Jabber/GTalk."
+
+#, fuzzy
+#~ msgid "Publish a MicroID for my Jabber/Google Talk address."
+#~ msgstr "Publiser en MicroID for min Jabber/Gtalk-adresse."
+
+#~ msgid "No Jabber ID."
+#~ msgstr "Ingen Jabber ID."
+
+#, fuzzy
+#~ msgid "Not a valid Jabber ID."
+#~ msgstr "Ugyldig Jabber ID"
+
+#~ msgid "That is already your Jabber ID."
+#~ msgstr "Det er allerede din Jabber ID."
+
+#~ msgid "That is not your Jabber ID."
+#~ msgstr "Det er ikke din Jabber ID."
+
+#~ msgid "Other settings"
+#~ msgstr "Andre innstillinger"
+
+#~ msgid "Tag cloud"
+#~ msgstr "Merkelappsky"
+
+#~ msgid "Consumer key"
+#~ msgstr "Forbrukernøkkel"
+
+#~ msgid "Consumer secret"
+#~ msgstr "Forbrukerhemmelighet"
+
+#, fuzzy
+#~ msgid "Authorize URL"
+#~ msgstr "Forfatter"
+
+#~ msgid "Jabber"
+#~ msgstr "Jabber"
+
+#~ msgid "Photo"
+#~ msgstr "Foto"
+
+#~ msgid "Other options"
+#~ msgstr "Andre valg"
+
+#~ msgid "Other"
+#~ msgstr "Andre"
+
+#, fuzzy
+#~ msgid "Primary site navigation"
+#~ msgstr "Endre nettstedskonfigurasjon"
+
+#~ msgctxt "MENU"
+#~ msgid "Personal"
+#~ msgstr "Personlig"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Change your email, avatar, password, profile"
+#~ msgstr "Endre e-posten, avateren, passordet og profilen din"
+
+#~ msgid "Account"
+#~ msgstr "Konto"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Connect to services"
+#~ msgstr "Koble til tjenester"
+
+#~ msgid "Connect"
+#~ msgstr "Koble til"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Change site configuration"
+#~ msgstr "Endre nettstedskonfigurasjon"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Invite friends and colleagues to join you on %s"
+#~ msgstr "Inviter venner og kollegaer til å bli med deg på %s"
+
+#~ msgctxt "MENU"
+#~ msgid "Invite"
+#~ msgstr "Inviter"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Create an account"
+#~ msgstr "Opprett en konto"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Help me!"
+#~ msgstr "Hjelp meg."
+
+#~ msgctxt "MENU"
+#~ msgid "Help"
+#~ msgstr "Hjelp"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Search for people or text"
+#~ msgstr "Søk etter personer eller tekst"
+
+#~ msgid "Local views"
+#~ msgstr "Lokale visninger"
+
+#~ msgid "Page notice"
+#~ msgstr "Sidenotis"
+
+#~ msgid "StatusNet software license"
+#~ msgstr "Programvarelisens for StatusNet"
+
+#, fuzzy
+#~ msgid "Site content license"
+#~ msgstr "Programvarelisens for StatusNet"
+
+#, fuzzy
+#~ msgid "Pagination"
+#~ msgstr "Registrering"
+
+#~ msgid "Author"
+#~ msgstr "Forfatter"
+
+#~ msgid "Provider"
+#~ msgstr "Leverandør"
+
+#, fuzzy
+#~ msgctxt "MENU"
+#~ msgid "SMS"
+#~ msgstr "SMS"
+
+#, fuzzy
+#~ msgid "Filter tags"
+#~ msgstr "Feed for taggen %s"
+
+#~ msgid "[%s]"
+#~ msgstr "[%s]"
+
+#~ msgid "Available characters"
+#~ msgstr "Tilgjengelige tegn"
+
+#, fuzzy
+#~ msgctxt "MENU"
+#~ msgid "Profile"
+#~ msgstr "Profil"
+
+#~ msgid "Search help"
+#~ msgstr "Søkehjelp"
+
+#, fuzzy
+#~ msgid "Message too long. Maximum is %1$d character, you sent %2$d."
+#~ msgid_plural "Message too long. Maximum is %1$d characters, you sent %2$d."
+#~ msgstr[0] "Melding for lang - maks er %1$d tegn, du sendte %2$d."
+#~ msgstr[1] "Melding for lang - maks er %1$d tegn, du sendte %2$d."
diff --git a/locale/nl/LC_MESSAGES/statusnet.po b/locale/nl/LC_MESSAGES/statusnet.po
index 8cc2f98dbf..7744e3175f 100644
--- a/locale/nl/LC_MESSAGES/statusnet.po
+++ b/locale/nl/LC_MESSAGES/statusnet.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 15:58+0000\n"
-"PO-Revision-Date: 2011-03-03 16:01:08+0000\n"
+"POT-Creation-Date: 2011-03-03 17:23+0000\n"
+"PO-Revision-Date: 2011-03-03 17:26:17+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -79,23 +79,23 @@ msgstr "Toegangsinstellingen opslaan"
 #. TRANS: Tooltip for button to save access settings in site admin panel.
 #. TRANS: Button text for saving theme settings.
 #. TRANS: Button label to save e-mail preferences.
-#. TRANS: Button label to save Instant Messaging preferences.
-#. TRANS: Button text for saving "Other settings" in profile.
+#. TRANS: Button label to save IM preferences.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
 #. TRANS: Button text for saving site notice in admin panel.
 #. TRANS: Button label to save SMS preferences.
 #. TRANS: Save button for settings for a profile in a subscriptions list.
+#. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
 #. TRANS: Button text on profile design page to save settings.
 #: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
-#: actions/emailsettings.php:250 actions/imsettings.php:183
-#: actions/othersettings.php:136 actions/pathsadminpanel.php:512
-#: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
-#: actions/smssettings.php:205 actions/subscriptions.php:259
+#: actions/emailsettings.php:251 actions/imsettings.php:199
+#: actions/pathsadminpanel.php:512 actions/profilesettings.php:198
+#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:204
+#: actions/subscriptions.php:261 actions/urlsettings.php:152
 #: actions/useradminpanel.php:298 lib/applicationeditform.php:355
-#: lib/designsettings.php:270 lib/groupeditform.php:201
+#: lib/designform.php:320 lib/groupeditform.php:201
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Opslaan"
@@ -134,7 +134,11 @@ msgstr "Deze pagina bestaat niet."
 #. 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 use "one time password login" without using an existing user.
+#. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
+#. TRANS: Client error displayed trying to find a user by ID for a non-existing ID.
+#. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when calling a profile action without specifying a user.
 #: actions/all.php:80 actions/allrss.php:69
@@ -146,19 +150,19 @@ msgstr "Deze pagina bestaat niet."
 #: actions/apidirectmessage.php:75 actions/apidirectmessagenew.php:72
 #: actions/apigroupcreate.php:111 actions/apigroupismember.php:89
 #: actions/apigroupjoin.php:98 actions/apigroupleave.php:98
-#: actions/apigrouplist.php:70 actions/apistatusesupdate.php:230
-#: actions/apisubscriptions.php:85 actions/apitimelinefavorites.php:70
-#: actions/apitimelinefriends.php:173 actions/apitimelinehome.php:78
-#: actions/apitimelinementions.php:77 actions/apitimelineuser.php:79
-#: actions/avatarbynickname.php:79 actions/favoritesrss.php:72
-#: actions/foaf.php:42 actions/foaf.php:61 actions/hcard.php:67
-#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
-#: actions/remotesubscribe.php:144 actions/remotesubscribe.php:153
-#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
-#: actions/showfavorites.php:106 actions/userbyid.php:74
-#: actions/usergroups.php:93 actions/userrss.php:40 actions/userxrd.php:59
-#: actions/xrds.php:71 lib/command.php:509 lib/galleryaction.php:59
-#: lib/mailbox.php:80 lib/profileaction.php:77
+#: actions/apigrouplist.php:70 actions/apigroupprofileupdate.php:108
+#: actions/apistatusesupdate.php:230 actions/apisubscriptions.php:85
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:173
+#: actions/apitimelinehome.php:78 actions/apitimelinementions.php:77
+#: actions/apitimelineuser.php:79 actions/avatarbynickname.php:79
+#: actions/favoritesrss.php:72 actions/foaf.php:42 actions/foaf.php:61
+#: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116
+#: actions/otp.php:78 actions/remotesubscribe.php:144
+#: actions/remotesubscribe.php:153 actions/replies.php:73
+#: actions/repliesrss.php:38 actions/rsd.php:113 actions/showfavorites.php:106
+#: actions/userbyid.php:75 actions/usergroups.php:93 actions/userrss.php:40
+#: actions/userxrd.php:59 actions/xrds.php:71 lib/command.php:509
+#: lib/galleryaction.php:59 lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Onbekende gebruiker."
 
@@ -172,10 +176,9 @@ msgstr "%1$s en vrienden, pagina %2$d"
 #. TRANS: H1 text for page. %s is a user nickname.
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Timeline title for user and friends. %s is a user nickname.
-#. TRANS: Tooltop for personal group navigation menu option when logged in for viewing timeline of self and friends.
 #: actions/all.php:94 actions/all.php:191 actions/allrss.php:117
 #: actions/apitimelinefriends.php:207 actions/apitimelinehome.php:113
-#: lib/personalgroupnav.php:102
+#: lib/personalgroupnav.php:100
 #, php-format
 msgid "%s and friends"
 msgstr "%s en vrienden"
@@ -234,7 +237,7 @@ msgstr ""
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
 #. TRANS: Second sentence of empty message for anonymous users. %s is a user nickname.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:227
+#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:221
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -283,19 +286,20 @@ msgstr "Updates van %1$s en vrienden op %2$s."
 #: actions/apifavoritecreate.php:98 actions/apifavoritedestroy.php:98
 #: actions/apifriendshipscreate.php:99 actions/apifriendshipsdestroy.php:99
 #: actions/apifriendshipsshow.php:124 actions/apigroupcreate.php:138
-#: actions/apigroupismember.php:115 actions/apigroupjoin.php:160
-#: actions/apigroupleave.php:145 actions/apigrouplist.php:134
+#: actions/apigroupismember.php:115 actions/apigroupjoin.php:151
+#: actions/apigroupleave.php:141 actions/apigrouplist.php:134
 #: actions/apigrouplistall.php:120 actions/apigroupmembership.php:105
+#: actions/apigroupprofileupdate.php:100 actions/apigroupprofileupdate.php:213
 #: actions/apigroupshow.php:114 actions/apihelptest.php:84
 #: actions/apistatusesdestroy.php:101 actions/apistatusesretweets.php:110
 #: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:139
 #: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
-#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:268
-#: actions/apitimelinegroup.php:147 actions/apitimelinehome.php:173
-#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:239
-#: actions/apitimelineretweetedtome.php:118
-#: actions/apitimelineretweetsofme.php:150 actions/apitimelinetag.php:159
-#: actions/apitimelineuser.php:206 actions/apiusershow.php:100
+#: actions/apitimelinefavorites.php:182 actions/apitimelinefriends.php:276
+#: actions/apitimelinegroup.php:148 actions/apitimelinehome.php:181
+#: actions/apitimelinementions.php:182 actions/apitimelinepublic.php:247
+#: actions/apitimelineretweetedtome.php:147
+#: actions/apitimelineretweetsofme.php:147 actions/apitimelinetag.php:165
+#: actions/apitimelineuser.php:217 actions/apiusershow.php:100
 msgid "API method not found."
 msgstr "De API-functie is niet aangetroffen."
 
@@ -310,8 +314,9 @@ msgstr "De API-functie is niet aangetroffen."
 #: actions/apifavoritecreate.php:88 actions/apifavoritedestroy.php:88
 #: actions/apifriendshipscreate.php:89 actions/apifriendshipsdestroy.php:89
 #: actions/apigroupcreate.php:102 actions/apigroupjoin.php:89
-#: actions/apigroupleave.php:89 actions/apimediaupload.php:66
-#: actions/apistatusesretweet.php:63 actions/apistatusesupdate.php:194
+#: actions/apigroupleave.php:89 actions/apigroupprofileupdate.php:92
+#: actions/apimediaupload.php:66 actions/apistatusesretweet.php:63
+#: actions/apistatusesupdate.php:194
 msgid "This method requires a POST."
 msgstr "Deze methode vereist een POST."
 
@@ -325,21 +330,16 @@ msgstr ""
 "waardes: sms, im, none."
 
 #. TRANS: Server error displayed when a user's delivery device cannot be updated.
-#. TRANS: Server error displayed when a user update to the database fails in the contact address confirmation action.
 #. TRANS: Server error thrown on database error updating e-mail preferences.
 #. TRANS: Server error thrown on database error removing a registered e-mail address.
-#. TRANS: Server error thrown on database error updating Instant Messaging preferences.
-#. TRANS: Server error thrown on database error removing a registered Instant Messaging address.
-#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
 #. TRANS: Server error thrown when user profile settings could not be updated.
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
-#: actions/apiaccountupdatedeliverydevice.php:130
-#: actions/confirmaddress.php:118 actions/emailsettings.php:352
-#: actions/emailsettings.php:498 actions/imsettings.php:276
-#: actions/imsettings.php:432 actions/othersettings.php:186
-#: actions/profilesettings.php:322 actions/smssettings.php:301
-#: actions/smssettings.php:454
+#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
+#: actions/apiaccountupdatedeliverydevice.php:136
+#: actions/emailsettings.php:353 actions/emailsettings.php:499
+#: actions/profilesettings.php:323 actions/smssettings.php:300
+#: actions/smssettings.php:453 actions/urlsettings.php:211
 msgid "Could not update user."
 msgstr "Het was niet mogelijk de gebruiker bij te werken."
 
@@ -365,7 +365,7 @@ msgstr "Deze gebruiker heeft geen profiel."
 
 #. TRANS: Server error displayed if a user profile could not be saved.
 #. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:418
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:419
 msgid "Could not save profile."
 msgstr "Het was niet mogelijk het profiel op te slaan."
 
@@ -377,7 +377,7 @@ msgstr "Het was niet mogelijk het profiel op te slaan."
 #: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
 #: actions/designadminpanel.php:120 actions/editapplication.php:121
 #: actions/newapplication.php:102 actions/newnotice.php:95
-#: lib/designsettings.php:298
+#: lib/designsettings.php:110
 #, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s byte) due to its "
@@ -402,8 +402,8 @@ msgstr[1] ""
 #: actions/apiaccountupdateprofilecolors.php:160
 #: actions/apiaccountupdateprofilecolors.php:171
 #: actions/groupdesignsettings.php:285 actions/groupdesignsettings.php:296
-#: actions/userdesignsettings.php:201 actions/userdesignsettings.php:211
-#: actions/userdesignsettings.php:253 actions/userdesignsettings.php:263
+#: actions/userdesignsettings.php:218 actions/userdesignsettings.php:228
+#: actions/userdesignsettings.php:270 actions/userdesignsettings.php:280
 msgid "Unable to save your design settings."
 msgstr "Het was niet mogelijk om uw ontwerpinstellingen op te slaan."
 
@@ -411,7 +411,7 @@ msgstr "Het was niet mogelijk om uw ontwerpinstellingen op te slaan."
 #. TRANS: Client error displayed when a database error occurs updating profile colours.
 #: actions/apiaccountupdateprofilebackgroundimage.php:191
 #: actions/apiaccountupdateprofilecolors.php:139
-#: actions/userdesignsettings.php:179
+#: actions/userdesignsettings.php:196
 msgid "Could not update your design."
 msgstr "Het was niet mogelijk uw ontwerp bij te werken."
 
@@ -519,8 +519,7 @@ msgstr "De ontvanger is niet aangetroffen."
 
 #. TRANS: Client error displayed trying to direct message another user who's not a friend (403).
 #: actions/apidirectmessagenew.php:144
-#, fuzzy
-msgid "Can't send direct messages to users who aren't your friend."
+msgid "Cannot send direct messages to users who aren't your friend."
 msgstr ""
 "U kunt geen privéberichten sturen aan gebruikers die niet op uw "
 "vriendenlijst staan."
@@ -606,9 +605,9 @@ msgstr "Het was niet mogelijk de doelgebruiker te vinden."
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:156 actions/editgroup.php:191
-#: actions/newgroup.php:137 actions/profilesettings.php:273
-#: actions/register.php:214
+#: actions/apigroupcreate.php:156 actions/apigroupprofileupdate.php:255
+#: actions/editgroup.php:191 actions/newgroup.php:137
+#: actions/profilesettings.php:274 actions/register.php:199
 msgid "Nickname already in use. Try another one."
 msgstr ""
 "De opgegeven gebruikersnaam is al in gebruik. Kies een andere gebruikersnaam."
@@ -617,9 +616,9 @@ msgstr ""
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:164 actions/editgroup.php:195
-#: actions/newgroup.php:141 actions/profilesettings.php:243
-#: actions/register.php:216
+#: actions/apigroupcreate.php:164 actions/apigroupprofileupdate.php:259
+#: actions/editgroup.php:195 actions/newgroup.php:141
+#: actions/profilesettings.php:244 actions/register.php:201
 msgid "Not a valid nickname."
 msgstr "Ongeldige gebruikersnaam!"
 
@@ -629,10 +628,10 @@ msgstr "Ongeldige gebruikersnaam!"
 #. TRANS: Validation error shown when providing an invalid homepage URL in the "New application" form.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:181 actions/editapplication.php:235
-#: actions/editgroup.php:202 actions/newapplication.php:221
-#: actions/newgroup.php:148 actions/profilesettings.php:248
-#: actions/register.php:223
+#: actions/apigroupcreate.php:181 actions/apigroupprofileupdate.php:277
+#: actions/editapplication.php:235 actions/editgroup.php:202
+#: actions/newapplication.php:221 actions/newgroup.php:148
+#: actions/profilesettings.php:249 actions/register.php:208
 msgid "Homepage is not a valid URL."
 msgstr "De thuispagina is geen geldige URL."
 
@@ -641,8 +640,8 @@ msgstr "De thuispagina is geen geldige URL."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:191 actions/editgroup.php:206
-#: actions/newgroup.php:152 actions/profilesettings.php:252
-#: actions/register.php:226
+#: actions/newgroup.php:152 actions/profilesettings.php:253
+#: actions/register.php:211
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "De volledige naam is te lang (maximaal 255 tekens)."
 
@@ -669,8 +668,8 @@ msgstr[1] "De beschrijving is te lang (maximaal %d tekens)."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:215 actions/editgroup.php:218
-#: actions/newgroup.php:164 actions/profilesettings.php:265
-#: actions/register.php:235
+#: actions/newgroup.php:164 actions/profilesettings.php:266
+#: actions/register.php:220
 msgid "Location is too long (maximum 255 characters)."
 msgstr "De locatie is te lang (maximaal 255 tekens)."
 
@@ -699,15 +698,16 @@ msgstr "Ongeldige alias: \"%s\"."
 #. TRANS: %s is the alias that is already in use.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error. %s is the already used alias.
-#: actions/apigroupcreate.php:264 actions/editgroup.php:246
-#: actions/newgroup.php:193
+#: actions/apigroupcreate.php:264 actions/apigroupprofileupdate.php:351
+#: actions/editgroup.php:246 actions/newgroup.php:193
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "De alias \"%s\" wordt al gebruikt. Geef een andere alias op."
 
 #. TRANS: Client error displayed when trying to use an alias during group creation that is the same as the group's nickname.
 #. TRANS: Group edit form validation error.
-#: actions/apigroupcreate.php:278 actions/editgroup.php:253
+#: actions/apigroupcreate.php:278 actions/apigroupprofileupdate.php:359
+#: actions/editgroup.php:253
 msgid "Alias can't be the same as nickname."
 msgstr "Een alias kan niet hetzelfde zijn als de gebruikersnaam."
 
@@ -719,7 +719,8 @@ msgstr "Een alias kan niet hetzelfde zijn als de gebruikersnaam."
 #. TRANS: Client error displayed requesting most recent notices to a group for a non-existing group.
 #: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
 #: actions/apigroupleave.php:104 actions/apigroupmembership.php:71
-#: actions/apigroupshow.php:81 actions/apitimelinegroup.php:89
+#: actions/apigroupprofileupdate.php:113 actions/apigroupshow.php:81
+#: actions/apitimelinegroup.php:89
 msgid "Group not found."
 msgstr "De groep is niet aangetroffen."
 
@@ -737,13 +738,11 @@ msgstr "U bent al lid van die groep."
 msgid "You have been blocked from that group by the admin."
 msgstr "Een beheerder heeft ingesteld dat u geen lid mag worden van die groep."
 
-#. TRANS: Server error displayed when joining a group fails.
-#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
 #. 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.
 #. TRANS: Message given having failed to add a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:362
+#: actions/apigroupjoin.php:136 actions/joingroup.php:139 lib/command.php:362
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "Het was niet mogelijk gebruiker %1$s toe te voegen aan de groep %2$s."
@@ -753,8 +752,6 @@ msgstr "Het was niet mogelijk gebruiker %1$s toe te voegen aan de groep %2$s."
 msgid "You are not a member of this group."
 msgstr "U bent geen lid van deze groep."
 
-#. TRANS: Server error displayed when leaving a group fails.
-#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
 #. TRANS: Server error displayed when leaving a group failed in the database.
 #. TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
 #. TRANS: Message given having failed to remove a user from a group.
@@ -790,6 +787,63 @@ msgstr "%s groepen"
 msgid "groups on %s"
 msgstr "groepen op %s"
 
+#. TRANS: Client error displayed trying to edit a group while not being a group admin.
+#. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
+#. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
+#: actions/apigroupprofileupdate.php:118 actions/editgroup.php:110
+#: actions/editgroup.php:176 actions/groupdesignsettings.php:109
+#: actions/grouplogo.php:111
+msgid "You must be an admin to edit the group."
+msgstr "U moet beheerder zijn om de groep te kunnen bewerken."
+
+#. TRANS: Server error displayed when editing a group fails.
+#: actions/apigroupprofileupdate.php:171 actions/editgroup.php:274
+msgid "Could not update group."
+msgstr "Het was niet mogelijk de groep bij te werken."
+
+#. TRANS: Server error displayed when group aliases could not be added.
+#. TRANS: Server exception thrown when creating group aliases failed.
+#: actions/apigroupprofileupdate.php:194 actions/editgroup.php:281
+#: classes/User_group.php:540
+msgid "Could not create aliases."
+msgstr "Het was niet mogelijk de aliassen aan te maken."
+
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: actions/apigroupprofileupdate.php:249 lib/nickname.php:165
+msgid "Nickname must have only lowercase letters and numbers and no spaces."
+msgstr ""
+"De gebruikersnaam mag alleen kleine letters en cijfers bevatten. Spaties "
+"zijn niet toegestaan."
+
+#: actions/apigroupprofileupdate.php:286
+#, fuzzy
+msgid "Full name is too long (max 255 chars)."
+msgstr "De volledige naam is te lang (maximaal 255 tekens)."
+
+#: actions/apigroupprofileupdate.php:296
+#, fuzzy, php-format
+msgid "description is too long (max %d chars)."
+msgstr "De beschrijving is te lang (maximaal %d teken)."
+
+#: actions/apigroupprofileupdate.php:307
+#, fuzzy
+msgid "Location is too long (max 255 chars)."
+msgstr "De locatie is te lang (maximaal 255 tekens)."
+
+#: actions/apigroupprofileupdate.php:326
+#, fuzzy, php-format
+msgid "Too many aliases! Maximum %d."
+msgstr "Te veel aliassen! Het maximale aantal is %d."
+
+#. TRANS: Group edit form validation error.
+#. TRANS: Group create form validation error.
+#. TRANS: %s is the invalid alias.
+#: actions/apigroupprofileupdate.php:342 actions/editgroup.php:241
+#: actions/newgroup.php:188
+#, php-format
+msgid "Invalid alias: \"%s\""
+msgstr "Ongeldige alias: \"%s\""
+
 #. TRANS: Client error displayed when uploading a media file has failed.
 #: actions/apimediaupload.php:101
 msgid "Upload failed."
@@ -820,21 +874,22 @@ msgstr "Het verzoektoken is al geautoriseerd."
 #. TRANS: Form validation error message.
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
+#. TRANS: Client error displayed when the session token is not okay.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
 #: actions/deletenotice.php:177 actions/disfavor.php:75
-#: actions/emailsettings.php:291 actions/favor.php:75 actions/geocode.php:55
+#: actions/emailsettings.php:292 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:65 actions/grouplogo.php:321
-#: actions/groupunblock.php:65 actions/imsettings.php:224
-#: actions/invite.php:60 actions/login.php:137 actions/makeadmin.php:66
-#: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
-#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
-#: actions/othersettings.php:155 actions/passwordsettings.php:138
-#: actions/profilesettings.php:217 actions/recoverpassword.php:383
-#: actions/register.php:172 actions/remotesubscribe.php:76
-#: actions/repeat.php:82 actions/smssettings.php:250 actions/subedit.php:40
-#: actions/subscribe.php:86 actions/tagother.php:166
-#: actions/unsubscribe.php:69 actions/userauthorization.php:52
-#: lib/designsettings.php:310
+#: actions/groupunblock.php:65 actions/imsettings.php:241
+#: actions/invite.php:60 actions/makeadmin.php:66 actions/newmessage.php:135
+#: actions/newnotice.php:105 actions/nudge.php:80
+#: actions/oauthappssettings.php:162 actions/oauthconnectionssettings.php:135
+#: actions/passwordsettings.php:137 actions/pluginenable.php:87
+#: actions/profilesettings.php:218 actions/recoverpassword.php:383
+#: actions/register.php:157 actions/remotesubscribe.php:76
+#: actions/repeat.php:82 actions/smssettings.php:249 actions/subedit.php:40
+#: actions/subscribe.php:87 actions/tagother.php:145
+#: actions/unsubscribe.php:69 actions/urlsettings.php:171
+#: actions/userauthorization.php:53 lib/designsettings.php:122
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 "Er is een probleem ontstaan met uw sessie. Probeer het nog een keer, "
@@ -866,10 +921,10 @@ msgstr ""
 #. TRANS: Unknown form validation error in design settings form.
 #: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
 #: actions/designadminpanel.php:100 actions/editapplication.php:144
-#: actions/emailsettings.php:310 actions/grouplogo.php:332
-#: actions/imsettings.php:239 actions/newapplication.php:124
-#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
-#: actions/smssettings.php:271 lib/designsettings.php:321
+#: actions/emailsettings.php:311 actions/grouplogo.php:332
+#: actions/imsettings.php:256 actions/newapplication.php:124
+#: actions/oauthconnectionssettings.php:144 actions/recoverpassword.php:46
+#: actions/smssettings.php:270 lib/designsettings.php:133
 msgid "Unexpected form submission."
 msgstr "Het formulier is onverwacht ingezonden."
 
@@ -918,31 +973,26 @@ msgstr "Gebruikersgegevens"
 
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Field label in form for profile settings.
-#. TRANS: Label for group nickname (dt). Text hidden by default.
-#. TRANS: DT for nick name in a profile.
-#: actions/apioauthauthorize.php:459 actions/login.php:252
-#: actions/profilesettings.php:106 actions/register.php:432
-#: actions/showgroup.php:243 actions/tagother.php:94
+#: actions/apioauthauthorize.php:459 actions/login.php:225
+#: actions/profilesettings.php:107 actions/register.php:411
 #: actions/userauthorization.php:145 lib/groupeditform.php:145
-#: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "Gebruikersnaam"
 
 #. TRANS: Field label on OAuth API authorisation form.
-#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:463 actions/login.php:255
-#: actions/register.php:436 lib/accountsettingsaction.php:120
+#: actions/apioauthauthorize.php:463 actions/login.php:228
+#: actions/register.php:415 lib/settingsnav.php:87
 msgid "Password"
 msgstr "Wachtwoord"
 
 #. TRANS: Button text that when clicked will cancel the process of allowing access to an account
 #. TRANS: by an external application.
 #. TRANS: Button label to cancel an e-mail address confirmation procedure.
-#. TRANS: Button label to cancel an Instant Messaging address confirmation procedure.
+#. TRANS: Button label to cancel an IM address confirmation procedure.
 #. TRANS: Button label to cancel a SMS address confirmation procedure.
 #. TRANS: Button label in the "Edit application" form.
-#: actions/apioauthauthorize.php:478 actions/emailsettings.php:124
-#: actions/imsettings.php:127 actions/smssettings.php:133
+#: actions/apioauthauthorize.php:478 actions/emailsettings.php:125
+#: actions/imsettings.php:136 actions/smssettings.php:132
 #: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Cancel"
@@ -1053,8 +1103,8 @@ msgstr "HTTP-methode wordt niet ondersteund."
 #. TRANS: Exception thrown requesting an unsupported notice output format.
 #. TRANS: %s is the requested output format.
 #: actions/apistatusesshow.php:144
-#, fuzzy, php-format
-msgid "Unsupported format: %s"
+#, php-format
+msgid "Unsupported format: %s."
 msgstr "Niet-ondersteund formaat: %s."
 
 #. TRANS: Client error displayed requesting a deleted status.
@@ -1139,13 +1189,6 @@ msgstr ""
 "Mededelingen van %1$s die op de favorietenlijst zijn geplaatst door %2$s / %3"
 "$s."
 
-#. TRANS: Server error displayed when generating an Atom feed fails.
-#. TRANS: %s is the error.
-#: actions/apitimelinegroup.php:134
-#, php-format
-msgid "Could not generate feed for group - %s"
-msgstr "Het was niet mogelijk een groepfeed te maken - %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.
 #: actions/apitimelinementions.php:115
@@ -1162,13 +1205,14 @@ msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr "%1$s updates die een reactie zijn op updates van %2$s / %3$s."
 
 #. TRANS: Title for site timeline. %s is the StatusNet sitename.
+#. TRANS: Public RSS feed title. %s is the StatusNet site name.
 #: actions/apitimelinepublic.php:193 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "%s publieke tijdlijn"
 
 #. TRANS: Subtitle for site timeline. %s is the StatusNet sitename.
-#: actions/apitimelinepublic.php:199 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:199
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "%s updates van iedereen"
@@ -1179,21 +1223,33 @@ msgid "Unimplemented."
 msgstr "Niet geïmplementeerd."
 
 #. TRANS: Title for Atom feed "repeated to me". %s is the user nickname.
-#: actions/apitimelineretweetedtome.php:108
+#: actions/apitimelineretweetedtome.php:96
 #, php-format
 msgid "Repeated to %s"
 msgstr "Herhaald naar %s"
 
+#: actions/apitimelineretweetedtome.php:98
+#, fuzzy, php-format
+msgid "%1$s notices that were to repeated to %2$s / %3$s."
+msgstr "%1$s updates die een reactie zijn op updates van %2$s / %3$s."
+
 #. TRANS: Title of list of repeated notices of the logged in user.
 #. TRANS: %s is the nickname of the logged in user.
-#: actions/apitimelineretweetsofme.php:112
+#: actions/apitimelineretweetsofme.php:98
 #, php-format
 msgid "Repeats of %s"
 msgstr "Herhaald van %s"
 
+#: actions/apitimelineretweetsofme.php:104
+#, fuzzy, php-format
+msgid "%1$s notices that %2$s / %3$s has repeated."
+msgstr "%1$s heeft de mededeling %2$s als favoriet gemarkeerd."
+
 #. TRANS: Title for timeline with lastest notices with a given tag.
 #. TRANS: %s is the tag.
-#: actions/apitimelinetag.php:101 actions/tag.php:67
+#. TRANS: Title for first page of notices with tags.
+#. TRANS: %s is the tag.
+#: actions/apitimelinetag.php:101 actions/tag.php:69
 #, php-format
 msgid "Notices tagged with %s"
 msgstr "Mededelingen met het label %s"
@@ -1206,53 +1262,54 @@ msgid "Updates tagged with %1$s on %2$s!"
 msgstr "Updates met het label %1$s op %2$s!"
 
 #. TRANS: Client error displayed trying to add a notice to another user's timeline.
-#: actions/apitimelineuser.php:297
+#: actions/apitimelineuser.php:308
 msgid "Only the user can add to their own timeline."
 msgstr "Gebruikers kunnen alleen zelf aan hun eigen tijdlijn toevoegen."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:304
+#: actions/apitimelineuser.php:315
 msgid "Only accept AtomPub for Atom feeds."
 msgstr "Alleen AtomPub voor Atomfeeds accepteren."
 
 #. TRANS: Client error displayed attempting to post an empty API notice.
-#: actions/apitimelineuser.php:311
+#: actions/apitimelineuser.php:322
 msgid "Atom post must not be empty."
 msgstr "Het Atombericht mag niet leeg zijn."
 
 #. TRANS: Client error displayed attempting to post an API that is not well-formed XML.
-#: actions/apitimelineuser.php:317
+#: actions/apitimelineuser.php:328
 msgid "Atom post must be well-formed XML."
 msgstr "Het Atombericht moet correct opgemaakte XML zijn."
 
 #. TRANS: Client error displayed when not using an Atom entry.
-#: actions/apitimelineuser.php:323 actions/atompubfavoritefeed.php:228
+#: actions/apitimelineuser.php:334 actions/atompubfavoritefeed.php:228
 #: actions/atompubmembershipfeed.php:230
 #: actions/atompubsubscriptionfeed.php:236
 msgid "Atom post must be an Atom entry."
 msgstr "Het Atombericht moet een Atomopmaak hebben."
 
 #. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
-#: actions/apitimelineuser.php:335
+#: actions/apitimelineuser.php:345
 msgid "Can only handle POST activities."
 msgstr "Het is alleen mogelijk om POST-activiteiten af te handelen."
 
 #. TRANS: Client error displayed when using an unsupported activity object type.
 #. TRANS: %s is the unsupported activity object type.
-#: actions/apitimelineuser.php:346
+#: actions/apitimelineuser.php:356
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr "Het is niet mogelijk om het activiteitobjecttype \"%s\" te verwerken."
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
 #. TRANS: %d is the notice ID (number).
-#: actions/apitimelineuser.php:380
+#: actions/apitimelineuser.php:390
 #, php-format
 msgid "No content for notice %d."
 msgstr "Geen inhoud voor mededeling %d."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:408
+#. TRANS: %s is the notice URI.
+#: actions/apitimelineuser.php:419
 #, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "De mededeling met URI \"%s\" bestaat al."
@@ -1269,9 +1326,10 @@ msgstr "De pagina is niet aangetroffen."
 
 #. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
 #. TRANS: Client exception.
+#. TRANS: Client error displayed trying to subscribe to a non-existing profile.
 #: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
 #: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
-#: actions/subscribe.php:107
+#: actions/subscribe.php:110
 msgid "No such profile."
 msgstr "Het profiel bestaat niet."
 
@@ -1410,7 +1468,7 @@ msgid "Not a member."
 msgstr "Geen lid."
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
-#: actions/atompubshowmembership.php:151
+#: actions/atompubshowmembership.php:150
 msgid "Cannot delete someone else's membership."
 msgstr "Het is niet mogelijk om een lidmaatschap van een ander te verwijderen."
 
@@ -1500,10 +1558,7 @@ msgid "Invalid size."
 msgstr "Ongeldige afmetingen."
 
 #. TRANS: Title for avatar upload page.
-#. TRANS: Label for group avatar (dt). Text hidden by default.
-#. TRANS: Link description in user account settings menu.
-#: actions/avatarsettings.php:66 actions/showgroup.php:227
-#: lib/accountsettingsaction.php:113
+#: actions/avatarsettings.php:66 lib/settingsnav.php:82
 msgid "Avatar"
 msgstr "Avatar"
 
@@ -1517,9 +1572,11 @@ msgstr ""
 
 #. TRANS: Server error displayed in avatar upload page when no matching profile can be found for a user.
 #. TRANS: Server error displayed coming across a request from a user without a profile.
+#. TRANS: Server error displayed when trying to authorise a remote subscription request
+#. TRANS: while the user has no profile.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
 #: actions/grouplogo.php:184 actions/remotesubscribe.php:190
-#: actions/userauthorization.php:72 actions/userrss.php:108
+#: actions/userauthorization.php:75 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr "Gebruiker zonder bijbehorend profiel."
 
@@ -1574,10 +1631,9 @@ msgstr "Uitsnijden"
 msgid "No file uploaded."
 msgstr "Er is geen bestand geüpload."
 
-#. TRANS: Avatar upload form unstruction after uploading a file.
+#. TRANS: Avatar upload form instruction after uploading a file.
 #: actions/avatarsettings.php:345
-#, fuzzy
-msgid "Pick a square area of the image to be your avatar"
+msgid "Pick a square area of the image to be your avatar."
 msgstr ""
 "Selecteer een vierkant in de afbeelding om deze als uw avatar in te stellen."
 
@@ -1604,7 +1660,7 @@ msgstr "De avatar is verwijderd."
 
 #. TRANS: Title for backup account page.
 #. TRANS: Option in profile settings to create a backup of the account of the currently logged in user.
-#: actions/backupaccount.php:61 actions/profilesettings.php:467
+#: actions/backupaccount.php:61 actions/profilesettings.php:468
 msgid "Backup account"
 msgstr "Reservekopie van gebruiker maken"
 
@@ -1641,8 +1697,7 @@ msgstr "Reservekopie"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
 #: actions/backupaccount.php:254
-#, fuzzy
-msgid "Backup your account"
+msgid "Backup your account."
 msgstr "Uw gebruiker back-uppen."
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
@@ -1683,8 +1738,7 @@ msgstr "Nee"
 
 #. TRANS: Submit button title for 'No' when blocking a user.
 #: actions/block.php:158
-#, fuzzy
-msgid "Do not block this user"
+msgid "Do not block this user."
 msgstr "Deze gebruiker niet blokkeren."
 
 #. TRANS: Button label on the user block form.
@@ -1701,10 +1755,9 @@ msgid "Yes"
 msgstr "Ja"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#. TRANS: Description of the form to block a user.
-#: actions/block.php:165 lib/blockform.php:79
-msgid "Block this user"
-msgstr "Deze gebruiker blokkeren"
+#: actions/block.php:165
+msgid "Block this user."
+msgstr "Deze gebruiker blokkeren."
 
 #. TRANS: Server error displayed when blocking a user fails.
 #: actions/block.php:189
@@ -1769,31 +1822,47 @@ msgstr "De bevestigingscode niet gevonden."
 msgid "That confirmation code is not for you!"
 msgstr "Dit is niet uw bevestigingscode!"
 
-#. TRANS: Server error for a unknow address type %s, which can be 'email', 'jabber', or 'sms'.
-#: actions/confirmaddress.php:92
-#, php-format
-msgid "Unrecognized address type %s."
+#. TRANS: Server error for an unknown address type, which can be 'email', 'sms', or the name of an IM network (such as 'xmpp' or 'aim')
+#: actions/confirmaddress.php:94
+#, fuzzy, php-format
+msgid "Unrecognized address type %s"
 msgstr "Onbekend adrestype %s."
 
 #. TRANS: Client error for an already confirmed email/jabber/sms address.
-#: actions/confirmaddress.php:97
+#: actions/confirmaddress.php:103 actions/confirmaddress.php:136
 msgid "That address has already been confirmed."
 msgstr "Dit adres is al bevestigd."
 
+#: actions/confirmaddress.php:121 actions/imsettings.php:444
+#: actions/userdesignsettings.php:306
+#, fuzzy
+msgid "Couldn't update user."
+msgstr "Het was niet mogelijk de gebruiker bij te werken."
+
+#: actions/confirmaddress.php:144
+#, fuzzy
+msgid "Couldn't update user im preferences."
+msgstr "Kan de gebruikersgegevens niet vernieuwen."
+
+#: actions/confirmaddress.php:156
+#, fuzzy
+msgid "Couldn't insert user im preferences."
+msgstr "Kon nieuw abonnement niet toevoegen."
+
 #. TRANS: Server error displayed when an address confirmation code deletion from the
 #. TRANS: database fails in the contact address confirmation action.
-#: actions/confirmaddress.php:132
+#: actions/confirmaddress.php:169
 msgid "Could not delete address confirmation."
 msgstr "De adresbevestiging kon niet verwijderd worden."
 
 #. TRANS: Title for the contact address confirmation action.
-#: actions/confirmaddress.php:150
+#: actions/confirmaddress.php:185
 msgid "Confirm address"
 msgstr "Adres bevestigen"
 
 #. TRANS: Success message for the contact address confirmation action.
 #. TRANS: %s can be 'email', 'jabber', or 'sms'.
-#: actions/confirmaddress.php:166
+#: actions/confirmaddress.php:200
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "Het adres \"%s\" is voor uw gebruiker bevestigd."
@@ -1807,6 +1876,7 @@ msgstr "Dialoog"
 #. TRANS: Label for user statistics.
 #: actions/conversation.php:149 lib/noticelist.php:87
 #: lib/profileaction.php:246 lib/searchgroupnav.php:82
+#: lib/threadednoticelist.php:66
 msgid "Notices"
 msgstr "Mededelingen"
 
@@ -1839,7 +1909,7 @@ msgstr "De gebruiker is verwijderd."
 
 #. TRANS: Page title for page on which a user account can be deleted.
 #. TRANS: Option in profile settings to delete the account of the currently logged in user.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:475
+#: actions/deleteaccount.php:228 actions/profilesettings.php:476
 msgid "Delete account"
 msgstr "Gebruiker verwijderen"
 
@@ -1866,7 +1936,7 @@ msgstr ""
 #. TRANS: Field label for delete account confirmation entry.
 #. TRANS: Field label for password reset form where the password has to be typed again.
 #: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:262 actions/register.php:440
+#: actions/recoverpassword.php:262 actions/register.php:419
 msgid "Confirm"
 msgstr "Bevestigen"
 
@@ -1897,14 +1967,14 @@ msgstr "De applicatie is niet gevonden."
 #. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
 #: actions/deleteapplication.php:79 actions/editapplication.php:78
-#: actions/showapplication.php:94
+#: actions/showapplication.php:90
 msgid "You are not the owner of this application."
 msgstr "U bent niet de eigenaar van deze applicatie."
 
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
-#: actions/newapplication.php:112 actions/showapplication.php:118
-#: lib/action.php:1425
+#: actions/newapplication.php:112 actions/showapplication.php:113
+#: lib/action.php:1391
 msgid "There was a problem with your session token."
 msgstr "Er is een probleem met uw sessietoken."
 
@@ -1927,14 +1997,12 @@ msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting an application.
 #: actions/deleteapplication.php:161
-#, fuzzy
-msgid "Do not delete this application"
+msgid "Do not delete this application."
 msgstr "Deze applicatie niet verwijderen."
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
 #: actions/deleteapplication.php:167
-#, fuzzy
-msgid "Delete this application"
+msgid "Delete this application."
 msgstr "Deze applicatie verwijderen."
 
 #. TRANS: Client error when trying to delete group while not logged in.
@@ -1989,14 +2057,12 @@ msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting a group.
 #: actions/deletegroup.php:224
-#, fuzzy
-msgid "Do not delete this group"
+msgid "Do not delete this group."
 msgstr "Deze groep niet verwijderen."
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
 #: actions/deletegroup.php:231
-#, fuzzy
-msgid "Delete this group"
+msgid "Delete this group."
 msgstr "Deze groep verwijderen."
 
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
@@ -2004,14 +2070,16 @@ msgstr "Deze groep verwijderen."
 #. TRANS: Client error displayed when trying to mark a notice as favorite without being logged in.
 #. TRANS: Client error displayed trying to block a user from a group while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
+#. TRANS: Client error displayed trying to log out when not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
+#. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
 #. TRANS: Client error displayed when trying to change user options while not logged in.
 #: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
-#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:69
+#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:70
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
-#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
-#: actions/tagother.php:33 actions/unsubscribe.php:52
+#: actions/nudge.php:63 actions/pluginenable.php:97 actions/subedit.php:33
+#: actions/subscribe.php:98 actions/tagother.php:33 actions/unsubscribe.php:52
 #: lib/adminpanelaction.php:71 lib/profileformaction.php:63
 #: lib/settingsaction.php:72
 msgid "Not logged in."
@@ -2039,14 +2107,13 @@ msgstr "Weet u zeker dat u deze aankondiging wilt verwijderen?"
 
 #. TRANS: Submit button title for 'No' when deleting a notice.
 #: actions/deletenotice.php:159
-#, fuzzy
-msgid "Do not delete this notice"
+msgid "Do not delete this notice."
 msgstr "Deze mededeling niet verwijderen."
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:166 lib/noticelist.php:673
-msgid "Delete this notice"
-msgstr "Deze mededeling verwijderen"
+#: actions/deletenotice.php:166
+msgid "Delete this notice."
+msgstr "Deze mededeling verwijderen."
 
 #. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
 #: actions/deleteuser.php:66
@@ -2081,19 +2148,16 @@ msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting a user.
 #: actions/deleteuser.php:158
-#, fuzzy
-msgid "Do not delete this user"
+msgid "Do not delete this user."
 msgstr "Deze gebruiker niet verwijderen."
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
-#. TRANS: Description of form for deleting a user.
-#: actions/deleteuser.php:165 lib/deleteuserform.php:75
-msgid "Delete this user"
-msgstr "Gebruiker verwijderen"
+#: actions/deleteuser.php:165
+msgid "Delete this user."
+msgstr "Deze gebruiker verwijderen."
 
 #. TRANS: Message used as title for design settings for the site.
-#. TRANS: Link description in user account settings menu.
-#: actions/designadminpanel.php:60 lib/accountsettingsaction.php:134
+#: actions/designadminpanel.php:60 lib/settingsnav.php:97
 msgid "Design"
 msgstr "Uiterlijk"
 
@@ -2160,8 +2224,7 @@ msgid "You can upload a custom StatusNet theme as a .ZIP archive."
 msgstr "U kunt een vormgeving voor StatusNet uploaden als ZIP-archief."
 
 #. TRANS: Fieldset legend for theme background image.
-#. TRANS: Fieldset legend on profile design page.
-#: actions/designadminpanel.php:515 lib/designsettings.php:98
+#: actions/designadminpanel.php:515
 msgid "Change background image"
 msgstr "Achtergrondafbeelding wijzigen"
 
@@ -2169,7 +2232,7 @@ msgstr "Achtergrondafbeelding wijzigen"
 #. TRANS: Field label for background color selector.
 #. TRANS: Label on profile design page for setting a profile page background colour.
 #: actions/designadminpanel.php:525 actions/designadminpanel.php:609
-#: lib/designsettings.php:183
+#: lib/designform.php:238
 msgid "Background"
 msgstr "Achtergrond"
 
@@ -2196,13 +2259,13 @@ msgstr "Uit"
 #. TRANS: Form guide for turning background image on or off on theme designer page.
 #. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
 #. TRANS: use of the uploaded profile image.
-#: actions/designadminpanel.php:577 lib/designsettings.php:159
+#: actions/designadminpanel.php:577 lib/designform.php:214
 msgid "Turn background image on or off."
 msgstr "Achtergrondafbeelding inschakelen of uitschakelen."
 
 #. TRANS: Checkbox label to title background image on theme designer page.
 #. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-#: actions/designadminpanel.php:583 lib/designsettings.php:165
+#: actions/designadminpanel.php:583 lib/designform.php:220
 msgid "Tile background image"
 msgstr "Achtergrondafbeelding naast elkaar"
 
@@ -2213,25 +2276,25 @@ msgstr "Kleuren wijzigen"
 
 #. TRANS: Field label for content color selector.
 #. TRANS: Label on profile design page for setting a profile page content colour.
-#: actions/designadminpanel.php:623 lib/designsettings.php:197
+#: actions/designadminpanel.php:623 lib/designform.php:252
 msgid "Content"
 msgstr "Inhoud"
 
 #. TRANS: Field label for sidebar color selector.
 #. TRANS: Label on profile design page for setting a profile page sidebar colour.
-#: actions/designadminpanel.php:637 lib/designsettings.php:211
+#: actions/designadminpanel.php:637 lib/designform.php:266
 msgid "Sidebar"
 msgstr "Menubalk"
 
 #. TRANS: Field label for text color selector.
 #. TRANS: Label on profile design page for setting a profile page text colour.
-#: actions/designadminpanel.php:651 lib/designsettings.php:225
+#: actions/designadminpanel.php:651 lib/designform.php:280
 msgid "Text"
 msgstr "Tekst"
 
 #. TRANS: Field label for link color selector.
 #. TRANS: Label on profile design page for setting a profile page links colour.
-#: actions/designadminpanel.php:665 lib/designsettings.php:239
+#: actions/designadminpanel.php:665 lib/designform.php:294
 msgid "Links"
 msgstr "Verwijzingen"
 
@@ -2252,22 +2315,19 @@ msgid "Use defaults"
 msgstr "Standaardinstellingen gebruiken"
 
 #. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: actions/designadminpanel.php:720 lib/designsettings.php:259
-msgid "Restore default designs"
-msgstr "Standaardontwerp toepassen"
+#: actions/designadminpanel.php:720
+msgid "Restore default designs."
+msgstr "Het standaardontwerp toepassen."
 
 #. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: actions/designadminpanel.php:728 lib/designsettings.php:267
-msgid "Reset back to default"
-msgstr "Standaardinstellingen toepassen"
+#: actions/designadminpanel.php:728
+msgid "Reset back to default."
+msgstr "De standaardinstellingen toepassen."
 
 #. TRANS: Title for button for saving theme settings.
-#. TRANS: Title for button on profile design page to save settings.
-#: actions/designadminpanel.php:736 lib/designsettings.php:272
-msgid "Save design"
-msgstr "Ontwerp opslaan"
+#: actions/designadminpanel.php:736
+msgid "Save design."
+msgstr "Ontwerp opslaan."
 
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
 #: actions/disfavor.php:83
@@ -2298,7 +2358,7 @@ msgid "You must be logged in to edit an application."
 msgstr "U moet aangemeld zijn om een applicatie te kunnen bewerken."
 
 #. TRANS: Client error displayed trying to edit an application that does not exist.
-#: actions/editapplication.php:83 actions/showapplication.php:87
+#: actions/editapplication.php:83 actions/showapplication.php:83
 msgid "No such application."
 msgstr "De applicatie bestaat niet."
 
@@ -2389,80 +2449,53 @@ msgstr "Groep %s bewerken"
 msgid "You must be logged in to create a group."
 msgstr "U moet aangemeld zijn om een groep aan te kunnen maken."
 
-#. TRANS: Client error displayed trying to edit a group while not being a group admin.
-#. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
-#. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
-#: actions/editgroup.php:110 actions/editgroup.php:176
-#: actions/groupdesignsettings.php:109 actions/grouplogo.php:111
-msgid "You must be an admin to edit the group."
-msgstr "U moet beheerder zijn om de groep te kunnen bewerken."
-
 #. TRANS: Form instructions for group edit form.
 #: actions/editgroup.php:161
 msgid "Use this form to edit the group."
 msgstr "Gebruik dit formulier om de groep te bewerken."
 
-#. TRANS: Group edit form validation error.
-#. TRANS: Group create form validation error.
-#. TRANS: %s is the invalid alias.
-#: actions/editgroup.php:241 actions/newgroup.php:188
-#, php-format
-msgid "Invalid alias: \"%s\""
-msgstr "Ongeldige alias: \"%s\""
-
-#. TRANS: Server error displayed when editing a group fails.
-#: actions/editgroup.php:274
-msgid "Could not update group."
-msgstr "Het was niet mogelijk de groep bij te werken."
-
-#. TRANS: Server error displayed when group aliases could not be added.
-#. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/editgroup.php:281 classes/User_group.php:540
-msgid "Could not create aliases."
-msgstr "Het was niet mogelijk de aliassen aan te maken."
-
 #. TRANS: Group edit form success message.
 #: actions/editgroup.php:301
 msgid "Options saved."
 msgstr "De instellingen zijn opgeslagen."
 
 #. TRANS: Title for e-mail settings.
-#: actions/emailsettings.php:59
+#: actions/emailsettings.php:60
 msgid "Email settings"
 msgstr "E-mailvoorkeuren"
 
 #. TRANS: E-mail settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/emailsettings.php:73
+#: actions/emailsettings.php:74
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 msgstr "Uw e-mailinstellingen op %%site.name%% beheren."
 
 #. TRANS: Form legend for e-mail settings form.
 #. TRANS: Field label for e-mail address input in e-mail settings form.
-#: actions/emailsettings.php:103 actions/emailsettings.php:129
+#: actions/emailsettings.php:104 actions/emailsettings.php:130
 msgid "Email address"
 msgstr "E-mailadres"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:109
+#: actions/emailsettings.php:110
 msgid "Current confirmed email address."
 msgstr "Huidige bevestigde e-mailadres"
 
 #. TRANS: Button label to remove a confirmed e-mail address.
 #. TRANS: Button label for removing a set sender e-mail address to post notices from.
-#. TRANS: Button label to remove a confirmed Instant Messaging address.
+#. TRANS: Button label to remove a confirmed IM address.
 #. TRANS: Button label to remove a confirmed SMS address.
 #. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
-#: actions/emailsettings.php:112 actions/emailsettings.php:179
-#: actions/imsettings.php:112 actions/smssettings.php:120
-#: actions/smssettings.php:176
+#: actions/emailsettings.php:113 actions/emailsettings.php:180
+#: actions/imsettings.php:119 actions/smssettings.php:119
+#: actions/smssettings.php:175
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Verwijderen"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:119
+#: actions/emailsettings.php:120
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -2475,46 +2508,46 @@ msgstr ""
 #. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
 #. TRANS: Any other domain may be owned by a legitimate person or
 #. TRANS: organization.
-#: actions/emailsettings.php:136
+#: actions/emailsettings.php:137
 msgid "Email address, like \"UserName@example.org\""
 msgstr "E-mailadres, zoals \"gebruikersnaam@example.org\""
 
 #. TRANS: Button label for adding an e-mail address in e-mail settings form.
-#. TRANS: Button label for adding an Instant Messaging address in Instant Messaging settings form.
+#. TRANS: Button label for adding an IM address in IM settings form.
 #. TRANS: Button label for adding a SMS phone number in SMS settings form.
-#: actions/emailsettings.php:140 actions/imsettings.php:147
-#: actions/smssettings.php:158
+#: actions/emailsettings.php:141 actions/imsettings.php:147
+#: actions/smssettings.php:157
 msgctxt "BUTTON"
 msgid "Add"
 msgstr "Toevoegen"
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:148 actions/smssettings.php:167
+#: actions/emailsettings.php:149 actions/smssettings.php:166
 msgid "Incoming email"
 msgstr "Inkomende e-mail"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:154
+#: actions/emailsettings.php:155
 msgid "I want to post notices by email."
 msgstr "Ik wil mededelingen per e-mail plaatsen."
 
 #. TRANS: Form instructions for incoming e-mail form in e-mail settings.
 #. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
-#: actions/emailsettings.php:176 actions/smssettings.php:174
+#: actions/emailsettings.php:177 actions/smssettings.php:173
 msgid "Send email to this address to post new notices."
 msgstr "Stuur een email naar dit adres om een nieuw bericht te posten"
 
 #. TRANS: Instructions for incoming e-mail address input form, when an address has already been assigned.
 #. TRANS: Instructions for incoming SMS e-mail address input form.
-#: actions/emailsettings.php:185 actions/smssettings.php:182
+#: actions/emailsettings.php:186 actions/smssettings.php:181
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr ""
 "Stelt een nieuw e-mailadres in voor het ontvangen van berichten. Het "
 "bestaande e-mailadres wordt verwijderd."
 
 #. TRANS: Instructions for incoming e-mail address input form.
-#: actions/emailsettings.php:189
+#: actions/emailsettings.php:190
 msgid ""
 "To send notices via email, we need to create a unique email address for you "
 "on this server:"
@@ -2524,87 +2557,87 @@ msgstr ""
 
 #. TRANS: Button label for adding an e-mail address to send notices from.
 #. TRANS: Button label for adding an SMS e-mail address to send notices from.
-#: actions/emailsettings.php:195 actions/smssettings.php:185
+#: actions/emailsettings.php:196 actions/smssettings.php:184
 msgctxt "BUTTON"
 msgid "New"
 msgstr "Nieuw"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:204
+#: actions/emailsettings.php:205
 msgid "Email preferences"
 msgstr "E-mailvoorkeuren"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:212
+#: actions/emailsettings.php:213
 msgid "Send me notices of new subscriptions through email."
 msgstr "Mij e-mailen bij nieuwe abonnementen."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:218
+#: actions/emailsettings.php:219
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr "Mij e-mailen als iemand mijn mededeling als favoriet instelt."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:225
+#: actions/emailsettings.php:226
 msgid "Send me email when someone sends me a private message."
 msgstr "Mij e-mailen als iemand mij een privébericht zendt."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:231
+#: actions/emailsettings.php:232
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr "Mij e-mailen als iemand mij een antwoord met \"@\" erin stuurt."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:237
+#: actions/emailsettings.php:238
 msgid "Allow friends to nudge me and send me an email."
 msgstr "Vrienden mogen me porren en e-mailen."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:243
+#: actions/emailsettings.php:244
 msgid "Publish a MicroID for my email address."
 msgstr "Een MicroID voor mijn e-mailadres publiceren."
 
 #. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:361
+#: actions/emailsettings.php:362
 msgid "Email preferences saved."
 msgstr "De e-mailvoorkeuren zijn opgeslagen."
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:380
+#: actions/emailsettings.php:381
 msgid "No email address."
 msgstr "Geen e-mailadres"
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:388
+#: actions/emailsettings.php:389
 msgid "Cannot normalize that email address."
 msgstr "Kan het e-mailadres niet normaliseren."
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:393 actions/register.php:212
+#: actions/emailsettings.php:394 actions/register.php:197
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "Geen geldig e-mailadres."
 
 #. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:397
+#: actions/emailsettings.php:398
 msgid "That is already your email address."
 msgstr "U hebt dit e-mailadres als ingesteld als uw e-mailadres."
 
 #. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:401
+#: actions/emailsettings.php:402
 msgid "That email address already belongs to another user."
 msgstr "Dit e-mailadres is al geregistreerd door een andere gebruiker."
 
 #. TRANS: Server error thrown on database error adding e-mail confirmation code.
 #. TRANS: Server error thrown on database error adding Instant Messaging confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:418 actions/imsettings.php:343
-#: actions/smssettings.php:365
+#: actions/emailsettings.php:419 actions/imsettings.php:362
+#: actions/smssettings.php:364
 msgid "Could not insert confirmation code."
 msgstr "De bevestigingscode kon niet ingevoegd worden."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:425
+#: actions/emailsettings.php:426
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
@@ -2616,57 +2649,60 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling Instant Messaging address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:445 actions/imsettings.php:377
-#: actions/smssettings.php:399
+#: actions/emailsettings.php:446 actions/imsettings.php:391
+#: actions/smssettings.php:398
 msgid "No pending confirmation to cancel."
 msgstr "Er is geen openstaand bevestigingsverzoek om te annuleren."
 
 #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:450
+#: actions/emailsettings.php:451
 msgid "That is the wrong email address."
 msgstr "Dat is het verkeerde e-mailadres."
 
 #. TRANS: Server error thrown on database error canceling e-mail address confirmation.
 #. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
-#: actions/emailsettings.php:459 actions/smssettings.php:413
+#: actions/emailsettings.php:460 actions/smssettings.php:412
 msgid "Could not delete email confirmation."
 msgstr "De e-mailbevestiging kon niet verwijderd worden."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:464
+#: actions/emailsettings.php:465
 msgid "Email confirmation cancelled."
 msgstr "E-mailbevestiging geannuleerd."
 
 #. TRANS: Message given trying to remove an e-mail address that is not
 #. TRANS: registered for the active user.
-#: actions/emailsettings.php:483
+#: actions/emailsettings.php:484
 msgid "That is not your email address."
 msgstr "Dit is niet uw e-mailadres."
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:504
+#: actions/emailsettings.php:505
 msgid "The email address was removed."
 msgstr "Het e-mailadres is verwijderd."
 
 #. TRANS: Form validation error displayed when trying to remove an incoming e-mail address while no address has been set.
-#: actions/emailsettings.php:518 actions/smssettings.php:555
+#: actions/emailsettings.php:519 actions/smssettings.php:554
 msgid "No incoming email address."
 msgstr "Geen binnenkomend e-mailadres"
 
 #. TRANS: Server error thrown on database error removing incoming e-mail address.
 #. TRANS: Server error thrown on database error adding incoming e-mail address.
-#: actions/emailsettings.php:530 actions/emailsettings.php:554
-#: actions/smssettings.php:565 actions/smssettings.php:588
+#. TRANS: Server error displayed when the user could not be updated in SMS settings.
+#: actions/emailsettings.php:531 actions/emailsettings.php:555
+#: actions/smssettings.php:565 actions/smssettings.php:590
 msgid "Could not update user record."
 msgstr "Kan de gebruikersgegevens niet vernieuwen."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:534 actions/smssettings.php:568
+#. TRANS: Confirmation text after updating SMS settings.
+#: actions/emailsettings.php:535 actions/smssettings.php:569
 msgid "Incoming email address removed."
 msgstr "Het e-mailadres voor inkomende mail is verwijderd."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:558 actions/smssettings.php:591
+#. TRANS: Confirmation text after updating SMS settings.
+#: actions/emailsettings.php:559 actions/smssettings.php:594
 msgid "New incoming email address added."
 msgstr "Het nieuwe binnenkomende e-mailadres is toegevoegd."
 
@@ -2677,9 +2713,8 @@ msgstr "Deze mededeling staat al in uw favorietenlijst."
 
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
 #: actions/favor.php:95
-#, fuzzy
-msgid "Disfavor favorite"
-msgstr "Van favorietenlijst verwijderen"
+msgid "Disfavor favorite."
+msgstr "Van uw favorietenlijst verwijderen."
 
 #. TRANS: Page title for first page of favorited notices.
 #. TRANS: Title for favourited notices section.
@@ -2732,9 +2767,8 @@ msgstr ""
 #. TRANS: %s is a user's nickname.
 #. TRANS: Title for first page of favourite notices of a user.
 #. TRANS: %s is the user for whom the favourite notices are displayed.
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing own favourited notices.
 #: actions/favoritesrss.php:111 actions/showfavorites.php:76
-#: lib/personalgroupnav.php:122
+#: lib/personalgroupnav.php:110
 #, php-format
 msgid "%s's favorite notices"
 msgstr "Favoriete mededelingen van %s"
@@ -2924,14 +2958,12 @@ msgstr ""
 
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
 #: actions/groupblock.php:191
-#, fuzzy
-msgid "Do not block this user from this group"
+msgid "Do not block this user from this group."
 msgstr "Deze gebruiker niet de toegang tot deze groep ontzeggen."
 
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
 #: actions/groupblock.php:198
-#, fuzzy
-msgid "Block this user from this group"
+msgid "Block this user from this group."
 msgstr "Deze gebruiker de toegang tot deze groep ontzeggen."
 
 #. TRANS: Server error displayed when trying to block a user from a group fails because of an application error.
@@ -2942,6 +2974,7 @@ msgstr ""
 "groep."
 
 #. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
+#. TRANS: Client error displayed trying to find a user by ID without providing an ID.
 #: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr "Geen ID."
@@ -2971,7 +3004,7 @@ msgid "Unable to update your design settings."
 msgstr "Het was niet mogelijk om uw ontwerpinstellingen bij te werken."
 
 #. TRANS: Form text to confirm saved group design settings.
-#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:222
+#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:239
 msgid "Design preferences saved."
 msgstr "De ontwerpvoorkeuren zijn opgeslagen."
 
@@ -3036,7 +3069,7 @@ msgid "A list of the users in this group."
 msgstr "Ledenlijst van deze groep"
 
 #. TRANS: Indicator in group members list that this user is a group administrator.
-#: actions/groupmembers.php:190
+#: actions/groupmembers.php:190 lib/action.php:581
 msgid "Admin"
 msgstr "Beheerder"
 
@@ -3130,8 +3163,10 @@ msgid "Group search"
 msgstr "Groepen zoeken"
 
 #. TRANS: Text on page where groups can be searched if no results were found for a query.
-#: actions/groupsearch.php:82 actions/noticesearch.php:117
-#: actions/peoplesearch.php:83
+#. TRANS: Text for notice search results is the query had no results.
+#. TRANS: Message on the "People search" page where a query has no results.
+#: actions/groupsearch.php:82 actions/noticesearch.php:122
+#: actions/peoplesearch.php:87
 msgid "No results."
 msgstr "Geen resultaten."
 
@@ -3168,163 +3203,173 @@ msgid "User is not blocked from group."
 msgstr "De gebruiker is niet de toegang tot de groep ontzegd."
 
 #. TRANS: Server error displayed when unblocking a user from a group fails because of an unknown error.
+#. TRANS: Server error displayed when removing a user block.
 #: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "Er is een fout opgetreden bij het verwijderen van de blokkade."
 
 #. TRANS: Title for Instant Messaging settings.
-#: actions/imsettings.php:58
+#: actions/imsettings.php:56
 msgid "IM settings"
 msgstr "IM-instellingen"
 
 #. 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.
-#: actions/imsettings.php:71
-#, php-format
+#: actions/imsettings.php:69
+#, fuzzy, php-format
 msgid ""
-"You can send and receive notices through Jabber/Google Talk [instant "
-"messages](%%doc.im%%). Configure your address and settings below."
+"You can send and receive notices through instant messaging [instant messages]"
+"(%%doc.im%%). Configure your addresses and settings below."
 msgstr ""
 "U kunt berichten verzenden en ontvangen via [\"onmiddellijke berichten\"](%%"
 "doc.im%%) van Jabber en Google Talk. Voer hieronder uw adres in en maak uw "
 "instellingen."
 
-#. TRANS: Message given in the Instant Messaging settings if XMPP is not enabled on the site.
+#. TRANS: Message given in the IM settings if IM is not enabled on the site.
 #: actions/imsettings.php:90
 msgid "IM is not available."
 msgstr "IM is niet beschikbaar."
 
-#. TRANS: Form legend for Instant Messaging settings form.
-#. TRANS: Field label for Instant Messaging address input in Instant Messaging settings form.
-#: actions/imsettings.php:102 actions/imsettings.php:132
-msgid "IM address"
-msgstr "IM-adres"
+#: actions/imsettings.php:116
+#, fuzzy, php-format
+msgid "Current confirmed %s address."
+msgstr "Huidige bevestigde e-mailadres"
 
-#: actions/imsettings.php:109
-msgid "Current confirmed Jabber/Google Talk address."
-msgstr "Huidige bevestigde Jabber- of Google Talk-adres."
-
-#. TRANS: Form note in Instant Messaging settings form.
-#. TRANS: %s is the Instant Messaging address set for the site.
-#: actions/imsettings.php:120
-#, php-format
+#. TRANS: Form note in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:128
+#, fuzzy, php-format
 msgid ""
-"Awaiting confirmation on this address. Check your Jabber/Google Talk account "
-"for a message with further instructions. (Did you add %s to your buddy list?)"
+"Awaiting confirmation on this address. Check your %s account for a message "
+"with further instructions. (Did you add %s to your buddy list?)"
 msgstr ""
 "Er wordt gewacht op bevestiging van dit adres. Controleer uw Jabber- of "
 "Google Talk-gebruiker op een bericht met nadere instructies. Hebt u %s aan "
 "uw contactenlijst toegevoegd?"
 
-#. TRANS: IM address input field instructions in Instant Messaging settings form.
-#. TRANS: %s is the Instant Messaging address set for the site.
-#. TRANS: Do not translate "example.org". It is one of the domain names reserved for use in examples by
-#. TRANS: http://www.rfc-editor.org/rfc/rfc2606.txt. Any other domain may be owned by a legitimate
-#. TRANS: person or organization.
-#: actions/imsettings.php:139
-#, php-format
-msgid ""
-"Jabber or Google Talk address, like \"UserName@example.org\". First, make "
-"sure to add %s to your buddy list in your IM client or on Google Talk."
-msgstr ""
-"Jabber-ID of Google Talk-adres, zoals \"gebruiker@example.org\". Zorg ervoor "
-"dat u %s eerst aan uw contactenlijst in uw IM-programma of in Google Talk "
-"toevoegt."
+#: actions/imsettings.php:140
+msgid "IM address"
+msgstr "IM-adres"
 
-#. TRANS: Form legend for Instant Messaging preferences form.
-#: actions/imsettings.php:154
-msgid "IM preferences"
+#: actions/imsettings.php:142
+#, php-format
+msgid "%s screenname."
+msgstr ""
+
+#. TRANS: Header for IM preferences form.
+#: actions/imsettings.php:163
+#, fuzzy
+msgid "IM Preferences"
 msgstr "IM-voorkeuren"
 
-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:159
-msgid "Send me notices through Jabber/Google Talk."
-msgstr "Mij berichten sturen via Jabber of Google Talk."
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:174
+#, fuzzy
+msgid "Send me notices"
+msgstr "Mededeling verzenden"
 
-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:165
-msgid "Post a notice when my Jabber/Google Talk status changes."
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:176
+#, fuzzy
+msgid "Post a notice when my status changes."
 msgstr ""
 "Een mededeling verzenden als mijn Jabber- of Google Talk-status wijzigt."
 
-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:171
-msgid ""
-"Send me replies through Jabber/Google Talk from people I'm not subscribed to."
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:178
+#, fuzzy
+msgid "Send me replies from people I'm not subscribed to."
 msgstr ""
 "Mij antwoorden sturen via Jabber of Google Talk van gebruikers op wie ik "
 "niet geabonneerd ben."
 
-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:178
-msgid "Publish a MicroID for my Jabber/Google Talk address."
-msgstr "Een MicroID voor mijn Jabber- of Google Talk-adres publiceren."
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:181
+#, fuzzy
+msgid "Publish a MicroID"
+msgstr "Een MicroID voor mijn e-mailadres publiceren."
 
-#. TRANS: Confirmation message for successful Instant Messaging preferences save.
-#: actions/imsettings.php:283 actions/othersettings.php:192
+#. TRANS: Server error thrown on database error updating IM preferences.
+#: actions/imsettings.php:291
+#, fuzzy
+msgid "Couldn't update IM preferences."
+msgstr "Het was niet mogelijk de gebruiker bij te werken."
+
+#. TRANS: Confirmation message for successful IM preferences save.
+#. TRANS: Confirmation message after saving preferences.
+#: actions/imsettings.php:298 actions/urlsettings.php:244
 msgid "Preferences saved."
 msgstr "Uw voorkeuren zijn opgeslagen."
 
-#. TRANS: Message given saving Instant Messaging address without having provided one.
-#: actions/imsettings.php:304
-msgid "No Jabber ID."
-msgstr "Geen Jabber-ID."
+#. TRANS: Message given saving IM address without having provided one.
+#: actions/imsettings.php:320
+#, fuzzy
+msgid "No screenname."
+msgstr "Geen gebruikersnaam."
 
-#. TRANS: Message given saving Instant Messaging address that cannot be normalised.
-#: actions/imsettings.php:312
-msgid "Cannot normalize that Jabber ID."
+#: actions/imsettings.php:325
+#, fuzzy
+msgid "No transport."
+msgstr "Geen mededeling."
+
+#. TRANS: Message given saving IM address that cannot be normalised.
+#: actions/imsettings.php:333
+#, fuzzy
+msgid "Cannot normalize that screenname"
 msgstr "Het was niet mogelijk om het Jabber-ID te normaliseren."
 
-#. TRANS: Message given saving Instant Messaging address that not valid.
-#: actions/imsettings.php:317
-msgid "Not a valid Jabber ID."
-msgstr "Geen geldige Jabber-ID."
+#. TRANS: Message given saving IM address that not valid.
+#: actions/imsettings.php:340
+#, fuzzy
+msgid "Not a valid screenname"
+msgstr "Ongeldige gebruikersnaam!"
 
-#. TRANS: Message given saving Instant Messaging address that is already set.
-#: actions/imsettings.php:321
-msgid "That is already your Jabber ID."
-msgstr "U hebt dit al ingesteld als uw Jabber-ID."
-
-#. TRANS: Message given saving Instant Messaging address that is already set for another user.
-#: actions/imsettings.php:325
-msgid "Jabber ID already belongs to another user."
+#. TRANS: Message given saving IM address that is already set for another user.
+#: actions/imsettings.php:344
+#, fuzzy
+msgid "Screenname already belongs to another user."
 msgstr "Het Jabber-ID wordt al gebruikt door een andere gebruiker."
 
-#. TRANS: Message given saving valid Instant Messaging address that is to be confirmed.
-#. TRANS: %s is the Instant Messaging address set for the site.
-#: actions/imsettings.php:353
-#, php-format
-msgid ""
-"A confirmation code was sent to the IM address you added. You must approve %"
-"s for sending messages to you."
+#. TRANS: Message given saving valid IM address that is to be confirmed.
+#: actions/imsettings.php:369
+#, fuzzy
+msgid "A confirmation code was sent to the IM address you added."
 msgstr ""
 "Er is een bevestigingscode verstuurd naar het opgegeven IM-adres. U moet "
 "ermee akkoord gaan dat %s berichten aan u verzendt."
 
-#. TRANS: Message given canceling Instant Messaging address confirmation for the wrong IM address.
-#: actions/imsettings.php:382
+#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#: actions/imsettings.php:396
 msgid "That is the wrong IM address."
 msgstr "Dat is het verkeerde IM-adres."
 
-#. TRANS: Server error thrown on database error canceling Instant Messaging address confirmation.
-#: actions/imsettings.php:391
-msgid "Could not delete IM confirmation."
+#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#: actions/imsettings.php:405
+#, fuzzy
+msgid "Couldn't delete confirmation."
 msgstr "De IM-bevestiging kon niet verwijderd worden."
 
-#. TRANS: Message given after successfully canceling Instant Messaging address confirmation.
-#: actions/imsettings.php:396
+#. TRANS: Message given after successfully canceling IM address confirmation.
+#: actions/imsettings.php:410
 msgid "IM confirmation cancelled."
 msgstr "IM-bevestiging geannuleerd."
 
-#. TRANS: Message given trying to remove an Instant Messaging address that is not
+#. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.
-#: actions/imsettings.php:417
-msgid "That is not your Jabber ID."
-msgstr "Dit is niet uw Jabber-ID."
+#: actions/imsettings.php:434
+#, fuzzy
+msgid "That is not your screenname."
+msgstr "Dit is niet uw telefoonnummer."
+
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#: actions/imsettings.php:443
+#, fuzzy
+msgid "Couldn't update user im prefs."
+msgstr "Kan de gebruikersgegevens niet vernieuwen."
 
 #. TRANS: Message given after successfully removing a registered Instant Messaging address.
-#: actions/imsettings.php:440
+#: actions/imsettings.php:451
 msgid "The IM address was removed."
 msgstr "Het IM-adres is verwijderd."
 
@@ -3537,7 +3582,7 @@ msgid "You must be logged in to join a group."
 msgstr "U moet aangemeld zijn om lid te worden van een groep."
 
 #. TRANS: Title for join group page after joining.
-#: actions/joingroup.php:147
+#: actions/joingroup.php:148
 #, php-format
 msgctxt "TITLE"
 msgid "%1$s joined group %2$s"
@@ -3666,7 +3711,7 @@ msgstr "Een URL voor een afbeelding om weer te geven met de licentie."
 #. TRANS: Submit button title.
 #: actions/licenseadminpanel.php:311 actions/sessionsadminpanel.php:199
 #: actions/siteadminpanel.php:292 actions/snapshotadminpanel.php:245
-#: actions/tagother.php:154 lib/applicationeditform.php:357
+#: actions/tagother.php:133 lib/applicationeditform.php:357
 msgid "Save"
 msgstr "Opslaan"
 
@@ -3674,41 +3719,43 @@ msgstr "Opslaan"
 msgid "Save license settings"
 msgstr "Licentieinstellingen opslaan"
 
-#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
+#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
+#: actions/login.php:97 actions/otp.php:62 actions/register.php:130
 msgid "Already logged in."
 msgstr "U bent al aangemeld."
 
-#: actions/login.php:148
+#: actions/login.php:125
 msgid "Incorrect username or password."
 msgstr "De gebruikersnaam of wachtwoord is onjuist."
 
-#: actions/login.php:154 actions/otp.php:120
+#. TRANS: Server error displayed when a user object could not be created trying to login using "one time password login".
+#: actions/login.php:131 actions/otp.php:127
 msgid "Error setting user. You are probably not authorized."
 msgstr ""
 "Er is een fout opgetreden bij het maken van de instellingen. U hebt "
 "waarschijnlijk niet de juiste rechten."
 
-#: actions/login.php:210 actions/login.php:263
+#: actions/login.php:185 actions/login.php:236 lib/action.php:598
 msgid "Login"
 msgstr "Aanmelden"
 
-#: actions/login.php:249
+#: actions/login.php:222
 msgid "Login to site"
 msgstr "Aanmelden"
 
-#: actions/login.php:258 actions/register.php:490
+#: actions/login.php:231 actions/register.php:469
 msgid "Remember me"
 msgstr "Aanmeldgegevens onthouden"
 
-#: actions/login.php:259 actions/register.php:492
+#: actions/login.php:232 actions/register.php:471
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "Voortaan automatisch aanmelden. Niet gebruiken op gedeelde computers!"
 
-#: actions/login.php:269
+#: actions/login.php:241
 msgid "Lost or forgotten password?"
 msgstr "Wachtwoord kwijt of vergeten?"
 
-#: actions/login.php:288
+#: actions/login.php:259
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -3716,11 +3763,11 @@ msgstr ""
 "Om veiligheidsredenen moet u uw gebruikersnaam en wachtwoord nogmaals "
 "invoeren alvorens u uw instellingen kunt wijzigen."
 
-#: actions/login.php:292
+#: actions/login.php:263
 msgid "Login with your username and password."
 msgstr "Aanmelden met uw gebruikersnaam en wachtwoord."
 
-#: actions/login.php:295
+#: actions/login.php:266
 #, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -3845,7 +3892,9 @@ msgstr "Nieuw bericht"
 msgid "Notice posted"
 msgstr "De mededeling is verzonden"
 
-#: actions/noticesearch.php:68
+#. TRANS: Instructions for Notice search page.
+#. TRANS: %%site.name%% is the name of the StatusNet site.
+#: actions/noticesearch.php:69
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -3854,16 +3903,21 @@ msgstr ""
 "Zoek naar mededelingen op %%site.name%% op basis van inhoud. Scheid "
 "zoektermen met spaties. Zoektermen moeten uit drie of meer tekens bestaan."
 
-#: actions/noticesearch.php:78
+#. TRANS: Title of the page where users can search for notices.
+#: actions/noticesearch.php:80
 msgid "Text search"
 msgstr "Tekst doorzoeken"
 
-#: actions/noticesearch.php:91
+#. TRANS: Test in RSS notice search.
+#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
+#: actions/noticesearch.php:95
 #, php-format
 msgid "Search results for \"%1$s\" on %2$s"
 msgstr "Zoekresultaten voor \"%1$s\" op %2$s"
 
-#: actions/noticesearch.php:121
+#. TRANS: Text for logged in users making a query for notices without results.
+#. TRANS: This message contains a Markdown link.
+#: actions/noticesearch.php:128
 #, php-format
 msgid ""
 "Be the first to [post on this topic](%%%%action.newnotice%%%%?"
@@ -3872,7 +3926,9 @@ msgstr ""
 "U kunt de eerste zijn die een bericht plaatst in [dit onderwerp](%%%%action."
 "newnotice%%%%?status_textarea=%s)!"
 
-#: actions/noticesearch.php:124
+#. TRANS: Text for not logged in users making a query for notices without results.
+#. TRANS: This message contains Markdown links.
+#: actions/noticesearch.php:133
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and be the first to "
@@ -3882,14 +3938,17 @@ msgstr ""
 "zijn die een bericht plaatst in [dit onderwerp](%%%%action.newnotice%%%%?"
 "status_textarea=%s)!"
 
-#: actions/noticesearchrss.php:96
+#. TRANS: RSS notice search feed title. %s is the query.
+#: actions/noticesearchrss.php:95
 #, php-format
 msgid "Updates with \"%s\""
 msgstr "Updates met \"%s\""
 
-#: actions/noticesearchrss.php:98
-#, fuzzy, php-format
-msgid "Updates matching search term \"%1$s\" on %2$s!"
+#. TRANS: RSS notice search feed description.
+#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
+#: actions/noticesearchrss.php:99
+#, php-format
+msgid "Updates matching search term \"%1$s\" on %2$s."
 msgstr "Updates die overeenkomen met de zoekterm \"%1$s\" op %2$s."
 
 #: actions/nudge.php:85
@@ -3908,46 +3967,46 @@ msgid "Nudge sent!"
 msgstr "De por is verzonden!"
 
 #. TRANS: Message displayed to an anonymous user trying to view OAuth application list.
-#: actions/oauthappssettings.php:60
+#: actions/oauthappssettings.php:57
 msgid "You must be logged in to list your applications."
 msgstr ""
 "U moet aangemeld zijn om een lijst met uw applicaties te kunnen bekijken."
 
 #. TRANS: Page title for OAuth applications
-#: actions/oauthappssettings.php:76
+#: actions/oauthappssettings.php:73
 msgid "OAuth applications"
 msgstr "Overige instellingen"
 
 #. TRANS: Page instructions for OAuth applications
-#: actions/oauthappssettings.php:88
+#: actions/oauthappssettings.php:85
 msgid "Applications you have registered"
 msgstr "Door u geregistreerde applicaties"
 
 #. TRANS: Empty list message on page with OAuth applications.
-#: actions/oauthappssettings.php:141
+#: actions/oauthappssettings.php:138
 #, php-format
 msgid "You have not registered any applications yet."
 msgstr "U hebt nog geen applicaties geregistreerd."
 
 #. TRANS: Title for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:71
+#: actions/oauthconnectionssettings.php:69
 msgid "Connected applications"
 msgstr "Verbonden applicaties"
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:83
+#: actions/oauthconnectionssettings.php:80
 msgid "The following connections exist for your account."
 msgstr ""
 "U hebt de onderstaande applicaties toegang gegeven tot uw gebruikersgegevens."
 
 #. TRANS: Client error when trying to revoke access for an application while not being a user of it.
-#: actions/oauthconnectionssettings.php:168
+#: actions/oauthconnectionssettings.php:165
 msgid "You are not a user of that application."
 msgstr "U bent geen gebruiker van die applicatie."
 
 #. TRANS: Client error when revoking access has failed for some reason.
 #. TRANS: %s is the application ID revoking access failed for.
-#: actions/oauthconnectionssettings.php:183
+#: actions/oauthconnectionssettings.php:180
 #, php-format
 msgid "Unable to revoke access for application: %s."
 msgstr ""
@@ -3956,7 +4015,7 @@ msgstr ""
 
 #. TRANS: Success message after revoking access for an application.
 #. TRANS: %1$s is the application name, %2$s is the first part of the user token.
-#: actions/oauthconnectionssettings.php:202
+#: actions/oauthconnectionssettings.php:199
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -3966,7 +4025,7 @@ msgstr ""
 "ingetrokken."
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:213
+#: actions/oauthconnectionssettings.php:210
 msgid "You have not authorized any applications to use your account."
 msgstr ""
 "U hebt geen enkele applicatie geautoriseerd voor toegang tot uw "
@@ -3975,7 +4034,7 @@ msgstr ""
 #. TRANS: Note for developers in the OAuth connection settings form.
 #. TRANS: This message contains a Markdown link. Do not separate "](".
 #. TRANS: %s is the URL to the OAuth settings.
-#: actions/oauthconnectionssettings.php:233
+#: actions/oauthconnectionssettings.php:230
 #, php-format
 msgid ""
 "Are you a developer? [Register an OAuth client application](%s) to use with "
@@ -3984,6 +4043,16 @@ msgstr ""
 "Bet u ontwikkelaar? [Registreer dan een OAuthprogramma](%s) om te gebruiken "
 "met deze Statusnetsite."
 
+#: actions/oembed.php:64
+#, php-format
+msgid "\"%s\" not found."
+msgstr "\"%s\" is niet aangetroffen."
+
+#: actions/oembed.php:76
+#, php-format
+msgid "Notice %s not found."
+msgstr "Opmerking \"%s\" is niet gevonden."
+
 #: actions/oembed.php:80 actions/shownotice.php:100
 msgid "Notice has no profile."
 msgstr "Mededeling heeft geen profiel."
@@ -3993,6 +4062,16 @@ msgstr "Mededeling heeft geen profiel."
 msgid "%1$s's status on %2$s"
 msgstr "Status van %1$s op %2$s"
 
+#: actions/oembed.php:95
+#, php-format
+msgid "Attachment %s not found."
+msgstr "De bijlage %s is niet gevonden."
+
+#: actions/oembed.php:136
+#, php-format
+msgid "\"%s\" not supported for oembed requests."
+msgstr "\"%s\" wordt niet ondersteund voor oembed-verzoeken."
+
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
 #: actions/oembed.php:168
 #, php-format
@@ -4006,93 +4085,60 @@ msgid "Only %s URLs over plain HTTP please."
 msgstr "Alleen URL's voor %s via normale HTTP alstublieft."
 
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1205
-#: lib/apiaction.php:1232 lib/apiaction.php:1367
+#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1207
+#: lib/apiaction.php:1234 lib/apiaction.php:1369
 msgid "Not a supported data format."
 msgstr "Geen ondersteund gegevensformaat."
 
+#. TRANS: ShortName in the OpenSearch interface when trying to find users.
 #: actions/opensearch.php:64
 msgid "People Search"
 msgstr "Mensen zoeken"
 
-#: actions/opensearch.php:67
+#: actions/opensearch.php:68
 msgid "Notice Search"
 msgstr "Mededeling zoeken"
 
-#: actions/othersettings.php:59
-msgid "Other settings"
-msgstr "Overige instellingen"
-
-#. TRANS: Instructions for tab "Other" in user profile settings.
-#: actions/othersettings.php:71
-msgid "Manage various other options."
-msgstr "Overige instellingen beheren."
-
-#. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
-#. TRANS: user's profile settings. Use of "free" is as in "open", indicating that the
-#. TRANS: information on the shortener site is freely distributable.
-#. TRANS: This message has one space at the beginning. Use your language's word separator
-#. TRANS: here if it has one (most likely a single space).
-#: actions/othersettings.php:113
-msgid " (free service)"
-msgstr " (vrij beschikbare dienst)"
-
-#. TRANS: Label for dropdown with URL shortener services.
-#: actions/othersettings.php:122
-msgid "Shorten URLs with"
-msgstr "URL's inkorten met"
-
-#. TRANS: Tooltip for for dropdown with URL shortener services.
-#: actions/othersettings.php:124
-msgid "Automatic shortening service to use."
-msgstr "Te gebruiken automatische verkortingsdienst."
-
-#. TRANS: Label for checkbox.
-#: actions/othersettings.php:130
-msgid "View profile designs"
-msgstr "Profielontwerpen gebruiken"
-
-#. TRANS: Tooltip for checkbox.
-#: actions/othersettings.php:132
-msgid "Show or hide profile designs."
-msgstr "Profielontwerpen weergeven of verbergen"
-
-#. TRANS: Form validation error for form "Other settings" in user profile.
-#: actions/othersettings.php:164
-msgid "URL shortening service is too long (maximum 50 characters)."
-msgstr "De URL voor de verkortingdienst is te lang (maximaal 50 tekens)."
-
-#: actions/otp.php:69
+#. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
+#: actions/otp.php:70
 msgid "No user ID specified."
 msgstr "Er is geen ID opgegeven."
 
-#: actions/otp.php:83
+#. TRANS: Client error displayed trying to use "one time password login" without specifying a login token.
+#: actions/otp.php:86
 msgid "No login token specified."
 msgstr "Er is geen token opgegeven."
 
-#: actions/otp.php:90
+#. TRANS: Client error displayed trying to use "one time password login" without requesting a login token.
+#: actions/otp.php:94
 msgid "No login token requested."
 msgstr "Er is niet om een aanmeldtoken gevraagd."
 
-#: actions/otp.php:95
+#. TRANS: Client error displayed trying to use "one time password login" while specifying an invalid login token.
+#: actions/otp.php:100
 msgid "Invalid login token specified."
 msgstr "Het opgegeven token is ongeldig."
 
-#: actions/otp.php:104
+#. TRANS: Client error displayed trying to use "one time password login" while specifying an expired login token.
+#: actions/otp.php:110
 msgid "Login token expired."
 msgstr "Het aanmeldtoken is verlopen."
 
-#: actions/outbox.php:58
+#. TRANS: Title for outbox for any but the fist page.
+#. TRANS: %1$s is the user nickname, %2$d is the page number.
+#: actions/outbox.php:57
 #, php-format
 msgid "Outbox for %1$s - page %2$d"
 msgstr "Postvak UIT voor %1$s - pagina %2$d"
 
+#. TRANS: Title for first page of outbox.
 #: actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
 msgstr "Postvak UIT voor %s"
 
-#: actions/outbox.php:104
+#. TRANS: Instructions for outbox.
+#: actions/outbox.php:103
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr "Dit is uw Postvak UIT waarin de door u verzonden privéberichten staan."
 
@@ -4118,43 +4164,42 @@ msgstr "Huidige wachtwoord"
 msgid "New password"
 msgstr "Nieuw wachtwoord"
 
-#: actions/passwordsettings.php:109
-#, fuzzy
-msgid "6 or more characters"
+#: actions/passwordsettings.php:109 actions/register.php:416
+msgid "6 or more characters."
 msgstr "Zes of meer tekens"
 
-#: actions/passwordsettings.php:113
-#, fuzzy
-msgid "Same as password above"
+#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#: actions/passwordsettings.php:113 actions/recoverpassword.php:264
+#: actions/register.php:420
+msgid "Same as password above."
 msgstr "Gelijk aan het wachtwoord hierboven."
 
 #: actions/passwordsettings.php:117
 msgid "Change"
 msgstr "Wijzigen"
 
-#: actions/passwordsettings.php:154 actions/register.php:238
+#: actions/passwordsettings.php:153 actions/register.php:223
 msgid "Password must be 6 or more characters."
 msgstr "Het wachtwoord moet zes of meer tekens bevatten."
 
-#: actions/passwordsettings.php:157 actions/register.php:241
+#: actions/passwordsettings.php:156 actions/register.php:226
 msgid "Passwords don't match."
 msgstr "De wachtwoorden komen niet overeen."
 
-#: actions/passwordsettings.php:165
+#: actions/passwordsettings.php:164
 msgid "Incorrect old password"
 msgstr "Het oude wachtwoord is onjuist"
 
-#: actions/passwordsettings.php:181
+#: actions/passwordsettings.php:180
 msgid "Error saving user; invalid."
 msgstr "Fout bij opslaan gebruiker; ongeldig."
 
-#: actions/passwordsettings.php:186
-#, fuzzy
-msgid "Can't save new password."
+#. TRANS: Reset password form validation error message.
+#: actions/passwordsettings.php:185 actions/recoverpassword.php:418
+msgid "Cannot save new password."
 msgstr "Het was niet mogelijk het nieuwe wachtwoord op te slaan."
 
-#. TRANS: Title for password recovery page in password saved mode.
-#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
+#: actions/passwordsettings.php:191
 msgid "Password saved."
 msgstr "Het wachtwoord is opgeslagen."
 
@@ -4359,8 +4404,7 @@ msgid "Directory where backgrounds are located."
 msgstr "Map waar achtergronden worden opgeslagen."
 
 #. TRANS: Fieldset legens in Paths admin panel.
-#. TRANS: DT element label in attachment list.
-#: actions/pathsadminpanel.php:419 lib/attachmentlist.php:98
+#: actions/pathsadminpanel.php:419
 msgid "Attachments"
 msgstr "Bijlagen"
 
@@ -4428,7 +4472,9 @@ msgstr "De server waar SSL-verzoeken heen gestuurd moeten worden."
 msgid "Save paths"
 msgstr "Opslagpaden"
 
-#: actions/peoplesearch.php:52
+#. TRANS: Instructions for the "People search" page.
+#. TRANS: %%site.name%% is the name of the StatusNet site.
+#: actions/peoplesearch.php:54
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
@@ -4438,7 +4484,8 @@ msgstr ""
 "interesses. Scheid de zoektermen met spaties. Zoektermen moeten uit drie of "
 "meer tekens bestaan."
 
-#: actions/peoplesearch.php:58
+#. TRANS: Title of a page where users can search for other users.
+#: actions/peoplesearch.php:61
 msgid "People search"
 msgstr "Gebruikers zoeken"
 
@@ -4452,6 +4499,60 @@ msgstr "Geen geldig gebruikerslabel: %s."
 msgid "Users self-tagged with %1$s - page %2$d"
 msgstr "Gebruikers die zichzelf met %1$s hebben gelabeld - pagina %2$d"
 
+#. TRANS: Page title for AJAX form return when a disabling a plugin.
+#: actions/plugindisable.php:69
+msgctxt "plugin"
+msgid "Disabled"
+msgstr ""
+
+#. TRANS: Client error displayed trying to perform any request method other than POST.
+#. TRANS: Do not translate POST.
+#: actions/pluginenable.php:78 actions/subscribe.php:77
+msgid "This action only accepts POST requests."
+msgstr "Deze handeling accepteert alleen POST-verzoeken."
+
+#: actions/pluginenable.php:102
+#, fuzzy
+msgid "You cannot administer plugins."
+msgstr "U kunt gebruikers niet verwijderen."
+
+#: actions/pluginenable.php:109
+#, fuzzy
+msgid "No such plugin."
+msgstr "Deze pagina bestaat niet."
+
+#. TRANS: Page title for AJAX form return when enabling a plugin.
+#: actions/pluginenable.php:159
+msgctxt "plugin"
+msgid "Enabled"
+msgstr ""
+
+#. TRANS: Tab and title for plugins admin panel.
+#. TRANS: Menu item for site administration
+#: actions/pluginsadminpanel.php:56 actions/version.php:191
+#: lib/adminpanelaction.php:411
+msgid "Plugins"
+msgstr "Plug-ins"
+
+#. TRANS: Instructions at top of plugin admin page.
+#: actions/pluginsadminpanel.php:68
+msgid ""
+"Additional plugins can be enabled and configured manually. See the <a href="
+"\"http://status.net/wiki/Plugins\">online plugin documentation</a> for more "
+"details."
+msgstr ""
+
+#. TRANS: Admin form section header
+#: actions/pluginsadminpanel.php:84
+#, fuzzy
+msgid "Default plugins"
+msgstr "Standaardtaal"
+
+#: actions/pluginsadminpanel.php:106
+msgid ""
+"All default plugins have been disabled from the site's configuration file."
+msgstr ""
+
 #: actions/postnotice.php:95
 msgid "Invalid notice content."
 msgstr "Ongeldige mededelinginhoud."
@@ -4464,12 +4565,12 @@ msgstr ""
 "van deze site."
 
 #. TRANS: Page title for profile settings.
-#: actions/profilesettings.php:59
+#: actions/profilesettings.php:60
 msgid "Profile settings"
 msgstr "Profielinstellingen"
 
 #. TRANS: Usage instructions for profile settings.
-#: actions/profilesettings.php:70
+#: actions/profilesettings.php:71
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
@@ -4477,40 +4578,37 @@ msgstr ""
 "andere gebruikers."
 
 #. TRANS: Profile settings form legend.
-#: actions/profilesettings.php:98
+#: actions/profilesettings.php:99
 msgid "Profile information"
 msgstr "Profielinformatie"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109 actions/register.php:433
+#: actions/profilesettings.php:110 actions/register.php:412
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr "1-64 kleine letters of cijfers, geen leestekens of spaties."
 
 #. TRANS: Field label in form for profile settings.
-#. TRANS: Label for full group name (dt). Text hidden by default.
-#. TRANS: DT for full name in a profile.
-#: actions/profilesettings.php:113 actions/register.php:455
-#: actions/showgroup.php:255 actions/tagother.php:104
-#: lib/groupeditform.php:150 lib/userprofile.php:156
+#: actions/profilesettings.php:114 actions/register.php:434
+#: lib/groupeditform.php:150
 msgid "Full name"
 msgstr "Volledige naam"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:118 actions/register.php:460
+#: actions/profilesettings.php:119 actions/register.php:439
 #: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "Startpagina"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:121
+#: actions/profilesettings.php:122 actions/register.php:441
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr "De URL van uw thuispagina, blog of profiel bij een andere website."
 
 #. TRANS: Tooltip for field label in form for profile settings. Plural
 #. TRANS: is decided by the number of characters available for the
 #. TRANS: biography (%d).
-#: actions/profilesettings.php:129 actions/register.php:471
+#: actions/profilesettings.php:130 actions/register.php:450
 #, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4518,79 +4616,72 @@ msgstr[0] "Beschrijf uzelf en uw interesses in %d teken"
 msgstr[1] "Beschrijf uzelf en uw interesses in %d tekens"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:135 actions/register.php:476
+#: actions/profilesettings.php:136 actions/register.php:455
 msgid "Describe yourself and your interests"
 msgstr "Beschrijf uzelf en uw interesses"
 
 #. TRANS: Text area label in form for profile settings where users can provide.
 #. TRANS: their biography.
-#: actions/profilesettings.php:139 actions/register.php:478
+#: actions/profilesettings.php:140 actions/register.php:457
 msgid "Bio"
 msgstr "Beschrijving"
 
 #. TRANS: Field label in form for profile settings.
-#. TRANS: Label for group location (dt). Text hidden by default.
-#. TRANS: DT for location in a profile.
-#: actions/profilesettings.php:145 actions/register.php:483
-#: actions/showgroup.php:265 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:173
-#: lib/userprofile.php:172
+#: actions/profilesettings.php:146 actions/register.php:462
+#: lib/groupeditform.php:173
 msgid "Location"
 msgstr "Locatie"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148 actions/register.php:485
+#: actions/profilesettings.php:149
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Waar u bent, bijvoorbeeld \"woonplaats, land\" of \"postcode, land\""
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:153
+#: actions/profilesettings.php:154
 msgid "Share my current location when posting notices"
 msgstr "Mijn huidige locatie weergeven bij het plaatsen van mededelingen"
 
 #. TRANS: Field label in form for profile settings.
-#. TRANS: DT for tags in a profile.
-#: actions/profilesettings.php:161 actions/tagother.php:149
-#: actions/tagother.php:209 lib/subscriptionlist.php:106
-#: lib/subscriptionlist.php:108 lib/userprofile.php:220
+#: actions/profilesettings.php:162 actions/tagother.php:128
+#: actions/tagother.php:188 lib/subscriptionlist.php:104
+#: lib/subscriptionlist.php:106
 msgid "Tags"
 msgstr "Labels"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:164
-#, fuzzy
+#: actions/profilesettings.php:165
 msgid ""
-"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- "
+"separated."
 msgstr ""
 "Eigen labels (letter, getallen, -, ., en _). Gescheiden door komma's of "
 "spaties."
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:169
+#: actions/profilesettings.php:170
 msgid "Language"
 msgstr "Taal"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:171
-#, fuzzy
-msgid "Preferred language"
+#: actions/profilesettings.php:172
+msgid "Preferred language."
 msgstr "Uw voorkeurstaal."
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:181
+#: actions/profilesettings.php:182
 msgid "Timezone"
 msgstr "Tijdzone"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:183
+#: actions/profilesettings.php:184
 msgid "What timezone are you normally in?"
 msgstr "In welke tijdzone verblijft u meestal?"
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:189
-#, fuzzy
+#: actions/profilesettings.php:190
 msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)"
+"Automatically subscribe to whoever subscribes to me (best for non-humans)."
 msgstr ""
 "Automatisch abonneren bij abonnement op mij (beste voor automatische "
 "processen)."
@@ -4598,7 +4689,7 @@ msgstr ""
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Plural form is used based on the maximum number of allowed
 #. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:258 actions/register.php:229
+#: actions/profilesettings.php:259 actions/register.php:214
 #, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4606,49 +4697,49 @@ msgstr[0] "De persoonlijke beschrijving is te lang (maximaal %d teken)."
 msgstr[1] "De persoonlijke beschrijving is te lang (maximaal %d tekens)."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:269 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:270 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr "Er is geen tijdzone geselecteerd."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:277
+#: actions/profilesettings.php:278
 msgid "Language is too long (maximum 50 characters)."
 msgstr "De taal is te lang (maximaal 50 tekens)."
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:291 actions/tagother.php:178
+#: actions/profilesettings.php:292
 #, php-format
-msgid "Invalid tag: \"%s\""
-msgstr "Ongeldig label: '%s'"
+msgid "Invalid tag: \"%s\"."
+msgstr "Ongeldig label: \"%s\"."
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:347
+#: actions/profilesettings.php:348
 msgid "Could not update user for autosubscribe."
 msgstr ""
 "Het was niet mogelijk de instelling voor automatisch abonneren voor de "
 "gebruiker bij te werken."
 
 #. TRANS: Server error thrown when user profile location preference settings could not be updated.
-#: actions/profilesettings.php:405
+#: actions/profilesettings.php:406
 msgid "Could not save location prefs."
 msgstr "Het was niet mogelijk de locatievoorkeuren op te slaan."
 
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:427 actions/tagother.php:200
+#: actions/profilesettings.php:428 actions/tagother.php:179
 msgid "Could not save tags."
 msgstr "Het was niet mogelijk de labels op te slaan."
 
 #. TRANS: Confirmation shown when user profile settings are saved.
 #. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:436 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:437 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "De instellingen zijn opgeslagen."
 
 #. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
 #. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:483 actions/restoreaccount.php:60
+#: actions/profilesettings.php:484 actions/restoreaccount.php:60
 msgid "Restore account"
 msgstr "Gebruiker terugladen van back-up"
 
@@ -4727,6 +4818,12 @@ msgstr ""
 "Micro-blogging) gebaseerd op de Vrije Software [StatusNet](http://status."
 "net/)"
 
+#. TRANS: Public RSS feed description. %s is the StatusNet site name.
+#: actions/publicrss.php:106
+#, php-format
+msgid "%s updates from everyone."
+msgstr "%s updates van iedereen."
+
 #. TRANS: Title for public tag cloud.
 #: actions/publictagcloud.php:57
 msgid "Public tag cloud"
@@ -4768,10 +4865,6 @@ msgstr ""
 "U kunt een [gebruiker registeren](%%action.register%%) en dan de eerste zijn "
 "die er een plaatst!"
 
-#: actions/publictagcloud.php:146
-msgid "Tag cloud"
-msgstr "Woordwolk"
-
 #. TRANS: Client error displayed trying to recover password while already logged in.
 #: actions/recoverpassword.php:37
 msgid "You are already logged in!"
@@ -4865,6 +4958,11 @@ msgstr "Wachtwoord herstellen"
 msgid "Password recovery requested"
 msgstr "Wachtwoordherstel aangevraagd"
 
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/recoverpassword.php:229
+msgid "Password saved"
+msgstr "Het wachtwoord is opgeslagen"
+
 #. TRANS: Title for password recovery page when an unknown action has been specified.
 #: actions/recoverpassword.php:232
 msgid "Unknown action"
@@ -4875,14 +4973,9 @@ msgstr "Onbekende handeling"
 msgid "6 or more characters, and do not forget it!"
 msgstr "Zes of meer tekens, en vergeet uw wachtwoord niet!"
 
-#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
-#: actions/recoverpassword.php:264 actions/register.php:441
-msgid "Same as password above."
-msgstr "Gelijk aan het wachtwoord hierboven."
-
 #. TRANS: Button text for password reset form.
 #. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: actions/recoverpassword.php:268 lib/designsettings.php:264
+#: actions/recoverpassword.php:268 lib/designform.php:145
 msgctxt "BUTTON"
 msgid "Reset"
 msgstr "Opnieuw instellen"
@@ -4933,13 +5026,8 @@ msgstr "Het wachtwoord moet uit zes of meer tekens bestaan."
 msgid "Password and confirmation do not match."
 msgstr "Het wachtwoord en de bevestiging komen niet overeen."
 
-#. TRANS: Reset password form validation error message.
-#: actions/recoverpassword.php:418
-msgid "Cannot save new password."
-msgstr "Het was niet mogelijk het nieuwe wachtwoord op te slaan."
-
 #. TRANS: Server error displayed when something does wrong with the user object during password reset.
-#: actions/recoverpassword.php:426 actions/register.php:256
+#: actions/recoverpassword.php:426 actions/register.php:241
 msgid "Error setting user."
 msgstr "Er is een fout opgetreden tijdens het instellen van de gebruiker."
 
@@ -4948,97 +5036,97 @@ msgstr "Er is een fout opgetreden tijdens het instellen van de gebruiker."
 msgid "New password successfully saved. You are now logged in."
 msgstr "Het nieuwe wachtwoord is opgeslagen. U bent nu aangemeld."
 
-#: actions/register.php:92 actions/register.php:196 actions/register.php:413
+#: actions/redirecturl.php:70
+#, fuzzy
+msgid "No id parameter"
+msgstr "Geen ID-argument."
+
+#: actions/redirecturl.php:76
+#, fuzzy, php-format
+msgid "No such file \"%d\""
+msgstr "Het bestand bestaat niet."
+
+#: actions/register.php:80 actions/register.php:181 actions/register.php:392
 msgid "Sorry, only invited people can register."
 msgstr "U kunt zich alleen registreren als u wordt uitgenodigd."
 
-#: actions/register.php:99
+#: actions/register.php:87
 msgid "Sorry, invalid invitation code."
 msgstr "Sorry. De uitnodigingscode is ongeldig."
 
-#: actions/register.php:119
+#: actions/register.php:106
 msgid "Registration successful"
 msgstr "De registratie is voltooid"
 
-#: actions/register.php:121 actions/register.php:511
+#: actions/register.php:108 actions/register.php:490
 msgid "Register"
 msgstr "Registreren"
 
-#: actions/register.php:142
+#: actions/register.php:128
 msgid "Registration not allowed."
 msgstr "Registratie is niet toegestaan."
 
-#: actions/register.php:209
-#, fuzzy
-msgid "You can't register if you don't agree to the license."
+#: actions/register.php:194
+msgid "You cannot register if you don't agree to the license."
 msgstr "U kunt zich niet registreren als u niet akkoord gaat met de licentie."
 
-#: actions/register.php:218
+#: actions/register.php:203
 msgid "Email address already exists."
 msgstr "Het e-mailadres bestaat al."
 
-#: actions/register.php:251 actions/register.php:273
+#: actions/register.php:236 actions/register.php:258
 msgid "Invalid username or password."
 msgstr "Ongeldige gebruikersnaam of wachtwoord."
 
-#: actions/register.php:351
-#, fuzzy
+#: actions/register.php:333
 msgid ""
 "With this form you can create a new account. You can then post notices and "
-"link up to friends and colleagues. "
+"link up to friends and colleagues."
 msgstr ""
 "Via dit formulier kunt u een nieuwe gebruiker aanmaken. Daarna kunt u "
 "mededelingen uitsturen en contact maken met vrienden en collega's."
 
-#: actions/register.php:437
-msgid "6 or more characters."
-msgstr "Zes of meer tekens"
-
-#. TRANS: Link description in user account settings menu.
-#: actions/register.php:445 actions/register.php:449
-#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
+#: actions/register.php:424 actions/register.php:428
+#: actions/siteadminpanel.php:238 lib/settingsnav.php:92
 msgid "Email"
 msgstr "E-mail"
 
-#: actions/register.php:446 actions/register.php:450
-#, fuzzy
-msgid "Used only for updates, announcements, and password recovery"
+#: actions/register.php:425 actions/register.php:429
+msgid "Used only for updates, announcements, and password recovery."
 msgstr "Alleen gebruikt voor updates, aankondigingen en wachtwoordherstel."
 
-#: actions/register.php:457
-#, fuzzy
-msgid "Longer name, preferably your \"real\" name"
+#: actions/register.php:436
+msgid "Longer name, preferably your \"real\" name."
 msgstr "Een langere naam, mogelijk uw echte naam."
 
-#: actions/register.php:462
-#, fuzzy
-msgid "URL of your homepage, blog, or profile on another site"
-msgstr "De URL van uw thuispagina, blog of profiel bij een andere website."
+#: actions/register.php:464
+msgid "Where you are, like \"City, State (or Region), Country\"."
+msgstr "Waar u bent, bijvoorbeeld \"woonplaats, land\" of \"postcode, land\"."
 
-#: actions/register.php:523
+#: actions/register.php:503
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
 msgstr ""
 "Ik begrijp dat inhoud en gegevens van %1$s persoonlijk en vertrouwelijk zijn."
 
-#: actions/register.php:533
+#: actions/register.php:513
 #, php-format
 msgid "My text and files are copyright by %1$s."
 msgstr "Voor mijn teksten en bestanden rust het auteursrecht bij %1$s."
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:537
+#: actions/register.php:517
 msgid "My text and files remain under my own copyright."
 msgstr "Ik ben de rechthebbende voor mijn teksten en bestanden."
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:540
+#: actions/register.php:520
 msgid "All rights reserved."
 msgstr "Alle rechten voorbehouden."
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:545
+#: actions/register.php:525
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -5047,7 +5135,7 @@ msgstr ""
 "Mijn teksten en bestanden zijn beschikbaar onder %s, behalve de volgende "
 "privégegevens: wachtwoord, e-mailadres, IM-adres, telefoonnummer."
 
-#: actions/register.php:588
+#: actions/register.php:566
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -5081,7 +5169,7 @@ msgstr ""
 "Dank u wel voor het registreren en we hopen dat deze dienst u biedt wat u "
 "ervan verwacht."
 
-#: actions/register.php:612
+#: actions/register.php:590
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5114,8 +5202,7 @@ msgid "User nickname"
 msgstr "Gebruikersnaam"
 
 #: actions/remotesubscribe.php:129
-#, fuzzy
-msgid "Nickname of the user you want to follow"
+msgid "Nickname of the user you want to follow."
 msgstr "Gebruikersnaam van de gebruiker waarop u wilt abonneren."
 
 #: actions/remotesubscribe.php:132
@@ -5123,19 +5210,17 @@ msgid "Profile URL"
 msgstr "Profiel-URL"
 
 #: actions/remotesubscribe.php:133
-#, fuzzy
-msgid "URL of your profile on another compatible microblogging service"
+msgid "URL of your profile on another compatible microblogging service."
 msgstr "De URL van uw profiel bij een andere, compatibele microblogdienst."
 
 #. TRANS: Link text for link that will subscribe to a remote profile.
 #: actions/remotesubscribe.php:136 lib/subscribeform.php:139
-#: lib/userprofile.php:431
+#: lib/userprofile.php:402
 msgid "Subscribe"
 msgstr "Abonneren"
 
 #: actions/remotesubscribe.php:158
-#, fuzzy
-msgid "Invalid profile URL (bad format)"
+msgid "Invalid profile URL (bad format)."
 msgstr "Ongeldige profiel-URL (foutieve opmaak)."
 
 #: actions/remotesubscribe.php:167
@@ -5168,7 +5253,7 @@ msgstr "U kunt uw eigen mededeling niet herhalen."
 msgid "You already repeated that notice."
 msgstr "U hent die mededeling al herhaald."
 
-#: actions/repeat.php:112 lib/noticelist.php:692
+#: actions/repeat.php:112 lib/noticelist.php:697
 msgid "Repeated"
 msgstr "Herhaald"
 
@@ -5176,9 +5261,9 @@ msgstr "Herhaald"
 msgid "Repeated!"
 msgstr "Herhaald!"
 
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing @-replies.
+#. TRANS: RSS reply feed title. %s is a user nickname.
 #: actions/replies.php:126 actions/repliesrss.php:68
-#: lib/personalgroupnav.php:109
+#: lib/personalgroupnav.php:105
 #, php-format
 msgid "Replies to %s"
 msgstr "Antwoorden aan %s"
@@ -5230,9 +5315,11 @@ msgstr ""
 "U kunt proberen [%1$s te porren](../%2$s) of [een bericht voor die gebruiker "
 "plaatsen](%%%%action.newnotice%%%%?status_textarea=%3$s)."
 
-#: actions/repliesrss.php:72
-#, fuzzy, php-format
-msgid "Replies to %1$s on %2$s!"
+#. TRANS: RSS reply feed description.
+#. TRANS: %1$s is a user nickname, %2$s is the StatusNet site name.
+#: actions/repliesrss.php:74
+#, php-format
+msgid "Replies to %1$s on %2$s."
 msgstr "Antwoorden aan %1$s op %2$s."
 
 #. TRANS: Client exception displayed when trying to restore an account while not logged in.
@@ -5336,7 +5423,7 @@ msgstr "U kunt geen gebruikersrollen intrekken op deze website."
 msgid "User doesn't have this role."
 msgstr "Deze gebruiker heeft deze rol niet."
 
-#: actions/rsd.php:146 actions/version.php:159
+#: actions/rsd.php:142 actions/version.php:159
 msgid "StatusNet"
 msgstr "StatusNet"
 
@@ -5378,87 +5465,38 @@ msgstr "Debuguitvoer voor sessies inschakelen."
 msgid "Save site settings"
 msgstr "Websiteinstellingen opslaan"
 
-#: actions/showapplication.php:82
+#: actions/showapplication.php:78
 msgid "You must be logged in to view an application."
 msgstr "U moet aangemeld zijn om een applicatie te kunnen bekijken."
 
-#: actions/showapplication.php:157
+#: actions/showapplication.php:151
 msgid "Application profile"
 msgstr "Applicatieprofiel"
 
-#. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:159 lib/applicationeditform.php:177
-msgid "Icon"
-msgstr "Icoon"
-
-#. TRANS: Form input field label for application name.
-#: actions/showapplication.php:169 actions/version.php:197
-#: lib/applicationeditform.php:190
-msgid "Name"
-msgstr "Naam"
-
-#. TRANS: Form input field label.
-#: actions/showapplication.php:178 lib/applicationeditform.php:227
-msgid "Organization"
-msgstr "Organisatie"
-
-#. TRANS: Form input field label.
-#: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:168
-msgid "Description"
-msgstr "Beschrijving"
-
-#. TRANS: Header for group statistics on a group page (h2).
-#. TRANS: H2 text for user statistics.
-#: actions/showapplication.php:192 actions/showgroup.php:460
-#: lib/profileaction.php:205
-msgid "Statistics"
-msgstr "Statistieken"
-
-#: actions/showapplication.php:203
+#: actions/showapplication.php:179
 #, php-format
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr "Aangemaakt door %1$s - standaardtoegang \"%2$s\" - %3$d gebruikers"
 
-#: actions/showapplication.php:213
+#: actions/showapplication.php:189
 msgid "Application actions"
 msgstr "Applicatiehandelingen"
 
-#: actions/showapplication.php:236
+#: actions/showapplication.php:212
 msgid "Reset key & secret"
 msgstr "Sleutel en wachtwoord op nieuw instellen"
 
 #. TRANS: Title of form for deleting a user.
-#: actions/showapplication.php:252 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:64 lib/noticelist.php:673
+#: actions/showapplication.php:228 lib/deletegroupform.php:121
+#: lib/deleteuserform.php:64 lib/noticelist.php:678
 msgid "Delete"
 msgstr "Verwijderen"
 
-#: actions/showapplication.php:261
+#: actions/showapplication.php:237
 msgid "Application info"
 msgstr "Applicatieinformatie"
 
-#: actions/showapplication.php:263
-msgid "Consumer key"
-msgstr "Gebruikerssleutel"
-
-#: actions/showapplication.php:268
-msgid "Consumer secret"
-msgstr "Gebruikersgeheim"
-
-#: actions/showapplication.php:273
-msgid "Request token URL"
-msgstr "URL voor verzoektoken"
-
-#: actions/showapplication.php:278
-msgid "Access token URL"
-msgstr "URL voor toegangstoken"
-
-#: actions/showapplication.php:283
-msgid "Authorize URL"
-msgstr "Autorisatie-URL"
-
-#: actions/showapplication.php:288
+#: actions/showapplication.php:255
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
@@ -5466,7 +5504,7 @@ msgstr ""
 "Opmerking: HMAC-SHA1 ondertekening wordt ondersteund. Ondertekening in "
 "platte tekst is niet mogelijk."
 
-#: actions/showapplication.php:309
+#: actions/showapplication.php:275
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr ""
 "Weet u zeker dat u uw gebruikerssleutel en geheime code wilt verwijderen?"
@@ -5555,61 +5593,47 @@ msgstr "%s groep"
 msgid "%1$s group, page %2$d"
 msgstr "Groep %1$s, pagina %2$d"
 
-#. TRANS: Group profile header (h2). Text hidden by default.
-#: actions/showgroup.php:223
-msgid "Group profile"
-msgstr "Groepsprofiel"
-
-#. TRANS: Label for group URL (dt). Text hidden by default.
-#. TRANS: DT for URL in a profile.
-#: actions/showgroup.php:273 actions/tagother.php:118
-#: actions/userauthorization.php:175 lib/userprofile.php:186
-msgid "URL"
-msgstr "URL"
-
 #. TRANS: Label for group description or group note (dt). Text hidden by default.
-#. TRANS: DT for note in a profile.
-#: actions/showgroup.php:285 actions/tagother.php:128
-#: actions/userauthorization.php:187 lib/userprofile.php:204
+#: actions/showgroup.php:266
 msgid "Note"
 msgstr "Opmerking"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:296 lib/groupeditform.php:180
+#: actions/showgroup.php:277 lib/groupeditform.php:180
 msgid "Aliases"
 msgstr "Aliassen"
 
 #. TRANS: Group actions header (h2). Text hidden by default.
-#: actions/showgroup.php:313
+#: actions/showgroup.php:294
 msgid "Group actions"
 msgstr "Groepshandelingen"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:357
+#: actions/showgroup.php:338
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
 msgstr "Mededelingenfeed voor groep %s (RSS 1.0)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:364
+#: actions/showgroup.php:345
 #, php-format
 msgid "Notice feed for %s group (RSS 2.0)"
 msgstr "Mededelingenfeed voor groep %s (RSS 2.0)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:371
+#: actions/showgroup.php:352
 #, php-format
 msgid "Notice feed for %s group (Atom)"
 msgstr "Mededelingenfeed voor groep %s (Atom)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:377
+#: actions/showgroup.php:358
 #, php-format
 msgid "FOAF for %s group"
 msgstr "Vriend van een vriend voor de groep %s"
 
 #. TRANS: Header for mini list of group members on a group page (h2).
-#: actions/showgroup.php:414
+#: actions/showgroup.php:395
 msgid "Members"
 msgstr "Leden"
 
@@ -5617,25 +5641,30 @@ msgstr "Leden"
 #. TRANS: Text for user subscription statistics if the user has no subscriptions.
 #. TRANS: Text for user subscriber statistics if user has no subscribers.
 #. TRANS: Text for user user group membership statistics if user is not a member of any group.
-#: actions/showgroup.php:420 lib/profileaction.php:137
+#: actions/showgroup.php:401 lib/profileaction.php:137
 #: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
-#: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
+#: lib/subscriptionlist.php:123 lib/tagcloudsection.php:71
 msgid "(None)"
 msgstr "(geen)"
 
 #. TRANS: Link to all group members from mini list of group members if group has more than n members.
-#: actions/showgroup.php:429
+#: actions/showgroup.php:410
 msgid "All members"
 msgstr "Alle leden"
 
-#. TRANS: Label for creation date in statistics on group page.
-#: actions/showgroup.php:465
+#. TRANS: Header for group statistics on a group page (h2).
+#. TRANS: H2 text for user statistics.
+#: actions/showgroup.php:441 lib/profileaction.php:205
+msgid "Statistics"
+msgstr "Statistieken"
+
+#: actions/showgroup.php:444
 msgctxt "LABEL"
 msgid "Created"
 msgstr "Aangemaakt"
 
 #. TRANS: Label for member count in statistics on group page.
-#: actions/showgroup.php:473
+#: actions/showgroup.php:449
 msgctxt "LABEL"
 msgid "Members"
 msgstr "Leden"
@@ -5644,7 +5673,7 @@ msgstr "Leden"
 #. TRANS: **%s** is the group alias, %%%%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).
-#: actions/showgroup.php:488
+#: actions/showgroup.php:464
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5663,7 +5692,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: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
-#: actions/showgroup.php:498
+#: actions/showgroup.php:474
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5677,7 +5706,7 @@ msgstr ""
 "over hun ervaringen en interesses. "
 
 #. TRANS: Header for list of group administrators on a group page (h2).
-#: actions/showgroup.php:527
+#: actions/showgroup.php:503
 msgid "Admins"
 msgstr "Beheerders"
 
@@ -5716,7 +5745,7 @@ msgid "%1$s tagged %2$s"
 msgstr "%2$s gelabeld door %1$s"
 
 #. TRANS: Page title showing tagged notices in one user's stream.
-#. TRANS: %1$s is the username, %2$s is the hash tag, %1$d is the page number.
+#. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
 #: actions/showstream.php:74
 #, php-format
 msgid "%1$s tagged %2$s, page %3$d"
@@ -5763,14 +5792,14 @@ msgid "FOAF for %s"
 msgstr "Vriend van een vriend (FOAF) voor %s"
 
 #. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
-#: actions/showstream.php:211
+#: actions/showstream.php:205
 #, php-format
 msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr ""
 "Dit is de tijdlijn voor %1$s, maar %1$s heeft nog geen berichten verzonden."
 
 #. TRANS: Second sentence of empty list message for a stream for the user themselves.
-#: actions/showstream.php:217
+#: actions/showstream.php:211
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
@@ -5780,7 +5809,7 @@ msgstr ""
 
 #. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:221
+#: actions/showstream.php:215
 #, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
@@ -5791,7 +5820,7 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:264
+#: actions/showstream.php:258
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5807,7 +5836,7 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:271
+#: actions/showstream.php:265
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5819,7 +5848,7 @@ msgstr ""
 "[StatusNet](http://status.net/). "
 
 #. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
-#: actions/showstream.php:328
+#: actions/showstream.php:322
 #, php-format
 msgid "Repeat of %s"
 msgstr "Herhaald van %s"
@@ -5972,76 +6001,74 @@ msgstr ""
 
 #. TRANS: Title for button to save site notice in admin panel.
 #: actions/sitenoticeadminpanel.php:201
-#, fuzzy
-msgid "Save site notice"
+msgid "Save site notice."
 msgstr "Websitebrede mededeling opslaan."
 
 #. TRANS: Title for SMS settings.
-#: actions/smssettings.php:57
+#: actions/smssettings.php:56
 msgid "SMS settings"
 msgstr "SMS-instellingen"
 
 #. TRANS: SMS settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/smssettings.php:71
+#: actions/smssettings.php:70
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr "U kunt SMS-berichten per e-mail ontvangen van %%site.name%%."
 
 #. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
-#: actions/smssettings.php:93
+#: actions/smssettings.php:92
 msgid "SMS is not available."
 msgstr "SMS is niet beschikbaar."
 
 #. TRANS: Form legend for SMS settings form.
-#: actions/smssettings.php:107
+#: actions/smssettings.php:106
 msgid "SMS address"
 msgstr "SMS-adres"
 
 #. TRANS: Form guide in SMS settings form.
-#: actions/smssettings.php:116
+#: actions/smssettings.php:115
 msgid "Current confirmed SMS-enabled phone number."
 msgstr "Huidige bevestigde telefoonnummer met SMS-functie."
 
 #. TRANS: Form guide in IM settings form.
-#: actions/smssettings.php:129
+#: actions/smssettings.php:128
 msgid "Awaiting confirmation on this phone number."
 msgstr "Er wordt gewacht op bevestiging van dit telefoonnummer."
 
 #. TRANS: Field label for SMS address input in SMS settings form.
-#: actions/smssettings.php:138
+#: actions/smssettings.php:137
 msgid "Confirmation code"
 msgstr "Bevestigingscode"
 
 #. TRANS: Form field instructions in SMS settings form.
-#: actions/smssettings.php:140
+#: actions/smssettings.php:139
 msgid "Enter the code you received on your phone."
 msgstr "Voer de code in die u via uw telefoon hebt ontvangen."
 
 #. TRANS: Button label to confirm SMS confirmation code in SMS settings.
-#: actions/smssettings.php:144
+#: actions/smssettings.php:143
 msgctxt "BUTTON"
 msgid "Confirm"
 msgstr "Bevestigen"
 
 #. TRANS: Field label for SMS phone number input in SMS settings form.
-#: actions/smssettings.php:149
+#: actions/smssettings.php:148
 msgid "SMS phone number"
 msgstr "SMS-nummer"
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
-#: actions/smssettings.php:152
-#, fuzzy
-msgid "Phone number, no punctuation or spaces, with area code"
+#: actions/smssettings.php:151
+msgid "Phone number, no punctuation or spaces, with area code."
 msgstr "Telefoonnummer zonder spaties of leestekens, met netnummer."
 
 #. TRANS: Form legend for SMS preferences form.
-#: actions/smssettings.php:191
+#: actions/smssettings.php:190
 msgid "SMS preferences"
 msgstr "SMS-voorkeuren"
 
 #. TRANS: Checkbox label in SMS preferences form.
-#: actions/smssettings.php:197
+#: actions/smssettings.php:196
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
@@ -6050,32 +6077,32 @@ msgstr ""
 "van mijn provider kan opleveren."
 
 #. TRANS: Confirmation message for successful SMS preferences save.
-#: actions/smssettings.php:308
+#: actions/smssettings.php:307
 msgid "SMS preferences saved."
 msgstr "Uw SMS-voorkeuren zijn opgeslagen."
 
 #. TRANS: Message given saving SMS phone number without having provided one.
-#: actions/smssettings.php:330
+#: actions/smssettings.php:329
 msgid "No phone number."
 msgstr "Geen telefoonnummer."
 
 #. TRANS: Message given saving SMS phone number without having selected a carrier.
-#: actions/smssettings.php:336
+#: actions/smssettings.php:335
 msgid "No carrier selected."
 msgstr "Er is geen provider geselecteerd."
 
 #. TRANS: Message given saving SMS phone number that is already set.
-#: actions/smssettings.php:344
+#: actions/smssettings.php:343
 msgid "That is already your phone number."
 msgstr "U hebt dit al ingesteld als uw telefoonnummer."
 
 #. TRANS: Message given saving SMS phone number that is already set for another user.
-#: actions/smssettings.php:348
+#: actions/smssettings.php:347
 msgid "That phone number already belongs to another user."
 msgstr "Dit telefoonnummer is al geregistrerd door een andere gebruiker."
 
 #. TRANS: Message given saving valid SMS phone number that is to be confirmed.
-#: actions/smssettings.php:376
+#: actions/smssettings.php:375
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
 "for the code and instructions on how to use it."
@@ -6084,39 +6111,39 @@ msgstr ""
 "toegevoegd. Op uw telefoon vindt u de code en de instructies."
 
 #. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
-#: actions/smssettings.php:404
+#: actions/smssettings.php:403
 msgid "That is the wrong confirmation number."
 msgstr "Dit is het verkeerde bevestigingsnummer."
 
 #. TRANS: Message given after successfully canceling SMS phone number confirmation.
-#: actions/smssettings.php:418
+#: actions/smssettings.php:417
 msgid "SMS confirmation cancelled."
 msgstr "SMS-bevestiging geannuleerd."
 
 #. TRANS: Message given trying to remove an SMS phone number that is not
 #. TRANS: registered for the active user.
-#: actions/smssettings.php:438
+#: actions/smssettings.php:437
 msgid "That is not your phone number."
 msgstr "Dit is niet uw telefoonnummer."
 
 #. TRANS: Message given after successfully removing a registered SMS phone number.
-#: actions/smssettings.php:460
+#: actions/smssettings.php:459
 msgid "The SMS phone number was removed."
 msgstr "Het SMS-nummer is verwijderd."
 
 #. TRANS: Label for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:499
+#: actions/smssettings.php:498
 msgid "Mobile carrier"
 msgstr "Mobiele aanbieder"
 
 #. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:504
+#: actions/smssettings.php:503
 msgid "Select a carrier"
 msgstr "Selecteer een provider"
 
 #. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
 #. TRANS: %s is an administrative contact's e-mail address.
-#: actions/smssettings.php:513
+#: actions/smssettings.php:512
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -6127,7 +6154,7 @@ msgstr ""
 "via e-mail weten op het e-mailadres %s."
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
-#: actions/smssettings.php:535
+#: actions/smssettings.php:534
 msgid "No code entered."
 msgstr "Er is geen code ingevoerd."
 
@@ -6201,17 +6228,15 @@ msgstr "U bent niet geabonneerd op dat profiel."
 msgid "Could not save subscription."
 msgstr "Het was niet mogelijk het abonnement op te slaan."
 
-#: actions/subscribe.php:77
-msgid "This action only accepts POST requests."
-msgstr "Deze handeling accepteert alleen POST-verzoeken."
-
-#: actions/subscribe.php:117
+#. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
+#: actions/subscribe.php:121
 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
 msgstr ""
 "U kunt niet abonneren op een OMB 1.0 profiel van een andere omgeving via "
 "deze handeling."
 
-#: actions/subscribe.php:145
+#. TRANS: Page title when subscription succeeded.
+#: actions/subscribe.php:149
 msgid "Subscribed"
 msgstr "Geabonneerd"
 
@@ -6328,31 +6353,34 @@ msgid "Subscription feed for %s (Atom)"
 msgstr "Abonneefeed voor %s (Atom)"
 
 #. TRANS: Checkbox label for enabling Jabber messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:239
-msgid "Jabber"
-msgstr "Jabber"
+#: actions/subscriptions.php:241 lib/settingsnav.php:110
+#, fuzzy
+msgid "IM"
+msgstr "IM"
 
 #. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:254
+#: actions/subscriptions.php:256 lib/settingsnav.php:117
 msgid "SMS"
 msgstr "SMS"
 
-#: actions/tag.php:69
+#. TRANS: Title for all but the first page of notices with tags.
+#. TRANS: %1$s is the tag, %2$d is the page number.
+#: actions/tag.php:73
 #, php-format
 msgid "Notices tagged with %1$s, page %2$d"
 msgstr "Mededelingen met het label %1$s, pagina %2$d"
 
-#: actions/tag.php:87
+#: actions/tag.php:91
 #, php-format
 msgid "Notice feed for tag %s (RSS 1.0)"
 msgstr "Mededelingenfeed voor label %s (RSS 1.0)"
 
-#: actions/tag.php:93
+#: actions/tag.php:97
 #, php-format
 msgid "Notice feed for tag %s (RSS 2.0)"
 msgstr "Mededelingenfeed voor label %s (RSS 2.0)"
 
-#: actions/tag.php:99
+#: actions/tag.php:103
 #, php-format
 msgid "Notice feed for tag %s (Atom)"
 msgstr "Mededelingenfeed voor label %s (Atom)"
@@ -6371,17 +6399,11 @@ msgstr "Label %s"
 msgid "User profile"
 msgstr "Gebruikersprofiel"
 
-#. TRANS: DT element in area for user avatar.
-#: actions/tagother.php:81 actions/userauthorization.php:132
-#: lib/userprofile.php:108
-msgid "Photo"
-msgstr "Foto"
-
-#: actions/tagother.php:141
+#: actions/tagother.php:120
 msgid "Tag user"
 msgstr "Gebruiker labelen"
 
-#: actions/tagother.php:151
+#: actions/tagother.php:130
 msgid ""
 "Tags for this user (letters, numbers, -, ., and _), comma- or space- "
 "separated"
@@ -6389,14 +6411,19 @@ msgstr ""
 "Labels voor deze gebruiker (letters, cijfers, -, ., en _). Gebruik komma's "
 "of spaties als scheidingsteken"
 
-#: actions/tagother.php:193
+#: actions/tagother.php:157
+#, php-format
+msgid "Invalid tag: \"%s\""
+msgstr "Ongeldig label: '%s'"
+
+#: actions/tagother.php:172
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 "U kunt alleen gebruikers labelen waarop u geabonneerd bent of die op u "
 "geabonneerd zijn."
 
-#: actions/tagother.php:236
+#: actions/tagother.php:215
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
 "Gebruik dit formulier om labels toe te voegen aan uw abonnementen of "
@@ -6406,6 +6433,7 @@ msgstr ""
 msgid "No such tag."
 msgstr "Onbekend label."
 
+#. TRANS: Client error displayed when trying to unblock a non-blocked user.
 #: actions/unblock.php:59
 msgid "You haven't blocked that user."
 msgstr "U hebt deze gebruiker niet geblokkeerd."
@@ -6426,7 +6454,7 @@ msgstr "Het profiel-ID was niet aanwezig in het verzoek."
 msgid "Unsubscribed"
 msgstr "Het abonnement is opgezegd"
 
-#: actions/updateprofile.php:64 actions/userauthorization.php:337
+#: actions/updateprofile.php:64
 #, php-format
 msgid ""
 "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
@@ -6434,6 +6462,77 @@ msgstr ""
 "De licentie \"%1$s\" voor de stream die u wilt volgen is niet compatibel met "
 "de sitelicentie \"%2$s\"."
 
+#: actions/urlsettings.php:60
+#, fuzzy
+msgid "URL settings"
+msgstr "IM-instellingen"
+
+#. TRANS: Instructions for tab "Other" in user profile settings.
+#: actions/urlsettings.php:72
+msgid "Manage various other options."
+msgstr "Overige instellingen beheren."
+
+#. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
+#. TRANS: user's profile settings. This message has one space at the beginning. Use your
+#. TRANS: language's word separator here if it has one (most likely a single space).
+#: actions/urlsettings.php:115
+msgid " (free service)"
+msgstr " (vrij beschikbare dienst)"
+
+#: actions/urlsettings.php:121
+#, fuzzy
+msgid "[none]"
+msgstr "Geen"
+
+#: actions/urlsettings.php:122
+msgid "[internal]"
+msgstr ""
+
+#. TRANS: Label for dropdown with URL shortener services.
+#: actions/urlsettings.php:130
+msgid "Shorten URLs with"
+msgstr "URL's inkorten met"
+
+#. TRANS: Tooltip for for dropdown with URL shortener services.
+#: actions/urlsettings.php:132
+msgid "Automatic shortening service to use."
+msgstr "Te gebruiken automatische verkortingsdienst."
+
+#: actions/urlsettings.php:138
+msgid "URL longer than"
+msgstr ""
+
+#: actions/urlsettings.php:141
+msgid "URLs longer than this will be shortened, 0 means always shorten."
+msgstr ""
+
+#: actions/urlsettings.php:145
+msgid "Text longer than"
+msgstr ""
+
+#: actions/urlsettings.php:148
+msgid ""
+"URLs in notices longer than this will be shortened, 0 means always shorten."
+msgstr ""
+
+#. TRANS: Form validation error for form "Other settings" in user profile.
+#: actions/urlsettings.php:180
+msgid "URL shortening service is too long (maximum 50 characters)."
+msgstr "De URL voor de verkortingdienst is te lang (maximaal 50 tekens)."
+
+#: actions/urlsettings.php:187
+msgid "Invalid number for max url length."
+msgstr ""
+
+#: actions/urlsettings.php:193
+#, fuzzy
+msgid "Invalid number for max notice length."
+msgstr "Ongeldige mededelinginhoud."
+
+#: actions/urlsettings.php:238
+msgid "Error saving user URL shortening preferences."
+msgstr ""
+
 #. TRANS: User admin panel title
 #: actions/useradminpanel.php:58
 msgctxt "TITLE"
@@ -6458,12 +6557,12 @@ msgstr "Ongeldige welkomsttekst. De maximale lengte is 255 tekens."
 #. TRANS: Client error displayed when trying to set a non-existing user as default subscription for new
 #. TRANS: users in user admin panel. %1$s is the invalid nickname.
 #: actions/useradminpanel.php:166
-#, fuzzy, php-format
-msgid "Invalid default subscripton: '%1$s' is not a user."
+#, php-format
+msgid "Invalid default subscripton: \"%1$s\" is not a user."
 msgstr "Ongeldig standaardabonnement: \"%1$s\" is geen gebruiker."
 
-#. TRANS: Link description in user account settings menu.
-#: actions/useradminpanel.php:215 lib/accountsettingsaction.php:106
+#: actions/useradminpanel.php:215 lib/action.php:565 lib/settingsnav.php:77
+#: lib/subgroupnav.php:81
 msgid "Profile"
 msgstr "Profiel"
 
@@ -6519,61 +6618,59 @@ msgstr "Of gebruikers nieuwe gebruikers kunnen uitnodigen."
 
 #. TRANS: Title for button to save user settings in user admin panel.
 #: actions/useradminpanel.php:302
-#, fuzzy
-msgid "Save user settings"
+msgid "Save user settings."
 msgstr "Gebruikersinstellingen opslaan."
 
-#: actions/userauthorization.php:105
+#. TRANS: Page title.
+#: actions/userauthorization.php:109
 msgid "Authorize subscription"
 msgstr "Abonneren"
 
-#: actions/userauthorization.php:110
-#, fuzzy
+#. TRANS: Page notice on "Auhtorize subscription" page.
+#: actions/userauthorization.php:115
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
 "user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
-"click “Reject”."
+"click \"Reject\"."
 msgstr ""
 "Controleer alstublieft deze details om er zeker van te zijn dat u zich wilt "
 "abonneren op de mededelingen van deze gebruiker. Als u zojuist niet hebt "
 "aangegeven dat u zich op de mededelingen van een gebruiker wilt abonneren, "
 "klik dan op \"Afwijzen\"."
 
-#. TRANS: Menu item for site administration
-#: actions/userauthorization.php:196 actions/version.php:167
-#: lib/adminpanelaction.php:403
-msgid "License"
-msgstr "Licentie"
-
-#: actions/userauthorization.php:217
-#, fuzzy
+#. TRANS: Button text on Authorise Subscription page.
+#: actions/userauthorization.php:200
+msgctxt "BUTTON"
 msgid "Accept"
 msgstr "Aanvaarden"
 
-#: actions/userauthorization.php:218 lib/subscribeform.php:115
-#: lib/subscribeform.php:139
-msgid "Subscribe to this user"
-msgstr "Abonneren op deze gebruiker"
+#. TRANS: Title for button on Authorise Subscription page.
+#: actions/userauthorization.php:202
+msgid "Subscribe to this user."
+msgstr "Abonneren op deze gebruiker."
 
-#: actions/userauthorization.php:219
-#, fuzzy
+#. TRANS: Button text on Authorise Subscription page.
+#: actions/userauthorization.php:204
+msgctxt "BUTTON"
 msgid "Reject"
 msgstr "Afwijzen"
 
-#: actions/userauthorization.php:220
-#, fuzzy
-msgid "Reject this subscription"
+#. TRANS: Title for button on Authorise Subscription page.
+#: actions/userauthorization.php:206
+msgid "Reject this subscription."
 msgstr "Dit abonnement weigeren."
 
-#: actions/userauthorization.php:232
+#. TRANS: Client error displayed for an empty authorisation request.
+#: actions/userauthorization.php:219
 msgid "No authorization request!"
 msgstr "Geen autorisatieverzoek!"
 
-#: actions/userauthorization.php:254
+#. TRANS: Accept message header from Authorise subscription page.
+#: actions/userauthorization.php:242
 msgid "Subscription authorized"
 msgstr "Het abonnement is geautoriseerd"
 
-#: actions/userauthorization.php:256
+#: actions/userauthorization.php:245
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to authorize the "
@@ -6583,11 +6680,12 @@ msgstr ""
 "Controleer de instructies van de site voor informatie over het volledig "
 "afwijzen van een abonnement. Uw abonnementstoken is:"
 
-#: actions/userauthorization.php:266
+#. TRANS: Reject message header from Authorise subscription page.
+#: actions/userauthorization.php:256
 msgid "Subscription rejected"
 msgstr "Het abonnement is afgewezen"
 
-#: actions/userauthorization.php:268
+#: actions/userauthorization.php:259
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to fully reject the "
@@ -6597,48 +6695,73 @@ msgstr ""
 "Controleer de instructies van de site voor informatie over het volledig "
 "afwijzen van een abonnement."
 
-#: actions/userauthorization.php:303
-#, fuzzy, php-format
-msgid "Listener URI ‘%s’ not found here."
+#. TRANS: Exception thrown when no valid user is found for an authorisation request.
+#. TRANS: %s is a listener URI.
+#: actions/userauthorization.php:296
+#, php-format
+msgid "Listener URI \"%s\" not found here."
 msgstr "De abonnee-URI \"%s\" is hier niet te vinden."
 
-#: actions/userauthorization.php:308
-#, fuzzy, php-format
-msgid "Listenee URI ‘%s’ is too long."
+#. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
+#. TRANS: %s is a listenee URI.
+#: actions/userauthorization.php:303
+#, php-format
+msgid "Listenee URI \"%s\" is too long."
 msgstr "De URI \"%s\" van de gevolgde gebruiker is te lang."
 
-#: actions/userauthorization.php:314
-#, fuzzy, php-format
-msgid "Listenee URI ‘%s’ is a local user."
+#. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
+#. TRANS: %s is a listenee URI.
+#: actions/userauthorization.php:311
+#, php-format
+msgid "Listenee URI \"%s\" is a local user."
 msgstr "De abonnements-URI \"%s\" is een lokale gebruiker."
 
+#. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
+#. TRANS: %s is a profile URL.
 #: actions/userauthorization.php:329
-#, fuzzy, php-format
-msgid "Profile URL ‘%s’ is for a local user."
+#, php-format
+msgid "Profile URL \"%s\" is for a local user."
 msgstr "De profiel-URL \"%s\" is van een lokale gebruiker."
 
-#: actions/userauthorization.php:345
-#, fuzzy, php-format
-msgid "Avatar URL ‘%s’ is not valid."
+#. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
+#. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
+#: actions/userauthorization.php:339
+#, php-format
+msgid ""
+"Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
+"\"."
+msgstr ""
+"De licentie \"%1$s\" voor de stream die u wilt volgen is niet compatibel met "
+"de sitelicentie \"%2$s\"."
+
+#. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
+#. TRANS: %s is an avatar URL.
+#: actions/userauthorization.php:349
+#, php-format
+msgid "Avatar URL \"%s\" is not valid."
 msgstr "De avatar-URL \"%s\" is niet geldig."
 
-#: actions/userauthorization.php:350
-#, fuzzy, php-format
-msgid "Can’t read avatar URL ‘%s’."
+#. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
+#. TRANS: %s is an avatar URL.
+#: actions/userauthorization.php:356
+#, php-format
+msgid "Cannot read avatar URL \"%s\"."
 msgstr "Het was niet mogelijk de avatar-URL \"%s\" te lezen."
 
-#: actions/userauthorization.php:355
-#, fuzzy, php-format
-msgid "Wrong image type for avatar URL ‘%s’."
+#. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
+#. TRANS: %s is an avatar URL.
+#: actions/userauthorization.php:363
+#, php-format
+msgid "Wrong image type for avatar URL \"%s\"."
 msgstr "Er staat een verkeerd afbeeldingsttype op de avatar-URL \"%s\"."
 
 #. TRANS: Page title for profile design page.
-#: actions/userdesignsettings.php:74 lib/designsettings.php:63
+#: actions/userdesignsettings.php:74 lib/designsettings.php:61
 msgid "Profile design"
 msgstr "Profielontwerp"
 
 #. TRANS: Instructions for profile design page.
-#: actions/userdesignsettings.php:84 lib/designsettings.php:74
+#: actions/userdesignsettings.php:84 lib/designsettings.php:72
 msgid ""
 "Customize the way your profile looks with a background image and a colour "
 "palette of your choice."
@@ -6646,10 +6769,28 @@ msgstr ""
 "U kunt de vormgeving van uw profiel aanpassen door een achtergrondafbeelding "
 "toe te voegen of het kleurenpalet aan te passen."
 
-#: actions/userdesignsettings.php:272
+#: actions/userdesignsettings.php:289
 msgid "Enjoy your hotdog!"
 msgstr "Geniet van uw hotdog!"
 
+#: actions/userdesignsettings.php:325
+#, fuzzy
+msgid "Design settings"
+msgstr "Websiteinstellingen opslaan"
+
+#: actions/userdesignsettings.php:340
+msgid "View profile designs"
+msgstr "Profielontwerpen gebruiken"
+
+#: actions/userdesignsettings.php:341
+msgid "Show or hide profile designs."
+msgstr "Profielontwerpen weergeven of verbergen"
+
+#: actions/userdesignsettings.php:348
+#, fuzzy
+msgid "Background file"
+msgstr "Achtergrond"
+
 #. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number.
 #: actions/usergroups.php:66
 #, php-format
@@ -6700,6 +6841,11 @@ msgstr ""
 msgid "Contributors"
 msgstr "Medewerkers"
 
+#. TRANS: Menu item for site administration
+#: actions/version.php:167 lib/adminpanelaction.php:403
+msgid "License"
+msgstr "Licentie"
+
 #: actions/version.php:170
 msgid ""
 "StatusNet is free software: you can redistribute it and/or modify it under "
@@ -6733,12 +6879,13 @@ msgstr ""
 "Samen met dit programma hoort u een kopie van de GNU Affero General Public "
 "License te hebben ontvangen. Zo niet, zie dan %s."
 
-#: actions/version.php:191
-msgid "Plugins"
-msgstr "Plug-ins"
+#. TRANS: Form input field label for application name.
+#: actions/version.php:197 lib/applicationeditform.php:190
+msgid "Name"
+msgstr "Naam"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:901
+#: actions/version.php:198 lib/action.php:885
 msgid "Version"
 msgstr "Versie"
 
@@ -6746,6 +6893,12 @@ msgstr "Versie"
 msgid "Author(s)"
 msgstr "Auteur(s)"
 
+#. TRANS: Form input field label.
+#: actions/version.php:200 lib/applicationeditform.php:208
+#: lib/groupeditform.php:168
+msgid "Description"
+msgstr "Beschrijving"
+
 #. TRANS: Activity title when marking a notice as favorite.
 #: classes/Fave.php:164
 msgid "Favor"
@@ -6867,7 +7020,7 @@ msgid "Could not create login token for %s"
 msgstr "Het was niet mogelijk een aanmeldtoken aan te maken voor %s"
 
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
-#: classes/Memcached_DataObject.php:542
+#: classes/Memcached_DataObject.php:556
 msgid "No database name or DSN found anywhere."
 msgstr "Geen databasenaam of DSN gevonden."
 
@@ -7053,18 +7206,18 @@ msgstr "%1$s is %2$s gaan volgen."
 
 #. TRANS: Notice given on user registration.
 #. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:395
+#: classes/User.php:390
 #, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr "Welkom bij %1$s, @%2$s!"
 
 #. TRANS: Server exception.
-#: classes/User.php:918
+#: classes/User.php:923
 msgid "No single user defined for single-user mode."
 msgstr "Er is geen gebruiker gedefinieerd voor single-usermodus."
 
 #. TRANS: Server exception.
-#: classes/User.php:922
+#: classes/User.php:927
 msgid "Single-user mode code called when not enabled."
 msgstr ""
 "De \"single-user\"-modus is aangeroepen terwijl deze niet is ingeschakeld."
@@ -7110,41 +7263,6 @@ msgstr "Er is geen XSD aangetroffen voor %s."
 msgid "No AtomPub API service for %s."
 msgstr "Er is geen AtomPub API-dienst voor %s."
 
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:104
-msgid "Change your profile settings"
-msgstr "Uw profielgegevens wijzigen"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:111
-msgid "Upload an avatar"
-msgstr "Avatar uploaden"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:118
-msgid "Change your password"
-msgstr "Uw wachtwoord wijzigen"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:125
-msgid "Change email handling"
-msgstr "E-mailafhandeling wijzigen"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:132
-msgid "Design your profile"
-msgstr "Uw profiel ontwerpen"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:139
-msgid "Other options"
-msgstr "Overige instellingen"
-
-#. TRANS: Link description in user account settings menu.
-#: lib/accountsettingsaction.php:141
-msgid "Other"
-msgstr "Overige"
-
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
 #: lib/action.php:161
 #, php-format
@@ -7162,206 +7280,128 @@ msgctxt "TOOLTIP"
 msgid "Show more"
 msgstr "Meer weergeven"
 
-#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:544
-msgid "Primary site navigation"
-msgstr "Primaire sitenavigatie"
+#. TRANS: Inline reply form submit button: submits a reply comment.
+#: lib/action.php:328
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Comment"
+msgstr "Inhoud"
 
-#. TRANS: Tooltip for main menu option "Personal".
-#: lib/action.php:550
-msgctxt "TOOLTIP"
-msgid "Personal profile and friends timeline"
-msgstr "Persoonlijk profiel en tijdlijn van vrienden"
+#. TRANS: Placeholder text for inline reply form. Clicking in this box will turn it into a mini notice form.
+#: lib/action.php:331
+msgid "Add a comment..."
+msgstr ""
 
-#. TRANS: Main menu option when logged in for access to personal profile and friends timeline.
-#. TRANS: Personal group navigation menu option when logged in for viewing timeline of self and friends.
-#: lib/action.php:553 lib/personalgroupnav.php:100
-msgctxt "MENU"
-msgid "Personal"
-msgstr "Persoonlijk"
+#: lib/action.php:559 lib/personalgroupnav.php:99
+#, fuzzy
+msgid "Home"
+msgstr "Startpagina"
 
-#. TRANS: Tooltip for main menu option "Account".
-#: lib/action.php:555
-msgctxt "TOOLTIP"
-msgid "Change your email, avatar, password, profile"
-msgstr "Uw e-mailadres, avatar, wachtwoord of profiel wijzigen"
-
-#. TRANS: Main menu option when logged in for access to user settings.
-#: lib/action.php:558
-msgid "Account"
-msgstr "Gebruiker"
-
-#. TRANS: Tooltip for main menu option "Services".
 #: lib/action.php:560
-msgctxt "TOOLTIP"
-msgid "Connect to services"
-msgstr "Met andere diensten koppelen"
+#, fuzzy
+msgid "Friends timeline"
+msgstr "%s tijdlijn"
 
-#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services.
-#: lib/action.php:563
-msgid "Connect"
-msgstr "Koppelen"
-
-#. TRANS: Tooltip for menu option "Admin".
 #: lib/action.php:566
-msgctxt "TOOLTIP"
-msgid "Change site configuration"
-msgstr "Websiteinstellingen wijzigen"
+#, fuzzy
+msgid "Your profile"
+msgstr "Groepsprofiel"
 
-#. TRANS: Main menu option when logged in and site admin for access to site configuration.
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/action.php:569 lib/groupnav.php:117
-msgctxt "MENU"
-msgid "Admin"
-msgstr "Beheer"
+#: lib/action.php:570 lib/action.php:593 lib/publicgroupnav.php:78
+msgid "Public"
+msgstr "Openbaar"
 
-#. TRANS: Tooltip for main menu option "Invite".
-#: lib/action.php:573
-#, php-format
-msgctxt "TOOLTIP"
-msgid "Invite friends and colleagues to join you on %s"
-msgstr "Vrienden en collega's uitnodigen om u te vergezellen op %s"
+#: lib/action.php:571 lib/action.php:594
+#, fuzzy
+msgid "Everyone on this site"
+msgstr "Gebruikers op deze site vinden"
+
+#: lib/action.php:575
+#, fuzzy
+msgid "Settings"
+msgstr "SMS-instellingen"
 
-#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users.
 #: lib/action.php:576
-msgctxt "MENU"
-msgid "Invite"
-msgstr "Uitnodigingen"
+#, fuzzy
+msgid "Change your personal settings"
+msgstr "Uw profielgegevens wijzigen"
 
-#. TRANS: Tooltip for main menu option "Logout"
 #: lib/action.php:582
-msgctxt "TOOLTIP"
-msgid "Logout from the site"
-msgstr "Gebruiker afmelden"
+#, fuzzy
+msgid "Site configuration"
+msgstr "Gebruikersinstellingen"
 
-#. TRANS: Main menu option when logged in to log out the current user.
-#: lib/action.php:585
-msgctxt "MENU"
+#: lib/action.php:587
+#, fuzzy
 msgid "Logout"
 msgstr "Afmelden"
 
-#. TRANS: Tooltip for main menu option "Register".
-#: lib/action.php:590
-msgctxt "TOOLTIP"
-msgid "Create an account"
-msgstr "Gebruiker aanmaken"
+#: lib/action.php:588
+#, fuzzy
+msgid "Logout from the site"
+msgstr "Gebruiker afmelden"
 
-#. TRANS: Main menu option when not logged in to register a new account.
-#. TRANS: Menu item for registering with the StatusNet site.
-#: lib/action.php:593 lib/logingroupnav.php:85
-msgctxt "MENU"
-msgid "Register"
-msgstr "Registreren"
-
-#. TRANS: Tooltip for main menu option "Login".
-#: lib/action.php:596
-msgctxt "TOOLTIP"
+#: lib/action.php:599
+#, fuzzy
 msgid "Login to the site"
 msgstr "Gebruiker aanmelden"
 
-#. TRANS: Main menu option when not logged in to log in.
-#. TRANS: Menu item for logging in to the StatusNet site.
-#: lib/action.php:599 lib/logingroupnav.php:77
-msgctxt "MENU"
-msgid "Login"
-msgstr "Aanmelden"
-
-#. TRANS: Tooltip for main menu option "Help".
-#: lib/action.php:602
-msgctxt "TOOLTIP"
-msgid "Help me!"
-msgstr "Help me!"
-
-#. TRANS: Main menu option for help on the StatusNet site.
-#: lib/action.php:605
-msgctxt "MENU"
-msgid "Help"
-msgstr "Help"
-
-#. TRANS: Tooltip for main menu option "Search".
-#: lib/action.php:608
-msgctxt "TOOLTIP"
-msgid "Search for people or text"
-msgstr "Naar gebruikers of tekst zoeken"
-
-#. TRANS: Main menu option when logged in or when the StatusNet instance is not private.
-#: lib/action.php:611
-msgctxt "MENU"
+#: lib/action.php:606
+#, fuzzy
 msgid "Search"
 msgstr "Zoeken"
 
-#. TRANS: DT element for site notice. String is hidden in default CSS.
-#. TRANS: Menu item for site administration
-#: lib/action.php:633 lib/adminpanelaction.php:387
-msgid "Site notice"
-msgstr "Mededeling van de website"
-
-#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:700
-msgid "Local views"
-msgstr "Lokale weergaven"
-
-#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:770
-msgid "Page notice"
-msgstr "Mededeling van de pagina"
-
-#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:874
-msgid "Secondary site navigation"
-msgstr "Secundaire sitenavigatie"
+#: lib/action.php:607
+#, fuzzy
+msgid "Search the site"
+msgstr "Site doorzoeken"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:880
+#: lib/action.php:864
 msgid "Help"
 msgstr "Help"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:883
+#: lib/action.php:867
 msgid "About"
 msgstr "Over"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:886
+#: lib/action.php:870
 msgid "FAQ"
 msgstr "Veel gestelde vragen"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:891
+#: lib/action.php:875
 msgid "TOS"
 msgstr "Gebruiksvoorwaarden"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:895
+#: lib/action.php:879
 msgid "Privacy"
 msgstr "Privacy"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:898
+#: lib/action.php:882
 msgid "Source"
 msgstr "Broncode"
 
 #. TRANS: Secondary navigation menu option leading to e-mail contact information on the
 #. TRANS: StatusNet site, where to report bugs, ...
-#: lib/action.php:905
+#: lib/action.php:889
 msgid "Contact"
 msgstr "Contact"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:908
+#: lib/action.php:892
 msgid "Badge"
 msgstr "Widget"
 
-#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:937
-msgid "StatusNet software license"
-msgstr "Licentie van de StatusNet-software"
-
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:944
+#: lib/action.php:921
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7371,7 +7411,7 @@ msgstr ""
 "broughtbyurl%%)."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:947
+#: lib/action.php:924
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** is een microblogdienst."
@@ -7380,7 +7420,7 @@ msgstr "**%%site.name%%** is een microblogdienst."
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:954
+#: lib/action.php:931
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7391,21 +7431,16 @@ msgstr ""
 "versie %s, beschikbaar onder de [GNU Affero General Public License](http://"
 "www.fsf.org/licensing/licenses/agpl-3.0.html)."
 
-#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:970
-msgid "Site content license"
-msgstr "Licentie voor siteinhoud"
-
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:977
+#: lib/action.php:949
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr "Inhoud en gegevens van %1$s zijn persoonlijk en vertrouwelijk."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:984
+#: lib/action.php:956
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
@@ -7413,7 +7448,7 @@ msgstr ""
 "voorbehouden."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:988
+#: lib/action.php:960
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 "Auteursrechten op inhoud en gegevens rusten bij de respectievelijke "
@@ -7421,26 +7456,21 @@ msgstr ""
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:1020
+#: lib/action.php:992
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
 "Alle inhoud en gegevens van %1$s zijn beschikbaar onder de licentie %2$s."
 
-#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1356
-msgid "Pagination"
-msgstr "Paginering"
-
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1367
+#: lib/action.php:1335
 msgid "After"
 msgstr "Later"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1377
+#: lib/action.php:1345
 msgid "Before"
 msgstr "Eerder"
 
@@ -7596,7 +7626,7 @@ msgid "User configuration"
 msgstr "Gebruikersinstellingen"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:122
+#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:110
 msgid "User"
 msgstr "Gebruiker"
 
@@ -7620,6 +7650,11 @@ msgstr "Sessieinstellingen"
 msgid "Edit site notice"
 msgstr "Websitebrede mededeling opslaan"
 
+#. TRANS: Menu item for site administration
+#: lib/adminpanelaction.php:387
+msgid "Site notice"
+msgstr "Mededeling van de website"
+
 #. TRANS: Menu item title/tooltip
 #: lib/adminpanelaction.php:393
 msgid "Snapshots configuration"
@@ -7630,6 +7665,12 @@ msgstr "Snapshotinstellingen"
 msgid "Set site license"
 msgstr "Sitelicentie instellen"
 
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:409
+#, fuzzy
+msgid "Plugins configuration"
+msgstr "Padinstellingen"
+
 #. TRANS: Client error 401.
 #: lib/apiauth.php:111
 msgid "API resource requires read-write access, but you only have read access."
@@ -7642,19 +7683,23 @@ msgstr ""
 msgid "No application for that consumer key."
 msgstr "Er is geen applicatie voor die gebruikerssleutel."
 
+#: lib/apiauth.php:202 lib/apiauth.php:284
+msgid "Not allowed to use API."
+msgstr "Het gebruik van de API is niet toegestaan."
+
 #. TRANS: OAuth exception given when an incorrect access token was given for a user.
-#: lib/apiauth.php:219
+#: lib/apiauth.php:225
 msgid "Bad access token."
 msgstr "Ongeldig toegangstoken."
 
 #. TRANS: OAuth exception given when no user was found for a given token (no token was found).
-#: lib/apiauth.php:224
+#: lib/apiauth.php:230
 msgid "No user for that token."
 msgstr "Er is geen gebruiker voor dat token."
 
 #. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel".
 #. TRANS: Client error thrown when authentication fails.
-#: lib/apiauth.php:266 lib/apiauth.php:293
+#: lib/apiauth.php:272 lib/apiauth.php:302
 msgid "Could not authenticate you."
 msgstr "U kon niet geauthenticeerd worden."
 
@@ -7703,6 +7748,11 @@ msgstr "Er is geprobeerd een onbekend token in te trekken."
 msgid "Failed to delete revoked token."
 msgstr "Het was niet mogelijk een ingetrokken token te verwijderen."
 
+#. TRANS: Form input field label for application icon.
+#: lib/applicationeditform.php:177
+msgid "Icon"
+msgstr "Icoon"
+
 #. TRANS: Form guide.
 #: lib/applicationeditform.php:182
 msgid "Icon for this application"
@@ -7737,6 +7787,11 @@ msgstr "Bron-URL"
 msgid "Organization responsible for this application"
 msgstr "Organisatie verantwoordelijk voor deze applicatie"
 
+#. TRANS: Form input field label.
+#: lib/applicationeditform.php:227
+msgid "Organization"
+msgstr "Organisatie"
+
 #. TRANS: Form input field instructions.
 #: lib/applicationeditform.php:234
 msgid "URL for the homepage of the organization"
@@ -7825,16 +7880,6 @@ msgstr "Het element author moet een element name bevatten."
 msgid "Do not use this method!"
 msgstr "Gebruik deze methode niet!"
 
-#. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:293
-msgid "Author"
-msgstr "Auteur"
-
-#. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:307
-msgid "Provider"
-msgstr "Provider"
-
 #. TRANS: Title.
 #: lib/attachmentnoticesection.php:67
 msgid "Notices where this attachment appears"
@@ -7860,23 +7905,28 @@ msgstr "Wachtwoord wijzigen is niet toegestaan"
 msgid "Block"
 msgstr "Blokkeren"
 
+#. TRANS: Description of the form to block a user.
+#: lib/blockform.php:79
+msgid "Block this user"
+msgstr "Deze gebruiker blokkeren"
+
 #. TRANS: Title for command results.
-#: lib/channel.php:160 lib/channel.php:181
+#: lib/channel.php:104 lib/channel.php:125
 msgid "Command results"
 msgstr "Commandoresultaten"
 
 #. TRANS: Title for command results.
-#: lib/channel.php:194
+#: lib/channel.php:138
 msgid "AJAX error"
 msgstr "Er is een Ajax-fout opgetreden"
 
 #. TRANS: E-mail subject when a command has completed.
-#: lib/channel.php:233 lib/mailhandler.php:143
+#: lib/channel.php:177 lib/mailhandler.php:143
 msgid "Command complete"
 msgstr "Het commando is uitgevoerd"
 
 #. TRANS: E-mail subject when a command has failed.
-#: lib/channel.php:244
+#: lib/channel.php:188
 msgid "Command failed"
 msgstr "Het uitvoeren van het commando is mislukt"
 
@@ -7979,7 +8029,7 @@ msgstr "Volledige naam: %s"
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a location.
-#: lib/command.php:446 lib/mail.php:270
+#: lib/command.php:446 lib/mail.php:275
 #, php-format
 msgid "Location: %s"
 msgstr "Locatie: %s"
@@ -7987,7 +8037,7 @@ msgstr "Locatie: %s"
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a homepage.
-#: lib/command.php:450 lib/mail.php:274
+#: lib/command.php:450 lib/mail.php:279
 #, php-format
 msgid "Homepage: %s"
 msgstr "Thuispagina: %s"
@@ -8270,109 +8320,102 @@ msgstr ""
 "tracking - nog niet beschikbaar\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:162
+#: lib/common.php:36
 msgid "No configuration file found."
 msgstr "Er is geen instellingenbestand aangetroffen."
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:165
+#: lib/common.php:39
 msgid "I looked for configuration files in the following places:"
 msgstr "Er is gezocht naar instellingenbestanden op de volgende plaatsen:"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:168
+#: lib/common.php:42
 msgid "You may wish to run the installer to fix this."
 msgstr ""
 "U kunt proberen de installer uit te voeren om dit probleem op te lossen."
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:172
+#: lib/common.php:46
 msgid "Go to the installer."
 msgstr "Naar het installatieprogramma gaan."
 
-#. TRANS: Menu item for Instant Messaging settings.
-#: lib/connectsettingsaction.php:106
-msgctxt "MENU"
-msgid "IM"
-msgstr "IM"
-
-#. TRANS: Tooltip for Instant Messaging menu item.
-#: lib/connectsettingsaction.php:108
-msgid "Updates by instant messenger (IM)"
-msgstr "Updates via instant messenger (IM)"
-
-#. TRANS: Menu item for Short Message Service settings.
-#: lib/connectsettingsaction.php:113
-msgctxt "MENU"
-msgid "SMS"
-msgstr "SMS"
-
-#. TRANS: Tooltip for Short Message Service menu item.
-#: lib/connectsettingsaction.php:115
-msgid "Updates by SMS"
-msgstr "Updates via SMS"
-
-#. TRANS: Menu item for OuAth connection settings.
-#: lib/connectsettingsaction.php:120
-msgctxt "MENU"
-msgid "Connections"
-msgstr "Koppelingen"
-
-#. TRANS: Tooltip for connected applications (Connections through OAuth) menu item.
-#: lib/connectsettingsaction.php:122
-msgid "Authorized connected applications"
-msgstr "Geautoriseerde verbonden applicaties"
-
 #: lib/dberroraction.php:59
 msgid "Database error"
 msgstr "Databasefout"
 
+#. TRANS: Description of form for deleting a user.
+#: lib/deleteuserform.php:75
+msgid "Delete this user"
+msgstr "Gebruiker verwijderen"
+
+#: lib/designform.php:114
+#, fuzzy
+msgid "Change design"
+msgstr "Ontwerp opslaan"
+
+#. TRANS: Fieldset legend on profile design page to change profile page colours.
+#: lib/designform.php:131
+msgid "Change colours"
+msgstr "Kleuren wijzigen"
+
+#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
+#: lib/designform.php:138
+msgid "Use defaults"
+msgstr "Standaardinstellingen gebruiken"
+
+#. TRANS: Title for button on profile design page to reset all colour settings to default.
+#: lib/designform.php:140
+msgid "Restore default designs"
+msgstr "Standaardontwerp toepassen"
+
+#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
+#: lib/designform.php:148
+msgid "Reset back to default"
+msgstr "Standaardinstellingen toepassen"
+
 #. TRANS: Label in form on profile design page.
 #. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
-#: lib/designsettings.php:108
+#: lib/designform.php:158
 msgid "Upload file"
 msgstr "Bestand uploaden"
 
 #. TRANS: Instructions for form on profile design page.
-#: lib/designsettings.php:113
+#: lib/designform.php:163
+#, fuzzy
 msgid ""
-"You can upload your personal background image. The maximum file size is 2MB."
+"You can upload your personal background image. The maximum file size is 2Mb."
 msgstr ""
 "U kunt een persoonlijke achtergrondafbeelding uploaden. De maximale "
 "bestandsgrootte is 2 megabyte."
 
 #. TRANS: Radio button on profile design page that will enable use of the uploaded profile image.
-#: lib/designsettings.php:139
+#: lib/designform.php:194
 msgctxt "RADIO"
 msgid "On"
 msgstr "Aan"
 
 #. TRANS: Radio button on profile design page that will disable use of the uploaded profile image.
-#: lib/designsettings.php:156
+#: lib/designform.php:211
 msgctxt "RADIO"
 msgid "Off"
 msgstr "Uit"
 
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: lib/designsettings.php:175
-msgid "Change colours"
-msgstr "Kleuren wijzigen"
-
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: lib/designsettings.php:257
-msgid "Use defaults"
-msgstr "Standaardinstellingen gebruiken"
+#. TRANS: Title for button on profile design page to save settings.
+#: lib/designform.php:322
+msgid "Save design"
+msgstr "Ontwerp opslaan"
 
 #. TRANS: Error message displayed if design settings could not be saved.
 #. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
-#: lib/designsettings.php:405 lib/designsettings.php:427
+#: lib/designsettings.php:216 lib/designsettings.php:238
 msgid "Couldn't update your design."
 msgstr "Het was niet mogelijk uw ontwerp bij te werken."
 
 #. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
-#: lib/designsettings.php:433
+#: lib/designsettings.php:244
 msgid "Design defaults restored."
 msgstr "Het standaardontwerp is weer ingesteld."
 
@@ -8439,27 +8482,23 @@ msgstr "Het is niet mogelijk te importeren zonder gebruiker."
 msgid "Feeds"
 msgstr "Feeds"
 
-#: lib/galleryaction.php:121
-msgid "Filter tags"
-msgstr "Labels filteren"
-
-#: lib/galleryaction.php:131
+#: lib/galleryaction.php:128
 msgid "All"
 msgstr "Alle"
 
-#: lib/galleryaction.php:139
+#: lib/galleryaction.php:136
 msgid "Select tag to filter"
 msgstr "Selecteer een label om op te filteren"
 
-#: lib/galleryaction.php:140
+#: lib/galleryaction.php:137
 msgid "Tag"
 msgstr "Label"
 
-#: lib/galleryaction.php:141
+#: lib/galleryaction.php:138
 msgid "Choose a tag to narrow list"
 msgstr "Kies een label om de lijst kleiner te maken"
 
-#: lib/galleryaction.php:143
+#: lib/galleryaction.php:140
 msgid "Go"
 msgstr "OK"
 
@@ -8548,6 +8587,12 @@ msgctxt "TOOLTIP"
 msgid "%s blocked users"
 msgstr "Geblokkeerde gebruikers in %s"
 
+#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
+#: lib/groupnav.php:117
+msgctxt "MENU"
+msgid "Admin"
+msgstr "Beheer"
+
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
 #: lib/groupnav.php:120
@@ -8657,39 +8702,63 @@ msgid_plural "%dB"
 msgstr[0] "%d byte"
 msgstr[1] "%d bytes"
 
-#: lib/jabber.php:387
+#: lib/implugin.php:262
 #, php-format
-msgid "[%s]"
-msgstr "[%s]"
+msgid ""
+"User \"%s\" on %s has said that your %s screenname belongs to them. If "
+"that's true, you can confirm by clicking on this URL: %s . (If you cannot "
+"click it, copy-and-paste it into the address bar of your browser). If that "
+"user isn't you, or if you didn't request this confirmation, just ignore this "
+"message."
+msgstr ""
 
-#: lib/jabber.php:567
+#: lib/implugin.php:349
 #, php-format
 msgid "Unknown inbox source %d."
 msgstr "Onbekende bron Postvak IN %d."
 
+#: lib/implugin.php:485
+#, fuzzy, php-format
+msgid "Message too long - maximum is %1$d characters, you sent %2$d."
+msgstr ""
+"Het bericht is te lang. Het mag maximaal %1$d teken bevatten en u hebt er %2"
+"$d gebruikt."
+
 #: lib/leaveform.php:114
 msgid "Leave"
 msgstr "Verlaten"
 
+#. TRANS: Menu item for logging in to the StatusNet site.
+#: lib/logingroupnav.php:77
+msgctxt "MENU"
+msgid "Login"
+msgstr "Aanmelden"
+
 #. TRANS: Title for menu item for logging in to the StatusNet site.
 #: lib/logingroupnav.php:79
 msgid "Login with a username and password"
 msgstr "Aanmelden met gebruikersnaam en wachtwoord"
 
+#. TRANS: Menu item for registering with the StatusNet site.
+#: lib/logingroupnav.php:85
+msgctxt "MENU"
+msgid "Register"
+msgstr "Registreren"
+
 #. TRANS: Title for menu item for registering with the StatusNet site.
 #: lib/logingroupnav.php:87
 msgid "Sign up for a new account"
 msgstr "Nieuwe gebruiker aanmaken"
 
 #. TRANS: Subject for address confirmation email.
-#: lib/mail.php:168
+#: lib/mail.php:172
 msgid "Email address confirmation"
 msgstr "E-mailadresbevestiging"
 
 #. TRANS: Body for address confirmation email.
 #. TRANS: %1$s is the addressed user's nickname, %2$s is the StatusNet sitename,
 #. TRANS: %3$s is the URL to confirm at.
-#: lib/mail.php:173
+#: lib/mail.php:177
 #, php-format
 msgid ""
 "Hey, %1$s.\n"
@@ -8721,14 +8790,14 @@ msgstr ""
 
 #. TRANS: Subject of new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
-#: lib/mail.php:238
+#: lib/mail.php:243
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1$s volgt nu uw berichten %2$s."
 
 #. TRANS: This is a paragraph in a new-subscriber e-mail.
 #. TRANS: %s is a URL where the subscriber can be reported as abusive.
-#: lib/mail.php:245
+#: lib/mail.php:250
 #, php-format
 msgid ""
 "If you believe this account is being used abusively, you can block them from "
@@ -8742,7 +8811,7 @@ msgstr ""
 #. TRANS: %3$s is the subscriber's profile URL, %4$s is the subscriber's location (or empty)
 #. TRANS: %5$s is the subscriber's homepage URL (or empty), %6%s is the subscriber's bio (or empty)
 #. TRANS: %7$s is a link to the addressed user's e-mail settings.
-#: lib/mail.php:255
+#: lib/mail.php:260
 #, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -8769,14 +8838,14 @@ msgstr ""
 
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is biographical information.
-#: lib/mail.php:278
+#: lib/mail.php:283
 #, php-format
 msgid "Bio: %s"
 msgstr "Beschrijving: %s"
 
 #. TRANS: Subject of notification mail for new posting email address.
 #. TRANS: %s is the StatusNet sitename.
-#: lib/mail.php:307
+#: lib/mail.php:312
 #, php-format
 msgid "New email address for posting to %s"
 msgstr "Nieuw e-mailadres om e-mail te versturen aan %s"
@@ -8784,7 +8853,7 @@ msgstr "Nieuw e-mailadres om e-mail te versturen aan %s"
 #. TRANS: Body of notification mail for new posting email address.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is the e-mail address to send
 #. TRANS: to to post by e-mail, %3$s is a URL to more instructions.
-#: lib/mail.php:313
+#: lib/mail.php:318
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -8807,26 +8876,26 @@ msgstr ""
 
 #. TRANS: Subject line for SMS-by-email notification messages.
 #. TRANS: %s is the posting user's nickname.
-#: lib/mail.php:434
+#: lib/mail.php:439
 #, php-format
 msgid "%s status"
 msgstr "%s status"
 
 #. TRANS: Subject line for SMS-by-email address confirmation message.
-#: lib/mail.php:460
+#: lib/mail.php:465
 msgid "SMS confirmation"
 msgstr "SMS-bevestiging"
 
 #. TRANS: Main body heading for SMS-by-email address confirmation message.
 #. TRANS: %s is the addressed user's nickname.
-#: lib/mail.php:464
+#: lib/mail.php:469
 #, php-format
 msgid "%s: confirm you own this phone number with this code:"
 msgstr "%s: bevestig dat u deze telefoon bezit met deze code:"
 
 #. TRANS: Subject for 'nudge' notification email.
 #. TRANS: %s is the nudging user.
-#: lib/mail.php:485
+#: lib/mail.php:490
 #, php-format
 msgid "You have been nudged by %s"
 msgstr "%s heeft u gepord"
@@ -8834,7 +8903,7 @@ msgstr "%s heeft u gepord"
 #. TRANS: Body for 'nudge' notification email.
 #. TRANS: %1$s is the nuding user's long name, $2$s is the nudging user's nickname,
 #. TRANS: %3$s is a URL to post notices at, %4$s is the StatusNet sitename.
-#: lib/mail.php:492
+#: lib/mail.php:497
 #, php-format
 msgid ""
 "%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -8864,7 +8933,7 @@ msgstr ""
 
 #. TRANS: Subject for direct-message notification email.
 #. TRANS: %s is the sending user's nickname.
-#: lib/mail.php:539
+#: lib/mail.php:544
 #, php-format
 msgid "New private message from %s"
 msgstr "U hebt een nieuw privébericht van %s."
@@ -8873,7 +8942,7 @@ msgstr "U hebt een nieuw privébericht van %s."
 #. TRANS: %1$s is the sending user's long name, %2$s is the sending user's nickname,
 #. TRANS: %3$s is the message content, %4$s a URL to the message,
 #. TRANS: %5$s is the StatusNet sitename.
-#: lib/mail.php:547
+#: lib/mail.php:552
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -8909,7 +8978,7 @@ msgstr ""
 
 #. TRANS: Subject for favorite notification e-mail.
 #. TRANS: %1$s is the adding user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:599
+#: lib/mail.php:604
 #, php-format
 msgid "%1$s (@%2$s) added your notice as a favorite"
 msgstr "%1$s (@%2$s) heeft uw mededeling als favoriet toegevoegd"
@@ -8919,7 +8988,7 @@ msgstr "%1$s (@%2$s) heeft uw mededeling als favoriet toegevoegd"
 #. TRANS: %3$s is a URL to the faved notice, %4$s is the faved notice text,
 #. TRANS: %5$s is a URL to all faves of the adding user, %6$s is the StatusNet sitename,
 #. TRANS: %7$s is the adding user's nickname.
-#: lib/mail.php:606
+#: lib/mail.php:611
 #, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -8958,7 +9027,7 @@ msgstr ""
 "%6$s\n"
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:664
+#: lib/mail.php:669
 #, php-format
 msgid ""
 "The full conversation can be read here:\n"
@@ -8971,7 +9040,7 @@ msgstr ""
 
 #. TRANS: E-mail subject for notice notification.
 #. TRANS: %1$s is the sending user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:672
+#: lib/mail.php:677
 #, php-format
 msgid "%1$s (@%2$s) sent a notice to your attention"
 msgstr "%1$s (@%2$s) heeft u een mededeling gestuurd"
@@ -8982,7 +9051,7 @@ msgstr "%1$s (@%2$s) heeft u een mededeling gestuurd"
 #. TRANS: %5$s is a URL to the full conversion if it exists (otherwise empty),
 #. TRANS: %6$s is a URL to reply to the notice, %7$s is a URL to all @-replied for the addressed user,
 #. TRANS: %8$s is a URL to the addressed user's e-mail settings, %9$s is the sender's nickname.
-#: lib/mail.php:680
+#: lib/mail.php:685
 #, php-format
 msgid ""
 "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -9126,11 +9195,7 @@ msgstr "Geen wederzijdse abonnees."
 msgid "To"
 msgstr "Aan"
 
-#: lib/messageform.php:166 lib/noticeform.php:186
-msgid "Available characters"
-msgstr "Beschikbare tekens"
-
-#: lib/messageform.php:185 lib/noticeform.php:237
+#: lib/messageform.php:184 lib/noticeform.php:236
 msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr "Verzenden"
@@ -9139,17 +9204,10 @@ msgstr "Verzenden"
 msgid "Messages"
 msgstr "Berichten"
 
-#: lib/messagelistitem.php:123 lib/noticelist.php:522
+#: lib/messagelistitem.php:123 lib/noticelist.php:527
 msgid "from"
 msgstr "van"
 
-#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:165
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr ""
-"De gebruikersnaam mag alleen kleine letters en cijfers bevatten. Spaties "
-"zijn niet toegestaan."
-
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 #: lib/nickname.php:178
 msgid "Nickname cannot be empty."
@@ -9172,23 +9230,23 @@ msgstr "Mededeling verzenden"
 msgid "What's up, %s?"
 msgstr "Hallo, %s."
 
-#: lib/noticeform.php:194
+#: lib/noticeform.php:193
 msgid "Attach"
 msgstr "Toevoegen"
 
-#: lib/noticeform.php:198
+#: lib/noticeform.php:197
 msgid "Attach a file"
 msgstr "Bestand toevoegen"
 
-#: lib/noticeform.php:213
+#: lib/noticeform.php:212
 msgid "Share my location"
 msgstr "Mijn locatie bekend maken"
 
-#: lib/noticeform.php:216
+#: lib/noticeform.php:215
 msgid "Do not share my location"
 msgstr "Mijn locatie niet bekend maken"
 
-#: lib/noticeform.php:217
+#: lib/noticeform.php:216
 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
 "try again later"
@@ -9197,55 +9255,59 @@ msgstr ""
 "nog eens"
 
 #. TRANS: Used in coordinates as abbreviation of north
-#: lib/noticelist.php:452
+#: lib/noticelist.php:457
 msgid "N"
 msgstr "N"
 
 #. TRANS: Used in coordinates as abbreviation of south
-#: lib/noticelist.php:454
+#: lib/noticelist.php:459
 msgid "S"
 msgstr "Z"
 
 #. TRANS: Used in coordinates as abbreviation of east
-#: lib/noticelist.php:456
+#: lib/noticelist.php:461
 msgid "E"
 msgstr "O"
 
 #. TRANS: Used in coordinates as abbreviation of west
-#: lib/noticelist.php:458
+#: lib/noticelist.php:463
 msgid "W"
 msgstr "W"
 
-#: lib/noticelist.php:460
+#: lib/noticelist.php:465
 #, php-format
 msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 
-#: lib/noticelist.php:469
+#: lib/noticelist.php:474
 msgid "at"
 msgstr "op"
 
-#: lib/noticelist.php:518
+#: lib/noticelist.php:523
 msgid "web"
 msgstr "web"
 
-#: lib/noticelist.php:584
+#: lib/noticelist.php:589
 msgid "in context"
 msgstr "in context"
 
-#: lib/noticelist.php:619
+#: lib/noticelist.php:624
 msgid "Repeated by"
 msgstr "Herhaald door"
 
-#: lib/noticelist.php:646
+#: lib/noticelist.php:651
 msgid "Reply to this notice"
 msgstr "Op deze mededeling antwoorden"
 
-#: lib/noticelist.php:647
+#: lib/noticelist.php:652
 msgid "Reply"
 msgstr "Antwoorden"
 
-#: lib/noticelist.php:691
+#: lib/noticelist.php:678
+msgid "Delete this notice"
+msgstr "Deze mededeling verwijderen"
+
+#: lib/noticelist.php:696
 msgid "Notice repeated"
 msgstr "Mededeling herhaald"
 
@@ -9282,43 +9344,31 @@ msgstr "Dubbele mededeling."
 msgid "Couldn't insert new subscription."
 msgstr "Kon nieuw abonnement niet toevoegen."
 
-#. TRANS: Personal group navigation menu option when logged in for viewing @-replies.
-#: lib/personalgroupnav.php:107
-msgctxt "MENU"
+#: lib/personalgroupnav.php:104
+#, fuzzy
 msgid "Replies"
 msgstr "Antwoorden"
 
-#. TRANS: Personal group navigation menu option when logged in for seeing own profile.
-#: lib/personalgroupnav.php:114
-msgctxt "MENU"
-msgid "Profile"
-msgstr "Profiel"
-
-#. TRANS: Personal group navigation menu option when logged in for viewing own favourited notices.
-#: lib/personalgroupnav.php:120
-msgctxt "MENU"
+#: lib/personalgroupnav.php:109
+#, fuzzy
 msgid "Favorites"
 msgstr "Favorieten"
 
-#. TRANS: Personal group navigation menu option when logged in for viewing recieved personal messages.
-#: lib/personalgroupnav.php:133
-msgctxt "MENU"
+#: lib/personalgroupnav.php:120
+#, fuzzy
 msgid "Inbox"
 msgstr "Postvak IN"
 
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing recieved personal messages.
-#: lib/personalgroupnav.php:135
+#: lib/personalgroupnav.php:121
 msgid "Your incoming messages"
 msgstr "Uw inkomende berichten"
 
-#. TRANS: Personal group navigation menu option when logged in for viewing senet personal messages.
-#: lib/personalgroupnav.php:140
-msgctxt "MENU"
+#: lib/personalgroupnav.php:125
+#, fuzzy
 msgid "Outbox"
 msgstr "Postvak UIT"
 
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing senet personal messages.
-#: lib/personalgroupnav.php:142
+#: lib/personalgroupnav.php:126
 msgid "Your sent messages"
 msgstr "Uw verzonden berichten"
 
@@ -9333,9 +9383,26 @@ msgstr "Labels in de mededelingen van %s"
 msgid "Unknown"
 msgstr "Onbekend"
 
+#. TRANS: Plugin admin panel controls
+#: lib/plugindisableform.php:90
+msgctxt "plugin"
+msgid "Disable"
+msgstr ""
+
+#. TRANS: Plugin admin panel controls
+#: lib/pluginenableform.php:112
+msgctxt "plugin"
+msgid "Enable"
+msgstr ""
+
+#: lib/pluginlist.php:196
+msgctxt "plugin-description"
+msgid "(Plugin descriptions unavailable when disabled.)"
+msgstr ""
+
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:82
+#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:88
 msgid "Subscriptions"
 msgstr "Abonnementen"
 
@@ -9346,7 +9413,7 @@ msgstr "Alle abonnementen"
 
 #. TRANS: H2 text for user subscriber statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:90
+#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:96
 msgid "Subscribers"
 msgstr "Abonnees"
 
@@ -9368,7 +9435,7 @@ msgstr "Lid sinds"
 #. TRANS: Label for user statistics.
 #. TRANS: H2 text for user group membership statistics.
 #: lib/profileaction.php:239 lib/profileaction.php:290
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:104
 msgid "Groups"
 msgstr "Groepen"
 
@@ -9388,10 +9455,6 @@ msgstr "Alle groepen"
 msgid "Unimplemented method."
 msgstr "Methode niet geïmplementeerd."
 
-#: lib/publicgroupnav.php:78
-msgid "Public"
-msgstr "Openbaar"
-
 #: lib/publicgroupnav.php:82
 msgid "User groups"
 msgstr "Gebruikersgroepen"
@@ -9430,7 +9493,7 @@ msgid "Revoke the \"%s\" role from this user"
 msgstr "De gebruikersrol \"%s\" voor deze gebruiker intrekken"
 
 #. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:974
+#: lib/router.php:1001
 msgid "Page not found."
 msgstr "De pagina is niet aangetroffen."
 
@@ -9459,11 +9522,6 @@ msgctxt "BUTTON"
 msgid "Search"
 msgstr "Zoeken"
 
-#. TRANS: Definition list item with instructions on how to get (better) search results.
-#: lib/searchaction.php:170
-msgid "Search help"
-msgstr "Hulp bij zoeken"
-
 #: lib/searchgroupnav.php:80
 msgid "People"
 msgstr "Gebruikers"
@@ -9488,6 +9546,51 @@ msgstr "Naamloze sectie"
 msgid "More..."
 msgstr "Meer..."
 
+#: lib/settingsnav.php:78
+msgid "Change your profile settings"
+msgstr "Uw profielgegevens wijzigen"
+
+#: lib/settingsnav.php:83
+msgid "Upload an avatar"
+msgstr "Avatar uploaden"
+
+#: lib/settingsnav.php:88
+msgid "Change your password"
+msgstr "Uw wachtwoord wijzigen"
+
+#: lib/settingsnav.php:93
+msgid "Change email handling"
+msgstr "E-mailafhandeling wijzigen"
+
+#: lib/settingsnav.php:98
+msgid "Design your profile"
+msgstr "Uw profiel ontwerpen"
+
+#: lib/settingsnav.php:102
+msgid "URL"
+msgstr "URL"
+
+#: lib/settingsnav.php:103
+msgid "URL shorteners"
+msgstr ""
+
+#: lib/settingsnav.php:111
+msgid "Updates by instant messenger (IM)"
+msgstr "Updates via instant messenger (IM)"
+
+#: lib/settingsnav.php:118
+msgid "Updates by SMS"
+msgstr "Updates via SMS"
+
+#: lib/settingsnav.php:123
+#, fuzzy
+msgid "Connections"
+msgstr "Koppelingen"
+
+#: lib/settingsnav.php:124
+msgid "Authorized connected applications"
+msgstr "Geautoriseerde verbonden applicaties"
+
 #: lib/silenceform.php:67
 msgid "Silence"
 msgstr "Muilkorven"
@@ -9496,30 +9599,34 @@ msgstr "Muilkorven"
 msgid "Silence this user"
 msgstr "Deze gebruiker muilkorven"
 
-#: lib/subgroupnav.php:83
+#: lib/subgroupnav.php:89
 #, php-format
 msgid "People %s subscribes to"
 msgstr "Gebruikers waarop %s een abonnement heeft"
 
-#: lib/subgroupnav.php:91
+#: lib/subgroupnav.php:97
 #, php-format
 msgid "People subscribed to %s"
 msgstr "Gebruikers met een abonnement op %s"
 
-#: lib/subgroupnav.php:99
+#: lib/subgroupnav.php:105
 #, php-format
 msgid "Groups %s is a member of"
 msgstr "Groepen waar %s lid van is"
 
-#: lib/subgroupnav.php:105
+#: lib/subgroupnav.php:111
 msgid "Invite"
 msgstr "Uitnodigen"
 
-#: lib/subgroupnav.php:106
+#: lib/subgroupnav.php:112
 #, php-format
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Vrienden en collega's uitnodigen om u te vergezellen op %s"
 
+#: lib/subscribeform.php:115 lib/subscribeform.php:139
+msgid "Subscribe to this user"
+msgstr "Abonneren op deze gebruiker"
+
 #: lib/subscriberspeopleselftagcloudsection.php:48
 #: lib/subscriptionspeopleselftagcloudsection.php:48
 msgid "People Tagcloud as self-tagged"
@@ -9600,6 +9707,13 @@ msgstr ""
 "Er is een fout opgetreden tijdens het openen van het archiefbestand met de "
 "vormgeving."
 
+#: lib/threadednoticelist.php:270
+#, php-format
+msgid "Show all %d comment"
+msgid_plural "Show all %d comments"
+msgstr[0] ""
+msgstr[1] ""
+
 #: lib/topposterssection.php:74
 msgid "Top posters"
 msgstr "Meest actieve gebruikers"
@@ -9641,76 +9755,79 @@ msgstr "Abonnement opheffen"
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "Gebruiker %1$s (%2$d) heeft geen profielrecord."
 
-#. TRANS: Link text for changeing the avatar of the logged in user.
-#: lib/userprofile.php:121
+#: lib/userprofile.php:116
 msgid "Edit Avatar"
 msgstr "Avatar bewerken"
 
 #. TRANS: H2 for user actions in a profile.
 #. TRANS: H2 for entity actions in a profile.
-#: lib/userprofile.php:245 lib/userprofile.php:261
+#: lib/userprofile.php:216 lib/userprofile.php:232
 msgid "User actions"
 msgstr "Gebruikershandelingen"
 
 #. TRANS: Text shown in user profile of not yet compeltely deleted users.
-#: lib/userprofile.php:249
+#: lib/userprofile.php:220
 msgid "User deletion in progress..."
 msgstr "Bezig met het verwijderen van de gebruiker..."
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:277
+#: lib/userprofile.php:248
 msgid "Edit profile settings"
 msgstr "Profielinstellingen bewerken"
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:279
+#: lib/userprofile.php:250
 msgid "Edit"
 msgstr "Bewerken"
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:303
+#: lib/userprofile.php:274
 msgid "Send a direct message to this user"
 msgstr "Deze gebruiker een direct bericht zenden"
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:305
+#: lib/userprofile.php:276
 msgid "Message"
 msgstr "Bericht"
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:347
+#: lib/userprofile.php:318
 msgid "Moderate"
 msgstr "Modereren"
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:386
+#: lib/userprofile.php:357
 msgid "User role"
 msgstr "Gebruikersrol"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:389
+#: lib/userprofile.php:360
 msgctxt "role"
 msgid "Administrator"
 msgstr "Beheerder"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:391
+#: lib/userprofile.php:362
 msgctxt "role"
 msgid "Moderator"
 msgstr "Moderator"
 
+#: lib/util.php:321
+msgid "Not allowed to log in."
+msgstr "Aanmelden is niet toegestaan."
+
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1306
+#: lib/util.php:1337
 msgid "a few seconds ago"
 msgstr "een paar seconden geleden"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1309
+#: lib/util.php:1340
 msgid "about a minute ago"
 msgstr "ongeveer een minuut geleden"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1313
+#: lib/util.php:1344
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
@@ -9718,12 +9835,12 @@ msgstr[0] "ongeveer een minuut geleden"
 msgstr[1] "ongeveer %d minuten geleden"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1316
+#: lib/util.php:1347
 msgid "about an hour ago"
 msgstr "ongeveer een uur geleden"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1320
+#: lib/util.php:1351
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
@@ -9731,12 +9848,12 @@ msgstr[0] "ongeveer een uur geleden"
 msgstr[1] "ongeveer %d uur geleden"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1323
+#: lib/util.php:1354
 msgid "about a day ago"
 msgstr "ongeveer een dag geleden"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1327
+#: lib/util.php:1358
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
@@ -9744,12 +9861,12 @@ msgstr[0] "ongeveer een dag geleden"
 msgstr[1] "ongeveer %d dagen geleden"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1330
+#: lib/util.php:1361
 msgid "about a month ago"
 msgstr "ongeveer een maand geleden"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1334
+#: lib/util.php:1365
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
@@ -9757,7 +9874,7 @@ msgstr[0] "ongeveer een maand geleden"
 msgstr[1] "ongeveer %d maanden geleden"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1337
+#: lib/util.php:1368
 msgid "about a year ago"
 msgstr "ongeveer een jaar geleden"
 
@@ -9768,26 +9885,6 @@ msgstr "ongeveer een jaar geleden"
 msgid "%s is not a valid color! Use 3 or 6 hex characters."
 msgstr "%s is geen geldige kleur. Gebruik drie of zes hexadecimale tekens."
 
-#. TRANS: %s is the URL to the StatusNet site's Instant Messaging settings.
-#: lib/xmppmanager.php:287
-#, php-format
-msgid "Unknown user. Go to %s to add your address to your account"
-msgstr ""
-"Onbekende gebruiker. Ga naar %s om uw adres toe te voegen aan uw gebruiker."
-
-#. TRANS: Response to XMPP source when it sent too long a message.
-#. TRANS: %1$d the maximum number of allowed characters (used for plural), %2$d is the sent number.
-#: lib/xmppmanager.php:406
-#, php-format
-msgid "Message too long. Maximum is %1$d character, you sent %2$d."
-msgid_plural "Message too long. Maximum is %1$d characters, you sent %2$d."
-msgstr[0] ""
-"Het bericht te is lang. De maximale lengte is %1$d tekens. De lengte van uw "
-"bericht was %2$d."
-msgstr[1] ""
-"Het bericht te is lang. De maximale lengte is %1$d tekens. De lengte van uw "
-"bericht was %2$d."
-
 #. TRANS: Exception.
 #: lib/xrd.php:63
 msgid "Invalid XML."
@@ -9804,64 +9901,178 @@ msgstr "Ongeldige XML. De XRD-root mist."
 msgid "Getting backup from file '%s'."
 msgstr "De back-up wordt uit het bestand \"%s\" geladen."
 
-#~ msgid "Block this user."
-#~ msgstr "Deze gebruiker blokkeren."
+#~ msgid "Could not generate feed for group - %s"
+#~ msgstr "Het was niet mogelijk een groepfeed te maken - %s"
 
-#~ msgid "Delete this notice."
-#~ msgstr "Deze mededeling verwijderen."
-
-#~ msgid "Delete this user."
-#~ msgstr "Deze gebruiker verwijderen."
-
-#~ msgid "Restore default designs."
-#~ msgstr "Het standaardontwerp toepassen."
-
-#~ msgid "Reset back to default."
-#~ msgstr "De standaardinstellingen toepassen."
-
-#~ msgid "Save design."
-#~ msgstr "Ontwerp opslaan."
-
-#~ msgid "Disfavor favorite."
-#~ msgstr "Van uw favorietenlijst verwijderen."
-
-#~ msgid "\"%s\" not found."
-#~ msgstr "\"%s\" is niet aangetroffen."
-
-#~ msgid "Notice %s not found."
-#~ msgstr "Opmerking \"%s\" is niet gevonden."
-
-#~ msgid "Attachment %s not found."
-#~ msgstr "De bijlage %s is niet gevonden."
-
-#~ msgid "\"%s\" not supported for oembed requests."
-#~ msgstr "\"%s\" wordt niet ondersteund voor oembed-verzoeken."
-
-#~ msgid "Invalid tag: \"%s\"."
-#~ msgstr "Ongeldig label: \"%s\"."
-
-#~ msgid "%s updates from everyone."
-#~ msgstr "%s updates van iedereen."
-
-#~ msgid "Password saved"
-#~ msgstr "Het wachtwoord is opgeslagen"
-
-#~ msgid "Where you are, like \"City, State (or Region), Country\"."
-#~ msgstr ""
-#~ "Waar u bent, bijvoorbeeld \"woonplaats, land\" of \"postcode, land\"."
-
-#~ msgid "Subscribe to this user."
-#~ msgstr "Abonneren op deze gebruiker."
+#~ msgid "Current confirmed Jabber/Google Talk address."
+#~ msgstr "Huidige bevestigde Jabber- of Google Talk-adres."
 
 #~ msgid ""
-#~ "Listenee stream license \"%1$s\" is not compatible with site license \"%2"
-#~ "$s\"."
+#~ "Jabber or Google Talk address, like \"UserName@example.org\". First, make "
+#~ "sure to add %s to your buddy list in your IM client or on Google Talk."
 #~ msgstr ""
-#~ "De licentie \"%1$s\" voor de stream die u wilt volgen is niet compatibel "
-#~ "met de sitelicentie \"%2$s\"."
+#~ "Jabber-ID of Google Talk-adres, zoals \"gebruiker@example.org\". Zorg "
+#~ "ervoor dat u %s eerst aan uw contactenlijst in uw IM-programma of in "
+#~ "Google Talk toevoegt."
 
-#~ msgid "Not allowed to use API."
-#~ msgstr "Het gebruik van de API is niet toegestaan."
+#~ msgid "Send me notices through Jabber/Google Talk."
+#~ msgstr "Mij berichten sturen via Jabber of Google Talk."
 
-#~ msgid "Not allowed to log in."
-#~ msgstr "Aanmelden is niet toegestaan."
+#~ msgid "Publish a MicroID for my Jabber/Google Talk address."
+#~ msgstr "Een MicroID voor mijn Jabber- of Google Talk-adres publiceren."
+
+#~ msgid "No Jabber ID."
+#~ msgstr "Geen Jabber-ID."
+
+#~ msgid "Not a valid Jabber ID."
+#~ msgstr "Geen geldige Jabber-ID."
+
+#~ msgid "That is already your Jabber ID."
+#~ msgstr "U hebt dit al ingesteld als uw Jabber-ID."
+
+#~ msgid "That is not your Jabber ID."
+#~ msgstr "Dit is niet uw Jabber-ID."
+
+#~ msgid "Other settings"
+#~ msgstr "Overige instellingen"
+
+#~ msgid "Tag cloud"
+#~ msgstr "Woordwolk"
+
+#~ msgid "Consumer key"
+#~ msgstr "Gebruikerssleutel"
+
+#~ msgid "Consumer secret"
+#~ msgstr "Gebruikersgeheim"
+
+#~ msgid "Request token URL"
+#~ msgstr "URL voor verzoektoken"
+
+#~ msgid "Access token URL"
+#~ msgstr "URL voor toegangstoken"
+
+#~ msgid "Authorize URL"
+#~ msgstr "Autorisatie-URL"
+
+#~ msgid "Jabber"
+#~ msgstr "Jabber"
+
+#~ msgid "Photo"
+#~ msgstr "Foto"
+
+#~ msgid "Other options"
+#~ msgstr "Overige instellingen"
+
+#~ msgid "Other"
+#~ msgstr "Overige"
+
+#~ msgid "Primary site navigation"
+#~ msgstr "Primaire sitenavigatie"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Personal profile and friends timeline"
+#~ msgstr "Persoonlijk profiel en tijdlijn van vrienden"
+
+#~ msgctxt "MENU"
+#~ msgid "Personal"
+#~ msgstr "Persoonlijk"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Change your email, avatar, password, profile"
+#~ msgstr "Uw e-mailadres, avatar, wachtwoord of profiel wijzigen"
+
+#~ msgid "Account"
+#~ msgstr "Gebruiker"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Connect to services"
+#~ msgstr "Met andere diensten koppelen"
+
+#~ msgid "Connect"
+#~ msgstr "Koppelen"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Change site configuration"
+#~ msgstr "Websiteinstellingen wijzigen"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Invite friends and colleagues to join you on %s"
+#~ msgstr "Vrienden en collega's uitnodigen om u te vergezellen op %s"
+
+#~ msgctxt "MENU"
+#~ msgid "Invite"
+#~ msgstr "Uitnodigingen"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Create an account"
+#~ msgstr "Gebruiker aanmaken"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Help me!"
+#~ msgstr "Help me!"
+
+#~ msgctxt "MENU"
+#~ msgid "Help"
+#~ msgstr "Help"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Search for people or text"
+#~ msgstr "Naar gebruikers of tekst zoeken"
+
+#~ msgid "Local views"
+#~ msgstr "Lokale weergaven"
+
+#~ msgid "Page notice"
+#~ msgstr "Mededeling van de pagina"
+
+#~ msgid "Secondary site navigation"
+#~ msgstr "Secundaire sitenavigatie"
+
+#~ msgid "StatusNet software license"
+#~ msgstr "Licentie van de StatusNet-software"
+
+#~ msgid "Site content license"
+#~ msgstr "Licentie voor siteinhoud"
+
+#~ msgid "Pagination"
+#~ msgstr "Paginering"
+
+#~ msgid "Author"
+#~ msgstr "Auteur"
+
+#~ msgid "Provider"
+#~ msgstr "Provider"
+
+#~ msgctxt "MENU"
+#~ msgid "SMS"
+#~ msgstr "SMS"
+
+#~ msgid "Filter tags"
+#~ msgstr "Labels filteren"
+
+#~ msgid "[%s]"
+#~ msgstr "[%s]"
+
+#~ msgid "Available characters"
+#~ msgstr "Beschikbare tekens"
+
+#~ msgctxt "MENU"
+#~ msgid "Profile"
+#~ msgstr "Profiel"
+
+#~ msgid "Search help"
+#~ msgstr "Hulp bij zoeken"
+
+#~ msgid "Unknown user. Go to %s to add your address to your account"
+#~ msgstr ""
+#~ "Onbekende gebruiker. Ga naar %s om uw adres toe te voegen aan uw "
+#~ "gebruiker."
+
+#~ msgid "Message too long. Maximum is %1$d character, you sent %2$d."
+#~ msgid_plural "Message too long. Maximum is %1$d characters, you sent %2$d."
+#~ msgstr[0] ""
+#~ "Het bericht te is lang. De maximale lengte is %1$d tekens. De lengte van "
+#~ "uw bericht was %2$d."
+#~ msgstr[1] ""
+#~ "Het bericht te is lang. De maximale lengte is %1$d tekens. De lengte van "
+#~ "uw bericht was %2$d."
diff --git a/locale/nn/LC_MESSAGES/statusnet.po b/locale/nn/LC_MESSAGES/statusnet.po
index 905af12eb1..8858866316 100644
--- a/locale/nn/LC_MESSAGES/statusnet.po
+++ b/locale/nn/LC_MESSAGES/statusnet.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 15:58+0000\n"
-"PO-Revision-Date: 2011-03-03 16:01:12+0000\n"
+"POT-Creation-Date: 2011-03-03 17:23+0000\n"
+"PO-Revision-Date: 2011-03-03 17:26:18+0000\n"
 "Language-Team: Norwegian Nynorsk <http://translatewiki.net/wiki/Portal:nn>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -84,23 +84,23 @@ msgstr "Avatar-innstillingar"
 #. TRANS: Tooltip for button to save access settings in site admin panel.
 #. TRANS: Button text for saving theme settings.
 #. TRANS: Button label to save e-mail preferences.
-#. TRANS: Button label to save Instant Messaging preferences.
-#. TRANS: Button text for saving "Other settings" in profile.
+#. TRANS: Button label to save IM preferences.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
 #. TRANS: Button text for saving site notice in admin panel.
 #. TRANS: Button label to save SMS preferences.
 #. TRANS: Save button for settings for a profile in a subscriptions list.
+#. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
 #. TRANS: Button text on profile design page to save settings.
 #: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
-#: actions/emailsettings.php:250 actions/imsettings.php:183
-#: actions/othersettings.php:136 actions/pathsadminpanel.php:512
-#: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
-#: actions/smssettings.php:205 actions/subscriptions.php:259
+#: actions/emailsettings.php:251 actions/imsettings.php:199
+#: actions/pathsadminpanel.php:512 actions/profilesettings.php:198
+#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:204
+#: actions/subscriptions.php:261 actions/urlsettings.php:152
 #: actions/useradminpanel.php:298 lib/applicationeditform.php:355
-#: lib/designsettings.php:270 lib/groupeditform.php:201
+#: lib/designform.php:320 lib/groupeditform.php:201
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Save"
@@ -141,7 +141,11 @@ msgstr "Dette emneord finst ikkje."
 #. 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 use "one time password login" without using an existing user.
+#. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
+#. TRANS: Client error displayed trying to find a user by ID for a non-existing ID.
+#. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when calling a profile action without specifying a user.
 #: actions/all.php:80 actions/allrss.php:69
@@ -153,19 +157,19 @@ msgstr "Dette emneord finst ikkje."
 #: actions/apidirectmessage.php:75 actions/apidirectmessagenew.php:72
 #: actions/apigroupcreate.php:111 actions/apigroupismember.php:89
 #: actions/apigroupjoin.php:98 actions/apigroupleave.php:98
-#: actions/apigrouplist.php:70 actions/apistatusesupdate.php:230
-#: actions/apisubscriptions.php:85 actions/apitimelinefavorites.php:70
-#: actions/apitimelinefriends.php:173 actions/apitimelinehome.php:78
-#: actions/apitimelinementions.php:77 actions/apitimelineuser.php:79
-#: actions/avatarbynickname.php:79 actions/favoritesrss.php:72
-#: actions/foaf.php:42 actions/foaf.php:61 actions/hcard.php:67
-#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
-#: actions/remotesubscribe.php:144 actions/remotesubscribe.php:153
-#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
-#: actions/showfavorites.php:106 actions/userbyid.php:74
-#: actions/usergroups.php:93 actions/userrss.php:40 actions/userxrd.php:59
-#: actions/xrds.php:71 lib/command.php:509 lib/galleryaction.php:59
-#: lib/mailbox.php:80 lib/profileaction.php:77
+#: actions/apigrouplist.php:70 actions/apigroupprofileupdate.php:108
+#: actions/apistatusesupdate.php:230 actions/apisubscriptions.php:85
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:173
+#: actions/apitimelinehome.php:78 actions/apitimelinementions.php:77
+#: actions/apitimelineuser.php:79 actions/avatarbynickname.php:79
+#: actions/favoritesrss.php:72 actions/foaf.php:42 actions/foaf.php:61
+#: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116
+#: actions/otp.php:78 actions/remotesubscribe.php:144
+#: actions/remotesubscribe.php:153 actions/replies.php:73
+#: actions/repliesrss.php:38 actions/rsd.php:113 actions/showfavorites.php:106
+#: actions/userbyid.php:75 actions/usergroups.php:93 actions/userrss.php:40
+#: actions/userxrd.php:59 actions/xrds.php:71 lib/command.php:509
+#: lib/galleryaction.php:59 lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Brukaren finst ikkje."
 
@@ -179,10 +183,9 @@ msgstr "%s med vener"
 #. TRANS: H1 text for page. %s is a user nickname.
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Timeline title for user and friends. %s is a user nickname.
-#. TRANS: Tooltop for personal group navigation menu option when logged in for viewing timeline of self and friends.
 #: actions/all.php:94 actions/all.php:191 actions/allrss.php:117
 #: actions/apitimelinefriends.php:207 actions/apitimelinehome.php:113
-#: lib/personalgroupnav.php:102
+#: lib/personalgroupnav.php:100
 #, php-format
 msgid "%s and friends"
 msgstr "%s med vener"
@@ -234,7 +237,7 @@ msgstr ""
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
 #. TRANS: Second sentence of empty message for anonymous users. %s is a user nickname.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:227
+#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:221
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -282,19 +285,20 @@ msgstr "Oppdateringar frå %1$s og vener på %2$s!"
 #: actions/apifavoritecreate.php:98 actions/apifavoritedestroy.php:98
 #: actions/apifriendshipscreate.php:99 actions/apifriendshipsdestroy.php:99
 #: actions/apifriendshipsshow.php:124 actions/apigroupcreate.php:138
-#: actions/apigroupismember.php:115 actions/apigroupjoin.php:160
-#: actions/apigroupleave.php:145 actions/apigrouplist.php:134
+#: actions/apigroupismember.php:115 actions/apigroupjoin.php:151
+#: actions/apigroupleave.php:141 actions/apigrouplist.php:134
 #: actions/apigrouplistall.php:120 actions/apigroupmembership.php:105
+#: actions/apigroupprofileupdate.php:100 actions/apigroupprofileupdate.php:213
 #: actions/apigroupshow.php:114 actions/apihelptest.php:84
 #: actions/apistatusesdestroy.php:101 actions/apistatusesretweets.php:110
 #: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:139
 #: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
-#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:268
-#: actions/apitimelinegroup.php:147 actions/apitimelinehome.php:173
-#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:239
-#: actions/apitimelineretweetedtome.php:118
-#: actions/apitimelineretweetsofme.php:150 actions/apitimelinetag.php:159
-#: actions/apitimelineuser.php:206 actions/apiusershow.php:100
+#: actions/apitimelinefavorites.php:182 actions/apitimelinefriends.php:276
+#: actions/apitimelinegroup.php:148 actions/apitimelinehome.php:181
+#: actions/apitimelinementions.php:182 actions/apitimelinepublic.php:247
+#: actions/apitimelineretweetedtome.php:147
+#: actions/apitimelineretweetsofme.php:147 actions/apitimelinetag.php:165
+#: actions/apitimelineuser.php:217 actions/apiusershow.php:100
 msgid "API method not found."
 msgstr "Fann ikkje API-metode."
 
@@ -309,8 +313,9 @@ msgstr "Fann ikkje API-metode."
 #: actions/apifavoritecreate.php:88 actions/apifavoritedestroy.php:88
 #: actions/apifriendshipscreate.php:89 actions/apifriendshipsdestroy.php:89
 #: actions/apigroupcreate.php:102 actions/apigroupjoin.php:89
-#: actions/apigroupleave.php:89 actions/apimediaupload.php:66
-#: actions/apistatusesretweet.php:63 actions/apistatusesupdate.php:194
+#: actions/apigroupleave.php:89 actions/apigroupprofileupdate.php:92
+#: actions/apimediaupload.php:66 actions/apistatusesretweet.php:63
+#: actions/apistatusesupdate.php:194
 msgid "This method requires a POST."
 msgstr "Dette krev ein POST."
 
@@ -322,21 +327,16 @@ msgid ""
 msgstr ""
 
 #. TRANS: Server error displayed when a user's delivery device cannot be updated.
-#. TRANS: Server error displayed when a user update to the database fails in the contact address confirmation action.
 #. TRANS: Server error thrown on database error updating e-mail preferences.
 #. TRANS: Server error thrown on database error removing a registered e-mail address.
-#. TRANS: Server error thrown on database error updating Instant Messaging preferences.
-#. TRANS: Server error thrown on database error removing a registered Instant Messaging address.
-#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
 #. TRANS: Server error thrown when user profile settings could not be updated.
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
-#: actions/apiaccountupdatedeliverydevice.php:130
-#: actions/confirmaddress.php:118 actions/emailsettings.php:352
-#: actions/emailsettings.php:498 actions/imsettings.php:276
-#: actions/imsettings.php:432 actions/othersettings.php:186
-#: actions/profilesettings.php:322 actions/smssettings.php:301
-#: actions/smssettings.php:454
+#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
+#: actions/apiaccountupdatedeliverydevice.php:136
+#: actions/emailsettings.php:353 actions/emailsettings.php:499
+#: actions/profilesettings.php:323 actions/smssettings.php:300
+#: actions/smssettings.php:453 actions/urlsettings.php:211
 msgid "Could not update user."
 msgstr "Kan ikkje oppdatera brukar."
 
@@ -362,7 +362,7 @@ msgstr "Brukaren har inga profil."
 
 #. TRANS: Server error displayed if a user profile could not be saved.
 #. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:418
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:419
 msgid "Could not save profile."
 msgstr "Kan ikkje lagra profil."
 
@@ -374,7 +374,7 @@ msgstr "Kan ikkje lagra profil."
 #: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
 #: actions/designadminpanel.php:120 actions/editapplication.php:121
 #: actions/newapplication.php:102 actions/newnotice.php:95
-#: lib/designsettings.php:298
+#: lib/designsettings.php:110
 #, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s byte) due to its "
@@ -395,8 +395,8 @@ msgstr[1] ""
 #: actions/apiaccountupdateprofilecolors.php:160
 #: actions/apiaccountupdateprofilecolors.php:171
 #: actions/groupdesignsettings.php:285 actions/groupdesignsettings.php:296
-#: actions/userdesignsettings.php:201 actions/userdesignsettings.php:211
-#: actions/userdesignsettings.php:253 actions/userdesignsettings.php:263
+#: actions/userdesignsettings.php:218 actions/userdesignsettings.php:228
+#: actions/userdesignsettings.php:270 actions/userdesignsettings.php:280
 #, fuzzy
 msgid "Unable to save your design settings."
 msgstr "Klarte ikkje å lagra Twitter-innstillingane dine!"
@@ -405,7 +405,7 @@ msgstr "Klarte ikkje å lagra Twitter-innstillingane dine!"
 #. TRANS: Client error displayed when a database error occurs updating profile colours.
 #: actions/apiaccountupdateprofilebackgroundimage.php:191
 #: actions/apiaccountupdateprofilecolors.php:139
-#: actions/userdesignsettings.php:179
+#: actions/userdesignsettings.php:196
 #, fuzzy
 msgid "Could not update your design."
 msgstr "Kan ikkje oppdatera brukar."
@@ -516,7 +516,7 @@ msgstr "Kunne ikkje finne mottakar."
 #. TRANS: Client error displayed trying to direct message another user who's not a friend (403).
 #: actions/apidirectmessagenew.php:144
 #, fuzzy
-msgid "Can't send direct messages to users who aren't your friend."
+msgid "Cannot send direct messages to users who aren't your friend."
 msgstr "Kan ikkje senda direktemeldingar til brukarar som du ikkje er ven med."
 
 #. TRANS: Client error displayed trying to direct message self (403).
@@ -604,9 +604,9 @@ msgstr "Kan ikkje oppdatera brukar."
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:156 actions/editgroup.php:191
-#: actions/newgroup.php:137 actions/profilesettings.php:273
-#: actions/register.php:214
+#: actions/apigroupcreate.php:156 actions/apigroupprofileupdate.php:255
+#: actions/editgroup.php:191 actions/newgroup.php:137
+#: actions/profilesettings.php:274 actions/register.php:199
 msgid "Nickname already in use. Try another one."
 msgstr "Kallenamnet er allereie i bruk. Prøv eit anna."
 
@@ -614,9 +614,9 @@ msgstr "Kallenamnet er allereie i bruk. Prøv eit anna."
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:164 actions/editgroup.php:195
-#: actions/newgroup.php:141 actions/profilesettings.php:243
-#: actions/register.php:216
+#: actions/apigroupcreate.php:164 actions/apigroupprofileupdate.php:259
+#: actions/editgroup.php:195 actions/newgroup.php:141
+#: actions/profilesettings.php:244 actions/register.php:201
 msgid "Not a valid nickname."
 msgstr "Ikkje eit gyldig brukarnamn."
 
@@ -626,10 +626,10 @@ msgstr "Ikkje eit gyldig brukarnamn."
 #. TRANS: Validation error shown when providing an invalid homepage URL in the "New application" form.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:181 actions/editapplication.php:235
-#: actions/editgroup.php:202 actions/newapplication.php:221
-#: actions/newgroup.php:148 actions/profilesettings.php:248
-#: actions/register.php:223
+#: actions/apigroupcreate.php:181 actions/apigroupprofileupdate.php:277
+#: actions/editapplication.php:235 actions/editgroup.php:202
+#: actions/newapplication.php:221 actions/newgroup.php:148
+#: actions/profilesettings.php:249 actions/register.php:208
 msgid "Homepage is not a valid URL."
 msgstr "Heimesida er ikkje ei gyldig internettadresse."
 
@@ -638,8 +638,8 @@ msgstr "Heimesida er ikkje ei gyldig internettadresse."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:191 actions/editgroup.php:206
-#: actions/newgroup.php:152 actions/profilesettings.php:252
-#: actions/register.php:226
+#: actions/newgroup.php:152 actions/profilesettings.php:253
+#: actions/register.php:211
 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "Ditt fulle namn er for langt (maksimalt 255 teikn)."
@@ -667,8 +667,8 @@ msgstr[1] "Plassering er for lang (maksimalt 255 teikn)."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:215 actions/editgroup.php:218
-#: actions/newgroup.php:164 actions/profilesettings.php:265
-#: actions/register.php:235
+#: actions/newgroup.php:164 actions/profilesettings.php:266
+#: actions/register.php:220
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
 msgstr "Plassering er for lang (maksimalt 255 teikn)."
@@ -698,15 +698,16 @@ msgstr "Ugyldig merkelapp: %s"
 #. TRANS: %s is the alias that is already in use.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error. %s is the already used alias.
-#: actions/apigroupcreate.php:264 actions/editgroup.php:246
-#: actions/newgroup.php:193
+#: actions/apigroupcreate.php:264 actions/apigroupprofileupdate.php:351
+#: actions/editgroup.php:246 actions/newgroup.php:193
 #, fuzzy, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "Kallenamnet er allereie i bruk. Prøv eit anna."
 
 #. TRANS: Client error displayed when trying to use an alias during group creation that is the same as the group's nickname.
 #. TRANS: Group edit form validation error.
-#: actions/apigroupcreate.php:278 actions/editgroup.php:253
+#: actions/apigroupcreate.php:278 actions/apigroupprofileupdate.php:359
+#: actions/editgroup.php:253
 msgid "Alias can't be the same as nickname."
 msgstr ""
 
@@ -718,7 +719,8 @@ msgstr ""
 #. TRANS: Client error displayed requesting most recent notices to a group for a non-existing group.
 #: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
 #: actions/apigroupleave.php:104 actions/apigroupmembership.php:71
-#: actions/apigroupshow.php:81 actions/apitimelinegroup.php:89
+#: actions/apigroupprofileupdate.php:113 actions/apigroupshow.php:81
+#: actions/apitimelinegroup.php:89
 msgid "Group not found."
 msgstr "Finst ikkje."
 
@@ -737,13 +739,11 @@ msgstr "Du er allereie medlem av den gruppa"
 msgid "You have been blocked from that group by the admin."
 msgstr ""
 
-#. TRANS: Server error displayed when joining a group fails.
-#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
 #. 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.
 #. TRANS: Message given having failed to add a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:362
+#: actions/apigroupjoin.php:136 actions/joingroup.php:139 lib/command.php:362
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "Kunne ikkje bli med i gruppa."
@@ -754,8 +754,6 @@ msgstr "Kunne ikkje bli med i gruppa."
 msgid "You are not a member of this group."
 msgstr "Du er ikkje medlem av den gruppa."
 
-#. TRANS: Server error displayed when leaving a group fails.
-#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
 #. TRANS: Server error displayed when leaving a group failed in the database.
 #. TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
 #. TRANS: Message given having failed to remove a user from a group.
@@ -791,6 +789,62 @@ msgstr "%s grupper"
 msgid "groups on %s"
 msgstr "Gruppe handlingar"
 
+#. TRANS: Client error displayed trying to edit a group while not being a group admin.
+#. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
+#. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
+#: actions/apigroupprofileupdate.php:118 actions/editgroup.php:110
+#: actions/editgroup.php:176 actions/groupdesignsettings.php:109
+#: actions/grouplogo.php:111
+msgid "You must be an admin to edit the group."
+msgstr "Du må være logga inn for å lage ei gruppe."
+
+#. TRANS: Server error displayed when editing a group fails.
+#: actions/apigroupprofileupdate.php:171 actions/editgroup.php:274
+msgid "Could not update group."
+msgstr "Kann ikkje oppdatera gruppa."
+
+#. TRANS: Server error displayed when group aliases could not be added.
+#. TRANS: Server exception thrown when creating group aliases failed.
+#: actions/apigroupprofileupdate.php:194 actions/editgroup.php:281
+#: classes/User_group.php:540
+#, fuzzy
+msgid "Could not create aliases."
+msgstr "Kunne ikkje lagre favoritt."
+
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: actions/apigroupprofileupdate.php:249 lib/nickname.php:165
+msgid "Nickname must have only lowercase letters and numbers and no spaces."
+msgstr "Kallenamn må berre ha små bokstavar og nummer, ingen mellomrom."
+
+#: actions/apigroupprofileupdate.php:286
+#, fuzzy
+msgid "Full name is too long (max 255 chars)."
+msgstr "Ditt fulle namn er for langt (maksimalt 255 teikn)."
+
+#: actions/apigroupprofileupdate.php:296
+#, fuzzy, php-format
+msgid "description is too long (max %d chars)."
+msgstr "Plassering er for lang (maksimalt 255 teikn)."
+
+#: actions/apigroupprofileupdate.php:307
+#, fuzzy
+msgid "Location is too long (max 255 chars)."
+msgstr "Plassering er for lang (maksimalt 255 teikn)."
+
+#: actions/apigroupprofileupdate.php:326
+#, php-format
+msgid "Too many aliases! Maximum %d."
+msgstr ""
+
+#. TRANS: Group edit form validation error.
+#. TRANS: Group create form validation error.
+#. TRANS: %s is the invalid alias.
+#: actions/apigroupprofileupdate.php:342 actions/editgroup.php:241
+#: actions/newgroup.php:188
+#, fuzzy, php-format
+msgid "Invalid alias: \"%s\""
+msgstr "Ugyldig merkelapp: %s"
+
 #. TRANS: Client error displayed when uploading a media file has failed.
 #: actions/apimediaupload.php:101
 #, fuzzy
@@ -825,21 +879,22 @@ msgstr "Du tingar ikkje oppdateringar til den profilen."
 #. TRANS: Form validation error message.
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
+#. TRANS: Client error displayed when the session token is not okay.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
 #: actions/deletenotice.php:177 actions/disfavor.php:75
-#: actions/emailsettings.php:291 actions/favor.php:75 actions/geocode.php:55
+#: actions/emailsettings.php:292 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:65 actions/grouplogo.php:321
-#: actions/groupunblock.php:65 actions/imsettings.php:224
-#: actions/invite.php:60 actions/login.php:137 actions/makeadmin.php:66
-#: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
-#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
-#: actions/othersettings.php:155 actions/passwordsettings.php:138
-#: actions/profilesettings.php:217 actions/recoverpassword.php:383
-#: actions/register.php:172 actions/remotesubscribe.php:76
-#: actions/repeat.php:82 actions/smssettings.php:250 actions/subedit.php:40
-#: actions/subscribe.php:86 actions/tagother.php:166
-#: actions/unsubscribe.php:69 actions/userauthorization.php:52
-#: lib/designsettings.php:310
+#: actions/groupunblock.php:65 actions/imsettings.php:241
+#: actions/invite.php:60 actions/makeadmin.php:66 actions/newmessage.php:135
+#: actions/newnotice.php:105 actions/nudge.php:80
+#: actions/oauthappssettings.php:162 actions/oauthconnectionssettings.php:135
+#: actions/passwordsettings.php:137 actions/pluginenable.php:87
+#: actions/profilesettings.php:218 actions/recoverpassword.php:383
+#: actions/register.php:157 actions/remotesubscribe.php:76
+#: actions/repeat.php:82 actions/smssettings.php:249 actions/subedit.php:40
+#: actions/subscribe.php:87 actions/tagother.php:145
+#: actions/unsubscribe.php:69 actions/urlsettings.php:171
+#: actions/userauthorization.php:53 lib/designsettings.php:122
 msgid "There was a problem with your session token. Try again, please."
 msgstr "Der var eit problem med sesjonen din. Vennlegst prøv på nytt."
 
@@ -869,10 +924,10 @@ msgstr "databasefeil ved innsetjing av skigardmerkelapp (#merkelapp): %s"
 #. TRANS: Unknown form validation error in design settings form.
 #: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
 #: actions/designadminpanel.php:100 actions/editapplication.php:144
-#: actions/emailsettings.php:310 actions/grouplogo.php:332
-#: actions/imsettings.php:239 actions/newapplication.php:124
-#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
-#: actions/smssettings.php:271 lib/designsettings.php:321
+#: actions/emailsettings.php:311 actions/grouplogo.php:332
+#: actions/imsettings.php:256 actions/newapplication.php:124
+#: actions/oauthconnectionssettings.php:144 actions/recoverpassword.php:46
+#: actions/smssettings.php:270 lib/designsettings.php:133
 msgid "Unexpected form submission."
 msgstr "Uventa skjemasending."
 
@@ -916,31 +971,26 @@ msgstr "Konto"
 
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Field label in form for profile settings.
-#. TRANS: Label for group nickname (dt). Text hidden by default.
-#. TRANS: DT for nick name in a profile.
-#: actions/apioauthauthorize.php:459 actions/login.php:252
-#: actions/profilesettings.php:106 actions/register.php:432
-#: actions/showgroup.php:243 actions/tagother.php:94
+#: actions/apioauthauthorize.php:459 actions/login.php:225
+#: actions/profilesettings.php:107 actions/register.php:411
 #: actions/userauthorization.php:145 lib/groupeditform.php:145
-#: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "Kallenamn"
 
 #. TRANS: Field label on OAuth API authorisation form.
-#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:463 actions/login.php:255
-#: actions/register.php:436 lib/accountsettingsaction.php:120
+#: actions/apioauthauthorize.php:463 actions/login.php:228
+#: actions/register.php:415 lib/settingsnav.php:87
 msgid "Password"
 msgstr "Passord"
 
 #. TRANS: Button text that when clicked will cancel the process of allowing access to an account
 #. TRANS: by an external application.
 #. TRANS: Button label to cancel an e-mail address confirmation procedure.
-#. TRANS: Button label to cancel an Instant Messaging address confirmation procedure.
+#. TRANS: Button label to cancel an IM address confirmation procedure.
 #. TRANS: Button label to cancel a SMS address confirmation procedure.
 #. TRANS: Button label in the "Edit application" form.
-#: actions/apioauthauthorize.php:478 actions/emailsettings.php:124
-#: actions/imsettings.php:127 actions/smssettings.php:133
+#: actions/apioauthauthorize.php:478 actions/emailsettings.php:125
+#: actions/imsettings.php:136 actions/smssettings.php:132
 #: lib/applicationeditform.php:351
 #, fuzzy
 msgctxt "BUTTON"
@@ -1054,7 +1104,7 @@ msgstr "Fann ikkje API-metode."
 #. TRANS: %s is the requested output format.
 #: actions/apistatusesshow.php:144
 #, fuzzy, php-format
-msgid "Unsupported format: %s"
+msgid "Unsupported format: %s."
 msgstr "Støttar ikkje bileteformatet."
 
 #. TRANS: Client error displayed requesting a deleted status.
@@ -1138,13 +1188,6 @@ msgstr "%1$s sin status på %2$s"
 msgid "%1$s updates favorited by %2$s / %3$s."
 msgstr "%1$s oppdateringar som svarar på oppdateringar frå %2$s / %3$s."
 
-#. TRANS: Server error displayed when generating an Atom feed fails.
-#. TRANS: %s is the error.
-#: actions/apitimelinegroup.php:134
-#, fuzzy, php-format
-msgid "Could not generate feed for group - %s"
-msgstr "Kann ikkje oppdatera gruppa."
-
 #. TRANS: Title for timeline of most recent mentions of a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname.
 #: actions/apitimelinementions.php:115
@@ -1161,13 +1204,14 @@ msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr "%1$s oppdateringar som svarar på oppdateringar frå %2$s / %3$s."
 
 #. TRANS: Title for site timeline. %s is the StatusNet sitename.
+#. TRANS: Public RSS feed title. %s is the StatusNet site name.
 #: actions/apitimelinepublic.php:193 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "%s offentleg tidsline"
 
 #. TRANS: Subtitle for site timeline. %s is the StatusNet sitename.
-#: actions/apitimelinepublic.php:199 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:199
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "%s oppdateringar frå alle saman!"
@@ -1179,21 +1223,34 @@ msgid "Unimplemented."
 msgstr "Kommando ikkje implementert."
 
 #. TRANS: Title for Atom feed "repeated to me". %s is the user nickname.
-#: actions/apitimelineretweetedtome.php:108
+#: actions/apitimelineretweetedtome.php:96
 #, fuzzy, php-format
 msgid "Repeated to %s"
 msgstr "Svar til %s"
 
+#: actions/apitimelineretweetedtome.php:98
+#, fuzzy, php-format
+msgid "%1$s notices that were to repeated to %2$s / %3$s."
+msgstr "%1$s oppdateringar som svarar på oppdateringar frå %2$s / %3$s."
+
 #. TRANS: Title of list of repeated notices of the logged in user.
 #. TRANS: %s is the nickname of the logged in user.
-#: actions/apitimelineretweetsofme.php:112
+#: actions/apitimelineretweetsofme.php:98
 #, fuzzy, php-format
 msgid "Repeats of %s"
 msgstr "Svar til %s"
 
+#: actions/apitimelineretweetsofme.php:104
+#, fuzzy, php-format
+msgid "%1$s notices that %2$s / %3$s has repeated."
+msgstr ""
+"Send meg ein epost når nokon legg til ein av mine notisar som favoritt."
+
 #. TRANS: Title for timeline with lastest notices with a given tag.
 #. TRANS: %s is the tag.
-#: actions/apitimelinetag.php:101 actions/tag.php:67
+#. TRANS: Title for first page of notices with tags.
+#. TRANS: %s is the tag.
+#: actions/apitimelinetag.php:101 actions/tag.php:69
 #, php-format
 msgid "Notices tagged with %s"
 msgstr "Notisar merka med %s"
@@ -1206,54 +1263,55 @@ msgid "Updates tagged with %1$s on %2$s!"
 msgstr "Oppdateringar frå %1$s på %2$s!"
 
 #. TRANS: Client error displayed trying to add a notice to another user's timeline.
-#: actions/apitimelineuser.php:297
+#: actions/apitimelineuser.php:308
 #, fuzzy
 msgid "Only the user can add to their own timeline."
 msgstr "Kun brukaren kan lese sine eigne meldingar."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:304
+#: actions/apitimelineuser.php:315
 msgid "Only accept AtomPub for Atom feeds."
 msgstr ""
 
 #. TRANS: Client error displayed attempting to post an empty API notice.
-#: actions/apitimelineuser.php:311
+#: actions/apitimelineuser.php:322
 msgid "Atom post must not be empty."
 msgstr ""
 
 #. TRANS: Client error displayed attempting to post an API that is not well-formed XML.
-#: actions/apitimelineuser.php:317
+#: actions/apitimelineuser.php:328
 msgid "Atom post must be well-formed XML."
 msgstr ""
 
 #. TRANS: Client error displayed when not using an Atom entry.
-#: actions/apitimelineuser.php:323 actions/atompubfavoritefeed.php:228
+#: actions/apitimelineuser.php:334 actions/atompubfavoritefeed.php:228
 #: actions/atompubmembershipfeed.php:230
 #: actions/atompubsubscriptionfeed.php:236
 msgid "Atom post must be an Atom entry."
 msgstr ""
 
 #. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
-#: actions/apitimelineuser.php:335
+#: actions/apitimelineuser.php:345
 msgid "Can only handle POST activities."
 msgstr ""
 
 #. TRANS: Client error displayed when using an unsupported activity object type.
 #. TRANS: %s is the unsupported activity object type.
-#: actions/apitimelineuser.php:346
+#: actions/apitimelineuser.php:356
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
 #. TRANS: %d is the notice ID (number).
-#: actions/apitimelineuser.php:380
+#: actions/apitimelineuser.php:390
 #, fuzzy, php-format
 msgid "No content for notice %d."
 msgstr "Søk i innhaldet av notisar"
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:408
+#. TRANS: %s is the notice URI.
+#: actions/apitimelineuser.php:419
 #, fuzzy, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "Fann ingen profil med den IDen."
@@ -1270,9 +1328,10 @@ msgstr "Fann ikkje API-metode."
 
 #. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
 #. TRANS: Client exception.
+#. TRANS: Client error displayed trying to subscribe to a non-existing profile.
 #: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
 #: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
-#: actions/subscribe.php:107
+#: actions/subscribe.php:110
 #, fuzzy
 msgid "No such profile."
 msgstr "Denne notisen finst ikkje."
@@ -1420,7 +1479,7 @@ msgid "Not a member."
 msgstr "Alle medlemmar"
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
-#: actions/atompubshowmembership.php:151
+#: actions/atompubshowmembership.php:150
 #, fuzzy
 msgid "Cannot delete someone else's membership."
 msgstr "Kunne ikkje lagra abonnement."
@@ -1509,10 +1568,7 @@ msgid "Invalid size."
 msgstr "Ugyldig storleik."
 
 #. TRANS: Title for avatar upload page.
-#. TRANS: Label for group avatar (dt). Text hidden by default.
-#. TRANS: Link description in user account settings menu.
-#: actions/avatarsettings.php:66 actions/showgroup.php:227
-#: lib/accountsettingsaction.php:113
+#: actions/avatarsettings.php:66 lib/settingsnav.php:82
 msgid "Avatar"
 msgstr "Brukarbilete"
 
@@ -1525,9 +1581,11 @@ msgstr "Du kan lasta opp ein logo for gruppa."
 
 #. TRANS: Server error displayed in avatar upload page when no matching profile can be found for a user.
 #. TRANS: Server error displayed coming across a request from a user without a profile.
+#. TRANS: Server error displayed when trying to authorise a remote subscription request
+#. TRANS: while the user has no profile.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
 #: actions/grouplogo.php:184 actions/remotesubscribe.php:190
-#: actions/userauthorization.php:72 actions/userrss.php:108
+#: actions/userauthorization.php:75 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr "Brukaren har inga profil."
 
@@ -1586,10 +1644,10 @@ msgstr "Skaler"
 msgid "No file uploaded."
 msgstr "Ingen vald profil."
 
-#. TRANS: Avatar upload form unstruction after uploading a file.
+#. TRANS: Avatar upload form instruction after uploading a file.
 #: actions/avatarsettings.php:345
 #, fuzzy
-msgid "Pick a square area of the image to be your avatar"
+msgid "Pick a square area of the image to be your avatar."
 msgstr "Velg eit utvalg av bildet som vil blir din avatar."
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
@@ -1616,7 +1674,7 @@ msgstr "Lasta opp brukarbilete."
 
 #. TRANS: Title for backup account page.
 #. TRANS: Option in profile settings to create a backup of the account of the currently logged in user.
-#: actions/backupaccount.php:61 actions/profilesettings.php:467
+#: actions/backupaccount.php:61 actions/profilesettings.php:468
 msgid "Backup account"
 msgstr ""
 
@@ -1649,7 +1707,7 @@ msgstr ""
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
 #: actions/backupaccount.php:254
-msgid "Backup your account"
+msgid "Backup your account."
 msgstr ""
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
@@ -1688,7 +1746,7 @@ msgstr "Merknad"
 #. TRANS: Submit button title for 'No' when blocking a user.
 #: actions/block.php:158
 #, fuzzy
-msgid "Do not block this user"
+msgid "Do not block this user."
 msgstr "Lås opp brukaren"
 
 #. TRANS: Button label on the user block form.
@@ -1706,9 +1764,9 @@ msgid "Yes"
 msgstr "Jau"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#. TRANS: Description of the form to block a user.
-#: actions/block.php:165 lib/blockform.php:79
-msgid "Block this user"
+#: actions/block.php:165
+#, fuzzy
+msgid "Block this user."
 msgstr "Blokkér denne brukaren"
 
 #. TRANS: Server error displayed when blocking a user fails.
@@ -1777,32 +1835,48 @@ msgstr "Fann ikkje stadfestingskode."
 msgid "That confirmation code is not for you!"
 msgstr "Den godkjenningskoden er ikkje for deg!"
 
-#. TRANS: Server error for a unknow address type %s, which can be 'email', 'jabber', or 'sms'.
-#: actions/confirmaddress.php:92
+#. TRANS: Server error for an unknown address type, which can be 'email', 'sms', or the name of an IM network (such as 'xmpp' or 'aim')
+#: actions/confirmaddress.php:94
 #, fuzzy, php-format
-msgid "Unrecognized address type %s."
+msgid "Unrecognized address type %s"
 msgstr "Ukjend adressetype %s"
 
 #. TRANS: Client error for an already confirmed email/jabber/sms address.
-#: actions/confirmaddress.php:97
+#: actions/confirmaddress.php:103 actions/confirmaddress.php:136
 msgid "That address has already been confirmed."
 msgstr "Den addressa har alt blitt bekrefta."
 
+#: actions/confirmaddress.php:121 actions/imsettings.php:444
+#: actions/userdesignsettings.php:306
+#, fuzzy
+msgid "Couldn't update user."
+msgstr "Kan ikkje oppdatera brukar."
+
+#: actions/confirmaddress.php:144
+#, fuzzy
+msgid "Couldn't update user im preferences."
+msgstr "Kan ikkje oppdatera brukarinformajon."
+
+#: actions/confirmaddress.php:156
+#, fuzzy
+msgid "Couldn't insert user im preferences."
+msgstr "Kan ikkje leggja til ny tinging."
+
 #. TRANS: Server error displayed when an address confirmation code deletion from the
 #. TRANS: database fails in the contact address confirmation action.
-#: actions/confirmaddress.php:132
+#: actions/confirmaddress.php:169
 #, fuzzy
 msgid "Could not delete address confirmation."
 msgstr "Kan ikkje sletta e-postgodkjenning."
 
 #. TRANS: Title for the contact address confirmation action.
-#: actions/confirmaddress.php:150
+#: actions/confirmaddress.php:185
 msgid "Confirm address"
 msgstr "Godkjent epostadresse."
 
 #. TRANS: Success message for the contact address confirmation action.
 #. TRANS: %s can be 'email', 'jabber', or 'sms'.
-#: actions/confirmaddress.php:166
+#: actions/confirmaddress.php:200
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "Addressa \"%s\" har blitt bekrefta for din konto."
@@ -1817,6 +1891,7 @@ msgstr "Stadfestingskode"
 #. TRANS: Label for user statistics.
 #: actions/conversation.php:149 lib/noticelist.php:87
 #: lib/profileaction.php:246 lib/searchgroupnav.php:82
+#: lib/threadednoticelist.php:66
 msgid "Notices"
 msgstr "Notisar"
 
@@ -1852,7 +1927,7 @@ msgstr "Lasta opp brukarbilete."
 
 #. TRANS: Page title for page on which a user account can be deleted.
 #. TRANS: Option in profile settings to delete the account of the currently logged in user.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:475
+#: actions/deleteaccount.php:228 actions/profilesettings.php:476
 #, fuzzy
 msgid "Delete account"
 msgstr "Opprett ei ny gruppe"
@@ -1876,7 +1951,7 @@ msgstr ""
 #. TRANS: Field label for delete account confirmation entry.
 #. TRANS: Field label for password reset form where the password has to be typed again.
 #: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:262 actions/register.php:440
+#: actions/recoverpassword.php:262 actions/register.php:419
 msgid "Confirm"
 msgstr "Godta"
 
@@ -1906,15 +1981,15 @@ msgstr "Fann ikkje stadfestingskode."
 #. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
 #: actions/deleteapplication.php:79 actions/editapplication.php:78
-#: actions/showapplication.php:94
+#: actions/showapplication.php:90
 #, fuzzy
 msgid "You are not the owner of this application."
 msgstr "Du er ikkje medlem av den gruppa."
 
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
-#: actions/newapplication.php:112 actions/showapplication.php:118
-#: lib/action.php:1425
+#: actions/newapplication.php:112 actions/showapplication.php:113
+#: lib/action.php:1391
 msgid "There was a problem with your session token."
 msgstr "Det var eit problem med sesjons billetten din."
 
@@ -1936,13 +2011,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting an application.
 #: actions/deleteapplication.php:161
 #, fuzzy
-msgid "Do not delete this application"
+msgid "Do not delete this application."
 msgstr "Kan ikkje sletta notisen."
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
 #: actions/deleteapplication.php:167
 #, fuzzy
-msgid "Delete this application"
+msgid "Delete this application."
 msgstr "Slett denne notisen"
 
 #. TRANS: Client error when trying to delete group while not logged in.
@@ -1998,13 +2073,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting a group.
 #: actions/deletegroup.php:224
 #, fuzzy
-msgid "Do not delete this group"
+msgid "Do not delete this group."
 msgstr "Ikkje slett denne gruppa"
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
 #: actions/deletegroup.php:231
 #, fuzzy
-msgid "Delete this group"
+msgid "Delete this group."
 msgstr "Slett denne gruppa"
 
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
@@ -2012,14 +2087,16 @@ msgstr "Slett denne gruppa"
 #. TRANS: Client error displayed when trying to mark a notice as favorite without being logged in.
 #. TRANS: Client error displayed trying to block a user from a group while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
+#. TRANS: Client error displayed trying to log out when not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
+#. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
 #. TRANS: Client error displayed when trying to change user options while not logged in.
 #: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
-#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:69
+#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:70
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
-#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
-#: actions/tagother.php:33 actions/unsubscribe.php:52
+#: actions/nudge.php:63 actions/pluginenable.php:97 actions/subedit.php:33
+#: actions/subscribe.php:98 actions/tagother.php:33 actions/unsubscribe.php:52
 #: lib/adminpanelaction.php:71 lib/profileformaction.php:63
 #: lib/settingsaction.php:72
 msgid "Not logged in."
@@ -2049,12 +2126,13 @@ msgstr "Sikker på at du vil sletta notisen?"
 #. TRANS: Submit button title for 'No' when deleting a notice.
 #: actions/deletenotice.php:159
 #, fuzzy
-msgid "Do not delete this notice"
+msgid "Do not delete this notice."
 msgstr "Kan ikkje sletta notisen."
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:166 lib/noticelist.php:673
-msgid "Delete this notice"
+#: actions/deletenotice.php:166
+#, fuzzy
+msgid "Delete this notice."
 msgstr "Slett denne notisen"
 
 #. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
@@ -2092,19 +2170,17 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting a user.
 #: actions/deleteuser.php:158
 #, fuzzy
-msgid "Do not delete this user"
+msgid "Do not delete this user."
 msgstr "Ikkje slett denne gruppa"
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
-#. TRANS: Description of form for deleting a user.
-#: actions/deleteuser.php:165 lib/deleteuserform.php:75
+#: actions/deleteuser.php:165
 #, fuzzy
-msgid "Delete this user"
+msgid "Delete this user."
 msgstr "Slett denne notisen"
 
 #. TRANS: Message used as title for design settings for the site.
-#. TRANS: Link description in user account settings menu.
-#: actions/designadminpanel.php:60 lib/accountsettingsaction.php:134
+#: actions/designadminpanel.php:60 lib/settingsnav.php:97
 msgid "Design"
 msgstr ""
 
@@ -2177,8 +2253,7 @@ msgid "You can upload a custom StatusNet theme as a .ZIP archive."
 msgstr ""
 
 #. TRANS: Fieldset legend for theme background image.
-#. TRANS: Fieldset legend on profile design page.
-#: actions/designadminpanel.php:515 lib/designsettings.php:98
+#: actions/designadminpanel.php:515
 msgid "Change background image"
 msgstr ""
 
@@ -2186,7 +2261,7 @@ msgstr ""
 #. TRANS: Field label for background color selector.
 #. TRANS: Label on profile design page for setting a profile page background colour.
 #: actions/designadminpanel.php:525 actions/designadminpanel.php:609
-#: lib/designsettings.php:183
+#: lib/designform.php:238
 msgid "Background"
 msgstr ""
 
@@ -2211,13 +2286,13 @@ msgstr ""
 #. TRANS: Form guide for turning background image on or off on theme designer page.
 #. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
 #. TRANS: use of the uploaded profile image.
-#: actions/designadminpanel.php:577 lib/designsettings.php:159
+#: actions/designadminpanel.php:577 lib/designform.php:214
 msgid "Turn background image on or off."
 msgstr ""
 
 #. TRANS: Checkbox label to title background image on theme designer page.
 #. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-#: actions/designadminpanel.php:583 lib/designsettings.php:165
+#: actions/designadminpanel.php:583 lib/designform.php:220
 msgid "Tile background image"
 msgstr ""
 
@@ -2229,26 +2304,26 @@ msgstr "Endra passordet ditt"
 
 #. TRANS: Field label for content color selector.
 #. TRANS: Label on profile design page for setting a profile page content colour.
-#: actions/designadminpanel.php:623 lib/designsettings.php:197
+#: actions/designadminpanel.php:623 lib/designform.php:252
 msgid "Content"
 msgstr "Innhald"
 
 #. TRANS: Field label for sidebar color selector.
 #. TRANS: Label on profile design page for setting a profile page sidebar colour.
-#: actions/designadminpanel.php:637 lib/designsettings.php:211
+#: actions/designadminpanel.php:637 lib/designform.php:266
 #, fuzzy
 msgid "Sidebar"
 msgstr "Søk"
 
 #. TRANS: Field label for text color selector.
 #. TRANS: Label on profile design page for setting a profile page text colour.
-#: actions/designadminpanel.php:651 lib/designsettings.php:225
+#: actions/designadminpanel.php:651 lib/designform.php:280
 msgid "Text"
 msgstr "Tekst"
 
 #. TRANS: Field label for link color selector.
 #. TRANS: Label on profile design page for setting a profile page links colour.
-#: actions/designadminpanel.php:665 lib/designsettings.php:239
+#: actions/designadminpanel.php:665 lib/designform.php:294
 #, fuzzy
 msgid "Links"
 msgstr "Logg inn"
@@ -2270,22 +2345,21 @@ msgid "Use defaults"
 msgstr ""
 
 #. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: actions/designadminpanel.php:720 lib/designsettings.php:259
-msgid "Restore default designs"
-msgstr ""
+#: actions/designadminpanel.php:720
+#, fuzzy
+msgid "Restore default designs."
+msgstr "Klarte ikkje å lagra Twitter-innstillingane dine!"
 
 #. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: actions/designadminpanel.php:728 lib/designsettings.php:267
-msgid "Reset back to default"
+#: actions/designadminpanel.php:728
+msgid "Reset back to default."
 msgstr ""
 
 #. TRANS: Title for button for saving theme settings.
-#. TRANS: Title for button on profile design page to save settings.
-#: actions/designadminpanel.php:736 lib/designsettings.php:272
-msgid "Save design"
-msgstr ""
+#: actions/designadminpanel.php:736
+#, fuzzy
+msgid "Save design."
+msgstr "Profilinnstillingar"
 
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
 #: actions/disfavor.php:83
@@ -2317,7 +2391,7 @@ msgid "You must be logged in to edit an application."
 msgstr "Du må være logga inn for å lage ei gruppe."
 
 #. TRANS: Client error displayed trying to edit an application that does not exist.
-#: actions/editapplication.php:83 actions/showapplication.php:87
+#: actions/editapplication.php:83 actions/showapplication.php:83
 #, fuzzy
 msgid "No such application."
 msgstr "Denne notisen finst ikkje."
@@ -2416,82 +2490,54 @@ msgstr "Rediger %s gruppa"
 msgid "You must be logged in to create a group."
 msgstr "Du må være logga inn for å lage ei gruppe."
 
-#. TRANS: Client error displayed trying to edit a group while not being a group admin.
-#. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
-#. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
-#: actions/editgroup.php:110 actions/editgroup.php:176
-#: actions/groupdesignsettings.php:109 actions/grouplogo.php:111
-msgid "You must be an admin to edit the group."
-msgstr "Du må være logga inn for å lage ei gruppe."
-
 #. TRANS: Form instructions for group edit form.
 #: actions/editgroup.php:161
 msgid "Use this form to edit the group."
 msgstr "Bruk dette skjemaet for å redigere gruppa"
 
-#. TRANS: Group edit form validation error.
-#. TRANS: Group create form validation error.
-#. TRANS: %s is the invalid alias.
-#: actions/editgroup.php:241 actions/newgroup.php:188
-#, fuzzy, php-format
-msgid "Invalid alias: \"%s\""
-msgstr "Ugyldig merkelapp: %s"
-
-#. TRANS: Server error displayed when editing a group fails.
-#: actions/editgroup.php:274
-msgid "Could not update group."
-msgstr "Kann ikkje oppdatera gruppa."
-
-#. TRANS: Server error displayed when group aliases could not be added.
-#. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/editgroup.php:281 classes/User_group.php:540
-#, fuzzy
-msgid "Could not create aliases."
-msgstr "Kunne ikkje lagre favoritt."
-
 #. TRANS: Group edit form success message.
 #: actions/editgroup.php:301
 msgid "Options saved."
 msgstr "Lagra innstillingar."
 
 #. TRANS: Title for e-mail settings.
-#: actions/emailsettings.php:59
+#: actions/emailsettings.php:60
 msgid "Email settings"
 msgstr "Profilinnstillingar"
 
 #. TRANS: E-mail settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/emailsettings.php:73
+#: actions/emailsettings.php:74
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 msgstr "Styr korleis du får epost frå %%site.name%%."
 
 #. TRANS: Form legend for e-mail settings form.
 #. TRANS: Field label for e-mail address input in e-mail settings form.
-#: actions/emailsettings.php:103 actions/emailsettings.php:129
+#: actions/emailsettings.php:104 actions/emailsettings.php:130
 #, fuzzy
 msgid "Email address"
 msgstr "Epostadresser"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:109
+#: actions/emailsettings.php:110
 msgid "Current confirmed email address."
 msgstr "Godkjent epostadresse."
 
 #. TRANS: Button label to remove a confirmed e-mail address.
 #. TRANS: Button label for removing a set sender e-mail address to post notices from.
-#. TRANS: Button label to remove a confirmed Instant Messaging address.
+#. TRANS: Button label to remove a confirmed IM address.
 #. TRANS: Button label to remove a confirmed SMS address.
 #. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
-#: actions/emailsettings.php:112 actions/emailsettings.php:179
-#: actions/imsettings.php:112 actions/smssettings.php:120
-#: actions/smssettings.php:176
+#: actions/emailsettings.php:113 actions/emailsettings.php:180
+#: actions/imsettings.php:119 actions/smssettings.php:119
+#: actions/smssettings.php:175
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Gjenopprett"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:119
+#: actions/emailsettings.php:120
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -2504,15 +2550,15 @@ msgstr ""
 #. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
 #. TRANS: Any other domain may be owned by a legitimate person or
 #. TRANS: organization.
-#: actions/emailsettings.php:136
+#: actions/emailsettings.php:137
 msgid "Email address, like \"UserName@example.org\""
 msgstr "Epostadresse («brukarnamn@example.org»)"
 
 #. TRANS: Button label for adding an e-mail address in e-mail settings form.
-#. TRANS: Button label for adding an Instant Messaging address in Instant Messaging settings form.
+#. TRANS: Button label for adding an IM address in IM settings form.
 #. TRANS: Button label for adding a SMS phone number in SMS settings form.
-#: actions/emailsettings.php:140 actions/imsettings.php:147
-#: actions/smssettings.php:158
+#: actions/emailsettings.php:141 actions/imsettings.php:147
+#: actions/smssettings.php:157
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Add"
@@ -2520,29 +2566,29 @@ msgstr "Legg til"
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:148 actions/smssettings.php:167
+#: actions/emailsettings.php:149 actions/smssettings.php:166
 msgid "Incoming email"
 msgstr "Innkomande epost"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:154
+#: actions/emailsettings.php:155
 msgid "I want to post notices by email."
 msgstr "Eg vil senda notisar med epost."
 
 #. TRANS: Form instructions for incoming e-mail form in e-mail settings.
 #. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
-#: actions/emailsettings.php:176 actions/smssettings.php:174
+#: actions/emailsettings.php:177 actions/smssettings.php:173
 msgid "Send email to this address to post new notices."
 msgstr "Send epost til denne addressa for å legge til nye notisar."
 
 #. TRANS: Instructions for incoming e-mail address input form, when an address has already been assigned.
 #. TRANS: Instructions for incoming SMS e-mail address input form.
-#: actions/emailsettings.php:185 actions/smssettings.php:182
+#: actions/emailsettings.php:186 actions/smssettings.php:181
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr "Vel ny epostadresse til å oppdatera med; fjerner den gamle."
 
 #. TRANS: Instructions for incoming e-mail address input form.
-#: actions/emailsettings.php:189
+#: actions/emailsettings.php:190
 msgid ""
 "To send notices via email, we need to create a unique email address for you "
 "on this server:"
@@ -2550,92 +2596,92 @@ msgstr ""
 
 #. TRANS: Button label for adding an e-mail address to send notices from.
 #. TRANS: Button label for adding an SMS e-mail address to send notices from.
-#: actions/emailsettings.php:195 actions/smssettings.php:185
+#: actions/emailsettings.php:196 actions/smssettings.php:184
 #, fuzzy
 msgctxt "BUTTON"
 msgid "New"
 msgstr "Ny"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:204
+#: actions/emailsettings.php:205
 msgid "Email preferences"
 msgstr "Epostadresser"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:212
+#: actions/emailsettings.php:213
 msgid "Send me notices of new subscriptions through email."
 msgstr "Send meg ein notis ved nye tingingar på epost."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:218
+#: actions/emailsettings.php:219
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr ""
 "Send meg ein epost når nokon legg til ein av mine notisar som favoritt."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:225
+#: actions/emailsettings.php:226
 msgid "Send me email when someone sends me a private message."
 msgstr "Send meg ein epost når nokon sender meg ei privat melding."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:231
+#: actions/emailsettings.php:232
 #, fuzzy
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr "Send meg ein epost når nokon sender meg ei privat melding."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:237
+#: actions/emailsettings.php:238
 msgid "Allow friends to nudge me and send me an email."
 msgstr "Tillat vennar å sende meg ein epost."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:243
+#: actions/emailsettings.php:244
 msgid "Publish a MicroID for my email address."
 msgstr "Publiser ein MicroID for epost addressa mi."
 
 #. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:361
+#: actions/emailsettings.php:362
 msgid "Email preferences saved."
 msgstr "Lagra brukarval."
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:380
+#: actions/emailsettings.php:381
 msgid "No email address."
 msgstr "Ingen epostadresse."
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:388
+#: actions/emailsettings.php:389
 #, fuzzy
 msgid "Cannot normalize that email address."
 msgstr "Klarar ikkje normalisera epostadressa"
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:393 actions/register.php:212
+#: actions/emailsettings.php:394 actions/register.php:197
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "Ikkje ei gyldig epostadresse."
 
 #. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:397
+#: actions/emailsettings.php:398
 msgid "That is already your email address."
 msgstr "Det er alt din epost addresse"
 
 #. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:401
+#: actions/emailsettings.php:402
 msgid "That email address already belongs to another user."
 msgstr "Den epost addressa er alt registrert hos ein annan brukar."
 
 #. TRANS: Server error thrown on database error adding e-mail confirmation code.
 #. TRANS: Server error thrown on database error adding Instant Messaging confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:418 actions/imsettings.php:343
-#: actions/smssettings.php:365
+#: actions/emailsettings.php:419 actions/imsettings.php:362
+#: actions/smssettings.php:364
 #, fuzzy
 msgid "Could not insert confirmation code."
 msgstr "Kan ikkje leggja til godkjenningskode."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:425
+#: actions/emailsettings.php:426
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
@@ -2646,60 +2692,63 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling Instant Messaging address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:445 actions/imsettings.php:377
-#: actions/smssettings.php:399
+#: actions/emailsettings.php:446 actions/imsettings.php:391
+#: actions/smssettings.php:398
 msgid "No pending confirmation to cancel."
 msgstr "Ingen ventande stadfesting å avbryta."
 
 #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:450
+#: actions/emailsettings.php:451
 #, fuzzy
 msgid "That is the wrong email address."
 msgstr "Det er feil lynmeldings addresse."
 
 #. TRANS: Server error thrown on database error canceling e-mail address confirmation.
 #. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
-#: actions/emailsettings.php:459 actions/smssettings.php:413
+#: actions/emailsettings.php:460 actions/smssettings.php:412
 #, fuzzy
 msgid "Could not delete email confirmation."
 msgstr "Kan ikkje sletta e-postgodkjenning."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:464
+#: actions/emailsettings.php:465
 msgid "Email confirmation cancelled."
 msgstr "Ingen ventande stadfesting å avbryta."
 
 #. TRANS: Message given trying to remove an e-mail address that is not
 #. TRANS: registered for the active user.
-#: actions/emailsettings.php:483
+#: actions/emailsettings.php:484
 msgid "That is not your email address."
 msgstr "Det er ikkje din epost addresse."
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:504
+#: actions/emailsettings.php:505
 msgid "The email address was removed."
 msgstr "Fjerna innkomande epostadresse."
 
 #. TRANS: Form validation error displayed when trying to remove an incoming e-mail address while no address has been set.
-#: actions/emailsettings.php:518 actions/smssettings.php:555
+#: actions/emailsettings.php:519 actions/smssettings.php:554
 msgid "No incoming email address."
 msgstr "Ingen innkomande epostadresse."
 
 #. TRANS: Server error thrown on database error removing incoming e-mail address.
 #. TRANS: Server error thrown on database error adding incoming e-mail address.
-#: actions/emailsettings.php:530 actions/emailsettings.php:554
-#: actions/smssettings.php:565 actions/smssettings.php:588
+#. TRANS: Server error displayed when the user could not be updated in SMS settings.
+#: actions/emailsettings.php:531 actions/emailsettings.php:555
+#: actions/smssettings.php:565 actions/smssettings.php:590
 #, fuzzy
 msgid "Could not update user record."
 msgstr "Kan ikkje oppdatera brukarinformajon."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:534 actions/smssettings.php:568
+#. TRANS: Confirmation text after updating SMS settings.
+#: actions/emailsettings.php:535 actions/smssettings.php:569
 msgid "Incoming email address removed."
 msgstr "Fjerna innkomande epostadresse."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:558 actions/smssettings.php:591
+#. TRANS: Confirmation text after updating SMS settings.
+#: actions/emailsettings.php:559 actions/smssettings.php:594
 msgid "New incoming email address added."
 msgstr "La til ny innkomande epostadresse."
 
@@ -2711,7 +2760,7 @@ msgstr "Denne notisen er alt ein favoritt!"
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
 #: actions/favor.php:95
 #, fuzzy
-msgid "Disfavor favorite"
+msgid "Disfavor favorite."
 msgstr "Fjern favoritt"
 
 #. TRANS: Page title for first page of favorited notices.
@@ -2758,9 +2807,8 @@ msgstr ""
 #. TRANS: %s is a user's nickname.
 #. TRANS: Title for first page of favourite notices of a user.
 #. TRANS: %s is the user for whom the favourite notices are displayed.
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing own favourited notices.
 #: actions/favoritesrss.php:111 actions/showfavorites.php:76
-#: lib/personalgroupnav.php:122
+#: lib/personalgroupnav.php:110
 #, php-format
 msgid "%s's favorite notices"
 msgstr "%s's favoritt meldingar"
@@ -2957,13 +3005,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
 #: actions/groupblock.php:191
 #, fuzzy
-msgid "Do not block this user from this group"
+msgid "Do not block this user from this group."
 msgstr "Ei liste over brukarane i denne gruppa."
 
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
 #: actions/groupblock.php:198
 #, fuzzy
-msgid "Block this user from this group"
+msgid "Block this user from this group."
 msgstr "Ei liste over brukarane i denne gruppa."
 
 #. TRANS: Server error displayed when trying to block a user from a group fails because of an application error.
@@ -2972,6 +3020,7 @@ msgid "Database error blocking user from group."
 msgstr ""
 
 #. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
+#. TRANS: Client error displayed trying to find a user by ID without providing an ID.
 #: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr "Nei Jabber-ID"
@@ -3002,7 +3051,7 @@ msgid "Unable to update your design settings."
 msgstr "Klarte ikkje å lagra Twitter-innstillingane dine!"
 
 #. TRANS: Form text to confirm saved group design settings.
-#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:222
+#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:239
 msgid "Design preferences saved."
 msgstr "Lagra brukarval."
 
@@ -3066,7 +3115,7 @@ msgid "A list of the users in this group."
 msgstr "Ei liste over brukarane i denne gruppa."
 
 #. TRANS: Indicator in group members list that this user is a group administrator.
-#: actions/groupmembers.php:190
+#: actions/groupmembers.php:190 lib/action.php:581
 msgid "Admin"
 msgstr "Administrator"
 
@@ -3155,8 +3204,10 @@ msgid "Group search"
 msgstr "Gruppesøk"
 
 #. TRANS: Text on page where groups can be searched if no results were found for a query.
-#: actions/groupsearch.php:82 actions/noticesearch.php:117
-#: actions/peoplesearch.php:83
+#. TRANS: Text for notice search results is the query had no results.
+#. TRANS: Message on the "People search" page where a query has no results.
+#: actions/groupsearch.php:82 actions/noticesearch.php:122
+#: actions/peoplesearch.php:87
 msgid "No results."
 msgstr "Resultat frå kommandoen"
 
@@ -3190,166 +3241,169 @@ msgid "User is not blocked from group."
 msgstr "Brukar har blokkert deg."
 
 #. TRANS: Server error displayed when unblocking a user from a group fails because of an unknown error.
+#. TRANS: Server error displayed when removing a user block.
 #: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "Feil ved fjerning av blokka."
 
 #. TRANS: Title for Instant Messaging settings.
-#: actions/imsettings.php:58
+#: actions/imsettings.php:56
 msgid "IM settings"
 msgstr "Avatar-innstillingar"
 
 #. 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.
-#: actions/imsettings.php:71
+#: actions/imsettings.php:69
 #, fuzzy, php-format
 msgid ""
-"You can send and receive notices through Jabber/Google Talk [instant "
-"messages](%%doc.im%%). Configure your address and settings below."
+"You can send and receive notices through instant messaging [instant messages]"
+"(%%doc.im%%). Configure your addresses and settings below."
 msgstr ""
 "Du kan sende og motta meldingar gjennom Jabber/GTalk [direktemeldingar](%%"
 "doc.im%%).  Set opp adressa og innstillingar under."
 
-#. TRANS: Message given in the Instant Messaging settings if XMPP is not enabled on the site.
+#. TRANS: Message given in the IM settings if IM is not enabled on the site.
 #: actions/imsettings.php:90
 #, fuzzy
 msgid "IM is not available."
 msgstr "Denne sida er ikkje tilgjengleg i eit"
 
-#. TRANS: Form legend for Instant Messaging settings form.
-#. TRANS: Field label for Instant Messaging address input in Instant Messaging settings form.
-#: actions/imsettings.php:102 actions/imsettings.php:132
-msgid "IM address"
-msgstr "Epostadresser"
+#: actions/imsettings.php:116
+#, fuzzy, php-format
+msgid "Current confirmed %s address."
+msgstr "Godkjent epostadresse."
 
-#: actions/imsettings.php:109
-#, fuzzy
-msgid "Current confirmed Jabber/Google Talk address."
-msgstr "Stadfesta Jabber/Gtalk-adresse."
-
-#. TRANS: Form note in Instant Messaging settings form.
-#. TRANS: %s is the Instant Messaging address set for the site.
-#: actions/imsettings.php:120
+#. TRANS: Form note in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:128
 #, fuzzy, php-format
 msgid ""
-"Awaiting confirmation on this address. Check your Jabber/Google Talk account "
-"for a message with further instructions. (Did you add %s to your buddy list?)"
+"Awaiting confirmation on this address. Check your %s account for a message "
+"with further instructions. (Did you add %s to your buddy list?)"
 msgstr ""
 "Venter på godkjenning. Sjekk din Jabber/GTalk-konto for ei melding med "
 "instruksjonar (la du %s til venelista di?)"
 
-#. TRANS: IM address input field instructions in Instant Messaging settings form.
-#. TRANS: %s is the Instant Messaging address set for the site.
-#. TRANS: Do not translate "example.org". It is one of the domain names reserved for use in examples by
-#. TRANS: http://www.rfc-editor.org/rfc/rfc2606.txt. Any other domain may be owned by a legitimate
-#. TRANS: person or organization.
-#: actions/imsettings.php:139
-#, fuzzy, php-format
-msgid ""
-"Jabber or Google Talk address, like \"UserName@example.org\". First, make "
-"sure to add %s to your buddy list in your IM client or on Google Talk."
-msgstr ""
-"Jabber- eller GTalk-adresse, døme «brukarnamn@example.org». Hugs å fyrst "
-"leggja %s til venelista di i ljonmeldingsklienten din."
+#: actions/imsettings.php:140
+msgid "IM address"
+msgstr "Epostadresser"
 
-#. TRANS: Form legend for Instant Messaging preferences form.
-#: actions/imsettings.php:154
-msgid "IM preferences"
+#: actions/imsettings.php:142
+#, php-format
+msgid "%s screenname."
+msgstr ""
+
+#. TRANS: Header for IM preferences form.
+#: actions/imsettings.php:163
+#, fuzzy
+msgid "IM Preferences"
 msgstr "Lagra brukarval."
 
-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:159
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:174
 #, fuzzy
-msgid "Send me notices through Jabber/Google Talk."
-msgstr "Send meg ein notis via Jabber/GTalk."
+msgid "Send me notices"
+msgstr "Send ei melding"
 
-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:165
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:176
 #, fuzzy
-msgid "Post a notice when my Jabber/Google Talk status changes."
+msgid "Post a notice when my status changes."
 msgstr "Legg til ein notis når min Jabber/GTalk status forandrar seg."
 
-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:171
-#, fuzzy
-msgid ""
-"Send me replies through Jabber/Google Talk from people I'm not subscribed to."
-msgstr "Send meg svar via Jabber/GTalk fra folk eg ikkje abbonnerar på."
-
-#. TRANS: Checkbox label in Instant Messaging preferences form.
+#. TRANS: Checkbox label in IM preferences form.
 #: actions/imsettings.php:178
 #, fuzzy
-msgid "Publish a MicroID for my Jabber/Google Talk address."
-msgstr "Publiser ein MicroID for Jabber/GTalk addressene mine"
+msgid "Send me replies from people I'm not subscribed to."
+msgstr "Send meg svar via Jabber/GTalk fra folk eg ikkje abbonnerar på."
 
-#. TRANS: Confirmation message for successful Instant Messaging preferences save.
-#: actions/imsettings.php:283 actions/othersettings.php:192
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:181
+#, fuzzy
+msgid "Publish a MicroID"
+msgstr "Publiser ein MicroID for epost addressa mi."
+
+#. TRANS: Server error thrown on database error updating IM preferences.
+#: actions/imsettings.php:291
+#, fuzzy
+msgid "Couldn't update IM preferences."
+msgstr "Kan ikkje oppdatera brukar."
+
+#. TRANS: Confirmation message for successful IM preferences save.
+#. TRANS: Confirmation message after saving preferences.
+#: actions/imsettings.php:298 actions/urlsettings.php:244
 msgid "Preferences saved."
 msgstr "Lagra brukarval."
 
-#. TRANS: Message given saving Instant Messaging address without having provided one.
-#: actions/imsettings.php:304
-msgid "No Jabber ID."
-msgstr "Nei Jabber-ID"
-
-#. TRANS: Message given saving Instant Messaging address that cannot be normalised.
-#: actions/imsettings.php:312
+#. TRANS: Message given saving IM address without having provided one.
+#: actions/imsettings.php:320
 #, fuzzy
-msgid "Cannot normalize that Jabber ID."
+msgid "No screenname."
+msgstr "Ingen kallenamn."
+
+#: actions/imsettings.php:325
+#, fuzzy
+msgid "No transport."
+msgstr "Denne notisen finst ikkje."
+
+#. TRANS: Message given saving IM address that cannot be normalised.
+#: actions/imsettings.php:333
+#, fuzzy
+msgid "Cannot normalize that screenname"
 msgstr "Klarar ikkje normalisera Jabber-IDen"
 
-#. TRANS: Message given saving Instant Messaging address that not valid.
-#: actions/imsettings.php:317
+#. TRANS: Message given saving IM address that not valid.
+#: actions/imsettings.php:340
 #, fuzzy
-msgid "Not a valid Jabber ID."
-msgstr "Ikkje ein gyldig Jabber-ID"
+msgid "Not a valid screenname"
+msgstr "Ikkje eit gyldig brukarnamn."
 
-#. TRANS: Message given saving Instant Messaging address that is already set.
-#: actions/imsettings.php:321
-msgid "That is already your Jabber ID."
-msgstr "Det er alt din Jabber ID."
-
-#. TRANS: Message given saving Instant Messaging address that is already set for another user.
-#: actions/imsettings.php:325
-msgid "Jabber ID already belongs to another user."
+#. TRANS: Message given saving IM address that is already set for another user.
+#: actions/imsettings.php:344
+#, fuzzy
+msgid "Screenname already belongs to another user."
 msgstr "Jabber-ID tilhøyrer allereie ein annan brukar."
 
-#. TRANS: Message given saving valid Instant Messaging address that is to be confirmed.
-#. TRANS: %s is the Instant Messaging address set for the site.
-#: actions/imsettings.php:353
-#, php-format
-msgid ""
-"A confirmation code was sent to the IM address you added. You must approve %"
-"s for sending messages to you."
+#. TRANS: Message given saving valid IM address that is to be confirmed.
+#: actions/imsettings.php:369
+#, fuzzy
+msgid "A confirmation code was sent to the IM address you added."
 msgstr ""
 "Sendte godkjenningskode til ljonmeldingsadressa du la til. Du må godtaka %s "
 "for å senda meldinger til deg."
 
-#. TRANS: Message given canceling Instant Messaging address confirmation for the wrong IM address.
-#: actions/imsettings.php:382
+#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#: actions/imsettings.php:396
 msgid "That is the wrong IM address."
 msgstr "Det er feil lynmeldings addresse."
 
-#. TRANS: Server error thrown on database error canceling Instant Messaging address confirmation.
-#: actions/imsettings.php:391
+#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#: actions/imsettings.php:405
 #, fuzzy
-msgid "Could not delete IM confirmation."
+msgid "Couldn't delete confirmation."
 msgstr "Kan ikkje sletta e-postgodkjenning."
 
-#. TRANS: Message given after successfully canceling Instant Messaging address confirmation.
-#: actions/imsettings.php:396
+#. TRANS: Message given after successfully canceling IM address confirmation.
+#: actions/imsettings.php:410
 msgid "IM confirmation cancelled."
 msgstr "Ingen stadfestingskode."
 
-#. TRANS: Message given trying to remove an Instant Messaging address that is not
+#. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.
-#: actions/imsettings.php:417
-msgid "That is not your Jabber ID."
-msgstr "Det er ikkje din Jabber ID."
+#: actions/imsettings.php:434
+#, fuzzy
+msgid "That is not your screenname."
+msgstr "Det er ikkje ditt telefonnummer"
+
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#: actions/imsettings.php:443
+#, fuzzy
+msgid "Couldn't update user im prefs."
+msgstr "Kan ikkje oppdatera brukarinformajon."
 
 #. TRANS: Message given after successfully removing a registered Instant Messaging address.
-#: actions/imsettings.php:440
+#: actions/imsettings.php:451
 msgid "The IM address was removed."
 msgstr "Fjerna innkomande epostadresse."
 
@@ -3561,7 +3615,7 @@ msgid "You must be logged in to join a group."
 msgstr "Du må være logga inn for å bli med i ei gruppe."
 
 #. TRANS: Title for join group page after joining.
-#: actions/joingroup.php:147
+#: actions/joingroup.php:148
 #, fuzzy, php-format
 msgctxt "TITLE"
 msgid "%1$s joined group %2$s"
@@ -3690,7 +3744,7 @@ msgstr ""
 #. TRANS: Submit button title.
 #: actions/licenseadminpanel.php:311 actions/sessionsadminpanel.php:199
 #: actions/siteadminpanel.php:292 actions/snapshotadminpanel.php:245
-#: actions/tagother.php:154 lib/applicationeditform.php:357
+#: actions/tagother.php:133 lib/applicationeditform.php:357
 msgid "Save"
 msgstr "Lagra"
 
@@ -3698,40 +3752,42 @@ msgstr "Lagra"
 msgid "Save license settings"
 msgstr ""
 
-#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
+#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
+#: actions/login.php:97 actions/otp.php:62 actions/register.php:130
 msgid "Already logged in."
 msgstr "Allereie logga inn."
 
-#: actions/login.php:148
+#: actions/login.php:125
 msgid "Incorrect username or password."
 msgstr "Feil brukarnamn eller passord."
 
-#: actions/login.php:154 actions/otp.php:120
+#. TRANS: Server error displayed when a user object could not be created trying to login using "one time password login".
+#: actions/login.php:131 actions/otp.php:127
 #, fuzzy
 msgid "Error setting user. You are probably not authorized."
 msgstr "Ikkje autorisert."
 
-#: actions/login.php:210 actions/login.php:263
+#: actions/login.php:185 actions/login.php:236 lib/action.php:598
 msgid "Login"
 msgstr "Logg inn"
 
-#: actions/login.php:249
+#: actions/login.php:222
 msgid "Login to site"
 msgstr "Logg inn "
 
-#: actions/login.php:258 actions/register.php:490
+#: actions/login.php:231 actions/register.php:469
 msgid "Remember me"
 msgstr "Hugs meg"
 
-#: actions/login.php:259 actions/register.php:492
+#: actions/login.php:232 actions/register.php:471
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "Logg inn automatisk i framtidi (ikkje for delte maskiner)."
 
-#: actions/login.php:269
+#: actions/login.php:241
 msgid "Lost or forgotten password?"
 msgstr "Mista eller gløymd passord?"
 
-#: actions/login.php:288
+#: actions/login.php:259
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -3739,12 +3795,12 @@ msgstr ""
 "Skriv inn brukarnam og passord før du endrar innstillingar (av "
 "tryggleiksomsyn)."
 
-#: actions/login.php:292
+#: actions/login.php:263
 #, fuzzy
 msgid "Login with your username and password."
 msgstr "Log inn med brukarnamn og passord."
 
-#: actions/login.php:295
+#: actions/login.php:266
 #, fuzzy, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -3879,7 +3935,9 @@ msgstr "Ny notis"
 msgid "Notice posted"
 msgstr "Melding lagra"
 
-#: actions/noticesearch.php:68
+#. TRANS: Instructions for Notice search page.
+#. TRANS: %%site.name%% is the name of the StatusNet site.
+#: actions/noticesearch.php:69
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -3888,37 +3946,47 @@ msgstr ""
 "Søk i notisar på %%site.name%% i innhald. Separer nøkkelord med mellomrom; "
 "dei må være minimum 3 bokstavar eller meir."
 
-#: actions/noticesearch.php:78
+#. TRANS: Title of the page where users can search for notices.
+#: actions/noticesearch.php:80
 msgid "Text search"
 msgstr "Tekstsøk"
 
-#: actions/noticesearch.php:91
+#. TRANS: Test in RSS notice search.
+#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
+#: actions/noticesearch.php:95
 #, php-format
 msgid "Search results for \"%1$s\" on %2$s"
 msgstr "Melding fra %1$s på %2$s"
 
-#: actions/noticesearch.php:121
+#. TRANS: Text for logged in users making a query for notices without results.
+#. TRANS: This message contains a Markdown link.
+#: actions/noticesearch.php:128
 #, php-format
 msgid ""
 "Be the first to [post on this topic](%%%%action.newnotice%%%%?"
 "status_textarea=%s)!"
 msgstr ""
 
-#: actions/noticesearch.php:124
+#. TRANS: Text for not logged in users making a query for notices without results.
+#. TRANS: This message contains Markdown links.
+#: actions/noticesearch.php:133
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and be the first to "
 "[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
 msgstr ""
 
-#: actions/noticesearchrss.php:96
+#. TRANS: RSS notice search feed title. %s is the query.
+#: actions/noticesearchrss.php:95
 #, fuzzy, php-format
 msgid "Updates with \"%s\""
 msgstr "Oppdateringar frå %1$s på %2$s!"
 
-#: actions/noticesearchrss.php:98
+#. TRANS: RSS notice search feed description.
+#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
+#: actions/noticesearchrss.php:99
 #, fuzzy, php-format
-msgid "Updates matching search term \"%1$s\" on %2$s!"
+msgid "Updates matching search term \"%1$s\" on %2$s."
 msgstr "Oppdateringar frå %1$s på %2$s!"
 
 #: actions/nudge.php:85
@@ -3939,53 +4007,53 @@ msgid "Nudge sent!"
 msgstr "Dytta!"
 
 #. TRANS: Message displayed to an anonymous user trying to view OAuth application list.
-#: actions/oauthappssettings.php:60
+#: actions/oauthappssettings.php:57
 msgid "You must be logged in to list your applications."
 msgstr "Du må være logga inn for å bli med i ei gruppe."
 
 #. TRANS: Page title for OAuth applications
-#: actions/oauthappssettings.php:76
+#: actions/oauthappssettings.php:73
 #, fuzzy
 msgid "OAuth applications"
 msgstr "Andre val"
 
 #. TRANS: Page instructions for OAuth applications
-#: actions/oauthappssettings.php:88
+#: actions/oauthappssettings.php:85
 msgid "Applications you have registered"
 msgstr ""
 
 #. TRANS: Empty list message on page with OAuth applications.
-#: actions/oauthappssettings.php:141
+#: actions/oauthappssettings.php:138
 #, php-format
 msgid "You have not registered any applications yet."
 msgstr ""
 
 #. TRANS: Title for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:71
+#: actions/oauthconnectionssettings.php:69
 msgid "Connected applications"
 msgstr ""
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:83
+#: actions/oauthconnectionssettings.php:80
 msgid "The following connections exist for your account."
 msgstr ""
 
 #. TRANS: Client error when trying to revoke access for an application while not being a user of it.
-#: actions/oauthconnectionssettings.php:168
+#: actions/oauthconnectionssettings.php:165
 #, fuzzy
 msgid "You are not a user of that application."
 msgstr "Du er ikkje medlem av den gruppa."
 
 #. TRANS: Client error when revoking access has failed for some reason.
 #. TRANS: %s is the application ID revoking access failed for.
-#: actions/oauthconnectionssettings.php:183
+#: actions/oauthconnectionssettings.php:180
 #, fuzzy, php-format
 msgid "Unable to revoke access for application: %s."
 msgstr "Bruk dette skjemaet for å redigere gruppa"
 
 #. TRANS: Success message after revoking access for an application.
 #. TRANS: %1$s is the application name, %2$s is the first part of the user token.
-#: actions/oauthconnectionssettings.php:202
+#: actions/oauthconnectionssettings.php:199
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -3993,20 +4061,30 @@ msgid ""
 msgstr ""
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:213
+#: actions/oauthconnectionssettings.php:210
 msgid "You have not authorized any applications to use your account."
 msgstr ""
 
 #. TRANS: Note for developers in the OAuth connection settings form.
 #. TRANS: This message contains a Markdown link. Do not separate "](".
 #. TRANS: %s is the URL to the OAuth settings.
-#: actions/oauthconnectionssettings.php:233
+#: actions/oauthconnectionssettings.php:230
 #, php-format
 msgid ""
 "Are you a developer? [Register an OAuth client application](%s) to use with "
 "this instance of StatusNet."
 msgstr ""
 
+#: actions/oembed.php:64
+#, fuzzy, php-format
+msgid "\"%s\" not found."
+msgstr "Fann ikkje API-metode."
+
+#: actions/oembed.php:76
+#, fuzzy, php-format
+msgid "Notice %s not found."
+msgstr "Fann ikkje API-metode."
+
 #: actions/oembed.php:80 actions/shownotice.php:100
 msgid "Notice has no profile."
 msgstr "Brukaren har inga profil."
@@ -4016,6 +4094,16 @@ msgstr "Brukaren har inga profil."
 msgid "%1$s's status on %2$s"
 msgstr "%1$s sin status på %2$s"
 
+#: actions/oembed.php:95
+#, fuzzy, php-format
+msgid "Attachment %s not found."
+msgstr "Kunne ikkje finne mottakar."
+
+#: actions/oembed.php:136
+#, php-format
+msgid "\"%s\" not supported for oembed requests."
+msgstr ""
+
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
 #: actions/oembed.php:168
 #, fuzzy, php-format
@@ -4029,99 +4117,64 @@ msgid "Only %s URLs over plain HTTP please."
 msgstr ""
 
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1205
-#: lib/apiaction.php:1232 lib/apiaction.php:1367
+#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1207
+#: lib/apiaction.php:1234 lib/apiaction.php:1369
 msgid "Not a supported data format."
 msgstr "Ikkje eit støtta dataformat."
 
+#. TRANS: ShortName in the OpenSearch interface when trying to find users.
 #: actions/opensearch.php:64
 msgid "People Search"
 msgstr "Søk etter folk"
 
-#: actions/opensearch.php:67
+#: actions/opensearch.php:68
 msgid "Notice Search"
 msgstr "Notissøk"
 
-#: actions/othersettings.php:59
-msgid "Other settings"
-msgstr "Avatar-innstillingar"
-
-#. TRANS: Instructions for tab "Other" in user profile settings.
-#: actions/othersettings.php:71
-msgid "Manage various other options."
-msgstr "Velikehald andre innstillingar"
-
-#. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
-#. TRANS: user's profile settings. Use of "free" is as in "open", indicating that the
-#. TRANS: information on the shortener site is freely distributable.
-#. TRANS: This message has one space at the beginning. Use your language's word separator
-#. TRANS: here if it has one (most likely a single space).
-#: actions/othersettings.php:113
-msgid " (free service)"
-msgstr ""
-
-#. TRANS: Label for dropdown with URL shortener services.
-#: actions/othersettings.php:122
-msgid "Shorten URLs with"
-msgstr ""
-
-#. TRANS: Tooltip for for dropdown with URL shortener services.
-#: actions/othersettings.php:124
-msgid "Automatic shortening service to use."
-msgstr "Den automatisk forkortingstenesta du vil bruke"
-
-#. TRANS: Label for checkbox.
-#: actions/othersettings.php:130
-#, fuzzy
-msgid "View profile designs"
-msgstr "Profilinnstillingar"
-
-#. TRANS: Tooltip for checkbox.
-#: actions/othersettings.php:132
-msgid "Show or hide profile designs."
-msgstr ""
-
-#. TRANS: Form validation error for form "Other settings" in user profile.
-#: actions/othersettings.php:164
-#, fuzzy
-msgid "URL shortening service is too long (maximum 50 characters)."
-msgstr "Adressa til forkortingstenesta er for lang (maksimalt 50 teikn)."
-
-#: actions/otp.php:69
+#. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
+#: actions/otp.php:70
 #, fuzzy
 msgid "No user ID specified."
 msgstr "Ingen vald profil."
 
-#: actions/otp.php:83
+#. TRANS: Client error displayed trying to use "one time password login" without specifying a login token.
+#: actions/otp.php:86
 #, fuzzy
 msgid "No login token specified."
 msgstr "Ingen vald profil."
 
-#: actions/otp.php:90
+#. TRANS: Client error displayed trying to use "one time password login" without requesting a login token.
+#: actions/otp.php:94
 msgid "No login token requested."
 msgstr "Ingen autoriserings-spørjing!"
 
-#: actions/otp.php:95
+#. TRANS: Client error displayed trying to use "one time password login" while specifying an invalid login token.
+#: actions/otp.php:100
 #, fuzzy
 msgid "Invalid login token specified."
 msgstr "Ugyldig notisinnhald"
 
-#: actions/otp.php:104
+#. TRANS: Client error displayed trying to use "one time password login" while specifying an expired login token.
+#: actions/otp.php:110
 #, fuzzy
 msgid "Login token expired."
 msgstr "Logg inn "
 
-#: actions/outbox.php:58
+#. TRANS: Title for outbox for any but the fist page.
+#. TRANS: %1$s is the user nickname, %2$d is the page number.
+#: actions/outbox.php:57
 #, fuzzy, php-format
 msgid "Outbox for %1$s - page %2$d"
 msgstr "Utboks for %s"
 
+#. TRANS: Title for first page of outbox.
 #: actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
 msgstr "Utboks for %s"
 
-#: actions/outbox.php:104
+#. TRANS: Instructions for outbox.
+#: actions/outbox.php:103
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr "Dette er din utboks som syner alle private meldingar du har sendt."
 
@@ -4147,43 +4200,45 @@ msgstr "Gamalt passord"
 msgid "New password"
 msgstr "Nytt passord"
 
-#: actions/passwordsettings.php:109
+#: actions/passwordsettings.php:109 actions/register.php:416
 #, fuzzy
-msgid "6 or more characters"
+msgid "6 or more characters."
 msgstr "6 eller fleire teikn"
 
-#: actions/passwordsettings.php:113
+#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#: actions/passwordsettings.php:113 actions/recoverpassword.php:264
+#: actions/register.php:420
 #, fuzzy
-msgid "Same as password above"
+msgid "Same as password above."
 msgstr "Samme passord som over"
 
 #: actions/passwordsettings.php:117
 msgid "Change"
 msgstr "Endra"
 
-#: actions/passwordsettings.php:154 actions/register.php:238
+#: actions/passwordsettings.php:153 actions/register.php:223
 msgid "Password must be 6 or more characters."
 msgstr "Passord må være minst 6 teikn."
 
-#: actions/passwordsettings.php:157 actions/register.php:241
+#: actions/passwordsettings.php:156 actions/register.php:226
 msgid "Passwords don't match."
 msgstr "Passorda var ikkje like."
 
-#: actions/passwordsettings.php:165
+#: actions/passwordsettings.php:164
 msgid "Incorrect old password"
 msgstr "Det gamle passordet stemmer ikkje"
 
-#: actions/passwordsettings.php:181
+#: actions/passwordsettings.php:180
 msgid "Error saving user; invalid."
 msgstr "Feil ved lagring av brukar; fungerer ikkje."
 
-#: actions/passwordsettings.php:186
+#. TRANS: Reset password form validation error message.
+#: actions/passwordsettings.php:185 actions/recoverpassword.php:418
 #, fuzzy
-msgid "Can't save new password."
+msgid "Cannot save new password."
 msgstr "Klarar ikkje lagra nytt passord."
 
-#. TRANS: Title for password recovery page in password saved mode.
-#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
+#: actions/passwordsettings.php:191
 msgid "Password saved."
 msgstr "Lagra passord."
 
@@ -4401,8 +4456,7 @@ msgid "Directory where backgrounds are located."
 msgstr ""
 
 #. TRANS: Fieldset legens in Paths admin panel.
-#. TRANS: DT element label in attachment list.
-#: actions/pathsadminpanel.php:419 lib/attachmentlist.php:98
+#: actions/pathsadminpanel.php:419
 msgid "Attachments"
 msgstr ""
 
@@ -4476,7 +4530,9 @@ msgstr ""
 msgid "Save paths"
 msgstr "Statusmelding"
 
-#: actions/peoplesearch.php:52
+#. TRANS: Instructions for the "People search" page.
+#. TRANS: %%site.name%% is the name of the StatusNet site.
+#: actions/peoplesearch.php:54
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
@@ -4485,7 +4541,8 @@ msgstr ""
 "Søk for mennesker på %%site.name%% i namn, lokasjon eller interesse. Separer "
 "nøkkelord med mellomrom; dei må være minimum 3 bokstavar eller meir."
 
-#: actions/peoplesearch.php:58
+#. TRANS: Title of a page where users can search for other users.
+#: actions/peoplesearch.php:61
 msgid "People search"
 msgstr "Søk etter folk"
 
@@ -4499,6 +4556,60 @@ msgstr "Ikkje ei gyldig epostadresse."
 msgid "Users self-tagged with %1$s - page %2$d"
 msgstr "Brukarar sjølv-merka med %s, side %d"
 
+#. TRANS: Page title for AJAX form return when a disabling a plugin.
+#: actions/plugindisable.php:69
+msgctxt "plugin"
+msgid "Disabled"
+msgstr ""
+
+#. TRANS: Client error displayed trying to perform any request method other than POST.
+#. TRANS: Do not translate POST.
+#: actions/pluginenable.php:78 actions/subscribe.php:77
+msgid "This action only accepts POST requests."
+msgstr ""
+
+#: actions/pluginenable.php:102
+#, fuzzy
+msgid "You cannot administer plugins."
+msgstr "Kan ikkje oppdatera brukar."
+
+#: actions/pluginenable.php:109
+#, fuzzy
+msgid "No such plugin."
+msgstr "Dette emneord finst ikkje."
+
+#. TRANS: Page title for AJAX form return when enabling a plugin.
+#: actions/pluginenable.php:159
+msgctxt "plugin"
+msgid "Enabled"
+msgstr ""
+
+#. TRANS: Tab and title for plugins admin panel.
+#. TRANS: Menu item for site administration
+#: actions/pluginsadminpanel.php:56 actions/version.php:191
+#: lib/adminpanelaction.php:411
+msgid "Plugins"
+msgstr ""
+
+#. TRANS: Instructions at top of plugin admin page.
+#: actions/pluginsadminpanel.php:68
+msgid ""
+"Additional plugins can be enabled and configured manually. See the <a href="
+"\"http://status.net/wiki/Plugins\">online plugin documentation</a> for more "
+"details."
+msgstr ""
+
+#. TRANS: Admin form section header
+#: actions/pluginsadminpanel.php:84
+#, fuzzy
+msgid "Default plugins"
+msgstr "Foretrukke språk"
+
+#: actions/pluginsadminpanel.php:106
+msgid ""
+"All default plugins have been disabled from the site's configuration file."
+msgstr ""
+
 #: actions/postnotice.php:95
 msgid "Invalid notice content."
 msgstr "Ugyldig filnamn."
@@ -4509,12 +4620,12 @@ msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’.
 msgstr ""
 
 #. TRANS: Page title for profile settings.
-#: actions/profilesettings.php:59
+#: actions/profilesettings.php:60
 msgid "Profile settings"
 msgstr "Profilinnstillingar"
 
 #. TRANS: Usage instructions for profile settings.
-#: actions/profilesettings.php:70
+#: actions/profilesettings.php:71
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
@@ -4522,35 +4633,32 @@ msgstr ""
 "deg."
 
 #. TRANS: Profile settings form legend.
-#: actions/profilesettings.php:98
+#: actions/profilesettings.php:99
 msgid "Profile information"
 msgstr "Profil informasjon"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109 actions/register.php:433
+#: actions/profilesettings.php:110 actions/register.php:412
 #, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr ""
 "1-64 små bokstavar eller tal, ingen punktum (og liknande) eller mellomrom"
 
 #. TRANS: Field label in form for profile settings.
-#. TRANS: Label for full group name (dt). Text hidden by default.
-#. TRANS: DT for full name in a profile.
-#: actions/profilesettings.php:113 actions/register.php:455
-#: actions/showgroup.php:255 actions/tagother.php:104
-#: lib/groupeditform.php:150 lib/userprofile.php:156
+#: actions/profilesettings.php:114 actions/register.php:434
+#: lib/groupeditform.php:150
 msgid "Full name"
 msgstr "Fullt namn"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:118 actions/register.php:460
+#: actions/profilesettings.php:119 actions/register.php:439
 #: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "Heimeside"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:121
+#: actions/profilesettings.php:122 actions/register.php:441
 #, fuzzy
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr "URL til heimesida di, bloggen din, eller ein profil på ei anna side."
@@ -4558,7 +4666,7 @@ msgstr "URL til heimesida di, bloggen din, eller ein profil på ei anna side."
 #. TRANS: Tooltip for field label in form for profile settings. Plural
 #. TRANS: is decided by the number of characters available for the
 #. TRANS: biography (%d).
-#: actions/profilesettings.php:129 actions/register.php:471
+#: actions/profilesettings.php:130 actions/register.php:450
 #, fuzzy, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4566,87 +4674,83 @@ msgstr[0] "Skriv om deg og interessene dine med 140 teikn"
 msgstr[1] "Skriv om deg og interessene dine med 140 teikn"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:135 actions/register.php:476
+#: actions/profilesettings.php:136 actions/register.php:455
 #, fuzzy
 msgid "Describe yourself and your interests"
 msgstr "Skildra deg sjølv og din"
 
 #. TRANS: Text area label in form for profile settings where users can provide.
 #. TRANS: their biography.
-#: actions/profilesettings.php:139 actions/register.php:478
+#: actions/profilesettings.php:140 actions/register.php:457
 msgid "Bio"
 msgstr "Om meg"
 
 #. TRANS: Field label in form for profile settings.
-#. TRANS: Label for group location (dt). Text hidden by default.
-#. TRANS: DT for location in a profile.
-#: actions/profilesettings.php:145 actions/register.php:483
-#: actions/showgroup.php:265 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:173
-#: lib/userprofile.php:172
+#: actions/profilesettings.php:146 actions/register.php:462
+#: lib/groupeditform.php:173
 msgid "Location"
 msgstr "Plassering"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148 actions/register.php:485
+#: actions/profilesettings.php:149
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Kvar er du, t.d. «By, Fylke (eller Region), Land»"
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:153
+#: actions/profilesettings.php:154
 msgid "Share my current location when posting notices"
 msgstr ""
 
 #. TRANS: Field label in form for profile settings.
-#. TRANS: DT for tags in a profile.
-#: actions/profilesettings.php:161 actions/tagother.php:149
-#: actions/tagother.php:209 lib/subscriptionlist.php:106
-#: lib/subscriptionlist.php:108 lib/userprofile.php:220
+#: actions/profilesettings.php:162 actions/tagother.php:128
+#: actions/tagother.php:188 lib/subscriptionlist.php:104
+#: lib/subscriptionlist.php:106
 msgid "Tags"
 msgstr "Merkelappar"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:164
+#: actions/profilesettings.php:165
 #, fuzzy
 msgid ""
-"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- "
+"separated."
 msgstr ""
 "merkelappar for deg sjølv ( bokstavar, nummer, -, ., og _ ), komma eller "
 "mellomroms separert."
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:169
+#: actions/profilesettings.php:170
 msgid "Language"
 msgstr "Språk"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:171
+#: actions/profilesettings.php:172
 #, fuzzy
-msgid "Preferred language"
+msgid "Preferred language."
 msgstr "Foretrukke språk"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:181
+#: actions/profilesettings.php:182
 msgid "Timezone"
 msgstr "Tidssone"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:183
+#: actions/profilesettings.php:184
 msgid "What timezone are you normally in?"
 msgstr "Kva tidssone er du vanlegvis i?"
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:189
+#: actions/profilesettings.php:190
 #, fuzzy
 msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)"
+"Automatically subscribe to whoever subscribes to me (best for non-humans)."
 msgstr ""
 "Automatisk ting notisane til dei som tingar mine (best for ikkje-menneskje)"
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Plural form is used based on the maximum number of allowed
 #. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:258 actions/register.php:229
+#: actions/profilesettings.php:259 actions/register.php:214
 #, fuzzy, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4654,50 +4758,50 @@ msgstr[0] "Plassering er for lang (maksimalt %d teikn)."
 msgstr[1] "Plassering er for lang (maksimalt %d teikn)."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:269 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:270 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr "Tidssone er ikkje valt."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:277
+#: actions/profilesettings.php:278
 #, fuzzy
 msgid "Language is too long (maximum 50 characters)."
 msgstr "Språk er for langt (maksimalt 50 teikn)."
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:291 actions/tagother.php:178
-#, php-format
-msgid "Invalid tag: \"%s\""
+#: actions/profilesettings.php:292
+#, fuzzy, php-format
+msgid "Invalid tag: \"%s\"."
 msgstr "Ugyldig merkelapp: %s"
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:347
+#: actions/profilesettings.php:348
 #, fuzzy
 msgid "Could not update user for autosubscribe."
 msgstr "Kan ikkje oppdatera brukar for automatisk tinging."
 
 #. TRANS: Server error thrown when user profile location preference settings could not be updated.
-#: actions/profilesettings.php:405
+#: actions/profilesettings.php:406
 #, fuzzy
 msgid "Could not save location prefs."
 msgstr "Kan ikkje lagra merkelapp."
 
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:427 actions/tagother.php:200
+#: actions/profilesettings.php:428 actions/tagother.php:179
 msgid "Could not save tags."
 msgstr "Kunne ikkje lagra emneord."
 
 #. TRANS: Confirmation shown when user profile settings are saved.
 #. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:436 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:437 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "Lagra innstillingar."
 
 #. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
 #. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:483 actions/restoreaccount.php:60
+#: actions/profilesettings.php:484 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "Opprett ei ny gruppe"
@@ -4771,6 +4875,12 @@ msgstr ""
 "Dette er %%site.name%%, ei [mikroblogging](http://en.wikipedia.org/wiki/"
 "Micro-blogging)-teneste"
 
+#. TRANS: Public RSS feed description. %s is the StatusNet site name.
+#: actions/publicrss.php:106
+#, fuzzy, php-format
+msgid "%s updates from everyone."
+msgstr "%s oppdateringar frå alle saman!"
+
 #. TRANS: Title for public tag cloud.
 #: actions/publictagcloud.php:57
 msgid "Public tag cloud"
@@ -4809,10 +4919,6 @@ msgid ""
 "one!"
 msgstr ""
 
-#: actions/publictagcloud.php:146
-msgid "Tag cloud"
-msgstr "Emne sky"
-
 #. TRANS: Client error displayed trying to recover password while already logged in.
 #: actions/recoverpassword.php:37
 msgid "You are already logged in!"
@@ -4907,6 +5013,12 @@ msgstr "Hent fram passord"
 msgid "Password recovery requested"
 msgstr "Passord opphenting etterspurt"
 
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/recoverpassword.php:229
+#, fuzzy
+msgid "Password saved"
+msgstr "Lagra passord."
+
 #. TRANS: Title for password recovery page when an unknown action has been specified.
 #: actions/recoverpassword.php:232
 msgid "Unknown action"
@@ -4918,15 +5030,9 @@ msgstr "Uventa handling."
 msgid "6 or more characters, and do not forget it!"
 msgstr "6 eller fleire teikn, og ikkje gløym dei."
 
-#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
-#: actions/recoverpassword.php:264 actions/register.php:441
-#, fuzzy
-msgid "Same as password above."
-msgstr "Samme passord som over"
-
 #. TRANS: Button text for password reset form.
 #. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: actions/recoverpassword.php:268 lib/designsettings.php:264
+#: actions/recoverpassword.php:268 lib/designform.php:145
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Reset"
@@ -4976,14 +5082,8 @@ msgstr "Passord må vera 6 tekn eller meir."
 msgid "Password and confirmation do not match."
 msgstr "Passord og stadfesting stemmer ikkje."
 
-#. TRANS: Reset password form validation error message.
-#: actions/recoverpassword.php:418
-#, fuzzy
-msgid "Cannot save new password."
-msgstr "Klarar ikkje lagra nytt passord."
-
 #. TRANS: Server error displayed when something does wrong with the user object during password reset.
-#: actions/recoverpassword.php:426 actions/register.php:256
+#: actions/recoverpassword.php:426 actions/register.php:241
 msgid "Error setting user."
 msgstr "Feil ved å setja brukar."
 
@@ -4992,96 +5092,100 @@ msgstr "Feil ved å setja brukar."
 msgid "New password successfully saved. You are now logged in."
 msgstr "Lagra det nye passordet. Du er logga inn."
 
-#: actions/register.php:92 actions/register.php:196 actions/register.php:413
+#: actions/redirecturl.php:70
+#, fuzzy
+msgid "No id parameter"
+msgstr "Manglar argumentet ID."
+
+#: actions/redirecturl.php:76
+#, fuzzy, php-format
+msgid "No such file \"%d\""
+msgstr "Denne notisen finst ikkje."
+
+#: actions/register.php:80 actions/register.php:181 actions/register.php:392
 msgid "Sorry, only invited people can register."
 msgstr "Beklage, men kun inviterte kan registrere seg."
 
-#: actions/register.php:99
+#: actions/register.php:87
 #, fuzzy
 msgid "Sorry, invalid invitation code."
 msgstr "Feil med stadfestingskode."
 
-#: actions/register.php:119
+#: actions/register.php:106
 msgid "Registration successful"
 msgstr "Registreringa gikk bra"
 
-#: actions/register.php:121 actions/register.php:511
+#: actions/register.php:108 actions/register.php:490
 msgid "Register"
 msgstr "Registrér"
 
-#: actions/register.php:142
+#: actions/register.php:128
 msgid "Registration not allowed."
 msgstr "Registrering ikkje tillatt."
 
-#: actions/register.php:209
+#: actions/register.php:194
 #, fuzzy
-msgid "You can't register if you don't agree to the license."
+msgid "You cannot register if you don't agree to the license."
 msgstr "Du kan ikkje registrera deg om du ikkje godtek vilkåra i lisensen."
 
-#: actions/register.php:218
+#: actions/register.php:203
 msgid "Email address already exists."
 msgstr "Epostadressa finst allereie."
 
-#: actions/register.php:251 actions/register.php:273
+#: actions/register.php:236 actions/register.php:258
 msgid "Invalid username or password."
 msgstr "Ugyldig brukarnamn eller passord."
 
-#: actions/register.php:351
+#: actions/register.php:333
 msgid ""
 "With this form you can create a new account. You can then post notices and "
-"link up to friends and colleagues. "
+"link up to friends and colleagues."
 msgstr ""
 
-#: actions/register.php:437
-#, fuzzy
-msgid "6 or more characters."
-msgstr "6 eller fleire teikn"
-
-#. TRANS: Link description in user account settings menu.
-#: actions/register.php:445 actions/register.php:449
-#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
+#: actions/register.php:424 actions/register.php:428
+#: actions/siteadminpanel.php:238 lib/settingsnav.php:92
 msgid "Email"
 msgstr "Epost"
 
-#: actions/register.php:446 actions/register.php:450
+#: actions/register.php:425 actions/register.php:429
 #, fuzzy
-msgid "Used only for updates, announcements, and password recovery"
+msgid "Used only for updates, announcements, and password recovery."
 msgstr ""
 "Blir berre brukt for uppdateringar, viktige meldingar og for gløymde passord"
 
-#: actions/register.php:457
+#: actions/register.php:436
 #, fuzzy
-msgid "Longer name, preferably your \"real\" name"
+msgid "Longer name, preferably your \"real\" name."
 msgstr "Lengre namn, fortrinnsvis ditt «ekte» namn"
 
-#: actions/register.php:462
+#: actions/register.php:464
 #, fuzzy
-msgid "URL of your homepage, blog, or profile on another site"
-msgstr "URL til heimesida di, bloggen din, eller ein profil på ei anna side."
+msgid "Where you are, like \"City, State (or Region), Country\"."
+msgstr "Kvar er du, t.d. «By, Fylke (eller Region), Land»"
 
-#: actions/register.php:523
+#: actions/register.php:503
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
 msgstr ""
 
-#: actions/register.php:533
+#: actions/register.php:513
 #, php-format
 msgid "My text and files are copyright by %1$s."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:537
+#: actions/register.php:517
 msgid "My text and files remain under my own copyright."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:540
+#: actions/register.php:520
 msgid "All rights reserved."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:545
+#: actions/register.php:525
 #, fuzzy, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -5090,7 +5194,7 @@ msgstr ""
 " unnateke privatdata: passord, epostadresse, ljonmeldingsadresse og "
 "telefonnummer."
 
-#: actions/register.php:588
+#: actions/register.php:566
 #, fuzzy, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -5122,7 +5226,7 @@ msgstr ""
 "\n"
 "Takk for at du blei med, og vi håpar du vil lika tenesta!"
 
-#: actions/register.php:612
+#: actions/register.php:590
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5157,7 +5261,7 @@ msgstr "Brukaren sitt kallenamn"
 
 #: actions/remotesubscribe.php:129
 #, fuzzy
-msgid "Nickname of the user you want to follow"
+msgid "Nickname of the user you want to follow."
 msgstr "Kallenamnet til brukaren du vil fylgja"
 
 #: actions/remotesubscribe.php:132
@@ -5166,18 +5270,18 @@ msgstr "Profil-adresse"
 
 #: actions/remotesubscribe.php:133
 #, fuzzy
-msgid "URL of your profile on another compatible microblogging service"
+msgid "URL of your profile on another compatible microblogging service."
 msgstr "URL til profilsida di på ei anna kompatibel mikrobloggingteneste."
 
 #. TRANS: Link text for link that will subscribe to a remote profile.
 #: actions/remotesubscribe.php:136 lib/subscribeform.php:139
-#: lib/userprofile.php:431
+#: lib/userprofile.php:402
 msgid "Subscribe"
 msgstr "Ting"
 
 #: actions/remotesubscribe.php:158
 #, fuzzy
-msgid "Invalid profile URL (bad format)"
+msgid "Invalid profile URL (bad format)."
 msgstr "Ugyldig profil-nettadresse (feil format)"
 
 #: actions/remotesubscribe.php:167
@@ -5215,7 +5319,7 @@ msgstr "Du kan ikkje registrera deg om du ikkje godtek vilkåra i lisensen."
 msgid "You already repeated that notice."
 msgstr "Du har allereie blokkert denne brukaren."
 
-#: actions/repeat.php:112 lib/noticelist.php:692
+#: actions/repeat.php:112 lib/noticelist.php:697
 msgid "Repeated"
 msgstr "Framheva"
 
@@ -5224,9 +5328,9 @@ msgstr "Framheva"
 msgid "Repeated!"
 msgstr "Lag"
 
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing @-replies.
+#. TRANS: RSS reply feed title. %s is a user nickname.
 #: actions/replies.php:126 actions/repliesrss.php:68
-#: lib/personalgroupnav.php:109
+#: lib/personalgroupnav.php:105
 #, php-format
 msgid "Replies to %s"
 msgstr "Svar til %s"
@@ -5272,9 +5376,11 @@ msgid ""
 "newnotice%%%%?status_textarea=%3$s)."
 msgstr ""
 
-#: actions/repliesrss.php:72
+#. TRANS: RSS reply feed description.
+#. TRANS: %1$s is a user nickname, %2$s is the StatusNet site name.
+#: actions/repliesrss.php:74
 #, fuzzy, php-format
-msgid "Replies to %1$s on %2$s!"
+msgid "Replies to %1$s on %2$s."
 msgstr "Melding til %1$s på %2$s"
 
 #. TRANS: Client exception displayed when trying to restore an account while not logged in.
@@ -5375,7 +5481,7 @@ msgstr "Du kan ikkje lengre legge inn notisar på denne sida."
 msgid "User doesn't have this role."
 msgstr "Kan ikkje finne brukar"
 
-#: actions/rsd.php:146 actions/version.php:159
+#: actions/rsd.php:142 actions/version.php:159
 msgid "StatusNet"
 msgstr "Statistikk"
 
@@ -5420,97 +5526,46 @@ msgstr ""
 msgid "Save site settings"
 msgstr "Avatar-innstillingar"
 
-#: actions/showapplication.php:82
+#: actions/showapplication.php:78
 #, fuzzy
 msgid "You must be logged in to view an application."
 msgstr "Du må være innlogga for å melde deg ut av ei gruppe."
 
-#: actions/showapplication.php:157
+#: actions/showapplication.php:151
 #, fuzzy
 msgid "Application profile"
 msgstr "Notisen har ingen profil"
 
-#. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:159 lib/applicationeditform.php:177
-msgid "Icon"
-msgstr ""
-
-#. TRANS: Form input field label for application name.
-#: actions/showapplication.php:169 actions/version.php:197
-#: lib/applicationeditform.php:190
-#, fuzzy
-msgid "Name"
-msgstr "Kallenamn"
-
-#. TRANS: Form input field label.
-#: actions/showapplication.php:178 lib/applicationeditform.php:227
-#, fuzzy
-msgid "Organization"
-msgstr "Paginering"
-
-#. TRANS: Form input field label.
-#: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:168
-msgid "Description"
-msgstr "Beskriving"
-
-#. TRANS: Header for group statistics on a group page (h2).
-#. TRANS: H2 text for user statistics.
-#: actions/showapplication.php:192 actions/showgroup.php:460
-#: lib/profileaction.php:205
-msgid "Statistics"
-msgstr "Statistikk"
-
-#: actions/showapplication.php:203
+#: actions/showapplication.php:179
 #, php-format
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr ""
 
-#: actions/showapplication.php:213
+#: actions/showapplication.php:189
 msgid "Application actions"
 msgstr ""
 
-#: actions/showapplication.php:236
+#: actions/showapplication.php:212
 msgid "Reset key & secret"
 msgstr ""
 
 #. TRANS: Title of form for deleting a user.
-#: actions/showapplication.php:252 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:64 lib/noticelist.php:673
+#: actions/showapplication.php:228 lib/deletegroupform.php:121
+#: lib/deleteuserform.php:64 lib/noticelist.php:678
 msgid "Delete"
 msgstr "Slett"
 
-#: actions/showapplication.php:261
+#: actions/showapplication.php:237
 msgid "Application info"
 msgstr ""
 
-#: actions/showapplication.php:263
-msgid "Consumer key"
-msgstr ""
-
-#: actions/showapplication.php:268
-msgid "Consumer secret"
-msgstr ""
-
-#: actions/showapplication.php:273
-msgid "Request token URL"
-msgstr ""
-
-#: actions/showapplication.php:278
-msgid "Access token URL"
-msgstr ""
-
-#: actions/showapplication.php:283
-msgid "Authorize URL"
-msgstr ""
-
-#: actions/showapplication.php:288
+#: actions/showapplication.php:255
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
 msgstr ""
 
-#: actions/showapplication.php:309
+#: actions/showapplication.php:275
 #, fuzzy
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr "Sikker på at du vil sletta notisen?"
@@ -5590,61 +5645,47 @@ msgstr "%s gruppe"
 msgid "%1$s group, page %2$d"
 msgstr "Grupper, side %d"
 
-#. TRANS: Group profile header (h2). Text hidden by default.
-#: actions/showgroup.php:223
-msgid "Group profile"
-msgstr "Gruppe profil"
-
-#. TRANS: Label for group URL (dt). Text hidden by default.
-#. TRANS: DT for URL in a profile.
-#: actions/showgroup.php:273 actions/tagother.php:118
-#: actions/userauthorization.php:175 lib/userprofile.php:186
-msgid "URL"
-msgstr "URL"
-
 #. TRANS: Label for group description or group note (dt). Text hidden by default.
-#. TRANS: DT for note in a profile.
-#: actions/showgroup.php:285 actions/tagother.php:128
-#: actions/userauthorization.php:187 lib/userprofile.php:204
+#: actions/showgroup.php:266
 msgid "Note"
 msgstr "Merknad"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:296 lib/groupeditform.php:180
+#: actions/showgroup.php:277 lib/groupeditform.php:180
 msgid "Aliases"
 msgstr ""
 
 #. TRANS: Group actions header (h2). Text hidden by default.
-#: actions/showgroup.php:313
+#: actions/showgroup.php:294
 msgid "Group actions"
 msgstr "Gruppe handlingar"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:357
+#: actions/showgroup.php:338
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
 msgstr "Straum for vener av %s"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:364
+#: actions/showgroup.php:345
 #, php-format
 msgid "Notice feed for %s group (RSS 2.0)"
 msgstr "Straum for vener av %s"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:371
+#: actions/showgroup.php:352
 #, php-format
 msgid "Notice feed for %s group (Atom)"
 msgstr "Notisstraum for %s"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:377
+#: actions/showgroup.php:358
 #, php-format
 msgid "FOAF for %s group"
 msgstr "Utboks for %s"
 
 #. TRANS: Header for mini list of group members on a group page (h2).
-#: actions/showgroup.php:414
+#: actions/showgroup.php:395
 msgid "Members"
 msgstr "Medlemmar"
 
@@ -5652,25 +5693,30 @@ msgstr "Medlemmar"
 #. TRANS: Text for user subscription statistics if the user has no subscriptions.
 #. TRANS: Text for user subscriber statistics if user has no subscribers.
 #. TRANS: Text for user user group membership statistics if user is not a member of any group.
-#: actions/showgroup.php:420 lib/profileaction.php:137
+#: actions/showgroup.php:401 lib/profileaction.php:137
 #: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
-#: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
+#: lib/subscriptionlist.php:123 lib/tagcloudsection.php:71
 msgid "(None)"
 msgstr "(Ingen)"
 
 #. TRANS: Link to all group members from mini list of group members if group has more than n members.
-#: actions/showgroup.php:429
+#: actions/showgroup.php:410
 msgid "All members"
 msgstr "Alle medlemmar"
 
-#. TRANS: Label for creation date in statistics on group page.
-#: actions/showgroup.php:465
+#. TRANS: Header for group statistics on a group page (h2).
+#. TRANS: H2 text for user statistics.
+#: actions/showgroup.php:441 lib/profileaction.php:205
+msgid "Statistics"
+msgstr "Statistikk"
+
+#: actions/showgroup.php:444
 msgctxt "LABEL"
 msgid "Created"
 msgstr "Oppretta"
 
 #. TRANS: Label for member count in statistics on group page.
-#: actions/showgroup.php:473
+#: actions/showgroup.php:449
 msgctxt "LABEL"
 msgid "Members"
 msgstr "Medlemmar"
@@ -5679,7 +5725,7 @@ msgstr "Medlemmar"
 #. TRANS: **%s** is the group alias, %%%%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).
-#: actions/showgroup.php:488
+#: actions/showgroup.php:464
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5692,7 +5738,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: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
-#: actions/showgroup.php:498
+#: actions/showgroup.php:474
 #, fuzzy, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5704,7 +5750,7 @@ msgstr ""
 "wikipedia.org/wiki/Micro-blogging)-teneste"
 
 #. TRANS: Header for list of group administrators on a group page (h2).
-#: actions/showgroup.php:527
+#: actions/showgroup.php:503
 #, fuzzy
 msgid "Admins"
 msgstr "Administrator"
@@ -5745,7 +5791,7 @@ msgid "%1$s tagged %2$s"
 msgstr "Grupper, side %d"
 
 #. TRANS: Page title showing tagged notices in one user's stream.
-#. TRANS: %1$s is the username, %2$s is the hash tag, %1$d is the page number.
+#. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
 #: actions/showstream.php:74
 #, fuzzy, php-format
 msgid "%1$s tagged %2$s, page %3$d"
@@ -5792,13 +5838,13 @@ msgid "FOAF for %s"
 msgstr "Utboks for %s"
 
 #. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
-#: actions/showstream.php:211
+#: actions/showstream.php:205
 #, php-format
 msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr ""
 
 #. TRANS: Second sentence of empty list message for a stream for the user themselves.
-#: actions/showstream.php:217
+#: actions/showstream.php:211
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
@@ -5806,7 +5852,7 @@ msgstr ""
 
 #. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:221
+#: actions/showstream.php:215
 #, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
@@ -5815,7 +5861,7 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:264
+#: actions/showstream.php:258
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5826,7 +5872,7 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:271
+#: actions/showstream.php:265
 #, fuzzy, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5837,7 +5883,7 @@ msgstr ""
 "wikipedia.org/wiki/Micro-blogging)-teneste"
 
 #. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
-#: actions/showstream.php:328
+#: actions/showstream.php:322
 #, fuzzy, php-format
 msgid "Repeat of %s"
 msgstr "Svar til %s"
@@ -5990,77 +6036,77 @@ msgstr ""
 #. TRANS: Title for button to save site notice in admin panel.
 #: actions/sitenoticeadminpanel.php:201
 #, fuzzy
-msgid "Save site notice"
+msgid "Save site notice."
 msgstr "Statusmelding"
 
 #. TRANS: Title for SMS settings.
-#: actions/smssettings.php:57
+#: actions/smssettings.php:56
 msgid "SMS settings"
 msgstr "Avatar-innstillingar"
 
 #. TRANS: SMS settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/smssettings.php:71
+#: actions/smssettings.php:70
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr "Du kan motta SMS-meldingar gjennom e-post frå %%site.name%%."
 
 #. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
-#: actions/smssettings.php:93
+#: actions/smssettings.php:92
 #, fuzzy
 msgid "SMS is not available."
 msgstr "Denne sida er ikkje tilgjengleg i eit"
 
 #. TRANS: Form legend for SMS settings form.
-#: actions/smssettings.php:107
+#: actions/smssettings.php:106
 msgid "SMS address"
 msgstr "Epostadresser"
 
 #. TRANS: Form guide in SMS settings form.
-#: actions/smssettings.php:116
+#: actions/smssettings.php:115
 msgid "Current confirmed SMS-enabled phone number."
 msgstr "Godkjent mobiltelefonnummer."
 
 #. TRANS: Form guide in IM settings form.
-#: actions/smssettings.php:129
+#: actions/smssettings.php:128
 msgid "Awaiting confirmation on this phone number."
 msgstr "Ventar på godkjenning for dette telefonnummeret."
 
 #. TRANS: Field label for SMS address input in SMS settings form.
-#: actions/smssettings.php:138
+#: actions/smssettings.php:137
 msgid "Confirmation code"
 msgstr "Stadfestingskode"
 
 #. TRANS: Form field instructions in SMS settings form.
-#: actions/smssettings.php:140
+#: actions/smssettings.php:139
 msgid "Enter the code you received on your phone."
 msgstr "Skriv inn koden du fekk på telefonen."
 
 #. TRANS: Button label to confirm SMS confirmation code in SMS settings.
-#: actions/smssettings.php:144
+#: actions/smssettings.php:143
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Confirm"
 msgstr "Godta"
 
 #. TRANS: Field label for SMS phone number input in SMS settings form.
-#: actions/smssettings.php:149
+#: actions/smssettings.php:148
 msgid "SMS phone number"
 msgstr "Ingen telefonnummer."
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
-#: actions/smssettings.php:152
+#: actions/smssettings.php:151
 #, fuzzy
-msgid "Phone number, no punctuation or spaces, with area code"
+msgid "Phone number, no punctuation or spaces, with area code."
 msgstr "Telefonnummer, kun tall, med landskode"
 
 #. TRANS: Form legend for SMS preferences form.
-#: actions/smssettings.php:191
+#: actions/smssettings.php:190
 msgid "SMS preferences"
 msgstr "Lagra brukarval."
 
 #. TRANS: Checkbox label in SMS preferences form.
-#: actions/smssettings.php:197
+#: actions/smssettings.php:196
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
@@ -6069,33 +6115,33 @@ msgstr ""
 "min tilbydar."
 
 #. TRANS: Confirmation message for successful SMS preferences save.
-#: actions/smssettings.php:308
+#: actions/smssettings.php:307
 #, fuzzy
 msgid "SMS preferences saved."
 msgstr "Lagra brukarval."
 
 #. TRANS: Message given saving SMS phone number without having provided one.
-#: actions/smssettings.php:330
+#: actions/smssettings.php:329
 msgid "No phone number."
 msgstr "Ingen telefonnummer."
 
 #. TRANS: Message given saving SMS phone number without having selected a carrier.
-#: actions/smssettings.php:336
+#: actions/smssettings.php:335
 msgid "No carrier selected."
 msgstr "Ingen mobiloperatør vald."
 
 #. TRANS: Message given saving SMS phone number that is already set.
-#: actions/smssettings.php:344
+#: actions/smssettings.php:343
 msgid "That is already your phone number."
 msgstr "Det er alt ditt telefonnummer"
 
 #. TRANS: Message given saving SMS phone number that is already set for another user.
-#: actions/smssettings.php:348
+#: actions/smssettings.php:347
 msgid "That phone number already belongs to another user."
 msgstr "Det telefonnummeret er alt registrert hos ein annan brukar."
 
 #. TRANS: Message given saving valid SMS phone number that is to be confirmed.
-#: actions/smssettings.php:376
+#: actions/smssettings.php:375
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
 "for the code and instructions on how to use it."
@@ -6104,40 +6150,40 @@ msgstr ""
 "søppelpostboksen) for koden og veiledning på korleis du nyttar han."
 
 #. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
-#: actions/smssettings.php:404
+#: actions/smssettings.php:403
 msgid "That is the wrong confirmation number."
 msgstr "Det er feil godkjennings nummer."
 
 #. TRANS: Message given after successfully canceling SMS phone number confirmation.
-#: actions/smssettings.php:418
+#: actions/smssettings.php:417
 msgid "SMS confirmation cancelled."
 msgstr "SMS bekreftelse"
 
 #. TRANS: Message given trying to remove an SMS phone number that is not
 #. TRANS: registered for the active user.
-#: actions/smssettings.php:438
+#: actions/smssettings.php:437
 msgid "That is not your phone number."
 msgstr "Det er ikkje ditt telefonnummer"
 
 #. TRANS: Message given after successfully removing a registered SMS phone number.
-#: actions/smssettings.php:460
+#: actions/smssettings.php:459
 #, fuzzy
 msgid "The SMS phone number was removed."
 msgstr "SMS telefon nummer"
 
 #. TRANS: Label for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:499
+#: actions/smssettings.php:498
 msgid "Mobile carrier"
 msgstr "Telefontilbydar"
 
 #. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:504
+#: actions/smssettings.php:503
 msgid "Select a carrier"
 msgstr "Velg ein tilbydar"
 
 #. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
 #. TRANS: %s is an administrative contact's e-mail address.
-#: actions/smssettings.php:513
+#: actions/smssettings.php:512
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -6147,7 +6193,7 @@ msgstr ""
 "aksepterer SMS-over-epost, men ikkje vistast her."
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
-#: actions/smssettings.php:535
+#: actions/smssettings.php:534
 #, fuzzy
 msgid "No code entered."
 msgstr "Ingen innskriven kode"
@@ -6222,16 +6268,14 @@ msgstr "Du tingar ikkje oppdateringar til den profilen."
 msgid "Could not save subscription."
 msgstr "Kunne ikkje lagra abonnement."
 
-#: actions/subscribe.php:77
-msgid "This action only accepts POST requests."
-msgstr ""
-
-#: actions/subscribe.php:117
+#. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
+#: actions/subscribe.php:121
 #, fuzzy
 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
 msgstr "Du tingar ikkje oppdateringar til den profilen."
 
-#: actions/subscribe.php:145
+#. TRANS: Page title when subscription succeeded.
+#: actions/subscribe.php:149
 msgid "Subscribed"
 msgstr "Abonnent"
 
@@ -6338,31 +6382,34 @@ msgid "Subscription feed for %s (Atom)"
 msgstr "Notisstraum for %s"
 
 #. TRANS: Checkbox label for enabling Jabber messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:239
-msgid "Jabber"
-msgstr "Jabber"
+#: actions/subscriptions.php:241 lib/settingsnav.php:110
+#, fuzzy
+msgid "IM"
+msgstr "Ljonmelding"
 
 #. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:254
+#: actions/subscriptions.php:256 lib/settingsnav.php:117
 msgid "SMS"
 msgstr "SMS"
 
-#: actions/tag.php:69
+#. TRANS: Title for all but the first page of notices with tags.
+#. TRANS: %1$s is the tag, %2$d is the page number.
+#: actions/tag.php:73
 #, php-format
 msgid "Notices tagged with %1$s, page %2$d"
 msgstr "Notisar merka med %s"
 
-#: actions/tag.php:87
+#: actions/tag.php:91
 #, php-format
 msgid "Notice feed for tag %s (RSS 1.0)"
 msgstr "Straum for vener av %s"
 
-#: actions/tag.php:93
+#: actions/tag.php:97
 #, php-format
 msgid "Notice feed for tag %s (RSS 2.0)"
 msgstr "Straum for vener av %s"
 
-#: actions/tag.php:99
+#: actions/tag.php:103
 #, fuzzy, php-format
 msgid "Notice feed for tag %s (Atom)"
 msgstr "Notisstraum for %s"
@@ -6382,17 +6429,11 @@ msgstr "Merkelapp %s"
 msgid "User profile"
 msgstr "Brukarprofil"
 
-#. TRANS: DT element in area for user avatar.
-#: actions/tagother.php:81 actions/userauthorization.php:132
-#: lib/userprofile.php:108
-msgid "Photo"
-msgstr "Bilete"
-
-#: actions/tagother.php:141
+#: actions/tagother.php:120
 msgid "Tag user"
 msgstr "Merk brukar"
 
-#: actions/tagother.php:151
+#: actions/tagother.php:130
 msgid ""
 "Tags for this user (letters, numbers, -, ., and _), comma- or space- "
 "separated"
@@ -6400,14 +6441,19 @@ msgstr ""
 "Emneord for denne brukaren (bokstavar, tal, <kbd>-</kbd>, <kbd>.</kbd>, og "
 "<kbd>_</kbd>, separert med komma eller mellomrom"
 
-#: actions/tagother.php:193
+#: actions/tagother.php:157
+#, php-format
+msgid "Invalid tag: \"%s\""
+msgstr "Ugyldig merkelapp: %s"
+
+#: actions/tagother.php:172
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 "Du kan berre leggje til emneord på folk som du tingar notisar frå, eller som "
 "tingar notisar frå deg."
 
-#: actions/tagother.php:236
+#: actions/tagother.php:215
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
 "Bruk dette skjemaet for å leggje til emneord til dei som tingar notisar frå "
@@ -6417,6 +6463,7 @@ msgstr ""
 msgid "No such tag."
 msgstr "Dette emneord finst ikkje."
 
+#. TRANS: Client error displayed when trying to unblock a non-blocked user.
 #: actions/unblock.php:59
 msgid "You haven't blocked that user."
 msgstr "Du tingar ikkje oppdateringar til den profilen."
@@ -6438,12 +6485,84 @@ msgstr "Fann ingen profil med den IDen."
 msgid "Unsubscribed"
 msgstr "Fjerna tinging"
 
-#: actions/updateprofile.php:64 actions/userauthorization.php:337
+#: actions/updateprofile.php:64
 #, php-format
 msgid ""
 "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
 msgstr ""
 
+#: actions/urlsettings.php:60
+#, fuzzy
+msgid "URL settings"
+msgstr "Avatar-innstillingar"
+
+#. TRANS: Instructions for tab "Other" in user profile settings.
+#: actions/urlsettings.php:72
+msgid "Manage various other options."
+msgstr "Velikehald andre innstillingar"
+
+#. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
+#. TRANS: user's profile settings. This message has one space at the beginning. Use your
+#. TRANS: language's word separator here if it has one (most likely a single space).
+#: actions/urlsettings.php:115
+msgid " (free service)"
+msgstr ""
+
+#: actions/urlsettings.php:121
+#, fuzzy
+msgid "[none]"
+msgstr "Ingen"
+
+#: actions/urlsettings.php:122
+msgid "[internal]"
+msgstr ""
+
+#. TRANS: Label for dropdown with URL shortener services.
+#: actions/urlsettings.php:130
+msgid "Shorten URLs with"
+msgstr ""
+
+#. TRANS: Tooltip for for dropdown with URL shortener services.
+#: actions/urlsettings.php:132
+msgid "Automatic shortening service to use."
+msgstr "Den automatisk forkortingstenesta du vil bruke"
+
+#: actions/urlsettings.php:138
+msgid "URL longer than"
+msgstr ""
+
+#: actions/urlsettings.php:141
+msgid "URLs longer than this will be shortened, 0 means always shorten."
+msgstr ""
+
+#: actions/urlsettings.php:145
+msgid "Text longer than"
+msgstr ""
+
+#: actions/urlsettings.php:148
+msgid ""
+"URLs in notices longer than this will be shortened, 0 means always shorten."
+msgstr ""
+
+#. TRANS: Form validation error for form "Other settings" in user profile.
+#: actions/urlsettings.php:180
+#, fuzzy
+msgid "URL shortening service is too long (maximum 50 characters)."
+msgstr "Adressa til forkortingstenesta er for lang (maksimalt 50 teikn)."
+
+#: actions/urlsettings.php:187
+msgid "Invalid number for max url length."
+msgstr ""
+
+#: actions/urlsettings.php:193
+#, fuzzy
+msgid "Invalid number for max notice length."
+msgstr "Ugyldig filnamn."
+
+#: actions/urlsettings.php:238
+msgid "Error saving user URL shortening preferences."
+msgstr ""
+
 #. TRANS: User admin panel title
 #: actions/useradminpanel.php:58
 #, fuzzy
@@ -6470,11 +6589,11 @@ msgstr ""
 #. TRANS: users in user admin panel. %1$s is the invalid nickname.
 #: actions/useradminpanel.php:166
 #, php-format
-msgid "Invalid default subscripton: '%1$s' is not a user."
+msgid "Invalid default subscripton: \"%1$s\" is not a user."
 msgstr ""
 
-#. TRANS: Link description in user account settings menu.
-#: actions/useradminpanel.php:215 lib/accountsettingsaction.php:106
+#: actions/useradminpanel.php:215 lib/action.php:565 lib/settingsnav.php:77
+#: lib/subgroupnav.php:81
 msgid "Profile"
 msgstr "Profil"
 
@@ -6538,59 +6657,62 @@ msgstr ""
 #. TRANS: Title for button to save user settings in user admin panel.
 #: actions/useradminpanel.php:302
 #, fuzzy
-msgid "Save user settings"
+msgid "Save user settings."
 msgstr "Avatar-innstillingar"
 
-#: actions/userauthorization.php:105
+#. TRANS: Page title.
+#: actions/userauthorization.php:109
 msgid "Authorize subscription"
 msgstr "Autoriser tinging"
 
-#: actions/userauthorization.php:110
+#. TRANS: Page notice on "Auhtorize subscription" page.
+#: actions/userauthorization.php:115
 #, fuzzy
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
 "user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
-"click “Reject”."
+"click \"Reject\"."
 msgstr ""
 "Sjekk desse detaljane og forsikre deg om at du vil abonnere på denne "
 "brukaren sine notisar. Vist du ikkje har bedt om dette, klikk \"Avbryt\""
 
-#. TRANS: Menu item for site administration
-#: actions/userauthorization.php:196 actions/version.php:167
-#: lib/adminpanelaction.php:403
-#, fuzzy
-msgid "License"
-msgstr "lisens."
-
-#: actions/userauthorization.php:217
+#. TRANS: Button text on Authorise Subscription page.
+#: actions/userauthorization.php:200
 #, fuzzy
+msgctxt "BUTTON"
 msgid "Accept"
 msgstr "Godta"
 
-#: actions/userauthorization.php:218 lib/subscribeform.php:115
-#: lib/subscribeform.php:139
-msgid "Subscribe to this user"
+#. TRANS: Title for button on Authorise Subscription page.
+#: actions/userauthorization.php:202
+#, fuzzy
+msgid "Subscribe to this user."
 msgstr "Lagre tinging for brukar: %s"
 
-#: actions/userauthorization.php:219
+#. TRANS: Button text on Authorise Subscription page.
+#: actions/userauthorization.php:204
 #, fuzzy
+msgctxt "BUTTON"
 msgid "Reject"
 msgstr "Avslå"
 
-#: actions/userauthorization.php:220
+#. TRANS: Title for button on Authorise Subscription page.
+#: actions/userauthorization.php:206
 #, fuzzy
-msgid "Reject this subscription"
+msgid "Reject this subscription."
 msgstr "%s tingarar"
 
-#: actions/userauthorization.php:232
+#. TRANS: Client error displayed for an empty authorisation request.
+#: actions/userauthorization.php:219
 msgid "No authorization request!"
 msgstr "Ingen autoriserings-spørjing!"
 
-#: actions/userauthorization.php:254
+#. TRANS: Accept message header from Authorise subscription page.
+#: actions/userauthorization.php:242
 msgid "Subscription authorized"
 msgstr "Tinging autorisert"
 
-#: actions/userauthorization.php:256
+#: actions/userauthorization.php:245
 #, fuzzy
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
@@ -6601,11 +6723,12 @@ msgstr ""
 "Sjekk med sida sine instruksjonar for korleis autorisering til tinginga skal "
 "gjennomførast. Ditt tingings teikn er: "
 
-#: actions/userauthorization.php:266
+#. TRANS: Reject message header from Authorise subscription page.
+#: actions/userauthorization.php:256
 msgid "Subscription rejected"
 msgstr "Tinging avvist"
 
-#: actions/userauthorization.php:268
+#: actions/userauthorization.php:259
 #, fuzzy
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
@@ -6615,58 +6738,99 @@ msgstr ""
 "Tingina har blitt avvist, men ingen henvisnings URL er tilgjengleg. Sjekk "
 "med sida sine instruksjonar for korleis ein skal avvise tinginga."
 
+#. TRANS: Exception thrown when no valid user is found for an authorisation request.
+#. TRANS: %s is a listener URI.
+#: actions/userauthorization.php:296
+#, php-format
+msgid "Listener URI \"%s\" not found here."
+msgstr ""
+
+#. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
+#. TRANS: %s is a listenee URI.
 #: actions/userauthorization.php:303
 #, php-format
-msgid "Listener URI ‘%s’ not found here."
+msgid "Listenee URI \"%s\" is too long."
 msgstr ""
 
-#: actions/userauthorization.php:308
+#. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
+#. TRANS: %s is a listenee URI.
+#: actions/userauthorization.php:311
 #, php-format
-msgid "Listenee URI ‘%s’ is too long."
-msgstr ""
-
-#: actions/userauthorization.php:314
-#, php-format
-msgid "Listenee URI ‘%s’ is a local user."
+msgid "Listenee URI \"%s\" is a local user."
 msgstr ""
 
+#. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
+#. TRANS: %s is a profile URL.
 #: actions/userauthorization.php:329
 #, php-format
-msgid "Profile URL ‘%s’ is for a local user."
+msgid "Profile URL \"%s\" is for a local user."
 msgstr ""
 
-#: actions/userauthorization.php:345
+#. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
+#. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
+#: actions/userauthorization.php:339
+#, php-format
+msgid ""
+"Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
+"\"."
+msgstr ""
+
+#. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
+#. TRANS: %s is an avatar URL.
+#: actions/userauthorization.php:349
 #, fuzzy, php-format
-msgid "Avatar URL ‘%s’ is not valid."
+msgid "Avatar URL \"%s\" is not valid."
 msgstr "Heimesida er ikkje ei gyldig internettadresse."
 
-#: actions/userauthorization.php:350
+#. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
+#. TRANS: %s is an avatar URL.
+#: actions/userauthorization.php:356
 #, fuzzy, php-format
-msgid "Can’t read avatar URL ‘%s’."
+msgid "Cannot read avatar URL \"%s\"."
 msgstr "Kan ikkje lesa brukarbilete-URL «%s»"
 
-#: actions/userauthorization.php:355
+#. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
+#. TRANS: %s is an avatar URL.
+#: actions/userauthorization.php:363
 #, fuzzy, php-format
-msgid "Wrong image type for avatar URL ‘%s’."
+msgid "Wrong image type for avatar URL \"%s\"."
 msgstr "Feil biletetype for '%s'"
 
 #. TRANS: Page title for profile design page.
-#: actions/userdesignsettings.php:74 lib/designsettings.php:63
+#: actions/userdesignsettings.php:74 lib/designsettings.php:61
 #, fuzzy
 msgid "Profile design"
 msgstr "Profilinnstillingar"
 
 #. TRANS: Instructions for profile design page.
-#: actions/userdesignsettings.php:84 lib/designsettings.php:74
+#: actions/userdesignsettings.php:84 lib/designsettings.php:72
 msgid ""
 "Customize the way your profile looks with a background image and a colour "
 "palette of your choice."
 msgstr ""
 
-#: actions/userdesignsettings.php:272
+#: actions/userdesignsettings.php:289
 msgid "Enjoy your hotdog!"
 msgstr ""
 
+#: actions/userdesignsettings.php:325
+#, fuzzy
+msgid "Design settings"
+msgstr "Avatar-innstillingar"
+
+#: actions/userdesignsettings.php:340
+#, fuzzy
+msgid "View profile designs"
+msgstr "Profilinnstillingar"
+
+#: actions/userdesignsettings.php:341
+msgid "Show or hide profile designs."
+msgstr ""
+
+#: actions/userdesignsettings.php:348
+msgid "Background file"
+msgstr ""
+
 #. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number.
 #: actions/usergroups.php:66
 #, php-format
@@ -6715,6 +6879,12 @@ msgstr ""
 msgid "Contributors"
 msgstr ""
 
+#. TRANS: Menu item for site administration
+#: actions/version.php:167 lib/adminpanelaction.php:403
+#, fuzzy
+msgid "License"
+msgstr "lisens."
+
 #: actions/version.php:170
 msgid ""
 "StatusNet is free software: you can redistribute it and/or modify it under "
@@ -6738,12 +6908,14 @@ msgid ""
 "along with this program.  If not, see %s."
 msgstr ""
 
-#: actions/version.php:191
-msgid "Plugins"
-msgstr ""
+#. TRANS: Form input field label for application name.
+#: actions/version.php:197 lib/applicationeditform.php:190
+#, fuzzy
+msgid "Name"
+msgstr "Kallenamn"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:901
+#: actions/version.php:198 lib/action.php:885
 #, fuzzy
 msgid "Version"
 msgstr "Personleg"
@@ -6752,6 +6924,12 @@ msgstr "Personleg"
 msgid "Author(s)"
 msgstr ""
 
+#. TRANS: Form input field label.
+#: actions/version.php:200 lib/applicationeditform.php:208
+#: lib/groupeditform.php:168
+msgid "Description"
+msgstr "Beskriving"
+
 #. TRANS: Activity title when marking a notice as favorite.
 #: classes/Fave.php:164
 msgid "Favor"
@@ -6871,7 +7049,7 @@ msgid "Could not create login token for %s"
 msgstr "Kunne ikkje lagre favoritt."
 
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
-#: classes/Memcached_DataObject.php:542
+#: classes/Memcached_DataObject.php:556
 msgid "No database name or DSN found anywhere."
 msgstr ""
 
@@ -7051,18 +7229,18 @@ msgstr "%1$s høyrer no på notisane dine på %2$s."
 
 #. TRANS: Notice given on user registration.
 #. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:395
+#: classes/User.php:390
 #, fuzzy, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr "Melding til %1$s på %2$s"
 
 #. TRANS: Server exception.
-#: classes/User.php:918
+#: classes/User.php:923
 msgid "No single user defined for single-user mode."
 msgstr ""
 
 #. TRANS: Server exception.
-#: classes/User.php:922
+#: classes/User.php:927
 msgid "Single-user mode code called when not enabled."
 msgstr ""
 
@@ -7108,42 +7286,6 @@ msgstr ""
 msgid "No AtomPub API service for %s."
 msgstr ""
 
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:104
-msgid "Change your profile settings"
-msgstr "Endra profilinnstillingane dine"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:111
-msgid "Upload an avatar"
-msgstr "Last opp ein avatar"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:118
-msgid "Change your password"
-msgstr "Endra passordet ditt"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:125
-msgid "Change email handling"
-msgstr "Endra eposthandtering"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:132
-#, fuzzy
-msgid "Design your profile"
-msgstr "Brukarprofil"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:139
-msgid "Other options"
-msgstr "Andre val"
-
-#. TRANS: Link description in user account settings menu.
-#: lib/accountsettingsaction.php:141
-msgid "Other"
-msgstr "Anna"
-
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
 #: lib/action.php:161
 #, fuzzy, php-format
@@ -7161,217 +7303,129 @@ msgctxt "TOOLTIP"
 msgid "Show more"
 msgstr ""
 
-#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:544
-msgid "Primary site navigation"
-msgstr "Navigasjon for hovudsida"
-
-#. TRANS: Tooltip for main menu option "Personal".
-#: lib/action.php:550
+#. TRANS: Inline reply form submit button: submits a reply comment.
+#: lib/action.php:328
 #, fuzzy
-msgctxt "TOOLTIP"
-msgid "Personal profile and friends timeline"
-msgstr "Personleg profil og oversyn over vener"
+msgctxt "BUTTON"
+msgid "Comment"
+msgstr "Innhald"
 
-#. TRANS: Main menu option when logged in for access to personal profile and friends timeline.
-#. TRANS: Personal group navigation menu option when logged in for viewing timeline of self and friends.
-#: lib/action.php:553 lib/personalgroupnav.php:100
+#. TRANS: Placeholder text for inline reply form. Clicking in this box will turn it into a mini notice form.
+#: lib/action.php:331
+msgid "Add a comment..."
+msgstr ""
+
+#: lib/action.php:559 lib/personalgroupnav.php:99
 #, fuzzy
-msgctxt "MENU"
-msgid "Personal"
-msgstr "Personleg"
+msgid "Home"
+msgstr "Heimeside"
 
-#. TRANS: Tooltip for main menu option "Account".
-#: lib/action.php:555
-msgctxt "TOOLTIP"
-msgid "Change your email, avatar, password, profile"
-msgstr "Endra passordet ditt"
-
-#. TRANS: Main menu option when logged in for access to user settings.
-#: lib/action.php:558
-msgid "Account"
-msgstr "Konto"
-
-#. TRANS: Tooltip for main menu option "Services".
 #: lib/action.php:560
 #, fuzzy
-msgctxt "TOOLTIP"
-msgid "Connect to services"
-msgstr "Klarte ikkje å omdirigera til tenaren: %s"
+msgid "Friends timeline"
+msgstr "%s tidsline"
 
-#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services.
-#: lib/action.php:563
-msgid "Connect"
-msgstr "Kopla til"
-
-#. TRANS: Tooltip for menu option "Admin".
 #: lib/action.php:566
 #, fuzzy
-msgctxt "TOOLTIP"
-msgid "Change site configuration"
-msgstr "Navigasjon for hovudsida"
+msgid "Your profile"
+msgstr "Gruppe profil"
 
-#. TRANS: Main menu option when logged in and site admin for access to site configuration.
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/action.php:569 lib/groupnav.php:117
+#: lib/action.php:570 lib/action.php:593 lib/publicgroupnav.php:78
+msgid "Public"
+msgstr "Offentleg"
+
+#: lib/action.php:571 lib/action.php:594
 #, fuzzy
-msgctxt "MENU"
-msgid "Admin"
-msgstr "Administrator"
+msgid "Everyone on this site"
+msgstr "Finn folk på denne sida"
 
-#. TRANS: Tooltip for main menu option "Invite".
-#: lib/action.php:573
-#, fuzzy, php-format
-msgctxt "TOOLTIP"
-msgid "Invite friends and colleagues to join you on %s"
-msgstr "Inviter vennar og kollega til å bli med deg på %s"
+#: lib/action.php:575
+#, fuzzy
+msgid "Settings"
+msgstr "Avatar-innstillingar"
 
-#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users.
 #: lib/action.php:576
 #, fuzzy
-msgctxt "MENU"
-msgid "Invite"
-msgstr "Invitér"
+msgid "Change your personal settings"
+msgstr "Endra profilinnstillingane dine"
 
-#. TRANS: Tooltip for main menu option "Logout"
 #: lib/action.php:582
-msgctxt "TOOLTIP"
-msgid "Logout from the site"
-msgstr "Logg inn "
+#, fuzzy
+msgid "Site configuration"
+msgstr "SMS bekreftelse"
 
-#. TRANS: Main menu option when logged in to log out the current user.
-#: lib/action.php:585
-msgctxt "MENU"
+#: lib/action.php:587
+#, fuzzy
 msgid "Logout"
 msgstr "Logo"
 
-#. TRANS: Tooltip for main menu option "Register".
-#: lib/action.php:590
-msgctxt "TOOLTIP"
-msgid "Create an account"
-msgstr "Opprett ei ny gruppe"
-
-#. TRANS: Main menu option when not logged in to register a new account.
-#. TRANS: Menu item for registering with the StatusNet site.
-#: lib/action.php:593 lib/logingroupnav.php:85
+#: lib/action.php:588
 #, fuzzy
-msgctxt "MENU"
-msgid "Register"
-msgstr "Registrér"
+msgid "Logout from the site"
+msgstr "Logg inn "
 
-#. TRANS: Tooltip for main menu option "Login".
-#: lib/action.php:596
-msgctxt "TOOLTIP"
+#: lib/action.php:599
+#, fuzzy
 msgid "Login to the site"
 msgstr "Logg inn "
 
-#. TRANS: Main menu option when not logged in to log in.
-#. TRANS: Menu item for logging in to the StatusNet site.
-#: lib/action.php:599 lib/logingroupnav.php:77
+#: lib/action.php:606
 #, fuzzy
-msgctxt "MENU"
-msgid "Login"
-msgstr "Logg inn"
-
-#. TRANS: Tooltip for main menu option "Help".
-#: lib/action.php:602
-msgctxt "TOOLTIP"
-msgid "Help me!"
-msgstr "Hjelp"
-
-#. TRANS: Main menu option for help on the StatusNet site.
-#: lib/action.php:605
-msgctxt "MENU"
-msgid "Help"
-msgstr "Hjelp"
-
-#. TRANS: Tooltip for main menu option "Search".
-#: lib/action.php:608
-#, fuzzy
-msgctxt "TOOLTIP"
-msgid "Search for people or text"
-msgstr "Søk etter folk eller innhald"
-
-#. TRANS: Main menu option when logged in or when the StatusNet instance is not private.
-#: lib/action.php:611
-#, fuzzy
-msgctxt "MENU"
 msgid "Search"
 msgstr "Søk"
 
-#. TRANS: DT element for site notice. String is hidden in default CSS.
-#. TRANS: Menu item for site administration
-#: lib/action.php:633 lib/adminpanelaction.php:387
-msgid "Site notice"
-msgstr "Statusmelding"
-
-#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:700
-msgid "Local views"
-msgstr "Lokale syningar"
-
-#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:770
-msgid "Page notice"
-msgstr "Sidenotis"
-
-#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:874
-msgid "Secondary site navigation"
-msgstr "Andrenivås side navigasjon"
+#: lib/action.php:607
+#, fuzzy
+msgid "Search the site"
+msgstr "Søk"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:880
+#: lib/action.php:864
 msgid "Help"
 msgstr "Hjelp"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:883
+#: lib/action.php:867
 msgid "About"
 msgstr "Om"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:886
+#: lib/action.php:870
 msgid "FAQ"
 msgstr "OSS"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:891
+#: lib/action.php:875
 msgid "TOS"
 msgstr ""
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:895
+#: lib/action.php:879
 msgid "Privacy"
 msgstr "Personvern"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:898
+#: lib/action.php:882
 msgid "Source"
 msgstr "Kjeldekode"
 
 #. TRANS: Secondary navigation menu option leading to e-mail contact information on the
 #. TRANS: StatusNet site, where to report bugs, ...
-#: lib/action.php:905
+#: lib/action.php:889
 msgid "Contact"
 msgstr "Kontakt"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:908
+#: lib/action.php:892
 #, fuzzy
 msgid "Badge"
 msgstr "Dult"
 
-#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:937
-msgid "StatusNet software license"
-msgstr "StatusNets programvarelisens"
-
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:944
+#: lib/action.php:921
 #, fuzzy, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7381,7 +7435,7 @@ msgstr ""
 "broughtbyurl%%). "
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:947
+#: lib/action.php:924
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** er ei mikrobloggingteneste."
@@ -7390,7 +7444,7 @@ msgstr "**%%site.name%%** er ei mikrobloggingteneste."
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:954
+#: lib/action.php:931
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7401,52 +7455,41 @@ msgstr ""
 "%s, tilgjengeleg under [GNU Affero General Public License](http://www.fsf."
 "org/licensing/licenses/agpl-3.0.html)."
 
-#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:970
-#, fuzzy
-msgid "Site content license"
-msgstr "StatusNets programvarelisens"
-
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:977
+#: lib/action.php:949
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:984
+#: lib/action.php:956
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:988
+#: lib/action.php:960
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:1020
+#: lib/action.php:992
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
 
-#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1356
-msgid "Pagination"
-msgstr "Paginering"
-
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1367
+#: lib/action.php:1335
 msgid "After"
 msgstr "« Etter"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1377
+#: lib/action.php:1345
 msgid "Before"
 msgstr "Før »"
 
@@ -7610,7 +7653,7 @@ msgid "User configuration"
 msgstr "SMS bekreftelse"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:122
+#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:110
 msgid "User"
 msgstr "Brukar"
 
@@ -7638,6 +7681,11 @@ msgstr "SMS bekreftelse"
 msgid "Edit site notice"
 msgstr "Statusmelding"
 
+#. TRANS: Menu item for site administration
+#: lib/adminpanelaction.php:387
+msgid "Site notice"
+msgstr "Statusmelding"
+
 #. TRANS: Menu item title/tooltip
 #: lib/adminpanelaction.php:393
 #, fuzzy
@@ -7649,6 +7697,12 @@ msgstr "SMS bekreftelse"
 msgid "Set site license"
 msgstr ""
 
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:409
+#, fuzzy
+msgid "Plugins configuration"
+msgstr "SMS bekreftelse"
+
 #. TRANS: Client error 401.
 #: lib/apiauth.php:111
 msgid "API resource requires read-write access, but you only have read access."
@@ -7659,19 +7713,23 @@ msgstr ""
 msgid "No application for that consumer key."
 msgstr ""
 
+#: lib/apiauth.php:202 lib/apiauth.php:284
+msgid "Not allowed to use API."
+msgstr ""
+
 #. TRANS: OAuth exception given when an incorrect access token was given for a user.
-#: lib/apiauth.php:219
+#: lib/apiauth.php:225
 msgid "Bad access token."
 msgstr ""
 
 #. TRANS: OAuth exception given when no user was found for a given token (no token was found).
-#: lib/apiauth.php:224
+#: lib/apiauth.php:230
 msgid "No user for that token."
 msgstr ""
 
 #. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel".
 #. TRANS: Client error thrown when authentication fails.
-#: lib/apiauth.php:266 lib/apiauth.php:293
+#: lib/apiauth.php:272 lib/apiauth.php:302
 msgid "Could not authenticate you."
 msgstr ""
 
@@ -7719,6 +7777,11 @@ msgstr ""
 msgid "Failed to delete revoked token."
 msgstr ""
 
+#. TRANS: Form input field label for application icon.
+#: lib/applicationeditform.php:177
+msgid "Icon"
+msgstr ""
+
 #. TRANS: Form guide.
 #: lib/applicationeditform.php:182
 msgid "Icon for this application"
@@ -7755,6 +7818,12 @@ msgstr "Kjeldekode"
 msgid "Organization responsible for this application"
 msgstr ""
 
+#. TRANS: Form input field label.
+#: lib/applicationeditform.php:227
+#, fuzzy
+msgid "Organization"
+msgstr "Paginering"
+
 #. TRANS: Form input field instructions.
 #: lib/applicationeditform.php:234
 #, fuzzy
@@ -7844,16 +7913,6 @@ msgstr ""
 msgid "Do not use this method!"
 msgstr "Ikkje slett denne gruppa"
 
-#. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:293
-msgid "Author"
-msgstr ""
-
-#. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:307
-msgid "Provider"
-msgstr "Forhandsvis"
-
 #. TRANS: Title.
 #: lib/attachmentnoticesection.php:67
 msgid "Notices where this attachment appears"
@@ -7881,24 +7940,29 @@ msgstr "Endra passord"
 msgid "Block"
 msgstr "Blokkér"
 
+#. TRANS: Description of the form to block a user.
+#: lib/blockform.php:79
+msgid "Block this user"
+msgstr "Blokkér denne brukaren"
+
 #. TRANS: Title for command results.
-#: lib/channel.php:160 lib/channel.php:181
+#: lib/channel.php:104 lib/channel.php:125
 msgid "Command results"
 msgstr "Resultat frå kommandoen"
 
 #. TRANS: Title for command results.
-#: lib/channel.php:194
+#: lib/channel.php:138
 #, fuzzy
 msgid "AJAX error"
 msgstr "Ajax feil"
 
 #. TRANS: E-mail subject when a command has completed.
-#: lib/channel.php:233 lib/mailhandler.php:143
+#: lib/channel.php:177 lib/mailhandler.php:143
 msgid "Command complete"
 msgstr "Kommandoen utførd"
 
 #. TRANS: E-mail subject when a command has failed.
-#: lib/channel.php:244
+#: lib/channel.php:188
 msgid "Command failed"
 msgstr "Kommandoen feila"
 
@@ -8000,7 +8064,7 @@ msgstr "Fullt namn: %s"
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a location.
-#: lib/command.php:446 lib/mail.php:270
+#: lib/command.php:446 lib/mail.php:275
 #, php-format
 msgid "Location: %s"
 msgstr "Stad: %s"
@@ -8008,7 +8072,7 @@ msgstr "Stad: %s"
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a homepage.
-#: lib/command.php:450 lib/mail.php:274
+#: lib/command.php:450 lib/mail.php:279
 #, php-format
 msgid "Homepage: %s"
 msgstr "Heimeside: %s"
@@ -8245,114 +8309,105 @@ msgid ""
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:162
+#: lib/common.php:36
 #, fuzzy
 msgid "No configuration file found."
 msgstr "Ingen stadfestingskode."
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:165
+#: lib/common.php:39
 #, fuzzy
 msgid "I looked for configuration files in the following places:"
 msgstr "Invitasjon(er) sendt til fylgjande folk:"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:168
+#: lib/common.php:42
 msgid "You may wish to run the installer to fix this."
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:172
+#: lib/common.php:46
 #, fuzzy
 msgid "Go to the installer."
 msgstr "Logg inn or sida"
 
-#. TRANS: Menu item for Instant Messaging settings.
-#: lib/connectsettingsaction.php:106
-#, fuzzy
-msgctxt "MENU"
-msgid "IM"
-msgstr "Ljonmelding"
-
-#. TRANS: Tooltip for Instant Messaging menu item.
-#: lib/connectsettingsaction.php:108
-msgid "Updates by instant messenger (IM)"
-msgstr "Oppdateringar over direktemeldingar (IM)"
-
-#. TRANS: Menu item for Short Message Service settings.
-#: lib/connectsettingsaction.php:113
-#, fuzzy
-msgctxt "MENU"
-msgid "SMS"
-msgstr "SMS"
-
-#. TRANS: Tooltip for Short Message Service menu item.
-#: lib/connectsettingsaction.php:115
-msgid "Updates by SMS"
-msgstr "Oppdateringar over SMS"
-
-#. TRANS: Menu item for OuAth connection settings.
-#: lib/connectsettingsaction.php:120
-#, fuzzy
-msgctxt "MENU"
-msgid "Connections"
-msgstr "Kopla til"
-
-#. TRANS: Tooltip for connected applications (Connections through OAuth) menu item.
-#: lib/connectsettingsaction.php:122
-msgid "Authorized connected applications"
-msgstr ""
-
 #: lib/dberroraction.php:59
 msgid "Database error"
 msgstr ""
 
-#. TRANS: Label in form on profile design page.
-#. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
-#: lib/designsettings.php:108
-msgid "Upload file"
-msgstr "Last opp fil"
+#. TRANS: Description of form for deleting a user.
+#: lib/deleteuserform.php:75
+#, fuzzy
+msgid "Delete this user"
+msgstr "Slett denne notisen"
 
-#. TRANS: Instructions for form on profile design page.
-#: lib/designsettings.php:113
-msgid ""
-"You can upload your personal background image. The maximum file size is 2MB."
-msgstr "Du kan lasta opp ein logo for gruppa."
-
-#. TRANS: Radio button on profile design page that will enable use of the uploaded profile image.
-#: lib/designsettings.php:139
-msgctxt "RADIO"
-msgid "On"
-msgstr ""
-
-#. TRANS: Radio button on profile design page that will disable use of the uploaded profile image.
-#: lib/designsettings.php:156
-msgctxt "RADIO"
-msgid "Off"
-msgstr ""
+#: lib/designform.php:114
+#, fuzzy
+msgid "Change design"
+msgstr "Profilinnstillingar"
 
 #. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: lib/designsettings.php:175
+#: lib/designform.php:131
 #, fuzzy
 msgid "Change colours"
 msgstr "Endra passordet ditt"
 
 #. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: lib/designsettings.php:257
+#: lib/designform.php:138
 msgid "Use defaults"
 msgstr ""
 
+#. TRANS: Title for button on profile design page to reset all colour settings to default.
+#: lib/designform.php:140
+msgid "Restore default designs"
+msgstr ""
+
+#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
+#: lib/designform.php:148
+msgid "Reset back to default"
+msgstr ""
+
+#. TRANS: Label in form on profile design page.
+#. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
+#: lib/designform.php:158
+msgid "Upload file"
+msgstr "Last opp fil"
+
+#. TRANS: Instructions for form on profile design page.
+#: lib/designform.php:163
+#, fuzzy
+msgid ""
+"You can upload your personal background image. The maximum file size is 2Mb."
+msgstr "Du kan lasta opp ein logo for gruppa."
+
+#. TRANS: Radio button on profile design page that will enable use of the uploaded profile image.
+#: lib/designform.php:194
+msgctxt "RADIO"
+msgid "On"
+msgstr ""
+
+#. TRANS: Radio button on profile design page that will disable use of the uploaded profile image.
+#: lib/designform.php:211
+msgctxt "RADIO"
+msgid "Off"
+msgstr ""
+
+#. TRANS: Title for button on profile design page to save settings.
+#: lib/designform.php:322
+msgid "Save design"
+msgstr ""
+
 #. TRANS: Error message displayed if design settings could not be saved.
 #. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
-#: lib/designsettings.php:405 lib/designsettings.php:427
+#: lib/designsettings.php:216 lib/designsettings.php:238
 #, fuzzy
 msgid "Couldn't update your design."
 msgstr "Kan ikkje oppdatera brukar."
 
 #. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
-#: lib/designsettings.php:433
+#: lib/designsettings.php:244
 msgid "Design defaults restored."
 msgstr ""
 
@@ -8422,28 +8477,24 @@ msgstr ""
 msgid "Feeds"
 msgstr ""
 
-#: lib/galleryaction.php:121
-msgid "Filter tags"
-msgstr "Filtrer emneord"
-
-#: lib/galleryaction.php:131
+#: lib/galleryaction.php:128
 msgid "All"
 msgstr "Alle"
 
-#: lib/galleryaction.php:139
+#: lib/galleryaction.php:136
 #, fuzzy
 msgid "Select tag to filter"
 msgstr "Velg ein tilbydar"
 
-#: lib/galleryaction.php:140
+#: lib/galleryaction.php:137
 msgid "Tag"
 msgstr "Merkelapp"
 
-#: lib/galleryaction.php:141
+#: lib/galleryaction.php:138
 msgid "Choose a tag to narrow list"
 msgstr "Velg ein merkelapp for å begrense lista"
 
-#: lib/galleryaction.php:143
+#: lib/galleryaction.php:140
 msgid "Go"
 msgstr "Gå"
 
@@ -8533,6 +8584,13 @@ msgctxt "TOOLTIP"
 msgid "%s blocked users"
 msgstr ""
 
+#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
+#: lib/groupnav.php:117
+#, fuzzy
+msgctxt "MENU"
+msgid "Admin"
+msgstr "Administrator"
+
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
 #: lib/groupnav.php:120
@@ -8642,39 +8700,63 @@ msgid_plural "%dB"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/jabber.php:387
+#: lib/implugin.php:262
 #, php-format
-msgid "[%s]"
+msgid ""
+"User \"%s\" on %s has said that your %s screenname belongs to them. If "
+"that's true, you can confirm by clicking on this URL: %s . (If you cannot "
+"click it, copy-and-paste it into the address bar of your browser). If that "
+"user isn't you, or if you didn't request this confirmation, just ignore this "
+"message."
 msgstr ""
 
-#: lib/jabber.php:567
+#: lib/implugin.php:349
 #, php-format
 msgid "Unknown inbox source %d."
 msgstr ""
 
+#: lib/implugin.php:485
+#, fuzzy, php-format
+msgid "Message too long - maximum is %1$d characters, you sent %2$d."
+msgstr "Melding for lang - maksimum 140 teikn, du skreiv %d"
+
 #: lib/leaveform.php:114
 msgid "Leave"
 msgstr "Forlat"
 
+#. TRANS: Menu item for logging in to the StatusNet site.
+#: lib/logingroupnav.php:77
+#, fuzzy
+msgctxt "MENU"
+msgid "Login"
+msgstr "Logg inn"
+
 #. TRANS: Title for menu item for logging in to the StatusNet site.
 #: lib/logingroupnav.php:79
 msgid "Login with a username and password"
 msgstr "Log inn med brukarnamn og passord."
 
+#. TRANS: Menu item for registering with the StatusNet site.
+#: lib/logingroupnav.php:85
+#, fuzzy
+msgctxt "MENU"
+msgid "Register"
+msgstr "Registrér"
+
 #. TRANS: Title for menu item for registering with the StatusNet site.
 #: lib/logingroupnav.php:87
 msgid "Sign up for a new account"
 msgstr "Opprett ny konto"
 
 #. TRANS: Subject for address confirmation email.
-#: lib/mail.php:168
+#: lib/mail.php:172
 msgid "Email address confirmation"
 msgstr "Stadfesting av epostadresse"
 
 #. TRANS: Body for address confirmation email.
 #. TRANS: %1$s is the addressed user's nickname, %2$s is the StatusNet sitename,
 #. TRANS: %3$s is the URL to confirm at.
-#: lib/mail.php:173
+#: lib/mail.php:177
 #, php-format
 msgid ""
 "Hey, %1$s.\n"
@@ -8693,14 +8775,14 @@ msgstr ""
 
 #. TRANS: Subject of new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
-#: lib/mail.php:238
+#: lib/mail.php:243
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1$s høyrer no på notisane dine på %2$s."
 
 #. TRANS: This is a paragraph in a new-subscriber e-mail.
 #. TRANS: %s is a URL where the subscriber can be reported as abusive.
-#: lib/mail.php:245
+#: lib/mail.php:250
 #, php-format
 msgid ""
 "If you believe this account is being used abusively, you can block them from "
@@ -8712,7 +8794,7 @@ msgstr ""
 #. TRANS: %3$s is the subscriber's profile URL, %4$s is the subscriber's location (or empty)
 #. TRANS: %5$s is the subscriber's homepage URL (or empty), %6%s is the subscriber's bio (or empty)
 #. TRANS: %7$s is a link to the addressed user's e-mail settings.
-#: lib/mail.php:255
+#: lib/mail.php:260
 #, fuzzy, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -8735,14 +8817,14 @@ msgstr ""
 
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is biographical information.
-#: lib/mail.php:278
+#: lib/mail.php:283
 #, php-format
 msgid "Bio: %s"
 msgstr "Stad: %s"
 
 #. TRANS: Subject of notification mail for new posting email address.
 #. TRANS: %s is the StatusNet sitename.
-#: lib/mail.php:307
+#: lib/mail.php:312
 #, php-format
 msgid "New email address for posting to %s"
 msgstr "Ny epostadresse for å oppdatera %s"
@@ -8750,7 +8832,7 @@ msgstr "Ny epostadresse for å oppdatera %s"
 #. TRANS: Body of notification mail for new posting email address.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is the e-mail address to send
 #. TRANS: to to post by e-mail, %3$s is a URL to more instructions.
-#: lib/mail.php:313
+#: lib/mail.php:318
 #, fuzzy, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -8772,26 +8854,26 @@ msgstr ""
 
 #. TRANS: Subject line for SMS-by-email notification messages.
 #. TRANS: %s is the posting user's nickname.
-#: lib/mail.php:434
+#: lib/mail.php:439
 #, php-format
 msgid "%s status"
 msgstr "%s status"
 
 #. TRANS: Subject line for SMS-by-email address confirmation message.
-#: lib/mail.php:460
+#: lib/mail.php:465
 msgid "SMS confirmation"
 msgstr "SMS bekreftelse"
 
 #. TRANS: Main body heading for SMS-by-email address confirmation message.
 #. TRANS: %s is the addressed user's nickname.
-#: lib/mail.php:464
+#: lib/mail.php:469
 #, fuzzy, php-format
 msgid "%s: confirm you own this phone number with this code:"
 msgstr "Ventar på godkjenning for dette telefonnummeret."
 
 #. TRANS: Subject for 'nudge' notification email.
 #. TRANS: %s is the nudging user.
-#: lib/mail.php:485
+#: lib/mail.php:490
 #, fuzzy, php-format
 msgid "You have been nudged by %s"
 msgstr "Du har blitt dulta av %s"
@@ -8799,7 +8881,7 @@ msgstr "Du har blitt dulta av %s"
 #. TRANS: Body for 'nudge' notification email.
 #. TRANS: %1$s is the nuding user's long name, $2$s is the nudging user's nickname,
 #. TRANS: %3$s is a URL to post notices at, %4$s is the StatusNet sitename.
-#: lib/mail.php:492
+#: lib/mail.php:497
 #, php-format
 msgid ""
 "%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -8817,7 +8899,7 @@ msgstr ""
 
 #. TRANS: Subject for direct-message notification email.
 #. TRANS: %s is the sending user's nickname.
-#: lib/mail.php:539
+#: lib/mail.php:544
 #, php-format
 msgid "New private message from %s"
 msgstr "Ny privat melding fra %s"
@@ -8826,7 +8908,7 @@ msgstr "Ny privat melding fra %s"
 #. TRANS: %1$s is the sending user's long name, %2$s is the sending user's nickname,
 #. TRANS: %3$s is the message content, %4$s a URL to the message,
 #. TRANS: %5$s is the StatusNet sitename.
-#: lib/mail.php:547
+#: lib/mail.php:552
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -8847,7 +8929,7 @@ msgstr ""
 
 #. TRANS: Subject for favorite notification e-mail.
 #. TRANS: %1$s is the adding user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:599
+#: lib/mail.php:604
 #, fuzzy, php-format
 msgid "%1$s (@%2$s) added your notice as a favorite"
 msgstr ""
@@ -8858,7 +8940,7 @@ msgstr ""
 #. TRANS: %3$s is a URL to the faved notice, %4$s is the faved notice text,
 #. TRANS: %5$s is a URL to all faves of the adding user, %6$s is the StatusNet sitename,
 #. TRANS: %7$s is the adding user's nickname.
-#: lib/mail.php:606
+#: lib/mail.php:611
 #, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -8880,7 +8962,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:664
+#: lib/mail.php:669
 #, php-format
 msgid ""
 "The full conversation can be read here:\n"
@@ -8890,7 +8972,7 @@ msgstr ""
 
 #. TRANS: E-mail subject for notice notification.
 #. TRANS: %1$s is the sending user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:672
+#: lib/mail.php:677
 #, php-format
 msgid "%1$s (@%2$s) sent a notice to your attention"
 msgstr ""
@@ -8901,7 +8983,7 @@ msgstr ""
 #. TRANS: %5$s is a URL to the full conversion if it exists (otherwise empty),
 #. TRANS: %6$s is a URL to reply to the notice, %7$s is a URL to all @-replied for the addressed user,
 #. TRANS: %8$s is a URL to the addressed user's e-mail settings, %9$s is the sender's nickname.
-#: lib/mail.php:680
+#: lib/mail.php:685
 #, php-format
 msgid ""
 "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -9018,11 +9100,7 @@ msgstr "Ikkje tinga."
 msgid "To"
 msgstr "Til"
 
-#: lib/messageform.php:166 lib/noticeform.php:186
-msgid "Available characters"
-msgstr "Tilgjenglege teikn"
-
-#: lib/messageform.php:185 lib/noticeform.php:237
+#: lib/messageform.php:184 lib/noticeform.php:236
 #, fuzzy
 msgctxt "Send button for sending notice"
 msgid "Send"
@@ -9033,16 +9111,11 @@ msgstr "Send"
 msgid "Messages"
 msgstr "Melding"
 
-#: lib/messagelistitem.php:123 lib/noticelist.php:522
+#: lib/messagelistitem.php:123 lib/noticelist.php:527
 #, fuzzy
 msgid "from"
 msgstr " frå "
 
-#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:165
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr "Kallenamn må berre ha små bokstavar og nummer, ingen mellomrom."
-
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 #: lib/nickname.php:178
 msgid "Nickname cannot be empty."
@@ -9065,83 +9138,87 @@ msgstr "Send ei melding"
 msgid "What's up, %s?"
 msgstr "Kva skjer, %s?"
 
-#: lib/noticeform.php:194
+#: lib/noticeform.php:193
 msgid "Attach"
 msgstr ""
 
-#: lib/noticeform.php:198
+#: lib/noticeform.php:197
 msgid "Attach a file"
 msgstr ""
 
-#: lib/noticeform.php:213
+#: lib/noticeform.php:212
 #, fuzzy
 msgid "Share my location"
 msgstr "Kan ikkje lagra merkelapp."
 
-#: lib/noticeform.php:216
+#: lib/noticeform.php:215
 #, fuzzy
 msgid "Do not share my location"
 msgstr "Kan ikkje lagra merkelapp."
 
-#: lib/noticeform.php:217
+#: lib/noticeform.php:216
 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
 "try again later"
 msgstr ""
 
 #. TRANS: Used in coordinates as abbreviation of north
-#: lib/noticelist.php:452
+#: lib/noticelist.php:457
 #, fuzzy
 msgid "N"
 msgstr "Nei"
 
 #. TRANS: Used in coordinates as abbreviation of south
-#: lib/noticelist.php:454
+#: lib/noticelist.php:459
 msgid "S"
 msgstr ""
 
 #. TRANS: Used in coordinates as abbreviation of east
-#: lib/noticelist.php:456
+#: lib/noticelist.php:461
 msgid "E"
 msgstr ""
 
 #. TRANS: Used in coordinates as abbreviation of west
-#: lib/noticelist.php:458
+#: lib/noticelist.php:463
 msgid "W"
 msgstr ""
 
-#: lib/noticelist.php:460
+#: lib/noticelist.php:465
 #, php-format
 msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgstr ""
 
-#: lib/noticelist.php:469
+#: lib/noticelist.php:474
 msgid "at"
 msgstr ""
 
-#: lib/noticelist.php:518
+#: lib/noticelist.php:523
 msgid "web"
 msgstr ""
 
-#: lib/noticelist.php:584
+#: lib/noticelist.php:589
 #, fuzzy
 msgid "in context"
 msgstr "Ingen innhald."
 
-#: lib/noticelist.php:619
+#: lib/noticelist.php:624
 #, fuzzy
 msgid "Repeated by"
 msgstr "Lag"
 
-#: lib/noticelist.php:646
+#: lib/noticelist.php:651
 msgid "Reply to this notice"
 msgstr "Svar på denne notisen"
 
-#: lib/noticelist.php:647
+#: lib/noticelist.php:652
 msgid "Reply"
 msgstr "Svar"
 
-#: lib/noticelist.php:691
+#: lib/noticelist.php:678
+msgid "Delete this notice"
+msgstr "Slett denne notisen"
+
+#: lib/noticelist.php:696
 #, fuzzy
 msgid "Notice repeated"
 msgstr "Melding lagra"
@@ -9179,48 +9256,31 @@ msgstr ""
 msgid "Couldn't insert new subscription."
 msgstr "Kan ikkje leggja til ny tinging."
 
-#. TRANS: Personal group navigation menu option when logged in for viewing @-replies.
-#: lib/personalgroupnav.php:107
+#: lib/personalgroupnav.php:104
 #, fuzzy
-msgctxt "MENU"
 msgid "Replies"
 msgstr "Svar"
 
-#. TRANS: Personal group navigation menu option when logged in for seeing own profile.
-#: lib/personalgroupnav.php:114
+#: lib/personalgroupnav.php:109
 #, fuzzy
-msgctxt "MENU"
-msgid "Profile"
-msgstr "Profil"
-
-#. TRANS: Personal group navigation menu option when logged in for viewing own favourited notices.
-#: lib/personalgroupnav.php:120
-#, fuzzy
-msgctxt "MENU"
 msgid "Favorites"
 msgstr "Favorittar"
 
-#. TRANS: Personal group navigation menu option when logged in for viewing recieved personal messages.
-#: lib/personalgroupnav.php:133
+#: lib/personalgroupnav.php:120
 #, fuzzy
-msgctxt "MENU"
 msgid "Inbox"
 msgstr "Innboks"
 
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing recieved personal messages.
-#: lib/personalgroupnav.php:135
+#: lib/personalgroupnav.php:121
 msgid "Your incoming messages"
 msgstr "Dine innkomande meldinger"
 
-#. TRANS: Personal group navigation menu option when logged in for viewing senet personal messages.
-#: lib/personalgroupnav.php:140
+#: lib/personalgroupnav.php:125
 #, fuzzy
-msgctxt "MENU"
 msgid "Outbox"
 msgstr "Utboks"
 
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing senet personal messages.
-#: lib/personalgroupnav.php:142
+#: lib/personalgroupnav.php:126
 msgid "Your sent messages"
 msgstr "Dine sende meldingar"
 
@@ -9236,9 +9296,26 @@ msgstr "Merkelappar i %s sine notisar"
 msgid "Unknown"
 msgstr "Uventa handling."
 
+#. TRANS: Plugin admin panel controls
+#: lib/plugindisableform.php:90
+msgctxt "plugin"
+msgid "Disable"
+msgstr ""
+
+#. TRANS: Plugin admin panel controls
+#: lib/pluginenableform.php:112
+msgctxt "plugin"
+msgid "Enable"
+msgstr ""
+
+#: lib/pluginlist.php:196
+msgctxt "plugin-description"
+msgid "(Plugin descriptions unavailable when disabled.)"
+msgstr ""
+
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:82
+#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:88
 msgid "Subscriptions"
 msgstr "Tingingar"
 
@@ -9249,7 +9326,7 @@ msgstr "Alle tingingar"
 
 #. TRANS: H2 text for user subscriber statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:90
+#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:96
 msgid "Subscribers"
 msgstr "Tingarar"
 
@@ -9272,7 +9349,7 @@ msgstr "Medlem sidan"
 #. TRANS: Label for user statistics.
 #. TRANS: H2 text for user group membership statistics.
 #: lib/profileaction.php:239 lib/profileaction.php:290
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:104
 msgid "Groups"
 msgstr "Grupper"
 
@@ -9292,10 +9369,6 @@ msgstr "Alle gruppar"
 msgid "Unimplemented method."
 msgstr ""
 
-#: lib/publicgroupnav.php:78
-msgid "Public"
-msgstr "Offentleg"
-
 #: lib/publicgroupnav.php:82
 msgid "User groups"
 msgstr "Brukar grupper"
@@ -9337,7 +9410,7 @@ msgid "Revoke the \"%s\" role from this user"
 msgstr "Ei liste over brukarane i denne gruppa."
 
 #. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:974
+#: lib/router.php:1001
 #, fuzzy
 msgid "Page not found."
 msgstr "Fann ikkje API-metode."
@@ -9370,12 +9443,6 @@ msgctxt "BUTTON"
 msgid "Search"
 msgstr ""
 
-#. TRANS: Definition list item with instructions on how to get (better) search results.
-#: lib/searchaction.php:170
-#, fuzzy
-msgid "Search help"
-msgstr "Søk"
-
 #: lib/searchgroupnav.php:80
 msgid "People"
 msgstr "Folk"
@@ -9400,6 +9467,52 @@ msgstr "Seksjon utan tittel"
 msgid "More..."
 msgstr ""
 
+#: lib/settingsnav.php:78
+msgid "Change your profile settings"
+msgstr "Endra profilinnstillingane dine"
+
+#: lib/settingsnav.php:83
+msgid "Upload an avatar"
+msgstr "Last opp ein avatar"
+
+#: lib/settingsnav.php:88
+msgid "Change your password"
+msgstr "Endra passordet ditt"
+
+#: lib/settingsnav.php:93
+msgid "Change email handling"
+msgstr "Endra eposthandtering"
+
+#: lib/settingsnav.php:98
+#, fuzzy
+msgid "Design your profile"
+msgstr "Brukarprofil"
+
+#: lib/settingsnav.php:102
+msgid "URL"
+msgstr "URL"
+
+#: lib/settingsnav.php:103
+msgid "URL shorteners"
+msgstr ""
+
+#: lib/settingsnav.php:111
+msgid "Updates by instant messenger (IM)"
+msgstr "Oppdateringar over direktemeldingar (IM)"
+
+#: lib/settingsnav.php:118
+msgid "Updates by SMS"
+msgstr "Oppdateringar over SMS"
+
+#: lib/settingsnav.php:123
+#, fuzzy
+msgid "Connections"
+msgstr "Kopla til"
+
+#: lib/settingsnav.php:124
+msgid "Authorized connected applications"
+msgstr ""
+
 #: lib/silenceform.php:67
 #, fuzzy
 msgid "Silence"
@@ -9410,30 +9523,34 @@ msgstr "Statusmelding"
 msgid "Silence this user"
 msgstr "Blokkér denne brukaren"
 
-#: lib/subgroupnav.php:83
+#: lib/subgroupnav.php:89
 #, php-format
 msgid "People %s subscribes to"
 msgstr "Mennesker %s tingar"
 
-#: lib/subgroupnav.php:91
+#: lib/subgroupnav.php:97
 #, php-format
 msgid "People subscribed to %s"
 msgstr "Mennesker som tingar %s"
 
-#: lib/subgroupnav.php:99
+#: lib/subgroupnav.php:105
 #, php-format
 msgid "Groups %s is a member of"
 msgstr "Grupper %s er medlem av"
 
-#: lib/subgroupnav.php:105
+#: lib/subgroupnav.php:111
 msgid "Invite"
 msgstr "Invitér"
 
-#: lib/subgroupnav.php:106
+#: lib/subgroupnav.php:112
 #, php-format
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Inviter vennar og kollega til å bli med deg på %s"
 
+#: lib/subscribeform.php:115 lib/subscribeform.php:139
+msgid "Subscribe to this user"
+msgstr "Lagre tinging for brukar: %s"
+
 #: lib/subscriberspeopleselftagcloudsection.php:48
 #: lib/subscriptionspeopleselftagcloudsection.php:48
 msgid "People Tagcloud as self-tagged"
@@ -9504,6 +9621,13 @@ msgstr ""
 msgid "Error opening theme archive."
 msgstr "Feil ved fjerning av blokka."
 
+#: lib/threadednoticelist.php:270
+#, php-format
+msgid "Show all %d comment"
+msgid_plural "Show all %d comments"
+msgstr[0] ""
+msgstr[1] ""
+
 #: lib/topposterssection.php:74
 msgid "Top posters"
 msgstr "Med flest meldingar"
@@ -9548,80 +9672,84 @@ msgstr "Fjern tinging"
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "Brukaren har inga profil."
 
-#. TRANS: Link text for changeing the avatar of the logged in user.
-#: lib/userprofile.php:121
+#: lib/userprofile.php:116
 #, fuzzy
 msgid "Edit Avatar"
 msgstr "Brukarbilete"
 
 #. TRANS: H2 for user actions in a profile.
 #. TRANS: H2 for entity actions in a profile.
-#: lib/userprofile.php:245 lib/userprofile.php:261
+#: lib/userprofile.php:216 lib/userprofile.php:232
 msgid "User actions"
 msgstr "Brukarverkty"
 
 #. TRANS: Text shown in user profile of not yet compeltely deleted users.
-#: lib/userprofile.php:249
+#: lib/userprofile.php:220
 msgid "User deletion in progress..."
 msgstr ""
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:277
+#: lib/userprofile.php:248
 #, fuzzy
 msgid "Edit profile settings"
 msgstr "Profilinnstillingar"
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:279
+#: lib/userprofile.php:250
 msgid "Edit"
 msgstr ""
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:303
+#: lib/userprofile.php:274
 msgid "Send a direct message to this user"
 msgstr "Send ei direktemelding til denne brukaren"
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:305
+#: lib/userprofile.php:276
 msgid "Message"
 msgstr "Melding"
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:347
+#: lib/userprofile.php:318
 msgid "Moderate"
 msgstr ""
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:386
+#: lib/userprofile.php:357
 #, fuzzy
 msgid "User role"
 msgstr "Brukarprofil"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:389
+#: lib/userprofile.php:360
 #, fuzzy
 msgctxt "role"
 msgid "Administrator"
 msgstr "Administrator"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:391
+#: lib/userprofile.php:362
 msgctxt "role"
 msgid "Moderator"
 msgstr ""
 
+#: lib/util.php:321
+#, fuzzy
+msgid "Not allowed to log in."
+msgstr "Ikkje logga inn"
+
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1306
+#: lib/util.php:1337
 msgid "a few seconds ago"
 msgstr "eit par sekund sidan"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1309
+#: lib/util.php:1340
 msgid "about a minute ago"
 msgstr "omtrent eitt minutt sidan"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1313
+#: lib/util.php:1344
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
@@ -9629,12 +9757,12 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1316
+#: lib/util.php:1347
 msgid "about an hour ago"
 msgstr "omtrent ein time sidan"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1320
+#: lib/util.php:1351
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
@@ -9642,12 +9770,12 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1323
+#: lib/util.php:1354
 msgid "about a day ago"
 msgstr "omtrent ein dag sidan"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1327
+#: lib/util.php:1358
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
@@ -9655,12 +9783,12 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1330
+#: lib/util.php:1361
 msgid "about a month ago"
 msgstr "omtrent ein månad sidan"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1334
+#: lib/util.php:1365
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
@@ -9668,7 +9796,7 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1337
+#: lib/util.php:1368
 msgid "about a year ago"
 msgstr "omtrent eitt år sidan"
 
@@ -9679,21 +9807,6 @@ msgstr "omtrent eitt år sidan"
 msgid "%s is not a valid color! Use 3 or 6 hex characters."
 msgstr "Heimesida er ikkje ei gyldig internettadresse."
 
-#. TRANS: %s is the URL to the StatusNet site's Instant Messaging settings.
-#: lib/xmppmanager.php:287
-#, php-format
-msgid "Unknown user. Go to %s to add your address to your account"
-msgstr ""
-
-#. TRANS: Response to XMPP source when it sent too long a message.
-#. TRANS: %1$d the maximum number of allowed characters (used for plural), %2$d is the sent number.
-#: lib/xmppmanager.php:406
-#, fuzzy, php-format
-msgid "Message too long. Maximum is %1$d character, you sent %2$d."
-msgid_plural "Message too long. Maximum is %1$d characters, you sent %2$d."
-msgstr[0] "Melding for lang - maksimum 140 teikn, du skreiv %d"
-msgstr[1] "Melding for lang - maksimum 140 teikn, du skreiv %d"
-
 #. TRANS: Exception.
 #: lib/xrd.php:63
 #, fuzzy
@@ -9712,61 +9825,164 @@ msgid "Getting backup from file '%s'."
 msgstr ""
 
 #, fuzzy
-#~ msgid "Block this user."
-#~ msgstr "Blokkér denne brukaren"
+#~ msgid "Could not generate feed for group - %s"
+#~ msgstr "Kann ikkje oppdatera gruppa."
 
 #, fuzzy
-#~ msgid "Delete this notice."
-#~ msgstr "Slett denne notisen"
+#~ msgid "Current confirmed Jabber/Google Talk address."
+#~ msgstr "Stadfesta Jabber/Gtalk-adresse."
 
 #, fuzzy
-#~ msgid "Delete this user."
-#~ msgstr "Slett denne notisen"
+#~ msgid ""
+#~ "Jabber or Google Talk address, like \"UserName@example.org\". First, make "
+#~ "sure to add %s to your buddy list in your IM client or on Google Talk."
+#~ msgstr ""
+#~ "Jabber- eller GTalk-adresse, døme «brukarnamn@example.org». Hugs å fyrst "
+#~ "leggja %s til venelista di i ljonmeldingsklienten din."
 
 #, fuzzy
-#~ msgid "Restore default designs."
-#~ msgstr "Klarte ikkje å lagra Twitter-innstillingane dine!"
+#~ msgid "Send me notices through Jabber/Google Talk."
+#~ msgstr "Send meg ein notis via Jabber/GTalk."
 
 #, fuzzy
-#~ msgid "Save design."
-#~ msgstr "Profilinnstillingar"
+#~ msgid "Publish a MicroID for my Jabber/Google Talk address."
+#~ msgstr "Publiser ein MicroID for Jabber/GTalk addressene mine"
+
+#~ msgid "No Jabber ID."
+#~ msgstr "Nei Jabber-ID"
 
 #, fuzzy
-#~ msgid "Disfavor favorite."
-#~ msgstr "Fjern favoritt"
+#~ msgid "Not a valid Jabber ID."
+#~ msgstr "Ikkje ein gyldig Jabber-ID"
+
+#~ msgid "That is already your Jabber ID."
+#~ msgstr "Det er alt din Jabber ID."
+
+#~ msgid "That is not your Jabber ID."
+#~ msgstr "Det er ikkje din Jabber ID."
+
+#~ msgid "Other settings"
+#~ msgstr "Avatar-innstillingar"
+
+#~ msgid "Tag cloud"
+#~ msgstr "Emne sky"
+
+#~ msgid "Jabber"
+#~ msgstr "Jabber"
+
+#~ msgid "Photo"
+#~ msgstr "Bilete"
+
+#~ msgid "Other options"
+#~ msgstr "Andre val"
+
+#~ msgid "Other"
+#~ msgstr "Anna"
+
+#~ msgid "Primary site navigation"
+#~ msgstr "Navigasjon for hovudsida"
 
 #, fuzzy
-#~ msgid "\"%s\" not found."
-#~ msgstr "Fann ikkje API-metode."
+#~ msgctxt "TOOLTIP"
+#~ msgid "Personal profile and friends timeline"
+#~ msgstr "Personleg profil og oversyn over vener"
 
 #, fuzzy
-#~ msgid "Notice %s not found."
-#~ msgstr "Fann ikkje API-metode."
+#~ msgctxt "MENU"
+#~ msgid "Personal"
+#~ msgstr "Personleg"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Change your email, avatar, password, profile"
+#~ msgstr "Endra passordet ditt"
+
+#~ msgid "Account"
+#~ msgstr "Konto"
 
 #, fuzzy
-#~ msgid "Attachment %s not found."
-#~ msgstr "Kunne ikkje finne mottakar."
+#~ msgctxt "TOOLTIP"
+#~ msgid "Connect to services"
+#~ msgstr "Klarte ikkje å omdirigera til tenaren: %s"
+
+#~ msgid "Connect"
+#~ msgstr "Kopla til"
 
 #, fuzzy
-#~ msgid "Invalid tag: \"%s\"."
-#~ msgstr "Ugyldig merkelapp: %s"
+#~ msgctxt "TOOLTIP"
+#~ msgid "Change site configuration"
+#~ msgstr "Navigasjon for hovudsida"
 
 #, fuzzy
-#~ msgid "%s updates from everyone."
-#~ msgstr "%s oppdateringar frå alle saman!"
+#~ msgctxt "TOOLTIP"
+#~ msgid "Invite friends and colleagues to join you on %s"
+#~ msgstr "Inviter vennar og kollega til å bli med deg på %s"
 
 #, fuzzy
-#~ msgid "Password saved"
-#~ msgstr "Lagra passord."
+#~ msgctxt "MENU"
+#~ msgid "Invite"
+#~ msgstr "Invitér"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Create an account"
+#~ msgstr "Opprett ei ny gruppe"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Help me!"
+#~ msgstr "Hjelp"
+
+#~ msgctxt "MENU"
+#~ msgid "Help"
+#~ msgstr "Hjelp"
 
 #, fuzzy
-#~ msgid "Where you are, like \"City, State (or Region), Country\"."
-#~ msgstr "Kvar er du, t.d. «By, Fylke (eller Region), Land»"
+#~ msgctxt "TOOLTIP"
+#~ msgid "Search for people or text"
+#~ msgstr "Søk etter folk eller innhald"
+
+#~ msgid "Local views"
+#~ msgstr "Lokale syningar"
+
+#~ msgid "Page notice"
+#~ msgstr "Sidenotis"
+
+#~ msgid "Secondary site navigation"
+#~ msgstr "Andrenivås side navigasjon"
+
+#~ msgid "StatusNet software license"
+#~ msgstr "StatusNets programvarelisens"
 
 #, fuzzy
-#~ msgid "Subscribe to this user."
-#~ msgstr "Lagre tinging for brukar: %s"
+#~ msgid "Site content license"
+#~ msgstr "StatusNets programvarelisens"
+
+#~ msgid "Pagination"
+#~ msgstr "Paginering"
+
+#~ msgid "Provider"
+#~ msgstr "Forhandsvis"
 
 #, fuzzy
-#~ msgid "Not allowed to log in."
-#~ msgstr "Ikkje logga inn"
+#~ msgctxt "MENU"
+#~ msgid "SMS"
+#~ msgstr "SMS"
+
+#~ msgid "Filter tags"
+#~ msgstr "Filtrer emneord"
+
+#~ msgid "Available characters"
+#~ msgstr "Tilgjenglege teikn"
+
+#, fuzzy
+#~ msgctxt "MENU"
+#~ msgid "Profile"
+#~ msgstr "Profil"
+
+#, fuzzy
+#~ msgid "Search help"
+#~ msgstr "Søk"
+
+#, fuzzy
+#~ msgid "Message too long. Maximum is %1$d character, you sent %2$d."
+#~ msgid_plural "Message too long. Maximum is %1$d characters, you sent %2$d."
+#~ msgstr[0] "Melding for lang - maksimum 140 teikn, du skreiv %d"
+#~ msgstr[1] "Melding for lang - maksimum 140 teikn, du skreiv %d"
diff --git a/locale/pl/LC_MESSAGES/statusnet.po b/locale/pl/LC_MESSAGES/statusnet.po
index e08d69f141..5e533faecb 100644
--- a/locale/pl/LC_MESSAGES/statusnet.po
+++ b/locale/pl/LC_MESSAGES/statusnet.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 15:58+0000\n"
-"PO-Revision-Date: 2011-03-03 16:01:15+0000\n"
+"POT-Creation-Date: 2011-03-03 17:23+0000\n"
+"PO-Revision-Date: 2011-03-03 17:26:21+0000\n"
 "Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
 "Language-Team: Polish <http://translatewiki.net/wiki/Portal:pl>\n"
 "MIME-Version: 1.0\n"
@@ -81,23 +81,23 @@ msgstr "Zapisz ustawienia dostępu"
 #. TRANS: Tooltip for button to save access settings in site admin panel.
 #. TRANS: Button text for saving theme settings.
 #. TRANS: Button label to save e-mail preferences.
-#. TRANS: Button label to save Instant Messaging preferences.
-#. TRANS: Button text for saving "Other settings" in profile.
+#. TRANS: Button label to save IM preferences.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
 #. TRANS: Button text for saving site notice in admin panel.
 #. TRANS: Button label to save SMS preferences.
 #. TRANS: Save button for settings for a profile in a subscriptions list.
+#. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
 #. TRANS: Button text on profile design page to save settings.
 #: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
-#: actions/emailsettings.php:250 actions/imsettings.php:183
-#: actions/othersettings.php:136 actions/pathsadminpanel.php:512
-#: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
-#: actions/smssettings.php:205 actions/subscriptions.php:259
+#: actions/emailsettings.php:251 actions/imsettings.php:199
+#: actions/pathsadminpanel.php:512 actions/profilesettings.php:198
+#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:204
+#: actions/subscriptions.php:261 actions/urlsettings.php:152
 #: actions/useradminpanel.php:298 lib/applicationeditform.php:355
-#: lib/designsettings.php:270 lib/groupeditform.php:201
+#: lib/designform.php:320 lib/groupeditform.php:201
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Zapisz"
@@ -136,7 +136,11 @@ msgstr "Nie ma takiej strony."
 #. 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 use "one time password login" without using an existing user.
+#. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
+#. TRANS: Client error displayed trying to find a user by ID for a non-existing ID.
+#. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when calling a profile action without specifying a user.
 #: actions/all.php:80 actions/allrss.php:69
@@ -148,19 +152,19 @@ msgstr "Nie ma takiej strony."
 #: actions/apidirectmessage.php:75 actions/apidirectmessagenew.php:72
 #: actions/apigroupcreate.php:111 actions/apigroupismember.php:89
 #: actions/apigroupjoin.php:98 actions/apigroupleave.php:98
-#: actions/apigrouplist.php:70 actions/apistatusesupdate.php:230
-#: actions/apisubscriptions.php:85 actions/apitimelinefavorites.php:70
-#: actions/apitimelinefriends.php:173 actions/apitimelinehome.php:78
-#: actions/apitimelinementions.php:77 actions/apitimelineuser.php:79
-#: actions/avatarbynickname.php:79 actions/favoritesrss.php:72
-#: actions/foaf.php:42 actions/foaf.php:61 actions/hcard.php:67
-#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
-#: actions/remotesubscribe.php:144 actions/remotesubscribe.php:153
-#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
-#: actions/showfavorites.php:106 actions/userbyid.php:74
-#: actions/usergroups.php:93 actions/userrss.php:40 actions/userxrd.php:59
-#: actions/xrds.php:71 lib/command.php:509 lib/galleryaction.php:59
-#: lib/mailbox.php:80 lib/profileaction.php:77
+#: actions/apigrouplist.php:70 actions/apigroupprofileupdate.php:108
+#: actions/apistatusesupdate.php:230 actions/apisubscriptions.php:85
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:173
+#: actions/apitimelinehome.php:78 actions/apitimelinementions.php:77
+#: actions/apitimelineuser.php:79 actions/avatarbynickname.php:79
+#: actions/favoritesrss.php:72 actions/foaf.php:42 actions/foaf.php:61
+#: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116
+#: actions/otp.php:78 actions/remotesubscribe.php:144
+#: actions/remotesubscribe.php:153 actions/replies.php:73
+#: actions/repliesrss.php:38 actions/rsd.php:113 actions/showfavorites.php:106
+#: actions/userbyid.php:75 actions/usergroups.php:93 actions/userrss.php:40
+#: actions/userxrd.php:59 actions/xrds.php:71 lib/command.php:509
+#: lib/galleryaction.php:59 lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Brak takiego użytkownika."
 
@@ -174,10 +178,9 @@ msgstr "%1$s i przyjaciele, strona %2$d"
 #. TRANS: H1 text for page. %s is a user nickname.
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Timeline title for user and friends. %s is a user nickname.
-#. TRANS: Tooltop for personal group navigation menu option when logged in for viewing timeline of self and friends.
 #: actions/all.php:94 actions/all.php:191 actions/allrss.php:117
 #: actions/apitimelinefriends.php:207 actions/apitimelinehome.php:113
-#: lib/personalgroupnav.php:102
+#: lib/personalgroupnav.php:100
 #, php-format
 msgid "%s and friends"
 msgstr "Użytkownik %s i przyjaciele"
@@ -235,7 +238,7 @@ msgstr ""
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
 #. TRANS: Second sentence of empty message for anonymous users. %s is a user nickname.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:227
+#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:221
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -284,19 +287,20 @@ msgstr "Aktualizacje z %1$s i przyjaciół na %2$s."
 #: actions/apifavoritecreate.php:98 actions/apifavoritedestroy.php:98
 #: actions/apifriendshipscreate.php:99 actions/apifriendshipsdestroy.php:99
 #: actions/apifriendshipsshow.php:124 actions/apigroupcreate.php:138
-#: actions/apigroupismember.php:115 actions/apigroupjoin.php:160
-#: actions/apigroupleave.php:145 actions/apigrouplist.php:134
+#: actions/apigroupismember.php:115 actions/apigroupjoin.php:151
+#: actions/apigroupleave.php:141 actions/apigrouplist.php:134
 #: actions/apigrouplistall.php:120 actions/apigroupmembership.php:105
+#: actions/apigroupprofileupdate.php:100 actions/apigroupprofileupdate.php:213
 #: actions/apigroupshow.php:114 actions/apihelptest.php:84
 #: actions/apistatusesdestroy.php:101 actions/apistatusesretweets.php:110
 #: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:139
 #: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
-#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:268
-#: actions/apitimelinegroup.php:147 actions/apitimelinehome.php:173
-#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:239
-#: actions/apitimelineretweetedtome.php:118
-#: actions/apitimelineretweetsofme.php:150 actions/apitimelinetag.php:159
-#: actions/apitimelineuser.php:206 actions/apiusershow.php:100
+#: actions/apitimelinefavorites.php:182 actions/apitimelinefriends.php:276
+#: actions/apitimelinegroup.php:148 actions/apitimelinehome.php:181
+#: actions/apitimelinementions.php:182 actions/apitimelinepublic.php:247
+#: actions/apitimelineretweetedtome.php:147
+#: actions/apitimelineretweetsofme.php:147 actions/apitimelinetag.php:165
+#: actions/apitimelineuser.php:217 actions/apiusershow.php:100
 msgid "API method not found."
 msgstr "Nie odnaleziono metody API."
 
@@ -311,8 +315,9 @@ msgstr "Nie odnaleziono metody API."
 #: actions/apifavoritecreate.php:88 actions/apifavoritedestroy.php:88
 #: actions/apifriendshipscreate.php:89 actions/apifriendshipsdestroy.php:89
 #: actions/apigroupcreate.php:102 actions/apigroupjoin.php:89
-#: actions/apigroupleave.php:89 actions/apimediaupload.php:66
-#: actions/apistatusesretweet.php:63 actions/apistatusesupdate.php:194
+#: actions/apigroupleave.php:89 actions/apigroupprofileupdate.php:92
+#: actions/apimediaupload.php:66 actions/apistatusesretweet.php:63
+#: actions/apistatusesupdate.php:194
 msgid "This method requires a POST."
 msgstr "Ta metoda wymaga POST."
 
@@ -325,21 +330,16 @@ msgstr ""
 "Należy podać parametr o nazwie \"device\" z jedną z wartości: sms, im, none."
 
 #. TRANS: Server error displayed when a user's delivery device cannot be updated.
-#. TRANS: Server error displayed when a user update to the database fails in the contact address confirmation action.
 #. TRANS: Server error thrown on database error updating e-mail preferences.
 #. TRANS: Server error thrown on database error removing a registered e-mail address.
-#. TRANS: Server error thrown on database error updating Instant Messaging preferences.
-#. TRANS: Server error thrown on database error removing a registered Instant Messaging address.
-#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
 #. TRANS: Server error thrown when user profile settings could not be updated.
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
-#: actions/apiaccountupdatedeliverydevice.php:130
-#: actions/confirmaddress.php:118 actions/emailsettings.php:352
-#: actions/emailsettings.php:498 actions/imsettings.php:276
-#: actions/imsettings.php:432 actions/othersettings.php:186
-#: actions/profilesettings.php:322 actions/smssettings.php:301
-#: actions/smssettings.php:454
+#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
+#: actions/apiaccountupdatedeliverydevice.php:136
+#: actions/emailsettings.php:353 actions/emailsettings.php:499
+#: actions/profilesettings.php:323 actions/smssettings.php:300
+#: actions/smssettings.php:453 actions/urlsettings.php:211
 msgid "Could not update user."
 msgstr "Nie można zaktualizować użytkownika."
 
@@ -365,7 +365,7 @@ msgstr "Użytkownik nie posiada profilu."
 
 #. TRANS: Server error displayed if a user profile could not be saved.
 #. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:418
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:419
 msgid "Could not save profile."
 msgstr "Nie można zapisać profilu."
 
@@ -377,7 +377,7 @@ msgstr "Nie można zapisać profilu."
 #: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
 #: actions/designadminpanel.php:120 actions/editapplication.php:121
 #: actions/newapplication.php:102 actions/newnotice.php:95
-#: lib/designsettings.php:298
+#: lib/designsettings.php:110
 #, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s byte) due to its "
@@ -405,8 +405,8 @@ msgstr[2] ""
 #: actions/apiaccountupdateprofilecolors.php:160
 #: actions/apiaccountupdateprofilecolors.php:171
 #: actions/groupdesignsettings.php:285 actions/groupdesignsettings.php:296
-#: actions/userdesignsettings.php:201 actions/userdesignsettings.php:211
-#: actions/userdesignsettings.php:253 actions/userdesignsettings.php:263
+#: actions/userdesignsettings.php:218 actions/userdesignsettings.php:228
+#: actions/userdesignsettings.php:270 actions/userdesignsettings.php:280
 msgid "Unable to save your design settings."
 msgstr "Nie można zapisać ustawień wyglądu."
 
@@ -414,7 +414,7 @@ msgstr "Nie można zapisać ustawień wyglądu."
 #. TRANS: Client error displayed when a database error occurs updating profile colours.
 #: actions/apiaccountupdateprofilebackgroundimage.php:191
 #: actions/apiaccountupdateprofilecolors.php:139
-#: actions/userdesignsettings.php:179
+#: actions/userdesignsettings.php:196
 msgid "Could not update your design."
 msgstr "Nie można zaktualizować wyglądu."
 
@@ -524,7 +524,7 @@ msgstr "Nie odnaleziono odbiorcy."
 #. TRANS: Client error displayed trying to direct message another user who's not a friend (403).
 #: actions/apidirectmessagenew.php:144
 #, fuzzy
-msgid "Can't send direct messages to users who aren't your friend."
+msgid "Cannot send direct messages to users who aren't your friend."
 msgstr ""
 "Nie można wysłać bezpośredniej wiadomości do użytkowników, którzy nie są "
 "twoimi przyjaciółmi."
@@ -608,9 +608,9 @@ msgstr "Nie można odnaleźć użytkownika docelowego."
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:156 actions/editgroup.php:191
-#: actions/newgroup.php:137 actions/profilesettings.php:273
-#: actions/register.php:214
+#: actions/apigroupcreate.php:156 actions/apigroupprofileupdate.php:255
+#: actions/editgroup.php:191 actions/newgroup.php:137
+#: actions/profilesettings.php:274 actions/register.php:199
 msgid "Nickname already in use. Try another one."
 msgstr "Pseudonim jest już używany. Spróbuj innego."
 
@@ -618,9 +618,9 @@ msgstr "Pseudonim jest już używany. Spróbuj innego."
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:164 actions/editgroup.php:195
-#: actions/newgroup.php:141 actions/profilesettings.php:243
-#: actions/register.php:216
+#: actions/apigroupcreate.php:164 actions/apigroupprofileupdate.php:259
+#: actions/editgroup.php:195 actions/newgroup.php:141
+#: actions/profilesettings.php:244 actions/register.php:201
 msgid "Not a valid nickname."
 msgstr "To nie jest prawidłowy pseudonim."
 
@@ -630,10 +630,10 @@ msgstr "To nie jest prawidłowy pseudonim."
 #. TRANS: Validation error shown when providing an invalid homepage URL in the "New application" form.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:181 actions/editapplication.php:235
-#: actions/editgroup.php:202 actions/newapplication.php:221
-#: actions/newgroup.php:148 actions/profilesettings.php:248
-#: actions/register.php:223
+#: actions/apigroupcreate.php:181 actions/apigroupprofileupdate.php:277
+#: actions/editapplication.php:235 actions/editgroup.php:202
+#: actions/newapplication.php:221 actions/newgroup.php:148
+#: actions/profilesettings.php:249 actions/register.php:208
 msgid "Homepage is not a valid URL."
 msgstr "Strona domowa nie jest prawidłowym adresem URL."
 
@@ -642,8 +642,8 @@ msgstr "Strona domowa nie jest prawidłowym adresem URL."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:191 actions/editgroup.php:206
-#: actions/newgroup.php:152 actions/profilesettings.php:252
-#: actions/register.php:226
+#: actions/newgroup.php:152 actions/profilesettings.php:253
+#: actions/register.php:211
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "Imię i nazwisko jest za długie (maksymalnie 255 znaków)."
 
@@ -671,8 +671,8 @@ msgstr[2] "Opis jest za długi (maksymalnie %d znaków)."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:215 actions/editgroup.php:218
-#: actions/newgroup.php:164 actions/profilesettings.php:265
-#: actions/register.php:235
+#: actions/newgroup.php:164 actions/profilesettings.php:266
+#: actions/register.php:220
 msgid "Location is too long (maximum 255 characters)."
 msgstr "Położenie jest za długie (maksymalnie 255 znaków)."
 
@@ -702,15 +702,16 @@ msgstr "Nieprawidłowy alias: \"%s\"."
 #. TRANS: %s is the alias that is already in use.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error. %s is the already used alias.
-#: actions/apigroupcreate.php:264 actions/editgroup.php:246
-#: actions/newgroup.php:193
+#: actions/apigroupcreate.php:264 actions/apigroupprofileupdate.php:351
+#: actions/editgroup.php:246 actions/newgroup.php:193
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "Alias \"%s\" jest już używany. Spróbuj innego."
 
 #. TRANS: Client error displayed when trying to use an alias during group creation that is the same as the group's nickname.
 #. TRANS: Group edit form validation error.
-#: actions/apigroupcreate.php:278 actions/editgroup.php:253
+#: actions/apigroupcreate.php:278 actions/apigroupprofileupdate.php:359
+#: actions/editgroup.php:253
 msgid "Alias can't be the same as nickname."
 msgstr "Alias nie może być taki sam jak pseudonim."
 
@@ -722,7 +723,8 @@ msgstr "Alias nie może być taki sam jak pseudonim."
 #. TRANS: Client error displayed requesting most recent notices to a group for a non-existing group.
 #: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
 #: actions/apigroupleave.php:104 actions/apigroupmembership.php:71
-#: actions/apigroupshow.php:81 actions/apitimelinegroup.php:89
+#: actions/apigroupprofileupdate.php:113 actions/apigroupshow.php:81
+#: actions/apitimelinegroup.php:89
 msgid "Group not found."
 msgstr "Nie odnaleziono grupy."
 
@@ -740,13 +742,11 @@ msgstr "Jesteś już członkiem tej grupy."
 msgid "You have been blocked from that group by the admin."
 msgstr "Zostałeś zablokowany w tej grupie przez administratora."
 
-#. TRANS: Server error displayed when joining a group fails.
-#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
 #. 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.
 #. TRANS: Message given having failed to add a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:362
+#: actions/apigroupjoin.php:136 actions/joingroup.php:139 lib/command.php:362
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "Nie można dołączyć użytkownika %1$s do grupy %2$s."
@@ -756,8 +756,6 @@ msgstr "Nie można dołączyć użytkownika %1$s do grupy %2$s."
 msgid "You are not a member of this group."
 msgstr "Nie jesteś członkiem tej grupy."
 
-#. TRANS: Server error displayed when leaving a group fails.
-#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
 #. TRANS: Server error displayed when leaving a group failed in the database.
 #. TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
 #. TRANS: Message given having failed to remove a user from a group.
@@ -793,6 +791,61 @@ msgstr "Grupy %s"
 msgid "groups on %s"
 msgstr "grupy na %s"
 
+#. TRANS: Client error displayed trying to edit a group while not being a group admin.
+#. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
+#. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
+#: actions/apigroupprofileupdate.php:118 actions/editgroup.php:110
+#: actions/editgroup.php:176 actions/groupdesignsettings.php:109
+#: actions/grouplogo.php:111
+msgid "You must be an admin to edit the group."
+msgstr "Musisz być administratorem, aby zmodyfikować grupę."
+
+#. TRANS: Server error displayed when editing a group fails.
+#: actions/apigroupprofileupdate.php:171 actions/editgroup.php:274
+msgid "Could not update group."
+msgstr "Nie można zaktualizować grupy."
+
+#. TRANS: Server error displayed when group aliases could not be added.
+#. TRANS: Server exception thrown when creating group aliases failed.
+#: actions/apigroupprofileupdate.php:194 actions/editgroup.php:281
+#: classes/User_group.php:540
+msgid "Could not create aliases."
+msgstr "Nie można utworzyć aliasów."
+
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: actions/apigroupprofileupdate.php:249 lib/nickname.php:165
+msgid "Nickname must have only lowercase letters and numbers and no spaces."
+msgstr "Pseudonim może zawierać tylko małe litery i cyfry, bez spacji."
+
+#: actions/apigroupprofileupdate.php:286
+#, fuzzy
+msgid "Full name is too long (max 255 chars)."
+msgstr "Imię i nazwisko jest za długie (maksymalnie 255 znaków)."
+
+#: actions/apigroupprofileupdate.php:296
+#, fuzzy, php-format
+msgid "description is too long (max %d chars)."
+msgstr "Opis jest za długi (maksymalnie %d znak)."
+
+#: actions/apigroupprofileupdate.php:307
+#, fuzzy
+msgid "Location is too long (max 255 chars)."
+msgstr "Położenie jest za długie (maksymalnie 255 znaków)."
+
+#: actions/apigroupprofileupdate.php:326
+#, fuzzy, php-format
+msgid "Too many aliases! Maximum %d."
+msgstr "Za dużo aliasów. Maksymalnie dozwolony jest %d."
+
+#. TRANS: Group edit form validation error.
+#. TRANS: Group create form validation error.
+#. TRANS: %s is the invalid alias.
+#: actions/apigroupprofileupdate.php:342 actions/editgroup.php:241
+#: actions/newgroup.php:188
+#, php-format
+msgid "Invalid alias: \"%s\""
+msgstr "Nieprawidłowy alias: \"%s\""
+
 #. TRANS: Client error displayed when uploading a media file has failed.
 #: actions/apimediaupload.php:101
 msgid "Upload failed."
@@ -823,21 +876,22 @@ msgstr "Token żądania został już upoważniony."
 #. TRANS: Form validation error message.
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
+#. TRANS: Client error displayed when the session token is not okay.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
 #: actions/deletenotice.php:177 actions/disfavor.php:75
-#: actions/emailsettings.php:291 actions/favor.php:75 actions/geocode.php:55
+#: actions/emailsettings.php:292 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:65 actions/grouplogo.php:321
-#: actions/groupunblock.php:65 actions/imsettings.php:224
-#: actions/invite.php:60 actions/login.php:137 actions/makeadmin.php:66
-#: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
-#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
-#: actions/othersettings.php:155 actions/passwordsettings.php:138
-#: actions/profilesettings.php:217 actions/recoverpassword.php:383
-#: actions/register.php:172 actions/remotesubscribe.php:76
-#: actions/repeat.php:82 actions/smssettings.php:250 actions/subedit.php:40
-#: actions/subscribe.php:86 actions/tagother.php:166
-#: actions/unsubscribe.php:69 actions/userauthorization.php:52
-#: lib/designsettings.php:310
+#: actions/groupunblock.php:65 actions/imsettings.php:241
+#: actions/invite.php:60 actions/makeadmin.php:66 actions/newmessage.php:135
+#: actions/newnotice.php:105 actions/nudge.php:80
+#: actions/oauthappssettings.php:162 actions/oauthconnectionssettings.php:135
+#: actions/passwordsettings.php:137 actions/pluginenable.php:87
+#: actions/profilesettings.php:218 actions/recoverpassword.php:383
+#: actions/register.php:157 actions/remotesubscribe.php:76
+#: actions/repeat.php:82 actions/smssettings.php:249 actions/subedit.php:40
+#: actions/subscribe.php:87 actions/tagother.php:145
+#: actions/unsubscribe.php:69 actions/urlsettings.php:171
+#: actions/userauthorization.php:53 lib/designsettings.php:122
 msgid "There was a problem with your session token. Try again, please."
 msgstr "Wystąpił problem z tokenem sesji. Spróbuj ponownie."
 
@@ -865,10 +919,10 @@ msgstr "Błąd bazy danych podczas wprowadzania oauth_token_association."
 #. TRANS: Unknown form validation error in design settings form.
 #: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
 #: actions/designadminpanel.php:100 actions/editapplication.php:144
-#: actions/emailsettings.php:310 actions/grouplogo.php:332
-#: actions/imsettings.php:239 actions/newapplication.php:124
-#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
-#: actions/smssettings.php:271 lib/designsettings.php:321
+#: actions/emailsettings.php:311 actions/grouplogo.php:332
+#: actions/imsettings.php:256 actions/newapplication.php:124
+#: actions/oauthconnectionssettings.php:144 actions/recoverpassword.php:46
+#: actions/smssettings.php:270 lib/designsettings.php:133
 msgid "Unexpected form submission."
 msgstr "Nieoczekiwane wysłanie formularza."
 
@@ -917,31 +971,26 @@ msgstr "Konto"
 
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Field label in form for profile settings.
-#. TRANS: Label for group nickname (dt). Text hidden by default.
-#. TRANS: DT for nick name in a profile.
-#: actions/apioauthauthorize.php:459 actions/login.php:252
-#: actions/profilesettings.php:106 actions/register.php:432
-#: actions/showgroup.php:243 actions/tagother.php:94
+#: actions/apioauthauthorize.php:459 actions/login.php:225
+#: actions/profilesettings.php:107 actions/register.php:411
 #: actions/userauthorization.php:145 lib/groupeditform.php:145
-#: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "Pseudonim"
 
 #. TRANS: Field label on OAuth API authorisation form.
-#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:463 actions/login.php:255
-#: actions/register.php:436 lib/accountsettingsaction.php:120
+#: actions/apioauthauthorize.php:463 actions/login.php:228
+#: actions/register.php:415 lib/settingsnav.php:87
 msgid "Password"
 msgstr "Hasło"
 
 #. TRANS: Button text that when clicked will cancel the process of allowing access to an account
 #. TRANS: by an external application.
 #. TRANS: Button label to cancel an e-mail address confirmation procedure.
-#. TRANS: Button label to cancel an Instant Messaging address confirmation procedure.
+#. TRANS: Button label to cancel an IM address confirmation procedure.
 #. TRANS: Button label to cancel a SMS address confirmation procedure.
 #. TRANS: Button label in the "Edit application" form.
-#: actions/apioauthauthorize.php:478 actions/emailsettings.php:124
-#: actions/imsettings.php:127 actions/smssettings.php:133
+#: actions/apioauthauthorize.php:478 actions/emailsettings.php:125
+#: actions/imsettings.php:136 actions/smssettings.php:132
 #: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Cancel"
@@ -1053,7 +1102,7 @@ msgstr "Metoda HTTP nie jest obsługiwana."
 #. TRANS: %s is the requested output format.
 #: actions/apistatusesshow.php:144
 #, fuzzy, php-format
-msgid "Unsupported format: %s"
+msgid "Unsupported format: %s."
 msgstr "Nieobsługiwany format: %s"
 
 #. TRANS: Client error displayed requesting a deleted status.
@@ -1138,13 +1187,6 @@ msgstr "%1$s/ulubione wpisy od %2$s"
 msgid "%1$s updates favorited by %2$s / %3$s."
 msgstr "Użytkownik %1$s aktualizuje ulubione według %2$s/%3$s."
 
-#. TRANS: Server error displayed when generating an Atom feed fails.
-#. TRANS: %s is the error.
-#: actions/apitimelinegroup.php:134
-#, php-format
-msgid "Could not generate feed for group - %s"
-msgstr "Nie można utworzyć kanału dla grupy - %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.
 #: actions/apitimelinementions.php:115
@@ -1161,13 +1203,14 @@ msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr "%1$s aktualizuje tę odpowiedź na aktualizacje od %2$s/%3$s."
 
 #. TRANS: Title for site timeline. %s is the StatusNet sitename.
+#. TRANS: Public RSS feed title. %s is the StatusNet site name.
 #: actions/apitimelinepublic.php:193 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "Publiczna oś czasu użytkownika %s"
 
 #. TRANS: Subtitle for site timeline. %s is the StatusNet sitename.
-#: actions/apitimelinepublic.php:199 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:199
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "Użytkownik %s aktualizuje od każdego."
@@ -1178,21 +1221,33 @@ msgid "Unimplemented."
 msgstr "Niezaimplementowane."
 
 #. TRANS: Title for Atom feed "repeated to me". %s is the user nickname.
-#: actions/apitimelineretweetedtome.php:108
+#: actions/apitimelineretweetedtome.php:96
 #, php-format
 msgid "Repeated to %s"
 msgstr "Powtórzone dla %s"
 
+#: actions/apitimelineretweetedtome.php:98
+#, fuzzy, php-format
+msgid "%1$s notices that were to repeated to %2$s / %3$s."
+msgstr "%1$s aktualizuje tę odpowiedź na aktualizacje od %2$s/%3$s."
+
 #. TRANS: Title of list of repeated notices of the logged in user.
 #. TRANS: %s is the nickname of the logged in user.
-#: actions/apitimelineretweetsofme.php:112
+#: actions/apitimelineretweetsofme.php:98
 #, php-format
 msgid "Repeats of %s"
 msgstr "Powtórzenia %s"
 
+#: actions/apitimelineretweetsofme.php:104
+#, fuzzy, php-format
+msgid "%1$s notices that %2$s / %3$s has repeated."
+msgstr "Użytkownik %1$s oznaczył wpis %2$s jako ulubiony."
+
 #. TRANS: Title for timeline with lastest notices with a given tag.
 #. TRANS: %s is the tag.
-#: actions/apitimelinetag.php:101 actions/tag.php:67
+#. TRANS: Title for first page of notices with tags.
+#. TRANS: %s is the tag.
+#: actions/apitimelinetag.php:101 actions/tag.php:69
 #, php-format
 msgid "Notices tagged with %s"
 msgstr "Wpisy ze znacznikiem %s"
@@ -1205,53 +1260,54 @@ msgid "Updates tagged with %1$s on %2$s!"
 msgstr "Aktualizacje ze znacznikiem %1$s na %2$s."
 
 #. TRANS: Client error displayed trying to add a notice to another user's timeline.
-#: actions/apitimelineuser.php:297
+#: actions/apitimelineuser.php:308
 msgid "Only the user can add to their own timeline."
 msgstr "Tylko użytkownik może dodawać do swojej osi czasu."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:304
+#: actions/apitimelineuser.php:315
 msgid "Only accept AtomPub for Atom feeds."
 msgstr "Akceptowanie tylko AtomPub dla kanałów Atom."
 
 #. TRANS: Client error displayed attempting to post an empty API notice.
-#: actions/apitimelineuser.php:311
+#: actions/apitimelineuser.php:322
 msgid "Atom post must not be empty."
 msgstr "Wpis Atom nie może być pusty."
 
 #. TRANS: Client error displayed attempting to post an API that is not well-formed XML.
-#: actions/apitimelineuser.php:317
+#: actions/apitimelineuser.php:328
 msgid "Atom post must be well-formed XML."
 msgstr "Wpis Atom musi być poprawnie sformatowanym kodem XML."
 
 #. TRANS: Client error displayed when not using an Atom entry.
-#: actions/apitimelineuser.php:323 actions/atompubfavoritefeed.php:228
+#: actions/apitimelineuser.php:334 actions/atompubfavoritefeed.php:228
 #: actions/atompubmembershipfeed.php:230
 #: actions/atompubsubscriptionfeed.php:236
 msgid "Atom post must be an Atom entry."
 msgstr "Wpis Atom musi być wpisem Atom."
 
 #. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
-#: actions/apitimelineuser.php:335
+#: actions/apitimelineuser.php:345
 msgid "Can only handle POST activities."
 msgstr "Można obsługiwać tylko działania POST."
 
 #. TRANS: Client error displayed when using an unsupported activity object type.
 #. TRANS: %s is the unsupported activity object type.
-#: actions/apitimelineuser.php:346
+#: actions/apitimelineuser.php:356
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr "Nie można obsłużyć typu obiektu działania \"%s\"."
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
 #. TRANS: %d is the notice ID (number).
-#: actions/apitimelineuser.php:380
+#: actions/apitimelineuser.php:390
 #, php-format
 msgid "No content for notice %d."
 msgstr "Brak zawartości dla wpisu %d."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:408
+#. TRANS: %s is the notice URI.
+#: actions/apitimelineuser.php:419
 #, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "Wpis z adresem URI \"%s\" już istnieje."
@@ -1268,9 +1324,10 @@ msgstr "Nie odnaleziono strony."
 
 #. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
 #. TRANS: Client exception.
+#. TRANS: Client error displayed trying to subscribe to a non-existing profile.
 #: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
 #: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
-#: actions/subscribe.php:107
+#: actions/subscribe.php:110
 msgid "No such profile."
 msgstr "Nie ma takiego profilu."
 
@@ -1405,7 +1462,7 @@ msgid "Not a member."
 msgstr "Nie jest członkiem."
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
-#: actions/atompubshowmembership.php:151
+#: actions/atompubshowmembership.php:150
 msgid "Cannot delete someone else's membership."
 msgstr "Nie można usunąć członkostwa innej osoby."
 
@@ -1492,10 +1549,7 @@ msgid "Invalid size."
 msgstr "Nieprawidłowy rozmiar."
 
 #. TRANS: Title for avatar upload page.
-#. TRANS: Label for group avatar (dt). Text hidden by default.
-#. TRANS: Link description in user account settings menu.
-#: actions/avatarsettings.php:66 actions/showgroup.php:227
-#: lib/accountsettingsaction.php:113
+#: actions/avatarsettings.php:66 lib/settingsnav.php:82
 msgid "Avatar"
 msgstr "Awatar"
 
@@ -1508,9 +1562,11 @@ msgstr "Można wysłać osobisty awatar. Maksymalny rozmiar pliku to %s."
 
 #. TRANS: Server error displayed in avatar upload page when no matching profile can be found for a user.
 #. TRANS: Server error displayed coming across a request from a user without a profile.
+#. TRANS: Server error displayed when trying to authorise a remote subscription request
+#. TRANS: while the user has no profile.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
 #: actions/grouplogo.php:184 actions/remotesubscribe.php:190
-#: actions/userauthorization.php:72 actions/userrss.php:108
+#: actions/userauthorization.php:75 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr "Użytkownik bez odpowiadającego profilu."
 
@@ -1565,10 +1621,10 @@ msgstr "Przytnij"
 msgid "No file uploaded."
 msgstr "Nie wysłano pliku."
 
-#. TRANS: Avatar upload form unstruction after uploading a file.
+#. TRANS: Avatar upload form instruction after uploading a file.
 #: actions/avatarsettings.php:345
 #, fuzzy
-msgid "Pick a square area of the image to be your avatar"
+msgid "Pick a square area of the image to be your avatar."
 msgstr "Wybierz kwadratowy obszar obrazu do awatara"
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
@@ -1594,7 +1650,7 @@ msgstr "Usunięto awatar."
 
 #. TRANS: Title for backup account page.
 #. TRANS: Option in profile settings to create a backup of the account of the currently logged in user.
-#: actions/backupaccount.php:61 actions/profilesettings.php:467
+#: actions/backupaccount.php:61 actions/profilesettings.php:468
 msgid "Backup account"
 msgstr "Wykonaj kopię zapasową konta"
 
@@ -1634,7 +1690,7 @@ msgstr "Kopia zapasowa"
 #. TRANS: Title for submit button to backup an account on the backup account page.
 #: actions/backupaccount.php:254
 #, fuzzy
-msgid "Backup your account"
+msgid "Backup your account."
 msgstr "Wykonuje kopię zapasową konta"
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
@@ -1676,7 +1732,7 @@ msgstr "Nie"
 #. TRANS: Submit button title for 'No' when blocking a user.
 #: actions/block.php:158
 #, fuzzy
-msgid "Do not block this user"
+msgid "Do not block this user."
 msgstr "Nie blokuj tego użytkownika"
 
 #. TRANS: Button label on the user block form.
@@ -1693,9 +1749,9 @@ msgid "Yes"
 msgstr "Tak"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#. TRANS: Description of the form to block a user.
-#: actions/block.php:165 lib/blockform.php:79
-msgid "Block this user"
+#: actions/block.php:165
+#, fuzzy
+msgid "Block this user."
 msgstr "Zablokuj tego użytkownika"
 
 #. TRANS: Server error displayed when blocking a user fails.
@@ -1761,31 +1817,47 @@ msgstr "Nie odnaleziono kodu potwierdzającego."
 msgid "That confirmation code is not for you!"
 msgstr "Ten kod potwierdzający nie jest przeznaczony dla ciebie."
 
-#. TRANS: Server error for a unknow address type %s, which can be 'email', 'jabber', or 'sms'.
-#: actions/confirmaddress.php:92
-#, php-format
-msgid "Unrecognized address type %s."
+#. TRANS: Server error for an unknown address type, which can be 'email', 'sms', or the name of an IM network (such as 'xmpp' or 'aim')
+#: actions/confirmaddress.php:94
+#, fuzzy, php-format
+msgid "Unrecognized address type %s"
 msgstr "Nierozpoznany typ adresu %s."
 
 #. TRANS: Client error for an already confirmed email/jabber/sms address.
-#: actions/confirmaddress.php:97
+#: actions/confirmaddress.php:103 actions/confirmaddress.php:136
 msgid "That address has already been confirmed."
 msgstr "Ten adres został już potwierdzony."
 
+#: actions/confirmaddress.php:121 actions/imsettings.php:444
+#: actions/userdesignsettings.php:306
+#, fuzzy
+msgid "Couldn't update user."
+msgstr "Nie można zaktualizować użytkownika."
+
+#: actions/confirmaddress.php:144
+#, fuzzy
+msgid "Couldn't update user im preferences."
+msgstr "Nie można zaktualizować wpisu użytkownika."
+
+#: actions/confirmaddress.php:156
+#, fuzzy
+msgid "Couldn't insert user im preferences."
+msgstr "Nie można wprowadzić nowej subskrypcji."
+
 #. TRANS: Server error displayed when an address confirmation code deletion from the
 #. TRANS: database fails in the contact address confirmation action.
-#: actions/confirmaddress.php:132
+#: actions/confirmaddress.php:169
 msgid "Could not delete address confirmation."
 msgstr "Nie można usunąć potwierdzenia adresu."
 
 #. TRANS: Title for the contact address confirmation action.
-#: actions/confirmaddress.php:150
+#: actions/confirmaddress.php:185
 msgid "Confirm address"
 msgstr "Potwierdź adres"
 
 #. TRANS: Success message for the contact address confirmation action.
 #. TRANS: %s can be 'email', 'jabber', or 'sms'.
-#: actions/confirmaddress.php:166
+#: actions/confirmaddress.php:200
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "Adres \"%s\" został potwierdzony dla twojego konta."
@@ -1799,6 +1871,7 @@ msgstr "Rozmowa"
 #. TRANS: Label for user statistics.
 #: actions/conversation.php:149 lib/noticelist.php:87
 #: lib/profileaction.php:246 lib/searchgroupnav.php:82
+#: lib/threadednoticelist.php:66
 msgid "Notices"
 msgstr "Wpisy"
 
@@ -1831,7 +1904,7 @@ msgstr "Usunięto konto."
 
 #. TRANS: Page title for page on which a user account can be deleted.
 #. TRANS: Option in profile settings to delete the account of the currently logged in user.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:475
+#: actions/deleteaccount.php:228 actions/profilesettings.php:476
 msgid "Delete account"
 msgstr "Usuń konto"
 
@@ -1857,7 +1930,7 @@ msgstr ""
 #. TRANS: Field label for delete account confirmation entry.
 #. TRANS: Field label for password reset form where the password has to be typed again.
 #: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:262 actions/register.php:440
+#: actions/recoverpassword.php:262 actions/register.php:419
 msgid "Confirm"
 msgstr "Potwierdź"
 
@@ -1886,14 +1959,14 @@ msgstr "Nie odnaleziono aplikacji."
 #. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
 #: actions/deleteapplication.php:79 actions/editapplication.php:78
-#: actions/showapplication.php:94
+#: actions/showapplication.php:90
 msgid "You are not the owner of this application."
 msgstr "Nie jesteś właścicielem tej aplikacji."
 
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
-#: actions/newapplication.php:112 actions/showapplication.php:118
-#: lib/action.php:1425
+#: actions/newapplication.php:112 actions/showapplication.php:113
+#: lib/action.php:1391
 msgid "There was a problem with your session token."
 msgstr "Wystąpił problem z tokenem sesji."
 
@@ -1916,13 +1989,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting an application.
 #: actions/deleteapplication.php:161
 #, fuzzy
-msgid "Do not delete this application"
+msgid "Do not delete this application."
 msgstr "Nie usuwaj tej aplikacji"
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
 #: actions/deleteapplication.php:167
 #, fuzzy
-msgid "Delete this application"
+msgid "Delete this application."
 msgstr "Usuń tę aplikację"
 
 #. TRANS: Client error when trying to delete group while not logged in.
@@ -1977,13 +2050,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting a group.
 #: actions/deletegroup.php:224
 #, fuzzy
-msgid "Do not delete this group"
+msgid "Do not delete this group."
 msgstr "Nie usuwaj tej grupy"
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
 #: actions/deletegroup.php:231
 #, fuzzy
-msgid "Delete this group"
+msgid "Delete this group."
 msgstr "Usuń tę grupę"
 
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
@@ -1991,14 +2064,16 @@ msgstr "Usuń tę grupę"
 #. TRANS: Client error displayed when trying to mark a notice as favorite without being logged in.
 #. TRANS: Client error displayed trying to block a user from a group while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
+#. TRANS: Client error displayed trying to log out when not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
+#. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
 #. TRANS: Client error displayed when trying to change user options while not logged in.
 #: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
-#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:69
+#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:70
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
-#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
-#: actions/tagother.php:33 actions/unsubscribe.php:52
+#: actions/nudge.php:63 actions/pluginenable.php:97 actions/subedit.php:33
+#: actions/subscribe.php:98 actions/tagother.php:33 actions/unsubscribe.php:52
 #: lib/adminpanelaction.php:71 lib/profileformaction.php:63
 #: lib/settingsaction.php:72
 msgid "Not logged in."
@@ -2027,12 +2102,13 @@ msgstr "Jesteś pewien, że chcesz usunąć ten wpis?"
 #. TRANS: Submit button title for 'No' when deleting a notice.
 #: actions/deletenotice.php:159
 #, fuzzy
-msgid "Do not delete this notice"
+msgid "Do not delete this notice."
 msgstr "Nie usuwaj tego wpisu"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:166 lib/noticelist.php:673
-msgid "Delete this notice"
+#: actions/deletenotice.php:166
+#, fuzzy
+msgid "Delete this notice."
 msgstr "Usuń ten wpis"
 
 #. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
@@ -2068,18 +2144,17 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting a user.
 #: actions/deleteuser.php:158
 #, fuzzy
-msgid "Do not delete this user"
+msgid "Do not delete this user."
 msgstr "Nie usuwaj tego użytkownika"
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
-#. TRANS: Description of form for deleting a user.
-#: actions/deleteuser.php:165 lib/deleteuserform.php:75
-msgid "Delete this user"
+#: actions/deleteuser.php:165
+#, fuzzy
+msgid "Delete this user."
 msgstr "Usuń tego użytkownika"
 
 #. TRANS: Message used as title for design settings for the site.
-#. TRANS: Link description in user account settings menu.
-#: actions/designadminpanel.php:60 lib/accountsettingsaction.php:134
+#: actions/designadminpanel.php:60 lib/settingsnav.php:97
 msgid "Design"
 msgstr "Wygląd"
 
@@ -2146,8 +2221,7 @@ msgid "You can upload a custom StatusNet theme as a .ZIP archive."
 msgstr "Można wysłać własny motyw witryny StatusNet jako archiwum zip."
 
 #. TRANS: Fieldset legend for theme background image.
-#. TRANS: Fieldset legend on profile design page.
-#: actions/designadminpanel.php:515 lib/designsettings.php:98
+#: actions/designadminpanel.php:515
 msgid "Change background image"
 msgstr "Zmień obraz tła"
 
@@ -2155,7 +2229,7 @@ msgstr "Zmień obraz tła"
 #. TRANS: Field label for background color selector.
 #. TRANS: Label on profile design page for setting a profile page background colour.
 #: actions/designadminpanel.php:525 actions/designadminpanel.php:609
-#: lib/designsettings.php:183
+#: lib/designform.php:238
 msgid "Background"
 msgstr "Tło"
 
@@ -2180,13 +2254,13 @@ msgstr "Wyłączone"
 #. TRANS: Form guide for turning background image on or off on theme designer page.
 #. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
 #. TRANS: use of the uploaded profile image.
-#: actions/designadminpanel.php:577 lib/designsettings.php:159
+#: actions/designadminpanel.php:577 lib/designform.php:214
 msgid "Turn background image on or off."
 msgstr "Włącz lub wyłącz obraz tła."
 
 #. TRANS: Checkbox label to title background image on theme designer page.
 #. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-#: actions/designadminpanel.php:583 lib/designsettings.php:165
+#: actions/designadminpanel.php:583 lib/designform.php:220
 msgid "Tile background image"
 msgstr "Kafelkowy obraz tła"
 
@@ -2197,25 +2271,25 @@ msgstr "Zmień kolory"
 
 #. TRANS: Field label for content color selector.
 #. TRANS: Label on profile design page for setting a profile page content colour.
-#: actions/designadminpanel.php:623 lib/designsettings.php:197
+#: actions/designadminpanel.php:623 lib/designform.php:252
 msgid "Content"
 msgstr "Treść"
 
 #. TRANS: Field label for sidebar color selector.
 #. TRANS: Label on profile design page for setting a profile page sidebar colour.
-#: actions/designadminpanel.php:637 lib/designsettings.php:211
+#: actions/designadminpanel.php:637 lib/designform.php:266
 msgid "Sidebar"
 msgstr "Panel boczny"
 
 #. TRANS: Field label for text color selector.
 #. TRANS: Label on profile design page for setting a profile page text colour.
-#: actions/designadminpanel.php:651 lib/designsettings.php:225
+#: actions/designadminpanel.php:651 lib/designform.php:280
 msgid "Text"
 msgstr "Tekst"
 
 #. TRANS: Field label for link color selector.
 #. TRANS: Label on profile design page for setting a profile page links colour.
-#: actions/designadminpanel.php:665 lib/designsettings.php:239
+#: actions/designadminpanel.php:665 lib/designform.php:294
 msgid "Links"
 msgstr "Odnośniki"
 
@@ -2236,21 +2310,21 @@ msgid "Use defaults"
 msgstr "Użyj domyślne"
 
 #. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: actions/designadminpanel.php:720 lib/designsettings.php:259
-msgid "Restore default designs"
+#: actions/designadminpanel.php:720
+#, fuzzy
+msgid "Restore default designs."
 msgstr "Przywróć domyślny wygląd"
 
 #. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: actions/designadminpanel.php:728 lib/designsettings.php:267
-msgid "Reset back to default"
+#: actions/designadminpanel.php:728
+#, fuzzy
+msgid "Reset back to default."
 msgstr "Przywróć domyślne ustawienia"
 
 #. TRANS: Title for button for saving theme settings.
-#. TRANS: Title for button on profile design page to save settings.
-#: actions/designadminpanel.php:736 lib/designsettings.php:272
-msgid "Save design"
+#: actions/designadminpanel.php:736
+#, fuzzy
+msgid "Save design."
 msgstr "Zapisz wygląd"
 
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
@@ -2282,7 +2356,7 @@ msgid "You must be logged in to edit an application."
 msgstr "Musisz być zalogowany, aby zmodyfikować aplikację."
 
 #. TRANS: Client error displayed trying to edit an application that does not exist.
-#: actions/editapplication.php:83 actions/showapplication.php:87
+#: actions/editapplication.php:83 actions/showapplication.php:83
 msgid "No such application."
 msgstr "Nie ma takiej aplikacji."
 
@@ -2373,80 +2447,53 @@ msgstr "Zmodyfikuj grupę %s"
 msgid "You must be logged in to create a group."
 msgstr "Musisz być zalogowany, aby utworzyć grupę."
 
-#. TRANS: Client error displayed trying to edit a group while not being a group admin.
-#. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
-#. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
-#: actions/editgroup.php:110 actions/editgroup.php:176
-#: actions/groupdesignsettings.php:109 actions/grouplogo.php:111
-msgid "You must be an admin to edit the group."
-msgstr "Musisz być administratorem, aby zmodyfikować grupę."
-
 #. TRANS: Form instructions for group edit form.
 #: actions/editgroup.php:161
 msgid "Use this form to edit the group."
 msgstr "Użyj tego formularza, aby zmodyfikować grupę."
 
-#. TRANS: Group edit form validation error.
-#. TRANS: Group create form validation error.
-#. TRANS: %s is the invalid alias.
-#: actions/editgroup.php:241 actions/newgroup.php:188
-#, php-format
-msgid "Invalid alias: \"%s\""
-msgstr "Nieprawidłowy alias: \"%s\""
-
-#. TRANS: Server error displayed when editing a group fails.
-#: actions/editgroup.php:274
-msgid "Could not update group."
-msgstr "Nie można zaktualizować grupy."
-
-#. TRANS: Server error displayed when group aliases could not be added.
-#. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/editgroup.php:281 classes/User_group.php:540
-msgid "Could not create aliases."
-msgstr "Nie można utworzyć aliasów."
-
 #. TRANS: Group edit form success message.
 #: actions/editgroup.php:301
 msgid "Options saved."
 msgstr "Zapisano opcje."
 
 #. TRANS: Title for e-mail settings.
-#: actions/emailsettings.php:59
+#: actions/emailsettings.php:60
 msgid "Email settings"
 msgstr "Ustawienia adresu e-mail"
 
 #. TRANS: E-mail settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/emailsettings.php:73
+#: actions/emailsettings.php:74
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 msgstr "Zarządzanie, jak otrzymywać wiadomości e-mail od %%site.name%%."
 
 #. TRANS: Form legend for e-mail settings form.
 #. TRANS: Field label for e-mail address input in e-mail settings form.
-#: actions/emailsettings.php:103 actions/emailsettings.php:129
+#: actions/emailsettings.php:104 actions/emailsettings.php:130
 msgid "Email address"
 msgstr "Adres e-mail"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:109
+#: actions/emailsettings.php:110
 msgid "Current confirmed email address."
 msgstr "Obecnie potwierdzone adresy e-mail."
 
 #. TRANS: Button label to remove a confirmed e-mail address.
 #. TRANS: Button label for removing a set sender e-mail address to post notices from.
-#. TRANS: Button label to remove a confirmed Instant Messaging address.
+#. TRANS: Button label to remove a confirmed IM address.
 #. TRANS: Button label to remove a confirmed SMS address.
 #. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
-#: actions/emailsettings.php:112 actions/emailsettings.php:179
-#: actions/imsettings.php:112 actions/smssettings.php:120
-#: actions/smssettings.php:176
+#: actions/emailsettings.php:113 actions/emailsettings.php:180
+#: actions/imsettings.php:119 actions/smssettings.php:119
+#: actions/smssettings.php:175
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Usuń"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:119
+#: actions/emailsettings.php:120
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -2460,44 +2507,44 @@ msgstr ""
 #. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
 #. TRANS: Any other domain may be owned by a legitimate person or
 #. TRANS: organization.
-#: actions/emailsettings.php:136
+#: actions/emailsettings.php:137
 msgid "Email address, like \"UserName@example.org\""
 msgstr "Adres e-mail, taki jak \"NazwaUżytkownika@example.org\""
 
 #. TRANS: Button label for adding an e-mail address in e-mail settings form.
-#. TRANS: Button label for adding an Instant Messaging address in Instant Messaging settings form.
+#. TRANS: Button label for adding an IM address in IM settings form.
 #. TRANS: Button label for adding a SMS phone number in SMS settings form.
-#: actions/emailsettings.php:140 actions/imsettings.php:147
-#: actions/smssettings.php:158
+#: actions/emailsettings.php:141 actions/imsettings.php:147
+#: actions/smssettings.php:157
 msgctxt "BUTTON"
 msgid "Add"
 msgstr "Dodaj"
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:148 actions/smssettings.php:167
+#: actions/emailsettings.php:149 actions/smssettings.php:166
 msgid "Incoming email"
 msgstr "Wiadomości przychodzące"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:154
+#: actions/emailsettings.php:155
 msgid "I want to post notices by email."
 msgstr "Chcę wysyłać wpisy przez wiadomości e-mail."
 
 #. TRANS: Form instructions for incoming e-mail form in e-mail settings.
 #. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
-#: actions/emailsettings.php:176 actions/smssettings.php:174
+#: actions/emailsettings.php:177 actions/smssettings.php:173
 msgid "Send email to this address to post new notices."
 msgstr "Wyślij wiadomość e-mail na ten adres, aby wysyłać nowe wpisy."
 
 #. TRANS: Instructions for incoming e-mail address input form, when an address has already been assigned.
 #. TRANS: Instructions for incoming SMS e-mail address input form.
-#: actions/emailsettings.php:185 actions/smssettings.php:182
+#: actions/emailsettings.php:186 actions/smssettings.php:181
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr "Używaj nowego adresu e-mail do wysyłania; anuluj poprzedni."
 
 #. TRANS: Instructions for incoming e-mail address input form.
-#: actions/emailsettings.php:189
+#: actions/emailsettings.php:190
 msgid ""
 "To send notices via email, we need to create a unique email address for you "
 "on this server:"
@@ -2507,88 +2554,88 @@ msgstr ""
 
 #. TRANS: Button label for adding an e-mail address to send notices from.
 #. TRANS: Button label for adding an SMS e-mail address to send notices from.
-#: actions/emailsettings.php:195 actions/smssettings.php:185
+#: actions/emailsettings.php:196 actions/smssettings.php:184
 msgctxt "BUTTON"
 msgid "New"
 msgstr "Nowy"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:204
+#: actions/emailsettings.php:205
 msgid "Email preferences"
 msgstr "Preferencje e-mail"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:212
+#: actions/emailsettings.php:213
 msgid "Send me notices of new subscriptions through email."
 msgstr "Wyślij wpisy nowych subskrypcji przez e-mail."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:218
+#: actions/emailsettings.php:219
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr "Wyślij wiadomość e-mail, kiedy ktoś doda mój wpis jako ulubiony."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:225
+#: actions/emailsettings.php:226
 msgid "Send me email when someone sends me a private message."
 msgstr "Wyślij wiadomość e-mail, kiedy ktoś wyśle prywatną wiadomość."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:231
+#: actions/emailsettings.php:232
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr "Wyślij wiadomość e-mail, kiedy ktoś wyśle odpowiedź \"@\"."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:237
+#: actions/emailsettings.php:238
 msgid "Allow friends to nudge me and send me an email."
 msgstr "Pozwól przyjaciołom na szturchanie mnie i wyślij mi wiadomość e-mail."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:243
+#: actions/emailsettings.php:244
 msgid "Publish a MicroID for my email address."
 msgstr "Opublikuj MicroID adresu e-mail."
 
 #. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:361
+#: actions/emailsettings.php:362
 msgid "Email preferences saved."
 msgstr "Zapisano preferencje e-mail."
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:380
+#: actions/emailsettings.php:381
 msgid "No email address."
 msgstr "Brak adresu e-mail."
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:388
+#: actions/emailsettings.php:389
 #, fuzzy
 msgid "Cannot normalize that email address."
 msgstr "Nie można znormalizować tego adresu e-mail"
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:393 actions/register.php:212
+#: actions/emailsettings.php:394 actions/register.php:197
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "To nie jest prawidłowy adres e-mail."
 
 #. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:397
+#: actions/emailsettings.php:398
 msgid "That is already your email address."
 msgstr "Ten adres e-mail jest już twój."
 
 #. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:401
+#: actions/emailsettings.php:402
 msgid "That email address already belongs to another user."
 msgstr "Ten adres e-mail należy już do innego użytkownika."
 
 #. TRANS: Server error thrown on database error adding e-mail confirmation code.
 #. TRANS: Server error thrown on database error adding Instant Messaging confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:418 actions/imsettings.php:343
-#: actions/smssettings.php:365
+#: actions/emailsettings.php:419 actions/imsettings.php:362
+#: actions/smssettings.php:364
 msgid "Could not insert confirmation code."
 msgstr "Nie można wprowadzić kodu potwierdzającego."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:425
+#: actions/emailsettings.php:426
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
@@ -2600,57 +2647,60 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling Instant Messaging address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:445 actions/imsettings.php:377
-#: actions/smssettings.php:399
+#: actions/emailsettings.php:446 actions/imsettings.php:391
+#: actions/smssettings.php:398
 msgid "No pending confirmation to cancel."
 msgstr "Brak oczekujących potwierdzeń do anulowania."
 
 #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:450
+#: actions/emailsettings.php:451
 msgid "That is the wrong email address."
 msgstr "To jest błędny adres e-mail."
 
 #. TRANS: Server error thrown on database error canceling e-mail address confirmation.
 #. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
-#: actions/emailsettings.php:459 actions/smssettings.php:413
+#: actions/emailsettings.php:460 actions/smssettings.php:412
 msgid "Could not delete email confirmation."
 msgstr "Nie można usunąć potwierdzenia adresu e-mail."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:464
+#: actions/emailsettings.php:465
 msgid "Email confirmation cancelled."
 msgstr "Anulowano potwierdzenie e-mail."
 
 #. TRANS: Message given trying to remove an e-mail address that is not
 #. TRANS: registered for the active user.
-#: actions/emailsettings.php:483
+#: actions/emailsettings.php:484
 msgid "That is not your email address."
 msgstr "To nie jest twój adres e-mail."
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:504
+#: actions/emailsettings.php:505
 msgid "The email address was removed."
 msgstr "Adres e-mail został usunięty."
 
 #. TRANS: Form validation error displayed when trying to remove an incoming e-mail address while no address has been set.
-#: actions/emailsettings.php:518 actions/smssettings.php:555
+#: actions/emailsettings.php:519 actions/smssettings.php:554
 msgid "No incoming email address."
 msgstr "Brak przychodzącego adresu e-mail."
 
 #. TRANS: Server error thrown on database error removing incoming e-mail address.
 #. TRANS: Server error thrown on database error adding incoming e-mail address.
-#: actions/emailsettings.php:530 actions/emailsettings.php:554
-#: actions/smssettings.php:565 actions/smssettings.php:588
+#. TRANS: Server error displayed when the user could not be updated in SMS settings.
+#: actions/emailsettings.php:531 actions/emailsettings.php:555
+#: actions/smssettings.php:565 actions/smssettings.php:590
 msgid "Could not update user record."
 msgstr "Nie można zaktualizować wpisu użytkownika."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:534 actions/smssettings.php:568
+#. TRANS: Confirmation text after updating SMS settings.
+#: actions/emailsettings.php:535 actions/smssettings.php:569
 msgid "Incoming email address removed."
 msgstr "Usunięto przychodzący adres e-mail."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:558 actions/smssettings.php:591
+#. TRANS: Confirmation text after updating SMS settings.
+#: actions/emailsettings.php:559 actions/smssettings.php:594
 msgid "New incoming email address added."
 msgstr "Dodano nowy przychodzący adres e-mail."
 
@@ -2662,7 +2712,7 @@ msgstr "Ten wpis jest już ulubiony."
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
 #: actions/favor.php:95
 #, fuzzy
-msgid "Disfavor favorite"
+msgid "Disfavor favorite."
 msgstr "Usuń wpis z ulubionych"
 
 #. TRANS: Page title for first page of favorited notices.
@@ -2715,9 +2765,8 @@ msgstr ""
 #. TRANS: %s is a user's nickname.
 #. TRANS: Title for first page of favourite notices of a user.
 #. TRANS: %s is the user for whom the favourite notices are displayed.
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing own favourited notices.
 #: actions/favoritesrss.php:111 actions/showfavorites.php:76
-#: lib/personalgroupnav.php:122
+#: lib/personalgroupnav.php:110
 #, php-format
 msgid "%s's favorite notices"
 msgstr "Ulubione wpisy użytkownika %s"
@@ -2904,13 +2953,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
 #: actions/groupblock.php:191
 #, fuzzy
-msgid "Do not block this user from this group"
+msgid "Do not block this user from this group."
 msgstr "Nie blokuj tego użytkownika w tej grupie"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
 #: actions/groupblock.php:198
 #, fuzzy
-msgid "Block this user from this group"
+msgid "Block this user from this group."
 msgstr "Zablokuj tego użytkownika w tej grupie"
 
 #. TRANS: Server error displayed when trying to block a user from a group fails because of an application error.
@@ -2919,6 +2968,7 @@ msgid "Database error blocking user from group."
 msgstr "Błąd bazy danych podczas blokowania użytkownika w grupie."
 
 #. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
+#. TRANS: Client error displayed trying to find a user by ID without providing an ID.
 #: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr "Brak identyfikatora."
@@ -2947,7 +2997,7 @@ msgid "Unable to update your design settings."
 msgstr "Nie można zapisać ustawień wyglądu."
 
 #. TRANS: Form text to confirm saved group design settings.
-#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:222
+#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:239
 msgid "Design preferences saved."
 msgstr "Zapisano preferencje wyglądu."
 
@@ -3010,7 +3060,7 @@ msgid "A list of the users in this group."
 msgstr "Lista użytkowników znajdujących się w tej grupie."
 
 #. TRANS: Indicator in group members list that this user is a group administrator.
-#: actions/groupmembers.php:190
+#: actions/groupmembers.php:190 lib/action.php:581
 msgid "Admin"
 msgstr "Administrator"
 
@@ -3103,8 +3153,10 @@ msgid "Group search"
 msgstr "Wyszukaj grupę"
 
 #. TRANS: Text on page where groups can be searched if no results were found for a query.
-#: actions/groupsearch.php:82 actions/noticesearch.php:117
-#: actions/peoplesearch.php:83
+#. TRANS: Text for notice search results is the query had no results.
+#. TRANS: Message on the "People search" page where a query has no results.
+#: actions/groupsearch.php:82 actions/noticesearch.php:122
+#: actions/peoplesearch.php:87
 msgid "No results."
 msgstr "Brak wyników."
 
@@ -3141,166 +3193,170 @@ msgid "User is not blocked from group."
 msgstr "Użytkownik nie został zablokowany w grupie."
 
 #. TRANS: Server error displayed when unblocking a user from a group fails because of an unknown error.
+#. TRANS: Server error displayed when removing a user block.
 #: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "Błąd podczas usuwania blokady."
 
 #. TRANS: Title for Instant Messaging settings.
-#: actions/imsettings.php:58
+#: actions/imsettings.php:56
 msgid "IM settings"
 msgstr "Ustawienia komunikatora"
 
 #. 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.
-#: actions/imsettings.php:71
+#: actions/imsettings.php:69
 #, fuzzy, php-format
 msgid ""
-"You can send and receive notices through Jabber/Google Talk [instant "
-"messages](%%doc.im%%). Configure your address and settings below."
+"You can send and receive notices through instant messaging [instant messages]"
+"(%%doc.im%%). Configure your addresses and settings below."
 msgstr ""
 "Można wysyłać i odbierać wpisy przez [komunikator](%%doc.im%%) Jabber/GTalk. "
 "Skonfiguruj adres i ustawienia poniżej."
 
-#. TRANS: Message given in the Instant Messaging settings if XMPP is not enabled on the site.
+#. TRANS: Message given in the IM settings if IM is not enabled on the site.
 #: actions/imsettings.php:90
 msgid "IM is not available."
 msgstr "Komunikator nie jest dostępny."
 
-#. TRANS: Form legend for Instant Messaging settings form.
-#. TRANS: Field label for Instant Messaging address input in Instant Messaging settings form.
-#: actions/imsettings.php:102 actions/imsettings.php:132
-msgid "IM address"
-msgstr "Adres komunikatora"
+#: actions/imsettings.php:116
+#, fuzzy, php-format
+msgid "Current confirmed %s address."
+msgstr "Obecnie potwierdzone adresy e-mail."
 
-#: actions/imsettings.php:109
-#, fuzzy
-msgid "Current confirmed Jabber/Google Talk address."
-msgstr "Obecnie potwierdzone adresy Jabber/GTalk."
-
-#. TRANS: Form note in Instant Messaging settings form.
-#. TRANS: %s is the Instant Messaging address set for the site.
-#: actions/imsettings.php:120
+#. TRANS: Form note in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:128
 #, fuzzy, php-format
 msgid ""
-"Awaiting confirmation on this address. Check your Jabber/Google Talk account "
-"for a message with further instructions. (Did you add %s to your buddy list?)"
+"Awaiting confirmation on this address. Check your %s account for a message "
+"with further instructions. (Did you add %s to your buddy list?)"
 msgstr ""
 "Oczekiwanie na potwierdzenie tego adresu. Sprawdź swoje konto Jabber/GTalk, "
 "czy otrzymałeś wiadomość z dalszymi instrukcjami (dodałeś %s do listy "
 "znajomych?)."
 
-#. TRANS: IM address input field instructions in Instant Messaging settings form.
-#. TRANS: %s is the Instant Messaging address set for the site.
-#. TRANS: Do not translate "example.org". It is one of the domain names reserved for use in examples by
-#. TRANS: http://www.rfc-editor.org/rfc/rfc2606.txt. Any other domain may be owned by a legitimate
-#. TRANS: person or organization.
-#: actions/imsettings.php:139
-#, fuzzy, php-format
-msgid ""
-"Jabber or Google Talk address, like \"UserName@example.org\". First, make "
-"sure to add %s to your buddy list in your IM client or on Google Talk."
-msgstr ""
-"Adres Jabber lub GTalk, taki jak \"NazwaUżytkownika@example.org\". Najpierw "
-"upewnij się, że dodałeś %s do listy znajomych w komunikatorze lub na GTalk."
+#: actions/imsettings.php:140
+msgid "IM address"
+msgstr "Adres komunikatora"
 
-#. TRANS: Form legend for Instant Messaging preferences form.
-#: actions/imsettings.php:154
-msgid "IM preferences"
+#: actions/imsettings.php:142
+#, php-format
+msgid "%s screenname."
+msgstr ""
+
+#. TRANS: Header for IM preferences form.
+#: actions/imsettings.php:163
+#, fuzzy
+msgid "IM Preferences"
 msgstr "Preferencje komunikatora"
 
-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:159
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:174
 #, fuzzy
-msgid "Send me notices through Jabber/Google Talk."
-msgstr "Wyślij mi wpisy przez Jabber/GTalk."
+msgid "Send me notices"
+msgstr "Wyślij wpis"
 
-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:165
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:176
 #, fuzzy
-msgid "Post a notice when my Jabber/Google Talk status changes."
+msgid "Post a notice when my status changes."
 msgstr "Wyślij wpis, kiedy zmieni się mój stan na Jabber/GTalk."
 
-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:171
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:178
 #, fuzzy
-msgid ""
-"Send me replies through Jabber/Google Talk from people I'm not subscribed to."
+msgid "Send me replies from people I'm not subscribed to."
 msgstr ""
 "Wyślij mi odpowiedzi przez Jabber/GTalk od osób, których nie subskrybuję."
 
-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:178
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:181
 #, fuzzy
-msgid "Publish a MicroID for my Jabber/Google Talk address."
-msgstr "Opublikuj MicroID adresu Jabber/GTalk."
+msgid "Publish a MicroID"
+msgstr "Opublikuj MicroID adresu e-mail."
 
-#. TRANS: Confirmation message for successful Instant Messaging preferences save.
-#: actions/imsettings.php:283 actions/othersettings.php:192
+#. TRANS: Server error thrown on database error updating IM preferences.
+#: actions/imsettings.php:291
+#, fuzzy
+msgid "Couldn't update IM preferences."
+msgstr "Nie można zaktualizować użytkownika."
+
+#. TRANS: Confirmation message for successful IM preferences save.
+#. TRANS: Confirmation message after saving preferences.
+#: actions/imsettings.php:298 actions/urlsettings.php:244
 msgid "Preferences saved."
 msgstr "Zapisano preferencje."
 
-#. TRANS: Message given saving Instant Messaging address without having provided one.
-#: actions/imsettings.php:304
-msgid "No Jabber ID."
-msgstr "Brak identyfikatora Jabbera."
-
-#. TRANS: Message given saving Instant Messaging address that cannot be normalised.
-#: actions/imsettings.php:312
+#. TRANS: Message given saving IM address without having provided one.
+#: actions/imsettings.php:320
 #, fuzzy
-msgid "Cannot normalize that Jabber ID."
+msgid "No screenname."
+msgstr "Brak pseudonimu."
+
+#: actions/imsettings.php:325
+#, fuzzy
+msgid "No transport."
+msgstr "Brak wpisu."
+
+#. TRANS: Message given saving IM address that cannot be normalised.
+#: actions/imsettings.php:333
+#, fuzzy
+msgid "Cannot normalize that screenname"
 msgstr "Nie można znormalizować tego identyfikatora Jabbera"
 
-#. TRANS: Message given saving Instant Messaging address that not valid.
-#: actions/imsettings.php:317
+#. TRANS: Message given saving IM address that not valid.
+#: actions/imsettings.php:340
 #, fuzzy
-msgid "Not a valid Jabber ID."
-msgstr "To nie jest prawidłowy identyfikator Jabbera"
+msgid "Not a valid screenname"
+msgstr "To nie jest prawidłowy pseudonim."
 
-#. TRANS: Message given saving Instant Messaging address that is already set.
-#: actions/imsettings.php:321
-msgid "That is already your Jabber ID."
-msgstr "Ten identyfikator Jabbera jest już twój."
-
-#. TRANS: Message given saving Instant Messaging address that is already set for another user.
-#: actions/imsettings.php:325
-msgid "Jabber ID already belongs to another user."
+#. TRANS: Message given saving IM address that is already set for another user.
+#: actions/imsettings.php:344
+#, fuzzy
+msgid "Screenname already belongs to another user."
 msgstr "Identyfikator Jabbera należy już do innego użytkownika."
 
-#. TRANS: Message given saving valid Instant Messaging address that is to be confirmed.
-#. TRANS: %s is the Instant Messaging address set for the site.
-#: actions/imsettings.php:353
-#, php-format
-msgid ""
-"A confirmation code was sent to the IM address you added. You must approve %"
-"s for sending messages to you."
+#. TRANS: Message given saving valid IM address that is to be confirmed.
+#: actions/imsettings.php:369
+#, fuzzy
+msgid "A confirmation code was sent to the IM address you added."
 msgstr ""
 "Kod potwierdzający został wysłany na dodany adres komunikatora. Należy "
 "zaakceptować otrzymywanie wiadomości od %s."
 
-#. TRANS: Message given canceling Instant Messaging address confirmation for the wrong IM address.
-#: actions/imsettings.php:382
+#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#: actions/imsettings.php:396
 msgid "That is the wrong IM address."
 msgstr "To jest błędny adres komunikatora."
 
-#. TRANS: Server error thrown on database error canceling Instant Messaging address confirmation.
-#: actions/imsettings.php:391
-msgid "Could not delete IM confirmation."
+#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#: actions/imsettings.php:405
+#, fuzzy
+msgid "Couldn't delete confirmation."
 msgstr "Nie można usunąć potwierdzenia komunikatora."
 
-#. TRANS: Message given after successfully canceling Instant Messaging address confirmation.
-#: actions/imsettings.php:396
+#. TRANS: Message given after successfully canceling IM address confirmation.
+#: actions/imsettings.php:410
 msgid "IM confirmation cancelled."
 msgstr "Anulowano potwierdzenie komunikatora."
 
-#. TRANS: Message given trying to remove an Instant Messaging address that is not
+#. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.
-#: actions/imsettings.php:417
-msgid "That is not your Jabber ID."
-msgstr "To nie jest twój identyfikator Jabbera."
+#: actions/imsettings.php:434
+#, fuzzy
+msgid "That is not your screenname."
+msgstr "To nie jest twój numer telefonu."
+
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#: actions/imsettings.php:443
+#, fuzzy
+msgid "Couldn't update user im prefs."
+msgstr "Nie można zaktualizować wpisu użytkownika."
 
 #. TRANS: Message given after successfully removing a registered Instant Messaging address.
-#: actions/imsettings.php:440
+#: actions/imsettings.php:451
 msgid "The IM address was removed."
 msgstr "Adres komunikatora został usunięty."
 
@@ -3519,7 +3575,7 @@ msgid "You must be logged in to join a group."
 msgstr "Musisz być zalogowany, aby dołączyć do grupy."
 
 #. TRANS: Title for join group page after joining.
-#: actions/joingroup.php:147
+#: actions/joingroup.php:148
 #, php-format
 msgctxt "TITLE"
 msgid "%1$s joined group %2$s"
@@ -3648,7 +3704,7 @@ msgstr "Adres URL obrazu do wyświetlenia z licencją."
 #. TRANS: Submit button title.
 #: actions/licenseadminpanel.php:311 actions/sessionsadminpanel.php:199
 #: actions/siteadminpanel.php:292 actions/snapshotadminpanel.php:245
-#: actions/tagother.php:154 lib/applicationeditform.php:357
+#: actions/tagother.php:133 lib/applicationeditform.php:357
 msgid "Save"
 msgstr "Zapisz"
 
@@ -3656,41 +3712,43 @@ msgstr "Zapisz"
 msgid "Save license settings"
 msgstr "Zapisz ustawienia licencji"
 
-#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
+#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
+#: actions/login.php:97 actions/otp.php:62 actions/register.php:130
 msgid "Already logged in."
 msgstr "Jesteś już zalogowany."
 
-#: actions/login.php:148
+#: actions/login.php:125
 msgid "Incorrect username or password."
 msgstr "Niepoprawna nazwa użytkownika lub hasło."
 
-#: actions/login.php:154 actions/otp.php:120
+#. TRANS: Server error displayed when a user object could not be created trying to login using "one time password login".
+#: actions/login.php:131 actions/otp.php:127
 msgid "Error setting user. You are probably not authorized."
 msgstr "Błąd podczas ustawiania użytkownika. Prawdopodobnie brak upoważnienia."
 
-#: actions/login.php:210 actions/login.php:263
+#: actions/login.php:185 actions/login.php:236 lib/action.php:598
 msgid "Login"
 msgstr "Zaloguj się"
 
-#: actions/login.php:249
+#: actions/login.php:222
 msgid "Login to site"
 msgstr "Zaloguj się na witrynie"
 
-#: actions/login.php:258 actions/register.php:490
+#: actions/login.php:231 actions/register.php:469
 msgid "Remember me"
 msgstr "Zapamiętaj mnie"
 
-#: actions/login.php:259 actions/register.php:492
+#: actions/login.php:232 actions/register.php:471
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 "Automatyczne logowanie. Nie należy używać na komputerach używanych przez "
 "wiele osób."
 
-#: actions/login.php:269
+#: actions/login.php:241
 msgid "Lost or forgotten password?"
 msgstr "Zgubione lub zapomniane hasło?"
 
-#: actions/login.php:288
+#: actions/login.php:259
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -3698,11 +3756,11 @@ msgstr ""
 "Z powodów bezpieczeństwa ponownie podaj nazwę użytkownika i hasło przed "
 "zmienianiem ustawień."
 
-#: actions/login.php:292
+#: actions/login.php:263
 msgid "Login with your username and password."
 msgstr "Logowanie za pomocą nazwy użytkownika i hasła."
 
-#: actions/login.php:295
+#: actions/login.php:266
 #, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -3827,7 +3885,9 @@ msgstr "Nowy wpis"
 msgid "Notice posted"
 msgstr "Wysłano wpis"
 
-#: actions/noticesearch.php:68
+#. TRANS: Instructions for Notice search page.
+#. TRANS: %%site.name%% is the name of the StatusNet site.
+#: actions/noticesearch.php:69
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -3836,16 +3896,21 @@ msgstr ""
 "Wyszukaj wpisy na %%site.name%% według ich treści. Oddziel wyszukiwane "
 "terminy spacjami. Terminy muszą mieć trzy znaki lub więcej."
 
-#: actions/noticesearch.php:78
+#. TRANS: Title of the page where users can search for notices.
+#: actions/noticesearch.php:80
 msgid "Text search"
 msgstr "Wyszukiwanie tekstu"
 
-#: actions/noticesearch.php:91
+#. TRANS: Test in RSS notice search.
+#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
+#: actions/noticesearch.php:95
 #, php-format
 msgid "Search results for \"%1$s\" on %2$s"
 msgstr "Wyniki wyszukiwania dla \"%1$s\" na %2$s"
 
-#: actions/noticesearch.php:121
+#. TRANS: Text for logged in users making a query for notices without results.
+#. TRANS: This message contains a Markdown link.
+#: actions/noticesearch.php:128
 #, php-format
 msgid ""
 "Be the first to [post on this topic](%%%%action.newnotice%%%%?"
@@ -3854,7 +3919,9 @@ msgstr ""
 "Zostań pierwszym, który [wyśle coś na ten temat](%%%%action.newnotice%%%%?"
 "status_textarea=%s)."
 
-#: actions/noticesearch.php:124
+#. TRANS: Text for not logged in users making a query for notices without results.
+#. TRANS: This message contains Markdown links.
+#: actions/noticesearch.php:133
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and be the first to "
@@ -3864,14 +3931,17 @@ msgstr ""
 "pierwszym, który [wyśle coś na ten temat](%%%%action.newnotice%%%%?"
 "status_textarea=%s)."
 
-#: actions/noticesearchrss.php:96
+#. TRANS: RSS notice search feed title. %s is the query.
+#: actions/noticesearchrss.php:95
 #, php-format
 msgid "Updates with \"%s\""
 msgstr "Aktualizacje z \"%s\""
 
-#: actions/noticesearchrss.php:98
+#. TRANS: RSS notice search feed description.
+#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
+#: actions/noticesearchrss.php:99
 #, fuzzy, php-format
-msgid "Updates matching search term \"%1$s\" on %2$s!"
+msgid "Updates matching search term \"%1$s\" on %2$s."
 msgstr "Aktualizacje pasujące do wyszukiwanego terminu \"%1$s\" na %2$s."
 
 #: actions/nudge.php:85
@@ -3891,51 +3961,51 @@ msgid "Nudge sent!"
 msgstr "Wysłano szturchnięcie."
 
 #. TRANS: Message displayed to an anonymous user trying to view OAuth application list.
-#: actions/oauthappssettings.php:60
+#: actions/oauthappssettings.php:57
 msgid "You must be logged in to list your applications."
 msgstr "Musisz być zalogowany, aby wyświetlić listę aplikacji."
 
 #. TRANS: Page title for OAuth applications
-#: actions/oauthappssettings.php:76
+#: actions/oauthappssettings.php:73
 msgid "OAuth applications"
 msgstr "Aplikacje OAuth"
 
 #. TRANS: Page instructions for OAuth applications
-#: actions/oauthappssettings.php:88
+#: actions/oauthappssettings.php:85
 msgid "Applications you have registered"
 msgstr "Zarejestrowane aplikacje"
 
 #. TRANS: Empty list message on page with OAuth applications.
-#: actions/oauthappssettings.php:141
+#: actions/oauthappssettings.php:138
 #, php-format
 msgid "You have not registered any applications yet."
 msgstr "Nie zarejestrowano jeszcze żadnych aplikacji."
 
 #. TRANS: Title for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:71
+#: actions/oauthconnectionssettings.php:69
 msgid "Connected applications"
 msgstr "Połączone aplikacje"
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:83
+#: actions/oauthconnectionssettings.php:80
 msgid "The following connections exist for your account."
 msgstr "Istnieją następujące połączenia dla konta."
 
 #. TRANS: Client error when trying to revoke access for an application while not being a user of it.
-#: actions/oauthconnectionssettings.php:168
+#: actions/oauthconnectionssettings.php:165
 msgid "You are not a user of that application."
 msgstr "Nie jesteś użytkownikiem tej aplikacji."
 
 #. TRANS: Client error when revoking access has failed for some reason.
 #. TRANS: %s is the application ID revoking access failed for.
-#: actions/oauthconnectionssettings.php:183
+#: actions/oauthconnectionssettings.php:180
 #, php-format
 msgid "Unable to revoke access for application: %s."
 msgstr "Nie można unieważnić dostępu dla aplikacji: %s."
 
 #. TRANS: Success message after revoking access for an application.
 #. TRANS: %1$s is the application name, %2$s is the first part of the user token.
-#: actions/oauthconnectionssettings.php:202
+#: actions/oauthconnectionssettings.php:199
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -3945,14 +4015,14 @@ msgstr ""
 "$s."
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:213
+#: actions/oauthconnectionssettings.php:210
 msgid "You have not authorized any applications to use your account."
 msgstr "Nie upoważniono żadnych aplikacji do używania konta."
 
 #. TRANS: Note for developers in the OAuth connection settings form.
 #. TRANS: This message contains a Markdown link. Do not separate "](".
 #. TRANS: %s is the URL to the OAuth settings.
-#: actions/oauthconnectionssettings.php:233
+#: actions/oauthconnectionssettings.php:230
 #, php-format
 msgid ""
 "Are you a developer? [Register an OAuth client application](%s) to use with "
@@ -3961,6 +4031,16 @@ msgstr ""
 "Jesteś programistą? [Zarejestruj aplikację kliencką OAuth](%s) do użycia z "
 "tą witryną StatusNet."
 
+#: actions/oembed.php:64
+#, fuzzy, php-format
+msgid "\"%s\" not found."
+msgstr "Nie odnaleziono strony."
+
+#: actions/oembed.php:76
+#, fuzzy, php-format
+msgid "Notice %s not found."
+msgstr "Nie odnaleziono wpisu nadrzędnego."
+
 #: actions/oembed.php:80 actions/shownotice.php:100
 msgid "Notice has no profile."
 msgstr "Wpis nie posiada profilu."
@@ -3970,6 +4050,16 @@ msgstr "Wpis nie posiada profilu."
 msgid "%1$s's status on %2$s"
 msgstr "Stan użytkownika %1$s na %2$s"
 
+#: actions/oembed.php:95
+#, fuzzy, php-format
+msgid "Attachment %s not found."
+msgstr "Nie odnaleziono odbiorcy."
+
+#: actions/oembed.php:136
+#, php-format
+msgid "\"%s\" not supported for oembed requests."
+msgstr ""
+
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
 #: actions/oembed.php:168
 #, php-format
@@ -3983,93 +4073,60 @@ msgid "Only %s URLs over plain HTTP please."
 msgstr "Dozwolone są tylko adresy URL %s przez zwykły protokół HTTP."
 
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1205
-#: lib/apiaction.php:1232 lib/apiaction.php:1367
+#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1207
+#: lib/apiaction.php:1234 lib/apiaction.php:1369
 msgid "Not a supported data format."
 msgstr "To nie jest obsługiwany format danych."
 
+#. TRANS: ShortName in the OpenSearch interface when trying to find users.
 #: actions/opensearch.php:64
 msgid "People Search"
 msgstr "Wyszukiwanie osób"
 
-#: actions/opensearch.php:67
+#: actions/opensearch.php:68
 msgid "Notice Search"
 msgstr "Wyszukiwanie wpisów"
 
-#: actions/othersettings.php:59
-msgid "Other settings"
-msgstr "Inne ustawienia"
-
-#. TRANS: Instructions for tab "Other" in user profile settings.
-#: actions/othersettings.php:71
-msgid "Manage various other options."
-msgstr "Zarządzaj różnymi innymi opcjami."
-
-#. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
-#. TRANS: user's profile settings. Use of "free" is as in "open", indicating that the
-#. TRANS: information on the shortener site is freely distributable.
-#. TRANS: This message has one space at the beginning. Use your language's word separator
-#. TRANS: here if it has one (most likely a single space).
-#: actions/othersettings.php:113
-msgid " (free service)"
-msgstr " (wolna usługa)"
-
-#. TRANS: Label for dropdown with URL shortener services.
-#: actions/othersettings.php:122
-msgid "Shorten URLs with"
-msgstr "Skracanie adresów URL za pomocą"
-
-#. TRANS: Tooltip for for dropdown with URL shortener services.
-#: actions/othersettings.php:124
-msgid "Automatic shortening service to use."
-msgstr "Używana automatyczna usługa skracania."
-
-#. TRANS: Label for checkbox.
-#: actions/othersettings.php:130
-msgid "View profile designs"
-msgstr "Wyświetl ustawienia wyglądu profilu"
-
-#. TRANS: Tooltip for checkbox.
-#: actions/othersettings.php:132
-msgid "Show or hide profile designs."
-msgstr "Wyświetl lub ukryj ustawienia wyglądu profilu."
-
-#. TRANS: Form validation error for form "Other settings" in user profile.
-#: actions/othersettings.php:164
-msgid "URL shortening service is too long (maximum 50 characters)."
-msgstr "Adres URL usługi skracania jest za długi (maksymalnie 50 znaków)."
-
-#: actions/otp.php:69
+#. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
+#: actions/otp.php:70
 msgid "No user ID specified."
 msgstr "Nie podano identyfikatora użytkownika."
 
-#: actions/otp.php:83
+#. TRANS: Client error displayed trying to use "one time password login" without specifying a login token.
+#: actions/otp.php:86
 msgid "No login token specified."
 msgstr "Nie podano tokenu logowania."
 
-#: actions/otp.php:90
+#. TRANS: Client error displayed trying to use "one time password login" without requesting a login token.
+#: actions/otp.php:94
 msgid "No login token requested."
 msgstr "Nie zażądano tokenu logowania."
 
-#: actions/otp.php:95
+#. TRANS: Client error displayed trying to use "one time password login" while specifying an invalid login token.
+#: actions/otp.php:100
 msgid "Invalid login token specified."
 msgstr "Podano nieprawidłowy token logowania."
 
-#: actions/otp.php:104
+#. TRANS: Client error displayed trying to use "one time password login" while specifying an expired login token.
+#: actions/otp.php:110
 msgid "Login token expired."
 msgstr "Token logowania wygasł."
 
-#: actions/outbox.php:58
+#. TRANS: Title for outbox for any but the fist page.
+#. TRANS: %1$s is the user nickname, %2$d is the page number.
+#: actions/outbox.php:57
 #, php-format
 msgid "Outbox for %1$s - page %2$d"
 msgstr "Wysłane wiadomości użytkownika %1$s - strona %2$d"
 
+#. TRANS: Title for first page of outbox.
 #: actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
 msgstr "Wysłane wiadomości użytkownika %s"
 
-#: actions/outbox.php:104
+#. TRANS: Instructions for outbox.
+#: actions/outbox.php:103
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr "To są wiadomości wysłane, czyli prywatne wiadomości, które wysłałeś."
 
@@ -4095,43 +4152,42 @@ msgstr "Poprzednie hasło"
 msgid "New password"
 msgstr "Nowe hasło"
 
-#: actions/passwordsettings.php:109
-#, fuzzy
-msgid "6 or more characters"
+#: actions/passwordsettings.php:109 actions/register.php:416
+msgid "6 or more characters."
 msgstr "6 lub więcej znaków."
 
-#: actions/passwordsettings.php:113
-#, fuzzy
-msgid "Same as password above"
+#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#: actions/passwordsettings.php:113 actions/recoverpassword.php:264
+#: actions/register.php:420
+msgid "Same as password above."
 msgstr "Takie samo jak powyższe hasło."
 
 #: actions/passwordsettings.php:117
 msgid "Change"
 msgstr "Zmień"
 
-#: actions/passwordsettings.php:154 actions/register.php:238
+#: actions/passwordsettings.php:153 actions/register.php:223
 msgid "Password must be 6 or more characters."
 msgstr "Hasło musi mieć sześć lub więcej znaków."
 
-#: actions/passwordsettings.php:157 actions/register.php:241
+#: actions/passwordsettings.php:156 actions/register.php:226
 msgid "Passwords don't match."
 msgstr "Hasła nie pasują do siebie."
 
-#: actions/passwordsettings.php:165
+#: actions/passwordsettings.php:164
 msgid "Incorrect old password"
 msgstr "Niepoprawne poprzednie hasło"
 
-#: actions/passwordsettings.php:181
+#: actions/passwordsettings.php:180
 msgid "Error saving user; invalid."
 msgstr "Błąd podczas zapisywania użytkownika; nieprawidłowy."
 
-#: actions/passwordsettings.php:186
-#, fuzzy
-msgid "Can't save new password."
+#. TRANS: Reset password form validation error message.
+#: actions/passwordsettings.php:185 actions/recoverpassword.php:418
+msgid "Cannot save new password."
 msgstr "Nie można zapisać nowego hasła."
 
-#. TRANS: Title for password recovery page in password saved mode.
-#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
+#: actions/passwordsettings.php:191
 msgid "Password saved."
 msgstr "Zapisano hasło."
 
@@ -4338,8 +4394,7 @@ msgid "Directory where backgrounds are located."
 msgstr "Katalog, w którym położone są tła."
 
 #. TRANS: Fieldset legens in Paths admin panel.
-#. TRANS: DT element label in attachment list.
-#: actions/pathsadminpanel.php:419 lib/attachmentlist.php:98
+#: actions/pathsadminpanel.php:419
 msgid "Attachments"
 msgstr "Załączniki"
 
@@ -4407,7 +4462,9 @@ msgstr "Serwer do przekierowywania żądań SSL."
 msgid "Save paths"
 msgstr "Ścieżki zapisu"
 
-#: actions/peoplesearch.php:52
+#. TRANS: Instructions for the "People search" page.
+#. TRANS: %%site.name%% is the name of the StatusNet site.
+#: actions/peoplesearch.php:54
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
@@ -4417,7 +4474,8 @@ msgstr ""
 "zainteresowań. Oddziel wyszukiwane terminy spacjami. Terminy muszą mieć trzy "
 "znaki lub więcej."
 
-#: actions/peoplesearch.php:58
+#. TRANS: Title of a page where users can search for other users.
+#: actions/peoplesearch.php:61
 msgid "People search"
 msgstr "Wyszukiwanie osób"
 
@@ -4431,6 +4489,60 @@ msgstr "Nieprawidłowy znacznik osób: %s."
 msgid "Users self-tagged with %1$s - page %2$d"
 msgstr "Użytkownicy używający znacznika %1$s - strona %2$d"
 
+#. TRANS: Page title for AJAX form return when a disabling a plugin.
+#: actions/plugindisable.php:69
+msgctxt "plugin"
+msgid "Disabled"
+msgstr ""
+
+#. TRANS: Client error displayed trying to perform any request method other than POST.
+#. TRANS: Do not translate POST.
+#: actions/pluginenable.php:78 actions/subscribe.php:77
+msgid "This action only accepts POST requests."
+msgstr "Ta czynność przyjmuje tylko żądania POST."
+
+#: actions/pluginenable.php:102
+#, fuzzy
+msgid "You cannot administer plugins."
+msgstr "Nie można usuwać użytkowników."
+
+#: actions/pluginenable.php:109
+#, fuzzy
+msgid "No such plugin."
+msgstr "Nie ma takiej strony."
+
+#. TRANS: Page title for AJAX form return when enabling a plugin.
+#: actions/pluginenable.php:159
+msgctxt "plugin"
+msgid "Enabled"
+msgstr ""
+
+#. TRANS: Tab and title for plugins admin panel.
+#. TRANS: Menu item for site administration
+#: actions/pluginsadminpanel.php:56 actions/version.php:191
+#: lib/adminpanelaction.php:411
+msgid "Plugins"
+msgstr "Wtyczki"
+
+#. TRANS: Instructions at top of plugin admin page.
+#: actions/pluginsadminpanel.php:68
+msgid ""
+"Additional plugins can be enabled and configured manually. See the <a href="
+"\"http://status.net/wiki/Plugins\">online plugin documentation</a> for more "
+"details."
+msgstr ""
+
+#. TRANS: Admin form section header
+#: actions/pluginsadminpanel.php:84
+#, fuzzy
+msgid "Default plugins"
+msgstr "Domyślny język"
+
+#: actions/pluginsadminpanel.php:106
+msgid ""
+"All default plugins have been disabled from the site's configuration file."
+msgstr ""
+
 #: actions/postnotice.php:95
 msgid "Invalid notice content."
 msgstr "Nieprawidłowa treść wpisu."
@@ -4441,12 +4553,12 @@ msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’.
 msgstr "Licencja wpisu \"%1$s\" nie jest zgodna z licencją witryny \"%2$s\"."
 
 #. TRANS: Page title for profile settings.
-#: actions/profilesettings.php:59
+#: actions/profilesettings.php:60
 msgid "Profile settings"
 msgstr "Ustawienia profilu"
 
 #. TRANS: Usage instructions for profile settings.
-#: actions/profilesettings.php:70
+#: actions/profilesettings.php:71
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
@@ -4454,40 +4566,37 @@ msgstr ""
 "lepiej cię poznać."
 
 #. TRANS: Profile settings form legend.
-#: actions/profilesettings.php:98
+#: actions/profilesettings.php:99
 msgid "Profile information"
 msgstr "Informacje o profilu"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109 actions/register.php:433
+#: actions/profilesettings.php:110 actions/register.php:412
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr "1-64 małe litery lub liczby, bez spacji i znaków przestankowych."
 
 #. TRANS: Field label in form for profile settings.
-#. TRANS: Label for full group name (dt). Text hidden by default.
-#. TRANS: DT for full name in a profile.
-#: actions/profilesettings.php:113 actions/register.php:455
-#: actions/showgroup.php:255 actions/tagother.php:104
-#: lib/groupeditform.php:150 lib/userprofile.php:156
+#: actions/profilesettings.php:114 actions/register.php:434
+#: lib/groupeditform.php:150
 msgid "Full name"
 msgstr "Imię i nazwisko"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:118 actions/register.php:460
+#: actions/profilesettings.php:119 actions/register.php:439
 #: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "Strona domowa"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:121
+#: actions/profilesettings.php:122 actions/register.php:441
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr "Adres URL strony domowej, bloga lub profilu na innej witrynie."
 
 #. TRANS: Tooltip for field label in form for profile settings. Plural
 #. TRANS: is decided by the number of characters available for the
 #. TRANS: biography (%d).
-#: actions/profilesettings.php:129 actions/register.php:471
+#: actions/profilesettings.php:130 actions/register.php:450
 #, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4496,86 +4605,82 @@ msgstr[1] "Opisz siebie i swoje zainteresowania w %d znakach"
 msgstr[2] "Opisz siebie i swoje zainteresowania w %d znakach"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:135 actions/register.php:476
+#: actions/profilesettings.php:136 actions/register.php:455
 msgid "Describe yourself and your interests"
 msgstr "Opisz się i swoje zainteresowania"
 
 #. TRANS: Text area label in form for profile settings where users can provide.
 #. TRANS: their biography.
-#: actions/profilesettings.php:139 actions/register.php:478
+#: actions/profilesettings.php:140 actions/register.php:457
 msgid "Bio"
 msgstr "O mnie"
 
 #. TRANS: Field label in form for profile settings.
-#. TRANS: Label for group location (dt). Text hidden by default.
-#. TRANS: DT for location in a profile.
-#: actions/profilesettings.php:145 actions/register.php:483
-#: actions/showgroup.php:265 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:173
-#: lib/userprofile.php:172
+#: actions/profilesettings.php:146 actions/register.php:462
+#: lib/groupeditform.php:173
 msgid "Location"
 msgstr "Położenie"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148 actions/register.php:485
+#: actions/profilesettings.php:149
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Gdzie jesteś, np. \"miasto, województwo (lub region), kraj\""
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:153
+#: actions/profilesettings.php:154
 msgid "Share my current location when posting notices"
 msgstr "Podziel się swoim obecnym położeniem podczas wysyłania wpisów"
 
 #. TRANS: Field label in form for profile settings.
-#. TRANS: DT for tags in a profile.
-#: actions/profilesettings.php:161 actions/tagother.php:149
-#: actions/tagother.php:209 lib/subscriptionlist.php:106
-#: lib/subscriptionlist.php:108 lib/userprofile.php:220
+#: actions/profilesettings.php:162 actions/tagother.php:128
+#: actions/tagother.php:188 lib/subscriptionlist.php:104
+#: lib/subscriptionlist.php:106
 msgid "Tags"
 msgstr "Znaczniki"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:164
+#: actions/profilesettings.php:165
 #, fuzzy
 msgid ""
-"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- "
+"separated."
 msgstr ""
 "Znaczniki dla siebie (litery, liczby, -, . i _), oddzielone przecinkami lub "
 "spacjami"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:169
+#: actions/profilesettings.php:170
 msgid "Language"
 msgstr "Język"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:171
+#: actions/profilesettings.php:172
 #, fuzzy
-msgid "Preferred language"
+msgid "Preferred language."
 msgstr "Preferowany język"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:181
+#: actions/profilesettings.php:182
 msgid "Timezone"
 msgstr "Strefa czasowa"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:183
+#: actions/profilesettings.php:184
 msgid "What timezone are you normally in?"
 msgstr "W jakiej strefie czasowej zwykle się znajdujesz?"
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:189
+#: actions/profilesettings.php:190
 #, fuzzy
 msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)"
+"Automatically subscribe to whoever subscribes to me (best for non-humans)."
 msgstr ""
 "Automatycznie subskrybuj każdego, kto mnie subskrybuje (najlepsze dla botów)"
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Plural form is used based on the maximum number of allowed
 #. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:258 actions/register.php:229
+#: actions/profilesettings.php:259 actions/register.php:214
 #, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4584,47 +4689,47 @@ msgstr[1] "Wpis \"O mnie\" jest za długi (maksymalnie %d znaki)."
 msgstr[2] "Wpis \"O mnie\" jest za długi (maksymalnie %d znaków)."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:269 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:270 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr "Nie wybrano strefy czasowej."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:277
+#: actions/profilesettings.php:278
 msgid "Language is too long (maximum 50 characters)."
 msgstr "Język jest za długi (maksymalnie 50 znaków)."
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:291 actions/tagother.php:178
-#, php-format
-msgid "Invalid tag: \"%s\""
+#: actions/profilesettings.php:292
+#, fuzzy, php-format
+msgid "Invalid tag: \"%s\"."
 msgstr "Nieprawidłowy znacznik: \"%s\""
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:347
+#: actions/profilesettings.php:348
 msgid "Could not update user for autosubscribe."
 msgstr "Nie można zaktualizować użytkownika do automatycznej subskrypcji."
 
 #. TRANS: Server error thrown when user profile location preference settings could not be updated.
-#: actions/profilesettings.php:405
+#: actions/profilesettings.php:406
 msgid "Could not save location prefs."
 msgstr "Nie można zapisać preferencji położenia."
 
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:427 actions/tagother.php:200
+#: actions/profilesettings.php:428 actions/tagother.php:179
 msgid "Could not save tags."
 msgstr "Nie można zapisać znaczników."
 
 #. TRANS: Confirmation shown when user profile settings are saved.
 #. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:436 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:437 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "Zapisano ustawienia."
 
 #. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
 #. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:483 actions/restoreaccount.php:60
+#: actions/profilesettings.php:484 actions/restoreaccount.php:60
 msgid "Restore account"
 msgstr "Przywróć konto"
 
@@ -4702,6 +4807,12 @@ msgstr ""
 "To jest %%site.name%%, usługa [mikroblogowania](http://pl.wikipedia.org/wiki/"
 "Mikroblog) oparta na wolnym narzędziu [StatusNet](http://status.net/)."
 
+#. TRANS: Public RSS feed description. %s is the StatusNet site name.
+#: actions/publicrss.php:106
+#, fuzzy, php-format
+msgid "%s updates from everyone."
+msgstr "Użytkownik %s aktualizuje od każdego."
+
 #. TRANS: Title for public tag cloud.
 #: actions/publictagcloud.php:57
 msgid "Public tag cloud"
@@ -4743,10 +4854,6 @@ msgstr ""
 "Dlaczego nie [zarejestrujesz konta](%%action.register%%) i zostaniesz "
 "pierwszym, który go wyśle."
 
-#: actions/publictagcloud.php:146
-msgid "Tag cloud"
-msgstr "Chmura znaczników"
-
 #. TRANS: Client error displayed trying to recover password while already logged in.
 #: actions/recoverpassword.php:37
 msgid "You are already logged in!"
@@ -4837,6 +4944,12 @@ msgstr "Przywróć hasło"
 msgid "Password recovery requested"
 msgstr "Zażądano przywracania hasła"
 
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/recoverpassword.php:229
+#, fuzzy
+msgid "Password saved"
+msgstr "Zapisano hasło."
+
 #. TRANS: Title for password recovery page when an unknown action has been specified.
 #: actions/recoverpassword.php:232
 msgid "Unknown action"
@@ -4847,14 +4960,9 @@ msgstr "Nieznane działanie"
 msgid "6 or more characters, and do not forget it!"
 msgstr "6 lub więcej znaków, i nie zapomnij go."
 
-#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
-#: actions/recoverpassword.php:264 actions/register.php:441
-msgid "Same as password above."
-msgstr "Takie samo jak powyższe hasło."
-
 #. TRANS: Button text for password reset form.
 #. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: actions/recoverpassword.php:268 lib/designsettings.php:264
+#: actions/recoverpassword.php:268 lib/designform.php:145
 msgctxt "BUTTON"
 msgid "Reset"
 msgstr "Przywróć"
@@ -4903,13 +5011,8 @@ msgstr "Hasło musi mieć sześć lub więcej znaków."
 msgid "Password and confirmation do not match."
 msgstr "Hasło i potwierdzenie nie pasują do siebie."
 
-#. TRANS: Reset password form validation error message.
-#: actions/recoverpassword.php:418
-msgid "Cannot save new password."
-msgstr "Nie można zapisać nowego hasła."
-
 #. TRANS: Server error displayed when something does wrong with the user object during password reset.
-#: actions/recoverpassword.php:426 actions/register.php:256
+#: actions/recoverpassword.php:426 actions/register.php:241
 msgid "Error setting user."
 msgstr "Błąd podczas ustawiania użytkownika."
 
@@ -4918,97 +5021,102 @@ msgstr "Błąd podczas ustawiania użytkownika."
 msgid "New password successfully saved. You are now logged in."
 msgstr "Pomyślnie zapisano nowe hasło. Jesteś teraz zalogowany."
 
-#: actions/register.php:92 actions/register.php:196 actions/register.php:413
+#: actions/redirecturl.php:70
+#, fuzzy
+msgid "No id parameter"
+msgstr "Brak parametru identyfikatora."
+
+#: actions/redirecturl.php:76
+#, fuzzy, php-format
+msgid "No such file \"%d\""
+msgstr "Nie ma takiego pliku."
+
+#: actions/register.php:80 actions/register.php:181 actions/register.php:392
 msgid "Sorry, only invited people can register."
 msgstr "Tylko zaproszone osoby mogą się rejestrować."
 
-#: actions/register.php:99
+#: actions/register.php:87
 msgid "Sorry, invalid invitation code."
 msgstr "Nieprawidłowy kod zaproszenia."
 
-#: actions/register.php:119
+#: actions/register.php:106
 msgid "Registration successful"
 msgstr "Rejestracja powiodła się"
 
-#: actions/register.php:121 actions/register.php:511
+#: actions/register.php:108 actions/register.php:490
 msgid "Register"
 msgstr "Zarejestruj się"
 
-#: actions/register.php:142
+#: actions/register.php:128
 msgid "Registration not allowed."
 msgstr "Rejestracja nie jest dozwolona."
 
-#: actions/register.php:209
+#: actions/register.php:194
 #, fuzzy
-msgid "You can't register if you don't agree to the license."
+msgid "You cannot register if you don't agree to the license."
 msgstr ""
 "Nie można się zarejestrować, jeśli nie zgadzasz się z warunkami licencji."
 
-#: actions/register.php:218
+#: actions/register.php:203
 msgid "Email address already exists."
 msgstr "Adres e-mail już istnieje."
 
-#: actions/register.php:251 actions/register.php:273
+#: actions/register.php:236 actions/register.php:258
 msgid "Invalid username or password."
 msgstr "Nieprawidłowa nazwa użytkownika lub hasło."
 
-#: actions/register.php:351
+#: actions/register.php:333
 #, fuzzy
 msgid ""
 "With this form you can create a new account. You can then post notices and "
-"link up to friends and colleagues. "
+"link up to friends and colleagues."
 msgstr ""
 "Za pomocą tego formularza można utworzyć nowe konto. Można wtedy wysyłać "
 "wpisy i połączyć się z przyjaciółmi i kolegami. "
 
-#: actions/register.php:437
-msgid "6 or more characters."
-msgstr "6 lub więcej znaków."
-
-#. TRANS: Link description in user account settings menu.
-#: actions/register.php:445 actions/register.php:449
-#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
+#: actions/register.php:424 actions/register.php:428
+#: actions/siteadminpanel.php:238 lib/settingsnav.php:92
 msgid "Email"
 msgstr "E-mail"
 
-#: actions/register.php:446 actions/register.php:450
+#: actions/register.php:425 actions/register.php:429
 #, fuzzy
-msgid "Used only for updates, announcements, and password recovery"
+msgid "Used only for updates, announcements, and password recovery."
 msgstr "Używane tylko do aktualizacji, ogłoszeń i przywracania hasła"
 
-#: actions/register.php:457
+#: actions/register.php:436
 #, fuzzy
-msgid "Longer name, preferably your \"real\" name"
+msgid "Longer name, preferably your \"real\" name."
 msgstr "Dłuższa nazwa, najlepiej twoje \"prawdziwe\" imię i nazwisko"
 
-#: actions/register.php:462
+#: actions/register.php:464
 #, fuzzy
-msgid "URL of your homepage, blog, or profile on another site"
-msgstr "Adres URL strony domowej, bloga lub profilu na innej witrynie."
+msgid "Where you are, like \"City, State (or Region), Country\"."
+msgstr "Gdzie jesteś, np. \"miasto, województwo (lub region), kraj\""
 
-#: actions/register.php:523
+#: actions/register.php:503
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
 msgstr "Rozumiem, że treść i dane %1$s są prywatne i poufne."
 
-#: actions/register.php:533
+#: actions/register.php:513
 #, php-format
 msgid "My text and files are copyright by %1$s."
 msgstr "Moje teksty i pliki są objęte prawami autorskimi %1$s."
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:537
+#: actions/register.php:517
 msgid "My text and files remain under my own copyright."
 msgstr "Moje teksty i pliki pozostają pod moimi prawami autorskimi."
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:540
+#: actions/register.php:520
 msgid "All rights reserved."
 msgstr "Wszystkie prawa zastrzeżone."
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:545
+#: actions/register.php:525
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -5017,7 +5125,7 @@ msgstr ""
 "Tekst i pliki są dostępne na warunkach licencji %s, poza tymi prywatnymi "
 "danymi: hasło, adres e-mail, adres komunikatora i numer telefonu."
 
-#: actions/register.php:588
+#: actions/register.php:566
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -5050,7 +5158,7 @@ msgstr ""
 "Dziękujemy za zarejestrowanie się i mamy nadzieję, że używanie tej usługi "
 "sprawi ci przyjemność."
 
-#: actions/register.php:612
+#: actions/register.php:590
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5084,7 +5192,7 @@ msgstr "Pseudonim użytkownika"
 
 #: actions/remotesubscribe.php:129
 #, fuzzy
-msgid "Nickname of the user you want to follow"
+msgid "Nickname of the user you want to follow."
 msgstr "Pseudonim użytkownika którego chcesz obserwować"
 
 #: actions/remotesubscribe.php:132
@@ -5093,18 +5201,18 @@ msgstr "Adres URL profilu"
 
 #: actions/remotesubscribe.php:133
 #, fuzzy
-msgid "URL of your profile on another compatible microblogging service"
+msgid "URL of your profile on another compatible microblogging service."
 msgstr "Adres URL profilu na innej, zgodnej usłudze mikroblogowania"
 
 #. TRANS: Link text for link that will subscribe to a remote profile.
 #: actions/remotesubscribe.php:136 lib/subscribeform.php:139
-#: lib/userprofile.php:431
+#: lib/userprofile.php:402
 msgid "Subscribe"
 msgstr "Subskrybuj"
 
 #: actions/remotesubscribe.php:158
 #, fuzzy
-msgid "Invalid profile URL (bad format)"
+msgid "Invalid profile URL (bad format)."
 msgstr "Nieprawidłowy adres URL profilu (błędny format)"
 
 #: actions/remotesubscribe.php:167
@@ -5137,7 +5245,7 @@ msgstr "Nie można powtórzyć własnego wpisu."
 msgid "You already repeated that notice."
 msgstr "Już powtórzono ten wpis."
 
-#: actions/repeat.php:112 lib/noticelist.php:692
+#: actions/repeat.php:112 lib/noticelist.php:697
 msgid "Repeated"
 msgstr "Powtórzono"
 
@@ -5145,9 +5253,9 @@ msgstr "Powtórzono"
 msgid "Repeated!"
 msgstr "Powtórzono."
 
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing @-replies.
+#. TRANS: RSS reply feed title. %s is a user nickname.
 #: actions/replies.php:126 actions/repliesrss.php:68
-#: lib/personalgroupnav.php:109
+#: lib/personalgroupnav.php:105
 #, php-format
 msgid "Replies to %s"
 msgstr "Odpowiedzi na %s"
@@ -5199,9 +5307,11 @@ msgstr ""
 "Można spróbować [szturchnąć użytkownika %1$s](../%2$s) lub [wysłać mu coś](%%"
 "%%action.newnotice%%%%?status_textarea=%3$s)."
 
-#: actions/repliesrss.php:72
+#. TRANS: RSS reply feed description.
+#. TRANS: %1$s is a user nickname, %2$s is the StatusNet site name.
+#: actions/repliesrss.php:74
 #, fuzzy, php-format
-msgid "Replies to %1$s on %2$s!"
+msgid "Replies to %1$s on %2$s."
 msgstr "odpowiedzi dla użytkownika %1$s na %2$s."
 
 #. TRANS: Client exception displayed when trying to restore an account while not logged in.
@@ -5301,7 +5411,7 @@ msgstr "Nie można unieważnić rol użytkowników na tej witrynie."
 msgid "User doesn't have this role."
 msgstr "Użytkownik nie ma tej roli."
 
-#: actions/rsd.php:146 actions/version.php:159
+#: actions/rsd.php:142 actions/version.php:159
 msgid "StatusNet"
 msgstr "StatusNet"
 
@@ -5343,87 +5453,38 @@ msgstr "Włącza wyjście debugowania dla sesji."
 msgid "Save site settings"
 msgstr "Zapisz ustawienia witryny"
 
-#: actions/showapplication.php:82
+#: actions/showapplication.php:78
 msgid "You must be logged in to view an application."
 msgstr "Musisz być zalogowany, aby wyświetlić aplikację."
 
-#: actions/showapplication.php:157
+#: actions/showapplication.php:151
 msgid "Application profile"
 msgstr "Profil aplikacji"
 
-#. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:159 lib/applicationeditform.php:177
-msgid "Icon"
-msgstr "Ikona"
-
-#. TRANS: Form input field label for application name.
-#: actions/showapplication.php:169 actions/version.php:197
-#: lib/applicationeditform.php:190
-msgid "Name"
-msgstr "Nazwa"
-
-#. TRANS: Form input field label.
-#: actions/showapplication.php:178 lib/applicationeditform.php:227
-msgid "Organization"
-msgstr "Organizacja"
-
-#. TRANS: Form input field label.
-#: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:168
-msgid "Description"
-msgstr "Opis"
-
-#. TRANS: Header for group statistics on a group page (h2).
-#. TRANS: H2 text for user statistics.
-#: actions/showapplication.php:192 actions/showgroup.php:460
-#: lib/profileaction.php:205
-msgid "Statistics"
-msgstr "Statystyki"
-
-#: actions/showapplication.php:203
+#: actions/showapplication.php:179
 #, php-format
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr "Utworzona przez %1$s - domyślny dostęp: %2$s - %3$d użytkowników"
 
-#: actions/showapplication.php:213
+#: actions/showapplication.php:189
 msgid "Application actions"
 msgstr "Czynności aplikacji"
 
-#: actions/showapplication.php:236
+#: actions/showapplication.php:212
 msgid "Reset key & secret"
 msgstr "Przywrócenie klucza i sekretu"
 
 #. TRANS: Title of form for deleting a user.
-#: actions/showapplication.php:252 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:64 lib/noticelist.php:673
+#: actions/showapplication.php:228 lib/deletegroupform.php:121
+#: lib/deleteuserform.php:64 lib/noticelist.php:678
 msgid "Delete"
 msgstr "Usuń"
 
-#: actions/showapplication.php:261
+#: actions/showapplication.php:237
 msgid "Application info"
 msgstr "Informacje o aplikacji"
 
-#: actions/showapplication.php:263
-msgid "Consumer key"
-msgstr "Klucz klienta"
-
-#: actions/showapplication.php:268
-msgid "Consumer secret"
-msgstr "Sekret klienta"
-
-#: actions/showapplication.php:273
-msgid "Request token URL"
-msgstr "Adres URL tokenu żądania"
-
-#: actions/showapplication.php:278
-msgid "Access token URL"
-msgstr "Adres URL tokenu żądania"
-
-#: actions/showapplication.php:283
-msgid "Authorize URL"
-msgstr "Adres URL upoważnienia"
-
-#: actions/showapplication.php:288
+#: actions/showapplication.php:255
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
@@ -5431,7 +5492,7 @@ msgstr ""
 "Uwaga: obsługiwane są podpisy HMAC-SHA1. Metoda podpisu w zwykłym tekście "
 "nie jest obsługiwana."
 
-#: actions/showapplication.php:309
+#: actions/showapplication.php:275
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr "Jesteś pewien, że chcesz przywrócić klucz i sekret klienta?"
 
@@ -5518,61 +5579,47 @@ msgstr "Grupa %s"
 msgid "%1$s group, page %2$d"
 msgstr "Grupa %1$s, strona %2$d"
 
-#. TRANS: Group profile header (h2). Text hidden by default.
-#: actions/showgroup.php:223
-msgid "Group profile"
-msgstr "Profil grupy"
-
-#. TRANS: Label for group URL (dt). Text hidden by default.
-#. TRANS: DT for URL in a profile.
-#: actions/showgroup.php:273 actions/tagother.php:118
-#: actions/userauthorization.php:175 lib/userprofile.php:186
-msgid "URL"
-msgstr "Adres URL"
-
 #. TRANS: Label for group description or group note (dt). Text hidden by default.
-#. TRANS: DT for note in a profile.
-#: actions/showgroup.php:285 actions/tagother.php:128
-#: actions/userauthorization.php:187 lib/userprofile.php:204
+#: actions/showgroup.php:266
 msgid "Note"
 msgstr "Wpis"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:296 lib/groupeditform.php:180
+#: actions/showgroup.php:277 lib/groupeditform.php:180
 msgid "Aliases"
 msgstr "Aliasy"
 
 #. TRANS: Group actions header (h2). Text hidden by default.
-#: actions/showgroup.php:313
+#: actions/showgroup.php:294
 msgid "Group actions"
 msgstr "Działania grupy"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:357
+#: actions/showgroup.php:338
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
 msgstr "Kanał wpisów dla grupy %s (RSS 1.0)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:364
+#: actions/showgroup.php:345
 #, php-format
 msgid "Notice feed for %s group (RSS 2.0)"
 msgstr "Kanał wpisów dla grupy %s (RSS 2.0)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:371
+#: actions/showgroup.php:352
 #, php-format
 msgid "Notice feed for %s group (Atom)"
 msgstr "Kanał wpisów dla grupy %s (Atom)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:377
+#: actions/showgroup.php:358
 #, php-format
 msgid "FOAF for %s group"
 msgstr "FOAF dla grupy %s"
 
 #. TRANS: Header for mini list of group members on a group page (h2).
-#: actions/showgroup.php:414
+#: actions/showgroup.php:395
 msgid "Members"
 msgstr "Członkowie"
 
@@ -5580,25 +5627,30 @@ msgstr "Członkowie"
 #. TRANS: Text for user subscription statistics if the user has no subscriptions.
 #. TRANS: Text for user subscriber statistics if user has no subscribers.
 #. TRANS: Text for user user group membership statistics if user is not a member of any group.
-#: actions/showgroup.php:420 lib/profileaction.php:137
+#: actions/showgroup.php:401 lib/profileaction.php:137
 #: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
-#: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
+#: lib/subscriptionlist.php:123 lib/tagcloudsection.php:71
 msgid "(None)"
 msgstr "(Brak)"
 
 #. TRANS: Link to all group members from mini list of group members if group has more than n members.
-#: actions/showgroup.php:429
+#: actions/showgroup.php:410
 msgid "All members"
 msgstr "Wszyscy członkowie"
 
-#. TRANS: Label for creation date in statistics on group page.
-#: actions/showgroup.php:465
+#. TRANS: Header for group statistics on a group page (h2).
+#. TRANS: H2 text for user statistics.
+#: actions/showgroup.php:441 lib/profileaction.php:205
+msgid "Statistics"
+msgstr "Statystyki"
+
+#: actions/showgroup.php:444
 msgctxt "LABEL"
 msgid "Created"
 msgstr "Utworzono"
 
 #. TRANS: Label for member count in statistics on group page.
-#: actions/showgroup.php:473
+#: actions/showgroup.php:449
 msgctxt "LABEL"
 msgid "Members"
 msgstr "Członkowie"
@@ -5607,7 +5659,7 @@ msgstr "Członkowie"
 #. TRANS: **%s** is the group alias, %%%%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).
-#: actions/showgroup.php:488
+#: actions/showgroup.php:464
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5626,7 +5678,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: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
-#: actions/showgroup.php:498
+#: actions/showgroup.php:474
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5640,7 +5692,7 @@ msgstr ""
 "krótkimi wiadomościami o swoim życiu i zainteresowaniach. "
 
 #. TRANS: Header for list of group administrators on a group page (h2).
-#: actions/showgroup.php:527
+#: actions/showgroup.php:503
 msgid "Admins"
 msgstr "Administratorzy"
 
@@ -5679,7 +5731,7 @@ msgid "%1$s tagged %2$s"
 msgstr "%1$s nadał etykietę %2$s"
 
 #. TRANS: Page title showing tagged notices in one user's stream.
-#. TRANS: %1$s is the username, %2$s is the hash tag, %1$d is the page number.
+#. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
 #: actions/showstream.php:74
 #, php-format
 msgid "%1$s tagged %2$s, page %3$d"
@@ -5726,14 +5778,14 @@ msgid "FOAF for %s"
 msgstr "FOAF dla %s"
 
 #. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
-#: actions/showstream.php:211
+#: actions/showstream.php:205
 #, php-format
 msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr ""
 "To jest oś czasu dla użytkownika %1$s, ale %1$s nie nic jeszcze nie wysłał."
 
 #. TRANS: Second sentence of empty list message for a stream for the user themselves.
-#: actions/showstream.php:217
+#: actions/showstream.php:211
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
@@ -5743,7 +5795,7 @@ msgstr ""
 
 #. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:221
+#: actions/showstream.php:215
 #, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
@@ -5754,7 +5806,7 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:264
+#: actions/showstream.php:258
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5770,7 +5822,7 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:271
+#: actions/showstream.php:265
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5782,7 +5834,7 @@ msgstr ""
 "(http://status.net/). "
 
 #. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
-#: actions/showstream.php:328
+#: actions/showstream.php:322
 #, php-format
 msgid "Repeat of %s"
 msgstr "Powtórzenia %s"
@@ -5930,75 +5982,75 @@ msgstr ""
 #. TRANS: Title for button to save site notice in admin panel.
 #: actions/sitenoticeadminpanel.php:201
 #, fuzzy
-msgid "Save site notice"
+msgid "Save site notice."
 msgstr "Zapisz wpis witryny"
 
 #. TRANS: Title for SMS settings.
-#: actions/smssettings.php:57
+#: actions/smssettings.php:56
 msgid "SMS settings"
 msgstr "Ustawienia SMS"
 
 #. TRANS: SMS settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/smssettings.php:71
+#: actions/smssettings.php:70
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr "Można otrzymywać wiadomości SMS przez e-mail od %%site.name%%."
 
 #. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
-#: actions/smssettings.php:93
+#: actions/smssettings.php:92
 msgid "SMS is not available."
 msgstr "Wiadomości SMS nie są dostępne."
 
 #. TRANS: Form legend for SMS settings form.
-#: actions/smssettings.php:107
+#: actions/smssettings.php:106
 msgid "SMS address"
 msgstr "Adres SMS"
 
 #. TRANS: Form guide in SMS settings form.
-#: actions/smssettings.php:116
+#: actions/smssettings.php:115
 msgid "Current confirmed SMS-enabled phone number."
 msgstr "Obecnie potwierdzone numery telefonów z włączoną usługą SMS."
 
 #. TRANS: Form guide in IM settings form.
-#: actions/smssettings.php:129
+#: actions/smssettings.php:128
 msgid "Awaiting confirmation on this phone number."
 msgstr "Oczekiwanie na potwierdzenie tego numeru telefonu."
 
 #. TRANS: Field label for SMS address input in SMS settings form.
-#: actions/smssettings.php:138
+#: actions/smssettings.php:137
 msgid "Confirmation code"
 msgstr "Kod potwierdzający"
 
 #. TRANS: Form field instructions in SMS settings form.
-#: actions/smssettings.php:140
+#: actions/smssettings.php:139
 msgid "Enter the code you received on your phone."
 msgstr "Podaj kod, który otrzymałeś na telefonie."
 
 #. TRANS: Button label to confirm SMS confirmation code in SMS settings.
-#: actions/smssettings.php:144
+#: actions/smssettings.php:143
 msgctxt "BUTTON"
 msgid "Confirm"
 msgstr "Potwierdź"
 
 #. TRANS: Field label for SMS phone number input in SMS settings form.
-#: actions/smssettings.php:149
+#: actions/smssettings.php:148
 msgid "SMS phone number"
 msgstr "Numer telefonu SMS"
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
-#: actions/smssettings.php:152
+#: actions/smssettings.php:151
 #, fuzzy
-msgid "Phone number, no punctuation or spaces, with area code"
+msgid "Phone number, no punctuation or spaces, with area code."
 msgstr "Numer telefonu, bez znaków przestankowych i spacji, z kodem państwa"
 
 #. TRANS: Form legend for SMS preferences form.
-#: actions/smssettings.php:191
+#: actions/smssettings.php:190
 msgid "SMS preferences"
 msgstr "Preferencje SMS"
 
 #. TRANS: Checkbox label in SMS preferences form.
-#: actions/smssettings.php:197
+#: actions/smssettings.php:196
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
@@ -6007,32 +6059,32 @@ msgstr ""
 "swojego operatora."
 
 #. TRANS: Confirmation message for successful SMS preferences save.
-#: actions/smssettings.php:308
+#: actions/smssettings.php:307
 msgid "SMS preferences saved."
 msgstr "Zapisano preferencje SMS."
 
 #. TRANS: Message given saving SMS phone number without having provided one.
-#: actions/smssettings.php:330
+#: actions/smssettings.php:329
 msgid "No phone number."
 msgstr "Brak numeru telefonu."
 
 #. TRANS: Message given saving SMS phone number without having selected a carrier.
-#: actions/smssettings.php:336
+#: actions/smssettings.php:335
 msgid "No carrier selected."
 msgstr "Nie wybrano operatora."
 
 #. TRANS: Message given saving SMS phone number that is already set.
-#: actions/smssettings.php:344
+#: actions/smssettings.php:343
 msgid "That is already your phone number."
 msgstr "Ten numer telefonu jest już twój."
 
 #. TRANS: Message given saving SMS phone number that is already set for another user.
-#: actions/smssettings.php:348
+#: actions/smssettings.php:347
 msgid "That phone number already belongs to another user."
 msgstr "Ten numer telefonu należy już do innego użytkownika."
 
 #. TRANS: Message given saving valid SMS phone number that is to be confirmed.
-#: actions/smssettings.php:376
+#: actions/smssettings.php:375
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
 "for the code and instructions on how to use it."
@@ -6041,39 +6093,39 @@ msgstr ""
 "czy otrzymałeś kod i instrukcje jak go użyć."
 
 #. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
-#: actions/smssettings.php:404
+#: actions/smssettings.php:403
 msgid "That is the wrong confirmation number."
 msgstr "To jest błędny numer potwierdzenia."
 
 #. TRANS: Message given after successfully canceling SMS phone number confirmation.
-#: actions/smssettings.php:418
+#: actions/smssettings.php:417
 msgid "SMS confirmation cancelled."
 msgstr "Anulowano potwierdzenie SMS."
 
 #. TRANS: Message given trying to remove an SMS phone number that is not
 #. TRANS: registered for the active user.
-#: actions/smssettings.php:438
+#: actions/smssettings.php:437
 msgid "That is not your phone number."
 msgstr "To nie jest twój numer telefonu."
 
 #. TRANS: Message given after successfully removing a registered SMS phone number.
-#: actions/smssettings.php:460
+#: actions/smssettings.php:459
 msgid "The SMS phone number was removed."
 msgstr "Numer telefonu SMS został usunięty."
 
 #. TRANS: Label for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:499
+#: actions/smssettings.php:498
 msgid "Mobile carrier"
 msgstr "Operator komórkowy"
 
 #. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:504
+#: actions/smssettings.php:503
 msgid "Select a carrier"
 msgstr "Wybierz operatora"
 
 #. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
 #. TRANS: %s is an administrative contact's e-mail address.
-#: actions/smssettings.php:513
+#: actions/smssettings.php:512
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -6084,7 +6136,7 @@ msgstr ""
 "e-mail na %s (w języku angielskim), aby nam o tym powiedzieć."
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
-#: actions/smssettings.php:535
+#: actions/smssettings.php:534
 #, fuzzy
 msgid "No code entered."
 msgstr "Nie podano kodu"
@@ -6158,17 +6210,15 @@ msgstr "Nie jesteś subskrybowany do tego profilu."
 msgid "Could not save subscription."
 msgstr "Nie można zapisać subskrypcji."
 
-#: actions/subscribe.php:77
-msgid "This action only accepts POST requests."
-msgstr "Ta czynność przyjmuje tylko żądania POST."
-
-#: actions/subscribe.php:117
+#. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
+#: actions/subscribe.php:121
 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
 msgstr ""
 "Nie można subskrybować zdalnego profilu profilu OMB 0.1 za pomocą tej "
 "czynności."
 
-#: actions/subscribe.php:145
+#. TRANS: Page title when subscription succeeded.
+#: actions/subscribe.php:149
 msgid "Subscribed"
 msgstr "Subskrybowano"
 
@@ -6285,31 +6335,34 @@ msgid "Subscription feed for %s (Atom)"
 msgstr "Kanał subskrypcji dla %s (Atom)"
 
 #. TRANS: Checkbox label for enabling Jabber messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:239
-msgid "Jabber"
-msgstr "Jabber"
+#: actions/subscriptions.php:241 lib/settingsnav.php:110
+#, fuzzy
+msgid "IM"
+msgstr "Komunikator"
 
 #. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:254
+#: actions/subscriptions.php:256 lib/settingsnav.php:117
 msgid "SMS"
 msgstr "SMS"
 
-#: actions/tag.php:69
+#. TRANS: Title for all but the first page of notices with tags.
+#. TRANS: %1$s is the tag, %2$d is the page number.
+#: actions/tag.php:73
 #, php-format
 msgid "Notices tagged with %1$s, page %2$d"
 msgstr "Wpisy ze znacznikiem %1$s, strona %2$d"
 
-#: actions/tag.php:87
+#: actions/tag.php:91
 #, php-format
 msgid "Notice feed for tag %s (RSS 1.0)"
 msgstr "Kanał wpisów dla znacznika %s (RSS 1.0)"
 
-#: actions/tag.php:93
+#: actions/tag.php:97
 #, php-format
 msgid "Notice feed for tag %s (RSS 2.0)"
 msgstr "Kanał wpisów dla znacznika %s (RSS 2.0)"
 
-#: actions/tag.php:99
+#: actions/tag.php:103
 #, php-format
 msgid "Notice feed for tag %s (Atom)"
 msgstr "Kanał wpisów dla znacznika %s (Atom)"
@@ -6328,17 +6381,11 @@ msgstr "Znacznik %s"
 msgid "User profile"
 msgstr "Profil użytkownika"
 
-#. TRANS: DT element in area for user avatar.
-#: actions/tagother.php:81 actions/userauthorization.php:132
-#: lib/userprofile.php:108
-msgid "Photo"
-msgstr "Zdjęcie"
-
-#: actions/tagother.php:141
+#: actions/tagother.php:120
 msgid "Tag user"
 msgstr "Znacznik użytkownika"
 
-#: actions/tagother.php:151
+#: actions/tagother.php:130
 msgid ""
 "Tags for this user (letters, numbers, -, ., and _), comma- or space- "
 "separated"
@@ -6346,14 +6393,19 @@ msgstr ""
 "Znaczniki dla tego użytkownika (litery, liczby, -, . i _), oddzielone "
 "przecinkami lub spacjami"
 
-#: actions/tagother.php:193
+#: actions/tagother.php:157
+#, php-format
+msgid "Invalid tag: \"%s\""
+msgstr "Nieprawidłowy znacznik: \"%s\""
+
+#: actions/tagother.php:172
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 "Można nadawać znaczniki tylko osobom, których subskrybujesz lub którzy "
 "subskrybują ciebie."
 
-#: actions/tagother.php:236
+#: actions/tagother.php:215
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
 "Użyj tego formularza, aby dodać znaczniki subskrybentom lub subskrypcjom."
@@ -6362,6 +6414,7 @@ msgstr ""
 msgid "No such tag."
 msgstr "Nie ma takiego znacznika."
 
+#. TRANS: Client error displayed when trying to unblock a non-blocked user.
 #: actions/unblock.php:59
 msgid "You haven't blocked that user."
 msgstr "Ten użytkownik nie został zablokowany."
@@ -6382,7 +6435,7 @@ msgstr "Brak identyfikatora profilu w żądaniu."
 msgid "Unsubscribed"
 msgstr "Zrezygnowano z subskrypcji"
 
-#: actions/updateprofile.php:64 actions/userauthorization.php:337
+#: actions/updateprofile.php:64
 #, php-format
 msgid ""
 "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
@@ -6390,6 +6443,77 @@ msgstr ""
 "Licencja nasłuchiwanego strumienia \"%1$s\" nie jest zgodna z licencją "
 "witryny \"%2$s\"."
 
+#: actions/urlsettings.php:60
+#, fuzzy
+msgid "URL settings"
+msgstr "Ustawienia komunikatora"
+
+#. TRANS: Instructions for tab "Other" in user profile settings.
+#: actions/urlsettings.php:72
+msgid "Manage various other options."
+msgstr "Zarządzaj różnymi innymi opcjami."
+
+#. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
+#. TRANS: user's profile settings. This message has one space at the beginning. Use your
+#. TRANS: language's word separator here if it has one (most likely a single space).
+#: actions/urlsettings.php:115
+msgid " (free service)"
+msgstr " (wolna usługa)"
+
+#: actions/urlsettings.php:121
+#, fuzzy
+msgid "[none]"
+msgstr "Brak"
+
+#: actions/urlsettings.php:122
+msgid "[internal]"
+msgstr ""
+
+#. TRANS: Label for dropdown with URL shortener services.
+#: actions/urlsettings.php:130
+msgid "Shorten URLs with"
+msgstr "Skracanie adresów URL za pomocą"
+
+#. TRANS: Tooltip for for dropdown with URL shortener services.
+#: actions/urlsettings.php:132
+msgid "Automatic shortening service to use."
+msgstr "Używana automatyczna usługa skracania."
+
+#: actions/urlsettings.php:138
+msgid "URL longer than"
+msgstr ""
+
+#: actions/urlsettings.php:141
+msgid "URLs longer than this will be shortened, 0 means always shorten."
+msgstr ""
+
+#: actions/urlsettings.php:145
+msgid "Text longer than"
+msgstr ""
+
+#: actions/urlsettings.php:148
+msgid ""
+"URLs in notices longer than this will be shortened, 0 means always shorten."
+msgstr ""
+
+#. TRANS: Form validation error for form "Other settings" in user profile.
+#: actions/urlsettings.php:180
+msgid "URL shortening service is too long (maximum 50 characters)."
+msgstr "Adres URL usługi skracania jest za długi (maksymalnie 50 znaków)."
+
+#: actions/urlsettings.php:187
+msgid "Invalid number for max url length."
+msgstr ""
+
+#: actions/urlsettings.php:193
+#, fuzzy
+msgid "Invalid number for max notice length."
+msgstr "Nieprawidłowa treść wpisu."
+
+#: actions/urlsettings.php:238
+msgid "Error saving user URL shortening preferences."
+msgstr ""
+
 #. TRANS: User admin panel title
 #: actions/useradminpanel.php:58
 msgctxt "TITLE"
@@ -6415,11 +6539,11 @@ msgstr "Nieprawidłowy tekst powitania. Maksymalna długość to 255 znaków."
 #. TRANS: users in user admin panel. %1$s is the invalid nickname.
 #: actions/useradminpanel.php:166
 #, fuzzy, php-format
-msgid "Invalid default subscripton: '%1$s' is not a user."
+msgid "Invalid default subscripton: \"%1$s\" is not a user."
 msgstr "Nieprawidłowa domyślna subskrypcja: \"%1$s\" nie jest użytkownikiem."
 
-#. TRANS: Link description in user account settings menu.
-#: actions/useradminpanel.php:215 lib/accountsettingsaction.php:106
+#: actions/useradminpanel.php:215 lib/action.php:565 lib/settingsnav.php:77
+#: lib/subgroupnav.php:81
 msgid "Profile"
 msgstr "Profil"
 
@@ -6476,59 +6600,63 @@ msgstr "Czy zezwolić użytkownikom zapraszanie nowych użytkowników."
 #. TRANS: Title for button to save user settings in user admin panel.
 #: actions/useradminpanel.php:302
 #, fuzzy
-msgid "Save user settings"
+msgid "Save user settings."
 msgstr "Zapisz ustawienia użytkownika"
 
-#: actions/userauthorization.php:105
+#. TRANS: Page title.
+#: actions/userauthorization.php:109
 msgid "Authorize subscription"
 msgstr "Upoważnij subskrypcję"
 
-#: actions/userauthorization.php:110
+#. TRANS: Page notice on "Auhtorize subscription" page.
+#: actions/userauthorization.php:115
 #, fuzzy
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
 "user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
-"click “Reject”."
+"click \"Reject\"."
 msgstr ""
 "Sprawdź te szczegóły, aby upewnić się, czy na pewno chcesz subskrybować "
 "wpisy tego użytkownika. Jeżeli nie prosiłeś o subskrypcję czyichś wpisów, "
 "naciśnij \"Odrzuć\"."
 
-#. TRANS: Menu item for site administration
-#: actions/userauthorization.php:196 actions/version.php:167
-#: lib/adminpanelaction.php:403
-msgid "License"
-msgstr "Licencja"
-
-#: actions/userauthorization.php:217
+#. TRANS: Button text on Authorise Subscription page.
+#: actions/userauthorization.php:200
 #, fuzzy
+msgctxt "BUTTON"
 msgid "Accept"
 msgstr "Zaakceptuj"
 
-#: actions/userauthorization.php:218 lib/subscribeform.php:115
-#: lib/subscribeform.php:139
-msgid "Subscribe to this user"
+#. TRANS: Title for button on Authorise Subscription page.
+#: actions/userauthorization.php:202
+#, fuzzy
+msgid "Subscribe to this user."
 msgstr "Subskrybuj tego użytkownika"
 
-#: actions/userauthorization.php:219
+#. TRANS: Button text on Authorise Subscription page.
+#: actions/userauthorization.php:204
 #, fuzzy
+msgctxt "BUTTON"
 msgid "Reject"
 msgstr "Odrzuć"
 
-#: actions/userauthorization.php:220
+#. TRANS: Title for button on Authorise Subscription page.
+#: actions/userauthorization.php:206
 #, fuzzy
-msgid "Reject this subscription"
+msgid "Reject this subscription."
 msgstr "Odrzuć tę subskrypcję"
 
-#: actions/userauthorization.php:232
+#. TRANS: Client error displayed for an empty authorisation request.
+#: actions/userauthorization.php:219
 msgid "No authorization request!"
 msgstr "Brak żądania upoważnienia."
 
-#: actions/userauthorization.php:254
+#. TRANS: Accept message header from Authorise subscription page.
+#: actions/userauthorization.php:242
 msgid "Subscription authorized"
 msgstr "Upoważniono subskrypcję"
 
-#: actions/userauthorization.php:256
+#: actions/userauthorization.php:245
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to authorize the "
@@ -6537,11 +6665,12 @@ msgstr ""
 "Subskrypcja została upoważniona, ale nie przekazano zwrotnego adresu URL. "
 "Sprawdź w instrukcjach witryny, jak upoważnić subskrypcję. Token subskrypcji:"
 
-#: actions/userauthorization.php:266
+#. TRANS: Reject message header from Authorise subscription page.
+#: actions/userauthorization.php:256
 msgid "Subscription rejected"
 msgstr "Odrzucono subskrypcję"
 
-#: actions/userauthorization.php:268
+#: actions/userauthorization.php:259
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to fully reject the "
@@ -6550,58 +6679,101 @@ msgstr ""
 "Subskrypcja została odrzucona, ale nie przekazano zwrotnego adresu URL. "
 "Sprawdź w instrukcjach witryny, jak w pełni odrzucić subskrypcję."
 
-#: actions/userauthorization.php:303
+#. TRANS: Exception thrown when no valid user is found for an authorisation request.
+#. TRANS: %s is a listener URI.
+#: actions/userauthorization.php:296
 #, fuzzy, php-format
-msgid "Listener URI ‘%s’ not found here."
+msgid "Listener URI \"%s\" not found here."
 msgstr "Adres URI nasłuchującego \"%s\" nie został tutaj odnaleziony."
 
-#: actions/userauthorization.php:308
+#. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
+#. TRANS: %s is a listenee URI.
+#: actions/userauthorization.php:303
 #, fuzzy, php-format
-msgid "Listenee URI ‘%s’ is too long."
+msgid "Listenee URI \"%s\" is too long."
 msgstr "Adres URI nasłuchującego \"%s\" jest za długi."
 
-#: actions/userauthorization.php:314
+#. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
+#. TRANS: %s is a listenee URI.
+#: actions/userauthorization.php:311
 #, fuzzy, php-format
-msgid "Listenee URI ‘%s’ is a local user."
+msgid "Listenee URI \"%s\" is a local user."
 msgstr "Adres URI nasłuchującego \"%s\" jest lokalnym użytkownikiem."
 
+#. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
+#. TRANS: %s is a profile URL.
 #: actions/userauthorization.php:329
 #, fuzzy, php-format
-msgid "Profile URL ‘%s’ is for a local user."
+msgid "Profile URL \"%s\" is for a local user."
 msgstr "Adres URL profilu \"%s\" jest dla lokalnego użytkownika."
 
-#: actions/userauthorization.php:345
+#. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
+#. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
+#: actions/userauthorization.php:339
 #, fuzzy, php-format
-msgid "Avatar URL ‘%s’ is not valid."
+msgid ""
+"Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
+"\"."
+msgstr ""
+"Licencja nasłuchiwanego strumienia \"%1$s\" nie jest zgodna z licencją "
+"witryny \"%2$s\"."
+
+#. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
+#. TRANS: %s is an avatar URL.
+#: actions/userauthorization.php:349
+#, fuzzy, php-format
+msgid "Avatar URL \"%s\" is not valid."
 msgstr "Adres URL \"%s\" jest nieprawidłowy."
 
-#: actions/userauthorization.php:350
+#. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
+#. TRANS: %s is an avatar URL.
+#: actions/userauthorization.php:356
 #, fuzzy, php-format
-msgid "Can’t read avatar URL ‘%s’."
+msgid "Cannot read avatar URL \"%s\"."
 msgstr "Nie można odczytać adresu URL awatara \"%s\"."
 
-#: actions/userauthorization.php:355
+#. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
+#. TRANS: %s is an avatar URL.
+#: actions/userauthorization.php:363
 #, fuzzy, php-format
-msgid "Wrong image type for avatar URL ‘%s’."
+msgid "Wrong image type for avatar URL \"%s\"."
 msgstr "Błędny typ obrazu dla adresu URL awatara \"%s\"."
 
 #. TRANS: Page title for profile design page.
-#: actions/userdesignsettings.php:74 lib/designsettings.php:63
+#: actions/userdesignsettings.php:74 lib/designsettings.php:61
 msgid "Profile design"
 msgstr "Wygląd profilu"
 
 #. TRANS: Instructions for profile design page.
-#: actions/userdesignsettings.php:84 lib/designsettings.php:74
+#: actions/userdesignsettings.php:84 lib/designsettings.php:72
 msgid ""
 "Customize the way your profile looks with a background image and a colour "
 "palette of your choice."
 msgstr ""
 "Dostosuj wygląd profilu za pomocą wybranego obrazu tła i palety kolorów."
 
-#: actions/userdesignsettings.php:272
+#: actions/userdesignsettings.php:289
 msgid "Enjoy your hotdog!"
 msgstr "Smacznego hot-doga."
 
+#: actions/userdesignsettings.php:325
+#, fuzzy
+msgid "Design settings"
+msgstr "Zapisz ustawienia witryny"
+
+#: actions/userdesignsettings.php:340
+msgid "View profile designs"
+msgstr "Wyświetl ustawienia wyglądu profilu"
+
+#: actions/userdesignsettings.php:341
+msgid "Show or hide profile designs."
+msgstr "Wyświetl lub ukryj ustawienia wyglądu profilu."
+
+#: actions/userdesignsettings.php:348
+#, fuzzy
+msgid "Background file"
+msgstr "Tło"
+
 #. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number.
 #: actions/usergroups.php:66
 #, php-format
@@ -6651,6 +6823,11 @@ msgstr ""
 msgid "Contributors"
 msgstr "Współtwórcy"
 
+#. TRANS: Menu item for site administration
+#: actions/version.php:167 lib/adminpanelaction.php:403
+msgid "License"
+msgstr "Licencja"
+
 #: actions/version.php:170
 msgid ""
 "StatusNet is free software: you can redistribute it and/or modify it under "
@@ -6686,12 +6863,13 @@ msgstr ""
 "Powszechnej Licencji Publicznej Affero GNU (GNU Affero General Public "
 "License); jeśli nie - proszę odwiedzić stronę internetową %s."
 
-#: actions/version.php:191
-msgid "Plugins"
-msgstr "Wtyczki"
+#. TRANS: Form input field label for application name.
+#: actions/version.php:197 lib/applicationeditform.php:190
+msgid "Name"
+msgstr "Nazwa"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:901
+#: actions/version.php:198 lib/action.php:885
 msgid "Version"
 msgstr "Wersja"
 
@@ -6699,6 +6877,12 @@ msgstr "Wersja"
 msgid "Author(s)"
 msgstr "Autorzy"
 
+#. TRANS: Form input field label.
+#: actions/version.php:200 lib/applicationeditform.php:208
+#: lib/groupeditform.php:168
+msgid "Description"
+msgstr "Opis"
+
 #. TRANS: Activity title when marking a notice as favorite.
 #: classes/Fave.php:164
 msgid "Favor"
@@ -6831,7 +7015,7 @@ msgid "Could not create login token for %s"
 msgstr "Nie można utworzyć tokenów loginów dla %s"
 
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
-#: classes/Memcached_DataObject.php:542
+#: classes/Memcached_DataObject.php:556
 msgid "No database name or DSN found anywhere."
 msgstr "Nigdzie nie odnaleziono nazwy lub DSN bazy danych."
 
@@ -7006,19 +7190,19 @@ msgstr "Użytkownik %1$s obserwuje teraz %2$s."
 
 #. TRANS: Notice given on user registration.
 #. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:395
+#: classes/User.php:390
 #, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr "Witaj w %1$s, @%2$s."
 
 #. TRANS: Server exception.
-#: classes/User.php:918
+#: classes/User.php:923
 msgid "No single user defined for single-user mode."
 msgstr ""
 "Nie określono pojedynczego użytkownika dla trybu pojedynczego użytkownika."
 
 #. TRANS: Server exception.
-#: classes/User.php:922
+#: classes/User.php:927
 msgid "Single-user mode code called when not enabled."
 msgstr "Wywołano kod pojedynczego użytkownika, kiedy nie był włączony."
 
@@ -7063,41 +7247,6 @@ msgstr "Nie można odnaleźć XRD dla %s."
 msgid "No AtomPub API service for %s."
 msgstr "Brak API usługi AtomPub dla %s."
 
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:104
-msgid "Change your profile settings"
-msgstr "Zmień ustawienia profilu"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:111
-msgid "Upload an avatar"
-msgstr "Wyślij awatar"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:118
-msgid "Change your password"
-msgstr "Zmień hasło"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:125
-msgid "Change email handling"
-msgstr "Zmień obsługę adresu e-mail"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:132
-msgid "Design your profile"
-msgstr "Wygląd profilu"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:139
-msgid "Other options"
-msgstr "Inne opcje"
-
-#. TRANS: Link description in user account settings menu.
-#: lib/accountsettingsaction.php:141
-msgid "Other"
-msgstr "Inne"
-
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
 #: lib/action.php:161
 #, php-format
@@ -7115,206 +7264,128 @@ msgctxt "TOOLTIP"
 msgid "Show more"
 msgstr "Wyświetl więcej"
 
-#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:544
-msgid "Primary site navigation"
-msgstr "Główna nawigacja witryny"
+#. TRANS: Inline reply form submit button: submits a reply comment.
+#: lib/action.php:328
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Comment"
+msgstr "Treść"
 
-#. TRANS: Tooltip for main menu option "Personal".
-#: lib/action.php:550
-msgctxt "TOOLTIP"
-msgid "Personal profile and friends timeline"
-msgstr "Profil osobisty i oś czasu przyjaciół"
+#. TRANS: Placeholder text for inline reply form. Clicking in this box will turn it into a mini notice form.
+#: lib/action.php:331
+msgid "Add a comment..."
+msgstr ""
 
-#. TRANS: Main menu option when logged in for access to personal profile and friends timeline.
-#. TRANS: Personal group navigation menu option when logged in for viewing timeline of self and friends.
-#: lib/action.php:553 lib/personalgroupnav.php:100
-msgctxt "MENU"
-msgid "Personal"
-msgstr "Osobiste"
+#: lib/action.php:559 lib/personalgroupnav.php:99
+#, fuzzy
+msgid "Home"
+msgstr "Strona domowa"
 
-#. TRANS: Tooltip for main menu option "Account".
-#: lib/action.php:555
-msgctxt "TOOLTIP"
-msgid "Change your email, avatar, password, profile"
-msgstr "Zmień adres e-mail, awatar, hasło, profil"
-
-#. TRANS: Main menu option when logged in for access to user settings.
-#: lib/action.php:558
-msgid "Account"
-msgstr "Konto"
-
-#. TRANS: Tooltip for main menu option "Services".
 #: lib/action.php:560
-msgctxt "TOOLTIP"
-msgid "Connect to services"
-msgstr "Połącz z serwisami"
+#, fuzzy
+msgid "Friends timeline"
+msgstr "Oś czasu użytkownika %s"
 
-#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services.
-#: lib/action.php:563
-msgid "Connect"
-msgstr "Połącz"
-
-#. TRANS: Tooltip for menu option "Admin".
 #: lib/action.php:566
-msgctxt "TOOLTIP"
-msgid "Change site configuration"
-msgstr "Zmień konfigurację witryny"
+#, fuzzy
+msgid "Your profile"
+msgstr "Profil grupy"
 
-#. TRANS: Main menu option when logged in and site admin for access to site configuration.
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/action.php:569 lib/groupnav.php:117
-msgctxt "MENU"
-msgid "Admin"
-msgstr "Administrator"
+#: lib/action.php:570 lib/action.php:593 lib/publicgroupnav.php:78
+msgid "Public"
+msgstr "Publiczny"
 
-#. TRANS: Tooltip for main menu option "Invite".
-#: lib/action.php:573
-#, php-format
-msgctxt "TOOLTIP"
-msgid "Invite friends and colleagues to join you on %s"
-msgstr "Zaproś przyjaciół i kolegów do dołączenia do ciebie na %s"
+#: lib/action.php:571 lib/action.php:594
+#, fuzzy
+msgid "Everyone on this site"
+msgstr "Znajdź osoby na tej witrynie"
+
+#: lib/action.php:575
+#, fuzzy
+msgid "Settings"
+msgstr "Ustawienia SMS"
 
-#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users.
 #: lib/action.php:576
-msgctxt "MENU"
-msgid "Invite"
-msgstr "Zaproś"
+#, fuzzy
+msgid "Change your personal settings"
+msgstr "Zmień ustawienia profilu"
 
-#. TRANS: Tooltip for main menu option "Logout"
 #: lib/action.php:582
-msgctxt "TOOLTIP"
-msgid "Logout from the site"
-msgstr "Wyloguj się z witryny"
+#, fuzzy
+msgid "Site configuration"
+msgstr "Konfiguracja użytkownika"
 
-#. TRANS: Main menu option when logged in to log out the current user.
-#: lib/action.php:585
-msgctxt "MENU"
+#: lib/action.php:587
+#, fuzzy
 msgid "Logout"
 msgstr "Wyloguj się"
 
-#. TRANS: Tooltip for main menu option "Register".
-#: lib/action.php:590
-msgctxt "TOOLTIP"
-msgid "Create an account"
-msgstr "Utwórz konto"
+#: lib/action.php:588
+#, fuzzy
+msgid "Logout from the site"
+msgstr "Wyloguj się z witryny"
 
-#. TRANS: Main menu option when not logged in to register a new account.
-#. TRANS: Menu item for registering with the StatusNet site.
-#: lib/action.php:593 lib/logingroupnav.php:85
-msgctxt "MENU"
-msgid "Register"
-msgstr "Zarejestruj się"
-
-#. TRANS: Tooltip for main menu option "Login".
-#: lib/action.php:596
-msgctxt "TOOLTIP"
+#: lib/action.php:599
+#, fuzzy
 msgid "Login to the site"
 msgstr "Zaloguj się na witrynie"
 
-#. TRANS: Main menu option when not logged in to log in.
-#. TRANS: Menu item for logging in to the StatusNet site.
-#: lib/action.php:599 lib/logingroupnav.php:77
-msgctxt "MENU"
-msgid "Login"
-msgstr "Zaloguj się"
-
-#. TRANS: Tooltip for main menu option "Help".
-#: lib/action.php:602
-msgctxt "TOOLTIP"
-msgid "Help me!"
-msgstr "Pomóż mi."
-
-#. TRANS: Main menu option for help on the StatusNet site.
-#: lib/action.php:605
-msgctxt "MENU"
-msgid "Help"
-msgstr "Pomoc"
-
-#. TRANS: Tooltip for main menu option "Search".
-#: lib/action.php:608
-msgctxt "TOOLTIP"
-msgid "Search for people or text"
-msgstr "Wyszukaj osoby lub tekst"
-
-#. TRANS: Main menu option when logged in or when the StatusNet instance is not private.
-#: lib/action.php:611
-msgctxt "MENU"
+#: lib/action.php:606
+#, fuzzy
 msgid "Search"
 msgstr "Wyszukaj"
 
-#. TRANS: DT element for site notice. String is hidden in default CSS.
-#. TRANS: Menu item for site administration
-#: lib/action.php:633 lib/adminpanelaction.php:387
-msgid "Site notice"
-msgstr "Wpis witryny"
-
-#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:700
-msgid "Local views"
-msgstr "Lokalne widoki"
-
-#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:770
-msgid "Page notice"
-msgstr "Wpis strony"
-
-#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:874
-msgid "Secondary site navigation"
-msgstr "Druga nawigacja witryny"
+#: lib/action.php:607
+#, fuzzy
+msgid "Search the site"
+msgstr "Przeszukaj witrynę"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:880
+#: lib/action.php:864
 msgid "Help"
 msgstr "Pomoc"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:883
+#: lib/action.php:867
 msgid "About"
 msgstr "O usłudze"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:886
+#: lib/action.php:870
 msgid "FAQ"
 msgstr "FAQ"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:891
+#: lib/action.php:875
 msgid "TOS"
 msgstr "TOS"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:895
+#: lib/action.php:879
 msgid "Privacy"
 msgstr "Prywatność"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:898
+#: lib/action.php:882
 msgid "Source"
 msgstr "Kod źródłowy"
 
 #. TRANS: Secondary navigation menu option leading to e-mail contact information on the
 #. TRANS: StatusNet site, where to report bugs, ...
-#: lib/action.php:905
+#: lib/action.php:889
 msgid "Contact"
 msgstr "Kontakt"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:908
+#: lib/action.php:892
 msgid "Badge"
 msgstr "Odznaka"
 
-#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:937
-msgid "StatusNet software license"
-msgstr "Licencja oprogramowania StatusNet"
-
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:944
+#: lib/action.php:921
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7324,7 +7395,7 @@ msgstr ""
 "broughtby%%](%%site.broughtbyurl%%)."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:947
+#: lib/action.php:924
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** jest usługą mikroblogowania."
@@ -7333,7 +7404,7 @@ msgstr "**%%site.name%%** jest usługą mikroblogowania."
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:954
+#: lib/action.php:931
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7344,21 +7415,16 @@ msgstr ""
 "status.net/) w wersji %s, dostępnego na [Powszechnej Licencji Publicznej GNU "
 "Affero](http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
 
-#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:970
-msgid "Site content license"
-msgstr "Licencja zawartości witryny"
-
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:977
+#: lib/action.php:949
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr "Treść i dane %1$s są prywatne i poufne."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:984
+#: lib/action.php:956
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
@@ -7366,7 +7432,7 @@ msgstr ""
 "zastrzeżone."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:988
+#: lib/action.php:960
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 "Prawa autorskie do treści i danych są własnością współtwórców. Wszystkie "
@@ -7374,27 +7440,22 @@ msgstr ""
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:1020
+#: lib/action.php:992
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
 "Wszystkie treści i dane na stronie %1$s są dostępne na warunkach licencji %2"
 "$s."
 
-#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1356
-msgid "Pagination"
-msgstr "Paginacja"
-
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1367
+#: lib/action.php:1335
 msgid "After"
 msgstr "Później"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1377
+#: lib/action.php:1345
 msgid "Before"
 msgstr "Wcześniej"
 
@@ -7546,7 +7607,7 @@ msgid "User configuration"
 msgstr "Konfiguracja użytkownika"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:122
+#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:110
 msgid "User"
 msgstr "Użytkownik"
 
@@ -7570,6 +7631,11 @@ msgstr "Konfiguracja sesji"
 msgid "Edit site notice"
 msgstr "Zmodyfikuj wpis witryny"
 
+#. TRANS: Menu item for site administration
+#: lib/adminpanelaction.php:387
+msgid "Site notice"
+msgstr "Wpis witryny"
+
 #. TRANS: Menu item title/tooltip
 #: lib/adminpanelaction.php:393
 msgid "Snapshots configuration"
@@ -7580,6 +7646,12 @@ msgstr "Konfiguracja migawek"
 msgid "Set site license"
 msgstr "Ustaw licencję witryny"
 
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:409
+#, fuzzy
+msgid "Plugins configuration"
+msgstr "Konfiguracja ścieżek"
+
 #. TRANS: Client error 401.
 #: lib/apiauth.php:111
 msgid "API resource requires read-write access, but you only have read access."
@@ -7592,19 +7664,23 @@ msgstr ""
 msgid "No application for that consumer key."
 msgstr "Brak aplikacji dla tego klucza klienta."
 
+#: lib/apiauth.php:202 lib/apiauth.php:284
+msgid "Not allowed to use API."
+msgstr ""
+
 #. TRANS: OAuth exception given when an incorrect access token was given for a user.
-#: lib/apiauth.php:219
+#: lib/apiauth.php:225
 msgid "Bad access token."
 msgstr "Błędny token dostępu."
 
 #. TRANS: OAuth exception given when no user was found for a given token (no token was found).
-#: lib/apiauth.php:224
+#: lib/apiauth.php:230
 msgid "No user for that token."
 msgstr "Brak użytkownika dla tego tokenu."
 
 #. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel".
 #. TRANS: Client error thrown when authentication fails.
-#: lib/apiauth.php:266 lib/apiauth.php:293
+#: lib/apiauth.php:272 lib/apiauth.php:302
 msgid "Could not authenticate you."
 msgstr "Nie można uwierzytelnić."
 
@@ -7647,6 +7723,11 @@ msgstr "Spróbowano unieważnić nieznany token."
 msgid "Failed to delete revoked token."
 msgstr "Usunięcie unieważnionego tokenu nie powiodło się."
 
+#. TRANS: Form input field label for application icon.
+#: lib/applicationeditform.php:177
+msgid "Icon"
+msgstr "Ikona"
+
 #. TRANS: Form guide.
 #: lib/applicationeditform.php:182
 msgid "Icon for this application"
@@ -7682,6 +7763,11 @@ msgstr "Źródłowy adres URL"
 msgid "Organization responsible for this application"
 msgstr "Organizacja odpowiedzialna za tę aplikację"
 
+#. TRANS: Form input field label.
+#: lib/applicationeditform.php:227
+msgid "Organization"
+msgstr "Organizacja"
+
 #. TRANS: Form input field instructions.
 #: lib/applicationeditform.php:234
 msgid "URL for the homepage of the organization"
@@ -7770,16 +7856,6 @@ msgstr "Element \"author\" musi zawierać element \"name\"."
 msgid "Do not use this method!"
 msgstr "Nie należy używać tej metody."
 
-#. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:293
-msgid "Author"
-msgstr "Autor"
-
-#. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:307
-msgid "Provider"
-msgstr "Dostawca"
-
 #. TRANS: Title.
 #: lib/attachmentnoticesection.php:67
 msgid "Notices where this attachment appears"
@@ -7805,23 +7881,28 @@ msgstr "Zmiana hasła nie jest dozwolona."
 msgid "Block"
 msgstr "Zablokuj"
 
+#. TRANS: Description of the form to block a user.
+#: lib/blockform.php:79
+msgid "Block this user"
+msgstr "Zablokuj tego użytkownika"
+
 #. TRANS: Title for command results.
-#: lib/channel.php:160 lib/channel.php:181
+#: lib/channel.php:104 lib/channel.php:125
 msgid "Command results"
 msgstr "Wyniki polecenia"
 
 #. TRANS: Title for command results.
-#: lib/channel.php:194
+#: lib/channel.php:138
 msgid "AJAX error"
 msgstr "Błąd AJAX"
 
 #. TRANS: E-mail subject when a command has completed.
-#: lib/channel.php:233 lib/mailhandler.php:143
+#: lib/channel.php:177 lib/mailhandler.php:143
 msgid "Command complete"
 msgstr "Zakończono polecenie"
 
 #. TRANS: E-mail subject when a command has failed.
-#: lib/channel.php:244
+#: lib/channel.php:188
 msgid "Command failed"
 msgstr "Polecenie nie powiodło się"
 
@@ -7924,7 +8005,7 @@ msgstr "Imię i nazwisko: %s"
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a location.
-#: lib/command.php:446 lib/mail.php:270
+#: lib/command.php:446 lib/mail.php:275
 #, php-format
 msgid "Location: %s"
 msgstr "Położenie: %s"
@@ -7932,7 +8013,7 @@ msgstr "Położenie: %s"
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a homepage.
-#: lib/command.php:450 lib/mail.php:274
+#: lib/command.php:450 lib/mail.php:279
 #, php-format
 msgid "Homepage: %s"
 msgstr "Strona domowa: %s"
@@ -8210,106 +8291,99 @@ msgstr ""
 "tracking - jeszcze nie zaimplementowano\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:162
+#: lib/common.php:36
 msgid "No configuration file found."
 msgstr "Nie odnaleziono pliku konfiguracji."
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:165
+#: lib/common.php:39
 msgid "I looked for configuration files in the following places:"
 msgstr "Szukano plików konfiguracji w następujących miejscach:"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:168
+#: lib/common.php:42
 msgid "You may wish to run the installer to fix this."
 msgstr "Należy uruchomić instalator, aby to naprawić."
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:172
+#: lib/common.php:46
 msgid "Go to the installer."
 msgstr "Przejdź do instalatora."
 
-#. TRANS: Menu item for Instant Messaging settings.
-#: lib/connectsettingsaction.php:106
-msgctxt "MENU"
-msgid "IM"
-msgstr "Komunikator"
-
-#. TRANS: Tooltip for Instant Messaging menu item.
-#: lib/connectsettingsaction.php:108
-msgid "Updates by instant messenger (IM)"
-msgstr "Aktualizacje przez komunikator"
-
-#. TRANS: Menu item for Short Message Service settings.
-#: lib/connectsettingsaction.php:113
-msgctxt "MENU"
-msgid "SMS"
-msgstr "SMS"
-
-#. TRANS: Tooltip for Short Message Service menu item.
-#: lib/connectsettingsaction.php:115
-msgid "Updates by SMS"
-msgstr "Aktualizacje przez wiadomości SMS"
-
-#. TRANS: Menu item for OuAth connection settings.
-#: lib/connectsettingsaction.php:120
-msgctxt "MENU"
-msgid "Connections"
-msgstr "Połączenia"
-
-#. TRANS: Tooltip for connected applications (Connections through OAuth) menu item.
-#: lib/connectsettingsaction.php:122
-msgid "Authorized connected applications"
-msgstr "Upoważnione połączone aplikacje"
-
 #: lib/dberroraction.php:59
 msgid "Database error"
 msgstr "Błąd bazy danych"
 
+#. TRANS: Description of form for deleting a user.
+#: lib/deleteuserform.php:75
+msgid "Delete this user"
+msgstr "Usuń tego użytkownika"
+
+#: lib/designform.php:114
+#, fuzzy
+msgid "Change design"
+msgstr "Zapisz wygląd"
+
+#. TRANS: Fieldset legend on profile design page to change profile page colours.
+#: lib/designform.php:131
+msgid "Change colours"
+msgstr "Zmień kolory"
+
+#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
+#: lib/designform.php:138
+msgid "Use defaults"
+msgstr "Użycie domyślnych"
+
+#. TRANS: Title for button on profile design page to reset all colour settings to default.
+#: lib/designform.php:140
+msgid "Restore default designs"
+msgstr "Przywróć domyślny wygląd"
+
+#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
+#: lib/designform.php:148
+msgid "Reset back to default"
+msgstr "Przywróć domyślne ustawienia"
+
 #. TRANS: Label in form on profile design page.
 #. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
-#: lib/designsettings.php:108
+#: lib/designform.php:158
 msgid "Upload file"
 msgstr "Wyślij plik"
 
 #. TRANS: Instructions for form on profile design page.
-#: lib/designsettings.php:113
+#: lib/designform.php:163
+#, fuzzy
 msgid ""
-"You can upload your personal background image. The maximum file size is 2MB."
+"You can upload your personal background image. The maximum file size is 2Mb."
 msgstr "Można wysłać osobisty obraz tła. Maksymalny rozmiar pliku to 2 MB."
 
 #. TRANS: Radio button on profile design page that will enable use of the uploaded profile image.
-#: lib/designsettings.php:139
+#: lib/designform.php:194
 msgctxt "RADIO"
 msgid "On"
 msgstr "Włączone"
 
 #. TRANS: Radio button on profile design page that will disable use of the uploaded profile image.
-#: lib/designsettings.php:156
+#: lib/designform.php:211
 msgctxt "RADIO"
 msgid "Off"
 msgstr "Wyłączone"
 
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: lib/designsettings.php:175
-msgid "Change colours"
-msgstr "Zmień kolory"
-
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: lib/designsettings.php:257
-msgid "Use defaults"
-msgstr "Użycie domyślnych"
+#. TRANS: Title for button on profile design page to save settings.
+#: lib/designform.php:322
+msgid "Save design"
+msgstr "Zapisz wygląd"
 
 #. TRANS: Error message displayed if design settings could not be saved.
 #. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
-#: lib/designsettings.php:405 lib/designsettings.php:427
+#: lib/designsettings.php:216 lib/designsettings.php:238
 msgid "Couldn't update your design."
 msgstr "Nie można zaktualizować wyglądu."
 
 #. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
-#: lib/designsettings.php:433
+#: lib/designsettings.php:244
 msgid "Design defaults restored."
 msgstr "Przywrócono domyślny wygląd."
 
@@ -8378,27 +8452,23 @@ msgstr "Nie można zaimportować bez użytkownika."
 msgid "Feeds"
 msgstr "Kanały"
 
-#: lib/galleryaction.php:121
-msgid "Filter tags"
-msgstr "Filtruj znaczniki"
-
-#: lib/galleryaction.php:131
+#: lib/galleryaction.php:128
 msgid "All"
 msgstr "Wszystko"
 
-#: lib/galleryaction.php:139
+#: lib/galleryaction.php:136
 msgid "Select tag to filter"
 msgstr "Wybierz znacznik do filtrowania"
 
-#: lib/galleryaction.php:140
+#: lib/galleryaction.php:137
 msgid "Tag"
 msgstr "Znacznik"
 
-#: lib/galleryaction.php:141
+#: lib/galleryaction.php:138
 msgid "Choose a tag to narrow list"
 msgstr "Wybierz znacznik do ograniczonej listy"
 
-#: lib/galleryaction.php:143
+#: lib/galleryaction.php:140
 msgid "Go"
 msgstr "Przejdź"
 
@@ -8494,6 +8564,12 @@ msgctxt "TOOLTIP"
 msgid "%s blocked users"
 msgstr "%s zablokowanych użytkowników"
 
+#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
+#: lib/groupnav.php:117
+msgctxt "MENU"
+msgid "Admin"
+msgstr "Administrator"
+
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
 #: lib/groupnav.php:120
@@ -8606,39 +8682,61 @@ msgstr[0] "%d B"
 msgstr[1] "%d B"
 msgstr[2] "%d B"
 
-#: lib/jabber.php:387
+#: lib/implugin.php:262
 #, php-format
-msgid "[%s]"
-msgstr "[%s]"
+msgid ""
+"User \"%s\" on %s has said that your %s screenname belongs to them. If "
+"that's true, you can confirm by clicking on this URL: %s . (If you cannot "
+"click it, copy-and-paste it into the address bar of your browser). If that "
+"user isn't you, or if you didn't request this confirmation, just ignore this "
+"message."
+msgstr ""
 
-#: lib/jabber.php:567
+#: lib/implugin.php:349
 #, php-format
 msgid "Unknown inbox source %d."
 msgstr "Nieznane źródło skrzynki odbiorczej %d."
 
+#: lib/implugin.php:485
+#, fuzzy, php-format
+msgid "Message too long - maximum is %1$d characters, you sent %2$d."
+msgstr "Wiadomość jest za długa - maksymalnie %1$d znak, wysłano %2$d."
+
 #: lib/leaveform.php:114
 msgid "Leave"
 msgstr "Opuść"
 
+#. TRANS: Menu item for logging in to the StatusNet site.
+#: lib/logingroupnav.php:77
+msgctxt "MENU"
+msgid "Login"
+msgstr "Zaloguj się"
+
 #. TRANS: Title for menu item for logging in to the StatusNet site.
 #: lib/logingroupnav.php:79
 msgid "Login with a username and password"
 msgstr "Zaloguj się za pomocą nazwy użytkownika i hasła"
 
+#. TRANS: Menu item for registering with the StatusNet site.
+#: lib/logingroupnav.php:85
+msgctxt "MENU"
+msgid "Register"
+msgstr "Zarejestruj się"
+
 #. TRANS: Title for menu item for registering with the StatusNet site.
 #: lib/logingroupnav.php:87
 msgid "Sign up for a new account"
 msgstr "Załóż nowe konto"
 
 #. TRANS: Subject for address confirmation email.
-#: lib/mail.php:168
+#: lib/mail.php:172
 msgid "Email address confirmation"
 msgstr "Potwierdzenie adresu e-mail"
 
 #. TRANS: Body for address confirmation email.
 #. TRANS: %1$s is the addressed user's nickname, %2$s is the StatusNet sitename,
 #. TRANS: %3$s is the URL to confirm at.
-#: lib/mail.php:173
+#: lib/mail.php:177
 #, php-format
 msgid ""
 "Hey, %1$s.\n"
@@ -8670,14 +8768,14 @@ msgstr ""
 
 #. TRANS: Subject of new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
-#: lib/mail.php:238
+#: lib/mail.php:243
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "Użytkownik %1$s obserwuje teraz twoje wpisy na %2$s."
 
 #. TRANS: This is a paragraph in a new-subscriber e-mail.
 #. TRANS: %s is a URL where the subscriber can be reported as abusive.
-#: lib/mail.php:245
+#: lib/mail.php:250
 #, php-format
 msgid ""
 "If you believe this account is being used abusively, you can block them from "
@@ -8692,7 +8790,7 @@ msgstr ""
 #. TRANS: %3$s is the subscriber's profile URL, %4$s is the subscriber's location (or empty)
 #. TRANS: %5$s is the subscriber's homepage URL (or empty), %6%s is the subscriber's bio (or empty)
 #. TRANS: %7$s is a link to the addressed user's e-mail settings.
-#: lib/mail.php:255
+#: lib/mail.php:260
 #, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -8719,14 +8817,14 @@ msgstr ""
 
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is biographical information.
-#: lib/mail.php:278
+#: lib/mail.php:283
 #, php-format
 msgid "Bio: %s"
 msgstr "O mnie: %s"
 
 #. TRANS: Subject of notification mail for new posting email address.
 #. TRANS: %s is the StatusNet sitename.
-#: lib/mail.php:307
+#: lib/mail.php:312
 #, php-format
 msgid "New email address for posting to %s"
 msgstr "Nowy adres e-mail do wysyłania do %s"
@@ -8734,7 +8832,7 @@ msgstr "Nowy adres e-mail do wysyłania do %s"
 #. TRANS: Body of notification mail for new posting email address.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is the e-mail address to send
 #. TRANS: to to post by e-mail, %3$s is a URL to more instructions.
-#: lib/mail.php:313
+#: lib/mail.php:318
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -8757,26 +8855,26 @@ msgstr ""
 
 #. TRANS: Subject line for SMS-by-email notification messages.
 #. TRANS: %s is the posting user's nickname.
-#: lib/mail.php:434
+#: lib/mail.php:439
 #, php-format
 msgid "%s status"
 msgstr "Stan użytkownika %s"
 
 #. TRANS: Subject line for SMS-by-email address confirmation message.
-#: lib/mail.php:460
+#: lib/mail.php:465
 msgid "SMS confirmation"
 msgstr "Potwierdzenie SMS"
 
 #. TRANS: Main body heading for SMS-by-email address confirmation message.
 #. TRANS: %s is the addressed user's nickname.
-#: lib/mail.php:464
+#: lib/mail.php:469
 #, php-format
 msgid "%s: confirm you own this phone number with this code:"
 msgstr "%s: proszę potwierdzić własny numer telefonu za pomocą tego kodu:"
 
 #. TRANS: Subject for 'nudge' notification email.
 #. TRANS: %s is the nudging user.
-#: lib/mail.php:485
+#: lib/mail.php:490
 #, php-format
 msgid "You have been nudged by %s"
 msgstr "Zostałeś szturchnięty przez użytkownika %s"
@@ -8784,7 +8882,7 @@ msgstr "Zostałeś szturchnięty przez użytkownika %s"
 #. TRANS: Body for 'nudge' notification email.
 #. TRANS: %1$s is the nuding user's long name, $2$s is the nudging user's nickname,
 #. TRANS: %3$s is a URL to post notices at, %4$s is the StatusNet sitename.
-#: lib/mail.php:492
+#: lib/mail.php:497
 #, php-format
 msgid ""
 "%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -8813,7 +8911,7 @@ msgstr ""
 
 #. TRANS: Subject for direct-message notification email.
 #. TRANS: %s is the sending user's nickname.
-#: lib/mail.php:539
+#: lib/mail.php:544
 #, php-format
 msgid "New private message from %s"
 msgstr "Nowa prywatna wiadomość od użytkownika %s"
@@ -8822,7 +8920,7 @@ msgstr "Nowa prywatna wiadomość od użytkownika %s"
 #. TRANS: %1$s is the sending user's long name, %2$s is the sending user's nickname,
 #. TRANS: %3$s is the message content, %4$s a URL to the message,
 #. TRANS: %5$s is the StatusNet sitename.
-#: lib/mail.php:547
+#: lib/mail.php:552
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -8857,7 +8955,7 @@ msgstr ""
 
 #. TRANS: Subject for favorite notification e-mail.
 #. TRANS: %1$s is the adding user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:599
+#: lib/mail.php:604
 #, php-format
 msgid "%1$s (@%2$s) added your notice as a favorite"
 msgstr "Użytkownik %1$s (@%2$s) dodał twój wpis jako ulubiony"
@@ -8867,7 +8965,7 @@ msgstr "Użytkownik %1$s (@%2$s) dodał twój wpis jako ulubiony"
 #. TRANS: %3$s is a URL to the faved notice, %4$s is the faved notice text,
 #. TRANS: %5$s is a URL to all faves of the adding user, %6$s is the StatusNet sitename,
 #. TRANS: %7$s is the adding user's nickname.
-#: lib/mail.php:606
+#: lib/mail.php:611
 #, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -8906,7 +9004,7 @@ msgstr ""
 "%6$s\n"
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:664
+#: lib/mail.php:669
 #, php-format
 msgid ""
 "The full conversation can be read here:\n"
@@ -8919,7 +9017,7 @@ msgstr ""
 
 #. TRANS: E-mail subject for notice notification.
 #. TRANS: %1$s is the sending user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:672
+#: lib/mail.php:677
 #, php-format
 msgid "%1$s (@%2$s) sent a notice to your attention"
 msgstr "Użytkownik %1$s (@%2$s) wysłał wpis wymagający twojej uwagi"
@@ -8930,7 +9028,7 @@ msgstr "Użytkownik %1$s (@%2$s) wysłał wpis wymagający twojej uwagi"
 #. TRANS: %5$s is a URL to the full conversion if it exists (otherwise empty),
 #. TRANS: %6$s is a URL to reply to the notice, %7$s is a URL to all @-replied for the addressed user,
 #. TRANS: %8$s is a URL to the addressed user's e-mail settings, %9$s is the sender's nickname.
-#: lib/mail.php:680
+#: lib/mail.php:685
 #, php-format
 msgid ""
 "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -9073,11 +9171,7 @@ msgstr "Brak wzajemnych subskrybentów."
 msgid "To"
 msgstr "Do"
 
-#: lib/messageform.php:166 lib/noticeform.php:186
-msgid "Available characters"
-msgstr "Dostępne znaki"
-
-#: lib/messageform.php:185 lib/noticeform.php:237
+#: lib/messageform.php:184 lib/noticeform.php:236
 msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr "Wyślij"
@@ -9087,15 +9181,10 @@ msgstr "Wyślij"
 msgid "Messages"
 msgstr "Wiadomość"
 
-#: lib/messagelistitem.php:123 lib/noticelist.php:522
+#: lib/messagelistitem.php:123 lib/noticelist.php:527
 msgid "from"
 msgstr "z"
 
-#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:165
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr "Pseudonim może zawierać tylko małe litery i cyfry, bez spacji."
-
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 #: lib/nickname.php:178
 msgid "Nickname cannot be empty."
@@ -9119,23 +9208,23 @@ msgstr "Wyślij wpis"
 msgid "What's up, %s?"
 msgstr "Co słychać, %s?"
 
-#: lib/noticeform.php:194
+#: lib/noticeform.php:193
 msgid "Attach"
 msgstr "Załącz"
 
-#: lib/noticeform.php:198
+#: lib/noticeform.php:197
 msgid "Attach a file"
 msgstr "Załącz plik"
 
-#: lib/noticeform.php:213
+#: lib/noticeform.php:212
 msgid "Share my location"
 msgstr "Ujawnij położenie"
 
-#: lib/noticeform.php:216
+#: lib/noticeform.php:215
 msgid "Do not share my location"
 msgstr "Nie ujawniaj położenia"
 
-#: lib/noticeform.php:217
+#: lib/noticeform.php:216
 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
 "try again later"
@@ -9144,55 +9233,59 @@ msgstr ""
 "ponownie później"
 
 #. TRANS: Used in coordinates as abbreviation of north
-#: lib/noticelist.php:452
+#: lib/noticelist.php:457
 msgid "N"
 msgstr "Północ"
 
 #. TRANS: Used in coordinates as abbreviation of south
-#: lib/noticelist.php:454
+#: lib/noticelist.php:459
 msgid "S"
 msgstr "Południe"
 
 #. TRANS: Used in coordinates as abbreviation of east
-#: lib/noticelist.php:456
+#: lib/noticelist.php:461
 msgid "E"
 msgstr "Wschód"
 
 #. TRANS: Used in coordinates as abbreviation of west
-#: lib/noticelist.php:458
+#: lib/noticelist.php:463
 msgid "W"
 msgstr "Zachód"
 
-#: lib/noticelist.php:460
+#: lib/noticelist.php:465
 #, php-format
 msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 
-#: lib/noticelist.php:469
+#: lib/noticelist.php:474
 msgid "at"
 msgstr "w"
 
-#: lib/noticelist.php:518
+#: lib/noticelist.php:523
 msgid "web"
 msgstr "WWW"
 
-#: lib/noticelist.php:584
+#: lib/noticelist.php:589
 msgid "in context"
 msgstr "w rozmowie"
 
-#: lib/noticelist.php:619
+#: lib/noticelist.php:624
 msgid "Repeated by"
 msgstr "Powtórzone przez"
 
-#: lib/noticelist.php:646
+#: lib/noticelist.php:651
 msgid "Reply to this notice"
 msgstr "Odpowiedz na ten wpis"
 
-#: lib/noticelist.php:647
+#: lib/noticelist.php:652
 msgid "Reply"
 msgstr "Odpowiedz"
 
-#: lib/noticelist.php:691
+#: lib/noticelist.php:678
+msgid "Delete this notice"
+msgstr "Usuń ten wpis"
+
+#: lib/noticelist.php:696
 msgid "Notice repeated"
 msgstr "Powtórzono wpis"
 
@@ -9229,48 +9322,31 @@ msgstr "Podwójny wpis."
 msgid "Couldn't insert new subscription."
 msgstr "Nie można wprowadzić nowej subskrypcji."
 
-#. TRANS: Personal group navigation menu option when logged in for viewing @-replies.
-#: lib/personalgroupnav.php:107
+#: lib/personalgroupnav.php:104
 #, fuzzy
-msgctxt "MENU"
 msgid "Replies"
 msgstr "Odpowiedzi"
 
-#. TRANS: Personal group navigation menu option when logged in for seeing own profile.
-#: lib/personalgroupnav.php:114
+#: lib/personalgroupnav.php:109
 #, fuzzy
-msgctxt "MENU"
-msgid "Profile"
-msgstr "Profil"
-
-#. TRANS: Personal group navigation menu option when logged in for viewing own favourited notices.
-#: lib/personalgroupnav.php:120
-#, fuzzy
-msgctxt "MENU"
 msgid "Favorites"
 msgstr "Ulubione"
 
-#. TRANS: Personal group navigation menu option when logged in for viewing recieved personal messages.
-#: lib/personalgroupnav.php:133
+#: lib/personalgroupnav.php:120
 #, fuzzy
-msgctxt "MENU"
 msgid "Inbox"
 msgstr "Odebrane"
 
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing recieved personal messages.
-#: lib/personalgroupnav.php:135
+#: lib/personalgroupnav.php:121
 msgid "Your incoming messages"
 msgstr "Wiadomości przychodzące"
 
-#. TRANS: Personal group navigation menu option when logged in for viewing senet personal messages.
-#: lib/personalgroupnav.php:140
+#: lib/personalgroupnav.php:125
 #, fuzzy
-msgctxt "MENU"
 msgid "Outbox"
 msgstr "Wysłane"
 
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing senet personal messages.
-#: lib/personalgroupnav.php:142
+#: lib/personalgroupnav.php:126
 msgid "Your sent messages"
 msgstr "Wysłane wiadomości"
 
@@ -9285,9 +9361,26 @@ msgstr "Znaczniki we wpisach użytkownika %s"
 msgid "Unknown"
 msgstr "Nieznane"
 
+#. TRANS: Plugin admin panel controls
+#: lib/plugindisableform.php:90
+msgctxt "plugin"
+msgid "Disable"
+msgstr ""
+
+#. TRANS: Plugin admin panel controls
+#: lib/pluginenableform.php:112
+msgctxt "plugin"
+msgid "Enable"
+msgstr ""
+
+#: lib/pluginlist.php:196
+msgctxt "plugin-description"
+msgid "(Plugin descriptions unavailable when disabled.)"
+msgstr ""
+
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:82
+#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:88
 msgid "Subscriptions"
 msgstr "Subskrypcje"
 
@@ -9298,7 +9391,7 @@ msgstr "Wszystkie subskrypcje"
 
 #. TRANS: H2 text for user subscriber statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:90
+#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:96
 msgid "Subscribers"
 msgstr "Subskrybenci"
 
@@ -9320,7 +9413,7 @@ msgstr "Członek od"
 #. TRANS: Label for user statistics.
 #. TRANS: H2 text for user group membership statistics.
 #: lib/profileaction.php:239 lib/profileaction.php:290
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:104
 msgid "Groups"
 msgstr "Grupy"
 
@@ -9340,10 +9433,6 @@ msgstr "Wszystkie grupy"
 msgid "Unimplemented method."
 msgstr "Niezaimplementowana metoda."
 
-#: lib/publicgroupnav.php:78
-msgid "Public"
-msgstr "Publiczny"
-
 #: lib/publicgroupnav.php:82
 msgid "User groups"
 msgstr "Grupy użytkowników"
@@ -9382,7 +9471,7 @@ msgid "Revoke the \"%s\" role from this user"
 msgstr "Unieważnij rolę \"%s\" tego użytkownika"
 
 #. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:974
+#: lib/router.php:1001
 msgid "Page not found."
 msgstr "Nie odnaleziono strony."
 
@@ -9411,11 +9500,6 @@ msgctxt "BUTTON"
 msgid "Search"
 msgstr "Wyszukaj"
 
-#. TRANS: Definition list item with instructions on how to get (better) search results.
-#: lib/searchaction.php:170
-msgid "Search help"
-msgstr "Przeszukaj pomoc"
-
 #: lib/searchgroupnav.php:80
 msgid "People"
 msgstr "Osoby"
@@ -9440,6 +9524,51 @@ msgstr "Sekcja bez nazwy"
 msgid "More..."
 msgstr "Więcej..."
 
+#: lib/settingsnav.php:78
+msgid "Change your profile settings"
+msgstr "Zmień ustawienia profilu"
+
+#: lib/settingsnav.php:83
+msgid "Upload an avatar"
+msgstr "Wyślij awatar"
+
+#: lib/settingsnav.php:88
+msgid "Change your password"
+msgstr "Zmień hasło"
+
+#: lib/settingsnav.php:93
+msgid "Change email handling"
+msgstr "Zmień obsługę adresu e-mail"
+
+#: lib/settingsnav.php:98
+msgid "Design your profile"
+msgstr "Wygląd profilu"
+
+#: lib/settingsnav.php:102
+msgid "URL"
+msgstr "Adres URL"
+
+#: lib/settingsnav.php:103
+msgid "URL shorteners"
+msgstr ""
+
+#: lib/settingsnav.php:111
+msgid "Updates by instant messenger (IM)"
+msgstr "Aktualizacje przez komunikator"
+
+#: lib/settingsnav.php:118
+msgid "Updates by SMS"
+msgstr "Aktualizacje przez wiadomości SMS"
+
+#: lib/settingsnav.php:123
+#, fuzzy
+msgid "Connections"
+msgstr "Połączenia"
+
+#: lib/settingsnav.php:124
+msgid "Authorized connected applications"
+msgstr "Upoważnione połączone aplikacje"
+
 #: lib/silenceform.php:67
 msgid "Silence"
 msgstr "Wycisz"
@@ -9448,30 +9577,34 @@ msgstr "Wycisz"
 msgid "Silence this user"
 msgstr "Wycisz tego użytkownika"
 
-#: lib/subgroupnav.php:83
+#: lib/subgroupnav.php:89
 #, php-format
 msgid "People %s subscribes to"
 msgstr "Osoby %s subskrybowane do"
 
-#: lib/subgroupnav.php:91
+#: lib/subgroupnav.php:97
 #, php-format
 msgid "People subscribed to %s"
 msgstr "Osoby subskrybowane do %s"
 
-#: lib/subgroupnav.php:99
+#: lib/subgroupnav.php:105
 #, php-format
 msgid "Groups %s is a member of"
 msgstr "Grupy %s są członkiem"
 
-#: lib/subgroupnav.php:105
+#: lib/subgroupnav.php:111
 msgid "Invite"
 msgstr "Zaproś"
 
-#: lib/subgroupnav.php:106
+#: lib/subgroupnav.php:112
 #, php-format
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Zaproś przyjaciół i kolegów do dołączenia do ciebie na %s"
 
+#: lib/subscribeform.php:115 lib/subscribeform.php:139
+msgid "Subscribe to this user"
+msgstr "Subskrybuj tego użytkownika"
+
 #: lib/subscriberspeopleselftagcloudsection.php:48
 #: lib/subscriptionspeopleselftagcloudsection.php:48
 msgid "People Tagcloud as self-tagged"
@@ -9552,6 +9685,14 @@ msgstr "Motyw zawiera plik typu \\\".%s\\\", który nie jest dozwolony."
 msgid "Error opening theme archive."
 msgstr "Błąd podczas otwierania archiwum motywu."
 
+#: lib/threadednoticelist.php:270
+#, php-format
+msgid "Show all %d comment"
+msgid_plural "Show all %d comments"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
 #: lib/topposterssection.php:74
 msgid "Top posters"
 msgstr "Najczęściej wysyłający wpisy"
@@ -9593,76 +9734,80 @@ msgstr "Zrezygnuj z subskrypcji"
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "Użytkownik%1$s (%2$d) nie posiada wpisu profilu."
 
-#. TRANS: Link text for changeing the avatar of the logged in user.
-#: lib/userprofile.php:121
+#: lib/userprofile.php:116
 msgid "Edit Avatar"
 msgstr "Zmodyfikuj awatar"
 
 #. TRANS: H2 for user actions in a profile.
 #. TRANS: H2 for entity actions in a profile.
-#: lib/userprofile.php:245 lib/userprofile.php:261
+#: lib/userprofile.php:216 lib/userprofile.php:232
 msgid "User actions"
 msgstr "Czynności użytkownika"
 
 #. TRANS: Text shown in user profile of not yet compeltely deleted users.
-#: lib/userprofile.php:249
+#: lib/userprofile.php:220
 msgid "User deletion in progress..."
 msgstr "Trwa usuwanie użytkownika..."
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:277
+#: lib/userprofile.php:248
 msgid "Edit profile settings"
 msgstr "Zmodyfikuj ustawienia profilu"
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:279
+#: lib/userprofile.php:250
 msgid "Edit"
 msgstr "Edycja"
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:303
+#: lib/userprofile.php:274
 msgid "Send a direct message to this user"
 msgstr "Wyślij bezpośrednią wiadomość do tego użytkownika"
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:305
+#: lib/userprofile.php:276
 msgid "Message"
 msgstr "Wiadomość"
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:347
+#: lib/userprofile.php:318
 msgid "Moderate"
 msgstr "Moderuj"
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:386
+#: lib/userprofile.php:357
 msgid "User role"
 msgstr "Rola użytkownika"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:389
+#: lib/userprofile.php:360
 msgctxt "role"
 msgid "Administrator"
 msgstr "Administrator"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:391
+#: lib/userprofile.php:362
 msgctxt "role"
 msgid "Moderator"
 msgstr "Moderator"
 
+#: lib/util.php:321
+#, fuzzy
+msgid "Not allowed to log in."
+msgstr "Niezalogowany."
+
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1306
+#: lib/util.php:1337
 msgid "a few seconds ago"
 msgstr "kilka sekund temu"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1309
+#: lib/util.php:1340
 msgid "about a minute ago"
 msgstr "około minutę temu"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1313
+#: lib/util.php:1344
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
@@ -9671,12 +9816,12 @@ msgstr[1] "około %d minut temu"
 msgstr[2] "około %d minut temu"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1316
+#: lib/util.php:1347
 msgid "about an hour ago"
 msgstr "około godzinę temu"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1320
+#: lib/util.php:1351
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
@@ -9685,12 +9830,12 @@ msgstr[1] "około %d godzin temu"
 msgstr[2] "około %d godzin temu"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1323
+#: lib/util.php:1354
 msgid "about a day ago"
 msgstr "blisko dzień temu"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1327
+#: lib/util.php:1358
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
@@ -9699,12 +9844,12 @@ msgstr[1] "około %d dni temu"
 msgstr[2] "około %d dni temu"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1330
+#: lib/util.php:1361
 msgid "about a month ago"
 msgstr "około miesiąc temu"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1334
+#: lib/util.php:1365
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
@@ -9713,7 +9858,7 @@ msgstr[1] "około %d miesięcy temu"
 msgstr[2] "około %d miesięcy temu"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1337
+#: lib/util.php:1368
 msgid "about a year ago"
 msgstr "około rok temu"
 
@@ -9726,23 +9871,6 @@ msgstr ""
 "%s nie jest prawidłowym kolorem. Proszę użyć trzech lub sześciu znaków "
 "szesnastkowych."
 
-#. TRANS: %s is the URL to the StatusNet site's Instant Messaging settings.
-#: lib/xmppmanager.php:287
-#, php-format
-msgid "Unknown user. Go to %s to add your address to your account"
-msgstr ""
-"Nieznany użytkownik. Proszę przejść na stronę %s i dodać adres do konta"
-
-#. TRANS: Response to XMPP source when it sent too long a message.
-#. TRANS: %1$d the maximum number of allowed characters (used for plural), %2$d is the sent number.
-#: lib/xmppmanager.php:406
-#, php-format
-msgid "Message too long. Maximum is %1$d character, you sent %2$d."
-msgid_plural "Message too long. Maximum is %1$d characters, you sent %2$d."
-msgstr[0] "Wiadomość jest za długa. Maksymalnie %1$d znak, wysłano %2$d."
-msgstr[1] "Wiadomość jest za długa. Maksymalnie %1$d znaki, wysłano %2$d."
-msgstr[2] "Wiadomość jest za długa. Maksymalnie %1$d znaków, wysłano %2$d."
-
 #. TRANS: Exception.
 #: lib/xrd.php:63
 msgid "Invalid XML."
@@ -9759,74 +9887,180 @@ msgstr "Nieprawidłowy kod XML, brak głównego XRD."
 msgid "Getting backup from file '%s'."
 msgstr "Pobieranie kopii zapasowej z pliku \"%s\"."
 
-#, fuzzy
-#~ msgid "Block this user."
-#~ msgstr "Zablokuj tego użytkownika"
+#~ msgid "Could not generate feed for group - %s"
+#~ msgstr "Nie można utworzyć kanału dla grupy - %s"
 
 #, fuzzy
-#~ msgid "Delete this notice."
-#~ msgstr "Usuń ten wpis"
-
-#, fuzzy
-#~ msgid "Delete this user."
-#~ msgstr "Usuń tego użytkownika"
-
-#, fuzzy
-#~ msgid "Restore default designs."
-#~ msgstr "Przywróć domyślny wygląd"
-
-#, fuzzy
-#~ msgid "Reset back to default."
-#~ msgstr "Przywróć domyślne ustawienia"
-
-#, fuzzy
-#~ msgid "Save design."
-#~ msgstr "Zapisz wygląd"
-
-#, fuzzy
-#~ msgid "Disfavor favorite."
-#~ msgstr "Usuń wpis z ulubionych"
-
-#, fuzzy
-#~ msgid "\"%s\" not found."
-#~ msgstr "Nie odnaleziono strony."
-
-#, fuzzy
-#~ msgid "Notice %s not found."
-#~ msgstr "Nie odnaleziono wpisu nadrzędnego."
-
-#, fuzzy
-#~ msgid "Attachment %s not found."
-#~ msgstr "Nie odnaleziono odbiorcy."
-
-#, fuzzy
-#~ msgid "Invalid tag: \"%s\"."
-#~ msgstr "Nieprawidłowy znacznik: \"%s\""
-
-#, fuzzy
-#~ msgid "%s updates from everyone."
-#~ msgstr "Użytkownik %s aktualizuje od każdego."
-
-#, fuzzy
-#~ msgid "Password saved"
-#~ msgstr "Zapisano hasło."
-
-#, fuzzy
-#~ msgid "Where you are, like \"City, State (or Region), Country\"."
-#~ msgstr "Gdzie jesteś, np. \"miasto, województwo (lub region), kraj\""
-
-#, fuzzy
-#~ msgid "Subscribe to this user."
-#~ msgstr "Subskrybuj tego użytkownika"
+#~ msgid "Current confirmed Jabber/Google Talk address."
+#~ msgstr "Obecnie potwierdzone adresy Jabber/GTalk."
 
 #, fuzzy
 #~ msgid ""
-#~ "Listenee stream license \"%1$s\" is not compatible with site license \"%2"
-#~ "$s\"."
+#~ "Jabber or Google Talk address, like \"UserName@example.org\". First, make "
+#~ "sure to add %s to your buddy list in your IM client or on Google Talk."
 #~ msgstr ""
-#~ "Licencja nasłuchiwanego strumienia \"%1$s\" nie jest zgodna z licencją "
-#~ "witryny \"%2$s\"."
+#~ "Adres Jabber lub GTalk, taki jak \"NazwaUżytkownika@example.org\". "
+#~ "Najpierw upewnij się, że dodałeś %s do listy znajomych w komunikatorze "
+#~ "lub na GTalk."
 
 #, fuzzy
-#~ msgid "Not allowed to log in."
-#~ msgstr "Niezalogowany."
+#~ msgid "Send me notices through Jabber/Google Talk."
+#~ msgstr "Wyślij mi wpisy przez Jabber/GTalk."
+
+#, fuzzy
+#~ msgid "Publish a MicroID for my Jabber/Google Talk address."
+#~ msgstr "Opublikuj MicroID adresu Jabber/GTalk."
+
+#~ msgid "No Jabber ID."
+#~ msgstr "Brak identyfikatora Jabbera."
+
+#, fuzzy
+#~ msgid "Not a valid Jabber ID."
+#~ msgstr "To nie jest prawidłowy identyfikator Jabbera"
+
+#~ msgid "That is already your Jabber ID."
+#~ msgstr "Ten identyfikator Jabbera jest już twój."
+
+#~ msgid "That is not your Jabber ID."
+#~ msgstr "To nie jest twój identyfikator Jabbera."
+
+#~ msgid "Other settings"
+#~ msgstr "Inne ustawienia"
+
+#~ msgid "Tag cloud"
+#~ msgstr "Chmura znaczników"
+
+#~ msgid "Consumer key"
+#~ msgstr "Klucz klienta"
+
+#~ msgid "Consumer secret"
+#~ msgstr "Sekret klienta"
+
+#~ msgid "Request token URL"
+#~ msgstr "Adres URL tokenu żądania"
+
+#~ msgid "Access token URL"
+#~ msgstr "Adres URL tokenu żądania"
+
+#~ msgid "Authorize URL"
+#~ msgstr "Adres URL upoważnienia"
+
+#~ msgid "Jabber"
+#~ msgstr "Jabber"
+
+#~ msgid "Photo"
+#~ msgstr "Zdjęcie"
+
+#~ msgid "Other options"
+#~ msgstr "Inne opcje"
+
+#~ msgid "Other"
+#~ msgstr "Inne"
+
+#~ msgid "Primary site navigation"
+#~ msgstr "Główna nawigacja witryny"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Personal profile and friends timeline"
+#~ msgstr "Profil osobisty i oś czasu przyjaciół"
+
+#~ msgctxt "MENU"
+#~ msgid "Personal"
+#~ msgstr "Osobiste"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Change your email, avatar, password, profile"
+#~ msgstr "Zmień adres e-mail, awatar, hasło, profil"
+
+#~ msgid "Account"
+#~ msgstr "Konto"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Connect to services"
+#~ msgstr "Połącz z serwisami"
+
+#~ msgid "Connect"
+#~ msgstr "Połącz"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Change site configuration"
+#~ msgstr "Zmień konfigurację witryny"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Invite friends and colleagues to join you on %s"
+#~ msgstr "Zaproś przyjaciół i kolegów do dołączenia do ciebie na %s"
+
+#~ msgctxt "MENU"
+#~ msgid "Invite"
+#~ msgstr "Zaproś"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Create an account"
+#~ msgstr "Utwórz konto"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Help me!"
+#~ msgstr "Pomóż mi."
+
+#~ msgctxt "MENU"
+#~ msgid "Help"
+#~ msgstr "Pomoc"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Search for people or text"
+#~ msgstr "Wyszukaj osoby lub tekst"
+
+#~ msgid "Local views"
+#~ msgstr "Lokalne widoki"
+
+#~ msgid "Page notice"
+#~ msgstr "Wpis strony"
+
+#~ msgid "Secondary site navigation"
+#~ msgstr "Druga nawigacja witryny"
+
+#~ msgid "StatusNet software license"
+#~ msgstr "Licencja oprogramowania StatusNet"
+
+#~ msgid "Site content license"
+#~ msgstr "Licencja zawartości witryny"
+
+#~ msgid "Pagination"
+#~ msgstr "Paginacja"
+
+#~ msgid "Author"
+#~ msgstr "Autor"
+
+#~ msgid "Provider"
+#~ msgstr "Dostawca"
+
+#~ msgctxt "MENU"
+#~ msgid "SMS"
+#~ msgstr "SMS"
+
+#~ msgid "Filter tags"
+#~ msgstr "Filtruj znaczniki"
+
+#~ msgid "[%s]"
+#~ msgstr "[%s]"
+
+#~ msgid "Available characters"
+#~ msgstr "Dostępne znaki"
+
+#, fuzzy
+#~ msgctxt "MENU"
+#~ msgid "Profile"
+#~ msgstr "Profil"
+
+#~ msgid "Search help"
+#~ msgstr "Przeszukaj pomoc"
+
+#~ msgid "Unknown user. Go to %s to add your address to your account"
+#~ msgstr ""
+#~ "Nieznany użytkownik. Proszę przejść na stronę %s i dodać adres do konta"
+
+#~ msgid "Message too long. Maximum is %1$d character, you sent %2$d."
+#~ msgid_plural "Message too long. Maximum is %1$d characters, you sent %2$d."
+#~ msgstr[0] "Wiadomość jest za długa. Maksymalnie %1$d znak, wysłano %2$d."
+#~ msgstr[1] "Wiadomość jest za długa. Maksymalnie %1$d znaki, wysłano %2$d."
+#~ msgstr[2] "Wiadomość jest za długa. Maksymalnie %1$d znaków, wysłano %2$d."
diff --git a/locale/pt/LC_MESSAGES/statusnet.po b/locale/pt/LC_MESSAGES/statusnet.po
index 496bc80ee4..9ef30c1357 100644
--- a/locale/pt/LC_MESSAGES/statusnet.po
+++ b/locale/pt/LC_MESSAGES/statusnet.po
@@ -16,8 +16,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 15:58+0000\n"
-"PO-Revision-Date: 2011-03-03 16:01:16+0000\n"
+"POT-Creation-Date: 2011-03-03 17:23+0000\n"
+"PO-Revision-Date: 2011-03-03 17:26:22+0000\n"
 "Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -83,23 +83,23 @@ msgstr "Gravar configurações de acesso"
 #. TRANS: Tooltip for button to save access settings in site admin panel.
 #. TRANS: Button text for saving theme settings.
 #. TRANS: Button label to save e-mail preferences.
-#. TRANS: Button label to save Instant Messaging preferences.
-#. TRANS: Button text for saving "Other settings" in profile.
+#. TRANS: Button label to save IM preferences.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
 #. TRANS: Button text for saving site notice in admin panel.
 #. TRANS: Button label to save SMS preferences.
 #. TRANS: Save button for settings for a profile in a subscriptions list.
+#. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
 #. TRANS: Button text on profile design page to save settings.
 #: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
-#: actions/emailsettings.php:250 actions/imsettings.php:183
-#: actions/othersettings.php:136 actions/pathsadminpanel.php:512
-#: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
-#: actions/smssettings.php:205 actions/subscriptions.php:259
+#: actions/emailsettings.php:251 actions/imsettings.php:199
+#: actions/pathsadminpanel.php:512 actions/profilesettings.php:198
+#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:204
+#: actions/subscriptions.php:261 actions/urlsettings.php:152
 #: actions/useradminpanel.php:298 lib/applicationeditform.php:355
-#: lib/designsettings.php:270 lib/groupeditform.php:201
+#: lib/designform.php:320 lib/groupeditform.php:201
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Gravar"
@@ -138,7 +138,11 @@ msgstr "Página não foi encontrada."
 #. 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 use "one time password login" without using an existing user.
+#. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
+#. TRANS: Client error displayed trying to find a user by ID for a non-existing ID.
+#. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when calling a profile action without specifying a user.
 #: actions/all.php:80 actions/allrss.php:69
@@ -150,19 +154,19 @@ msgstr "Página não foi encontrada."
 #: actions/apidirectmessage.php:75 actions/apidirectmessagenew.php:72
 #: actions/apigroupcreate.php:111 actions/apigroupismember.php:89
 #: actions/apigroupjoin.php:98 actions/apigroupleave.php:98
-#: actions/apigrouplist.php:70 actions/apistatusesupdate.php:230
-#: actions/apisubscriptions.php:85 actions/apitimelinefavorites.php:70
-#: actions/apitimelinefriends.php:173 actions/apitimelinehome.php:78
-#: actions/apitimelinementions.php:77 actions/apitimelineuser.php:79
-#: actions/avatarbynickname.php:79 actions/favoritesrss.php:72
-#: actions/foaf.php:42 actions/foaf.php:61 actions/hcard.php:67
-#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
-#: actions/remotesubscribe.php:144 actions/remotesubscribe.php:153
-#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
-#: actions/showfavorites.php:106 actions/userbyid.php:74
-#: actions/usergroups.php:93 actions/userrss.php:40 actions/userxrd.php:59
-#: actions/xrds.php:71 lib/command.php:509 lib/galleryaction.php:59
-#: lib/mailbox.php:80 lib/profileaction.php:77
+#: actions/apigrouplist.php:70 actions/apigroupprofileupdate.php:108
+#: actions/apistatusesupdate.php:230 actions/apisubscriptions.php:85
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:173
+#: actions/apitimelinehome.php:78 actions/apitimelinementions.php:77
+#: actions/apitimelineuser.php:79 actions/avatarbynickname.php:79
+#: actions/favoritesrss.php:72 actions/foaf.php:42 actions/foaf.php:61
+#: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116
+#: actions/otp.php:78 actions/remotesubscribe.php:144
+#: actions/remotesubscribe.php:153 actions/replies.php:73
+#: actions/repliesrss.php:38 actions/rsd.php:113 actions/showfavorites.php:106
+#: actions/userbyid.php:75 actions/usergroups.php:93 actions/userrss.php:40
+#: actions/userxrd.php:59 actions/xrds.php:71 lib/command.php:509
+#: lib/galleryaction.php:59 lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Utilizador não foi encontrado."
 
@@ -176,10 +180,9 @@ msgstr "%1$s e amigos, página %2$d"
 #. TRANS: H1 text for page. %s is a user nickname.
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Timeline title for user and friends. %s is a user nickname.
-#. TRANS: Tooltop for personal group navigation menu option when logged in for viewing timeline of self and friends.
 #: actions/all.php:94 actions/all.php:191 actions/allrss.php:117
 #: actions/apitimelinefriends.php:207 actions/apitimelinehome.php:113
-#: lib/personalgroupnav.php:102
+#: lib/personalgroupnav.php:100
 #, php-format
 msgid "%s and friends"
 msgstr "%s e amigos"
@@ -236,7 +239,7 @@ msgstr ""
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
 #. TRANS: Second sentence of empty message for anonymous users. %s is a user nickname.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:227
+#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:221
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -285,19 +288,20 @@ msgstr "Actualizações de %1$s e amigos no %2$s!"
 #: actions/apifavoritecreate.php:98 actions/apifavoritedestroy.php:98
 #: actions/apifriendshipscreate.php:99 actions/apifriendshipsdestroy.php:99
 #: actions/apifriendshipsshow.php:124 actions/apigroupcreate.php:138
-#: actions/apigroupismember.php:115 actions/apigroupjoin.php:160
-#: actions/apigroupleave.php:145 actions/apigrouplist.php:134
+#: actions/apigroupismember.php:115 actions/apigroupjoin.php:151
+#: actions/apigroupleave.php:141 actions/apigrouplist.php:134
 #: actions/apigrouplistall.php:120 actions/apigroupmembership.php:105
+#: actions/apigroupprofileupdate.php:100 actions/apigroupprofileupdate.php:213
 #: actions/apigroupshow.php:114 actions/apihelptest.php:84
 #: actions/apistatusesdestroy.php:101 actions/apistatusesretweets.php:110
 #: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:139
 #: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
-#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:268
-#: actions/apitimelinegroup.php:147 actions/apitimelinehome.php:173
-#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:239
-#: actions/apitimelineretweetedtome.php:118
-#: actions/apitimelineretweetsofme.php:150 actions/apitimelinetag.php:159
-#: actions/apitimelineuser.php:206 actions/apiusershow.php:100
+#: actions/apitimelinefavorites.php:182 actions/apitimelinefriends.php:276
+#: actions/apitimelinegroup.php:148 actions/apitimelinehome.php:181
+#: actions/apitimelinementions.php:182 actions/apitimelinepublic.php:247
+#: actions/apitimelineretweetedtome.php:147
+#: actions/apitimelineretweetsofme.php:147 actions/apitimelinetag.php:165
+#: actions/apitimelineuser.php:217 actions/apiusershow.php:100
 msgid "API method not found."
 msgstr "Método da API não encontrado."
 
@@ -312,8 +316,9 @@ msgstr "Método da API não encontrado."
 #: actions/apifavoritecreate.php:88 actions/apifavoritedestroy.php:88
 #: actions/apifriendshipscreate.php:89 actions/apifriendshipsdestroy.php:89
 #: actions/apigroupcreate.php:102 actions/apigroupjoin.php:89
-#: actions/apigroupleave.php:89 actions/apimediaupload.php:66
-#: actions/apistatusesretweet.php:63 actions/apistatusesupdate.php:194
+#: actions/apigroupleave.php:89 actions/apigroupprofileupdate.php:92
+#: actions/apimediaupload.php:66 actions/apistatusesretweet.php:63
+#: actions/apistatusesupdate.php:194
 msgid "This method requires a POST."
 msgstr "Este método requer um POST."
 
@@ -326,21 +331,16 @@ msgstr ""
 "Tem de especificar um parâmetro 'aparelho' com um dos valores: sms, im, none."
 
 #. TRANS: Server error displayed when a user's delivery device cannot be updated.
-#. TRANS: Server error displayed when a user update to the database fails in the contact address confirmation action.
 #. TRANS: Server error thrown on database error updating e-mail preferences.
 #. TRANS: Server error thrown on database error removing a registered e-mail address.
-#. TRANS: Server error thrown on database error updating Instant Messaging preferences.
-#. TRANS: Server error thrown on database error removing a registered Instant Messaging address.
-#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
 #. TRANS: Server error thrown when user profile settings could not be updated.
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
-#: actions/apiaccountupdatedeliverydevice.php:130
-#: actions/confirmaddress.php:118 actions/emailsettings.php:352
-#: actions/emailsettings.php:498 actions/imsettings.php:276
-#: actions/imsettings.php:432 actions/othersettings.php:186
-#: actions/profilesettings.php:322 actions/smssettings.php:301
-#: actions/smssettings.php:454
+#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
+#: actions/apiaccountupdatedeliverydevice.php:136
+#: actions/emailsettings.php:353 actions/emailsettings.php:499
+#: actions/profilesettings.php:323 actions/smssettings.php:300
+#: actions/smssettings.php:453 actions/urlsettings.php:211
 msgid "Could not update user."
 msgstr "Não foi possível actualizar o utilizador."
 
@@ -366,7 +366,7 @@ msgstr "Utilizador não tem perfil."
 
 #. TRANS: Server error displayed if a user profile could not be saved.
 #. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:418
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:419
 msgid "Could not save profile."
 msgstr "Não foi possível gravar o perfil."
 
@@ -378,7 +378,7 @@ msgstr "Não foi possível gravar o perfil."
 #: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
 #: actions/designadminpanel.php:120 actions/editapplication.php:121
 #: actions/newapplication.php:102 actions/newnotice.php:95
-#: lib/designsettings.php:298
+#: lib/designsettings.php:110
 #, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s byte) due to its "
@@ -403,8 +403,8 @@ msgstr[1] ""
 #: actions/apiaccountupdateprofilecolors.php:160
 #: actions/apiaccountupdateprofilecolors.php:171
 #: actions/groupdesignsettings.php:285 actions/groupdesignsettings.php:296
-#: actions/userdesignsettings.php:201 actions/userdesignsettings.php:211
-#: actions/userdesignsettings.php:253 actions/userdesignsettings.php:263
+#: actions/userdesignsettings.php:218 actions/userdesignsettings.php:228
+#: actions/userdesignsettings.php:270 actions/userdesignsettings.php:280
 msgid "Unable to save your design settings."
 msgstr "Não foi possível gravar as configurações do estilo."
 
@@ -412,7 +412,7 @@ msgstr "Não foi possível gravar as configurações do estilo."
 #. TRANS: Client error displayed when a database error occurs updating profile colours.
 #: actions/apiaccountupdateprofilebackgroundimage.php:191
 #: actions/apiaccountupdateprofilecolors.php:139
-#: actions/userdesignsettings.php:179
+#: actions/userdesignsettings.php:196
 msgid "Could not update your design."
 msgstr "Não foi possível actualizar o seu estilo."
 
@@ -522,7 +522,7 @@ msgstr "Destinatário não encontrado."
 #. TRANS: Client error displayed trying to direct message another user who's not a friend (403).
 #: actions/apidirectmessagenew.php:144
 #, fuzzy
-msgid "Can't send direct messages to users who aren't your friend."
+msgid "Cannot send direct messages to users who aren't your friend."
 msgstr ""
 "Não pode enviar mensagens directas a utilizadores que não sejam amigos."
 
@@ -607,9 +607,9 @@ msgstr "Não foi possível encontrar o utilizador de destino."
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:156 actions/editgroup.php:191
-#: actions/newgroup.php:137 actions/profilesettings.php:273
-#: actions/register.php:214
+#: actions/apigroupcreate.php:156 actions/apigroupprofileupdate.php:255
+#: actions/editgroup.php:191 actions/newgroup.php:137
+#: actions/profilesettings.php:274 actions/register.php:199
 msgid "Nickname already in use. Try another one."
 msgstr "Utilizador já é usado. Tente outro."
 
@@ -617,9 +617,9 @@ msgstr "Utilizador já é usado. Tente outro."
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:164 actions/editgroup.php:195
-#: actions/newgroup.php:141 actions/profilesettings.php:243
-#: actions/register.php:216
+#: actions/apigroupcreate.php:164 actions/apigroupprofileupdate.php:259
+#: actions/editgroup.php:195 actions/newgroup.php:141
+#: actions/profilesettings.php:244 actions/register.php:201
 msgid "Not a valid nickname."
 msgstr "Utilizador não é válido."
 
@@ -629,10 +629,10 @@ msgstr "Utilizador não é válido."
 #. TRANS: Validation error shown when providing an invalid homepage URL in the "New application" form.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:181 actions/editapplication.php:235
-#: actions/editgroup.php:202 actions/newapplication.php:221
-#: actions/newgroup.php:148 actions/profilesettings.php:248
-#: actions/register.php:223
+#: actions/apigroupcreate.php:181 actions/apigroupprofileupdate.php:277
+#: actions/editapplication.php:235 actions/editgroup.php:202
+#: actions/newapplication.php:221 actions/newgroup.php:148
+#: actions/profilesettings.php:249 actions/register.php:208
 msgid "Homepage is not a valid URL."
 msgstr "Página de ínicio não é uma URL válida."
 
@@ -641,8 +641,8 @@ msgstr "Página de ínicio não é uma URL válida."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:191 actions/editgroup.php:206
-#: actions/newgroup.php:152 actions/profilesettings.php:252
-#: actions/register.php:226
+#: actions/newgroup.php:152 actions/profilesettings.php:253
+#: actions/register.php:211
 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "Nome completo demasiado longo (máx. 255 caracteres)."
@@ -670,8 +670,8 @@ msgstr[1] "Descrição demasiado longa (máx. %d caracteres)."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:215 actions/editgroup.php:218
-#: actions/newgroup.php:164 actions/profilesettings.php:265
-#: actions/register.php:235
+#: actions/newgroup.php:164 actions/profilesettings.php:266
+#: actions/register.php:220
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
 msgstr "Localidade demasiado longa (máx. 255 caracteres)."
@@ -701,15 +701,16 @@ msgstr "Nome alternativo inválido: \"%s\""
 #. TRANS: %s is the alias that is already in use.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error. %s is the already used alias.
-#: actions/apigroupcreate.php:264 actions/editgroup.php:246
-#: actions/newgroup.php:193
+#: actions/apigroupcreate.php:264 actions/apigroupprofileupdate.php:351
+#: actions/editgroup.php:246 actions/newgroup.php:193
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "Nome alternativo \"%s\" já em uso. Tente outro."
 
 #. TRANS: Client error displayed when trying to use an alias during group creation that is the same as the group's nickname.
 #. TRANS: Group edit form validation error.
-#: actions/apigroupcreate.php:278 actions/editgroup.php:253
+#: actions/apigroupcreate.php:278 actions/apigroupprofileupdate.php:359
+#: actions/editgroup.php:253
 msgid "Alias can't be the same as nickname."
 msgstr "Um nome alternativo não pode ser igual ao nome do utilizador."
 
@@ -721,7 +722,8 @@ msgstr "Um nome alternativo não pode ser igual ao nome do utilizador."
 #. TRANS: Client error displayed requesting most recent notices to a group for a non-existing group.
 #: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
 #: actions/apigroupleave.php:104 actions/apigroupmembership.php:71
-#: actions/apigroupshow.php:81 actions/apitimelinegroup.php:89
+#: actions/apigroupprofileupdate.php:113 actions/apigroupshow.php:81
+#: actions/apitimelinegroup.php:89
 msgid "Group not found."
 msgstr "Grupo não foi encontrado."
 
@@ -739,13 +741,11 @@ msgstr "Já é membro desse grupo."
 msgid "You have been blocked from that group by the admin."
 msgstr "Foi bloqueado desse grupo pelo gestor."
 
-#. TRANS: Server error displayed when joining a group fails.
-#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
 #. 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.
 #. TRANS: Message given having failed to add a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:362
+#: actions/apigroupjoin.php:136 actions/joingroup.php:139 lib/command.php:362
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "Não foi possível adicionar %1$s ao grupo %2$s."
@@ -755,8 +755,6 @@ msgstr "Não foi possível adicionar %1$s ao grupo %2$s."
 msgid "You are not a member of this group."
 msgstr "Não é membro deste grupo."
 
-#. TRANS: Server error displayed when leaving a group fails.
-#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
 #. TRANS: Server error displayed when leaving a group failed in the database.
 #. TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
 #. TRANS: Message given having failed to remove a user from a group.
@@ -792,6 +790,61 @@ msgstr "Grupos de %s"
 msgid "groups on %s"
 msgstr "Grupos em %s"
 
+#. TRANS: Client error displayed trying to edit a group while not being a group admin.
+#. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
+#. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
+#: actions/apigroupprofileupdate.php:118 actions/editgroup.php:110
+#: actions/editgroup.php:176 actions/groupdesignsettings.php:109
+#: actions/grouplogo.php:111
+msgid "You must be an admin to edit the group."
+msgstr "Tem de ser administrador para editar o grupo."
+
+#. TRANS: Server error displayed when editing a group fails.
+#: actions/apigroupprofileupdate.php:171 actions/editgroup.php:274
+msgid "Could not update group."
+msgstr "Não foi possível actualizar o grupo."
+
+#. TRANS: Server error displayed when group aliases could not be added.
+#. TRANS: Server exception thrown when creating group aliases failed.
+#: actions/apigroupprofileupdate.php:194 actions/editgroup.php:281
+#: classes/User_group.php:540
+msgid "Could not create aliases."
+msgstr "Não foi possível criar os nomes alternativos."
+
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: actions/apigroupprofileupdate.php:249 lib/nickname.php:165
+msgid "Nickname must have only lowercase letters and numbers and no spaces."
+msgstr "Utilizador só deve conter letras minúsculas e números. Sem espaços."
+
+#: actions/apigroupprofileupdate.php:286
+#, fuzzy
+msgid "Full name is too long (max 255 chars)."
+msgstr "Nome completo demasiado longo (máx. 255 caracteres)."
+
+#: actions/apigroupprofileupdate.php:296
+#, fuzzy, php-format
+msgid "description is too long (max %d chars)."
+msgstr "Descrição demasiado longa (máx. %d caracteres)."
+
+#: actions/apigroupprofileupdate.php:307
+#, fuzzy
+msgid "Location is too long (max 255 chars)."
+msgstr "Localidade demasiado longa (máx. 255 caracteres)."
+
+#: actions/apigroupprofileupdate.php:326
+#, fuzzy, php-format
+msgid "Too many aliases! Maximum %d."
+msgstr "Demasiados nomes alternativos! Máx. %d."
+
+#. TRANS: Group edit form validation error.
+#. TRANS: Group create form validation error.
+#. TRANS: %s is the invalid alias.
+#: actions/apigroupprofileupdate.php:342 actions/editgroup.php:241
+#: actions/newgroup.php:188
+#, php-format
+msgid "Invalid alias: \"%s\""
+msgstr "Nome alternativo inválido: \"%s\""
+
 #. TRANS: Client error displayed when uploading a media file has failed.
 #: actions/apimediaupload.php:101
 msgid "Upload failed."
@@ -825,21 +878,22 @@ msgstr "Não tem autorização."
 #. TRANS: Form validation error message.
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
+#. TRANS: Client error displayed when the session token is not okay.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
 #: actions/deletenotice.php:177 actions/disfavor.php:75
-#: actions/emailsettings.php:291 actions/favor.php:75 actions/geocode.php:55
+#: actions/emailsettings.php:292 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:65 actions/grouplogo.php:321
-#: actions/groupunblock.php:65 actions/imsettings.php:224
-#: actions/invite.php:60 actions/login.php:137 actions/makeadmin.php:66
-#: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
-#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
-#: actions/othersettings.php:155 actions/passwordsettings.php:138
-#: actions/profilesettings.php:217 actions/recoverpassword.php:383
-#: actions/register.php:172 actions/remotesubscribe.php:76
-#: actions/repeat.php:82 actions/smssettings.php:250 actions/subedit.php:40
-#: actions/subscribe.php:86 actions/tagother.php:166
-#: actions/unsubscribe.php:69 actions/userauthorization.php:52
-#: lib/designsettings.php:310
+#: actions/groupunblock.php:65 actions/imsettings.php:241
+#: actions/invite.php:60 actions/makeadmin.php:66 actions/newmessage.php:135
+#: actions/newnotice.php:105 actions/nudge.php:80
+#: actions/oauthappssettings.php:162 actions/oauthconnectionssettings.php:135
+#: actions/passwordsettings.php:137 actions/pluginenable.php:87
+#: actions/profilesettings.php:218 actions/recoverpassword.php:383
+#: actions/register.php:157 actions/remotesubscribe.php:76
+#: actions/repeat.php:82 actions/smssettings.php:249 actions/subedit.php:40
+#: actions/subscribe.php:87 actions/tagother.php:145
+#: actions/unsubscribe.php:69 actions/urlsettings.php:171
+#: actions/userauthorization.php:53 lib/designsettings.php:122
 msgid "There was a problem with your session token. Try again, please."
 msgstr "Ocorreu um problema com a sua sessão. Por favor, tente novamente."
 
@@ -868,10 +922,10 @@ msgstr "Erro na base de dados ao inserir o utilizador da aplicação OAuth."
 #. TRANS: Unknown form validation error in design settings form.
 #: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
 #: actions/designadminpanel.php:100 actions/editapplication.php:144
-#: actions/emailsettings.php:310 actions/grouplogo.php:332
-#: actions/imsettings.php:239 actions/newapplication.php:124
-#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
-#: actions/smssettings.php:271 lib/designsettings.php:321
+#: actions/emailsettings.php:311 actions/grouplogo.php:332
+#: actions/imsettings.php:256 actions/newapplication.php:124
+#: actions/oauthconnectionssettings.php:144 actions/recoverpassword.php:46
+#: actions/smssettings.php:270 lib/designsettings.php:133
 msgid "Unexpected form submission."
 msgstr "Envio inesperado de formulário."
 
@@ -921,31 +975,26 @@ msgstr "Conta"
 
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Field label in form for profile settings.
-#. TRANS: Label for group nickname (dt). Text hidden by default.
-#. TRANS: DT for nick name in a profile.
-#: actions/apioauthauthorize.php:459 actions/login.php:252
-#: actions/profilesettings.php:106 actions/register.php:432
-#: actions/showgroup.php:243 actions/tagother.php:94
+#: actions/apioauthauthorize.php:459 actions/login.php:225
+#: actions/profilesettings.php:107 actions/register.php:411
 #: actions/userauthorization.php:145 lib/groupeditform.php:145
-#: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "Utilizador"
 
 #. TRANS: Field label on OAuth API authorisation form.
-#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:463 actions/login.php:255
-#: actions/register.php:436 lib/accountsettingsaction.php:120
+#: actions/apioauthauthorize.php:463 actions/login.php:228
+#: actions/register.php:415 lib/settingsnav.php:87
 msgid "Password"
 msgstr "Senha"
 
 #. TRANS: Button text that when clicked will cancel the process of allowing access to an account
 #. TRANS: by an external application.
 #. TRANS: Button label to cancel an e-mail address confirmation procedure.
-#. TRANS: Button label to cancel an Instant Messaging address confirmation procedure.
+#. TRANS: Button label to cancel an IM address confirmation procedure.
 #. TRANS: Button label to cancel a SMS address confirmation procedure.
 #. TRANS: Button label in the "Edit application" form.
-#: actions/apioauthauthorize.php:478 actions/emailsettings.php:124
-#: actions/imsettings.php:127 actions/smssettings.php:133
+#: actions/apioauthauthorize.php:478 actions/emailsettings.php:125
+#: actions/imsettings.php:136 actions/smssettings.php:132
 #: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Cancel"
@@ -1058,7 +1107,7 @@ msgstr "Método da API não encontrado."
 #. TRANS: %s is the requested output format.
 #: actions/apistatusesshow.php:144
 #, fuzzy, php-format
-msgid "Unsupported format: %s"
+msgid "Unsupported format: %s."
 msgstr "Formato não suportado."
 
 #. TRANS: Client error displayed requesting a deleted status.
@@ -1140,13 +1189,6 @@ msgstr "%1$s / Favoritas de %2$s"
 msgid "%1$s updates favorited by %2$s / %3$s."
 msgstr "%1$s actualizações preferidas por %2$s / %2$s."
 
-#. TRANS: Server error displayed when generating an Atom feed fails.
-#. TRANS: %s is the error.
-#: actions/apitimelinegroup.php:134
-#, fuzzy, php-format
-msgid "Could not generate feed for group - %s"
-msgstr "Não foi possível actualizar o grupo."
-
 #. TRANS: Title for timeline of most recent mentions of a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname.
 #: actions/apitimelinementions.php:115
@@ -1163,13 +1205,14 @@ msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr "%1$s actualizações em resposta a actualizações de %2$s / %3$s."
 
 #. TRANS: Title for site timeline. %s is the StatusNet sitename.
+#. TRANS: Public RSS feed title. %s is the StatusNet site name.
 #: actions/apitimelinepublic.php:193 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "Notas públicas de %s"
 
 #. TRANS: Subtitle for site timeline. %s is the StatusNet sitename.
-#: actions/apitimelinepublic.php:199 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:199
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "%s actualizações de todos!"
@@ -1181,21 +1224,33 @@ msgid "Unimplemented."
 msgstr "Método não implementado."
 
 #. TRANS: Title for Atom feed "repeated to me". %s is the user nickname.
-#: actions/apitimelineretweetedtome.php:108
+#: actions/apitimelineretweetedtome.php:96
 #, php-format
 msgid "Repeated to %s"
 msgstr "Repetida para %s"
 
+#: actions/apitimelineretweetedtome.php:98
+#, fuzzy, php-format
+msgid "%1$s notices that were to repeated to %2$s / %3$s."
+msgstr "%1$s actualizações em resposta a actualizações de %2$s / %3$s."
+
 #. TRANS: Title of list of repeated notices of the logged in user.
 #. TRANS: %s is the nickname of the logged in user.
-#: actions/apitimelineretweetsofme.php:112
+#: actions/apitimelineretweetsofme.php:98
 #, php-format
 msgid "Repeats of %s"
 msgstr "Repetições de %s"
 
+#: actions/apitimelineretweetsofme.php:104
+#, fuzzy, php-format
+msgid "%1$s notices that %2$s / %3$s has repeated."
+msgstr "%s (@%s) adicionou a sua nota às favoritas."
+
 #. TRANS: Title for timeline with lastest notices with a given tag.
 #. TRANS: %s is the tag.
-#: actions/apitimelinetag.php:101 actions/tag.php:67
+#. TRANS: Title for first page of notices with tags.
+#. TRANS: %s is the tag.
+#: actions/apitimelinetag.php:101 actions/tag.php:69
 #, php-format
 msgid "Notices tagged with %s"
 msgstr "Notas categorizadas com %s"
@@ -1208,54 +1263,55 @@ msgid "Updates tagged with %1$s on %2$s!"
 msgstr "Actualizações categorizadas com %1$s em %2$s!"
 
 #. TRANS: Client error displayed trying to add a notice to another user's timeline.
-#: actions/apitimelineuser.php:297
+#: actions/apitimelineuser.php:308
 #, fuzzy
 msgid "Only the user can add to their own timeline."
 msgstr "Só o próprio utilizador pode ler a sua caixa de correio."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:304
+#: actions/apitimelineuser.php:315
 msgid "Only accept AtomPub for Atom feeds."
 msgstr ""
 
 #. TRANS: Client error displayed attempting to post an empty API notice.
-#: actions/apitimelineuser.php:311
+#: actions/apitimelineuser.php:322
 msgid "Atom post must not be empty."
 msgstr ""
 
 #. TRANS: Client error displayed attempting to post an API that is not well-formed XML.
-#: actions/apitimelineuser.php:317
+#: actions/apitimelineuser.php:328
 msgid "Atom post must be well-formed XML."
 msgstr ""
 
 #. TRANS: Client error displayed when not using an Atom entry.
-#: actions/apitimelineuser.php:323 actions/atompubfavoritefeed.php:228
+#: actions/apitimelineuser.php:334 actions/atompubfavoritefeed.php:228
 #: actions/atompubmembershipfeed.php:230
 #: actions/atompubsubscriptionfeed.php:236
 msgid "Atom post must be an Atom entry."
 msgstr ""
 
 #. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
-#: actions/apitimelineuser.php:335
+#: actions/apitimelineuser.php:345
 msgid "Can only handle POST activities."
 msgstr ""
 
 #. TRANS: Client error displayed when using an unsupported activity object type.
 #. TRANS: %s is the unsupported activity object type.
-#: actions/apitimelineuser.php:346
+#: actions/apitimelineuser.php:356
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
 #. TRANS: %d is the notice ID (number).
-#: actions/apitimelineuser.php:380
+#: actions/apitimelineuser.php:390
 #, fuzzy, php-format
 msgid "No content for notice %d."
 msgstr "Procurar no conteúdo das notas"
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:408
+#. TRANS: %s is the notice URI.
+#: actions/apitimelineuser.php:419
 #, fuzzy, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "Não existe nenhuma nota com essa identificação."
@@ -1273,9 +1329,10 @@ msgstr "Método da API não encontrado."
 
 #. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
 #. TRANS: Client exception.
+#. TRANS: Client error displayed trying to subscribe to a non-existing profile.
 #: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
 #: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
-#: actions/subscribe.php:107
+#: actions/subscribe.php:110
 msgid "No such profile."
 msgstr "Perfil não foi encontrado."
 
@@ -1422,7 +1479,7 @@ msgid "Not a member."
 msgstr "Todos os membros"
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
-#: actions/atompubshowmembership.php:151
+#: actions/atompubshowmembership.php:150
 #, fuzzy
 msgid "Cannot delete someone else's membership."
 msgstr "Não foi possível apagar a auto-subscrição."
@@ -1511,10 +1568,7 @@ msgid "Invalid size."
 msgstr "Tamanho inválido."
 
 #. TRANS: Title for avatar upload page.
-#. TRANS: Label for group avatar (dt). Text hidden by default.
-#. TRANS: Link description in user account settings menu.
-#: actions/avatarsettings.php:66 actions/showgroup.php:227
-#: lib/accountsettingsaction.php:113
+#: actions/avatarsettings.php:66 lib/settingsnav.php:82
 msgid "Avatar"
 msgstr "Avatar"
 
@@ -1527,9 +1581,11 @@ msgstr "Pode carregar o seu avatar pessoal. O tamanho máximo do ficheiro é %s.
 
 #. TRANS: Server error displayed in avatar upload page when no matching profile can be found for a user.
 #. TRANS: Server error displayed coming across a request from a user without a profile.
+#. TRANS: Server error displayed when trying to authorise a remote subscription request
+#. TRANS: while the user has no profile.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
 #: actions/grouplogo.php:184 actions/remotesubscribe.php:190
-#: actions/userauthorization.php:72 actions/userrss.php:108
+#: actions/userauthorization.php:75 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr "Utilizador sem perfil correspondente."
 
@@ -1587,10 +1643,10 @@ msgstr "Cortar"
 msgid "No file uploaded."
 msgstr "Não foi carregado nenhum ficheiro."
 
-#. TRANS: Avatar upload form unstruction after uploading a file.
+#. TRANS: Avatar upload form instruction after uploading a file.
 #: actions/avatarsettings.php:345
 #, fuzzy
-msgid "Pick a square area of the image to be your avatar"
+msgid "Pick a square area of the image to be your avatar."
 msgstr "Escolha uma área quadrada da imagem para ser o seu avatar"
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
@@ -1616,7 +1672,7 @@ msgstr "Avatar apagado."
 
 #. TRANS: Title for backup account page.
 #. TRANS: Option in profile settings to create a backup of the account of the currently logged in user.
-#: actions/backupaccount.php:61 actions/profilesettings.php:467
+#: actions/backupaccount.php:61 actions/profilesettings.php:468
 msgid "Backup account"
 msgstr ""
 
@@ -1650,7 +1706,7 @@ msgstr "Fundo"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
 #: actions/backupaccount.php:254
-msgid "Backup your account"
+msgid "Backup your account."
 msgstr ""
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
@@ -1692,7 +1748,7 @@ msgstr "Não"
 #. TRANS: Submit button title for 'No' when blocking a user.
 #: actions/block.php:158
 #, fuzzy
-msgid "Do not block this user"
+msgid "Do not block this user."
 msgstr "Não bloquear este utilizador"
 
 #. TRANS: Button label on the user block form.
@@ -1709,9 +1765,9 @@ msgid "Yes"
 msgstr "Sim"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#. TRANS: Description of the form to block a user.
-#: actions/block.php:165 lib/blockform.php:79
-msgid "Block this user"
+#: actions/block.php:165
+#, fuzzy
+msgid "Block this user."
 msgstr "Bloquear este utilizador"
 
 #. TRANS: Server error displayed when blocking a user fails.
@@ -1778,32 +1834,48 @@ msgstr "Código de confirmação não encontrado"
 msgid "That confirmation code is not for you!"
 msgstr "Esse código de confirmação não é para si!"
 
-#. TRANS: Server error for a unknow address type %s, which can be 'email', 'jabber', or 'sms'.
-#: actions/confirmaddress.php:92
-#, php-format
-msgid "Unrecognized address type %s."
+#. TRANS: Server error for an unknown address type, which can be 'email', 'sms', or the name of an IM network (such as 'xmpp' or 'aim')
+#: actions/confirmaddress.php:94
+#, fuzzy, php-format
+msgid "Unrecognized address type %s"
 msgstr "Tipo do endereço %s não reconhecido."
 
 #. TRANS: Client error for an already confirmed email/jabber/sms address.
-#: actions/confirmaddress.php:97
+#: actions/confirmaddress.php:103 actions/confirmaddress.php:136
 msgid "That address has already been confirmed."
 msgstr "Esse endereço já tinha sido confirmado."
 
+#: actions/confirmaddress.php:121 actions/imsettings.php:444
+#: actions/userdesignsettings.php:306
+#, fuzzy
+msgid "Couldn't update user."
+msgstr "Não foi possível actualizar o utilizador."
+
+#: actions/confirmaddress.php:144
+#, fuzzy
+msgid "Couldn't update user im preferences."
+msgstr "Não foi possível actualizar o registo do utilizador."
+
+#: actions/confirmaddress.php:156
+#, fuzzy
+msgid "Couldn't insert user im preferences."
+msgstr "Não foi possível inserir nova subscrição."
+
 #. TRANS: Server error displayed when an address confirmation code deletion from the
 #. TRANS: database fails in the contact address confirmation action.
-#: actions/confirmaddress.php:132
+#: actions/confirmaddress.php:169
 #, fuzzy
 msgid "Could not delete address confirmation."
 msgstr "Não foi possível apagar a confirmação do mensageiro instantâneo."
 
 #. TRANS: Title for the contact address confirmation action.
-#: actions/confirmaddress.php:150
+#: actions/confirmaddress.php:185
 msgid "Confirm address"
 msgstr "Confirmar endereço"
 
 #. TRANS: Success message for the contact address confirmation action.
 #. TRANS: %s can be 'email', 'jabber', or 'sms'.
-#: actions/confirmaddress.php:166
+#: actions/confirmaddress.php:200
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "O endereço \"%s\" foi confirmado para a sua conta."
@@ -1817,6 +1889,7 @@ msgstr "Conversação"
 #. TRANS: Label for user statistics.
 #: actions/conversation.php:149 lib/noticelist.php:87
 #: lib/profileaction.php:246 lib/searchgroupnav.php:82
+#: lib/threadednoticelist.php:66
 msgid "Notices"
 msgstr "Notas"
 
@@ -1852,7 +1925,7 @@ msgstr "Avatar apagado."
 
 #. TRANS: Page title for page on which a user account can be deleted.
 #. TRANS: Option in profile settings to delete the account of the currently logged in user.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:475
+#: actions/deleteaccount.php:228 actions/profilesettings.php:476
 #, fuzzy
 msgid "Delete account"
 msgstr "Criar uma conta"
@@ -1876,7 +1949,7 @@ msgstr ""
 #. TRANS: Field label for delete account confirmation entry.
 #. TRANS: Field label for password reset form where the password has to be typed again.
 #: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:262 actions/register.php:440
+#: actions/recoverpassword.php:262 actions/register.php:419
 msgid "Confirm"
 msgstr "Confirmação"
 
@@ -1906,14 +1979,14 @@ msgstr "Aplicação não foi encontrada."
 #. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
 #: actions/deleteapplication.php:79 actions/editapplication.php:78
-#: actions/showapplication.php:94
+#: actions/showapplication.php:90
 msgid "You are not the owner of this application."
 msgstr "Não é o proprietário desta aplicação."
 
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
-#: actions/newapplication.php:112 actions/showapplication.php:118
-#: lib/action.php:1425
+#: actions/newapplication.php:112 actions/showapplication.php:113
+#: lib/action.php:1391
 msgid "There was a problem with your session token."
 msgstr "Ocorreu um problema com a sua sessão."
 
@@ -1937,13 +2010,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting an application.
 #: actions/deleteapplication.php:161
 #, fuzzy
-msgid "Do not delete this application"
+msgid "Do not delete this application."
 msgstr "Não apagar esta aplicação"
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
 #: actions/deleteapplication.php:167
 #, fuzzy
-msgid "Delete this application"
+msgid "Delete this application."
 msgstr "Apagar esta aplicação"
 
 #. TRANS: Client error when trying to delete group while not logged in.
@@ -2001,13 +2074,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting a group.
 #: actions/deletegroup.php:224
 #, fuzzy
-msgid "Do not delete this group"
+msgid "Do not delete this group."
 msgstr "Não apagar esta nota"
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
 #: actions/deletegroup.php:231
 #, fuzzy
-msgid "Delete this group"
+msgid "Delete this group."
 msgstr "Apagar este utilizador"
 
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
@@ -2015,14 +2088,16 @@ msgstr "Apagar este utilizador"
 #. TRANS: Client error displayed when trying to mark a notice as favorite without being logged in.
 #. TRANS: Client error displayed trying to block a user from a group while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
+#. TRANS: Client error displayed trying to log out when not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
+#. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
 #. TRANS: Client error displayed when trying to change user options while not logged in.
 #: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
-#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:69
+#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:70
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
-#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
-#: actions/tagother.php:33 actions/unsubscribe.php:52
+#: actions/nudge.php:63 actions/pluginenable.php:97 actions/subedit.php:33
+#: actions/subscribe.php:98 actions/tagother.php:33 actions/unsubscribe.php:52
 #: lib/adminpanelaction.php:71 lib/profileformaction.php:63
 #: lib/settingsaction.php:72
 msgid "Not logged in."
@@ -2051,12 +2126,13 @@ msgstr "Tem a certeza de que quer apagar esta nota?"
 #. TRANS: Submit button title for 'No' when deleting a notice.
 #: actions/deletenotice.php:159
 #, fuzzy
-msgid "Do not delete this notice"
+msgid "Do not delete this notice."
 msgstr "Não apagar esta nota"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:166 lib/noticelist.php:673
-msgid "Delete this notice"
+#: actions/deletenotice.php:166
+#, fuzzy
+msgid "Delete this notice."
 msgstr "Apagar esta nota"
 
 #. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
@@ -2093,18 +2169,17 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting a user.
 #: actions/deleteuser.php:158
 #, fuzzy
-msgid "Do not delete this user"
+msgid "Do not delete this user."
 msgstr "Não apagar esta nota"
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
-#. TRANS: Description of form for deleting a user.
-#: actions/deleteuser.php:165 lib/deleteuserform.php:75
-msgid "Delete this user"
+#: actions/deleteuser.php:165
+#, fuzzy
+msgid "Delete this user."
 msgstr "Apagar este utilizador"
 
 #. TRANS: Message used as title for design settings for the site.
-#. TRANS: Link description in user account settings menu.
-#: actions/designadminpanel.php:60 lib/accountsettingsaction.php:134
+#: actions/designadminpanel.php:60 lib/settingsnav.php:97
 msgid "Design"
 msgstr "Estilo"
 
@@ -2175,8 +2250,7 @@ msgstr ""
 "um arquivo .ZIP."
 
 #. TRANS: Fieldset legend for theme background image.
-#. TRANS: Fieldset legend on profile design page.
-#: actions/designadminpanel.php:515 lib/designsettings.php:98
+#: actions/designadminpanel.php:515
 msgid "Change background image"
 msgstr "Alterar imagem de fundo"
 
@@ -2184,7 +2258,7 @@ msgstr "Alterar imagem de fundo"
 #. TRANS: Field label for background color selector.
 #. TRANS: Label on profile design page for setting a profile page background colour.
 #: actions/designadminpanel.php:525 actions/designadminpanel.php:609
-#: lib/designsettings.php:183
+#: lib/designform.php:238
 msgid "Background"
 msgstr "Fundo"
 
@@ -2211,13 +2285,13 @@ msgstr "Desligar"
 #. TRANS: Form guide for turning background image on or off on theme designer page.
 #. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
 #. TRANS: use of the uploaded profile image.
-#: actions/designadminpanel.php:577 lib/designsettings.php:159
+#: actions/designadminpanel.php:577 lib/designform.php:214
 msgid "Turn background image on or off."
 msgstr "Ligar ou desligar a imagem de fundo."
 
 #. TRANS: Checkbox label to title background image on theme designer page.
 #. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-#: actions/designadminpanel.php:583 lib/designsettings.php:165
+#: actions/designadminpanel.php:583 lib/designform.php:220
 msgid "Tile background image"
 msgstr "Repetir imagem de fundo em mosaico"
 
@@ -2229,25 +2303,25 @@ msgstr "Alterar cores"
 
 #. TRANS: Field label for content color selector.
 #. TRANS: Label on profile design page for setting a profile page content colour.
-#: actions/designadminpanel.php:623 lib/designsettings.php:197
+#: actions/designadminpanel.php:623 lib/designform.php:252
 msgid "Content"
 msgstr "Conteúdo"
 
 #. TRANS: Field label for sidebar color selector.
 #. TRANS: Label on profile design page for setting a profile page sidebar colour.
-#: actions/designadminpanel.php:637 lib/designsettings.php:211
+#: actions/designadminpanel.php:637 lib/designform.php:266
 msgid "Sidebar"
 msgstr "Barra"
 
 #. TRANS: Field label for text color selector.
 #. TRANS: Label on profile design page for setting a profile page text colour.
-#: actions/designadminpanel.php:651 lib/designsettings.php:225
+#: actions/designadminpanel.php:651 lib/designform.php:280
 msgid "Text"
 msgstr "Texto"
 
 #. TRANS: Field label for link color selector.
 #. TRANS: Label on profile design page for setting a profile page links colour.
-#: actions/designadminpanel.php:665 lib/designsettings.php:239
+#: actions/designadminpanel.php:665 lib/designform.php:294
 msgid "Links"
 msgstr "Links"
 
@@ -2269,21 +2343,21 @@ msgid "Use defaults"
 msgstr "Usar predefinições"
 
 #. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: actions/designadminpanel.php:720 lib/designsettings.php:259
-msgid "Restore default designs"
+#: actions/designadminpanel.php:720
+#, fuzzy
+msgid "Restore default designs."
 msgstr "Repor estilos predefinidos"
 
 #. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: actions/designadminpanel.php:728 lib/designsettings.php:267
-msgid "Reset back to default"
+#: actions/designadminpanel.php:728
+#, fuzzy
+msgid "Reset back to default."
 msgstr "Repor predefinição"
 
 #. TRANS: Title for button for saving theme settings.
-#. TRANS: Title for button on profile design page to save settings.
-#: actions/designadminpanel.php:736 lib/designsettings.php:272
-msgid "Save design"
+#: actions/designadminpanel.php:736
+#, fuzzy
+msgid "Save design."
 msgstr "Gravar o estilo"
 
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
@@ -2315,7 +2389,7 @@ msgid "You must be logged in to edit an application."
 msgstr "Tem de iniciar uma sessão para editar uma aplicação."
 
 #. TRANS: Client error displayed trying to edit an application that does not exist.
-#: actions/editapplication.php:83 actions/showapplication.php:87
+#: actions/editapplication.php:83 actions/showapplication.php:83
 msgid "No such application."
 msgstr "Aplicação não foi encontrada."
 
@@ -2408,80 +2482,53 @@ msgstr "Editar grupo %s"
 msgid "You must be logged in to create a group."
 msgstr "Tem de iniciar uma sessão para criar o grupo."
 
-#. TRANS: Client error displayed trying to edit a group while not being a group admin.
-#. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
-#. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
-#: actions/editgroup.php:110 actions/editgroup.php:176
-#: actions/groupdesignsettings.php:109 actions/grouplogo.php:111
-msgid "You must be an admin to edit the group."
-msgstr "Tem de ser administrador para editar o grupo."
-
 #. TRANS: Form instructions for group edit form.
 #: actions/editgroup.php:161
 msgid "Use this form to edit the group."
 msgstr "Use este formulário para editar o grupo."
 
-#. TRANS: Group edit form validation error.
-#. TRANS: Group create form validation error.
-#. TRANS: %s is the invalid alias.
-#: actions/editgroup.php:241 actions/newgroup.php:188
-#, php-format
-msgid "Invalid alias: \"%s\""
-msgstr "Nome alternativo inválido: \"%s\""
-
-#. TRANS: Server error displayed when editing a group fails.
-#: actions/editgroup.php:274
-msgid "Could not update group."
-msgstr "Não foi possível actualizar o grupo."
-
-#. TRANS: Server error displayed when group aliases could not be added.
-#. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/editgroup.php:281 classes/User_group.php:540
-msgid "Could not create aliases."
-msgstr "Não foi possível criar os nomes alternativos."
-
 #. TRANS: Group edit form success message.
 #: actions/editgroup.php:301
 msgid "Options saved."
 msgstr "Opções gravadas."
 
 #. TRANS: Title for e-mail settings.
-#: actions/emailsettings.php:59
+#: actions/emailsettings.php:60
 msgid "Email settings"
 msgstr "Configurações do correio electrónico"
 
 #. TRANS: E-mail settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/emailsettings.php:73
+#: actions/emailsettings.php:74
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 msgstr "Defina como receberá mensagens electrónicas de %%site.name%%."
 
 #. TRANS: Form legend for e-mail settings form.
 #. TRANS: Field label for e-mail address input in e-mail settings form.
-#: actions/emailsettings.php:103 actions/emailsettings.php:129
+#: actions/emailsettings.php:104 actions/emailsettings.php:130
 msgid "Email address"
 msgstr "Endereço de correio electrónico"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:109
+#: actions/emailsettings.php:110
 msgid "Current confirmed email address."
 msgstr "Endereço de correio já confirmado."
 
 #. TRANS: Button label to remove a confirmed e-mail address.
 #. TRANS: Button label for removing a set sender e-mail address to post notices from.
-#. TRANS: Button label to remove a confirmed Instant Messaging address.
+#. TRANS: Button label to remove a confirmed IM address.
 #. TRANS: Button label to remove a confirmed SMS address.
 #. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
-#: actions/emailsettings.php:112 actions/emailsettings.php:179
-#: actions/imsettings.php:112 actions/smssettings.php:120
-#: actions/smssettings.php:176
+#: actions/emailsettings.php:113 actions/emailsettings.php:180
+#: actions/imsettings.php:119 actions/smssettings.php:119
+#: actions/smssettings.php:175
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Remover"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:119
+#: actions/emailsettings.php:120
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -2494,45 +2541,45 @@ msgstr ""
 #. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
 #. TRANS: Any other domain may be owned by a legitimate person or
 #. TRANS: organization.
-#: actions/emailsettings.php:136
+#: actions/emailsettings.php:137
 msgid "Email address, like \"UserName@example.org\""
 msgstr ""
 "Endereço de correio electrónico, por ex. \"nomedeutilizador@exemplo.pt\""
 
 #. TRANS: Button label for adding an e-mail address in e-mail settings form.
-#. TRANS: Button label for adding an Instant Messaging address in Instant Messaging settings form.
+#. TRANS: Button label for adding an IM address in IM settings form.
 #. TRANS: Button label for adding a SMS phone number in SMS settings form.
-#: actions/emailsettings.php:140 actions/imsettings.php:147
-#: actions/smssettings.php:158
+#: actions/emailsettings.php:141 actions/imsettings.php:147
+#: actions/smssettings.php:157
 msgctxt "BUTTON"
 msgid "Add"
 msgstr "Adicionar"
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:148 actions/smssettings.php:167
+#: actions/emailsettings.php:149 actions/smssettings.php:166
 msgid "Incoming email"
 msgstr "Correio recebido"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:154
+#: actions/emailsettings.php:155
 msgid "I want to post notices by email."
 msgstr "Quero publicar notas por correio electrónico."
 
 #. TRANS: Form instructions for incoming e-mail form in e-mail settings.
 #. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
-#: actions/emailsettings.php:176 actions/smssettings.php:174
+#: actions/emailsettings.php:177 actions/smssettings.php:173
 msgid "Send email to this address to post new notices."
 msgstr "Envie mensagens electrónicas para este endereço para publicar notas."
 
 #. TRANS: Instructions for incoming e-mail address input form, when an address has already been assigned.
 #. TRANS: Instructions for incoming SMS e-mail address input form.
-#: actions/emailsettings.php:185 actions/smssettings.php:182
+#: actions/emailsettings.php:186 actions/smssettings.php:181
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr "Crie um endereço electrónico novo para publicações; cancela o antigo."
 
 #. TRANS: Instructions for incoming e-mail address input form.
-#: actions/emailsettings.php:189
+#: actions/emailsettings.php:190
 msgid ""
 "To send notices via email, we need to create a unique email address for you "
 "on this server:"
@@ -2540,93 +2587,93 @@ msgstr ""
 
 #. TRANS: Button label for adding an e-mail address to send notices from.
 #. TRANS: Button label for adding an SMS e-mail address to send notices from.
-#: actions/emailsettings.php:195 actions/smssettings.php:185
+#: actions/emailsettings.php:196 actions/smssettings.php:184
 msgctxt "BUTTON"
 msgid "New"
 msgstr "Novo"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:204
+#: actions/emailsettings.php:205
 msgid "Email preferences"
 msgstr "Preferências de correio electrónico"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:212
+#: actions/emailsettings.php:213
 msgid "Send me notices of new subscriptions through email."
 msgstr "Enviem-me notificação electrónica das novas subscrições."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:218
+#: actions/emailsettings.php:219
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr ""
 "Enviem-me notificação electrónica quando uma nota minha é adicionada às "
 "favoritas."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:225
+#: actions/emailsettings.php:226
 msgid "Send me email when someone sends me a private message."
 msgstr ""
 "Enviem-me notificação electrónica quando me enviarem uma mensagem privada."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:231
+#: actions/emailsettings.php:232
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr ""
 "Enviem-me notificação electrónica quando me enviarem uma \"resposta-@\"."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:237
+#: actions/emailsettings.php:238
 msgid "Allow friends to nudge me and send me an email."
 msgstr "Permitir que amigos me toquem e enviem mensagens electrónicas."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:243
+#: actions/emailsettings.php:244
 msgid "Publish a MicroID for my email address."
 msgstr "Publicar um MicroID para o meu endereço electrónico."
 
 #. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:361
+#: actions/emailsettings.php:362
 msgid "Email preferences saved."
 msgstr "Preferências de correio electrónico foram gravadas."
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:380
+#: actions/emailsettings.php:381
 msgid "No email address."
 msgstr "Sem endereço de correio electrónico."
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:388
+#: actions/emailsettings.php:389
 #, fuzzy
 msgid "Cannot normalize that email address."
 msgstr "Não é possível normalizar esse endereço electrónico"
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:393 actions/register.php:212
+#: actions/emailsettings.php:394 actions/register.php:197
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "Correio electrónico é inválido."
 
 #. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:397
+#: actions/emailsettings.php:398
 msgid "That is already your email address."
 msgstr "Esse já é o seu endereço electrónico."
 
 #. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:401
+#: actions/emailsettings.php:402
 msgid "That email address already belongs to another user."
 msgstr "Esse endereço electrónico já pertence a outro utilizador."
 
 #. TRANS: Server error thrown on database error adding e-mail confirmation code.
 #. TRANS: Server error thrown on database error adding Instant Messaging confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:418 actions/imsettings.php:343
-#: actions/smssettings.php:365
+#: actions/emailsettings.php:419 actions/imsettings.php:362
+#: actions/smssettings.php:364
 #, fuzzy
 msgid "Could not insert confirmation code."
 msgstr "Não foi possível inserir o código de confirmação."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:425
+#: actions/emailsettings.php:426
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
@@ -2638,59 +2685,62 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling Instant Messaging address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:445 actions/imsettings.php:377
-#: actions/smssettings.php:399
+#: actions/emailsettings.php:446 actions/imsettings.php:391
+#: actions/smssettings.php:398
 msgid "No pending confirmation to cancel."
 msgstr "Nenhuma confirmação pendente para cancelar."
 
 #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:450
+#: actions/emailsettings.php:451
 msgid "That is the wrong email address."
 msgstr "Esse endereço de correio electrónico está errado."
 
 #. TRANS: Server error thrown on database error canceling e-mail address confirmation.
 #. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
-#: actions/emailsettings.php:459 actions/smssettings.php:413
+#: actions/emailsettings.php:460 actions/smssettings.php:412
 #, fuzzy
 msgid "Could not delete email confirmation."
 msgstr "Não foi possível apagar a confirmação do endereço electrónico."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:464
+#: actions/emailsettings.php:465
 msgid "Email confirmation cancelled."
 msgstr "Confirmação de correio electrónico cancelada."
 
 #. TRANS: Message given trying to remove an e-mail address that is not
 #. TRANS: registered for the active user.
-#: actions/emailsettings.php:483
+#: actions/emailsettings.php:484
 msgid "That is not your email address."
 msgstr "Esse não é o seu endereço electrónico."
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:504
+#: actions/emailsettings.php:505
 msgid "The email address was removed."
 msgstr "O endereço de correio electrónico foi removido."
 
 #. TRANS: Form validation error displayed when trying to remove an incoming e-mail address while no address has been set.
-#: actions/emailsettings.php:518 actions/smssettings.php:555
+#: actions/emailsettings.php:519 actions/smssettings.php:554
 msgid "No incoming email address."
 msgstr "Sem endereço electrónico de entrada."
 
 #. TRANS: Server error thrown on database error removing incoming e-mail address.
 #. TRANS: Server error thrown on database error adding incoming e-mail address.
-#: actions/emailsettings.php:530 actions/emailsettings.php:554
-#: actions/smssettings.php:565 actions/smssettings.php:588
+#. TRANS: Server error displayed when the user could not be updated in SMS settings.
+#: actions/emailsettings.php:531 actions/emailsettings.php:555
+#: actions/smssettings.php:565 actions/smssettings.php:590
 #, fuzzy
 msgid "Could not update user record."
 msgstr "Não foi possível actualizar o registo do utilizador."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:534 actions/smssettings.php:568
+#. TRANS: Confirmation text after updating SMS settings.
+#: actions/emailsettings.php:535 actions/smssettings.php:569
 msgid "Incoming email address removed."
 msgstr "Endereço electrónico de entrada foi removido."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:558 actions/smssettings.php:591
+#. TRANS: Confirmation text after updating SMS settings.
+#: actions/emailsettings.php:559 actions/smssettings.php:594
 msgid "New incoming email address added."
 msgstr "Adicionado endereço electrónico de entrada novo."
 
@@ -2702,7 +2752,7 @@ msgstr "Esta nota já é uma favorita!"
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
 #: actions/favor.php:95
 #, fuzzy
-msgid "Disfavor favorite"
+msgid "Disfavor favorite."
 msgstr "Retirar das favoritas"
 
 #. TRANS: Page title for first page of favorited notices.
@@ -2754,9 +2804,8 @@ msgstr ""
 #. TRANS: %s is a user's nickname.
 #. TRANS: Title for first page of favourite notices of a user.
 #. TRANS: %s is the user for whom the favourite notices are displayed.
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing own favourited notices.
 #: actions/favoritesrss.php:111 actions/showfavorites.php:76
-#: lib/personalgroupnav.php:122
+#: lib/personalgroupnav.php:110
 #, php-format
 msgid "%s's favorite notices"
 msgstr "Notas favoritas de %s"
@@ -2943,13 +2992,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
 #: actions/groupblock.php:191
 #, fuzzy
-msgid "Do not block this user from this group"
+msgid "Do not block this user from this group."
 msgstr "Não bloquear acesso deste utilizador a este grupo"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
 #: actions/groupblock.php:198
 #, fuzzy
-msgid "Block this user from this group"
+msgid "Block this user from this group."
 msgstr "Bloquear acesso deste utilizador a este grupo"
 
 #. TRANS: Server error displayed when trying to block a user from a group fails because of an application error.
@@ -2958,6 +3007,7 @@ msgid "Database error blocking user from group."
 msgstr "Erro na base de dados ao bloquear acesso do utilizador ao grupo."
 
 #. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
+#. TRANS: Client error displayed trying to find a user by ID without providing an ID.
 #: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr "Sem ID."
@@ -2988,7 +3038,7 @@ msgid "Unable to update your design settings."
 msgstr "Não foi possível gravar as configurações do estilo."
 
 #. TRANS: Form text to confirm saved group design settings.
-#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:222
+#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:239
 msgid "Design preferences saved."
 msgstr "Preferências de estilo foram gravadas."
 
@@ -3053,7 +3103,7 @@ msgid "A list of the users in this group."
 msgstr "Uma lista dos utilizadores neste grupo."
 
 #. TRANS: Indicator in group members list that this user is a group administrator.
-#: actions/groupmembers.php:190
+#: actions/groupmembers.php:190 lib/action.php:581
 msgid "Admin"
 msgstr "Gestor"
 
@@ -3146,8 +3196,10 @@ msgid "Group search"
 msgstr "Pesquisa de grupos"
 
 #. TRANS: Text on page where groups can be searched if no results were found for a query.
-#: actions/groupsearch.php:82 actions/noticesearch.php:117
-#: actions/peoplesearch.php:83
+#. TRANS: Text for notice search results is the query had no results.
+#. TRANS: Message on the "People search" page where a query has no results.
+#: actions/groupsearch.php:82 actions/noticesearch.php:122
+#: actions/peoplesearch.php:87
 msgid "No results."
 msgstr "Sem resultados."
 
@@ -3184,167 +3236,169 @@ msgid "User is not blocked from group."
 msgstr "Acesso do utilizador ao grupo não foi bloqueado."
 
 #. TRANS: Server error displayed when unblocking a user from a group fails because of an unknown error.
+#. TRANS: Server error displayed when removing a user block.
 #: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "Erro ao remover o bloqueio."
 
 #. TRANS: Title for Instant Messaging settings.
-#: actions/imsettings.php:58
+#: actions/imsettings.php:56
 msgid "IM settings"
 msgstr "Configurações do 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.
-#: actions/imsettings.php:71
+#: actions/imsettings.php:69
 #, fuzzy, php-format
 msgid ""
-"You can send and receive notices through Jabber/Google Talk [instant "
-"messages](%%doc.im%%). Configure your address and settings below."
+"You can send and receive notices through instant messaging [instant messages]"
+"(%%doc.im%%). Configure your addresses and settings below."
 msgstr ""
 "Pode enviar e receber notas através de [mensagens instantâneas](%%doc.im%%) "
 "Jabber/GTalk. Configure o seu endereço e outras definições abaixo."
 
-#. TRANS: Message given in the Instant Messaging settings if XMPP is not enabled on the site.
+#. TRANS: Message given in the IM settings if IM is not enabled on the site.
 #: actions/imsettings.php:90
 msgid "IM is not available."
 msgstr "MI não está disponível."
 
-#. TRANS: Form legend for Instant Messaging settings form.
-#. TRANS: Field label for Instant Messaging address input in Instant Messaging settings form.
-#: actions/imsettings.php:102 actions/imsettings.php:132
-msgid "IM address"
-msgstr "Endereço IM"
+#: actions/imsettings.php:116
+#, fuzzy, php-format
+msgid "Current confirmed %s address."
+msgstr "Endereço de correio já confirmado."
 
-#: actions/imsettings.php:109
-#, fuzzy
-msgid "Current confirmed Jabber/Google Talk address."
-msgstr "Endereço do Jabber/GTalk já confirmado."
-
-#. TRANS: Form note in Instant Messaging settings form.
-#. TRANS: %s is the Instant Messaging address set for the site.
-#: actions/imsettings.php:120
+#. TRANS: Form note in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:128
 #, fuzzy, php-format
 msgid ""
-"Awaiting confirmation on this address. Check your Jabber/Google Talk account "
-"for a message with further instructions. (Did you add %s to your buddy list?)"
+"Awaiting confirmation on this address. Check your %s account for a message "
+"with further instructions. (Did you add %s to your buddy list?)"
 msgstr ""
 "A aguardar confirmação deste endereço. Verifique as instruções que foram "
 "enviadas para a sua conta de Jabber/GTalk. (Adicionou %s à sua lista de "
 "amigos?)"
 
-#. TRANS: IM address input field instructions in Instant Messaging settings form.
-#. TRANS: %s is the Instant Messaging address set for the site.
-#. TRANS: Do not translate "example.org". It is one of the domain names reserved for use in examples by
-#. TRANS: http://www.rfc-editor.org/rfc/rfc2606.txt. Any other domain may be owned by a legitimate
-#. TRANS: person or organization.
-#: actions/imsettings.php:139
-#, fuzzy, php-format
-msgid ""
-"Jabber or Google Talk address, like \"UserName@example.org\". First, make "
-"sure to add %s to your buddy list in your IM client or on Google Talk."
-msgstr ""
-"Endereço Jabber ou GTalk, por exemplo \"NomeDeUtilizador@exemplo.pt\". "
-"Primeiro, certifique-se de que adicionou %s à sua lista de amigos no cliente "
-"MI ou no GTalk."
+#: actions/imsettings.php:140
+msgid "IM address"
+msgstr "Endereço IM"
 
-#. TRANS: Form legend for Instant Messaging preferences form.
-#: actions/imsettings.php:154
-msgid "IM preferences"
+#: actions/imsettings.php:142
+#, php-format
+msgid "%s screenname."
+msgstr ""
+
+#. TRANS: Header for IM preferences form.
+#: actions/imsettings.php:163
+#, fuzzy
+msgid "IM Preferences"
 msgstr "Preferências de MI"
 
-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:159
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:174
 #, fuzzy
-msgid "Send me notices through Jabber/Google Talk."
-msgstr "Enviar-me notas via Jabber/GTalk."
+msgid "Send me notices"
+msgstr "Enviar uma nota"
 
-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:165
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:176
 #, fuzzy
-msgid "Post a notice when my Jabber/Google Talk status changes."
+msgid "Post a notice when my status changes."
 msgstr "Publicar uma nota quando o meu estado no Jabber/GTalk se altera."
 
-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:171
-#, fuzzy
-msgid ""
-"Send me replies through Jabber/Google Talk from people I'm not subscribed to."
-msgstr "Enviar-me via Jabber/GTalk respostas de pessoas que não subscrevo."
-
-#. TRANS: Checkbox label in Instant Messaging preferences form.
+#. TRANS: Checkbox label in IM preferences form.
 #: actions/imsettings.php:178
 #, fuzzy
-msgid "Publish a MicroID for my Jabber/Google Talk address."
-msgstr "Publicar um MicroID para o meu endereço Jabber/GTalk."
+msgid "Send me replies from people I'm not subscribed to."
+msgstr "Enviar-me via Jabber/GTalk respostas de pessoas que não subscrevo."
 
-#. TRANS: Confirmation message for successful Instant Messaging preferences save.
-#: actions/imsettings.php:283 actions/othersettings.php:192
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:181
+#, fuzzy
+msgid "Publish a MicroID"
+msgstr "Publicar um MicroID para o meu endereço electrónico."
+
+#. TRANS: Server error thrown on database error updating IM preferences.
+#: actions/imsettings.php:291
+#, fuzzy
+msgid "Couldn't update IM preferences."
+msgstr "Não foi possível actualizar o utilizador."
+
+#. TRANS: Confirmation message for successful IM preferences save.
+#. TRANS: Confirmation message after saving preferences.
+#: actions/imsettings.php:298 actions/urlsettings.php:244
 msgid "Preferences saved."
 msgstr "Preferências gravadas."
 
-#. TRANS: Message given saving Instant Messaging address without having provided one.
-#: actions/imsettings.php:304
-msgid "No Jabber ID."
-msgstr "Não introduziu o Jabber ID."
-
-#. TRANS: Message given saving Instant Messaging address that cannot be normalised.
-#: actions/imsettings.php:312
+#. TRANS: Message given saving IM address without having provided one.
+#: actions/imsettings.php:320
 #, fuzzy
-msgid "Cannot normalize that Jabber ID."
+msgid "No screenname."
+msgstr "Nome de utilizador não definido."
+
+#: actions/imsettings.php:325
+#, fuzzy
+msgid "No transport."
+msgstr "Sem nota."
+
+#. TRANS: Message given saving IM address that cannot be normalised.
+#: actions/imsettings.php:333
+#, fuzzy
+msgid "Cannot normalize that screenname"
 msgstr "Não é possível normalizar esse Jabber ID"
 
-#. TRANS: Message given saving Instant Messaging address that not valid.
-#: actions/imsettings.php:317
+#. TRANS: Message given saving IM address that not valid.
+#: actions/imsettings.php:340
 #, fuzzy
-msgid "Not a valid Jabber ID."
-msgstr "Jabber ID não é válido"
+msgid "Not a valid screenname"
+msgstr "Utilizador não é válido."
 
-#. TRANS: Message given saving Instant Messaging address that is already set.
-#: actions/imsettings.php:321
-msgid "That is already your Jabber ID."
-msgstr "Esse já é o seu Jabber ID."
-
-#. TRANS: Message given saving Instant Messaging address that is already set for another user.
-#: actions/imsettings.php:325
-msgid "Jabber ID already belongs to another user."
+#. TRANS: Message given saving IM address that is already set for another user.
+#: actions/imsettings.php:344
+#, fuzzy
+msgid "Screenname already belongs to another user."
 msgstr "O Jabber ID introduzido já pertence a outro utilizador."
 
-#. TRANS: Message given saving valid Instant Messaging address that is to be confirmed.
-#. TRANS: %s is the Instant Messaging address set for the site.
-#: actions/imsettings.php:353
-#, php-format
-msgid ""
-"A confirmation code was sent to the IM address you added. You must approve %"
-"s for sending messages to you."
+#. TRANS: Message given saving valid IM address that is to be confirmed.
+#: actions/imsettings.php:369
+#, fuzzy
+msgid "A confirmation code was sent to the IM address you added."
 msgstr ""
 "Um código de confirmação foi enviado para o endereço fornecido. Tem que "
 "aprovar que %s envie mensagens para si."
 
-#. TRANS: Message given canceling Instant Messaging address confirmation for the wrong IM address.
-#: actions/imsettings.php:382
+#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#: actions/imsettings.php:396
 msgid "That is the wrong IM address."
 msgstr "Esse endereço de mensagens instantâneas está errado."
 
-#. TRANS: Server error thrown on database error canceling Instant Messaging address confirmation.
-#: actions/imsettings.php:391
+#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#: actions/imsettings.php:405
 #, fuzzy
-msgid "Could not delete IM confirmation."
+msgid "Couldn't delete confirmation."
 msgstr "Não foi possível apagar a confirmação do mensageiro instantâneo."
 
-#. TRANS: Message given after successfully canceling Instant Messaging address confirmation.
-#: actions/imsettings.php:396
+#. TRANS: Message given after successfully canceling IM address confirmation.
+#: actions/imsettings.php:410
 msgid "IM confirmation cancelled."
 msgstr "Confirmação do mensageiro instantâneo cancelada."
 
-#. TRANS: Message given trying to remove an Instant Messaging address that is not
+#. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.
-#: actions/imsettings.php:417
-msgid "That is not your Jabber ID."
-msgstr "Esse não é o seu Jabber ID."
+#: actions/imsettings.php:434
+#, fuzzy
+msgid "That is not your screenname."
+msgstr "Esse número de telefone não é o seu."
+
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#: actions/imsettings.php:443
+#, fuzzy
+msgid "Couldn't update user im prefs."
+msgstr "Não foi possível actualizar o registo do utilizador."
 
 #. TRANS: Message given after successfully removing a registered Instant Messaging address.
-#: actions/imsettings.php:440
+#: actions/imsettings.php:451
 msgid "The IM address was removed."
 msgstr "O endereço do mensageiro instantâneo foi removido."
 
@@ -3562,7 +3616,7 @@ msgid "You must be logged in to join a group."
 msgstr "Tem de iniciar uma sessão para se juntar a um grupo."
 
 #. TRANS: Title for join group page after joining.
-#: actions/joingroup.php:147
+#: actions/joingroup.php:148
 #, fuzzy, php-format
 msgctxt "TITLE"
 msgid "%1$s joined group %2$s"
@@ -3690,7 +3744,7 @@ msgstr ""
 #. TRANS: Submit button title.
 #: actions/licenseadminpanel.php:311 actions/sessionsadminpanel.php:199
 #: actions/siteadminpanel.php:292 actions/snapshotadminpanel.php:245
-#: actions/tagother.php:154 lib/applicationeditform.php:357
+#: actions/tagother.php:133 lib/applicationeditform.php:357
 msgid "Save"
 msgstr "Gravar"
 
@@ -3698,41 +3752,43 @@ msgstr "Gravar"
 msgid "Save license settings"
 msgstr ""
 
-#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
+#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
+#: actions/login.php:97 actions/otp.php:62 actions/register.php:130
 msgid "Already logged in."
 msgstr "Sessão já foi iniciada."
 
-#: actions/login.php:148
+#: actions/login.php:125
 msgid "Incorrect username or password."
 msgstr "Nome de utilizador ou senha incorrectos."
 
-#: actions/login.php:154 actions/otp.php:120
+#. TRANS: Server error displayed when a user object could not be created trying to login using "one time password login".
+#: actions/login.php:131 actions/otp.php:127
 msgid "Error setting user. You are probably not authorized."
 msgstr "Erro ao preparar o utilizador. Provavelmente não está autorizado."
 
-#: actions/login.php:210 actions/login.php:263
+#: actions/login.php:185 actions/login.php:236 lib/action.php:598
 msgid "Login"
 msgstr "Entrar"
 
-#: actions/login.php:249
+#: actions/login.php:222
 msgid "Login to site"
 msgstr "Iniciar sessão no site"
 
-#: actions/login.php:258 actions/register.php:490
+#: actions/login.php:231 actions/register.php:469
 msgid "Remember me"
 msgstr "Lembrar-me neste computador"
 
-#: actions/login.php:259 actions/register.php:492
+#: actions/login.php:232 actions/register.php:471
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 "De futuro, iniciar sessão automaticamente. Não usar em computadores "
 "partilhados!"
 
-#: actions/login.php:269
+#: actions/login.php:241
 msgid "Lost or forgotten password?"
 msgstr "Perdeu ou esqueceu-se da senha?"
 
-#: actions/login.php:288
+#: actions/login.php:259
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -3740,11 +3796,11 @@ msgstr ""
 "Por razões de segurança, por favor re-introduza o seu nome de utilizador e "
 "senha antes de alterar as configurações."
 
-#: actions/login.php:292
+#: actions/login.php:263
 msgid "Login with your username and password."
 msgstr "Iniciar sessão com um nome de utilizador e senha."
 
-#: actions/login.php:295
+#: actions/login.php:266
 #, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -3870,7 +3926,9 @@ msgstr "Nota nova"
 msgid "Notice posted"
 msgstr "Nota publicada"
 
-#: actions/noticesearch.php:68
+#. TRANS: Instructions for Notice search page.
+#. TRANS: %%site.name%% is the name of the StatusNet site.
+#: actions/noticesearch.php:69
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -3879,16 +3937,21 @@ msgstr ""
 "Procure notas no %%site.name%%, pesquisando o seu conteúdo. Os termos de "
 "busca devem ter 3 ou mais caracteres e estar separados por espaços."
 
-#: actions/noticesearch.php:78
+#. TRANS: Title of the page where users can search for notices.
+#: actions/noticesearch.php:80
 msgid "Text search"
 msgstr "Pesquisa de texto"
 
-#: actions/noticesearch.php:91
+#. TRANS: Test in RSS notice search.
+#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
+#: actions/noticesearch.php:95
 #, php-format
 msgid "Search results for \"%1$s\" on %2$s"
 msgstr "Resultados da pesquisa de \"%1$s\" em %2$s"
 
-#: actions/noticesearch.php:121
+#. TRANS: Text for logged in users making a query for notices without results.
+#. TRANS: This message contains a Markdown link.
+#: actions/noticesearch.php:128
 #, php-format
 msgid ""
 "Be the first to [post on this topic](%%%%action.newnotice%%%%?"
@@ -3897,7 +3960,9 @@ msgstr ""
 "Seja o primeiro a [publicar neste tópico](%%action.newnotice%%?"
 "status_textarea=%s)!"
 
-#: actions/noticesearch.php:124
+#. TRANS: Text for not logged in users making a query for notices without results.
+#. TRANS: This message contains Markdown links.
+#: actions/noticesearch.php:133
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and be the first to "
@@ -3906,14 +3971,17 @@ msgstr ""
 "Podia [registar uma conta](%%action.register%%) e ser a primeira pessoa a "
 "[publicar neste tópico](%%action.newnotice%%?status_textarea=%s)!"
 
-#: actions/noticesearchrss.php:96
+#. TRANS: RSS notice search feed title. %s is the query.
+#: actions/noticesearchrss.php:95
 #, php-format
 msgid "Updates with \"%s\""
 msgstr "Actualizações com \"%s\""
 
-#: actions/noticesearchrss.php:98
+#. TRANS: RSS notice search feed description.
+#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
+#: actions/noticesearchrss.php:99
 #, fuzzy, php-format
-msgid "Updates matching search term \"%1$s\" on %2$s!"
+msgid "Updates matching search term \"%1$s\" on %2$s."
 msgstr "Actualizações que contêm o termo \"%1$s\" em %2$s!"
 
 #: actions/nudge.php:85
@@ -3934,51 +4002,51 @@ msgid "Nudge sent!"
 msgstr "Toque enviado!"
 
 #. TRANS: Message displayed to an anonymous user trying to view OAuth application list.
-#: actions/oauthappssettings.php:60
+#: actions/oauthappssettings.php:57
 msgid "You must be logged in to list your applications."
 msgstr "Tem de iniciar uma sessão para listar as suas aplicações."
 
 #. TRANS: Page title for OAuth applications
-#: actions/oauthappssettings.php:76
+#: actions/oauthappssettings.php:73
 msgid "OAuth applications"
 msgstr "Aplicações OAuth"
 
 #. TRANS: Page instructions for OAuth applications
-#: actions/oauthappssettings.php:88
+#: actions/oauthappssettings.php:85
 msgid "Applications you have registered"
 msgstr "Aplicações que registou"
 
 #. TRANS: Empty list message on page with OAuth applications.
-#: actions/oauthappssettings.php:141
+#: actions/oauthappssettings.php:138
 #, php-format
 msgid "You have not registered any applications yet."
 msgstr "Ainda não registou nenhuma aplicação."
 
 #. TRANS: Title for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:71
+#: actions/oauthconnectionssettings.php:69
 msgid "Connected applications"
 msgstr "Aplicações ligadas"
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:83
+#: actions/oauthconnectionssettings.php:80
 msgid "The following connections exist for your account."
 msgstr ""
 
 #. TRANS: Client error when trying to revoke access for an application while not being a user of it.
-#: actions/oauthconnectionssettings.php:168
+#: actions/oauthconnectionssettings.php:165
 msgid "You are not a user of that application."
 msgstr "Não é utilizador dessa aplicação."
 
 #. TRANS: Client error when revoking access has failed for some reason.
 #. TRANS: %s is the application ID revoking access failed for.
-#: actions/oauthconnectionssettings.php:183
+#: actions/oauthconnectionssettings.php:180
 #, fuzzy, php-format
 msgid "Unable to revoke access for application: %s."
 msgstr "Não foi possível retirar acesso da aplicação: %s"
 
 #. TRANS: Success message after revoking access for an application.
 #. TRANS: %1$s is the application name, %2$s is the first part of the user token.
-#: actions/oauthconnectionssettings.php:202
+#: actions/oauthconnectionssettings.php:199
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -3986,20 +4054,30 @@ msgid ""
 msgstr ""
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:213
+#: actions/oauthconnectionssettings.php:210
 msgid "You have not authorized any applications to use your account."
 msgstr "Não permitiu que nenhuma aplicação use a sua conta."
 
 #. TRANS: Note for developers in the OAuth connection settings form.
 #. TRANS: This message contains a Markdown link. Do not separate "](".
 #. TRANS: %s is the URL to the OAuth settings.
-#: actions/oauthconnectionssettings.php:233
+#: actions/oauthconnectionssettings.php:230
 #, php-format
 msgid ""
 "Are you a developer? [Register an OAuth client application](%s) to use with "
 "this instance of StatusNet."
 msgstr ""
 
+#: actions/oembed.php:64
+#, fuzzy, php-format
+msgid "\"%s\" not found."
+msgstr "Método da API não encontrado."
+
+#: actions/oembed.php:76
+#, fuzzy, php-format
+msgid "Notice %s not found."
+msgstr "Método da API não encontrado."
+
 #: actions/oembed.php:80 actions/shownotice.php:100
 msgid "Notice has no profile."
 msgstr "Nota não tem perfil."
@@ -4009,6 +4087,16 @@ msgstr "Nota não tem perfil."
 msgid "%1$s's status on %2$s"
 msgstr "Estado de %1$s em %2$s"
 
+#: actions/oembed.php:95
+#, fuzzy, php-format
+msgid "Attachment %s not found."
+msgstr "Destinatário não encontrado."
+
+#: actions/oembed.php:136
+#, php-format
+msgid "\"%s\" not supported for oembed requests."
+msgstr ""
+
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
 #: actions/oembed.php:168
 #, php-format
@@ -4022,94 +4110,60 @@ msgid "Only %s URLs over plain HTTP please."
 msgstr "Só URLs %s sobre HTTP simples, por favor."
 
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1205
-#: lib/apiaction.php:1232 lib/apiaction.php:1367
+#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1207
+#: lib/apiaction.php:1234 lib/apiaction.php:1369
 msgid "Not a supported data format."
 msgstr "Formato de dados não suportado."
 
+#. TRANS: ShortName in the OpenSearch interface when trying to find users.
 #: actions/opensearch.php:64
 msgid "People Search"
 msgstr "Pesquisa de Pessoas"
 
-#: actions/opensearch.php:67
+#: actions/opensearch.php:68
 msgid "Notice Search"
 msgstr "Pesquisa de Notas"
 
-#: actions/othersettings.php:59
-msgid "Other settings"
-msgstr "Outras configurações"
-
-#. TRANS: Instructions for tab "Other" in user profile settings.
-#: actions/othersettings.php:71
-msgid "Manage various other options."
-msgstr "Gerir várias outras opções."
-
-#. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
-#. TRANS: user's profile settings. Use of "free" is as in "open", indicating that the
-#. TRANS: information on the shortener site is freely distributable.
-#. TRANS: This message has one space at the beginning. Use your language's word separator
-#. TRANS: here if it has one (most likely a single space).
-#: actions/othersettings.php:113
-msgid " (free service)"
-msgstr " (serviço livre)"
-
-#. TRANS: Label for dropdown with URL shortener services.
-#: actions/othersettings.php:122
-msgid "Shorten URLs with"
-msgstr "Encurtar URLs com"
-
-#. TRANS: Tooltip for for dropdown with URL shortener services.
-#: actions/othersettings.php:124
-msgid "Automatic shortening service to use."
-msgstr "Serviço de encurtamento que será usado automaticamente"
-
-#. TRANS: Label for checkbox.
-#: actions/othersettings.php:130
-msgid "View profile designs"
-msgstr "Ver estilos para o perfil"
-
-#. TRANS: Tooltip for checkbox.
-#: actions/othersettings.php:132
-msgid "Show or hide profile designs."
-msgstr "Mostrar ou esconder estilos para o perfil."
-
-#. TRANS: Form validation error for form "Other settings" in user profile.
-#: actions/othersettings.php:164
-#, fuzzy
-msgid "URL shortening service is too long (maximum 50 characters)."
-msgstr "Serviço de encurtamento de URLs demasiado extenso (máx. 50 caracteres)"
-
-#: actions/otp.php:69
+#. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
+#: actions/otp.php:70
 msgid "No user ID specified."
 msgstr "Não foi especificado um ID de utilizador."
 
-#: actions/otp.php:83
+#. TRANS: Client error displayed trying to use "one time password login" without specifying a login token.
+#: actions/otp.php:86
 msgid "No login token specified."
 msgstr "Chave de entrada não foi especificada."
 
-#: actions/otp.php:90
+#. TRANS: Client error displayed trying to use "one time password login" without requesting a login token.
+#: actions/otp.php:94
 msgid "No login token requested."
 msgstr "Chave de entrada não foi pedida."
 
-#: actions/otp.php:95
+#. TRANS: Client error displayed trying to use "one time password login" while specifying an invalid login token.
+#: actions/otp.php:100
 msgid "Invalid login token specified."
 msgstr "Chave de entrada especificada é inválida."
 
-#: actions/otp.php:104
+#. TRANS: Client error displayed trying to use "one time password login" while specifying an expired login token.
+#: actions/otp.php:110
 msgid "Login token expired."
 msgstr "Chave de entrada expirou."
 
-#: actions/outbox.php:58
+#. TRANS: Title for outbox for any but the fist page.
+#. TRANS: %1$s is the user nickname, %2$d is the page number.
+#: actions/outbox.php:57
 #, php-format
 msgid "Outbox for %1$s - page %2$d"
 msgstr "Caixa de saída de %s - página %2$d"
 
+#. TRANS: Title for first page of outbox.
 #: actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
 msgstr "Caixa de saída de %s"
 
-#: actions/outbox.php:104
+#. TRANS: Instructions for outbox.
+#: actions/outbox.php:103
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr ""
 "Esta é a sua caixa de saída, que apresenta as mensagens privadas que enviou."
@@ -4136,43 +4190,45 @@ msgstr "Antiga"
 msgid "New password"
 msgstr "Nova"
 
-#: actions/passwordsettings.php:109
+#: actions/passwordsettings.php:109 actions/register.php:416
 #, fuzzy
-msgid "6 or more characters"
+msgid "6 or more characters."
 msgstr "6 ou mais caracteres"
 
-#: actions/passwordsettings.php:113
+#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#: actions/passwordsettings.php:113 actions/recoverpassword.php:264
+#: actions/register.php:420
 #, fuzzy
-msgid "Same as password above"
+msgid "Same as password above."
 msgstr "Repita a senha nova"
 
 #: actions/passwordsettings.php:117
 msgid "Change"
 msgstr "Modificar"
 
-#: actions/passwordsettings.php:154 actions/register.php:238
+#: actions/passwordsettings.php:153 actions/register.php:223
 msgid "Password must be 6 or more characters."
 msgstr "Senha tem de ter 6 ou mais caracteres."
 
-#: actions/passwordsettings.php:157 actions/register.php:241
+#: actions/passwordsettings.php:156 actions/register.php:226
 msgid "Passwords don't match."
 msgstr "Senhas não coincidem."
 
-#: actions/passwordsettings.php:165
+#: actions/passwordsettings.php:164
 msgid "Incorrect old password"
 msgstr "Senha antiga incorrecta."
 
-#: actions/passwordsettings.php:181
+#: actions/passwordsettings.php:180
 msgid "Error saving user; invalid."
 msgstr "Erro ao guardar utilizador; inválido."
 
-#: actions/passwordsettings.php:186
+#. TRANS: Reset password form validation error message.
+#: actions/passwordsettings.php:185 actions/recoverpassword.php:418
 #, fuzzy
-msgid "Can't save new password."
+msgid "Cannot save new password."
 msgstr "Não é possível guardar a nova senha."
 
-#. TRANS: Title for password recovery page in password saved mode.
-#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
+#: actions/passwordsettings.php:191
 msgid "Password saved."
 msgstr "Senha gravada."
 
@@ -4389,8 +4445,7 @@ msgid "Directory where backgrounds are located."
 msgstr "Localização do directório das línguas"
 
 #. TRANS: Fieldset legens in Paths admin panel.
-#. TRANS: DT element label in attachment list.
-#: actions/pathsadminpanel.php:419 lib/attachmentlist.php:98
+#: actions/pathsadminpanel.php:419
 msgid "Attachments"
 msgstr "Anexos"
 
@@ -4464,7 +4519,9 @@ msgstr "Servidor para onde encaminhar pedidos SSL"
 msgid "Save paths"
 msgstr "Gravar localizações"
 
-#: actions/peoplesearch.php:52
+#. TRANS: Instructions for the "People search" page.
+#. TRANS: %%site.name%% is the name of the StatusNet site.
+#: actions/peoplesearch.php:54
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
@@ -4474,7 +4531,8 @@ msgstr ""
 "interesses. Os termos de busca devem ter 3 ou mais caracteres e estar "
 "separados por espaços."
 
-#: actions/peoplesearch.php:58
+#. TRANS: Title of a page where users can search for other users.
+#: actions/peoplesearch.php:61
 msgid "People search"
 msgstr "Pesquisa de pessoas"
 
@@ -4488,6 +4546,60 @@ msgstr "Categoria de pessoas inválida: %s."
 msgid "Users self-tagged with %1$s - page %2$d"
 msgstr "Utilizadores auto-categorizados com %1$s - página %2$d"
 
+#. TRANS: Page title for AJAX form return when a disabling a plugin.
+#: actions/plugindisable.php:69
+msgctxt "plugin"
+msgid "Disabled"
+msgstr ""
+
+#. TRANS: Client error displayed trying to perform any request method other than POST.
+#. TRANS: Do not translate POST.
+#: actions/pluginenable.php:78 actions/subscribe.php:77
+msgid "This action only accepts POST requests."
+msgstr "Esta operação só aceita pedidos POST."
+
+#: actions/pluginenable.php:102
+#, fuzzy
+msgid "You cannot administer plugins."
+msgstr "Não pode apagar utilizadores."
+
+#: actions/pluginenable.php:109
+#, fuzzy
+msgid "No such plugin."
+msgstr "Página não foi encontrada."
+
+#. TRANS: Page title for AJAX form return when enabling a plugin.
+#: actions/pluginenable.php:159
+msgctxt "plugin"
+msgid "Enabled"
+msgstr ""
+
+#. TRANS: Tab and title for plugins admin panel.
+#. TRANS: Menu item for site administration
+#: actions/pluginsadminpanel.php:56 actions/version.php:191
+#: lib/adminpanelaction.php:411
+msgid "Plugins"
+msgstr "Plugins"
+
+#. TRANS: Instructions at top of plugin admin page.
+#: actions/pluginsadminpanel.php:68
+msgid ""
+"Additional plugins can be enabled and configured manually. See the <a href="
+"\"http://status.net/wiki/Plugins\">online plugin documentation</a> for more "
+"details."
+msgstr ""
+
+#. TRANS: Admin form section header
+#: actions/pluginsadminpanel.php:84
+#, fuzzy
+msgid "Default plugins"
+msgstr "Língua, por omissão"
+
+#: actions/pluginsadminpanel.php:106
+msgid ""
+"All default plugins have been disabled from the site's configuration file."
+msgstr ""
+
 #: actions/postnotice.php:95
 msgid "Invalid notice content."
 msgstr "Conteúdo da nota é inválido."
@@ -4499,12 +4611,12 @@ msgstr ""
 "A licença ‘%1$s’ da nota não é compatível com a licença ‘%2$s’ do site."
 
 #. TRANS: Page title for profile settings.
-#: actions/profilesettings.php:59
+#: actions/profilesettings.php:60
 msgid "Profile settings"
 msgstr "Configurações do perfil"
 
 #. TRANS: Usage instructions for profile settings.
-#: actions/profilesettings.php:70
+#: actions/profilesettings.php:71
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
@@ -4512,34 +4624,31 @@ msgstr ""
 "saibam mais sobre si."
 
 #. TRANS: Profile settings form legend.
-#: actions/profilesettings.php:98
+#: actions/profilesettings.php:99
 msgid "Profile information"
 msgstr "Informação do perfil"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109 actions/register.php:433
+#: actions/profilesettings.php:110 actions/register.php:412
 #, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr "1-64 letras minúsculas ou números, sem pontuação ou espaços"
 
 #. TRANS: Field label in form for profile settings.
-#. TRANS: Label for full group name (dt). Text hidden by default.
-#. TRANS: DT for full name in a profile.
-#: actions/profilesettings.php:113 actions/register.php:455
-#: actions/showgroup.php:255 actions/tagother.php:104
-#: lib/groupeditform.php:150 lib/userprofile.php:156
+#: actions/profilesettings.php:114 actions/register.php:434
+#: lib/groupeditform.php:150
 msgid "Full name"
 msgstr "Nome completo"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:118 actions/register.php:460
+#: actions/profilesettings.php:119 actions/register.php:439
 #: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "Página pessoal"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:121
+#: actions/profilesettings.php:122 actions/register.php:441
 #, fuzzy
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr "URL da sua página pessoal, blogue ou perfil noutro site na internet"
@@ -4547,7 +4656,7 @@ msgstr "URL da sua página pessoal, blogue ou perfil noutro site na internet"
 #. TRANS: Tooltip for field label in form for profile settings. Plural
 #. TRANS: is decided by the number of characters available for the
 #. TRANS: biography (%d).
-#: actions/profilesettings.php:129 actions/register.php:471
+#: actions/profilesettings.php:130 actions/register.php:450
 #, fuzzy, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4555,85 +4664,81 @@ msgstr[0] "Descreva-se e aos seus interesses (máx. 140 caracteres)"
 msgstr[1] "Descreva-se e aos seus interesses (máx. 140 caracteres)"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:135 actions/register.php:476
+#: actions/profilesettings.php:136 actions/register.php:455
 msgid "Describe yourself and your interests"
 msgstr "Descreva-se e aos seus interesses"
 
 #. TRANS: Text area label in form for profile settings where users can provide.
 #. TRANS: their biography.
-#: actions/profilesettings.php:139 actions/register.php:478
+#: actions/profilesettings.php:140 actions/register.php:457
 msgid "Bio"
 msgstr "Biografia"
 
 #. TRANS: Field label in form for profile settings.
-#. TRANS: Label for group location (dt). Text hidden by default.
-#. TRANS: DT for location in a profile.
-#: actions/profilesettings.php:145 actions/register.php:483
-#: actions/showgroup.php:265 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:173
-#: lib/userprofile.php:172
+#: actions/profilesettings.php:146 actions/register.php:462
+#: lib/groupeditform.php:173
 msgid "Location"
 msgstr "Localidade"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148 actions/register.php:485
+#: actions/profilesettings.php:149
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Onde está, por ex. \"Cidade, Região, País\""
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:153
+#: actions/profilesettings.php:154
 msgid "Share my current location when posting notices"
 msgstr "Compartilhar a minha localização presente ao publicar notas"
 
 #. TRANS: Field label in form for profile settings.
-#. TRANS: DT for tags in a profile.
-#: actions/profilesettings.php:161 actions/tagother.php:149
-#: actions/tagother.php:209 lib/subscriptionlist.php:106
-#: lib/subscriptionlist.php:108 lib/userprofile.php:220
+#: actions/profilesettings.php:162 actions/tagother.php:128
+#: actions/tagother.php:188 lib/subscriptionlist.php:104
+#: lib/subscriptionlist.php:106
 msgid "Tags"
 msgstr "Categorias"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:164
+#: actions/profilesettings.php:165
 #, fuzzy
 msgid ""
-"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- "
+"separated."
 msgstr ""
 "Categorias para si (letras, números, -, ., _), separadas por vírgulas ou "
 "espaços"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:169
+#: actions/profilesettings.php:170
 msgid "Language"
 msgstr "Língua"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:171
+#: actions/profilesettings.php:172
 #, fuzzy
-msgid "Preferred language"
+msgid "Preferred language."
 msgstr "Língua preferida"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:181
+#: actions/profilesettings.php:182
 msgid "Timezone"
 msgstr "Fuso horário"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:183
+#: actions/profilesettings.php:184
 msgid "What timezone are you normally in?"
 msgstr "Em que fuso horário se encontra normalmente?"
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:189
+#: actions/profilesettings.php:190
 #, fuzzy
 msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)"
+"Automatically subscribe to whoever subscribes to me (best for non-humans)."
 msgstr "Subscrever automaticamente quem me subscreva (óptimo para não-humanos)"
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Plural form is used based on the maximum number of allowed
 #. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:258 actions/register.php:229
+#: actions/profilesettings.php:259 actions/register.php:214
 #, fuzzy, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4641,50 +4746,50 @@ msgstr[0] "Biografia demasiado extensa (máx. %d caracteres)."
 msgstr[1] "Biografia demasiado extensa (máx. %d caracteres)."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:269 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:270 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr "Fuso horário não foi seleccionado."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:277
+#: actions/profilesettings.php:278
 #, fuzzy
 msgid "Language is too long (maximum 50 characters)."
 msgstr "Língua é demasiado extensa (máx. 50 caracteres)."
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:291 actions/tagother.php:178
-#, php-format
-msgid "Invalid tag: \"%s\""
+#: actions/profilesettings.php:292
+#, fuzzy, php-format
+msgid "Invalid tag: \"%s\"."
 msgstr "Categoria inválida: \"%s\""
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:347
+#: actions/profilesettings.php:348
 #, fuzzy
 msgid "Could not update user for autosubscribe."
 msgstr "Não foi possível actualizar o utilizador para subscrição automática."
 
 #. TRANS: Server error thrown when user profile location preference settings could not be updated.
-#: actions/profilesettings.php:405
+#: actions/profilesettings.php:406
 #, fuzzy
 msgid "Could not save location prefs."
 msgstr "Não foi possível gravar as preferências de localização."
 
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:427 actions/tagother.php:200
+#: actions/profilesettings.php:428 actions/tagother.php:179
 msgid "Could not save tags."
 msgstr "Não foi possível gravar as categorias."
 
 #. TRANS: Confirmation shown when user profile settings are saved.
 #. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:436 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:437 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "Configurações gravadas."
 
 #. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
 #. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:483 actions/restoreaccount.php:60
+#: actions/profilesettings.php:484 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "Criar uma conta"
@@ -4764,6 +4869,12 @@ msgstr ""
 "wikipedia.org/wiki/Micro-blogging) baseado no programa de Software Livre "
 "[StatusNet](http://status.net/)."
 
+#. TRANS: Public RSS feed description. %s is the StatusNet site name.
+#: actions/publicrss.php:106
+#, fuzzy, php-format
+msgid "%s updates from everyone."
+msgstr "%s actualizações de todos!"
+
 #. TRANS: Title for public tag cloud.
 #: actions/publictagcloud.php:57
 msgid "Public tag cloud"
@@ -4804,10 +4915,6 @@ msgstr ""
 "Podia [registar uma conta](%%action.register%%) e ser a primeira pessoa a "
 "publicar uma!"
 
-#: actions/publictagcloud.php:146
-msgid "Tag cloud"
-msgstr "Nuvem de categorias"
-
 #. TRANS: Client error displayed trying to recover password while already logged in.
 #: actions/recoverpassword.php:37
 msgid "You are already logged in!"
@@ -4902,6 +5009,12 @@ msgstr "Recuperar senha"
 msgid "Password recovery requested"
 msgstr "Solicitada recuperação da senha"
 
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/recoverpassword.php:229
+#, fuzzy
+msgid "Password saved"
+msgstr "Senha gravada."
+
 #. TRANS: Title for password recovery page when an unknown action has been specified.
 #: actions/recoverpassword.php:232
 msgid "Unknown action"
@@ -4913,15 +5026,9 @@ msgstr "Acção desconhecida"
 msgid "6 or more characters, and do not forget it!"
 msgstr "6 ou mais caracteres, e não a esqueça!"
 
-#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
-#: actions/recoverpassword.php:264 actions/register.php:441
-#, fuzzy
-msgid "Same as password above."
-msgstr "Repita a senha nova"
-
 #. TRANS: Button text for password reset form.
 #. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: actions/recoverpassword.php:268 lib/designsettings.php:264
+#: actions/recoverpassword.php:268 lib/designform.php:145
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Reset"
@@ -4973,14 +5080,8 @@ msgstr "Senha tem de ter 6 ou mais caracteres."
 msgid "Password and confirmation do not match."
 msgstr "A senha e a confirmação não coincidem."
 
-#. TRANS: Reset password form validation error message.
-#: actions/recoverpassword.php:418
-#, fuzzy
-msgid "Cannot save new password."
-msgstr "Não é possível guardar a nova senha."
-
 #. TRANS: Server error displayed when something does wrong with the user object during password reset.
-#: actions/recoverpassword.php:426 actions/register.php:256
+#: actions/recoverpassword.php:426 actions/register.php:241
 msgid "Error setting user."
 msgstr "Erro ao configurar utilizador."
 
@@ -4989,101 +5090,105 @@ msgstr "Erro ao configurar utilizador."
 msgid "New password successfully saved. You are now logged in."
 msgstr "A senha nova foi gravada com sucesso. Iniciou uma sessão."
 
-#: actions/register.php:92 actions/register.php:196 actions/register.php:413
+#: actions/redirecturl.php:70
+#, fuzzy
+msgid "No id parameter"
+msgstr "Argumento de identificação (ID) em falta."
+
+#: actions/redirecturl.php:76
+#, fuzzy, php-format
+msgid "No such file \"%d\""
+msgstr "Ficheiro não foi encontrado."
+
+#: actions/register.php:80 actions/register.php:181 actions/register.php:392
 msgid "Sorry, only invited people can register."
 msgstr "Desculpe, só pessoas convidadas se podem registar."
 
-#: actions/register.php:99
+#: actions/register.php:87
 msgid "Sorry, invalid invitation code."
 msgstr "Desculpe, código de convite inválido."
 
-#: actions/register.php:119
+#: actions/register.php:106
 msgid "Registration successful"
 msgstr "Registo efectuado"
 
-#: actions/register.php:121 actions/register.php:511
+#: actions/register.php:108 actions/register.php:490
 msgid "Register"
 msgstr "Registar"
 
-#: actions/register.php:142
+#: actions/register.php:128
 msgid "Registration not allowed."
 msgstr "Registo não é permitido."
 
-#: actions/register.php:209
+#: actions/register.php:194
 #, fuzzy
-msgid "You can't register if you don't agree to the license."
+msgid "You cannot register if you don't agree to the license."
 msgstr "Não se pode registar se não aceita a licença."
 
-#: actions/register.php:218
+#: actions/register.php:203
 msgid "Email address already exists."
 msgstr "Correio electrónico já existe."
 
-#: actions/register.php:251 actions/register.php:273
+#: actions/register.php:236 actions/register.php:258
 msgid "Invalid username or password."
 msgstr "Nome de utilizador ou senha inválidos."
 
-#: actions/register.php:351
+#: actions/register.php:333
 #, fuzzy
 msgid ""
 "With this form you can create a new account. You can then post notices and "
-"link up to friends and colleagues. "
+"link up to friends and colleagues."
 msgstr ""
 "Com este formulário pode criar uma conta nova. Poderá então publicar notas e "
 "ligar-se a amigos e colegas. "
 
-#: actions/register.php:437
-#, fuzzy
-msgid "6 or more characters."
-msgstr "6 ou mais caracteres"
-
-#. TRANS: Link description in user account settings menu.
-#: actions/register.php:445 actions/register.php:449
-#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
+#: actions/register.php:424 actions/register.php:428
+#: actions/siteadminpanel.php:238 lib/settingsnav.php:92
 msgid "Email"
 msgstr "Correio"
 
-#: actions/register.php:446 actions/register.php:450
+#: actions/register.php:425 actions/register.php:429
 #, fuzzy
-msgid "Used only for updates, announcements, and password recovery"
+msgid "Used only for updates, announcements, and password recovery."
 msgstr "Usado apenas para actualizações, anúncios e recuperação da senha"
 
-#: actions/register.php:457
+#: actions/register.php:436
 #, fuzzy
-msgid "Longer name, preferably your \"real\" name"
+msgid "Longer name, preferably your \"real\" name."
 msgstr "Nome mais longo, de preferência o seu nome \"verdadeiro\""
 
-#: actions/register.php:462
+#: actions/register.php:464
 #, fuzzy
-msgid "URL of your homepage, blog, or profile on another site"
-msgstr "URL da sua página pessoal, blogue ou perfil noutro site na internet"
+msgid "Where you are, like \"City, State (or Region), Country\"."
+msgstr "Onde está, por ex. \"Cidade, Região, País\""
 
-#: actions/register.php:523
+#: actions/register.php:503
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
 msgstr ""
 "Compreendo que o conteúdo e dados do site %1$s são privados e confidenciais."
 
-#: actions/register.php:533
+#: actions/register.php:513
 #, php-format
 msgid "My text and files are copyright by %1$s."
 msgstr ""
 "Os meus textos e ficheiros estão protegidos pelos direitos de autor de %1$s."
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:537
+#: actions/register.php:517
 msgid "My text and files remain under my own copyright."
 msgstr ""
 "Os meus textos e ficheiros permanecem protegidos pelos meus próprios "
 "direitos de autor."
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:540
+#: actions/register.php:520
 msgid "All rights reserved."
 msgstr "Todos os direitos reservados."
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:545
+#: actions/register.php:525
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -5093,7 +5198,7 @@ msgstr ""
 "estes dados privados: senha, endereço de correio electrónico, endereço de "
 "mensageiro instantâneo, número de telefone."
 
-#: actions/register.php:588
+#: actions/register.php:566
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -5126,7 +5231,7 @@ msgstr ""
 "\n"
 "Obrigado por se ter registado e esperamos que se divirta usando este serviço."
 
-#: actions/register.php:612
+#: actions/register.php:590
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5160,7 +5265,7 @@ msgstr "Nome do utilizador"
 
 #: actions/remotesubscribe.php:129
 #, fuzzy
-msgid "Nickname of the user you want to follow"
+msgid "Nickname of the user you want to follow."
 msgstr "Nome do utilizador que pretende seguir"
 
 #: actions/remotesubscribe.php:132
@@ -5169,18 +5274,18 @@ msgstr "URL do perfil"
 
 #: actions/remotesubscribe.php:133
 #, fuzzy
-msgid "URL of your profile on another compatible microblogging service"
+msgid "URL of your profile on another compatible microblogging service."
 msgstr "URL do seu perfil noutro serviço de microblogues compatível"
 
 #. TRANS: Link text for link that will subscribe to a remote profile.
 #: actions/remotesubscribe.php:136 lib/subscribeform.php:139
-#: lib/userprofile.php:431
+#: lib/userprofile.php:402
 msgid "Subscribe"
 msgstr "Subscrever"
 
 #: actions/remotesubscribe.php:158
 #, fuzzy
-msgid "Invalid profile URL (bad format)"
+msgid "Invalid profile URL (bad format)."
 msgstr "URL de perfil inválido (formato incorrecto)"
 
 #: actions/remotesubscribe.php:167
@@ -5216,7 +5321,7 @@ msgstr "Não pode repetir a sua própria nota."
 msgid "You already repeated that notice."
 msgstr "Já repetiu essa nota."
 
-#: actions/repeat.php:112 lib/noticelist.php:692
+#: actions/repeat.php:112 lib/noticelist.php:697
 msgid "Repeated"
 msgstr "Repetida"
 
@@ -5224,9 +5329,9 @@ msgstr "Repetida"
 msgid "Repeated!"
 msgstr "Repetida!"
 
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing @-replies.
+#. TRANS: RSS reply feed title. %s is a user nickname.
 #: actions/replies.php:126 actions/repliesrss.php:68
-#: lib/personalgroupnav.php:109
+#: lib/personalgroupnav.php:105
 #, php-format
 msgid "Replies to %s"
 msgstr "Respostas a %s"
@@ -5277,9 +5382,11 @@ msgstr ""
 "Pode tentar [dar um toque em %1$s](../%2$s) ou [endereçar-lhe uma nota](%%%%"
 "action.newnotice%%%%?status_textarea=%3$s)."
 
-#: actions/repliesrss.php:72
+#. TRANS: RSS reply feed description.
+#. TRANS: %1$s is a user nickname, %2$s is the StatusNet site name.
+#: actions/repliesrss.php:74
 #, fuzzy, php-format
-msgid "Replies to %1$s on %2$s!"
+msgid "Replies to %1$s on %2$s."
 msgstr "Respostas a %1$s em %2$s!"
 
 #. TRANS: Client exception displayed when trying to restore an account while not logged in.
@@ -5381,7 +5488,7 @@ msgstr "Não pode retirar funções aos utilizadores neste site."
 msgid "User doesn't have this role."
 msgstr "O utilizador não tem esta função."
 
-#: actions/rsd.php:146 actions/version.php:159
+#: actions/rsd.php:142 actions/version.php:159
 msgid "StatusNet"
 msgstr "StatusNet"
 
@@ -5423,87 +5530,38 @@ msgstr "Ligar a impressão de dados de depuração, para sessões."
 msgid "Save site settings"
 msgstr "Gravar configurações do site"
 
-#: actions/showapplication.php:82
+#: actions/showapplication.php:78
 msgid "You must be logged in to view an application."
 msgstr "Tem de iniciar uma sessão para ver uma aplicação."
 
-#: actions/showapplication.php:157
+#: actions/showapplication.php:151
 msgid "Application profile"
 msgstr "Perfil da aplicação"
 
-#. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:159 lib/applicationeditform.php:177
-msgid "Icon"
-msgstr "Ícone"
-
-#. TRANS: Form input field label for application name.
-#: actions/showapplication.php:169 actions/version.php:197
-#: lib/applicationeditform.php:190
-msgid "Name"
-msgstr "Nome"
-
-#. TRANS: Form input field label.
-#: actions/showapplication.php:178 lib/applicationeditform.php:227
-msgid "Organization"
-msgstr "Organização"
-
-#. TRANS: Form input field label.
-#: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:168
-msgid "Description"
-msgstr "Descrição"
-
-#. TRANS: Header for group statistics on a group page (h2).
-#. TRANS: H2 text for user statistics.
-#: actions/showapplication.php:192 actions/showgroup.php:460
-#: lib/profileaction.php:205
-msgid "Statistics"
-msgstr "Estatísticas"
-
-#: actions/showapplication.php:203
+#: actions/showapplication.php:179
 #, php-format
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr "Criado por %1$s - acesso por omissão %2$s - %3$d utilizadores"
 
-#: actions/showapplication.php:213
+#: actions/showapplication.php:189
 msgid "Application actions"
 msgstr "Operações da aplicação"
 
-#: actions/showapplication.php:236
+#: actions/showapplication.php:212
 msgid "Reset key & secret"
 msgstr "Reiniciar chave e segredo"
 
 #. TRANS: Title of form for deleting a user.
-#: actions/showapplication.php:252 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:64 lib/noticelist.php:673
+#: actions/showapplication.php:228 lib/deletegroupform.php:121
+#: lib/deleteuserform.php:64 lib/noticelist.php:678
 msgid "Delete"
 msgstr "Apagar"
 
-#: actions/showapplication.php:261
+#: actions/showapplication.php:237
 msgid "Application info"
 msgstr "Informação da aplicação"
 
-#: actions/showapplication.php:263
-msgid "Consumer key"
-msgstr "Chave do consumidor"
-
-#: actions/showapplication.php:268
-msgid "Consumer secret"
-msgstr "Segredo do consumidor"
-
-#: actions/showapplication.php:273
-msgid "Request token URL"
-msgstr "URL da chave de pedido"
-
-#: actions/showapplication.php:278
-msgid "Access token URL"
-msgstr "URL da chave de acesso"
-
-#: actions/showapplication.php:283
-msgid "Authorize URL"
-msgstr "Autorizar URL"
-
-#: actions/showapplication.php:288
+#: actions/showapplication.php:255
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
@@ -5511,7 +5569,7 @@ msgstr ""
 "Nota: Assinaturas HMAC-SHA1 são suportadas. O método de assinatura com texto "
 "simples não é suportado."
 
-#: actions/showapplication.php:309
+#: actions/showapplication.php:275
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr ""
 "Tem a certeza de que quer reiniciar a sua chave e segredo de consumidor?"
@@ -5599,61 +5657,47 @@ msgstr "Grupo %s"
 msgid "%1$s group, page %2$d"
 msgstr "Grupo %1$s, página %2$d"
 
-#. TRANS: Group profile header (h2). Text hidden by default.
-#: actions/showgroup.php:223
-msgid "Group profile"
-msgstr "Perfil do grupo"
-
-#. TRANS: Label for group URL (dt). Text hidden by default.
-#. TRANS: DT for URL in a profile.
-#: actions/showgroup.php:273 actions/tagother.php:118
-#: actions/userauthorization.php:175 lib/userprofile.php:186
-msgid "URL"
-msgstr "URL"
-
 #. TRANS: Label for group description or group note (dt). Text hidden by default.
-#. TRANS: DT for note in a profile.
-#: actions/showgroup.php:285 actions/tagother.php:128
-#: actions/userauthorization.php:187 lib/userprofile.php:204
+#: actions/showgroup.php:266
 msgid "Note"
 msgstr "Anotação"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:296 lib/groupeditform.php:180
+#: actions/showgroup.php:277 lib/groupeditform.php:180
 msgid "Aliases"
 msgstr "Nomes alternativos"
 
 #. TRANS: Group actions header (h2). Text hidden by default.
-#: actions/showgroup.php:313
+#: actions/showgroup.php:294
 msgid "Group actions"
 msgstr "Acções do grupo"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:357
+#: actions/showgroup.php:338
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
 msgstr "Fonte de notas do grupo %s (RSS 1.0)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:364
+#: actions/showgroup.php:345
 #, php-format
 msgid "Notice feed for %s group (RSS 2.0)"
 msgstr "Fonte de notas do grupo %s (RSS 2.0)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:371
+#: actions/showgroup.php:352
 #, php-format
 msgid "Notice feed for %s group (Atom)"
 msgstr "Fonte de notas do grupo %s (Atom)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:377
+#: actions/showgroup.php:358
 #, php-format
 msgid "FOAF for %s group"
 msgstr "FOAF do grupo %s"
 
 #. TRANS: Header for mini list of group members on a group page (h2).
-#: actions/showgroup.php:414
+#: actions/showgroup.php:395
 msgid "Members"
 msgstr "Membros"
 
@@ -5661,26 +5705,31 @@ msgstr "Membros"
 #. TRANS: Text for user subscription statistics if the user has no subscriptions.
 #. TRANS: Text for user subscriber statistics if user has no subscribers.
 #. TRANS: Text for user user group membership statistics if user is not a member of any group.
-#: actions/showgroup.php:420 lib/profileaction.php:137
+#: actions/showgroup.php:401 lib/profileaction.php:137
 #: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
-#: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
+#: lib/subscriptionlist.php:123 lib/tagcloudsection.php:71
 msgid "(None)"
 msgstr "(Nenhum)"
 
 #. TRANS: Link to all group members from mini list of group members if group has more than n members.
-#: actions/showgroup.php:429
+#: actions/showgroup.php:410
 msgid "All members"
 msgstr "Todos os membros"
 
-#. TRANS: Label for creation date in statistics on group page.
-#: actions/showgroup.php:465
+#. TRANS: Header for group statistics on a group page (h2).
+#. TRANS: H2 text for user statistics.
+#: actions/showgroup.php:441 lib/profileaction.php:205
+msgid "Statistics"
+msgstr "Estatísticas"
+
+#: actions/showgroup.php:444
 #, fuzzy
 msgctxt "LABEL"
 msgid "Created"
 msgstr "Criado"
 
 #. TRANS: Label for member count in statistics on group page.
-#: actions/showgroup.php:473
+#: actions/showgroup.php:449
 #, fuzzy
 msgctxt "LABEL"
 msgid "Members"
@@ -5690,7 +5739,7 @@ msgstr "Membros"
 #. TRANS: **%s** is the group alias, %%%%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).
-#: actions/showgroup.php:488
+#: actions/showgroup.php:464
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5709,7 +5758,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: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
-#: actions/showgroup.php:498
+#: actions/showgroup.php:474
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5723,7 +5772,7 @@ msgstr ""
 "grupo partilham mensagens curtas acerca das suas vidas e interesses. "
 
 #. TRANS: Header for list of group administrators on a group page (h2).
-#: actions/showgroup.php:527
+#: actions/showgroup.php:503
 msgid "Admins"
 msgstr "Gestores"
 
@@ -5762,7 +5811,7 @@ msgid "%1$s tagged %2$s"
 msgstr "%1$s, página %2$d"
 
 #. TRANS: Page title showing tagged notices in one user's stream.
-#. TRANS: %1$s is the username, %2$s is the hash tag, %1$d is the page number.
+#. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
 #: actions/showstream.php:74
 #, fuzzy, php-format
 msgid "%1$s tagged %2$s, page %3$d"
@@ -5809,13 +5858,13 @@ msgid "FOAF for %s"
 msgstr "FOAF para %s"
 
 #. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
-#: actions/showstream.php:211
+#: actions/showstream.php:205
 #, fuzzy, php-format
 msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr "Estas são as notas de %1$s, mas %2$s ainda não publicou nenhuma."
 
 #. TRANS: Second sentence of empty list message for a stream for the user themselves.
-#: actions/showstream.php:217
+#: actions/showstream.php:211
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
@@ -5825,7 +5874,7 @@ msgstr ""
 
 #. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:221
+#: actions/showstream.php:215
 #, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
@@ -5836,7 +5885,7 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:264
+#: actions/showstream.php:258
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5852,7 +5901,7 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:271
+#: actions/showstream.php:265
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5864,7 +5913,7 @@ msgstr ""
 "Software Livre [StatusNet](http://status.net/). "
 
 #. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
-#: actions/showstream.php:328
+#: actions/showstream.php:322
 #, php-format
 msgid "Repeat of %s"
 msgstr "Repetições de %s"
@@ -6013,75 +6062,75 @@ msgstr "Texto do aviso do site (máx. 255 caracteres; pode usar HTML)"
 #. TRANS: Title for button to save site notice in admin panel.
 #: actions/sitenoticeadminpanel.php:201
 #, fuzzy
-msgid "Save site notice"
+msgid "Save site notice."
 msgstr "Gravar aviso do site"
 
 #. TRANS: Title for SMS settings.
-#: actions/smssettings.php:57
+#: actions/smssettings.php:56
 msgid "SMS settings"
 msgstr "Configurações de SMS"
 
 #. TRANS: SMS settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/smssettings.php:71
+#: actions/smssettings.php:70
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr "Pode receber SMSs do site %%site.name%% por correio electrónico."
 
 #. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
-#: actions/smssettings.php:93
+#: actions/smssettings.php:92
 msgid "SMS is not available."
 msgstr "SMS não está disponível."
 
 #. TRANS: Form legend for SMS settings form.
-#: actions/smssettings.php:107
+#: actions/smssettings.php:106
 msgid "SMS address"
 msgstr "Endereço SMS"
 
 #. TRANS: Form guide in SMS settings form.
-#: actions/smssettings.php:116
+#: actions/smssettings.php:115
 msgid "Current confirmed SMS-enabled phone number."
 msgstr "Número de telefone com serviço SMS activo já confirmado."
 
 #. TRANS: Form guide in IM settings form.
-#: actions/smssettings.php:129
+#: actions/smssettings.php:128
 msgid "Awaiting confirmation on this phone number."
 msgstr "A aguardar confirmação deste número de telefone."
 
 #. TRANS: Field label for SMS address input in SMS settings form.
-#: actions/smssettings.php:138
+#: actions/smssettings.php:137
 msgid "Confirmation code"
 msgstr "Código de confirmação"
 
 #. TRANS: Form field instructions in SMS settings form.
-#: actions/smssettings.php:140
+#: actions/smssettings.php:139
 msgid "Enter the code you received on your phone."
 msgstr "Introduza o código que recebeu no seu telefone."
 
 #. TRANS: Button label to confirm SMS confirmation code in SMS settings.
-#: actions/smssettings.php:144
+#: actions/smssettings.php:143
 msgctxt "BUTTON"
 msgid "Confirm"
 msgstr "Confirmar"
 
 #. TRANS: Field label for SMS phone number input in SMS settings form.
-#: actions/smssettings.php:149
+#: actions/smssettings.php:148
 msgid "SMS phone number"
 msgstr "Número de telefone para SMS"
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
-#: actions/smssettings.php:152
+#: actions/smssettings.php:151
 #, fuzzy
-msgid "Phone number, no punctuation or spaces, with area code"
+msgid "Phone number, no punctuation or spaces, with area code."
 msgstr "Número de telefone, sem pontuação ou espaços, com código de área"
 
 #. TRANS: Form legend for SMS preferences form.
-#: actions/smssettings.php:191
+#: actions/smssettings.php:190
 msgid "SMS preferences"
 msgstr "Preferências de SMS"
 
 #. TRANS: Checkbox label in SMS preferences form.
-#: actions/smssettings.php:197
+#: actions/smssettings.php:196
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
@@ -6090,32 +6139,32 @@ msgstr ""
 "me montantes exorbitantes."
 
 #. TRANS: Confirmation message for successful SMS preferences save.
-#: actions/smssettings.php:308
+#: actions/smssettings.php:307
 msgid "SMS preferences saved."
 msgstr "Preferências de SMS gravadas."
 
 #. TRANS: Message given saving SMS phone number without having provided one.
-#: actions/smssettings.php:330
+#: actions/smssettings.php:329
 msgid "No phone number."
 msgstr "Nenhum número de telefone."
 
 #. TRANS: Message given saving SMS phone number without having selected a carrier.
-#: actions/smssettings.php:336
+#: actions/smssettings.php:335
 msgid "No carrier selected."
 msgstr "Operador não foi seleccionado."
 
 #. TRANS: Message given saving SMS phone number that is already set.
-#: actions/smssettings.php:344
+#: actions/smssettings.php:343
 msgid "That is already your phone number."
 msgstr "Esse já é o seu número de telefone."
 
 #. TRANS: Message given saving SMS phone number that is already set for another user.
-#: actions/smssettings.php:348
+#: actions/smssettings.php:347
 msgid "That phone number already belongs to another user."
 msgstr "Esse número de telefone já pertence a outro utilizador."
 
 #. TRANS: Message given saving valid SMS phone number that is to be confirmed.
-#: actions/smssettings.php:376
+#: actions/smssettings.php:375
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
 "for the code and instructions on how to use it."
@@ -6125,39 +6174,39 @@ msgstr ""
 "utilização."
 
 #. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
-#: actions/smssettings.php:404
+#: actions/smssettings.php:403
 msgid "That is the wrong confirmation number."
 msgstr "Esse número de confirmação está errado."
 
 #. TRANS: Message given after successfully canceling SMS phone number confirmation.
-#: actions/smssettings.php:418
+#: actions/smssettings.php:417
 msgid "SMS confirmation cancelled."
 msgstr "Confirmação de SMS cancelada."
 
 #. TRANS: Message given trying to remove an SMS phone number that is not
 #. TRANS: registered for the active user.
-#: actions/smssettings.php:438
+#: actions/smssettings.php:437
 msgid "That is not your phone number."
 msgstr "Esse número de telefone não é o seu."
 
 #. TRANS: Message given after successfully removing a registered SMS phone number.
-#: actions/smssettings.php:460
+#: actions/smssettings.php:459
 msgid "The SMS phone number was removed."
 msgstr "Número de telefone para SMS foi removido."
 
 #. TRANS: Label for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:499
+#: actions/smssettings.php:498
 msgid "Mobile carrier"
 msgstr "Operador móvel"
 
 #. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:504
+#: actions/smssettings.php:503
 msgid "Select a carrier"
 msgstr "Seleccione um operador"
 
 #. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
 #. TRANS: %s is an administrative contact's e-mail address.
-#: actions/smssettings.php:513
+#: actions/smssettings.php:512
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -6168,7 +6217,7 @@ msgstr ""
 "para %s."
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
-#: actions/smssettings.php:535
+#: actions/smssettings.php:534
 #, fuzzy
 msgid "No code entered."
 msgstr "Nenhum código introduzido"
@@ -6242,15 +6291,13 @@ msgstr "Não subscreveu esse perfil."
 msgid "Could not save subscription."
 msgstr "Não foi possível gravar a subscrição."
 
-#: actions/subscribe.php:77
-msgid "This action only accepts POST requests."
-msgstr "Esta operação só aceita pedidos POST."
-
-#: actions/subscribe.php:117
+#. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
+#: actions/subscribe.php:121
 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
 msgstr "Não pode subscrever um perfil remoto OMB 0.1 com esta operação."
 
-#: actions/subscribe.php:145
+#. TRANS: Page title when subscription succeeded.
+#: actions/subscribe.php:149
 msgid "Subscribed"
 msgstr "Subscrito"
 
@@ -6368,31 +6415,34 @@ msgid "Subscription feed for %s (Atom)"
 msgstr "Fonte de notas para %s (Atom)"
 
 #. TRANS: Checkbox label for enabling Jabber messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:239
-msgid "Jabber"
-msgstr "Jabber"
+#: actions/subscriptions.php:241 lib/settingsnav.php:110
+#, fuzzy
+msgid "IM"
+msgstr "MI"
 
 #. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:254
+#: actions/subscriptions.php:256 lib/settingsnav.php:117
 msgid "SMS"
 msgstr "SMS"
 
-#: actions/tag.php:69
+#. TRANS: Title for all but the first page of notices with tags.
+#. TRANS: %1$s is the tag, %2$d is the page number.
+#: actions/tag.php:73
 #, php-format
 msgid "Notices tagged with %1$s, page %2$d"
 msgstr "Notas categorizadas com %1$s, página %2$d"
 
-#: actions/tag.php:87
+#: actions/tag.php:91
 #, php-format
 msgid "Notice feed for tag %s (RSS 1.0)"
 msgstr "Fonte de notas para a categoria %s (RSS 1.0)"
 
-#: actions/tag.php:93
+#: actions/tag.php:97
 #, php-format
 msgid "Notice feed for tag %s (RSS 2.0)"
 msgstr "Fonte de notas para a categoria %s (RSS 2.0)"
 
-#: actions/tag.php:99
+#: actions/tag.php:103
 #, php-format
 msgid "Notice feed for tag %s (Atom)"
 msgstr "Fonte de notas para a categoria %s (Atom)"
@@ -6411,17 +6461,11 @@ msgstr "Categoria %s"
 msgid "User profile"
 msgstr "Perfil"
 
-#. TRANS: DT element in area for user avatar.
-#: actions/tagother.php:81 actions/userauthorization.php:132
-#: lib/userprofile.php:108
-msgid "Photo"
-msgstr "Foto"
-
-#: actions/tagother.php:141
+#: actions/tagother.php:120
 msgid "Tag user"
 msgstr "Categorizar utilizador"
 
-#: actions/tagother.php:151
+#: actions/tagother.php:130
 msgid ""
 "Tags for this user (letters, numbers, -, ., and _), comma- or space- "
 "separated"
@@ -6429,12 +6473,17 @@ msgstr ""
 "Categorias para este utilizador (letras, números, ., _), separadas por "
 "vírgulas ou espaços"
 
-#: actions/tagother.php:193
+#: actions/tagother.php:157
+#, php-format
+msgid "Invalid tag: \"%s\""
+msgstr "Categoria inválida: \"%s\""
+
+#: actions/tagother.php:172
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr "Só pode categorizar pessoas que subscreve ou os seus subscritores."
 
-#: actions/tagother.php:236
+#: actions/tagother.php:215
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
 "Use este formulário para categorizar os seus subscritores ou os que "
@@ -6444,6 +6493,7 @@ msgstr ""
 msgid "No such tag."
 msgstr "Categoria não foi encontrada."
 
+#. TRANS: Client error displayed when trying to unblock a non-blocked user.
 #: actions/unblock.php:59
 msgid "You haven't blocked that user."
 msgstr "Não bloqueou esse utilizador."
@@ -6464,7 +6514,7 @@ msgstr "O pedido não tem a identificação do perfil."
 msgid "Unsubscribed"
 msgstr "Subscrição cancelada"
 
-#: actions/updateprofile.php:64 actions/userauthorization.php:337
+#: actions/updateprofile.php:64
 #, php-format
 msgid ""
 "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
@@ -6472,6 +6522,78 @@ msgstr ""
 "Licença ‘%1$s’ da listenee stream não é compatível com a licença ‘%2$s’ do "
 "site."
 
+#: actions/urlsettings.php:60
+#, fuzzy
+msgid "URL settings"
+msgstr "Configurações do IM"
+
+#. TRANS: Instructions for tab "Other" in user profile settings.
+#: actions/urlsettings.php:72
+msgid "Manage various other options."
+msgstr "Gerir várias outras opções."
+
+#. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
+#. TRANS: user's profile settings. This message has one space at the beginning. Use your
+#. TRANS: language's word separator here if it has one (most likely a single space).
+#: actions/urlsettings.php:115
+msgid " (free service)"
+msgstr " (serviço livre)"
+
+#: actions/urlsettings.php:121
+#, fuzzy
+msgid "[none]"
+msgstr "Nenhum"
+
+#: actions/urlsettings.php:122
+msgid "[internal]"
+msgstr ""
+
+#. TRANS: Label for dropdown with URL shortener services.
+#: actions/urlsettings.php:130
+msgid "Shorten URLs with"
+msgstr "Encurtar URLs com"
+
+#. TRANS: Tooltip for for dropdown with URL shortener services.
+#: actions/urlsettings.php:132
+msgid "Automatic shortening service to use."
+msgstr "Serviço de encurtamento que será usado automaticamente"
+
+#: actions/urlsettings.php:138
+msgid "URL longer than"
+msgstr ""
+
+#: actions/urlsettings.php:141
+msgid "URLs longer than this will be shortened, 0 means always shorten."
+msgstr ""
+
+#: actions/urlsettings.php:145
+msgid "Text longer than"
+msgstr ""
+
+#: actions/urlsettings.php:148
+msgid ""
+"URLs in notices longer than this will be shortened, 0 means always shorten."
+msgstr ""
+
+#. TRANS: Form validation error for form "Other settings" in user profile.
+#: actions/urlsettings.php:180
+#, fuzzy
+msgid "URL shortening service is too long (maximum 50 characters)."
+msgstr "Serviço de encurtamento de URLs demasiado extenso (máx. 50 caracteres)"
+
+#: actions/urlsettings.php:187
+msgid "Invalid number for max url length."
+msgstr ""
+
+#: actions/urlsettings.php:193
+#, fuzzy
+msgid "Invalid number for max notice length."
+msgstr "Conteúdo da nota é inválido."
+
+#: actions/urlsettings.php:238
+msgid "Error saving user URL shortening preferences."
+msgstr ""
+
 #. TRANS: User admin panel title
 #: actions/useradminpanel.php:58
 msgctxt "TITLE"
@@ -6498,11 +6620,11 @@ msgstr "Texto de boas-vindas inválido. Tamanho máx. é 255 caracteres."
 #. TRANS: users in user admin panel. %1$s is the invalid nickname.
 #: actions/useradminpanel.php:166
 #, fuzzy, php-format
-msgid "Invalid default subscripton: '%1$s' is not a user."
+msgid "Invalid default subscripton: \"%1$s\" is not a user."
 msgstr "Subscrição predefinida é inválida: '%1$s' não é utilizador."
 
-#. TRANS: Link description in user account settings menu.
-#: actions/useradminpanel.php:215 lib/accountsettingsaction.php:106
+#: actions/useradminpanel.php:215 lib/action.php:565 lib/settingsnav.php:77
+#: lib/subgroupnav.php:81
 msgid "Profile"
 msgstr "Perfil"
 
@@ -6560,59 +6682,63 @@ msgstr "Permitir, ou não, que utilizadores convidem utilizadores novos."
 #. TRANS: Title for button to save user settings in user admin panel.
 #: actions/useradminpanel.php:302
 #, fuzzy
-msgid "Save user settings"
+msgid "Save user settings."
 msgstr "Gravar configurações do site"
 
-#: actions/userauthorization.php:105
+#. TRANS: Page title.
+#: actions/userauthorization.php:109
 msgid "Authorize subscription"
 msgstr "Autorizar subscrição"
 
-#: actions/userauthorization.php:110
+#. TRANS: Page notice on "Auhtorize subscription" page.
+#: actions/userauthorization.php:115
 #, fuzzy
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
 "user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
-"click “Reject”."
+"click \"Reject\"."
 msgstr ""
 "Por favor, verifique estes detalhes para se certificar de que deseja "
 "subscrever as notas deste utilizador. Se não fez um pedido para subscrever "
 "as notas de alguém, simplesmente clique \"Rejeitar\"."
 
-#. TRANS: Menu item for site administration
-#: actions/userauthorization.php:196 actions/version.php:167
-#: lib/adminpanelaction.php:403
-msgid "License"
-msgstr "Licença"
-
-#: actions/userauthorization.php:217
+#. TRANS: Button text on Authorise Subscription page.
+#: actions/userauthorization.php:200
 #, fuzzy
+msgctxt "BUTTON"
 msgid "Accept"
 msgstr "Aceitar"
 
-#: actions/userauthorization.php:218 lib/subscribeform.php:115
-#: lib/subscribeform.php:139
-msgid "Subscribe to this user"
+#. TRANS: Title for button on Authorise Subscription page.
+#: actions/userauthorization.php:202
+#, fuzzy
+msgid "Subscribe to this user."
 msgstr "Subscrever este utilizador"
 
-#: actions/userauthorization.php:219
+#. TRANS: Button text on Authorise Subscription page.
+#: actions/userauthorization.php:204
 #, fuzzy
+msgctxt "BUTTON"
 msgid "Reject"
 msgstr "Rejeitar"
 
-#: actions/userauthorization.php:220
+#. TRANS: Title for button on Authorise Subscription page.
+#: actions/userauthorization.php:206
 #, fuzzy
-msgid "Reject this subscription"
+msgid "Reject this subscription."
 msgstr "Rejeitar esta subscrição"
 
-#: actions/userauthorization.php:232
+#. TRANS: Client error displayed for an empty authorisation request.
+#: actions/userauthorization.php:219
 msgid "No authorization request!"
 msgstr "Não há pedido de autorização!"
 
-#: actions/userauthorization.php:254
+#. TRANS: Accept message header from Authorise subscription page.
+#: actions/userauthorization.php:242
 msgid "Subscription authorized"
 msgstr "Subscrição autorizada"
 
-#: actions/userauthorization.php:256
+#: actions/userauthorization.php:245
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to authorize the "
@@ -6622,11 +6748,12 @@ msgstr ""
 "Verifique as instruções do site para saber como autorizar a subscrição. A "
 "sua chave de subscrição é:"
 
-#: actions/userauthorization.php:266
+#. TRANS: Reject message header from Authorise subscription page.
+#: actions/userauthorization.php:256
 msgid "Subscription rejected"
 msgstr "Subscrição rejeitada"
 
-#: actions/userauthorization.php:268
+#: actions/userauthorization.php:259
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to fully reject the "
@@ -6636,48 +6763,73 @@ msgstr ""
 "Verifique as instruções do site para saber como rejeitar completamente a "
 "subscrição."
 
-#: actions/userauthorization.php:303
+#. TRANS: Exception thrown when no valid user is found for an authorisation request.
+#. TRANS: %s is a listener URI.
+#: actions/userauthorization.php:296
 #, fuzzy, php-format
-msgid "Listener URI ‘%s’ not found here."
+msgid "Listener URI \"%s\" not found here."
 msgstr "A listener URI ‘%s’ não foi encontrada aqui."
 
-#: actions/userauthorization.php:308
+#. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
+#. TRANS: %s is a listenee URI.
+#: actions/userauthorization.php:303
 #, fuzzy, php-format
-msgid "Listenee URI ‘%s’ is too long."
+msgid "Listenee URI \"%s\" is too long."
 msgstr "URI do escutado ‘%s’ é demasiado longo."
 
-#: actions/userauthorization.php:314
+#. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
+#. TRANS: %s is a listenee URI.
+#: actions/userauthorization.php:311
 #, fuzzy, php-format
-msgid "Listenee URI ‘%s’ is a local user."
+msgid "Listenee URI \"%s\" is a local user."
 msgstr "URI do ouvido ‘%s’ é um utilizador local."
 
+#. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
+#. TRANS: %s is a profile URL.
 #: actions/userauthorization.php:329
 #, fuzzy, php-format
-msgid "Profile URL ‘%s’ is for a local user."
+msgid "Profile URL \"%s\" is for a local user."
 msgstr "A URL ‘%s’ do perfil é de um utilizador local."
 
-#: actions/userauthorization.php:345
+#. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
+#. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
+#: actions/userauthorization.php:339
 #, fuzzy, php-format
-msgid "Avatar URL ‘%s’ is not valid."
+msgid ""
+"Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
+"\"."
+msgstr ""
+"Licença ‘%1$s’ da listenee stream não é compatível com a licença ‘%2$s’ do "
+"site."
+
+#. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
+#. TRANS: %s is an avatar URL.
+#: actions/userauthorization.php:349
+#, fuzzy, php-format
+msgid "Avatar URL \"%s\" is not valid."
 msgstr "A URL ‘%s’ do avatar é inválida."
 
-#: actions/userauthorization.php:350
+#. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
+#. TRANS: %s is an avatar URL.
+#: actions/userauthorization.php:356
 #, fuzzy, php-format
-msgid "Can’t read avatar URL ‘%s’."
+msgid "Cannot read avatar URL \"%s\"."
 msgstr "Não é possível ler a URL do avatar ‘%s’."
 
-#: actions/userauthorization.php:355
+#. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
+#. TRANS: %s is an avatar URL.
+#: actions/userauthorization.php:363
 #, fuzzy, php-format
-msgid "Wrong image type for avatar URL ‘%s’."
+msgid "Wrong image type for avatar URL \"%s\"."
 msgstr "Tipo de imagem incorrecto para o avatar da URL ‘%s’."
 
 #. TRANS: Page title for profile design page.
-#: actions/userdesignsettings.php:74 lib/designsettings.php:63
+#: actions/userdesignsettings.php:74 lib/designsettings.php:61
 msgid "Profile design"
 msgstr "Estilo do perfil"
 
 #. TRANS: Instructions for profile design page.
-#: actions/userdesignsettings.php:84 lib/designsettings.php:74
+#: actions/userdesignsettings.php:84 lib/designsettings.php:72
 msgid ""
 "Customize the way your profile looks with a background image and a colour "
 "palette of your choice."
@@ -6685,10 +6837,28 @@ msgstr ""
 "Personalize o estilo do seu perfil com uma imagem de fundo e uma paleta de "
 "cores à sua escolha."
 
-#: actions/userdesignsettings.php:272
+#: actions/userdesignsettings.php:289
 msgid "Enjoy your hotdog!"
 msgstr "Disfrute do seu cachorro-quente!"
 
+#: actions/userdesignsettings.php:325
+#, fuzzy
+msgid "Design settings"
+msgstr "Gravar configurações do site"
+
+#: actions/userdesignsettings.php:340
+msgid "View profile designs"
+msgstr "Ver estilos para o perfil"
+
+#: actions/userdesignsettings.php:341
+msgid "Show or hide profile designs."
+msgstr "Mostrar ou esconder estilos para o perfil."
+
+#: actions/userdesignsettings.php:348
+#, fuzzy
+msgid "Background file"
+msgstr "Fundo"
+
 #. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number.
 #: actions/usergroups.php:66
 #, php-format
@@ -6738,6 +6908,11 @@ msgstr ""
 msgid "Contributors"
 msgstr "Colaboradores"
 
+#. TRANS: Menu item for site administration
+#: actions/version.php:167 lib/adminpanelaction.php:403
+msgid "License"
+msgstr "Licença"
+
 #: actions/version.php:170
 msgid ""
 "StatusNet is free software: you can redistribute it and/or modify it under "
@@ -6770,12 +6945,13 @@ msgstr ""
 "Juntamente com este programa deve ter recebido uma cópia da GNU Affero "
 "General Public License. Se não a tiver recebido, consulte %s."
 
-#: actions/version.php:191
-msgid "Plugins"
-msgstr "Plugins"
+#. TRANS: Form input field label for application name.
+#: actions/version.php:197 lib/applicationeditform.php:190
+msgid "Name"
+msgstr "Nome"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:901
+#: actions/version.php:198 lib/action.php:885
 msgid "Version"
 msgstr "Versão"
 
@@ -6783,6 +6959,12 @@ msgstr "Versão"
 msgid "Author(s)"
 msgstr "Autores"
 
+#. TRANS: Form input field label.
+#: actions/version.php:200 lib/applicationeditform.php:208
+#: lib/groupeditform.php:168
+msgid "Description"
+msgstr "Descrição"
+
 #. TRANS: Activity title when marking a notice as favorite.
 #: classes/Fave.php:164
 msgid "Favor"
@@ -6905,7 +7087,7 @@ msgid "Could not create login token for %s"
 msgstr "Não foi possível criar a chave de entrada para %s"
 
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
-#: classes/Memcached_DataObject.php:542
+#: classes/Memcached_DataObject.php:556
 msgid "No database name or DSN found anywhere."
 msgstr "Não foi encontrado nenhum nome de base de dados ou DSN."
 
@@ -7083,18 +7265,18 @@ msgstr "%1$s está agora a ouvir as suas notas em %2$s."
 
 #. TRANS: Notice given on user registration.
 #. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:395
+#: classes/User.php:390
 #, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr "%1$s dá-lhe as boas-vindas, @%2$s!"
 
 #. TRANS: Server exception.
-#: classes/User.php:918
+#: classes/User.php:923
 msgid "No single user defined for single-user mode."
 msgstr "Nenhum utilizador único definido para o modo de utilizador único."
 
 #. TRANS: Server exception.
-#: classes/User.php:922
+#: classes/User.php:927
 msgid "Single-user mode code called when not enabled."
 msgstr ""
 
@@ -7139,41 +7321,6 @@ msgstr ""
 msgid "No AtomPub API service for %s."
 msgstr ""
 
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:104
-msgid "Change your profile settings"
-msgstr "Modificar as suas definições de perfil"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:111
-msgid "Upload an avatar"
-msgstr "Carregar um avatar"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:118
-msgid "Change your password"
-msgstr "Modificar a sua senha"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:125
-msgid "Change email handling"
-msgstr "Alterar manuseamento de email"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:132
-msgid "Design your profile"
-msgstr "Altere o estilo do seu perfil"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:139
-msgid "Other options"
-msgstr "Outras opções"
-
-#. TRANS: Link description in user account settings menu.
-#: lib/accountsettingsaction.php:141
-msgid "Other"
-msgstr "Outras"
-
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
 #: lib/action.php:161
 #, php-format
@@ -7191,206 +7338,128 @@ msgctxt "TOOLTIP"
 msgid "Show more"
 msgstr ""
 
-#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:544
-msgid "Primary site navigation"
-msgstr "Navegação primária deste site"
+#. TRANS: Inline reply form submit button: submits a reply comment.
+#: lib/action.php:328
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Comment"
+msgstr "Conteúdo"
 
-#. TRANS: Tooltip for main menu option "Personal".
-#: lib/action.php:550
-msgctxt "TOOLTIP"
-msgid "Personal profile and friends timeline"
-msgstr "Perfil pessoal e notas dos amigos"
+#. TRANS: Placeholder text for inline reply form. Clicking in this box will turn it into a mini notice form.
+#: lib/action.php:331
+msgid "Add a comment..."
+msgstr ""
 
-#. TRANS: Main menu option when logged in for access to personal profile and friends timeline.
-#. TRANS: Personal group navigation menu option when logged in for viewing timeline of self and friends.
-#: lib/action.php:553 lib/personalgroupnav.php:100
-msgctxt "MENU"
-msgid "Personal"
-msgstr "Pessoal"
+#: lib/action.php:559 lib/personalgroupnav.php:99
+#, fuzzy
+msgid "Home"
+msgstr "Página pessoal"
 
-#. TRANS: Tooltip for main menu option "Account".
-#: lib/action.php:555
-msgctxt "TOOLTIP"
-msgid "Change your email, avatar, password, profile"
-msgstr "Altere o seu endereço electrónico, avatar, senha, perfil"
-
-#. TRANS: Main menu option when logged in for access to user settings.
-#: lib/action.php:558
-msgid "Account"
-msgstr "Conta"
-
-#. TRANS: Tooltip for main menu option "Services".
 #: lib/action.php:560
-msgctxt "TOOLTIP"
-msgid "Connect to services"
-msgstr "Ligar aos serviços"
+#, fuzzy
+msgid "Friends timeline"
+msgstr "Notas de %s"
 
-#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services.
-#: lib/action.php:563
-msgid "Connect"
-msgstr "Ligar"
-
-#. TRANS: Tooltip for menu option "Admin".
 #: lib/action.php:566
-msgctxt "TOOLTIP"
-msgid "Change site configuration"
-msgstr "Alterar a configuração do site"
+#, fuzzy
+msgid "Your profile"
+msgstr "Perfil do grupo"
 
-#. TRANS: Main menu option when logged in and site admin for access to site configuration.
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/action.php:569 lib/groupnav.php:117
-msgctxt "MENU"
-msgid "Admin"
-msgstr "Gestor"
+#: lib/action.php:570 lib/action.php:593 lib/publicgroupnav.php:78
+msgid "Public"
+msgstr "Público"
 
-#. TRANS: Tooltip for main menu option "Invite".
-#: lib/action.php:573
-#, php-format
-msgctxt "TOOLTIP"
-msgid "Invite friends and colleagues to join you on %s"
-msgstr "Convidar amigos e colegas para se juntarem a si em %s"
+#: lib/action.php:571 lib/action.php:594
+#, fuzzy
+msgid "Everyone on this site"
+msgstr "Procurar pessoas neste site"
+
+#: lib/action.php:575
+#, fuzzy
+msgid "Settings"
+msgstr "Configurações de SMS"
 
-#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users.
 #: lib/action.php:576
-msgctxt "MENU"
-msgid "Invite"
-msgstr "Convidar"
+#, fuzzy
+msgid "Change your personal settings"
+msgstr "Modificar as suas definições de perfil"
 
-#. TRANS: Tooltip for main menu option "Logout"
 #: lib/action.php:582
-msgctxt "TOOLTIP"
-msgid "Logout from the site"
-msgstr "Terminar esta sessão"
+#, fuzzy
+msgid "Site configuration"
+msgstr "Configuração do utilizador"
 
-#. TRANS: Main menu option when logged in to log out the current user.
-#: lib/action.php:585
-msgctxt "MENU"
+#: lib/action.php:587
+#, fuzzy
 msgid "Logout"
 msgstr "Sair"
 
-#. TRANS: Tooltip for main menu option "Register".
-#: lib/action.php:590
-msgctxt "TOOLTIP"
-msgid "Create an account"
-msgstr "Criar uma conta"
+#: lib/action.php:588
+#, fuzzy
+msgid "Logout from the site"
+msgstr "Terminar esta sessão"
 
-#. TRANS: Main menu option when not logged in to register a new account.
-#. TRANS: Menu item for registering with the StatusNet site.
-#: lib/action.php:593 lib/logingroupnav.php:85
-msgctxt "MENU"
-msgid "Register"
-msgstr "Registar"
-
-#. TRANS: Tooltip for main menu option "Login".
-#: lib/action.php:596
-msgctxt "TOOLTIP"
+#: lib/action.php:599
+#, fuzzy
 msgid "Login to the site"
 msgstr "Iniciar uma sessão"
 
-#. TRANS: Main menu option when not logged in to log in.
-#. TRANS: Menu item for logging in to the StatusNet site.
-#: lib/action.php:599 lib/logingroupnav.php:77
-msgctxt "MENU"
-msgid "Login"
-msgstr "Entrar"
-
-#. TRANS: Tooltip for main menu option "Help".
-#: lib/action.php:602
-msgctxt "TOOLTIP"
-msgid "Help me!"
-msgstr "Ajudem-me!"
-
-#. TRANS: Main menu option for help on the StatusNet site.
-#: lib/action.php:605
-msgctxt "MENU"
-msgid "Help"
-msgstr "Ajuda"
-
-#. TRANS: Tooltip for main menu option "Search".
-#: lib/action.php:608
-msgctxt "TOOLTIP"
-msgid "Search for people or text"
-msgstr "Procurar pessoas ou pesquisar texto"
-
-#. TRANS: Main menu option when logged in or when the StatusNet instance is not private.
-#: lib/action.php:611
-msgctxt "MENU"
+#: lib/action.php:606
+#, fuzzy
 msgid "Search"
 msgstr "Pesquisa"
 
-#. TRANS: DT element for site notice. String is hidden in default CSS.
-#. TRANS: Menu item for site administration
-#: lib/action.php:633 lib/adminpanelaction.php:387
-msgid "Site notice"
-msgstr "Aviso do site"
-
-#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:700
-msgid "Local views"
-msgstr "Vistas locais"
-
-#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:770
-msgid "Page notice"
-msgstr "Aviso da página"
-
-#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:874
-msgid "Secondary site navigation"
-msgstr "Navegação secundária deste site"
+#: lib/action.php:607
+#, fuzzy
+msgid "Search the site"
+msgstr "Pesquisar site"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:880
+#: lib/action.php:864
 msgid "Help"
 msgstr "Ajuda"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:883
+#: lib/action.php:867
 msgid "About"
 msgstr "Sobre"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:886
+#: lib/action.php:870
 msgid "FAQ"
 msgstr "FAQ"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:891
+#: lib/action.php:875
 msgid "TOS"
 msgstr "Termos"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:895
+#: lib/action.php:879
 msgid "Privacy"
 msgstr "Privacidade"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:898
+#: lib/action.php:882
 msgid "Source"
 msgstr "Código fonte"
 
 #. TRANS: Secondary navigation menu option leading to e-mail contact information on the
 #. TRANS: StatusNet site, where to report bugs, ...
-#: lib/action.php:905
+#: lib/action.php:889
 msgid "Contact"
 msgstr "Contacto"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:908
+#: lib/action.php:892
 msgid "Badge"
 msgstr "Emblema"
 
-#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:937
-msgid "StatusNet software license"
-msgstr "Licença de software do StatusNet"
-
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:944
+#: lib/action.php:921
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7400,7 +7469,7 @@ msgstr ""
 "broughtby%%](%%site.broughtbyurl%%)."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:947
+#: lib/action.php:924
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** é um serviço de microblogues."
@@ -7409,7 +7478,7 @@ msgstr "**%%site.name%%** é um serviço de microblogues."
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:954
+#: lib/action.php:931
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7420,21 +7489,16 @@ msgstr ""
 "disponibilizado nos termos da [GNU Affero General Public License](http://www."
 "fsf.org/licensing/licenses/agpl-3.0.html)."
 
-#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:970
-msgid "Site content license"
-msgstr "Licença de conteúdos do site"
-
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:977
+#: lib/action.php:949
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr "O conteúdo e dados do site %1$s são privados e confidenciais."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:984
+#: lib/action.php:956
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
@@ -7442,7 +7506,7 @@ msgstr ""
 "direitos reservados."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:988
+#: lib/action.php:960
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 "Direitos de autor sobre o conteúdo e dados detidos pelos contribuidores. "
@@ -7450,27 +7514,22 @@ msgstr ""
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:1020
+#: lib/action.php:992
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
 "Todo o conteúdo e dados do site %1$s são disponibilizados nos termos da "
 "licença %2$s."
 
-#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1356
-msgid "Pagination"
-msgstr "Paginação"
-
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1367
+#: lib/action.php:1335
 msgid "After"
 msgstr "Posteriores"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1377
+#: lib/action.php:1345
 msgid "Before"
 msgstr "Anteriores"
 
@@ -7626,7 +7685,7 @@ msgid "User configuration"
 msgstr "Configuração do utilizador"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:122
+#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:110
 msgid "User"
 msgstr "Utilizador"
 
@@ -7650,6 +7709,11 @@ msgstr "Configuração das sessões"
 msgid "Edit site notice"
 msgstr "Editar aviso do site"
 
+#. TRANS: Menu item for site administration
+#: lib/adminpanelaction.php:387
+msgid "Site notice"
+msgstr "Aviso do site"
+
 #. TRANS: Menu item title/tooltip
 #: lib/adminpanelaction.php:393
 msgid "Snapshots configuration"
@@ -7660,6 +7724,12 @@ msgstr "Configuração dos instântaneos"
 msgid "Set site license"
 msgstr ""
 
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:409
+#, fuzzy
+msgid "Plugins configuration"
+msgstr "Configuração das localizações"
+
 #. TRANS: Client error 401.
 #: lib/apiauth.php:111
 msgid "API resource requires read-write access, but you only have read access."
@@ -7670,19 +7740,23 @@ msgstr "API requer acesso de leitura e escrita, mas só tem acesso de leitura."
 msgid "No application for that consumer key."
 msgstr "Nenhuma aplicação para essa chave de consumidor."
 
+#: lib/apiauth.php:202 lib/apiauth.php:284
+msgid "Not allowed to use API."
+msgstr ""
+
 #. TRANS: OAuth exception given when an incorrect access token was given for a user.
-#: lib/apiauth.php:219
+#: lib/apiauth.php:225
 msgid "Bad access token."
 msgstr "Código de acesso incorrecto."
 
 #. TRANS: OAuth exception given when no user was found for a given token (no token was found).
-#: lib/apiauth.php:224
+#: lib/apiauth.php:230
 msgid "No user for that token."
 msgstr "Nenhum utilizador para esse código."
 
 #. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel".
 #. TRANS: Client error thrown when authentication fails.
-#: lib/apiauth.php:266 lib/apiauth.php:293
+#: lib/apiauth.php:272 lib/apiauth.php:302
 msgid "Could not authenticate you."
 msgstr "Não foi possível autenticá-lo."
 
@@ -7729,6 +7803,11 @@ msgstr "Tentou revogar um código desconhecido."
 msgid "Failed to delete revoked token."
 msgstr "Falha ao eliminar código revogado."
 
+#. TRANS: Form input field label for application icon.
+#: lib/applicationeditform.php:177
+msgid "Icon"
+msgstr "Ícone"
+
 #. TRANS: Form guide.
 #: lib/applicationeditform.php:182
 msgid "Icon for this application"
@@ -7763,6 +7842,11 @@ msgstr "URL de origem"
 msgid "Organization responsible for this application"
 msgstr "Organização responsável por esta aplicação"
 
+#. TRANS: Form input field label.
+#: lib/applicationeditform.php:227
+msgid "Organization"
+msgstr "Organização"
+
 #. TRANS: Form input field instructions.
 #: lib/applicationeditform.php:234
 msgid "URL for the homepage of the organization"
@@ -7851,16 +7935,6 @@ msgstr ""
 msgid "Do not use this method!"
 msgstr "Não apagar esta nota"
 
-#. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:293
-msgid "Author"
-msgstr "Autor"
-
-#. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:307
-msgid "Provider"
-msgstr "Fornecedor"
-
 #. TRANS: Title.
 #: lib/attachmentnoticesection.php:67
 msgid "Notices where this attachment appears"
@@ -7888,24 +7962,29 @@ msgstr "Não é permitido mudar a palavra-chave"
 msgid "Block"
 msgstr "Bloquear"
 
+#. TRANS: Description of the form to block a user.
+#: lib/blockform.php:79
+msgid "Block this user"
+msgstr "Bloquear este utilizador"
+
 #. TRANS: Title for command results.
-#: lib/channel.php:160 lib/channel.php:181
+#: lib/channel.php:104 lib/channel.php:125
 msgid "Command results"
 msgstr "Resultados do comando"
 
 #. TRANS: Title for command results.
-#: lib/channel.php:194
+#: lib/channel.php:138
 #, fuzzy
 msgid "AJAX error"
 msgstr "Erro do Ajax"
 
 #. TRANS: E-mail subject when a command has completed.
-#: lib/channel.php:233 lib/mailhandler.php:143
+#: lib/channel.php:177 lib/mailhandler.php:143
 msgid "Command complete"
 msgstr "Comando terminado"
 
 #. TRANS: E-mail subject when a command has failed.
-#: lib/channel.php:244
+#: lib/channel.php:188
 msgid "Command failed"
 msgstr "Comando falhou"
 
@@ -8008,7 +8087,7 @@ msgstr "Nome completo: %s"
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a location.
-#: lib/command.php:446 lib/mail.php:270
+#: lib/command.php:446 lib/mail.php:275
 #, php-format
 msgid "Location: %s"
 msgstr "Localidade: %s"
@@ -8016,7 +8095,7 @@ msgstr "Localidade: %s"
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a homepage.
-#: lib/command.php:450 lib/mail.php:274
+#: lib/command.php:450 lib/mail.php:279
 #, php-format
 msgid "Homepage: %s"
 msgstr "Página pessoal: %s"
@@ -8286,115 +8365,105 @@ msgstr ""
 "tracking - ainda não implementado.\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:162
+#: lib/common.php:36
 #, fuzzy
 msgid "No configuration file found."
 msgstr "Ficheiro de configuração não encontrado. "
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:165
+#: lib/common.php:39
 #, fuzzy
 msgid "I looked for configuration files in the following places:"
 msgstr "Procurei ficheiros de configuração nos seguintes sítios: "
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:168
+#: lib/common.php:42
 msgid "You may wish to run the installer to fix this."
 msgstr "Talvez queira correr o instalador para resolver esta questão."
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:172
+#: lib/common.php:46
 msgid "Go to the installer."
 msgstr "Ir para o instalador."
 
-#. TRANS: Menu item for Instant Messaging settings.
-#: lib/connectsettingsaction.php:106
-#, fuzzy
-msgctxt "MENU"
-msgid "IM"
-msgstr "MI"
-
-#. TRANS: Tooltip for Instant Messaging menu item.
-#: lib/connectsettingsaction.php:108
-msgid "Updates by instant messenger (IM)"
-msgstr "Actualizações por mensagem instantânea (MI)"
-
-#. TRANS: Menu item for Short Message Service settings.
-#: lib/connectsettingsaction.php:113
-#, fuzzy
-msgctxt "MENU"
-msgid "SMS"
-msgstr "SMS"
-
-#. TRANS: Tooltip for Short Message Service menu item.
-#: lib/connectsettingsaction.php:115
-msgid "Updates by SMS"
-msgstr "Actualizações por SMS"
-
-#. TRANS: Menu item for OuAth connection settings.
-#: lib/connectsettingsaction.php:120
-#, fuzzy
-msgctxt "MENU"
-msgid "Connections"
-msgstr "Ligações"
-
-#. TRANS: Tooltip for connected applications (Connections through OAuth) menu item.
-#: lib/connectsettingsaction.php:122
-msgid "Authorized connected applications"
-msgstr "Aplicações ligadas autorizadas"
-
 #: lib/dberroraction.php:59
 msgid "Database error"
 msgstr "Erro de base de dados"
 
+#. TRANS: Description of form for deleting a user.
+#: lib/deleteuserform.php:75
+msgid "Delete this user"
+msgstr "Apagar este utilizador"
+
+#: lib/designform.php:114
+#, fuzzy
+msgid "Change design"
+msgstr "Gravar o estilo"
+
+#. TRANS: Fieldset legend on profile design page to change profile page colours.
+#: lib/designform.php:131
+msgid "Change colours"
+msgstr "Alterar cores"
+
+#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
+#: lib/designform.php:138
+msgid "Use defaults"
+msgstr "Usar predefinições"
+
+#. TRANS: Title for button on profile design page to reset all colour settings to default.
+#: lib/designform.php:140
+msgid "Restore default designs"
+msgstr "Repor estilos predefinidos"
+
+#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
+#: lib/designform.php:148
+msgid "Reset back to default"
+msgstr "Repor predefinição"
+
 #. TRANS: Label in form on profile design page.
 #. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
-#: lib/designsettings.php:108
+#: lib/designform.php:158
 msgid "Upload file"
 msgstr "Carregar ficheiro"
 
 #. TRANS: Instructions for form on profile design page.
-#: lib/designsettings.php:113
+#: lib/designform.php:163
+#, fuzzy
 msgid ""
-"You can upload your personal background image. The maximum file size is 2MB."
+"You can upload your personal background image. The maximum file size is 2Mb."
 msgstr ""
 "Pode carregar uma imagem de fundo pessoal. O tamanho máximo do ficheiro é "
 "2MB."
 
 #. TRANS: Radio button on profile design page that will enable use of the uploaded profile image.
-#: lib/designsettings.php:139
+#: lib/designform.php:194
 #, fuzzy
 msgctxt "RADIO"
 msgid "On"
 msgstr "Ligar"
 
 #. TRANS: Radio button on profile design page that will disable use of the uploaded profile image.
-#: lib/designsettings.php:156
+#: lib/designform.php:211
 #, fuzzy
 msgctxt "RADIO"
 msgid "Off"
 msgstr "Desligar"
 
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: lib/designsettings.php:175
-msgid "Change colours"
-msgstr "Alterar cores"
-
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: lib/designsettings.php:257
-msgid "Use defaults"
-msgstr "Usar predefinições"
+#. TRANS: Title for button on profile design page to save settings.
+#: lib/designform.php:322
+msgid "Save design"
+msgstr "Gravar o estilo"
 
 #. TRANS: Error message displayed if design settings could not be saved.
 #. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
-#: lib/designsettings.php:405 lib/designsettings.php:427
+#: lib/designsettings.php:216 lib/designsettings.php:238
 msgid "Couldn't update your design."
 msgstr "Não foi possível actualizar o estilo."
 
 #. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
-#: lib/designsettings.php:433
+#: lib/designsettings.php:244
 msgid "Design defaults restored."
 msgstr "Predefinições do estilo repostas"
 
@@ -8464,27 +8533,23 @@ msgstr ""
 msgid "Feeds"
 msgstr ""
 
-#: lib/galleryaction.php:121
-msgid "Filter tags"
-msgstr "Filtrar categorias"
-
-#: lib/galleryaction.php:131
+#: lib/galleryaction.php:128
 msgid "All"
 msgstr "Todas"
 
-#: lib/galleryaction.php:139
+#: lib/galleryaction.php:136
 msgid "Select tag to filter"
 msgstr "Seleccione uma categoria para filtrar"
 
-#: lib/galleryaction.php:140
+#: lib/galleryaction.php:137
 msgid "Tag"
 msgstr "Categoria"
 
-#: lib/galleryaction.php:141
+#: lib/galleryaction.php:138
 msgid "Choose a tag to narrow list"
 msgstr "Escolha uma categoria para reduzir a lista"
 
-#: lib/galleryaction.php:143
+#: lib/galleryaction.php:140
 msgid "Go"
 msgstr "Prosseguir"
 
@@ -8574,6 +8639,12 @@ msgctxt "TOOLTIP"
 msgid "%s blocked users"
 msgstr "Utilizadores bloqueados de %s"
 
+#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
+#: lib/groupnav.php:117
+msgctxt "MENU"
+msgid "Admin"
+msgstr "Gestor"
+
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
 #: lib/groupnav.php:120
@@ -8683,39 +8754,61 @@ msgid_plural "%dB"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/jabber.php:387
+#: lib/implugin.php:262
 #, php-format
-msgid "[%s]"
-msgstr "[%s]"
+msgid ""
+"User \"%s\" on %s has said that your %s screenname belongs to them. If "
+"that's true, you can confirm by clicking on this URL: %s . (If you cannot "
+"click it, copy-and-paste it into the address bar of your browser). If that "
+"user isn't you, or if you didn't request this confirmation, just ignore this "
+"message."
+msgstr ""
 
-#: lib/jabber.php:567
+#: lib/implugin.php:349
 #, php-format
 msgid "Unknown inbox source %d."
 msgstr "Origem da caixa de entrada desconhecida \"%s\"."
 
+#: lib/implugin.php:485
+#, fuzzy, php-format
+msgid "Message too long - maximum is %1$d characters, you sent %2$d."
+msgstr "Mensagem demasiado extensa - máx. %1$d caracteres, enviou %2$d."
+
 #: lib/leaveform.php:114
 msgid "Leave"
 msgstr "Afastar-me"
 
+#. TRANS: Menu item for logging in to the StatusNet site.
+#: lib/logingroupnav.php:77
+msgctxt "MENU"
+msgid "Login"
+msgstr "Entrar"
+
 #. TRANS: Title for menu item for logging in to the StatusNet site.
 #: lib/logingroupnav.php:79
 msgid "Login with a username and password"
 msgstr "Iniciar sessão com um nome de utilizador e senha"
 
+#. TRANS: Menu item for registering with the StatusNet site.
+#: lib/logingroupnav.php:85
+msgctxt "MENU"
+msgid "Register"
+msgstr "Registar"
+
 #. TRANS: Title for menu item for registering with the StatusNet site.
 #: lib/logingroupnav.php:87
 msgid "Sign up for a new account"
 msgstr "Registar uma conta nova"
 
 #. TRANS: Subject for address confirmation email.
-#: lib/mail.php:168
+#: lib/mail.php:172
 msgid "Email address confirmation"
 msgstr "Confirmação do endereço electrónico"
 
 #. TRANS: Body for address confirmation email.
 #. TRANS: %1$s is the addressed user's nickname, %2$s is the StatusNet sitename,
 #. TRANS: %3$s is the URL to confirm at.
-#: lib/mail.php:173
+#: lib/mail.php:177
 #, fuzzy, php-format
 msgid ""
 "Hey, %1$s.\n"
@@ -8746,14 +8839,14 @@ msgstr ""
 
 #. TRANS: Subject of new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
-#: lib/mail.php:238
+#: lib/mail.php:243
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1$s está agora a ouvir as suas notas em %2$s."
 
 #. TRANS: This is a paragraph in a new-subscriber e-mail.
 #. TRANS: %s is a URL where the subscriber can be reported as abusive.
-#: lib/mail.php:245
+#: lib/mail.php:250
 #, php-format
 msgid ""
 "If you believe this account is being used abusively, you can block them from "
@@ -8768,7 +8861,7 @@ msgstr ""
 #. TRANS: %3$s is the subscriber's profile URL, %4$s is the subscriber's location (or empty)
 #. TRANS: %5$s is the subscriber's homepage URL (or empty), %6%s is the subscriber's bio (or empty)
 #. TRANS: %7$s is a link to the addressed user's e-mail settings.
-#: lib/mail.php:255
+#: lib/mail.php:260
 #, fuzzy, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -8796,14 +8889,14 @@ msgstr ""
 
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is biographical information.
-#: lib/mail.php:278
+#: lib/mail.php:283
 #, php-format
 msgid "Bio: %s"
 msgstr "Bio: %s"
 
 #. TRANS: Subject of notification mail for new posting email address.
 #. TRANS: %s is the StatusNet sitename.
-#: lib/mail.php:307
+#: lib/mail.php:312
 #, php-format
 msgid "New email address for posting to %s"
 msgstr "Novo endereço electrónico para publicar no site %s"
@@ -8811,7 +8904,7 @@ msgstr "Novo endereço electrónico para publicar no site %s"
 #. TRANS: Body of notification mail for new posting email address.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is the e-mail address to send
 #. TRANS: to to post by e-mail, %3$s is a URL to more instructions.
-#: lib/mail.php:313
+#: lib/mail.php:318
 #, fuzzy, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -8834,26 +8927,26 @@ msgstr ""
 
 #. TRANS: Subject line for SMS-by-email notification messages.
 #. TRANS: %s is the posting user's nickname.
-#: lib/mail.php:434
+#: lib/mail.php:439
 #, php-format
 msgid "%s status"
 msgstr "Estado de %s"
 
 #. TRANS: Subject line for SMS-by-email address confirmation message.
-#: lib/mail.php:460
+#: lib/mail.php:465
 msgid "SMS confirmation"
 msgstr "Confirmação SMS"
 
 #. TRANS: Main body heading for SMS-by-email address confirmation message.
 #. TRANS: %s is the addressed user's nickname.
-#: lib/mail.php:464
+#: lib/mail.php:469
 #, php-format
 msgid "%s: confirm you own this phone number with this code:"
 msgstr "%s: confirme que este número de telefone é seu com este código:"
 
 #. TRANS: Subject for 'nudge' notification email.
 #. TRANS: %s is the nudging user.
-#: lib/mail.php:485
+#: lib/mail.php:490
 #, fuzzy, php-format
 msgid "You have been nudged by %s"
 msgstr "%s envia-lhe um toque"
@@ -8861,7 +8954,7 @@ msgstr "%s envia-lhe um toque"
 #. TRANS: Body for 'nudge' notification email.
 #. TRANS: %1$s is the nuding user's long name, $2$s is the nudging user's nickname,
 #. TRANS: %3$s is a URL to post notices at, %4$s is the StatusNet sitename.
-#: lib/mail.php:492
+#: lib/mail.php:497
 #, php-format
 msgid ""
 "%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -8890,7 +8983,7 @@ msgstr ""
 
 #. TRANS: Subject for direct-message notification email.
 #. TRANS: %s is the sending user's nickname.
-#: lib/mail.php:539
+#: lib/mail.php:544
 #, php-format
 msgid "New private message from %s"
 msgstr "Nova mensagem privada de %s"
@@ -8899,7 +8992,7 @@ msgstr "Nova mensagem privada de %s"
 #. TRANS: %1$s is the sending user's long name, %2$s is the sending user's nickname,
 #. TRANS: %3$s is the message content, %4$s a URL to the message,
 #. TRANS: %5$s is the StatusNet sitename.
-#: lib/mail.php:547
+#: lib/mail.php:552
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -8934,7 +9027,7 @@ msgstr ""
 
 #. TRANS: Subject for favorite notification e-mail.
 #. TRANS: %1$s is the adding user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:599
+#: lib/mail.php:604
 #, fuzzy, php-format
 msgid "%1$s (@%2$s) added your notice as a favorite"
 msgstr "%s (@%s) adicionou a sua nota às favoritas."
@@ -8944,7 +9037,7 @@ msgstr "%s (@%s) adicionou a sua nota às favoritas."
 #. TRANS: %3$s is a URL to the faved notice, %4$s is the faved notice text,
 #. TRANS: %5$s is a URL to all faves of the adding user, %6$s is the StatusNet sitename,
 #. TRANS: %7$s is the adding user's nickname.
-#: lib/mail.php:606
+#: lib/mail.php:611
 #, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -8982,7 +9075,7 @@ msgstr ""
 "%6$s\n"
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:664
+#: lib/mail.php:669
 #, php-format
 msgid ""
 "The full conversation can be read here:\n"
@@ -8995,7 +9088,7 @@ msgstr ""
 
 #. TRANS: E-mail subject for notice notification.
 #. TRANS: %1$s is the sending user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:672
+#: lib/mail.php:677
 #, fuzzy, php-format
 msgid "%1$s (@%2$s) sent a notice to your attention"
 msgstr "%s (@%s) enviou uma nota à sua atenção"
@@ -9006,7 +9099,7 @@ msgstr "%s (@%s) enviou uma nota à sua atenção"
 #. TRANS: %5$s is a URL to the full conversion if it exists (otherwise empty),
 #. TRANS: %6$s is a URL to reply to the notice, %7$s is a URL to all @-replied for the addressed user,
 #. TRANS: %8$s is a URL to the addressed user's e-mail settings, %9$s is the sender's nickname.
-#: lib/mail.php:680
+#: lib/mail.php:685
 #, php-format
 msgid ""
 "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -9153,11 +9246,7 @@ msgstr "Não subscrito!"
 msgid "To"
 msgstr "Para"
 
-#: lib/messageform.php:166 lib/noticeform.php:186
-msgid "Available characters"
-msgstr "Caracteres disponíveis"
-
-#: lib/messageform.php:185 lib/noticeform.php:237
+#: lib/messageform.php:184 lib/noticeform.php:236
 msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr "Enviar"
@@ -9167,15 +9256,10 @@ msgstr "Enviar"
 msgid "Messages"
 msgstr "Mensagem"
 
-#: lib/messagelistitem.php:123 lib/noticelist.php:522
+#: lib/messagelistitem.php:123 lib/noticelist.php:527
 msgid "from"
 msgstr "a partir de"
 
-#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:165
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr "Utilizador só deve conter letras minúsculas e números. Sem espaços."
-
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 #: lib/nickname.php:178
 msgid "Nickname cannot be empty."
@@ -9198,23 +9282,23 @@ msgstr "Enviar uma nota"
 msgid "What's up, %s?"
 msgstr "Novidades, %s?"
 
-#: lib/noticeform.php:194
+#: lib/noticeform.php:193
 msgid "Attach"
 msgstr "Anexar"
 
-#: lib/noticeform.php:198
+#: lib/noticeform.php:197
 msgid "Attach a file"
 msgstr "Anexar um ficheiro"
 
-#: lib/noticeform.php:213
+#: lib/noticeform.php:212
 msgid "Share my location"
 msgstr "Partilhar a minha localização."
 
-#: lib/noticeform.php:216
+#: lib/noticeform.php:215
 msgid "Do not share my location"
 msgstr "Não partilhar a minha localização"
 
-#: lib/noticeform.php:217
+#: lib/noticeform.php:216
 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
 "try again later"
@@ -9223,55 +9307,59 @@ msgstr ""
 "tente novamente mais tarde"
 
 #. TRANS: Used in coordinates as abbreviation of north
-#: lib/noticelist.php:452
+#: lib/noticelist.php:457
 msgid "N"
 msgstr "N"
 
 #. TRANS: Used in coordinates as abbreviation of south
-#: lib/noticelist.php:454
+#: lib/noticelist.php:459
 msgid "S"
 msgstr "S"
 
 #. TRANS: Used in coordinates as abbreviation of east
-#: lib/noticelist.php:456
+#: lib/noticelist.php:461
 msgid "E"
 msgstr "E"
 
 #. TRANS: Used in coordinates as abbreviation of west
-#: lib/noticelist.php:458
+#: lib/noticelist.php:463
 msgid "W"
 msgstr "O"
 
-#: lib/noticelist.php:460
+#: lib/noticelist.php:465
 #, php-format
 msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 
-#: lib/noticelist.php:469
+#: lib/noticelist.php:474
 msgid "at"
 msgstr "coords."
 
-#: lib/noticelist.php:518
+#: lib/noticelist.php:523
 msgid "web"
 msgstr "web"
 
-#: lib/noticelist.php:584
+#: lib/noticelist.php:589
 msgid "in context"
 msgstr "no contexto"
 
-#: lib/noticelist.php:619
+#: lib/noticelist.php:624
 msgid "Repeated by"
 msgstr "Repetida por"
 
-#: lib/noticelist.php:646
+#: lib/noticelist.php:651
 msgid "Reply to this notice"
 msgstr "Responder a esta nota"
 
-#: lib/noticelist.php:647
+#: lib/noticelist.php:652
 msgid "Reply"
 msgstr "Responder"
 
-#: lib/noticelist.php:691
+#: lib/noticelist.php:678
+msgid "Delete this notice"
+msgstr "Apagar esta nota"
+
+#: lib/noticelist.php:696
 msgid "Notice repeated"
 msgstr "Nota repetida"
 
@@ -9308,48 +9396,31 @@ msgstr "Nota duplicada."
 msgid "Couldn't insert new subscription."
 msgstr "Não foi possível inserir nova subscrição."
 
-#. TRANS: Personal group navigation menu option when logged in for viewing @-replies.
-#: lib/personalgroupnav.php:107
+#: lib/personalgroupnav.php:104
 #, fuzzy
-msgctxt "MENU"
 msgid "Replies"
 msgstr "Respostas"
 
-#. TRANS: Personal group navigation menu option when logged in for seeing own profile.
-#: lib/personalgroupnav.php:114
+#: lib/personalgroupnav.php:109
 #, fuzzy
-msgctxt "MENU"
-msgid "Profile"
-msgstr "Perfil"
-
-#. TRANS: Personal group navigation menu option when logged in for viewing own favourited notices.
-#: lib/personalgroupnav.php:120
-#, fuzzy
-msgctxt "MENU"
 msgid "Favorites"
 msgstr "Favoritas"
 
-#. TRANS: Personal group navigation menu option when logged in for viewing recieved personal messages.
-#: lib/personalgroupnav.php:133
+#: lib/personalgroupnav.php:120
 #, fuzzy
-msgctxt "MENU"
 msgid "Inbox"
 msgstr "Recebidas"
 
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing recieved personal messages.
-#: lib/personalgroupnav.php:135
+#: lib/personalgroupnav.php:121
 msgid "Your incoming messages"
 msgstr "Mensagens recebidas"
 
-#. TRANS: Personal group navigation menu option when logged in for viewing senet personal messages.
-#: lib/personalgroupnav.php:140
+#: lib/personalgroupnav.php:125
 #, fuzzy
-msgctxt "MENU"
 msgid "Outbox"
 msgstr "Enviadas"
 
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing senet personal messages.
-#: lib/personalgroupnav.php:142
+#: lib/personalgroupnav.php:126
 msgid "Your sent messages"
 msgstr "Mensagens enviadas"
 
@@ -9364,9 +9435,26 @@ msgstr "Categorias nas notas de %s"
 msgid "Unknown"
 msgstr "Desconhecida"
 
+#. TRANS: Plugin admin panel controls
+#: lib/plugindisableform.php:90
+msgctxt "plugin"
+msgid "Disable"
+msgstr ""
+
+#. TRANS: Plugin admin panel controls
+#: lib/pluginenableform.php:112
+msgctxt "plugin"
+msgid "Enable"
+msgstr ""
+
+#: lib/pluginlist.php:196
+msgctxt "plugin-description"
+msgid "(Plugin descriptions unavailable when disabled.)"
+msgstr ""
+
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:82
+#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:88
 msgid "Subscriptions"
 msgstr "Subscrições"
 
@@ -9377,7 +9465,7 @@ msgstr "Todas as subscrições"
 
 #. TRANS: H2 text for user subscriber statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:90
+#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:96
 msgid "Subscribers"
 msgstr "Subscritores"
 
@@ -9399,7 +9487,7 @@ msgstr "Membro desde"
 #. TRANS: Label for user statistics.
 #. TRANS: H2 text for user group membership statistics.
 #: lib/profileaction.php:239 lib/profileaction.php:290
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:104
 msgid "Groups"
 msgstr "Grupos"
 
@@ -9419,10 +9507,6 @@ msgstr "Todos os grupos"
 msgid "Unimplemented method."
 msgstr "Método não implementado."
 
-#: lib/publicgroupnav.php:78
-msgid "Public"
-msgstr "Público"
-
 #: lib/publicgroupnav.php:82
 msgid "User groups"
 msgstr "Grupos"
@@ -9461,7 +9545,7 @@ msgid "Revoke the \"%s\" role from this user"
 msgstr "Retirar a função \"%s\" a este utilizador"
 
 #. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:974
+#: lib/router.php:1001
 #, fuzzy
 msgid "Page not found."
 msgstr "Método da API não encontrado."
@@ -9491,11 +9575,6 @@ msgctxt "BUTTON"
 msgid "Search"
 msgstr "Pesquisar"
 
-#. TRANS: Definition list item with instructions on how to get (better) search results.
-#: lib/searchaction.php:170
-msgid "Search help"
-msgstr "Pesquisar ajuda"
-
 #: lib/searchgroupnav.php:80
 msgid "People"
 msgstr "Pessoas"
@@ -9520,6 +9599,51 @@ msgstr "Secção sem título"
 msgid "More..."
 msgstr "Mais..."
 
+#: lib/settingsnav.php:78
+msgid "Change your profile settings"
+msgstr "Modificar as suas definições de perfil"
+
+#: lib/settingsnav.php:83
+msgid "Upload an avatar"
+msgstr "Carregar um avatar"
+
+#: lib/settingsnav.php:88
+msgid "Change your password"
+msgstr "Modificar a sua senha"
+
+#: lib/settingsnav.php:93
+msgid "Change email handling"
+msgstr "Alterar manuseamento de email"
+
+#: lib/settingsnav.php:98
+msgid "Design your profile"
+msgstr "Altere o estilo do seu perfil"
+
+#: lib/settingsnav.php:102
+msgid "URL"
+msgstr "URL"
+
+#: lib/settingsnav.php:103
+msgid "URL shorteners"
+msgstr ""
+
+#: lib/settingsnav.php:111
+msgid "Updates by instant messenger (IM)"
+msgstr "Actualizações por mensagem instantânea (MI)"
+
+#: lib/settingsnav.php:118
+msgid "Updates by SMS"
+msgstr "Actualizações por SMS"
+
+#: lib/settingsnav.php:123
+#, fuzzy
+msgid "Connections"
+msgstr "Ligações"
+
+#: lib/settingsnav.php:124
+msgid "Authorized connected applications"
+msgstr "Aplicações ligadas autorizadas"
+
 #: lib/silenceform.php:67
 msgid "Silence"
 msgstr "Silenciar"
@@ -9528,30 +9652,34 @@ msgstr "Silenciar"
 msgid "Silence this user"
 msgstr "Silenciar este utilizador"
 
-#: lib/subgroupnav.php:83
+#: lib/subgroupnav.php:89
 #, php-format
 msgid "People %s subscribes to"
 msgstr "Pessoas que %s subscreve"
 
-#: lib/subgroupnav.php:91
+#: lib/subgroupnav.php:97
 #, php-format
 msgid "People subscribed to %s"
 msgstr "Pessoas que subscrevem %s"
 
-#: lib/subgroupnav.php:99
+#: lib/subgroupnav.php:105
 #, php-format
 msgid "Groups %s is a member of"
 msgstr "Grupos de que %s é membro"
 
-#: lib/subgroupnav.php:105
+#: lib/subgroupnav.php:111
 msgid "Invite"
 msgstr "Convidar"
 
-#: lib/subgroupnav.php:106
+#: lib/subgroupnav.php:112
 #, php-format
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Convidar amigos e colegas para se juntarem a si em %s"
 
+#: lib/subscribeform.php:115 lib/subscribeform.php:139
+msgid "Subscribe to this user"
+msgstr "Subscrever este utilizador"
+
 #: lib/subscriberspeopleselftagcloudsection.php:48
 #: lib/subscriptionspeopleselftagcloudsection.php:48
 msgid "People Tagcloud as self-tagged"
@@ -9628,6 +9756,13 @@ msgstr "Tema contém um ficheiro do tipo '.%s', o que não é permitido."
 msgid "Error opening theme archive."
 msgstr "Ocorreu um erro ao abrir o arquivo do tema."
 
+#: lib/threadednoticelist.php:270
+#, php-format
+msgid "Show all %d comment"
+msgid_plural "Show all %d comments"
+msgstr[0] ""
+msgstr[1] ""
+
 #: lib/topposterssection.php:74
 msgid "Top posters"
 msgstr "Quem mais publica"
@@ -9670,76 +9805,80 @@ msgstr "Abandonar"
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "Utilizador não tem perfil."
 
-#. TRANS: Link text for changeing the avatar of the logged in user.
-#: lib/userprofile.php:121
+#: lib/userprofile.php:116
 msgid "Edit Avatar"
 msgstr "Editar Avatar"
 
 #. TRANS: H2 for user actions in a profile.
 #. TRANS: H2 for entity actions in a profile.
-#: lib/userprofile.php:245 lib/userprofile.php:261
+#: lib/userprofile.php:216 lib/userprofile.php:232
 msgid "User actions"
 msgstr "Acções do utilizador"
 
 #. TRANS: Text shown in user profile of not yet compeltely deleted users.
-#: lib/userprofile.php:249
+#: lib/userprofile.php:220
 msgid "User deletion in progress..."
 msgstr "A apagar o utilizador..."
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:277
+#: lib/userprofile.php:248
 msgid "Edit profile settings"
 msgstr "Editar configurações do perfil"
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:279
+#: lib/userprofile.php:250
 msgid "Edit"
 msgstr "Editar"
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:303
+#: lib/userprofile.php:274
 msgid "Send a direct message to this user"
 msgstr "Enviar mensagem directa a este utilizador"
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:305
+#: lib/userprofile.php:276
 msgid "Message"
 msgstr "Mensagem"
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:347
+#: lib/userprofile.php:318
 msgid "Moderate"
 msgstr "Moderar"
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:386
+#: lib/userprofile.php:357
 msgid "User role"
 msgstr "Função"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:389
+#: lib/userprofile.php:360
 msgctxt "role"
 msgid "Administrator"
 msgstr "Gestor"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:391
+#: lib/userprofile.php:362
 msgctxt "role"
 msgid "Moderator"
 msgstr "Moderador"
 
+#: lib/util.php:321
+#, fuzzy
+msgid "Not allowed to log in."
+msgstr "Não iniciou sessão."
+
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1306
+#: lib/util.php:1337
 msgid "a few seconds ago"
 msgstr "há alguns segundos"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1309
+#: lib/util.php:1340
 msgid "about a minute ago"
 msgstr "há cerca de um minuto"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1313
+#: lib/util.php:1344
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
@@ -9747,12 +9886,12 @@ msgstr[0] "há cerca de um minuto atrás"
 msgstr[1] "há cerca de %d minutos atrás"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1316
+#: lib/util.php:1347
 msgid "about an hour ago"
 msgstr "há cerca de uma hora"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1320
+#: lib/util.php:1351
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
@@ -9760,12 +9899,12 @@ msgstr[0] "há cerca de uma hora atrás"
 msgstr[1] "há cerca de %d horas atrás"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1323
+#: lib/util.php:1354
 msgid "about a day ago"
 msgstr "há cerca de um dia"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1327
+#: lib/util.php:1358
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
@@ -9773,12 +9912,12 @@ msgstr[0] "há cerca de um dia atrás"
 msgstr[1] "há cerca de %d dias atrás"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1330
+#: lib/util.php:1361
 msgid "about a month ago"
 msgstr "há cerca de um mês"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1334
+#: lib/util.php:1365
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
@@ -9786,7 +9925,7 @@ msgstr[0] "há cerca de um mês atrás"
 msgstr[1] "há cerca de %d meses atrás"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1337
+#: lib/util.php:1368
 msgid "about a year ago"
 msgstr "há cerca de um ano"
 
@@ -9797,21 +9936,6 @@ msgstr "há cerca de um ano"
 msgid "%s is not a valid color! Use 3 or 6 hex characters."
 msgstr "%s não é uma cor válida! Use 3 ou 6 caracteres hexadecimais."
 
-#. TRANS: %s is the URL to the StatusNet site's Instant Messaging settings.
-#: lib/xmppmanager.php:287
-#, php-format
-msgid "Unknown user. Go to %s to add your address to your account"
-msgstr ""
-
-#. TRANS: Response to XMPP source when it sent too long a message.
-#. TRANS: %1$d the maximum number of allowed characters (used for plural), %2$d is the sent number.
-#: lib/xmppmanager.php:406
-#, fuzzy, php-format
-msgid "Message too long. Maximum is %1$d character, you sent %2$d."
-msgid_plural "Message too long. Maximum is %1$d characters, you sent %2$d."
-msgstr[0] "Mensagem demasiado extensa - máx. %1$d caracteres, enviou %2$d."
-msgstr[1] "Mensagem demasiado extensa - máx. %1$d caracteres, enviou %2$d."
-
 #. TRANS: Exception.
 #: lib/xrd.php:63
 #, fuzzy
@@ -9830,73 +9954,177 @@ msgid "Getting backup from file '%s'."
 msgstr ""
 
 #, fuzzy
-#~ msgid "Block this user."
-#~ msgstr "Bloquear este utilizador"
+#~ msgid "Could not generate feed for group - %s"
+#~ msgstr "Não foi possível actualizar o grupo."
 
 #, fuzzy
-#~ msgid "Delete this notice."
-#~ msgstr "Apagar esta nota"
-
-#, fuzzy
-#~ msgid "Delete this user."
-#~ msgstr "Apagar este utilizador"
-
-#, fuzzy
-#~ msgid "Restore default designs."
-#~ msgstr "Repor estilos predefinidos"
-
-#, fuzzy
-#~ msgid "Reset back to default."
-#~ msgstr "Repor predefinição"
-
-#, fuzzy
-#~ msgid "Save design."
-#~ msgstr "Gravar o estilo"
-
-#, fuzzy
-#~ msgid "Disfavor favorite."
-#~ msgstr "Retirar das favoritas"
-
-#, fuzzy
-#~ msgid "\"%s\" not found."
-#~ msgstr "Método da API não encontrado."
-
-#, fuzzy
-#~ msgid "Notice %s not found."
-#~ msgstr "Método da API não encontrado."
-
-#, fuzzy
-#~ msgid "Attachment %s not found."
-#~ msgstr "Destinatário não encontrado."
-
-#, fuzzy
-#~ msgid "Invalid tag: \"%s\"."
-#~ msgstr "Categoria inválida: \"%s\""
-
-#, fuzzy
-#~ msgid "%s updates from everyone."
-#~ msgstr "%s actualizações de todos!"
-
-#, fuzzy
-#~ msgid "Password saved"
-#~ msgstr "Senha gravada."
-
-#, fuzzy
-#~ msgid "Where you are, like \"City, State (or Region), Country\"."
-#~ msgstr "Onde está, por ex. \"Cidade, Região, País\""
-
-#, fuzzy
-#~ msgid "Subscribe to this user."
-#~ msgstr "Subscrever este utilizador"
+#~ msgid "Current confirmed Jabber/Google Talk address."
+#~ msgstr "Endereço do Jabber/GTalk já confirmado."
 
 #, fuzzy
 #~ msgid ""
-#~ "Listenee stream license \"%1$s\" is not compatible with site license \"%2"
-#~ "$s\"."
+#~ "Jabber or Google Talk address, like \"UserName@example.org\". First, make "
+#~ "sure to add %s to your buddy list in your IM client or on Google Talk."
 #~ msgstr ""
-#~ "Licença ‘%1$s’ da listenee stream não é compatível com a licença ‘%2$s’ "
-#~ "do site."
+#~ "Endereço Jabber ou GTalk, por exemplo \"NomeDeUtilizador@exemplo.pt\". "
+#~ "Primeiro, certifique-se de que adicionou %s à sua lista de amigos no "
+#~ "cliente MI ou no GTalk."
 
 #, fuzzy
-#~ msgid "Not allowed to log in."
-#~ msgstr "Não iniciou sessão."
+#~ msgid "Send me notices through Jabber/Google Talk."
+#~ msgstr "Enviar-me notas via Jabber/GTalk."
+
+#, fuzzy
+#~ msgid "Publish a MicroID for my Jabber/Google Talk address."
+#~ msgstr "Publicar um MicroID para o meu endereço Jabber/GTalk."
+
+#~ msgid "No Jabber ID."
+#~ msgstr "Não introduziu o Jabber ID."
+
+#, fuzzy
+#~ msgid "Not a valid Jabber ID."
+#~ msgstr "Jabber ID não é válido"
+
+#~ msgid "That is already your Jabber ID."
+#~ msgstr "Esse já é o seu Jabber ID."
+
+#~ msgid "That is not your Jabber ID."
+#~ msgstr "Esse não é o seu Jabber ID."
+
+#~ msgid "Other settings"
+#~ msgstr "Outras configurações"
+
+#~ msgid "Tag cloud"
+#~ msgstr "Nuvem de categorias"
+
+#~ msgid "Consumer key"
+#~ msgstr "Chave do consumidor"
+
+#~ msgid "Consumer secret"
+#~ msgstr "Segredo do consumidor"
+
+#~ msgid "Request token URL"
+#~ msgstr "URL da chave de pedido"
+
+#~ msgid "Access token URL"
+#~ msgstr "URL da chave de acesso"
+
+#~ msgid "Authorize URL"
+#~ msgstr "Autorizar URL"
+
+#~ msgid "Jabber"
+#~ msgstr "Jabber"
+
+#~ msgid "Photo"
+#~ msgstr "Foto"
+
+#~ msgid "Other options"
+#~ msgstr "Outras opções"
+
+#~ msgid "Other"
+#~ msgstr "Outras"
+
+#~ msgid "Primary site navigation"
+#~ msgstr "Navegação primária deste site"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Personal profile and friends timeline"
+#~ msgstr "Perfil pessoal e notas dos amigos"
+
+#~ msgctxt "MENU"
+#~ msgid "Personal"
+#~ msgstr "Pessoal"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Change your email, avatar, password, profile"
+#~ msgstr "Altere o seu endereço electrónico, avatar, senha, perfil"
+
+#~ msgid "Account"
+#~ msgstr "Conta"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Connect to services"
+#~ msgstr "Ligar aos serviços"
+
+#~ msgid "Connect"
+#~ msgstr "Ligar"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Change site configuration"
+#~ msgstr "Alterar a configuração do site"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Invite friends and colleagues to join you on %s"
+#~ msgstr "Convidar amigos e colegas para se juntarem a si em %s"
+
+#~ msgctxt "MENU"
+#~ msgid "Invite"
+#~ msgstr "Convidar"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Create an account"
+#~ msgstr "Criar uma conta"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Help me!"
+#~ msgstr "Ajudem-me!"
+
+#~ msgctxt "MENU"
+#~ msgid "Help"
+#~ msgstr "Ajuda"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Search for people or text"
+#~ msgstr "Procurar pessoas ou pesquisar texto"
+
+#~ msgid "Local views"
+#~ msgstr "Vistas locais"
+
+#~ msgid "Page notice"
+#~ msgstr "Aviso da página"
+
+#~ msgid "Secondary site navigation"
+#~ msgstr "Navegação secundária deste site"
+
+#~ msgid "StatusNet software license"
+#~ msgstr "Licença de software do StatusNet"
+
+#~ msgid "Site content license"
+#~ msgstr "Licença de conteúdos do site"
+
+#~ msgid "Pagination"
+#~ msgstr "Paginação"
+
+#~ msgid "Author"
+#~ msgstr "Autor"
+
+#~ msgid "Provider"
+#~ msgstr "Fornecedor"
+
+#, fuzzy
+#~ msgctxt "MENU"
+#~ msgid "SMS"
+#~ msgstr "SMS"
+
+#~ msgid "Filter tags"
+#~ msgstr "Filtrar categorias"
+
+#~ msgid "[%s]"
+#~ msgstr "[%s]"
+
+#~ msgid "Available characters"
+#~ msgstr "Caracteres disponíveis"
+
+#, fuzzy
+#~ msgctxt "MENU"
+#~ msgid "Profile"
+#~ msgstr "Perfil"
+
+#~ msgid "Search help"
+#~ msgstr "Pesquisar ajuda"
+
+#, fuzzy
+#~ msgid "Message too long. Maximum is %1$d character, you sent %2$d."
+#~ msgid_plural "Message too long. Maximum is %1$d characters, you sent %2$d."
+#~ msgstr[0] "Mensagem demasiado extensa - máx. %1$d caracteres, enviou %2$d."
+#~ msgstr[1] "Mensagem demasiado extensa - máx. %1$d caracteres, enviou %2$d."
diff --git a/locale/pt_BR/LC_MESSAGES/statusnet.po b/locale/pt_BR/LC_MESSAGES/statusnet.po
index 3ae0770f61..5588f08fa7 100644
--- a/locale/pt_BR/LC_MESSAGES/statusnet.po
+++ b/locale/pt_BR/LC_MESSAGES/statusnet.po
@@ -15,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 15:58+0000\n"
-"PO-Revision-Date: 2011-03-03 16:01:18+0000\n"
+"POT-Creation-Date: 2011-03-03 17:23+0000\n"
+"PO-Revision-Date: 2011-03-03 17:26:24+0000\n"
 "Language-Team: Brazilian Portuguese <http://translatewiki.net/wiki/Portal:pt-"
 "br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -83,23 +83,23 @@ msgstr "Salvar as configurações de acesso"
 #. TRANS: Tooltip for button to save access settings in site admin panel.
 #. TRANS: Button text for saving theme settings.
 #. TRANS: Button label to save e-mail preferences.
-#. TRANS: Button label to save Instant Messaging preferences.
-#. TRANS: Button text for saving "Other settings" in profile.
+#. TRANS: Button label to save IM preferences.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
 #. TRANS: Button text for saving site notice in admin panel.
 #. TRANS: Button label to save SMS preferences.
 #. TRANS: Save button for settings for a profile in a subscriptions list.
+#. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
 #. TRANS: Button text on profile design page to save settings.
 #: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
-#: actions/emailsettings.php:250 actions/imsettings.php:183
-#: actions/othersettings.php:136 actions/pathsadminpanel.php:512
-#: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
-#: actions/smssettings.php:205 actions/subscriptions.php:259
+#: actions/emailsettings.php:251 actions/imsettings.php:199
+#: actions/pathsadminpanel.php:512 actions/profilesettings.php:198
+#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:204
+#: actions/subscriptions.php:261 actions/urlsettings.php:152
 #: actions/useradminpanel.php:298 lib/applicationeditform.php:355
-#: lib/designsettings.php:270 lib/groupeditform.php:201
+#: lib/designform.php:320 lib/groupeditform.php:201
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Salvar"
@@ -138,7 +138,11 @@ msgstr "Esta página não existe."
 #. 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 use "one time password login" without using an existing user.
+#. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
+#. TRANS: Client error displayed trying to find a user by ID for a non-existing ID.
+#. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when calling a profile action without specifying a user.
 #: actions/all.php:80 actions/allrss.php:69
@@ -150,19 +154,19 @@ msgstr "Esta página não existe."
 #: actions/apidirectmessage.php:75 actions/apidirectmessagenew.php:72
 #: actions/apigroupcreate.php:111 actions/apigroupismember.php:89
 #: actions/apigroupjoin.php:98 actions/apigroupleave.php:98
-#: actions/apigrouplist.php:70 actions/apistatusesupdate.php:230
-#: actions/apisubscriptions.php:85 actions/apitimelinefavorites.php:70
-#: actions/apitimelinefriends.php:173 actions/apitimelinehome.php:78
-#: actions/apitimelinementions.php:77 actions/apitimelineuser.php:79
-#: actions/avatarbynickname.php:79 actions/favoritesrss.php:72
-#: actions/foaf.php:42 actions/foaf.php:61 actions/hcard.php:67
-#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
-#: actions/remotesubscribe.php:144 actions/remotesubscribe.php:153
-#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
-#: actions/showfavorites.php:106 actions/userbyid.php:74
-#: actions/usergroups.php:93 actions/userrss.php:40 actions/userxrd.php:59
-#: actions/xrds.php:71 lib/command.php:509 lib/galleryaction.php:59
-#: lib/mailbox.php:80 lib/profileaction.php:77
+#: actions/apigrouplist.php:70 actions/apigroupprofileupdate.php:108
+#: actions/apistatusesupdate.php:230 actions/apisubscriptions.php:85
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:173
+#: actions/apitimelinehome.php:78 actions/apitimelinementions.php:77
+#: actions/apitimelineuser.php:79 actions/avatarbynickname.php:79
+#: actions/favoritesrss.php:72 actions/foaf.php:42 actions/foaf.php:61
+#: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116
+#: actions/otp.php:78 actions/remotesubscribe.php:144
+#: actions/remotesubscribe.php:153 actions/replies.php:73
+#: actions/repliesrss.php:38 actions/rsd.php:113 actions/showfavorites.php:106
+#: actions/userbyid.php:75 actions/usergroups.php:93 actions/userrss.php:40
+#: actions/userxrd.php:59 actions/xrds.php:71 lib/command.php:509
+#: lib/galleryaction.php:59 lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Este usuário não existe."
 
@@ -176,10 +180,9 @@ msgstr "%1$s e amigos, pág. %2$d"
 #. TRANS: H1 text for page. %s is a user nickname.
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Timeline title for user and friends. %s is a user nickname.
-#. TRANS: Tooltop for personal group navigation menu option when logged in for viewing timeline of self and friends.
 #: actions/all.php:94 actions/all.php:191 actions/allrss.php:117
 #: actions/apitimelinefriends.php:207 actions/apitimelinehome.php:113
-#: lib/personalgroupnav.php:102
+#: lib/personalgroupnav.php:100
 #, php-format
 msgid "%s and friends"
 msgstr "%s e amigos"
@@ -237,7 +240,7 @@ msgstr ""
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
 #. TRANS: Second sentence of empty message for anonymous users. %s is a user nickname.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:227
+#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:221
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -286,19 +289,20 @@ msgstr "Atualizações de %1$s e amigos no %2$s!"
 #: actions/apifavoritecreate.php:98 actions/apifavoritedestroy.php:98
 #: actions/apifriendshipscreate.php:99 actions/apifriendshipsdestroy.php:99
 #: actions/apifriendshipsshow.php:124 actions/apigroupcreate.php:138
-#: actions/apigroupismember.php:115 actions/apigroupjoin.php:160
-#: actions/apigroupleave.php:145 actions/apigrouplist.php:134
+#: actions/apigroupismember.php:115 actions/apigroupjoin.php:151
+#: actions/apigroupleave.php:141 actions/apigrouplist.php:134
 #: actions/apigrouplistall.php:120 actions/apigroupmembership.php:105
+#: actions/apigroupprofileupdate.php:100 actions/apigroupprofileupdate.php:213
 #: actions/apigroupshow.php:114 actions/apihelptest.php:84
 #: actions/apistatusesdestroy.php:101 actions/apistatusesretweets.php:110
 #: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:139
 #: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
-#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:268
-#: actions/apitimelinegroup.php:147 actions/apitimelinehome.php:173
-#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:239
-#: actions/apitimelineretweetedtome.php:118
-#: actions/apitimelineretweetsofme.php:150 actions/apitimelinetag.php:159
-#: actions/apitimelineuser.php:206 actions/apiusershow.php:100
+#: actions/apitimelinefavorites.php:182 actions/apitimelinefriends.php:276
+#: actions/apitimelinegroup.php:148 actions/apitimelinehome.php:181
+#: actions/apitimelinementions.php:182 actions/apitimelinepublic.php:247
+#: actions/apitimelineretweetedtome.php:147
+#: actions/apitimelineretweetsofme.php:147 actions/apitimelinetag.php:165
+#: actions/apitimelineuser.php:217 actions/apiusershow.php:100
 msgid "API method not found."
 msgstr "O método da API não foi encontrado!"
 
@@ -313,8 +317,9 @@ msgstr "O método da API não foi encontrado!"
 #: actions/apifavoritecreate.php:88 actions/apifavoritedestroy.php:88
 #: actions/apifriendshipscreate.php:89 actions/apifriendshipsdestroy.php:89
 #: actions/apigroupcreate.php:102 actions/apigroupjoin.php:89
-#: actions/apigroupleave.php:89 actions/apimediaupload.php:66
-#: actions/apistatusesretweet.php:63 actions/apistatusesupdate.php:194
+#: actions/apigroupleave.php:89 actions/apigroupprofileupdate.php:92
+#: actions/apimediaupload.php:66 actions/apistatusesretweet.php:63
+#: actions/apistatusesupdate.php:194
 msgid "This method requires a POST."
 msgstr "Este método requer um POST."
 
@@ -328,21 +333,16 @@ msgstr ""
 "valores: sms, im, none"
 
 #. TRANS: Server error displayed when a user's delivery device cannot be updated.
-#. TRANS: Server error displayed when a user update to the database fails in the contact address confirmation action.
 #. TRANS: Server error thrown on database error updating e-mail preferences.
 #. TRANS: Server error thrown on database error removing a registered e-mail address.
-#. TRANS: Server error thrown on database error updating Instant Messaging preferences.
-#. TRANS: Server error thrown on database error removing a registered Instant Messaging address.
-#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
 #. TRANS: Server error thrown when user profile settings could not be updated.
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
-#: actions/apiaccountupdatedeliverydevice.php:130
-#: actions/confirmaddress.php:118 actions/emailsettings.php:352
-#: actions/emailsettings.php:498 actions/imsettings.php:276
-#: actions/imsettings.php:432 actions/othersettings.php:186
-#: actions/profilesettings.php:322 actions/smssettings.php:301
-#: actions/smssettings.php:454
+#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
+#: actions/apiaccountupdatedeliverydevice.php:136
+#: actions/emailsettings.php:353 actions/emailsettings.php:499
+#: actions/profilesettings.php:323 actions/smssettings.php:300
+#: actions/smssettings.php:453 actions/urlsettings.php:211
 msgid "Could not update user."
 msgstr "Não foi possível atualizar o usuário."
 
@@ -368,7 +368,7 @@ msgstr "O usuário não tem perfil."
 
 #. TRANS: Server error displayed if a user profile could not be saved.
 #. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:418
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:419
 msgid "Could not save profile."
 msgstr "Não foi possível salvar o perfil."
 
@@ -380,7 +380,7 @@ msgstr "Não foi possível salvar o perfil."
 #: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
 #: actions/designadminpanel.php:120 actions/editapplication.php:121
 #: actions/newapplication.php:102 actions/newnotice.php:95
-#: lib/designsettings.php:298
+#: lib/designsettings.php:110
 #, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s byte) due to its "
@@ -405,8 +405,8 @@ msgstr[1] ""
 #: actions/apiaccountupdateprofilecolors.php:160
 #: actions/apiaccountupdateprofilecolors.php:171
 #: actions/groupdesignsettings.php:285 actions/groupdesignsettings.php:296
-#: actions/userdesignsettings.php:201 actions/userdesignsettings.php:211
-#: actions/userdesignsettings.php:253 actions/userdesignsettings.php:263
+#: actions/userdesignsettings.php:218 actions/userdesignsettings.php:228
+#: actions/userdesignsettings.php:270 actions/userdesignsettings.php:280
 msgid "Unable to save your design settings."
 msgstr "Não foi possível salvar suas configurações de aparência."
 
@@ -414,7 +414,7 @@ msgstr "Não foi possível salvar suas configurações de aparência."
 #. TRANS: Client error displayed when a database error occurs updating profile colours.
 #: actions/apiaccountupdateprofilebackgroundimage.php:191
 #: actions/apiaccountupdateprofilecolors.php:139
-#: actions/userdesignsettings.php:179
+#: actions/userdesignsettings.php:196
 msgid "Could not update your design."
 msgstr "Não foi possível atualizar a sua aparência."
 
@@ -525,7 +525,7 @@ msgstr "O usuário destinatário não foi encontrado."
 #. TRANS: Client error displayed trying to direct message another user who's not a friend (403).
 #: actions/apidirectmessagenew.php:144
 #, fuzzy
-msgid "Can't send direct messages to users who aren't your friend."
+msgid "Cannot send direct messages to users who aren't your friend."
 msgstr ""
 "Não é possível enviar mensagens diretas para usuários que não sejam seus "
 "amigos."
@@ -610,9 +610,9 @@ msgstr "Não foi possível encontrar usuário de destino."
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:156 actions/editgroup.php:191
-#: actions/newgroup.php:137 actions/profilesettings.php:273
-#: actions/register.php:214
+#: actions/apigroupcreate.php:156 actions/apigroupprofileupdate.php:255
+#: actions/editgroup.php:191 actions/newgroup.php:137
+#: actions/profilesettings.php:274 actions/register.php:199
 msgid "Nickname already in use. Try another one."
 msgstr "Esta identificação já está em uso. Tente outro."
 
@@ -620,9 +620,9 @@ msgstr "Esta identificação já está em uso. Tente outro."
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:164 actions/editgroup.php:195
-#: actions/newgroup.php:141 actions/profilesettings.php:243
-#: actions/register.php:216
+#: actions/apigroupcreate.php:164 actions/apigroupprofileupdate.php:259
+#: actions/editgroup.php:195 actions/newgroup.php:141
+#: actions/profilesettings.php:244 actions/register.php:201
 msgid "Not a valid nickname."
 msgstr "Não é uma identificação válida."
 
@@ -632,10 +632,10 @@ msgstr "Não é uma identificação válida."
 #. TRANS: Validation error shown when providing an invalid homepage URL in the "New application" form.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:181 actions/editapplication.php:235
-#: actions/editgroup.php:202 actions/newapplication.php:221
-#: actions/newgroup.php:148 actions/profilesettings.php:248
-#: actions/register.php:223
+#: actions/apigroupcreate.php:181 actions/apigroupprofileupdate.php:277
+#: actions/editapplication.php:235 actions/editgroup.php:202
+#: actions/newapplication.php:221 actions/newgroup.php:148
+#: actions/profilesettings.php:249 actions/register.php:208
 msgid "Homepage is not a valid URL."
 msgstr "A URL informada não é válida."
 
@@ -644,8 +644,8 @@ msgstr "A URL informada não é válida."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:191 actions/editgroup.php:206
-#: actions/newgroup.php:152 actions/profilesettings.php:252
-#: actions/register.php:226
+#: actions/newgroup.php:152 actions/profilesettings.php:253
+#: actions/register.php:211
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "O nome completo é muito extenso (máx. 255 caracteres)"
 
@@ -672,8 +672,8 @@ msgstr[1] "A descrição é muito extensa (máximo %d caracteres)."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:215 actions/editgroup.php:218
-#: actions/newgroup.php:164 actions/profilesettings.php:265
-#: actions/register.php:235
+#: actions/newgroup.php:164 actions/profilesettings.php:266
+#: actions/register.php:220
 msgid "Location is too long (maximum 255 characters)."
 msgstr "A localização é muito extensa (máx. 255 caracteres)."
 
@@ -702,15 +702,16 @@ msgstr "Apelido inválido: \"%s\"."
 #. TRANS: %s is the alias that is already in use.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error. %s is the already used alias.
-#: actions/apigroupcreate.php:264 actions/editgroup.php:246
-#: actions/newgroup.php:193
+#: actions/apigroupcreate.php:264 actions/apigroupprofileupdate.php:351
+#: actions/editgroup.php:246 actions/newgroup.php:193
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "O apelido \"%s\" já está em uso. Tente outro."
 
 #. TRANS: Client error displayed when trying to use an alias during group creation that is the same as the group's nickname.
 #. TRANS: Group edit form validation error.
-#: actions/apigroupcreate.php:278 actions/editgroup.php:253
+#: actions/apigroupcreate.php:278 actions/apigroupprofileupdate.php:359
+#: actions/editgroup.php:253
 msgid "Alias can't be the same as nickname."
 msgstr "O apelido não pode ser igual à identificação."
 
@@ -722,7 +723,8 @@ msgstr "O apelido não pode ser igual à identificação."
 #. TRANS: Client error displayed requesting most recent notices to a group for a non-existing group.
 #: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
 #: actions/apigroupleave.php:104 actions/apigroupmembership.php:71
-#: actions/apigroupshow.php:81 actions/apitimelinegroup.php:89
+#: actions/apigroupprofileupdate.php:113 actions/apigroupshow.php:81
+#: actions/apitimelinegroup.php:89
 msgid "Group not found."
 msgstr "O grupo não foi encontrado."
 
@@ -740,13 +742,11 @@ msgstr "Você já é membro desse grupo."
 msgid "You have been blocked from that group by the admin."
 msgstr "O administrador desse grupo bloqueou sua inscrição."
 
-#. TRANS: Server error displayed when joining a group fails.
-#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
 #. 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.
 #. TRANS: Message given having failed to add a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:362
+#: actions/apigroupjoin.php:136 actions/joingroup.php:139 lib/command.php:362
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "Não foi possível associar o usuário %1$s ao grupo %2$s."
@@ -756,8 +756,6 @@ msgstr "Não foi possível associar o usuário %1$s ao grupo %2$s."
 msgid "You are not a member of this group."
 msgstr "Você não é membro deste grupo."
 
-#. TRANS: Server error displayed when leaving a group fails.
-#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
 #. TRANS: Server error displayed when leaving a group failed in the database.
 #. TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
 #. TRANS: Message given having failed to remove a user from a group.
@@ -793,6 +791,63 @@ msgstr "Grupos de %s"
 msgid "groups on %s"
 msgstr "grupos no %s"
 
+#. TRANS: Client error displayed trying to edit a group while not being a group admin.
+#. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
+#. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
+#: actions/apigroupprofileupdate.php:118 actions/editgroup.php:110
+#: actions/editgroup.php:176 actions/groupdesignsettings.php:109
+#: actions/grouplogo.php:111
+msgid "You must be an admin to edit the group."
+msgstr "Você deve ser um administrador para editar o grupo."
+
+#. TRANS: Server error displayed when editing a group fails.
+#: actions/apigroupprofileupdate.php:171 actions/editgroup.php:274
+msgid "Could not update group."
+msgstr "Não foi possível atualizar o grupo."
+
+#. TRANS: Server error displayed when group aliases could not be added.
+#. TRANS: Server exception thrown when creating group aliases failed.
+#: actions/apigroupprofileupdate.php:194 actions/editgroup.php:281
+#: classes/User_group.php:540
+msgid "Could not create aliases."
+msgstr "Não foi possível criar os apelidos."
+
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: actions/apigroupprofileupdate.php:249 lib/nickname.php:165
+msgid "Nickname must have only lowercase letters and numbers and no spaces."
+msgstr ""
+"A identificação deve conter apenas letras minúsculas e números e não pode "
+"ter e espaços."
+
+#: actions/apigroupprofileupdate.php:286
+#, fuzzy
+msgid "Full name is too long (max 255 chars)."
+msgstr "O nome completo é muito extenso (máx. 255 caracteres)"
+
+#: actions/apigroupprofileupdate.php:296
+#, fuzzy, php-format
+msgid "description is too long (max %d chars)."
+msgstr "A descrição é muito extensa (máximo %d caractere)."
+
+#: actions/apigroupprofileupdate.php:307
+#, fuzzy
+msgid "Location is too long (max 255 chars)."
+msgstr "A localização é muito extensa (máx. 255 caracteres)."
+
+#: actions/apigroupprofileupdate.php:326
+#, fuzzy, php-format
+msgid "Too many aliases! Maximum %d."
+msgstr "Muitos apelidos! O máximo é %d."
+
+#. TRANS: Group edit form validation error.
+#. TRANS: Group create form validation error.
+#. TRANS: %s is the invalid alias.
+#: actions/apigroupprofileupdate.php:342 actions/editgroup.php:241
+#: actions/newgroup.php:188
+#, php-format
+msgid "Invalid alias: \"%s\""
+msgstr "Apelido inválido: \"%s\""
+
 #. TRANS: Client error displayed when uploading a media file has failed.
 #: actions/apimediaupload.php:101
 msgid "Upload failed."
@@ -823,21 +878,22 @@ msgstr "O token solicitado já foi autorizado."
 #. TRANS: Form validation error message.
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
+#. TRANS: Client error displayed when the session token is not okay.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
 #: actions/deletenotice.php:177 actions/disfavor.php:75
-#: actions/emailsettings.php:291 actions/favor.php:75 actions/geocode.php:55
+#: actions/emailsettings.php:292 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:65 actions/grouplogo.php:321
-#: actions/groupunblock.php:65 actions/imsettings.php:224
-#: actions/invite.php:60 actions/login.php:137 actions/makeadmin.php:66
-#: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
-#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
-#: actions/othersettings.php:155 actions/passwordsettings.php:138
-#: actions/profilesettings.php:217 actions/recoverpassword.php:383
-#: actions/register.php:172 actions/remotesubscribe.php:76
-#: actions/repeat.php:82 actions/smssettings.php:250 actions/subedit.php:40
-#: actions/subscribe.php:86 actions/tagother.php:166
-#: actions/unsubscribe.php:69 actions/userauthorization.php:52
-#: lib/designsettings.php:310
+#: actions/groupunblock.php:65 actions/imsettings.php:241
+#: actions/invite.php:60 actions/makeadmin.php:66 actions/newmessage.php:135
+#: actions/newnotice.php:105 actions/nudge.php:80
+#: actions/oauthappssettings.php:162 actions/oauthconnectionssettings.php:135
+#: actions/passwordsettings.php:137 actions/pluginenable.php:87
+#: actions/profilesettings.php:218 actions/recoverpassword.php:383
+#: actions/register.php:157 actions/remotesubscribe.php:76
+#: actions/repeat.php:82 actions/smssettings.php:249 actions/subedit.php:40
+#: actions/subscribe.php:87 actions/tagother.php:145
+#: actions/unsubscribe.php:69 actions/urlsettings.php:171
+#: actions/userauthorization.php:53 lib/designsettings.php:122
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 "Ocorreu um problema com o seu token de sessão. Tente novamente, por favor."
@@ -866,10 +922,10 @@ msgstr "Erro no banco de dados durante a inserção de oauth_token_association."
 #. TRANS: Unknown form validation error in design settings form.
 #: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
 #: actions/designadminpanel.php:100 actions/editapplication.php:144
-#: actions/emailsettings.php:310 actions/grouplogo.php:332
-#: actions/imsettings.php:239 actions/newapplication.php:124
-#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
-#: actions/smssettings.php:271 lib/designsettings.php:321
+#: actions/emailsettings.php:311 actions/grouplogo.php:332
+#: actions/imsettings.php:256 actions/newapplication.php:124
+#: actions/oauthconnectionssettings.php:144 actions/recoverpassword.php:46
+#: actions/smssettings.php:270 lib/designsettings.php:133
 msgid "Unexpected form submission."
 msgstr "Submissão inesperada de formulário."
 
@@ -919,31 +975,26 @@ msgstr "Conta"
 
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Field label in form for profile settings.
-#. TRANS: Label for group nickname (dt). Text hidden by default.
-#. TRANS: DT for nick name in a profile.
-#: actions/apioauthauthorize.php:459 actions/login.php:252
-#: actions/profilesettings.php:106 actions/register.php:432
-#: actions/showgroup.php:243 actions/tagother.php:94
+#: actions/apioauthauthorize.php:459 actions/login.php:225
+#: actions/profilesettings.php:107 actions/register.php:411
 #: actions/userauthorization.php:145 lib/groupeditform.php:145
-#: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "Usuário"
 
 #. TRANS: Field label on OAuth API authorisation form.
-#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:463 actions/login.php:255
-#: actions/register.php:436 lib/accountsettingsaction.php:120
+#: actions/apioauthauthorize.php:463 actions/login.php:228
+#: actions/register.php:415 lib/settingsnav.php:87
 msgid "Password"
 msgstr "Senha"
 
 #. TRANS: Button text that when clicked will cancel the process of allowing access to an account
 #. TRANS: by an external application.
 #. TRANS: Button label to cancel an e-mail address confirmation procedure.
-#. TRANS: Button label to cancel an Instant Messaging address confirmation procedure.
+#. TRANS: Button label to cancel an IM address confirmation procedure.
 #. TRANS: Button label to cancel a SMS address confirmation procedure.
 #. TRANS: Button label in the "Edit application" form.
-#: actions/apioauthauthorize.php:478 actions/emailsettings.php:124
-#: actions/imsettings.php:127 actions/smssettings.php:133
+#: actions/apioauthauthorize.php:478 actions/emailsettings.php:125
+#: actions/imsettings.php:136 actions/smssettings.php:132
 #: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Cancel"
@@ -1055,7 +1106,7 @@ msgstr "O método HTTP não é suportado."
 #. TRANS: %s is the requested output format.
 #: actions/apistatusesshow.php:144
 #, fuzzy, php-format
-msgid "Unsupported format: %s"
+msgid "Unsupported format: %s."
 msgstr "Formato não suportado: %s"
 
 #. TRANS: Client error displayed requesting a deleted status.
@@ -1135,13 +1186,6 @@ msgstr "%1$s / Favoritas de %2$s"
 msgid "%1$s updates favorited by %2$s / %3$s."
 msgstr "Mensagens de %1$s marcadas como favoritas por %2$s / %3$s."
 
-#. TRANS: Server error displayed when generating an Atom feed fails.
-#. TRANS: %s is the error.
-#: actions/apitimelinegroup.php:134
-#, php-format
-msgid "Could not generate feed for group - %s"
-msgstr "Não foi possível gerar a fonte de notícias para o grupo - %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.
 #: actions/apitimelinementions.php:115
@@ -1158,13 +1202,14 @@ msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr "%1$s mensagens em resposta a mensagens de %2$s / %3$s."
 
 #. TRANS: Title for site timeline. %s is the StatusNet sitename.
+#. TRANS: Public RSS feed title. %s is the StatusNet site name.
 #: actions/apitimelinepublic.php:193 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "Mensagens públicas de %s"
 
 #. TRANS: Subtitle for site timeline. %s is the StatusNet sitename.
-#: actions/apitimelinepublic.php:199 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:199
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "%s mensagens de todo mundo!"
@@ -1175,21 +1220,33 @@ msgid "Unimplemented."
 msgstr "Não implementado."
 
 #. TRANS: Title for Atom feed "repeated to me". %s is the user nickname.
-#: actions/apitimelineretweetedtome.php:108
+#: actions/apitimelineretweetedtome.php:96
 #, php-format
 msgid "Repeated to %s"
 msgstr "Repetida para %s"
 
+#: actions/apitimelineretweetedtome.php:98
+#, fuzzy, php-format
+msgid "%1$s notices that were to repeated to %2$s / %3$s."
+msgstr "%1$s mensagens em resposta a mensagens de %2$s / %3$s."
+
 #. TRANS: Title of list of repeated notices of the logged in user.
 #. TRANS: %s is the nickname of the logged in user.
-#: actions/apitimelineretweetsofme.php:112
+#: actions/apitimelineretweetsofme.php:98
 #, php-format
 msgid "Repeats of %s"
 msgstr "Repetições de %s"
 
+#: actions/apitimelineretweetsofme.php:104
+#, fuzzy, php-format
+msgid "%1$s notices that %2$s / %3$s has repeated."
+msgstr "%1$s marcou a mensagem %2$s como favorita."
+
 #. TRANS: Title for timeline with lastest notices with a given tag.
 #. TRANS: %s is the tag.
-#: actions/apitimelinetag.php:101 actions/tag.php:67
+#. TRANS: Title for first page of notices with tags.
+#. TRANS: %s is the tag.
+#: actions/apitimelinetag.php:101 actions/tag.php:69
 #, php-format
 msgid "Notices tagged with %s"
 msgstr "Mensagens etiquetadas como %s"
@@ -1202,53 +1259,54 @@ msgid "Updates tagged with %1$s on %2$s!"
 msgstr "Mensagens etiquetadas como %1$s no %2$s!"
 
 #. TRANS: Client error displayed trying to add a notice to another user's timeline.
-#: actions/apitimelineuser.php:297
+#: actions/apitimelineuser.php:308
 msgid "Only the user can add to their own timeline."
 msgstr "Somente o usuário pode adicionar à sua própria linha de tempo."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:304
+#: actions/apitimelineuser.php:315
 msgid "Only accept AtomPub for Atom feeds."
 msgstr "Só são aceitos AtomPub para fontes Atom."
 
 #. TRANS: Client error displayed attempting to post an empty API notice.
-#: actions/apitimelineuser.php:311
+#: actions/apitimelineuser.php:322
 msgid "Atom post must not be empty."
 msgstr "A publicação Atom não pode estar em branco."
 
 #. TRANS: Client error displayed attempting to post an API that is not well-formed XML.
-#: actions/apitimelineuser.php:317
+#: actions/apitimelineuser.php:328
 msgid "Atom post must be well-formed XML."
 msgstr "A publicação Atom deve ser um XML formatado corretamente."
 
 #. TRANS: Client error displayed when not using an Atom entry.
-#: actions/apitimelineuser.php:323 actions/atompubfavoritefeed.php:228
+#: actions/apitimelineuser.php:334 actions/atompubfavoritefeed.php:228
 #: actions/atompubmembershipfeed.php:230
 #: actions/atompubsubscriptionfeed.php:236
 msgid "Atom post must be an Atom entry."
 msgstr "A publicação Atom deve ser uma entrada Atom."
 
 #. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
-#: actions/apitimelineuser.php:335
+#: actions/apitimelineuser.php:345
 msgid "Can only handle POST activities."
 msgstr "Só é possível manipular atividades POST."
 
 #. TRANS: Client error displayed when using an unsupported activity object type.
 #. TRANS: %s is the unsupported activity object type.
-#: actions/apitimelineuser.php:346
+#: actions/apitimelineuser.php:356
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr "Não é possível manipular o tipo de objeto de atividade \"%s\"."
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
 #. TRANS: %d is the notice ID (number).
-#: actions/apitimelineuser.php:380
+#: actions/apitimelineuser.php:390
 #, php-format
 msgid "No content for notice %d."
 msgstr "Nenhum conteúdo para a mensagem %d."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:408
+#. TRANS: %s is the notice URI.
+#: actions/apitimelineuser.php:419
 #, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "Já existe uma mensagem com a URI \"%s\"."
@@ -1265,9 +1323,10 @@ msgstr "O método da API não foi encontrado!"
 
 #. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
 #. TRANS: Client exception.
+#. TRANS: Client error displayed trying to subscribe to a non-existing profile.
 #: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
 #: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
-#: actions/subscribe.php:107
+#: actions/subscribe.php:110
 msgid "No such profile."
 msgstr "Este perfil não existe."
 
@@ -1407,7 +1466,7 @@ msgid "Not a member."
 msgstr "Não é um membro"
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
-#: actions/atompubshowmembership.php:151
+#: actions/atompubshowmembership.php:150
 #, fuzzy
 msgid "Cannot delete someone else's membership."
 msgstr "Não é possível excluir a assinatura de outra pessoa"
@@ -1496,10 +1555,7 @@ msgid "Invalid size."
 msgstr "Tamanho inválido."
 
 #. TRANS: Title for avatar upload page.
-#. TRANS: Label for group avatar (dt). Text hidden by default.
-#. TRANS: Link description in user account settings menu.
-#: actions/avatarsettings.php:66 actions/showgroup.php:227
-#: lib/accountsettingsaction.php:113
+#: actions/avatarsettings.php:66 lib/settingsnav.php:82
 msgid "Avatar"
 msgstr "Avatar"
 
@@ -1513,9 +1569,11 @@ msgstr ""
 
 #. TRANS: Server error displayed in avatar upload page when no matching profile can be found for a user.
 #. TRANS: Server error displayed coming across a request from a user without a profile.
+#. TRANS: Server error displayed when trying to authorise a remote subscription request
+#. TRANS: while the user has no profile.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
 #: actions/grouplogo.php:184 actions/remotesubscribe.php:190
-#: actions/userauthorization.php:72 actions/userrss.php:108
+#: actions/userauthorization.php:75 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr "Usuário sem um perfil correspondente"
 
@@ -1570,10 +1628,10 @@ msgstr "Cortar"
 msgid "No file uploaded."
 msgstr "Não foi enviado nenhum arquivo."
 
-#. TRANS: Avatar upload form unstruction after uploading a file.
+#. TRANS: Avatar upload form instruction after uploading a file.
 #: actions/avatarsettings.php:345
 #, fuzzy
-msgid "Pick a square area of the image to be your avatar"
+msgid "Pick a square area of the image to be your avatar."
 msgstr "Selecione uma área quadrada da imagem para ser seu avatar"
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
@@ -1599,7 +1657,7 @@ msgstr "O avatar foi excluído."
 
 #. TRANS: Title for backup account page.
 #. TRANS: Option in profile settings to create a backup of the account of the currently logged in user.
-#: actions/backupaccount.php:61 actions/profilesettings.php:467
+#: actions/backupaccount.php:61 actions/profilesettings.php:468
 msgid "Backup account"
 msgstr "Fazer backup da conta"
 
@@ -1639,7 +1697,7 @@ msgstr "Fundo"
 #. TRANS: Title for submit button to backup an account on the backup account page.
 #: actions/backupaccount.php:254
 #, fuzzy
-msgid "Backup your account"
+msgid "Backup your account."
 msgstr "Fazer backup da conta"
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
@@ -1682,7 +1740,7 @@ msgstr "Não"
 #. TRANS: Submit button title for 'No' when blocking a user.
 #: actions/block.php:158
 #, fuzzy
-msgid "Do not block this user"
+msgid "Do not block this user."
 msgstr "Não bloquear este usuário"
 
 #. TRANS: Button label on the user block form.
@@ -1699,9 +1757,9 @@ msgid "Yes"
 msgstr "Sim"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#. TRANS: Description of the form to block a user.
-#: actions/block.php:165 lib/blockform.php:79
-msgid "Block this user"
+#: actions/block.php:165
+#, fuzzy
+msgid "Block this user."
 msgstr "Bloquear este usuário"
 
 #. TRANS: Server error displayed when blocking a user fails.
@@ -1767,31 +1825,47 @@ msgstr "O código de confirmação não foi encontrado."
 msgid "That confirmation code is not for you!"
 msgstr "Esse não é o seu código de confirmação!"
 
-#. TRANS: Server error for a unknow address type %s, which can be 'email', 'jabber', or 'sms'.
-#: actions/confirmaddress.php:92
-#, php-format
-msgid "Unrecognized address type %s."
+#. TRANS: Server error for an unknown address type, which can be 'email', 'sms', or the name of an IM network (such as 'xmpp' or 'aim')
+#: actions/confirmaddress.php:94
+#, fuzzy, php-format
+msgid "Unrecognized address type %s"
 msgstr "Tipo de endereço %s não reconhecido."
 
 #. TRANS: Client error for an already confirmed email/jabber/sms address.
-#: actions/confirmaddress.php:97
+#: actions/confirmaddress.php:103 actions/confirmaddress.php:136
 msgid "That address has already been confirmed."
 msgstr "Esse endereço já foi confirmado."
 
+#: actions/confirmaddress.php:121 actions/imsettings.php:444
+#: actions/userdesignsettings.php:306
+#, fuzzy
+msgid "Couldn't update user."
+msgstr "Não foi possível atualizar o usuário."
+
+#: actions/confirmaddress.php:144
+#, fuzzy
+msgid "Couldn't update user im preferences."
+msgstr "Não foi possível atualizar o registro do usuário."
+
+#: actions/confirmaddress.php:156
+#, fuzzy
+msgid "Couldn't insert user im preferences."
+msgstr "Não foi possível inserir a nova assinatura."
+
 #. TRANS: Server error displayed when an address confirmation code deletion from the
 #. TRANS: database fails in the contact address confirmation action.
-#: actions/confirmaddress.php:132
+#: actions/confirmaddress.php:169
 msgid "Could not delete address confirmation."
 msgstr "Não foi possível excluir a confirmação do endereço."
 
 #. TRANS: Title for the contact address confirmation action.
-#: actions/confirmaddress.php:150
+#: actions/confirmaddress.php:185
 msgid "Confirm address"
 msgstr "Confirme o endereço"
 
 #. TRANS: Success message for the contact address confirmation action.
 #. TRANS: %s can be 'email', 'jabber', or 'sms'.
-#: actions/confirmaddress.php:166
+#: actions/confirmaddress.php:200
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "O endereço \"%s\" foi confirmado para sua conta."
@@ -1805,6 +1879,7 @@ msgstr "Conversa"
 #. TRANS: Label for user statistics.
 #: actions/conversation.php:149 lib/noticelist.php:87
 #: lib/profileaction.php:246 lib/searchgroupnav.php:82
+#: lib/threadednoticelist.php:66
 msgid "Notices"
 msgstr "Mensagens"
 
@@ -1840,7 +1915,7 @@ msgstr "O avatar foi excluído."
 
 #. TRANS: Page title for page on which a user account can be deleted.
 #. TRANS: Option in profile settings to delete the account of the currently logged in user.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:475
+#: actions/deleteaccount.php:228 actions/profilesettings.php:476
 #, fuzzy
 msgid "Delete account"
 msgstr "Criar uma conta"
@@ -1864,7 +1939,7 @@ msgstr ""
 #. TRANS: Field label for delete account confirmation entry.
 #. TRANS: Field label for password reset form where the password has to be typed again.
 #: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:262 actions/register.php:440
+#: actions/recoverpassword.php:262 actions/register.php:419
 msgid "Confirm"
 msgstr "Confirmar"
 
@@ -1894,14 +1969,14 @@ msgstr "A aplicação não foi encontrada."
 #. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
 #: actions/deleteapplication.php:79 actions/editapplication.php:78
-#: actions/showapplication.php:94
+#: actions/showapplication.php:90
 msgid "You are not the owner of this application."
 msgstr "Você não é o dono desta aplicação."
 
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
-#: actions/newapplication.php:112 actions/showapplication.php:118
-#: lib/action.php:1425
+#: actions/newapplication.php:112 actions/showapplication.php:113
+#: lib/action.php:1391
 msgid "There was a problem with your session token."
 msgstr "Ocorreu um problema com o seu token de sessão."
 
@@ -1925,13 +2000,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting an application.
 #: actions/deleteapplication.php:161
 #, fuzzy
-msgid "Do not delete this application"
+msgid "Do not delete this application."
 msgstr "Não excluir esta aplicação"
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
 #: actions/deleteapplication.php:167
 #, fuzzy
-msgid "Delete this application"
+msgid "Delete this application."
 msgstr "Excluir esta aplicação"
 
 #. TRANS: Client error when trying to delete group while not logged in.
@@ -1986,13 +2061,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting a group.
 #: actions/deletegroup.php:224
 #, fuzzy
-msgid "Do not delete this group"
+msgid "Do not delete this group."
 msgstr "Não excluir este grupo"
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
 #: actions/deletegroup.php:231
 #, fuzzy
-msgid "Delete this group"
+msgid "Delete this group."
 msgstr "Excluir este grupo"
 
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
@@ -2000,14 +2075,16 @@ msgstr "Excluir este grupo"
 #. TRANS: Client error displayed when trying to mark a notice as favorite without being logged in.
 #. TRANS: Client error displayed trying to block a user from a group while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
+#. TRANS: Client error displayed trying to log out when not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
+#. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
 #. TRANS: Client error displayed when trying to change user options while not logged in.
 #: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
-#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:69
+#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:70
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
-#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
-#: actions/tagother.php:33 actions/unsubscribe.php:52
+#: actions/nudge.php:63 actions/pluginenable.php:97 actions/subedit.php:33
+#: actions/subscribe.php:98 actions/tagother.php:33 actions/unsubscribe.php:52
 #: lib/adminpanelaction.php:71 lib/profileformaction.php:63
 #: lib/settingsaction.php:72
 msgid "Not logged in."
@@ -2036,12 +2113,13 @@ msgstr "Tem certeza que deseja excluir esta mensagem?"
 #. TRANS: Submit button title for 'No' when deleting a notice.
 #: actions/deletenotice.php:159
 #, fuzzy
-msgid "Do not delete this notice"
+msgid "Do not delete this notice."
 msgstr "Não excluir esta mensagem."
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:166 lib/noticelist.php:673
-msgid "Delete this notice"
+#: actions/deletenotice.php:166
+#, fuzzy
+msgid "Delete this notice."
 msgstr "Excluir esta mensagem"
 
 #. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
@@ -2078,18 +2156,17 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting a user.
 #: actions/deleteuser.php:158
 #, fuzzy
-msgid "Do not delete this user"
+msgid "Do not delete this user."
 msgstr "Não excluir este grupo"
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
-#. TRANS: Description of form for deleting a user.
-#: actions/deleteuser.php:165 lib/deleteuserform.php:75
-msgid "Delete this user"
+#: actions/deleteuser.php:165
+#, fuzzy
+msgid "Delete this user."
 msgstr "Excluir este usuário"
 
 #. TRANS: Message used as title for design settings for the site.
-#. TRANS: Link description in user account settings menu.
-#: actions/designadminpanel.php:60 lib/accountsettingsaction.php:134
+#: actions/designadminpanel.php:60 lib/settingsnav.php:97
 msgid "Design"
 msgstr "Aparência"
 
@@ -2158,8 +2235,7 @@ msgstr ""
 "arquivo .zip."
 
 #. TRANS: Fieldset legend for theme background image.
-#. TRANS: Fieldset legend on profile design page.
-#: actions/designadminpanel.php:515 lib/designsettings.php:98
+#: actions/designadminpanel.php:515
 msgid "Change background image"
 msgstr "Alterar imagem do fundo"
 
@@ -2167,7 +2243,7 @@ msgstr "Alterar imagem do fundo"
 #. TRANS: Field label for background color selector.
 #. TRANS: Label on profile design page for setting a profile page background colour.
 #: actions/designadminpanel.php:525 actions/designadminpanel.php:609
-#: lib/designsettings.php:183
+#: lib/designform.php:238
 msgid "Background"
 msgstr "Fundo"
 
@@ -2194,13 +2270,13 @@ msgstr "Desativado"
 #. TRANS: Form guide for turning background image on or off on theme designer page.
 #. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
 #. TRANS: use of the uploaded profile image.
-#: actions/designadminpanel.php:577 lib/designsettings.php:159
+#: actions/designadminpanel.php:577 lib/designform.php:214
 msgid "Turn background image on or off."
 msgstr "Ativar/desativar a imagem de fundo."
 
 #. TRANS: Checkbox label to title background image on theme designer page.
 #. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-#: actions/designadminpanel.php:583 lib/designsettings.php:165
+#: actions/designadminpanel.php:583 lib/designform.php:220
 msgid "Tile background image"
 msgstr "Ladrilhar a imagem de fundo"
 
@@ -2212,25 +2288,25 @@ msgstr "Alterar a cor"
 
 #. TRANS: Field label for content color selector.
 #. TRANS: Label on profile design page for setting a profile page content colour.
-#: actions/designadminpanel.php:623 lib/designsettings.php:197
+#: actions/designadminpanel.php:623 lib/designform.php:252
 msgid "Content"
 msgstr "Conteúdo"
 
 #. TRANS: Field label for sidebar color selector.
 #. TRANS: Label on profile design page for setting a profile page sidebar colour.
-#: actions/designadminpanel.php:637 lib/designsettings.php:211
+#: actions/designadminpanel.php:637 lib/designform.php:266
 msgid "Sidebar"
 msgstr "Barra lateral"
 
 #. TRANS: Field label for text color selector.
 #. TRANS: Label on profile design page for setting a profile page text colour.
-#: actions/designadminpanel.php:651 lib/designsettings.php:225
+#: actions/designadminpanel.php:651 lib/designform.php:280
 msgid "Text"
 msgstr "Texto"
 
 #. TRANS: Field label for link color selector.
 #. TRANS: Label on profile design page for setting a profile page links colour.
-#: actions/designadminpanel.php:665 lib/designsettings.php:239
+#: actions/designadminpanel.php:665 lib/designform.php:294
 msgid "Links"
 msgstr "Links"
 
@@ -2252,21 +2328,21 @@ msgid "Use defaults"
 msgstr "Usar o padrão|"
 
 #. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: actions/designadminpanel.php:720 lib/designsettings.php:259
-msgid "Restore default designs"
+#: actions/designadminpanel.php:720
+#, fuzzy
+msgid "Restore default designs."
 msgstr "Restaura a aparência padrão"
 
 #. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: actions/designadminpanel.php:728 lib/designsettings.php:267
-msgid "Reset back to default"
+#: actions/designadminpanel.php:728
+#, fuzzy
+msgid "Reset back to default."
 msgstr "Restaura de volta ao padrão"
 
 #. TRANS: Title for button for saving theme settings.
-#. TRANS: Title for button on profile design page to save settings.
-#: actions/designadminpanel.php:736 lib/designsettings.php:272
-msgid "Save design"
+#: actions/designadminpanel.php:736
+#, fuzzy
+msgid "Save design."
 msgstr "Salvar a aparência"
 
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
@@ -2298,7 +2374,7 @@ msgid "You must be logged in to edit an application."
 msgstr "Você precisa estar autenticado para editar uma aplicação."
 
 #. TRANS: Client error displayed trying to edit an application that does not exist.
-#: actions/editapplication.php:83 actions/showapplication.php:87
+#: actions/editapplication.php:83 actions/showapplication.php:83
 msgid "No such application."
 msgstr "Essa aplicação não existe."
 
@@ -2389,80 +2465,53 @@ msgstr "Editar o grupo %s"
 msgid "You must be logged in to create a group."
 msgstr "Você deve estar autenticado para criar um grupo."
 
-#. TRANS: Client error displayed trying to edit a group while not being a group admin.
-#. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
-#. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
-#: actions/editgroup.php:110 actions/editgroup.php:176
-#: actions/groupdesignsettings.php:109 actions/grouplogo.php:111
-msgid "You must be an admin to edit the group."
-msgstr "Você deve ser um administrador para editar o grupo."
-
 #. TRANS: Form instructions for group edit form.
 #: actions/editgroup.php:161
 msgid "Use this form to edit the group."
 msgstr "Use esse formulário para editar o grupo."
 
-#. TRANS: Group edit form validation error.
-#. TRANS: Group create form validation error.
-#. TRANS: %s is the invalid alias.
-#: actions/editgroup.php:241 actions/newgroup.php:188
-#, php-format
-msgid "Invalid alias: \"%s\""
-msgstr "Apelido inválido: \"%s\""
-
-#. TRANS: Server error displayed when editing a group fails.
-#: actions/editgroup.php:274
-msgid "Could not update group."
-msgstr "Não foi possível atualizar o grupo."
-
-#. TRANS: Server error displayed when group aliases could not be added.
-#. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/editgroup.php:281 classes/User_group.php:540
-msgid "Could not create aliases."
-msgstr "Não foi possível criar os apelidos."
-
 #. TRANS: Group edit form success message.
 #: actions/editgroup.php:301
 msgid "Options saved."
 msgstr "As configurações foram salvas."
 
 #. TRANS: Title for e-mail settings.
-#: actions/emailsettings.php:59
+#: actions/emailsettings.php:60
 msgid "Email settings"
 msgstr "Configurações do e-mail"
 
 #. TRANS: E-mail settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/emailsettings.php:73
+#: actions/emailsettings.php:74
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 msgstr "Configure o recebimento de e-mails de %%site.name%%."
 
 #. TRANS: Form legend for e-mail settings form.
 #. TRANS: Field label for e-mail address input in e-mail settings form.
-#: actions/emailsettings.php:103 actions/emailsettings.php:129
+#: actions/emailsettings.php:104 actions/emailsettings.php:130
 msgid "Email address"
 msgstr "Endereço de e-mail"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:109
+#: actions/emailsettings.php:110
 msgid "Current confirmed email address."
 msgstr "Endereço de e-mail já confirmado."
 
 #. TRANS: Button label to remove a confirmed e-mail address.
 #. TRANS: Button label for removing a set sender e-mail address to post notices from.
-#. TRANS: Button label to remove a confirmed Instant Messaging address.
+#. TRANS: Button label to remove a confirmed IM address.
 #. TRANS: Button label to remove a confirmed SMS address.
 #. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
-#: actions/emailsettings.php:112 actions/emailsettings.php:179
-#: actions/imsettings.php:112 actions/smssettings.php:120
-#: actions/smssettings.php:176
+#: actions/emailsettings.php:113 actions/emailsettings.php:180
+#: actions/imsettings.php:119 actions/smssettings.php:119
+#: actions/smssettings.php:175
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Remover"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:119
+#: actions/emailsettings.php:120
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -2475,44 +2524,44 @@ msgstr ""
 #. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
 #. TRANS: Any other domain may be owned by a legitimate person or
 #. TRANS: organization.
-#: actions/emailsettings.php:136
+#: actions/emailsettings.php:137
 msgid "Email address, like \"UserName@example.org\""
 msgstr "Endereço de e-mail, ex: \"usuario@exemplo.org\""
 
 #. TRANS: Button label for adding an e-mail address in e-mail settings form.
-#. TRANS: Button label for adding an Instant Messaging address in Instant Messaging settings form.
+#. TRANS: Button label for adding an IM address in IM settings form.
 #. TRANS: Button label for adding a SMS phone number in SMS settings form.
-#: actions/emailsettings.php:140 actions/imsettings.php:147
-#: actions/smssettings.php:158
+#: actions/emailsettings.php:141 actions/imsettings.php:147
+#: actions/smssettings.php:157
 msgctxt "BUTTON"
 msgid "Add"
 msgstr "Adicionar"
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:148 actions/smssettings.php:167
+#: actions/emailsettings.php:149 actions/smssettings.php:166
 msgid "Incoming email"
 msgstr "E-mail de recebimento"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:154
+#: actions/emailsettings.php:155
 msgid "I want to post notices by email."
 msgstr "Eu quero publicar mensagens por e-mail."
 
 #. TRANS: Form instructions for incoming e-mail form in e-mail settings.
 #. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
-#: actions/emailsettings.php:176 actions/smssettings.php:174
+#: actions/emailsettings.php:177 actions/smssettings.php:173
 msgid "Send email to this address to post new notices."
 msgstr "Envie e-mails para esse endereço para publicar novas mensagens."
 
 #. TRANS: Instructions for incoming e-mail address input form, when an address has already been assigned.
 #. TRANS: Instructions for incoming SMS e-mail address input form.
-#: actions/emailsettings.php:185 actions/smssettings.php:182
+#: actions/emailsettings.php:186 actions/smssettings.php:181
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr "Cria um novo endereço de e-mail para publicar e cancela o antigo."
 
 #. TRANS: Instructions for incoming e-mail address input form.
-#: actions/emailsettings.php:189
+#: actions/emailsettings.php:190
 msgid ""
 "To send notices via email, we need to create a unique email address for you "
 "on this server:"
@@ -2520,93 +2569,93 @@ msgstr ""
 
 #. TRANS: Button label for adding an e-mail address to send notices from.
 #. TRANS: Button label for adding an SMS e-mail address to send notices from.
-#: actions/emailsettings.php:195 actions/smssettings.php:185
+#: actions/emailsettings.php:196 actions/smssettings.php:184
 msgctxt "BUTTON"
 msgid "New"
 msgstr "Novo"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:204
+#: actions/emailsettings.php:205
 msgid "Email preferences"
 msgstr "Preferências de e-mail"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:212
+#: actions/emailsettings.php:213
 msgid "Send me notices of new subscriptions through email."
 msgstr "Envie-me notificações de novos assinantes por e-mail."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:218
+#: actions/emailsettings.php:219
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr ""
 "Envie-me um e-mail quando alguém adicionar alguma mensagem minha como "
 "favorita."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:225
+#: actions/emailsettings.php:226
 msgid "Send me email when someone sends me a private message."
 msgstr "Envie-me um e-mail quando alguém me mandar uma mensagem particular."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:231
+#: actions/emailsettings.php:232
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr ""
 "Envie-me um e-mail quando alguém mandar uma mensagem citando meu nome "
 "(\"@nome\")."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:237
+#: actions/emailsettings.php:238
 msgid "Allow friends to nudge me and send me an email."
 msgstr "Permita que meus amigos chamem minha atenção e enviem-me e-mails."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:243
+#: actions/emailsettings.php:244
 msgid "Publish a MicroID for my email address."
 msgstr "Publique um MicroID para meu endereço de e-mail."
 
 #. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:361
+#: actions/emailsettings.php:362
 msgid "Email preferences saved."
 msgstr "As configurações de e-mail foram salvas."
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:380
+#: actions/emailsettings.php:381
 msgid "No email address."
 msgstr "Nenhum endereço de e-mail."
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:388
+#: actions/emailsettings.php:389
 #, fuzzy
 msgid "Cannot normalize that email address."
 msgstr "Não foi possível normalizar este endereço de e-mail"
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:393 actions/register.php:212
+#: actions/emailsettings.php:394 actions/register.php:197
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "Não é um endereço de e-mail válido."
 
 #. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:397
+#: actions/emailsettings.php:398
 msgid "That is already your email address."
 msgstr "Esse já é seu endereço de e-mail."
 
 #. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:401
+#: actions/emailsettings.php:402
 msgid "That email address already belongs to another user."
 msgstr "Esse endereço de e-mail já pertence à outro usuário."
 
 #. TRANS: Server error thrown on database error adding e-mail confirmation code.
 #. TRANS: Server error thrown on database error adding Instant Messaging confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:418 actions/imsettings.php:343
-#: actions/smssettings.php:365
+#: actions/emailsettings.php:419 actions/imsettings.php:362
+#: actions/smssettings.php:364
 #, fuzzy
 msgid "Could not insert confirmation code."
 msgstr "Não foi possível inserir o código de confirmação."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:425
+#: actions/emailsettings.php:426
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
@@ -2618,59 +2667,62 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling Instant Messaging address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:445 actions/imsettings.php:377
-#: actions/smssettings.php:399
+#: actions/emailsettings.php:446 actions/imsettings.php:391
+#: actions/smssettings.php:398
 msgid "No pending confirmation to cancel."
 msgstr "Nenhuma confirmação pendente para cancelar."
 
 #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:450
+#: actions/emailsettings.php:451
 msgid "That is the wrong email address."
 msgstr "Esse é o endereço de e-mail errado."
 
 #. TRANS: Server error thrown on database error canceling e-mail address confirmation.
 #. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
-#: actions/emailsettings.php:459 actions/smssettings.php:413
+#: actions/emailsettings.php:460 actions/smssettings.php:412
 #, fuzzy
 msgid "Could not delete email confirmation."
 msgstr "Não foi possível excluir a confirmação de e-mail."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:464
+#: actions/emailsettings.php:465
 msgid "Email confirmation cancelled."
 msgstr "A confirmação por e-mail foi cancelada."
 
 #. TRANS: Message given trying to remove an e-mail address that is not
 #. TRANS: registered for the active user.
-#: actions/emailsettings.php:483
+#: actions/emailsettings.php:484
 msgid "That is not your email address."
 msgstr "Esse não é seu endereço de email."
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:504
+#: actions/emailsettings.php:505
 msgid "The email address was removed."
 msgstr "O endereço de e-mail foi removido."
 
 #. TRANS: Form validation error displayed when trying to remove an incoming e-mail address while no address has been set.
-#: actions/emailsettings.php:518 actions/smssettings.php:555
+#: actions/emailsettings.php:519 actions/smssettings.php:554
 msgid "No incoming email address."
 msgstr "Nenhum endereço de e-mail para recebimentos."
 
 #. TRANS: Server error thrown on database error removing incoming e-mail address.
 #. TRANS: Server error thrown on database error adding incoming e-mail address.
-#: actions/emailsettings.php:530 actions/emailsettings.php:554
-#: actions/smssettings.php:565 actions/smssettings.php:588
+#. TRANS: Server error displayed when the user could not be updated in SMS settings.
+#: actions/emailsettings.php:531 actions/emailsettings.php:555
+#: actions/smssettings.php:565 actions/smssettings.php:590
 #, fuzzy
 msgid "Could not update user record."
 msgstr "Não foi possível atualizar o registro do usuário."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:534 actions/smssettings.php:568
+#. TRANS: Confirmation text after updating SMS settings.
+#: actions/emailsettings.php:535 actions/smssettings.php:569
 msgid "Incoming email address removed."
 msgstr "O endereço de e-mail de recebimento foi removido."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:558 actions/smssettings.php:591
+#. TRANS: Confirmation text after updating SMS settings.
+#: actions/emailsettings.php:559 actions/smssettings.php:594
 msgid "New incoming email address added."
 msgstr ""
 "Foi adicionado um novo endereço de e-mail para recebimento de mensagens."
@@ -2683,7 +2735,7 @@ msgstr "Essa mensagem já é uma favorita!"
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
 #: actions/favor.php:95
 #, fuzzy
-msgid "Disfavor favorite"
+msgid "Disfavor favorite."
 msgstr "Desmarcar a favorita"
 
 #. TRANS: Page title for first page of favorited notices.
@@ -2736,9 +2788,8 @@ msgstr ""
 #. TRANS: %s is a user's nickname.
 #. TRANS: Title for first page of favourite notices of a user.
 #. TRANS: %s is the user for whom the favourite notices are displayed.
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing own favourited notices.
 #: actions/favoritesrss.php:111 actions/showfavorites.php:76
-#: lib/personalgroupnav.php:122
+#: lib/personalgroupnav.php:110
 #, php-format
 msgid "%s's favorite notices"
 msgstr "Mensagens favoritas de %s"
@@ -2925,13 +2976,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
 #: actions/groupblock.php:191
 #, fuzzy
-msgid "Do not block this user from this group"
+msgid "Do not block this user from this group."
 msgstr "Não bloquear este usuário neste grupo"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
 #: actions/groupblock.php:198
 #, fuzzy
-msgid "Block this user from this group"
+msgid "Block this user from this group."
 msgstr "Bloquear este usuário neste grupo"
 
 #. TRANS: Server error displayed when trying to block a user from a group fails because of an application error.
@@ -2941,6 +2992,7 @@ msgstr ""
 "Ocorreu um erro no banco de dados ao tentar bloquear o usuário no grupo."
 
 #. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
+#. TRANS: Client error displayed trying to find a user by ID without providing an ID.
 #: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr "Nenhuma ID."
@@ -2971,7 +3023,7 @@ msgid "Unable to update your design settings."
 msgstr "Não foi possível salvar suas configurações de aparência."
 
 #. TRANS: Form text to confirm saved group design settings.
-#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:222
+#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:239
 msgid "Design preferences saved."
 msgstr "As configurações da aparência foram salvas."
 
@@ -3036,7 +3088,7 @@ msgid "A list of the users in this group."
 msgstr "Uma lista dos usuários deste grupo."
 
 #. TRANS: Indicator in group members list that this user is a group administrator.
-#: actions/groupmembers.php:190
+#: actions/groupmembers.php:190 lib/action.php:581
 msgid "Admin"
 msgstr "Admin"
 
@@ -3129,8 +3181,10 @@ msgid "Group search"
 msgstr "Procurar grupos"
 
 #. TRANS: Text on page where groups can be searched if no results were found for a query.
-#: actions/groupsearch.php:82 actions/noticesearch.php:117
-#: actions/peoplesearch.php:83
+#. TRANS: Text for notice search results is the query had no results.
+#. TRANS: Message on the "People search" page where a query has no results.
+#: actions/groupsearch.php:82 actions/noticesearch.php:122
+#: actions/peoplesearch.php:87
 msgid "No results."
 msgstr "Nenhum resultado."
 
@@ -3167,169 +3221,171 @@ msgid "User is not blocked from group."
 msgstr "O usuário não está bloqueado no grupo."
 
 #. TRANS: Server error displayed when unblocking a user from a group fails because of an unknown error.
+#. TRANS: Server error displayed when removing a user block.
 #: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "Erro na remoção do bloqueio."
 
 #. TRANS: Title for Instant Messaging settings.
-#: actions/imsettings.php:58
+#: actions/imsettings.php:56
 msgid "IM settings"
 msgstr "Configurações do MI"
 
 #. 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.
-#: actions/imsettings.php:71
+#: actions/imsettings.php:69
 #, fuzzy, php-format
 msgid ""
-"You can send and receive notices through Jabber/Google Talk [instant "
-"messages](%%doc.im%%). Configure your address and settings below."
+"You can send and receive notices through instant messaging [instant messages]"
+"(%%doc.im%%). Configure your addresses and settings below."
 msgstr ""
 "Você pode enviar e receber mensagens através dos [mensageiros instantâneos](%"
 "%doc.im%%) Jabber/GTalk. Configure seu endereço e opções abaixo."
 
-#. TRANS: Message given in the Instant Messaging settings if XMPP is not enabled on the site.
+#. TRANS: Message given in the IM settings if IM is not enabled on the site.
 #: actions/imsettings.php:90
 msgid "IM is not available."
 msgstr "MI não está disponível"
 
-#. TRANS: Form legend for Instant Messaging settings form.
-#. TRANS: Field label for Instant Messaging address input in Instant Messaging settings form.
-#: actions/imsettings.php:102 actions/imsettings.php:132
-msgid "IM address"
-msgstr "Endereço do MI"
+#: actions/imsettings.php:116
+#, fuzzy, php-format
+msgid "Current confirmed %s address."
+msgstr "Endereço de e-mail já confirmado."
 
-#: actions/imsettings.php:109
-#, fuzzy
-msgid "Current confirmed Jabber/Google Talk address."
-msgstr "Endereço de Jabber/GTalk já confirmado."
-
-#. TRANS: Form note in Instant Messaging settings form.
-#. TRANS: %s is the Instant Messaging address set for the site.
-#: actions/imsettings.php:120
+#. TRANS: Form note in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:128
 #, fuzzy, php-format
 msgid ""
-"Awaiting confirmation on this address. Check your Jabber/Google Talk account "
-"for a message with further instructions. (Did you add %s to your buddy list?)"
+"Awaiting confirmation on this address. Check your %s account for a message "
+"with further instructions. (Did you add %s to your buddy list?)"
 msgstr ""
 "Aguardando a confirmação deste endereço. Procure em sua conta de Jabber/"
 "GTalk por uma mensagem com mais instruções (Você adicionou %s à sua lista de "
 "contatos?)"
 
-#. TRANS: IM address input field instructions in Instant Messaging settings form.
-#. TRANS: %s is the Instant Messaging address set for the site.
-#. TRANS: Do not translate "example.org". It is one of the domain names reserved for use in examples by
-#. TRANS: http://www.rfc-editor.org/rfc/rfc2606.txt. Any other domain may be owned by a legitimate
-#. TRANS: person or organization.
-#: actions/imsettings.php:139
-#, fuzzy, php-format
-msgid ""
-"Jabber or Google Talk address, like \"UserName@example.org\". First, make "
-"sure to add %s to your buddy list in your IM client or on Google Talk."
-msgstr ""
-"Endereço de Jabber ou GTalk, ex: \"usuario@exemplo.org\". Primeiro, "
-"certifique-se de adicionar %s à sua lista de contatos em seu cliente de MI "
-"ou no GTalk."
+#: actions/imsettings.php:140
+msgid "IM address"
+msgstr "Endereço do MI"
 
-#. TRANS: Form legend for Instant Messaging preferences form.
-#: actions/imsettings.php:154
-msgid "IM preferences"
+#: actions/imsettings.php:142
+#, php-format
+msgid "%s screenname."
+msgstr ""
+
+#. TRANS: Header for IM preferences form.
+#: actions/imsettings.php:163
+#, fuzzy
+msgid "IM Preferences"
 msgstr "Preferências do mensageiro instantâneo"
 
-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:159
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:174
 #, fuzzy
-msgid "Send me notices through Jabber/Google Talk."
-msgstr "Envie-me mensagens via Jabber/GTalk."
+msgid "Send me notices"
+msgstr "Enviar uma mensagem"
 
-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:165
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:176
 #, fuzzy
-msgid "Post a notice when my Jabber/Google Talk status changes."
+msgid "Post a notice when my status changes."
 msgstr "Publicar uma mensagem quando eu mudar de status no Jabber/GTalk."
 
-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:171
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:178
 #, fuzzy
-msgid ""
-"Send me replies through Jabber/Google Talk from people I'm not subscribed to."
+msgid "Send me replies from people I'm not subscribed to."
 msgstr ""
 "Envie-me respostas de pessoas que eu não estou assinando através do Jabber/"
 "GTalk."
 
-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:178
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:181
 #, fuzzy
-msgid "Publish a MicroID for my Jabber/Google Talk address."
-msgstr "Publique um MicroID para meu endereço de Jabber/Gtalk."
+msgid "Publish a MicroID"
+msgstr "Publique um MicroID para meu endereço de e-mail."
 
-#. TRANS: Confirmation message for successful Instant Messaging preferences save.
-#: actions/imsettings.php:283 actions/othersettings.php:192
+#. TRANS: Server error thrown on database error updating IM preferences.
+#: actions/imsettings.php:291
+#, fuzzy
+msgid "Couldn't update IM preferences."
+msgstr "Não foi possível atualizar o usuário."
+
+#. TRANS: Confirmation message for successful IM preferences save.
+#. TRANS: Confirmation message after saving preferences.
+#: actions/imsettings.php:298 actions/urlsettings.php:244
 msgid "Preferences saved."
 msgstr "As preferências foram salvas."
 
-#. TRANS: Message given saving Instant Messaging address without having provided one.
-#: actions/imsettings.php:304
-msgid "No Jabber ID."
-msgstr "Nenhuma ID de Jabber."
-
-#. TRANS: Message given saving Instant Messaging address that cannot be normalised.
-#: actions/imsettings.php:312
+#. TRANS: Message given saving IM address without having provided one.
+#: actions/imsettings.php:320
 #, fuzzy
-msgid "Cannot normalize that Jabber ID."
+msgid "No screenname."
+msgstr "Nenhuma identificação."
+
+#: actions/imsettings.php:325
+#, fuzzy
+msgid "No transport."
+msgstr "Nenhuma mensagem."
+
+#. TRANS: Message given saving IM address that cannot be normalised.
+#: actions/imsettings.php:333
+#, fuzzy
+msgid "Cannot normalize that screenname"
 msgstr "Não foi possível normalizar essa ID do Jabber"
 
-#. TRANS: Message given saving Instant Messaging address that not valid.
-#: actions/imsettings.php:317
+#. TRANS: Message given saving IM address that not valid.
+#: actions/imsettings.php:340
 #, fuzzy
-msgid "Not a valid Jabber ID."
-msgstr "Não é uma ID de Jabber válida"
+msgid "Not a valid screenname"
+msgstr "Não é uma identificação válida."
 
-#. TRANS: Message given saving Instant Messaging address that is already set.
-#: actions/imsettings.php:321
-msgid "That is already your Jabber ID."
-msgstr "Essa já é sua ID do Jabber."
-
-#. TRANS: Message given saving Instant Messaging address that is already set for another user.
-#: actions/imsettings.php:325
-msgid "Jabber ID already belongs to another user."
+#. TRANS: Message given saving IM address that is already set for another user.
+#: actions/imsettings.php:344
+#, fuzzy
+msgid "Screenname already belongs to another user."
 msgstr "Esta ID do Jabber já pertence à outro usuário."
 
-#. TRANS: Message given saving valid Instant Messaging address that is to be confirmed.
-#. TRANS: %s is the Instant Messaging address set for the site.
-#: actions/imsettings.php:353
-#, php-format
-msgid ""
-"A confirmation code was sent to the IM address you added. You must approve %"
-"s for sending messages to you."
+#. TRANS: Message given saving valid IM address that is to be confirmed.
+#: actions/imsettings.php:369
+#, fuzzy
+msgid "A confirmation code was sent to the IM address you added."
 msgstr ""
 "Um código de confirmação foi enviado para o endereço de IM que você "
 "informou. Você deve permitir que %s envie mensagens para você."
 
-#. TRANS: Message given canceling Instant Messaging address confirmation for the wrong IM address.
-#: actions/imsettings.php:382
+#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#: actions/imsettings.php:396
 msgid "That is the wrong IM address."
 msgstr "Isso é um endereço de MI errado."
 
-#. TRANS: Server error thrown on database error canceling Instant Messaging address confirmation.
-#: actions/imsettings.php:391
+#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#: actions/imsettings.php:405
 #, fuzzy
-msgid "Could not delete IM confirmation."
+msgid "Couldn't delete confirmation."
 msgstr "Não foi possível excluir a confirmação do mensageiro instantâneo."
 
-#. TRANS: Message given after successfully canceling Instant Messaging address confirmation.
-#: actions/imsettings.php:396
+#. TRANS: Message given after successfully canceling IM address confirmation.
+#: actions/imsettings.php:410
 msgid "IM confirmation cancelled."
 msgstr "A confirmação do mensageiro instantâneo foi cancelada."
 
-#. TRANS: Message given trying to remove an Instant Messaging address that is not
+#. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.
-#: actions/imsettings.php:417
-msgid "That is not your Jabber ID."
-msgstr "Essa não é sua ID do Jabber."
+#: actions/imsettings.php:434
+#, fuzzy
+msgid "That is not your screenname."
+msgstr "Esse não é seu número de telefone."
+
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#: actions/imsettings.php:443
+#, fuzzy
+msgid "Couldn't update user im prefs."
+msgstr "Não foi possível atualizar o registro do usuário."
 
 #. TRANS: Message given after successfully removing a registered Instant Messaging address.
-#: actions/imsettings.php:440
+#: actions/imsettings.php:451
 msgid "The IM address was removed."
 msgstr "O endereço de mensageiro instantâneo foi removido."
 
@@ -3542,7 +3598,7 @@ msgid "You must be logged in to join a group."
 msgstr "Você deve estar autenticado para se associar a um grupo."
 
 #. TRANS: Title for join group page after joining.
-#: actions/joingroup.php:147
+#: actions/joingroup.php:148
 #, fuzzy, php-format
 msgctxt "TITLE"
 msgid "%1$s joined group %2$s"
@@ -3676,7 +3732,7 @@ msgstr "URL de uma imagem a ser exibida com a licença."
 #. TRANS: Submit button title.
 #: actions/licenseadminpanel.php:311 actions/sessionsadminpanel.php:199
 #: actions/siteadminpanel.php:292 actions/snapshotadminpanel.php:245
-#: actions/tagother.php:154 lib/applicationeditform.php:357
+#: actions/tagother.php:133 lib/applicationeditform.php:357
 msgid "Save"
 msgstr "Salvar"
 
@@ -3684,42 +3740,44 @@ msgstr "Salvar"
 msgid "Save license settings"
 msgstr "Salvar as configurações da licença"
 
-#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
+#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
+#: actions/login.php:97 actions/otp.php:62 actions/register.php:130
 msgid "Already logged in."
 msgstr "Já está autenticado."
 
-#: actions/login.php:148
+#: actions/login.php:125
 msgid "Incorrect username or password."
 msgstr "Nome de usuário e/ou senha incorreto(s)."
 
-#: actions/login.php:154 actions/otp.php:120
+#. TRANS: Server error displayed when a user object could not be created trying to login using "one time password login".
+#: actions/login.php:131 actions/otp.php:127
 msgid "Error setting user. You are probably not authorized."
 msgstr ""
 "Erro na configuração do usuário. Você provavelmente não tem autorização."
 
-#: actions/login.php:210 actions/login.php:263
+#: actions/login.php:185 actions/login.php:236 lib/action.php:598
 msgid "Login"
 msgstr "Entrar"
 
-#: actions/login.php:249
+#: actions/login.php:222
 msgid "Login to site"
 msgstr "Autenticar-se no site"
 
-#: actions/login.php:258 actions/register.php:490
+#: actions/login.php:231 actions/register.php:469
 msgid "Remember me"
 msgstr "Lembrar neste computador"
 
-#: actions/login.php:259 actions/register.php:492
+#: actions/login.php:232 actions/register.php:471
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 "Entra automaticamente da próxima vez, sem pedir a senha. Não use em "
 "computadores compartilhados!"
 
-#: actions/login.php:269
+#: actions/login.php:241
 msgid "Lost or forgotten password?"
 msgstr "Perdeu ou esqueceu sua senha?"
 
-#: actions/login.php:288
+#: actions/login.php:259
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -3727,11 +3785,11 @@ msgstr ""
 "Por razões de segurança, por favor, digite novamente seu nome de usuário e "
 "senha antes de alterar suas configurações."
 
-#: actions/login.php:292
+#: actions/login.php:263
 msgid "Login with your username and password."
 msgstr "Autentique-se com seu nome de usuário e senha."
 
-#: actions/login.php:295
+#: actions/login.php:266
 #, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -3861,7 +3919,9 @@ msgstr "Nova mensagem"
 msgid "Notice posted"
 msgstr "A mensagem foi publicada"
 
-#: actions/noticesearch.php:68
+#. TRANS: Instructions for Notice search page.
+#. TRANS: %%site.name%% is the name of the StatusNet site.
+#: actions/noticesearch.php:69
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -3870,16 +3930,21 @@ msgstr ""
 "Procurar mensagens no %%site.name%% por seu conteúdo. Separe os termos da "
 "busca com espaços; eles devem ter 3 ou mais caracteres."
 
-#: actions/noticesearch.php:78
+#. TRANS: Title of the page where users can search for notices.
+#: actions/noticesearch.php:80
 msgid "Text search"
 msgstr "Procurar por texto"
 
-#: actions/noticesearch.php:91
+#. TRANS: Test in RSS notice search.
+#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
+#: actions/noticesearch.php:95
 #, php-format
 msgid "Search results for \"%1$s\" on %2$s"
 msgstr "Resultados da procura para \"%1$s\" no %2$s"
 
-#: actions/noticesearch.php:121
+#. TRANS: Text for logged in users making a query for notices without results.
+#. TRANS: This message contains a Markdown link.
+#: actions/noticesearch.php:128
 #, php-format
 msgid ""
 "Be the first to [post on this topic](%%%%action.newnotice%%%%?"
@@ -3888,7 +3953,9 @@ msgstr ""
 "Seja o primeiro a [publicar sobre este tópico](%%%%action.newnotice%%%%?"
 "status_textarea=%s)!"
 
-#: actions/noticesearch.php:124
+#. TRANS: Text for not logged in users making a query for notices without results.
+#. TRANS: This message contains Markdown links.
+#: actions/noticesearch.php:133
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and be the first to "
@@ -3898,14 +3965,17 @@ msgstr ""
 "primeiro a [publicar sobre este tópico](%%%%action.newnotice%%%%?"
 "status_textarea=%s)?"
 
-#: actions/noticesearchrss.php:96
+#. TRANS: RSS notice search feed title. %s is the query.
+#: actions/noticesearchrss.php:95
 #, php-format
 msgid "Updates with \"%s\""
 msgstr "Mensagens com \"%s\""
 
-#: actions/noticesearchrss.php:98
+#. TRANS: RSS notice search feed description.
+#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
+#: actions/noticesearchrss.php:99
 #, fuzzy, php-format
-msgid "Updates matching search term \"%1$s\" on %2$s!"
+msgid "Updates matching search term \"%1$s\" on %2$s."
 msgstr "Mensagens correspondentes aos termos \"%1$s\" no %2$s!"
 
 #: actions/nudge.php:85
@@ -3925,51 +3995,51 @@ msgid "Nudge sent!"
 msgstr "A chamada de atenção foi enviada!"
 
 #. TRANS: Message displayed to an anonymous user trying to view OAuth application list.
-#: actions/oauthappssettings.php:60
+#: actions/oauthappssettings.php:57
 msgid "You must be logged in to list your applications."
 msgstr "Você precisa estar autenticado para listar suas aplicações."
 
 #. TRANS: Page title for OAuth applications
-#: actions/oauthappssettings.php:76
+#: actions/oauthappssettings.php:73
 msgid "OAuth applications"
 msgstr "Aplicações OAuth"
 
 #. TRANS: Page instructions for OAuth applications
-#: actions/oauthappssettings.php:88
+#: actions/oauthappssettings.php:85
 msgid "Applications you have registered"
 msgstr "Aplicações que você registrou"
 
 #. TRANS: Empty list message on page with OAuth applications.
-#: actions/oauthappssettings.php:141
+#: actions/oauthappssettings.php:138
 #, php-format
 msgid "You have not registered any applications yet."
 msgstr "Você ainda não registrou nenhuma aplicação."
 
 #. TRANS: Title for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:71
+#: actions/oauthconnectionssettings.php:69
 msgid "Connected applications"
 msgstr "Aplicações conectadas"
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:83
+#: actions/oauthconnectionssettings.php:80
 msgid "The following connections exist for your account."
 msgstr "Existem as seguintes conexões para a sua conta."
 
 #. TRANS: Client error when trying to revoke access for an application while not being a user of it.
-#: actions/oauthconnectionssettings.php:168
+#: actions/oauthconnectionssettings.php:165
 msgid "You are not a user of that application."
 msgstr "Você não é um usuário dessa aplicação."
 
 #. TRANS: Client error when revoking access has failed for some reason.
 #. TRANS: %s is the application ID revoking access failed for.
-#: actions/oauthconnectionssettings.php:183
+#: actions/oauthconnectionssettings.php:180
 #, php-format
 msgid "Unable to revoke access for application: %s."
 msgstr "Não foi possível revogar o acesso para a aplicação: %s."
 
 #. TRANS: Success message after revoking access for an application.
 #. TRANS: %1$s is the application name, %2$s is the first part of the user token.
-#: actions/oauthconnectionssettings.php:202
+#: actions/oauthconnectionssettings.php:199
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -3978,14 +4048,14 @@ msgstr ""
 "O acesso de %1$s e do token iniciado por %2$s foi revogado com sucesso."
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:213
+#: actions/oauthconnectionssettings.php:210
 msgid "You have not authorized any applications to use your account."
 msgstr "Você não autorizou nenhuma aplicação a usar a sua conta."
 
 #. TRANS: Note for developers in the OAuth connection settings form.
 #. TRANS: This message contains a Markdown link. Do not separate "](".
 #. TRANS: %s is the URL to the OAuth settings.
-#: actions/oauthconnectionssettings.php:233
+#: actions/oauthconnectionssettings.php:230
 #, php-format
 msgid ""
 "Are you a developer? [Register an OAuth client application](%s) to use with "
@@ -3994,6 +4064,16 @@ msgstr ""
 "Você é um desenvolvedor? [Registre uma aplicação cliente OAuth](%s) para "
 "usar com esta instância do StatusNet."
 
+#: actions/oembed.php:64
+#, fuzzy, php-format
+msgid "\"%s\" not found."
+msgstr "O método da API não foi encontrado!"
+
+#: actions/oembed.php:76
+#, fuzzy, php-format
+msgid "Notice %s not found."
+msgstr "A mensagem pai não foi encontrada."
+
 #: actions/oembed.php:80 actions/shownotice.php:100
 msgid "Notice has no profile."
 msgstr "A mensagem não está associada a nenhum perfil."
@@ -4003,6 +4083,16 @@ msgstr "A mensagem não está associada a nenhum perfil."
 msgid "%1$s's status on %2$s"
 msgstr "Mensagem de %1$s no %2$s"
 
+#: actions/oembed.php:95
+#, fuzzy, php-format
+msgid "Attachment %s not found."
+msgstr "O usuário destinatário não foi encontrado."
+
+#: actions/oembed.php:136
+#, php-format
+msgid "\"%s\" not supported for oembed requests."
+msgstr ""
+
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
 #: actions/oembed.php:168
 #, php-format
@@ -4016,93 +4106,60 @@ msgid "Only %s URLs over plain HTTP please."
 msgstr "Por favor, somente URLs %s sobre HTTP puro."
 
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1205
-#: lib/apiaction.php:1232 lib/apiaction.php:1367
+#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1207
+#: lib/apiaction.php:1234 lib/apiaction.php:1369
 msgid "Not a supported data format."
 msgstr "Não é um formato de dados suportado."
 
+#. TRANS: ShortName in the OpenSearch interface when trying to find users.
 #: actions/opensearch.php:64
 msgid "People Search"
 msgstr "Procurar pessoas"
 
-#: actions/opensearch.php:67
+#: actions/opensearch.php:68
 msgid "Notice Search"
 msgstr "Procurar mensagens"
 
-#: actions/othersettings.php:59
-msgid "Other settings"
-msgstr "Outras configurações"
-
-#. TRANS: Instructions for tab "Other" in user profile settings.
-#: actions/othersettings.php:71
-msgid "Manage various other options."
-msgstr "Gerencia várias outras opções."
-
-#. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
-#. TRANS: user's profile settings. Use of "free" is as in "open", indicating that the
-#. TRANS: information on the shortener site is freely distributable.
-#. TRANS: This message has one space at the beginning. Use your language's word separator
-#. TRANS: here if it has one (most likely a single space).
-#: actions/othersettings.php:113
-msgid " (free service)"
-msgstr " (serviço livre)"
-
-#. TRANS: Label for dropdown with URL shortener services.
-#: actions/othersettings.php:122
-msgid "Shorten URLs with"
-msgstr "Encolher URLs com"
-
-#. TRANS: Tooltip for for dropdown with URL shortener services.
-#: actions/othersettings.php:124
-msgid "Automatic shortening service to use."
-msgstr "Serviço de encolhimento automático a ser utilizado."
-
-#. TRANS: Label for checkbox.
-#: actions/othersettings.php:130
-msgid "View profile designs"
-msgstr "Visualizar aparências do perfil"
-
-#. TRANS: Tooltip for checkbox.
-#: actions/othersettings.php:132
-msgid "Show or hide profile designs."
-msgstr "Exibir ou esconder as aparências do perfil."
-
-#. TRANS: Form validation error for form "Other settings" in user profile.
-#: actions/othersettings.php:164
-msgid "URL shortening service is too long (maximum 50 characters)."
-msgstr "O serviço de encolhimento de URL é muito extenso (máx. 50 caracteres)."
-
-#: actions/otp.php:69
+#. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
+#: actions/otp.php:70
 msgid "No user ID specified."
 msgstr "Não foi especificado nenhum ID de usuário."
 
-#: actions/otp.php:83
+#. TRANS: Client error displayed trying to use "one time password login" without specifying a login token.
+#: actions/otp.php:86
 msgid "No login token specified."
 msgstr "Não foi especificado nenhum token de autenticação."
 
-#: actions/otp.php:90
+#. TRANS: Client error displayed trying to use "one time password login" without requesting a login token.
+#: actions/otp.php:94
 msgid "No login token requested."
 msgstr "Não foi requerido nenhum token de autenticação."
 
-#: actions/otp.php:95
+#. TRANS: Client error displayed trying to use "one time password login" while specifying an invalid login token.
+#: actions/otp.php:100
 msgid "Invalid login token specified."
 msgstr "O token de autenticação especificado é inválido."
 
-#: actions/otp.php:104
+#. TRANS: Client error displayed trying to use "one time password login" while specifying an expired login token.
+#: actions/otp.php:110
 msgid "Login token expired."
 msgstr "O token de autenticação expirou."
 
-#: actions/outbox.php:58
+#. TRANS: Title for outbox for any but the fist page.
+#. TRANS: %1$s is the user nickname, %2$d is the page number.
+#: actions/outbox.php:57
 #, php-format
 msgid "Outbox for %1$s - page %2$d"
 msgstr "Enviadas por %s - pág. %2$d"
 
+#. TRANS: Title for first page of outbox.
 #: actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
 msgstr "Enviadas de %s"
 
-#: actions/outbox.php:104
+#. TRANS: Instructions for outbox.
+#: actions/outbox.php:103
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr ""
 "Essa é a sua caixa de mensagens enviadas, que lista as mensagens "
@@ -4130,43 +4187,45 @@ msgstr "Senha anterior"
 msgid "New password"
 msgstr "Senha nova"
 
-#: actions/passwordsettings.php:109
+#: actions/passwordsettings.php:109 actions/register.php:416
 #, fuzzy
-msgid "6 or more characters"
+msgid "6 or more characters."
 msgstr "No mínimo 6 caracteres"
 
-#: actions/passwordsettings.php:113
+#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#: actions/passwordsettings.php:113 actions/recoverpassword.php:264
+#: actions/register.php:420
 #, fuzzy
-msgid "Same as password above"
+msgid "Same as password above."
 msgstr "Igual à senha acima"
 
 #: actions/passwordsettings.php:117
 msgid "Change"
 msgstr "Alterar"
 
-#: actions/passwordsettings.php:154 actions/register.php:238
+#: actions/passwordsettings.php:153 actions/register.php:223
 msgid "Password must be 6 or more characters."
 msgstr "A senha deve ter, no mínimo, 6 caracteres."
 
-#: actions/passwordsettings.php:157 actions/register.php:241
+#: actions/passwordsettings.php:156 actions/register.php:226
 msgid "Passwords don't match."
 msgstr "As senhas não coincidem."
 
-#: actions/passwordsettings.php:165
+#: actions/passwordsettings.php:164
 msgid "Incorrect old password"
 msgstr "A senha anterior está errada"
 
-#: actions/passwordsettings.php:181
+#: actions/passwordsettings.php:180
 msgid "Error saving user; invalid."
 msgstr "Erro ao salvar usuário; inválido."
 
-#: actions/passwordsettings.php:186
+#. TRANS: Reset password form validation error message.
+#: actions/passwordsettings.php:185 actions/recoverpassword.php:418
 #, fuzzy
-msgid "Can't save new password."
+msgid "Cannot save new password."
 msgstr "Não é possível salvar a nova senha."
 
-#. TRANS: Title for password recovery page in password saved mode.
-#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
+#: actions/passwordsettings.php:191
 msgid "Password saved."
 msgstr "A senha foi salva."
 
@@ -4372,8 +4431,7 @@ msgid "Directory where backgrounds are located."
 msgstr "Diretório onde os planos de fundo estão localizados."
 
 #. TRANS: Fieldset legens in Paths admin panel.
-#. TRANS: DT element label in attachment list.
-#: actions/pathsadminpanel.php:419 lib/attachmentlist.php:98
+#: actions/pathsadminpanel.php:419
 msgid "Attachments"
 msgstr "Anexos"
 
@@ -4441,7 +4499,9 @@ msgstr "Servidor para onde devem ser direcionadas as requisições SSL."
 msgid "Save paths"
 msgstr "Salvar caminhos"
 
-#: actions/peoplesearch.php:52
+#. TRANS: Instructions for the "People search" page.
+#. TRANS: %%site.name%% is the name of the StatusNet site.
+#: actions/peoplesearch.php:54
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
@@ -4450,7 +4510,8 @@ msgstr ""
 "Procurar pessoas no %%site.name%% por seus nomes, localidade ou interesses. "
 "Separe os termos da busca com espaços; eles devem ter 3 ou mais caracteres."
 
-#: actions/peoplesearch.php:58
+#. TRANS: Title of a page where users can search for other users.
+#: actions/peoplesearch.php:61
 msgid "People search"
 msgstr "Procurar pessoas"
 
@@ -4464,6 +4525,60 @@ msgstr "Não é uma etiqueta de pessoa válida: %s."
 msgid "Users self-tagged with %1$s - page %2$d"
 msgstr "Usuários auto-etiquetados com %1$s - pág. %2$d"
 
+#. TRANS: Page title for AJAX form return when a disabling a plugin.
+#: actions/plugindisable.php:69
+msgctxt "plugin"
+msgid "Disabled"
+msgstr ""
+
+#. TRANS: Client error displayed trying to perform any request method other than POST.
+#. TRANS: Do not translate POST.
+#: actions/pluginenable.php:78 actions/subscribe.php:77
+msgid "This action only accepts POST requests."
+msgstr "Esta ação aceita somente requisições POST."
+
+#: actions/pluginenable.php:102
+#, fuzzy
+msgid "You cannot administer plugins."
+msgstr "Você não pode excluir usuários."
+
+#: actions/pluginenable.php:109
+#, fuzzy
+msgid "No such plugin."
+msgstr "Esta página não existe."
+
+#. TRANS: Page title for AJAX form return when enabling a plugin.
+#: actions/pluginenable.php:159
+msgctxt "plugin"
+msgid "Enabled"
+msgstr ""
+
+#. TRANS: Tab and title for plugins admin panel.
+#. TRANS: Menu item for site administration
+#: actions/pluginsadminpanel.php:56 actions/version.php:191
+#: lib/adminpanelaction.php:411
+msgid "Plugins"
+msgstr "Plugins"
+
+#. TRANS: Instructions at top of plugin admin page.
+#: actions/pluginsadminpanel.php:68
+msgid ""
+"Additional plugins can be enabled and configured manually. See the <a href="
+"\"http://status.net/wiki/Plugins\">online plugin documentation</a> for more "
+"details."
+msgstr ""
+
+#. TRANS: Admin form section header
+#: actions/pluginsadminpanel.php:84
+#, fuzzy
+msgid "Default plugins"
+msgstr "Idioma padrão"
+
+#: actions/pluginsadminpanel.php:106
+msgid ""
+"All default plugins have been disabled from the site's configuration file."
+msgstr ""
+
 #: actions/postnotice.php:95
 msgid "Invalid notice content."
 msgstr "O conteúdo da mensagem é inválido."
@@ -4475,12 +4590,12 @@ msgstr ""
 "A licença ‘%1$s’ da mensagem não é compatível com a licença ‘%2$s’ do site."
 
 #. TRANS: Page title for profile settings.
-#: actions/profilesettings.php:59
+#: actions/profilesettings.php:60
 msgid "Profile settings"
 msgstr "Configurações do perfil"
 
 #. TRANS: Usage instructions for profile settings.
-#: actions/profilesettings.php:70
+#: actions/profilesettings.php:71
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
@@ -4488,40 +4603,37 @@ msgstr ""
 "saibam mais sobre você."
 
 #. TRANS: Profile settings form legend.
-#: actions/profilesettings.php:98
+#: actions/profilesettings.php:99
 msgid "Profile information"
 msgstr "Informações do perfil"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109 actions/register.php:433
+#: actions/profilesettings.php:110 actions/register.php:412
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr "1-64 letras minúsculas ou números, sem pontuações ou espaços."
 
 #. TRANS: Field label in form for profile settings.
-#. TRANS: Label for full group name (dt). Text hidden by default.
-#. TRANS: DT for full name in a profile.
-#: actions/profilesettings.php:113 actions/register.php:455
-#: actions/showgroup.php:255 actions/tagother.php:104
-#: lib/groupeditform.php:150 lib/userprofile.php:156
+#: actions/profilesettings.php:114 actions/register.php:434
+#: lib/groupeditform.php:150
 msgid "Full name"
 msgstr "Nome completo"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:118 actions/register.php:460
+#: actions/profilesettings.php:119 actions/register.php:439
 #: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "Site"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:121
+#: actions/profilesettings.php:122 actions/register.php:441
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr "URL do seu site, blog ou perfil em outro site."
 
 #. TRANS: Tooltip for field label in form for profile settings. Plural
 #. TRANS: is decided by the number of characters available for the
 #. TRANS: biography (%d).
-#: actions/profilesettings.php:129 actions/register.php:471
+#: actions/profilesettings.php:130 actions/register.php:450
 #, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4529,86 +4641,82 @@ msgstr[0] "Descreva a si mesmo e os seus interesses em %d caractere"
 msgstr[1] "Descreva a si mesmo e os seus interesses em %d caracteres"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:135 actions/register.php:476
+#: actions/profilesettings.php:136 actions/register.php:455
 msgid "Describe yourself and your interests"
 msgstr "Descreva a si mesmo e os seus interesses"
 
 #. TRANS: Text area label in form for profile settings where users can provide.
 #. TRANS: their biography.
-#: actions/profilesettings.php:139 actions/register.php:478
+#: actions/profilesettings.php:140 actions/register.php:457
 msgid "Bio"
 msgstr "Descrição"
 
 #. TRANS: Field label in form for profile settings.
-#. TRANS: Label for group location (dt). Text hidden by default.
-#. TRANS: DT for location in a profile.
-#: actions/profilesettings.php:145 actions/register.php:483
-#: actions/showgroup.php:265 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:173
-#: lib/userprofile.php:172
+#: actions/profilesettings.php:146 actions/register.php:462
+#: lib/groupeditform.php:173
 msgid "Location"
 msgstr "Localização"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148 actions/register.php:485
+#: actions/profilesettings.php:149
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Onde você está, ex: \"cidade, estado (ou região), país\""
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:153
+#: actions/profilesettings.php:154
 msgid "Share my current location when posting notices"
 msgstr "Compartilhe minha localização atual ao publicar mensagens"
 
 #. TRANS: Field label in form for profile settings.
-#. TRANS: DT for tags in a profile.
-#: actions/profilesettings.php:161 actions/tagother.php:149
-#: actions/tagother.php:209 lib/subscriptionlist.php:106
-#: lib/subscriptionlist.php:108 lib/userprofile.php:220
+#: actions/profilesettings.php:162 actions/tagother.php:128
+#: actions/tagother.php:188 lib/subscriptionlist.php:104
+#: lib/subscriptionlist.php:106
 msgid "Tags"
 msgstr "Etiquetas"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:164
+#: actions/profilesettings.php:165
 #, fuzzy
 msgid ""
-"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- "
+"separated."
 msgstr ""
 "Suas etiquetas (letras, números, -, ., e _), separadas por vírgulas ou "
 "espaços"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:169
+#: actions/profilesettings.php:170
 msgid "Language"
 msgstr "Idioma"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:171
+#: actions/profilesettings.php:172
 #, fuzzy
-msgid "Preferred language"
+msgid "Preferred language."
 msgstr "Idioma preferencial"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:181
+#: actions/profilesettings.php:182
 msgid "Timezone"
 msgstr "Fuso horário"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:183
+#: actions/profilesettings.php:184
 msgid "What timezone are you normally in?"
 msgstr "Em que fuso horário você normalmente está?"
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:189
+#: actions/profilesettings.php:190
 #, fuzzy
 msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)"
+"Automatically subscribe to whoever subscribes to me (best for non-humans)."
 msgstr ""
 "Assinar automaticamente à quem me assinar (melhor para perfis não humanos)"
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Plural form is used based on the maximum number of allowed
 #. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:258 actions/register.php:229
+#: actions/profilesettings.php:259 actions/register.php:214
 #, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4616,49 +4724,49 @@ msgstr[0] "A descrição é muito extensa (máximo %d caractere)."
 msgstr[1] "A descrição é muito extensa (máximo %d caracteres)."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:269 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:270 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr "O fuso horário não foi selecionado."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:277
+#: actions/profilesettings.php:278
 msgid "Language is too long (maximum 50 characters)."
 msgstr "O nome do idioma é muito extenso (máx. 50 caracteres)."
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:291 actions/tagother.php:178
-#, php-format
-msgid "Invalid tag: \"%s\""
+#: actions/profilesettings.php:292
+#, fuzzy, php-format
+msgid "Invalid tag: \"%s\"."
 msgstr "Etiqueta inválida: \"%s\""
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:347
+#: actions/profilesettings.php:348
 #, fuzzy
 msgid "Could not update user for autosubscribe."
 msgstr "Não foi possível atualizar o usuário para assinar automaticamente."
 
 #. TRANS: Server error thrown when user profile location preference settings could not be updated.
-#: actions/profilesettings.php:405
+#: actions/profilesettings.php:406
 #, fuzzy
 msgid "Could not save location prefs."
 msgstr "Não foi possível salvar as preferências de localização."
 
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:427 actions/tagother.php:200
+#: actions/profilesettings.php:428 actions/tagother.php:179
 msgid "Could not save tags."
 msgstr "Não foi possível salvar as etiquetas."
 
 #. TRANS: Confirmation shown when user profile settings are saved.
 #. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:436 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:437 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "As configurações foram salvas."
 
 #. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
 #. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:483 actions/restoreaccount.php:60
+#: actions/profilesettings.php:484 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "Criar uma conta"
@@ -4737,6 +4845,12 @@ msgstr ""
 "Este é %%site.name%%, um serviço de [microblog](http://pt.wikipedia.org/wiki/"
 "Microblogging) baseado no software livre [StatusNet](http://status.net/)."
 
+#. TRANS: Public RSS feed description. %s is the StatusNet site name.
+#: actions/publicrss.php:106
+#, fuzzy, php-format
+msgid "%s updates from everyone."
+msgstr "%s mensagens de todo mundo!"
+
 #. TRANS: Title for public tag cloud.
 #: actions/publictagcloud.php:57
 msgid "Public tag cloud"
@@ -4778,10 +4892,6 @@ msgstr ""
 "Por que você não [registra uma conta](%%action.register%%) pra ser o "
 "primeiro a publicar?"
 
-#: actions/publictagcloud.php:146
-msgid "Tag cloud"
-msgstr "Nuvem de etiquetas"
-
 #. TRANS: Client error displayed trying to recover password while already logged in.
 #: actions/recoverpassword.php:37
 msgid "You are already logged in!"
@@ -4874,6 +4984,12 @@ msgstr "Recuperar a senha"
 msgid "Password recovery requested"
 msgstr "Foi solicitada a recuperação da senha"
 
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/recoverpassword.php:229
+#, fuzzy
+msgid "Password saved"
+msgstr "A senha foi salva."
+
 #. TRANS: Title for password recovery page when an unknown action has been specified.
 #: actions/recoverpassword.php:232
 msgid "Unknown action"
@@ -4885,15 +5001,9 @@ msgstr "Ação desconhecida"
 msgid "6 or more characters, and do not forget it!"
 msgstr "No mínimo 6 caracteres. E não se esqueça dela!"
 
-#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
-#: actions/recoverpassword.php:264 actions/register.php:441
-#, fuzzy
-msgid "Same as password above."
-msgstr "Igual à senha acima"
-
 #. TRANS: Button text for password reset form.
 #. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: actions/recoverpassword.php:268 lib/designsettings.php:264
+#: actions/recoverpassword.php:268 lib/designform.php:145
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Reset"
@@ -4945,14 +5055,8 @@ msgstr "A senha deve ter 6 ou mais caracteres."
 msgid "Password and confirmation do not match."
 msgstr "A senha e a confirmação não coincidem."
 
-#. TRANS: Reset password form validation error message.
-#: actions/recoverpassword.php:418
-#, fuzzy
-msgid "Cannot save new password."
-msgstr "Não é possível salvar a nova senha."
-
 #. TRANS: Server error displayed when something does wrong with the user object during password reset.
-#: actions/recoverpassword.php:426 actions/register.php:256
+#: actions/recoverpassword.php:426 actions/register.php:241
 msgid "Error setting user."
 msgstr "Erro na configuração do usuário."
 
@@ -4963,75 +5067,79 @@ msgstr ""
 "A nova senha foi salva com sucesso. A partir de agora você já está "
 "autenticado."
 
-#: actions/register.php:92 actions/register.php:196 actions/register.php:413
+#: actions/redirecturl.php:70
+#, fuzzy
+msgid "No id parameter"
+msgstr "Nenhum argumento de ID."
+
+#: actions/redirecturl.php:76
+#, fuzzy, php-format
+msgid "No such file \"%d\""
+msgstr "Esse arquivo não existe."
+
+#: actions/register.php:80 actions/register.php:181 actions/register.php:392
 msgid "Sorry, only invited people can register."
 msgstr "Desculpe, mas somente convidados podem se registrar."
 
-#: actions/register.php:99
+#: actions/register.php:87
 msgid "Sorry, invalid invitation code."
 msgstr "Desculpe, mas o código do convite é inválido."
 
-#: actions/register.php:119
+#: actions/register.php:106
 msgid "Registration successful"
 msgstr "Registro realizado com sucesso"
 
-#: actions/register.php:121 actions/register.php:511
+#: actions/register.php:108 actions/register.php:490
 msgid "Register"
 msgstr "Registrar-se"
 
-#: actions/register.php:142
+#: actions/register.php:128
 msgid "Registration not allowed."
 msgstr "Não é permitido o registro."
 
-#: actions/register.php:209
+#: actions/register.php:194
 #, fuzzy
-msgid "You can't register if you don't agree to the license."
+msgid "You cannot register if you don't agree to the license."
 msgstr "Você não pode se registrar se não aceitar a licença."
 
-#: actions/register.php:218
+#: actions/register.php:203
 msgid "Email address already exists."
 msgstr "O endereço de e-mail já existe."
 
-#: actions/register.php:251 actions/register.php:273
+#: actions/register.php:236 actions/register.php:258
 msgid "Invalid username or password."
 msgstr "Nome de usuário e/ou senha inválido(s)"
 
-#: actions/register.php:351
+#: actions/register.php:333
 #, fuzzy
 msgid ""
 "With this form you can create a new account. You can then post notices and "
-"link up to friends and colleagues. "
+"link up to friends and colleagues."
 msgstr ""
 "Através deste formulário você pode criar uma nova conta. A partir daí você "
 "pode publicar mensagens e se conectar a amigos e colegas. "
 
-#: actions/register.php:437
-#, fuzzy
-msgid "6 or more characters."
-msgstr "No mínimo 6 caracteres"
-
-#. TRANS: Link description in user account settings menu.
-#: actions/register.php:445 actions/register.php:449
-#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
+#: actions/register.php:424 actions/register.php:428
+#: actions/siteadminpanel.php:238 lib/settingsnav.php:92
 msgid "Email"
 msgstr "E-mail"
 
-#: actions/register.php:446 actions/register.php:450
+#: actions/register.php:425 actions/register.php:429
 #, fuzzy
-msgid "Used only for updates, announcements, and password recovery"
+msgid "Used only for updates, announcements, and password recovery."
 msgstr "Usado apenas para atualizações, anúncios e recuperações de senha"
 
-#: actions/register.php:457
+#: actions/register.php:436
 #, fuzzy
-msgid "Longer name, preferably your \"real\" name"
+msgid "Longer name, preferably your \"real\" name."
 msgstr "Nome completo, de preferência seu nome \"real\""
 
-#: actions/register.php:462
+#: actions/register.php:464
 #, fuzzy
-msgid "URL of your homepage, blog, or profile on another site"
-msgstr "URL do seu site, blog ou perfil em outro site."
+msgid "Where you are, like \"City, State (or Region), Country\"."
+msgstr "Onde você está, ex: \"cidade, estado (ou região), país\""
 
-#: actions/register.php:523
+#: actions/register.php:503
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
@@ -5039,23 +5147,23 @@ msgstr ""
 "Eu entendo que o conteúdo e os dados de %1$s são particulares e "
 "confidenciais."
 
-#: actions/register.php:533
+#: actions/register.php:513
 #, php-format
 msgid "My text and files are copyright by %1$s."
 msgstr "Meus textos e arquivos estão licenciados sob a %1$s."
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:537
+#: actions/register.php:517
 msgid "My text and files remain under my own copyright."
 msgstr "Meus textos e arquivos permanecem sob meus próprios direitos autorais."
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:540
+#: actions/register.php:520
 msgid "All rights reserved."
 msgstr "Todos os direitos reservados."
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:545
+#: actions/register.php:525
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -5065,7 +5173,7 @@ msgstr ""
 "particulares: senha, endereço de e-mail, endereço do mensageiro instantâneo "
 "e número de telefone."
 
-#: actions/register.php:588
+#: actions/register.php:566
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -5098,7 +5206,7 @@ msgstr ""
 "\n"
 "Obrigado por se registrar e esperamos que você aproveite o serviço."
 
-#: actions/register.php:612
+#: actions/register.php:590
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5132,7 +5240,7 @@ msgstr "Identificação do usuário"
 
 #: actions/remotesubscribe.php:129
 #, fuzzy
-msgid "Nickname of the user you want to follow"
+msgid "Nickname of the user you want to follow."
 msgstr "Identificação do usuário que você quer seguir"
 
 #: actions/remotesubscribe.php:132
@@ -5141,18 +5249,18 @@ msgstr "URL do perfil"
 
 #: actions/remotesubscribe.php:133
 #, fuzzy
-msgid "URL of your profile on another compatible microblogging service"
+msgid "URL of your profile on another compatible microblogging service."
 msgstr "URL do seu perfil em outro serviço de microblog compatível"
 
 #. TRANS: Link text for link that will subscribe to a remote profile.
 #: actions/remotesubscribe.php:136 lib/subscribeform.php:139
-#: lib/userprofile.php:431
+#: lib/userprofile.php:402
 msgid "Subscribe"
 msgstr "Assinar"
 
 #: actions/remotesubscribe.php:158
 #, fuzzy
-msgid "Invalid profile URL (bad format)"
+msgid "Invalid profile URL (bad format)."
 msgstr "A URL do perfil é inválida (formato inválido)"
 
 #: actions/remotesubscribe.php:167
@@ -5187,7 +5295,7 @@ msgstr "Você não pode repetir sua própria mensagem."
 msgid "You already repeated that notice."
 msgstr "Você já repetiu essa mensagem."
 
-#: actions/repeat.php:112 lib/noticelist.php:692
+#: actions/repeat.php:112 lib/noticelist.php:697
 msgid "Repeated"
 msgstr "Repetida"
 
@@ -5195,9 +5303,9 @@ msgstr "Repetida"
 msgid "Repeated!"
 msgstr "Repetida!"
 
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing @-replies.
+#. TRANS: RSS reply feed title. %s is a user nickname.
 #: actions/replies.php:126 actions/repliesrss.php:68
-#: lib/personalgroupnav.php:109
+#: lib/personalgroupnav.php:105
 #, php-format
 msgid "Replies to %s"
 msgstr "Respostas para %s"
@@ -5249,9 +5357,11 @@ msgstr ""
 "Seja o primeiro a [publicar sobre este tópico](%%%%action.newnotice%%%%?"
 "status_textarea=%s)!"
 
-#: actions/repliesrss.php:72
+#. TRANS: RSS reply feed description.
+#. TRANS: %1$s is a user nickname, %2$s is the StatusNet site name.
+#: actions/repliesrss.php:74
 #, fuzzy, php-format
-msgid "Replies to %1$s on %2$s!"
+msgid "Replies to %1$s on %2$s."
 msgstr "Respostas para %1$s no %2$s"
 
 #. TRANS: Client exception displayed when trying to restore an account while not logged in.
@@ -5355,7 +5465,7 @@ msgstr "Não é possível revogar os papéis dos usuários neste site."
 msgid "User doesn't have this role."
 msgstr "O usuário não possui este papel."
 
-#: actions/rsd.php:146 actions/version.php:159
+#: actions/rsd.php:142 actions/version.php:159
 msgid "StatusNet"
 msgstr "StatusNet"
 
@@ -5397,87 +5507,38 @@ msgstr "Ativa a saída de depuração para as sessões."
 msgid "Save site settings"
 msgstr "Salvar as configurações do site"
 
-#: actions/showapplication.php:82
+#: actions/showapplication.php:78
 msgid "You must be logged in to view an application."
 msgstr "Você deve estar autenticado para visualizar uma aplicação."
 
-#: actions/showapplication.php:157
+#: actions/showapplication.php:151
 msgid "Application profile"
 msgstr "Perfil da aplicação"
 
-#. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:159 lib/applicationeditform.php:177
-msgid "Icon"
-msgstr "Ícone"
-
-#. TRANS: Form input field label for application name.
-#: actions/showapplication.php:169 actions/version.php:197
-#: lib/applicationeditform.php:190
-msgid "Name"
-msgstr "Nome"
-
-#. TRANS: Form input field label.
-#: actions/showapplication.php:178 lib/applicationeditform.php:227
-msgid "Organization"
-msgstr "Organização"
-
-#. TRANS: Form input field label.
-#: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:168
-msgid "Description"
-msgstr "Descrição"
-
-#. TRANS: Header for group statistics on a group page (h2).
-#. TRANS: H2 text for user statistics.
-#: actions/showapplication.php:192 actions/showgroup.php:460
-#: lib/profileaction.php:205
-msgid "Statistics"
-msgstr "Estatísticas"
-
-#: actions/showapplication.php:203
+#: actions/showapplication.php:179
 #, php-format
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr "Criado por %1$s - acesso %2$s por padrão - %3$d usuários"
 
-#: actions/showapplication.php:213
+#: actions/showapplication.php:189
 msgid "Application actions"
 msgstr "Ações da aplicação"
 
-#: actions/showapplication.php:236
+#: actions/showapplication.php:212
 msgid "Reset key & secret"
 msgstr "Restaurar a chave e o segredo"
 
 #. TRANS: Title of form for deleting a user.
-#: actions/showapplication.php:252 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:64 lib/noticelist.php:673
+#: actions/showapplication.php:228 lib/deletegroupform.php:121
+#: lib/deleteuserform.php:64 lib/noticelist.php:678
 msgid "Delete"
 msgstr "Excluir"
 
-#: actions/showapplication.php:261
+#: actions/showapplication.php:237
 msgid "Application info"
 msgstr "Informação da aplicação"
 
-#: actions/showapplication.php:263
-msgid "Consumer key"
-msgstr "Chave do consumidor"
-
-#: actions/showapplication.php:268
-msgid "Consumer secret"
-msgstr "Segredo do consumidor"
-
-#: actions/showapplication.php:273
-msgid "Request token URL"
-msgstr "URL do token de requisição"
-
-#: actions/showapplication.php:278
-msgid "Access token URL"
-msgstr "URL do token de acesso"
-
-#: actions/showapplication.php:283
-msgid "Authorize URL"
-msgstr "Autorizar a URL"
-
-#: actions/showapplication.php:288
+#: actions/showapplication.php:255
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
@@ -5485,7 +5546,7 @@ msgstr ""
 "Nota: Nós suportamos assinaturas HMAC-SHA1. Nós não suportamos o método de "
 "assinatura em texto plano."
 
-#: actions/showapplication.php:309
+#: actions/showapplication.php:275
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr "Tem certeza que deseja restaurar sua chave e segredo de consumidor?"
 
@@ -5571,61 +5632,47 @@ msgstr "Grupo %s"
 msgid "%1$s group, page %2$d"
 msgstr "Grupo %1$s, pág. %2$d"
 
-#. TRANS: Group profile header (h2). Text hidden by default.
-#: actions/showgroup.php:223
-msgid "Group profile"
-msgstr "Perfil do grupo"
-
-#. TRANS: Label for group URL (dt). Text hidden by default.
-#. TRANS: DT for URL in a profile.
-#: actions/showgroup.php:273 actions/tagother.php:118
-#: actions/userauthorization.php:175 lib/userprofile.php:186
-msgid "URL"
-msgstr "Site"
-
 #. TRANS: Label for group description or group note (dt). Text hidden by default.
-#. TRANS: DT for note in a profile.
-#: actions/showgroup.php:285 actions/tagother.php:128
-#: actions/userauthorization.php:187 lib/userprofile.php:204
+#: actions/showgroup.php:266
 msgid "Note"
 msgstr "Mensagem"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:296 lib/groupeditform.php:180
+#: actions/showgroup.php:277 lib/groupeditform.php:180
 msgid "Aliases"
 msgstr "Apelidos"
 
 #. TRANS: Group actions header (h2). Text hidden by default.
-#: actions/showgroup.php:313
+#: actions/showgroup.php:294
 msgid "Group actions"
 msgstr "Ações do grupo"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:357
+#: actions/showgroup.php:338
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
 msgstr "Fonte de mensagens do grupo %s (RSS 1.0)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:364
+#: actions/showgroup.php:345
 #, php-format
 msgid "Notice feed for %s group (RSS 2.0)"
 msgstr "Fonte de mensagens do grupo %s (RSS 2.0)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:371
+#: actions/showgroup.php:352
 #, php-format
 msgid "Notice feed for %s group (Atom)"
 msgstr "Fonte de mensagens do grupo %s (Atom)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:377
+#: actions/showgroup.php:358
 #, php-format
 msgid "FOAF for %s group"
 msgstr "FOAF para o grupo %s"
 
 #. TRANS: Header for mini list of group members on a group page (h2).
-#: actions/showgroup.php:414
+#: actions/showgroup.php:395
 msgid "Members"
 msgstr "Membros"
 
@@ -5633,25 +5680,30 @@ msgstr "Membros"
 #. TRANS: Text for user subscription statistics if the user has no subscriptions.
 #. TRANS: Text for user subscriber statistics if user has no subscribers.
 #. TRANS: Text for user user group membership statistics if user is not a member of any group.
-#: actions/showgroup.php:420 lib/profileaction.php:137
+#: actions/showgroup.php:401 lib/profileaction.php:137
 #: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
-#: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
+#: lib/subscriptionlist.php:123 lib/tagcloudsection.php:71
 msgid "(None)"
 msgstr "(Nenhum)"
 
 #. TRANS: Link to all group members from mini list of group members if group has more than n members.
-#: actions/showgroup.php:429
+#: actions/showgroup.php:410
 msgid "All members"
 msgstr "Todos os membros"
 
-#. TRANS: Label for creation date in statistics on group page.
-#: actions/showgroup.php:465
+#. TRANS: Header for group statistics on a group page (h2).
+#. TRANS: H2 text for user statistics.
+#: actions/showgroup.php:441 lib/profileaction.php:205
+msgid "Statistics"
+msgstr "Estatísticas"
+
+#: actions/showgroup.php:444
 msgctxt "LABEL"
 msgid "Created"
 msgstr "Criado"
 
 #. TRANS: Label for member count in statistics on group page.
-#: actions/showgroup.php:473
+#: actions/showgroup.php:449
 msgctxt "LABEL"
 msgid "Members"
 msgstr "Membros"
@@ -5660,7 +5712,7 @@ msgstr "Membros"
 #. TRANS: **%s** is the group alias, %%%%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).
-#: actions/showgroup.php:488
+#: actions/showgroup.php:464
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5679,7 +5731,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: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
-#: actions/showgroup.php:498
+#: actions/showgroup.php:474
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5693,7 +5745,7 @@ msgstr ""
 "sobre suas vidas e interesses. "
 
 #. TRANS: Header for list of group administrators on a group page (h2).
-#: actions/showgroup.php:527
+#: actions/showgroup.php:503
 msgid "Admins"
 msgstr "Administradores"
 
@@ -5732,7 +5784,7 @@ msgid "%1$s tagged %2$s"
 msgstr "Mensagens de %1$s etiquetadas como %2$s"
 
 #. TRANS: Page title showing tagged notices in one user's stream.
-#. TRANS: %1$s is the username, %2$s is the hash tag, %1$d is the page number.
+#. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
 #: actions/showstream.php:74
 #, php-format
 msgid "%1$s tagged %2$s, page %3$d"
@@ -5779,7 +5831,7 @@ msgid "FOAF for %s"
 msgstr "FOAF de %s"
 
 #. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
-#: actions/showstream.php:211
+#: actions/showstream.php:205
 #, php-format
 msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr ""
@@ -5787,7 +5839,7 @@ msgstr ""
 "ainda."
 
 #. TRANS: Second sentence of empty list message for a stream for the user themselves.
-#: actions/showstream.php:217
+#: actions/showstream.php:211
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
@@ -5797,7 +5849,7 @@ msgstr ""
 
 #. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:221
+#: actions/showstream.php:215
 #, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
@@ -5808,7 +5860,7 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:264
+#: actions/showstream.php:258
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5824,7 +5876,7 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:271
+#: actions/showstream.php:265
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5836,7 +5888,7 @@ msgstr ""
 "(http://status.net/). "
 
 #. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
-#: actions/showstream.php:328
+#: actions/showstream.php:322
 #, php-format
 msgid "Repeat of %s"
 msgstr "Repetição de %s"
@@ -5984,75 +6036,75 @@ msgstr ""
 #. TRANS: Title for button to save site notice in admin panel.
 #: actions/sitenoticeadminpanel.php:201
 #, fuzzy
-msgid "Save site notice"
+msgid "Save site notice."
 msgstr "Salvar os avisos do site"
 
 #. TRANS: Title for SMS settings.
-#: actions/smssettings.php:57
+#: actions/smssettings.php:56
 msgid "SMS settings"
 msgstr "Configuração do SMS"
 
 #. TRANS: SMS settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/smssettings.php:71
+#: actions/smssettings.php:70
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr "Você pode receber mensagens SMS de %%site.name%% através do e-mail."
 
 #. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
-#: actions/smssettings.php:93
+#: actions/smssettings.php:92
 msgid "SMS is not available."
 msgstr "SMS não está disponível."
 
 #. TRANS: Form legend for SMS settings form.
-#: actions/smssettings.php:107
+#: actions/smssettings.php:106
 msgid "SMS address"
 msgstr "Endereço de SMS"
 
 #. TRANS: Form guide in SMS settings form.
-#: actions/smssettings.php:116
+#: actions/smssettings.php:115
 msgid "Current confirmed SMS-enabled phone number."
 msgstr "Número de telefone já habilitado para receber SMS."
 
 #. TRANS: Form guide in IM settings form.
-#: actions/smssettings.php:129
+#: actions/smssettings.php:128
 msgid "Awaiting confirmation on this phone number."
 msgstr "Aguardando a confirmação deste número de telefone."
 
 #. TRANS: Field label for SMS address input in SMS settings form.
-#: actions/smssettings.php:138
+#: actions/smssettings.php:137
 msgid "Confirmation code"
 msgstr "Código de confirmação"
 
 #. TRANS: Form field instructions in SMS settings form.
-#: actions/smssettings.php:140
+#: actions/smssettings.php:139
 msgid "Enter the code you received on your phone."
 msgstr "Informe o código que você recebeu no seu telefone."
 
 #. TRANS: Button label to confirm SMS confirmation code in SMS settings.
-#: actions/smssettings.php:144
+#: actions/smssettings.php:143
 msgctxt "BUTTON"
 msgid "Confirm"
 msgstr "Confirmar"
 
 #. TRANS: Field label for SMS phone number input in SMS settings form.
-#: actions/smssettings.php:149
+#: actions/smssettings.php:148
 msgid "SMS phone number"
 msgstr "Telefone para SMS"
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
-#: actions/smssettings.php:152
+#: actions/smssettings.php:151
 #, fuzzy
-msgid "Phone number, no punctuation or spaces, with area code"
+msgid "Phone number, no punctuation or spaces, with area code."
 msgstr "Número de telefone, sem pontuação ou espaços, com código de área"
 
 #. TRANS: Form legend for SMS preferences form.
-#: actions/smssettings.php:191
+#: actions/smssettings.php:190
 msgid "SMS preferences"
 msgstr "Preferências do SMS"
 
 #. TRANS: Checkbox label in SMS preferences form.
-#: actions/smssettings.php:197
+#: actions/smssettings.php:196
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
@@ -6061,32 +6113,32 @@ msgstr ""
 "exorbitantes da minha operadora."
 
 #. TRANS: Confirmation message for successful SMS preferences save.
-#: actions/smssettings.php:308
+#: actions/smssettings.php:307
 msgid "SMS preferences saved."
 msgstr "As preferências do SMS foram salvas."
 
 #. TRANS: Message given saving SMS phone number without having provided one.
-#: actions/smssettings.php:330
+#: actions/smssettings.php:329
 msgid "No phone number."
 msgstr "Nenhum número de telefone."
 
 #. TRANS: Message given saving SMS phone number without having selected a carrier.
-#: actions/smssettings.php:336
+#: actions/smssettings.php:335
 msgid "No carrier selected."
 msgstr "Não foi selecionada nenhuma operadora."
 
 #. TRANS: Message given saving SMS phone number that is already set.
-#: actions/smssettings.php:344
+#: actions/smssettings.php:343
 msgid "That is already your phone number."
 msgstr "Esse já é seu número de telefone."
 
 #. TRANS: Message given saving SMS phone number that is already set for another user.
-#: actions/smssettings.php:348
+#: actions/smssettings.php:347
 msgid "That phone number already belongs to another user."
 msgstr "Esse número de telefone já pertence à outro usuário."
 
 #. TRANS: Message given saving valid SMS phone number that is to be confirmed.
-#: actions/smssettings.php:376
+#: actions/smssettings.php:375
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
 "for the code and instructions on how to use it."
@@ -6095,39 +6147,39 @@ msgstr ""
 "informou. Verifique no seu telefone o código e instruções sobre como usá-lo."
 
 #. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
-#: actions/smssettings.php:404
+#: actions/smssettings.php:403
 msgid "That is the wrong confirmation number."
 msgstr "Isso é um número de confirmação errado."
 
 #. TRANS: Message given after successfully canceling SMS phone number confirmation.
-#: actions/smssettings.php:418
+#: actions/smssettings.php:417
 msgid "SMS confirmation cancelled."
 msgstr "A confirmação do SMS foi cancelada."
 
 #. TRANS: Message given trying to remove an SMS phone number that is not
 #. TRANS: registered for the active user.
-#: actions/smssettings.php:438
+#: actions/smssettings.php:437
 msgid "That is not your phone number."
 msgstr "Esse não é seu número de telefone."
 
 #. TRANS: Message given after successfully removing a registered SMS phone number.
-#: actions/smssettings.php:460
+#: actions/smssettings.php:459
 msgid "The SMS phone number was removed."
 msgstr "O número de telefone para SMS foi removido."
 
 #. TRANS: Label for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:499
+#: actions/smssettings.php:498
 msgid "Mobile carrier"
 msgstr "Operadora de celular"
 
 #. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:504
+#: actions/smssettings.php:503
 msgid "Select a carrier"
 msgstr "Selecione uma operadora"
 
 #. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
 #. TRANS: %s is an administrative contact's e-mail address.
-#: actions/smssettings.php:513
+#: actions/smssettings.php:512
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -6137,7 +6189,7 @@ msgstr ""
 "e-mail que não está listada aqui, informe-nos enviando uma mensagem para %s."
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
-#: actions/smssettings.php:535
+#: actions/smssettings.php:534
 #, fuzzy
 msgid "No code entered."
 msgstr "Não foi digitado nenhum código"
@@ -6211,15 +6263,13 @@ msgstr "Você não está assinando esse perfil."
 msgid "Could not save subscription."
 msgstr "Não foi possível salvar a assinatura."
 
-#: actions/subscribe.php:77
-msgid "This action only accepts POST requests."
-msgstr "Esta ação aceita somente requisições POST."
-
-#: actions/subscribe.php:117
+#. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
+#: actions/subscribe.php:121
 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
 msgstr "Não é possível assinar um perfil OMB 0.1 remoto com essa ação."
 
-#: actions/subscribe.php:145
+#. TRANS: Page title when subscription succeeded.
+#: actions/subscribe.php:149
 msgid "Subscribed"
 msgstr "Assinado"
 
@@ -6336,31 +6386,34 @@ msgid "Subscription feed for %s (Atom)"
 msgstr "Fonte de mensagens de %s (Atom)"
 
 #. TRANS: Checkbox label for enabling Jabber messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:239
-msgid "Jabber"
-msgstr "Jabber"
+#: actions/subscriptions.php:241 lib/settingsnav.php:110
+#, fuzzy
+msgid "IM"
+msgstr "MI"
 
 #. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:254
+#: actions/subscriptions.php:256 lib/settingsnav.php:117
 msgid "SMS"
 msgstr "SMS"
 
-#: actions/tag.php:69
+#. TRANS: Title for all but the first page of notices with tags.
+#. TRANS: %1$s is the tag, %2$d is the page number.
+#: actions/tag.php:73
 #, php-format
 msgid "Notices tagged with %1$s, page %2$d"
 msgstr "Mensagens etiquetadas com %1$s, pág. %2$d"
 
-#: actions/tag.php:87
+#: actions/tag.php:91
 #, php-format
 msgid "Notice feed for tag %s (RSS 1.0)"
 msgstr "Fonte de mensagens de %s (RSS 1.0)"
 
-#: actions/tag.php:93
+#: actions/tag.php:97
 #, php-format
 msgid "Notice feed for tag %s (RSS 2.0)"
 msgstr "Fonte de mensagens de %s (RSS 2.0)"
 
-#: actions/tag.php:99
+#: actions/tag.php:103
 #, php-format
 msgid "Notice feed for tag %s (Atom)"
 msgstr "Fonte de mensagens de %s (Atom)"
@@ -6379,17 +6432,11 @@ msgstr "Etiqueta %s"
 msgid "User profile"
 msgstr "Perfil do usuário"
 
-#. TRANS: DT element in area for user avatar.
-#: actions/tagother.php:81 actions/userauthorization.php:132
-#: lib/userprofile.php:108
-msgid "Photo"
-msgstr "Imagem"
-
-#: actions/tagother.php:141
+#: actions/tagother.php:120
 msgid "Tag user"
 msgstr "Etiquetar o usuário"
 
-#: actions/tagother.php:151
+#: actions/tagother.php:130
 msgid ""
 "Tags for this user (letters, numbers, -, ., and _), comma- or space- "
 "separated"
@@ -6397,12 +6444,17 @@ msgstr ""
 "Etiquetas para este usuário (letras, números, -, ., e _), separadas por "
 "vírgulas ou espaços"
 
-#: actions/tagother.php:193
+#: actions/tagother.php:157
+#, php-format
+msgid "Invalid tag: \"%s\""
+msgstr "Etiqueta inválida: \"%s\""
+
+#: actions/tagother.php:172
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr "Você só pode etiquetar pessoas às quais assina ou que assinam você."
 
-#: actions/tagother.php:236
+#: actions/tagother.php:215
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
 "Use esse formulário para adicionar etiquetas aos seus assinantes ou "
@@ -6412,6 +6464,7 @@ msgstr ""
 msgid "No such tag."
 msgstr "Esta etiqueta não existe."
 
+#. TRANS: Client error displayed when trying to unblock a non-blocked user.
 #: actions/unblock.php:59
 msgid "You haven't blocked that user."
 msgstr "Você não bloqueou esse usuário."
@@ -6432,7 +6485,7 @@ msgstr "A requisição não possui nenhuma ID de perfil."
 msgid "Unsubscribed"
 msgstr "Cancelado"
 
-#: actions/updateprofile.php:64 actions/userauthorization.php:337
+#: actions/updateprofile.php:64
 #, php-format
 msgid ""
 "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
@@ -6440,6 +6493,77 @@ msgstr ""
 "A licença '%1$s' do fluxo do usuário não é compatível com a licença '%2$s' "
 "do site."
 
+#: actions/urlsettings.php:60
+#, fuzzy
+msgid "URL settings"
+msgstr "Configurações do MI"
+
+#. TRANS: Instructions for tab "Other" in user profile settings.
+#: actions/urlsettings.php:72
+msgid "Manage various other options."
+msgstr "Gerencia várias outras opções."
+
+#. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
+#. TRANS: user's profile settings. This message has one space at the beginning. Use your
+#. TRANS: language's word separator here if it has one (most likely a single space).
+#: actions/urlsettings.php:115
+msgid " (free service)"
+msgstr " (serviço livre)"
+
+#: actions/urlsettings.php:121
+#, fuzzy
+msgid "[none]"
+msgstr "Nenhuma"
+
+#: actions/urlsettings.php:122
+msgid "[internal]"
+msgstr ""
+
+#. TRANS: Label for dropdown with URL shortener services.
+#: actions/urlsettings.php:130
+msgid "Shorten URLs with"
+msgstr "Encolher URLs com"
+
+#. TRANS: Tooltip for for dropdown with URL shortener services.
+#: actions/urlsettings.php:132
+msgid "Automatic shortening service to use."
+msgstr "Serviço de encolhimento automático a ser utilizado."
+
+#: actions/urlsettings.php:138
+msgid "URL longer than"
+msgstr ""
+
+#: actions/urlsettings.php:141
+msgid "URLs longer than this will be shortened, 0 means always shorten."
+msgstr ""
+
+#: actions/urlsettings.php:145
+msgid "Text longer than"
+msgstr ""
+
+#: actions/urlsettings.php:148
+msgid ""
+"URLs in notices longer than this will be shortened, 0 means always shorten."
+msgstr ""
+
+#. TRANS: Form validation error for form "Other settings" in user profile.
+#: actions/urlsettings.php:180
+msgid "URL shortening service is too long (maximum 50 characters)."
+msgstr "O serviço de encolhimento de URL é muito extenso (máx. 50 caracteres)."
+
+#: actions/urlsettings.php:187
+msgid "Invalid number for max url length."
+msgstr ""
+
+#: actions/urlsettings.php:193
+#, fuzzy
+msgid "Invalid number for max notice length."
+msgstr "O conteúdo da mensagem é inválido."
+
+#: actions/urlsettings.php:238
+msgid "Error saving user URL shortening preferences."
+msgstr ""
+
 #. TRANS: User admin panel title
 #: actions/useradminpanel.php:58
 msgctxt "TITLE"
@@ -6466,11 +6590,11 @@ msgstr ""
 #. TRANS: users in user admin panel. %1$s is the invalid nickname.
 #: actions/useradminpanel.php:166
 #, fuzzy, php-format
-msgid "Invalid default subscripton: '%1$s' is not a user."
+msgid "Invalid default subscripton: \"%1$s\" is not a user."
 msgstr "Assinatura padrão inválida: '%1$s' não é um usuário."
 
-#. TRANS: Link description in user account settings menu.
-#: actions/useradminpanel.php:215 lib/accountsettingsaction.php:106
+#: actions/useradminpanel.php:215 lib/action.php:565 lib/settingsnav.php:77
+#: lib/subgroupnav.php:81
 msgid "Profile"
 msgstr "Perfil"
 
@@ -6527,59 +6651,63 @@ msgstr "Define se os usuários podem ou não convidar novos usuários."
 #. TRANS: Title for button to save user settings in user admin panel.
 #: actions/useradminpanel.php:302
 #, fuzzy
-msgid "Save user settings"
+msgid "Save user settings."
 msgstr "Salvar as configurações de usuário"
 
-#: actions/userauthorization.php:105
+#. TRANS: Page title.
+#: actions/userauthorization.php:109
 msgid "Authorize subscription"
 msgstr "Autorizar a assinatura"
 
-#: actions/userauthorization.php:110
+#. TRANS: Page notice on "Auhtorize subscription" page.
+#: actions/userauthorization.php:115
 #, fuzzy
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
 "user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
-"click “Reject”."
+"click \"Reject\"."
 msgstr ""
 "Por favor, verifique estes detalhes para ter certeza que você quer assinar "
 "as mensagens deste usuário. Se você não solicitou assinar as mensagens de "
 "alguém, clique em \"Recusar\"."
 
-#. TRANS: Menu item for site administration
-#: actions/userauthorization.php:196 actions/version.php:167
-#: lib/adminpanelaction.php:403
-msgid "License"
-msgstr "Licença"
-
-#: actions/userauthorization.php:217
+#. TRANS: Button text on Authorise Subscription page.
+#: actions/userauthorization.php:200
 #, fuzzy
+msgctxt "BUTTON"
 msgid "Accept"
 msgstr "Aceitar"
 
-#: actions/userauthorization.php:218 lib/subscribeform.php:115
-#: lib/subscribeform.php:139
-msgid "Subscribe to this user"
+#. TRANS: Title for button on Authorise Subscription page.
+#: actions/userauthorization.php:202
+#, fuzzy
+msgid "Subscribe to this user."
 msgstr "Assinar este usuário"
 
-#: actions/userauthorization.php:219
+#. TRANS: Button text on Authorise Subscription page.
+#: actions/userauthorization.php:204
 #, fuzzy
+msgctxt "BUTTON"
 msgid "Reject"
 msgstr "Recusar"
 
-#: actions/userauthorization.php:220
+#. TRANS: Title for button on Authorise Subscription page.
+#: actions/userauthorization.php:206
 #, fuzzy
-msgid "Reject this subscription"
+msgid "Reject this subscription."
 msgstr "Recusar esta assinatura"
 
-#: actions/userauthorization.php:232
+#. TRANS: Client error displayed for an empty authorisation request.
+#: actions/userauthorization.php:219
 msgid "No authorization request!"
 msgstr "Nenhum pedido de autorização!"
 
-#: actions/userauthorization.php:254
+#. TRANS: Accept message header from Authorise subscription page.
+#: actions/userauthorization.php:242
 msgid "Subscription authorized"
 msgstr "A assinatura foi autorizada"
 
-#: actions/userauthorization.php:256
+#: actions/userauthorization.php:245
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to authorize the "
@@ -6589,11 +6717,12 @@ msgstr ""
 "Verifique as instruções do site para detalhes sobre como autorizar a "
 "assinatura. Seu token de assinatura é:"
 
-#: actions/userauthorization.php:266
+#. TRANS: Reject message header from Authorise subscription page.
+#: actions/userauthorization.php:256
 msgid "Subscription rejected"
 msgstr "A assinatura foi recusada"
 
-#: actions/userauthorization.php:268
+#: actions/userauthorization.php:259
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to fully reject the "
@@ -6603,48 +6732,73 @@ msgstr ""
 "Verifique as instruções do site para detalhes sobre como rejeitar "
 "completamente a assinatura."
 
-#: actions/userauthorization.php:303
+#. TRANS: Exception thrown when no valid user is found for an authorisation request.
+#. TRANS: %s is a listener URI.
+#: actions/userauthorization.php:296
 #, fuzzy, php-format
-msgid "Listener URI ‘%s’ not found here."
+msgid "Listener URI \"%s\" not found here."
 msgstr "A URI ‘%s’ do usuário não foi encontrada aqui."
 
-#: actions/userauthorization.php:308
+#. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
+#. TRANS: %s is a listenee URI.
+#: actions/userauthorization.php:303
 #, fuzzy, php-format
-msgid "Listenee URI ‘%s’ is too long."
+msgid "Listenee URI \"%s\" is too long."
 msgstr "A URI ‘%s’ do usuário é muito extensa."
 
-#: actions/userauthorization.php:314
+#. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
+#. TRANS: %s is a listenee URI.
+#: actions/userauthorization.php:311
 #, fuzzy, php-format
-msgid "Listenee URI ‘%s’ is a local user."
+msgid "Listenee URI \"%s\" is a local user."
 msgstr "A URI ‘%s’ é de um usuário local."
 
+#. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
+#. TRANS: %s is a profile URL.
 #: actions/userauthorization.php:329
 #, fuzzy, php-format
-msgid "Profile URL ‘%s’ is for a local user."
+msgid "Profile URL \"%s\" is for a local user."
 msgstr "A URL ‘%s’ do perfil é de um usuário local."
 
-#: actions/userauthorization.php:345
+#. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
+#. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
+#: actions/userauthorization.php:339
 #, fuzzy, php-format
-msgid "Avatar URL ‘%s’ is not valid."
+msgid ""
+"Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
+"\"."
+msgstr ""
+"A licença '%1$s' do fluxo do usuário não é compatível com a licença '%2$s' "
+"do site."
+
+#. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
+#. TRANS: %s is an avatar URL.
+#: actions/userauthorization.php:349
+#, fuzzy, php-format
+msgid "Avatar URL \"%s\" is not valid."
 msgstr "A URL ‘%s’ do avatar não é válida."
 
-#: actions/userauthorization.php:350
+#. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
+#. TRANS: %s is an avatar URL.
+#: actions/userauthorization.php:356
 #, fuzzy, php-format
-msgid "Can’t read avatar URL ‘%s’."
+msgid "Cannot read avatar URL \"%s\"."
 msgstr "Não é possível ler a URL '%s' do avatar."
 
-#: actions/userauthorization.php:355
+#. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
+#. TRANS: %s is an avatar URL.
+#: actions/userauthorization.php:363
 #, fuzzy, php-format
-msgid "Wrong image type for avatar URL ‘%s’."
+msgid "Wrong image type for avatar URL \"%s\"."
 msgstr "Tipo de imagem errado para a URL '%s' do avatar."
 
 #. TRANS: Page title for profile design page.
-#: actions/userdesignsettings.php:74 lib/designsettings.php:63
+#: actions/userdesignsettings.php:74 lib/designsettings.php:61
 msgid "Profile design"
 msgstr "Aparência do perfil"
 
 #. TRANS: Instructions for profile design page.
-#: actions/userdesignsettings.php:84 lib/designsettings.php:74
+#: actions/userdesignsettings.php:84 lib/designsettings.php:72
 msgid ""
 "Customize the way your profile looks with a background image and a colour "
 "palette of your choice."
@@ -6652,10 +6806,28 @@ msgstr ""
 "Personalize a aparência do seu perfil, com uma imagem de fundo e uma paleta "
 "de cores da sua preferência."
 
-#: actions/userdesignsettings.php:272
+#: actions/userdesignsettings.php:289
 msgid "Enjoy your hotdog!"
 msgstr "Aproveite o seu cachorro-quente!"
 
+#: actions/userdesignsettings.php:325
+#, fuzzy
+msgid "Design settings"
+msgstr "Salvar as configurações do site"
+
+#: actions/userdesignsettings.php:340
+msgid "View profile designs"
+msgstr "Visualizar aparências do perfil"
+
+#: actions/userdesignsettings.php:341
+msgid "Show or hide profile designs."
+msgstr "Exibir ou esconder as aparências do perfil."
+
+#: actions/userdesignsettings.php:348
+#, fuzzy
+msgid "Background file"
+msgstr "Fundo"
+
 #. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number.
 #: actions/usergroups.php:66
 #, php-format
@@ -6707,6 +6879,11 @@ msgstr ""
 msgid "Contributors"
 msgstr "Colaboradores"
 
+#. TRANS: Menu item for site administration
+#: actions/version.php:167 lib/adminpanelaction.php:403
+msgid "License"
+msgstr "Licença"
+
 #: actions/version.php:170
 msgid ""
 "StatusNet is free software: you can redistribute it and/or modify it under "
@@ -6740,12 +6917,13 @@ msgstr ""
 "Você deve ter recebido uma cópia da GNU Affero General Public License com "
 "este programa. Caso contrário, veja %s."
 
-#: actions/version.php:191
-msgid "Plugins"
-msgstr "Plugins"
+#. TRANS: Form input field label for application name.
+#: actions/version.php:197 lib/applicationeditform.php:190
+msgid "Name"
+msgstr "Nome"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:901
+#: actions/version.php:198 lib/action.php:885
 msgid "Version"
 msgstr "Versão"
 
@@ -6753,6 +6931,12 @@ msgstr "Versão"
 msgid "Author(s)"
 msgstr "Autor(es)"
 
+#. TRANS: Form input field label.
+#: actions/version.php:200 lib/applicationeditform.php:208
+#: lib/groupeditform.php:168
+msgid "Description"
+msgstr "Descrição"
+
 #. TRANS: Activity title when marking a notice as favorite.
 #: classes/Fave.php:164
 msgid "Favor"
@@ -6871,7 +7055,7 @@ msgid "Could not create login token for %s"
 msgstr "Não foi possível criar o token de autenticação para %s"
 
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
-#: classes/Memcached_DataObject.php:542
+#: classes/Memcached_DataObject.php:556
 msgid "No database name or DSN found anywhere."
 msgstr "Não foi encontrado nenhum nome de base de dados ou DSN."
 
@@ -7048,18 +7232,18 @@ msgstr "%1$s agora está acompanhando suas mensagens no %2$s."
 
 #. TRANS: Notice given on user registration.
 #. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:395
+#: classes/User.php:390
 #, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr "Bem vindo(a) a %1$s, @%2$s!"
 
 #. TRANS: Server exception.
-#: classes/User.php:918
+#: classes/User.php:923
 msgid "No single user defined for single-user mode."
 msgstr "Nenhum usuário definido para o modo de usuário único."
 
 #. TRANS: Server exception.
-#: classes/User.php:922
+#: classes/User.php:927
 msgid "Single-user mode code called when not enabled."
 msgstr ""
 
@@ -7104,41 +7288,6 @@ msgstr ""
 msgid "No AtomPub API service for %s."
 msgstr ""
 
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:104
-msgid "Change your profile settings"
-msgstr "Alterar as suas configurações de perfil"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:111
-msgid "Upload an avatar"
-msgstr "Enviar um avatar"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:118
-msgid "Change your password"
-msgstr "Alterar a sua senha"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:125
-msgid "Change email handling"
-msgstr "Configurações de uso do e-mail"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:132
-msgid "Design your profile"
-msgstr "Mude a aparência do seu perfil"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:139
-msgid "Other options"
-msgstr "Outras opções"
-
-#. TRANS: Link description in user account settings menu.
-#: lib/accountsettingsaction.php:141
-msgid "Other"
-msgstr "Outras"
-
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
 #: lib/action.php:161
 #, php-format
@@ -7156,206 +7305,128 @@ msgctxt "TOOLTIP"
 msgid "Show more"
 msgstr ""
 
-#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:544
-msgid "Primary site navigation"
-msgstr "Navegação primária no site"
+#. TRANS: Inline reply form submit button: submits a reply comment.
+#: lib/action.php:328
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Comment"
+msgstr "Conteúdo"
 
-#. TRANS: Tooltip for main menu option "Personal".
-#: lib/action.php:550
-msgctxt "TOOLTIP"
-msgid "Personal profile and friends timeline"
-msgstr "Perfil pessoal e fluxo de mensagens dos amigos"
+#. TRANS: Placeholder text for inline reply form. Clicking in this box will turn it into a mini notice form.
+#: lib/action.php:331
+msgid "Add a comment..."
+msgstr ""
 
-#. TRANS: Main menu option when logged in for access to personal profile and friends timeline.
-#. TRANS: Personal group navigation menu option when logged in for viewing timeline of self and friends.
-#: lib/action.php:553 lib/personalgroupnav.php:100
-msgctxt "MENU"
-msgid "Personal"
-msgstr "Pessoal"
+#: lib/action.php:559 lib/personalgroupnav.php:99
+#, fuzzy
+msgid "Home"
+msgstr "Site"
 
-#. TRANS: Tooltip for main menu option "Account".
-#: lib/action.php:555
-msgctxt "TOOLTIP"
-msgid "Change your email, avatar, password, profile"
-msgstr "Altere seu e-mail, avatar, senha, perfil"
-
-#. TRANS: Main menu option when logged in for access to user settings.
-#: lib/action.php:558
-msgid "Account"
-msgstr "Conta"
-
-#. TRANS: Tooltip for main menu option "Services".
 #: lib/action.php:560
-msgctxt "TOOLTIP"
-msgid "Connect to services"
-msgstr "Conecte-se a outros serviços"
+#, fuzzy
+msgid "Friends timeline"
+msgstr "Mensagens de %s"
 
-#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services.
-#: lib/action.php:563
-msgid "Connect"
-msgstr "Conectar"
-
-#. TRANS: Tooltip for menu option "Admin".
 #: lib/action.php:566
-msgctxt "TOOLTIP"
-msgid "Change site configuration"
-msgstr "Altere as configurações do site"
+#, fuzzy
+msgid "Your profile"
+msgstr "Perfil do grupo"
 
-#. TRANS: Main menu option when logged in and site admin for access to site configuration.
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/action.php:569 lib/groupnav.php:117
-msgctxt "MENU"
-msgid "Admin"
-msgstr "Administrar"
+#: lib/action.php:570 lib/action.php:593 lib/publicgroupnav.php:78
+msgid "Public"
+msgstr "Público"
 
-#. TRANS: Tooltip for main menu option "Invite".
-#: lib/action.php:573
-#, php-format
-msgctxt "TOOLTIP"
-msgid "Invite friends and colleagues to join you on %s"
-msgstr "Convide seus amigos e colegas para unir-se a você no %s"
+#: lib/action.php:571 lib/action.php:594
+#, fuzzy
+msgid "Everyone on this site"
+msgstr "Encontre pessoas neste site"
+
+#: lib/action.php:575
+#, fuzzy
+msgid "Settings"
+msgstr "Configuração do SMS"
 
-#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users.
 #: lib/action.php:576
-msgctxt "MENU"
-msgid "Invite"
-msgstr "Convidar"
+#, fuzzy
+msgid "Change your personal settings"
+msgstr "Alterar as suas configurações de perfil"
 
-#. TRANS: Tooltip for main menu option "Logout"
 #: lib/action.php:582
-msgctxt "TOOLTIP"
-msgid "Logout from the site"
-msgstr "Sair do site"
+#, fuzzy
+msgid "Site configuration"
+msgstr "Configuração do usuário"
 
-#. TRANS: Main menu option when logged in to log out the current user.
-#: lib/action.php:585
-msgctxt "MENU"
+#: lib/action.php:587
+#, fuzzy
 msgid "Logout"
 msgstr "Sair"
 
-#. TRANS: Tooltip for main menu option "Register".
-#: lib/action.php:590
-msgctxt "TOOLTIP"
-msgid "Create an account"
-msgstr "Criar uma conta"
+#: lib/action.php:588
+#, fuzzy
+msgid "Logout from the site"
+msgstr "Sair do site"
 
-#. TRANS: Main menu option when not logged in to register a new account.
-#. TRANS: Menu item for registering with the StatusNet site.
-#: lib/action.php:593 lib/logingroupnav.php:85
-msgctxt "MENU"
-msgid "Register"
-msgstr "Registrar-se"
-
-#. TRANS: Tooltip for main menu option "Login".
-#: lib/action.php:596
-msgctxt "TOOLTIP"
+#: lib/action.php:599
+#, fuzzy
 msgid "Login to the site"
 msgstr "Autentique-se no site"
 
-#. TRANS: Main menu option when not logged in to log in.
-#. TRANS: Menu item for logging in to the StatusNet site.
-#: lib/action.php:599 lib/logingroupnav.php:77
-msgctxt "MENU"
-msgid "Login"
-msgstr "Entrar"
-
-#. TRANS: Tooltip for main menu option "Help".
-#: lib/action.php:602
-msgctxt "TOOLTIP"
-msgid "Help me!"
-msgstr "Ajudem-me!"
-
-#. TRANS: Main menu option for help on the StatusNet site.
-#: lib/action.php:605
-msgctxt "MENU"
-msgid "Help"
-msgstr "Ajuda"
-
-#. TRANS: Tooltip for main menu option "Search".
-#: lib/action.php:608
-msgctxt "TOOLTIP"
-msgid "Search for people or text"
-msgstr "Procure por pessoas ou textos"
-
-#. TRANS: Main menu option when logged in or when the StatusNet instance is not private.
-#: lib/action.php:611
-msgctxt "MENU"
+#: lib/action.php:606
+#, fuzzy
 msgid "Search"
 msgstr "Pesquisar"
 
-#. TRANS: DT element for site notice. String is hidden in default CSS.
-#. TRANS: Menu item for site administration
-#: lib/action.php:633 lib/adminpanelaction.php:387
-msgid "Site notice"
-msgstr "Avisos do site"
-
-#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:700
-msgid "Local views"
-msgstr "Visualizações locais"
-
-#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:770
-msgid "Page notice"
-msgstr "Notícia da página"
-
-#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:874
-msgid "Secondary site navigation"
-msgstr "Navegação secundária no site"
+#: lib/action.php:607
+#, fuzzy
+msgid "Search the site"
+msgstr "Procurar no site"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:880
+#: lib/action.php:864
 msgid "Help"
 msgstr "Ajuda"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:883
+#: lib/action.php:867
 msgid "About"
 msgstr "Sobre"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:886
+#: lib/action.php:870
 msgid "FAQ"
 msgstr "FAQ"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:891
+#: lib/action.php:875
 msgid "TOS"
 msgstr "Termos de uso"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:895
+#: lib/action.php:879
 msgid "Privacy"
 msgstr "Privacidade"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:898
+#: lib/action.php:882
 msgid "Source"
 msgstr "Fonte"
 
 #. TRANS: Secondary navigation menu option leading to e-mail contact information on the
 #. TRANS: StatusNet site, where to report bugs, ...
-#: lib/action.php:905
+#: lib/action.php:889
 msgid "Contact"
 msgstr "Contato"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:908
+#: lib/action.php:892
 msgid "Badge"
 msgstr "Mini-aplicativo"
 
-#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:937
-msgid "StatusNet software license"
-msgstr "Licença do software StatusNet"
-
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:944
+#: lib/action.php:921
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7365,7 +7436,7 @@ msgstr ""
 "broughtby%%](%%site.broughtbyurl%%). "
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:947
+#: lib/action.php:924
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** é um serviço de microblog."
@@ -7374,7 +7445,7 @@ msgstr "**%%site.name%%** é um serviço de microblog."
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:954
+#: lib/action.php:931
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7385,27 +7456,22 @@ msgstr ""
 "versão %s, disponível sob a [GNU Affero General Public License](http://www."
 "fsf.org/licensing/licenses/agpl-3.0.html)."
 
-#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:970
-msgid "Site content license"
-msgstr "Licença do conteúdo do site"
-
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:977
+#: lib/action.php:949
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr "O conteúdo e os dados de %1$s são privados e confidenciais."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:984
+#: lib/action.php:956
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr "Conteúdo e dados licenciados sob %1$s. Todos os direitos reservados."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:988
+#: lib/action.php:960
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 "Conteúdo e dados licenciados pelos colaboradores. Todos os direitos "
@@ -7413,25 +7479,20 @@ msgstr ""
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:1020
+#: lib/action.php:992
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr "Todo o conteúdo e dados de %1$s estão disponíveis sob a licença %2$s."
 
-#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1356
-msgid "Pagination"
-msgstr "Paginação"
-
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1367
+#: lib/action.php:1335
 msgid "After"
 msgstr "Próximo"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1377
+#: lib/action.php:1345
 msgid "Before"
 msgstr "Anterior"
 
@@ -7587,7 +7648,7 @@ msgid "User configuration"
 msgstr "Configuração do usuário"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:122
+#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:110
 msgid "User"
 msgstr "Usuário"
 
@@ -7611,6 +7672,11 @@ msgstr "Configuração das sessões"
 msgid "Edit site notice"
 msgstr "Editar os avisos do site"
 
+#. TRANS: Menu item for site administration
+#: lib/adminpanelaction.php:387
+msgid "Site notice"
+msgstr "Avisos do site"
+
 #. TRANS: Menu item title/tooltip
 #: lib/adminpanelaction.php:393
 msgid "Snapshots configuration"
@@ -7621,6 +7687,12 @@ msgstr "Configurações das estatísticas"
 msgid "Set site license"
 msgstr ""
 
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:409
+#, fuzzy
+msgid "Plugins configuration"
+msgstr "Configuração dos caminhos"
+
 #. TRANS: Client error 401.
 #: lib/apiauth.php:111
 msgid "API resource requires read-write access, but you only have read access."
@@ -7633,19 +7705,23 @@ msgstr ""
 msgid "No application for that consumer key."
 msgstr "Não foi encontrado nenhuma aplicação para essa chave de consumidor."
 
+#: lib/apiauth.php:202 lib/apiauth.php:284
+msgid "Not allowed to use API."
+msgstr ""
+
 #. TRANS: OAuth exception given when an incorrect access token was given for a user.
-#: lib/apiauth.php:219
+#: lib/apiauth.php:225
 msgid "Bad access token."
 msgstr "Token de acesso incorreto."
 
 #. TRANS: OAuth exception given when no user was found for a given token (no token was found).
-#: lib/apiauth.php:224
+#: lib/apiauth.php:230
 msgid "No user for that token."
 msgstr "Nenhum usuário para esse código."
 
 #. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel".
 #. TRANS: Client error thrown when authentication fails.
-#: lib/apiauth.php:266 lib/apiauth.php:293
+#: lib/apiauth.php:272 lib/apiauth.php:302
 msgid "Could not authenticate you."
 msgstr "Não foi possível autenticá-lo."
 
@@ -7694,6 +7770,11 @@ msgstr "Tentou revogar um código desconhecido."
 msgid "Failed to delete revoked token."
 msgstr "Falha ao eliminar código revogado."
 
+#. TRANS: Form input field label for application icon.
+#: lib/applicationeditform.php:177
+msgid "Icon"
+msgstr "Ícone"
+
 #. TRANS: Form guide.
 #: lib/applicationeditform.php:182
 msgid "Icon for this application"
@@ -7728,6 +7809,11 @@ msgstr "URL da fonte"
 msgid "Organization responsible for this application"
 msgstr "Organização responsável por esta aplicação"
 
+#. TRANS: Form input field label.
+#: lib/applicationeditform.php:227
+msgid "Organization"
+msgstr "Organização"
+
 #. TRANS: Form input field instructions.
 #: lib/applicationeditform.php:234
 msgid "URL for the homepage of the organization"
@@ -7817,16 +7903,6 @@ msgstr ""
 msgid "Do not use this method!"
 msgstr "Não excluir este grupo"
 
-#. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:293
-msgid "Author"
-msgstr "Autor"
-
-#. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:307
-msgid "Provider"
-msgstr "Operadora"
-
 #. TRANS: Title.
 #: lib/attachmentnoticesection.php:67
 msgid "Notices where this attachment appears"
@@ -7854,24 +7930,29 @@ msgstr "Não é permitido alterar a senha"
 msgid "Block"
 msgstr "Bloquear"
 
+#. TRANS: Description of the form to block a user.
+#: lib/blockform.php:79
+msgid "Block this user"
+msgstr "Bloquear este usuário"
+
 #. TRANS: Title for command results.
-#: lib/channel.php:160 lib/channel.php:181
+#: lib/channel.php:104 lib/channel.php:125
 msgid "Command results"
 msgstr "Resultados do comando"
 
 #. TRANS: Title for command results.
-#: lib/channel.php:194
+#: lib/channel.php:138
 #, fuzzy
 msgid "AJAX error"
 msgstr "Erro no Ajax"
 
 #. TRANS: E-mail subject when a command has completed.
-#: lib/channel.php:233 lib/mailhandler.php:143
+#: lib/channel.php:177 lib/mailhandler.php:143
 msgid "Command complete"
 msgstr "O comando foi completado"
 
 #. TRANS: E-mail subject when a command has failed.
-#: lib/channel.php:244
+#: lib/channel.php:188
 msgid "Command failed"
 msgstr "O comando falhou"
 
@@ -7975,7 +8056,7 @@ msgstr "Nome completo: %s"
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a location.
-#: lib/command.php:446 lib/mail.php:270
+#: lib/command.php:446 lib/mail.php:275
 #, php-format
 msgid "Location: %s"
 msgstr "Localização: %s"
@@ -7983,7 +8064,7 @@ msgstr "Localização: %s"
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a homepage.
-#: lib/command.php:450 lib/mail.php:274
+#: lib/command.php:450 lib/mail.php:279
 #, php-format
 msgid "Homepage: %s"
 msgstr "Site: %s"
@@ -8260,114 +8341,104 @@ msgstr ""
 "tracking -  não implementado ainda\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:162
+#: lib/common.php:36
 #, fuzzy
 msgid "No configuration file found."
 msgstr "Não foi encontrado nenhum arquivo de configuração. "
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:165
+#: lib/common.php:39
 #, fuzzy
 msgid "I looked for configuration files in the following places:"
 msgstr "Eu procurei pelos arquivos de configuração nos seguintes lugares: "
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:168
+#: lib/common.php:42
 msgid "You may wish to run the installer to fix this."
 msgstr "Você pode querer executar o instalador para corrigir isto."
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:172
+#: lib/common.php:46
 msgid "Go to the installer."
 msgstr "Ir para o instalador."
 
-#. TRANS: Menu item for Instant Messaging settings.
-#: lib/connectsettingsaction.php:106
-#, fuzzy
-msgctxt "MENU"
-msgid "IM"
-msgstr "MI"
-
-#. TRANS: Tooltip for Instant Messaging menu item.
-#: lib/connectsettingsaction.php:108
-msgid "Updates by instant messenger (IM)"
-msgstr "Atualizações via mensageiro instantâneo (MI)"
-
-#. TRANS: Menu item for Short Message Service settings.
-#: lib/connectsettingsaction.php:113
-#, fuzzy
-msgctxt "MENU"
-msgid "SMS"
-msgstr "SMS"
-
-#. TRANS: Tooltip for Short Message Service menu item.
-#: lib/connectsettingsaction.php:115
-msgid "Updates by SMS"
-msgstr "Atualizações via SMS"
-
-#. TRANS: Menu item for OuAth connection settings.
-#: lib/connectsettingsaction.php:120
-#, fuzzy
-msgctxt "MENU"
-msgid "Connections"
-msgstr "Conexões"
-
-#. TRANS: Tooltip for connected applications (Connections through OAuth) menu item.
-#: lib/connectsettingsaction.php:122
-msgid "Authorized connected applications"
-msgstr "Aplicações autorizadas conectadas"
-
 #: lib/dberroraction.php:59
 msgid "Database error"
 msgstr "Erro no banco de dados"
 
+#. TRANS: Description of form for deleting a user.
+#: lib/deleteuserform.php:75
+msgid "Delete this user"
+msgstr "Excluir este usuário"
+
+#: lib/designform.php:114
+#, fuzzy
+msgid "Change design"
+msgstr "Salvar a aparência"
+
+#. TRANS: Fieldset legend on profile design page to change profile page colours.
+#: lib/designform.php:131
+msgid "Change colours"
+msgstr "Alterar a cor"
+
+#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
+#: lib/designform.php:138
+msgid "Use defaults"
+msgstr "Usar o padrão|"
+
+#. TRANS: Title for button on profile design page to reset all colour settings to default.
+#: lib/designform.php:140
+msgid "Restore default designs"
+msgstr "Restaura a aparência padrão"
+
+#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
+#: lib/designform.php:148
+msgid "Reset back to default"
+msgstr "Restaura de volta ao padrão"
+
 #. TRANS: Label in form on profile design page.
 #. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
-#: lib/designsettings.php:108
+#: lib/designform.php:158
 msgid "Upload file"
 msgstr "Enviar arquivo"
 
 #. TRANS: Instructions for form on profile design page.
-#: lib/designsettings.php:113
+#: lib/designform.php:163
+#, fuzzy
 msgid ""
-"You can upload your personal background image. The maximum file size is 2MB."
+"You can upload your personal background image. The maximum file size is 2Mb."
 msgstr ""
 "Você pode enviar sua imagem de fundo. O tamanho máximo do arquivo é de 2Mb."
 
 #. TRANS: Radio button on profile design page that will enable use of the uploaded profile image.
-#: lib/designsettings.php:139
+#: lib/designform.php:194
 #, fuzzy
 msgctxt "RADIO"
 msgid "On"
 msgstr "Ativado"
 
 #. TRANS: Radio button on profile design page that will disable use of the uploaded profile image.
-#: lib/designsettings.php:156
+#: lib/designform.php:211
 #, fuzzy
 msgctxt "RADIO"
 msgid "Off"
 msgstr "Desativado"
 
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: lib/designsettings.php:175
-msgid "Change colours"
-msgstr "Alterar a cor"
-
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: lib/designsettings.php:257
-msgid "Use defaults"
-msgstr "Usar o padrão|"
+#. TRANS: Title for button on profile design page to save settings.
+#: lib/designform.php:322
+msgid "Save design"
+msgstr "Salvar a aparência"
 
 #. TRANS: Error message displayed if design settings could not be saved.
 #. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
-#: lib/designsettings.php:405 lib/designsettings.php:427
+#: lib/designsettings.php:216 lib/designsettings.php:238
 msgid "Couldn't update your design."
 msgstr "Não foi possível atualizar a aparência."
 
 #. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
-#: lib/designsettings.php:433
+#: lib/designsettings.php:244
 msgid "Design defaults restored."
 msgstr "A aparência padrão foi restaurada."
 
@@ -8437,27 +8508,23 @@ msgstr ""
 msgid "Feeds"
 msgstr ""
 
-#: lib/galleryaction.php:121
-msgid "Filter tags"
-msgstr "Filtrar etiquetas"
-
-#: lib/galleryaction.php:131
+#: lib/galleryaction.php:128
 msgid "All"
 msgstr "Todas"
 
-#: lib/galleryaction.php:139
+#: lib/galleryaction.php:136
 msgid "Select tag to filter"
 msgstr "Selecione a etiqueta para filtrar"
 
-#: lib/galleryaction.php:140
+#: lib/galleryaction.php:137
 msgid "Tag"
 msgstr "Etiqueta"
 
-#: lib/galleryaction.php:141
+#: lib/galleryaction.php:138
 msgid "Choose a tag to narrow list"
 msgstr "Selecione uma etiqueta para reduzir a lista"
 
-#: lib/galleryaction.php:143
+#: lib/galleryaction.php:140
 msgid "Go"
 msgstr "Ir"
 
@@ -8549,6 +8616,12 @@ msgctxt "TOOLTIP"
 msgid "%s blocked users"
 msgstr "Usuários bloqueados de %s"
 
+#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
+#: lib/groupnav.php:117
+msgctxt "MENU"
+msgid "Admin"
+msgstr "Administrar"
+
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
 #: lib/groupnav.php:120
@@ -8658,39 +8731,62 @@ msgid_plural "%dB"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/jabber.php:387
+#: lib/implugin.php:262
 #, php-format
-msgid "[%s]"
-msgstr "[%s]"
+msgid ""
+"User \"%s\" on %s has said that your %s screenname belongs to them. If "
+"that's true, you can confirm by clicking on this URL: %s . (If you cannot "
+"click it, copy-and-paste it into the address bar of your browser). If that "
+"user isn't you, or if you didn't request this confirmation, just ignore this "
+"message."
+msgstr ""
 
-#: lib/jabber.php:567
+#: lib/implugin.php:349
 #, php-format
 msgid "Unknown inbox source %d."
 msgstr "Fonte da caixa de entrada desconhecida %d."
 
+#: lib/implugin.php:485
+#, fuzzy, php-format
+msgid "Message too long - maximum is %1$d characters, you sent %2$d."
+msgstr ""
+"A mensagem é muito extensa - o máximo são %1$d caracteres e você enviou %2$d."
+
 #: lib/leaveform.php:114
 msgid "Leave"
 msgstr "Sair"
 
+#. TRANS: Menu item for logging in to the StatusNet site.
+#: lib/logingroupnav.php:77
+msgctxt "MENU"
+msgid "Login"
+msgstr "Entrar"
+
 #. TRANS: Title for menu item for logging in to the StatusNet site.
 #: lib/logingroupnav.php:79
 msgid "Login with a username and password"
 msgstr "Autentique-se com um nome de usuário e uma senha"
 
+#. TRANS: Menu item for registering with the StatusNet site.
+#: lib/logingroupnav.php:85
+msgctxt "MENU"
+msgid "Register"
+msgstr "Registrar-se"
+
 #. TRANS: Title for menu item for registering with the StatusNet site.
 #: lib/logingroupnav.php:87
 msgid "Sign up for a new account"
 msgstr "Cadastre-se para uma nova conta"
 
 #. TRANS: Subject for address confirmation email.
-#: lib/mail.php:168
+#: lib/mail.php:172
 msgid "Email address confirmation"
 msgstr "Confirmação do endereço de e-mail"
 
 #. TRANS: Body for address confirmation email.
 #. TRANS: %1$s is the addressed user's nickname, %2$s is the StatusNet sitename,
 #. TRANS: %3$s is the URL to confirm at.
-#: lib/mail.php:173
+#: lib/mail.php:177
 #, fuzzy, php-format
 msgid ""
 "Hey, %1$s.\n"
@@ -8721,14 +8817,14 @@ msgstr ""
 
 #. TRANS: Subject of new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
-#: lib/mail.php:238
+#: lib/mail.php:243
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1$s agora está acompanhando suas mensagens no %2$s."
 
 #. TRANS: This is a paragraph in a new-subscriber e-mail.
 #. TRANS: %s is a URL where the subscriber can be reported as abusive.
-#: lib/mail.php:245
+#: lib/mail.php:250
 #, php-format
 msgid ""
 "If you believe this account is being used abusively, you can block them from "
@@ -8743,7 +8839,7 @@ msgstr ""
 #. TRANS: %3$s is the subscriber's profile URL, %4$s is the subscriber's location (or empty)
 #. TRANS: %5$s is the subscriber's homepage URL (or empty), %6%s is the subscriber's bio (or empty)
 #. TRANS: %7$s is a link to the addressed user's e-mail settings.
-#: lib/mail.php:255
+#: lib/mail.php:260
 #, fuzzy, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -8770,14 +8866,14 @@ msgstr ""
 
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is biographical information.
-#: lib/mail.php:278
+#: lib/mail.php:283
 #, php-format
 msgid "Bio: %s"
 msgstr "Descrição: %s"
 
 #. TRANS: Subject of notification mail for new posting email address.
 #. TRANS: %s is the StatusNet sitename.
-#: lib/mail.php:307
+#: lib/mail.php:312
 #, php-format
 msgid "New email address for posting to %s"
 msgstr "Novo endereço de e-mail para publicar no %s"
@@ -8785,7 +8881,7 @@ msgstr "Novo endereço de e-mail para publicar no %s"
 #. TRANS: Body of notification mail for new posting email address.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is the e-mail address to send
 #. TRANS: to to post by e-mail, %3$s is a URL to more instructions.
-#: lib/mail.php:313
+#: lib/mail.php:318
 #, fuzzy, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -8808,19 +8904,19 @@ msgstr ""
 
 #. TRANS: Subject line for SMS-by-email notification messages.
 #. TRANS: %s is the posting user's nickname.
-#: lib/mail.php:434
+#: lib/mail.php:439
 #, php-format
 msgid "%s status"
 msgstr "Mensagem de %s"
 
 #. TRANS: Subject line for SMS-by-email address confirmation message.
-#: lib/mail.php:460
+#: lib/mail.php:465
 msgid "SMS confirmation"
 msgstr "Confirmação de SMS"
 
 #. TRANS: Main body heading for SMS-by-email address confirmation message.
 #. TRANS: %s is the addressed user's nickname.
-#: lib/mail.php:464
+#: lib/mail.php:469
 #, php-format
 msgid "%s: confirm you own this phone number with this code:"
 msgstr ""
@@ -8829,7 +8925,7 @@ msgstr ""
 
 #. TRANS: Subject for 'nudge' notification email.
 #. TRANS: %s is the nudging user.
-#: lib/mail.php:485
+#: lib/mail.php:490
 #, fuzzy, php-format
 msgid "You have been nudged by %s"
 msgstr "Você teve a atenção chamada por %s"
@@ -8837,7 +8933,7 @@ msgstr "Você teve a atenção chamada por %s"
 #. TRANS: Body for 'nudge' notification email.
 #. TRANS: %1$s is the nuding user's long name, $2$s is the nudging user's nickname,
 #. TRANS: %3$s is a URL to post notices at, %4$s is the StatusNet sitename.
-#: lib/mail.php:492
+#: lib/mail.php:497
 #, php-format
 msgid ""
 "%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -8866,7 +8962,7 @@ msgstr ""
 
 #. TRANS: Subject for direct-message notification email.
 #. TRANS: %s is the sending user's nickname.
-#: lib/mail.php:539
+#: lib/mail.php:544
 #, php-format
 msgid "New private message from %s"
 msgstr "Nova mensagem particular de %s"
@@ -8875,7 +8971,7 @@ msgstr "Nova mensagem particular de %s"
 #. TRANS: %1$s is the sending user's long name, %2$s is the sending user's nickname,
 #. TRANS: %3$s is the message content, %4$s a URL to the message,
 #. TRANS: %5$s is the StatusNet sitename.
-#: lib/mail.php:547
+#: lib/mail.php:552
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -8910,7 +9006,7 @@ msgstr ""
 
 #. TRANS: Subject for favorite notification e-mail.
 #. TRANS: %1$s is the adding user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:599
+#: lib/mail.php:604
 #, fuzzy, php-format
 msgid "%1$s (@%2$s) added your notice as a favorite"
 msgstr "%s (@%s) marcou sua mensagem como favorita"
@@ -8920,7 +9016,7 @@ msgstr "%s (@%s) marcou sua mensagem como favorita"
 #. TRANS: %3$s is a URL to the faved notice, %4$s is the faved notice text,
 #. TRANS: %5$s is a URL to all faves of the adding user, %6$s is the StatusNet sitename,
 #. TRANS: %7$s is the adding user's nickname.
-#: lib/mail.php:606
+#: lib/mail.php:611
 #, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -8958,7 +9054,7 @@ msgstr ""
 "%6$s\n"
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:664
+#: lib/mail.php:669
 #, php-format
 msgid ""
 "The full conversation can be read here:\n"
@@ -8971,7 +9067,7 @@ msgstr ""
 
 #. TRANS: E-mail subject for notice notification.
 #. TRANS: %1$s is the sending user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:672
+#: lib/mail.php:677
 #, fuzzy, php-format
 msgid "%1$s (@%2$s) sent a notice to your attention"
 msgstr "%s (@%s) enviou uma mensagem citando você"
@@ -8982,7 +9078,7 @@ msgstr "%s (@%s) enviou uma mensagem citando você"
 #. TRANS: %5$s is a URL to the full conversion if it exists (otherwise empty),
 #. TRANS: %6$s is a URL to reply to the notice, %7$s is a URL to all @-replied for the addressed user,
 #. TRANS: %8$s is a URL to the addressed user's e-mail settings, %9$s is the sender's nickname.
-#: lib/mail.php:680
+#: lib/mail.php:685
 #, php-format
 msgid ""
 "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -9129,11 +9225,7 @@ msgstr "Não assinado!"
 msgid "To"
 msgstr "Para"
 
-#: lib/messageform.php:166 lib/noticeform.php:186
-msgid "Available characters"
-msgstr "Caracteres disponíveis"
-
-#: lib/messageform.php:185 lib/noticeform.php:237
+#: lib/messageform.php:184 lib/noticeform.php:236
 msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr "Enviar"
@@ -9143,17 +9235,10 @@ msgstr "Enviar"
 msgid "Messages"
 msgstr "Mensagem"
 
-#: lib/messagelistitem.php:123 lib/noticelist.php:522
+#: lib/messagelistitem.php:123 lib/noticelist.php:527
 msgid "from"
 msgstr "de"
 
-#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:165
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr ""
-"A identificação deve conter apenas letras minúsculas e números e não pode "
-"ter e espaços."
-
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 #: lib/nickname.php:178
 msgid "Nickname cannot be empty."
@@ -9176,23 +9261,23 @@ msgstr "Enviar uma mensagem"
 msgid "What's up, %s?"
 msgstr "E aí, %s?"
 
-#: lib/noticeform.php:194
+#: lib/noticeform.php:193
 msgid "Attach"
 msgstr "Anexo"
 
-#: lib/noticeform.php:198
+#: lib/noticeform.php:197
 msgid "Attach a file"
 msgstr "Anexar um arquivo"
 
-#: lib/noticeform.php:213
+#: lib/noticeform.php:212
 msgid "Share my location"
 msgstr "Divulgar minha localização"
 
-#: lib/noticeform.php:216
+#: lib/noticeform.php:215
 msgid "Do not share my location"
 msgstr "Não divulgar minha localização"
 
-#: lib/noticeform.php:217
+#: lib/noticeform.php:216
 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
 "try again later"
@@ -9201,55 +9286,59 @@ msgstr ""
 "esperado. Por favor, tente novamente mais tarde."
 
 #. TRANS: Used in coordinates as abbreviation of north
-#: lib/noticelist.php:452
+#: lib/noticelist.php:457
 msgid "N"
 msgstr "N"
 
 #. TRANS: Used in coordinates as abbreviation of south
-#: lib/noticelist.php:454
+#: lib/noticelist.php:459
 msgid "S"
 msgstr "S"
 
 #. TRANS: Used in coordinates as abbreviation of east
-#: lib/noticelist.php:456
+#: lib/noticelist.php:461
 msgid "E"
 msgstr "L"
 
 #. TRANS: Used in coordinates as abbreviation of west
-#: lib/noticelist.php:458
+#: lib/noticelist.php:463
 msgid "W"
 msgstr "O"
 
-#: lib/noticelist.php:460
+#: lib/noticelist.php:465
 #, php-format
 msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 
-#: lib/noticelist.php:469
+#: lib/noticelist.php:474
 msgid "at"
 msgstr "em"
 
-#: lib/noticelist.php:518
+#: lib/noticelist.php:523
 msgid "web"
 msgstr "web"
 
-#: lib/noticelist.php:584
+#: lib/noticelist.php:589
 msgid "in context"
 msgstr "no contexto"
 
-#: lib/noticelist.php:619
+#: lib/noticelist.php:624
 msgid "Repeated by"
 msgstr "Repetida por"
 
-#: lib/noticelist.php:646
+#: lib/noticelist.php:651
 msgid "Reply to this notice"
 msgstr "Responder a esta mensagem"
 
-#: lib/noticelist.php:647
+#: lib/noticelist.php:652
 msgid "Reply"
 msgstr "Responder"
 
-#: lib/noticelist.php:691
+#: lib/noticelist.php:678
+msgid "Delete this notice"
+msgstr "Excluir esta mensagem"
+
+#: lib/noticelist.php:696
 msgid "Notice repeated"
 msgstr "Mensagem repetida"
 
@@ -9286,48 +9375,31 @@ msgstr "Nota duplicada."
 msgid "Couldn't insert new subscription."
 msgstr "Não foi possível inserir a nova assinatura."
 
-#. TRANS: Personal group navigation menu option when logged in for viewing @-replies.
-#: lib/personalgroupnav.php:107
+#: lib/personalgroupnav.php:104
 #, fuzzy
-msgctxt "MENU"
 msgid "Replies"
 msgstr "Respostas"
 
-#. TRANS: Personal group navigation menu option when logged in for seeing own profile.
-#: lib/personalgroupnav.php:114
+#: lib/personalgroupnav.php:109
 #, fuzzy
-msgctxt "MENU"
-msgid "Profile"
-msgstr "Perfil"
-
-#. TRANS: Personal group navigation menu option when logged in for viewing own favourited notices.
-#: lib/personalgroupnav.php:120
-#, fuzzy
-msgctxt "MENU"
 msgid "Favorites"
 msgstr "Favoritos"
 
-#. TRANS: Personal group navigation menu option when logged in for viewing recieved personal messages.
-#: lib/personalgroupnav.php:133
+#: lib/personalgroupnav.php:120
 #, fuzzy
-msgctxt "MENU"
 msgid "Inbox"
 msgstr "Recebidas"
 
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing recieved personal messages.
-#: lib/personalgroupnav.php:135
+#: lib/personalgroupnav.php:121
 msgid "Your incoming messages"
 msgstr "Suas mensagens recebidas"
 
-#. TRANS: Personal group navigation menu option when logged in for viewing senet personal messages.
-#: lib/personalgroupnav.php:140
+#: lib/personalgroupnav.php:125
 #, fuzzy
-msgctxt "MENU"
 msgid "Outbox"
 msgstr "Enviadas"
 
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing senet personal messages.
-#: lib/personalgroupnav.php:142
+#: lib/personalgroupnav.php:126
 msgid "Your sent messages"
 msgstr "Suas mensagens enviadas"
 
@@ -9342,9 +9414,26 @@ msgstr "Etiquetas nas mensagens de %s"
 msgid "Unknown"
 msgstr "Desconhecido"
 
+#. TRANS: Plugin admin panel controls
+#: lib/plugindisableform.php:90
+msgctxt "plugin"
+msgid "Disable"
+msgstr ""
+
+#. TRANS: Plugin admin panel controls
+#: lib/pluginenableform.php:112
+msgctxt "plugin"
+msgid "Enable"
+msgstr ""
+
+#: lib/pluginlist.php:196
+msgctxt "plugin-description"
+msgid "(Plugin descriptions unavailable when disabled.)"
+msgstr ""
+
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:82
+#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:88
 msgid "Subscriptions"
 msgstr "Assinaturas"
 
@@ -9355,7 +9444,7 @@ msgstr "Todas as assinaturas"
 
 #. TRANS: H2 text for user subscriber statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:90
+#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:96
 msgid "Subscribers"
 msgstr "Assinantes"
 
@@ -9377,7 +9466,7 @@ msgstr "Membro desde"
 #. TRANS: Label for user statistics.
 #. TRANS: H2 text for user group membership statistics.
 #: lib/profileaction.php:239 lib/profileaction.php:290
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:104
 msgid "Groups"
 msgstr "Grupos"
 
@@ -9397,10 +9486,6 @@ msgstr "Todos os grupos"
 msgid "Unimplemented method."
 msgstr "Método não implementado."
 
-#: lib/publicgroupnav.php:78
-msgid "Public"
-msgstr "Público"
-
 #: lib/publicgroupnav.php:82
 msgid "User groups"
 msgstr "Grupos de usuário"
@@ -9439,7 +9524,7 @@ msgid "Revoke the \"%s\" role from this user"
 msgstr "Revoga o papel \"%s\" deste usuário"
 
 #. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:974
+#: lib/router.php:1001
 #, fuzzy
 msgid "Page not found."
 msgstr "O método da API não foi encontrado!"
@@ -9469,11 +9554,6 @@ msgctxt "BUTTON"
 msgid "Search"
 msgstr "Pesquisar"
 
-#. TRANS: Definition list item with instructions on how to get (better) search results.
-#: lib/searchaction.php:170
-msgid "Search help"
-msgstr "Ajuda da procura"
-
 #: lib/searchgroupnav.php:80
 msgid "People"
 msgstr "Pessoas"
@@ -9498,6 +9578,51 @@ msgstr "Seção sem título"
 msgid "More..."
 msgstr "Mais..."
 
+#: lib/settingsnav.php:78
+msgid "Change your profile settings"
+msgstr "Alterar as suas configurações de perfil"
+
+#: lib/settingsnav.php:83
+msgid "Upload an avatar"
+msgstr "Enviar um avatar"
+
+#: lib/settingsnav.php:88
+msgid "Change your password"
+msgstr "Alterar a sua senha"
+
+#: lib/settingsnav.php:93
+msgid "Change email handling"
+msgstr "Configurações de uso do e-mail"
+
+#: lib/settingsnav.php:98
+msgid "Design your profile"
+msgstr "Mude a aparência do seu perfil"
+
+#: lib/settingsnav.php:102
+msgid "URL"
+msgstr "Site"
+
+#: lib/settingsnav.php:103
+msgid "URL shorteners"
+msgstr ""
+
+#: lib/settingsnav.php:111
+msgid "Updates by instant messenger (IM)"
+msgstr "Atualizações via mensageiro instantâneo (MI)"
+
+#: lib/settingsnav.php:118
+msgid "Updates by SMS"
+msgstr "Atualizações via SMS"
+
+#: lib/settingsnav.php:123
+#, fuzzy
+msgid "Connections"
+msgstr "Conexões"
+
+#: lib/settingsnav.php:124
+msgid "Authorized connected applications"
+msgstr "Aplicações autorizadas conectadas"
+
 #: lib/silenceform.php:67
 msgid "Silence"
 msgstr "Silenciar"
@@ -9506,30 +9631,34 @@ msgstr "Silenciar"
 msgid "Silence this user"
 msgstr "Silenciar este usuário"
 
-#: lib/subgroupnav.php:83
+#: lib/subgroupnav.php:89
 #, php-format
 msgid "People %s subscribes to"
 msgstr "Assinaturas de %s"
 
-#: lib/subgroupnav.php:91
+#: lib/subgroupnav.php:97
 #, php-format
 msgid "People subscribed to %s"
 msgstr "Assinantes de %s"
 
-#: lib/subgroupnav.php:99
+#: lib/subgroupnav.php:105
 #, php-format
 msgid "Groups %s is a member of"
 msgstr "Grupos dos quais %s é membro"
 
-#: lib/subgroupnav.php:105
+#: lib/subgroupnav.php:111
 msgid "Invite"
 msgstr "Convidar"
 
-#: lib/subgroupnav.php:106
+#: lib/subgroupnav.php:112
 #, php-format
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Convide seus amigos e colegas para unir-se a você no %s"
 
+#: lib/subscribeform.php:115 lib/subscribeform.php:139
+msgid "Subscribe to this user"
+msgstr "Assinar este usuário"
+
 #: lib/subscriberspeopleselftagcloudsection.php:48
 #: lib/subscriptionspeopleselftagcloudsection.php:48
 msgid "People Tagcloud as self-tagged"
@@ -9604,6 +9733,13 @@ msgstr "O tema contém um arquivo do tipo '.%s', que não é permitido."
 msgid "Error opening theme archive."
 msgstr "Ocorreu um erro ao abrir o arquivo do tema."
 
+#: lib/threadednoticelist.php:270
+#, php-format
+msgid "Show all %d comment"
+msgid_plural "Show all %d comments"
+msgstr[0] ""
+msgstr[1] ""
+
 #: lib/topposterssection.php:74
 msgid "Top posters"
 msgstr "Quem mais publica"
@@ -9646,76 +9782,80 @@ msgstr "Cancelar"
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "O usuário não tem perfil."
 
-#. TRANS: Link text for changeing the avatar of the logged in user.
-#: lib/userprofile.php:121
+#: lib/userprofile.php:116
 msgid "Edit Avatar"
 msgstr "Editar o avatar"
 
 #. TRANS: H2 for user actions in a profile.
 #. TRANS: H2 for entity actions in a profile.
-#: lib/userprofile.php:245 lib/userprofile.php:261
+#: lib/userprofile.php:216 lib/userprofile.php:232
 msgid "User actions"
 msgstr "Ações do usuário"
 
 #. TRANS: Text shown in user profile of not yet compeltely deleted users.
-#: lib/userprofile.php:249
+#: lib/userprofile.php:220
 msgid "User deletion in progress..."
 msgstr "Exclusão do usuário em andamento..."
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:277
+#: lib/userprofile.php:248
 msgid "Edit profile settings"
 msgstr "Editar as configurações do perfil"
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:279
+#: lib/userprofile.php:250
 msgid "Edit"
 msgstr "Editar"
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:303
+#: lib/userprofile.php:274
 msgid "Send a direct message to this user"
 msgstr "Enviar uma mensagem para este usuário."
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:305
+#: lib/userprofile.php:276
 msgid "Message"
 msgstr "Mensagem"
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:347
+#: lib/userprofile.php:318
 msgid "Moderate"
 msgstr "Moderar"
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:386
+#: lib/userprofile.php:357
 msgid "User role"
 msgstr "Papel do usuário"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:389
+#: lib/userprofile.php:360
 msgctxt "role"
 msgid "Administrator"
 msgstr "Administrador"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:391
+#: lib/userprofile.php:362
 msgctxt "role"
 msgid "Moderator"
 msgstr "Moderador"
 
+#: lib/util.php:321
+#, fuzzy
+msgid "Not allowed to log in."
+msgstr "Você não está autenticado."
+
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1306
+#: lib/util.php:1337
 msgid "a few seconds ago"
 msgstr "alguns segundos atrás"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1309
+#: lib/util.php:1340
 msgid "about a minute ago"
 msgstr "cerca de 1 minuto atrás"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1313
+#: lib/util.php:1344
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
@@ -9723,12 +9863,12 @@ msgstr[0] "há cerca de um minuto atrás"
 msgstr[1] "há cerca de %d minutos atrás"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1316
+#: lib/util.php:1347
 msgid "about an hour ago"
 msgstr "cerca de 1 hora atrás"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1320
+#: lib/util.php:1351
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
@@ -9736,12 +9876,12 @@ msgstr[0] "há cerca de uma hora atrás"
 msgstr[1] "há cerca de %d horas atrás"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1323
+#: lib/util.php:1354
 msgid "about a day ago"
 msgstr "cerca de 1 dia atrás"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1327
+#: lib/util.php:1358
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
@@ -9749,12 +9889,12 @@ msgstr[0] "há cerca de um dia atrás"
 msgstr[1] "há cerca de %d dias atrás"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1330
+#: lib/util.php:1361
 msgid "about a month ago"
 msgstr "cerca de 1 mês atrás"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1334
+#: lib/util.php:1365
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
@@ -9762,7 +9902,7 @@ msgstr[0] "há cerca de um mês atrás"
 msgstr[1] "há cerca de %d meses atrás"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1337
+#: lib/util.php:1368
 msgid "about a year ago"
 msgstr "cerca de 1 ano atrás"
 
@@ -9773,23 +9913,6 @@ msgstr "cerca de 1 ano atrás"
 msgid "%s is not a valid color! Use 3 or 6 hex characters."
 msgstr "%s não é uma cor válida! Utilize 3 ou 6 caracteres hexadecimais."
 
-#. TRANS: %s is the URL to the StatusNet site's Instant Messaging settings.
-#: lib/xmppmanager.php:287
-#, php-format
-msgid "Unknown user. Go to %s to add your address to your account"
-msgstr ""
-
-#. TRANS: Response to XMPP source when it sent too long a message.
-#. TRANS: %1$d the maximum number of allowed characters (used for plural), %2$d is the sent number.
-#: lib/xmppmanager.php:406
-#, fuzzy, php-format
-msgid "Message too long. Maximum is %1$d character, you sent %2$d."
-msgid_plural "Message too long. Maximum is %1$d characters, you sent %2$d."
-msgstr[0] ""
-"A mensagem é muito extensa - o máximo são %1$d caracteres e você enviou %2$d."
-msgstr[1] ""
-"A mensagem é muito extensa - o máximo são %1$d caracteres e você enviou %2$d."
-
 #. TRANS: Exception.
 #: lib/xrd.php:63
 #, fuzzy
@@ -9807,74 +9930,181 @@ msgstr ""
 msgid "Getting backup from file '%s'."
 msgstr ""
 
-#, fuzzy
-#~ msgid "Block this user."
-#~ msgstr "Bloquear este usuário"
+#~ msgid "Could not generate feed for group - %s"
+#~ msgstr "Não foi possível gerar a fonte de notícias para o grupo - %s"
 
 #, fuzzy
-#~ msgid "Delete this notice."
-#~ msgstr "Excluir esta mensagem"
-
-#, fuzzy
-#~ msgid "Delete this user."
-#~ msgstr "Excluir este usuário"
-
-#, fuzzy
-#~ msgid "Restore default designs."
-#~ msgstr "Restaura a aparência padrão"
-
-#, fuzzy
-#~ msgid "Reset back to default."
-#~ msgstr "Restaura de volta ao padrão"
-
-#, fuzzy
-#~ msgid "Save design."
-#~ msgstr "Salvar a aparência"
-
-#, fuzzy
-#~ msgid "Disfavor favorite."
-#~ msgstr "Desmarcar a favorita"
-
-#, fuzzy
-#~ msgid "\"%s\" not found."
-#~ msgstr "O método da API não foi encontrado!"
-
-#, fuzzy
-#~ msgid "Notice %s not found."
-#~ msgstr "A mensagem pai não foi encontrada."
-
-#, fuzzy
-#~ msgid "Attachment %s not found."
-#~ msgstr "O usuário destinatário não foi encontrado."
-
-#, fuzzy
-#~ msgid "Invalid tag: \"%s\"."
-#~ msgstr "Etiqueta inválida: \"%s\""
-
-#, fuzzy
-#~ msgid "%s updates from everyone."
-#~ msgstr "%s mensagens de todo mundo!"
-
-#, fuzzy
-#~ msgid "Password saved"
-#~ msgstr "A senha foi salva."
-
-#, fuzzy
-#~ msgid "Where you are, like \"City, State (or Region), Country\"."
-#~ msgstr "Onde você está, ex: \"cidade, estado (ou região), país\""
-
-#, fuzzy
-#~ msgid "Subscribe to this user."
-#~ msgstr "Assinar este usuário"
+#~ msgid "Current confirmed Jabber/Google Talk address."
+#~ msgstr "Endereço de Jabber/GTalk já confirmado."
 
 #, fuzzy
 #~ msgid ""
-#~ "Listenee stream license \"%1$s\" is not compatible with site license \"%2"
-#~ "$s\"."
+#~ "Jabber or Google Talk address, like \"UserName@example.org\". First, make "
+#~ "sure to add %s to your buddy list in your IM client or on Google Talk."
 #~ msgstr ""
-#~ "A licença '%1$s' do fluxo do usuário não é compatível com a licença '%2"
-#~ "$s' do site."
+#~ "Endereço de Jabber ou GTalk, ex: \"usuario@exemplo.org\". Primeiro, "
+#~ "certifique-se de adicionar %s à sua lista de contatos em seu cliente de "
+#~ "MI ou no GTalk."
 
 #, fuzzy
-#~ msgid "Not allowed to log in."
-#~ msgstr "Você não está autenticado."
+#~ msgid "Send me notices through Jabber/Google Talk."
+#~ msgstr "Envie-me mensagens via Jabber/GTalk."
+
+#, fuzzy
+#~ msgid "Publish a MicroID for my Jabber/Google Talk address."
+#~ msgstr "Publique um MicroID para meu endereço de Jabber/Gtalk."
+
+#~ msgid "No Jabber ID."
+#~ msgstr "Nenhuma ID de Jabber."
+
+#, fuzzy
+#~ msgid "Not a valid Jabber ID."
+#~ msgstr "Não é uma ID de Jabber válida"
+
+#~ msgid "That is already your Jabber ID."
+#~ msgstr "Essa já é sua ID do Jabber."
+
+#~ msgid "That is not your Jabber ID."
+#~ msgstr "Essa não é sua ID do Jabber."
+
+#~ msgid "Other settings"
+#~ msgstr "Outras configurações"
+
+#~ msgid "Tag cloud"
+#~ msgstr "Nuvem de etiquetas"
+
+#~ msgid "Consumer key"
+#~ msgstr "Chave do consumidor"
+
+#~ msgid "Consumer secret"
+#~ msgstr "Segredo do consumidor"
+
+#~ msgid "Request token URL"
+#~ msgstr "URL do token de requisição"
+
+#~ msgid "Access token URL"
+#~ msgstr "URL do token de acesso"
+
+#~ msgid "Authorize URL"
+#~ msgstr "Autorizar a URL"
+
+#~ msgid "Jabber"
+#~ msgstr "Jabber"
+
+#~ msgid "Photo"
+#~ msgstr "Imagem"
+
+#~ msgid "Other options"
+#~ msgstr "Outras opções"
+
+#~ msgid "Other"
+#~ msgstr "Outras"
+
+#~ msgid "Primary site navigation"
+#~ msgstr "Navegação primária no site"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Personal profile and friends timeline"
+#~ msgstr "Perfil pessoal e fluxo de mensagens dos amigos"
+
+#~ msgctxt "MENU"
+#~ msgid "Personal"
+#~ msgstr "Pessoal"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Change your email, avatar, password, profile"
+#~ msgstr "Altere seu e-mail, avatar, senha, perfil"
+
+#~ msgid "Account"
+#~ msgstr "Conta"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Connect to services"
+#~ msgstr "Conecte-se a outros serviços"
+
+#~ msgid "Connect"
+#~ msgstr "Conectar"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Change site configuration"
+#~ msgstr "Altere as configurações do site"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Invite friends and colleagues to join you on %s"
+#~ msgstr "Convide seus amigos e colegas para unir-se a você no %s"
+
+#~ msgctxt "MENU"
+#~ msgid "Invite"
+#~ msgstr "Convidar"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Create an account"
+#~ msgstr "Criar uma conta"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Help me!"
+#~ msgstr "Ajudem-me!"
+
+#~ msgctxt "MENU"
+#~ msgid "Help"
+#~ msgstr "Ajuda"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Search for people or text"
+#~ msgstr "Procure por pessoas ou textos"
+
+#~ msgid "Local views"
+#~ msgstr "Visualizações locais"
+
+#~ msgid "Page notice"
+#~ msgstr "Notícia da página"
+
+#~ msgid "Secondary site navigation"
+#~ msgstr "Navegação secundária no site"
+
+#~ msgid "StatusNet software license"
+#~ msgstr "Licença do software StatusNet"
+
+#~ msgid "Site content license"
+#~ msgstr "Licença do conteúdo do site"
+
+#~ msgid "Pagination"
+#~ msgstr "Paginação"
+
+#~ msgid "Author"
+#~ msgstr "Autor"
+
+#~ msgid "Provider"
+#~ msgstr "Operadora"
+
+#, fuzzy
+#~ msgctxt "MENU"
+#~ msgid "SMS"
+#~ msgstr "SMS"
+
+#~ msgid "Filter tags"
+#~ msgstr "Filtrar etiquetas"
+
+#~ msgid "[%s]"
+#~ msgstr "[%s]"
+
+#~ msgid "Available characters"
+#~ msgstr "Caracteres disponíveis"
+
+#, fuzzy
+#~ msgctxt "MENU"
+#~ msgid "Profile"
+#~ msgstr "Perfil"
+
+#~ msgid "Search help"
+#~ msgstr "Ajuda da procura"
+
+#, fuzzy
+#~ msgid "Message too long. Maximum is %1$d character, you sent %2$d."
+#~ msgid_plural "Message too long. Maximum is %1$d characters, you sent %2$d."
+#~ msgstr[0] ""
+#~ "A mensagem é muito extensa - o máximo são %1$d caracteres e você enviou %2"
+#~ "$d."
+#~ msgstr[1] ""
+#~ "A mensagem é muito extensa - o máximo são %1$d caracteres e você enviou %2"
+#~ "$d."
diff --git a/locale/ru/LC_MESSAGES/statusnet.po b/locale/ru/LC_MESSAGES/statusnet.po
index 734acc3331..123b63eadd 100644
--- a/locale/ru/LC_MESSAGES/statusnet.po
+++ b/locale/ru/LC_MESSAGES/statusnet.po
@@ -18,8 +18,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 15:58+0000\n"
-"PO-Revision-Date: 2011-03-03 16:01:19+0000\n"
+"POT-Creation-Date: 2011-03-03 17:23+0000\n"
+"PO-Revision-Date: 2011-03-03 17:26:25+0000\n"
 "Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -87,23 +87,23 @@ msgstr "Сохранить настройки доступа"
 #. TRANS: Tooltip for button to save access settings in site admin panel.
 #. TRANS: Button text for saving theme settings.
 #. TRANS: Button label to save e-mail preferences.
-#. TRANS: Button label to save Instant Messaging preferences.
-#. TRANS: Button text for saving "Other settings" in profile.
+#. TRANS: Button label to save IM preferences.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
 #. TRANS: Button text for saving site notice in admin panel.
 #. TRANS: Button label to save SMS preferences.
 #. TRANS: Save button for settings for a profile in a subscriptions list.
+#. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
 #. TRANS: Button text on profile design page to save settings.
 #: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
-#: actions/emailsettings.php:250 actions/imsettings.php:183
-#: actions/othersettings.php:136 actions/pathsadminpanel.php:512
-#: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
-#: actions/smssettings.php:205 actions/subscriptions.php:259
+#: actions/emailsettings.php:251 actions/imsettings.php:199
+#: actions/pathsadminpanel.php:512 actions/profilesettings.php:198
+#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:204
+#: actions/subscriptions.php:261 actions/urlsettings.php:152
 #: actions/useradminpanel.php:298 lib/applicationeditform.php:355
-#: lib/designsettings.php:270 lib/groupeditform.php:201
+#: lib/designform.php:320 lib/groupeditform.php:201
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Сохранить"
@@ -142,7 +142,11 @@ msgstr "Нет такой страницы."
 #. 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 use "one time password login" without using an existing user.
+#. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
+#. TRANS: Client error displayed trying to find a user by ID for a non-existing ID.
+#. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when calling a profile action without specifying a user.
 #: actions/all.php:80 actions/allrss.php:69
@@ -154,19 +158,19 @@ msgstr "Нет такой страницы."
 #: actions/apidirectmessage.php:75 actions/apidirectmessagenew.php:72
 #: actions/apigroupcreate.php:111 actions/apigroupismember.php:89
 #: actions/apigroupjoin.php:98 actions/apigroupleave.php:98
-#: actions/apigrouplist.php:70 actions/apistatusesupdate.php:230
-#: actions/apisubscriptions.php:85 actions/apitimelinefavorites.php:70
-#: actions/apitimelinefriends.php:173 actions/apitimelinehome.php:78
-#: actions/apitimelinementions.php:77 actions/apitimelineuser.php:79
-#: actions/avatarbynickname.php:79 actions/favoritesrss.php:72
-#: actions/foaf.php:42 actions/foaf.php:61 actions/hcard.php:67
-#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
-#: actions/remotesubscribe.php:144 actions/remotesubscribe.php:153
-#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
-#: actions/showfavorites.php:106 actions/userbyid.php:74
-#: actions/usergroups.php:93 actions/userrss.php:40 actions/userxrd.php:59
-#: actions/xrds.php:71 lib/command.php:509 lib/galleryaction.php:59
-#: lib/mailbox.php:80 lib/profileaction.php:77
+#: actions/apigrouplist.php:70 actions/apigroupprofileupdate.php:108
+#: actions/apistatusesupdate.php:230 actions/apisubscriptions.php:85
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:173
+#: actions/apitimelinehome.php:78 actions/apitimelinementions.php:77
+#: actions/apitimelineuser.php:79 actions/avatarbynickname.php:79
+#: actions/favoritesrss.php:72 actions/foaf.php:42 actions/foaf.php:61
+#: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116
+#: actions/otp.php:78 actions/remotesubscribe.php:144
+#: actions/remotesubscribe.php:153 actions/replies.php:73
+#: actions/repliesrss.php:38 actions/rsd.php:113 actions/showfavorites.php:106
+#: actions/userbyid.php:75 actions/usergroups.php:93 actions/userrss.php:40
+#: actions/userxrd.php:59 actions/xrds.php:71 lib/command.php:509
+#: lib/galleryaction.php:59 lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Нет такого пользователя."
 
@@ -180,10 +184,9 @@ msgstr "%1$s и друзья, страница %2$d"
 #. TRANS: H1 text for page. %s is a user nickname.
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Timeline title for user and friends. %s is a user nickname.
-#. TRANS: Tooltop for personal group navigation menu option when logged in for viewing timeline of self and friends.
 #: actions/all.php:94 actions/all.php:191 actions/allrss.php:117
 #: actions/apitimelinefriends.php:207 actions/apitimelinehome.php:113
-#: lib/personalgroupnav.php:102
+#: lib/personalgroupnav.php:100
 #, php-format
 msgid "%s and friends"
 msgstr "%s и друзья"
@@ -239,7 +242,7 @@ msgstr ""
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
 #. TRANS: Second sentence of empty message for anonymous users. %s is a user nickname.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:227
+#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:221
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -288,19 +291,20 @@ msgstr "Обновлено от %1$s и его друзей на %2$s!"
 #: actions/apifavoritecreate.php:98 actions/apifavoritedestroy.php:98
 #: actions/apifriendshipscreate.php:99 actions/apifriendshipsdestroy.php:99
 #: actions/apifriendshipsshow.php:124 actions/apigroupcreate.php:138
-#: actions/apigroupismember.php:115 actions/apigroupjoin.php:160
-#: actions/apigroupleave.php:145 actions/apigrouplist.php:134
+#: actions/apigroupismember.php:115 actions/apigroupjoin.php:151
+#: actions/apigroupleave.php:141 actions/apigrouplist.php:134
 #: actions/apigrouplistall.php:120 actions/apigroupmembership.php:105
+#: actions/apigroupprofileupdate.php:100 actions/apigroupprofileupdate.php:213
 #: actions/apigroupshow.php:114 actions/apihelptest.php:84
 #: actions/apistatusesdestroy.php:101 actions/apistatusesretweets.php:110
 #: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:139
 #: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
-#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:268
-#: actions/apitimelinegroup.php:147 actions/apitimelinehome.php:173
-#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:239
-#: actions/apitimelineretweetedtome.php:118
-#: actions/apitimelineretweetsofme.php:150 actions/apitimelinetag.php:159
-#: actions/apitimelineuser.php:206 actions/apiusershow.php:100
+#: actions/apitimelinefavorites.php:182 actions/apitimelinefriends.php:276
+#: actions/apitimelinegroup.php:148 actions/apitimelinehome.php:181
+#: actions/apitimelinementions.php:182 actions/apitimelinepublic.php:247
+#: actions/apitimelineretweetedtome.php:147
+#: actions/apitimelineretweetsofme.php:147 actions/apitimelinetag.php:165
+#: actions/apitimelineuser.php:217 actions/apiusershow.php:100
 msgid "API method not found."
 msgstr "Метод API не найден."
 
@@ -315,8 +319,9 @@ msgstr "Метод API не найден."
 #: actions/apifavoritecreate.php:88 actions/apifavoritedestroy.php:88
 #: actions/apifriendshipscreate.php:89 actions/apifriendshipsdestroy.php:89
 #: actions/apigroupcreate.php:102 actions/apigroupjoin.php:89
-#: actions/apigroupleave.php:89 actions/apimediaupload.php:66
-#: actions/apistatusesretweet.php:63 actions/apistatusesupdate.php:194
+#: actions/apigroupleave.php:89 actions/apigroupprofileupdate.php:92
+#: actions/apimediaupload.php:66 actions/apistatusesretweet.php:63
+#: actions/apistatusesupdate.php:194
 msgid "This method requires a POST."
 msgstr "Этот метод требует POST."
 
@@ -330,21 +335,16 @@ msgstr ""
 "none."
 
 #. TRANS: Server error displayed when a user's delivery device cannot be updated.
-#. TRANS: Server error displayed when a user update to the database fails in the contact address confirmation action.
 #. TRANS: Server error thrown on database error updating e-mail preferences.
 #. TRANS: Server error thrown on database error removing a registered e-mail address.
-#. TRANS: Server error thrown on database error updating Instant Messaging preferences.
-#. TRANS: Server error thrown on database error removing a registered Instant Messaging address.
-#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
 #. TRANS: Server error thrown when user profile settings could not be updated.
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
-#: actions/apiaccountupdatedeliverydevice.php:130
-#: actions/confirmaddress.php:118 actions/emailsettings.php:352
-#: actions/emailsettings.php:498 actions/imsettings.php:276
-#: actions/imsettings.php:432 actions/othersettings.php:186
-#: actions/profilesettings.php:322 actions/smssettings.php:301
-#: actions/smssettings.php:454
+#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
+#: actions/apiaccountupdatedeliverydevice.php:136
+#: actions/emailsettings.php:353 actions/emailsettings.php:499
+#: actions/profilesettings.php:323 actions/smssettings.php:300
+#: actions/smssettings.php:453 actions/urlsettings.php:211
 msgid "Could not update user."
 msgstr "Не удаётся обновить пользователя."
 
@@ -370,7 +370,7 @@ msgstr "У пользователя нет профиля."
 
 #. TRANS: Server error displayed if a user profile could not be saved.
 #. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:418
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:419
 msgid "Could not save profile."
 msgstr "Не удаётся сохранить профиль."
 
@@ -382,7 +382,7 @@ msgstr "Не удаётся сохранить профиль."
 #: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
 #: actions/designadminpanel.php:120 actions/editapplication.php:121
 #: actions/newapplication.php:102 actions/newnotice.php:95
-#: lib/designsettings.php:298
+#: lib/designsettings.php:110
 #, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s byte) due to its "
@@ -410,8 +410,8 @@ msgstr[2] ""
 #: actions/apiaccountupdateprofilecolors.php:160
 #: actions/apiaccountupdateprofilecolors.php:171
 #: actions/groupdesignsettings.php:285 actions/groupdesignsettings.php:296
-#: actions/userdesignsettings.php:201 actions/userdesignsettings.php:211
-#: actions/userdesignsettings.php:253 actions/userdesignsettings.php:263
+#: actions/userdesignsettings.php:218 actions/userdesignsettings.php:228
+#: actions/userdesignsettings.php:270 actions/userdesignsettings.php:280
 msgid "Unable to save your design settings."
 msgstr "Не удаётся сохранить ваши настройки оформления!"
 
@@ -419,7 +419,7 @@ msgstr "Не удаётся сохранить ваши настройки оф
 #. TRANS: Client error displayed when a database error occurs updating profile colours.
 #: actions/apiaccountupdateprofilebackgroundimage.php:191
 #: actions/apiaccountupdateprofilecolors.php:139
-#: actions/userdesignsettings.php:179
+#: actions/userdesignsettings.php:196
 msgid "Could not update your design."
 msgstr "Не удаётся обновить ваше оформление."
 
@@ -529,7 +529,7 @@ msgstr "Получатель не найден."
 #. TRANS: Client error displayed trying to direct message another user who's not a friend (403).
 #: actions/apidirectmessagenew.php:144
 #, fuzzy
-msgid "Can't send direct messages to users who aren't your friend."
+msgid "Cannot send direct messages to users who aren't your friend."
 msgstr ""
 "Не удаётся посылать прямые сообщения пользователям, которые не являются "
 "Вашими друзьями."
@@ -614,9 +614,9 @@ msgstr "Не удаётся найти целевого пользователя
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:156 actions/editgroup.php:191
-#: actions/newgroup.php:137 actions/profilesettings.php:273
-#: actions/register.php:214
+#: actions/apigroupcreate.php:156 actions/apigroupprofileupdate.php:255
+#: actions/editgroup.php:191 actions/newgroup.php:137
+#: actions/profilesettings.php:274 actions/register.php:199
 msgid "Nickname already in use. Try another one."
 msgstr "Такое имя уже используется. Попробуйте какое-нибудь другое."
 
@@ -624,9 +624,9 @@ msgstr "Такое имя уже используется. Попробуйте
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:164 actions/editgroup.php:195
-#: actions/newgroup.php:141 actions/profilesettings.php:243
-#: actions/register.php:216
+#: actions/apigroupcreate.php:164 actions/apigroupprofileupdate.php:259
+#: actions/editgroup.php:195 actions/newgroup.php:141
+#: actions/profilesettings.php:244 actions/register.php:201
 msgid "Not a valid nickname."
 msgstr "Неверное имя."
 
@@ -636,10 +636,10 @@ msgstr "Неверное имя."
 #. TRANS: Validation error shown when providing an invalid homepage URL in the "New application" form.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:181 actions/editapplication.php:235
-#: actions/editgroup.php:202 actions/newapplication.php:221
-#: actions/newgroup.php:148 actions/profilesettings.php:248
-#: actions/register.php:223
+#: actions/apigroupcreate.php:181 actions/apigroupprofileupdate.php:277
+#: actions/editapplication.php:235 actions/editgroup.php:202
+#: actions/newapplication.php:221 actions/newgroup.php:148
+#: actions/profilesettings.php:249 actions/register.php:208
 msgid "Homepage is not a valid URL."
 msgstr "URL Главной страницы неверен."
 
@@ -648,8 +648,8 @@ msgstr "URL Главной страницы неверен."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:191 actions/editgroup.php:206
-#: actions/newgroup.php:152 actions/profilesettings.php:252
-#: actions/register.php:226
+#: actions/newgroup.php:152 actions/profilesettings.php:253
+#: actions/register.php:211
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "Полное имя слишком длинное (максимум 255 символов)."
 
@@ -677,8 +677,8 @@ msgstr[2] "Слишком длинное описание (максимум %d 
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:215 actions/editgroup.php:218
-#: actions/newgroup.php:164 actions/profilesettings.php:265
-#: actions/register.php:235
+#: actions/newgroup.php:164 actions/profilesettings.php:266
+#: actions/register.php:220
 msgid "Location is too long (maximum 255 characters)."
 msgstr "Слишком длинное месторасположение (максимум 255 символов)."
 
@@ -708,15 +708,16 @@ msgstr "Ошибочный псевдоним: «%s»."
 #. TRANS: %s is the alias that is already in use.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error. %s is the already used alias.
-#: actions/apigroupcreate.php:264 actions/editgroup.php:246
-#: actions/newgroup.php:193
+#: actions/apigroupcreate.php:264 actions/apigroupprofileupdate.php:351
+#: actions/editgroup.php:246 actions/newgroup.php:193
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "Алиас «%s» уже используется. Попробуйте какой-нибудь другой."
 
 #. TRANS: Client error displayed when trying to use an alias during group creation that is the same as the group's nickname.
 #. TRANS: Group edit form validation error.
-#: actions/apigroupcreate.php:278 actions/editgroup.php:253
+#: actions/apigroupcreate.php:278 actions/apigroupprofileupdate.php:359
+#: actions/editgroup.php:253
 msgid "Alias can't be the same as nickname."
 msgstr "Алиас не может совпадать с именем."
 
@@ -728,7 +729,8 @@ msgstr "Алиас не может совпадать с именем."
 #. TRANS: Client error displayed requesting most recent notices to a group for a non-existing group.
 #: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
 #: actions/apigroupleave.php:104 actions/apigroupmembership.php:71
-#: actions/apigroupshow.php:81 actions/apitimelinegroup.php:89
+#: actions/apigroupprofileupdate.php:113 actions/apigroupshow.php:81
+#: actions/apitimelinegroup.php:89
 msgid "Group not found."
 msgstr "Группа не найдена."
 
@@ -746,13 +748,11 @@ msgstr "Вы уже являетесь членом этой группы."
 msgid "You have been blocked from that group by the admin."
 msgstr "Вы заблокированы из этой группы администратором."
 
-#. TRANS: Server error displayed when joining a group fails.
-#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
 #. 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.
 #. TRANS: Message given having failed to add a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:362
+#: actions/apigroupjoin.php:136 actions/joingroup.php:139 lib/command.php:362
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "Не удаётся присоединить пользователя %1$s к группе %2$s."
@@ -762,8 +762,6 @@ msgstr "Не удаётся присоединить пользователя %1
 msgid "You are not a member of this group."
 msgstr "Вы не являетесь членом этой группы."
 
-#. TRANS: Server error displayed when leaving a group fails.
-#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
 #. TRANS: Server error displayed when leaving a group failed in the database.
 #. TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
 #. TRANS: Message given having failed to remove a user from a group.
@@ -799,6 +797,62 @@ msgstr "Группы %s"
 msgid "groups on %s"
 msgstr "группы на %s"
 
+#. TRANS: Client error displayed trying to edit a group while not being a group admin.
+#. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
+#. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
+#: actions/apigroupprofileupdate.php:118 actions/editgroup.php:110
+#: actions/editgroup.php:176 actions/groupdesignsettings.php:109
+#: actions/grouplogo.php:111
+msgid "You must be an admin to edit the group."
+msgstr "Вы должны быть администратором, чтобы изменять информацию о группе."
+
+#. TRANS: Server error displayed when editing a group fails.
+#: actions/apigroupprofileupdate.php:171 actions/editgroup.php:274
+msgid "Could not update group."
+msgstr "Не удаётся обновить информацию о группе."
+
+#. TRANS: Server error displayed when group aliases could not be added.
+#. TRANS: Server exception thrown when creating group aliases failed.
+#: actions/apigroupprofileupdate.php:194 actions/editgroup.php:281
+#: classes/User_group.php:540
+msgid "Could not create aliases."
+msgstr "Не удаётся создать алиасы."
+
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: actions/apigroupprofileupdate.php:249 lib/nickname.php:165
+msgid "Nickname must have only lowercase letters and numbers and no spaces."
+msgstr ""
+"Имя должно состоять только из прописных букв и цифр и не иметь пробелов."
+
+#: actions/apigroupprofileupdate.php:286
+#, fuzzy
+msgid "Full name is too long (max 255 chars)."
+msgstr "Полное имя слишком длинное (максимум 255 символов)."
+
+#: actions/apigroupprofileupdate.php:296
+#, fuzzy, php-format
+msgid "description is too long (max %d chars)."
+msgstr "Слишком длинное описание (максимум %d символ)."
+
+#: actions/apigroupprofileupdate.php:307
+#, fuzzy
+msgid "Location is too long (max 255 chars)."
+msgstr "Слишком длинное месторасположение (максимум 255 символов)."
+
+#: actions/apigroupprofileupdate.php:326
+#, fuzzy, php-format
+msgid "Too many aliases! Maximum %d."
+msgstr "Слишком много алиасов! Максимальное число — %d."
+
+#. TRANS: Group edit form validation error.
+#. TRANS: Group create form validation error.
+#. TRANS: %s is the invalid alias.
+#: actions/apigroupprofileupdate.php:342 actions/editgroup.php:241
+#: actions/newgroup.php:188
+#, php-format
+msgid "Invalid alias: \"%s\""
+msgstr "Неверный алиас: «%s»"
+
 #. TRANS: Client error displayed when uploading a media file has failed.
 #: actions/apimediaupload.php:101
 msgid "Upload failed."
@@ -829,21 +883,22 @@ msgstr "Ключ запроса уже авторизован."
 #. TRANS: Form validation error message.
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
+#. TRANS: Client error displayed when the session token is not okay.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
 #: actions/deletenotice.php:177 actions/disfavor.php:75
-#: actions/emailsettings.php:291 actions/favor.php:75 actions/geocode.php:55
+#: actions/emailsettings.php:292 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:65 actions/grouplogo.php:321
-#: actions/groupunblock.php:65 actions/imsettings.php:224
-#: actions/invite.php:60 actions/login.php:137 actions/makeadmin.php:66
-#: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
-#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
-#: actions/othersettings.php:155 actions/passwordsettings.php:138
-#: actions/profilesettings.php:217 actions/recoverpassword.php:383
-#: actions/register.php:172 actions/remotesubscribe.php:76
-#: actions/repeat.php:82 actions/smssettings.php:250 actions/subedit.php:40
-#: actions/subscribe.php:86 actions/tagother.php:166
-#: actions/unsubscribe.php:69 actions/userauthorization.php:52
-#: lib/designsettings.php:310
+#: actions/groupunblock.php:65 actions/imsettings.php:241
+#: actions/invite.php:60 actions/makeadmin.php:66 actions/newmessage.php:135
+#: actions/newnotice.php:105 actions/nudge.php:80
+#: actions/oauthappssettings.php:162 actions/oauthconnectionssettings.php:135
+#: actions/passwordsettings.php:137 actions/pluginenable.php:87
+#: actions/profilesettings.php:218 actions/recoverpassword.php:383
+#: actions/register.php:157 actions/remotesubscribe.php:76
+#: actions/repeat.php:82 actions/smssettings.php:249 actions/subedit.php:40
+#: actions/subscribe.php:87 actions/tagother.php:145
+#: actions/unsubscribe.php:69 actions/urlsettings.php:171
+#: actions/userauthorization.php:53 lib/designsettings.php:122
 msgid "There was a problem with your session token. Try again, please."
 msgstr "Проблема с вашим ключом сессии. Пожалуйста, попробуйте ещё раз."
 
@@ -871,10 +926,10 @@ msgstr "Ошибка базы данных при вставке oauth_token_ass
 #. TRANS: Unknown form validation error in design settings form.
 #: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
 #: actions/designadminpanel.php:100 actions/editapplication.php:144
-#: actions/emailsettings.php:310 actions/grouplogo.php:332
-#: actions/imsettings.php:239 actions/newapplication.php:124
-#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
-#: actions/smssettings.php:271 lib/designsettings.php:321
+#: actions/emailsettings.php:311 actions/grouplogo.php:332
+#: actions/imsettings.php:256 actions/newapplication.php:124
+#: actions/oauthconnectionssettings.php:144 actions/recoverpassword.php:46
+#: actions/smssettings.php:270 lib/designsettings.php:133
 msgid "Unexpected form submission."
 msgstr "Нетиповое подтверждение формы."
 
@@ -924,31 +979,26 @@ msgstr "Аккаунт"
 
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Field label in form for profile settings.
-#. TRANS: Label for group nickname (dt). Text hidden by default.
-#. TRANS: DT for nick name in a profile.
-#: actions/apioauthauthorize.php:459 actions/login.php:252
-#: actions/profilesettings.php:106 actions/register.php:432
-#: actions/showgroup.php:243 actions/tagother.php:94
+#: actions/apioauthauthorize.php:459 actions/login.php:225
+#: actions/profilesettings.php:107 actions/register.php:411
 #: actions/userauthorization.php:145 lib/groupeditform.php:145
-#: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "Имя"
 
 #. TRANS: Field label on OAuth API authorisation form.
-#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:463 actions/login.php:255
-#: actions/register.php:436 lib/accountsettingsaction.php:120
+#: actions/apioauthauthorize.php:463 actions/login.php:228
+#: actions/register.php:415 lib/settingsnav.php:87
 msgid "Password"
 msgstr "Пароль"
 
 #. TRANS: Button text that when clicked will cancel the process of allowing access to an account
 #. TRANS: by an external application.
 #. TRANS: Button label to cancel an e-mail address confirmation procedure.
-#. TRANS: Button label to cancel an Instant Messaging address confirmation procedure.
+#. TRANS: Button label to cancel an IM address confirmation procedure.
 #. TRANS: Button label to cancel a SMS address confirmation procedure.
 #. TRANS: Button label in the "Edit application" form.
-#: actions/apioauthauthorize.php:478 actions/emailsettings.php:124
-#: actions/imsettings.php:127 actions/smssettings.php:133
+#: actions/apioauthauthorize.php:478 actions/emailsettings.php:125
+#: actions/imsettings.php:136 actions/smssettings.php:132
 #: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Cancel"
@@ -1060,7 +1110,7 @@ msgstr "HTTP-метод не поддерживается."
 #. TRANS: %s is the requested output format.
 #: actions/apistatusesshow.php:144
 #, fuzzy, php-format
-msgid "Unsupported format: %s"
+msgid "Unsupported format: %s."
 msgstr "Неподдерживаемый формат: %s"
 
 #. TRANS: Client error displayed requesting a deleted status.
@@ -1142,13 +1192,6 @@ msgstr "%1$s / Любимое от %2$s"
 msgid "%1$s updates favorited by %2$s / %3$s."
 msgstr "Обновления %1$s, отмеченные как любимые %2$s / %3$s."
 
-#. TRANS: Server error displayed when generating an Atom feed fails.
-#. TRANS: %s is the error.
-#: actions/apitimelinegroup.php:134
-#, php-format
-msgid "Could not generate feed for group - %s"
-msgstr "Не удаётся сгенерировать информацию о группе: %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.
 #: actions/apitimelinementions.php:115
@@ -1165,13 +1208,14 @@ msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr "%1$s обновил этот ответ на сообщение: %2$s / %3$s."
 
 #. TRANS: Title for site timeline. %s is the StatusNet sitename.
+#. TRANS: Public RSS feed title. %s is the StatusNet site name.
 #: actions/apitimelinepublic.php:193 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "Общая лента %s"
 
 #. TRANS: Subtitle for site timeline. %s is the StatusNet sitename.
-#: actions/apitimelinepublic.php:199 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:199
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "Обновления %s от всех!"
@@ -1182,21 +1226,33 @@ msgid "Unimplemented."
 msgstr "Нереализованный метод."
 
 #. TRANS: Title for Atom feed "repeated to me". %s is the user nickname.
-#: actions/apitimelineretweetedtome.php:108
+#: actions/apitimelineretweetedtome.php:96
 #, php-format
 msgid "Repeated to %s"
 msgstr "Повторено для %s"
 
+#: actions/apitimelineretweetedtome.php:98
+#, fuzzy, php-format
+msgid "%1$s notices that were to repeated to %2$s / %3$s."
+msgstr "%1$s обновил этот ответ на сообщение: %2$s / %3$s."
+
 #. TRANS: Title of list of repeated notices of the logged in user.
 #. TRANS: %s is the nickname of the logged in user.
-#: actions/apitimelineretweetsofme.php:112
+#: actions/apitimelineretweetsofme.php:98
 #, php-format
 msgid "Repeats of %s"
 msgstr "Повторы за %s"
 
+#: actions/apitimelineretweetsofme.php:104
+#, fuzzy, php-format
+msgid "%1$s notices that %2$s / %3$s has repeated."
+msgstr "%1$s добавил запись %2$s в число любимых."
+
 #. TRANS: Title for timeline with lastest notices with a given tag.
 #. TRANS: %s is the tag.
-#: actions/apitimelinetag.php:101 actions/tag.php:67
+#. TRANS: Title for first page of notices with tags.
+#. TRANS: %s is the tag.
+#: actions/apitimelinetag.php:101 actions/tag.php:69
 #, php-format
 msgid "Notices tagged with %s"
 msgstr "Записи с тегом %s"
@@ -1209,53 +1265,54 @@ msgid "Updates tagged with %1$s on %2$s!"
 msgstr "Обновления с тегом %1$s на %2$s!"
 
 #. TRANS: Client error displayed trying to add a notice to another user's timeline.
-#: actions/apitimelineuser.php:297
+#: actions/apitimelineuser.php:308
 msgid "Only the user can add to their own timeline."
 msgstr "Только пользователь может добавлять в свою ленту."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:304
+#: actions/apitimelineuser.php:315
 msgid "Only accept AtomPub for Atom feeds."
 msgstr "Принимать только AtomPub для каналов Atom."
 
 #. TRANS: Client error displayed attempting to post an empty API notice.
-#: actions/apitimelineuser.php:311
+#: actions/apitimelineuser.php:322
 msgid "Atom post must not be empty."
 msgstr "POST-запрос Atom не может быть пустым."
 
 #. TRANS: Client error displayed attempting to post an API that is not well-formed XML.
-#: actions/apitimelineuser.php:317
+#: actions/apitimelineuser.php:328
 msgid "Atom post must be well-formed XML."
 msgstr "POST-запрос Atom должен быть корректным документом XML."
 
 #. TRANS: Client error displayed when not using an Atom entry.
-#: actions/apitimelineuser.php:323 actions/atompubfavoritefeed.php:228
+#: actions/apitimelineuser.php:334 actions/atompubfavoritefeed.php:228
 #: actions/atompubmembershipfeed.php:230
 #: actions/atompubsubscriptionfeed.php:236
 msgid "Atom post must be an Atom entry."
 msgstr "POST-запрос Atom должен быть объектом Atom."
 
 #. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
-#: actions/apitimelineuser.php:335
+#: actions/apitimelineuser.php:345
 msgid "Can only handle POST activities."
 msgstr "Возможна обработка только POST-запросов."
 
 #. TRANS: Client error displayed when using an unsupported activity object type.
 #. TRANS: %s is the unsupported activity object type.
-#: actions/apitimelineuser.php:346
+#: actions/apitimelineuser.php:356
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr "Невозможно обработать действия объекта типа «%s»."
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
 #. TRANS: %d is the notice ID (number).
-#: actions/apitimelineuser.php:380
+#: actions/apitimelineuser.php:390
 #, php-format
 msgid "No content for notice %d."
 msgstr "Нет содержания для записи %d."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:408
+#. TRANS: %s is the notice URI.
+#: actions/apitimelineuser.php:419
 #, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "Запись с URI «%s» уже существует."
@@ -1272,9 +1329,10 @@ msgstr "Метод API не найден."
 
 #. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
 #. TRANS: Client exception.
+#. TRANS: Client error displayed trying to subscribe to a non-existing profile.
 #: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
 #: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
-#: actions/subscribe.php:107
+#: actions/subscribe.php:110
 msgid "No such profile."
 msgstr "Нет такого профиля."
 
@@ -1415,7 +1473,7 @@ msgid "Not a member."
 msgstr "Все участники"
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
-#: actions/atompubshowmembership.php:151
+#: actions/atompubshowmembership.php:150
 #, fuzzy
 msgid "Cannot delete someone else's membership."
 msgstr "Невозможно удалить подписку на самого себя."
@@ -1505,10 +1563,7 @@ msgid "Invalid size."
 msgstr "Неверный размер."
 
 #. TRANS: Title for avatar upload page.
-#. TRANS: Label for group avatar (dt). Text hidden by default.
-#. TRANS: Link description in user account settings menu.
-#: actions/avatarsettings.php:66 actions/showgroup.php:227
-#: lib/accountsettingsaction.php:113
+#: actions/avatarsettings.php:66 lib/settingsnav.php:82
 msgid "Avatar"
 msgstr "Аватар"
 
@@ -1522,9 +1577,11 @@ msgstr ""
 
 #. TRANS: Server error displayed in avatar upload page when no matching profile can be found for a user.
 #. TRANS: Server error displayed coming across a request from a user without a profile.
+#. TRANS: Server error displayed when trying to authorise a remote subscription request
+#. TRANS: while the user has no profile.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
 #: actions/grouplogo.php:184 actions/remotesubscribe.php:190
-#: actions/userauthorization.php:72 actions/userrss.php:108
+#: actions/userauthorization.php:75 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr "Пользователь без соответствующего профиля."
 
@@ -1579,10 +1636,10 @@ msgstr "Обрезать"
 msgid "No file uploaded."
 msgstr "Файл не загружен."
 
-#. TRANS: Avatar upload form unstruction after uploading a file.
+#. TRANS: Avatar upload form instruction after uploading a file.
 #: actions/avatarsettings.php:345
 #, fuzzy
-msgid "Pick a square area of the image to be your avatar"
+msgid "Pick a square area of the image to be your avatar."
 msgstr "Подберите нужный квадратный участок для вашей аватары"
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
@@ -1608,7 +1665,7 @@ msgstr "Аватар удалён."
 
 #. TRANS: Title for backup account page.
 #. TRANS: Option in profile settings to create a backup of the account of the currently logged in user.
-#: actions/backupaccount.php:61 actions/profilesettings.php:467
+#: actions/backupaccount.php:61 actions/profilesettings.php:468
 msgid "Backup account"
 msgstr "Резервное копирование учетной записи"
 
@@ -1643,7 +1700,7 @@ msgstr "Фон"
 #. TRANS: Title for submit button to backup an account on the backup account page.
 #: actions/backupaccount.php:254
 #, fuzzy
-msgid "Backup your account"
+msgid "Backup your account."
 msgstr "Резервное копирование учетной записи"
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
@@ -1685,7 +1742,7 @@ msgstr "Нет"
 #. TRANS: Submit button title for 'No' when blocking a user.
 #: actions/block.php:158
 #, fuzzy
-msgid "Do not block this user"
+msgid "Do not block this user."
 msgstr "Не блокировать этого пользователя"
 
 #. TRANS: Button label on the user block form.
@@ -1702,9 +1759,9 @@ msgid "Yes"
 msgstr "Да"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#. TRANS: Description of the form to block a user.
-#: actions/block.php:165 lib/blockform.php:79
-msgid "Block this user"
+#: actions/block.php:165
+#, fuzzy
+msgid "Block this user."
 msgstr "Заблокировать пользователя."
 
 #. TRANS: Server error displayed when blocking a user fails.
@@ -1770,31 +1827,47 @@ msgstr "Код подтверждения не найден."
 msgid "That confirmation code is not for you!"
 msgstr "Это не Ваш код подтверждения!"
 
-#. TRANS: Server error for a unknow address type %s, which can be 'email', 'jabber', or 'sms'.
-#: actions/confirmaddress.php:92
-#, php-format
-msgid "Unrecognized address type %s."
+#. TRANS: Server error for an unknown address type, which can be 'email', 'sms', or the name of an IM network (such as 'xmpp' or 'aim')
+#: actions/confirmaddress.php:94
+#, fuzzy, php-format
+msgid "Unrecognized address type %s"
 msgstr "Нераспознанный тип адреса %s."
 
 #. TRANS: Client error for an already confirmed email/jabber/sms address.
-#: actions/confirmaddress.php:97
+#: actions/confirmaddress.php:103 actions/confirmaddress.php:136
 msgid "That address has already been confirmed."
 msgstr "Этот адрес уже подтверждён."
 
+#: actions/confirmaddress.php:121 actions/imsettings.php:444
+#: actions/userdesignsettings.php:306
+#, fuzzy
+msgid "Couldn't update user."
+msgstr "Не удаётся обновить пользователя."
+
+#: actions/confirmaddress.php:144
+#, fuzzy
+msgid "Couldn't update user im preferences."
+msgstr "Не удаётся обновить пользовательскую запись."
+
+#: actions/confirmaddress.php:156
+#, fuzzy
+msgid "Couldn't insert user im preferences."
+msgstr "Не удаётся вставить новую подписку."
+
 #. TRANS: Server error displayed when an address confirmation code deletion from the
 #. TRANS: database fails in the contact address confirmation action.
-#: actions/confirmaddress.php:132
+#: actions/confirmaddress.php:169
 msgid "Could not delete address confirmation."
 msgstr "Не удаётся удалить подверждение адреса."
 
 #. TRANS: Title for the contact address confirmation action.
-#: actions/confirmaddress.php:150
+#: actions/confirmaddress.php:185
 msgid "Confirm address"
 msgstr "Подтвердить адрес"
 
 #. TRANS: Success message for the contact address confirmation action.
 #. TRANS: %s can be 'email', 'jabber', or 'sms'.
-#: actions/confirmaddress.php:166
+#: actions/confirmaddress.php:200
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "Адрес «%s» подтверждён для вашего аккаунта."
@@ -1808,6 +1881,7 @@ msgstr "Дискуссия"
 #. TRANS: Label for user statistics.
 #: actions/conversation.php:149 lib/noticelist.php:87
 #: lib/profileaction.php:246 lib/searchgroupnav.php:82
+#: lib/threadednoticelist.php:66
 msgid "Notices"
 msgstr "Записи"
 
@@ -1843,7 +1917,7 @@ msgstr "Аватар удалён."
 
 #. TRANS: Page title for page on which a user account can be deleted.
 #. TRANS: Option in profile settings to delete the account of the currently logged in user.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:475
+#: actions/deleteaccount.php:228 actions/profilesettings.php:476
 #, fuzzy
 msgid "Delete account"
 msgstr "Создать новый аккаунт"
@@ -1867,7 +1941,7 @@ msgstr ""
 #. TRANS: Field label for delete account confirmation entry.
 #. TRANS: Field label for password reset form where the password has to be typed again.
 #: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:262 actions/register.php:440
+#: actions/recoverpassword.php:262 actions/register.php:419
 msgid "Confirm"
 msgstr "Подтверждение"
 
@@ -1897,14 +1971,14 @@ msgstr "Приложение не найдено."
 #. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
 #: actions/deleteapplication.php:79 actions/editapplication.php:78
-#: actions/showapplication.php:94
+#: actions/showapplication.php:90
 msgid "You are not the owner of this application."
 msgstr "Вы не являетесь владельцем этого приложения."
 
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
-#: actions/newapplication.php:112 actions/showapplication.php:118
-#: lib/action.php:1425
+#: actions/newapplication.php:112 actions/showapplication.php:113
+#: lib/action.php:1391
 msgid "There was a problem with your session token."
 msgstr "Проблема с вашим ключом сессии."
 
@@ -1928,13 +2002,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting an application.
 #: actions/deleteapplication.php:161
 #, fuzzy
-msgid "Do not delete this application"
+msgid "Do not delete this application."
 msgstr "Не удаляйте это приложение"
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
 #: actions/deleteapplication.php:167
 #, fuzzy
-msgid "Delete this application"
+msgid "Delete this application."
 msgstr "Удалить это приложение"
 
 #. TRANS: Client error when trying to delete group while not logged in.
@@ -1989,13 +2063,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting a group.
 #: actions/deletegroup.php:224
 #, fuzzy
-msgid "Do not delete this group"
+msgid "Do not delete this group."
 msgstr "Не удаляйте эту группу"
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
 #: actions/deletegroup.php:231
 #, fuzzy
-msgid "Delete this group"
+msgid "Delete this group."
 msgstr "Удалить эту группу"
 
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
@@ -2003,14 +2077,16 @@ msgstr "Удалить эту группу"
 #. TRANS: Client error displayed when trying to mark a notice as favorite without being logged in.
 #. TRANS: Client error displayed trying to block a user from a group while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
+#. TRANS: Client error displayed trying to log out when not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
+#. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
 #. TRANS: Client error displayed when trying to change user options while not logged in.
 #: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
-#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:69
+#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:70
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
-#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
-#: actions/tagother.php:33 actions/unsubscribe.php:52
+#: actions/nudge.php:63 actions/pluginenable.php:97 actions/subedit.php:33
+#: actions/subscribe.php:98 actions/tagother.php:33 actions/unsubscribe.php:52
 #: lib/adminpanelaction.php:71 lib/profileformaction.php:63
 #: lib/settingsaction.php:72
 msgid "Not logged in."
@@ -2039,12 +2115,13 @@ msgstr "Вы уверены, что хотите удалить эту запи
 #. TRANS: Submit button title for 'No' when deleting a notice.
 #: actions/deletenotice.php:159
 #, fuzzy
-msgid "Do not delete this notice"
+msgid "Do not delete this notice."
 msgstr "Не удалять эту запись"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:166 lib/noticelist.php:673
-msgid "Delete this notice"
+#: actions/deletenotice.php:166
+#, fuzzy
+msgid "Delete this notice."
 msgstr "Удалить эту запись"
 
 #. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
@@ -2081,18 +2158,17 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting a user.
 #: actions/deleteuser.php:158
 #, fuzzy
-msgid "Do not delete this user"
+msgid "Do not delete this user."
 msgstr "Не удаляйте эту группу"
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
-#. TRANS: Description of form for deleting a user.
-#: actions/deleteuser.php:165 lib/deleteuserform.php:75
-msgid "Delete this user"
+#: actions/deleteuser.php:165
+#, fuzzy
+msgid "Delete this user."
 msgstr "Удалить этого пользователя"
 
 #. TRANS: Message used as title for design settings for the site.
-#. TRANS: Link description in user account settings menu.
-#: actions/designadminpanel.php:60 lib/accountsettingsaction.php:134
+#: actions/designadminpanel.php:60 lib/settingsnav.php:97
 msgid "Design"
 msgstr "Оформление"
 
@@ -2159,8 +2235,7 @@ msgid "You can upload a custom StatusNet theme as a .ZIP archive."
 msgstr "Вы можете загрузить особую тему StatusNet в виде ZIP-архива."
 
 #. TRANS: Fieldset legend for theme background image.
-#. TRANS: Fieldset legend on profile design page.
-#: actions/designadminpanel.php:515 lib/designsettings.php:98
+#: actions/designadminpanel.php:515
 msgid "Change background image"
 msgstr "Изменение фонового изображения"
 
@@ -2168,7 +2243,7 @@ msgstr "Изменение фонового изображения"
 #. TRANS: Field label for background color selector.
 #. TRANS: Label on profile design page for setting a profile page background colour.
 #: actions/designadminpanel.php:525 actions/designadminpanel.php:609
-#: lib/designsettings.php:183
+#: lib/designform.php:238
 msgid "Background"
 msgstr "Фон"
 
@@ -2195,13 +2270,13 @@ msgstr "Отключить"
 #. TRANS: Form guide for turning background image on or off on theme designer page.
 #. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
 #. TRANS: use of the uploaded profile image.
-#: actions/designadminpanel.php:577 lib/designsettings.php:159
+#: actions/designadminpanel.php:577 lib/designform.php:214
 msgid "Turn background image on or off."
 msgstr "Включить или отключить показ фонового изображения."
 
 #. TRANS: Checkbox label to title background image on theme designer page.
 #. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-#: actions/designadminpanel.php:583 lib/designsettings.php:165
+#: actions/designadminpanel.php:583 lib/designform.php:220
 msgid "Tile background image"
 msgstr "Растянуть фоновое изображение"
 
@@ -2213,25 +2288,25 @@ msgstr "Изменение цветовой гаммы"
 
 #. TRANS: Field label for content color selector.
 #. TRANS: Label on profile design page for setting a profile page content colour.
-#: actions/designadminpanel.php:623 lib/designsettings.php:197
+#: actions/designadminpanel.php:623 lib/designform.php:252
 msgid "Content"
 msgstr "Содержание"
 
 #. TRANS: Field label for sidebar color selector.
 #. TRANS: Label on profile design page for setting a profile page sidebar colour.
-#: actions/designadminpanel.php:637 lib/designsettings.php:211
+#: actions/designadminpanel.php:637 lib/designform.php:266
 msgid "Sidebar"
 msgstr "Боковая панель"
 
 #. TRANS: Field label for text color selector.
 #. TRANS: Label on profile design page for setting a profile page text colour.
-#: actions/designadminpanel.php:651 lib/designsettings.php:225
+#: actions/designadminpanel.php:651 lib/designform.php:280
 msgid "Text"
 msgstr "Текст"
 
 #. TRANS: Field label for link color selector.
 #. TRANS: Label on profile design page for setting a profile page links colour.
-#: actions/designadminpanel.php:665 lib/designsettings.php:239
+#: actions/designadminpanel.php:665 lib/designform.php:294
 msgid "Links"
 msgstr "Ссылки"
 
@@ -2253,21 +2328,21 @@ msgid "Use defaults"
 msgstr "Использовать значения по умолчанию"
 
 #. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: actions/designadminpanel.php:720 lib/designsettings.php:259
-msgid "Restore default designs"
+#: actions/designadminpanel.php:720
+#, fuzzy
+msgid "Restore default designs."
 msgstr "Восстановить оформление по умолчанию"
 
 #. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: actions/designadminpanel.php:728 lib/designsettings.php:267
-msgid "Reset back to default"
+#: actions/designadminpanel.php:728
+#, fuzzy
+msgid "Reset back to default."
 msgstr "Восстановить значения по умолчанию"
 
 #. TRANS: Title for button for saving theme settings.
-#. TRANS: Title for button on profile design page to save settings.
-#: actions/designadminpanel.php:736 lib/designsettings.php:272
-msgid "Save design"
+#: actions/designadminpanel.php:736
+#, fuzzy
+msgid "Save design."
 msgstr "Сохранить оформление"
 
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
@@ -2299,7 +2374,7 @@ msgid "You must be logged in to edit an application."
 msgstr "Вы должны авторизоваться, чтобы изменить приложение."
 
 #. TRANS: Client error displayed trying to edit an application that does not exist.
-#: actions/editapplication.php:83 actions/showapplication.php:87
+#: actions/editapplication.php:83 actions/showapplication.php:83
 msgid "No such application."
 msgstr "Нет такого приложения."
 
@@ -2390,80 +2465,53 @@ msgstr "Изменить информацию о группе %s"
 msgid "You must be logged in to create a group."
 msgstr "Вы должны авторизоваться, чтобы создать новую группу."
 
-#. TRANS: Client error displayed trying to edit a group while not being a group admin.
-#. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
-#. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
-#: actions/editgroup.php:110 actions/editgroup.php:176
-#: actions/groupdesignsettings.php:109 actions/grouplogo.php:111
-msgid "You must be an admin to edit the group."
-msgstr "Вы должны быть администратором, чтобы изменять информацию о группе."
-
 #. TRANS: Form instructions for group edit form.
 #: actions/editgroup.php:161
 msgid "Use this form to edit the group."
 msgstr "Заполните информацию о группе в следующие поля"
 
-#. TRANS: Group edit form validation error.
-#. TRANS: Group create form validation error.
-#. TRANS: %s is the invalid alias.
-#: actions/editgroup.php:241 actions/newgroup.php:188
-#, php-format
-msgid "Invalid alias: \"%s\""
-msgstr "Неверный алиас: «%s»"
-
-#. TRANS: Server error displayed when editing a group fails.
-#: actions/editgroup.php:274
-msgid "Could not update group."
-msgstr "Не удаётся обновить информацию о группе."
-
-#. TRANS: Server error displayed when group aliases could not be added.
-#. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/editgroup.php:281 classes/User_group.php:540
-msgid "Could not create aliases."
-msgstr "Не удаётся создать алиасы."
-
 #. TRANS: Group edit form success message.
 #: actions/editgroup.php:301
 msgid "Options saved."
 msgstr "Настройки сохранены."
 
 #. TRANS: Title for e-mail settings.
-#: actions/emailsettings.php:59
+#: actions/emailsettings.php:60
 msgid "Email settings"
 msgstr "Настройка почты"
 
 #. TRANS: E-mail settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/emailsettings.php:73
+#: actions/emailsettings.php:74
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 msgstr "Управление процессом получения электронной почты с %%site.name%%."
 
 #. TRANS: Form legend for e-mail settings form.
 #. TRANS: Field label for e-mail address input in e-mail settings form.
-#: actions/emailsettings.php:103 actions/emailsettings.php:129
+#: actions/emailsettings.php:104 actions/emailsettings.php:130
 msgid "Email address"
 msgstr "Адрес эл. почты"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:109
+#: actions/emailsettings.php:110
 msgid "Current confirmed email address."
 msgstr "Подтверждённый в настоящее время электронный адрес."
 
 #. TRANS: Button label to remove a confirmed e-mail address.
 #. TRANS: Button label for removing a set sender e-mail address to post notices from.
-#. TRANS: Button label to remove a confirmed Instant Messaging address.
+#. TRANS: Button label to remove a confirmed IM address.
 #. TRANS: Button label to remove a confirmed SMS address.
 #. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
-#: actions/emailsettings.php:112 actions/emailsettings.php:179
-#: actions/imsettings.php:112 actions/smssettings.php:120
-#: actions/smssettings.php:176
+#: actions/emailsettings.php:113 actions/emailsettings.php:180
+#: actions/imsettings.php:119 actions/smssettings.php:119
+#: actions/smssettings.php:175
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Удалить"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:119
+#: actions/emailsettings.php:120
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -2476,47 +2524,47 @@ msgstr ""
 #. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
 #. TRANS: Any other domain may be owned by a legitimate person or
 #. TRANS: organization.
-#: actions/emailsettings.php:136
+#: actions/emailsettings.php:137
 msgid "Email address, like \"UserName@example.org\""
 msgstr "Электронный адрес вида \"UserName@example.org\""
 
 #. TRANS: Button label for adding an e-mail address in e-mail settings form.
-#. TRANS: Button label for adding an Instant Messaging address in Instant Messaging settings form.
+#. TRANS: Button label for adding an IM address in IM settings form.
 #. TRANS: Button label for adding a SMS phone number in SMS settings form.
-#: actions/emailsettings.php:140 actions/imsettings.php:147
-#: actions/smssettings.php:158
+#: actions/emailsettings.php:141 actions/imsettings.php:147
+#: actions/smssettings.php:157
 msgctxt "BUTTON"
 msgid "Add"
 msgstr "Добавить"
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:148 actions/smssettings.php:167
+#: actions/emailsettings.php:149 actions/smssettings.php:166
 msgid "Incoming email"
 msgstr "Входящий электронный адрес"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:154
+#: actions/emailsettings.php:155
 msgid "I want to post notices by email."
 msgstr "Я хочу отправлять записи по электронной почте."
 
 #. TRANS: Form instructions for incoming e-mail form in e-mail settings.
 #. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
-#: actions/emailsettings.php:176 actions/smssettings.php:174
+#: actions/emailsettings.php:177 actions/smssettings.php:173
 msgid "Send email to this address to post new notices."
 msgstr ""
 "Отправляйте электронные письма на этот адрес для отсылки новых записей."
 
 #. TRANS: Instructions for incoming e-mail address input form, when an address has already been assigned.
 #. TRANS: Instructions for incoming SMS e-mail address input form.
-#: actions/emailsettings.php:185 actions/smssettings.php:182
+#: actions/emailsettings.php:186 actions/smssettings.php:181
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr ""
 "Создаёт новый адрес электронной почты для отсылки сообщений; отменяет старый "
 "адрес."
 
 #. TRANS: Instructions for incoming e-mail address input form.
-#: actions/emailsettings.php:189
+#: actions/emailsettings.php:190
 msgid ""
 "To send notices via email, we need to create a unique email address for you "
 "on this server:"
@@ -2524,96 +2572,96 @@ msgstr ""
 
 #. TRANS: Button label for adding an e-mail address to send notices from.
 #. TRANS: Button label for adding an SMS e-mail address to send notices from.
-#: actions/emailsettings.php:195 actions/smssettings.php:185
+#: actions/emailsettings.php:196 actions/smssettings.php:184
 msgctxt "BUTTON"
 msgid "New"
 msgstr "Новый"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:204
+#: actions/emailsettings.php:205
 msgid "Email preferences"
 msgstr "Настройки эл. почты"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:212
+#: actions/emailsettings.php:213
 msgid "Send me notices of new subscriptions through email."
 msgstr "Уведомлять меня о новых подписчиках по почте."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:218
+#: actions/emailsettings.php:219
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr ""
 "Посылать мне сообщение по электронной почте, если кто-нибудь добавит мою "
 "запись в число любимых."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:225
+#: actions/emailsettings.php:226
 msgid "Send me email when someone sends me a private message."
 msgstr ""
 "Посылать мне сообщение по электронной почте, если кто-нибудь пошлёт мне "
 "приватное сообщение."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:231
+#: actions/emailsettings.php:232
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr ""
 "Посылать мне сообщение по электронной почте, если кто-нибудь пошлёт мне «@-"
 "ответ»."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:237
+#: actions/emailsettings.php:238
 msgid "Allow friends to nudge me and send me an email."
 msgstr ""
 "Разрешить друзьям «подталкивать» меня и посылать мне электронные сообщения."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:243
+#: actions/emailsettings.php:244
 msgid "Publish a MicroID for my email address."
 msgstr "Опубликовать MicroID для моего электронного адреса."
 
 #. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:361
+#: actions/emailsettings.php:362
 msgid "Email preferences saved."
 msgstr "Настройки эл. почты сохранены."
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:380
+#: actions/emailsettings.php:381
 msgid "No email address."
 msgstr "Нет электронного адреса."
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:388
+#: actions/emailsettings.php:389
 #, fuzzy
 msgid "Cannot normalize that email address."
 msgstr "Не удаётся стандартизировать этот электронный адрес"
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:393 actions/register.php:212
+#: actions/emailsettings.php:394 actions/register.php:197
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "Неверный электронный адрес."
 
 #. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:397
+#: actions/emailsettings.php:398
 msgid "That is already your email address."
 msgstr "Это уже Ваш электронный адрес."
 
 #. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:401
+#: actions/emailsettings.php:402
 msgid "That email address already belongs to another user."
 msgstr "Этот электронный адрес уже задействован другим пользователем."
 
 #. TRANS: Server error thrown on database error adding e-mail confirmation code.
 #. TRANS: Server error thrown on database error adding Instant Messaging confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:418 actions/imsettings.php:343
-#: actions/smssettings.php:365
+#: actions/emailsettings.php:419 actions/imsettings.php:362
+#: actions/smssettings.php:364
 #, fuzzy
 msgid "Could not insert confirmation code."
 msgstr "Не удаётся вставить код подтверждения."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:425
+#: actions/emailsettings.php:426
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
@@ -2625,59 +2673,62 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling Instant Messaging address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:445 actions/imsettings.php:377
-#: actions/smssettings.php:399
+#: actions/emailsettings.php:446 actions/imsettings.php:391
+#: actions/smssettings.php:398
 msgid "No pending confirmation to cancel."
 msgstr "Нет подтверждения отказа."
 
 #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:450
+#: actions/emailsettings.php:451
 msgid "That is the wrong email address."
 msgstr "Это неверный адрес эл. почты."
 
 #. TRANS: Server error thrown on database error canceling e-mail address confirmation.
 #. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
-#: actions/emailsettings.php:459 actions/smssettings.php:413
+#: actions/emailsettings.php:460 actions/smssettings.php:412
 #, fuzzy
 msgid "Could not delete email confirmation."
 msgstr "Не удаётся удалить подверждение по электронному адресу."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:464
+#: actions/emailsettings.php:465
 msgid "Email confirmation cancelled."
 msgstr "Подтверждение эл. почты отменено."
 
 #. TRANS: Message given trying to remove an e-mail address that is not
 #. TRANS: registered for the active user.
-#: actions/emailsettings.php:483
+#: actions/emailsettings.php:484
 msgid "That is not your email address."
 msgstr "Это не Ваш электронный адрес."
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:504
+#: actions/emailsettings.php:505
 msgid "The email address was removed."
 msgstr "Адрес эл. почты удалён."
 
 #. TRANS: Form validation error displayed when trying to remove an incoming e-mail address while no address has been set.
-#: actions/emailsettings.php:518 actions/smssettings.php:555
+#: actions/emailsettings.php:519 actions/smssettings.php:554
 msgid "No incoming email address."
 msgstr "Нет входящего электронного адреса."
 
 #. TRANS: Server error thrown on database error removing incoming e-mail address.
 #. TRANS: Server error thrown on database error adding incoming e-mail address.
-#: actions/emailsettings.php:530 actions/emailsettings.php:554
-#: actions/smssettings.php:565 actions/smssettings.php:588
+#. TRANS: Server error displayed when the user could not be updated in SMS settings.
+#: actions/emailsettings.php:531 actions/emailsettings.php:555
+#: actions/smssettings.php:565 actions/smssettings.php:590
 #, fuzzy
 msgid "Could not update user record."
 msgstr "Не удаётся обновить пользовательскую запись."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:534 actions/smssettings.php:568
+#. TRANS: Confirmation text after updating SMS settings.
+#: actions/emailsettings.php:535 actions/smssettings.php:569
 msgid "Incoming email address removed."
 msgstr "Входящий электронный адрес удалён."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:558 actions/smssettings.php:591
+#. TRANS: Confirmation text after updating SMS settings.
+#: actions/emailsettings.php:559 actions/smssettings.php:594
 msgid "New incoming email address added."
 msgstr "Новый входящий электронный адрес добавлен."
 
@@ -2689,7 +2740,7 @@ msgstr "Эта запись уже входит в число любимых!"
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
 #: actions/favor.php:95
 #, fuzzy
-msgid "Disfavor favorite"
+msgid "Disfavor favorite."
 msgstr "Разлюбить"
 
 #. TRANS: Page title for first page of favorited notices.
@@ -2742,9 +2793,8 @@ msgstr ""
 #. TRANS: %s is a user's nickname.
 #. TRANS: Title for first page of favourite notices of a user.
 #. TRANS: %s is the user for whom the favourite notices are displayed.
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing own favourited notices.
 #: actions/favoritesrss.php:111 actions/showfavorites.php:76
-#: lib/personalgroupnav.php:122
+#: lib/personalgroupnav.php:110
 #, php-format
 msgid "%s's favorite notices"
 msgstr "Любимые записи %s"
@@ -2931,13 +2981,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
 #: actions/groupblock.php:191
 #, fuzzy
-msgid "Do not block this user from this group"
+msgid "Do not block this user from this group."
 msgstr "Не блокировать этого пользователя из этой группы"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
 #: actions/groupblock.php:198
 #, fuzzy
-msgid "Block this user from this group"
+msgid "Block this user from this group."
 msgstr "Заблокировать этого пользователя из этой группы"
 
 #. TRANS: Server error displayed when trying to block a user from a group fails because of an application error.
@@ -2946,6 +2996,7 @@ msgid "Database error blocking user from group."
 msgstr "Ошибка базы данных при блокировании пользователя из группы."
 
 #. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
+#. TRANS: Client error displayed trying to find a user by ID without providing an ID.
 #: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr "Нет ID."
@@ -2976,7 +3027,7 @@ msgid "Unable to update your design settings."
 msgstr "Не удаётся сохранить ваши настройки оформления!"
 
 #. TRANS: Form text to confirm saved group design settings.
-#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:222
+#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:239
 msgid "Design preferences saved."
 msgstr "Настройки оформления сохранены."
 
@@ -3041,7 +3092,7 @@ msgid "A list of the users in this group."
 msgstr "Список пользователей, являющихся членами этой группы."
 
 #. TRANS: Indicator in group members list that this user is a group administrator.
-#: actions/groupmembers.php:190
+#: actions/groupmembers.php:190 lib/action.php:581
 msgid "Admin"
 msgstr "Настройки"
 
@@ -3134,8 +3185,10 @@ msgid "Group search"
 msgstr "Поиск группы"
 
 #. TRANS: Text on page where groups can be searched if no results were found for a query.
-#: actions/groupsearch.php:82 actions/noticesearch.php:117
-#: actions/peoplesearch.php:83
+#. TRANS: Text for notice search results is the query had no results.
+#. TRANS: Message on the "People search" page where a query has no results.
+#: actions/groupsearch.php:82 actions/noticesearch.php:122
+#: actions/peoplesearch.php:87
 msgid "No results."
 msgstr "Нет результатов."
 
@@ -3172,168 +3225,170 @@ msgid "User is not blocked from group."
 msgstr "Пользователь не заблокировал вас из группы."
 
 #. TRANS: Server error displayed when unblocking a user from a group fails because of an unknown error.
+#. TRANS: Server error displayed when removing a user block.
 #: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "Ошибка при удалении данного блока."
 
 #. TRANS: Title for Instant Messaging settings.
-#: actions/imsettings.php:58
+#: actions/imsettings.php:56
 msgid "IM settings"
 msgstr "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.
-#: actions/imsettings.php:71
+#: actions/imsettings.php:69
 #, fuzzy, php-format
 msgid ""
-"You can send and receive notices through Jabber/Google Talk [instant "
-"messages](%%doc.im%%). Configure your address and settings below."
+"You can send and receive notices through instant messaging [instant messages]"
+"(%%doc.im%%). Configure your addresses and settings below."
 msgstr ""
 "Вы можете отправлять и получать записи через Jabber/GTalk [онлайн-мессенджер]"
 "(%%doc.im%%). Настройте ваш аккаунт и предпочтения ниже."
 
-#. TRANS: Message given in the Instant Messaging settings if XMPP is not enabled on the site.
+#. TRANS: Message given in the IM settings if IM is not enabled on the site.
 #: actions/imsettings.php:90
 msgid "IM is not available."
 msgstr "IM не доступен."
 
-#. TRANS: Form legend for Instant Messaging settings form.
-#. TRANS: Field label for Instant Messaging address input in Instant Messaging settings form.
-#: actions/imsettings.php:102 actions/imsettings.php:132
-msgid "IM address"
-msgstr "IM-адрес"
+#: actions/imsettings.php:116
+#, fuzzy, php-format
+msgid "Current confirmed %s address."
+msgstr "Подтверждённый в настоящее время электронный адрес."
 
-#: actions/imsettings.php:109
-#, fuzzy
-msgid "Current confirmed Jabber/Google Talk address."
-msgstr "Подтверждённый в настоящее время Jabber/Gtalk - адрес."
-
-#. TRANS: Form note in Instant Messaging settings form.
-#. TRANS: %s is the Instant Messaging address set for the site.
-#: actions/imsettings.php:120
+#. TRANS: Form note in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:128
 #, fuzzy, php-format
 msgid ""
-"Awaiting confirmation on this address. Check your Jabber/Google Talk account "
-"for a message with further instructions. (Did you add %s to your buddy list?)"
+"Awaiting confirmation on this address. Check your %s account for a message "
+"with further instructions. (Did you add %s to your buddy list?)"
 msgstr ""
 "В ожидании подтверждения этого адреса. Проверьте ваш Jabber/GTalk на предмет "
 "сообщения с дальнейшими инструкциями. (Вы включили %s в ваш список "
 "контактов?)"
 
-#. TRANS: IM address input field instructions in Instant Messaging settings form.
-#. TRANS: %s is the Instant Messaging address set for the site.
-#. TRANS: Do not translate "example.org". It is one of the domain names reserved for use in examples by
-#. TRANS: http://www.rfc-editor.org/rfc/rfc2606.txt. Any other domain may be owned by a legitimate
-#. TRANS: person or organization.
-#: actions/imsettings.php:139
-#, fuzzy, php-format
-msgid ""
-"Jabber or Google Talk address, like \"UserName@example.org\". First, make "
-"sure to add %s to your buddy list in your IM client or on Google Talk."
-msgstr ""
-"Jabber или GTalk - адрес, типа \"UserName@example.org\". Первым делом "
-"убедитесь, что добавили %s в список Ваших корреспондентов на Вашем IM-"
-"мессенджере или в GTalk."
+#: actions/imsettings.php:140
+msgid "IM address"
+msgstr "IM-адрес"
 
-#. TRANS: Form legend for Instant Messaging preferences form.
-#: actions/imsettings.php:154
-msgid "IM preferences"
+#: actions/imsettings.php:142
+#, php-format
+msgid "%s screenname."
+msgstr ""
+
+#. TRANS: Header for IM preferences form.
+#: actions/imsettings.php:163
+#, fuzzy
+msgid "IM Preferences"
 msgstr "Настройки IM"
 
-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:159
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:174
 #, fuzzy
-msgid "Send me notices through Jabber/Google Talk."
-msgstr "Посылать мне записи через Jabber/GTalk."
+msgid "Send me notices"
+msgstr "Послать запись"
 
-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:165
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:176
 #, fuzzy
-msgid "Post a notice when my Jabber/Google Talk status changes."
+msgid "Post a notice when my status changes."
 msgstr "Публиковать запись, когда мой Jabber/GTalk - статус изменяется."
 
-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:171
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:178
 #, fuzzy
-msgid ""
-"Send me replies through Jabber/Google Talk from people I'm not subscribed to."
+msgid "Send me replies from people I'm not subscribed to."
 msgstr ""
 "Посылать мне реплики через Jabber/GTalk от людей, на которых я не подписан."
 
-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:178
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:181
 #, fuzzy
-msgid "Publish a MicroID for my Jabber/Google Talk address."
-msgstr "Опубликовать MicroID для моего Jabber/GTalk - адреса."
+msgid "Publish a MicroID"
+msgstr "Опубликовать MicroID для моего электронного адреса."
 
-#. TRANS: Confirmation message for successful Instant Messaging preferences save.
-#: actions/imsettings.php:283 actions/othersettings.php:192
+#. TRANS: Server error thrown on database error updating IM preferences.
+#: actions/imsettings.php:291
+#, fuzzy
+msgid "Couldn't update IM preferences."
+msgstr "Не удаётся обновить пользователя."
+
+#. TRANS: Confirmation message for successful IM preferences save.
+#. TRANS: Confirmation message after saving preferences.
+#: actions/imsettings.php:298 actions/urlsettings.php:244
 msgid "Preferences saved."
 msgstr "Предпочтения сохранены."
 
-#. TRANS: Message given saving Instant Messaging address without having provided one.
-#: actions/imsettings.php:304
-msgid "No Jabber ID."
-msgstr "Не Jabber ID."
-
-#. TRANS: Message given saving Instant Messaging address that cannot be normalised.
-#: actions/imsettings.php:312
+#. TRANS: Message given saving IM address without having provided one.
+#: actions/imsettings.php:320
 #, fuzzy
-msgid "Cannot normalize that Jabber ID."
+msgid "No screenname."
+msgstr "Нет имени."
+
+#: actions/imsettings.php:325
+#, fuzzy
+msgid "No transport."
+msgstr "Запись отсутствует."
+
+#. TRANS: Message given saving IM address that cannot be normalised.
+#: actions/imsettings.php:333
+#, fuzzy
+msgid "Cannot normalize that screenname"
 msgstr "Не удаётся стандартизировать этот Jabber ID"
 
-#. TRANS: Message given saving Instant Messaging address that not valid.
-#: actions/imsettings.php:317
+#. TRANS: Message given saving IM address that not valid.
+#: actions/imsettings.php:340
 #, fuzzy
-msgid "Not a valid Jabber ID."
-msgstr "Неверный код Jabber ID"
+msgid "Not a valid screenname"
+msgstr "Неверное имя."
 
-#. TRANS: Message given saving Instant Messaging address that is already set.
-#: actions/imsettings.php:321
-msgid "That is already your Jabber ID."
-msgstr "Это уже Ваш Jabber ID."
-
-#. TRANS: Message given saving Instant Messaging address that is already set for another user.
-#: actions/imsettings.php:325
-msgid "Jabber ID already belongs to another user."
+#. TRANS: Message given saving IM address that is already set for another user.
+#: actions/imsettings.php:344
+#, fuzzy
+msgid "Screenname already belongs to another user."
 msgstr "Этот Jabber ID уже используется другим пользователем."
 
-#. TRANS: Message given saving valid Instant Messaging address that is to be confirmed.
-#. TRANS: %s is the Instant Messaging address set for the site.
-#: actions/imsettings.php:353
-#, php-format
-msgid ""
-"A confirmation code was sent to the IM address you added. You must approve %"
-"s for sending messages to you."
+#. TRANS: Message given saving valid IM address that is to be confirmed.
+#: actions/imsettings.php:369
+#, fuzzy
+msgid "A confirmation code was sent to the IM address you added."
 msgstr ""
 "Код подтверждения выслан на добавленный вами IM-адрес. Вы должны подтвердить "
 "%s для отправки вам сообщений."
 
-#. TRANS: Message given canceling Instant Messaging address confirmation for the wrong IM address.
-#: actions/imsettings.php:382
+#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#: actions/imsettings.php:396
 msgid "That is the wrong IM address."
 msgstr "Это неверный IM-адрес."
 
-#. TRANS: Server error thrown on database error canceling Instant Messaging address confirmation.
-#: actions/imsettings.php:391
+#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#: actions/imsettings.php:405
 #, fuzzy
-msgid "Could not delete IM confirmation."
+msgid "Couldn't delete confirmation."
 msgstr "Не удаётся удалить подверждение IM."
 
-#. TRANS: Message given after successfully canceling Instant Messaging address confirmation.
-#: actions/imsettings.php:396
+#. TRANS: Message given after successfully canceling IM address confirmation.
+#: actions/imsettings.php:410
 msgid "IM confirmation cancelled."
 msgstr "Подтверждение IM отменено."
 
-#. TRANS: Message given trying to remove an Instant Messaging address that is not
+#. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.
-#: actions/imsettings.php:417
-msgid "That is not your Jabber ID."
-msgstr "Это не Ваш Jabber ID."
+#: actions/imsettings.php:434
+#, fuzzy
+msgid "That is not your screenname."
+msgstr "Это не Ваш номер телефона."
+
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#: actions/imsettings.php:443
+#, fuzzy
+msgid "Couldn't update user im prefs."
+msgstr "Не удаётся обновить пользовательскую запись."
 
 #. TRANS: Message given after successfully removing a registered Instant Messaging address.
-#: actions/imsettings.php:440
+#: actions/imsettings.php:451
 msgid "The IM address was removed."
 msgstr "Адрес IM удалён."
 
@@ -3554,7 +3609,7 @@ msgid "You must be logged in to join a group."
 msgstr "Вы должны авторизоваться для вступления в группу."
 
 #. TRANS: Title for join group page after joining.
-#: actions/joingroup.php:147
+#: actions/joingroup.php:148
 #, fuzzy, php-format
 msgctxt "TITLE"
 msgid "%1$s joined group %2$s"
@@ -3683,7 +3738,7 @@ msgstr "URL изображения, отображаемого вместе с 
 #. TRANS: Submit button title.
 #: actions/licenseadminpanel.php:311 actions/sessionsadminpanel.php:199
 #: actions/siteadminpanel.php:292 actions/snapshotadminpanel.php:245
-#: actions/tagother.php:154 lib/applicationeditform.php:357
+#: actions/tagother.php:133 lib/applicationeditform.php:357
 msgid "Save"
 msgstr "Сохранить"
 
@@ -3691,39 +3746,41 @@ msgstr "Сохранить"
 msgid "Save license settings"
 msgstr "Сохранить настройки лицензии"
 
-#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
+#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
+#: actions/login.php:97 actions/otp.php:62 actions/register.php:130
 msgid "Already logged in."
 msgstr "Вы уже авторизовались."
 
-#: actions/login.php:148
+#: actions/login.php:125
 msgid "Incorrect username or password."
 msgstr "Некорректное имя или пароль."
 
-#: actions/login.php:154 actions/otp.php:120
+#. TRANS: Server error displayed when a user object could not be created trying to login using "one time password login".
+#: actions/login.php:131 actions/otp.php:127
 msgid "Error setting user. You are probably not authorized."
 msgstr "Ошибка установки пользователя. Вы, вероятно, не авторизованы."
 
-#: actions/login.php:210 actions/login.php:263
+#: actions/login.php:185 actions/login.php:236 lib/action.php:598
 msgid "Login"
 msgstr "Вход"
 
-#: actions/login.php:249
+#: actions/login.php:222
 msgid "Login to site"
 msgstr "Авторизоваться"
 
-#: actions/login.php:258 actions/register.php:490
+#: actions/login.php:231 actions/register.php:469
 msgid "Remember me"
 msgstr "Запомнить меня"
 
-#: actions/login.php:259 actions/register.php:492
+#: actions/login.php:232 actions/register.php:471
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "Автоматическии входить в дальнейшем. Не для общедоступных компьютеров!"
 
-#: actions/login.php:269
+#: actions/login.php:241
 msgid "Lost or forgotten password?"
 msgstr "Потеряли или забыли пароль?"
 
-#: actions/login.php:288
+#: actions/login.php:259
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -3731,11 +3788,11 @@ msgstr ""
 "По причинам сохранения безопасности введите имя и пароль ещё раз, прежде чем "
 "изменять Ваши установки."
 
-#: actions/login.php:292
+#: actions/login.php:263
 msgid "Login with your username and password."
 msgstr "Войти с вашим именем участника и паролем."
 
-#: actions/login.php:295
+#: actions/login.php:266
 #, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -3863,7 +3920,9 @@ msgstr "Новая запись"
 msgid "Notice posted"
 msgstr "Запись опубликована"
 
-#: actions/noticesearch.php:68
+#. TRANS: Instructions for Notice search page.
+#. TRANS: %%site.name%% is the name of the StatusNet site.
+#: actions/noticesearch.php:69
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -3872,16 +3931,21 @@ msgstr ""
 "Поиск по содержанию записей на %%site.name%%. Между ключевыми словами "
 "ставьте пробелы. Минимальная длина слова — 3 буквы."
 
-#: actions/noticesearch.php:78
+#. TRANS: Title of the page where users can search for notices.
+#: actions/noticesearch.php:80
 msgid "Text search"
 msgstr "Поиск текста"
 
-#: actions/noticesearch.php:91
+#. TRANS: Test in RSS notice search.
+#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
+#: actions/noticesearch.php:95
 #, php-format
 msgid "Search results for \"%1$s\" on %2$s"
 msgstr "Результаты поиска для «%1$s» на %2$s"
 
-#: actions/noticesearch.php:121
+#. TRANS: Text for logged in users making a query for notices without results.
+#. TRANS: This message contains a Markdown link.
+#: actions/noticesearch.php:128
 #, php-format
 msgid ""
 "Be the first to [post on this topic](%%%%action.newnotice%%%%?"
@@ -3890,7 +3954,9 @@ msgstr ""
 "Станьте первыми, кто [напишет на эту тему](%%%%action.newnotice%%%%?"
 "status_textarea=%s)!"
 
-#: actions/noticesearch.php:124
+#. TRANS: Text for not logged in users making a query for notices without results.
+#. TRANS: This message contains Markdown links.
+#: actions/noticesearch.php:133
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and be the first to "
@@ -3899,14 +3965,17 @@ msgstr ""
 "Почему бы не [зарегистрироваться](%%%%action.register%%%%) и не отправить "
 "первое [сообщение на эту тему](%%%%action.newnotice%%%%?status_textarea=%s)?"
 
-#: actions/noticesearchrss.php:96
+#. TRANS: RSS notice search feed title. %s is the query.
+#: actions/noticesearchrss.php:95
 #, php-format
 msgid "Updates with \"%s\""
 msgstr "Обновления с «$s»"
 
-#: actions/noticesearchrss.php:98
+#. TRANS: RSS notice search feed description.
+#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
+#: actions/noticesearchrss.php:99
 #, fuzzy, php-format
-msgid "Updates matching search term \"%1$s\" on %2$s!"
+msgid "Updates matching search term \"%1$s\" on %2$s."
 msgstr "Все обновления, соответствующие поисковому запросу «%s»"
 
 #: actions/nudge.php:85
@@ -3926,51 +3995,51 @@ msgid "Nudge sent!"
 msgstr "«Подталкивание» отправлено!"
 
 #. TRANS: Message displayed to an anonymous user trying to view OAuth application list.
-#: actions/oauthappssettings.php:60
+#: actions/oauthappssettings.php:57
 msgid "You must be logged in to list your applications."
 msgstr "Вы должны авторизоваться, чтобы просматривать свои приложения."
 
 #. TRANS: Page title for OAuth applications
-#: actions/oauthappssettings.php:76
+#: actions/oauthappssettings.php:73
 msgid "OAuth applications"
 msgstr "Приложения OAuth"
 
 #. TRANS: Page instructions for OAuth applications
-#: actions/oauthappssettings.php:88
+#: actions/oauthappssettings.php:85
 msgid "Applications you have registered"
 msgstr "Приложения, которые вы зарегистрировали"
 
 #. TRANS: Empty list message on page with OAuth applications.
-#: actions/oauthappssettings.php:141
+#: actions/oauthappssettings.php:138
 #, php-format
 msgid "You have not registered any applications yet."
 msgstr "Вы пока не зарегистрировали ни одного приложения."
 
 #. TRANS: Title for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:71
+#: actions/oauthconnectionssettings.php:69
 msgid "Connected applications"
 msgstr "Подключённые приложения"
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:83
+#: actions/oauthconnectionssettings.php:80
 msgid "The following connections exist for your account."
 msgstr "Следующие приложения подключены к вашей учётной записи."
 
 #. TRANS: Client error when trying to revoke access for an application while not being a user of it.
-#: actions/oauthconnectionssettings.php:168
+#: actions/oauthconnectionssettings.php:165
 msgid "You are not a user of that application."
 msgstr "Вы не являетесь пользователем этого приложения."
 
 #. TRANS: Client error when revoking access has failed for some reason.
 #. TRANS: %s is the application ID revoking access failed for.
-#: actions/oauthconnectionssettings.php:183
+#: actions/oauthconnectionssettings.php:180
 #, php-format
 msgid "Unable to revoke access for application: %s."
 msgstr "Не удаётся отозвать доступ для приложения: %s."
 
 #. TRANS: Success message after revoking access for an application.
 #. TRANS: %1$s is the application name, %2$s is the first part of the user token.
-#: actions/oauthconnectionssettings.php:202
+#: actions/oauthconnectionssettings.php:199
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -3979,14 +4048,14 @@ msgstr ""
 "Доступ для %1$s и ключ доступа, начинающийся на %2$s, успешно отозваны."
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:213
+#: actions/oauthconnectionssettings.php:210
 msgid "You have not authorized any applications to use your account."
 msgstr "Вы не разрешили приложениям использовать вашу учётную запись."
 
 #. TRANS: Note for developers in the OAuth connection settings form.
 #. TRANS: This message contains a Markdown link. Do not separate "](".
 #. TRANS: %s is the URL to the OAuth settings.
-#: actions/oauthconnectionssettings.php:233
+#: actions/oauthconnectionssettings.php:230
 #, php-format
 msgid ""
 "Are you a developer? [Register an OAuth client application](%s) to use with "
@@ -3995,6 +4064,16 @@ msgstr ""
 "Вы разработчик? [Зарегистрируйте клиентское приложение OAuth](%s) для "
 "использования с этим сайтом StatusNet."
 
+#: actions/oembed.php:64
+#, fuzzy, php-format
+msgid "\"%s\" not found."
+msgstr "Метод API не найден."
+
+#: actions/oembed.php:76
+#, fuzzy, php-format
+msgid "Notice %s not found."
+msgstr "Родительская запись не найдена."
+
 #: actions/oembed.php:80 actions/shownotice.php:100
 msgid "Notice has no profile."
 msgstr "Уведомление не имеет профиля."
@@ -4004,6 +4083,16 @@ msgstr "Уведомление не имеет профиля."
 msgid "%1$s's status on %2$s"
 msgstr "Статус %1$s на %2$s"
 
+#: actions/oembed.php:95
+#, fuzzy, php-format
+msgid "Attachment %s not found."
+msgstr "Получатель не найден."
+
+#: actions/oembed.php:136
+#, php-format
+msgid "\"%s\" not supported for oembed requests."
+msgstr ""
+
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
 #: actions/oembed.php:168
 #, php-format
@@ -4017,93 +4106,60 @@ msgid "Only %s URLs over plain HTTP please."
 msgstr "Только %s URL в простом HTTP, пожалуйста."
 
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1205
-#: lib/apiaction.php:1232 lib/apiaction.php:1367
+#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1207
+#: lib/apiaction.php:1234 lib/apiaction.php:1369
 msgid "Not a supported data format."
 msgstr "Неподдерживаемый формат данных."
 
+#. TRANS: ShortName in the OpenSearch interface when trying to find users.
 #: actions/opensearch.php:64
 msgid "People Search"
 msgstr "Поиск людей"
 
-#: actions/opensearch.php:67
+#: actions/opensearch.php:68
 msgid "Notice Search"
 msgstr "Поиск в записях"
 
-#: actions/othersettings.php:59
-msgid "Other settings"
-msgstr "Другие настройки"
-
-#. TRANS: Instructions for tab "Other" in user profile settings.
-#: actions/othersettings.php:71
-msgid "Manage various other options."
-msgstr "Управление другими опциями."
-
-#. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
-#. TRANS: user's profile settings. Use of "free" is as in "open", indicating that the
-#. TRANS: information on the shortener site is freely distributable.
-#. TRANS: This message has one space at the beginning. Use your language's word separator
-#. TRANS: here if it has one (most likely a single space).
-#: actions/othersettings.php:113
-msgid " (free service)"
-msgstr " (свободный сервис)"
-
-#. TRANS: Label for dropdown with URL shortener services.
-#: actions/othersettings.php:122
-msgid "Shorten URLs with"
-msgstr "Сокращать URL с помощью"
-
-#. TRANS: Tooltip for for dropdown with URL shortener services.
-#: actions/othersettings.php:124
-msgid "Automatic shortening service to use."
-msgstr "Автоматически использовать выбранный сервис"
-
-#. TRANS: Label for checkbox.
-#: actions/othersettings.php:130
-msgid "View profile designs"
-msgstr "Показать оформления профиля"
-
-#. TRANS: Tooltip for checkbox.
-#: actions/othersettings.php:132
-msgid "Show or hide profile designs."
-msgstr "Показать или скрыть оформления профиля."
-
-#. TRANS: Form validation error for form "Other settings" in user profile.
-#: actions/othersettings.php:164
-msgid "URL shortening service is too long (maximum 50 characters)."
-msgstr "Сервис сокращения URL слишком длинный (максимум 50 символов)."
-
-#: actions/otp.php:69
+#. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
+#: actions/otp.php:70
 msgid "No user ID specified."
 msgstr "Не указан идентификатор пользователя."
 
-#: actions/otp.php:83
+#. TRANS: Client error displayed trying to use "one time password login" without specifying a login token.
+#: actions/otp.php:86
 msgid "No login token specified."
 msgstr "Не указан ключ для входа."
 
-#: actions/otp.php:90
+#. TRANS: Client error displayed trying to use "one time password login" without requesting a login token.
+#: actions/otp.php:94
 msgid "No login token requested."
 msgstr "Ключ для входа не был запрошен."
 
-#: actions/otp.php:95
+#. TRANS: Client error displayed trying to use "one time password login" while specifying an invalid login token.
+#: actions/otp.php:100
 msgid "Invalid login token specified."
 msgstr "Задан неверный ключ для входа."
 
-#: actions/otp.php:104
+#. TRANS: Client error displayed trying to use "one time password login" while specifying an expired login token.
+#: actions/otp.php:110
 msgid "Login token expired."
 msgstr "Срок действия ключа для входа истёк."
 
-#: actions/outbox.php:58
+#. TRANS: Title for outbox for any but the fist page.
+#. TRANS: %1$s is the user nickname, %2$d is the page number.
+#: actions/outbox.php:57
 #, php-format
 msgid "Outbox for %1$s - page %2$d"
 msgstr "Исходящие для %s — страница %2$d"
 
+#. TRANS: Title for first page of outbox.
 #: actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
 msgstr "Исходящие для %s"
 
-#: actions/outbox.php:104
+#. TRANS: Instructions for outbox.
+#: actions/outbox.php:103
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr ""
 "Это список исходящих писем, в котором перечислены отправленные вами личные "
@@ -4131,43 +4187,45 @@ msgstr "Старый пароль"
 msgid "New password"
 msgstr "Новый пароль"
 
-#: actions/passwordsettings.php:109
+#: actions/passwordsettings.php:109 actions/register.php:416
 #, fuzzy
-msgid "6 or more characters"
+msgid "6 or more characters."
 msgstr "6 или больше знаков"
 
-#: actions/passwordsettings.php:113
+#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#: actions/passwordsettings.php:113 actions/recoverpassword.php:264
+#: actions/register.php:420
 #, fuzzy
-msgid "Same as password above"
+msgid "Same as password above."
 msgstr "Тот же пароль, что и выше"
 
 #: actions/passwordsettings.php:117
 msgid "Change"
 msgstr "Изменить"
 
-#: actions/passwordsettings.php:154 actions/register.php:238
+#: actions/passwordsettings.php:153 actions/register.php:223
 msgid "Password must be 6 or more characters."
 msgstr "Пароль должен быть длиной не менее 6 символов."
 
-#: actions/passwordsettings.php:157 actions/register.php:241
+#: actions/passwordsettings.php:156 actions/register.php:226
 msgid "Passwords don't match."
 msgstr "Пароли не совпадают."
 
-#: actions/passwordsettings.php:165
+#: actions/passwordsettings.php:164
 msgid "Incorrect old password"
 msgstr "Некорректный старый пароль"
 
-#: actions/passwordsettings.php:181
+#: actions/passwordsettings.php:180
 msgid "Error saving user; invalid."
 msgstr "Ошибка сохранения пользователя; неверное имя."
 
-#: actions/passwordsettings.php:186
+#. TRANS: Reset password form validation error message.
+#: actions/passwordsettings.php:185 actions/recoverpassword.php:418
 #, fuzzy
-msgid "Can't save new password."
+msgid "Cannot save new password."
 msgstr "Не удаётся сохранить новый пароль."
 
-#. TRANS: Title for password recovery page in password saved mode.
-#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
+#: actions/passwordsettings.php:191
 msgid "Password saved."
 msgstr "Пароль сохранён."
 
@@ -4372,8 +4430,7 @@ msgid "Directory where backgrounds are located."
 msgstr "Директория, в которой расположены фоновые изображения."
 
 #. TRANS: Fieldset legens in Paths admin panel.
-#. TRANS: DT element label in attachment list.
-#: actions/pathsadminpanel.php:419 lib/attachmentlist.php:98
+#: actions/pathsadminpanel.php:419
 msgid "Attachments"
 msgstr "Вложения"
 
@@ -4441,7 +4498,9 @@ msgstr "Сервер, которому направлять SSL-запросы."
 msgid "Save paths"
 msgstr "Сохранить пути"
 
-#: actions/peoplesearch.php:52
+#. TRANS: Instructions for the "People search" page.
+#. TRANS: %%site.name%% is the name of the StatusNet site.
+#: actions/peoplesearch.php:54
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
@@ -4450,7 +4509,8 @@ msgstr ""
 "Поиск людей на %%site.name%% по имени, месторасположению или интересам. "
 "Разделяйте ключевые слова пробелами. Минимальная длина слова — 3 буквы."
 
-#: actions/peoplesearch.php:58
+#. TRANS: Title of a page where users can search for other users.
+#: actions/peoplesearch.php:61
 msgid "People search"
 msgstr "Поиск людей"
 
@@ -4464,6 +4524,60 @@ msgstr "Неверный тег человека: %s."
 msgid "Users self-tagged with %1$s - page %2$d"
 msgstr "Пользователи, установившие себе тег %1$s — страница %2$d"
 
+#. TRANS: Page title for AJAX form return when a disabling a plugin.
+#: actions/plugindisable.php:69
+msgctxt "plugin"
+msgid "Disabled"
+msgstr ""
+
+#. TRANS: Client error displayed trying to perform any request method other than POST.
+#. TRANS: Do not translate POST.
+#: actions/pluginenable.php:78 actions/subscribe.php:77
+msgid "This action only accepts POST requests."
+msgstr "Это действие принимает только POST-запросы."
+
+#: actions/pluginenable.php:102
+#, fuzzy
+msgid "You cannot administer plugins."
+msgstr "Вы не можете удалять пользователей."
+
+#: actions/pluginenable.php:109
+#, fuzzy
+msgid "No such plugin."
+msgstr "Нет такой страницы."
+
+#. TRANS: Page title for AJAX form return when enabling a plugin.
+#: actions/pluginenable.php:159
+msgctxt "plugin"
+msgid "Enabled"
+msgstr ""
+
+#. TRANS: Tab and title for plugins admin panel.
+#. TRANS: Menu item for site administration
+#: actions/pluginsadminpanel.php:56 actions/version.php:191
+#: lib/adminpanelaction.php:411
+msgid "Plugins"
+msgstr "Плагины"
+
+#. TRANS: Instructions at top of plugin admin page.
+#: actions/pluginsadminpanel.php:68
+msgid ""
+"Additional plugins can be enabled and configured manually. See the <a href="
+"\"http://status.net/wiki/Plugins\">online plugin documentation</a> for more "
+"details."
+msgstr ""
+
+#. TRANS: Admin form section header
+#: actions/pluginsadminpanel.php:84
+#, fuzzy
+msgid "Default plugins"
+msgstr "Язык по умолчанию"
+
+#: actions/pluginsadminpanel.php:106
+msgid ""
+"All default plugins have been disabled from the site's configuration file."
+msgstr ""
+
 #: actions/postnotice.php:95
 msgid "Invalid notice content."
 msgstr "Ошибочное содержание записи."
@@ -4474,12 +4588,12 @@ msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’.
 msgstr "Лицензия записи «%1$s» не совместима с лицензией сайта «%2$s»."
 
 #. TRANS: Page title for profile settings.
-#: actions/profilesettings.php:59
+#: actions/profilesettings.php:60
 msgid "Profile settings"
 msgstr "Настройки профиля"
 
 #. TRANS: Usage instructions for profile settings.
-#: actions/profilesettings.php:70
+#: actions/profilesettings.php:71
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
@@ -4487,41 +4601,38 @@ msgstr ""
 "больше."
 
 #. TRANS: Profile settings form legend.
-#: actions/profilesettings.php:98
+#: actions/profilesettings.php:99
 msgid "Profile information"
 msgstr "Информация профиля"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109 actions/register.php:433
+#: actions/profilesettings.php:110 actions/register.php:412
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr ""
 "1-64 латинских строчных буквы или цифры, без знаков препинания и пробелов"
 
 #. TRANS: Field label in form for profile settings.
-#. TRANS: Label for full group name (dt). Text hidden by default.
-#. TRANS: DT for full name in a profile.
-#: actions/profilesettings.php:113 actions/register.php:455
-#: actions/showgroup.php:255 actions/tagother.php:104
-#: lib/groupeditform.php:150 lib/userprofile.php:156
+#: actions/profilesettings.php:114 actions/register.php:434
+#: lib/groupeditform.php:150
 msgid "Full name"
 msgstr "Полное имя"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:118 actions/register.php:460
+#: actions/profilesettings.php:119 actions/register.php:439
 #: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "Главная"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:121
+#: actions/profilesettings.php:122 actions/register.php:441
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr "Адрес вашей домашней страницы, блога или профиля на другом сайте."
 
 #. TRANS: Tooltip for field label in form for profile settings. Plural
 #. TRANS: is decided by the number of characters available for the
 #. TRANS: biography (%d).
-#: actions/profilesettings.php:129 actions/register.php:471
+#: actions/profilesettings.php:130 actions/register.php:450
 #, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4530,85 +4641,81 @@ msgstr[1] "Опишите себя и свои увлечения при пом
 msgstr[2] "Опишите себя и свои увлечения при помощи %d символов"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:135 actions/register.php:476
+#: actions/profilesettings.php:136 actions/register.php:455
 msgid "Describe yourself and your interests"
 msgstr "Опишите себя и свои интересы"
 
 #. TRANS: Text area label in form for profile settings where users can provide.
 #. TRANS: their biography.
-#: actions/profilesettings.php:139 actions/register.php:478
+#: actions/profilesettings.php:140 actions/register.php:457
 msgid "Bio"
 msgstr "Биография"
 
 #. TRANS: Field label in form for profile settings.
-#. TRANS: Label for group location (dt). Text hidden by default.
-#. TRANS: DT for location in a profile.
-#: actions/profilesettings.php:145 actions/register.php:483
-#: actions/showgroup.php:265 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:173
-#: lib/userprofile.php:172
+#: actions/profilesettings.php:146 actions/register.php:462
+#: lib/groupeditform.php:173
 msgid "Location"
 msgstr "Месторасположение"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148 actions/register.php:485
+#: actions/profilesettings.php:149
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Где вы находитесь, например «Город, область, страна»"
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:153
+#: actions/profilesettings.php:154
 msgid "Share my current location when posting notices"
 msgstr "Делиться своим текущим местоположением при отправке записей"
 
 #. TRANS: Field label in form for profile settings.
-#. TRANS: DT for tags in a profile.
-#: actions/profilesettings.php:161 actions/tagother.php:149
-#: actions/tagother.php:209 lib/subscriptionlist.php:106
-#: lib/subscriptionlist.php:108 lib/userprofile.php:220
+#: actions/profilesettings.php:162 actions/tagother.php:128
+#: actions/tagother.php:188 lib/subscriptionlist.php:104
+#: lib/subscriptionlist.php:106
 msgid "Tags"
 msgstr "Теги"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:164
+#: actions/profilesettings.php:165
 #, fuzzy
 msgid ""
-"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- "
+"separated."
 msgstr ""
 "Теги для самого себя (буквы, цифры, -, ., и _), разделенные запятой или "
 "пробелом"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:169
+#: actions/profilesettings.php:170
 msgid "Language"
 msgstr "Язык"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:171
+#: actions/profilesettings.php:172
 #, fuzzy
-msgid "Preferred language"
+msgid "Preferred language."
 msgstr "Предпочитаемый язык"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:181
+#: actions/profilesettings.php:182
 msgid "Timezone"
 msgstr "Часовой пояс"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:183
+#: actions/profilesettings.php:184
 msgid "What timezone are you normally in?"
 msgstr "В каком часовом поясе Вы обычно находитесь?"
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:189
+#: actions/profilesettings.php:190
 #, fuzzy
 msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)"
+"Automatically subscribe to whoever subscribes to me (best for non-humans)."
 msgstr "Автоматически подписываться на всех, кто подписался на меня"
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Plural form is used based on the maximum number of allowed
 #. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:258 actions/register.php:229
+#: actions/profilesettings.php:259 actions/register.php:214
 #, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4617,49 +4724,49 @@ msgstr[1] "Слишком длинная биография (максимум %d
 msgstr[2] "Слишком длинная биография (максимум %d символов)."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:269 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:270 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr "Часовой пояс не выбран."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:277
+#: actions/profilesettings.php:278
 msgid "Language is too long (maximum 50 characters)."
 msgstr "Слишком длинный язык (максимум 50 символов)."
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:291 actions/tagother.php:178
-#, php-format
-msgid "Invalid tag: \"%s\""
+#: actions/profilesettings.php:292
+#, fuzzy, php-format
+msgid "Invalid tag: \"%s\"."
 msgstr "Неверный тег: «%s»"
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:347
+#: actions/profilesettings.php:348
 #, fuzzy
 msgid "Could not update user for autosubscribe."
 msgstr "Не удаётся обновить пользователя для автоподписки."
 
 #. TRANS: Server error thrown when user profile location preference settings could not be updated.
-#: actions/profilesettings.php:405
+#: actions/profilesettings.php:406
 #, fuzzy
 msgid "Could not save location prefs."
 msgstr "Не удаётся сохранить настройки местоположения."
 
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:427 actions/tagother.php:200
+#: actions/profilesettings.php:428 actions/tagother.php:179
 msgid "Could not save tags."
 msgstr "Не удаётся сохранить теги."
 
 #. TRANS: Confirmation shown when user profile settings are saved.
 #. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:436 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:437 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "Настройки сохранены."
 
 #. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
 #. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:483 actions/restoreaccount.php:60
+#: actions/profilesettings.php:484 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "Создать новый аккаунт"
@@ -4738,6 +4845,12 @@ msgstr ""
 "Микроблоггинг), созданный с использованием свободного программного "
 "обеспечения [StatusNet](http://status.net/)."
 
+#. TRANS: Public RSS feed description. %s is the StatusNet site name.
+#: actions/publicrss.php:106
+#, fuzzy, php-format
+msgid "%s updates from everyone."
+msgstr "Обновления %s от всех!"
+
 #. TRANS: Title for public tag cloud.
 #: actions/publictagcloud.php:57
 msgid "Public tag cloud"
@@ -4778,10 +4891,6 @@ msgstr ""
 "Почему бы не [зарегистрироваться](%%action.register%%), чтобы отправить "
 "первым?"
 
-#: actions/publictagcloud.php:146
-msgid "Tag cloud"
-msgstr "Облако тегов"
-
 #. TRANS: Client error displayed trying to recover password while already logged in.
 #: actions/recoverpassword.php:37
 msgid "You are already logged in!"
@@ -4873,6 +4982,12 @@ msgstr "Восстановление пароля"
 msgid "Password recovery requested"
 msgstr "Запрошено восстановление пароля"
 
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/recoverpassword.php:229
+#, fuzzy
+msgid "Password saved"
+msgstr "Пароль сохранён."
+
 #. TRANS: Title for password recovery page when an unknown action has been specified.
 #: actions/recoverpassword.php:232
 msgid "Unknown action"
@@ -4884,15 +4999,9 @@ msgstr "Неизвестное действие"
 msgid "6 or more characters, and do not forget it!"
 msgstr "6 или более символов, и не забывайте его!"
 
-#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
-#: actions/recoverpassword.php:264 actions/register.php:441
-#, fuzzy
-msgid "Same as password above."
-msgstr "Тот же пароль, что и выше"
-
 #. TRANS: Button text for password reset form.
 #. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: actions/recoverpassword.php:268 lib/designsettings.php:264
+#: actions/recoverpassword.php:268 lib/designform.php:145
 msgctxt "BUTTON"
 msgid "Reset"
 msgstr "Сбросить"
@@ -4941,14 +5050,8 @@ msgstr "Пароль должен быть длиной не менее 6 сим
 msgid "Password and confirmation do not match."
 msgstr "Пароль и его подтверждение не совпадают."
 
-#. TRANS: Reset password form validation error message.
-#: actions/recoverpassword.php:418
-#, fuzzy
-msgid "Cannot save new password."
-msgstr "Не удаётся сохранить новый пароль."
-
 #. TRANS: Server error displayed when something does wrong with the user object during password reset.
-#: actions/recoverpassword.php:426 actions/register.php:256
+#: actions/recoverpassword.php:426 actions/register.php:241
 msgid "Error setting user."
 msgstr "Ошибка в установках пользователя."
 
@@ -4957,78 +5060,82 @@ msgstr "Ошибка в установках пользователя."
 msgid "New password successfully saved. You are now logged in."
 msgstr "Новый пароль успешно сохранён. Вы авторизовались."
 
-#: actions/register.php:92 actions/register.php:196 actions/register.php:413
+#: actions/redirecturl.php:70
+#, fuzzy
+msgid "No id parameter"
+msgstr "Нет аргумента ID."
+
+#: actions/redirecturl.php:76
+#, fuzzy, php-format
+msgid "No such file \"%d\""
+msgstr "Нет такого файла."
+
+#: actions/register.php:80 actions/register.php:181 actions/register.php:392
 msgid "Sorry, only invited people can register."
 msgstr "Простите, регистрация только по приглашению."
 
-#: actions/register.php:99
+#: actions/register.php:87
 msgid "Sorry, invalid invitation code."
 msgstr "Извините, неверный пригласительный код."
 
-#: actions/register.php:119
+#: actions/register.php:106
 msgid "Registration successful"
 msgstr "Регистрация успешна!"
 
-#: actions/register.php:121 actions/register.php:511
+#: actions/register.php:108 actions/register.php:490
 msgid "Register"
 msgstr "Регистрация"
 
-#: actions/register.php:142
+#: actions/register.php:128
 msgid "Registration not allowed."
 msgstr "Регистрация недопустима."
 
-#: actions/register.php:209
+#: actions/register.php:194
 #, fuzzy
-msgid "You can't register if you don't agree to the license."
+msgid "You cannot register if you don't agree to the license."
 msgstr ""
 "Вы не можете зарегистрироваться, если Вы не подтверждаете лицензионного "
 "соглашения."
 
-#: actions/register.php:218
+#: actions/register.php:203
 msgid "Email address already exists."
 msgstr "Такой электронный адрес уже задействован."
 
-#: actions/register.php:251 actions/register.php:273
+#: actions/register.php:236 actions/register.php:258
 msgid "Invalid username or password."
 msgstr "Неверное имя или пароль."
 
-#: actions/register.php:351
+#: actions/register.php:333
 #, fuzzy
 msgid ""
 "With this form you can create a new account. You can then post notices and "
-"link up to friends and colleagues. "
+"link up to friends and colleagues."
 msgstr ""
 "С помощью этой формы вы можете создать новую учётную запись. Тогда вы "
 "получите возможность публиковать короткие сообщения и устанавливать связи с "
 "друзьями и коллегами. "
 
-#: actions/register.php:437
-#, fuzzy
-msgid "6 or more characters."
-msgstr "6 или больше знаков"
-
-#. TRANS: Link description in user account settings menu.
-#: actions/register.php:445 actions/register.php:449
-#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
+#: actions/register.php:424 actions/register.php:428
+#: actions/siteadminpanel.php:238 lib/settingsnav.php:92
 msgid "Email"
 msgstr "Email"
 
-#: actions/register.php:446 actions/register.php:450
+#: actions/register.php:425 actions/register.php:429
 #, fuzzy
-msgid "Used only for updates, announcements, and password recovery"
+msgid "Used only for updates, announcements, and password recovery."
 msgstr "Нужна только для обновлений, осведомлений и восстановления пароля."
 
-#: actions/register.php:457
+#: actions/register.php:436
 #, fuzzy
-msgid "Longer name, preferably your \"real\" name"
+msgid "Longer name, preferably your \"real\" name."
 msgstr "Полное имя, предпочтительно Ваше настоящее имя"
 
-#: actions/register.php:462
+#: actions/register.php:464
 #, fuzzy
-msgid "URL of your homepage, blog, or profile on another site"
-msgstr "Адрес вашей домашней страницы, блога или профиля на другом сайте."
+msgid "Where you are, like \"City, State (or Region), Country\"."
+msgstr "Где вы находитесь, например «Город, область, страна»"
 
-#: actions/register.php:523
+#: actions/register.php:503
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
@@ -5036,23 +5143,23 @@ msgstr ""
 "Я понимаю, что содержание и данные %1$s являются частными и "
 "конфиденциальными."
 
-#: actions/register.php:533
+#: actions/register.php:513
 #, php-format
 msgid "My text and files are copyright by %1$s."
 msgstr "Авторским правом на мои тексты и файлы обладает %1$s."
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:537
+#: actions/register.php:517
 msgid "My text and files remain under my own copyright."
 msgstr "Авторские права на мои тексты и файлы остаются за мной."
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:540
+#: actions/register.php:520
 msgid "All rights reserved."
 msgstr "Все права защищены."
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:545
+#: actions/register.php:525
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -5061,7 +5168,7 @@ msgstr ""
 "Мои тексты и файлы доступны на условиях %s, за исключением следующей личной "
 "информации: пароля, почтового адреса, номера мессенджера и номера телефона."
 
-#: actions/register.php:588
+#: actions/register.php:566
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -5095,7 +5202,7 @@ msgstr ""
 "Спасибо за то, что присоединились к нам, надеемся, что вы получите "
 "удовольствие от использования данного сервиса!"
 
-#: actions/register.php:612
+#: actions/register.php:590
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5127,7 +5234,7 @@ msgstr "Имя пользователя."
 
 #: actions/remotesubscribe.php:129
 #, fuzzy
-msgid "Nickname of the user you want to follow"
+msgid "Nickname of the user you want to follow."
 msgstr "Имя пользователя, которому Вы хотите следовать"
 
 #: actions/remotesubscribe.php:132
@@ -5136,18 +5243,18 @@ msgstr "URL профиля"
 
 #: actions/remotesubscribe.php:133
 #, fuzzy
-msgid "URL of your profile on another compatible microblogging service"
+msgid "URL of your profile on another compatible microblogging service."
 msgstr "Адрес URL твоего профиля на другом подходящем сервисе микроблогинга"
 
 #. TRANS: Link text for link that will subscribe to a remote profile.
 #: actions/remotesubscribe.php:136 lib/subscribeform.php:139
-#: lib/userprofile.php:431
+#: lib/userprofile.php:402
 msgid "Subscribe"
 msgstr "Подписаться"
 
 #: actions/remotesubscribe.php:158
 #, fuzzy
-msgid "Invalid profile URL (bad format)"
+msgid "Invalid profile URL (bad format)."
 msgstr "Неверный URL профиля (плохой формат)"
 
 #: actions/remotesubscribe.php:167
@@ -5181,7 +5288,7 @@ msgstr "Вы не можете повторить собственную зап
 msgid "You already repeated that notice."
 msgstr "Вы уже повторили эту запись."
 
-#: actions/repeat.php:112 lib/noticelist.php:692
+#: actions/repeat.php:112 lib/noticelist.php:697
 msgid "Repeated"
 msgstr "Повторено"
 
@@ -5189,9 +5296,9 @@ msgstr "Повторено"
 msgid "Repeated!"
 msgstr "Повторено!"
 
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing @-replies.
+#. TRANS: RSS reply feed title. %s is a user nickname.
 #: actions/replies.php:126 actions/repliesrss.php:68
-#: lib/personalgroupnav.php:109
+#: lib/personalgroupnav.php:105
 #, php-format
 msgid "Replies to %s"
 msgstr "Ответы для %s"
@@ -5243,9 +5350,11 @@ msgstr ""
 "Вы можете попробовать «[подтолкнуть %1$s](../%2$s)» или [написать им что-"
 "нибудь](%%%%action.newnotice%%%%?status_textarea=%3$s)."
 
-#: actions/repliesrss.php:72
+#. TRANS: RSS reply feed description.
+#. TRANS: %1$s is a user nickname, %2$s is the StatusNet site name.
+#: actions/repliesrss.php:74
 #, fuzzy, php-format
-msgid "Replies to %1$s on %2$s!"
+msgid "Replies to %1$s on %2$s."
 msgstr "Ответы на записи %1$s на %2$s!"
 
 #. TRANS: Client exception displayed when trying to restore an account while not logged in.
@@ -5346,7 +5455,7 @@ msgstr "Вы не можете снимать роли пользователе
 msgid "User doesn't have this role."
 msgstr "Пользователь не имеет этой роли."
 
-#: actions/rsd.php:146 actions/version.php:159
+#: actions/rsd.php:142 actions/version.php:159
 msgid "StatusNet"
 msgstr "StatusNet"
 
@@ -5389,87 +5498,38 @@ msgstr "Включить отладочный вывод для сессий."
 msgid "Save site settings"
 msgstr "Сохранить настройки сайта"
 
-#: actions/showapplication.php:82
+#: actions/showapplication.php:78
 msgid "You must be logged in to view an application."
 msgstr "Вы должны авторизоваться, чтобы просматривать приложения."
 
-#: actions/showapplication.php:157
+#: actions/showapplication.php:151
 msgid "Application profile"
 msgstr "Профиль приложения"
 
-#. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:159 lib/applicationeditform.php:177
-msgid "Icon"
-msgstr "Иконка"
-
-#. TRANS: Form input field label for application name.
-#: actions/showapplication.php:169 actions/version.php:197
-#: lib/applicationeditform.php:190
-msgid "Name"
-msgstr "Имя"
-
-#. TRANS: Form input field label.
-#: actions/showapplication.php:178 lib/applicationeditform.php:227
-msgid "Organization"
-msgstr "Организация"
-
-#. TRANS: Form input field label.
-#: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:168
-msgid "Description"
-msgstr "Описание"
-
-#. TRANS: Header for group statistics on a group page (h2).
-#. TRANS: H2 text for user statistics.
-#: actions/showapplication.php:192 actions/showgroup.php:460
-#: lib/profileaction.php:205
-msgid "Statistics"
-msgstr "Статистика"
-
-#: actions/showapplication.php:203
+#: actions/showapplication.php:179
 #, php-format
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr "Создано %1$s — доступ по умолчанию: %2$s — %3$d польз."
 
-#: actions/showapplication.php:213
+#: actions/showapplication.php:189
 msgid "Application actions"
 msgstr "Действия приложения"
 
-#: actions/showapplication.php:236
+#: actions/showapplication.php:212
 msgid "Reset key & secret"
 msgstr "Сбросить ключ и секретную фразу"
 
 #. TRANS: Title of form for deleting a user.
-#: actions/showapplication.php:252 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:64 lib/noticelist.php:673
+#: actions/showapplication.php:228 lib/deletegroupform.php:121
+#: lib/deleteuserform.php:64 lib/noticelist.php:678
 msgid "Delete"
 msgstr "Удалить"
 
-#: actions/showapplication.php:261
+#: actions/showapplication.php:237
 msgid "Application info"
 msgstr "Информация о приложении"
 
-#: actions/showapplication.php:263
-msgid "Consumer key"
-msgstr "Потребительский ключ"
-
-#: actions/showapplication.php:268
-msgid "Consumer secret"
-msgstr "Секретная фраза потребителя"
-
-#: actions/showapplication.php:273
-msgid "Request token URL"
-msgstr "URL ключа запроса"
-
-#: actions/showapplication.php:278
-msgid "Access token URL"
-msgstr "URL ключа доступа"
-
-#: actions/showapplication.php:283
-msgid "Authorize URL"
-msgstr "URL авторизации"
-
-#: actions/showapplication.php:288
+#: actions/showapplication.php:255
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
@@ -5477,7 +5537,7 @@ msgstr ""
 "Примечание: Мы поддерживаем подписи HMAC-SHA1. Мы не поддерживаем метод "
 "подписи открытым текстом."
 
-#: actions/showapplication.php:309
+#: actions/showapplication.php:275
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr ""
 "Вы уверены, что хотите сбросить ваш ключ потребителя и секретную фразу?"
@@ -5564,61 +5624,47 @@ msgstr "Группа %s"
 msgid "%1$s group, page %2$d"
 msgstr "Группа %1$s, страница %2$d"
 
-#. TRANS: Group profile header (h2). Text hidden by default.
-#: actions/showgroup.php:223
-msgid "Group profile"
-msgstr "Профиль группы"
-
-#. TRANS: Label for group URL (dt). Text hidden by default.
-#. TRANS: DT for URL in a profile.
-#: actions/showgroup.php:273 actions/tagother.php:118
-#: actions/userauthorization.php:175 lib/userprofile.php:186
-msgid "URL"
-msgstr "URL"
-
 #. TRANS: Label for group description or group note (dt). Text hidden by default.
-#. TRANS: DT for note in a profile.
-#: actions/showgroup.php:285 actions/tagother.php:128
-#: actions/userauthorization.php:187 lib/userprofile.php:204
+#: actions/showgroup.php:266
 msgid "Note"
 msgstr "Запись"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:296 lib/groupeditform.php:180
+#: actions/showgroup.php:277 lib/groupeditform.php:180
 msgid "Aliases"
 msgstr "Алиасы"
 
 #. TRANS: Group actions header (h2). Text hidden by default.
-#: actions/showgroup.php:313
+#: actions/showgroup.php:294
 msgid "Group actions"
 msgstr "Действия группы"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:357
+#: actions/showgroup.php:338
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
 msgstr "Лента записей группы %s (RSS 1.0)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:364
+#: actions/showgroup.php:345
 #, php-format
 msgid "Notice feed for %s group (RSS 2.0)"
 msgstr "Лента записей группы %s (RSS 2.0)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:371
+#: actions/showgroup.php:352
 #, php-format
 msgid "Notice feed for %s group (Atom)"
 msgstr "Лента записей группы %s (Atom)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:377
+#: actions/showgroup.php:358
 #, php-format
 msgid "FOAF for %s group"
 msgstr "FOAF для группы %s"
 
 #. TRANS: Header for mini list of group members on a group page (h2).
-#: actions/showgroup.php:414
+#: actions/showgroup.php:395
 msgid "Members"
 msgstr "Участники"
 
@@ -5626,25 +5672,30 @@ msgstr "Участники"
 #. TRANS: Text for user subscription statistics if the user has no subscriptions.
 #. TRANS: Text for user subscriber statistics if user has no subscribers.
 #. TRANS: Text for user user group membership statistics if user is not a member of any group.
-#: actions/showgroup.php:420 lib/profileaction.php:137
+#: actions/showgroup.php:401 lib/profileaction.php:137
 #: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
-#: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
+#: lib/subscriptionlist.php:123 lib/tagcloudsection.php:71
 msgid "(None)"
 msgstr "(пока ничего нет)"
 
 #. TRANS: Link to all group members from mini list of group members if group has more than n members.
-#: actions/showgroup.php:429
+#: actions/showgroup.php:410
 msgid "All members"
 msgstr "Все участники"
 
-#. TRANS: Label for creation date in statistics on group page.
-#: actions/showgroup.php:465
+#. TRANS: Header for group statistics on a group page (h2).
+#. TRANS: H2 text for user statistics.
+#: actions/showgroup.php:441 lib/profileaction.php:205
+msgid "Statistics"
+msgstr "Статистика"
+
+#: actions/showgroup.php:444
 msgctxt "LABEL"
 msgid "Created"
 msgstr "Дата создания"
 
 #. TRANS: Label for member count in statistics on group page.
-#: actions/showgroup.php:473
+#: actions/showgroup.php:449
 msgctxt "LABEL"
 msgid "Members"
 msgstr "Участники"
@@ -5653,7 +5704,7 @@ msgstr "Участники"
 #. TRANS: **%s** is the group alias, %%%%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).
-#: actions/showgroup.php:488
+#: actions/showgroup.php:464
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5672,7 +5723,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: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
-#: actions/showgroup.php:498
+#: actions/showgroup.php:474
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5686,7 +5737,7 @@ msgstr ""
 "короткими сообщениями о своей жизни и интересах. "
 
 #. TRANS: Header for list of group administrators on a group page (h2).
-#: actions/showgroup.php:527
+#: actions/showgroup.php:503
 msgid "Admins"
 msgstr "Администраторы"
 
@@ -5725,7 +5776,7 @@ msgid "%1$s tagged %2$s"
 msgstr "%1$s с тегом %2$s"
 
 #. TRANS: Page title showing tagged notices in one user's stream.
-#. TRANS: %1$s is the username, %2$s is the hash tag, %1$d is the page number.
+#. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
 #: actions/showstream.php:74
 #, php-format
 msgid "%1$s tagged %2$s, page %3$d"
@@ -5772,13 +5823,13 @@ msgid "FOAF for %s"
 msgstr "FOAF для %s"
 
 #. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
-#: actions/showstream.php:211
+#: actions/showstream.php:205
 #, php-format
 msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr "Это лента %1$s, однако %1$s пока ничего не отправил."
 
 #. TRANS: Second sentence of empty list message for a stream for the user themselves.
-#: actions/showstream.php:217
+#: actions/showstream.php:211
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
@@ -5788,7 +5839,7 @@ msgstr ""
 
 #. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:221
+#: actions/showstream.php:215
 #, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
@@ -5799,7 +5850,7 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:264
+#: actions/showstream.php:258
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5816,7 +5867,7 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:271
+#: actions/showstream.php:265
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5829,7 +5880,7 @@ msgstr ""
 "net/). "
 
 #. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
-#: actions/showstream.php:328
+#: actions/showstream.php:322
 #, php-format
 msgid "Repeat of %s"
 msgstr "Повтор за %s"
@@ -5976,77 +6027,77 @@ msgstr "Текст уведомления сайта (максимум 255 си
 #. TRANS: Title for button to save site notice in admin panel.
 #: actions/sitenoticeadminpanel.php:201
 #, fuzzy
-msgid "Save site notice"
+msgid "Save site notice."
 msgstr "Сохранить уведомление сайта"
 
 #. TRANS: Title for SMS settings.
-#: actions/smssettings.php:57
+#: actions/smssettings.php:56
 msgid "SMS settings"
 msgstr "Установки СМС"
 
 #. TRANS: SMS settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/smssettings.php:71
+#: actions/smssettings.php:70
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr ""
 "Вы можете отправлять СМС-сообщения по электронному адресу от %%site.name%%."
 
 #. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
-#: actions/smssettings.php:93
+#: actions/smssettings.php:92
 msgid "SMS is not available."
 msgstr "Отправка СМС недоступна."
 
 #. TRANS: Form legend for SMS settings form.
-#: actions/smssettings.php:107
+#: actions/smssettings.php:106
 msgid "SMS address"
 msgstr "SMS-адрес"
 
 #. TRANS: Form guide in SMS settings form.
-#: actions/smssettings.php:116
+#: actions/smssettings.php:115
 msgid "Current confirmed SMS-enabled phone number."
 msgstr ""
 "Подтверждённый в настоящее время SMS-доступный номер мобильного телефона."
 
 #. TRANS: Form guide in IM settings form.
-#: actions/smssettings.php:129
+#: actions/smssettings.php:128
 msgid "Awaiting confirmation on this phone number."
 msgstr "В ожидании подтверждения данного номера телефона."
 
 #. TRANS: Field label for SMS address input in SMS settings form.
-#: actions/smssettings.php:138
+#: actions/smssettings.php:137
 msgid "Confirmation code"
 msgstr "Код подтверждения"
 
 #. TRANS: Form field instructions in SMS settings form.
-#: actions/smssettings.php:140
+#: actions/smssettings.php:139
 msgid "Enter the code you received on your phone."
 msgstr "Введите код, который вы получили по телефону."
 
 #. TRANS: Button label to confirm SMS confirmation code in SMS settings.
-#: actions/smssettings.php:144
+#: actions/smssettings.php:143
 msgctxt "BUTTON"
 msgid "Confirm"
 msgstr "Подтвердить"
 
 #. TRANS: Field label for SMS phone number input in SMS settings form.
-#: actions/smssettings.php:149
+#: actions/smssettings.php:148
 msgid "SMS phone number"
 msgstr "Номер телефона для СМС"
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
-#: actions/smssettings.php:152
+#: actions/smssettings.php:151
 #, fuzzy
-msgid "Phone number, no punctuation or spaces, with area code"
+msgid "Phone number, no punctuation or spaces, with area code."
 msgstr "Номер телефона, без пробелов, с кодом зоны"
 
 #. TRANS: Form legend for SMS preferences form.
-#: actions/smssettings.php:191
+#: actions/smssettings.php:190
 msgid "SMS preferences"
 msgstr "Настройки SMS"
 
 #. TRANS: Checkbox label in SMS preferences form.
-#: actions/smssettings.php:197
+#: actions/smssettings.php:196
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
@@ -6055,32 +6106,32 @@ msgstr ""
 "по пересылке."
 
 #. TRANS: Confirmation message for successful SMS preferences save.
-#: actions/smssettings.php:308
+#: actions/smssettings.php:307
 msgid "SMS preferences saved."
 msgstr "Настройки SMS сохранены."
 
 #. TRANS: Message given saving SMS phone number without having provided one.
-#: actions/smssettings.php:330
+#: actions/smssettings.php:329
 msgid "No phone number."
 msgstr "Нет номера телефона."
 
 #. TRANS: Message given saving SMS phone number without having selected a carrier.
-#: actions/smssettings.php:336
+#: actions/smssettings.php:335
 msgid "No carrier selected."
 msgstr "Провайдер не выбран."
 
 #. TRANS: Message given saving SMS phone number that is already set.
-#: actions/smssettings.php:344
+#: actions/smssettings.php:343
 msgid "That is already your phone number."
 msgstr "Это уже ваш номер телефона."
 
 #. TRANS: Message given saving SMS phone number that is already set for another user.
-#: actions/smssettings.php:348
+#: actions/smssettings.php:347
 msgid "That phone number already belongs to another user."
 msgstr "Этот телефонный номер уже задействован другим пользователем."
 
 #. TRANS: Message given saving valid SMS phone number that is to be confirmed.
-#: actions/smssettings.php:376
+#: actions/smssettings.php:375
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
 "for the code and instructions on how to use it."
@@ -6089,39 +6140,39 @@ msgstr ""
 "телефон для нахождения этого кода и инструкций по его использованию."
 
 #. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
-#: actions/smssettings.php:404
+#: actions/smssettings.php:403
 msgid "That is the wrong confirmation number."
 msgstr "Это неверный номер подтверждения."
 
 #. TRANS: Message given after successfully canceling SMS phone number confirmation.
-#: actions/smssettings.php:418
+#: actions/smssettings.php:417
 msgid "SMS confirmation cancelled."
 msgstr "Подтверждение SMS отменено."
 
 #. TRANS: Message given trying to remove an SMS phone number that is not
 #. TRANS: registered for the active user.
-#: actions/smssettings.php:438
+#: actions/smssettings.php:437
 msgid "That is not your phone number."
 msgstr "Это не Ваш номер телефона."
 
 #. TRANS: Message given after successfully removing a registered SMS phone number.
-#: actions/smssettings.php:460
+#: actions/smssettings.php:459
 msgid "The SMS phone number was removed."
 msgstr "Номер SMS телефона удалён."
 
 #. TRANS: Label for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:499
+#: actions/smssettings.php:498
 msgid "Mobile carrier"
 msgstr "Выбор провайдера"
 
 #. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:504
+#: actions/smssettings.php:503
 msgid "Select a carrier"
 msgstr "Выбор провайдера"
 
 #. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
 #. TRANS: %s is an administrative contact's e-mail address.
-#: actions/smssettings.php:513
+#: actions/smssettings.php:512
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -6132,7 +6183,7 @@ msgstr ""
 "то сообщите нам об этом по электронной почте %s."
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
-#: actions/smssettings.php:535
+#: actions/smssettings.php:534
 #, fuzzy
 msgid "No code entered."
 msgstr "Код не введён"
@@ -6206,17 +6257,15 @@ msgstr "Вы не подписаны на этот профиль."
 msgid "Could not save subscription."
 msgstr "Не удаётся сохранить подписку."
 
-#: actions/subscribe.php:77
-msgid "This action only accepts POST requests."
-msgstr "Это действие принимает только POST-запросы."
-
-#: actions/subscribe.php:117
+#. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
+#: actions/subscribe.php:121
 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
 msgstr ""
 "Вы не можете подписаться на удалённый профиль OMB 0.1 с помощью этого "
 "действия."
 
-#: actions/subscribe.php:145
+#. TRANS: Page title when subscription succeeded.
+#: actions/subscribe.php:149
 msgid "Subscribed"
 msgstr "Подписано"
 
@@ -6333,31 +6382,34 @@ msgid "Subscription feed for %s (Atom)"
 msgstr "Лента записей для %s (Atom)"
 
 #. TRANS: Checkbox label for enabling Jabber messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:239
-msgid "Jabber"
-msgstr "Jabber"
+#: actions/subscriptions.php:241 lib/settingsnav.php:110
+#, fuzzy
+msgid "IM"
+msgstr "IM"
 
 #. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:254
+#: actions/subscriptions.php:256 lib/settingsnav.php:117
 msgid "SMS"
 msgstr "СМС"
 
-#: actions/tag.php:69
+#. TRANS: Title for all but the first page of notices with tags.
+#. TRANS: %1$s is the tag, %2$d is the page number.
+#: actions/tag.php:73
 #, php-format
 msgid "Notices tagged with %1$s, page %2$d"
 msgstr "Записи с тегом %1$s, страница %2$d"
 
-#: actions/tag.php:87
+#: actions/tag.php:91
 #, php-format
 msgid "Notice feed for tag %s (RSS 1.0)"
 msgstr "Лента записей для тега %s (RSS 1.0)"
 
-#: actions/tag.php:93
+#: actions/tag.php:97
 #, php-format
 msgid "Notice feed for tag %s (RSS 2.0)"
 msgstr "Лента записей для тега %s (RSS 2.0)"
 
-#: actions/tag.php:99
+#: actions/tag.php:103
 #, php-format
 msgid "Notice feed for tag %s (Atom)"
 msgstr "Лента записей для тега %s (Atom)"
@@ -6376,17 +6428,11 @@ msgstr "Теги %s"
 msgid "User profile"
 msgstr "Профиль пользователя"
 
-#. TRANS: DT element in area for user avatar.
-#: actions/tagother.php:81 actions/userauthorization.php:132
-#: lib/userprofile.php:108
-msgid "Photo"
-msgstr "Фото"
-
-#: actions/tagother.php:141
+#: actions/tagother.php:120
 msgid "Tag user"
 msgstr "Теги для пользователя"
 
-#: actions/tagother.php:151
+#: actions/tagother.php:130
 msgid ""
 "Tags for this user (letters, numbers, -, ., and _), comma- or space- "
 "separated"
@@ -6394,14 +6440,19 @@ msgstr ""
 "Теги для этого пользователя (буквы, цифры, -, ., и _), разделённые запятой "
 "или пробелом"
 
-#: actions/tagother.php:193
+#: actions/tagother.php:157
+#, php-format
+msgid "Invalid tag: \"%s\""
+msgstr "Неверный тег: «%s»"
+
+#: actions/tagother.php:172
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 "Вы можете помечать тегами только пользователей, на которых подписаны или "
 "которые подписаны на Вас."
 
-#: actions/tagother.php:236
+#: actions/tagother.php:215
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
 "Используйте эту форму для добавления тегов Вашим подписчикам или подписантам."
@@ -6410,6 +6461,7 @@ msgstr ""
 msgid "No such tag."
 msgstr "Нет такого тега."
 
+#. TRANS: Client error displayed when trying to unblock a non-blocked user.
 #: actions/unblock.php:59
 msgid "You haven't blocked that user."
 msgstr "Вы не заблокировали этого пользователя."
@@ -6430,13 +6482,84 @@ msgstr "Нет ID профиля в запросе."
 msgid "Unsubscribed"
 msgstr "Отписано"
 
-#: actions/updateprofile.php:64 actions/userauthorization.php:337
+#: actions/updateprofile.php:64
 #, php-format
 msgid ""
 "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
 msgstr ""
 "Лицензия просматриваемого потока «%1$s» несовместима с лицензией сайта «%2$s»."
 
+#: actions/urlsettings.php:60
+#, fuzzy
+msgid "URL settings"
+msgstr "IM-установки"
+
+#. TRANS: Instructions for tab "Other" in user profile settings.
+#: actions/urlsettings.php:72
+msgid "Manage various other options."
+msgstr "Управление другими опциями."
+
+#. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
+#. TRANS: user's profile settings. This message has one space at the beginning. Use your
+#. TRANS: language's word separator here if it has one (most likely a single space).
+#: actions/urlsettings.php:115
+msgid " (free service)"
+msgstr " (свободный сервис)"
+
+#: actions/urlsettings.php:121
+#, fuzzy
+msgid "[none]"
+msgstr "Нет тегов"
+
+#: actions/urlsettings.php:122
+msgid "[internal]"
+msgstr ""
+
+#. TRANS: Label for dropdown with URL shortener services.
+#: actions/urlsettings.php:130
+msgid "Shorten URLs with"
+msgstr "Сокращать URL с помощью"
+
+#. TRANS: Tooltip for for dropdown with URL shortener services.
+#: actions/urlsettings.php:132
+msgid "Automatic shortening service to use."
+msgstr "Автоматически использовать выбранный сервис"
+
+#: actions/urlsettings.php:138
+msgid "URL longer than"
+msgstr ""
+
+#: actions/urlsettings.php:141
+msgid "URLs longer than this will be shortened, 0 means always shorten."
+msgstr ""
+
+#: actions/urlsettings.php:145
+msgid "Text longer than"
+msgstr ""
+
+#: actions/urlsettings.php:148
+msgid ""
+"URLs in notices longer than this will be shortened, 0 means always shorten."
+msgstr ""
+
+#. TRANS: Form validation error for form "Other settings" in user profile.
+#: actions/urlsettings.php:180
+msgid "URL shortening service is too long (maximum 50 characters)."
+msgstr "Сервис сокращения URL слишком длинный (максимум 50 символов)."
+
+#: actions/urlsettings.php:187
+msgid "Invalid number for max url length."
+msgstr ""
+
+#: actions/urlsettings.php:193
+#, fuzzy
+msgid "Invalid number for max notice length."
+msgstr "Ошибочное содержание записи."
+
+#: actions/urlsettings.php:238
+msgid "Error saving user URL shortening preferences."
+msgstr ""
+
 #. TRANS: User admin panel title
 #: actions/useradminpanel.php:58
 msgctxt "TITLE"
@@ -6463,11 +6586,11 @@ msgstr ""
 #. TRANS: users in user admin panel. %1$s is the invalid nickname.
 #: actions/useradminpanel.php:166
 #, fuzzy, php-format
-msgid "Invalid default subscripton: '%1$s' is not a user."
+msgid "Invalid default subscripton: \"%1$s\" is not a user."
 msgstr "Неверная подписка по умолчанию: «%1$s» не является пользователем."
 
-#. TRANS: Link description in user account settings menu.
-#: actions/useradminpanel.php:215 lib/accountsettingsaction.php:106
+#: actions/useradminpanel.php:215 lib/action.php:565 lib/settingsnav.php:77
+#: lib/subgroupnav.php:81
 msgid "Profile"
 msgstr "Профиль"
 
@@ -6524,59 +6647,63 @@ msgstr "Разрешать ли пользователям приглашать
 #. TRANS: Title for button to save user settings in user admin panel.
 #: actions/useradminpanel.php:302
 #, fuzzy
-msgid "Save user settings"
+msgid "Save user settings."
 msgstr "Сохранить пользовательские настройки"
 
-#: actions/userauthorization.php:105
+#. TRANS: Page title.
+#: actions/userauthorization.php:109
 msgid "Authorize subscription"
 msgstr "Авторизовать подписку"
 
-#: actions/userauthorization.php:110
+#. TRANS: Page notice on "Auhtorize subscription" page.
+#: actions/userauthorization.php:115
 #, fuzzy
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
 "user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
-"click “Reject”."
+"click \"Reject\"."
 msgstr ""
 "Пожалуйста, проверьте эти подробности, чтобы быть уверенным, что вы хотите "
 "подписаться на записи этого пользователя. Если Вы этого не хотите делать, "
 "нажмите «Отказ»."
 
-#. TRANS: Menu item for site administration
-#: actions/userauthorization.php:196 actions/version.php:167
-#: lib/adminpanelaction.php:403
-msgid "License"
-msgstr "Лицензия"
-
-#: actions/userauthorization.php:217
+#. TRANS: Button text on Authorise Subscription page.
+#: actions/userauthorization.php:200
 #, fuzzy
+msgctxt "BUTTON"
 msgid "Accept"
 msgstr "Принять"
 
-#: actions/userauthorization.php:218 lib/subscribeform.php:115
-#: lib/subscribeform.php:139
-msgid "Subscribe to this user"
+#. TRANS: Title for button on Authorise Subscription page.
+#: actions/userauthorization.php:202
+#, fuzzy
+msgid "Subscribe to this user."
 msgstr "Подписаться на этого пользователя"
 
-#: actions/userauthorization.php:219
+#. TRANS: Button text on Authorise Subscription page.
+#: actions/userauthorization.php:204
 #, fuzzy
+msgctxt "BUTTON"
 msgid "Reject"
 msgstr "Отбросить"
 
-#: actions/userauthorization.php:220
+#. TRANS: Title for button on Authorise Subscription page.
+#: actions/userauthorization.php:206
 #, fuzzy
-msgid "Reject this subscription"
+msgid "Reject this subscription."
 msgstr "Отвергнуть эту подписку"
 
-#: actions/userauthorization.php:232
+#. TRANS: Client error displayed for an empty authorisation request.
+#: actions/userauthorization.php:219
 msgid "No authorization request!"
 msgstr "Не авторизованный запрос!"
 
-#: actions/userauthorization.php:254
+#. TRANS: Accept message header from Authorise subscription page.
+#: actions/userauthorization.php:242
 msgid "Subscription authorized"
 msgstr "Подписка авторизована"
 
-#: actions/userauthorization.php:256
+#: actions/userauthorization.php:245
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to authorize the "
@@ -6585,11 +6712,12 @@ msgstr ""
 "Подписка авторизована, но нет обратного URL. Посмотрите инструкции на сайте "
 "о том, как авторизовать подписку. Ваш ключ подписки:"
 
-#: actions/userauthorization.php:266
+#. TRANS: Reject message header from Authorise subscription page.
+#: actions/userauthorization.php:256
 msgid "Subscription rejected"
 msgstr "Подписка отменена"
 
-#: actions/userauthorization.php:268
+#: actions/userauthorization.php:259
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to fully reject the "
@@ -6598,48 +6726,72 @@ msgstr ""
 "Подписка отвергнута, но не бы передан URL обратного вызова. Проверьте "
 "инструкции на сайте, чтобы полностью отказаться от подписки."
 
-#: actions/userauthorization.php:303
+#. TRANS: Exception thrown when no valid user is found for an authorisation request.
+#. TRANS: %s is a listener URI.
+#: actions/userauthorization.php:296
 #, fuzzy, php-format
-msgid "Listener URI ‘%s’ not found here."
+msgid "Listener URI \"%s\" not found here."
 msgstr "Смотрящий URI «%s» здесь не найден."
 
-#: actions/userauthorization.php:308
+#. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
+#. TRANS: %s is a listenee URI.
+#: actions/userauthorization.php:303
 #, fuzzy, php-format
-msgid "Listenee URI ‘%s’ is too long."
+msgid "Listenee URI \"%s\" is too long."
 msgstr "Просматриваемый URI «%s» слишком длинный."
 
-#: actions/userauthorization.php:314
+#. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
+#. TRANS: %s is a listenee URI.
+#: actions/userauthorization.php:311
 #, fuzzy, php-format
-msgid "Listenee URI ‘%s’ is a local user."
+msgid "Listenee URI \"%s\" is a local user."
 msgstr "Просматриваемый URI «%s» — локальный пользователь."
 
+#. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
+#. TRANS: %s is a profile URL.
 #: actions/userauthorization.php:329
 #, fuzzy, php-format
-msgid "Profile URL ‘%s’ is for a local user."
+msgid "Profile URL \"%s\" is for a local user."
 msgstr "URL профиля «%s» предназначен только для локального пользователя."
 
-#: actions/userauthorization.php:345
+#. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
+#. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
+#: actions/userauthorization.php:339
 #, fuzzy, php-format
-msgid "Avatar URL ‘%s’ is not valid."
+msgid ""
+"Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
+"\"."
+msgstr ""
+"Лицензия просматриваемого потока «%1$s» несовместима с лицензией сайта «%2$s»."
+
+#. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
+#. TRANS: %s is an avatar URL.
+#: actions/userauthorization.php:349
+#, fuzzy, php-format
+msgid "Avatar URL \"%s\" is not valid."
 msgstr "URL аватары «%s» недействителен."
 
-#: actions/userauthorization.php:350
+#. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
+#. TRANS: %s is an avatar URL.
+#: actions/userauthorization.php:356
 #, fuzzy, php-format
-msgid "Can’t read avatar URL ‘%s’."
+msgid "Cannot read avatar URL \"%s\"."
 msgstr "Не удаётся прочитать URL аватары «%s»"
 
-#: actions/userauthorization.php:355
+#. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
+#. TRANS: %s is an avatar URL.
+#: actions/userauthorization.php:363
 #, fuzzy, php-format
-msgid "Wrong image type for avatar URL ‘%s’."
+msgid "Wrong image type for avatar URL \"%s\"."
 msgstr "Неверный тип изображения для URL аватары «%s»."
 
 #. TRANS: Page title for profile design page.
-#: actions/userdesignsettings.php:74 lib/designsettings.php:63
+#: actions/userdesignsettings.php:74 lib/designsettings.php:61
 msgid "Profile design"
 msgstr "Оформление профиля"
 
 #. TRANS: Instructions for profile design page.
-#: actions/userdesignsettings.php:84 lib/designsettings.php:74
+#: actions/userdesignsettings.php:84 lib/designsettings.php:72
 msgid ""
 "Customize the way your profile looks with a background image and a colour "
 "palette of your choice."
@@ -6647,10 +6799,28 @@ msgstr ""
 "Настройте внешний вид своего профиля, установив фоновое изображение и "
 "цветовую гамму на свой выбор."
 
-#: actions/userdesignsettings.php:272
+#: actions/userdesignsettings.php:289
 msgid "Enjoy your hotdog!"
 msgstr "Приятного аппетита!"
 
+#: actions/userdesignsettings.php:325
+#, fuzzy
+msgid "Design settings"
+msgstr "Сохранить настройки сайта"
+
+#: actions/userdesignsettings.php:340
+msgid "View profile designs"
+msgstr "Показать оформления профиля"
+
+#: actions/userdesignsettings.php:341
+msgid "Show or hide profile designs."
+msgstr "Показать или скрыть оформления профиля."
+
+#: actions/userdesignsettings.php:348
+#, fuzzy
+msgid "Background file"
+msgstr "Фон"
+
 #. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number.
 #: actions/usergroups.php:66
 #, php-format
@@ -6701,6 +6871,11 @@ msgstr ""
 msgid "Contributors"
 msgstr "Разработчики"
 
+#. TRANS: Menu item for site administration
+#: actions/version.php:167 lib/adminpanelaction.php:403
+msgid "License"
+msgstr "Лицензия"
+
 #: actions/version.php:170
 msgid ""
 "StatusNet is free software: you can redistribute it and/or modify it under "
@@ -6734,12 +6909,13 @@ msgstr ""
 "Вы должны были получить копию GNU Affero General Public License вместе с "
 "этой программой. Если нет, см. %s."
 
-#: actions/version.php:191
-msgid "Plugins"
-msgstr "Плагины"
+#. TRANS: Form input field label for application name.
+#: actions/version.php:197 lib/applicationeditform.php:190
+msgid "Name"
+msgstr "Имя"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:901
+#: actions/version.php:198 lib/action.php:885
 msgid "Version"
 msgstr "Версия"
 
@@ -6747,6 +6923,12 @@ msgstr "Версия"
 msgid "Author(s)"
 msgstr "Автор(ы)"
 
+#. TRANS: Form input field label.
+#: actions/version.php:200 lib/applicationeditform.php:208
+#: lib/groupeditform.php:168
+msgid "Description"
+msgstr "Описание"
+
 #. TRANS: Activity title when marking a notice as favorite.
 #: classes/Fave.php:164
 msgid "Favor"
@@ -6871,7 +7053,7 @@ msgid "Could not create login token for %s"
 msgstr "Не удаётся создать токен входа для %s"
 
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
-#: classes/Memcached_DataObject.php:542
+#: classes/Memcached_DataObject.php:556
 msgid "No database name or DSN found anywhere."
 msgstr "Имя базы данных или DSN не найдено."
 
@@ -7048,18 +7230,18 @@ msgstr "%1$s теперь следит за %2$s."
 
 #. TRANS: Notice given on user registration.
 #. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:395
+#: classes/User.php:390
 #, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr "Добро пожаловать на %1$s, @%2$s!"
 
 #. TRANS: Server exception.
-#: classes/User.php:918
+#: classes/User.php:923
 msgid "No single user defined for single-user mode."
 msgstr "Ни задан пользователь для однопользовательского режима."
 
 #. TRANS: Server exception.
-#: classes/User.php:922
+#: classes/User.php:927
 msgid "Single-user mode code called when not enabled."
 msgstr "Вызов отключённого кода однопользовательского режима."
 
@@ -7104,41 +7286,6 @@ msgstr ""
 msgid "No AtomPub API service for %s."
 msgstr ""
 
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:104
-msgid "Change your profile settings"
-msgstr "Изменить ваши настройки профиля"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:111
-msgid "Upload an avatar"
-msgstr "Загрузить аватару"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:118
-msgid "Change your password"
-msgstr "Измените свой пароль"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:125
-msgid "Change email handling"
-msgstr "Изменить электронный адрес"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:132
-msgid "Design your profile"
-msgstr "Оформить ваш профиль"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:139
-msgid "Other options"
-msgstr "Другие опции"
-
-#. TRANS: Link description in user account settings menu.
-#: lib/accountsettingsaction.php:141
-msgid "Other"
-msgstr "Другое"
-
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
 #: lib/action.php:161
 #, php-format
@@ -7156,206 +7303,128 @@ msgctxt "TOOLTIP"
 msgid "Show more"
 msgstr "Показать ещё"
 
-#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:544
-msgid "Primary site navigation"
-msgstr "Главная навигация"
+#. TRANS: Inline reply form submit button: submits a reply comment.
+#: lib/action.php:328
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Comment"
+msgstr "Содержание"
 
-#. TRANS: Tooltip for main menu option "Personal".
-#: lib/action.php:550
-msgctxt "TOOLTIP"
-msgid "Personal profile and friends timeline"
-msgstr "Личный профиль и лента друзей"
+#. TRANS: Placeholder text for inline reply form. Clicking in this box will turn it into a mini notice form.
+#: lib/action.php:331
+msgid "Add a comment..."
+msgstr ""
 
-#. TRANS: Main menu option when logged in for access to personal profile and friends timeline.
-#. TRANS: Personal group navigation menu option when logged in for viewing timeline of self and friends.
-#: lib/action.php:553 lib/personalgroupnav.php:100
-msgctxt "MENU"
-msgid "Personal"
-msgstr "Личное"
+#: lib/action.php:559 lib/personalgroupnav.php:99
+#, fuzzy
+msgid "Home"
+msgstr "Главная"
 
-#. TRANS: Tooltip for main menu option "Account".
-#: lib/action.php:555
-msgctxt "TOOLTIP"
-msgid "Change your email, avatar, password, profile"
-msgstr "Изменить ваш email, аватар, пароль, профиль"
-
-#. TRANS: Main menu option when logged in for access to user settings.
-#: lib/action.php:558
-msgid "Account"
-msgstr "Настройки"
-
-#. TRANS: Tooltip for main menu option "Services".
 #: lib/action.php:560
-msgctxt "TOOLTIP"
-msgid "Connect to services"
-msgstr "Соединить с сервисами"
+#, fuzzy
+msgid "Friends timeline"
+msgstr "Лента %s"
 
-#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services.
-#: lib/action.php:563
-msgid "Connect"
-msgstr "Соединить"
-
-#. TRANS: Tooltip for menu option "Admin".
 #: lib/action.php:566
-msgctxt "TOOLTIP"
-msgid "Change site configuration"
-msgstr "Изменить конфигурацию сайта"
+#, fuzzy
+msgid "Your profile"
+msgstr "Профиль группы"
 
-#. TRANS: Main menu option when logged in and site admin for access to site configuration.
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/action.php:569 lib/groupnav.php:117
-msgctxt "MENU"
-msgid "Admin"
-msgstr "Настройки"
+#: lib/action.php:570 lib/action.php:593 lib/publicgroupnav.php:78
+msgid "Public"
+msgstr "Общее"
 
-#. TRANS: Tooltip for main menu option "Invite".
-#: lib/action.php:573
-#, php-format
-msgctxt "TOOLTIP"
-msgid "Invite friends and colleagues to join you on %s"
-msgstr "Пригласите друзей и коллег стать такими же как Вы участниками %s"
+#: lib/action.php:571 lib/action.php:594
+#, fuzzy
+msgid "Everyone on this site"
+msgstr "Найти человека на этом сайте"
+
+#: lib/action.php:575
+#, fuzzy
+msgid "Settings"
+msgstr "Установки СМС"
 
-#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users.
 #: lib/action.php:576
-msgctxt "MENU"
-msgid "Invite"
-msgstr "Пригласить"
+#, fuzzy
+msgid "Change your personal settings"
+msgstr "Изменить ваши настройки профиля"
 
-#. TRANS: Tooltip for main menu option "Logout"
 #: lib/action.php:582
-msgctxt "TOOLTIP"
-msgid "Logout from the site"
-msgstr "Выйти"
+#, fuzzy
+msgid "Site configuration"
+msgstr "Конфигурация пользователя"
 
-#. TRANS: Main menu option when logged in to log out the current user.
-#: lib/action.php:585
-msgctxt "MENU"
+#: lib/action.php:587
+#, fuzzy
 msgid "Logout"
 msgstr "Выход"
 
-#. TRANS: Tooltip for main menu option "Register".
-#: lib/action.php:590
-msgctxt "TOOLTIP"
-msgid "Create an account"
-msgstr "Создать новый аккаунт"
+#: lib/action.php:588
+#, fuzzy
+msgid "Logout from the site"
+msgstr "Выйти"
 
-#. TRANS: Main menu option when not logged in to register a new account.
-#. TRANS: Menu item for registering with the StatusNet site.
-#: lib/action.php:593 lib/logingroupnav.php:85
-msgctxt "MENU"
-msgid "Register"
-msgstr "Регистрация"
-
-#. TRANS: Tooltip for main menu option "Login".
-#: lib/action.php:596
-msgctxt "TOOLTIP"
+#: lib/action.php:599
+#, fuzzy
 msgid "Login to the site"
 msgstr "Войти"
 
-#. TRANS: Main menu option when not logged in to log in.
-#. TRANS: Menu item for logging in to the StatusNet site.
-#: lib/action.php:599 lib/logingroupnav.php:77
-msgctxt "MENU"
-msgid "Login"
-msgstr "Вход"
-
-#. TRANS: Tooltip for main menu option "Help".
-#: lib/action.php:602
-msgctxt "TOOLTIP"
-msgid "Help me!"
-msgstr "Помощь"
-
-#. TRANS: Main menu option for help on the StatusNet site.
-#: lib/action.php:605
-msgctxt "MENU"
-msgid "Help"
-msgstr "Помощь"
-
-#. TRANS: Tooltip for main menu option "Search".
-#: lib/action.php:608
-msgctxt "TOOLTIP"
-msgid "Search for people or text"
-msgstr "Искать людей или текст"
-
-#. TRANS: Main menu option when logged in or when the StatusNet instance is not private.
-#: lib/action.php:611
-msgctxt "MENU"
+#: lib/action.php:606
+#, fuzzy
 msgid "Search"
 msgstr "Поиск"
 
-#. TRANS: DT element for site notice. String is hidden in default CSS.
-#. TRANS: Menu item for site administration
-#: lib/action.php:633 lib/adminpanelaction.php:387
-msgid "Site notice"
-msgstr "Уведомление сайта"
-
-#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:700
-msgid "Local views"
-msgstr "Локальные виды"
-
-#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:770
-msgid "Page notice"
-msgstr "Новая запись"
-
-#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:874
-msgid "Secondary site navigation"
-msgstr "Навигация по подпискам"
+#: lib/action.php:607
+#, fuzzy
+msgid "Search the site"
+msgstr "Поиск по сайту"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:880
+#: lib/action.php:864
 msgid "Help"
 msgstr "Помощь"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:883
+#: lib/action.php:867
 msgid "About"
 msgstr "О проекте"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:886
+#: lib/action.php:870
 msgid "FAQ"
 msgstr "ЧаВо"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:891
+#: lib/action.php:875
 msgid "TOS"
 msgstr "TOS"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:895
+#: lib/action.php:879
 msgid "Privacy"
 msgstr "Пользовательское соглашение"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:898
+#: lib/action.php:882
 msgid "Source"
 msgstr "Исходный код"
 
 #. TRANS: Secondary navigation menu option leading to e-mail contact information on the
 #. TRANS: StatusNet site, where to report bugs, ...
-#: lib/action.php:905
+#: lib/action.php:889
 msgid "Contact"
 msgstr "Контактная информация"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:908
+#: lib/action.php:892
 msgid "Badge"
 msgstr "Бедж"
 
-#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:937
-msgid "StatusNet software license"
-msgstr "StatusNet лицензия"
-
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:944
+#: lib/action.php:921
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7365,7 +7434,7 @@ msgstr ""
 "broughtby%%](%%site.broughtbyurl%%)."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:947
+#: lib/action.php:924
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** — сервис микроблогинга."
@@ -7374,7 +7443,7 @@ msgstr "**%%site.name%%** — сервис микроблогинга."
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:954
+#: lib/action.php:931
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7386,28 +7455,23 @@ msgstr ""
 "лицензией [GNU Affero General Public License](http://www.fsf.org/licensing/"
 "licenses/agpl-3.0.html)."
 
-#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:970
-msgid "Site content license"
-msgstr "Лицензия содержимого сайта"
-
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:977
+#: lib/action.php:949
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr "Содержание и данные %1$s являются личными и конфиденциальными."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:984
+#: lib/action.php:956
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
 "Авторские права на содержание и данные принадлежат %1$s. Все права защищены."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:988
+#: lib/action.php:960
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 "Авторские права на содержание и данные принадлежат разработчикам. Все права "
@@ -7415,25 +7479,20 @@ msgstr ""
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:1020
+#: lib/action.php:992
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr "Все материалы и данные %1$s доступны на условиях лицензии %2$s."
 
-#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1356
-msgid "Pagination"
-msgstr "Разбиение на страницы"
-
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1367
+#: lib/action.php:1335
 msgid "After"
 msgstr "Сюда"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1377
+#: lib/action.php:1345
 msgid "Before"
 msgstr "Туда"
 
@@ -7587,7 +7646,7 @@ msgid "User configuration"
 msgstr "Конфигурация пользователя"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:122
+#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:110
 msgid "User"
 msgstr "Пользователь"
 
@@ -7611,6 +7670,11 @@ msgstr "Конфигурация сессий"
 msgid "Edit site notice"
 msgstr "Изменить уведомление сайта"
 
+#. TRANS: Menu item for site administration
+#: lib/adminpanelaction.php:387
+msgid "Site notice"
+msgstr "Уведомление сайта"
+
 #. TRANS: Menu item title/tooltip
 #: lib/adminpanelaction.php:393
 msgid "Snapshots configuration"
@@ -7621,6 +7685,12 @@ msgstr "Конфигурация снимков"
 msgid "Set site license"
 msgstr "Установить лицензию сайта"
 
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:409
+#, fuzzy
+msgid "Plugins configuration"
+msgstr "Конфигурация путей"
+
 #. TRANS: Client error 401.
 #: lib/apiauth.php:111
 msgid "API resource requires read-write access, but you only have read access."
@@ -7633,19 +7703,23 @@ msgstr ""
 msgid "No application for that consumer key."
 msgstr "Нет приложения для этого пользовательского ключа."
 
+#: lib/apiauth.php:202 lib/apiauth.php:284
+msgid "Not allowed to use API."
+msgstr ""
+
 #. TRANS: OAuth exception given when an incorrect access token was given for a user.
-#: lib/apiauth.php:219
+#: lib/apiauth.php:225
 msgid "Bad access token."
 msgstr "Неверный ключ доступа."
 
 #. TRANS: OAuth exception given when no user was found for a given token (no token was found).
-#: lib/apiauth.php:224
+#: lib/apiauth.php:230
 msgid "No user for that token."
 msgstr "Нет пользователя для этого ключа."
 
 #. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel".
 #. TRANS: Client error thrown when authentication fails.
-#: lib/apiauth.php:266 lib/apiauth.php:293
+#: lib/apiauth.php:272 lib/apiauth.php:302
 msgid "Could not authenticate you."
 msgstr "Не удаётся произвести аутентификацию."
 
@@ -7689,6 +7763,11 @@ msgstr "Попытка отменить неизвестный ключ."
 msgid "Failed to delete revoked token."
 msgstr "Не удаётся удалить аннулированный ключ."
 
+#. TRANS: Form input field label for application icon.
+#: lib/applicationeditform.php:177
+msgid "Icon"
+msgstr "Иконка"
+
 #. TRANS: Form guide.
 #: lib/applicationeditform.php:182
 msgid "Icon for this application"
@@ -7724,6 +7803,11 @@ msgstr "URL источника"
 msgid "Organization responsible for this application"
 msgstr "Организация, ответственная за это приложение"
 
+#. TRANS: Form input field label.
+#: lib/applicationeditform.php:227
+msgid "Organization"
+msgstr "Организация"
+
 #. TRANS: Form input field instructions.
 #: lib/applicationeditform.php:234
 msgid "URL for the homepage of the organization"
@@ -7814,16 +7898,6 @@ msgstr "Элемент author должен содержать элемент nam
 msgid "Do not use this method!"
 msgstr "Не удаляйте эту группу"
 
-#. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:293
-msgid "Author"
-msgstr "Автор"
-
-#. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:307
-msgid "Provider"
-msgstr "Сервис"
-
 #. TRANS: Title.
 #: lib/attachmentnoticesection.php:67
 msgid "Notices where this attachment appears"
@@ -7849,23 +7923,28 @@ msgstr "Смена пароля не разрешена."
 msgid "Block"
 msgstr "Блокировать"
 
+#. TRANS: Description of the form to block a user.
+#: lib/blockform.php:79
+msgid "Block this user"
+msgstr "Заблокировать пользователя."
+
 #. TRANS: Title for command results.
-#: lib/channel.php:160 lib/channel.php:181
+#: lib/channel.php:104 lib/channel.php:125
 msgid "Command results"
 msgstr "Команда исполнена"
 
 #. TRANS: Title for command results.
-#: lib/channel.php:194
+#: lib/channel.php:138
 msgid "AJAX error"
 msgstr "Ошибка AJAX"
 
 #. TRANS: E-mail subject when a command has completed.
-#: lib/channel.php:233 lib/mailhandler.php:143
+#: lib/channel.php:177 lib/mailhandler.php:143
 msgid "Command complete"
 msgstr "Команда завершена"
 
 #. TRANS: E-mail subject when a command has failed.
-#: lib/channel.php:244
+#: lib/channel.php:188
 msgid "Command failed"
 msgstr "Команда неудачна"
 
@@ -7968,7 +8047,7 @@ msgstr "Полное имя: %s"
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a location.
-#: lib/command.php:446 lib/mail.php:270
+#: lib/command.php:446 lib/mail.php:275
 #, php-format
 msgid "Location: %s"
 msgstr "Месторасположение: %s"
@@ -7976,7 +8055,7 @@ msgstr "Месторасположение: %s"
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a homepage.
-#: lib/command.php:450 lib/mail.php:274
+#: lib/command.php:450 lib/mail.php:279
 #, php-format
 msgid "Homepage: %s"
 msgstr "Домашняя страница: %s"
@@ -8258,108 +8337,101 @@ msgstr ""
 "tracking — пока не реализовано.\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:162
+#: lib/common.php:36
 msgid "No configuration file found."
 msgstr "Конфигурационный файл не найден."
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:165
+#: lib/common.php:39
 msgid "I looked for configuration files in the following places:"
 msgstr "Конфигурационные файлы искались в следующих местах:"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:168
+#: lib/common.php:42
 msgid "You may wish to run the installer to fix this."
 msgstr "Возможно, вы решите запустить установщик для исправления этого."
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:172
+#: lib/common.php:46
 msgid "Go to the installer."
 msgstr "Перейти к установщику"
 
-#. TRANS: Menu item for Instant Messaging settings.
-#: lib/connectsettingsaction.php:106
-msgctxt "MENU"
-msgid "IM"
-msgstr "IM"
-
-#. TRANS: Tooltip for Instant Messaging menu item.
-#: lib/connectsettingsaction.php:108
-msgid "Updates by instant messenger (IM)"
-msgstr "Обновлено по IM"
-
-#. TRANS: Menu item for Short Message Service settings.
-#: lib/connectsettingsaction.php:113
-msgctxt "MENU"
-msgid "SMS"
-msgstr "SMS"
-
-#. TRANS: Tooltip for Short Message Service menu item.
-#: lib/connectsettingsaction.php:115
-msgid "Updates by SMS"
-msgstr "Обновления по СМС"
-
-#. TRANS: Menu item for OuAth connection settings.
-#: lib/connectsettingsaction.php:120
-msgctxt "MENU"
-msgid "Connections"
-msgstr "Соединения"
-
-#. TRANS: Tooltip for connected applications (Connections through OAuth) menu item.
-#: lib/connectsettingsaction.php:122
-msgid "Authorized connected applications"
-msgstr "Авторизованные соединённые приложения"
-
 #: lib/dberroraction.php:59
 msgid "Database error"
 msgstr "Ошибка базы данных"
 
+#. TRANS: Description of form for deleting a user.
+#: lib/deleteuserform.php:75
+msgid "Delete this user"
+msgstr "Удалить этого пользователя"
+
+#: lib/designform.php:114
+#, fuzzy
+msgid "Change design"
+msgstr "Сохранить оформление"
+
+#. TRANS: Fieldset legend on profile design page to change profile page colours.
+#: lib/designform.php:131
+msgid "Change colours"
+msgstr "Изменение цветовой гаммы"
+
+#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
+#: lib/designform.php:138
+msgid "Use defaults"
+msgstr "Использовать значения по умолчанию"
+
+#. TRANS: Title for button on profile design page to reset all colour settings to default.
+#: lib/designform.php:140
+msgid "Restore default designs"
+msgstr "Восстановить оформление по умолчанию"
+
+#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
+#: lib/designform.php:148
+msgid "Reset back to default"
+msgstr "Восстановить значения по умолчанию"
+
 #. TRANS: Label in form on profile design page.
 #. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
-#: lib/designsettings.php:108
+#: lib/designform.php:158
 msgid "Upload file"
 msgstr "Загрузить файл"
 
 #. TRANS: Instructions for form on profile design page.
-#: lib/designsettings.php:113
+#: lib/designform.php:163
+#, fuzzy
 msgid ""
-"You can upload your personal background image. The maximum file size is 2MB."
+"You can upload your personal background image. The maximum file size is 2Mb."
 msgstr ""
 "Вы можете загрузить собственное фоновое изображение. Максимальный размер "
 "файла составляет 2МБ."
 
 #. TRANS: Radio button on profile design page that will enable use of the uploaded profile image.
-#: lib/designsettings.php:139
+#: lib/designform.php:194
 msgctxt "RADIO"
 msgid "On"
 msgstr "Включено"
 
 #. TRANS: Radio button on profile design page that will disable use of the uploaded profile image.
-#: lib/designsettings.php:156
+#: lib/designform.php:211
 msgctxt "RADIO"
 msgid "Off"
 msgstr "Выключено"
 
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: lib/designsettings.php:175
-msgid "Change colours"
-msgstr "Изменение цветовой гаммы"
-
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: lib/designsettings.php:257
-msgid "Use defaults"
-msgstr "Использовать значения по умолчанию"
+#. TRANS: Title for button on profile design page to save settings.
+#: lib/designform.php:322
+msgid "Save design"
+msgstr "Сохранить оформление"
 
 #. TRANS: Error message displayed if design settings could not be saved.
 #. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
-#: lib/designsettings.php:405 lib/designsettings.php:427
+#: lib/designsettings.php:216 lib/designsettings.php:238
 msgid "Couldn't update your design."
 msgstr "Не удаётся обновить ваше оформление."
 
 #. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
-#: lib/designsettings.php:433
+#: lib/designsettings.php:244
 msgid "Design defaults restored."
 msgstr "Оформление по умолчанию восстановлено."
 
@@ -8429,27 +8501,23 @@ msgstr ""
 msgid "Feeds"
 msgstr "Каналы"
 
-#: lib/galleryaction.php:121
-msgid "Filter tags"
-msgstr "Фильтровать теги"
-
-#: lib/galleryaction.php:131
+#: lib/galleryaction.php:128
 msgid "All"
 msgstr "Все"
 
-#: lib/galleryaction.php:139
+#: lib/galleryaction.php:136
 msgid "Select tag to filter"
 msgstr "Выберите тег для фильтрации"
 
-#: lib/galleryaction.php:140
+#: lib/galleryaction.php:137
 msgid "Tag"
 msgstr "Теги"
 
-#: lib/galleryaction.php:141
+#: lib/galleryaction.php:138
 msgid "Choose a tag to narrow list"
 msgstr "Выберите тег из выпадающего списка"
 
-#: lib/galleryaction.php:143
+#: lib/galleryaction.php:140
 msgid "Go"
 msgstr "Перейти"
 
@@ -8545,6 +8613,12 @@ msgctxt "TOOLTIP"
 msgid "%s blocked users"
 msgstr "Заблокированные пользователи %s"
 
+#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
+#: lib/groupnav.php:117
+msgctxt "MENU"
+msgid "Admin"
+msgstr "Настройки"
+
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
 #: lib/groupnav.php:120
@@ -8657,39 +8731,61 @@ msgstr[0] "%dБ"
 msgstr[1] "%dБ"
 msgstr[2] ""
 
-#: lib/jabber.php:387
+#: lib/implugin.php:262
 #, php-format
-msgid "[%s]"
-msgstr "[%s]"
+msgid ""
+"User \"%s\" on %s has said that your %s screenname belongs to them. If "
+"that's true, you can confirm by clicking on this URL: %s . (If you cannot "
+"click it, copy-and-paste it into the address bar of your browser). If that "
+"user isn't you, or if you didn't request this confirmation, just ignore this "
+"message."
+msgstr ""
 
-#: lib/jabber.php:567
+#: lib/implugin.php:349
 #, php-format
 msgid "Unknown inbox source %d."
 msgstr "Неизвестный источник входящих сообщений %d."
 
+#: lib/implugin.php:485
+#, fuzzy, php-format
+msgid "Message too long - maximum is %1$d characters, you sent %2$d."
+msgstr "Сообщение слишком длинное — не больше %1$d символа, вы отправили %2$d."
+
 #: lib/leaveform.php:114
 msgid "Leave"
 msgstr "Покинуть"
 
+#. TRANS: Menu item for logging in to the StatusNet site.
+#: lib/logingroupnav.php:77
+msgctxt "MENU"
+msgid "Login"
+msgstr "Вход"
+
 #. TRANS: Title for menu item for logging in to the StatusNet site.
 #: lib/logingroupnav.php:79
 msgid "Login with a username and password"
 msgstr "Войти с вашим ником и паролем."
 
+#. TRANS: Menu item for registering with the StatusNet site.
+#: lib/logingroupnav.php:85
+msgctxt "MENU"
+msgid "Register"
+msgstr "Регистрация"
+
 #. TRANS: Title for menu item for registering with the StatusNet site.
 #: lib/logingroupnav.php:87
 msgid "Sign up for a new account"
 msgstr "Создать новый аккаунт"
 
 #. TRANS: Subject for address confirmation email.
-#: lib/mail.php:168
+#: lib/mail.php:172
 msgid "Email address confirmation"
 msgstr "Подтверждение электронного адреса"
 
 #. TRANS: Body for address confirmation email.
 #. TRANS: %1$s is the addressed user's nickname, %2$s is the StatusNet sitename,
 #. TRANS: %3$s is the URL to confirm at.
-#: lib/mail.php:173
+#: lib/mail.php:177
 #, php-format
 msgid ""
 "Hey, %1$s.\n"
@@ -8721,14 +8817,14 @@ msgstr ""
 
 #. TRANS: Subject of new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
-#: lib/mail.php:238
+#: lib/mail.php:243
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1$s теперь следит за вашими записями на %2$s."
 
 #. TRANS: This is a paragraph in a new-subscriber e-mail.
 #. TRANS: %s is a URL where the subscriber can be reported as abusive.
-#: lib/mail.php:245
+#: lib/mail.php:250
 #, php-format
 msgid ""
 "If you believe this account is being used abusively, you can block them from "
@@ -8743,7 +8839,7 @@ msgstr ""
 #. TRANS: %3$s is the subscriber's profile URL, %4$s is the subscriber's location (or empty)
 #. TRANS: %5$s is the subscriber's homepage URL (or empty), %6%s is the subscriber's bio (or empty)
 #. TRANS: %7$s is a link to the addressed user's e-mail settings.
-#: lib/mail.php:255
+#: lib/mail.php:260
 #, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -8770,14 +8866,14 @@ msgstr ""
 
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is biographical information.
-#: lib/mail.php:278
+#: lib/mail.php:283
 #, php-format
 msgid "Bio: %s"
 msgstr "Биография: %s"
 
 #. TRANS: Subject of notification mail for new posting email address.
 #. TRANS: %s is the StatusNet sitename.
-#: lib/mail.php:307
+#: lib/mail.php:312
 #, php-format
 msgid "New email address for posting to %s"
 msgstr "Новый электронный адрес для постинга %s"
@@ -8785,7 +8881,7 @@ msgstr "Новый электронный адрес для постинга %s"
 #. TRANS: Body of notification mail for new posting email address.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is the e-mail address to send
 #. TRANS: to to post by e-mail, %3$s is a URL to more instructions.
-#: lib/mail.php:313
+#: lib/mail.php:318
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -8808,26 +8904,26 @@ msgstr ""
 
 #. TRANS: Subject line for SMS-by-email notification messages.
 #. TRANS: %s is the posting user's nickname.
-#: lib/mail.php:434
+#: lib/mail.php:439
 #, php-format
 msgid "%s status"
 msgstr "%s статус"
 
 #. TRANS: Subject line for SMS-by-email address confirmation message.
-#: lib/mail.php:460
+#: lib/mail.php:465
 msgid "SMS confirmation"
 msgstr "Подтверждение СМС"
 
 #. TRANS: Main body heading for SMS-by-email address confirmation message.
 #. TRANS: %s is the addressed user's nickname.
-#: lib/mail.php:464
+#: lib/mail.php:469
 #, php-format
 msgid "%s: confirm you own this phone number with this code:"
 msgstr "%s. Подтвердите, что это ваш телефон, следующим кодом:"
 
 #. TRANS: Subject for 'nudge' notification email.
 #. TRANS: %s is the nudging user.
-#: lib/mail.php:485
+#: lib/mail.php:490
 #, fuzzy, php-format
 msgid "You have been nudged by %s"
 msgstr "Вас «подтолкнул» пользователь %s"
@@ -8835,7 +8931,7 @@ msgstr "Вас «подтолкнул» пользователь %s"
 #. TRANS: Body for 'nudge' notification email.
 #. TRANS: %1$s is the nuding user's long name, $2$s is the nudging user's nickname,
 #. TRANS: %3$s is a URL to post notices at, %4$s is the StatusNet sitename.
-#: lib/mail.php:492
+#: lib/mail.php:497
 #, php-format
 msgid ""
 "%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -8864,7 +8960,7 @@ msgstr ""
 
 #. TRANS: Subject for direct-message notification email.
 #. TRANS: %s is the sending user's nickname.
-#: lib/mail.php:539
+#: lib/mail.php:544
 #, php-format
 msgid "New private message from %s"
 msgstr "Новое приватное сообщение от %s"
@@ -8873,7 +8969,7 @@ msgstr "Новое приватное сообщение от %s"
 #. TRANS: %1$s is the sending user's long name, %2$s is the sending user's nickname,
 #. TRANS: %3$s is the message content, %4$s a URL to the message,
 #. TRANS: %5$s is the StatusNet sitename.
-#: lib/mail.php:547
+#: lib/mail.php:552
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -8908,7 +9004,7 @@ msgstr ""
 
 #. TRANS: Subject for favorite notification e-mail.
 #. TRANS: %1$s is the adding user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:599
+#: lib/mail.php:604
 #, php-format
 msgid "%1$s (@%2$s) added your notice as a favorite"
 msgstr "%1$s (@%2$s) добавил вашу запись в число своих любимых"
@@ -8918,7 +9014,7 @@ msgstr "%1$s (@%2$s) добавил вашу запись в число свои
 #. TRANS: %3$s is a URL to the faved notice, %4$s is the faved notice text,
 #. TRANS: %5$s is a URL to all faves of the adding user, %6$s is the StatusNet sitename,
 #. TRANS: %7$s is the adding user's nickname.
-#: lib/mail.php:606
+#: lib/mail.php:611
 #, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -8956,7 +9052,7 @@ msgstr ""
 "%6$s\n"
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:664
+#: lib/mail.php:669
 #, php-format
 msgid ""
 "The full conversation can be read here:\n"
@@ -8969,7 +9065,7 @@ msgstr ""
 
 #. TRANS: E-mail subject for notice notification.
 #. TRANS: %1$s is the sending user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:672
+#: lib/mail.php:677
 #, php-format
 msgid "%1$s (@%2$s) sent a notice to your attention"
 msgstr "%1$s (@%2$s) отправил запись для вашего внимания"
@@ -8980,7 +9076,7 @@ msgstr "%1$s (@%2$s) отправил запись для вашего вним
 #. TRANS: %5$s is a URL to the full conversion if it exists (otherwise empty),
 #. TRANS: %6$s is a URL to reply to the notice, %7$s is a URL to all @-replied for the addressed user,
 #. TRANS: %8$s is a URL to the addressed user's e-mail settings, %9$s is the sender's nickname.
-#: lib/mail.php:680
+#: lib/mail.php:685
 #, php-format
 msgid ""
 "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -9124,11 +9220,7 @@ msgstr "Нет взаимных подписчиков."
 msgid "To"
 msgstr "Для"
 
-#: lib/messageform.php:166 lib/noticeform.php:186
-msgid "Available characters"
-msgstr "6 или больше знаков"
-
-#: lib/messageform.php:185 lib/noticeform.php:237
+#: lib/messageform.php:184 lib/noticeform.php:236
 msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr "Отправить"
@@ -9138,16 +9230,10 @@ msgstr "Отправить"
 msgid "Messages"
 msgstr "Сообщение"
 
-#: lib/messagelistitem.php:123 lib/noticelist.php:522
+#: lib/messagelistitem.php:123 lib/noticelist.php:527
 msgid "from"
 msgstr "от"
 
-#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:165
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr ""
-"Имя должно состоять только из прописных букв и цифр и не иметь пробелов."
-
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 #: lib/nickname.php:178
 msgid "Nickname cannot be empty."
@@ -9171,23 +9257,23 @@ msgstr "Послать запись"
 msgid "What's up, %s?"
 msgstr "Что нового, %s?"
 
-#: lib/noticeform.php:194
+#: lib/noticeform.php:193
 msgid "Attach"
 msgstr "Прикрепить"
 
-#: lib/noticeform.php:198
+#: lib/noticeform.php:197
 msgid "Attach a file"
 msgstr "Прикрепить файл"
 
-#: lib/noticeform.php:213
+#: lib/noticeform.php:212
 msgid "Share my location"
 msgstr "Поделиться своим местоположением."
 
-#: lib/noticeform.php:216
+#: lib/noticeform.php:215
 msgid "Do not share my location"
 msgstr "Не публиковать своё местоположение"
 
-#: lib/noticeform.php:217
+#: lib/noticeform.php:216
 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
 "try again later"
@@ -9196,55 +9282,59 @@ msgstr ""
 "времени, чем ожидалось; повторите попытку позже"
 
 #. TRANS: Used in coordinates as abbreviation of north
-#: lib/noticelist.php:452
+#: lib/noticelist.php:457
 msgid "N"
 msgstr "с. ш."
 
 #. TRANS: Used in coordinates as abbreviation of south
-#: lib/noticelist.php:454
+#: lib/noticelist.php:459
 msgid "S"
 msgstr "ю. ш."
 
 #. TRANS: Used in coordinates as abbreviation of east
-#: lib/noticelist.php:456
+#: lib/noticelist.php:461
 msgid "E"
 msgstr "в. д."
 
 #. TRANS: Used in coordinates as abbreviation of west
-#: lib/noticelist.php:458
+#: lib/noticelist.php:463
 msgid "W"
 msgstr "з. д."
 
-#: lib/noticelist.php:460
+#: lib/noticelist.php:465
 #, php-format
 msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgstr "%1$u°%2$u'%3$u\" %4$s %5$u°%6$u'%7$u\" %8$s"
 
-#: lib/noticelist.php:469
+#: lib/noticelist.php:474
 msgid "at"
 msgstr "из"
 
-#: lib/noticelist.php:518
+#: lib/noticelist.php:523
 msgid "web"
 msgstr "web"
 
-#: lib/noticelist.php:584
+#: lib/noticelist.php:589
 msgid "in context"
 msgstr "переписка"
 
-#: lib/noticelist.php:619
+#: lib/noticelist.php:624
 msgid "Repeated by"
 msgstr "Повторено"
 
-#: lib/noticelist.php:646
+#: lib/noticelist.php:651
 msgid "Reply to this notice"
 msgstr "Ответить на эту запись"
 
-#: lib/noticelist.php:647
+#: lib/noticelist.php:652
 msgid "Reply"
 msgstr "Ответить"
 
-#: lib/noticelist.php:691
+#: lib/noticelist.php:678
+msgid "Delete this notice"
+msgstr "Удалить эту запись"
+
+#: lib/noticelist.php:696
 msgid "Notice repeated"
 msgstr "Запись повторена"
 
@@ -9281,48 +9371,31 @@ msgstr "Дублирующаяся запись."
 msgid "Couldn't insert new subscription."
 msgstr "Не удаётся вставить новую подписку."
 
-#. TRANS: Personal group navigation menu option when logged in for viewing @-replies.
-#: lib/personalgroupnav.php:107
+#: lib/personalgroupnav.php:104
 #, fuzzy
-msgctxt "MENU"
 msgid "Replies"
 msgstr "Ответы"
 
-#. TRANS: Personal group navigation menu option when logged in for seeing own profile.
-#: lib/personalgroupnav.php:114
+#: lib/personalgroupnav.php:109
 #, fuzzy
-msgctxt "MENU"
-msgid "Profile"
-msgstr "Профиль"
-
-#. TRANS: Personal group navigation menu option when logged in for viewing own favourited notices.
-#: lib/personalgroupnav.php:120
-#, fuzzy
-msgctxt "MENU"
 msgid "Favorites"
 msgstr "Любимое"
 
-#. TRANS: Personal group navigation menu option when logged in for viewing recieved personal messages.
-#: lib/personalgroupnav.php:133
+#: lib/personalgroupnav.php:120
 #, fuzzy
-msgctxt "MENU"
 msgid "Inbox"
 msgstr "Входящие"
 
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing recieved personal messages.
-#: lib/personalgroupnav.php:135
+#: lib/personalgroupnav.php:121
 msgid "Your incoming messages"
 msgstr "Ваши входящие сообщения"
 
-#. TRANS: Personal group navigation menu option when logged in for viewing senet personal messages.
-#: lib/personalgroupnav.php:140
+#: lib/personalgroupnav.php:125
 #, fuzzy
-msgctxt "MENU"
 msgid "Outbox"
 msgstr "Исходящие"
 
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing senet personal messages.
-#: lib/personalgroupnav.php:142
+#: lib/personalgroupnav.php:126
 msgid "Your sent messages"
 msgstr "Ваши исходящие сообщения"
 
@@ -9337,9 +9410,26 @@ msgstr "Теги записей пользователя %s"
 msgid "Unknown"
 msgstr "Неизвестно"
 
+#. TRANS: Plugin admin panel controls
+#: lib/plugindisableform.php:90
+msgctxt "plugin"
+msgid "Disable"
+msgstr ""
+
+#. TRANS: Plugin admin panel controls
+#: lib/pluginenableform.php:112
+msgctxt "plugin"
+msgid "Enable"
+msgstr ""
+
+#: lib/pluginlist.php:196
+msgctxt "plugin-description"
+msgid "(Plugin descriptions unavailable when disabled.)"
+msgstr ""
+
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:82
+#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:88
 msgid "Subscriptions"
 msgstr "Подписки"
 
@@ -9350,7 +9440,7 @@ msgstr "Все подписки."
 
 #. TRANS: H2 text for user subscriber statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:90
+#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:96
 msgid "Subscribers"
 msgstr "Подписчики"
 
@@ -9372,7 +9462,7 @@ msgstr "Регистрация"
 #. TRANS: Label for user statistics.
 #. TRANS: H2 text for user group membership statistics.
 #: lib/profileaction.php:239 lib/profileaction.php:290
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:104
 msgid "Groups"
 msgstr "Группы"
 
@@ -9392,10 +9482,6 @@ msgstr "Все группы"
 msgid "Unimplemented method."
 msgstr "Нереализованный метод."
 
-#: lib/publicgroupnav.php:78
-msgid "Public"
-msgstr "Общее"
-
 #: lib/publicgroupnav.php:82
 msgid "User groups"
 msgstr "Группы"
@@ -9434,7 +9520,7 @@ msgid "Revoke the \"%s\" role from this user"
 msgstr "Отозвать у этого пользователя роль «%s»"
 
 #. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:974
+#: lib/router.php:1001
 msgid "Page not found."
 msgstr "Страница не найдена."
 
@@ -9463,11 +9549,6 @@ msgctxt "BUTTON"
 msgid "Search"
 msgstr "Найти"
 
-#. TRANS: Definition list item with instructions on how to get (better) search results.
-#: lib/searchaction.php:170
-msgid "Search help"
-msgstr "Справка по поиску"
-
 #: lib/searchgroupnav.php:80
 msgid "People"
 msgstr "Люди"
@@ -9492,6 +9573,51 @@ msgstr "Секция без названия"
 msgid "More..."
 msgstr "Далее…"
 
+#: lib/settingsnav.php:78
+msgid "Change your profile settings"
+msgstr "Изменить ваши настройки профиля"
+
+#: lib/settingsnav.php:83
+msgid "Upload an avatar"
+msgstr "Загрузить аватару"
+
+#: lib/settingsnav.php:88
+msgid "Change your password"
+msgstr "Измените свой пароль"
+
+#: lib/settingsnav.php:93
+msgid "Change email handling"
+msgstr "Изменить электронный адрес"
+
+#: lib/settingsnav.php:98
+msgid "Design your profile"
+msgstr "Оформить ваш профиль"
+
+#: lib/settingsnav.php:102
+msgid "URL"
+msgstr "URL"
+
+#: lib/settingsnav.php:103
+msgid "URL shorteners"
+msgstr ""
+
+#: lib/settingsnav.php:111
+msgid "Updates by instant messenger (IM)"
+msgstr "Обновлено по IM"
+
+#: lib/settingsnav.php:118
+msgid "Updates by SMS"
+msgstr "Обновления по СМС"
+
+#: lib/settingsnav.php:123
+#, fuzzy
+msgid "Connections"
+msgstr "Соединения"
+
+#: lib/settingsnav.php:124
+msgid "Authorized connected applications"
+msgstr "Авторизованные соединённые приложения"
+
 #: lib/silenceform.php:67
 msgid "Silence"
 msgstr "Заглушить"
@@ -9500,30 +9626,34 @@ msgstr "Заглушить"
 msgid "Silence this user"
 msgstr "Заглушить этого пользователя."
 
-#: lib/subgroupnav.php:83
+#: lib/subgroupnav.php:89
 #, php-format
 msgid "People %s subscribes to"
 msgstr "Люди на которых подписан %s"
 
-#: lib/subgroupnav.php:91
+#: lib/subgroupnav.php:97
 #, php-format
 msgid "People subscribed to %s"
 msgstr "Люди подписанные на %s"
 
-#: lib/subgroupnav.php:99
+#: lib/subgroupnav.php:105
 #, php-format
 msgid "Groups %s is a member of"
 msgstr "Группы, в которых состоит %s"
 
-#: lib/subgroupnav.php:105
+#: lib/subgroupnav.php:111
 msgid "Invite"
 msgstr "Пригласить"
 
-#: lib/subgroupnav.php:106
+#: lib/subgroupnav.php:112
 #, php-format
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Пригласите друзей и коллег стать такими же как вы участниками %s"
 
+#: lib/subscribeform.php:115 lib/subscribeform.php:139
+msgid "Subscribe to this user"
+msgstr "Подписаться на этого пользователя"
+
 #: lib/subscriberspeopleselftagcloudsection.php:48
 #: lib/subscriptionspeopleselftagcloudsection.php:48
 msgid "People Tagcloud as self-tagged"
@@ -9601,6 +9731,14 @@ msgstr "Тема содержит файл недопустимого типа 
 msgid "Error opening theme archive."
 msgstr "Ошибка открытия архива темы."
 
+#: lib/threadednoticelist.php:270
+#, php-format
+msgid "Show all %d comment"
+msgid_plural "Show all %d comments"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
 #: lib/topposterssection.php:74
 msgid "Top posters"
 msgstr "Самые активные"
@@ -9642,76 +9780,80 @@ msgstr "Отписаться"
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "У пользователя %1$s (%2$d) нет записи профиля."
 
-#. TRANS: Link text for changeing the avatar of the logged in user.
-#: lib/userprofile.php:121
+#: lib/userprofile.php:116
 msgid "Edit Avatar"
 msgstr "Изменить аватару"
 
 #. TRANS: H2 for user actions in a profile.
 #. TRANS: H2 for entity actions in a profile.
-#: lib/userprofile.php:245 lib/userprofile.php:261
+#: lib/userprofile.php:216 lib/userprofile.php:232
 msgid "User actions"
 msgstr "Действия пользователя"
 
 #. TRANS: Text shown in user profile of not yet compeltely deleted users.
-#: lib/userprofile.php:249
+#: lib/userprofile.php:220
 msgid "User deletion in progress..."
 msgstr "Идёт удаление пользователя…"
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:277
+#: lib/userprofile.php:248
 msgid "Edit profile settings"
 msgstr "Изменение настроек профиля"
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:279
+#: lib/userprofile.php:250
 msgid "Edit"
 msgstr "Редактировать"
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:303
+#: lib/userprofile.php:274
 msgid "Send a direct message to this user"
 msgstr "Послать приватное сообщение этому пользователю."
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:305
+#: lib/userprofile.php:276
 msgid "Message"
 msgstr "Сообщение"
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:347
+#: lib/userprofile.php:318
 msgid "Moderate"
 msgstr "Модерировать"
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:386
+#: lib/userprofile.php:357
 msgid "User role"
 msgstr "Роль пользователя"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:389
+#: lib/userprofile.php:360
 msgctxt "role"
 msgid "Administrator"
 msgstr "Администратор"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:391
+#: lib/userprofile.php:362
 msgctxt "role"
 msgid "Moderator"
 msgstr "Модератор"
 
+#: lib/util.php:321
+#, fuzzy
+msgid "Not allowed to log in."
+msgstr "Не авторизован."
+
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1306
+#: lib/util.php:1337
 msgid "a few seconds ago"
 msgstr "пару секунд назад"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1309
+#: lib/util.php:1340
 msgid "about a minute ago"
 msgstr "около минуты назад"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1313
+#: lib/util.php:1344
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
@@ -9720,12 +9862,12 @@ msgstr[1] "около %d минут назад"
 msgstr[2] "около %d минут назад"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1316
+#: lib/util.php:1347
 msgid "about an hour ago"
 msgstr "около часа назад"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1320
+#: lib/util.php:1351
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
@@ -9734,12 +9876,12 @@ msgstr[1] "около %d часов назад"
 msgstr[2] "около %d часов назад"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1323
+#: lib/util.php:1354
 msgid "about a day ago"
 msgstr "около дня назад"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1327
+#: lib/util.php:1358
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
@@ -9748,12 +9890,12 @@ msgstr[1] "около %d дней назад"
 msgstr[2] "около %d дней назад"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1330
+#: lib/util.php:1361
 msgid "about a month ago"
 msgstr "около месяца назад"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1334
+#: lib/util.php:1365
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
@@ -9762,7 +9904,7 @@ msgstr[1] "около %d месяцев назад"
 msgstr[2] "около %d месяцев назад"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1337
+#: lib/util.php:1368
 msgid "about a year ago"
 msgstr "около года назад"
 
@@ -9775,27 +9917,6 @@ msgstr ""
 "%s не является допустимым цветом! Используйте 3 или 6 шестнадцатеричных "
 "символов."
 
-#. TRANS: %s is the URL to the StatusNet site's Instant Messaging settings.
-#: lib/xmppmanager.php:287
-#, php-format
-msgid "Unknown user. Go to %s to add your address to your account"
-msgstr ""
-"Неизвестный пользователь. Перейдите на %s, чтобы добавить адрес для вашей "
-"учётной записи"
-
-#. TRANS: Response to XMPP source when it sent too long a message.
-#. TRANS: %1$d the maximum number of allowed characters (used for plural), %2$d is the sent number.
-#: lib/xmppmanager.php:406
-#, php-format
-msgid "Message too long. Maximum is %1$d character, you sent %2$d."
-msgid_plural "Message too long. Maximum is %1$d characters, you sent %2$d."
-msgstr[0] ""
-"Сообщение слишком длинное — не больше %1$d символа, вы отправили %2$d."
-msgstr[1] ""
-"Сообщение слишком длинное — не больше %1$d символов, вы отправили %2$d."
-msgstr[2] ""
-"Сообщение слишком длинное — не больше %1$d символов, вы отправили %2$d."
-
 #. TRANS: Exception.
 #: lib/xrd.php:63
 msgid "Invalid XML."
@@ -9812,74 +9933,184 @@ msgstr "Неверный XML, отсутствует корень XRD."
 msgid "Getting backup from file '%s'."
 msgstr "Получение резервной копии из файла «%s»."
 
-#, fuzzy
-#~ msgid "Block this user."
-#~ msgstr "Заблокировать пользователя."
+#~ msgid "Could not generate feed for group - %s"
+#~ msgstr "Не удаётся сгенерировать информацию о группе: %s"
 
 #, fuzzy
-#~ msgid "Delete this notice."
-#~ msgstr "Удалить эту запись"
-
-#, fuzzy
-#~ msgid "Delete this user."
-#~ msgstr "Удалить этого пользователя"
-
-#, fuzzy
-#~ msgid "Restore default designs."
-#~ msgstr "Восстановить оформление по умолчанию"
-
-#, fuzzy
-#~ msgid "Reset back to default."
-#~ msgstr "Восстановить значения по умолчанию"
-
-#, fuzzy
-#~ msgid "Save design."
-#~ msgstr "Сохранить оформление"
-
-#, fuzzy
-#~ msgid "Disfavor favorite."
-#~ msgstr "Разлюбить"
-
-#, fuzzy
-#~ msgid "\"%s\" not found."
-#~ msgstr "Метод API не найден."
-
-#, fuzzy
-#~ msgid "Notice %s not found."
-#~ msgstr "Родительская запись не найдена."
-
-#, fuzzy
-#~ msgid "Attachment %s not found."
-#~ msgstr "Получатель не найден."
-
-#, fuzzy
-#~ msgid "Invalid tag: \"%s\"."
-#~ msgstr "Неверный тег: «%s»"
-
-#, fuzzy
-#~ msgid "%s updates from everyone."
-#~ msgstr "Обновления %s от всех!"
-
-#, fuzzy
-#~ msgid "Password saved"
-#~ msgstr "Пароль сохранён."
-
-#, fuzzy
-#~ msgid "Where you are, like \"City, State (or Region), Country\"."
-#~ msgstr "Где вы находитесь, например «Город, область, страна»"
-
-#, fuzzy
-#~ msgid "Subscribe to this user."
-#~ msgstr "Подписаться на этого пользователя"
+#~ msgid "Current confirmed Jabber/Google Talk address."
+#~ msgstr "Подтверждённый в настоящее время Jabber/Gtalk - адрес."
 
 #, fuzzy
 #~ msgid ""
-#~ "Listenee stream license \"%1$s\" is not compatible with site license \"%2"
-#~ "$s\"."
+#~ "Jabber or Google Talk address, like \"UserName@example.org\". First, make "
+#~ "sure to add %s to your buddy list in your IM client or on Google Talk."
 #~ msgstr ""
-#~ "Лицензия просматриваемого потока «%1$s» несовместима с лицензией сайта «%2"
-#~ "$s»."
+#~ "Jabber или GTalk - адрес, типа \"UserName@example.org\". Первым делом "
+#~ "убедитесь, что добавили %s в список Ваших корреспондентов на Вашем IM-"
+#~ "мессенджере или в GTalk."
 
 #, fuzzy
-#~ msgid "Not allowed to log in."
-#~ msgstr "Не авторизован."
+#~ msgid "Send me notices through Jabber/Google Talk."
+#~ msgstr "Посылать мне записи через Jabber/GTalk."
+
+#, fuzzy
+#~ msgid "Publish a MicroID for my Jabber/Google Talk address."
+#~ msgstr "Опубликовать MicroID для моего Jabber/GTalk - адреса."
+
+#~ msgid "No Jabber ID."
+#~ msgstr "Не Jabber ID."
+
+#, fuzzy
+#~ msgid "Not a valid Jabber ID."
+#~ msgstr "Неверный код Jabber ID"
+
+#~ msgid "That is already your Jabber ID."
+#~ msgstr "Это уже Ваш Jabber ID."
+
+#~ msgid "That is not your Jabber ID."
+#~ msgstr "Это не Ваш Jabber ID."
+
+#~ msgid "Other settings"
+#~ msgstr "Другие настройки"
+
+#~ msgid "Tag cloud"
+#~ msgstr "Облако тегов"
+
+#~ msgid "Consumer key"
+#~ msgstr "Потребительский ключ"
+
+#~ msgid "Consumer secret"
+#~ msgstr "Секретная фраза потребителя"
+
+#~ msgid "Request token URL"
+#~ msgstr "URL ключа запроса"
+
+#~ msgid "Access token URL"
+#~ msgstr "URL ключа доступа"
+
+#~ msgid "Authorize URL"
+#~ msgstr "URL авторизации"
+
+#~ msgid "Jabber"
+#~ msgstr "Jabber"
+
+#~ msgid "Photo"
+#~ msgstr "Фото"
+
+#~ msgid "Other options"
+#~ msgstr "Другие опции"
+
+#~ msgid "Other"
+#~ msgstr "Другое"
+
+#~ msgid "Primary site navigation"
+#~ msgstr "Главная навигация"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Personal profile and friends timeline"
+#~ msgstr "Личный профиль и лента друзей"
+
+#~ msgctxt "MENU"
+#~ msgid "Personal"
+#~ msgstr "Личное"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Change your email, avatar, password, profile"
+#~ msgstr "Изменить ваш email, аватар, пароль, профиль"
+
+#~ msgid "Account"
+#~ msgstr "Настройки"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Connect to services"
+#~ msgstr "Соединить с сервисами"
+
+#~ msgid "Connect"
+#~ msgstr "Соединить"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Change site configuration"
+#~ msgstr "Изменить конфигурацию сайта"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Invite friends and colleagues to join you on %s"
+#~ msgstr "Пригласите друзей и коллег стать такими же как Вы участниками %s"
+
+#~ msgctxt "MENU"
+#~ msgid "Invite"
+#~ msgstr "Пригласить"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Create an account"
+#~ msgstr "Создать новый аккаунт"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Help me!"
+#~ msgstr "Помощь"
+
+#~ msgctxt "MENU"
+#~ msgid "Help"
+#~ msgstr "Помощь"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Search for people or text"
+#~ msgstr "Искать людей или текст"
+
+#~ msgid "Local views"
+#~ msgstr "Локальные виды"
+
+#~ msgid "Page notice"
+#~ msgstr "Новая запись"
+
+#~ msgid "Secondary site navigation"
+#~ msgstr "Навигация по подпискам"
+
+#~ msgid "StatusNet software license"
+#~ msgstr "StatusNet лицензия"
+
+#~ msgid "Site content license"
+#~ msgstr "Лицензия содержимого сайта"
+
+#~ msgid "Pagination"
+#~ msgstr "Разбиение на страницы"
+
+#~ msgid "Author"
+#~ msgstr "Автор"
+
+#~ msgid "Provider"
+#~ msgstr "Сервис"
+
+#~ msgctxt "MENU"
+#~ msgid "SMS"
+#~ msgstr "SMS"
+
+#~ msgid "Filter tags"
+#~ msgstr "Фильтровать теги"
+
+#~ msgid "[%s]"
+#~ msgstr "[%s]"
+
+#~ msgid "Available characters"
+#~ msgstr "6 или больше знаков"
+
+#, fuzzy
+#~ msgctxt "MENU"
+#~ msgid "Profile"
+#~ msgstr "Профиль"
+
+#~ msgid "Search help"
+#~ msgstr "Справка по поиску"
+
+#~ msgid "Unknown user. Go to %s to add your address to your account"
+#~ msgstr ""
+#~ "Неизвестный пользователь. Перейдите на %s, чтобы добавить адрес для вашей "
+#~ "учётной записи"
+
+#~ msgid "Message too long. Maximum is %1$d character, you sent %2$d."
+#~ msgid_plural "Message too long. Maximum is %1$d characters, you sent %2$d."
+#~ msgstr[0] ""
+#~ "Сообщение слишком длинное — не больше %1$d символа, вы отправили %2$d."
+#~ msgstr[1] ""
+#~ "Сообщение слишком длинное — не больше %1$d символов, вы отправили %2$d."
+#~ msgstr[2] ""
+#~ "Сообщение слишком длинное — не больше %1$d символов, вы отправили %2$d."
diff --git a/locale/statusnet.pot b/locale/statusnet.pot
index 4499ddb4bf..c995c35963 100644
--- a/locale/statusnet.pot
+++ b/locale/statusnet.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 15:58+0000\n"
+"POT-Creation-Date: 2011-03-03 17:23+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -72,23 +72,23 @@ msgstr ""
 #. TRANS: Tooltip for button to save access settings in site admin panel.
 #. TRANS: Button text for saving theme settings.
 #. TRANS: Button label to save e-mail preferences.
-#. TRANS: Button label to save Instant Messaging preferences.
-#. TRANS: Button text for saving "Other settings" in profile.
+#. TRANS: Button label to save IM preferences.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
 #. TRANS: Button text for saving site notice in admin panel.
 #. TRANS: Button label to save SMS preferences.
 #. TRANS: Save button for settings for a profile in a subscriptions list.
+#. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
 #. TRANS: Button text on profile design page to save settings.
 #: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
-#: actions/emailsettings.php:250 actions/imsettings.php:183
-#: actions/othersettings.php:136 actions/pathsadminpanel.php:512
-#: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
-#: actions/smssettings.php:205 actions/subscriptions.php:259
+#: actions/emailsettings.php:251 actions/imsettings.php:199
+#: actions/pathsadminpanel.php:512 actions/profilesettings.php:198
+#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:204
+#: actions/subscriptions.php:261 actions/urlsettings.php:152
 #: actions/useradminpanel.php:298 lib/applicationeditform.php:355
-#: lib/designsettings.php:270 lib/groupeditform.php:201
+#: lib/designform.php:320 lib/groupeditform.php:201
 msgctxt "BUTTON"
 msgid "Save"
 msgstr ""
@@ -127,7 +127,11 @@ msgstr ""
 #. 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 use "one time password login" without using an existing user.
+#. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
+#. TRANS: Client error displayed trying to find a user by ID for a non-existing ID.
+#. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when calling a profile action without specifying a user.
 #: actions/all.php:80 actions/allrss.php:69
@@ -139,19 +143,19 @@ msgstr ""
 #: actions/apidirectmessage.php:75 actions/apidirectmessagenew.php:72
 #: actions/apigroupcreate.php:111 actions/apigroupismember.php:89
 #: actions/apigroupjoin.php:98 actions/apigroupleave.php:98
-#: actions/apigrouplist.php:70 actions/apistatusesupdate.php:230
-#: actions/apisubscriptions.php:85 actions/apitimelinefavorites.php:70
-#: actions/apitimelinefriends.php:173 actions/apitimelinehome.php:78
-#: actions/apitimelinementions.php:77 actions/apitimelineuser.php:79
-#: actions/avatarbynickname.php:79 actions/favoritesrss.php:72
-#: actions/foaf.php:42 actions/foaf.php:61 actions/hcard.php:67
-#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
-#: actions/remotesubscribe.php:144 actions/remotesubscribe.php:153
-#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
-#: actions/showfavorites.php:106 actions/userbyid.php:74
-#: actions/usergroups.php:93 actions/userrss.php:40 actions/userxrd.php:59
-#: actions/xrds.php:71 lib/command.php:509 lib/galleryaction.php:59
-#: lib/mailbox.php:80 lib/profileaction.php:77
+#: actions/apigrouplist.php:70 actions/apigroupprofileupdate.php:108
+#: actions/apistatusesupdate.php:230 actions/apisubscriptions.php:85
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:173
+#: actions/apitimelinehome.php:78 actions/apitimelinementions.php:77
+#: actions/apitimelineuser.php:79 actions/avatarbynickname.php:79
+#: actions/favoritesrss.php:72 actions/foaf.php:42 actions/foaf.php:61
+#: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116
+#: actions/otp.php:78 actions/remotesubscribe.php:144
+#: actions/remotesubscribe.php:153 actions/replies.php:73
+#: actions/repliesrss.php:38 actions/rsd.php:113 actions/showfavorites.php:106
+#: actions/userbyid.php:75 actions/usergroups.php:93 actions/userrss.php:40
+#: actions/userxrd.php:59 actions/xrds.php:71 lib/command.php:509
+#: lib/galleryaction.php:59 lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr ""
 
@@ -165,10 +169,9 @@ msgstr ""
 #. TRANS: H1 text for page. %s is a user nickname.
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Timeline title for user and friends. %s is a user nickname.
-#. TRANS: Tooltop for personal group navigation menu option when logged in for viewing timeline of self and friends.
 #: actions/all.php:94 actions/all.php:191 actions/allrss.php:117
 #: actions/apitimelinefriends.php:207 actions/apitimelinehome.php:113
-#: lib/personalgroupnav.php:102
+#: lib/personalgroupnav.php:100
 #, php-format
 msgid "%s and friends"
 msgstr ""
@@ -220,7 +223,7 @@ msgstr ""
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
 #. TRANS: Second sentence of empty message for anonymous users. %s is a user nickname.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:227
+#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:221
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -267,19 +270,20 @@ msgstr ""
 #: actions/apifavoritecreate.php:98 actions/apifavoritedestroy.php:98
 #: actions/apifriendshipscreate.php:99 actions/apifriendshipsdestroy.php:99
 #: actions/apifriendshipsshow.php:124 actions/apigroupcreate.php:138
-#: actions/apigroupismember.php:115 actions/apigroupjoin.php:160
-#: actions/apigroupleave.php:145 actions/apigrouplist.php:134
+#: actions/apigroupismember.php:115 actions/apigroupjoin.php:151
+#: actions/apigroupleave.php:141 actions/apigrouplist.php:134
 #: actions/apigrouplistall.php:120 actions/apigroupmembership.php:105
+#: actions/apigroupprofileupdate.php:100 actions/apigroupprofileupdate.php:213
 #: actions/apigroupshow.php:114 actions/apihelptest.php:84
 #: actions/apistatusesdestroy.php:101 actions/apistatusesretweets.php:110
 #: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:139
 #: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
-#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:268
-#: actions/apitimelinegroup.php:147 actions/apitimelinehome.php:173
-#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:239
-#: actions/apitimelineretweetedtome.php:118
-#: actions/apitimelineretweetsofme.php:150 actions/apitimelinetag.php:159
-#: actions/apitimelineuser.php:206 actions/apiusershow.php:100
+#: actions/apitimelinefavorites.php:182 actions/apitimelinefriends.php:276
+#: actions/apitimelinegroup.php:148 actions/apitimelinehome.php:181
+#: actions/apitimelinementions.php:182 actions/apitimelinepublic.php:247
+#: actions/apitimelineretweetedtome.php:147
+#: actions/apitimelineretweetsofme.php:147 actions/apitimelinetag.php:165
+#: actions/apitimelineuser.php:217 actions/apiusershow.php:100
 msgid "API method not found."
 msgstr ""
 
@@ -294,8 +298,9 @@ msgstr ""
 #: actions/apifavoritecreate.php:88 actions/apifavoritedestroy.php:88
 #: actions/apifriendshipscreate.php:89 actions/apifriendshipsdestroy.php:89
 #: actions/apigroupcreate.php:102 actions/apigroupjoin.php:89
-#: actions/apigroupleave.php:89 actions/apimediaupload.php:66
-#: actions/apistatusesretweet.php:63 actions/apistatusesupdate.php:194
+#: actions/apigroupleave.php:89 actions/apigroupprofileupdate.php:92
+#: actions/apimediaupload.php:66 actions/apistatusesretweet.php:63
+#: actions/apistatusesupdate.php:194
 msgid "This method requires a POST."
 msgstr ""
 
@@ -307,21 +312,16 @@ msgid ""
 msgstr ""
 
 #. TRANS: Server error displayed when a user's delivery device cannot be updated.
-#. TRANS: Server error displayed when a user update to the database fails in the contact address confirmation action.
 #. TRANS: Server error thrown on database error updating e-mail preferences.
 #. TRANS: Server error thrown on database error removing a registered e-mail address.
-#. TRANS: Server error thrown on database error updating Instant Messaging preferences.
-#. TRANS: Server error thrown on database error removing a registered Instant Messaging address.
-#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
 #. TRANS: Server error thrown when user profile settings could not be updated.
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
-#: actions/apiaccountupdatedeliverydevice.php:130
-#: actions/confirmaddress.php:118 actions/emailsettings.php:352
-#: actions/emailsettings.php:498 actions/imsettings.php:276
-#: actions/imsettings.php:432 actions/othersettings.php:186
-#: actions/profilesettings.php:322 actions/smssettings.php:301
-#: actions/smssettings.php:454
+#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
+#: actions/apiaccountupdatedeliverydevice.php:136
+#: actions/emailsettings.php:353 actions/emailsettings.php:499
+#: actions/profilesettings.php:323 actions/smssettings.php:300
+#: actions/smssettings.php:453 actions/urlsettings.php:211
 msgid "Could not update user."
 msgstr ""
 
@@ -347,7 +347,7 @@ msgstr ""
 
 #. TRANS: Server error displayed if a user profile could not be saved.
 #. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:418
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:419
 msgid "Could not save profile."
 msgstr ""
 
@@ -359,7 +359,7 @@ msgstr ""
 #: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
 #: actions/designadminpanel.php:120 actions/editapplication.php:121
 #: actions/newapplication.php:102 actions/newnotice.php:95
-#: lib/designsettings.php:298
+#: lib/designsettings.php:110
 #, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s byte) due to its "
@@ -380,8 +380,8 @@ msgstr[1] ""
 #: actions/apiaccountupdateprofilecolors.php:160
 #: actions/apiaccountupdateprofilecolors.php:171
 #: actions/groupdesignsettings.php:285 actions/groupdesignsettings.php:296
-#: actions/userdesignsettings.php:201 actions/userdesignsettings.php:211
-#: actions/userdesignsettings.php:253 actions/userdesignsettings.php:263
+#: actions/userdesignsettings.php:218 actions/userdesignsettings.php:228
+#: actions/userdesignsettings.php:270 actions/userdesignsettings.php:280
 msgid "Unable to save your design settings."
 msgstr ""
 
@@ -389,7 +389,7 @@ msgstr ""
 #. TRANS: Client error displayed when a database error occurs updating profile colours.
 #: actions/apiaccountupdateprofilebackgroundimage.php:191
 #: actions/apiaccountupdateprofilecolors.php:139
-#: actions/userdesignsettings.php:179
+#: actions/userdesignsettings.php:196
 msgid "Could not update your design."
 msgstr ""
 
@@ -497,7 +497,7 @@ msgstr ""
 
 #. TRANS: Client error displayed trying to direct message another user who's not a friend (403).
 #: actions/apidirectmessagenew.php:144
-msgid "Can't send direct messages to users who aren't your friend."
+msgid "Cannot send direct messages to users who aren't your friend."
 msgstr ""
 
 #. TRANS: Client error displayed trying to direct message self (403).
@@ -578,9 +578,9 @@ msgstr ""
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:156 actions/editgroup.php:191
-#: actions/newgroup.php:137 actions/profilesettings.php:273
-#: actions/register.php:214
+#: actions/apigroupcreate.php:156 actions/apigroupprofileupdate.php:255
+#: actions/editgroup.php:191 actions/newgroup.php:137
+#: actions/profilesettings.php:274 actions/register.php:199
 msgid "Nickname already in use. Try another one."
 msgstr ""
 
@@ -588,9 +588,9 @@ msgstr ""
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:164 actions/editgroup.php:195
-#: actions/newgroup.php:141 actions/profilesettings.php:243
-#: actions/register.php:216
+#: actions/apigroupcreate.php:164 actions/apigroupprofileupdate.php:259
+#: actions/editgroup.php:195 actions/newgroup.php:141
+#: actions/profilesettings.php:244 actions/register.php:201
 msgid "Not a valid nickname."
 msgstr ""
 
@@ -600,10 +600,10 @@ msgstr ""
 #. TRANS: Validation error shown when providing an invalid homepage URL in the "New application" form.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:181 actions/editapplication.php:235
-#: actions/editgroup.php:202 actions/newapplication.php:221
-#: actions/newgroup.php:148 actions/profilesettings.php:248
-#: actions/register.php:223
+#: actions/apigroupcreate.php:181 actions/apigroupprofileupdate.php:277
+#: actions/editapplication.php:235 actions/editgroup.php:202
+#: actions/newapplication.php:221 actions/newgroup.php:148
+#: actions/profilesettings.php:249 actions/register.php:208
 msgid "Homepage is not a valid URL."
 msgstr ""
 
@@ -612,8 +612,8 @@ msgstr ""
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:191 actions/editgroup.php:206
-#: actions/newgroup.php:152 actions/profilesettings.php:252
-#: actions/register.php:226
+#: actions/newgroup.php:152 actions/profilesettings.php:253
+#: actions/register.php:211
 msgid "Full name is too long (maximum 255 characters)."
 msgstr ""
 
@@ -640,8 +640,8 @@ msgstr[1] ""
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:215 actions/editgroup.php:218
-#: actions/newgroup.php:164 actions/profilesettings.php:265
-#: actions/register.php:235
+#: actions/newgroup.php:164 actions/profilesettings.php:266
+#: actions/register.php:220
 msgid "Location is too long (maximum 255 characters)."
 msgstr ""
 
@@ -670,15 +670,16 @@ msgstr ""
 #. TRANS: %s is the alias that is already in use.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error. %s is the already used alias.
-#: actions/apigroupcreate.php:264 actions/editgroup.php:246
-#: actions/newgroup.php:193
+#: actions/apigroupcreate.php:264 actions/apigroupprofileupdate.php:351
+#: actions/editgroup.php:246 actions/newgroup.php:193
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to use an alias during group creation that is the same as the group's nickname.
 #. TRANS: Group edit form validation error.
-#: actions/apigroupcreate.php:278 actions/editgroup.php:253
+#: actions/apigroupcreate.php:278 actions/apigroupprofileupdate.php:359
+#: actions/editgroup.php:253
 msgid "Alias can't be the same as nickname."
 msgstr ""
 
@@ -690,7 +691,8 @@ msgstr ""
 #. TRANS: Client error displayed requesting most recent notices to a group for a non-existing group.
 #: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
 #: actions/apigroupleave.php:104 actions/apigroupmembership.php:71
-#: actions/apigroupshow.php:81 actions/apitimelinegroup.php:89
+#: actions/apigroupprofileupdate.php:113 actions/apigroupshow.php:81
+#: actions/apitimelinegroup.php:89
 msgid "Group not found."
 msgstr ""
 
@@ -708,13 +710,11 @@ msgstr ""
 msgid "You have been blocked from that group by the admin."
 msgstr ""
 
-#. TRANS: Server error displayed when joining a group fails.
-#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
 #. 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.
 #. TRANS: Message given having failed to add a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:362
+#: actions/apigroupjoin.php:136 actions/joingroup.php:139 lib/command.php:362
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr ""
@@ -724,8 +724,6 @@ msgstr ""
 msgid "You are not a member of this group."
 msgstr ""
 
-#. TRANS: Server error displayed when leaving a group fails.
-#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
 #. TRANS: Server error displayed when leaving a group failed in the database.
 #. TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
 #. TRANS: Message given having failed to remove a user from a group.
@@ -761,6 +759,59 @@ msgstr ""
 msgid "groups on %s"
 msgstr ""
 
+#. TRANS: Client error displayed trying to edit a group while not being a group admin.
+#. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
+#. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
+#: actions/apigroupprofileupdate.php:118 actions/editgroup.php:110
+#: actions/editgroup.php:176 actions/groupdesignsettings.php:109
+#: actions/grouplogo.php:111
+msgid "You must be an admin to edit the group."
+msgstr ""
+
+#. TRANS: Server error displayed when editing a group fails.
+#: actions/apigroupprofileupdate.php:171 actions/editgroup.php:274
+msgid "Could not update group."
+msgstr ""
+
+#. TRANS: Server error displayed when group aliases could not be added.
+#. TRANS: Server exception thrown when creating group aliases failed.
+#: actions/apigroupprofileupdate.php:194 actions/editgroup.php:281
+#: classes/User_group.php:540
+msgid "Could not create aliases."
+msgstr ""
+
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: actions/apigroupprofileupdate.php:249 lib/nickname.php:165
+msgid "Nickname must have only lowercase letters and numbers and no spaces."
+msgstr ""
+
+#: actions/apigroupprofileupdate.php:286
+msgid "Full name is too long (max 255 chars)."
+msgstr ""
+
+#: actions/apigroupprofileupdate.php:296
+#, php-format
+msgid "description is too long (max %d chars)."
+msgstr ""
+
+#: actions/apigroupprofileupdate.php:307
+msgid "Location is too long (max 255 chars)."
+msgstr ""
+
+#: actions/apigroupprofileupdate.php:326
+#, php-format
+msgid "Too many aliases! Maximum %d."
+msgstr ""
+
+#. TRANS: Group edit form validation error.
+#. TRANS: Group create form validation error.
+#. TRANS: %s is the invalid alias.
+#: actions/apigroupprofileupdate.php:342 actions/editgroup.php:241
+#: actions/newgroup.php:188
+#, php-format
+msgid "Invalid alias: \"%s\""
+msgstr ""
+
 #. TRANS: Client error displayed when uploading a media file has failed.
 #: actions/apimediaupload.php:101
 msgid "Upload failed."
@@ -791,21 +842,22 @@ msgstr ""
 #. TRANS: Form validation error message.
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
+#. TRANS: Client error displayed when the session token is not okay.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
 #: actions/deletenotice.php:177 actions/disfavor.php:75
-#: actions/emailsettings.php:291 actions/favor.php:75 actions/geocode.php:55
+#: actions/emailsettings.php:292 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:65 actions/grouplogo.php:321
-#: actions/groupunblock.php:65 actions/imsettings.php:224
-#: actions/invite.php:60 actions/login.php:137 actions/makeadmin.php:66
-#: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
-#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
-#: actions/othersettings.php:155 actions/passwordsettings.php:138
-#: actions/profilesettings.php:217 actions/recoverpassword.php:383
-#: actions/register.php:172 actions/remotesubscribe.php:76
-#: actions/repeat.php:82 actions/smssettings.php:250 actions/subedit.php:40
-#: actions/subscribe.php:86 actions/tagother.php:166
-#: actions/unsubscribe.php:69 actions/userauthorization.php:52
-#: lib/designsettings.php:310
+#: actions/groupunblock.php:65 actions/imsettings.php:241
+#: actions/invite.php:60 actions/makeadmin.php:66 actions/newmessage.php:135
+#: actions/newnotice.php:105 actions/nudge.php:80
+#: actions/oauthappssettings.php:162 actions/oauthconnectionssettings.php:135
+#: actions/passwordsettings.php:137 actions/pluginenable.php:87
+#: actions/profilesettings.php:218 actions/recoverpassword.php:383
+#: actions/register.php:157 actions/remotesubscribe.php:76
+#: actions/repeat.php:82 actions/smssettings.php:249 actions/subedit.php:40
+#: actions/subscribe.php:87 actions/tagother.php:145
+#: actions/unsubscribe.php:69 actions/urlsettings.php:171
+#: actions/userauthorization.php:53 lib/designsettings.php:122
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 
@@ -833,10 +885,10 @@ msgstr ""
 #. TRANS: Unknown form validation error in design settings form.
 #: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
 #: actions/designadminpanel.php:100 actions/editapplication.php:144
-#: actions/emailsettings.php:310 actions/grouplogo.php:332
-#: actions/imsettings.php:239 actions/newapplication.php:124
-#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
-#: actions/smssettings.php:271 lib/designsettings.php:321
+#: actions/emailsettings.php:311 actions/grouplogo.php:332
+#: actions/imsettings.php:256 actions/newapplication.php:124
+#: actions/oauthconnectionssettings.php:144 actions/recoverpassword.php:46
+#: actions/smssettings.php:270 lib/designsettings.php:133
 msgid "Unexpected form submission."
 msgstr ""
 
@@ -879,31 +931,26 @@ msgstr ""
 
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Field label in form for profile settings.
-#. TRANS: Label for group nickname (dt). Text hidden by default.
-#. TRANS: DT for nick name in a profile.
-#: actions/apioauthauthorize.php:459 actions/login.php:252
-#: actions/profilesettings.php:106 actions/register.php:432
-#: actions/showgroup.php:243 actions/tagother.php:94
+#: actions/apioauthauthorize.php:459 actions/login.php:225
+#: actions/profilesettings.php:107 actions/register.php:411
 #: actions/userauthorization.php:145 lib/groupeditform.php:145
-#: lib/userprofile.php:137
 msgid "Nickname"
 msgstr ""
 
 #. TRANS: Field label on OAuth API authorisation form.
-#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:463 actions/login.php:255
-#: actions/register.php:436 lib/accountsettingsaction.php:120
+#: actions/apioauthauthorize.php:463 actions/login.php:228
+#: actions/register.php:415 lib/settingsnav.php:87
 msgid "Password"
 msgstr ""
 
 #. TRANS: Button text that when clicked will cancel the process of allowing access to an account
 #. TRANS: by an external application.
 #. TRANS: Button label to cancel an e-mail address confirmation procedure.
-#. TRANS: Button label to cancel an Instant Messaging address confirmation procedure.
+#. TRANS: Button label to cancel an IM address confirmation procedure.
 #. TRANS: Button label to cancel a SMS address confirmation procedure.
 #. TRANS: Button label in the "Edit application" form.
-#: actions/apioauthauthorize.php:478 actions/emailsettings.php:124
-#: actions/imsettings.php:127 actions/smssettings.php:133
+#: actions/apioauthauthorize.php:478 actions/emailsettings.php:125
+#: actions/imsettings.php:136 actions/smssettings.php:132
 #: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Cancel"
@@ -1011,7 +1058,7 @@ msgstr ""
 #. TRANS: %s is the requested output format.
 #: actions/apistatusesshow.php:144
 #, php-format
-msgid "Unsupported format: %s"
+msgid "Unsupported format: %s."
 msgstr ""
 
 #. TRANS: Client error displayed requesting a deleted status.
@@ -1091,13 +1138,6 @@ msgstr ""
 msgid "%1$s updates favorited by %2$s / %3$s."
 msgstr ""
 
-#. TRANS: Server error displayed when generating an Atom feed fails.
-#. TRANS: %s is the error.
-#: actions/apitimelinegroup.php:134
-#, php-format
-msgid "Could not generate feed for group - %s"
-msgstr ""
-
 #. TRANS: Title for timeline of most recent mentions of a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname.
 #: actions/apitimelinementions.php:115
@@ -1114,13 +1154,14 @@ msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr ""
 
 #. TRANS: Title for site timeline. %s is the StatusNet sitename.
+#. TRANS: Public RSS feed title. %s is the StatusNet site name.
 #: actions/apitimelinepublic.php:193 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr ""
 
 #. TRANS: Subtitle for site timeline. %s is the StatusNet sitename.
-#: actions/apitimelinepublic.php:199 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:199
 #, php-format
 msgid "%s updates from everyone!"
 msgstr ""
@@ -1131,21 +1172,33 @@ msgid "Unimplemented."
 msgstr ""
 
 #. TRANS: Title for Atom feed "repeated to me". %s is the user nickname.
-#: actions/apitimelineretweetedtome.php:108
+#: actions/apitimelineretweetedtome.php:96
 #, php-format
 msgid "Repeated to %s"
 msgstr ""
 
+#: actions/apitimelineretweetedtome.php:98
+#, php-format
+msgid "%1$s notices that were to repeated to %2$s / %3$s."
+msgstr ""
+
 #. TRANS: Title of list of repeated notices of the logged in user.
 #. TRANS: %s is the nickname of the logged in user.
-#: actions/apitimelineretweetsofme.php:112
+#: actions/apitimelineretweetsofme.php:98
 #, php-format
 msgid "Repeats of %s"
 msgstr ""
 
+#: actions/apitimelineretweetsofme.php:104
+#, php-format
+msgid "%1$s notices that %2$s / %3$s has repeated."
+msgstr ""
+
 #. TRANS: Title for timeline with lastest notices with a given tag.
 #. TRANS: %s is the tag.
-#: actions/apitimelinetag.php:101 actions/tag.php:67
+#. TRANS: Title for first page of notices with tags.
+#. TRANS: %s is the tag.
+#: actions/apitimelinetag.php:101 actions/tag.php:69
 #, php-format
 msgid "Notices tagged with %s"
 msgstr ""
@@ -1158,53 +1211,54 @@ msgid "Updates tagged with %1$s on %2$s!"
 msgstr ""
 
 #. TRANS: Client error displayed trying to add a notice to another user's timeline.
-#: actions/apitimelineuser.php:297
+#: actions/apitimelineuser.php:308
 msgid "Only the user can add to their own timeline."
 msgstr ""
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:304
+#: actions/apitimelineuser.php:315
 msgid "Only accept AtomPub for Atom feeds."
 msgstr ""
 
 #. TRANS: Client error displayed attempting to post an empty API notice.
-#: actions/apitimelineuser.php:311
+#: actions/apitimelineuser.php:322
 msgid "Atom post must not be empty."
 msgstr ""
 
 #. TRANS: Client error displayed attempting to post an API that is not well-formed XML.
-#: actions/apitimelineuser.php:317
+#: actions/apitimelineuser.php:328
 msgid "Atom post must be well-formed XML."
 msgstr ""
 
 #. TRANS: Client error displayed when not using an Atom entry.
-#: actions/apitimelineuser.php:323 actions/atompubfavoritefeed.php:228
+#: actions/apitimelineuser.php:334 actions/atompubfavoritefeed.php:228
 #: actions/atompubmembershipfeed.php:230
 #: actions/atompubsubscriptionfeed.php:236
 msgid "Atom post must be an Atom entry."
 msgstr ""
 
 #. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
-#: actions/apitimelineuser.php:335
+#: actions/apitimelineuser.php:345
 msgid "Can only handle POST activities."
 msgstr ""
 
 #. TRANS: Client error displayed when using an unsupported activity object type.
 #. TRANS: %s is the unsupported activity object type.
-#: actions/apitimelineuser.php:346
+#: actions/apitimelineuser.php:356
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
 #. TRANS: %d is the notice ID (number).
-#: actions/apitimelineuser.php:380
+#: actions/apitimelineuser.php:390
 #, php-format
 msgid "No content for notice %d."
 msgstr ""
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:408
+#. TRANS: %s is the notice URI.
+#: actions/apitimelineuser.php:419
 #, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr ""
@@ -1221,9 +1275,10 @@ msgstr ""
 
 #. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
 #. TRANS: Client exception.
+#. TRANS: Client error displayed trying to subscribe to a non-existing profile.
 #: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
 #: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
-#: actions/subscribe.php:107
+#: actions/subscribe.php:110
 msgid "No such profile."
 msgstr ""
 
@@ -1358,7 +1413,7 @@ msgid "Not a member."
 msgstr ""
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
-#: actions/atompubshowmembership.php:151
+#: actions/atompubshowmembership.php:150
 msgid "Cannot delete someone else's membership."
 msgstr ""
 
@@ -1445,10 +1500,7 @@ msgid "Invalid size."
 msgstr ""
 
 #. TRANS: Title for avatar upload page.
-#. TRANS: Label for group avatar (dt). Text hidden by default.
-#. TRANS: Link description in user account settings menu.
-#: actions/avatarsettings.php:66 actions/showgroup.php:227
-#: lib/accountsettingsaction.php:113
+#: actions/avatarsettings.php:66 lib/settingsnav.php:82
 msgid "Avatar"
 msgstr ""
 
@@ -1461,9 +1513,11 @@ msgstr ""
 
 #. TRANS: Server error displayed in avatar upload page when no matching profile can be found for a user.
 #. TRANS: Server error displayed coming across a request from a user without a profile.
+#. TRANS: Server error displayed when trying to authorise a remote subscription request
+#. TRANS: while the user has no profile.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
 #: actions/grouplogo.php:184 actions/remotesubscribe.php:190
-#: actions/userauthorization.php:72 actions/userrss.php:108
+#: actions/userauthorization.php:75 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr ""
 
@@ -1518,9 +1572,9 @@ msgstr ""
 msgid "No file uploaded."
 msgstr ""
 
-#. TRANS: Avatar upload form unstruction after uploading a file.
+#. TRANS: Avatar upload form instruction after uploading a file.
 #: actions/avatarsettings.php:345
-msgid "Pick a square area of the image to be your avatar"
+msgid "Pick a square area of the image to be your avatar."
 msgstr ""
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
@@ -1546,7 +1600,7 @@ msgstr ""
 
 #. TRANS: Title for backup account page.
 #. TRANS: Option in profile settings to create a backup of the account of the currently logged in user.
-#: actions/backupaccount.php:61 actions/profilesettings.php:467
+#: actions/backupaccount.php:61 actions/profilesettings.php:468
 msgid "Backup account"
 msgstr ""
 
@@ -1578,7 +1632,7 @@ msgstr ""
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
 #: actions/backupaccount.php:254
-msgid "Backup your account"
+msgid "Backup your account."
 msgstr ""
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
@@ -1616,7 +1670,7 @@ msgstr ""
 
 #. TRANS: Submit button title for 'No' when blocking a user.
 #: actions/block.php:158
-msgid "Do not block this user"
+msgid "Do not block this user."
 msgstr ""
 
 #. TRANS: Button label on the user block form.
@@ -1633,9 +1687,8 @@ msgid "Yes"
 msgstr ""
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#. TRANS: Description of the form to block a user.
-#: actions/block.php:165 lib/blockform.php:79
-msgid "Block this user"
+#: actions/block.php:165
+msgid "Block this user."
 msgstr ""
 
 #. TRANS: Server error displayed when blocking a user fails.
@@ -1701,31 +1754,44 @@ msgstr ""
 msgid "That confirmation code is not for you!"
 msgstr ""
 
-#. TRANS: Server error for a unknow address type %s, which can be 'email', 'jabber', or 'sms'.
-#: actions/confirmaddress.php:92
+#. TRANS: Server error for an unknown address type, which can be 'email', 'sms', or the name of an IM network (such as 'xmpp' or 'aim')
+#: actions/confirmaddress.php:94
 #, php-format
-msgid "Unrecognized address type %s."
+msgid "Unrecognized address type %s"
 msgstr ""
 
 #. TRANS: Client error for an already confirmed email/jabber/sms address.
-#: actions/confirmaddress.php:97
+#: actions/confirmaddress.php:103 actions/confirmaddress.php:136
 msgid "That address has already been confirmed."
 msgstr ""
 
+#: actions/confirmaddress.php:121 actions/imsettings.php:444
+#: actions/userdesignsettings.php:306
+msgid "Couldn't update user."
+msgstr ""
+
+#: actions/confirmaddress.php:144
+msgid "Couldn't update user im preferences."
+msgstr ""
+
+#: actions/confirmaddress.php:156
+msgid "Couldn't insert user im preferences."
+msgstr ""
+
 #. TRANS: Server error displayed when an address confirmation code deletion from the
 #. TRANS: database fails in the contact address confirmation action.
-#: actions/confirmaddress.php:132
+#: actions/confirmaddress.php:169
 msgid "Could not delete address confirmation."
 msgstr ""
 
 #. TRANS: Title for the contact address confirmation action.
-#: actions/confirmaddress.php:150
+#: actions/confirmaddress.php:185
 msgid "Confirm address"
 msgstr ""
 
 #. TRANS: Success message for the contact address confirmation action.
 #. TRANS: %s can be 'email', 'jabber', or 'sms'.
-#: actions/confirmaddress.php:166
+#: actions/confirmaddress.php:200
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr ""
@@ -1739,6 +1805,7 @@ msgstr ""
 #. TRANS: Label for user statistics.
 #: actions/conversation.php:149 lib/noticelist.php:87
 #: lib/profileaction.php:246 lib/searchgroupnav.php:82
+#: lib/threadednoticelist.php:66
 msgid "Notices"
 msgstr ""
 
@@ -1771,7 +1838,7 @@ msgstr ""
 
 #. TRANS: Page title for page on which a user account can be deleted.
 #. TRANS: Option in profile settings to delete the account of the currently logged in user.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:475
+#: actions/deleteaccount.php:228 actions/profilesettings.php:476
 msgid "Delete account"
 msgstr ""
 
@@ -1794,7 +1861,7 @@ msgstr ""
 #. TRANS: Field label for delete account confirmation entry.
 #. TRANS: Field label for password reset form where the password has to be typed again.
 #: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:262 actions/register.php:440
+#: actions/recoverpassword.php:262 actions/register.php:419
 msgid "Confirm"
 msgstr ""
 
@@ -1823,14 +1890,14 @@ msgstr ""
 #. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
 #: actions/deleteapplication.php:79 actions/editapplication.php:78
-#: actions/showapplication.php:94
+#: actions/showapplication.php:90
 msgid "You are not the owner of this application."
 msgstr ""
 
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
-#: actions/newapplication.php:112 actions/showapplication.php:118
-#: lib/action.php:1425
+#: actions/newapplication.php:112 actions/showapplication.php:113
+#: lib/action.php:1391
 msgid "There was a problem with your session token."
 msgstr ""
 
@@ -1850,12 +1917,12 @@ msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting an application.
 #: actions/deleteapplication.php:161
-msgid "Do not delete this application"
+msgid "Do not delete this application."
 msgstr ""
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
 #: actions/deleteapplication.php:167
-msgid "Delete this application"
+msgid "Delete this application."
 msgstr ""
 
 #. TRANS: Client error when trying to delete group while not logged in.
@@ -1906,12 +1973,12 @@ msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting a group.
 #: actions/deletegroup.php:224
-msgid "Do not delete this group"
+msgid "Do not delete this group."
 msgstr ""
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
 #: actions/deletegroup.php:231
-msgid "Delete this group"
+msgid "Delete this group."
 msgstr ""
 
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
@@ -1919,14 +1986,16 @@ msgstr ""
 #. TRANS: Client error displayed when trying to mark a notice as favorite without being logged in.
 #. TRANS: Client error displayed trying to block a user from a group while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
+#. TRANS: Client error displayed trying to log out when not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
+#. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
 #. TRANS: Client error displayed when trying to change user options while not logged in.
 #: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
-#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:69
+#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:70
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
-#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
-#: actions/tagother.php:33 actions/unsubscribe.php:52
+#: actions/nudge.php:63 actions/pluginenable.php:97 actions/subedit.php:33
+#: actions/subscribe.php:98 actions/tagother.php:33 actions/unsubscribe.php:52
 #: lib/adminpanelaction.php:71 lib/profileformaction.php:63
 #: lib/settingsaction.php:72
 msgid "Not logged in."
@@ -1952,12 +2021,12 @@ msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting a notice.
 #: actions/deletenotice.php:159
-msgid "Do not delete this notice"
+msgid "Do not delete this notice."
 msgstr ""
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:166 lib/noticelist.php:673
-msgid "Delete this notice"
+#: actions/deletenotice.php:166
+msgid "Delete this notice."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
@@ -1990,18 +2059,16 @@ msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting a user.
 #: actions/deleteuser.php:158
-msgid "Do not delete this user"
+msgid "Do not delete this user."
 msgstr ""
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
-#. TRANS: Description of form for deleting a user.
-#: actions/deleteuser.php:165 lib/deleteuserform.php:75
-msgid "Delete this user"
+#: actions/deleteuser.php:165
+msgid "Delete this user."
 msgstr ""
 
 #. TRANS: Message used as title for design settings for the site.
-#. TRANS: Link description in user account settings menu.
-#: actions/designadminpanel.php:60 lib/accountsettingsaction.php:134
+#: actions/designadminpanel.php:60 lib/settingsnav.php:97
 msgid "Design"
 msgstr ""
 
@@ -2068,8 +2135,7 @@ msgid "You can upload a custom StatusNet theme as a .ZIP archive."
 msgstr ""
 
 #. TRANS: Fieldset legend for theme background image.
-#. TRANS: Fieldset legend on profile design page.
-#: actions/designadminpanel.php:515 lib/designsettings.php:98
+#: actions/designadminpanel.php:515
 msgid "Change background image"
 msgstr ""
 
@@ -2077,7 +2143,7 @@ msgstr ""
 #. TRANS: Field label for background color selector.
 #. TRANS: Label on profile design page for setting a profile page background colour.
 #: actions/designadminpanel.php:525 actions/designadminpanel.php:609
-#: lib/designsettings.php:183
+#: lib/designform.php:238
 msgid "Background"
 msgstr ""
 
@@ -2102,13 +2168,13 @@ msgstr ""
 #. TRANS: Form guide for turning background image on or off on theme designer page.
 #. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
 #. TRANS: use of the uploaded profile image.
-#: actions/designadminpanel.php:577 lib/designsettings.php:159
+#: actions/designadminpanel.php:577 lib/designform.php:214
 msgid "Turn background image on or off."
 msgstr ""
 
 #. TRANS: Checkbox label to title background image on theme designer page.
 #. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-#: actions/designadminpanel.php:583 lib/designsettings.php:165
+#: actions/designadminpanel.php:583 lib/designform.php:220
 msgid "Tile background image"
 msgstr ""
 
@@ -2119,25 +2185,25 @@ msgstr ""
 
 #. TRANS: Field label for content color selector.
 #. TRANS: Label on profile design page for setting a profile page content colour.
-#: actions/designadminpanel.php:623 lib/designsettings.php:197
+#: actions/designadminpanel.php:623 lib/designform.php:252
 msgid "Content"
 msgstr ""
 
 #. TRANS: Field label for sidebar color selector.
 #. TRANS: Label on profile design page for setting a profile page sidebar colour.
-#: actions/designadminpanel.php:637 lib/designsettings.php:211
+#: actions/designadminpanel.php:637 lib/designform.php:266
 msgid "Sidebar"
 msgstr ""
 
 #. TRANS: Field label for text color selector.
 #. TRANS: Label on profile design page for setting a profile page text colour.
-#: actions/designadminpanel.php:651 lib/designsettings.php:225
+#: actions/designadminpanel.php:651 lib/designform.php:280
 msgid "Text"
 msgstr ""
 
 #. TRANS: Field label for link color selector.
 #. TRANS: Label on profile design page for setting a profile page links colour.
-#: actions/designadminpanel.php:665 lib/designsettings.php:239
+#: actions/designadminpanel.php:665 lib/designform.php:294
 msgid "Links"
 msgstr ""
 
@@ -2158,21 +2224,18 @@ msgid "Use defaults"
 msgstr ""
 
 #. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: actions/designadminpanel.php:720 lib/designsettings.php:259
-msgid "Restore default designs"
+#: actions/designadminpanel.php:720
+msgid "Restore default designs."
 msgstr ""
 
 #. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: actions/designadminpanel.php:728 lib/designsettings.php:267
-msgid "Reset back to default"
+#: actions/designadminpanel.php:728
+msgid "Reset back to default."
 msgstr ""
 
 #. TRANS: Title for button for saving theme settings.
-#. TRANS: Title for button on profile design page to save settings.
-#: actions/designadminpanel.php:736 lib/designsettings.php:272
-msgid "Save design"
+#: actions/designadminpanel.php:736
+msgid "Save design."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
@@ -2204,7 +2267,7 @@ msgid "You must be logged in to edit an application."
 msgstr ""
 
 #. TRANS: Client error displayed trying to edit an application that does not exist.
-#: actions/editapplication.php:83 actions/showapplication.php:87
+#: actions/editapplication.php:83 actions/showapplication.php:83
 msgid "No such application."
 msgstr ""
 
@@ -2295,80 +2358,53 @@ msgstr ""
 msgid "You must be logged in to create a group."
 msgstr ""
 
-#. TRANS: Client error displayed trying to edit a group while not being a group admin.
-#. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
-#. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
-#: actions/editgroup.php:110 actions/editgroup.php:176
-#: actions/groupdesignsettings.php:109 actions/grouplogo.php:111
-msgid "You must be an admin to edit the group."
-msgstr ""
-
 #. TRANS: Form instructions for group edit form.
 #: actions/editgroup.php:161
 msgid "Use this form to edit the group."
 msgstr ""
 
-#. TRANS: Group edit form validation error.
-#. TRANS: Group create form validation error.
-#. TRANS: %s is the invalid alias.
-#: actions/editgroup.php:241 actions/newgroup.php:188
-#, php-format
-msgid "Invalid alias: \"%s\""
-msgstr ""
-
-#. TRANS: Server error displayed when editing a group fails.
-#: actions/editgroup.php:274
-msgid "Could not update group."
-msgstr ""
-
-#. TRANS: Server error displayed when group aliases could not be added.
-#. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/editgroup.php:281 classes/User_group.php:540
-msgid "Could not create aliases."
-msgstr ""
-
 #. TRANS: Group edit form success message.
 #: actions/editgroup.php:301
 msgid "Options saved."
 msgstr ""
 
 #. TRANS: Title for e-mail settings.
-#: actions/emailsettings.php:59
+#: actions/emailsettings.php:60
 msgid "Email settings"
 msgstr ""
 
 #. TRANS: E-mail settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/emailsettings.php:73
+#: actions/emailsettings.php:74
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 msgstr ""
 
 #. TRANS: Form legend for e-mail settings form.
 #. TRANS: Field label for e-mail address input in e-mail settings form.
-#: actions/emailsettings.php:103 actions/emailsettings.php:129
+#: actions/emailsettings.php:104 actions/emailsettings.php:130
 msgid "Email address"
 msgstr ""
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:109
+#: actions/emailsettings.php:110
 msgid "Current confirmed email address."
 msgstr ""
 
 #. TRANS: Button label to remove a confirmed e-mail address.
 #. TRANS: Button label for removing a set sender e-mail address to post notices from.
-#. TRANS: Button label to remove a confirmed Instant Messaging address.
+#. TRANS: Button label to remove a confirmed IM address.
 #. TRANS: Button label to remove a confirmed SMS address.
 #. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
-#: actions/emailsettings.php:112 actions/emailsettings.php:179
-#: actions/imsettings.php:112 actions/smssettings.php:120
-#: actions/smssettings.php:176
+#: actions/emailsettings.php:113 actions/emailsettings.php:180
+#: actions/imsettings.php:119 actions/smssettings.php:119
+#: actions/smssettings.php:175
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr ""
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:119
+#: actions/emailsettings.php:120
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -2379,44 +2415,44 @@ msgstr ""
 #. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
 #. TRANS: Any other domain may be owned by a legitimate person or
 #. TRANS: organization.
-#: actions/emailsettings.php:136
+#: actions/emailsettings.php:137
 msgid "Email address, like \"UserName@example.org\""
 msgstr ""
 
 #. TRANS: Button label for adding an e-mail address in e-mail settings form.
-#. TRANS: Button label for adding an Instant Messaging address in Instant Messaging settings form.
+#. TRANS: Button label for adding an IM address in IM settings form.
 #. TRANS: Button label for adding a SMS phone number in SMS settings form.
-#: actions/emailsettings.php:140 actions/imsettings.php:147
-#: actions/smssettings.php:158
+#: actions/emailsettings.php:141 actions/imsettings.php:147
+#: actions/smssettings.php:157
 msgctxt "BUTTON"
 msgid "Add"
 msgstr ""
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:148 actions/smssettings.php:167
+#: actions/emailsettings.php:149 actions/smssettings.php:166
 msgid "Incoming email"
 msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:154
+#: actions/emailsettings.php:155
 msgid "I want to post notices by email."
 msgstr ""
 
 #. TRANS: Form instructions for incoming e-mail form in e-mail settings.
 #. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
-#: actions/emailsettings.php:176 actions/smssettings.php:174
+#: actions/emailsettings.php:177 actions/smssettings.php:173
 msgid "Send email to this address to post new notices."
 msgstr ""
 
 #. TRANS: Instructions for incoming e-mail address input form, when an address has already been assigned.
 #. TRANS: Instructions for incoming SMS e-mail address input form.
-#: actions/emailsettings.php:185 actions/smssettings.php:182
+#: actions/emailsettings.php:186 actions/smssettings.php:181
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr ""
 
 #. TRANS: Instructions for incoming e-mail address input form.
-#: actions/emailsettings.php:189
+#: actions/emailsettings.php:190
 msgid ""
 "To send notices via email, we need to create a unique email address for you "
 "on this server:"
@@ -2424,87 +2460,87 @@ msgstr ""
 
 #. TRANS: Button label for adding an e-mail address to send notices from.
 #. TRANS: Button label for adding an SMS e-mail address to send notices from.
-#: actions/emailsettings.php:195 actions/smssettings.php:185
+#: actions/emailsettings.php:196 actions/smssettings.php:184
 msgctxt "BUTTON"
 msgid "New"
 msgstr ""
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:204
+#: actions/emailsettings.php:205
 msgid "Email preferences"
 msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:212
+#: actions/emailsettings.php:213
 msgid "Send me notices of new subscriptions through email."
 msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:218
+#: actions/emailsettings.php:219
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:225
+#: actions/emailsettings.php:226
 msgid "Send me email when someone sends me a private message."
 msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:231
+#: actions/emailsettings.php:232
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:237
+#: actions/emailsettings.php:238
 msgid "Allow friends to nudge me and send me an email."
 msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:243
+#: actions/emailsettings.php:244
 msgid "Publish a MicroID for my email address."
 msgstr ""
 
 #. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:361
+#: actions/emailsettings.php:362
 msgid "Email preferences saved."
 msgstr ""
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:380
+#: actions/emailsettings.php:381
 msgid "No email address."
 msgstr ""
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:388
+#: actions/emailsettings.php:389
 msgid "Cannot normalize that email address."
 msgstr ""
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:393 actions/register.php:212
+#: actions/emailsettings.php:394 actions/register.php:197
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr ""
 
 #. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:397
+#: actions/emailsettings.php:398
 msgid "That is already your email address."
 msgstr ""
 
 #. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:401
+#: actions/emailsettings.php:402
 msgid "That email address already belongs to another user."
 msgstr ""
 
 #. TRANS: Server error thrown on database error adding e-mail confirmation code.
 #. TRANS: Server error thrown on database error adding Instant Messaging confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:418 actions/imsettings.php:343
-#: actions/smssettings.php:365
+#: actions/emailsettings.php:419 actions/imsettings.php:362
+#: actions/smssettings.php:364
 msgid "Could not insert confirmation code."
 msgstr ""
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:425
+#: actions/emailsettings.php:426
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
@@ -2513,57 +2549,60 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling Instant Messaging address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:445 actions/imsettings.php:377
-#: actions/smssettings.php:399
+#: actions/emailsettings.php:446 actions/imsettings.php:391
+#: actions/smssettings.php:398
 msgid "No pending confirmation to cancel."
 msgstr ""
 
 #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:450
+#: actions/emailsettings.php:451
 msgid "That is the wrong email address."
 msgstr ""
 
 #. TRANS: Server error thrown on database error canceling e-mail address confirmation.
 #. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
-#: actions/emailsettings.php:459 actions/smssettings.php:413
+#: actions/emailsettings.php:460 actions/smssettings.php:412
 msgid "Could not delete email confirmation."
 msgstr ""
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:464
+#: actions/emailsettings.php:465
 msgid "Email confirmation cancelled."
 msgstr ""
 
 #. TRANS: Message given trying to remove an e-mail address that is not
 #. TRANS: registered for the active user.
-#: actions/emailsettings.php:483
+#: actions/emailsettings.php:484
 msgid "That is not your email address."
 msgstr ""
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:504
+#: actions/emailsettings.php:505
 msgid "The email address was removed."
 msgstr ""
 
 #. TRANS: Form validation error displayed when trying to remove an incoming e-mail address while no address has been set.
-#: actions/emailsettings.php:518 actions/smssettings.php:555
+#: actions/emailsettings.php:519 actions/smssettings.php:554
 msgid "No incoming email address."
 msgstr ""
 
 #. TRANS: Server error thrown on database error removing incoming e-mail address.
 #. TRANS: Server error thrown on database error adding incoming e-mail address.
-#: actions/emailsettings.php:530 actions/emailsettings.php:554
-#: actions/smssettings.php:565 actions/smssettings.php:588
+#. TRANS: Server error displayed when the user could not be updated in SMS settings.
+#: actions/emailsettings.php:531 actions/emailsettings.php:555
+#: actions/smssettings.php:565 actions/smssettings.php:590
 msgid "Could not update user record."
 msgstr ""
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:534 actions/smssettings.php:568
+#. TRANS: Confirmation text after updating SMS settings.
+#: actions/emailsettings.php:535 actions/smssettings.php:569
 msgid "Incoming email address removed."
 msgstr ""
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:558 actions/smssettings.php:591
+#. TRANS: Confirmation text after updating SMS settings.
+#: actions/emailsettings.php:559 actions/smssettings.php:594
 msgid "New incoming email address added."
 msgstr ""
 
@@ -2574,7 +2613,7 @@ msgstr ""
 
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
 #: actions/favor.php:95
-msgid "Disfavor favorite"
+msgid "Disfavor favorite."
 msgstr ""
 
 #. TRANS: Page title for first page of favorited notices.
@@ -2621,9 +2660,8 @@ msgstr ""
 #. TRANS: %s is a user's nickname.
 #. TRANS: Title for first page of favourite notices of a user.
 #. TRANS: %s is the user for whom the favourite notices are displayed.
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing own favourited notices.
 #: actions/favoritesrss.php:111 actions/showfavorites.php:76
-#: lib/personalgroupnav.php:122
+#: lib/personalgroupnav.php:110
 #, php-format
 msgid "%s's favorite notices"
 msgstr ""
@@ -2806,12 +2844,12 @@ msgstr ""
 
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
 #: actions/groupblock.php:191
-msgid "Do not block this user from this group"
+msgid "Do not block this user from this group."
 msgstr ""
 
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
 #: actions/groupblock.php:198
-msgid "Block this user from this group"
+msgid "Block this user from this group."
 msgstr ""
 
 #. TRANS: Server error displayed when trying to block a user from a group fails because of an application error.
@@ -2820,6 +2858,7 @@ msgid "Database error blocking user from group."
 msgstr ""
 
 #. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
+#. TRANS: Client error displayed trying to find a user by ID without providing an ID.
 #: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr ""
@@ -2847,7 +2886,7 @@ msgid "Unable to update your design settings."
 msgstr ""
 
 #. TRANS: Form text to confirm saved group design settings.
-#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:222
+#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:239
 msgid "Design preferences saved."
 msgstr ""
 
@@ -2910,7 +2949,7 @@ msgid "A list of the users in this group."
 msgstr ""
 
 #. TRANS: Indicator in group members list that this user is a group administrator.
-#: actions/groupmembers.php:190
+#: actions/groupmembers.php:190 lib/action.php:581
 msgid "Admin"
 msgstr ""
 
@@ -2995,8 +3034,10 @@ msgid "Group search"
 msgstr ""
 
 #. TRANS: Text on page where groups can be searched if no results were found for a query.
-#: actions/groupsearch.php:82 actions/noticesearch.php:117
-#: actions/peoplesearch.php:83
+#. TRANS: Text for notice search results is the query had no results.
+#. TRANS: Message on the "People search" page where a query has no results.
+#: actions/groupsearch.php:82 actions/noticesearch.php:122
+#: actions/peoplesearch.php:87
 msgid "No results."
 msgstr ""
 
@@ -3029,149 +3070,147 @@ msgid "User is not blocked from group."
 msgstr ""
 
 #. TRANS: Server error displayed when unblocking a user from a group fails because of an unknown error.
+#. TRANS: Server error displayed when removing a user block.
 #: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr ""
 
 #. TRANS: Title for Instant Messaging settings.
-#: actions/imsettings.php:58
+#: actions/imsettings.php:56
 msgid "IM settings"
 msgstr ""
 
 #. 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.
-#: actions/imsettings.php:71
+#: actions/imsettings.php:69
 #, php-format
 msgid ""
-"You can send and receive notices through Jabber/Google Talk [instant "
-"messages](%%doc.im%%). Configure your address and settings below."
+"You can send and receive notices through instant messaging [instant messages]"
+"(%%doc.im%%). Configure your addresses and settings below."
 msgstr ""
 
-#. TRANS: Message given in the Instant Messaging settings if XMPP is not enabled on the site.
+#. TRANS: Message given in the IM settings if IM is not enabled on the site.
 #: actions/imsettings.php:90
 msgid "IM is not available."
 msgstr ""
 
-#. TRANS: Form legend for Instant Messaging settings form.
-#. TRANS: Field label for Instant Messaging address input in Instant Messaging settings form.
-#: actions/imsettings.php:102 actions/imsettings.php:132
+#: actions/imsettings.php:116
+#, php-format
+msgid "Current confirmed %s address."
+msgstr ""
+
+#. TRANS: Form note in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:128
+#, php-format
+msgid ""
+"Awaiting confirmation on this address. Check your %s account for a message "
+"with further instructions. (Did you add %s to your buddy list?)"
+msgstr ""
+
+#: actions/imsettings.php:140
 msgid "IM address"
 msgstr ""
 
-#: actions/imsettings.php:109
-msgid "Current confirmed Jabber/Google Talk address."
-msgstr ""
-
-#. TRANS: Form note in Instant Messaging settings form.
-#. TRANS: %s is the Instant Messaging address set for the site.
-#: actions/imsettings.php:120
+#: actions/imsettings.php:142
 #, php-format
-msgid ""
-"Awaiting confirmation on this address. Check your Jabber/Google Talk account "
-"for a message with further instructions. (Did you add %s to your buddy list?)"
+msgid "%s screenname."
 msgstr ""
 
-#. TRANS: IM address input field instructions in Instant Messaging settings form.
-#. TRANS: %s is the Instant Messaging address set for the site.
-#. TRANS: Do not translate "example.org". It is one of the domain names reserved for use in examples by
-#. TRANS: http://www.rfc-editor.org/rfc/rfc2606.txt. Any other domain may be owned by a legitimate
-#. TRANS: person or organization.
-#: actions/imsettings.php:139
-#, php-format
-msgid ""
-"Jabber or Google Talk address, like \"UserName@example.org\". First, make "
-"sure to add %s to your buddy list in your IM client or on Google Talk."
+#. TRANS: Header for IM preferences form.
+#: actions/imsettings.php:163
+msgid "IM Preferences"
 msgstr ""
 
-#. TRANS: Form legend for Instant Messaging preferences form.
-#: actions/imsettings.php:154
-msgid "IM preferences"
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:174
+msgid "Send me notices"
 msgstr ""
 
-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:159
-msgid "Send me notices through Jabber/Google Talk."
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:176
+msgid "Post a notice when my status changes."
 msgstr ""
 
-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:165
-msgid "Post a notice when my Jabber/Google Talk status changes."
-msgstr ""
-
-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:171
-msgid ""
-"Send me replies through Jabber/Google Talk from people I'm not subscribed to."
-msgstr ""
-
-#. TRANS: Checkbox label in Instant Messaging preferences form.
+#. TRANS: Checkbox label in IM preferences form.
 #: actions/imsettings.php:178
-msgid "Publish a MicroID for my Jabber/Google Talk address."
+msgid "Send me replies from people I'm not subscribed to."
 msgstr ""
 
-#. TRANS: Confirmation message for successful Instant Messaging preferences save.
-#: actions/imsettings.php:283 actions/othersettings.php:192
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:181
+msgid "Publish a MicroID"
+msgstr ""
+
+#. TRANS: Server error thrown on database error updating IM preferences.
+#: actions/imsettings.php:291
+msgid "Couldn't update IM preferences."
+msgstr ""
+
+#. TRANS: Confirmation message for successful IM preferences save.
+#. TRANS: Confirmation message after saving preferences.
+#: actions/imsettings.php:298 actions/urlsettings.php:244
 msgid "Preferences saved."
 msgstr ""
 
-#. TRANS: Message given saving Instant Messaging address without having provided one.
-#: actions/imsettings.php:304
-msgid "No Jabber ID."
+#. TRANS: Message given saving IM address without having provided one.
+#: actions/imsettings.php:320
+msgid "No screenname."
 msgstr ""
 
-#. TRANS: Message given saving Instant Messaging address that cannot be normalised.
-#: actions/imsettings.php:312
-msgid "Cannot normalize that Jabber ID."
-msgstr ""
-
-#. TRANS: Message given saving Instant Messaging address that not valid.
-#: actions/imsettings.php:317
-msgid "Not a valid Jabber ID."
-msgstr ""
-
-#. TRANS: Message given saving Instant Messaging address that is already set.
-#: actions/imsettings.php:321
-msgid "That is already your Jabber ID."
-msgstr ""
-
-#. TRANS: Message given saving Instant Messaging address that is already set for another user.
 #: actions/imsettings.php:325
-msgid "Jabber ID already belongs to another user."
+msgid "No transport."
 msgstr ""
 
-#. TRANS: Message given saving valid Instant Messaging address that is to be confirmed.
-#. TRANS: %s is the Instant Messaging address set for the site.
-#: actions/imsettings.php:353
-#, php-format
-msgid ""
-"A confirmation code was sent to the IM address you added. You must approve %"
-"s for sending messages to you."
+#. TRANS: Message given saving IM address that cannot be normalised.
+#: actions/imsettings.php:333
+msgid "Cannot normalize that screenname"
 msgstr ""
 
-#. TRANS: Message given canceling Instant Messaging address confirmation for the wrong IM address.
-#: actions/imsettings.php:382
+#. TRANS: Message given saving IM address that not valid.
+#: actions/imsettings.php:340
+msgid "Not a valid screenname"
+msgstr ""
+
+#. TRANS: Message given saving IM address that is already set for another user.
+#: actions/imsettings.php:344
+msgid "Screenname already belongs to another user."
+msgstr ""
+
+#. TRANS: Message given saving valid IM address that is to be confirmed.
+#: actions/imsettings.php:369
+msgid "A confirmation code was sent to the IM address you added."
+msgstr ""
+
+#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#: actions/imsettings.php:396
 msgid "That is the wrong IM address."
 msgstr ""
 
-#. TRANS: Server error thrown on database error canceling Instant Messaging address confirmation.
-#: actions/imsettings.php:391
-msgid "Could not delete IM confirmation."
+#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#: actions/imsettings.php:405
+msgid "Couldn't delete confirmation."
 msgstr ""
 
-#. TRANS: Message given after successfully canceling Instant Messaging address confirmation.
-#: actions/imsettings.php:396
+#. TRANS: Message given after successfully canceling IM address confirmation.
+#: actions/imsettings.php:410
 msgid "IM confirmation cancelled."
 msgstr ""
 
-#. TRANS: Message given trying to remove an Instant Messaging address that is not
+#. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.
-#: actions/imsettings.php:417
-msgid "That is not your Jabber ID."
+#: actions/imsettings.php:434
+msgid "That is not your screenname."
+msgstr ""
+
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#: actions/imsettings.php:443
+msgid "Couldn't update user im prefs."
 msgstr ""
 
 #. TRANS: Message given after successfully removing a registered Instant Messaging address.
-#: actions/imsettings.php:440
+#: actions/imsettings.php:451
 msgid "The IM address was removed."
 msgstr ""
 
@@ -3350,7 +3389,7 @@ msgid "You must be logged in to join a group."
 msgstr ""
 
 #. TRANS: Title for join group page after joining.
-#: actions/joingroup.php:147
+#: actions/joingroup.php:148
 #, php-format
 msgctxt "TITLE"
 msgid "%1$s joined group %2$s"
@@ -3477,7 +3516,7 @@ msgstr ""
 #. TRANS: Submit button title.
 #: actions/licenseadminpanel.php:311 actions/sessionsadminpanel.php:199
 #: actions/siteadminpanel.php:292 actions/snapshotadminpanel.php:245
-#: actions/tagother.php:154 lib/applicationeditform.php:357
+#: actions/tagother.php:133 lib/applicationeditform.php:357
 msgid "Save"
 msgstr ""
 
@@ -3485,49 +3524,51 @@ msgstr ""
 msgid "Save license settings"
 msgstr ""
 
-#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
+#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
+#: actions/login.php:97 actions/otp.php:62 actions/register.php:130
 msgid "Already logged in."
 msgstr ""
 
-#: actions/login.php:148
+#: actions/login.php:125
 msgid "Incorrect username or password."
 msgstr ""
 
-#: actions/login.php:154 actions/otp.php:120
+#. TRANS: Server error displayed when a user object could not be created trying to login using "one time password login".
+#: actions/login.php:131 actions/otp.php:127
 msgid "Error setting user. You are probably not authorized."
 msgstr ""
 
-#: actions/login.php:210 actions/login.php:263
+#: actions/login.php:185 actions/login.php:236 lib/action.php:598
 msgid "Login"
 msgstr ""
 
-#: actions/login.php:249
+#: actions/login.php:222
 msgid "Login to site"
 msgstr ""
 
-#: actions/login.php:258 actions/register.php:490
+#: actions/login.php:231 actions/register.php:469
 msgid "Remember me"
 msgstr ""
 
-#: actions/login.php:259 actions/register.php:492
+#: actions/login.php:232 actions/register.php:471
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 
-#: actions/login.php:269
+#: actions/login.php:241
 msgid "Lost or forgotten password?"
 msgstr ""
 
-#: actions/login.php:288
+#: actions/login.php:259
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
 msgstr ""
 
-#: actions/login.php:292
+#: actions/login.php:263
 msgid "Login with your username and password."
 msgstr ""
 
-#: actions/login.php:295
+#: actions/login.php:266
 #, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -3650,44 +3691,56 @@ msgstr ""
 msgid "Notice posted"
 msgstr ""
 
-#: actions/noticesearch.php:68
+#. TRANS: Instructions for Notice search page.
+#. TRANS: %%site.name%% is the name of the StatusNet site.
+#: actions/noticesearch.php:69
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
 "by spaces; they must be 3 characters or more."
 msgstr ""
 
-#: actions/noticesearch.php:78
+#. TRANS: Title of the page where users can search for notices.
+#: actions/noticesearch.php:80
 msgid "Text search"
 msgstr ""
 
-#: actions/noticesearch.php:91
+#. TRANS: Test in RSS notice search.
+#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
+#: actions/noticesearch.php:95
 #, php-format
 msgid "Search results for \"%1$s\" on %2$s"
 msgstr ""
 
-#: actions/noticesearch.php:121
+#. TRANS: Text for logged in users making a query for notices without results.
+#. TRANS: This message contains a Markdown link.
+#: actions/noticesearch.php:128
 #, php-format
 msgid ""
 "Be the first to [post on this topic](%%%%action.newnotice%%%%?"
 "status_textarea=%s)!"
 msgstr ""
 
-#: actions/noticesearch.php:124
+#. TRANS: Text for not logged in users making a query for notices without results.
+#. TRANS: This message contains Markdown links.
+#: actions/noticesearch.php:133
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and be the first to "
 "[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
 msgstr ""
 
-#: actions/noticesearchrss.php:96
+#. TRANS: RSS notice search feed title. %s is the query.
+#: actions/noticesearchrss.php:95
 #, php-format
 msgid "Updates with \"%s\""
 msgstr ""
 
-#: actions/noticesearchrss.php:98
+#. TRANS: RSS notice search feed description.
+#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
+#: actions/noticesearchrss.php:99
 #, php-format
-msgid "Updates matching search term \"%1$s\" on %2$s!"
+msgid "Updates matching search term \"%1$s\" on %2$s."
 msgstr ""
 
 #: actions/nudge.php:85
@@ -3705,51 +3758,51 @@ msgid "Nudge sent!"
 msgstr ""
 
 #. TRANS: Message displayed to an anonymous user trying to view OAuth application list.
-#: actions/oauthappssettings.php:60
+#: actions/oauthappssettings.php:57
 msgid "You must be logged in to list your applications."
 msgstr ""
 
 #. TRANS: Page title for OAuth applications
-#: actions/oauthappssettings.php:76
+#: actions/oauthappssettings.php:73
 msgid "OAuth applications"
 msgstr ""
 
 #. TRANS: Page instructions for OAuth applications
-#: actions/oauthappssettings.php:88
+#: actions/oauthappssettings.php:85
 msgid "Applications you have registered"
 msgstr ""
 
 #. TRANS: Empty list message on page with OAuth applications.
-#: actions/oauthappssettings.php:141
+#: actions/oauthappssettings.php:138
 #, php-format
 msgid "You have not registered any applications yet."
 msgstr ""
 
 #. TRANS: Title for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:71
+#: actions/oauthconnectionssettings.php:69
 msgid "Connected applications"
 msgstr ""
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:83
+#: actions/oauthconnectionssettings.php:80
 msgid "The following connections exist for your account."
 msgstr ""
 
 #. TRANS: Client error when trying to revoke access for an application while not being a user of it.
-#: actions/oauthconnectionssettings.php:168
+#: actions/oauthconnectionssettings.php:165
 msgid "You are not a user of that application."
 msgstr ""
 
 #. TRANS: Client error when revoking access has failed for some reason.
 #. TRANS: %s is the application ID revoking access failed for.
-#: actions/oauthconnectionssettings.php:183
+#: actions/oauthconnectionssettings.php:180
 #, php-format
 msgid "Unable to revoke access for application: %s."
 msgstr ""
 
 #. TRANS: Success message after revoking access for an application.
 #. TRANS: %1$s is the application name, %2$s is the first part of the user token.
-#: actions/oauthconnectionssettings.php:202
+#: actions/oauthconnectionssettings.php:199
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -3757,20 +3810,30 @@ msgid ""
 msgstr ""
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:213
+#: actions/oauthconnectionssettings.php:210
 msgid "You have not authorized any applications to use your account."
 msgstr ""
 
 #. TRANS: Note for developers in the OAuth connection settings form.
 #. TRANS: This message contains a Markdown link. Do not separate "](".
 #. TRANS: %s is the URL to the OAuth settings.
-#: actions/oauthconnectionssettings.php:233
+#: actions/oauthconnectionssettings.php:230
 #, php-format
 msgid ""
 "Are you a developer? [Register an OAuth client application](%s) to use with "
 "this instance of StatusNet."
 msgstr ""
 
+#: actions/oembed.php:64
+#, php-format
+msgid "\"%s\" not found."
+msgstr ""
+
+#: actions/oembed.php:76
+#, php-format
+msgid "Notice %s not found."
+msgstr ""
+
 #: actions/oembed.php:80 actions/shownotice.php:100
 msgid "Notice has no profile."
 msgstr ""
@@ -3780,6 +3843,16 @@ msgstr ""
 msgid "%1$s's status on %2$s"
 msgstr ""
 
+#: actions/oembed.php:95
+#, php-format
+msgid "Attachment %s not found."
+msgstr ""
+
+#: actions/oembed.php:136
+#, php-format
+msgid "\"%s\" not supported for oembed requests."
+msgstr ""
+
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
 #: actions/oembed.php:168
 #, php-format
@@ -3793,93 +3866,60 @@ msgid "Only %s URLs over plain HTTP please."
 msgstr ""
 
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1205
-#: lib/apiaction.php:1232 lib/apiaction.php:1367
+#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1207
+#: lib/apiaction.php:1234 lib/apiaction.php:1369
 msgid "Not a supported data format."
 msgstr ""
 
+#. TRANS: ShortName in the OpenSearch interface when trying to find users.
 #: actions/opensearch.php:64
 msgid "People Search"
 msgstr ""
 
-#: actions/opensearch.php:67
+#: actions/opensearch.php:68
 msgid "Notice Search"
 msgstr ""
 
-#: actions/othersettings.php:59
-msgid "Other settings"
-msgstr ""
-
-#. TRANS: Instructions for tab "Other" in user profile settings.
-#: actions/othersettings.php:71
-msgid "Manage various other options."
-msgstr ""
-
-#. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
-#. TRANS: user's profile settings. Use of "free" is as in "open", indicating that the
-#. TRANS: information on the shortener site is freely distributable.
-#. TRANS: This message has one space at the beginning. Use your language's word separator
-#. TRANS: here if it has one (most likely a single space).
-#: actions/othersettings.php:113
-msgid " (free service)"
-msgstr ""
-
-#. TRANS: Label for dropdown with URL shortener services.
-#: actions/othersettings.php:122
-msgid "Shorten URLs with"
-msgstr ""
-
-#. TRANS: Tooltip for for dropdown with URL shortener services.
-#: actions/othersettings.php:124
-msgid "Automatic shortening service to use."
-msgstr ""
-
-#. TRANS: Label for checkbox.
-#: actions/othersettings.php:130
-msgid "View profile designs"
-msgstr ""
-
-#. TRANS: Tooltip for checkbox.
-#: actions/othersettings.php:132
-msgid "Show or hide profile designs."
-msgstr ""
-
-#. TRANS: Form validation error for form "Other settings" in user profile.
-#: actions/othersettings.php:164
-msgid "URL shortening service is too long (maximum 50 characters)."
-msgstr ""
-
-#: actions/otp.php:69
+#. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
+#: actions/otp.php:70
 msgid "No user ID specified."
 msgstr ""
 
-#: actions/otp.php:83
+#. TRANS: Client error displayed trying to use "one time password login" without specifying a login token.
+#: actions/otp.php:86
 msgid "No login token specified."
 msgstr ""
 
-#: actions/otp.php:90
+#. TRANS: Client error displayed trying to use "one time password login" without requesting a login token.
+#: actions/otp.php:94
 msgid "No login token requested."
 msgstr ""
 
-#: actions/otp.php:95
+#. TRANS: Client error displayed trying to use "one time password login" while specifying an invalid login token.
+#: actions/otp.php:100
 msgid "Invalid login token specified."
 msgstr ""
 
-#: actions/otp.php:104
+#. TRANS: Client error displayed trying to use "one time password login" while specifying an expired login token.
+#: actions/otp.php:110
 msgid "Login token expired."
 msgstr ""
 
-#: actions/outbox.php:58
+#. TRANS: Title for outbox for any but the fist page.
+#. TRANS: %1$s is the user nickname, %2$d is the page number.
+#: actions/outbox.php:57
 #, php-format
 msgid "Outbox for %1$s - page %2$d"
 msgstr ""
 
+#. TRANS: Title for first page of outbox.
 #: actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
 msgstr ""
 
-#: actions/outbox.php:104
+#. TRANS: Instructions for outbox.
+#: actions/outbox.php:103
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr ""
 
@@ -3905,40 +3945,42 @@ msgstr ""
 msgid "New password"
 msgstr ""
 
-#: actions/passwordsettings.php:109
-msgid "6 or more characters"
+#: actions/passwordsettings.php:109 actions/register.php:416
+msgid "6 or more characters."
 msgstr ""
 
-#: actions/passwordsettings.php:113
-msgid "Same as password above"
+#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#: actions/passwordsettings.php:113 actions/recoverpassword.php:264
+#: actions/register.php:420
+msgid "Same as password above."
 msgstr ""
 
 #: actions/passwordsettings.php:117
 msgid "Change"
 msgstr ""
 
-#: actions/passwordsettings.php:154 actions/register.php:238
+#: actions/passwordsettings.php:153 actions/register.php:223
 msgid "Password must be 6 or more characters."
 msgstr ""
 
-#: actions/passwordsettings.php:157 actions/register.php:241
+#: actions/passwordsettings.php:156 actions/register.php:226
 msgid "Passwords don't match."
 msgstr ""
 
-#: actions/passwordsettings.php:165
+#: actions/passwordsettings.php:164
 msgid "Incorrect old password"
 msgstr ""
 
-#: actions/passwordsettings.php:181
+#: actions/passwordsettings.php:180
 msgid "Error saving user; invalid."
 msgstr ""
 
-#: actions/passwordsettings.php:186
-msgid "Can't save new password."
+#. TRANS: Reset password form validation error message.
+#: actions/passwordsettings.php:185 actions/recoverpassword.php:418
+msgid "Cannot save new password."
 msgstr ""
 
-#. TRANS: Title for password recovery page in password saved mode.
-#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
+#: actions/passwordsettings.php:191
 msgid "Password saved."
 msgstr ""
 
@@ -4143,8 +4185,7 @@ msgid "Directory where backgrounds are located."
 msgstr ""
 
 #. TRANS: Fieldset legens in Paths admin panel.
-#. TRANS: DT element label in attachment list.
-#: actions/pathsadminpanel.php:419 lib/attachmentlist.php:98
+#: actions/pathsadminpanel.php:419
 msgid "Attachments"
 msgstr ""
 
@@ -4212,14 +4253,17 @@ msgstr ""
 msgid "Save paths"
 msgstr ""
 
-#: actions/peoplesearch.php:52
+#. TRANS: Instructions for the "People search" page.
+#. TRANS: %%site.name%% is the name of the StatusNet site.
+#: actions/peoplesearch.php:54
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
 "Separate the terms by spaces; they must be 3 characters or more."
 msgstr ""
 
-#: actions/peoplesearch.php:58
+#. TRANS: Title of a page where users can search for other users.
+#: actions/peoplesearch.php:61
 msgid "People search"
 msgstr ""
 
@@ -4233,6 +4277,57 @@ msgstr ""
 msgid "Users self-tagged with %1$s - page %2$d"
 msgstr ""
 
+#. TRANS: Page title for AJAX form return when a disabling a plugin.
+#: actions/plugindisable.php:69
+msgctxt "plugin"
+msgid "Disabled"
+msgstr ""
+
+#. TRANS: Client error displayed trying to perform any request method other than POST.
+#. TRANS: Do not translate POST.
+#: actions/pluginenable.php:78 actions/subscribe.php:77
+msgid "This action only accepts POST requests."
+msgstr ""
+
+#: actions/pluginenable.php:102
+msgid "You cannot administer plugins."
+msgstr ""
+
+#: actions/pluginenable.php:109
+msgid "No such plugin."
+msgstr ""
+
+#. TRANS: Page title for AJAX form return when enabling a plugin.
+#: actions/pluginenable.php:159
+msgctxt "plugin"
+msgid "Enabled"
+msgstr ""
+
+#. TRANS: Tab and title for plugins admin panel.
+#. TRANS: Menu item for site administration
+#: actions/pluginsadminpanel.php:56 actions/version.php:191
+#: lib/adminpanelaction.php:411
+msgid "Plugins"
+msgstr ""
+
+#. TRANS: Instructions at top of plugin admin page.
+#: actions/pluginsadminpanel.php:68
+msgid ""
+"Additional plugins can be enabled and configured manually. See the <a href="
+"\"http://status.net/wiki/Plugins\">online plugin documentation</a> for more "
+"details."
+msgstr ""
+
+#. TRANS: Admin form section header
+#: actions/pluginsadminpanel.php:84
+msgid "Default plugins"
+msgstr ""
+
+#: actions/pluginsadminpanel.php:106
+msgid ""
+"All default plugins have been disabled from the site's configuration file."
+msgstr ""
+
 #: actions/postnotice.php:95
 msgid "Invalid notice content."
 msgstr ""
@@ -4243,51 +4338,48 @@ msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’.
 msgstr ""
 
 #. TRANS: Page title for profile settings.
-#: actions/profilesettings.php:59
+#: actions/profilesettings.php:60
 msgid "Profile settings"
 msgstr ""
 
 #. TRANS: Usage instructions for profile settings.
-#: actions/profilesettings.php:70
+#: actions/profilesettings.php:71
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
 
 #. TRANS: Profile settings form legend.
-#: actions/profilesettings.php:98
+#: actions/profilesettings.php:99
 msgid "Profile information"
 msgstr ""
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109 actions/register.php:433
+#: actions/profilesettings.php:110 actions/register.php:412
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr ""
 
 #. TRANS: Field label in form for profile settings.
-#. TRANS: Label for full group name (dt). Text hidden by default.
-#. TRANS: DT for full name in a profile.
-#: actions/profilesettings.php:113 actions/register.php:455
-#: actions/showgroup.php:255 actions/tagother.php:104
-#: lib/groupeditform.php:150 lib/userprofile.php:156
+#: actions/profilesettings.php:114 actions/register.php:434
+#: lib/groupeditform.php:150
 msgid "Full name"
 msgstr ""
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:118 actions/register.php:460
+#: actions/profilesettings.php:119 actions/register.php:439
 #: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr ""
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:121
+#: actions/profilesettings.php:122 actions/register.php:441
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr ""
 
 #. TRANS: Tooltip for field label in form for profile settings. Plural
 #. TRANS: is decided by the number of characters available for the
 #. TRANS: biography (%d).
-#: actions/profilesettings.php:129 actions/register.php:471
+#: actions/profilesettings.php:130 actions/register.php:450
 #, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4295,80 +4387,76 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:135 actions/register.php:476
+#: actions/profilesettings.php:136 actions/register.php:455
 msgid "Describe yourself and your interests"
 msgstr ""
 
 #. TRANS: Text area label in form for profile settings where users can provide.
 #. TRANS: their biography.
-#: actions/profilesettings.php:139 actions/register.php:478
+#: actions/profilesettings.php:140 actions/register.php:457
 msgid "Bio"
 msgstr ""
 
 #. TRANS: Field label in form for profile settings.
-#. TRANS: Label for group location (dt). Text hidden by default.
-#. TRANS: DT for location in a profile.
-#: actions/profilesettings.php:145 actions/register.php:483
-#: actions/showgroup.php:265 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:173
-#: lib/userprofile.php:172
+#: actions/profilesettings.php:146 actions/register.php:462
+#: lib/groupeditform.php:173
 msgid "Location"
 msgstr ""
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148 actions/register.php:485
+#: actions/profilesettings.php:149
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr ""
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:153
+#: actions/profilesettings.php:154
 msgid "Share my current location when posting notices"
 msgstr ""
 
 #. TRANS: Field label in form for profile settings.
-#. TRANS: DT for tags in a profile.
-#: actions/profilesettings.php:161 actions/tagother.php:149
-#: actions/tagother.php:209 lib/subscriptionlist.php:106
-#: lib/subscriptionlist.php:108 lib/userprofile.php:220
+#: actions/profilesettings.php:162 actions/tagother.php:128
+#: actions/tagother.php:188 lib/subscriptionlist.php:104
+#: lib/subscriptionlist.php:106
 msgid "Tags"
 msgstr ""
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:164
+#: actions/profilesettings.php:165
 msgid ""
-"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- "
+"separated."
 msgstr ""
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:169
+#: actions/profilesettings.php:170
 msgid "Language"
 msgstr ""
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:171
-msgid "Preferred language"
+#: actions/profilesettings.php:172
+msgid "Preferred language."
 msgstr ""
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:181
+#: actions/profilesettings.php:182
 msgid "Timezone"
 msgstr ""
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:183
+#: actions/profilesettings.php:184
 msgid "What timezone are you normally in?"
 msgstr ""
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:189
+#: actions/profilesettings.php:190
 msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)"
+"Automatically subscribe to whoever subscribes to me (best for non-humans)."
 msgstr ""
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Plural form is used based on the maximum number of allowed
 #. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:258 actions/register.php:229
+#: actions/profilesettings.php:259 actions/register.php:214
 #, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4376,47 +4464,47 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:269 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:270 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr ""
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:277
+#: actions/profilesettings.php:278
 msgid "Language is too long (maximum 50 characters)."
 msgstr ""
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:291 actions/tagother.php:178
+#: actions/profilesettings.php:292
 #, php-format
-msgid "Invalid tag: \"%s\""
+msgid "Invalid tag: \"%s\"."
 msgstr ""
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:347
+#: actions/profilesettings.php:348
 msgid "Could not update user for autosubscribe."
 msgstr ""
 
 #. TRANS: Server error thrown when user profile location preference settings could not be updated.
-#: actions/profilesettings.php:405
+#: actions/profilesettings.php:406
 msgid "Could not save location prefs."
 msgstr ""
 
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:427 actions/tagother.php:200
+#: actions/profilesettings.php:428 actions/tagother.php:179
 msgid "Could not save tags."
 msgstr ""
 
 #. TRANS: Confirmation shown when user profile settings are saved.
 #. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:436 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:437 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr ""
 
 #. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
 #. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:483 actions/restoreaccount.php:60
+#: actions/profilesettings.php:484 actions/restoreaccount.php:60
 msgid "Restore account"
 msgstr ""
 
@@ -4484,6 +4572,12 @@ msgid ""
 "tool."
 msgstr ""
 
+#. TRANS: Public RSS feed description. %s is the StatusNet site name.
+#: actions/publicrss.php:106
+#, php-format
+msgid "%s updates from everyone."
+msgstr ""
+
 #. TRANS: Title for public tag cloud.
 #: actions/publictagcloud.php:57
 msgid "Public tag cloud"
@@ -4522,10 +4616,6 @@ msgid ""
 "one!"
 msgstr ""
 
-#: actions/publictagcloud.php:146
-msgid "Tag cloud"
-msgstr ""
-
 #. TRANS: Client error displayed trying to recover password while already logged in.
 #: actions/recoverpassword.php:37
 msgid "You are already logged in!"
@@ -4614,6 +4704,11 @@ msgstr ""
 msgid "Password recovery requested"
 msgstr ""
 
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/recoverpassword.php:229
+msgid "Password saved"
+msgstr ""
+
 #. TRANS: Title for password recovery page when an unknown action has been specified.
 #: actions/recoverpassword.php:232
 msgid "Unknown action"
@@ -4624,14 +4719,9 @@ msgstr ""
 msgid "6 or more characters, and do not forget it!"
 msgstr ""
 
-#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
-#: actions/recoverpassword.php:264 actions/register.php:441
-msgid "Same as password above."
-msgstr ""
-
 #. TRANS: Button text for password reset form.
 #. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: actions/recoverpassword.php:268 lib/designsettings.php:264
+#: actions/recoverpassword.php:268 lib/designform.php:145
 msgctxt "BUTTON"
 msgid "Reset"
 msgstr ""
@@ -4678,13 +4768,8 @@ msgstr ""
 msgid "Password and confirmation do not match."
 msgstr ""
 
-#. TRANS: Reset password form validation error message.
-#: actions/recoverpassword.php:418
-msgid "Cannot save new password."
-msgstr ""
-
 #. TRANS: Server error displayed when something does wrong with the user object during password reset.
-#: actions/recoverpassword.php:426 actions/register.php:256
+#: actions/recoverpassword.php:426 actions/register.php:241
 msgid "Error setting user."
 msgstr ""
 
@@ -4693,96 +4778,100 @@ msgstr ""
 msgid "New password successfully saved. You are now logged in."
 msgstr ""
 
-#: actions/register.php:92 actions/register.php:196 actions/register.php:413
+#: actions/redirecturl.php:70
+msgid "No id parameter"
+msgstr ""
+
+#: actions/redirecturl.php:76
+#, php-format
+msgid "No such file \"%d\""
+msgstr ""
+
+#: actions/register.php:80 actions/register.php:181 actions/register.php:392
 msgid "Sorry, only invited people can register."
 msgstr ""
 
-#: actions/register.php:99
+#: actions/register.php:87
 msgid "Sorry, invalid invitation code."
 msgstr ""
 
-#: actions/register.php:119
+#: actions/register.php:106
 msgid "Registration successful"
 msgstr ""
 
-#: actions/register.php:121 actions/register.php:511
+#: actions/register.php:108 actions/register.php:490
 msgid "Register"
 msgstr ""
 
-#: actions/register.php:142
+#: actions/register.php:128
 msgid "Registration not allowed."
 msgstr ""
 
-#: actions/register.php:209
-msgid "You can't register if you don't agree to the license."
+#: actions/register.php:194
+msgid "You cannot register if you don't agree to the license."
 msgstr ""
 
-#: actions/register.php:218
+#: actions/register.php:203
 msgid "Email address already exists."
 msgstr ""
 
-#: actions/register.php:251 actions/register.php:273
+#: actions/register.php:236 actions/register.php:258
 msgid "Invalid username or password."
 msgstr ""
 
-#: actions/register.php:351
+#: actions/register.php:333
 msgid ""
 "With this form you can create a new account. You can then post notices and "
-"link up to friends and colleagues. "
+"link up to friends and colleagues."
 msgstr ""
 
-#: actions/register.php:437
-msgid "6 or more characters."
-msgstr ""
-
-#. TRANS: Link description in user account settings menu.
-#: actions/register.php:445 actions/register.php:449
-#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
+#: actions/register.php:424 actions/register.php:428
+#: actions/siteadminpanel.php:238 lib/settingsnav.php:92
 msgid "Email"
 msgstr ""
 
-#: actions/register.php:446 actions/register.php:450
-msgid "Used only for updates, announcements, and password recovery"
+#: actions/register.php:425 actions/register.php:429
+msgid "Used only for updates, announcements, and password recovery."
 msgstr ""
 
-#: actions/register.php:457
-msgid "Longer name, preferably your \"real\" name"
+#: actions/register.php:436
+msgid "Longer name, preferably your \"real\" name."
 msgstr ""
 
-#: actions/register.php:462
-msgid "URL of your homepage, blog, or profile on another site"
+#: actions/register.php:464
+msgid "Where you are, like \"City, State (or Region), Country\"."
 msgstr ""
 
-#: actions/register.php:523
+#: actions/register.php:503
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
 msgstr ""
 
-#: actions/register.php:533
+#: actions/register.php:513
 #, php-format
 msgid "My text and files are copyright by %1$s."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:537
+#: actions/register.php:517
 msgid "My text and files remain under my own copyright."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:540
+#: actions/register.php:520
 msgid "All rights reserved."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:545
+#: actions/register.php:525
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
 "email address, IM address, and phone number."
 msgstr ""
 
-#: actions/register.php:588
+#: actions/register.php:566
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -4801,7 +4890,7 @@ msgid ""
 "Thanks for signing up and we hope you enjoy using this service."
 msgstr ""
 
-#: actions/register.php:612
+#: actions/register.php:590
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -4828,7 +4917,7 @@ msgid "User nickname"
 msgstr ""
 
 #: actions/remotesubscribe.php:129
-msgid "Nickname of the user you want to follow"
+msgid "Nickname of the user you want to follow."
 msgstr ""
 
 #: actions/remotesubscribe.php:132
@@ -4836,17 +4925,17 @@ msgid "Profile URL"
 msgstr ""
 
 #: actions/remotesubscribe.php:133
-msgid "URL of your profile on another compatible microblogging service"
+msgid "URL of your profile on another compatible microblogging service."
 msgstr ""
 
 #. TRANS: Link text for link that will subscribe to a remote profile.
 #: actions/remotesubscribe.php:136 lib/subscribeform.php:139
-#: lib/userprofile.php:431
+#: lib/userprofile.php:402
 msgid "Subscribe"
 msgstr ""
 
 #: actions/remotesubscribe.php:158
-msgid "Invalid profile URL (bad format)"
+msgid "Invalid profile URL (bad format)."
 msgstr ""
 
 #: actions/remotesubscribe.php:167
@@ -4877,7 +4966,7 @@ msgstr ""
 msgid "You already repeated that notice."
 msgstr ""
 
-#: actions/repeat.php:112 lib/noticelist.php:692
+#: actions/repeat.php:112 lib/noticelist.php:697
 msgid "Repeated"
 msgstr ""
 
@@ -4885,9 +4974,9 @@ msgstr ""
 msgid "Repeated!"
 msgstr ""
 
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing @-replies.
+#. TRANS: RSS reply feed title. %s is a user nickname.
 #: actions/replies.php:126 actions/repliesrss.php:68
-#: lib/personalgroupnav.php:109
+#: lib/personalgroupnav.php:105
 #, php-format
 msgid "Replies to %s"
 msgstr ""
@@ -4933,9 +5022,11 @@ msgid ""
 "newnotice%%%%?status_textarea=%3$s)."
 msgstr ""
 
-#: actions/repliesrss.php:72
+#. TRANS: RSS reply feed description.
+#. TRANS: %1$s is a user nickname, %2$s is the StatusNet site name.
+#: actions/repliesrss.php:74
 #, php-format
-msgid "Replies to %1$s on %2$s!"
+msgid "Replies to %1$s on %2$s."
 msgstr ""
 
 #. TRANS: Client exception displayed when trying to restore an account while not logged in.
@@ -5030,7 +5121,7 @@ msgstr ""
 msgid "User doesn't have this role."
 msgstr ""
 
-#: actions/rsd.php:146 actions/version.php:159
+#: actions/rsd.php:142 actions/version.php:159
 msgid "StatusNet"
 msgstr ""
 
@@ -5072,93 +5163,44 @@ msgstr ""
 msgid "Save site settings"
 msgstr ""
 
-#: actions/showapplication.php:82
+#: actions/showapplication.php:78
 msgid "You must be logged in to view an application."
 msgstr ""
 
-#: actions/showapplication.php:157
+#: actions/showapplication.php:151
 msgid "Application profile"
 msgstr ""
 
-#. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:159 lib/applicationeditform.php:177
-msgid "Icon"
-msgstr ""
-
-#. TRANS: Form input field label for application name.
-#: actions/showapplication.php:169 actions/version.php:197
-#: lib/applicationeditform.php:190
-msgid "Name"
-msgstr ""
-
-#. TRANS: Form input field label.
-#: actions/showapplication.php:178 lib/applicationeditform.php:227
-msgid "Organization"
-msgstr ""
-
-#. TRANS: Form input field label.
-#: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:168
-msgid "Description"
-msgstr ""
-
-#. TRANS: Header for group statistics on a group page (h2).
-#. TRANS: H2 text for user statistics.
-#: actions/showapplication.php:192 actions/showgroup.php:460
-#: lib/profileaction.php:205
-msgid "Statistics"
-msgstr ""
-
-#: actions/showapplication.php:203
+#: actions/showapplication.php:179
 #, php-format
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr ""
 
-#: actions/showapplication.php:213
+#: actions/showapplication.php:189
 msgid "Application actions"
 msgstr ""
 
-#: actions/showapplication.php:236
+#: actions/showapplication.php:212
 msgid "Reset key & secret"
 msgstr ""
 
 #. TRANS: Title of form for deleting a user.
-#: actions/showapplication.php:252 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:64 lib/noticelist.php:673
+#: actions/showapplication.php:228 lib/deletegroupform.php:121
+#: lib/deleteuserform.php:64 lib/noticelist.php:678
 msgid "Delete"
 msgstr ""
 
-#: actions/showapplication.php:261
+#: actions/showapplication.php:237
 msgid "Application info"
 msgstr ""
 
-#: actions/showapplication.php:263
-msgid "Consumer key"
-msgstr ""
-
-#: actions/showapplication.php:268
-msgid "Consumer secret"
-msgstr ""
-
-#: actions/showapplication.php:273
-msgid "Request token URL"
-msgstr ""
-
-#: actions/showapplication.php:278
-msgid "Access token URL"
-msgstr ""
-
-#: actions/showapplication.php:283
-msgid "Authorize URL"
-msgstr ""
-
-#: actions/showapplication.php:288
+#: actions/showapplication.php:255
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
 msgstr ""
 
-#: actions/showapplication.php:309
+#: actions/showapplication.php:275
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr ""
 
@@ -5237,61 +5279,47 @@ msgstr ""
 msgid "%1$s group, page %2$d"
 msgstr ""
 
-#. TRANS: Group profile header (h2). Text hidden by default.
-#: actions/showgroup.php:223
-msgid "Group profile"
-msgstr ""
-
-#. TRANS: Label for group URL (dt). Text hidden by default.
-#. TRANS: DT for URL in a profile.
-#: actions/showgroup.php:273 actions/tagother.php:118
-#: actions/userauthorization.php:175 lib/userprofile.php:186
-msgid "URL"
-msgstr ""
-
 #. TRANS: Label for group description or group note (dt). Text hidden by default.
-#. TRANS: DT for note in a profile.
-#: actions/showgroup.php:285 actions/tagother.php:128
-#: actions/userauthorization.php:187 lib/userprofile.php:204
+#: actions/showgroup.php:266
 msgid "Note"
 msgstr ""
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:296 lib/groupeditform.php:180
+#: actions/showgroup.php:277 lib/groupeditform.php:180
 msgid "Aliases"
 msgstr ""
 
 #. TRANS: Group actions header (h2). Text hidden by default.
-#: actions/showgroup.php:313
+#: actions/showgroup.php:294
 msgid "Group actions"
 msgstr ""
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:357
+#: actions/showgroup.php:338
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
 msgstr ""
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:364
+#: actions/showgroup.php:345
 #, php-format
 msgid "Notice feed for %s group (RSS 2.0)"
 msgstr ""
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:371
+#: actions/showgroup.php:352
 #, php-format
 msgid "Notice feed for %s group (Atom)"
 msgstr ""
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:377
+#: actions/showgroup.php:358
 #, php-format
 msgid "FOAF for %s group"
 msgstr ""
 
 #. TRANS: Header for mini list of group members on a group page (h2).
-#: actions/showgroup.php:414
+#: actions/showgroup.php:395
 msgid "Members"
 msgstr ""
 
@@ -5299,25 +5327,30 @@ msgstr ""
 #. TRANS: Text for user subscription statistics if the user has no subscriptions.
 #. TRANS: Text for user subscriber statistics if user has no subscribers.
 #. TRANS: Text for user user group membership statistics if user is not a member of any group.
-#: actions/showgroup.php:420 lib/profileaction.php:137
+#: actions/showgroup.php:401 lib/profileaction.php:137
 #: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
-#: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
+#: lib/subscriptionlist.php:123 lib/tagcloudsection.php:71
 msgid "(None)"
 msgstr ""
 
 #. TRANS: Link to all group members from mini list of group members if group has more than n members.
-#: actions/showgroup.php:429
+#: actions/showgroup.php:410
 msgid "All members"
 msgstr ""
 
-#. TRANS: Label for creation date in statistics on group page.
-#: actions/showgroup.php:465
+#. TRANS: Header for group statistics on a group page (h2).
+#. TRANS: H2 text for user statistics.
+#: actions/showgroup.php:441 lib/profileaction.php:205
+msgid "Statistics"
+msgstr ""
+
+#: actions/showgroup.php:444
 msgctxt "LABEL"
 msgid "Created"
 msgstr ""
 
 #. TRANS: Label for member count in statistics on group page.
-#: actions/showgroup.php:473
+#: actions/showgroup.php:449
 msgctxt "LABEL"
 msgid "Members"
 msgstr ""
@@ -5326,7 +5359,7 @@ msgstr ""
 #. TRANS: **%s** is the group alias, %%%%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).
-#: actions/showgroup.php:488
+#: actions/showgroup.php:464
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5339,7 +5372,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: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
-#: actions/showgroup.php:498
+#: actions/showgroup.php:474
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5349,7 +5382,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: Header for list of group administrators on a group page (h2).
-#: actions/showgroup.php:527
+#: actions/showgroup.php:503
 msgid "Admins"
 msgstr ""
 
@@ -5388,7 +5421,7 @@ msgid "%1$s tagged %2$s"
 msgstr ""
 
 #. TRANS: Page title showing tagged notices in one user's stream.
-#. TRANS: %1$s is the username, %2$s is the hash tag, %1$d is the page number.
+#. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
 #: actions/showstream.php:74
 #, php-format
 msgid "%1$s tagged %2$s, page %3$d"
@@ -5435,13 +5468,13 @@ msgid "FOAF for %s"
 msgstr ""
 
 #. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
-#: actions/showstream.php:211
+#: actions/showstream.php:205
 #, php-format
 msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr ""
 
 #. TRANS: Second sentence of empty list message for a stream for the user themselves.
-#: actions/showstream.php:217
+#: actions/showstream.php:211
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
@@ -5449,7 +5482,7 @@ msgstr ""
 
 #. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:221
+#: actions/showstream.php:215
 #, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
@@ -5458,7 +5491,7 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:264
+#: actions/showstream.php:258
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5469,7 +5502,7 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:271
+#: actions/showstream.php:265
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5478,7 +5511,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
-#: actions/showstream.php:328
+#: actions/showstream.php:322
 #, php-format
 msgid "Repeat of %s"
 msgstr ""
@@ -5620,145 +5653,145 @@ msgstr ""
 
 #. TRANS: Title for button to save site notice in admin panel.
 #: actions/sitenoticeadminpanel.php:201
-msgid "Save site notice"
+msgid "Save site notice."
 msgstr ""
 
 #. TRANS: Title for SMS settings.
-#: actions/smssettings.php:57
+#: actions/smssettings.php:56
 msgid "SMS settings"
 msgstr ""
 
 #. TRANS: SMS settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/smssettings.php:71
+#: actions/smssettings.php:70
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr ""
 
 #. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
-#: actions/smssettings.php:93
+#: actions/smssettings.php:92
 msgid "SMS is not available."
 msgstr ""
 
 #. TRANS: Form legend for SMS settings form.
-#: actions/smssettings.php:107
+#: actions/smssettings.php:106
 msgid "SMS address"
 msgstr ""
 
 #. TRANS: Form guide in SMS settings form.
-#: actions/smssettings.php:116
+#: actions/smssettings.php:115
 msgid "Current confirmed SMS-enabled phone number."
 msgstr ""
 
 #. TRANS: Form guide in IM settings form.
-#: actions/smssettings.php:129
+#: actions/smssettings.php:128
 msgid "Awaiting confirmation on this phone number."
 msgstr ""
 
 #. TRANS: Field label for SMS address input in SMS settings form.
-#: actions/smssettings.php:138
+#: actions/smssettings.php:137
 msgid "Confirmation code"
 msgstr ""
 
 #. TRANS: Form field instructions in SMS settings form.
-#: actions/smssettings.php:140
+#: actions/smssettings.php:139
 msgid "Enter the code you received on your phone."
 msgstr ""
 
 #. TRANS: Button label to confirm SMS confirmation code in SMS settings.
-#: actions/smssettings.php:144
+#: actions/smssettings.php:143
 msgctxt "BUTTON"
 msgid "Confirm"
 msgstr ""
 
 #. TRANS: Field label for SMS phone number input in SMS settings form.
-#: actions/smssettings.php:149
+#: actions/smssettings.php:148
 msgid "SMS phone number"
 msgstr ""
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
-#: actions/smssettings.php:152
-msgid "Phone number, no punctuation or spaces, with area code"
+#: actions/smssettings.php:151
+msgid "Phone number, no punctuation or spaces, with area code."
 msgstr ""
 
 #. TRANS: Form legend for SMS preferences form.
-#: actions/smssettings.php:191
+#: actions/smssettings.php:190
 msgid "SMS preferences"
 msgstr ""
 
 #. TRANS: Checkbox label in SMS preferences form.
-#: actions/smssettings.php:197
+#: actions/smssettings.php:196
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
 msgstr ""
 
 #. TRANS: Confirmation message for successful SMS preferences save.
-#: actions/smssettings.php:308
+#: actions/smssettings.php:307
 msgid "SMS preferences saved."
 msgstr ""
 
 #. TRANS: Message given saving SMS phone number without having provided one.
-#: actions/smssettings.php:330
+#: actions/smssettings.php:329
 msgid "No phone number."
 msgstr ""
 
 #. TRANS: Message given saving SMS phone number without having selected a carrier.
-#: actions/smssettings.php:336
+#: actions/smssettings.php:335
 msgid "No carrier selected."
 msgstr ""
 
 #. TRANS: Message given saving SMS phone number that is already set.
-#: actions/smssettings.php:344
+#: actions/smssettings.php:343
 msgid "That is already your phone number."
 msgstr ""
 
 #. TRANS: Message given saving SMS phone number that is already set for another user.
-#: actions/smssettings.php:348
+#: actions/smssettings.php:347
 msgid "That phone number already belongs to another user."
 msgstr ""
 
 #. TRANS: Message given saving valid SMS phone number that is to be confirmed.
-#: actions/smssettings.php:376
+#: actions/smssettings.php:375
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
 "for the code and instructions on how to use it."
 msgstr ""
 
 #. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
-#: actions/smssettings.php:404
+#: actions/smssettings.php:403
 msgid "That is the wrong confirmation number."
 msgstr ""
 
 #. TRANS: Message given after successfully canceling SMS phone number confirmation.
-#: actions/smssettings.php:418
+#: actions/smssettings.php:417
 msgid "SMS confirmation cancelled."
 msgstr ""
 
 #. TRANS: Message given trying to remove an SMS phone number that is not
 #. TRANS: registered for the active user.
-#: actions/smssettings.php:438
+#: actions/smssettings.php:437
 msgid "That is not your phone number."
 msgstr ""
 
 #. TRANS: Message given after successfully removing a registered SMS phone number.
-#: actions/smssettings.php:460
+#: actions/smssettings.php:459
 msgid "The SMS phone number was removed."
 msgstr ""
 
 #. TRANS: Label for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:499
+#: actions/smssettings.php:498
 msgid "Mobile carrier"
 msgstr ""
 
 #. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:504
+#: actions/smssettings.php:503
 msgid "Select a carrier"
 msgstr ""
 
 #. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
 #. TRANS: %s is an administrative contact's e-mail address.
-#: actions/smssettings.php:513
+#: actions/smssettings.php:512
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -5766,7 +5799,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
-#: actions/smssettings.php:535
+#: actions/smssettings.php:534
 msgid "No code entered."
 msgstr ""
 
@@ -5839,15 +5872,13 @@ msgstr ""
 msgid "Could not save subscription."
 msgstr ""
 
-#: actions/subscribe.php:77
-msgid "This action only accepts POST requests."
-msgstr ""
-
-#: actions/subscribe.php:117
+#. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
+#: actions/subscribe.php:121
 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
 msgstr ""
 
-#: actions/subscribe.php:145
+#. TRANS: Page title when subscription succeeded.
+#: actions/subscribe.php:149
 msgid "Subscribed"
 msgstr ""
 
@@ -5954,31 +5985,33 @@ msgid "Subscription feed for %s (Atom)"
 msgstr ""
 
 #. TRANS: Checkbox label for enabling Jabber messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:239
-msgid "Jabber"
+#: actions/subscriptions.php:241 lib/settingsnav.php:110
+msgid "IM"
 msgstr ""
 
 #. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:254
+#: actions/subscriptions.php:256 lib/settingsnav.php:117
 msgid "SMS"
 msgstr ""
 
-#: actions/tag.php:69
+#. TRANS: Title for all but the first page of notices with tags.
+#. TRANS: %1$s is the tag, %2$d is the page number.
+#: actions/tag.php:73
 #, php-format
 msgid "Notices tagged with %1$s, page %2$d"
 msgstr ""
 
-#: actions/tag.php:87
+#: actions/tag.php:91
 #, php-format
 msgid "Notice feed for tag %s (RSS 1.0)"
 msgstr ""
 
-#: actions/tag.php:93
+#: actions/tag.php:97
 #, php-format
 msgid "Notice feed for tag %s (RSS 2.0)"
 msgstr ""
 
-#: actions/tag.php:99
+#: actions/tag.php:103
 #, php-format
 msgid "Notice feed for tag %s (Atom)"
 msgstr ""
@@ -5997,28 +6030,27 @@ msgstr ""
 msgid "User profile"
 msgstr ""
 
-#. TRANS: DT element in area for user avatar.
-#: actions/tagother.php:81 actions/userauthorization.php:132
-#: lib/userprofile.php:108
-msgid "Photo"
-msgstr ""
-
-#: actions/tagother.php:141
+#: actions/tagother.php:120
 msgid "Tag user"
 msgstr ""
 
-#: actions/tagother.php:151
+#: actions/tagother.php:130
 msgid ""
 "Tags for this user (letters, numbers, -, ., and _), comma- or space- "
 "separated"
 msgstr ""
 
-#: actions/tagother.php:193
+#: actions/tagother.php:157
+#, php-format
+msgid "Invalid tag: \"%s\""
+msgstr ""
+
+#: actions/tagother.php:172
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 
-#: actions/tagother.php:236
+#: actions/tagother.php:215
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
 
@@ -6026,6 +6058,7 @@ msgstr ""
 msgid "No such tag."
 msgstr ""
 
+#. TRANS: Client error displayed when trying to unblock a non-blocked user.
 #: actions/unblock.php:59
 msgid "You haven't blocked that user."
 msgstr ""
@@ -6046,12 +6079,80 @@ msgstr ""
 msgid "Unsubscribed"
 msgstr ""
 
-#: actions/updateprofile.php:64 actions/userauthorization.php:337
+#: actions/updateprofile.php:64
 #, php-format
 msgid ""
 "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
 msgstr ""
 
+#: actions/urlsettings.php:60
+msgid "URL settings"
+msgstr ""
+
+#. TRANS: Instructions for tab "Other" in user profile settings.
+#: actions/urlsettings.php:72
+msgid "Manage various other options."
+msgstr ""
+
+#. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
+#. TRANS: user's profile settings. This message has one space at the beginning. Use your
+#. TRANS: language's word separator here if it has one (most likely a single space).
+#: actions/urlsettings.php:115
+msgid " (free service)"
+msgstr ""
+
+#: actions/urlsettings.php:121
+msgid "[none]"
+msgstr ""
+
+#: actions/urlsettings.php:122
+msgid "[internal]"
+msgstr ""
+
+#. TRANS: Label for dropdown with URL shortener services.
+#: actions/urlsettings.php:130
+msgid "Shorten URLs with"
+msgstr ""
+
+#. TRANS: Tooltip for for dropdown with URL shortener services.
+#: actions/urlsettings.php:132
+msgid "Automatic shortening service to use."
+msgstr ""
+
+#: actions/urlsettings.php:138
+msgid "URL longer than"
+msgstr ""
+
+#: actions/urlsettings.php:141
+msgid "URLs longer than this will be shortened, 0 means always shorten."
+msgstr ""
+
+#: actions/urlsettings.php:145
+msgid "Text longer than"
+msgstr ""
+
+#: actions/urlsettings.php:148
+msgid ""
+"URLs in notices longer than this will be shortened, 0 means always shorten."
+msgstr ""
+
+#. TRANS: Form validation error for form "Other settings" in user profile.
+#: actions/urlsettings.php:180
+msgid "URL shortening service is too long (maximum 50 characters)."
+msgstr ""
+
+#: actions/urlsettings.php:187
+msgid "Invalid number for max url length."
+msgstr ""
+
+#: actions/urlsettings.php:193
+msgid "Invalid number for max notice length."
+msgstr ""
+
+#: actions/urlsettings.php:238
+msgid "Error saving user URL shortening preferences."
+msgstr ""
+
 #. TRANS: User admin panel title
 #: actions/useradminpanel.php:58
 msgctxt "TITLE"
@@ -6077,11 +6178,11 @@ msgstr ""
 #. TRANS: users in user admin panel. %1$s is the invalid nickname.
 #: actions/useradminpanel.php:166
 #, php-format
-msgid "Invalid default subscripton: '%1$s' is not a user."
+msgid "Invalid default subscripton: \"%1$s\" is not a user."
 msgstr ""
 
-#. TRANS: Link description in user account settings menu.
-#: actions/useradminpanel.php:215 lib/accountsettingsaction.php:106
+#: actions/useradminpanel.php:215 lib/action.php:565 lib/settingsnav.php:77
+#: lib/subgroupnav.php:81
 msgid "Profile"
 msgstr ""
 
@@ -6137,120 +6238,163 @@ msgstr ""
 
 #. TRANS: Title for button to save user settings in user admin panel.
 #: actions/useradminpanel.php:302
-msgid "Save user settings"
+msgid "Save user settings."
 msgstr ""
 
-#: actions/userauthorization.php:105
+#. TRANS: Page title.
+#: actions/userauthorization.php:109
 msgid "Authorize subscription"
 msgstr ""
 
-#: actions/userauthorization.php:110
+#. TRANS: Page notice on "Auhtorize subscription" page.
+#: actions/userauthorization.php:115
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
 "user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
-"click “Reject”."
+"click \"Reject\"."
 msgstr ""
 
-#. TRANS: Menu item for site administration
-#: actions/userauthorization.php:196 actions/version.php:167
-#: lib/adminpanelaction.php:403
-msgid "License"
-msgstr ""
-
-#: actions/userauthorization.php:217
+#. TRANS: Button text on Authorise Subscription page.
+#: actions/userauthorization.php:200
+msgctxt "BUTTON"
 msgid "Accept"
 msgstr ""
 
-#: actions/userauthorization.php:218 lib/subscribeform.php:115
-#: lib/subscribeform.php:139
-msgid "Subscribe to this user"
+#. TRANS: Title for button on Authorise Subscription page.
+#: actions/userauthorization.php:202
+msgid "Subscribe to this user."
 msgstr ""
 
-#: actions/userauthorization.php:219
+#. TRANS: Button text on Authorise Subscription page.
+#: actions/userauthorization.php:204
+msgctxt "BUTTON"
 msgid "Reject"
 msgstr ""
 
-#: actions/userauthorization.php:220
-msgid "Reject this subscription"
+#. TRANS: Title for button on Authorise Subscription page.
+#: actions/userauthorization.php:206
+msgid "Reject this subscription."
 msgstr ""
 
-#: actions/userauthorization.php:232
+#. TRANS: Client error displayed for an empty authorisation request.
+#: actions/userauthorization.php:219
 msgid "No authorization request!"
 msgstr ""
 
-#: actions/userauthorization.php:254
+#. TRANS: Accept message header from Authorise subscription page.
+#: actions/userauthorization.php:242
 msgid "Subscription authorized"
 msgstr ""
 
-#: actions/userauthorization.php:256
+#: actions/userauthorization.php:245
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to authorize the "
 "subscription. Your subscription token is:"
 msgstr ""
 
-#: actions/userauthorization.php:266
+#. TRANS: Reject message header from Authorise subscription page.
+#: actions/userauthorization.php:256
 msgid "Subscription rejected"
 msgstr ""
 
-#: actions/userauthorization.php:268
+#: actions/userauthorization.php:259
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to fully reject the "
 "subscription."
 msgstr ""
 
+#. TRANS: Exception thrown when no valid user is found for an authorisation request.
+#. TRANS: %s is a listener URI.
+#: actions/userauthorization.php:296
+#, php-format
+msgid "Listener URI \"%s\" not found here."
+msgstr ""
+
+#. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
+#. TRANS: %s is a listenee URI.
 #: actions/userauthorization.php:303
 #, php-format
-msgid "Listener URI ‘%s’ not found here."
+msgid "Listenee URI \"%s\" is too long."
 msgstr ""
 
-#: actions/userauthorization.php:308
+#. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
+#. TRANS: %s is a listenee URI.
+#: actions/userauthorization.php:311
 #, php-format
-msgid "Listenee URI ‘%s’ is too long."
-msgstr ""
-
-#: actions/userauthorization.php:314
-#, php-format
-msgid "Listenee URI ‘%s’ is a local user."
+msgid "Listenee URI \"%s\" is a local user."
 msgstr ""
 
+#. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
+#. TRANS: %s is a profile URL.
 #: actions/userauthorization.php:329
 #, php-format
-msgid "Profile URL ‘%s’ is for a local user."
+msgid "Profile URL \"%s\" is for a local user."
 msgstr ""
 
-#: actions/userauthorization.php:345
+#. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
+#. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
+#: actions/userauthorization.php:339
 #, php-format
-msgid "Avatar URL ‘%s’ is not valid."
+msgid ""
+"Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
+"\"."
 msgstr ""
 
-#: actions/userauthorization.php:350
+#. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
+#. TRANS: %s is an avatar URL.
+#: actions/userauthorization.php:349
 #, php-format
-msgid "Can’t read avatar URL ‘%s’."
+msgid "Avatar URL \"%s\" is not valid."
 msgstr ""
 
-#: actions/userauthorization.php:355
+#. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
+#. TRANS: %s is an avatar URL.
+#: actions/userauthorization.php:356
 #, php-format
-msgid "Wrong image type for avatar URL ‘%s’."
+msgid "Cannot read avatar URL \"%s\"."
+msgstr ""
+
+#. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
+#. TRANS: %s is an avatar URL.
+#: actions/userauthorization.php:363
+#, php-format
+msgid "Wrong image type for avatar URL \"%s\"."
 msgstr ""
 
 #. TRANS: Page title for profile design page.
-#: actions/userdesignsettings.php:74 lib/designsettings.php:63
+#: actions/userdesignsettings.php:74 lib/designsettings.php:61
 msgid "Profile design"
 msgstr ""
 
 #. TRANS: Instructions for profile design page.
-#: actions/userdesignsettings.php:84 lib/designsettings.php:74
+#: actions/userdesignsettings.php:84 lib/designsettings.php:72
 msgid ""
 "Customize the way your profile looks with a background image and a colour "
 "palette of your choice."
 msgstr ""
 
-#: actions/userdesignsettings.php:272
+#: actions/userdesignsettings.php:289
 msgid "Enjoy your hotdog!"
 msgstr ""
 
+#: actions/userdesignsettings.php:325
+msgid "Design settings"
+msgstr ""
+
+#: actions/userdesignsettings.php:340
+msgid "View profile designs"
+msgstr ""
+
+#: actions/userdesignsettings.php:341
+msgid "Show or hide profile designs."
+msgstr ""
+
+#: actions/userdesignsettings.php:348
+msgid "Background file"
+msgstr ""
+
 #. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number.
 #: actions/usergroups.php:66
 #, php-format
@@ -6298,6 +6442,11 @@ msgstr ""
 msgid "Contributors"
 msgstr ""
 
+#. TRANS: Menu item for site administration
+#: actions/version.php:167 lib/adminpanelaction.php:403
+msgid "License"
+msgstr ""
+
 #: actions/version.php:170
 msgid ""
 "StatusNet is free software: you can redistribute it and/or modify it under "
@@ -6321,12 +6470,13 @@ msgid ""
 "along with this program.  If not, see %s."
 msgstr ""
 
-#: actions/version.php:191
-msgid "Plugins"
+#. TRANS: Form input field label for application name.
+#: actions/version.php:197 lib/applicationeditform.php:190
+msgid "Name"
 msgstr ""
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:901
+#: actions/version.php:198 lib/action.php:885
 msgid "Version"
 msgstr ""
 
@@ -6334,6 +6484,12 @@ msgstr ""
 msgid "Author(s)"
 msgstr ""
 
+#. TRANS: Form input field label.
+#: actions/version.php:200 lib/applicationeditform.php:208
+#: lib/groupeditform.php:168
+msgid "Description"
+msgstr ""
+
 #. TRANS: Activity title when marking a notice as favorite.
 #: classes/Fave.php:164
 msgid "Favor"
@@ -6448,7 +6604,7 @@ msgid "Could not create login token for %s"
 msgstr ""
 
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
-#: classes/Memcached_DataObject.php:542
+#: classes/Memcached_DataObject.php:556
 msgid "No database name or DSN found anywhere."
 msgstr ""
 
@@ -6618,18 +6774,18 @@ msgstr ""
 
 #. TRANS: Notice given on user registration.
 #. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:395
+#: classes/User.php:390
 #, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr ""
 
 #. TRANS: Server exception.
-#: classes/User.php:918
+#: classes/User.php:923
 msgid "No single user defined for single-user mode."
 msgstr ""
 
 #. TRANS: Server exception.
-#: classes/User.php:922
+#: classes/User.php:927
 msgid "Single-user mode code called when not enabled."
 msgstr ""
 
@@ -6674,41 +6830,6 @@ msgstr ""
 msgid "No AtomPub API service for %s."
 msgstr ""
 
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:104
-msgid "Change your profile settings"
-msgstr ""
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:111
-msgid "Upload an avatar"
-msgstr ""
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:118
-msgid "Change your password"
-msgstr ""
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:125
-msgid "Change email handling"
-msgstr ""
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:132
-msgid "Design your profile"
-msgstr ""
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:139
-msgid "Other options"
-msgstr ""
-
-#. TRANS: Link description in user account settings menu.
-#: lib/accountsettingsaction.php:141
-msgid "Other"
-msgstr ""
-
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
 #: lib/action.php:161
 #, php-format
@@ -6726,206 +6847,115 @@ msgctxt "TOOLTIP"
 msgid "Show more"
 msgstr ""
 
-#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:544
-msgid "Primary site navigation"
+#. TRANS: Inline reply form submit button: submits a reply comment.
+#: lib/action.php:328
+msgctxt "BUTTON"
+msgid "Comment"
 msgstr ""
 
-#. TRANS: Tooltip for main menu option "Personal".
-#: lib/action.php:550
-msgctxt "TOOLTIP"
-msgid "Personal profile and friends timeline"
+#. TRANS: Placeholder text for inline reply form. Clicking in this box will turn it into a mini notice form.
+#: lib/action.php:331
+msgid "Add a comment..."
 msgstr ""
 
-#. TRANS: Main menu option when logged in for access to personal profile and friends timeline.
-#. TRANS: Personal group navigation menu option when logged in for viewing timeline of self and friends.
-#: lib/action.php:553 lib/personalgroupnav.php:100
-msgctxt "MENU"
-msgid "Personal"
+#: lib/action.php:559 lib/personalgroupnav.php:99
+msgid "Home"
 msgstr ""
 
-#. TRANS: Tooltip for main menu option "Account".
-#: lib/action.php:555
-msgctxt "TOOLTIP"
-msgid "Change your email, avatar, password, profile"
-msgstr ""
-
-#. TRANS: Main menu option when logged in for access to user settings.
-#: lib/action.php:558
-msgid "Account"
-msgstr ""
-
-#. TRANS: Tooltip for main menu option "Services".
 #: lib/action.php:560
-msgctxt "TOOLTIP"
-msgid "Connect to services"
+msgid "Friends timeline"
 msgstr ""
 
-#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services.
-#: lib/action.php:563
-msgid "Connect"
-msgstr ""
-
-#. TRANS: Tooltip for menu option "Admin".
 #: lib/action.php:566
-msgctxt "TOOLTIP"
-msgid "Change site configuration"
+msgid "Your profile"
 msgstr ""
 
-#. TRANS: Main menu option when logged in and site admin for access to site configuration.
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/action.php:569 lib/groupnav.php:117
-msgctxt "MENU"
-msgid "Admin"
+#: lib/action.php:570 lib/action.php:593 lib/publicgroupnav.php:78
+msgid "Public"
 msgstr ""
 
-#. TRANS: Tooltip for main menu option "Invite".
-#: lib/action.php:573
-#, php-format
-msgctxt "TOOLTIP"
-msgid "Invite friends and colleagues to join you on %s"
+#: lib/action.php:571 lib/action.php:594
+msgid "Everyone on this site"
+msgstr ""
+
+#: lib/action.php:575
+msgid "Settings"
 msgstr ""
 
-#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users.
 #: lib/action.php:576
-msgctxt "MENU"
-msgid "Invite"
+msgid "Change your personal settings"
 msgstr ""
 
-#. TRANS: Tooltip for main menu option "Logout"
 #: lib/action.php:582
-msgctxt "TOOLTIP"
-msgid "Logout from the site"
+msgid "Site configuration"
 msgstr ""
 
-#. TRANS: Main menu option when logged in to log out the current user.
-#: lib/action.php:585
-msgctxt "MENU"
+#: lib/action.php:587
 msgid "Logout"
 msgstr ""
 
-#. TRANS: Tooltip for main menu option "Register".
-#: lib/action.php:590
-msgctxt "TOOLTIP"
-msgid "Create an account"
+#: lib/action.php:588
+msgid "Logout from the site"
 msgstr ""
 
-#. TRANS: Main menu option when not logged in to register a new account.
-#. TRANS: Menu item for registering with the StatusNet site.
-#: lib/action.php:593 lib/logingroupnav.php:85
-msgctxt "MENU"
-msgid "Register"
-msgstr ""
-
-#. TRANS: Tooltip for main menu option "Login".
-#: lib/action.php:596
-msgctxt "TOOLTIP"
+#: lib/action.php:599
 msgid "Login to the site"
 msgstr ""
 
-#. TRANS: Main menu option when not logged in to log in.
-#. TRANS: Menu item for logging in to the StatusNet site.
-#: lib/action.php:599 lib/logingroupnav.php:77
-msgctxt "MENU"
-msgid "Login"
-msgstr ""
-
-#. TRANS: Tooltip for main menu option "Help".
-#: lib/action.php:602
-msgctxt "TOOLTIP"
-msgid "Help me!"
-msgstr ""
-
-#. TRANS: Main menu option for help on the StatusNet site.
-#: lib/action.php:605
-msgctxt "MENU"
-msgid "Help"
-msgstr ""
-
-#. TRANS: Tooltip for main menu option "Search".
-#: lib/action.php:608
-msgctxt "TOOLTIP"
-msgid "Search for people or text"
-msgstr ""
-
-#. TRANS: Main menu option when logged in or when the StatusNet instance is not private.
-#: lib/action.php:611
-msgctxt "MENU"
+#: lib/action.php:606
 msgid "Search"
 msgstr ""
 
-#. TRANS: DT element for site notice. String is hidden in default CSS.
-#. TRANS: Menu item for site administration
-#: lib/action.php:633 lib/adminpanelaction.php:387
-msgid "Site notice"
-msgstr ""
-
-#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:700
-msgid "Local views"
-msgstr ""
-
-#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:770
-msgid "Page notice"
-msgstr ""
-
-#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:874
-msgid "Secondary site navigation"
+#: lib/action.php:607
+msgid "Search the site"
 msgstr ""
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:880
+#: lib/action.php:864
 msgid "Help"
 msgstr ""
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:883
+#: lib/action.php:867
 msgid "About"
 msgstr ""
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:886
+#: lib/action.php:870
 msgid "FAQ"
 msgstr ""
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:891
+#: lib/action.php:875
 msgid "TOS"
 msgstr ""
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:895
+#: lib/action.php:879
 msgid "Privacy"
 msgstr ""
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:898
+#: lib/action.php:882
 msgid "Source"
 msgstr ""
 
 #. TRANS: Secondary navigation menu option leading to e-mail contact information on the
 #. TRANS: StatusNet site, where to report bugs, ...
-#: lib/action.php:905
+#: lib/action.php:889
 msgid "Contact"
 msgstr ""
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:908
+#: lib/action.php:892
 msgid "Badge"
 msgstr ""
 
-#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:937
-msgid "StatusNet software license"
-msgstr ""
-
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:944
+#: lib/action.php:921
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -6933,7 +6963,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:947
+#: lib/action.php:924
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr ""
@@ -6942,7 +6972,7 @@ msgstr ""
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:954
+#: lib/action.php:931
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -6950,51 +6980,41 @@ msgid ""
 "org/licensing/licenses/agpl-3.0.html)."
 msgstr ""
 
-#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:970
-msgid "Site content license"
-msgstr ""
-
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:977
+#: lib/action.php:949
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:984
+#: lib/action.php:956
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:988
+#: lib/action.php:960
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:1020
+#: lib/action.php:992
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
 
-#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1356
-msgid "Pagination"
-msgstr ""
-
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1367
+#: lib/action.php:1335
 msgid "After"
 msgstr ""
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1377
+#: lib/action.php:1345
 msgid "Before"
 msgstr ""
 
@@ -7145,7 +7165,7 @@ msgid "User configuration"
 msgstr ""
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:122
+#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:110
 msgid "User"
 msgstr ""
 
@@ -7169,6 +7189,11 @@ msgstr ""
 msgid "Edit site notice"
 msgstr ""
 
+#. TRANS: Menu item for site administration
+#: lib/adminpanelaction.php:387
+msgid "Site notice"
+msgstr ""
+
 #. TRANS: Menu item title/tooltip
 #: lib/adminpanelaction.php:393
 msgid "Snapshots configuration"
@@ -7179,6 +7204,11 @@ msgstr ""
 msgid "Set site license"
 msgstr ""
 
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:409
+msgid "Plugins configuration"
+msgstr ""
+
 #. TRANS: Client error 401.
 #: lib/apiauth.php:111
 msgid "API resource requires read-write access, but you only have read access."
@@ -7189,19 +7219,23 @@ msgstr ""
 msgid "No application for that consumer key."
 msgstr ""
 
+#: lib/apiauth.php:202 lib/apiauth.php:284
+msgid "Not allowed to use API."
+msgstr ""
+
 #. TRANS: OAuth exception given when an incorrect access token was given for a user.
-#: lib/apiauth.php:219
+#: lib/apiauth.php:225
 msgid "Bad access token."
 msgstr ""
 
 #. TRANS: OAuth exception given when no user was found for a given token (no token was found).
-#: lib/apiauth.php:224
+#: lib/apiauth.php:230
 msgid "No user for that token."
 msgstr ""
 
 #. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel".
 #. TRANS: Client error thrown when authentication fails.
-#: lib/apiauth.php:266 lib/apiauth.php:293
+#: lib/apiauth.php:272 lib/apiauth.php:302
 msgid "Could not authenticate you."
 msgstr ""
 
@@ -7244,6 +7278,11 @@ msgstr ""
 msgid "Failed to delete revoked token."
 msgstr ""
 
+#. TRANS: Form input field label for application icon.
+#: lib/applicationeditform.php:177
+msgid "Icon"
+msgstr ""
+
 #. TRANS: Form guide.
 #: lib/applicationeditform.php:182
 msgid "Icon for this application"
@@ -7278,6 +7317,11 @@ msgstr ""
 msgid "Organization responsible for this application"
 msgstr ""
 
+#. TRANS: Form input field label.
+#: lib/applicationeditform.php:227
+msgid "Organization"
+msgstr ""
+
 #. TRANS: Form input field instructions.
 #: lib/applicationeditform.php:234
 msgid "URL for the homepage of the organization"
@@ -7365,16 +7409,6 @@ msgstr ""
 msgid "Do not use this method!"
 msgstr ""
 
-#. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:293
-msgid "Author"
-msgstr ""
-
-#. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:307
-msgid "Provider"
-msgstr ""
-
 #. TRANS: Title.
 #: lib/attachmentnoticesection.php:67
 msgid "Notices where this attachment appears"
@@ -7400,23 +7434,28 @@ msgstr ""
 msgid "Block"
 msgstr ""
 
+#. TRANS: Description of the form to block a user.
+#: lib/blockform.php:79
+msgid "Block this user"
+msgstr ""
+
 #. TRANS: Title for command results.
-#: lib/channel.php:160 lib/channel.php:181
+#: lib/channel.php:104 lib/channel.php:125
 msgid "Command results"
 msgstr ""
 
 #. TRANS: Title for command results.
-#: lib/channel.php:194
+#: lib/channel.php:138
 msgid "AJAX error"
 msgstr ""
 
 #. TRANS: E-mail subject when a command has completed.
-#: lib/channel.php:233 lib/mailhandler.php:143
+#: lib/channel.php:177 lib/mailhandler.php:143
 msgid "Command complete"
 msgstr ""
 
 #. TRANS: E-mail subject when a command has failed.
-#: lib/channel.php:244
+#: lib/channel.php:188
 msgid "Command failed"
 msgstr ""
 
@@ -7515,7 +7554,7 @@ msgstr ""
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a location.
-#: lib/command.php:446 lib/mail.php:270
+#: lib/command.php:446 lib/mail.php:275
 #, php-format
 msgid "Location: %s"
 msgstr ""
@@ -7523,7 +7562,7 @@ msgstr ""
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a homepage.
-#: lib/command.php:450 lib/mail.php:274
+#: lib/command.php:450 lib/mail.php:279
 #, php-format
 msgid "Homepage: %s"
 msgstr ""
@@ -7753,106 +7792,97 @@ msgid ""
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:162
+#: lib/common.php:36
 msgid "No configuration file found."
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:165
+#: lib/common.php:39
 msgid "I looked for configuration files in the following places:"
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:168
+#: lib/common.php:42
 msgid "You may wish to run the installer to fix this."
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:172
+#: lib/common.php:46
 msgid "Go to the installer."
 msgstr ""
 
-#. TRANS: Menu item for Instant Messaging settings.
-#: lib/connectsettingsaction.php:106
-msgctxt "MENU"
-msgid "IM"
-msgstr ""
-
-#. TRANS: Tooltip for Instant Messaging menu item.
-#: lib/connectsettingsaction.php:108
-msgid "Updates by instant messenger (IM)"
-msgstr ""
-
-#. TRANS: Menu item for Short Message Service settings.
-#: lib/connectsettingsaction.php:113
-msgctxt "MENU"
-msgid "SMS"
-msgstr ""
-
-#. TRANS: Tooltip for Short Message Service menu item.
-#: lib/connectsettingsaction.php:115
-msgid "Updates by SMS"
-msgstr ""
-
-#. TRANS: Menu item for OuAth connection settings.
-#: lib/connectsettingsaction.php:120
-msgctxt "MENU"
-msgid "Connections"
-msgstr ""
-
-#. TRANS: Tooltip for connected applications (Connections through OAuth) menu item.
-#: lib/connectsettingsaction.php:122
-msgid "Authorized connected applications"
-msgstr ""
-
 #: lib/dberroraction.php:59
 msgid "Database error"
 msgstr ""
 
+#. TRANS: Description of form for deleting a user.
+#: lib/deleteuserform.php:75
+msgid "Delete this user"
+msgstr ""
+
+#: lib/designform.php:114
+msgid "Change design"
+msgstr ""
+
+#. TRANS: Fieldset legend on profile design page to change profile page colours.
+#: lib/designform.php:131
+msgid "Change colours"
+msgstr ""
+
+#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
+#: lib/designform.php:138
+msgid "Use defaults"
+msgstr ""
+
+#. TRANS: Title for button on profile design page to reset all colour settings to default.
+#: lib/designform.php:140
+msgid "Restore default designs"
+msgstr ""
+
+#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
+#: lib/designform.php:148
+msgid "Reset back to default"
+msgstr ""
+
 #. TRANS: Label in form on profile design page.
 #. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
-#: lib/designsettings.php:108
+#: lib/designform.php:158
 msgid "Upload file"
 msgstr ""
 
 #. TRANS: Instructions for form on profile design page.
-#: lib/designsettings.php:113
+#: lib/designform.php:163
 msgid ""
-"You can upload your personal background image. The maximum file size is 2MB."
+"You can upload your personal background image. The maximum file size is 2Mb."
 msgstr ""
 
 #. TRANS: Radio button on profile design page that will enable use of the uploaded profile image.
-#: lib/designsettings.php:139
+#: lib/designform.php:194
 msgctxt "RADIO"
 msgid "On"
 msgstr ""
 
 #. TRANS: Radio button on profile design page that will disable use of the uploaded profile image.
-#: lib/designsettings.php:156
+#: lib/designform.php:211
 msgctxt "RADIO"
 msgid "Off"
 msgstr ""
 
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: lib/designsettings.php:175
-msgid "Change colours"
-msgstr ""
-
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: lib/designsettings.php:257
-msgid "Use defaults"
+#. TRANS: Title for button on profile design page to save settings.
+#: lib/designform.php:322
+msgid "Save design"
 msgstr ""
 
 #. TRANS: Error message displayed if design settings could not be saved.
 #. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
-#: lib/designsettings.php:405 lib/designsettings.php:427
+#: lib/designsettings.php:216 lib/designsettings.php:238
 msgid "Couldn't update your design."
 msgstr ""
 
 #. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
-#: lib/designsettings.php:433
+#: lib/designsettings.php:244
 msgid "Design defaults restored."
 msgstr ""
 
@@ -7919,27 +7949,23 @@ msgstr ""
 msgid "Feeds"
 msgstr ""
 
-#: lib/galleryaction.php:121
-msgid "Filter tags"
-msgstr ""
-
-#: lib/galleryaction.php:131
+#: lib/galleryaction.php:128
 msgid "All"
 msgstr ""
 
-#: lib/galleryaction.php:139
+#: lib/galleryaction.php:136
 msgid "Select tag to filter"
 msgstr ""
 
-#: lib/galleryaction.php:140
+#: lib/galleryaction.php:137
 msgid "Tag"
 msgstr ""
 
-#: lib/galleryaction.php:141
+#: lib/galleryaction.php:138
 msgid "Choose a tag to narrow list"
 msgstr ""
 
-#: lib/galleryaction.php:143
+#: lib/galleryaction.php:140
 msgid "Go"
 msgstr ""
 
@@ -8025,6 +8051,12 @@ msgctxt "TOOLTIP"
 msgid "%s blocked users"
 msgstr ""
 
+#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
+#: lib/groupnav.php:117
+msgctxt "MENU"
+msgid "Admin"
+msgstr ""
+
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
 #: lib/groupnav.php:120
@@ -8134,39 +8166,61 @@ msgid_plural "%dB"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/jabber.php:387
+#: lib/implugin.php:262
 #, php-format
-msgid "[%s]"
+msgid ""
+"User \"%s\" on %s has said that your %s screenname belongs to them. If "
+"that's true, you can confirm by clicking on this URL: %s . (If you cannot "
+"click it, copy-and-paste it into the address bar of your browser). If that "
+"user isn't you, or if you didn't request this confirmation, just ignore this "
+"message."
 msgstr ""
 
-#: lib/jabber.php:567
+#: lib/implugin.php:349
 #, php-format
 msgid "Unknown inbox source %d."
 msgstr ""
 
+#: lib/implugin.php:485
+#, php-format
+msgid "Message too long - maximum is %1$d characters, you sent %2$d."
+msgstr ""
+
 #: lib/leaveform.php:114
 msgid "Leave"
 msgstr ""
 
+#. TRANS: Menu item for logging in to the StatusNet site.
+#: lib/logingroupnav.php:77
+msgctxt "MENU"
+msgid "Login"
+msgstr ""
+
 #. TRANS: Title for menu item for logging in to the StatusNet site.
 #: lib/logingroupnav.php:79
 msgid "Login with a username and password"
 msgstr ""
 
+#. TRANS: Menu item for registering with the StatusNet site.
+#: lib/logingroupnav.php:85
+msgctxt "MENU"
+msgid "Register"
+msgstr ""
+
 #. TRANS: Title for menu item for registering with the StatusNet site.
 #: lib/logingroupnav.php:87
 msgid "Sign up for a new account"
 msgstr ""
 
 #. TRANS: Subject for address confirmation email.
-#: lib/mail.php:168
+#: lib/mail.php:172
 msgid "Email address confirmation"
 msgstr ""
 
 #. TRANS: Body for address confirmation email.
 #. TRANS: %1$s is the addressed user's nickname, %2$s is the StatusNet sitename,
 #. TRANS: %3$s is the URL to confirm at.
-#: lib/mail.php:173
+#: lib/mail.php:177
 #, php-format
 msgid ""
 "Hey, %1$s.\n"
@@ -8185,14 +8239,14 @@ msgstr ""
 
 #. TRANS: Subject of new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
-#: lib/mail.php:238
+#: lib/mail.php:243
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr ""
 
 #. TRANS: This is a paragraph in a new-subscriber e-mail.
 #. TRANS: %s is a URL where the subscriber can be reported as abusive.
-#: lib/mail.php:245
+#: lib/mail.php:250
 #, php-format
 msgid ""
 "If you believe this account is being used abusively, you can block them from "
@@ -8204,7 +8258,7 @@ msgstr ""
 #. TRANS: %3$s is the subscriber's profile URL, %4$s is the subscriber's location (or empty)
 #. TRANS: %5$s is the subscriber's homepage URL (or empty), %6%s is the subscriber's bio (or empty)
 #. TRANS: %7$s is a link to the addressed user's e-mail settings.
-#: lib/mail.php:255
+#: lib/mail.php:260
 #, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -8221,14 +8275,14 @@ msgstr ""
 
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is biographical information.
-#: lib/mail.php:278
+#: lib/mail.php:283
 #, php-format
 msgid "Bio: %s"
 msgstr ""
 
 #. TRANS: Subject of notification mail for new posting email address.
 #. TRANS: %s is the StatusNet sitename.
-#: lib/mail.php:307
+#: lib/mail.php:312
 #, php-format
 msgid "New email address for posting to %s"
 msgstr ""
@@ -8236,7 +8290,7 @@ msgstr ""
 #. TRANS: Body of notification mail for new posting email address.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is the e-mail address to send
 #. TRANS: to to post by e-mail, %3$s is a URL to more instructions.
-#: lib/mail.php:313
+#: lib/mail.php:318
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -8251,26 +8305,26 @@ msgstr ""
 
 #. TRANS: Subject line for SMS-by-email notification messages.
 #. TRANS: %s is the posting user's nickname.
-#: lib/mail.php:434
+#: lib/mail.php:439
 #, php-format
 msgid "%s status"
 msgstr ""
 
 #. TRANS: Subject line for SMS-by-email address confirmation message.
-#: lib/mail.php:460
+#: lib/mail.php:465
 msgid "SMS confirmation"
 msgstr ""
 
 #. TRANS: Main body heading for SMS-by-email address confirmation message.
 #. TRANS: %s is the addressed user's nickname.
-#: lib/mail.php:464
+#: lib/mail.php:469
 #, php-format
 msgid "%s: confirm you own this phone number with this code:"
 msgstr ""
 
 #. TRANS: Subject for 'nudge' notification email.
 #. TRANS: %s is the nudging user.
-#: lib/mail.php:485
+#: lib/mail.php:490
 #, php-format
 msgid "You have been nudged by %s"
 msgstr ""
@@ -8278,7 +8332,7 @@ msgstr ""
 #. TRANS: Body for 'nudge' notification email.
 #. TRANS: %1$s is the nuding user's long name, $2$s is the nudging user's nickname,
 #. TRANS: %3$s is a URL to post notices at, %4$s is the StatusNet sitename.
-#: lib/mail.php:492
+#: lib/mail.php:497
 #, php-format
 msgid ""
 "%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -8296,7 +8350,7 @@ msgstr ""
 
 #. TRANS: Subject for direct-message notification email.
 #. TRANS: %s is the sending user's nickname.
-#: lib/mail.php:539
+#: lib/mail.php:544
 #, php-format
 msgid "New private message from %s"
 msgstr ""
@@ -8305,7 +8359,7 @@ msgstr ""
 #. TRANS: %1$s is the sending user's long name, %2$s is the sending user's nickname,
 #. TRANS: %3$s is the message content, %4$s a URL to the message,
 #. TRANS: %5$s is the StatusNet sitename.
-#: lib/mail.php:547
+#: lib/mail.php:552
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -8326,7 +8380,7 @@ msgstr ""
 
 #. TRANS: Subject for favorite notification e-mail.
 #. TRANS: %1$s is the adding user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:599
+#: lib/mail.php:604
 #, php-format
 msgid "%1$s (@%2$s) added your notice as a favorite"
 msgstr ""
@@ -8336,7 +8390,7 @@ msgstr ""
 #. TRANS: %3$s is a URL to the faved notice, %4$s is the faved notice text,
 #. TRANS: %5$s is a URL to all faves of the adding user, %6$s is the StatusNet sitename,
 #. TRANS: %7$s is the adding user's nickname.
-#: lib/mail.php:606
+#: lib/mail.php:611
 #, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -8358,7 +8412,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:664
+#: lib/mail.php:669
 #, php-format
 msgid ""
 "The full conversation can be read here:\n"
@@ -8368,7 +8422,7 @@ msgstr ""
 
 #. TRANS: E-mail subject for notice notification.
 #. TRANS: %1$s is the sending user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:672
+#: lib/mail.php:677
 #, php-format
 msgid "%1$s (@%2$s) sent a notice to your attention"
 msgstr ""
@@ -8379,7 +8433,7 @@ msgstr ""
 #. TRANS: %5$s is a URL to the full conversion if it exists (otherwise empty),
 #. TRANS: %6$s is a URL to reply to the notice, %7$s is a URL to all @-replied for the addressed user,
 #. TRANS: %8$s is a URL to the addressed user's e-mail settings, %9$s is the sender's nickname.
-#: lib/mail.php:680
+#: lib/mail.php:685
 #, php-format
 msgid ""
 "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -8494,11 +8548,7 @@ msgstr ""
 msgid "To"
 msgstr ""
 
-#: lib/messageform.php:166 lib/noticeform.php:186
-msgid "Available characters"
-msgstr ""
-
-#: lib/messageform.php:185 lib/noticeform.php:237
+#: lib/messageform.php:184 lib/noticeform.php:236
 msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr ""
@@ -8507,15 +8557,10 @@ msgstr ""
 msgid "Messages"
 msgstr ""
 
-#: lib/messagelistitem.php:123 lib/noticelist.php:522
+#: lib/messagelistitem.php:123 lib/noticelist.php:527
 msgid "from"
 msgstr ""
 
-#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:165
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr ""
-
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 #: lib/nickname.php:178
 msgid "Nickname cannot be empty."
@@ -8538,78 +8583,82 @@ msgstr ""
 msgid "What's up, %s?"
 msgstr ""
 
-#: lib/noticeform.php:194
+#: lib/noticeform.php:193
 msgid "Attach"
 msgstr ""
 
-#: lib/noticeform.php:198
+#: lib/noticeform.php:197
 msgid "Attach a file"
 msgstr ""
 
-#: lib/noticeform.php:213
+#: lib/noticeform.php:212
 msgid "Share my location"
 msgstr ""
 
-#: lib/noticeform.php:216
+#: lib/noticeform.php:215
 msgid "Do not share my location"
 msgstr ""
 
-#: lib/noticeform.php:217
+#: lib/noticeform.php:216
 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
 "try again later"
 msgstr ""
 
 #. TRANS: Used in coordinates as abbreviation of north
-#: lib/noticelist.php:452
+#: lib/noticelist.php:457
 msgid "N"
 msgstr ""
 
 #. TRANS: Used in coordinates as abbreviation of south
-#: lib/noticelist.php:454
+#: lib/noticelist.php:459
 msgid "S"
 msgstr ""
 
 #. TRANS: Used in coordinates as abbreviation of east
-#: lib/noticelist.php:456
+#: lib/noticelist.php:461
 msgid "E"
 msgstr ""
 
 #. TRANS: Used in coordinates as abbreviation of west
-#: lib/noticelist.php:458
+#: lib/noticelist.php:463
 msgid "W"
 msgstr ""
 
-#: lib/noticelist.php:460
+#: lib/noticelist.php:465
 #, php-format
 msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgstr ""
 
-#: lib/noticelist.php:469
+#: lib/noticelist.php:474
 msgid "at"
 msgstr ""
 
-#: lib/noticelist.php:518
+#: lib/noticelist.php:523
 msgid "web"
 msgstr ""
 
-#: lib/noticelist.php:584
+#: lib/noticelist.php:589
 msgid "in context"
 msgstr ""
 
-#: lib/noticelist.php:619
+#: lib/noticelist.php:624
 msgid "Repeated by"
 msgstr ""
 
-#: lib/noticelist.php:646
+#: lib/noticelist.php:651
 msgid "Reply to this notice"
 msgstr ""
 
-#: lib/noticelist.php:647
+#: lib/noticelist.php:652
 msgid "Reply"
 msgstr ""
 
-#: lib/noticelist.php:691
+#: lib/noticelist.php:678
+msgid "Delete this notice"
+msgstr ""
+
+#: lib/noticelist.php:696
 msgid "Notice repeated"
 msgstr ""
 
@@ -8646,43 +8695,27 @@ msgstr ""
 msgid "Couldn't insert new subscription."
 msgstr ""
 
-#. TRANS: Personal group navigation menu option when logged in for viewing @-replies.
-#: lib/personalgroupnav.php:107
-msgctxt "MENU"
+#: lib/personalgroupnav.php:104
 msgid "Replies"
 msgstr ""
 
-#. TRANS: Personal group navigation menu option when logged in for seeing own profile.
-#: lib/personalgroupnav.php:114
-msgctxt "MENU"
-msgid "Profile"
-msgstr ""
-
-#. TRANS: Personal group navigation menu option when logged in for viewing own favourited notices.
-#: lib/personalgroupnav.php:120
-msgctxt "MENU"
+#: lib/personalgroupnav.php:109
 msgid "Favorites"
 msgstr ""
 
-#. TRANS: Personal group navigation menu option when logged in for viewing recieved personal messages.
-#: lib/personalgroupnav.php:133
-msgctxt "MENU"
+#: lib/personalgroupnav.php:120
 msgid "Inbox"
 msgstr ""
 
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing recieved personal messages.
-#: lib/personalgroupnav.php:135
+#: lib/personalgroupnav.php:121
 msgid "Your incoming messages"
 msgstr ""
 
-#. TRANS: Personal group navigation menu option when logged in for viewing senet personal messages.
-#: lib/personalgroupnav.php:140
-msgctxt "MENU"
+#: lib/personalgroupnav.php:125
 msgid "Outbox"
 msgstr ""
 
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing senet personal messages.
-#: lib/personalgroupnav.php:142
+#: lib/personalgroupnav.php:126
 msgid "Your sent messages"
 msgstr ""
 
@@ -8697,9 +8730,26 @@ msgstr ""
 msgid "Unknown"
 msgstr ""
 
+#. TRANS: Plugin admin panel controls
+#: lib/plugindisableform.php:90
+msgctxt "plugin"
+msgid "Disable"
+msgstr ""
+
+#. TRANS: Plugin admin panel controls
+#: lib/pluginenableform.php:112
+msgctxt "plugin"
+msgid "Enable"
+msgstr ""
+
+#: lib/pluginlist.php:196
+msgctxt "plugin-description"
+msgid "(Plugin descriptions unavailable when disabled.)"
+msgstr ""
+
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:82
+#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:88
 msgid "Subscriptions"
 msgstr ""
 
@@ -8710,7 +8760,7 @@ msgstr ""
 
 #. TRANS: H2 text for user subscriber statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:90
+#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:96
 msgid "Subscribers"
 msgstr ""
 
@@ -8732,7 +8782,7 @@ msgstr ""
 #. TRANS: Label for user statistics.
 #. TRANS: H2 text for user group membership statistics.
 #: lib/profileaction.php:239 lib/profileaction.php:290
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:104
 msgid "Groups"
 msgstr ""
 
@@ -8752,10 +8802,6 @@ msgstr ""
 msgid "Unimplemented method."
 msgstr ""
 
-#: lib/publicgroupnav.php:78
-msgid "Public"
-msgstr ""
-
 #: lib/publicgroupnav.php:82
 msgid "User groups"
 msgstr ""
@@ -8794,7 +8840,7 @@ msgid "Revoke the \"%s\" role from this user"
 msgstr ""
 
 #. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:974
+#: lib/router.php:1001
 msgid "Page not found."
 msgstr ""
 
@@ -8823,11 +8869,6 @@ msgctxt "BUTTON"
 msgid "Search"
 msgstr ""
 
-#. TRANS: Definition list item with instructions on how to get (better) search results.
-#: lib/searchaction.php:170
-msgid "Search help"
-msgstr ""
-
 #: lib/searchgroupnav.php:80
 msgid "People"
 msgstr ""
@@ -8852,6 +8893,50 @@ msgstr ""
 msgid "More..."
 msgstr ""
 
+#: lib/settingsnav.php:78
+msgid "Change your profile settings"
+msgstr ""
+
+#: lib/settingsnav.php:83
+msgid "Upload an avatar"
+msgstr ""
+
+#: lib/settingsnav.php:88
+msgid "Change your password"
+msgstr ""
+
+#: lib/settingsnav.php:93
+msgid "Change email handling"
+msgstr ""
+
+#: lib/settingsnav.php:98
+msgid "Design your profile"
+msgstr ""
+
+#: lib/settingsnav.php:102
+msgid "URL"
+msgstr ""
+
+#: lib/settingsnav.php:103
+msgid "URL shorteners"
+msgstr ""
+
+#: lib/settingsnav.php:111
+msgid "Updates by instant messenger (IM)"
+msgstr ""
+
+#: lib/settingsnav.php:118
+msgid "Updates by SMS"
+msgstr ""
+
+#: lib/settingsnav.php:123
+msgid "Connections"
+msgstr ""
+
+#: lib/settingsnav.php:124
+msgid "Authorized connected applications"
+msgstr ""
+
 #: lib/silenceform.php:67
 msgid "Silence"
 msgstr ""
@@ -8860,30 +8945,34 @@ msgstr ""
 msgid "Silence this user"
 msgstr ""
 
-#: lib/subgroupnav.php:83
+#: lib/subgroupnav.php:89
 #, php-format
 msgid "People %s subscribes to"
 msgstr ""
 
-#: lib/subgroupnav.php:91
+#: lib/subgroupnav.php:97
 #, php-format
 msgid "People subscribed to %s"
 msgstr ""
 
-#: lib/subgroupnav.php:99
+#: lib/subgroupnav.php:105
 #, php-format
 msgid "Groups %s is a member of"
 msgstr ""
 
-#: lib/subgroupnav.php:105
+#: lib/subgroupnav.php:111
 msgid "Invite"
 msgstr ""
 
-#: lib/subgroupnav.php:106
+#: lib/subgroupnav.php:112
 #, php-format
 msgid "Invite friends and colleagues to join you on %s"
 msgstr ""
 
+#: lib/subscribeform.php:115 lib/subscribeform.php:139
+msgid "Subscribe to this user"
+msgstr ""
+
 #: lib/subscriberspeopleselftagcloudsection.php:48
 #: lib/subscriptionspeopleselftagcloudsection.php:48
 msgid "People Tagcloud as self-tagged"
@@ -8952,6 +9041,13 @@ msgstr ""
 msgid "Error opening theme archive."
 msgstr ""
 
+#: lib/threadednoticelist.php:270
+#, php-format
+msgid "Show all %d comment"
+msgid_plural "Show all %d comments"
+msgstr[0] ""
+msgstr[1] ""
+
 #: lib/topposterssection.php:74
 msgid "Top posters"
 msgstr ""
@@ -8993,76 +9089,79 @@ msgstr ""
 msgid "User %1$s (%2$d) has no profile record."
 msgstr ""
 
-#. TRANS: Link text for changeing the avatar of the logged in user.
-#: lib/userprofile.php:121
+#: lib/userprofile.php:116
 msgid "Edit Avatar"
 msgstr ""
 
 #. TRANS: H2 for user actions in a profile.
 #. TRANS: H2 for entity actions in a profile.
-#: lib/userprofile.php:245 lib/userprofile.php:261
+#: lib/userprofile.php:216 lib/userprofile.php:232
 msgid "User actions"
 msgstr ""
 
 #. TRANS: Text shown in user profile of not yet compeltely deleted users.
-#: lib/userprofile.php:249
+#: lib/userprofile.php:220
 msgid "User deletion in progress..."
 msgstr ""
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:277
+#: lib/userprofile.php:248
 msgid "Edit profile settings"
 msgstr ""
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:279
+#: lib/userprofile.php:250
 msgid "Edit"
 msgstr ""
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:303
+#: lib/userprofile.php:274
 msgid "Send a direct message to this user"
 msgstr ""
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:305
+#: lib/userprofile.php:276
 msgid "Message"
 msgstr ""
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:347
+#: lib/userprofile.php:318
 msgid "Moderate"
 msgstr ""
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:386
+#: lib/userprofile.php:357
 msgid "User role"
 msgstr ""
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:389
+#: lib/userprofile.php:360
 msgctxt "role"
 msgid "Administrator"
 msgstr ""
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:391
+#: lib/userprofile.php:362
 msgctxt "role"
 msgid "Moderator"
 msgstr ""
 
+#: lib/util.php:321
+msgid "Not allowed to log in."
+msgstr ""
+
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1306
+#: lib/util.php:1337
 msgid "a few seconds ago"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1309
+#: lib/util.php:1340
 msgid "about a minute ago"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1313
+#: lib/util.php:1344
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
@@ -9070,12 +9169,12 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1316
+#: lib/util.php:1347
 msgid "about an hour ago"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1320
+#: lib/util.php:1351
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
@@ -9083,12 +9182,12 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1323
+#: lib/util.php:1354
 msgid "about a day ago"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1327
+#: lib/util.php:1358
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
@@ -9096,12 +9195,12 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1330
+#: lib/util.php:1361
 msgid "about a month ago"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1334
+#: lib/util.php:1365
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
@@ -9109,7 +9208,7 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1337
+#: lib/util.php:1368
 msgid "about a year ago"
 msgstr ""
 
@@ -9120,21 +9219,6 @@ msgstr ""
 msgid "%s is not a valid color! Use 3 or 6 hex characters."
 msgstr ""
 
-#. TRANS: %s is the URL to the StatusNet site's Instant Messaging settings.
-#: lib/xmppmanager.php:287
-#, php-format
-msgid "Unknown user. Go to %s to add your address to your account"
-msgstr ""
-
-#. TRANS: Response to XMPP source when it sent too long a message.
-#. TRANS: %1$d the maximum number of allowed characters (used for plural), %2$d is the sent number.
-#: lib/xmppmanager.php:406
-#, php-format
-msgid "Message too long. Maximum is %1$d character, you sent %2$d."
-msgid_plural "Message too long. Maximum is %1$d characters, you sent %2$d."
-msgstr[0] ""
-msgstr[1] ""
-
 #. TRANS: Exception.
 #: lib/xrd.php:63
 msgid "Invalid XML."
diff --git a/locale/sv/LC_MESSAGES/statusnet.po b/locale/sv/LC_MESSAGES/statusnet.po
index 1edde09543..83eeb283ab 100644
--- a/locale/sv/LC_MESSAGES/statusnet.po
+++ b/locale/sv/LC_MESSAGES/statusnet.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 15:58+0000\n"
-"PO-Revision-Date: 2011-03-03 16:01:21+0000\n"
+"POT-Creation-Date: 2011-03-03 17:23+0000\n"
+"PO-Revision-Date: 2011-03-03 17:26:27+0000\n"
 "Language-Team: Swedish <http://translatewiki.net/wiki/Portal:sv>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -81,23 +81,23 @@ msgstr "Spara inställningar för åtkomst"
 #. TRANS: Tooltip for button to save access settings in site admin panel.
 #. TRANS: Button text for saving theme settings.
 #. TRANS: Button label to save e-mail preferences.
-#. TRANS: Button label to save Instant Messaging preferences.
-#. TRANS: Button text for saving "Other settings" in profile.
+#. TRANS: Button label to save IM preferences.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
 #. TRANS: Button text for saving site notice in admin panel.
 #. TRANS: Button label to save SMS preferences.
 #. TRANS: Save button for settings for a profile in a subscriptions list.
+#. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
 #. TRANS: Button text on profile design page to save settings.
 #: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
-#: actions/emailsettings.php:250 actions/imsettings.php:183
-#: actions/othersettings.php:136 actions/pathsadminpanel.php:512
-#: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
-#: actions/smssettings.php:205 actions/subscriptions.php:259
+#: actions/emailsettings.php:251 actions/imsettings.php:199
+#: actions/pathsadminpanel.php:512 actions/profilesettings.php:198
+#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:204
+#: actions/subscriptions.php:261 actions/urlsettings.php:152
 #: actions/useradminpanel.php:298 lib/applicationeditform.php:355
-#: lib/designsettings.php:270 lib/groupeditform.php:201
+#: lib/designform.php:320 lib/groupeditform.php:201
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Spara"
@@ -136,7 +136,11 @@ msgstr "Ingen sådan sida"
 #. 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 use "one time password login" without using an existing user.
+#. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
+#. TRANS: Client error displayed trying to find a user by ID for a non-existing ID.
+#. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when calling a profile action without specifying a user.
 #: actions/all.php:80 actions/allrss.php:69
@@ -148,19 +152,19 @@ msgstr "Ingen sådan sida"
 #: actions/apidirectmessage.php:75 actions/apidirectmessagenew.php:72
 #: actions/apigroupcreate.php:111 actions/apigroupismember.php:89
 #: actions/apigroupjoin.php:98 actions/apigroupleave.php:98
-#: actions/apigrouplist.php:70 actions/apistatusesupdate.php:230
-#: actions/apisubscriptions.php:85 actions/apitimelinefavorites.php:70
-#: actions/apitimelinefriends.php:173 actions/apitimelinehome.php:78
-#: actions/apitimelinementions.php:77 actions/apitimelineuser.php:79
-#: actions/avatarbynickname.php:79 actions/favoritesrss.php:72
-#: actions/foaf.php:42 actions/foaf.php:61 actions/hcard.php:67
-#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
-#: actions/remotesubscribe.php:144 actions/remotesubscribe.php:153
-#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
-#: actions/showfavorites.php:106 actions/userbyid.php:74
-#: actions/usergroups.php:93 actions/userrss.php:40 actions/userxrd.php:59
-#: actions/xrds.php:71 lib/command.php:509 lib/galleryaction.php:59
-#: lib/mailbox.php:80 lib/profileaction.php:77
+#: actions/apigrouplist.php:70 actions/apigroupprofileupdate.php:108
+#: actions/apistatusesupdate.php:230 actions/apisubscriptions.php:85
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:173
+#: actions/apitimelinehome.php:78 actions/apitimelinementions.php:77
+#: actions/apitimelineuser.php:79 actions/avatarbynickname.php:79
+#: actions/favoritesrss.php:72 actions/foaf.php:42 actions/foaf.php:61
+#: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116
+#: actions/otp.php:78 actions/remotesubscribe.php:144
+#: actions/remotesubscribe.php:153 actions/replies.php:73
+#: actions/repliesrss.php:38 actions/rsd.php:113 actions/showfavorites.php:106
+#: actions/userbyid.php:75 actions/usergroups.php:93 actions/userrss.php:40
+#: actions/userxrd.php:59 actions/xrds.php:71 lib/command.php:509
+#: lib/galleryaction.php:59 lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Ingen sådan användare."
 
@@ -174,10 +178,9 @@ msgstr "%1$s och vänner, sida %2$d"
 #. TRANS: H1 text for page. %s is a user nickname.
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Timeline title for user and friends. %s is a user nickname.
-#. TRANS: Tooltop for personal group navigation menu option when logged in for viewing timeline of self and friends.
 #: actions/all.php:94 actions/all.php:191 actions/allrss.php:117
 #: actions/apitimelinefriends.php:207 actions/apitimelinehome.php:113
-#: lib/personalgroupnav.php:102
+#: lib/personalgroupnav.php:100
 #, php-format
 msgid "%s and friends"
 msgstr "%s och vänner"
@@ -233,7 +236,7 @@ msgstr ""
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
 #. TRANS: Second sentence of empty message for anonymous users. %s is a user nickname.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:227
+#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:221
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -282,19 +285,20 @@ msgstr "Uppdateringar från %1$s och vänner på %2$s!"
 #: actions/apifavoritecreate.php:98 actions/apifavoritedestroy.php:98
 #: actions/apifriendshipscreate.php:99 actions/apifriendshipsdestroy.php:99
 #: actions/apifriendshipsshow.php:124 actions/apigroupcreate.php:138
-#: actions/apigroupismember.php:115 actions/apigroupjoin.php:160
-#: actions/apigroupleave.php:145 actions/apigrouplist.php:134
+#: actions/apigroupismember.php:115 actions/apigroupjoin.php:151
+#: actions/apigroupleave.php:141 actions/apigrouplist.php:134
 #: actions/apigrouplistall.php:120 actions/apigroupmembership.php:105
+#: actions/apigroupprofileupdate.php:100 actions/apigroupprofileupdate.php:213
 #: actions/apigroupshow.php:114 actions/apihelptest.php:84
 #: actions/apistatusesdestroy.php:101 actions/apistatusesretweets.php:110
 #: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:139
 #: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
-#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:268
-#: actions/apitimelinegroup.php:147 actions/apitimelinehome.php:173
-#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:239
-#: actions/apitimelineretweetedtome.php:118
-#: actions/apitimelineretweetsofme.php:150 actions/apitimelinetag.php:159
-#: actions/apitimelineuser.php:206 actions/apiusershow.php:100
+#: actions/apitimelinefavorites.php:182 actions/apitimelinefriends.php:276
+#: actions/apitimelinegroup.php:148 actions/apitimelinehome.php:181
+#: actions/apitimelinementions.php:182 actions/apitimelinepublic.php:247
+#: actions/apitimelineretweetedtome.php:147
+#: actions/apitimelineretweetsofme.php:147 actions/apitimelinetag.php:165
+#: actions/apitimelineuser.php:217 actions/apiusershow.php:100
 msgid "API method not found."
 msgstr "API-metod hittades inte."
 
@@ -309,8 +313,9 @@ msgstr "API-metod hittades inte."
 #: actions/apifavoritecreate.php:88 actions/apifavoritedestroy.php:88
 #: actions/apifriendshipscreate.php:89 actions/apifriendshipsdestroy.php:89
 #: actions/apigroupcreate.php:102 actions/apigroupjoin.php:89
-#: actions/apigroupleave.php:89 actions/apimediaupload.php:66
-#: actions/apistatusesretweet.php:63 actions/apistatusesupdate.php:194
+#: actions/apigroupleave.php:89 actions/apigroupprofileupdate.php:92
+#: actions/apimediaupload.php:66 actions/apistatusesretweet.php:63
+#: actions/apistatusesupdate.php:194
 msgid "This method requires a POST."
 msgstr "Denna metod kräver en POST."
 
@@ -322,21 +327,16 @@ msgid ""
 msgstr "Du måste ange ett värdet på parametern 'device': sms, im, none"
 
 #. TRANS: Server error displayed when a user's delivery device cannot be updated.
-#. TRANS: Server error displayed when a user update to the database fails in the contact address confirmation action.
 #. TRANS: Server error thrown on database error updating e-mail preferences.
 #. TRANS: Server error thrown on database error removing a registered e-mail address.
-#. TRANS: Server error thrown on database error updating Instant Messaging preferences.
-#. TRANS: Server error thrown on database error removing a registered Instant Messaging address.
-#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
 #. TRANS: Server error thrown when user profile settings could not be updated.
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
-#: actions/apiaccountupdatedeliverydevice.php:130
-#: actions/confirmaddress.php:118 actions/emailsettings.php:352
-#: actions/emailsettings.php:498 actions/imsettings.php:276
-#: actions/imsettings.php:432 actions/othersettings.php:186
-#: actions/profilesettings.php:322 actions/smssettings.php:301
-#: actions/smssettings.php:454
+#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
+#: actions/apiaccountupdatedeliverydevice.php:136
+#: actions/emailsettings.php:353 actions/emailsettings.php:499
+#: actions/profilesettings.php:323 actions/smssettings.php:300
+#: actions/smssettings.php:453 actions/urlsettings.php:211
 msgid "Could not update user."
 msgstr "Kunde inte uppdatera användare."
 
@@ -362,7 +362,7 @@ msgstr "Användaren har ingen profil."
 
 #. TRANS: Server error displayed if a user profile could not be saved.
 #. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:418
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:419
 msgid "Could not save profile."
 msgstr "Kunde inte spara profil."
 
@@ -374,7 +374,7 @@ msgstr "Kunde inte spara profil."
 #: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
 #: actions/designadminpanel.php:120 actions/editapplication.php:121
 #: actions/newapplication.php:102 actions/newnotice.php:95
-#: lib/designsettings.php:298
+#: lib/designsettings.php:110
 #, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s byte) due to its "
@@ -399,8 +399,8 @@ msgstr[1] ""
 #: actions/apiaccountupdateprofilecolors.php:160
 #: actions/apiaccountupdateprofilecolors.php:171
 #: actions/groupdesignsettings.php:285 actions/groupdesignsettings.php:296
-#: actions/userdesignsettings.php:201 actions/userdesignsettings.php:211
-#: actions/userdesignsettings.php:253 actions/userdesignsettings.php:263
+#: actions/userdesignsettings.php:218 actions/userdesignsettings.php:228
+#: actions/userdesignsettings.php:270 actions/userdesignsettings.php:280
 msgid "Unable to save your design settings."
 msgstr "Kunde inte spara dina utseendeinställningar."
 
@@ -408,7 +408,7 @@ msgstr "Kunde inte spara dina utseendeinställningar."
 #. TRANS: Client error displayed when a database error occurs updating profile colours.
 #: actions/apiaccountupdateprofilebackgroundimage.php:191
 #: actions/apiaccountupdateprofilecolors.php:139
-#: actions/userdesignsettings.php:179
+#: actions/userdesignsettings.php:196
 msgid "Could not update your design."
 msgstr "Kunde inte uppdatera din profils utseende."
 
@@ -517,7 +517,7 @@ msgstr "Mottagare hittades inte."
 #. TRANS: Client error displayed trying to direct message another user who's not a friend (403).
 #: actions/apidirectmessagenew.php:144
 #, fuzzy
-msgid "Can't send direct messages to users who aren't your friend."
+msgid "Cannot send direct messages to users who aren't your friend."
 msgstr "Kan inte skicka direktmeddelanden till användare som inte är din vän."
 
 #. TRANS: Client error displayed trying to direct message self (403).
@@ -601,9 +601,9 @@ msgstr "Kunde inte hitta målanvändare."
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:156 actions/editgroup.php:191
-#: actions/newgroup.php:137 actions/profilesettings.php:273
-#: actions/register.php:214
+#: actions/apigroupcreate.php:156 actions/apigroupprofileupdate.php:255
+#: actions/editgroup.php:191 actions/newgroup.php:137
+#: actions/profilesettings.php:274 actions/register.php:199
 msgid "Nickname already in use. Try another one."
 msgstr "Smeknamnet används redan. Försök med ett annat."
 
@@ -611,9 +611,9 @@ msgstr "Smeknamnet används redan. Försök med ett annat."
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:164 actions/editgroup.php:195
-#: actions/newgroup.php:141 actions/profilesettings.php:243
-#: actions/register.php:216
+#: actions/apigroupcreate.php:164 actions/apigroupprofileupdate.php:259
+#: actions/editgroup.php:195 actions/newgroup.php:141
+#: actions/profilesettings.php:244 actions/register.php:201
 msgid "Not a valid nickname."
 msgstr "Inte ett giltigt smeknamn."
 
@@ -623,10 +623,10 @@ msgstr "Inte ett giltigt smeknamn."
 #. TRANS: Validation error shown when providing an invalid homepage URL in the "New application" form.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:181 actions/editapplication.php:235
-#: actions/editgroup.php:202 actions/newapplication.php:221
-#: actions/newgroup.php:148 actions/profilesettings.php:248
-#: actions/register.php:223
+#: actions/apigroupcreate.php:181 actions/apigroupprofileupdate.php:277
+#: actions/editapplication.php:235 actions/editgroup.php:202
+#: actions/newapplication.php:221 actions/newgroup.php:148
+#: actions/profilesettings.php:249 actions/register.php:208
 msgid "Homepage is not a valid URL."
 msgstr "Hemsida är inte en giltig webbadress."
 
@@ -635,8 +635,8 @@ msgstr "Hemsida är inte en giltig webbadress."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:191 actions/editgroup.php:206
-#: actions/newgroup.php:152 actions/profilesettings.php:252
-#: actions/register.php:226
+#: actions/newgroup.php:152 actions/profilesettings.php:253
+#: actions/register.php:211
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "Fullständigt namn är för långt (max 255 tecken)."
 
@@ -663,8 +663,8 @@ msgstr[1] "Beskrivning är för lång (max %d tecken)."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:215 actions/editgroup.php:218
-#: actions/newgroup.php:164 actions/profilesettings.php:265
-#: actions/register.php:235
+#: actions/newgroup.php:164 actions/profilesettings.php:266
+#: actions/register.php:220
 msgid "Location is too long (maximum 255 characters)."
 msgstr "Beskrivning av plats är för lång (max 255 tecken)."
 
@@ -693,15 +693,16 @@ msgstr "Ogiltigt alias: \"%s\"."
 #. TRANS: %s is the alias that is already in use.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error. %s is the already used alias.
-#: actions/apigroupcreate.php:264 actions/editgroup.php:246
-#: actions/newgroup.php:193
+#: actions/apigroupcreate.php:264 actions/apigroupprofileupdate.php:351
+#: actions/editgroup.php:246 actions/newgroup.php:193
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "Alias \"%s\" används redan. Försök med ett annat."
 
 #. TRANS: Client error displayed when trying to use an alias during group creation that is the same as the group's nickname.
 #. TRANS: Group edit form validation error.
-#: actions/apigroupcreate.php:278 actions/editgroup.php:253
+#: actions/apigroupcreate.php:278 actions/apigroupprofileupdate.php:359
+#: actions/editgroup.php:253
 msgid "Alias can't be the same as nickname."
 msgstr "Alias kan inte vara samma som smeknamn."
 
@@ -713,7 +714,8 @@ msgstr "Alias kan inte vara samma som smeknamn."
 #. TRANS: Client error displayed requesting most recent notices to a group for a non-existing group.
 #: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
 #: actions/apigroupleave.php:104 actions/apigroupmembership.php:71
-#: actions/apigroupshow.php:81 actions/apitimelinegroup.php:89
+#: actions/apigroupprofileupdate.php:113 actions/apigroupshow.php:81
+#: actions/apitimelinegroup.php:89
 msgid "Group not found."
 msgstr "Grupp hittades inte."
 
@@ -731,13 +733,11 @@ msgstr "Du är redan en medlem i denna grupp."
 msgid "You have been blocked from that group by the admin."
 msgstr "Du har blivit blockerad från denna grupp av administratören."
 
-#. TRANS: Server error displayed when joining a group fails.
-#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
 #. 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.
 #. TRANS: Message given having failed to add a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:362
+#: actions/apigroupjoin.php:136 actions/joingroup.php:139 lib/command.php:362
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "Kunde inte ansluta användare %1$s till grupp %2$s."
@@ -747,8 +747,6 @@ msgstr "Kunde inte ansluta användare %1$s till grupp %2$s."
 msgid "You are not a member of this group."
 msgstr "Du är inte en medlem i denna grupp."
 
-#. TRANS: Server error displayed when leaving a group fails.
-#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
 #. TRANS: Server error displayed when leaving a group failed in the database.
 #. TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
 #. TRANS: Message given having failed to remove a user from a group.
@@ -784,6 +782,62 @@ msgstr "%s grupper"
 msgid "groups on %s"
 msgstr "grupper på %s"
 
+#. TRANS: Client error displayed trying to edit a group while not being a group admin.
+#. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
+#. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
+#: actions/apigroupprofileupdate.php:118 actions/editgroup.php:110
+#: actions/editgroup.php:176 actions/groupdesignsettings.php:109
+#: actions/grouplogo.php:111
+msgid "You must be an admin to edit the group."
+msgstr "Du måste vara en administratör för att redigera gruppen."
+
+#. TRANS: Server error displayed when editing a group fails.
+#: actions/apigroupprofileupdate.php:171 actions/editgroup.php:274
+msgid "Could not update group."
+msgstr "Kunde inte uppdatera grupp."
+
+#. TRANS: Server error displayed when group aliases could not be added.
+#. TRANS: Server exception thrown when creating group aliases failed.
+#: actions/apigroupprofileupdate.php:194 actions/editgroup.php:281
+#: classes/User_group.php:540
+msgid "Could not create aliases."
+msgstr "Kunde inte skapa alias."
+
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: actions/apigroupprofileupdate.php:249 lib/nickname.php:165
+msgid "Nickname must have only lowercase letters and numbers and no spaces."
+msgstr ""
+"Smeknamnet får endast innehålla små bokstäver eller siffror, inga mellanslag."
+
+#: actions/apigroupprofileupdate.php:286
+#, fuzzy
+msgid "Full name is too long (max 255 chars)."
+msgstr "Fullständigt namn är för långt (max 255 tecken)."
+
+#: actions/apigroupprofileupdate.php:296
+#, fuzzy, php-format
+msgid "description is too long (max %d chars)."
+msgstr "Beskrivning är för lång (max %d tecken)."
+
+#: actions/apigroupprofileupdate.php:307
+#, fuzzy
+msgid "Location is too long (max 255 chars)."
+msgstr "Beskrivning av plats är för lång (max 255 tecken)."
+
+#: actions/apigroupprofileupdate.php:326
+#, fuzzy, php-format
+msgid "Too many aliases! Maximum %d."
+msgstr "För många alias! Högst %d tillåtet."
+
+#. TRANS: Group edit form validation error.
+#. TRANS: Group create form validation error.
+#. TRANS: %s is the invalid alias.
+#: actions/apigroupprofileupdate.php:342 actions/editgroup.php:241
+#: actions/newgroup.php:188
+#, php-format
+msgid "Invalid alias: \"%s\""
+msgstr "Ogiltigt alias: \"%s\""
+
 #. TRANS: Client error displayed when uploading a media file has failed.
 #: actions/apimediaupload.php:101
 msgid "Upload failed."
@@ -815,21 +869,22 @@ msgstr "Begäran-token är redan auktoriserad."
 #. TRANS: Form validation error message.
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
+#. TRANS: Client error displayed when the session token is not okay.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
 #: actions/deletenotice.php:177 actions/disfavor.php:75
-#: actions/emailsettings.php:291 actions/favor.php:75 actions/geocode.php:55
+#: actions/emailsettings.php:292 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:65 actions/grouplogo.php:321
-#: actions/groupunblock.php:65 actions/imsettings.php:224
-#: actions/invite.php:60 actions/login.php:137 actions/makeadmin.php:66
-#: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
-#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
-#: actions/othersettings.php:155 actions/passwordsettings.php:138
-#: actions/profilesettings.php:217 actions/recoverpassword.php:383
-#: actions/register.php:172 actions/remotesubscribe.php:76
-#: actions/repeat.php:82 actions/smssettings.php:250 actions/subedit.php:40
-#: actions/subscribe.php:86 actions/tagother.php:166
-#: actions/unsubscribe.php:69 actions/userauthorization.php:52
-#: lib/designsettings.php:310
+#: actions/groupunblock.php:65 actions/imsettings.php:241
+#: actions/invite.php:60 actions/makeadmin.php:66 actions/newmessage.php:135
+#: actions/newnotice.php:105 actions/nudge.php:80
+#: actions/oauthappssettings.php:162 actions/oauthconnectionssettings.php:135
+#: actions/passwordsettings.php:137 actions/pluginenable.php:87
+#: actions/profilesettings.php:218 actions/recoverpassword.php:383
+#: actions/register.php:157 actions/remotesubscribe.php:76
+#: actions/repeat.php:82 actions/smssettings.php:249 actions/subedit.php:40
+#: actions/subscribe.php:87 actions/tagother.php:145
+#: actions/unsubscribe.php:69 actions/urlsettings.php:171
+#: actions/userauthorization.php:53 lib/designsettings.php:122
 msgid "There was a problem with your session token. Try again, please."
 msgstr "Det var ett problem med din sessions-token. Var vänlig försök igen."
 
@@ -858,10 +913,10 @@ msgstr "Databasfel vid infogning av OAuth-applikationsanvändare."
 #. TRANS: Unknown form validation error in design settings form.
 #: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
 #: actions/designadminpanel.php:100 actions/editapplication.php:144
-#: actions/emailsettings.php:310 actions/grouplogo.php:332
-#: actions/imsettings.php:239 actions/newapplication.php:124
-#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
-#: actions/smssettings.php:271 lib/designsettings.php:321
+#: actions/emailsettings.php:311 actions/grouplogo.php:332
+#: actions/imsettings.php:256 actions/newapplication.php:124
+#: actions/oauthconnectionssettings.php:144 actions/recoverpassword.php:46
+#: actions/smssettings.php:270 lib/designsettings.php:133
 msgid "Unexpected form submission."
 msgstr "Oväntat inskick av formulär."
 
@@ -910,31 +965,26 @@ msgstr "Konto"
 
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Field label in form for profile settings.
-#. TRANS: Label for group nickname (dt). Text hidden by default.
-#. TRANS: DT for nick name in a profile.
-#: actions/apioauthauthorize.php:459 actions/login.php:252
-#: actions/profilesettings.php:106 actions/register.php:432
-#: actions/showgroup.php:243 actions/tagother.php:94
+#: actions/apioauthauthorize.php:459 actions/login.php:225
+#: actions/profilesettings.php:107 actions/register.php:411
 #: actions/userauthorization.php:145 lib/groupeditform.php:145
-#: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "Smeknamn"
 
 #. TRANS: Field label on OAuth API authorisation form.
-#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:463 actions/login.php:255
-#: actions/register.php:436 lib/accountsettingsaction.php:120
+#: actions/apioauthauthorize.php:463 actions/login.php:228
+#: actions/register.php:415 lib/settingsnav.php:87
 msgid "Password"
 msgstr "Lösenord"
 
 #. TRANS: Button text that when clicked will cancel the process of allowing access to an account
 #. TRANS: by an external application.
 #. TRANS: Button label to cancel an e-mail address confirmation procedure.
-#. TRANS: Button label to cancel an Instant Messaging address confirmation procedure.
+#. TRANS: Button label to cancel an IM address confirmation procedure.
 #. TRANS: Button label to cancel a SMS address confirmation procedure.
 #. TRANS: Button label in the "Edit application" form.
-#: actions/apioauthauthorize.php:478 actions/emailsettings.php:124
-#: actions/imsettings.php:127 actions/smssettings.php:133
+#: actions/apioauthauthorize.php:478 actions/emailsettings.php:125
+#: actions/imsettings.php:136 actions/smssettings.php:132
 #: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Cancel"
@@ -1046,7 +1096,7 @@ msgstr "API-metod hittades inte."
 #. TRANS: %s is the requested output format.
 #: actions/apistatusesshow.php:144
 #, fuzzy, php-format
-msgid "Unsupported format: %s"
+msgid "Unsupported format: %s."
 msgstr "Format som inte stödjs."
 
 #. TRANS: Client error displayed requesting a deleted status.
@@ -1128,13 +1178,6 @@ msgstr "%1$s / Favoriter från %2$s"
 msgid "%1$s updates favorited by %2$s / %3$s."
 msgstr "%1$s uppdateringar markerade som favorit av %2$s / %2$s."
 
-#. TRANS: Server error displayed when generating an Atom feed fails.
-#. TRANS: %s is the error.
-#: actions/apitimelinegroup.php:134
-#, php-format
-msgid "Could not generate feed for group - %s"
-msgstr "Kunde inte generera flöde för grupp - %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.
 #: actions/apitimelinementions.php:115
@@ -1151,13 +1194,14 @@ msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr "%1$s uppdateringar med svar på uppdatering från %2$s / %3$s."
 
 #. TRANS: Title for site timeline. %s is the StatusNet sitename.
+#. TRANS: Public RSS feed title. %s is the StatusNet site name.
 #: actions/apitimelinepublic.php:193 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "%s publika tidslinje"
 
 #. TRANS: Subtitle for site timeline. %s is the StatusNet sitename.
-#: actions/apitimelinepublic.php:199 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:199
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "%s uppdateringar från alla!"
@@ -1168,21 +1212,33 @@ msgid "Unimplemented."
 msgstr "Inte implementerad."
 
 #. TRANS: Title for Atom feed "repeated to me". %s is the user nickname.
-#: actions/apitimelineretweetedtome.php:108
+#: actions/apitimelineretweetedtome.php:96
 #, php-format
 msgid "Repeated to %s"
 msgstr "Upprepat till %s"
 
+#: actions/apitimelineretweetedtome.php:98
+#, fuzzy, php-format
+msgid "%1$s notices that were to repeated to %2$s / %3$s."
+msgstr "%1$s uppdateringar med svar på uppdatering från %2$s / %3$s."
+
 #. TRANS: Title of list of repeated notices of the logged in user.
 #. TRANS: %s is the nickname of the logged in user.
-#: actions/apitimelineretweetsofme.php:112
+#: actions/apitimelineretweetsofme.php:98
 #, php-format
 msgid "Repeats of %s"
 msgstr "Upprepningar av %s"
 
+#: actions/apitimelineretweetsofme.php:104
+#, fuzzy, php-format
+msgid "%1$s notices that %2$s / %3$s has repeated."
+msgstr "%s (@%s) lade till din notis som en favorit"
+
 #. TRANS: Title for timeline with lastest notices with a given tag.
 #. TRANS: %s is the tag.
-#: actions/apitimelinetag.php:101 actions/tag.php:67
+#. TRANS: Title for first page of notices with tags.
+#. TRANS: %s is the tag.
+#: actions/apitimelinetag.php:101 actions/tag.php:69
 #, php-format
 msgid "Notices tagged with %s"
 msgstr "Notiser taggade med %s"
@@ -1195,54 +1251,55 @@ msgid "Updates tagged with %1$s on %2$s!"
 msgstr "Uppdateringar taggade med %1$s på %2$s!"
 
 #. TRANS: Client error displayed trying to add a notice to another user's timeline.
-#: actions/apitimelineuser.php:297
+#: actions/apitimelineuser.php:308
 #, fuzzy
 msgid "Only the user can add to their own timeline."
 msgstr "Bara användaren kan läsa sina egna brevlådor."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:304
+#: actions/apitimelineuser.php:315
 msgid "Only accept AtomPub for Atom feeds."
 msgstr ""
 
 #. TRANS: Client error displayed attempting to post an empty API notice.
-#: actions/apitimelineuser.php:311
+#: actions/apitimelineuser.php:322
 msgid "Atom post must not be empty."
 msgstr ""
 
 #. TRANS: Client error displayed attempting to post an API that is not well-formed XML.
-#: actions/apitimelineuser.php:317
+#: actions/apitimelineuser.php:328
 msgid "Atom post must be well-formed XML."
 msgstr ""
 
 #. TRANS: Client error displayed when not using an Atom entry.
-#: actions/apitimelineuser.php:323 actions/atompubfavoritefeed.php:228
+#: actions/apitimelineuser.php:334 actions/atompubfavoritefeed.php:228
 #: actions/atompubmembershipfeed.php:230
 #: actions/atompubsubscriptionfeed.php:236
 msgid "Atom post must be an Atom entry."
 msgstr ""
 
 #. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
-#: actions/apitimelineuser.php:335
+#: actions/apitimelineuser.php:345
 msgid "Can only handle POST activities."
 msgstr ""
 
 #. TRANS: Client error displayed when using an unsupported activity object type.
 #. TRANS: %s is the unsupported activity object type.
-#: actions/apitimelineuser.php:346
+#: actions/apitimelineuser.php:356
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
 #. TRANS: %d is the notice ID (number).
-#: actions/apitimelineuser.php:380
+#: actions/apitimelineuser.php:390
 #, fuzzy, php-format
 msgid "No content for notice %d."
 msgstr "Hitta innehåll i notiser"
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:408
+#. TRANS: %s is the notice URI.
+#: actions/apitimelineuser.php:419
 #, fuzzy, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "Notis med den ID:n finns inte."
@@ -1259,9 +1316,10 @@ msgstr "API-metod hittades inte."
 
 #. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
 #. TRANS: Client exception.
+#. TRANS: Client error displayed trying to subscribe to a non-existing profile.
 #: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
 #: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
-#: actions/subscribe.php:107
+#: actions/subscribe.php:110
 msgid "No such profile."
 msgstr "Ingen sådan profil."
 
@@ -1408,7 +1466,7 @@ msgid "Not a member."
 msgstr "Alla medlemmar"
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
-#: actions/atompubshowmembership.php:151
+#: actions/atompubshowmembership.php:150
 #, fuzzy
 msgid "Cannot delete someone else's membership."
 msgstr "Kunde inte spara prenumeration."
@@ -1497,10 +1555,7 @@ msgid "Invalid size."
 msgstr "Ogiltig storlek."
 
 #. TRANS: Title for avatar upload page.
-#. TRANS: Label for group avatar (dt). Text hidden by default.
-#. TRANS: Link description in user account settings menu.
-#: actions/avatarsettings.php:66 actions/showgroup.php:227
-#: lib/accountsettingsaction.php:113
+#: actions/avatarsettings.php:66 lib/settingsnav.php:82
 msgid "Avatar"
 msgstr "Avatar"
 
@@ -1514,9 +1569,11 @@ msgstr ""
 
 #. TRANS: Server error displayed in avatar upload page when no matching profile can be found for a user.
 #. TRANS: Server error displayed coming across a request from a user without a profile.
+#. TRANS: Server error displayed when trying to authorise a remote subscription request
+#. TRANS: while the user has no profile.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
 #: actions/grouplogo.php:184 actions/remotesubscribe.php:190
-#: actions/userauthorization.php:72 actions/userrss.php:108
+#: actions/userauthorization.php:75 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr "Användare utan matchande profil."
 
@@ -1571,10 +1628,10 @@ msgstr "Beskär"
 msgid "No file uploaded."
 msgstr "Ingen fil laddades upp."
 
-#. TRANS: Avatar upload form unstruction after uploading a file.
+#. TRANS: Avatar upload form instruction after uploading a file.
 #: actions/avatarsettings.php:345
 #, fuzzy
-msgid "Pick a square area of the image to be your avatar"
+msgid "Pick a square area of the image to be your avatar."
 msgstr "Välj ett kvadratiskt område i bilden som din avatar"
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
@@ -1600,7 +1657,7 @@ msgstr "Avatar borttagen."
 
 #. TRANS: Title for backup account page.
 #. TRANS: Option in profile settings to create a backup of the account of the currently logged in user.
-#: actions/backupaccount.php:61 actions/profilesettings.php:467
+#: actions/backupaccount.php:61 actions/profilesettings.php:468
 msgid "Backup account"
 msgstr ""
 
@@ -1634,7 +1691,7 @@ msgstr "Bakgrund"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
 #: actions/backupaccount.php:254
-msgid "Backup your account"
+msgid "Backup your account."
 msgstr ""
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
@@ -1676,7 +1733,7 @@ msgstr "Nej"
 #. TRANS: Submit button title for 'No' when blocking a user.
 #: actions/block.php:158
 #, fuzzy
-msgid "Do not block this user"
+msgid "Do not block this user."
 msgstr "Blockera inte denna användare"
 
 #. TRANS: Button label on the user block form.
@@ -1693,9 +1750,9 @@ msgid "Yes"
 msgstr "Ja"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#. TRANS: Description of the form to block a user.
-#: actions/block.php:165 lib/blockform.php:79
-msgid "Block this user"
+#: actions/block.php:165
+#, fuzzy
+msgid "Block this user."
 msgstr "Blockera denna användare"
 
 #. TRANS: Server error displayed when blocking a user fails.
@@ -1762,31 +1819,47 @@ msgstr "Bekräftelsekod kunde inte hittas."
 msgid "That confirmation code is not for you!"
 msgstr "Denna bekräftelsekod är inte för dig!"
 
-#. TRANS: Server error for a unknow address type %s, which can be 'email', 'jabber', or 'sms'.
-#: actions/confirmaddress.php:92
-#, php-format
-msgid "Unrecognized address type %s."
+#. TRANS: Server error for an unknown address type, which can be 'email', 'sms', or the name of an IM network (such as 'xmpp' or 'aim')
+#: actions/confirmaddress.php:94
+#, fuzzy, php-format
+msgid "Unrecognized address type %s"
 msgstr "Adresstypen %s känns inte igen."
 
 #. TRANS: Client error for an already confirmed email/jabber/sms address.
-#: actions/confirmaddress.php:97
+#: actions/confirmaddress.php:103 actions/confirmaddress.php:136
 msgid "That address has already been confirmed."
 msgstr "Denna adress har redan blivit bekräftad."
 
+#: actions/confirmaddress.php:121 actions/imsettings.php:444
+#: actions/userdesignsettings.php:306
+#, fuzzy
+msgid "Couldn't update user."
+msgstr "Kunde inte uppdatera användare."
+
+#: actions/confirmaddress.php:144
+#, fuzzy
+msgid "Couldn't update user im preferences."
+msgstr "Kunde inte uppdatera användaruppgift."
+
+#: actions/confirmaddress.php:156
+#, fuzzy
+msgid "Couldn't insert user im preferences."
+msgstr "Kunde inte infoga ny prenumeration."
+
 #. TRANS: Server error displayed when an address confirmation code deletion from the
 #. TRANS: database fails in the contact address confirmation action.
-#: actions/confirmaddress.php:132
+#: actions/confirmaddress.php:169
 msgid "Could not delete address confirmation."
 msgstr "Kunde inte ta bort adressbekräftelse."
 
 #. TRANS: Title for the contact address confirmation action.
-#: actions/confirmaddress.php:150
+#: actions/confirmaddress.php:185
 msgid "Confirm address"
 msgstr "Bekräfta adress"
 
 #. TRANS: Success message for the contact address confirmation action.
 #. TRANS: %s can be 'email', 'jabber', or 'sms'.
-#: actions/confirmaddress.php:166
+#: actions/confirmaddress.php:200
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "Adressen \"%s\" har blivit bekräftad för ditt konto."
@@ -1800,6 +1873,7 @@ msgstr "Konversationer"
 #. TRANS: Label for user statistics.
 #: actions/conversation.php:149 lib/noticelist.php:87
 #: lib/profileaction.php:246 lib/searchgroupnav.php:82
+#: lib/threadednoticelist.php:66
 msgid "Notices"
 msgstr "Notiser"
 
@@ -1835,7 +1909,7 @@ msgstr "Avatar borttagen."
 
 #. TRANS: Page title for page on which a user account can be deleted.
 #. TRANS: Option in profile settings to delete the account of the currently logged in user.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:475
+#: actions/deleteaccount.php:228 actions/profilesettings.php:476
 #, fuzzy
 msgid "Delete account"
 msgstr "Skapa ett konto"
@@ -1859,7 +1933,7 @@ msgstr ""
 #. TRANS: Field label for delete account confirmation entry.
 #. TRANS: Field label for password reset form where the password has to be typed again.
 #: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:262 actions/register.php:440
+#: actions/recoverpassword.php:262 actions/register.php:419
 msgid "Confirm"
 msgstr "Bekräfta"
 
@@ -1889,14 +1963,14 @@ msgstr "Applikation hittades inte."
 #. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
 #: actions/deleteapplication.php:79 actions/editapplication.php:78
-#: actions/showapplication.php:94
+#: actions/showapplication.php:90
 msgid "You are not the owner of this application."
 msgstr "Du är inte ägaren av denna applikation."
 
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
-#: actions/newapplication.php:112 actions/showapplication.php:118
-#: lib/action.php:1425
+#: actions/newapplication.php:112 actions/showapplication.php:113
+#: lib/action.php:1391
 msgid "There was a problem with your session token."
 msgstr "Det var ett problem med din sessions-token."
 
@@ -1920,13 +1994,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting an application.
 #: actions/deleteapplication.php:161
 #, fuzzy
-msgid "Do not delete this application"
+msgid "Do not delete this application."
 msgstr "Ta inte bort denna applikation"
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
 #: actions/deleteapplication.php:167
 #, fuzzy
-msgid "Delete this application"
+msgid "Delete this application."
 msgstr "Ta bort denna applikation"
 
 #. TRANS: Client error when trying to delete group while not logged in.
@@ -1981,13 +2055,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting a group.
 #: actions/deletegroup.php:224
 #, fuzzy
-msgid "Do not delete this group"
+msgid "Do not delete this group."
 msgstr "Ta inte bort denna grupp"
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
 #: actions/deletegroup.php:231
 #, fuzzy
-msgid "Delete this group"
+msgid "Delete this group."
 msgstr "Ta bort denna grupp"
 
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
@@ -1995,14 +2069,16 @@ msgstr "Ta bort denna grupp"
 #. TRANS: Client error displayed when trying to mark a notice as favorite without being logged in.
 #. TRANS: Client error displayed trying to block a user from a group while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
+#. TRANS: Client error displayed trying to log out when not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
+#. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
 #. TRANS: Client error displayed when trying to change user options while not logged in.
 #: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
-#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:69
+#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:70
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
-#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
-#: actions/tagother.php:33 actions/unsubscribe.php:52
+#: actions/nudge.php:63 actions/pluginenable.php:97 actions/subedit.php:33
+#: actions/subscribe.php:98 actions/tagother.php:33 actions/unsubscribe.php:52
 #: lib/adminpanelaction.php:71 lib/profileformaction.php:63
 #: lib/settingsaction.php:72
 msgid "Not logged in."
@@ -2031,12 +2107,13 @@ msgstr "Är du säker på att du vill ta bort denna notis?"
 #. TRANS: Submit button title for 'No' when deleting a notice.
 #: actions/deletenotice.php:159
 #, fuzzy
-msgid "Do not delete this notice"
+msgid "Do not delete this notice."
 msgstr "Ta inte bort denna notis"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:166 lib/noticelist.php:673
-msgid "Delete this notice"
+#: actions/deletenotice.php:166
+#, fuzzy
+msgid "Delete this notice."
 msgstr "Ta bort denna notis"
 
 #. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
@@ -2073,18 +2150,17 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting a user.
 #: actions/deleteuser.php:158
 #, fuzzy
-msgid "Do not delete this user"
+msgid "Do not delete this user."
 msgstr "Ta inte bort denna grupp"
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
-#. TRANS: Description of form for deleting a user.
-#: actions/deleteuser.php:165 lib/deleteuserform.php:75
-msgid "Delete this user"
+#: actions/deleteuser.php:165
+#, fuzzy
+msgid "Delete this user."
 msgstr "Ta bort denna användare"
 
 #. TRANS: Message used as title for design settings for the site.
-#. TRANS: Link description in user account settings menu.
-#: actions/designadminpanel.php:60 lib/accountsettingsaction.php:134
+#: actions/designadminpanel.php:60 lib/settingsnav.php:97
 msgid "Design"
 msgstr "Utseende"
 
@@ -2151,8 +2227,7 @@ msgid "You can upload a custom StatusNet theme as a .ZIP archive."
 msgstr "Du kan ladda upp ett eget StatusNet-tema som ett .ZIP-arkiv."
 
 #. TRANS: Fieldset legend for theme background image.
-#. TRANS: Fieldset legend on profile design page.
-#: actions/designadminpanel.php:515 lib/designsettings.php:98
+#: actions/designadminpanel.php:515
 msgid "Change background image"
 msgstr "Ändra bakgrundsbild"
 
@@ -2160,7 +2235,7 @@ msgstr "Ändra bakgrundsbild"
 #. TRANS: Field label for background color selector.
 #. TRANS: Label on profile design page for setting a profile page background colour.
 #: actions/designadminpanel.php:525 actions/designadminpanel.php:609
-#: lib/designsettings.php:183
+#: lib/designform.php:238
 msgid "Background"
 msgstr "Bakgrund"
 
@@ -2187,13 +2262,13 @@ msgstr "Av"
 #. TRANS: Form guide for turning background image on or off on theme designer page.
 #. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
 #. TRANS: use of the uploaded profile image.
-#: actions/designadminpanel.php:577 lib/designsettings.php:159
+#: actions/designadminpanel.php:577 lib/designform.php:214
 msgid "Turn background image on or off."
 msgstr "Sätt på eller stäng av bakgrundsbild."
 
 #. TRANS: Checkbox label to title background image on theme designer page.
 #. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-#: actions/designadminpanel.php:583 lib/designsettings.php:165
+#: actions/designadminpanel.php:583 lib/designform.php:220
 msgid "Tile background image"
 msgstr "Upprepa bakgrundsbild"
 
@@ -2205,25 +2280,25 @@ msgstr "Byt färger"
 
 #. TRANS: Field label for content color selector.
 #. TRANS: Label on profile design page for setting a profile page content colour.
-#: actions/designadminpanel.php:623 lib/designsettings.php:197
+#: actions/designadminpanel.php:623 lib/designform.php:252
 msgid "Content"
 msgstr "Innehåll"
 
 #. TRANS: Field label for sidebar color selector.
 #. TRANS: Label on profile design page for setting a profile page sidebar colour.
-#: actions/designadminpanel.php:637 lib/designsettings.php:211
+#: actions/designadminpanel.php:637 lib/designform.php:266
 msgid "Sidebar"
 msgstr "Sidofält"
 
 #. TRANS: Field label for text color selector.
 #. TRANS: Label on profile design page for setting a profile page text colour.
-#: actions/designadminpanel.php:651 lib/designsettings.php:225
+#: actions/designadminpanel.php:651 lib/designform.php:280
 msgid "Text"
 msgstr "Text"
 
 #. TRANS: Field label for link color selector.
 #. TRANS: Label on profile design page for setting a profile page links colour.
-#: actions/designadminpanel.php:665 lib/designsettings.php:239
+#: actions/designadminpanel.php:665 lib/designform.php:294
 msgid "Links"
 msgstr "Länkar"
 
@@ -2245,21 +2320,21 @@ msgid "Use defaults"
 msgstr "Använd standardvärden"
 
 #. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: actions/designadminpanel.php:720 lib/designsettings.php:259
-msgid "Restore default designs"
+#: actions/designadminpanel.php:720
+#, fuzzy
+msgid "Restore default designs."
 msgstr "Återställ standardutseende"
 
 #. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: actions/designadminpanel.php:728 lib/designsettings.php:267
-msgid "Reset back to default"
+#: actions/designadminpanel.php:728
+#, fuzzy
+msgid "Reset back to default."
 msgstr "Återställ till standardvärde"
 
 #. TRANS: Title for button for saving theme settings.
-#. TRANS: Title for button on profile design page to save settings.
-#: actions/designadminpanel.php:736 lib/designsettings.php:272
-msgid "Save design"
+#: actions/designadminpanel.php:736
+#, fuzzy
+msgid "Save design."
 msgstr "Spara utseende"
 
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
@@ -2291,7 +2366,7 @@ msgid "You must be logged in to edit an application."
 msgstr "Du måste vara inloggad för att redigera en applikation."
 
 #. TRANS: Client error displayed trying to edit an application that does not exist.
-#: actions/editapplication.php:83 actions/showapplication.php:87
+#: actions/editapplication.php:83 actions/showapplication.php:83
 msgid "No such application."
 msgstr "Ingen sådan applikation."
 
@@ -2382,80 +2457,53 @@ msgstr "Redigera %s grupp"
 msgid "You must be logged in to create a group."
 msgstr "Du måste vara inloggad för att skapa en grupp."
 
-#. TRANS: Client error displayed trying to edit a group while not being a group admin.
-#. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
-#. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
-#: actions/editgroup.php:110 actions/editgroup.php:176
-#: actions/groupdesignsettings.php:109 actions/grouplogo.php:111
-msgid "You must be an admin to edit the group."
-msgstr "Du måste vara en administratör för att redigera gruppen."
-
 #. TRANS: Form instructions for group edit form.
 #: actions/editgroup.php:161
 msgid "Use this form to edit the group."
 msgstr "Använd detta formulär för att redigera gruppen."
 
-#. TRANS: Group edit form validation error.
-#. TRANS: Group create form validation error.
-#. TRANS: %s is the invalid alias.
-#: actions/editgroup.php:241 actions/newgroup.php:188
-#, php-format
-msgid "Invalid alias: \"%s\""
-msgstr "Ogiltigt alias: \"%s\""
-
-#. TRANS: Server error displayed when editing a group fails.
-#: actions/editgroup.php:274
-msgid "Could not update group."
-msgstr "Kunde inte uppdatera grupp."
-
-#. TRANS: Server error displayed when group aliases could not be added.
-#. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/editgroup.php:281 classes/User_group.php:540
-msgid "Could not create aliases."
-msgstr "Kunde inte skapa alias."
-
 #. TRANS: Group edit form success message.
 #: actions/editgroup.php:301
 msgid "Options saved."
 msgstr "Alternativ sparade."
 
 #. TRANS: Title for e-mail settings.
-#: actions/emailsettings.php:59
+#: actions/emailsettings.php:60
 msgid "Email settings"
 msgstr "E-postinställningar"
 
 #. TRANS: E-mail settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/emailsettings.php:73
+#: actions/emailsettings.php:74
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 msgstr "Hantera hur du får e-post från %%site.name%%"
 
 #. TRANS: Form legend for e-mail settings form.
 #. TRANS: Field label for e-mail address input in e-mail settings form.
-#: actions/emailsettings.php:103 actions/emailsettings.php:129
+#: actions/emailsettings.php:104 actions/emailsettings.php:130
 msgid "Email address"
 msgstr "E-postadress"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:109
+#: actions/emailsettings.php:110
 msgid "Current confirmed email address."
 msgstr "Aktuell, bekräftad e-postadress."
 
 #. TRANS: Button label to remove a confirmed e-mail address.
 #. TRANS: Button label for removing a set sender e-mail address to post notices from.
-#. TRANS: Button label to remove a confirmed Instant Messaging address.
+#. TRANS: Button label to remove a confirmed IM address.
 #. TRANS: Button label to remove a confirmed SMS address.
 #. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
-#: actions/emailsettings.php:112 actions/emailsettings.php:179
-#: actions/imsettings.php:112 actions/smssettings.php:120
-#: actions/smssettings.php:176
+#: actions/emailsettings.php:113 actions/emailsettings.php:180
+#: actions/imsettings.php:119 actions/smssettings.php:119
+#: actions/smssettings.php:175
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Ta bort"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:119
+#: actions/emailsettings.php:120
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -2468,45 +2516,45 @@ msgstr ""
 #. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
 #. TRANS: Any other domain may be owned by a legitimate person or
 #. TRANS: organization.
-#: actions/emailsettings.php:136
+#: actions/emailsettings.php:137
 msgid "Email address, like \"UserName@example.org\""
 msgstr "E-postadress, såsom \"användarnamn@example.org\""
 
 #. TRANS: Button label for adding an e-mail address in e-mail settings form.
-#. TRANS: Button label for adding an Instant Messaging address in Instant Messaging settings form.
+#. TRANS: Button label for adding an IM address in IM settings form.
 #. TRANS: Button label for adding a SMS phone number in SMS settings form.
-#: actions/emailsettings.php:140 actions/imsettings.php:147
-#: actions/smssettings.php:158
+#: actions/emailsettings.php:141 actions/imsettings.php:147
+#: actions/smssettings.php:157
 msgctxt "BUTTON"
 msgid "Add"
 msgstr "Lägg till"
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:148 actions/smssettings.php:167
+#: actions/emailsettings.php:149 actions/smssettings.php:166
 msgid "Incoming email"
 msgstr "Inkommande e-post"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:154
+#: actions/emailsettings.php:155
 msgid "I want to post notices by email."
 msgstr "Jag vill posta notiser genom min e-post."
 
 #. TRANS: Form instructions for incoming e-mail form in e-mail settings.
 #. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
-#: actions/emailsettings.php:176 actions/smssettings.php:174
+#: actions/emailsettings.php:177 actions/smssettings.php:173
 msgid "Send email to this address to post new notices."
 msgstr "Skicka e-post till denna adress för att posta nya notiser."
 
 #. TRANS: Instructions for incoming e-mail address input form, when an address has already been assigned.
 #. TRANS: Instructions for incoming SMS e-mail address input form.
-#: actions/emailsettings.php:185 actions/smssettings.php:182
+#: actions/emailsettings.php:186 actions/smssettings.php:181
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr ""
 "Ange en ny e-postadress för att posta till; detta inaktiverar den gamla."
 
 #. TRANS: Instructions for incoming e-mail address input form.
-#: actions/emailsettings.php:189
+#: actions/emailsettings.php:190
 msgid ""
 "To send notices via email, we need to create a unique email address for you "
 "on this server:"
@@ -2514,89 +2562,89 @@ msgstr ""
 
 #. TRANS: Button label for adding an e-mail address to send notices from.
 #. TRANS: Button label for adding an SMS e-mail address to send notices from.
-#: actions/emailsettings.php:195 actions/smssettings.php:185
+#: actions/emailsettings.php:196 actions/smssettings.php:184
 msgctxt "BUTTON"
 msgid "New"
 msgstr "Ny"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:204
+#: actions/emailsettings.php:205
 msgid "Email preferences"
 msgstr "E-postinställningar"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:212
+#: actions/emailsettings.php:213
 msgid "Send me notices of new subscriptions through email."
 msgstr "Skicka notiser om nya prenumerationer till mig genom e-post."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:218
+#: actions/emailsettings.php:219
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr "Skicka mig e-post när någon lägger till min notis som en favorit."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:225
+#: actions/emailsettings.php:226
 msgid "Send me email when someone sends me a private message."
 msgstr "Skicka mig e-post när någon skickar mig ett privat meddelande."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:231
+#: actions/emailsettings.php:232
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr "Skicka mig e-post när någon skickar ett \"@-svar\"."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:237
+#: actions/emailsettings.php:238
 msgid "Allow friends to nudge me and send me an email."
 msgstr "Tillåt vänner att knuffa mig och skicka e-post till mig."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:243
+#: actions/emailsettings.php:244
 msgid "Publish a MicroID for my email address."
 msgstr "Publicera ett MicroID för min e-postadress."
 
 #. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:361
+#: actions/emailsettings.php:362
 msgid "Email preferences saved."
 msgstr "E-postinställningar sparade."
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:380
+#: actions/emailsettings.php:381
 msgid "No email address."
 msgstr "Ingen e-postadress."
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:388
+#: actions/emailsettings.php:389
 #, fuzzy
 msgid "Cannot normalize that email address."
 msgstr "Kan inte normalisera den e-postadressen"
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:393 actions/register.php:212
+#: actions/emailsettings.php:394 actions/register.php:197
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "Inte en giltig e-postadress."
 
 #. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:397
+#: actions/emailsettings.php:398
 msgid "That is already your email address."
 msgstr "Det är redan din e-postadress."
 
 #. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:401
+#: actions/emailsettings.php:402
 msgid "That email address already belongs to another user."
 msgstr "Den e-postadressen tillhör redan en annan användare."
 
 #. TRANS: Server error thrown on database error adding e-mail confirmation code.
 #. TRANS: Server error thrown on database error adding Instant Messaging confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:418 actions/imsettings.php:343
-#: actions/smssettings.php:365
+#: actions/emailsettings.php:419 actions/imsettings.php:362
+#: actions/smssettings.php:364
 #, fuzzy
 msgid "Could not insert confirmation code."
 msgstr "Kunde inte infoga bekräftelsekod."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:425
+#: actions/emailsettings.php:426
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
@@ -2608,59 +2656,62 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling Instant Messaging address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:445 actions/imsettings.php:377
-#: actions/smssettings.php:399
+#: actions/emailsettings.php:446 actions/imsettings.php:391
+#: actions/smssettings.php:398
 msgid "No pending confirmation to cancel."
 msgstr "Ingen väntande bekräftelse att avbryta."
 
 #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:450
+#: actions/emailsettings.php:451
 msgid "That is the wrong email address."
 msgstr "Detta är fel e-postadress."
 
 #. TRANS: Server error thrown on database error canceling e-mail address confirmation.
 #. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
-#: actions/emailsettings.php:459 actions/smssettings.php:413
+#: actions/emailsettings.php:460 actions/smssettings.php:412
 #, fuzzy
 msgid "Could not delete email confirmation."
 msgstr "Kunde inte ta bort e-postbekräftelse."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:464
+#: actions/emailsettings.php:465
 msgid "Email confirmation cancelled."
 msgstr "E-postbekräftelse avbruten."
 
 #. TRANS: Message given trying to remove an e-mail address that is not
 #. TRANS: registered for the active user.
-#: actions/emailsettings.php:483
+#: actions/emailsettings.php:484
 msgid "That is not your email address."
 msgstr "Det är inte din e-postadress."
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:504
+#: actions/emailsettings.php:505
 msgid "The email address was removed."
 msgstr "E-postadressen togs bort."
 
 #. TRANS: Form validation error displayed when trying to remove an incoming e-mail address while no address has been set.
-#: actions/emailsettings.php:518 actions/smssettings.php:555
+#: actions/emailsettings.php:519 actions/smssettings.php:554
 msgid "No incoming email address."
 msgstr "Ingen inkommande e-postadress."
 
 #. TRANS: Server error thrown on database error removing incoming e-mail address.
 #. TRANS: Server error thrown on database error adding incoming e-mail address.
-#: actions/emailsettings.php:530 actions/emailsettings.php:554
-#: actions/smssettings.php:565 actions/smssettings.php:588
+#. TRANS: Server error displayed when the user could not be updated in SMS settings.
+#: actions/emailsettings.php:531 actions/emailsettings.php:555
+#: actions/smssettings.php:565 actions/smssettings.php:590
 #, fuzzy
 msgid "Could not update user record."
 msgstr "Kunde inte uppdatera användaruppgift."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:534 actions/smssettings.php:568
+#. TRANS: Confirmation text after updating SMS settings.
+#: actions/emailsettings.php:535 actions/smssettings.php:569
 msgid "Incoming email address removed."
 msgstr "Inkommande e-postadress borttagen."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:558 actions/smssettings.php:591
+#. TRANS: Confirmation text after updating SMS settings.
+#: actions/emailsettings.php:559 actions/smssettings.php:594
 msgid "New incoming email address added."
 msgstr "Ny inkommande e-postadress tillagd."
 
@@ -2672,7 +2723,7 @@ msgstr "Denna notis är redan en favorit!"
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
 #: actions/favor.php:95
 #, fuzzy
-msgid "Disfavor favorite"
+msgid "Disfavor favorite."
 msgstr "Ta bort märkning som favorit"
 
 #. TRANS: Page title for first page of favorited notices.
@@ -2725,9 +2776,8 @@ msgstr ""
 #. TRANS: %s is a user's nickname.
 #. TRANS: Title for first page of favourite notices of a user.
 #. TRANS: %s is the user for whom the favourite notices are displayed.
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing own favourited notices.
 #: actions/favoritesrss.php:111 actions/showfavorites.php:76
-#: lib/personalgroupnav.php:122
+#: lib/personalgroupnav.php:110
 #, php-format
 msgid "%s's favorite notices"
 msgstr "%ss favoritnotiser"
@@ -2914,13 +2964,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
 #: actions/groupblock.php:191
 #, fuzzy
-msgid "Do not block this user from this group"
+msgid "Do not block this user from this group."
 msgstr "Blockera inte denna användare från denna grupp"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
 #: actions/groupblock.php:198
 #, fuzzy
-msgid "Block this user from this group"
+msgid "Block this user from this group."
 msgstr "Blockera denna användare från denna grupp"
 
 #. TRANS: Server error displayed when trying to block a user from a group fails because of an application error.
@@ -2929,6 +2979,7 @@ msgid "Database error blocking user from group."
 msgstr "Databasfel vid blockering av användare från grupp."
 
 #. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
+#. TRANS: Client error displayed trying to find a user by ID without providing an ID.
 #: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr "Ingen ID."
@@ -2958,7 +3009,7 @@ msgid "Unable to update your design settings."
 msgstr "Kunde inte spara dina utseendeinställningar."
 
 #. TRANS: Form text to confirm saved group design settings.
-#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:222
+#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:239
 msgid "Design preferences saved."
 msgstr "Utseendeinställningar sparade."
 
@@ -3023,7 +3074,7 @@ msgid "A list of the users in this group."
 msgstr "En lista av användarna i denna grupp."
 
 #. TRANS: Indicator in group members list that this user is a group administrator.
-#: actions/groupmembers.php:190
+#: actions/groupmembers.php:190 lib/action.php:581
 msgid "Admin"
 msgstr "Administratör"
 
@@ -3116,8 +3167,10 @@ msgid "Group search"
 msgstr "Gruppsökning"
 
 #. TRANS: Text on page where groups can be searched if no results were found for a query.
-#: actions/groupsearch.php:82 actions/noticesearch.php:117
-#: actions/peoplesearch.php:83
+#. TRANS: Text for notice search results is the query had no results.
+#. TRANS: Message on the "People search" page where a query has no results.
+#: actions/groupsearch.php:82 actions/noticesearch.php:122
+#: actions/peoplesearch.php:87
 msgid "No results."
 msgstr "Inga resultat."
 
@@ -3154,167 +3207,170 @@ msgid "User is not blocked from group."
 msgstr "Användare är inte blockerad från grupp."
 
 #. TRANS: Server error displayed when unblocking a user from a group fails because of an unknown error.
+#. TRANS: Server error displayed when removing a user block.
 #: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "Fel vid hävning av blockering."
 
 #. TRANS: Title for Instant Messaging settings.
-#: actions/imsettings.php:58
+#: actions/imsettings.php:56
 msgid "IM settings"
 msgstr "Inställningar för snabbmeddelanden"
 
 #. 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.
-#: actions/imsettings.php:71
+#: actions/imsettings.php:69
 #, fuzzy, php-format
 msgid ""
-"You can send and receive notices through Jabber/Google Talk [instant "
-"messages](%%doc.im%%). Configure your address and settings below."
+"You can send and receive notices through instant messaging [instant messages]"
+"(%%doc.im%%). Configure your addresses and settings below."
 msgstr ""
 "Du kan skicka och ta emot notiser genom Jabber/GTalk-[snabbmeddelanden](%%"
 "doc.im%%). Konfigurera din adress och dina inställningar nedan."
 
-#. TRANS: Message given in the Instant Messaging settings if XMPP is not enabled on the site.
+#. TRANS: Message given in the IM settings if IM is not enabled on the site.
 #: actions/imsettings.php:90
 msgid "IM is not available."
 msgstr "IM är inte tillgänglig."
 
-#. TRANS: Form legend for Instant Messaging settings form.
-#. TRANS: Field label for Instant Messaging address input in Instant Messaging settings form.
-#: actions/imsettings.php:102 actions/imsettings.php:132
-msgid "IM address"
-msgstr "Adress för snabbmeddelanden"
+#: actions/imsettings.php:116
+#, fuzzy, php-format
+msgid "Current confirmed %s address."
+msgstr "Aktuell, bekräftad e-postadress."
 
-#: actions/imsettings.php:109
-#, fuzzy
-msgid "Current confirmed Jabber/Google Talk address."
-msgstr "Aktuell bekräftad Jabber/Gtalk-adress."
-
-#. TRANS: Form note in Instant Messaging settings form.
-#. TRANS: %s is the Instant Messaging address set for the site.
-#: actions/imsettings.php:120
+#. TRANS: Form note in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:128
 #, fuzzy, php-format
 msgid ""
-"Awaiting confirmation on this address. Check your Jabber/Google Talk account "
-"for a message with further instructions. (Did you add %s to your buddy list?)"
+"Awaiting confirmation on this address. Check your %s account for a message "
+"with further instructions. (Did you add %s to your buddy list?)"
 msgstr ""
 "Väntar på bekräftelse för denna adress. Kontrollera ditt Jabber/GTalk-konto "
 "för vidare instruktioner. (La du till %s i din kompislista?)"
 
-#. TRANS: IM address input field instructions in Instant Messaging settings form.
-#. TRANS: %s is the Instant Messaging address set for the site.
-#. TRANS: Do not translate "example.org". It is one of the domain names reserved for use in examples by
-#. TRANS: http://www.rfc-editor.org/rfc/rfc2606.txt. Any other domain may be owned by a legitimate
-#. TRANS: person or organization.
-#: actions/imsettings.php:139
-#, fuzzy, php-format
-msgid ""
-"Jabber or Google Talk address, like \"UserName@example.org\". First, make "
-"sure to add %s to your buddy list in your IM client or on Google Talk."
-msgstr ""
-"Jabber- eller GTalk-adress, som \"användarnamn@example.org\". Se först till "
-"att lägga till %s i din kompislista i din IM-klient eller hos GTalk."
+#: actions/imsettings.php:140
+msgid "IM address"
+msgstr "Adress för snabbmeddelanden"
 
-#. TRANS: Form legend for Instant Messaging preferences form.
-#: actions/imsettings.php:154
-msgid "IM preferences"
+#: actions/imsettings.php:142
+#, php-format
+msgid "%s screenname."
+msgstr ""
+
+#. TRANS: Header for IM preferences form.
+#: actions/imsettings.php:163
+#, fuzzy
+msgid "IM Preferences"
 msgstr "Inställningar för snabbmeddelanden"
 
-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:159
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:174
 #, fuzzy
-msgid "Send me notices through Jabber/Google Talk."
-msgstr "Skicka notiser till mig genom Jabber/GTalk."
+msgid "Send me notices"
+msgstr "Skicka en notis"
 
-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:165
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:176
 #, fuzzy
-msgid "Post a notice when my Jabber/Google Talk status changes."
+msgid "Post a notice when my status changes."
 msgstr "Posta en notis när min Jabber/GTalk-status ändras."
 
-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:171
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:178
 #, fuzzy
-msgid ""
-"Send me replies through Jabber/Google Talk from people I'm not subscribed to."
+msgid "Send me replies from people I'm not subscribed to."
 msgstr ""
 "Skicka svar till mig genom Jabber/GTalk från personer som jag inte "
 "prenumererar på."
 
-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:178
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:181
 #, fuzzy
-msgid "Publish a MicroID for my Jabber/Google Talk address."
-msgstr "Publicera ett MicroID för min Jabber/GTalk-adress."
+msgid "Publish a MicroID"
+msgstr "Publicera ett MicroID för min e-postadress."
 
-#. TRANS: Confirmation message for successful Instant Messaging preferences save.
-#: actions/imsettings.php:283 actions/othersettings.php:192
+#. TRANS: Server error thrown on database error updating IM preferences.
+#: actions/imsettings.php:291
+#, fuzzy
+msgid "Couldn't update IM preferences."
+msgstr "Kunde inte uppdatera användare."
+
+#. TRANS: Confirmation message for successful IM preferences save.
+#. TRANS: Confirmation message after saving preferences.
+#: actions/imsettings.php:298 actions/urlsettings.php:244
 msgid "Preferences saved."
 msgstr "Inställningar sparade."
 
-#. TRANS: Message given saving Instant Messaging address without having provided one.
-#: actions/imsettings.php:304
-msgid "No Jabber ID."
-msgstr "Inget Jabber-ID."
-
-#. TRANS: Message given saving Instant Messaging address that cannot be normalised.
-#: actions/imsettings.php:312
+#. TRANS: Message given saving IM address without having provided one.
+#: actions/imsettings.php:320
 #, fuzzy
-msgid "Cannot normalize that Jabber ID."
+msgid "No screenname."
+msgstr "Inget smeknamn."
+
+#: actions/imsettings.php:325
+#, fuzzy
+msgid "No transport."
+msgstr "Ingen notis."
+
+#. TRANS: Message given saving IM address that cannot be normalised.
+#: actions/imsettings.php:333
+#, fuzzy
+msgid "Cannot normalize that screenname"
 msgstr "Kan inte normalisera detta Jabber-ID"
 
-#. TRANS: Message given saving Instant Messaging address that not valid.
-#: actions/imsettings.php:317
+#. TRANS: Message given saving IM address that not valid.
+#: actions/imsettings.php:340
 #, fuzzy
-msgid "Not a valid Jabber ID."
-msgstr "Inte ett giltigt Jabber-ID"
+msgid "Not a valid screenname"
+msgstr "Inte ett giltigt smeknamn."
 
-#. TRANS: Message given saving Instant Messaging address that is already set.
-#: actions/imsettings.php:321
-msgid "That is already your Jabber ID."
-msgstr "Detta är redan ditt Jabber-ID"
-
-#. TRANS: Message given saving Instant Messaging address that is already set for another user.
-#: actions/imsettings.php:325
-msgid "Jabber ID already belongs to another user."
+#. TRANS: Message given saving IM address that is already set for another user.
+#: actions/imsettings.php:344
+#, fuzzy
+msgid "Screenname already belongs to another user."
 msgstr "Jabber-ID:t tillhör redan en annan användare."
 
-#. TRANS: Message given saving valid Instant Messaging address that is to be confirmed.
-#. TRANS: %s is the Instant Messaging address set for the site.
-#: actions/imsettings.php:353
-#, php-format
-msgid ""
-"A confirmation code was sent to the IM address you added. You must approve %"
-"s for sending messages to you."
+#. TRANS: Message given saving valid IM address that is to be confirmed.
+#: actions/imsettings.php:369
+#, fuzzy
+msgid "A confirmation code was sent to the IM address you added."
 msgstr ""
 "En bekräftelsekod skickades till den IM-adress du angav. Du måste godkänna "
 "att %s får skicka meddelanden till dig."
 
-#. TRANS: Message given canceling Instant Messaging address confirmation for the wrong IM address.
-#: actions/imsettings.php:382
+#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#: actions/imsettings.php:396
 msgid "That is the wrong IM address."
 msgstr "Detta är fel IM-adress."
 
-#. TRANS: Server error thrown on database error canceling Instant Messaging address confirmation.
-#: actions/imsettings.php:391
+#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#: actions/imsettings.php:405
 #, fuzzy
-msgid "Could not delete IM confirmation."
+msgid "Couldn't delete confirmation."
 msgstr "Kunde inte ta bort bekräftelse för snabbmeddelanden."
 
-#. TRANS: Message given after successfully canceling Instant Messaging address confirmation.
-#: actions/imsettings.php:396
+#. TRANS: Message given after successfully canceling IM address confirmation.
+#: actions/imsettings.php:410
 msgid "IM confirmation cancelled."
 msgstr "Bekräftelse för snabbmeddelanden avbruten."
 
-#. TRANS: Message given trying to remove an Instant Messaging address that is not
+#. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.
-#: actions/imsettings.php:417
-msgid "That is not your Jabber ID."
-msgstr "Detta är inte ditt Jabber-ID."
+#: actions/imsettings.php:434
+#, fuzzy
+msgid "That is not your screenname."
+msgstr "Detta är inte ditt telefonnummer."
+
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#: actions/imsettings.php:443
+#, fuzzy
+msgid "Couldn't update user im prefs."
+msgstr "Kunde inte uppdatera användaruppgift."
 
 #. TRANS: Message given after successfully removing a registered Instant Messaging address.
-#: actions/imsettings.php:440
+#: actions/imsettings.php:451
 msgid "The IM address was removed."
 msgstr "Adressen för snabbmeddelanden togs bort."
 
@@ -3531,7 +3587,7 @@ msgid "You must be logged in to join a group."
 msgstr "Du måste vara inloggad för att kunna gå med i en grupp."
 
 #. TRANS: Title for join group page after joining.
-#: actions/joingroup.php:147
+#: actions/joingroup.php:148
 #, fuzzy, php-format
 msgctxt "TITLE"
 msgid "%1$s joined group %2$s"
@@ -3659,7 +3715,7 @@ msgstr ""
 #. TRANS: Submit button title.
 #: actions/licenseadminpanel.php:311 actions/sessionsadminpanel.php:199
 #: actions/siteadminpanel.php:292 actions/snapshotadminpanel.php:245
-#: actions/tagother.php:154 lib/applicationeditform.php:357
+#: actions/tagother.php:133 lib/applicationeditform.php:357
 msgid "Save"
 msgstr "Spara"
 
@@ -3667,39 +3723,41 @@ msgstr "Spara"
 msgid "Save license settings"
 msgstr "Spara licensinsällningar"
 
-#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
+#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
+#: actions/login.php:97 actions/otp.php:62 actions/register.php:130
 msgid "Already logged in."
 msgstr "Redan inloggad."
 
-#: actions/login.php:148
+#: actions/login.php:125
 msgid "Incorrect username or password."
 msgstr "Felaktigt användarnamn eller lösenord."
 
-#: actions/login.php:154 actions/otp.php:120
+#. TRANS: Server error displayed when a user object could not be created trying to login using "one time password login".
+#: actions/login.php:131 actions/otp.php:127
 msgid "Error setting user. You are probably not authorized."
 msgstr "Fel vid inställning av användare. Du har sannolikt inte tillstånd."
 
-#: actions/login.php:210 actions/login.php:263
+#: actions/login.php:185 actions/login.php:236 lib/action.php:598
 msgid "Login"
 msgstr "Logga in"
 
-#: actions/login.php:249
+#: actions/login.php:222
 msgid "Login to site"
 msgstr "Logga in på webbplatsen"
 
-#: actions/login.php:258 actions/register.php:490
+#: actions/login.php:231 actions/register.php:469
 msgid "Remember me"
 msgstr "Kom ihåg mig"
 
-#: actions/login.php:259 actions/register.php:492
+#: actions/login.php:232 actions/register.php:471
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "Logga in automatiskt i framtiden; inte för delade datorer!"
 
-#: actions/login.php:269
+#: actions/login.php:241
 msgid "Lost or forgotten password?"
 msgstr "Tappat bort eller glömt ditt lösenord?"
 
-#: actions/login.php:288
+#: actions/login.php:259
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -3707,11 +3765,11 @@ msgstr ""
 "Av säkerhetsskäl, var vänlig och skriv in ditt användarnamn och lösenord "
 "igen innan du ändrar dina inställningar."
 
-#: actions/login.php:292
+#: actions/login.php:263
 msgid "Login with your username and password."
 msgstr "Logga in med ditt användarnamn och lösenord."
 
-#: actions/login.php:295
+#: actions/login.php:266
 #, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -3840,7 +3898,9 @@ msgstr "Ny notis"
 msgid "Notice posted"
 msgstr "Notis postad"
 
-#: actions/noticesearch.php:68
+#. TRANS: Instructions for Notice search page.
+#. TRANS: %%site.name%% is the name of the StatusNet site.
+#: actions/noticesearch.php:69
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -3849,16 +3909,21 @@ msgstr ""
 "Sök efter innehåll i notiser på %%site.name%%. Skilj söktermerna åt med "
 "mellanslag; de måste vara minst tre tecken långa."
 
-#: actions/noticesearch.php:78
+#. TRANS: Title of the page where users can search for notices.
+#: actions/noticesearch.php:80
 msgid "Text search"
 msgstr "Textsökning"
 
-#: actions/noticesearch.php:91
+#. TRANS: Test in RSS notice search.
+#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
+#: actions/noticesearch.php:95
 #, php-format
 msgid "Search results for \"%1$s\" on %2$s"
 msgstr "Sökresultat för \"%1$s\" på %2$s"
 
-#: actions/noticesearch.php:121
+#. TRANS: Text for logged in users making a query for notices without results.
+#. TRANS: This message contains a Markdown link.
+#: actions/noticesearch.php:128
 #, php-format
 msgid ""
 "Be the first to [post on this topic](%%%%action.newnotice%%%%?"
@@ -3867,7 +3932,9 @@ msgstr ""
 "Var den första att [skriva i detta ämne](%%%%action.newnotice%%%%?"
 "status_textarea=%s)!"
 
-#: actions/noticesearch.php:124
+#. TRANS: Text for not logged in users making a query for notices without results.
+#. TRANS: This message contains Markdown links.
+#: actions/noticesearch.php:133
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and be the first to "
@@ -3876,14 +3943,17 @@ msgstr ""
 "Varför inte [registrera ett konto](%%%%action.register%%%%) och vara först "
 "med att [skriva i detta ämne](%%%%action.newnotice%%%%?status_textarea=%s)!"
 
-#: actions/noticesearchrss.php:96
+#. TRANS: RSS notice search feed title. %s is the query.
+#: actions/noticesearchrss.php:95
 #, php-format
 msgid "Updates with \"%s\""
 msgstr "Uppdateringar med \"%s\""
 
-#: actions/noticesearchrss.php:98
+#. TRANS: RSS notice search feed description.
+#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
+#: actions/noticesearchrss.php:99
 #, fuzzy, php-format
-msgid "Updates matching search term \"%1$s\" on %2$s!"
+msgid "Updates matching search term \"%1$s\" on %2$s."
 msgstr "Uppdateringar som matchar söksträngen \"%1$s\" på %2$s!"
 
 #: actions/nudge.php:85
@@ -3904,51 +3974,51 @@ msgid "Nudge sent!"
 msgstr "Knuff sänd!"
 
 #. TRANS: Message displayed to an anonymous user trying to view OAuth application list.
-#: actions/oauthappssettings.php:60
+#: actions/oauthappssettings.php:57
 msgid "You must be logged in to list your applications."
 msgstr "Du måste vara inloggad för att lista dina applikationer."
 
 #. TRANS: Page title for OAuth applications
-#: actions/oauthappssettings.php:76
+#: actions/oauthappssettings.php:73
 msgid "OAuth applications"
 msgstr "OAuth-applikationer"
 
 #. TRANS: Page instructions for OAuth applications
-#: actions/oauthappssettings.php:88
+#: actions/oauthappssettings.php:85
 msgid "Applications you have registered"
 msgstr "Applikationer du har registrerat"
 
 #. TRANS: Empty list message on page with OAuth applications.
-#: actions/oauthappssettings.php:141
+#: actions/oauthappssettings.php:138
 #, php-format
 msgid "You have not registered any applications yet."
 msgstr "Du har inte registrerat några applikationer än."
 
 #. TRANS: Title for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:71
+#: actions/oauthconnectionssettings.php:69
 msgid "Connected applications"
 msgstr "Anslutna applikationer"
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:83
+#: actions/oauthconnectionssettings.php:80
 msgid "The following connections exist for your account."
 msgstr ""
 
 #. TRANS: Client error when trying to revoke access for an application while not being a user of it.
-#: actions/oauthconnectionssettings.php:168
+#: actions/oauthconnectionssettings.php:165
 msgid "You are not a user of that application."
 msgstr "Du är inte en användare av den applikationen."
 
 #. TRANS: Client error when revoking access has failed for some reason.
 #. TRANS: %s is the application ID revoking access failed for.
-#: actions/oauthconnectionssettings.php:183
+#: actions/oauthconnectionssettings.php:180
 #, php-format
 msgid "Unable to revoke access for application: %s."
 msgstr "Kunde inte återkalla åtkomst för applikation: %s."
 
 #. TRANS: Success message after revoking access for an application.
 #. TRANS: %1$s is the application name, %2$s is the first part of the user token.
-#: actions/oauthconnectionssettings.php:202
+#: actions/oauthconnectionssettings.php:199
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -3956,20 +4026,30 @@ msgid ""
 msgstr ""
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:213
+#: actions/oauthconnectionssettings.php:210
 msgid "You have not authorized any applications to use your account."
 msgstr "Du har inte tillåtit några applikationer att använda ditt konto."
 
 #. TRANS: Note for developers in the OAuth connection settings form.
 #. TRANS: This message contains a Markdown link. Do not separate "](".
 #. TRANS: %s is the URL to the OAuth settings.
-#: actions/oauthconnectionssettings.php:233
+#: actions/oauthconnectionssettings.php:230
 #, php-format
 msgid ""
 "Are you a developer? [Register an OAuth client application](%s) to use with "
 "this instance of StatusNet."
 msgstr ""
 
+#: actions/oembed.php:64
+#, fuzzy, php-format
+msgid "\"%s\" not found."
+msgstr "API-metod hittades inte."
+
+#: actions/oembed.php:76
+#, fuzzy, php-format
+msgid "Notice %s not found."
+msgstr "API-metod hittades inte."
+
 #: actions/oembed.php:80 actions/shownotice.php:100
 msgid "Notice has no profile."
 msgstr "Notisen har ingen profil."
@@ -3979,6 +4059,16 @@ msgstr "Notisen har ingen profil."
 msgid "%1$s's status on %2$s"
 msgstr "%1$ss status den %2$s"
 
+#: actions/oembed.php:95
+#, fuzzy, php-format
+msgid "Attachment %s not found."
+msgstr "Mottagare hittades inte."
+
+#: actions/oembed.php:136
+#, php-format
+msgid "\"%s\" not supported for oembed requests."
+msgstr ""
+
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
 #: actions/oembed.php:168
 #, php-format
@@ -3992,94 +4082,60 @@ msgid "Only %s URLs over plain HTTP please."
 msgstr "Endast %s-webbadresser över vanlig HTTP."
 
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1205
-#: lib/apiaction.php:1232 lib/apiaction.php:1367
+#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1207
+#: lib/apiaction.php:1234 lib/apiaction.php:1369
 msgid "Not a supported data format."
 msgstr "Ett dataformat som inte stödjs"
 
+#. TRANS: ShortName in the OpenSearch interface when trying to find users.
 #: actions/opensearch.php:64
 msgid "People Search"
 msgstr "Personsökning"
 
-#: actions/opensearch.php:67
+#: actions/opensearch.php:68
 msgid "Notice Search"
 msgstr "Notissökning"
 
-#: actions/othersettings.php:59
-msgid "Other settings"
-msgstr "Övriga inställningar"
-
-#. TRANS: Instructions for tab "Other" in user profile settings.
-#: actions/othersettings.php:71
-msgid "Manage various other options."
-msgstr "Hantera diverse andra alternativ."
-
-#. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
-#. TRANS: user's profile settings. Use of "free" is as in "open", indicating that the
-#. TRANS: information on the shortener site is freely distributable.
-#. TRANS: This message has one space at the beginning. Use your language's word separator
-#. TRANS: here if it has one (most likely a single space).
-#: actions/othersettings.php:113
-msgid " (free service)"
-msgstr " (fri tjänst)"
-
-#. TRANS: Label for dropdown with URL shortener services.
-#: actions/othersettings.php:122
-msgid "Shorten URLs with"
-msgstr "Förkorta URL:er med"
-
-#. TRANS: Tooltip for for dropdown with URL shortener services.
-#: actions/othersettings.php:124
-msgid "Automatic shortening service to use."
-msgstr "Automatiska förkortningstjänster att använda."
-
-#. TRANS: Label for checkbox.
-#: actions/othersettings.php:130
-msgid "View profile designs"
-msgstr "Visa profilutseenden"
-
-#. TRANS: Tooltip for checkbox.
-#: actions/othersettings.php:132
-msgid "Show or hide profile designs."
-msgstr "Visa eller göm profilutseenden."
-
-#. TRANS: Form validation error for form "Other settings" in user profile.
-#: actions/othersettings.php:164
-#, fuzzy
-msgid "URL shortening service is too long (maximum 50 characters)."
-msgstr "Namnet på URL-förkortningstjänsen är för långt (max 50 tecken)."
-
-#: actions/otp.php:69
+#. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
+#: actions/otp.php:70
 msgid "No user ID specified."
 msgstr "Ingen användar-ID angiven."
 
-#: actions/otp.php:83
+#. TRANS: Client error displayed trying to use "one time password login" without specifying a login token.
+#: actions/otp.php:86
 msgid "No login token specified."
 msgstr "Ingen inloggnings-token angiven."
 
-#: actions/otp.php:90
+#. TRANS: Client error displayed trying to use "one time password login" without requesting a login token.
+#: actions/otp.php:94
 msgid "No login token requested."
 msgstr "Ingen token för inloggning begärd."
 
-#: actions/otp.php:95
+#. TRANS: Client error displayed trying to use "one time password login" while specifying an invalid login token.
+#: actions/otp.php:100
 msgid "Invalid login token specified."
 msgstr "Ogiltig inloggnings-token angiven."
 
-#: actions/otp.php:104
+#. TRANS: Client error displayed trying to use "one time password login" while specifying an expired login token.
+#: actions/otp.php:110
 msgid "Login token expired."
 msgstr "Inloggnings-token förfallen."
 
-#: actions/outbox.php:58
+#. TRANS: Title for outbox for any but the fist page.
+#. TRANS: %1$s is the user nickname, %2$d is the page number.
+#: actions/outbox.php:57
 #, php-format
 msgid "Outbox for %1$s - page %2$d"
 msgstr "Utkorg för %1$s - sida %2$d"
 
+#. TRANS: Title for first page of outbox.
 #: actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
 msgstr "Utkorg för %s"
 
-#: actions/outbox.php:104
+#. TRANS: Instructions for outbox.
+#: actions/outbox.php:103
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr "Detta är din utkorg som innehåller privata meddelanden du har skickat."
 
@@ -4105,43 +4161,45 @@ msgstr "Gammalt lösenord"
 msgid "New password"
 msgstr "Nytt lösenord"
 
-#: actions/passwordsettings.php:109
+#: actions/passwordsettings.php:109 actions/register.php:416
 #, fuzzy
-msgid "6 or more characters"
+msgid "6 or more characters."
 msgstr "Minst 6 tecken"
 
-#: actions/passwordsettings.php:113
+#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#: actions/passwordsettings.php:113 actions/recoverpassword.php:264
+#: actions/register.php:420
 #, fuzzy
-msgid "Same as password above"
+msgid "Same as password above."
 msgstr "Samma som lösenordet ovan"
 
 #: actions/passwordsettings.php:117
 msgid "Change"
 msgstr "Ändra"
 
-#: actions/passwordsettings.php:154 actions/register.php:238
+#: actions/passwordsettings.php:153 actions/register.php:223
 msgid "Password must be 6 or more characters."
 msgstr "Lösenordet måste vara minst 6 tecken."
 
-#: actions/passwordsettings.php:157 actions/register.php:241
+#: actions/passwordsettings.php:156 actions/register.php:226
 msgid "Passwords don't match."
 msgstr "Lösenorden matchar inte."
 
-#: actions/passwordsettings.php:165
+#: actions/passwordsettings.php:164
 msgid "Incorrect old password"
 msgstr "Felaktigt gammalt lösenord"
 
-#: actions/passwordsettings.php:181
+#: actions/passwordsettings.php:180
 msgid "Error saving user; invalid."
 msgstr "Fel vid sparande av användare; ogiltig."
 
-#: actions/passwordsettings.php:186
+#. TRANS: Reset password form validation error message.
+#: actions/passwordsettings.php:185 actions/recoverpassword.php:418
 #, fuzzy
-msgid "Can't save new password."
+msgid "Cannot save new password."
 msgstr "Kan inte spara nytt lösenord."
 
-#. TRANS: Title for password recovery page in password saved mode.
-#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
+#: actions/passwordsettings.php:191
 msgid "Password saved."
 msgstr "Lösenord sparat."
 
@@ -4353,8 +4411,7 @@ msgid "Directory where backgrounds are located."
 msgstr "Katalogsökväg till lokaliseringfiler (locales)"
 
 #. TRANS: Fieldset legens in Paths admin panel.
-#. TRANS: DT element label in attachment list.
-#: actions/pathsadminpanel.php:419 lib/attachmentlist.php:98
+#: actions/pathsadminpanel.php:419
 msgid "Attachments"
 msgstr "Bilagor"
 
@@ -4426,7 +4483,9 @@ msgstr "Server att dirigera SSL-begäran till."
 msgid "Save paths"
 msgstr "Spara sökvägar"
 
-#: actions/peoplesearch.php:52
+#. TRANS: Instructions for the "People search" page.
+#. TRANS: %%site.name%% is the name of the StatusNet site.
+#: actions/peoplesearch.php:54
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
@@ -4435,7 +4494,8 @@ msgstr ""
 "Sök efter personer på %%site.name%% efter deras namn, plats eller intressen. "
 "Skilj söktermerna åt med mellanslag; de måste vara tre tecken långa."
 
-#: actions/peoplesearch.php:58
+#. TRANS: Title of a page where users can search for other users.
+#: actions/peoplesearch.php:61
 msgid "People search"
 msgstr "Personsökning"
 
@@ -4449,6 +4509,60 @@ msgstr "Inte en giltig persontagg: %s."
 msgid "Users self-tagged with %1$s - page %2$d"
 msgstr "Användare som taggat sig själv med %1$s - sida %2$d"
 
+#. TRANS: Page title for AJAX form return when a disabling a plugin.
+#: actions/plugindisable.php:69
+msgctxt "plugin"
+msgid "Disabled"
+msgstr ""
+
+#. TRANS: Client error displayed trying to perform any request method other than POST.
+#. TRANS: Do not translate POST.
+#: actions/pluginenable.php:78 actions/subscribe.php:77
+msgid "This action only accepts POST requests."
+msgstr "Denna åtgärd accepterar endast POST-begäran."
+
+#: actions/pluginenable.php:102
+#, fuzzy
+msgid "You cannot administer plugins."
+msgstr "Du kan inte ta bort användare."
+
+#: actions/pluginenable.php:109
+#, fuzzy
+msgid "No such plugin."
+msgstr "Ingen sådan sida"
+
+#. TRANS: Page title for AJAX form return when enabling a plugin.
+#: actions/pluginenable.php:159
+msgctxt "plugin"
+msgid "Enabled"
+msgstr ""
+
+#. TRANS: Tab and title for plugins admin panel.
+#. TRANS: Menu item for site administration
+#: actions/pluginsadminpanel.php:56 actions/version.php:191
+#: lib/adminpanelaction.php:411
+msgid "Plugins"
+msgstr "Insticksmoduler"
+
+#. TRANS: Instructions at top of plugin admin page.
+#: actions/pluginsadminpanel.php:68
+msgid ""
+"Additional plugins can be enabled and configured manually. See the <a href="
+"\"http://status.net/wiki/Plugins\">online plugin documentation</a> for more "
+"details."
+msgstr ""
+
+#. TRANS: Admin form section header
+#: actions/pluginsadminpanel.php:84
+#, fuzzy
+msgid "Default plugins"
+msgstr "Standardspråk"
+
+#: actions/pluginsadminpanel.php:106
+msgid ""
+"All default plugins have been disabled from the site's configuration file."
+msgstr ""
+
 #: actions/postnotice.php:95
 msgid "Invalid notice content."
 msgstr "Ogiltigt notisinnehåll."
@@ -4459,12 +4573,12 @@ msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’.
 msgstr "Licensen för notiser ‘%1$s’ är inte förenlig webbplatslicensen ‘%2$s’."
 
 #. TRANS: Page title for profile settings.
-#: actions/profilesettings.php:59
+#: actions/profilesettings.php:60
 msgid "Profile settings"
 msgstr "Profilinställningar"
 
 #. TRANS: Usage instructions for profile settings.
-#: actions/profilesettings.php:70
+#: actions/profilesettings.php:71
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
@@ -4472,34 +4586,31 @@ msgstr ""
 "dig."
 
 #. TRANS: Profile settings form legend.
-#: actions/profilesettings.php:98
+#: actions/profilesettings.php:99
 msgid "Profile information"
 msgstr "Profilinformation"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109 actions/register.php:433
+#: actions/profilesettings.php:110 actions/register.php:412
 #, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr "1-64 små bokstäver eller nummer, inga punkter eller mellanslag"
 
 #. TRANS: Field label in form for profile settings.
-#. TRANS: Label for full group name (dt). Text hidden by default.
-#. TRANS: DT for full name in a profile.
-#: actions/profilesettings.php:113 actions/register.php:455
-#: actions/showgroup.php:255 actions/tagother.php:104
-#: lib/groupeditform.php:150 lib/userprofile.php:156
+#: actions/profilesettings.php:114 actions/register.php:434
+#: lib/groupeditform.php:150
 msgid "Full name"
 msgstr "Fullständigt namn"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:118 actions/register.php:460
+#: actions/profilesettings.php:119 actions/register.php:439
 #: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "Hemsida"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:121
+#: actions/profilesettings.php:122 actions/register.php:441
 #, fuzzy
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr "URL till din hemsida, blogg eller profil på en annan webbplats."
@@ -4507,7 +4618,7 @@ msgstr "URL till din hemsida, blogg eller profil på en annan webbplats."
 #. TRANS: Tooltip for field label in form for profile settings. Plural
 #. TRANS: is decided by the number of characters available for the
 #. TRANS: biography (%d).
-#: actions/profilesettings.php:129 actions/register.php:471
+#: actions/profilesettings.php:130 actions/register.php:450
 #, fuzzy, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4515,79 +4626,75 @@ msgstr[0] "Beskriv dig själv och dina intressen med högst 140 tecken"
 msgstr[1] "Beskriv dig själv och dina intressen med högst 140 tecken"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:135 actions/register.php:476
+#: actions/profilesettings.php:136 actions/register.php:455
 msgid "Describe yourself and your interests"
 msgstr "Beskriv dig själv och dina intressen"
 
 #. TRANS: Text area label in form for profile settings where users can provide.
 #. TRANS: their biography.
-#: actions/profilesettings.php:139 actions/register.php:478
+#: actions/profilesettings.php:140 actions/register.php:457
 msgid "Bio"
 msgstr "Biografi"
 
 #. TRANS: Field label in form for profile settings.
-#. TRANS: Label for group location (dt). Text hidden by default.
-#. TRANS: DT for location in a profile.
-#: actions/profilesettings.php:145 actions/register.php:483
-#: actions/showgroup.php:265 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:173
-#: lib/userprofile.php:172
+#: actions/profilesettings.php:146 actions/register.php:462
+#: lib/groupeditform.php:173
 msgid "Location"
 msgstr "Plats"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148 actions/register.php:485
+#: actions/profilesettings.php:149
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Var du håller till, såsom \"Stad, Län, Land\""
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:153
+#: actions/profilesettings.php:154
 msgid "Share my current location when posting notices"
 msgstr "Dela min nuvarande plats när jag skickar notiser"
 
 #. TRANS: Field label in form for profile settings.
-#. TRANS: DT for tags in a profile.
-#: actions/profilesettings.php:161 actions/tagother.php:149
-#: actions/tagother.php:209 lib/subscriptionlist.php:106
-#: lib/subscriptionlist.php:108 lib/userprofile.php:220
+#: actions/profilesettings.php:162 actions/tagother.php:128
+#: actions/tagother.php:188 lib/subscriptionlist.php:104
+#: lib/subscriptionlist.php:106
 msgid "Tags"
 msgstr "Taggar"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:164
+#: actions/profilesettings.php:165
 #, fuzzy
 msgid ""
-"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- "
+"separated."
 msgstr ""
 "Taggar för dig själv (bokstäver, nummer, -, ., och _), separerade med "
 "kommatecken eller mellanslag"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:169
+#: actions/profilesettings.php:170
 msgid "Language"
 msgstr "Språk"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:171
+#: actions/profilesettings.php:172
 #, fuzzy
-msgid "Preferred language"
+msgid "Preferred language."
 msgstr "Föredraget språk"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:181
+#: actions/profilesettings.php:182
 msgid "Timezone"
 msgstr "Tidszon"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:183
+#: actions/profilesettings.php:184
 msgid "What timezone are you normally in?"
 msgstr "I vilken tidszon befinner du dig normalt?"
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:189
+#: actions/profilesettings.php:190
 #, fuzzy
 msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)"
+"Automatically subscribe to whoever subscribes to me (best for non-humans)."
 msgstr ""
 "Prenumerera automatiskt på den som prenumererar på mig (bäst för icke-"
 "människa) "
@@ -4595,7 +4702,7 @@ msgstr ""
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Plural form is used based on the maximum number of allowed
 #. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:258 actions/register.php:229
+#: actions/profilesettings.php:259 actions/register.php:214
 #, fuzzy, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4603,50 +4710,50 @@ msgstr[0] "Biografin är för lång (max %d tecken)."
 msgstr[1] "Biografin är för lång (max %d tecken)."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:269 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:270 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr "Tidszon inte valt."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:277
+#: actions/profilesettings.php:278
 #, fuzzy
 msgid "Language is too long (maximum 50 characters)."
 msgstr "Språknamn är för långt (max 50 tecken)."
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:291 actions/tagother.php:178
-#, php-format
-msgid "Invalid tag: \"%s\""
+#: actions/profilesettings.php:292
+#, fuzzy, php-format
+msgid "Invalid tag: \"%s\"."
 msgstr "Ogiltig tagg: \"%s\""
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:347
+#: actions/profilesettings.php:348
 #, fuzzy
 msgid "Could not update user for autosubscribe."
 msgstr "Kunde inte uppdatera användaren för automatisk prenumeration."
 
 #. TRANS: Server error thrown when user profile location preference settings could not be updated.
-#: actions/profilesettings.php:405
+#: actions/profilesettings.php:406
 #, fuzzy
 msgid "Could not save location prefs."
 msgstr "Kunde inte spara platsinställningar."
 
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:427 actions/tagother.php:200
+#: actions/profilesettings.php:428 actions/tagother.php:179
 msgid "Could not save tags."
 msgstr "Kunde inte spara taggar."
 
 #. TRANS: Confirmation shown when user profile settings are saved.
 #. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:436 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:437 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "Inställningar sparade."
 
 #. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
 #. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:483 actions/restoreaccount.php:60
+#: actions/profilesettings.php:484 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "Skapa ett konto"
@@ -4726,6 +4833,12 @@ msgstr ""
 "Mikroblogg)tjänst baserad på den fria programvaran [StatusNet](http://status."
 "net/)."
 
+#. TRANS: Public RSS feed description. %s is the StatusNet site name.
+#: actions/publicrss.php:106
+#, fuzzy, php-format
+msgid "%s updates from everyone."
+msgstr "%s uppdateringar från alla!"
+
 #. TRANS: Title for public tag cloud.
 #: actions/publictagcloud.php:57
 msgid "Public tag cloud"
@@ -4766,10 +4879,6 @@ msgstr ""
 "Varför inte [registrera ett konto](%%action.register%%) och bli först att "
 "posta en!"
 
-#: actions/publictagcloud.php:146
-msgid "Tag cloud"
-msgstr "Taggmoln"
-
 #. TRANS: Client error displayed trying to recover password while already logged in.
 #: actions/recoverpassword.php:37
 msgid "You are already logged in!"
@@ -4862,6 +4971,12 @@ msgstr "Återskapa lösenord"
 msgid "Password recovery requested"
 msgstr "Återskapande av lösenord begärd"
 
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/recoverpassword.php:229
+#, fuzzy
+msgid "Password saved"
+msgstr "Lösenord sparat."
+
 #. TRANS: Title for password recovery page when an unknown action has been specified.
 #: actions/recoverpassword.php:232
 msgid "Unknown action"
@@ -4873,15 +4988,9 @@ msgstr "Okänd funktion"
 msgid "6 or more characters, and do not forget it!"
 msgstr "Minst 6 tecken, och glöm inte bort det!"
 
-#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
-#: actions/recoverpassword.php:264 actions/register.php:441
-#, fuzzy
-msgid "Same as password above."
-msgstr "Samma som lösenordet ovan"
-
 #. TRANS: Button text for password reset form.
 #. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: actions/recoverpassword.php:268 lib/designsettings.php:264
+#: actions/recoverpassword.php:268 lib/designform.php:145
 msgctxt "BUTTON"
 msgid "Reset"
 msgstr "Återställ"
@@ -4931,14 +5040,8 @@ msgstr "Lösenordet måste vara minst 6 tecken."
 msgid "Password and confirmation do not match."
 msgstr "Lösenord och bekräftelse matchar inte."
 
-#. TRANS: Reset password form validation error message.
-#: actions/recoverpassword.php:418
-#, fuzzy
-msgid "Cannot save new password."
-msgstr "Kan inte spara nytt lösenord."
-
 #. TRANS: Server error displayed when something does wrong with the user object during password reset.
-#: actions/recoverpassword.php:426 actions/register.php:256
+#: actions/recoverpassword.php:426 actions/register.php:241
 msgid "Error setting user."
 msgstr "Fel uppstog i användarens inställning"
 
@@ -4947,100 +5050,104 @@ msgstr "Fel uppstog i användarens inställning"
 msgid "New password successfully saved. You are now logged in."
 msgstr "Nya lösenordet sparat. Du är nu inloggad."
 
-#: actions/register.php:92 actions/register.php:196 actions/register.php:413
+#: actions/redirecturl.php:70
+#, fuzzy
+msgid "No id parameter"
+msgstr "Inget ID-argument."
+
+#: actions/redirecturl.php:76
+#, fuzzy, php-format
+msgid "No such file \"%d\""
+msgstr "Ingen sådan fil."
+
+#: actions/register.php:80 actions/register.php:181 actions/register.php:392
 msgid "Sorry, only invited people can register."
 msgstr "Tyvärr, bara inbjudna personer kan registrera sig."
 
-#: actions/register.php:99
+#: actions/register.php:87
 msgid "Sorry, invalid invitation code."
 msgstr "Tyvärr, ogiltig inbjudningskod."
 
-#: actions/register.php:119
+#: actions/register.php:106
 msgid "Registration successful"
 msgstr "Registreringen genomförd"
 
-#: actions/register.php:121 actions/register.php:511
+#: actions/register.php:108 actions/register.php:490
 msgid "Register"
 msgstr "Registrera"
 
-#: actions/register.php:142
+#: actions/register.php:128
 msgid "Registration not allowed."
 msgstr "Registrering inte tillåten."
 
-#: actions/register.php:209
+#: actions/register.php:194
 #, fuzzy
-msgid "You can't register if you don't agree to the license."
+msgid "You cannot register if you don't agree to the license."
 msgstr "Du kan inte registrera dig om du inte godkänner licensen."
 
-#: actions/register.php:218
+#: actions/register.php:203
 msgid "Email address already exists."
 msgstr "E-postadressen finns redan."
 
-#: actions/register.php:251 actions/register.php:273
+#: actions/register.php:236 actions/register.php:258
 msgid "Invalid username or password."
 msgstr "Ogiltigt användarnamn eller lösenord."
 
-#: actions/register.php:351
+#: actions/register.php:333
 #, fuzzy
 msgid ""
 "With this form you can create a new account. You can then post notices and "
-"link up to friends and colleagues. "
+"link up to friends and colleagues."
 msgstr ""
 "Med detta formulär kan du skapa ett nytt konto. Du kan sedan posta notiser "
 "och ansluta till vänner och kollegor. "
 
-#: actions/register.php:437
-#, fuzzy
-msgid "6 or more characters."
-msgstr "Minst 6 tecken"
-
-#. TRANS: Link description in user account settings menu.
-#: actions/register.php:445 actions/register.php:449
-#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
+#: actions/register.php:424 actions/register.php:428
+#: actions/siteadminpanel.php:238 lib/settingsnav.php:92
 msgid "Email"
 msgstr "E-post"
 
-#: actions/register.php:446 actions/register.php:450
+#: actions/register.php:425 actions/register.php:429
 #, fuzzy
-msgid "Used only for updates, announcements, and password recovery"
+msgid "Used only for updates, announcements, and password recovery."
 msgstr ""
 "Används endast för uppdateringar, tillkännagivanden och återskapande av "
 "lösenord"
 
-#: actions/register.php:457
+#: actions/register.php:436
 #, fuzzy
-msgid "Longer name, preferably your \"real\" name"
+msgid "Longer name, preferably your \"real\" name."
 msgstr "Längre namn, förslagsvis ditt \"verkliga\" namn"
 
-#: actions/register.php:462
+#: actions/register.php:464
 #, fuzzy
-msgid "URL of your homepage, blog, or profile on another site"
-msgstr "URL till din hemsida, blogg eller profil på en annan webbplats."
+msgid "Where you are, like \"City, State (or Region), Country\"."
+msgstr "Var du håller till, såsom \"Stad, Län, Land\""
 
-#: actions/register.php:523
+#: actions/register.php:503
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
 msgstr ""
 "Jag förstår att innehåll och data av %1$s är privata och konfidentiella."
 
-#: actions/register.php:533
+#: actions/register.php:513
 #, php-format
 msgid "My text and files are copyright by %1$s."
 msgstr "Upphovsrätten till min text och mina filer innehas av %1$s."
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:537
+#: actions/register.php:517
 msgid "My text and files remain under my own copyright."
 msgstr "Upphovsrätten till min text och mina filer är fortsatt min."
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:540
+#: actions/register.php:520
 msgid "All rights reserved."
 msgstr "Alla rättigheter reserverade."
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:545
+#: actions/register.php:525
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -5049,7 +5156,7 @@ msgstr ""
 "Mina texter och filer är tillgängliga under %s med undantag av den här "
 "privata datan: lösenord, e-postadress, IM-adress, telefonnummer."
 
-#: actions/register.php:588
+#: actions/register.php:566
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -5082,7 +5189,7 @@ msgstr ""
 "Tack för att du anmält dig och vi hoppas att du kommer tycka om att använda "
 "denna tjänst."
 
-#: actions/register.php:612
+#: actions/register.php:590
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5116,7 +5223,7 @@ msgstr "Användarens smeknamn"
 
 #: actions/remotesubscribe.php:129
 #, fuzzy
-msgid "Nickname of the user you want to follow"
+msgid "Nickname of the user you want to follow."
 msgstr "Smeknamnet på användaren du vill följa"
 
 #: actions/remotesubscribe.php:132
@@ -5125,18 +5232,18 @@ msgstr "Profil-URL"
 
 #: actions/remotesubscribe.php:133
 #, fuzzy
-msgid "URL of your profile on another compatible microblogging service"
+msgid "URL of your profile on another compatible microblogging service."
 msgstr "URL till din profil på en annan kompatibel mikrobloggtjänst"
 
 #. TRANS: Link text for link that will subscribe to a remote profile.
 #: actions/remotesubscribe.php:136 lib/subscribeform.php:139
-#: lib/userprofile.php:431
+#: lib/userprofile.php:402
 msgid "Subscribe"
 msgstr "Prenumerera"
 
 #: actions/remotesubscribe.php:158
 #, fuzzy
-msgid "Invalid profile URL (bad format)"
+msgid "Invalid profile URL (bad format)."
 msgstr "Ogiltig profil-URL (dåligt format)"
 
 #: actions/remotesubscribe.php:167
@@ -5172,7 +5279,7 @@ msgstr "Du kan inte upprepa din egna notis."
 msgid "You already repeated that notice."
 msgstr "Du har redan upprepat denna notis."
 
-#: actions/repeat.php:112 lib/noticelist.php:692
+#: actions/repeat.php:112 lib/noticelist.php:697
 msgid "Repeated"
 msgstr "Upprepad"
 
@@ -5180,9 +5287,9 @@ msgstr "Upprepad"
 msgid "Repeated!"
 msgstr "Upprepad!"
 
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing @-replies.
+#. TRANS: RSS reply feed title. %s is a user nickname.
 #: actions/replies.php:126 actions/repliesrss.php:68
-#: lib/personalgroupnav.php:109
+#: lib/personalgroupnav.php:105
 #, php-format
 msgid "Replies to %s"
 msgstr "Svarat till %s"
@@ -5232,9 +5339,11 @@ msgstr ""
 "Var den första att [skriva i detta ämne](%%%%action.newnotice%%%%?"
 "status_textarea=%s)!"
 
-#: actions/repliesrss.php:72
+#. TRANS: RSS reply feed description.
+#. TRANS: %1$s is a user nickname, %2$s is the StatusNet site name.
+#: actions/repliesrss.php:74
 #, fuzzy, php-format
-msgid "Replies to %1$s on %2$s!"
+msgid "Replies to %1$s on %2$s."
 msgstr "Svar till %1$s på %2$s"
 
 #. TRANS: Client exception displayed when trying to restore an account while not logged in.
@@ -5337,7 +5446,7 @@ msgstr "Du kan inte återkalla användarroller på denna webbplats."
 msgid "User doesn't have this role."
 msgstr "Användare har inte denna roll."
 
-#: actions/rsd.php:146 actions/version.php:159
+#: actions/rsd.php:142 actions/version.php:159
 msgid "StatusNet"
 msgstr "StatusNet"
 
@@ -5379,87 +5488,38 @@ msgstr "Sätt på felsökningsutdata för sessioner."
 msgid "Save site settings"
 msgstr "Spara webbplatsinställningar"
 
-#: actions/showapplication.php:82
+#: actions/showapplication.php:78
 msgid "You must be logged in to view an application."
 msgstr "Du måste vara inloggad för att se en applikation."
 
-#: actions/showapplication.php:157
+#: actions/showapplication.php:151
 msgid "Application profile"
 msgstr "Applikationsprofil"
 
-#. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:159 lib/applicationeditform.php:177
-msgid "Icon"
-msgstr "Ikon"
-
-#. TRANS: Form input field label for application name.
-#: actions/showapplication.php:169 actions/version.php:197
-#: lib/applicationeditform.php:190
-msgid "Name"
-msgstr "Namn"
-
-#. TRANS: Form input field label.
-#: actions/showapplication.php:178 lib/applicationeditform.php:227
-msgid "Organization"
-msgstr "Organisation"
-
-#. TRANS: Form input field label.
-#: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:168
-msgid "Description"
-msgstr "Beskrivning"
-
-#. TRANS: Header for group statistics on a group page (h2).
-#. TRANS: H2 text for user statistics.
-#: actions/showapplication.php:192 actions/showgroup.php:460
-#: lib/profileaction.php:205
-msgid "Statistics"
-msgstr "Statistik"
-
-#: actions/showapplication.php:203
+#: actions/showapplication.php:179
 #, php-format
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr "Skapad av %1$s - %2$s standardåtkomst - %3$d användare"
 
-#: actions/showapplication.php:213
+#: actions/showapplication.php:189
 msgid "Application actions"
 msgstr "Åtgärder för applikation"
 
-#: actions/showapplication.php:236
+#: actions/showapplication.php:212
 msgid "Reset key & secret"
 msgstr "Återställ nyckel & hemlighet"
 
 #. TRANS: Title of form for deleting a user.
-#: actions/showapplication.php:252 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:64 lib/noticelist.php:673
+#: actions/showapplication.php:228 lib/deletegroupform.php:121
+#: lib/deleteuserform.php:64 lib/noticelist.php:678
 msgid "Delete"
 msgstr "Ta bort"
 
-#: actions/showapplication.php:261
+#: actions/showapplication.php:237
 msgid "Application info"
 msgstr "Information om applikation"
 
-#: actions/showapplication.php:263
-msgid "Consumer key"
-msgstr "Nyckel för konsument"
-
-#: actions/showapplication.php:268
-msgid "Consumer secret"
-msgstr "Hemlighet för konsument"
-
-#: actions/showapplication.php:273
-msgid "Request token URL"
-msgstr "URL för begäran-token"
-
-#: actions/showapplication.php:278
-msgid "Access token URL"
-msgstr "URL för åtkomst-token"
-
-#: actions/showapplication.php:283
-msgid "Authorize URL"
-msgstr "Tillåt URL"
-
-#: actions/showapplication.php:288
+#: actions/showapplication.php:255
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
@@ -5467,7 +5527,7 @@ msgstr ""
 "Notera: Vi stöjder HMAC-SHA1-signaturer. Vi stödjer inte metoden med "
 "klartextsignatur."
 
-#: actions/showapplication.php:309
+#: actions/showapplication.php:275
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr ""
 "Är du säker på att du vill återställa din konsumentnyckel och -hemlighet?"
@@ -5554,61 +5614,47 @@ msgstr "%s grupp"
 msgid "%1$s group, page %2$d"
 msgstr "%1$s grupp, sida %2$d"
 
-#. TRANS: Group profile header (h2). Text hidden by default.
-#: actions/showgroup.php:223
-msgid "Group profile"
-msgstr "Grupprofil"
-
-#. TRANS: Label for group URL (dt). Text hidden by default.
-#. TRANS: DT for URL in a profile.
-#: actions/showgroup.php:273 actions/tagother.php:118
-#: actions/userauthorization.php:175 lib/userprofile.php:186
-msgid "URL"
-msgstr "URL"
-
 #. TRANS: Label for group description or group note (dt). Text hidden by default.
-#. TRANS: DT for note in a profile.
-#: actions/showgroup.php:285 actions/tagother.php:128
-#: actions/userauthorization.php:187 lib/userprofile.php:204
+#: actions/showgroup.php:266
 msgid "Note"
 msgstr "Notis"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:296 lib/groupeditform.php:180
+#: actions/showgroup.php:277 lib/groupeditform.php:180
 msgid "Aliases"
 msgstr "Alias"
 
 #. TRANS: Group actions header (h2). Text hidden by default.
-#: actions/showgroup.php:313
+#: actions/showgroup.php:294
 msgid "Group actions"
 msgstr "Åtgärder för grupp"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:357
+#: actions/showgroup.php:338
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
 msgstr "Flöde av notiser för %s grupp (RSS 1.0)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:364
+#: actions/showgroup.php:345
 #, php-format
 msgid "Notice feed for %s group (RSS 2.0)"
 msgstr "Flöde av notiser för %s grupp (RSS 2.0)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:371
+#: actions/showgroup.php:352
 #, php-format
 msgid "Notice feed for %s group (Atom)"
 msgstr "Flöde av notiser för %s grupp (Atom)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:377
+#: actions/showgroup.php:358
 #, php-format
 msgid "FOAF for %s group"
 msgstr "FOAF för %s grupp"
 
 #. TRANS: Header for mini list of group members on a group page (h2).
-#: actions/showgroup.php:414
+#: actions/showgroup.php:395
 msgid "Members"
 msgstr "Medlemmar"
 
@@ -5616,25 +5662,30 @@ msgstr "Medlemmar"
 #. TRANS: Text for user subscription statistics if the user has no subscriptions.
 #. TRANS: Text for user subscriber statistics if user has no subscribers.
 #. TRANS: Text for user user group membership statistics if user is not a member of any group.
-#: actions/showgroup.php:420 lib/profileaction.php:137
+#: actions/showgroup.php:401 lib/profileaction.php:137
 #: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
-#: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
+#: lib/subscriptionlist.php:123 lib/tagcloudsection.php:71
 msgid "(None)"
 msgstr "(Ingen)"
 
 #. TRANS: Link to all group members from mini list of group members if group has more than n members.
-#: actions/showgroup.php:429
+#: actions/showgroup.php:410
 msgid "All members"
 msgstr "Alla medlemmar"
 
-#. TRANS: Label for creation date in statistics on group page.
-#: actions/showgroup.php:465
+#. TRANS: Header for group statistics on a group page (h2).
+#. TRANS: H2 text for user statistics.
+#: actions/showgroup.php:441 lib/profileaction.php:205
+msgid "Statistics"
+msgstr "Statistik"
+
+#: actions/showgroup.php:444
 msgctxt "LABEL"
 msgid "Created"
 msgstr "Skapad"
 
 #. TRANS: Label for member count in statistics on group page.
-#: actions/showgroup.php:473
+#: actions/showgroup.php:449
 msgctxt "LABEL"
 msgid "Members"
 msgstr "Medlemmar"
@@ -5643,7 +5694,7 @@ msgstr "Medlemmar"
 #. TRANS: **%s** is the group alias, %%%%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).
-#: actions/showgroup.php:488
+#: actions/showgroup.php:464
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5661,7 +5712,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: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
-#: actions/showgroup.php:498
+#: actions/showgroup.php:474
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5675,7 +5726,7 @@ msgstr ""
 "sina liv och intressen. "
 
 #. TRANS: Header for list of group administrators on a group page (h2).
-#: actions/showgroup.php:527
+#: actions/showgroup.php:503
 msgid "Admins"
 msgstr "Administratörer"
 
@@ -5714,7 +5765,7 @@ msgid "%1$s tagged %2$s"
 msgstr "%1$s taggade %2$d"
 
 #. TRANS: Page title showing tagged notices in one user's stream.
-#. TRANS: %1$s is the username, %2$s is the hash tag, %1$d is the page number.
+#. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
 #: actions/showstream.php:74
 #, php-format
 msgid "%1$s tagged %2$s, page %3$d"
@@ -5761,13 +5812,13 @@ msgid "FOAF for %s"
 msgstr "FOAF för %s"
 
 #. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
-#: actions/showstream.php:211
+#: actions/showstream.php:205
 #, fuzzy, php-format
 msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr "Detta är tidslinjen för %1$s men %2$s har inte postat något än."
 
 #. TRANS: Second sentence of empty list message for a stream for the user themselves.
-#: actions/showstream.php:217
+#: actions/showstream.php:211
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
@@ -5777,7 +5828,7 @@ msgstr ""
 
 #. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:221
+#: actions/showstream.php:215
 #, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
@@ -5788,7 +5839,7 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:264
+#: actions/showstream.php:258
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5803,7 +5854,7 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:271
+#: actions/showstream.php:265
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5815,7 +5866,7 @@ msgstr ""
 "[StatusNet](http://status.net/). "
 
 #. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
-#: actions/showstream.php:328
+#: actions/showstream.php:322
 #, php-format
 msgid "Repeat of %s"
 msgstr "Upprepning av %s"
@@ -5963,75 +6014,75 @@ msgstr "Text för webbplatsnotis (max 255 tecken; HTML ok)"
 #. TRANS: Title for button to save site notice in admin panel.
 #: actions/sitenoticeadminpanel.php:201
 #, fuzzy
-msgid "Save site notice"
+msgid "Save site notice."
 msgstr "Spara webbplatsnotis"
 
 #. TRANS: Title for SMS settings.
-#: actions/smssettings.php:57
+#: actions/smssettings.php:56
 msgid "SMS settings"
 msgstr "Inställningar för SMS"
 
 #. TRANS: SMS settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/smssettings.php:71
+#: actions/smssettings.php:70
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr "Du kan ta emot SMS-meddelanden genom e-post från %%site.name%%."
 
 #. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
-#: actions/smssettings.php:93
+#: actions/smssettings.php:92
 msgid "SMS is not available."
 msgstr "SMS är inte tillgängligt."
 
 #. TRANS: Form legend for SMS settings form.
-#: actions/smssettings.php:107
+#: actions/smssettings.php:106
 msgid "SMS address"
 msgstr "SMS-adress"
 
 #. TRANS: Form guide in SMS settings form.
-#: actions/smssettings.php:116
+#: actions/smssettings.php:115
 msgid "Current confirmed SMS-enabled phone number."
 msgstr "Nuvarande bekäftat telefonnummer för SMS."
 
 #. TRANS: Form guide in IM settings form.
-#: actions/smssettings.php:129
+#: actions/smssettings.php:128
 msgid "Awaiting confirmation on this phone number."
 msgstr "Väntar bekräftelse för detta telefonnummer."
 
 #. TRANS: Field label for SMS address input in SMS settings form.
-#: actions/smssettings.php:138
+#: actions/smssettings.php:137
 msgid "Confirmation code"
 msgstr "Bekräftelsekod"
 
 #. TRANS: Form field instructions in SMS settings form.
-#: actions/smssettings.php:140
+#: actions/smssettings.php:139
 msgid "Enter the code you received on your phone."
 msgstr "Fyll i koden du mottog i din telefon."
 
 #. TRANS: Button label to confirm SMS confirmation code in SMS settings.
-#: actions/smssettings.php:144
+#: actions/smssettings.php:143
 msgctxt "BUTTON"
 msgid "Confirm"
 msgstr "Bekräfta"
 
 #. TRANS: Field label for SMS phone number input in SMS settings form.
-#: actions/smssettings.php:149
+#: actions/smssettings.php:148
 msgid "SMS phone number"
 msgstr "Telefonnummer för SMS"
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
-#: actions/smssettings.php:152
+#: actions/smssettings.php:151
 #, fuzzy
-msgid "Phone number, no punctuation or spaces, with area code"
+msgid "Phone number, no punctuation or spaces, with area code."
 msgstr "Telefonnummer, inga punkter eller mellanslag, med landskod"
 
 #. TRANS: Form legend for SMS preferences form.
-#: actions/smssettings.php:191
+#: actions/smssettings.php:190
 msgid "SMS preferences"
 msgstr "SMS-inställningar"
 
 #. TRANS: Checkbox label in SMS preferences form.
-#: actions/smssettings.php:197
+#: actions/smssettings.php:196
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
@@ -6040,32 +6091,32 @@ msgstr ""
 "debitera mig."
 
 #. TRANS: Confirmation message for successful SMS preferences save.
-#: actions/smssettings.php:308
+#: actions/smssettings.php:307
 msgid "SMS preferences saved."
 msgstr "SMS-inställningar sparade."
 
 #. TRANS: Message given saving SMS phone number without having provided one.
-#: actions/smssettings.php:330
+#: actions/smssettings.php:329
 msgid "No phone number."
 msgstr "Inget telefonnummer."
 
 #. TRANS: Message given saving SMS phone number without having selected a carrier.
-#: actions/smssettings.php:336
+#: actions/smssettings.php:335
 msgid "No carrier selected."
 msgstr "Ingen operatör vald."
 
 #. TRANS: Message given saving SMS phone number that is already set.
-#: actions/smssettings.php:344
+#: actions/smssettings.php:343
 msgid "That is already your phone number."
 msgstr "Detta är redan ditt telefonnummer."
 
 #. TRANS: Message given saving SMS phone number that is already set for another user.
-#: actions/smssettings.php:348
+#: actions/smssettings.php:347
 msgid "That phone number already belongs to another user."
 msgstr "Detta telefonnumr tillhör redan en annan användare."
 
 #. TRANS: Message given saving valid SMS phone number that is to be confirmed.
-#: actions/smssettings.php:376
+#: actions/smssettings.php:375
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
 "for the code and instructions on how to use it."
@@ -6074,39 +6125,39 @@ msgstr ""
 "din telefon för koden och instruktioner om hur du använder den."
 
 #. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
-#: actions/smssettings.php:404
+#: actions/smssettings.php:403
 msgid "That is the wrong confirmation number."
 msgstr "Detta är fel bekräftelsenummer."
 
 #. TRANS: Message given after successfully canceling SMS phone number confirmation.
-#: actions/smssettings.php:418
+#: actions/smssettings.php:417
 msgid "SMS confirmation cancelled."
 msgstr "SMS-bekräftelse avbruten."
 
 #. TRANS: Message given trying to remove an SMS phone number that is not
 #. TRANS: registered for the active user.
-#: actions/smssettings.php:438
+#: actions/smssettings.php:437
 msgid "That is not your phone number."
 msgstr "Detta är inte ditt telefonnummer."
 
 #. TRANS: Message given after successfully removing a registered SMS phone number.
-#: actions/smssettings.php:460
+#: actions/smssettings.php:459
 msgid "The SMS phone number was removed."
 msgstr "Telefonnummer för SMS togs bort."
 
 #. TRANS: Label for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:499
+#: actions/smssettings.php:498
 msgid "Mobile carrier"
 msgstr "Mobiloperatör"
 
 #. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:504
+#: actions/smssettings.php:503
 msgid "Select a carrier"
 msgstr "Välj en operatör"
 
 #. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
 #. TRANS: %s is an administrative contact's e-mail address.
-#: actions/smssettings.php:513
+#: actions/smssettings.php:512
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -6117,7 +6168,7 @@ msgstr ""
 "på %s och berätta."
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
-#: actions/smssettings.php:535
+#: actions/smssettings.php:534
 #, fuzzy
 msgid "No code entered."
 msgstr "Ingen kod ifylld"
@@ -6191,15 +6242,13 @@ msgstr "Du är inte prenumerat hos den profilen."
 msgid "Could not save subscription."
 msgstr "Kunde inte spara prenumeration."
 
-#: actions/subscribe.php:77
-msgid "This action only accepts POST requests."
-msgstr "Denna åtgärd accepterar endast POST-begäran."
-
-#: actions/subscribe.php:117
+#. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
+#: actions/subscribe.php:121
 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
 msgstr "Du kan inte prenumerera på en 0MB 0.1-fjärrprofil med denna åtgärd."
 
-#: actions/subscribe.php:145
+#. TRANS: Page title when subscription succeeded.
+#: actions/subscribe.php:149
 msgid "Subscribed"
 msgstr "Prenumerant"
 
@@ -6317,31 +6366,34 @@ msgid "Subscription feed for %s (Atom)"
 msgstr "Flöde av notiser för %s (Atom)"
 
 #. TRANS: Checkbox label for enabling Jabber messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:239
-msgid "Jabber"
-msgstr "Jabber"
+#: actions/subscriptions.php:241 lib/settingsnav.php:110
+#, fuzzy
+msgid "IM"
+msgstr "Snabbmeddelande"
 
 #. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:254
+#: actions/subscriptions.php:256 lib/settingsnav.php:117
 msgid "SMS"
 msgstr "SMS"
 
-#: actions/tag.php:69
+#. TRANS: Title for all but the first page of notices with tags.
+#. TRANS: %1$s is the tag, %2$d is the page number.
+#: actions/tag.php:73
 #, php-format
 msgid "Notices tagged with %1$s, page %2$d"
 msgstr "Notiser taggade med %1$s, sida %2$d"
 
-#: actions/tag.php:87
+#: actions/tag.php:91
 #, php-format
 msgid "Notice feed for tag %s (RSS 1.0)"
 msgstr "Flöde av notiser för tagg %s (RSS 1.0)"
 
-#: actions/tag.php:93
+#: actions/tag.php:97
 #, php-format
 msgid "Notice feed for tag %s (RSS 2.0)"
 msgstr "Flöde av notiser för tagg %s (RSS 2.0)"
 
-#: actions/tag.php:99
+#: actions/tag.php:103
 #, php-format
 msgid "Notice feed for tag %s (Atom)"
 msgstr "Flöde av notiser för tagg %s (Atom)"
@@ -6360,17 +6412,11 @@ msgstr "Tagg %s"
 msgid "User profile"
 msgstr "Användarprofil"
 
-#. TRANS: DT element in area for user avatar.
-#: actions/tagother.php:81 actions/userauthorization.php:132
-#: lib/userprofile.php:108
-msgid "Photo"
-msgstr "Foto"
-
-#: actions/tagother.php:141
+#: actions/tagother.php:120
 msgid "Tag user"
 msgstr "Tagga användare"
 
-#: actions/tagother.php:151
+#: actions/tagother.php:130
 msgid ""
 "Tags for this user (letters, numbers, -, ., and _), comma- or space- "
 "separated"
@@ -6378,13 +6424,18 @@ msgstr ""
 "Taggar för denna användare (bokstäver, nummer, -, ., och _), separerade med "
 "kommatecken eller mellanslag"
 
-#: actions/tagother.php:193
+#: actions/tagother.php:157
+#, php-format
+msgid "Invalid tag: \"%s\""
+msgstr "Ogiltig tagg: \"%s\""
+
+#: actions/tagother.php:172
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 "Du kan bara tagga personer du prenumererar på eller som prenumererar på dig."
 
-#: actions/tagother.php:236
+#: actions/tagother.php:215
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
 "Använd detta formulär för att lägga till taggar till dina prenumeranter "
@@ -6394,6 +6445,7 @@ msgstr ""
 msgid "No such tag."
 msgstr "Ingen sådan tagg."
 
+#. TRANS: Client error displayed when trying to unblock a non-blocked user.
 #: actions/unblock.php:59
 msgid "You haven't blocked that user."
 msgstr "Du har inte blockerat denna användared."
@@ -6414,7 +6466,7 @@ msgstr "Ingen profil-ID i begäran."
 msgid "Unsubscribed"
 msgstr "Prenumeration avslutad"
 
-#: actions/updateprofile.php:64 actions/userauthorization.php:337
+#: actions/updateprofile.php:64
 #, php-format
 msgid ""
 "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
@@ -6422,6 +6474,78 @@ msgstr ""
 "Licensen för lyssnarströmmen '%1$s' är inte förenlig med webbplatslicensen '%"
 "2$s'."
 
+#: actions/urlsettings.php:60
+#, fuzzy
+msgid "URL settings"
+msgstr "Inställningar för snabbmeddelanden"
+
+#. TRANS: Instructions for tab "Other" in user profile settings.
+#: actions/urlsettings.php:72
+msgid "Manage various other options."
+msgstr "Hantera diverse andra alternativ."
+
+#. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
+#. TRANS: user's profile settings. This message has one space at the beginning. Use your
+#. TRANS: language's word separator here if it has one (most likely a single space).
+#: actions/urlsettings.php:115
+msgid " (free service)"
+msgstr " (fri tjänst)"
+
+#: actions/urlsettings.php:121
+#, fuzzy
+msgid "[none]"
+msgstr "Ingen"
+
+#: actions/urlsettings.php:122
+msgid "[internal]"
+msgstr ""
+
+#. TRANS: Label for dropdown with URL shortener services.
+#: actions/urlsettings.php:130
+msgid "Shorten URLs with"
+msgstr "Förkorta URL:er med"
+
+#. TRANS: Tooltip for for dropdown with URL shortener services.
+#: actions/urlsettings.php:132
+msgid "Automatic shortening service to use."
+msgstr "Automatiska förkortningstjänster att använda."
+
+#: actions/urlsettings.php:138
+msgid "URL longer than"
+msgstr ""
+
+#: actions/urlsettings.php:141
+msgid "URLs longer than this will be shortened, 0 means always shorten."
+msgstr ""
+
+#: actions/urlsettings.php:145
+msgid "Text longer than"
+msgstr ""
+
+#: actions/urlsettings.php:148
+msgid ""
+"URLs in notices longer than this will be shortened, 0 means always shorten."
+msgstr ""
+
+#. TRANS: Form validation error for form "Other settings" in user profile.
+#: actions/urlsettings.php:180
+#, fuzzy
+msgid "URL shortening service is too long (maximum 50 characters)."
+msgstr "Namnet på URL-förkortningstjänsen är för långt (max 50 tecken)."
+
+#: actions/urlsettings.php:187
+msgid "Invalid number for max url length."
+msgstr ""
+
+#: actions/urlsettings.php:193
+#, fuzzy
+msgid "Invalid number for max notice length."
+msgstr "Ogiltigt notisinnehåll."
+
+#: actions/urlsettings.php:238
+msgid "Error saving user URL shortening preferences."
+msgstr ""
+
 #. TRANS: User admin panel title
 #: actions/useradminpanel.php:58
 msgctxt "TITLE"
@@ -6448,11 +6572,11 @@ msgstr "Ogiltig välkomsttext. Maximal längd är 255 tecken."
 #. TRANS: users in user admin panel. %1$s is the invalid nickname.
 #: actions/useradminpanel.php:166
 #, fuzzy, php-format
-msgid "Invalid default subscripton: '%1$s' is not a user."
+msgid "Invalid default subscripton: \"%1$s\" is not a user."
 msgstr "Ogiltig standardprenumeration: '%1$s' är inte användare."
 
-#. TRANS: Link description in user account settings menu.
-#: actions/useradminpanel.php:215 lib/accountsettingsaction.php:106
+#: actions/useradminpanel.php:215 lib/action.php:565 lib/settingsnav.php:77
+#: lib/subgroupnav.php:81
 msgid "Profile"
 msgstr "Profil"
 
@@ -6512,59 +6636,63 @@ msgstr "Hurvida användare skall tillåtas bjuda in nya användare."
 #. TRANS: Title for button to save user settings in user admin panel.
 #: actions/useradminpanel.php:302
 #, fuzzy
-msgid "Save user settings"
+msgid "Save user settings."
 msgstr "Spara webbplatsinställningar"
 
-#: actions/userauthorization.php:105
+#. TRANS: Page title.
+#: actions/userauthorization.php:109
 msgid "Authorize subscription"
 msgstr "Godkänn prenumeration"
 
-#: actions/userauthorization.php:110
+#. TRANS: Page notice on "Auhtorize subscription" page.
+#: actions/userauthorization.php:115
 #, fuzzy
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
 "user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
-"click “Reject”."
+"click \"Reject\"."
 msgstr ""
 "Vänligen kontrollera dessa uppgifter för att försäkra dig om att du vill "
 "prenumerera på den här användarens notiser. Om du inte bett att prenumerera "
 "på någons meddelanden, klicka på \"Avvisa\"."
 
-#. TRANS: Menu item for site administration
-#: actions/userauthorization.php:196 actions/version.php:167
-#: lib/adminpanelaction.php:403
-msgid "License"
-msgstr "Licens"
-
-#: actions/userauthorization.php:217
+#. TRANS: Button text on Authorise Subscription page.
+#: actions/userauthorization.php:200
 #, fuzzy
+msgctxt "BUTTON"
 msgid "Accept"
 msgstr "Acceptera"
 
-#: actions/userauthorization.php:218 lib/subscribeform.php:115
-#: lib/subscribeform.php:139
-msgid "Subscribe to this user"
+#. TRANS: Title for button on Authorise Subscription page.
+#: actions/userauthorization.php:202
+#, fuzzy
+msgid "Subscribe to this user."
 msgstr "Prenumerera på denna användare"
 
-#: actions/userauthorization.php:219
+#. TRANS: Button text on Authorise Subscription page.
+#: actions/userauthorization.php:204
 #, fuzzy
+msgctxt "BUTTON"
 msgid "Reject"
 msgstr "Avvisa"
 
-#: actions/userauthorization.php:220
+#. TRANS: Title for button on Authorise Subscription page.
+#: actions/userauthorization.php:206
 #, fuzzy
-msgid "Reject this subscription"
+msgid "Reject this subscription."
 msgstr "Avvisa denna prenumeration"
 
-#: actions/userauthorization.php:232
+#. TRANS: Client error displayed for an empty authorisation request.
+#: actions/userauthorization.php:219
 msgid "No authorization request!"
 msgstr "Ingen begäran om godkännande!"
 
-#: actions/userauthorization.php:254
+#. TRANS: Accept message header from Authorise subscription page.
+#: actions/userauthorization.php:242
 msgid "Subscription authorized"
 msgstr "Prenumeration godkänd"
 
-#: actions/userauthorization.php:256
+#: actions/userauthorization.php:245
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to authorize the "
@@ -6574,11 +6702,12 @@ msgstr ""
 "med webbplatsens instruktioner hur du bekräftar en prenumeration. Din "
 "prenumerations-token är:"
 
-#: actions/userauthorization.php:266
+#. TRANS: Reject message header from Authorise subscription page.
+#: actions/userauthorization.php:256
 msgid "Subscription rejected"
 msgstr "Prenumeration avvisad"
 
-#: actions/userauthorization.php:268
+#: actions/userauthorization.php:259
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to fully reject the "
@@ -6588,58 +6717,101 @@ msgstr ""
 "webbplatsens instruktioner för detaljer om hur du fullständingt avvisar "
 "prenumerationen."
 
-#: actions/userauthorization.php:303
+#. TRANS: Exception thrown when no valid user is found for an authorisation request.
+#. TRANS: %s is a listener URI.
+#: actions/userauthorization.php:296
 #, fuzzy, php-format
-msgid "Listener URI ‘%s’ not found here."
+msgid "Listener URI \"%s\" not found here."
 msgstr "URI för lyssnare '%s' hittades inte här."
 
-#: actions/userauthorization.php:308
+#. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
+#. TRANS: %s is a listenee URI.
+#: actions/userauthorization.php:303
 #, fuzzy, php-format
-msgid "Listenee URI ‘%s’ is too long."
+msgid "Listenee URI \"%s\" is too long."
 msgstr "Lyssnar-URI '%s' är för lång."
 
-#: actions/userauthorization.php:314
+#. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
+#. TRANS: %s is a listenee URI.
+#: actions/userauthorization.php:311
 #, fuzzy, php-format
-msgid "Listenee URI ‘%s’ is a local user."
+msgid "Listenee URI \"%s\" is a local user."
 msgstr "Lyssnar-URI '%s' är en lokal användare."
 
+#. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
+#. TRANS: %s is a profile URL.
 #: actions/userauthorization.php:329
 #, fuzzy, php-format
-msgid "Profile URL ‘%s’ is for a local user."
+msgid "Profile URL \"%s\" is for a local user."
 msgstr "Profil-URL ‘%s’ är för en lokal användare."
 
-#: actions/userauthorization.php:345
+#. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
+#. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
+#: actions/userauthorization.php:339
 #, fuzzy, php-format
-msgid "Avatar URL ‘%s’ is not valid."
+msgid ""
+"Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
+"\"."
+msgstr ""
+"Licensen för lyssnarströmmen '%1$s' är inte förenlig med webbplatslicensen '%"
+"2$s'."
+
+#. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
+#. TRANS: %s is an avatar URL.
+#: actions/userauthorization.php:349
+#, fuzzy, php-format
+msgid "Avatar URL \"%s\" is not valid."
 msgstr "Avatar-URL ‘%s’ är inte giltig."
 
-#: actions/userauthorization.php:350
+#. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
+#. TRANS: %s is an avatar URL.
+#: actions/userauthorization.php:356
 #, fuzzy, php-format
-msgid "Can’t read avatar URL ‘%s’."
+msgid "Cannot read avatar URL \"%s\"."
 msgstr "Kan inte läsa avatar-URL '%s'."
 
-#: actions/userauthorization.php:355
+#. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
+#. TRANS: %s is an avatar URL.
+#: actions/userauthorization.php:363
 #, fuzzy, php-format
-msgid "Wrong image type for avatar URL ‘%s’."
+msgid "Wrong image type for avatar URL \"%s\"."
 msgstr "Fel bildtyp för avatar-URL '%s'."
 
 #. TRANS: Page title for profile design page.
-#: actions/userdesignsettings.php:74 lib/designsettings.php:63
+#: actions/userdesignsettings.php:74 lib/designsettings.php:61
 msgid "Profile design"
 msgstr "Profilutseende"
 
 #. TRANS: Instructions for profile design page.
-#: actions/userdesignsettings.php:84 lib/designsettings.php:74
+#: actions/userdesignsettings.php:84 lib/designsettings.php:72
 msgid ""
 "Customize the way your profile looks with a background image and a colour "
 "palette of your choice."
 msgstr ""
 "Anpassa hur din profil ser ut genom att välja bakgrundbild och färgpalett."
 
-#: actions/userdesignsettings.php:272
+#: actions/userdesignsettings.php:289
 msgid "Enjoy your hotdog!"
 msgstr "Smaklig måltid!"
 
+#: actions/userdesignsettings.php:325
+#, fuzzy
+msgid "Design settings"
+msgstr "Spara webbplatsinställningar"
+
+#: actions/userdesignsettings.php:340
+msgid "View profile designs"
+msgstr "Visa profilutseenden"
+
+#: actions/userdesignsettings.php:341
+msgid "Show or hide profile designs."
+msgstr "Visa eller göm profilutseenden."
+
+#: actions/userdesignsettings.php:348
+#, fuzzy
+msgid "Background file"
+msgstr "Bakgrund"
+
 #. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number.
 #: actions/usergroups.php:66
 #, php-format
@@ -6690,6 +6862,11 @@ msgstr ""
 msgid "Contributors"
 msgstr "Medarbetare"
 
+#. TRANS: Menu item for site administration
+#: actions/version.php:167 lib/adminpanelaction.php:403
+msgid "License"
+msgstr "Licens"
+
 #: actions/version.php:170
 msgid ""
 "StatusNet is free software: you can redistribute it and/or modify it under "
@@ -6723,12 +6900,13 @@ msgstr ""
 "Du bör ha fått en kopia av GNU Affero General Public License tillsammans med "
 "detta program. Om inte, se %s."
 
-#: actions/version.php:191
-msgid "Plugins"
-msgstr "Insticksmoduler"
+#. TRANS: Form input field label for application name.
+#: actions/version.php:197 lib/applicationeditform.php:190
+msgid "Name"
+msgstr "Namn"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:901
+#: actions/version.php:198 lib/action.php:885
 msgid "Version"
 msgstr "Version"
 
@@ -6736,6 +6914,12 @@ msgstr "Version"
 msgid "Author(s)"
 msgstr "Författare"
 
+#. TRANS: Form input field label.
+#: actions/version.php:200 lib/applicationeditform.php:208
+#: lib/groupeditform.php:168
+msgid "Description"
+msgstr "Beskrivning"
+
 #. TRANS: Activity title when marking a notice as favorite.
 #: classes/Fave.php:164
 msgid "Favor"
@@ -6856,7 +7040,7 @@ msgid "Could not create login token for %s"
 msgstr "Kunde inte skapa inloggnings-token för %s"
 
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
-#: classes/Memcached_DataObject.php:542
+#: classes/Memcached_DataObject.php:556
 msgid "No database name or DSN found anywhere."
 msgstr "Inget databasnamn eller DSN funnen någonstans."
 
@@ -7031,18 +7215,18 @@ msgstr "%1$s lyssnar nu på dina notiser på %2$s."
 
 #. TRANS: Notice given on user registration.
 #. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:395
+#: classes/User.php:390
 #, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr "Välkommen till %1$s, @%2$s!"
 
 #. TRANS: Server exception.
-#: classes/User.php:918
+#: classes/User.php:923
 msgid "No single user defined for single-user mode."
 msgstr "Ingen enskild användare definierad för enanvändarläge."
 
 #. TRANS: Server exception.
-#: classes/User.php:922
+#: classes/User.php:927
 msgid "Single-user mode code called when not enabled."
 msgstr ""
 
@@ -7087,41 +7271,6 @@ msgstr ""
 msgid "No AtomPub API service for %s."
 msgstr ""
 
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:104
-msgid "Change your profile settings"
-msgstr "Ändra dina profilinställningar"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:111
-msgid "Upload an avatar"
-msgstr "Ladda upp en avatar"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:118
-msgid "Change your password"
-msgstr "Ändra ditt lösenord"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:125
-msgid "Change email handling"
-msgstr "Ändra e-posthantering"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:132
-msgid "Design your profile"
-msgstr "Designa din profil"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:139
-msgid "Other options"
-msgstr "Övriga alternativ"
-
-#. TRANS: Link description in user account settings menu.
-#: lib/accountsettingsaction.php:141
-msgid "Other"
-msgstr "Övrigt"
-
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
 #: lib/action.php:161
 #, php-format
@@ -7139,206 +7288,128 @@ msgctxt "TOOLTIP"
 msgid "Show more"
 msgstr "Visa mer"
 
-#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:544
-msgid "Primary site navigation"
-msgstr "Primär webbplatsnavigation"
+#. TRANS: Inline reply form submit button: submits a reply comment.
+#: lib/action.php:328
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Comment"
+msgstr "Innehåll"
 
-#. TRANS: Tooltip for main menu option "Personal".
-#: lib/action.php:550
-msgctxt "TOOLTIP"
-msgid "Personal profile and friends timeline"
-msgstr "Personlig profil och vänners tidslinje"
+#. TRANS: Placeholder text for inline reply form. Clicking in this box will turn it into a mini notice form.
+#: lib/action.php:331
+msgid "Add a comment..."
+msgstr ""
 
-#. TRANS: Main menu option when logged in for access to personal profile and friends timeline.
-#. TRANS: Personal group navigation menu option when logged in for viewing timeline of self and friends.
-#: lib/action.php:553 lib/personalgroupnav.php:100
-msgctxt "MENU"
-msgid "Personal"
-msgstr "Personligt"
+#: lib/action.php:559 lib/personalgroupnav.php:99
+#, fuzzy
+msgid "Home"
+msgstr "Hemsida"
 
-#. TRANS: Tooltip for main menu option "Account".
-#: lib/action.php:555
-msgctxt "TOOLTIP"
-msgid "Change your email, avatar, password, profile"
-msgstr "Ändra din e-post, avatar, lösenord, profil"
-
-#. TRANS: Main menu option when logged in for access to user settings.
-#: lib/action.php:558
-msgid "Account"
-msgstr "Konto"
-
-#. TRANS: Tooltip for main menu option "Services".
 #: lib/action.php:560
-msgctxt "TOOLTIP"
-msgid "Connect to services"
-msgstr "Anslut till tjänster"
+#, fuzzy
+msgid "Friends timeline"
+msgstr "%s tidslinje"
 
-#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services.
-#: lib/action.php:563
-msgid "Connect"
-msgstr "Anslut"
-
-#. TRANS: Tooltip for menu option "Admin".
 #: lib/action.php:566
-msgctxt "TOOLTIP"
-msgid "Change site configuration"
-msgstr "Ändra webbplatskonfiguration"
+#, fuzzy
+msgid "Your profile"
+msgstr "Grupprofil"
 
-#. TRANS: Main menu option when logged in and site admin for access to site configuration.
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/action.php:569 lib/groupnav.php:117
-msgctxt "MENU"
-msgid "Admin"
-msgstr "Administratör"
+#: lib/action.php:570 lib/action.php:593 lib/publicgroupnav.php:78
+msgid "Public"
+msgstr "Publikt"
 
-#. TRANS: Tooltip for main menu option "Invite".
-#: lib/action.php:573
-#, php-format
-msgctxt "TOOLTIP"
-msgid "Invite friends and colleagues to join you on %s"
-msgstr "Bjud in vänner och kollegor att gå med dig på %s"
+#: lib/action.php:571 lib/action.php:594
+#, fuzzy
+msgid "Everyone on this site"
+msgstr "Hitta personer på denna webbplats"
+
+#: lib/action.php:575
+#, fuzzy
+msgid "Settings"
+msgstr "Inställningar för SMS"
 
-#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users.
 #: lib/action.php:576
-msgctxt "MENU"
-msgid "Invite"
-msgstr "Bjud in"
+#, fuzzy
+msgid "Change your personal settings"
+msgstr "Ändra dina profilinställningar"
 
-#. TRANS: Tooltip for main menu option "Logout"
 #: lib/action.php:582
-msgctxt "TOOLTIP"
-msgid "Logout from the site"
-msgstr "Logga ut från webbplatsen"
+#, fuzzy
+msgid "Site configuration"
+msgstr "Konfiguration av användare"
 
-#. TRANS: Main menu option when logged in to log out the current user.
-#: lib/action.php:585
-msgctxt "MENU"
+#: lib/action.php:587
+#, fuzzy
 msgid "Logout"
 msgstr "Logga ut"
 
-#. TRANS: Tooltip for main menu option "Register".
-#: lib/action.php:590
-msgctxt "TOOLTIP"
-msgid "Create an account"
-msgstr "Skapa ett konto"
+#: lib/action.php:588
+#, fuzzy
+msgid "Logout from the site"
+msgstr "Logga ut från webbplatsen"
 
-#. TRANS: Main menu option when not logged in to register a new account.
-#. TRANS: Menu item for registering with the StatusNet site.
-#: lib/action.php:593 lib/logingroupnav.php:85
-msgctxt "MENU"
-msgid "Register"
-msgstr "Registrera"
-
-#. TRANS: Tooltip for main menu option "Login".
-#: lib/action.php:596
-msgctxt "TOOLTIP"
+#: lib/action.php:599
+#, fuzzy
 msgid "Login to the site"
 msgstr "Logga in på webbplatsen"
 
-#. TRANS: Main menu option when not logged in to log in.
-#. TRANS: Menu item for logging in to the StatusNet site.
-#: lib/action.php:599 lib/logingroupnav.php:77
-msgctxt "MENU"
-msgid "Login"
-msgstr "Logga in"
-
-#. TRANS: Tooltip for main menu option "Help".
-#: lib/action.php:602
-msgctxt "TOOLTIP"
-msgid "Help me!"
-msgstr "Hjälp mig!"
-
-#. TRANS: Main menu option for help on the StatusNet site.
-#: lib/action.php:605
-msgctxt "MENU"
-msgid "Help"
-msgstr "Hjälp"
-
-#. TRANS: Tooltip for main menu option "Search".
-#: lib/action.php:608
-msgctxt "TOOLTIP"
-msgid "Search for people or text"
-msgstr "Sök efter personer eller text"
-
-#. TRANS: Main menu option when logged in or when the StatusNet instance is not private.
-#: lib/action.php:611
-msgctxt "MENU"
+#: lib/action.php:606
+#, fuzzy
 msgid "Search"
 msgstr "Sök"
 
-#. TRANS: DT element for site notice. String is hidden in default CSS.
-#. TRANS: Menu item for site administration
-#: lib/action.php:633 lib/adminpanelaction.php:387
-msgid "Site notice"
-msgstr "Webbplatsnotis"
-
-#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:700
-msgid "Local views"
-msgstr "Lokala vyer"
-
-#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:770
-msgid "Page notice"
-msgstr "Sidnotis"
-
-#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:874
-msgid "Secondary site navigation"
-msgstr "Sekundär webbplatsnavigation"
+#: lib/action.php:607
+#, fuzzy
+msgid "Search the site"
+msgstr "Sök webbplats"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:880
+#: lib/action.php:864
 msgid "Help"
 msgstr "Hjälp"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:883
+#: lib/action.php:867
 msgid "About"
 msgstr "Om"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:886
+#: lib/action.php:870
 msgid "FAQ"
 msgstr "Frågor & svar"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:891
+#: lib/action.php:875
 msgid "TOS"
 msgstr "Användarvillkor"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:895
+#: lib/action.php:879
 msgid "Privacy"
 msgstr "Sekretess"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:898
+#: lib/action.php:882
 msgid "Source"
 msgstr "Källa"
 
 #. TRANS: Secondary navigation menu option leading to e-mail contact information on the
 #. TRANS: StatusNet site, where to report bugs, ...
-#: lib/action.php:905
+#: lib/action.php:889
 msgid "Contact"
 msgstr "Kontakt"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:908
+#: lib/action.php:892
 msgid "Badge"
 msgstr "Emblem"
 
-#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:937
-msgid "StatusNet software license"
-msgstr "Programvarulicens för StatusNet"
-
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:944
+#: lib/action.php:921
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7348,7 +7419,7 @@ msgstr ""
 "%%](%%site.broughtbyurl%%)."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:947
+#: lib/action.php:924
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** är en mikrobloggtjänst."
@@ -7357,7 +7428,7 @@ msgstr "**%%site.name%%** är en mikrobloggtjänst."
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:954
+#: lib/action.php:931
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7368,52 +7439,42 @@ msgstr ""
 "version %s, tillgänglig under [GNU Affero General Public License](http://www."
 "fsf.org/licensing/licenses/agpl-3.0.html)."
 
-#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:970
-msgid "Site content license"
-msgstr "Licens för webbplatsinnehåll"
-
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:977
+#: lib/action.php:949
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr "Innehåll och data av %1$s är privat och konfidensiell."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:984
+#: lib/action.php:956
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr "Innehåll och data copyright av %1$s. Alla rättigheter reserverade."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:988
+#: lib/action.php:960
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 "Innehåll och data copyright av medarbetare. Alla rättigheter reserverade."
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:1020
+#: lib/action.php:992
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr "Innehåll och data på %1$s är tillgänglig under licensen %2$s."
 
-#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1356
-msgid "Pagination"
-msgstr "Numrering av sidor"
-
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1367
+#: lib/action.php:1335
 msgid "After"
 msgstr "Senare"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1377
+#: lib/action.php:1345
 msgid "Before"
 msgstr "Tidigare"
 
@@ -7567,7 +7628,7 @@ msgid "User configuration"
 msgstr "Konfiguration av användare"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:122
+#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:110
 msgid "User"
 msgstr "Användare"
 
@@ -7591,6 +7652,11 @@ msgstr "Konfiguration av sessioner"
 msgid "Edit site notice"
 msgstr "Redigera webbplatsnotis"
 
+#. TRANS: Menu item for site administration
+#: lib/adminpanelaction.php:387
+msgid "Site notice"
+msgstr "Webbplatsnotis"
+
 #. TRANS: Menu item title/tooltip
 #: lib/adminpanelaction.php:393
 msgid "Snapshots configuration"
@@ -7601,6 +7667,12 @@ msgstr "Konfiguration av ögonblicksbilder"
 msgid "Set site license"
 msgstr "Ange webbplatslicens"
 
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:409
+#, fuzzy
+msgid "Plugins configuration"
+msgstr "Konfiguration av sökvägar"
+
 #. TRANS: Client error 401.
 #: lib/apiauth.php:111
 msgid "API resource requires read-write access, but you only have read access."
@@ -7612,19 +7684,23 @@ msgstr ""
 msgid "No application for that consumer key."
 msgstr ""
 
+#: lib/apiauth.php:202 lib/apiauth.php:284
+msgid "Not allowed to use API."
+msgstr ""
+
 #. TRANS: OAuth exception given when an incorrect access token was given for a user.
-#: lib/apiauth.php:219
+#: lib/apiauth.php:225
 msgid "Bad access token."
 msgstr ""
 
 #. TRANS: OAuth exception given when no user was found for a given token (no token was found).
-#: lib/apiauth.php:224
+#: lib/apiauth.php:230
 msgid "No user for that token."
 msgstr ""
 
 #. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel".
 #. TRANS: Client error thrown when authentication fails.
-#: lib/apiauth.php:266 lib/apiauth.php:293
+#: lib/apiauth.php:272 lib/apiauth.php:302
 msgid "Could not authenticate you."
 msgstr ""
 
@@ -7671,6 +7747,11 @@ msgstr ""
 msgid "Failed to delete revoked token."
 msgstr ""
 
+#. TRANS: Form input field label for application icon.
+#: lib/applicationeditform.php:177
+msgid "Icon"
+msgstr "Ikon"
+
 #. TRANS: Form guide.
 #: lib/applicationeditform.php:182
 msgid "Icon for this application"
@@ -7705,6 +7786,11 @@ msgstr "URL för källa"
 msgid "Organization responsible for this application"
 msgstr "Organisation som ansvarar för denna applikation"
 
+#. TRANS: Form input field label.
+#: lib/applicationeditform.php:227
+msgid "Organization"
+msgstr "Organisation"
+
 #. TRANS: Form input field instructions.
 #: lib/applicationeditform.php:234
 msgid "URL for the homepage of the organization"
@@ -7794,16 +7880,6 @@ msgstr ""
 msgid "Do not use this method!"
 msgstr "Ta inte bort denna grupp"
 
-#. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:293
-msgid "Author"
-msgstr "Författare"
-
-#. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:307
-msgid "Provider"
-msgstr "Tillhandahållare"
-
 #. TRANS: Title.
 #: lib/attachmentnoticesection.php:67
 msgid "Notices where this attachment appears"
@@ -7829,23 +7905,28 @@ msgstr "Byte av lösenord är inte tillåtet."
 msgid "Block"
 msgstr "Blockera"
 
+#. TRANS: Description of the form to block a user.
+#: lib/blockform.php:79
+msgid "Block this user"
+msgstr "Blockera denna användare"
+
 #. TRANS: Title for command results.
-#: lib/channel.php:160 lib/channel.php:181
+#: lib/channel.php:104 lib/channel.php:125
 msgid "Command results"
 msgstr "Resultat av kommando"
 
 #. TRANS: Title for command results.
-#: lib/channel.php:194
+#: lib/channel.php:138
 msgid "AJAX error"
 msgstr "AJAX-fel"
 
 #. TRANS: E-mail subject when a command has completed.
-#: lib/channel.php:233 lib/mailhandler.php:143
+#: lib/channel.php:177 lib/mailhandler.php:143
 msgid "Command complete"
 msgstr "Kommando komplett"
 
 #. TRANS: E-mail subject when a command has failed.
-#: lib/channel.php:244
+#: lib/channel.php:188
 msgid "Command failed"
 msgstr "Kommando misslyckades"
 
@@ -7948,7 +8029,7 @@ msgstr "Fullständigt namn: %s"
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a location.
-#: lib/command.php:446 lib/mail.php:270
+#: lib/command.php:446 lib/mail.php:275
 #, php-format
 msgid "Location: %s"
 msgstr "Plats: %s"
@@ -7956,7 +8037,7 @@ msgstr "Plats: %s"
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a homepage.
-#: lib/command.php:450 lib/mail.php:274
+#: lib/command.php:450 lib/mail.php:279
 #, php-format
 msgid "Homepage: %s"
 msgstr "Hemsida: %s"
@@ -8227,110 +8308,103 @@ msgstr ""
 "tracking - inte implementerat än.\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:162
+#: lib/common.php:36
 #, fuzzy
 msgid "No configuration file found."
 msgstr "Ingen konfigurationsfil hittades. "
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:165
+#: lib/common.php:39
 #, fuzzy
 msgid "I looked for configuration files in the following places:"
 msgstr "Jag letade efter konfigurationsfiler på följande platser: "
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:168
+#: lib/common.php:42
 msgid "You may wish to run the installer to fix this."
 msgstr "Du kanske vill köra installeraren för att åtgärda detta."
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:172
+#: lib/common.php:46
 msgid "Go to the installer."
 msgstr "Gå till installeraren."
 
-#. TRANS: Menu item for Instant Messaging settings.
-#: lib/connectsettingsaction.php:106
-msgctxt "MENU"
-msgid "IM"
-msgstr "Snabbmeddelande"
-
-#. TRANS: Tooltip for Instant Messaging menu item.
-#: lib/connectsettingsaction.php:108
-msgid "Updates by instant messenger (IM)"
-msgstr "Uppdateringar via snabbmeddelande (IM)"
-
-#. TRANS: Menu item for Short Message Service settings.
-#: lib/connectsettingsaction.php:113
-msgctxt "MENU"
-msgid "SMS"
-msgstr "SMS"
-
-#. TRANS: Tooltip for Short Message Service menu item.
-#: lib/connectsettingsaction.php:115
-msgid "Updates by SMS"
-msgstr "Uppdateringar via SMS"
-
-#. TRANS: Menu item for OuAth connection settings.
-#: lib/connectsettingsaction.php:120
-msgctxt "MENU"
-msgid "Connections"
-msgstr "Anslutningar"
-
-#. TRANS: Tooltip for connected applications (Connections through OAuth) menu item.
-#: lib/connectsettingsaction.php:122
-msgid "Authorized connected applications"
-msgstr "Tillåt anslutna applikationer"
-
 #: lib/dberroraction.php:59
 msgid "Database error"
 msgstr "Databasfel"
 
+#. TRANS: Description of form for deleting a user.
+#: lib/deleteuserform.php:75
+msgid "Delete this user"
+msgstr "Ta bort denna användare"
+
+#: lib/designform.php:114
+#, fuzzy
+msgid "Change design"
+msgstr "Spara utseende"
+
+#. TRANS: Fieldset legend on profile design page to change profile page colours.
+#: lib/designform.php:131
+msgid "Change colours"
+msgstr "Byt färger"
+
+#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
+#: lib/designform.php:138
+msgid "Use defaults"
+msgstr "Använd standardvärden"
+
+#. TRANS: Title for button on profile design page to reset all colour settings to default.
+#: lib/designform.php:140
+msgid "Restore default designs"
+msgstr "Återställ standardutseende"
+
+#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
+#: lib/designform.php:148
+msgid "Reset back to default"
+msgstr "Återställ till standardvärde"
+
 #. TRANS: Label in form on profile design page.
 #. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
-#: lib/designsettings.php:108
+#: lib/designform.php:158
 msgid "Upload file"
 msgstr "Ladda upp fil"
 
 #. TRANS: Instructions for form on profile design page.
-#: lib/designsettings.php:113
+#: lib/designform.php:163
+#, fuzzy
 msgid ""
-"You can upload your personal background image. The maximum file size is 2MB."
+"You can upload your personal background image. The maximum file size is 2Mb."
 msgstr ""
 "Du kan ladda upp din personliga bakgrundbild. Den maximala filstorleken är "
 "2MB."
 
 #. TRANS: Radio button on profile design page that will enable use of the uploaded profile image.
-#: lib/designsettings.php:139
+#: lib/designform.php:194
 msgctxt "RADIO"
 msgid "On"
 msgstr "På"
 
 #. TRANS: Radio button on profile design page that will disable use of the uploaded profile image.
-#: lib/designsettings.php:156
+#: lib/designform.php:211
 msgctxt "RADIO"
 msgid "Off"
 msgstr "Av"
 
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: lib/designsettings.php:175
-msgid "Change colours"
-msgstr "Byt färger"
-
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: lib/designsettings.php:257
-msgid "Use defaults"
-msgstr "Använd standardvärden"
+#. TRANS: Title for button on profile design page to save settings.
+#: lib/designform.php:322
+msgid "Save design"
+msgstr "Spara utseende"
 
 #. TRANS: Error message displayed if design settings could not be saved.
 #. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
-#: lib/designsettings.php:405 lib/designsettings.php:427
+#: lib/designsettings.php:216 lib/designsettings.php:238
 msgid "Couldn't update your design."
 msgstr "Kunde inte uppdatera dina utseendeinställningar."
 
 #. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
-#: lib/designsettings.php:433
+#: lib/designsettings.php:244
 msgid "Design defaults restored."
 msgstr "Standardvärden för utseende återställda."
 
@@ -8400,27 +8474,23 @@ msgstr ""
 msgid "Feeds"
 msgstr "Flöden"
 
-#: lib/galleryaction.php:121
-msgid "Filter tags"
-msgstr "Filtrera taggar"
-
-#: lib/galleryaction.php:131
+#: lib/galleryaction.php:128
 msgid "All"
 msgstr "Alla"
 
-#: lib/galleryaction.php:139
+#: lib/galleryaction.php:136
 msgid "Select tag to filter"
 msgstr "Välj tagg att filtrera"
 
-#: lib/galleryaction.php:140
+#: lib/galleryaction.php:137
 msgid "Tag"
 msgstr "Tagg"
 
-#: lib/galleryaction.php:141
+#: lib/galleryaction.php:138
 msgid "Choose a tag to narrow list"
 msgstr "Välj en tagg för att begränsa lista"
 
-#: lib/galleryaction.php:143
+#: lib/galleryaction.php:140
 msgid "Go"
 msgstr "Gå"
 
@@ -8510,6 +8580,12 @@ msgctxt "TOOLTIP"
 msgid "%s blocked users"
 msgstr "%s blockerade användare"
 
+#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
+#: lib/groupnav.php:117
+msgctxt "MENU"
+msgid "Admin"
+msgstr "Administratör"
+
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
 #: lib/groupnav.php:120
@@ -8619,39 +8695,61 @@ msgid_plural "%dB"
 msgstr[0] "%dB"
 msgstr[1] "%dB"
 
-#: lib/jabber.php:387
+#: lib/implugin.php:262
 #, php-format
-msgid "[%s]"
-msgstr "[%s]"
+msgid ""
+"User \"%s\" on %s has said that your %s screenname belongs to them. If "
+"that's true, you can confirm by clicking on this URL: %s . (If you cannot "
+"click it, copy-and-paste it into the address bar of your browser). If that "
+"user isn't you, or if you didn't request this confirmation, just ignore this "
+"message."
+msgstr ""
 
-#: lib/jabber.php:567
+#: lib/implugin.php:349
 #, php-format
 msgid "Unknown inbox source %d."
 msgstr "Okänd källa för inkorg %d."
 
+#: lib/implugin.php:485
+#, fuzzy, php-format
+msgid "Message too long - maximum is %1$d characters, you sent %2$d."
+msgstr "Meddelande för långt - maximum är %1$d tecken, du skickade %2$d."
+
 #: lib/leaveform.php:114
 msgid "Leave"
 msgstr "Lämna"
 
+#. TRANS: Menu item for logging in to the StatusNet site.
+#: lib/logingroupnav.php:77
+msgctxt "MENU"
+msgid "Login"
+msgstr "Logga in"
+
 #. TRANS: Title for menu item for logging in to the StatusNet site.
 #: lib/logingroupnav.php:79
 msgid "Login with a username and password"
 msgstr "Logga in med ett användarnamn och lösenord"
 
+#. TRANS: Menu item for registering with the StatusNet site.
+#: lib/logingroupnav.php:85
+msgctxt "MENU"
+msgid "Register"
+msgstr "Registrera"
+
 #. TRANS: Title for menu item for registering with the StatusNet site.
 #: lib/logingroupnav.php:87
 msgid "Sign up for a new account"
 msgstr "Registrera dig för ett nytt konto"
 
 #. TRANS: Subject for address confirmation email.
-#: lib/mail.php:168
+#: lib/mail.php:172
 msgid "Email address confirmation"
 msgstr "E-postadressbekräftelse"
 
 #. TRANS: Body for address confirmation email.
 #. TRANS: %1$s is the addressed user's nickname, %2$s is the StatusNet sitename,
 #. TRANS: %3$s is the URL to confirm at.
-#: lib/mail.php:173
+#: lib/mail.php:177
 #, fuzzy, php-format
 msgid ""
 "Hey, %1$s.\n"
@@ -8682,14 +8780,14 @@ msgstr ""
 
 #. TRANS: Subject of new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
-#: lib/mail.php:238
+#: lib/mail.php:243
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1$s lyssnar nu på dina notiser på %2$s."
 
 #. TRANS: This is a paragraph in a new-subscriber e-mail.
 #. TRANS: %s is a URL where the subscriber can be reported as abusive.
-#: lib/mail.php:245
+#: lib/mail.php:250
 #, php-format
 msgid ""
 "If you believe this account is being used abusively, you can block them from "
@@ -8704,7 +8802,7 @@ msgstr ""
 #. TRANS: %3$s is the subscriber's profile URL, %4$s is the subscriber's location (or empty)
 #. TRANS: %5$s is the subscriber's homepage URL (or empty), %6%s is the subscriber's bio (or empty)
 #. TRANS: %7$s is a link to the addressed user's e-mail settings.
-#: lib/mail.php:255
+#: lib/mail.php:260
 #, fuzzy, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -8731,14 +8829,14 @@ msgstr ""
 
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is biographical information.
-#: lib/mail.php:278
+#: lib/mail.php:283
 #, php-format
 msgid "Bio: %s"
 msgstr "Biografi: %s"
 
 #. TRANS: Subject of notification mail for new posting email address.
 #. TRANS: %s is the StatusNet sitename.
-#: lib/mail.php:307
+#: lib/mail.php:312
 #, php-format
 msgid "New email address for posting to %s"
 msgstr "Ny e-postadress för att skicka till %s"
@@ -8746,7 +8844,7 @@ msgstr "Ny e-postadress för att skicka till %s"
 #. TRANS: Body of notification mail for new posting email address.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is the e-mail address to send
 #. TRANS: to to post by e-mail, %3$s is a URL to more instructions.
-#: lib/mail.php:313
+#: lib/mail.php:318
 #, fuzzy, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -8769,26 +8867,26 @@ msgstr ""
 
 #. TRANS: Subject line for SMS-by-email notification messages.
 #. TRANS: %s is the posting user's nickname.
-#: lib/mail.php:434
+#: lib/mail.php:439
 #, php-format
 msgid "%s status"
 msgstr "%s status"
 
 #. TRANS: Subject line for SMS-by-email address confirmation message.
-#: lib/mail.php:460
+#: lib/mail.php:465
 msgid "SMS confirmation"
 msgstr "SMS-bekräftelse"
 
 #. TRANS: Main body heading for SMS-by-email address confirmation message.
 #. TRANS: %s is the addressed user's nickname.
-#: lib/mail.php:464
+#: lib/mail.php:469
 #, php-format
 msgid "%s: confirm you own this phone number with this code:"
 msgstr "%s: bekräfta detta telefonnummer med denna kod:"
 
 #. TRANS: Subject for 'nudge' notification email.
 #. TRANS: %s is the nudging user.
-#: lib/mail.php:485
+#: lib/mail.php:490
 #, fuzzy, php-format
 msgid "You have been nudged by %s"
 msgstr "Du har blivit knuffad av %s"
@@ -8796,7 +8894,7 @@ msgstr "Du har blivit knuffad av %s"
 #. TRANS: Body for 'nudge' notification email.
 #. TRANS: %1$s is the nuding user's long name, $2$s is the nudging user's nickname,
 #. TRANS: %3$s is a URL to post notices at, %4$s is the StatusNet sitename.
-#: lib/mail.php:492
+#: lib/mail.php:497
 #, php-format
 msgid ""
 "%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -8825,7 +8923,7 @@ msgstr ""
 
 #. TRANS: Subject for direct-message notification email.
 #. TRANS: %s is the sending user's nickname.
-#: lib/mail.php:539
+#: lib/mail.php:544
 #, php-format
 msgid "New private message from %s"
 msgstr "Nytt privat meddelande från %s"
@@ -8834,7 +8932,7 @@ msgstr "Nytt privat meddelande från %s"
 #. TRANS: %1$s is the sending user's long name, %2$s is the sending user's nickname,
 #. TRANS: %3$s is the message content, %4$s a URL to the message,
 #. TRANS: %5$s is the StatusNet sitename.
-#: lib/mail.php:547
+#: lib/mail.php:552
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -8869,7 +8967,7 @@ msgstr ""
 
 #. TRANS: Subject for favorite notification e-mail.
 #. TRANS: %1$s is the adding user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:599
+#: lib/mail.php:604
 #, fuzzy, php-format
 msgid "%1$s (@%2$s) added your notice as a favorite"
 msgstr "%s (@%s) lade till din notis som en favorit"
@@ -8879,7 +8977,7 @@ msgstr "%s (@%s) lade till din notis som en favorit"
 #. TRANS: %3$s is a URL to the faved notice, %4$s is the faved notice text,
 #. TRANS: %5$s is a URL to all faves of the adding user, %6$s is the StatusNet sitename,
 #. TRANS: %7$s is the adding user's nickname.
-#: lib/mail.php:606
+#: lib/mail.php:611
 #, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -8917,7 +9015,7 @@ msgstr ""
 "%6$s\n"
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:664
+#: lib/mail.php:669
 #, php-format
 msgid ""
 "The full conversation can be read here:\n"
@@ -8930,7 +9028,7 @@ msgstr ""
 
 #. TRANS: E-mail subject for notice notification.
 #. TRANS: %1$s is the sending user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:672
+#: lib/mail.php:677
 #, fuzzy, php-format
 msgid "%1$s (@%2$s) sent a notice to your attention"
 msgstr "%s (@%s) skickade en notis för din uppmärksamhet"
@@ -8941,7 +9039,7 @@ msgstr "%s (@%s) skickade en notis för din uppmärksamhet"
 #. TRANS: %5$s is a URL to the full conversion if it exists (otherwise empty),
 #. TRANS: %6$s is a URL to reply to the notice, %7$s is a URL to all @-replied for the addressed user,
 #. TRANS: %8$s is a URL to the addressed user's e-mail settings, %9$s is the sender's nickname.
-#: lib/mail.php:680
+#: lib/mail.php:685
 #, php-format
 msgid ""
 "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -9086,11 +9184,7 @@ msgstr "Inte prenumerant!"
 msgid "To"
 msgstr "Till"
 
-#: lib/messageform.php:166 lib/noticeform.php:186
-msgid "Available characters"
-msgstr "Tillgängliga tecken"
-
-#: lib/messageform.php:185 lib/noticeform.php:237
+#: lib/messageform.php:184 lib/noticeform.php:236
 msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr "Skicka"
@@ -9100,16 +9194,10 @@ msgstr "Skicka"
 msgid "Messages"
 msgstr "Meddelande"
 
-#: lib/messagelistitem.php:123 lib/noticelist.php:522
+#: lib/messagelistitem.php:123 lib/noticelist.php:527
 msgid "from"
 msgstr "från"
 
-#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:165
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr ""
-"Smeknamnet får endast innehålla små bokstäver eller siffror, inga mellanslag."
-
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 #: lib/nickname.php:178
 msgid "Nickname cannot be empty."
@@ -9132,23 +9220,23 @@ msgstr "Skicka en notis"
 msgid "What's up, %s?"
 msgstr "Vad är på gång, %s?"
 
-#: lib/noticeform.php:194
+#: lib/noticeform.php:193
 msgid "Attach"
 msgstr "Bifoga"
 
-#: lib/noticeform.php:198
+#: lib/noticeform.php:197
 msgid "Attach a file"
 msgstr "Bifoga en fil"
 
-#: lib/noticeform.php:213
+#: lib/noticeform.php:212
 msgid "Share my location"
 msgstr "Dela min plats"
 
-#: lib/noticeform.php:216
+#: lib/noticeform.php:215
 msgid "Do not share my location"
 msgstr "Dela inte min plats"
 
-#: lib/noticeform.php:217
+#: lib/noticeform.php:216
 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
 "try again later"
@@ -9157,55 +9245,59 @@ msgstr ""
 "god försök igen senare"
 
 #. TRANS: Used in coordinates as abbreviation of north
-#: lib/noticelist.php:452
+#: lib/noticelist.php:457
 msgid "N"
 msgstr "N"
 
 #. TRANS: Used in coordinates as abbreviation of south
-#: lib/noticelist.php:454
+#: lib/noticelist.php:459
 msgid "S"
 msgstr "S"
 
 #. TRANS: Used in coordinates as abbreviation of east
-#: lib/noticelist.php:456
+#: lib/noticelist.php:461
 msgid "E"
 msgstr "Ö"
 
 #. TRANS: Used in coordinates as abbreviation of west
-#: lib/noticelist.php:458
+#: lib/noticelist.php:463
 msgid "W"
 msgstr "V"
 
-#: lib/noticelist.php:460
+#: lib/noticelist.php:465
 #, php-format
 msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 
-#: lib/noticelist.php:469
+#: lib/noticelist.php:474
 msgid "at"
 msgstr "på"
 
-#: lib/noticelist.php:518
+#: lib/noticelist.php:523
 msgid "web"
 msgstr "webb"
 
-#: lib/noticelist.php:584
+#: lib/noticelist.php:589
 msgid "in context"
 msgstr "i sammanhang"
 
-#: lib/noticelist.php:619
+#: lib/noticelist.php:624
 msgid "Repeated by"
 msgstr "Upprepad av"
 
-#: lib/noticelist.php:646
+#: lib/noticelist.php:651
 msgid "Reply to this notice"
 msgstr "Svara på denna notis"
 
-#: lib/noticelist.php:647
+#: lib/noticelist.php:652
 msgid "Reply"
 msgstr "Svara"
 
-#: lib/noticelist.php:691
+#: lib/noticelist.php:678
+msgid "Delete this notice"
+msgstr "Ta bort denna notis"
+
+#: lib/noticelist.php:696
 msgid "Notice repeated"
 msgstr "Notis upprepad"
 
@@ -9242,48 +9334,31 @@ msgstr "Duplicera notis."
 msgid "Couldn't insert new subscription."
 msgstr "Kunde inte infoga ny prenumeration."
 
-#. TRANS: Personal group navigation menu option when logged in for viewing @-replies.
-#: lib/personalgroupnav.php:107
+#: lib/personalgroupnav.php:104
 #, fuzzy
-msgctxt "MENU"
 msgid "Replies"
 msgstr "Svar"
 
-#. TRANS: Personal group navigation menu option when logged in for seeing own profile.
-#: lib/personalgroupnav.php:114
+#: lib/personalgroupnav.php:109
 #, fuzzy
-msgctxt "MENU"
-msgid "Profile"
-msgstr "Profil"
-
-#. TRANS: Personal group navigation menu option when logged in for viewing own favourited notices.
-#: lib/personalgroupnav.php:120
-#, fuzzy
-msgctxt "MENU"
 msgid "Favorites"
 msgstr "Favoriter"
 
-#. TRANS: Personal group navigation menu option when logged in for viewing recieved personal messages.
-#: lib/personalgroupnav.php:133
+#: lib/personalgroupnav.php:120
 #, fuzzy
-msgctxt "MENU"
 msgid "Inbox"
 msgstr "Inkorg"
 
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing recieved personal messages.
-#: lib/personalgroupnav.php:135
+#: lib/personalgroupnav.php:121
 msgid "Your incoming messages"
 msgstr "Dina inkommande meddelanden"
 
-#. TRANS: Personal group navigation menu option when logged in for viewing senet personal messages.
-#: lib/personalgroupnav.php:140
+#: lib/personalgroupnav.php:125
 #, fuzzy
-msgctxt "MENU"
 msgid "Outbox"
 msgstr "Utkorg"
 
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing senet personal messages.
-#: lib/personalgroupnav.php:142
+#: lib/personalgroupnav.php:126
 msgid "Your sent messages"
 msgstr "Dina skickade meddelanden"
 
@@ -9298,9 +9373,26 @@ msgstr "Taggar i %ss notiser"
 msgid "Unknown"
 msgstr "Okänd"
 
+#. TRANS: Plugin admin panel controls
+#: lib/plugindisableform.php:90
+msgctxt "plugin"
+msgid "Disable"
+msgstr ""
+
+#. TRANS: Plugin admin panel controls
+#: lib/pluginenableform.php:112
+msgctxt "plugin"
+msgid "Enable"
+msgstr ""
+
+#: lib/pluginlist.php:196
+msgctxt "plugin-description"
+msgid "(Plugin descriptions unavailable when disabled.)"
+msgstr ""
+
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:82
+#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:88
 msgid "Subscriptions"
 msgstr "Prenumerationer"
 
@@ -9311,7 +9403,7 @@ msgstr "Alla prenumerationer"
 
 #. TRANS: H2 text for user subscriber statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:90
+#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:96
 msgid "Subscribers"
 msgstr "Prenumeranter"
 
@@ -9333,7 +9425,7 @@ msgstr "Medlem sedan"
 #. TRANS: Label for user statistics.
 #. TRANS: H2 text for user group membership statistics.
 #: lib/profileaction.php:239 lib/profileaction.php:290
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:104
 msgid "Groups"
 msgstr "Grupper"
 
@@ -9353,10 +9445,6 @@ msgstr "Alla grupper"
 msgid "Unimplemented method."
 msgstr "Inte implementerad metod."
 
-#: lib/publicgroupnav.php:78
-msgid "Public"
-msgstr "Publikt"
-
 #: lib/publicgroupnav.php:82
 msgid "User groups"
 msgstr "Användargrupper"
@@ -9395,7 +9483,7 @@ msgid "Revoke the \"%s\" role from this user"
 msgstr "Återkalla rollen \"%s\" från denna användare"
 
 #. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:974
+#: lib/router.php:1001
 #, fuzzy
 msgid "Page not found."
 msgstr "API-metod hittades inte."
@@ -9425,11 +9513,6 @@ msgctxt "BUTTON"
 msgid "Search"
 msgstr "Sök"
 
-#. TRANS: Definition list item with instructions on how to get (better) search results.
-#: lib/searchaction.php:170
-msgid "Search help"
-msgstr "Sök hjälp"
-
 #: lib/searchgroupnav.php:80
 msgid "People"
 msgstr "Personer"
@@ -9454,6 +9537,51 @@ msgstr "Namnlös sektion"
 msgid "More..."
 msgstr "Mer..."
 
+#: lib/settingsnav.php:78
+msgid "Change your profile settings"
+msgstr "Ändra dina profilinställningar"
+
+#: lib/settingsnav.php:83
+msgid "Upload an avatar"
+msgstr "Ladda upp en avatar"
+
+#: lib/settingsnav.php:88
+msgid "Change your password"
+msgstr "Ändra ditt lösenord"
+
+#: lib/settingsnav.php:93
+msgid "Change email handling"
+msgstr "Ändra e-posthantering"
+
+#: lib/settingsnav.php:98
+msgid "Design your profile"
+msgstr "Designa din profil"
+
+#: lib/settingsnav.php:102
+msgid "URL"
+msgstr "URL"
+
+#: lib/settingsnav.php:103
+msgid "URL shorteners"
+msgstr ""
+
+#: lib/settingsnav.php:111
+msgid "Updates by instant messenger (IM)"
+msgstr "Uppdateringar via snabbmeddelande (IM)"
+
+#: lib/settingsnav.php:118
+msgid "Updates by SMS"
+msgstr "Uppdateringar via SMS"
+
+#: lib/settingsnav.php:123
+#, fuzzy
+msgid "Connections"
+msgstr "Anslutningar"
+
+#: lib/settingsnav.php:124
+msgid "Authorized connected applications"
+msgstr "Tillåt anslutna applikationer"
+
 #: lib/silenceform.php:67
 msgid "Silence"
 msgstr "Tysta ned"
@@ -9462,30 +9590,34 @@ msgstr "Tysta ned"
 msgid "Silence this user"
 msgstr "Tysta ned denna användare"
 
-#: lib/subgroupnav.php:83
+#: lib/subgroupnav.php:89
 #, php-format
 msgid "People %s subscribes to"
 msgstr "Personer %s prenumererar på"
 
-#: lib/subgroupnav.php:91
+#: lib/subgroupnav.php:97
 #, php-format
 msgid "People subscribed to %s"
 msgstr "Personer som prenumererar på %s"
 
-#: lib/subgroupnav.php:99
+#: lib/subgroupnav.php:105
 #, php-format
 msgid "Groups %s is a member of"
 msgstr "Grupper %s är en medlem i"
 
-#: lib/subgroupnav.php:105
+#: lib/subgroupnav.php:111
 msgid "Invite"
 msgstr "Bjud in"
 
-#: lib/subgroupnav.php:106
+#: lib/subgroupnav.php:112
 #, php-format
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Bjud in vänner och kollegor att gå med dig på %s"
 
+#: lib/subscribeform.php:115 lib/subscribeform.php:139
+msgid "Subscribe to this user"
+msgstr "Prenumerera på denna användare"
+
 #: lib/subscriberspeopleselftagcloudsection.php:48
 #: lib/subscriptionspeopleselftagcloudsection.php:48
 msgid "People Tagcloud as self-tagged"
@@ -9559,6 +9691,13 @@ msgstr "Tema innehåller fil av typen '.%s', vilket inte är tillåtet."
 msgid "Error opening theme archive."
 msgstr "Fel vid öppning temaarkiv."
 
+#: lib/threadednoticelist.php:270
+#, php-format
+msgid "Show all %d comment"
+msgid_plural "Show all %d comments"
+msgstr[0] ""
+msgstr[1] ""
+
 #: lib/topposterssection.php:74
 msgid "Top posters"
 msgstr "Toppostare"
@@ -9600,76 +9739,80 @@ msgstr "Avsluta pren."
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "Användaren har ingen profil."
 
-#. TRANS: Link text for changeing the avatar of the logged in user.
-#: lib/userprofile.php:121
+#: lib/userprofile.php:116
 msgid "Edit Avatar"
 msgstr "Redigera avatar"
 
 #. TRANS: H2 for user actions in a profile.
 #. TRANS: H2 for entity actions in a profile.
-#: lib/userprofile.php:245 lib/userprofile.php:261
+#: lib/userprofile.php:216 lib/userprofile.php:232
 msgid "User actions"
 msgstr "Åtgärder för användare"
 
 #. TRANS: Text shown in user profile of not yet compeltely deleted users.
-#: lib/userprofile.php:249
+#: lib/userprofile.php:220
 msgid "User deletion in progress..."
 msgstr "Borttagning av användare pågår..."
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:277
+#: lib/userprofile.php:248
 msgid "Edit profile settings"
 msgstr "Redigera profilinställningar"
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:279
+#: lib/userprofile.php:250
 msgid "Edit"
 msgstr "Redigera"
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:303
+#: lib/userprofile.php:274
 msgid "Send a direct message to this user"
 msgstr "Skicka ett direktmeddelande till denna användare"
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:305
+#: lib/userprofile.php:276
 msgid "Message"
 msgstr "Meddelande"
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:347
+#: lib/userprofile.php:318
 msgid "Moderate"
 msgstr "Moderera"
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:386
+#: lib/userprofile.php:357
 msgid "User role"
 msgstr "Användarroll"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:389
+#: lib/userprofile.php:360
 msgctxt "role"
 msgid "Administrator"
 msgstr "Administratör"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:391
+#: lib/userprofile.php:362
 msgctxt "role"
 msgid "Moderator"
 msgstr "Moderator"
 
+#: lib/util.php:321
+#, fuzzy
+msgid "Not allowed to log in."
+msgstr "Inte inloggad."
+
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1306
+#: lib/util.php:1337
 msgid "a few seconds ago"
 msgstr "ett par sekunder sedan"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1309
+#: lib/util.php:1340
 msgid "about a minute ago"
 msgstr "för nån minut sedan"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1313
+#: lib/util.php:1344
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
@@ -9677,12 +9820,12 @@ msgstr[0] "för ungefär en minut sedan"
 msgstr[1] "för ungefär %d minuter sedan"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1316
+#: lib/util.php:1347
 msgid "about an hour ago"
 msgstr "för en timma sedan"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1320
+#: lib/util.php:1351
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
@@ -9690,12 +9833,12 @@ msgstr[0] "för ungefär en timma sedan"
 msgstr[1] "för ungefär %d timmar sedan"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1323
+#: lib/util.php:1354
 msgid "about a day ago"
 msgstr "för en dag sedan"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1327
+#: lib/util.php:1358
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
@@ -9703,12 +9846,12 @@ msgstr[0] "för ungefär en dag sedan"
 msgstr[1] "för ungefär %d dagar sedan"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1330
+#: lib/util.php:1361
 msgid "about a month ago"
 msgstr "för en månad sedan"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1334
+#: lib/util.php:1365
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
@@ -9716,7 +9859,7 @@ msgstr[0] "för ungefär en månad sedan"
 msgstr[1] "för ungefär %d månader sedan"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1337
+#: lib/util.php:1368
 msgid "about a year ago"
 msgstr "för ett år sedan"
 
@@ -9727,21 +9870,6 @@ msgstr "för ett år sedan"
 msgid "%s is not a valid color! Use 3 or 6 hex characters."
 msgstr "%s är inte en giltig färg! Använd 3 eller 6 hexadecimala tecken."
 
-#. TRANS: %s is the URL to the StatusNet site's Instant Messaging settings.
-#: lib/xmppmanager.php:287
-#, php-format
-msgid "Unknown user. Go to %s to add your address to your account"
-msgstr ""
-
-#. TRANS: Response to XMPP source when it sent too long a message.
-#. TRANS: %1$d the maximum number of allowed characters (used for plural), %2$d is the sent number.
-#: lib/xmppmanager.php:406
-#, fuzzy, php-format
-msgid "Message too long. Maximum is %1$d character, you sent %2$d."
-msgid_plural "Message too long. Maximum is %1$d characters, you sent %2$d."
-msgstr[0] "Meddelande för långt - maximum är %1$d tecken, du skickade %2$d."
-msgstr[1] "Meddelande för långt - maximum är %1$d tecken, du skickade %2$d."
-
 #. TRANS: Exception.
 #: lib/xrd.php:63
 #, fuzzy
@@ -9759,74 +9887,175 @@ msgstr ""
 msgid "Getting backup from file '%s'."
 msgstr ""
 
-#, fuzzy
-#~ msgid "Block this user."
-#~ msgstr "Blockera denna användare"
+#~ msgid "Could not generate feed for group - %s"
+#~ msgstr "Kunde inte generera flöde för grupp - %s"
 
 #, fuzzy
-#~ msgid "Delete this notice."
-#~ msgstr "Ta bort denna notis"
-
-#, fuzzy
-#~ msgid "Delete this user."
-#~ msgstr "Ta bort denna användare"
-
-#, fuzzy
-#~ msgid "Restore default designs."
-#~ msgstr "Återställ standardutseende"
-
-#, fuzzy
-#~ msgid "Reset back to default."
-#~ msgstr "Återställ till standardvärde"
-
-#, fuzzy
-#~ msgid "Save design."
-#~ msgstr "Spara utseende"
-
-#, fuzzy
-#~ msgid "Disfavor favorite."
-#~ msgstr "Ta bort märkning som favorit"
-
-#, fuzzy
-#~ msgid "\"%s\" not found."
-#~ msgstr "API-metod hittades inte."
-
-#, fuzzy
-#~ msgid "Notice %s not found."
-#~ msgstr "API-metod hittades inte."
-
-#, fuzzy
-#~ msgid "Attachment %s not found."
-#~ msgstr "Mottagare hittades inte."
-
-#, fuzzy
-#~ msgid "Invalid tag: \"%s\"."
-#~ msgstr "Ogiltig tagg: \"%s\""
-
-#, fuzzy
-#~ msgid "%s updates from everyone."
-#~ msgstr "%s uppdateringar från alla!"
-
-#, fuzzy
-#~ msgid "Password saved"
-#~ msgstr "Lösenord sparat."
-
-#, fuzzy
-#~ msgid "Where you are, like \"City, State (or Region), Country\"."
-#~ msgstr "Var du håller till, såsom \"Stad, Län, Land\""
-
-#, fuzzy
-#~ msgid "Subscribe to this user."
-#~ msgstr "Prenumerera på denna användare"
+#~ msgid "Current confirmed Jabber/Google Talk address."
+#~ msgstr "Aktuell bekräftad Jabber/Gtalk-adress."
 
 #, fuzzy
 #~ msgid ""
-#~ "Listenee stream license \"%1$s\" is not compatible with site license \"%2"
-#~ "$s\"."
+#~ "Jabber or Google Talk address, like \"UserName@example.org\". First, make "
+#~ "sure to add %s to your buddy list in your IM client or on Google Talk."
 #~ msgstr ""
-#~ "Licensen för lyssnarströmmen '%1$s' är inte förenlig med "
-#~ "webbplatslicensen '%2$s'."
+#~ "Jabber- eller GTalk-adress, som \"användarnamn@example.org\". Se först "
+#~ "till att lägga till %s i din kompislista i din IM-klient eller hos GTalk."
 
 #, fuzzy
-#~ msgid "Not allowed to log in."
-#~ msgstr "Inte inloggad."
+#~ msgid "Send me notices through Jabber/Google Talk."
+#~ msgstr "Skicka notiser till mig genom Jabber/GTalk."
+
+#, fuzzy
+#~ msgid "Publish a MicroID for my Jabber/Google Talk address."
+#~ msgstr "Publicera ett MicroID för min Jabber/GTalk-adress."
+
+#~ msgid "No Jabber ID."
+#~ msgstr "Inget Jabber-ID."
+
+#, fuzzy
+#~ msgid "Not a valid Jabber ID."
+#~ msgstr "Inte ett giltigt Jabber-ID"
+
+#~ msgid "That is already your Jabber ID."
+#~ msgstr "Detta är redan ditt Jabber-ID"
+
+#~ msgid "That is not your Jabber ID."
+#~ msgstr "Detta är inte ditt Jabber-ID."
+
+#~ msgid "Other settings"
+#~ msgstr "Övriga inställningar"
+
+#~ msgid "Tag cloud"
+#~ msgstr "Taggmoln"
+
+#~ msgid "Consumer key"
+#~ msgstr "Nyckel för konsument"
+
+#~ msgid "Consumer secret"
+#~ msgstr "Hemlighet för konsument"
+
+#~ msgid "Request token URL"
+#~ msgstr "URL för begäran-token"
+
+#~ msgid "Access token URL"
+#~ msgstr "URL för åtkomst-token"
+
+#~ msgid "Authorize URL"
+#~ msgstr "Tillåt URL"
+
+#~ msgid "Jabber"
+#~ msgstr "Jabber"
+
+#~ msgid "Photo"
+#~ msgstr "Foto"
+
+#~ msgid "Other options"
+#~ msgstr "Övriga alternativ"
+
+#~ msgid "Other"
+#~ msgstr "Övrigt"
+
+#~ msgid "Primary site navigation"
+#~ msgstr "Primär webbplatsnavigation"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Personal profile and friends timeline"
+#~ msgstr "Personlig profil och vänners tidslinje"
+
+#~ msgctxt "MENU"
+#~ msgid "Personal"
+#~ msgstr "Personligt"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Change your email, avatar, password, profile"
+#~ msgstr "Ändra din e-post, avatar, lösenord, profil"
+
+#~ msgid "Account"
+#~ msgstr "Konto"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Connect to services"
+#~ msgstr "Anslut till tjänster"
+
+#~ msgid "Connect"
+#~ msgstr "Anslut"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Change site configuration"
+#~ msgstr "Ändra webbplatskonfiguration"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Invite friends and colleagues to join you on %s"
+#~ msgstr "Bjud in vänner och kollegor att gå med dig på %s"
+
+#~ msgctxt "MENU"
+#~ msgid "Invite"
+#~ msgstr "Bjud in"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Create an account"
+#~ msgstr "Skapa ett konto"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Help me!"
+#~ msgstr "Hjälp mig!"
+
+#~ msgctxt "MENU"
+#~ msgid "Help"
+#~ msgstr "Hjälp"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Search for people or text"
+#~ msgstr "Sök efter personer eller text"
+
+#~ msgid "Local views"
+#~ msgstr "Lokala vyer"
+
+#~ msgid "Page notice"
+#~ msgstr "Sidnotis"
+
+#~ msgid "Secondary site navigation"
+#~ msgstr "Sekundär webbplatsnavigation"
+
+#~ msgid "StatusNet software license"
+#~ msgstr "Programvarulicens för StatusNet"
+
+#~ msgid "Site content license"
+#~ msgstr "Licens för webbplatsinnehåll"
+
+#~ msgid "Pagination"
+#~ msgstr "Numrering av sidor"
+
+#~ msgid "Author"
+#~ msgstr "Författare"
+
+#~ msgid "Provider"
+#~ msgstr "Tillhandahållare"
+
+#~ msgctxt "MENU"
+#~ msgid "SMS"
+#~ msgstr "SMS"
+
+#~ msgid "Filter tags"
+#~ msgstr "Filtrera taggar"
+
+#~ msgid "[%s]"
+#~ msgstr "[%s]"
+
+#~ msgid "Available characters"
+#~ msgstr "Tillgängliga tecken"
+
+#, fuzzy
+#~ msgctxt "MENU"
+#~ msgid "Profile"
+#~ msgstr "Profil"
+
+#~ msgid "Search help"
+#~ msgstr "Sök hjälp"
+
+#, fuzzy
+#~ msgid "Message too long. Maximum is %1$d character, you sent %2$d."
+#~ msgid_plural "Message too long. Maximum is %1$d characters, you sent %2$d."
+#~ msgstr[0] "Meddelande för långt - maximum är %1$d tecken, du skickade %2$d."
+#~ msgstr[1] "Meddelande för långt - maximum är %1$d tecken, du skickade %2$d."
diff --git a/locale/te/LC_MESSAGES/statusnet.po b/locale/te/LC_MESSAGES/statusnet.po
index 86e3970216..eeb5234edf 100644
--- a/locale/te/LC_MESSAGES/statusnet.po
+++ b/locale/te/LC_MESSAGES/statusnet.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 15:58+0000\n"
-"PO-Revision-Date: 2011-03-03 16:01:22+0000\n"
+"POT-Creation-Date: 2011-03-03 17:23+0000\n"
+"PO-Revision-Date: 2011-03-03 17:26:28+0000\n"
 "Language-Team: Telugu <http://translatewiki.net/wiki/Portal:te>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -77,23 +77,23 @@ msgstr "అందుబాటు అమరికలను భద్రపరచ
 #. TRANS: Tooltip for button to save access settings in site admin panel.
 #. TRANS: Button text for saving theme settings.
 #. TRANS: Button label to save e-mail preferences.
-#. TRANS: Button label to save Instant Messaging preferences.
-#. TRANS: Button text for saving "Other settings" in profile.
+#. TRANS: Button label to save IM preferences.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
 #. TRANS: Button text for saving site notice in admin panel.
 #. TRANS: Button label to save SMS preferences.
 #. TRANS: Save button for settings for a profile in a subscriptions list.
+#. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
 #. TRANS: Button text on profile design page to save settings.
 #: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
-#: actions/emailsettings.php:250 actions/imsettings.php:183
-#: actions/othersettings.php:136 actions/pathsadminpanel.php:512
-#: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
-#: actions/smssettings.php:205 actions/subscriptions.php:259
+#: actions/emailsettings.php:251 actions/imsettings.php:199
+#: actions/pathsadminpanel.php:512 actions/profilesettings.php:198
+#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:204
+#: actions/subscriptions.php:261 actions/urlsettings.php:152
 #: actions/useradminpanel.php:298 lib/applicationeditform.php:355
-#: lib/designsettings.php:270 lib/groupeditform.php:201
+#: lib/designform.php:320 lib/groupeditform.php:201
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "భద్రపరచు"
@@ -132,7 +132,11 @@ msgstr "అటువంటి పేజీ లేదు."
 #. 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 use "one time password login" without using an existing user.
+#. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
+#. TRANS: Client error displayed trying to find a user by ID for a non-existing ID.
+#. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when calling a profile action without specifying a user.
 #: actions/all.php:80 actions/allrss.php:69
@@ -144,19 +148,19 @@ msgstr "అటువంటి పేజీ లేదు."
 #: actions/apidirectmessage.php:75 actions/apidirectmessagenew.php:72
 #: actions/apigroupcreate.php:111 actions/apigroupismember.php:89
 #: actions/apigroupjoin.php:98 actions/apigroupleave.php:98
-#: actions/apigrouplist.php:70 actions/apistatusesupdate.php:230
-#: actions/apisubscriptions.php:85 actions/apitimelinefavorites.php:70
-#: actions/apitimelinefriends.php:173 actions/apitimelinehome.php:78
-#: actions/apitimelinementions.php:77 actions/apitimelineuser.php:79
-#: actions/avatarbynickname.php:79 actions/favoritesrss.php:72
-#: actions/foaf.php:42 actions/foaf.php:61 actions/hcard.php:67
-#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
-#: actions/remotesubscribe.php:144 actions/remotesubscribe.php:153
-#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
-#: actions/showfavorites.php:106 actions/userbyid.php:74
-#: actions/usergroups.php:93 actions/userrss.php:40 actions/userxrd.php:59
-#: actions/xrds.php:71 lib/command.php:509 lib/galleryaction.php:59
-#: lib/mailbox.php:80 lib/profileaction.php:77
+#: actions/apigrouplist.php:70 actions/apigroupprofileupdate.php:108
+#: actions/apistatusesupdate.php:230 actions/apisubscriptions.php:85
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:173
+#: actions/apitimelinehome.php:78 actions/apitimelinementions.php:77
+#: actions/apitimelineuser.php:79 actions/avatarbynickname.php:79
+#: actions/favoritesrss.php:72 actions/foaf.php:42 actions/foaf.php:61
+#: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116
+#: actions/otp.php:78 actions/remotesubscribe.php:144
+#: actions/remotesubscribe.php:153 actions/replies.php:73
+#: actions/repliesrss.php:38 actions/rsd.php:113 actions/showfavorites.php:106
+#: actions/userbyid.php:75 actions/usergroups.php:93 actions/userrss.php:40
+#: actions/userxrd.php:59 actions/xrds.php:71 lib/command.php:509
+#: lib/galleryaction.php:59 lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "అటువంటి వాడుకరి లేరు."
 
@@ -170,10 +174,9 @@ msgstr "%1$s మరియు మిత్రులు, పేజీ %2$d"
 #. TRANS: H1 text for page. %s is a user nickname.
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Timeline title for user and friends. %s is a user nickname.
-#. TRANS: Tooltop for personal group navigation menu option when logged in for viewing timeline of self and friends.
 #: actions/all.php:94 actions/all.php:191 actions/allrss.php:117
 #: actions/apitimelinefriends.php:207 actions/apitimelinehome.php:113
-#: lib/personalgroupnav.php:102
+#: lib/personalgroupnav.php:100
 #, php-format
 msgid "%s and friends"
 msgstr "%s మరియు మిత్రులు"
@@ -227,7 +230,7 @@ msgstr ""
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
 #. TRANS: Second sentence of empty message for anonymous users. %s is a user nickname.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:227
+#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:221
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -275,19 +278,20 @@ msgstr "%2$sలో %1$s మరియు స్నేహితుల నుండ
 #: actions/apifavoritecreate.php:98 actions/apifavoritedestroy.php:98
 #: actions/apifriendshipscreate.php:99 actions/apifriendshipsdestroy.php:99
 #: actions/apifriendshipsshow.php:124 actions/apigroupcreate.php:138
-#: actions/apigroupismember.php:115 actions/apigroupjoin.php:160
-#: actions/apigroupleave.php:145 actions/apigrouplist.php:134
+#: actions/apigroupismember.php:115 actions/apigroupjoin.php:151
+#: actions/apigroupleave.php:141 actions/apigrouplist.php:134
 #: actions/apigrouplistall.php:120 actions/apigroupmembership.php:105
+#: actions/apigroupprofileupdate.php:100 actions/apigroupprofileupdate.php:213
 #: actions/apigroupshow.php:114 actions/apihelptest.php:84
 #: actions/apistatusesdestroy.php:101 actions/apistatusesretweets.php:110
 #: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:139
 #: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
-#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:268
-#: actions/apitimelinegroup.php:147 actions/apitimelinehome.php:173
-#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:239
-#: actions/apitimelineretweetedtome.php:118
-#: actions/apitimelineretweetsofme.php:150 actions/apitimelinetag.php:159
-#: actions/apitimelineuser.php:206 actions/apiusershow.php:100
+#: actions/apitimelinefavorites.php:182 actions/apitimelinefriends.php:276
+#: actions/apitimelinegroup.php:148 actions/apitimelinehome.php:181
+#: actions/apitimelinementions.php:182 actions/apitimelinepublic.php:247
+#: actions/apitimelineretweetedtome.php:147
+#: actions/apitimelineretweetsofme.php:147 actions/apitimelinetag.php:165
+#: actions/apitimelineuser.php:217 actions/apiusershow.php:100
 msgid "API method not found."
 msgstr "API పద్ధతి లేదు."
 
@@ -302,8 +306,9 @@ msgstr "API పద్ధతి లేదు."
 #: actions/apifavoritecreate.php:88 actions/apifavoritedestroy.php:88
 #: actions/apifriendshipscreate.php:89 actions/apifriendshipsdestroy.php:89
 #: actions/apigroupcreate.php:102 actions/apigroupjoin.php:89
-#: actions/apigroupleave.php:89 actions/apimediaupload.php:66
-#: actions/apistatusesretweet.php:63 actions/apistatusesupdate.php:194
+#: actions/apigroupleave.php:89 actions/apigroupprofileupdate.php:92
+#: actions/apimediaupload.php:66 actions/apistatusesretweet.php:63
+#: actions/apistatusesupdate.php:194
 msgid "This method requires a POST."
 msgstr ""
 
@@ -315,21 +320,16 @@ msgid ""
 msgstr ""
 
 #. TRANS: Server error displayed when a user's delivery device cannot be updated.
-#. TRANS: Server error displayed when a user update to the database fails in the contact address confirmation action.
 #. TRANS: Server error thrown on database error updating e-mail preferences.
 #. TRANS: Server error thrown on database error removing a registered e-mail address.
-#. TRANS: Server error thrown on database error updating Instant Messaging preferences.
-#. TRANS: Server error thrown on database error removing a registered Instant Messaging address.
-#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
 #. TRANS: Server error thrown when user profile settings could not be updated.
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
-#: actions/apiaccountupdatedeliverydevice.php:130
-#: actions/confirmaddress.php:118 actions/emailsettings.php:352
-#: actions/emailsettings.php:498 actions/imsettings.php:276
-#: actions/imsettings.php:432 actions/othersettings.php:186
-#: actions/profilesettings.php:322 actions/smssettings.php:301
-#: actions/smssettings.php:454
+#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
+#: actions/apiaccountupdatedeliverydevice.php:136
+#: actions/emailsettings.php:353 actions/emailsettings.php:499
+#: actions/profilesettings.php:323 actions/smssettings.php:300
+#: actions/smssettings.php:453 actions/urlsettings.php:211
 msgid "Could not update user."
 msgstr "వాడుకరిని తాజాకరించలేకున్నాం."
 
@@ -355,7 +355,7 @@ msgstr "వాడుకరికి ప్రొఫైలు లేదు."
 
 #. TRANS: Server error displayed if a user profile could not be saved.
 #. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:418
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:419
 #, fuzzy
 msgid "Could not save profile."
 msgstr "ప్రొఫైలుని భద్రపరచలేకున్నాం."
@@ -368,7 +368,7 @@ msgstr "ప్రొఫైలుని భద్రపరచలేకున్
 #: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
 #: actions/designadminpanel.php:120 actions/editapplication.php:121
 #: actions/newapplication.php:102 actions/newnotice.php:95
-#: lib/designsettings.php:298
+#: lib/designsettings.php:110
 #, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s byte) due to its "
@@ -389,8 +389,8 @@ msgstr[1] ""
 #: actions/apiaccountupdateprofilecolors.php:160
 #: actions/apiaccountupdateprofilecolors.php:171
 #: actions/groupdesignsettings.php:285 actions/groupdesignsettings.php:296
-#: actions/userdesignsettings.php:201 actions/userdesignsettings.php:211
-#: actions/userdesignsettings.php:253 actions/userdesignsettings.php:263
+#: actions/userdesignsettings.php:218 actions/userdesignsettings.php:228
+#: actions/userdesignsettings.php:270 actions/userdesignsettings.php:280
 msgid "Unable to save your design settings."
 msgstr "మీ రూపురేఖల అమరికలని భద్రపరచలేకున్నాం."
 
@@ -398,7 +398,7 @@ msgstr "మీ రూపురేఖల అమరికలని భద్రప
 #. TRANS: Client error displayed when a database error occurs updating profile colours.
 #: actions/apiaccountupdateprofilebackgroundimage.php:191
 #: actions/apiaccountupdateprofilecolors.php:139
-#: actions/userdesignsettings.php:179
+#: actions/userdesignsettings.php:196
 #, fuzzy
 msgid "Could not update your design."
 msgstr "వాడుకరిని తాజాకరించలేకున్నాం."
@@ -508,8 +508,7 @@ msgstr "అందుకోవాల్సిన వాడుకరి కనబ
 
 #. TRANS: Client error displayed trying to direct message another user who's not a friend (403).
 #: actions/apidirectmessagenew.php:144
-#, fuzzy
-msgid "Can't send direct messages to users who aren't your friend."
+msgid "Cannot send direct messages to users who aren't your friend."
 msgstr "మీ స్నేహితులు కాని వాడుకరులకి నేరు సందేశాలు పంపించలేరు."
 
 #. TRANS: Client error displayed trying to direct message self (403).
@@ -590,9 +589,9 @@ msgstr "లక్ష్యిత వాడుకరిని కనుగొన
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:156 actions/editgroup.php:191
-#: actions/newgroup.php:137 actions/profilesettings.php:273
-#: actions/register.php:214
+#: actions/apigroupcreate.php:156 actions/apigroupprofileupdate.php:255
+#: actions/editgroup.php:191 actions/newgroup.php:137
+#: actions/profilesettings.php:274 actions/register.php:199
 msgid "Nickname already in use. Try another one."
 msgstr "ఆ పేరుని ఇప్పటికే వాడుతున్నారు. మరోటి ప్రయత్నించండి."
 
@@ -600,9 +599,9 @@ msgstr "ఆ పేరుని ఇప్పటికే వాడుతున్
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:164 actions/editgroup.php:195
-#: actions/newgroup.php:141 actions/profilesettings.php:243
-#: actions/register.php:216
+#: actions/apigroupcreate.php:164 actions/apigroupprofileupdate.php:259
+#: actions/editgroup.php:195 actions/newgroup.php:141
+#: actions/profilesettings.php:244 actions/register.php:201
 msgid "Not a valid nickname."
 msgstr "సరైన పేరు కాదు."
 
@@ -612,10 +611,10 @@ msgstr "సరైన పేరు కాదు."
 #. TRANS: Validation error shown when providing an invalid homepage URL in the "New application" form.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:181 actions/editapplication.php:235
-#: actions/editgroup.php:202 actions/newapplication.php:221
-#: actions/newgroup.php:148 actions/profilesettings.php:248
-#: actions/register.php:223
+#: actions/apigroupcreate.php:181 actions/apigroupprofileupdate.php:277
+#: actions/editapplication.php:235 actions/editgroup.php:202
+#: actions/newapplication.php:221 actions/newgroup.php:148
+#: actions/profilesettings.php:249 actions/register.php:208
 msgid "Homepage is not a valid URL."
 msgstr "హోమ్ పేజీ URL సరైనది కాదు."
 
@@ -624,8 +623,8 @@ msgstr "హోమ్ పేజీ URL సరైనది కాదు."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:191 actions/editgroup.php:206
-#: actions/newgroup.php:152 actions/profilesettings.php:252
-#: actions/register.php:226
+#: actions/newgroup.php:152 actions/profilesettings.php:253
+#: actions/register.php:211
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "పూర్తి పేరు చాలా పెద్దగా ఉంది (గరిష్ఠం 255 అక్షరాలు)."
 
@@ -652,8 +651,8 @@ msgstr[1] "వివరణ చాలా పెద్దగా ఉంది (%d 
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:215 actions/editgroup.php:218
-#: actions/newgroup.php:164 actions/profilesettings.php:265
-#: actions/register.php:235
+#: actions/newgroup.php:164 actions/profilesettings.php:266
+#: actions/register.php:220
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
 msgstr "ప్రాంతం పేరు మరీ పెద్దగా ఉంది (255 అక్షరాలు గరిష్ఠం)."
@@ -683,15 +682,16 @@ msgstr "తప్పుడు మారుపేరు: \"%s\"."
 #. TRANS: %s is the alias that is already in use.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error. %s is the already used alias.
-#: actions/apigroupcreate.php:264 actions/editgroup.php:246
-#: actions/newgroup.php:193
+#: actions/apigroupcreate.php:264 actions/apigroupprofileupdate.php:351
+#: actions/editgroup.php:246 actions/newgroup.php:193
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "\"%s\" అన్న మారుపేరుని ఇప్పటికే వాడుతున్నారు. మరొకటి ప్రయత్నించండి."
 
 #. TRANS: Client error displayed when trying to use an alias during group creation that is the same as the group's nickname.
 #. TRANS: Group edit form validation error.
-#: actions/apigroupcreate.php:278 actions/editgroup.php:253
+#: actions/apigroupcreate.php:278 actions/apigroupprofileupdate.php:359
+#: actions/editgroup.php:253
 msgid "Alias can't be the same as nickname."
 msgstr "మారుపేరు పేరుతో సమానంగా ఉండకూడదు."
 
@@ -703,7 +703,8 @@ msgstr "మారుపేరు పేరుతో సమానంగా ఉం
 #. TRANS: Client error displayed requesting most recent notices to a group for a non-existing group.
 #: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
 #: actions/apigroupleave.php:104 actions/apigroupmembership.php:71
-#: actions/apigroupshow.php:81 actions/apitimelinegroup.php:89
+#: actions/apigroupprofileupdate.php:113 actions/apigroupshow.php:81
+#: actions/apitimelinegroup.php:89
 msgid "Group not found."
 msgstr "గుంపు దొరకలేదు."
 
@@ -721,13 +722,11 @@ msgstr "మీరు ఇప్పటికే ఆ గుంపులో సభ
 msgid "You have been blocked from that group by the admin."
 msgstr "నిర్వాహకులు ఆ గుంపు నుండి మిమ్మల్ని నిరోధించారు."
 
-#. TRANS: Server error displayed when joining a group fails.
-#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
 #. 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.
 #. TRANS: Message given having failed to add a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:362
+#: actions/apigroupjoin.php:136 actions/joingroup.php:139 lib/command.php:362
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "వాడుకరి %1$sని %2$s గుంపులో చేర్చలేకపోయాం"
@@ -737,8 +736,6 @@ msgstr "వాడుకరి %1$sని %2$s గుంపులో చేర్
 msgid "You are not a member of this group."
 msgstr "మీరు ఈ గుంపులో సభ్యులు కాదు."
 
-#. TRANS: Server error displayed when leaving a group fails.
-#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
 #. TRANS: Server error displayed when leaving a group failed in the database.
 #. TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
 #. TRANS: Message given having failed to remove a user from a group.
@@ -774,6 +771,61 @@ msgstr "%s గుంపులు"
 msgid "groups on %s"
 msgstr "%s పై గుంపులు"
 
+#. TRANS: Client error displayed trying to edit a group while not being a group admin.
+#. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
+#. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
+#: actions/apigroupprofileupdate.php:118 actions/editgroup.php:110
+#: actions/editgroup.php:176 actions/groupdesignsettings.php:109
+#: actions/grouplogo.php:111
+msgid "You must be an admin to edit the group."
+msgstr "గుంపుని మార్చడానికి మీరు నిర్వాహకులయి ఉండాలి."
+
+#. TRANS: Server error displayed when editing a group fails.
+#: actions/apigroupprofileupdate.php:171 actions/editgroup.php:274
+msgid "Could not update group."
+msgstr "గుంపుని తాజాకరించలేకున్నాం."
+
+#. TRANS: Server error displayed when group aliases could not be added.
+#. TRANS: Server exception thrown when creating group aliases failed.
+#: actions/apigroupprofileupdate.php:194 actions/editgroup.php:281
+#: classes/User_group.php:540
+msgid "Could not create aliases."
+msgstr "మారుపేర్లని సృష్టించలేకపోయాం."
+
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: actions/apigroupprofileupdate.php:249 lib/nickname.php:165
+msgid "Nickname must have only lowercase letters and numbers and no spaces."
+msgstr "పేరులో చిన్నబడి అక్షరాలు మరియు అంకెలు మాత్రమే ఖాళీలు లేకుండా ఉండాలి."
+
+#: actions/apigroupprofileupdate.php:286
+#, fuzzy
+msgid "Full name is too long (max 255 chars)."
+msgstr "పూర్తి పేరు చాలా పెద్దగా ఉంది (గరిష్ఠం 255 అక్షరాలు)."
+
+#: actions/apigroupprofileupdate.php:296
+#, fuzzy, php-format
+msgid "description is too long (max %d chars)."
+msgstr "వివరణ చాలా పెద్దగా ఉంది (%d అక్షరాలు గరిష్ఠం)."
+
+#: actions/apigroupprofileupdate.php:307
+#, fuzzy
+msgid "Location is too long (max 255 chars)."
+msgstr "ప్రాంతం పేరు మరీ పెద్దగా ఉంది (255 అక్షరాలు గరిష్ఠం)."
+
+#: actions/apigroupprofileupdate.php:326
+#, fuzzy, php-format
+msgid "Too many aliases! Maximum %d."
+msgstr "చాలా మారుపేర్లు! %d గరిష్ఠం."
+
+#. TRANS: Group edit form validation error.
+#. TRANS: Group create form validation error.
+#. TRANS: %s is the invalid alias.
+#: actions/apigroupprofileupdate.php:342 actions/editgroup.php:241
+#: actions/newgroup.php:188
+#, php-format
+msgid "Invalid alias: \"%s\""
+msgstr "తప్పుడు మారుపేరు: \"%s\""
+
 #. TRANS: Client error displayed when uploading a media file has failed.
 #: actions/apimediaupload.php:101
 msgid "Upload failed."
@@ -807,21 +859,22 @@ msgstr "మీకు అధీకరణ లేదు."
 #. TRANS: Form validation error message.
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
+#. TRANS: Client error displayed when the session token is not okay.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
 #: actions/deletenotice.php:177 actions/disfavor.php:75
-#: actions/emailsettings.php:291 actions/favor.php:75 actions/geocode.php:55
+#: actions/emailsettings.php:292 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:65 actions/grouplogo.php:321
-#: actions/groupunblock.php:65 actions/imsettings.php:224
-#: actions/invite.php:60 actions/login.php:137 actions/makeadmin.php:66
-#: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
-#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
-#: actions/othersettings.php:155 actions/passwordsettings.php:138
-#: actions/profilesettings.php:217 actions/recoverpassword.php:383
-#: actions/register.php:172 actions/remotesubscribe.php:76
-#: actions/repeat.php:82 actions/smssettings.php:250 actions/subedit.php:40
-#: actions/subscribe.php:86 actions/tagother.php:166
-#: actions/unsubscribe.php:69 actions/userauthorization.php:52
-#: lib/designsettings.php:310
+#: actions/groupunblock.php:65 actions/imsettings.php:241
+#: actions/invite.php:60 actions/makeadmin.php:66 actions/newmessage.php:135
+#: actions/newnotice.php:105 actions/nudge.php:80
+#: actions/oauthappssettings.php:162 actions/oauthconnectionssettings.php:135
+#: actions/passwordsettings.php:137 actions/pluginenable.php:87
+#: actions/profilesettings.php:218 actions/recoverpassword.php:383
+#: actions/register.php:157 actions/remotesubscribe.php:76
+#: actions/repeat.php:82 actions/smssettings.php:249 actions/subedit.php:40
+#: actions/subscribe.php:87 actions/tagother.php:145
+#: actions/unsubscribe.php:69 actions/urlsettings.php:171
+#: actions/userauthorization.php:53 lib/designsettings.php:122
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 
@@ -850,10 +903,10 @@ msgstr "అవతారాన్ని పెట్టడంలో పొరప
 #. TRANS: Unknown form validation error in design settings form.
 #: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
 #: actions/designadminpanel.php:100 actions/editapplication.php:144
-#: actions/emailsettings.php:310 actions/grouplogo.php:332
-#: actions/imsettings.php:239 actions/newapplication.php:124
-#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
-#: actions/smssettings.php:271 lib/designsettings.php:321
+#: actions/emailsettings.php:311 actions/grouplogo.php:332
+#: actions/imsettings.php:256 actions/newapplication.php:124
+#: actions/oauthconnectionssettings.php:144 actions/recoverpassword.php:46
+#: actions/smssettings.php:270 lib/designsettings.php:133
 msgid "Unexpected form submission."
 msgstr ""
 
@@ -896,31 +949,26 @@ msgstr "ఖాతా"
 
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Field label in form for profile settings.
-#. TRANS: Label for group nickname (dt). Text hidden by default.
-#. TRANS: DT for nick name in a profile.
-#: actions/apioauthauthorize.php:459 actions/login.php:252
-#: actions/profilesettings.php:106 actions/register.php:432
-#: actions/showgroup.php:243 actions/tagother.php:94
+#: actions/apioauthauthorize.php:459 actions/login.php:225
+#: actions/profilesettings.php:107 actions/register.php:411
 #: actions/userauthorization.php:145 lib/groupeditform.php:145
-#: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "పేరు"
 
 #. TRANS: Field label on OAuth API authorisation form.
-#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:463 actions/login.php:255
-#: actions/register.php:436 lib/accountsettingsaction.php:120
+#: actions/apioauthauthorize.php:463 actions/login.php:228
+#: actions/register.php:415 lib/settingsnav.php:87
 msgid "Password"
 msgstr "సంకేతపదం"
 
 #. TRANS: Button text that when clicked will cancel the process of allowing access to an account
 #. TRANS: by an external application.
 #. TRANS: Button label to cancel an e-mail address confirmation procedure.
-#. TRANS: Button label to cancel an Instant Messaging address confirmation procedure.
+#. TRANS: Button label to cancel an IM address confirmation procedure.
 #. TRANS: Button label to cancel a SMS address confirmation procedure.
 #. TRANS: Button label in the "Edit application" form.
-#: actions/apioauthauthorize.php:478 actions/emailsettings.php:124
-#: actions/imsettings.php:127 actions/smssettings.php:133
+#: actions/apioauthauthorize.php:478 actions/emailsettings.php:125
+#: actions/imsettings.php:136 actions/smssettings.php:132
 #: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Cancel"
@@ -1031,7 +1079,7 @@ msgstr "నిర్ధారణ సంకేతం కనబడలేదు."
 #. TRANS: %s is the requested output format.
 #: actions/apistatusesshow.php:144
 #, fuzzy, php-format
-msgid "Unsupported format: %s"
+msgid "Unsupported format: %s."
 msgstr "%s కి నేరు సందేశాలు"
 
 #. TRANS: Client error displayed requesting a deleted status.
@@ -1112,13 +1160,6 @@ msgstr "%1$s / %2$s యొక్క ఇష్టాంశాలు"
 msgid "%1$s updates favorited by %2$s / %3$s."
 msgstr "%s యొక్క మైక్రోబ్లాగు"
 
-#. TRANS: Server error displayed when generating an Atom feed fails.
-#. TRANS: %s is the error.
-#: actions/apitimelinegroup.php:134
-#, fuzzy, php-format
-msgid "Could not generate feed for group - %s"
-msgstr "గుంపుని తాజాకరించలేకున్నాం."
-
 #. TRANS: Title for timeline of most recent mentions of a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname.
 #: actions/apitimelinementions.php:115
@@ -1135,13 +1176,14 @@ msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr ""
 
 #. TRANS: Title for site timeline. %s is the StatusNet sitename.
+#. TRANS: Public RSS feed title. %s is the StatusNet site name.
 #: actions/apitimelinepublic.php:193 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "%s బహిరంగ కాలరేఖ"
 
 #. TRANS: Subtitle for site timeline. %s is the StatusNet sitename.
-#: actions/apitimelinepublic.php:199 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:199
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "అందరి నుండి %s తాజాకరణలు!"
@@ -1152,21 +1194,33 @@ msgid "Unimplemented."
 msgstr "అమలుపరచబడలేదు."
 
 #. TRANS: Title for Atom feed "repeated to me". %s is the user nickname.
-#: actions/apitimelineretweetedtome.php:108
+#: actions/apitimelineretweetedtome.php:96
 #, php-format
 msgid "Repeated to %s"
 msgstr "%s యొక్క పునరావృతం"
 
+#: actions/apitimelineretweetedtome.php:98
+#, fuzzy, php-format
+msgid "%1$s notices that were to repeated to %2$s / %3$s."
+msgstr "%s యొక్క మైక్రోబ్లాగు"
+
 #. TRANS: Title of list of repeated notices of the logged in user.
 #. TRANS: %s is the nickname of the logged in user.
-#: actions/apitimelineretweetsofme.php:112
+#: actions/apitimelineretweetsofme.php:98
 #, php-format
 msgid "Repeats of %s"
 msgstr "%s యొక్క పునరావృతాలు"
 
+#: actions/apitimelineretweetsofme.php:104
+#, fuzzy, php-format
+msgid "%1$s notices that %2$s / %3$s has repeated."
+msgstr "%2$s నోటీసుని %1$s ఇష్టాంశంగా గుర్తించారు."
+
 #. TRANS: Title for timeline with lastest notices with a given tag.
 #. TRANS: %s is the tag.
-#: actions/apitimelinetag.php:101 actions/tag.php:67
+#. TRANS: Title for first page of notices with tags.
+#. TRANS: %s is the tag.
+#: actions/apitimelinetag.php:101 actions/tag.php:69
 #, fuzzy, php-format
 msgid "Notices tagged with %s"
 msgstr "%2$sలో %1$s అనే ట్యాగుతో ఉన్న నోటీసులు!"
@@ -1179,53 +1233,54 @@ msgid "Updates tagged with %1$s on %2$s!"
 msgstr "%2$sలో %1$s అనే ట్యాగుతో ఉన్న నోటీసులు!"
 
 #. TRANS: Client error displayed trying to add a notice to another user's timeline.
-#: actions/apitimelineuser.php:297
+#: actions/apitimelineuser.php:308
 msgid "Only the user can add to their own timeline."
 msgstr "ఆ వాడుకరి మాత్రమే వారి కాలరేఖలో చేర్చగలరు."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:304
+#: actions/apitimelineuser.php:315
 msgid "Only accept AtomPub for Atom feeds."
 msgstr ""
 
 #. TRANS: Client error displayed attempting to post an empty API notice.
-#: actions/apitimelineuser.php:311
+#: actions/apitimelineuser.php:322
 msgid "Atom post must not be empty."
 msgstr ""
 
 #. TRANS: Client error displayed attempting to post an API that is not well-formed XML.
-#: actions/apitimelineuser.php:317
+#: actions/apitimelineuser.php:328
 msgid "Atom post must be well-formed XML."
 msgstr ""
 
 #. TRANS: Client error displayed when not using an Atom entry.
-#: actions/apitimelineuser.php:323 actions/atompubfavoritefeed.php:228
+#: actions/apitimelineuser.php:334 actions/atompubfavoritefeed.php:228
 #: actions/atompubmembershipfeed.php:230
 #: actions/atompubsubscriptionfeed.php:236
 msgid "Atom post must be an Atom entry."
 msgstr ""
 
 #. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
-#: actions/apitimelineuser.php:335
+#: actions/apitimelineuser.php:345
 msgid "Can only handle POST activities."
 msgstr ""
 
 #. TRANS: Client error displayed when using an unsupported activity object type.
 #. TRANS: %s is the unsupported activity object type.
-#: actions/apitimelineuser.php:346
+#: actions/apitimelineuser.php:356
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
 #. TRANS: %d is the notice ID (number).
-#: actions/apitimelineuser.php:380
+#: actions/apitimelineuser.php:390
 #, fuzzy, php-format
 msgid "No content for notice %d."
 msgstr "మీ నోటీసుని మీరే పునరావృతించలేరు."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:408
+#. TRANS: %s is the notice URI.
+#: actions/apitimelineuser.php:419
 #, fuzzy, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "ఆ ఈమెయిలు చిరునామా లేదా వాడుకరిపేరుతో వాడుకరులెవరూ లేరు."
@@ -1243,9 +1298,10 @@ msgstr "వాడుకరి దొరకలేదు."
 
 #. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
 #. TRANS: Client exception.
+#. TRANS: Client error displayed trying to subscribe to a non-existing profile.
 #: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
 #: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
-#: actions/subscribe.php:107
+#: actions/subscribe.php:110
 #, fuzzy
 msgid "No such profile."
 msgstr "అటువంటి ఫైలు లేదు."
@@ -1391,7 +1447,7 @@ msgid "Not a member."
 msgstr "సభ్యులు కాదు."
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
-#: actions/atompubshowmembership.php:151
+#: actions/atompubshowmembership.php:150
 #, fuzzy
 msgid "Cannot delete someone else's membership."
 msgstr "కొత్త చందాని చేర్చలేకపోయాం."
@@ -1480,10 +1536,7 @@ msgid "Invalid size."
 msgstr "తప్పుడు పరిమాణం."
 
 #. TRANS: Title for avatar upload page.
-#. TRANS: Label for group avatar (dt). Text hidden by default.
-#. TRANS: Link description in user account settings menu.
-#: actions/avatarsettings.php:66 actions/showgroup.php:227
-#: lib/accountsettingsaction.php:113
+#: actions/avatarsettings.php:66 lib/settingsnav.php:82
 msgid "Avatar"
 msgstr "అవతారం"
 
@@ -1496,9 +1549,11 @@ msgstr "మీ వ్యక్తిగత అవతారాన్ని మీ
 
 #. TRANS: Server error displayed in avatar upload page when no matching profile can be found for a user.
 #. TRANS: Server error displayed coming across a request from a user without a profile.
+#. TRANS: Server error displayed when trying to authorise a remote subscription request
+#. TRANS: while the user has no profile.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
 #: actions/grouplogo.php:184 actions/remotesubscribe.php:190
-#: actions/userauthorization.php:72 actions/userrss.php:108
+#: actions/userauthorization.php:75 actions/userrss.php:108
 #, fuzzy
 msgid "User without matching profile."
 msgstr "వాడుకరికి ప్రొఫైలు లేదు."
@@ -1554,10 +1609,10 @@ msgstr "కత్తిరించు"
 msgid "No file uploaded."
 msgstr "ఏ దస్త్రమూ ఎక్కింపబడలేదు."
 
-#. TRANS: Avatar upload form unstruction after uploading a file.
+#. TRANS: Avatar upload form instruction after uploading a file.
 #: actions/avatarsettings.php:345
 #, fuzzy
-msgid "Pick a square area of the image to be your avatar"
+msgid "Pick a square area of the image to be your avatar."
 msgstr "మీ అవతారానికి గానూ ఈ చిత్రం నుండి ఒక చతురస్రపు ప్రదేశాన్ని ఎంచుకోండి"
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
@@ -1583,7 +1638,7 @@ msgstr "అవతారాన్ని తొలగించాం."
 
 #. TRANS: Title for backup account page.
 #. TRANS: Option in profile settings to create a backup of the account of the currently logged in user.
-#: actions/backupaccount.php:61 actions/profilesettings.php:467
+#: actions/backupaccount.php:61 actions/profilesettings.php:468
 msgid "Backup account"
 msgstr ""
 
@@ -1617,7 +1672,7 @@ msgstr "నేపథ్యం"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
 #: actions/backupaccount.php:254
-msgid "Backup your account"
+msgid "Backup your account."
 msgstr ""
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
@@ -1658,7 +1713,7 @@ msgstr "కాదు"
 #. TRANS: Submit button title for 'No' when blocking a user.
 #: actions/block.php:158
 #, fuzzy
-msgid "Do not block this user"
+msgid "Do not block this user."
 msgstr "ఈ వాడుకరిని నిరోధించకు"
 
 #. TRANS: Button label on the user block form.
@@ -1675,10 +1730,9 @@ msgid "Yes"
 msgstr "అవును"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#. TRANS: Description of the form to block a user.
-#: actions/block.php:165 lib/blockform.php:79
-msgid "Block this user"
-msgstr "ఈ వాడుకరిని నిరోధించు"
+#: actions/block.php:165
+msgid "Block this user."
+msgstr "ఈ వాడుకరిని నిరోధించండి."
 
 #. TRANS: Server error displayed when blocking a user fails.
 #: actions/block.php:189
@@ -1744,32 +1798,48 @@ msgstr "నిర్ధారణ సంకేతం కనబడలేదు."
 msgid "That confirmation code is not for you!"
 msgstr "ఆ నిర్ధారణా సంకేతం మీది కాదు!"
 
-#. TRANS: Server error for a unknow address type %s, which can be 'email', 'jabber', or 'sms'.
-#: actions/confirmaddress.php:92
-#, php-format
-msgid "Unrecognized address type %s."
+#. TRANS: Server error for an unknown address type, which can be 'email', 'sms', or the name of an IM network (such as 'xmpp' or 'aim')
+#: actions/confirmaddress.php:94
+#, fuzzy, php-format
+msgid "Unrecognized address type %s"
 msgstr "గుర్తుతెలియని చిరునామా రకం %s."
 
 #. TRANS: Client error for an already confirmed email/jabber/sms address.
-#: actions/confirmaddress.php:97
+#: actions/confirmaddress.php:103 actions/confirmaddress.php:136
 msgid "That address has already been confirmed."
 msgstr "ఆ చిరునామా ఇప్పటికే నిర్ధారితమైంది."
 
+#: actions/confirmaddress.php:121 actions/imsettings.php:444
+#: actions/userdesignsettings.php:306
+#, fuzzy
+msgid "Couldn't update user."
+msgstr "వాడుకరిని తాజాకరించలేకున్నాం."
+
+#: actions/confirmaddress.php:144
+#, fuzzy
+msgid "Couldn't update user im preferences."
+msgstr "వాడుకరిని తాజాకరించలేకున్నాం."
+
+#: actions/confirmaddress.php:156
+#, fuzzy
+msgid "Couldn't insert user im preferences."
+msgstr "కొత్త చందాని చేర్చలేకపోయాం."
+
 #. TRANS: Server error displayed when an address confirmation code deletion from the
 #. TRANS: database fails in the contact address confirmation action.
-#: actions/confirmaddress.php:132
+#: actions/confirmaddress.php:169
 #, fuzzy
 msgid "Could not delete address confirmation."
 msgstr "ఈమెయిల్ నిర్ధారణని తొలగించలేకున్నాం."
 
 #. TRANS: Title for the contact address confirmation action.
-#: actions/confirmaddress.php:150
+#: actions/confirmaddress.php:185
 msgid "Confirm address"
 msgstr "చిరునామాని నిర్ధారించు"
 
 #. TRANS: Success message for the contact address confirmation action.
 #. TRANS: %s can be 'email', 'jabber', or 'sms'.
-#: actions/confirmaddress.php:166
+#: actions/confirmaddress.php:200
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "\"%s\" అనే చిరునామా మీ ఖాతాకి నిర్ధారితమైంది."
@@ -1783,6 +1853,7 @@ msgstr "సంభాషణ"
 #. TRANS: Label for user statistics.
 #: actions/conversation.php:149 lib/noticelist.php:87
 #: lib/profileaction.php:246 lib/searchgroupnav.php:82
+#: lib/threadednoticelist.php:66
 msgid "Notices"
 msgstr "సందేశాలు"
 
@@ -1816,7 +1887,7 @@ msgstr "ఖాతాని తొలగించాం."
 
 #. TRANS: Page title for page on which a user account can be deleted.
 #. TRANS: Option in profile settings to delete the account of the currently logged in user.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:475
+#: actions/deleteaccount.php:228 actions/profilesettings.php:476
 #, fuzzy
 msgid "Delete account"
 msgstr "ఖాతాని సృష్టించుకోండి"
@@ -1840,7 +1911,7 @@ msgstr ""
 #. TRANS: Field label for delete account confirmation entry.
 #. TRANS: Field label for password reset form where the password has to be typed again.
 #: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:262 actions/register.php:440
+#: actions/recoverpassword.php:262 actions/register.php:419
 msgid "Confirm"
 msgstr "నిర్థారించు"
 
@@ -1870,14 +1941,14 @@ msgstr "ఉపకరణం కనబడలేదు."
 #. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
 #: actions/deleteapplication.php:79 actions/editapplication.php:78
-#: actions/showapplication.php:94
+#: actions/showapplication.php:90
 msgid "You are not the owner of this application."
 msgstr "మీరు ఈ ఉపకరణం యొక్క యజమాని కాదు."
 
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
-#: actions/newapplication.php:112 actions/showapplication.php:118
-#: lib/action.php:1425
+#: actions/newapplication.php:112 actions/showapplication.php:113
+#: lib/action.php:1391
 msgid "There was a problem with your session token."
 msgstr ""
 
@@ -1900,13 +1971,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting an application.
 #: actions/deleteapplication.php:161
 #, fuzzy
-msgid "Do not delete this application"
+msgid "Do not delete this application."
 msgstr "ఈ ఉపకరణాన్ని తొలగించకు"
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
 #: actions/deleteapplication.php:167
 #, fuzzy
-msgid "Delete this application"
+msgid "Delete this application."
 msgstr "ఈ ఉపకరణాన్ని తొలగించు"
 
 #. TRANS: Client error when trying to delete group while not logged in.
@@ -1961,13 +2032,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting a group.
 #: actions/deletegroup.php:224
 #, fuzzy
-msgid "Do not delete this group"
+msgid "Do not delete this group."
 msgstr "ఈ గుంపును తొలగించకు"
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
 #: actions/deletegroup.php:231
 #, fuzzy
-msgid "Delete this group"
+msgid "Delete this group."
 msgstr "ఈ గుంపుని తొలగించు"
 
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
@@ -1975,14 +2046,16 @@ msgstr "ఈ గుంపుని తొలగించు"
 #. TRANS: Client error displayed when trying to mark a notice as favorite without being logged in.
 #. TRANS: Client error displayed trying to block a user from a group while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
+#. TRANS: Client error displayed trying to log out when not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
+#. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
 #. TRANS: Client error displayed when trying to change user options while not logged in.
 #: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
-#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:69
+#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:70
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
-#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
-#: actions/tagother.php:33 actions/unsubscribe.php:52
+#: actions/nudge.php:63 actions/pluginenable.php:97 actions/subedit.php:33
+#: actions/subscribe.php:98 actions/tagother.php:33 actions/unsubscribe.php:52
 #: lib/adminpanelaction.php:71 lib/profileformaction.php:63
 #: lib/settingsaction.php:72
 msgid "Not logged in."
@@ -2009,12 +2082,13 @@ msgstr "మీరు నిజంగానే ఈ నోటీసుని త
 #. TRANS: Submit button title for 'No' when deleting a notice.
 #: actions/deletenotice.php:159
 #, fuzzy
-msgid "Do not delete this notice"
+msgid "Do not delete this notice."
 msgstr "ఈ నోటీసుని తొలగించకు"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:166 lib/noticelist.php:673
-msgid "Delete this notice"
+#: actions/deletenotice.php:166
+#, fuzzy
+msgid "Delete this notice."
 msgstr "ఈ నోటీసుని తొలగించు"
 
 #. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
@@ -2050,19 +2124,16 @@ msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting a user.
 #: actions/deleteuser.php:158
-#, fuzzy
-msgid "Do not delete this user"
+msgid "Do not delete this user."
 msgstr "ఈ వాడుకరిని తొలగించకండి."
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
-#. TRANS: Description of form for deleting a user.
-#: actions/deleteuser.php:165 lib/deleteuserform.php:75
-msgid "Delete this user"
-msgstr "ఈ వాడుకరిని తొలగించు"
+#: actions/deleteuser.php:165
+msgid "Delete this user."
+msgstr "ఈ వాడుకరిని తొలగించండి."
 
 #. TRANS: Message used as title for design settings for the site.
-#. TRANS: Link description in user account settings menu.
-#: actions/designadminpanel.php:60 lib/accountsettingsaction.php:134
+#: actions/designadminpanel.php:60 lib/settingsnav.php:97
 msgid "Design"
 msgstr "రూపురేఖలు"
 
@@ -2130,8 +2201,7 @@ msgid "You can upload a custom StatusNet theme as a .ZIP archive."
 msgstr ""
 
 #. TRANS: Fieldset legend for theme background image.
-#. TRANS: Fieldset legend on profile design page.
-#: actions/designadminpanel.php:515 lib/designsettings.php:98
+#: actions/designadminpanel.php:515
 msgid "Change background image"
 msgstr "నేపథ్య చిత్రాన్ని మార్చు"
 
@@ -2139,7 +2209,7 @@ msgstr "నేపథ్య చిత్రాన్ని మార్చు"
 #. TRANS: Field label for background color selector.
 #. TRANS: Label on profile design page for setting a profile page background colour.
 #: actions/designadminpanel.php:525 actions/designadminpanel.php:609
-#: lib/designsettings.php:183
+#: lib/designform.php:238
 msgid "Background"
 msgstr "నేపథ్యం"
 
@@ -2164,14 +2234,14 @@ msgstr "ఆఫ్"
 #. TRANS: Form guide for turning background image on or off on theme designer page.
 #. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
 #. TRANS: use of the uploaded profile image.
-#: actions/designadminpanel.php:577 lib/designsettings.php:159
+#: actions/designadminpanel.php:577 lib/designform.php:214
 #, fuzzy
 msgid "Turn background image on or off."
 msgstr "నేపథ్య చిత్రాన్ని మార్చు"
 
 #. TRANS: Checkbox label to title background image on theme designer page.
 #. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-#: actions/designadminpanel.php:583 lib/designsettings.php:165
+#: actions/designadminpanel.php:583 lib/designform.php:220
 #, fuzzy
 msgid "Tile background image"
 msgstr "నేపథ్య చిత్రాన్ని మార్చు"
@@ -2184,25 +2254,25 @@ msgstr "రంగులను మార్చు"
 
 #. TRANS: Field label for content color selector.
 #. TRANS: Label on profile design page for setting a profile page content colour.
-#: actions/designadminpanel.php:623 lib/designsettings.php:197
+#: actions/designadminpanel.php:623 lib/designform.php:252
 msgid "Content"
 msgstr "విషయం"
 
 #. TRANS: Field label for sidebar color selector.
 #. TRANS: Label on profile design page for setting a profile page sidebar colour.
-#: actions/designadminpanel.php:637 lib/designsettings.php:211
+#: actions/designadminpanel.php:637 lib/designform.php:266
 msgid "Sidebar"
 msgstr "పక్కపట్టీ"
 
 #. TRANS: Field label for text color selector.
 #. TRANS: Label on profile design page for setting a profile page text colour.
-#: actions/designadminpanel.php:651 lib/designsettings.php:225
+#: actions/designadminpanel.php:651 lib/designform.php:280
 msgid "Text"
 msgstr "పాఠ్యం"
 
 #. TRANS: Field label for link color selector.
 #. TRANS: Label on profile design page for setting a profile page links colour.
-#: actions/designadminpanel.php:665 lib/designsettings.php:239
+#: actions/designadminpanel.php:665 lib/designform.php:294
 msgid "Links"
 msgstr "లంకెలు"
 
@@ -2224,23 +2294,21 @@ msgid "Use defaults"
 msgstr "అప్రమేయాలని ఉపయోగించు"
 
 #. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: actions/designadminpanel.php:720 lib/designsettings.php:259
+#: actions/designadminpanel.php:720
 #, fuzzy
-msgid "Restore default designs"
+msgid "Restore default designs."
 msgstr "అప్రమేయాలని ఉపయోగించు"
 
 #. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: actions/designadminpanel.php:728 lib/designsettings.php:267
+#: actions/designadminpanel.php:728
 #, fuzzy
-msgid "Reset back to default"
+msgid "Reset back to default."
 msgstr "అప్రమేయాలని ఉపయోగించు"
 
 #. TRANS: Title for button for saving theme settings.
-#. TRANS: Title for button on profile design page to save settings.
-#: actions/designadminpanel.php:736 lib/designsettings.php:272
-msgid "Save design"
+#: actions/designadminpanel.php:736
+#, fuzzy
+msgid "Save design."
 msgstr "రూపురేఖలని భద్రపరచు"
 
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
@@ -2272,7 +2340,7 @@ msgid "You must be logged in to edit an application."
 msgstr "ఉపకరణాలని మార్చడానికి మీరు ప్రవేశించి ఉండాలి."
 
 #. TRANS: Client error displayed trying to edit an application that does not exist.
-#: actions/editapplication.php:83 actions/showapplication.php:87
+#: actions/editapplication.php:83 actions/showapplication.php:83
 msgid "No such application."
 msgstr "అటువంటి ఉపకరణం లేదు."
 
@@ -2367,80 +2435,53 @@ msgstr "%s గుంపుని మార్చు"
 msgid "You must be logged in to create a group."
 msgstr "గుంపుని సృష్టించడానికి మీరు లోనికి ప్రవేశించాలి."
 
-#. TRANS: Client error displayed trying to edit a group while not being a group admin.
-#. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
-#. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
-#: actions/editgroup.php:110 actions/editgroup.php:176
-#: actions/groupdesignsettings.php:109 actions/grouplogo.php:111
-msgid "You must be an admin to edit the group."
-msgstr "గుంపుని మార్చడానికి మీరు నిర్వాహకులయి ఉండాలి."
-
 #. TRANS: Form instructions for group edit form.
 #: actions/editgroup.php:161
 msgid "Use this form to edit the group."
 msgstr "గుంపుని మార్చడానికి ఈ ఫారాన్ని ఉపయోగించండి."
 
-#. TRANS: Group edit form validation error.
-#. TRANS: Group create form validation error.
-#. TRANS: %s is the invalid alias.
-#: actions/editgroup.php:241 actions/newgroup.php:188
-#, php-format
-msgid "Invalid alias: \"%s\""
-msgstr "తప్పుడు మారుపేరు: \"%s\""
-
-#. TRANS: Server error displayed when editing a group fails.
-#: actions/editgroup.php:274
-msgid "Could not update group."
-msgstr "గుంపుని తాజాకరించలేకున్నాం."
-
-#. TRANS: Server error displayed when group aliases could not be added.
-#. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/editgroup.php:281 classes/User_group.php:540
-msgid "Could not create aliases."
-msgstr "మారుపేర్లని సృష్టించలేకపోయాం."
-
 #. TRANS: Group edit form success message.
 #: actions/editgroup.php:301
 msgid "Options saved."
 msgstr "ఎంపికలు భద్రమయ్యాయి."
 
 #. TRANS: Title for e-mail settings.
-#: actions/emailsettings.php:59
+#: actions/emailsettings.php:60
 msgid "Email settings"
 msgstr "ఈమెయిల్ అమరికలు"
 
 #. TRANS: E-mail settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/emailsettings.php:73
+#: actions/emailsettings.php:74
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 msgstr "%%site.name%% నుండి మీకు ఎలా మెయిల్ వస్తూంతో సంభాళించుకోండి."
 
 #. TRANS: Form legend for e-mail settings form.
 #. TRANS: Field label for e-mail address input in e-mail settings form.
-#: actions/emailsettings.php:103 actions/emailsettings.php:129
+#: actions/emailsettings.php:104 actions/emailsettings.php:130
 msgid "Email address"
 msgstr "ఈమెయిలు చిరునామా"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:109
+#: actions/emailsettings.php:110
 msgid "Current confirmed email address."
 msgstr "ప్రస్తుత నిర్ధారిత ఈమెయిలు చిరునామా."
 
 #. TRANS: Button label to remove a confirmed e-mail address.
 #. TRANS: Button label for removing a set sender e-mail address to post notices from.
-#. TRANS: Button label to remove a confirmed Instant Messaging address.
+#. TRANS: Button label to remove a confirmed IM address.
 #. TRANS: Button label to remove a confirmed SMS address.
 #. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
-#: actions/emailsettings.php:112 actions/emailsettings.php:179
-#: actions/imsettings.php:112 actions/smssettings.php:120
-#: actions/smssettings.php:176
+#: actions/emailsettings.php:113 actions/emailsettings.php:180
+#: actions/imsettings.php:119 actions/smssettings.php:119
+#: actions/smssettings.php:175
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "తొలగించు"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:119
+#: actions/emailsettings.php:120
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -2453,46 +2494,46 @@ msgstr ""
 #. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
 #. TRANS: Any other domain may be owned by a legitimate person or
 #. TRANS: organization.
-#: actions/emailsettings.php:136
+#: actions/emailsettings.php:137
 msgid "Email address, like \"UserName@example.org\""
 msgstr "ఈమెయిల్ చిరునామా, \"username@example.org\" వలె"
 
 #. TRANS: Button label for adding an e-mail address in e-mail settings form.
-#. TRANS: Button label for adding an Instant Messaging address in Instant Messaging settings form.
+#. TRANS: Button label for adding an IM address in IM settings form.
 #. TRANS: Button label for adding a SMS phone number in SMS settings form.
-#: actions/emailsettings.php:140 actions/imsettings.php:147
-#: actions/smssettings.php:158
+#: actions/emailsettings.php:141 actions/imsettings.php:147
+#: actions/smssettings.php:157
 msgctxt "BUTTON"
 msgid "Add"
 msgstr "చేర్చు"
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:148 actions/smssettings.php:167
+#: actions/emailsettings.php:149 actions/smssettings.php:166
 msgid "Incoming email"
 msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:154
+#: actions/emailsettings.php:155
 msgid "I want to post notices by email."
 msgstr "నేను ఈమెయిలు ద్వారా నోటీసులు పంపాలనుకుంటున్నాను."
 
 #. TRANS: Form instructions for incoming e-mail form in e-mail settings.
 #. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
-#: actions/emailsettings.php:176 actions/smssettings.php:174
+#: actions/emailsettings.php:177 actions/smssettings.php:173
 #, fuzzy
 msgid "Send email to this address to post new notices."
 msgstr "%sకి నోటీసులు పంపించడానికి కొత్త ఈమెయిలు చిరునామా"
 
 #. TRANS: Instructions for incoming e-mail address input form, when an address has already been assigned.
 #. TRANS: Instructions for incoming SMS e-mail address input form.
-#: actions/emailsettings.php:185 actions/smssettings.php:182
+#: actions/emailsettings.php:186 actions/smssettings.php:181
 #, fuzzy
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr "%sకి నోటీసులు పంపించడానికి కొత్త ఈమెయిలు చిరునామా"
 
 #. TRANS: Instructions for incoming e-mail address input form.
-#: actions/emailsettings.php:189
+#: actions/emailsettings.php:190
 msgid ""
 "To send notices via email, we need to create a unique email address for you "
 "on this server:"
@@ -2500,90 +2541,90 @@ msgstr ""
 
 #. TRANS: Button label for adding an e-mail address to send notices from.
 #. TRANS: Button label for adding an SMS e-mail address to send notices from.
-#: actions/emailsettings.php:195 actions/smssettings.php:185
+#: actions/emailsettings.php:196 actions/smssettings.php:184
 msgctxt "BUTTON"
 msgid "New"
 msgstr "కొత్తది"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:204
+#: actions/emailsettings.php:205
 msgid "Email preferences"
 msgstr "ఈమెయిలు అభిరుచులు"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:212
+#: actions/emailsettings.php:213
 msgid "Send me notices of new subscriptions through email."
 msgstr "కొత్త చందాదార్లు చేరినప్పుడు నాకు ఈమెయిలు ద్వారా తెలియజేయి."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:218
+#: actions/emailsettings.php:219
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr "ఎవరైనా నా నోటీసుని ఇష్టాంశంగా చేర్చుకున్నపుడు నాకు ఈమెయిలు పంపించు."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:225
+#: actions/emailsettings.php:226
 msgid "Send me email when someone sends me a private message."
 msgstr "ఎవరైనా నాకు అంతరంగిక సందేశాన్ని పంపించినప్పుడు నాకు ఈమెయిలుని పంపించు"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:231
+#: actions/emailsettings.php:232
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr "ఎవరైనా నాకు \"@-స్పందన\"ని పంపినప్పుడు నాకు ఈమెయిలును పంపించు."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:237
+#: actions/emailsettings.php:238
 msgid "Allow friends to nudge me and send me an email."
 msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:243
+#: actions/emailsettings.php:244
 #, fuzzy
 msgid "Publish a MicroID for my email address."
 msgstr "అది మీ ఈమెయిలు చిరునామా కాదు."
 
 #. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:361
+#: actions/emailsettings.php:362
 msgid "Email preferences saved."
 msgstr "ఈమెయిలు అభిరుచులు భద్రమయ్యాయి."
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:380
+#: actions/emailsettings.php:381
 msgid "No email address."
 msgstr "ఈమెయిలు చిరునామా లేదు."
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:388
+#: actions/emailsettings.php:389
 #, fuzzy
 msgid "Cannot normalize that email address."
 msgstr "ప్రస్తుత నిర్ధారిత ఈమెయిలు చిరునామా."
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:393 actions/register.php:212
+#: actions/emailsettings.php:394 actions/register.php:197
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "సరైన ఈమెయిల్ చిరునామా కాదు:"
 
 #. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:397
+#: actions/emailsettings.php:398
 msgid "That is already your email address."
 msgstr "అది ఇప్పటికే మీ ఈమెయిల్ చిరునామా."
 
 #. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:401
+#: actions/emailsettings.php:402
 msgid "That email address already belongs to another user."
 msgstr "ఆ ఈమెయిల్ చిరునామా ఇప్పటేకే ఇతర వాడుకరికి సంబంధించినది."
 
 #. TRANS: Server error thrown on database error adding e-mail confirmation code.
 #. TRANS: Server error thrown on database error adding Instant Messaging confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:418 actions/imsettings.php:343
-#: actions/smssettings.php:365
+#: actions/emailsettings.php:419 actions/imsettings.php:362
+#: actions/smssettings.php:364
 #, fuzzy
 msgid "Could not insert confirmation code."
 msgstr "నిర్ధారణ సంకేతాన్ని చేర్చలేకపోయాం."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:425
+#: actions/emailsettings.php:426
 #, fuzzy
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
@@ -2595,60 +2636,63 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling Instant Messaging address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:445 actions/imsettings.php:377
-#: actions/smssettings.php:399
+#: actions/emailsettings.php:446 actions/imsettings.php:391
+#: actions/smssettings.php:398
 msgid "No pending confirmation to cancel."
 msgstr "రద్దుచేయడానికి వేచివున్న నిర్ధారణలేమీ లేవు."
 
 #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:450
+#: actions/emailsettings.php:451
 msgid "That is the wrong email address."
 msgstr "ఆ ఈమెయిలు చిరునామా సరైనది కాదు."
 
 #. TRANS: Server error thrown on database error canceling e-mail address confirmation.
 #. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
-#: actions/emailsettings.php:459 actions/smssettings.php:413
+#: actions/emailsettings.php:460 actions/smssettings.php:412
 #, fuzzy
 msgid "Could not delete email confirmation."
 msgstr "ఈమెయిల్ నిర్ధారణని తొలగించలేకున్నాం."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:464
+#: actions/emailsettings.php:465
 msgid "Email confirmation cancelled."
 msgstr "ఈమెయిలు నిర్ధారణ రద్దయింది."
 
 #. TRANS: Message given trying to remove an e-mail address that is not
 #. TRANS: registered for the active user.
-#: actions/emailsettings.php:483
+#: actions/emailsettings.php:484
 msgid "That is not your email address."
 msgstr "అది మీ ఈమెయిలు చిరునామా కాదు."
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:504
+#: actions/emailsettings.php:505
 msgid "The email address was removed."
 msgstr "ఆ ఈమెయిలు చిరునామాని తొలగించాం."
 
 #. TRANS: Form validation error displayed when trying to remove an incoming e-mail address while no address has been set.
-#: actions/emailsettings.php:518 actions/smssettings.php:555
+#: actions/emailsettings.php:519 actions/smssettings.php:554
 #, fuzzy
 msgid "No incoming email address."
 msgstr "ఈమెయిలు చిరునామా లేదు."
 
 #. TRANS: Server error thrown on database error removing incoming e-mail address.
 #. TRANS: Server error thrown on database error adding incoming e-mail address.
-#: actions/emailsettings.php:530 actions/emailsettings.php:554
-#: actions/smssettings.php:565 actions/smssettings.php:588
+#. TRANS: Server error displayed when the user could not be updated in SMS settings.
+#: actions/emailsettings.php:531 actions/emailsettings.php:555
+#: actions/smssettings.php:565 actions/smssettings.php:590
 msgid "Could not update user record."
 msgstr "వాడుకరిని తాజాకరించలేకున్నాం."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:534 actions/smssettings.php:568
+#. TRANS: Confirmation text after updating SMS settings.
+#: actions/emailsettings.php:535 actions/smssettings.php:569
 #, fuzzy
 msgid "Incoming email address removed."
 msgstr "ఆ ఈమెయిలు చిరునామాని తొలగించాం."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:558 actions/smssettings.php:591
+#. TRANS: Confirmation text after updating SMS settings.
+#: actions/emailsettings.php:559 actions/smssettings.php:594
 #, fuzzy
 msgid "New incoming email address added."
 msgstr "ఈమెయిలు చిరునామా లేదు."
@@ -2661,7 +2705,7 @@ msgstr "ఈ నోటీసు ఇప్పటికే మీ ఇష్టా
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
 #: actions/favor.php:95
 #, fuzzy
-msgid "Disfavor favorite"
+msgid "Disfavor favorite."
 msgstr "ఇష్టాంశాలకు చేర్చు"
 
 #. TRANS: Page title for first page of favorited notices.
@@ -2708,9 +2752,8 @@ msgstr "[ఒక ఖాతాని నమోదుచేసుకుని](%%ac
 #. TRANS: %s is a user's nickname.
 #. TRANS: Title for first page of favourite notices of a user.
 #. TRANS: %s is the user for whom the favourite notices are displayed.
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing own favourited notices.
 #: actions/favoritesrss.php:111 actions/showfavorites.php:76
-#: lib/personalgroupnav.php:122
+#: lib/personalgroupnav.php:110
 #, php-format
 msgid "%s's favorite notices"
 msgstr "%sకి ఇష్టమైన నోటీసులు"
@@ -2899,13 +2942,12 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
 #: actions/groupblock.php:191
 #, fuzzy
-msgid "Do not block this user from this group"
+msgid "Do not block this user from this group."
 msgstr "ఈ వాడుకరిని ఈ గుంపు నుండి నిరోధించకు"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
 #: actions/groupblock.php:198
-#, fuzzy
-msgid "Block this user from this group"
+msgid "Block this user from this group."
 msgstr "ఈ వాడుకరిని ఈ గుంపునుండి నిరోధించండి."
 
 #. TRANS: Server error displayed when trying to block a user from a group fails because of an application error.
@@ -2915,6 +2957,7 @@ msgid "Database error blocking user from group."
 msgstr "ఈ వాడుకరిని ఈ గుంపు నుండి నిరోధించకు"
 
 #. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
+#. TRANS: Client error displayed trying to find a user by ID without providing an ID.
 #: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr "ఐడీ లేదు."
@@ -2943,7 +2986,7 @@ msgid "Unable to update your design settings."
 msgstr "మీ రూపురేఖల అమరికలని భద్రపరచలేకున్నాం."
 
 #. TRANS: Form text to confirm saved group design settings.
-#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:222
+#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:239
 msgid "Design preferences saved."
 msgstr "ఈమెయిలు అభిరుచులు భద్రమయ్యాయి."
 
@@ -3006,7 +3049,7 @@ msgid "A list of the users in this group."
 msgstr "ఈ గుంపులో వాడుకరులు జాబితా."
 
 #. TRANS: Indicator in group members list that this user is a group administrator.
-#: actions/groupmembers.php:190
+#: actions/groupmembers.php:190 lib/action.php:581
 msgid "Admin"
 msgstr "నిర్వాహకులు"
 
@@ -3097,8 +3140,10 @@ msgid "Group search"
 msgstr "గుంపుల అన్వేషణ"
 
 #. TRANS: Text on page where groups can be searched if no results were found for a query.
-#: actions/groupsearch.php:82 actions/noticesearch.php:117
-#: actions/peoplesearch.php:83
+#. TRANS: Text for notice search results is the query had no results.
+#. TRANS: Message on the "People search" page where a query has no results.
+#: actions/groupsearch.php:82 actions/noticesearch.php:122
+#: actions/peoplesearch.php:87
 msgid "No results."
 msgstr "ఫలితాలేమీ లేవు."
 
@@ -3134,156 +3179,162 @@ msgid "User is not blocked from group."
 msgstr "వాడుకరిని గుంపు నుండి నిరోధించలేదు."
 
 #. TRANS: Server error displayed when unblocking a user from a group fails because of an unknown error.
+#. TRANS: Server error displayed when removing a user block.
 #: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "నిరోధాన్ని తొలగించడంలో పొరపాటు."
 
 #. TRANS: Title for Instant Messaging settings.
-#: actions/imsettings.php:58
+#: actions/imsettings.php:56
 msgid "IM settings"
 msgstr "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.
-#: actions/imsettings.php:71
+#: actions/imsettings.php:69
 #, php-format
 msgid ""
-"You can send and receive notices through Jabber/Google Talk [instant "
-"messages](%%doc.im%%). Configure your address and settings below."
+"You can send and receive notices through instant messaging [instant messages]"
+"(%%doc.im%%). Configure your addresses and settings below."
 msgstr ""
 
-#. TRANS: Message given in the Instant Messaging settings if XMPP is not enabled on the site.
+#. TRANS: Message given in the IM settings if IM is not enabled on the site.
 #: actions/imsettings.php:90
 msgid "IM is not available."
 msgstr "IM అందుబాటులో లేదు."
 
-#. TRANS: Form legend for Instant Messaging settings form.
-#. TRANS: Field label for Instant Messaging address input in Instant Messaging settings form.
-#: actions/imsettings.php:102 actions/imsettings.php:132
-msgid "IM address"
-msgstr "IM చిరునామా"
+#: actions/imsettings.php:116
+#, fuzzy, php-format
+msgid "Current confirmed %s address."
+msgstr "ప్రస్తుత నిర్ధారిత ఈమెయిలు చిరునామా."
 
-#: actions/imsettings.php:109
-#, fuzzy
-msgid "Current confirmed Jabber/Google Talk address."
-msgstr "ప్రస్తుతం నిర్ధారించిన Jabber/GTalk చిరునామా"
-
-#. TRANS: Form note in Instant Messaging settings form.
-#. TRANS: %s is the Instant Messaging address set for the site.
-#: actions/imsettings.php:120
+#. TRANS: Form note in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:128
 #, fuzzy, php-format
 msgid ""
-"Awaiting confirmation on this address. Check your Jabber/Google Talk account "
-"for a message with further instructions. (Did you add %s to your buddy list?)"
+"Awaiting confirmation on this address. Check your %s account for a message "
+"with further instructions. (Did you add %s to your buddy list?)"
 msgstr ""
 "ఈ చిరునామా నిర్ధారణకై వేచివున్నాం. తదుపరి సూచనలతో ఉన్న సందేశానికై మీ ఇన్‌బాక్స్‌లో (స్పామ్ బాక్సులో కూడా!) "
 "చూడండి."
 
-#. TRANS: IM address input field instructions in Instant Messaging settings form.
-#. TRANS: %s is the Instant Messaging address set for the site.
-#. TRANS: Do not translate "example.org". It is one of the domain names reserved for use in examples by
-#. TRANS: http://www.rfc-editor.org/rfc/rfc2606.txt. Any other domain may be owned by a legitimate
-#. TRANS: person or organization.
-#: actions/imsettings.php:139
+#: actions/imsettings.php:140
+msgid "IM address"
+msgstr "IM చిరునామా"
+
+#: actions/imsettings.php:142
 #, php-format
-msgid ""
-"Jabber or Google Talk address, like \"UserName@example.org\". First, make "
-"sure to add %s to your buddy list in your IM client or on Google Talk."
+msgid "%s screenname."
 msgstr ""
 
-#. TRANS: Form legend for Instant Messaging preferences form.
-#: actions/imsettings.php:154
-msgid "IM preferences"
+#. TRANS: Header for IM preferences form.
+#: actions/imsettings.php:163
+#, fuzzy
+msgid "IM Preferences"
 msgstr "IM అభిరుచులు"
 
-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:159
-msgid "Send me notices through Jabber/Google Talk."
-msgstr ""
-
-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:165
-msgid "Post a notice when my Jabber/Google Talk status changes."
-msgstr ""
-
-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:171
-msgid ""
-"Send me replies through Jabber/Google Talk from people I'm not subscribed to."
-msgstr ""
-
-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:178
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:174
 #, fuzzy
-msgid "Publish a MicroID for my Jabber/Google Talk address."
-msgstr "ప్రస్తుతం నిర్ధారించిన Jabber/GTalk చిరునామా"
+msgid "Send me notices"
+msgstr "సైటు గమనిక"
 
-#. TRANS: Confirmation message for successful Instant Messaging preferences save.
-#: actions/imsettings.php:283 actions/othersettings.php:192
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:176
+msgid "Post a notice when my status changes."
+msgstr ""
+
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:178
+msgid "Send me replies from people I'm not subscribed to."
+msgstr ""
+
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:181
+#, fuzzy
+msgid "Publish a MicroID"
+msgstr "అది మీ ఈమెయిలు చిరునామా కాదు."
+
+#. TRANS: Server error thrown on database error updating IM preferences.
+#: actions/imsettings.php:291
+#, fuzzy
+msgid "Couldn't update IM preferences."
+msgstr "వాడుకరిని తాజాకరించలేకున్నాం."
+
+#. TRANS: Confirmation message for successful IM preferences save.
+#. TRANS: Confirmation message after saving preferences.
+#: actions/imsettings.php:298 actions/urlsettings.php:244
 msgid "Preferences saved."
 msgstr "అభిరుచులు భద్రమయ్యాయి."
 
-#. TRANS: Message given saving Instant Messaging address without having provided one.
-#: actions/imsettings.php:304
-msgid "No Jabber ID."
-msgstr "Jabber ID లేదు."
-
-#. TRANS: Message given saving Instant Messaging address that cannot be normalised.
-#: actions/imsettings.php:312
+#. TRANS: Message given saving IM address without having provided one.
+#: actions/imsettings.php:320
 #, fuzzy
-msgid "Cannot normalize that Jabber ID."
-msgstr "సరైన Jabber ఐడీ కాదు"
+msgid "No screenname."
+msgstr "పేరు"
 
-#. TRANS: Message given saving Instant Messaging address that not valid.
-#: actions/imsettings.php:317
-#, fuzzy
-msgid "Not a valid Jabber ID."
-msgstr "సరైన Jabber ఐడీ కాదు"
-
-#. TRANS: Message given saving Instant Messaging address that is already set.
-#: actions/imsettings.php:321
-msgid "That is already your Jabber ID."
-msgstr "ఈ Jabber ID మీకు ఇప్పటికే ఉంది"
-
-#. TRANS: Message given saving Instant Messaging address that is already set for another user.
 #: actions/imsettings.php:325
-msgid "Jabber ID already belongs to another user."
+#, fuzzy
+msgid "No transport."
+msgstr "సందేశం లేదు."
+
+#. TRANS: Message given saving IM address that cannot be normalised.
+#: actions/imsettings.php:333
+#, fuzzy
+msgid "Cannot normalize that screenname"
+msgstr "సరైన Jabber ఐడీ కాదు"
+
+#. TRANS: Message given saving IM address that not valid.
+#: actions/imsettings.php:340
+#, fuzzy
+msgid "Not a valid screenname"
+msgstr "సరైన పేరు కాదు."
+
+#. TRANS: Message given saving IM address that is already set for another user.
+#: actions/imsettings.php:344
+#, fuzzy
+msgid "Screenname already belongs to another user."
 msgstr "Jabber ID ఇప్పటికే వేరొకరికి ఉంది."
 
-#. TRANS: Message given saving valid Instant Messaging address that is to be confirmed.
-#. TRANS: %s is the Instant Messaging address set for the site.
-#: actions/imsettings.php:353
-#, php-format
-msgid ""
-"A confirmation code was sent to the IM address you added. You must approve %"
-"s for sending messages to you."
-msgstr ""
+#. TRANS: Message given saving valid IM address that is to be confirmed.
+#: actions/imsettings.php:369
+#, fuzzy
+msgid "A confirmation code was sent to the IM address you added."
+msgstr "ఆ నిర్ధారణా సంకేతం మీది కాదు!"
 
-#. TRANS: Message given canceling Instant Messaging address confirmation for the wrong IM address.
-#: actions/imsettings.php:382
+#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#: actions/imsettings.php:396
 msgid "That is the wrong IM address."
 msgstr "ఆ IM చిరునామా సరైనది కాదు."
 
-#. TRANS: Server error thrown on database error canceling Instant Messaging address confirmation.
-#: actions/imsettings.php:391
+#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#: actions/imsettings.php:405
 #, fuzzy
-msgid "Could not delete IM confirmation."
+msgid "Couldn't delete confirmation."
 msgstr "ఈమెయిల్ నిర్ధారణని తొలగించలేకున్నాం."
 
-#. TRANS: Message given after successfully canceling Instant Messaging address confirmation.
-#: actions/imsettings.php:396
+#. TRANS: Message given after successfully canceling IM address confirmation.
+#: actions/imsettings.php:410
 msgid "IM confirmation cancelled."
 msgstr "IM నిర్ధారణ రద్దయింది."
 
-#. TRANS: Message given trying to remove an Instant Messaging address that is not
+#. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.
-#: actions/imsettings.php:417
-msgid "That is not your Jabber ID."
-msgstr "ఇది మీ Jabber ID కాదు"
+#: actions/imsettings.php:434
+#, fuzzy
+msgid "That is not your screenname."
+msgstr "అది మీ ఫోను నంబర్ కాదు."
+
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#: actions/imsettings.php:443
+#, fuzzy
+msgid "Couldn't update user im prefs."
+msgstr "వాడుకరిని తాజాకరించలేకున్నాం."
 
 #. TRANS: Message given after successfully removing a registered Instant Messaging address.
-#: actions/imsettings.php:440
+#: actions/imsettings.php:451
 msgid "The IM address was removed."
 msgstr "ఆ IM చిరునామాని తొలగించాం."
 
@@ -3490,7 +3541,7 @@ msgid "You must be logged in to join a group."
 msgstr "గుంపుల్లో చేరడానికి మీరు ప్రవేశించి ఉండాలి."
 
 #. TRANS: Title for join group page after joining.
-#: actions/joingroup.php:147
+#: actions/joingroup.php:148
 #, fuzzy, php-format
 msgctxt "TITLE"
 msgid "%1$s joined group %2$s"
@@ -3618,7 +3669,7 @@ msgstr ""
 #. TRANS: Submit button title.
 #: actions/licenseadminpanel.php:311 actions/sessionsadminpanel.php:199
 #: actions/siteadminpanel.php:292 actions/snapshotadminpanel.php:245
-#: actions/tagother.php:154 lib/applicationeditform.php:357
+#: actions/tagother.php:133 lib/applicationeditform.php:357
 msgid "Save"
 msgstr "భద్రపరచు"
 
@@ -3626,50 +3677,52 @@ msgstr "భద్రపరచు"
 msgid "Save license settings"
 msgstr "లైసెన్సు అమరికలను భద్రపరచు"
 
-#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
+#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
+#: actions/login.php:97 actions/otp.php:62 actions/register.php:130
 msgid "Already logged in."
 msgstr "ఇప్పటికే లోనికి ప్రవేశించారు."
 
-#: actions/login.php:148
+#: actions/login.php:125
 msgid "Incorrect username or password."
 msgstr "వాడుకరిపేరు లేదా సంకేతపదం తప్పు."
 
-#: actions/login.php:154 actions/otp.php:120
+#. TRANS: Server error displayed when a user object could not be created trying to login using "one time password login".
+#: actions/login.php:131 actions/otp.php:127
 msgid "Error setting user. You are probably not authorized."
 msgstr "వాడుకరిని అమర్చడంలో పొరపాటు. బహుశా మీకు అధీకరణ లేకపోవచ్చు."
 
-#: actions/login.php:210 actions/login.php:263
+#: actions/login.php:185 actions/login.php:236 lib/action.php:598
 msgid "Login"
 msgstr "ప్రవేశించండి"
 
-#: actions/login.php:249
+#: actions/login.php:222
 msgid "Login to site"
 msgstr "సైటు లోనికి ప్రవేశించు"
 
-#: actions/login.php:258 actions/register.php:490
+#: actions/login.php:231 actions/register.php:469
 msgid "Remember me"
 msgstr "నన్ను గుర్తుంచుకో"
 
-#: actions/login.php:259 actions/register.php:492
+#: actions/login.php:232 actions/register.php:471
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "భవిష్యత్తులో ఆటోమెటిగ్గా లోనికి ప్రవేశించు; బయటి కంప్యూర్ల కొరకు కాదు!"
 
-#: actions/login.php:269
+#: actions/login.php:241
 msgid "Lost or forgotten password?"
 msgstr "మీ సంకేతపదం మర్చిపోయారా?"
 
-#: actions/login.php:288
+#: actions/login.php:259
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
 msgstr ""
 "భద్రతా కారణాల దృష్ట్యా, అమరికలు మార్చే ముందు మీ వాడుకరి పేరుని మరియు సంకేతపదాన్ని మరోసారి ఇవ్వండి."
 
-#: actions/login.php:292
+#: actions/login.php:263
 msgid "Login with your username and password."
 msgstr "మీ వాడుకరిపేరు మరియు సంకేతపదాలతో ప్రవేశించండి."
 
-#: actions/login.php:295
+#: actions/login.php:266
 #, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -3795,7 +3848,9 @@ msgstr "కొత్త సందేశం"
 msgid "Notice posted"
 msgstr "నోటీసుని పునరావృతించారు"
 
-#: actions/noticesearch.php:68
+#. TRANS: Instructions for Notice search page.
+#. TRANS: %%site.name%% is the name of the StatusNet site.
+#: actions/noticesearch.php:69
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -3804,16 +3859,21 @@ msgstr ""
 "%%site.name%%లోని సందేశాలను వెతకండి. అన్వేషణ పదాలను ఖాళీలతో వేరుచేయండి; ఒక్కో పదంలో 3 లేదా "
 "అంతకంటే ఎక్కువ అక్షరాలు ఉండాలి."
 
-#: actions/noticesearch.php:78
+#. TRANS: Title of the page where users can search for notices.
+#: actions/noticesearch.php:80
 msgid "Text search"
 msgstr "పాఠ్య అన్వేషణ"
 
-#: actions/noticesearch.php:91
+#. TRANS: Test in RSS notice search.
+#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
+#: actions/noticesearch.php:95
 #, php-format
 msgid "Search results for \"%1$s\" on %2$s"
 msgstr "%2$sలో \"%1$s\"కై అన్వేషణ ఫలితాలు"
 
-#: actions/noticesearch.php:121
+#. TRANS: Text for logged in users making a query for notices without results.
+#. TRANS: This message contains a Markdown link.
+#: actions/noticesearch.php:128
 #, php-format
 msgid ""
 "Be the first to [post on this topic](%%%%action.newnotice%%%%?"
@@ -3821,7 +3881,9 @@ msgid ""
 msgstr ""
 "[ఈ విషయంపై](%%%%action.newnotice%%%%?status_textarea=%s) వ్రాసే మొదటివారు మీరే అవ్వండి!"
 
-#: actions/noticesearch.php:124
+#. TRANS: Text for not logged in users making a query for notices without results.
+#. TRANS: This message contains Markdown links.
+#: actions/noticesearch.php:133
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and be the first to "
@@ -3830,14 +3892,17 @@ msgstr ""
 "మీరు [ఒక ఖాతా నమోదు చేసుకుని](%%%%action.register%%%%) [ఈ విషయంపై వ్రాసే](%%%%action."
 "newnotice%%%%?status_textarea=%s) మొదటివారు ఎందుకుకాకూడదు!"
 
-#: actions/noticesearchrss.php:96
+#. TRANS: RSS notice search feed title. %s is the query.
+#: actions/noticesearchrss.php:95
 #, php-format
 msgid "Updates with \"%s\""
 msgstr "%2$sలో %1$s అనే ట్యాగుతో ఉన్న నోటీసులు!"
 
-#: actions/noticesearchrss.php:98
+#. TRANS: RSS notice search feed description.
+#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
+#: actions/noticesearchrss.php:99
 #, fuzzy, php-format
-msgid "Updates matching search term \"%1$s\" on %2$s!"
+msgid "Updates matching search term \"%1$s\" on %2$s."
 msgstr "%2$sలో %1$s అనే ట్యాగుతో ఉన్న నోటీసులు!"
 
 #: actions/nudge.php:85
@@ -3857,51 +3922,51 @@ msgid "Nudge sent!"
 msgstr "సందేశాన్ని పంపించాం"
 
 #. TRANS: Message displayed to an anonymous user trying to view OAuth application list.
-#: actions/oauthappssettings.php:60
+#: actions/oauthappssettings.php:57
 msgid "You must be logged in to list your applications."
 msgstr "మీ ఉపకరణాలను చూడడానికి మీరు ప్రవేశించి ఉండాలి."
 
 #. TRANS: Page title for OAuth applications
-#: actions/oauthappssettings.php:76
+#: actions/oauthappssettings.php:73
 msgid "OAuth applications"
 msgstr "OAuth ఉపకరణాలు"
 
 #. TRANS: Page instructions for OAuth applications
-#: actions/oauthappssettings.php:88
+#: actions/oauthappssettings.php:85
 msgid "Applications you have registered"
 msgstr "మీరు నమోదు చేసివున్న ఉపకరణాలు"
 
 #. TRANS: Empty list message on page with OAuth applications.
-#: actions/oauthappssettings.php:141
+#: actions/oauthappssettings.php:138
 #, php-format
 msgid "You have not registered any applications yet."
 msgstr "మీరు ఇంకా ఏ ఉపకరణాన్నీ నమోదు చేసుకోలేదు."
 
 #. TRANS: Title for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:71
+#: actions/oauthconnectionssettings.php:69
 msgid "Connected applications"
 msgstr "సంధానిత ఉపకరణాలు"
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:83
+#: actions/oauthconnectionssettings.php:80
 msgid "The following connections exist for your account."
 msgstr ""
 
 #. TRANS: Client error when trying to revoke access for an application while not being a user of it.
-#: actions/oauthconnectionssettings.php:168
+#: actions/oauthconnectionssettings.php:165
 msgid "You are not a user of that application."
 msgstr "మీరు ఆ ఉపకరణం యొక్క వాడుకరి కాదు."
 
 #. TRANS: Client error when revoking access has failed for some reason.
 #. TRANS: %s is the application ID revoking access failed for.
-#: actions/oauthconnectionssettings.php:183
+#: actions/oauthconnectionssettings.php:180
 #, fuzzy, php-format
 msgid "Unable to revoke access for application: %s."
 msgstr "మీ ఉపకరణాన్ని మార్చడానికి ఈ ఫారాన్ని ఉపయోగించండి."
 
 #. TRANS: Success message after revoking access for an application.
 #. TRANS: %1$s is the application name, %2$s is the first part of the user token.
-#: actions/oauthconnectionssettings.php:202
+#: actions/oauthconnectionssettings.php:199
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -3909,20 +3974,30 @@ msgid ""
 msgstr ""
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:213
+#: actions/oauthconnectionssettings.php:210
 msgid "You have not authorized any applications to use your account."
 msgstr "మీ ఖాతాని ఉపయోగించుకోడానికి మీరు ఏ ఉపకరణాన్నీ అధీకరించలేదు."
 
 #. TRANS: Note for developers in the OAuth connection settings form.
 #. TRANS: This message contains a Markdown link. Do not separate "](".
 #. TRANS: %s is the URL to the OAuth settings.
-#: actions/oauthconnectionssettings.php:233
+#: actions/oauthconnectionssettings.php:230
 #, php-format
 msgid ""
 "Are you a developer? [Register an OAuth client application](%s) to use with "
 "this instance of StatusNet."
 msgstr ""
 
+#: actions/oembed.php:64
+#, fuzzy, php-format
+msgid "\"%s\" not found."
+msgstr "వాడుకరి దొరకలేదు."
+
+#: actions/oembed.php:76
+#, fuzzy, php-format
+msgid "Notice %s not found."
+msgstr "నిర్ధారణ సంకేతం కనబడలేదు."
+
 #: actions/oembed.php:80 actions/shownotice.php:100
 msgid "Notice has no profile."
 msgstr "నోటీసుకి ప్రొఫైలు లేదు."
@@ -3932,6 +4007,16 @@ msgstr "నోటీసుకి ప్రొఫైలు లేదు."
 msgid "%1$s's status on %2$s"
 msgstr "%2$sలో %1$s యొక్క స్థితి"
 
+#: actions/oembed.php:95
+#, fuzzy, php-format
+msgid "Attachment %s not found."
+msgstr "అందుకోవాల్సిన వాడుకరి కనబడలేదు."
+
+#: actions/oembed.php:136
+#, php-format
+msgid "\"%s\" not supported for oembed requests."
+msgstr ""
+
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
 #: actions/oembed.php:168
 #, fuzzy, php-format
@@ -3945,98 +4030,63 @@ msgid "Only %s URLs over plain HTTP please."
 msgstr ""
 
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1205
-#: lib/apiaction.php:1232 lib/apiaction.php:1367
+#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1207
+#: lib/apiaction.php:1234 lib/apiaction.php:1369
 msgid "Not a supported data format."
 msgstr ""
 
+#. TRANS: ShortName in the OpenSearch interface when trying to find users.
 #: actions/opensearch.php:64
 msgid "People Search"
 msgstr "ప్రజల అన్వేషణ"
 
-#: actions/opensearch.php:67
+#: actions/opensearch.php:68
 msgid "Notice Search"
 msgstr "నోటీసుల అన్వేషణ"
 
-#: actions/othersettings.php:59
-msgid "Other settings"
-msgstr "ఇతర అమరికలు"
-
-#. TRANS: Instructions for tab "Other" in user profile settings.
-#: actions/othersettings.php:71
-msgid "Manage various other options."
-msgstr "వేరే ఇతర ఎంపికలని సంభాళించండి."
-
-#. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
-#. TRANS: user's profile settings. Use of "free" is as in "open", indicating that the
-#. TRANS: information on the shortener site is freely distributable.
-#. TRANS: This message has one space at the beginning. Use your language's word separator
-#. TRANS: here if it has one (most likely a single space).
-#: actions/othersettings.php:113
-msgid " (free service)"
-msgstr " (స్వేచ్ఛా సేవ)"
-
-#. TRANS: Label for dropdown with URL shortener services.
-#: actions/othersettings.php:122
-msgid "Shorten URLs with"
-msgstr "URL కుదింపు సేవ"
-
-#. TRANS: Tooltip for for dropdown with URL shortener services.
-#: actions/othersettings.php:124
-msgid "Automatic shortening service to use."
-msgstr "ఉపయోగించాల్సిన యాంత్రిక కుదింపు సేవ."
-
-#. TRANS: Label for checkbox.
-#: actions/othersettings.php:130
-msgid "View profile designs"
-msgstr "ఫ్రొఫైలు రూపురేఖలు"
-
-#. TRANS: Tooltip for checkbox.
-#: actions/othersettings.php:132
-#, fuzzy
-msgid "Show or hide profile designs."
-msgstr "ఫ్రొఫైలు రూపురేఖలు"
-
-#. TRANS: Form validation error for form "Other settings" in user profile.
-#: actions/othersettings.php:164
-#, fuzzy
-msgid "URL shortening service is too long (maximum 50 characters)."
-msgstr "URL కుదింపు సేవ మరీ పెద్దగా ఉంది (50 అక్షరాలు గరిష్ఠం)."
-
-#: actions/otp.php:69
+#. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
+#: actions/otp.php:70
 msgid "No user ID specified."
 msgstr "గుంపు ఏమీ పేర్కొనలేదు."
 
-#: actions/otp.php:83
+#. TRANS: Client error displayed trying to use "one time password login" without specifying a login token.
+#: actions/otp.php:86
 msgid "No login token specified."
 msgstr "గుంపు ఏమీ పేర్కొనలేదు."
 
-#: actions/otp.php:90
+#. TRANS: Client error displayed trying to use "one time password login" without requesting a login token.
+#: actions/otp.php:94
 #, fuzzy
 msgid "No login token requested."
 msgstr "అధీకరణ అభ్యర్థన లేదు!"
 
-#: actions/otp.php:95
+#. TRANS: Client error displayed trying to use "one time password login" while specifying an invalid login token.
+#: actions/otp.php:100
 #, fuzzy
 msgid "Invalid login token specified."
 msgstr "సందేశపు విషయం సరైనది కాదు"
 
-#: actions/otp.php:104
+#. TRANS: Client error displayed trying to use "one time password login" while specifying an expired login token.
+#: actions/otp.php:110
 #, fuzzy
 msgid "Login token expired."
 msgstr "సైటు లోనికి ప్రవేశించు"
 
-#: actions/outbox.php:58
+#. TRANS: Title for outbox for any but the fist page.
+#. TRANS: %1$s is the user nickname, %2$d is the page number.
+#: actions/outbox.php:57
 #, fuzzy, php-format
 msgid "Outbox for %1$s - page %2$d"
 msgstr "%1$sకి వచ్చినవి - %2$dవ పేజీ"
 
+#. TRANS: Title for first page of outbox.
 #: actions/outbox.php:61
 #, fuzzy, php-format
 msgid "Outbox for %s"
 msgstr "%sకి వచ్చినవి"
 
-#: actions/outbox.php:104
+#. TRANS: Instructions for outbox.
+#: actions/outbox.php:103
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr "ఇవి మీరు పంపివున్న అంతరంగిక సందేశాలు."
 
@@ -4062,43 +4112,44 @@ msgstr "పాత సంకేతపదం"
 msgid "New password"
 msgstr "కొత్త సంకేతపదం"
 
-#: actions/passwordsettings.php:109
-#, fuzzy
-msgid "6 or more characters"
+#: actions/passwordsettings.php:109 actions/register.php:416
+msgid "6 or more characters."
 msgstr "6 లేదా అంతకంటే ఎక్కువ అక్షరాలు."
 
-#: actions/passwordsettings.php:113
+#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#: actions/passwordsettings.php:113 actions/recoverpassword.php:264
+#: actions/register.php:420
 #, fuzzy
-msgid "Same as password above"
+msgid "Same as password above."
 msgstr "పై సంకేతపదం వలెనే"
 
 #: actions/passwordsettings.php:117
 msgid "Change"
 msgstr "మార్చు"
 
-#: actions/passwordsettings.php:154 actions/register.php:238
+#: actions/passwordsettings.php:153 actions/register.php:223
 msgid "Password must be 6 or more characters."
 msgstr "సంకేతపదం తప్పనిసరిగా 6 లేదా అంతకంటే ఎక్కువ అక్షరాలుండాలి."
 
-#: actions/passwordsettings.php:157 actions/register.php:241
+#: actions/passwordsettings.php:156 actions/register.php:226
 msgid "Passwords don't match."
 msgstr "సంకేతపదాలు సరిపోలలేదు."
 
-#: actions/passwordsettings.php:165
+#: actions/passwordsettings.php:164
 msgid "Incorrect old password"
 msgstr "పాత సంకేతపదం తప్పు"
 
-#: actions/passwordsettings.php:181
+#: actions/passwordsettings.php:180
 msgid "Error saving user; invalid."
 msgstr "వాడుకరిని భద్రపరచడంలో పొరపాటు: సరికాదు."
 
-#: actions/passwordsettings.php:186
+#. TRANS: Reset password form validation error message.
+#: actions/passwordsettings.php:185 actions/recoverpassword.php:418
 #, fuzzy
-msgid "Can't save new password."
+msgid "Cannot save new password."
 msgstr "కొత్త సంకేతపదాన్ని భద్రపరచలేము."
 
-#. TRANS: Title for password recovery page in password saved mode.
-#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
+#: actions/passwordsettings.php:191
 msgid "Password saved."
 msgstr "సంకేతపదం భద్రమయ్యింది."
 
@@ -4313,8 +4364,7 @@ msgid "Directory where backgrounds are located."
 msgstr ""
 
 #. TRANS: Fieldset legens in Paths admin panel.
-#. TRANS: DT element label in attachment list.
-#: actions/pathsadminpanel.php:419 lib/attachmentlist.php:98
+#: actions/pathsadminpanel.php:419
 msgid "Attachments"
 msgstr "జోడింపులు"
 
@@ -4388,7 +4438,9 @@ msgstr ""
 msgid "Save paths"
 msgstr "కొత్త సందేశం"
 
-#: actions/peoplesearch.php:52
+#. TRANS: Instructions for the "People search" page.
+#. TRANS: %%site.name%% is the name of the StatusNet site.
+#: actions/peoplesearch.php:54
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
@@ -4397,7 +4449,8 @@ msgstr ""
 "%%site.name%%లో వ్యక్తులను వారి పేరు, ప్రాంతం, లేదా ఆసక్తులను బట్టి వెతకండి. అన్వేషించే పదాలను "
 "ఖాళీలతో వేరుచేయండి; ఒక్కో పదంలో 3 లేదా అంతకంటే ఎక్కువ అక్షరాలు ఉండాలి."
 
-#: actions/peoplesearch.php:58
+#. TRANS: Title of a page where users can search for other users.
+#: actions/peoplesearch.php:61
 msgid "People search"
 msgstr "వ్యక్తుల అన్వేషణ"
 
@@ -4411,6 +4464,60 @@ msgstr "సరైన ఈమెయిల్ చిరునామా కాదు
 msgid "Users self-tagged with %1$s - page %2$d"
 msgstr "%2$sలో %1$s అనే ట్యాగుతో ఉన్న నోటీసులు!"
 
+#. TRANS: Page title for AJAX form return when a disabling a plugin.
+#: actions/plugindisable.php:69
+msgctxt "plugin"
+msgid "Disabled"
+msgstr ""
+
+#. TRANS: Client error displayed trying to perform any request method other than POST.
+#. TRANS: Do not translate POST.
+#: actions/pluginenable.php:78 actions/subscribe.php:77
+msgid "This action only accepts POST requests."
+msgstr ""
+
+#: actions/pluginenable.php:102
+#, fuzzy
+msgid "You cannot administer plugins."
+msgstr "మీరు వాడుకరులని తొలగించలేరు."
+
+#: actions/pluginenable.php:109
+#, fuzzy
+msgid "No such plugin."
+msgstr "అటువంటి పేజీ లేదు."
+
+#. TRANS: Page title for AJAX form return when enabling a plugin.
+#: actions/pluginenable.php:159
+msgctxt "plugin"
+msgid "Enabled"
+msgstr ""
+
+#. TRANS: Tab and title for plugins admin panel.
+#. TRANS: Menu item for site administration
+#: actions/pluginsadminpanel.php:56 actions/version.php:191
+#: lib/adminpanelaction.php:411
+msgid "Plugins"
+msgstr "ప్లగిన్లు"
+
+#. TRANS: Instructions at top of plugin admin page.
+#: actions/pluginsadminpanel.php:68
+msgid ""
+"Additional plugins can be enabled and configured manually. See the <a href="
+"\"http://status.net/wiki/Plugins\">online plugin documentation</a> for more "
+"details."
+msgstr ""
+
+#. TRANS: Admin form section header
+#: actions/pluginsadminpanel.php:84
+#, fuzzy
+msgid "Default plugins"
+msgstr "అప్రమేయ భాష"
+
+#: actions/pluginsadminpanel.php:106
+msgid ""
+"All default plugins have been disabled from the site's configuration file."
+msgstr ""
+
 #: actions/postnotice.php:95
 msgid "Invalid notice content."
 msgstr "తప్పుడు దస్త్రపుపేరు.."
@@ -4421,12 +4528,12 @@ msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’.
 msgstr ""
 
 #. TRANS: Page title for profile settings.
-#: actions/profilesettings.php:59
+#: actions/profilesettings.php:60
 msgid "Profile settings"
 msgstr "ఫ్రొఫైలు అమరికలు"
 
 #. TRANS: Usage instructions for profile settings.
-#: actions/profilesettings.php:70
+#: actions/profilesettings.php:71
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
@@ -4434,34 +4541,31 @@ msgstr ""
 "తెలుసుకోగలుగుతారు."
 
 #. TRANS: Profile settings form legend.
-#: actions/profilesettings.php:98
+#: actions/profilesettings.php:99
 msgid "Profile information"
 msgstr "ప్రొఫైలు సమాచారం"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109 actions/register.php:433
+#: actions/profilesettings.php:110 actions/register.php:412
 #, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr "1-64 చిన్నబడి అక్షరాలు లేదా అంకెలు, విరామచిహ్నాలు మరియు ఖాళీలు తప్ప"
 
 #. TRANS: Field label in form for profile settings.
-#. TRANS: Label for full group name (dt). Text hidden by default.
-#. TRANS: DT for full name in a profile.
-#: actions/profilesettings.php:113 actions/register.php:455
-#: actions/showgroup.php:255 actions/tagother.php:104
-#: lib/groupeditform.php:150 lib/userprofile.php:156
+#: actions/profilesettings.php:114 actions/register.php:434
+#: lib/groupeditform.php:150
 msgid "Full name"
 msgstr "పూర్తి పేరు"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:118 actions/register.php:460
+#: actions/profilesettings.php:119 actions/register.php:439
 #: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "హోమ్ పేజీ"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:121
+#: actions/profilesettings.php:122 actions/register.php:441
 #, fuzzy
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr "మీ హోమ్ పేజీ, బ్లాగు, లేదా వేరే సేటులోని మీ ప్రొఫైలు యొక్క చిరునామా"
@@ -4469,7 +4573,7 @@ msgstr "మీ హోమ్ పేజీ, బ్లాగు, లేదా వ
 #. TRANS: Tooltip for field label in form for profile settings. Plural
 #. TRANS: is decided by the number of characters available for the
 #. TRANS: biography (%d).
-#: actions/profilesettings.php:129 actions/register.php:471
+#: actions/profilesettings.php:130 actions/register.php:450
 #, fuzzy, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4477,82 +4581,77 @@ msgstr[0] "మీ గురించి మరియు మీ ఆసక్త
 msgstr[1] "మీ గురించి మరియు మీ ఆసక్తుల గురించి %d అక్షరాల్లో చెప్పండి"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:135 actions/register.php:476
+#: actions/profilesettings.php:136 actions/register.php:455
 msgid "Describe yourself and your interests"
 msgstr "మీ గురించి మరియు మీ ఆసక్తుల గురించి చెప్పండి"
 
 #. TRANS: Text area label in form for profile settings where users can provide.
 #. TRANS: their biography.
-#: actions/profilesettings.php:139 actions/register.php:478
+#: actions/profilesettings.php:140 actions/register.php:457
 msgid "Bio"
 msgstr "స్వపరిచయం"
 
 #. TRANS: Field label in form for profile settings.
-#. TRANS: Label for group location (dt). Text hidden by default.
-#. TRANS: DT for location in a profile.
-#: actions/profilesettings.php:145 actions/register.php:483
-#: actions/showgroup.php:265 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:173
-#: lib/userprofile.php:172
+#: actions/profilesettings.php:146 actions/register.php:462
+#: lib/groupeditform.php:173
 msgid "Location"
 msgstr "ప్రాంతం"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148 actions/register.php:485
+#: actions/profilesettings.php:149
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "మీరు ఎక్కడ నుండి, \"నగరం, రాష్ట్రం (లేదా ప్రాంతం), దేశం\""
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:153
+#: actions/profilesettings.php:154
 msgid "Share my current location when posting notices"
 msgstr ""
 
 #. TRANS: Field label in form for profile settings.
-#. TRANS: DT for tags in a profile.
-#: actions/profilesettings.php:161 actions/tagother.php:149
-#: actions/tagother.php:209 lib/subscriptionlist.php:106
-#: lib/subscriptionlist.php:108 lib/userprofile.php:220
+#: actions/profilesettings.php:162 actions/tagother.php:128
+#: actions/tagother.php:188 lib/subscriptionlist.php:104
+#: lib/subscriptionlist.php:106
 msgid "Tags"
 msgstr "ట్యాగులు"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:164
+#: actions/profilesettings.php:165
 msgid ""
-"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- "
+"separated."
 msgstr ""
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:169
+#: actions/profilesettings.php:170
 msgid "Language"
 msgstr "భాష"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:171
-#, fuzzy
-msgid "Preferred language"
+#: actions/profilesettings.php:172
+msgid "Preferred language."
 msgstr "ప్రాధాన్యతా భాష."
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:181
+#: actions/profilesettings.php:182
 msgid "Timezone"
 msgstr "కాలమండలం"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:183
+#: actions/profilesettings.php:184
 msgid "What timezone are you normally in?"
 msgstr "మీరు సామాన్యంగా ఉండే కాలమండలం ఏది?"
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:189
+#: actions/profilesettings.php:190
 #, fuzzy
 msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)"
+"Automatically subscribe to whoever subscribes to me (best for non-humans)."
 msgstr "ఉపయోగించాల్సిన యాంత్రిక కుదింపు సేవ."
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Plural form is used based on the maximum number of allowed
 #. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:258 actions/register.php:229
+#: actions/profilesettings.php:259 actions/register.php:214
 #, fuzzy, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4560,50 +4659,50 @@ msgstr[0] "స్వపరిచయం చాలా పెద్దగా ఉం
 msgstr[1] "స్వపరిచయం చాలా పెద్దగా ఉంది (%d అక్షరాలు గరిష్ఠం)."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:269 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:270 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr "కాలమండలాన్ని ఎంచుకోలేదు."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:277
+#: actions/profilesettings.php:278
 #, fuzzy
 msgid "Language is too long (maximum 50 characters)."
 msgstr "భాష మరీ పెద్దగా ఉంది (50 అక్షరాలు గరిష్ఠం)."
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:291 actions/tagother.php:178
-#, php-format
-msgid "Invalid tag: \"%s\""
+#: actions/profilesettings.php:292
+#, fuzzy, php-format
+msgid "Invalid tag: \"%s\"."
 msgstr "తప్పుడు మారుపేరు: \"%s\""
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:347
+#: actions/profilesettings.php:348
 #, fuzzy
 msgid "Could not update user for autosubscribe."
 msgstr "వాడుకరిని తాజాకరించలేకున్నాం."
 
 #. TRANS: Server error thrown when user profile location preference settings could not be updated.
-#: actions/profilesettings.php:405
+#: actions/profilesettings.php:406
 #, fuzzy
 msgid "Could not save location prefs."
 msgstr "ట్యాగులని భద్రపరచలేకున్నాం."
 
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:427 actions/tagother.php:200
+#: actions/profilesettings.php:428 actions/tagother.php:179
 msgid "Could not save tags."
 msgstr "ట్యాగులని భద్రపరచలేకపోయాం."
 
 #. TRANS: Confirmation shown when user profile settings are saved.
 #. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:436 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:437 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "అమరికలు భద్రమయ్యాయి."
 
 #. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
 #. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:483 actions/restoreaccount.php:60
+#: actions/profilesettings.php:484 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "ఖాతాని సృష్టించుకోండి"
@@ -4681,6 +4780,12 @@ msgstr ""
 "ఇది %%site.name%%, స్వేచ్ఛా మృదూపకరమైన [స్టేటస్‌నెట్](http://status.net/) అనే పనిముట్టుపై "
 "ఆధారపడిన ఒక [మైక్రో-బ్లాగింగు](http://en.wikipedia.org/wiki/Micro-blogging) సేవ."
 
+#. TRANS: Public RSS feed description. %s is the StatusNet site name.
+#: actions/publicrss.php:106
+#, fuzzy, php-format
+msgid "%s updates from everyone."
+msgstr "అందరి నుండి %s తాజాకరణలు!"
+
 #. TRANS: Title for public tag cloud.
 #: actions/publictagcloud.php:57
 msgid "Public tag cloud"
@@ -4719,10 +4824,6 @@ msgid ""
 "one!"
 msgstr "[ఒక ఖాతాని నమోదుచేసుకుని](%%action.register%%) మీరే మొదట వ్రాసేవారు ఎందుకు కాకూడదు!"
 
-#: actions/publictagcloud.php:146
-msgid "Tag cloud"
-msgstr "ట్యాగు మేఘం"
-
 #. TRANS: Client error displayed trying to recover password while already logged in.
 #: actions/recoverpassword.php:37
 msgid "You are already logged in!"
@@ -4819,6 +4920,12 @@ msgstr "కొత్త సంకేతపదం"
 msgid "Password recovery requested"
 msgstr ""
 
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/recoverpassword.php:229
+#, fuzzy
+msgid "Password saved"
+msgstr "సంకేతపదం భద్రమయ్యింది."
+
 #. TRANS: Title for password recovery page when an unknown action has been specified.
 #: actions/recoverpassword.php:232
 msgid "Unknown action"
@@ -4830,15 +4937,9 @@ msgstr "తెలియని చర్య"
 msgid "6 or more characters, and do not forget it!"
 msgstr "6 లేదా అంతకంటే ఎక్కువ అక్షరాలు, మర్చిపోకండి!"
 
-#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
-#: actions/recoverpassword.php:264 actions/register.php:441
-#, fuzzy
-msgid "Same as password above."
-msgstr "పై సంకేతపదం వలెనే"
-
 #. TRANS: Button text for password reset form.
 #. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: actions/recoverpassword.php:268 lib/designsettings.php:264
+#: actions/recoverpassword.php:268 lib/designform.php:145
 msgctxt "BUTTON"
 msgid "Reset"
 msgstr "రీసెట్"
@@ -4886,14 +4987,8 @@ msgstr "సంకేతపదం 6 లేదా అంతకంటే ఎక్
 msgid "Password and confirmation do not match."
 msgstr "సంకేతపదం మరియు నిర్ధారణ సరిపోలేదు."
 
-#. TRANS: Reset password form validation error message.
-#: actions/recoverpassword.php:418
-#, fuzzy
-msgid "Cannot save new password."
-msgstr "కొత్త సంకేతపదాన్ని భద్రపరచలేము."
-
 #. TRANS: Server error displayed when something does wrong with the user object during password reset.
-#: actions/recoverpassword.php:426 actions/register.php:256
+#: actions/recoverpassword.php:426 actions/register.php:241
 #, fuzzy
 msgid "Error setting user."
 msgstr "వాడుకరిని భద్రపరచడంలో పొరపాటు: సరికాదు."
@@ -4903,93 +4998,98 @@ msgstr "వాడుకరిని భద్రపరచడంలో పొర
 msgid "New password successfully saved. You are now logged in."
 msgstr "మీ కొత్త సంకేతపదం భద్రమైంది. మీరు ఇప్పుడు లోనికి ప్రవేశించారు."
 
-#: actions/register.php:92 actions/register.php:196 actions/register.php:413
+#: actions/redirecturl.php:70
+#, fuzzy
+msgid "No id parameter"
+msgstr "జోడింపులు లేవు."
+
+#: actions/redirecturl.php:76
+#, fuzzy, php-format
+msgid "No such file \"%d\""
+msgstr "అటువంటి ఫైలు లేదు."
+
+#: actions/register.php:80 actions/register.php:181 actions/register.php:392
 msgid "Sorry, only invited people can register."
 msgstr "క్షమించండి, ఆహ్వానితులు మాత్రమే నమోదుకాగలరు."
 
-#: actions/register.php:99
+#: actions/register.php:87
 msgid "Sorry, invalid invitation code."
 msgstr "క్షమించండి, తప్పు ఆహ్వాన సంకేతం."
 
-#: actions/register.php:119
+#: actions/register.php:106
 msgid "Registration successful"
 msgstr "నమోదు విజయవంతం"
 
-#: actions/register.php:121 actions/register.php:511
+#: actions/register.php:108 actions/register.php:490
 msgid "Register"
 msgstr "నమోదు"
 
-#: actions/register.php:142
+#: actions/register.php:128
 msgid "Registration not allowed."
 msgstr "నమోదు అనుమతించబడదు."
 
-#: actions/register.php:209
+#: actions/register.php:194
 #, fuzzy
-msgid "You can't register if you don't agree to the license."
+msgid "You cannot register if you don't agree to the license."
 msgstr "ఈ లైసెన్సుకి అంగీకరించకపోతే మీరు నమోదుచేసుకోలేరు."
 
-#: actions/register.php:218
+#: actions/register.php:203
 msgid "Email address already exists."
 msgstr "ఈమెయిల్ చిరునామా ఇప్పటికే ఉంది."
 
-#: actions/register.php:251 actions/register.php:273
+#: actions/register.php:236 actions/register.php:258
 msgid "Invalid username or password."
 msgstr "వాడుకరిపేరు లేదా సంకేతపదం తప్పు."
 
-#: actions/register.php:351
+#: actions/register.php:333
 msgid ""
 "With this form you can create a new account. You can then post notices and "
-"link up to friends and colleagues. "
+"link up to friends and colleagues."
 msgstr ""
 
-#: actions/register.php:437
-msgid "6 or more characters."
-msgstr "6 లేదా అంతకంటే ఎక్కువ అక్షరాలు."
-
-#. TRANS: Link description in user account settings menu.
-#: actions/register.php:445 actions/register.php:449
-#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
+#: actions/register.php:424 actions/register.php:428
+#: actions/siteadminpanel.php:238 lib/settingsnav.php:92
 msgid "Email"
 msgstr "ఈమెయిల్"
 
-#: actions/register.php:446 actions/register.php:450
+#: actions/register.php:425 actions/register.php:429
 #, fuzzy
-msgid "Used only for updates, announcements, and password recovery"
+msgid "Used only for updates, announcements, and password recovery."
 msgstr "తాజా విశేషాలు, ప్రకటనలు, మరియు సంకేతపదం పోయినప్పుడు మాత్రమే ఉపయోగిస్తాం."
 
-#: actions/register.php:457
+#: actions/register.php:436
 #, fuzzy
-msgid "Longer name, preferably your \"real\" name"
+msgid "Longer name, preferably your \"real\" name."
 msgstr "పొడుగాటి పేరు, మీ \"అసలు\" పేరైతే మంచిది"
 
-#: actions/register.php:462
+#: actions/register.php:464
 #, fuzzy
-msgid "URL of your homepage, blog, or profile on another site"
-msgstr "మీ హోమ్ పేజీ, బ్లాగు, లేదా వేరే సేటులోని మీ ప్రొఫైలు యొక్క చిరునామా"
+msgid "Where you are, like \"City, State (or Region), Country\"."
+msgstr "మీరు ఎక్కడ నుండి, \"నగరం, రాష్ట్రం (లేదా ప్రాంతం), దేశం\""
 
-#: actions/register.php:523
+#: actions/register.php:503
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
 msgstr ""
 
-#: actions/register.php:533
+#: actions/register.php:513
 #, php-format
 msgid "My text and files are copyright by %1$s."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:537
+#: actions/register.php:517
 msgid "My text and files remain under my own copyright."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:540
+#: actions/register.php:520
 msgid "All rights reserved."
 msgstr "సర్వహక్కులూ సురక్షితం."
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:545
+#: actions/register.php:525
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -4998,7 +5098,7 @@ msgstr ""
 "నా పాఠ్యం మరియు దస్త్రాలు %s క్రింద లభ్యం, ఈ అంతరంగిక భోగట్టా తప్ప: సంకేతపదం, ఈమెయిల్ చిరునామా, IM "
 "చిరునామా, మరియు ఫోన్ నంబర్."
 
-#: actions/register.php:588
+#: actions/register.php:566
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -5029,7 +5129,7 @@ msgstr ""
 "\n"
 "నమోదుచేసుకున్నందుకు కృతజ్ఞతలు మరియు ఈ సేవని ఉపయోగిస్తూ మీరు ఆనందిస్తారని మేం ఆశిస్తున్నాం."
 
-#: actions/register.php:612
+#: actions/register.php:590
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5062,7 +5162,7 @@ msgstr "వాడుకరి పేరు"
 
 #: actions/remotesubscribe.php:129
 #, fuzzy
-msgid "Nickname of the user you want to follow"
+msgid "Nickname of the user you want to follow."
 msgstr "మీరు అనుసరించాలనుకుంటున్న వాడుకరి యొక్క ముద్దుపేరు"
 
 #: actions/remotesubscribe.php:132
@@ -5070,18 +5170,18 @@ msgid "Profile URL"
 msgstr "ప్రొఫైలు URL"
 
 #: actions/remotesubscribe.php:133
-msgid "URL of your profile on another compatible microblogging service"
+msgid "URL of your profile on another compatible microblogging service."
 msgstr ""
 
 #. TRANS: Link text for link that will subscribe to a remote profile.
 #: actions/remotesubscribe.php:136 lib/subscribeform.php:139
-#: lib/userprofile.php:431
+#: lib/userprofile.php:402
 msgid "Subscribe"
 msgstr "చందాచేరు"
 
 #: actions/remotesubscribe.php:158
 #, fuzzy
-msgid "Invalid profile URL (bad format)"
+msgid "Invalid profile URL (bad format)."
 msgstr "ప్రొపైల్ URL తప్పు (చెడు ఫార్మాట్)"
 
 #: actions/remotesubscribe.php:167
@@ -5115,7 +5215,7 @@ msgstr "మీ నోటీసుని మీరే పునరావృతి
 msgid "You already repeated that notice."
 msgstr "మీరు ఇప్పటికే ఆ నోటీసుని పునరావృతించారు."
 
-#: actions/repeat.php:112 lib/noticelist.php:692
+#: actions/repeat.php:112 lib/noticelist.php:697
 #, fuzzy
 msgid "Repeated"
 msgstr "సృష్టితం"
@@ -5124,9 +5224,9 @@ msgstr "సృష్టితం"
 msgid "Repeated!"
 msgstr "పునరావృతించారు!"
 
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing @-replies.
+#. TRANS: RSS reply feed title. %s is a user nickname.
 #: actions/replies.php:126 actions/repliesrss.php:68
-#: lib/personalgroupnav.php:109
+#: lib/personalgroupnav.php:105
 #, php-format
 msgid "Replies to %s"
 msgstr "%sకి స్పందనలు"
@@ -5175,9 +5275,11 @@ msgid ""
 msgstr ""
 "[ఈ విషయంపై](%%%%action.newnotice%%%%?status_textarea=%s) వ్రాసే మొదటివారు మీరే అవ్వండి!"
 
-#: actions/repliesrss.php:72
+#. TRANS: RSS reply feed description.
+#. TRANS: %1$s is a user nickname, %2$s is the StatusNet site name.
+#: actions/repliesrss.php:74
 #, fuzzy, php-format
-msgid "Replies to %1$s on %2$s!"
+msgid "Replies to %1$s on %2$s."
 msgstr "%2$sలో %1$sకి స్పందనలు!"
 
 #. TRANS: Client exception displayed when trying to restore an account while not logged in.
@@ -5277,7 +5379,7 @@ msgstr "ఈ సైటులో మీరు వాడుకరలకి పా
 msgid "User doesn't have this role."
 msgstr "వాడుకరికి ఈ పాత్ర లేదు."
 
-#: actions/rsd.php:146 actions/version.php:159
+#: actions/rsd.php:142 actions/version.php:159
 msgid "StatusNet"
 msgstr "స్టేటస్‌నెట్"
 
@@ -5322,94 +5424,44 @@ msgstr ""
 msgid "Save site settings"
 msgstr "సైటు అమరికలను భద్రపరచు"
 
-#: actions/showapplication.php:82
+#: actions/showapplication.php:78
 msgid "You must be logged in to view an application."
 msgstr "ఉపకరణాలని చూడడానికి మీరు తప్పనిసరిగా ప్రవేశించి ఉండాలి."
 
-#: actions/showapplication.php:157
+#: actions/showapplication.php:151
 msgid "Application profile"
 msgstr "ఉపకరణ ప్రవర"
 
-#. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:159 lib/applicationeditform.php:177
-msgid "Icon"
-msgstr "ప్రతీకం"
-
-#. TRANS: Form input field label for application name.
-#: actions/showapplication.php:169 actions/version.php:197
-#: lib/applicationeditform.php:190
-msgid "Name"
-msgstr "పేరు"
-
-#. TRANS: Form input field label.
-#: actions/showapplication.php:178 lib/applicationeditform.php:227
-msgid "Organization"
-msgstr "సంస్ధ"
-
-#. TRANS: Form input field label.
-#: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:168
-msgid "Description"
-msgstr "వివరణ"
-
-#. TRANS: Header for group statistics on a group page (h2).
-#. TRANS: H2 text for user statistics.
-#: actions/showapplication.php:192 actions/showgroup.php:460
-#: lib/profileaction.php:205
-msgid "Statistics"
-msgstr "గణాంకాలు"
-
-#: actions/showapplication.php:203
+#: actions/showapplication.php:179
 #, php-format
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr "సృష్టించినది %1$s - అప్రమేయ అందుబాటు %2$s  - %3$d వాడుకరులు"
 
-#: actions/showapplication.php:213
+#: actions/showapplication.php:189
 msgid "Application actions"
 msgstr "ఉపకరణ చర్యలు"
 
-#: actions/showapplication.php:236
+#: actions/showapplication.php:212
 msgid "Reset key & secret"
 msgstr ""
 
 #. TRANS: Title of form for deleting a user.
-#: actions/showapplication.php:252 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:64 lib/noticelist.php:673
+#: actions/showapplication.php:228 lib/deletegroupform.php:121
+#: lib/deleteuserform.php:64 lib/noticelist.php:678
 msgid "Delete"
 msgstr "తొలగించు"
 
-#: actions/showapplication.php:261
+#: actions/showapplication.php:237
 msgid "Application info"
 msgstr "ఉపకరణ సమాచారం"
 
-#: actions/showapplication.php:263
-msgid "Consumer key"
-msgstr ""
-
-#: actions/showapplication.php:268
-msgid "Consumer secret"
-msgstr ""
-
-#: actions/showapplication.php:273
-msgid "Request token URL"
-msgstr ""
-
-#: actions/showapplication.php:278
-msgid "Access token URL"
-msgstr ""
-
-#: actions/showapplication.php:283
-#, fuzzy
-msgid "Authorize URL"
-msgstr "రచయిత"
-
-#: actions/showapplication.php:288
+#: actions/showapplication.php:255
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
 msgstr ""
 
-#: actions/showapplication.php:309
+#: actions/showapplication.php:275
 #, fuzzy
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr "మీరు నిజంగానే ఈ నోటీసుని తొలగించాలనుకుంటున్నారా?"
@@ -5492,61 +5544,47 @@ msgstr "%s గుంపు"
 msgid "%1$s group, page %2$d"
 msgstr "%1$s గుంపు , %2$dవ పేజీ"
 
-#. TRANS: Group profile header (h2). Text hidden by default.
-#: actions/showgroup.php:223
-msgid "Group profile"
-msgstr "గుంపు ప్రొఫైలు"
-
-#. TRANS: Label for group URL (dt). Text hidden by default.
-#. TRANS: DT for URL in a profile.
-#: actions/showgroup.php:273 actions/tagother.php:118
-#: actions/userauthorization.php:175 lib/userprofile.php:186
-msgid "URL"
-msgstr ""
-
 #. TRANS: Label for group description or group note (dt). Text hidden by default.
-#. TRANS: DT for note in a profile.
-#: actions/showgroup.php:285 actions/tagother.php:128
-#: actions/userauthorization.php:187 lib/userprofile.php:204
+#: actions/showgroup.php:266
 msgid "Note"
 msgstr "గమనిక"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:296 lib/groupeditform.php:180
+#: actions/showgroup.php:277 lib/groupeditform.php:180
 msgid "Aliases"
 msgstr "మారుపేర్లు"
 
 #. TRANS: Group actions header (h2). Text hidden by default.
-#: actions/showgroup.php:313
+#: actions/showgroup.php:294
 msgid "Group actions"
 msgstr "గుంపు చర్యలు"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:357
+#: actions/showgroup.php:338
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
 msgstr "%s కొరకు స్పందనల ఫీడు (RSS 1.0)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:364
+#: actions/showgroup.php:345
 #, php-format
 msgid "Notice feed for %s group (RSS 2.0)"
 msgstr "%s కొరకు స్పందనల ఫీడు (RSS 2.0)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:371
+#: actions/showgroup.php:352
 #, php-format
 msgid "Notice feed for %s group (Atom)"
 msgstr "%s కొరకు స్పందనల ఫీడు (ఆటమ్)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:377
+#: actions/showgroup.php:358
 #, php-format
 msgid "FOAF for %s group"
 msgstr "%s గుంపు"
 
 #. TRANS: Header for mini list of group members on a group page (h2).
-#: actions/showgroup.php:414
+#: actions/showgroup.php:395
 msgid "Members"
 msgstr "సభ్యులు"
 
@@ -5554,26 +5592,31 @@ msgstr "సభ్యులు"
 #. TRANS: Text for user subscription statistics if the user has no subscriptions.
 #. TRANS: Text for user subscriber statistics if user has no subscribers.
 #. TRANS: Text for user user group membership statistics if user is not a member of any group.
-#: actions/showgroup.php:420 lib/profileaction.php:137
+#: actions/showgroup.php:401 lib/profileaction.php:137
 #: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
-#: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
+#: lib/subscriptionlist.php:123 lib/tagcloudsection.php:71
 msgid "(None)"
 msgstr "(ఏమీలేదు)"
 
 #. TRANS: Link to all group members from mini list of group members if group has more than n members.
-#: actions/showgroup.php:429
+#: actions/showgroup.php:410
 msgid "All members"
 msgstr "అందరు సభ్యులూ"
 
-#. TRANS: Label for creation date in statistics on group page.
-#: actions/showgroup.php:465
+#. TRANS: Header for group statistics on a group page (h2).
+#. TRANS: H2 text for user statistics.
+#: actions/showgroup.php:441 lib/profileaction.php:205
+msgid "Statistics"
+msgstr "గణాంకాలు"
+
+#: actions/showgroup.php:444
 #, fuzzy
 msgctxt "LABEL"
 msgid "Created"
 msgstr "సృష్టితం"
 
 #. TRANS: Label for member count in statistics on group page.
-#: actions/showgroup.php:473
+#: actions/showgroup.php:449
 msgctxt "LABEL"
 msgid "Members"
 msgstr "సభ్యులు"
@@ -5582,7 +5625,7 @@ msgstr "సభ్యులు"
 #. TRANS: **%s** is the group alias, %%%%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).
-#: actions/showgroup.php:488
+#: actions/showgroup.php:464
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5601,7 +5644,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: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
-#: actions/showgroup.php:498
+#: actions/showgroup.php:474
 #, fuzzy, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5617,7 +5660,7 @@ msgstr ""
 "doc.help%%%%))"
 
 #. TRANS: Header for list of group administrators on a group page (h2).
-#: actions/showgroup.php:527
+#: actions/showgroup.php:503
 msgid "Admins"
 msgstr "నిర్వాహకులు"
 
@@ -5656,7 +5699,7 @@ msgid "%1$s tagged %2$s"
 msgstr "%1$s, %2$dవ పేజీ"
 
 #. TRANS: Page title showing tagged notices in one user's stream.
-#. TRANS: %1$s is the username, %2$s is the hash tag, %1$d is the page number.
+#. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
 #: actions/showstream.php:74
 #, fuzzy, php-format
 msgid "%1$s tagged %2$s, page %3$d"
@@ -5703,13 +5746,13 @@ msgid "FOAF for %s"
 msgstr "%s గుంపు"
 
 #. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
-#: actions/showstream.php:211
+#: actions/showstream.php:205
 #, fuzzy, php-format
 msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr "ఇది %1$s యొక్క కాలరేఖ కానీ %2$s ఇంకా ఏమీ రాయలేదు."
 
 #. TRANS: Second sentence of empty list message for a stream for the user themselves.
-#: actions/showstream.php:217
+#: actions/showstream.php:211
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
@@ -5718,7 +5761,7 @@ msgstr ""
 
 #. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:221
+#: actions/showstream.php:215
 #, fuzzy, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
@@ -5728,7 +5771,7 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:264
+#: actions/showstream.php:258
 #, fuzzy, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5745,7 +5788,7 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:271
+#: actions/showstream.php:265
 #, fuzzy, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5756,7 +5799,7 @@ msgstr ""
 "ఆధారపడిన ఒక [మైక్రో-బ్లాగింగు](http://en.wikipedia.org/wiki/Micro-blogging) సేవ."
 
 #. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
-#: actions/showstream.php:328
+#: actions/showstream.php:322
 #, php-format
 msgid "Repeat of %s"
 msgstr "%s యొక్క పునరావృతం"
@@ -5905,111 +5948,111 @@ msgstr "సైటు-వారీ నోటీసు పాఠ్యం (255 అ
 #. TRANS: Title for button to save site notice in admin panel.
 #: actions/sitenoticeadminpanel.php:201
 #, fuzzy
-msgid "Save site notice"
+msgid "Save site notice."
 msgstr "సైటు గమనికని భద్రపరచు"
 
 #. TRANS: Title for SMS settings.
-#: actions/smssettings.php:57
+#: actions/smssettings.php:56
 msgid "SMS settings"
 msgstr "SMS అమరికలు"
 
 #. TRANS: SMS settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/smssettings.php:71
+#: actions/smssettings.php:70
 #, fuzzy, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr "%%site.name%% నుండి మీకు ఎలా మెయిల్ వస్తూంతో సంభాళించుకోండి."
 
 #. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
-#: actions/smssettings.php:93
+#: actions/smssettings.php:92
 msgid "SMS is not available."
 msgstr "IM అందుబాటులో లేదు."
 
 #. TRANS: Form legend for SMS settings form.
-#: actions/smssettings.php:107
+#: actions/smssettings.php:106
 msgid "SMS address"
 msgstr "SMS చిరునామా"
 
 #. TRANS: Form guide in SMS settings form.
-#: actions/smssettings.php:116
+#: actions/smssettings.php:115
 #, fuzzy
 msgid "Current confirmed SMS-enabled phone number."
 msgstr "ప్రస్తుత నిర్ధారిత ఈమెయిలు చిరునామా."
 
 #. TRANS: Form guide in IM settings form.
-#: actions/smssettings.php:129
+#: actions/smssettings.php:128
 msgid "Awaiting confirmation on this phone number."
 msgstr "ఈ ఫోను నంబరు యొక్క నిర్ధారణకై వేచివుంది."
 
 #. TRANS: Field label for SMS address input in SMS settings form.
-#: actions/smssettings.php:138
+#: actions/smssettings.php:137
 msgid "Confirmation code"
 msgstr "నిర్ధారణ సంకేతం"
 
 #. TRANS: Form field instructions in SMS settings form.
-#: actions/smssettings.php:140
+#: actions/smssettings.php:139
 msgid "Enter the code you received on your phone."
 msgstr ""
 
 #. TRANS: Button label to confirm SMS confirmation code in SMS settings.
-#: actions/smssettings.php:144
+#: actions/smssettings.php:143
 msgctxt "BUTTON"
 msgid "Confirm"
 msgstr "నిర్థారించు"
 
 #. TRANS: Field label for SMS phone number input in SMS settings form.
-#: actions/smssettings.php:149
+#: actions/smssettings.php:148
 #, fuzzy
 msgid "SMS phone number"
 msgstr "ఫోను నెంబరు లేదు."
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
-#: actions/smssettings.php:152
+#: actions/smssettings.php:151
 #, fuzzy
-msgid "Phone number, no punctuation or spaces, with area code"
+msgid "Phone number, no punctuation or spaces, with area code."
 msgstr "1-64 చిన్నబడి అక్షరాలు లేదా అంకెలు, విరామ చిహ్నాలు లేదా ఖాళీలు లేకుండా. తప్పనిసరి."
 
 #. TRANS: Form legend for SMS preferences form.
-#: actions/smssettings.php:191
+#: actions/smssettings.php:190
 msgid "SMS preferences"
 msgstr "SMS అభిరుచులు"
 
 #. TRANS: Checkbox label in SMS preferences form.
-#: actions/smssettings.php:197
+#: actions/smssettings.php:196
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
 msgstr ""
 
 #. TRANS: Confirmation message for successful SMS preferences save.
-#: actions/smssettings.php:308
+#: actions/smssettings.php:307
 #, fuzzy
 msgid "SMS preferences saved."
 msgstr "అభిరుచులు భద్రమయ్యాయి."
 
 #. TRANS: Message given saving SMS phone number without having provided one.
-#: actions/smssettings.php:330
+#: actions/smssettings.php:329
 msgid "No phone number."
 msgstr "ఫోను నెంబరు లేదు."
 
 #. TRANS: Message given saving SMS phone number without having selected a carrier.
-#: actions/smssettings.php:336
+#: actions/smssettings.php:335
 #, fuzzy
 msgid "No carrier selected."
 msgstr "నోటీసుని తొలగించాం."
 
 #. TRANS: Message given saving SMS phone number that is already set.
-#: actions/smssettings.php:344
+#: actions/smssettings.php:343
 msgid "That is already your phone number."
 msgstr "ఇది ఇప్పటికే మీ ఫోను నెంబరు."
 
 #. TRANS: Message given saving SMS phone number that is already set for another user.
-#: actions/smssettings.php:348
+#: actions/smssettings.php:347
 msgid "That phone number already belongs to another user."
 msgstr "ఆ ఫోను నంబరు ఇప్పటికే వేరే వాడుకరికి చెందినది."
 
 #. TRANS: Message given saving valid SMS phone number that is to be confirmed.
-#: actions/smssettings.php:376
+#: actions/smssettings.php:375
 #, fuzzy
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
@@ -6017,39 +6060,39 @@ msgid ""
 msgstr "ఆ నిర్ధారణా సంకేతం మీది కాదు!"
 
 #. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
-#: actions/smssettings.php:404
+#: actions/smssettings.php:403
 msgid "That is the wrong confirmation number."
 msgstr "అది తప్పుడు నిర్ధారణ సంఖ్య."
 
 #. TRANS: Message given after successfully canceling SMS phone number confirmation.
-#: actions/smssettings.php:418
+#: actions/smssettings.php:417
 msgid "SMS confirmation cancelled."
 msgstr "IM నిర్ధారణ రద్దయింది."
 
 #. TRANS: Message given trying to remove an SMS phone number that is not
 #. TRANS: registered for the active user.
-#: actions/smssettings.php:438
+#: actions/smssettings.php:437
 msgid "That is not your phone number."
 msgstr "అది మీ ఫోను నంబర్ కాదు."
 
 #. TRANS: Message given after successfully removing a registered SMS phone number.
-#: actions/smssettings.php:460
+#: actions/smssettings.php:459
 msgid "The SMS phone number was removed."
 msgstr "ఆ IM చిరునామాని తొలగించాం."
 
 #. TRANS: Label for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:499
+#: actions/smssettings.php:498
 msgid "Mobile carrier"
 msgstr ""
 
 #. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:504
+#: actions/smssettings.php:503
 msgid "Select a carrier"
 msgstr ""
 
 #. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
 #. TRANS: %s is an administrative contact's e-mail address.
-#: actions/smssettings.php:513
+#: actions/smssettings.php:512
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -6057,7 +6100,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
-#: actions/smssettings.php:535
+#: actions/smssettings.php:534
 #, fuzzy
 msgid "No code entered."
 msgstr "విషయం లేదు!"
@@ -6135,15 +6178,13 @@ msgstr "మీరు ఎవరికీ చందాచేరలేదు."
 msgid "Could not save subscription."
 msgstr "కొత్త చందాని చేర్చలేకపోయాం."
 
-#: actions/subscribe.php:77
-msgid "This action only accepts POST requests."
-msgstr ""
-
-#: actions/subscribe.php:117
+#. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
+#: actions/subscribe.php:121
 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
 msgstr ""
 
-#: actions/subscribe.php:145
+#. TRANS: Page title when subscription succeeded.
+#: actions/subscribe.php:149
 msgid "Subscribed"
 msgstr "చందాచేరారు"
 
@@ -6254,31 +6295,33 @@ msgid "Subscription feed for %s (Atom)"
 msgstr "%s కొరకు స్పందనల ఫీడు (ఆటమ్)"
 
 #. TRANS: Checkbox label for enabling Jabber messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:239
-msgid "Jabber"
-msgstr "జాబర్"
+#: actions/subscriptions.php:241 lib/settingsnav.php:110
+msgid "IM"
+msgstr ""
 
 #. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:254
+#: actions/subscriptions.php:256 lib/settingsnav.php:117
 msgid "SMS"
 msgstr ""
 
-#: actions/tag.php:69
+#. TRANS: Title for all but the first page of notices with tags.
+#. TRANS: %1$s is the tag, %2$d is the page number.
+#: actions/tag.php:73
 #, php-format
 msgid "Notices tagged with %1$s, page %2$d"
 msgstr "%2$sలో %1$s అనే ట్యాగుతో ఉన్న నోటీసులు!"
 
-#: actions/tag.php:87
+#: actions/tag.php:91
 #, php-format
 msgid "Notice feed for tag %s (RSS 1.0)"
 msgstr "%s కొరకు స్పందనల ఫీడు (RSS 1.0)"
 
-#: actions/tag.php:93
+#: actions/tag.php:97
 #, php-format
 msgid "Notice feed for tag %s (RSS 2.0)"
 msgstr "%s కొరకు స్పందనల ఫీడు (RSS 2.0)"
 
-#: actions/tag.php:99
+#: actions/tag.php:103
 #, php-format
 msgid "Notice feed for tag %s (Atom)"
 msgstr "%s కొరకు స్పందనల ఫీడు (ఆటమ్)"
@@ -6297,29 +6340,28 @@ msgstr "ట్యాగులు"
 msgid "User profile"
 msgstr "వాడుకరి ప్రొఫైలు"
 
-#. TRANS: DT element in area for user avatar.
-#: actions/tagother.php:81 actions/userauthorization.php:132
-#: lib/userprofile.php:108
-msgid "Photo"
-msgstr "ఫొటో"
-
-#: actions/tagother.php:141
+#: actions/tagother.php:120
 #, fuzzy
 msgid "Tag user"
 msgstr "ట్యాగులు"
 
-#: actions/tagother.php:151
+#: actions/tagother.php:130
 msgid ""
 "Tags for this user (letters, numbers, -, ., and _), comma- or space- "
 "separated"
 msgstr ""
 
-#: actions/tagother.php:193
+#: actions/tagother.php:157
+#, php-format
+msgid "Invalid tag: \"%s\""
+msgstr "తప్పుడు మారుపేరు: \"%s\""
+
+#: actions/tagother.php:172
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 
-#: actions/tagother.php:236
+#: actions/tagother.php:215
 #, fuzzy
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr "మీ ఉపకరణాన్ని మార్చడానికి ఈ ఫారాన్ని ఉపయోగించండి."
@@ -6328,6 +6370,7 @@ msgstr "మీ ఉపకరణాన్ని మార్చడానికి
 msgid "No such tag."
 msgstr "అటువంటి ట్యాగు లేదు."
 
+#. TRANS: Client error displayed when trying to unblock a non-blocked user.
 #: actions/unblock.php:59
 msgid "You haven't blocked that user."
 msgstr "మీరు ఆ వాడుకరిని నిరోధించలేదు."
@@ -6350,12 +6393,84 @@ msgstr "అధీకరణ అభ్యర్థన లేదు!"
 msgid "Unsubscribed"
 msgstr "చందామాను"
 
-#: actions/updateprofile.php:64 actions/userauthorization.php:337
+#: actions/updateprofile.php:64
 #, php-format
 msgid ""
 "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
 msgstr ""
 
+#: actions/urlsettings.php:60
+#, fuzzy
+msgid "URL settings"
+msgstr "IM అమరికలు"
+
+#. TRANS: Instructions for tab "Other" in user profile settings.
+#: actions/urlsettings.php:72
+msgid "Manage various other options."
+msgstr "వేరే ఇతర ఎంపికలని సంభాళించండి."
+
+#. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
+#. TRANS: user's profile settings. This message has one space at the beginning. Use your
+#. TRANS: language's word separator here if it has one (most likely a single space).
+#: actions/urlsettings.php:115
+msgid " (free service)"
+msgstr " (స్వేచ్ఛా సేవ)"
+
+#: actions/urlsettings.php:121
+#, fuzzy
+msgid "[none]"
+msgstr "ఏమీలేదు"
+
+#: actions/urlsettings.php:122
+msgid "[internal]"
+msgstr ""
+
+#. TRANS: Label for dropdown with URL shortener services.
+#: actions/urlsettings.php:130
+msgid "Shorten URLs with"
+msgstr "URL కుదింపు సేవ"
+
+#. TRANS: Tooltip for for dropdown with URL shortener services.
+#: actions/urlsettings.php:132
+msgid "Automatic shortening service to use."
+msgstr "ఉపయోగించాల్సిన యాంత్రిక కుదింపు సేవ."
+
+#: actions/urlsettings.php:138
+msgid "URL longer than"
+msgstr ""
+
+#: actions/urlsettings.php:141
+msgid "URLs longer than this will be shortened, 0 means always shorten."
+msgstr ""
+
+#: actions/urlsettings.php:145
+msgid "Text longer than"
+msgstr ""
+
+#: actions/urlsettings.php:148
+msgid ""
+"URLs in notices longer than this will be shortened, 0 means always shorten."
+msgstr ""
+
+#. TRANS: Form validation error for form "Other settings" in user profile.
+#: actions/urlsettings.php:180
+#, fuzzy
+msgid "URL shortening service is too long (maximum 50 characters)."
+msgstr "URL కుదింపు సేవ మరీ పెద్దగా ఉంది (50 అక్షరాలు గరిష్ఠం)."
+
+#: actions/urlsettings.php:187
+msgid "Invalid number for max url length."
+msgstr ""
+
+#: actions/urlsettings.php:193
+#, fuzzy
+msgid "Invalid number for max notice length."
+msgstr "తప్పుడు దస్త్రపుపేరు.."
+
+#: actions/urlsettings.php:238
+msgid "Error saving user URL shortening preferences."
+msgstr ""
+
 #. TRANS: User admin panel title
 #: actions/useradminpanel.php:58
 msgctxt "TITLE"
@@ -6381,11 +6496,11 @@ msgstr "చెల్లని స్వాగత పాఠ్యం. గరి
 #. TRANS: users in user admin panel. %1$s is the invalid nickname.
 #: actions/useradminpanel.php:166
 #, php-format
-msgid "Invalid default subscripton: '%1$s' is not a user."
+msgid "Invalid default subscripton: \"%1$s\" is not a user."
 msgstr ""
 
-#. TRANS: Link description in user account settings menu.
-#: actions/useradminpanel.php:215 lib/accountsettingsaction.php:106
+#: actions/useradminpanel.php:215 lib/action.php:565 lib/settingsnav.php:77
+#: lib/subgroupnav.php:81
 msgid "Profile"
 msgstr "ప్రొఫైలు"
 
@@ -6444,124 +6559,167 @@ msgstr "వాడుకరులను కొత్త వారిని ఆహ
 #. TRANS: Title for button to save user settings in user admin panel.
 #: actions/useradminpanel.php:302
 #, fuzzy
-msgid "Save user settings"
+msgid "Save user settings."
 msgstr "వాడుకరి అమరికలను భద్రపరచు"
 
-#: actions/userauthorization.php:105
+#. TRANS: Page title.
+#: actions/userauthorization.php:109
 msgid "Authorize subscription"
 msgstr "చందాని అధీకరించండి"
 
-#: actions/userauthorization.php:110
+#. TRANS: Page notice on "Auhtorize subscription" page.
+#: actions/userauthorization.php:115
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
 "user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
-"click “Reject”."
+"click \"Reject\"."
 msgstr ""
 
-#. TRANS: Menu item for site administration
-#: actions/userauthorization.php:196 actions/version.php:167
-#: lib/adminpanelaction.php:403
-msgid "License"
-msgstr "లైసెన్సు"
-
-#: actions/userauthorization.php:217
-#, fuzzy
+#. TRANS: Button text on Authorise Subscription page.
+#: actions/userauthorization.php:200
+msgctxt "BUTTON"
 msgid "Accept"
 msgstr "అంగీకరించు"
 
-#: actions/userauthorization.php:218 lib/subscribeform.php:115
-#: lib/subscribeform.php:139
-msgid "Subscribe to this user"
-msgstr "ఈ వాడుకరికి చందాచేరు"
+#. TRANS: Title for button on Authorise Subscription page.
+#: actions/userauthorization.php:202
+msgid "Subscribe to this user."
+msgstr "ఈ వాడుకరికి చందాచేరండి."
 
-#: actions/userauthorization.php:219
-#, fuzzy
+#. TRANS: Button text on Authorise Subscription page.
+#: actions/userauthorization.php:204
+msgctxt "BUTTON"
 msgid "Reject"
 msgstr "తిరస్కరించు"
 
-#: actions/userauthorization.php:220
-#, fuzzy
-msgid "Reject this subscription"
+#. TRANS: Title for button on Authorise Subscription page.
+#: actions/userauthorization.php:206
+msgid "Reject this subscription."
 msgstr "ఈ చందాని తిరస్కరించండి."
 
-#: actions/userauthorization.php:232
+#. TRANS: Client error displayed for an empty authorisation request.
+#: actions/userauthorization.php:219
 msgid "No authorization request!"
 msgstr "అధీకరణ అభ్యర్థన లేదు!"
 
-#: actions/userauthorization.php:254
+#. TRANS: Accept message header from Authorise subscription page.
+#: actions/userauthorization.php:242
 msgid "Subscription authorized"
 msgstr "చందాని అధీకరించారు"
 
-#: actions/userauthorization.php:256
+#: actions/userauthorization.php:245
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to authorize the "
 "subscription. Your subscription token is:"
 msgstr ""
 
-#: actions/userauthorization.php:266
+#. TRANS: Reject message header from Authorise subscription page.
+#: actions/userauthorization.php:256
 msgid "Subscription rejected"
 msgstr "చందాని తిరస్కరించారు."
 
-#: actions/userauthorization.php:268
+#: actions/userauthorization.php:259
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to fully reject the "
 "subscription."
 msgstr ""
 
+#. TRANS: Exception thrown when no valid user is found for an authorisation request.
+#. TRANS: %s is a listener URI.
+#: actions/userauthorization.php:296
+#, php-format
+msgid "Listener URI \"%s\" not found here."
+msgstr ""
+
+#. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
+#. TRANS: %s is a listenee URI.
 #: actions/userauthorization.php:303
 #, php-format
-msgid "Listener URI ‘%s’ not found here."
+msgid "Listenee URI \"%s\" is too long."
 msgstr ""
 
-#: actions/userauthorization.php:308
+#. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
+#. TRANS: %s is a listenee URI.
+#: actions/userauthorization.php:311
 #, php-format
-msgid "Listenee URI ‘%s’ is too long."
-msgstr ""
-
-#: actions/userauthorization.php:314
-#, php-format
-msgid "Listenee URI ‘%s’ is a local user."
+msgid "Listenee URI \"%s\" is a local user."
 msgstr ""
 
+#. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
+#. TRANS: %s is a profile URL.
 #: actions/userauthorization.php:329
 #, php-format
-msgid "Profile URL ‘%s’ is for a local user."
+msgid "Profile URL \"%s\" is for a local user."
 msgstr ""
 
-#: actions/userauthorization.php:345
+#. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
+#. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
+#: actions/userauthorization.php:339
+#, php-format
+msgid ""
+"Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
+"\"."
+msgstr ""
+
+#. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
+#. TRANS: %s is an avatar URL.
+#: actions/userauthorization.php:349
 #, fuzzy, php-format
-msgid "Avatar URL ‘%s’ is not valid."
+msgid "Avatar URL \"%s\" is not valid."
 msgstr "హోమ్ పేజీ URL సరైనది కాదు."
 
-#: actions/userauthorization.php:350
+#. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
+#. TRANS: %s is an avatar URL.
+#: actions/userauthorization.php:356
 #, fuzzy, php-format
-msgid "Can’t read avatar URL ‘%s’."
+msgid "Cannot read avatar URL \"%s\"."
 msgstr "'%s' అనే అవతారపు URL తప్పు"
 
-#: actions/userauthorization.php:355
+#. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
+#. TRANS: %s is an avatar URL.
+#: actions/userauthorization.php:363
 #, fuzzy, php-format
-msgid "Wrong image type for avatar URL ‘%s’."
+msgid "Wrong image type for avatar URL \"%s\"."
 msgstr "'%s' కొరకు తప్పుడు బొమ్మ రకం"
 
 #. TRANS: Page title for profile design page.
-#: actions/userdesignsettings.php:74 lib/designsettings.php:63
+#: actions/userdesignsettings.php:74 lib/designsettings.php:61
 msgid "Profile design"
 msgstr "ఫ్రొఫైలు రూపురేఖలు"
 
 #. TRANS: Instructions for profile design page.
-#: actions/userdesignsettings.php:84 lib/designsettings.php:74
+#: actions/userdesignsettings.php:84 lib/designsettings.php:72
 #, fuzzy
 msgid ""
 "Customize the way your profile looks with a background image and a colour "
 "palette of your choice."
 msgstr "నేపథ్య చిత్రం మరియు రంగుల ఎంపికతో మీ గుంపు ఎలా కనిపించాలో మలచుకోండి."
 
-#: actions/userdesignsettings.php:272
+#: actions/userdesignsettings.php:289
 msgid "Enjoy your hotdog!"
 msgstr ""
 
+#: actions/userdesignsettings.php:325
+#, fuzzy
+msgid "Design settings"
+msgstr "సైటు అమరికలను భద్రపరచు"
+
+#: actions/userdesignsettings.php:340
+msgid "View profile designs"
+msgstr "ఫ్రొఫైలు రూపురేఖలు"
+
+#: actions/userdesignsettings.php:341
+#, fuzzy
+msgid "Show or hide profile designs."
+msgstr "ఫ్రొఫైలు రూపురేఖలు"
+
+#: actions/userdesignsettings.php:348
+#, fuzzy
+msgid "Background file"
+msgstr "నేపథ్యం"
+
 #. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number.
 #: actions/usergroups.php:66
 #, php-format
@@ -6610,6 +6768,11 @@ msgstr ""
 msgid "Contributors"
 msgstr "అనుసంధానాలు"
 
+#. TRANS: Menu item for site administration
+#: actions/version.php:167 lib/adminpanelaction.php:403
+msgid "License"
+msgstr "లైసెన్సు"
+
 #: actions/version.php:170
 msgid ""
 "StatusNet is free software: you can redistribute it and/or modify it under "
@@ -6633,12 +6796,13 @@ msgid ""
 "along with this program.  If not, see %s."
 msgstr ""
 
-#: actions/version.php:191
-msgid "Plugins"
-msgstr "ప్లగిన్లు"
+#. TRANS: Form input field label for application name.
+#: actions/version.php:197 lib/applicationeditform.php:190
+msgid "Name"
+msgstr "పేరు"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:901
+#: actions/version.php:198 lib/action.php:885
 msgid "Version"
 msgstr "సంచిక"
 
@@ -6646,6 +6810,12 @@ msgstr "సంచిక"
 msgid "Author(s)"
 msgstr "రచయిత(లు)"
 
+#. TRANS: Form input field label.
+#: actions/version.php:200 lib/applicationeditform.php:208
+#: lib/groupeditform.php:168
+msgid "Description"
+msgstr "వివరణ"
+
 #. TRANS: Activity title when marking a notice as favorite.
 #: classes/Fave.php:164
 msgid "Favor"
@@ -6760,7 +6930,7 @@ msgid "Could not create login token for %s"
 msgstr "మారుపేర్లని సృష్టించలేకపోయాం."
 
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
-#: classes/Memcached_DataObject.php:542
+#: classes/Memcached_DataObject.php:556
 msgid "No database name or DSN found anywhere."
 msgstr ""
 
@@ -6936,18 +7106,18 @@ msgstr "%1$s ఇప్పుడు %2$sలో మీ నోటీసులని
 
 #. TRANS: Notice given on user registration.
 #. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:395
+#: classes/User.php:390
 #, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr "@%2$s, %1$sకి స్వాగతం!"
 
 #. TRANS: Server exception.
-#: classes/User.php:918
+#: classes/User.php:923
 msgid "No single user defined for single-user mode."
 msgstr ""
 
 #. TRANS: Server exception.
-#: classes/User.php:922
+#: classes/User.php:927
 msgid "Single-user mode code called when not enabled."
 msgstr ""
 
@@ -6992,42 +7162,6 @@ msgstr ""
 msgid "No AtomPub API service for %s."
 msgstr ""
 
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:104
-#, fuzzy
-msgid "Change your profile settings"
-msgstr "ఫ్రొఫైలు అమరికలని మార్చు"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:111
-msgid "Upload an avatar"
-msgstr "ఒక అవతారాన్ని ఎక్కించండి"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:118
-msgid "Change your password"
-msgstr "మీ సంకేతపదాన్ని మార్చుకోండి"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:125
-msgid "Change email handling"
-msgstr ""
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:132
-msgid "Design your profile"
-msgstr "వాడుకరి ప్రొఫైలు"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:139
-msgid "Other options"
-msgstr "ఇతర ఎంపికలు"
-
-#. TRANS: Link description in user account settings menu.
-#: lib/accountsettingsaction.php:141
-msgid "Other"
-msgstr "ఇతర"
-
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
 #: lib/action.php:161
 #, php-format
@@ -7045,207 +7179,128 @@ msgctxt "TOOLTIP"
 msgid "Show more"
 msgstr "మరింత చూపించు"
 
-#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:544
-msgid "Primary site navigation"
-msgstr "ప్రాధమిక సైటు మార్గదర్శిని"
+#. TRANS: Inline reply form submit button: submits a reply comment.
+#: lib/action.php:328
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Comment"
+msgstr "విషయం"
 
-#. TRANS: Tooltip for main menu option "Personal".
-#: lib/action.php:550
-msgctxt "TOOLTIP"
-msgid "Personal profile and friends timeline"
+#. TRANS: Placeholder text for inline reply form. Clicking in this box will turn it into a mini notice form.
+#: lib/action.php:331
+msgid "Add a comment..."
 msgstr ""
 
-#. TRANS: Main menu option when logged in for access to personal profile and friends timeline.
-#. TRANS: Personal group navigation menu option when logged in for viewing timeline of self and friends.
-#: lib/action.php:553 lib/personalgroupnav.php:100
-msgctxt "MENU"
-msgid "Personal"
-msgstr "వ్యక్తిగత"
+#: lib/action.php:559 lib/personalgroupnav.php:99
+#, fuzzy
+msgid "Home"
+msgstr "హోమ్ పేజీ"
 
-#. TRANS: Tooltip for main menu option "Account".
-#: lib/action.php:555
-msgctxt "TOOLTIP"
-msgid "Change your email, avatar, password, profile"
-msgstr "మీ ఈమెయిలు, అవతారం, సంకేతపదం మరియు ప్రౌఫైళ్ళను మార్చుకోండి"
-
-#. TRANS: Main menu option when logged in for access to user settings.
-#: lib/action.php:558
-msgid "Account"
-msgstr "ఖాతా"
-
-#. TRANS: Tooltip for main menu option "Services".
 #: lib/action.php:560
 #, fuzzy
-msgctxt "TOOLTIP"
-msgid "Connect to services"
-msgstr "అనుసంధానాలు"
+msgid "Friends timeline"
+msgstr "%s కాలరేఖ"
 
-#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services.
-#: lib/action.php:563
-msgid "Connect"
-msgstr "అనుసంధానించు"
-
-#. TRANS: Tooltip for menu option "Admin".
 #: lib/action.php:566
-msgctxt "TOOLTIP"
-msgid "Change site configuration"
-msgstr "సైటు స్వరూపణాన్ని మార్చండి"
+#, fuzzy
+msgid "Your profile"
+msgstr "గుంపు ప్రొఫైలు"
 
-#. TRANS: Main menu option when logged in and site admin for access to site configuration.
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/action.php:569 lib/groupnav.php:117
-msgctxt "MENU"
-msgid "Admin"
-msgstr "నిర్వాహకులు"
+#: lib/action.php:570 lib/action.php:593 lib/publicgroupnav.php:78
+msgid "Public"
+msgstr "ప్రజా"
 
-#. TRANS: Tooltip for main menu option "Invite".
-#: lib/action.php:573
-#, php-format
-msgctxt "TOOLTIP"
-msgid "Invite friends and colleagues to join you on %s"
-msgstr "%sలో తోడుకై మీ స్నేహితులని మరియు సహోద్యోగులని ఆహ్వానించండి"
+#: lib/action.php:571 lib/action.php:594
+#, fuzzy
+msgid "Everyone on this site"
+msgstr "ఈ సైటులోని వ్యక్తులని కనుగొనండి"
+
+#: lib/action.php:575
+#, fuzzy
+msgid "Settings"
+msgstr "SMS అమరికలు"
 
-#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users.
 #: lib/action.php:576
-msgctxt "MENU"
-msgid "Invite"
-msgstr "ఆహ్వానించు"
+#, fuzzy
+msgid "Change your personal settings"
+msgstr "ఫ్రొఫైలు అమరికలని మార్చు"
 
-#. TRANS: Tooltip for main menu option "Logout"
 #: lib/action.php:582
-msgctxt "TOOLTIP"
-msgid "Logout from the site"
-msgstr "సైటు నుండి నిష్క్రమించు"
+#, fuzzy
+msgid "Site configuration"
+msgstr "వాడుకరి స్వరూపణం"
 
-#. TRANS: Main menu option when logged in to log out the current user.
-#: lib/action.php:585
-msgctxt "MENU"
+#: lib/action.php:587
+#, fuzzy
 msgid "Logout"
 msgstr "నిష్క్రమించు"
 
-#. TRANS: Tooltip for main menu option "Register".
-#: lib/action.php:590
-msgctxt "TOOLTIP"
-msgid "Create an account"
-msgstr "ఖాతాని సృష్టించుకోండి"
+#: lib/action.php:588
+#, fuzzy
+msgid "Logout from the site"
+msgstr "సైటు నుండి నిష్క్రమించు"
 
-#. TRANS: Main menu option when not logged in to register a new account.
-#. TRANS: Menu item for registering with the StatusNet site.
-#: lib/action.php:593 lib/logingroupnav.php:85
-msgctxt "MENU"
-msgid "Register"
-msgstr "నమోదు"
-
-#. TRANS: Tooltip for main menu option "Login".
-#: lib/action.php:596
-msgctxt "TOOLTIP"
+#: lib/action.php:599
+#, fuzzy
 msgid "Login to the site"
 msgstr "సైటు లోనికి ప్రవేశించండి"
 
-#. TRANS: Main menu option when not logged in to log in.
-#. TRANS: Menu item for logging in to the StatusNet site.
-#: lib/action.php:599 lib/logingroupnav.php:77
-msgctxt "MENU"
-msgid "Login"
-msgstr "ప్రవేశించు"
-
-#. TRANS: Tooltip for main menu option "Help".
-#: lib/action.php:602
-msgctxt "TOOLTIP"
-msgid "Help me!"
-msgstr "సహాయం కావాలి!"
-
-#. TRANS: Main menu option for help on the StatusNet site.
-#: lib/action.php:605
-msgctxt "MENU"
-msgid "Help"
-msgstr "సహాయం"
-
-#. TRANS: Tooltip for main menu option "Search".
-#: lib/action.php:608
-msgctxt "TOOLTIP"
-msgid "Search for people or text"
-msgstr "ప్రజలు లేదా పాఠ్యం కొరకు వెతకండి"
-
-#. TRANS: Main menu option when logged in or when the StatusNet instance is not private.
-#: lib/action.php:611
-msgctxt "MENU"
+#: lib/action.php:606
+#, fuzzy
 msgid "Search"
 msgstr "వెతుకు"
 
-#. TRANS: DT element for site notice. String is hidden in default CSS.
-#. TRANS: Menu item for site administration
-#: lib/action.php:633 lib/adminpanelaction.php:387
-msgid "Site notice"
-msgstr "సైటు గమనిక"
-
-#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:700
-msgid "Local views"
-msgstr "స్థానిక వీక్షణలు"
-
-#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:770
-msgid "Page notice"
-msgstr "పేజీ గమనిక"
-
-#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:874
-msgid "Secondary site navigation"
-msgstr "ద్వితీయ సైటు మార్గదర్శిని"
+#: lib/action.php:607
+#, fuzzy
+msgid "Search the site"
+msgstr "సైటుని వెతుకు"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:880
+#: lib/action.php:864
 msgid "Help"
 msgstr "సహాయం"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:883
+#: lib/action.php:867
 msgid "About"
 msgstr "గురించి"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:886
+#: lib/action.php:870
 msgid "FAQ"
 msgstr "ప్రశ్నలు"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:891
+#: lib/action.php:875
 msgid "TOS"
 msgstr "సేవా నియమాలు"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:895
+#: lib/action.php:879
 msgid "Privacy"
 msgstr "అంతరంగికత"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:898
+#: lib/action.php:882
 msgid "Source"
 msgstr "మూలము"
 
 #. TRANS: Secondary navigation menu option leading to e-mail contact information on the
 #. TRANS: StatusNet site, where to report bugs, ...
-#: lib/action.php:905
+#: lib/action.php:889
 msgid "Contact"
 msgstr "సంప్రదించు"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:908
+#: lib/action.php:892
 msgid "Badge"
 msgstr "బాడ్జి"
 
-#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:937
-msgid "StatusNet software license"
-msgstr "స్టేటస్‌నెట్ మృదూపకరణ లైసెన్సు"
-
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:944
+#: lib/action.php:921
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7255,7 +7310,7 @@ msgstr ""
 "అందిస్తున్న సూక్ష్మ బ్లాగింగు సేవ."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:947
+#: lib/action.php:924
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** అనేది మైక్రో బ్లాగింగు సదుపాయం."
@@ -7264,7 +7319,7 @@ msgstr "**%%site.name%%** అనేది మైక్రో బ్లాగి
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:954
+#: lib/action.php:931
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7275,51 +7330,41 @@ msgstr ""
 "html) కింద లభ్యమయ్యే [స్టేటస్&zwnj;నెట్](http://status.net/) మైక్రోబ్లాగింగ్ ఉపకరణం సంచిక %s "
 "పై నడుస్తుంది."
 
-#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:970
-msgid "Site content license"
-msgstr "స్టేటస్‌నెట్ మృదూపకరణ లైసెన్సు"
-
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:977
+#: lib/action.php:949
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:984
+#: lib/action.php:956
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:988
+#: lib/action.php:960
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:1020
+#: lib/action.php:992
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
 
-#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1356
-msgid "Pagination"
-msgstr "పేజీకరణ"
-
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1367
+#: lib/action.php:1335
 msgid "After"
 msgstr "తర్వాత"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1377
+#: lib/action.php:1345
 msgid "Before"
 msgstr "ఇంతక్రితం"
 
@@ -7474,7 +7519,7 @@ msgid "User configuration"
 msgstr "వాడుకరి స్వరూపణం"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:122
+#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:110
 msgid "User"
 msgstr "వాడుకరి"
 
@@ -7499,6 +7544,11 @@ msgstr "రూపకల్పన స్వరూపణం"
 msgid "Edit site notice"
 msgstr "సైటు గమనికని భద్రపరచు"
 
+#. TRANS: Menu item for site administration
+#: lib/adminpanelaction.php:387
+msgid "Site notice"
+msgstr "సైటు గమనిక"
+
 #. TRANS: Menu item title/tooltip
 #: lib/adminpanelaction.php:393
 msgid "Snapshots configuration"
@@ -7509,6 +7559,12 @@ msgstr "వాడుకరి స్వరూపణం"
 msgid "Set site license"
 msgstr ""
 
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:409
+#, fuzzy
+msgid "Plugins configuration"
+msgstr "వాడుకరి స్వరూపణం"
+
 #. TRANS: Client error 401.
 #: lib/apiauth.php:111
 msgid "API resource requires read-write access, but you only have read access."
@@ -7519,19 +7575,23 @@ msgstr ""
 msgid "No application for that consumer key."
 msgstr ""
 
+#: lib/apiauth.php:202 lib/apiauth.php:284
+msgid "Not allowed to use API."
+msgstr ""
+
 #. TRANS: OAuth exception given when an incorrect access token was given for a user.
-#: lib/apiauth.php:219
+#: lib/apiauth.php:225
 msgid "Bad access token."
 msgstr ""
 
 #. TRANS: OAuth exception given when no user was found for a given token (no token was found).
-#: lib/apiauth.php:224
+#: lib/apiauth.php:230
 msgid "No user for that token."
 msgstr ""
 
 #. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel".
 #. TRANS: Client error thrown when authentication fails.
-#: lib/apiauth.php:266 lib/apiauth.php:293
+#: lib/apiauth.php:272 lib/apiauth.php:302
 msgid "Could not authenticate you."
 msgstr ""
 
@@ -7579,6 +7639,11 @@ msgstr ""
 msgid "Failed to delete revoked token."
 msgstr ""
 
+#. TRANS: Form input field label for application icon.
+#: lib/applicationeditform.php:177
+msgid "Icon"
+msgstr "ప్రతీకం"
+
 #. TRANS: Form guide.
 #: lib/applicationeditform.php:182
 msgid "Icon for this application"
@@ -7614,6 +7679,11 @@ msgstr "మూలము"
 msgid "Organization responsible for this application"
 msgstr "ఈ ఉపకరణానికి బాధ్యతాయుతమైన సంస్థ"
 
+#. TRANS: Form input field label.
+#: lib/applicationeditform.php:227
+msgid "Organization"
+msgstr "సంస్ధ"
+
 #. TRANS: Form input field instructions.
 #: lib/applicationeditform.php:234
 msgid "URL for the homepage of the organization"
@@ -7703,16 +7773,6 @@ msgstr ""
 msgid "Do not use this method!"
 msgstr "ఈ గుంపును తొలగించకు"
 
-#. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:293
-msgid "Author"
-msgstr "రచయిత"
-
-#. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:307
-msgid "Provider"
-msgstr "మునుజూపు"
-
 #. TRANS: Title.
 #: lib/attachmentnoticesection.php:67
 msgid "Notices where this attachment appears"
@@ -7740,24 +7800,29 @@ msgstr "సంకేతపదం మార్పడానికి అనుమ
 msgid "Block"
 msgstr "నిరోధించు"
 
+#. TRANS: Description of the form to block a user.
+#: lib/blockform.php:79
+msgid "Block this user"
+msgstr "ఈ వాడుకరిని నిరోధించు"
+
 #. TRANS: Title for command results.
-#: lib/channel.php:160 lib/channel.php:181
+#: lib/channel.php:104 lib/channel.php:125
 msgid "Command results"
 msgstr "ఆదేశ ఫలితాలు"
 
 #. TRANS: Title for command results.
-#: lib/channel.php:194
+#: lib/channel.php:138
 #, fuzzy
 msgid "AJAX error"
 msgstr "అజాక్స్ పొరపాటు"
 
 #. TRANS: E-mail subject when a command has completed.
-#: lib/channel.php:233 lib/mailhandler.php:143
+#: lib/channel.php:177 lib/mailhandler.php:143
 msgid "Command complete"
 msgstr "ఆదేశం పూర్తయ్యింది"
 
 #. TRANS: E-mail subject when a command has failed.
-#: lib/channel.php:244
+#: lib/channel.php:188
 msgid "Command failed"
 msgstr "ఆదేశం విఫలమైంది"
 
@@ -7862,7 +7927,7 @@ msgstr "పూర్తిపేరు: %s"
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a location.
-#: lib/command.php:446 lib/mail.php:270
+#: lib/command.php:446 lib/mail.php:275
 #, php-format
 msgid "Location: %s"
 msgstr "ప్రాంతం: %s"
@@ -7870,7 +7935,7 @@ msgstr "ప్రాంతం: %s"
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a homepage.
-#: lib/command.php:450 lib/mail.php:274
+#: lib/command.php:450 lib/mail.php:279
 #, php-format
 msgid "Homepage: %s"
 msgstr "హోంపేజీ: %s"
@@ -8105,111 +8170,104 @@ msgid ""
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:162
+#: lib/common.php:36
 #, fuzzy
 msgid "No configuration file found."
 msgstr "స్వరూపణపు దస్త్రమేమీ కనబడలేదు. "
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:165
+#: lib/common.php:39
 #, fuzzy
 msgid "I looked for configuration files in the following places:"
 msgstr "స్వరూపణపు దస్త్రాల కొరకు ఈ ప్రదేశాలతో చూసాం: "
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:168
+#: lib/common.php:42
 msgid "You may wish to run the installer to fix this."
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:172
+#: lib/common.php:46
 #, fuzzy
 msgid "Go to the installer."
 msgstr "సైటు లోనికి ప్రవేశించండి"
 
-#. TRANS: Menu item for Instant Messaging settings.
-#: lib/connectsettingsaction.php:106
-msgctxt "MENU"
-msgid "IM"
-msgstr ""
-
-#. TRANS: Tooltip for Instant Messaging menu item.
-#: lib/connectsettingsaction.php:108
-msgid "Updates by instant messenger (IM)"
-msgstr ""
-
-#. TRANS: Menu item for Short Message Service settings.
-#: lib/connectsettingsaction.php:113
-#, fuzzy
-msgctxt "MENU"
-msgid "SMS"
-msgstr "SSLని ఉపయోగించు"
-
-#. TRANS: Tooltip for Short Message Service menu item.
-#: lib/connectsettingsaction.php:115
-msgid "Updates by SMS"
-msgstr ""
-
-#. TRANS: Menu item for OuAth connection settings.
-#: lib/connectsettingsaction.php:120
-#, fuzzy
-msgctxt "MENU"
-msgid "Connections"
-msgstr "అనుసంధానాలు"
-
-#. TRANS: Tooltip for connected applications (Connections through OAuth) menu item.
-#: lib/connectsettingsaction.php:122
-msgid "Authorized connected applications"
-msgstr "అధీకృత అనుసంధాన ఉపకరణాలు"
-
 #: lib/dberroraction.php:59
 msgid "Database error"
 msgstr ""
 
+#. TRANS: Description of form for deleting a user.
+#: lib/deleteuserform.php:75
+msgid "Delete this user"
+msgstr "ఈ వాడుకరిని తొలగించు"
+
+#: lib/designform.php:114
+#, fuzzy
+msgid "Change design"
+msgstr "రూపురేఖలని భద్రపరచు"
+
+#. TRANS: Fieldset legend on profile design page to change profile page colours.
+#: lib/designform.php:131
+msgid "Change colours"
+msgstr "రంగులను మార్చు"
+
+#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
+#: lib/designform.php:138
+msgid "Use defaults"
+msgstr "అప్రమేయాలని ఉపయోగించు"
+
+#. TRANS: Title for button on profile design page to reset all colour settings to default.
+#: lib/designform.php:140
+#, fuzzy
+msgid "Restore default designs"
+msgstr "అప్రమేయాలని ఉపయోగించు"
+
+#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
+#: lib/designform.php:148
+#, fuzzy
+msgid "Reset back to default"
+msgstr "అప్రమేయాలని ఉపయోగించు"
+
 #. TRANS: Label in form on profile design page.
 #. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
-#: lib/designsettings.php:108
+#: lib/designform.php:158
 msgid "Upload file"
 msgstr "ఫైలుని ఎక్కించు"
 
 #. TRANS: Instructions for form on profile design page.
-#: lib/designsettings.php:113
+#: lib/designform.php:163
+#, fuzzy
 msgid ""
-"You can upload your personal background image. The maximum file size is 2MB."
+"You can upload your personal background image. The maximum file size is 2Mb."
 msgstr "మీ వ్యక్తిగత నేపథ్యపు చిత్రాన్ని మీరు ఎక్కించవచ్చు. గరిష్ఠ ఫైలు పరిమాణం 2మెబై."
 
 #. TRANS: Radio button on profile design page that will enable use of the uploaded profile image.
-#: lib/designsettings.php:139
+#: lib/designform.php:194
 msgctxt "RADIO"
 msgid "On"
 msgstr "ఆన్"
 
 #. TRANS: Radio button on profile design page that will disable use of the uploaded profile image.
-#: lib/designsettings.php:156
+#: lib/designform.php:211
 msgctxt "RADIO"
 msgid "Off"
 msgstr "ఆఫ్"
 
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: lib/designsettings.php:175
-msgid "Change colours"
-msgstr "రంగులను మార్చు"
-
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: lib/designsettings.php:257
-msgid "Use defaults"
-msgstr "అప్రమేయాలని ఉపయోగించు"
+#. TRANS: Title for button on profile design page to save settings.
+#: lib/designform.php:322
+msgid "Save design"
+msgstr "రూపురేఖలని భద్రపరచు"
 
 #. TRANS: Error message displayed if design settings could not be saved.
 #. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
-#: lib/designsettings.php:405 lib/designsettings.php:427
+#: lib/designsettings.php:216 lib/designsettings.php:238
 msgid "Couldn't update your design."
 msgstr "మీ రూపురేఖలని తాజాకరించలేకపోయాం."
 
 #. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
-#: lib/designsettings.php:433
+#: lib/designsettings.php:244
 msgid "Design defaults restored."
 msgstr ""
 
@@ -8280,28 +8338,24 @@ msgstr ""
 msgid "Feeds"
 msgstr "ఫీడులు"
 
-#: lib/galleryaction.php:121
-msgid "Filter tags"
-msgstr ""
-
-#: lib/galleryaction.php:131
+#: lib/galleryaction.php:128
 msgid "All"
 msgstr "అన్నీ"
 
-#: lib/galleryaction.php:139
+#: lib/galleryaction.php:136
 msgid "Select tag to filter"
 msgstr ""
 
-#: lib/galleryaction.php:140
+#: lib/galleryaction.php:137
 #, fuzzy
 msgid "Tag"
 msgstr "ట్యాగులు"
 
-#: lib/galleryaction.php:141
+#: lib/galleryaction.php:138
 msgid "Choose a tag to narrow list"
 msgstr ""
 
-#: lib/galleryaction.php:143
+#: lib/galleryaction.php:140
 msgid "Go"
 msgstr "వెళ్ళు"
 
@@ -8389,6 +8443,12 @@ msgctxt "TOOLTIP"
 msgid "%s blocked users"
 msgstr "%s నుండి నిరోధించిన వాడుకరులు"
 
+#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
+#: lib/groupnav.php:117
+msgctxt "MENU"
+msgid "Admin"
+msgstr "నిర్వాహకులు"
+
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
 #: lib/groupnav.php:120
@@ -8498,39 +8558,61 @@ msgid_plural "%dB"
 msgstr[0] "%dబైటు"
 msgstr[1] "%dబైట్లు"
 
-#: lib/jabber.php:387
+#: lib/implugin.php:262
 #, php-format
-msgid "[%s]"
-msgstr "[%s]"
+msgid ""
+"User \"%s\" on %s has said that your %s screenname belongs to them. If "
+"that's true, you can confirm by clicking on this URL: %s . (If you cannot "
+"click it, copy-and-paste it into the address bar of your browser). If that "
+"user isn't you, or if you didn't request this confirmation, just ignore this "
+"message."
+msgstr ""
 
-#: lib/jabber.php:567
+#: lib/implugin.php:349
 #, php-format
 msgid "Unknown inbox source %d."
 msgstr "గుర్తు తెలియని భాష \"%s\"."
 
+#: lib/implugin.php:485
+#, fuzzy, php-format
+msgid "Message too long - maximum is %1$d characters, you sent %2$d."
+msgstr "నోటిసు చాలా పొడవుగా ఉంది - %1$d అక్షరాలు గరిష్ఠం, మీరు %2$d పంపించారు."
+
 #: lib/leaveform.php:114
 msgid "Leave"
 msgstr "వైదొలగు"
 
+#. TRANS: Menu item for logging in to the StatusNet site.
+#: lib/logingroupnav.php:77
+msgctxt "MENU"
+msgid "Login"
+msgstr "ప్రవేశించు"
+
 #. TRANS: Title for menu item for logging in to the StatusNet site.
 #: lib/logingroupnav.php:79
 msgid "Login with a username and password"
 msgstr "వాడుకరిపేరు మరియు సంకేతపదాలతో ప్రవేశించండి"
 
+#. TRANS: Menu item for registering with the StatusNet site.
+#: lib/logingroupnav.php:85
+msgctxt "MENU"
+msgid "Register"
+msgstr "నమోదు"
+
 #. TRANS: Title for menu item for registering with the StatusNet site.
 #: lib/logingroupnav.php:87
 msgid "Sign up for a new account"
 msgstr "కొత్త ఖాతా కొరకై నమోదుచేసుకోండి"
 
 #. TRANS: Subject for address confirmation email.
-#: lib/mail.php:168
+#: lib/mail.php:172
 msgid "Email address confirmation"
 msgstr "ఈమెయిల్ చిరునామా నిర్ధారణ"
 
 #. TRANS: Body for address confirmation email.
 #. TRANS: %1$s is the addressed user's nickname, %2$s is the StatusNet sitename,
 #. TRANS: %3$s is the URL to confirm at.
-#: lib/mail.php:173
+#: lib/mail.php:177
 #, fuzzy, php-format
 msgid ""
 "Hey, %1$s.\n"
@@ -8561,14 +8643,14 @@ msgstr ""
 
 #. TRANS: Subject of new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
-#: lib/mail.php:238
+#: lib/mail.php:243
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1$s ఇప్పుడు %2$sలో మీ నోటీసులని వింటున్నారు."
 
 #. TRANS: This is a paragraph in a new-subscriber e-mail.
 #. TRANS: %s is a URL where the subscriber can be reported as abusive.
-#: lib/mail.php:245
+#: lib/mail.php:250
 #, php-format
 msgid ""
 "If you believe this account is being used abusively, you can block them from "
@@ -8580,7 +8662,7 @@ msgstr ""
 #. TRANS: %3$s is the subscriber's profile URL, %4$s is the subscriber's location (or empty)
 #. TRANS: %5$s is the subscriber's homepage URL (or empty), %6%s is the subscriber's bio (or empty)
 #. TRANS: %7$s is a link to the addressed user's e-mail settings.
-#: lib/mail.php:255
+#: lib/mail.php:260
 #, fuzzy, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -8607,14 +8689,14 @@ msgstr ""
 
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is biographical information.
-#: lib/mail.php:278
+#: lib/mail.php:283
 #, php-format
 msgid "Bio: %s"
 msgstr "స్వపరిచయం: %s"
 
 #. TRANS: Subject of notification mail for new posting email address.
 #. TRANS: %s is the StatusNet sitename.
-#: lib/mail.php:307
+#: lib/mail.php:312
 #, php-format
 msgid "New email address for posting to %s"
 msgstr "%sకి నోటీసులు పంపించడానికి కొత్త ఈమెయిలు చిరునామా"
@@ -8622,7 +8704,7 @@ msgstr "%sకి నోటీసులు పంపించడానికి 
 #. TRANS: Body of notification mail for new posting email address.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is the e-mail address to send
 #. TRANS: to to post by e-mail, %3$s is a URL to more instructions.
-#: lib/mail.php:313
+#: lib/mail.php:318
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -8637,26 +8719,26 @@ msgstr ""
 
 #. TRANS: Subject line for SMS-by-email notification messages.
 #. TRANS: %s is the posting user's nickname.
-#: lib/mail.php:434
+#: lib/mail.php:439
 #, php-format
 msgid "%s status"
 msgstr "%s స్థితి"
 
 #. TRANS: Subject line for SMS-by-email address confirmation message.
-#: lib/mail.php:460
+#: lib/mail.php:465
 msgid "SMS confirmation"
 msgstr "SMS నిర్ధారణ"
 
 #. TRANS: Main body heading for SMS-by-email address confirmation message.
 #. TRANS: %s is the addressed user's nickname.
-#: lib/mail.php:464
+#: lib/mail.php:469
 #, fuzzy, php-format
 msgid "%s: confirm you own this phone number with this code:"
 msgstr "ఈ ఫోను నంబరు యొక్క నిర్ధారణకై వేచివుంది."
 
 #. TRANS: Subject for 'nudge' notification email.
 #. TRANS: %s is the nudging user.
-#: lib/mail.php:485
+#: lib/mail.php:490
 #, fuzzy, php-format
 msgid "You have been nudged by %s"
 msgstr "చందాచేరడం నుండి మిమ్మల్ని నిషేధించారు."
@@ -8664,7 +8746,7 @@ msgstr "చందాచేరడం నుండి మిమ్మల్ని
 #. TRANS: Body for 'nudge' notification email.
 #. TRANS: %1$s is the nuding user's long name, $2$s is the nudging user's nickname,
 #. TRANS: %3$s is a URL to post notices at, %4$s is the StatusNet sitename.
-#: lib/mail.php:492
+#: lib/mail.php:497
 #, php-format
 msgid ""
 "%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -8693,7 +8775,7 @@ msgstr ""
 
 #. TRANS: Subject for direct-message notification email.
 #. TRANS: %s is the sending user's nickname.
-#: lib/mail.php:539
+#: lib/mail.php:544
 #, php-format
 msgid "New private message from %s"
 msgstr "%s నుండి కొత్త అంతరంగిక సందేశం"
@@ -8702,7 +8784,7 @@ msgstr "%s నుండి కొత్త అంతరంగిక సందే
 #. TRANS: %1$s is the sending user's long name, %2$s is the sending user's nickname,
 #. TRANS: %3$s is the message content, %4$s a URL to the message,
 #. TRANS: %5$s is the StatusNet sitename.
-#: lib/mail.php:547
+#: lib/mail.php:552
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -8737,7 +8819,7 @@ msgstr ""
 
 #. TRANS: Subject for favorite notification e-mail.
 #. TRANS: %1$s is the adding user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:599
+#: lib/mail.php:604
 #, php-format
 msgid "%1$s (@%2$s) added your notice as a favorite"
 msgstr "%1$s (@%2$s) మీ నోటీసుని ఇష్టపడ్డారు"
@@ -8747,7 +8829,7 @@ msgstr "%1$s (@%2$s) మీ నోటీసుని ఇష్టపడ్డా
 #. TRANS: %3$s is a URL to the faved notice, %4$s is the faved notice text,
 #. TRANS: %5$s is a URL to all faves of the adding user, %6$s is the StatusNet sitename,
 #. TRANS: %7$s is the adding user's nickname.
-#: lib/mail.php:606
+#: lib/mail.php:611
 #, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -8785,7 +8867,7 @@ msgstr ""
 "%6$s\n"
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:664
+#: lib/mail.php:669
 #, php-format
 msgid ""
 "The full conversation can be read here:\n"
@@ -8798,7 +8880,7 @@ msgstr ""
 
 #. TRANS: E-mail subject for notice notification.
 #. TRANS: %1$s is the sending user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:672
+#: lib/mail.php:677
 #, php-format
 msgid "%1$s (@%2$s) sent a notice to your attention"
 msgstr "%1$s (@%2$s) మీ దృష్టికి ఒక నోటిసుని పంపించారు"
@@ -8809,7 +8891,7 @@ msgstr "%1$s (@%2$s) మీ దృష్టికి ఒక నోటిసు
 #. TRANS: %5$s is a URL to the full conversion if it exists (otherwise empty),
 #. TRANS: %6$s is a URL to reply to the notice, %7$s is a URL to all @-replied for the addressed user,
 #. TRANS: %8$s is a URL to the addressed user's e-mail settings, %9$s is the sender's nickname.
-#: lib/mail.php:680
+#: lib/mail.php:685
 #, php-format
 msgid ""
 "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -8952,11 +9034,7 @@ msgstr "చందాదార్లు"
 msgid "To"
 msgstr ""
 
-#: lib/messageform.php:166 lib/noticeform.php:186
-msgid "Available characters"
-msgstr "అందుబాటులో ఉన్న అక్షరాలు"
-
-#: lib/messageform.php:185 lib/noticeform.php:237
+#: lib/messageform.php:184 lib/noticeform.php:236
 msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr "పంపించు"
@@ -8966,15 +9044,10 @@ msgstr "పంపించు"
 msgid "Messages"
 msgstr "సందేశం"
 
-#: lib/messagelistitem.php:123 lib/noticelist.php:522
+#: lib/messagelistitem.php:123 lib/noticelist.php:527
 msgid "from"
 msgstr "నుండి"
 
-#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:165
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr "పేరులో చిన్నబడి అక్షరాలు మరియు అంకెలు మాత్రమే ఖాళీలు లేకుండా ఉండాలి."
-
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 #: lib/nickname.php:178
 msgid "Nickname cannot be empty."
@@ -8997,23 +9070,23 @@ msgstr "సైటు గమనిక"
 msgid "What's up, %s?"
 msgstr "%s, ఏమిటి సంగతులు?"
 
-#: lib/noticeform.php:194
+#: lib/noticeform.php:193
 msgid "Attach"
 msgstr "జోడించు"
 
-#: lib/noticeform.php:198
+#: lib/noticeform.php:197
 msgid "Attach a file"
 msgstr "ఒక ఫైలుని జోడించు"
 
-#: lib/noticeform.php:213
+#: lib/noticeform.php:212
 msgid "Share my location"
 msgstr "నేనున్న ప్రాంతాన్ని బహిరంగపరచు"
 
-#: lib/noticeform.php:216
+#: lib/noticeform.php:215
 msgid "Do not share my location"
 msgstr "నేనున్న ప్రాంతాన్ని బహిరంగపరచకు"
 
-#: lib/noticeform.php:217
+#: lib/noticeform.php:216
 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
 "try again later"
@@ -9022,55 +9095,59 @@ msgstr ""
 "కాసేపాగి ప్రయత్నించండి"
 
 #. TRANS: Used in coordinates as abbreviation of north
-#: lib/noticelist.php:452
+#: lib/noticelist.php:457
 msgid "N"
 msgstr "ఉ"
 
 #. TRANS: Used in coordinates as abbreviation of south
-#: lib/noticelist.php:454
+#: lib/noticelist.php:459
 msgid "S"
 msgstr "ద"
 
 #. TRANS: Used in coordinates as abbreviation of east
-#: lib/noticelist.php:456
+#: lib/noticelist.php:461
 msgid "E"
 msgstr "తూ"
 
 #. TRANS: Used in coordinates as abbreviation of west
-#: lib/noticelist.php:458
+#: lib/noticelist.php:463
 msgid "W"
 msgstr "ప"
 
-#: lib/noticelist.php:460
+#: lib/noticelist.php:465
 #, php-format
 msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 
-#: lib/noticelist.php:469
+#: lib/noticelist.php:474
 msgid "at"
 msgstr "ప్రాంతం"
 
-#: lib/noticelist.php:518
+#: lib/noticelist.php:523
 msgid "web"
 msgstr "జాలం"
 
-#: lib/noticelist.php:584
+#: lib/noticelist.php:589
 msgid "in context"
 msgstr "సందర్భంలో"
 
-#: lib/noticelist.php:619
+#: lib/noticelist.php:624
 msgid "Repeated by"
 msgstr "%s యొక్క పునరావృతం"
 
-#: lib/noticelist.php:646
+#: lib/noticelist.php:651
 msgid "Reply to this notice"
 msgstr "ఈ నోటీసుపై స్పందించండి"
 
-#: lib/noticelist.php:647
+#: lib/noticelist.php:652
 msgid "Reply"
 msgstr "స్పందించండి"
 
-#: lib/noticelist.php:691
+#: lib/noticelist.php:678
+msgid "Delete this notice"
+msgstr "ఈ నోటీసుని తొలగించు"
+
+#: lib/noticelist.php:696
 msgid "Notice repeated"
 msgstr "నోటీసుని పునరావృతించారు"
 
@@ -9110,48 +9187,31 @@ msgstr ""
 msgid "Couldn't insert new subscription."
 msgstr "కొత్త చందాని చేర్చలేకపోయాం."
 
-#. TRANS: Personal group navigation menu option when logged in for viewing @-replies.
-#: lib/personalgroupnav.php:107
+#: lib/personalgroupnav.php:104
 #, fuzzy
-msgctxt "MENU"
 msgid "Replies"
 msgstr "స్పందనలు"
 
-#. TRANS: Personal group navigation menu option when logged in for seeing own profile.
-#: lib/personalgroupnav.php:114
+#: lib/personalgroupnav.php:109
 #, fuzzy
-msgctxt "MENU"
-msgid "Profile"
-msgstr "ప్రొఫైలు"
-
-#. TRANS: Personal group navigation menu option when logged in for viewing own favourited notices.
-#: lib/personalgroupnav.php:120
-#, fuzzy
-msgctxt "MENU"
 msgid "Favorites"
 msgstr "ఇష్టాంశాలు"
 
-#. TRANS: Personal group navigation menu option when logged in for viewing recieved personal messages.
-#: lib/personalgroupnav.php:133
+#: lib/personalgroupnav.php:120
 #, fuzzy
-msgctxt "MENU"
 msgid "Inbox"
 msgstr "వచ్చినవి"
 
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing recieved personal messages.
-#: lib/personalgroupnav.php:135
+#: lib/personalgroupnav.php:121
 msgid "Your incoming messages"
 msgstr "మీకు వచ్చిన సందేశాలు"
 
-#. TRANS: Personal group navigation menu option when logged in for viewing senet personal messages.
-#: lib/personalgroupnav.php:140
+#: lib/personalgroupnav.php:125
 #, fuzzy
-msgctxt "MENU"
 msgid "Outbox"
 msgstr "పంపినవి"
 
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing senet personal messages.
-#: lib/personalgroupnav.php:142
+#: lib/personalgroupnav.php:126
 msgid "Your sent messages"
 msgstr "మీరు పంపిన సందేశాలు"
 
@@ -9167,9 +9227,26 @@ msgstr ""
 msgid "Unknown"
 msgstr "తెలియని చర్య"
 
+#. TRANS: Plugin admin panel controls
+#: lib/plugindisableform.php:90
+msgctxt "plugin"
+msgid "Disable"
+msgstr ""
+
+#. TRANS: Plugin admin panel controls
+#: lib/pluginenableform.php:112
+msgctxt "plugin"
+msgid "Enable"
+msgstr ""
+
+#: lib/pluginlist.php:196
+msgctxt "plugin-description"
+msgid "(Plugin descriptions unavailable when disabled.)"
+msgstr ""
+
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:82
+#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:88
 msgid "Subscriptions"
 msgstr "చందాలు"
 
@@ -9180,7 +9257,7 @@ msgstr "అన్ని చందాలు"
 
 #. TRANS: H2 text for user subscriber statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:90
+#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:96
 msgid "Subscribers"
 msgstr "చందాదార్లు"
 
@@ -9202,7 +9279,7 @@ msgstr "సభ్యులైన తేదీ"
 #. TRANS: Label for user statistics.
 #. TRANS: H2 text for user group membership statistics.
 #: lib/profileaction.php:239 lib/profileaction.php:290
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:104
 msgid "Groups"
 msgstr "గుంపులు"
 
@@ -9222,10 +9299,6 @@ msgstr "అన్ని గుంపులు"
 msgid "Unimplemented method."
 msgstr ""
 
-#: lib/publicgroupnav.php:78
-msgid "Public"
-msgstr "ప్రజా"
-
 #: lib/publicgroupnav.php:82
 msgid "User groups"
 msgstr "వాడుకరి గుంపులు"
@@ -9264,7 +9337,7 @@ msgid "Revoke the \"%s\" role from this user"
 msgstr "ఈ గుంపునుండి ఈ వాడుకరిని నిరోధించు"
 
 #. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:974
+#: lib/router.php:1001
 #, fuzzy
 msgid "Page not found."
 msgstr "నిర్ధారణ సంకేతం కనబడలేదు."
@@ -9295,11 +9368,6 @@ msgctxt "BUTTON"
 msgid "Search"
 msgstr "వెతుకు"
 
-#. TRANS: Definition list item with instructions on how to get (better) search results.
-#: lib/searchaction.php:170
-msgid "Search help"
-msgstr "సహాయంలో వెతుకు"
-
 #: lib/searchgroupnav.php:80
 msgid "People"
 msgstr "ప్రజలు"
@@ -9324,6 +9392,52 @@ msgstr "శీర్షికలేని విభాగం"
 msgid "More..."
 msgstr "మరింత..."
 
+#: lib/settingsnav.php:78
+#, fuzzy
+msgid "Change your profile settings"
+msgstr "ఫ్రొఫైలు అమరికలని మార్చు"
+
+#: lib/settingsnav.php:83
+msgid "Upload an avatar"
+msgstr "ఒక అవతారాన్ని ఎక్కించండి"
+
+#: lib/settingsnav.php:88
+msgid "Change your password"
+msgstr "మీ సంకేతపదాన్ని మార్చుకోండి"
+
+#: lib/settingsnav.php:93
+msgid "Change email handling"
+msgstr ""
+
+#: lib/settingsnav.php:98
+msgid "Design your profile"
+msgstr "వాడుకరి ప్రొఫైలు"
+
+#: lib/settingsnav.php:102
+msgid "URL"
+msgstr ""
+
+#: lib/settingsnav.php:103
+msgid "URL shorteners"
+msgstr ""
+
+#: lib/settingsnav.php:111
+msgid "Updates by instant messenger (IM)"
+msgstr ""
+
+#: lib/settingsnav.php:118
+msgid "Updates by SMS"
+msgstr ""
+
+#: lib/settingsnav.php:123
+#, fuzzy
+msgid "Connections"
+msgstr "అనుసంధానాలు"
+
+#: lib/settingsnav.php:124
+msgid "Authorized connected applications"
+msgstr "అధీకృత అనుసంధాన ఉపకరణాలు"
+
 #: lib/silenceform.php:67
 msgid "Silence"
 msgstr "సైటు గమనిక"
@@ -9332,30 +9446,34 @@ msgstr "సైటు గమనిక"
 msgid "Silence this user"
 msgstr "ఈ వాడుకరిని తొలగించు"
 
-#: lib/subgroupnav.php:83
+#: lib/subgroupnav.php:89
 #, php-format
 msgid "People %s subscribes to"
 msgstr "%s చందాచేరిన వ్యక్తులు"
 
-#: lib/subgroupnav.php:91
+#: lib/subgroupnav.php:97
 #, php-format
 msgid "People subscribed to %s"
 msgstr "%sకి చందాచేరిన వ్యక్తులు"
 
-#: lib/subgroupnav.php:99
+#: lib/subgroupnav.php:105
 #, php-format
 msgid "Groups %s is a member of"
 msgstr "%s సభ్యులుగా ఉన్న గుంపులు"
 
-#: lib/subgroupnav.php:105
+#: lib/subgroupnav.php:111
 msgid "Invite"
 msgstr "ఆహ్వానించు"
 
-#: lib/subgroupnav.php:106
+#: lib/subgroupnav.php:112
 #, php-format
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "%sలో తోడుకై మీ స్నేహితులని మరియు సహోద్యోగులని ఆహ్వానించండి"
 
+#: lib/subscribeform.php:115 lib/subscribeform.php:139
+msgid "Subscribe to this user"
+msgstr "ఈ వాడుకరికి చందాచేరు"
+
 #: lib/subscriberspeopleselftagcloudsection.php:48
 #: lib/subscriptionspeopleselftagcloudsection.php:48
 msgid "People Tagcloud as self-tagged"
@@ -9426,6 +9544,13 @@ msgstr ""
 msgid "Error opening theme archive."
 msgstr "నిరోధాన్ని తొలగించడంలో పొరపాటు."
 
+#: lib/threadednoticelist.php:270
+#, php-format
+msgid "Show all %d comment"
+msgid_plural "Show all %d comments"
+msgstr[0] ""
+msgstr[1] ""
+
 #: lib/topposterssection.php:74
 msgid "Top posters"
 msgstr ""
@@ -9467,77 +9592,81 @@ msgstr "చందామాను"
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "వాడుకరికి ప్రొఫైలు లేదు."
 
-#. TRANS: Link text for changeing the avatar of the logged in user.
-#: lib/userprofile.php:121
+#: lib/userprofile.php:116
 msgid "Edit Avatar"
 msgstr "అవతారాన్ని మార్చు"
 
 #. TRANS: H2 for user actions in a profile.
 #. TRANS: H2 for entity actions in a profile.
-#: lib/userprofile.php:245 lib/userprofile.php:261
+#: lib/userprofile.php:216 lib/userprofile.php:232
 msgid "User actions"
 msgstr "వాడుకరి చర్యలు"
 
 #. TRANS: Text shown in user profile of not yet compeltely deleted users.
-#: lib/userprofile.php:249
+#: lib/userprofile.php:220
 msgid "User deletion in progress..."
 msgstr "వాడుకరి తొలగింపు కొనసాగుతూంది..."
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:277
+#: lib/userprofile.php:248
 msgid "Edit profile settings"
 msgstr "ఫ్రొఫైలు అమరికలని మార్చు"
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:279
+#: lib/userprofile.php:250
 msgid "Edit"
 msgstr "మార్చు"
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:303
+#: lib/userprofile.php:274
 msgid "Send a direct message to this user"
 msgstr "ఈ వాడుకరికి ఒక నేరు సందేశాన్ని పంపించండి"
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:305
+#: lib/userprofile.php:276
 msgid "Message"
 msgstr "సందేశం"
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:347
+#: lib/userprofile.php:318
 #, fuzzy
 msgid "Moderate"
 msgstr "సమన్వయకర్త"
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:386
+#: lib/userprofile.php:357
 msgid "User role"
 msgstr "వాడుకరి పాత్ర"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:389
+#: lib/userprofile.php:360
 msgctxt "role"
 msgid "Administrator"
 msgstr "నిర్వాహకులు"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:391
+#: lib/userprofile.php:362
 msgctxt "role"
 msgid "Moderator"
 msgstr "సమన్వయకర్త"
 
+#: lib/util.php:321
+#, fuzzy
+msgid "Not allowed to log in."
+msgstr "లోనికి ప్రవేశించలేదు."
+
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1306
+#: lib/util.php:1337
 msgid "a few seconds ago"
 msgstr "కొన్ని క్షణాల క్రితం"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1309
+#: lib/util.php:1340
 msgid "about a minute ago"
 msgstr "ఓ నిమిషం క్రితం"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1313
+#: lib/util.php:1344
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
@@ -9545,12 +9674,12 @@ msgstr[0] "సుమారు ఒక నిమిషం క్రితం"
 msgstr[1] "సుమారు %d నిమిషాల క్రితం"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1316
+#: lib/util.php:1347
 msgid "about an hour ago"
 msgstr "ఒక గంట క్రితం"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1320
+#: lib/util.php:1351
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
@@ -9558,12 +9687,12 @@ msgstr[0] "సుమారు ఒక గంట క్రితం"
 msgstr[1] "సుమారు %d గంటల క్రితం"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1323
+#: lib/util.php:1354
 msgid "about a day ago"
 msgstr "ఓ రోజు క్రితం"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1327
+#: lib/util.php:1358
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
@@ -9571,12 +9700,12 @@ msgstr[0] "సుమారు ఒక రోజు క్రితం"
 msgstr[1] "సుమారు %d రోజుల క్రితం"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1330
+#: lib/util.php:1361
 msgid "about a month ago"
 msgstr "ఓ నెల క్రితం"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1334
+#: lib/util.php:1365
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
@@ -9584,7 +9713,7 @@ msgstr[0] "సుమారు ఒక నెల క్రితం"
 msgstr[1] "సుమారు %d నెలల క్రితం"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1337
+#: lib/util.php:1368
 msgid "about a year ago"
 msgstr "ఒక సంవత్సరం క్రితం"
 
@@ -9595,21 +9724,6 @@ msgstr "ఒక సంవత్సరం క్రితం"
 msgid "%s is not a valid color! Use 3 or 6 hex characters."
 msgstr "%s అనేది సరైన రంగు కాదు! 3 లేదా 6 హెక్స్ అక్షరాలను వాడండి."
 
-#. TRANS: %s is the URL to the StatusNet site's Instant Messaging settings.
-#: lib/xmppmanager.php:287
-#, php-format
-msgid "Unknown user. Go to %s to add your address to your account"
-msgstr ""
-
-#. TRANS: Response to XMPP source when it sent too long a message.
-#. TRANS: %1$d the maximum number of allowed characters (used for plural), %2$d is the sent number.
-#: lib/xmppmanager.php:406
-#, fuzzy, php-format
-msgid "Message too long. Maximum is %1$d character, you sent %2$d."
-msgid_plural "Message too long. Maximum is %1$d characters, you sent %2$d."
-msgstr[0] "నోటిసు చాలా పొడవుగా ఉంది - %1$d అక్షరాలు గరిష్ఠం, మీరు %2$d పంపించారు."
-msgstr[1] "నోటిసు చాలా పొడవుగా ఉంది - %1$d అక్షరాలు గరిష్ఠం, మీరు %2$d పంపించారు."
-
 #. TRANS: Exception.
 #: lib/xrd.php:63
 #, fuzzy
@@ -9627,63 +9741,148 @@ msgstr ""
 msgid "Getting backup from file '%s'."
 msgstr ""
 
-#~ msgid "Block this user."
-#~ msgstr "ఈ వాడుకరిని నిరోధించండి."
+#, fuzzy
+#~ msgid "Could not generate feed for group - %s"
+#~ msgstr "గుంపుని తాజాకరించలేకున్నాం."
 
 #, fuzzy
-#~ msgid "Delete this notice."
-#~ msgstr "ఈ నోటీసుని తొలగించు"
-
-#~ msgid "Delete this user."
-#~ msgstr "ఈ వాడుకరిని తొలగించండి."
+#~ msgid "Current confirmed Jabber/Google Talk address."
+#~ msgstr "ప్రస్తుతం నిర్ధారించిన Jabber/GTalk చిరునామా"
 
 #, fuzzy
-#~ msgid "Restore default designs."
-#~ msgstr "అప్రమేయాలని ఉపయోగించు"
+#~ msgid "Publish a MicroID for my Jabber/Google Talk address."
+#~ msgstr "ప్రస్తుతం నిర్ధారించిన Jabber/GTalk చిరునామా"
+
+#~ msgid "No Jabber ID."
+#~ msgstr "Jabber ID లేదు."
 
 #, fuzzy
-#~ msgid "Reset back to default."
-#~ msgstr "అప్రమేయాలని ఉపయోగించు"
+#~ msgid "Not a valid Jabber ID."
+#~ msgstr "సరైన Jabber ఐడీ కాదు"
+
+#~ msgid "That is already your Jabber ID."
+#~ msgstr "ఈ Jabber ID మీకు ఇప్పటికే ఉంది"
+
+#~ msgid "That is not your Jabber ID."
+#~ msgstr "ఇది మీ Jabber ID కాదు"
+
+#~ msgid "Other settings"
+#~ msgstr "ఇతర అమరికలు"
+
+#~ msgid "Tag cloud"
+#~ msgstr "ట్యాగు మేఘం"
 
 #, fuzzy
-#~ msgid "Save design."
-#~ msgstr "రూపురేఖలని భద్రపరచు"
+#~ msgid "Authorize URL"
+#~ msgstr "రచయిత"
+
+#~ msgid "Jabber"
+#~ msgstr "జాబర్"
+
+#~ msgid "Photo"
+#~ msgstr "ఫొటో"
+
+#~ msgid "Other options"
+#~ msgstr "ఇతర ఎంపికలు"
+
+#~ msgid "Other"
+#~ msgstr "ఇతర"
+
+#~ msgid "Primary site navigation"
+#~ msgstr "ప్రాధమిక సైటు మార్గదర్శిని"
+
+#~ msgctxt "MENU"
+#~ msgid "Personal"
+#~ msgstr "వ్యక్తిగత"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Change your email, avatar, password, profile"
+#~ msgstr "మీ ఈమెయిలు, అవతారం, సంకేతపదం మరియు ప్రౌఫైళ్ళను మార్చుకోండి"
+
+#~ msgid "Account"
+#~ msgstr "ఖాతా"
 
 #, fuzzy
-#~ msgid "Disfavor favorite."
-#~ msgstr "ఇష్టాంశాలకు చేర్చు"
+#~ msgctxt "TOOLTIP"
+#~ msgid "Connect to services"
+#~ msgstr "అనుసంధానాలు"
+
+#~ msgid "Connect"
+#~ msgstr "అనుసంధానించు"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Change site configuration"
+#~ msgstr "సైటు స్వరూపణాన్ని మార్చండి"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Invite friends and colleagues to join you on %s"
+#~ msgstr "%sలో తోడుకై మీ స్నేహితులని మరియు సహోద్యోగులని ఆహ్వానించండి"
+
+#~ msgctxt "MENU"
+#~ msgid "Invite"
+#~ msgstr "ఆహ్వానించు"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Create an account"
+#~ msgstr "ఖాతాని సృష్టించుకోండి"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Help me!"
+#~ msgstr "సహాయం కావాలి!"
+
+#~ msgctxt "MENU"
+#~ msgid "Help"
+#~ msgstr "సహాయం"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Search for people or text"
+#~ msgstr "ప్రజలు లేదా పాఠ్యం కొరకు వెతకండి"
+
+#~ msgid "Local views"
+#~ msgstr "స్థానిక వీక్షణలు"
+
+#~ msgid "Page notice"
+#~ msgstr "పేజీ గమనిక"
+
+#~ msgid "Secondary site navigation"
+#~ msgstr "ద్వితీయ సైటు మార్గదర్శిని"
+
+#~ msgid "StatusNet software license"
+#~ msgstr "స్టేటస్‌నెట్ మృదూపకరణ లైసెన్సు"
+
+#~ msgid "Site content license"
+#~ msgstr "స్టేటస్‌నెట్ మృదూపకరణ లైసెన్సు"
+
+#~ msgid "Pagination"
+#~ msgstr "పేజీకరణ"
+
+#~ msgid "Author"
+#~ msgstr "రచయిత"
+
+#~ msgid "Provider"
+#~ msgstr "మునుజూపు"
 
 #, fuzzy
-#~ msgid "\"%s\" not found."
-#~ msgstr "వాడుకరి దొరకలేదు."
+#~ msgctxt "MENU"
+#~ msgid "SMS"
+#~ msgstr "SSLని ఉపయోగించు"
+
+#~ msgid "[%s]"
+#~ msgstr "[%s]"
+
+#~ msgid "Available characters"
+#~ msgstr "అందుబాటులో ఉన్న అక్షరాలు"
 
 #, fuzzy
-#~ msgid "Notice %s not found."
-#~ msgstr "నిర్ధారణ సంకేతం కనబడలేదు."
+#~ msgctxt "MENU"
+#~ msgid "Profile"
+#~ msgstr "ప్రొఫైలు"
+
+#~ msgid "Search help"
+#~ msgstr "సహాయంలో వెతుకు"
 
 #, fuzzy
-#~ msgid "Attachment %s not found."
-#~ msgstr "అందుకోవాల్సిన వాడుకరి కనబడలేదు."
-
-#, fuzzy
-#~ msgid "Invalid tag: \"%s\"."
-#~ msgstr "తప్పుడు మారుపేరు: \"%s\""
-
-#, fuzzy
-#~ msgid "%s updates from everyone."
-#~ msgstr "అందరి నుండి %s తాజాకరణలు!"
-
-#, fuzzy
-#~ msgid "Password saved"
-#~ msgstr "సంకేతపదం భద్రమయ్యింది."
-
-#, fuzzy
-#~ msgid "Where you are, like \"City, State (or Region), Country\"."
-#~ msgstr "మీరు ఎక్కడ నుండి, \"నగరం, రాష్ట్రం (లేదా ప్రాంతం), దేశం\""
-
-#~ msgid "Subscribe to this user."
-#~ msgstr "ఈ వాడుకరికి చందాచేరండి."
-
-#, fuzzy
-#~ msgid "Not allowed to log in."
-#~ msgstr "లోనికి ప్రవేశించలేదు."
+#~ msgid "Message too long. Maximum is %1$d character, you sent %2$d."
+#~ msgid_plural "Message too long. Maximum is %1$d characters, you sent %2$d."
+#~ msgstr[0] "నోటిసు చాలా పొడవుగా ఉంది - %1$d అక్షరాలు గరిష్ఠం, మీరు %2$d పంపించారు."
+#~ msgstr[1] "నోటిసు చాలా పొడవుగా ఉంది - %1$d అక్షరాలు గరిష్ఠం, మీరు %2$d పంపించారు."
diff --git a/locale/tr/LC_MESSAGES/statusnet.po b/locale/tr/LC_MESSAGES/statusnet.po
index 66d16b962e..2ab5760b11 100644
--- a/locale/tr/LC_MESSAGES/statusnet.po
+++ b/locale/tr/LC_MESSAGES/statusnet.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 15:58+0000\n"
-"PO-Revision-Date: 2011-03-03 16:01:26+0000\n"
+"POT-Creation-Date: 2011-03-03 17:23+0000\n"
+"PO-Revision-Date: 2011-03-03 17:26:30+0000\n"
 "Language-Team: Turkish <http://translatewiki.net/wiki/Portal:tr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -80,23 +80,23 @@ msgstr "Erişim ayarlarını kaydet"
 #. TRANS: Tooltip for button to save access settings in site admin panel.
 #. TRANS: Button text for saving theme settings.
 #. TRANS: Button label to save e-mail preferences.
-#. TRANS: Button label to save Instant Messaging preferences.
-#. TRANS: Button text for saving "Other settings" in profile.
+#. TRANS: Button label to save IM preferences.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
 #. TRANS: Button text for saving site notice in admin panel.
 #. TRANS: Button label to save SMS preferences.
 #. TRANS: Save button for settings for a profile in a subscriptions list.
+#. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
 #. TRANS: Button text on profile design page to save settings.
 #: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
-#: actions/emailsettings.php:250 actions/imsettings.php:183
-#: actions/othersettings.php:136 actions/pathsadminpanel.php:512
-#: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
-#: actions/smssettings.php:205 actions/subscriptions.php:259
+#: actions/emailsettings.php:251 actions/imsettings.php:199
+#: actions/pathsadminpanel.php:512 actions/profilesettings.php:198
+#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:204
+#: actions/subscriptions.php:261 actions/urlsettings.php:152
 #: actions/useradminpanel.php:298 lib/applicationeditform.php:355
-#: lib/designsettings.php:270 lib/groupeditform.php:201
+#: lib/designform.php:320 lib/groupeditform.php:201
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Kaydet"
@@ -135,7 +135,11 @@ msgstr "Böyle bir sayfa yok."
 #. 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 use "one time password login" without using an existing user.
+#. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
+#. TRANS: Client error displayed trying to find a user by ID for a non-existing ID.
+#. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when calling a profile action without specifying a user.
 #: actions/all.php:80 actions/allrss.php:69
@@ -147,19 +151,19 @@ msgstr "Böyle bir sayfa yok."
 #: actions/apidirectmessage.php:75 actions/apidirectmessagenew.php:72
 #: actions/apigroupcreate.php:111 actions/apigroupismember.php:89
 #: actions/apigroupjoin.php:98 actions/apigroupleave.php:98
-#: actions/apigrouplist.php:70 actions/apistatusesupdate.php:230
-#: actions/apisubscriptions.php:85 actions/apitimelinefavorites.php:70
-#: actions/apitimelinefriends.php:173 actions/apitimelinehome.php:78
-#: actions/apitimelinementions.php:77 actions/apitimelineuser.php:79
-#: actions/avatarbynickname.php:79 actions/favoritesrss.php:72
-#: actions/foaf.php:42 actions/foaf.php:61 actions/hcard.php:67
-#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
-#: actions/remotesubscribe.php:144 actions/remotesubscribe.php:153
-#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
-#: actions/showfavorites.php:106 actions/userbyid.php:74
-#: actions/usergroups.php:93 actions/userrss.php:40 actions/userxrd.php:59
-#: actions/xrds.php:71 lib/command.php:509 lib/galleryaction.php:59
-#: lib/mailbox.php:80 lib/profileaction.php:77
+#: actions/apigrouplist.php:70 actions/apigroupprofileupdate.php:108
+#: actions/apistatusesupdate.php:230 actions/apisubscriptions.php:85
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:173
+#: actions/apitimelinehome.php:78 actions/apitimelinementions.php:77
+#: actions/apitimelineuser.php:79 actions/avatarbynickname.php:79
+#: actions/favoritesrss.php:72 actions/foaf.php:42 actions/foaf.php:61
+#: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116
+#: actions/otp.php:78 actions/remotesubscribe.php:144
+#: actions/remotesubscribe.php:153 actions/replies.php:73
+#: actions/repliesrss.php:38 actions/rsd.php:113 actions/showfavorites.php:106
+#: actions/userbyid.php:75 actions/usergroups.php:93 actions/userrss.php:40
+#: actions/userxrd.php:59 actions/xrds.php:71 lib/command.php:509
+#: lib/galleryaction.php:59 lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Böyle bir kullanıcı yok."
 
@@ -173,10 +177,9 @@ msgstr "%1$s ve arkadaşları, sayfa %2$d"
 #. TRANS: H1 text for page. %s is a user nickname.
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Timeline title for user and friends. %s is a user nickname.
-#. TRANS: Tooltop for personal group navigation menu option when logged in for viewing timeline of self and friends.
 #: actions/all.php:94 actions/all.php:191 actions/allrss.php:117
 #: actions/apitimelinefriends.php:207 actions/apitimelinehome.php:113
-#: lib/personalgroupnav.php:102
+#: lib/personalgroupnav.php:100
 #, php-format
 msgid "%s and friends"
 msgstr "%s ve arkadaşları"
@@ -235,7 +238,7 @@ msgstr ""
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
 #. TRANS: Second sentence of empty message for anonymous users. %s is a user nickname.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:227
+#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:221
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -284,19 +287,20 @@ msgstr "%2$s üzerindeki %1$s ve arkadaşlarından güncellemeler!"
 #: actions/apifavoritecreate.php:98 actions/apifavoritedestroy.php:98
 #: actions/apifriendshipscreate.php:99 actions/apifriendshipsdestroy.php:99
 #: actions/apifriendshipsshow.php:124 actions/apigroupcreate.php:138
-#: actions/apigroupismember.php:115 actions/apigroupjoin.php:160
-#: actions/apigroupleave.php:145 actions/apigrouplist.php:134
+#: actions/apigroupismember.php:115 actions/apigroupjoin.php:151
+#: actions/apigroupleave.php:141 actions/apigrouplist.php:134
 #: actions/apigrouplistall.php:120 actions/apigroupmembership.php:105
+#: actions/apigroupprofileupdate.php:100 actions/apigroupprofileupdate.php:213
 #: actions/apigroupshow.php:114 actions/apihelptest.php:84
 #: actions/apistatusesdestroy.php:101 actions/apistatusesretweets.php:110
 #: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:139
 #: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
-#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:268
-#: actions/apitimelinegroup.php:147 actions/apitimelinehome.php:173
-#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:239
-#: actions/apitimelineretweetedtome.php:118
-#: actions/apitimelineretweetsofme.php:150 actions/apitimelinetag.php:159
-#: actions/apitimelineuser.php:206 actions/apiusershow.php:100
+#: actions/apitimelinefavorites.php:182 actions/apitimelinefriends.php:276
+#: actions/apitimelinegroup.php:148 actions/apitimelinehome.php:181
+#: actions/apitimelinementions.php:182 actions/apitimelinepublic.php:247
+#: actions/apitimelineretweetedtome.php:147
+#: actions/apitimelineretweetsofme.php:147 actions/apitimelinetag.php:165
+#: actions/apitimelineuser.php:217 actions/apiusershow.php:100
 msgid "API method not found."
 msgstr "UPA yöntemi bulunamadı."
 
@@ -311,8 +315,9 @@ msgstr "UPA yöntemi bulunamadı."
 #: actions/apifavoritecreate.php:88 actions/apifavoritedestroy.php:88
 #: actions/apifriendshipscreate.php:89 actions/apifriendshipsdestroy.php:89
 #: actions/apigroupcreate.php:102 actions/apigroupjoin.php:89
-#: actions/apigroupleave.php:89 actions/apimediaupload.php:66
-#: actions/apistatusesretweet.php:63 actions/apistatusesupdate.php:194
+#: actions/apigroupleave.php:89 actions/apigroupprofileupdate.php:92
+#: actions/apimediaupload.php:66 actions/apistatusesretweet.php:63
+#: actions/apistatusesupdate.php:194
 msgid "This method requires a POST."
 msgstr "Bu yöntem bir POST gerektirir."
 
@@ -326,21 +331,16 @@ msgstr ""
 "belirtmelisiniz."
 
 #. TRANS: Server error displayed when a user's delivery device cannot be updated.
-#. TRANS: Server error displayed when a user update to the database fails in the contact address confirmation action.
 #. TRANS: Server error thrown on database error updating e-mail preferences.
 #. TRANS: Server error thrown on database error removing a registered e-mail address.
-#. TRANS: Server error thrown on database error updating Instant Messaging preferences.
-#. TRANS: Server error thrown on database error removing a registered Instant Messaging address.
-#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
 #. TRANS: Server error thrown when user profile settings could not be updated.
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
-#: actions/apiaccountupdatedeliverydevice.php:130
-#: actions/confirmaddress.php:118 actions/emailsettings.php:352
-#: actions/emailsettings.php:498 actions/imsettings.php:276
-#: actions/imsettings.php:432 actions/othersettings.php:186
-#: actions/profilesettings.php:322 actions/smssettings.php:301
-#: actions/smssettings.php:454
+#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
+#: actions/apiaccountupdatedeliverydevice.php:136
+#: actions/emailsettings.php:353 actions/emailsettings.php:499
+#: actions/profilesettings.php:323 actions/smssettings.php:300
+#: actions/smssettings.php:453 actions/urlsettings.php:211
 msgid "Could not update user."
 msgstr "Kullanıcı güncellenemedi."
 
@@ -366,7 +366,7 @@ msgstr "Kullanıcının profili yok."
 
 #. TRANS: Server error displayed if a user profile could not be saved.
 #. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:418
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:419
 msgid "Could not save profile."
 msgstr "Profil kaydedilemedi."
 
@@ -378,7 +378,7 @@ msgstr "Profil kaydedilemedi."
 #: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
 #: actions/designadminpanel.php:120 actions/editapplication.php:121
 #: actions/newapplication.php:102 actions/newnotice.php:95
-#: lib/designsettings.php:298
+#: lib/designsettings.php:110
 #, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s byte) due to its "
@@ -400,8 +400,8 @@ msgstr[0] ""
 #: actions/apiaccountupdateprofilecolors.php:160
 #: actions/apiaccountupdateprofilecolors.php:171
 #: actions/groupdesignsettings.php:285 actions/groupdesignsettings.php:296
-#: actions/userdesignsettings.php:201 actions/userdesignsettings.php:211
-#: actions/userdesignsettings.php:253 actions/userdesignsettings.php:263
+#: actions/userdesignsettings.php:218 actions/userdesignsettings.php:228
+#: actions/userdesignsettings.php:270 actions/userdesignsettings.php:280
 msgid "Unable to save your design settings."
 msgstr "Dizayn ayarlarınız kaydedilemedi."
 
@@ -409,7 +409,7 @@ msgstr "Dizayn ayarlarınız kaydedilemedi."
 #. TRANS: Client error displayed when a database error occurs updating profile colours.
 #: actions/apiaccountupdateprofilebackgroundimage.php:191
 #: actions/apiaccountupdateprofilecolors.php:139
-#: actions/userdesignsettings.php:179
+#: actions/userdesignsettings.php:196
 msgid "Could not update your design."
 msgstr "Tasarımınız güncellenemedi."
 
@@ -517,7 +517,7 @@ msgstr "Alıcı kullanıcı bulunamadı."
 #. TRANS: Client error displayed trying to direct message another user who's not a friend (403).
 #: actions/apidirectmessagenew.php:144
 #, fuzzy
-msgid "Can't send direct messages to users who aren't your friend."
+msgid "Cannot send direct messages to users who aren't your friend."
 msgstr "Arkadaşınız olmayan kullanıcılara özel mesaj gönderemezsiniz."
 
 #. TRANS: Client error displayed trying to direct message self (403).
@@ -600,9 +600,9 @@ msgstr "Hedef kullanıcı bulunamadı."
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:156 actions/editgroup.php:191
-#: actions/newgroup.php:137 actions/profilesettings.php:273
-#: actions/register.php:214
+#: actions/apigroupcreate.php:156 actions/apigroupprofileupdate.php:255
+#: actions/editgroup.php:191 actions/newgroup.php:137
+#: actions/profilesettings.php:274 actions/register.php:199
 msgid "Nickname already in use. Try another one."
 msgstr "Takma ad kullanımda. Başka bir tane deneyin."
 
@@ -610,9 +610,9 @@ msgstr "Takma ad kullanımda. Başka bir tane deneyin."
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:164 actions/editgroup.php:195
-#: actions/newgroup.php:141 actions/profilesettings.php:243
-#: actions/register.php:216
+#: actions/apigroupcreate.php:164 actions/apigroupprofileupdate.php:259
+#: actions/editgroup.php:195 actions/newgroup.php:141
+#: actions/profilesettings.php:244 actions/register.php:201
 msgid "Not a valid nickname."
 msgstr "Geçersiz bir takma ad."
 
@@ -622,10 +622,10 @@ msgstr "Geçersiz bir takma ad."
 #. TRANS: Validation error shown when providing an invalid homepage URL in the "New application" form.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:181 actions/editapplication.php:235
-#: actions/editgroup.php:202 actions/newapplication.php:221
-#: actions/newgroup.php:148 actions/profilesettings.php:248
-#: actions/register.php:223
+#: actions/apigroupcreate.php:181 actions/apigroupprofileupdate.php:277
+#: actions/editapplication.php:235 actions/editgroup.php:202
+#: actions/newapplication.php:221 actions/newgroup.php:148
+#: actions/profilesettings.php:249 actions/register.php:208
 msgid "Homepage is not a valid URL."
 msgstr "Başlangıç sayfası adresi geçerli bir URL değil."
 
@@ -634,8 +634,8 @@ msgstr "Başlangıç sayfası adresi geçerli bir URL değil."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:191 actions/editgroup.php:206
-#: actions/newgroup.php:152 actions/profilesettings.php:252
-#: actions/register.php:226
+#: actions/newgroup.php:152 actions/profilesettings.php:253
+#: actions/register.php:211
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "Tam isim çok uzun (en fazla: 255 karakter)."
 
@@ -661,8 +661,8 @@ msgstr[0] "Tanım çok uzun (en fazla %d karakter)."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:215 actions/editgroup.php:218
-#: actions/newgroup.php:164 actions/profilesettings.php:265
-#: actions/register.php:235
+#: actions/newgroup.php:164 actions/profilesettings.php:266
+#: actions/register.php:220
 msgid "Location is too long (maximum 255 characters)."
 msgstr "Yer bilgisi çok uzun (en fazla 255 karakter)."
 
@@ -690,15 +690,16 @@ msgstr "Geçersiz büyüklük."
 #. TRANS: %s is the alias that is already in use.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error. %s is the already used alias.
-#: actions/apigroupcreate.php:264 actions/editgroup.php:246
-#: actions/newgroup.php:193
+#: actions/apigroupcreate.php:264 actions/apigroupprofileupdate.php:351
+#: actions/editgroup.php:246 actions/newgroup.php:193
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "Diğerisim \"%s\" kullanımda. Başka bir tane deneyin."
 
 #. TRANS: Client error displayed when trying to use an alias during group creation that is the same as the group's nickname.
 #. TRANS: Group edit form validation error.
-#: actions/apigroupcreate.php:278 actions/editgroup.php:253
+#: actions/apigroupcreate.php:278 actions/apigroupprofileupdate.php:359
+#: actions/editgroup.php:253
 msgid "Alias can't be the same as nickname."
 msgstr "Diğerisim, kullanıcı adı ile aynı olamaz."
 
@@ -710,7 +711,8 @@ msgstr "Diğerisim, kullanıcı adı ile aynı olamaz."
 #. TRANS: Client error displayed requesting most recent notices to a group for a non-existing group.
 #: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
 #: actions/apigroupleave.php:104 actions/apigroupmembership.php:71
-#: actions/apigroupshow.php:81 actions/apitimelinegroup.php:89
+#: actions/apigroupprofileupdate.php:113 actions/apigroupshow.php:81
+#: actions/apitimelinegroup.php:89
 msgid "Group not found."
 msgstr "Onay kodu bulunamadı."
 
@@ -728,13 +730,11 @@ msgstr "Bize o profili yollamadınız"
 msgid "You have been blocked from that group by the admin."
 msgstr "Bu gruptan yönetici tarafından engellendiniz."
 
-#. TRANS: Server error displayed when joining a group fails.
-#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
 #. 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.
 #. TRANS: Message given having failed to add a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:362
+#: actions/apigroupjoin.php:136 actions/joingroup.php:139 lib/command.php:362
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "%1$s kullanıcısı, %2$s grubuna katılamadı."
@@ -744,8 +744,6 @@ msgstr "%1$s kullanıcısı, %2$s grubuna katılamadı."
 msgid "You are not a member of this group."
 msgstr "Bu grubun bir üyesi değilsiniz."
 
-#. TRANS: Server error displayed when leaving a group fails.
-#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
 #. TRANS: Server error displayed when leaving a group failed in the database.
 #. TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
 #. TRANS: Message given having failed to remove a user from a group.
@@ -781,6 +779,63 @@ msgstr "%s grupları"
 msgid "groups on %s"
 msgstr "%s üzerindeki gruplar"
 
+#. TRANS: Client error displayed trying to edit a group while not being a group admin.
+#. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
+#. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
+#: actions/apigroupprofileupdate.php:118 actions/editgroup.php:110
+#: actions/editgroup.php:176 actions/groupdesignsettings.php:109
+#: actions/grouplogo.php:111
+msgid "You must be an admin to edit the group."
+msgstr "Bir grubu düzenlemek için bir yönetici olmalısınız."
+
+#. TRANS: Server error displayed when editing a group fails.
+#: actions/apigroupprofileupdate.php:171 actions/editgroup.php:274
+msgid "Could not update group."
+msgstr "Grup güncellenemedi."
+
+#. TRANS: Server error displayed when group aliases could not be added.
+#. TRANS: Server exception thrown when creating group aliases failed.
+#: actions/apigroupprofileupdate.php:194 actions/editgroup.php:281
+#: classes/User_group.php:540
+msgid "Could not create aliases."
+msgstr "Kullanıcı güncellenemedi."
+
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: actions/apigroupprofileupdate.php:249 lib/nickname.php:165
+msgid "Nickname must have only lowercase letters and numbers and no spaces."
+msgstr ""
+"Takma ad sadece küçük harflerden ve rakamlardan oluşabilir, boşluk "
+"kullanılamaz. "
+
+#: actions/apigroupprofileupdate.php:286
+#, fuzzy
+msgid "Full name is too long (max 255 chars)."
+msgstr "Tam isim çok uzun (en fazla: 255 karakter)."
+
+#: actions/apigroupprofileupdate.php:296
+#, fuzzy, php-format
+msgid "description is too long (max %d chars)."
+msgstr "Tanım çok uzun (en fazla %d karakter)."
+
+#: actions/apigroupprofileupdate.php:307
+#, fuzzy
+msgid "Location is too long (max 255 chars)."
+msgstr "Yer bilgisi çok uzun (en fazla 255 karakter)."
+
+#: actions/apigroupprofileupdate.php:326
+#, fuzzy, php-format
+msgid "Too many aliases! Maximum %d."
+msgstr "Çok fazla diğerisim! En fazla %d taneye izin veriliyor."
+
+#. TRANS: Group edit form validation error.
+#. TRANS: Group create form validation error.
+#. TRANS: %s is the invalid alias.
+#: actions/apigroupprofileupdate.php:342 actions/editgroup.php:241
+#: actions/newgroup.php:188
+#, fuzzy, php-format
+msgid "Invalid alias: \"%s\""
+msgstr "%s Geçersiz başlangıç sayfası"
+
 #. TRANS: Client error displayed when uploading a media file has failed.
 #: actions/apimediaupload.php:101
 msgid "Upload failed."
@@ -811,21 +866,22 @@ msgstr "İstek belirteci zaten yetkili."
 #. TRANS: Form validation error message.
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
+#. TRANS: Client error displayed when the session token is not okay.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
 #: actions/deletenotice.php:177 actions/disfavor.php:75
-#: actions/emailsettings.php:291 actions/favor.php:75 actions/geocode.php:55
+#: actions/emailsettings.php:292 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:65 actions/grouplogo.php:321
-#: actions/groupunblock.php:65 actions/imsettings.php:224
-#: actions/invite.php:60 actions/login.php:137 actions/makeadmin.php:66
-#: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
-#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
-#: actions/othersettings.php:155 actions/passwordsettings.php:138
-#: actions/profilesettings.php:217 actions/recoverpassword.php:383
-#: actions/register.php:172 actions/remotesubscribe.php:76
-#: actions/repeat.php:82 actions/smssettings.php:250 actions/subedit.php:40
-#: actions/subscribe.php:86 actions/tagother.php:166
-#: actions/unsubscribe.php:69 actions/userauthorization.php:52
-#: lib/designsettings.php:310
+#: actions/groupunblock.php:65 actions/imsettings.php:241
+#: actions/invite.php:60 actions/makeadmin.php:66 actions/newmessage.php:135
+#: actions/newnotice.php:105 actions/nudge.php:80
+#: actions/oauthappssettings.php:162 actions/oauthconnectionssettings.php:135
+#: actions/passwordsettings.php:137 actions/pluginenable.php:87
+#: actions/profilesettings.php:218 actions/recoverpassword.php:383
+#: actions/register.php:157 actions/remotesubscribe.php:76
+#: actions/repeat.php:82 actions/smssettings.php:249 actions/subedit.php:40
+#: actions/subscribe.php:87 actions/tagother.php:145
+#: actions/unsubscribe.php:69 actions/urlsettings.php:171
+#: actions/userauthorization.php:53 lib/designsettings.php:122
 msgid "There was a problem with your session token. Try again, please."
 msgstr "Oturum belirtecinizde bir sorun var. Lütfen, tekrar deneyin."
 
@@ -853,10 +909,10 @@ msgstr "oauth_token_association eklerken veritabanı hatası."
 #. TRANS: Unknown form validation error in design settings form.
 #: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
 #: actions/designadminpanel.php:100 actions/editapplication.php:144
-#: actions/emailsettings.php:310 actions/grouplogo.php:332
-#: actions/imsettings.php:239 actions/newapplication.php:124
-#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
-#: actions/smssettings.php:271 lib/designsettings.php:321
+#: actions/emailsettings.php:311 actions/grouplogo.php:332
+#: actions/imsettings.php:256 actions/newapplication.php:124
+#: actions/oauthconnectionssettings.php:144 actions/recoverpassword.php:46
+#: actions/smssettings.php:270 lib/designsettings.php:133
 msgid "Unexpected form submission."
 msgstr "Beklenmeğen form girdisi."
 
@@ -907,31 +963,26 @@ msgstr "Hesap"
 
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Field label in form for profile settings.
-#. TRANS: Label for group nickname (dt). Text hidden by default.
-#. TRANS: DT for nick name in a profile.
-#: actions/apioauthauthorize.php:459 actions/login.php:252
-#: actions/profilesettings.php:106 actions/register.php:432
-#: actions/showgroup.php:243 actions/tagother.php:94
+#: actions/apioauthauthorize.php:459 actions/login.php:225
+#: actions/profilesettings.php:107 actions/register.php:411
 #: actions/userauthorization.php:145 lib/groupeditform.php:145
-#: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "Takma ad"
 
 #. TRANS: Field label on OAuth API authorisation form.
-#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:463 actions/login.php:255
-#: actions/register.php:436 lib/accountsettingsaction.php:120
+#: actions/apioauthauthorize.php:463 actions/login.php:228
+#: actions/register.php:415 lib/settingsnav.php:87
 msgid "Password"
 msgstr "Parola"
 
 #. TRANS: Button text that when clicked will cancel the process of allowing access to an account
 #. TRANS: by an external application.
 #. TRANS: Button label to cancel an e-mail address confirmation procedure.
-#. TRANS: Button label to cancel an Instant Messaging address confirmation procedure.
+#. TRANS: Button label to cancel an IM address confirmation procedure.
 #. TRANS: Button label to cancel a SMS address confirmation procedure.
 #. TRANS: Button label in the "Edit application" form.
-#: actions/apioauthauthorize.php:478 actions/emailsettings.php:124
-#: actions/imsettings.php:127 actions/smssettings.php:133
+#: actions/apioauthauthorize.php:478 actions/emailsettings.php:125
+#: actions/imsettings.php:136 actions/smssettings.php:132
 #: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Cancel"
@@ -1043,7 +1094,7 @@ msgstr "HTTP yöntemi desteklenmiyor."
 #. TRANS: %s is the requested output format.
 #: actions/apistatusesshow.php:144
 #, fuzzy, php-format
-msgid "Unsupported format: %s"
+msgid "Unsupported format: %s."
 msgstr "Desteklenmeyen biçim: %s"
 
 #. TRANS: Client error displayed requesting a deleted status.
@@ -1123,13 +1174,6 @@ msgstr "%1$s / %2$s kullanıcısının favorileri"
 msgid "%1$s updates favorited by %2$s / %3$s."
 msgstr "%2$s / %3$s tarafından favorilere eklenen %1$s güncellemeleri."
 
-#. TRANS: Server error displayed when generating an Atom feed fails.
-#. TRANS: %s is the error.
-#: actions/apitimelinegroup.php:134
-#, php-format
-msgid "Could not generate feed for group - %s"
-msgstr "Grup - %s için besleme oluşturulamadı."
-
 #. TRANS: Title for timeline of most recent mentions of a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname.
 #: actions/apitimelinementions.php:115
@@ -1146,13 +1190,14 @@ msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr ""
 
 #. TRANS: Title for site timeline. %s is the StatusNet sitename.
+#. TRANS: Public RSS feed title. %s is the StatusNet site name.
 #: actions/apitimelinepublic.php:193 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "%s genel zaman çizelgesi"
 
 #. TRANS: Subtitle for site timeline. %s is the StatusNet sitename.
-#: actions/apitimelinepublic.php:199 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:199
 #, php-format
 msgid "%s updates from everyone!"
 msgstr ""
@@ -1164,21 +1209,33 @@ msgid "Unimplemented."
 msgstr "showForm() gerçeklenmemiş."
 
 #. TRANS: Title for Atom feed "repeated to me". %s is the user nickname.
-#: actions/apitimelineretweetedtome.php:108
+#: actions/apitimelineretweetedtome.php:96
 #, fuzzy, php-format
 msgid "Repeated to %s"
 msgstr "%s için cevaplar"
 
+#: actions/apitimelineretweetedtome.php:98
+#, fuzzy, php-format
+msgid "%1$s notices that were to repeated to %2$s / %3$s."
+msgstr "%2$s / %3$s tarafından favorilere eklenen %1$s güncellemeleri."
+
 #. TRANS: Title of list of repeated notices of the logged in user.
 #. TRANS: %s is the nickname of the logged in user.
-#: actions/apitimelineretweetsofme.php:112
+#: actions/apitimelineretweetsofme.php:98
 #, fuzzy, php-format
 msgid "Repeats of %s"
 msgstr "%s için cevaplar"
 
+#: actions/apitimelineretweetsofme.php:104
+#, fuzzy, php-format
+msgid "%1$s notices that %2$s / %3$s has repeated."
+msgstr "%1$s %2$s'da durumunuzu takip ediyor"
+
 #. TRANS: Title for timeline with lastest notices with a given tag.
 #. TRANS: %s is the tag.
-#: actions/apitimelinetag.php:101 actions/tag.php:67
+#. TRANS: Title for first page of notices with tags.
+#. TRANS: %s is the tag.
+#: actions/apitimelinetag.php:101 actions/tag.php:69
 #, php-format
 msgid "Notices tagged with %s"
 msgstr "%s ile etiketli durum mesajları"
@@ -1191,53 +1248,54 @@ msgid "Updates tagged with %1$s on %2$s!"
 msgstr "%s adli kullanicinin durum mesajlari"
 
 #. TRANS: Client error displayed trying to add a notice to another user's timeline.
-#: actions/apitimelineuser.php:297
+#: actions/apitimelineuser.php:308
 msgid "Only the user can add to their own timeline."
 msgstr ""
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:304
+#: actions/apitimelineuser.php:315
 msgid "Only accept AtomPub for Atom feeds."
 msgstr ""
 
 #. TRANS: Client error displayed attempting to post an empty API notice.
-#: actions/apitimelineuser.php:311
+#: actions/apitimelineuser.php:322
 msgid "Atom post must not be empty."
 msgstr ""
 
 #. TRANS: Client error displayed attempting to post an API that is not well-formed XML.
-#: actions/apitimelineuser.php:317
+#: actions/apitimelineuser.php:328
 msgid "Atom post must be well-formed XML."
 msgstr ""
 
 #. TRANS: Client error displayed when not using an Atom entry.
-#: actions/apitimelineuser.php:323 actions/atompubfavoritefeed.php:228
+#: actions/apitimelineuser.php:334 actions/atompubfavoritefeed.php:228
 #: actions/atompubmembershipfeed.php:230
 #: actions/atompubsubscriptionfeed.php:236
 msgid "Atom post must be an Atom entry."
 msgstr ""
 
 #. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
-#: actions/apitimelineuser.php:335
+#: actions/apitimelineuser.php:345
 msgid "Can only handle POST activities."
 msgstr ""
 
 #. TRANS: Client error displayed when using an unsupported activity object type.
 #. TRANS: %s is the unsupported activity object type.
-#: actions/apitimelineuser.php:346
+#: actions/apitimelineuser.php:356
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
 #. TRANS: %d is the notice ID (number).
-#: actions/apitimelineuser.php:380
+#: actions/apitimelineuser.php:390
 #, fuzzy, php-format
 msgid "No content for notice %d."
 msgstr "Eğer lisansı kabul etmezseniz kayıt olamazsınız."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:408
+#. TRANS: %s is the notice URI.
+#: actions/apitimelineuser.php:419
 #, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr ""
@@ -1255,9 +1313,10 @@ msgstr "Onay kodu bulunamadı."
 
 #. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
 #. TRANS: Client exception.
+#. TRANS: Client error displayed trying to subscribe to a non-existing profile.
 #: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
 #: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
-#: actions/subscribe.php:107
+#: actions/subscribe.php:110
 #, fuzzy
 msgid "No such profile."
 msgstr "Böyle bir durum mesajı yok."
@@ -1405,7 +1464,7 @@ msgid "Not a member."
 msgstr "Tüm üyeler"
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
-#: actions/atompubshowmembership.php:151
+#: actions/atompubshowmembership.php:150
 #, fuzzy
 msgid "Cannot delete someone else's membership."
 msgstr "Yeni abonelik eklenemedi."
@@ -1494,10 +1553,7 @@ msgid "Invalid size."
 msgstr "Geçersiz büyüklük."
 
 #. TRANS: Title for avatar upload page.
-#. TRANS: Label for group avatar (dt). Text hidden by default.
-#. TRANS: Link description in user account settings menu.
-#: actions/avatarsettings.php:66 actions/showgroup.php:227
-#: lib/accountsettingsaction.php:113
+#: actions/avatarsettings.php:66 lib/settingsnav.php:82
 msgid "Avatar"
 msgstr "Avatar"
 
@@ -1511,9 +1567,11 @@ msgstr ""
 
 #. TRANS: Server error displayed in avatar upload page when no matching profile can be found for a user.
 #. TRANS: Server error displayed coming across a request from a user without a profile.
+#. TRANS: Server error displayed when trying to authorise a remote subscription request
+#. TRANS: while the user has no profile.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
 #: actions/grouplogo.php:184 actions/remotesubscribe.php:190
-#: actions/userauthorization.php:72 actions/userrss.php:108
+#: actions/userauthorization.php:75 actions/userrss.php:108
 #, fuzzy
 msgid "User without matching profile."
 msgstr "Kullanıcının profili yok."
@@ -1570,10 +1628,10 @@ msgstr "Kırp"
 msgid "No file uploaded."
 msgstr "Hiçbir dosya yüklenmedi."
 
-#. TRANS: Avatar upload form unstruction after uploading a file.
+#. TRANS: Avatar upload form instruction after uploading a file.
 #: actions/avatarsettings.php:345
 #, fuzzy
-msgid "Pick a square area of the image to be your avatar"
+msgid "Pick a square area of the image to be your avatar."
 msgstr "Resimden kullanıcı resminiz olacak bir kare alanı seçin"
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
@@ -1599,7 +1657,7 @@ msgstr "Kullanıcı resmi silindi."
 
 #. TRANS: Title for backup account page.
 #. TRANS: Option in profile settings to create a backup of the account of the currently logged in user.
-#: actions/backupaccount.php:61 actions/profilesettings.php:467
+#: actions/backupaccount.php:61 actions/profilesettings.php:468
 msgid "Backup account"
 msgstr ""
 
@@ -1632,7 +1690,7 @@ msgstr "Arkaplan"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
 #: actions/backupaccount.php:254
-msgid "Backup your account"
+msgid "Backup your account."
 msgstr ""
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
@@ -1675,7 +1733,7 @@ msgstr "Hayır"
 #. TRANS: Submit button title for 'No' when blocking a user.
 #: actions/block.php:158
 #, fuzzy
-msgid "Do not block this user"
+msgid "Do not block this user."
 msgstr "Bu kullanıcıyı engelleme"
 
 #. TRANS: Button label on the user block form.
@@ -1692,9 +1750,9 @@ msgid "Yes"
 msgstr "Evet"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#. TRANS: Description of the form to block a user.
-#: actions/block.php:165 lib/blockform.php:79
-msgid "Block this user"
+#: actions/block.php:165
+#, fuzzy
+msgid "Block this user."
 msgstr "Bu kullanıcıyı engelle"
 
 #. TRANS: Server error displayed when blocking a user fails.
@@ -1761,32 +1819,48 @@ msgstr "Onay kodu bulunamadı."
 msgid "That confirmation code is not for you!"
 msgstr "O onay kodu sizin için değil!"
 
-#. TRANS: Server error for a unknow address type %s, which can be 'email', 'jabber', or 'sms'.
-#: actions/confirmaddress.php:92
-#, php-format
-msgid "Unrecognized address type %s."
+#. TRANS: Server error for an unknown address type, which can be 'email', 'sms', or the name of an IM network (such as 'xmpp' or 'aim')
+#: actions/confirmaddress.php:94
+#, fuzzy, php-format
+msgid "Unrecognized address type %s"
 msgstr "Tanınmayan adres türü %s."
 
 #. TRANS: Client error for an already confirmed email/jabber/sms address.
-#: actions/confirmaddress.php:97
+#: actions/confirmaddress.php:103 actions/confirmaddress.php:136
 msgid "That address has already been confirmed."
 msgstr "O adres daha önce onaylanmış."
 
+#: actions/confirmaddress.php:121 actions/imsettings.php:444
+#: actions/userdesignsettings.php:306
+#, fuzzy
+msgid "Couldn't update user."
+msgstr "Kullanıcı güncellenemedi."
+
+#: actions/confirmaddress.php:144
+#, fuzzy
+msgid "Couldn't update user im preferences."
+msgstr "Kullanıcı kayıtları güncellenemedi."
+
+#: actions/confirmaddress.php:156
+#, fuzzy
+msgid "Couldn't insert user im preferences."
+msgstr "Yeni abonelik eklenemedi."
+
 #. TRANS: Server error displayed when an address confirmation code deletion from the
 #. TRANS: database fails in the contact address confirmation action.
-#: actions/confirmaddress.php:132
+#: actions/confirmaddress.php:169
 #, fuzzy
 msgid "Could not delete address confirmation."
 msgstr "Eposta onayı silinemedi."
 
 #. TRANS: Title for the contact address confirmation action.
-#: actions/confirmaddress.php:150
+#: actions/confirmaddress.php:185
 msgid "Confirm address"
 msgstr "Onayla"
 
 #. TRANS: Success message for the contact address confirmation action.
 #. TRANS: %s can be 'email', 'jabber', or 'sms'.
-#: actions/confirmaddress.php:166
+#: actions/confirmaddress.php:200
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "\"%s\" adresi hesabınız için onaylandı."
@@ -1800,6 +1874,7 @@ msgstr "Konuşma"
 #. TRANS: Label for user statistics.
 #: actions/conversation.php:149 lib/noticelist.php:87
 #: lib/profileaction.php:246 lib/searchgroupnav.php:82
+#: lib/threadednoticelist.php:66
 msgid "Notices"
 msgstr "Durum mesajları"
 
@@ -1834,7 +1909,7 @@ msgstr "Kullanıcı resmi silindi."
 
 #. TRANS: Page title for page on which a user account can be deleted.
 #. TRANS: Option in profile settings to delete the account of the currently logged in user.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:475
+#: actions/deleteaccount.php:228 actions/profilesettings.php:476
 #, fuzzy
 msgid "Delete account"
 msgstr "Bir hesap oluştur"
@@ -1858,7 +1933,7 @@ msgstr ""
 #. TRANS: Field label for delete account confirmation entry.
 #. TRANS: Field label for password reset form where the password has to be typed again.
 #: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:262 actions/register.php:440
+#: actions/recoverpassword.php:262 actions/register.php:419
 msgid "Confirm"
 msgstr "Onayla"
 
@@ -1888,14 +1963,14 @@ msgstr "Onay kodu bulunamadı."
 #. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
 #: actions/deleteapplication.php:79 actions/editapplication.php:78
-#: actions/showapplication.php:94
+#: actions/showapplication.php:90
 msgid "You are not the owner of this application."
 msgstr "Bu uygulamanın sahibi değilsiniz."
 
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
-#: actions/newapplication.php:112 actions/showapplication.php:118
-#: lib/action.php:1425
+#: actions/newapplication.php:112 actions/showapplication.php:113
+#: lib/action.php:1391
 msgid "There was a problem with your session token."
 msgstr ""
 
@@ -1919,13 +1994,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting an application.
 #: actions/deleteapplication.php:161
 #, fuzzy
-msgid "Do not delete this application"
+msgid "Do not delete this application."
 msgstr "Bu uygulamayı silme"
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
 #: actions/deleteapplication.php:167
 #, fuzzy
-msgid "Delete this application"
+msgid "Delete this application."
 msgstr "Bu uygulamayı sil"
 
 #. TRANS: Client error when trying to delete group while not logged in.
@@ -1984,13 +2059,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting a group.
 #: actions/deletegroup.php:224
 #, fuzzy
-msgid "Do not delete this group"
+msgid "Do not delete this group."
 msgstr "Bu durum mesajını silme"
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
 #: actions/deletegroup.php:231
 #, fuzzy
-msgid "Delete this group"
+msgid "Delete this group."
 msgstr "Bu kullanıcıyı sil"
 
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
@@ -1998,14 +2073,16 @@ msgstr "Bu kullanıcıyı sil"
 #. TRANS: Client error displayed when trying to mark a notice as favorite without being logged in.
 #. TRANS: Client error displayed trying to block a user from a group while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
+#. TRANS: Client error displayed trying to log out when not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
+#. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
 #. TRANS: Client error displayed when trying to change user options while not logged in.
 #: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
-#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:69
+#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:70
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
-#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
-#: actions/tagother.php:33 actions/unsubscribe.php:52
+#: actions/nudge.php:63 actions/pluginenable.php:97 actions/subedit.php:33
+#: actions/subscribe.php:98 actions/tagother.php:33 actions/unsubscribe.php:52
 #: lib/adminpanelaction.php:71 lib/profileformaction.php:63
 #: lib/settingsaction.php:72
 msgid "Not logged in."
@@ -2034,12 +2111,13 @@ msgstr "Bu durum mesajını silmek istediğinizden emin misiniz?"
 #. TRANS: Submit button title for 'No' when deleting a notice.
 #: actions/deletenotice.php:159
 #, fuzzy
-msgid "Do not delete this notice"
+msgid "Do not delete this notice."
 msgstr "Bu durum mesajını silme"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:166 lib/noticelist.php:673
-msgid "Delete this notice"
+#: actions/deletenotice.php:166
+#, fuzzy
+msgid "Delete this notice."
 msgstr "Bu durum mesajını sil"
 
 #. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
@@ -2076,18 +2154,17 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting a user.
 #: actions/deleteuser.php:158
 #, fuzzy
-msgid "Do not delete this user"
+msgid "Do not delete this user."
 msgstr "Bu durum mesajını silme"
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
-#. TRANS: Description of form for deleting a user.
-#: actions/deleteuser.php:165 lib/deleteuserform.php:75
-msgid "Delete this user"
+#: actions/deleteuser.php:165
+#, fuzzy
+msgid "Delete this user."
 msgstr "Bu kullanıcıyı sil"
 
 #. TRANS: Message used as title for design settings for the site.
-#. TRANS: Link description in user account settings menu.
-#: actions/designadminpanel.php:60 lib/accountsettingsaction.php:134
+#: actions/designadminpanel.php:60 lib/settingsnav.php:97
 msgid "Design"
 msgstr "Dizayn"
 
@@ -2155,8 +2232,7 @@ msgid "You can upload a custom StatusNet theme as a .ZIP archive."
 msgstr "Özel bir StatusNet temasını .ZIP arşivi olarak yükleyebilirsiniz."
 
 #. TRANS: Fieldset legend for theme background image.
-#. TRANS: Fieldset legend on profile design page.
-#: actions/designadminpanel.php:515 lib/designsettings.php:98
+#: actions/designadminpanel.php:515
 msgid "Change background image"
 msgstr "Arkaplan resmini değiştir"
 
@@ -2164,7 +2240,7 @@ msgstr "Arkaplan resmini değiştir"
 #. TRANS: Field label for background color selector.
 #. TRANS: Label on profile design page for setting a profile page background colour.
 #: actions/designadminpanel.php:525 actions/designadminpanel.php:609
-#: lib/designsettings.php:183
+#: lib/designform.php:238
 msgid "Background"
 msgstr "Arkaplan"
 
@@ -2191,13 +2267,13 @@ msgstr "Kapalı"
 #. TRANS: Form guide for turning background image on or off on theme designer page.
 #. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
 #. TRANS: use of the uploaded profile image.
-#: actions/designadminpanel.php:577 lib/designsettings.php:159
+#: actions/designadminpanel.php:577 lib/designform.php:214
 msgid "Turn background image on or off."
 msgstr "Arkaplan resmini açın ya da kapatın."
 
 #. TRANS: Checkbox label to title background image on theme designer page.
 #. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-#: actions/designadminpanel.php:583 lib/designsettings.php:165
+#: actions/designadminpanel.php:583 lib/designform.php:220
 msgid "Tile background image"
 msgstr "Arkaplan resmini döşe"
 
@@ -2209,25 +2285,25 @@ msgstr "Renkleri değiştir"
 
 #. TRANS: Field label for content color selector.
 #. TRANS: Label on profile design page for setting a profile page content colour.
-#: actions/designadminpanel.php:623 lib/designsettings.php:197
+#: actions/designadminpanel.php:623 lib/designform.php:252
 msgid "Content"
 msgstr "İçerik"
 
 #. TRANS: Field label for sidebar color selector.
 #. TRANS: Label on profile design page for setting a profile page sidebar colour.
-#: actions/designadminpanel.php:637 lib/designsettings.php:211
+#: actions/designadminpanel.php:637 lib/designform.php:266
 msgid "Sidebar"
 msgstr "Kenar Çubuğu"
 
 #. TRANS: Field label for text color selector.
 #. TRANS: Label on profile design page for setting a profile page text colour.
-#: actions/designadminpanel.php:651 lib/designsettings.php:225
+#: actions/designadminpanel.php:651 lib/designform.php:280
 msgid "Text"
 msgstr "Metin"
 
 #. TRANS: Field label for link color selector.
 #. TRANS: Label on profile design page for setting a profile page links colour.
-#: actions/designadminpanel.php:665 lib/designsettings.php:239
+#: actions/designadminpanel.php:665 lib/designform.php:294
 msgid "Links"
 msgstr "Bağlantılar"
 
@@ -2249,21 +2325,21 @@ msgid "Use defaults"
 msgstr "Öntanımlıları kullan"
 
 #. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: actions/designadminpanel.php:720 lib/designsettings.php:259
-msgid "Restore default designs"
-msgstr ""
+#: actions/designadminpanel.php:720
+#, fuzzy
+msgid "Restore default designs."
+msgstr "Öntanımlıları kullan"
 
 #. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: actions/designadminpanel.php:728 lib/designsettings.php:267
-msgid "Reset back to default"
+#: actions/designadminpanel.php:728
+#, fuzzy
+msgid "Reset back to default."
 msgstr "Öntanımlıya geri dön"
 
 #. TRANS: Title for button for saving theme settings.
-#. TRANS: Title for button on profile design page to save settings.
-#: actions/designadminpanel.php:736 lib/designsettings.php:272
-msgid "Save design"
+#: actions/designadminpanel.php:736
+#, fuzzy
+msgid "Save design."
 msgstr "Dizaynı kaydet"
 
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
@@ -2295,7 +2371,7 @@ msgid "You must be logged in to edit an application."
 msgstr "Bir uygulamayı düzenlemek için giriş yapmış olmanız gerekir."
 
 #. TRANS: Client error displayed trying to edit an application that does not exist.
-#: actions/editapplication.php:83 actions/showapplication.php:87
+#: actions/editapplication.php:83 actions/showapplication.php:83
 msgid "No such application."
 msgstr "Böyle bir uygulama yok."
 
@@ -2388,80 +2464,53 @@ msgstr "%s grubunu düzenle"
 msgid "You must be logged in to create a group."
 msgstr "Bir grup oluşturmak için giriş yapmış olmanız gerekir."
 
-#. TRANS: Client error displayed trying to edit a group while not being a group admin.
-#. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
-#. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
-#: actions/editgroup.php:110 actions/editgroup.php:176
-#: actions/groupdesignsettings.php:109 actions/grouplogo.php:111
-msgid "You must be an admin to edit the group."
-msgstr "Bir grubu düzenlemek için bir yönetici olmalısınız."
-
 #. TRANS: Form instructions for group edit form.
 #: actions/editgroup.php:161
 msgid "Use this form to edit the group."
 msgstr "Grubu düzenlemek için bu biçimi kullan."
 
-#. TRANS: Group edit form validation error.
-#. TRANS: Group create form validation error.
-#. TRANS: %s is the invalid alias.
-#: actions/editgroup.php:241 actions/newgroup.php:188
-#, fuzzy, php-format
-msgid "Invalid alias: \"%s\""
-msgstr "%s Geçersiz başlangıç sayfası"
-
-#. TRANS: Server error displayed when editing a group fails.
-#: actions/editgroup.php:274
-msgid "Could not update group."
-msgstr "Grup güncellenemedi."
-
-#. TRANS: Server error displayed when group aliases could not be added.
-#. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/editgroup.php:281 classes/User_group.php:540
-msgid "Could not create aliases."
-msgstr "Kullanıcı güncellenemedi."
-
 #. TRANS: Group edit form success message.
 #: actions/editgroup.php:301
 msgid "Options saved."
 msgstr "Seçenekler kaydedildi."
 
 #. TRANS: Title for e-mail settings.
-#: actions/emailsettings.php:59
+#: actions/emailsettings.php:60
 msgid "Email settings"
 msgstr "E-posta ayarları"
 
 #. TRANS: E-mail settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/emailsettings.php:73
+#: actions/emailsettings.php:74
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 msgstr "%%site.name%%'dan nasıl e-posta alacağınızı yönetin."
 
 #. TRANS: Form legend for e-mail settings form.
 #. TRANS: Field label for e-mail address input in e-mail settings form.
-#: actions/emailsettings.php:103 actions/emailsettings.php:129
+#: actions/emailsettings.php:104 actions/emailsettings.php:130
 msgid "Email address"
 msgstr "E-posta adresi"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:109
+#: actions/emailsettings.php:110
 msgid "Current confirmed email address."
 msgstr "Mevcut doğrulanmış e-posta adresi."
 
 #. TRANS: Button label to remove a confirmed e-mail address.
 #. TRANS: Button label for removing a set sender e-mail address to post notices from.
-#. TRANS: Button label to remove a confirmed Instant Messaging address.
+#. TRANS: Button label to remove a confirmed IM address.
 #. TRANS: Button label to remove a confirmed SMS address.
 #. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
-#: actions/emailsettings.php:112 actions/emailsettings.php:179
-#: actions/imsettings.php:112 actions/smssettings.php:120
-#: actions/smssettings.php:176
+#: actions/emailsettings.php:113 actions/emailsettings.php:180
+#: actions/imsettings.php:119 actions/smssettings.php:119
+#: actions/smssettings.php:175
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Geri al"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:119
+#: actions/emailsettings.php:120
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -2474,46 +2523,46 @@ msgstr ""
 #. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
 #. TRANS: Any other domain may be owned by a legitimate person or
 #. TRANS: organization.
-#: actions/emailsettings.php:136
+#: actions/emailsettings.php:137
 msgid "Email address, like \"UserName@example.org\""
 msgstr "\"kullanıcıadı@örnek.org\" benzeri bir e-posta adresi."
 
 #. TRANS: Button label for adding an e-mail address in e-mail settings form.
-#. TRANS: Button label for adding an Instant Messaging address in Instant Messaging settings form.
+#. TRANS: Button label for adding an IM address in IM settings form.
 #. TRANS: Button label for adding a SMS phone number in SMS settings form.
-#: actions/emailsettings.php:140 actions/imsettings.php:147
-#: actions/smssettings.php:158
+#: actions/emailsettings.php:141 actions/imsettings.php:147
+#: actions/smssettings.php:157
 msgctxt "BUTTON"
 msgid "Add"
 msgstr "Ekle"
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:148 actions/smssettings.php:167
+#: actions/emailsettings.php:149 actions/smssettings.php:166
 msgid "Incoming email"
 msgstr "Gelen e-posta"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:154
+#: actions/emailsettings.php:155
 msgid "I want to post notices by email."
 msgstr ""
 
 #. TRANS: Form instructions for incoming e-mail form in e-mail settings.
 #. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
-#: actions/emailsettings.php:176 actions/smssettings.php:174
+#: actions/emailsettings.php:177 actions/smssettings.php:173
 msgid "Send email to this address to post new notices."
 msgstr "Yeni durum mesajları göndermek için bu adrese e-posta atın."
 
 #. TRANS: Instructions for incoming e-mail address input form, when an address has already been assigned.
 #. TRANS: Instructions for incoming SMS e-mail address input form.
-#: actions/emailsettings.php:185 actions/smssettings.php:182
+#: actions/emailsettings.php:186 actions/smssettings.php:181
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr ""
 "Gönderim yapmak için yeni bir e-posta adresi oluşturun; eskisi iptal "
 "olacaktır."
 
 #. TRANS: Instructions for incoming e-mail address input form.
-#: actions/emailsettings.php:189
+#: actions/emailsettings.php:190
 msgid ""
 "To send notices via email, we need to create a unique email address for you "
 "on this server:"
@@ -2521,79 +2570,79 @@ msgstr ""
 
 #. TRANS: Button label for adding an e-mail address to send notices from.
 #. TRANS: Button label for adding an SMS e-mail address to send notices from.
-#: actions/emailsettings.php:195 actions/smssettings.php:185
+#: actions/emailsettings.php:196 actions/smssettings.php:184
 msgctxt "BUTTON"
 msgid "New"
 msgstr "Yeni"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:204
+#: actions/emailsettings.php:205
 msgid "Email preferences"
 msgstr "E-posta tercihleri"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:212
+#: actions/emailsettings.php:213
 #, fuzzy
 msgid "Send me notices of new subscriptions through email."
 msgstr "Durum mesajlarını Jabber/GTalk üzerinden gönder."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:218
+#: actions/emailsettings.php:219
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr ""
 "Biri benim durum mesajımı favori olarak eklediğinde bana e-posta gönder."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:225
+#: actions/emailsettings.php:226
 msgid "Send me email when someone sends me a private message."
 msgstr "Birisi bana özel mesaj attığında bana e-posta gönder."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:231
+#: actions/emailsettings.php:232
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:237
+#: actions/emailsettings.php:238
 msgid "Allow friends to nudge me and send me an email."
 msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:243
+#: actions/emailsettings.php:244
 #, fuzzy
 msgid "Publish a MicroID for my email address."
 msgstr "Bir takma ad veya eposta adresi girin."
 
 #. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:361
+#: actions/emailsettings.php:362
 msgid "Email preferences saved."
 msgstr "E-posta tercihleri kaydedildi."
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:380
+#: actions/emailsettings.php:381
 #, fuzzy
 msgid "No email address."
 msgstr "Geçersiz bir eposta adresi."
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:388
+#: actions/emailsettings.php:389
 #, fuzzy
 msgid "Cannot normalize that email address."
 msgstr "Jabber işlemlerinde bir hata oluştu."
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:393 actions/register.php:212
+#: actions/emailsettings.php:394 actions/register.php:197
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "Geçersiz bir eposta adresi."
 
 #. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:397
+#: actions/emailsettings.php:398
 msgid "That is already your email address."
 msgstr "Bu zaten sizin e-posta adresiniz."
 
 #. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:401
+#: actions/emailsettings.php:402
 #, fuzzy
 msgid "That email address already belongs to another user."
 msgstr "Jabber ID başka bir kullanıcıya ait."
@@ -2601,14 +2650,14 @@ msgstr "Jabber ID başka bir kullanıcıya ait."
 #. TRANS: Server error thrown on database error adding e-mail confirmation code.
 #. TRANS: Server error thrown on database error adding Instant Messaging confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:418 actions/imsettings.php:343
-#: actions/smssettings.php:365
+#: actions/emailsettings.php:419 actions/imsettings.php:362
+#: actions/smssettings.php:364
 #, fuzzy
 msgid "Could not insert confirmation code."
 msgstr "Onay kodu eklenemedi."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:425
+#: actions/emailsettings.php:426
 #, fuzzy
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
@@ -2620,60 +2669,63 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling Instant Messaging address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:445 actions/imsettings.php:377
-#: actions/smssettings.php:399
+#: actions/emailsettings.php:446 actions/imsettings.php:391
+#: actions/smssettings.php:398
 msgid "No pending confirmation to cancel."
 msgstr "İptal etmek için beklenen onay yok."
 
 #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:450
+#: actions/emailsettings.php:451
 msgid "That is the wrong email address."
 msgstr "Bu yanlış e-posta adresi."
 
 #. TRANS: Server error thrown on database error canceling e-mail address confirmation.
 #. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
-#: actions/emailsettings.php:459 actions/smssettings.php:413
+#: actions/emailsettings.php:460 actions/smssettings.php:412
 #, fuzzy
 msgid "Could not delete email confirmation."
 msgstr "Eposta onayı silinemedi."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:464
+#: actions/emailsettings.php:465
 msgid "Email confirmation cancelled."
 msgstr "İptal etmek için beklenen onay yok."
 
 #. TRANS: Message given trying to remove an e-mail address that is not
 #. TRANS: registered for the active user.
-#: actions/emailsettings.php:483
+#: actions/emailsettings.php:484
 msgid "That is not your email address."
 msgstr "Bu sizin e-posta adresiniz değil."
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:504
+#: actions/emailsettings.php:505
 msgid "The email address was removed."
 msgstr "Eposta adresi zaten var."
 
 #. TRANS: Form validation error displayed when trying to remove an incoming e-mail address while no address has been set.
-#: actions/emailsettings.php:518 actions/smssettings.php:555
+#: actions/emailsettings.php:519 actions/smssettings.php:554
 #, fuzzy
 msgid "No incoming email address."
 msgstr "Geçersiz bir eposta adresi."
 
 #. TRANS: Server error thrown on database error removing incoming e-mail address.
 #. TRANS: Server error thrown on database error adding incoming e-mail address.
-#: actions/emailsettings.php:530 actions/emailsettings.php:554
-#: actions/smssettings.php:565 actions/smssettings.php:588
+#. TRANS: Server error displayed when the user could not be updated in SMS settings.
+#: actions/emailsettings.php:531 actions/emailsettings.php:555
+#: actions/smssettings.php:565 actions/smssettings.php:590
 #, fuzzy
 msgid "Could not update user record."
 msgstr "Kullanıcı kayıtları güncellenemedi."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:534 actions/smssettings.php:568
+#. TRANS: Confirmation text after updating SMS settings.
+#: actions/emailsettings.php:535 actions/smssettings.php:569
 msgid "Incoming email address removed."
 msgstr "Gelen e-posta adresi silindi."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:558 actions/smssettings.php:591
+#. TRANS: Confirmation text after updating SMS settings.
+#: actions/emailsettings.php:559 actions/smssettings.php:594
 msgid "New incoming email address added."
 msgstr "Yeni gelen e-posta adresi eklendi."
 
@@ -2685,7 +2737,7 @@ msgstr "Bu durum mesajı zaten bir favori!"
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
 #: actions/favor.php:95
 #, fuzzy
-msgid "Disfavor favorite"
+msgid "Disfavor favorite."
 msgstr "Favoriliğini kaldır"
 
 #. TRANS: Page title for first page of favorited notices.
@@ -2734,9 +2786,8 @@ msgstr ""
 #. TRANS: %s is a user's nickname.
 #. TRANS: Title for first page of favourite notices of a user.
 #. TRANS: %s is the user for whom the favourite notices are displayed.
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing own favourited notices.
 #: actions/favoritesrss.php:111 actions/showfavorites.php:76
-#: lib/personalgroupnav.php:122
+#: lib/personalgroupnav.php:110
 #, php-format
 msgid "%s's favorite notices"
 msgstr "%s kullanıcısının favori durum mesajları"
@@ -2925,13 +2976,13 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
 #: actions/groupblock.php:191
 #, fuzzy
-msgid "Do not block this user from this group"
+msgid "Do not block this user from this group."
 msgstr "Bu kullanıcıyı bu gruptan engellemeyin"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
 #: actions/groupblock.php:198
 #, fuzzy
-msgid "Block this user from this group"
+msgid "Block this user from this group."
 msgstr "Bu kullanıcıyı bu gruptan engelleyin"
 
 #. TRANS: Server error displayed when trying to block a user from a group fails because of an application error.
@@ -2940,6 +2991,7 @@ msgid "Database error blocking user from group."
 msgstr ""
 
 #. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
+#. TRANS: Client error displayed trying to find a user by ID without providing an ID.
 #: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr "JabberID yok."
@@ -2968,7 +3020,7 @@ msgid "Unable to update your design settings."
 msgstr "Dizayn ayarlarınız kaydedilemedi."
 
 #. TRANS: Form text to confirm saved group design settings.
-#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:222
+#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:239
 #, fuzzy
 msgid "Design preferences saved."
 msgstr "Tercihler kaydedildi."
@@ -3035,7 +3087,7 @@ msgid "A list of the users in this group."
 msgstr "Bu gruptaki kullanıcıların listesi."
 
 #. TRANS: Indicator in group members list that this user is a group administrator.
-#: actions/groupmembers.php:190
+#: actions/groupmembers.php:190 lib/action.php:581
 msgid "Admin"
 msgstr "Yönetici"
 
@@ -3124,8 +3176,10 @@ msgid "Group search"
 msgstr "Grup arama"
 
 #. TRANS: Text on page where groups can be searched if no results were found for a query.
-#: actions/groupsearch.php:82 actions/noticesearch.php:117
-#: actions/peoplesearch.php:83
+#. TRANS: Text for notice search results is the query had no results.
+#. TRANS: Message on the "People search" page where a query has no results.
+#: actions/groupsearch.php:82 actions/noticesearch.php:122
+#: actions/peoplesearch.php:87
 msgid "No results."
 msgstr "Sonuç yok."
 
@@ -3158,166 +3212,169 @@ msgid "User is not blocked from group."
 msgstr "Kullanıcı gruptan engellenmedi."
 
 #. TRANS: Server error displayed when unblocking a user from a group fails because of an unknown error.
+#. TRANS: Server error displayed when removing a user block.
 #: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "Engellemeyi kaldırırken hata."
 
 #. TRANS: Title for Instant Messaging settings.
-#: actions/imsettings.php:58
+#: actions/imsettings.php:56
 msgid "IM settings"
 msgstr "Profil ayarları"
 
 #. 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.
-#: actions/imsettings.php:71
+#: actions/imsettings.php:69
 #, fuzzy, php-format
 msgid ""
-"You can send and receive notices through Jabber/Google Talk [instant "
-"messages](%%doc.im%%). Configure your address and settings below."
+"You can send and receive notices through instant messaging [instant messages]"
+"(%%doc.im%%). Configure your addresses and settings below."
 msgstr ""
 "Jabber/GTalk kullanarak durum mesaji gÖnderip alabilirsiniz. IM adres "
 "ayarlarinizi aşağıda yapın."
 
-#. TRANS: Message given in the Instant Messaging settings if XMPP is not enabled on the site.
+#. TRANS: Message given in the IM settings if IM is not enabled on the site.
 #: actions/imsettings.php:90
 msgid "IM is not available."
 msgstr "Anlık mesajlaşma mevcut değil."
 
-#. TRANS: Form legend for Instant Messaging settings form.
-#. TRANS: Field label for Instant Messaging address input in Instant Messaging settings form.
-#: actions/imsettings.php:102 actions/imsettings.php:132
-msgid "IM address"
-msgstr "Anlık mesajlaşma adresi"
+#: actions/imsettings.php:116
+#, fuzzy, php-format
+msgid "Current confirmed %s address."
+msgstr "Mevcut doğrulanmış e-posta adresi."
 
-#: actions/imsettings.php:109
-#, fuzzy
-msgid "Current confirmed Jabber/Google Talk address."
-msgstr "Onaylanmış Jabber/Gtalk adresi."
-
-#. TRANS: Form note in Instant Messaging settings form.
-#. TRANS: %s is the Instant Messaging address set for the site.
-#: actions/imsettings.php:120
+#. TRANS: Form note in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:128
 #, fuzzy, php-format
 msgid ""
-"Awaiting confirmation on this address. Check your Jabber/Google Talk account "
-"for a message with further instructions. (Did you add %s to your buddy list?)"
+"Awaiting confirmation on this address. Check your %s account for a message "
+"with further instructions. (Did you add %s to your buddy list?)"
 msgstr ""
 "Bu adresten onay bekleniyor. Jabber/Google Talk hesabınızı ayrıntılı bilgi "
 "içeren mesajı almak için kontrol edin. (%s'u arkadaş listenize eklediniz mi?)"
 
-#. TRANS: IM address input field instructions in Instant Messaging settings form.
-#. TRANS: %s is the Instant Messaging address set for the site.
-#. TRANS: Do not translate "example.org". It is one of the domain names reserved for use in examples by
-#. TRANS: http://www.rfc-editor.org/rfc/rfc2606.txt. Any other domain may be owned by a legitimate
-#. TRANS: person or organization.
-#: actions/imsettings.php:139
-#, fuzzy, php-format
-msgid ""
-"Jabber or Google Talk address, like \"UserName@example.org\". First, make "
-"sure to add %s to your buddy list in your IM client or on Google Talk."
-msgstr ""
-"Jabber veya Gtalk adresi: \"KullaniciAdi@example.org\" gibi. Öncelikle %s, "
-"IM istemcisi veya Gtalk arkadaşlar listenize eklenmiş olmalıdır."
+#: actions/imsettings.php:140
+msgid "IM address"
+msgstr "Anlık mesajlaşma adresi"
 
-#. TRANS: Form legend for Instant Messaging preferences form.
-#: actions/imsettings.php:154
-msgid "IM preferences"
+#: actions/imsettings.php:142
+#, php-format
+msgid "%s screenname."
+msgstr ""
+
+#. TRANS: Header for IM preferences form.
+#: actions/imsettings.php:163
+#, fuzzy
+msgid "IM Preferences"
 msgstr "Tercihler kaydedildi."
 
-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:159
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:174
 #, fuzzy
-msgid "Send me notices through Jabber/Google Talk."
-msgstr "Durum mesajlarını Jabber/GTalk üzerinden gönder."
+msgid "Send me notices"
+msgstr "Yeni durum mesajı"
 
-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:165
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:176
 #, fuzzy
-msgid "Post a notice when my Jabber/Google Talk status changes."
+msgid "Post a notice when my status changes."
 msgstr ""
 "Jabber/GTalk durum mesajim değiştiğinde nedurum.com'da durumumu güncelle"
 
-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:171
-#, fuzzy
-msgid ""
-"Send me replies through Jabber/Google Talk from people I'm not subscribed to."
-msgstr "Durum mesajlarını Jabber/GTalk üzerinden gönder."
-
-#. TRANS: Checkbox label in Instant Messaging preferences form.
+#. TRANS: Checkbox label in IM preferences form.
 #: actions/imsettings.php:178
 #, fuzzy
-msgid "Publish a MicroID for my Jabber/Google Talk address."
-msgstr "Onaylanmış Jabber/Gtalk adresi."
+msgid "Send me replies from people I'm not subscribed to."
+msgstr "Durum mesajlarını Jabber/GTalk üzerinden gönder."
 
-#. TRANS: Confirmation message for successful Instant Messaging preferences save.
-#: actions/imsettings.php:283 actions/othersettings.php:192
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:181
+#, fuzzy
+msgid "Publish a MicroID"
+msgstr "Bir takma ad veya eposta adresi girin."
+
+#. TRANS: Server error thrown on database error updating IM preferences.
+#: actions/imsettings.php:291
+#, fuzzy
+msgid "Couldn't update IM preferences."
+msgstr "Kullanıcı güncellenemedi."
+
+#. TRANS: Confirmation message for successful IM preferences save.
+#. TRANS: Confirmation message after saving preferences.
+#: actions/imsettings.php:298 actions/urlsettings.php:244
 msgid "Preferences saved."
 msgstr "Tercihler kaydedildi."
 
-#. TRANS: Message given saving Instant Messaging address without having provided one.
-#: actions/imsettings.php:304
-msgid "No Jabber ID."
-msgstr "JabberID yok."
-
-#. TRANS: Message given saving Instant Messaging address that cannot be normalised.
-#: actions/imsettings.php:312
+#. TRANS: Message given saving IM address without having provided one.
+#: actions/imsettings.php:320
 #, fuzzy
-msgid "Cannot normalize that Jabber ID."
+msgid "No screenname."
+msgstr "Takma ad yok"
+
+#: actions/imsettings.php:325
+#, fuzzy
+msgid "No transport."
+msgstr "Böyle bir durum mesajı yok."
+
+#. TRANS: Message given saving IM address that cannot be normalised.
+#: actions/imsettings.php:333
+#, fuzzy
+msgid "Cannot normalize that screenname"
 msgstr "Jabber işlemlerinde bir hata oluştu."
 
-#. TRANS: Message given saving Instant Messaging address that not valid.
-#: actions/imsettings.php:317
+#. TRANS: Message given saving IM address that not valid.
+#: actions/imsettings.php:340
 #, fuzzy
-msgid "Not a valid Jabber ID."
-msgstr "Geçersiz bir Jabber ID"
+msgid "Not a valid screenname"
+msgstr "Geçersiz bir takma ad."
 
-#. TRANS: Message given saving Instant Messaging address that is already set.
-#: actions/imsettings.php:321
-msgid "That is already your Jabber ID."
-msgstr "Bu zaten sizin Jabber ID'niz."
-
-#. TRANS: Message given saving Instant Messaging address that is already set for another user.
-#: actions/imsettings.php:325
-msgid "Jabber ID already belongs to another user."
+#. TRANS: Message given saving IM address that is already set for another user.
+#: actions/imsettings.php:344
+#, fuzzy
+msgid "Screenname already belongs to another user."
 msgstr "Jabber ID başka bir kullanıcıya ait."
 
-#. TRANS: Message given saving valid Instant Messaging address that is to be confirmed.
-#. TRANS: %s is the Instant Messaging address set for the site.
-#: actions/imsettings.php:353
-#, php-format
-msgid ""
-"A confirmation code was sent to the IM address you added. You must approve %"
-"s for sending messages to you."
+#. TRANS: Message given saving valid IM address that is to be confirmed.
+#: actions/imsettings.php:369
+#, fuzzy
+msgid "A confirmation code was sent to the IM address you added."
 msgstr ""
 "Eklemiş olduğunuz IM adresine bir onay kodu gönderildi. %s tarafından size "
 "mesaj yollanabilmesi için onaylamanız gerekmektedir."
 
-#. TRANS: Message given canceling Instant Messaging address confirmation for the wrong IM address.
-#: actions/imsettings.php:382
+#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#: actions/imsettings.php:396
 msgid "That is the wrong IM address."
 msgstr "Yanlış IM adresi."
 
-#. TRANS: Server error thrown on database error canceling Instant Messaging address confirmation.
-#: actions/imsettings.php:391
+#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#: actions/imsettings.php:405
 #, fuzzy
-msgid "Could not delete IM confirmation."
+msgid "Couldn't delete confirmation."
 msgstr "Eposta onayı silinemedi."
 
-#. TRANS: Message given after successfully canceling Instant Messaging address confirmation.
-#: actions/imsettings.php:396
+#. TRANS: Message given after successfully canceling IM address confirmation.
+#: actions/imsettings.php:410
 msgid "IM confirmation cancelled."
 msgstr "Onay kodu yok."
 
-#. TRANS: Message given trying to remove an Instant Messaging address that is not
+#. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.
-#: actions/imsettings.php:417
-msgid "That is not your Jabber ID."
+#: actions/imsettings.php:434
+#, fuzzy
+msgid "That is not your screenname."
 msgstr "Bu sizin Jabber ID'niz değil."
 
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#: actions/imsettings.php:443
+#, fuzzy
+msgid "Couldn't update user im prefs."
+msgstr "Kullanıcı kayıtları güncellenemedi."
+
 #. TRANS: Message given after successfully removing a registered Instant Messaging address.
-#: actions/imsettings.php:440
+#: actions/imsettings.php:451
 #, fuzzy
 msgid "The IM address was removed."
 msgstr "Bu adres kaldırılmıştı."
@@ -3497,7 +3554,7 @@ msgid "You must be logged in to join a group."
 msgstr "Gruba katılmak için giriş yapmalısınız."
 
 #. TRANS: Title for join group page after joining.
-#: actions/joingroup.php:147
+#: actions/joingroup.php:148
 #, fuzzy, php-format
 msgctxt "TITLE"
 msgid "%1$s joined group %2$s"
@@ -3626,7 +3683,7 @@ msgstr "Lisansla birlikte gösterilecek bir resim için bağlantı."
 #. TRANS: Submit button title.
 #: actions/licenseadminpanel.php:311 actions/sessionsadminpanel.php:199
 #: actions/siteadminpanel.php:292 actions/snapshotadminpanel.php:245
-#: actions/tagother.php:154 lib/applicationeditform.php:357
+#: actions/tagother.php:133 lib/applicationeditform.php:357
 msgid "Save"
 msgstr "Kaydet"
 
@@ -3634,41 +3691,43 @@ msgstr "Kaydet"
 msgid "Save license settings"
 msgstr "Lisans ayarlarını kaydet"
 
-#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
+#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
+#: actions/login.php:97 actions/otp.php:62 actions/register.php:130
 msgid "Already logged in."
 msgstr "Zaten giriş yapılmış."
 
-#: actions/login.php:148
+#: actions/login.php:125
 msgid "Incorrect username or password."
 msgstr "Yanlış kullanıcı adı veya parola."
 
-#: actions/login.php:154 actions/otp.php:120
+#. TRANS: Server error displayed when a user object could not be created trying to login using "one time password login".
+#: actions/login.php:131 actions/otp.php:127
 #, fuzzy
 msgid "Error setting user. You are probably not authorized."
 msgstr "Yetkilendirilmemiş."
 
-#: actions/login.php:210 actions/login.php:263
+#: actions/login.php:185 actions/login.php:236 lib/action.php:598
 msgid "Login"
 msgstr "Giriş"
 
-#: actions/login.php:249
+#: actions/login.php:222
 msgid "Login to site"
 msgstr "Siteye giriş"
 
-#: actions/login.php:258 actions/register.php:490
+#: actions/login.php:231 actions/register.php:469
 msgid "Remember me"
 msgstr "Beni hatırla"
 
-#: actions/login.php:259 actions/register.php:492
+#: actions/login.php:232 actions/register.php:471
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 "Gelecekte kendiliğinden giriş yap, paylaşılan bilgisayarlar için değildir!"
 
-#: actions/login.php:269
+#: actions/login.php:241
 msgid "Lost or forgotten password?"
 msgstr "Parolamı unuttum veya kaybettim"
 
-#: actions/login.php:288
+#: actions/login.php:259
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -3676,11 +3735,11 @@ msgstr ""
 "Güvenliğiniz için, ayarlarınızı değiştirmeden önce lütfen kullanıcı adınızı "
 "ve parolanızı tekrar giriniz."
 
-#: actions/login.php:292
+#: actions/login.php:263
 msgid "Login with your username and password."
 msgstr "Yanlış kullanıcı adı veya parola."
 
-#: actions/login.php:295
+#: actions/login.php:266
 #, fuzzy, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -3811,7 +3870,9 @@ msgstr "Yeni durum mesajı"
 msgid "Notice posted"
 msgstr "Durum mesajı gönderildi"
 
-#: actions/noticesearch.php:68
+#. TRANS: Instructions for Notice search page.
+#. TRANS: %%site.name%% is the name of the StatusNet site.
+#: actions/noticesearch.php:69
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -3820,37 +3881,47 @@ msgstr ""
 "%%site.name%%'da durum mesajlarının içeriğinde arama yap. Anahtar kelimeleri "
 "boşluk ile ayırın. Anahtar kelime 3 veya daha fazla karakterden oluşmalı."
 
-#: actions/noticesearch.php:78
+#. TRANS: Title of the page where users can search for notices.
+#: actions/noticesearch.php:80
 msgid "Text search"
 msgstr "Metin arama"
 
-#: actions/noticesearch.php:91
+#. TRANS: Test in RSS notice search.
+#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
+#: actions/noticesearch.php:95
 #, php-format
 msgid "Search results for \"%1$s\" on %2$s"
 msgstr "%2$s üzerindeki \"%1$s\" için arama sonuçları"
 
-#: actions/noticesearch.php:121
+#. TRANS: Text for logged in users making a query for notices without results.
+#. TRANS: This message contains a Markdown link.
+#: actions/noticesearch.php:128
 #, php-format
 msgid ""
 "Be the first to [post on this topic](%%%%action.newnotice%%%%?"
 "status_textarea=%s)!"
 msgstr ""
 
-#: actions/noticesearch.php:124
+#. TRANS: Text for not logged in users making a query for notices without results.
+#. TRANS: This message contains Markdown links.
+#: actions/noticesearch.php:133
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and be the first to "
 "[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
 msgstr ""
 
-#: actions/noticesearchrss.php:96
+#. TRANS: RSS notice search feed title. %s is the query.
+#: actions/noticesearchrss.php:95
 #, fuzzy, php-format
 msgid "Updates with \"%s\""
 msgstr "%s adli kullanicinin durum mesajlari"
 
-#: actions/noticesearchrss.php:98
+#. TRANS: RSS notice search feed description.
+#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
+#: actions/noticesearchrss.php:99
 #, fuzzy, php-format
-msgid "Updates matching search term \"%1$s\" on %2$s!"
+msgid "Updates matching search term \"%1$s\" on %2$s."
 msgstr "\"%s\" kelimesinin geçtiği tüm güncellemeler"
 
 #: actions/nudge.php:85
@@ -3868,51 +3939,51 @@ msgid "Nudge sent!"
 msgstr ""
 
 #. TRANS: Message displayed to an anonymous user trying to view OAuth application list.
-#: actions/oauthappssettings.php:60
+#: actions/oauthappssettings.php:57
 msgid "You must be logged in to list your applications."
 msgstr "Uygulamalarınızı listelemek için giriş yapmış olmanız gerekir."
 
 #. TRANS: Page title for OAuth applications
-#: actions/oauthappssettings.php:76
+#: actions/oauthappssettings.php:73
 msgid "OAuth applications"
 msgstr "OAuth uygulamaları"
 
 #. TRANS: Page instructions for OAuth applications
-#: actions/oauthappssettings.php:88
+#: actions/oauthappssettings.php:85
 msgid "Applications you have registered"
 msgstr "Kaydettiğiniz uygulamalar"
 
 #. TRANS: Empty list message on page with OAuth applications.
-#: actions/oauthappssettings.php:141
+#: actions/oauthappssettings.php:138
 #, php-format
 msgid "You have not registered any applications yet."
 msgstr ""
 
 #. TRANS: Title for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:71
+#: actions/oauthconnectionssettings.php:69
 msgid "Connected applications"
 msgstr "Bağlı uygulamalar"
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:83
+#: actions/oauthconnectionssettings.php:80
 msgid "The following connections exist for your account."
 msgstr ""
 
 #. TRANS: Client error when trying to revoke access for an application while not being a user of it.
-#: actions/oauthconnectionssettings.php:168
+#: actions/oauthconnectionssettings.php:165
 msgid "You are not a user of that application."
 msgstr "Bu uygulamanın bir kullanıcısı değilsiniz."
 
 #. TRANS: Client error when revoking access has failed for some reason.
 #. TRANS: %s is the application ID revoking access failed for.
-#: actions/oauthconnectionssettings.php:183
+#: actions/oauthconnectionssettings.php:180
 #, fuzzy, php-format
 msgid "Unable to revoke access for application: %s."
 msgstr "Uygulamayı düzenlemek için bu biçimi kullan."
 
 #. TRANS: Success message after revoking access for an application.
 #. TRANS: %1$s is the application name, %2$s is the first part of the user token.
-#: actions/oauthconnectionssettings.php:202
+#: actions/oauthconnectionssettings.php:199
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -3920,20 +3991,30 @@ msgid ""
 msgstr ""
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:213
+#: actions/oauthconnectionssettings.php:210
 msgid "You have not authorized any applications to use your account."
 msgstr ""
 
 #. TRANS: Note for developers in the OAuth connection settings form.
 #. TRANS: This message contains a Markdown link. Do not separate "](".
 #. TRANS: %s is the URL to the OAuth settings.
-#: actions/oauthconnectionssettings.php:233
+#: actions/oauthconnectionssettings.php:230
 #, php-format
 msgid ""
 "Are you a developer? [Register an OAuth client application](%s) to use with "
 "this instance of StatusNet."
 msgstr ""
 
+#: actions/oembed.php:64
+#, fuzzy, php-format
+msgid "\"%s\" not found."
+msgstr "Onay kodu bulunamadı."
+
+#: actions/oembed.php:76
+#, fuzzy, php-format
+msgid "Notice %s not found."
+msgstr "Üst durum mesajı bulunamadı."
+
 #: actions/oembed.php:80 actions/shownotice.php:100
 msgid "Notice has no profile."
 msgstr "Kullanıcının profili yok."
@@ -3943,6 +4024,16 @@ msgstr "Kullanıcının profili yok."
 msgid "%1$s's status on %2$s"
 msgstr "%1$s'in %2$s'deki durum mesajları "
 
+#: actions/oembed.php:95
+#, fuzzy, php-format
+msgid "Attachment %s not found."
+msgstr "Alıcı kullanıcı bulunamadı."
+
+#: actions/oembed.php:136
+#, php-format
+msgid "\"%s\" not supported for oembed requests."
+msgstr ""
+
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
 #: actions/oembed.php:168
 #, fuzzy, php-format
@@ -3956,98 +4047,64 @@ msgid "Only %s URLs over plain HTTP please."
 msgstr ""
 
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1205
-#: lib/apiaction.php:1232 lib/apiaction.php:1367
+#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1207
+#: lib/apiaction.php:1234 lib/apiaction.php:1369
 msgid "Not a supported data format."
 msgstr "Desteklenen bir veri biçimi değil."
 
+#. TRANS: ShortName in the OpenSearch interface when trying to find users.
 #: actions/opensearch.php:64
 msgid "People Search"
 msgstr "Kişi Arama"
 
-#: actions/opensearch.php:67
+#: actions/opensearch.php:68
 msgid "Notice Search"
 msgstr "Durum Mesajı Arama"
 
-#: actions/othersettings.php:59
-msgid "Other settings"
-msgstr "Profil ayarları"
-
-#. TRANS: Instructions for tab "Other" in user profile settings.
-#: actions/othersettings.php:71
-msgid "Manage various other options."
-msgstr ""
-
-#. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
-#. TRANS: user's profile settings. Use of "free" is as in "open", indicating that the
-#. TRANS: information on the shortener site is freely distributable.
-#. TRANS: This message has one space at the beginning. Use your language's word separator
-#. TRANS: here if it has one (most likely a single space).
-#: actions/othersettings.php:113
-msgid " (free service)"
-msgstr ""
-
-#. TRANS: Label for dropdown with URL shortener services.
-#: actions/othersettings.php:122
-msgid "Shorten URLs with"
-msgstr "Bağlantıları şununla kısalt"
-
-#. TRANS: Tooltip for for dropdown with URL shortener services.
-#: actions/othersettings.php:124
-msgid "Automatic shortening service to use."
-msgstr "Kullanılacak otomatik kısaltma servisi."
-
-#. TRANS: Label for checkbox.
-#: actions/othersettings.php:130
-msgid "View profile designs"
-msgstr "Profil dizaynlarını görüntüle"
-
-#. TRANS: Tooltip for checkbox.
-#: actions/othersettings.php:132
-msgid "Show or hide profile designs."
-msgstr ""
-
-#. TRANS: Form validation error for form "Other settings" in user profile.
-#: actions/othersettings.php:164
-#, fuzzy
-msgid "URL shortening service is too long (maximum 50 characters)."
-msgstr "Yer bilgisi çok uzun (azm: 255 karakter)."
-
-#: actions/otp.php:69
+#. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
+#: actions/otp.php:70
 #, fuzzy
 msgid "No user ID specified."
 msgstr "Yeni durum mesajı"
 
-#: actions/otp.php:83
+#. TRANS: Client error displayed trying to use "one time password login" without specifying a login token.
+#: actions/otp.php:86
 #, fuzzy
 msgid "No login token specified."
 msgstr "Yeni durum mesajı"
 
-#: actions/otp.php:90
+#. TRANS: Client error displayed trying to use "one time password login" without requesting a login token.
+#: actions/otp.php:94
 #, fuzzy
 msgid "No login token requested."
 msgstr "Yetkilendirme isteği yok!"
 
-#: actions/otp.php:95
+#. TRANS: Client error displayed trying to use "one time password login" while specifying an invalid login token.
+#: actions/otp.php:100
 #, fuzzy
 msgid "Invalid login token specified."
 msgstr "Geçersiz durum mesajı"
 
-#: actions/otp.php:104
+#. TRANS: Client error displayed trying to use "one time password login" while specifying an expired login token.
+#: actions/otp.php:110
 msgid "Login token expired."
 msgstr ""
 
-#: actions/outbox.php:58
+#. TRANS: Title for outbox for any but the fist page.
+#. TRANS: %1$s is the user nickname, %2$d is the page number.
+#: actions/outbox.php:57
 #, php-format
 msgid "Outbox for %1$s - page %2$d"
 msgstr ""
 
+#. TRANS: Title for first page of outbox.
 #: actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
 msgstr ""
 
-#: actions/outbox.php:104
+#. TRANS: Instructions for outbox.
+#: actions/outbox.php:103
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr ""
 
@@ -4073,43 +4130,45 @@ msgstr "Eski parola"
 msgid "New password"
 msgstr "Yeni parola"
 
-#: actions/passwordsettings.php:109
+#: actions/passwordsettings.php:109 actions/register.php:416
 #, fuzzy
-msgid "6 or more characters"
+msgid "6 or more characters."
 msgstr "6 veya daha fazla karakter"
 
-#: actions/passwordsettings.php:113
+#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#: actions/passwordsettings.php:113 actions/recoverpassword.php:264
+#: actions/register.php:420
 #, fuzzy
-msgid "Same as password above"
+msgid "Same as password above."
 msgstr "yukarıdaki parolanın aynısı"
 
 #: actions/passwordsettings.php:117
 msgid "Change"
 msgstr "Değiştir"
 
-#: actions/passwordsettings.php:154 actions/register.php:238
+#: actions/passwordsettings.php:153 actions/register.php:223
 msgid "Password must be 6 or more characters."
 msgstr "Parola 6 veya daha fazla karakterden oluşmalıdır."
 
-#: actions/passwordsettings.php:157 actions/register.php:241
+#: actions/passwordsettings.php:156 actions/register.php:226
 msgid "Passwords don't match."
 msgstr "Parolalar birbirini tutmuyor."
 
-#: actions/passwordsettings.php:165
+#: actions/passwordsettings.php:164
 msgid "Incorrect old password"
 msgstr "Eski parola yanlış"
 
-#: actions/passwordsettings.php:181
+#: actions/passwordsettings.php:180
 msgid "Error saving user; invalid."
 msgstr "Kullanıcıyı kaydetmede hata oluştu; geçersiz."
 
-#: actions/passwordsettings.php:186
+#. TRANS: Reset password form validation error message.
+#: actions/passwordsettings.php:185 actions/recoverpassword.php:418
 #, fuzzy
-msgid "Can't save new password."
+msgid "Cannot save new password."
 msgstr "Yeni parola kaydedilemedi."
 
-#. TRANS: Title for password recovery page in password saved mode.
-#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
+#: actions/passwordsettings.php:191
 msgid "Password saved."
 msgstr "Parola kaydedildi."
 
@@ -4325,8 +4384,7 @@ msgid "Directory where backgrounds are located."
 msgstr ""
 
 #. TRANS: Fieldset legens in Paths admin panel.
-#. TRANS: DT element label in attachment list.
-#: actions/pathsadminpanel.php:419 lib/attachmentlist.php:98
+#: actions/pathsadminpanel.php:419
 msgid "Attachments"
 msgstr ""
 
@@ -4399,7 +4457,9 @@ msgstr ""
 msgid "Save paths"
 msgstr "Yeni durum mesajı"
 
-#: actions/peoplesearch.php:52
+#. TRANS: Instructions for the "People search" page.
+#. TRANS: %%site.name%% is the name of the StatusNet site.
+#: actions/peoplesearch.php:54
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
@@ -4409,7 +4469,8 @@ msgstr ""
 "yap. Anahtar kelimeleri boşluk ile ayırın. Anahtar kelime 3 veya daha fazla "
 "karakterden oluşmalı. "
 
-#: actions/peoplesearch.php:58
+#. TRANS: Title of a page where users can search for other users.
+#: actions/peoplesearch.php:61
 msgid "People search"
 msgstr "Kişi Arama"
 
@@ -4423,6 +4484,60 @@ msgstr "Geçersiz bir eposta adresi."
 msgid "Users self-tagged with %1$s - page %2$d"
 msgstr "%s adli kullanicinin durum mesajlari"
 
+#. TRANS: Page title for AJAX form return when a disabling a plugin.
+#: actions/plugindisable.php:69
+msgctxt "plugin"
+msgid "Disabled"
+msgstr ""
+
+#. TRANS: Client error displayed trying to perform any request method other than POST.
+#. TRANS: Do not translate POST.
+#: actions/pluginenable.php:78 actions/subscribe.php:77
+msgid "This action only accepts POST requests."
+msgstr ""
+
+#: actions/pluginenable.php:102
+#, fuzzy
+msgid "You cannot administer plugins."
+msgstr "Kullanıcıları silemezsiniz."
+
+#: actions/pluginenable.php:109
+#, fuzzy
+msgid "No such plugin."
+msgstr "Böyle bir sayfa yok."
+
+#. TRANS: Page title for AJAX form return when enabling a plugin.
+#: actions/pluginenable.php:159
+msgctxt "plugin"
+msgid "Enabled"
+msgstr ""
+
+#. TRANS: Tab and title for plugins admin panel.
+#. TRANS: Menu item for site administration
+#: actions/pluginsadminpanel.php:56 actions/version.php:191
+#: lib/adminpanelaction.php:411
+msgid "Plugins"
+msgstr "Eklentiler"
+
+#. TRANS: Instructions at top of plugin admin page.
+#: actions/pluginsadminpanel.php:68
+msgid ""
+"Additional plugins can be enabled and configured manually. See the <a href="
+"\"http://status.net/wiki/Plugins\">online plugin documentation</a> for more "
+"details."
+msgstr ""
+
+#. TRANS: Admin form section header
+#: actions/pluginsadminpanel.php:84
+#, fuzzy
+msgid "Default plugins"
+msgstr "Öntanımlı dil"
+
+#: actions/pluginsadminpanel.php:106
+msgid ""
+"All default plugins have been disabled from the site's configuration file."
+msgstr ""
+
 #: actions/postnotice.php:95
 msgid "Invalid notice content."
 msgstr "Geçersiz büyüklük."
@@ -4433,12 +4548,12 @@ msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’.
 msgstr ""
 
 #. TRANS: Page title for profile settings.
-#: actions/profilesettings.php:59
+#: actions/profilesettings.php:60
 msgid "Profile settings"
 msgstr "Profil ayarları"
 
 #. TRANS: Usage instructions for profile settings.
-#: actions/profilesettings.php:70
+#: actions/profilesettings.php:71
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
@@ -4446,12 +4561,12 @@ msgstr ""
 "hakkınızda daha fazla bilgi sahibi olur."
 
 #. TRANS: Profile settings form legend.
-#: actions/profilesettings.php:98
+#: actions/profilesettings.php:99
 msgid "Profile information"
 msgstr "Profil ayarları"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109 actions/register.php:433
+#: actions/profilesettings.php:110 actions/register.php:412
 #, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr ""
@@ -4459,23 +4574,20 @@ msgstr ""
 "verilmez"
 
 #. TRANS: Field label in form for profile settings.
-#. TRANS: Label for full group name (dt). Text hidden by default.
-#. TRANS: DT for full name in a profile.
-#: actions/profilesettings.php:113 actions/register.php:455
-#: actions/showgroup.php:255 actions/tagother.php:104
-#: lib/groupeditform.php:150 lib/userprofile.php:156
+#: actions/profilesettings.php:114 actions/register.php:434
+#: lib/groupeditform.php:150
 msgid "Full name"
 msgstr "Tam İsim"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:118 actions/register.php:460
+#: actions/profilesettings.php:119 actions/register.php:439
 #: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "Başlangıç Sayfası"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:121
+#: actions/profilesettings.php:122 actions/register.php:441
 #, fuzzy
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr ""
@@ -4484,143 +4596,139 @@ msgstr ""
 #. TRANS: Tooltip for field label in form for profile settings. Plural
 #. TRANS: is decided by the number of characters available for the
 #. TRANS: biography (%d).
-#: actions/profilesettings.php:129 actions/register.php:471
+#: actions/profilesettings.php:130 actions/register.php:450
 #, fuzzy, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
 msgstr[0] "Kendinizi ve ilgi alanlarınızı 140 karakter ile anlatın"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:135 actions/register.php:476
+#: actions/profilesettings.php:136 actions/register.php:455
 #, fuzzy
 msgid "Describe yourself and your interests"
 msgstr "Kendinizi ve ilgi alanlarınızı 140 karakter ile anlatın"
 
 #. TRANS: Text area label in form for profile settings where users can provide.
 #. TRANS: their biography.
-#: actions/profilesettings.php:139 actions/register.php:478
+#: actions/profilesettings.php:140 actions/register.php:457
 msgid "Bio"
 msgstr "Hakkında"
 
 #. TRANS: Field label in form for profile settings.
-#. TRANS: Label for group location (dt). Text hidden by default.
-#. TRANS: DT for location in a profile.
-#: actions/profilesettings.php:145 actions/register.php:483
-#: actions/showgroup.php:265 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:173
-#: lib/userprofile.php:172
+#: actions/profilesettings.php:146 actions/register.php:462
+#: lib/groupeditform.php:173
 msgid "Location"
 msgstr "Yer"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148 actions/register.php:485
+#: actions/profilesettings.php:149
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Bulunduğunuz yer, \"Şehir, Eyalet (veya Bölge), Ülke\" gibi"
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:153
+#: actions/profilesettings.php:154
 msgid "Share my current location when posting notices"
 msgstr ""
 
 #. TRANS: Field label in form for profile settings.
-#. TRANS: DT for tags in a profile.
-#: actions/profilesettings.php:161 actions/tagother.php:149
-#: actions/tagother.php:209 lib/subscriptionlist.php:106
-#: lib/subscriptionlist.php:108 lib/userprofile.php:220
+#: actions/profilesettings.php:162 actions/tagother.php:128
+#: actions/tagother.php:188 lib/subscriptionlist.php:104
+#: lib/subscriptionlist.php:106
 msgid "Tags"
 msgstr "Etiketler"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:164
+#: actions/profilesettings.php:165
 #, fuzzy
 msgid ""
-"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- "
+"separated."
 msgstr ""
 "Kendiniz için etiketler (harf, sayı, -. ., ve _ kullanılabilir), virgül veya "
 "boşlukla ayırabilirsiniz"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:169
+#: actions/profilesettings.php:170
 msgid "Language"
 msgstr "Dil"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:171
+#: actions/profilesettings.php:172
 #, fuzzy
-msgid "Preferred language"
+msgid "Preferred language."
 msgstr "Tercih edilen dil"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:181
+#: actions/profilesettings.php:182
 msgid "Timezone"
 msgstr "Zaman dilimi"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:183
+#: actions/profilesettings.php:184
 msgid "What timezone are you normally in?"
 msgstr "Normalde hangi zaman dilimi içindesiniz?"
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:189
+#: actions/profilesettings.php:190
 #, fuzzy
 msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)"
+"Automatically subscribe to whoever subscribes to me (best for non-humans)."
 msgstr "Bana abone olan herkese abone yap (insan olmayanlar için en iyisi)"
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Plural form is used based on the maximum number of allowed
 #. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:258 actions/register.php:229
+#: actions/profilesettings.php:259 actions/register.php:214
 #, fuzzy, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
 msgstr[0] "Yer bilgisi çok uzun (azm: %d karakter)."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:269 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:270 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr "Zaman dilimi seçilmedi."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:277
+#: actions/profilesettings.php:278
 #, fuzzy
 msgid "Language is too long (maximum 50 characters)."
 msgstr "Dil çok uzun (maksimum: 50 karakter)."
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:291 actions/tagother.php:178
-#, php-format
-msgid "Invalid tag: \"%s\""
+#: actions/profilesettings.php:292
+#, fuzzy, php-format
+msgid "Invalid tag: \"%s\"."
 msgstr "Geçersiz büyüklük."
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:347
+#: actions/profilesettings.php:348
 #, fuzzy
 msgid "Could not update user for autosubscribe."
 msgstr "Kullanıcı güncellenemedi."
 
 #. TRANS: Server error thrown when user profile location preference settings could not be updated.
-#: actions/profilesettings.php:405
+#: actions/profilesettings.php:406
 #, fuzzy
 msgid "Could not save location prefs."
 msgstr "Profil kaydedilemedi."
 
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:427 actions/tagother.php:200
+#: actions/profilesettings.php:428 actions/tagother.php:179
 msgid "Could not save tags."
 msgstr "Profil kaydedilemedi."
 
 #. TRANS: Confirmation shown when user profile settings are saved.
 #. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:436 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:437 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "Ayarlar kaydedildi."
 
 #. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
 #. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:483 actions/restoreaccount.php:60
+#: actions/profilesettings.php:484 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "Bir hesap oluştur"
@@ -4693,6 +4801,12 @@ msgid ""
 "tool."
 msgstr ""
 
+#. TRANS: Public RSS feed description. %s is the StatusNet site name.
+#: actions/publicrss.php:106
+#, php-format
+msgid "%s updates from everyone."
+msgstr ""
+
 #. TRANS: Title for public tag cloud.
 #: actions/publictagcloud.php:57
 #, fuzzy
@@ -4732,10 +4846,6 @@ msgid ""
 "one!"
 msgstr ""
 
-#: actions/publictagcloud.php:146
-msgid "Tag cloud"
-msgstr ""
-
 #. TRANS: Client error displayed trying to recover password while already logged in.
 #: actions/recoverpassword.php:37
 msgid "You are already logged in!"
@@ -4831,6 +4941,12 @@ msgstr "Parolanı geri al"
 msgid "Password recovery requested"
 msgstr "Parola geri alma isteği"
 
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/recoverpassword.php:229
+#, fuzzy
+msgid "Password saved"
+msgstr "Parola kaydedildi."
+
 #. TRANS: Title for password recovery page when an unknown action has been specified.
 #: actions/recoverpassword.php:232
 msgid "Unknown action"
@@ -4842,15 +4958,9 @@ msgstr ""
 msgid "6 or more characters, and do not forget it!"
 msgstr "Unutmayın, 6 veya daha fazla karakter"
 
-#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
-#: actions/recoverpassword.php:264 actions/register.php:441
-#, fuzzy
-msgid "Same as password above."
-msgstr "yukarıdaki parolanın aynısı"
-
 #. TRANS: Button text for password reset form.
 #. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: actions/recoverpassword.php:268 lib/designsettings.php:264
+#: actions/recoverpassword.php:268 lib/designform.php:145
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Reset"
@@ -4902,14 +5012,8 @@ msgstr "Parola 6 veya daha fazla karakterden oluşmalıdır."
 msgid "Password and confirmation do not match."
 msgstr "Parola ve onaylaması birbirini tutmuyor."
 
-#. TRANS: Reset password form validation error message.
-#: actions/recoverpassword.php:418
-#, fuzzy
-msgid "Cannot save new password."
-msgstr "Yeni parola kaydedilemedi."
-
 #. TRANS: Server error displayed when something does wrong with the user object during password reset.
-#: actions/recoverpassword.php:426 actions/register.php:256
+#: actions/recoverpassword.php:426 actions/register.php:241
 msgid "Error setting user."
 msgstr "Kullanıcı ayarlamada hata oluştu."
 
@@ -4918,96 +5022,99 @@ msgstr "Kullanıcı ayarlamada hata oluştu."
 msgid "New password successfully saved. You are now logged in."
 msgstr "Yeni parola başarıyla kaydedildi. Şimdi giriş yaptınız."
 
-#: actions/register.php:92 actions/register.php:196 actions/register.php:413
+#: actions/redirecturl.php:70
+#, fuzzy
+msgid "No id parameter"
+msgstr "Böyle bir belge yok."
+
+#: actions/redirecturl.php:76
+#, fuzzy, php-format
+msgid "No such file \"%d\""
+msgstr "Böyle bir dosya yok."
+
+#: actions/register.php:80 actions/register.php:181 actions/register.php:392
 msgid "Sorry, only invited people can register."
 msgstr ""
 
-#: actions/register.php:99
+#: actions/register.php:87
 #, fuzzy
 msgid "Sorry, invalid invitation code."
 msgstr "Onay kodu hatası."
 
-#: actions/register.php:119
+#: actions/register.php:106
 msgid "Registration successful"
 msgstr "Kayıt başarılı"
 
-#: actions/register.php:121 actions/register.php:511
+#: actions/register.php:108 actions/register.php:490
 msgid "Register"
 msgstr "Kayıt"
 
-#: actions/register.php:142
+#: actions/register.php:128
 msgid "Registration not allowed."
 msgstr "Kayıt yapılmasına izin verilmiyor."
 
-#: actions/register.php:209
+#: actions/register.php:194
 #, fuzzy
-msgid "You can't register if you don't agree to the license."
+msgid "You cannot register if you don't agree to the license."
 msgstr "Eğer lisansı kabul etmezseniz kayıt olamazsınız."
 
-#: actions/register.php:218
+#: actions/register.php:203
 msgid "Email address already exists."
 msgstr "Eposta adresi zaten var."
 
-#: actions/register.php:251 actions/register.php:273
+#: actions/register.php:236 actions/register.php:258
 msgid "Invalid username or password."
 msgstr "Geçersiz kullanıcı adı veya parola."
 
-#: actions/register.php:351
+#: actions/register.php:333
 msgid ""
 "With this form you can create a new account. You can then post notices and "
-"link up to friends and colleagues. "
+"link up to friends and colleagues."
 msgstr ""
 
-#: actions/register.php:437
-#, fuzzy
-msgid "6 or more characters."
-msgstr "6 veya daha fazla karakter"
-
-#. TRANS: Link description in user account settings menu.
-#: actions/register.php:445 actions/register.php:449
-#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
+#: actions/register.php:424 actions/register.php:428
+#: actions/siteadminpanel.php:238 lib/settingsnav.php:92
 msgid "Email"
 msgstr "Eposta"
 
-#: actions/register.php:446 actions/register.php:450
+#: actions/register.php:425 actions/register.php:429
 #, fuzzy
-msgid "Used only for updates, announcements, and password recovery"
+msgid "Used only for updates, announcements, and password recovery."
 msgstr ""
 "Sadece sistem güncellemeleri, duyurular ve parola geri alma için kullanılır."
 
-#: actions/register.php:457
-msgid "Longer name, preferably your \"real\" name"
+#: actions/register.php:436
+msgid "Longer name, preferably your \"real\" name."
 msgstr ""
 
-#: actions/register.php:462
+#: actions/register.php:464
 #, fuzzy
-msgid "URL of your homepage, blog, or profile on another site"
-msgstr ""
-"Web Sitenizin, blogunuzun ya da varsa başka bir sitedeki profilinizin adresi"
+msgid "Where you are, like \"City, State (or Region), Country\"."
+msgstr "Bulunduğunuz yer, \"Şehir, Eyalet (veya Bölge), Ülke\" gibi"
 
-#: actions/register.php:523
+#: actions/register.php:503
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
 msgstr ""
 
-#: actions/register.php:533
+#: actions/register.php:513
 #, php-format
 msgid "My text and files are copyright by %1$s."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:537
+#: actions/register.php:517
 msgid "My text and files remain under my own copyright."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:540
+#: actions/register.php:520
 msgid "All rights reserved."
 msgstr "Tüm hakları saklıdır."
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:545
+#: actions/register.php:525
 #, fuzzy, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -5016,7 +5123,7 @@ msgstr ""
 "bu özel veriler haricinde: parola, eposta adresi, IM adresi, telefon "
 "numarası."
 
-#: actions/register.php:588
+#: actions/register.php:566
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -5035,7 +5142,7 @@ msgid ""
 "Thanks for signing up and we hope you enjoy using this service."
 msgstr ""
 
-#: actions/register.php:612
+#: actions/register.php:590
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5064,7 +5171,7 @@ msgstr "Kullanıcı takma adı"
 
 #: actions/remotesubscribe.php:129
 #, fuzzy
-msgid "Nickname of the user you want to follow"
+msgid "Nickname of the user you want to follow."
 msgstr "Takip etmek istediğiniz kullanıcının takma adı"
 
 #: actions/remotesubscribe.php:132
@@ -5072,18 +5179,18 @@ msgid "Profile URL"
 msgstr "Profil Adresi"
 
 #: actions/remotesubscribe.php:133
-msgid "URL of your profile on another compatible microblogging service"
+msgid "URL of your profile on another compatible microblogging service."
 msgstr ""
 
 #. TRANS: Link text for link that will subscribe to a remote profile.
 #: actions/remotesubscribe.php:136 lib/subscribeform.php:139
-#: lib/userprofile.php:431
+#: lib/userprofile.php:402
 msgid "Subscribe"
 msgstr "Abone ol"
 
 #: actions/remotesubscribe.php:158
 #, fuzzy
-msgid "Invalid profile URL (bad format)"
+msgid "Invalid profile URL (bad format)."
 msgstr "Geçersiz dosya ismi."
 
 #: actions/remotesubscribe.php:167
@@ -5119,7 +5226,7 @@ msgstr "Eğer lisansı kabul etmezseniz kayıt olamazsınız."
 msgid "You already repeated that notice."
 msgstr "Zaten giriş yapmış durumdasıznız!"
 
-#: actions/repeat.php:112 lib/noticelist.php:692
+#: actions/repeat.php:112 lib/noticelist.php:697
 msgid "Repeated"
 msgstr "Sıfırla"
 
@@ -5128,9 +5235,9 @@ msgstr "Sıfırla"
 msgid "Repeated!"
 msgstr "Yarat"
 
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing @-replies.
+#. TRANS: RSS reply feed title. %s is a user nickname.
 #: actions/replies.php:126 actions/repliesrss.php:68
-#: lib/personalgroupnav.php:109
+#: lib/personalgroupnav.php:105
 #, php-format
 msgid "Replies to %s"
 msgstr "%s için cevaplar"
@@ -5176,9 +5283,11 @@ msgid ""
 "newnotice%%%%?status_textarea=%3$s)."
 msgstr ""
 
-#: actions/repliesrss.php:72
+#. TRANS: RSS reply feed description.
+#. TRANS: %1$s is a user nickname, %2$s is the StatusNet site name.
+#: actions/repliesrss.php:74
 #, fuzzy, php-format
-msgid "Replies to %1$s on %2$s!"
+msgid "Replies to %1$s on %2$s."
 msgstr "%s için cevaplar"
 
 #. TRANS: Client exception displayed when trying to restore an account while not logged in.
@@ -5279,7 +5388,7 @@ msgstr "Bize o profili yollamadınız"
 msgid "User doesn't have this role."
 msgstr "Kullanıcının profili yok."
 
-#: actions/rsd.php:146 actions/version.php:159
+#: actions/rsd.php:142 actions/version.php:159
 msgid "StatusNet"
 msgstr "İstatistikler"
 
@@ -5323,95 +5432,45 @@ msgstr ""
 msgid "Save site settings"
 msgstr "Profil ayarları"
 
-#: actions/showapplication.php:82
+#: actions/showapplication.php:78
 msgid "You must be logged in to view an application."
 msgstr ""
 
-#: actions/showapplication.php:157
+#: actions/showapplication.php:151
 #, fuzzy
 msgid "Application profile"
 msgstr "Bu durum mesajının ait oldugu kullanıcı profili yok"
 
-#. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:159 lib/applicationeditform.php:177
-msgid "Icon"
-msgstr "Simge"
-
-#. TRANS: Form input field label for application name.
-#: actions/showapplication.php:169 actions/version.php:197
-#: lib/applicationeditform.php:190
-#, fuzzy
-msgid "Name"
-msgstr "Takma ad"
-
-#. TRANS: Form input field label.
-#: actions/showapplication.php:178 lib/applicationeditform.php:227
-msgid "Organization"
-msgstr "Organizasyon"
-
-#. TRANS: Form input field label.
-#: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:168
-msgid "Description"
-msgstr "Tanım"
-
-#. TRANS: Header for group statistics on a group page (h2).
-#. TRANS: H2 text for user statistics.
-#: actions/showapplication.php:192 actions/showgroup.php:460
-#: lib/profileaction.php:205
-msgid "Statistics"
-msgstr "İstatistikler"
-
-#: actions/showapplication.php:203
+#: actions/showapplication.php:179
 #, php-format
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr ""
 
-#: actions/showapplication.php:213
+#: actions/showapplication.php:189
 msgid "Application actions"
 msgstr ""
 
-#: actions/showapplication.php:236
+#: actions/showapplication.php:212
 msgid "Reset key & secret"
 msgstr ""
 
 #. TRANS: Title of form for deleting a user.
-#: actions/showapplication.php:252 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:64 lib/noticelist.php:673
+#: actions/showapplication.php:228 lib/deletegroupform.php:121
+#: lib/deleteuserform.php:64 lib/noticelist.php:678
 msgid "Delete"
 msgstr "Sil"
 
-#: actions/showapplication.php:261
+#: actions/showapplication.php:237
 msgid "Application info"
 msgstr ""
 
-#: actions/showapplication.php:263
-msgid "Consumer key"
-msgstr ""
-
-#: actions/showapplication.php:268
-msgid "Consumer secret"
-msgstr ""
-
-#: actions/showapplication.php:273
-msgid "Request token URL"
-msgstr ""
-
-#: actions/showapplication.php:278
-msgid "Access token URL"
-msgstr ""
-
-#: actions/showapplication.php:283
-msgid "Authorize URL"
-msgstr ""
-
-#: actions/showapplication.php:288
+#: actions/showapplication.php:255
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
 msgstr ""
 
-#: actions/showapplication.php:309
+#: actions/showapplication.php:275
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr ""
 
@@ -5491,61 +5550,47 @@ msgstr ""
 msgid "%1$s group, page %2$d"
 msgstr "Bütün abonelikler"
 
-#. TRANS: Group profile header (h2). Text hidden by default.
-#: actions/showgroup.php:223
-msgid "Group profile"
-msgstr "Kullanıcının profili yok."
-
-#. TRANS: Label for group URL (dt). Text hidden by default.
-#. TRANS: DT for URL in a profile.
-#: actions/showgroup.php:273 actions/tagother.php:118
-#: actions/userauthorization.php:175 lib/userprofile.php:186
-msgid "URL"
-msgstr "Bağlantı"
-
 #. TRANS: Label for group description or group note (dt). Text hidden by default.
-#. TRANS: DT for note in a profile.
-#: actions/showgroup.php:285 actions/tagother.php:128
-#: actions/userauthorization.php:187 lib/userprofile.php:204
+#: actions/showgroup.php:266
 msgid "Note"
 msgstr "Not"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:296 lib/groupeditform.php:180
+#: actions/showgroup.php:277 lib/groupeditform.php:180
 msgid "Aliases"
 msgstr "Diğerisimler"
 
 #. TRANS: Group actions header (h2). Text hidden by default.
-#: actions/showgroup.php:313
+#: actions/showgroup.php:294
 msgid "Group actions"
 msgstr ""
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:357
+#: actions/showgroup.php:338
 #, fuzzy, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
 msgstr "%s için durum RSS beslemesi"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:364
+#: actions/showgroup.php:345
 #, fuzzy, php-format
 msgid "Notice feed for %s group (RSS 2.0)"
 msgstr "%s için durum RSS beslemesi"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:371
+#: actions/showgroup.php:352
 #, fuzzy, php-format
 msgid "Notice feed for %s group (Atom)"
 msgstr "%s için durum RSS beslemesi"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:377
+#: actions/showgroup.php:358
 #, fuzzy, php-format
 msgid "FOAF for %s group"
 msgstr "%s için durum RSS beslemesi"
 
 #. TRANS: Header for mini list of group members on a group page (h2).
-#: actions/showgroup.php:414
+#: actions/showgroup.php:395
 msgid "Members"
 msgstr "Üyeler"
 
@@ -5553,26 +5598,31 @@ msgstr "Üyeler"
 #. TRANS: Text for user subscription statistics if the user has no subscriptions.
 #. TRANS: Text for user subscriber statistics if user has no subscribers.
 #. TRANS: Text for user user group membership statistics if user is not a member of any group.
-#: actions/showgroup.php:420 lib/profileaction.php:137
+#: actions/showgroup.php:401 lib/profileaction.php:137
 #: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
-#: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
+#: lib/subscriptionlist.php:123 lib/tagcloudsection.php:71
 msgid "(None)"
 msgstr "(Yok)"
 
 #. TRANS: Link to all group members from mini list of group members if group has more than n members.
-#: actions/showgroup.php:429
+#: actions/showgroup.php:410
 msgid "All members"
 msgstr "Tüm üyeler"
 
-#. TRANS: Label for creation date in statistics on group page.
-#: actions/showgroup.php:465
+#. TRANS: Header for group statistics on a group page (h2).
+#. TRANS: H2 text for user statistics.
+#: actions/showgroup.php:441 lib/profileaction.php:205
+msgid "Statistics"
+msgstr "İstatistikler"
+
+#: actions/showgroup.php:444
 #, fuzzy
 msgctxt "LABEL"
 msgid "Created"
 msgstr "Oluşturuldu"
 
 #. TRANS: Label for member count in statistics on group page.
-#: actions/showgroup.php:473
+#: actions/showgroup.php:449
 #, fuzzy
 msgctxt "LABEL"
 msgid "Members"
@@ -5582,7 +5632,7 @@ msgstr "Üyeler"
 #. TRANS: **%s** is the group alias, %%%%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).
-#: actions/showgroup.php:488
+#: actions/showgroup.php:464
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5595,7 +5645,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: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
-#: actions/showgroup.php:498
+#: actions/showgroup.php:474
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5605,7 +5655,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: Header for list of group administrators on a group page (h2).
-#: actions/showgroup.php:527
+#: actions/showgroup.php:503
 msgid "Admins"
 msgstr "Yöneticiler"
 
@@ -5644,7 +5694,7 @@ msgid "%1$s tagged %2$s"
 msgstr "%s ve arkadaşları"
 
 #. TRANS: Page title showing tagged notices in one user's stream.
-#. TRANS: %1$s is the username, %2$s is the hash tag, %1$d is the page number.
+#. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
 #: actions/showstream.php:74
 #, fuzzy, php-format
 msgid "%1$s tagged %2$s, page %3$d"
@@ -5691,7 +5741,7 @@ msgid "FOAF for %s"
 msgstr ""
 
 #. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
-#: actions/showstream.php:211
+#: actions/showstream.php:205
 #, fuzzy, php-format
 msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr ""
@@ -5699,7 +5749,7 @@ msgstr ""
 "göndermemiş."
 
 #. TRANS: Second sentence of empty list message for a stream for the user themselves.
-#: actions/showstream.php:217
+#: actions/showstream.php:211
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
@@ -5707,7 +5757,7 @@ msgstr ""
 
 #. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:221
+#: actions/showstream.php:215
 #, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
@@ -5716,7 +5766,7 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:264
+#: actions/showstream.php:258
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5727,7 +5777,7 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:271
+#: actions/showstream.php:265
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5736,7 +5786,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
-#: actions/showstream.php:328
+#: actions/showstream.php:322
 #, fuzzy, php-format
 msgid "Repeat of %s"
 msgstr "%s için cevaplar"
@@ -5885,117 +5935,117 @@ msgstr ""
 #. TRANS: Title for button to save site notice in admin panel.
 #: actions/sitenoticeadminpanel.php:201
 #, fuzzy
-msgid "Save site notice"
+msgid "Save site notice."
 msgstr "Yeni durum mesajı"
 
 #. TRANS: Title for SMS settings.
-#: actions/smssettings.php:57
+#: actions/smssettings.php:56
 msgid "SMS settings"
 msgstr "Profil ayarları"
 
 #. TRANS: SMS settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/smssettings.php:71
+#: actions/smssettings.php:70
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr ""
 
 #. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
-#: actions/smssettings.php:93
+#: actions/smssettings.php:92
 #, fuzzy
 msgid "SMS is not available."
 msgstr "Bu sayfa kabul ettiğiniz ortam türünde kullanılabilir değil"
 
 #. TRANS: Form legend for SMS settings form.
-#: actions/smssettings.php:107
+#: actions/smssettings.php:106
 #, fuzzy
 msgid "SMS address"
 msgstr "IM adresi"
 
 #. TRANS: Form guide in SMS settings form.
-#: actions/smssettings.php:116
+#: actions/smssettings.php:115
 msgid "Current confirmed SMS-enabled phone number."
 msgstr ""
 
 #. TRANS: Form guide in IM settings form.
-#: actions/smssettings.php:129
+#: actions/smssettings.php:128
 msgid "Awaiting confirmation on this phone number."
 msgstr ""
 
 #. TRANS: Field label for SMS address input in SMS settings form.
-#: actions/smssettings.php:138
+#: actions/smssettings.php:137
 #, fuzzy
 msgid "Confirmation code"
 msgstr "Onay kodu yok."
 
 #. TRANS: Form field instructions in SMS settings form.
-#: actions/smssettings.php:140
+#: actions/smssettings.php:139
 msgid "Enter the code you received on your phone."
 msgstr ""
 
 #. TRANS: Button label to confirm SMS confirmation code in SMS settings.
-#: actions/smssettings.php:144
+#: actions/smssettings.php:143
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Confirm"
 msgstr "Onayla"
 
 #. TRANS: Field label for SMS phone number input in SMS settings form.
-#: actions/smssettings.php:149
+#: actions/smssettings.php:148
 msgid "SMS phone number"
 msgstr ""
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
-#: actions/smssettings.php:152
+#: actions/smssettings.php:151
 #, fuzzy
-msgid "Phone number, no punctuation or spaces, with area code"
+msgid "Phone number, no punctuation or spaces, with area code."
 msgstr ""
 "1-64 küçük harf veya rakam, noktalama işaretlerine ve boşluklara izin "
 "verilmez"
 
 #. TRANS: Form legend for SMS preferences form.
-#: actions/smssettings.php:191
+#: actions/smssettings.php:190
 msgid "SMS preferences"
 msgstr "Tercihler kaydedildi."
 
 #. TRANS: Checkbox label in SMS preferences form.
-#: actions/smssettings.php:197
+#: actions/smssettings.php:196
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
 msgstr ""
 
 #. TRANS: Confirmation message for successful SMS preferences save.
-#: actions/smssettings.php:308
+#: actions/smssettings.php:307
 #, fuzzy
 msgid "SMS preferences saved."
 msgstr "Tercihler kaydedildi."
 
 #. TRANS: Message given saving SMS phone number without having provided one.
-#: actions/smssettings.php:330
+#: actions/smssettings.php:329
 #, fuzzy
 msgid "No phone number."
 msgstr "Böyle bir kullanıcı yok."
 
 #. TRANS: Message given saving SMS phone number without having selected a carrier.
-#: actions/smssettings.php:336
+#: actions/smssettings.php:335
 msgid "No carrier selected."
 msgstr ""
 
 #. TRANS: Message given saving SMS phone number that is already set.
-#: actions/smssettings.php:344
+#: actions/smssettings.php:343
 #, fuzzy
 msgid "That is already your phone number."
 msgstr "Bu zaten sizin Jabber ID'niz."
 
 #. TRANS: Message given saving SMS phone number that is already set for another user.
-#: actions/smssettings.php:348
+#: actions/smssettings.php:347
 #, fuzzy
 msgid "That phone number already belongs to another user."
 msgstr "Jabber ID başka bir kullanıcıya ait."
 
 #. TRANS: Message given saving valid SMS phone number that is to be confirmed.
-#: actions/smssettings.php:376
+#: actions/smssettings.php:375
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
 "for the code and instructions on how to use it."
@@ -6004,42 +6054,42 @@ msgstr ""
 "mesaj yollanabilmesi için onaylamanız gerekmektedir."
 
 #. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
-#: actions/smssettings.php:404
+#: actions/smssettings.php:403
 #, fuzzy
 msgid "That is the wrong confirmation number."
 msgstr "Yanlış IM adresi."
 
 #. TRANS: Message given after successfully canceling SMS phone number confirmation.
-#: actions/smssettings.php:418
+#: actions/smssettings.php:417
 msgid "SMS confirmation cancelled."
 msgstr "Onay kodu yok."
 
 #. TRANS: Message given trying to remove an SMS phone number that is not
 #. TRANS: registered for the active user.
-#: actions/smssettings.php:438
+#: actions/smssettings.php:437
 #, fuzzy
 msgid "That is not your phone number."
 msgstr "Bu sizin Jabber ID'niz değil."
 
 #. TRANS: Message given after successfully removing a registered SMS phone number.
-#: actions/smssettings.php:460
+#: actions/smssettings.php:459
 #, fuzzy
 msgid "The SMS phone number was removed."
 msgstr "Bu adres kaldırılmıştı."
 
 #. TRANS: Label for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:499
+#: actions/smssettings.php:498
 msgid "Mobile carrier"
 msgstr ""
 
 #. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:504
+#: actions/smssettings.php:503
 msgid "Select a carrier"
 msgstr ""
 
 #. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
 #. TRANS: %s is an administrative contact's e-mail address.
-#: actions/smssettings.php:513
+#: actions/smssettings.php:512
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -6047,7 +6097,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
-#: actions/smssettings.php:535
+#: actions/smssettings.php:534
 #, fuzzy
 msgid "No code entered."
 msgstr "İçerik yok!"
@@ -6123,16 +6173,14 @@ msgstr "Bize o profili yollamadınız"
 msgid "Could not save subscription."
 msgstr "Yeni abonelik eklenemedi."
 
-#: actions/subscribe.php:77
-msgid "This action only accepts POST requests."
-msgstr ""
-
-#: actions/subscribe.php:117
+#. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
+#: actions/subscribe.php:121
 #, fuzzy
 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
 msgstr "Bize o profili yollamadınız"
 
-#: actions/subscribe.php:145
+#. TRANS: Page title when subscription succeeded.
+#: actions/subscribe.php:149
 #, fuzzy
 msgid "Subscribed"
 msgstr "Abone ol"
@@ -6240,31 +6288,33 @@ msgid "Subscription feed for %s (Atom)"
 msgstr "%s için durum RSS beslemesi"
 
 #. TRANS: Checkbox label for enabling Jabber messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:239
-msgid "Jabber"
-msgstr "Jabber"
+#: actions/subscriptions.php:241 lib/settingsnav.php:110
+msgid "IM"
+msgstr ""
 
 #. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:254
+#: actions/subscriptions.php:256 lib/settingsnav.php:117
 msgid "SMS"
 msgstr ""
 
-#: actions/tag.php:69
+#. TRANS: Title for all but the first page of notices with tags.
+#. TRANS: %1$s is the tag, %2$d is the page number.
+#: actions/tag.php:73
 #, fuzzy, php-format
 msgid "Notices tagged with %1$s, page %2$d"
 msgstr "%s adli kullanicinin durum mesajlari"
 
-#: actions/tag.php:87
+#: actions/tag.php:91
 #, fuzzy, php-format
 msgid "Notice feed for tag %s (RSS 1.0)"
 msgstr "%s için durum RSS beslemesi"
 
-#: actions/tag.php:93
+#: actions/tag.php:97
 #, fuzzy, php-format
 msgid "Notice feed for tag %s (RSS 2.0)"
 msgstr "%s için durum RSS beslemesi"
 
-#: actions/tag.php:99
+#: actions/tag.php:103
 #, fuzzy, php-format
 msgid "Notice feed for tag %s (Atom)"
 msgstr "%s için durum RSS beslemesi"
@@ -6285,28 +6335,27 @@ msgstr ""
 msgid "User profile"
 msgstr "Kullanıcının profili yok."
 
-#. TRANS: DT element in area for user avatar.
-#: actions/tagother.php:81 actions/userauthorization.php:132
-#: lib/userprofile.php:108
-msgid "Photo"
-msgstr "Fotoğraf"
-
-#: actions/tagother.php:141
+#: actions/tagother.php:120
 msgid "Tag user"
 msgstr "Kullanıcıyı etiketle"
 
-#: actions/tagother.php:151
+#: actions/tagother.php:130
 msgid ""
 "Tags for this user (letters, numbers, -, ., and _), comma- or space- "
 "separated"
 msgstr ""
 
-#: actions/tagother.php:193
+#: actions/tagother.php:157
+#, php-format
+msgid "Invalid tag: \"%s\""
+msgstr "Geçersiz büyüklük."
+
+#: actions/tagother.php:172
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 
-#: actions/tagother.php:236
+#: actions/tagother.php:215
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
 
@@ -6314,6 +6363,7 @@ msgstr ""
 msgid "No such tag."
 msgstr "Böyle bir etiket yok."
 
+#. TRANS: Client error displayed when trying to unblock a non-blocked user.
 #: actions/unblock.php:59
 #, fuzzy
 msgid "You haven't blocked that user."
@@ -6339,12 +6389,83 @@ msgstr "Yetkilendirme isteği yok!"
 msgid "Unsubscribed"
 msgstr "Aboneliği sonlandır"
 
-#: actions/updateprofile.php:64 actions/userauthorization.php:337
+#: actions/updateprofile.php:64
 #, php-format
 msgid ""
 "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
 msgstr ""
 
+#: actions/urlsettings.php:60
+#, fuzzy
+msgid "URL settings"
+msgstr "Profil ayarları"
+
+#. TRANS: Instructions for tab "Other" in user profile settings.
+#: actions/urlsettings.php:72
+msgid "Manage various other options."
+msgstr ""
+
+#. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
+#. TRANS: user's profile settings. This message has one space at the beginning. Use your
+#. TRANS: language's word separator here if it has one (most likely a single space).
+#: actions/urlsettings.php:115
+msgid " (free service)"
+msgstr ""
+
+#: actions/urlsettings.php:121
+msgid "[none]"
+msgstr ""
+
+#: actions/urlsettings.php:122
+msgid "[internal]"
+msgstr ""
+
+#. TRANS: Label for dropdown with URL shortener services.
+#: actions/urlsettings.php:130
+msgid "Shorten URLs with"
+msgstr "Bağlantıları şununla kısalt"
+
+#. TRANS: Tooltip for for dropdown with URL shortener services.
+#: actions/urlsettings.php:132
+msgid "Automatic shortening service to use."
+msgstr "Kullanılacak otomatik kısaltma servisi."
+
+#: actions/urlsettings.php:138
+msgid "URL longer than"
+msgstr ""
+
+#: actions/urlsettings.php:141
+msgid "URLs longer than this will be shortened, 0 means always shorten."
+msgstr ""
+
+#: actions/urlsettings.php:145
+msgid "Text longer than"
+msgstr ""
+
+#: actions/urlsettings.php:148
+msgid ""
+"URLs in notices longer than this will be shortened, 0 means always shorten."
+msgstr ""
+
+#. TRANS: Form validation error for form "Other settings" in user profile.
+#: actions/urlsettings.php:180
+#, fuzzy
+msgid "URL shortening service is too long (maximum 50 characters)."
+msgstr "Yer bilgisi çok uzun (azm: 255 karakter)."
+
+#: actions/urlsettings.php:187
+msgid "Invalid number for max url length."
+msgstr ""
+
+#: actions/urlsettings.php:193
+#, fuzzy
+msgid "Invalid number for max notice length."
+msgstr "Geçersiz büyüklük."
+
+#: actions/urlsettings.php:238
+msgid "Error saving user URL shortening preferences."
+msgstr ""
+
 #. TRANS: User admin panel title
 #: actions/useradminpanel.php:58
 msgctxt "TITLE"
@@ -6371,11 +6492,11 @@ msgstr "Geçersiz lisans başlığı. En fazla uzunluk 255 karakterdir."
 #. TRANS: users in user admin panel. %1$s is the invalid nickname.
 #: actions/useradminpanel.php:166
 #, php-format
-msgid "Invalid default subscripton: '%1$s' is not a user."
+msgid "Invalid default subscripton: \"%1$s\" is not a user."
 msgstr ""
 
-#. TRANS: Link description in user account settings menu.
-#: actions/useradminpanel.php:215 lib/accountsettingsaction.php:106
+#: actions/useradminpanel.php:215 lib/action.php:565 lib/settingsnav.php:77
+#: lib/subgroupnav.php:81
 msgid "Profile"
 msgstr "Profil"
 
@@ -6436,128 +6557,174 @@ msgstr ""
 #. TRANS: Title for button to save user settings in user admin panel.
 #: actions/useradminpanel.php:302
 #, fuzzy
-msgid "Save user settings"
+msgid "Save user settings."
 msgstr "Profil ayarları"
 
-#: actions/userauthorization.php:105
+#. TRANS: Page title.
+#: actions/userauthorization.php:109
 msgid "Authorize subscription"
 msgstr "Takip isteğini onayla"
 
-#: actions/userauthorization.php:110
+#. TRANS: Page notice on "Auhtorize subscription" page.
+#: actions/userauthorization.php:115
 #, fuzzy
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
 "user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
-"click “Reject”."
+"click \"Reject\"."
 msgstr ""
 "Lütfen bu kullanıcının durumunu takip etmek istediğinizden emin olmak için "
 "detayları gözden geçirin. Kimsenin durumunu taki etme isteğinde "
 "bulunmadıysanız \"İptal\" tuşuna basın. "
 
-#. TRANS: Menu item for site administration
-#: actions/userauthorization.php:196 actions/version.php:167
-#: lib/adminpanelaction.php:403
-msgid "License"
-msgstr "Lisans"
-
-#: actions/userauthorization.php:217
+#. TRANS: Button text on Authorise Subscription page.
+#: actions/userauthorization.php:200
 #, fuzzy
+msgctxt "BUTTON"
 msgid "Accept"
 msgstr "Kabul et"
 
-#: actions/userauthorization.php:218 lib/subscribeform.php:115
-#: lib/subscribeform.php:139
-msgid "Subscribe to this user"
+#. TRANS: Title for button on Authorise Subscription page.
+#: actions/userauthorization.php:202
+#, fuzzy
+msgid "Subscribe to this user."
 msgstr "Bize o profili yollamadınız"
 
-#: actions/userauthorization.php:219
+#. TRANS: Button text on Authorise Subscription page.
+#: actions/userauthorization.php:204
 #, fuzzy
+msgctxt "BUTTON"
 msgid "Reject"
 msgstr "Reddet"
 
-#: actions/userauthorization.php:220
+#. TRANS: Title for button on Authorise Subscription page.
+#: actions/userauthorization.php:206
 #, fuzzy
-msgid "Reject this subscription"
+msgid "Reject this subscription."
 msgstr "Takip isteğini onayla"
 
-#: actions/userauthorization.php:232
+#. TRANS: Client error displayed for an empty authorisation request.
+#: actions/userauthorization.php:219
 msgid "No authorization request!"
 msgstr "Yetkilendirme isteği yok!"
 
-#: actions/userauthorization.php:254
+#. TRANS: Accept message header from Authorise subscription page.
+#: actions/userauthorization.php:242
 msgid "Subscription authorized"
 msgstr "Takip talebine izin verildi"
 
-#: actions/userauthorization.php:256
+#: actions/userauthorization.php:245
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to authorize the "
 "subscription. Your subscription token is:"
 msgstr ""
 
-#: actions/userauthorization.php:266
+#. TRANS: Reject message header from Authorise subscription page.
+#: actions/userauthorization.php:256
 msgid "Subscription rejected"
 msgstr "Abonelik reddedildi."
 
-#: actions/userauthorization.php:268
+#: actions/userauthorization.php:259
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to fully reject the "
 "subscription."
 msgstr ""
 
-#: actions/userauthorization.php:303
+#. TRANS: Exception thrown when no valid user is found for an authorisation request.
+#. TRANS: %s is a listener URI.
+#: actions/userauthorization.php:296
 #, php-format
-msgid "Listener URI ‘%s’ not found here."
+msgid "Listener URI \"%s\" not found here."
 msgstr ""
 
-#: actions/userauthorization.php:308
+#. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
+#. TRANS: %s is a listenee URI.
+#: actions/userauthorization.php:303
 #, fuzzy, php-format
-msgid "Listenee URI ‘%s’ is too long."
+msgid "Listenee URI \"%s\" is too long."
 msgstr "Kaynak bağlantı çok uzun."
 
-#: actions/userauthorization.php:314
-#, fuzzy, php-format
-msgid "Listenee URI ‘%s’ is a local user."
-msgstr "Kaynak bağlantı çok uzun."
+#. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
+#. TRANS: %s is a listenee URI.
+#: actions/userauthorization.php:311
+#, php-format
+msgid "Listenee URI \"%s\" is a local user."
+msgstr ""
 
+#. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
+#. TRANS: %s is a profile URL.
 #: actions/userauthorization.php:329
 #, php-format
-msgid "Profile URL ‘%s’ is for a local user."
+msgid "Profile URL \"%s\" is for a local user."
 msgstr ""
 
-#: actions/userauthorization.php:345
+#. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
+#. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
+#: actions/userauthorization.php:339
+#, php-format
+msgid ""
+"Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
+"\"."
+msgstr ""
+
+#. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
+#. TRANS: %s is an avatar URL.
+#: actions/userauthorization.php:349
 #, fuzzy, php-format
-msgid "Avatar URL ‘%s’ is not valid."
+msgid "Avatar URL \"%s\" is not valid."
 msgstr "Kaynak bağlantı geçerli değil."
 
-#: actions/userauthorization.php:350
+#. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
+#. TRANS: %s is an avatar URL.
+#: actions/userauthorization.php:356
 #, fuzzy, php-format
-msgid "Can’t read avatar URL ‘%s’."
+msgid "Cannot read avatar URL \"%s\"."
 msgstr "Avatar URLi '%s' okunamıyor"
 
-#: actions/userauthorization.php:355
+#. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
+#. TRANS: %s is an avatar URL.
+#: actions/userauthorization.php:363
 #, fuzzy, php-format
-msgid "Wrong image type for avatar URL ‘%s’."
+msgid "Wrong image type for avatar URL \"%s\"."
 msgstr "%s için yanlış resim türü"
 
 #. TRANS: Page title for profile design page.
-#: actions/userdesignsettings.php:74 lib/designsettings.php:63
+#: actions/userdesignsettings.php:74 lib/designsettings.php:61
 #, fuzzy
 msgid "Profile design"
 msgstr "Profil ayarları"
 
 #. TRANS: Instructions for profile design page.
-#: actions/userdesignsettings.php:84 lib/designsettings.php:74
+#: actions/userdesignsettings.php:84 lib/designsettings.php:72
 msgid ""
 "Customize the way your profile looks with a background image and a colour "
 "palette of your choice."
 msgstr ""
 
-#: actions/userdesignsettings.php:272
+#: actions/userdesignsettings.php:289
 msgid "Enjoy your hotdog!"
 msgstr ""
 
+#: actions/userdesignsettings.php:325
+#, fuzzy
+msgid "Design settings"
+msgstr "Profil ayarları"
+
+#: actions/userdesignsettings.php:340
+msgid "View profile designs"
+msgstr "Profil dizaynlarını görüntüle"
+
+#: actions/userdesignsettings.php:341
+msgid "Show or hide profile designs."
+msgstr ""
+
+#: actions/userdesignsettings.php:348
+#, fuzzy
+msgid "Background file"
+msgstr "Arkaplan"
+
 #. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number.
 #: actions/usergroups.php:66
 #, fuzzy, php-format
@@ -6605,6 +6772,11 @@ msgstr ""
 msgid "Contributors"
 msgstr ""
 
+#. TRANS: Menu item for site administration
+#: actions/version.php:167 lib/adminpanelaction.php:403
+msgid "License"
+msgstr "Lisans"
+
 #: actions/version.php:170
 msgid ""
 "StatusNet is free software: you can redistribute it and/or modify it under "
@@ -6628,12 +6800,14 @@ msgid ""
 "along with this program.  If not, see %s."
 msgstr ""
 
-#: actions/version.php:191
-msgid "Plugins"
-msgstr "Eklentiler"
+#. TRANS: Form input field label for application name.
+#: actions/version.php:197 lib/applicationeditform.php:190
+#, fuzzy
+msgid "Name"
+msgstr "Takma ad"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:901
+#: actions/version.php:198 lib/action.php:885
 msgid "Version"
 msgstr "Sürüm"
 
@@ -6641,6 +6815,12 @@ msgstr "Sürüm"
 msgid "Author(s)"
 msgstr ""
 
+#. TRANS: Form input field label.
+#: actions/version.php:200 lib/applicationeditform.php:208
+#: lib/groupeditform.php:168
+msgid "Description"
+msgstr "Tanım"
+
 #. TRANS: Activity title when marking a notice as favorite.
 #: classes/Fave.php:164
 msgid "Favor"
@@ -6757,7 +6937,7 @@ msgid "Could not create login token for %s"
 msgstr "Avatar bilgisi kaydedilemedi"
 
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
-#: classes/Memcached_DataObject.php:542
+#: classes/Memcached_DataObject.php:556
 msgid "No database name or DSN found anywhere."
 msgstr ""
 
@@ -6932,18 +7112,18 @@ msgstr "%1$s %2$s'da durumunuzu takip ediyor"
 
 #. TRANS: Notice given on user registration.
 #. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:395
+#: classes/User.php:390
 #, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr ""
 
 #. TRANS: Server exception.
-#: classes/User.php:918
+#: classes/User.php:923
 msgid "No single user defined for single-user mode."
 msgstr ""
 
 #. TRANS: Server exception.
-#: classes/User.php:922
+#: classes/User.php:927
 msgid "Single-user mode code called when not enabled."
 msgstr ""
 
@@ -6988,41 +7168,6 @@ msgstr ""
 msgid "No AtomPub API service for %s."
 msgstr ""
 
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:104
-msgid "Change your profile settings"
-msgstr "Profil ayarlarınızı değiştirin"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:111
-msgid "Upload an avatar"
-msgstr "Bir kullanıcı resmi yükle"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:118
-msgid "Change your password"
-msgstr "Parolanızı değiştirin"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:125
-msgid "Change email handling"
-msgstr ""
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:132
-msgid "Design your profile"
-msgstr "Profilinizi tasarlayın"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:139
-msgid "Other options"
-msgstr "Diğer seçenekler"
-
-#. TRANS: Link description in user account settings menu.
-#: lib/accountsettingsaction.php:141
-msgid "Other"
-msgstr "Diğer"
-
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
 #: lib/action.php:161
 #, fuzzy, php-format
@@ -7040,212 +7185,128 @@ msgctxt "TOOLTIP"
 msgid "Show more"
 msgstr ""
 
-#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:544
-msgid "Primary site navigation"
-msgstr ""
-
-#. TRANS: Tooltip for main menu option "Personal".
-#: lib/action.php:550
-msgctxt "TOOLTIP"
-msgid "Personal profile and friends timeline"
-msgstr "Kişisel profil ve arkadaşların zaman çizelgesi"
-
-#. TRANS: Main menu option when logged in for access to personal profile and friends timeline.
-#. TRANS: Personal group navigation menu option when logged in for viewing timeline of self and friends.
-#: lib/action.php:553 lib/personalgroupnav.php:100
-msgctxt "MENU"
-msgid "Personal"
-msgstr "Kişisel"
-
-#. TRANS: Tooltip for main menu option "Account".
-#: lib/action.php:555
-msgctxt "TOOLTIP"
-msgid "Change your email, avatar, password, profile"
-msgstr "E-postanızı, kullanıcı resminizi, parolanızı, profilinizi değiştirin"
-
-#. TRANS: Main menu option when logged in for access to user settings.
-#: lib/action.php:558
-msgid "Account"
-msgstr "Hesap"
-
-#. TRANS: Tooltip for main menu option "Services".
-#: lib/action.php:560
-msgctxt "TOOLTIP"
-msgid "Connect to services"
-msgstr "Servislere bağlan"
-
-#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services.
-#: lib/action.php:563
-msgid "Connect"
-msgstr "Bağlan"
-
-#. TRANS: Tooltip for menu option "Admin".
-#: lib/action.php:566
-msgctxt "TOOLTIP"
-msgid "Change site configuration"
-msgstr "Site yapılandırmasını değiştir"
-
-#. TRANS: Main menu option when logged in and site admin for access to site configuration.
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/action.php:569 lib/groupnav.php:117
-msgctxt "MENU"
-msgid "Admin"
-msgstr "Yönetim"
-
-#. TRANS: Tooltip for main menu option "Invite".
-#: lib/action.php:573
-#, php-format
-msgctxt "TOOLTIP"
-msgid "Invite friends and colleagues to join you on %s"
-msgstr ""
-"%s üzerinde size katılmaları için arkadaşlarınızı ve meslektaşlarınızı davet "
-"edin"
-
-#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users.
-#: lib/action.php:576
-msgctxt "MENU"
-msgid "Invite"
-msgstr "Davet et"
-
-#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:582
-msgctxt "TOOLTIP"
-msgid "Logout from the site"
-msgstr ""
-
-#. TRANS: Main menu option when logged in to log out the current user.
-#: lib/action.php:585
+#. TRANS: Inline reply form submit button: submits a reply comment.
+#: lib/action.php:328
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Comment"
+msgstr "İçerik"
+
+#. TRANS: Placeholder text for inline reply form. Clicking in this box will turn it into a mini notice form.
+#: lib/action.php:331
+msgid "Add a comment..."
+msgstr ""
+
+#: lib/action.php:559 lib/personalgroupnav.php:99
+#, fuzzy
+msgid "Home"
+msgstr "Başlangıç Sayfası"
+
+#: lib/action.php:560
+#, fuzzy
+msgid "Friends timeline"
+msgstr "%s zaman çizelgesi"
+
+#: lib/action.php:566
+#, fuzzy
+msgid "Your profile"
+msgstr "Kullanıcının profili yok."
+
+#: lib/action.php:570 lib/action.php:593 lib/publicgroupnav.php:78
+msgid "Public"
+msgstr "Genel"
+
+#: lib/action.php:571 lib/action.php:594
+#, fuzzy
+msgid "Everyone on this site"
+msgstr "Siteye giriş"
+
+#: lib/action.php:575
+#, fuzzy
+msgid "Settings"
+msgstr "Profil ayarları"
+
+#: lib/action.php:576
+#, fuzzy
+msgid "Change your personal settings"
+msgstr "Profil ayarlarınızı değiştirin"
+
+#: lib/action.php:582
+#, fuzzy
+msgid "Site configuration"
+msgstr "Onay kodu yok."
+
+#: lib/action.php:587
 #, fuzzy
-msgctxt "MENU"
 msgid "Logout"
 msgstr "Çıkış"
 
-#. TRANS: Tooltip for main menu option "Register".
-#: lib/action.php:590
-msgctxt "TOOLTIP"
-msgid "Create an account"
-msgstr "Bir hesap oluştur"
+#: lib/action.php:588
+#, fuzzy
+msgid "Logout from the site"
+msgstr "Siteye giriş"
 
-#. TRANS: Main menu option when not logged in to register a new account.
-#. TRANS: Menu item for registering with the StatusNet site.
-#: lib/action.php:593 lib/logingroupnav.php:85
-msgctxt "MENU"
-msgid "Register"
-msgstr "Kayıt"
-
-#. TRANS: Tooltip for main menu option "Login".
-#: lib/action.php:596
-msgctxt "TOOLTIP"
+#: lib/action.php:599
+#, fuzzy
 msgid "Login to the site"
 msgstr "Siteye giriş"
 
-#. TRANS: Main menu option when not logged in to log in.
-#. TRANS: Menu item for logging in to the StatusNet site.
-#: lib/action.php:599 lib/logingroupnav.php:77
-msgctxt "MENU"
-msgid "Login"
-msgstr "Giriş"
-
-#. TRANS: Tooltip for main menu option "Help".
-#: lib/action.php:602
-msgctxt "TOOLTIP"
-msgid "Help me!"
-msgstr "Bana yardım et!"
-
-#. TRANS: Main menu option for help on the StatusNet site.
-#: lib/action.php:605
-msgctxt "MENU"
-msgid "Help"
-msgstr "Yardım"
-
-#. TRANS: Tooltip for main menu option "Search".
-#: lib/action.php:608
-msgctxt "TOOLTIP"
-msgid "Search for people or text"
-msgstr "Kişi ya da yazılar için arama yap"
-
-#. TRANS: Main menu option when logged in or when the StatusNet instance is not private.
-#: lib/action.php:611
-msgctxt "MENU"
+#: lib/action.php:606
+#, fuzzy
 msgid "Search"
 msgstr "Ara"
 
-#. TRANS: DT element for site notice. String is hidden in default CSS.
-#. TRANS: Menu item for site administration
-#: lib/action.php:633 lib/adminpanelaction.php:387
+#: lib/action.php:607
 #, fuzzy
-msgid "Site notice"
-msgstr "Yeni durum mesajı"
-
-#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:700
-msgid "Local views"
-msgstr ""
-
-#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:770
-#, fuzzy
-msgid "Page notice"
-msgstr "Yeni durum mesajı"
-
-#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:874
-#, fuzzy
-msgid "Secondary site navigation"
-msgstr "Abonelikler"
+msgid "Search the site"
+msgstr "Ara"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:880
+#: lib/action.php:864
 msgid "Help"
 msgstr "Yardım"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:883
+#: lib/action.php:867
 msgid "About"
 msgstr "Hakkında"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:886
+#: lib/action.php:870
 msgid "FAQ"
 msgstr "SSS"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:891
+#: lib/action.php:875
 msgid "TOS"
 msgstr ""
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:895
+#: lib/action.php:879
 msgid "Privacy"
 msgstr "Gizlilik"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:898
+#: lib/action.php:882
 msgid "Source"
 msgstr "Kaynak"
 
 #. TRANS: Secondary navigation menu option leading to e-mail contact information on the
 #. TRANS: StatusNet site, where to report bugs, ...
-#: lib/action.php:905
+#: lib/action.php:889
 msgid "Contact"
 msgstr "İletişim"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:908
+#: lib/action.php:892
 msgid "Badge"
 msgstr ""
 
-#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:937
-msgid "StatusNet software license"
-msgstr "StatusNet yazılım lisansı"
-
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:944
+#: lib/action.php:921
 #, fuzzy, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7255,7 +7316,7 @@ msgstr ""
 "hazırlanan anında mesajlaşma ağıdır. "
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:947
+#: lib/action.php:924
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** bir aninda mesajlaşma sosyal ağıdır."
@@ -7264,7 +7325,7 @@ msgstr "**%%site.name%%** bir aninda mesajlaşma sosyal ağıdır."
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:954
+#: lib/action.php:931
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7275,51 +7336,41 @@ msgstr ""
 "licenses/agpl-3.0.html) lisansı ile korunan [StatusNet](http://status.net/) "
 "microbloglama yazılımının %s. versiyonunu kullanmaktadır."
 
-#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:970
-msgid "Site content license"
-msgstr "Site içeriği lisansı"
-
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:977
+#: lib/action.php:949
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:984
+#: lib/action.php:956
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:988
+#: lib/action.php:960
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:1020
+#: lib/action.php:992
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
 
-#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1356
-msgid "Pagination"
-msgstr ""
-
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1367
+#: lib/action.php:1335
 msgid "After"
 msgstr "Sonra"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1377
+#: lib/action.php:1345
 msgid "Before"
 msgstr "Önce"
 
@@ -7473,7 +7524,7 @@ msgid "User configuration"
 msgstr "Onay kodu yok."
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:122
+#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:110
 msgid "User"
 msgstr "Kullanıcı"
 
@@ -7498,6 +7549,12 @@ msgstr "Eposta adresi onayı"
 msgid "Edit site notice"
 msgstr "Site durum mesajını düzenle"
 
+#. TRANS: Menu item for site administration
+#: lib/adminpanelaction.php:387
+#, fuzzy
+msgid "Site notice"
+msgstr "Yeni durum mesajı"
+
 #. TRANS: Menu item title/tooltip
 #: lib/adminpanelaction.php:393
 #, fuzzy
@@ -7509,6 +7566,12 @@ msgstr "Eposta adresi onayı"
 msgid "Set site license"
 msgstr ""
 
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:409
+#, fuzzy
+msgid "Plugins configuration"
+msgstr "Yol yapılandırması"
+
 #. TRANS: Client error 401.
 #: lib/apiauth.php:111
 msgid "API resource requires read-write access, but you only have read access."
@@ -7519,19 +7582,23 @@ msgstr ""
 msgid "No application for that consumer key."
 msgstr ""
 
+#: lib/apiauth.php:202 lib/apiauth.php:284
+msgid "Not allowed to use API."
+msgstr ""
+
 #. TRANS: OAuth exception given when an incorrect access token was given for a user.
-#: lib/apiauth.php:219
+#: lib/apiauth.php:225
 msgid "Bad access token."
 msgstr ""
 
 #. TRANS: OAuth exception given when no user was found for a given token (no token was found).
-#: lib/apiauth.php:224
+#: lib/apiauth.php:230
 msgid "No user for that token."
 msgstr ""
 
 #. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel".
 #. TRANS: Client error thrown when authentication fails.
-#: lib/apiauth.php:266 lib/apiauth.php:293
+#: lib/apiauth.php:272 lib/apiauth.php:302
 msgid "Could not authenticate you."
 msgstr ""
 
@@ -7578,6 +7645,11 @@ msgstr ""
 msgid "Failed to delete revoked token."
 msgstr ""
 
+#. TRANS: Form input field label for application icon.
+#: lib/applicationeditform.php:177
+msgid "Icon"
+msgstr "Simge"
+
 #. TRANS: Form guide.
 #: lib/applicationeditform.php:182
 msgid "Icon for this application"
@@ -7615,6 +7687,11 @@ msgstr "Kaynak"
 msgid "Organization responsible for this application"
 msgstr ""
 
+#. TRANS: Form input field label.
+#: lib/applicationeditform.php:227
+msgid "Organization"
+msgstr "Organizasyon"
+
 #. TRANS: Form input field instructions.
 #: lib/applicationeditform.php:234
 #, fuzzy
@@ -7705,16 +7782,6 @@ msgstr ""
 msgid "Do not use this method!"
 msgstr "Bu durum mesajını silme"
 
-#. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:293
-msgid "Author"
-msgstr ""
-
-#. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:307
-msgid "Provider"
-msgstr "Sağlayıcı"
-
 #. TRANS: Title.
 #: lib/attachmentnoticesection.php:67
 msgid "Notices where this attachment appears"
@@ -7742,23 +7809,28 @@ msgstr "Parola kaydedildi."
 msgid "Block"
 msgstr "Engelle"
 
+#. TRANS: Description of the form to block a user.
+#: lib/blockform.php:79
+msgid "Block this user"
+msgstr "Bu kullanıcıyı engelle"
+
 #. TRANS: Title for command results.
-#: lib/channel.php:160 lib/channel.php:181
+#: lib/channel.php:104 lib/channel.php:125
 msgid "Command results"
 msgstr ""
 
 #. TRANS: Title for command results.
-#: lib/channel.php:194
+#: lib/channel.php:138
 msgid "AJAX error"
 msgstr ""
 
 #. TRANS: E-mail subject when a command has completed.
-#: lib/channel.php:233 lib/mailhandler.php:143
+#: lib/channel.php:177 lib/mailhandler.php:143
 msgid "Command complete"
 msgstr ""
 
 #. TRANS: E-mail subject when a command has failed.
-#: lib/channel.php:244
+#: lib/channel.php:188
 msgid "Command failed"
 msgstr ""
 
@@ -7859,7 +7931,7 @@ msgstr "Tam İsim: %s"
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a location.
-#: lib/command.php:446 lib/mail.php:270
+#: lib/command.php:446 lib/mail.php:275
 #, php-format
 msgid "Location: %s"
 msgstr "Yer: %s"
@@ -7867,7 +7939,7 @@ msgstr "Yer: %s"
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a homepage.
-#: lib/command.php:450 lib/mail.php:274
+#: lib/command.php:450 lib/mail.php:279
 #, fuzzy, php-format
 msgid "Homepage: %s"
 msgstr "Başlangıç Sayfası"
@@ -8100,114 +8172,105 @@ msgid ""
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:162
+#: lib/common.php:36
 #, fuzzy
 msgid "No configuration file found."
 msgstr "Onay kodu yok."
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:165
+#: lib/common.php:39
 msgid "I looked for configuration files in the following places:"
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:168
+#: lib/common.php:42
 msgid "You may wish to run the installer to fix this."
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:172
+#: lib/common.php:46
 msgid "Go to the installer."
 msgstr ""
 
-#. TRANS: Menu item for Instant Messaging settings.
-#: lib/connectsettingsaction.php:106
-msgctxt "MENU"
-msgid "IM"
-msgstr ""
-
-#. TRANS: Tooltip for Instant Messaging menu item.
-#: lib/connectsettingsaction.php:108
-msgid "Updates by instant messenger (IM)"
-msgstr ""
-
-#. TRANS: Menu item for Short Message Service settings.
-#: lib/connectsettingsaction.php:113
-msgctxt "MENU"
-msgid "SMS"
-msgstr ""
-
-#. TRANS: Tooltip for Short Message Service menu item.
-#: lib/connectsettingsaction.php:115
-msgid "Updates by SMS"
-msgstr ""
-
-#. TRANS: Menu item for OuAth connection settings.
-#: lib/connectsettingsaction.php:120
-#, fuzzy
-msgctxt "MENU"
-msgid "Connections"
-msgstr "Bağlan"
-
-#. TRANS: Tooltip for connected applications (Connections through OAuth) menu item.
-#: lib/connectsettingsaction.php:122
-msgid "Authorized connected applications"
-msgstr ""
-
 #: lib/dberroraction.php:59
 msgid "Database error"
 msgstr ""
 
+#. TRANS: Description of form for deleting a user.
+#: lib/deleteuserform.php:75
+msgid "Delete this user"
+msgstr "Bu kullanıcıyı sil"
+
+#: lib/designform.php:114
+#, fuzzy
+msgid "Change design"
+msgstr "Dizaynı kaydet"
+
+#. TRANS: Fieldset legend on profile design page to change profile page colours.
+#: lib/designform.php:131
+msgid "Change colours"
+msgstr "Renkleri değiştir"
+
+#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
+#: lib/designform.php:138
+msgid "Use defaults"
+msgstr "Öntanımlıları kullan"
+
+#. TRANS: Title for button on profile design page to reset all colour settings to default.
+#: lib/designform.php:140
+msgid "Restore default designs"
+msgstr ""
+
+#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
+#: lib/designform.php:148
+msgid "Reset back to default"
+msgstr "Öntanımlıya geri dön"
+
 #. TRANS: Label in form on profile design page.
 #. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
-#: lib/designsettings.php:108
+#: lib/designform.php:158
 #, fuzzy
 msgid "Upload file"
 msgstr "Yükle"
 
 #. TRANS: Instructions for form on profile design page.
-#: lib/designsettings.php:113
+#: lib/designform.php:163
 #, fuzzy
 msgid ""
-"You can upload your personal background image. The maximum file size is 2MB."
+"You can upload your personal background image. The maximum file size is 2Mb."
 msgstr ""
 "Ah, durumunuz biraz uzun kaçtı. Azami 180 karaktere sığdırmaya ne dersiniz?"
 
 #. TRANS: Radio button on profile design page that will enable use of the uploaded profile image.
-#: lib/designsettings.php:139
+#: lib/designform.php:194
 #, fuzzy
 msgctxt "RADIO"
 msgid "On"
 msgstr "Açık"
 
 #. TRANS: Radio button on profile design page that will disable use of the uploaded profile image.
-#: lib/designsettings.php:156
+#: lib/designform.php:211
 #, fuzzy
 msgctxt "RADIO"
 msgid "Off"
 msgstr "Kapalı"
 
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: lib/designsettings.php:175
-msgid "Change colours"
-msgstr "Renkleri değiştir"
-
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: lib/designsettings.php:257
-msgid "Use defaults"
-msgstr "Öntanımlıları kullan"
+#. TRANS: Title for button on profile design page to save settings.
+#: lib/designform.php:322
+msgid "Save design"
+msgstr "Dizaynı kaydet"
 
 #. TRANS: Error message displayed if design settings could not be saved.
 #. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
-#: lib/designsettings.php:405 lib/designsettings.php:427
+#: lib/designsettings.php:216 lib/designsettings.php:238
 #, fuzzy
 msgid "Couldn't update your design."
 msgstr "Kullanıcı güncellenemedi."
 
 #. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
-#: lib/designsettings.php:433
+#: lib/designsettings.php:244
 msgid "Design defaults restored."
 msgstr ""
 
@@ -8277,27 +8340,23 @@ msgstr ""
 msgid "Feeds"
 msgstr ""
 
-#: lib/galleryaction.php:121
-msgid "Filter tags"
-msgstr ""
-
-#: lib/galleryaction.php:131
+#: lib/galleryaction.php:128
 msgid "All"
 msgstr ""
 
-#: lib/galleryaction.php:139
+#: lib/galleryaction.php:136
 msgid "Select tag to filter"
 msgstr ""
 
-#: lib/galleryaction.php:140
+#: lib/galleryaction.php:137
 msgid "Tag"
 msgstr ""
 
-#: lib/galleryaction.php:141
+#: lib/galleryaction.php:138
 msgid "Choose a tag to narrow list"
 msgstr ""
 
-#: lib/galleryaction.php:143
+#: lib/galleryaction.php:140
 msgid "Go"
 msgstr ""
 
@@ -8387,6 +8446,12 @@ msgctxt "TOOLTIP"
 msgid "%s blocked users"
 msgstr ""
 
+#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
+#: lib/groupnav.php:117
+msgctxt "MENU"
+msgid "Admin"
+msgstr "Yönetim"
+
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
 #: lib/groupnav.php:120
@@ -8495,27 +8560,49 @@ msgid "%dB"
 msgid_plural "%dB"
 msgstr[0] ""
 
-#: lib/jabber.php:387
+#: lib/implugin.php:262
 #, php-format
-msgid "[%s]"
+msgid ""
+"User \"%s\" on %s has said that your %s screenname belongs to them. If "
+"that's true, you can confirm by clicking on this URL: %s . (If you cannot "
+"click it, copy-and-paste it into the address bar of your browser). If that "
+"user isn't you, or if you didn't request this confirmation, just ignore this "
+"message."
 msgstr ""
 
-#: lib/jabber.php:567
+#: lib/implugin.php:349
 #, php-format
 msgid "Unknown inbox source %d."
 msgstr ""
 
+#: lib/implugin.php:485
+#, fuzzy, php-format
+msgid "Message too long - maximum is %1$d characters, you sent %2$d."
+msgstr "Bu çok uzun. Maksimum durum mesajı boyutu %d karakterdir."
+
 #: lib/leaveform.php:114
 #, fuzzy
 msgid "Leave"
 msgstr "Kaydet"
 
+#. TRANS: Menu item for logging in to the StatusNet site.
+#: lib/logingroupnav.php:77
+msgctxt "MENU"
+msgid "Login"
+msgstr "Giriş"
+
 #. TRANS: Title for menu item for logging in to the StatusNet site.
 #: lib/logingroupnav.php:79
 #, fuzzy
 msgid "Login with a username and password"
 msgstr "Geçersiz kullanıcı adı veya parola."
 
+#. TRANS: Menu item for registering with the StatusNet site.
+#: lib/logingroupnav.php:85
+msgctxt "MENU"
+msgid "Register"
+msgstr "Kayıt"
+
 #. TRANS: Title for menu item for registering with the StatusNet site.
 #: lib/logingroupnav.php:87
 #, fuzzy
@@ -8523,14 +8610,14 @@ msgid "Sign up for a new account"
 msgstr "Yeni hesap oluştur"
 
 #. TRANS: Subject for address confirmation email.
-#: lib/mail.php:168
+#: lib/mail.php:172
 msgid "Email address confirmation"
 msgstr "Eposta adresi onayı"
 
 #. TRANS: Body for address confirmation email.
 #. TRANS: %1$s is the addressed user's nickname, %2$s is the StatusNet sitename,
 #. TRANS: %3$s is the URL to confirm at.
-#: lib/mail.php:173
+#: lib/mail.php:177
 #, php-format
 msgid ""
 "Hey, %1$s.\n"
@@ -8549,14 +8636,14 @@ msgstr ""
 
 #. TRANS: Subject of new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
-#: lib/mail.php:238
+#: lib/mail.php:243
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1$s %2$s'da durumunuzu takip ediyor"
 
 #. TRANS: This is a paragraph in a new-subscriber e-mail.
 #. TRANS: %s is a URL where the subscriber can be reported as abusive.
-#: lib/mail.php:245
+#: lib/mail.php:250
 #, php-format
 msgid ""
 "If you believe this account is being used abusively, you can block them from "
@@ -8568,7 +8655,7 @@ msgstr ""
 #. TRANS: %3$s is the subscriber's profile URL, %4$s is the subscriber's location (or empty)
 #. TRANS: %5$s is the subscriber's homepage URL (or empty), %6%s is the subscriber's bio (or empty)
 #. TRANS: %7$s is a link to the addressed user's e-mail settings.
-#: lib/mail.php:255
+#: lib/mail.php:260
 #, fuzzy, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -8591,14 +8678,14 @@ msgstr ""
 
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is biographical information.
-#: lib/mail.php:278
+#: lib/mail.php:283
 #, fuzzy, php-format
 msgid "Bio: %s"
 msgstr "Hakkında"
 
 #. TRANS: Subject of notification mail for new posting email address.
 #. TRANS: %s is the StatusNet sitename.
-#: lib/mail.php:307
+#: lib/mail.php:312
 #, fuzzy, php-format
 msgid "New email address for posting to %s"
 msgstr "Kullanıcı için kaydedilmiş eposta adresi yok."
@@ -8606,7 +8693,7 @@ msgstr "Kullanıcı için kaydedilmiş eposta adresi yok."
 #. TRANS: Body of notification mail for new posting email address.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is the e-mail address to send
 #. TRANS: to to post by e-mail, %3$s is a URL to more instructions.
-#: lib/mail.php:313
+#: lib/mail.php:318
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -8621,27 +8708,27 @@ msgstr ""
 
 #. TRANS: Subject line for SMS-by-email notification messages.
 #. TRANS: %s is the posting user's nickname.
-#: lib/mail.php:434
+#: lib/mail.php:439
 #, php-format
 msgid "%s status"
 msgstr "%s durum"
 
 #. TRANS: Subject line for SMS-by-email address confirmation message.
-#: lib/mail.php:460
+#: lib/mail.php:465
 #, fuzzy
 msgid "SMS confirmation"
 msgstr "Onay kodu yok."
 
 #. TRANS: Main body heading for SMS-by-email address confirmation message.
 #. TRANS: %s is the addressed user's nickname.
-#: lib/mail.php:464
+#: lib/mail.php:469
 #, php-format
 msgid "%s: confirm you own this phone number with this code:"
 msgstr ""
 
 #. TRANS: Subject for 'nudge' notification email.
 #. TRANS: %s is the nudging user.
-#: lib/mail.php:485
+#: lib/mail.php:490
 #, php-format
 msgid "You have been nudged by %s"
 msgstr ""
@@ -8649,7 +8736,7 @@ msgstr ""
 #. TRANS: Body for 'nudge' notification email.
 #. TRANS: %1$s is the nuding user's long name, $2$s is the nudging user's nickname,
 #. TRANS: %3$s is a URL to post notices at, %4$s is the StatusNet sitename.
-#: lib/mail.php:492
+#: lib/mail.php:497
 #, php-format
 msgid ""
 "%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -8667,7 +8754,7 @@ msgstr ""
 
 #. TRANS: Subject for direct-message notification email.
 #. TRANS: %s is the sending user's nickname.
-#: lib/mail.php:539
+#: lib/mail.php:544
 #, php-format
 msgid "New private message from %s"
 msgstr ""
@@ -8676,7 +8763,7 @@ msgstr ""
 #. TRANS: %1$s is the sending user's long name, %2$s is the sending user's nickname,
 #. TRANS: %3$s is the message content, %4$s a URL to the message,
 #. TRANS: %5$s is the StatusNet sitename.
-#: lib/mail.php:547
+#: lib/mail.php:552
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -8697,7 +8784,7 @@ msgstr ""
 
 #. TRANS: Subject for favorite notification e-mail.
 #. TRANS: %1$s is the adding user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:599
+#: lib/mail.php:604
 #, fuzzy, php-format
 msgid "%1$s (@%2$s) added your notice as a favorite"
 msgstr "%1$s %2$s'da durumunuzu takip ediyor"
@@ -8707,7 +8794,7 @@ msgstr "%1$s %2$s'da durumunuzu takip ediyor"
 #. TRANS: %3$s is a URL to the faved notice, %4$s is the faved notice text,
 #. TRANS: %5$s is a URL to all faves of the adding user, %6$s is the StatusNet sitename,
 #. TRANS: %7$s is the adding user's nickname.
-#: lib/mail.php:606
+#: lib/mail.php:611
 #, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -8729,7 +8816,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:664
+#: lib/mail.php:669
 #, php-format
 msgid ""
 "The full conversation can be read here:\n"
@@ -8739,7 +8826,7 @@ msgstr ""
 
 #. TRANS: E-mail subject for notice notification.
 #. TRANS: %1$s is the sending user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:672
+#: lib/mail.php:677
 #, php-format
 msgid "%1$s (@%2$s) sent a notice to your attention"
 msgstr ""
@@ -8750,7 +8837,7 @@ msgstr ""
 #. TRANS: %5$s is a URL to the full conversion if it exists (otherwise empty),
 #. TRANS: %6$s is a URL to reply to the notice, %7$s is a URL to all @-replied for the addressed user,
 #. TRANS: %8$s is a URL to the addressed user's e-mail settings, %9$s is the sender's nickname.
-#: lib/mail.php:680
+#: lib/mail.php:685
 #, php-format
 msgid ""
 "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -8866,12 +8953,7 @@ msgstr "Bu kullanıcıyı zaten takip etmiyorsunuz!"
 msgid "To"
 msgstr ""
 
-#: lib/messageform.php:166 lib/noticeform.php:186
-#, fuzzy
-msgid "Available characters"
-msgstr "6 veya daha fazla karakter"
-
-#: lib/messageform.php:185 lib/noticeform.php:237
+#: lib/messageform.php:184 lib/noticeform.php:236
 #, fuzzy
 msgctxt "Send button for sending notice"
 msgid "Send"
@@ -8882,17 +8964,10 @@ msgstr "Gönder"
 msgid "Messages"
 msgstr "Mesaj gönder"
 
-#: lib/messagelistitem.php:123 lib/noticelist.php:522
+#: lib/messagelistitem.php:123 lib/noticelist.php:527
 msgid "from"
 msgstr ""
 
-#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:165
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr ""
-"Takma ad sadece küçük harflerden ve rakamlardan oluşabilir, boşluk "
-"kullanılamaz. "
-
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 #: lib/nickname.php:178
 msgid "Nickname cannot be empty."
@@ -8915,82 +8990,86 @@ msgstr "Yeni durum mesajı"
 msgid "What's up, %s?"
 msgstr "N'aber %s?"
 
-#: lib/noticeform.php:194
+#: lib/noticeform.php:193
 msgid "Attach"
 msgstr ""
 
-#: lib/noticeform.php:198
+#: lib/noticeform.php:197
 msgid "Attach a file"
 msgstr ""
 
-#: lib/noticeform.php:213
+#: lib/noticeform.php:212
 #, fuzzy
 msgid "Share my location"
 msgstr "Profil kaydedilemedi."
 
-#: lib/noticeform.php:216
+#: lib/noticeform.php:215
 #, fuzzy
 msgid "Do not share my location"
 msgstr "Profil kaydedilemedi."
 
-#: lib/noticeform.php:217
+#: lib/noticeform.php:216
 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
 "try again later"
 msgstr ""
 
 #. TRANS: Used in coordinates as abbreviation of north
-#: lib/noticelist.php:452
+#: lib/noticelist.php:457
 msgid "N"
 msgstr "K"
 
 #. TRANS: Used in coordinates as abbreviation of south
-#: lib/noticelist.php:454
+#: lib/noticelist.php:459
 msgid "S"
 msgstr "G"
 
 #. TRANS: Used in coordinates as abbreviation of east
-#: lib/noticelist.php:456
+#: lib/noticelist.php:461
 msgid "E"
 msgstr "D"
 
 #. TRANS: Used in coordinates as abbreviation of west
-#: lib/noticelist.php:458
+#: lib/noticelist.php:463
 msgid "W"
 msgstr "B"
 
-#: lib/noticelist.php:460
+#: lib/noticelist.php:465
 #, php-format
 msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgstr ""
 
-#: lib/noticelist.php:469
+#: lib/noticelist.php:474
 msgid "at"
 msgstr ""
 
-#: lib/noticelist.php:518
+#: lib/noticelist.php:523
 msgid "web"
 msgstr ""
 
-#: lib/noticelist.php:584
+#: lib/noticelist.php:589
 #, fuzzy
 msgid "in context"
 msgstr "İçerik yok!"
 
-#: lib/noticelist.php:619
+#: lib/noticelist.php:624
 #, fuzzy
 msgid "Repeated by"
 msgstr "Yarat"
 
-#: lib/noticelist.php:646
+#: lib/noticelist.php:651
 msgid "Reply to this notice"
 msgstr ""
 
-#: lib/noticelist.php:647
+#: lib/noticelist.php:652
 msgid "Reply"
 msgstr "Cevaplar"
 
-#: lib/noticelist.php:691
+#: lib/noticelist.php:678
+msgid "Delete this notice"
+msgstr "Bu durum mesajını sil"
+
+#: lib/noticelist.php:696
 #, fuzzy
 msgid "Notice repeated"
 msgstr "Durum mesajları"
@@ -9028,46 +9107,29 @@ msgstr ""
 msgid "Couldn't insert new subscription."
 msgstr "Yeni abonelik eklenemedi."
 
-#. TRANS: Personal group navigation menu option when logged in for viewing @-replies.
-#: lib/personalgroupnav.php:107
+#: lib/personalgroupnav.php:104
 #, fuzzy
-msgctxt "MENU"
 msgid "Replies"
 msgstr "Cevaplar"
 
-#. TRANS: Personal group navigation menu option when logged in for seeing own profile.
-#: lib/personalgroupnav.php:114
+#: lib/personalgroupnav.php:109
 #, fuzzy
-msgctxt "MENU"
-msgid "Profile"
-msgstr "Profil"
-
-#. TRANS: Personal group navigation menu option when logged in for viewing own favourited notices.
-#: lib/personalgroupnav.php:120
-#, fuzzy
-msgctxt "MENU"
 msgid "Favorites"
 msgstr "%s favorileri"
 
-#. TRANS: Personal group navigation menu option when logged in for viewing recieved personal messages.
-#: lib/personalgroupnav.php:133
-msgctxt "MENU"
+#: lib/personalgroupnav.php:120
 msgid "Inbox"
 msgstr ""
 
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing recieved personal messages.
-#: lib/personalgroupnav.php:135
+#: lib/personalgroupnav.php:121
 msgid "Your incoming messages"
 msgstr ""
 
-#. TRANS: Personal group navigation menu option when logged in for viewing senet personal messages.
-#: lib/personalgroupnav.php:140
-msgctxt "MENU"
+#: lib/personalgroupnav.php:125
 msgid "Outbox"
 msgstr ""
 
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing senet personal messages.
-#: lib/personalgroupnav.php:142
+#: lib/personalgroupnav.php:126
 msgid "Your sent messages"
 msgstr ""
 
@@ -9082,9 +9144,26 @@ msgstr ""
 msgid "Unknown"
 msgstr ""
 
+#. TRANS: Plugin admin panel controls
+#: lib/plugindisableform.php:90
+msgctxt "plugin"
+msgid "Disable"
+msgstr ""
+
+#. TRANS: Plugin admin panel controls
+#: lib/pluginenableform.php:112
+msgctxt "plugin"
+msgid "Enable"
+msgstr ""
+
+#: lib/pluginlist.php:196
+msgctxt "plugin-description"
+msgid "(Plugin descriptions unavailable when disabled.)"
+msgstr ""
+
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:82
+#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:88
 msgid "Subscriptions"
 msgstr "Abonelikler"
 
@@ -9095,7 +9174,7 @@ msgstr "Bütün abonelikler"
 
 #. TRANS: H2 text for user subscriber statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:90
+#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:96
 msgid "Subscribers"
 msgstr "Abone olanlar"
 
@@ -9118,7 +9197,7 @@ msgstr "Üyelik başlangıcı"
 #. TRANS: Label for user statistics.
 #. TRANS: H2 text for user group membership statistics.
 #: lib/profileaction.php:239 lib/profileaction.php:290
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:104
 msgid "Groups"
 msgstr "Gruplar"
 
@@ -9138,10 +9217,6 @@ msgstr ""
 msgid "Unimplemented method."
 msgstr ""
 
-#: lib/publicgroupnav.php:78
-msgid "Public"
-msgstr "Genel"
-
 #: lib/publicgroupnav.php:82
 msgid "User groups"
 msgstr ""
@@ -9184,7 +9259,7 @@ msgid "Revoke the \"%s\" role from this user"
 msgstr "Böyle bir kullanıcı yok."
 
 #. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:974
+#: lib/router.php:1001
 #, fuzzy
 msgid "Page not found."
 msgstr "Onay kodu bulunamadı."
@@ -9216,12 +9291,6 @@ msgctxt "BUTTON"
 msgid "Search"
 msgstr ""
 
-#. TRANS: Definition list item with instructions on how to get (better) search results.
-#: lib/searchaction.php:170
-#, fuzzy
-msgid "Search help"
-msgstr "Ara"
-
 #: lib/searchgroupnav.php:80
 #, fuzzy
 msgid "People"
@@ -9247,6 +9316,51 @@ msgstr ""
 msgid "More..."
 msgstr ""
 
+#: lib/settingsnav.php:78
+msgid "Change your profile settings"
+msgstr "Profil ayarlarınızı değiştirin"
+
+#: lib/settingsnav.php:83
+msgid "Upload an avatar"
+msgstr "Bir kullanıcı resmi yükle"
+
+#: lib/settingsnav.php:88
+msgid "Change your password"
+msgstr "Parolanızı değiştirin"
+
+#: lib/settingsnav.php:93
+msgid "Change email handling"
+msgstr ""
+
+#: lib/settingsnav.php:98
+msgid "Design your profile"
+msgstr "Profilinizi tasarlayın"
+
+#: lib/settingsnav.php:102
+msgid "URL"
+msgstr "Bağlantı"
+
+#: lib/settingsnav.php:103
+msgid "URL shorteners"
+msgstr ""
+
+#: lib/settingsnav.php:111
+msgid "Updates by instant messenger (IM)"
+msgstr ""
+
+#: lib/settingsnav.php:118
+msgid "Updates by SMS"
+msgstr ""
+
+#: lib/settingsnav.php:123
+#, fuzzy
+msgid "Connections"
+msgstr "Bağlan"
+
+#: lib/settingsnav.php:124
+msgid "Authorized connected applications"
+msgstr ""
+
 #: lib/silenceform.php:67
 #, fuzzy
 msgid "Silence"
@@ -9257,30 +9371,34 @@ msgstr "Yeni durum mesajı"
 msgid "Silence this user"
 msgstr "Böyle bir kullanıcı yok."
 
-#: lib/subgroupnav.php:83
+#: lib/subgroupnav.php:89
 #, fuzzy, php-format
 msgid "People %s subscribes to"
 msgstr "Uzaktan abonelik"
 
-#: lib/subgroupnav.php:91
+#: lib/subgroupnav.php:97
 #, fuzzy, php-format
 msgid "People subscribed to %s"
 msgstr "Uzaktan abonelik"
 
-#: lib/subgroupnav.php:99
+#: lib/subgroupnav.php:105
 #, php-format
 msgid "Groups %s is a member of"
 msgstr ""
 
-#: lib/subgroupnav.php:105
+#: lib/subgroupnav.php:111
 msgid "Invite"
 msgstr ""
 
-#: lib/subgroupnav.php:106
+#: lib/subgroupnav.php:112
 #, php-format
 msgid "Invite friends and colleagues to join you on %s"
 msgstr ""
 
+#: lib/subscribeform.php:115 lib/subscribeform.php:139
+msgid "Subscribe to this user"
+msgstr "Bize o profili yollamadınız"
+
 #: lib/subscriberspeopleselftagcloudsection.php:48
 #: lib/subscriptionspeopleselftagcloudsection.php:48
 msgid "People Tagcloud as self-tagged"
@@ -9351,6 +9469,12 @@ msgstr ""
 msgid "Error opening theme archive."
 msgstr "Uzaktaki profili güncellemede hata oluştu"
 
+#: lib/threadednoticelist.php:270
+#, php-format
+msgid "Show all %d comment"
+msgid_plural "Show all %d comments"
+msgstr[0] ""
+
 #: lib/topposterssection.php:74
 msgid "Top posters"
 msgstr ""
@@ -9396,122 +9520,126 @@ msgstr "Aboneliği sonlandır"
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "Kullanıcının profili yok."
 
-#. TRANS: Link text for changeing the avatar of the logged in user.
-#: lib/userprofile.php:121
+#: lib/userprofile.php:116
 #, fuzzy
 msgid "Edit Avatar"
 msgstr "Avatar"
 
 #. TRANS: H2 for user actions in a profile.
 #. TRANS: H2 for entity actions in a profile.
-#: lib/userprofile.php:245 lib/userprofile.php:261
+#: lib/userprofile.php:216 lib/userprofile.php:232
 msgid "User actions"
 msgstr ""
 
 #. TRANS: Text shown in user profile of not yet compeltely deleted users.
-#: lib/userprofile.php:249
+#: lib/userprofile.php:220
 msgid "User deletion in progress..."
 msgstr ""
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:277
+#: lib/userprofile.php:248
 #, fuzzy
 msgid "Edit profile settings"
 msgstr "Profil ayarları"
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:279
+#: lib/userprofile.php:250
 msgid "Edit"
 msgstr ""
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:303
+#: lib/userprofile.php:274
 msgid "Send a direct message to this user"
 msgstr ""
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:305
+#: lib/userprofile.php:276
 msgid "Message"
 msgstr ""
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:347
+#: lib/userprofile.php:318
 msgid "Moderate"
 msgstr ""
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:386
+#: lib/userprofile.php:357
 #, fuzzy
 msgid "User role"
 msgstr "Kullanıcının profili yok."
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:389
+#: lib/userprofile.php:360
 msgctxt "role"
 msgid "Administrator"
 msgstr ""
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:391
+#: lib/userprofile.php:362
 msgctxt "role"
 msgid "Moderator"
 msgstr ""
 
+#: lib/util.php:321
+#, fuzzy
+msgid "Not allowed to log in."
+msgstr "Giriş yapılmadı."
+
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1306
+#: lib/util.php:1337
 msgid "a few seconds ago"
 msgstr "birkaç saniye önce"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1309
+#: lib/util.php:1340
 msgid "about a minute ago"
 msgstr "yaklaşık bir dakika önce"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1313
+#: lib/util.php:1344
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
 msgstr[0] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1316
+#: lib/util.php:1347
 msgid "about an hour ago"
 msgstr "yaklaşık bir saat önce"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1320
+#: lib/util.php:1351
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
 msgstr[0] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1323
+#: lib/util.php:1354
 msgid "about a day ago"
 msgstr "yaklaşık bir gün önce"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1327
+#: lib/util.php:1358
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
 msgstr[0] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1330
+#: lib/util.php:1361
 msgid "about a month ago"
 msgstr "yaklaşık bir ay önce"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1334
+#: lib/util.php:1365
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
 msgstr[0] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1337
+#: lib/util.php:1368
 msgid "about a year ago"
 msgstr "yaklaşık bir yıl önce"
 
@@ -9522,20 +9650,6 @@ msgstr "yaklaşık bir yıl önce"
 msgid "%s is not a valid color! Use 3 or 6 hex characters."
 msgstr "Başlangıç sayfası adresi geçerli bir URL değil."
 
-#. TRANS: %s is the URL to the StatusNet site's Instant Messaging settings.
-#: lib/xmppmanager.php:287
-#, php-format
-msgid "Unknown user. Go to %s to add your address to your account"
-msgstr ""
-
-#. TRANS: Response to XMPP source when it sent too long a message.
-#. TRANS: %1$d the maximum number of allowed characters (used for plural), %2$d is the sent number.
-#: lib/xmppmanager.php:406
-#, fuzzy, php-format
-msgid "Message too long. Maximum is %1$d character, you sent %2$d."
-msgid_plural "Message too long. Maximum is %1$d characters, you sent %2$d."
-msgstr[0] "Bu çok uzun. Maksimum durum mesajı boyutu %d karakterdir."
-
 #. TRANS: Exception.
 #: lib/xrd.php:63
 #, fuzzy
@@ -9553,62 +9667,141 @@ msgstr ""
 msgid "Getting backup from file '%s'."
 msgstr ""
 
-#, fuzzy
-#~ msgid "Block this user."
-#~ msgstr "Bu kullanıcıyı engelle"
+#~ msgid "Could not generate feed for group - %s"
+#~ msgstr "Grup - %s için besleme oluşturulamadı."
 
 #, fuzzy
-#~ msgid "Delete this notice."
-#~ msgstr "Bu durum mesajını sil"
+#~ msgid "Current confirmed Jabber/Google Talk address."
+#~ msgstr "Onaylanmış Jabber/Gtalk adresi."
 
 #, fuzzy
-#~ msgid "Delete this user."
-#~ msgstr "Bu kullanıcıyı sil"
+#~ msgid ""
+#~ "Jabber or Google Talk address, like \"UserName@example.org\". First, make "
+#~ "sure to add %s to your buddy list in your IM client or on Google Talk."
+#~ msgstr ""
+#~ "Jabber veya Gtalk adresi: \"KullaniciAdi@example.org\" gibi. Öncelikle %"
+#~ "s, IM istemcisi veya Gtalk arkadaşlar listenize eklenmiş olmalıdır."
 
 #, fuzzy
-#~ msgid "Restore default designs."
-#~ msgstr "Öntanımlıları kullan"
+#~ msgid "Send me notices through Jabber/Google Talk."
+#~ msgstr "Durum mesajlarını Jabber/GTalk üzerinden gönder."
 
 #, fuzzy
-#~ msgid "Reset back to default."
-#~ msgstr "Öntanımlıya geri dön"
+#~ msgid "Publish a MicroID for my Jabber/Google Talk address."
+#~ msgstr "Onaylanmış Jabber/Gtalk adresi."
+
+#~ msgid "No Jabber ID."
+#~ msgstr "JabberID yok."
 
 #, fuzzy
-#~ msgid "Save design."
-#~ msgstr "Dizaynı kaydet"
+#~ msgid "Not a valid Jabber ID."
+#~ msgstr "Geçersiz bir Jabber ID"
+
+#~ msgid "That is already your Jabber ID."
+#~ msgstr "Bu zaten sizin Jabber ID'niz."
+
+#~ msgid "That is not your Jabber ID."
+#~ msgstr "Bu sizin Jabber ID'niz değil."
+
+#~ msgid "Other settings"
+#~ msgstr "Profil ayarları"
+
+#~ msgid "Jabber"
+#~ msgstr "Jabber"
+
+#~ msgid "Photo"
+#~ msgstr "Fotoğraf"
+
+#~ msgid "Other options"
+#~ msgstr "Diğer seçenekler"
+
+#~ msgid "Other"
+#~ msgstr "Diğer"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Personal profile and friends timeline"
+#~ msgstr "Kişisel profil ve arkadaşların zaman çizelgesi"
+
+#~ msgctxt "MENU"
+#~ msgid "Personal"
+#~ msgstr "Kişisel"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Change your email, avatar, password, profile"
+#~ msgstr ""
+#~ "E-postanızı, kullanıcı resminizi, parolanızı, profilinizi değiştirin"
+
+#~ msgid "Account"
+#~ msgstr "Hesap"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Connect to services"
+#~ msgstr "Servislere bağlan"
+
+#~ msgid "Connect"
+#~ msgstr "Bağlan"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Change site configuration"
+#~ msgstr "Site yapılandırmasını değiştir"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Invite friends and colleagues to join you on %s"
+#~ msgstr ""
+#~ "%s üzerinde size katılmaları için arkadaşlarınızı ve meslektaşlarınızı "
+#~ "davet edin"
+
+#~ msgctxt "MENU"
+#~ msgid "Invite"
+#~ msgstr "Davet et"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Create an account"
+#~ msgstr "Bir hesap oluştur"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Help me!"
+#~ msgstr "Bana yardım et!"
+
+#~ msgctxt "MENU"
+#~ msgid "Help"
+#~ msgstr "Yardım"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Search for people or text"
+#~ msgstr "Kişi ya da yazılar için arama yap"
 
 #, fuzzy
-#~ msgid "Disfavor favorite."
-#~ msgstr "Favoriliğini kaldır"
+#~ msgid "Page notice"
+#~ msgstr "Yeni durum mesajı"
 
 #, fuzzy
-#~ msgid "\"%s\" not found."
-#~ msgstr "Onay kodu bulunamadı."
+#~ msgid "Secondary site navigation"
+#~ msgstr "Abonelikler"
+
+#~ msgid "StatusNet software license"
+#~ msgstr "StatusNet yazılım lisansı"
+
+#~ msgid "Site content license"
+#~ msgstr "Site içeriği lisansı"
+
+#~ msgid "Provider"
+#~ msgstr "Sağlayıcı"
 
 #, fuzzy
-#~ msgid "Notice %s not found."
-#~ msgstr "Üst durum mesajı bulunamadı."
+#~ msgid "Available characters"
+#~ msgstr "6 veya daha fazla karakter"
 
 #, fuzzy
-#~ msgid "Attachment %s not found."
-#~ msgstr "Alıcı kullanıcı bulunamadı."
+#~ msgctxt "MENU"
+#~ msgid "Profile"
+#~ msgstr "Profil"
 
 #, fuzzy
-#~ msgid "Invalid tag: \"%s\"."
-#~ msgstr "Geçersiz büyüklük."
+#~ msgid "Search help"
+#~ msgstr "Ara"
 
 #, fuzzy
-#~ msgid "Password saved"
-#~ msgstr "Parola kaydedildi."
-
-#, fuzzy
-#~ msgid "Where you are, like \"City, State (or Region), Country\"."
-#~ msgstr "Bulunduğunuz yer, \"Şehir, Eyalet (veya Bölge), Ülke\" gibi"
-
-#, fuzzy
-#~ msgid "Subscribe to this user."
-#~ msgstr "Bize o profili yollamadınız"
-
-#, fuzzy
-#~ msgid "Not allowed to log in."
-#~ msgstr "Giriş yapılmadı."
+#~ msgid "Message too long. Maximum is %1$d character, you sent %2$d."
+#~ msgid_plural "Message too long. Maximum is %1$d characters, you sent %2$d."
+#~ msgstr[0] "Bu çok uzun. Maksimum durum mesajı boyutu %d karakterdir."
diff --git a/locale/uk/LC_MESSAGES/statusnet.po b/locale/uk/LC_MESSAGES/statusnet.po
index ac01403373..e491d1d412 100644
--- a/locale/uk/LC_MESSAGES/statusnet.po
+++ b/locale/uk/LC_MESSAGES/statusnet.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 15:58+0000\n"
-"PO-Revision-Date: 2011-03-03 16:01:28+0000\n"
+"POT-Creation-Date: 2011-03-03 17:23+0000\n"
+"PO-Revision-Date: 2011-03-03 17:26:31+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -82,23 +82,23 @@ msgstr "Зберегти параметри доступу"
 #. TRANS: Tooltip for button to save access settings in site admin panel.
 #. TRANS: Button text for saving theme settings.
 #. TRANS: Button label to save e-mail preferences.
-#. TRANS: Button label to save Instant Messaging preferences.
-#. TRANS: Button text for saving "Other settings" in profile.
+#. TRANS: Button label to save IM preferences.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
 #. TRANS: Button text for saving site notice in admin panel.
 #. TRANS: Button label to save SMS preferences.
 #. TRANS: Save button for settings for a profile in a subscriptions list.
+#. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
 #. TRANS: Button text on profile design page to save settings.
 #: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
-#: actions/emailsettings.php:250 actions/imsettings.php:183
-#: actions/othersettings.php:136 actions/pathsadminpanel.php:512
-#: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
-#: actions/smssettings.php:205 actions/subscriptions.php:259
+#: actions/emailsettings.php:251 actions/imsettings.php:199
+#: actions/pathsadminpanel.php:512 actions/profilesettings.php:198
+#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:204
+#: actions/subscriptions.php:261 actions/urlsettings.php:152
 #: actions/useradminpanel.php:298 lib/applicationeditform.php:355
-#: lib/designsettings.php:270 lib/groupeditform.php:201
+#: lib/designform.php:320 lib/groupeditform.php:201
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Зберегти"
@@ -137,7 +137,11 @@ msgstr "Немає такої сторінки."
 #. 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 use "one time password login" without using an existing user.
+#. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
+#. TRANS: Client error displayed trying to find a user by ID for a non-existing ID.
+#. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when calling a profile action without specifying a user.
 #: actions/all.php:80 actions/allrss.php:69
@@ -149,19 +153,19 @@ msgstr "Немає такої сторінки."
 #: actions/apidirectmessage.php:75 actions/apidirectmessagenew.php:72
 #: actions/apigroupcreate.php:111 actions/apigroupismember.php:89
 #: actions/apigroupjoin.php:98 actions/apigroupleave.php:98
-#: actions/apigrouplist.php:70 actions/apistatusesupdate.php:230
-#: actions/apisubscriptions.php:85 actions/apitimelinefavorites.php:70
-#: actions/apitimelinefriends.php:173 actions/apitimelinehome.php:78
-#: actions/apitimelinementions.php:77 actions/apitimelineuser.php:79
-#: actions/avatarbynickname.php:79 actions/favoritesrss.php:72
-#: actions/foaf.php:42 actions/foaf.php:61 actions/hcard.php:67
-#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
-#: actions/remotesubscribe.php:144 actions/remotesubscribe.php:153
-#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
-#: actions/showfavorites.php:106 actions/userbyid.php:74
-#: actions/usergroups.php:93 actions/userrss.php:40 actions/userxrd.php:59
-#: actions/xrds.php:71 lib/command.php:509 lib/galleryaction.php:59
-#: lib/mailbox.php:80 lib/profileaction.php:77
+#: actions/apigrouplist.php:70 actions/apigroupprofileupdate.php:108
+#: actions/apistatusesupdate.php:230 actions/apisubscriptions.php:85
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:173
+#: actions/apitimelinehome.php:78 actions/apitimelinementions.php:77
+#: actions/apitimelineuser.php:79 actions/avatarbynickname.php:79
+#: actions/favoritesrss.php:72 actions/foaf.php:42 actions/foaf.php:61
+#: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116
+#: actions/otp.php:78 actions/remotesubscribe.php:144
+#: actions/remotesubscribe.php:153 actions/replies.php:73
+#: actions/repliesrss.php:38 actions/rsd.php:113 actions/showfavorites.php:106
+#: actions/userbyid.php:75 actions/usergroups.php:93 actions/userrss.php:40
+#: actions/userxrd.php:59 actions/xrds.php:71 lib/command.php:509
+#: lib/galleryaction.php:59 lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Такого користувача немає."
 
@@ -175,10 +179,9 @@ msgstr "%1$s та друзі, сторінка %2$d"
 #. TRANS: H1 text for page. %s is a user nickname.
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Timeline title for user and friends. %s is a user nickname.
-#. TRANS: Tooltop for personal group navigation menu option when logged in for viewing timeline of self and friends.
 #: actions/all.php:94 actions/all.php:191 actions/allrss.php:117
 #: actions/apitimelinefriends.php:207 actions/apitimelinehome.php:113
-#: lib/personalgroupnav.php:102
+#: lib/personalgroupnav.php:100
 #, php-format
 msgid "%s and friends"
 msgstr "%s з друзями"
@@ -234,7 +237,7 @@ msgstr ""
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
 #. TRANS: Second sentence of empty message for anonymous users. %s is a user nickname.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:227
+#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:221
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -283,19 +286,20 @@ msgstr "Оновлення від %1$s та друзів на %2$s!"
 #: actions/apifavoritecreate.php:98 actions/apifavoritedestroy.php:98
 #: actions/apifriendshipscreate.php:99 actions/apifriendshipsdestroy.php:99
 #: actions/apifriendshipsshow.php:124 actions/apigroupcreate.php:138
-#: actions/apigroupismember.php:115 actions/apigroupjoin.php:160
-#: actions/apigroupleave.php:145 actions/apigrouplist.php:134
+#: actions/apigroupismember.php:115 actions/apigroupjoin.php:151
+#: actions/apigroupleave.php:141 actions/apigrouplist.php:134
 #: actions/apigrouplistall.php:120 actions/apigroupmembership.php:105
+#: actions/apigroupprofileupdate.php:100 actions/apigroupprofileupdate.php:213
 #: actions/apigroupshow.php:114 actions/apihelptest.php:84
 #: actions/apistatusesdestroy.php:101 actions/apistatusesretweets.php:110
 #: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:139
 #: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
-#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:268
-#: actions/apitimelinegroup.php:147 actions/apitimelinehome.php:173
-#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:239
-#: actions/apitimelineretweetedtome.php:118
-#: actions/apitimelineretweetsofme.php:150 actions/apitimelinetag.php:159
-#: actions/apitimelineuser.php:206 actions/apiusershow.php:100
+#: actions/apitimelinefavorites.php:182 actions/apitimelinefriends.php:276
+#: actions/apitimelinegroup.php:148 actions/apitimelinehome.php:181
+#: actions/apitimelinementions.php:182 actions/apitimelinepublic.php:247
+#: actions/apitimelineretweetedtome.php:147
+#: actions/apitimelineretweetsofme.php:147 actions/apitimelinetag.php:165
+#: actions/apitimelineuser.php:217 actions/apiusershow.php:100
 msgid "API method not found."
 msgstr "API метод не знайдено."
 
@@ -310,8 +314,9 @@ msgstr "API метод не знайдено."
 #: actions/apifavoritecreate.php:88 actions/apifavoritedestroy.php:88
 #: actions/apifriendshipscreate.php:89 actions/apifriendshipsdestroy.php:89
 #: actions/apigroupcreate.php:102 actions/apigroupjoin.php:89
-#: actions/apigroupleave.php:89 actions/apimediaupload.php:66
-#: actions/apistatusesretweet.php:63 actions/apistatusesupdate.php:194
+#: actions/apigroupleave.php:89 actions/apigroupprofileupdate.php:92
+#: actions/apimediaupload.php:66 actions/apistatusesretweet.php:63
+#: actions/apistatusesupdate.php:194
 msgid "This method requires a POST."
 msgstr "Цей метод потребує POST."
 
@@ -324,21 +329,16 @@ msgstr ""
 "Ви мусите встановити параметр «device» з одним зі значень: sms, im, none."
 
 #. TRANS: Server error displayed when a user's delivery device cannot be updated.
-#. TRANS: Server error displayed when a user update to the database fails in the contact address confirmation action.
 #. TRANS: Server error thrown on database error updating e-mail preferences.
 #. TRANS: Server error thrown on database error removing a registered e-mail address.
-#. TRANS: Server error thrown on database error updating Instant Messaging preferences.
-#. TRANS: Server error thrown on database error removing a registered Instant Messaging address.
-#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
 #. TRANS: Server error thrown when user profile settings could not be updated.
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
-#: actions/apiaccountupdatedeliverydevice.php:130
-#: actions/confirmaddress.php:118 actions/emailsettings.php:352
-#: actions/emailsettings.php:498 actions/imsettings.php:276
-#: actions/imsettings.php:432 actions/othersettings.php:186
-#: actions/profilesettings.php:322 actions/smssettings.php:301
-#: actions/smssettings.php:454
+#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
+#: actions/apiaccountupdatedeliverydevice.php:136
+#: actions/emailsettings.php:353 actions/emailsettings.php:499
+#: actions/profilesettings.php:323 actions/smssettings.php:300
+#: actions/smssettings.php:453 actions/urlsettings.php:211
 msgid "Could not update user."
 msgstr "Не вдалося оновити користувача."
 
@@ -364,7 +364,7 @@ msgstr "Користувач не має профілю."
 
 #. TRANS: Server error displayed if a user profile could not be saved.
 #. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:418
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:419
 msgid "Could not save profile."
 msgstr "Не вдалося зберегти профіль."
 
@@ -376,7 +376,7 @@ msgstr "Не вдалося зберегти профіль."
 #: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
 #: actions/designadminpanel.php:120 actions/editapplication.php:121
 #: actions/newapplication.php:102 actions/newnotice.php:95
-#: lib/designsettings.php:298
+#: lib/designsettings.php:110
 #, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s byte) due to its "
@@ -404,8 +404,8 @@ msgstr[2] ""
 #: actions/apiaccountupdateprofilecolors.php:160
 #: actions/apiaccountupdateprofilecolors.php:171
 #: actions/groupdesignsettings.php:285 actions/groupdesignsettings.php:296
-#: actions/userdesignsettings.php:201 actions/userdesignsettings.php:211
-#: actions/userdesignsettings.php:253 actions/userdesignsettings.php:263
+#: actions/userdesignsettings.php:218 actions/userdesignsettings.php:228
+#: actions/userdesignsettings.php:270 actions/userdesignsettings.php:280
 msgid "Unable to save your design settings."
 msgstr "Не маю можливості зберегти налаштування дизайну."
 
@@ -413,7 +413,7 @@ msgstr "Не маю можливості зберегти налаштуванн
 #. TRANS: Client error displayed when a database error occurs updating profile colours.
 #: actions/apiaccountupdateprofilebackgroundimage.php:191
 #: actions/apiaccountupdateprofilecolors.php:139
-#: actions/userdesignsettings.php:179
+#: actions/userdesignsettings.php:196
 msgid "Could not update your design."
 msgstr "Не вдалося оновити ваш дизайн."
 
@@ -522,8 +522,7 @@ msgstr "Отримувача не знайдено."
 
 #. TRANS: Client error displayed trying to direct message another user who's not a friend (403).
 #: actions/apidirectmessagenew.php:144
-#, fuzzy
-msgid "Can't send direct messages to users who aren't your friend."
+msgid "Cannot send direct messages to users who aren't your friend."
 msgstr ""
 "Не вдається надіслати пряме повідомлення користувачеві, який не є вашим "
 "другом."
@@ -610,9 +609,9 @@ msgstr "Не вдалося знайти цільового користувач
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:156 actions/editgroup.php:191
-#: actions/newgroup.php:137 actions/profilesettings.php:273
-#: actions/register.php:214
+#: actions/apigroupcreate.php:156 actions/apigroupprofileupdate.php:255
+#: actions/editgroup.php:191 actions/newgroup.php:137
+#: actions/profilesettings.php:274 actions/register.php:199
 msgid "Nickname already in use. Try another one."
 msgstr "Це ім’я вже використовується. Спробуйте інше."
 
@@ -620,9 +619,9 @@ msgstr "Це ім’я вже використовується. Спробуйт
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:164 actions/editgroup.php:195
-#: actions/newgroup.php:141 actions/profilesettings.php:243
-#: actions/register.php:216
+#: actions/apigroupcreate.php:164 actions/apigroupprofileupdate.php:259
+#: actions/editgroup.php:195 actions/newgroup.php:141
+#: actions/profilesettings.php:244 actions/register.php:201
 msgid "Not a valid nickname."
 msgstr "Це недійсне ім’я користувача."
 
@@ -632,10 +631,10 @@ msgstr "Це недійсне ім’я користувача."
 #. TRANS: Validation error shown when providing an invalid homepage URL in the "New application" form.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:181 actions/editapplication.php:235
-#: actions/editgroup.php:202 actions/newapplication.php:221
-#: actions/newgroup.php:148 actions/profilesettings.php:248
-#: actions/register.php:223
+#: actions/apigroupcreate.php:181 actions/apigroupprofileupdate.php:277
+#: actions/editapplication.php:235 actions/editgroup.php:202
+#: actions/newapplication.php:221 actions/newgroup.php:148
+#: actions/profilesettings.php:249 actions/register.php:208
 msgid "Homepage is not a valid URL."
 msgstr "Веб-сторінка має недійсну URL-адресу."
 
@@ -644,8 +643,8 @@ msgstr "Веб-сторінка має недійсну URL-адресу."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:191 actions/editgroup.php:206
-#: actions/newgroup.php:152 actions/profilesettings.php:252
-#: actions/register.php:226
+#: actions/newgroup.php:152 actions/profilesettings.php:253
+#: actions/register.php:211
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "Повне ім’я надто довге (не більше 255 символів)."
 
@@ -673,8 +672,8 @@ msgstr[2] "Опис надто довгий (максимум — %d знакі
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:215 actions/editgroup.php:218
-#: actions/newgroup.php:164 actions/profilesettings.php:265
-#: actions/register.php:235
+#: actions/newgroup.php:164 actions/profilesettings.php:266
+#: actions/register.php:220
 msgid "Location is too long (maximum 255 characters)."
 msgstr "Розташування надто довге (не більше 255 символів)."
 
@@ -704,15 +703,16 @@ msgstr "Помилкове додаткове ім’я: «%s»."
 #. TRANS: %s is the alias that is already in use.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error. %s is the already used alias.
-#: actions/apigroupcreate.php:264 actions/editgroup.php:246
-#: actions/newgroup.php:193
+#: actions/apigroupcreate.php:264 actions/apigroupprofileupdate.php:351
+#: actions/editgroup.php:246 actions/newgroup.php:193
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "Додаткове ім’я «%s» вже використовується. Спробуйте інше."
 
 #. TRANS: Client error displayed when trying to use an alias during group creation that is the same as the group's nickname.
 #. TRANS: Group edit form validation error.
-#: actions/apigroupcreate.php:278 actions/editgroup.php:253
+#: actions/apigroupcreate.php:278 actions/apigroupprofileupdate.php:359
+#: actions/editgroup.php:253
 msgid "Alias can't be the same as nickname."
 msgstr "Додаткове ім’я не може бути таким самим що й основне."
 
@@ -724,7 +724,8 @@ msgstr "Додаткове ім’я не може бути таким сами
 #. TRANS: Client error displayed requesting most recent notices to a group for a non-existing group.
 #: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
 #: actions/apigroupleave.php:104 actions/apigroupmembership.php:71
-#: actions/apigroupshow.php:81 actions/apitimelinegroup.php:89
+#: actions/apigroupprofileupdate.php:113 actions/apigroupshow.php:81
+#: actions/apitimelinegroup.php:89
 msgid "Group not found."
 msgstr "Спільноту не знайдено."
 
@@ -742,13 +743,11 @@ msgstr "Ви вже стоїте у цій спільноти."
 msgid "You have been blocked from that group by the admin."
 msgstr "Адміністратор спільноти заблокував ваш профіль."
 
-#. TRANS: Server error displayed when joining a group fails.
-#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
 #. 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.
 #. TRANS: Message given having failed to add a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:362
+#: actions/apigroupjoin.php:136 actions/joingroup.php:139 lib/command.php:362
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "Не вдалось долучити користувача %1$s до спільноти %2$s."
@@ -758,8 +757,6 @@ msgstr "Не вдалось долучити користувача %1$s до с
 msgid "You are not a member of this group."
 msgstr "Ви не стоїте у цій спільноті."
 
-#. TRANS: Server error displayed when leaving a group fails.
-#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
 #. TRANS: Server error displayed when leaving a group failed in the database.
 #. TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
 #. TRANS: Message given having failed to remove a user from a group.
@@ -795,6 +792,65 @@ msgstr "Спільноти %s"
 msgid "groups on %s"
 msgstr "спільноти на %s"
 
+#. TRANS: Client error displayed trying to edit a group while not being a group admin.
+#. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
+#. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
+#: actions/apigroupprofileupdate.php:118 actions/editgroup.php:110
+#: actions/editgroup.php:176 actions/groupdesignsettings.php:109
+#: actions/grouplogo.php:111
+msgid "You must be an admin to edit the group."
+msgstr ""
+"Ви маєте бути наділені правами адміністратора, аби відредагувати властивості "
+"даної спільноти."
+
+#. TRANS: Server error displayed when editing a group fails.
+#: actions/apigroupprofileupdate.php:171 actions/editgroup.php:274
+msgid "Could not update group."
+msgstr "Не вдалося оновити спільноту."
+
+#. TRANS: Server error displayed when group aliases could not be added.
+#. TRANS: Server exception thrown when creating group aliases failed.
+#: actions/apigroupprofileupdate.php:194 actions/editgroup.php:281
+#: classes/User_group.php:540
+msgid "Could not create aliases."
+msgstr "Неможна призначити додаткові імена."
+
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: actions/apigroupprofileupdate.php:249 lib/nickname.php:165
+msgid "Nickname must have only lowercase letters and numbers and no spaces."
+msgstr ""
+"Ім’я користувача повинно складатись з літер нижнього регістру і цифр, ніяких "
+"інтервалів."
+
+#: actions/apigroupprofileupdate.php:286
+#, fuzzy
+msgid "Full name is too long (max 255 chars)."
+msgstr "Повне ім’я надто довге (не більше 255 символів)."
+
+#: actions/apigroupprofileupdate.php:296
+#, fuzzy, php-format
+msgid "description is too long (max %d chars)."
+msgstr "Опис надто довгий (максимум — %d знак)."
+
+#: actions/apigroupprofileupdate.php:307
+#, fuzzy
+msgid "Location is too long (max 255 chars)."
+msgstr "Розташування надто довге (не більше 255 символів)."
+
+#: actions/apigroupprofileupdate.php:326
+#, fuzzy, php-format
+msgid "Too many aliases! Maximum %d."
+msgstr "Надто багато додаткових імен! Максимум становить %d."
+
+#. TRANS: Group edit form validation error.
+#. TRANS: Group create form validation error.
+#. TRANS: %s is the invalid alias.
+#: actions/apigroupprofileupdate.php:342 actions/editgroup.php:241
+#: actions/newgroup.php:188
+#, php-format
+msgid "Invalid alias: \"%s\""
+msgstr "Помилкове додаткове ім’я: «%s»"
+
 #. TRANS: Client error displayed when uploading a media file has failed.
 #: actions/apimediaupload.php:101
 msgid "Upload failed."
@@ -825,21 +881,22 @@ msgstr "Токен запиту вже авторизовано."
 #. TRANS: Form validation error message.
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
+#. TRANS: Client error displayed when the session token is not okay.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
 #: actions/deletenotice.php:177 actions/disfavor.php:75
-#: actions/emailsettings.php:291 actions/favor.php:75 actions/geocode.php:55
+#: actions/emailsettings.php:292 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:65 actions/grouplogo.php:321
-#: actions/groupunblock.php:65 actions/imsettings.php:224
-#: actions/invite.php:60 actions/login.php:137 actions/makeadmin.php:66
-#: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
-#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
-#: actions/othersettings.php:155 actions/passwordsettings.php:138
-#: actions/profilesettings.php:217 actions/recoverpassword.php:383
-#: actions/register.php:172 actions/remotesubscribe.php:76
-#: actions/repeat.php:82 actions/smssettings.php:250 actions/subedit.php:40
-#: actions/subscribe.php:86 actions/tagother.php:166
-#: actions/unsubscribe.php:69 actions/userauthorization.php:52
-#: lib/designsettings.php:310
+#: actions/groupunblock.php:65 actions/imsettings.php:241
+#: actions/invite.php:60 actions/makeadmin.php:66 actions/newmessage.php:135
+#: actions/newnotice.php:105 actions/nudge.php:80
+#: actions/oauthappssettings.php:162 actions/oauthconnectionssettings.php:135
+#: actions/passwordsettings.php:137 actions/pluginenable.php:87
+#: actions/profilesettings.php:218 actions/recoverpassword.php:383
+#: actions/register.php:157 actions/remotesubscribe.php:76
+#: actions/repeat.php:82 actions/smssettings.php:249 actions/subedit.php:40
+#: actions/subscribe.php:87 actions/tagother.php:145
+#: actions/unsubscribe.php:69 actions/urlsettings.php:171
+#: actions/userauthorization.php:53 lib/designsettings.php:122
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 "Виникли певні проблеми з токеном поточної сесії. Спробуйте знов, будь ласка."
@@ -868,10 +925,10 @@ msgstr "Помилка бази даних при додаванні парам
 #. TRANS: Unknown form validation error in design settings form.
 #: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
 #: actions/designadminpanel.php:100 actions/editapplication.php:144
-#: actions/emailsettings.php:310 actions/grouplogo.php:332
-#: actions/imsettings.php:239 actions/newapplication.php:124
-#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
-#: actions/smssettings.php:271 lib/designsettings.php:321
+#: actions/emailsettings.php:311 actions/grouplogo.php:332
+#: actions/imsettings.php:256 actions/newapplication.php:124
+#: actions/oauthconnectionssettings.php:144 actions/recoverpassword.php:46
+#: actions/smssettings.php:270 lib/designsettings.php:133
 msgid "Unexpected form submission."
 msgstr "Несподіване представлення форми."
 
@@ -921,31 +978,26 @@ msgstr "Акаунт"
 
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Field label in form for profile settings.
-#. TRANS: Label for group nickname (dt). Text hidden by default.
-#. TRANS: DT for nick name in a profile.
-#: actions/apioauthauthorize.php:459 actions/login.php:252
-#: actions/profilesettings.php:106 actions/register.php:432
-#: actions/showgroup.php:243 actions/tagother.php:94
+#: actions/apioauthauthorize.php:459 actions/login.php:225
+#: actions/profilesettings.php:107 actions/register.php:411
 #: actions/userauthorization.php:145 lib/groupeditform.php:145
-#: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "Ім’я користувача"
 
 #. TRANS: Field label on OAuth API authorisation form.
-#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:463 actions/login.php:255
-#: actions/register.php:436 lib/accountsettingsaction.php:120
+#: actions/apioauthauthorize.php:463 actions/login.php:228
+#: actions/register.php:415 lib/settingsnav.php:87
 msgid "Password"
 msgstr "Пароль"
 
 #. TRANS: Button text that when clicked will cancel the process of allowing access to an account
 #. TRANS: by an external application.
 #. TRANS: Button label to cancel an e-mail address confirmation procedure.
-#. TRANS: Button label to cancel an Instant Messaging address confirmation procedure.
+#. TRANS: Button label to cancel an IM address confirmation procedure.
 #. TRANS: Button label to cancel a SMS address confirmation procedure.
 #. TRANS: Button label in the "Edit application" form.
-#: actions/apioauthauthorize.php:478 actions/emailsettings.php:124
-#: actions/imsettings.php:127 actions/smssettings.php:133
+#: actions/apioauthauthorize.php:478 actions/emailsettings.php:125
+#: actions/imsettings.php:136 actions/smssettings.php:132
 #: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Cancel"
@@ -1056,8 +1108,8 @@ msgstr "HTTP спосіб не підтримується."
 #. TRANS: Exception thrown requesting an unsupported notice output format.
 #. TRANS: %s is the requested output format.
 #: actions/apistatusesshow.php:144
-#, fuzzy, php-format
-msgid "Unsupported format: %s"
+#, php-format
+msgid "Unsupported format: %s."
 msgstr "Формат, який не підтримується: %s."
 
 #. TRANS: Client error displayed requesting a deleted status.
@@ -1145,13 +1197,6 @@ msgstr "%1$s / Обрані від %2$s"
 msgid "%1$s updates favorited by %2$s / %3$s."
 msgstr "%1$s, оновлення обраних дописів %2$s / %3$s."
 
-#. TRANS: Server error displayed when generating an Atom feed fails.
-#. TRANS: %s is the error.
-#: actions/apitimelinegroup.php:134
-#, php-format
-msgid "Could not generate feed for group - %s"
-msgstr "Не вдалося створити веб-стрічку для спільноти — %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.
 #: actions/apitimelinementions.php:115
@@ -1168,13 +1213,14 @@ msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr "%1$s оновив цю відповідь на допис від %2$s / %3$s."
 
 #. TRANS: Title for site timeline. %s is the StatusNet sitename.
+#. TRANS: Public RSS feed title. %s is the StatusNet site name.
 #: actions/apitimelinepublic.php:193 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "%s загальна стрічка"
 
 #. TRANS: Subtitle for site timeline. %s is the StatusNet sitename.
-#: actions/apitimelinepublic.php:199 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:199
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "%s оновлення від усіх!"
@@ -1185,21 +1231,33 @@ msgid "Unimplemented."
 msgstr "Метод не виконується."
 
 #. TRANS: Title for Atom feed "repeated to me". %s is the user nickname.
-#: actions/apitimelineretweetedtome.php:108
+#: actions/apitimelineretweetedtome.php:96
 #, php-format
 msgid "Repeated to %s"
 msgstr "Повторено для %s"
 
+#: actions/apitimelineretweetedtome.php:98
+#, fuzzy, php-format
+msgid "%1$s notices that were to repeated to %2$s / %3$s."
+msgstr "%1$s оновив цю відповідь на допис від %2$s / %3$s."
+
 #. TRANS: Title of list of repeated notices of the logged in user.
 #. TRANS: %s is the nickname of the logged in user.
-#: actions/apitimelineretweetsofme.php:112
+#: actions/apitimelineretweetsofme.php:98
 #, php-format
 msgid "Repeats of %s"
 msgstr "Повторення %s"
 
+#: actions/apitimelineretweetsofme.php:104
+#, fuzzy, php-format
+msgid "%1$s notices that %2$s / %3$s has repeated."
+msgstr "%1$s додав(ла) ваш допис %2$s до обраних."
+
 #. TRANS: Title for timeline with lastest notices with a given tag.
 #. TRANS: %s is the tag.
-#: actions/apitimelinetag.php:101 actions/tag.php:67
+#. TRANS: Title for first page of notices with tags.
+#. TRANS: %s is the tag.
+#: actions/apitimelinetag.php:101 actions/tag.php:69
 #, php-format
 msgid "Notices tagged with %s"
 msgstr "Дописи позначені з %s"
@@ -1212,53 +1270,54 @@ msgid "Updates tagged with %1$s on %2$s!"
 msgstr "Оновлення позначені з %1$s на %2$s!"
 
 #. TRANS: Client error displayed trying to add a notice to another user's timeline.
-#: actions/apitimelineuser.php:297
+#: actions/apitimelineuser.php:308
 msgid "Only the user can add to their own timeline."
 msgstr "Користувач може робити доповнення тільки до своєї власної хронології."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:304
+#: actions/apitimelineuser.php:315
 msgid "Only accept AtomPub for Atom feeds."
 msgstr "Приймати лише AtomPub для веб-стрічок формату Atom."
 
 #. TRANS: Client error displayed attempting to post an empty API notice.
-#: actions/apitimelineuser.php:311
+#: actions/apitimelineuser.php:322
 msgid "Atom post must not be empty."
 msgstr "Запис Atom не повинен бути порожнім."
 
 #. TRANS: Client error displayed attempting to post an API that is not well-formed XML.
-#: actions/apitimelineuser.php:317
+#: actions/apitimelineuser.php:328
 msgid "Atom post must be well-formed XML."
 msgstr "Запис Atom має бути у правильно сформованому XML."
 
 #. TRANS: Client error displayed when not using an Atom entry.
-#: actions/apitimelineuser.php:323 actions/atompubfavoritefeed.php:228
+#: actions/apitimelineuser.php:334 actions/atompubfavoritefeed.php:228
 #: actions/atompubmembershipfeed.php:230
 #: actions/atompubsubscriptionfeed.php:236
 msgid "Atom post must be an Atom entry."
 msgstr "POST-запит Atom має бути записом формату Atom."
 
 #. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
-#: actions/apitimelineuser.php:335
+#: actions/apitimelineuser.php:345
 msgid "Can only handle POST activities."
 msgstr "Можливою є обробка лише POST-запитів."
 
 #. TRANS: Client error displayed when using an unsupported activity object type.
 #. TRANS: %s is the unsupported activity object type.
-#: actions/apitimelineuser.php:346
+#: actions/apitimelineuser.php:356
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr "Неможливо опрацювати дії об’єкта типу «%s»."
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
 #. TRANS: %d is the notice ID (number).
-#: actions/apitimelineuser.php:380
+#: actions/apitimelineuser.php:390
 #, php-format
 msgid "No content for notice %d."
 msgstr "Допис %d не має змісту."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:408
+#. TRANS: %s is the notice URI.
+#: actions/apitimelineuser.php:419
 #, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "Повідомлення з URI \"%s\" вже існує."
@@ -1275,9 +1334,10 @@ msgstr "Сторінку не знайдено."
 
 #. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
 #. TRANS: Client exception.
+#. TRANS: Client error displayed trying to subscribe to a non-existing profile.
 #: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
 #: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
-#: actions/subscribe.php:107
+#: actions/subscribe.php:110
 msgid "No such profile."
 msgstr "Немає такого профілю."
 
@@ -1412,7 +1472,7 @@ msgid "Not a member."
 msgstr "Не є учасником."
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
-#: actions/atompubshowmembership.php:151
+#: actions/atompubshowmembership.php:150
 msgid "Cannot delete someone else's membership."
 msgstr "Неможливо позбавити когось членства."
 
@@ -1499,10 +1559,7 @@ msgid "Invalid size."
 msgstr "Недійсний розмір."
 
 #. TRANS: Title for avatar upload page.
-#. TRANS: Label for group avatar (dt). Text hidden by default.
-#. TRANS: Link description in user account settings menu.
-#: actions/avatarsettings.php:66 actions/showgroup.php:227
-#: lib/accountsettingsaction.php:113
+#: actions/avatarsettings.php:66 lib/settingsnav.php:82
 msgid "Avatar"
 msgstr "Аватара"
 
@@ -1515,9 +1572,11 @@ msgstr "Ви можете завантажити аватару. Максима
 
 #. TRANS: Server error displayed in avatar upload page when no matching profile can be found for a user.
 #. TRANS: Server error displayed coming across a request from a user without a profile.
+#. TRANS: Server error displayed when trying to authorise a remote subscription request
+#. TRANS: while the user has no profile.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
 #: actions/grouplogo.php:184 actions/remotesubscribe.php:190
-#: actions/userauthorization.php:72 actions/userrss.php:108
+#: actions/userauthorization.php:75 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr "Користувач без відповідного профілю."
 
@@ -1572,10 +1631,9 @@ msgstr "Втяти"
 msgid "No file uploaded."
 msgstr "Жодного файлу не завантажено."
 
-#. TRANS: Avatar upload form unstruction after uploading a file.
+#. TRANS: Avatar upload form instruction after uploading a file.
 #: actions/avatarsettings.php:345
-#, fuzzy
-msgid "Pick a square area of the image to be your avatar"
+msgid "Pick a square area of the image to be your avatar."
 msgstr "Оберіть квадратну ділянку зображення, яка й буде вашою аватаркою."
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
@@ -1601,7 +1659,7 @@ msgstr "Аватару видалено."
 
 #. TRANS: Title for backup account page.
 #. TRANS: Option in profile settings to create a backup of the account of the currently logged in user.
-#: actions/backupaccount.php:61 actions/profilesettings.php:467
+#: actions/backupaccount.php:61 actions/profilesettings.php:468
 msgid "Backup account"
 msgstr "Резерв. копія"
 
@@ -1641,8 +1699,7 @@ msgstr "Резерв. копія"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
 #: actions/backupaccount.php:254
-#, fuzzy
-msgid "Backup your account"
+msgid "Backup your account."
 msgstr "Резервне копіювання вашого облікового запису."
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
@@ -1683,8 +1740,7 @@ msgstr "Ні"
 
 #. TRANS: Submit button title for 'No' when blocking a user.
 #: actions/block.php:158
-#, fuzzy
-msgid "Do not block this user"
+msgid "Do not block this user."
 msgstr "Не блокувати цього користувача."
 
 #. TRANS: Button label on the user block form.
@@ -1701,10 +1757,9 @@ msgid "Yes"
 msgstr "Так"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#. TRANS: Description of the form to block a user.
-#: actions/block.php:165 lib/blockform.php:79
-msgid "Block this user"
-msgstr "Блокувати користувача"
+#: actions/block.php:165
+msgid "Block this user."
+msgstr "Блокувати користувача."
 
 #. TRANS: Server error displayed when blocking a user fails.
 #: actions/block.php:189
@@ -1769,31 +1824,47 @@ msgstr "Код підтвердження не знайдено."
 msgid "That confirmation code is not for you!"
 msgstr "Цей код підтвердження не для вас!"
 
-#. TRANS: Server error for a unknow address type %s, which can be 'email', 'jabber', or 'sms'.
-#: actions/confirmaddress.php:92
-#, php-format
-msgid "Unrecognized address type %s."
+#. TRANS: Server error for an unknown address type, which can be 'email', 'sms', or the name of an IM network (such as 'xmpp' or 'aim')
+#: actions/confirmaddress.php:94
+#, fuzzy, php-format
+msgid "Unrecognized address type %s"
 msgstr "Невизначений тип адреси %s."
 
 #. TRANS: Client error for an already confirmed email/jabber/sms address.
-#: actions/confirmaddress.php:97
+#: actions/confirmaddress.php:103 actions/confirmaddress.php:136
 msgid "That address has already been confirmed."
 msgstr "Цю адресу вже підтверджено."
 
+#: actions/confirmaddress.php:121 actions/imsettings.php:444
+#: actions/userdesignsettings.php:306
+#, fuzzy
+msgid "Couldn't update user."
+msgstr "Не вдалося оновити користувача."
+
+#: actions/confirmaddress.php:144
+#, fuzzy
+msgid "Couldn't update user im preferences."
+msgstr "Не вдалося оновити запис користувача."
+
+#: actions/confirmaddress.php:156
+#, fuzzy
+msgid "Couldn't insert user im preferences."
+msgstr "Не вдалося додати нову підписку."
+
 #. TRANS: Server error displayed when an address confirmation code deletion from the
 #. TRANS: database fails in the contact address confirmation action.
-#: actions/confirmaddress.php:132
+#: actions/confirmaddress.php:169
 msgid "Could not delete address confirmation."
 msgstr "Не вдалося видалити адресу підтвердження."
 
 #. TRANS: Title for the contact address confirmation action.
-#: actions/confirmaddress.php:150
+#: actions/confirmaddress.php:185
 msgid "Confirm address"
 msgstr "Підтвердити адресу"
 
 #. TRANS: Success message for the contact address confirmation action.
 #. TRANS: %s can be 'email', 'jabber', or 'sms'.
-#: actions/confirmaddress.php:166
+#: actions/confirmaddress.php:200
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "Адресу «%s» підтверджено для вашого акаунту."
@@ -1807,6 +1878,7 @@ msgstr "Розмова"
 #. TRANS: Label for user statistics.
 #: actions/conversation.php:149 lib/noticelist.php:87
 #: lib/profileaction.php:246 lib/searchgroupnav.php:82
+#: lib/threadednoticelist.php:66
 msgid "Notices"
 msgstr "Дописи"
 
@@ -1840,7 +1912,7 @@ msgstr "Акаунт видалено."
 
 #. TRANS: Page title for page on which a user account can be deleted.
 #. TRANS: Option in profile settings to delete the account of the currently logged in user.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:475
+#: actions/deleteaccount.php:228 actions/profilesettings.php:476
 msgid "Delete account"
 msgstr "Видалити акаунт"
 
@@ -1867,7 +1939,7 @@ msgstr ""
 #. TRANS: Field label for delete account confirmation entry.
 #. TRANS: Field label for password reset form where the password has to be typed again.
 #: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:262 actions/register.php:440
+#: actions/recoverpassword.php:262 actions/register.php:419
 msgid "Confirm"
 msgstr "Підтвердити"
 
@@ -1896,14 +1968,14 @@ msgstr "Додаток не виявлено."
 #. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
 #: actions/deleteapplication.php:79 actions/editapplication.php:78
-#: actions/showapplication.php:94
+#: actions/showapplication.php:90
 msgid "You are not the owner of this application."
 msgstr "Ви не є власником цього додатку."
 
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
-#: actions/newapplication.php:112 actions/showapplication.php:118
-#: lib/action.php:1425
+#: actions/newapplication.php:112 actions/showapplication.php:113
+#: lib/action.php:1391
 msgid "There was a problem with your session token."
 msgstr "Виникли певні проблеми з токеном поточної сесії."
 
@@ -1926,14 +1998,12 @@ msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting an application.
 #: actions/deleteapplication.php:161
-#, fuzzy
-msgid "Do not delete this application"
+msgid "Do not delete this application."
 msgstr "Не видаляти цей додаток."
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
 #: actions/deleteapplication.php:167
-#, fuzzy
-msgid "Delete this application"
+msgid "Delete this application."
 msgstr "Видалити додаток."
 
 #. TRANS: Client error when trying to delete group while not logged in.
@@ -1987,14 +2057,12 @@ msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting a group.
 #: actions/deletegroup.php:224
-#, fuzzy
-msgid "Do not delete this group"
+msgid "Do not delete this group."
 msgstr "Не видаляти цю спільноту."
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
 #: actions/deletegroup.php:231
-#, fuzzy
-msgid "Delete this group"
+msgid "Delete this group."
 msgstr "Видалити спільноту."
 
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
@@ -2002,14 +2070,16 @@ msgstr "Видалити спільноту."
 #. TRANS: Client error displayed when trying to mark a notice as favorite without being logged in.
 #. TRANS: Client error displayed trying to block a user from a group while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
+#. TRANS: Client error displayed trying to log out when not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
+#. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
 #. TRANS: Client error displayed when trying to change user options while not logged in.
 #: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
-#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:69
+#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:70
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
-#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
-#: actions/tagother.php:33 actions/unsubscribe.php:52
+#: actions/nudge.php:63 actions/pluginenable.php:97 actions/subedit.php:33
+#: actions/subscribe.php:98 actions/tagother.php:33 actions/unsubscribe.php:52
 #: lib/adminpanelaction.php:71 lib/profileformaction.php:63
 #: lib/settingsaction.php:72
 msgid "Not logged in."
@@ -2035,14 +2105,13 @@ msgstr "Ви впевненні, що бажаєте видалити цей д
 
 #. TRANS: Submit button title for 'No' when deleting a notice.
 #: actions/deletenotice.php:159
-#, fuzzy
-msgid "Do not delete this notice"
+msgid "Do not delete this notice."
 msgstr "Не видаляти цей допис."
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:166 lib/noticelist.php:673
-msgid "Delete this notice"
-msgstr "Видалити допис"
+#: actions/deletenotice.php:166
+msgid "Delete this notice."
+msgstr "Видалити допис."
 
 #. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
 #: actions/deleteuser.php:66
@@ -2076,19 +2145,16 @@ msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting a user.
 #: actions/deleteuser.php:158
-#, fuzzy
-msgid "Do not delete this user"
+msgid "Do not delete this user."
 msgstr "Не видаляти цього користувача."
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
-#. TRANS: Description of form for deleting a user.
-#: actions/deleteuser.php:165 lib/deleteuserform.php:75
-msgid "Delete this user"
-msgstr "Видалити цього користувача"
+#: actions/deleteuser.php:165
+msgid "Delete this user."
+msgstr "Видалити цього користувача."
 
 #. TRANS: Message used as title for design settings for the site.
-#. TRANS: Link description in user account settings menu.
-#: actions/designadminpanel.php:60 lib/accountsettingsaction.php:134
+#: actions/designadminpanel.php:60 lib/settingsnav.php:97
 msgid "Design"
 msgstr "Дизайн"
 
@@ -2155,8 +2221,7 @@ msgid "You can upload a custom StatusNet theme as a .ZIP archive."
 msgstr "Ви можете завантажити свою тему для сайту StatusNet як .ZIP архів."
 
 #. TRANS: Fieldset legend for theme background image.
-#. TRANS: Fieldset legend on profile design page.
-#: actions/designadminpanel.php:515 lib/designsettings.php:98
+#: actions/designadminpanel.php:515
 msgid "Change background image"
 msgstr "Змінити фонове зображення"
 
@@ -2164,7 +2229,7 @@ msgstr "Змінити фонове зображення"
 #. TRANS: Field label for background color selector.
 #. TRANS: Label on profile design page for setting a profile page background colour.
 #: actions/designadminpanel.php:525 actions/designadminpanel.php:609
-#: lib/designsettings.php:183
+#: lib/designform.php:238
 msgid "Background"
 msgstr "Фон"
 
@@ -2191,13 +2256,13 @@ msgstr "Вимк."
 #. TRANS: Form guide for turning background image on or off on theme designer page.
 #. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
 #. TRANS: use of the uploaded profile image.
-#: actions/designadminpanel.php:577 lib/designsettings.php:159
+#: actions/designadminpanel.php:577 lib/designform.php:214
 msgid "Turn background image on or off."
 msgstr "Увімкнути або вимкнути фонове зображення."
 
 #. TRANS: Checkbox label to title background image on theme designer page.
 #. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-#: actions/designadminpanel.php:583 lib/designsettings.php:165
+#: actions/designadminpanel.php:583 lib/designform.php:220
 msgid "Tile background image"
 msgstr "Замостити фон"
 
@@ -2208,25 +2273,25 @@ msgstr "Змінити кольори"
 
 #. TRANS: Field label for content color selector.
 #. TRANS: Label on profile design page for setting a profile page content colour.
-#: actions/designadminpanel.php:623 lib/designsettings.php:197
+#: actions/designadminpanel.php:623 lib/designform.php:252
 msgid "Content"
 msgstr "Зміст"
 
 #. TRANS: Field label for sidebar color selector.
 #. TRANS: Label on profile design page for setting a profile page sidebar colour.
-#: actions/designadminpanel.php:637 lib/designsettings.php:211
+#: actions/designadminpanel.php:637 lib/designform.php:266
 msgid "Sidebar"
 msgstr "Сайдбар"
 
 #. TRANS: Field label for text color selector.
 #. TRANS: Label on profile design page for setting a profile page text colour.
-#: actions/designadminpanel.php:651 lib/designsettings.php:225
+#: actions/designadminpanel.php:651 lib/designform.php:280
 msgid "Text"
 msgstr "Текст"
 
 #. TRANS: Field label for link color selector.
 #. TRANS: Label on profile design page for setting a profile page links colour.
-#: actions/designadminpanel.php:665 lib/designsettings.php:239
+#: actions/designadminpanel.php:665 lib/designform.php:294
 msgid "Links"
 msgstr "Посилання"
 
@@ -2247,22 +2312,19 @@ msgid "Use defaults"
 msgstr "За замовч."
 
 #. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: actions/designadminpanel.php:720 lib/designsettings.php:259
-msgid "Restore default designs"
-msgstr "Оновити налаштування за замовчуванням"
+#: actions/designadminpanel.php:720
+msgid "Restore default designs."
+msgstr "Відновити стандартні установки."
 
 #. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: actions/designadminpanel.php:728 lib/designsettings.php:267
-msgid "Reset back to default"
-msgstr "Повернутись до початкових налаштувань"
+#: actions/designadminpanel.php:728
+msgid "Reset back to default."
+msgstr "Повернутись до стандартних налаштувань."
 
 #. TRANS: Title for button for saving theme settings.
-#. TRANS: Title for button on profile design page to save settings.
-#: actions/designadminpanel.php:736 lib/designsettings.php:272
-msgid "Save design"
-msgstr "Зберегти дизайн"
+#: actions/designadminpanel.php:736
+msgid "Save design."
+msgstr "Зберегти дизайн."
 
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
 #: actions/disfavor.php:83
@@ -2293,7 +2355,7 @@ msgid "You must be logged in to edit an application."
 msgstr "Ви маєте спочатку увійти, аби мати змогу керувати додатком."
 
 #. TRANS: Client error displayed trying to edit an application that does not exist.
-#: actions/editapplication.php:83 actions/showapplication.php:87
+#: actions/editapplication.php:83 actions/showapplication.php:83
 msgid "No such application."
 msgstr "Такого додатку немає."
 
@@ -2384,82 +2446,53 @@ msgstr "Змінити властивості спільноти %s"
 msgid "You must be logged in to create a group."
 msgstr "Ви маєте спочатку увійти, аби мати змогу започаткувати спільноту."
 
-#. TRANS: Client error displayed trying to edit a group while not being a group admin.
-#. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
-#. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
-#: actions/editgroup.php:110 actions/editgroup.php:176
-#: actions/groupdesignsettings.php:109 actions/grouplogo.php:111
-msgid "You must be an admin to edit the group."
-msgstr ""
-"Ви маєте бути наділені правами адміністратора, аби відредагувати властивості "
-"даної спільноти."
-
 #. TRANS: Form instructions for group edit form.
 #: actions/editgroup.php:161
 msgid "Use this form to edit the group."
 msgstr "Скористайтесь цією формою, щоб відредагувати властивості спільноти."
 
-#. TRANS: Group edit form validation error.
-#. TRANS: Group create form validation error.
-#. TRANS: %s is the invalid alias.
-#: actions/editgroup.php:241 actions/newgroup.php:188
-#, php-format
-msgid "Invalid alias: \"%s\""
-msgstr "Помилкове додаткове ім’я: «%s»"
-
-#. TRANS: Server error displayed when editing a group fails.
-#: actions/editgroup.php:274
-msgid "Could not update group."
-msgstr "Не вдалося оновити спільноту."
-
-#. TRANS: Server error displayed when group aliases could not be added.
-#. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/editgroup.php:281 classes/User_group.php:540
-msgid "Could not create aliases."
-msgstr "Неможна призначити додаткові імена."
-
 #. TRANS: Group edit form success message.
 #: actions/editgroup.php:301
 msgid "Options saved."
 msgstr "Опції збережено."
 
 #. TRANS: Title for e-mail settings.
-#: actions/emailsettings.php:59
+#: actions/emailsettings.php:60
 msgid "Email settings"
 msgstr "Налаштування пошти"
 
 #. TRANS: E-mail settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/emailsettings.php:73
+#: actions/emailsettings.php:74
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 msgstr "Зазначте, як саме ви бажаєте отримувати листи з %%site.name%%."
 
 #. TRANS: Form legend for e-mail settings form.
 #. TRANS: Field label for e-mail address input in e-mail settings form.
-#: actions/emailsettings.php:103 actions/emailsettings.php:129
+#: actions/emailsettings.php:104 actions/emailsettings.php:130
 msgid "Email address"
 msgstr "Електронна адреса"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:109
+#: actions/emailsettings.php:110
 msgid "Current confirmed email address."
 msgstr "Поточна підтверджена поштова адреса."
 
 #. TRANS: Button label to remove a confirmed e-mail address.
 #. TRANS: Button label for removing a set sender e-mail address to post notices from.
-#. TRANS: Button label to remove a confirmed Instant Messaging address.
+#. TRANS: Button label to remove a confirmed IM address.
 #. TRANS: Button label to remove a confirmed SMS address.
 #. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
-#: actions/emailsettings.php:112 actions/emailsettings.php:179
-#: actions/imsettings.php:112 actions/smssettings.php:120
-#: actions/smssettings.php:176
+#: actions/emailsettings.php:113 actions/emailsettings.php:180
+#: actions/imsettings.php:119 actions/smssettings.php:119
+#: actions/smssettings.php:175
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Видалити"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:119
+#: actions/emailsettings.php:120
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -2472,44 +2505,44 @@ msgstr ""
 #. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
 #. TRANS: Any other domain may be owned by a legitimate person or
 #. TRANS: organization.
-#: actions/emailsettings.php:136
+#: actions/emailsettings.php:137
 msgid "Email address, like \"UserName@example.org\""
 msgstr "Електронна адреса, на зразок «UserName@example.org»"
 
 #. TRANS: Button label for adding an e-mail address in e-mail settings form.
-#. TRANS: Button label for adding an Instant Messaging address in Instant Messaging settings form.
+#. TRANS: Button label for adding an IM address in IM settings form.
 #. TRANS: Button label for adding a SMS phone number in SMS settings form.
-#: actions/emailsettings.php:140 actions/imsettings.php:147
-#: actions/smssettings.php:158
+#: actions/emailsettings.php:141 actions/imsettings.php:147
+#: actions/smssettings.php:157
 msgctxt "BUTTON"
 msgid "Add"
 msgstr "Додати"
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:148 actions/smssettings.php:167
+#: actions/emailsettings.php:149 actions/smssettings.php:166
 msgid "Incoming email"
 msgstr "Вхідна пошта"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:154
+#: actions/emailsettings.php:155
 msgid "I want to post notices by email."
 msgstr "Я хочу надсилати дописи поштою."
 
 #. TRANS: Form instructions for incoming e-mail form in e-mail settings.
 #. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
-#: actions/emailsettings.php:176 actions/smssettings.php:174
+#: actions/emailsettings.php:177 actions/smssettings.php:173
 msgid "Send email to this address to post new notices."
 msgstr "Надсилайте дописи на цю адресу і їх буде опубліковано на сайті."
 
 #. TRANS: Instructions for incoming e-mail address input form, when an address has already been assigned.
 #. TRANS: Instructions for incoming SMS e-mail address input form.
-#: actions/emailsettings.php:185 actions/smssettings.php:182
+#: actions/emailsettings.php:186 actions/smssettings.php:181
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr "Створити нову адресу для надсилання повідомлень; видалити стару."
 
 #. TRANS: Instructions for incoming e-mail address input form.
-#: actions/emailsettings.php:189
+#: actions/emailsettings.php:190
 msgid ""
 "To send notices via email, we need to create a unique email address for you "
 "on this server:"
@@ -2519,87 +2552,87 @@ msgstr ""
 
 #. TRANS: Button label for adding an e-mail address to send notices from.
 #. TRANS: Button label for adding an SMS e-mail address to send notices from.
-#: actions/emailsettings.php:195 actions/smssettings.php:185
+#: actions/emailsettings.php:196 actions/smssettings.php:184
 msgctxt "BUTTON"
 msgid "New"
 msgstr "Нове"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:204
+#: actions/emailsettings.php:205
 msgid "Email preferences"
 msgstr "Преференції ел. пошти"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:212
+#: actions/emailsettings.php:213
 msgid "Send me notices of new subscriptions through email."
 msgstr "Поівдомляти мене поштою про нові підписки."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:218
+#: actions/emailsettings.php:219
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr "Надсилати мені листа, коли хтось додає мій допис до списку обраних."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:225
+#: actions/emailsettings.php:226
 msgid "Send me email when someone sends me a private message."
 msgstr "Надсилати мені листа, коли хтось має приватне повідомлення для мене."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:231
+#: actions/emailsettings.php:232
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr "Надсилати мені листа, коли на мій допис з’являється «@-відповідь»."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:237
+#: actions/emailsettings.php:238
 msgid "Allow friends to nudge me and send me an email."
 msgstr "Дозволити друзям «розштовхати» мене, надіславши мені листа."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:243
+#: actions/emailsettings.php:244
 msgid "Publish a MicroID for my email address."
 msgstr "Позначати міткою MicroID мою електронну адресу."
 
 #. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:361
+#: actions/emailsettings.php:362
 msgid "Email preferences saved."
 msgstr "Преференції пошти збережно."
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:380
+#: actions/emailsettings.php:381
 msgid "No email address."
 msgstr "Немає електронної адреси."
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:388
+#: actions/emailsettings.php:389
 msgid "Cannot normalize that email address."
 msgstr "Не можна полагодити цю поштову адресу."
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:393 actions/register.php:212
+#: actions/emailsettings.php:394 actions/register.php:197
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "Це недійсна електронна адреса."
 
 #. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:397
+#: actions/emailsettings.php:398
 msgid "That is already your email address."
 msgstr "Це і є вашою адресою."
 
 #. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:401
+#: actions/emailsettings.php:402
 msgid "That email address already belongs to another user."
 msgstr "Ця електронна адреса належить іншому користувачу."
 
 #. TRANS: Server error thrown on database error adding e-mail confirmation code.
 #. TRANS: Server error thrown on database error adding Instant Messaging confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:418 actions/imsettings.php:343
-#: actions/smssettings.php:365
+#: actions/emailsettings.php:419 actions/imsettings.php:362
+#: actions/smssettings.php:364
 msgid "Could not insert confirmation code."
 msgstr "Не вдалося додати код підтвердження."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:425
+#: actions/emailsettings.php:426
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
@@ -2611,57 +2644,60 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling Instant Messaging address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:445 actions/imsettings.php:377
-#: actions/smssettings.php:399
+#: actions/emailsettings.php:446 actions/imsettings.php:391
+#: actions/smssettings.php:398
 msgid "No pending confirmation to cancel."
 msgstr "Не очікується підтвердження для скасування."
 
 #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:450
+#: actions/emailsettings.php:451
 msgid "That is the wrong email address."
 msgstr "Це помилкова адреса електронної пошти."
 
 #. TRANS: Server error thrown on database error canceling e-mail address confirmation.
 #. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
-#: actions/emailsettings.php:459 actions/smssettings.php:413
+#: actions/emailsettings.php:460 actions/smssettings.php:412
 msgid "Could not delete email confirmation."
 msgstr "Не вдається видалити підтвердження електронної адреси."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:464
+#: actions/emailsettings.php:465
 msgid "Email confirmation cancelled."
 msgstr "Підтвердження електронної пошти скасовано."
 
 #. TRANS: Message given trying to remove an e-mail address that is not
 #. TRANS: registered for the active user.
-#: actions/emailsettings.php:483
+#: actions/emailsettings.php:484
 msgid "That is not your email address."
 msgstr "Це не є вашою адресою."
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:504
+#: actions/emailsettings.php:505
 msgid "The email address was removed."
 msgstr "Адреса була видалена."
 
 #. TRANS: Form validation error displayed when trying to remove an incoming e-mail address while no address has been set.
-#: actions/emailsettings.php:518 actions/smssettings.php:555
+#: actions/emailsettings.php:519 actions/smssettings.php:554
 msgid "No incoming email address."
 msgstr "Немає адреси для вхідної пошти."
 
 #. TRANS: Server error thrown on database error removing incoming e-mail address.
 #. TRANS: Server error thrown on database error adding incoming e-mail address.
-#: actions/emailsettings.php:530 actions/emailsettings.php:554
-#: actions/smssettings.php:565 actions/smssettings.php:588
+#. TRANS: Server error displayed when the user could not be updated in SMS settings.
+#: actions/emailsettings.php:531 actions/emailsettings.php:555
+#: actions/smssettings.php:565 actions/smssettings.php:590
 msgid "Could not update user record."
 msgstr "Не вдалося оновити запис користувача."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:534 actions/smssettings.php:568
+#. TRANS: Confirmation text after updating SMS settings.
+#: actions/emailsettings.php:535 actions/smssettings.php:569
 msgid "Incoming email address removed."
 msgstr "Адресу вхідної пошти видалено."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:558 actions/smssettings.php:591
+#. TRANS: Confirmation text after updating SMS settings.
+#: actions/emailsettings.php:559 actions/smssettings.php:594
 msgid "New incoming email address added."
 msgstr "Нову адресу для вхідних повідомлень додано."
 
@@ -2672,9 +2708,8 @@ msgstr "Цей допис вже є обраним!"
 
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
 #: actions/favor.php:95
-#, fuzzy
-msgid "Disfavor favorite"
-msgstr "Видалити з обраних"
+msgid "Disfavor favorite."
+msgstr "Видалити з обраних."
 
 #. TRANS: Page title for first page of favorited notices.
 #. TRANS: Title for favourited notices section.
@@ -2724,9 +2759,8 @@ msgstr ""
 #. TRANS: %s is a user's nickname.
 #. TRANS: Title for first page of favourite notices of a user.
 #. TRANS: %s is the user for whom the favourite notices are displayed.
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing own favourited notices.
 #: actions/favoritesrss.php:111 actions/showfavorites.php:76
-#: lib/personalgroupnav.php:122
+#: lib/personalgroupnav.php:110
 #, php-format
 msgid "%s's favorite notices"
 msgstr "Обрані дописи %s"
@@ -2912,14 +2946,12 @@ msgstr ""
 
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
 #: actions/groupblock.php:191
-#, fuzzy
-msgid "Do not block this user from this group"
+msgid "Do not block this user from this group."
 msgstr "Не блокувати цього користувача у цій спільноті."
 
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
 #: actions/groupblock.php:198
-#, fuzzy
-msgid "Block this user from this group"
+msgid "Block this user from this group."
 msgstr "Заблокувати цього користувача у цій спільноті."
 
 #. TRANS: Server error displayed when trying to block a user from a group fails because of an application error.
@@ -2928,6 +2960,7 @@ msgid "Database error blocking user from group."
 msgstr "Виникла помилка при блокуванні користувача в цій спільноті."
 
 #. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
+#. TRANS: Client error displayed trying to find a user by ID without providing an ID.
 #: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr "Немає ID."
@@ -2958,7 +2991,7 @@ msgid "Unable to update your design settings."
 msgstr "Не вдалося оновити налаштування дизайну."
 
 #. TRANS: Form text to confirm saved group design settings.
-#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:222
+#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:239
 msgid "Design preferences saved."
 msgstr "Преференції дизайну збережно."
 
@@ -3023,7 +3056,7 @@ msgid "A list of the users in this group."
 msgstr "Список учасників цієї спільноти."
 
 #. TRANS: Indicator in group members list that this user is a group administrator.
-#: actions/groupmembers.php:190
+#: actions/groupmembers.php:190 lib/action.php:581
 msgid "Admin"
 msgstr "Адмін"
 
@@ -3116,8 +3149,10 @@ msgid "Group search"
 msgstr "Пошук спільнот"
 
 #. TRANS: Text on page where groups can be searched if no results were found for a query.
-#: actions/groupsearch.php:82 actions/noticesearch.php:117
-#: actions/peoplesearch.php:83
+#. TRANS: Text for notice search results is the query had no results.
+#. TRANS: Message on the "People search" page where a query has no results.
+#: actions/groupsearch.php:82 actions/noticesearch.php:122
+#: actions/peoplesearch.php:87
 msgid "No results."
 msgstr "Немає результатів."
 
@@ -3154,163 +3189,173 @@ msgid "User is not blocked from group."
 msgstr "Користувача не блоковано."
 
 #. TRANS: Server error displayed when unblocking a user from a group fails because of an unknown error.
+#. TRANS: Server error displayed when removing a user block.
 #: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "Помилка при розблокуванні."
 
 #. TRANS: Title for Instant Messaging settings.
-#: actions/imsettings.php:58
+#: actions/imsettings.php:56
 msgid "IM settings"
 msgstr "Налаштування ІМ"
 
 #. 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.
-#: actions/imsettings.php:71
-#, php-format
+#: actions/imsettings.php:69
+#, fuzzy, php-format
 msgid ""
-"You can send and receive notices through Jabber/Google Talk [instant "
-"messages](%%doc.im%%). Configure your address and settings below."
+"You can send and receive notices through instant messaging [instant messages]"
+"(%%doc.im%%). Configure your addresses and settings below."
 msgstr ""
 "Ви можете надсилати та отримувати дописи через Jabber/Google Talk [службу "
 "миттєвих повідомлень](%%doc.im%%). Вкажіть свою адресу і налаштуйте опції "
 "нижче."
 
-#. TRANS: Message given in the Instant Messaging settings if XMPP is not enabled on the site.
+#. TRANS: Message given in the IM settings if IM is not enabled on the site.
 #: actions/imsettings.php:90
 msgid "IM is not available."
 msgstr "ІМ недоступний"
 
-#. TRANS: Form legend for Instant Messaging settings form.
-#. TRANS: Field label for Instant Messaging address input in Instant Messaging settings form.
-#: actions/imsettings.php:102 actions/imsettings.php:132
-msgid "IM address"
-msgstr "ІМ-адреса"
+#: actions/imsettings.php:116
+#, fuzzy, php-format
+msgid "Current confirmed %s address."
+msgstr "Поточна підтверджена поштова адреса."
 
-#: actions/imsettings.php:109
-msgid "Current confirmed Jabber/Google Talk address."
-msgstr "Поточна підтверджена адреса Jabber/Google Talk."
-
-#. TRANS: Form note in Instant Messaging settings form.
-#. TRANS: %s is the Instant Messaging address set for the site.
-#: actions/imsettings.php:120
-#, php-format
+#. TRANS: Form note in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:128
+#, fuzzy, php-format
 msgid ""
-"Awaiting confirmation on this address. Check your Jabber/Google Talk account "
-"for a message with further instructions. (Did you add %s to your buddy list?)"
+"Awaiting confirmation on this address. Check your %s account for a message "
+"with further instructions. (Did you add %s to your buddy list?)"
 msgstr ""
 "Очікування підтвердження цієї адреси. Перевірте свій Jabber/Google Talk "
 "акаунт, туди має надійти повідомлення з подальшими інструкціями. (Ви додали %"
 "s до вашого списку контактів?)"
 
-#. TRANS: IM address input field instructions in Instant Messaging settings form.
-#. TRANS: %s is the Instant Messaging address set for the site.
-#. TRANS: Do not translate "example.org". It is one of the domain names reserved for use in examples by
-#. TRANS: http://www.rfc-editor.org/rfc/rfc2606.txt. Any other domain may be owned by a legitimate
-#. TRANS: person or organization.
-#: actions/imsettings.php:139
-#, php-format
-msgid ""
-"Jabber or Google Talk address, like \"UserName@example.org\". First, make "
-"sure to add %s to your buddy list in your IM client or on Google Talk."
-msgstr ""
-"Jabber або Google Talk адреса, на зразок «username@example.org». Але спершу "
-"переконайтеся, що додали %s до списку контактів в своєму IM-клієнті або в "
-"Google Talk."
+#: actions/imsettings.php:140
+msgid "IM address"
+msgstr "ІМ-адреса"
 
-#. TRANS: Form legend for Instant Messaging preferences form.
-#: actions/imsettings.php:154
-msgid "IM preferences"
+#: actions/imsettings.php:142
+#, php-format
+msgid "%s screenname."
+msgstr ""
+
+#. TRANS: Header for IM preferences form.
+#: actions/imsettings.php:163
+#, fuzzy
+msgid "IM Preferences"
 msgstr "Преференції ІМ"
 
-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:159
-msgid "Send me notices through Jabber/Google Talk."
-msgstr "Повідомляти мене через Jabber/Google Talk."
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:174
+#, fuzzy
+msgid "Send me notices"
+msgstr "Надіслати допис"
 
-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:165
-msgid "Post a notice when my Jabber/Google Talk status changes."
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:176
+#, fuzzy
+msgid "Post a notice when my status changes."
 msgstr ""
 "Надсилати дописи на сайт, коли мій статус Jabber/Google Talk змінюється."
 
-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:171
-msgid ""
-"Send me replies through Jabber/Google Talk from people I'm not subscribed to."
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:178
+#, fuzzy
+msgid "Send me replies from people I'm not subscribed to."
 msgstr ""
 "Надсилати мені відповіді через Jabber/Google Talk від людей, до яких я не "
 "підписаний."
 
-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:178
-msgid "Publish a MicroID for my Jabber/Google Talk address."
-msgstr "Позначати міткою MicroID мою адресу Jabber/Google Talk."
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:181
+#, fuzzy
+msgid "Publish a MicroID"
+msgstr "Позначати міткою MicroID мою електронну адресу."
 
-#. TRANS: Confirmation message for successful Instant Messaging preferences save.
-#: actions/imsettings.php:283 actions/othersettings.php:192
+#. TRANS: Server error thrown on database error updating IM preferences.
+#: actions/imsettings.php:291
+#, fuzzy
+msgid "Couldn't update IM preferences."
+msgstr "Не вдалося оновити користувача."
+
+#. TRANS: Confirmation message for successful IM preferences save.
+#. TRANS: Confirmation message after saving preferences.
+#: actions/imsettings.php:298 actions/urlsettings.php:244
 msgid "Preferences saved."
 msgstr "Преференції збережно."
 
-#. TRANS: Message given saving Instant Messaging address without having provided one.
-#: actions/imsettings.php:304
-msgid "No Jabber ID."
-msgstr "Немає Jabber ID."
+#. TRANS: Message given saving IM address without having provided one.
+#: actions/imsettings.php:320
+#, fuzzy
+msgid "No screenname."
+msgstr "Немає імені."
 
-#. TRANS: Message given saving Instant Messaging address that cannot be normalised.
-#: actions/imsettings.php:312
-msgid "Cannot normalize that Jabber ID."
+#: actions/imsettings.php:325
+#, fuzzy
+msgid "No transport."
+msgstr "Немає допису."
+
+#. TRANS: Message given saving IM address that cannot be normalised.
+#: actions/imsettings.php:333
+#, fuzzy
+msgid "Cannot normalize that screenname"
 msgstr "Не можна полагодити цей Jabber ID."
 
-#. TRANS: Message given saving Instant Messaging address that not valid.
-#: actions/imsettings.php:317
-msgid "Not a valid Jabber ID."
-msgstr "Це недійсний Jabber ID."
+#. TRANS: Message given saving IM address that not valid.
+#: actions/imsettings.php:340
+#, fuzzy
+msgid "Not a valid screenname"
+msgstr "Це недійсне ім’я користувача."
 
-#. TRANS: Message given saving Instant Messaging address that is already set.
-#: actions/imsettings.php:321
-msgid "That is already your Jabber ID."
-msgstr "Це і є ваш Jabber ID."
-
-#. TRANS: Message given saving Instant Messaging address that is already set for another user.
-#: actions/imsettings.php:325
-msgid "Jabber ID already belongs to another user."
+#. TRANS: Message given saving IM address that is already set for another user.
+#: actions/imsettings.php:344
+#, fuzzy
+msgid "Screenname already belongs to another user."
 msgstr "Jabber ID вже належить іншому користувачу."
 
-#. TRANS: Message given saving valid Instant Messaging address that is to be confirmed.
-#. TRANS: %s is the Instant Messaging address set for the site.
-#: actions/imsettings.php:353
-#, php-format
-msgid ""
-"A confirmation code was sent to the IM address you added. You must approve %"
-"s for sending messages to you."
+#. TRANS: Message given saving valid IM address that is to be confirmed.
+#: actions/imsettings.php:369
+#, fuzzy
+msgid "A confirmation code was sent to the IM address you added."
 msgstr ""
 "Код підтвердження був відправлений на адресу IM, яку ви зазначили. Ви "
 "повинні затвердити %s для відправлення вам повідомлень."
 
-#. TRANS: Message given canceling Instant Messaging address confirmation for the wrong IM address.
-#: actions/imsettings.php:382
+#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#: actions/imsettings.php:396
 msgid "That is the wrong IM address."
 msgstr "Це помилкова адреса IM."
 
-#. TRANS: Server error thrown on database error canceling Instant Messaging address confirmation.
-#: actions/imsettings.php:391
-msgid "Could not delete IM confirmation."
+#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#: actions/imsettings.php:405
+#, fuzzy
+msgid "Couldn't delete confirmation."
 msgstr "Не вдалося видалити підтвердження ІМ-адреси."
 
-#. TRANS: Message given after successfully canceling Instant Messaging address confirmation.
-#: actions/imsettings.php:396
+#. TRANS: Message given after successfully canceling IM address confirmation.
+#: actions/imsettings.php:410
 msgid "IM confirmation cancelled."
 msgstr "Підтвердження ІМ скасовано."
 
-#. TRANS: Message given trying to remove an Instant Messaging address that is not
+#. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.
-#: actions/imsettings.php:417
-msgid "That is not your Jabber ID."
-msgstr "Це не ваш Jabber ID."
+#: actions/imsettings.php:434
+#, fuzzy
+msgid "That is not your screenname."
+msgstr "Це не ваш телефонний номер."
+
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#: actions/imsettings.php:443
+#, fuzzy
+msgid "Couldn't update user im prefs."
+msgstr "Не вдалося оновити запис користувача."
 
 #. TRANS: Message given after successfully removing a registered Instant Messaging address.
-#: actions/imsettings.php:440
+#: actions/imsettings.php:451
 msgid "The IM address was removed."
 msgstr "Адреса ІМ була видалена."
 
@@ -3528,7 +3573,7 @@ msgid "You must be logged in to join a group."
 msgstr "Ви повинні спочатку увійти на сайт, аби долучитися до спільноти."
 
 #. TRANS: Title for join group page after joining.
-#: actions/joingroup.php:147
+#: actions/joingroup.php:148
 #, php-format
 msgctxt "TITLE"
 msgid "%1$s joined group %2$s"
@@ -3657,7 +3702,7 @@ msgstr "URL-адреса зображення (логотипу) для пока
 #. TRANS: Submit button title.
 #: actions/licenseadminpanel.php:311 actions/sessionsadminpanel.php:199
 #: actions/siteadminpanel.php:292 actions/snapshotadminpanel.php:245
-#: actions/tagother.php:154 lib/applicationeditform.php:357
+#: actions/tagother.php:133 lib/applicationeditform.php:357
 msgid "Save"
 msgstr "Зберегти"
 
@@ -3665,41 +3710,43 @@ msgstr "Зберегти"
 msgid "Save license settings"
 msgstr "Зберегти налаштування ліцензії"
 
-#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
+#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
+#: actions/login.php:97 actions/otp.php:62 actions/register.php:130
 msgid "Already logged in."
 msgstr "Тепер ви увійшли."
 
-#: actions/login.php:148
+#: actions/login.php:125
 msgid "Incorrect username or password."
 msgstr "Неточне ім’я або пароль."
 
-#: actions/login.php:154 actions/otp.php:120
+#. TRANS: Server error displayed when a user object could not be created trying to login using "one time password login".
+#: actions/login.php:131 actions/otp.php:127
 msgid "Error setting user. You are probably not authorized."
 msgstr "Помилка. Можливо, ви не авторизовані."
 
-#: actions/login.php:210 actions/login.php:263
+#: actions/login.php:185 actions/login.php:236 lib/action.php:598
 msgid "Login"
 msgstr "Увійти"
 
-#: actions/login.php:249
+#: actions/login.php:222
 msgid "Login to site"
 msgstr "Вхід на сайт"
 
-#: actions/login.php:258 actions/register.php:490
+#: actions/login.php:231 actions/register.php:469
 msgid "Remember me"
 msgstr "Пам’ятати мене"
 
-#: actions/login.php:259 actions/register.php:492
+#: actions/login.php:232 actions/register.php:471
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 "Автоматично входити у майбутньому; не для комп’ютерів загального "
 "користування!"
 
-#: actions/login.php:269
+#: actions/login.php:241
 msgid "Lost or forgotten password?"
 msgstr "Загубили або забули пароль?"
 
-#: actions/login.php:288
+#: actions/login.php:259
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -3707,11 +3754,11 @@ msgstr ""
 "З міркувань безпеки, будь ласка, введіть ще раз ім’я та пароль, перед тим як "
 "змінювати налаштування."
 
-#: actions/login.php:292
+#: actions/login.php:263
 msgid "Login with your username and password."
 msgstr "Увійти використовуючи ім’я та пароль."
 
-#: actions/login.php:295
+#: actions/login.php:266
 #, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -3840,7 +3887,9 @@ msgstr "Новий допис"
 msgid "Notice posted"
 msgstr "Допис надіслано"
 
-#: actions/noticesearch.php:68
+#. TRANS: Instructions for Notice search page.
+#. TRANS: %%site.name%% is the name of the StatusNet site.
+#: actions/noticesearch.php:69
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -3849,16 +3898,21 @@ msgstr ""
 "Пошук дописів на %%site.name%% за їх змістом. Відокремлюйте пошукові умови "
 "інтервалами; вони повинні складатись з 3 знаків або більше."
 
-#: actions/noticesearch.php:78
+#. TRANS: Title of the page where users can search for notices.
+#: actions/noticesearch.php:80
 msgid "Text search"
 msgstr "Пошук текстів"
 
-#: actions/noticesearch.php:91
+#. TRANS: Test in RSS notice search.
+#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
+#: actions/noticesearch.php:95
 #, php-format
 msgid "Search results for \"%1$s\" on %2$s"
 msgstr "Результати пошуку «%1$s» на сайті %2$s"
 
-#: actions/noticesearch.php:121
+#. TRANS: Text for logged in users making a query for notices without results.
+#. TRANS: This message contains a Markdown link.
+#: actions/noticesearch.php:128
 #, php-format
 msgid ""
 "Be the first to [post on this topic](%%%%action.newnotice%%%%?"
@@ -3867,7 +3921,9 @@ msgstr ""
 "Станьте тим, хто напише перший [допис до цього топіку](%%%%action.newnotice%%"
 "%%?status_textarea=%s)!"
 
-#: actions/noticesearch.php:124
+#. TRANS: Text for not logged in users making a query for notices without results.
+#. TRANS: This message contains Markdown links.
+#: actions/noticesearch.php:133
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and be the first to "
@@ -3876,14 +3932,17 @@ msgstr ""
 "Чому б не [зареєструватись](%%%%action.register%%%%) і не написати перший "
 "[допис до цього топіку](%%%%action.newnotice%%%%?status_textarea=%s)!"
 
-#: actions/noticesearchrss.php:96
+#. TRANS: RSS notice search feed title. %s is the query.
+#: actions/noticesearchrss.php:95
 #, php-format
 msgid "Updates with \"%s\""
 msgstr "Оновлення з «%s»"
 
-#: actions/noticesearchrss.php:98
-#, fuzzy, php-format
-msgid "Updates matching search term \"%1$s\" on %2$s!"
+#. TRANS: RSS notice search feed description.
+#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
+#: actions/noticesearchrss.php:99
+#, php-format
+msgid "Updates matching search term \"%1$s\" on %2$s."
 msgstr "Всі оновлення за збігом з «%1$s» на %2$s."
 
 #: actions/nudge.php:85
@@ -3903,51 +3962,51 @@ msgid "Nudge sent!"
 msgstr "Спробу «розштовхати» зараховано!"
 
 #. TRANS: Message displayed to an anonymous user trying to view OAuth application list.
-#: actions/oauthappssettings.php:60
+#: actions/oauthappssettings.php:57
 msgid "You must be logged in to list your applications."
 msgstr "Ви повинні увійти, аби переглянути список ваших додатків."
 
 #. TRANS: Page title for OAuth applications
-#: actions/oauthappssettings.php:76
+#: actions/oauthappssettings.php:73
 msgid "OAuth applications"
 msgstr "Додатки OAuth"
 
 #. TRANS: Page instructions for OAuth applications
-#: actions/oauthappssettings.php:88
+#: actions/oauthappssettings.php:85
 msgid "Applications you have registered"
 msgstr "Додатки, які ви зареєстрували"
 
 #. TRANS: Empty list message on page with OAuth applications.
-#: actions/oauthappssettings.php:141
+#: actions/oauthappssettings.php:138
 #, php-format
 msgid "You have not registered any applications yet."
 msgstr "Поки що ви не зареєстрували жодних додатків."
 
 #. TRANS: Title for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:71
+#: actions/oauthconnectionssettings.php:69
 msgid "Connected applications"
 msgstr "Під’єднані додатки"
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:83
+#: actions/oauthconnectionssettings.php:80
 msgid "The following connections exist for your account."
 msgstr "Наступні з’єднання вже існують для вашого профілю."
 
 #. TRANS: Client error when trying to revoke access for an application while not being a user of it.
-#: actions/oauthconnectionssettings.php:168
+#: actions/oauthconnectionssettings.php:165
 msgid "You are not a user of that application."
 msgstr "Ви не є користувачем даного додатку."
 
 #. TRANS: Client error when revoking access has failed for some reason.
 #. TRANS: %s is the application ID revoking access failed for.
-#: actions/oauthconnectionssettings.php:183
+#: actions/oauthconnectionssettings.php:180
 #, php-format
 msgid "Unable to revoke access for application: %s."
 msgstr "Неможливо скасувати доступ для додатку: %s."
 
 #. TRANS: Success message after revoking access for an application.
 #. TRANS: %1$s is the application name, %2$s is the first part of the user token.
-#: actions/oauthconnectionssettings.php:202
+#: actions/oauthconnectionssettings.php:199
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -3957,14 +4016,14 @@ msgstr ""
 "$s."
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:213
+#: actions/oauthconnectionssettings.php:210
 msgid "You have not authorized any applications to use your account."
 msgstr "Ви не дозволили жодним додаткам використовувати ваш акаунт."
 
 #. TRANS: Note for developers in the OAuth connection settings form.
 #. TRANS: This message contains a Markdown link. Do not separate "](".
 #. TRANS: %s is the URL to the OAuth settings.
-#: actions/oauthconnectionssettings.php:233
+#: actions/oauthconnectionssettings.php:230
 #, php-format
 msgid ""
 "Are you a developer? [Register an OAuth client application](%s) to use with "
@@ -3973,6 +4032,16 @@ msgstr ""
 "Ви — розробник? [Зареєструйте клієнтський додаток OAuth](%s) щоб "
 "користуватися ним на даному сайті StatusNet."
 
+#: actions/oembed.php:64
+#, php-format
+msgid "\"%s\" not found."
+msgstr "«%s» не знайдено."
+
+#: actions/oembed.php:76
+#, php-format
+msgid "Notice %s not found."
+msgstr "Допис %s не знайдено."
+
 #: actions/oembed.php:80 actions/shownotice.php:100
 msgid "Notice has no profile."
 msgstr "Допис не має профілю."
@@ -3982,6 +4051,16 @@ msgstr "Допис не має профілю."
 msgid "%1$s's status on %2$s"
 msgstr "%1$s має статус на %2$s"
 
+#: actions/oembed.php:95
+#, php-format
+msgid "Attachment %s not found."
+msgstr "Вкладення %s не знайдено."
+
+#: actions/oembed.php:136
+#, php-format
+msgid "\"%s\" not supported for oembed requests."
+msgstr "«%s» не підтримується для oembed-запитів."
+
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
 #: actions/oembed.php:168
 #, php-format
@@ -3995,93 +4074,60 @@ msgid "Only %s URLs over plain HTTP please."
 msgstr "URL-адреса %s лише в простому HTTP, будь ласка."
 
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1205
-#: lib/apiaction.php:1232 lib/apiaction.php:1367
+#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1207
+#: lib/apiaction.php:1234 lib/apiaction.php:1369
 msgid "Not a supported data format."
 msgstr "Такий формат даних не підтримується."
 
+#. TRANS: ShortName in the OpenSearch interface when trying to find users.
 #: actions/opensearch.php:64
 msgid "People Search"
 msgstr "Пошук людей"
 
-#: actions/opensearch.php:67
+#: actions/opensearch.php:68
 msgid "Notice Search"
 msgstr "Пошук дописів"
 
-#: actions/othersettings.php:59
-msgid "Other settings"
-msgstr "Інші опції"
-
-#. TRANS: Instructions for tab "Other" in user profile settings.
-#: actions/othersettings.php:71
-msgid "Manage various other options."
-msgstr "Керування деякими іншими опціями."
-
-#. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
-#. TRANS: user's profile settings. Use of "free" is as in "open", indicating that the
-#. TRANS: information on the shortener site is freely distributable.
-#. TRANS: This message has one space at the beginning. Use your language's word separator
-#. TRANS: here if it has one (most likely a single space).
-#: actions/othersettings.php:113
-msgid " (free service)"
-msgstr " (вільний сервіс)"
-
-#. TRANS: Label for dropdown with URL shortener services.
-#: actions/othersettings.php:122
-msgid "Shorten URLs with"
-msgstr "Скорочення URL"
-
-#. TRANS: Tooltip for for dropdown with URL shortener services.
-#: actions/othersettings.php:124
-msgid "Automatic shortening service to use."
-msgstr "Доступні сервіси."
-
-#. TRANS: Label for checkbox.
-#: actions/othersettings.php:130
-msgid "View profile designs"
-msgstr "Переглядати дизайн користувачів"
-
-#. TRANS: Tooltip for checkbox.
-#: actions/othersettings.php:132
-msgid "Show or hide profile designs."
-msgstr "Показувати або приховувати дизайни сторінок окремих користувачів."
-
-#. TRANS: Form validation error for form "Other settings" in user profile.
-#: actions/othersettings.php:164
-msgid "URL shortening service is too long (maximum 50 characters)."
-msgstr "Сервіс скорочення URL-адрес надто довгий (50 символів максимум)."
-
-#: actions/otp.php:69
+#. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
+#: actions/otp.php:70
 msgid "No user ID specified."
 msgstr "ID користувача не визначено."
 
-#: actions/otp.php:83
+#. TRANS: Client error displayed trying to use "one time password login" without specifying a login token.
+#: actions/otp.php:86
 msgid "No login token specified."
 msgstr "Токен для входу не визначено."
 
-#: actions/otp.php:90
+#. TRANS: Client error displayed trying to use "one time password login" without requesting a login token.
+#: actions/otp.php:94
 msgid "No login token requested."
 msgstr "Токен для входу у запиті відсутній."
 
-#: actions/otp.php:95
+#. TRANS: Client error displayed trying to use "one time password login" while specifying an invalid login token.
+#: actions/otp.php:100
 msgid "Invalid login token specified."
 msgstr "Токен для входу визначено як неправильний."
 
-#: actions/otp.php:104
+#. TRANS: Client error displayed trying to use "one time password login" while specifying an expired login token.
+#: actions/otp.php:110
 msgid "Login token expired."
 msgstr "Токен для входу втратив чинність."
 
-#: actions/outbox.php:58
+#. TRANS: Title for outbox for any but the fist page.
+#. TRANS: %1$s is the user nickname, %2$d is the page number.
+#: actions/outbox.php:57
 #, php-format
 msgid "Outbox for %1$s - page %2$d"
 msgstr "Вихідні для %1$s — сторінка %2$d"
 
+#. TRANS: Title for first page of outbox.
 #: actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
 msgstr "Вихідні для %s"
 
-#: actions/outbox.php:104
+#. TRANS: Instructions for outbox.
+#: actions/outbox.php:103
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr ""
 "Це ваші вихідні повідомлення, тут містяться повідомлення, які ви надіслали "
@@ -4109,43 +4155,42 @@ msgstr "Старий пароль"
 msgid "New password"
 msgstr "Новий пароль"
 
-#: actions/passwordsettings.php:109
-#, fuzzy
-msgid "6 or more characters"
+#: actions/passwordsettings.php:109 actions/register.php:416
+msgid "6 or more characters."
 msgstr "6 або більше знаків."
 
-#: actions/passwordsettings.php:113
-#, fuzzy
-msgid "Same as password above"
+#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#: actions/passwordsettings.php:113 actions/recoverpassword.php:264
+#: actions/register.php:420
+msgid "Same as password above."
 msgstr "Такий само, як і пароль вище."
 
 #: actions/passwordsettings.php:117
 msgid "Change"
 msgstr "Змінити"
 
-#: actions/passwordsettings.php:154 actions/register.php:238
+#: actions/passwordsettings.php:153 actions/register.php:223
 msgid "Password must be 6 or more characters."
 msgstr "Пароль має складатись з 6-ти або більше знаків."
 
-#: actions/passwordsettings.php:157 actions/register.php:241
+#: actions/passwordsettings.php:156 actions/register.php:226
 msgid "Passwords don't match."
 msgstr "Паролі не співпадають."
 
-#: actions/passwordsettings.php:165
+#: actions/passwordsettings.php:164
 msgid "Incorrect old password"
 msgstr "Старий пароль є неточним"
 
-#: actions/passwordsettings.php:181
+#: actions/passwordsettings.php:180
 msgid "Error saving user; invalid."
 msgstr "Помилка при збереженні користувача; недійсний."
 
-#: actions/passwordsettings.php:186
-#, fuzzy
-msgid "Can't save new password."
+#. TRANS: Reset password form validation error message.
+#: actions/passwordsettings.php:185 actions/recoverpassword.php:418
+msgid "Cannot save new password."
 msgstr "Не вдається зберегти новий пароль."
 
-#. TRANS: Title for password recovery page in password saved mode.
-#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
+#: actions/passwordsettings.php:191
 msgid "Password saved."
 msgstr "Пароль збережено."
 
@@ -4350,8 +4395,7 @@ msgid "Directory where backgrounds are located."
 msgstr "Директорія, в якій знаходяться фонові зображення."
 
 #. TRANS: Fieldset legens in Paths admin panel.
-#. TRANS: DT element label in attachment list.
-#: actions/pathsadminpanel.php:419 lib/attachmentlist.php:98
+#: actions/pathsadminpanel.php:419
 msgid "Attachments"
 msgstr "Вкладення"
 
@@ -4419,7 +4463,9 @@ msgstr "Сервер на який направляти SSL-запити."
 msgid "Save paths"
 msgstr "Зберегти шляхи"
 
-#: actions/peoplesearch.php:52
+#. TRANS: Instructions for the "People search" page.
+#. TRANS: %%site.name%% is the name of the StatusNet site.
+#: actions/peoplesearch.php:54
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
@@ -4429,7 +4475,8 @@ msgstr ""
 "Відокремлюйте пошукові умови інтервалами; вони повинні складатись з 3 знаків "
 "або більше."
 
-#: actions/peoplesearch.php:58
+#. TRANS: Title of a page where users can search for other users.
+#: actions/peoplesearch.php:61
 msgid "People search"
 msgstr "Пошук людей"
 
@@ -4443,6 +4490,60 @@ msgstr "Це недійсний особистий теґ: %s."
 msgid "Users self-tagged with %1$s - page %2$d"
 msgstr "Користувачі з особистим теґом «%1$s» — сторінка %2$d"
 
+#. TRANS: Page title for AJAX form return when a disabling a plugin.
+#: actions/plugindisable.php:69
+msgctxt "plugin"
+msgid "Disabled"
+msgstr ""
+
+#. TRANS: Client error displayed trying to perform any request method other than POST.
+#. TRANS: Do not translate POST.
+#: actions/pluginenable.php:78 actions/subscribe.php:77
+msgid "This action only accepts POST requests."
+msgstr "Ця дія приймає лише запити POST."
+
+#: actions/pluginenable.php:102
+#, fuzzy
+msgid "You cannot administer plugins."
+msgstr "Ви не можете видаляти користувачів."
+
+#: actions/pluginenable.php:109
+#, fuzzy
+msgid "No such plugin."
+msgstr "Немає такої сторінки."
+
+#. TRANS: Page title for AJAX form return when enabling a plugin.
+#: actions/pluginenable.php:159
+msgctxt "plugin"
+msgid "Enabled"
+msgstr ""
+
+#. TRANS: Tab and title for plugins admin panel.
+#. TRANS: Menu item for site administration
+#: actions/pluginsadminpanel.php:56 actions/version.php:191
+#: lib/adminpanelaction.php:411
+msgid "Plugins"
+msgstr "Додатки"
+
+#. TRANS: Instructions at top of plugin admin page.
+#: actions/pluginsadminpanel.php:68
+msgid ""
+"Additional plugins can be enabled and configured manually. See the <a href="
+"\"http://status.net/wiki/Plugins\">online plugin documentation</a> for more "
+"details."
+msgstr ""
+
+#. TRANS: Admin form section header
+#: actions/pluginsadminpanel.php:84
+#, fuzzy
+msgid "Default plugins"
+msgstr "Мова за замовчуванням"
+
+#: actions/pluginsadminpanel.php:106
+msgid ""
+"All default plugins have been disabled from the site's configuration file."
+msgstr ""
+
 #: actions/postnotice.php:95
 msgid "Invalid notice content."
 msgstr "Недійсний зміст допису."
@@ -4453,52 +4554,49 @@ msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’.
 msgstr "Ліцензія допису «%1$s» є несумісною з ліцензією сайту «%2$s»."
 
 #. TRANS: Page title for profile settings.
-#: actions/profilesettings.php:59
+#: actions/profilesettings.php:60
 msgid "Profile settings"
 msgstr "Налаштування профілю"
 
 #. TRANS: Usage instructions for profile settings.
-#: actions/profilesettings.php:70
+#: actions/profilesettings.php:71
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
 "Ви можете заповнити свій особистий профіль і люди знатимуть про вас більше."
 
 #. TRANS: Profile settings form legend.
-#: actions/profilesettings.php:98
+#: actions/profilesettings.php:99
 msgid "Profile information"
 msgstr "Інформація профілю"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109 actions/register.php:433
+#: actions/profilesettings.php:110 actions/register.php:412
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr "1-64 рядкових літер і цифр, ніякої пунктуації або інтервалів."
 
 #. TRANS: Field label in form for profile settings.
-#. TRANS: Label for full group name (dt). Text hidden by default.
-#. TRANS: DT for full name in a profile.
-#: actions/profilesettings.php:113 actions/register.php:455
-#: actions/showgroup.php:255 actions/tagother.php:104
-#: lib/groupeditform.php:150 lib/userprofile.php:156
+#: actions/profilesettings.php:114 actions/register.php:434
+#: lib/groupeditform.php:150
 msgid "Full name"
 msgstr "Повне ім’я"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:118 actions/register.php:460
+#: actions/profilesettings.php:119 actions/register.php:439
 #: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "Веб-сторінка"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:121
+#: actions/profilesettings.php:122 actions/register.php:441
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr "URL-адреса вашої веб-сторінки, блоґу, або профілю на іншому сайті."
 
 #. TRANS: Tooltip for field label in form for profile settings. Plural
 #. TRANS: is decided by the number of characters available for the
 #. TRANS: biography (%d).
-#: actions/profilesettings.php:129 actions/register.php:471
+#: actions/profilesettings.php:130 actions/register.php:450
 #, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4507,86 +4605,79 @@ msgstr[1] "Опишіть себе та свої інтереси інтерес
 msgstr[2] "Опишіть себе та свої інтереси інтереси вкладаючись у %d символів"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:135 actions/register.php:476
+#: actions/profilesettings.php:136 actions/register.php:455
 msgid "Describe yourself and your interests"
 msgstr "Опишіть себе та свої інтереси"
 
 #. TRANS: Text area label in form for profile settings where users can provide.
 #. TRANS: their biography.
-#: actions/profilesettings.php:139 actions/register.php:478
+#: actions/profilesettings.php:140 actions/register.php:457
 msgid "Bio"
 msgstr "Про себе"
 
 #. TRANS: Field label in form for profile settings.
-#. TRANS: Label for group location (dt). Text hidden by default.
-#. TRANS: DT for location in a profile.
-#: actions/profilesettings.php:145 actions/register.php:483
-#: actions/showgroup.php:265 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:173
-#: lib/userprofile.php:172
+#: actions/profilesettings.php:146 actions/register.php:462
+#: lib/groupeditform.php:173
 msgid "Location"
 msgstr "Розташування"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148 actions/register.php:485
+#: actions/profilesettings.php:149
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Де ви живете, на кшталт «Місто, область (регіон), країна»"
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:153
+#: actions/profilesettings.php:154
 msgid "Share my current location when posting notices"
 msgstr "Показувати моє місцезнаходження при надсиланні дописів"
 
 #. TRANS: Field label in form for profile settings.
-#. TRANS: DT for tags in a profile.
-#: actions/profilesettings.php:161 actions/tagother.php:149
-#: actions/tagother.php:209 lib/subscriptionlist.php:106
-#: lib/subscriptionlist.php:108 lib/userprofile.php:220
+#: actions/profilesettings.php:162 actions/tagother.php:128
+#: actions/tagother.php:188 lib/subscriptionlist.php:104
+#: lib/subscriptionlist.php:106
 msgid "Tags"
 msgstr "Теґи"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:164
-#, fuzzy
+#: actions/profilesettings.php:165
 msgid ""
-"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- "
+"separated."
 msgstr ""
 "Позначте себе теґами (літери, цифри, -, . та _), відокремлюючи кожен комою "
 "або пробілом."
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:169
+#: actions/profilesettings.php:170
 msgid "Language"
 msgstr "Мова"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:171
-#, fuzzy
-msgid "Preferred language"
+#: actions/profilesettings.php:172
+msgid "Preferred language."
 msgstr "Мова, котрій надаєте перевагу."
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:181
+#: actions/profilesettings.php:182
 msgid "Timezone"
 msgstr "Часовий пояс"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:183
+#: actions/profilesettings.php:184
 msgid "What timezone are you normally in?"
 msgstr "За яким часовим поясом ви живете?"
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:189
-#, fuzzy
+#: actions/profilesettings.php:190
 msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)"
+"Automatically subscribe to whoever subscribes to me (best for non-humans)."
 msgstr ""
 "Автоматично підписуватись до тих, хто підписався до мене. (Слава роботам!)"
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Plural form is used based on the maximum number of allowed
 #. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:258 actions/register.php:229
+#: actions/profilesettings.php:259 actions/register.php:214
 #, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4595,47 +4686,47 @@ msgstr[1] "Біографія надто довга (не більше %d сим
 msgstr[2] "Біографія надто довга (не більше %d символів)."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:269 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:270 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr "Часовий пояс не обрано."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:277
+#: actions/profilesettings.php:278
 msgid "Language is too long (maximum 50 characters)."
 msgstr "Мова надто довга (не більше 50 символів)."
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:291 actions/tagother.php:178
+#: actions/profilesettings.php:292
 #, php-format
-msgid "Invalid tag: \"%s\""
-msgstr "Недійсний теґ: «%s»"
+msgid "Invalid tag: \"%s\"."
+msgstr "Неприпустимий теґ: «%s»."
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:347
+#: actions/profilesettings.php:348
 msgid "Could not update user for autosubscribe."
 msgstr "Не вдалося оновити користувача для автопідписки."
 
 #. TRANS: Server error thrown when user profile location preference settings could not be updated.
-#: actions/profilesettings.php:405
+#: actions/profilesettings.php:406
 msgid "Could not save location prefs."
 msgstr "Не вдалося зберегти преференції розташування."
 
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:427 actions/tagother.php:200
+#: actions/profilesettings.php:428 actions/tagother.php:179
 msgid "Could not save tags."
 msgstr "Не вдалося зберегти теґи."
 
 #. TRANS: Confirmation shown when user profile settings are saved.
 #. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:436 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:437 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "Налаштування збережено."
 
 #. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
 #. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:483 actions/restoreaccount.php:60
+#: actions/profilesettings.php:484 actions/restoreaccount.php:60
 msgid "Restore account"
 msgstr "Відновити акаунт"
 
@@ -4714,6 +4805,12 @@ msgstr ""
 "Мікроблогінг), який працює на вільному програмному забезпеченні [StatusNet]"
 "(http://status.net/)."
 
+#. TRANS: Public RSS feed description. %s is the StatusNet site name.
+#: actions/publicrss.php:106
+#, php-format
+msgid "%s updates from everyone."
+msgstr "Всі оновлення на %s."
+
 #. TRANS: Title for public tag cloud.
 #: actions/publictagcloud.php:57
 msgid "Public tag cloud"
@@ -4754,10 +4851,6 @@ msgstr ""
 "Чому б не [зареєструватись](%%%%action.register%%%%) і не написати щось "
 "цікаве!"
 
-#: actions/publictagcloud.php:146
-msgid "Tag cloud"
-msgstr "Хмарка теґів"
-
 #. TRANS: Client error displayed trying to recover password while already logged in.
 #: actions/recoverpassword.php:37
 msgid "You are already logged in!"
@@ -4849,6 +4942,11 @@ msgstr "Відновити пароль"
 msgid "Password recovery requested"
 msgstr "Запит на відновлення паролю відправлено"
 
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/recoverpassword.php:229
+msgid "Password saved"
+msgstr "Пароль збережено"
+
 #. TRANS: Title for password recovery page when an unknown action has been specified.
 #: actions/recoverpassword.php:232
 msgid "Unknown action"
@@ -4859,14 +4957,9 @@ msgstr "Дія невідома"
 msgid "6 or more characters, and do not forget it!"
 msgstr "6 або більше знаків, і не забудьте їх!"
 
-#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
-#: actions/recoverpassword.php:264 actions/register.php:441
-msgid "Same as password above."
-msgstr "Такий само, як і пароль вище."
-
 #. TRANS: Button text for password reset form.
 #. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: actions/recoverpassword.php:268 lib/designsettings.php:264
+#: actions/recoverpassword.php:268 lib/designform.php:145
 msgctxt "BUTTON"
 msgid "Reset"
 msgstr "Скинути"
@@ -4915,13 +5008,8 @@ msgstr "Пароль має складатись з 6-ти або більше 
 msgid "Password and confirmation do not match."
 msgstr "Пароль та підтвердження не співпадають."
 
-#. TRANS: Reset password form validation error message.
-#: actions/recoverpassword.php:418
-msgid "Cannot save new password."
-msgstr "Не вдається зберегти новий пароль."
-
 #. TRANS: Server error displayed when something does wrong with the user object during password reset.
-#: actions/recoverpassword.php:426 actions/register.php:256
+#: actions/recoverpassword.php:426 actions/register.php:241
 msgid "Error setting user."
 msgstr "Помилка в налаштуваннях користувача."
 
@@ -4930,97 +5018,97 @@ msgstr "Помилка в налаштуваннях користувача."
 msgid "New password successfully saved. You are now logged in."
 msgstr "Новий пароль успішно збережено. Тепер ви увійшли."
 
-#: actions/register.php:92 actions/register.php:196 actions/register.php:413
+#: actions/redirecturl.php:70
+#, fuzzy
+msgid "No id parameter"
+msgstr "Немає ID аргументу."
+
+#: actions/redirecturl.php:76
+#, fuzzy, php-format
+msgid "No such file \"%d\""
+msgstr "Такого файлу немає."
+
+#: actions/register.php:80 actions/register.php:181 actions/register.php:392
 msgid "Sorry, only invited people can register."
 msgstr ""
 "Пробачте, але лише ті, кого було запрошено, мають змогу зареєструватись тут."
 
-#: actions/register.php:99
+#: actions/register.php:87
 msgid "Sorry, invalid invitation code."
 msgstr "Даруйте, помилка у коді запрошення."
 
-#: actions/register.php:119
+#: actions/register.php:106
 msgid "Registration successful"
 msgstr "Реєстрація успішна"
 
-#: actions/register.php:121 actions/register.php:511
+#: actions/register.php:108 actions/register.php:490
 msgid "Register"
 msgstr "Реєстрація"
 
-#: actions/register.php:142
+#: actions/register.php:128
 msgid "Registration not allowed."
 msgstr "Реєстрацію не дозволено."
 
-#: actions/register.php:209
-#, fuzzy
-msgid "You can't register if you don't agree to the license."
+#: actions/register.php:194
+msgid "You cannot register if you don't agree to the license."
 msgstr "Ви не можете зареєструватись, якщо не погодитесь з умовами ліцензії."
 
-#: actions/register.php:218
+#: actions/register.php:203
 msgid "Email address already exists."
 msgstr "Ця адреса вже використовується."
 
-#: actions/register.php:251 actions/register.php:273
+#: actions/register.php:236 actions/register.php:258
 msgid "Invalid username or password."
 msgstr "Недійсне ім’я або пароль."
 
-#: actions/register.php:351
-#, fuzzy
+#: actions/register.php:333
 msgid ""
 "With this form you can create a new account. You can then post notices and "
-"link up to friends and colleagues. "
+"link up to friends and colleagues."
 msgstr ""
 "Ця форма дозволить вам створити новий акаунт. Ви зможете робити дописи і "
 "будете в курсі справ ваших друзів та колег."
 
-#: actions/register.php:437
-msgid "6 or more characters."
-msgstr "6 або більше знаків."
-
-#. TRANS: Link description in user account settings menu.
-#: actions/register.php:445 actions/register.php:449
-#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
+#: actions/register.php:424 actions/register.php:428
+#: actions/siteadminpanel.php:238 lib/settingsnav.php:92
 msgid "Email"
 msgstr "Пошта"
 
-#: actions/register.php:446 actions/register.php:450
-#, fuzzy
-msgid "Used only for updates, announcements, and password recovery"
+#: actions/register.php:425 actions/register.php:429
+msgid "Used only for updates, announcements, and password recovery."
 msgstr "Використовується лише для оновлень, оголошень та відновлення пароля."
 
-#: actions/register.php:457
-#, fuzzy
-msgid "Longer name, preferably your \"real\" name"
+#: actions/register.php:436
+msgid "Longer name, preferably your \"real\" name."
 msgstr "Повне ім’я, бажано ваше справжнє ім’я."
 
-#: actions/register.php:462
-#, fuzzy
-msgid "URL of your homepage, blog, or profile on another site"
-msgstr "URL-адреса вашої веб-сторінки, блоґу, або профілю на іншому сайті."
+#: actions/register.php:464
+msgid "Where you are, like \"City, State (or Region), Country\"."
+msgstr "Де ви живете, на кшталт «Місто, область (регіон), країна»."
 
-#: actions/register.php:523
+#: actions/register.php:503
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
 msgstr "Я розумію, що зміст і дані %1$s є приватними і конфіденційними."
 
-#: actions/register.php:533
+#: actions/register.php:513
 #, php-format
 msgid "My text and files are copyright by %1$s."
 msgstr "Авторські права на мої тексти і файли належать %1$s."
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:537
+#: actions/register.php:517
 msgid "My text and files remain under my own copyright."
 msgstr "Авторські права на мої тексти і файли залишаються за мною."
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:540
+#: actions/register.php:520
 msgid "All rights reserved."
 msgstr "Всі права захищені."
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:545
+#: actions/register.php:525
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -5029,7 +5117,7 @@ msgstr ""
 "Мої дописи і файли доступні на умовах %s, окрім цих приватних даних: пароль, "
 "електронна адреса, адреса IM, телефонний номер."
 
-#: actions/register.php:588
+#: actions/register.php:566
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -5062,7 +5150,7 @@ msgstr ""
 "Дякуємо, що зареєструвались у нас, і, сподіваємось, вам сподобається наш "
 "сервіс."
 
-#: actions/register.php:612
+#: actions/register.php:590
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5094,8 +5182,7 @@ msgid "User nickname"
 msgstr "Ім’я користувача"
 
 #: actions/remotesubscribe.php:129
-#, fuzzy
-msgid "Nickname of the user you want to follow"
+msgid "Nickname of the user you want to follow."
 msgstr "Ім’я користувача, дописи якого ви хотіли б читати."
 
 #: actions/remotesubscribe.php:132
@@ -5103,19 +5190,17 @@ msgid "Profile URL"
 msgstr "URL-адреса профілю"
 
 #: actions/remotesubscribe.php:133
-#, fuzzy
-msgid "URL of your profile on another compatible microblogging service"
+msgid "URL of your profile on another compatible microblogging service."
 msgstr "URL-адреса вашого профілю на іншому сумісному сервісі мікроблоґів."
 
 #. TRANS: Link text for link that will subscribe to a remote profile.
 #: actions/remotesubscribe.php:136 lib/subscribeform.php:139
-#: lib/userprofile.php:431
+#: lib/userprofile.php:402
 msgid "Subscribe"
 msgstr "Підписатись"
 
 #: actions/remotesubscribe.php:158
-#, fuzzy
-msgid "Invalid profile URL (bad format)"
+msgid "Invalid profile URL (bad format)."
 msgstr "Неприпустима URL-адреса профілю (неправильний формат)."
 
 #: actions/remotesubscribe.php:167
@@ -5147,7 +5232,7 @@ msgstr "Ви не можете повторювати власні дописи.
 msgid "You already repeated that notice."
 msgstr "Ви вже повторили цей допис."
 
-#: actions/repeat.php:112 lib/noticelist.php:692
+#: actions/repeat.php:112 lib/noticelist.php:697
 msgid "Repeated"
 msgstr "Повторено"
 
@@ -5155,9 +5240,9 @@ msgstr "Повторено"
 msgid "Repeated!"
 msgstr "Повторено!"
 
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing @-replies.
+#. TRANS: RSS reply feed title. %s is a user nickname.
 #: actions/replies.php:126 actions/repliesrss.php:68
-#: lib/personalgroupnav.php:109
+#: lib/personalgroupnav.php:105
 #, php-format
 msgid "Replies to %s"
 msgstr "Відповіді до %s"
@@ -5209,9 +5294,11 @@ msgstr ""
 "Ви можете [«розштовхати» %1$s](../%2$s) або [написати дещо варте його уваги](%"
 "%%%action.newnotice%%%%?status_textarea=%3$s)."
 
-#: actions/repliesrss.php:72
-#, fuzzy, php-format
-msgid "Replies to %1$s on %2$s!"
+#. TRANS: RSS reply feed description.
+#. TRANS: %1$s is a user nickname, %2$s is the StatusNet site name.
+#: actions/repliesrss.php:74
+#, php-format
+msgid "Replies to %1$s on %2$s."
 msgstr "Відповіді до %1$s на %2$s."
 
 #. TRANS: Client exception displayed when trying to restore an account while not logged in.
@@ -5314,7 +5401,7 @@ msgstr "Ви не можете позбавляти користувачів р
 msgid "User doesn't have this role."
 msgstr "Користувач не має цієї ролі."
 
-#: actions/rsd.php:146 actions/version.php:159
+#: actions/rsd.php:142 actions/version.php:159
 msgid "StatusNet"
 msgstr "StatusNet"
 
@@ -5356,87 +5443,38 @@ msgstr "Виводити дані сесії наладки."
 msgid "Save site settings"
 msgstr "Зберегти налаштування сайту"
 
-#: actions/showapplication.php:82
+#: actions/showapplication.php:78
 msgid "You must be logged in to view an application."
 msgstr "Ви повинні спочатку увійти, аби переглянути додаток."
 
-#: actions/showapplication.php:157
+#: actions/showapplication.php:151
 msgid "Application profile"
 msgstr "Профіль додатку"
 
-#. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:159 lib/applicationeditform.php:177
-msgid "Icon"
-msgstr "Іконка"
-
-#. TRANS: Form input field label for application name.
-#: actions/showapplication.php:169 actions/version.php:197
-#: lib/applicationeditform.php:190
-msgid "Name"
-msgstr "Ім’я"
-
-#. TRANS: Form input field label.
-#: actions/showapplication.php:178 lib/applicationeditform.php:227
-msgid "Organization"
-msgstr "Організація"
-
-#. TRANS: Form input field label.
-#: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:168
-msgid "Description"
-msgstr "Опис"
-
-#. TRANS: Header for group statistics on a group page (h2).
-#. TRANS: H2 text for user statistics.
-#: actions/showapplication.php:192 actions/showgroup.php:460
-#: lib/profileaction.php:205
-msgid "Statistics"
-msgstr "Статистика"
-
-#: actions/showapplication.php:203
+#: actions/showapplication.php:179
 #, php-format
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr "Створено %1$s — %2$s доступ за замовч. — %3$d користувачів"
 
-#: actions/showapplication.php:213
+#: actions/showapplication.php:189
 msgid "Application actions"
 msgstr "Можливості додатку"
 
-#: actions/showapplication.php:236
+#: actions/showapplication.php:212
 msgid "Reset key & secret"
 msgstr "Призначити новий ключ і таємне слово"
 
 #. TRANS: Title of form for deleting a user.
-#: actions/showapplication.php:252 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:64 lib/noticelist.php:673
+#: actions/showapplication.php:228 lib/deletegroupform.php:121
+#: lib/deleteuserform.php:64 lib/noticelist.php:678
 msgid "Delete"
 msgstr "Видалити"
 
-#: actions/showapplication.php:261
+#: actions/showapplication.php:237
 msgid "Application info"
 msgstr "Інфо додатку"
 
-#: actions/showapplication.php:263
-msgid "Consumer key"
-msgstr "Ключ споживача"
-
-#: actions/showapplication.php:268
-msgid "Consumer secret"
-msgstr "Таємно слово споживача"
-
-#: actions/showapplication.php:273
-msgid "Request token URL"
-msgstr "URL-адреса токена запиту"
-
-#: actions/showapplication.php:278
-msgid "Access token URL"
-msgstr "URL-адреса токена дозволу"
-
-#: actions/showapplication.php:283
-msgid "Authorize URL"
-msgstr "Авторизувати URL-адресу"
-
-#: actions/showapplication.php:288
+#: actions/showapplication.php:255
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
@@ -5444,7 +5482,7 @@ msgstr ""
 "До уваги: Всі підписи шифруються за методом HMAC-SHA1. Ми не підтримуємо "
 "шифрування підписів відкритим текстом."
 
-#: actions/showapplication.php:309
+#: actions/showapplication.php:275
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr "Ви впевнені, що бажаєте скинути ваш ключ споживача і секретний код?"
 
@@ -5531,61 +5569,47 @@ msgstr "Спільнота %s"
 msgid "%1$s group, page %2$d"
 msgstr "Спільнота %1$s, сторінка %2$d"
 
-#. TRANS: Group profile header (h2). Text hidden by default.
-#: actions/showgroup.php:223
-msgid "Group profile"
-msgstr "Профіль спільноти"
-
-#. TRANS: Label for group URL (dt). Text hidden by default.
-#. TRANS: DT for URL in a profile.
-#: actions/showgroup.php:273 actions/tagother.php:118
-#: actions/userauthorization.php:175 lib/userprofile.php:186
-msgid "URL"
-msgstr "URL"
-
 #. TRANS: Label for group description or group note (dt). Text hidden by default.
-#. TRANS: DT for note in a profile.
-#: actions/showgroup.php:285 actions/tagother.php:128
-#: actions/userauthorization.php:187 lib/userprofile.php:204
+#: actions/showgroup.php:266
 msgid "Note"
 msgstr "Зауваження"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:296 lib/groupeditform.php:180
+#: actions/showgroup.php:277 lib/groupeditform.php:180
 msgid "Aliases"
 msgstr "Додаткові імена"
 
 #. TRANS: Group actions header (h2). Text hidden by default.
-#: actions/showgroup.php:313
+#: actions/showgroup.php:294
 msgid "Group actions"
 msgstr "Дії спільноти"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:357
+#: actions/showgroup.php:338
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
 msgstr "Стрічка дописів спільноти %s (RSS 1.0)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:364
+#: actions/showgroup.php:345
 #, php-format
 msgid "Notice feed for %s group (RSS 2.0)"
 msgstr "Стрічка дописів спільноти %s (RSS 2.0)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:371
+#: actions/showgroup.php:352
 #, php-format
 msgid "Notice feed for %s group (Atom)"
 msgstr "Стрічка дописів спільноти %s (Atom)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:377
+#: actions/showgroup.php:358
 #, php-format
 msgid "FOAF for %s group"
 msgstr "FOAF спільноти %s"
 
 #. TRANS: Header for mini list of group members on a group page (h2).
-#: actions/showgroup.php:414
+#: actions/showgroup.php:395
 msgid "Members"
 msgstr "Учасники"
 
@@ -5593,25 +5617,30 @@ msgstr "Учасники"
 #. TRANS: Text for user subscription statistics if the user has no subscriptions.
 #. TRANS: Text for user subscriber statistics if user has no subscribers.
 #. TRANS: Text for user user group membership statistics if user is not a member of any group.
-#: actions/showgroup.php:420 lib/profileaction.php:137
+#: actions/showgroup.php:401 lib/profileaction.php:137
 #: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
-#: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
+#: lib/subscriptionlist.php:123 lib/tagcloudsection.php:71
 msgid "(None)"
 msgstr "(Пусто)"
 
 #. TRANS: Link to all group members from mini list of group members if group has more than n members.
-#: actions/showgroup.php:429
+#: actions/showgroup.php:410
 msgid "All members"
 msgstr "Всі учасники"
 
-#. TRANS: Label for creation date in statistics on group page.
-#: actions/showgroup.php:465
+#. TRANS: Header for group statistics on a group page (h2).
+#. TRANS: H2 text for user statistics.
+#: actions/showgroup.php:441 lib/profileaction.php:205
+msgid "Statistics"
+msgstr "Статистика"
+
+#: actions/showgroup.php:444
 msgctxt "LABEL"
 msgid "Created"
 msgstr "Створено"
 
 #. TRANS: Label for member count in statistics on group page.
-#: actions/showgroup.php:473
+#: actions/showgroup.php:449
 msgctxt "LABEL"
 msgid "Members"
 msgstr "Учасники"
@@ -5620,7 +5649,7 @@ msgstr "Учасники"
 #. TRANS: **%s** is the group alias, %%%%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).
-#: actions/showgroup.php:488
+#: actions/showgroup.php:464
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5639,7 +5668,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: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
-#: actions/showgroup.php:498
+#: actions/showgroup.php:474
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5653,7 +5682,7 @@ msgstr ""
 "спільноти роблять короткі дописи про своє життя та інтереси. "
 
 #. TRANS: Header for list of group administrators on a group page (h2).
-#: actions/showgroup.php:527
+#: actions/showgroup.php:503
 msgid "Admins"
 msgstr "Адміни"
 
@@ -5692,7 +5721,7 @@ msgid "%1$s tagged %2$s"
 msgstr "Дописи %1$s позначені теґом %2$s"
 
 #. TRANS: Page title showing tagged notices in one user's stream.
-#. TRANS: %1$s is the username, %2$s is the hash tag, %1$d is the page number.
+#. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
 #: actions/showstream.php:74
 #, php-format
 msgid "%1$s tagged %2$s, page %3$d"
@@ -5739,13 +5768,13 @@ msgid "FOAF for %s"
 msgstr "FOAF для %s"
 
 #. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
-#: actions/showstream.php:211
+#: actions/showstream.php:205
 #, php-format
 msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr "Це стрічка дописів %1$s, але %1$s ще нічого не написав."
 
 #. TRANS: Second sentence of empty list message for a stream for the user themselves.
-#: actions/showstream.php:217
+#: actions/showstream.php:211
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
@@ -5755,7 +5784,7 @@ msgstr ""
 
 #. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:221
+#: actions/showstream.php:215
 #, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
@@ -5766,7 +5795,7 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:264
+#: actions/showstream.php:258
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5782,7 +5811,7 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:271
+#: actions/showstream.php:265
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5794,7 +5823,7 @@ msgstr ""
 "програмному забезпеченні [StatusNet](http://status.net/). "
 
 #. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
-#: actions/showstream.php:328
+#: actions/showstream.php:322
 #, php-format
 msgid "Repeat of %s"
 msgstr "Повторення за %s"
@@ -5943,76 +5972,74 @@ msgstr ""
 
 #. TRANS: Title for button to save site notice in admin panel.
 #: actions/sitenoticeadminpanel.php:201
-#, fuzzy
-msgid "Save site notice"
+msgid "Save site notice."
 msgstr "Зберегти повідомлення сайту."
 
 #. TRANS: Title for SMS settings.
-#: actions/smssettings.php:57
+#: actions/smssettings.php:56
 msgid "SMS settings"
 msgstr "Налаштування СМС"
 
 #. TRANS: SMS settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/smssettings.php:71
+#: actions/smssettings.php:70
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr "Ви можете отримувати СМС через електронну пошту від %%site.name%%."
 
 #. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
-#: actions/smssettings.php:93
+#: actions/smssettings.php:92
 msgid "SMS is not available."
 msgstr "СМС недоступно."
 
 #. TRANS: Form legend for SMS settings form.
-#: actions/smssettings.php:107
+#: actions/smssettings.php:106
 msgid "SMS address"
 msgstr "SMS-адреса"
 
 #. TRANS: Form guide in SMS settings form.
-#: actions/smssettings.php:116
+#: actions/smssettings.php:115
 msgid "Current confirmed SMS-enabled phone number."
 msgstr "Поточний підтверджений телефонний номер."
 
 #. TRANS: Form guide in IM settings form.
-#: actions/smssettings.php:129
+#: actions/smssettings.php:128
 msgid "Awaiting confirmation on this phone number."
 msgstr "Очікування підтвердження телефонного номера."
 
 #. TRANS: Field label for SMS address input in SMS settings form.
-#: actions/smssettings.php:138
+#: actions/smssettings.php:137
 msgid "Confirmation code"
 msgstr "Код підтвердження"
 
 #. TRANS: Form field instructions in SMS settings form.
-#: actions/smssettings.php:140
+#: actions/smssettings.php:139
 msgid "Enter the code you received on your phone."
 msgstr "Введіть код, який ви отримали телефоном."
 
 #. TRANS: Button label to confirm SMS confirmation code in SMS settings.
-#: actions/smssettings.php:144
+#: actions/smssettings.php:143
 msgctxt "BUTTON"
 msgid "Confirm"
 msgstr "Підтвердити"
 
 #. TRANS: Field label for SMS phone number input in SMS settings form.
-#: actions/smssettings.php:149
+#: actions/smssettings.php:148
 msgid "SMS phone number"
 msgstr "Телефонний номер"
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
-#: actions/smssettings.php:152
-#, fuzzy
-msgid "Phone number, no punctuation or spaces, with area code"
+#: actions/smssettings.php:151
+msgid "Phone number, no punctuation or spaces, with area code."
 msgstr "Телефонний номер та регіональний код, ніякої пунктуації чи інтервалів."
 
 #. TRANS: Form legend for SMS preferences form.
-#: actions/smssettings.php:191
+#: actions/smssettings.php:190
 msgid "SMS preferences"
 msgstr "Преференції SMS"
 
 #. TRANS: Checkbox label in SMS preferences form.
-#: actions/smssettings.php:197
+#: actions/smssettings.php:196
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
@@ -6021,32 +6048,32 @@ msgstr ""
 "витрати від мого мобільного оператора."
 
 #. TRANS: Confirmation message for successful SMS preferences save.
-#: actions/smssettings.php:308
+#: actions/smssettings.php:307
 msgid "SMS preferences saved."
 msgstr "Преференції SMS збережено."
 
 #. TRANS: Message given saving SMS phone number without having provided one.
-#: actions/smssettings.php:330
+#: actions/smssettings.php:329
 msgid "No phone number."
 msgstr "Немає телефонного номера."
 
 #. TRANS: Message given saving SMS phone number without having selected a carrier.
-#: actions/smssettings.php:336
+#: actions/smssettings.php:335
 msgid "No carrier selected."
 msgstr "Оператора не обрано."
 
 #. TRANS: Message given saving SMS phone number that is already set.
-#: actions/smssettings.php:344
+#: actions/smssettings.php:343
 msgid "That is already your phone number."
 msgstr "Це і є ваш телефонний номер."
 
 #. TRANS: Message given saving SMS phone number that is already set for another user.
-#: actions/smssettings.php:348
+#: actions/smssettings.php:347
 msgid "That phone number already belongs to another user."
 msgstr "Цей телефонний номер належить іншому користувачу."
 
 #. TRANS: Message given saving valid SMS phone number that is to be confirmed.
-#: actions/smssettings.php:376
+#: actions/smssettings.php:375
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
 "for the code and instructions on how to use it."
@@ -6055,39 +6082,39 @@ msgstr ""
 "Перевірте вхідні повідомлення, там має бути код та подальші інструкції."
 
 #. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
-#: actions/smssettings.php:404
+#: actions/smssettings.php:403
 msgid "That is the wrong confirmation number."
 msgstr "Це помилковий код підтвердження."
 
 #. TRANS: Message given after successfully canceling SMS phone number confirmation.
-#: actions/smssettings.php:418
+#: actions/smssettings.php:417
 msgid "SMS confirmation cancelled."
 msgstr "Підтвердження SMS скасовано."
 
 #. TRANS: Message given trying to remove an SMS phone number that is not
 #. TRANS: registered for the active user.
-#: actions/smssettings.php:438
+#: actions/smssettings.php:437
 msgid "That is not your phone number."
 msgstr "Це не ваш телефонний номер."
 
 #. TRANS: Message given after successfully removing a registered SMS phone number.
-#: actions/smssettings.php:460
+#: actions/smssettings.php:459
 msgid "The SMS phone number was removed."
 msgstr "Телефонний номер для SMS був видалений."
 
 #. TRANS: Label for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:499
+#: actions/smssettings.php:498
 msgid "Mobile carrier"
 msgstr "Мобільний оператор"
 
 #. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:504
+#: actions/smssettings.php:503
 msgid "Select a carrier"
 msgstr "Оберіть оператора"
 
 #. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
 #. TRANS: %s is an administrative contact's e-mail address.
-#: actions/smssettings.php:513
+#: actions/smssettings.php:512
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -6098,7 +6125,7 @@ msgstr ""
 "на %s і ми внесемо його до списку."
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
-#: actions/smssettings.php:535
+#: actions/smssettings.php:534
 msgid "No code entered."
 msgstr "Код не введено."
 
@@ -6171,15 +6198,13 @@ msgstr "Ви не підписані до цього профілю."
 msgid "Could not save subscription."
 msgstr "Не вдалося зберегти підписку."
 
-#: actions/subscribe.php:77
-msgid "This action only accepts POST requests."
-msgstr "Ця дія приймає лише запити POST."
-
-#: actions/subscribe.php:117
+#. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
+#: actions/subscribe.php:121
 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
 msgstr "Цією дією ви не зможете підписатися до віддаленого профілю OMB 0.1."
 
-#: actions/subscribe.php:145
+#. TRANS: Page title when subscription succeeded.
+#: actions/subscribe.php:149
 msgid "Subscribed"
 msgstr "Підписані"
 
@@ -6296,31 +6321,34 @@ msgid "Subscription feed for %s (Atom)"
 msgstr "Стрічка підписок %s (Atom)"
 
 #. TRANS: Checkbox label for enabling Jabber messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:239
-msgid "Jabber"
-msgstr "Jabber"
+#: actions/subscriptions.php:241 lib/settingsnav.php:110
+#, fuzzy
+msgid "IM"
+msgstr "ІМ"
 
 #. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:254
+#: actions/subscriptions.php:256 lib/settingsnav.php:117
 msgid "SMS"
 msgstr "СМС"
 
-#: actions/tag.php:69
+#. TRANS: Title for all but the first page of notices with tags.
+#. TRANS: %1$s is the tag, %2$d is the page number.
+#: actions/tag.php:73
 #, php-format
 msgid "Notices tagged with %1$s, page %2$d"
 msgstr "Дописи з теґом %1$s, сторінка %2$d"
 
-#: actions/tag.php:87
+#: actions/tag.php:91
 #, php-format
 msgid "Notice feed for tag %s (RSS 1.0)"
 msgstr "Стрічка дописів для теґу %s (RSS 1.0)"
 
-#: actions/tag.php:93
+#: actions/tag.php:97
 #, php-format
 msgid "Notice feed for tag %s (RSS 2.0)"
 msgstr "Стрічка дописів для теґу %s (RSS 2.0)"
 
-#: actions/tag.php:99
+#: actions/tag.php:103
 #, php-format
 msgid "Notice feed for tag %s (Atom)"
 msgstr "Стрічка дописів для теґу %s (Atom)"
@@ -6339,17 +6367,11 @@ msgstr "Позначити %s"
 msgid "User profile"
 msgstr "Профіль користувача."
 
-#. TRANS: DT element in area for user avatar.
-#: actions/tagother.php:81 actions/userauthorization.php:132
-#: lib/userprofile.php:108
-msgid "Photo"
-msgstr "Фото"
-
-#: actions/tagother.php:141
+#: actions/tagother.php:120
 msgid "Tag user"
 msgstr "Позначити користувача"
 
-#: actions/tagother.php:151
+#: actions/tagother.php:130
 msgid ""
 "Tags for this user (letters, numbers, -, ., and _), comma- or space- "
 "separated"
@@ -6357,14 +6379,19 @@ msgstr ""
 "Позначити користувача теґами (літери, цифри, -, . та _), відокремлюючи кожен "
 "комою або пробілом"
 
-#: actions/tagother.php:193
+#: actions/tagother.php:157
+#, php-format
+msgid "Invalid tag: \"%s\""
+msgstr "Недійсний теґ: «%s»"
+
+#: actions/tagother.php:172
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 "Ви маєте можливість позначати теґами тих, до кого ви підписані, а також тих, "
 "хто є підписаним до вас."
 
-#: actions/tagother.php:236
+#: actions/tagother.php:215
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr "Скористайтесь цією формою, щоб додати теґи своїм підпискам та читачам."
 
@@ -6372,6 +6399,7 @@ msgstr "Скористайтесь цією формою, щоб додати т
 msgid "No such tag."
 msgstr "Такого теґу немає."
 
+#. TRANS: Client error displayed when trying to unblock a non-blocked user.
 #: actions/unblock.php:59
 msgid "You haven't blocked that user."
 msgstr "Цього користувача блокувати неможливо."
@@ -6392,12 +6420,83 @@ msgstr "У запиті відсутній ID профілю."
 msgid "Unsubscribed"
 msgstr "Відписано"
 
-#: actions/updateprofile.php:64 actions/userauthorization.php:337
+#: actions/updateprofile.php:64
 #, php-format
 msgid ""
 "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
 msgstr "Ліцензія «%1$s» не відповідає ліцензії сайту «%2$s»."
 
+#: actions/urlsettings.php:60
+#, fuzzy
+msgid "URL settings"
+msgstr "Налаштування ІМ"
+
+#. TRANS: Instructions for tab "Other" in user profile settings.
+#: actions/urlsettings.php:72
+msgid "Manage various other options."
+msgstr "Керування деякими іншими опціями."
+
+#. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
+#. TRANS: user's profile settings. This message has one space at the beginning. Use your
+#. TRANS: language's word separator here if it has one (most likely a single space).
+#: actions/urlsettings.php:115
+msgid " (free service)"
+msgstr " (вільний сервіс)"
+
+#: actions/urlsettings.php:121
+#, fuzzy
+msgid "[none]"
+msgstr "Пусто"
+
+#: actions/urlsettings.php:122
+msgid "[internal]"
+msgstr ""
+
+#. TRANS: Label for dropdown with URL shortener services.
+#: actions/urlsettings.php:130
+msgid "Shorten URLs with"
+msgstr "Скорочення URL"
+
+#. TRANS: Tooltip for for dropdown with URL shortener services.
+#: actions/urlsettings.php:132
+msgid "Automatic shortening service to use."
+msgstr "Доступні сервіси."
+
+#: actions/urlsettings.php:138
+msgid "URL longer than"
+msgstr ""
+
+#: actions/urlsettings.php:141
+msgid "URLs longer than this will be shortened, 0 means always shorten."
+msgstr ""
+
+#: actions/urlsettings.php:145
+msgid "Text longer than"
+msgstr ""
+
+#: actions/urlsettings.php:148
+msgid ""
+"URLs in notices longer than this will be shortened, 0 means always shorten."
+msgstr ""
+
+#. TRANS: Form validation error for form "Other settings" in user profile.
+#: actions/urlsettings.php:180
+msgid "URL shortening service is too long (maximum 50 characters)."
+msgstr "Сервіс скорочення URL-адрес надто довгий (50 символів максимум)."
+
+#: actions/urlsettings.php:187
+msgid "Invalid number for max url length."
+msgstr ""
+
+#: actions/urlsettings.php:193
+#, fuzzy
+msgid "Invalid number for max notice length."
+msgstr "Недійсний зміст допису."
+
+#: actions/urlsettings.php:238
+msgid "Error saving user URL shortening preferences."
+msgstr ""
+
 #. TRANS: User admin panel title
 #: actions/useradminpanel.php:58
 msgctxt "TITLE"
@@ -6422,12 +6521,12 @@ msgstr "Помилковий текст привітання. Максималь
 #. TRANS: Client error displayed when trying to set a non-existing user as default subscription for new
 #. TRANS: users in user admin panel. %1$s is the invalid nickname.
 #: actions/useradminpanel.php:166
-#, fuzzy, php-format
-msgid "Invalid default subscripton: '%1$s' is not a user."
+#, php-format
+msgid "Invalid default subscripton: \"%1$s\" is not a user."
 msgstr "Помилкова підписка за замовчуванням: «%1$s» не є користувачем."
 
-#. TRANS: Link description in user account settings menu.
-#: actions/useradminpanel.php:215 lib/accountsettingsaction.php:106
+#: actions/useradminpanel.php:215 lib/action.php:565 lib/settingsnav.php:77
+#: lib/subgroupnav.php:81
 msgid "Profile"
 msgstr "Профіль"
 
@@ -6484,60 +6583,58 @@ msgstr ""
 
 #. TRANS: Title for button to save user settings in user admin panel.
 #: actions/useradminpanel.php:302
-#, fuzzy
-msgid "Save user settings"
+msgid "Save user settings."
 msgstr "Зберегти налаштування користувача."
 
-#: actions/userauthorization.php:105
+#. TRANS: Page title.
+#: actions/userauthorization.php:109
 msgid "Authorize subscription"
 msgstr "Авторизувати підписку"
 
-#: actions/userauthorization.php:110
-#, fuzzy
+#. TRANS: Page notice on "Auhtorize subscription" page.
+#: actions/userauthorization.php:115
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
 "user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
-"click “Reject”."
+"click \"Reject\"."
 msgstr ""
 "Будь ласка, перевірте всі деталі, аби упевнитись, що ви дійсно бажаєте "
 "підписатись на дописи цього користувача. Якщо ви не збираєтесь "
 "підписуватись, то просто натисніть «Відмінити»."
 
-#. TRANS: Menu item for site administration
-#: actions/userauthorization.php:196 actions/version.php:167
-#: lib/adminpanelaction.php:403
-msgid "License"
-msgstr "Ліцензія"
-
-#: actions/userauthorization.php:217
-#, fuzzy
+#. TRANS: Button text on Authorise Subscription page.
+#: actions/userauthorization.php:200
+msgctxt "BUTTON"
 msgid "Accept"
 msgstr "Погодитись"
 
-#: actions/userauthorization.php:218 lib/subscribeform.php:115
-#: lib/subscribeform.php:139
-msgid "Subscribe to this user"
-msgstr "Підписатись до цього користувача"
+#. TRANS: Title for button on Authorise Subscription page.
+#: actions/userauthorization.php:202
+msgid "Subscribe to this user."
+msgstr "Підписатися до цього користувача."
 
-#: actions/userauthorization.php:219
-#, fuzzy
+#. TRANS: Button text on Authorise Subscription page.
+#: actions/userauthorization.php:204
+msgctxt "BUTTON"
 msgid "Reject"
 msgstr "Відхилити"
 
-#: actions/userauthorization.php:220
-#, fuzzy
-msgid "Reject this subscription"
+#. TRANS: Title for button on Authorise Subscription page.
+#: actions/userauthorization.php:206
+msgid "Reject this subscription."
 msgstr "Відхилити підписку."
 
-#: actions/userauthorization.php:232
+#. TRANS: Client error displayed for an empty authorisation request.
+#: actions/userauthorization.php:219
 msgid "No authorization request!"
 msgstr "Немає запиту на авторизацію!"
 
-#: actions/userauthorization.php:254
+#. TRANS: Accept message header from Authorise subscription page.
+#: actions/userauthorization.php:242
 msgid "Subscription authorized"
 msgstr "Підписку авторизовано"
 
-#: actions/userauthorization.php:256
+#: actions/userauthorization.php:245
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to authorize the "
@@ -6547,11 +6644,12 @@ msgstr ""
 "Звіртесь з інструкціями на сайті для більш конкретної інформації про те, як "
 "авторизувати підписку. Ваш підписний токен:"
 
-#: actions/userauthorization.php:266
+#. TRANS: Reject message header from Authorise subscription page.
+#: actions/userauthorization.php:256
 msgid "Subscription rejected"
 msgstr "Підписку скинуто"
 
-#: actions/userauthorization.php:268
+#: actions/userauthorization.php:259
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to fully reject the "
@@ -6561,48 +6659,71 @@ msgstr ""
 "з інструкціями на сайті для більш конкретної інформації про те, як скинути "
 "підписку."
 
-#: actions/userauthorization.php:303
-#, fuzzy, php-format
-msgid "Listener URI ‘%s’ not found here."
+#. TRANS: Exception thrown when no valid user is found for an authorisation request.
+#. TRANS: %s is a listener URI.
+#: actions/userauthorization.php:296
+#, php-format
+msgid "Listener URI \"%s\" not found here."
 msgstr "URI слухача «%s» тут не знайдено."
 
-#: actions/userauthorization.php:308
-#, fuzzy, php-format
-msgid "Listenee URI ‘%s’ is too long."
+#. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
+#. TRANS: %s is a listenee URI.
+#: actions/userauthorization.php:303
+#, php-format
+msgid "Listenee URI \"%s\" is too long."
 msgstr "URI слухача «%s» задовге."
 
-#: actions/userauthorization.php:314
-#, fuzzy, php-format
-msgid "Listenee URI ‘%s’ is a local user."
+#. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
+#. TRANS: %s is a listenee URI.
+#: actions/userauthorization.php:311
+#, php-format
+msgid "Listenee URI \"%s\" is a local user."
 msgstr "URI слухача «%s» — це локальний користувач."
 
+#. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
+#. TRANS: %s is a profile URL.
 #: actions/userauthorization.php:329
-#, fuzzy, php-format
-msgid "Profile URL ‘%s’ is for a local user."
+#, php-format
+msgid "Profile URL \"%s\" is for a local user."
 msgstr "URL-адреса профілю «%s» для локального користувача."
 
-#: actions/userauthorization.php:345
-#, fuzzy, php-format
-msgid "Avatar URL ‘%s’ is not valid."
+#. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
+#. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
+#: actions/userauthorization.php:339
+#, php-format
+msgid ""
+"Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
+"\"."
+msgstr "Ліцензія потоку «%1$s» є несумісною з ліцензією сайту «%2$s»."
+
+#. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
+#. TRANS: %s is an avatar URL.
+#: actions/userauthorization.php:349
+#, php-format
+msgid "Avatar URL \"%s\" is not valid."
 msgstr "URL-адреса аватари «%s» не є дійсною."
 
-#: actions/userauthorization.php:350
-#, fuzzy, php-format
-msgid "Can’t read avatar URL ‘%s’."
+#. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
+#. TRANS: %s is an avatar URL.
+#: actions/userauthorization.php:356
+#, php-format
+msgid "Cannot read avatar URL \"%s\"."
 msgstr "Не вдалося прочитати URL аватари «%s»."
 
-#: actions/userauthorization.php:355
-#, fuzzy, php-format
-msgid "Wrong image type for avatar URL ‘%s’."
+#. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
+#. TRANS: %s is an avatar URL.
+#: actions/userauthorization.php:363
+#, php-format
+msgid "Wrong image type for avatar URL \"%s\"."
 msgstr "Неправильний тип зображення для URL аватари «%s»."
 
 #. TRANS: Page title for profile design page.
-#: actions/userdesignsettings.php:74 lib/designsettings.php:63
+#: actions/userdesignsettings.php:74 lib/designsettings.php:61
 msgid "Profile design"
 msgstr "Дизайн профілю"
 
 #. TRANS: Instructions for profile design page.
-#: actions/userdesignsettings.php:84 lib/designsettings.php:74
+#: actions/userdesignsettings.php:84 lib/designsettings.php:72
 msgid ""
 "Customize the way your profile looks with a background image and a colour "
 "palette of your choice."
@@ -6610,10 +6731,28 @@ msgstr ""
 "Налаштуйте вигляд сторінки свого профілю, використовуючи фонове зображення і "
 "кольори на свій смак."
 
-#: actions/userdesignsettings.php:272
+#: actions/userdesignsettings.php:289
 msgid "Enjoy your hotdog!"
 msgstr "Поласуйте бутербродом!"
 
+#: actions/userdesignsettings.php:325
+#, fuzzy
+msgid "Design settings"
+msgstr "Зберегти налаштування сайту"
+
+#: actions/userdesignsettings.php:340
+msgid "View profile designs"
+msgstr "Переглядати дизайн користувачів"
+
+#: actions/userdesignsettings.php:341
+msgid "Show or hide profile designs."
+msgstr "Показувати або приховувати дизайни сторінок окремих користувачів."
+
+#: actions/userdesignsettings.php:348
+#, fuzzy
+msgid "Background file"
+msgstr "Фон"
+
 #. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number.
 #: actions/usergroups.php:66
 #, php-format
@@ -6665,6 +6804,11 @@ msgstr ""
 msgid "Contributors"
 msgstr "Розробники"
 
+#. TRANS: Menu item for site administration
+#: actions/version.php:167 lib/adminpanelaction.php:403
+msgid "License"
+msgstr "Ліцензія"
+
 #: actions/version.php:170
 msgid ""
 "StatusNet is free software: you can redistribute it and/or modify it under "
@@ -6698,12 +6842,13 @@ msgstr ""
 "Разом з програмою ви маєте отримати копію ліцензійних умов GNU Affero "
 "General Public License. Якщо ні, перейдіть на %s."
 
-#: actions/version.php:191
-msgid "Plugins"
-msgstr "Додатки"
+#. TRANS: Form input field label for application name.
+#: actions/version.php:197 lib/applicationeditform.php:190
+msgid "Name"
+msgstr "Ім’я"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:901
+#: actions/version.php:198 lib/action.php:885
 msgid "Version"
 msgstr "Версія"
 
@@ -6711,6 +6856,12 @@ msgstr "Версія"
 msgid "Author(s)"
 msgstr "Автор(и)"
 
+#. TRANS: Form input field label.
+#: actions/version.php:200 lib/applicationeditform.php:208
+#: lib/groupeditform.php:168
+msgid "Description"
+msgstr "Опис"
+
 #. TRANS: Activity title when marking a notice as favorite.
 #: classes/Fave.php:164
 msgid "Favor"
@@ -6834,7 +6985,7 @@ msgid "Could not create login token for %s"
 msgstr "Не вдалося створити токен входу для %s"
 
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
-#: classes/Memcached_DataObject.php:542
+#: classes/Memcached_DataObject.php:556
 msgid "No database name or DSN found anywhere."
 msgstr "Немає імені бази даних або DSN ніде не знайдено"
 
@@ -7009,18 +7160,18 @@ msgstr "%1$s тепер слідкує за %2$s."
 
 #. TRANS: Notice given on user registration.
 #. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:395
+#: classes/User.php:390
 #, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr "Вітаємо на %1$s, @%2$s!"
 
 #. TRANS: Server exception.
-#: classes/User.php:918
+#: classes/User.php:923
 msgid "No single user defined for single-user mode."
 msgstr "Користувача для однокористувацького режиму не визначено."
 
 #. TRANS: Server exception.
-#: classes/User.php:922
+#: classes/User.php:927
 msgid "Single-user mode code called when not enabled."
 msgstr "Код для однокористувацького режиму називається, коли не ввімкнуто."
 
@@ -7065,41 +7216,6 @@ msgstr "Не вдається знайти XRD для %s."
 msgid "No AtomPub API service for %s."
 msgstr "Немає послуги AtomPub API для %s."
 
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:104
-msgid "Change your profile settings"
-msgstr "Змінити налаштування профілю"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:111
-msgid "Upload an avatar"
-msgstr "Завантаження аватари"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:118
-msgid "Change your password"
-msgstr "Змінити пароль"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:125
-msgid "Change email handling"
-msgstr "Змінити електронну адресу"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:132
-msgid "Design your profile"
-msgstr "Дизайн вашого профілю"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:139
-msgid "Other options"
-msgstr "Інші опції"
-
-#. TRANS: Link description in user account settings menu.
-#: lib/accountsettingsaction.php:141
-msgid "Other"
-msgstr "Інше"
-
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
 #: lib/action.php:161
 #, php-format
@@ -7117,206 +7233,128 @@ msgctxt "TOOLTIP"
 msgid "Show more"
 msgstr "Розгорнути"
 
-#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:544
-msgid "Primary site navigation"
-msgstr "Відправна навігація по сайту"
+#. TRANS: Inline reply form submit button: submits a reply comment.
+#: lib/action.php:328
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Comment"
+msgstr "Зміст"
 
-#. TRANS: Tooltip for main menu option "Personal".
-#: lib/action.php:550
-msgctxt "TOOLTIP"
-msgid "Personal profile and friends timeline"
-msgstr "Персональний профіль і стрічка друзів"
+#. TRANS: Placeholder text for inline reply form. Clicking in this box will turn it into a mini notice form.
+#: lib/action.php:331
+msgid "Add a comment..."
+msgstr ""
 
-#. TRANS: Main menu option when logged in for access to personal profile and friends timeline.
-#. TRANS: Personal group navigation menu option when logged in for viewing timeline of self and friends.
-#: lib/action.php:553 lib/personalgroupnav.php:100
-msgctxt "MENU"
-msgid "Personal"
-msgstr "Стрічка"
+#: lib/action.php:559 lib/personalgroupnav.php:99
+#, fuzzy
+msgid "Home"
+msgstr "Веб-сторінка"
 
-#. TRANS: Tooltip for main menu option "Account".
-#: lib/action.php:555
-msgctxt "TOOLTIP"
-msgid "Change your email, avatar, password, profile"
-msgstr "Змінити електронну адресу, аватару, пароль, профіль"
-
-#. TRANS: Main menu option when logged in for access to user settings.
-#: lib/action.php:558
-msgid "Account"
-msgstr "Акаунт"
-
-#. TRANS: Tooltip for main menu option "Services".
 #: lib/action.php:560
-msgctxt "TOOLTIP"
-msgid "Connect to services"
-msgstr "З’єднання з сервісами"
+#, fuzzy
+msgid "Friends timeline"
+msgstr "%s стрічка"
 
-#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services.
-#: lib/action.php:563
-msgid "Connect"
-msgstr "З’єднання"
-
-#. TRANS: Tooltip for menu option "Admin".
 #: lib/action.php:566
-msgctxt "TOOLTIP"
-msgid "Change site configuration"
-msgstr "Змінити конфігурацію сайту"
+#, fuzzy
+msgid "Your profile"
+msgstr "Профіль спільноти"
 
-#. TRANS: Main menu option when logged in and site admin for access to site configuration.
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/action.php:569 lib/groupnav.php:117
-msgctxt "MENU"
-msgid "Admin"
-msgstr "Адмін"
+#: lib/action.php:570 lib/action.php:593 lib/publicgroupnav.php:78
+msgid "Public"
+msgstr "Загал"
 
-#. TRANS: Tooltip for main menu option "Invite".
-#: lib/action.php:573
-#, php-format
-msgctxt "TOOLTIP"
-msgid "Invite friends and colleagues to join you on %s"
-msgstr "Запросіть друзів та колег приєднатись до вас на %s"
+#: lib/action.php:571 lib/action.php:594
+#, fuzzy
+msgid "Everyone on this site"
+msgstr "Пошук людей на цьому сайті"
+
+#: lib/action.php:575
+#, fuzzy
+msgid "Settings"
+msgstr "Налаштування СМС"
 
-#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users.
 #: lib/action.php:576
-msgctxt "MENU"
-msgid "Invite"
-msgstr "Запросити"
+#, fuzzy
+msgid "Change your personal settings"
+msgstr "Змінити налаштування профілю"
 
-#. TRANS: Tooltip for main menu option "Logout"
 #: lib/action.php:582
-msgctxt "TOOLTIP"
-msgid "Logout from the site"
-msgstr "Вийти з сайту"
+#, fuzzy
+msgid "Site configuration"
+msgstr "Конфігурація користувача"
 
-#. TRANS: Main menu option when logged in to log out the current user.
-#: lib/action.php:585
-msgctxt "MENU"
+#: lib/action.php:587
+#, fuzzy
 msgid "Logout"
 msgstr "Вийти"
 
-#. TRANS: Tooltip for main menu option "Register".
-#: lib/action.php:590
-msgctxt "TOOLTIP"
-msgid "Create an account"
-msgstr "Створити новий акаунт"
+#: lib/action.php:588
+#, fuzzy
+msgid "Logout from the site"
+msgstr "Вийти з сайту"
 
-#. TRANS: Main menu option when not logged in to register a new account.
-#. TRANS: Menu item for registering with the StatusNet site.
-#: lib/action.php:593 lib/logingroupnav.php:85
-msgctxt "MENU"
-msgid "Register"
-msgstr "Реєстрація"
-
-#. TRANS: Tooltip for main menu option "Login".
-#: lib/action.php:596
-msgctxt "TOOLTIP"
+#: lib/action.php:599
+#, fuzzy
 msgid "Login to the site"
 msgstr "Увійти на сайт"
 
-#. TRANS: Main menu option when not logged in to log in.
-#. TRANS: Menu item for logging in to the StatusNet site.
-#: lib/action.php:599 lib/logingroupnav.php:77
-msgctxt "MENU"
-msgid "Login"
-msgstr "Увійти"
-
-#. TRANS: Tooltip for main menu option "Help".
-#: lib/action.php:602
-msgctxt "TOOLTIP"
-msgid "Help me!"
-msgstr "Допоможіть!"
-
-#. TRANS: Main menu option for help on the StatusNet site.
-#: lib/action.php:605
-msgctxt "MENU"
-msgid "Help"
-msgstr "Довідка"
-
-#. TRANS: Tooltip for main menu option "Search".
-#: lib/action.php:608
-msgctxt "TOOLTIP"
-msgid "Search for people or text"
-msgstr "Пошук людей або текстів"
-
-#. TRANS: Main menu option when logged in or when the StatusNet instance is not private.
-#: lib/action.php:611
-msgctxt "MENU"
+#: lib/action.php:606
+#, fuzzy
 msgid "Search"
 msgstr "Пошук"
 
-#. TRANS: DT element for site notice. String is hidden in default CSS.
-#. TRANS: Menu item for site administration
-#: lib/action.php:633 lib/adminpanelaction.php:387
-msgid "Site notice"
-msgstr "Об’яви на сайті"
-
-#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:700
-msgid "Local views"
-msgstr "Огляд"
-
-#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:770
-msgid "Page notice"
-msgstr "Зауваження сторінки"
-
-#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:874
-msgid "Secondary site navigation"
-msgstr "Другорядна навігація по сайту"
+#: lib/action.php:607
+#, fuzzy
+msgid "Search the site"
+msgstr "Пошук"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:880
+#: lib/action.php:864
 msgid "Help"
 msgstr "Допомога"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:883
+#: lib/action.php:867
 msgid "About"
 msgstr "Про"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:886
+#: lib/action.php:870
 msgid "FAQ"
 msgstr "ЧаП"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:891
+#: lib/action.php:875
 msgid "TOS"
 msgstr "Умови"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:895
+#: lib/action.php:879
 msgid "Privacy"
 msgstr "Приватність"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:898
+#: lib/action.php:882
 msgid "Source"
 msgstr "Джерело"
 
 #. TRANS: Secondary navigation menu option leading to e-mail contact information on the
 #. TRANS: StatusNet site, where to report bugs, ...
-#: lib/action.php:905
+#: lib/action.php:889
 msgid "Contact"
 msgstr "Контакт"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:908
+#: lib/action.php:892
 msgid "Badge"
 msgstr "Бедж"
 
-#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:937
-msgid "StatusNet software license"
-msgstr "Ліцензія програмного забезпечення StatusNet"
-
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:944
+#: lib/action.php:921
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7326,7 +7364,7 @@ msgstr ""
 "site.broughtbyurl%%)."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:947
+#: lib/action.php:924
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** — це сервіс мікроблоґів."
@@ -7335,7 +7373,7 @@ msgstr "**%%site.name%%** — це сервіс мікроблоґів."
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:954
+#: lib/action.php:931
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7346,52 +7384,42 @@ msgstr ""
 "для мікроблоґів, версія %s, доступному під [GNU Affero General Public "
 "License](http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
 
-#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:970
-msgid "Site content license"
-msgstr "Ліцензія змісту сайту"
-
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:977
+#: lib/action.php:949
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr "Зміст і дані %1$s є приватними і конфіденційними."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:984
+#: lib/action.php:956
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr "Авторські права на зміст і дані належать %1$s. Всі права захищено."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:988
+#: lib/action.php:960
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 "Авторські права на зміст і дані належать розробникам. Всі права захищено."
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:1020
+#: lib/action.php:992
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr "Весь зміст і дані %1$s доступні на умовах ліцензії %2$s."
 
-#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1356
-msgid "Pagination"
-msgstr "Нумерація сторінок"
-
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1367
+#: lib/action.php:1335
 msgid "After"
 msgstr "Вперед"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1377
+#: lib/action.php:1345
 msgid "Before"
 msgstr "Назад"
 
@@ -7544,7 +7572,7 @@ msgid "User configuration"
 msgstr "Конфігурація користувача"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:122
+#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:110
 msgid "User"
 msgstr "Користувач"
 
@@ -7568,6 +7596,11 @@ msgstr "Конфігурація сесій"
 msgid "Edit site notice"
 msgstr "Редагувати повідомлення сайту"
 
+#. TRANS: Menu item for site administration
+#: lib/adminpanelaction.php:387
+msgid "Site notice"
+msgstr "Об’яви на сайті"
+
 #. TRANS: Menu item title/tooltip
 #: lib/adminpanelaction.php:393
 msgid "Snapshots configuration"
@@ -7578,6 +7611,12 @@ msgstr "Конфігурація знімків"
 msgid "Set site license"
 msgstr "Зазначте ліцензію сайту"
 
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:409
+#, fuzzy
+msgid "Plugins configuration"
+msgstr "Конфігурація шляху"
+
 #. TRANS: Client error 401.
 #: lib/apiauth.php:111
 msgid "API resource requires read-write access, but you only have read access."
@@ -7590,19 +7629,23 @@ msgstr ""
 msgid "No application for that consumer key."
 msgstr "Немає додатків для даного споживчого ключа."
 
+#: lib/apiauth.php:202 lib/apiauth.php:284
+msgid "Not allowed to use API."
+msgstr "Не дозволяється використовувати API."
+
 #. TRANS: OAuth exception given when an incorrect access token was given for a user.
-#: lib/apiauth.php:219
+#: lib/apiauth.php:225
 msgid "Bad access token."
 msgstr "Токен погодження невірний."
 
 #. TRANS: OAuth exception given when no user was found for a given token (no token was found).
-#: lib/apiauth.php:224
+#: lib/apiauth.php:230
 msgid "No user for that token."
 msgstr "Немає користувача для цього токену."
 
 #. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel".
 #. TRANS: Client error thrown when authentication fails.
-#: lib/apiauth.php:266 lib/apiauth.php:293
+#: lib/apiauth.php:272 lib/apiauth.php:302
 msgid "Could not authenticate you."
 msgstr "Не вдалося автентифікувати вас."
 
@@ -7645,6 +7688,11 @@ msgstr "Спроба скасувати невідомий токен."
 msgid "Failed to delete revoked token."
 msgstr "Не вдалося видалити скасований токен."
 
+#. TRANS: Form input field label for application icon.
+#: lib/applicationeditform.php:177
+msgid "Icon"
+msgstr "Іконка"
+
 #. TRANS: Form guide.
 #: lib/applicationeditform.php:182
 msgid "Icon for this application"
@@ -7680,6 +7728,11 @@ msgstr "URL-адреса"
 msgid "Organization responsible for this application"
 msgstr "Організація, відповідальна за цей додаток"
 
+#. TRANS: Form input field label.
+#: lib/applicationeditform.php:227
+msgid "Organization"
+msgstr "Організація"
+
 #. TRANS: Form input field instructions.
 #: lib/applicationeditform.php:234
 msgid "URL for the homepage of the organization"
@@ -7768,16 +7821,6 @@ msgstr "Елемент author повинен містити елемент name.
 msgid "Do not use this method!"
 msgstr "Не видаляти цей метод!"
 
-#. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:293
-msgid "Author"
-msgstr "Автор"
-
-#. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:307
-msgid "Provider"
-msgstr "Провайдер"
-
 #. TRANS: Title.
 #: lib/attachmentnoticesection.php:67
 msgid "Notices where this attachment appears"
@@ -7803,23 +7846,28 @@ msgstr "Змінювати пароль не дозволено."
 msgid "Block"
 msgstr "Блок"
 
+#. TRANS: Description of the form to block a user.
+#: lib/blockform.php:79
+msgid "Block this user"
+msgstr "Блокувати користувача"
+
 #. TRANS: Title for command results.
-#: lib/channel.php:160 lib/channel.php:181
+#: lib/channel.php:104 lib/channel.php:125
 msgid "Command results"
 msgstr "Результати команди"
 
 #. TRANS: Title for command results.
-#: lib/channel.php:194
+#: lib/channel.php:138
 msgid "AJAX error"
 msgstr "Помилка AJAX"
 
 #. TRANS: E-mail subject when a command has completed.
-#: lib/channel.php:233 lib/mailhandler.php:143
+#: lib/channel.php:177 lib/mailhandler.php:143
 msgid "Command complete"
 msgstr "Команду виконано"
 
 #. TRANS: E-mail subject when a command has failed.
-#: lib/channel.php:244
+#: lib/channel.php:188
 msgid "Command failed"
 msgstr "Команду не виконано"
 
@@ -7922,7 +7970,7 @@ msgstr "Повне ім’я: %s"
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a location.
-#: lib/command.php:446 lib/mail.php:270
+#: lib/command.php:446 lib/mail.php:275
 #, php-format
 msgid "Location: %s"
 msgstr "Розташування: %s"
@@ -7930,7 +7978,7 @@ msgstr "Розташування: %s"
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a homepage.
-#: lib/command.php:450 lib/mail.php:274
+#: lib/command.php:450 lib/mail.php:279
 #, php-format
 msgid "Homepage: %s"
 msgstr "Веб-сторінка: %s"
@@ -8212,108 +8260,101 @@ msgstr ""
 "tracking — наразі не виконується\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:162
+#: lib/common.php:36
 msgid "No configuration file found."
 msgstr "Файл конфігурації не знайдено."
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:165
+#: lib/common.php:39
 msgid "I looked for configuration files in the following places:"
 msgstr "Пошук файлів конфігурації проводився тут:"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:168
+#: lib/common.php:42
 msgid "You may wish to run the installer to fix this."
 msgstr "Запустіть файл інсталяції, аби полагодити це."
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:172
+#: lib/common.php:46
 msgid "Go to the installer."
 msgstr "Іти до файлу інсталяції."
 
-#. TRANS: Menu item for Instant Messaging settings.
-#: lib/connectsettingsaction.php:106
-msgctxt "MENU"
-msgid "IM"
-msgstr "ІМ"
-
-#. TRANS: Tooltip for Instant Messaging menu item.
-#: lib/connectsettingsaction.php:108
-msgid "Updates by instant messenger (IM)"
-msgstr "Оновлення за допомогою служби миттєвих повідомлень (ІМ)"
-
-#. TRANS: Menu item for Short Message Service settings.
-#: lib/connectsettingsaction.php:113
-msgctxt "MENU"
-msgid "SMS"
-msgstr "СМС"
-
-#. TRANS: Tooltip for Short Message Service menu item.
-#: lib/connectsettingsaction.php:115
-msgid "Updates by SMS"
-msgstr "Оновлення через СМС"
-
-#. TRANS: Menu item for OuAth connection settings.
-#: lib/connectsettingsaction.php:120
-msgctxt "MENU"
-msgid "Connections"
-msgstr "З’єднання"
-
-#. TRANS: Tooltip for connected applications (Connections through OAuth) menu item.
-#: lib/connectsettingsaction.php:122
-msgid "Authorized connected applications"
-msgstr "Авторизовані під’єднані додатки"
-
 #: lib/dberroraction.php:59
 msgid "Database error"
 msgstr "Помилка бази даних"
 
+#. TRANS: Description of form for deleting a user.
+#: lib/deleteuserform.php:75
+msgid "Delete this user"
+msgstr "Видалити цього користувача"
+
+#: lib/designform.php:114
+#, fuzzy
+msgid "Change design"
+msgstr "Зберегти дизайн"
+
+#. TRANS: Fieldset legend on profile design page to change profile page colours.
+#: lib/designform.php:131
+msgid "Change colours"
+msgstr "Змінити кольори"
+
+#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
+#: lib/designform.php:138
+msgid "Use defaults"
+msgstr "За замовч."
+
+#. TRANS: Title for button on profile design page to reset all colour settings to default.
+#: lib/designform.php:140
+msgid "Restore default designs"
+msgstr "Оновити налаштування за замовчуванням"
+
+#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
+#: lib/designform.php:148
+msgid "Reset back to default"
+msgstr "Повернутись до початкових налаштувань"
+
 #. TRANS: Label in form on profile design page.
 #. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
-#: lib/designsettings.php:108
+#: lib/designform.php:158
 msgid "Upload file"
 msgstr "Завантажити файл"
 
 #. TRANS: Instructions for form on profile design page.
-#: lib/designsettings.php:113
+#: lib/designform.php:163
+#, fuzzy
 msgid ""
-"You can upload your personal background image. The maximum file size is 2MB."
+"You can upload your personal background image. The maximum file size is 2Mb."
 msgstr ""
 "Ви можете завантажити власне фонове зображення. Максимальний розмір файлу "
 "становить 2Мб."
 
 #. TRANS: Radio button on profile design page that will enable use of the uploaded profile image.
-#: lib/designsettings.php:139
+#: lib/designform.php:194
 msgctxt "RADIO"
 msgid "On"
 msgstr "Увімк."
 
 #. TRANS: Radio button on profile design page that will disable use of the uploaded profile image.
-#: lib/designsettings.php:156
+#: lib/designform.php:211
 msgctxt "RADIO"
 msgid "Off"
 msgstr "Вимк."
 
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: lib/designsettings.php:175
-msgid "Change colours"
-msgstr "Змінити кольори"
-
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: lib/designsettings.php:257
-msgid "Use defaults"
-msgstr "За замовч."
+#. TRANS: Title for button on profile design page to save settings.
+#: lib/designform.php:322
+msgid "Save design"
+msgstr "Зберегти дизайн"
 
 #. TRANS: Error message displayed if design settings could not be saved.
 #. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
-#: lib/designsettings.php:405 lib/designsettings.php:427
+#: lib/designsettings.php:216 lib/designsettings.php:238
 msgid "Couldn't update your design."
 msgstr "Не вдалося оновити дизайн."
 
 #. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
-#: lib/designsettings.php:433
+#: lib/designsettings.php:244
 msgid "Design defaults restored."
 msgstr "Дизайн за замовчуванням відновлено."
 
@@ -8380,27 +8421,23 @@ msgstr "Неможливо імпортувати без користувача.
 msgid "Feeds"
 msgstr "Веб-стрічки"
 
-#: lib/galleryaction.php:121
-msgid "Filter tags"
-msgstr "Фільтр для теґів"
-
-#: lib/galleryaction.php:131
+#: lib/galleryaction.php:128
 msgid "All"
 msgstr "Всі"
 
-#: lib/galleryaction.php:139
+#: lib/galleryaction.php:136
 msgid "Select tag to filter"
 msgstr "Оберіть фільтр теґів"
 
-#: lib/galleryaction.php:140
+#: lib/galleryaction.php:137
 msgid "Tag"
 msgstr "Теґ"
 
-#: lib/galleryaction.php:141
+#: lib/galleryaction.php:138
 msgid "Choose a tag to narrow list"
 msgstr "Оберіть теґ до звуженого списку"
 
-#: lib/galleryaction.php:143
+#: lib/galleryaction.php:140
 msgid "Go"
 msgstr "Вперед"
 
@@ -8496,6 +8533,12 @@ msgctxt "TOOLTIP"
 msgid "%s blocked users"
 msgstr "Заблоковані користувачі %s"
 
+#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
+#: lib/groupnav.php:117
+msgctxt "MENU"
+msgid "Admin"
+msgstr "Адмін"
+
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
 #: lib/groupnav.php:120
@@ -8608,39 +8651,63 @@ msgstr[0] "%d б"
 msgstr[1] "%d б"
 msgstr[2] "%d б"
 
-#: lib/jabber.php:387
+#: lib/implugin.php:262
 #, php-format
-msgid "[%s]"
-msgstr "[%s]"
+msgid ""
+"User \"%s\" on %s has said that your %s screenname belongs to them. If "
+"that's true, you can confirm by clicking on this URL: %s . (If you cannot "
+"click it, copy-and-paste it into the address bar of your browser). If that "
+"user isn't you, or if you didn't request this confirmation, just ignore this "
+"message."
+msgstr ""
 
-#: lib/jabber.php:567
+#: lib/implugin.php:349
 #, php-format
 msgid "Unknown inbox source %d."
 msgstr "Невідоме джерело вхідного повідомлення %d."
 
+#: lib/implugin.php:485
+#, fuzzy, php-format
+msgid "Message too long - maximum is %1$d characters, you sent %2$d."
+msgstr ""
+"Повідомлення надто довге, максимум становить %1$d символ, натомість ви "
+"надсилаєте %2$d."
+
 #: lib/leaveform.php:114
 msgid "Leave"
 msgstr "Залишити"
 
+#. TRANS: Menu item for logging in to the StatusNet site.
+#: lib/logingroupnav.php:77
+msgctxt "MENU"
+msgid "Login"
+msgstr "Увійти"
+
 #. TRANS: Title for menu item for logging in to the StatusNet site.
 #: lib/logingroupnav.php:79
 msgid "Login with a username and password"
 msgstr "Увійти використовуючи ім’я та пароль"
 
+#. TRANS: Menu item for registering with the StatusNet site.
+#: lib/logingroupnav.php:85
+msgctxt "MENU"
+msgid "Register"
+msgstr "Реєстрація"
+
 #. TRANS: Title for menu item for registering with the StatusNet site.
 #: lib/logingroupnav.php:87
 msgid "Sign up for a new account"
 msgstr "Зареєструвати новий акаунт"
 
 #. TRANS: Subject for address confirmation email.
-#: lib/mail.php:168
+#: lib/mail.php:172
 msgid "Email address confirmation"
 msgstr "Підтвердження електронної адреси"
 
 #. TRANS: Body for address confirmation email.
 #. TRANS: %1$s is the addressed user's nickname, %2$s is the StatusNet sitename,
 #. TRANS: %3$s is the URL to confirm at.
-#: lib/mail.php:173
+#: lib/mail.php:177
 #, php-format
 msgid ""
 "Hey, %1$s.\n"
@@ -8671,14 +8738,14 @@ msgstr ""
 
 #. TRANS: Subject of new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
-#: lib/mail.php:238
+#: lib/mail.php:243
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1$s тепер слідкує за вашими дописами на %2$s."
 
 #. TRANS: This is a paragraph in a new-subscriber e-mail.
 #. TRANS: %s is a URL where the subscriber can be reported as abusive.
-#: lib/mail.php:245
+#: lib/mail.php:250
 #, php-format
 msgid ""
 "If you believe this account is being used abusively, you can block them from "
@@ -8693,7 +8760,7 @@ msgstr ""
 #. TRANS: %3$s is the subscriber's profile URL, %4$s is the subscriber's location (or empty)
 #. TRANS: %5$s is the subscriber's homepage URL (or empty), %6%s is the subscriber's bio (or empty)
 #. TRANS: %7$s is a link to the addressed user's e-mail settings.
-#: lib/mail.php:255
+#: lib/mail.php:260
 #, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -8720,14 +8787,14 @@ msgstr ""
 
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is biographical information.
-#: lib/mail.php:278
+#: lib/mail.php:283
 #, php-format
 msgid "Bio: %s"
 msgstr "Про себе: %s"
 
 #. TRANS: Subject of notification mail for new posting email address.
 #. TRANS: %s is the StatusNet sitename.
-#: lib/mail.php:307
+#: lib/mail.php:312
 #, php-format
 msgid "New email address for posting to %s"
 msgstr "Нова електронна адреса для надсилання повідомлень на %s"
@@ -8735,7 +8802,7 @@ msgstr "Нова електронна адреса для надсилання 
 #. TRANS: Body of notification mail for new posting email address.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is the e-mail address to send
 #. TRANS: to to post by e-mail, %3$s is a URL to more instructions.
-#: lib/mail.php:313
+#: lib/mail.php:318
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -8758,19 +8825,19 @@ msgstr ""
 
 #. TRANS: Subject line for SMS-by-email notification messages.
 #. TRANS: %s is the posting user's nickname.
-#: lib/mail.php:434
+#: lib/mail.php:439
 #, php-format
 msgid "%s status"
 msgstr "%s статус"
 
 #. TRANS: Subject line for SMS-by-email address confirmation message.
-#: lib/mail.php:460
+#: lib/mail.php:465
 msgid "SMS confirmation"
 msgstr "Підтвердження СМС"
 
 #. TRANS: Main body heading for SMS-by-email address confirmation message.
 #. TRANS: %s is the addressed user's nickname.
-#: lib/mail.php:464
+#: lib/mail.php:469
 #, php-format
 msgid "%s: confirm you own this phone number with this code:"
 msgstr ""
@@ -8779,7 +8846,7 @@ msgstr ""
 
 #. TRANS: Subject for 'nudge' notification email.
 #. TRANS: %s is the nudging user.
-#: lib/mail.php:485
+#: lib/mail.php:490
 #, php-format
 msgid "You have been nudged by %s"
 msgstr "Вас спробував «розштовхати» %s"
@@ -8787,7 +8854,7 @@ msgstr "Вас спробував «розштовхати» %s"
 #. TRANS: Body for 'nudge' notification email.
 #. TRANS: %1$s is the nuding user's long name, $2$s is the nudging user's nickname,
 #. TRANS: %3$s is a URL to post notices at, %4$s is the StatusNet sitename.
-#: lib/mail.php:492
+#: lib/mail.php:497
 #, php-format
 msgid ""
 "%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -8816,7 +8883,7 @@ msgstr ""
 
 #. TRANS: Subject for direct-message notification email.
 #. TRANS: %s is the sending user's nickname.
-#: lib/mail.php:539
+#: lib/mail.php:544
 #, php-format
 msgid "New private message from %s"
 msgstr "Нове приватне повідомлення від %s"
@@ -8825,7 +8892,7 @@ msgstr "Нове приватне повідомлення від %s"
 #. TRANS: %1$s is the sending user's long name, %2$s is the sending user's nickname,
 #. TRANS: %3$s is the message content, %4$s a URL to the message,
 #. TRANS: %5$s is the StatusNet sitename.
-#: lib/mail.php:547
+#: lib/mail.php:552
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -8860,7 +8927,7 @@ msgstr ""
 
 #. TRANS: Subject for favorite notification e-mail.
 #. TRANS: %1$s is the adding user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:599
+#: lib/mail.php:604
 #, php-format
 msgid "%1$s (@%2$s) added your notice as a favorite"
 msgstr "%1$s (@%2$s) додав(ла) ваш допис обраних"
@@ -8870,7 +8937,7 @@ msgstr "%1$s (@%2$s) додав(ла) ваш допис обраних"
 #. TRANS: %3$s is a URL to the faved notice, %4$s is the faved notice text,
 #. TRANS: %5$s is a URL to all faves of the adding user, %6$s is the StatusNet sitename,
 #. TRANS: %7$s is the adding user's nickname.
-#: lib/mail.php:606
+#: lib/mail.php:611
 #, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -8908,7 +8975,7 @@ msgstr ""
 "%6$s\n"
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:664
+#: lib/mail.php:669
 #, php-format
 msgid ""
 "The full conversation can be read here:\n"
@@ -8921,7 +8988,7 @@ msgstr ""
 
 #. TRANS: E-mail subject for notice notification.
 #. TRANS: %1$s is the sending user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:672
+#: lib/mail.php:677
 #, php-format
 msgid "%1$s (@%2$s) sent a notice to your attention"
 msgstr "%1$s (@%2$s) пропонує до вашої уваги наступний допис"
@@ -8932,7 +8999,7 @@ msgstr "%1$s (@%2$s) пропонує до вашої уваги наступн
 #. TRANS: %5$s is a URL to the full conversion if it exists (otherwise empty),
 #. TRANS: %6$s is a URL to reply to the notice, %7$s is a URL to all @-replied for the addressed user,
 #. TRANS: %8$s is a URL to the addressed user's e-mail settings, %9$s is the sender's nickname.
-#: lib/mail.php:680
+#: lib/mail.php:685
 #, php-format
 msgid ""
 "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -9076,11 +9143,7 @@ msgstr "Немає відповідних абонентів."
 msgid "To"
 msgstr "До"
 
-#: lib/messageform.php:166 lib/noticeform.php:186
-msgid "Available characters"
-msgstr "Лишилось знаків"
-
-#: lib/messageform.php:185 lib/noticeform.php:237
+#: lib/messageform.php:184 lib/noticeform.php:236
 msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr "Так"
@@ -9089,17 +9152,10 @@ msgstr "Так"
 msgid "Messages"
 msgstr "Повідомлення"
 
-#: lib/messagelistitem.php:123 lib/noticelist.php:522
+#: lib/messagelistitem.php:123 lib/noticelist.php:527
 msgid "from"
 msgstr "з"
 
-#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:165
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr ""
-"Ім’я користувача повинно складатись з літер нижнього регістру і цифр, ніяких "
-"інтервалів."
-
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 #: lib/nickname.php:178
 msgid "Nickname cannot be empty."
@@ -9123,23 +9179,23 @@ msgstr "Надіслати допис"
 msgid "What's up, %s?"
 msgstr "Що нового, %s?"
 
-#: lib/noticeform.php:194
+#: lib/noticeform.php:193
 msgid "Attach"
 msgstr "Вкласти"
 
-#: lib/noticeform.php:198
+#: lib/noticeform.php:197
 msgid "Attach a file"
 msgstr "Вкласти файл"
 
-#: lib/noticeform.php:213
+#: lib/noticeform.php:212
 msgid "Share my location"
 msgstr "Показувати місцезнаходження."
 
-#: lib/noticeform.php:216
+#: lib/noticeform.php:215
 msgid "Do not share my location"
 msgstr "Приховувати моє місцезнаходження"
 
-#: lib/noticeform.php:217
+#: lib/noticeform.php:216
 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
 "try again later"
@@ -9148,55 +9204,59 @@ msgstr ""
 "ніж очікувалось; будь ласка, спробуйте пізніше"
 
 #. TRANS: Used in coordinates as abbreviation of north
-#: lib/noticelist.php:452
+#: lib/noticelist.php:457
 msgid "N"
 msgstr "Півн."
 
 #. TRANS: Used in coordinates as abbreviation of south
-#: lib/noticelist.php:454
+#: lib/noticelist.php:459
 msgid "S"
 msgstr "Півд."
 
 #. TRANS: Used in coordinates as abbreviation of east
-#: lib/noticelist.php:456
+#: lib/noticelist.php:461
 msgid "E"
 msgstr "Сх."
 
 #. TRANS: Used in coordinates as abbreviation of west
-#: lib/noticelist.php:458
+#: lib/noticelist.php:463
 msgid "W"
 msgstr "Зах."
 
-#: lib/noticelist.php:460
+#: lib/noticelist.php:465
 #, php-format
 msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 
-#: lib/noticelist.php:469
+#: lib/noticelist.php:474
 msgid "at"
 msgstr "в"
 
-#: lib/noticelist.php:518
+#: lib/noticelist.php:523
 msgid "web"
 msgstr "вебу"
 
-#: lib/noticelist.php:584
+#: lib/noticelist.php:589
 msgid "in context"
 msgstr "у контексті"
 
-#: lib/noticelist.php:619
+#: lib/noticelist.php:624
 msgid "Repeated by"
 msgstr "Повторено"
 
-#: lib/noticelist.php:646
+#: lib/noticelist.php:651
 msgid "Reply to this notice"
 msgstr "Відповісти на цей допис"
 
-#: lib/noticelist.php:647
+#: lib/noticelist.php:652
 msgid "Reply"
 msgstr "Відповісти"
 
-#: lib/noticelist.php:691
+#: lib/noticelist.php:678
+msgid "Delete this notice"
+msgstr "Видалити допис"
+
+#: lib/noticelist.php:696
 msgid "Notice repeated"
 msgstr "Допис повторили"
 
@@ -9233,43 +9293,31 @@ msgstr "Дублікат допису."
 msgid "Couldn't insert new subscription."
 msgstr "Не вдалося додати нову підписку."
 
-#. TRANS: Personal group navigation menu option when logged in for viewing @-replies.
-#: lib/personalgroupnav.php:107
-msgctxt "MENU"
+#: lib/personalgroupnav.php:104
+#, fuzzy
 msgid "Replies"
 msgstr "Відповіді"
 
-#. TRANS: Personal group navigation menu option when logged in for seeing own profile.
-#: lib/personalgroupnav.php:114
-msgctxt "MENU"
-msgid "Profile"
-msgstr "Профіль"
-
-#. TRANS: Personal group navigation menu option when logged in for viewing own favourited notices.
-#: lib/personalgroupnav.php:120
-msgctxt "MENU"
+#: lib/personalgroupnav.php:109
+#, fuzzy
 msgid "Favorites"
 msgstr "Обрані"
 
-#. TRANS: Personal group navigation menu option when logged in for viewing recieved personal messages.
-#: lib/personalgroupnav.php:133
-msgctxt "MENU"
+#: lib/personalgroupnav.php:120
+#, fuzzy
 msgid "Inbox"
 msgstr "Вхідні"
 
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing recieved personal messages.
-#: lib/personalgroupnav.php:135
+#: lib/personalgroupnav.php:121
 msgid "Your incoming messages"
 msgstr "Ваші вхідні повідомлення"
 
-#. TRANS: Personal group navigation menu option when logged in for viewing senet personal messages.
-#: lib/personalgroupnav.php:140
-msgctxt "MENU"
+#: lib/personalgroupnav.php:125
+#, fuzzy
 msgid "Outbox"
 msgstr "Вихідні"
 
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing senet personal messages.
-#: lib/personalgroupnav.php:142
+#: lib/personalgroupnav.php:126
 msgid "Your sent messages"
 msgstr "Надіслані вами повідомлення"
 
@@ -9284,9 +9332,26 @@ msgstr "Теґи у дописах %s"
 msgid "Unknown"
 msgstr "Невідомо"
 
+#. TRANS: Plugin admin panel controls
+#: lib/plugindisableform.php:90
+msgctxt "plugin"
+msgid "Disable"
+msgstr ""
+
+#. TRANS: Plugin admin panel controls
+#: lib/pluginenableform.php:112
+msgctxt "plugin"
+msgid "Enable"
+msgstr ""
+
+#: lib/pluginlist.php:196
+msgctxt "plugin-description"
+msgid "(Plugin descriptions unavailable when disabled.)"
+msgstr ""
+
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:82
+#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:88
 msgid "Subscriptions"
 msgstr "Підписки"
 
@@ -9297,7 +9362,7 @@ msgstr "Всі підписки"
 
 #. TRANS: H2 text for user subscriber statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:90
+#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:96
 msgid "Subscribers"
 msgstr "Підписані"
 
@@ -9319,7 +9384,7 @@ msgstr "Реєстрація"
 #. TRANS: Label for user statistics.
 #. TRANS: H2 text for user group membership statistics.
 #: lib/profileaction.php:239 lib/profileaction.php:290
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:104
 msgid "Groups"
 msgstr "Спільноти"
 
@@ -9339,10 +9404,6 @@ msgstr "Всі спільноти"
 msgid "Unimplemented method."
 msgstr "Метод не виконується."
 
-#: lib/publicgroupnav.php:78
-msgid "Public"
-msgstr "Загал"
-
 #: lib/publicgroupnav.php:82
 msgid "User groups"
 msgstr "Спільноти"
@@ -9381,7 +9442,7 @@ msgid "Revoke the \"%s\" role from this user"
 msgstr "Відкликати роль «%s» для цього користувача"
 
 #. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:974
+#: lib/router.php:1001
 msgid "Page not found."
 msgstr "Сторінку не знайдено."
 
@@ -9410,11 +9471,6 @@ msgctxt "BUTTON"
 msgid "Search"
 msgstr "Пошук"
 
-#. TRANS: Definition list item with instructions on how to get (better) search results.
-#: lib/searchaction.php:170
-msgid "Search help"
-msgstr "Пошук"
-
 #: lib/searchgroupnav.php:80
 msgid "People"
 msgstr "Люди"
@@ -9439,6 +9495,51 @@ msgstr "Розділ без заголовку"
 msgid "More..."
 msgstr "Ще..."
 
+#: lib/settingsnav.php:78
+msgid "Change your profile settings"
+msgstr "Змінити налаштування профілю"
+
+#: lib/settingsnav.php:83
+msgid "Upload an avatar"
+msgstr "Завантаження аватари"
+
+#: lib/settingsnav.php:88
+msgid "Change your password"
+msgstr "Змінити пароль"
+
+#: lib/settingsnav.php:93
+msgid "Change email handling"
+msgstr "Змінити електронну адресу"
+
+#: lib/settingsnav.php:98
+msgid "Design your profile"
+msgstr "Дизайн вашого профілю"
+
+#: lib/settingsnav.php:102
+msgid "URL"
+msgstr "URL"
+
+#: lib/settingsnav.php:103
+msgid "URL shorteners"
+msgstr ""
+
+#: lib/settingsnav.php:111
+msgid "Updates by instant messenger (IM)"
+msgstr "Оновлення за допомогою служби миттєвих повідомлень (ІМ)"
+
+#: lib/settingsnav.php:118
+msgid "Updates by SMS"
+msgstr "Оновлення через СМС"
+
+#: lib/settingsnav.php:123
+#, fuzzy
+msgid "Connections"
+msgstr "З’єднання"
+
+#: lib/settingsnav.php:124
+msgid "Authorized connected applications"
+msgstr "Авторизовані під’єднані додатки"
+
 #: lib/silenceform.php:67
 msgid "Silence"
 msgstr "Нічичирк!"
@@ -9447,30 +9548,34 @@ msgstr "Нічичирк!"
 msgid "Silence this user"
 msgstr "Змусити користувача замовкнути, відправити у забуття"
 
-#: lib/subgroupnav.php:83
+#: lib/subgroupnav.php:89
 #, php-format
 msgid "People %s subscribes to"
 msgstr "%s підписався до наступних людей"
 
-#: lib/subgroupnav.php:91
+#: lib/subgroupnav.php:97
 #, php-format
 msgid "People subscribed to %s"
 msgstr "Люди підписані до %s"
 
-#: lib/subgroupnav.php:99
+#: lib/subgroupnav.php:105
 #, php-format
 msgid "Groups %s is a member of"
 msgstr "Спільноти, до яких залучений %s"
 
-#: lib/subgroupnav.php:105
+#: lib/subgroupnav.php:111
 msgid "Invite"
 msgstr "Запросити"
 
-#: lib/subgroupnav.php:106
+#: lib/subgroupnav.php:112
 #, php-format
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Запросіть друзів та колег приєднатись до вас на %s"
 
+#: lib/subscribeform.php:115 lib/subscribeform.php:139
+msgid "Subscribe to this user"
+msgstr "Підписатись до цього користувача"
+
 #: lib/subscriberspeopleselftagcloudsection.php:48
 #: lib/subscriptionspeopleselftagcloudsection.php:48
 msgid "People Tagcloud as self-tagged"
@@ -9550,6 +9655,14 @@ msgstr "Тема містить файл типу «.%s», який є непр
 msgid "Error opening theme archive."
 msgstr "Помилка при відкритті архіву з темою."
 
+#: lib/threadednoticelist.php:270
+#, php-format
+msgid "Show all %d comment"
+msgid_plural "Show all %d comments"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
 #: lib/topposterssection.php:74
 msgid "Top posters"
 msgstr "Топ-дописувачі"
@@ -9591,76 +9704,79 @@ msgstr "Відписатись"
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "Користувач %1$s (%2$d) не має профілю."
 
-#. TRANS: Link text for changeing the avatar of the logged in user.
-#: lib/userprofile.php:121
+#: lib/userprofile.php:116
 msgid "Edit Avatar"
 msgstr "Аватара"
 
 #. TRANS: H2 for user actions in a profile.
 #. TRANS: H2 for entity actions in a profile.
-#: lib/userprofile.php:245 lib/userprofile.php:261
+#: lib/userprofile.php:216 lib/userprofile.php:232
 msgid "User actions"
 msgstr "Діяльність користувача"
 
 #. TRANS: Text shown in user profile of not yet compeltely deleted users.
-#: lib/userprofile.php:249
+#: lib/userprofile.php:220
 msgid "User deletion in progress..."
 msgstr "Видалення користувача у процесі..."
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:277
+#: lib/userprofile.php:248
 msgid "Edit profile settings"
 msgstr "Налаштування профілю"
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:279
+#: lib/userprofile.php:250
 msgid "Edit"
 msgstr "Правка"
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:303
+#: lib/userprofile.php:274
 msgid "Send a direct message to this user"
 msgstr "Надіслати пряме повідомлення цьому користувачеві"
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:305
+#: lib/userprofile.php:276
 msgid "Message"
 msgstr "Повідомлення"
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:347
+#: lib/userprofile.php:318
 msgid "Moderate"
 msgstr "Модерувати"
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:386
+#: lib/userprofile.php:357
 msgid "User role"
 msgstr "Роль користувача"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:389
+#: lib/userprofile.php:360
 msgctxt "role"
 msgid "Administrator"
 msgstr "Адміністратор"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:391
+#: lib/userprofile.php:362
 msgctxt "role"
 msgid "Moderator"
 msgstr "Модератор"
 
+#: lib/util.php:321
+msgid "Not allowed to log in."
+msgstr "Вхід до системи не дозволено."
+
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1306
+#: lib/util.php:1337
 msgid "a few seconds ago"
 msgstr "мить тому"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1309
+#: lib/util.php:1340
 msgid "about a minute ago"
 msgstr "хвилину тому"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1313
+#: lib/util.php:1344
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
@@ -9669,12 +9785,12 @@ msgstr[1] "близько %d хвилин тому"
 msgstr[2] "близько %d хвилин тому"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1316
+#: lib/util.php:1347
 msgid "about an hour ago"
 msgstr "годину тому"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1320
+#: lib/util.php:1351
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
@@ -9683,12 +9799,12 @@ msgstr[1] "близько %d годин тому"
 msgstr[2] "близько %d годин тому"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1323
+#: lib/util.php:1354
 msgid "about a day ago"
 msgstr "день тому"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1327
+#: lib/util.php:1358
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
@@ -9697,12 +9813,12 @@ msgstr[1] "близько %d днів тому"
 msgstr[2] "близько %d днів тому"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1330
+#: lib/util.php:1361
 msgid "about a month ago"
 msgstr "місяць тому"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1334
+#: lib/util.php:1365
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
@@ -9711,7 +9827,7 @@ msgstr[1] "близько %d місяців тому"
 msgstr[2] "близько %d місяців тому"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1337
+#: lib/util.php:1368
 msgid "about a year ago"
 msgstr "близько року тому"
 
@@ -9722,29 +9838,6 @@ msgstr "близько року тому"
 msgid "%s is not a valid color! Use 3 or 6 hex characters."
 msgstr "%s є неприпустимим кольором! Використайте 3 або 6 знаків (HEX-формат)"
 
-#. TRANS: %s is the URL to the StatusNet site's Instant Messaging settings.
-#: lib/xmppmanager.php:287
-#, php-format
-msgid "Unknown user. Go to %s to add your address to your account"
-msgstr ""
-"Невідомий користувач. Перейти до %s, аби додати свою адресу до акаунту."
-
-#. TRANS: Response to XMPP source when it sent too long a message.
-#. TRANS: %1$d the maximum number of allowed characters (used for plural), %2$d is the sent number.
-#: lib/xmppmanager.php:406
-#, php-format
-msgid "Message too long. Maximum is %1$d character, you sent %2$d."
-msgid_plural "Message too long. Maximum is %1$d characters, you sent %2$d."
-msgstr[0] ""
-"Повідомлення надто довге. Максимум становить %1$d символів, натомість ви "
-"надсилаєте %2$d."
-msgstr[1] ""
-"Повідомлення надто довге. Максимум становить %1$d символів, натомість ви "
-"надсилаєте %2$d."
-msgstr[2] ""
-"Повідомлення надто довге. Максимум становить %1$d символів, натомість ви "
-"надсилаєте %2$d."
-
 #. TRANS: Exception.
 #: lib/xrd.php:63
 msgid "Invalid XML."
@@ -9761,61 +9854,180 @@ msgstr "Неправильний XML, корінь XRD відсутній."
 msgid "Getting backup from file '%s'."
 msgstr "Отримання резервної копії файлу «%s»."
 
-#~ msgid "Block this user."
-#~ msgstr "Блокувати користувача."
+#~ msgid "Could not generate feed for group - %s"
+#~ msgstr "Не вдалося створити веб-стрічку для спільноти — %s"
 
-#~ msgid "Delete this notice."
-#~ msgstr "Видалити допис."
-
-#~ msgid "Delete this user."
-#~ msgstr "Видалити цього користувача."
-
-#~ msgid "Restore default designs."
-#~ msgstr "Відновити стандартні установки."
-
-#~ msgid "Reset back to default."
-#~ msgstr "Повернутись до стандартних налаштувань."
-
-#~ msgid "Save design."
-#~ msgstr "Зберегти дизайн."
-
-#~ msgid "Disfavor favorite."
-#~ msgstr "Видалити з обраних."
-
-#~ msgid "\"%s\" not found."
-#~ msgstr "«%s» не знайдено."
-
-#~ msgid "Notice %s not found."
-#~ msgstr "Допис %s не знайдено."
-
-#~ msgid "Attachment %s not found."
-#~ msgstr "Вкладення %s не знайдено."
-
-#~ msgid "\"%s\" not supported for oembed requests."
-#~ msgstr "«%s» не підтримується для oembed-запитів."
-
-#~ msgid "Invalid tag: \"%s\"."
-#~ msgstr "Неприпустимий теґ: «%s»."
-
-#~ msgid "%s updates from everyone."
-#~ msgstr "Всі оновлення на %s."
-
-#~ msgid "Password saved"
-#~ msgstr "Пароль збережено"
-
-#~ msgid "Where you are, like \"City, State (or Region), Country\"."
-#~ msgstr "Де ви живете, на кшталт «Місто, область (регіон), країна»."
-
-#~ msgid "Subscribe to this user."
-#~ msgstr "Підписатися до цього користувача."
+#~ msgid "Current confirmed Jabber/Google Talk address."
+#~ msgstr "Поточна підтверджена адреса Jabber/Google Talk."
 
 #~ msgid ""
-#~ "Listenee stream license \"%1$s\" is not compatible with site license \"%2"
-#~ "$s\"."
-#~ msgstr "Ліцензія потоку «%1$s» є несумісною з ліцензією сайту «%2$s»."
+#~ "Jabber or Google Talk address, like \"UserName@example.org\". First, make "
+#~ "sure to add %s to your buddy list in your IM client or on Google Talk."
+#~ msgstr ""
+#~ "Jabber або Google Talk адреса, на зразок «username@example.org». Але "
+#~ "спершу переконайтеся, що додали %s до списку контактів в своєму IM-"
+#~ "клієнті або в Google Talk."
 
-#~ msgid "Not allowed to use API."
-#~ msgstr "Не дозволяється використовувати API."
+#~ msgid "Send me notices through Jabber/Google Talk."
+#~ msgstr "Повідомляти мене через Jabber/Google Talk."
 
-#~ msgid "Not allowed to log in."
-#~ msgstr "Вхід до системи не дозволено."
+#~ msgid "Publish a MicroID for my Jabber/Google Talk address."
+#~ msgstr "Позначати міткою MicroID мою адресу Jabber/Google Talk."
+
+#~ msgid "No Jabber ID."
+#~ msgstr "Немає Jabber ID."
+
+#~ msgid "Not a valid Jabber ID."
+#~ msgstr "Це недійсний Jabber ID."
+
+#~ msgid "That is already your Jabber ID."
+#~ msgstr "Це і є ваш Jabber ID."
+
+#~ msgid "That is not your Jabber ID."
+#~ msgstr "Це не ваш Jabber ID."
+
+#~ msgid "Other settings"
+#~ msgstr "Інші опції"
+
+#~ msgid "Tag cloud"
+#~ msgstr "Хмарка теґів"
+
+#~ msgid "Consumer key"
+#~ msgstr "Ключ споживача"
+
+#~ msgid "Consumer secret"
+#~ msgstr "Таємно слово споживача"
+
+#~ msgid "Request token URL"
+#~ msgstr "URL-адреса токена запиту"
+
+#~ msgid "Access token URL"
+#~ msgstr "URL-адреса токена дозволу"
+
+#~ msgid "Authorize URL"
+#~ msgstr "Авторизувати URL-адресу"
+
+#~ msgid "Jabber"
+#~ msgstr "Jabber"
+
+#~ msgid "Photo"
+#~ msgstr "Фото"
+
+#~ msgid "Other options"
+#~ msgstr "Інші опції"
+
+#~ msgid "Other"
+#~ msgstr "Інше"
+
+#~ msgid "Primary site navigation"
+#~ msgstr "Відправна навігація по сайту"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Personal profile and friends timeline"
+#~ msgstr "Персональний профіль і стрічка друзів"
+
+#~ msgctxt "MENU"
+#~ msgid "Personal"
+#~ msgstr "Стрічка"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Change your email, avatar, password, profile"
+#~ msgstr "Змінити електронну адресу, аватару, пароль, профіль"
+
+#~ msgid "Account"
+#~ msgstr "Акаунт"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Connect to services"
+#~ msgstr "З’єднання з сервісами"
+
+#~ msgid "Connect"
+#~ msgstr "З’єднання"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Change site configuration"
+#~ msgstr "Змінити конфігурацію сайту"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Invite friends and colleagues to join you on %s"
+#~ msgstr "Запросіть друзів та колег приєднатись до вас на %s"
+
+#~ msgctxt "MENU"
+#~ msgid "Invite"
+#~ msgstr "Запросити"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Create an account"
+#~ msgstr "Створити новий акаунт"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Help me!"
+#~ msgstr "Допоможіть!"
+
+#~ msgctxt "MENU"
+#~ msgid "Help"
+#~ msgstr "Довідка"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Search for people or text"
+#~ msgstr "Пошук людей або текстів"
+
+#~ msgid "Local views"
+#~ msgstr "Огляд"
+
+#~ msgid "Page notice"
+#~ msgstr "Зауваження сторінки"
+
+#~ msgid "Secondary site navigation"
+#~ msgstr "Другорядна навігація по сайту"
+
+#~ msgid "StatusNet software license"
+#~ msgstr "Ліцензія програмного забезпечення StatusNet"
+
+#~ msgid "Site content license"
+#~ msgstr "Ліцензія змісту сайту"
+
+#~ msgid "Pagination"
+#~ msgstr "Нумерація сторінок"
+
+#~ msgid "Author"
+#~ msgstr "Автор"
+
+#~ msgid "Provider"
+#~ msgstr "Провайдер"
+
+#~ msgctxt "MENU"
+#~ msgid "SMS"
+#~ msgstr "СМС"
+
+#~ msgid "Filter tags"
+#~ msgstr "Фільтр для теґів"
+
+#~ msgid "[%s]"
+#~ msgstr "[%s]"
+
+#~ msgid "Available characters"
+#~ msgstr "Лишилось знаків"
+
+#~ msgctxt "MENU"
+#~ msgid "Profile"
+#~ msgstr "Профіль"
+
+#~ msgid "Search help"
+#~ msgstr "Пошук"
+
+#~ msgid "Unknown user. Go to %s to add your address to your account"
+#~ msgstr ""
+#~ "Невідомий користувач. Перейти до %s, аби додати свою адресу до акаунту."
+
+#~ msgid "Message too long. Maximum is %1$d character, you sent %2$d."
+#~ msgid_plural "Message too long. Maximum is %1$d characters, you sent %2$d."
+#~ msgstr[0] ""
+#~ "Повідомлення надто довге. Максимум становить %1$d символів, натомість ви "
+#~ "надсилаєте %2$d."
+#~ msgstr[1] ""
+#~ "Повідомлення надто довге. Максимум становить %1$d символів, натомість ви "
+#~ "надсилаєте %2$d."
+#~ msgstr[2] ""
+#~ "Повідомлення надто довге. Максимум становить %1$d символів, натомість ви "
+#~ "надсилаєте %2$d."
diff --git a/locale/zh_CN/LC_MESSAGES/statusnet.po b/locale/zh_CN/LC_MESSAGES/statusnet.po
index f5d5cedd2e..6f74d5417a 100644
--- a/locale/zh_CN/LC_MESSAGES/statusnet.po
+++ b/locale/zh_CN/LC_MESSAGES/statusnet.po
@@ -15,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 15:58+0000\n"
-"PO-Revision-Date: 2011-03-03 16:01:29+0000\n"
+"POT-Creation-Date: 2011-03-03 17:23+0000\n"
+"PO-Revision-Date: 2011-03-03 17:26:33+0000\n"
 "Language-Team: Simplified Chinese <http://translatewiki.net/wiki/Portal:zh-"
 "hans>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -83,23 +83,23 @@ msgstr "保存访问设置"
 #. TRANS: Tooltip for button to save access settings in site admin panel.
 #. TRANS: Button text for saving theme settings.
 #. TRANS: Button label to save e-mail preferences.
-#. TRANS: Button label to save Instant Messaging preferences.
-#. TRANS: Button text for saving "Other settings" in profile.
+#. TRANS: Button label to save IM preferences.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
 #. TRANS: Button text for saving site notice in admin panel.
 #. TRANS: Button label to save SMS preferences.
 #. TRANS: Save button for settings for a profile in a subscriptions list.
+#. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
 #. TRANS: Button text on profile design page to save settings.
 #: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
-#: actions/emailsettings.php:250 actions/imsettings.php:183
-#: actions/othersettings.php:136 actions/pathsadminpanel.php:512
-#: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
-#: actions/smssettings.php:205 actions/subscriptions.php:259
+#: actions/emailsettings.php:251 actions/imsettings.php:199
+#: actions/pathsadminpanel.php:512 actions/profilesettings.php:198
+#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:204
+#: actions/subscriptions.php:261 actions/urlsettings.php:152
 #: actions/useradminpanel.php:298 lib/applicationeditform.php:355
-#: lib/designsettings.php:270 lib/groupeditform.php:201
+#: lib/designform.php:320 lib/groupeditform.php:201
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "保存"
@@ -138,7 +138,11 @@ msgstr "没有这个页面。"
 #. 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 use "one time password login" without using an existing user.
+#. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
+#. TRANS: Client error displayed trying to find a user by ID for a non-existing ID.
+#. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when calling a profile action without specifying a user.
 #: actions/all.php:80 actions/allrss.php:69
@@ -150,19 +154,19 @@ msgstr "没有这个页面。"
 #: actions/apidirectmessage.php:75 actions/apidirectmessagenew.php:72
 #: actions/apigroupcreate.php:111 actions/apigroupismember.php:89
 #: actions/apigroupjoin.php:98 actions/apigroupleave.php:98
-#: actions/apigrouplist.php:70 actions/apistatusesupdate.php:230
-#: actions/apisubscriptions.php:85 actions/apitimelinefavorites.php:70
-#: actions/apitimelinefriends.php:173 actions/apitimelinehome.php:78
-#: actions/apitimelinementions.php:77 actions/apitimelineuser.php:79
-#: actions/avatarbynickname.php:79 actions/favoritesrss.php:72
-#: actions/foaf.php:42 actions/foaf.php:61 actions/hcard.php:67
-#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
-#: actions/remotesubscribe.php:144 actions/remotesubscribe.php:153
-#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
-#: actions/showfavorites.php:106 actions/userbyid.php:74
-#: actions/usergroups.php:93 actions/userrss.php:40 actions/userxrd.php:59
-#: actions/xrds.php:71 lib/command.php:509 lib/galleryaction.php:59
-#: lib/mailbox.php:80 lib/profileaction.php:77
+#: actions/apigrouplist.php:70 actions/apigroupprofileupdate.php:108
+#: actions/apistatusesupdate.php:230 actions/apisubscriptions.php:85
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:173
+#: actions/apitimelinehome.php:78 actions/apitimelinementions.php:77
+#: actions/apitimelineuser.php:79 actions/avatarbynickname.php:79
+#: actions/favoritesrss.php:72 actions/foaf.php:42 actions/foaf.php:61
+#: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116
+#: actions/otp.php:78 actions/remotesubscribe.php:144
+#: actions/remotesubscribe.php:153 actions/replies.php:73
+#: actions/repliesrss.php:38 actions/rsd.php:113 actions/showfavorites.php:106
+#: actions/userbyid.php:75 actions/usergroups.php:93 actions/userrss.php:40
+#: actions/userxrd.php:59 actions/xrds.php:71 lib/command.php:509
+#: lib/galleryaction.php:59 lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "没有这个用户。"
 
@@ -176,10 +180,9 @@ msgstr "%1$s 和好友，第%2$d页"
 #. TRANS: H1 text for page. %s is a user nickname.
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Timeline title for user and friends. %s is a user nickname.
-#. TRANS: Tooltop for personal group navigation menu option when logged in for viewing timeline of self and friends.
 #: actions/all.php:94 actions/all.php:191 actions/allrss.php:117
 #: actions/apitimelinefriends.php:207 actions/apitimelinehome.php:113
-#: lib/personalgroupnav.php:102
+#: lib/personalgroupnav.php:100
 #, php-format
 msgid "%s and friends"
 msgstr "%s 和好友们"
@@ -234,7 +237,7 @@ msgstr ""
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
 #. TRANS: Second sentence of empty message for anonymous users. %s is a user nickname.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:227
+#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:221
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -282,19 +285,20 @@ msgstr "%2$s上%1$s和好友们的更新！"
 #: actions/apifavoritecreate.php:98 actions/apifavoritedestroy.php:98
 #: actions/apifriendshipscreate.php:99 actions/apifriendshipsdestroy.php:99
 #: actions/apifriendshipsshow.php:124 actions/apigroupcreate.php:138
-#: actions/apigroupismember.php:115 actions/apigroupjoin.php:160
-#: actions/apigroupleave.php:145 actions/apigrouplist.php:134
+#: actions/apigroupismember.php:115 actions/apigroupjoin.php:151
+#: actions/apigroupleave.php:141 actions/apigrouplist.php:134
 #: actions/apigrouplistall.php:120 actions/apigroupmembership.php:105
+#: actions/apigroupprofileupdate.php:100 actions/apigroupprofileupdate.php:213
 #: actions/apigroupshow.php:114 actions/apihelptest.php:84
 #: actions/apistatusesdestroy.php:101 actions/apistatusesretweets.php:110
 #: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:139
 #: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
-#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:268
-#: actions/apitimelinegroup.php:147 actions/apitimelinehome.php:173
-#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:239
-#: actions/apitimelineretweetedtome.php:118
-#: actions/apitimelineretweetsofme.php:150 actions/apitimelinetag.php:159
-#: actions/apitimelineuser.php:206 actions/apiusershow.php:100
+#: actions/apitimelinefavorites.php:182 actions/apitimelinefriends.php:276
+#: actions/apitimelinegroup.php:148 actions/apitimelinehome.php:181
+#: actions/apitimelinementions.php:182 actions/apitimelinepublic.php:247
+#: actions/apitimelineretweetedtome.php:147
+#: actions/apitimelineretweetsofme.php:147 actions/apitimelinetag.php:165
+#: actions/apitimelineuser.php:217 actions/apiusershow.php:100
 msgid "API method not found."
 msgstr "API方法没有找到。"
 
@@ -309,8 +313,9 @@ msgstr "API方法没有找到。"
 #: actions/apifavoritecreate.php:88 actions/apifavoritedestroy.php:88
 #: actions/apifriendshipscreate.php:89 actions/apifriendshipsdestroy.php:89
 #: actions/apigroupcreate.php:102 actions/apigroupjoin.php:89
-#: actions/apigroupleave.php:89 actions/apimediaupload.php:66
-#: actions/apistatusesretweet.php:63 actions/apistatusesupdate.php:194
+#: actions/apigroupleave.php:89 actions/apigroupprofileupdate.php:92
+#: actions/apimediaupload.php:66 actions/apistatusesretweet.php:63
+#: actions/apistatusesupdate.php:194
 msgid "This method requires a POST."
 msgstr "此方法接受POST请求。"
 
@@ -323,21 +328,16 @@ msgstr ""
 "你必须指定一个名为'device'的参数，值可以是以下中的一个：sms, im, none。"
 
 #. TRANS: Server error displayed when a user's delivery device cannot be updated.
-#. TRANS: Server error displayed when a user update to the database fails in the contact address confirmation action.
 #. TRANS: Server error thrown on database error updating e-mail preferences.
 #. TRANS: Server error thrown on database error removing a registered e-mail address.
-#. TRANS: Server error thrown on database error updating Instant Messaging preferences.
-#. TRANS: Server error thrown on database error removing a registered Instant Messaging address.
-#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
 #. TRANS: Server error thrown when user profile settings could not be updated.
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
-#: actions/apiaccountupdatedeliverydevice.php:130
-#: actions/confirmaddress.php:118 actions/emailsettings.php:352
-#: actions/emailsettings.php:498 actions/imsettings.php:276
-#: actions/imsettings.php:432 actions/othersettings.php:186
-#: actions/profilesettings.php:322 actions/smssettings.php:301
-#: actions/smssettings.php:454
+#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
+#: actions/apiaccountupdatedeliverydevice.php:136
+#: actions/emailsettings.php:353 actions/emailsettings.php:499
+#: actions/profilesettings.php:323 actions/smssettings.php:300
+#: actions/smssettings.php:453 actions/urlsettings.php:211
 msgid "Could not update user."
 msgstr "无法更新用户。"
 
@@ -363,7 +363,7 @@ msgstr "用户没有个人信息。"
 
 #. TRANS: Server error displayed if a user profile could not be saved.
 #. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:418
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:419
 msgid "Could not save profile."
 msgstr "无法保存个人信息。"
 
@@ -375,7 +375,7 @@ msgstr "无法保存个人信息。"
 #: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
 #: actions/designadminpanel.php:120 actions/editapplication.php:121
 #: actions/newapplication.php:102 actions/newnotice.php:95
-#: lib/designsettings.php:298
+#: lib/designsettings.php:110
 #, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s byte) due to its "
@@ -395,8 +395,8 @@ msgstr[0] "服务器当前的设置无法处理这么多的 POST 数据（%s byt
 #: actions/apiaccountupdateprofilecolors.php:160
 #: actions/apiaccountupdateprofilecolors.php:171
 #: actions/groupdesignsettings.php:285 actions/groupdesignsettings.php:296
-#: actions/userdesignsettings.php:201 actions/userdesignsettings.php:211
-#: actions/userdesignsettings.php:253 actions/userdesignsettings.php:263
+#: actions/userdesignsettings.php:218 actions/userdesignsettings.php:228
+#: actions/userdesignsettings.php:270 actions/userdesignsettings.php:280
 msgid "Unable to save your design settings."
 msgstr "无法保存你的外观设置。"
 
@@ -404,7 +404,7 @@ msgstr "无法保存你的外观设置。"
 #. TRANS: Client error displayed when a database error occurs updating profile colours.
 #: actions/apiaccountupdateprofilebackgroundimage.php:191
 #: actions/apiaccountupdateprofilecolors.php:139
-#: actions/userdesignsettings.php:179
+#: actions/userdesignsettings.php:196
 msgid "Could not update your design."
 msgstr "无法更新你的外观。"
 
@@ -511,8 +511,7 @@ msgstr "未找到收件人。"
 
 #. TRANS: Client error displayed trying to direct message another user who's not a friend (403).
 #: actions/apidirectmessagenew.php:144
-#, fuzzy
-msgid "Can't send direct messages to users who aren't your friend."
+msgid "Cannot send direct messages to users who aren't your friend."
 msgstr "不能将直接邮件发送到用户的不是你的朋友。"
 
 #. TRANS: Client error displayed trying to direct message self (403).
@@ -593,9 +592,9 @@ msgstr "无法找到目标用户。"
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:156 actions/editgroup.php:191
-#: actions/newgroup.php:137 actions/profilesettings.php:273
-#: actions/register.php:214
+#: actions/apigroupcreate.php:156 actions/apigroupprofileupdate.php:255
+#: actions/editgroup.php:191 actions/newgroup.php:137
+#: actions/profilesettings.php:274 actions/register.php:199
 msgid "Nickname already in use. Try another one."
 msgstr "昵称已被使用，换一个吧。"
 
@@ -603,9 +602,9 @@ msgstr "昵称已被使用，换一个吧。"
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:164 actions/editgroup.php:195
-#: actions/newgroup.php:141 actions/profilesettings.php:243
-#: actions/register.php:216
+#: actions/apigroupcreate.php:164 actions/apigroupprofileupdate.php:259
+#: actions/editgroup.php:195 actions/newgroup.php:141
+#: actions/profilesettings.php:244 actions/register.php:201
 msgid "Not a valid nickname."
 msgstr "不是有效的昵称。"
 
@@ -615,10 +614,10 @@ msgstr "不是有效的昵称。"
 #. TRANS: Validation error shown when providing an invalid homepage URL in the "New application" form.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:181 actions/editapplication.php:235
-#: actions/editgroup.php:202 actions/newapplication.php:221
-#: actions/newgroup.php:148 actions/profilesettings.php:248
-#: actions/register.php:223
+#: actions/apigroupcreate.php:181 actions/apigroupprofileupdate.php:277
+#: actions/editapplication.php:235 actions/editgroup.php:202
+#: actions/newapplication.php:221 actions/newgroup.php:148
+#: actions/profilesettings.php:249 actions/register.php:208
 msgid "Homepage is not a valid URL."
 msgstr "主页的URL不正确。"
 
@@ -627,8 +626,8 @@ msgstr "主页的URL不正确。"
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:191 actions/editgroup.php:206
-#: actions/newgroup.php:152 actions/profilesettings.php:252
-#: actions/register.php:226
+#: actions/newgroup.php:152 actions/profilesettings.php:253
+#: actions/register.php:211
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "全名过长(不能超过 255 个字符)。"
 
@@ -654,8 +653,8 @@ msgstr[0] "D描述过长(不能超过%d 个字符)。"
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:215 actions/editgroup.php:218
-#: actions/newgroup.php:164 actions/profilesettings.php:265
-#: actions/register.php:235
+#: actions/newgroup.php:164 actions/profilesettings.php:266
+#: actions/register.php:220
 msgid "Location is too long (maximum 255 characters)."
 msgstr "位置过长(不能超过255个字符)。"
 
@@ -683,15 +682,16 @@ msgstr "无效的别名：“%s”。"
 #. TRANS: %s is the alias that is already in use.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error. %s is the already used alias.
-#: actions/apigroupcreate.php:264 actions/editgroup.php:246
-#: actions/newgroup.php:193
+#: actions/apigroupcreate.php:264 actions/apigroupprofileupdate.php:351
+#: actions/editgroup.php:246 actions/newgroup.php:193
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "%s这个别名已被使用，换一个吧。"
 
 #. TRANS: Client error displayed when trying to use an alias during group creation that is the same as the group's nickname.
 #. TRANS: Group edit form validation error.
-#: actions/apigroupcreate.php:278 actions/editgroup.php:253
+#: actions/apigroupcreate.php:278 actions/apigroupprofileupdate.php:359
+#: actions/editgroup.php:253
 msgid "Alias can't be the same as nickname."
 msgstr "别名不能和昵称相同。"
 
@@ -703,7 +703,8 @@ msgstr "别名不能和昵称相同。"
 #. TRANS: Client error displayed requesting most recent notices to a group for a non-existing group.
 #: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
 #: actions/apigroupleave.php:104 actions/apigroupmembership.php:71
-#: actions/apigroupshow.php:81 actions/apitimelinegroup.php:89
+#: actions/apigroupprofileupdate.php:113 actions/apigroupshow.php:81
+#: actions/apitimelinegroup.php:89
 msgid "Group not found."
 msgstr "小组未找到。"
 
@@ -721,13 +722,11 @@ msgstr "你已经是该小组成员。"
 msgid "You have been blocked from that group by the admin."
 msgstr "你已经被管理员从该小组中屏蔽。"
 
-#. TRANS: Server error displayed when joining a group fails.
-#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
 #. 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.
 #. TRANS: Message given having failed to add a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:362
+#: actions/apigroupjoin.php:136 actions/joingroup.php:139 lib/command.php:362
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "无法把用户%1$s添加到%2$s小组"
@@ -737,8 +736,6 @@ msgstr "无法把用户%1$s添加到%2$s小组"
 msgid "You are not a member of this group."
 msgstr "你不是该小组成员。"
 
-#. TRANS: Server error displayed when leaving a group fails.
-#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
 #. TRANS: Server error displayed when leaving a group failed in the database.
 #. TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
 #. TRANS: Message given having failed to remove a user from a group.
@@ -774,6 +771,61 @@ msgstr "%s 的小组"
 msgid "groups on %s"
 msgstr "在%s上的小组"
 
+#. TRANS: Client error displayed trying to edit a group while not being a group admin.
+#. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
+#. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
+#: actions/apigroupprofileupdate.php:118 actions/editgroup.php:110
+#: actions/editgroup.php:176 actions/groupdesignsettings.php:109
+#: actions/grouplogo.php:111
+msgid "You must be an admin to edit the group."
+msgstr "管理员才可以编辑小组。"
+
+#. TRANS: Server error displayed when editing a group fails.
+#: actions/apigroupprofileupdate.php:171 actions/editgroup.php:274
+msgid "Could not update group."
+msgstr "无法更新小组"
+
+#. TRANS: Server error displayed when group aliases could not be added.
+#. TRANS: Server exception thrown when creating group aliases failed.
+#: actions/apigroupprofileupdate.php:194 actions/editgroup.php:281
+#: classes/User_group.php:540
+msgid "Could not create aliases."
+msgstr "无法创建别名。"
+
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: actions/apigroupprofileupdate.php:249 lib/nickname.php:165
+msgid "Nickname must have only lowercase letters and numbers and no spaces."
+msgstr "昵称只能使用小写字母和数字且不能使用空格。"
+
+#: actions/apigroupprofileupdate.php:286
+#, fuzzy
+msgid "Full name is too long (max 255 chars)."
+msgstr "全名过长(不能超过 255 个字符)。"
+
+#: actions/apigroupprofileupdate.php:296
+#, fuzzy, php-format
+msgid "description is too long (max %d chars)."
+msgstr "D描述过长(不能超过%d 个字符)。"
+
+#: actions/apigroupprofileupdate.php:307
+#, fuzzy
+msgid "Location is too long (max 255 chars)."
+msgstr "位置过长(不能超过255个字符)。"
+
+#: actions/apigroupprofileupdate.php:326
+#, fuzzy, php-format
+msgid "Too many aliases! Maximum %d."
+msgstr "太多别名了！最多允许%d 个。"
+
+#. TRANS: Group edit form validation error.
+#. TRANS: Group create form validation error.
+#. TRANS: %s is the invalid alias.
+#: actions/apigroupprofileupdate.php:342 actions/editgroup.php:241
+#: actions/newgroup.php:188
+#, php-format
+msgid "Invalid alias: \"%s\""
+msgstr "无效的别名：“%s”。"
+
 #. TRANS: Client error displayed when uploading a media file has failed.
 #: actions/apimediaupload.php:101
 msgid "Upload failed."
@@ -804,21 +856,22 @@ msgstr "请求 token 已被授权了。"
 #. TRANS: Form validation error message.
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
+#. TRANS: Client error displayed when the session token is not okay.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
 #: actions/deletenotice.php:177 actions/disfavor.php:75
-#: actions/emailsettings.php:291 actions/favor.php:75 actions/geocode.php:55
+#: actions/emailsettings.php:292 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:65 actions/grouplogo.php:321
-#: actions/groupunblock.php:65 actions/imsettings.php:224
-#: actions/invite.php:60 actions/login.php:137 actions/makeadmin.php:66
-#: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
-#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
-#: actions/othersettings.php:155 actions/passwordsettings.php:138
-#: actions/profilesettings.php:217 actions/recoverpassword.php:383
-#: actions/register.php:172 actions/remotesubscribe.php:76
-#: actions/repeat.php:82 actions/smssettings.php:250 actions/subedit.php:40
-#: actions/subscribe.php:86 actions/tagother.php:166
-#: actions/unsubscribe.php:69 actions/userauthorization.php:52
-#: lib/designsettings.php:310
+#: actions/groupunblock.php:65 actions/imsettings.php:241
+#: actions/invite.php:60 actions/makeadmin.php:66 actions/newmessage.php:135
+#: actions/newnotice.php:105 actions/nudge.php:80
+#: actions/oauthappssettings.php:162 actions/oauthconnectionssettings.php:135
+#: actions/passwordsettings.php:137 actions/pluginenable.php:87
+#: actions/profilesettings.php:218 actions/recoverpassword.php:383
+#: actions/register.php:157 actions/remotesubscribe.php:76
+#: actions/repeat.php:82 actions/smssettings.php:249 actions/subedit.php:40
+#: actions/subscribe.php:87 actions/tagother.php:145
+#: actions/unsubscribe.php:69 actions/urlsettings.php:171
+#: actions/userauthorization.php:53 lib/designsettings.php:122
 msgid "There was a problem with your session token. Try again, please."
 msgstr "你的 session 出现了一个问题，请重试。"
 
@@ -846,10 +899,10 @@ msgstr "插入 oauth_token_association 时数据库出错。"
 #. TRANS: Unknown form validation error in design settings form.
 #: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
 #: actions/designadminpanel.php:100 actions/editapplication.php:144
-#: actions/emailsettings.php:310 actions/grouplogo.php:332
-#: actions/imsettings.php:239 actions/newapplication.php:124
-#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
-#: actions/smssettings.php:271 lib/designsettings.php:321
+#: actions/emailsettings.php:311 actions/grouplogo.php:332
+#: actions/imsettings.php:256 actions/newapplication.php:124
+#: actions/oauthconnectionssettings.php:144 actions/recoverpassword.php:46
+#: actions/smssettings.php:270 lib/designsettings.php:133
 msgid "Unexpected form submission."
 msgstr "未预料的表单提交。"
 
@@ -896,31 +949,26 @@ msgstr "帐号"
 
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Field label in form for profile settings.
-#. TRANS: Label for group nickname (dt). Text hidden by default.
-#. TRANS: DT for nick name in a profile.
-#: actions/apioauthauthorize.php:459 actions/login.php:252
-#: actions/profilesettings.php:106 actions/register.php:432
-#: actions/showgroup.php:243 actions/tagother.php:94
+#: actions/apioauthauthorize.php:459 actions/login.php:225
+#: actions/profilesettings.php:107 actions/register.php:411
 #: actions/userauthorization.php:145 lib/groupeditform.php:145
-#: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "昵称"
 
 #. TRANS: Field label on OAuth API authorisation form.
-#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:463 actions/login.php:255
-#: actions/register.php:436 lib/accountsettingsaction.php:120
+#: actions/apioauthauthorize.php:463 actions/login.php:228
+#: actions/register.php:415 lib/settingsnav.php:87
 msgid "Password"
 msgstr "密码"
 
 #. TRANS: Button text that when clicked will cancel the process of allowing access to an account
 #. TRANS: by an external application.
 #. TRANS: Button label to cancel an e-mail address confirmation procedure.
-#. TRANS: Button label to cancel an Instant Messaging address confirmation procedure.
+#. TRANS: Button label to cancel an IM address confirmation procedure.
 #. TRANS: Button label to cancel a SMS address confirmation procedure.
 #. TRANS: Button label in the "Edit application" form.
-#: actions/apioauthauthorize.php:478 actions/emailsettings.php:124
-#: actions/imsettings.php:127 actions/smssettings.php:133
+#: actions/apioauthauthorize.php:478 actions/emailsettings.php:125
+#: actions/imsettings.php:136 actions/smssettings.php:132
 #: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Cancel"
@@ -1027,8 +1075,8 @@ msgstr "HTTP 方法不支持。"
 #. TRANS: Exception thrown requesting an unsupported notice output format.
 #. TRANS: %s is the requested output format.
 #: actions/apistatusesshow.php:144
-#, fuzzy, php-format
-msgid "Unsupported format: %s"
+#, php-format
+msgid "Unsupported format: %s."
 msgstr "不支持的格式： %s。"
 
 #. TRANS: Client error displayed requesting a deleted status.
@@ -1106,13 +1154,6 @@ msgstr "%1$s / 来自 %2$s 的收藏"
 msgid "%1$s updates favorited by %2$s / %3$s."
 msgstr "%1$s上被%2$s（%3$s）收藏的消息。"
 
-#. TRANS: Server error displayed when generating an Atom feed fails.
-#. TRANS: %s is the error.
-#: actions/apitimelinegroup.php:134
-#, php-format
-msgid "Could not generate feed for group - %s"
-msgstr "无法生成小组的 feed - %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.
 #: actions/apitimelinementions.php:115
@@ -1129,13 +1170,14 @@ msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr " %1$s 条消息回复给来自 %2$s 的消息 / %3$s。"
 
 #. TRANS: Title for site timeline. %s is the StatusNet sitename.
+#. TRANS: Public RSS feed title. %s is the StatusNet site name.
 #: actions/apitimelinepublic.php:193 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "%s 公共时间线"
 
 #. TRANS: Subtitle for site timeline. %s is the StatusNet sitename.
-#: actions/apitimelinepublic.php:199 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:199
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "%s条来自所有人的消息！"
@@ -1146,21 +1188,33 @@ msgid "Unimplemented."
 msgstr "未生效。"
 
 #. TRANS: Title for Atom feed "repeated to me". %s is the user nickname.
-#: actions/apitimelineretweetedtome.php:108
+#: actions/apitimelineretweetedtome.php:96
 #, php-format
 msgid "Repeated to %s"
 msgstr "转发给%s"
 
+#: actions/apitimelineretweetedtome.php:98
+#, fuzzy, php-format
+msgid "%1$s notices that were to repeated to %2$s / %3$s."
+msgstr " %1$s 条消息回复给来自 %2$s 的消息 / %3$s。"
+
 #. TRANS: Title of list of repeated notices of the logged in user.
 #. TRANS: %s is the nickname of the logged in user.
-#: actions/apitimelineretweetsofme.php:112
+#: actions/apitimelineretweetsofme.php:98
 #, php-format
 msgid "Repeats of %s"
 msgstr "%s 的转发"
 
+#: actions/apitimelineretweetsofme.php:104
+#, fuzzy, php-format
+msgid "%1$s notices that %2$s / %3$s has repeated."
+msgstr "%1$s 收藏了消息 %2$s 。"
+
 #. TRANS: Title for timeline with lastest notices with a given tag.
 #. TRANS: %s is the tag.
-#: actions/apitimelinetag.php:101 actions/tag.php:67
+#. TRANS: Title for first page of notices with tags.
+#. TRANS: %s is the tag.
+#: actions/apitimelinetag.php:101 actions/tag.php:69
 #, php-format
 msgid "Notices tagged with %s"
 msgstr "带 %s 标签的消息"
@@ -1173,53 +1227,54 @@ msgid "Updates tagged with %1$s on %2$s!"
 msgstr "%2$s 上有 %1$s 标签的消息！"
 
 #. TRANS: Client error displayed trying to add a notice to another user's timeline.
-#: actions/apitimelineuser.php:297
+#: actions/apitimelineuser.php:308
 msgid "Only the user can add to their own timeline."
 msgstr "只有该用户才能添加到他们的时间线。"
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:304
+#: actions/apitimelineuser.php:315
 msgid "Only accept AtomPub for Atom feeds."
 msgstr "只接受 AtomPub 原子饲料。"
 
 #. TRANS: Client error displayed attempting to post an empty API notice.
-#: actions/apitimelineuser.php:311
+#: actions/apitimelineuser.php:322
 msgid "Atom post must not be empty."
 msgstr "原子开机自检不能为空。"
 
 #. TRANS: Client error displayed attempting to post an API that is not well-formed XML.
-#: actions/apitimelineuser.php:317
+#: actions/apitimelineuser.php:328
 msgid "Atom post must be well-formed XML."
 msgstr "原子后必须是格式良好 XML。"
 
 #. TRANS: Client error displayed when not using an Atom entry.
-#: actions/apitimelineuser.php:323 actions/atompubfavoritefeed.php:228
+#: actions/apitimelineuser.php:334 actions/atompubfavoritefeed.php:228
 #: actions/atompubmembershipfeed.php:230
 #: actions/atompubsubscriptionfeed.php:236
 msgid "Atom post must be an Atom entry."
 msgstr "原子后必须是一个原子的条目。"
 
 #. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
-#: actions/apitimelineuser.php:335
+#: actions/apitimelineuser.php:345
 msgid "Can only handle POST activities."
 msgstr "只能处理开机自检活动。"
 
 #. TRANS: Client error displayed when using an unsupported activity object type.
 #. TRANS: %s is the unsupported activity object type.
-#: actions/apitimelineuser.php:346
+#: actions/apitimelineuser.php:356
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr "无法处理活动对象类型 %s。"
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
 #. TRANS: %d is the notice ID (number).
-#: actions/apitimelineuser.php:380
+#: actions/apitimelineuser.php:390
 #, php-format
 msgid "No content for notice %d."
 msgstr "没有通知 %d 的内容。"
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:408
+#. TRANS: %s is the notice URI.
+#: actions/apitimelineuser.php:419
 #, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "已存在使用 URI \"%s\" 的消息了。"
@@ -1236,9 +1291,10 @@ msgstr "API方法没有找到。"
 
 #. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
 #. TRANS: Client exception.
+#. TRANS: Client error displayed trying to subscribe to a non-existing profile.
 #: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
 #: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
-#: actions/subscribe.php:107
+#: actions/subscribe.php:110
 msgid "No such profile."
 msgstr "没有这个文件。"
 
@@ -1373,7 +1429,7 @@ msgid "Not a member."
 msgstr "不是会员。"
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
-#: actions/atompubshowmembership.php:151
+#: actions/atompubshowmembership.php:150
 msgid "Cannot delete someone else's membership."
 msgstr "不能删除其他人的成员资格。"
 
@@ -1460,10 +1516,7 @@ msgid "Invalid size."
 msgstr "大小不正确。"
 
 #. TRANS: Title for avatar upload page.
-#. TRANS: Label for group avatar (dt). Text hidden by default.
-#. TRANS: Link description in user account settings menu.
-#: actions/avatarsettings.php:66 actions/showgroup.php:227
-#: lib/accountsettingsaction.php:113
+#: actions/avatarsettings.php:66 lib/settingsnav.php:82
 msgid "Avatar"
 msgstr "头像"
 
@@ -1476,9 +1529,11 @@ msgstr "你可以上传你的个人头像。文件大小限制在%s以下。"
 
 #. TRANS: Server error displayed in avatar upload page when no matching profile can be found for a user.
 #. TRANS: Server error displayed coming across a request from a user without a profile.
+#. TRANS: Server error displayed when trying to authorise a remote subscription request
+#. TRANS: while the user has no profile.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
 #: actions/grouplogo.php:184 actions/remotesubscribe.php:190
-#: actions/userauthorization.php:72 actions/userrss.php:108
+#: actions/userauthorization.php:75 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr "用户没有相应个人信息。"
 
@@ -1533,10 +1588,9 @@ msgstr "剪裁"
 msgid "No file uploaded."
 msgstr "没有文件被上传。"
 
-#. TRANS: Avatar upload form unstruction after uploading a file.
+#. TRANS: Avatar upload form instruction after uploading a file.
 #: actions/avatarsettings.php:345
-#, fuzzy
-msgid "Pick a square area of the image to be your avatar"
+msgid "Pick a square area of the image to be your avatar."
 msgstr "选择一个方形的区域的图像为您的虚拟形象。"
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
@@ -1562,7 +1616,7 @@ msgstr "头像已删除。"
 
 #. TRANS: Title for backup account page.
 #. TRANS: Option in profile settings to create a backup of the account of the currently logged in user.
-#: actions/backupaccount.php:61 actions/profilesettings.php:467
+#: actions/backupaccount.php:61 actions/profilesettings.php:468
 msgid "Backup account"
 msgstr "备份的帐户"
 
@@ -1597,8 +1651,7 @@ msgstr "备份"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
 #: actions/backupaccount.php:254
-#, fuzzy
-msgid "Backup your account"
+msgid "Backup your account."
 msgstr "备份您的帐户。"
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
@@ -1638,8 +1691,7 @@ msgstr "否"
 
 #. TRANS: Submit button title for 'No' when blocking a user.
 #: actions/block.php:158
-#, fuzzy
-msgid "Do not block this user"
+msgid "Do not block this user."
 msgstr "不要屏蔽这个用户"
 
 #. TRANS: Button label on the user block form.
@@ -1656,9 +1708,8 @@ msgid "Yes"
 msgstr "是"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#. TRANS: Description of the form to block a user.
-#: actions/block.php:165 lib/blockform.php:79
-msgid "Block this user"
+#: actions/block.php:165
+msgid "Block this user."
 msgstr "屏蔽这个用户"
 
 #. TRANS: Server error displayed when blocking a user fails.
@@ -1724,31 +1775,47 @@ msgstr "未找到确认码。"
 msgid "That confirmation code is not for you!"
 msgstr "此确认码不是你的！"
 
-#. TRANS: Server error for a unknow address type %s, which can be 'email', 'jabber', or 'sms'.
-#: actions/confirmaddress.php:92
-#, php-format
-msgid "Unrecognized address type %s."
+#. TRANS: Server error for an unknown address type, which can be 'email', 'sms', or the name of an IM network (such as 'xmpp' or 'aim')
+#: actions/confirmaddress.php:94
+#, fuzzy, php-format
+msgid "Unrecognized address type %s"
 msgstr "不可识别的地址类型%s。"
 
 #. TRANS: Client error for an already confirmed email/jabber/sms address.
-#: actions/confirmaddress.php:97
+#: actions/confirmaddress.php:103 actions/confirmaddress.php:136
 msgid "That address has already been confirmed."
 msgstr "此地址已被确认过了。"
 
+#: actions/confirmaddress.php:121 actions/imsettings.php:444
+#: actions/userdesignsettings.php:306
+#, fuzzy
+msgid "Couldn't update user."
+msgstr "无法更新用户。"
+
+#: actions/confirmaddress.php:144
+#, fuzzy
+msgid "Couldn't update user im preferences."
+msgstr "无法更新用户记录。"
+
+#: actions/confirmaddress.php:156
+#, fuzzy
+msgid "Couldn't insert user im preferences."
+msgstr "无法添加新的关注。"
+
 #. TRANS: Server error displayed when an address confirmation code deletion from the
 #. TRANS: database fails in the contact address confirmation action.
-#: actions/confirmaddress.php:132
+#: actions/confirmaddress.php:169
 msgid "Could not delete address confirmation."
 msgstr "无法删除地址确认码。"
 
 #. TRANS: Title for the contact address confirmation action.
-#: actions/confirmaddress.php:150
+#: actions/confirmaddress.php:185
 msgid "Confirm address"
 msgstr "确认地址"
 
 #. TRANS: Success message for the contact address confirmation action.
 #. TRANS: %s can be 'email', 'jabber', or 'sms'.
-#: actions/confirmaddress.php:166
+#: actions/confirmaddress.php:200
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "你账户的地址 \"%s\" 已被确认。"
@@ -1762,6 +1829,7 @@ msgstr "对话"
 #. TRANS: Label for user statistics.
 #: actions/conversation.php:149 lib/noticelist.php:87
 #: lib/profileaction.php:246 lib/searchgroupnav.php:82
+#: lib/threadednoticelist.php:66
 msgid "Notices"
 msgstr "消息"
 
@@ -1794,7 +1862,7 @@ msgstr "删除的帐户。"
 
 #. TRANS: Page title for page on which a user account can be deleted.
 #. TRANS: Option in profile settings to delete the account of the currently logged in user.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:475
+#: actions/deleteaccount.php:228 actions/profilesettings.php:476
 msgid "Delete account"
 msgstr "删除帐户"
 
@@ -1817,7 +1885,7 @@ msgstr "强烈建议您在删除前 <a href=\"%s\">备份您的数据</a>。"
 #. TRANS: Field label for delete account confirmation entry.
 #. TRANS: Field label for password reset form where the password has to be typed again.
 #: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:262 actions/register.php:440
+#: actions/recoverpassword.php:262 actions/register.php:419
 msgid "Confirm"
 msgstr "密码确认"
 
@@ -1846,14 +1914,14 @@ msgstr "未找到应用。"
 #. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
 #: actions/deleteapplication.php:79 actions/editapplication.php:78
-#: actions/showapplication.php:94
+#: actions/showapplication.php:90
 msgid "You are not the owner of this application."
 msgstr "你不是该应用的拥有者。"
 
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
-#: actions/newapplication.php:112 actions/showapplication.php:118
-#: lib/action.php:1425
+#: actions/newapplication.php:112 actions/showapplication.php:113
+#: lib/action.php:1391
 msgid "There was a problem with your session token."
 msgstr "你的 session token 出现了问题。"
 
@@ -1875,14 +1943,12 @@ msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting an application.
 #: actions/deleteapplication.php:161
-#, fuzzy
-msgid "Do not delete this application"
+msgid "Do not delete this application."
 msgstr "不要删除此应用程序。"
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
 #: actions/deleteapplication.php:167
-#, fuzzy
-msgid "Delete this application"
+msgid "Delete this application."
 msgstr "删除此应用程序。"
 
 #. TRANS: Client error when trying to delete group while not logged in.
@@ -1935,14 +2001,12 @@ msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting a group.
 #: actions/deletegroup.php:224
-#, fuzzy
-msgid "Do not delete this group"
+msgid "Do not delete this group."
 msgstr "不要删除此组。"
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
 #: actions/deletegroup.php:231
-#, fuzzy
-msgid "Delete this group"
+msgid "Delete this group."
 msgstr "删除此组。"
 
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
@@ -1950,14 +2014,16 @@ msgstr "删除此组。"
 #. TRANS: Client error displayed when trying to mark a notice as favorite without being logged in.
 #. TRANS: Client error displayed trying to block a user from a group while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
+#. TRANS: Client error displayed trying to log out when not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
+#. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
 #. TRANS: Client error displayed when trying to change user options while not logged in.
 #: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
-#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:69
+#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:70
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
-#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
-#: actions/tagother.php:33 actions/unsubscribe.php:52
+#: actions/nudge.php:63 actions/pluginenable.php:97 actions/subedit.php:33
+#: actions/subscribe.php:98 actions/tagother.php:33 actions/unsubscribe.php:52
 #: lib/adminpanelaction.php:71 lib/profileformaction.php:63
 #: lib/settingsaction.php:72
 msgid "Not logged in."
@@ -1983,14 +2049,13 @@ msgstr "你确定要删除这条消息吗？"
 
 #. TRANS: Submit button title for 'No' when deleting a notice.
 #: actions/deletenotice.php:159
-#, fuzzy
-msgid "Do not delete this notice"
+msgid "Do not delete this notice."
 msgstr "不要删除此通知。"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:166 lib/noticelist.php:673
-msgid "Delete this notice"
-msgstr "删除"
+#: actions/deletenotice.php:166
+msgid "Delete this notice."
+msgstr "删除此通知。"
 
 #. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
 #: actions/deleteuser.php:66
@@ -2023,19 +2088,16 @@ msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting a user.
 #: actions/deleteuser.php:158
-#, fuzzy
-msgid "Do not delete this user"
+msgid "Do not delete this user."
 msgstr "请不要删除该用户。"
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
-#. TRANS: Description of form for deleting a user.
-#: actions/deleteuser.php:165 lib/deleteuserform.php:75
-msgid "Delete this user"
-msgstr "删除这个用户"
+#: actions/deleteuser.php:165
+msgid "Delete this user."
+msgstr "删除此用户。"
 
 #. TRANS: Message used as title for design settings for the site.
-#. TRANS: Link description in user account settings menu.
-#: actions/designadminpanel.php:60 lib/accountsettingsaction.php:134
+#: actions/designadminpanel.php:60 lib/settingsnav.php:97
 msgid "Design"
 msgstr "外观"
 
@@ -2102,8 +2164,7 @@ msgid "You can upload a custom StatusNet theme as a .ZIP archive."
 msgstr "你可以上传一个 .ZIP 压缩文件作为一个自定义的 StatusNet 主题"
 
 #. TRANS: Fieldset legend for theme background image.
-#. TRANS: Fieldset legend on profile design page.
-#: actions/designadminpanel.php:515 lib/designsettings.php:98
+#: actions/designadminpanel.php:515
 msgid "Change background image"
 msgstr "更换背景图像"
 
@@ -2111,7 +2172,7 @@ msgstr "更换背景图像"
 #. TRANS: Field label for background color selector.
 #. TRANS: Label on profile design page for setting a profile page background colour.
 #: actions/designadminpanel.php:525 actions/designadminpanel.php:609
-#: lib/designsettings.php:183
+#: lib/designform.php:238
 msgid "Background"
 msgstr "背景"
 
@@ -2136,13 +2197,13 @@ msgstr "关闭"
 #. TRANS: Form guide for turning background image on or off on theme designer page.
 #. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
 #. TRANS: use of the uploaded profile image.
-#: actions/designadminpanel.php:577 lib/designsettings.php:159
+#: actions/designadminpanel.php:577 lib/designform.php:214
 msgid "Turn background image on or off."
 msgstr "打开或关闭背景图片"
 
 #. TRANS: Checkbox label to title background image on theme designer page.
 #. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-#: actions/designadminpanel.php:583 lib/designsettings.php:165
+#: actions/designadminpanel.php:583 lib/designform.php:220
 msgid "Tile background image"
 msgstr "平铺背景图片"
 
@@ -2153,25 +2214,25 @@ msgstr "更改颜色"
 
 #. TRANS: Field label for content color selector.
 #. TRANS: Label on profile design page for setting a profile page content colour.
-#: actions/designadminpanel.php:623 lib/designsettings.php:197
+#: actions/designadminpanel.php:623 lib/designform.php:252
 msgid "Content"
 msgstr "内容"
 
 #. TRANS: Field label for sidebar color selector.
 #. TRANS: Label on profile design page for setting a profile page sidebar colour.
-#: actions/designadminpanel.php:637 lib/designsettings.php:211
+#: actions/designadminpanel.php:637 lib/designform.php:266
 msgid "Sidebar"
 msgstr "边栏"
 
 #. TRANS: Field label for text color selector.
 #. TRANS: Label on profile design page for setting a profile page text colour.
-#: actions/designadminpanel.php:651 lib/designsettings.php:225
+#: actions/designadminpanel.php:651 lib/designform.php:280
 msgid "Text"
 msgstr "文字"
 
 #. TRANS: Field label for link color selector.
 #. TRANS: Label on profile design page for setting a profile page links colour.
-#: actions/designadminpanel.php:665 lib/designsettings.php:239
+#: actions/designadminpanel.php:665 lib/designform.php:294
 msgid "Links"
 msgstr "链接"
 
@@ -2192,22 +2253,19 @@ msgid "Use defaults"
 msgstr "使用默认值"
 
 #. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: actions/designadminpanel.php:720 lib/designsettings.php:259
-msgid "Restore default designs"
-msgstr "恢复默认外观"
+#: actions/designadminpanel.php:720
+msgid "Restore default designs."
+msgstr "还原默认设计。"
 
 #. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: actions/designadminpanel.php:728 lib/designsettings.php:267
-msgid "Reset back to default"
-msgstr "重置到默认"
+#: actions/designadminpanel.php:728
+msgid "Reset back to default."
+msgstr "重置回默认值。"
 
 #. TRANS: Title for button for saving theme settings.
-#. TRANS: Title for button on profile design page to save settings.
-#: actions/designadminpanel.php:736 lib/designsettings.php:272
-msgid "Save design"
-msgstr "保存外观"
+#: actions/designadminpanel.php:736
+msgid "Save design."
+msgstr "保存设计。"
 
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
 #: actions/disfavor.php:83
@@ -2238,7 +2296,7 @@ msgid "You must be logged in to edit an application."
 msgstr "你必须登录后才能编辑应用。"
 
 #. TRANS: Client error displayed trying to edit an application that does not exist.
-#: actions/editapplication.php:83 actions/showapplication.php:87
+#: actions/editapplication.php:83 actions/showapplication.php:83
 msgid "No such application."
 msgstr "没有这个应用。"
 
@@ -2329,80 +2387,53 @@ msgstr "编辑 %s 小组"
 msgid "You must be logged in to create a group."
 msgstr "你必须登录才能创建小组。"
 
-#. TRANS: Client error displayed trying to edit a group while not being a group admin.
-#. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
-#. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
-#: actions/editgroup.php:110 actions/editgroup.php:176
-#: actions/groupdesignsettings.php:109 actions/grouplogo.php:111
-msgid "You must be an admin to edit the group."
-msgstr "管理员才可以编辑小组。"
-
 #. TRANS: Form instructions for group edit form.
 #: actions/editgroup.php:161
 msgid "Use this form to edit the group."
 msgstr "通过这个表单来编辑小组"
 
-#. TRANS: Group edit form validation error.
-#. TRANS: Group create form validation error.
-#. TRANS: %s is the invalid alias.
-#: actions/editgroup.php:241 actions/newgroup.php:188
-#, php-format
-msgid "Invalid alias: \"%s\""
-msgstr "无效的别名：“%s”。"
-
-#. TRANS: Server error displayed when editing a group fails.
-#: actions/editgroup.php:274
-msgid "Could not update group."
-msgstr "无法更新小组"
-
-#. TRANS: Server error displayed when group aliases could not be added.
-#. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/editgroup.php:281 classes/User_group.php:540
-msgid "Could not create aliases."
-msgstr "无法创建别名。"
-
 #. TRANS: Group edit form success message.
 #: actions/editgroup.php:301
 msgid "Options saved."
 msgstr "选项已保存。"
 
 #. TRANS: Title for e-mail settings.
-#: actions/emailsettings.php:59
+#: actions/emailsettings.php:60
 msgid "Email settings"
 msgstr "Email 设置"
 
 #. TRANS: E-mail settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/emailsettings.php:73
+#: actions/emailsettings.php:74
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 msgstr "设置你如何接受来自 %%site.name%% 的邮件。"
 
 #. TRANS: Form legend for e-mail settings form.
 #. TRANS: Field label for e-mail address input in e-mail settings form.
-#: actions/emailsettings.php:103 actions/emailsettings.php:129
+#: actions/emailsettings.php:104 actions/emailsettings.php:130
 msgid "Email address"
 msgstr "电邮地址"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:109
+#: actions/emailsettings.php:110
 msgid "Current confirmed email address."
 msgstr "当前确认的电子邮件。"
 
 #. TRANS: Button label to remove a confirmed e-mail address.
 #. TRANS: Button label for removing a set sender e-mail address to post notices from.
-#. TRANS: Button label to remove a confirmed Instant Messaging address.
+#. TRANS: Button label to remove a confirmed IM address.
 #. TRANS: Button label to remove a confirmed SMS address.
 #. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
-#: actions/emailsettings.php:112 actions/emailsettings.php:179
-#: actions/imsettings.php:112 actions/smssettings.php:120
-#: actions/smssettings.php:176
+#: actions/emailsettings.php:113 actions/emailsettings.php:180
+#: actions/imsettings.php:119 actions/smssettings.php:119
+#: actions/smssettings.php:175
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "移除"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:119
+#: actions/emailsettings.php:120
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -2415,44 +2446,44 @@ msgstr ""
 #. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
 #. TRANS: Any other domain may be owned by a legitimate person or
 #. TRANS: organization.
-#: actions/emailsettings.php:136
+#: actions/emailsettings.php:137
 msgid "Email address, like \"UserName@example.org\""
 msgstr "电子邮件，类似 \"UserName@example.org\""
 
 #. TRANS: Button label for adding an e-mail address in e-mail settings form.
-#. TRANS: Button label for adding an Instant Messaging address in Instant Messaging settings form.
+#. TRANS: Button label for adding an IM address in IM settings form.
 #. TRANS: Button label for adding a SMS phone number in SMS settings form.
-#: actions/emailsettings.php:140 actions/imsettings.php:147
-#: actions/smssettings.php:158
+#: actions/emailsettings.php:141 actions/imsettings.php:147
+#: actions/smssettings.php:157
 msgctxt "BUTTON"
 msgid "Add"
 msgstr "添加"
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:148 actions/smssettings.php:167
+#: actions/emailsettings.php:149 actions/smssettings.php:166
 msgid "Incoming email"
 msgstr "接收用 email"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:154
+#: actions/emailsettings.php:155
 msgid "I want to post notices by email."
 msgstr "我希望通过邮件发布信息。"
 
 #. TRANS: Form instructions for incoming e-mail form in e-mail settings.
 #. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
-#: actions/emailsettings.php:176 actions/smssettings.php:174
+#: actions/emailsettings.php:177 actions/smssettings.php:173
 msgid "Send email to this address to post new notices."
 msgstr "通过发送电子邮件到这个地址来发布新的消息。"
 
 #. TRANS: Instructions for incoming e-mail address input form, when an address has already been assigned.
 #. TRANS: Instructions for incoming SMS e-mail address input form.
-#: actions/emailsettings.php:185 actions/smssettings.php:182
+#: actions/emailsettings.php:186 actions/smssettings.php:181
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr "生成新的电子邮件地址用于发布消息；取消旧的。"
 
 #. TRANS: Instructions for incoming e-mail address input form.
-#: actions/emailsettings.php:189
+#: actions/emailsettings.php:190
 msgid ""
 "To send notices via email, we need to create a unique email address for you "
 "on this server:"
@@ -2461,87 +2492,87 @@ msgstr ""
 
 #. TRANS: Button label for adding an e-mail address to send notices from.
 #. TRANS: Button label for adding an SMS e-mail address to send notices from.
-#: actions/emailsettings.php:195 actions/smssettings.php:185
+#: actions/emailsettings.php:196 actions/smssettings.php:184
 msgctxt "BUTTON"
 msgid "New"
 msgstr "新增"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:204
+#: actions/emailsettings.php:205
 msgid "Email preferences"
 msgstr "Email 偏好"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:212
+#: actions/emailsettings.php:213
 msgid "Send me notices of new subscriptions through email."
 msgstr "将新的关注通过电子邮件发送给我。"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:218
+#: actions/emailsettings.php:219
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr "有人收藏我的消息时，发邮件通知我。"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:225
+#: actions/emailsettings.php:226
 msgid "Send me email when someone sends me a private message."
 msgstr "有人给我发送私信时，发邮件通知我。"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:231
+#: actions/emailsettings.php:232
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr "有人给我发送 @ 消息时，发邮件通知我。"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:237
+#: actions/emailsettings.php:238
 msgid "Allow friends to nudge me and send me an email."
 msgstr "允许朋友们呼叫我并给我发送邮件。"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:243
+#: actions/emailsettings.php:244
 msgid "Publish a MicroID for my email address."
 msgstr "公开电子邮件的 MicroID。"
 
 #. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:361
+#: actions/emailsettings.php:362
 msgid "Email preferences saved."
 msgstr "Email 偏好已保存。"
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:380
+#: actions/emailsettings.php:381
 msgid "No email address."
 msgstr "没有电子邮件地址。"
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:388
+#: actions/emailsettings.php:389
 msgid "Cannot normalize that email address."
 msgstr "无法识别此电子邮件。"
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:393 actions/register.php:212
+#: actions/emailsettings.php:394 actions/register.php:197
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "不是有效的电子邮件。"
 
 #. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:397
+#: actions/emailsettings.php:398
 msgid "That is already your email address."
 msgstr "你已登记此电子邮件。"
 
 #. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:401
+#: actions/emailsettings.php:402
 msgid "That email address already belongs to another user."
 msgstr "此电子邮件属于其他用户。"
 
 #. TRANS: Server error thrown on database error adding e-mail confirmation code.
 #. TRANS: Server error thrown on database error adding Instant Messaging confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:418 actions/imsettings.php:343
-#: actions/smssettings.php:365
+#: actions/emailsettings.php:419 actions/imsettings.php:362
+#: actions/smssettings.php:364
 msgid "Could not insert confirmation code."
 msgstr "无法插入确认码。"
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:425
+#: actions/emailsettings.php:426
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
@@ -2552,57 +2583,60 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling Instant Messaging address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:445 actions/imsettings.php:377
-#: actions/smssettings.php:399
+#: actions/emailsettings.php:446 actions/imsettings.php:391
+#: actions/smssettings.php:398
 msgid "No pending confirmation to cancel."
 msgstr "没有可以取消的确认。"
 
 #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:450
+#: actions/emailsettings.php:451
 msgid "That is the wrong email address."
 msgstr "这是错误的电子邮件地址。"
 
 #. TRANS: Server error thrown on database error canceling e-mail address confirmation.
 #. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
-#: actions/emailsettings.php:459 actions/smssettings.php:413
+#: actions/emailsettings.php:460 actions/smssettings.php:412
 msgid "Could not delete email confirmation."
 msgstr "无法删除电子邮件确认。"
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:464
+#: actions/emailsettings.php:465
 msgid "Email confirmation cancelled."
 msgstr "Email 确认已取消。"
 
 #. TRANS: Message given trying to remove an e-mail address that is not
 #. TRANS: registered for the active user.
-#: actions/emailsettings.php:483
+#: actions/emailsettings.php:484
 msgid "That is not your email address."
 msgstr "这个不是你的电子邮件地址。"
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:504
+#: actions/emailsettings.php:505
 msgid "The email address was removed."
 msgstr "电子邮件地址已被删除。"
 
 #. TRANS: Form validation error displayed when trying to remove an incoming e-mail address while no address has been set.
-#: actions/emailsettings.php:518 actions/smssettings.php:555
+#: actions/emailsettings.php:519 actions/smssettings.php:554
 msgid "No incoming email address."
 msgstr "没有发布用的电子邮件地址。"
 
 #. TRANS: Server error thrown on database error removing incoming e-mail address.
 #. TRANS: Server error thrown on database error adding incoming e-mail address.
-#: actions/emailsettings.php:530 actions/emailsettings.php:554
-#: actions/smssettings.php:565 actions/smssettings.php:588
+#. TRANS: Server error displayed when the user could not be updated in SMS settings.
+#: actions/emailsettings.php:531 actions/emailsettings.php:555
+#: actions/smssettings.php:565 actions/smssettings.php:590
 msgid "Could not update user record."
 msgstr "无法更新用户记录。"
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:534 actions/smssettings.php:568
+#. TRANS: Confirmation text after updating SMS settings.
+#: actions/emailsettings.php:535 actions/smssettings.php:569
 msgid "Incoming email address removed."
 msgstr "发布用的电子邮件被删除。"
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:558 actions/smssettings.php:591
+#. TRANS: Confirmation text after updating SMS settings.
+#: actions/emailsettings.php:559 actions/smssettings.php:594
 msgid "New incoming email address added."
 msgstr "已添加新的发布用的电子邮件地址。"
 
@@ -2613,9 +2647,8 @@ msgstr "已收藏过此消息！"
 
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
 #: actions/favor.php:95
-#, fuzzy
-msgid "Disfavor favorite"
-msgstr "不赞成的最爱"
+msgid "Disfavor favorite."
+msgstr "不是赞成的最爱。"
 
 #. TRANS: Page title for first page of favorited notices.
 #. TRANS: Title for favourited notices section.
@@ -2661,9 +2694,8 @@ msgstr "现在就[注册一个账户](%%action.register%%)并成为第一个添
 #. TRANS: %s is a user's nickname.
 #. TRANS: Title for first page of favourite notices of a user.
 #. TRANS: %s is the user for whom the favourite notices are displayed.
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing own favourited notices.
 #: actions/favoritesrss.php:111 actions/showfavorites.php:76
-#: lib/personalgroupnav.php:122
+#: lib/personalgroupnav.php:110
 #, php-format
 msgid "%s's favorite notices"
 msgstr "%s收藏的消息"
@@ -2848,14 +2880,12 @@ msgstr ""
 
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
 #: actions/groupblock.php:191
-#, fuzzy
-msgid "Do not block this user from this group"
+msgid "Do not block this user from this group."
 msgstr "不要在此小组屏蔽此用户。"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
 #: actions/groupblock.php:198
-#, fuzzy
-msgid "Block this user from this group"
+msgid "Block this user from this group."
 msgstr "阻止此此组中的用户。"
 
 #. TRANS: Server error displayed when trying to block a user from a group fails because of an application error.
@@ -2864,6 +2894,7 @@ msgid "Database error blocking user from group."
 msgstr "在小组中屏蔽用户时数据库发生错误。"
 
 #. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
+#. TRANS: Client error displayed trying to find a user by ID without providing an ID.
 #: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr "没有 ID。"
@@ -2891,7 +2922,7 @@ msgid "Unable to update your design settings."
 msgstr "无法更新你的外观设置。"
 
 #. TRANS: Form text to confirm saved group design settings.
-#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:222
+#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:239
 msgid "Design preferences saved."
 msgstr "外观偏好已保存。"
 
@@ -2954,7 +2985,7 @@ msgid "A list of the users in this group."
 msgstr "该小组的成员列表。"
 
 #. TRANS: Indicator in group members list that this user is a group administrator.
-#: actions/groupmembers.php:190
+#: actions/groupmembers.php:190 lib/action.php:581
 msgid "Admin"
 msgstr "管理"
 
@@ -3045,8 +3076,10 @@ msgid "Group search"
 msgstr "小组搜索"
 
 #. TRANS: Text on page where groups can be searched if no results were found for a query.
-#: actions/groupsearch.php:82 actions/noticesearch.php:117
-#: actions/peoplesearch.php:83
+#. TRANS: Text for notice search results is the query had no results.
+#. TRANS: Message on the "People search" page where a query has no results.
+#: actions/groupsearch.php:82 actions/noticesearch.php:122
+#: actions/peoplesearch.php:87
 msgid "No results."
 msgstr "没有查询结果。"
 
@@ -3081,155 +3114,166 @@ msgid "User is not blocked from group."
 msgstr "用户未被小组屏蔽。"
 
 #. TRANS: Server error displayed when unblocking a user from a group fails because of an unknown error.
+#. TRANS: Server error displayed when removing a user block.
 #: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "取消屏蔽时出错。"
 
 #. TRANS: Title for Instant Messaging settings.
-#: actions/imsettings.php:58
+#: actions/imsettings.php:56
 msgid "IM settings"
 msgstr "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.
-#: actions/imsettings.php:71
-#, php-format
+#: actions/imsettings.php:69
+#, fuzzy, php-format
 msgid ""
-"You can send and receive notices through Jabber/Google Talk [instant "
-"messages](%%doc.im%%). Configure your address and settings below."
+"You can send and receive notices through instant messaging [instant messages]"
+"(%%doc.im%%). Configure your addresses and settings below."
 msgstr ""
 "你可以通过Jabber/GTalk [即时通讯工具](%%doc.im%%)发送和接收消息。在这里配置它"
 "们。"
 
-#. TRANS: Message given in the Instant Messaging settings if XMPP is not enabled on the site.
+#. TRANS: Message given in the IM settings if IM is not enabled on the site.
 #: actions/imsettings.php:90
 msgid "IM is not available."
 msgstr "IM 不可用。"
 
-#. TRANS: Form legend for Instant Messaging settings form.
-#. TRANS: Field label for Instant Messaging address input in Instant Messaging settings form.
-#: actions/imsettings.php:102 actions/imsettings.php:132
-msgid "IM address"
-msgstr "IM 地址"
+#: actions/imsettings.php:116
+#, fuzzy, php-format
+msgid "Current confirmed %s address."
+msgstr "当前确认的电子邮件。"
 
-#: actions/imsettings.php:109
-msgid "Current confirmed Jabber/Google Talk address."
-msgstr "当前已确认的Jabber/GTalk账号。"
-
-#. TRANS: Form note in Instant Messaging settings form.
-#. TRANS: %s is the Instant Messaging address set for the site.
-#: actions/imsettings.php:120
-#, php-format
+#. TRANS: Form note in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:128
+#, fuzzy, php-format
 msgid ""
-"Awaiting confirmation on this address. Check your Jabber/Google Talk account "
-"for a message with further instructions. (Did you add %s to your buddy list?)"
+"Awaiting confirmation on this address. Check your %s account for a message "
+"with further instructions. (Did you add %s to your buddy list?)"
 msgstr ""
 "正在等待验证这个地址。请检查你的 Jabber/GTalk 帐户看有没有收到下一步的指示。"
 "（你添加 %s 为你的好友了吗？）"
 
-#. TRANS: IM address input field instructions in Instant Messaging settings form.
-#. TRANS: %s is the Instant Messaging address set for the site.
-#. TRANS: Do not translate "example.org". It is one of the domain names reserved for use in examples by
-#. TRANS: http://www.rfc-editor.org/rfc/rfc2606.txt. Any other domain may be owned by a legitimate
-#. TRANS: person or organization.
-#: actions/imsettings.php:139
-#, php-format
-msgid ""
-"Jabber or Google Talk address, like \"UserName@example.org\". First, make "
-"sure to add %s to your buddy list in your IM client or on Google Talk."
-msgstr ""
-"Jabber 或 Google Talk 地址，比如 \"UserName@example.org\"。首先，请确认你已"
-"在 IM 聊天工具或 Google Talk 中将 %s 添加了好友。"
+#: actions/imsettings.php:140
+msgid "IM address"
+msgstr "IM 地址"
 
-#. TRANS: Form legend for Instant Messaging preferences form.
-#: actions/imsettings.php:154
-msgid "IM preferences"
+#: actions/imsettings.php:142
+#, php-format
+msgid "%s screenname."
+msgstr ""
+
+#. TRANS: Header for IM preferences form.
+#: actions/imsettings.php:163
+#, fuzzy
+msgid "IM Preferences"
 msgstr "IM 首选项已保存。"
 
-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:159
-msgid "Send me notices through Jabber/Google Talk."
-msgstr "通过 Jabber/Google Talk 给我发送消息。"
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:174
+#, fuzzy
+msgid "Send me notices"
+msgstr "发送一个通知"
 
-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:165
-msgid "Post a notice when my Jabber/Google Talk status changes."
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:176
+#, fuzzy
+msgid "Post a notice when my status changes."
 msgstr "当我的 Jabber/Google Talk 状态消息改变时自动发布消息。"
 
-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:171
-msgid ""
-"Send me replies through Jabber/Google Talk from people I'm not subscribed to."
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:178
+#, fuzzy
+msgid "Send me replies from people I'm not subscribed to."
 msgstr "将我没有关注的用户给我的回复通过 Jabber/Google Talk 发送给我。"
 
-#. TRANS: Checkbox label in Instant Messaging preferences form.
-#: actions/imsettings.php:178
-msgid "Publish a MicroID for my Jabber/Google Talk address."
-msgstr "为我的 Jabber/Google Talk 地址发布一个 MicroID。"
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:181
+#, fuzzy
+msgid "Publish a MicroID"
+msgstr "公开电子邮件的 MicroID。"
 
-#. TRANS: Confirmation message for successful Instant Messaging preferences save.
-#: actions/imsettings.php:283 actions/othersettings.php:192
+#. TRANS: Server error thrown on database error updating IM preferences.
+#: actions/imsettings.php:291
+#, fuzzy
+msgid "Couldn't update IM preferences."
+msgstr "无法更新用户。"
+
+#. TRANS: Confirmation message for successful IM preferences save.
+#. TRANS: Confirmation message after saving preferences.
+#: actions/imsettings.php:298 actions/urlsettings.php:244
 msgid "Preferences saved."
 msgstr "首选项已保存。"
 
-#. TRANS: Message given saving Instant Messaging address without having provided one.
-#: actions/imsettings.php:304
-msgid "No Jabber ID."
-msgstr "没有 Jabber ID。"
+#. TRANS: Message given saving IM address without having provided one.
+#: actions/imsettings.php:320
+#, fuzzy
+msgid "No screenname."
+msgstr "没有昵称。"
 
-#. TRANS: Message given saving Instant Messaging address that cannot be normalised.
-#: actions/imsettings.php:312
-msgid "Cannot normalize that Jabber ID."
+#: actions/imsettings.php:325
+#, fuzzy
+msgid "No transport."
+msgstr "没有消息。"
+
+#. TRANS: Message given saving IM address that cannot be normalised.
+#: actions/imsettings.php:333
+#, fuzzy
+msgid "Cannot normalize that screenname"
 msgstr "无法识别此 Jabber ID。"
 
-#. TRANS: Message given saving Instant Messaging address that not valid.
-#: actions/imsettings.php:317
-msgid "Not a valid Jabber ID."
-msgstr "不是有效的 Jabber ID。"
+#. TRANS: Message given saving IM address that not valid.
+#: actions/imsettings.php:340
+#, fuzzy
+msgid "Not a valid screenname"
+msgstr "不是有效的昵称。"
 
-#. TRANS: Message given saving Instant Messaging address that is already set.
-#: actions/imsettings.php:321
-msgid "That is already your Jabber ID."
-msgstr "这个已经是你的 Jabber 帐号了。"
-
-#. TRANS: Message given saving Instant Messaging address that is already set for another user.
-#: actions/imsettings.php:325
-msgid "Jabber ID already belongs to another user."
+#. TRANS: Message given saving IM address that is already set for another user.
+#: actions/imsettings.php:344
+#, fuzzy
+msgid "Screenname already belongs to another user."
 msgstr "Jabber ID 属于另一用户。"
 
-#. TRANS: Message given saving valid Instant Messaging address that is to be confirmed.
-#. TRANS: %s is the Instant Messaging address set for the site.
-#: actions/imsettings.php:353
-#, php-format
-msgid ""
-"A confirmation code was sent to the IM address you added. You must approve %"
-"s for sending messages to you."
+#. TRANS: Message given saving valid IM address that is to be confirmed.
+#: actions/imsettings.php:369
+#, fuzzy
+msgid "A confirmation code was sent to the IM address you added."
 msgstr "验证码已被发送到你新增的 IM 地址。你必须允许 %s 向你发送信息。"
 
-#. TRANS: Message given canceling Instant Messaging address confirmation for the wrong IM address.
-#: actions/imsettings.php:382
+#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#: actions/imsettings.php:396
 msgid "That is the wrong IM address."
 msgstr "IM 地址错误。"
 
-#. TRANS: Server error thrown on database error canceling Instant Messaging address confirmation.
-#: actions/imsettings.php:391
-msgid "Could not delete IM confirmation."
+#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#: actions/imsettings.php:405
+#, fuzzy
+msgid "Couldn't delete confirmation."
 msgstr "无法删除 IM 确认。"
 
-#. TRANS: Message given after successfully canceling Instant Messaging address confirmation.
-#: actions/imsettings.php:396
+#. TRANS: Message given after successfully canceling IM address confirmation.
+#: actions/imsettings.php:410
 msgid "IM confirmation cancelled."
 msgstr "IM 确认已取消。"
 
-#. TRANS: Message given trying to remove an Instant Messaging address that is not
+#. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.
-#: actions/imsettings.php:417
-msgid "That is not your Jabber ID."
-msgstr "这不是你的 Jabber ID。"
+#: actions/imsettings.php:434
+#, fuzzy
+msgid "That is not your screenname."
+msgstr "这是他人的电话号码。"
+
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#: actions/imsettings.php:443
+#, fuzzy
+msgid "Couldn't update user im prefs."
+msgstr "无法更新用户记录。"
 
 #. TRANS: Message given after successfully removing a registered Instant Messaging address.
-#: actions/imsettings.php:440
+#: actions/imsettings.php:451
 msgid "The IM address was removed."
 msgstr "IM 地址已删除。"
 
@@ -3427,7 +3471,7 @@ msgid "You must be logged in to join a group."
 msgstr "你必须登录才能加入小组。"
 
 #. TRANS: Title for join group page after joining.
-#: actions/joingroup.php:147
+#: actions/joingroup.php:148
 #, php-format
 msgctxt "TITLE"
 msgid "%1$s joined group %2$s"
@@ -3554,7 +3598,7 @@ msgstr "与许可协议一起出现的图片 URL。"
 #. TRANS: Submit button title.
 #: actions/licenseadminpanel.php:311 actions/sessionsadminpanel.php:199
 #: actions/siteadminpanel.php:292 actions/snapshotadminpanel.php:245
-#: actions/tagother.php:154 lib/applicationeditform.php:357
+#: actions/tagother.php:133 lib/applicationeditform.php:357
 msgid "Save"
 msgstr "保存"
 
@@ -3562,49 +3606,51 @@ msgstr "保存"
 msgid "Save license settings"
 msgstr "保存许可协议设置"
 
-#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
+#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
+#: actions/login.php:97 actions/otp.php:62 actions/register.php:130
 msgid "Already logged in."
 msgstr "已登录。"
 
-#: actions/login.php:148
+#: actions/login.php:125
 msgid "Incorrect username or password."
 msgstr "用户名或密码不正确。"
 
-#: actions/login.php:154 actions/otp.php:120
+#. TRANS: Server error displayed when a user object could not be created trying to login using "one time password login".
+#: actions/login.php:131 actions/otp.php:127
 msgid "Error setting user. You are probably not authorized."
 msgstr "设置用户时出错。你可能没有被认证。"
 
-#: actions/login.php:210 actions/login.php:263
+#: actions/login.php:185 actions/login.php:236 lib/action.php:598
 msgid "Login"
 msgstr "登录"
 
-#: actions/login.php:249
+#: actions/login.php:222
 msgid "Login to site"
 msgstr "登录"
 
-#: actions/login.php:258 actions/register.php:490
+#: actions/login.php:231 actions/register.php:469
 msgid "Remember me"
 msgstr "记住登录状态"
 
-#: actions/login.php:259 actions/register.php:492
+#: actions/login.php:232 actions/register.php:471
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "下次自动登录，请不要在公共电脑上使用此选项！"
 
-#: actions/login.php:269
+#: actions/login.php:241
 msgid "Lost or forgotten password?"
 msgstr "忘记了密码？"
 
-#: actions/login.php:288
+#: actions/login.php:259
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
 msgstr "由于安全原因，修改设置前需要输入用户名和密码。"
 
-#: actions/login.php:292
+#: actions/login.php:263
 msgid "Login with your username and password."
 msgstr "使用用户名和密码登录。"
 
-#: actions/login.php:295
+#: actions/login.php:266
 #, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -3727,7 +3773,9 @@ msgstr "新消息"
 msgid "Notice posted"
 msgstr "消息已发布。"
 
-#: actions/noticesearch.php:68
+#. TRANS: Instructions for Notice search page.
+#. TRANS: %%site.name%% is the name of the StatusNet site.
+#: actions/noticesearch.php:69
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -3736,16 +3784,21 @@ msgstr ""
 "在%%site.name%%的消息内容中搜索。搜索条件至少包含 3 个字符，多个搜索条件用空"
 "格分隔。"
 
-#: actions/noticesearch.php:78
+#. TRANS: Title of the page where users can search for notices.
+#: actions/noticesearch.php:80
 msgid "Text search"
 msgstr "搜索消息"
 
-#: actions/noticesearch.php:91
+#. TRANS: Test in RSS notice search.
+#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
+#: actions/noticesearch.php:95
 #, php-format
 msgid "Search results for \"%1$s\" on %2$s"
 msgstr "在%2$s上搜索\"%1$s\"的结果"
 
-#: actions/noticesearch.php:121
+#. TRANS: Text for logged in users making a query for notices without results.
+#. TRANS: This message contains a Markdown link.
+#: actions/noticesearch.php:128
 #, php-format
 msgid ""
 "Be the first to [post on this topic](%%%%action.newnotice%%%%?"
@@ -3754,7 +3807,9 @@ msgstr ""
 "成为第一个[对该主题发布消息]的人(%%%%action.newnotice%%%%?status_textarea=%"
 "s) ！"
 
-#: actions/noticesearch.php:124
+#. TRANS: Text for not logged in users making a query for notices without results.
+#. TRANS: This message contains Markdown links.
+#: actions/noticesearch.php:133
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and be the first to "
@@ -3763,14 +3818,17 @@ msgstr ""
 "现在就 [注册账户](%%%%action.register%%%%) 并成为第一个 [对该主题发布消息的"
 "人](%%%%action.newnotice%%%%?status_textarea=%s) ！"
 
-#: actions/noticesearchrss.php:96
+#. TRANS: RSS notice search feed title. %s is the query.
+#: actions/noticesearchrss.php:95
 #, php-format
 msgid "Updates with \"%s\""
 msgstr "\"%s\"的更新"
 
-#: actions/noticesearchrss.php:98
+#. TRANS: RSS notice search feed description.
+#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
+#: actions/noticesearchrss.php:99
 #, fuzzy, php-format
-msgid "Updates matching search term \"%1$s\" on %2$s!"
+msgid "Updates matching search term \"%1$s\" on %2$s."
 msgstr "%2$s上符合搜索关键字\"%1$s\"的更新！"
 
 #: actions/nudge.php:85
@@ -3788,51 +3846,51 @@ msgid "Nudge sent!"
 msgstr "呼叫已发出！"
 
 #. TRANS: Message displayed to an anonymous user trying to view OAuth application list.
-#: actions/oauthappssettings.php:60
+#: actions/oauthappssettings.php:57
 msgid "You must be logged in to list your applications."
 msgstr "必须登录才能查看你的应用列表。"
 
 #. TRANS: Page title for OAuth applications
-#: actions/oauthappssettings.php:76
+#: actions/oauthappssettings.php:73
 msgid "OAuth applications"
 msgstr "OAuth 应用"
 
 #. TRANS: Page instructions for OAuth applications
-#: actions/oauthappssettings.php:88
+#: actions/oauthappssettings.php:85
 msgid "Applications you have registered"
 msgstr "你已经登记的程序。"
 
 #. TRANS: Empty list message on page with OAuth applications.
-#: actions/oauthappssettings.php:141
+#: actions/oauthappssettings.php:138
 #, php-format
 msgid "You have not registered any applications yet."
 msgstr "你还没登记任何程序。"
 
 #. TRANS: Title for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:71
+#: actions/oauthconnectionssettings.php:69
 msgid "Connected applications"
 msgstr "关联的应用"
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:83
+#: actions/oauthconnectionssettings.php:80
 msgid "The following connections exist for your account."
 msgstr "你的账号的关联。"
 
 #. TRANS: Client error when trying to revoke access for an application while not being a user of it.
-#: actions/oauthconnectionssettings.php:168
+#: actions/oauthconnectionssettings.php:165
 msgid "You are not a user of that application."
 msgstr "你不是那个应用的用户。"
 
 #. TRANS: Client error when revoking access has failed for some reason.
 #. TRANS: %s is the application ID revoking access failed for.
-#: actions/oauthconnectionssettings.php:183
+#: actions/oauthconnectionssettings.php:180
 #, php-format
 msgid "Unable to revoke access for application: %s."
 msgstr "不能取消%s应用的访问。"
 
 #. TRANS: Success message after revoking access for an application.
 #. TRANS: %1$s is the application name, %2$s is the first part of the user token.
-#: actions/oauthconnectionssettings.php:202
+#: actions/oauthconnectionssettings.php:199
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -3840,14 +3898,14 @@ msgid ""
 msgstr "你已成功取消了%1$s的访问，access token 中前面的部分是 %2$s。"
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:213
+#: actions/oauthconnectionssettings.php:210
 msgid "You have not authorized any applications to use your account."
 msgstr "你还没允许任何程序使用你的账户。"
 
 #. TRANS: Note for developers in the OAuth connection settings form.
 #. TRANS: This message contains a Markdown link. Do not separate "](".
 #. TRANS: %s is the URL to the OAuth settings.
-#: actions/oauthconnectionssettings.php:233
+#: actions/oauthconnectionssettings.php:230
 #, php-format
 msgid ""
 "Are you a developer? [Register an OAuth client application](%s) to use with "
@@ -3855,6 +3913,16 @@ msgid ""
 msgstr ""
 "你是开发者么？[注册一个 OAuth 客户端应用](%s) 来使用这个 StatusNet 网站。"
 
+#: actions/oembed.php:64
+#, php-format
+msgid "\"%s\" not found."
+msgstr "找不到\"%s\"。"
+
+#: actions/oembed.php:76
+#, php-format
+msgid "Notice %s not found."
+msgstr "找不到 %s 的通知。"
+
 #: actions/oembed.php:80 actions/shownotice.php:100
 msgid "Notice has no profile."
 msgstr "消息没有对应用户。"
@@ -3864,6 +3932,16 @@ msgstr "消息没有对应用户。"
 msgid "%1$s's status on %2$s"
 msgstr "%1$s在%2$s时发的消息"
 
+#: actions/oembed.php:95
+#, php-format
+msgid "Attachment %s not found."
+msgstr "找不到 %s 的附件。"
+
+#: actions/oembed.php:136
+#, php-format
+msgid "\"%s\" not supported for oembed requests."
+msgstr "\"%s\"不支持 oembed 的请求。"
+
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
 #: actions/oembed.php:168
 #, php-format
@@ -3877,93 +3955,60 @@ msgid "Only %s URLs over plain HTTP please."
 msgstr "请只用HTTP明文的%sURLs的地址。"
 
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1205
-#: lib/apiaction.php:1232 lib/apiaction.php:1367
+#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1207
+#: lib/apiaction.php:1234 lib/apiaction.php:1369
 msgid "Not a supported data format."
 msgstr "不支持的数据格式。"
 
+#. TRANS: ShortName in the OpenSearch interface when trying to find users.
 #: actions/opensearch.php:64
 msgid "People Search"
 msgstr "搜索用户"
 
-#: actions/opensearch.php:67
+#: actions/opensearch.php:68
 msgid "Notice Search"
 msgstr "搜索消息"
 
-#: actions/othersettings.php:59
-msgid "Other settings"
-msgstr "其他设置"
-
-#. TRANS: Instructions for tab "Other" in user profile settings.
-#: actions/othersettings.php:71
-msgid "Manage various other options."
-msgstr "管理其他选项。"
-
-#. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
-#. TRANS: user's profile settings. Use of "free" is as in "open", indicating that the
-#. TRANS: information on the shortener site is freely distributable.
-#. TRANS: This message has one space at the beginning. Use your language's word separator
-#. TRANS: here if it has one (most likely a single space).
-#: actions/othersettings.php:113
-msgid " (free service)"
-msgstr "（免费服务）"
-
-#. TRANS: Label for dropdown with URL shortener services.
-#: actions/othersettings.php:122
-msgid "Shorten URLs with"
-msgstr "缩短 URL 使用"
-
-#. TRANS: Tooltip for for dropdown with URL shortener services.
-#: actions/othersettings.php:124
-msgid "Automatic shortening service to use."
-msgstr "要使用的自动短网址服务。"
-
-#. TRANS: Label for checkbox.
-#: actions/othersettings.php:130
-msgid "View profile designs"
-msgstr "查看个人页面外观"
-
-#. TRANS: Tooltip for checkbox.
-#: actions/othersettings.php:132
-msgid "Show or hide profile designs."
-msgstr "显示或隐藏个人页面外观。"
-
-#. TRANS: Form validation error for form "Other settings" in user profile.
-#: actions/othersettings.php:164
-msgid "URL shortening service is too long (maximum 50 characters)."
-msgstr "短网址服务过长(不能超过50个字符)。"
-
-#: actions/otp.php:69
+#. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
+#: actions/otp.php:70
 msgid "No user ID specified."
 msgstr "没用指定用户 ID。"
 
-#: actions/otp.php:83
+#. TRANS: Client error displayed trying to use "one time password login" without specifying a login token.
+#: actions/otp.php:86
 msgid "No login token specified."
 msgstr "没有指定登录 token。"
 
-#: actions/otp.php:90
+#. TRANS: Client error displayed trying to use "one time password login" without requesting a login token.
+#: actions/otp.php:94
 msgid "No login token requested."
 msgstr "没有请求的登录 token。"
 
-#: actions/otp.php:95
+#. TRANS: Client error displayed trying to use "one time password login" while specifying an invalid login token.
+#: actions/otp.php:100
 msgid "Invalid login token specified."
 msgstr "指定的登录 token 无效。"
 
-#: actions/otp.php:104
+#. TRANS: Client error displayed trying to use "one time password login" while specifying an expired login token.
+#: actions/otp.php:110
 msgid "Login token expired."
 msgstr "登录 token 已过期。"
 
-#: actions/outbox.php:58
+#. TRANS: Title for outbox for any but the fist page.
+#. TRANS: %1$s is the user nickname, %2$d is the page number.
+#: actions/outbox.php:57
 #, php-format
 msgid "Outbox for %1$s - page %2$d"
 msgstr "%1$s的发件箱 - 第%2$d页"
 
+#. TRANS: Title for first page of outbox.
 #: actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
 msgstr "%s 的发件箱"
 
-#: actions/outbox.php:104
+#. TRANS: Instructions for outbox.
+#: actions/outbox.php:103
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr "这是你的发件箱，包含你发送的私信。"
 
@@ -3989,43 +4034,42 @@ msgstr "旧密码"
 msgid "New password"
 msgstr "新密码"
 
-#: actions/passwordsettings.php:109
-#, fuzzy
-msgid "6 or more characters"
+#: actions/passwordsettings.php:109 actions/register.php:416
+msgid "6 or more characters."
 msgstr "6 个或更多字符"
 
-#: actions/passwordsettings.php:113
-#, fuzzy
-msgid "Same as password above"
+#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#: actions/passwordsettings.php:113 actions/recoverpassword.php:264
+#: actions/register.php:420
+msgid "Same as password above."
 msgstr "与上面相同的密码"
 
 #: actions/passwordsettings.php:117
 msgid "Change"
 msgstr "修改"
 
-#: actions/passwordsettings.php:154 actions/register.php:238
+#: actions/passwordsettings.php:153 actions/register.php:223
 msgid "Password must be 6 or more characters."
 msgstr "密码必须包含 6 个或更多字符。"
 
-#: actions/passwordsettings.php:157 actions/register.php:241
+#: actions/passwordsettings.php:156 actions/register.php:226
 msgid "Passwords don't match."
 msgstr "密码不匹配。"
 
-#: actions/passwordsettings.php:165
+#: actions/passwordsettings.php:164
 msgid "Incorrect old password"
 msgstr "旧密码不正确"
 
-#: actions/passwordsettings.php:181
+#: actions/passwordsettings.php:180
 msgid "Error saving user; invalid."
 msgstr "保存用户时出错；无效。"
 
-#: actions/passwordsettings.php:186
-#, fuzzy
-msgid "Can't save new password."
+#. TRANS: Reset password form validation error message.
+#: actions/passwordsettings.php:185 actions/recoverpassword.php:418
+msgid "Cannot save new password."
 msgstr "无法保存新密码。"
 
-#. TRANS: Title for password recovery page in password saved mode.
-#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
+#: actions/passwordsettings.php:191
 msgid "Password saved."
 msgstr "密码已保存。"
 
@@ -4230,8 +4274,7 @@ msgid "Directory where backgrounds are located."
 msgstr "背景文件的目录。"
 
 #. TRANS: Fieldset legens in Paths admin panel.
-#. TRANS: DT element label in attachment list.
-#: actions/pathsadminpanel.php:419 lib/attachmentlist.php:98
+#: actions/pathsadminpanel.php:419
 msgid "Attachments"
 msgstr "附件"
 
@@ -4299,7 +4342,9 @@ msgstr "直接SSL请求的服务器"
 msgid "Save paths"
 msgstr "保存路径"
 
-#: actions/peoplesearch.php:52
+#. TRANS: Instructions for the "People search" page.
+#. TRANS: %%site.name%% is the name of the StatusNet site.
+#: actions/peoplesearch.php:54
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
@@ -4308,7 +4353,8 @@ msgstr ""
 "通过姓名、位置和爱好搜索在%%site.name%%的用户。搜索条件至少包含 3 个字符，多"
 "个搜索条件用空格分隔。"
 
-#: actions/peoplesearch.php:58
+#. TRANS: Title of a page where users can search for other users.
+#: actions/peoplesearch.php:61
 msgid "People search"
 msgstr "搜索用户"
 
@@ -4322,6 +4368,60 @@ msgstr "不是有效的标签：%s。"
 msgid "Users self-tagged with %1$s - page %2$d"
 msgstr "用户自加标签%s - 第%d 页"
 
+#. TRANS: Page title for AJAX form return when a disabling a plugin.
+#: actions/plugindisable.php:69
+msgctxt "plugin"
+msgid "Disabled"
+msgstr ""
+
+#. TRANS: Client error displayed trying to perform any request method other than POST.
+#. TRANS: Do not translate POST.
+#: actions/pluginenable.php:78 actions/subscribe.php:77
+msgid "This action only accepts POST requests."
+msgstr "这个动作只接受 POST 请求"
+
+#: actions/pluginenable.php:102
+#, fuzzy
+msgid "You cannot administer plugins."
+msgstr "你不能删除用户。"
+
+#: actions/pluginenable.php:109
+#, fuzzy
+msgid "No such plugin."
+msgstr "没有这个页面。"
+
+#. TRANS: Page title for AJAX form return when enabling a plugin.
+#: actions/pluginenable.php:159
+msgctxt "plugin"
+msgid "Enabled"
+msgstr ""
+
+#. TRANS: Tab and title for plugins admin panel.
+#. TRANS: Menu item for site administration
+#: actions/pluginsadminpanel.php:56 actions/version.php:191
+#: lib/adminpanelaction.php:411
+msgid "Plugins"
+msgstr "插件"
+
+#. TRANS: Instructions at top of plugin admin page.
+#: actions/pluginsadminpanel.php:68
+msgid ""
+"Additional plugins can be enabled and configured manually. See the <a href="
+"\"http://status.net/wiki/Plugins\">online plugin documentation</a> for more "
+"details."
+msgstr ""
+
+#. TRANS: Admin form section header
+#: actions/pluginsadminpanel.php:84
+#, fuzzy
+msgid "Default plugins"
+msgstr "默认语言"
+
+#: actions/pluginsadminpanel.php:106
+msgid ""
+"All default plugins have been disabled from the site's configuration file."
+msgstr ""
+
 #: actions/postnotice.php:95
 msgid "Invalid notice content."
 msgstr "无效的消息内容。"
@@ -4332,181 +4432,172 @@ msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’.
 msgstr "消息许可证“%1$s”与这个网站的许可证“%2$s”不兼容。"
 
 #. TRANS: Page title for profile settings.
-#: actions/profilesettings.php:59
+#: actions/profilesettings.php:60
 msgid "Profile settings"
 msgstr "个人设置"
 
 #. TRANS: Usage instructions for profile settings.
-#: actions/profilesettings.php:70
+#: actions/profilesettings.php:71
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr "在这里更新个人信息，让大家对你了解得更多。"
 
 #. TRANS: Profile settings form legend.
-#: actions/profilesettings.php:98
+#: actions/profilesettings.php:99
 msgid "Profile information"
 msgstr "个人信息"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109 actions/register.php:433
+#: actions/profilesettings.php:110 actions/register.php:412
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr "1 到 64 个小写字母或数字，不包含标点或空格。"
 
 #. TRANS: Field label in form for profile settings.
-#. TRANS: Label for full group name (dt). Text hidden by default.
-#. TRANS: DT for full name in a profile.
-#: actions/profilesettings.php:113 actions/register.php:455
-#: actions/showgroup.php:255 actions/tagother.php:104
-#: lib/groupeditform.php:150 lib/userprofile.php:156
+#: actions/profilesettings.php:114 actions/register.php:434
+#: lib/groupeditform.php:150
 msgid "Full name"
 msgstr "全名"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:118 actions/register.php:460
+#: actions/profilesettings.php:119 actions/register.php:439
 #: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "主页"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:121
+#: actions/profilesettings.php:122 actions/register.php:441
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr "你的主页、博客或在其他网站的URL。"
 
 #. TRANS: Tooltip for field label in form for profile settings. Plural
 #. TRANS: is decided by the number of characters available for the
 #. TRANS: biography (%d).
-#: actions/profilesettings.php:129 actions/register.php:471
+#: actions/profilesettings.php:130 actions/register.php:450
 #, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
 msgstr[0] "用不超过%d个字符描述你自己和你的兴趣"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:135 actions/register.php:476
+#: actions/profilesettings.php:136 actions/register.php:455
 msgid "Describe yourself and your interests"
 msgstr "描述你自己和你的兴趣"
 
 #. TRANS: Text area label in form for profile settings where users can provide.
 #. TRANS: their biography.
-#: actions/profilesettings.php:139 actions/register.php:478
+#: actions/profilesettings.php:140 actions/register.php:457
 msgid "Bio"
 msgstr "自述"
 
 #. TRANS: Field label in form for profile settings.
-#. TRANS: Label for group location (dt). Text hidden by default.
-#. TRANS: DT for location in a profile.
-#: actions/profilesettings.php:145 actions/register.php:483
-#: actions/showgroup.php:265 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:173
-#: lib/userprofile.php:172
+#: actions/profilesettings.php:146 actions/register.php:462
+#: lib/groupeditform.php:173
 msgid "Location"
 msgstr "位置"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148 actions/register.php:485
+#: actions/profilesettings.php:149
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "你的地理位置，格式类似\"城市，省份，国家\""
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:153
+#: actions/profilesettings.php:154
 msgid "Share my current location when posting notices"
 msgstr "当发布消息时分享我的地理位置"
 
 #. TRANS: Field label in form for profile settings.
-#. TRANS: DT for tags in a profile.
-#: actions/profilesettings.php:161 actions/tagother.php:149
-#: actions/tagother.php:209 lib/subscriptionlist.php:106
-#: lib/subscriptionlist.php:108 lib/userprofile.php:220
+#: actions/profilesettings.php:162 actions/tagother.php:128
+#: actions/tagother.php:188 lib/subscriptionlist.php:104
+#: lib/subscriptionlist.php:106
 msgid "Tags"
 msgstr "标签"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:164
+#: actions/profilesettings.php:165
 #, fuzzy
 msgid ""
-"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- "
+"separated."
 msgstr "你的标签 (字母、数字、“-”、“. ”和“ _”)， 以逗号或空格分隔"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:169
+#: actions/profilesettings.php:170
 msgid "Language"
 msgstr "语言"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:171
-#, fuzzy
-msgid "Preferred language"
+#: actions/profilesettings.php:172
+msgid "Preferred language."
 msgstr "首选的语言。"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:181
+#: actions/profilesettings.php:182
 msgid "Timezone"
 msgstr "时区"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:183
+#: actions/profilesettings.php:184
 msgid "What timezone are you normally in?"
 msgstr "你一般处于哪个时区？"
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:189
-#, fuzzy
+#: actions/profilesettings.php:190
 msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)"
+"Automatically subscribe to whoever subscribes to me (best for non-humans)."
 msgstr "自动关注任何关注我的人（这个选项适合机器人）"
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Plural form is used based on the maximum number of allowed
 #. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:258 actions/register.php:229
+#: actions/profilesettings.php:259 actions/register.php:214
 #, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
 msgstr[0] "自述过长(不能超过%d个字符)。"
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:269 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:270 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr "未选择时区。"
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:277
+#: actions/profilesettings.php:278
 msgid "Language is too long (maximum 50 characters)."
 msgstr "语言过长(不能超过50个字符)。"
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:291 actions/tagother.php:178
+#: actions/profilesettings.php:292
 #, php-format
-msgid "Invalid tag: \"%s\""
-msgstr "无效的标签：\"%s\"。"
+msgid "Invalid tag: \"%s\"."
+msgstr "无效的标记： %s。"
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:347
+#: actions/profilesettings.php:348
 msgid "Could not update user for autosubscribe."
 msgstr "无法更新用户的自动关注。"
 
 #. TRANS: Server error thrown when user profile location preference settings could not be updated.
-#: actions/profilesettings.php:405
+#: actions/profilesettings.php:406
 msgid "Could not save location prefs."
 msgstr "无法保存位置设置。"
 
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:427 actions/tagother.php:200
+#: actions/profilesettings.php:428 actions/tagother.php:179
 msgid "Could not save tags."
 msgstr "无法保存标签。"
 
 #. TRANS: Confirmation shown when user profile settings are saved.
 #. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:436 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:437 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "设置已保存。"
 
 #. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
 #. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:483 actions/restoreaccount.php:60
+#: actions/profilesettings.php:484 actions/restoreaccount.php:60
 msgid "Restore account"
 msgstr "还原账户"
 
@@ -4580,6 +4671,12 @@ msgstr ""
 "这里是%%site.name%%，一个基于自由软件[StatusNet](http://status.net/)的[微博"
 "客](http://zh.wikipedia.org/zh-hans/%E5%BE%AE%E5%8D%9A%E5%AE%A2) 。"
 
+#. TRANS: Public RSS feed description. %s is the StatusNet site name.
+#: actions/publicrss.php:106
+#, fuzzy, php-format
+msgid "%s updates from everyone."
+msgstr "%s条来自所有人的消息！"
+
 #. TRANS: Title for public tag cloud.
 #: actions/publictagcloud.php:57
 msgid "Public tag cloud"
@@ -4618,10 +4715,6 @@ msgid ""
 "one!"
 msgstr "现在就[注册](%%action.register%%)并发布第一个！"
 
-#: actions/publictagcloud.php:146
-msgid "Tag cloud"
-msgstr "标签云"
-
 #. TRANS: Client error displayed trying to recover password while already logged in.
 #: actions/recoverpassword.php:37
 msgid "You are already logged in!"
@@ -4710,6 +4803,11 @@ msgstr "恢复密码"
 msgid "Password recovery requested"
 msgstr "已请求密码恢复"
 
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/recoverpassword.php:229
+msgid "Password saved"
+msgstr "密码已保存。"
+
 #. TRANS: Title for password recovery page when an unknown action has been specified.
 #: actions/recoverpassword.php:232
 msgid "Unknown action"
@@ -4720,14 +4818,9 @@ msgstr "未知动作"
 msgid "6 or more characters, and do not forget it!"
 msgstr "至少6个字符，还有，别忘记它！"
 
-#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
-#: actions/recoverpassword.php:264 actions/register.php:441
-msgid "Same as password above."
-msgstr "与上面相同的密码"
-
 #. TRANS: Button text for password reset form.
 #. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: actions/recoverpassword.php:268 lib/designsettings.php:264
+#: actions/recoverpassword.php:268 lib/designform.php:145
 msgctxt "BUTTON"
 msgid "Reset"
 msgstr "重置"
@@ -4774,13 +4867,8 @@ msgstr "密码必须是 6 位或更多字符。"
 msgid "Password and confirmation do not match."
 msgstr "密码和确认密码不匹配。"
 
-#. TRANS: Reset password form validation error message.
-#: actions/recoverpassword.php:418
-msgid "Cannot save new password."
-msgstr "无法保存新密码。"
-
 #. TRANS: Server error displayed when something does wrong with the user object during password reset.
-#: actions/recoverpassword.php:426 actions/register.php:256
+#: actions/recoverpassword.php:426 actions/register.php:241
 msgid "Error setting user."
 msgstr "保存用户设置时出错。"
 
@@ -4789,94 +4877,94 @@ msgstr "保存用户设置时出错。"
 msgid "New password successfully saved. You are now logged in."
 msgstr "新密码已保存，你现在已登录。"
 
-#: actions/register.php:92 actions/register.php:196 actions/register.php:413
+#: actions/redirecturl.php:70
+#, fuzzy
+msgid "No id parameter"
+msgstr "没有 ID 冲突。"
+
+#: actions/redirecturl.php:76
+#, fuzzy, php-format
+msgid "No such file \"%d\""
+msgstr "没有这个文件。"
+
+#: actions/register.php:80 actions/register.php:181 actions/register.php:392
 msgid "Sorry, only invited people can register."
 msgstr "对不起，只有被邀请的用户才能注册。"
 
-#: actions/register.php:99
+#: actions/register.php:87
 msgid "Sorry, invalid invitation code."
 msgstr "对不起，无效的邀请码。"
 
-#: actions/register.php:119
+#: actions/register.php:106
 msgid "Registration successful"
 msgstr "注册成功"
 
-#: actions/register.php:121 actions/register.php:511
+#: actions/register.php:108 actions/register.php:490
 msgid "Register"
 msgstr "注册"
 
-#: actions/register.php:142
+#: actions/register.php:128
 msgid "Registration not allowed."
 msgstr "不允许注册。"
 
-#: actions/register.php:209
-#, fuzzy
-msgid "You can't register if you don't agree to the license."
+#: actions/register.php:194
+msgid "You cannot register if you don't agree to the license."
 msgstr "如果您不同意该许可，您不能注册。"
 
-#: actions/register.php:218
+#: actions/register.php:203
 msgid "Email address already exists."
 msgstr "电子邮件地址已存在。"
 
-#: actions/register.php:251 actions/register.php:273
+#: actions/register.php:236 actions/register.php:258
 msgid "Invalid username or password."
 msgstr "用户名或密码不正确。"
 
-#: actions/register.php:351
-#, fuzzy
+#: actions/register.php:333
 msgid ""
 "With this form you can create a new account. You can then post notices and "
-"link up to friends and colleagues. "
+"link up to friends and colleagues."
 msgstr "使用此窗体可以创建一个新的帐户。然后可以张贴告示及链接到的朋友和同事。"
 
-#: actions/register.php:437
-msgid "6 or more characters."
-msgstr "6 个或更多字符"
-
-#. TRANS: Link description in user account settings menu.
-#: actions/register.php:445 actions/register.php:449
-#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
+#: actions/register.php:424 actions/register.php:428
+#: actions/siteadminpanel.php:238 lib/settingsnav.php:92
 msgid "Email"
 msgstr "电子邮件"
 
-#: actions/register.php:446 actions/register.php:450
-#, fuzzy
-msgid "Used only for updates, announcements, and password recovery"
+#: actions/register.php:425 actions/register.php:429
+msgid "Used only for updates, announcements, and password recovery."
 msgstr "仅用于更新、 公告及密码恢复。"
 
-#: actions/register.php:457
-#, fuzzy
-msgid "Longer name, preferably your \"real\" name"
+#: actions/register.php:436
+msgid "Longer name, preferably your \"real\" name."
 msgstr "你最好是\"真正的\"的名字的长名称技术。"
 
-#: actions/register.php:462
-#, fuzzy
-msgid "URL of your homepage, blog, or profile on another site"
-msgstr "你的主页、博客或在其他网站的URL。"
+#: actions/register.php:464
+msgid "Where you are, like \"City, State (or Region), Country\"."
+msgstr "你在哪里，像\"城市、 国家（或地区）、国家\"。"
 
-#: actions/register.php:523
+#: actions/register.php:503
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
 msgstr "我明白%1$s的信息是私人且保密的。"
 
-#: actions/register.php:533
+#: actions/register.php:513
 #, php-format
 msgid "My text and files are copyright by %1$s."
 msgstr "我的文字和文件的版权归%1$s所有。"
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:537
+#: actions/register.php:517
 msgid "My text and files remain under my own copyright."
 msgstr "我的文字和文件的版权由我自己保留。"
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:540
+#: actions/register.php:520
 msgid "All rights reserved."
 msgstr "保留所有权利。"
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:545
+#: actions/register.php:525
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -4885,7 +4973,7 @@ msgstr ""
 "我的文字和文件在%s下提供，除了如下隐私内容：密码、电子邮件地址、IM 地址和电话"
 "号码。"
 
-#: actions/register.php:588
+#: actions/register.php:566
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -4915,7 +5003,7 @@ msgstr ""
 "\n"
 "感谢你的注册，希望你喜欢这个服务。"
 
-#: actions/register.php:612
+#: actions/register.php:590
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -4945,8 +5033,7 @@ msgid "User nickname"
 msgstr "昵称"
 
 #: actions/remotesubscribe.php:129
-#, fuzzy
-msgid "Nickname of the user you want to follow"
+msgid "Nickname of the user you want to follow."
 msgstr "您要执行的用户的别名。"
 
 #: actions/remotesubscribe.php:132
@@ -4954,19 +5041,18 @@ msgid "Profile URL"
 msgstr "资料页 URL"
 
 #: actions/remotesubscribe.php:133
-#, fuzzy
-msgid "URL of your profile on another compatible microblogging service"
+msgid "URL of your profile on another compatible microblogging service."
 msgstr "另一种兼容的微博客服务配置文件的 URL。"
 
 #. TRANS: Link text for link that will subscribe to a remote profile.
 #: actions/remotesubscribe.php:136 lib/subscribeform.php:139
-#: lib/userprofile.php:431
+#: lib/userprofile.php:402
 msgid "Subscribe"
 msgstr "关注"
 
 #: actions/remotesubscribe.php:158
 #, fuzzy
-msgid "Invalid profile URL (bad format)"
+msgid "Invalid profile URL (bad format)."
 msgstr "无效的用户 URL (格式错误)"
 
 #: actions/remotesubscribe.php:167
@@ -4997,7 +5083,7 @@ msgstr "你不能重复自己的消息。"
 msgid "You already repeated that notice."
 msgstr "你已转发过了那个消息。"
 
-#: actions/repeat.php:112 lib/noticelist.php:692
+#: actions/repeat.php:112 lib/noticelist.php:697
 msgid "Repeated"
 msgstr "已转发"
 
@@ -5005,9 +5091,9 @@ msgstr "已转发"
 msgid "Repeated!"
 msgstr "已转发！"
 
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing @-replies.
+#. TRANS: RSS reply feed title. %s is a user nickname.
 #: actions/replies.php:126 actions/repliesrss.php:68
-#: lib/personalgroupnav.php:109
+#: lib/personalgroupnav.php:105
 #, php-format
 msgid "Replies to %s"
 msgstr "对 %s 的回复"
@@ -5056,9 +5142,11 @@ msgstr ""
 "你可以试着 [呼叫%1$s](../%2$s) 或者给他们 [发一些消息](%%%%action.newnotice%%"
 "%%?status_textarea=%3$s)。"
 
-#: actions/repliesrss.php:72
+#. TRANS: RSS reply feed description.
+#. TRANS: %1$s is a user nickname, %2$s is the StatusNet site name.
+#: actions/repliesrss.php:74
 #, fuzzy, php-format
-msgid "Replies to %1$s on %2$s!"
+msgid "Replies to %1$s on %2$s."
 msgstr "在%2$s上对%1$s的回复!"
 
 #. TRANS: Client exception displayed when trying to restore an account while not logged in.
@@ -5155,7 +5243,7 @@ msgstr "你不能在这个网站移除用户角色。"
 msgid "User doesn't have this role."
 msgstr "用户没有此权限。"
 
-#: actions/rsd.php:146 actions/version.php:159
+#: actions/rsd.php:142 actions/version.php:159
 msgid "StatusNet"
 msgstr "StatusNet"
 
@@ -5197,93 +5285,44 @@ msgstr "打开 sessions 的调试输出。"
 msgid "Save site settings"
 msgstr "保存访问设置"
 
-#: actions/showapplication.php:82
+#: actions/showapplication.php:78
 msgid "You must be logged in to view an application."
 msgstr "你必须登录才能创建小组。"
 
-#: actions/showapplication.php:157
+#: actions/showapplication.php:151
 msgid "Application profile"
 msgstr "未找到应用。"
 
-#. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:159 lib/applicationeditform.php:177
-msgid "Icon"
-msgstr "图标"
-
-#. TRANS: Form input field label for application name.
-#: actions/showapplication.php:169 actions/version.php:197
-#: lib/applicationeditform.php:190
-msgid "Name"
-msgstr "名称"
-
-#. TRANS: Form input field label.
-#: actions/showapplication.php:178 lib/applicationeditform.php:227
-msgid "Organization"
-msgstr "组织名称必填。"
-
-#. TRANS: Form input field label.
-#: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:168
-msgid "Description"
-msgstr "描述"
-
-#. TRANS: Header for group statistics on a group page (h2).
-#. TRANS: H2 text for user statistics.
-#: actions/showapplication.php:192 actions/showgroup.php:460
-#: lib/profileaction.php:205
-msgid "Statistics"
-msgstr "统计"
-
-#: actions/showapplication.php:203
+#: actions/showapplication.php:179
 #, php-format
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr "由%1$s创建 - 默认访问权限%2$s - %3$d个用户"
 
-#: actions/showapplication.php:213
+#: actions/showapplication.php:189
 msgid "Application actions"
 msgstr "应用程序动作"
 
-#: actions/showapplication.php:236
+#: actions/showapplication.php:212
 msgid "Reset key & secret"
 msgstr "重置key和secret"
 
 #. TRANS: Title of form for deleting a user.
-#: actions/showapplication.php:252 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:64 lib/noticelist.php:673
+#: actions/showapplication.php:228 lib/deletegroupform.php:121
+#: lib/deleteuserform.php:64 lib/noticelist.php:678
 msgid "Delete"
 msgstr "删除"
 
-#: actions/showapplication.php:261
+#: actions/showapplication.php:237
 msgid "Application info"
 msgstr "应用程序信息"
 
-#: actions/showapplication.php:263
-msgid "Consumer key"
-msgstr "Consumer key"
-
-#: actions/showapplication.php:268
-msgid "Consumer secret"
-msgstr "Consumer secret"
-
-#: actions/showapplication.php:273
-msgid "Request token URL"
-msgstr "请求令牌URL"
-
-#: actions/showapplication.php:278
-msgid "Access token URL"
-msgstr "访问令牌URL"
-
-#: actions/showapplication.php:283
-msgid "Authorize URL"
-msgstr "授权URL"
-
-#: actions/showapplication.php:288
+#: actions/showapplication.php:255
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
 msgstr "提示：我们支持HMAC-SHA1签名。我们不支持明文的签名方法。"
 
-#: actions/showapplication.php:309
+#: actions/showapplication.php:275
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr "你确定要重置你的consumer key和secret吗？"
 
@@ -5366,61 +5405,47 @@ msgstr "%s 小组"
 msgid "%1$s group, page %2$d"
 msgstr "%1$s小组，第%2$d页"
 
-#. TRANS: Group profile header (h2). Text hidden by default.
-#: actions/showgroup.php:223
-msgid "Group profile"
-msgstr "小组资料"
-
-#. TRANS: Label for group URL (dt). Text hidden by default.
-#. TRANS: DT for URL in a profile.
-#: actions/showgroup.php:273 actions/tagother.php:118
-#: actions/userauthorization.php:175 lib/userprofile.php:186
-msgid "URL"
-msgstr "URL 互联网地址"
-
 #. TRANS: Label for group description or group note (dt). Text hidden by default.
-#. TRANS: DT for note in a profile.
-#: actions/showgroup.php:285 actions/tagother.php:128
-#: actions/userauthorization.php:187 lib/userprofile.php:204
+#: actions/showgroup.php:266
 msgid "Note"
 msgstr "注释"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:296 lib/groupeditform.php:180
+#: actions/showgroup.php:277 lib/groupeditform.php:180
 msgid "Aliases"
 msgstr "别名"
 
 #. TRANS: Group actions header (h2). Text hidden by default.
-#: actions/showgroup.php:313
+#: actions/showgroup.php:294
 msgid "Group actions"
 msgstr "小组动作"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:357
+#: actions/showgroup.php:338
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
 msgstr "%s小组的消息聚合 (RSS 1.0)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:364
+#: actions/showgroup.php:345
 #, php-format
 msgid "Notice feed for %s group (RSS 2.0)"
 msgstr "%s小组的消息聚合 (RSS 2.0)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:371
+#: actions/showgroup.php:352
 #, php-format
 msgid "Notice feed for %s group (Atom)"
 msgstr "%s小组的消息聚合 (Atom)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:377
+#: actions/showgroup.php:358
 #, php-format
 msgid "FOAF for %s group"
 msgstr "%s 的发件箱"
 
 #. TRANS: Header for mini list of group members on a group page (h2).
-#: actions/showgroup.php:414
+#: actions/showgroup.php:395
 msgid "Members"
 msgstr "小组成员"
 
@@ -5428,25 +5453,30 @@ msgstr "小组成员"
 #. TRANS: Text for user subscription statistics if the user has no subscriptions.
 #. TRANS: Text for user subscriber statistics if user has no subscribers.
 #. TRANS: Text for user user group membership statistics if user is not a member of any group.
-#: actions/showgroup.php:420 lib/profileaction.php:137
+#: actions/showgroup.php:401 lib/profileaction.php:137
 #: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
-#: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
+#: lib/subscriptionlist.php:123 lib/tagcloudsection.php:71
 msgid "(None)"
 msgstr "（无）"
 
 #. TRANS: Link to all group members from mini list of group members if group has more than n members.
-#: actions/showgroup.php:429
+#: actions/showgroup.php:410
 msgid "All members"
 msgstr "所有成员"
 
-#. TRANS: Label for creation date in statistics on group page.
-#: actions/showgroup.php:465
+#. TRANS: Header for group statistics on a group page (h2).
+#. TRANS: H2 text for user statistics.
+#: actions/showgroup.php:441 lib/profileaction.php:205
+msgid "Statistics"
+msgstr "统计"
+
+#: actions/showgroup.php:444
 msgctxt "LABEL"
 msgid "Created"
 msgstr "已创建"
 
 #. TRANS: Label for member count in statistics on group page.
-#: actions/showgroup.php:473
+#: actions/showgroup.php:449
 msgctxt "LABEL"
 msgid "Members"
 msgstr "成员"
@@ -5455,7 +5485,7 @@ msgstr "成员"
 #. TRANS: **%s** is the group alias, %%%%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).
-#: actions/showgroup.php:488
+#: actions/showgroup.php:464
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5473,7 +5503,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: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
-#: actions/showgroup.php:498
+#: actions/showgroup.php:474
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5487,7 +5517,7 @@ msgstr ""
 "趣的消息。"
 
 #. TRANS: Header for list of group administrators on a group page (h2).
-#: actions/showgroup.php:527
+#: actions/showgroup.php:503
 msgid "Admins"
 msgstr "管理员"
 
@@ -5526,7 +5556,7 @@ msgid "%1$s tagged %2$s"
 msgstr "%1$s 的标签 %2$s"
 
 #. TRANS: Page title showing tagged notices in one user's stream.
-#. TRANS: %1$s is the username, %2$s is the hash tag, %1$d is the page number.
+#. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
 #: actions/showstream.php:74
 #, php-format
 msgid "%1$s tagged %2$s, page %3$d"
@@ -5573,13 +5603,13 @@ msgid "FOAF for %s"
 msgstr "%s的FOAF"
 
 #. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
-#: actions/showstream.php:211
+#: actions/showstream.php:205
 #, php-format
 msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr "这是%1$s的时间线，但是%1$s还没有发布任何内容。"
 
 #. TRANS: Second sentence of empty list message for a stream for the user themselves.
-#: actions/showstream.php:217
+#: actions/showstream.php:211
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
@@ -5587,7 +5617,7 @@ msgstr "最近看到了什么有趣的消息了么？你还没有发布消息呢
 
 #. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:221
+#: actions/showstream.php:215
 #, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
@@ -5598,7 +5628,7 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:264
+#: actions/showstream.php:258
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5613,7 +5643,7 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:271
+#: actions/showstream.php:265
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5625,7 +5655,7 @@ msgstr ""
 "E5%BE%AE%E5%8D%9A%E5%AE%A2)。"
 
 #. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
-#: actions/showstream.php:328
+#: actions/showstream.php:322
 #, php-format
 msgid "Repeat of %s"
 msgstr "%s 的转发"
@@ -5767,108 +5797,106 @@ msgstr "整个网站的公告文字（最长255字符；可使用HTML）"
 
 #. TRANS: Title for button to save site notice in admin panel.
 #: actions/sitenoticeadminpanel.php:201
-#, fuzzy
-msgid "Save site notice"
+msgid "Save site notice."
 msgstr "保存网站公告。"
 
 #. TRANS: Title for SMS settings.
-#: actions/smssettings.php:57
+#: actions/smssettings.php:56
 msgid "SMS settings"
 msgstr "SMS 设置"
 
 #. TRANS: SMS settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/smssettings.php:71
+#: actions/smssettings.php:70
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr "你可以通过 %%site.name%% 的电子邮件接收SMS短信。"
 
 #. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
-#: actions/smssettings.php:93
+#: actions/smssettings.php:92
 msgid "SMS is not available."
 msgstr "SMS 不可用。"
 
 #. TRANS: Form legend for SMS settings form.
-#: actions/smssettings.php:107
+#: actions/smssettings.php:106
 msgid "SMS address"
 msgstr "SMS 地址"
 
 #. TRANS: Form guide in SMS settings form.
-#: actions/smssettings.php:116
+#: actions/smssettings.php:115
 msgid "Current confirmed SMS-enabled phone number."
 msgstr "已确认的可以发送SMS短消息的电话号码。"
 
 #. TRANS: Form guide in IM settings form.
-#: actions/smssettings.php:129
+#: actions/smssettings.php:128
 msgid "Awaiting confirmation on this phone number."
 msgstr "等待确认此电话号码。"
 
 #. TRANS: Field label for SMS address input in SMS settings form.
-#: actions/smssettings.php:138
+#: actions/smssettings.php:137
 msgid "Confirmation code"
 msgstr "确认码"
 
 #. TRANS: Form field instructions in SMS settings form.
-#: actions/smssettings.php:140
+#: actions/smssettings.php:139
 msgid "Enter the code you received on your phone."
 msgstr "输入手机收到的验证码。"
 
 #. TRANS: Button label to confirm SMS confirmation code in SMS settings.
-#: actions/smssettings.php:144
+#: actions/smssettings.php:143
 msgctxt "BUTTON"
 msgid "Confirm"
 msgstr "确认"
 
 #. TRANS: Field label for SMS phone number input in SMS settings form.
-#: actions/smssettings.php:149
+#: actions/smssettings.php:148
 msgid "SMS phone number"
 msgstr "SMS 电话号码"
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
-#: actions/smssettings.php:152
-#, fuzzy
-msgid "Phone number, no punctuation or spaces, with area code"
+#: actions/smssettings.php:151
+msgid "Phone number, no punctuation or spaces, with area code."
 msgstr "电话号码、 没有标点或带区号的空格。"
 
 #. TRANS: Form legend for SMS preferences form.
-#: actions/smssettings.php:191
+#: actions/smssettings.php:190
 msgid "SMS preferences"
 msgstr "SMS 偏好"
 
 #. TRANS: Checkbox label in SMS preferences form.
-#: actions/smssettings.php:197
+#: actions/smssettings.php:196
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
 msgstr "通过SMS短信将消息发给我；我了解这样也许会给我带来不菲的开支。"
 
 #. TRANS: Confirmation message for successful SMS preferences save.
-#: actions/smssettings.php:308
+#: actions/smssettings.php:307
 msgid "SMS preferences saved."
 msgstr "SMS设置已保存。"
 
 #. TRANS: Message given saving SMS phone number without having provided one.
-#: actions/smssettings.php:330
+#: actions/smssettings.php:329
 msgid "No phone number."
 msgstr "没有电话号码。"
 
 #. TRANS: Message given saving SMS phone number without having selected a carrier.
-#: actions/smssettings.php:336
+#: actions/smssettings.php:335
 msgid "No carrier selected."
 msgstr "未选择运营商。"
 
 #. TRANS: Message given saving SMS phone number that is already set.
-#: actions/smssettings.php:344
+#: actions/smssettings.php:343
 msgid "That is already your phone number."
 msgstr "你已登记此电话号码。"
 
 #. TRANS: Message given saving SMS phone number that is already set for another user.
-#: actions/smssettings.php:348
+#: actions/smssettings.php:347
 msgid "That phone number already belongs to another user."
 msgstr "这个电话号码属于另一个用户。"
 
 #. TRANS: Message given saving valid SMS phone number that is to be confirmed.
-#: actions/smssettings.php:376
+#: actions/smssettings.php:375
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
 "for the code and instructions on how to use it."
@@ -5876,39 +5904,39 @@ msgstr ""
 "验证码已被发送到你新增的电话号码。请检查你的电话，找到验证码并按要求使用它。"
 
 #. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
-#: actions/smssettings.php:404
+#: actions/smssettings.php:403
 msgid "That is the wrong confirmation number."
 msgstr "确认码错误。"
 
 #. TRANS: Message given after successfully canceling SMS phone number confirmation.
-#: actions/smssettings.php:418
+#: actions/smssettings.php:417
 msgid "SMS confirmation cancelled."
 msgstr "SMS 验证已取消。"
 
 #. TRANS: Message given trying to remove an SMS phone number that is not
 #. TRANS: registered for the active user.
-#: actions/smssettings.php:438
+#: actions/smssettings.php:437
 msgid "That is not your phone number."
 msgstr "这是他人的电话号码。"
 
 #. TRANS: Message given after successfully removing a registered SMS phone number.
-#: actions/smssettings.php:460
+#: actions/smssettings.php:459
 msgid "The SMS phone number was removed."
 msgstr "SMS 电话号码已移除。"
 
 #. TRANS: Label for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:499
+#: actions/smssettings.php:498
 msgid "Mobile carrier"
 msgstr "移动运营商"
 
 #. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:504
+#: actions/smssettings.php:503
 msgid "Select a carrier"
 msgstr "选择运营商"
 
 #. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
 #. TRANS: %s is an administrative contact's e-mail address.
-#: actions/smssettings.php:513
+#: actions/smssettings.php:512
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -5918,7 +5946,7 @@ msgstr ""
 "系 %s 以告知。"
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
-#: actions/smssettings.php:535
+#: actions/smssettings.php:534
 msgid "No code entered."
 msgstr "没有输入的代码。"
 
@@ -5991,15 +6019,13 @@ msgstr "你没有关注这个用户"
 msgid "Could not save subscription."
 msgstr "无法保存关注。"
 
-#: actions/subscribe.php:77
-msgid "This action only accepts POST requests."
-msgstr "这个动作只接受 POST 请求"
-
-#: actions/subscribe.php:117
+#. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
+#: actions/subscribe.php:121
 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
 msgstr "你不能用这个操作关注一个 OMB 0.1 远程用户。"
 
-#: actions/subscribe.php:145
+#. TRANS: Page title when subscription succeeded.
+#: actions/subscribe.php:149
 msgid "Subscribed"
 msgstr "已关注"
 
@@ -6112,31 +6138,34 @@ msgid "Subscription feed for %s (Atom)"
 msgstr "%s的订阅源 (Atom)"
 
 #. TRANS: Checkbox label for enabling Jabber messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:239
-msgid "Jabber"
-msgstr "Jabber"
+#: actions/subscriptions.php:241 lib/settingsnav.php:110
+#, fuzzy
+msgid "IM"
+msgstr "即时通讯IM"
 
 #. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:254
+#: actions/subscriptions.php:256 lib/settingsnav.php:117
 msgid "SMS"
 msgstr "SMS"
 
-#: actions/tag.php:69
+#. TRANS: Title for all but the first page of notices with tags.
+#. TRANS: %1$s is the tag, %2$d is the page number.
+#: actions/tag.php:73
 #, php-format
 msgid "Notices tagged with %1$s, page %2$d"
 msgstr "带%1$s标签的消息，第%2$d页"
 
-#: actions/tag.php:87
+#: actions/tag.php:91
 #, php-format
 msgid "Notice feed for tag %s (RSS 1.0)"
 msgstr "%s标签的消息聚合 (RSS 1.0)"
 
-#: actions/tag.php:93
+#: actions/tag.php:97
 #, php-format
 msgid "Notice feed for tag %s (RSS 2.0)"
 msgstr "%s标签的消息聚合 (RSS 2.0)"
 
-#: actions/tag.php:99
+#: actions/tag.php:103
 #, php-format
 msgid "Notice feed for tag %s (Atom)"
 msgstr "%s标签的消息聚合 (Atom)"
@@ -6155,29 +6184,28 @@ msgstr "将%s加为标签"
 msgid "User profile"
 msgstr "用户页面"
 
-#. TRANS: DT element in area for user avatar.
-#: actions/tagother.php:81 actions/userauthorization.php:132
-#: lib/userprofile.php:108
-msgid "Photo"
-msgstr "相片"
-
-#: actions/tagother.php:141
+#: actions/tagother.php:120
 msgid "Tag user"
 msgstr "将用户加为标签"
 
-#: actions/tagother.php:151
+#: actions/tagother.php:130
 msgid ""
 "Tags for this user (letters, numbers, -, ., and _), comma- or space- "
 "separated"
 msgstr ""
 "给这个用户加注标签 (字母letters, 数字numbers, -, ., and _), 逗号或空格分隔"
 
-#: actions/tagother.php:193
+#: actions/tagother.php:157
+#, php-format
+msgid "Invalid tag: \"%s\""
+msgstr "无效的标签：\"%s\"。"
+
+#: actions/tagother.php:172
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr "你只能给你关注或关注你的人添加标签。"
 
-#: actions/tagother.php:236
+#: actions/tagother.php:215
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr "使用这个表单给你的关注者或你关注的用户添加标签。"
 
@@ -6185,6 +6213,7 @@ msgstr "使用这个表单给你的关注者或你关注的用户添加标签。
 msgid "No such tag."
 msgstr "没有此标签。"
 
+#. TRANS: Client error displayed when trying to unblock a non-blocked user.
 #: actions/unblock.php:59
 msgid "You haven't blocked that user."
 msgstr "你未屏蔽该用户。"
@@ -6205,12 +6234,83 @@ msgstr "请求不含资料页 ID。"
 msgid "Unsubscribed"
 msgstr "已取消关注"
 
-#: actions/updateprofile.php:64 actions/userauthorization.php:337
+#: actions/updateprofile.php:64
 #, php-format
 msgid ""
 "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
 msgstr "Listenee stream 许可证“‘%1$s” 与本网站的许可证 “%2$s”不兼容。"
 
+#: actions/urlsettings.php:60
+#, fuzzy
+msgid "URL settings"
+msgstr "IM 设置"
+
+#. TRANS: Instructions for tab "Other" in user profile settings.
+#: actions/urlsettings.php:72
+msgid "Manage various other options."
+msgstr "管理其他选项。"
+
+#. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
+#. TRANS: user's profile settings. This message has one space at the beginning. Use your
+#. TRANS: language's word separator here if it has one (most likely a single space).
+#: actions/urlsettings.php:115
+msgid " (free service)"
+msgstr "（免费服务）"
+
+#: actions/urlsettings.php:121
+#, fuzzy
+msgid "[none]"
+msgstr "无"
+
+#: actions/urlsettings.php:122
+msgid "[internal]"
+msgstr ""
+
+#. TRANS: Label for dropdown with URL shortener services.
+#: actions/urlsettings.php:130
+msgid "Shorten URLs with"
+msgstr "缩短 URL 使用"
+
+#. TRANS: Tooltip for for dropdown with URL shortener services.
+#: actions/urlsettings.php:132
+msgid "Automatic shortening service to use."
+msgstr "要使用的自动短网址服务。"
+
+#: actions/urlsettings.php:138
+msgid "URL longer than"
+msgstr ""
+
+#: actions/urlsettings.php:141
+msgid "URLs longer than this will be shortened, 0 means always shorten."
+msgstr ""
+
+#: actions/urlsettings.php:145
+msgid "Text longer than"
+msgstr ""
+
+#: actions/urlsettings.php:148
+msgid ""
+"URLs in notices longer than this will be shortened, 0 means always shorten."
+msgstr ""
+
+#. TRANS: Form validation error for form "Other settings" in user profile.
+#: actions/urlsettings.php:180
+msgid "URL shortening service is too long (maximum 50 characters)."
+msgstr "短网址服务过长(不能超过50个字符)。"
+
+#: actions/urlsettings.php:187
+msgid "Invalid number for max url length."
+msgstr ""
+
+#: actions/urlsettings.php:193
+#, fuzzy
+msgid "Invalid number for max notice length."
+msgstr "无效的消息内容。"
+
+#: actions/urlsettings.php:238
+msgid "Error saving user URL shortening preferences."
+msgstr ""
+
 #. TRANS: User admin panel title
 #: actions/useradminpanel.php:58
 msgctxt "TITLE"
@@ -6235,12 +6335,12 @@ msgstr "无效的欢迎文字。最大长度255个字符。"
 #. TRANS: Client error displayed when trying to set a non-existing user as default subscription for new
 #. TRANS: users in user admin panel. %1$s is the invalid nickname.
 #: actions/useradminpanel.php:166
-#, fuzzy, php-format
-msgid "Invalid default subscripton: '%1$s' is not a user."
+#, php-format
+msgid "Invalid default subscripton: \"%1$s\" is not a user."
 msgstr "无效的默认关注：“%1$s”不是一个用户。"
 
-#. TRANS: Link description in user account settings menu.
-#: actions/useradminpanel.php:215 lib/accountsettingsaction.php:106
+#: actions/useradminpanel.php:215 lib/action.php:565 lib/settingsnav.php:77
+#: lib/subgroupnav.php:81
 msgid "Profile"
 msgstr "个人信息"
 
@@ -6296,59 +6396,57 @@ msgstr "是否允许用户发送注册邀请。"
 
 #. TRANS: Title for button to save user settings in user admin panel.
 #: actions/useradminpanel.php:302
-#, fuzzy
-msgid "Save user settings"
+msgid "Save user settings."
 msgstr "保存用户设置。"
 
-#: actions/userauthorization.php:105
+#. TRANS: Page title.
+#: actions/userauthorization.php:109
 msgid "Authorize subscription"
 msgstr "授权关注"
 
-#: actions/userauthorization.php:110
-#, fuzzy
+#. TRANS: Page notice on "Auhtorize subscription" page.
+#: actions/userauthorization.php:115
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
 "user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
-"click “Reject”."
+"click \"Reject\"."
 msgstr ""
 "请检查这些详细信息，请确保您要订阅此用户的通知。如果您不只是要求某人的通知订"
 "阅，请单击\"拒绝\"。"
 
-#. TRANS: Menu item for site administration
-#: actions/userauthorization.php:196 actions/version.php:167
-#: lib/adminpanelaction.php:403
-msgid "License"
-msgstr "许可协议"
-
-#: actions/userauthorization.php:217
-#, fuzzy
+#. TRANS: Button text on Authorise Subscription page.
+#: actions/userauthorization.php:200
+msgctxt "BUTTON"
 msgid "Accept"
 msgstr "接受"
 
-#: actions/userauthorization.php:218 lib/subscribeform.php:115
-#: lib/subscribeform.php:139
-msgid "Subscribe to this user"
-msgstr "关注这个用户"
+#. TRANS: Title for button on Authorise Subscription page.
+#: actions/userauthorization.php:202
+msgid "Subscribe to this user."
+msgstr "订阅此用户。"
 
-#: actions/userauthorization.php:219
-#, fuzzy
+#. TRANS: Button text on Authorise Subscription page.
+#: actions/userauthorization.php:204
+msgctxt "BUTTON"
 msgid "Reject"
 msgstr "拒绝"
 
-#: actions/userauthorization.php:220
-#, fuzzy
-msgid "Reject this subscription"
+#. TRANS: Title for button on Authorise Subscription page.
+#: actions/userauthorization.php:206
+msgid "Reject this subscription."
 msgstr "拒绝此订阅。"
 
-#: actions/userauthorization.php:232
+#. TRANS: Client error displayed for an empty authorisation request.
+#: actions/userauthorization.php:219
 msgid "No authorization request!"
 msgstr "没有授权请求！"
 
-#: actions/userauthorization.php:254
+#. TRANS: Accept message header from Authorise subscription page.
+#: actions/userauthorization.php:242
 msgid "Subscription authorized"
 msgstr "已授权关注"
 
-#: actions/userauthorization.php:256
+#: actions/userauthorization.php:245
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to authorize the "
@@ -6357,68 +6455,110 @@ msgstr ""
 "已授权关注，但是没有回传 URL。请到网站查看如何授权关注。你的 subscription "
 "token 是："
 
-#: actions/userauthorization.php:266
+#. TRANS: Reject message header from Authorise subscription page.
+#: actions/userauthorization.php:256
 msgid "Subscription rejected"
 msgstr "关注已拒绝"
 
-#: actions/userauthorization.php:268
+#: actions/userauthorization.php:259
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to fully reject the "
 "subscription."
 msgstr "关注已拒绝，但是没有回传 URL。请到网站查看如何完全拒绝关注。"
 
-#: actions/userauthorization.php:303
+#. TRANS: Exception thrown when no valid user is found for an authorisation request.
+#. TRANS: %s is a listener URI.
+#: actions/userauthorization.php:296
 #, fuzzy, php-format
-msgid "Listener URI ‘%s’ not found here."
+msgid "Listener URI \"%s\" not found here."
 msgstr "Listener URI ‘%s’ 没有找到。"
 
-#: actions/userauthorization.php:308
+#. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
+#. TRANS: %s is a listenee URI.
+#: actions/userauthorization.php:303
 #, fuzzy, php-format
-msgid "Listenee URI ‘%s’ is too long."
+msgid "Listenee URI \"%s\" is too long."
 msgstr "Listenee URI ‘%s’ 过长。"
 
-#: actions/userauthorization.php:314
+#. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
+#. TRANS: %s is a listenee URI.
+#: actions/userauthorization.php:311
 #, fuzzy, php-format
-msgid "Listenee URI ‘%s’ is a local user."
+msgid "Listenee URI \"%s\" is a local user."
 msgstr "Listenee URI ‘%s’ 是一个本地用户。"
 
+#. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
+#. TRANS: %s is a profile URL.
 #: actions/userauthorization.php:329
 #, fuzzy, php-format
-msgid "Profile URL ‘%s’ is for a local user."
+msgid "Profile URL \"%s\" is for a local user."
 msgstr "个人信息 URL “%s” 是为本地用户的。"
 
-#: actions/userauthorization.php:345
+#. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
+#. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
+#: actions/userauthorization.php:339
 #, fuzzy, php-format
-msgid "Avatar URL ‘%s’ is not valid."
+msgid ""
+"Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
+"\"."
+msgstr "Listenee stream 许可证“‘%1$s” 与本网站的许可证 “%2$s”不兼容。"
+
+#. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
+#. TRANS: %s is an avatar URL.
+#: actions/userauthorization.php:349
+#, fuzzy, php-format
+msgid "Avatar URL \"%s\" is not valid."
 msgstr "头像地址‘%s’无效。"
 
-#: actions/userauthorization.php:350
+#. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
+#. TRANS: %s is an avatar URL.
+#: actions/userauthorization.php:356
 #, fuzzy, php-format
-msgid "Can’t read avatar URL ‘%s’."
+msgid "Cannot read avatar URL \"%s\"."
 msgstr "无法读取头像 URL '%s'。"
 
-#: actions/userauthorization.php:355
+#. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
+#. TRANS: %s is an avatar URL.
+#: actions/userauthorization.php:363
 #, fuzzy, php-format
-msgid "Wrong image type for avatar URL ‘%s’."
+msgid "Wrong image type for avatar URL \"%s\"."
 msgstr "头像 URL ‘%s’ 图像格式错误。"
 
 #. TRANS: Page title for profile design page.
-#: actions/userdesignsettings.php:74 lib/designsettings.php:63
+#: actions/userdesignsettings.php:74 lib/designsettings.php:61
 msgid "Profile design"
 msgstr "个人页面外观"
 
 #. TRANS: Instructions for profile design page.
-#: actions/userdesignsettings.php:84 lib/designsettings.php:74
+#: actions/userdesignsettings.php:84 lib/designsettings.php:72
 msgid ""
 "Customize the way your profile looks with a background image and a colour "
 "palette of your choice."
 msgstr "通过背景图片和调色板自定义你的页面外观。"
 
-#: actions/userdesignsettings.php:272
+#: actions/userdesignsettings.php:289
 msgid "Enjoy your hotdog!"
 msgstr "享受你的成果吧！"
 
+#: actions/userdesignsettings.php:325
+#, fuzzy
+msgid "Design settings"
+msgstr "保存访问设置"
+
+#: actions/userdesignsettings.php:340
+msgid "View profile designs"
+msgstr "查看个人页面外观"
+
+#: actions/userdesignsettings.php:341
+msgid "Show or hide profile designs."
+msgstr "显示或隐藏个人页面外观。"
+
+#: actions/userdesignsettings.php:348
+#, fuzzy
+msgid "Background file"
+msgstr "背景"
+
 #. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number.
 #: actions/usergroups.php:66
 #, php-format
@@ -6467,6 +6607,11 @@ msgstr ""
 msgid "Contributors"
 msgstr "贡献者"
 
+#. TRANS: Menu item for site administration
+#: actions/version.php:167 lib/adminpanelaction.php:403
+msgid "License"
+msgstr "许可协议"
+
 #: actions/version.php:170
 msgid ""
 "StatusNet is free software: you can redistribute it and/or modify it under "
@@ -6494,12 +6639,13 @@ msgid ""
 "along with this program.  If not, see %s."
 msgstr "你应该在本程序中收到了一份 GNU Affero GPL 的副本，如果没有收到请看%s。"
 
-#: actions/version.php:191
-msgid "Plugins"
-msgstr "插件"
+#. TRANS: Form input field label for application name.
+#: actions/version.php:197 lib/applicationeditform.php:190
+msgid "Name"
+msgstr "名称"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:901
+#: actions/version.php:198 lib/action.php:885
 msgid "Version"
 msgstr "版本"
 
@@ -6507,6 +6653,12 @@ msgstr "版本"
 msgid "Author(s)"
 msgstr "作者"
 
+#. TRANS: Form input field label.
+#: actions/version.php:200 lib/applicationeditform.php:208
+#: lib/groupeditform.php:168
+msgid "Description"
+msgstr "描述"
+
 #. TRANS: Activity title when marking a notice as favorite.
 #: classes/Fave.php:164
 msgid "Favor"
@@ -6618,7 +6770,7 @@ msgid "Could not create login token for %s"
 msgstr "无法创建别名。"
 
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
-#: classes/Memcached_DataObject.php:542
+#: classes/Memcached_DataObject.php:556
 msgid "No database name or DSN found anywhere."
 msgstr "没有找到数据库名称或者 DSN。"
 
@@ -6788,18 +6940,18 @@ msgstr "%1$s 现在开始关注了 %2$s。"
 
 #. TRANS: Notice given on user registration.
 #. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:395
+#: classes/User.php:390
 #, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr "欢迎来到 %1$s，@%2$s！"
 
 #. TRANS: Server exception.
-#: classes/User.php:918
+#: classes/User.php:923
 msgid "No single user defined for single-user mode."
 msgstr "没有单独的用户被定义为单用户模式。"
 
 #. TRANS: Server exception.
-#: classes/User.php:922
+#: classes/User.php:927
 msgid "Single-user mode code called when not enabled."
 msgstr "没启用单用户模式的代码。"
 
@@ -6844,41 +6996,6 @@ msgstr ""
 msgid "No AtomPub API service for %s."
 msgstr ""
 
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:104
-msgid "Change your profile settings"
-msgstr "修改你的个人信息"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:111
-msgid "Upload an avatar"
-msgstr "上传一个头像。"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:118
-msgid "Change your password"
-msgstr "修改密码"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:125
-msgid "Change email handling"
-msgstr "修改电子邮件"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:132
-msgid "Design your profile"
-msgstr "设计你的个人页面外观"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:139
-msgid "Other options"
-msgstr "其他选项"
-
-#. TRANS: Link description in user account settings menu.
-#: lib/accountsettingsaction.php:141
-msgid "Other"
-msgstr "其他"
-
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
 #: lib/action.php:161
 #, php-format
@@ -6896,206 +7013,128 @@ msgctxt "TOOLTIP"
 msgid "Show more"
 msgstr "显示更多"
 
-#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:544
-msgid "Primary site navigation"
-msgstr "主站导航"
+#. TRANS: Inline reply form submit button: submits a reply comment.
+#: lib/action.php:328
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Comment"
+msgstr "内容"
 
-#. TRANS: Tooltip for main menu option "Personal".
-#: lib/action.php:550
-msgctxt "TOOLTIP"
-msgid "Personal profile and friends timeline"
-msgstr "个人资料及朋友的时间线"
+#. TRANS: Placeholder text for inline reply form. Clicking in this box will turn it into a mini notice form.
+#: lib/action.php:331
+msgid "Add a comment..."
+msgstr ""
 
-#. TRANS: Main menu option when logged in for access to personal profile and friends timeline.
-#. TRANS: Personal group navigation menu option when logged in for viewing timeline of self and friends.
-#: lib/action.php:553 lib/personalgroupnav.php:100
-msgctxt "MENU"
-msgid "Personal"
-msgstr "个人"
+#: lib/action.php:559 lib/personalgroupnav.php:99
+#, fuzzy
+msgid "Home"
+msgstr "主页"
 
-#. TRANS: Tooltip for main menu option "Account".
-#: lib/action.php:555
-msgctxt "TOOLTIP"
-msgid "Change your email, avatar, password, profile"
-msgstr "修改你的 email 地址、头像、密码、资料"
-
-#. TRANS: Main menu option when logged in for access to user settings.
-#: lib/action.php:558
-msgid "Account"
-msgstr "帐号"
-
-#. TRANS: Tooltip for main menu option "Services".
 #: lib/action.php:560
-msgctxt "TOOLTIP"
-msgid "Connect to services"
-msgstr "关联的服务"
+#, fuzzy
+msgid "Friends timeline"
+msgstr "%s的时间线"
 
-#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services.
-#: lib/action.php:563
-msgid "Connect"
-msgstr "关联"
-
-#. TRANS: Tooltip for menu option "Admin".
 #: lib/action.php:566
-msgctxt "TOOLTIP"
-msgid "Change site configuration"
-msgstr "更改网站配置"
+#, fuzzy
+msgid "Your profile"
+msgstr "小组资料"
 
-#. TRANS: Main menu option when logged in and site admin for access to site configuration.
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/action.php:569 lib/groupnav.php:117
-msgctxt "MENU"
-msgid "Admin"
-msgstr "管理"
+#: lib/action.php:570 lib/action.php:593 lib/publicgroupnav.php:78
+msgid "Public"
+msgstr "公共"
 
-#. TRANS: Tooltip for main menu option "Invite".
-#: lib/action.php:573
-#, php-format
-msgctxt "TOOLTIP"
-msgid "Invite friends and colleagues to join you on %s"
-msgstr "邀请好友和同事加入%s。"
+#: lib/action.php:571 lib/action.php:594
+#, fuzzy
+msgid "Everyone on this site"
+msgstr "搜索本站用户"
+
+#: lib/action.php:575
+#, fuzzy
+msgid "Settings"
+msgstr "SMS 设置"
 
-#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users.
 #: lib/action.php:576
-msgctxt "MENU"
-msgid "Invite"
-msgstr "邀请"
+#, fuzzy
+msgid "Change your personal settings"
+msgstr "修改你的个人信息"
 
-#. TRANS: Tooltip for main menu option "Logout"
 #: lib/action.php:582
-msgctxt "TOOLTIP"
-msgid "Logout from the site"
-msgstr "从网站登出"
+#, fuzzy
+msgid "Site configuration"
+msgstr "用户配置"
 
-#. TRANS: Main menu option when logged in to log out the current user.
-#: lib/action.php:585
-msgctxt "MENU"
+#: lib/action.php:587
+#, fuzzy
 msgid "Logout"
 msgstr "登出"
 
-#. TRANS: Tooltip for main menu option "Register".
-#: lib/action.php:590
-msgctxt "TOOLTIP"
-msgid "Create an account"
-msgstr "创建一个账户"
+#: lib/action.php:588
+#, fuzzy
+msgid "Logout from the site"
+msgstr "从网站登出"
 
-#. TRANS: Main menu option when not logged in to register a new account.
-#. TRANS: Menu item for registering with the StatusNet site.
-#: lib/action.php:593 lib/logingroupnav.php:85
-msgctxt "MENU"
-msgid "Register"
-msgstr "注册"
-
-#. TRANS: Tooltip for main menu option "Login".
-#: lib/action.php:596
-msgctxt "TOOLTIP"
+#: lib/action.php:599
+#, fuzzy
 msgid "Login to the site"
 msgstr "登录这个网站"
 
-#. TRANS: Main menu option when not logged in to log in.
-#. TRANS: Menu item for logging in to the StatusNet site.
-#: lib/action.php:599 lib/logingroupnav.php:77
-msgctxt "MENU"
-msgid "Login"
-msgstr "登录"
-
-#. TRANS: Tooltip for main menu option "Help".
-#: lib/action.php:602
-msgctxt "TOOLTIP"
-msgid "Help me!"
-msgstr "帮助我！"
-
-#. TRANS: Main menu option for help on the StatusNet site.
-#: lib/action.php:605
-msgctxt "MENU"
-msgid "Help"
-msgstr "帮助"
-
-#. TRANS: Tooltip for main menu option "Search".
-#: lib/action.php:608
-msgctxt "TOOLTIP"
-msgid "Search for people or text"
-msgstr "搜索人或文字"
-
-#. TRANS: Main menu option when logged in or when the StatusNet instance is not private.
-#: lib/action.php:611
-msgctxt "MENU"
+#: lib/action.php:606
+#, fuzzy
 msgid "Search"
 msgstr "搜索"
 
-#. TRANS: DT element for site notice. String is hidden in default CSS.
-#. TRANS: Menu item for site administration
-#: lib/action.php:633 lib/adminpanelaction.php:387
-msgid "Site notice"
-msgstr "网站消息"
-
-#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:700
-msgid "Local views"
-msgstr "本地显示"
-
-#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:770
-msgid "Page notice"
-msgstr "页面消息"
-
-#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:874
-msgid "Secondary site navigation"
-msgstr "副站导航"
+#: lib/action.php:607
+#, fuzzy
+msgid "Search the site"
+msgstr "搜索帮助"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:880
+#: lib/action.php:864
 msgid "Help"
 msgstr "帮助"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:883
+#: lib/action.php:867
 msgid "About"
 msgstr "关于"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:886
+#: lib/action.php:870
 msgid "FAQ"
 msgstr "FAQ"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:891
+#: lib/action.php:875
 msgid "TOS"
 msgstr "条款"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:895
+#: lib/action.php:879
 msgid "Privacy"
 msgstr "隐私"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:898
+#: lib/action.php:882
 msgid "Source"
 msgstr "源码"
 
 #. TRANS: Secondary navigation menu option leading to e-mail contact information on the
 #. TRANS: StatusNet site, where to report bugs, ...
-#: lib/action.php:905
+#: lib/action.php:889
 msgid "Contact"
 msgstr "联系"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:908
+#: lib/action.php:892
 msgid "Badge"
 msgstr "挂件"
 
-#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:937
-msgid "StatusNet software license"
-msgstr "StatusNet 软件许可证"
-
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:944
+#: lib/action.php:921
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7105,7 +7144,7 @@ msgstr ""
 "broughtbyurl%%)。"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:947
+#: lib/action.php:924
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** 是一个微博客服务。"
@@ -7114,7 +7153,7 @@ msgstr "**%%site.name%%** 是一个微博客服务。"
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:954
+#: lib/action.php:931
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7124,51 +7163,41 @@ msgstr ""
 "它运行[StatusNet](http://status.net/)微博客服务，版本 %s，[GNU Affero GPL]"
 "(http://www.fsf.org/licensing/licenses/agpl-3.0.html)授权。"
 
-#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:970
-msgid "Site content license"
-msgstr "网站内容许可协议"
-
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:977
+#: lib/action.php:949
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr "%1$s的内容和数据是私人且保密的。"
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:984
+#: lib/action.php:956
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr "内容和数据%1$s版权所有并保留所有权利。"
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:988
+#: lib/action.php:960
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr "内容和数据贡献者版权所有并保留所有权利。"
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:1020
+#: lib/action.php:992
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr "所有%1$s的内容和数据在%2$s许可下有效。"
 
-#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1356
-msgid "Pagination"
-msgstr "分页"
-
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1367
+#: lib/action.php:1335
 msgid "After"
 msgstr "之后"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1377
+#: lib/action.php:1345
 msgid "Before"
 msgstr "之前"
 
@@ -7319,7 +7348,7 @@ msgid "User configuration"
 msgstr "用户配置"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:122
+#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:110
 msgid "User"
 msgstr "用户"
 
@@ -7343,6 +7372,11 @@ msgstr "会话配置"
 msgid "Edit site notice"
 msgstr "编辑网站消息"
 
+#. TRANS: Menu item for site administration
+#: lib/adminpanelaction.php:387
+msgid "Site notice"
+msgstr "网站消息"
+
 #. TRANS: Menu item title/tooltip
 #: lib/adminpanelaction.php:393
 msgid "Snapshots configuration"
@@ -7353,6 +7387,12 @@ msgstr "更改站点配置"
 msgid "Set site license"
 msgstr "设置网站许可协议"
 
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:409
+#, fuzzy
+msgid "Plugins configuration"
+msgstr "路径配置"
+
 #. TRANS: Client error 401.
 #: lib/apiauth.php:111
 msgid "API resource requires read-write access, but you only have read access."
@@ -7363,19 +7403,23 @@ msgstr "API 资源需要读写的访问权限，但是你只有只读的权限
 msgid "No application for that consumer key."
 msgstr "没有应用使用这个 consumer key。"
 
+#: lib/apiauth.php:202 lib/apiauth.php:284
+msgid "Not allowed to use API."
+msgstr ""
+
 #. TRANS: OAuth exception given when an incorrect access token was given for a user.
-#: lib/apiauth.php:219
+#: lib/apiauth.php:225
 msgid "Bad access token."
 msgstr "无效的 access token。"
 
 #. TRANS: OAuth exception given when no user was found for a given token (no token was found).
-#: lib/apiauth.php:224
+#: lib/apiauth.php:230
 msgid "No user for that token."
 msgstr "没有用户使用这个 token。"
 
 #. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel".
 #. TRANS: Client error thrown when authentication fails.
-#: lib/apiauth.php:266 lib/apiauth.php:293
+#: lib/apiauth.php:272 lib/apiauth.php:302
 msgid "Could not authenticate you."
 msgstr "无法验证你。"
 
@@ -7418,6 +7462,11 @@ msgstr "尝试了取消未知的 token。"
 msgid "Failed to delete revoked token."
 msgstr "删除取消的 token 失败。"
 
+#. TRANS: Form input field label for application icon.
+#: lib/applicationeditform.php:177
+msgid "Icon"
+msgstr "图标"
+
 #. TRANS: Form guide.
 #: lib/applicationeditform.php:182
 msgid "Icon for this application"
@@ -7451,6 +7500,11 @@ msgstr "来源网址"
 msgid "Organization responsible for this application"
 msgstr "该应用的负责组织"
 
+#. TRANS: Form input field label.
+#: lib/applicationeditform.php:227
+msgid "Organization"
+msgstr "组织名称必填。"
+
 #. TRANS: Form input field instructions.
 #: lib/applicationeditform.php:234
 msgid "URL for the homepage of the organization"
@@ -7538,16 +7592,6 @@ msgstr "作者元素必须包含一个名称元素。"
 msgid "Do not use this method!"
 msgstr "不要使用此方法 ！"
 
-#. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:293
-msgid "Author"
-msgstr "作者"
-
-#. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:307
-msgid "Provider"
-msgstr "提供者"
-
 #. TRANS: Title.
 #: lib/attachmentnoticesection.php:67
 msgid "Notices where this attachment appears"
@@ -7573,23 +7617,28 @@ msgstr "不允许更改密码。"
 msgid "Block"
 msgstr "屏蔽"
 
+#. TRANS: Description of the form to block a user.
+#: lib/blockform.php:79
+msgid "Block this user"
+msgstr "屏蔽这个用户"
+
 #. TRANS: Title for command results.
-#: lib/channel.php:160 lib/channel.php:181
+#: lib/channel.php:104 lib/channel.php:125
 msgid "Command results"
 msgstr "执行结果"
 
 #. TRANS: Title for command results.
-#: lib/channel.php:194
+#: lib/channel.php:138
 msgid "AJAX error"
 msgstr "AJAX 错误"
 
 #. TRANS: E-mail subject when a command has completed.
-#: lib/channel.php:233 lib/mailhandler.php:143
+#: lib/channel.php:177 lib/mailhandler.php:143
 msgid "Command complete"
 msgstr "执行完毕"
 
 #. TRANS: E-mail subject when a command has failed.
-#: lib/channel.php:244
+#: lib/channel.php:188
 msgid "Command failed"
 msgstr "执行失败"
 
@@ -7692,7 +7741,7 @@ msgstr "全名：%s"
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a location.
-#: lib/command.php:446 lib/mail.php:270
+#: lib/command.php:446 lib/mail.php:275
 #, php-format
 msgid "Location: %s"
 msgstr "位置：%s"
@@ -7700,7 +7749,7 @@ msgstr "位置：%s"
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a homepage.
-#: lib/command.php:450 lib/mail.php:274
+#: lib/command.php:450 lib/mail.php:279
 #, php-format
 msgid "Homepage: %s"
 msgstr "主页：%s"
@@ -7963,106 +8012,99 @@ msgstr ""
 "tracking - 尚未实现。\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:162
+#: lib/common.php:36
 msgid "No configuration file found."
 msgstr "没有找到配置文件。"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:165
+#: lib/common.php:39
 msgid "I looked for configuration files in the following places:"
 msgstr "我在以下位置查找了配置文件："
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:168
+#: lib/common.php:42
 msgid "You may wish to run the installer to fix this."
 msgstr "或许你想运行安装程序来解决这个问题。"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:172
+#: lib/common.php:46
 msgid "Go to the installer."
 msgstr "去安装程序。"
 
-#. TRANS: Menu item for Instant Messaging settings.
-#: lib/connectsettingsaction.php:106
-msgctxt "MENU"
-msgid "IM"
-msgstr "即时通讯IM"
-
-#. TRANS: Tooltip for Instant Messaging menu item.
-#: lib/connectsettingsaction.php:108
-msgid "Updates by instant messenger (IM)"
-msgstr "使用即时通讯工具(IM)更新"
-
-#. TRANS: Menu item for Short Message Service settings.
-#: lib/connectsettingsaction.php:113
-msgctxt "MENU"
-msgid "SMS"
-msgstr "SMS"
-
-#. TRANS: Tooltip for Short Message Service menu item.
-#: lib/connectsettingsaction.php:115
-msgid "Updates by SMS"
-msgstr "使用 SMS 更新"
-
-#. TRANS: Menu item for OuAth connection settings.
-#: lib/connectsettingsaction.php:120
-msgctxt "MENU"
-msgid "Connections"
-msgstr "关联"
-
-#. TRANS: Tooltip for connected applications (Connections through OAuth) menu item.
-#: lib/connectsettingsaction.php:122
-msgid "Authorized connected applications"
-msgstr "被授权已连接的应用"
-
 #: lib/dberroraction.php:59
 msgid "Database error"
 msgstr "数据库错误"
 
+#. TRANS: Description of form for deleting a user.
+#: lib/deleteuserform.php:75
+msgid "Delete this user"
+msgstr "删除这个用户"
+
+#: lib/designform.php:114
+#, fuzzy
+msgid "Change design"
+msgstr "保存外观"
+
+#. TRANS: Fieldset legend on profile design page to change profile page colours.
+#: lib/designform.php:131
+msgid "Change colours"
+msgstr "改变颜色"
+
+#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
+#: lib/designform.php:138
+msgid "Use defaults"
+msgstr "使用默认值"
+
+#. TRANS: Title for button on profile design page to reset all colour settings to default.
+#: lib/designform.php:140
+msgid "Restore default designs"
+msgstr "恢复默认外观"
+
+#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
+#: lib/designform.php:148
+msgid "Reset back to default"
+msgstr "重置到默认"
+
 #. TRANS: Label in form on profile design page.
 #. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
-#: lib/designsettings.php:108
+#: lib/designform.php:158
 msgid "Upload file"
 msgstr "上传文件"
 
 #. TRANS: Instructions for form on profile design page.
-#: lib/designsettings.php:113
+#: lib/designform.php:163
+#, fuzzy
 msgid ""
-"You can upload your personal background image. The maximum file size is 2MB."
+"You can upload your personal background image. The maximum file size is 2Mb."
 msgstr "你可以上传你的个人页面背景。文件最大 2MB。"
 
 #. TRANS: Radio button on profile design page that will enable use of the uploaded profile image.
-#: lib/designsettings.php:139
+#: lib/designform.php:194
 msgctxt "RADIO"
 msgid "On"
 msgstr "打开"
 
 #. TRANS: Radio button on profile design page that will disable use of the uploaded profile image.
-#: lib/designsettings.php:156
+#: lib/designform.php:211
 msgctxt "RADIO"
 msgid "Off"
 msgstr "关闭"
 
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: lib/designsettings.php:175
-msgid "Change colours"
-msgstr "改变颜色"
-
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: lib/designsettings.php:257
-msgid "Use defaults"
-msgstr "使用默认值"
+#. TRANS: Title for button on profile design page to save settings.
+#: lib/designform.php:322
+msgid "Save design"
+msgstr "保存外观"
 
 #. TRANS: Error message displayed if design settings could not be saved.
 #. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
-#: lib/designsettings.php:405 lib/designsettings.php:427
+#: lib/designsettings.php:216 lib/designsettings.php:238
 msgid "Couldn't update your design."
 msgstr "无法更新你的外观。"
 
 #. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
-#: lib/designsettings.php:433
+#: lib/designsettings.php:244
 msgid "Design defaults restored."
 msgstr "默认外观已恢复。"
 
@@ -8129,27 +8171,23 @@ msgstr "没有用户无法导入。"
 msgid "Feeds"
 msgstr "Feeds"
 
-#: lib/galleryaction.php:121
-msgid "Filter tags"
-msgstr "过滤标签"
-
-#: lib/galleryaction.php:131
+#: lib/galleryaction.php:128
 msgid "All"
 msgstr "全部"
 
-#: lib/galleryaction.php:139
+#: lib/galleryaction.php:136
 msgid "Select tag to filter"
 msgstr "选择要过滤的标签"
 
-#: lib/galleryaction.php:140
+#: lib/galleryaction.php:137
 msgid "Tag"
 msgstr "标签"
 
-#: lib/galleryaction.php:141
+#: lib/galleryaction.php:138
 msgid "Choose a tag to narrow list"
 msgstr "选择标签缩小清单"
 
-#: lib/galleryaction.php:143
+#: lib/galleryaction.php:140
 msgid "Go"
 msgstr "执行"
 
@@ -8233,6 +8271,12 @@ msgctxt "TOOLTIP"
 msgid "%s blocked users"
 msgstr "%s 屏蔽的用户"
 
+#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
+#: lib/groupnav.php:117
+msgctxt "MENU"
+msgid "Admin"
+msgstr "管理"
+
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
 #: lib/groupnav.php:120
@@ -8339,39 +8383,61 @@ msgid "%dB"
 msgid_plural "%dB"
 msgstr[0] "%dB"
 
-#: lib/jabber.php:387
+#: lib/implugin.php:262
 #, php-format
-msgid "[%s]"
-msgstr "[%s]"
+msgid ""
+"User \"%s\" on %s has said that your %s screenname belongs to them. If "
+"that's true, you can confirm by clicking on this URL: %s . (If you cannot "
+"click it, copy-and-paste it into the address bar of your browser). If that "
+"user isn't you, or if you didn't request this confirmation, just ignore this "
+"message."
+msgstr ""
 
-#: lib/jabber.php:567
+#: lib/implugin.php:349
 #, php-format
 msgid "Unknown inbox source %d."
 msgstr "未知的收件箱来源%d。"
 
+#: lib/implugin.php:485
+#, fuzzy, php-format
+msgid "Message too long - maximum is %1$d characters, you sent %2$d."
+msgstr "消息太长了 - 最大长度为%1$d字符，你发送的是%2$d字符。"
+
 #: lib/leaveform.php:114
 msgid "Leave"
 msgstr "离开"
 
+#. TRANS: Menu item for logging in to the StatusNet site.
+#: lib/logingroupnav.php:77
+msgctxt "MENU"
+msgid "Login"
+msgstr "登录"
+
 #. TRANS: Title for menu item for logging in to the StatusNet site.
 #: lib/logingroupnav.php:79
 msgid "Login with a username and password"
 msgstr "用用户名和密码登录。"
 
+#. TRANS: Menu item for registering with the StatusNet site.
+#: lib/logingroupnav.php:85
+msgctxt "MENU"
+msgid "Register"
+msgstr "注册"
+
 #. TRANS: Title for menu item for registering with the StatusNet site.
 #: lib/logingroupnav.php:87
 msgid "Sign up for a new account"
 msgstr "注册一个新帐户"
 
 #. TRANS: Subject for address confirmation email.
-#: lib/mail.php:168
+#: lib/mail.php:172
 msgid "Email address confirmation"
 msgstr "电子邮件地址确认"
 
 #. TRANS: Body for address confirmation email.
 #. TRANS: %1$s is the addressed user's nickname, %2$s is the StatusNet sitename,
 #. TRANS: %3$s is the URL to confirm at.
-#: lib/mail.php:173
+#: lib/mail.php:177
 #, php-format
 msgid ""
 "Hey, %1$s.\n"
@@ -8402,14 +8468,14 @@ msgstr ""
 
 #. TRANS: Subject of new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
-#: lib/mail.php:238
+#: lib/mail.php:243
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1$s 开始关注你在 %2$s 的消息。"
 
 #. TRANS: This is a paragraph in a new-subscriber e-mail.
 #. TRANS: %s is a URL where the subscriber can be reported as abusive.
-#: lib/mail.php:245
+#: lib/mail.php:250
 #, php-format
 msgid ""
 "If you believe this account is being used abusively, you can block them from "
@@ -8423,7 +8489,7 @@ msgstr ""
 #. TRANS: %3$s is the subscriber's profile URL, %4$s is the subscriber's location (or empty)
 #. TRANS: %5$s is the subscriber's homepage URL (or empty), %6%s is the subscriber's bio (or empty)
 #. TRANS: %7$s is a link to the addressed user's e-mail settings.
-#: lib/mail.php:255
+#: lib/mail.php:260
 #, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -8450,14 +8516,14 @@ msgstr ""
 
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is biographical information.
-#: lib/mail.php:278
+#: lib/mail.php:283
 #, php-format
 msgid "Bio: %s"
 msgstr "自我介绍：%s"
 
 #. TRANS: Subject of notification mail for new posting email address.
 #. TRANS: %s is the StatusNet sitename.
-#: lib/mail.php:307
+#: lib/mail.php:312
 #, php-format
 msgid "New email address for posting to %s"
 msgstr "新的电子邮件地址，用于发布 %s 信息"
@@ -8465,7 +8531,7 @@ msgstr "新的电子邮件地址，用于发布 %s 信息"
 #. TRANS: Body of notification mail for new posting email address.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is the e-mail address to send
 #. TRANS: to to post by e-mail, %3$s is a URL to more instructions.
-#: lib/mail.php:313
+#: lib/mail.php:318
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -8489,26 +8555,26 @@ msgstr ""
 
 #. TRANS: Subject line for SMS-by-email notification messages.
 #. TRANS: %s is the posting user's nickname.
-#: lib/mail.php:434
+#: lib/mail.php:439
 #, php-format
 msgid "%s status"
 msgstr "%s 状态"
 
 #. TRANS: Subject line for SMS-by-email address confirmation message.
-#: lib/mail.php:460
+#: lib/mail.php:465
 msgid "SMS confirmation"
 msgstr "SMS 验证"
 
 #. TRANS: Main body heading for SMS-by-email address confirmation message.
 #. TRANS: %s is the addressed user's nickname.
-#: lib/mail.php:464
+#: lib/mail.php:469
 #, php-format
 msgid "%s: confirm you own this phone number with this code:"
 msgstr "%s：通过此代码证明这是你的手机："
 
 #. TRANS: Subject for 'nudge' notification email.
 #. TRANS: %s is the nudging user.
-#: lib/mail.php:485
+#: lib/mail.php:490
 #, php-format
 msgid "You have been nudged by %s"
 msgstr "您被 %s 已推动"
@@ -8516,7 +8582,7 @@ msgstr "您被 %s 已推动"
 #. TRANS: Body for 'nudge' notification email.
 #. TRANS: %1$s is the nuding user's long name, $2$s is the nudging user's nickname,
 #. TRANS: %3$s is a URL to post notices at, %4$s is the StatusNet sitename.
-#: lib/mail.php:492
+#: lib/mail.php:497
 #, php-format
 msgid ""
 "%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -8544,7 +8610,7 @@ msgstr ""
 
 #. TRANS: Subject for direct-message notification email.
 #. TRANS: %s is the sending user's nickname.
-#: lib/mail.php:539
+#: lib/mail.php:544
 #, php-format
 msgid "New private message from %s"
 msgstr "来自%s的私信"
@@ -8553,7 +8619,7 @@ msgstr "来自%s的私信"
 #. TRANS: %1$s is the sending user's long name, %2$s is the sending user's nickname,
 #. TRANS: %3$s is the message content, %4$s a URL to the message,
 #. TRANS: %5$s is the StatusNet sitename.
-#: lib/mail.php:547
+#: lib/mail.php:552
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -8588,7 +8654,7 @@ msgstr ""
 
 #. TRANS: Subject for favorite notification e-mail.
 #. TRANS: %1$s is the adding user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:599
+#: lib/mail.php:604
 #, php-format
 msgid "%1$s (@%2$s) added your notice as a favorite"
 msgstr "%1$s (@%2$s) 收藏了你的消息"
@@ -8598,7 +8664,7 @@ msgstr "%1$s (@%2$s) 收藏了你的消息"
 #. TRANS: %3$s is a URL to the faved notice, %4$s is the faved notice text,
 #. TRANS: %5$s is a URL to all faves of the adding user, %6$s is the StatusNet sitename,
 #. TRANS: %7$s is the adding user's nickname.
-#: lib/mail.php:606
+#: lib/mail.php:611
 #, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -8636,7 +8702,7 @@ msgstr ""
 "%6$s\n"
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:664
+#: lib/mail.php:669
 #, php-format
 msgid ""
 "The full conversation can be read here:\n"
@@ -8649,7 +8715,7 @@ msgstr ""
 
 #. TRANS: E-mail subject for notice notification.
 #. TRANS: %1$s is the sending user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:672
+#: lib/mail.php:677
 #, php-format
 msgid "%1$s (@%2$s) sent a notice to your attention"
 msgstr "%1$s (@%2$s) 给你发送了一条消息"
@@ -8660,7 +8726,7 @@ msgstr "%1$s (@%2$s) 给你发送了一条消息"
 #. TRANS: %5$s is a URL to the full conversion if it exists (otherwise empty),
 #. TRANS: %6$s is a URL to reply to the notice, %7$s is a URL to all @-replied for the addressed user,
 #. TRANS: %8$s is a URL to the addressed user's e-mail settings, %9$s is the sender's nickname.
-#: lib/mail.php:680
+#: lib/mail.php:685
 #, php-format
 msgid ""
 "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -8799,11 +8865,7 @@ msgstr "没有共同的关注者。"
 msgid "To"
 msgstr "到"
 
-#: lib/messageform.php:166 lib/noticeform.php:186
-msgid "Available characters"
-msgstr "可用的字符"
-
-#: lib/messageform.php:185 lib/noticeform.php:237
+#: lib/messageform.php:184 lib/noticeform.php:236
 msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr "发布"
@@ -8812,15 +8874,10 @@ msgstr "发布"
 msgid "Messages"
 msgstr "消息"
 
-#: lib/messagelistitem.php:123 lib/noticelist.php:522
+#: lib/messagelistitem.php:123 lib/noticelist.php:527
 msgid "from"
 msgstr "通过"
 
-#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:165
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr "昵称只能使用小写字母和数字且不能使用空格。"
-
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 #: lib/nickname.php:178
 msgid "Nickname cannot be empty."
@@ -8842,78 +8899,82 @@ msgstr "发送一个通知"
 msgid "What's up, %s?"
 msgstr "%s，最近怎么样？"
 
-#: lib/noticeform.php:194
+#: lib/noticeform.php:193
 msgid "Attach"
 msgstr "附件"
 
-#: lib/noticeform.php:198
+#: lib/noticeform.php:197
 msgid "Attach a file"
 msgstr "添加一个文件附件"
 
-#: lib/noticeform.php:213
+#: lib/noticeform.php:212
 msgid "Share my location"
 msgstr "分享我的地理位置。"
 
-#: lib/noticeform.php:216
+#: lib/noticeform.php:215
 msgid "Do not share my location"
 msgstr "不要分享我的地理位置。"
 
-#: lib/noticeform.php:217
+#: lib/noticeform.php:216
 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
 "try again later"
 msgstr "抱歉，获取你的地理位置时间过长，请稍候重试"
 
 #. TRANS: Used in coordinates as abbreviation of north
-#: lib/noticelist.php:452
+#: lib/noticelist.php:457
 msgid "N"
 msgstr "N"
 
 #. TRANS: Used in coordinates as abbreviation of south
-#: lib/noticelist.php:454
+#: lib/noticelist.php:459
 msgid "S"
 msgstr "S"
 
 #. TRANS: Used in coordinates as abbreviation of east
-#: lib/noticelist.php:456
+#: lib/noticelist.php:461
 msgid "E"
 msgstr "E"
 
 #. TRANS: Used in coordinates as abbreviation of west
-#: lib/noticelist.php:458
+#: lib/noticelist.php:463
 msgid "W"
 msgstr "W"
 
-#: lib/noticelist.php:460
+#: lib/noticelist.php:465
 #, php-format
 msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 
-#: lib/noticelist.php:469
+#: lib/noticelist.php:474
 msgid "at"
 msgstr "位于"
 
-#: lib/noticelist.php:518
+#: lib/noticelist.php:523
 msgid "web"
 msgstr "网页"
 
-#: lib/noticelist.php:584
+#: lib/noticelist.php:589
 msgid "in context"
 msgstr "查看对话"
 
-#: lib/noticelist.php:619
+#: lib/noticelist.php:624
 msgid "Repeated by"
 msgstr "转发来自"
 
-#: lib/noticelist.php:646
+#: lib/noticelist.php:651
 msgid "Reply to this notice"
 msgstr "回复"
 
-#: lib/noticelist.php:647
+#: lib/noticelist.php:652
 msgid "Reply"
 msgstr "回复"
 
-#: lib/noticelist.php:691
+#: lib/noticelist.php:678
+msgid "Delete this notice"
+msgstr "删除"
+
+#: lib/noticelist.php:696
 msgid "Notice repeated"
 msgstr "消息已转发"
 
@@ -8950,43 +9011,31 @@ msgstr "复制消息。"
 msgid "Couldn't insert new subscription."
 msgstr "无法添加新的关注。"
 
-#. TRANS: Personal group navigation menu option when logged in for viewing @-replies.
-#: lib/personalgroupnav.php:107
-msgctxt "MENU"
+#: lib/personalgroupnav.php:104
+#, fuzzy
 msgid "Replies"
 msgstr "答复"
 
-#. TRANS: Personal group navigation menu option when logged in for seeing own profile.
-#: lib/personalgroupnav.php:114
-msgctxt "MENU"
-msgid "Profile"
-msgstr "配置文件"
-
-#. TRANS: Personal group navigation menu option when logged in for viewing own favourited notices.
-#: lib/personalgroupnav.php:120
-msgctxt "MENU"
+#: lib/personalgroupnav.php:109
+#, fuzzy
 msgid "Favorites"
 msgstr "收藏夹"
 
-#. TRANS: Personal group navigation menu option when logged in for viewing recieved personal messages.
-#: lib/personalgroupnav.php:133
-msgctxt "MENU"
+#: lib/personalgroupnav.php:120
+#, fuzzy
 msgid "Inbox"
 msgstr "收件箱"
 
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing recieved personal messages.
-#: lib/personalgroupnav.php:135
+#: lib/personalgroupnav.php:121
 msgid "Your incoming messages"
 msgstr "你收到的私信"
 
-#. TRANS: Personal group navigation menu option when logged in for viewing senet personal messages.
-#: lib/personalgroupnav.php:140
-msgctxt "MENU"
+#: lib/personalgroupnav.php:125
+#, fuzzy
 msgid "Outbox"
 msgstr "发件箱"
 
-#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing senet personal messages.
-#: lib/personalgroupnav.php:142
+#: lib/personalgroupnav.php:126
 msgid "Your sent messages"
 msgstr "你发送的私信"
 
@@ -9001,9 +9050,26 @@ msgstr "%s的消息中的标签"
 msgid "Unknown"
 msgstr "未知的"
 
+#. TRANS: Plugin admin panel controls
+#: lib/plugindisableform.php:90
+msgctxt "plugin"
+msgid "Disable"
+msgstr ""
+
+#. TRANS: Plugin admin panel controls
+#: lib/pluginenableform.php:112
+msgctxt "plugin"
+msgid "Enable"
+msgstr ""
+
+#: lib/pluginlist.php:196
+msgctxt "plugin-description"
+msgid "(Plugin descriptions unavailable when disabled.)"
+msgstr ""
+
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:82
+#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:88
 msgid "Subscriptions"
 msgstr "关注的"
 
@@ -9014,7 +9080,7 @@ msgstr "所有关注的"
 
 #. TRANS: H2 text for user subscriber statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:90
+#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:96
 msgid "Subscribers"
 msgstr "关注者"
 
@@ -9036,7 +9102,7 @@ msgstr "注册时间"
 #. TRANS: Label for user statistics.
 #. TRANS: H2 text for user group membership statistics.
 #: lib/profileaction.php:239 lib/profileaction.php:290
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:104
 msgid "Groups"
 msgstr "小组"
 
@@ -9056,10 +9122,6 @@ msgstr "所有小组"
 msgid "Unimplemented method."
 msgstr "未使用的方法。"
 
-#: lib/publicgroupnav.php:78
-msgid "Public"
-msgstr "公共"
-
 #: lib/publicgroupnav.php:82
 msgid "User groups"
 msgstr "用户小组"
@@ -9098,7 +9160,7 @@ msgid "Revoke the \"%s\" role from this user"
 msgstr "取消这个用户的\"%s\"权限"
 
 #. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:974
+#: lib/router.php:1001
 msgid "Page not found."
 msgstr "没有找到页面。"
 
@@ -9127,11 +9189,6 @@ msgctxt "BUTTON"
 msgid "Search"
 msgstr "搜索"
 
-#. TRANS: Definition list item with instructions on how to get (better) search results.
-#: lib/searchaction.php:170
-msgid "Search help"
-msgstr "搜索帮助"
-
 #: lib/searchgroupnav.php:80
 msgid "People"
 msgstr "用户"
@@ -9156,6 +9213,51 @@ msgstr "无标题章节"
 msgid "More..."
 msgstr "更多..."
 
+#: lib/settingsnav.php:78
+msgid "Change your profile settings"
+msgstr "修改你的个人信息"
+
+#: lib/settingsnav.php:83
+msgid "Upload an avatar"
+msgstr "上传一个头像。"
+
+#: lib/settingsnav.php:88
+msgid "Change your password"
+msgstr "修改密码"
+
+#: lib/settingsnav.php:93
+msgid "Change email handling"
+msgstr "修改电子邮件"
+
+#: lib/settingsnav.php:98
+msgid "Design your profile"
+msgstr "设计你的个人页面外观"
+
+#: lib/settingsnav.php:102
+msgid "URL"
+msgstr "URL 互联网地址"
+
+#: lib/settingsnav.php:103
+msgid "URL shorteners"
+msgstr ""
+
+#: lib/settingsnav.php:111
+msgid "Updates by instant messenger (IM)"
+msgstr "使用即时通讯工具(IM)更新"
+
+#: lib/settingsnav.php:118
+msgid "Updates by SMS"
+msgstr "使用 SMS 更新"
+
+#: lib/settingsnav.php:123
+#, fuzzy
+msgid "Connections"
+msgstr "关联"
+
+#: lib/settingsnav.php:124
+msgid "Authorized connected applications"
+msgstr "被授权已连接的应用"
+
 #: lib/silenceform.php:67
 msgid "Silence"
 msgstr "禁言"
@@ -9164,30 +9266,34 @@ msgstr "禁言"
 msgid "Silence this user"
 msgstr "将此用户禁言"
 
-#: lib/subgroupnav.php:83
+#: lib/subgroupnav.php:89
 #, php-format
 msgid "People %s subscribes to"
 msgstr "%s关注的用户"
 
-#: lib/subgroupnav.php:91
+#: lib/subgroupnav.php:97
 #, php-format
 msgid "People subscribed to %s"
 msgstr "关注了%s的用户"
 
-#: lib/subgroupnav.php:99
+#: lib/subgroupnav.php:105
 #, php-format
 msgid "Groups %s is a member of"
 msgstr "%s 组是成员组成了"
 
-#: lib/subgroupnav.php:105
+#: lib/subgroupnav.php:111
 msgid "Invite"
 msgstr "邀请"
 
-#: lib/subgroupnav.php:106
+#: lib/subgroupnav.php:112
 #, php-format
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "邀请朋友和同事来%s一起和你交流"
 
+#: lib/subscribeform.php:115 lib/subscribeform.php:139
+msgid "Subscribe to this user"
+msgstr "关注这个用户"
+
 #: lib/subscriberspeopleselftagcloudsection.php:48
 #: lib/subscriptionspeopleselftagcloudsection.php:48
 msgid "People Tagcloud as self-tagged"
@@ -9256,6 +9362,12 @@ msgstr "主题包含不允许的”.%s“格式文件。"
 msgid "Error opening theme archive."
 msgstr "打开主题文件时出错。"
 
+#: lib/threadednoticelist.php:270
+#, php-format
+msgid "Show all %d comment"
+msgid_plural "Show all %d comments"
+msgstr[0] ""
+
 #: lib/topposterssection.php:74
 msgid "Top posters"
 msgstr "灌水精英"
@@ -9297,119 +9409,122 @@ msgstr "取消关注"
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "用户 %1$s (%2$d) 没有个人信息记录。"
 
-#. TRANS: Link text for changeing the avatar of the logged in user.
-#: lib/userprofile.php:121
+#: lib/userprofile.php:116
 msgid "Edit Avatar"
 msgstr "编辑头像"
 
 #. TRANS: H2 for user actions in a profile.
 #. TRANS: H2 for entity actions in a profile.
-#: lib/userprofile.php:245 lib/userprofile.php:261
+#: lib/userprofile.php:216 lib/userprofile.php:232
 msgid "User actions"
 msgstr "用户动作"
 
 #. TRANS: Text shown in user profile of not yet compeltely deleted users.
-#: lib/userprofile.php:249
+#: lib/userprofile.php:220
 msgid "User deletion in progress..."
 msgstr "用户删除处理中……"
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:277
+#: lib/userprofile.php:248
 msgid "Edit profile settings"
 msgstr "编辑个人信息设置"
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:279
+#: lib/userprofile.php:250
 msgid "Edit"
 msgstr "编辑"
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:303
+#: lib/userprofile.php:274
 msgid "Send a direct message to this user"
 msgstr "给该用户发送私信"
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:305
+#: lib/userprofile.php:276
 msgid "Message"
 msgstr "私信"
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:347
+#: lib/userprofile.php:318
 msgid "Moderate"
 msgstr "审核"
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:386
+#: lib/userprofile.php:357
 msgid "User role"
 msgstr "用户权限"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:389
+#: lib/userprofile.php:360
 msgctxt "role"
 msgid "Administrator"
 msgstr "管理员"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:391
+#: lib/userprofile.php:362
 msgctxt "role"
 msgid "Moderator"
 msgstr "审核员"
 
+#: lib/util.php:321
+msgid "Not allowed to log in."
+msgstr "不允许登录。"
+
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1306
+#: lib/util.php:1337
 msgid "a few seconds ago"
 msgstr "几秒前"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1309
+#: lib/util.php:1340
 msgid "about a minute ago"
 msgstr "约1分钟前"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1313
+#: lib/util.php:1344
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
 msgstr[0] "约%d分钟前"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1316
+#: lib/util.php:1347
 msgid "about an hour ago"
 msgstr "约1小时前"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1320
+#: lib/util.php:1351
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
 msgstr[0] "约%d小时前"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1323
+#: lib/util.php:1354
 msgid "about a day ago"
 msgstr "约1天前"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1327
+#: lib/util.php:1358
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
 msgstr[0] "约%d天前"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1330
+#: lib/util.php:1361
 msgid "about a month ago"
 msgstr "约1个月前"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1334
+#: lib/util.php:1365
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
 msgstr[0] "约%d个月前"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1337
+#: lib/util.php:1368
 msgid "about a year ago"
 msgstr "约1年前"
 
@@ -9420,20 +9535,6 @@ msgstr "约1年前"
 msgid "%s is not a valid color! Use 3 or 6 hex characters."
 msgstr "%s不是有效的颜色！应使用3或6个十六进制字符。"
 
-#. TRANS: %s is the URL to the StatusNet site's Instant Messaging settings.
-#: lib/xmppmanager.php:287
-#, php-format
-msgid "Unknown user. Go to %s to add your address to your account"
-msgstr "未知的用户。到 %s 添加你的账号的地址"
-
-#. TRANS: Response to XMPP source when it sent too long a message.
-#. TRANS: %1$d the maximum number of allowed characters (used for plural), %2$d is the sent number.
-#: lib/xmppmanager.php:406
-#, php-format
-msgid "Message too long. Maximum is %1$d character, you sent %2$d."
-msgid_plural "Message too long. Maximum is %1$d characters, you sent %2$d."
-msgstr[0] "消息太长了，不能超过%1$d个字符，你发送的是%2$d。"
-
 #. TRANS: Exception.
 #: lib/xrd.php:63
 msgid "Invalid XML."
@@ -9450,60 +9551,170 @@ msgstr "不合法的XML, 缺少XRD根"
 msgid "Getting backup from file '%s'."
 msgstr "从文件'%s'获取备份。"
 
-#~ msgid "Block this user."
-#~ msgstr "屏蔽这个用户"
+#~ msgid "Could not generate feed for group - %s"
+#~ msgstr "无法生成小组的 feed - %s"
 
-#~ msgid "Delete this notice."
-#~ msgstr "删除此通知。"
+#~ msgid "Current confirmed Jabber/Google Talk address."
+#~ msgstr "当前已确认的Jabber/GTalk账号。"
 
-#~ msgid "Delete this user."
-#~ msgstr "删除此用户。"
-
-#~ msgid "Restore default designs."
-#~ msgstr "还原默认设计。"
-
-#~ msgid "Reset back to default."
-#~ msgstr "重置回默认值。"
-
-#~ msgid "Save design."
-#~ msgstr "保存设计。"
-
-#~ msgid "Disfavor favorite."
-#~ msgstr "不是赞成的最爱。"
-
-#~ msgid "\"%s\" not found."
-#~ msgstr "找不到\"%s\"。"
-
-#~ msgid "Notice %s not found."
-#~ msgstr "找不到 %s 的通知。"
-
-#~ msgid "Attachment %s not found."
-#~ msgstr "找不到 %s 的附件。"
-
-#~ msgid "\"%s\" not supported for oembed requests."
-#~ msgstr "\"%s\"不支持 oembed 的请求。"
-
-#~ msgid "Invalid tag: \"%s\"."
-#~ msgstr "无效的标记： %s。"
-
-#, fuzzy
-#~ msgid "%s updates from everyone."
-#~ msgstr "%s条来自所有人的消息！"
-
-#~ msgid "Password saved"
-#~ msgstr "密码已保存。"
-
-#~ msgid "Where you are, like \"City, State (or Region), Country\"."
-#~ msgstr "你在哪里，像\"城市、 国家（或地区）、国家\"。"
-
-#~ msgid "Subscribe to this user."
-#~ msgstr "订阅此用户。"
-
-#, fuzzy
 #~ msgid ""
-#~ "Listenee stream license \"%1$s\" is not compatible with site license \"%2"
-#~ "$s\"."
-#~ msgstr "Listenee stream 许可证“‘%1$s” 与本网站的许可证 “%2$s”不兼容。"
+#~ "Jabber or Google Talk address, like \"UserName@example.org\". First, make "
+#~ "sure to add %s to your buddy list in your IM client or on Google Talk."
+#~ msgstr ""
+#~ "Jabber 或 Google Talk 地址，比如 \"UserName@example.org\"。首先，请确认你"
+#~ "已在 IM 聊天工具或 Google Talk 中将 %s 添加了好友。"
 
-#~ msgid "Not allowed to log in."
-#~ msgstr "不允许登录。"
+#~ msgid "Send me notices through Jabber/Google Talk."
+#~ msgstr "通过 Jabber/Google Talk 给我发送消息。"
+
+#~ msgid "Publish a MicroID for my Jabber/Google Talk address."
+#~ msgstr "为我的 Jabber/Google Talk 地址发布一个 MicroID。"
+
+#~ msgid "No Jabber ID."
+#~ msgstr "没有 Jabber ID。"
+
+#~ msgid "Not a valid Jabber ID."
+#~ msgstr "不是有效的 Jabber ID。"
+
+#~ msgid "That is already your Jabber ID."
+#~ msgstr "这个已经是你的 Jabber 帐号了。"
+
+#~ msgid "That is not your Jabber ID."
+#~ msgstr "这不是你的 Jabber ID。"
+
+#~ msgid "Other settings"
+#~ msgstr "其他设置"
+
+#~ msgid "Tag cloud"
+#~ msgstr "标签云"
+
+#~ msgid "Consumer key"
+#~ msgstr "Consumer key"
+
+#~ msgid "Consumer secret"
+#~ msgstr "Consumer secret"
+
+#~ msgid "Request token URL"
+#~ msgstr "请求令牌URL"
+
+#~ msgid "Access token URL"
+#~ msgstr "访问令牌URL"
+
+#~ msgid "Authorize URL"
+#~ msgstr "授权URL"
+
+#~ msgid "Jabber"
+#~ msgstr "Jabber"
+
+#~ msgid "Photo"
+#~ msgstr "相片"
+
+#~ msgid "Other options"
+#~ msgstr "其他选项"
+
+#~ msgid "Other"
+#~ msgstr "其他"
+
+#~ msgid "Primary site navigation"
+#~ msgstr "主站导航"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Personal profile and friends timeline"
+#~ msgstr "个人资料及朋友的时间线"
+
+#~ msgctxt "MENU"
+#~ msgid "Personal"
+#~ msgstr "个人"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Change your email, avatar, password, profile"
+#~ msgstr "修改你的 email 地址、头像、密码、资料"
+
+#~ msgid "Account"
+#~ msgstr "帐号"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Connect to services"
+#~ msgstr "关联的服务"
+
+#~ msgid "Connect"
+#~ msgstr "关联"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Change site configuration"
+#~ msgstr "更改网站配置"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Invite friends and colleagues to join you on %s"
+#~ msgstr "邀请好友和同事加入%s。"
+
+#~ msgctxt "MENU"
+#~ msgid "Invite"
+#~ msgstr "邀请"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Create an account"
+#~ msgstr "创建一个账户"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Help me!"
+#~ msgstr "帮助我！"
+
+#~ msgctxt "MENU"
+#~ msgid "Help"
+#~ msgstr "帮助"
+
+#~ msgctxt "TOOLTIP"
+#~ msgid "Search for people or text"
+#~ msgstr "搜索人或文字"
+
+#~ msgid "Local views"
+#~ msgstr "本地显示"
+
+#~ msgid "Page notice"
+#~ msgstr "页面消息"
+
+#~ msgid "Secondary site navigation"
+#~ msgstr "副站导航"
+
+#~ msgid "StatusNet software license"
+#~ msgstr "StatusNet 软件许可证"
+
+#~ msgid "Site content license"
+#~ msgstr "网站内容许可协议"
+
+#~ msgid "Pagination"
+#~ msgstr "分页"
+
+#~ msgid "Author"
+#~ msgstr "作者"
+
+#~ msgid "Provider"
+#~ msgstr "提供者"
+
+#~ msgctxt "MENU"
+#~ msgid "SMS"
+#~ msgstr "SMS"
+
+#~ msgid "Filter tags"
+#~ msgstr "过滤标签"
+
+#~ msgid "[%s]"
+#~ msgstr "[%s]"
+
+#~ msgid "Available characters"
+#~ msgstr "可用的字符"
+
+#~ msgctxt "MENU"
+#~ msgid "Profile"
+#~ msgstr "配置文件"
+
+#~ msgid "Search help"
+#~ msgstr "搜索帮助"
+
+#~ msgid "Unknown user. Go to %s to add your address to your account"
+#~ msgstr "未知的用户。到 %s 添加你的账号的地址"
+
+#~ msgid "Message too long. Maximum is %1$d character, you sent %2$d."
+#~ msgid_plural "Message too long. Maximum is %1$d characters, you sent %2$d."
+#~ msgstr[0] "消息太长了，不能超过%1$d个字符，你发送的是%2$d。"
diff --git a/plugins/APC/locale/APC.pot b/plugins/APC/locale/APC.pot
index 9069b7d867..46759518d8 100644
--- a/plugins/APC/locale/APC.pot
+++ b/plugins/APC/locale/APC.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/AccountManager/locale/AccountManager.pot b/plugins/AccountManager/locale/AccountManager.pot
new file mode 100644
index 0000000000..5279a34d0f
--- /dev/null
+++ b/plugins/AccountManager/locale/AccountManager.pot
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: AccountManagerPlugin.php:112
+msgid ""
+"The Account Manager plugin implements the Account Manager specification."
+msgstr ""
diff --git a/plugins/Adsense/locale/Adsense.pot b/plugins/Adsense/locale/Adsense.pot
index 9f4cb0ccd1..2889b534a7 100644
--- a/plugins/Adsense/locale/Adsense.pot
+++ b/plugins/Adsense/locale/Adsense.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/Aim/locale/Aim.pot b/plugins/Aim/locale/Aim.pot
new file mode 100644
index 0000000000..d90aa51c83
--- /dev/null
+++ b/plugins/Aim/locale/Aim.pot
@@ -0,0 +1,30 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: aimmanager.php:80
+msgid "Send me a message to post a notice"
+msgstr ""
+
+#: AimPlugin.php:60
+msgid "AIM"
+msgstr ""
+
+#: AimPlugin.php:165
+msgid ""
+"The AIM plugin allows users to send and receive notices over the AIM network."
+msgstr ""
diff --git a/plugins/AnonymousFave/locale/AnonymousFave.pot b/plugins/AnonymousFave/locale/AnonymousFave.pot
index 27f66777b3..ec69c8950b 100644
--- a/plugins/AnonymousFave/locale/AnonymousFave.pot
+++ b/plugins/AnonymousFave/locale/AnonymousFave.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/AutoSandbox/locale/AutoSandbox.pot b/plugins/AutoSandbox/locale/AutoSandbox.pot
index 14e29e0cc0..5f6b4905fa 100644
--- a/plugins/AutoSandbox/locale/AutoSandbox.pot
+++ b/plugins/AutoSandbox/locale/AutoSandbox.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/Autocomplete/locale/Autocomplete.pot b/plugins/Autocomplete/locale/Autocomplete.pot
index 04c0ccfc03..165afc202e 100644
--- a/plugins/Autocomplete/locale/Autocomplete.pot
+++ b/plugins/Autocomplete/locale/Autocomplete.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/Awesomeness/locale/Awesomeness.pot b/plugins/Awesomeness/locale/Awesomeness.pot
index df2faaa0fd..8646f0e280 100644
--- a/plugins/Awesomeness/locale/Awesomeness.pot
+++ b/plugins/Awesomeness/locale/Awesomeness.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/Awesomeness/locale/pt/LC_MESSAGES/Awesomeness.po b/plugins/Awesomeness/locale/pt/LC_MESSAGES/Awesomeness.po
index 6184d5212c..faaa23a6b6 100644
--- a/plugins/Awesomeness/locale/pt/LC_MESSAGES/Awesomeness.po
+++ b/plugins/Awesomeness/locale/pt/LC_MESSAGES/Awesomeness.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Awesomeness\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 15:58+0000\n"
-"PO-Revision-Date: 2011-03-03 16:01:39+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:26:39+0000\n"
 "Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/BitlyUrl/locale/BitlyUrl.pot b/plugins/BitlyUrl/locale/BitlyUrl.pot
index fde23a22af..c19d44aeac 100644
--- a/plugins/BitlyUrl/locale/BitlyUrl.pot
+++ b/plugins/BitlyUrl/locale/BitlyUrl.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,20 +16,20 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: BitlyUrlPlugin.php:48
+#: BitlyUrlPlugin.php:46
 msgid "You must specify a serviceUrl for bit.ly shortening."
 msgstr ""
 
-#: BitlyUrlPlugin.php:175
+#: BitlyUrlPlugin.php:173
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr ""
 
-#: BitlyUrlPlugin.php:216
+#: BitlyUrlPlugin.php:214
 msgid "bit.ly"
 msgstr ""
 
-#: BitlyUrlPlugin.php:217 bitlyadminpanelaction.php:54
+#: BitlyUrlPlugin.php:215 bitlyadminpanelaction.php:54
 msgid "bit.ly URL shortening"
 msgstr ""
 
diff --git a/plugins/BitlyUrl/locale/be-tarask/LC_MESSAGES/BitlyUrl.po b/plugins/BitlyUrl/locale/be-tarask/LC_MESSAGES/BitlyUrl.po
index 8cece258e4..e588203795 100644
--- a/plugins/BitlyUrl/locale/be-tarask/LC_MESSAGES/BitlyUrl.po
+++ b/plugins/BitlyUrl/locale/be-tarask/LC_MESSAGES/BitlyUrl.po
@@ -10,35 +10,35 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BitlyUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:20+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:26:40+0000\n"
 "Language-Team: Belarusian (Taraškievica orthography) <http://translatewiki."
 "net/wiki/Portal:be-tarask>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:31+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-02-17 11:29:48+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: be-tarask\n"
 "X-Message-Group: #out-statusnet-plugin-bitlyurl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: BitlyUrlPlugin.php:48
+#: BitlyUrlPlugin.php:46
 msgid "You must specify a serviceUrl for bit.ly shortening."
 msgstr "Вам неабходна пазначыць serviceUrl для сэрвісу скарачэньняў bit.ly."
 
-#: BitlyUrlPlugin.php:175
+#: BitlyUrlPlugin.php:173
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr ""
 "Выкарыстаньне сэрвісу скарачэньня URL-адрасоў <a href=\"http://%1$s/\">%1$s</"
 "a>."
 
-#: BitlyUrlPlugin.php:216
+#: BitlyUrlPlugin.php:214
 msgid "bit.ly"
 msgstr "bit.ly"
 
-#: BitlyUrlPlugin.php:217 bitlyadminpanelaction.php:54
+#: BitlyUrlPlugin.php:215 bitlyadminpanelaction.php:54
 msgid "bit.ly URL shortening"
 msgstr "Скарачэньне URL-адрасоў bit.ly"
 
diff --git a/plugins/BitlyUrl/locale/ca/LC_MESSAGES/BitlyUrl.po b/plugins/BitlyUrl/locale/ca/LC_MESSAGES/BitlyUrl.po
index c9281c84df..ad79fdc4dc 100644
--- a/plugins/BitlyUrl/locale/ca/LC_MESSAGES/BitlyUrl.po
+++ b/plugins/BitlyUrl/locale/ca/LC_MESSAGES/BitlyUrl.po
@@ -9,33 +9,33 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BitlyUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-17 10:25+0000\n"
-"PO-Revision-Date: 2011-02-17 10:27:59+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:26:40+0000\n"
 "Language-Team: Catalan <http://translatewiki.net/wiki/Portal:ca>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:19:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r82325); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-02-17 11:29:48+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ca\n"
 "X-Message-Group: #out-statusnet-plugin-bitlyurl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: BitlyUrlPlugin.php:48
+#: BitlyUrlPlugin.php:46
 msgid "You must specify a serviceUrl for bit.ly shortening."
 msgstr "Heu d'especificar un URL de servei per a l'escurçament de bit.ly"
 
-#: BitlyUrlPlugin.php:175
+#: BitlyUrlPlugin.php:173
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr ""
 "Fa servir el servei d'escurçament d'URL <a href=\"http://%1$s/\">%1$s</a>."
 
-#: BitlyUrlPlugin.php:216
+#: BitlyUrlPlugin.php:214
 msgid "bit.ly"
 msgstr "bit.ly"
 
-#: BitlyUrlPlugin.php:217 bitlyadminpanelaction.php:54
+#: BitlyUrlPlugin.php:215 bitlyadminpanelaction.php:54
 msgid "bit.ly URL shortening"
 msgstr "Escurçament d'URL bit.ly"
 
diff --git a/plugins/BitlyUrl/locale/de/LC_MESSAGES/BitlyUrl.po b/plugins/BitlyUrl/locale/de/LC_MESSAGES/BitlyUrl.po
index 0d48c0699c..d4af3918d3 100644
--- a/plugins/BitlyUrl/locale/de/LC_MESSAGES/BitlyUrl.po
+++ b/plugins/BitlyUrl/locale/de/LC_MESSAGES/BitlyUrl.po
@@ -10,32 +10,32 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BitlyUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:20+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:26:40+0000\n"
 "Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:31+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-02-17 11:29:48+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-bitlyurl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: BitlyUrlPlugin.php:48
+#: BitlyUrlPlugin.php:46
 msgid "You must specify a serviceUrl for bit.ly shortening."
 msgstr "Du musst eine „serviceUrl“ zur bit.ly-URL-Kürzung angeben."
 
-#: BitlyUrlPlugin.php:175
+#: BitlyUrlPlugin.php:173
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr "Benutzung des <a href=\"http://%1$s/\">%1$s</a>-URL-Kürzungsdienstes."
 
-#: BitlyUrlPlugin.php:216
+#: BitlyUrlPlugin.php:214
 msgid "bit.ly"
 msgstr "bit.ly"
 
-#: BitlyUrlPlugin.php:217 bitlyadminpanelaction.php:54
+#: BitlyUrlPlugin.php:215 bitlyadminpanelaction.php:54
 msgid "bit.ly URL shortening"
 msgstr "bit.ly-URL-Kürzung"
 
diff --git a/plugins/BitlyUrl/locale/fr/LC_MESSAGES/BitlyUrl.po b/plugins/BitlyUrl/locale/fr/LC_MESSAGES/BitlyUrl.po
index bf46115af5..bf3d0abc56 100644
--- a/plugins/BitlyUrl/locale/fr/LC_MESSAGES/BitlyUrl.po
+++ b/plugins/BitlyUrl/locale/fr/LC_MESSAGES/BitlyUrl.po
@@ -9,34 +9,34 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BitlyUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:20+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:26:40+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:31+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-02-17 11:29:48+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-bitlyurl\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: BitlyUrlPlugin.php:48
+#: BitlyUrlPlugin.php:46
 msgid "You must specify a serviceUrl for bit.ly shortening."
 msgstr "Vous devez spécifier un serviceUrl pour le raccourcissement bit.ly."
 
-#: BitlyUrlPlugin.php:175
+#: BitlyUrlPlugin.php:173
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr ""
 "Utilise le service de raccourcissement d’URL <a href=\"http://%1$s/\">%1$s</"
 "a>."
 
-#: BitlyUrlPlugin.php:216
+#: BitlyUrlPlugin.php:214
 msgid "bit.ly"
 msgstr "bit.ly"
 
-#: BitlyUrlPlugin.php:217 bitlyadminpanelaction.php:54
+#: BitlyUrlPlugin.php:215 bitlyadminpanelaction.php:54
 msgid "bit.ly URL shortening"
 msgstr "Raccourcissement d’URL bit.ly"
 
diff --git a/plugins/BitlyUrl/locale/gl/LC_MESSAGES/BitlyUrl.po b/plugins/BitlyUrl/locale/gl/LC_MESSAGES/BitlyUrl.po
index c66df9d09d..80e9334c78 100644
--- a/plugins/BitlyUrl/locale/gl/LC_MESSAGES/BitlyUrl.po
+++ b/plugins/BitlyUrl/locale/gl/LC_MESSAGES/BitlyUrl.po
@@ -9,34 +9,34 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BitlyUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:20+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:26:40+0000\n"
 "Language-Team: Galician <http://translatewiki.net/wiki/Portal:gl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:31+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-02-17 11:29:48+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: gl\n"
 "X-Message-Group: #out-statusnet-plugin-bitlyurl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: BitlyUrlPlugin.php:48
+#: BitlyUrlPlugin.php:46
 msgid "You must specify a serviceUrl for bit.ly shortening."
 msgstr ""
 
-#: BitlyUrlPlugin.php:175
+#: BitlyUrlPlugin.php:173
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr ""
 "Emprega o servizo de abreviación de enderezos URL <a href=\"http://%1$s/\">%1"
 "$s</a>."
 
-#: BitlyUrlPlugin.php:216
+#: BitlyUrlPlugin.php:214
 msgid "bit.ly"
 msgstr ""
 
-#: BitlyUrlPlugin.php:217 bitlyadminpanelaction.php:54
+#: BitlyUrlPlugin.php:215 bitlyadminpanelaction.php:54
 msgid "bit.ly URL shortening"
 msgstr ""
 
diff --git a/plugins/BitlyUrl/locale/ia/LC_MESSAGES/BitlyUrl.po b/plugins/BitlyUrl/locale/ia/LC_MESSAGES/BitlyUrl.po
index e76e01c997..976002a3e4 100644
--- a/plugins/BitlyUrl/locale/ia/LC_MESSAGES/BitlyUrl.po
+++ b/plugins/BitlyUrl/locale/ia/LC_MESSAGES/BitlyUrl.po
@@ -9,32 +9,32 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BitlyUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:20+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:26:40+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:31+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-02-17 11:29:48+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-bitlyurl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: BitlyUrlPlugin.php:48
+#: BitlyUrlPlugin.php:46
 msgid "You must specify a serviceUrl for bit.ly shortening."
 msgstr "Tu debe specificar un serviceUrl pro accurtamento bit.ly."
 
-#: BitlyUrlPlugin.php:175
+#: BitlyUrlPlugin.php:173
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr "Usa abbreviator de URL <a href=\"http://%1$s/\">%1$s</a>."
 
-#: BitlyUrlPlugin.php:216
+#: BitlyUrlPlugin.php:214
 msgid "bit.ly"
 msgstr "bit.ly"
 
-#: BitlyUrlPlugin.php:217 bitlyadminpanelaction.php:54
+#: BitlyUrlPlugin.php:215 bitlyadminpanelaction.php:54
 msgid "bit.ly URL shortening"
 msgstr "Accurtamento de URL con bit.ly"
 
diff --git a/plugins/BitlyUrl/locale/mk/LC_MESSAGES/BitlyUrl.po b/plugins/BitlyUrl/locale/mk/LC_MESSAGES/BitlyUrl.po
index 8f883adb5d..8d836a8213 100644
--- a/plugins/BitlyUrl/locale/mk/LC_MESSAGES/BitlyUrl.po
+++ b/plugins/BitlyUrl/locale/mk/LC_MESSAGES/BitlyUrl.po
@@ -9,34 +9,34 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BitlyUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:20+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:26:40+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:31+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-02-17 11:29:48+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-bitlyurl\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
 
-#: BitlyUrlPlugin.php:48
+#: BitlyUrlPlugin.php:46
 msgid "You must specify a serviceUrl for bit.ly shortening."
 msgstr "Мора да наведете URL-адреса за скратување со bit.ly."
 
-#: BitlyUrlPlugin.php:175
+#: BitlyUrlPlugin.php:173
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr ""
 "Користи <a href=\"http://%1$s/\">%1$s</a> - служба за скратување на URL-"
 "адреса."
 
-#: BitlyUrlPlugin.php:216
+#: BitlyUrlPlugin.php:214
 msgid "bit.ly"
 msgstr "bit.ly"
 
-#: BitlyUrlPlugin.php:217 bitlyadminpanelaction.php:54
+#: BitlyUrlPlugin.php:215 bitlyadminpanelaction.php:54
 msgid "bit.ly URL shortening"
 msgstr "Скратување на URL со bit.ly"
 
diff --git a/plugins/BitlyUrl/locale/nb/LC_MESSAGES/BitlyUrl.po b/plugins/BitlyUrl/locale/nb/LC_MESSAGES/BitlyUrl.po
index 99b85e7f9a..91c9a2f708 100644
--- a/plugins/BitlyUrl/locale/nb/LC_MESSAGES/BitlyUrl.po
+++ b/plugins/BitlyUrl/locale/nb/LC_MESSAGES/BitlyUrl.po
@@ -9,32 +9,32 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BitlyUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:20+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:26:41+0000\n"
 "Language-Team: Norwegian (bokmål)‬ <http://translatewiki.net/wiki/Portal:no>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:31+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-02-17 11:29:48+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: #out-statusnet-plugin-bitlyurl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: BitlyUrlPlugin.php:48
+#: BitlyUrlPlugin.php:46
 msgid "You must specify a serviceUrl for bit.ly shortening."
 msgstr "Du må angi en serviceUrl for bit.ly-forkortelse."
 
-#: BitlyUrlPlugin.php:175
+#: BitlyUrlPlugin.php:173
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr "Bruker URL-forkortertjenesten <a href=\"http://%1$s/\">%1$s</a>."
 
-#: BitlyUrlPlugin.php:216
+#: BitlyUrlPlugin.php:214
 msgid "bit.ly"
 msgstr "bit.ly"
 
-#: BitlyUrlPlugin.php:217 bitlyadminpanelaction.php:54
+#: BitlyUrlPlugin.php:215 bitlyadminpanelaction.php:54
 msgid "bit.ly URL shortening"
 msgstr "bit.ly URL-forkortelse"
 
diff --git a/plugins/BitlyUrl/locale/nl/LC_MESSAGES/BitlyUrl.po b/plugins/BitlyUrl/locale/nl/LC_MESSAGES/BitlyUrl.po
index 85757890b2..82c0ce4e8d 100644
--- a/plugins/BitlyUrl/locale/nl/LC_MESSAGES/BitlyUrl.po
+++ b/plugins/BitlyUrl/locale/nl/LC_MESSAGES/BitlyUrl.po
@@ -9,34 +9,34 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BitlyUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:20+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:26:40+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:31+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-02-17 11:29:48+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-bitlyurl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: BitlyUrlPlugin.php:48
+#: BitlyUrlPlugin.php:46
 msgid "You must specify a serviceUrl for bit.ly shortening."
 msgstr "U moet een serviceUrl opgeven om URL's in te korten via bit.ly."
 
-#: BitlyUrlPlugin.php:175
+#: BitlyUrlPlugin.php:173
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr ""
 "Gebruikt de dienst <a href=\"http://%1$s/\">%1$s</a> om URL's korter te "
 "maken."
 
-#: BitlyUrlPlugin.php:216
+#: BitlyUrlPlugin.php:214
 msgid "bit.ly"
 msgstr "bit.ly"
 
-#: BitlyUrlPlugin.php:217 bitlyadminpanelaction.php:54
+#: BitlyUrlPlugin.php:215 bitlyadminpanelaction.php:54
 msgid "bit.ly URL shortening"
 msgstr "URL's inkorten via bit.ly"
 
diff --git a/plugins/BitlyUrl/locale/ru/LC_MESSAGES/BitlyUrl.po b/plugins/BitlyUrl/locale/ru/LC_MESSAGES/BitlyUrl.po
index 193e793952..a15ebf0b5e 100644
--- a/plugins/BitlyUrl/locale/ru/LC_MESSAGES/BitlyUrl.po
+++ b/plugins/BitlyUrl/locale/ru/LC_MESSAGES/BitlyUrl.po
@@ -11,33 +11,33 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BitlyUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:20+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:26:41+0000\n"
 "Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:31+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-02-17 11:29:48+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-bitlyurl\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: BitlyUrlPlugin.php:48
+#: BitlyUrlPlugin.php:46
 msgid "You must specify a serviceUrl for bit.ly shortening."
 msgstr "Вы должны указать serviceUrl для bit.ly сокращений."
 
-#: BitlyUrlPlugin.php:175
+#: BitlyUrlPlugin.php:173
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr "Использование службы сокращения URL <a href=\"http://%1$s/\">%1$s</a>."
 
-#: BitlyUrlPlugin.php:216
+#: BitlyUrlPlugin.php:214
 msgid "bit.ly"
 msgstr "bit.ly"
 
-#: BitlyUrlPlugin.php:217 bitlyadminpanelaction.php:54
+#: BitlyUrlPlugin.php:215 bitlyadminpanelaction.php:54
 msgid "bit.ly URL shortening"
 msgstr "Сервис сокращения URL bit.ly"
 
diff --git a/plugins/BitlyUrl/locale/uk/LC_MESSAGES/BitlyUrl.po b/plugins/BitlyUrl/locale/uk/LC_MESSAGES/BitlyUrl.po
index 1f8701ec8f..99c8175228 100644
--- a/plugins/BitlyUrl/locale/uk/LC_MESSAGES/BitlyUrl.po
+++ b/plugins/BitlyUrl/locale/uk/LC_MESSAGES/BitlyUrl.po
@@ -9,35 +9,35 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BitlyUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:20+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:26:41+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:31+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-02-17 11:29:48+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-bitlyurl\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: BitlyUrlPlugin.php:48
+#: BitlyUrlPlugin.php:46
 msgid "You must specify a serviceUrl for bit.ly shortening."
 msgstr ""
 "Ви мусите зазначити URL-адресу для сервісу скорочення URL-адрес bit.ly."
 
-#: BitlyUrlPlugin.php:175
+#: BitlyUrlPlugin.php:173
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr ""
 "Використання <a href=\"http://%1$s/\">%1$s</a> для скорочення URL-адрес."
 
-#: BitlyUrlPlugin.php:216
+#: BitlyUrlPlugin.php:214
 msgid "bit.ly"
 msgstr "bit.ly"
 
-#: BitlyUrlPlugin.php:217 bitlyadminpanelaction.php:54
+#: BitlyUrlPlugin.php:215 bitlyadminpanelaction.php:54
 msgid "bit.ly URL shortening"
 msgstr "Скорочення URL-адрес bit.ly"
 
diff --git a/plugins/Blacklist/locale/Blacklist.pot b/plugins/Blacklist/locale/Blacklist.pot
index 63c2aeb6f3..45c144818e 100644
--- a/plugins/Blacklist/locale/Blacklist.pot
+++ b/plugins/Blacklist/locale/Blacklist.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/BlankAd/locale/BlankAd.pot b/plugins/BlankAd/locale/BlankAd.pot
index 646c31b781..843516d224 100644
--- a/plugins/BlankAd/locale/BlankAd.pot
+++ b/plugins/BlankAd/locale/BlankAd.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/BlogspamNet/locale/BlogspamNet.pot b/plugins/BlogspamNet/locale/BlogspamNet.pot
index 2dfbea8343..382247613a 100644
--- a/plugins/BlogspamNet/locale/BlogspamNet.pot
+++ b/plugins/BlogspamNet/locale/BlogspamNet.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/Bookmark/locale/Bookmark.pot b/plugins/Bookmark/locale/Bookmark.pot
index 53929ae867..92fc96912f 100644
--- a/plugins/Bookmark/locale/Bookmark.pot
+++ b/plugins/Bookmark/locale/Bookmark.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/CacheLog/locale/CacheLog.pot b/plugins/CacheLog/locale/CacheLog.pot
index 4480b05702..8e2071d9af 100644
--- a/plugins/CacheLog/locale/CacheLog.pot
+++ b/plugins/CacheLog/locale/CacheLog.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/CasAuthentication/locale/CasAuthentication.pot b/plugins/CasAuthentication/locale/CasAuthentication.pot
index 601cd7af8b..43917b6f1e 100644
--- a/plugins/CasAuthentication/locale/CasAuthentication.pot
+++ b/plugins/CasAuthentication/locale/CasAuthentication.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/ClientSideShorten/locale/ClientSideShorten.pot b/plugins/ClientSideShorten/locale/ClientSideShorten.pot
index 9669dc2928..336701917b 100644
--- a/plugins/ClientSideShorten/locale/ClientSideShorten.pot
+++ b/plugins/ClientSideShorten/locale/ClientSideShorten.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ClientSideShortenPlugin.php:74
+#: ClientSideShortenPlugin.php:76
 msgid ""
 "ClientSideShorten causes the web interface's notice form to automatically "
 "shorten URLs as they entered, and before the notice is submitted."
diff --git a/plugins/ClientSideShorten/locale/be-tarask/LC_MESSAGES/ClientSideShorten.po b/plugins/ClientSideShorten/locale/be-tarask/LC_MESSAGES/ClientSideShorten.po
index ae68a1bf41..82f8b9acf9 100644
--- a/plugins/ClientSideShorten/locale/be-tarask/LC_MESSAGES/ClientSideShorten.po
+++ b/plugins/ClientSideShorten/locale/be-tarask/LC_MESSAGES/ClientSideShorten.po
@@ -9,20 +9,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ClientSideShorten\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:27+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:26:48+0000\n"
 "Language-Team: Belarusian (Taraškievica orthography) <http://translatewiki."
 "net/wiki/Portal:be-tarask>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:35+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:19:34+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: be-tarask\n"
 "X-Message-Group: #out-statusnet-plugin-clientsideshorten\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ClientSideShortenPlugin.php:74
+#: ClientSideShortenPlugin.php:76
 msgid ""
 "ClientSideShorten causes the web interface's notice form to automatically "
 "shorten URLs as they entered, and before the notice is submitted."
diff --git a/plugins/ClientSideShorten/locale/br/LC_MESSAGES/ClientSideShorten.po b/plugins/ClientSideShorten/locale/br/LC_MESSAGES/ClientSideShorten.po
index 51bad30b87..08688e2a37 100644
--- a/plugins/ClientSideShorten/locale/br/LC_MESSAGES/ClientSideShorten.po
+++ b/plugins/ClientSideShorten/locale/br/LC_MESSAGES/ClientSideShorten.po
@@ -9,19 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ClientSideShorten\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:28+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:26:48+0000\n"
 "Language-Team: Breton <http://translatewiki.net/wiki/Portal:br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:35+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:19:34+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-clientsideshorten\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ClientSideShortenPlugin.php:74
+#: ClientSideShortenPlugin.php:76
 msgid ""
 "ClientSideShorten causes the web interface's notice form to automatically "
 "shorten URLs as they entered, and before the notice is submitted."
diff --git a/plugins/ClientSideShorten/locale/de/LC_MESSAGES/ClientSideShorten.po b/plugins/ClientSideShorten/locale/de/LC_MESSAGES/ClientSideShorten.po
index 4df0e50666..8a3b16ba4d 100644
--- a/plugins/ClientSideShorten/locale/de/LC_MESSAGES/ClientSideShorten.po
+++ b/plugins/ClientSideShorten/locale/de/LC_MESSAGES/ClientSideShorten.po
@@ -9,19 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ClientSideShorten\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:28+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:26:48+0000\n"
 "Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:35+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:19:34+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-clientsideshorten\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ClientSideShortenPlugin.php:74
+#: ClientSideShortenPlugin.php:76
 msgid ""
 "ClientSideShorten causes the web interface's notice form to automatically "
 "shorten URLs as they entered, and before the notice is submitted."
diff --git a/plugins/ClientSideShorten/locale/es/LC_MESSAGES/ClientSideShorten.po b/plugins/ClientSideShorten/locale/es/LC_MESSAGES/ClientSideShorten.po
index 40692e7273..ffd4ea89e2 100644
--- a/plugins/ClientSideShorten/locale/es/LC_MESSAGES/ClientSideShorten.po
+++ b/plugins/ClientSideShorten/locale/es/LC_MESSAGES/ClientSideShorten.po
@@ -9,19 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ClientSideShorten\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:28+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:26:48+0000\n"
 "Language-Team: Spanish <http://translatewiki.net/wiki/Portal:es>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:35+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:19:34+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-clientsideshorten\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ClientSideShortenPlugin.php:74
+#: ClientSideShortenPlugin.php:76
 msgid ""
 "ClientSideShorten causes the web interface's notice form to automatically "
 "shorten URLs as they entered, and before the notice is submitted."
diff --git a/plugins/ClientSideShorten/locale/fr/LC_MESSAGES/ClientSideShorten.po b/plugins/ClientSideShorten/locale/fr/LC_MESSAGES/ClientSideShorten.po
index 688a2546c8..e0bf8ce08a 100644
--- a/plugins/ClientSideShorten/locale/fr/LC_MESSAGES/ClientSideShorten.po
+++ b/plugins/ClientSideShorten/locale/fr/LC_MESSAGES/ClientSideShorten.po
@@ -10,19 +10,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ClientSideShorten\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:28+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:26:48+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:35+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:19:34+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-clientsideshorten\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ClientSideShortenPlugin.php:74
+#: ClientSideShortenPlugin.php:76
 msgid ""
 "ClientSideShorten causes the web interface's notice form to automatically "
 "shorten URLs as they entered, and before the notice is submitted."
diff --git a/plugins/ClientSideShorten/locale/he/LC_MESSAGES/ClientSideShorten.po b/plugins/ClientSideShorten/locale/he/LC_MESSAGES/ClientSideShorten.po
index af5c32767d..c7a1d8c42e 100644
--- a/plugins/ClientSideShorten/locale/he/LC_MESSAGES/ClientSideShorten.po
+++ b/plugins/ClientSideShorten/locale/he/LC_MESSAGES/ClientSideShorten.po
@@ -9,19 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ClientSideShorten\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:28+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:26:48+0000\n"
 "Language-Team: Hebrew <http://translatewiki.net/wiki/Portal:he>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:35+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:19:34+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-plugin-clientsideshorten\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ClientSideShortenPlugin.php:74
+#: ClientSideShortenPlugin.php:76
 msgid ""
 "ClientSideShorten causes the web interface's notice form to automatically "
 "shorten URLs as they entered, and before the notice is submitted."
diff --git a/plugins/ClientSideShorten/locale/ia/LC_MESSAGES/ClientSideShorten.po b/plugins/ClientSideShorten/locale/ia/LC_MESSAGES/ClientSideShorten.po
index 7b28c36b77..0a75887f5d 100644
--- a/plugins/ClientSideShorten/locale/ia/LC_MESSAGES/ClientSideShorten.po
+++ b/plugins/ClientSideShorten/locale/ia/LC_MESSAGES/ClientSideShorten.po
@@ -9,19 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ClientSideShorten\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:28+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:26:48+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:35+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:19:34+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-clientsideshorten\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ClientSideShortenPlugin.php:74
+#: ClientSideShortenPlugin.php:76
 msgid ""
 "ClientSideShorten causes the web interface's notice form to automatically "
 "shorten URLs as they entered, and before the notice is submitted."
diff --git a/plugins/ClientSideShorten/locale/id/LC_MESSAGES/ClientSideShorten.po b/plugins/ClientSideShorten/locale/id/LC_MESSAGES/ClientSideShorten.po
index 1eec2eac18..8c06a3167a 100644
--- a/plugins/ClientSideShorten/locale/id/LC_MESSAGES/ClientSideShorten.po
+++ b/plugins/ClientSideShorten/locale/id/LC_MESSAGES/ClientSideShorten.po
@@ -9,19 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ClientSideShorten\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:28+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:26:48+0000\n"
 "Language-Team: Indonesian <http://translatewiki.net/wiki/Portal:id>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:35+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:19:34+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: id\n"
 "X-Message-Group: #out-statusnet-plugin-clientsideshorten\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ClientSideShortenPlugin.php:74
+#: ClientSideShortenPlugin.php:76
 msgid ""
 "ClientSideShorten causes the web interface's notice form to automatically "
 "shorten URLs as they entered, and before the notice is submitted."
diff --git a/plugins/ClientSideShorten/locale/mk/LC_MESSAGES/ClientSideShorten.po b/plugins/ClientSideShorten/locale/mk/LC_MESSAGES/ClientSideShorten.po
index a702242a08..56a2aa77c9 100644
--- a/plugins/ClientSideShorten/locale/mk/LC_MESSAGES/ClientSideShorten.po
+++ b/plugins/ClientSideShorten/locale/mk/LC_MESSAGES/ClientSideShorten.po
@@ -9,19 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ClientSideShorten\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:28+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:26:48+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:35+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:19:34+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-clientsideshorten\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
 
-#: ClientSideShortenPlugin.php:74
+#: ClientSideShortenPlugin.php:76
 msgid ""
 "ClientSideShorten causes the web interface's notice form to automatically "
 "shorten URLs as they entered, and before the notice is submitted."
diff --git a/plugins/ClientSideShorten/locale/nb/LC_MESSAGES/ClientSideShorten.po b/plugins/ClientSideShorten/locale/nb/LC_MESSAGES/ClientSideShorten.po
index 00038dc070..3c458ea3e6 100644
--- a/plugins/ClientSideShorten/locale/nb/LC_MESSAGES/ClientSideShorten.po
+++ b/plugins/ClientSideShorten/locale/nb/LC_MESSAGES/ClientSideShorten.po
@@ -9,19 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ClientSideShorten\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:28+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:26:48+0000\n"
 "Language-Team: Norwegian (bokmål)‬ <http://translatewiki.net/wiki/Portal:no>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:35+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:19:34+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: #out-statusnet-plugin-clientsideshorten\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ClientSideShortenPlugin.php:74
+#: ClientSideShortenPlugin.php:76
 msgid ""
 "ClientSideShorten causes the web interface's notice form to automatically "
 "shorten URLs as they entered, and before the notice is submitted."
diff --git a/plugins/ClientSideShorten/locale/nl/LC_MESSAGES/ClientSideShorten.po b/plugins/ClientSideShorten/locale/nl/LC_MESSAGES/ClientSideShorten.po
index 4b976374fa..8e07250985 100644
--- a/plugins/ClientSideShorten/locale/nl/LC_MESSAGES/ClientSideShorten.po
+++ b/plugins/ClientSideShorten/locale/nl/LC_MESSAGES/ClientSideShorten.po
@@ -9,19 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ClientSideShorten\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:28+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:26:48+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:35+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:19:34+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-clientsideshorten\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ClientSideShortenPlugin.php:74
+#: ClientSideShortenPlugin.php:76
 msgid ""
 "ClientSideShorten causes the web interface's notice form to automatically "
 "shorten URLs as they entered, and before the notice is submitted."
diff --git a/plugins/ClientSideShorten/locale/ru/LC_MESSAGES/ClientSideShorten.po b/plugins/ClientSideShorten/locale/ru/LC_MESSAGES/ClientSideShorten.po
index 887f658eeb..e4f3be0d97 100644
--- a/plugins/ClientSideShorten/locale/ru/LC_MESSAGES/ClientSideShorten.po
+++ b/plugins/ClientSideShorten/locale/ru/LC_MESSAGES/ClientSideShorten.po
@@ -10,20 +10,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ClientSideShorten\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:28+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:26:48+0000\n"
 "Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:35+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:19:34+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-clientsideshorten\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: ClientSideShortenPlugin.php:74
+#: ClientSideShortenPlugin.php:76
 msgid ""
 "ClientSideShorten causes the web interface's notice form to automatically "
 "shorten URLs as they entered, and before the notice is submitted."
diff --git a/plugins/ClientSideShorten/locale/tl/LC_MESSAGES/ClientSideShorten.po b/plugins/ClientSideShorten/locale/tl/LC_MESSAGES/ClientSideShorten.po
index c2c7d5a1a7..928d92245b 100644
--- a/plugins/ClientSideShorten/locale/tl/LC_MESSAGES/ClientSideShorten.po
+++ b/plugins/ClientSideShorten/locale/tl/LC_MESSAGES/ClientSideShorten.po
@@ -9,19 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ClientSideShorten\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:28+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:26:48+0000\n"
 "Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:35+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:19:34+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-clientsideshorten\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ClientSideShortenPlugin.php:74
+#: ClientSideShortenPlugin.php:76
 msgid ""
 "ClientSideShorten causes the web interface's notice form to automatically "
 "shorten URLs as they entered, and before the notice is submitted."
diff --git a/plugins/ClientSideShorten/locale/uk/LC_MESSAGES/ClientSideShorten.po b/plugins/ClientSideShorten/locale/uk/LC_MESSAGES/ClientSideShorten.po
index 570c942c97..d9651bca90 100644
--- a/plugins/ClientSideShorten/locale/uk/LC_MESSAGES/ClientSideShorten.po
+++ b/plugins/ClientSideShorten/locale/uk/LC_MESSAGES/ClientSideShorten.po
@@ -10,20 +10,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ClientSideShorten\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:28+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:26:48+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:35+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:19:34+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-clientsideshorten\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: ClientSideShortenPlugin.php:74
+#: ClientSideShortenPlugin.php:76
 msgid ""
 "ClientSideShorten causes the web interface's notice form to automatically "
 "shorten URLs as they entered, and before the notice is submitted."
diff --git a/plugins/ClientSideShorten/locale/zh_CN/LC_MESSAGES/ClientSideShorten.po b/plugins/ClientSideShorten/locale/zh_CN/LC_MESSAGES/ClientSideShorten.po
index f73bab2d0a..2273d1dc42 100644
--- a/plugins/ClientSideShorten/locale/zh_CN/LC_MESSAGES/ClientSideShorten.po
+++ b/plugins/ClientSideShorten/locale/zh_CN/LC_MESSAGES/ClientSideShorten.po
@@ -10,20 +10,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ClientSideShorten\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:28+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:26:48+0000\n"
 "Language-Team: Simplified Chinese <http://translatewiki.net/wiki/Portal:zh-"
 "hans>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:35+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:19:34+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-clientsideshorten\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ClientSideShortenPlugin.php:74
+#: ClientSideShortenPlugin.php:76
 msgid ""
 "ClientSideShorten causes the web interface's notice form to automatically "
 "shorten URLs as they entered, and before the notice is submitted."
diff --git a/plugins/Comet/locale/Comet.pot b/plugins/Comet/locale/Comet.pot
index 01eb382550..dd36365090 100644
--- a/plugins/Comet/locale/Comet.pot
+++ b/plugins/Comet/locale/Comet.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/DirectionDetector/locale/DirectionDetector.pot b/plugins/DirectionDetector/locale/DirectionDetector.pot
index 3d43b31b0b..9f7981a9ee 100644
--- a/plugins/DirectionDetector/locale/DirectionDetector.pot
+++ b/plugins/DirectionDetector/locale/DirectionDetector.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/DiskCache/locale/DiskCache.pot b/plugins/DiskCache/locale/DiskCache.pot
index 9b51cd1d4a..ca717a462d 100644
--- a/plugins/DiskCache/locale/DiskCache.pot
+++ b/plugins/DiskCache/locale/DiskCache.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/Disqus/locale/Disqus.pot b/plugins/Disqus/locale/Disqus.pot
index 25c533c11a..5afc9546e1 100644
--- a/plugins/Disqus/locale/Disqus.pot
+++ b/plugins/Disqus/locale/Disqus.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/Echo/locale/Echo.pot b/plugins/Echo/locale/Echo.pot
index e2dfa190c4..1420bdcd14 100644
--- a/plugins/Echo/locale/Echo.pot
+++ b/plugins/Echo/locale/Echo.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/EmailAuthentication/locale/EmailAuthentication.pot b/plugins/EmailAuthentication/locale/EmailAuthentication.pot
index 94247349cb..7e25e81da9 100644
--- a/plugins/EmailAuthentication/locale/EmailAuthentication.pot
+++ b/plugins/EmailAuthentication/locale/EmailAuthentication.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/EmailSummary/locale/EmailSummary.pot b/plugins/EmailSummary/locale/EmailSummary.pot
index ee2ff66aa9..b497ab88ba 100644
--- a/plugins/EmailSummary/locale/EmailSummary.pot
+++ b/plugins/EmailSummary/locale/EmailSummary.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/ExtendedProfile/locale/ExtendedProfile.pot b/plugins/ExtendedProfile/locale/ExtendedProfile.pot
new file mode 100644
index 0000000000..0b53a88f8c
--- /dev/null
+++ b/plugins/ExtendedProfile/locale/ExtendedProfile.pot
@@ -0,0 +1,116 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: extendedprofile.php:49 extendedprofile.php:103
+msgid "Personal"
+msgstr ""
+
+#: extendedprofile.php:52
+msgid "Full name"
+msgstr ""
+
+#: extendedprofile.php:57
+msgid "Title"
+msgstr ""
+
+#: extendedprofile.php:61
+msgid "Manager"
+msgstr ""
+
+#: extendedprofile.php:66
+msgid "Location"
+msgstr ""
+
+#: extendedprofile.php:70
+msgid "Bio"
+msgstr ""
+
+#: extendedprofile.php:75
+msgid "Tags"
+msgstr ""
+
+#: extendedprofile.php:82
+msgid "Contact"
+msgstr ""
+
+#: extendedprofile.php:85
+msgid "Phone"
+msgstr ""
+
+#: extendedprofile.php:91
+msgid "IM"
+msgstr ""
+
+#: extendedprofile.php:96
+msgid "Websites"
+msgstr ""
+
+#: extendedprofile.php:106
+msgid "Birthday"
+msgstr ""
+
+#: extendedprofile.php:111
+msgid "Spouse's name"
+msgstr ""
+
+#: extendedprofile.php:115
+msgid "Kids' names"
+msgstr ""
+
+#: extendedprofile.php:120
+msgid "Work experience"
+msgstr ""
+
+#: extendedprofile.php:124
+msgid "Employer"
+msgstr ""
+
+#: extendedprofile.php:129
+msgid "Education"
+msgstr ""
+
+#: extendedprofile.php:133
+msgid "Institution"
+msgstr ""
+
+#: ExtendedProfilePlugin.php:40
+msgid "UI extensions for additional profile fields."
+msgstr ""
+
+#. TRANS: Link description in user account settings menu.
+#: ExtendedProfilePlugin.php:108
+msgid "Details"
+msgstr ""
+
+#: ExtendedProfilePlugin.php:116
+msgid "More details..."
+msgstr ""
+
+#. TRANS: Link title for link on user profile.
+#: profiledetailaction.php:61
+msgid "Edit extended profile settings"
+msgstr ""
+
+#. TRANS: Link text for link on user profile.
+#: profiledetailaction.php:63
+msgid "Edit"
+msgstr ""
+
+#: profiledetailsettingsaction.php:29
+msgid "Extended profile settings"
+msgstr ""
diff --git a/plugins/FacebookBridge/locale/FacebookBridge.pot b/plugins/FacebookBridge/locale/FacebookBridge.pot
index 0bedae8cd3..81d1aed082 100644
--- a/plugins/FacebookBridge/locale/FacebookBridge.pot
+++ b/plugins/FacebookBridge/locale/FacebookBridge.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 15:58+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/FirePHP/locale/FirePHP.pot b/plugins/FirePHP/locale/FirePHP.pot
index 8dd98099f7..713e85bcf2 100644
--- a/plugins/FirePHP/locale/FirePHP.pot
+++ b/plugins/FirePHP/locale/FirePHP.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/FollowEveryone/locale/FollowEveryone.pot b/plugins/FollowEveryone/locale/FollowEveryone.pot
index 069ef623e2..8c28a9a81d 100644
--- a/plugins/FollowEveryone/locale/FollowEveryone.pot
+++ b/plugins/FollowEveryone/locale/FollowEveryone.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/ForceGroup/locale/ForceGroup.pot b/plugins/ForceGroup/locale/ForceGroup.pot
index 3d39dceb71..fcf34621c4 100644
--- a/plugins/ForceGroup/locale/ForceGroup.pot
+++ b/plugins/ForceGroup/locale/ForceGroup.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/GeoURL/locale/GeoURL.pot b/plugins/GeoURL/locale/GeoURL.pot
index bb33c1d508..527de4471c 100644
--- a/plugins/GeoURL/locale/GeoURL.pot
+++ b/plugins/GeoURL/locale/GeoURL.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/Geonames/locale/Geonames.pot b/plugins/Geonames/locale/Geonames.pot
index 7fdcd654ce..6fd405e371 100644
--- a/plugins/Geonames/locale/Geonames.pot
+++ b/plugins/Geonames/locale/Geonames.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/GoogleAnalytics/locale/GoogleAnalytics.pot b/plugins/GoogleAnalytics/locale/GoogleAnalytics.pot
index cd7a894ec2..267fe7d63f 100644
--- a/plugins/GoogleAnalytics/locale/GoogleAnalytics.pot
+++ b/plugins/GoogleAnalytics/locale/GoogleAnalytics.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/Gravatar/locale/Gravatar.pot b/plugins/Gravatar/locale/Gravatar.pot
index 589415bb25..2df7c645a3 100644
--- a/plugins/Gravatar/locale/Gravatar.pot
+++ b/plugins/Gravatar/locale/Gravatar.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/GroupFavorited/locale/GroupFavorited.pot b/plugins/GroupFavorited/locale/GroupFavorited.pot
index e1fa43b7b2..9de2b4bb8f 100644
--- a/plugins/GroupFavorited/locale/GroupFavorited.pot
+++ b/plugins/GroupFavorited/locale/GroupFavorited.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/GroupPrivateMessage/locale/GroupPrivateMessage.pot b/plugins/GroupPrivateMessage/locale/GroupPrivateMessage.pot
index c6be0d5ddd..8d5edc6c07 100644
--- a/plugins/GroupPrivateMessage/locale/GroupPrivateMessage.pot
+++ b/plugins/GroupPrivateMessage/locale/GroupPrivateMessage.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-14 16:01+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/Imap/locale/Imap.pot b/plugins/Imap/locale/Imap.pot
index 3828d0e7bc..1016c4068e 100644
--- a/plugins/Imap/locale/Imap.pot
+++ b/plugins/Imap/locale/Imap.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/InProcessCache/locale/InProcessCache.pot b/plugins/InProcessCache/locale/InProcessCache.pot
index 96225bf988..61ebc8f3dc 100644
--- a/plugins/InProcessCache/locale/InProcessCache.pot
+++ b/plugins/InProcessCache/locale/InProcessCache.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/InfiniteScroll/locale/InfiniteScroll.pot b/plugins/InfiniteScroll/locale/InfiniteScroll.pot
index fa156216ac..dd061e17ef 100644
--- a/plugins/InfiniteScroll/locale/InfiniteScroll.pot
+++ b/plugins/InfiniteScroll/locale/InfiniteScroll.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/Irc/locale/Irc.pot b/plugins/Irc/locale/Irc.pot
new file mode 100644
index 0000000000..b1f3fc4692
--- /dev/null
+++ b/plugins/Irc/locale/Irc.pot
@@ -0,0 +1,35 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ircmanager.php:234
+msgid "Your nickname is not registered so IRC connectivity cannot be enabled"
+msgstr ""
+
+#: Irc_waiting_message.php:127
+#, php-format
+msgid "Could not increment attempts count for %d"
+msgstr ""
+
+#: IrcPlugin.php:79
+msgid "IRC"
+msgstr ""
+
+#: IrcPlugin.php:393
+msgid ""
+"The IRC plugin allows users to send and receive notices over an IRC network."
+msgstr ""
diff --git a/plugins/LdapAuthentication/locale/LdapAuthentication.pot b/plugins/LdapAuthentication/locale/LdapAuthentication.pot
index fbadd7a3ff..31fc52825a 100644
--- a/plugins/LdapAuthentication/locale/LdapAuthentication.pot
+++ b/plugins/LdapAuthentication/locale/LdapAuthentication.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/LdapAuthorization/locale/LdapAuthorization.pot b/plugins/LdapAuthorization/locale/LdapAuthorization.pot
index 49d3503d8d..8fd98d924f 100644
--- a/plugins/LdapAuthorization/locale/LdapAuthorization.pot
+++ b/plugins/LdapAuthorization/locale/LdapAuthorization.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/LilUrl/locale/LilUrl.pot b/plugins/LilUrl/locale/LilUrl.pot
index 6dd9580443..b1ca108736 100644
--- a/plugins/LilUrl/locale/LilUrl.pot
+++ b/plugins/LilUrl/locale/LilUrl.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,11 +16,11 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: LilUrlPlugin.php:43
+#: LilUrlPlugin.php:41
 msgid "A serviceUrl must be specified."
 msgstr ""
 
-#: LilUrlPlugin.php:68
+#: LilUrlPlugin.php:66
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr ""
diff --git a/plugins/LilUrl/locale/de/LC_MESSAGES/LilUrl.po b/plugins/LilUrl/locale/de/LC_MESSAGES/LilUrl.po
index 93c8ffc151..5d30766d11 100644
--- a/plugins/LilUrl/locale/de/LC_MESSAGES/LilUrl.po
+++ b/plugins/LilUrl/locale/de/LC_MESSAGES/LilUrl.po
@@ -9,23 +9,23 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LilUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:59+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:13+0000\n"
 "Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:03+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:25:30+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-lilurl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: LilUrlPlugin.php:43
+#: LilUrlPlugin.php:41
 msgid "A serviceUrl must be specified."
 msgstr "Eine „serviceUrl“ muss angegeben werden."
 
-#: LilUrlPlugin.php:68
+#: LilUrlPlugin.php:66
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr "Benutzung des <a href=\"http://%1$s/\">%1$s</a>-URL-Kürzungsdienstes."
diff --git a/plugins/LilUrl/locale/fr/LC_MESSAGES/LilUrl.po b/plugins/LilUrl/locale/fr/LC_MESSAGES/LilUrl.po
index f01bee046a..2dea700619 100644
--- a/plugins/LilUrl/locale/fr/LC_MESSAGES/LilUrl.po
+++ b/plugins/LilUrl/locale/fr/LC_MESSAGES/LilUrl.po
@@ -10,23 +10,23 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LilUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:59+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:13+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:03+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:25:30+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-lilurl\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: LilUrlPlugin.php:43
+#: LilUrlPlugin.php:41
 msgid "A serviceUrl must be specified."
 msgstr "Une URL de service doit être spécifiée."
 
-#: LilUrlPlugin.php:68
+#: LilUrlPlugin.php:66
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr ""
diff --git a/plugins/LilUrl/locale/he/LC_MESSAGES/LilUrl.po b/plugins/LilUrl/locale/he/LC_MESSAGES/LilUrl.po
index 643ad0263b..0769c6406d 100644
--- a/plugins/LilUrl/locale/he/LC_MESSAGES/LilUrl.po
+++ b/plugins/LilUrl/locale/he/LC_MESSAGES/LilUrl.po
@@ -9,23 +9,23 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LilUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:59+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:13+0000\n"
 "Language-Team: Hebrew <http://translatewiki.net/wiki/Portal:he>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:03+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:25:30+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-plugin-lilurl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: LilUrlPlugin.php:43
+#: LilUrlPlugin.php:41
 msgid "A serviceUrl must be specified."
 msgstr "יש לציין serviceUrl (כתובת השירות)"
 
-#: LilUrlPlugin.php:68
+#: LilUrlPlugin.php:66
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr "שימוש בשירות קיצור הכתובות <a href=\"http://%1$s/\">%1$s</a>."
diff --git a/plugins/LilUrl/locale/ia/LC_MESSAGES/LilUrl.po b/plugins/LilUrl/locale/ia/LC_MESSAGES/LilUrl.po
index d34afcd07d..ec4cf18c9f 100644
--- a/plugins/LilUrl/locale/ia/LC_MESSAGES/LilUrl.po
+++ b/plugins/LilUrl/locale/ia/LC_MESSAGES/LilUrl.po
@@ -9,23 +9,23 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LilUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:00+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:13+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:03+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:25:30+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-lilurl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: LilUrlPlugin.php:43
+#: LilUrlPlugin.php:41
 msgid "A serviceUrl must be specified."
 msgstr "Un serviceUrl debe esser specificate."
 
-#: LilUrlPlugin.php:68
+#: LilUrlPlugin.php:66
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr ""
diff --git a/plugins/LilUrl/locale/id/LC_MESSAGES/LilUrl.po b/plugins/LilUrl/locale/id/LC_MESSAGES/LilUrl.po
index b984bcf479..2679dc0aaf 100644
--- a/plugins/LilUrl/locale/id/LC_MESSAGES/LilUrl.po
+++ b/plugins/LilUrl/locale/id/LC_MESSAGES/LilUrl.po
@@ -9,23 +9,23 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LilUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:00+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:13+0000\n"
 "Language-Team: Indonesian <http://translatewiki.net/wiki/Portal:id>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:03+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:25:30+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: id\n"
 "X-Message-Group: #out-statusnet-plugin-lilurl\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: LilUrlPlugin.php:43
+#: LilUrlPlugin.php:41
 msgid "A serviceUrl must be specified."
 msgstr "Sebuah serviceUrl harus disebutkan."
 
-#: LilUrlPlugin.php:68
+#: LilUrlPlugin.php:66
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr "Menggunakan layanan pemendek URL <a href=\"http://%1$s/\">%1$s</a>."
diff --git a/plugins/LilUrl/locale/ja/LC_MESSAGES/LilUrl.po b/plugins/LilUrl/locale/ja/LC_MESSAGES/LilUrl.po
index d5d62b3a5d..a5e8e0bbd6 100644
--- a/plugins/LilUrl/locale/ja/LC_MESSAGES/LilUrl.po
+++ b/plugins/LilUrl/locale/ja/LC_MESSAGES/LilUrl.po
@@ -9,23 +9,23 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LilUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:00+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:13+0000\n"
 "Language-Team: Japanese <http://translatewiki.net/wiki/Portal:ja>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:03+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:25:30+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ja\n"
 "X-Message-Group: #out-statusnet-plugin-lilurl\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: LilUrlPlugin.php:43
+#: LilUrlPlugin.php:41
 msgid "A serviceUrl must be specified."
 msgstr ""
 
-#: LilUrlPlugin.php:68
+#: LilUrlPlugin.php:66
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr "<a href=\"http://%1$s/\">%1$s</a>をURL短縮サービスとして利用する。"
diff --git a/plugins/LilUrl/locale/mk/LC_MESSAGES/LilUrl.po b/plugins/LilUrl/locale/mk/LC_MESSAGES/LilUrl.po
index 9d0a31df1f..5467e751cd 100644
--- a/plugins/LilUrl/locale/mk/LC_MESSAGES/LilUrl.po
+++ b/plugins/LilUrl/locale/mk/LC_MESSAGES/LilUrl.po
@@ -9,23 +9,23 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LilUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:00+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:13+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:03+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:25:30+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-lilurl\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
 
-#: LilUrlPlugin.php:43
+#: LilUrlPlugin.php:41
 msgid "A serviceUrl must be specified."
 msgstr "Мора да се назначи адреса на службата (serviceUrl)."
 
-#: LilUrlPlugin.php:68
+#: LilUrlPlugin.php:66
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr ""
diff --git a/plugins/LilUrl/locale/nb/LC_MESSAGES/LilUrl.po b/plugins/LilUrl/locale/nb/LC_MESSAGES/LilUrl.po
index c9fccd864d..7a7dd13a05 100644
--- a/plugins/LilUrl/locale/nb/LC_MESSAGES/LilUrl.po
+++ b/plugins/LilUrl/locale/nb/LC_MESSAGES/LilUrl.po
@@ -9,23 +9,23 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LilUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:00+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:13+0000\n"
 "Language-Team: Norwegian (bokmål)‬ <http://translatewiki.net/wiki/Portal:no>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:03+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:25:30+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: #out-statusnet-plugin-lilurl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: LilUrlPlugin.php:43
+#: LilUrlPlugin.php:41
 msgid "A serviceUrl must be specified."
 msgstr "En tjeneste-Url må spesifiseres."
 
-#: LilUrlPlugin.php:68
+#: LilUrlPlugin.php:66
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr "Bruker URL-forkortertjenesten <a href=\"http://%1$s/\">%1$s</a>."
diff --git a/plugins/LilUrl/locale/nl/LC_MESSAGES/LilUrl.po b/plugins/LilUrl/locale/nl/LC_MESSAGES/LilUrl.po
index b5de95da75..917f751ae7 100644
--- a/plugins/LilUrl/locale/nl/LC_MESSAGES/LilUrl.po
+++ b/plugins/LilUrl/locale/nl/LC_MESSAGES/LilUrl.po
@@ -9,23 +9,23 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LilUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:00+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:13+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:03+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:25:30+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-lilurl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: LilUrlPlugin.php:43
+#: LilUrlPlugin.php:41
 msgid "A serviceUrl must be specified."
 msgstr "Er moet een serviceUrl opgegeven worden."
 
-#: LilUrlPlugin.php:68
+#: LilUrlPlugin.php:66
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr ""
diff --git a/plugins/LilUrl/locale/ru/LC_MESSAGES/LilUrl.po b/plugins/LilUrl/locale/ru/LC_MESSAGES/LilUrl.po
index 592d1f62f8..1ff9526456 100644
--- a/plugins/LilUrl/locale/ru/LC_MESSAGES/LilUrl.po
+++ b/plugins/LilUrl/locale/ru/LC_MESSAGES/LilUrl.po
@@ -9,24 +9,24 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LilUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:00+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:13+0000\n"
 "Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:03+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:25:30+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-lilurl\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: LilUrlPlugin.php:43
+#: LilUrlPlugin.php:41
 msgid "A serviceUrl must be specified."
 msgstr "Должен быть указан URL-адрес сервису."
 
-#: LilUrlPlugin.php:68
+#: LilUrlPlugin.php:66
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr "Использование службы сокращения URL <a href=\"http://%1$s/\">%1$s</a>."
diff --git a/plugins/LilUrl/locale/tl/LC_MESSAGES/LilUrl.po b/plugins/LilUrl/locale/tl/LC_MESSAGES/LilUrl.po
index 222d447fc4..9e83bdab2c 100644
--- a/plugins/LilUrl/locale/tl/LC_MESSAGES/LilUrl.po
+++ b/plugins/LilUrl/locale/tl/LC_MESSAGES/LilUrl.po
@@ -9,23 +9,23 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LilUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:00+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:13+0000\n"
 "Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:03+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:25:30+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-lilurl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: LilUrlPlugin.php:43
+#: LilUrlPlugin.php:41
 msgid "A serviceUrl must be specified."
 msgstr "Dapat tukuyin ang isang URL ng palingkuran."
 
-#: LilUrlPlugin.php:68
+#: LilUrlPlugin.php:66
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr ""
diff --git a/plugins/LilUrl/locale/uk/LC_MESSAGES/LilUrl.po b/plugins/LilUrl/locale/uk/LC_MESSAGES/LilUrl.po
index c26e86cc90..e8e62d5d76 100644
--- a/plugins/LilUrl/locale/uk/LC_MESSAGES/LilUrl.po
+++ b/plugins/LilUrl/locale/uk/LC_MESSAGES/LilUrl.po
@@ -9,24 +9,24 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LilUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:00+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:13+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:03+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:25:30+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-lilurl\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: LilUrlPlugin.php:43
+#: LilUrlPlugin.php:41
 msgid "A serviceUrl must be specified."
 msgstr "URL-адресу сервісу має бути зазначено."
 
-#: LilUrlPlugin.php:68
+#: LilUrlPlugin.php:66
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr ""
diff --git a/plugins/LilUrl/locale/zh_CN/LC_MESSAGES/LilUrl.po b/plugins/LilUrl/locale/zh_CN/LC_MESSAGES/LilUrl.po
index 4f210c0798..b4d003c866 100644
--- a/plugins/LilUrl/locale/zh_CN/LC_MESSAGES/LilUrl.po
+++ b/plugins/LilUrl/locale/zh_CN/LC_MESSAGES/LilUrl.po
@@ -9,24 +9,24 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LilUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:00+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:13+0000\n"
 "Language-Team: Simplified Chinese <http://translatewiki.net/wiki/Portal:zh-"
 "hans>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:03+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:25:30+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-lilurl\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: LilUrlPlugin.php:43
+#: LilUrlPlugin.php:41
 msgid "A serviceUrl must be specified."
 msgstr "必须设置一个服务的地址 Url。"
 
-#: LilUrlPlugin.php:68
+#: LilUrlPlugin.php:66
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr "使用 <a href=\"http://%1$s/\">%1$s</a> 短链接服务"
diff --git a/plugins/LinkPreview/locale/LinkPreview.pot b/plugins/LinkPreview/locale/LinkPreview.pot
index a48337ff90..42ab0e5a9a 100644
--- a/plugins/LinkPreview/locale/LinkPreview.pot
+++ b/plugins/LinkPreview/locale/LinkPreview.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/Linkback/locale/Linkback.pot b/plugins/Linkback/locale/Linkback.pot
index c06b9b5b00..6b0c4e7431 100644
--- a/plugins/Linkback/locale/Linkback.pot
+++ b/plugins/Linkback/locale/Linkback.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/LogFilter/locale/LogFilter.pot b/plugins/LogFilter/locale/LogFilter.pot
index 962734f01c..d794233fcf 100644
--- a/plugins/LogFilter/locale/LogFilter.pot
+++ b/plugins/LogFilter/locale/LogFilter.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/Mapstraction/locale/Mapstraction.pot b/plugins/Mapstraction/locale/Mapstraction.pot
index e3fc59fce4..0e9048529d 100644
--- a/plugins/Mapstraction/locale/Mapstraction.pot
+++ b/plugins/Mapstraction/locale/Mapstraction.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/Memcache/locale/Memcache.pot b/plugins/Memcache/locale/Memcache.pot
index 5dd9c27317..e611af98b0 100644
--- a/plugins/Memcache/locale/Memcache.pot
+++ b/plugins/Memcache/locale/Memcache.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/Memcached/locale/Memcached.pot b/plugins/Memcached/locale/Memcached.pot
index 6ec5fac4c3..c72698a316 100644
--- a/plugins/Memcached/locale/Memcached.pot
+++ b/plugins/Memcached/locale/Memcached.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/Meteor/locale/Meteor.pot b/plugins/Meteor/locale/Meteor.pot
index 9df9b6bdc6..7a2db76ab0 100644
--- a/plugins/Meteor/locale/Meteor.pot
+++ b/plugins/Meteor/locale/Meteor.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/Minify/locale/Minify.pot b/plugins/Minify/locale/Minify.pot
index 3305e32bfe..5c1b704a83 100644
--- a/plugins/Minify/locale/Minify.pot
+++ b/plugins/Minify/locale/Minify.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/MobileProfile/locale/MobileProfile.pot b/plugins/MobileProfile/locale/MobileProfile.pot
index 9211418104..40d70f71f9 100644
--- a/plugins/MobileProfile/locale/MobileProfile.pot
+++ b/plugins/MobileProfile/locale/MobileProfile.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 15:58+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/ModHelper/locale/ModHelper.pot b/plugins/ModHelper/locale/ModHelper.pot
index 28cbd45307..4d7d2a8a81 100644
--- a/plugins/ModHelper/locale/ModHelper.pot
+++ b/plugins/ModHelper/locale/ModHelper.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/ModPlus/locale/ModPlus.pot b/plugins/ModPlus/locale/ModPlus.pot
index ace9377032..4036032d37 100644
--- a/plugins/ModPlus/locale/ModPlus.pot
+++ b/plugins/ModPlus/locale/ModPlus.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/Msn/locale/Msn.pot b/plugins/Msn/locale/Msn.pot
new file mode 100644
index 0000000000..a032d4759f
--- /dev/null
+++ b/plugins/Msn/locale/Msn.pot
@@ -0,0 +1,26 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: MsnPlugin.php:62
+msgid "MSN"
+msgstr ""
+
+#: MsnPlugin.php:212
+msgid ""
+"The MSN plugin allows users to send and receive notices over the MSN network."
+msgstr ""
diff --git a/plugins/NoticeTitle/locale/NoticeTitle.pot b/plugins/NoticeTitle/locale/NoticeTitle.pot
index c87d25c00f..babb054ff8 100644
--- a/plugins/NoticeTitle/locale/NoticeTitle.pot
+++ b/plugins/NoticeTitle/locale/NoticeTitle.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/OStatus/locale/OStatus.pot b/plugins/OStatus/locale/OStatus.pot
index 2cd394d529..ce414e189c 100644
--- a/plugins/OStatus/locale/OStatus.pot
+++ b/plugins/OStatus/locale/OStatus.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-14 16:01+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -120,138 +120,138 @@ msgid "Attempting to end PuSH subscription for feed with no hub."
 msgstr ""
 
 #. TRANS: Server exception. %s is a URI.
-#: classes/Ostatus_profile.php:192
+#: classes/Ostatus_profile.php:154
 #, php-format
 msgid "Invalid ostatus_profile state: both group and profile IDs set for %s."
 msgstr ""
 
 #. TRANS: Server exception. %s is a URI.
-#: classes/Ostatus_profile.php:195
+#: classes/Ostatus_profile.php:157
 #, php-format
 msgid "Invalid ostatus_profile state: both group and profile IDs empty for %s."
 msgstr ""
 
 #. TRANS: Server exception.
 #. TRANS: %1$s is the method name the exception occured in, %2$s is the actor type.
-#: classes/Ostatus_profile.php:285
+#: classes/Ostatus_profile.php:247
 #, php-format
 msgid "Invalid actor passed to %1$s: %2$s."
 msgstr ""
 
 #. TRANS: Server exception.
-#: classes/Ostatus_profile.php:379
+#: classes/Ostatus_profile.php:341
 msgid ""
 "Invalid type passed to Ostatus_profile::notify. It must be XML string or "
 "Activity entry."
 msgstr ""
 
 #. TRANS: Exception.
-#: classes/Ostatus_profile.php:410
+#: classes/Ostatus_profile.php:372
 msgid "Unknown feed format."
 msgstr ""
 
 #. TRANS: Exception.
-#: classes/Ostatus_profile.php:434
+#: classes/Ostatus_profile.php:396
 msgid "RSS feed without a channel."
 msgstr ""
 
 #. TRANS: Client exception.
-#: classes/Ostatus_profile.php:480
+#: classes/Ostatus_profile.php:442
 msgid "Can't handle that kind of post."
 msgstr ""
 
 #. TRANS: Client exception. %s is a source URI.
-#: classes/Ostatus_profile.php:538
+#: classes/Ostatus_profile.php:500
 #, php-format
 msgid "No content for notice %s."
 msgstr ""
 
 #. TRANS: Shown when a notice is longer than supported and/or when attachments are present. At runtime
 #. TRANS: this will usually be replaced with localised text from StatusNet core messages.
-#: classes/Ostatus_profile.php:573
+#: classes/Ostatus_profile.php:535
 msgid "Show more"
 msgstr ""
 
 #. TRANS: Exception. %s is a profile URL.
-#: classes/Ostatus_profile.php:766
+#: classes/Ostatus_profile.php:728
 #, php-format
 msgid "Could not reach profile page %s."
 msgstr ""
 
 #. TRANS: Exception. %s is a URL.
-#: classes/Ostatus_profile.php:824
+#: classes/Ostatus_profile.php:786
 #, php-format
 msgid "Could not find a feed URL for profile page %s."
 msgstr ""
 
 #. TRANS: Feed sub exception.
-#: classes/Ostatus_profile.php:923
+#: classes/Ostatus_profile.php:885
 msgid "Can't find enough profile information to make a feed."
 msgstr ""
 
 #. TRANS: Server exception. %s is a URL.
-#: classes/Ostatus_profile.php:987
+#: classes/Ostatus_profile.php:949
 #, php-format
 msgid "Invalid avatar URL %s."
 msgstr ""
 
 #. TRANS: Server exception. %s is a URI.
-#: classes/Ostatus_profile.php:998
+#: classes/Ostatus_profile.php:960
 #, php-format
 msgid "Tried to update avatar for unsaved remote profile %s."
 msgstr ""
 
 #. TRANS: Server exception. %s is a URL.
-#: classes/Ostatus_profile.php:1008
+#: classes/Ostatus_profile.php:970
 #, php-format
 msgid "Unable to fetch avatar from %s."
 msgstr ""
 
 #. TRANS: Exception.
-#: classes/Ostatus_profile.php:1235
+#: classes/Ostatus_profile.php:1197
 msgid "Local user can't be referenced as remote."
 msgstr ""
 
 #. TRANS: Exception.
-#: classes/Ostatus_profile.php:1240
+#: classes/Ostatus_profile.php:1202
 msgid "Local group can't be referenced as remote."
 msgstr ""
 
 #. TRANS: Server exception.
-#: classes/Ostatus_profile.php:1292 classes/Ostatus_profile.php:1303
+#: classes/Ostatus_profile.php:1254 classes/Ostatus_profile.php:1265
 msgid "Can't save local profile."
 msgstr ""
 
 #. TRANS: Server exception.
-#: classes/Ostatus_profile.php:1311
+#: classes/Ostatus_profile.php:1273
 msgid "Can't save OStatus profile."
 msgstr ""
 
 #. TRANS: Exception.
-#: classes/Ostatus_profile.php:1599 classes/Ostatus_profile.php:1627
+#: classes/Ostatus_profile.php:1561 classes/Ostatus_profile.php:1589
 msgid "Not a valid webfinger address."
 msgstr ""
 
 #. TRANS: Exception. %s is a webfinger address.
-#: classes/Ostatus_profile.php:1709
+#: classes/Ostatus_profile.php:1671
 #, php-format
 msgid "Couldn't save profile for \"%s\"."
 msgstr ""
 
 #. TRANS: Exception. %s is a webfinger address.
-#: classes/Ostatus_profile.php:1728
+#: classes/Ostatus_profile.php:1690
 #, php-format
 msgid "Couldn't save ostatus_profile for \"%s\"."
 msgstr ""
 
 #. TRANS: Exception. %s is a webfinger address.
-#: classes/Ostatus_profile.php:1736
+#: classes/Ostatus_profile.php:1698
 #, php-format
 msgid "Couldn't find a valid profile for \"%s\"."
 msgstr ""
 
 #. TRANS: Server exception.
-#: classes/Ostatus_profile.php:1779
+#: classes/Ostatus_profile.php:1741
 msgid "Could not store HTML content of long post as file."
 msgstr ""
 
@@ -574,69 +574,49 @@ msgstr ""
 msgid "You are already subscribed to this user."
 msgstr ""
 
-#: actions/ostatussub.php:167
-msgid "Photo"
-msgstr ""
-
-#: actions/ostatussub.php:178
-msgid "Nickname"
-msgstr ""
-
-#: actions/ostatussub.php:199
-msgid "Location"
-msgstr ""
-
-#: actions/ostatussub.php:208
-msgid "URL"
-msgstr ""
-
-#: actions/ostatussub.php:220
-msgid "Note"
-msgstr ""
-
 #. TRANS: Error text.
-#: actions/ostatussub.php:256 actions/ostatussub.php:263
-#: actions/ostatussub.php:288
+#: actions/ostatussub.php:232 actions/ostatussub.php:239
+#: actions/ostatussub.php:264
 msgid ""
 "Sorry, we could not reach that address. Please make sure that the OStatus "
 "address is like nickname@example.com or http://example.net/nickname."
 msgstr ""
 
 #. TRANS: Error text.
-#: actions/ostatussub.php:267 actions/ostatussub.php:271
-#: actions/ostatussub.php:275 actions/ostatussub.php:279
-#: actions/ostatussub.php:283
+#: actions/ostatussub.php:243 actions/ostatussub.php:247
+#: actions/ostatussub.php:251 actions/ostatussub.php:255
+#: actions/ostatussub.php:259
 msgid ""
 "Sorry, we could not reach that feed. Please try that OStatus address again "
 "later."
 msgstr ""
 
 #. TRANS: OStatus remote subscription dialog error.
-#: actions/ostatussub.php:317
+#: actions/ostatussub.php:293
 msgid "Already subscribed!"
 msgstr ""
 
 #. TRANS: OStatus remote subscription dialog error.
-#: actions/ostatussub.php:322
+#: actions/ostatussub.php:298
 msgid "Remote subscription failed!"
 msgstr ""
 
-#: actions/ostatussub.php:369 actions/ostatusinit.php:64
+#: actions/ostatussub.php:345 actions/ostatusinit.php:64
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 
 #. TRANS: Form title.
-#: actions/ostatussub.php:397 actions/ostatusinit.php:83
+#: actions/ostatussub.php:373 actions/ostatusinit.php:83
 msgid "Subscribe to user"
 msgstr ""
 
 #. TRANS: Page title for OStatus remote subscription form
-#: actions/ostatussub.php:417
+#: actions/ostatussub.php:393
 msgid "Confirm"
 msgstr ""
 
 #. TRANS: Instructions.
-#: actions/ostatussub.php:429
+#: actions/ostatussub.php:405
 msgid ""
 "You can subscribe to users from other supported sites. Paste their address "
 "or profile URI below:"
diff --git a/plugins/OStatus/locale/de/LC_MESSAGES/OStatus.po b/plugins/OStatus/locale/de/LC_MESSAGES/OStatus.po
index 89697d90b6..9566496f7e 100644
--- a/plugins/OStatus/locale/de/LC_MESSAGES/OStatus.po
+++ b/plugins/OStatus/locale/de/LC_MESSAGES/OStatus.po
@@ -10,13 +10,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OStatus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-14 16:01+0000\n"
-"PO-Revision-Date: 2011-02-14 16:09:37+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:45+0000\n"
 "Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-03 00:48:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r82114); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-02-14 17:22:01+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-ostatus\n"
@@ -130,7 +130,7 @@ msgstr ""
 "Es wird versucht, ein PuSH-Abonnemont für einen Feed ohne Hub zu beenden."
 
 #. TRANS: Server exception. %s is a URI.
-#: classes/Ostatus_profile.php:192
+#: classes/Ostatus_profile.php:154
 #, php-format
 msgid "Invalid ostatus_profile state: both group and profile IDs set for %s."
 msgstr ""
@@ -138,7 +138,7 @@ msgstr ""
 "s gesetzt."
 
 #. TRANS: Server exception. %s is a URI.
-#: classes/Ostatus_profile.php:195
+#: classes/Ostatus_profile.php:157
 #, php-format
 msgid "Invalid ostatus_profile state: both group and profile IDs empty for %s."
 msgstr ""
@@ -147,13 +147,13 @@ msgstr ""
 
 #. TRANS: Server exception.
 #. TRANS: %1$s is the method name the exception occured in, %2$s is the actor type.
-#: classes/Ostatus_profile.php:285
+#: classes/Ostatus_profile.php:247
 #, php-format
 msgid "Invalid actor passed to %1$s: %2$s."
 msgstr "Ungültiger actor an %1$s übergeben: %2$s."
 
 #. TRANS: Server exception.
-#: classes/Ostatus_profile.php:379
+#: classes/Ostatus_profile.php:341
 msgid ""
 "Invalid type passed to Ostatus_profile::notify. It must be XML string or "
 "Activity entry."
@@ -162,58 +162,58 @@ msgstr ""
 "oder ein Activity-Eintrag sein."
 
 #. TRANS: Exception.
-#: classes/Ostatus_profile.php:410
+#: classes/Ostatus_profile.php:372
 msgid "Unknown feed format."
 msgstr "Unbekanntes Feed-Format."
 
 #. TRANS: Exception.
-#: classes/Ostatus_profile.php:434
+#: classes/Ostatus_profile.php:396
 msgid "RSS feed without a channel."
 msgstr "RSS-Feed ohne einen Kanal."
 
 #. TRANS: Client exception.
-#: classes/Ostatus_profile.php:480
+#: classes/Ostatus_profile.php:442
 msgid "Can't handle that kind of post."
 msgstr "Kann diese Art von Post nicht verarbeiten."
 
 #. TRANS: Client exception. %s is a source URI.
-#: classes/Ostatus_profile.php:538
+#: classes/Ostatus_profile.php:500
 #, php-format
 msgid "No content for notice %s."
 msgstr "Kein Inhalt für Nachricht %s."
 
 #. TRANS: Shown when a notice is longer than supported and/or when attachments are present. At runtime
 #. TRANS: this will usually be replaced with localised text from StatusNet core messages.
-#: classes/Ostatus_profile.php:573
+#: classes/Ostatus_profile.php:535
 msgid "Show more"
 msgstr "Mehr anzeigen"
 
 #. TRANS: Exception. %s is a profile URL.
-#: classes/Ostatus_profile.php:766
+#: classes/Ostatus_profile.php:728
 #, php-format
 msgid "Could not reach profile page %s."
 msgstr "Konnte Profilseite %s nicht erreichen."
 
 #. TRANS: Exception. %s is a URL.
-#: classes/Ostatus_profile.php:824
+#: classes/Ostatus_profile.php:786
 #, php-format
 msgid "Could not find a feed URL for profile page %s."
 msgstr "Konnte keinen Feed-URL für die Profilseite %s finden."
 
 #. TRANS: Feed sub exception.
-#: classes/Ostatus_profile.php:923
+#: classes/Ostatus_profile.php:885
 msgid "Can't find enough profile information to make a feed."
 msgstr ""
 "Kann nicht genug Profilinformationen finden, um einen Feed zu erstellen."
 
 #. TRANS: Server exception. %s is a URL.
-#: classes/Ostatus_profile.php:987
+#: classes/Ostatus_profile.php:949
 #, php-format
 msgid "Invalid avatar URL %s."
 msgstr "Ungültiger Avatar-URL %s."
 
 #. TRANS: Server exception. %s is a URI.
-#: classes/Ostatus_profile.php:998
+#: classes/Ostatus_profile.php:960
 #, php-format
 msgid "Tried to update avatar for unsaved remote profile %s."
 msgstr ""
@@ -221,56 +221,56 @@ msgstr ""
 "aktualisieren."
 
 #. TRANS: Server exception. %s is a URL.
-#: classes/Ostatus_profile.php:1008
+#: classes/Ostatus_profile.php:970
 #, php-format
 msgid "Unable to fetch avatar from %s."
 msgstr "Kann den Avatar von %s nicht abrufen."
 
 #. TRANS: Exception.
-#: classes/Ostatus_profile.php:1235
+#: classes/Ostatus_profile.php:1197
 msgid "Local user can't be referenced as remote."
 msgstr "Lokaler Benutzer kann nicht als remote verwiesen werden."
 
 #. TRANS: Exception.
-#: classes/Ostatus_profile.php:1240
+#: classes/Ostatus_profile.php:1202
 msgid "Local group can't be referenced as remote."
 msgstr "Lokale Gruppe kann nicht als remote verwiesen werden."
 
 #. TRANS: Server exception.
-#: classes/Ostatus_profile.php:1292 classes/Ostatus_profile.php:1303
+#: classes/Ostatus_profile.php:1254 classes/Ostatus_profile.php:1265
 msgid "Can't save local profile."
 msgstr "Lokales Profil kann nicht gespeichert werden."
 
 #. TRANS: Server exception.
-#: classes/Ostatus_profile.php:1311
+#: classes/Ostatus_profile.php:1273
 msgid "Can't save OStatus profile."
 msgstr "OStatus-Profil kann nicht gespeichert werden."
 
 #. TRANS: Exception.
-#: classes/Ostatus_profile.php:1599 classes/Ostatus_profile.php:1627
+#: classes/Ostatus_profile.php:1561 classes/Ostatus_profile.php:1589
 msgid "Not a valid webfinger address."
 msgstr "Ungültige Webfinger-Adresse."
 
 #. TRANS: Exception. %s is a webfinger address.
-#: classes/Ostatus_profile.php:1709
+#: classes/Ostatus_profile.php:1671
 #, php-format
 msgid "Couldn't save profile for \"%s\"."
 msgstr "Profil für „%s“ konnte nicht gespeichert werden."
 
 #. TRANS: Exception. %s is a webfinger address.
-#: classes/Ostatus_profile.php:1728
+#: classes/Ostatus_profile.php:1690
 #, php-format
 msgid "Couldn't save ostatus_profile for \"%s\"."
 msgstr "Ostatus_profile für „%s“ konnte nicht gespeichert werden."
 
 #. TRANS: Exception. %s is a webfinger address.
-#: classes/Ostatus_profile.php:1736
+#: classes/Ostatus_profile.php:1698
 #, php-format
 msgid "Couldn't find a valid profile for \"%s\"."
 msgstr "Es konnte kein gültiges Profil für „%s“ gefunden werden."
 
 #. TRANS: Server exception.
-#: classes/Ostatus_profile.php:1779
+#: classes/Ostatus_profile.php:1741
 msgid "Could not store HTML content of long post as file."
 msgstr ""
 "HTML-Inhalt eines langen Posts konnte nicht als Datei nicht gespeichert "
@@ -605,29 +605,9 @@ msgstr "Abonniere diesen Benutzer"
 msgid "You are already subscribed to this user."
 msgstr "Du hast diesen Benutzer bereits abonniert:"
 
-#: actions/ostatussub.php:167
-msgid "Photo"
-msgstr "Foto"
-
-#: actions/ostatussub.php:178
-msgid "Nickname"
-msgstr "Benutzername"
-
-#: actions/ostatussub.php:199
-msgid "Location"
-msgstr "Ort"
-
-#: actions/ostatussub.php:208
-msgid "URL"
-msgstr "URL"
-
-#: actions/ostatussub.php:220
-msgid "Note"
-msgstr "Notiz"
-
 #. TRANS: Error text.
-#: actions/ostatussub.php:256 actions/ostatussub.php:263
-#: actions/ostatussub.php:288
+#: actions/ostatussub.php:232 actions/ostatussub.php:239
+#: actions/ostatussub.php:264
 msgid ""
 "Sorry, we could not reach that address. Please make sure that the OStatus "
 "address is like nickname@example.com or http://example.net/nickname."
@@ -637,9 +617,9 @@ msgstr ""
 "http://example.net/nickname."
 
 #. TRANS: Error text.
-#: actions/ostatussub.php:267 actions/ostatussub.php:271
-#: actions/ostatussub.php:275 actions/ostatussub.php:279
-#: actions/ostatussub.php:283
+#: actions/ostatussub.php:243 actions/ostatussub.php:247
+#: actions/ostatussub.php:251 actions/ostatussub.php:255
+#: actions/ostatussub.php:259
 msgid ""
 "Sorry, we could not reach that feed. Please try that OStatus address again "
 "later."
@@ -648,31 +628,31 @@ msgstr ""
 "diese OStatus-Adresse später noch einmal."
 
 #. TRANS: OStatus remote subscription dialog error.
-#: actions/ostatussub.php:317
+#: actions/ostatussub.php:293
 msgid "Already subscribed!"
 msgstr "Bereits abonniert!"
 
 #. TRANS: OStatus remote subscription dialog error.
-#: actions/ostatussub.php:322
+#: actions/ostatussub.php:298
 msgid "Remote subscription failed!"
 msgstr "Remoteabonnement fehlgeschlagen!"
 
-#: actions/ostatussub.php:369 actions/ostatusinit.php:64
+#: actions/ostatussub.php:345 actions/ostatusinit.php:64
 msgid "There was a problem with your session token. Try again, please."
 msgstr "Es gab ein Problem mit deinem Sitzungstoken. Bitte versuche es erneut."
 
 #. TRANS: Form title.
-#: actions/ostatussub.php:397 actions/ostatusinit.php:83
+#: actions/ostatussub.php:373 actions/ostatusinit.php:83
 msgid "Subscribe to user"
 msgstr "Abonniere diesen Benutzer"
 
 #. TRANS: Page title for OStatus remote subscription form
-#: actions/ostatussub.php:417
+#: actions/ostatussub.php:393
 msgid "Confirm"
 msgstr "Bestätigen"
 
 #. TRANS: Instructions.
-#: actions/ostatussub.php:429
+#: actions/ostatussub.php:405
 msgid ""
 "You can subscribe to users from other supported sites. Paste their address "
 "or profile URI below:"
@@ -790,3 +770,18 @@ msgstr "Unerwartete Deabonnement-Anfrage für %s."
 #, php-format
 msgid "Unexpected unsubscribe request for %s."
 msgstr "Unerwartete Deabonnement-Anfrage für %s."
+
+#~ msgid "Photo"
+#~ msgstr "Foto"
+
+#~ msgid "Nickname"
+#~ msgstr "Benutzername"
+
+#~ msgid "Location"
+#~ msgstr "Ort"
+
+#~ msgid "URL"
+#~ msgstr "URL"
+
+#~ msgid "Note"
+#~ msgstr "Notiz"
diff --git a/plugins/OStatus/locale/fr/LC_MESSAGES/OStatus.po b/plugins/OStatus/locale/fr/LC_MESSAGES/OStatus.po
index ac126fd904..e47a6c0fa9 100644
--- a/plugins/OStatus/locale/fr/LC_MESSAGES/OStatus.po
+++ b/plugins/OStatus/locale/fr/LC_MESSAGES/OStatus.po
@@ -11,13 +11,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OStatus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-14 16:01+0000\n"
-"PO-Revision-Date: 2011-02-14 16:09:38+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:45+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-03 00:48:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r82114); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-02-14 17:22:01+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-ostatus\n"
@@ -133,7 +133,7 @@ msgstr ""
 "concentrateur."
 
 #. TRANS: Server exception. %s is a URI.
-#: classes/Ostatus_profile.php:192
+#: classes/Ostatus_profile.php:154
 #, php-format
 msgid "Invalid ostatus_profile state: both group and profile IDs set for %s."
 msgstr ""
@@ -141,7 +141,7 @@ msgstr ""
 "profil définis pour « %s »."
 
 #. TRANS: Server exception. %s is a URI.
-#: classes/Ostatus_profile.php:195
+#: classes/Ostatus_profile.php:157
 #, php-format
 msgid "Invalid ostatus_profile state: both group and profile IDs empty for %s."
 msgstr ""
@@ -150,13 +150,13 @@ msgstr ""
 
 #. TRANS: Server exception.
 #. TRANS: %1$s is the method name the exception occured in, %2$s is the actor type.
-#: classes/Ostatus_profile.php:285
+#: classes/Ostatus_profile.php:247
 #, php-format
 msgid "Invalid actor passed to %1$s: %2$s."
 msgstr "Type d’acteur invalide passé à la méthode « %1$s » : « %2$s »."
 
 #. TRANS: Server exception.
-#: classes/Ostatus_profile.php:379
+#: classes/Ostatus_profile.php:341
 msgid ""
 "Invalid type passed to Ostatus_profile::notify. It must be XML string or "
 "Activity entry."
@@ -165,40 +165,40 @@ msgstr ""
 "une chaîne XML ou une entrée « Activity »."
 
 #. TRANS: Exception.
-#: classes/Ostatus_profile.php:410
+#: classes/Ostatus_profile.php:372
 msgid "Unknown feed format."
 msgstr "Format de flux d’information inconnu."
 
 #. TRANS: Exception.
-#: classes/Ostatus_profile.php:434
+#: classes/Ostatus_profile.php:396
 msgid "RSS feed without a channel."
 msgstr "Flux RSS sans canal."
 
 #. TRANS: Client exception.
-#: classes/Ostatus_profile.php:480
+#: classes/Ostatus_profile.php:442
 msgid "Can't handle that kind of post."
 msgstr "Impossible de gérer cette sorte de publication."
 
 #. TRANS: Client exception. %s is a source URI.
-#: classes/Ostatus_profile.php:538
+#: classes/Ostatus_profile.php:500
 #, php-format
 msgid "No content for notice %s."
 msgstr "Aucun contenu dans l’avis « %s »."
 
 #. TRANS: Shown when a notice is longer than supported and/or when attachments are present. At runtime
 #. TRANS: this will usually be replaced with localised text from StatusNet core messages.
-#: classes/Ostatus_profile.php:573
+#: classes/Ostatus_profile.php:535
 msgid "Show more"
 msgstr "Voir davantage"
 
 #. TRANS: Exception. %s is a profile URL.
-#: classes/Ostatus_profile.php:766
+#: classes/Ostatus_profile.php:728
 #, php-format
 msgid "Could not reach profile page %s."
 msgstr "Impossible d’atteindre la page de profil « %s »."
 
 #. TRANS: Exception. %s is a URL.
-#: classes/Ostatus_profile.php:824
+#: classes/Ostatus_profile.php:786
 #, php-format
 msgid "Could not find a feed URL for profile page %s."
 msgstr ""
@@ -206,20 +206,20 @@ msgstr ""
 "profil « %s »."
 
 #. TRANS: Feed sub exception.
-#: classes/Ostatus_profile.php:923
+#: classes/Ostatus_profile.php:885
 msgid "Can't find enough profile information to make a feed."
 msgstr ""
 "Impossible de trouver assez d’informations de profil pour créer un flux "
 "d’information."
 
 #. TRANS: Server exception. %s is a URL.
-#: classes/Ostatus_profile.php:987
+#: classes/Ostatus_profile.php:949
 #, php-format
 msgid "Invalid avatar URL %s."
 msgstr "Adresse URL d’avatar « %s » invalide."
 
 #. TRANS: Server exception. %s is a URI.
-#: classes/Ostatus_profile.php:998
+#: classes/Ostatus_profile.php:960
 #, php-format
 msgid "Tried to update avatar for unsaved remote profile %s."
 msgstr ""
@@ -227,56 +227,56 @@ msgstr ""
 "»."
 
 #. TRANS: Server exception. %s is a URL.
-#: classes/Ostatus_profile.php:1008
+#: classes/Ostatus_profile.php:970
 #, php-format
 msgid "Unable to fetch avatar from %s."
 msgstr "Impossible de récupérer l’avatar depuis « %s »."
 
 #. TRANS: Exception.
-#: classes/Ostatus_profile.php:1235
+#: classes/Ostatus_profile.php:1197
 msgid "Local user can't be referenced as remote."
 msgstr "L’utilisateur local ne peut être référencé comme distant."
 
 #. TRANS: Exception.
-#: classes/Ostatus_profile.php:1240
+#: classes/Ostatus_profile.php:1202
 msgid "Local group can't be referenced as remote."
 msgstr "Le groupe local ne peut être référencé comme distant."
 
 #. TRANS: Server exception.
-#: classes/Ostatus_profile.php:1292 classes/Ostatus_profile.php:1303
+#: classes/Ostatus_profile.php:1254 classes/Ostatus_profile.php:1265
 msgid "Can't save local profile."
 msgstr "Impossible de sauvegarder le profil local."
 
 #. TRANS: Server exception.
-#: classes/Ostatus_profile.php:1311
+#: classes/Ostatus_profile.php:1273
 msgid "Can't save OStatus profile."
 msgstr "Impossible de sauvegarder le profil OStatus."
 
 #. TRANS: Exception.
-#: classes/Ostatus_profile.php:1599 classes/Ostatus_profile.php:1627
+#: classes/Ostatus_profile.php:1561 classes/Ostatus_profile.php:1589
 msgid "Not a valid webfinger address."
 msgstr "Ce n’est pas une adresse « webfinger » valide."
 
 #. TRANS: Exception. %s is a webfinger address.
-#: classes/Ostatus_profile.php:1709
+#: classes/Ostatus_profile.php:1671
 #, php-format
 msgid "Couldn't save profile for \"%s\"."
 msgstr "Impossible de sauvegarder le profil pour « %s »."
 
 #. TRANS: Exception. %s is a webfinger address.
-#: classes/Ostatus_profile.php:1728
+#: classes/Ostatus_profile.php:1690
 #, php-format
 msgid "Couldn't save ostatus_profile for \"%s\"."
 msgstr "Impossible d’enregistrer le profil OStatus pour « %s »."
 
 #. TRANS: Exception. %s is a webfinger address.
-#: classes/Ostatus_profile.php:1736
+#: classes/Ostatus_profile.php:1698
 #, php-format
 msgid "Couldn't find a valid profile for \"%s\"."
 msgstr "Impossible de trouver un profil valide pour « %s »."
 
 #. TRANS: Server exception.
-#: classes/Ostatus_profile.php:1779
+#: classes/Ostatus_profile.php:1741
 msgid "Could not store HTML content of long post as file."
 msgstr ""
 "Impossible de stocker le contenu HTML d’une longue publication en un fichier."
@@ -622,29 +622,9 @@ msgstr "S’abonner à cet utilisateur"
 msgid "You are already subscribed to this user."
 msgstr "Vous êtes déjà abonné à cet utilisateur."
 
-#: actions/ostatussub.php:167
-msgid "Photo"
-msgstr "Photo"
-
-#: actions/ostatussub.php:178
-msgid "Nickname"
-msgstr "Pseudonyme"
-
-#: actions/ostatussub.php:199
-msgid "Location"
-msgstr "Emplacement"
-
-#: actions/ostatussub.php:208
-msgid "URL"
-msgstr "Adresse URL"
-
-#: actions/ostatussub.php:220
-msgid "Note"
-msgstr "Note"
-
 #. TRANS: Error text.
-#: actions/ostatussub.php:256 actions/ostatussub.php:263
-#: actions/ostatussub.php:288
+#: actions/ostatussub.php:232 actions/ostatussub.php:239
+#: actions/ostatussub.php:264
 msgid ""
 "Sorry, we could not reach that address. Please make sure that the OStatus "
 "address is like nickname@example.com or http://example.net/nickname."
@@ -654,9 +634,9 @@ msgstr ""
 "forme pseudonyme@example.com ou http://example.net/pseudonyme."
 
 #. TRANS: Error text.
-#: actions/ostatussub.php:267 actions/ostatussub.php:271
-#: actions/ostatussub.php:275 actions/ostatussub.php:279
-#: actions/ostatussub.php:283
+#: actions/ostatussub.php:243 actions/ostatussub.php:247
+#: actions/ostatussub.php:251 actions/ostatussub.php:255
+#: actions/ostatussub.php:259
 msgid ""
 "Sorry, we could not reach that feed. Please try that OStatus address again "
 "later."
@@ -665,33 +645,33 @@ msgstr ""
 "cette adresse OStatus."
 
 #. TRANS: OStatus remote subscription dialog error.
-#: actions/ostatussub.php:317
+#: actions/ostatussub.php:293
 msgid "Already subscribed!"
 msgstr "Déjà abonné !"
 
 #. TRANS: OStatus remote subscription dialog error.
-#: actions/ostatussub.php:322
+#: actions/ostatussub.php:298
 msgid "Remote subscription failed!"
 msgstr "Ĺ’abonnement distant a échoué !"
 
-#: actions/ostatussub.php:369 actions/ostatusinit.php:64
+#: actions/ostatussub.php:345 actions/ostatusinit.php:64
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 "Un problème est survenu avec votre jeton de session. Veuillez essayer à "
 "nouveau."
 
 #. TRANS: Form title.
-#: actions/ostatussub.php:397 actions/ostatusinit.php:83
+#: actions/ostatussub.php:373 actions/ostatusinit.php:83
 msgid "Subscribe to user"
 msgstr "S’abonner à un utilisateur"
 
 #. TRANS: Page title for OStatus remote subscription form
-#: actions/ostatussub.php:417
+#: actions/ostatussub.php:393
 msgid "Confirm"
 msgstr "Confirmer"
 
 #. TRANS: Instructions.
-#: actions/ostatussub.php:429
+#: actions/ostatussub.php:405
 msgid ""
 "You can subscribe to users from other supported sites. Paste their address "
 "or profile URI below:"
@@ -811,3 +791,18 @@ msgstr "Demande d’abonnement inattendue pour le sujet invalide « %s »."
 #, php-format
 msgid "Unexpected unsubscribe request for %s."
 msgstr "Demande de désabonnement inattendue pour le sujet invalide « %s »."
+
+#~ msgid "Photo"
+#~ msgstr "Photo"
+
+#~ msgid "Nickname"
+#~ msgstr "Pseudonyme"
+
+#~ msgid "Location"
+#~ msgstr "Emplacement"
+
+#~ msgid "URL"
+#~ msgstr "Adresse URL"
+
+#~ msgid "Note"
+#~ msgstr "Note"
diff --git a/plugins/OStatus/locale/ia/LC_MESSAGES/OStatus.po b/plugins/OStatus/locale/ia/LC_MESSAGES/OStatus.po
index 8d533cb771..ad166ccece 100644
--- a/plugins/OStatus/locale/ia/LC_MESSAGES/OStatus.po
+++ b/plugins/OStatus/locale/ia/LC_MESSAGES/OStatus.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OStatus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-14 16:01+0000\n"
-"PO-Revision-Date: 2011-02-14 16:09:38+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:45+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-03 00:48:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r82114); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-02-14 17:22:01+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-ostatus\n"
@@ -127,14 +127,14 @@ msgid "Attempting to end PuSH subscription for feed with no hub."
 msgstr "Tentativa de terminar subscription PuSH pro syndication sin centro."
 
 #. TRANS: Server exception. %s is a URI.
-#: classes/Ostatus_profile.php:192
+#: classes/Ostatus_profile.php:154
 #, php-format
 msgid "Invalid ostatus_profile state: both group and profile IDs set for %s."
 msgstr ""
 "Stato ostatus_profile invalide: IDs e de gruppo e de profilo definite pro %s."
 
 #. TRANS: Server exception. %s is a URI.
-#: classes/Ostatus_profile.php:195
+#: classes/Ostatus_profile.php:157
 #, php-format
 msgid "Invalid ostatus_profile state: both group and profile IDs empty for %s."
 msgstr ""
@@ -142,13 +142,13 @@ msgstr ""
 
 #. TRANS: Server exception.
 #. TRANS: %1$s is the method name the exception occured in, %2$s is the actor type.
-#: classes/Ostatus_profile.php:285
+#: classes/Ostatus_profile.php:247
 #, php-format
 msgid "Invalid actor passed to %1$s: %2$s."
 msgstr "Actor invalide passate a %1$s: %2$s."
 
 #. TRANS: Server exception.
-#: classes/Ostatus_profile.php:379
+#: classes/Ostatus_profile.php:341
 msgid ""
 "Invalid type passed to Ostatus_profile::notify. It must be XML string or "
 "Activity entry."
@@ -157,113 +157,113 @@ msgstr ""
 "o entrata Activity."
 
 #. TRANS: Exception.
-#: classes/Ostatus_profile.php:410
+#: classes/Ostatus_profile.php:372
 msgid "Unknown feed format."
 msgstr "Formato de syndication incognite."
 
 #. TRANS: Exception.
-#: classes/Ostatus_profile.php:434
+#: classes/Ostatus_profile.php:396
 msgid "RSS feed without a channel."
 msgstr "Syndication RSS sin canal."
 
 #. TRANS: Client exception.
-#: classes/Ostatus_profile.php:480
+#: classes/Ostatus_profile.php:442
 msgid "Can't handle that kind of post."
 msgstr "Non pote tractar iste typo de message."
 
 #. TRANS: Client exception. %s is a source URI.
-#: classes/Ostatus_profile.php:538
+#: classes/Ostatus_profile.php:500
 #, php-format
 msgid "No content for notice %s."
 msgstr "Nulle contento pro nota %s."
 
 #. TRANS: Shown when a notice is longer than supported and/or when attachments are present. At runtime
 #. TRANS: this will usually be replaced with localised text from StatusNet core messages.
-#: classes/Ostatus_profile.php:573
+#: classes/Ostatus_profile.php:535
 msgid "Show more"
 msgstr "Monstrar plus"
 
 #. TRANS: Exception. %s is a profile URL.
-#: classes/Ostatus_profile.php:766
+#: classes/Ostatus_profile.php:728
 #, php-format
 msgid "Could not reach profile page %s."
 msgstr "Non poteva attinger pagina de profilo %s."
 
 #. TRANS: Exception. %s is a URL.
-#: classes/Ostatus_profile.php:824
+#: classes/Ostatus_profile.php:786
 #, php-format
 msgid "Could not find a feed URL for profile page %s."
 msgstr "Non poteva trovar un URL de syndication pro pagina de profilo %s."
 
 #. TRANS: Feed sub exception.
-#: classes/Ostatus_profile.php:923
+#: classes/Ostatus_profile.php:885
 msgid "Can't find enough profile information to make a feed."
 msgstr ""
 "Non pote trovar satis de information de profilo pro facer un syndication."
 
 #. TRANS: Server exception. %s is a URL.
-#: classes/Ostatus_profile.php:987
+#: classes/Ostatus_profile.php:949
 #, php-format
 msgid "Invalid avatar URL %s."
 msgstr "URL de avatar %s invalide."
 
 #. TRANS: Server exception. %s is a URI.
-#: classes/Ostatus_profile.php:998
+#: classes/Ostatus_profile.php:960
 #, php-format
 msgid "Tried to update avatar for unsaved remote profile %s."
 msgstr "Tentava actualisar avatar pro profilo remote non salveguardate %s."
 
 #. TRANS: Server exception. %s is a URL.
-#: classes/Ostatus_profile.php:1008
+#: classes/Ostatus_profile.php:970
 #, php-format
 msgid "Unable to fetch avatar from %s."
 msgstr "Incapace de obtener avatar ab %s."
 
 #. TRANS: Exception.
-#: classes/Ostatus_profile.php:1235
+#: classes/Ostatus_profile.php:1197
 msgid "Local user can't be referenced as remote."
 msgstr "Usator local non pote esser referentiate como remote."
 
 #. TRANS: Exception.
-#: classes/Ostatus_profile.php:1240
+#: classes/Ostatus_profile.php:1202
 msgid "Local group can't be referenced as remote."
 msgstr "Gruppo local non pote esser referentiate como remote."
 
 #. TRANS: Server exception.
-#: classes/Ostatus_profile.php:1292 classes/Ostatus_profile.php:1303
+#: classes/Ostatus_profile.php:1254 classes/Ostatus_profile.php:1265
 msgid "Can't save local profile."
 msgstr "Non pote salveguardar profilo local."
 
 #. TRANS: Server exception.
-#: classes/Ostatus_profile.php:1311
+#: classes/Ostatus_profile.php:1273
 msgid "Can't save OStatus profile."
 msgstr "Non pote salveguardar profilo OStatus."
 
 #. TRANS: Exception.
-#: classes/Ostatus_profile.php:1599 classes/Ostatus_profile.php:1627
+#: classes/Ostatus_profile.php:1561 classes/Ostatus_profile.php:1589
 msgid "Not a valid webfinger address."
 msgstr "Adresse webfinger invalide."
 
 #. TRANS: Exception. %s is a webfinger address.
-#: classes/Ostatus_profile.php:1709
+#: classes/Ostatus_profile.php:1671
 #, php-format
 msgid "Couldn't save profile for \"%s\"."
 msgstr "Non poteva salveguardar profilo pro \"%s\"."
 
 #. TRANS: Exception. %s is a webfinger address.
-#: classes/Ostatus_profile.php:1728
+#: classes/Ostatus_profile.php:1690
 #, php-format
 msgid "Couldn't save ostatus_profile for \"%s\"."
 msgstr "Non poteva salveguardar osatus_profile pro %s."
 
 #. TRANS: Exception. %s is a webfinger address.
-#: classes/Ostatus_profile.php:1736
+#: classes/Ostatus_profile.php:1698
 #, php-format
 msgid "Couldn't find a valid profile for \"%s\"."
 msgstr "Non poteva trovar un profilo valide pro \"%s\"."
 
 #. TRANS: Server exception.
-#: classes/Ostatus_profile.php:1779
+#: classes/Ostatus_profile.php:1741
 msgid "Could not store HTML content of long post as file."
 msgstr "Non poteva immagazinar contento HTML de longe message como file."
 
@@ -596,29 +596,9 @@ msgstr "Subscriber a iste usator"
 msgid "You are already subscribed to this user."
 msgstr "Tu es ja subscribite a iste usator."
 
-#: actions/ostatussub.php:167
-msgid "Photo"
-msgstr "Photo"
-
-#: actions/ostatussub.php:178
-msgid "Nickname"
-msgstr "Pseudonymo"
-
-#: actions/ostatussub.php:199
-msgid "Location"
-msgstr "Loco"
-
-#: actions/ostatussub.php:208
-msgid "URL"
-msgstr "URL"
-
-#: actions/ostatussub.php:220
-msgid "Note"
-msgstr "Nota"
-
 #. TRANS: Error text.
-#: actions/ostatussub.php:256 actions/ostatussub.php:263
-#: actions/ostatussub.php:288
+#: actions/ostatussub.php:232 actions/ostatussub.php:239
+#: actions/ostatussub.php:264
 msgid ""
 "Sorry, we could not reach that address. Please make sure that the OStatus "
 "address is like nickname@example.com or http://example.net/nickname."
@@ -628,9 +608,9 @@ msgstr ""
 "net/pseudonymo."
 
 #. TRANS: Error text.
-#: actions/ostatussub.php:267 actions/ostatussub.php:271
-#: actions/ostatussub.php:275 actions/ostatussub.php:279
-#: actions/ostatussub.php:283
+#: actions/ostatussub.php:243 actions/ostatussub.php:247
+#: actions/ostatussub.php:251 actions/ostatussub.php:255
+#: actions/ostatussub.php:259
 msgid ""
 "Sorry, we could not reach that feed. Please try that OStatus address again "
 "later."
@@ -639,31 +619,31 @@ msgstr ""
 "reproba iste adresse OStatus plus tarde."
 
 #. TRANS: OStatus remote subscription dialog error.
-#: actions/ostatussub.php:317
+#: actions/ostatussub.php:293
 msgid "Already subscribed!"
 msgstr "Ja subscribite!"
 
 #. TRANS: OStatus remote subscription dialog error.
-#: actions/ostatussub.php:322
+#: actions/ostatussub.php:298
 msgid "Remote subscription failed!"
 msgstr "Subscription remote fallite!"
 
-#: actions/ostatussub.php:369 actions/ostatusinit.php:64
+#: actions/ostatussub.php:345 actions/ostatusinit.php:64
 msgid "There was a problem with your session token. Try again, please."
 msgstr "Occurreva un problema con le indicio de tu session. Per favor reproba."
 
 #. TRANS: Form title.
-#: actions/ostatussub.php:397 actions/ostatusinit.php:83
+#: actions/ostatussub.php:373 actions/ostatusinit.php:83
 msgid "Subscribe to user"
 msgstr "Subscriber a usator"
 
 #. TRANS: Page title for OStatus remote subscription form
-#: actions/ostatussub.php:417
+#: actions/ostatussub.php:393
 msgid "Confirm"
 msgstr "Confirmar"
 
 #. TRANS: Instructions.
-#: actions/ostatussub.php:429
+#: actions/ostatussub.php:405
 msgid ""
 "You can subscribe to users from other supported sites. Paste their address "
 "or profile URI below:"
@@ -781,3 +761,18 @@ msgstr "Requesta de subscription inexpectate pro %s."
 #, php-format
 msgid "Unexpected unsubscribe request for %s."
 msgstr "Requesta de cancellation de subscription inexpectate pro %s."
+
+#~ msgid "Photo"
+#~ msgstr "Photo"
+
+#~ msgid "Nickname"
+#~ msgstr "Pseudonymo"
+
+#~ msgid "Location"
+#~ msgstr "Loco"
+
+#~ msgid "URL"
+#~ msgstr "URL"
+
+#~ msgid "Note"
+#~ msgstr "Nota"
diff --git a/plugins/OStatus/locale/mk/LC_MESSAGES/OStatus.po b/plugins/OStatus/locale/mk/LC_MESSAGES/OStatus.po
index 86d0f996fa..52cc874556 100644
--- a/plugins/OStatus/locale/mk/LC_MESSAGES/OStatus.po
+++ b/plugins/OStatus/locale/mk/LC_MESSAGES/OStatus.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OStatus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-14 16:01+0000\n"
-"PO-Revision-Date: 2011-02-14 16:09:39+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:45+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-03 00:48:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r82114); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-02-14 17:22:01+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-ostatus\n"
@@ -128,7 +128,7 @@ msgstr ""
 "Се обидувам да ставам крај на PuSH-претплатата за емитување без средиште."
 
 #. TRANS: Server exception. %s is a URI.
-#: classes/Ostatus_profile.php:192
+#: classes/Ostatus_profile.php:154
 #, php-format
 msgid "Invalid ostatus_profile state: both group and profile IDs set for %s."
 msgstr ""
@@ -136,7 +136,7 @@ msgstr ""
 "наместени за %s."
 
 #. TRANS: Server exception. %s is a URI.
-#: classes/Ostatus_profile.php:195
+#: classes/Ostatus_profile.php:157
 #, php-format
 msgid "Invalid ostatus_profile state: both group and profile IDs empty for %s."
 msgstr ""
@@ -145,13 +145,13 @@ msgstr ""
 
 #. TRANS: Server exception.
 #. TRANS: %1$s is the method name the exception occured in, %2$s is the actor type.
-#: classes/Ostatus_profile.php:285
+#: classes/Ostatus_profile.php:247
 #, php-format
 msgid "Invalid actor passed to %1$s: %2$s."
 msgstr "На %1$s е пренесен неважечки учесник: %2$s."
 
 #. TRANS: Server exception.
-#: classes/Ostatus_profile.php:379
+#: classes/Ostatus_profile.php:341
 msgid ""
 "Invalid type passed to Ostatus_profile::notify. It must be XML string or "
 "Activity entry."
@@ -160,113 +160,113 @@ msgstr ""
 "или ставка во Activity."
 
 #. TRANS: Exception.
-#: classes/Ostatus_profile.php:410
+#: classes/Ostatus_profile.php:372
 msgid "Unknown feed format."
 msgstr "Непознат формат на каналско емитување."
 
 #. TRANS: Exception.
-#: classes/Ostatus_profile.php:434
+#: classes/Ostatus_profile.php:396
 msgid "RSS feed without a channel."
 msgstr "RSS-емитување без канал."
 
 #. TRANS: Client exception.
-#: classes/Ostatus_profile.php:480
+#: classes/Ostatus_profile.php:442
 msgid "Can't handle that kind of post."
 msgstr "Не можам да работам со таква објава."
 
 #. TRANS: Client exception. %s is a source URI.
-#: classes/Ostatus_profile.php:538
+#: classes/Ostatus_profile.php:500
 #, php-format
 msgid "No content for notice %s."
 msgstr "Нема содржина за забелешката %s."
 
 #. TRANS: Shown when a notice is longer than supported and/or when attachments are present. At runtime
 #. TRANS: this will usually be replaced with localised text from StatusNet core messages.
-#: classes/Ostatus_profile.php:573
+#: classes/Ostatus_profile.php:535
 msgid "Show more"
 msgstr "Повеќе"
 
 #. TRANS: Exception. %s is a profile URL.
-#: classes/Ostatus_profile.php:766
+#: classes/Ostatus_profile.php:728
 #, php-format
 msgid "Could not reach profile page %s."
 msgstr "Не можев да ја добијам профилната страница %s."
 
 #. TRANS: Exception. %s is a URL.
-#: classes/Ostatus_profile.php:824
+#: classes/Ostatus_profile.php:786
 #, php-format
 msgid "Could not find a feed URL for profile page %s."
 msgstr "Не можев да пронајдам каналска URL-адреса за профилната страница %s."
 
 #. TRANS: Feed sub exception.
-#: classes/Ostatus_profile.php:923
+#: classes/Ostatus_profile.php:885
 msgid "Can't find enough profile information to make a feed."
 msgstr "Не можев да најдам доволно профилни податоци за да направам канал."
 
 #. TRANS: Server exception. %s is a URL.
-#: classes/Ostatus_profile.php:987
+#: classes/Ostatus_profile.php:949
 #, php-format
 msgid "Invalid avatar URL %s."
 msgstr "Неважечка URL-адреса за аватарот: %s."
 
 #. TRANS: Server exception. %s is a URI.
-#: classes/Ostatus_profile.php:998
+#: classes/Ostatus_profile.php:960
 #, php-format
 msgid "Tried to update avatar for unsaved remote profile %s."
 msgstr ""
 "Се обидов да го подновам аватарот за незачуваниот далечински профил %s."
 
 #. TRANS: Server exception. %s is a URL.
-#: classes/Ostatus_profile.php:1008
+#: classes/Ostatus_profile.php:970
 #, php-format
 msgid "Unable to fetch avatar from %s."
 msgstr "Не можам да го добијам аватарот од %s."
 
 #. TRANS: Exception.
-#: classes/Ostatus_profile.php:1235
+#: classes/Ostatus_profile.php:1197
 msgid "Local user can't be referenced as remote."
 msgstr "Локалниот корисник не може да се наведе како далечински."
 
 #. TRANS: Exception.
-#: classes/Ostatus_profile.php:1240
+#: classes/Ostatus_profile.php:1202
 msgid "Local group can't be referenced as remote."
 msgstr "Локалната група не може да се наведе како далечинска."
 
 #. TRANS: Server exception.
-#: classes/Ostatus_profile.php:1292 classes/Ostatus_profile.php:1303
+#: classes/Ostatus_profile.php:1254 classes/Ostatus_profile.php:1265
 msgid "Can't save local profile."
 msgstr "Не можам да го зачувам локалниот профил."
 
 #. TRANS: Server exception.
-#: classes/Ostatus_profile.php:1311
+#: classes/Ostatus_profile.php:1273
 msgid "Can't save OStatus profile."
 msgstr "Не можам да го зачувам профилот од OStatus."
 
 #. TRANS: Exception.
-#: classes/Ostatus_profile.php:1599 classes/Ostatus_profile.php:1627
+#: classes/Ostatus_profile.php:1561 classes/Ostatus_profile.php:1589
 msgid "Not a valid webfinger address."
 msgstr "Ова не е важечка Webfinger-адреса"
 
 #. TRANS: Exception. %s is a webfinger address.
-#: classes/Ostatus_profile.php:1709
+#: classes/Ostatus_profile.php:1671
 #, php-format
 msgid "Couldn't save profile for \"%s\"."
 msgstr "Не можам да го зачувам профилот за „%s“."
 
 #. TRANS: Exception. %s is a webfinger address.
-#: classes/Ostatus_profile.php:1728
+#: classes/Ostatus_profile.php:1690
 #, php-format
 msgid "Couldn't save ostatus_profile for \"%s\"."
 msgstr "Не можам да го зачувам ostatus_profile за „%s“."
 
 #. TRANS: Exception. %s is a webfinger address.
-#: classes/Ostatus_profile.php:1736
+#: classes/Ostatus_profile.php:1698
 #, php-format
 msgid "Couldn't find a valid profile for \"%s\"."
 msgstr "Не можев да пронајдам важечки профил за „%s“."
 
 #. TRANS: Server exception.
-#: classes/Ostatus_profile.php:1779
+#: classes/Ostatus_profile.php:1741
 msgid "Could not store HTML content of long post as file."
 msgstr ""
 "Не можам да ја складирам HTML-содржината на долгата објава како податотека."
@@ -600,29 +600,9 @@ msgstr "Претплати се на корисников"
 msgid "You are already subscribed to this user."
 msgstr "Веќе сте претплатени на овој корисник."
 
-#: actions/ostatussub.php:167
-msgid "Photo"
-msgstr "Слика"
-
-#: actions/ostatussub.php:178
-msgid "Nickname"
-msgstr "Прекар"
-
-#: actions/ostatussub.php:199
-msgid "Location"
-msgstr "Место"
-
-#: actions/ostatussub.php:208
-msgid "URL"
-msgstr "URL-адереса"
-
-#: actions/ostatussub.php:220
-msgid "Note"
-msgstr "Белешка"
-
 #. TRANS: Error text.
-#: actions/ostatussub.php:256 actions/ostatussub.php:263
-#: actions/ostatussub.php:288
+#: actions/ostatussub.php:232 actions/ostatussub.php:239
+#: actions/ostatussub.php:264
 msgid ""
 "Sorry, we could not reach that address. Please make sure that the OStatus "
 "address is like nickname@example.com or http://example.net/nickname."
@@ -631,9 +611,9 @@ msgstr ""
 "OStatus е од типот prekar@primer.com или http://primer.net/prekar."
 
 #. TRANS: Error text.
-#: actions/ostatussub.php:267 actions/ostatussub.php:271
-#: actions/ostatussub.php:275 actions/ostatussub.php:279
-#: actions/ostatussub.php:283
+#: actions/ostatussub.php:243 actions/ostatussub.php:247
+#: actions/ostatussub.php:251 actions/ostatussub.php:255
+#: actions/ostatussub.php:259
 msgid ""
 "Sorry, we could not reach that feed. Please try that OStatus address again "
 "later."
@@ -642,31 +622,31 @@ msgstr ""
 "адреса подоцна."
 
 #. TRANS: OStatus remote subscription dialog error.
-#: actions/ostatussub.php:317
+#: actions/ostatussub.php:293
 msgid "Already subscribed!"
 msgstr "Веќе сте претплатени!"
 
 #. TRANS: OStatus remote subscription dialog error.
-#: actions/ostatussub.php:322
+#: actions/ostatussub.php:298
 msgid "Remote subscription failed!"
 msgstr "Далечинската претплата не успеа!"
 
-#: actions/ostatussub.php:369 actions/ostatusinit.php:64
+#: actions/ostatussub.php:345 actions/ostatusinit.php:64
 msgid "There was a problem with your session token. Try again, please."
 msgstr "Се појави проблем со жетонот на Вашата сесија. Обидете се повторно."
 
 #. TRANS: Form title.
-#: actions/ostatussub.php:397 actions/ostatusinit.php:83
+#: actions/ostatussub.php:373 actions/ostatusinit.php:83
 msgid "Subscribe to user"
 msgstr "Претплати се на корисник"
 
 #. TRANS: Page title for OStatus remote subscription form
-#: actions/ostatussub.php:417
+#: actions/ostatussub.php:393
 msgid "Confirm"
 msgstr "Потврди"
 
 #. TRANS: Instructions.
-#: actions/ostatussub.php:429
+#: actions/ostatussub.php:405
 msgid ""
 "You can subscribe to users from other supported sites. Paste their address "
 "or profile URI below:"
@@ -784,3 +764,18 @@ msgstr "Неочекувано барање за претплата за %s."
 #, php-format
 msgid "Unexpected unsubscribe request for %s."
 msgstr "Неочекувано барање за отпишување од претплата за %s."
+
+#~ msgid "Photo"
+#~ msgstr "Слика"
+
+#~ msgid "Nickname"
+#~ msgstr "Прекар"
+
+#~ msgid "Location"
+#~ msgstr "Место"
+
+#~ msgid "URL"
+#~ msgstr "URL-адереса"
+
+#~ msgid "Note"
+#~ msgstr "Белешка"
diff --git a/plugins/OStatus/locale/nl/LC_MESSAGES/OStatus.po b/plugins/OStatus/locale/nl/LC_MESSAGES/OStatus.po
index 6164e0e957..e8dae09893 100644
--- a/plugins/OStatus/locale/nl/LC_MESSAGES/OStatus.po
+++ b/plugins/OStatus/locale/nl/LC_MESSAGES/OStatus.po
@@ -10,13 +10,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OStatus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-14 16:01+0000\n"
-"PO-Revision-Date: 2011-02-14 16:09:39+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:45+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-03 00:48:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r82114); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-02-14 17:22:01+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-ostatus\n"
@@ -134,7 +134,7 @@ msgstr ""
 "Aan het proberen een PuSH-abonnement te verwijderen voor een feed zonder hub."
 
 #. TRANS: Server exception. %s is a URI.
-#: classes/Ostatus_profile.php:192
+#: classes/Ostatus_profile.php:154
 #, php-format
 msgid "Invalid ostatus_profile state: both group and profile IDs set for %s."
 msgstr ""
@@ -142,7 +142,7 @@ msgstr ""
 "voor %s is ingesteld."
 
 #. TRANS: Server exception. %s is a URI.
-#: classes/Ostatus_profile.php:195
+#: classes/Ostatus_profile.php:157
 #, php-format
 msgid "Invalid ostatus_profile state: both group and profile IDs empty for %s."
 msgstr ""
@@ -151,13 +151,13 @@ msgstr ""
 
 #. TRANS: Server exception.
 #. TRANS: %1$s is the method name the exception occured in, %2$s is the actor type.
-#: classes/Ostatus_profile.php:285
+#: classes/Ostatus_profile.php:247
 #, php-format
 msgid "Invalid actor passed to %1$s: %2$s."
 msgstr "Ongeldige actor doorgegeven aan %1$s: %2$s."
 
 #. TRANS: Server exception.
-#: classes/Ostatus_profile.php:379
+#: classes/Ostatus_profile.php:341
 msgid ""
 "Invalid type passed to Ostatus_profile::notify. It must be XML string or "
 "Activity entry."
@@ -166,119 +166,119 @@ msgstr ""
 "string of Activity zijn."
 
 #. TRANS: Exception.
-#: classes/Ostatus_profile.php:410
+#: classes/Ostatus_profile.php:372
 msgid "Unknown feed format."
 msgstr "Onbekend feedformaat"
 
 #. TRANS: Exception.
-#: classes/Ostatus_profile.php:434
+#: classes/Ostatus_profile.php:396
 msgid "RSS feed without a channel."
 msgstr "RSS-feed zonder kanaal."
 
 #. TRANS: Client exception.
-#: classes/Ostatus_profile.php:480
+#: classes/Ostatus_profile.php:442
 msgid "Can't handle that kind of post."
 msgstr "Dat type post kan niet verwerkt worden."
 
 #. TRANS: Client exception. %s is a source URI.
-#: classes/Ostatus_profile.php:538
+#: classes/Ostatus_profile.php:500
 #, php-format
 msgid "No content for notice %s."
 msgstr "Geen inhoud voor mededeling %s."
 
 #. TRANS: Shown when a notice is longer than supported and/or when attachments are present. At runtime
 #. TRANS: this will usually be replaced with localised text from StatusNet core messages.
-#: classes/Ostatus_profile.php:573
+#: classes/Ostatus_profile.php:535
 msgid "Show more"
 msgstr "Meer weergeven"
 
 #. TRANS: Exception. %s is a profile URL.
-#: classes/Ostatus_profile.php:766
+#: classes/Ostatus_profile.php:728
 #, php-format
 msgid "Could not reach profile page %s."
 msgstr "Het was niet mogelijk de profielpagina %s te bereiken."
 
 #. TRANS: Exception. %s is a URL.
-#: classes/Ostatus_profile.php:824
+#: classes/Ostatus_profile.php:786
 #, php-format
 msgid "Could not find a feed URL for profile page %s."
 msgstr "Het was niet mogelijk de feed-URL voor de profielpagina %s te vinden."
 
 #. TRANS: Feed sub exception.
-#: classes/Ostatus_profile.php:923
+#: classes/Ostatus_profile.php:885
 msgid "Can't find enough profile information to make a feed."
 msgstr ""
 "Het was niet mogelijk voldoende profielinformatie te vinden om een feed te "
 "maken."
 
 #. TRANS: Server exception. %s is a URL.
-#: classes/Ostatus_profile.php:987
+#: classes/Ostatus_profile.php:949
 #, php-format
 msgid "Invalid avatar URL %s."
 msgstr "Ongeldige avatar-URL %s."
 
 #. TRANS: Server exception. %s is a URI.
-#: classes/Ostatus_profile.php:998
+#: classes/Ostatus_profile.php:960
 #, php-format
 msgid "Tried to update avatar for unsaved remote profile %s."
 msgstr ""
 "Geprobeerd om een avatar bij te werken voor het niet opgeslagen profiel %s."
 
 #. TRANS: Server exception. %s is a URL.
-#: classes/Ostatus_profile.php:1008
+#: classes/Ostatus_profile.php:970
 #, php-format
 msgid "Unable to fetch avatar from %s."
 msgstr "Het was niet mogelijk de avatar op te halen van %s."
 
 #. TRANS: Exception.
-#: classes/Ostatus_profile.php:1235
+#: classes/Ostatus_profile.php:1197
 msgid "Local user can't be referenced as remote."
 msgstr ""
 "Naar een lokale gebruiker kan niet verwezen worden alsof die zich bij een "
 "andere dienst bevindt."
 
 #. TRANS: Exception.
-#: classes/Ostatus_profile.php:1240
+#: classes/Ostatus_profile.php:1202
 msgid "Local group can't be referenced as remote."
 msgstr ""
 "Naar een lokale groep kan niet verwezen worden alsof die zich bij een andere "
 "dienst bevindt."
 
 #. TRANS: Server exception.
-#: classes/Ostatus_profile.php:1292 classes/Ostatus_profile.php:1303
+#: classes/Ostatus_profile.php:1254 classes/Ostatus_profile.php:1265
 msgid "Can't save local profile."
 msgstr "Het was niet mogelijk het lokale profiel op te slaan."
 
 #. TRANS: Server exception.
-#: classes/Ostatus_profile.php:1311
+#: classes/Ostatus_profile.php:1273
 msgid "Can't save OStatus profile."
 msgstr "Het was niet mogelijk het Ostatusprofiel op te slaan."
 
 #. TRANS: Exception.
-#: classes/Ostatus_profile.php:1599 classes/Ostatus_profile.php:1627
+#: classes/Ostatus_profile.php:1561 classes/Ostatus_profile.php:1589
 msgid "Not a valid webfinger address."
 msgstr "Geen geldig webfingeradres."
 
 #. TRANS: Exception. %s is a webfinger address.
-#: classes/Ostatus_profile.php:1709
+#: classes/Ostatus_profile.php:1671
 #, php-format
 msgid "Couldn't save profile for \"%s\"."
 msgstr "Het was niet mogelijk het profiel voor \"%s\" op te slaan."
 
 #. TRANS: Exception. %s is a webfinger address.
-#: classes/Ostatus_profile.php:1728
+#: classes/Ostatus_profile.php:1690
 #, php-format
 msgid "Couldn't save ostatus_profile for \"%s\"."
 msgstr "Het was niet mogelijk het ostatus_profile voor \"%s\" op te slaan."
 
 #. TRANS: Exception. %s is a webfinger address.
-#: classes/Ostatus_profile.php:1736
+#: classes/Ostatus_profile.php:1698
 #, php-format
 msgid "Couldn't find a valid profile for \"%s\"."
 msgstr "Er is geen geldig profiel voor \"%s\" gevonden."
 
 #. TRANS: Server exception.
-#: classes/Ostatus_profile.php:1779
+#: classes/Ostatus_profile.php:1741
 msgid "Could not store HTML content of long post as file."
 msgstr ""
 "Het was niet mogelijk de HTML-inhoud van het lange bericht als bestand op te "
@@ -627,29 +627,9 @@ msgstr "Abonneren op deze gebruiker"
 msgid "You are already subscribed to this user."
 msgstr "U bent al geabonneerd op deze gebruiker."
 
-#: actions/ostatussub.php:167
-msgid "Photo"
-msgstr "Foto"
-
-#: actions/ostatussub.php:178
-msgid "Nickname"
-msgstr "Gebruikersnaam"
-
-#: actions/ostatussub.php:199
-msgid "Location"
-msgstr "Locatie"
-
-#: actions/ostatussub.php:208
-msgid "URL"
-msgstr "URL"
-
-#: actions/ostatussub.php:220
-msgid "Note"
-msgstr "Opmerking"
-
 #. TRANS: Error text.
-#: actions/ostatussub.php:256 actions/ostatussub.php:263
-#: actions/ostatussub.php:288
+#: actions/ostatussub.php:232 actions/ostatussub.php:239
+#: actions/ostatussub.php:264
 msgid ""
 "Sorry, we could not reach that address. Please make sure that the OStatus "
 "address is like nickname@example.com or http://example.net/nickname."
@@ -658,9 +638,9 @@ msgstr ""
 "van gebruiker@example.com of http://example.net/gebruiker."
 
 #. TRANS: Error text.
-#: actions/ostatussub.php:267 actions/ostatussub.php:271
-#: actions/ostatussub.php:275 actions/ostatussub.php:279
-#: actions/ostatussub.php:283
+#: actions/ostatussub.php:243 actions/ostatussub.php:247
+#: actions/ostatussub.php:251 actions/ostatussub.php:255
+#: actions/ostatussub.php:259
 msgid ""
 "Sorry, we could not reach that feed. Please try that OStatus address again "
 "later."
@@ -668,33 +648,33 @@ msgstr ""
 "Die feed was niet te bereiken. Probeer dat OStatusadres later nog een keer."
 
 #. TRANS: OStatus remote subscription dialog error.
-#: actions/ostatussub.php:317
+#: actions/ostatussub.php:293
 msgid "Already subscribed!"
 msgstr "U bent al gebonneerd!"
 
 #. TRANS: OStatus remote subscription dialog error.
-#: actions/ostatussub.php:322
+#: actions/ostatussub.php:298
 msgid "Remote subscription failed!"
 msgstr "Abonneren via een andere dienst is mislukt!"
 
-#: actions/ostatussub.php:369 actions/ostatusinit.php:64
+#: actions/ostatussub.php:345 actions/ostatusinit.php:64
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 "Er is een probleem ontstaan met uw sessie. Probeer het nog een keer, "
 "alstublieft."
 
 #. TRANS: Form title.
-#: actions/ostatussub.php:397 actions/ostatusinit.php:83
+#: actions/ostatussub.php:373 actions/ostatusinit.php:83
 msgid "Subscribe to user"
 msgstr "Abonneren op gebruiker"
 
 #. TRANS: Page title for OStatus remote subscription form
-#: actions/ostatussub.php:417
+#: actions/ostatussub.php:393
 msgid "Confirm"
 msgstr "Bevestigen"
 
 #. TRANS: Instructions.
-#: actions/ostatussub.php:429
+#: actions/ostatussub.php:405
 msgid ""
 "You can subscribe to users from other supported sites. Paste their address "
 "or profile URI below:"
@@ -813,3 +793,18 @@ msgstr "Onverwacht abonneringsverzoek voor %s."
 #, php-format
 msgid "Unexpected unsubscribe request for %s."
 msgstr "Onverwacht verzoek om abonnement op te hebben voor %s."
+
+#~ msgid "Photo"
+#~ msgstr "Foto"
+
+#~ msgid "Nickname"
+#~ msgstr "Gebruikersnaam"
+
+#~ msgid "Location"
+#~ msgstr "Locatie"
+
+#~ msgid "URL"
+#~ msgstr "URL"
+
+#~ msgid "Note"
+#~ msgstr "Opmerking"
diff --git a/plugins/OStatus/locale/uk/LC_MESSAGES/OStatus.po b/plugins/OStatus/locale/uk/LC_MESSAGES/OStatus.po
index 6e3eb52be4..eb6534502f 100644
--- a/plugins/OStatus/locale/uk/LC_MESSAGES/OStatus.po
+++ b/plugins/OStatus/locale/uk/LC_MESSAGES/OStatus.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OStatus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-14 16:01+0000\n"
-"PO-Revision-Date: 2011-02-14 16:09:39+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:46+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-03 00:48:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r82114); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-02-14 17:22:01+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-ostatus\n"
@@ -131,7 +131,7 @@ msgstr ""
 "вузла."
 
 #. TRANS: Server exception. %s is a URI.
-#: classes/Ostatus_profile.php:192
+#: classes/Ostatus_profile.php:154
 #, php-format
 msgid "Invalid ostatus_profile state: both group and profile IDs set for %s."
 msgstr ""
@@ -139,7 +139,7 @@ msgstr ""
 "ідентифікатори встановлено для %s."
 
 #. TRANS: Server exception. %s is a URI.
-#: classes/Ostatus_profile.php:195
+#: classes/Ostatus_profile.php:157
 #, php-format
 msgid "Invalid ostatus_profile state: both group and profile IDs empty for %s."
 msgstr ""
@@ -148,13 +148,13 @@ msgstr ""
 
 #. TRANS: Server exception.
 #. TRANS: %1$s is the method name the exception occured in, %2$s is the actor type.
-#: classes/Ostatus_profile.php:285
+#: classes/Ostatus_profile.php:247
 #, php-format
 msgid "Invalid actor passed to %1$s: %2$s."
 msgstr "До %1$s передано невірний об’єкт: %2$s."
 
 #. TRANS: Server exception.
-#: classes/Ostatus_profile.php:379
+#: classes/Ostatus_profile.php:341
 msgid ""
 "Invalid type passed to Ostatus_profile::notify. It must be XML string or "
 "Activity entry."
@@ -163,113 +163,113 @@ msgstr ""
 "рядок у форматі XML, або запис активності."
 
 #. TRANS: Exception.
-#: classes/Ostatus_profile.php:410
+#: classes/Ostatus_profile.php:372
 msgid "Unknown feed format."
 msgstr "Невідомий формат веб-стрічки."
 
 #. TRANS: Exception.
-#: classes/Ostatus_profile.php:434
+#: classes/Ostatus_profile.php:396
 msgid "RSS feed without a channel."
 msgstr "RSS-стрічка не має каналу."
 
 #. TRANS: Client exception.
-#: classes/Ostatus_profile.php:480
+#: classes/Ostatus_profile.php:442
 msgid "Can't handle that kind of post."
 msgstr "Не вдається обробити такий тип допису."
 
 #. TRANS: Client exception. %s is a source URI.
-#: classes/Ostatus_profile.php:538
+#: classes/Ostatus_profile.php:500
 #, php-format
 msgid "No content for notice %s."
 msgstr "Допис %s не має змісту."
 
 #. TRANS: Shown when a notice is longer than supported and/or when attachments are present. At runtime
 #. TRANS: this will usually be replaced with localised text from StatusNet core messages.
-#: classes/Ostatus_profile.php:573
+#: classes/Ostatus_profile.php:535
 msgid "Show more"
 msgstr "Розгорнути"
 
 #. TRANS: Exception. %s is a profile URL.
-#: classes/Ostatus_profile.php:766
+#: classes/Ostatus_profile.php:728
 #, php-format
 msgid "Could not reach profile page %s."
 msgstr "Не вдалося досягти сторінки профілю %s."
 
 #. TRANS: Exception. %s is a URL.
-#: classes/Ostatus_profile.php:824
+#: classes/Ostatus_profile.php:786
 #, php-format
 msgid "Could not find a feed URL for profile page %s."
 msgstr "Не вдалося знайти URL веб-стрічки для сторінки профілю %s."
 
 #. TRANS: Feed sub exception.
-#: classes/Ostatus_profile.php:923
+#: classes/Ostatus_profile.php:885
 msgid "Can't find enough profile information to make a feed."
 msgstr ""
 "Не можу знайти достатньо інформації про профіль, аби сформувати веб-стрічку."
 
 #. TRANS: Server exception. %s is a URL.
-#: classes/Ostatus_profile.php:987
+#: classes/Ostatus_profile.php:949
 #, php-format
 msgid "Invalid avatar URL %s."
 msgstr "Невірна URL-адреса аватари %s."
 
 #. TRANS: Server exception. %s is a URI.
-#: classes/Ostatus_profile.php:998
+#: classes/Ostatus_profile.php:960
 #, php-format
 msgid "Tried to update avatar for unsaved remote profile %s."
 msgstr "Намагаюся оновити аватару для не збереженого віддаленого профілю %s."
 
 #. TRANS: Server exception. %s is a URL.
-#: classes/Ostatus_profile.php:1008
+#: classes/Ostatus_profile.php:970
 #, php-format
 msgid "Unable to fetch avatar from %s."
 msgstr "Неможливо завантажити аватару з %s."
 
 #. TRANS: Exception.
-#: classes/Ostatus_profile.php:1235
+#: classes/Ostatus_profile.php:1197
 msgid "Local user can't be referenced as remote."
 msgstr "Місцевий користувач не може бути зазначеним у якості віддаленого."
 
 #. TRANS: Exception.
-#: classes/Ostatus_profile.php:1240
+#: classes/Ostatus_profile.php:1202
 msgid "Local group can't be referenced as remote."
 msgstr "Локальну спільноту не можна зазначити у якості віддаленої."
 
 #. TRANS: Server exception.
-#: classes/Ostatus_profile.php:1292 classes/Ostatus_profile.php:1303
+#: classes/Ostatus_profile.php:1254 classes/Ostatus_profile.php:1265
 msgid "Can't save local profile."
 msgstr "Не вдається зберегти місцевий профіль."
 
 #. TRANS: Server exception.
-#: classes/Ostatus_profile.php:1311
+#: classes/Ostatus_profile.php:1273
 msgid "Can't save OStatus profile."
 msgstr "Не вдається зберегти профіль OStatus."
 
 #. TRANS: Exception.
-#: classes/Ostatus_profile.php:1599 classes/Ostatus_profile.php:1627
+#: classes/Ostatus_profile.php:1561 classes/Ostatus_profile.php:1589
 msgid "Not a valid webfinger address."
 msgstr "Це недійсна адреса для протоколу WebFinger."
 
 #. TRANS: Exception. %s is a webfinger address.
-#: classes/Ostatus_profile.php:1709
+#: classes/Ostatus_profile.php:1671
 #, php-format
 msgid "Couldn't save profile for \"%s\"."
 msgstr "Не можу зберегти профіль для «%s»."
 
 #. TRANS: Exception. %s is a webfinger address.
-#: classes/Ostatus_profile.php:1728
+#: classes/Ostatus_profile.php:1690
 #, php-format
 msgid "Couldn't save ostatus_profile for \"%s\"."
 msgstr "Не можу зберегти профіль OStatus для «%s»."
 
 #. TRANS: Exception. %s is a webfinger address.
-#: classes/Ostatus_profile.php:1736
+#: classes/Ostatus_profile.php:1698
 #, php-format
 msgid "Couldn't find a valid profile for \"%s\"."
 msgstr "не можу знайти відповідний й профіль для «%s»."
 
 #. TRANS: Server exception.
-#: classes/Ostatus_profile.php:1779
+#: classes/Ostatus_profile.php:1741
 msgid "Could not store HTML content of long post as file."
 msgstr "Не можу зберегти HTML місткого допису у якості файлу."
 
@@ -610,29 +610,9 @@ msgstr "Підписатись до цього користувача"
 msgid "You are already subscribed to this user."
 msgstr "Ви вже підписані до цього користувача."
 
-#: actions/ostatussub.php:167
-msgid "Photo"
-msgstr "Фото"
-
-#: actions/ostatussub.php:178
-msgid "Nickname"
-msgstr "Псевдонім"
-
-#: actions/ostatussub.php:199
-msgid "Location"
-msgstr "Розташування"
-
-#: actions/ostatussub.php:208
-msgid "URL"
-msgstr "URL-адреса"
-
-#: actions/ostatussub.php:220
-msgid "Note"
-msgstr "Примітка"
-
 #. TRANS: Error text.
-#: actions/ostatussub.php:256 actions/ostatussub.php:263
-#: actions/ostatussub.php:288
+#: actions/ostatussub.php:232 actions/ostatussub.php:239
+#: actions/ostatussub.php:264
 msgid ""
 "Sorry, we could not reach that address. Please make sure that the OStatus "
 "address is like nickname@example.com or http://example.net/nickname."
@@ -642,9 +622,9 @@ msgstr ""
 "nickname@example.com або ж http://example.net/nickname."
 
 #. TRANS: Error text.
-#: actions/ostatussub.php:267 actions/ostatussub.php:271
-#: actions/ostatussub.php:275 actions/ostatussub.php:279
-#: actions/ostatussub.php:283
+#: actions/ostatussub.php:243 actions/ostatussub.php:247
+#: actions/ostatussub.php:251 actions/ostatussub.php:255
+#: actions/ostatussub.php:259
 msgid ""
 "Sorry, we could not reach that feed. Please try that OStatus address again "
 "later."
@@ -653,31 +633,31 @@ msgstr ""
 "дану адресу ще раз пізніше."
 
 #. TRANS: OStatus remote subscription dialog error.
-#: actions/ostatussub.php:317
+#: actions/ostatussub.php:293
 msgid "Already subscribed!"
 msgstr "Вже підписаний!"
 
 #. TRANS: OStatus remote subscription dialog error.
-#: actions/ostatussub.php:322
+#: actions/ostatussub.php:298
 msgid "Remote subscription failed!"
 msgstr "Підписатися віддалено не вдалося!"
 
-#: actions/ostatussub.php:369 actions/ostatusinit.php:64
+#: actions/ostatussub.php:345 actions/ostatusinit.php:64
 msgid "There was a problem with your session token. Try again, please."
 msgstr "Виникли певні проблеми з токеном сесії. Спробуйте знов, будь ласка."
 
 #. TRANS: Form title.
-#: actions/ostatussub.php:397 actions/ostatusinit.php:83
+#: actions/ostatussub.php:373 actions/ostatusinit.php:83
 msgid "Subscribe to user"
 msgstr "Підписатися до користувача"
 
 #. TRANS: Page title for OStatus remote subscription form
-#: actions/ostatussub.php:417
+#: actions/ostatussub.php:393
 msgid "Confirm"
 msgstr "Підтвердити"
 
 #. TRANS: Instructions.
-#: actions/ostatussub.php:429
+#: actions/ostatussub.php:405
 msgid ""
 "You can subscribe to users from other supported sites. Paste their address "
 "or profile URI below:"
@@ -795,3 +775,18 @@ msgstr "Несподіваний запит підписки для %s."
 #, php-format
 msgid "Unexpected unsubscribe request for %s."
 msgstr "Несподіваний запит щодо скасування підписки для %s."
+
+#~ msgid "Photo"
+#~ msgstr "Фото"
+
+#~ msgid "Nickname"
+#~ msgstr "Псевдонім"
+
+#~ msgid "Location"
+#~ msgstr "Розташування"
+
+#~ msgid "URL"
+#~ msgstr "URL-адреса"
+
+#~ msgid "Note"
+#~ msgstr "Примітка"
diff --git a/plugins/OpenExternalLinkTarget/locale/OpenExternalLinkTarget.pot b/plugins/OpenExternalLinkTarget/locale/OpenExternalLinkTarget.pot
index 8704e52ba9..ac02f79869 100644
--- a/plugins/OpenExternalLinkTarget/locale/OpenExternalLinkTarget.pot
+++ b/plugins/OpenExternalLinkTarget/locale/OpenExternalLinkTarget.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/OpenID/locale/OpenID.pot b/plugins/OpenID/locale/OpenID.pot
index 6027d7d53a..fa404286e7 100644
--- a/plugins/OpenID/locale/OpenID.pot
+++ b/plugins/OpenID/locale/OpenID.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -38,7 +38,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: OpenID plugin logon form field label.
-#: openidsettings.php:108 OpenIDPlugin.php:681 openidlogin.php:161
+#: openidsettings.php:108 OpenIDPlugin.php:703 openidlogin.php:152
 msgid "OpenID URL"
 msgstr ""
 
@@ -77,7 +77,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: Message given when there is a problem with the user's session token.
-#: openidsettings.php:232 finishopenidlogin.php:42 openidlogin.php:51
+#: openidsettings.php:232 finishopenidlogin.php:42
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 
@@ -301,38 +301,38 @@ msgid "OpenID configuration"
 msgstr ""
 
 #. TRANS: OpenID plugin description.
-#: OpenIDPlugin.php:631
+#: OpenIDPlugin.php:653
 msgid "Use <a href=\"http://openid.net/\">OpenID</a> to login to the site."
 msgstr ""
 
 #. TRANS: button label for OAuth authorization page when needing OpenID authentication first.
-#: OpenIDPlugin.php:641
+#: OpenIDPlugin.php:663
 msgctxt "BUTTON"
 msgid "Continue"
 msgstr ""
 
 #. TRANS: OpenID plugin logon form legend.
-#: OpenIDPlugin.php:658 openidlogin.php:140
+#: OpenIDPlugin.php:680 openidlogin.php:132
 msgid "OpenID login"
 msgstr ""
 
 #. TRANS: Field label.
-#: OpenIDPlugin.php:666 openidlogin.php:148
+#: OpenIDPlugin.php:688 openidlogin.php:139
 msgid "OpenID provider"
 msgstr ""
 
 #. TRANS: Form guide.
-#: OpenIDPlugin.php:675 openidlogin.php:156
+#: OpenIDPlugin.php:697 openidlogin.php:147
 msgid "Enter your username."
 msgstr ""
 
 #. TRANS: Form guide.
-#: OpenIDPlugin.php:677 openidlogin.php:157
+#: OpenIDPlugin.php:699 openidlogin.php:148
 msgid "You will be sent to the provider's site for authentication."
 msgstr ""
 
 #. TRANS: OpenID plugin logon form field instructions.
-#: OpenIDPlugin.php:684 openidlogin.php:164
+#: OpenIDPlugin.php:706 openidlogin.php:155
 msgid "Your OpenID URL"
 msgstr ""
 
@@ -489,7 +489,7 @@ msgstr ""
 
 #. TRANS: OpenID plugin message. Rememberme logins have to reauthenticate before changing any profile settings.
 #. TRANS: "OpenID" is the display text for a link with URL "(%%doc.openid%%)".
-#: openidlogin.php:82
+#: openidlogin.php:74
 #, php-format
 msgid ""
 "For security reasons, please re-login with your [OpenID](%%doc.openid%%) "
@@ -498,29 +498,29 @@ msgstr ""
 
 #. TRANS: OpenID plugin message.
 #. TRANS: "OpenID" is the display text for a link with URL "(%%doc.openid%%)".
-#: openidlogin.php:88
+#: openidlogin.php:80
 #, php-format
 msgid "Login with an [OpenID](%%doc.openid%%) account."
 msgstr ""
 
 #. TRANS: OpenID plugin message. Title.
 #. TRANS: Title after getting the status of the OpenID authorisation request.
-#: openidlogin.php:122 finishaddopenid.php:187
+#: openidlogin.php:114 finishaddopenid.php:187
 msgid "OpenID Login"
 msgstr ""
 
 #. TRANS: OpenID plugin logon form checkbox label for setting to put the OpenID information in a cookie.
-#: openidlogin.php:169
+#: openidlogin.php:160
 msgid "Remember me"
 msgstr ""
 
 #. TRANS: OpenID plugin logon form field instructions.
-#: openidlogin.php:171
+#: openidlogin.php:162
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 
 #. TRANS: OpenID plugin logon form button label to start logon with the data provided in the logon form.
-#: openidlogin.php:176
+#: openidlogin.php:167
 msgctxt "BUTTON"
 msgid "Login"
 msgstr ""
diff --git a/plugins/OpenID/locale/br/LC_MESSAGES/OpenID.po b/plugins/OpenID/locale/br/LC_MESSAGES/OpenID.po
index f53dd5fc41..ba67bd35ba 100644
--- a/plugins/OpenID/locale/br/LC_MESSAGES/OpenID.po
+++ b/plugins/OpenID/locale/br/LC_MESSAGES/OpenID.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OpenID\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:40+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:34+0000\n"
 "Language-Team: Breton <http://translatewiki.net/wiki/Portal:br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-22 19:30:33+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-02-14 17:22:00+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-openid\n"
@@ -43,7 +43,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: OpenID plugin logon form field label.
-#: openidsettings.php:108 OpenIDPlugin.php:681 openidlogin.php:161
+#: openidsettings.php:108 OpenIDPlugin.php:703 openidlogin.php:152
 msgid "OpenID URL"
 msgstr "URL OpenID"
 
@@ -82,7 +82,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: Message given when there is a problem with the user's session token.
-#: openidsettings.php:232 finishopenidlogin.php:42 openidlogin.php:51
+#: openidsettings.php:232 finishopenidlogin.php:42
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 
@@ -306,38 +306,38 @@ msgid "OpenID configuration"
 msgstr "Kefluniadur OpenID"
 
 #. TRANS: OpenID plugin description.
-#: OpenIDPlugin.php:631
+#: OpenIDPlugin.php:653
 msgid "Use <a href=\"http://openid.net/\">OpenID</a> to login to the site."
 msgstr ""
 
 #. TRANS: button label for OAuth authorization page when needing OpenID authentication first.
-#: OpenIDPlugin.php:641
+#: OpenIDPlugin.php:663
 msgctxt "BUTTON"
 msgid "Continue"
 msgstr "Kenderc'hel"
 
 #. TRANS: OpenID plugin logon form legend.
-#: OpenIDPlugin.php:658 openidlogin.php:140
+#: OpenIDPlugin.php:680 openidlogin.php:132
 msgid "OpenID login"
 msgstr ""
 
 #. TRANS: Field label.
-#: OpenIDPlugin.php:666 openidlogin.php:148
+#: OpenIDPlugin.php:688 openidlogin.php:139
 msgid "OpenID provider"
 msgstr ""
 
 #. TRANS: Form guide.
-#: OpenIDPlugin.php:675 openidlogin.php:156
+#: OpenIDPlugin.php:697 openidlogin.php:147
 msgid "Enter your username."
 msgstr "Ebarzhit hoc'h anv implijer"
 
 #. TRANS: Form guide.
-#: OpenIDPlugin.php:677 openidlogin.php:157
+#: OpenIDPlugin.php:699 openidlogin.php:148
 msgid "You will be sent to the provider's site for authentication."
 msgstr ""
 
 #. TRANS: OpenID plugin logon form field instructions.
-#: OpenIDPlugin.php:684 openidlogin.php:164
+#: OpenIDPlugin.php:706 openidlogin.php:155
 msgid "Your OpenID URL"
 msgstr ""
 
@@ -496,7 +496,7 @@ msgstr ""
 
 #. TRANS: OpenID plugin message. Rememberme logins have to reauthenticate before changing any profile settings.
 #. TRANS: "OpenID" is the display text for a link with URL "(%%doc.openid%%)".
-#: openidlogin.php:82
+#: openidlogin.php:74
 #, php-format
 msgid ""
 "For security reasons, please re-login with your [OpenID](%%doc.openid%%) "
@@ -505,29 +505,29 @@ msgstr ""
 
 #. TRANS: OpenID plugin message.
 #. TRANS: "OpenID" is the display text for a link with URL "(%%doc.openid%%)".
-#: openidlogin.php:88
+#: openidlogin.php:80
 #, php-format
 msgid "Login with an [OpenID](%%doc.openid%%) account."
 msgstr "Kevreañ gant ur gont [OpenID](%%doc.openid%%)."
 
 #. TRANS: OpenID plugin message. Title.
 #. TRANS: Title after getting the status of the OpenID authorisation request.
-#: openidlogin.php:122 finishaddopenid.php:187
+#: openidlogin.php:114 finishaddopenid.php:187
 msgid "OpenID Login"
 msgstr ""
 
 #. TRANS: OpenID plugin logon form checkbox label for setting to put the OpenID information in a cookie.
-#: openidlogin.php:169
+#: openidlogin.php:160
 msgid "Remember me"
 msgstr "Derc'hel soñj ac'hanon"
 
 #. TRANS: OpenID plugin logon form field instructions.
-#: openidlogin.php:171
+#: openidlogin.php:162
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 
 #. TRANS: OpenID plugin logon form button label to start logon with the data provided in the logon form.
-#: openidlogin.php:176
+#: openidlogin.php:167
 msgctxt "BUTTON"
 msgid "Login"
 msgstr "Kevreañ"
diff --git a/plugins/OpenID/locale/ca/LC_MESSAGES/OpenID.po b/plugins/OpenID/locale/ca/LC_MESSAGES/OpenID.po
index 15b871e35e..d3e1ab1425 100644
--- a/plugins/OpenID/locale/ca/LC_MESSAGES/OpenID.po
+++ b/plugins/OpenID/locale/ca/LC_MESSAGES/OpenID.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OpenID\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-02 23:31+0000\n"
-"PO-Revision-Date: 2011-02-02 23:37:37+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:34+0000\n"
 "Language-Team: Catalan <http://translatewiki.net/wiki/Portal:ca>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:25:50+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81409); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-02-14 17:22:00+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ca\n"
 "X-Message-Group: #out-statusnet-plugin-openid\n"
@@ -48,7 +48,7 @@ msgstr ""
 "caixa a continuació i feu clic a «Afegeix»."
 
 #. TRANS: OpenID plugin logon form field label.
-#: openidsettings.php:108 OpenIDPlugin.php:681 openidlogin.php:161
+#: openidsettings.php:108 OpenIDPlugin.php:703 openidlogin.php:152
 msgid "OpenID URL"
 msgstr "URL de la connexió OpenID"
 
@@ -91,7 +91,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: Message given when there is a problem with the user's session token.
-#: openidsettings.php:232 finishopenidlogin.php:42 openidlogin.php:51
+#: openidsettings.php:232 finishopenidlogin.php:42
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 "S'ha produït un problema amb el vostre testimoni de sessió. Proveu-ho de nou."
@@ -324,39 +324,39 @@ msgid "OpenID configuration"
 msgstr "Configuració de l'OpenID"
 
 #. TRANS: OpenID plugin description.
-#: OpenIDPlugin.php:631
+#: OpenIDPlugin.php:653
 msgid "Use <a href=\"http://openid.net/\">OpenID</a> to login to the site."
 msgstr ""
 "Fa servir <a href=\"http://openid.net/\">OpenID</a> per connectar-se al lloc."
 
 #. TRANS: button label for OAuth authorization page when needing OpenID authentication first.
-#: OpenIDPlugin.php:641
+#: OpenIDPlugin.php:663
 msgctxt "BUTTON"
 msgid "Continue"
 msgstr "Continua"
 
 #. TRANS: OpenID plugin logon form legend.
-#: OpenIDPlugin.php:658 openidlogin.php:140
+#: OpenIDPlugin.php:680 openidlogin.php:132
 msgid "OpenID login"
 msgstr "Inici de sessió amb OpenID"
 
 #. TRANS: Field label.
-#: OpenIDPlugin.php:666 openidlogin.php:148
+#: OpenIDPlugin.php:688 openidlogin.php:139
 msgid "OpenID provider"
 msgstr "Proveïdor d'OpenID"
 
 #. TRANS: Form guide.
-#: OpenIDPlugin.php:675 openidlogin.php:156
+#: OpenIDPlugin.php:697 openidlogin.php:147
 msgid "Enter your username."
 msgstr "Introduïu el vostre nom d'usuari."
 
 #. TRANS: Form guide.
-#: OpenIDPlugin.php:677 openidlogin.php:157
+#: OpenIDPlugin.php:699 openidlogin.php:148
 msgid "You will be sent to the provider's site for authentication."
 msgstr "Se us portarà al lloc del proveïdor perquè us hi autentiqueu."
 
 #. TRANS: OpenID plugin logon form field instructions.
-#: OpenIDPlugin.php:684 openidlogin.php:164
+#: OpenIDPlugin.php:706 openidlogin.php:155
 msgid "Your OpenID URL"
 msgstr "L'URL del vostre OpenID"
 
@@ -519,7 +519,7 @@ msgstr "S'ha produït un error en connectar l'usuari amb la connexió OpenID."
 
 #. TRANS: OpenID plugin message. Rememberme logins have to reauthenticate before changing any profile settings.
 #. TRANS: "OpenID" is the display text for a link with URL "(%%doc.openid%%)".
-#: openidlogin.php:82
+#: openidlogin.php:74
 #, php-format
 msgid ""
 "For security reasons, please re-login with your [OpenID](%%doc.openid%%) "
@@ -530,31 +530,31 @@ msgstr ""
 
 #. TRANS: OpenID plugin message.
 #. TRANS: "OpenID" is the display text for a link with URL "(%%doc.openid%%)".
-#: openidlogin.php:88
+#: openidlogin.php:80
 #, php-format
 msgid "Login with an [OpenID](%%doc.openid%%) account."
 msgstr "Inicia una sessió amb un compte [OpenID](%%doc.openid%%)."
 
 #. TRANS: OpenID plugin message. Title.
 #. TRANS: Title after getting the status of the OpenID authorisation request.
-#: openidlogin.php:122 finishaddopenid.php:187
+#: openidlogin.php:114 finishaddopenid.php:187
 msgid "OpenID Login"
 msgstr "Inici de sessió amb OpenID"
 
 #. TRANS: OpenID plugin logon form checkbox label for setting to put the OpenID information in a cookie.
-#: openidlogin.php:169
+#: openidlogin.php:160
 msgid "Remember me"
 msgstr "Recorda'm"
 
 #. TRANS: OpenID plugin logon form field instructions.
-#: openidlogin.php:171
+#: openidlogin.php:162
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 "Inicia una sessió automàticament en el futur; no recomanable en ordinadors "
 "compartits!"
 
 #. TRANS: OpenID plugin logon form button label to start logon with the data provided in the logon form.
-#: openidlogin.php:176
+#: openidlogin.php:167
 msgctxt "BUTTON"
 msgid "Login"
 msgstr "Inicia una sessió"
diff --git a/plugins/OpenID/locale/de/LC_MESSAGES/OpenID.po b/plugins/OpenID/locale/de/LC_MESSAGES/OpenID.po
index 555c799786..ef8fec98b1 100644
--- a/plugins/OpenID/locale/de/LC_MESSAGES/OpenID.po
+++ b/plugins/OpenID/locale/de/LC_MESSAGES/OpenID.po
@@ -11,13 +11,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OpenID\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-14 16:01+0000\n"
-"PO-Revision-Date: 2011-02-14 16:09:15+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:34+0000\n"
 "Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-03 23:18:47+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r82114); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-02-14 17:22:00+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-openid\n"
@@ -49,7 +49,7 @@ msgstr ""
 "nachfolgenden Feld ein und klicke auf „Hinzufügen“."
 
 #. TRANS: OpenID plugin logon form field label.
-#: openidsettings.php:108 OpenIDPlugin.php:681 openidlogin.php:161
+#: openidsettings.php:108 OpenIDPlugin.php:703 openidlogin.php:152
 msgid "OpenID URL"
 msgstr "OpenID-URL"
 
@@ -95,7 +95,7 @@ msgstr ""
 "den Zugriff auf deine OpenID zu verweigern."
 
 #. TRANS: Message given when there is a problem with the user's session token.
-#: openidsettings.php:232 finishopenidlogin.php:42 openidlogin.php:51
+#: openidsettings.php:232 finishopenidlogin.php:42
 msgid "There was a problem with your session token. Try again, please."
 msgstr "Es gab ein Problem mit deinem Sitzungstoken. Bitte versuche es erneut."
 
@@ -336,42 +336,42 @@ msgid "OpenID configuration"
 msgstr "OpenId-Konfiguration"
 
 #. TRANS: OpenID plugin description.
-#: OpenIDPlugin.php:631
+#: OpenIDPlugin.php:653
 msgid "Use <a href=\"http://openid.net/\">OpenID</a> to login to the site."
 msgstr ""
 "Benutzung der <a href=\"http://openid.net/\">OpenID</a> zur Anmeldung auf "
 "der Seite"
 
 #. TRANS: button label for OAuth authorization page when needing OpenID authentication first.
-#: OpenIDPlugin.php:641
+#: OpenIDPlugin.php:663
 msgctxt "BUTTON"
 msgid "Continue"
 msgstr "Weiter"
 
 #. TRANS: OpenID plugin logon form legend.
-#: OpenIDPlugin.php:658 openidlogin.php:140
+#: OpenIDPlugin.php:680 openidlogin.php:132
 msgid "OpenID login"
 msgstr "OpenID-Benutzername"
 
 #. TRANS: Field label.
-#: OpenIDPlugin.php:666 openidlogin.php:148
+#: OpenIDPlugin.php:688 openidlogin.php:139
 msgid "OpenID provider"
 msgstr "OpenID-Provider"
 
 #. TRANS: Form guide.
-#: OpenIDPlugin.php:675 openidlogin.php:156
+#: OpenIDPlugin.php:697 openidlogin.php:147
 msgid "Enter your username."
 msgstr "Gib deinen Benutzernamen ein."
 
 #. TRANS: Form guide.
-#: OpenIDPlugin.php:677 openidlogin.php:157
+#: OpenIDPlugin.php:699 openidlogin.php:148
 msgid "You will be sent to the provider's site for authentication."
 msgstr ""
 "Du wirst zur Authentifizierung auf die Seite ihres OpenID-Providers "
 "weitergeleitet werden."
 
 #. TRANS: OpenID plugin logon form field instructions.
-#: OpenIDPlugin.php:684 openidlogin.php:164
+#: OpenIDPlugin.php:706 openidlogin.php:155
 msgid "Your OpenID URL"
 msgstr "Ihre OpenID URL"
 
@@ -537,7 +537,7 @@ msgstr "Fehler bei der Verbindung des Benutzers mit OpenID."
 
 #. TRANS: OpenID plugin message. Rememberme logins have to reauthenticate before changing any profile settings.
 #. TRANS: "OpenID" is the display text for a link with URL "(%%doc.openid%%)".
-#: openidlogin.php:82
+#: openidlogin.php:74
 #, php-format
 msgid ""
 "For security reasons, please re-login with your [OpenID](%%doc.openid%%) "
@@ -548,29 +548,29 @@ msgstr ""
 
 #. TRANS: OpenID plugin message.
 #. TRANS: "OpenID" is the display text for a link with URL "(%%doc.openid%%)".
-#: openidlogin.php:88
+#: openidlogin.php:80
 #, php-format
 msgid "Login with an [OpenID](%%doc.openid%%) account."
 msgstr "Mit einem [OpenID](%%doc.openid%%)-Benutzerkonto anmelden."
 
 #. TRANS: OpenID plugin message. Title.
 #. TRANS: Title after getting the status of the OpenID authorisation request.
-#: openidlogin.php:122 finishaddopenid.php:187
+#: openidlogin.php:114 finishaddopenid.php:187
 msgid "OpenID Login"
 msgstr "OpenID-Anmeldung"
 
 #. TRANS: OpenID plugin logon form checkbox label for setting to put the OpenID information in a cookie.
-#: openidlogin.php:169
+#: openidlogin.php:160
 msgid "Remember me"
 msgstr "Anmeldedaten merken"
 
 #. TRANS: OpenID plugin logon form field instructions.
-#: openidlogin.php:171
+#: openidlogin.php:162
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "Automatisch anmelden; nicht bei gemeinsam genutzten PCs einsetzen!"
 
 #. TRANS: OpenID plugin logon form button label to start logon with the data provided in the logon form.
-#: openidlogin.php:176
+#: openidlogin.php:167
 msgctxt "BUTTON"
 msgid "Login"
 msgstr "Anmelden"
diff --git a/plugins/OpenID/locale/fr/LC_MESSAGES/OpenID.po b/plugins/OpenID/locale/fr/LC_MESSAGES/OpenID.po
index 3a101ed86f..2027710c29 100644
--- a/plugins/OpenID/locale/fr/LC_MESSAGES/OpenID.po
+++ b/plugins/OpenID/locale/fr/LC_MESSAGES/OpenID.po
@@ -10,13 +10,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OpenID\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:40+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:34+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-22 19:30:33+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-02-14 17:22:00+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-openid\n"
@@ -49,7 +49,7 @@ msgstr ""
 "case ci-dessous et cliquez sur « Ajouter »."
 
 #. TRANS: OpenID plugin logon form field label.
-#: openidsettings.php:108 OpenIDPlugin.php:681 openidlogin.php:161
+#: openidsettings.php:108 OpenIDPlugin.php:703 openidlogin.php:152
 msgid "OpenID URL"
 msgstr "Adresse URL OpenID"
 
@@ -96,7 +96,7 @@ msgstr ""
 "d’accéder à votre compte OpenID."
 
 #. TRANS: Message given when there is a problem with the user's session token.
-#: openidsettings.php:232 finishopenidlogin.php:42 openidlogin.php:51
+#: openidsettings.php:232 finishopenidlogin.php:42
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 "Un problème est survenu avec votre jeton de session. Veuillez essayer à "
@@ -344,39 +344,39 @@ msgid "OpenID configuration"
 msgstr "Configuration d’OpenID"
 
 #. TRANS: OpenID plugin description.
-#: OpenIDPlugin.php:631
+#: OpenIDPlugin.php:653
 msgid "Use <a href=\"http://openid.net/\">OpenID</a> to login to the site."
 msgstr ""
 "Utiliser <a href=\"http://openid.net/\">OpenID</a> pour se connecter au site."
 
 #. TRANS: button label for OAuth authorization page when needing OpenID authentication first.
-#: OpenIDPlugin.php:641
+#: OpenIDPlugin.php:663
 msgctxt "BUTTON"
 msgid "Continue"
 msgstr "Continuer"
 
 #. TRANS: OpenID plugin logon form legend.
-#: OpenIDPlugin.php:658 openidlogin.php:140
+#: OpenIDPlugin.php:680 openidlogin.php:132
 msgid "OpenID login"
 msgstr "Connexion OpenID"
 
 #. TRANS: Field label.
-#: OpenIDPlugin.php:666 openidlogin.php:148
+#: OpenIDPlugin.php:688 openidlogin.php:139
 msgid "OpenID provider"
 msgstr "Fournisseur OpenID"
 
 #. TRANS: Form guide.
-#: OpenIDPlugin.php:675 openidlogin.php:156
+#: OpenIDPlugin.php:697 openidlogin.php:147
 msgid "Enter your username."
 msgstr "Entrez votre nom d’utilisateur."
 
 #. TRANS: Form guide.
-#: OpenIDPlugin.php:677 openidlogin.php:157
+#: OpenIDPlugin.php:699 openidlogin.php:148
 msgid "You will be sent to the provider's site for authentication."
 msgstr "Vous serez envoyé sur le site du fournisseur pour l’authentification."
 
 #. TRANS: OpenID plugin logon form field instructions.
-#: OpenIDPlugin.php:684 openidlogin.php:164
+#: OpenIDPlugin.php:706 openidlogin.php:155
 msgid "Your OpenID URL"
 msgstr "Votre URL OpenID"
 
@@ -541,7 +541,7 @@ msgstr "Erreur de connexion de l’utilisateur à OpenID."
 
 #. TRANS: OpenID plugin message. Rememberme logins have to reauthenticate before changing any profile settings.
 #. TRANS: "OpenID" is the display text for a link with URL "(%%doc.openid%%)".
-#: openidlogin.php:82
+#: openidlogin.php:74
 #, php-format
 msgid ""
 "For security reasons, please re-login with your [OpenID](%%doc.openid%%) "
@@ -552,31 +552,31 @@ msgstr ""
 
 #. TRANS: OpenID plugin message.
 #. TRANS: "OpenID" is the display text for a link with URL "(%%doc.openid%%)".
-#: openidlogin.php:88
+#: openidlogin.php:80
 #, php-format
 msgid "Login with an [OpenID](%%doc.openid%%) account."
 msgstr "Connexion avec un compte [OpenID](%%doc.openid%%)."
 
 #. TRANS: OpenID plugin message. Title.
 #. TRANS: Title after getting the status of the OpenID authorisation request.
-#: openidlogin.php:122 finishaddopenid.php:187
+#: openidlogin.php:114 finishaddopenid.php:187
 msgid "OpenID Login"
 msgstr "Connexion OpenID"
 
 #. TRANS: OpenID plugin logon form checkbox label for setting to put the OpenID information in a cookie.
-#: openidlogin.php:169
+#: openidlogin.php:160
 msgid "Remember me"
 msgstr "Se souvenir de moi"
 
 #. TRANS: OpenID plugin logon form field instructions.
-#: openidlogin.php:171
+#: openidlogin.php:162
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 "Me connecter automatiquement à l’avenir ; déconseillé sur les ordinateurs "
 "publics ou partagés !"
 
 #. TRANS: OpenID plugin logon form button label to start logon with the data provided in the logon form.
-#: openidlogin.php:176
+#: openidlogin.php:167
 msgctxt "BUTTON"
 msgid "Login"
 msgstr "Connexion"
diff --git a/plugins/OpenID/locale/ia/LC_MESSAGES/OpenID.po b/plugins/OpenID/locale/ia/LC_MESSAGES/OpenID.po
index 5d7bf04eed..91feba29e3 100644
--- a/plugins/OpenID/locale/ia/LC_MESSAGES/OpenID.po
+++ b/plugins/OpenID/locale/ia/LC_MESSAGES/OpenID.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OpenID\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:40+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:34+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-22 19:30:33+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-02-14 17:22:00+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-openid\n"
@@ -47,7 +47,7 @@ msgstr ""
 "clicca \"Adder\"."
 
 #. TRANS: OpenID plugin logon form field label.
-#: openidsettings.php:108 OpenIDPlugin.php:681 openidlogin.php:161
+#: openidsettings.php:108 OpenIDPlugin.php:703 openidlogin.php:152
 msgid "OpenID URL"
 msgstr "URL OpenID"
 
@@ -92,7 +92,7 @@ msgstr ""
 "accesso a tu OpenID."
 
 #. TRANS: Message given when there is a problem with the user's session token.
-#: openidsettings.php:232 finishopenidlogin.php:42 openidlogin.php:51
+#: openidsettings.php:232 finishopenidlogin.php:42
 msgid "There was a problem with your session token. Try again, please."
 msgstr "Occurreva un problema con le indicio de tu session. Per favor reproba."
 
@@ -334,39 +334,39 @@ msgid "OpenID configuration"
 msgstr "Configuration de OpenID"
 
 #. TRANS: OpenID plugin description.
-#: OpenIDPlugin.php:631
+#: OpenIDPlugin.php:653
 msgid "Use <a href=\"http://openid.net/\">OpenID</a> to login to the site."
 msgstr ""
 "Usar <a href=\"http://openid.net/\">OpenID</a> pro aperir session al sito."
 
 #. TRANS: button label for OAuth authorization page when needing OpenID authentication first.
-#: OpenIDPlugin.php:641
+#: OpenIDPlugin.php:663
 msgctxt "BUTTON"
 msgid "Continue"
 msgstr "Continuar"
 
 #. TRANS: OpenID plugin logon form legend.
-#: OpenIDPlugin.php:658 openidlogin.php:140
+#: OpenIDPlugin.php:680 openidlogin.php:132
 msgid "OpenID login"
 msgstr "Apertura de session via OpenID"
 
 #. TRANS: Field label.
-#: OpenIDPlugin.php:666 openidlogin.php:148
+#: OpenIDPlugin.php:688 openidlogin.php:139
 msgid "OpenID provider"
 msgstr "Fornitor de OpenID"
 
 #. TRANS: Form guide.
-#: OpenIDPlugin.php:675 openidlogin.php:156
+#: OpenIDPlugin.php:697 openidlogin.php:147
 msgid "Enter your username."
 msgstr "Entra tu nomine de usator."
 
 #. TRANS: Form guide.
-#: OpenIDPlugin.php:677 openidlogin.php:157
+#: OpenIDPlugin.php:699 openidlogin.php:148
 msgid "You will be sent to the provider's site for authentication."
 msgstr "Tu essera inviate al sito del fornitor pro authentication."
 
 #. TRANS: OpenID plugin logon form field instructions.
-#: OpenIDPlugin.php:684 openidlogin.php:164
+#: OpenIDPlugin.php:706 openidlogin.php:155
 msgid "Your OpenID URL"
 msgstr "Tu URL de OpenID"
 
@@ -531,7 +531,7 @@ msgstr "Error durante le connexion del usator a OpenID."
 
 #. TRANS: OpenID plugin message. Rememberme logins have to reauthenticate before changing any profile settings.
 #. TRANS: "OpenID" is the display text for a link with URL "(%%doc.openid%%)".
-#: openidlogin.php:82
+#: openidlogin.php:74
 #, php-format
 msgid ""
 "For security reasons, please re-login with your [OpenID](%%doc.openid%%) "
@@ -542,31 +542,31 @@ msgstr ""
 
 #. TRANS: OpenID plugin message.
 #. TRANS: "OpenID" is the display text for a link with URL "(%%doc.openid%%)".
-#: openidlogin.php:88
+#: openidlogin.php:80
 #, php-format
 msgid "Login with an [OpenID](%%doc.openid%%) account."
 msgstr "Aperir session con un conto [OpenID](%%doc.openid%%)."
 
 #. TRANS: OpenID plugin message. Title.
 #. TRANS: Title after getting the status of the OpenID authorisation request.
-#: openidlogin.php:122 finishaddopenid.php:187
+#: openidlogin.php:114 finishaddopenid.php:187
 msgid "OpenID Login"
 msgstr "Apertura de session via OpenID"
 
 #. TRANS: OpenID plugin logon form checkbox label for setting to put the OpenID information in a cookie.
-#: openidlogin.php:169
+#: openidlogin.php:160
 msgid "Remember me"
 msgstr "Memorar me"
 
 #. TRANS: OpenID plugin logon form field instructions.
-#: openidlogin.php:171
+#: openidlogin.php:162
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 "Aperir session automaticamente in le futuro; non pro computatores usate in "
 "commun!"
 
 #. TRANS: OpenID plugin logon form button label to start logon with the data provided in the logon form.
-#: openidlogin.php:176
+#: openidlogin.php:167
 msgctxt "BUTTON"
 msgid "Login"
 msgstr "Aperir session"
diff --git a/plugins/OpenID/locale/mk/LC_MESSAGES/OpenID.po b/plugins/OpenID/locale/mk/LC_MESSAGES/OpenID.po
index da1c1a7851..2f9547cb13 100644
--- a/plugins/OpenID/locale/mk/LC_MESSAGES/OpenID.po
+++ b/plugins/OpenID/locale/mk/LC_MESSAGES/OpenID.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OpenID\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:40+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:34+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-22 19:30:33+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-02-14 17:22:00+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-openid\n"
@@ -48,7 +48,7 @@ msgstr ""
 "полето подолу и кликнете на „Додај“."
 
 #. TRANS: OpenID plugin logon form field label.
-#: openidsettings.php:108 OpenIDPlugin.php:681 openidlogin.php:161
+#: openidsettings.php:108 OpenIDPlugin.php:703 openidlogin.php:152
 msgid "OpenID URL"
 msgstr "URL на OpenID"
 
@@ -92,7 +92,7 @@ msgstr ""
 "OpenID, тогаш отстранете го од списоков."
 
 #. TRANS: Message given when there is a problem with the user's session token.
-#: openidsettings.php:232 finishopenidlogin.php:42 openidlogin.php:51
+#: openidsettings.php:232 finishopenidlogin.php:42
 msgid "There was a problem with your session token. Try again, please."
 msgstr "Се појави проблем со жетонот на Вашата сесија. Обидете се подоцна."
 
@@ -331,38 +331,38 @@ msgid "OpenID configuration"
 msgstr "Поставки за OpenID"
 
 #. TRANS: OpenID plugin description.
-#: OpenIDPlugin.php:631
+#: OpenIDPlugin.php:653
 msgid "Use <a href=\"http://openid.net/\">OpenID</a> to login to the site."
 msgstr "Користете <a href=\"http://openid.net/\">OpenID</a> за најава."
 
 #. TRANS: button label for OAuth authorization page when needing OpenID authentication first.
-#: OpenIDPlugin.php:641
+#: OpenIDPlugin.php:663
 msgctxt "BUTTON"
 msgid "Continue"
 msgstr "Продолжи"
 
 #. TRANS: OpenID plugin logon form legend.
-#: OpenIDPlugin.php:658 openidlogin.php:140
+#: OpenIDPlugin.php:680 openidlogin.php:132
 msgid "OpenID login"
 msgstr "Најава со OpenID"
 
 #. TRANS: Field label.
-#: OpenIDPlugin.php:666 openidlogin.php:148
+#: OpenIDPlugin.php:688 openidlogin.php:139
 msgid "OpenID provider"
 msgstr "Услужител за OpenID"
 
 #. TRANS: Form guide.
-#: OpenIDPlugin.php:675 openidlogin.php:156
+#: OpenIDPlugin.php:697 openidlogin.php:147
 msgid "Enter your username."
 msgstr "Внесете го Вашето корисничко име."
 
 #. TRANS: Form guide.
-#: OpenIDPlugin.php:677 openidlogin.php:157
+#: OpenIDPlugin.php:699 openidlogin.php:148
 msgid "You will be sent to the provider's site for authentication."
 msgstr "Ќе бидете префрлени на мреж. место на услужникот за потврда."
 
 #. TRANS: OpenID plugin logon form field instructions.
-#: OpenIDPlugin.php:684 openidlogin.php:164
+#: OpenIDPlugin.php:706 openidlogin.php:155
 msgid "Your OpenID URL"
 msgstr "URL-адреса на Вашиот OpenID"
 
@@ -527,7 +527,7 @@ msgstr "Грешка при поврзувањето на корисникот 
 
 #. TRANS: OpenID plugin message. Rememberme logins have to reauthenticate before changing any profile settings.
 #. TRANS: "OpenID" is the display text for a link with URL "(%%doc.openid%%)".
-#: openidlogin.php:82
+#: openidlogin.php:74
 #, php-format
 msgid ""
 "For security reasons, please re-login with your [OpenID](%%doc.openid%%) "
@@ -538,30 +538,30 @@ msgstr ""
 
 #. TRANS: OpenID plugin message.
 #. TRANS: "OpenID" is the display text for a link with URL "(%%doc.openid%%)".
-#: openidlogin.php:88
+#: openidlogin.php:80
 #, php-format
 msgid "Login with an [OpenID](%%doc.openid%%) account."
 msgstr "Најава со сметка на [OpenID](%%doc.openid%%)."
 
 #. TRANS: OpenID plugin message. Title.
 #. TRANS: Title after getting the status of the OpenID authorisation request.
-#: openidlogin.php:122 finishaddopenid.php:187
+#: openidlogin.php:114 finishaddopenid.php:187
 msgid "OpenID Login"
 msgstr "OpenID-Најава"
 
 #. TRANS: OpenID plugin logon form checkbox label for setting to put the OpenID information in a cookie.
-#: openidlogin.php:169
+#: openidlogin.php:160
 msgid "Remember me"
 msgstr "Запомни ме"
 
 #. TRANS: OpenID plugin logon form field instructions.
-#: openidlogin.php:171
+#: openidlogin.php:162
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 "Отсега врши автоматска најава. Не треба да се користи за јавни сметачи!"
 
 #. TRANS: OpenID plugin logon form button label to start logon with the data provided in the logon form.
-#: openidlogin.php:176
+#: openidlogin.php:167
 msgctxt "BUTTON"
 msgid "Login"
 msgstr "Најава"
diff --git a/plugins/OpenID/locale/nl/LC_MESSAGES/OpenID.po b/plugins/OpenID/locale/nl/LC_MESSAGES/OpenID.po
index 92d9fb63c1..9ffbb1bc74 100644
--- a/plugins/OpenID/locale/nl/LC_MESSAGES/OpenID.po
+++ b/plugins/OpenID/locale/nl/LC_MESSAGES/OpenID.po
@@ -10,16 +10,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OpenID\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:41+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:34+0000\n"
 "Last-Translator: Siebrand Mazeland <s.mazeland@xs4all.nl>\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-01-22 19:30:33+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-02-14 17:22:00+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-openid\n"
@@ -50,7 +50,7 @@ msgstr ""
 "en klik op \"Toevoegen\"."
 
 #. TRANS: OpenID plugin logon form field label.
-#: openidsettings.php:108 OpenIDPlugin.php:681 openidlogin.php:161
+#: openidsettings.php:108 OpenIDPlugin.php:703 openidlogin.php:152
 msgid "OpenID URL"
 msgstr "OpenID-URL"
 
@@ -96,7 +96,7 @@ msgstr ""
 "heeft tot uw OpenID."
 
 #. TRANS: Message given when there is a problem with the user's session token.
-#: openidsettings.php:232 finishopenidlogin.php:42 openidlogin.php:51
+#: openidsettings.php:232 finishopenidlogin.php:42
 msgid "There was a problem with your session token. Try again, please."
 msgstr "Er was een probleem met uw sessietoken. Probeer het opnieuw."
 
@@ -337,40 +337,40 @@ msgid "OpenID configuration"
 msgstr "OpenID-instellingen"
 
 #. TRANS: OpenID plugin description.
-#: OpenIDPlugin.php:631
+#: OpenIDPlugin.php:653
 msgid "Use <a href=\"http://openid.net/\">OpenID</a> to login to the site."
 msgstr ""
 "Gebruik <a href=\"http://openid.net/\">OpenID</a> om aan te melden bij de "
 "site."
 
 #. TRANS: button label for OAuth authorization page when needing OpenID authentication first.
-#: OpenIDPlugin.php:641
+#: OpenIDPlugin.php:663
 msgctxt "BUTTON"
 msgid "Continue"
 msgstr "Continue"
 
 #. TRANS: OpenID plugin logon form legend.
-#: OpenIDPlugin.php:658 openidlogin.php:140
+#: OpenIDPlugin.php:680 openidlogin.php:132
 msgid "OpenID login"
 msgstr "Aanmelden via OpenID"
 
 #. TRANS: Field label.
-#: OpenIDPlugin.php:666 openidlogin.php:148
+#: OpenIDPlugin.php:688 openidlogin.php:139
 msgid "OpenID provider"
 msgstr "OpenID-provider"
 
 #. TRANS: Form guide.
-#: OpenIDPlugin.php:675 openidlogin.php:156
+#: OpenIDPlugin.php:697 openidlogin.php:147
 msgid "Enter your username."
 msgstr "Voer uw gebruikersnaam in"
 
 #. TRANS: Form guide.
-#: OpenIDPlugin.php:677 openidlogin.php:157
+#: OpenIDPlugin.php:699 openidlogin.php:148
 msgid "You will be sent to the provider's site for authentication."
 msgstr "U wordt naar de site van de provider omgeleid om aan te melden."
 
 #. TRANS: OpenID plugin logon form field instructions.
-#: OpenIDPlugin.php:684 openidlogin.php:164
+#: OpenIDPlugin.php:706 openidlogin.php:155
 msgid "Your OpenID URL"
 msgstr "Uw OpenID-URL"
 
@@ -533,7 +533,7 @@ msgstr "Fout bij het koppelen met OpenID."
 
 #. TRANS: OpenID plugin message. Rememberme logins have to reauthenticate before changing any profile settings.
 #. TRANS: "OpenID" is the display text for a link with URL "(%%doc.openid%%)".
-#: openidlogin.php:82
+#: openidlogin.php:74
 #, php-format
 msgid ""
 "For security reasons, please re-login with your [OpenID](%%doc.openid%%) "
@@ -544,30 +544,30 @@ msgstr ""
 
 #. TRANS: OpenID plugin message.
 #. TRANS: "OpenID" is the display text for a link with URL "(%%doc.openid%%)".
-#: openidlogin.php:88
+#: openidlogin.php:80
 #, php-format
 msgid "Login with an [OpenID](%%doc.openid%%) account."
 msgstr "Aanmelden met een [OpenID](%%doc.openid%%)-gebruiker."
 
 #. TRANS: OpenID plugin message. Title.
 #. TRANS: Title after getting the status of the OpenID authorisation request.
-#: openidlogin.php:122 finishaddopenid.php:187
+#: openidlogin.php:114 finishaddopenid.php:187
 msgid "OpenID Login"
 msgstr "Aanmelden via OpenID"
 
 #. TRANS: OpenID plugin logon form checkbox label for setting to put the OpenID information in a cookie.
-#: openidlogin.php:169
+#: openidlogin.php:160
 msgid "Remember me"
 msgstr "Aanmeldgegevens onthouden"
 
 #. TRANS: OpenID plugin logon form field instructions.
-#: openidlogin.php:171
+#: openidlogin.php:162
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 "In het vervolg automatisch aanmelden. Niet gebruiken op gedeelde computers!"
 
 #. TRANS: OpenID plugin logon form button label to start logon with the data provided in the logon form.
-#: openidlogin.php:176
+#: openidlogin.php:167
 msgctxt "BUTTON"
 msgid "Login"
 msgstr "Aanmelden"
diff --git a/plugins/OpenID/locale/tl/LC_MESSAGES/OpenID.po b/plugins/OpenID/locale/tl/LC_MESSAGES/OpenID.po
index 5b1f94e25c..fba73ad1ed 100644
--- a/plugins/OpenID/locale/tl/LC_MESSAGES/OpenID.po
+++ b/plugins/OpenID/locale/tl/LC_MESSAGES/OpenID.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OpenID\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:45+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:34+0000\n"
 "Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-22 19:30:33+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-02-14 17:22:00+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-openid\n"
@@ -48,7 +48,7 @@ msgstr ""
 "nasa ibaba at pindutin ang \"Idagdag\"."
 
 #. TRANS: OpenID plugin logon form field label.
-#: openidsettings.php:108 OpenIDPlugin.php:681 openidlogin.php:161
+#: openidsettings.php:108 OpenIDPlugin.php:703 openidlogin.php:152
 msgid "OpenID URL"
 msgstr "URL ng OpenID"
 
@@ -94,7 +94,7 @@ msgstr ""
 "ito upang tanggihan ang pagpunta nito sa iyong OpenID."
 
 #. TRANS: Message given when there is a problem with the user's session token.
-#: openidsettings.php:232 finishopenidlogin.php:42 openidlogin.php:51
+#: openidsettings.php:232 finishopenidlogin.php:42
 msgid "There was a problem with your session token. Try again, please."
 msgstr "May suliranin sa iyong token na pangsesyon.  Paki subukan uli."
 
@@ -344,40 +344,40 @@ msgid "OpenID configuration"
 msgstr "Pagkakaayos ng OpenID"
 
 #. TRANS: OpenID plugin description.
-#: OpenIDPlugin.php:631
+#: OpenIDPlugin.php:653
 msgid "Use <a href=\"http://openid.net/\">OpenID</a> to login to the site."
 msgstr ""
 "Gamitin ang <a href=\"http://openid.net/\">OpenID</a> upang lumagda sa sityo."
 
 #. TRANS: button label for OAuth authorization page when needing OpenID authentication first.
-#: OpenIDPlugin.php:641
+#: OpenIDPlugin.php:663
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Continue"
 msgstr "Magpatuloy"
 
 #. TRANS: OpenID plugin logon form legend.
-#: OpenIDPlugin.php:658 openidlogin.php:140
+#: OpenIDPlugin.php:680 openidlogin.php:132
 msgid "OpenID login"
 msgstr "Panglagdang OpenID"
 
 #. TRANS: Field label.
-#: OpenIDPlugin.php:666 openidlogin.php:148
+#: OpenIDPlugin.php:688 openidlogin.php:139
 msgid "OpenID provider"
 msgstr "Tagapagbigay ng OpenID"
 
 #. TRANS: Form guide.
-#: OpenIDPlugin.php:675 openidlogin.php:156
+#: OpenIDPlugin.php:697 openidlogin.php:147
 msgid "Enter your username."
 msgstr "Ipasok ang iyong pangalan ng tagagamit."
 
 #. TRANS: Form guide.
-#: OpenIDPlugin.php:677 openidlogin.php:157
+#: OpenIDPlugin.php:699 openidlogin.php:148
 msgid "You will be sent to the provider's site for authentication."
 msgstr "Ipapadala ka sa sityo ng tagapagbigay para sa pagpapatunay."
 
 #. TRANS: OpenID plugin logon form field instructions.
-#: OpenIDPlugin.php:684 openidlogin.php:164
+#: OpenIDPlugin.php:706 openidlogin.php:155
 msgid "Your OpenID URL"
 msgstr "Ang iyong URL ng OpenID"
 
@@ -545,7 +545,7 @@ msgstr "May kamalian sa pag-ugnay ng tagagamit sa OpenID."
 
 #. TRANS: OpenID plugin message. Rememberme logins have to reauthenticate before changing any profile settings.
 #. TRANS: "OpenID" is the display text for a link with URL "(%%doc.openid%%)".
-#: openidlogin.php:82
+#: openidlogin.php:74
 #, php-format
 msgid ""
 "For security reasons, please re-login with your [OpenID](%%doc.openid%%) "
@@ -556,30 +556,30 @@ msgstr ""
 
 #. TRANS: OpenID plugin message.
 #. TRANS: "OpenID" is the display text for a link with URL "(%%doc.openid%%)".
-#: openidlogin.php:88
+#: openidlogin.php:80
 #, php-format
 msgid "Login with an [OpenID](%%doc.openid%%) account."
 msgstr "Lumagda sa pamamagitan ng isang akawnt ng [OpenID](%%doc.openid%%)."
 
 #. TRANS: OpenID plugin message. Title.
 #. TRANS: Title after getting the status of the OpenID authorisation request.
-#: openidlogin.php:122 finishaddopenid.php:187
+#: openidlogin.php:114 finishaddopenid.php:187
 msgid "OpenID Login"
 msgstr "Panglagdang OpenID"
 
 #. TRANS: OpenID plugin logon form checkbox label for setting to put the OpenID information in a cookie.
-#: openidlogin.php:169
+#: openidlogin.php:160
 msgid "Remember me"
 msgstr "Tandaan ako"
 
 #. TRANS: OpenID plugin logon form field instructions.
-#: openidlogin.php:171
+#: openidlogin.php:162
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 "Kusang lumagda sa hinaharap; hindi para sa pinagsasaluhang mga kompyuter!"
 
 #. TRANS: OpenID plugin logon form button label to start logon with the data provided in the logon form.
-#: openidlogin.php:176
+#: openidlogin.php:167
 msgctxt "BUTTON"
 msgid "Login"
 msgstr "Lumagda"
diff --git a/plugins/OpenID/locale/uk/LC_MESSAGES/OpenID.po b/plugins/OpenID/locale/uk/LC_MESSAGES/OpenID.po
index 23b1c44e9f..348be1f7e0 100644
--- a/plugins/OpenID/locale/uk/LC_MESSAGES/OpenID.po
+++ b/plugins/OpenID/locale/uk/LC_MESSAGES/OpenID.po
@@ -10,13 +10,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OpenID\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:46+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:34+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-22 19:30:33+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-02-14 17:22:00+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-openid\n"
@@ -50,7 +50,7 @@ msgstr ""
 "натисніть «Додати»."
 
 #. TRANS: OpenID plugin logon form field label.
-#: openidsettings.php:108 OpenIDPlugin.php:681 openidlogin.php:161
+#: openidsettings.php:108 OpenIDPlugin.php:703 openidlogin.php:152
 msgid "OpenID URL"
 msgstr "URL-адреса OpenID"
 
@@ -95,7 +95,7 @@ msgstr ""
 "на вхід."
 
 #. TRANS: Message given when there is a problem with the user's session token.
-#: openidsettings.php:232 finishopenidlogin.php:42 openidlogin.php:51
+#: openidsettings.php:232 finishopenidlogin.php:42
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 "Виникли певні проблеми з токеном поточної сесії. Спробуйте знов, будь ласка."
@@ -337,39 +337,39 @@ msgid "OpenID configuration"
 msgstr "Конфігурація OpenID"
 
 #. TRANS: OpenID plugin description.
-#: OpenIDPlugin.php:631
+#: OpenIDPlugin.php:653
 msgid "Use <a href=\"http://openid.net/\">OpenID</a> to login to the site."
 msgstr ""
 "Використання <a href=\"http://openid.net/\">OpenID</a> для входу на сайт."
 
 #. TRANS: button label for OAuth authorization page when needing OpenID authentication first.
-#: OpenIDPlugin.php:641
+#: OpenIDPlugin.php:663
 msgctxt "BUTTON"
 msgid "Continue"
 msgstr "Продовжити"
 
 #. TRANS: OpenID plugin logon form legend.
-#: OpenIDPlugin.php:658 openidlogin.php:140
+#: OpenIDPlugin.php:680 openidlogin.php:132
 msgid "OpenID login"
 msgstr "Вхід з OpenID"
 
 #. TRANS: Field label.
-#: OpenIDPlugin.php:666 openidlogin.php:148
+#: OpenIDPlugin.php:688 openidlogin.php:139
 msgid "OpenID provider"
 msgstr "OpenID-провайдер"
 
 #. TRANS: Form guide.
-#: OpenIDPlugin.php:675 openidlogin.php:156
+#: OpenIDPlugin.php:697 openidlogin.php:147
 msgid "Enter your username."
 msgstr "Введіть ім’я користувача."
 
 #. TRANS: Form guide.
-#: OpenIDPlugin.php:677 openidlogin.php:157
+#: OpenIDPlugin.php:699 openidlogin.php:148
 msgid "You will be sent to the provider's site for authentication."
 msgstr "Вас буде перенаправлено на веб-сторінку провайдера для автентифікації."
 
 #. TRANS: OpenID plugin logon form field instructions.
-#: OpenIDPlugin.php:684 openidlogin.php:164
+#: OpenIDPlugin.php:706 openidlogin.php:155
 msgid "Your OpenID URL"
 msgstr "URL вашого OpenID"
 
@@ -534,7 +534,7 @@ msgstr "Помилка при підключенні користувача до
 
 #. TRANS: OpenID plugin message. Rememberme logins have to reauthenticate before changing any profile settings.
 #. TRANS: "OpenID" is the display text for a link with URL "(%%doc.openid%%)".
-#: openidlogin.php:82
+#: openidlogin.php:74
 #, php-format
 msgid ""
 "For security reasons, please re-login with your [OpenID](%%doc.openid%%) "
@@ -545,31 +545,31 @@ msgstr ""
 
 #. TRANS: OpenID plugin message.
 #. TRANS: "OpenID" is the display text for a link with URL "(%%doc.openid%%)".
-#: openidlogin.php:88
+#: openidlogin.php:80
 #, php-format
 msgid "Login with an [OpenID](%%doc.openid%%) account."
 msgstr "Увійти з [OpenID](%%doc.openid%%)."
 
 #. TRANS: OpenID plugin message. Title.
 #. TRANS: Title after getting the status of the OpenID authorisation request.
-#: openidlogin.php:122 finishaddopenid.php:187
+#: openidlogin.php:114 finishaddopenid.php:187
 msgid "OpenID Login"
 msgstr "Вхід з OpenID"
 
 #. TRANS: OpenID plugin logon form checkbox label for setting to put the OpenID information in a cookie.
-#: openidlogin.php:169
+#: openidlogin.php:160
 msgid "Remember me"
 msgstr "Пам’ятати мене"
 
 #. TRANS: OpenID plugin logon form field instructions.
-#: openidlogin.php:171
+#: openidlogin.php:162
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 "Автоматично входити у майбутньому; не для комп’ютерів загального "
 "користування!"
 
 #. TRANS: OpenID plugin logon form button label to start logon with the data provided in the logon form.
-#: openidlogin.php:176
+#: openidlogin.php:167
 msgctxt "BUTTON"
 msgid "Login"
 msgstr "Увійти"
diff --git a/plugins/OpenX/locale/OpenX.pot b/plugins/OpenX/locale/OpenX.pot
index 563968ff02..9647573713 100644
--- a/plugins/OpenX/locale/OpenX.pot
+++ b/plugins/OpenX/locale/OpenX.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/PiwikAnalytics/locale/PiwikAnalytics.pot b/plugins/PiwikAnalytics/locale/PiwikAnalytics.pot
index 558ca758ac..cea5fa6147 100644
--- a/plugins/PiwikAnalytics/locale/PiwikAnalytics.pot
+++ b/plugins/PiwikAnalytics/locale/PiwikAnalytics.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/PostDebug/locale/PostDebug.pot b/plugins/PostDebug/locale/PostDebug.pot
index 6af8be92f7..a9c20e270e 100644
--- a/plugins/PostDebug/locale/PostDebug.pot
+++ b/plugins/PostDebug/locale/PostDebug.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/PoweredByStatusNet/locale/PoweredByStatusNet.pot b/plugins/PoweredByStatusNet/locale/PoweredByStatusNet.pot
index 76a68fa0b8..a3dcbce268 100644
--- a/plugins/PoweredByStatusNet/locale/PoweredByStatusNet.pot
+++ b/plugins/PoweredByStatusNet/locale/PoweredByStatusNet.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/PtitUrl/locale/PtitUrl.pot b/plugins/PtitUrl/locale/PtitUrl.pot
index 9ae2aacbbd..6c5dad914c 100644
--- a/plugins/PtitUrl/locale/PtitUrl.pot
+++ b/plugins/PtitUrl/locale/PtitUrl.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: PtitUrlPlugin.php:67
+#: PtitUrlPlugin.php:66
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr ""
diff --git a/plugins/PtitUrl/locale/br/LC_MESSAGES/PtitUrl.po b/plugins/PtitUrl/locale/br/LC_MESSAGES/PtitUrl.po
index 415c46dd73..0c11e735eb 100644
--- a/plugins/PtitUrl/locale/br/LC_MESSAGES/PtitUrl.po
+++ b/plugins/PtitUrl/locale/br/LC_MESSAGES/PtitUrl.po
@@ -9,19 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PtitUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:11+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:48+0000\n"
 "Language-Team: Breton <http://translatewiki.net/wiki/Portal:br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:25+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:28:16+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-ptiturl\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: PtitUrlPlugin.php:67
+#: PtitUrlPlugin.php:66
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr ""
diff --git a/plugins/PtitUrl/locale/de/LC_MESSAGES/PtitUrl.po b/plugins/PtitUrl/locale/de/LC_MESSAGES/PtitUrl.po
index 4f20edd7df..c183fef995 100644
--- a/plugins/PtitUrl/locale/de/LC_MESSAGES/PtitUrl.po
+++ b/plugins/PtitUrl/locale/de/LC_MESSAGES/PtitUrl.po
@@ -9,19 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PtitUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:11+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:48+0000\n"
 "Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:25+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:28:16+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-ptiturl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: PtitUrlPlugin.php:67
+#: PtitUrlPlugin.php:66
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr "Benutzung des <a href=\"http://%1$s/\">%1$s</a>-URL-Kürzungsdienstes."
diff --git a/plugins/PtitUrl/locale/es/LC_MESSAGES/PtitUrl.po b/plugins/PtitUrl/locale/es/LC_MESSAGES/PtitUrl.po
index 62bce6570c..9f345055db 100644
--- a/plugins/PtitUrl/locale/es/LC_MESSAGES/PtitUrl.po
+++ b/plugins/PtitUrl/locale/es/LC_MESSAGES/PtitUrl.po
@@ -9,19 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PtitUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:11+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:48+0000\n"
 "Language-Team: Spanish <http://translatewiki.net/wiki/Portal:es>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:25+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:28:16+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-ptiturl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: PtitUrlPlugin.php:67
+#: PtitUrlPlugin.php:66
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr ""
diff --git a/plugins/PtitUrl/locale/fr/LC_MESSAGES/PtitUrl.po b/plugins/PtitUrl/locale/fr/LC_MESSAGES/PtitUrl.po
index 12be41ec1d..df93e87881 100644
--- a/plugins/PtitUrl/locale/fr/LC_MESSAGES/PtitUrl.po
+++ b/plugins/PtitUrl/locale/fr/LC_MESSAGES/PtitUrl.po
@@ -9,19 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PtitUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:11+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:48+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:25+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:28:16+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-ptiturl\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: PtitUrlPlugin.php:67
+#: PtitUrlPlugin.php:66
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr ""
diff --git a/plugins/PtitUrl/locale/gl/LC_MESSAGES/PtitUrl.po b/plugins/PtitUrl/locale/gl/LC_MESSAGES/PtitUrl.po
index 54e492c54a..e50a6d4eaf 100644
--- a/plugins/PtitUrl/locale/gl/LC_MESSAGES/PtitUrl.po
+++ b/plugins/PtitUrl/locale/gl/LC_MESSAGES/PtitUrl.po
@@ -9,19 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PtitUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:11+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:48+0000\n"
 "Language-Team: Galician <http://translatewiki.net/wiki/Portal:gl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:25+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:28:16+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: gl\n"
 "X-Message-Group: #out-statusnet-plugin-ptiturl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: PtitUrlPlugin.php:67
+#: PtitUrlPlugin.php:66
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr ""
diff --git a/plugins/PtitUrl/locale/he/LC_MESSAGES/PtitUrl.po b/plugins/PtitUrl/locale/he/LC_MESSAGES/PtitUrl.po
index 75e502c1c0..db964d850b 100644
--- a/plugins/PtitUrl/locale/he/LC_MESSAGES/PtitUrl.po
+++ b/plugins/PtitUrl/locale/he/LC_MESSAGES/PtitUrl.po
@@ -9,19 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PtitUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:11+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:48+0000\n"
 "Language-Team: Hebrew <http://translatewiki.net/wiki/Portal:he>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:25+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:28:16+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-plugin-ptiturl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: PtitUrlPlugin.php:67
+#: PtitUrlPlugin.php:66
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr "שימוש בשירות קיצור הכתובות <a href=\"http://%1$s/\">%1$s</a>."
diff --git a/plugins/PtitUrl/locale/ia/LC_MESSAGES/PtitUrl.po b/plugins/PtitUrl/locale/ia/LC_MESSAGES/PtitUrl.po
index b34aacf2ba..0525aa7463 100644
--- a/plugins/PtitUrl/locale/ia/LC_MESSAGES/PtitUrl.po
+++ b/plugins/PtitUrl/locale/ia/LC_MESSAGES/PtitUrl.po
@@ -9,19 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PtitUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:11+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:48+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:25+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:28:16+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-ptiturl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: PtitUrlPlugin.php:67
+#: PtitUrlPlugin.php:66
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr ""
diff --git a/plugins/PtitUrl/locale/ja/LC_MESSAGES/PtitUrl.po b/plugins/PtitUrl/locale/ja/LC_MESSAGES/PtitUrl.po
index c0c6b50b97..2f0816c8d4 100644
--- a/plugins/PtitUrl/locale/ja/LC_MESSAGES/PtitUrl.po
+++ b/plugins/PtitUrl/locale/ja/LC_MESSAGES/PtitUrl.po
@@ -9,19 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PtitUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:11+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:48+0000\n"
 "Language-Team: Japanese <http://translatewiki.net/wiki/Portal:ja>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:25+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:28:16+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ja\n"
 "X-Message-Group: #out-statusnet-plugin-ptiturl\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: PtitUrlPlugin.php:67
+#: PtitUrlPlugin.php:66
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr "<a href=\"http://%1$s/\">%1$s</a>をURL短縮サービスとして利用する。"
diff --git a/plugins/PtitUrl/locale/mk/LC_MESSAGES/PtitUrl.po b/plugins/PtitUrl/locale/mk/LC_MESSAGES/PtitUrl.po
index 9c6ed47b0e..a34d8afc61 100644
--- a/plugins/PtitUrl/locale/mk/LC_MESSAGES/PtitUrl.po
+++ b/plugins/PtitUrl/locale/mk/LC_MESSAGES/PtitUrl.po
@@ -9,19 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PtitUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:11+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:48+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:25+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:28:16+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-ptiturl\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
 
-#: PtitUrlPlugin.php:67
+#: PtitUrlPlugin.php:66
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr ""
diff --git a/plugins/PtitUrl/locale/nb/LC_MESSAGES/PtitUrl.po b/plugins/PtitUrl/locale/nb/LC_MESSAGES/PtitUrl.po
index aed44c9db9..8a866c84c1 100644
--- a/plugins/PtitUrl/locale/nb/LC_MESSAGES/PtitUrl.po
+++ b/plugins/PtitUrl/locale/nb/LC_MESSAGES/PtitUrl.po
@@ -9,19 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PtitUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:11+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:48+0000\n"
 "Language-Team: Norwegian (bokmål)‬ <http://translatewiki.net/wiki/Portal:no>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:25+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:28:16+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: #out-statusnet-plugin-ptiturl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: PtitUrlPlugin.php:67
+#: PtitUrlPlugin.php:66
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr "Bruker URL-forkortertjenesten <a href=\"http://%1$s/\">%1$s</a>."
diff --git a/plugins/PtitUrl/locale/nl/LC_MESSAGES/PtitUrl.po b/plugins/PtitUrl/locale/nl/LC_MESSAGES/PtitUrl.po
index 6e85bb42a8..5105cc432a 100644
--- a/plugins/PtitUrl/locale/nl/LC_MESSAGES/PtitUrl.po
+++ b/plugins/PtitUrl/locale/nl/LC_MESSAGES/PtitUrl.po
@@ -9,19 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PtitUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:11+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:48+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:25+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:28:16+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-ptiturl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: PtitUrlPlugin.php:67
+#: PtitUrlPlugin.php:66
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr ""
diff --git a/plugins/PtitUrl/locale/pt/LC_MESSAGES/PtitUrl.po b/plugins/PtitUrl/locale/pt/LC_MESSAGES/PtitUrl.po
index 2bebc30d98..7842da9173 100644
--- a/plugins/PtitUrl/locale/pt/LC_MESSAGES/PtitUrl.po
+++ b/plugins/PtitUrl/locale/pt/LC_MESSAGES/PtitUrl.po
@@ -9,19 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PtitUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:11+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:48+0000\n"
 "Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:25+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:28:16+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-plugin-ptiturl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: PtitUrlPlugin.php:67
+#: PtitUrlPlugin.php:66
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr "Usa o serviço de abreviação de URLs <a href=\"http://%1$s/\">%1$s</a>."
diff --git a/plugins/PtitUrl/locale/pt_BR/LC_MESSAGES/PtitUrl.po b/plugins/PtitUrl/locale/pt_BR/LC_MESSAGES/PtitUrl.po
index c30dcd7a5a..6687fe7fef 100644
--- a/plugins/PtitUrl/locale/pt_BR/LC_MESSAGES/PtitUrl.po
+++ b/plugins/PtitUrl/locale/pt_BR/LC_MESSAGES/PtitUrl.po
@@ -9,20 +9,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PtitUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:11+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:48+0000\n"
 "Language-Team: Brazilian Portuguese <http://translatewiki.net/wiki/Portal:pt-"
 "br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:25+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:28:16+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt-br\n"
 "X-Message-Group: #out-statusnet-plugin-ptiturl\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: PtitUrlPlugin.php:67
+#: PtitUrlPlugin.php:66
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr ""
diff --git a/plugins/PtitUrl/locale/ru/LC_MESSAGES/PtitUrl.po b/plugins/PtitUrl/locale/ru/LC_MESSAGES/PtitUrl.po
index 27f0d87f13..b6f8b24b1e 100644
--- a/plugins/PtitUrl/locale/ru/LC_MESSAGES/PtitUrl.po
+++ b/plugins/PtitUrl/locale/ru/LC_MESSAGES/PtitUrl.po
@@ -9,20 +9,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PtitUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:11+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:48+0000\n"
 "Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:25+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:28:16+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-ptiturl\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: PtitUrlPlugin.php:67
+#: PtitUrlPlugin.php:66
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr "Использование службы сокращения URL <a href=\"http://%1$s/\">%1$s</a>."
diff --git a/plugins/PtitUrl/locale/tl/LC_MESSAGES/PtitUrl.po b/plugins/PtitUrl/locale/tl/LC_MESSAGES/PtitUrl.po
index 963fa6037d..7b744e43e3 100644
--- a/plugins/PtitUrl/locale/tl/LC_MESSAGES/PtitUrl.po
+++ b/plugins/PtitUrl/locale/tl/LC_MESSAGES/PtitUrl.po
@@ -9,19 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PtitUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:11+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:48+0000\n"
 "Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:25+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:28:16+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-ptiturl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: PtitUrlPlugin.php:67
+#: PtitUrlPlugin.php:66
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr ""
diff --git a/plugins/PtitUrl/locale/uk/LC_MESSAGES/PtitUrl.po b/plugins/PtitUrl/locale/uk/LC_MESSAGES/PtitUrl.po
index 81f8d26224..5627b60a51 100644
--- a/plugins/PtitUrl/locale/uk/LC_MESSAGES/PtitUrl.po
+++ b/plugins/PtitUrl/locale/uk/LC_MESSAGES/PtitUrl.po
@@ -9,20 +9,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PtitUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:11+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:48+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:25+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:28:16+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-ptiturl\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: PtitUrlPlugin.php:67
+#: PtitUrlPlugin.php:66
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr ""
diff --git a/plugins/RSSCloud/locale/RSSCloud.pot b/plugins/RSSCloud/locale/RSSCloud.pot
index e97026e1ea..b82123e665 100644
--- a/plugins/RSSCloud/locale/RSSCloud.pot
+++ b/plugins/RSSCloud/locale/RSSCloud.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -59,7 +59,7 @@ msgstr ""
 msgid "This resource requires an HTTP POST."
 msgstr ""
 
-#: RSSCloudPlugin.php:248
+#: RSSCloudPlugin.php:245
 msgid ""
 "The RSSCloud plugin enables your StatusNet instance to publish real-time "
 "updates for profile RSS feeds using the <a href=\"http://rsscloud.org/"
diff --git a/plugins/RSSCloud/locale/de/LC_MESSAGES/RSSCloud.po b/plugins/RSSCloud/locale/de/LC_MESSAGES/RSSCloud.po
index e3cddb8a9b..f0b849191a 100644
--- a/plugins/RSSCloud/locale/de/LC_MESSAGES/RSSCloud.po
+++ b/plugins/RSSCloud/locale/de/LC_MESSAGES/RSSCloud.po
@@ -11,13 +11,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - RSSCloud\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-14 16:01+0000\n"
-"PO-Revision-Date: 2011-02-14 16:10:00+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:52+0000\n"
 "Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:28:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r82114); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-02-14 17:22:04+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-rsscloud\n"
@@ -72,7 +72,7 @@ msgstr "Diese Ressource erfordert eine HTTP-GET-Anfrage."
 msgid "This resource requires an HTTP POST."
 msgstr "Diese Ressource erfordert eine HTTP-POST-Anfrage."
 
-#: RSSCloudPlugin.php:248
+#: RSSCloudPlugin.php:245
 msgid ""
 "The RSSCloud plugin enables your StatusNet instance to publish real-time "
 "updates for profile RSS feeds using the <a href=\"http://rsscloud.org/"
diff --git a/plugins/RSSCloud/locale/fr/LC_MESSAGES/RSSCloud.po b/plugins/RSSCloud/locale/fr/LC_MESSAGES/RSSCloud.po
index 58520bb59f..9b8cd95895 100644
--- a/plugins/RSSCloud/locale/fr/LC_MESSAGES/RSSCloud.po
+++ b/plugins/RSSCloud/locale/fr/LC_MESSAGES/RSSCloud.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - RSSCloud\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:18+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:52+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-02-14 17:22:04+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-rsscloud\n"
@@ -74,7 +74,7 @@ msgstr "Cette ressource nécessite une requête HTTP GET."
 msgid "This resource requires an HTTP POST."
 msgstr "Cette ressource nécessite une requête HTTP POST."
 
-#: RSSCloudPlugin.php:248
+#: RSSCloudPlugin.php:245
 msgid ""
 "The RSSCloud plugin enables your StatusNet instance to publish real-time "
 "updates for profile RSS feeds using the <a href=\"http://rsscloud.org/"
diff --git a/plugins/RSSCloud/locale/ia/LC_MESSAGES/RSSCloud.po b/plugins/RSSCloud/locale/ia/LC_MESSAGES/RSSCloud.po
index d23c7b2028..da582b6ba6 100644
--- a/plugins/RSSCloud/locale/ia/LC_MESSAGES/RSSCloud.po
+++ b/plugins/RSSCloud/locale/ia/LC_MESSAGES/RSSCloud.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - RSSCloud\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:18+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:52+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-02-14 17:22:04+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-rsscloud\n"
@@ -70,7 +70,7 @@ msgstr "Iste ressource require un HTTP GET."
 msgid "This resource requires an HTTP POST."
 msgstr "Iste ressource require un HTTP POST."
 
-#: RSSCloudPlugin.php:248
+#: RSSCloudPlugin.php:245
 msgid ""
 "The RSSCloud plugin enables your StatusNet instance to publish real-time "
 "updates for profile RSS feeds using the <a href=\"http://rsscloud.org/"
diff --git a/plugins/RSSCloud/locale/mk/LC_MESSAGES/RSSCloud.po b/plugins/RSSCloud/locale/mk/LC_MESSAGES/RSSCloud.po
index 6d02d5933e..4e58776b58 100644
--- a/plugins/RSSCloud/locale/mk/LC_MESSAGES/RSSCloud.po
+++ b/plugins/RSSCloud/locale/mk/LC_MESSAGES/RSSCloud.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - RSSCloud\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:18+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:52+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-02-14 17:22:04+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-rsscloud\n"
@@ -70,7 +70,7 @@ msgstr "Овој ресурс бара HTTP GET."
 msgid "This resource requires an HTTP POST."
 msgstr "Овој ресурс бара HTTP POST."
 
-#: RSSCloudPlugin.php:248
+#: RSSCloudPlugin.php:245
 msgid ""
 "The RSSCloud plugin enables your StatusNet instance to publish real-time "
 "updates for profile RSS feeds using the <a href=\"http://rsscloud.org/"
diff --git a/plugins/RSSCloud/locale/nl/LC_MESSAGES/RSSCloud.po b/plugins/RSSCloud/locale/nl/LC_MESSAGES/RSSCloud.po
index b8a8e300f2..b5b2c343a4 100644
--- a/plugins/RSSCloud/locale/nl/LC_MESSAGES/RSSCloud.po
+++ b/plugins/RSSCloud/locale/nl/LC_MESSAGES/RSSCloud.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - RSSCloud\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:18+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:52+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-02-14 17:22:04+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-rsscloud\n"
@@ -70,7 +70,7 @@ msgstr "Deze bron heeft een HTTP GET nodig."
 msgid "This resource requires an HTTP POST."
 msgstr "Deze bron heeft een HTTP POST nodig."
 
-#: RSSCloudPlugin.php:248
+#: RSSCloudPlugin.php:245
 msgid ""
 "The RSSCloud plugin enables your StatusNet instance to publish real-time "
 "updates for profile RSS feeds using the <a href=\"http://rsscloud.org/"
diff --git a/plugins/RSSCloud/locale/tl/LC_MESSAGES/RSSCloud.po b/plugins/RSSCloud/locale/tl/LC_MESSAGES/RSSCloud.po
index 4a8d9d844d..1a9d9d088a 100644
--- a/plugins/RSSCloud/locale/tl/LC_MESSAGES/RSSCloud.po
+++ b/plugins/RSSCloud/locale/tl/LC_MESSAGES/RSSCloud.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - RSSCloud\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:18+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:52+0000\n"
 "Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-02-14 17:22:04+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-rsscloud\n"
@@ -70,7 +70,7 @@ msgstr "Ang pinagkunang ito ay nangangailangan ng HTTP GET."
 msgid "This resource requires an HTTP POST."
 msgstr "Ang pinagkukunang ito ay nangangailangan ng HTTP POST."
 
-#: RSSCloudPlugin.php:248
+#: RSSCloudPlugin.php:245
 msgid ""
 "The RSSCloud plugin enables your StatusNet instance to publish real-time "
 "updates for profile RSS feeds using the <a href=\"http://rsscloud.org/"
diff --git a/plugins/RSSCloud/locale/uk/LC_MESSAGES/RSSCloud.po b/plugins/RSSCloud/locale/uk/LC_MESSAGES/RSSCloud.po
index 97a2548769..f1e66b289b 100644
--- a/plugins/RSSCloud/locale/uk/LC_MESSAGES/RSSCloud.po
+++ b/plugins/RSSCloud/locale/uk/LC_MESSAGES/RSSCloud.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - RSSCloud\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:18+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:52+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-02-14 17:22:04+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-rsscloud\n"
@@ -70,7 +70,7 @@ msgstr "Цей ресурс вимагає форми HTTP GET."
 msgid "This resource requires an HTTP POST."
 msgstr "Цей ресурс вимагає форми HTTP POST."
 
-#: RSSCloudPlugin.php:248
+#: RSSCloudPlugin.php:245
 msgid ""
 "The RSSCloud plugin enables your StatusNet instance to publish real-time "
 "updates for profile RSS feeds using the <a href=\"http://rsscloud.org/"
diff --git a/plugins/Realtime/locale/Realtime.pot b/plugins/Realtime/locale/Realtime.pot
index 5c1cc212b2..9549ce840b 100644
--- a/plugins/Realtime/locale/Realtime.pot
+++ b/plugins/Realtime/locale/Realtime.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-14 16:01+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/Recaptcha/locale/Recaptcha.pot b/plugins/Recaptcha/locale/Recaptcha.pot
index 586d674b8b..66faa46bb8 100644
--- a/plugins/Recaptcha/locale/Recaptcha.pot
+++ b/plugins/Recaptcha/locale/Recaptcha.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,15 +16,15 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: RecaptchaPlugin.php:64
+#: RecaptchaPlugin.php:57
 msgid "Captcha"
 msgstr ""
 
-#: RecaptchaPlugin.php:105
+#: RecaptchaPlugin.php:98
 msgid "Captcha does not match!"
 msgstr ""
 
-#: RecaptchaPlugin.php:117
+#: RecaptchaPlugin.php:110
 msgid ""
 "Uses <a href=\"http://recaptcha.org/\">Recaptcha</a> service to add a  "
 "captcha to the registration page."
diff --git a/plugins/Recaptcha/locale/de/LC_MESSAGES/Recaptcha.po b/plugins/Recaptcha/locale/de/LC_MESSAGES/Recaptcha.po
index 9b6617e00a..9acfd15397 100644
--- a/plugins/Recaptcha/locale/de/LC_MESSAGES/Recaptcha.po
+++ b/plugins/Recaptcha/locale/de/LC_MESSAGES/Recaptcha.po
@@ -10,27 +10,27 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Recaptcha\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:13+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:49+0000\n"
 "Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:07+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:28:18+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-recaptcha\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: RecaptchaPlugin.php:64
+#: RecaptchaPlugin.php:57
 msgid "Captcha"
 msgstr "Captcha"
 
-#: RecaptchaPlugin.php:105
+#: RecaptchaPlugin.php:98
 msgid "Captcha does not match!"
 msgstr "Captcha stimmt nicht mit Text überein!"
 
-#: RecaptchaPlugin.php:117
+#: RecaptchaPlugin.php:110
 msgid ""
 "Uses <a href=\"http://recaptcha.org/\">Recaptcha</a> service to add a  "
 "captcha to the registration page."
diff --git a/plugins/Recaptcha/locale/fr/LC_MESSAGES/Recaptcha.po b/plugins/Recaptcha/locale/fr/LC_MESSAGES/Recaptcha.po
index ef6f6d698b..7976544b4f 100644
--- a/plugins/Recaptcha/locale/fr/LC_MESSAGES/Recaptcha.po
+++ b/plugins/Recaptcha/locale/fr/LC_MESSAGES/Recaptcha.po
@@ -10,27 +10,27 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Recaptcha\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:13+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:49+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:07+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:28:18+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-recaptcha\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: RecaptchaPlugin.php:64
+#: RecaptchaPlugin.php:57
 msgid "Captcha"
 msgstr "Vérificateur anti-robot Captcha"
 
-#: RecaptchaPlugin.php:105
+#: RecaptchaPlugin.php:98
 msgid "Captcha does not match!"
 msgstr "Le Captcha ne correspond pas !"
 
-#: RecaptchaPlugin.php:117
+#: RecaptchaPlugin.php:110
 msgid ""
 "Uses <a href=\"http://recaptcha.org/\">Recaptcha</a> service to add a  "
 "captcha to the registration page."
diff --git a/plugins/Recaptcha/locale/fur/LC_MESSAGES/Recaptcha.po b/plugins/Recaptcha/locale/fur/LC_MESSAGES/Recaptcha.po
index 6d9eab8b5a..273b509c28 100644
--- a/plugins/Recaptcha/locale/fur/LC_MESSAGES/Recaptcha.po
+++ b/plugins/Recaptcha/locale/fur/LC_MESSAGES/Recaptcha.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Recaptcha\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 15:58+0000\n"
-"PO-Revision-Date: 2011-03-03 16:02:50+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:49+0000\n"
 "Language-Team: Friulian <http://translatewiki.net/wiki/Portal:fur>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -21,15 +21,15 @@ msgstr ""
 "X-Message-Group: #out-statusnet-plugin-recaptcha\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: RecaptchaPlugin.php:64
+#: RecaptchaPlugin.php:57
 msgid "Captcha"
 msgstr "Captcha"
 
-#: RecaptchaPlugin.php:105
+#: RecaptchaPlugin.php:98
 msgid "Captcha does not match!"
 msgstr "Il Captcha nol corispuint!"
 
-#: RecaptchaPlugin.php:117
+#: RecaptchaPlugin.php:110
 msgid ""
 "Uses <a href=\"http://recaptcha.org/\">Recaptcha</a> service to add a  "
 "captcha to the registration page."
diff --git a/plugins/Recaptcha/locale/ia/LC_MESSAGES/Recaptcha.po b/plugins/Recaptcha/locale/ia/LC_MESSAGES/Recaptcha.po
index ebc7f9a8d8..33334530cf 100644
--- a/plugins/Recaptcha/locale/ia/LC_MESSAGES/Recaptcha.po
+++ b/plugins/Recaptcha/locale/ia/LC_MESSAGES/Recaptcha.po
@@ -9,27 +9,27 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Recaptcha\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:15+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:49+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:07+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:28:18+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-recaptcha\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: RecaptchaPlugin.php:64
+#: RecaptchaPlugin.php:57
 msgid "Captcha"
 msgstr "Captcha"
 
-#: RecaptchaPlugin.php:105
+#: RecaptchaPlugin.php:98
 msgid "Captcha does not match!"
 msgstr "Captcha non corresponde!"
 
-#: RecaptchaPlugin.php:117
+#: RecaptchaPlugin.php:110
 msgid ""
 "Uses <a href=\"http://recaptcha.org/\">Recaptcha</a> service to add a  "
 "captcha to the registration page."
diff --git a/plugins/Recaptcha/locale/mk/LC_MESSAGES/Recaptcha.po b/plugins/Recaptcha/locale/mk/LC_MESSAGES/Recaptcha.po
index 87edf870bf..d641ab985f 100644
--- a/plugins/Recaptcha/locale/mk/LC_MESSAGES/Recaptcha.po
+++ b/plugins/Recaptcha/locale/mk/LC_MESSAGES/Recaptcha.po
@@ -9,27 +9,27 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Recaptcha\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:15+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:50+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:07+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:28:18+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-recaptcha\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
 
-#: RecaptchaPlugin.php:64
+#: RecaptchaPlugin.php:57
 msgid "Captcha"
 msgstr "Captcha"
 
-#: RecaptchaPlugin.php:105
+#: RecaptchaPlugin.php:98
 msgid "Captcha does not match!"
 msgstr "Captcha не се совпаѓа!"
 
-#: RecaptchaPlugin.php:117
+#: RecaptchaPlugin.php:110
 msgid ""
 "Uses <a href=\"http://recaptcha.org/\">Recaptcha</a> service to add a  "
 "captcha to the registration page."
diff --git a/plugins/Recaptcha/locale/nb/LC_MESSAGES/Recaptcha.po b/plugins/Recaptcha/locale/nb/LC_MESSAGES/Recaptcha.po
index a4b71eefba..ae5b0716e1 100644
--- a/plugins/Recaptcha/locale/nb/LC_MESSAGES/Recaptcha.po
+++ b/plugins/Recaptcha/locale/nb/LC_MESSAGES/Recaptcha.po
@@ -9,27 +9,27 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Recaptcha\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:15+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:50+0000\n"
 "Language-Team: Norwegian (bokmål)‬ <http://translatewiki.net/wiki/Portal:no>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:07+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:28:18+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: #out-statusnet-plugin-recaptcha\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: RecaptchaPlugin.php:64
+#: RecaptchaPlugin.php:57
 msgid "Captcha"
 msgstr "Captcha"
 
-#: RecaptchaPlugin.php:105
+#: RecaptchaPlugin.php:98
 msgid "Captcha does not match!"
 msgstr "Captcha stemmer ikke."
 
-#: RecaptchaPlugin.php:117
+#: RecaptchaPlugin.php:110
 msgid ""
 "Uses <a href=\"http://recaptcha.org/\">Recaptcha</a> service to add a  "
 "captcha to the registration page."
diff --git a/plugins/Recaptcha/locale/nl/LC_MESSAGES/Recaptcha.po b/plugins/Recaptcha/locale/nl/LC_MESSAGES/Recaptcha.po
index 435261b706..fe6ed4629e 100644
--- a/plugins/Recaptcha/locale/nl/LC_MESSAGES/Recaptcha.po
+++ b/plugins/Recaptcha/locale/nl/LC_MESSAGES/Recaptcha.po
@@ -9,27 +9,27 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Recaptcha\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:15+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:50+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:07+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:28:18+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-recaptcha\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: RecaptchaPlugin.php:64
+#: RecaptchaPlugin.php:57
 msgid "Captcha"
 msgstr "Captcha"
 
-#: RecaptchaPlugin.php:105
+#: RecaptchaPlugin.php:98
 msgid "Captcha does not match!"
 msgstr "Captcha komt niet overeen!"
 
-#: RecaptchaPlugin.php:117
+#: RecaptchaPlugin.php:110
 msgid ""
 "Uses <a href=\"http://recaptcha.org/\">Recaptcha</a> service to add a  "
 "captcha to the registration page."
diff --git a/plugins/Recaptcha/locale/pt/LC_MESSAGES/Recaptcha.po b/plugins/Recaptcha/locale/pt/LC_MESSAGES/Recaptcha.po
index 14a18d2bf5..d47d24e1c8 100644
--- a/plugins/Recaptcha/locale/pt/LC_MESSAGES/Recaptcha.po
+++ b/plugins/Recaptcha/locale/pt/LC_MESSAGES/Recaptcha.po
@@ -9,27 +9,27 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Recaptcha\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:15+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:50+0000\n"
 "Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:07+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:28:18+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-plugin-recaptcha\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: RecaptchaPlugin.php:64
+#: RecaptchaPlugin.php:57
 msgid "Captcha"
 msgstr "Imagem de verificação"
 
-#: RecaptchaPlugin.php:105
+#: RecaptchaPlugin.php:98
 msgid "Captcha does not match!"
 msgstr "A imagem de verificação não corresponde!"
 
-#: RecaptchaPlugin.php:117
+#: RecaptchaPlugin.php:110
 msgid ""
 "Uses <a href=\"http://recaptcha.org/\">Recaptcha</a> service to add a  "
 "captcha to the registration page."
diff --git a/plugins/Recaptcha/locale/ru/LC_MESSAGES/Recaptcha.po b/plugins/Recaptcha/locale/ru/LC_MESSAGES/Recaptcha.po
index f8b78b2d53..e90689a5ce 100644
--- a/plugins/Recaptcha/locale/ru/LC_MESSAGES/Recaptcha.po
+++ b/plugins/Recaptcha/locale/ru/LC_MESSAGES/Recaptcha.po
@@ -10,28 +10,28 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Recaptcha\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:15+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:50+0000\n"
 "Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:07+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:28:18+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-recaptcha\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: RecaptchaPlugin.php:64
+#: RecaptchaPlugin.php:57
 msgid "Captcha"
 msgstr "Капча"
 
-#: RecaptchaPlugin.php:105
+#: RecaptchaPlugin.php:98
 msgid "Captcha does not match!"
 msgstr "Код проверки не совпадает!"
 
-#: RecaptchaPlugin.php:117
+#: RecaptchaPlugin.php:110
 msgid ""
 "Uses <a href=\"http://recaptcha.org/\">Recaptcha</a> service to add a  "
 "captcha to the registration page."
diff --git a/plugins/Recaptcha/locale/tl/LC_MESSAGES/Recaptcha.po b/plugins/Recaptcha/locale/tl/LC_MESSAGES/Recaptcha.po
index 906688e5ab..d3dac3b2f2 100644
--- a/plugins/Recaptcha/locale/tl/LC_MESSAGES/Recaptcha.po
+++ b/plugins/Recaptcha/locale/tl/LC_MESSAGES/Recaptcha.po
@@ -9,27 +9,27 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Recaptcha\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:15+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:50+0000\n"
 "Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:07+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:28:18+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-recaptcha\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: RecaptchaPlugin.php:64
+#: RecaptchaPlugin.php:57
 msgid "Captcha"
 msgstr "Captcha"
 
-#: RecaptchaPlugin.php:105
+#: RecaptchaPlugin.php:98
 msgid "Captcha does not match!"
 msgstr "Hindi tugma ang Captcha!"
 
-#: RecaptchaPlugin.php:117
+#: RecaptchaPlugin.php:110
 msgid ""
 "Uses <a href=\"http://recaptcha.org/\">Recaptcha</a> service to add a  "
 "captcha to the registration page."
diff --git a/plugins/Recaptcha/locale/uk/LC_MESSAGES/Recaptcha.po b/plugins/Recaptcha/locale/uk/LC_MESSAGES/Recaptcha.po
index ed848d5076..f1ff37a26b 100644
--- a/plugins/Recaptcha/locale/uk/LC_MESSAGES/Recaptcha.po
+++ b/plugins/Recaptcha/locale/uk/LC_MESSAGES/Recaptcha.po
@@ -9,28 +9,28 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Recaptcha\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:15+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:50+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:07+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:28:18+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-recaptcha\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: RecaptchaPlugin.php:64
+#: RecaptchaPlugin.php:57
 msgid "Captcha"
 msgstr "Captcha"
 
-#: RecaptchaPlugin.php:105
+#: RecaptchaPlugin.php:98
 msgid "Captcha does not match!"
 msgstr "Коди перевірки не збігаються!"
 
-#: RecaptchaPlugin.php:117
+#: RecaptchaPlugin.php:110
 msgid ""
 "Uses <a href=\"http://recaptcha.org/\">Recaptcha</a> service to add a  "
 "captcha to the registration page."
diff --git a/plugins/RegisterThrottle/locale/RegisterThrottle.pot b/plugins/RegisterThrottle/locale/RegisterThrottle.pot
index d8a5fdce31..3a34c4fef4 100644
--- a/plugins/RegisterThrottle/locale/RegisterThrottle.pot
+++ b/plugins/RegisterThrottle/locale/RegisterThrottle.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/RequireValidatedEmail/locale/RequireValidatedEmail.pot b/plugins/RequireValidatedEmail/locale/RequireValidatedEmail.pot
index c8d8f212f3..82f2070334 100644
--- a/plugins/RequireValidatedEmail/locale/RequireValidatedEmail.pot
+++ b/plugins/RequireValidatedEmail/locale/RequireValidatedEmail.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 15:58+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,14 +16,14 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: RequireValidatedEmailPlugin.php:92
+#: RequireValidatedEmailPlugin.php:121
 msgid "You must validate your email address before posting."
 msgstr ""
 
-#: RequireValidatedEmailPlugin.php:112
+#: RequireValidatedEmailPlugin.php:141
 msgid "You must provide an email address to register."
 msgstr ""
 
-#: RequireValidatedEmailPlugin.php:216
+#: RequireValidatedEmailPlugin.php:245
 msgid "Disables posting without a validated email address."
 msgstr ""
diff --git a/plugins/RequireValidatedEmail/locale/de/LC_MESSAGES/RequireValidatedEmail.po b/plugins/RequireValidatedEmail/locale/de/LC_MESSAGES/RequireValidatedEmail.po
index d0e7151ec6..f92c965cc6 100644
--- a/plugins/RequireValidatedEmail/locale/de/LC_MESSAGES/RequireValidatedEmail.po
+++ b/plugins/RequireValidatedEmail/locale/de/LC_MESSAGES/RequireValidatedEmail.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - RequireValidatedEmail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 15:58+0000\n"
-"PO-Revision-Date: 2011-03-03 16:02:51+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:51+0000\n"
 "Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -21,14 +21,14 @@ msgstr ""
 "X-Message-Group: #out-statusnet-plugin-requirevalidatedemail\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: RequireValidatedEmailPlugin.php:92
+#: RequireValidatedEmailPlugin.php:121
 msgid "You must validate your email address before posting."
 msgstr "Du musst deine E-Mail-Adresse validieren, bevor du beitragen kannst."
 
-#: RequireValidatedEmailPlugin.php:112
+#: RequireValidatedEmailPlugin.php:141
 msgid "You must provide an email address to register."
 msgstr "Du musst eine E-Mail-Adresse angeben, um dich zu registrieren."
 
-#: RequireValidatedEmailPlugin.php:216
+#: RequireValidatedEmailPlugin.php:245
 msgid "Disables posting without a validated email address."
 msgstr "Deaktiviert Posten ohne gültige E-Mail-Adresse."
diff --git a/plugins/RequireValidatedEmail/locale/fr/LC_MESSAGES/RequireValidatedEmail.po b/plugins/RequireValidatedEmail/locale/fr/LC_MESSAGES/RequireValidatedEmail.po
index 36d56338b8..75c1d5bd6c 100644
--- a/plugins/RequireValidatedEmail/locale/fr/LC_MESSAGES/RequireValidatedEmail.po
+++ b/plugins/RequireValidatedEmail/locale/fr/LC_MESSAGES/RequireValidatedEmail.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - RequireValidatedEmail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 15:58+0000\n"
-"PO-Revision-Date: 2011-03-03 16:02:51+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:51+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -21,15 +21,15 @@ msgstr ""
 "X-Message-Group: #out-statusnet-plugin-requirevalidatedemail\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: RequireValidatedEmailPlugin.php:92
+#: RequireValidatedEmailPlugin.php:121
 msgid "You must validate your email address before posting."
 msgstr "Vous devez valider votre adresse électronique avant de poster."
 
-#: RequireValidatedEmailPlugin.php:112
+#: RequireValidatedEmailPlugin.php:141
 msgid "You must provide an email address to register."
 msgstr "Vous devez fournir une adresse électronique avant de vous enregistrer."
 
-#: RequireValidatedEmailPlugin.php:216
+#: RequireValidatedEmailPlugin.php:245
 msgid "Disables posting without a validated email address."
 msgstr ""
 "Désactive le postage pour ceux qui n’ont pas d’adresse électronique valide."
diff --git a/plugins/RequireValidatedEmail/locale/ia/LC_MESSAGES/RequireValidatedEmail.po b/plugins/RequireValidatedEmail/locale/ia/LC_MESSAGES/RequireValidatedEmail.po
index 6dd6b54e51..a5f9e6aec9 100644
--- a/plugins/RequireValidatedEmail/locale/ia/LC_MESSAGES/RequireValidatedEmail.po
+++ b/plugins/RequireValidatedEmail/locale/ia/LC_MESSAGES/RequireValidatedEmail.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - RequireValidatedEmail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 15:58+0000\n"
-"PO-Revision-Date: 2011-03-03 16:02:51+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:51+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -21,14 +21,14 @@ msgstr ""
 "X-Message-Group: #out-statusnet-plugin-requirevalidatedemail\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: RequireValidatedEmailPlugin.php:92
+#: RequireValidatedEmailPlugin.php:121
 msgid "You must validate your email address before posting."
 msgstr "Tu debe validar tu adresse de e-mail ante de publicar."
 
-#: RequireValidatedEmailPlugin.php:112
+#: RequireValidatedEmailPlugin.php:141
 msgid "You must provide an email address to register."
 msgstr "Tu debe fornir un adresse de e-mail pro poter crear un conto."
 
-#: RequireValidatedEmailPlugin.php:216
+#: RequireValidatedEmailPlugin.php:245
 msgid "Disables posting without a validated email address."
 msgstr "Disactiva le publication de messages sin adresse de e-mail validate."
diff --git a/plugins/RequireValidatedEmail/locale/mk/LC_MESSAGES/RequireValidatedEmail.po b/plugins/RequireValidatedEmail/locale/mk/LC_MESSAGES/RequireValidatedEmail.po
index bbf01db034..b55a7520c3 100644
--- a/plugins/RequireValidatedEmail/locale/mk/LC_MESSAGES/RequireValidatedEmail.po
+++ b/plugins/RequireValidatedEmail/locale/mk/LC_MESSAGES/RequireValidatedEmail.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - RequireValidatedEmail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 15:58+0000\n"
-"PO-Revision-Date: 2011-03-03 16:02:52+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:51+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -21,16 +21,16 @@ msgstr ""
 "X-Message-Group: #out-statusnet-plugin-requirevalidatedemail\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
 
-#: RequireValidatedEmailPlugin.php:92
+#: RequireValidatedEmailPlugin.php:121
 msgid "You must validate your email address before posting."
 msgstr ""
 "Пред да почнете да објавувате ќе мора да ја потврдите Вашата е-поштенска "
 "адреса."
 
-#: RequireValidatedEmailPlugin.php:112
+#: RequireValidatedEmailPlugin.php:141
 msgid "You must provide an email address to register."
 msgstr "За да се регистрирате, ќе мора да наведете е-поштенска адреса."
 
-#: RequireValidatedEmailPlugin.php:216
+#: RequireValidatedEmailPlugin.php:245
 msgid "Disables posting without a validated email address."
 msgstr "Оневозможува објавување без потврдена е-пошта."
diff --git a/plugins/RequireValidatedEmail/locale/nl/LC_MESSAGES/RequireValidatedEmail.po b/plugins/RequireValidatedEmail/locale/nl/LC_MESSAGES/RequireValidatedEmail.po
index 8d5831dc11..64c055389f 100644
--- a/plugins/RequireValidatedEmail/locale/nl/LC_MESSAGES/RequireValidatedEmail.po
+++ b/plugins/RequireValidatedEmail/locale/nl/LC_MESSAGES/RequireValidatedEmail.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - RequireValidatedEmail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 15:58+0000\n"
-"PO-Revision-Date: 2011-03-03 16:02:52+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:51+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -21,14 +21,14 @@ msgstr ""
 "X-Message-Group: #out-statusnet-plugin-requirevalidatedemail\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: RequireValidatedEmailPlugin.php:92
+#: RequireValidatedEmailPlugin.php:121
 msgid "You must validate your email address before posting."
 msgstr "U moet uw e-mailadres bevestigen voordat u berichten kunt plaatsen."
 
-#: RequireValidatedEmailPlugin.php:112
+#: RequireValidatedEmailPlugin.php:141
 msgid "You must provide an email address to register."
 msgstr "U moet een e-mailadres opgeven om te kunnen registreren."
 
-#: RequireValidatedEmailPlugin.php:216
+#: RequireValidatedEmailPlugin.php:245
 msgid "Disables posting without a validated email address."
 msgstr "Schakelt berichten plaatsen zonder gevalideerd e-mailadres uit."
diff --git a/plugins/RequireValidatedEmail/locale/tl/LC_MESSAGES/RequireValidatedEmail.po b/plugins/RequireValidatedEmail/locale/tl/LC_MESSAGES/RequireValidatedEmail.po
index 387c2e91a8..3639efe2bc 100644
--- a/plugins/RequireValidatedEmail/locale/tl/LC_MESSAGES/RequireValidatedEmail.po
+++ b/plugins/RequireValidatedEmail/locale/tl/LC_MESSAGES/RequireValidatedEmail.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - RequireValidatedEmail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 15:58+0000\n"
-"PO-Revision-Date: 2011-03-03 16:02:52+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:51+0000\n"
 "Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -21,14 +21,14 @@ msgstr ""
 "X-Message-Group: #out-statusnet-plugin-requirevalidatedemail\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: RequireValidatedEmailPlugin.php:92
+#: RequireValidatedEmailPlugin.php:121
 msgid "You must validate your email address before posting."
 msgstr "Kailangan patunayan mo ang iyong tirahan ng e-liham bago magpaskil."
 
-#: RequireValidatedEmailPlugin.php:112
+#: RequireValidatedEmailPlugin.php:141
 msgid "You must provide an email address to register."
 msgstr "Dapat kang magbigay ng isang tirahan ng e-liham upang makapagpatala."
 
-#: RequireValidatedEmailPlugin.php:216
+#: RequireValidatedEmailPlugin.php:245
 msgid "Disables posting without a validated email address."
 msgstr ""
diff --git a/plugins/RequireValidatedEmail/locale/uk/LC_MESSAGES/RequireValidatedEmail.po b/plugins/RequireValidatedEmail/locale/uk/LC_MESSAGES/RequireValidatedEmail.po
index b649cb361b..bba5ef7932 100644
--- a/plugins/RequireValidatedEmail/locale/uk/LC_MESSAGES/RequireValidatedEmail.po
+++ b/plugins/RequireValidatedEmail/locale/uk/LC_MESSAGES/RequireValidatedEmail.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - RequireValidatedEmail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 15:58+0000\n"
-"PO-Revision-Date: 2011-03-03 16:02:52+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:51+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -22,17 +22,17 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: RequireValidatedEmailPlugin.php:92
+#: RequireValidatedEmailPlugin.php:121
 msgid "You must validate your email address before posting."
 msgstr ""
 "Ви повинні підтвердити свою адресу електронної пошти до того, як почнете "
 "надсилати дописи поштою."
 
-#: RequireValidatedEmailPlugin.php:112
+#: RequireValidatedEmailPlugin.php:141
 msgid "You must provide an email address to register."
 msgstr "Ви повинні зазначити свою адресу електронної пошти для реєстрації."
 
-#: RequireValidatedEmailPlugin.php:216
+#: RequireValidatedEmailPlugin.php:245
 msgid "Disables posting without a validated email address."
 msgstr ""
 "Забороняє надсилання дописів, якщо користувач не має підтвердженої "
diff --git a/plugins/ReverseUsernameAuthentication/locale/ReverseUsernameAuthentication.pot b/plugins/ReverseUsernameAuthentication/locale/ReverseUsernameAuthentication.pot
index 9569292f2e..b242fcbc72 100644
--- a/plugins/ReverseUsernameAuthentication/locale/ReverseUsernameAuthentication.pot
+++ b/plugins/ReverseUsernameAuthentication/locale/ReverseUsernameAuthentication.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/ReverseUsernameAuthentication/locale/de/LC_MESSAGES/ReverseUsernameAuthentication.po b/plugins/ReverseUsernameAuthentication/locale/de/LC_MESSAGES/ReverseUsernameAuthentication.po
index 078e5d52bb..42dfe1bc9f 100644
--- a/plugins/ReverseUsernameAuthentication/locale/de/LC_MESSAGES/ReverseUsernameAuthentication.po
+++ b/plugins/ReverseUsernameAuthentication/locale/de/LC_MESSAGES/ReverseUsernameAuthentication.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ReverseUsernameAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-14 16:01+0000\n"
-"PO-Revision-Date: 2011-02-14 16:09:57+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:51+0000\n"
 "Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:28:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r82114); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-02-14 17:22:02+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-reverseusernameauthentication\n"
diff --git a/plugins/ReverseUsernameAuthentication/locale/fr/LC_MESSAGES/ReverseUsernameAuthentication.po b/plugins/ReverseUsernameAuthentication/locale/fr/LC_MESSAGES/ReverseUsernameAuthentication.po
index c8bae42542..b381cfaf01 100644
--- a/plugins/ReverseUsernameAuthentication/locale/fr/LC_MESSAGES/ReverseUsernameAuthentication.po
+++ b/plugins/ReverseUsernameAuthentication/locale/fr/LC_MESSAGES/ReverseUsernameAuthentication.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ReverseUsernameAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:17+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:51+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:27:21+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-02-14 17:22:02+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-reverseusernameauthentication\n"
diff --git a/plugins/ReverseUsernameAuthentication/locale/he/LC_MESSAGES/ReverseUsernameAuthentication.po b/plugins/ReverseUsernameAuthentication/locale/he/LC_MESSAGES/ReverseUsernameAuthentication.po
index 49d7869a1b..070d21c078 100644
--- a/plugins/ReverseUsernameAuthentication/locale/he/LC_MESSAGES/ReverseUsernameAuthentication.po
+++ b/plugins/ReverseUsernameAuthentication/locale/he/LC_MESSAGES/ReverseUsernameAuthentication.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ReverseUsernameAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:17+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:51+0000\n"
 "Language-Team: Hebrew <http://translatewiki.net/wiki/Portal:he>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:27:21+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-02-14 17:22:02+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-plugin-reverseusernameauthentication\n"
diff --git a/plugins/ReverseUsernameAuthentication/locale/ia/LC_MESSAGES/ReverseUsernameAuthentication.po b/plugins/ReverseUsernameAuthentication/locale/ia/LC_MESSAGES/ReverseUsernameAuthentication.po
index 42e44d79a4..6dfde61a0e 100644
--- a/plugins/ReverseUsernameAuthentication/locale/ia/LC_MESSAGES/ReverseUsernameAuthentication.po
+++ b/plugins/ReverseUsernameAuthentication/locale/ia/LC_MESSAGES/ReverseUsernameAuthentication.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ReverseUsernameAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:17+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:51+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:27:21+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-02-14 17:22:02+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-reverseusernameauthentication\n"
diff --git a/plugins/ReverseUsernameAuthentication/locale/id/LC_MESSAGES/ReverseUsernameAuthentication.po b/plugins/ReverseUsernameAuthentication/locale/id/LC_MESSAGES/ReverseUsernameAuthentication.po
index c3774052df..de4ca247c3 100644
--- a/plugins/ReverseUsernameAuthentication/locale/id/LC_MESSAGES/ReverseUsernameAuthentication.po
+++ b/plugins/ReverseUsernameAuthentication/locale/id/LC_MESSAGES/ReverseUsernameAuthentication.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ReverseUsernameAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:17+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:51+0000\n"
 "Language-Team: Indonesian <http://translatewiki.net/wiki/Portal:id>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:27:21+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-02-14 17:22:02+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: id\n"
 "X-Message-Group: #out-statusnet-plugin-reverseusernameauthentication\n"
diff --git a/plugins/ReverseUsernameAuthentication/locale/ja/LC_MESSAGES/ReverseUsernameAuthentication.po b/plugins/ReverseUsernameAuthentication/locale/ja/LC_MESSAGES/ReverseUsernameAuthentication.po
index 110ebe128a..e1e9211d43 100644
--- a/plugins/ReverseUsernameAuthentication/locale/ja/LC_MESSAGES/ReverseUsernameAuthentication.po
+++ b/plugins/ReverseUsernameAuthentication/locale/ja/LC_MESSAGES/ReverseUsernameAuthentication.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ReverseUsernameAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:17+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:51+0000\n"
 "Language-Team: Japanese <http://translatewiki.net/wiki/Portal:ja>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:27:21+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-02-14 17:22:02+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ja\n"
 "X-Message-Group: #out-statusnet-plugin-reverseusernameauthentication\n"
diff --git a/plugins/ReverseUsernameAuthentication/locale/mk/LC_MESSAGES/ReverseUsernameAuthentication.po b/plugins/ReverseUsernameAuthentication/locale/mk/LC_MESSAGES/ReverseUsernameAuthentication.po
index 8cb5a2d759..36eda184e4 100644
--- a/plugins/ReverseUsernameAuthentication/locale/mk/LC_MESSAGES/ReverseUsernameAuthentication.po
+++ b/plugins/ReverseUsernameAuthentication/locale/mk/LC_MESSAGES/ReverseUsernameAuthentication.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ReverseUsernameAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:17+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:51+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:27:21+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-02-14 17:22:02+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-reverseusernameauthentication\n"
diff --git a/plugins/ReverseUsernameAuthentication/locale/nb/LC_MESSAGES/ReverseUsernameAuthentication.po b/plugins/ReverseUsernameAuthentication/locale/nb/LC_MESSAGES/ReverseUsernameAuthentication.po
index 627fbe3c9a..a3918398ab 100644
--- a/plugins/ReverseUsernameAuthentication/locale/nb/LC_MESSAGES/ReverseUsernameAuthentication.po
+++ b/plugins/ReverseUsernameAuthentication/locale/nb/LC_MESSAGES/ReverseUsernameAuthentication.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ReverseUsernameAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:17+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:51+0000\n"
 "Language-Team: Norwegian (bokmål)‬ <http://translatewiki.net/wiki/Portal:no>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:27:21+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-02-14 17:22:02+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: #out-statusnet-plugin-reverseusernameauthentication\n"
diff --git a/plugins/ReverseUsernameAuthentication/locale/nl/LC_MESSAGES/ReverseUsernameAuthentication.po b/plugins/ReverseUsernameAuthentication/locale/nl/LC_MESSAGES/ReverseUsernameAuthentication.po
index 2ede8a8a57..4ff6e99151 100644
--- a/plugins/ReverseUsernameAuthentication/locale/nl/LC_MESSAGES/ReverseUsernameAuthentication.po
+++ b/plugins/ReverseUsernameAuthentication/locale/nl/LC_MESSAGES/ReverseUsernameAuthentication.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ReverseUsernameAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:17+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:51+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:27:21+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-02-14 17:22:02+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-reverseusernameauthentication\n"
diff --git a/plugins/ReverseUsernameAuthentication/locale/ru/LC_MESSAGES/ReverseUsernameAuthentication.po b/plugins/ReverseUsernameAuthentication/locale/ru/LC_MESSAGES/ReverseUsernameAuthentication.po
index acde74d108..ba1547fabd 100644
--- a/plugins/ReverseUsernameAuthentication/locale/ru/LC_MESSAGES/ReverseUsernameAuthentication.po
+++ b/plugins/ReverseUsernameAuthentication/locale/ru/LC_MESSAGES/ReverseUsernameAuthentication.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ReverseUsernameAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:17+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:51+0000\n"
 "Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:27:21+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-02-14 17:22:02+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-reverseusernameauthentication\n"
diff --git a/plugins/ReverseUsernameAuthentication/locale/tl/LC_MESSAGES/ReverseUsernameAuthentication.po b/plugins/ReverseUsernameAuthentication/locale/tl/LC_MESSAGES/ReverseUsernameAuthentication.po
index ec2644fa3c..f24ce5355f 100644
--- a/plugins/ReverseUsernameAuthentication/locale/tl/LC_MESSAGES/ReverseUsernameAuthentication.po
+++ b/plugins/ReverseUsernameAuthentication/locale/tl/LC_MESSAGES/ReverseUsernameAuthentication.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ReverseUsernameAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:17+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:51+0000\n"
 "Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:27:21+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-02-14 17:22:02+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-reverseusernameauthentication\n"
diff --git a/plugins/ReverseUsernameAuthentication/locale/uk/LC_MESSAGES/ReverseUsernameAuthentication.po b/plugins/ReverseUsernameAuthentication/locale/uk/LC_MESSAGES/ReverseUsernameAuthentication.po
index db9a4ac680..baeb04e5c7 100644
--- a/plugins/ReverseUsernameAuthentication/locale/uk/LC_MESSAGES/ReverseUsernameAuthentication.po
+++ b/plugins/ReverseUsernameAuthentication/locale/uk/LC_MESSAGES/ReverseUsernameAuthentication.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ReverseUsernameAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:17+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:51+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:27:21+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-02-14 17:22:02+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-reverseusernameauthentication\n"
diff --git a/plugins/SQLProfile/locale/SQLProfile.pot b/plugins/SQLProfile/locale/SQLProfile.pot
index 371977335b..1548a38ebd 100644
--- a/plugins/SQLProfile/locale/SQLProfile.pot
+++ b/plugins/SQLProfile/locale/SQLProfile.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/SQLProfile/locale/de/LC_MESSAGES/SQLProfile.po b/plugins/SQLProfile/locale/de/LC_MESSAGES/SQLProfile.po
index f7d98c8012..26bbe7c858 100644
--- a/plugins/SQLProfile/locale/de/LC_MESSAGES/SQLProfile.po
+++ b/plugins/SQLProfile/locale/de/LC_MESSAGES/SQLProfile.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SQLProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-14 16:01+0000\n"
-"PO-Revision-Date: 2011-02-14 16:10:12+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:03+0000\n"
 "Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:28:31+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r82114); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-02-14 17:22:10+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-sqlprofile\n"
diff --git a/plugins/SQLProfile/locale/fr/LC_MESSAGES/SQLProfile.po b/plugins/SQLProfile/locale/fr/LC_MESSAGES/SQLProfile.po
index 4d65dd0709..b5d35fc1b3 100644
--- a/plugins/SQLProfile/locale/fr/LC_MESSAGES/SQLProfile.po
+++ b/plugins/SQLProfile/locale/fr/LC_MESSAGES/SQLProfile.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SQLProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-14 16:01+0000\n"
-"PO-Revision-Date: 2011-02-14 16:10:12+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:03+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:28:31+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r82114); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-02-14 17:22:10+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-sqlprofile\n"
diff --git a/plugins/SQLProfile/locale/ia/LC_MESSAGES/SQLProfile.po b/plugins/SQLProfile/locale/ia/LC_MESSAGES/SQLProfile.po
index 98018ec23d..80b96c5998 100644
--- a/plugins/SQLProfile/locale/ia/LC_MESSAGES/SQLProfile.po
+++ b/plugins/SQLProfile/locale/ia/LC_MESSAGES/SQLProfile.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SQLProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:25+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:03+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-22 19:30:41+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-02-14 17:22:10+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-sqlprofile\n"
diff --git a/plugins/SQLProfile/locale/mk/LC_MESSAGES/SQLProfile.po b/plugins/SQLProfile/locale/mk/LC_MESSAGES/SQLProfile.po
index 055548a804..dc514d16cc 100644
--- a/plugins/SQLProfile/locale/mk/LC_MESSAGES/SQLProfile.po
+++ b/plugins/SQLProfile/locale/mk/LC_MESSAGES/SQLProfile.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SQLProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:25+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:03+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-22 19:30:41+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-02-14 17:22:10+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-sqlprofile\n"
diff --git a/plugins/SQLProfile/locale/nl/LC_MESSAGES/SQLProfile.po b/plugins/SQLProfile/locale/nl/LC_MESSAGES/SQLProfile.po
index bd447788f8..57892bd43a 100644
--- a/plugins/SQLProfile/locale/nl/LC_MESSAGES/SQLProfile.po
+++ b/plugins/SQLProfile/locale/nl/LC_MESSAGES/SQLProfile.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SQLProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:25+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:03+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-22 19:30:41+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-02-14 17:22:10+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-sqlprofile\n"
diff --git a/plugins/SQLProfile/locale/pt/LC_MESSAGES/SQLProfile.po b/plugins/SQLProfile/locale/pt/LC_MESSAGES/SQLProfile.po
index 28cfa95bbf..775a2fb8ab 100644
--- a/plugins/SQLProfile/locale/pt/LC_MESSAGES/SQLProfile.po
+++ b/plugins/SQLProfile/locale/pt/LC_MESSAGES/SQLProfile.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SQLProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 15:58+0000\n"
-"PO-Revision-Date: 2011-03-03 16:03:03+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:03+0000\n"
 "Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/SQLProfile/locale/ru/LC_MESSAGES/SQLProfile.po b/plugins/SQLProfile/locale/ru/LC_MESSAGES/SQLProfile.po
index 7bc8b6ce0d..443a30a27a 100644
--- a/plugins/SQLProfile/locale/ru/LC_MESSAGES/SQLProfile.po
+++ b/plugins/SQLProfile/locale/ru/LC_MESSAGES/SQLProfile.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SQLProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:25+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:04+0000\n"
 "Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-22 19:30:41+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-02-14 17:22:10+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-sqlprofile\n"
diff --git a/plugins/SQLProfile/locale/uk/LC_MESSAGES/SQLProfile.po b/plugins/SQLProfile/locale/uk/LC_MESSAGES/SQLProfile.po
index 8af513f1e6..24c004b9b2 100644
--- a/plugins/SQLProfile/locale/uk/LC_MESSAGES/SQLProfile.po
+++ b/plugins/SQLProfile/locale/uk/LC_MESSAGES/SQLProfile.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SQLProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:25+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:04+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-22 19:30:41+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-02-14 17:22:10+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-sqlprofile\n"
diff --git a/plugins/Sample/locale/Sample.pot b/plugins/Sample/locale/Sample.pot
index b62608bf6d..d1a4d06887 100644
--- a/plugins/Sample/locale/Sample.pot
+++ b/plugins/Sample/locale/Sample.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -31,15 +31,15 @@ msgstr ""
 msgid "Could not increment greeting count for %d."
 msgstr ""
 
-#: SamplePlugin.php:259 hello.php:111
+#: SamplePlugin.php:270 hello.php:111
 msgid "Hello"
 msgstr ""
 
-#: SamplePlugin.php:259
+#: SamplePlugin.php:270
 msgid "A warm greeting"
 msgstr ""
 
-#: SamplePlugin.php:270
+#: SamplePlugin.php:281
 msgid "A sample plugin to show basics of development for new hackers."
 msgstr ""
 
diff --git a/plugins/Sample/locale/br/LC_MESSAGES/Sample.po b/plugins/Sample/locale/br/LC_MESSAGES/Sample.po
index 7a698b3da7..61b030bfd5 100644
--- a/plugins/Sample/locale/br/LC_MESSAGES/Sample.po
+++ b/plugins/Sample/locale/br/LC_MESSAGES/Sample.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Sample\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:19+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:53+0000\n"
 "Language-Team: Breton <http://translatewiki.net/wiki/Portal:br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:27:21+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:28:23+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-sample\n"
@@ -35,15 +35,15 @@ msgstr "Dibosupl eo enrollañ ar gont degemer nevez evit an implijer %d."
 msgid "Could not increment greeting count for %d."
 msgstr "Dibosupl eo inkremantañ ar gont degemer nevez evit an implijer %d."
 
-#: SamplePlugin.php:259 hello.php:111
+#: SamplePlugin.php:270 hello.php:111
 msgid "Hello"
 msgstr "Demat"
 
-#: SamplePlugin.php:259
+#: SamplePlugin.php:270
 msgid "A warm greeting"
 msgstr "Un degemer tomm"
 
-#: SamplePlugin.php:270
+#: SamplePlugin.php:281
 msgid "A sample plugin to show basics of development for new hackers."
 msgstr ""
 "Ur skouer a lugant evit diskouez an diazezoù diorren evit ar c'hoderien "
diff --git a/plugins/Sample/locale/de/LC_MESSAGES/Sample.po b/plugins/Sample/locale/de/LC_MESSAGES/Sample.po
index 9c9cb9aa5a..fc4e7612c6 100644
--- a/plugins/Sample/locale/de/LC_MESSAGES/Sample.po
+++ b/plugins/Sample/locale/de/LC_MESSAGES/Sample.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Sample\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:19+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:53+0000\n"
 "Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:27:21+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:28:23+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-sample\n"
@@ -35,15 +35,15 @@ msgstr "Konnte neuen Grüßungszähler von %d nicht speichern."
 msgid "Could not increment greeting count for %d."
 msgstr "Konnte Grüßungszähler von %d nicht erhöhen."
 
-#: SamplePlugin.php:259 hello.php:111
+#: SamplePlugin.php:270 hello.php:111
 msgid "Hello"
 msgstr "Hallo"
 
-#: SamplePlugin.php:259
+#: SamplePlugin.php:270
 msgid "A warm greeting"
 msgstr "Ein herzlicher Gruß"
 
-#: SamplePlugin.php:270
+#: SamplePlugin.php:281
 msgid "A sample plugin to show basics of development for new hackers."
 msgstr "Ein Beispiel-Plugin, um die Entwicklungsbasis neuen Hackern zu zeigen."
 
diff --git a/plugins/Sample/locale/fr/LC_MESSAGES/Sample.po b/plugins/Sample/locale/fr/LC_MESSAGES/Sample.po
index 19d96b389d..174910f779 100644
--- a/plugins/Sample/locale/fr/LC_MESSAGES/Sample.po
+++ b/plugins/Sample/locale/fr/LC_MESSAGES/Sample.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Sample\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:20+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:53+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:27:21+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:28:23+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-sample\n"
@@ -36,15 +36,15 @@ msgstr ""
 msgid "Could not increment greeting count for %d."
 msgstr "Impossible d’incrémenter le compte de vœux pour l’utilisateur %d."
 
-#: SamplePlugin.php:259 hello.php:111
+#: SamplePlugin.php:270 hello.php:111
 msgid "Hello"
 msgstr "Bonjour"
 
-#: SamplePlugin.php:259
+#: SamplePlugin.php:270
 msgid "A warm greeting"
 msgstr "Un accueil chaleureux"
 
-#: SamplePlugin.php:270
+#: SamplePlugin.php:281
 msgid "A sample plugin to show basics of development for new hackers."
 msgstr ""
 "Un exemple de greffon pour montrer les bases de développement pour les "
diff --git a/plugins/Sample/locale/ia/LC_MESSAGES/Sample.po b/plugins/Sample/locale/ia/LC_MESSAGES/Sample.po
index 2572ae96d4..ed716a4122 100644
--- a/plugins/Sample/locale/ia/LC_MESSAGES/Sample.po
+++ b/plugins/Sample/locale/ia/LC_MESSAGES/Sample.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Sample\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:20+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:53+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:27:21+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:28:23+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-sample\n"
@@ -35,15 +35,15 @@ msgstr "Non poteva salveguardar le numero de nove salutationes pro %d."
 msgid "Could not increment greeting count for %d."
 msgstr "Non poteva incrementar le numero de salutationes pro %d."
 
-#: SamplePlugin.php:259 hello.php:111
+#: SamplePlugin.php:270 hello.php:111
 msgid "Hello"
 msgstr "Salute"
 
-#: SamplePlugin.php:259
+#: SamplePlugin.php:270
 msgid "A warm greeting"
 msgstr "Un calide salutation"
 
-#: SamplePlugin.php:270
+#: SamplePlugin.php:281
 msgid "A sample plugin to show basics of development for new hackers."
 msgstr ""
 "Un plug-in de exemplo pro demonstrar le principios de disveloppamento pro "
diff --git a/plugins/Sample/locale/lb/LC_MESSAGES/Sample.po b/plugins/Sample/locale/lb/LC_MESSAGES/Sample.po
index 5467937337..8fe949a127 100644
--- a/plugins/Sample/locale/lb/LC_MESSAGES/Sample.po
+++ b/plugins/Sample/locale/lb/LC_MESSAGES/Sample.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Sample\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:20+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:53+0000\n"
 "Language-Team: Luxembourgish <http://translatewiki.net/wiki/Portal:lb>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:27:21+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:28:23+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: lb\n"
 "X-Message-Group: #out-statusnet-plugin-sample\n"
@@ -35,15 +35,15 @@ msgstr ""
 msgid "Could not increment greeting count for %d."
 msgstr ""
 
-#: SamplePlugin.php:259 hello.php:111
+#: SamplePlugin.php:270 hello.php:111
 msgid "Hello"
 msgstr "Salut"
 
-#: SamplePlugin.php:259
+#: SamplePlugin.php:270
 msgid "A warm greeting"
 msgstr "E schéine Bonjour"
 
-#: SamplePlugin.php:270
+#: SamplePlugin.php:281
 msgid "A sample plugin to show basics of development for new hackers."
 msgstr ""
 
diff --git a/plugins/Sample/locale/mk/LC_MESSAGES/Sample.po b/plugins/Sample/locale/mk/LC_MESSAGES/Sample.po
index 0c6cc43831..4d43e23db1 100644
--- a/plugins/Sample/locale/mk/LC_MESSAGES/Sample.po
+++ b/plugins/Sample/locale/mk/LC_MESSAGES/Sample.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Sample\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:20+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:53+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:27:21+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:28:23+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-sample\n"
@@ -35,15 +35,15 @@ msgstr "Не можев да го зачувам бројот на поздра
 msgid "Could not increment greeting count for %d."
 msgstr "Не можев да го дополнам бројот на поздрави за %d."
 
-#: SamplePlugin.php:259 hello.php:111
+#: SamplePlugin.php:270 hello.php:111
 msgid "Hello"
 msgstr "Здраво"
 
-#: SamplePlugin.php:259
+#: SamplePlugin.php:270
 msgid "A warm greeting"
 msgstr "Срдечен поздрав"
 
-#: SamplePlugin.php:270
+#: SamplePlugin.php:281
 msgid "A sample plugin to show basics of development for new hackers."
 msgstr ""
 "Приклучок-пример за основите на развојното програмирање за нови хакери."
diff --git a/plugins/Sample/locale/nl/LC_MESSAGES/Sample.po b/plugins/Sample/locale/nl/LC_MESSAGES/Sample.po
index 58d4fc3b0b..d0da1a36a5 100644
--- a/plugins/Sample/locale/nl/LC_MESSAGES/Sample.po
+++ b/plugins/Sample/locale/nl/LC_MESSAGES/Sample.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Sample\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:20+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:53+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:27:21+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:28:23+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-sample\n"
@@ -35,15 +35,15 @@ msgstr "Het was niet mogelijk het aantal begroetingen op te slaan voor %d."
 msgid "Could not increment greeting count for %d."
 msgstr "Het was niet mogelijk het aantal begroetingen op te hogen voor %d."
 
-#: SamplePlugin.php:259 hello.php:111
+#: SamplePlugin.php:270 hello.php:111
 msgid "Hello"
 msgstr "Hallo"
 
-#: SamplePlugin.php:259
+#: SamplePlugin.php:270
 msgid "A warm greeting"
 msgstr "Een warme begroeting"
 
-#: SamplePlugin.php:270
+#: SamplePlugin.php:281
 msgid "A sample plugin to show basics of development for new hackers."
 msgstr ""
 "Een voorbeeldplug-in als basis voor ontwikkelingen door nieuwe hackers."
diff --git a/plugins/Sample/locale/ru/LC_MESSAGES/Sample.po b/plugins/Sample/locale/ru/LC_MESSAGES/Sample.po
index 93ed517321..cecf620f0c 100644
--- a/plugins/Sample/locale/ru/LC_MESSAGES/Sample.po
+++ b/plugins/Sample/locale/ru/LC_MESSAGES/Sample.po
@@ -10,13 +10,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Sample\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:20+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:53+0000\n"
 "Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:27:21+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:28:23+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-sample\n"
@@ -37,15 +37,15 @@ msgstr "Не удалось сохранить новое приветствие
 msgid "Could not increment greeting count for %d."
 msgstr ""
 
-#: SamplePlugin.php:259 hello.php:111
+#: SamplePlugin.php:270 hello.php:111
 msgid "Hello"
 msgstr "Привет"
 
-#: SamplePlugin.php:259
+#: SamplePlugin.php:270
 msgid "A warm greeting"
 msgstr ""
 
-#: SamplePlugin.php:270
+#: SamplePlugin.php:281
 msgid "A sample plugin to show basics of development for new hackers."
 msgstr ""
 
diff --git a/plugins/Sample/locale/tl/LC_MESSAGES/Sample.po b/plugins/Sample/locale/tl/LC_MESSAGES/Sample.po
index 9da38e48f3..5bb224ac76 100644
--- a/plugins/Sample/locale/tl/LC_MESSAGES/Sample.po
+++ b/plugins/Sample/locale/tl/LC_MESSAGES/Sample.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Sample\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:20+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:53+0000\n"
 "Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:27:21+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:28:23+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-sample\n"
@@ -35,15 +35,15 @@ msgstr "Hindi masagip ang bagong bilang ng pagbati para sa %d."
 msgid "Could not increment greeting count for %d."
 msgstr "Hindi masudlungan ang bilang ng pagbati para sa %d."
 
-#: SamplePlugin.php:259 hello.php:111
+#: SamplePlugin.php:270 hello.php:111
 msgid "Hello"
 msgstr "Kumusta"
 
-#: SamplePlugin.php:259
+#: SamplePlugin.php:270
 msgid "A warm greeting"
 msgstr "Isang mainit-init na pagbati"
 
-#: SamplePlugin.php:270
+#: SamplePlugin.php:281
 msgid "A sample plugin to show basics of development for new hackers."
 msgstr ""
 "Isang halimbawang pampasak upang ipakita ang mga saligan ng kaunlaran para "
diff --git a/plugins/Sample/locale/uk/LC_MESSAGES/Sample.po b/plugins/Sample/locale/uk/LC_MESSAGES/Sample.po
index 29b133c7ac..a1209c8b62 100644
--- a/plugins/Sample/locale/uk/LC_MESSAGES/Sample.po
+++ b/plugins/Sample/locale/uk/LC_MESSAGES/Sample.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Sample\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:20+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:53+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:27:21+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:28:23+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-sample\n"
@@ -36,15 +36,15 @@ msgstr "Не вдалося зберегти новий лічильник пр
 msgid "Could not increment greeting count for %d."
 msgstr "Не вдалося перерахувати лічильник привітань для %d."
 
-#: SamplePlugin.php:259 hello.php:111
+#: SamplePlugin.php:270 hello.php:111
 msgid "Hello"
 msgstr "Привіт"
 
-#: SamplePlugin.php:259
+#: SamplePlugin.php:270
 msgid "A warm greeting"
 msgstr "Щирі вітання"
 
-#: SamplePlugin.php:270
+#: SamplePlugin.php:281
 msgid "A sample plugin to show basics of development for new hackers."
 msgstr "Приклад додатку для демонстрації основ розробки новим гакерам."
 
diff --git a/plugins/Sample/locale/zh_CN/LC_MESSAGES/Sample.po b/plugins/Sample/locale/zh_CN/LC_MESSAGES/Sample.po
index 0255e7f6d7..a50a8d8fb1 100644
--- a/plugins/Sample/locale/zh_CN/LC_MESSAGES/Sample.po
+++ b/plugins/Sample/locale/zh_CN/LC_MESSAGES/Sample.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Sample\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:20+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:53+0000\n"
 "Language-Team: Simplified Chinese <http://translatewiki.net/wiki/Portal:zh-"
 "hans>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:27:21+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:28:23+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-sample\n"
@@ -36,15 +36,15 @@ msgstr "无法保存%d新的问候计数。"
 msgid "Could not increment greeting count for %d."
 msgstr "无法增加%d的问候计数。"
 
-#: SamplePlugin.php:259 hello.php:111
+#: SamplePlugin.php:270 hello.php:111
 msgid "Hello"
 msgstr "你好"
 
-#: SamplePlugin.php:259
+#: SamplePlugin.php:270
 msgid "A warm greeting"
 msgstr "一个热情的问候"
 
-#: SamplePlugin.php:270
+#: SamplePlugin.php:281
 msgid "A sample plugin to show basics of development for new hackers."
 msgstr "一个为新的 hackers 显示基础开发的示例插件。"
 
diff --git a/plugins/ShareNotice/locale/ShareNotice.pot b/plugins/ShareNotice/locale/ShareNotice.pot
index 8b70031faa..a1bbabf296 100644
--- a/plugins/ShareNotice/locale/ShareNotice.pot
+++ b/plugins/ShareNotice/locale/ShareNotice.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/ShareNotice/locale/br/LC_MESSAGES/ShareNotice.po b/plugins/ShareNotice/locale/br/LC_MESSAGES/ShareNotice.po
index 6a03590ef0..d85b76bfa2 100644
--- a/plugins/ShareNotice/locale/br/LC_MESSAGES/ShareNotice.po
+++ b/plugins/ShareNotice/locale/br/LC_MESSAGES/ShareNotice.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ShareNotice\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:21+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:54+0000\n"
 "Language-Team: Breton <http://translatewiki.net/wiki/Portal:br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:25+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:28:24+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-sharenotice\n"
diff --git a/plugins/ShareNotice/locale/ca/LC_MESSAGES/ShareNotice.po b/plugins/ShareNotice/locale/ca/LC_MESSAGES/ShareNotice.po
index d50ff1b56c..8ddfa69819 100644
--- a/plugins/ShareNotice/locale/ca/LC_MESSAGES/ShareNotice.po
+++ b/plugins/ShareNotice/locale/ca/LC_MESSAGES/ShareNotice.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ShareNotice\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:21+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:54+0000\n"
 "Language-Team: Catalan <http://translatewiki.net/wiki/Portal:ca>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:25+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:28:24+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ca\n"
 "X-Message-Group: #out-statusnet-plugin-sharenotice\n"
diff --git a/plugins/ShareNotice/locale/de/LC_MESSAGES/ShareNotice.po b/plugins/ShareNotice/locale/de/LC_MESSAGES/ShareNotice.po
index 3775f4536b..c940aa6edd 100644
--- a/plugins/ShareNotice/locale/de/LC_MESSAGES/ShareNotice.po
+++ b/plugins/ShareNotice/locale/de/LC_MESSAGES/ShareNotice.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ShareNotice\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:21+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:54+0000\n"
 "Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:25+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:28:24+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-sharenotice\n"
diff --git a/plugins/ShareNotice/locale/fr/LC_MESSAGES/ShareNotice.po b/plugins/ShareNotice/locale/fr/LC_MESSAGES/ShareNotice.po
index 23aff854c8..6a56078243 100644
--- a/plugins/ShareNotice/locale/fr/LC_MESSAGES/ShareNotice.po
+++ b/plugins/ShareNotice/locale/fr/LC_MESSAGES/ShareNotice.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ShareNotice\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:21+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:54+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:25+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:28:24+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-sharenotice\n"
diff --git a/plugins/ShareNotice/locale/ia/LC_MESSAGES/ShareNotice.po b/plugins/ShareNotice/locale/ia/LC_MESSAGES/ShareNotice.po
index a393f975fe..3701273edd 100644
--- a/plugins/ShareNotice/locale/ia/LC_MESSAGES/ShareNotice.po
+++ b/plugins/ShareNotice/locale/ia/LC_MESSAGES/ShareNotice.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ShareNotice\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:21+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:54+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:25+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:28:24+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-sharenotice\n"
diff --git a/plugins/ShareNotice/locale/mk/LC_MESSAGES/ShareNotice.po b/plugins/ShareNotice/locale/mk/LC_MESSAGES/ShareNotice.po
index a6d1a8d74b..976c2e97f4 100644
--- a/plugins/ShareNotice/locale/mk/LC_MESSAGES/ShareNotice.po
+++ b/plugins/ShareNotice/locale/mk/LC_MESSAGES/ShareNotice.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ShareNotice\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:21+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:54+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:25+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:28:24+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-sharenotice\n"
diff --git a/plugins/ShareNotice/locale/nl/LC_MESSAGES/ShareNotice.po b/plugins/ShareNotice/locale/nl/LC_MESSAGES/ShareNotice.po
index ac88030296..fc05170ae0 100644
--- a/plugins/ShareNotice/locale/nl/LC_MESSAGES/ShareNotice.po
+++ b/plugins/ShareNotice/locale/nl/LC_MESSAGES/ShareNotice.po
@@ -10,13 +10,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ShareNotice\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:21+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:54+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:25+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:28:24+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-sharenotice\n"
diff --git a/plugins/ShareNotice/locale/tl/LC_MESSAGES/ShareNotice.po b/plugins/ShareNotice/locale/tl/LC_MESSAGES/ShareNotice.po
index 7086b5fe58..8be749ef27 100644
--- a/plugins/ShareNotice/locale/tl/LC_MESSAGES/ShareNotice.po
+++ b/plugins/ShareNotice/locale/tl/LC_MESSAGES/ShareNotice.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ShareNotice\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:21+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:54+0000\n"
 "Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:25+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:28:24+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-sharenotice\n"
diff --git a/plugins/ShareNotice/locale/uk/LC_MESSAGES/ShareNotice.po b/plugins/ShareNotice/locale/uk/LC_MESSAGES/ShareNotice.po
index 1b89f9d369..a669984d0c 100644
--- a/plugins/ShareNotice/locale/uk/LC_MESSAGES/ShareNotice.po
+++ b/plugins/ShareNotice/locale/uk/LC_MESSAGES/ShareNotice.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ShareNotice\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:21+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:54+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:25+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:28:24+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-sharenotice\n"
diff --git a/plugins/SimpleUrl/locale/SimpleUrl.pot b/plugins/SimpleUrl/locale/SimpleUrl.pot
index 619ccab506..d75df682c7 100644
--- a/plugins/SimpleUrl/locale/SimpleUrl.pot
+++ b/plugins/SimpleUrl/locale/SimpleUrl.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: SimpleUrlPlugin.php:58
+#: SimpleUrlPlugin.php:56
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr ""
diff --git a/plugins/SimpleUrl/locale/br/LC_MESSAGES/SimpleUrl.po b/plugins/SimpleUrl/locale/br/LC_MESSAGES/SimpleUrl.po
index 377f6ad1dd..b8b7dc37ff 100644
--- a/plugins/SimpleUrl/locale/br/LC_MESSAGES/SimpleUrl.po
+++ b/plugins/SimpleUrl/locale/br/LC_MESSAGES/SimpleUrl.po
@@ -9,19 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SimpleUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:22+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:54+0000\n"
 "Language-Team: Breton <http://translatewiki.net/wiki/Portal:br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:26+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:28:26+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-simpleurl\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: SimpleUrlPlugin.php:58
+#: SimpleUrlPlugin.php:56
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr ""
diff --git a/plugins/SimpleUrl/locale/de/LC_MESSAGES/SimpleUrl.po b/plugins/SimpleUrl/locale/de/LC_MESSAGES/SimpleUrl.po
index 611a0033ce..161eb788dc 100644
--- a/plugins/SimpleUrl/locale/de/LC_MESSAGES/SimpleUrl.po
+++ b/plugins/SimpleUrl/locale/de/LC_MESSAGES/SimpleUrl.po
@@ -9,19 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SimpleUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:22+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:54+0000\n"
 "Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:26+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:28:26+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-simpleurl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: SimpleUrlPlugin.php:58
+#: SimpleUrlPlugin.php:56
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr "Benutzung des <a href=\"http://%1$s/\">%1$s</a>-URL-Kürzungsdienstes."
diff --git a/plugins/SimpleUrl/locale/es/LC_MESSAGES/SimpleUrl.po b/plugins/SimpleUrl/locale/es/LC_MESSAGES/SimpleUrl.po
index b598251c20..f408784173 100644
--- a/plugins/SimpleUrl/locale/es/LC_MESSAGES/SimpleUrl.po
+++ b/plugins/SimpleUrl/locale/es/LC_MESSAGES/SimpleUrl.po
@@ -9,19 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SimpleUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:22+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:54+0000\n"
 "Language-Team: Spanish <http://translatewiki.net/wiki/Portal:es>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:26+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:28:26+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-simpleurl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: SimpleUrlPlugin.php:58
+#: SimpleUrlPlugin.php:56
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr ""
diff --git a/plugins/SimpleUrl/locale/fr/LC_MESSAGES/SimpleUrl.po b/plugins/SimpleUrl/locale/fr/LC_MESSAGES/SimpleUrl.po
index f2f4557ac7..a0d157b926 100644
--- a/plugins/SimpleUrl/locale/fr/LC_MESSAGES/SimpleUrl.po
+++ b/plugins/SimpleUrl/locale/fr/LC_MESSAGES/SimpleUrl.po
@@ -9,19 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SimpleUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:22+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:54+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:26+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:28:26+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-simpleurl\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: SimpleUrlPlugin.php:58
+#: SimpleUrlPlugin.php:56
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr ""
diff --git a/plugins/SimpleUrl/locale/gl/LC_MESSAGES/SimpleUrl.po b/plugins/SimpleUrl/locale/gl/LC_MESSAGES/SimpleUrl.po
index ba322a1059..b26c8551ca 100644
--- a/plugins/SimpleUrl/locale/gl/LC_MESSAGES/SimpleUrl.po
+++ b/plugins/SimpleUrl/locale/gl/LC_MESSAGES/SimpleUrl.po
@@ -9,19 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SimpleUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:22+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:54+0000\n"
 "Language-Team: Galician <http://translatewiki.net/wiki/Portal:gl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:26+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:28:26+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: gl\n"
 "X-Message-Group: #out-statusnet-plugin-simpleurl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: SimpleUrlPlugin.php:58
+#: SimpleUrlPlugin.php:56
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr ""
diff --git a/plugins/SimpleUrl/locale/he/LC_MESSAGES/SimpleUrl.po b/plugins/SimpleUrl/locale/he/LC_MESSAGES/SimpleUrl.po
index 20e7593339..0464888b73 100644
--- a/plugins/SimpleUrl/locale/he/LC_MESSAGES/SimpleUrl.po
+++ b/plugins/SimpleUrl/locale/he/LC_MESSAGES/SimpleUrl.po
@@ -9,19 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SimpleUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:22+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:54+0000\n"
 "Language-Team: Hebrew <http://translatewiki.net/wiki/Portal:he>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:26+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:28:26+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-plugin-simpleurl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: SimpleUrlPlugin.php:58
+#: SimpleUrlPlugin.php:56
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr "שימוש בשירות קיצור הכתובות <a href=\"http://%1$s/\">%1$s</a>."
diff --git a/plugins/SimpleUrl/locale/ia/LC_MESSAGES/SimpleUrl.po b/plugins/SimpleUrl/locale/ia/LC_MESSAGES/SimpleUrl.po
index 9240485369..7c316f18a7 100644
--- a/plugins/SimpleUrl/locale/ia/LC_MESSAGES/SimpleUrl.po
+++ b/plugins/SimpleUrl/locale/ia/LC_MESSAGES/SimpleUrl.po
@@ -9,19 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SimpleUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:22+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:55+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:26+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:28:26+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-simpleurl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: SimpleUrlPlugin.php:58
+#: SimpleUrlPlugin.php:56
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr ""
diff --git a/plugins/SimpleUrl/locale/id/LC_MESSAGES/SimpleUrl.po b/plugins/SimpleUrl/locale/id/LC_MESSAGES/SimpleUrl.po
index 6d041d853e..e4c4b48fdf 100644
--- a/plugins/SimpleUrl/locale/id/LC_MESSAGES/SimpleUrl.po
+++ b/plugins/SimpleUrl/locale/id/LC_MESSAGES/SimpleUrl.po
@@ -9,19 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SimpleUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:22+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:55+0000\n"
 "Language-Team: Indonesian <http://translatewiki.net/wiki/Portal:id>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:26+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:28:26+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: id\n"
 "X-Message-Group: #out-statusnet-plugin-simpleurl\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: SimpleUrlPlugin.php:58
+#: SimpleUrlPlugin.php:56
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr "Menggunakan layanan pemendek URL <a href=\"http://%1$s/\">%1$s</a>."
diff --git a/plugins/SimpleUrl/locale/ja/LC_MESSAGES/SimpleUrl.po b/plugins/SimpleUrl/locale/ja/LC_MESSAGES/SimpleUrl.po
index 9a0493dc2e..8f781859ed 100644
--- a/plugins/SimpleUrl/locale/ja/LC_MESSAGES/SimpleUrl.po
+++ b/plugins/SimpleUrl/locale/ja/LC_MESSAGES/SimpleUrl.po
@@ -9,19 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SimpleUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:22+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:55+0000\n"
 "Language-Team: Japanese <http://translatewiki.net/wiki/Portal:ja>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:26+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:28:26+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ja\n"
 "X-Message-Group: #out-statusnet-plugin-simpleurl\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: SimpleUrlPlugin.php:58
+#: SimpleUrlPlugin.php:56
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr "<a href=\"http://%1$s/\">%1$s</a>をURL短縮サービスとして利用する。"
diff --git a/plugins/SimpleUrl/locale/mk/LC_MESSAGES/SimpleUrl.po b/plugins/SimpleUrl/locale/mk/LC_MESSAGES/SimpleUrl.po
index e59c7e0e8d..68ff2bb8cc 100644
--- a/plugins/SimpleUrl/locale/mk/LC_MESSAGES/SimpleUrl.po
+++ b/plugins/SimpleUrl/locale/mk/LC_MESSAGES/SimpleUrl.po
@@ -9,19 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SimpleUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:22+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:55+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:26+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:28:26+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-simpleurl\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
 
-#: SimpleUrlPlugin.php:58
+#: SimpleUrlPlugin.php:56
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr ""
diff --git a/plugins/SimpleUrl/locale/nb/LC_MESSAGES/SimpleUrl.po b/plugins/SimpleUrl/locale/nb/LC_MESSAGES/SimpleUrl.po
index 54ff57741d..037ae501ff 100644
--- a/plugins/SimpleUrl/locale/nb/LC_MESSAGES/SimpleUrl.po
+++ b/plugins/SimpleUrl/locale/nb/LC_MESSAGES/SimpleUrl.po
@@ -9,19 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SimpleUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:22+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:55+0000\n"
 "Language-Team: Norwegian (bokmål)‬ <http://translatewiki.net/wiki/Portal:no>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:26+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:28:26+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: #out-statusnet-plugin-simpleurl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: SimpleUrlPlugin.php:58
+#: SimpleUrlPlugin.php:56
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr "Bruker URL-forkortertjenesten <a href=\"http://%1$s/\">%1$s</a>."
diff --git a/plugins/SimpleUrl/locale/nl/LC_MESSAGES/SimpleUrl.po b/plugins/SimpleUrl/locale/nl/LC_MESSAGES/SimpleUrl.po
index 23a6e9e5eb..e08ad1d4aa 100644
--- a/plugins/SimpleUrl/locale/nl/LC_MESSAGES/SimpleUrl.po
+++ b/plugins/SimpleUrl/locale/nl/LC_MESSAGES/SimpleUrl.po
@@ -9,19 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SimpleUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:22+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:55+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:26+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:28:26+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-simpleurl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: SimpleUrlPlugin.php:58
+#: SimpleUrlPlugin.php:56
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr ""
diff --git a/plugins/SimpleUrl/locale/pt/LC_MESSAGES/SimpleUrl.po b/plugins/SimpleUrl/locale/pt/LC_MESSAGES/SimpleUrl.po
index 35c390fad4..e02cf8320b 100644
--- a/plugins/SimpleUrl/locale/pt/LC_MESSAGES/SimpleUrl.po
+++ b/plugins/SimpleUrl/locale/pt/LC_MESSAGES/SimpleUrl.po
@@ -9,19 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SimpleUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:22+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:55+0000\n"
 "Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:26+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:28:26+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-plugin-simpleurl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: SimpleUrlPlugin.php:58
+#: SimpleUrlPlugin.php:56
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr "Usa o serviço de abreviação de URLs <a href=\"http://%1$s/\">%1$s</a>."
diff --git a/plugins/SimpleUrl/locale/ru/LC_MESSAGES/SimpleUrl.po b/plugins/SimpleUrl/locale/ru/LC_MESSAGES/SimpleUrl.po
index 1cc402f2c0..db579ddd05 100644
--- a/plugins/SimpleUrl/locale/ru/LC_MESSAGES/SimpleUrl.po
+++ b/plugins/SimpleUrl/locale/ru/LC_MESSAGES/SimpleUrl.po
@@ -9,20 +9,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SimpleUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:22+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:55+0000\n"
 "Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:26+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:28:26+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-simpleurl\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: SimpleUrlPlugin.php:58
+#: SimpleUrlPlugin.php:56
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr "Использование службы сокращения URL <a href=\"http://%1$s/\">%1$s</a>."
diff --git a/plugins/SimpleUrl/locale/tl/LC_MESSAGES/SimpleUrl.po b/plugins/SimpleUrl/locale/tl/LC_MESSAGES/SimpleUrl.po
index cc8d9b6969..f4568ab003 100644
--- a/plugins/SimpleUrl/locale/tl/LC_MESSAGES/SimpleUrl.po
+++ b/plugins/SimpleUrl/locale/tl/LC_MESSAGES/SimpleUrl.po
@@ -9,19 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SimpleUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:22+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:55+0000\n"
 "Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:26+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:28:26+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-simpleurl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: SimpleUrlPlugin.php:58
+#: SimpleUrlPlugin.php:56
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr ""
diff --git a/plugins/SimpleUrl/locale/uk/LC_MESSAGES/SimpleUrl.po b/plugins/SimpleUrl/locale/uk/LC_MESSAGES/SimpleUrl.po
index 7eb81e90cc..a155748315 100644
--- a/plugins/SimpleUrl/locale/uk/LC_MESSAGES/SimpleUrl.po
+++ b/plugins/SimpleUrl/locale/uk/LC_MESSAGES/SimpleUrl.po
@@ -9,20 +9,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SimpleUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:22+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:55+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:26+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:28:26+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-simpleurl\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: SimpleUrlPlugin.php:58
+#: SimpleUrlPlugin.php:56
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr ""
diff --git a/plugins/Sitemap/locale/Sitemap.pot b/plugins/Sitemap/locale/Sitemap.pot
index dd93aec724..142406585b 100644
--- a/plugins/Sitemap/locale/Sitemap.pot
+++ b/plugins/Sitemap/locale/Sitemap.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/Sitemap/locale/br/LC_MESSAGES/Sitemap.po b/plugins/Sitemap/locale/br/LC_MESSAGES/Sitemap.po
index 12a732a15b..9e57dc248e 100644
--- a/plugins/Sitemap/locale/br/LC_MESSAGES/Sitemap.po
+++ b/plugins/Sitemap/locale/br/LC_MESSAGES/Sitemap.po
@@ -10,13 +10,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Sitemap\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:23+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:56+0000\n"
 "Language-Team: Breton <http://translatewiki.net/wiki/Portal:br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 23:54:28+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-02-14 17:22:07+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-sitemap\n"
diff --git a/plugins/Sitemap/locale/de/LC_MESSAGES/Sitemap.po b/plugins/Sitemap/locale/de/LC_MESSAGES/Sitemap.po
index 4c482fd9da..890e989b8b 100644
--- a/plugins/Sitemap/locale/de/LC_MESSAGES/Sitemap.po
+++ b/plugins/Sitemap/locale/de/LC_MESSAGES/Sitemap.po
@@ -10,13 +10,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Sitemap\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-14 16:01+0000\n"
-"PO-Revision-Date: 2011-02-14 16:10:09+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:56+0000\n"
 "Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:28:26+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r82114); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-02-14 17:22:07+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-sitemap\n"
diff --git a/plugins/Sitemap/locale/fr/LC_MESSAGES/Sitemap.po b/plugins/Sitemap/locale/fr/LC_MESSAGES/Sitemap.po
index 19d1de0e91..5dcd13ff78 100644
--- a/plugins/Sitemap/locale/fr/LC_MESSAGES/Sitemap.po
+++ b/plugins/Sitemap/locale/fr/LC_MESSAGES/Sitemap.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Sitemap\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:23+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:56+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 23:54:28+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-02-14 17:22:07+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-sitemap\n"
diff --git a/plugins/Sitemap/locale/ia/LC_MESSAGES/Sitemap.po b/plugins/Sitemap/locale/ia/LC_MESSAGES/Sitemap.po
index c1973385c7..de14e52422 100644
--- a/plugins/Sitemap/locale/ia/LC_MESSAGES/Sitemap.po
+++ b/plugins/Sitemap/locale/ia/LC_MESSAGES/Sitemap.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Sitemap\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:23+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:56+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 23:54:28+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-02-14 17:22:07+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-sitemap\n"
diff --git a/plugins/Sitemap/locale/mk/LC_MESSAGES/Sitemap.po b/plugins/Sitemap/locale/mk/LC_MESSAGES/Sitemap.po
index ac4d5021a9..95ed335ff4 100644
--- a/plugins/Sitemap/locale/mk/LC_MESSAGES/Sitemap.po
+++ b/plugins/Sitemap/locale/mk/LC_MESSAGES/Sitemap.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Sitemap\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:23+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:56+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 23:54:28+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-02-14 17:22:07+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-sitemap\n"
diff --git a/plugins/Sitemap/locale/nl/LC_MESSAGES/Sitemap.po b/plugins/Sitemap/locale/nl/LC_MESSAGES/Sitemap.po
index b671507e8c..128f5cb72d 100644
--- a/plugins/Sitemap/locale/nl/LC_MESSAGES/Sitemap.po
+++ b/plugins/Sitemap/locale/nl/LC_MESSAGES/Sitemap.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Sitemap\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:24+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:56+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 23:54:28+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-02-14 17:22:07+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-sitemap\n"
diff --git a/plugins/Sitemap/locale/ru/LC_MESSAGES/Sitemap.po b/plugins/Sitemap/locale/ru/LC_MESSAGES/Sitemap.po
index 102e7a03ae..3c3a31414d 100644
--- a/plugins/Sitemap/locale/ru/LC_MESSAGES/Sitemap.po
+++ b/plugins/Sitemap/locale/ru/LC_MESSAGES/Sitemap.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Sitemap\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:24+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:56+0000\n"
 "Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 23:54:28+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-02-14 17:22:07+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-sitemap\n"
diff --git a/plugins/Sitemap/locale/tl/LC_MESSAGES/Sitemap.po b/plugins/Sitemap/locale/tl/LC_MESSAGES/Sitemap.po
index 9fc3515525..f3d33006cb 100644
--- a/plugins/Sitemap/locale/tl/LC_MESSAGES/Sitemap.po
+++ b/plugins/Sitemap/locale/tl/LC_MESSAGES/Sitemap.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Sitemap\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:24+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:56+0000\n"
 "Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 23:54:28+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-02-14 17:22:07+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-sitemap\n"
diff --git a/plugins/Sitemap/locale/uk/LC_MESSAGES/Sitemap.po b/plugins/Sitemap/locale/uk/LC_MESSAGES/Sitemap.po
index f3a66ab27f..2505524903 100644
--- a/plugins/Sitemap/locale/uk/LC_MESSAGES/Sitemap.po
+++ b/plugins/Sitemap/locale/uk/LC_MESSAGES/Sitemap.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Sitemap\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:24+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:56+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 23:54:28+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-02-14 17:22:07+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-sitemap\n"
diff --git a/plugins/SlicedFavorites/locale/SlicedFavorites.pot b/plugins/SlicedFavorites/locale/SlicedFavorites.pot
index 7a4653f187..5e6912450e 100644
--- a/plugins/SlicedFavorites/locale/SlicedFavorites.pot
+++ b/plugins/SlicedFavorites/locale/SlicedFavorites.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/SlicedFavorites/locale/de/LC_MESSAGES/SlicedFavorites.po b/plugins/SlicedFavorites/locale/de/LC_MESSAGES/SlicedFavorites.po
index 52e0713dd5..661e6bab1c 100644
--- a/plugins/SlicedFavorites/locale/de/LC_MESSAGES/SlicedFavorites.po
+++ b/plugins/SlicedFavorites/locale/de/LC_MESSAGES/SlicedFavorites.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SlicedFavorites\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-14 16:01+0000\n"
-"PO-Revision-Date: 2011-02-14 16:10:10+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:56+0000\n"
 "Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:28:27+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r82114); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-02-14 17:22:08+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-slicedfavorites\n"
diff --git a/plugins/SlicedFavorites/locale/fr/LC_MESSAGES/SlicedFavorites.po b/plugins/SlicedFavorites/locale/fr/LC_MESSAGES/SlicedFavorites.po
index d0e4570908..5ec335d54b 100644
--- a/plugins/SlicedFavorites/locale/fr/LC_MESSAGES/SlicedFavorites.po
+++ b/plugins/SlicedFavorites/locale/fr/LC_MESSAGES/SlicedFavorites.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SlicedFavorites\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:24+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:56+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:27:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-02-14 17:22:08+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-slicedfavorites\n"
diff --git a/plugins/SlicedFavorites/locale/he/LC_MESSAGES/SlicedFavorites.po b/plugins/SlicedFavorites/locale/he/LC_MESSAGES/SlicedFavorites.po
index a6e8b9b99c..67e4130f48 100644
--- a/plugins/SlicedFavorites/locale/he/LC_MESSAGES/SlicedFavorites.po
+++ b/plugins/SlicedFavorites/locale/he/LC_MESSAGES/SlicedFavorites.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SlicedFavorites\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:24+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:56+0000\n"
 "Language-Team: Hebrew <http://translatewiki.net/wiki/Portal:he>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:27:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-02-14 17:22:08+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-plugin-slicedfavorites\n"
diff --git a/plugins/SlicedFavorites/locale/ia/LC_MESSAGES/SlicedFavorites.po b/plugins/SlicedFavorites/locale/ia/LC_MESSAGES/SlicedFavorites.po
index b6ae67bc72..d129160ef3 100644
--- a/plugins/SlicedFavorites/locale/ia/LC_MESSAGES/SlicedFavorites.po
+++ b/plugins/SlicedFavorites/locale/ia/LC_MESSAGES/SlicedFavorites.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SlicedFavorites\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:24+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:56+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:27:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-02-14 17:22:08+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-slicedfavorites\n"
diff --git a/plugins/SlicedFavorites/locale/id/LC_MESSAGES/SlicedFavorites.po b/plugins/SlicedFavorites/locale/id/LC_MESSAGES/SlicedFavorites.po
index 60260aa298..0c0b8651b1 100644
--- a/plugins/SlicedFavorites/locale/id/LC_MESSAGES/SlicedFavorites.po
+++ b/plugins/SlicedFavorites/locale/id/LC_MESSAGES/SlicedFavorites.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SlicedFavorites\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:24+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:56+0000\n"
 "Language-Team: Indonesian <http://translatewiki.net/wiki/Portal:id>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:27:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-02-14 17:22:08+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: id\n"
 "X-Message-Group: #out-statusnet-plugin-slicedfavorites\n"
diff --git a/plugins/SlicedFavorites/locale/mk/LC_MESSAGES/SlicedFavorites.po b/plugins/SlicedFavorites/locale/mk/LC_MESSAGES/SlicedFavorites.po
index 91082170b7..c7634d1b04 100644
--- a/plugins/SlicedFavorites/locale/mk/LC_MESSAGES/SlicedFavorites.po
+++ b/plugins/SlicedFavorites/locale/mk/LC_MESSAGES/SlicedFavorites.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SlicedFavorites\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:24+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:56+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:27:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-02-14 17:22:08+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-slicedfavorites\n"
diff --git a/plugins/SlicedFavorites/locale/nl/LC_MESSAGES/SlicedFavorites.po b/plugins/SlicedFavorites/locale/nl/LC_MESSAGES/SlicedFavorites.po
index a0953c6b52..26bf1f4780 100644
--- a/plugins/SlicedFavorites/locale/nl/LC_MESSAGES/SlicedFavorites.po
+++ b/plugins/SlicedFavorites/locale/nl/LC_MESSAGES/SlicedFavorites.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SlicedFavorites\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:24+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:56+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:27:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-02-14 17:22:08+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-slicedfavorites\n"
diff --git a/plugins/SlicedFavorites/locale/ru/LC_MESSAGES/SlicedFavorites.po b/plugins/SlicedFavorites/locale/ru/LC_MESSAGES/SlicedFavorites.po
index d9b1f50aab..e26c3aa0bf 100644
--- a/plugins/SlicedFavorites/locale/ru/LC_MESSAGES/SlicedFavorites.po
+++ b/plugins/SlicedFavorites/locale/ru/LC_MESSAGES/SlicedFavorites.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SlicedFavorites\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:24+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:56+0000\n"
 "Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:27:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-02-14 17:22:08+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-slicedfavorites\n"
diff --git a/plugins/SlicedFavorites/locale/tl/LC_MESSAGES/SlicedFavorites.po b/plugins/SlicedFavorites/locale/tl/LC_MESSAGES/SlicedFavorites.po
index c2f9c395a1..ed9b1df3ec 100644
--- a/plugins/SlicedFavorites/locale/tl/LC_MESSAGES/SlicedFavorites.po
+++ b/plugins/SlicedFavorites/locale/tl/LC_MESSAGES/SlicedFavorites.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SlicedFavorites\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:24+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:56+0000\n"
 "Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:27:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-02-14 17:22:08+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-slicedfavorites\n"
diff --git a/plugins/SlicedFavorites/locale/uk/LC_MESSAGES/SlicedFavorites.po b/plugins/SlicedFavorites/locale/uk/LC_MESSAGES/SlicedFavorites.po
index 874656dd0e..cc08b9b994 100644
--- a/plugins/SlicedFavorites/locale/uk/LC_MESSAGES/SlicedFavorites.po
+++ b/plugins/SlicedFavorites/locale/uk/LC_MESSAGES/SlicedFavorites.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SlicedFavorites\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:24+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:56+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:27:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-02-14 17:22:08+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-slicedfavorites\n"
diff --git a/plugins/SphinxSearch/locale/SphinxSearch.pot b/plugins/SphinxSearch/locale/SphinxSearch.pot
index 2e7cd22704..977547f73c 100644
--- a/plugins/SphinxSearch/locale/SphinxSearch.pot
+++ b/plugins/SphinxSearch/locale/SphinxSearch.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/SphinxSearch/locale/de/LC_MESSAGES/SphinxSearch.po b/plugins/SphinxSearch/locale/de/LC_MESSAGES/SphinxSearch.po
index 0fbfb5b411..2b49580dd1 100644
--- a/plugins/SphinxSearch/locale/de/LC_MESSAGES/SphinxSearch.po
+++ b/plugins/SphinxSearch/locale/de/LC_MESSAGES/SphinxSearch.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SphinxSearch\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-14 16:01+0000\n"
-"PO-Revision-Date: 2011-02-14 16:10:11+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:57+0000\n"
 "Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:28:30+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r82114); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-02-14 17:22:09+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-sphinxsearch\n"
diff --git a/plugins/SphinxSearch/locale/fr/LC_MESSAGES/SphinxSearch.po b/plugins/SphinxSearch/locale/fr/LC_MESSAGES/SphinxSearch.po
index 164095c42a..eb3da48b50 100644
--- a/plugins/SphinxSearch/locale/fr/LC_MESSAGES/SphinxSearch.po
+++ b/plugins/SphinxSearch/locale/fr/LC_MESSAGES/SphinxSearch.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SphinxSearch\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:25+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:57+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:27:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-02-14 17:22:09+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-sphinxsearch\n"
diff --git a/plugins/SphinxSearch/locale/ia/LC_MESSAGES/SphinxSearch.po b/plugins/SphinxSearch/locale/ia/LC_MESSAGES/SphinxSearch.po
index 417a9a5dcc..35b4d81481 100644
--- a/plugins/SphinxSearch/locale/ia/LC_MESSAGES/SphinxSearch.po
+++ b/plugins/SphinxSearch/locale/ia/LC_MESSAGES/SphinxSearch.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SphinxSearch\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:25+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:57+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:27:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-02-14 17:22:09+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-sphinxsearch\n"
diff --git a/plugins/SphinxSearch/locale/mk/LC_MESSAGES/SphinxSearch.po b/plugins/SphinxSearch/locale/mk/LC_MESSAGES/SphinxSearch.po
index 375efdbf63..fba5987035 100644
--- a/plugins/SphinxSearch/locale/mk/LC_MESSAGES/SphinxSearch.po
+++ b/plugins/SphinxSearch/locale/mk/LC_MESSAGES/SphinxSearch.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SphinxSearch\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:25+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:27:57+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:27:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-02-14 17:22:09+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-sphinxsearch\n"
diff --git a/plugins/SphinxSearch/locale/nl/LC_MESSAGES/SphinxSearch.po b/plugins/SphinxSearch/locale/nl/LC_MESSAGES/SphinxSearch.po
index fa92094718..01db579045 100644
--- a/plugins/SphinxSearch/locale/nl/LC_MESSAGES/SphinxSearch.po
+++ b/plugins/SphinxSearch/locale/nl/LC_MESSAGES/SphinxSearch.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SphinxSearch\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:25+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:00+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:27:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-02-14 17:22:09+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-sphinxsearch\n"
diff --git a/plugins/SphinxSearch/locale/ru/LC_MESSAGES/SphinxSearch.po b/plugins/SphinxSearch/locale/ru/LC_MESSAGES/SphinxSearch.po
index e8d8199a0a..b43b59fea2 100644
--- a/plugins/SphinxSearch/locale/ru/LC_MESSAGES/SphinxSearch.po
+++ b/plugins/SphinxSearch/locale/ru/LC_MESSAGES/SphinxSearch.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SphinxSearch\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:25+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:03+0000\n"
 "Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:27:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-02-14 17:22:09+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-sphinxsearch\n"
diff --git a/plugins/SphinxSearch/locale/tl/LC_MESSAGES/SphinxSearch.po b/plugins/SphinxSearch/locale/tl/LC_MESSAGES/SphinxSearch.po
index 3ad2f5b44c..c1fa820bd8 100644
--- a/plugins/SphinxSearch/locale/tl/LC_MESSAGES/SphinxSearch.po
+++ b/plugins/SphinxSearch/locale/tl/LC_MESSAGES/SphinxSearch.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SphinxSearch\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:25+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:03+0000\n"
 "Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:27:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-02-14 17:22:09+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-sphinxsearch\n"
diff --git a/plugins/SphinxSearch/locale/uk/LC_MESSAGES/SphinxSearch.po b/plugins/SphinxSearch/locale/uk/LC_MESSAGES/SphinxSearch.po
index 772b593170..245d5d14e4 100644
--- a/plugins/SphinxSearch/locale/uk/LC_MESSAGES/SphinxSearch.po
+++ b/plugins/SphinxSearch/locale/uk/LC_MESSAGES/SphinxSearch.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SphinxSearch\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:25+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:03+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:27:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-02-14 17:22:09+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-sphinxsearch\n"
diff --git a/plugins/StrictTransportSecurity/locale/StrictTransportSecurity.pot b/plugins/StrictTransportSecurity/locale/StrictTransportSecurity.pot
new file mode 100644
index 0000000000..8b5836eb3e
--- /dev/null
+++ b/plugins/StrictTransportSecurity/locale/StrictTransportSecurity.pot
@@ -0,0 +1,23 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: StrictTransportSecurityPlugin.php:59
+msgid ""
+"The Strict Transport Security plugin implements the Strict Transport "
+"Security header, improving the security of HTTPS only sites."
+msgstr ""
diff --git a/plugins/SubMirror/locale/SubMirror.pot b/plugins/SubMirror/locale/SubMirror.pot
index 6d67b02526..2c331f21bc 100644
--- a/plugins/SubMirror/locale/SubMirror.pot
+++ b/plugins/SubMirror/locale/SubMirror.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/SubMirror/locale/de/LC_MESSAGES/SubMirror.po b/plugins/SubMirror/locale/de/LC_MESSAGES/SubMirror.po
index 6d6036e465..07d1c2a376 100644
--- a/plugins/SubMirror/locale/de/LC_MESSAGES/SubMirror.po
+++ b/plugins/SubMirror/locale/de/LC_MESSAGES/SubMirror.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SubMirror\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-14 16:01+0000\n"
-"PO-Revision-Date: 2011-02-14 16:10:15+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:05+0000\n"
 "Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-30 23:08:44+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r82114); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-02-14 17:22:11+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-submirror\n"
diff --git a/plugins/SubMirror/locale/fr/LC_MESSAGES/SubMirror.po b/plugins/SubMirror/locale/fr/LC_MESSAGES/SubMirror.po
index 4075cb55af..2933870198 100644
--- a/plugins/SubMirror/locale/fr/LC_MESSAGES/SubMirror.po
+++ b/plugins/SubMirror/locale/fr/LC_MESSAGES/SubMirror.po
@@ -10,13 +10,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SubMirror\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-14 16:01+0000\n"
-"PO-Revision-Date: 2011-02-14 16:10:15+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:05+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-30 23:08:44+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r82114); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-02-14 17:22:11+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-submirror\n"
diff --git a/plugins/SubMirror/locale/ia/LC_MESSAGES/SubMirror.po b/plugins/SubMirror/locale/ia/LC_MESSAGES/SubMirror.po
index 7c93ce7168..48fa001c4b 100644
--- a/plugins/SubMirror/locale/ia/LC_MESSAGES/SubMirror.po
+++ b/plugins/SubMirror/locale/ia/LC_MESSAGES/SubMirror.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SubMirror\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-30 22:50+0000\n"
-"PO-Revision-Date: 2011-01-30 22:54:21+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:05+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:28:47+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81224); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-02-14 17:22:11+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-submirror\n"
diff --git a/plugins/SubMirror/locale/mk/LC_MESSAGES/SubMirror.po b/plugins/SubMirror/locale/mk/LC_MESSAGES/SubMirror.po
index 9629c5bca4..208fd8db5b 100644
--- a/plugins/SubMirror/locale/mk/LC_MESSAGES/SubMirror.po
+++ b/plugins/SubMirror/locale/mk/LC_MESSAGES/SubMirror.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SubMirror\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-30 22:50+0000\n"
-"PO-Revision-Date: 2011-01-30 22:54:21+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:05+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:28:47+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81224); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-02-14 17:22:11+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-submirror\n"
diff --git a/plugins/SubMirror/locale/nl/LC_MESSAGES/SubMirror.po b/plugins/SubMirror/locale/nl/LC_MESSAGES/SubMirror.po
index 679e2bcefd..e603027c02 100644
--- a/plugins/SubMirror/locale/nl/LC_MESSAGES/SubMirror.po
+++ b/plugins/SubMirror/locale/nl/LC_MESSAGES/SubMirror.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SubMirror\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-30 22:50+0000\n"
-"PO-Revision-Date: 2011-01-30 22:54:21+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:05+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:28:47+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81224); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-02-14 17:22:11+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-submirror\n"
diff --git a/plugins/SubMirror/locale/tl/LC_MESSAGES/SubMirror.po b/plugins/SubMirror/locale/tl/LC_MESSAGES/SubMirror.po
index 8d0e19d59f..15bdb4b660 100644
--- a/plugins/SubMirror/locale/tl/LC_MESSAGES/SubMirror.po
+++ b/plugins/SubMirror/locale/tl/LC_MESSAGES/SubMirror.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SubMirror\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:27+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:06+0000\n"
 "Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-15 11:02:40+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-02-14 17:22:11+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-submirror\n"
diff --git a/plugins/SubMirror/locale/uk/LC_MESSAGES/SubMirror.po b/plugins/SubMirror/locale/uk/LC_MESSAGES/SubMirror.po
index 0fafc4566b..ac9e7741e5 100644
--- a/plugins/SubMirror/locale/uk/LC_MESSAGES/SubMirror.po
+++ b/plugins/SubMirror/locale/uk/LC_MESSAGES/SubMirror.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SubMirror\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 15:58+0000\n"
-"PO-Revision-Date: 2011-03-03 16:03:05+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:06+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/SubscriptionThrottle/locale/SubscriptionThrottle.pot b/plugins/SubscriptionThrottle/locale/SubscriptionThrottle.pot
index 2f0d899fa7..cb3be6b7e9 100644
--- a/plugins/SubscriptionThrottle/locale/SubscriptionThrottle.pot
+++ b/plugins/SubscriptionThrottle/locale/SubscriptionThrottle.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/SubscriptionThrottle/locale/de/LC_MESSAGES/SubscriptionThrottle.po b/plugins/SubscriptionThrottle/locale/de/LC_MESSAGES/SubscriptionThrottle.po
index 046355ce8d..c1eefbdda5 100644
--- a/plugins/SubscriptionThrottle/locale/de/LC_MESSAGES/SubscriptionThrottle.po
+++ b/plugins/SubscriptionThrottle/locale/de/LC_MESSAGES/SubscriptionThrottle.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SubscriptionThrottle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:27+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:06+0000\n"
 "Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:22:17+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:29:07+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-subscriptionthrottle\n"
diff --git a/plugins/SubscriptionThrottle/locale/es/LC_MESSAGES/SubscriptionThrottle.po b/plugins/SubscriptionThrottle/locale/es/LC_MESSAGES/SubscriptionThrottle.po
index e8b625d22e..16a45f15c4 100644
--- a/plugins/SubscriptionThrottle/locale/es/LC_MESSAGES/SubscriptionThrottle.po
+++ b/plugins/SubscriptionThrottle/locale/es/LC_MESSAGES/SubscriptionThrottle.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SubscriptionThrottle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:27+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:06+0000\n"
 "Language-Team: Spanish <http://translatewiki.net/wiki/Portal:es>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:22:17+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:29:07+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-subscriptionthrottle\n"
diff --git a/plugins/SubscriptionThrottle/locale/fr/LC_MESSAGES/SubscriptionThrottle.po b/plugins/SubscriptionThrottle/locale/fr/LC_MESSAGES/SubscriptionThrottle.po
index ac4dfc454b..1df4cac4c9 100644
--- a/plugins/SubscriptionThrottle/locale/fr/LC_MESSAGES/SubscriptionThrottle.po
+++ b/plugins/SubscriptionThrottle/locale/fr/LC_MESSAGES/SubscriptionThrottle.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SubscriptionThrottle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:27+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:06+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:22:17+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:29:07+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-subscriptionthrottle\n"
diff --git a/plugins/SubscriptionThrottle/locale/he/LC_MESSAGES/SubscriptionThrottle.po b/plugins/SubscriptionThrottle/locale/he/LC_MESSAGES/SubscriptionThrottle.po
index c79910a646..889086db5e 100644
--- a/plugins/SubscriptionThrottle/locale/he/LC_MESSAGES/SubscriptionThrottle.po
+++ b/plugins/SubscriptionThrottle/locale/he/LC_MESSAGES/SubscriptionThrottle.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SubscriptionThrottle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:27+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:06+0000\n"
 "Language-Team: Hebrew <http://translatewiki.net/wiki/Portal:he>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:22:17+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:29:07+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-plugin-subscriptionthrottle\n"
diff --git a/plugins/SubscriptionThrottle/locale/ia/LC_MESSAGES/SubscriptionThrottle.po b/plugins/SubscriptionThrottle/locale/ia/LC_MESSAGES/SubscriptionThrottle.po
index 75f9e172f1..e920e0ba0b 100644
--- a/plugins/SubscriptionThrottle/locale/ia/LC_MESSAGES/SubscriptionThrottle.po
+++ b/plugins/SubscriptionThrottle/locale/ia/LC_MESSAGES/SubscriptionThrottle.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SubscriptionThrottle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:28+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:06+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:22:17+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:29:07+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-subscriptionthrottle\n"
diff --git a/plugins/SubscriptionThrottle/locale/id/LC_MESSAGES/SubscriptionThrottle.po b/plugins/SubscriptionThrottle/locale/id/LC_MESSAGES/SubscriptionThrottle.po
index 620aa93f61..4e03f4e48f 100644
--- a/plugins/SubscriptionThrottle/locale/id/LC_MESSAGES/SubscriptionThrottle.po
+++ b/plugins/SubscriptionThrottle/locale/id/LC_MESSAGES/SubscriptionThrottle.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SubscriptionThrottle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:28+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:06+0000\n"
 "Language-Team: Indonesian <http://translatewiki.net/wiki/Portal:id>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:22:17+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:29:07+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: id\n"
 "X-Message-Group: #out-statusnet-plugin-subscriptionthrottle\n"
diff --git a/plugins/SubscriptionThrottle/locale/mk/LC_MESSAGES/SubscriptionThrottle.po b/plugins/SubscriptionThrottle/locale/mk/LC_MESSAGES/SubscriptionThrottle.po
index 29d19a92dc..6592f994f4 100644
--- a/plugins/SubscriptionThrottle/locale/mk/LC_MESSAGES/SubscriptionThrottle.po
+++ b/plugins/SubscriptionThrottle/locale/mk/LC_MESSAGES/SubscriptionThrottle.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SubscriptionThrottle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:28+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:06+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:22:17+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:29:07+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-subscriptionthrottle\n"
diff --git a/plugins/SubscriptionThrottle/locale/nb/LC_MESSAGES/SubscriptionThrottle.po b/plugins/SubscriptionThrottle/locale/nb/LC_MESSAGES/SubscriptionThrottle.po
index e2cf246393..74c1c7a710 100644
--- a/plugins/SubscriptionThrottle/locale/nb/LC_MESSAGES/SubscriptionThrottle.po
+++ b/plugins/SubscriptionThrottle/locale/nb/LC_MESSAGES/SubscriptionThrottle.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SubscriptionThrottle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:28+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:06+0000\n"
 "Language-Team: Norwegian (bokmål)‬ <http://translatewiki.net/wiki/Portal:no>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:22:17+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:29:07+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: #out-statusnet-plugin-subscriptionthrottle\n"
diff --git a/plugins/SubscriptionThrottle/locale/nl/LC_MESSAGES/SubscriptionThrottle.po b/plugins/SubscriptionThrottle/locale/nl/LC_MESSAGES/SubscriptionThrottle.po
index df43aacfbc..bbb0c8de12 100644
--- a/plugins/SubscriptionThrottle/locale/nl/LC_MESSAGES/SubscriptionThrottle.po
+++ b/plugins/SubscriptionThrottle/locale/nl/LC_MESSAGES/SubscriptionThrottle.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SubscriptionThrottle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:28+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:06+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:22:17+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:29:07+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-subscriptionthrottle\n"
diff --git a/plugins/SubscriptionThrottle/locale/pt/LC_MESSAGES/SubscriptionThrottle.po b/plugins/SubscriptionThrottle/locale/pt/LC_MESSAGES/SubscriptionThrottle.po
index 87c3cc174b..090e41870c 100644
--- a/plugins/SubscriptionThrottle/locale/pt/LC_MESSAGES/SubscriptionThrottle.po
+++ b/plugins/SubscriptionThrottle/locale/pt/LC_MESSAGES/SubscriptionThrottle.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SubscriptionThrottle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 15:58+0000\n"
-"PO-Revision-Date: 2011-03-03 16:03:05+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:06+0000\n"
 "Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/SubscriptionThrottle/locale/ru/LC_MESSAGES/SubscriptionThrottle.po b/plugins/SubscriptionThrottle/locale/ru/LC_MESSAGES/SubscriptionThrottle.po
index fbf2f26088..7dbb0c3f5e 100644
--- a/plugins/SubscriptionThrottle/locale/ru/LC_MESSAGES/SubscriptionThrottle.po
+++ b/plugins/SubscriptionThrottle/locale/ru/LC_MESSAGES/SubscriptionThrottle.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SubscriptionThrottle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:28+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:06+0000\n"
 "Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:22:17+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:29:07+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-subscriptionthrottle\n"
diff --git a/plugins/SubscriptionThrottle/locale/tl/LC_MESSAGES/SubscriptionThrottle.po b/plugins/SubscriptionThrottle/locale/tl/LC_MESSAGES/SubscriptionThrottle.po
index df797f6d2a..cf367ad2ad 100644
--- a/plugins/SubscriptionThrottle/locale/tl/LC_MESSAGES/SubscriptionThrottle.po
+++ b/plugins/SubscriptionThrottle/locale/tl/LC_MESSAGES/SubscriptionThrottle.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SubscriptionThrottle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:28+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:06+0000\n"
 "Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:22:17+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:29:07+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-subscriptionthrottle\n"
diff --git a/plugins/SubscriptionThrottle/locale/uk/LC_MESSAGES/SubscriptionThrottle.po b/plugins/SubscriptionThrottle/locale/uk/LC_MESSAGES/SubscriptionThrottle.po
index 0f94615875..c9bd03f549 100644
--- a/plugins/SubscriptionThrottle/locale/uk/LC_MESSAGES/SubscriptionThrottle.po
+++ b/plugins/SubscriptionThrottle/locale/uk/LC_MESSAGES/SubscriptionThrottle.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SubscriptionThrottle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:28+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:06+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:22:17+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:29:07+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-subscriptionthrottle\n"
diff --git a/plugins/TabFocus/locale/TabFocus.pot b/plugins/TabFocus/locale/TabFocus.pot
index e71c4ac453..dfd9c09fc9 100644
--- a/plugins/TabFocus/locale/TabFocus.pot
+++ b/plugins/TabFocus/locale/TabFocus.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/TabFocus/locale/br/LC_MESSAGES/TabFocus.po b/plugins/TabFocus/locale/br/LC_MESSAGES/TabFocus.po
index 4f40983024..9fa70fdfb1 100644
--- a/plugins/TabFocus/locale/br/LC_MESSAGES/TabFocus.po
+++ b/plugins/TabFocus/locale/br/LC_MESSAGES/TabFocus.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TabFocus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:28+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:06+0000\n"
 "Language-Team: Breton <http://translatewiki.net/wiki/Portal:br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-22 19:30:52+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:29:08+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-tabfocus\n"
diff --git a/plugins/TabFocus/locale/es/LC_MESSAGES/TabFocus.po b/plugins/TabFocus/locale/es/LC_MESSAGES/TabFocus.po
index d19e40a685..662e2aacab 100644
--- a/plugins/TabFocus/locale/es/LC_MESSAGES/TabFocus.po
+++ b/plugins/TabFocus/locale/es/LC_MESSAGES/TabFocus.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TabFocus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:28+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:06+0000\n"
 "Language-Team: Spanish <http://translatewiki.net/wiki/Portal:es>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-22 19:30:52+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:29:08+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-tabfocus\n"
diff --git a/plugins/TabFocus/locale/fr/LC_MESSAGES/TabFocus.po b/plugins/TabFocus/locale/fr/LC_MESSAGES/TabFocus.po
index 1bf8203c17..6e022603fc 100644
--- a/plugins/TabFocus/locale/fr/LC_MESSAGES/TabFocus.po
+++ b/plugins/TabFocus/locale/fr/LC_MESSAGES/TabFocus.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TabFocus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:28+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:06+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-22 19:30:52+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:29:08+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-tabfocus\n"
diff --git a/plugins/TabFocus/locale/gl/LC_MESSAGES/TabFocus.po b/plugins/TabFocus/locale/gl/LC_MESSAGES/TabFocus.po
index eeb5aa2a1f..b9e99a39c4 100644
--- a/plugins/TabFocus/locale/gl/LC_MESSAGES/TabFocus.po
+++ b/plugins/TabFocus/locale/gl/LC_MESSAGES/TabFocus.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TabFocus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:28+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:06+0000\n"
 "Language-Team: Galician <http://translatewiki.net/wiki/Portal:gl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-22 19:30:52+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:29:08+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: gl\n"
 "X-Message-Group: #out-statusnet-plugin-tabfocus\n"
diff --git a/plugins/TabFocus/locale/he/LC_MESSAGES/TabFocus.po b/plugins/TabFocus/locale/he/LC_MESSAGES/TabFocus.po
index 8febc9a078..2d4769b235 100644
--- a/plugins/TabFocus/locale/he/LC_MESSAGES/TabFocus.po
+++ b/plugins/TabFocus/locale/he/LC_MESSAGES/TabFocus.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TabFocus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:28+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:06+0000\n"
 "Language-Team: Hebrew <http://translatewiki.net/wiki/Portal:he>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-22 19:30:52+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:29:08+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-plugin-tabfocus\n"
diff --git a/plugins/TabFocus/locale/ia/LC_MESSAGES/TabFocus.po b/plugins/TabFocus/locale/ia/LC_MESSAGES/TabFocus.po
index 5bdc5cd0c1..15a0d27d25 100644
--- a/plugins/TabFocus/locale/ia/LC_MESSAGES/TabFocus.po
+++ b/plugins/TabFocus/locale/ia/LC_MESSAGES/TabFocus.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TabFocus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:28+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:06+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-22 19:30:52+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:29:08+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-tabfocus\n"
diff --git a/plugins/TabFocus/locale/id/LC_MESSAGES/TabFocus.po b/plugins/TabFocus/locale/id/LC_MESSAGES/TabFocus.po
index 2fb812e955..b1bc20069d 100644
--- a/plugins/TabFocus/locale/id/LC_MESSAGES/TabFocus.po
+++ b/plugins/TabFocus/locale/id/LC_MESSAGES/TabFocus.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TabFocus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:28+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:06+0000\n"
 "Language-Team: Indonesian <http://translatewiki.net/wiki/Portal:id>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-22 19:30:52+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:29:08+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: id\n"
 "X-Message-Group: #out-statusnet-plugin-tabfocus\n"
diff --git a/plugins/TabFocus/locale/mk/LC_MESSAGES/TabFocus.po b/plugins/TabFocus/locale/mk/LC_MESSAGES/TabFocus.po
index 07b09e6e08..2de7f9c020 100644
--- a/plugins/TabFocus/locale/mk/LC_MESSAGES/TabFocus.po
+++ b/plugins/TabFocus/locale/mk/LC_MESSAGES/TabFocus.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TabFocus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:28+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:06+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-22 19:30:52+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:29:08+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-tabfocus\n"
diff --git a/plugins/TabFocus/locale/nb/LC_MESSAGES/TabFocus.po b/plugins/TabFocus/locale/nb/LC_MESSAGES/TabFocus.po
index 34d316b627..9e0cc691b0 100644
--- a/plugins/TabFocus/locale/nb/LC_MESSAGES/TabFocus.po
+++ b/plugins/TabFocus/locale/nb/LC_MESSAGES/TabFocus.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TabFocus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:28+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:07+0000\n"
 "Language-Team: Norwegian (bokmål)‬ <http://translatewiki.net/wiki/Portal:no>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-22 19:30:52+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:29:08+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: #out-statusnet-plugin-tabfocus\n"
diff --git a/plugins/TabFocus/locale/nl/LC_MESSAGES/TabFocus.po b/plugins/TabFocus/locale/nl/LC_MESSAGES/TabFocus.po
index 7036a81310..01ae767b1f 100644
--- a/plugins/TabFocus/locale/nl/LC_MESSAGES/TabFocus.po
+++ b/plugins/TabFocus/locale/nl/LC_MESSAGES/TabFocus.po
@@ -10,13 +10,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TabFocus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:28+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:07+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-22 19:30:52+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:29:08+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-tabfocus\n"
diff --git a/plugins/TabFocus/locale/ru/LC_MESSAGES/TabFocus.po b/plugins/TabFocus/locale/ru/LC_MESSAGES/TabFocus.po
index 75bf0b0db5..921ac5c4b5 100644
--- a/plugins/TabFocus/locale/ru/LC_MESSAGES/TabFocus.po
+++ b/plugins/TabFocus/locale/ru/LC_MESSAGES/TabFocus.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TabFocus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:28+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:07+0000\n"
 "Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-22 19:30:52+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:29:08+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-tabfocus\n"
diff --git a/plugins/TabFocus/locale/tl/LC_MESSAGES/TabFocus.po b/plugins/TabFocus/locale/tl/LC_MESSAGES/TabFocus.po
index 9936069b63..af192168ed 100644
--- a/plugins/TabFocus/locale/tl/LC_MESSAGES/TabFocus.po
+++ b/plugins/TabFocus/locale/tl/LC_MESSAGES/TabFocus.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TabFocus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:28+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:07+0000\n"
 "Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-22 19:30:52+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:29:08+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-tabfocus\n"
diff --git a/plugins/TabFocus/locale/uk/LC_MESSAGES/TabFocus.po b/plugins/TabFocus/locale/uk/LC_MESSAGES/TabFocus.po
index 1b266717a5..307609b06f 100644
--- a/plugins/TabFocus/locale/uk/LC_MESSAGES/TabFocus.po
+++ b/plugins/TabFocus/locale/uk/LC_MESSAGES/TabFocus.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TabFocus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:28+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:07+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-22 19:30:52+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:29:08+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-tabfocus\n"
diff --git a/plugins/TightUrl/locale/TightUrl.pot b/plugins/TightUrl/locale/TightUrl.pot
index 98ca5fff4a..e749d38002 100644
--- a/plugins/TightUrl/locale/TightUrl.pot
+++ b/plugins/TightUrl/locale/TightUrl.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: TightUrlPlugin.php:68
+#: TightUrlPlugin.php:66
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr ""
diff --git a/plugins/TightUrl/locale/de/LC_MESSAGES/TightUrl.po b/plugins/TightUrl/locale/de/LC_MESSAGES/TightUrl.po
index 02a4250edc..1283c83ba5 100644
--- a/plugins/TightUrl/locale/de/LC_MESSAGES/TightUrl.po
+++ b/plugins/TightUrl/locale/de/LC_MESSAGES/TightUrl.po
@@ -9,19 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TightUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:29+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:07+0000\n"
 "Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:22:19+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:29:10+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-tighturl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: TightUrlPlugin.php:68
+#: TightUrlPlugin.php:66
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr "Benutzung des <a href=\"http://%1$s/\">%1$s</a>-URL-Kürzungsdienstes."
diff --git a/plugins/TightUrl/locale/es/LC_MESSAGES/TightUrl.po b/plugins/TightUrl/locale/es/LC_MESSAGES/TightUrl.po
index 624c5d1a68..d45993f150 100644
--- a/plugins/TightUrl/locale/es/LC_MESSAGES/TightUrl.po
+++ b/plugins/TightUrl/locale/es/LC_MESSAGES/TightUrl.po
@@ -9,19 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TightUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:29+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:07+0000\n"
 "Language-Team: Spanish <http://translatewiki.net/wiki/Portal:es>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:22:19+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:29:10+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-tighturl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: TightUrlPlugin.php:68
+#: TightUrlPlugin.php:66
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr ""
diff --git a/plugins/TightUrl/locale/fr/LC_MESSAGES/TightUrl.po b/plugins/TightUrl/locale/fr/LC_MESSAGES/TightUrl.po
index d218d6da15..7f439fcb05 100644
--- a/plugins/TightUrl/locale/fr/LC_MESSAGES/TightUrl.po
+++ b/plugins/TightUrl/locale/fr/LC_MESSAGES/TightUrl.po
@@ -9,19 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TightUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:29+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:07+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:22:19+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:29:10+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-tighturl\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: TightUrlPlugin.php:68
+#: TightUrlPlugin.php:66
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr ""
diff --git a/plugins/TightUrl/locale/gl/LC_MESSAGES/TightUrl.po b/plugins/TightUrl/locale/gl/LC_MESSAGES/TightUrl.po
index f896314996..8da08b4a61 100644
--- a/plugins/TightUrl/locale/gl/LC_MESSAGES/TightUrl.po
+++ b/plugins/TightUrl/locale/gl/LC_MESSAGES/TightUrl.po
@@ -9,19 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TightUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:29+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:07+0000\n"
 "Language-Team: Galician <http://translatewiki.net/wiki/Portal:gl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:22:19+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:29:10+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: gl\n"
 "X-Message-Group: #out-statusnet-plugin-tighturl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: TightUrlPlugin.php:68
+#: TightUrlPlugin.php:66
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr ""
diff --git a/plugins/TightUrl/locale/he/LC_MESSAGES/TightUrl.po b/plugins/TightUrl/locale/he/LC_MESSAGES/TightUrl.po
index 6288f004b5..aa87a5c00b 100644
--- a/plugins/TightUrl/locale/he/LC_MESSAGES/TightUrl.po
+++ b/plugins/TightUrl/locale/he/LC_MESSAGES/TightUrl.po
@@ -9,19 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TightUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:29+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:07+0000\n"
 "Language-Team: Hebrew <http://translatewiki.net/wiki/Portal:he>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:22:19+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:29:10+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-plugin-tighturl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: TightUrlPlugin.php:68
+#: TightUrlPlugin.php:66
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr "שימוש בשירות קיצור הכתובות <a href=\"http://%1$s/\">%1$s</a>."
diff --git a/plugins/TightUrl/locale/ia/LC_MESSAGES/TightUrl.po b/plugins/TightUrl/locale/ia/LC_MESSAGES/TightUrl.po
index f3c55bcf13..3609b610ad 100644
--- a/plugins/TightUrl/locale/ia/LC_MESSAGES/TightUrl.po
+++ b/plugins/TightUrl/locale/ia/LC_MESSAGES/TightUrl.po
@@ -9,19 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TightUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:29+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:07+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:22:19+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:29:10+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-tighturl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: TightUrlPlugin.php:68
+#: TightUrlPlugin.php:66
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr ""
diff --git a/plugins/TightUrl/locale/id/LC_MESSAGES/TightUrl.po b/plugins/TightUrl/locale/id/LC_MESSAGES/TightUrl.po
index 7f3dd02230..6bfb03c2d3 100644
--- a/plugins/TightUrl/locale/id/LC_MESSAGES/TightUrl.po
+++ b/plugins/TightUrl/locale/id/LC_MESSAGES/TightUrl.po
@@ -9,19 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TightUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:29+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:07+0000\n"
 "Language-Team: Indonesian <http://translatewiki.net/wiki/Portal:id>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:22:19+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:29:10+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: id\n"
 "X-Message-Group: #out-statusnet-plugin-tighturl\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: TightUrlPlugin.php:68
+#: TightUrlPlugin.php:66
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr "Menggunakan layanan pemendek URL <a href=\"http://%1$s/\">%1$s</a>."
diff --git a/plugins/TightUrl/locale/ja/LC_MESSAGES/TightUrl.po b/plugins/TightUrl/locale/ja/LC_MESSAGES/TightUrl.po
index 5c32337df2..bd413f9195 100644
--- a/plugins/TightUrl/locale/ja/LC_MESSAGES/TightUrl.po
+++ b/plugins/TightUrl/locale/ja/LC_MESSAGES/TightUrl.po
@@ -9,19 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TightUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:29+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:07+0000\n"
 "Language-Team: Japanese <http://translatewiki.net/wiki/Portal:ja>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:22:19+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:29:10+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ja\n"
 "X-Message-Group: #out-statusnet-plugin-tighturl\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: TightUrlPlugin.php:68
+#: TightUrlPlugin.php:66
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr "<a href=\"http://%1$s/\">%1$s</a>をURL短縮サービスとして利用する。"
diff --git a/plugins/TightUrl/locale/mk/LC_MESSAGES/TightUrl.po b/plugins/TightUrl/locale/mk/LC_MESSAGES/TightUrl.po
index b93768ae42..734a99405d 100644
--- a/plugins/TightUrl/locale/mk/LC_MESSAGES/TightUrl.po
+++ b/plugins/TightUrl/locale/mk/LC_MESSAGES/TightUrl.po
@@ -9,19 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TightUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:29+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:07+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:22:19+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:29:10+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-tighturl\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
 
-#: TightUrlPlugin.php:68
+#: TightUrlPlugin.php:66
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr ""
diff --git a/plugins/TightUrl/locale/nb/LC_MESSAGES/TightUrl.po b/plugins/TightUrl/locale/nb/LC_MESSAGES/TightUrl.po
index d1d48d6c76..61595b125b 100644
--- a/plugins/TightUrl/locale/nb/LC_MESSAGES/TightUrl.po
+++ b/plugins/TightUrl/locale/nb/LC_MESSAGES/TightUrl.po
@@ -9,19 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TightUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:29+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:07+0000\n"
 "Language-Team: Norwegian (bokmål)‬ <http://translatewiki.net/wiki/Portal:no>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:22:19+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:29:10+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: #out-statusnet-plugin-tighturl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: TightUrlPlugin.php:68
+#: TightUrlPlugin.php:66
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr "Bruker URL-forkortertjenesten <a href=\"http://%1$s/\">%1$s</a>."
diff --git a/plugins/TightUrl/locale/nl/LC_MESSAGES/TightUrl.po b/plugins/TightUrl/locale/nl/LC_MESSAGES/TightUrl.po
index 59924afad3..0e8ade5788 100644
--- a/plugins/TightUrl/locale/nl/LC_MESSAGES/TightUrl.po
+++ b/plugins/TightUrl/locale/nl/LC_MESSAGES/TightUrl.po
@@ -9,19 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TightUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:29+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:07+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:22:19+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:29:10+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-tighturl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: TightUrlPlugin.php:68
+#: TightUrlPlugin.php:66
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr ""
diff --git a/plugins/TightUrl/locale/pt/LC_MESSAGES/TightUrl.po b/plugins/TightUrl/locale/pt/LC_MESSAGES/TightUrl.po
index b645880286..3c1d236268 100644
--- a/plugins/TightUrl/locale/pt/LC_MESSAGES/TightUrl.po
+++ b/plugins/TightUrl/locale/pt/LC_MESSAGES/TightUrl.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TightUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 15:58+0000\n"
-"PO-Revision-Date: 2011-03-03 16:03:06+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:07+0000\n"
 "Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -21,7 +21,7 @@ msgstr ""
 "X-Message-Group: #out-statusnet-plugin-tighturl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: TightUrlPlugin.php:68
+#: TightUrlPlugin.php:66
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr "Usa o serviço de abreviação de URLs <a href=\"http://%1$s/\">%1$s</a>."
diff --git a/plugins/TightUrl/locale/pt_BR/LC_MESSAGES/TightUrl.po b/plugins/TightUrl/locale/pt_BR/LC_MESSAGES/TightUrl.po
index 6445814d79..d42461220b 100644
--- a/plugins/TightUrl/locale/pt_BR/LC_MESSAGES/TightUrl.po
+++ b/plugins/TightUrl/locale/pt_BR/LC_MESSAGES/TightUrl.po
@@ -9,20 +9,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TightUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:29+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:07+0000\n"
 "Language-Team: Brazilian Portuguese <http://translatewiki.net/wiki/Portal:pt-"
 "br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:22:19+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:29:10+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt-br\n"
 "X-Message-Group: #out-statusnet-plugin-tighturl\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: TightUrlPlugin.php:68
+#: TightUrlPlugin.php:66
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr ""
diff --git a/plugins/TightUrl/locale/ru/LC_MESSAGES/TightUrl.po b/plugins/TightUrl/locale/ru/LC_MESSAGES/TightUrl.po
index f304eeb7a7..63887b9209 100644
--- a/plugins/TightUrl/locale/ru/LC_MESSAGES/TightUrl.po
+++ b/plugins/TightUrl/locale/ru/LC_MESSAGES/TightUrl.po
@@ -9,20 +9,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TightUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:29+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:07+0000\n"
 "Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:22:19+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:29:10+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-tighturl\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: TightUrlPlugin.php:68
+#: TightUrlPlugin.php:66
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr "Использование службы сокращения URL <a href=\"http://%1$s/\">%1$s</a>."
diff --git a/plugins/TightUrl/locale/tl/LC_MESSAGES/TightUrl.po b/plugins/TightUrl/locale/tl/LC_MESSAGES/TightUrl.po
index 831413b2cd..72a32a1a67 100644
--- a/plugins/TightUrl/locale/tl/LC_MESSAGES/TightUrl.po
+++ b/plugins/TightUrl/locale/tl/LC_MESSAGES/TightUrl.po
@@ -9,19 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TightUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:29+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:07+0000\n"
 "Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:22:19+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:29:10+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-tighturl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: TightUrlPlugin.php:68
+#: TightUrlPlugin.php:66
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr ""
diff --git a/plugins/TightUrl/locale/uk/LC_MESSAGES/TightUrl.po b/plugins/TightUrl/locale/uk/LC_MESSAGES/TightUrl.po
index e94d099839..84eb10730e 100644
--- a/plugins/TightUrl/locale/uk/LC_MESSAGES/TightUrl.po
+++ b/plugins/TightUrl/locale/uk/LC_MESSAGES/TightUrl.po
@@ -9,20 +9,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TightUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:29+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:07+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:22:19+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:29:10+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-tighturl\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: TightUrlPlugin.php:68
+#: TightUrlPlugin.php:66
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr ""
diff --git a/plugins/TinyMCE/locale/TinyMCE.pot b/plugins/TinyMCE/locale/TinyMCE.pot
index 50903d25bd..55764b7288 100644
--- a/plugins/TinyMCE/locale/TinyMCE.pot
+++ b/plugins/TinyMCE/locale/TinyMCE.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-14 16:01+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/TinyMCE/locale/ca/LC_MESSAGES/TinyMCE.po b/plugins/TinyMCE/locale/ca/LC_MESSAGES/TinyMCE.po
index c020d47af6..88eb00425a 100644
--- a/plugins/TinyMCE/locale/ca/LC_MESSAGES/TinyMCE.po
+++ b/plugins/TinyMCE/locale/ca/LC_MESSAGES/TinyMCE.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TinyMCE\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-14 16:01+0000\n"
-"PO-Revision-Date: 2011-02-14 16:10:18+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:07+0000\n"
 "Language-Team: Catalan <http://translatewiki.net/wiki/Portal:ca>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:11+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r82114); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-02-14 17:22:12+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ca\n"
 "X-Message-Group: #out-statusnet-plugin-tinymce\n"
diff --git a/plugins/TinyMCE/locale/eo/LC_MESSAGES/TinyMCE.po b/plugins/TinyMCE/locale/eo/LC_MESSAGES/TinyMCE.po
index 8a8bc66647..50c612c9b5 100644
--- a/plugins/TinyMCE/locale/eo/LC_MESSAGES/TinyMCE.po
+++ b/plugins/TinyMCE/locale/eo/LC_MESSAGES/TinyMCE.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TinyMCE\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-14 16:01+0000\n"
-"PO-Revision-Date: 2011-02-14 16:10:18+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:07+0000\n"
 "Language-Team: Esperanto <http://translatewiki.net/wiki/Portal:eo>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:11+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r82114); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-02-14 17:22:12+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: eo\n"
 "X-Message-Group: #out-statusnet-plugin-tinymce\n"
diff --git a/plugins/TinyMCE/locale/es/LC_MESSAGES/TinyMCE.po b/plugins/TinyMCE/locale/es/LC_MESSAGES/TinyMCE.po
index e88a76b674..9106672959 100644
--- a/plugins/TinyMCE/locale/es/LC_MESSAGES/TinyMCE.po
+++ b/plugins/TinyMCE/locale/es/LC_MESSAGES/TinyMCE.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TinyMCE\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-14 16:01+0000\n"
-"PO-Revision-Date: 2011-02-14 16:10:18+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:08+0000\n"
 "Language-Team: Spanish <http://translatewiki.net/wiki/Portal:es>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:11+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r82114); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-02-14 17:22:12+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-tinymce\n"
diff --git a/plugins/TinyMCE/locale/fr/LC_MESSAGES/TinyMCE.po b/plugins/TinyMCE/locale/fr/LC_MESSAGES/TinyMCE.po
index a459db080e..bc63c04bbc 100644
--- a/plugins/TinyMCE/locale/fr/LC_MESSAGES/TinyMCE.po
+++ b/plugins/TinyMCE/locale/fr/LC_MESSAGES/TinyMCE.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TinyMCE\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-14 16:01+0000\n"
-"PO-Revision-Date: 2011-02-14 16:10:18+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:08+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:11+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r82114); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-02-14 17:22:12+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-tinymce\n"
diff --git a/plugins/TinyMCE/locale/he/LC_MESSAGES/TinyMCE.po b/plugins/TinyMCE/locale/he/LC_MESSAGES/TinyMCE.po
index fe86b85389..50a0615f07 100644
--- a/plugins/TinyMCE/locale/he/LC_MESSAGES/TinyMCE.po
+++ b/plugins/TinyMCE/locale/he/LC_MESSAGES/TinyMCE.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TinyMCE\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-14 16:01+0000\n"
-"PO-Revision-Date: 2011-02-14 16:10:18+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:08+0000\n"
 "Language-Team: Hebrew <http://translatewiki.net/wiki/Portal:he>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:11+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r82114); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-02-14 17:22:12+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-plugin-tinymce\n"
diff --git a/plugins/TinyMCE/locale/ia/LC_MESSAGES/TinyMCE.po b/plugins/TinyMCE/locale/ia/LC_MESSAGES/TinyMCE.po
index e86a224f08..385df5da9f 100644
--- a/plugins/TinyMCE/locale/ia/LC_MESSAGES/TinyMCE.po
+++ b/plugins/TinyMCE/locale/ia/LC_MESSAGES/TinyMCE.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TinyMCE\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-14 16:01+0000\n"
-"PO-Revision-Date: 2011-02-14 16:10:18+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:08+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:11+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r82114); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-02-14 17:22:12+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-tinymce\n"
diff --git a/plugins/TinyMCE/locale/id/LC_MESSAGES/TinyMCE.po b/plugins/TinyMCE/locale/id/LC_MESSAGES/TinyMCE.po
index ff45822089..9369ecf97b 100644
--- a/plugins/TinyMCE/locale/id/LC_MESSAGES/TinyMCE.po
+++ b/plugins/TinyMCE/locale/id/LC_MESSAGES/TinyMCE.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TinyMCE\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-14 16:01+0000\n"
-"PO-Revision-Date: 2011-02-14 16:10:18+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:08+0000\n"
 "Language-Team: Indonesian <http://translatewiki.net/wiki/Portal:id>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:11+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r82114); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-02-14 17:22:12+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: id\n"
 "X-Message-Group: #out-statusnet-plugin-tinymce\n"
diff --git a/plugins/TinyMCE/locale/mk/LC_MESSAGES/TinyMCE.po b/plugins/TinyMCE/locale/mk/LC_MESSAGES/TinyMCE.po
index 8841220f8b..e9106594b6 100644
--- a/plugins/TinyMCE/locale/mk/LC_MESSAGES/TinyMCE.po
+++ b/plugins/TinyMCE/locale/mk/LC_MESSAGES/TinyMCE.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TinyMCE\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-14 16:01+0000\n"
-"PO-Revision-Date: 2011-02-14 16:10:18+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:08+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:11+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r82114); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-02-14 17:22:12+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-tinymce\n"
diff --git a/plugins/TinyMCE/locale/nb/LC_MESSAGES/TinyMCE.po b/plugins/TinyMCE/locale/nb/LC_MESSAGES/TinyMCE.po
index 2f84655eb9..0eed6e9667 100644
--- a/plugins/TinyMCE/locale/nb/LC_MESSAGES/TinyMCE.po
+++ b/plugins/TinyMCE/locale/nb/LC_MESSAGES/TinyMCE.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TinyMCE\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-14 16:01+0000\n"
-"PO-Revision-Date: 2011-02-14 16:10:18+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:08+0000\n"
 "Language-Team: Norwegian (bokmål)‬ <http://translatewiki.net/wiki/Portal:no>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:11+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r82114); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-02-14 17:22:12+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: #out-statusnet-plugin-tinymce\n"
diff --git a/plugins/TinyMCE/locale/nl/LC_MESSAGES/TinyMCE.po b/plugins/TinyMCE/locale/nl/LC_MESSAGES/TinyMCE.po
index 25469e91a6..d5e675d8bd 100644
--- a/plugins/TinyMCE/locale/nl/LC_MESSAGES/TinyMCE.po
+++ b/plugins/TinyMCE/locale/nl/LC_MESSAGES/TinyMCE.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TinyMCE\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-14 16:01+0000\n"
-"PO-Revision-Date: 2011-02-14 16:10:18+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:08+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:11+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r82114); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-02-14 17:22:12+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-tinymce\n"
diff --git a/plugins/TinyMCE/locale/pt/LC_MESSAGES/TinyMCE.po b/plugins/TinyMCE/locale/pt/LC_MESSAGES/TinyMCE.po
index 2531674f43..1bc9f10e9f 100644
--- a/plugins/TinyMCE/locale/pt/LC_MESSAGES/TinyMCE.po
+++ b/plugins/TinyMCE/locale/pt/LC_MESSAGES/TinyMCE.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TinyMCE\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 15:58+0000\n"
-"PO-Revision-Date: 2011-03-03 16:03:07+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:08+0000\n"
 "Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/TinyMCE/locale/pt_BR/LC_MESSAGES/TinyMCE.po b/plugins/TinyMCE/locale/pt_BR/LC_MESSAGES/TinyMCE.po
index 0cb97a604f..328e93c5ee 100644
--- a/plugins/TinyMCE/locale/pt_BR/LC_MESSAGES/TinyMCE.po
+++ b/plugins/TinyMCE/locale/pt_BR/LC_MESSAGES/TinyMCE.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TinyMCE\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-14 16:01+0000\n"
-"PO-Revision-Date: 2011-02-14 16:10:18+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:08+0000\n"
 "Language-Team: Brazilian Portuguese <http://translatewiki.net/wiki/Portal:pt-"
 "br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:11+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r82114); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-02-14 17:22:12+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt-br\n"
 "X-Message-Group: #out-statusnet-plugin-tinymce\n"
diff --git a/plugins/TinyMCE/locale/ru/LC_MESSAGES/TinyMCE.po b/plugins/TinyMCE/locale/ru/LC_MESSAGES/TinyMCE.po
index d336492d3a..e8d4fdccab 100644
--- a/plugins/TinyMCE/locale/ru/LC_MESSAGES/TinyMCE.po
+++ b/plugins/TinyMCE/locale/ru/LC_MESSAGES/TinyMCE.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TinyMCE\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-14 16:01+0000\n"
-"PO-Revision-Date: 2011-02-14 16:10:18+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:08+0000\n"
 "Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:11+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r82114); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-02-14 17:22:12+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-tinymce\n"
diff --git a/plugins/TinyMCE/locale/tl/LC_MESSAGES/TinyMCE.po b/plugins/TinyMCE/locale/tl/LC_MESSAGES/TinyMCE.po
index 9f2d643d3c..16e60f248f 100644
--- a/plugins/TinyMCE/locale/tl/LC_MESSAGES/TinyMCE.po
+++ b/plugins/TinyMCE/locale/tl/LC_MESSAGES/TinyMCE.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TinyMCE\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-14 16:01+0000\n"
-"PO-Revision-Date: 2011-02-14 16:10:18+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:08+0000\n"
 "Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:11+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r82114); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-02-14 17:22:12+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-tinymce\n"
diff --git a/plugins/TinyMCE/locale/uk/LC_MESSAGES/TinyMCE.po b/plugins/TinyMCE/locale/uk/LC_MESSAGES/TinyMCE.po
index 5ea66da3b0..606ceabb70 100644
--- a/plugins/TinyMCE/locale/uk/LC_MESSAGES/TinyMCE.po
+++ b/plugins/TinyMCE/locale/uk/LC_MESSAGES/TinyMCE.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TinyMCE\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-14 16:01+0000\n"
-"PO-Revision-Date: 2011-02-14 16:10:18+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:08+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:11+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r82114); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-02-14 17:22:12+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-tinymce\n"
diff --git a/plugins/TwitterBridge/locale/TwitterBridge.pot b/plugins/TwitterBridge/locale/TwitterBridge.pot
index 35adf08e1a..b8c627b9cb 100644
--- a/plugins/TwitterBridge/locale/TwitterBridge.pot
+++ b/plugins/TwitterBridge/locale/TwitterBridge.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-14 16:01+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -132,7 +132,7 @@ msgid ""
 "be manually configured."
 msgstr ""
 
-#: twitteradminpanel.php:293 twittersettings.php:200
+#: twitteradminpanel.php:293 twittersettings.php:199
 msgid "Save"
 msgstr ""
 
@@ -156,7 +156,7 @@ msgstr ""
 msgid "Sign in with Twitter"
 msgstr ""
 
-#: twitterauthorization.php:120 twittersettings.php:226
+#: twitterauthorization.php:120 twittersettings.php:225
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 
@@ -271,96 +271,96 @@ msgstr ""
 msgid "Invalid username or password."
 msgstr ""
 
-#: twittersettings.php:58
+#: twittersettings.php:57
 msgid "Twitter settings"
 msgstr ""
 
-#: twittersettings.php:69
+#: twittersettings.php:68
 msgid ""
 "Connect your Twitter account to share your updates with your Twitter friends "
 "and vice-versa."
 msgstr ""
 
-#: twittersettings.php:116
+#: twittersettings.php:115
 msgid "Twitter account"
 msgstr ""
 
-#: twittersettings.php:121
+#: twittersettings.php:120
 msgid "Connected Twitter account"
 msgstr ""
 
-#: twittersettings.php:126
+#: twittersettings.php:125
 msgid "Disconnect my account from Twitter"
 msgstr ""
 
-#: twittersettings.php:132
+#: twittersettings.php:131
 msgid "Disconnecting your Twitter could make it impossible to log in! Please "
 msgstr ""
 
-#: twittersettings.php:136
+#: twittersettings.php:135
 msgid "set a password"
 msgstr ""
 
-#: twittersettings.php:138
+#: twittersettings.php:137
 msgid " first."
 msgstr ""
 
 #. TRANS: %1$s is the current website name.
-#: twittersettings.php:142
+#: twittersettings.php:141
 #, php-format
 msgid ""
 "Keep your %1$s account but disconnect from Twitter. You can use your %1$s "
 "password to log in."
 msgstr ""
 
-#: twittersettings.php:150
+#: twittersettings.php:149
 msgid "Disconnect"
 msgstr ""
 
-#: twittersettings.php:157
+#: twittersettings.php:156
 msgid "Preferences"
 msgstr ""
 
-#: twittersettings.php:161
+#: twittersettings.php:160
 msgid "Automatically send my notices to Twitter."
 msgstr ""
 
-#: twittersettings.php:168
+#: twittersettings.php:167
 msgid "Send local \"@\" replies to Twitter."
 msgstr ""
 
-#: twittersettings.php:175
+#: twittersettings.php:174
 msgid "Subscribe to my Twitter friends here."
 msgstr ""
 
-#: twittersettings.php:184
+#: twittersettings.php:183
 msgid "Import my friends timeline."
 msgstr ""
 
-#: twittersettings.php:202
+#: twittersettings.php:201
 msgid "Add"
 msgstr ""
 
-#: twittersettings.php:236
+#: twittersettings.php:235
 msgid "Unexpected form submission."
 msgstr ""
 
-#: twittersettings.php:251
+#: twittersettings.php:250
 msgid "No Twitter connection to remove."
 msgstr ""
 
-#: twittersettings.php:259
+#: twittersettings.php:258
 msgid "Couldn't remove Twitter user."
 msgstr ""
 
-#: twittersettings.php:263
+#: twittersettings.php:262
 msgid "Twitter account disconnected."
 msgstr ""
 
-#: twittersettings.php:283 twittersettings.php:294
+#: twittersettings.php:282 twittersettings.php:293
 msgid "Couldn't save Twitter preferences."
 msgstr ""
 
-#: twittersettings.php:302
+#: twittersettings.php:301
 msgid "Twitter preferences saved."
 msgstr ""
diff --git a/plugins/TwitterBridge/locale/br/LC_MESSAGES/TwitterBridge.po b/plugins/TwitterBridge/locale/br/LC_MESSAGES/TwitterBridge.po
index 6674b57c2f..49a8831e9f 100644
--- a/plugins/TwitterBridge/locale/br/LC_MESSAGES/TwitterBridge.po
+++ b/plugins/TwitterBridge/locale/br/LC_MESSAGES/TwitterBridge.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TwitterBridge\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-14 16:01+0000\n"
-"PO-Revision-Date: 2011-02-14 16:10:26+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:13+0000\n"
 "Language-Team: Breton <http://translatewiki.net/wiki/Portal:br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:14+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r82114); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-02-14 17:22:14+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-twitterbridge\n"
@@ -137,7 +137,7 @@ msgid ""
 "be manually configured."
 msgstr ""
 
-#: twitteradminpanel.php:293 twittersettings.php:200
+#: twitteradminpanel.php:293 twittersettings.php:199
 msgid "Save"
 msgstr "Enrollañ"
 
@@ -161,7 +161,7 @@ msgstr "Kevreadenn gant ho kont Twitter"
 msgid "Sign in with Twitter"
 msgstr "Kevreañ gant Twitter"
 
-#: twitterauthorization.php:120 twittersettings.php:226
+#: twitterauthorization.php:120 twittersettings.php:225
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 
@@ -276,96 +276,96 @@ msgstr ""
 msgid "Invalid username or password."
 msgstr "Anv implijer pe ger-tremen direizh."
 
-#: twittersettings.php:58
+#: twittersettings.php:57
 msgid "Twitter settings"
 msgstr "Arventennoù Twitter"
 
-#: twittersettings.php:69
+#: twittersettings.php:68
 msgid ""
 "Connect your Twitter account to share your updates with your Twitter friends "
 "and vice-versa."
 msgstr ""
 
-#: twittersettings.php:116
+#: twittersettings.php:115
 msgid "Twitter account"
 msgstr "Kont Twitter"
 
-#: twittersettings.php:121
+#: twittersettings.php:120
 msgid "Connected Twitter account"
 msgstr ""
 
-#: twittersettings.php:126
+#: twittersettings.php:125
 msgid "Disconnect my account from Twitter"
 msgstr "Digevreañ ma c'hont deus Twitter"
 
-#: twittersettings.php:132
+#: twittersettings.php:131
 msgid "Disconnecting your Twitter could make it impossible to log in! Please "
 msgstr ""
 
-#: twittersettings.php:136
+#: twittersettings.php:135
 msgid "set a password"
 msgstr "Termeniñ ur ger-tremen"
 
-#: twittersettings.php:138
+#: twittersettings.php:137
 msgid " first."
 msgstr "da gentañ."
 
 #. TRANS: %1$s is the current website name.
-#: twittersettings.php:142
+#: twittersettings.php:141
 #, php-format
 msgid ""
 "Keep your %1$s account but disconnect from Twitter. You can use your %1$s "
 "password to log in."
 msgstr ""
 
-#: twittersettings.php:150
+#: twittersettings.php:149
 msgid "Disconnect"
 msgstr "Digevreet"
 
-#: twittersettings.php:157
+#: twittersettings.php:156
 msgid "Preferences"
 msgstr "Penndibaboù"
 
-#: twittersettings.php:161
+#: twittersettings.php:160
 msgid "Automatically send my notices to Twitter."
 msgstr ""
 
-#: twittersettings.php:168
+#: twittersettings.php:167
 msgid "Send local \"@\" replies to Twitter."
 msgstr ""
 
-#: twittersettings.php:175
+#: twittersettings.php:174
 msgid "Subscribe to my Twitter friends here."
 msgstr ""
 
-#: twittersettings.php:184
+#: twittersettings.php:183
 msgid "Import my friends timeline."
 msgstr ""
 
-#: twittersettings.php:202
+#: twittersettings.php:201
 msgid "Add"
 msgstr "Ouzhpennañ"
 
-#: twittersettings.php:236
+#: twittersettings.php:235
 msgid "Unexpected form submission."
 msgstr ""
 
-#: twittersettings.php:251
+#: twittersettings.php:250
 msgid "No Twitter connection to remove."
 msgstr ""
 
-#: twittersettings.php:259
+#: twittersettings.php:258
 msgid "Couldn't remove Twitter user."
 msgstr ""
 
-#: twittersettings.php:263
+#: twittersettings.php:262
 msgid "Twitter account disconnected."
 msgstr ""
 
-#: twittersettings.php:283 twittersettings.php:294
+#: twittersettings.php:282 twittersettings.php:293
 msgid "Couldn't save Twitter preferences."
 msgstr ""
 
-#: twittersettings.php:302
+#: twittersettings.php:301
 msgid "Twitter preferences saved."
 msgstr ""
diff --git a/plugins/TwitterBridge/locale/ca/LC_MESSAGES/TwitterBridge.po b/plugins/TwitterBridge/locale/ca/LC_MESSAGES/TwitterBridge.po
index 77f3fc6f31..8949997fcc 100644
--- a/plugins/TwitterBridge/locale/ca/LC_MESSAGES/TwitterBridge.po
+++ b/plugins/TwitterBridge/locale/ca/LC_MESSAGES/TwitterBridge.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TwitterBridge\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-14 16:01+0000\n"
-"PO-Revision-Date: 2011-02-14 16:10:26+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:13+0000\n"
 "Language-Team: Catalan <http://translatewiki.net/wiki/Portal:ca>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:14+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r82114); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-02-14 17:22:14+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ca\n"
 "X-Message-Group: #out-statusnet-plugin-twitterbridge\n"
@@ -153,7 +153,7 @@ msgstr ""
 "Permet als usuaris importar les línies temporals dels amics al Twitter. Cal "
 "que es configurin els dimonis manualment."
 
-#: twitteradminpanel.php:293 twittersettings.php:200
+#: twitteradminpanel.php:293 twittersettings.php:199
 msgid "Save"
 msgstr "Desa"
 
@@ -177,7 +177,7 @@ msgstr "Inicieu una sessió amb el vostre compte del Twitter"
 msgid "Sign in with Twitter"
 msgstr "Inici de sessió amb el Twitter"
 
-#: twitterauthorization.php:120 twittersettings.php:226
+#: twitterauthorization.php:120 twittersettings.php:225
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 "S'ha produït un problema amb el vostre testimoni de sessió. Torneu-ho a "
@@ -304,11 +304,11 @@ msgstr "Error en connectar l'usuari al Twitter."
 msgid "Invalid username or password."
 msgstr "Nom d'usuari o contrasenya no vàlida."
 
-#: twittersettings.php:58
+#: twittersettings.php:57
 msgid "Twitter settings"
 msgstr "Paràmetres del Twitter"
 
-#: twittersettings.php:69
+#: twittersettings.php:68
 msgid ""
 "Connect your Twitter account to share your updates with your Twitter friends "
 "and vice-versa."
@@ -316,34 +316,34 @@ msgstr ""
 "Connecteu el vostre compte del Twitter per compartir les vostres "
 "actualitzacions amb els vostres amics del Twitter i viceversa."
 
-#: twittersettings.php:116
+#: twittersettings.php:115
 msgid "Twitter account"
 msgstr "Compte del Twitter"
 
-#: twittersettings.php:121
+#: twittersettings.php:120
 msgid "Connected Twitter account"
 msgstr "Compte del Twitter connectat"
 
-#: twittersettings.php:126
+#: twittersettings.php:125
 msgid "Disconnect my account from Twitter"
 msgstr "Desconnecta el meu compte del Twitter"
 
-#: twittersettings.php:132
+#: twittersettings.php:131
 msgid "Disconnecting your Twitter could make it impossible to log in! Please "
 msgstr ""
 "En desconnectar el vostre Twitter podeu impossibilitar que torneu a iniciar "
 "una sessió! "
 
-#: twittersettings.php:136
+#: twittersettings.php:135
 msgid "set a password"
 msgstr "Definiu una contrasenya"
 
-#: twittersettings.php:138
+#: twittersettings.php:137
 msgid " first."
 msgstr " primer."
 
 #. TRANS: %1$s is the current website name.
-#: twittersettings.php:142
+#: twittersettings.php:141
 #, php-format
 msgid ""
 "Keep your %1$s account but disconnect from Twitter. You can use your %1$s "
@@ -352,54 +352,54 @@ msgstr ""
 "Mantingueu el vostre compte %1$s, però desconnecteu-lo del Twitter. Podeu "
 "emprar la vostra contrasenya %1$s per iniciar una sessió."
 
-#: twittersettings.php:150
+#: twittersettings.php:149
 msgid "Disconnect"
 msgstr "Desconnecta"
 
-#: twittersettings.php:157
+#: twittersettings.php:156
 msgid "Preferences"
 msgstr "Preferències"
 
-#: twittersettings.php:161
+#: twittersettings.php:160
 msgid "Automatically send my notices to Twitter."
 msgstr "Envia automàticament els meus avisos al Twitter."
 
-#: twittersettings.php:168
+#: twittersettings.php:167
 msgid "Send local \"@\" replies to Twitter."
 msgstr "Envia les respostes locals «@» al Twitter."
 
-#: twittersettings.php:175
+#: twittersettings.php:174
 msgid "Subscribe to my Twitter friends here."
 msgstr "Subscriu els meus amics del Twitter aquí."
 
-#: twittersettings.php:184
+#: twittersettings.php:183
 msgid "Import my friends timeline."
 msgstr "Importa la línia temporal d'amics."
 
-#: twittersettings.php:202
+#: twittersettings.php:201
 msgid "Add"
 msgstr "Afegeix"
 
-#: twittersettings.php:236
+#: twittersettings.php:235
 msgid "Unexpected form submission."
 msgstr "Enviament de formulari inesperat."
 
-#: twittersettings.php:251
+#: twittersettings.php:250
 msgid "No Twitter connection to remove."
 msgstr "No hi ha cap connexió del Twitter a suprimir."
 
-#: twittersettings.php:259
+#: twittersettings.php:258
 msgid "Couldn't remove Twitter user."
 msgstr "No s'ha pogut suprimir l'usuari del Twitter."
 
-#: twittersettings.php:263
+#: twittersettings.php:262
 msgid "Twitter account disconnected."
 msgstr "S'ha desconnectat el compte del Twitter."
 
-#: twittersettings.php:283 twittersettings.php:294
+#: twittersettings.php:282 twittersettings.php:293
 msgid "Couldn't save Twitter preferences."
 msgstr "No s'han pogut desar les preferències del Twitter."
 
-#: twittersettings.php:302
+#: twittersettings.php:301
 msgid "Twitter preferences saved."
 msgstr "S'han desat les preferències del Twitter."
diff --git a/plugins/TwitterBridge/locale/fa/LC_MESSAGES/TwitterBridge.po b/plugins/TwitterBridge/locale/fa/LC_MESSAGES/TwitterBridge.po
index 599b026dcd..fa3129d220 100644
--- a/plugins/TwitterBridge/locale/fa/LC_MESSAGES/TwitterBridge.po
+++ b/plugins/TwitterBridge/locale/fa/LC_MESSAGES/TwitterBridge.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TwitterBridge\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-14 16:01+0000\n"
-"PO-Revision-Date: 2011-02-14 16:10:26+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:13+0000\n"
 "Language-Team: Persian <http://translatewiki.net/wiki/Portal:fa>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:14+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r82114); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-02-14 17:22:14+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fa\n"
 "X-Message-Group: #out-statusnet-plugin-twitterbridge\n"
@@ -137,7 +137,7 @@ msgid ""
 "be manually configured."
 msgstr ""
 
-#: twitteradminpanel.php:293 twittersettings.php:200
+#: twitteradminpanel.php:293 twittersettings.php:199
 msgid "Save"
 msgstr "ذخیره"
 
@@ -161,7 +161,7 @@ msgstr ""
 msgid "Sign in with Twitter"
 msgstr "با حساب کاربری توییتر وارد شوید"
 
-#: twitterauthorization.php:120 twittersettings.php:226
+#: twitterauthorization.php:120 twittersettings.php:225
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 
@@ -276,96 +276,96 @@ msgstr "خطا در اتصال کاربر به توییتر."
 msgid "Invalid username or password."
 msgstr "نام کاربری یا رمز عبور اشتباه است."
 
-#: twittersettings.php:58
+#: twittersettings.php:57
 msgid "Twitter settings"
 msgstr "تنظیمات توییتر"
 
-#: twittersettings.php:69
+#: twittersettings.php:68
 msgid ""
 "Connect your Twitter account to share your updates with your Twitter friends "
 "and vice-versa."
 msgstr ""
 
-#: twittersettings.php:116
+#: twittersettings.php:115
 msgid "Twitter account"
 msgstr "حساب کاربری توییتر"
 
-#: twittersettings.php:121
+#: twittersettings.php:120
 msgid "Connected Twitter account"
 msgstr "حساب کاربری توییتر متصل شد"
 
-#: twittersettings.php:126
+#: twittersettings.php:125
 msgid "Disconnect my account from Twitter"
 msgstr "قطع ارتباط حساب کاربری من از توییتر"
 
-#: twittersettings.php:132
+#: twittersettings.php:131
 msgid "Disconnecting your Twitter could make it impossible to log in! Please "
 msgstr ""
 
-#: twittersettings.php:136
+#: twittersettings.php:135
 msgid "set a password"
 msgstr "تنظیم رمز عبور"
 
-#: twittersettings.php:138
+#: twittersettings.php:137
 msgid " first."
 msgstr " ابتدا."
 
 #. TRANS: %1$s is the current website name.
-#: twittersettings.php:142
+#: twittersettings.php:141
 #, php-format
 msgid ""
 "Keep your %1$s account but disconnect from Twitter. You can use your %1$s "
 "password to log in."
 msgstr ""
 
-#: twittersettings.php:150
+#: twittersettings.php:149
 msgid "Disconnect"
 msgstr "قطع اتصال"
 
-#: twittersettings.php:157
+#: twittersettings.php:156
 msgid "Preferences"
 msgstr "ترجیحات"
 
-#: twittersettings.php:161
+#: twittersettings.php:160
 msgid "Automatically send my notices to Twitter."
 msgstr ""
 
-#: twittersettings.php:168
+#: twittersettings.php:167
 msgid "Send local \"@\" replies to Twitter."
 msgstr ""
 
-#: twittersettings.php:175
+#: twittersettings.php:174
 msgid "Subscribe to my Twitter friends here."
 msgstr ""
 
-#: twittersettings.php:184
+#: twittersettings.php:183
 msgid "Import my friends timeline."
 msgstr ""
 
-#: twittersettings.php:202
+#: twittersettings.php:201
 msgid "Add"
 msgstr "افزودن"
 
-#: twittersettings.php:236
+#: twittersettings.php:235
 msgid "Unexpected form submission."
 msgstr ""
 
-#: twittersettings.php:251
+#: twittersettings.php:250
 msgid "No Twitter connection to remove."
 msgstr "هیچ ارتباط توییتری برای حذف وجود ندارد."
 
-#: twittersettings.php:259
+#: twittersettings.php:258
 msgid "Couldn't remove Twitter user."
 msgstr "نمی‌توان کاربر توییتر را حذف کرد."
 
-#: twittersettings.php:263
+#: twittersettings.php:262
 msgid "Twitter account disconnected."
 msgstr "حساب توییتر قطع شده است."
 
-#: twittersettings.php:283 twittersettings.php:294
+#: twittersettings.php:282 twittersettings.php:293
 msgid "Couldn't save Twitter preferences."
 msgstr "نمی‌توان ترجیحات توییتر را ذخیره کرد."
 
-#: twittersettings.php:302
+#: twittersettings.php:301
 msgid "Twitter preferences saved."
 msgstr "تنظیمات توییتر ذخیره شد."
diff --git a/plugins/TwitterBridge/locale/fr/LC_MESSAGES/TwitterBridge.po b/plugins/TwitterBridge/locale/fr/LC_MESSAGES/TwitterBridge.po
index c265ca668d..0483cf33e2 100644
--- a/plugins/TwitterBridge/locale/fr/LC_MESSAGES/TwitterBridge.po
+++ b/plugins/TwitterBridge/locale/fr/LC_MESSAGES/TwitterBridge.po
@@ -10,13 +10,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TwitterBridge\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-14 16:01+0000\n"
-"PO-Revision-Date: 2011-02-14 16:10:26+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:13+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:14+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r82114); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-02-14 17:22:14+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-twitterbridge\n"
@@ -156,7 +156,7 @@ msgstr ""
 "Permettre aux utilisateurs d’importer les agendas de leurs amis Twitter. "
 "Exige que les démons soient configurés manuellement."
 
-#: twitteradminpanel.php:293 twittersettings.php:200
+#: twitteradminpanel.php:293 twittersettings.php:199
 msgid "Save"
 msgstr "Sauvegarder"
 
@@ -180,7 +180,7 @@ msgstr "Connexion avec votre compte Twitter"
 msgid "Sign in with Twitter"
 msgstr "S’inscrire avec Twitter"
 
-#: twitterauthorization.php:120 twittersettings.php:226
+#: twitterauthorization.php:120 twittersettings.php:225
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 "Un problème est survenu avec votre jeton de session. Veuillez essayer à "
@@ -308,11 +308,11 @@ msgstr "Erreur de connexion de l’utilisateur à Twitter."
 msgid "Invalid username or password."
 msgstr "Nom d’utilisateur ou mot de passe incorrect."
 
-#: twittersettings.php:58
+#: twittersettings.php:57
 msgid "Twitter settings"
 msgstr "Paramètres Twitter"
 
-#: twittersettings.php:69
+#: twittersettings.php:68
 msgid ""
 "Connect your Twitter account to share your updates with your Twitter friends "
 "and vice-versa."
@@ -320,34 +320,34 @@ msgstr ""
 "Connectez votre compte Twitter pour partager vos mises à jour avec vos amis "
 "Twitter et vice-versa."
 
-#: twittersettings.php:116
+#: twittersettings.php:115
 msgid "Twitter account"
 msgstr "Compte Twitter"
 
-#: twittersettings.php:121
+#: twittersettings.php:120
 msgid "Connected Twitter account"
 msgstr "Compte Twitter connecté"
 
-#: twittersettings.php:126
+#: twittersettings.php:125
 msgid "Disconnect my account from Twitter"
 msgstr "Déconnecter mon compte de Twitter"
 
-#: twittersettings.php:132
+#: twittersettings.php:131
 msgid "Disconnecting your Twitter could make it impossible to log in! Please "
 msgstr ""
 "La déconnexion de votre compte Twitter ne vous permettrait plus de vous "
 "connecter ! S’il vous plaît "
 
-#: twittersettings.php:136
+#: twittersettings.php:135
 msgid "set a password"
 msgstr "définissez un mot de passe"
 
-#: twittersettings.php:138
+#: twittersettings.php:137
 msgid " first."
 msgstr " tout d’abord."
 
 #. TRANS: %1$s is the current website name.
-#: twittersettings.php:142
+#: twittersettings.php:141
 #, php-format
 msgid ""
 "Keep your %1$s account but disconnect from Twitter. You can use your %1$s "
@@ -356,54 +356,54 @@ msgstr ""
 "Gardez votre compte %1$s, mais déconnectez-vous de Twitter. Vous pouvez "
 "utiliser votre mot de passe %1$s pour vous connecter."
 
-#: twittersettings.php:150
+#: twittersettings.php:149
 msgid "Disconnect"
 msgstr "Déconnecter"
 
-#: twittersettings.php:157
+#: twittersettings.php:156
 msgid "Preferences"
 msgstr "Préférences"
 
-#: twittersettings.php:161
+#: twittersettings.php:160
 msgid "Automatically send my notices to Twitter."
 msgstr "Envoyer automatiquement  mes avis sur Twitter."
 
-#: twittersettings.php:168
+#: twittersettings.php:167
 msgid "Send local \"@\" replies to Twitter."
 msgstr "Envoyer des réponses \"@\" locales à Twitter."
 
-#: twittersettings.php:175
+#: twittersettings.php:174
 msgid "Subscribe to my Twitter friends here."
 msgstr "S’abonner à mes amis Twitter ici."
 
-#: twittersettings.php:184
+#: twittersettings.php:183
 msgid "Import my friends timeline."
 msgstr "Importer l’agenda de mes amis."
 
-#: twittersettings.php:202
+#: twittersettings.php:201
 msgid "Add"
 msgstr "Ajouter"
 
-#: twittersettings.php:236
+#: twittersettings.php:235
 msgid "Unexpected form submission."
 msgstr "Soumission de formulaire inattendue."
 
-#: twittersettings.php:251
+#: twittersettings.php:250
 msgid "No Twitter connection to remove."
 msgstr "Aucune connexion Twitter à retirer."
 
-#: twittersettings.php:259
+#: twittersettings.php:258
 msgid "Couldn't remove Twitter user."
 msgstr "Impossible de supprimer l’utilisateur Twitter."
 
-#: twittersettings.php:263
+#: twittersettings.php:262
 msgid "Twitter account disconnected."
 msgstr "Compte Twitter déconnecté."
 
-#: twittersettings.php:283 twittersettings.php:294
+#: twittersettings.php:282 twittersettings.php:293
 msgid "Couldn't save Twitter preferences."
 msgstr "Impossible de sauvegarder les préférences Twitter."
 
-#: twittersettings.php:302
+#: twittersettings.php:301
 msgid "Twitter preferences saved."
 msgstr "Préférences Twitter enregistrées."
diff --git a/plugins/TwitterBridge/locale/ia/LC_MESSAGES/TwitterBridge.po b/plugins/TwitterBridge/locale/ia/LC_MESSAGES/TwitterBridge.po
index 696005b31c..c1855ebffd 100644
--- a/plugins/TwitterBridge/locale/ia/LC_MESSAGES/TwitterBridge.po
+++ b/plugins/TwitterBridge/locale/ia/LC_MESSAGES/TwitterBridge.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TwitterBridge\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-14 16:01+0000\n"
-"PO-Revision-Date: 2011-02-14 16:10:26+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:13+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:14+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r82114); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-02-14 17:22:14+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-twitterbridge\n"
@@ -152,7 +152,7 @@ msgstr ""
 "Permitte que usatores importa le chronologias de lor amicos de Twitter. "
 "Require que le demones sia configurate manualmente."
 
-#: twitteradminpanel.php:293 twittersettings.php:200
+#: twitteradminpanel.php:293 twittersettings.php:199
 msgid "Save"
 msgstr "Salveguardar"
 
@@ -176,7 +176,7 @@ msgstr "Aperir session con tu conto de Twitter"
 msgid "Sign in with Twitter"
 msgstr "Aperir session con Twitter"
 
-#: twitterauthorization.php:120 twittersettings.php:226
+#: twitterauthorization.php:120 twittersettings.php:225
 msgid "There was a problem with your session token. Try again, please."
 msgstr "Occurreva un problema con le indicio de tu session. Per favor reproba."
 
@@ -299,11 +299,11 @@ msgstr "Error durante le connexion del usator a Twitter."
 msgid "Invalid username or password."
 msgstr "Nomine de usator o contrasigno invalide."
 
-#: twittersettings.php:58
+#: twittersettings.php:57
 msgid "Twitter settings"
 msgstr "Configuration de Twitter"
 
-#: twittersettings.php:69
+#: twittersettings.php:68
 msgid ""
 "Connect your Twitter account to share your updates with your Twitter friends "
 "and vice-versa."
@@ -311,34 +311,34 @@ msgstr ""
 "Connecte tu conto de Twitter pro condivider tu actualisationes con tu amicos "
 "de Twitter e vice versa."
 
-#: twittersettings.php:116
+#: twittersettings.php:115
 msgid "Twitter account"
 msgstr "Conto de Twitter"
 
-#: twittersettings.php:121
+#: twittersettings.php:120
 msgid "Connected Twitter account"
 msgstr "Conto de Twitter connectite"
 
-#: twittersettings.php:126
+#: twittersettings.php:125
 msgid "Disconnect my account from Twitter"
 msgstr "Disconnecter mi conto ab Twitter"
 
-#: twittersettings.php:132
+#: twittersettings.php:131
 msgid "Disconnecting your Twitter could make it impossible to log in! Please "
 msgstr ""
 "Le disconnexion de tu conto de Twitter renderea le authentication "
 "impossibile! Per favor "
 
-#: twittersettings.php:136
+#: twittersettings.php:135
 msgid "set a password"
 msgstr "defini un contrasigno"
 
-#: twittersettings.php:138
+#: twittersettings.php:137
 msgid " first."
 msgstr " primo."
 
 #. TRANS: %1$s is the current website name.
-#: twittersettings.php:142
+#: twittersettings.php:141
 #, php-format
 msgid ""
 "Keep your %1$s account but disconnect from Twitter. You can use your %1$s "
@@ -347,54 +347,54 @@ msgstr ""
 "Retene tu conto de %1$s ma disconnecte ab Twitter. Tu pote usar tu "
 "contrasigno de %1$s pro aperir session."
 
-#: twittersettings.php:150
+#: twittersettings.php:149
 msgid "Disconnect"
 msgstr "Disconnecter"
 
-#: twittersettings.php:157
+#: twittersettings.php:156
 msgid "Preferences"
 msgstr "Preferentias"
 
-#: twittersettings.php:161
+#: twittersettings.php:160
 msgid "Automatically send my notices to Twitter."
 msgstr "Automaticamente inviar mi notas a Twitter."
 
-#: twittersettings.php:168
+#: twittersettings.php:167
 msgid "Send local \"@\" replies to Twitter."
 msgstr "Inviar responsas \"@\" local a Twitter."
 
-#: twittersettings.php:175
+#: twittersettings.php:174
 msgid "Subscribe to my Twitter friends here."
 msgstr "Subscriber hic a mi amicos de Twitter."
 
-#: twittersettings.php:184
+#: twittersettings.php:183
 msgid "Import my friends timeline."
 msgstr "Importar le chronologia de mi amicos."
 
-#: twittersettings.php:202
+#: twittersettings.php:201
 msgid "Add"
 msgstr "Adder"
 
-#: twittersettings.php:236
+#: twittersettings.php:235
 msgid "Unexpected form submission."
 msgstr "Submission de formulario inexpectate."
 
-#: twittersettings.php:251
+#: twittersettings.php:250
 msgid "No Twitter connection to remove."
 msgstr "Nulle connexion Twitter a remover."
 
-#: twittersettings.php:259
+#: twittersettings.php:258
 msgid "Couldn't remove Twitter user."
 msgstr "Non poteva remover le usator de Twitter."
 
-#: twittersettings.php:263
+#: twittersettings.php:262
 msgid "Twitter account disconnected."
 msgstr "Conto de Twitter disconnectite."
 
-#: twittersettings.php:283 twittersettings.php:294
+#: twittersettings.php:282 twittersettings.php:293
 msgid "Couldn't save Twitter preferences."
 msgstr "Non poteva salveguardar le preferentias de Twitter."
 
-#: twittersettings.php:302
+#: twittersettings.php:301
 msgid "Twitter preferences saved."
 msgstr "Preferentias de Twitter salveguardate."
diff --git a/plugins/TwitterBridge/locale/mk/LC_MESSAGES/TwitterBridge.po b/plugins/TwitterBridge/locale/mk/LC_MESSAGES/TwitterBridge.po
index 5120942bc9..b242639ee7 100644
--- a/plugins/TwitterBridge/locale/mk/LC_MESSAGES/TwitterBridge.po
+++ b/plugins/TwitterBridge/locale/mk/LC_MESSAGES/TwitterBridge.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TwitterBridge\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-14 16:01+0000\n"
-"PO-Revision-Date: 2011-02-14 16:10:26+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:13+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:14+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r82114); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-02-14 17:22:14+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-twitterbridge\n"
@@ -153,7 +153,7 @@ msgstr ""
 "Им овозможува на корисниците да ги увезуваат хронологиите на нивните "
 "пријатели на Twitter. Бара рачно нагодување на демоните."
 
-#: twitteradminpanel.php:293 twittersettings.php:200
+#: twitteradminpanel.php:293 twittersettings.php:199
 msgid "Save"
 msgstr "Зачувај"
 
@@ -177,7 +177,7 @@ msgstr "Најава со Вашата сметка од Twitter"
 msgid "Sign in with Twitter"
 msgstr "Најава со Twitter"
 
-#: twitterauthorization.php:120 twittersettings.php:226
+#: twitterauthorization.php:120 twittersettings.php:225
 msgid "There was a problem with your session token. Try again, please."
 msgstr "Се појави проблем со жетонот на Вашата сесија. Обидете се повторно."
 
@@ -301,11 +301,11 @@ msgstr "Грешка при поврзувањето на корисникот 
 msgid "Invalid username or password."
 msgstr "Неважечко корисничко име или лозинка."
 
-#: twittersettings.php:58
+#: twittersettings.php:57
 msgid "Twitter settings"
 msgstr "Нагодувања за Twitter"
 
-#: twittersettings.php:69
+#: twittersettings.php:68
 msgid ""
 "Connect your Twitter account to share your updates with your Twitter friends "
 "and vice-versa."
@@ -313,34 +313,34 @@ msgstr ""
 "Поврзете ја Вашата сметка на Twitter за да ги споделувате подновувањата со "
 "Вашите пријатели на Twitter и обратно."
 
-#: twittersettings.php:116
+#: twittersettings.php:115
 msgid "Twitter account"
 msgstr "Сметка на Twitter"
 
-#: twittersettings.php:121
+#: twittersettings.php:120
 msgid "Connected Twitter account"
 msgstr "Поврзана сметка на Twitter"
 
-#: twittersettings.php:126
+#: twittersettings.php:125
 msgid "Disconnect my account from Twitter"
 msgstr "Прекини ја врската со сметката на Twitter"
 
-#: twittersettings.php:132
+#: twittersettings.php:131
 msgid "Disconnecting your Twitter could make it impossible to log in! Please "
 msgstr ""
 "Ако ја прекинете врската со сметката на Twitter, нема да можете да се "
 "најавите! Затоа "
 
-#: twittersettings.php:136
+#: twittersettings.php:135
 msgid "set a password"
 msgstr "ставете лозинка"
 
-#: twittersettings.php:138
+#: twittersettings.php:137
 msgid " first."
 msgstr "пред да продолжите."
 
 #. TRANS: %1$s is the current website name.
-#: twittersettings.php:142
+#: twittersettings.php:141
 #, php-format
 msgid ""
 "Keep your %1$s account but disconnect from Twitter. You can use your %1$s "
@@ -349,54 +349,54 @@ msgstr ""
 "Задржете си ја сметката на %1$s, но прекинете ја врската со Twitter. За "
 "најава, користете ја Вашата лозинка на %1$s."
 
-#: twittersettings.php:150
+#: twittersettings.php:149
 msgid "Disconnect"
 msgstr "Прекини"
 
-#: twittersettings.php:157
+#: twittersettings.php:156
 msgid "Preferences"
 msgstr "Нагодувања"
 
-#: twittersettings.php:161
+#: twittersettings.php:160
 msgid "Automatically send my notices to Twitter."
 msgstr "Автоматски испраќај ми ги забелешките на Twitter."
 
-#: twittersettings.php:168
+#: twittersettings.php:167
 msgid "Send local \"@\" replies to Twitter."
 msgstr "Испраќај локални „@“ одговори на Twitter."
 
-#: twittersettings.php:175
+#: twittersettings.php:174
 msgid "Subscribe to my Twitter friends here."
 msgstr "Претплатете се на пријателите од Twitter тука."
 
-#: twittersettings.php:184
+#: twittersettings.php:183
 msgid "Import my friends timeline."
 msgstr "Увези ја хронологијата на моите пријатели."
 
-#: twittersettings.php:202
+#: twittersettings.php:201
 msgid "Add"
 msgstr "Додај"
 
-#: twittersettings.php:236
+#: twittersettings.php:235
 msgid "Unexpected form submission."
 msgstr "Неочекувано поднесување на образец."
 
-#: twittersettings.php:251
+#: twittersettings.php:250
 msgid "No Twitter connection to remove."
 msgstr "Нема врска со Twitter за отстранување."
 
-#: twittersettings.php:259
+#: twittersettings.php:258
 msgid "Couldn't remove Twitter user."
 msgstr "Не можев да го отстранам корисникот на Twitter."
 
-#: twittersettings.php:263
+#: twittersettings.php:262
 msgid "Twitter account disconnected."
 msgstr "Врската со сметката на Twitter е прекината."
 
-#: twittersettings.php:283 twittersettings.php:294
+#: twittersettings.php:282 twittersettings.php:293
 msgid "Couldn't save Twitter preferences."
 msgstr "Не можев да ги зачувам нагодувањата за Twitter."
 
-#: twittersettings.php:302
+#: twittersettings.php:301
 msgid "Twitter preferences saved."
 msgstr "Нагодувањата за Twitter се зачувани."
diff --git a/plugins/TwitterBridge/locale/nl/LC_MESSAGES/TwitterBridge.po b/plugins/TwitterBridge/locale/nl/LC_MESSAGES/TwitterBridge.po
index 37b3b77f52..45a9a209aa 100644
--- a/plugins/TwitterBridge/locale/nl/LC_MESSAGES/TwitterBridge.po
+++ b/plugins/TwitterBridge/locale/nl/LC_MESSAGES/TwitterBridge.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TwitterBridge\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-14 16:01+0000\n"
-"PO-Revision-Date: 2011-02-14 16:10:26+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:13+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:14+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r82114); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-02-14 17:22:14+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-twitterbridge\n"
@@ -156,7 +156,7 @@ msgstr ""
 "Gebruikers toestaan de tijdlijnen van hun Twittervrienden te importeren. "
 "Vereist handmatig te configureren daemons."
 
-#: twitteradminpanel.php:293 twittersettings.php:200
+#: twitteradminpanel.php:293 twittersettings.php:199
 msgid "Save"
 msgstr "Opslaan"
 
@@ -180,7 +180,7 @@ msgstr "Aanmelden met uw Twittergebruiker"
 msgid "Sign in with Twitter"
 msgstr "Aanmelden met Twitter"
 
-#: twitterauthorization.php:120 twittersettings.php:226
+#: twitterauthorization.php:120 twittersettings.php:225
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 "Er is een probleem ontstaan met uw sessie. Probeer het nog een keer, "
@@ -307,11 +307,11 @@ msgstr "Fout bij het verbinden van de gebruiker met Twitter."
 msgid "Invalid username or password."
 msgstr "Ongeldige gebruikersnaam of wachtwoord."
 
-#: twittersettings.php:58
+#: twittersettings.php:57
 msgid "Twitter settings"
 msgstr "Twitterinstellingen"
 
-#: twittersettings.php:69
+#: twittersettings.php:68
 msgid ""
 "Connect your Twitter account to share your updates with your Twitter friends "
 "and vice-versa."
@@ -319,34 +319,34 @@ msgstr ""
 "Koppel uw Twittergebruiker om uw berichten te delen met uw Twittervrienden "
 "en vice versa."
 
-#: twittersettings.php:116
+#: twittersettings.php:115
 msgid "Twitter account"
 msgstr "Twittergebruiker"
 
-#: twittersettings.php:121
+#: twittersettings.php:120
 msgid "Connected Twitter account"
 msgstr "Gekoppelde Twittergebruiker"
 
-#: twittersettings.php:126
+#: twittersettings.php:125
 msgid "Disconnect my account from Twitter"
 msgstr "Mijn gebruiker loskoppelen van Twitter"
 
-#: twittersettings.php:132
+#: twittersettings.php:131
 msgid "Disconnecting your Twitter could make it impossible to log in! Please "
 msgstr ""
 "Loskoppelen van uw Twittergebruiker zou ervoor zorgen dat u niet langer kunt "
 "aanmelden. U moet eerst "
 
-#: twittersettings.php:136
+#: twittersettings.php:135
 msgid "set a password"
 msgstr "een wachtwoord instellen"
 
-#: twittersettings.php:138
+#: twittersettings.php:137
 msgid " first."
 msgstr " voordat u verder kunt met deze handeling."
 
 #. TRANS: %1$s is the current website name.
-#: twittersettings.php:142
+#: twittersettings.php:141
 #, php-format
 msgid ""
 "Keep your %1$s account but disconnect from Twitter. You can use your %1$s "
@@ -355,54 +355,54 @@ msgstr ""
 "Uw gebruiker bij %1$s behouden maar deze loskoppelen van Twitter. U kunt uw "
 "wachtwoord van %1$s gebruiken om aan te melden."
 
-#: twittersettings.php:150
+#: twittersettings.php:149
 msgid "Disconnect"
 msgstr "Loskoppelen"
 
-#: twittersettings.php:157
+#: twittersettings.php:156
 msgid "Preferences"
 msgstr "Voorkeuren"
 
-#: twittersettings.php:161
+#: twittersettings.php:160
 msgid "Automatically send my notices to Twitter."
 msgstr "Mijn berichten automatisch naar Twitter verzenden"
 
-#: twittersettings.php:168
+#: twittersettings.php:167
 msgid "Send local \"@\" replies to Twitter."
 msgstr "Lokale antwoorden met \"2\" naar Twitter verzenden."
 
-#: twittersettings.php:175
+#: twittersettings.php:174
 msgid "Subscribe to my Twitter friends here."
 msgstr "Hier op mijn Twittervrienden abonneren."
 
-#: twittersettings.php:184
+#: twittersettings.php:183
 msgid "Import my friends timeline."
 msgstr "Tijdlijn van mijn vrienden importeren."
 
-#: twittersettings.php:202
+#: twittersettings.php:201
 msgid "Add"
 msgstr "Toevoegen"
 
-#: twittersettings.php:236
+#: twittersettings.php:235
 msgid "Unexpected form submission."
 msgstr "Het formulier is onverwacht ingezonden."
 
-#: twittersettings.php:251
+#: twittersettings.php:250
 msgid "No Twitter connection to remove."
 msgstr "Er is geen Twitterkoppeling om te verwijderen."
 
-#: twittersettings.php:259
+#: twittersettings.php:258
 msgid "Couldn't remove Twitter user."
 msgstr "Het was niet mogelijk de Twittergebruiker te verwijderen."
 
-#: twittersettings.php:263
+#: twittersettings.php:262
 msgid "Twitter account disconnected."
 msgstr "De Twittergebruiker is ontkoppeld."
 
-#: twittersettings.php:283 twittersettings.php:294
+#: twittersettings.php:282 twittersettings.php:293
 msgid "Couldn't save Twitter preferences."
 msgstr "Het was niet mogelijk de Twittervoorkeuren op te slaan."
 
-#: twittersettings.php:302
+#: twittersettings.php:301
 msgid "Twitter preferences saved."
 msgstr "De Twitterinstellingen zijn opgeslagen."
diff --git a/plugins/TwitterBridge/locale/tr/LC_MESSAGES/TwitterBridge.po b/plugins/TwitterBridge/locale/tr/LC_MESSAGES/TwitterBridge.po
index 8741adf4b4..7b23e06920 100644
--- a/plugins/TwitterBridge/locale/tr/LC_MESSAGES/TwitterBridge.po
+++ b/plugins/TwitterBridge/locale/tr/LC_MESSAGES/TwitterBridge.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TwitterBridge\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-14 16:01+0000\n"
-"PO-Revision-Date: 2011-02-14 16:10:26+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:13+0000\n"
 "Language-Team: Turkish <http://translatewiki.net/wiki/Portal:tr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:14+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r82114); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-02-14 17:22:14+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tr\n"
 "X-Message-Group: #out-statusnet-plugin-twitterbridge\n"
@@ -137,7 +137,7 @@ msgid ""
 "be manually configured."
 msgstr ""
 
-#: twitteradminpanel.php:293 twittersettings.php:200
+#: twitteradminpanel.php:293 twittersettings.php:199
 msgid "Save"
 msgstr "Kaydet"
 
@@ -161,7 +161,7 @@ msgstr "Twitter hesabınızla giriş yapın"
 msgid "Sign in with Twitter"
 msgstr ""
 
-#: twitterauthorization.php:120 twittersettings.php:226
+#: twitterauthorization.php:120 twittersettings.php:225
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 
@@ -285,11 +285,11 @@ msgstr "Twitter'a kullanıcı bağlama hatası."
 msgid "Invalid username or password."
 msgstr "Geçersiz kullanıcı adı veya parola."
 
-#: twittersettings.php:58
+#: twittersettings.php:57
 msgid "Twitter settings"
 msgstr "Twitter ayarları"
 
-#: twittersettings.php:69
+#: twittersettings.php:68
 msgid ""
 "Connect your Twitter account to share your updates with your Twitter friends "
 "and vice-versa."
@@ -297,86 +297,86 @@ msgstr ""
 "Güncellemelerinizi Twitter arkadaşlarınızla paylaşmak ve onların sizi takip "
 "edebilmesi için Twitter hesabınızla bağlantı kurun."
 
-#: twittersettings.php:116
+#: twittersettings.php:115
 msgid "Twitter account"
 msgstr "Twitter hesabı"
 
-#: twittersettings.php:121
+#: twittersettings.php:120
 msgid "Connected Twitter account"
 msgstr "Bağlı Twitter hesabı"
 
-#: twittersettings.php:126
+#: twittersettings.php:125
 msgid "Disconnect my account from Twitter"
 msgstr "Hesabımın Twitter bağlantısını kes."
 
-#: twittersettings.php:132
+#: twittersettings.php:131
 msgid "Disconnecting your Twitter could make it impossible to log in! Please "
 msgstr ""
 
-#: twittersettings.php:136
+#: twittersettings.php:135
 msgid "set a password"
 msgstr "bir parola ayarla"
 
-#: twittersettings.php:138
+#: twittersettings.php:137
 msgid " first."
 msgstr " ilk."
 
 #. TRANS: %1$s is the current website name.
-#: twittersettings.php:142
+#: twittersettings.php:141
 #, php-format
 msgid ""
 "Keep your %1$s account but disconnect from Twitter. You can use your %1$s "
 "password to log in."
 msgstr ""
 
-#: twittersettings.php:150
+#: twittersettings.php:149
 msgid "Disconnect"
 msgstr "Bağlantıyı Kes"
 
-#: twittersettings.php:157
+#: twittersettings.php:156
 msgid "Preferences"
 msgstr "Tercihler"
 
-#: twittersettings.php:161
+#: twittersettings.php:160
 msgid "Automatically send my notices to Twitter."
 msgstr "Durum mesajlarımı otomatik olarak Twitter'a gönder."
 
-#: twittersettings.php:168
+#: twittersettings.php:167
 msgid "Send local \"@\" replies to Twitter."
 msgstr ""
 
-#: twittersettings.php:175
+#: twittersettings.php:174
 msgid "Subscribe to my Twitter friends here."
 msgstr ""
 
-#: twittersettings.php:184
+#: twittersettings.php:183
 msgid "Import my friends timeline."
 msgstr "Arkadaşlarımın zaman çizelgesini içeri aktar."
 
-#: twittersettings.php:202
+#: twittersettings.php:201
 msgid "Add"
 msgstr "Ekle"
 
-#: twittersettings.php:236
+#: twittersettings.php:235
 msgid "Unexpected form submission."
 msgstr "Beklenmedik form gönderimi."
 
-#: twittersettings.php:251
+#: twittersettings.php:250
 msgid "No Twitter connection to remove."
 msgstr ""
 
-#: twittersettings.php:259
+#: twittersettings.php:258
 msgid "Couldn't remove Twitter user."
 msgstr "Twitter kullanıcısı silinemedi."
 
-#: twittersettings.php:263
+#: twittersettings.php:262
 msgid "Twitter account disconnected."
 msgstr "Twitter hesabı bağlantısı kesildi."
 
-#: twittersettings.php:283 twittersettings.php:294
+#: twittersettings.php:282 twittersettings.php:293
 msgid "Couldn't save Twitter preferences."
 msgstr "Twitter tercihleri kaydedilemedi."
 
-#: twittersettings.php:302
+#: twittersettings.php:301
 msgid "Twitter preferences saved."
 msgstr "Twitter tercihleriniz kaydedildi."
diff --git a/plugins/TwitterBridge/locale/uk/LC_MESSAGES/TwitterBridge.po b/plugins/TwitterBridge/locale/uk/LC_MESSAGES/TwitterBridge.po
index fa2b4acc51..68945904f0 100644
--- a/plugins/TwitterBridge/locale/uk/LC_MESSAGES/TwitterBridge.po
+++ b/plugins/TwitterBridge/locale/uk/LC_MESSAGES/TwitterBridge.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TwitterBridge\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-14 16:01+0000\n"
-"PO-Revision-Date: 2011-02-14 16:10:26+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:13+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:14+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r82114); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-02-14 17:22:14+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-twitterbridge\n"
@@ -155,7 +155,7 @@ msgstr ""
 "Дозволити користувачам імпортувати їхні стрічки дописів з Twitter. Це "
 "вимагає ручної настройки процесів типу «daemon»."
 
-#: twitteradminpanel.php:293 twittersettings.php:200
+#: twitteradminpanel.php:293 twittersettings.php:199
 msgid "Save"
 msgstr "Зберегти"
 
@@ -179,7 +179,7 @@ msgstr "Увійти за допомогою акаунту Twitter"
 msgid "Sign in with Twitter"
 msgstr "Увійти з акаунтом Twitter"
 
-#: twitterauthorization.php:120 twittersettings.php:226
+#: twitterauthorization.php:120 twittersettings.php:225
 msgid "There was a problem with your session token. Try again, please."
 msgstr "Виникли певні проблеми з токеном сесії. Спробуйте знов, будь ласка."
 
@@ -303,11 +303,11 @@ msgstr "Помилка при підключенні користувача до
 msgid "Invalid username or password."
 msgstr "Недійсне ім’я або пароль."
 
-#: twittersettings.php:58
+#: twittersettings.php:57
 msgid "Twitter settings"
 msgstr "Налаштування Twitter"
 
-#: twittersettings.php:69
+#: twittersettings.php:68
 msgid ""
 "Connect your Twitter account to share your updates with your Twitter friends "
 "and vice-versa."
@@ -315,34 +315,34 @@ msgstr ""
 "Підключіть ваш акаунт Twitter, щоб ділитися новими дописами з друзями в "
 "Twitter і навпаки."
 
-#: twittersettings.php:116
+#: twittersettings.php:115
 msgid "Twitter account"
 msgstr "Акаунт Twitter"
 
-#: twittersettings.php:121
+#: twittersettings.php:120
 msgid "Connected Twitter account"
 msgstr "Під’єднаний акаунт Twitter"
 
-#: twittersettings.php:126
+#: twittersettings.php:125
 msgid "Disconnect my account from Twitter"
 msgstr "Від’єднати мій акаунт від Twitter"
 
-#: twittersettings.php:132
+#: twittersettings.php:131
 msgid "Disconnecting your Twitter could make it impossible to log in! Please "
 msgstr ""
 "Якщо ви від’єднаєте свій Twitter, то це унеможливить вхід до системи у "
 "майбутньому! Будь ласка, "
 
-#: twittersettings.php:136
+#: twittersettings.php:135
 msgid "set a password"
 msgstr "встановіть пароль"
 
-#: twittersettings.php:138
+#: twittersettings.php:137
 msgid " first."
 msgstr " спочатку."
 
 #. TRANS: %1$s is the current website name.
-#: twittersettings.php:142
+#: twittersettings.php:141
 #, php-format
 msgid ""
 "Keep your %1$s account but disconnect from Twitter. You can use your %1$s "
@@ -351,54 +351,54 @@ msgstr ""
 "Зберегти ваш акаунт %1$s, але від’єднати його від Twitter. Ви можете "
 "використовувати пароль від %1$s для входу на сайт."
 
-#: twittersettings.php:150
+#: twittersettings.php:149
 msgid "Disconnect"
 msgstr "Від’єднати"
 
-#: twittersettings.php:157
+#: twittersettings.php:156
 msgid "Preferences"
 msgstr "Налаштування"
 
-#: twittersettings.php:161
+#: twittersettings.php:160
 msgid "Automatically send my notices to Twitter."
 msgstr "Автоматично пересилати мої дописи на Twitter."
 
-#: twittersettings.php:168
+#: twittersettings.php:167
 msgid "Send local \"@\" replies to Twitter."
 msgstr "Надіслати локальні «@» відповіді на Twitter."
 
-#: twittersettings.php:175
+#: twittersettings.php:174
 msgid "Subscribe to my Twitter friends here."
 msgstr "Підписатись до моїх друзів з Twitter тут."
 
-#: twittersettings.php:184
+#: twittersettings.php:183
 msgid "Import my friends timeline."
 msgstr "Імпортувати стрічку дописів моїх друзів."
 
-#: twittersettings.php:202
+#: twittersettings.php:201
 msgid "Add"
 msgstr "Додати"
 
-#: twittersettings.php:236
+#: twittersettings.php:235
 msgid "Unexpected form submission."
 msgstr "Несподіване представлення форми."
 
-#: twittersettings.php:251
+#: twittersettings.php:250
 msgid "No Twitter connection to remove."
 msgstr "Не виявлено з’єднань з Twitter для видалення."
 
-#: twittersettings.php:259
+#: twittersettings.php:258
 msgid "Couldn't remove Twitter user."
 msgstr "Не вдається видалити користувача Twitter."
 
-#: twittersettings.php:263
+#: twittersettings.php:262
 msgid "Twitter account disconnected."
 msgstr "Акаунт Twitter від’єднано."
 
-#: twittersettings.php:283 twittersettings.php:294
+#: twittersettings.php:282 twittersettings.php:293
 msgid "Couldn't save Twitter preferences."
 msgstr "Не можу зберегти налаштування Twitter."
 
-#: twittersettings.php:302
+#: twittersettings.php:301
 msgid "Twitter preferences saved."
 msgstr "Налаштування Twitter збережено."
diff --git a/plugins/TwitterBridge/locale/zh_CN/LC_MESSAGES/TwitterBridge.po b/plugins/TwitterBridge/locale/zh_CN/LC_MESSAGES/TwitterBridge.po
index 51d528f2a4..5d1a69d7b7 100644
--- a/plugins/TwitterBridge/locale/zh_CN/LC_MESSAGES/TwitterBridge.po
+++ b/plugins/TwitterBridge/locale/zh_CN/LC_MESSAGES/TwitterBridge.po
@@ -10,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TwitterBridge\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-14 16:01+0000\n"
-"PO-Revision-Date: 2011-02-14 16:10:27+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:13+0000\n"
 "Language-Team: Simplified Chinese <http://translatewiki.net/wiki/Portal:zh-"
 "hans>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:14+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r82114); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-02-14 17:22:14+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-twitterbridge\n"
@@ -150,7 +150,7 @@ msgid ""
 "be manually configured."
 msgstr "允许用户导入他们 Twitter 好友的时间线。需要手动设置后台进程。"
 
-#: twitteradminpanel.php:293 twittersettings.php:200
+#: twitteradminpanel.php:293 twittersettings.php:199
 msgid "Save"
 msgstr "保存"
 
@@ -174,7 +174,7 @@ msgstr "使用你的 Twitter 帐号登录"
 msgid "Sign in with Twitter"
 msgstr "使用 Twitter 登录"
 
-#: twitterauthorization.php:120 twittersettings.php:226
+#: twitterauthorization.php:120 twittersettings.php:225
 msgid "There was a problem with your session token. Try again, please."
 msgstr "你的 session token 出现了一个问题，请重试。"
 
@@ -293,97 +293,97 @@ msgstr "关联用户到 Twitter 出错。"
 msgid "Invalid username or password."
 msgstr "用户名或密码不正确。"
 
-#: twittersettings.php:58
+#: twittersettings.php:57
 msgid "Twitter settings"
 msgstr "Twitter 设置"
 
-#: twittersettings.php:69
+#: twittersettings.php:68
 msgid ""
 "Connect your Twitter account to share your updates with your Twitter friends "
 "and vice-versa."
 msgstr ""
 "关联你的 Twitter 帐号并与你的 Twitter 好友分享你的更新和查看好友的更新。"
 
-#: twittersettings.php:116
+#: twittersettings.php:115
 msgid "Twitter account"
 msgstr "Twitter 帐号"
 
-#: twittersettings.php:121
+#: twittersettings.php:120
 msgid "Connected Twitter account"
 msgstr "已关联的 Twitter 帐号"
 
-#: twittersettings.php:126
+#: twittersettings.php:125
 msgid "Disconnect my account from Twitter"
 msgstr "取消我的帐号与 Twitter 的关联"
 
-#: twittersettings.php:132
+#: twittersettings.php:131
 msgid "Disconnecting your Twitter could make it impossible to log in! Please "
 msgstr "取消关联你的 Twitter 帐号和能会导致无法登录！请"
 
-#: twittersettings.php:136
+#: twittersettings.php:135
 msgid "set a password"
 msgstr "设置一个密码"
 
-#: twittersettings.php:138
+#: twittersettings.php:137
 msgid " first."
 msgstr "先。"
 
 #. TRANS: %1$s is the current website name.
-#: twittersettings.php:142
+#: twittersettings.php:141
 #, php-format
 msgid ""
 "Keep your %1$s account but disconnect from Twitter. You can use your %1$s "
 "password to log in."
 msgstr "保留你的 %1$s 帐号并取消关联 Twitter。你可以使用你的 %1$s 密码来登录。"
 
-#: twittersettings.php:150
+#: twittersettings.php:149
 msgid "Disconnect"
 msgstr "取消关联"
 
-#: twittersettings.php:157
+#: twittersettings.php:156
 msgid "Preferences"
 msgstr "参数设置"
 
-#: twittersettings.php:161
+#: twittersettings.php:160
 msgid "Automatically send my notices to Twitter."
 msgstr "自动将我的消息发送到 Twitter。"
 
-#: twittersettings.php:168
+#: twittersettings.php:167
 msgid "Send local \"@\" replies to Twitter."
 msgstr "将本地的“@”回复发送到 Twitter。"
 
-#: twittersettings.php:175
+#: twittersettings.php:174
 msgid "Subscribe to my Twitter friends here."
 msgstr "关注我在这里的 Twitter 好友。"
 
-#: twittersettings.php:184
+#: twittersettings.php:183
 msgid "Import my friends timeline."
 msgstr "导入我好友的时间线。"
 
-#: twittersettings.php:202
+#: twittersettings.php:201
 msgid "Add"
 msgstr "添加"
 
-#: twittersettings.php:236
+#: twittersettings.php:235
 msgid "Unexpected form submission."
 msgstr "未预料的表单提交。"
 
-#: twittersettings.php:251
+#: twittersettings.php:250
 msgid "No Twitter connection to remove."
 msgstr "没有可以移除的Twitter连接。"
 
-#: twittersettings.php:259
+#: twittersettings.php:258
 msgid "Couldn't remove Twitter user."
 msgstr "无法删除 Twitter 用户。"
 
-#: twittersettings.php:263
+#: twittersettings.php:262
 msgid "Twitter account disconnected."
 msgstr "已取消 Twitter 帐号关联。"
 
-#: twittersettings.php:283 twittersettings.php:294
+#: twittersettings.php:282 twittersettings.php:293
 msgid "Couldn't save Twitter preferences."
 msgstr "无法保存 Twitter 参数设置。"
 
-#: twittersettings.php:302
+#: twittersettings.php:301
 msgid "Twitter preferences saved."
 msgstr "已保存 Twitter 参数设置。"
diff --git a/plugins/UserFlag/locale/UserFlag.pot b/plugins/UserFlag/locale/UserFlag.pot
index 5cd5ca7062..d85e58424f 100644
--- a/plugins/UserFlag/locale/UserFlag.pot
+++ b/plugins/UserFlag/locale/UserFlag.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/UserFlag/locale/ca/LC_MESSAGES/UserFlag.po b/plugins/UserFlag/locale/ca/LC_MESSAGES/UserFlag.po
index e05b5a2375..31061daf79 100644
--- a/plugins/UserFlag/locale/ca/LC_MESSAGES/UserFlag.po
+++ b/plugins/UserFlag/locale/ca/LC_MESSAGES/UserFlag.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - UserFlag\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:38+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:15+0000\n"
 "Language-Team: Catalan <http://translatewiki.net/wiki/Portal:ca>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:22:21+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:29:15+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ca\n"
 "X-Message-Group: #out-statusnet-plugin-userflag\n"
diff --git a/plugins/UserFlag/locale/fr/LC_MESSAGES/UserFlag.po b/plugins/UserFlag/locale/fr/LC_MESSAGES/UserFlag.po
index ea9fce2479..703364021e 100644
--- a/plugins/UserFlag/locale/fr/LC_MESSAGES/UserFlag.po
+++ b/plugins/UserFlag/locale/fr/LC_MESSAGES/UserFlag.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - UserFlag\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:38+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:15+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:22:21+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:29:15+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-userflag\n"
diff --git a/plugins/UserFlag/locale/ia/LC_MESSAGES/UserFlag.po b/plugins/UserFlag/locale/ia/LC_MESSAGES/UserFlag.po
index a25e411ab4..376cf02b05 100644
--- a/plugins/UserFlag/locale/ia/LC_MESSAGES/UserFlag.po
+++ b/plugins/UserFlag/locale/ia/LC_MESSAGES/UserFlag.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - UserFlag\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:38+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:15+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:22:21+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:29:15+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-userflag\n"
diff --git a/plugins/UserFlag/locale/mk/LC_MESSAGES/UserFlag.po b/plugins/UserFlag/locale/mk/LC_MESSAGES/UserFlag.po
index 8cc38e1e52..204b755c3b 100644
--- a/plugins/UserFlag/locale/mk/LC_MESSAGES/UserFlag.po
+++ b/plugins/UserFlag/locale/mk/LC_MESSAGES/UserFlag.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - UserFlag\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:38+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:15+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:22:21+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:29:15+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-userflag\n"
diff --git a/plugins/UserFlag/locale/nl/LC_MESSAGES/UserFlag.po b/plugins/UserFlag/locale/nl/LC_MESSAGES/UserFlag.po
index 66595bfb94..0e791fc2b2 100644
--- a/plugins/UserFlag/locale/nl/LC_MESSAGES/UserFlag.po
+++ b/plugins/UserFlag/locale/nl/LC_MESSAGES/UserFlag.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - UserFlag\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:38+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:15+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:22:21+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:29:15+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-userflag\n"
diff --git a/plugins/UserFlag/locale/pt/LC_MESSAGES/UserFlag.po b/plugins/UserFlag/locale/pt/LC_MESSAGES/UserFlag.po
index 4749da312a..b85c2aefd1 100644
--- a/plugins/UserFlag/locale/pt/LC_MESSAGES/UserFlag.po
+++ b/plugins/UserFlag/locale/pt/LC_MESSAGES/UserFlag.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - UserFlag\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:38+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:15+0000\n"
 "Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:22:21+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:29:15+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-plugin-userflag\n"
diff --git a/plugins/UserFlag/locale/ru/LC_MESSAGES/UserFlag.po b/plugins/UserFlag/locale/ru/LC_MESSAGES/UserFlag.po
index 2380541770..299d3b6d81 100644
--- a/plugins/UserFlag/locale/ru/LC_MESSAGES/UserFlag.po
+++ b/plugins/UserFlag/locale/ru/LC_MESSAGES/UserFlag.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - UserFlag\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:38+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:15+0000\n"
 "Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:22:21+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:29:15+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-userflag\n"
diff --git a/plugins/UserFlag/locale/uk/LC_MESSAGES/UserFlag.po b/plugins/UserFlag/locale/uk/LC_MESSAGES/UserFlag.po
index e72a05fd1a..d17c6ff308 100644
--- a/plugins/UserFlag/locale/uk/LC_MESSAGES/UserFlag.po
+++ b/plugins/UserFlag/locale/uk/LC_MESSAGES/UserFlag.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - UserFlag\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:38+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:15+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:22:21+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:29:15+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-userflag\n"
diff --git a/plugins/UserLimit/locale/UserLimit.pot b/plugins/UserLimit/locale/UserLimit.pot
index 92b4da5180..e716e93ba9 100644
--- a/plugins/UserLimit/locale/UserLimit.pot
+++ b/plugins/UserLimit/locale/UserLimit.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/UserLimit/locale/br/LC_MESSAGES/UserLimit.po b/plugins/UserLimit/locale/br/LC_MESSAGES/UserLimit.po
index 741323eab8..658dbf4b8f 100644
--- a/plugins/UserLimit/locale/br/LC_MESSAGES/UserLimit.po
+++ b/plugins/UserLimit/locale/br/LC_MESSAGES/UserLimit.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - UserLimit\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:39+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:15+0000\n"
 "Language-Team: Breton <http://translatewiki.net/wiki/Portal:br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:22:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:29:16+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-userlimit\n"
diff --git a/plugins/UserLimit/locale/de/LC_MESSAGES/UserLimit.po b/plugins/UserLimit/locale/de/LC_MESSAGES/UserLimit.po
index efa2dbec83..cbc3cc0baf 100644
--- a/plugins/UserLimit/locale/de/LC_MESSAGES/UserLimit.po
+++ b/plugins/UserLimit/locale/de/LC_MESSAGES/UserLimit.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - UserLimit\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:39+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:15+0000\n"
 "Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:22:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:29:16+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-userlimit\n"
diff --git a/plugins/UserLimit/locale/es/LC_MESSAGES/UserLimit.po b/plugins/UserLimit/locale/es/LC_MESSAGES/UserLimit.po
index 23143bdc1d..1cf72b60c9 100644
--- a/plugins/UserLimit/locale/es/LC_MESSAGES/UserLimit.po
+++ b/plugins/UserLimit/locale/es/LC_MESSAGES/UserLimit.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - UserLimit\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:39+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:15+0000\n"
 "Language-Team: Spanish <http://translatewiki.net/wiki/Portal:es>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:22:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:29:16+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-userlimit\n"
diff --git a/plugins/UserLimit/locale/fi/LC_MESSAGES/UserLimit.po b/plugins/UserLimit/locale/fi/LC_MESSAGES/UserLimit.po
index 9da37f1188..d8eabfc7ce 100644
--- a/plugins/UserLimit/locale/fi/LC_MESSAGES/UserLimit.po
+++ b/plugins/UserLimit/locale/fi/LC_MESSAGES/UserLimit.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - UserLimit\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:39+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:15+0000\n"
 "Language-Team: Finnish <http://translatewiki.net/wiki/Portal:fi>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:22:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:29:16+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fi\n"
 "X-Message-Group: #out-statusnet-plugin-userlimit\n"
diff --git a/plugins/UserLimit/locale/fr/LC_MESSAGES/UserLimit.po b/plugins/UserLimit/locale/fr/LC_MESSAGES/UserLimit.po
index 569a836ef0..a7b4eb8d1c 100644
--- a/plugins/UserLimit/locale/fr/LC_MESSAGES/UserLimit.po
+++ b/plugins/UserLimit/locale/fr/LC_MESSAGES/UserLimit.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - UserLimit\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:39+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:15+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:22:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:29:16+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-userlimit\n"
diff --git a/plugins/UserLimit/locale/gl/LC_MESSAGES/UserLimit.po b/plugins/UserLimit/locale/gl/LC_MESSAGES/UserLimit.po
index af6f4c2cd4..e36479a1e1 100644
--- a/plugins/UserLimit/locale/gl/LC_MESSAGES/UserLimit.po
+++ b/plugins/UserLimit/locale/gl/LC_MESSAGES/UserLimit.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - UserLimit\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:39+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:15+0000\n"
 "Language-Team: Galician <http://translatewiki.net/wiki/Portal:gl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:22:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:29:16+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: gl\n"
 "X-Message-Group: #out-statusnet-plugin-userlimit\n"
diff --git a/plugins/UserLimit/locale/he/LC_MESSAGES/UserLimit.po b/plugins/UserLimit/locale/he/LC_MESSAGES/UserLimit.po
index 856f57bf68..d14e614e16 100644
--- a/plugins/UserLimit/locale/he/LC_MESSAGES/UserLimit.po
+++ b/plugins/UserLimit/locale/he/LC_MESSAGES/UserLimit.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - UserLimit\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:39+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:15+0000\n"
 "Language-Team: Hebrew <http://translatewiki.net/wiki/Portal:he>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:22:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:29:16+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-plugin-userlimit\n"
diff --git a/plugins/UserLimit/locale/ia/LC_MESSAGES/UserLimit.po b/plugins/UserLimit/locale/ia/LC_MESSAGES/UserLimit.po
index 443d2e8f28..e6eebc8d39 100644
--- a/plugins/UserLimit/locale/ia/LC_MESSAGES/UserLimit.po
+++ b/plugins/UserLimit/locale/ia/LC_MESSAGES/UserLimit.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - UserLimit\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:39+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:15+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:22:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:29:16+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-userlimit\n"
diff --git a/plugins/UserLimit/locale/id/LC_MESSAGES/UserLimit.po b/plugins/UserLimit/locale/id/LC_MESSAGES/UserLimit.po
index c0474d0a39..269f7edfd6 100644
--- a/plugins/UserLimit/locale/id/LC_MESSAGES/UserLimit.po
+++ b/plugins/UserLimit/locale/id/LC_MESSAGES/UserLimit.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - UserLimit\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:39+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:15+0000\n"
 "Language-Team: Indonesian <http://translatewiki.net/wiki/Portal:id>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:22:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:29:16+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: id\n"
 "X-Message-Group: #out-statusnet-plugin-userlimit\n"
diff --git a/plugins/UserLimit/locale/lb/LC_MESSAGES/UserLimit.po b/plugins/UserLimit/locale/lb/LC_MESSAGES/UserLimit.po
index c6aae240e1..f89c8932ae 100644
--- a/plugins/UserLimit/locale/lb/LC_MESSAGES/UserLimit.po
+++ b/plugins/UserLimit/locale/lb/LC_MESSAGES/UserLimit.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - UserLimit\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:39+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:15+0000\n"
 "Language-Team: Luxembourgish <http://translatewiki.net/wiki/Portal:lb>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:22:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:29:16+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: lb\n"
 "X-Message-Group: #out-statusnet-plugin-userlimit\n"
diff --git a/plugins/UserLimit/locale/lv/LC_MESSAGES/UserLimit.po b/plugins/UserLimit/locale/lv/LC_MESSAGES/UserLimit.po
index 07122bb094..859475792b 100644
--- a/plugins/UserLimit/locale/lv/LC_MESSAGES/UserLimit.po
+++ b/plugins/UserLimit/locale/lv/LC_MESSAGES/UserLimit.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - UserLimit\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:39+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:15+0000\n"
 "Language-Team: Latvian <http://translatewiki.net/wiki/Portal:lv>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:22:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:29:16+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: lv\n"
 "X-Message-Group: #out-statusnet-plugin-userlimit\n"
diff --git a/plugins/UserLimit/locale/mk/LC_MESSAGES/UserLimit.po b/plugins/UserLimit/locale/mk/LC_MESSAGES/UserLimit.po
index 7842868251..5dfe980f0c 100644
--- a/plugins/UserLimit/locale/mk/LC_MESSAGES/UserLimit.po
+++ b/plugins/UserLimit/locale/mk/LC_MESSAGES/UserLimit.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - UserLimit\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:39+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:15+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:22:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:29:16+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-userlimit\n"
diff --git a/plugins/UserLimit/locale/nb/LC_MESSAGES/UserLimit.po b/plugins/UserLimit/locale/nb/LC_MESSAGES/UserLimit.po
index bb2755f2f3..3799089e61 100644
--- a/plugins/UserLimit/locale/nb/LC_MESSAGES/UserLimit.po
+++ b/plugins/UserLimit/locale/nb/LC_MESSAGES/UserLimit.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - UserLimit\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:39+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:15+0000\n"
 "Language-Team: Norwegian (bokmål)‬ <http://translatewiki.net/wiki/Portal:no>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:22:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:29:16+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: #out-statusnet-plugin-userlimit\n"
diff --git a/plugins/UserLimit/locale/nl/LC_MESSAGES/UserLimit.po b/plugins/UserLimit/locale/nl/LC_MESSAGES/UserLimit.po
index eae61cb887..961c1f6732 100644
--- a/plugins/UserLimit/locale/nl/LC_MESSAGES/UserLimit.po
+++ b/plugins/UserLimit/locale/nl/LC_MESSAGES/UserLimit.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - UserLimit\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:39+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:15+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:22:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:29:16+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-userlimit\n"
diff --git a/plugins/UserLimit/locale/pt/LC_MESSAGES/UserLimit.po b/plugins/UserLimit/locale/pt/LC_MESSAGES/UserLimit.po
index 934798b525..ce10755874 100644
--- a/plugins/UserLimit/locale/pt/LC_MESSAGES/UserLimit.po
+++ b/plugins/UserLimit/locale/pt/LC_MESSAGES/UserLimit.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - UserLimit\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:39+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:15+0000\n"
 "Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:22:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:29:16+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-plugin-userlimit\n"
diff --git a/plugins/UserLimit/locale/pt_BR/LC_MESSAGES/UserLimit.po b/plugins/UserLimit/locale/pt_BR/LC_MESSAGES/UserLimit.po
index 619d54b6ab..e2a4f7dc4c 100644
--- a/plugins/UserLimit/locale/pt_BR/LC_MESSAGES/UserLimit.po
+++ b/plugins/UserLimit/locale/pt_BR/LC_MESSAGES/UserLimit.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - UserLimit\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:39+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:15+0000\n"
 "Language-Team: Brazilian Portuguese <http://translatewiki.net/wiki/Portal:pt-"
 "br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:22:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:29:16+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt-br\n"
 "X-Message-Group: #out-statusnet-plugin-userlimit\n"
diff --git a/plugins/UserLimit/locale/ru/LC_MESSAGES/UserLimit.po b/plugins/UserLimit/locale/ru/LC_MESSAGES/UserLimit.po
index 709d009bbe..c72e38d998 100644
--- a/plugins/UserLimit/locale/ru/LC_MESSAGES/UserLimit.po
+++ b/plugins/UserLimit/locale/ru/LC_MESSAGES/UserLimit.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - UserLimit\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:39+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:15+0000\n"
 "Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:22:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:29:16+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-userlimit\n"
diff --git a/plugins/UserLimit/locale/tl/LC_MESSAGES/UserLimit.po b/plugins/UserLimit/locale/tl/LC_MESSAGES/UserLimit.po
index 3ad7a632dd..157ae59a6d 100644
--- a/plugins/UserLimit/locale/tl/LC_MESSAGES/UserLimit.po
+++ b/plugins/UserLimit/locale/tl/LC_MESSAGES/UserLimit.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - UserLimit\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:39+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:15+0000\n"
 "Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:22:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:29:16+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-userlimit\n"
diff --git a/plugins/UserLimit/locale/tr/LC_MESSAGES/UserLimit.po b/plugins/UserLimit/locale/tr/LC_MESSAGES/UserLimit.po
index ef3884d814..372b32a10b 100644
--- a/plugins/UserLimit/locale/tr/LC_MESSAGES/UserLimit.po
+++ b/plugins/UserLimit/locale/tr/LC_MESSAGES/UserLimit.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - UserLimit\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:39+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:15+0000\n"
 "Language-Team: Turkish <http://translatewiki.net/wiki/Portal:tr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:22:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:29:16+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tr\n"
 "X-Message-Group: #out-statusnet-plugin-userlimit\n"
diff --git a/plugins/UserLimit/locale/uk/LC_MESSAGES/UserLimit.po b/plugins/UserLimit/locale/uk/LC_MESSAGES/UserLimit.po
index 63cbaaba04..cf15ec04a4 100644
--- a/plugins/UserLimit/locale/uk/LC_MESSAGES/UserLimit.po
+++ b/plugins/UserLimit/locale/uk/LC_MESSAGES/UserLimit.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - UserLimit\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:39+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:15+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:22:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:29:16+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-userlimit\n"
diff --git a/plugins/WikiHashtags/locale/WikiHashtags.pot b/plugins/WikiHashtags/locale/WikiHashtags.pot
index 6c1c306e90..02e425fb2e 100644
--- a/plugins/WikiHashtags/locale/WikiHashtags.pot
+++ b/plugins/WikiHashtags/locale/WikiHashtags.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/WikiHashtags/locale/br/LC_MESSAGES/WikiHashtags.po b/plugins/WikiHashtags/locale/br/LC_MESSAGES/WikiHashtags.po
index bce3a314d4..a26b1467e3 100644
--- a/plugins/WikiHashtags/locale/br/LC_MESSAGES/WikiHashtags.po
+++ b/plugins/WikiHashtags/locale/br/LC_MESSAGES/WikiHashtags.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - WikiHashtags\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:39+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:16+0000\n"
 "Language-Team: Breton <http://translatewiki.net/wiki/Portal:br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:22:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:29:51+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-wikihashtags\n"
diff --git a/plugins/WikiHashtags/locale/de/LC_MESSAGES/WikiHashtags.po b/plugins/WikiHashtags/locale/de/LC_MESSAGES/WikiHashtags.po
index fdf3033b9a..0c7761c44f 100644
--- a/plugins/WikiHashtags/locale/de/LC_MESSAGES/WikiHashtags.po
+++ b/plugins/WikiHashtags/locale/de/LC_MESSAGES/WikiHashtags.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - WikiHashtags\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:40+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:16+0000\n"
 "Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:22:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:29:51+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-wikihashtags\n"
diff --git a/plugins/WikiHashtags/locale/fr/LC_MESSAGES/WikiHashtags.po b/plugins/WikiHashtags/locale/fr/LC_MESSAGES/WikiHashtags.po
index 0bae818b94..0987b8c6d9 100644
--- a/plugins/WikiHashtags/locale/fr/LC_MESSAGES/WikiHashtags.po
+++ b/plugins/WikiHashtags/locale/fr/LC_MESSAGES/WikiHashtags.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - WikiHashtags\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:40+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:16+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:22:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:29:51+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-wikihashtags\n"
diff --git a/plugins/WikiHashtags/locale/he/LC_MESSAGES/WikiHashtags.po b/plugins/WikiHashtags/locale/he/LC_MESSAGES/WikiHashtags.po
index 0f41e8f9a1..72d6e19063 100644
--- a/plugins/WikiHashtags/locale/he/LC_MESSAGES/WikiHashtags.po
+++ b/plugins/WikiHashtags/locale/he/LC_MESSAGES/WikiHashtags.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - WikiHashtags\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:40+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:16+0000\n"
 "Language-Team: Hebrew <http://translatewiki.net/wiki/Portal:he>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:22:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:29:51+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-plugin-wikihashtags\n"
diff --git a/plugins/WikiHashtags/locale/ia/LC_MESSAGES/WikiHashtags.po b/plugins/WikiHashtags/locale/ia/LC_MESSAGES/WikiHashtags.po
index 0fb8e99c3a..8a1b620a95 100644
--- a/plugins/WikiHashtags/locale/ia/LC_MESSAGES/WikiHashtags.po
+++ b/plugins/WikiHashtags/locale/ia/LC_MESSAGES/WikiHashtags.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - WikiHashtags\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:40+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:16+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:22:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:29:51+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-wikihashtags\n"
diff --git a/plugins/WikiHashtags/locale/id/LC_MESSAGES/WikiHashtags.po b/plugins/WikiHashtags/locale/id/LC_MESSAGES/WikiHashtags.po
index 0a06ac1264..03c98b1444 100644
--- a/plugins/WikiHashtags/locale/id/LC_MESSAGES/WikiHashtags.po
+++ b/plugins/WikiHashtags/locale/id/LC_MESSAGES/WikiHashtags.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - WikiHashtags\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:40+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:16+0000\n"
 "Language-Team: Indonesian <http://translatewiki.net/wiki/Portal:id>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:22:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:29:51+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: id\n"
 "X-Message-Group: #out-statusnet-plugin-wikihashtags\n"
diff --git a/plugins/WikiHashtags/locale/mk/LC_MESSAGES/WikiHashtags.po b/plugins/WikiHashtags/locale/mk/LC_MESSAGES/WikiHashtags.po
index a96546cec6..3ab4e2653b 100644
--- a/plugins/WikiHashtags/locale/mk/LC_MESSAGES/WikiHashtags.po
+++ b/plugins/WikiHashtags/locale/mk/LC_MESSAGES/WikiHashtags.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - WikiHashtags\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:40+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:16+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:22:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:29:51+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-wikihashtags\n"
diff --git a/plugins/WikiHashtags/locale/nb/LC_MESSAGES/WikiHashtags.po b/plugins/WikiHashtags/locale/nb/LC_MESSAGES/WikiHashtags.po
index 3d6fe43627..3d299035e7 100644
--- a/plugins/WikiHashtags/locale/nb/LC_MESSAGES/WikiHashtags.po
+++ b/plugins/WikiHashtags/locale/nb/LC_MESSAGES/WikiHashtags.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - WikiHashtags\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:40+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:16+0000\n"
 "Language-Team: Norwegian (bokmål)‬ <http://translatewiki.net/wiki/Portal:no>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:22:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:29:51+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: #out-statusnet-plugin-wikihashtags\n"
diff --git a/plugins/WikiHashtags/locale/nl/LC_MESSAGES/WikiHashtags.po b/plugins/WikiHashtags/locale/nl/LC_MESSAGES/WikiHashtags.po
index 5c483bff9f..e95286c818 100644
--- a/plugins/WikiHashtags/locale/nl/LC_MESSAGES/WikiHashtags.po
+++ b/plugins/WikiHashtags/locale/nl/LC_MESSAGES/WikiHashtags.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - WikiHashtags\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:40+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:16+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:22:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:29:51+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-wikihashtags\n"
diff --git a/plugins/WikiHashtags/locale/pt/LC_MESSAGES/WikiHashtags.po b/plugins/WikiHashtags/locale/pt/LC_MESSAGES/WikiHashtags.po
index c610c46fb5..433ad79941 100644
--- a/plugins/WikiHashtags/locale/pt/LC_MESSAGES/WikiHashtags.po
+++ b/plugins/WikiHashtags/locale/pt/LC_MESSAGES/WikiHashtags.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - WikiHashtags\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 15:58+0000\n"
-"PO-Revision-Date: 2011-03-03 16:03:15+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:16+0000\n"
 "Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/WikiHashtags/locale/pt_BR/LC_MESSAGES/WikiHashtags.po b/plugins/WikiHashtags/locale/pt_BR/LC_MESSAGES/WikiHashtags.po
index a85e46c2d1..f5f30bcae5 100644
--- a/plugins/WikiHashtags/locale/pt_BR/LC_MESSAGES/WikiHashtags.po
+++ b/plugins/WikiHashtags/locale/pt_BR/LC_MESSAGES/WikiHashtags.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - WikiHashtags\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:40+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:16+0000\n"
 "Language-Team: Brazilian Portuguese <http://translatewiki.net/wiki/Portal:pt-"
 "br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:22:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:29:51+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt-br\n"
 "X-Message-Group: #out-statusnet-plugin-wikihashtags\n"
diff --git a/plugins/WikiHashtags/locale/ru/LC_MESSAGES/WikiHashtags.po b/plugins/WikiHashtags/locale/ru/LC_MESSAGES/WikiHashtags.po
index 193ac98cea..7d8b0c948f 100644
--- a/plugins/WikiHashtags/locale/ru/LC_MESSAGES/WikiHashtags.po
+++ b/plugins/WikiHashtags/locale/ru/LC_MESSAGES/WikiHashtags.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - WikiHashtags\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:40+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:16+0000\n"
 "Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:22:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:29:51+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-wikihashtags\n"
diff --git a/plugins/WikiHashtags/locale/tl/LC_MESSAGES/WikiHashtags.po b/plugins/WikiHashtags/locale/tl/LC_MESSAGES/WikiHashtags.po
index 06655e158d..5dfc2f834a 100644
--- a/plugins/WikiHashtags/locale/tl/LC_MESSAGES/WikiHashtags.po
+++ b/plugins/WikiHashtags/locale/tl/LC_MESSAGES/WikiHashtags.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - WikiHashtags\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:40+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:16+0000\n"
 "Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:22:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:29:51+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-wikihashtags\n"
diff --git a/plugins/WikiHashtags/locale/tr/LC_MESSAGES/WikiHashtags.po b/plugins/WikiHashtags/locale/tr/LC_MESSAGES/WikiHashtags.po
index a4298ae20f..19a3f06f4a 100644
--- a/plugins/WikiHashtags/locale/tr/LC_MESSAGES/WikiHashtags.po
+++ b/plugins/WikiHashtags/locale/tr/LC_MESSAGES/WikiHashtags.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - WikiHashtags\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:40+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:16+0000\n"
 "Language-Team: Turkish <http://translatewiki.net/wiki/Portal:tr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:22:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:29:51+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tr\n"
 "X-Message-Group: #out-statusnet-plugin-wikihashtags\n"
diff --git a/plugins/WikiHashtags/locale/uk/LC_MESSAGES/WikiHashtags.po b/plugins/WikiHashtags/locale/uk/LC_MESSAGES/WikiHashtags.po
index 813f049182..3802b6ad5c 100644
--- a/plugins/WikiHashtags/locale/uk/LC_MESSAGES/WikiHashtags.po
+++ b/plugins/WikiHashtags/locale/uk/LC_MESSAGES/WikiHashtags.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - WikiHashtags\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:40+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:16+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:22:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:29:51+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-wikihashtags\n"
diff --git a/plugins/WikiHowProfile/locale/WikiHowProfile.pot b/plugins/WikiHowProfile/locale/WikiHowProfile.pot
index b87ba1dffb..7e5f5030a5 100644
--- a/plugins/WikiHowProfile/locale/WikiHowProfile.pot
+++ b/plugins/WikiHowProfile/locale/WikiHowProfile.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/WikiHowProfile/locale/fr/LC_MESSAGES/WikiHowProfile.po b/plugins/WikiHowProfile/locale/fr/LC_MESSAGES/WikiHowProfile.po
index dd0a317fe6..1aac2b4d7e 100644
--- a/plugins/WikiHowProfile/locale/fr/LC_MESSAGES/WikiHowProfile.po
+++ b/plugins/WikiHowProfile/locale/fr/LC_MESSAGES/WikiHowProfile.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - WikiHowProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:40+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:16+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:22:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:29:52+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-wikihowprofile\n"
diff --git a/plugins/WikiHowProfile/locale/ia/LC_MESSAGES/WikiHowProfile.po b/plugins/WikiHowProfile/locale/ia/LC_MESSAGES/WikiHowProfile.po
index 821bd2e344..33e770d149 100644
--- a/plugins/WikiHowProfile/locale/ia/LC_MESSAGES/WikiHowProfile.po
+++ b/plugins/WikiHowProfile/locale/ia/LC_MESSAGES/WikiHowProfile.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - WikiHowProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:40+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:16+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:22:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:29:52+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-wikihowprofile\n"
diff --git a/plugins/WikiHowProfile/locale/mk/LC_MESSAGES/WikiHowProfile.po b/plugins/WikiHowProfile/locale/mk/LC_MESSAGES/WikiHowProfile.po
index 8c5785daf1..e52aa1bb1b 100644
--- a/plugins/WikiHowProfile/locale/mk/LC_MESSAGES/WikiHowProfile.po
+++ b/plugins/WikiHowProfile/locale/mk/LC_MESSAGES/WikiHowProfile.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - WikiHowProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:40+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:16+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:22:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:29:52+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-wikihowprofile\n"
diff --git a/plugins/WikiHowProfile/locale/nl/LC_MESSAGES/WikiHowProfile.po b/plugins/WikiHowProfile/locale/nl/LC_MESSAGES/WikiHowProfile.po
index 3b9115ba4d..8e39d70036 100644
--- a/plugins/WikiHowProfile/locale/nl/LC_MESSAGES/WikiHowProfile.po
+++ b/plugins/WikiHowProfile/locale/nl/LC_MESSAGES/WikiHowProfile.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - WikiHowProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:40+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:16+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:22:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:29:52+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-wikihowprofile\n"
diff --git a/plugins/WikiHowProfile/locale/ru/LC_MESSAGES/WikiHowProfile.po b/plugins/WikiHowProfile/locale/ru/LC_MESSAGES/WikiHowProfile.po
index 18beb14674..4d48f7ba25 100644
--- a/plugins/WikiHowProfile/locale/ru/LC_MESSAGES/WikiHowProfile.po
+++ b/plugins/WikiHowProfile/locale/ru/LC_MESSAGES/WikiHowProfile.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - WikiHowProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:40+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:17+0000\n"
 "Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:22:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:29:52+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-wikihowprofile\n"
diff --git a/plugins/WikiHowProfile/locale/tl/LC_MESSAGES/WikiHowProfile.po b/plugins/WikiHowProfile/locale/tl/LC_MESSAGES/WikiHowProfile.po
index 123e56189e..b5c1a39b49 100644
--- a/plugins/WikiHowProfile/locale/tl/LC_MESSAGES/WikiHowProfile.po
+++ b/plugins/WikiHowProfile/locale/tl/LC_MESSAGES/WikiHowProfile.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - WikiHowProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:40+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:17+0000\n"
 "Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:22:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:29:52+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-wikihowprofile\n"
diff --git a/plugins/WikiHowProfile/locale/tr/LC_MESSAGES/WikiHowProfile.po b/plugins/WikiHowProfile/locale/tr/LC_MESSAGES/WikiHowProfile.po
index 1ab5b9eabb..5b8d124aee 100644
--- a/plugins/WikiHowProfile/locale/tr/LC_MESSAGES/WikiHowProfile.po
+++ b/plugins/WikiHowProfile/locale/tr/LC_MESSAGES/WikiHowProfile.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - WikiHowProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:40+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:17+0000\n"
 "Language-Team: Turkish <http://translatewiki.net/wiki/Portal:tr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:22:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:29:52+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tr\n"
 "X-Message-Group: #out-statusnet-plugin-wikihowprofile\n"
diff --git a/plugins/WikiHowProfile/locale/uk/LC_MESSAGES/WikiHowProfile.po b/plugins/WikiHowProfile/locale/uk/LC_MESSAGES/WikiHowProfile.po
index d72534bf81..b9da782d2e 100644
--- a/plugins/WikiHowProfile/locale/uk/LC_MESSAGES/WikiHowProfile.po
+++ b/plugins/WikiHowProfile/locale/uk/LC_MESSAGES/WikiHowProfile.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - WikiHowProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:40+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:17+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:22:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:29:52+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-wikihowprofile\n"
diff --git a/plugins/XCache/locale/XCache.pot b/plugins/XCache/locale/XCache.pot
index 80d4ac349d..c27c733d22 100644
--- a/plugins/XCache/locale/XCache.pot
+++ b/plugins/XCache/locale/XCache.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/XCache/locale/br/LC_MESSAGES/XCache.po b/plugins/XCache/locale/br/LC_MESSAGES/XCache.po
index 017b4fe824..a9c195eafa 100644
--- a/plugins/XCache/locale/br/LC_MESSAGES/XCache.po
+++ b/plugins/XCache/locale/br/LC_MESSAGES/XCache.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - XCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:41+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:17+0000\n"
 "Language-Team: Breton <http://translatewiki.net/wiki/Portal:br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:22:25+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:29:54+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-xcache\n"
diff --git a/plugins/XCache/locale/es/LC_MESSAGES/XCache.po b/plugins/XCache/locale/es/LC_MESSAGES/XCache.po
index 7a8f90bade..85f6d26f7a 100644
--- a/plugins/XCache/locale/es/LC_MESSAGES/XCache.po
+++ b/plugins/XCache/locale/es/LC_MESSAGES/XCache.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - XCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:41+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:17+0000\n"
 "Language-Team: Spanish <http://translatewiki.net/wiki/Portal:es>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:22:25+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:29:54+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-xcache\n"
diff --git a/plugins/XCache/locale/fi/LC_MESSAGES/XCache.po b/plugins/XCache/locale/fi/LC_MESSAGES/XCache.po
index 9f9b590272..b9effc3810 100644
--- a/plugins/XCache/locale/fi/LC_MESSAGES/XCache.po
+++ b/plugins/XCache/locale/fi/LC_MESSAGES/XCache.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - XCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:41+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:17+0000\n"
 "Language-Team: Finnish <http://translatewiki.net/wiki/Portal:fi>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:22:25+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:29:54+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fi\n"
 "X-Message-Group: #out-statusnet-plugin-xcache\n"
diff --git a/plugins/XCache/locale/fr/LC_MESSAGES/XCache.po b/plugins/XCache/locale/fr/LC_MESSAGES/XCache.po
index f18e17db2a..947f4465a7 100644
--- a/plugins/XCache/locale/fr/LC_MESSAGES/XCache.po
+++ b/plugins/XCache/locale/fr/LC_MESSAGES/XCache.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - XCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:41+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:17+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:22:25+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:29:54+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-xcache\n"
diff --git a/plugins/XCache/locale/gl/LC_MESSAGES/XCache.po b/plugins/XCache/locale/gl/LC_MESSAGES/XCache.po
index 8524088c9f..dd4531b2e8 100644
--- a/plugins/XCache/locale/gl/LC_MESSAGES/XCache.po
+++ b/plugins/XCache/locale/gl/LC_MESSAGES/XCache.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - XCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:41+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:17+0000\n"
 "Language-Team: Galician <http://translatewiki.net/wiki/Portal:gl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:22:25+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:29:54+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: gl\n"
 "X-Message-Group: #out-statusnet-plugin-xcache\n"
diff --git a/plugins/XCache/locale/he/LC_MESSAGES/XCache.po b/plugins/XCache/locale/he/LC_MESSAGES/XCache.po
index ba98aa9e08..5e08cb4ed3 100644
--- a/plugins/XCache/locale/he/LC_MESSAGES/XCache.po
+++ b/plugins/XCache/locale/he/LC_MESSAGES/XCache.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - XCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:41+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:17+0000\n"
 "Language-Team: Hebrew <http://translatewiki.net/wiki/Portal:he>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:22:25+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:29:54+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-plugin-xcache\n"
diff --git a/plugins/XCache/locale/ia/LC_MESSAGES/XCache.po b/plugins/XCache/locale/ia/LC_MESSAGES/XCache.po
index 21212ea994..a13d1d5e90 100644
--- a/plugins/XCache/locale/ia/LC_MESSAGES/XCache.po
+++ b/plugins/XCache/locale/ia/LC_MESSAGES/XCache.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - XCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:41+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:17+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:22:25+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:29:54+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-xcache\n"
diff --git a/plugins/XCache/locale/id/LC_MESSAGES/XCache.po b/plugins/XCache/locale/id/LC_MESSAGES/XCache.po
index b66357000f..b3a3ed22c2 100644
--- a/plugins/XCache/locale/id/LC_MESSAGES/XCache.po
+++ b/plugins/XCache/locale/id/LC_MESSAGES/XCache.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - XCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:41+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:17+0000\n"
 "Language-Team: Indonesian <http://translatewiki.net/wiki/Portal:id>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:22:25+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:29:54+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: id\n"
 "X-Message-Group: #out-statusnet-plugin-xcache\n"
diff --git a/plugins/XCache/locale/mk/LC_MESSAGES/XCache.po b/plugins/XCache/locale/mk/LC_MESSAGES/XCache.po
index f986da04ff..712387545d 100644
--- a/plugins/XCache/locale/mk/LC_MESSAGES/XCache.po
+++ b/plugins/XCache/locale/mk/LC_MESSAGES/XCache.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - XCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:41+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:17+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:22:25+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:29:54+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-xcache\n"
diff --git a/plugins/XCache/locale/nb/LC_MESSAGES/XCache.po b/plugins/XCache/locale/nb/LC_MESSAGES/XCache.po
index f408cef8b8..c31f913c86 100644
--- a/plugins/XCache/locale/nb/LC_MESSAGES/XCache.po
+++ b/plugins/XCache/locale/nb/LC_MESSAGES/XCache.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - XCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:41+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:17+0000\n"
 "Language-Team: Norwegian (bokmål)‬ <http://translatewiki.net/wiki/Portal:no>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:22:25+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:29:54+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: #out-statusnet-plugin-xcache\n"
diff --git a/plugins/XCache/locale/nl/LC_MESSAGES/XCache.po b/plugins/XCache/locale/nl/LC_MESSAGES/XCache.po
index 7619c0ffa5..d6e80652fd 100644
--- a/plugins/XCache/locale/nl/LC_MESSAGES/XCache.po
+++ b/plugins/XCache/locale/nl/LC_MESSAGES/XCache.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - XCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:41+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:17+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:22:25+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:29:54+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-xcache\n"
diff --git a/plugins/XCache/locale/pt/LC_MESSAGES/XCache.po b/plugins/XCache/locale/pt/LC_MESSAGES/XCache.po
index 19f82c4ba1..699453c39e 100644
--- a/plugins/XCache/locale/pt/LC_MESSAGES/XCache.po
+++ b/plugins/XCache/locale/pt/LC_MESSAGES/XCache.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - XCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 15:58+0000\n"
-"PO-Revision-Date: 2011-03-03 16:03:17+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:17+0000\n"
 "Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/plugins/XCache/locale/pt_BR/LC_MESSAGES/XCache.po b/plugins/XCache/locale/pt_BR/LC_MESSAGES/XCache.po
index cbd685909d..e52df8c462 100644
--- a/plugins/XCache/locale/pt_BR/LC_MESSAGES/XCache.po
+++ b/plugins/XCache/locale/pt_BR/LC_MESSAGES/XCache.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - XCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:41+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:17+0000\n"
 "Language-Team: Brazilian Portuguese <http://translatewiki.net/wiki/Portal:pt-"
 "br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:22:25+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:29:54+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt-br\n"
 "X-Message-Group: #out-statusnet-plugin-xcache\n"
diff --git a/plugins/XCache/locale/ru/LC_MESSAGES/XCache.po b/plugins/XCache/locale/ru/LC_MESSAGES/XCache.po
index c078f1b86c..8afccae06c 100644
--- a/plugins/XCache/locale/ru/LC_MESSAGES/XCache.po
+++ b/plugins/XCache/locale/ru/LC_MESSAGES/XCache.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - XCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:41+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:17+0000\n"
 "Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:22:25+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:29:54+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-xcache\n"
diff --git a/plugins/XCache/locale/tl/LC_MESSAGES/XCache.po b/plugins/XCache/locale/tl/LC_MESSAGES/XCache.po
index ac14a8e62d..3ab573f9df 100644
--- a/plugins/XCache/locale/tl/LC_MESSAGES/XCache.po
+++ b/plugins/XCache/locale/tl/LC_MESSAGES/XCache.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - XCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:41+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:17+0000\n"
 "Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:22:25+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:29:54+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-xcache\n"
diff --git a/plugins/XCache/locale/tr/LC_MESSAGES/XCache.po b/plugins/XCache/locale/tr/LC_MESSAGES/XCache.po
index 70a82818c4..b9d3cf733e 100644
--- a/plugins/XCache/locale/tr/LC_MESSAGES/XCache.po
+++ b/plugins/XCache/locale/tr/LC_MESSAGES/XCache.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - XCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:41+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:17+0000\n"
 "Language-Team: Turkish <http://translatewiki.net/wiki/Portal:tr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:22:25+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:29:54+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tr\n"
 "X-Message-Group: #out-statusnet-plugin-xcache\n"
diff --git a/plugins/XCache/locale/uk/LC_MESSAGES/XCache.po b/plugins/XCache/locale/uk/LC_MESSAGES/XCache.po
index 59cb35f648..82b1336253 100644
--- a/plugins/XCache/locale/uk/LC_MESSAGES/XCache.po
+++ b/plugins/XCache/locale/uk/LC_MESSAGES/XCache.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - XCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:41+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:17+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:22:25+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:29:54+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-xcache\n"
diff --git a/plugins/Xmpp/locale/Xmpp.pot b/plugins/Xmpp/locale/Xmpp.pot
new file mode 100644
index 0000000000..d6ed6ad6fa
--- /dev/null
+++ b/plugins/Xmpp/locale/Xmpp.pot
@@ -0,0 +1,31 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: XmppPlugin.php:62
+msgid "XMPP/Jabber/GTalk"
+msgstr ""
+
+#: XmppPlugin.php:429
+msgid ""
+"The XMPP plugin allows users to send and receive notices over the XMPP/"
+"Jabber network."
+msgstr ""
+
+#: xmppmanager.php:168 xmppmanager.php:207
+msgid "Send me a message to post a notice"
+msgstr ""
diff --git a/plugins/YammerImport/locale/YammerImport.pot b/plugins/YammerImport/locale/YammerImport.pot
index db6936cac8..e78563baa0 100644
--- a/plugins/YammerImport/locale/YammerImport.pot
+++ b/plugins/YammerImport/locale/YammerImport.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/YammerImport/locale/br/LC_MESSAGES/YammerImport.po b/plugins/YammerImport/locale/br/LC_MESSAGES/YammerImport.po
index 9aa6392721..f29347eeeb 100644
--- a/plugins/YammerImport/locale/br/LC_MESSAGES/YammerImport.po
+++ b/plugins/YammerImport/locale/br/LC_MESSAGES/YammerImport.po
@@ -10,13 +10,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - YammerImport\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:46+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:21+0000\n"
 "Language-Team: Breton <http://translatewiki.net/wiki/Portal:br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:22:25+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:29:55+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-yammerimport\n"
diff --git a/plugins/YammerImport/locale/fr/LC_MESSAGES/YammerImport.po b/plugins/YammerImport/locale/fr/LC_MESSAGES/YammerImport.po
index 3b306cc3e1..8d09f81e3a 100644
--- a/plugins/YammerImport/locale/fr/LC_MESSAGES/YammerImport.po
+++ b/plugins/YammerImport/locale/fr/LC_MESSAGES/YammerImport.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - YammerImport\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:47+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:21+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:22:25+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:29:55+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-yammerimport\n"
diff --git a/plugins/YammerImport/locale/gl/LC_MESSAGES/YammerImport.po b/plugins/YammerImport/locale/gl/LC_MESSAGES/YammerImport.po
index 83c1a6156f..543f1e22c9 100644
--- a/plugins/YammerImport/locale/gl/LC_MESSAGES/YammerImport.po
+++ b/plugins/YammerImport/locale/gl/LC_MESSAGES/YammerImport.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - YammerImport\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:47+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:21+0000\n"
 "Language-Team: Galician <http://translatewiki.net/wiki/Portal:gl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:22:25+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:29:55+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: gl\n"
 "X-Message-Group: #out-statusnet-plugin-yammerimport\n"
diff --git a/plugins/YammerImport/locale/ia/LC_MESSAGES/YammerImport.po b/plugins/YammerImport/locale/ia/LC_MESSAGES/YammerImport.po
index 6968cc8f22..172dcae8d1 100644
--- a/plugins/YammerImport/locale/ia/LC_MESSAGES/YammerImport.po
+++ b/plugins/YammerImport/locale/ia/LC_MESSAGES/YammerImport.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - YammerImport\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:47+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:21+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:22:25+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:29:55+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-yammerimport\n"
diff --git a/plugins/YammerImport/locale/mk/LC_MESSAGES/YammerImport.po b/plugins/YammerImport/locale/mk/LC_MESSAGES/YammerImport.po
index 6d5a5987d5..bd56dff878 100644
--- a/plugins/YammerImport/locale/mk/LC_MESSAGES/YammerImport.po
+++ b/plugins/YammerImport/locale/mk/LC_MESSAGES/YammerImport.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - YammerImport\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:47+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:21+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:22:25+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:29:55+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-yammerimport\n"
diff --git a/plugins/YammerImport/locale/nl/LC_MESSAGES/YammerImport.po b/plugins/YammerImport/locale/nl/LC_MESSAGES/YammerImport.po
index af7cdba7a2..b3362acde6 100644
--- a/plugins/YammerImport/locale/nl/LC_MESSAGES/YammerImport.po
+++ b/plugins/YammerImport/locale/nl/LC_MESSAGES/YammerImport.po
@@ -10,13 +10,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - YammerImport\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:47+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:21+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:22:25+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:29:55+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-yammerimport\n"
diff --git a/plugins/YammerImport/locale/ru/LC_MESSAGES/YammerImport.po b/plugins/YammerImport/locale/ru/LC_MESSAGES/YammerImport.po
index 20f8fd61a8..11e2b56c3c 100644
--- a/plugins/YammerImport/locale/ru/LC_MESSAGES/YammerImport.po
+++ b/plugins/YammerImport/locale/ru/LC_MESSAGES/YammerImport.po
@@ -10,13 +10,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - YammerImport\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:47+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:21+0000\n"
 "Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:22:25+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:29:55+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-yammerimport\n"
diff --git a/plugins/YammerImport/locale/tr/LC_MESSAGES/YammerImport.po b/plugins/YammerImport/locale/tr/LC_MESSAGES/YammerImport.po
index 9b1d552288..05b5ecfe45 100644
--- a/plugins/YammerImport/locale/tr/LC_MESSAGES/YammerImport.po
+++ b/plugins/YammerImport/locale/tr/LC_MESSAGES/YammerImport.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - YammerImport\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:47+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:21+0000\n"
 "Language-Team: Turkish <http://translatewiki.net/wiki/Portal:tr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:22:25+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:29:55+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tr\n"
 "X-Message-Group: #out-statusnet-plugin-yammerimport\n"
diff --git a/plugins/YammerImport/locale/uk/LC_MESSAGES/YammerImport.po b/plugins/YammerImport/locale/uk/LC_MESSAGES/YammerImport.po
index 2b09e40fe6..8577621835 100644
--- a/plugins/YammerImport/locale/uk/LC_MESSAGES/YammerImport.po
+++ b/plugins/YammerImport/locale/uk/LC_MESSAGES/YammerImport.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - YammerImport\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:47+0000\n"
+"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"PO-Revision-Date: 2011-03-03 17:28:21+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:22:25+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:29:55+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-yammerimport\n"

From 5a404ee713c7b55810aa5db087d36ca086e8e740 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Thu, 3 Mar 2011 12:26:07 -0800
Subject: [PATCH 377/655] 'Comment' -> 'Reply' in inline comment/reply messages

---
 js/util.js                 | 2 +-
 js/util.min.js             | 2 +-
 lib/action.php             | 4 ++--
 lib/threadednoticelist.php | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/js/util.js b/js/util.js
index fce2fd775d..e1e6a779ec 100644
--- a/js/util.js
+++ b/js/util.js
@@ -739,7 +739,7 @@ var SN = { // StatusNet
             placeholder.click(function() {
                 SN.U.NoticeInlineReplyTrigger(notice);
             });
-            placeholder.find('input').val(SN.msg('reply_comment'));
+            placeholder.find('input').val(SN.msg('reply_placeholder'));
             list.append(placeholder);
         },
 
diff --git a/js/util.min.js b/js/util.min.js
index 053f5b655b..436048937e 100644
--- a/js/util.min.js
+++ b/js/util.min.js
@@ -1 +1 @@
-var SN={C:{I:{CounterBlackout:false,MaxLength:140,PatternUsername:/^[0-9a-zA-Z\-_.]*$/,HTTP20x30x:[200,201,202,203,204,205,206,300,301,302,303,304,305,306,307]},S:{Disabled:"disabled",Warning:"warning",Error:"error",Success:"success",Processing:"processing",CommandResult:"command_result",FormNotice:"form_notice",NoticeDataText:"notice_data-text",NoticeTextCount:"notice_text-count",NoticeInReplyTo:"notice_in-reply-to",NoticeDataAttach:"notice_data-attach",NoticeDataAttachSelected:"notice_data-attach_selected",NoticeActionSubmit:"notice_action-submit",NoticeLat:"notice_data-lat",NoticeLon:"notice_data-lon",NoticeLocationId:"notice_data-location_id",NoticeLocationNs:"notice_data-location_ns",NoticeGeoName:"notice_data-geo_name",NoticeDataGeo:"notice_data-geo",NoticeDataGeoCookie:"NoticeDataGeo",NoticeDataGeoSelected:"notice_data-geo_selected",StatusNetInstance:"StatusNetInstance"}},messages:{},msg:function(a){if(typeof SN.messages[a]=="undefined"){return"["+a+"]"}else{return SN.messages[a]}},U:{FormNoticeEnhancements:function(b){if(jQuery.data(b[0],"ElementData")===undefined){MaxLength=b.find("#"+SN.C.S.NoticeTextCount).text();if(typeof(MaxLength)=="undefined"){MaxLength=SN.C.I.MaxLength}jQuery.data(b[0],"ElementData",{MaxLength:MaxLength});SN.U.Counter(b);NDT=b.find("#"+SN.C.S.NoticeDataText);NDT.bind("keyup",function(c){SN.U.Counter(b)});var a=function(c){window.setTimeout(function(){SN.U.Counter(b)},50)};NDT.bind("cut",a).bind("paste",a);NDT.bind("keydown",function(c){SN.U.SubmitOnReturn(c,b)})}else{b.find("#"+SN.C.S.NoticeTextCount).text(jQuery.data(b[0],"ElementData").MaxLength)}if($("body")[0].id!="conversation"&&window.location.hash.length===0&&$(window).scrollTop()==0){b.find("textarea").focus()}},SubmitOnReturn:function(b,a){if(b.keyCode==13||b.keyCode==10){a.submit();b.preventDefault();b.stopPropagation();$("#"+a[0].id+" #"+SN.C.S.NoticeDataText).blur();$("body").focus();return false}return true},Counter:function(d){SN.C.I.FormNoticeCurrent=d;var b=jQuery.data(d[0],"ElementData").MaxLength;if(b<=0){return}var c=b-SN.U.CharacterCount(d);var a=d.find("#"+SN.C.S.NoticeTextCount);if(c.toString()!=a.text()){if(!SN.C.I.CounterBlackout||c===0){if(a.text()!=String(c)){a.text(c)}if(c<0){d.addClass(SN.C.S.Warning)}else{d.removeClass(SN.C.S.Warning)}if(!SN.C.I.CounterBlackout){SN.C.I.CounterBlackout=true;SN.C.I.FormNoticeCurrent=d;window.setTimeout("SN.U.ClearCounterBlackout(SN.C.I.FormNoticeCurrent);",500)}}}},CharacterCount:function(a){return a.find("#"+SN.C.S.NoticeDataText).val().length},ClearCounterBlackout:function(a){SN.C.I.CounterBlackout=false;SN.U.Counter(a)},RewriteAjaxAction:function(a){if(document.location.protocol=="https:"&&a.substr(0,5)=="http:"){return a.replace(/^http:\/\/[^:\/]+/,"https://"+document.location.host)}else{return a}},FormXHR:function(a){$.ajax({type:"POST",dataType:"xml",url:SN.U.RewriteAjaxAction(a.attr("action")),data:a.serialize()+"&ajax=1",beforeSend:function(b){a.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(c,d,b){alert(b||d)},success:function(b,c){if(typeof($("form",b)[0])!="undefined"){form_new=document._importNode($("form",b)[0],true);a.replaceWith(form_new)}else{a.replaceWith(document._importNode($("p",b)[0],true))}}})},FormNoticeXHR:function(b){SN.C.I.NoticeDataGeo={};b.append('<input type="hidden" name="ajax" value="1"/>');b.attr("action",SN.U.RewriteAjaxAction(b.attr("action")));var c=function(d,e){b.append($('<p class="form_response"></p>').addClass(d).text(e))};var a=function(){b.find(".form_response").remove()};b.ajaxForm({dataType:"xml",timeout:"60000",beforeSend:function(d){if(b.find("#"+SN.C.S.NoticeDataText)[0].value.length===0){b.addClass(SN.C.S.Warning);return false}b.addClass(SN.C.S.Processing).find("#"+SN.C.S.NoticeActionSubmit).addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled);SN.C.I.NoticeDataGeo.NLat=$("#"+SN.C.S.NoticeLat).val();SN.C.I.NoticeDataGeo.NLon=$("#"+SN.C.S.NoticeLon).val();SN.C.I.NoticeDataGeo.NLNS=$("#"+SN.C.S.NoticeLocationNs).val();SN.C.I.NoticeDataGeo.NLID=$("#"+SN.C.S.NoticeLocationId).val();SN.C.I.NoticeDataGeo.NDG=$("#"+SN.C.S.NoticeDataGeo).attr("checked");cookieValue=$.cookie(SN.C.S.NoticeDataGeoCookie);if(cookieValue!==null&&cookieValue!="disabled"){cookieValue=JSON.parse(cookieValue);SN.C.I.NoticeDataGeo.NLat=$("#"+SN.C.S.NoticeLat).val(cookieValue.NLat).val();SN.C.I.NoticeDataGeo.NLon=$("#"+SN.C.S.NoticeLon).val(cookieValue.NLon).val();if($("#"+SN.C.S.NoticeLocationNs).val(cookieValue.NLNS)){SN.C.I.NoticeDataGeo.NLNS=$("#"+SN.C.S.NoticeLocationNs).val(cookieValue.NLNS).val();SN.C.I.NoticeDataGeo.NLID=$("#"+SN.C.S.NoticeLocationId).val(cookieValue.NLID).val()}}if(cookieValue=="disabled"){SN.C.I.NoticeDataGeo.NDG=$("#"+SN.C.S.NoticeDataGeo).attr("checked",false).attr("checked")}else{SN.C.I.NoticeDataGeo.NDG=$("#"+SN.C.S.NoticeDataGeo).attr("checked",true).attr("checked")}return true},error:function(f,g,e){b.removeClass(SN.C.S.Processing).find("#"+SN.C.S.NoticeActionSubmit).removeClass(SN.C.S.Disabled).removeAttr(SN.C.S.Disabled,SN.C.S.Disabled);a();if(g=="timeout"){c("error","Sorry! We had trouble sending your notice. The servers are overloaded. Please try again, and contact the site administrator if this problem persists.")}else{var d=SN.U.GetResponseXML(f);if($("."+SN.C.S.Error,d).length>0){b.append(document._importNode($("."+SN.C.S.Error,d)[0],true))}else{if(parseInt(f.status)===0||jQuery.inArray(parseInt(f.status),SN.C.I.HTTP20x30x)>=0){b.resetForm().find("#"+SN.C.S.NoticeDataAttachSelected).remove();SN.U.FormNoticeEnhancements(b)}else{c("error","(Sorry! We had trouble sending your notice ("+f.status+" "+f.statusText+"). Please report the problem to the site administrator if this happens again.")}}}},success:function(i,k){a();var e=$("#"+SN.C.S.Error,i);if(e.length>0){c("error",e.text())}else{if($("body")[0].id=="bookmarklet"){self.close()}var d=$("#"+SN.C.S.CommandResult,i);if(d.length>0){c("success",d.text())}else{var h=document._importNode($("li",i)[0],true);var j=$("#notices_primary .notices:first");if(j.length>0&&SN.U.belongsOnTimeline(h)){if($("#"+h.id).length===0){var f=$("#"+SN.C.S.NoticeInReplyTo).val();var g="#notices_primary #notice-"+f;if($("body")[0].id=="conversation"){if(f.length>0&&$(g+" .notices").length<1){$(g).append('<ul class="notices"></ul>')}$($(g+" .notices")[0]).append(h)}else{j.prepend(h)}$("#"+h.id).css({display:"none"}).fadeIn(2500);SN.U.NoticeWithAttachment($("#"+h.id));SN.U.NoticeReplyTo($("#"+h.id))}}else{c("success",$("title",i).text())}}b.resetForm();b.find("#"+SN.C.S.NoticeInReplyTo).val("");b.find("#"+SN.C.S.NoticeDataAttachSelected).remove();SN.U.FormNoticeEnhancements(b)}},complete:function(d,e){b.removeClass(SN.C.S.Processing).find("#"+SN.C.S.NoticeActionSubmit).removeAttr(SN.C.S.Disabled).removeClass(SN.C.S.Disabled);$("#"+SN.C.S.NoticeLat).val(SN.C.I.NoticeDataGeo.NLat);$("#"+SN.C.S.NoticeLon).val(SN.C.I.NoticeDataGeo.NLon);if($("#"+SN.C.S.NoticeLocationNs)){$("#"+SN.C.S.NoticeLocationNs).val(SN.C.I.NoticeDataGeo.NLNS);$("#"+SN.C.S.NoticeLocationId).val(SN.C.I.NoticeDataGeo.NLID)}$("#"+SN.C.S.NoticeDataGeo).attr("checked",SN.C.I.NoticeDataGeo.NDG)}})},GetResponseXML:function(b){try{return b.responseXML}catch(a){return(new DOMParser()).parseFromString(b.responseText,"text/xml")}},NoticeReply:function(){if($("#"+SN.C.S.NoticeDataText).length>0&&$("#content .notice_reply").length>0){$("#content .notice").each(function(){SN.U.NoticeReplyTo($(this))})}},NoticeReplyTo:function(a){a.find(".notice_reply").live("click",function(c){c.preventDefault();var b=($(".author .nickname",a).length>0)?$($(".author .nickname",a)[0]):$(".author .nickname.uid");SN.U.NoticeInlineReplyTrigger(a,"@"+b.text());return false})},NoticeInlineReplyTrigger:function(h,i){var c=$($(".notice_id",h)[0]).text();var d=h;var f=h.closest(".notices");if(f.hasClass("threaded-replies")){d=f.closest(".notice")}else{f=$("ul.threaded-replies",h);if(f.length==0){f=$('<ul class="notices threaded-replies xoxo"></ul>');h.append(f)}}var k=$(".notice-reply-form",f);if(k.length==0){$("li.notice-reply-placeholder").remove();var g=$("li.notice-reply",f);if(g.length==0){g=$('<li class="notice-reply"><form class="notice-reply-form" method="post"><textarea name="status_textarea"></textarea><div class="controls"><input type="hidden" name="token"><input type="hidden" name="inreplyto"><input type="submit" class="submit"></div></form></li>');var b=$("#form_notice");k=g.find("form");k.attr("action",b.attr("action"));k.find('input[name="token"]').val(b.find("input[name=token]").val());k.find('input[type="submit"]').val(SN.msg("reply_submit"));f.append(g);k.find("textarea").blur(function(){var m=$(this);var l=$.trim(m.val());if(l==""||l==m.data("initialText")){g.remove();if(f.find("li").length>0){SN.U.NoticeInlineReplyPlaceholder(d)}else{f.remove()}}});k.submit(function(m){var l=k;$.ajax({type:"POST",dataType:"xml",url:SN.U.RewriteAjaxAction(l.attr("action")),data:l.serialize()+"&ajax=1",beforeSend:function(n){l.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled).end().find("textarea").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(o,p,n){alert(n||p)},success:function(p,r){var o=$("li",p)[0];if(o){var n=document._importNode(o,true);var q=$(n).attr("id");if($("#"+q).length==0){g.replaceWith(n);SN.U.NoticeInlineReplyPlaceholder(d)}else{g.remove()}}}});m.preventDefault();return false})}}k.find("input[name=inreplyto]").val(c);var j=k.find("textarea");if(j.length==0){throw"No textarea"}var a="";if(i){a=i+" "}j.val(a+j.val().replace(RegExp(a,"i"),""));j.data("initialText",$.trim(i+""));j.focus();if(j[0].setSelectionRange){var e=j.val().length;j[0].setSelectionRange(e,e)}},NoticeReplySet:function(b,d){if(b.match(SN.C.I.PatternUsername)){var c=$("#"+SN.C.S.NoticeDataText);if(c.length>0){replyto="@"+b+" ";c.val(replyto+c.val().replace(RegExp(replyto,"i"),""));$("#"+SN.C.S.FormNotice+" #"+SN.C.S.NoticeInReplyTo).val(d);c[0].focus();if(c[0].setSelectionRange){var a=c.val().length;c[0].setSelectionRange(a,a)}}}},NoticeFavor:function(){$(".form_favor").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_disfavor").live("click",function(){SN.U.FormXHR($(this));return false})},NoticeInlineReplyPlaceholder:function(b){var a=b.find("ul.threaded-replies");var c=$('<li class="notice-reply-placeholder"><input class="placeholder"></li>');c.click(function(){SN.U.NoticeInlineReplyTrigger(b)});c.find("input").val(SN.msg("reply_comment"));a.append(c)},NoticeInlineReplySetup:function(){$(".threaded-replies").each(function(){var b=$(this);var a=b.closest(".notice");SN.U.NoticeInlineReplyPlaceholder(a)})},NoticeRepeat:function(){$(".form_repeat").live("click",function(a){a.preventDefault();SN.U.NoticeRepeatConfirmation($(this));return false})},NoticeRepeatConfirmation:function(a){var c=a.find(".submit");var b=c.clone();b.addClass("submit_dialogbox").removeClass("submit");a.append(b);b.bind("click",function(){SN.U.FormXHR(a);return false});c.hide();a.addClass("dialogbox").append('<button class="close">&#215;</button>').closest(".notice-options").addClass("opaque");a.find("button.close").click(function(){$(this).remove();a.removeClass("dialogbox").closest(".notice-options").removeClass("opaque");a.find(".submit_dialogbox").remove();a.find(".submit").show();return false})},NoticeAttachments:function(){$(".notice a.attachment").each(function(){SN.U.NoticeWithAttachment($(this).closest(".notice"))})},NoticeWithAttachment:function(b){if(b.find(".attachment").length===0){return}var a=b.find(".attachment.more");if(a.length>0){$(a[0]).click(function(){var c=$(this);c.addClass(SN.C.S.Processing);$.get(c.attr("href")+"/ajax",null,function(d){c.parent(".entry-content").html($(d).find("#attachment_view .entry-content").html())});return false}).attr("title",SN.msg("showmore_tooltip"))}},NoticeDataAttach:function(){NDA=$("#"+SN.C.S.NoticeDataAttach);NDA.change(function(c){var a=$(this).val();if(!a){$("#"+SN.C.S.NoticeDataAttachSelected).remove();return false}S='<div id="'+SN.C.S.NoticeDataAttachSelected+'" class="'+SN.C.S.Success+'"><code>'+a+'</code> <button class="close">&#215;</button></div>';NDAS=$("#"+SN.C.S.NoticeDataAttachSelected);if(NDAS.length>0){NDAS.replaceWith(S)}else{$("#"+SN.C.S.FormNotice).append(S)}$("#"+SN.C.S.NoticeDataAttachSelected+" button").click(function(){$("#"+SN.C.S.NoticeDataAttachSelected).remove();NDA.val("");return false});if(typeof this.files=="object"){for(var b=0;b<this.files.length;b++){SN.U.PreviewAttach(this.files[b])}}})},maxFileSize:function(b){var a=$(b).find("input[name=MAX_FILE_SIZE]").attr("value");if(a){return parseInt(a)}else{return 0}},PreviewAttach:function(c){var d=c.type+" "+Math.round(c.size/1024)+"KB";var e=true;var g;if(typeof window.createObjectURL!="undefined"){g=function(h,i){i(window.createObjectURL(h))}}else{if(typeof window.FileReader!="undefined"){g=function(i,j){var h=new FileReader();h.onload=function(k){j(h.result)};h.readAsDataURL(i)}}else{e=false}}var a=["image/png","image/jpeg","image/gif","image/svg+xml"];if($.inArray(c.type,a)==-1){e=false}var f=8*1024*1024;if(c.size>f){e=false}if(e){g(c,function(i){var h=$("<img>").attr("title",d).attr("alt",d).attr("src",i).attr("style","height: 120px");$("#"+SN.C.S.NoticeDataAttachSelected).append(h)})}else{var b=$("<div></div>").text(d);$("#"+SN.C.S.NoticeDataAttachSelected).append(b)}},NoticeLocationAttach:function(){var c=$("#"+SN.C.S.NoticeLat).val();var h=$("#"+SN.C.S.NoticeLon).val();var d=$("#"+SN.C.S.NoticeLocationNs).val();var i=$("#"+SN.C.S.NoticeLocationId).val();var a=$("#"+SN.C.S.NoticeGeoName).text();var b=$("#"+SN.C.S.NoticeDataGeo);function e(){$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",jQuery.trim($("label[for="+SN.C.S.NoticeDataGeo+"]").text())).removeClass("checked");$("#"+SN.C.S.NoticeLat).val("");$("#"+SN.C.S.NoticeLon).val("");$("#"+SN.C.S.NoticeLocationNs).val("");$("#"+SN.C.S.NoticeLocationId).val("");$("#"+SN.C.S.NoticeDataGeo).attr("checked",false);$.cookie(SN.C.S.NoticeDataGeoCookie,"disabled",{path:"/"})}function j(k,l){$.getJSON(k,l,function(m){var n,o;if(typeof(m.location_ns)!="undefined"){$("#"+SN.C.S.NoticeLocationNs).val(m.location_ns);n=m.location_ns}if(typeof(m.location_id)!="undefined"){$("#"+SN.C.S.NoticeLocationId).val(m.location_id);o=m.location_id}if(typeof(m.name)=="undefined"){NLN_text=l.lat+";"+l.lon}else{NLN_text=m.name}$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",NoticeDataGeo_text.ShareDisable+" ("+NLN_text+")");$("#"+SN.C.S.NoticeLat).val(l.lat);$("#"+SN.C.S.NoticeLon).val(l.lon);$("#"+SN.C.S.NoticeLocationNs).val(n);$("#"+SN.C.S.NoticeLocationId).val(o);$("#"+SN.C.S.NoticeDataGeo).attr("checked",true);var p={NLat:l.lat,NLon:l.lon,NLNS:n,NLID:o,NLN:NLN_text,NLNU:m.url,NDG:true};$.cookie(SN.C.S.NoticeDataGeoCookie,JSON.stringify(p),{path:"/"})})}if(b.length>0){if($.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){b.attr("checked",false)}else{b.attr("checked",true)}var f=$("#notice_data-geo_wrap");var g=f.attr("title");f.removeAttr("title");$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",jQuery.trim($("label[for="+SN.C.S.NoticeDataGeo+"]").text()));b.change(function(){if($("#"+SN.C.S.NoticeDataGeo).attr("checked")===true||$.cookie(SN.C.S.NoticeDataGeoCookie)===null){$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",NoticeDataGeo_text.ShareDisable).addClass("checked");if($.cookie(SN.C.S.NoticeDataGeoCookie)===null||$.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){if(navigator.geolocation){navigator.geolocation.getCurrentPosition(function(m){$("#"+SN.C.S.NoticeLat).val(m.coords.latitude);$("#"+SN.C.S.NoticeLon).val(m.coords.longitude);var n={lat:m.coords.latitude,lon:m.coords.longitude,token:$("#token").val()};j(g,n)},function(m){switch(m.code){case m.PERMISSION_DENIED:e();break;case m.TIMEOUT:$("#"+SN.C.S.NoticeDataGeo).attr("checked",false);break}},{timeout:10000})}else{if(c.length>0&&h.length>0){var k={lat:c,lon:h,token:$("#token").val()};j(g,k)}else{e();$("#"+SN.C.S.NoticeDataGeo).remove();$("label[for="+SN.C.S.NoticeDataGeo+"]").remove()}}}else{var l=JSON.parse($.cookie(SN.C.S.NoticeDataGeoCookie));$("#"+SN.C.S.NoticeLat).val(l.NLat);$("#"+SN.C.S.NoticeLon).val(l.NLon);$("#"+SN.C.S.NoticeLocationNs).val(l.NLNS);$("#"+SN.C.S.NoticeLocationId).val(l.NLID);$("#"+SN.C.S.NoticeDataGeo).attr("checked",l.NDG);$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",NoticeDataGeo_text.ShareDisable+" ("+l.NLN+")").addClass("checked")}}else{e()}}).change()}},NewDirectMessage:function(){NDM=$(".entity_send-a-message a");NDM.attr({href:NDM.attr("href")+"&ajax=1"});NDM.bind("click",function(){var a=$(".entity_send-a-message form");if(a.length===0){$(this).addClass(SN.C.S.Processing);$.get(NDM.attr("href"),null,function(b){$(".entity_send-a-message").append(document._importNode($("form",b)[0],true));a=$(".entity_send-a-message .form_notice");SN.U.FormNoticeXHR(a);SN.U.FormNoticeEnhancements(a);a.append('<button class="close">&#215;</button>');$(".entity_send-a-message button").click(function(){a.hide();return false});NDM.removeClass(SN.C.S.Processing)})}else{a.show();$(".entity_send-a-message textarea").focus()}return false})},GetFullYear:function(c,d,a){var b=new Date();b.setFullYear(c,d,a);return b},StatusNetInstance:{Set:function(b){var a=SN.U.StatusNetInstance.Get();if(a!==null){b=$.extend(a,b)}$.cookie(SN.C.S.StatusNetInstance,JSON.stringify(b),{path:"/",expires:SN.U.GetFullYear(2029,0,1)})},Get:function(){var a=$.cookie(SN.C.S.StatusNetInstance);if(a!==null){return JSON.parse(a)}return null},Delete:function(){$.cookie(SN.C.S.StatusNetInstance,null)}},belongsOnTimeline:function(b){var a=$("body").attr("id");if(a=="public"){return true}var c=$("#nav_profile a").attr("href");if(c){var d=$(b).find(".entry-title .author a.url").attr("href");if(d==c){if(a=="all"||a=="showstream"){return true}}}return false}},Init:{NoticeForm:function(){if($("body.user_in").length>0){SN.U.NoticeLocationAttach();$("."+SN.C.S.FormNotice).each(function(){SN.U.FormNoticeXHR($(this));SN.U.FormNoticeEnhancements($(this))});SN.U.NoticeDataAttach()}},Notices:function(){if($("body.user_in").length>0){SN.U.NoticeFavor();SN.U.NoticeRepeat();SN.U.NoticeReply();SN.U.NoticeInlineReplySetup()}SN.U.NoticeAttachments()},EntityActions:function(){if($("body.user_in").length>0){$(".form_user_subscribe").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_user_unsubscribe").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_group_join").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_group_leave").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_user_nudge").live("click",function(){SN.U.FormXHR($(this));return false});SN.U.NewDirectMessage()}},Login:function(){if(SN.U.StatusNetInstance.Get()!==null){var a=SN.U.StatusNetInstance.Get().Nickname;if(a!==null){$("#form_login #nickname").val(a)}}$("#form_login").bind("submit",function(){SN.U.StatusNetInstance.Set({Nickname:$("#form_login #nickname").val()});return true})},UploadForms:function(){$("input[type=file]").change(function(d){if(typeof this.files=="object"&&this.files.length>0){var c=0;for(var b=0;b<this.files.length;b++){c+=this.files[b].size}var a=SN.U.maxFileSize($(this.form));if(a>0&&c>a){var e="File too large: maximum upload size is %d bytes.";alert(e.replace("%d",a));$(this).val("");d.preventDefault();return false}}})}}};$(document).ready(function(){SN.Init.UploadForms();if($("."+SN.C.S.FormNotice).length>0){SN.Init.NoticeForm()}if($("#content .notices").length>0){SN.Init.Notices()}if($("#content .entity_actions").length>0){SN.Init.EntityActions()}if($("#form_login").length>0){SN.Init.Login()}});if(!document.ELEMENT_NODE){document.ELEMENT_NODE=1;document.ATTRIBUTE_NODE=2;document.TEXT_NODE=3;document.CDATA_SECTION_NODE=4;document.ENTITY_REFERENCE_NODE=5;document.ENTITY_NODE=6;document.PROCESSING_INSTRUCTION_NODE=7;document.COMMENT_NODE=8;document.DOCUMENT_NODE=9;document.DOCUMENT_TYPE_NODE=10;document.DOCUMENT_FRAGMENT_NODE=11;document.NOTATION_NODE=12}document._importNode=function(e,a){switch(e.nodeType){case document.ELEMENT_NODE:var d=document.createElement(e.nodeName);if(e.attributes&&e.attributes.length>0){for(var c=0,b=e.attributes.length;c<b;){if(e.attributes[c].nodeName=="class"){d.className=e.getAttribute(e.attributes[c++].nodeName)}else{d.setAttribute(e.attributes[c].nodeName,e.getAttribute(e.attributes[c++].nodeName))}}}if(a&&e.childNodes&&e.childNodes.length>0){for(var c=0,b=e.childNodes.length;c<b;){d.appendChild(document._importNode(e.childNodes[c++],a))}}return d;break;case document.TEXT_NODE:case document.CDATA_SECTION_NODE:case document.COMMENT_NODE:return document.createTextNode(e.nodeValue);break}};if(typeof navigator.geolocation=="undefined"||navigator.geolocation.shim){(function(){(function(){if(window.google&&google.gears){return}var c=null;if(typeof GearsFactory!="undefined"){c=new GearsFactory()}else{try{c=new ActiveXObject("Gears.Factory");if(c.getBuildInfo().indexOf("ie_mobile")!=-1){c.privateSetGlobalObject(this)}}catch(d){if((typeof navigator.mimeTypes!="undefined")&&navigator.mimeTypes["application/x-googlegears"]){c=document.createElement("object");c.style.display="none";c.width=0;c.height=0;c.type="application/x-googlegears";document.documentElement.appendChild(c)}}}if(!c){return}if(!window.google){google={}}if(!google.gears){google.gears={factory:c}}})();var a=(function(){var d=google.gears.factory.create("beta.geolocation");var c=function(f,e){return function(g){f(g);e.lastPosition=g}};return{shim:true,type:"Gears",lastPosition:null,getCurrentPosition:function(e,g,h){var f=this;var i=c(e,f);d.getCurrentPosition(i,g,h)},watchPosition:function(e,f,g){d.watchPosition(e,f,g)},clearWatch:function(e){d.clearWatch(e)},getPermission:function(g,e,f){d.getPermission(g,e,f)}}});var b=(function(){var i=false;var e=function(){if(!d()&&!i){i=true;var j=document.createElement("script");j.src=(document.location.protocol=="https:"?"https://":"http://")+"www.google.com/jsapi?callback=_google_loader_apiLoaded";j.type="text/javascript";document.getElementsByTagName("body")[0].appendChild(j)}};var c=[];var h=function(j){c.push(j)};var f=function(){if(d()){while(c.length>0){var j=c.pop();j()}}};window._google_loader_apiLoaded=function(){f()};var d=function(){return(window.google&&google.loader)};var g=function(j){if(d()){return true}h(j);e();return false};e();return{shim:true,type:"ClientLocation",lastPosition:null,getCurrentPosition:function(k,n,o){var m=this;if(!g(function(){m.getCurrentPosition(k,n,o)})){return}if(google.loader.ClientLocation){var l=google.loader.ClientLocation;var j={coords:{latitude:l.latitude,longitude:l.longitude,altitude:null,accuracy:43000,altitudeAccuracy:null,heading:null,speed:null},address:{city:l.address.city,country:l.address.country,country_code:l.address.country_code,region:l.address.region},timestamp:new Date()};k(j);this.lastPosition=j}else{if(n==="function"){n({code:3,message:"Using the Google ClientLocation API and it is not able to calculate a location."})}}},watchPosition:function(j,l,m){this.getCurrentPosition(j,l,m);var k=this;var n=setInterval(function(){k.getCurrentPosition(j,l,m)},10000);return n},clearWatch:function(j){clearInterval(j)},getPermission:function(l,j,k){return true}}});navigator.geolocation=(window.google&&google.gears)?a():b()})()};
\ No newline at end of file
+var SN={C:{I:{CounterBlackout:false,MaxLength:140,PatternUsername:/^[0-9a-zA-Z\-_.]*$/,HTTP20x30x:[200,201,202,203,204,205,206,300,301,302,303,304,305,306,307]},S:{Disabled:"disabled",Warning:"warning",Error:"error",Success:"success",Processing:"processing",CommandResult:"command_result",FormNotice:"form_notice",NoticeDataText:"notice_data-text",NoticeTextCount:"notice_text-count",NoticeInReplyTo:"notice_in-reply-to",NoticeDataAttach:"notice_data-attach",NoticeDataAttachSelected:"notice_data-attach_selected",NoticeActionSubmit:"notice_action-submit",NoticeLat:"notice_data-lat",NoticeLon:"notice_data-lon",NoticeLocationId:"notice_data-location_id",NoticeLocationNs:"notice_data-location_ns",NoticeGeoName:"notice_data-geo_name",NoticeDataGeo:"notice_data-geo",NoticeDataGeoCookie:"NoticeDataGeo",NoticeDataGeoSelected:"notice_data-geo_selected",StatusNetInstance:"StatusNetInstance"}},messages:{},msg:function(a){if(typeof SN.messages[a]=="undefined"){return"["+a+"]"}else{return SN.messages[a]}},U:{FormNoticeEnhancements:function(b){if(jQuery.data(b[0],"ElementData")===undefined){MaxLength=b.find("#"+SN.C.S.NoticeTextCount).text();if(typeof(MaxLength)=="undefined"){MaxLength=SN.C.I.MaxLength}jQuery.data(b[0],"ElementData",{MaxLength:MaxLength});SN.U.Counter(b);NDT=b.find("#"+SN.C.S.NoticeDataText);NDT.bind("keyup",function(c){SN.U.Counter(b)});var a=function(c){window.setTimeout(function(){SN.U.Counter(b)},50)};NDT.bind("cut",a).bind("paste",a);NDT.bind("keydown",function(c){SN.U.SubmitOnReturn(c,b)})}else{b.find("#"+SN.C.S.NoticeTextCount).text(jQuery.data(b[0],"ElementData").MaxLength)}if($("body")[0].id!="conversation"&&window.location.hash.length===0&&$(window).scrollTop()==0){b.find("textarea").focus()}},SubmitOnReturn:function(b,a){if(b.keyCode==13||b.keyCode==10){a.submit();b.preventDefault();b.stopPropagation();$("#"+a[0].id+" #"+SN.C.S.NoticeDataText).blur();$("body").focus();return false}return true},Counter:function(d){SN.C.I.FormNoticeCurrent=d;var b=jQuery.data(d[0],"ElementData").MaxLength;if(b<=0){return}var c=b-SN.U.CharacterCount(d);var a=d.find("#"+SN.C.S.NoticeTextCount);if(c.toString()!=a.text()){if(!SN.C.I.CounterBlackout||c===0){if(a.text()!=String(c)){a.text(c)}if(c<0){d.addClass(SN.C.S.Warning)}else{d.removeClass(SN.C.S.Warning)}if(!SN.C.I.CounterBlackout){SN.C.I.CounterBlackout=true;SN.C.I.FormNoticeCurrent=d;window.setTimeout("SN.U.ClearCounterBlackout(SN.C.I.FormNoticeCurrent);",500)}}}},CharacterCount:function(a){return a.find("#"+SN.C.S.NoticeDataText).val().length},ClearCounterBlackout:function(a){SN.C.I.CounterBlackout=false;SN.U.Counter(a)},RewriteAjaxAction:function(a){if(document.location.protocol=="https:"&&a.substr(0,5)=="http:"){return a.replace(/^http:\/\/[^:\/]+/,"https://"+document.location.host)}else{return a}},FormXHR:function(a){$.ajax({type:"POST",dataType:"xml",url:SN.U.RewriteAjaxAction(a.attr("action")),data:a.serialize()+"&ajax=1",beforeSend:function(b){a.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(c,d,b){alert(b||d)},success:function(b,c){if(typeof($("form",b)[0])!="undefined"){form_new=document._importNode($("form",b)[0],true);a.replaceWith(form_new)}else{a.replaceWith(document._importNode($("p",b)[0],true))}}})},FormNoticeXHR:function(b){SN.C.I.NoticeDataGeo={};b.append('<input type="hidden" name="ajax" value="1"/>');b.attr("action",SN.U.RewriteAjaxAction(b.attr("action")));var c=function(d,e){b.append($('<p class="form_response"></p>').addClass(d).text(e))};var a=function(){b.find(".form_response").remove()};b.ajaxForm({dataType:"xml",timeout:"60000",beforeSend:function(d){if(b.find("#"+SN.C.S.NoticeDataText)[0].value.length===0){b.addClass(SN.C.S.Warning);return false}b.addClass(SN.C.S.Processing).find("#"+SN.C.S.NoticeActionSubmit).addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled);SN.C.I.NoticeDataGeo.NLat=$("#"+SN.C.S.NoticeLat).val();SN.C.I.NoticeDataGeo.NLon=$("#"+SN.C.S.NoticeLon).val();SN.C.I.NoticeDataGeo.NLNS=$("#"+SN.C.S.NoticeLocationNs).val();SN.C.I.NoticeDataGeo.NLID=$("#"+SN.C.S.NoticeLocationId).val();SN.C.I.NoticeDataGeo.NDG=$("#"+SN.C.S.NoticeDataGeo).attr("checked");cookieValue=$.cookie(SN.C.S.NoticeDataGeoCookie);if(cookieValue!==null&&cookieValue!="disabled"){cookieValue=JSON.parse(cookieValue);SN.C.I.NoticeDataGeo.NLat=$("#"+SN.C.S.NoticeLat).val(cookieValue.NLat).val();SN.C.I.NoticeDataGeo.NLon=$("#"+SN.C.S.NoticeLon).val(cookieValue.NLon).val();if($("#"+SN.C.S.NoticeLocationNs).val(cookieValue.NLNS)){SN.C.I.NoticeDataGeo.NLNS=$("#"+SN.C.S.NoticeLocationNs).val(cookieValue.NLNS).val();SN.C.I.NoticeDataGeo.NLID=$("#"+SN.C.S.NoticeLocationId).val(cookieValue.NLID).val()}}if(cookieValue=="disabled"){SN.C.I.NoticeDataGeo.NDG=$("#"+SN.C.S.NoticeDataGeo).attr("checked",false).attr("checked")}else{SN.C.I.NoticeDataGeo.NDG=$("#"+SN.C.S.NoticeDataGeo).attr("checked",true).attr("checked")}return true},error:function(f,g,e){b.removeClass(SN.C.S.Processing).find("#"+SN.C.S.NoticeActionSubmit).removeClass(SN.C.S.Disabled).removeAttr(SN.C.S.Disabled,SN.C.S.Disabled);a();if(g=="timeout"){c("error","Sorry! We had trouble sending your notice. The servers are overloaded. Please try again, and contact the site administrator if this problem persists.")}else{var d=SN.U.GetResponseXML(f);if($("."+SN.C.S.Error,d).length>0){b.append(document._importNode($("."+SN.C.S.Error,d)[0],true))}else{if(parseInt(f.status)===0||jQuery.inArray(parseInt(f.status),SN.C.I.HTTP20x30x)>=0){b.resetForm().find("#"+SN.C.S.NoticeDataAttachSelected).remove();SN.U.FormNoticeEnhancements(b)}else{c("error","(Sorry! We had trouble sending your notice ("+f.status+" "+f.statusText+"). Please report the problem to the site administrator if this happens again.")}}}},success:function(i,k){a();var e=$("#"+SN.C.S.Error,i);if(e.length>0){c("error",e.text())}else{if($("body")[0].id=="bookmarklet"){self.close()}var d=$("#"+SN.C.S.CommandResult,i);if(d.length>0){c("success",d.text())}else{var h=document._importNode($("li",i)[0],true);var j=$("#notices_primary .notices:first");if(j.length>0&&SN.U.belongsOnTimeline(h)){if($("#"+h.id).length===0){var f=$("#"+SN.C.S.NoticeInReplyTo).val();var g="#notices_primary #notice-"+f;if($("body")[0].id=="conversation"){if(f.length>0&&$(g+" .notices").length<1){$(g).append('<ul class="notices"></ul>')}$($(g+" .notices")[0]).append(h)}else{j.prepend(h)}$("#"+h.id).css({display:"none"}).fadeIn(2500);SN.U.NoticeWithAttachment($("#"+h.id));SN.U.NoticeReplyTo($("#"+h.id))}}else{c("success",$("title",i).text())}}b.resetForm();b.find("#"+SN.C.S.NoticeInReplyTo).val("");b.find("#"+SN.C.S.NoticeDataAttachSelected).remove();SN.U.FormNoticeEnhancements(b)}},complete:function(d,e){b.removeClass(SN.C.S.Processing).find("#"+SN.C.S.NoticeActionSubmit).removeAttr(SN.C.S.Disabled).removeClass(SN.C.S.Disabled);$("#"+SN.C.S.NoticeLat).val(SN.C.I.NoticeDataGeo.NLat);$("#"+SN.C.S.NoticeLon).val(SN.C.I.NoticeDataGeo.NLon);if($("#"+SN.C.S.NoticeLocationNs)){$("#"+SN.C.S.NoticeLocationNs).val(SN.C.I.NoticeDataGeo.NLNS);$("#"+SN.C.S.NoticeLocationId).val(SN.C.I.NoticeDataGeo.NLID)}$("#"+SN.C.S.NoticeDataGeo).attr("checked",SN.C.I.NoticeDataGeo.NDG)}})},GetResponseXML:function(b){try{return b.responseXML}catch(a){return(new DOMParser()).parseFromString(b.responseText,"text/xml")}},NoticeReply:function(){if($("#"+SN.C.S.NoticeDataText).length>0&&$("#content .notice_reply").length>0){$("#content .notice").each(function(){SN.U.NoticeReplyTo($(this))})}},NoticeReplyTo:function(a){a.find(".notice_reply").live("click",function(c){c.preventDefault();var b=($(".author .nickname",a).length>0)?$($(".author .nickname",a)[0]):$(".author .nickname.uid");SN.U.NoticeInlineReplyTrigger(a,"@"+b.text());return false})},NoticeInlineReplyTrigger:function(h,i){var c=$($(".notice_id",h)[0]).text();var d=h;var f=h.closest(".notices");if(f.hasClass("threaded-replies")){d=f.closest(".notice")}else{f=$("ul.threaded-replies",h);if(f.length==0){f=$('<ul class="notices threaded-replies xoxo"></ul>');h.append(f)}}var k=$(".notice-reply-form",f);if(k.length==0){$("li.notice-reply-placeholder").remove();var g=$("li.notice-reply",f);if(g.length==0){g=$('<li class="notice-reply"><form class="notice-reply-form" method="post"><textarea name="status_textarea"></textarea><div class="controls"><input type="hidden" name="token"><input type="hidden" name="inreplyto"><input type="submit" class="submit"></div></form></li>');var b=$("#form_notice");k=g.find("form");k.attr("action",b.attr("action"));k.find('input[name="token"]').val(b.find("input[name=token]").val());k.find('input[type="submit"]').val(SN.msg("reply_submit"));f.append(g);k.find("textarea").blur(function(){var m=$(this);var l=$.trim(m.val());if(l==""||l==m.data("initialText")){g.remove();if(f.find("li").length>0){SN.U.NoticeInlineReplyPlaceholder(d)}else{f.remove()}}});k.submit(function(m){var l=k;$.ajax({type:"POST",dataType:"xml",url:SN.U.RewriteAjaxAction(l.attr("action")),data:l.serialize()+"&ajax=1",beforeSend:function(n){l.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled).end().find("textarea").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(o,p,n){alert(n||p)},success:function(p,r){var o=$("li",p)[0];if(o){var n=document._importNode(o,true);var q=$(n).attr("id");if($("#"+q).length==0){g.replaceWith(n);SN.U.NoticeInlineReplyPlaceholder(d)}else{g.remove()}}}});m.preventDefault();return false})}}k.find("input[name=inreplyto]").val(c);var j=k.find("textarea");if(j.length==0){throw"No textarea"}var a="";if(i){a=i+" "}j.val(a+j.val().replace(RegExp(a,"i"),""));j.data("initialText",$.trim(i+""));j.focus();if(j[0].setSelectionRange){var e=j.val().length;j[0].setSelectionRange(e,e)}},NoticeReplySet:function(b,d){if(b.match(SN.C.I.PatternUsername)){var c=$("#"+SN.C.S.NoticeDataText);if(c.length>0){replyto="@"+b+" ";c.val(replyto+c.val().replace(RegExp(replyto,"i"),""));$("#"+SN.C.S.FormNotice+" #"+SN.C.S.NoticeInReplyTo).val(d);c[0].focus();if(c[0].setSelectionRange){var a=c.val().length;c[0].setSelectionRange(a,a)}}}},NoticeFavor:function(){$(".form_favor").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_disfavor").live("click",function(){SN.U.FormXHR($(this));return false})},NoticeInlineReplyPlaceholder:function(b){var a=b.find("ul.threaded-replies");var c=$('<li class="notice-reply-placeholder"><input class="placeholder"></li>');c.click(function(){SN.U.NoticeInlineReplyTrigger(b)});c.find("input").val(SN.msg("reply_placeholder"));a.append(c)},NoticeInlineReplySetup:function(){$(".threaded-replies").each(function(){var b=$(this);var a=b.closest(".notice");SN.U.NoticeInlineReplyPlaceholder(a)})},NoticeRepeat:function(){$(".form_repeat").live("click",function(a){a.preventDefault();SN.U.NoticeRepeatConfirmation($(this));return false})},NoticeRepeatConfirmation:function(a){var c=a.find(".submit");var b=c.clone();b.addClass("submit_dialogbox").removeClass("submit");a.append(b);b.bind("click",function(){SN.U.FormXHR(a);return false});c.hide();a.addClass("dialogbox").append('<button class="close">&#215;</button>').closest(".notice-options").addClass("opaque");a.find("button.close").click(function(){$(this).remove();a.removeClass("dialogbox").closest(".notice-options").removeClass("opaque");a.find(".submit_dialogbox").remove();a.find(".submit").show();return false})},NoticeAttachments:function(){$(".notice a.attachment").each(function(){SN.U.NoticeWithAttachment($(this).closest(".notice"))})},NoticeWithAttachment:function(b){if(b.find(".attachment").length===0){return}var a=b.find(".attachment.more");if(a.length>0){$(a[0]).click(function(){var c=$(this);c.addClass(SN.C.S.Processing);$.get(c.attr("href")+"/ajax",null,function(d){c.parent(".entry-content").html($(d).find("#attachment_view .entry-content").html())});return false}).attr("title",SN.msg("showmore_tooltip"))}},NoticeDataAttach:function(){NDA=$("#"+SN.C.S.NoticeDataAttach);NDA.change(function(c){var a=$(this).val();if(!a){$("#"+SN.C.S.NoticeDataAttachSelected).remove();return false}S='<div id="'+SN.C.S.NoticeDataAttachSelected+'" class="'+SN.C.S.Success+'"><code>'+a+'</code> <button class="close">&#215;</button></div>';NDAS=$("#"+SN.C.S.NoticeDataAttachSelected);if(NDAS.length>0){NDAS.replaceWith(S)}else{$("#"+SN.C.S.FormNotice).append(S)}$("#"+SN.C.S.NoticeDataAttachSelected+" button").click(function(){$("#"+SN.C.S.NoticeDataAttachSelected).remove();NDA.val("");return false});if(typeof this.files=="object"){for(var b=0;b<this.files.length;b++){SN.U.PreviewAttach(this.files[b])}}})},maxFileSize:function(b){var a=$(b).find("input[name=MAX_FILE_SIZE]").attr("value");if(a){return parseInt(a)}else{return 0}},PreviewAttach:function(c){var d=c.type+" "+Math.round(c.size/1024)+"KB";var e=true;var g;if(typeof window.createObjectURL!="undefined"){g=function(h,i){i(window.createObjectURL(h))}}else{if(typeof window.FileReader!="undefined"){g=function(i,j){var h=new FileReader();h.onload=function(k){j(h.result)};h.readAsDataURL(i)}}else{e=false}}var a=["image/png","image/jpeg","image/gif","image/svg+xml"];if($.inArray(c.type,a)==-1){e=false}var f=8*1024*1024;if(c.size>f){e=false}if(e){g(c,function(i){var h=$("<img>").attr("title",d).attr("alt",d).attr("src",i).attr("style","height: 120px");$("#"+SN.C.S.NoticeDataAttachSelected).append(h)})}else{var b=$("<div></div>").text(d);$("#"+SN.C.S.NoticeDataAttachSelected).append(b)}},NoticeLocationAttach:function(){var c=$("#"+SN.C.S.NoticeLat).val();var h=$("#"+SN.C.S.NoticeLon).val();var d=$("#"+SN.C.S.NoticeLocationNs).val();var i=$("#"+SN.C.S.NoticeLocationId).val();var a=$("#"+SN.C.S.NoticeGeoName).text();var b=$("#"+SN.C.S.NoticeDataGeo);function e(){$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",jQuery.trim($("label[for="+SN.C.S.NoticeDataGeo+"]").text())).removeClass("checked");$("#"+SN.C.S.NoticeLat).val("");$("#"+SN.C.S.NoticeLon).val("");$("#"+SN.C.S.NoticeLocationNs).val("");$("#"+SN.C.S.NoticeLocationId).val("");$("#"+SN.C.S.NoticeDataGeo).attr("checked",false);$.cookie(SN.C.S.NoticeDataGeoCookie,"disabled",{path:"/"})}function j(k,l){$.getJSON(k,l,function(m){var n,o;if(typeof(m.location_ns)!="undefined"){$("#"+SN.C.S.NoticeLocationNs).val(m.location_ns);n=m.location_ns}if(typeof(m.location_id)!="undefined"){$("#"+SN.C.S.NoticeLocationId).val(m.location_id);o=m.location_id}if(typeof(m.name)=="undefined"){NLN_text=l.lat+";"+l.lon}else{NLN_text=m.name}$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",NoticeDataGeo_text.ShareDisable+" ("+NLN_text+")");$("#"+SN.C.S.NoticeLat).val(l.lat);$("#"+SN.C.S.NoticeLon).val(l.lon);$("#"+SN.C.S.NoticeLocationNs).val(n);$("#"+SN.C.S.NoticeLocationId).val(o);$("#"+SN.C.S.NoticeDataGeo).attr("checked",true);var p={NLat:l.lat,NLon:l.lon,NLNS:n,NLID:o,NLN:NLN_text,NLNU:m.url,NDG:true};$.cookie(SN.C.S.NoticeDataGeoCookie,JSON.stringify(p),{path:"/"})})}if(b.length>0){if($.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){b.attr("checked",false)}else{b.attr("checked",true)}var f=$("#notice_data-geo_wrap");var g=f.attr("title");f.removeAttr("title");$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",jQuery.trim($("label[for="+SN.C.S.NoticeDataGeo+"]").text()));b.change(function(){if($("#"+SN.C.S.NoticeDataGeo).attr("checked")===true||$.cookie(SN.C.S.NoticeDataGeoCookie)===null){$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",NoticeDataGeo_text.ShareDisable).addClass("checked");if($.cookie(SN.C.S.NoticeDataGeoCookie)===null||$.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){if(navigator.geolocation){navigator.geolocation.getCurrentPosition(function(m){$("#"+SN.C.S.NoticeLat).val(m.coords.latitude);$("#"+SN.C.S.NoticeLon).val(m.coords.longitude);var n={lat:m.coords.latitude,lon:m.coords.longitude,token:$("#token").val()};j(g,n)},function(m){switch(m.code){case m.PERMISSION_DENIED:e();break;case m.TIMEOUT:$("#"+SN.C.S.NoticeDataGeo).attr("checked",false);break}},{timeout:10000})}else{if(c.length>0&&h.length>0){var k={lat:c,lon:h,token:$("#token").val()};j(g,k)}else{e();$("#"+SN.C.S.NoticeDataGeo).remove();$("label[for="+SN.C.S.NoticeDataGeo+"]").remove()}}}else{var l=JSON.parse($.cookie(SN.C.S.NoticeDataGeoCookie));$("#"+SN.C.S.NoticeLat).val(l.NLat);$("#"+SN.C.S.NoticeLon).val(l.NLon);$("#"+SN.C.S.NoticeLocationNs).val(l.NLNS);$("#"+SN.C.S.NoticeLocationId).val(l.NLID);$("#"+SN.C.S.NoticeDataGeo).attr("checked",l.NDG);$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",NoticeDataGeo_text.ShareDisable+" ("+l.NLN+")").addClass("checked")}}else{e()}}).change()}},NewDirectMessage:function(){NDM=$(".entity_send-a-message a");NDM.attr({href:NDM.attr("href")+"&ajax=1"});NDM.bind("click",function(){var a=$(".entity_send-a-message form");if(a.length===0){$(this).addClass(SN.C.S.Processing);$.get(NDM.attr("href"),null,function(b){$(".entity_send-a-message").append(document._importNode($("form",b)[0],true));a=$(".entity_send-a-message .form_notice");SN.U.FormNoticeXHR(a);SN.U.FormNoticeEnhancements(a);a.append('<button class="close">&#215;</button>');$(".entity_send-a-message button").click(function(){a.hide();return false});NDM.removeClass(SN.C.S.Processing)})}else{a.show();$(".entity_send-a-message textarea").focus()}return false})},GetFullYear:function(c,d,a){var b=new Date();b.setFullYear(c,d,a);return b},StatusNetInstance:{Set:function(b){var a=SN.U.StatusNetInstance.Get();if(a!==null){b=$.extend(a,b)}$.cookie(SN.C.S.StatusNetInstance,JSON.stringify(b),{path:"/",expires:SN.U.GetFullYear(2029,0,1)})},Get:function(){var a=$.cookie(SN.C.S.StatusNetInstance);if(a!==null){return JSON.parse(a)}return null},Delete:function(){$.cookie(SN.C.S.StatusNetInstance,null)}},belongsOnTimeline:function(b){var a=$("body").attr("id");if(a=="public"){return true}var c=$("#nav_profile a").attr("href");if(c){var d=$(b).find(".entry-title .author a.url").attr("href");if(d==c){if(a=="all"||a=="showstream"){return true}}}return false}},Init:{NoticeForm:function(){if($("body.user_in").length>0){SN.U.NoticeLocationAttach();$("."+SN.C.S.FormNotice).each(function(){SN.U.FormNoticeXHR($(this));SN.U.FormNoticeEnhancements($(this))});SN.U.NoticeDataAttach()}},Notices:function(){if($("body.user_in").length>0){SN.U.NoticeFavor();SN.U.NoticeRepeat();SN.U.NoticeReply();SN.U.NoticeInlineReplySetup()}SN.U.NoticeAttachments()},EntityActions:function(){if($("body.user_in").length>0){$(".form_user_subscribe").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_user_unsubscribe").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_group_join").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_group_leave").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_user_nudge").live("click",function(){SN.U.FormXHR($(this));return false});SN.U.NewDirectMessage()}},Login:function(){if(SN.U.StatusNetInstance.Get()!==null){var a=SN.U.StatusNetInstance.Get().Nickname;if(a!==null){$("#form_login #nickname").val(a)}}$("#form_login").bind("submit",function(){SN.U.StatusNetInstance.Set({Nickname:$("#form_login #nickname").val()});return true})},UploadForms:function(){$("input[type=file]").change(function(d){if(typeof this.files=="object"&&this.files.length>0){var c=0;for(var b=0;b<this.files.length;b++){c+=this.files[b].size}var a=SN.U.maxFileSize($(this.form));if(a>0&&c>a){var e="File too large: maximum upload size is %d bytes.";alert(e.replace("%d",a));$(this).val("");d.preventDefault();return false}}})}}};$(document).ready(function(){SN.Init.UploadForms();if($("."+SN.C.S.FormNotice).length>0){SN.Init.NoticeForm()}if($("#content .notices").length>0){SN.Init.Notices()}if($("#content .entity_actions").length>0){SN.Init.EntityActions()}if($("#form_login").length>0){SN.Init.Login()}});if(!document.ELEMENT_NODE){document.ELEMENT_NODE=1;document.ATTRIBUTE_NODE=2;document.TEXT_NODE=3;document.CDATA_SECTION_NODE=4;document.ENTITY_REFERENCE_NODE=5;document.ENTITY_NODE=6;document.PROCESSING_INSTRUCTION_NODE=7;document.COMMENT_NODE=8;document.DOCUMENT_NODE=9;document.DOCUMENT_TYPE_NODE=10;document.DOCUMENT_FRAGMENT_NODE=11;document.NOTATION_NODE=12}document._importNode=function(e,a){switch(e.nodeType){case document.ELEMENT_NODE:var d=document.createElement(e.nodeName);if(e.attributes&&e.attributes.length>0){for(var c=0,b=e.attributes.length;c<b;){if(e.attributes[c].nodeName=="class"){d.className=e.getAttribute(e.attributes[c++].nodeName)}else{d.setAttribute(e.attributes[c].nodeName,e.getAttribute(e.attributes[c++].nodeName))}}}if(a&&e.childNodes&&e.childNodes.length>0){for(var c=0,b=e.childNodes.length;c<b;){d.appendChild(document._importNode(e.childNodes[c++],a))}}return d;break;case document.TEXT_NODE:case document.CDATA_SECTION_NODE:case document.COMMENT_NODE:return document.createTextNode(e.nodeValue);break}};if(typeof navigator.geolocation=="undefined"||navigator.geolocation.shim){(function(){(function(){if(window.google&&google.gears){return}var c=null;if(typeof GearsFactory!="undefined"){c=new GearsFactory()}else{try{c=new ActiveXObject("Gears.Factory");if(c.getBuildInfo().indexOf("ie_mobile")!=-1){c.privateSetGlobalObject(this)}}catch(d){if((typeof navigator.mimeTypes!="undefined")&&navigator.mimeTypes["application/x-googlegears"]){c=document.createElement("object");c.style.display="none";c.width=0;c.height=0;c.type="application/x-googlegears";document.documentElement.appendChild(c)}}}if(!c){return}if(!window.google){google={}}if(!google.gears){google.gears={factory:c}}})();var a=(function(){var d=google.gears.factory.create("beta.geolocation");var c=function(f,e){return function(g){f(g);e.lastPosition=g}};return{shim:true,type:"Gears",lastPosition:null,getCurrentPosition:function(e,g,h){var f=this;var i=c(e,f);d.getCurrentPosition(i,g,h)},watchPosition:function(e,f,g){d.watchPosition(e,f,g)},clearWatch:function(e){d.clearWatch(e)},getPermission:function(g,e,f){d.getPermission(g,e,f)}}});var b=(function(){var i=false;var e=function(){if(!d()&&!i){i=true;var j=document.createElement("script");j.src=(document.location.protocol=="https:"?"https://":"http://")+"www.google.com/jsapi?callback=_google_loader_apiLoaded";j.type="text/javascript";document.getElementsByTagName("body")[0].appendChild(j)}};var c=[];var h=function(j){c.push(j)};var f=function(){if(d()){while(c.length>0){var j=c.pop();j()}}};window._google_loader_apiLoaded=function(){f()};var d=function(){return(window.google&&google.loader)};var g=function(j){if(d()){return true}h(j);e();return false};e();return{shim:true,type:"ClientLocation",lastPosition:null,getCurrentPosition:function(k,n,o){var m=this;if(!g(function(){m.getCurrentPosition(k,n,o)})){return}if(google.loader.ClientLocation){var l=google.loader.ClientLocation;var j={coords:{latitude:l.latitude,longitude:l.longitude,altitude:null,accuracy:43000,altitudeAccuracy:null,heading:null,speed:null},address:{city:l.address.city,country:l.address.country,country_code:l.address.country_code,region:l.address.region},timestamp:new Date()};k(j);this.lastPosition=j}else{if(n==="function"){n({code:3,message:"Using the Google ClientLocation API and it is not able to calculate a location."})}}},watchPosition:function(j,l,m){this.getCurrentPosition(j,l,m);var k=this;var n=setInterval(function(){k.getCurrentPosition(j,l,m)},10000);return n},clearWatch:function(j){clearInterval(j)},getPermission:function(l,j,k){return true}}});navigator.geolocation=(window.google&&google.gears)?a():b()})()};
\ No newline at end of file
diff --git a/lib/action.php b/lib/action.php
index 650f706a4b..9b5f571c61 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -325,10 +325,10 @@ class Action extends HTMLOutputter // lawsuit
             $messages['showmore_tooltip'] = _m('TOOLTIP', 'Show more');
 
             // TRANS: Inline reply form submit button: submits a reply comment.
-            $messages['reply_submit'] = _m('BUTTON', 'Comment');
+            $messages['reply_submit'] = _m('BUTTON', 'Reply');
 
             // TRANS: Placeholder text for inline reply form. Clicking in this box will turn it into a mini notice form.
-            $messages['reply_comment'] = _m('Add a comment...');
+            $messages['reply_placeholder'] = _m('Write a reply...');
 
             $messages = array_merge($messages, $this->getScriptMessages());
 
diff --git a/lib/threadednoticelist.php b/lib/threadednoticelist.php
index 645f15438f..867ce28ed6 100644
--- a/lib/threadednoticelist.php
+++ b/lib/threadednoticelist.php
@@ -267,7 +267,7 @@ class ThreadedNoticeListMoreItem extends NoticeListItem
         $notice = new Notice();
         $notice->conversation = $id;
         $n = $notice->count() - 1;
-        $msg = sprintf(_m('Show all %d comment', 'Show all %d comments', $n), $n);
+        $msg = sprintf(_m('Show %d reply', 'Show all %d replies', $n), $n);
 
         $this->out->element('a', array('href' => $url), $msg);
 

From 04189184612259914dacfb4dceae34f2c74cd425 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Thu, 3 Mar 2011 16:53:44 -0500
Subject: [PATCH 378/655] first pass at microapp class

---
 lib/microapp.php | 59 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 59 insertions(+)
 create mode 100644 lib/microapp.php

diff --git a/lib/microapp.php b/lib/microapp.php
new file mode 100644
index 0000000000..77e6abb7e3
--- /dev/null
+++ b/lib/microapp.php
@@ -0,0 +1,59 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2011, StatusNet, Inc.
+ *
+ * Superclass for microapp plugin
+ * 
+ * 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  Microapp
+ * @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);
+}
+
+/**
+ * Superclass for microapp plugins
+ *
+ * This class lets you define micro-applications with different kinds of activities.
+ *
+ * The applications work more-or-less like other 
+ * 
+ * @category  Microapp
+ * @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 MicroAppPlugin extends Plugin
+{
+    abstract function isMyNotice($notice);
+    abstract function isMyActivity($activity);
+    abstract function saveNoticeFromActivity($activity);
+    abstract function activityFromNotice($notice);
+    abstract function showNotice($notice, $out);
+}

From 2695ead7b2f6c99eeb9aae10344c152bb8ef01cb Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Thu, 3 Mar 2011 16:57:16 -0500
Subject: [PATCH 379/655] add activity object type to notice

---
 db/core.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/db/core.php b/db/core.php
index 55d724b505..62730b853f 100644
--- a/db/core.php
+++ b/db/core.php
@@ -201,6 +201,7 @@ $schema['notice'] = array(
         'location_id' => array('type' => 'int', 'description' => 'location id if possible'),
         'location_ns' => array('type' => 'int', 'description' => 'namespace for location'),
         'repeat_of' => array('type' => 'int', 'description' => 'notice this is a repeat of'),
+        'object_type' => array('type' => 'varchar', 'length' => 32, 'description' => 'URI representing activity streams object type'),
     ),
     'primary key' => array('id'),
     'unique keys' => array(

From 6f73b2870b7029a643ef2138f60a209f908f063d Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Thu, 3 Mar 2011 15:21:27 -0800
Subject: [PATCH 380/655] Rework geolocation status display so you can actually
 tell what it's doing and whether a location will be posted.

Goes in along with the file attachment info, below the notice box. Still needs to be generalized to work with multiple forms.
---
 js/util.js     | 108 +++++++++++++++++++++++++++++++++++++------------
 js/util.min.js |   2 +-
 2 files changed, 83 insertions(+), 27 deletions(-)

diff --git a/js/util.js b/js/util.js
index e1e6a779ec..139057f7b6 100644
--- a/js/util.js
+++ b/js/util.js
@@ -375,29 +375,7 @@ var SN = { // StatusNet
                             .addClass(SN.C.S.Disabled)
                             .attr(SN.C.S.Disabled, SN.C.S.Disabled);
 
-                    SN.C.I.NoticeDataGeo.NLat = $('#'+SN.C.S.NoticeLat).val();
-                    SN.C.I.NoticeDataGeo.NLon = $('#'+SN.C.S.NoticeLon).val();
-                    SN.C.I.NoticeDataGeo.NLNS = $('#'+SN.C.S.NoticeLocationNs).val();
-                    SN.C.I.NoticeDataGeo.NLID = $('#'+SN.C.S.NoticeLocationId).val();
-                    SN.C.I.NoticeDataGeo.NDG = $('#'+SN.C.S.NoticeDataGeo).attr('checked');
-
-                    cookieValue = $.cookie(SN.C.S.NoticeDataGeoCookie);
-
-                    if (cookieValue !== null && cookieValue != 'disabled') {
-                        cookieValue = JSON.parse(cookieValue);
-                        SN.C.I.NoticeDataGeo.NLat = $('#'+SN.C.S.NoticeLat).val(cookieValue.NLat).val();
-                        SN.C.I.NoticeDataGeo.NLon = $('#'+SN.C.S.NoticeLon).val(cookieValue.NLon).val();
-                        if ($('#'+SN.C.S.NoticeLocationNs).val(cookieValue.NLNS)) {
-                            SN.C.I.NoticeDataGeo.NLNS = $('#'+SN.C.S.NoticeLocationNs).val(cookieValue.NLNS).val();
-                            SN.C.I.NoticeDataGeo.NLID = $('#'+SN.C.S.NoticeLocationId).val(cookieValue.NLID).val();
-                        }
-                    }
-                    if (cookieValue == 'disabled') {
-                        SN.C.I.NoticeDataGeo.NDG = $('#'+SN.C.S.NoticeDataGeo).attr('checked', false).attr('checked');
-                    }
-                    else {
-                        SN.C.I.NoticeDataGeo.NDG = $('#'+SN.C.S.NoticeDataGeo).attr('checked', true).attr('checked');
-                    }
+                    SN.U.normalizeGeoData(form);
 
                     return true;
                 },
@@ -501,6 +479,35 @@ var SN = { // StatusNet
             });
         },
 
+        normalizeGeoData: function(form) {
+            SN.C.I.NoticeDataGeo.NLat = form.find('[name=lat]').val();
+            SN.C.I.NoticeDataGeo.NLon = form.find('[name=lon]').val();
+            SN.C.I.NoticeDataGeo.NLNS = form.find('[name=location_ns]').val();
+            SN.C.I.NoticeDataGeo.NLID = form.find('[name=location_id]').val();
+            SN.C.I.NoticeDataGeo.NDG = $('#'+SN.C.S.NoticeDataGeo).attr('checked'); // @fixme
+
+            var cookieValue = $.cookie(SN.C.S.NoticeDataGeoCookie);
+
+            if (cookieValue !== null && cookieValue != 'disabled') {
+                cookieValue = JSON.parse(cookieValue);
+                SN.C.I.NoticeDataGeo.NLat = form.find('[name=lat]').val(cookieValue.NLat).val();
+                SN.C.I.NoticeDataGeo.NLon = form.find('[name=lon]').val(cookieValue.NLon).val();
+                if (cookieValue.NLNS) {
+                    SN.C.I.NoticeDataGeo.NLNS = form.find('[name=location_ns]').val(cookieValue.NLNS).val();
+                    SN.C.I.NoticeDataGeo.NLID = form.find('[name=location_id]').val(cookieValue.NLID).val();
+                } else {
+                    form.find('[name=location_ns]').val('');
+                    form.find('[name=location_id]').val('');
+                }
+            }
+            if (cookieValue == 'disabled') {
+                SN.C.I.NoticeDataGeo.NDG = $('#'+SN.C.S.NoticeDataGeo).attr('checked', false).attr('checked');
+            }
+            else {
+                SN.C.I.NoticeDataGeo.NDG = $('#'+SN.C.S.NoticeDataGeo).attr('checked', true).attr('checked');
+            }
+
+        },
         /**
          * Fetch an XML DOM from an XHR's response data.
          *
@@ -1026,6 +1033,7 @@ var SN = { // StatusNet
          *
          */
         NoticeLocationAttach: function() {
+            // @fixme this should not be tied to the main notice form, as there may be multiple notice forms...
             var NLat = $('#'+SN.C.S.NoticeLat).val();
             var NLon = $('#'+SN.C.S.NoticeLon).val();
             var NLNS = $('#'+SN.C.S.NoticeLocationNs).val();
@@ -1033,7 +1041,7 @@ var SN = { // StatusNet
             var NLN = $('#'+SN.C.S.NoticeGeoName).text();
             var NDGe = $('#'+SN.C.S.NoticeDataGeo);
 
-            function removeNoticeDataGeo() {
+            function removeNoticeDataGeo(error) {
                 $('label[for='+SN.C.S.NoticeDataGeo+']')
                     .attr('title', jQuery.trim($('label[for='+SN.C.S.NoticeDataGeo+']').text()))
                     .removeClass('checked');
@@ -1045,9 +1053,17 @@ var SN = { // StatusNet
                 $('#'+SN.C.S.NoticeDataGeo).attr('checked', false);
 
                 $.cookie(SN.C.S.NoticeDataGeoCookie, 'disabled', { path: '/' });
+
+                if (error) {
+                    $('.geo_status_wrapper').removeClass('success').addClass('error');
+                    $('.geo_status_wrapper .geo_status').text(error);
+                } else {
+                    $('.geo_status_wrapper').remove();
+                }
             }
 
             function getJSONgeocodeURL(geocodeURL, data) {
+                SN.U.NoticeGeoStatus('Looking up place name...');
                 $.getJSON(geocodeURL, data, function(location) {
                     var lns, lid;
 
@@ -1068,6 +1084,7 @@ var SN = { // StatusNet
                         NLN_text = location.name;
                     }
 
+                    SN.U.NoticeGeoStatus(NLN_text, data.lat, data.lon, location.url);
                     $('label[for='+SN.C.S.NoticeDataGeo+']')
                         .attr('title', NoticeDataGeo_text.ShareDisable + ' (' + NLN_text + ')');
 
@@ -1114,6 +1131,7 @@ var SN = { // StatusNet
 
                         if ($.cookie(SN.C.S.NoticeDataGeoCookie) === null || $.cookie(SN.C.S.NoticeDataGeoCookie) == 'disabled') {
                             if (navigator.geolocation) {
+                                SN.U.NoticeGeoStatus('Requesting location from browser...');
                                 navigator.geolocation.getCurrentPosition(
                                     function(position) {
                                         $('#'+SN.C.S.NoticeLat).val(position.coords.latitude);
@@ -1131,10 +1149,11 @@ var SN = { // StatusNet
                                     function(error) {
                                         switch(error.code) {
                                             case error.PERMISSION_DENIED:
-                                                removeNoticeDataGeo();
+                                                removeNoticeDataGeo('Location permission denied.');
                                                 break;
                                             case error.TIMEOUT:
-                                                $('#'+SN.C.S.NoticeDataGeo).attr('checked', false);
+                                                //$('#'+SN.C.S.NoticeDataGeo).attr('checked', false);
+                                                removeNoticeDataGeo('Location lookup timeout.');
                                                 break;
                                         }
                                     },
@@ -1170,6 +1189,7 @@ var SN = { // StatusNet
                             $('#'+SN.C.S.NoticeLocationId).val(cookieValue.NLID);
                             $('#'+SN.C.S.NoticeDataGeo).attr('checked', cookieValue.NDG);
 
+                            SN.U.NoticeGeoStatus(cookieValue.NLN, cookieValue.NLat, cookieValue.NLon, cookieValue.NLNU);
                             $('label[for='+SN.C.S.NoticeDataGeo+']')
                                 .attr('title', NoticeDataGeo_text.ShareDisable + ' (' + cookieValue.NLN + ')')
                                 .addClass('checked');
@@ -1182,6 +1202,42 @@ var SN = { // StatusNet
             }
         },
 
+        /**
+         * Create or update a geolocation status widget in this notice posting form.
+         *
+         * @param {String} status
+         * @param {String} lat (optional)
+         * @param {String} lon (optional)
+         * @param {String} url (optional)
+         */
+        NoticeGeoStatus: function(status, lat, lon, url)
+        {
+            var form = $('#form_notice');
+            var wrapper = form.find('.geo_status_wrapper');
+            if (wrapper.length == 0) {
+                wrapper = $('<div class="'+SN.C.S.Success+' geo_status_wrapper"><button class="close" style="float:right">&#215;</button><div class="geo_status"></div></div>');
+                wrapper.find('button.close').click(function() {
+                    $('#'+SN.C.S.NoticeDataGeo).removeAttr('checked').change();
+                });
+                form.append(wrapper);
+            }
+            var label;
+            if (url) {
+                label = $('<a></a>').attr('href', url);
+            } else {
+                label = $('<span></span>');
+            }
+            label.text(status);
+            if (lat || lon) {
+                var latlon = lat + ';' + lon;
+                label.attr('title', latlon);
+                if (!status) {
+                    label.text(latlon)
+                }
+            }
+            wrapper.find('.geo_status').empty().append(label);
+        },
+
         /**
          * Setup function -- DOES NOT trigger actions immediately.
          *
diff --git a/js/util.min.js b/js/util.min.js
index 436048937e..f9903920cc 100644
--- a/js/util.min.js
+++ b/js/util.min.js
@@ -1 +1 @@
-var SN={C:{I:{CounterBlackout:false,MaxLength:140,PatternUsername:/^[0-9a-zA-Z\-_.]*$/,HTTP20x30x:[200,201,202,203,204,205,206,300,301,302,303,304,305,306,307]},S:{Disabled:"disabled",Warning:"warning",Error:"error",Success:"success",Processing:"processing",CommandResult:"command_result",FormNotice:"form_notice",NoticeDataText:"notice_data-text",NoticeTextCount:"notice_text-count",NoticeInReplyTo:"notice_in-reply-to",NoticeDataAttach:"notice_data-attach",NoticeDataAttachSelected:"notice_data-attach_selected",NoticeActionSubmit:"notice_action-submit",NoticeLat:"notice_data-lat",NoticeLon:"notice_data-lon",NoticeLocationId:"notice_data-location_id",NoticeLocationNs:"notice_data-location_ns",NoticeGeoName:"notice_data-geo_name",NoticeDataGeo:"notice_data-geo",NoticeDataGeoCookie:"NoticeDataGeo",NoticeDataGeoSelected:"notice_data-geo_selected",StatusNetInstance:"StatusNetInstance"}},messages:{},msg:function(a){if(typeof SN.messages[a]=="undefined"){return"["+a+"]"}else{return SN.messages[a]}},U:{FormNoticeEnhancements:function(b){if(jQuery.data(b[0],"ElementData")===undefined){MaxLength=b.find("#"+SN.C.S.NoticeTextCount).text();if(typeof(MaxLength)=="undefined"){MaxLength=SN.C.I.MaxLength}jQuery.data(b[0],"ElementData",{MaxLength:MaxLength});SN.U.Counter(b);NDT=b.find("#"+SN.C.S.NoticeDataText);NDT.bind("keyup",function(c){SN.U.Counter(b)});var a=function(c){window.setTimeout(function(){SN.U.Counter(b)},50)};NDT.bind("cut",a).bind("paste",a);NDT.bind("keydown",function(c){SN.U.SubmitOnReturn(c,b)})}else{b.find("#"+SN.C.S.NoticeTextCount).text(jQuery.data(b[0],"ElementData").MaxLength)}if($("body")[0].id!="conversation"&&window.location.hash.length===0&&$(window).scrollTop()==0){b.find("textarea").focus()}},SubmitOnReturn:function(b,a){if(b.keyCode==13||b.keyCode==10){a.submit();b.preventDefault();b.stopPropagation();$("#"+a[0].id+" #"+SN.C.S.NoticeDataText).blur();$("body").focus();return false}return true},Counter:function(d){SN.C.I.FormNoticeCurrent=d;var b=jQuery.data(d[0],"ElementData").MaxLength;if(b<=0){return}var c=b-SN.U.CharacterCount(d);var a=d.find("#"+SN.C.S.NoticeTextCount);if(c.toString()!=a.text()){if(!SN.C.I.CounterBlackout||c===0){if(a.text()!=String(c)){a.text(c)}if(c<0){d.addClass(SN.C.S.Warning)}else{d.removeClass(SN.C.S.Warning)}if(!SN.C.I.CounterBlackout){SN.C.I.CounterBlackout=true;SN.C.I.FormNoticeCurrent=d;window.setTimeout("SN.U.ClearCounterBlackout(SN.C.I.FormNoticeCurrent);",500)}}}},CharacterCount:function(a){return a.find("#"+SN.C.S.NoticeDataText).val().length},ClearCounterBlackout:function(a){SN.C.I.CounterBlackout=false;SN.U.Counter(a)},RewriteAjaxAction:function(a){if(document.location.protocol=="https:"&&a.substr(0,5)=="http:"){return a.replace(/^http:\/\/[^:\/]+/,"https://"+document.location.host)}else{return a}},FormXHR:function(a){$.ajax({type:"POST",dataType:"xml",url:SN.U.RewriteAjaxAction(a.attr("action")),data:a.serialize()+"&ajax=1",beforeSend:function(b){a.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(c,d,b){alert(b||d)},success:function(b,c){if(typeof($("form",b)[0])!="undefined"){form_new=document._importNode($("form",b)[0],true);a.replaceWith(form_new)}else{a.replaceWith(document._importNode($("p",b)[0],true))}}})},FormNoticeXHR:function(b){SN.C.I.NoticeDataGeo={};b.append('<input type="hidden" name="ajax" value="1"/>');b.attr("action",SN.U.RewriteAjaxAction(b.attr("action")));var c=function(d,e){b.append($('<p class="form_response"></p>').addClass(d).text(e))};var a=function(){b.find(".form_response").remove()};b.ajaxForm({dataType:"xml",timeout:"60000",beforeSend:function(d){if(b.find("#"+SN.C.S.NoticeDataText)[0].value.length===0){b.addClass(SN.C.S.Warning);return false}b.addClass(SN.C.S.Processing).find("#"+SN.C.S.NoticeActionSubmit).addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled);SN.C.I.NoticeDataGeo.NLat=$("#"+SN.C.S.NoticeLat).val();SN.C.I.NoticeDataGeo.NLon=$("#"+SN.C.S.NoticeLon).val();SN.C.I.NoticeDataGeo.NLNS=$("#"+SN.C.S.NoticeLocationNs).val();SN.C.I.NoticeDataGeo.NLID=$("#"+SN.C.S.NoticeLocationId).val();SN.C.I.NoticeDataGeo.NDG=$("#"+SN.C.S.NoticeDataGeo).attr("checked");cookieValue=$.cookie(SN.C.S.NoticeDataGeoCookie);if(cookieValue!==null&&cookieValue!="disabled"){cookieValue=JSON.parse(cookieValue);SN.C.I.NoticeDataGeo.NLat=$("#"+SN.C.S.NoticeLat).val(cookieValue.NLat).val();SN.C.I.NoticeDataGeo.NLon=$("#"+SN.C.S.NoticeLon).val(cookieValue.NLon).val();if($("#"+SN.C.S.NoticeLocationNs).val(cookieValue.NLNS)){SN.C.I.NoticeDataGeo.NLNS=$("#"+SN.C.S.NoticeLocationNs).val(cookieValue.NLNS).val();SN.C.I.NoticeDataGeo.NLID=$("#"+SN.C.S.NoticeLocationId).val(cookieValue.NLID).val()}}if(cookieValue=="disabled"){SN.C.I.NoticeDataGeo.NDG=$("#"+SN.C.S.NoticeDataGeo).attr("checked",false).attr("checked")}else{SN.C.I.NoticeDataGeo.NDG=$("#"+SN.C.S.NoticeDataGeo).attr("checked",true).attr("checked")}return true},error:function(f,g,e){b.removeClass(SN.C.S.Processing).find("#"+SN.C.S.NoticeActionSubmit).removeClass(SN.C.S.Disabled).removeAttr(SN.C.S.Disabled,SN.C.S.Disabled);a();if(g=="timeout"){c("error","Sorry! We had trouble sending your notice. The servers are overloaded. Please try again, and contact the site administrator if this problem persists.")}else{var d=SN.U.GetResponseXML(f);if($("."+SN.C.S.Error,d).length>0){b.append(document._importNode($("."+SN.C.S.Error,d)[0],true))}else{if(parseInt(f.status)===0||jQuery.inArray(parseInt(f.status),SN.C.I.HTTP20x30x)>=0){b.resetForm().find("#"+SN.C.S.NoticeDataAttachSelected).remove();SN.U.FormNoticeEnhancements(b)}else{c("error","(Sorry! We had trouble sending your notice ("+f.status+" "+f.statusText+"). Please report the problem to the site administrator if this happens again.")}}}},success:function(i,k){a();var e=$("#"+SN.C.S.Error,i);if(e.length>0){c("error",e.text())}else{if($("body")[0].id=="bookmarklet"){self.close()}var d=$("#"+SN.C.S.CommandResult,i);if(d.length>0){c("success",d.text())}else{var h=document._importNode($("li",i)[0],true);var j=$("#notices_primary .notices:first");if(j.length>0&&SN.U.belongsOnTimeline(h)){if($("#"+h.id).length===0){var f=$("#"+SN.C.S.NoticeInReplyTo).val();var g="#notices_primary #notice-"+f;if($("body")[0].id=="conversation"){if(f.length>0&&$(g+" .notices").length<1){$(g).append('<ul class="notices"></ul>')}$($(g+" .notices")[0]).append(h)}else{j.prepend(h)}$("#"+h.id).css({display:"none"}).fadeIn(2500);SN.U.NoticeWithAttachment($("#"+h.id));SN.U.NoticeReplyTo($("#"+h.id))}}else{c("success",$("title",i).text())}}b.resetForm();b.find("#"+SN.C.S.NoticeInReplyTo).val("");b.find("#"+SN.C.S.NoticeDataAttachSelected).remove();SN.U.FormNoticeEnhancements(b)}},complete:function(d,e){b.removeClass(SN.C.S.Processing).find("#"+SN.C.S.NoticeActionSubmit).removeAttr(SN.C.S.Disabled).removeClass(SN.C.S.Disabled);$("#"+SN.C.S.NoticeLat).val(SN.C.I.NoticeDataGeo.NLat);$("#"+SN.C.S.NoticeLon).val(SN.C.I.NoticeDataGeo.NLon);if($("#"+SN.C.S.NoticeLocationNs)){$("#"+SN.C.S.NoticeLocationNs).val(SN.C.I.NoticeDataGeo.NLNS);$("#"+SN.C.S.NoticeLocationId).val(SN.C.I.NoticeDataGeo.NLID)}$("#"+SN.C.S.NoticeDataGeo).attr("checked",SN.C.I.NoticeDataGeo.NDG)}})},GetResponseXML:function(b){try{return b.responseXML}catch(a){return(new DOMParser()).parseFromString(b.responseText,"text/xml")}},NoticeReply:function(){if($("#"+SN.C.S.NoticeDataText).length>0&&$("#content .notice_reply").length>0){$("#content .notice").each(function(){SN.U.NoticeReplyTo($(this))})}},NoticeReplyTo:function(a){a.find(".notice_reply").live("click",function(c){c.preventDefault();var b=($(".author .nickname",a).length>0)?$($(".author .nickname",a)[0]):$(".author .nickname.uid");SN.U.NoticeInlineReplyTrigger(a,"@"+b.text());return false})},NoticeInlineReplyTrigger:function(h,i){var c=$($(".notice_id",h)[0]).text();var d=h;var f=h.closest(".notices");if(f.hasClass("threaded-replies")){d=f.closest(".notice")}else{f=$("ul.threaded-replies",h);if(f.length==0){f=$('<ul class="notices threaded-replies xoxo"></ul>');h.append(f)}}var k=$(".notice-reply-form",f);if(k.length==0){$("li.notice-reply-placeholder").remove();var g=$("li.notice-reply",f);if(g.length==0){g=$('<li class="notice-reply"><form class="notice-reply-form" method="post"><textarea name="status_textarea"></textarea><div class="controls"><input type="hidden" name="token"><input type="hidden" name="inreplyto"><input type="submit" class="submit"></div></form></li>');var b=$("#form_notice");k=g.find("form");k.attr("action",b.attr("action"));k.find('input[name="token"]').val(b.find("input[name=token]").val());k.find('input[type="submit"]').val(SN.msg("reply_submit"));f.append(g);k.find("textarea").blur(function(){var m=$(this);var l=$.trim(m.val());if(l==""||l==m.data("initialText")){g.remove();if(f.find("li").length>0){SN.U.NoticeInlineReplyPlaceholder(d)}else{f.remove()}}});k.submit(function(m){var l=k;$.ajax({type:"POST",dataType:"xml",url:SN.U.RewriteAjaxAction(l.attr("action")),data:l.serialize()+"&ajax=1",beforeSend:function(n){l.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled).end().find("textarea").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(o,p,n){alert(n||p)},success:function(p,r){var o=$("li",p)[0];if(o){var n=document._importNode(o,true);var q=$(n).attr("id");if($("#"+q).length==0){g.replaceWith(n);SN.U.NoticeInlineReplyPlaceholder(d)}else{g.remove()}}}});m.preventDefault();return false})}}k.find("input[name=inreplyto]").val(c);var j=k.find("textarea");if(j.length==0){throw"No textarea"}var a="";if(i){a=i+" "}j.val(a+j.val().replace(RegExp(a,"i"),""));j.data("initialText",$.trim(i+""));j.focus();if(j[0].setSelectionRange){var e=j.val().length;j[0].setSelectionRange(e,e)}},NoticeReplySet:function(b,d){if(b.match(SN.C.I.PatternUsername)){var c=$("#"+SN.C.S.NoticeDataText);if(c.length>0){replyto="@"+b+" ";c.val(replyto+c.val().replace(RegExp(replyto,"i"),""));$("#"+SN.C.S.FormNotice+" #"+SN.C.S.NoticeInReplyTo).val(d);c[0].focus();if(c[0].setSelectionRange){var a=c.val().length;c[0].setSelectionRange(a,a)}}}},NoticeFavor:function(){$(".form_favor").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_disfavor").live("click",function(){SN.U.FormXHR($(this));return false})},NoticeInlineReplyPlaceholder:function(b){var a=b.find("ul.threaded-replies");var c=$('<li class="notice-reply-placeholder"><input class="placeholder"></li>');c.click(function(){SN.U.NoticeInlineReplyTrigger(b)});c.find("input").val(SN.msg("reply_placeholder"));a.append(c)},NoticeInlineReplySetup:function(){$(".threaded-replies").each(function(){var b=$(this);var a=b.closest(".notice");SN.U.NoticeInlineReplyPlaceholder(a)})},NoticeRepeat:function(){$(".form_repeat").live("click",function(a){a.preventDefault();SN.U.NoticeRepeatConfirmation($(this));return false})},NoticeRepeatConfirmation:function(a){var c=a.find(".submit");var b=c.clone();b.addClass("submit_dialogbox").removeClass("submit");a.append(b);b.bind("click",function(){SN.U.FormXHR(a);return false});c.hide();a.addClass("dialogbox").append('<button class="close">&#215;</button>').closest(".notice-options").addClass("opaque");a.find("button.close").click(function(){$(this).remove();a.removeClass("dialogbox").closest(".notice-options").removeClass("opaque");a.find(".submit_dialogbox").remove();a.find(".submit").show();return false})},NoticeAttachments:function(){$(".notice a.attachment").each(function(){SN.U.NoticeWithAttachment($(this).closest(".notice"))})},NoticeWithAttachment:function(b){if(b.find(".attachment").length===0){return}var a=b.find(".attachment.more");if(a.length>0){$(a[0]).click(function(){var c=$(this);c.addClass(SN.C.S.Processing);$.get(c.attr("href")+"/ajax",null,function(d){c.parent(".entry-content").html($(d).find("#attachment_view .entry-content").html())});return false}).attr("title",SN.msg("showmore_tooltip"))}},NoticeDataAttach:function(){NDA=$("#"+SN.C.S.NoticeDataAttach);NDA.change(function(c){var a=$(this).val();if(!a){$("#"+SN.C.S.NoticeDataAttachSelected).remove();return false}S='<div id="'+SN.C.S.NoticeDataAttachSelected+'" class="'+SN.C.S.Success+'"><code>'+a+'</code> <button class="close">&#215;</button></div>';NDAS=$("#"+SN.C.S.NoticeDataAttachSelected);if(NDAS.length>0){NDAS.replaceWith(S)}else{$("#"+SN.C.S.FormNotice).append(S)}$("#"+SN.C.S.NoticeDataAttachSelected+" button").click(function(){$("#"+SN.C.S.NoticeDataAttachSelected).remove();NDA.val("");return false});if(typeof this.files=="object"){for(var b=0;b<this.files.length;b++){SN.U.PreviewAttach(this.files[b])}}})},maxFileSize:function(b){var a=$(b).find("input[name=MAX_FILE_SIZE]").attr("value");if(a){return parseInt(a)}else{return 0}},PreviewAttach:function(c){var d=c.type+" "+Math.round(c.size/1024)+"KB";var e=true;var g;if(typeof window.createObjectURL!="undefined"){g=function(h,i){i(window.createObjectURL(h))}}else{if(typeof window.FileReader!="undefined"){g=function(i,j){var h=new FileReader();h.onload=function(k){j(h.result)};h.readAsDataURL(i)}}else{e=false}}var a=["image/png","image/jpeg","image/gif","image/svg+xml"];if($.inArray(c.type,a)==-1){e=false}var f=8*1024*1024;if(c.size>f){e=false}if(e){g(c,function(i){var h=$("<img>").attr("title",d).attr("alt",d).attr("src",i).attr("style","height: 120px");$("#"+SN.C.S.NoticeDataAttachSelected).append(h)})}else{var b=$("<div></div>").text(d);$("#"+SN.C.S.NoticeDataAttachSelected).append(b)}},NoticeLocationAttach:function(){var c=$("#"+SN.C.S.NoticeLat).val();var h=$("#"+SN.C.S.NoticeLon).val();var d=$("#"+SN.C.S.NoticeLocationNs).val();var i=$("#"+SN.C.S.NoticeLocationId).val();var a=$("#"+SN.C.S.NoticeGeoName).text();var b=$("#"+SN.C.S.NoticeDataGeo);function e(){$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",jQuery.trim($("label[for="+SN.C.S.NoticeDataGeo+"]").text())).removeClass("checked");$("#"+SN.C.S.NoticeLat).val("");$("#"+SN.C.S.NoticeLon).val("");$("#"+SN.C.S.NoticeLocationNs).val("");$("#"+SN.C.S.NoticeLocationId).val("");$("#"+SN.C.S.NoticeDataGeo).attr("checked",false);$.cookie(SN.C.S.NoticeDataGeoCookie,"disabled",{path:"/"})}function j(k,l){$.getJSON(k,l,function(m){var n,o;if(typeof(m.location_ns)!="undefined"){$("#"+SN.C.S.NoticeLocationNs).val(m.location_ns);n=m.location_ns}if(typeof(m.location_id)!="undefined"){$("#"+SN.C.S.NoticeLocationId).val(m.location_id);o=m.location_id}if(typeof(m.name)=="undefined"){NLN_text=l.lat+";"+l.lon}else{NLN_text=m.name}$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",NoticeDataGeo_text.ShareDisable+" ("+NLN_text+")");$("#"+SN.C.S.NoticeLat).val(l.lat);$("#"+SN.C.S.NoticeLon).val(l.lon);$("#"+SN.C.S.NoticeLocationNs).val(n);$("#"+SN.C.S.NoticeLocationId).val(o);$("#"+SN.C.S.NoticeDataGeo).attr("checked",true);var p={NLat:l.lat,NLon:l.lon,NLNS:n,NLID:o,NLN:NLN_text,NLNU:m.url,NDG:true};$.cookie(SN.C.S.NoticeDataGeoCookie,JSON.stringify(p),{path:"/"})})}if(b.length>0){if($.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){b.attr("checked",false)}else{b.attr("checked",true)}var f=$("#notice_data-geo_wrap");var g=f.attr("title");f.removeAttr("title");$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",jQuery.trim($("label[for="+SN.C.S.NoticeDataGeo+"]").text()));b.change(function(){if($("#"+SN.C.S.NoticeDataGeo).attr("checked")===true||$.cookie(SN.C.S.NoticeDataGeoCookie)===null){$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",NoticeDataGeo_text.ShareDisable).addClass("checked");if($.cookie(SN.C.S.NoticeDataGeoCookie)===null||$.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){if(navigator.geolocation){navigator.geolocation.getCurrentPosition(function(m){$("#"+SN.C.S.NoticeLat).val(m.coords.latitude);$("#"+SN.C.S.NoticeLon).val(m.coords.longitude);var n={lat:m.coords.latitude,lon:m.coords.longitude,token:$("#token").val()};j(g,n)},function(m){switch(m.code){case m.PERMISSION_DENIED:e();break;case m.TIMEOUT:$("#"+SN.C.S.NoticeDataGeo).attr("checked",false);break}},{timeout:10000})}else{if(c.length>0&&h.length>0){var k={lat:c,lon:h,token:$("#token").val()};j(g,k)}else{e();$("#"+SN.C.S.NoticeDataGeo).remove();$("label[for="+SN.C.S.NoticeDataGeo+"]").remove()}}}else{var l=JSON.parse($.cookie(SN.C.S.NoticeDataGeoCookie));$("#"+SN.C.S.NoticeLat).val(l.NLat);$("#"+SN.C.S.NoticeLon).val(l.NLon);$("#"+SN.C.S.NoticeLocationNs).val(l.NLNS);$("#"+SN.C.S.NoticeLocationId).val(l.NLID);$("#"+SN.C.S.NoticeDataGeo).attr("checked",l.NDG);$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",NoticeDataGeo_text.ShareDisable+" ("+l.NLN+")").addClass("checked")}}else{e()}}).change()}},NewDirectMessage:function(){NDM=$(".entity_send-a-message a");NDM.attr({href:NDM.attr("href")+"&ajax=1"});NDM.bind("click",function(){var a=$(".entity_send-a-message form");if(a.length===0){$(this).addClass(SN.C.S.Processing);$.get(NDM.attr("href"),null,function(b){$(".entity_send-a-message").append(document._importNode($("form",b)[0],true));a=$(".entity_send-a-message .form_notice");SN.U.FormNoticeXHR(a);SN.U.FormNoticeEnhancements(a);a.append('<button class="close">&#215;</button>');$(".entity_send-a-message button").click(function(){a.hide();return false});NDM.removeClass(SN.C.S.Processing)})}else{a.show();$(".entity_send-a-message textarea").focus()}return false})},GetFullYear:function(c,d,a){var b=new Date();b.setFullYear(c,d,a);return b},StatusNetInstance:{Set:function(b){var a=SN.U.StatusNetInstance.Get();if(a!==null){b=$.extend(a,b)}$.cookie(SN.C.S.StatusNetInstance,JSON.stringify(b),{path:"/",expires:SN.U.GetFullYear(2029,0,1)})},Get:function(){var a=$.cookie(SN.C.S.StatusNetInstance);if(a!==null){return JSON.parse(a)}return null},Delete:function(){$.cookie(SN.C.S.StatusNetInstance,null)}},belongsOnTimeline:function(b){var a=$("body").attr("id");if(a=="public"){return true}var c=$("#nav_profile a").attr("href");if(c){var d=$(b).find(".entry-title .author a.url").attr("href");if(d==c){if(a=="all"||a=="showstream"){return true}}}return false}},Init:{NoticeForm:function(){if($("body.user_in").length>0){SN.U.NoticeLocationAttach();$("."+SN.C.S.FormNotice).each(function(){SN.U.FormNoticeXHR($(this));SN.U.FormNoticeEnhancements($(this))});SN.U.NoticeDataAttach()}},Notices:function(){if($("body.user_in").length>0){SN.U.NoticeFavor();SN.U.NoticeRepeat();SN.U.NoticeReply();SN.U.NoticeInlineReplySetup()}SN.U.NoticeAttachments()},EntityActions:function(){if($("body.user_in").length>0){$(".form_user_subscribe").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_user_unsubscribe").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_group_join").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_group_leave").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_user_nudge").live("click",function(){SN.U.FormXHR($(this));return false});SN.U.NewDirectMessage()}},Login:function(){if(SN.U.StatusNetInstance.Get()!==null){var a=SN.U.StatusNetInstance.Get().Nickname;if(a!==null){$("#form_login #nickname").val(a)}}$("#form_login").bind("submit",function(){SN.U.StatusNetInstance.Set({Nickname:$("#form_login #nickname").val()});return true})},UploadForms:function(){$("input[type=file]").change(function(d){if(typeof this.files=="object"&&this.files.length>0){var c=0;for(var b=0;b<this.files.length;b++){c+=this.files[b].size}var a=SN.U.maxFileSize($(this.form));if(a>0&&c>a){var e="File too large: maximum upload size is %d bytes.";alert(e.replace("%d",a));$(this).val("");d.preventDefault();return false}}})}}};$(document).ready(function(){SN.Init.UploadForms();if($("."+SN.C.S.FormNotice).length>0){SN.Init.NoticeForm()}if($("#content .notices").length>0){SN.Init.Notices()}if($("#content .entity_actions").length>0){SN.Init.EntityActions()}if($("#form_login").length>0){SN.Init.Login()}});if(!document.ELEMENT_NODE){document.ELEMENT_NODE=1;document.ATTRIBUTE_NODE=2;document.TEXT_NODE=3;document.CDATA_SECTION_NODE=4;document.ENTITY_REFERENCE_NODE=5;document.ENTITY_NODE=6;document.PROCESSING_INSTRUCTION_NODE=7;document.COMMENT_NODE=8;document.DOCUMENT_NODE=9;document.DOCUMENT_TYPE_NODE=10;document.DOCUMENT_FRAGMENT_NODE=11;document.NOTATION_NODE=12}document._importNode=function(e,a){switch(e.nodeType){case document.ELEMENT_NODE:var d=document.createElement(e.nodeName);if(e.attributes&&e.attributes.length>0){for(var c=0,b=e.attributes.length;c<b;){if(e.attributes[c].nodeName=="class"){d.className=e.getAttribute(e.attributes[c++].nodeName)}else{d.setAttribute(e.attributes[c].nodeName,e.getAttribute(e.attributes[c++].nodeName))}}}if(a&&e.childNodes&&e.childNodes.length>0){for(var c=0,b=e.childNodes.length;c<b;){d.appendChild(document._importNode(e.childNodes[c++],a))}}return d;break;case document.TEXT_NODE:case document.CDATA_SECTION_NODE:case document.COMMENT_NODE:return document.createTextNode(e.nodeValue);break}};if(typeof navigator.geolocation=="undefined"||navigator.geolocation.shim){(function(){(function(){if(window.google&&google.gears){return}var c=null;if(typeof GearsFactory!="undefined"){c=new GearsFactory()}else{try{c=new ActiveXObject("Gears.Factory");if(c.getBuildInfo().indexOf("ie_mobile")!=-1){c.privateSetGlobalObject(this)}}catch(d){if((typeof navigator.mimeTypes!="undefined")&&navigator.mimeTypes["application/x-googlegears"]){c=document.createElement("object");c.style.display="none";c.width=0;c.height=0;c.type="application/x-googlegears";document.documentElement.appendChild(c)}}}if(!c){return}if(!window.google){google={}}if(!google.gears){google.gears={factory:c}}})();var a=(function(){var d=google.gears.factory.create("beta.geolocation");var c=function(f,e){return function(g){f(g);e.lastPosition=g}};return{shim:true,type:"Gears",lastPosition:null,getCurrentPosition:function(e,g,h){var f=this;var i=c(e,f);d.getCurrentPosition(i,g,h)},watchPosition:function(e,f,g){d.watchPosition(e,f,g)},clearWatch:function(e){d.clearWatch(e)},getPermission:function(g,e,f){d.getPermission(g,e,f)}}});var b=(function(){var i=false;var e=function(){if(!d()&&!i){i=true;var j=document.createElement("script");j.src=(document.location.protocol=="https:"?"https://":"http://")+"www.google.com/jsapi?callback=_google_loader_apiLoaded";j.type="text/javascript";document.getElementsByTagName("body")[0].appendChild(j)}};var c=[];var h=function(j){c.push(j)};var f=function(){if(d()){while(c.length>0){var j=c.pop();j()}}};window._google_loader_apiLoaded=function(){f()};var d=function(){return(window.google&&google.loader)};var g=function(j){if(d()){return true}h(j);e();return false};e();return{shim:true,type:"ClientLocation",lastPosition:null,getCurrentPosition:function(k,n,o){var m=this;if(!g(function(){m.getCurrentPosition(k,n,o)})){return}if(google.loader.ClientLocation){var l=google.loader.ClientLocation;var j={coords:{latitude:l.latitude,longitude:l.longitude,altitude:null,accuracy:43000,altitudeAccuracy:null,heading:null,speed:null},address:{city:l.address.city,country:l.address.country,country_code:l.address.country_code,region:l.address.region},timestamp:new Date()};k(j);this.lastPosition=j}else{if(n==="function"){n({code:3,message:"Using the Google ClientLocation API and it is not able to calculate a location."})}}},watchPosition:function(j,l,m){this.getCurrentPosition(j,l,m);var k=this;var n=setInterval(function(){k.getCurrentPosition(j,l,m)},10000);return n},clearWatch:function(j){clearInterval(j)},getPermission:function(l,j,k){return true}}});navigator.geolocation=(window.google&&google.gears)?a():b()})()};
\ No newline at end of file
+var SN={C:{I:{CounterBlackout:false,MaxLength:140,PatternUsername:/^[0-9a-zA-Z\-_.]*$/,HTTP20x30x:[200,201,202,203,204,205,206,300,301,302,303,304,305,306,307]},S:{Disabled:"disabled",Warning:"warning",Error:"error",Success:"success",Processing:"processing",CommandResult:"command_result",FormNotice:"form_notice",NoticeDataText:"notice_data-text",NoticeTextCount:"notice_text-count",NoticeInReplyTo:"notice_in-reply-to",NoticeDataAttach:"notice_data-attach",NoticeDataAttachSelected:"notice_data-attach_selected",NoticeActionSubmit:"notice_action-submit",NoticeLat:"notice_data-lat",NoticeLon:"notice_data-lon",NoticeLocationId:"notice_data-location_id",NoticeLocationNs:"notice_data-location_ns",NoticeGeoName:"notice_data-geo_name",NoticeDataGeo:"notice_data-geo",NoticeDataGeoCookie:"NoticeDataGeo",NoticeDataGeoSelected:"notice_data-geo_selected",StatusNetInstance:"StatusNetInstance"}},messages:{},msg:function(a){if(typeof SN.messages[a]=="undefined"){return"["+a+"]"}else{return SN.messages[a]}},U:{FormNoticeEnhancements:function(b){if(jQuery.data(b[0],"ElementData")===undefined){MaxLength=b.find("#"+SN.C.S.NoticeTextCount).text();if(typeof(MaxLength)=="undefined"){MaxLength=SN.C.I.MaxLength}jQuery.data(b[0],"ElementData",{MaxLength:MaxLength});SN.U.Counter(b);NDT=b.find("#"+SN.C.S.NoticeDataText);NDT.bind("keyup",function(c){SN.U.Counter(b)});var a=function(c){window.setTimeout(function(){SN.U.Counter(b)},50)};NDT.bind("cut",a).bind("paste",a);NDT.bind("keydown",function(c){SN.U.SubmitOnReturn(c,b)})}else{b.find("#"+SN.C.S.NoticeTextCount).text(jQuery.data(b[0],"ElementData").MaxLength)}if($("body")[0].id!="conversation"&&window.location.hash.length===0&&$(window).scrollTop()==0){b.find("textarea").focus()}},SubmitOnReturn:function(b,a){if(b.keyCode==13||b.keyCode==10){a.submit();b.preventDefault();b.stopPropagation();$("#"+a[0].id+" #"+SN.C.S.NoticeDataText).blur();$("body").focus();return false}return true},Counter:function(d){SN.C.I.FormNoticeCurrent=d;var b=jQuery.data(d[0],"ElementData").MaxLength;if(b<=0){return}var c=b-SN.U.CharacterCount(d);var a=d.find("#"+SN.C.S.NoticeTextCount);if(c.toString()!=a.text()){if(!SN.C.I.CounterBlackout||c===0){if(a.text()!=String(c)){a.text(c)}if(c<0){d.addClass(SN.C.S.Warning)}else{d.removeClass(SN.C.S.Warning)}if(!SN.C.I.CounterBlackout){SN.C.I.CounterBlackout=true;SN.C.I.FormNoticeCurrent=d;window.setTimeout("SN.U.ClearCounterBlackout(SN.C.I.FormNoticeCurrent);",500)}}}},CharacterCount:function(a){return a.find("#"+SN.C.S.NoticeDataText).val().length},ClearCounterBlackout:function(a){SN.C.I.CounterBlackout=false;SN.U.Counter(a)},RewriteAjaxAction:function(a){if(document.location.protocol=="https:"&&a.substr(0,5)=="http:"){return a.replace(/^http:\/\/[^:\/]+/,"https://"+document.location.host)}else{return a}},FormXHR:function(a){$.ajax({type:"POST",dataType:"xml",url:SN.U.RewriteAjaxAction(a.attr("action")),data:a.serialize()+"&ajax=1",beforeSend:function(b){a.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(c,d,b){alert(b||d)},success:function(b,c){if(typeof($("form",b)[0])!="undefined"){form_new=document._importNode($("form",b)[0],true);a.replaceWith(form_new)}else{a.replaceWith(document._importNode($("p",b)[0],true))}}})},FormNoticeXHR:function(b){SN.C.I.NoticeDataGeo={};b.append('<input type="hidden" name="ajax" value="1"/>');b.attr("action",SN.U.RewriteAjaxAction(b.attr("action")));var c=function(d,e){b.append($('<p class="form_response"></p>').addClass(d).text(e))};var a=function(){b.find(".form_response").remove()};b.ajaxForm({dataType:"xml",timeout:"60000",beforeSend:function(d){if(b.find("#"+SN.C.S.NoticeDataText)[0].value.length===0){b.addClass(SN.C.S.Warning);return false}b.addClass(SN.C.S.Processing).find("#"+SN.C.S.NoticeActionSubmit).addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled);SN.U.normalizeGeoData(b);return true},error:function(f,g,e){b.removeClass(SN.C.S.Processing).find("#"+SN.C.S.NoticeActionSubmit).removeClass(SN.C.S.Disabled).removeAttr(SN.C.S.Disabled,SN.C.S.Disabled);a();if(g=="timeout"){c("error","Sorry! We had trouble sending your notice. The servers are overloaded. Please try again, and contact the site administrator if this problem persists.")}else{var d=SN.U.GetResponseXML(f);if($("."+SN.C.S.Error,d).length>0){b.append(document._importNode($("."+SN.C.S.Error,d)[0],true))}else{if(parseInt(f.status)===0||jQuery.inArray(parseInt(f.status),SN.C.I.HTTP20x30x)>=0){b.resetForm().find("#"+SN.C.S.NoticeDataAttachSelected).remove();SN.U.FormNoticeEnhancements(b)}else{c("error","(Sorry! We had trouble sending your notice ("+f.status+" "+f.statusText+"). Please report the problem to the site administrator if this happens again.")}}}},success:function(i,k){a();var e=$("#"+SN.C.S.Error,i);if(e.length>0){c("error",e.text())}else{if($("body")[0].id=="bookmarklet"){self.close()}var d=$("#"+SN.C.S.CommandResult,i);if(d.length>0){c("success",d.text())}else{var h=document._importNode($("li",i)[0],true);var j=$("#notices_primary .notices:first");if(j.length>0&&SN.U.belongsOnTimeline(h)){if($("#"+h.id).length===0){var f=$("#"+SN.C.S.NoticeInReplyTo).val();var g="#notices_primary #notice-"+f;if($("body")[0].id=="conversation"){if(f.length>0&&$(g+" .notices").length<1){$(g).append('<ul class="notices"></ul>')}$($(g+" .notices")[0]).append(h)}else{j.prepend(h)}$("#"+h.id).css({display:"none"}).fadeIn(2500);SN.U.NoticeWithAttachment($("#"+h.id));SN.U.NoticeReplyTo($("#"+h.id))}}else{c("success",$("title",i).text())}}b.resetForm();b.find("#"+SN.C.S.NoticeInReplyTo).val("");b.find("#"+SN.C.S.NoticeDataAttachSelected).remove();SN.U.FormNoticeEnhancements(b)}},complete:function(d,e){b.removeClass(SN.C.S.Processing).find("#"+SN.C.S.NoticeActionSubmit).removeAttr(SN.C.S.Disabled).removeClass(SN.C.S.Disabled);$("#"+SN.C.S.NoticeLat).val(SN.C.I.NoticeDataGeo.NLat);$("#"+SN.C.S.NoticeLon).val(SN.C.I.NoticeDataGeo.NLon);if($("#"+SN.C.S.NoticeLocationNs)){$("#"+SN.C.S.NoticeLocationNs).val(SN.C.I.NoticeDataGeo.NLNS);$("#"+SN.C.S.NoticeLocationId).val(SN.C.I.NoticeDataGeo.NLID)}$("#"+SN.C.S.NoticeDataGeo).attr("checked",SN.C.I.NoticeDataGeo.NDG)}})},normalizeGeoData:function(a){SN.C.I.NoticeDataGeo.NLat=a.find("[name=lat]").val();SN.C.I.NoticeDataGeo.NLon=a.find("[name=lon]").val();SN.C.I.NoticeDataGeo.NLNS=a.find("[name=location_ns]").val();SN.C.I.NoticeDataGeo.NLID=a.find("[name=location_id]").val();SN.C.I.NoticeDataGeo.NDG=$("#"+SN.C.S.NoticeDataGeo).attr("checked");var b=$.cookie(SN.C.S.NoticeDataGeoCookie);if(b!==null&&b!="disabled"){b=JSON.parse(b);SN.C.I.NoticeDataGeo.NLat=a.find("[name=lat]").val(b.NLat).val();SN.C.I.NoticeDataGeo.NLon=a.find("[name=lon]").val(b.NLon).val();if(b.NLNS){SN.C.I.NoticeDataGeo.NLNS=a.find("[name=location_ns]").val(b.NLNS).val();SN.C.I.NoticeDataGeo.NLID=a.find("[name=location_id]").val(b.NLID).val()}else{a.find("[name=location_ns]").val("");a.find("[name=location_id]").val("")}}if(b=="disabled"){SN.C.I.NoticeDataGeo.NDG=$("#"+SN.C.S.NoticeDataGeo).attr("checked",false).attr("checked")}else{SN.C.I.NoticeDataGeo.NDG=$("#"+SN.C.S.NoticeDataGeo).attr("checked",true).attr("checked")}},GetResponseXML:function(b){try{return b.responseXML}catch(a){return(new DOMParser()).parseFromString(b.responseText,"text/xml")}},NoticeReply:function(){if($("#"+SN.C.S.NoticeDataText).length>0&&$("#content .notice_reply").length>0){$("#content .notice").each(function(){SN.U.NoticeReplyTo($(this))})}},NoticeReplyTo:function(a){a.find(".notice_reply").live("click",function(c){c.preventDefault();var b=($(".author .nickname",a).length>0)?$($(".author .nickname",a)[0]):$(".author .nickname.uid");SN.U.NoticeInlineReplyTrigger(a,"@"+b.text());return false})},NoticeInlineReplyTrigger:function(h,i){var c=$($(".notice_id",h)[0]).text();var d=h;var f=h.closest(".notices");if(f.hasClass("threaded-replies")){d=f.closest(".notice")}else{f=$("ul.threaded-replies",h);if(f.length==0){f=$('<ul class="notices threaded-replies xoxo"></ul>');h.append(f)}}var k=$(".notice-reply-form",f);if(k.length==0){$("li.notice-reply-placeholder").remove();var g=$("li.notice-reply",f);if(g.length==0){g=$('<li class="notice-reply"><form class="notice-reply-form" method="post"><textarea name="status_textarea"></textarea><div class="controls"><input type="hidden" name="token"><input type="hidden" name="inreplyto"><input type="submit" class="submit"></div></form></li>');var b=$("#form_notice");k=g.find("form");k.attr("action",b.attr("action"));k.find('input[name="token"]').val(b.find("input[name=token]").val());k.find('input[type="submit"]').val(SN.msg("reply_submit"));f.append(g);k.find("textarea").blur(function(){var m=$(this);var l=$.trim(m.val());if(l==""||l==m.data("initialText")){g.remove();if(f.find("li").length>0){SN.U.NoticeInlineReplyPlaceholder(d)}else{f.remove()}}});k.submit(function(m){var l=k;$.ajax({type:"POST",dataType:"xml",url:SN.U.RewriteAjaxAction(l.attr("action")),data:l.serialize()+"&ajax=1",beforeSend:function(n){l.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled).end().find("textarea").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(o,p,n){alert(n||p)},success:function(p,r){var o=$("li",p)[0];if(o){var n=document._importNode(o,true);var q=$(n).attr("id");if($("#"+q).length==0){g.replaceWith(n);SN.U.NoticeInlineReplyPlaceholder(d)}else{g.remove()}}}});m.preventDefault();return false})}}k.find("input[name=inreplyto]").val(c);var j=k.find("textarea");if(j.length==0){throw"No textarea"}var a="";if(i){a=i+" "}j.val(a+j.val().replace(RegExp(a,"i"),""));j.data("initialText",$.trim(i+""));j.focus();if(j[0].setSelectionRange){var e=j.val().length;j[0].setSelectionRange(e,e)}},NoticeReplySet:function(b,d){if(b.match(SN.C.I.PatternUsername)){var c=$("#"+SN.C.S.NoticeDataText);if(c.length>0){replyto="@"+b+" ";c.val(replyto+c.val().replace(RegExp(replyto,"i"),""));$("#"+SN.C.S.FormNotice+" #"+SN.C.S.NoticeInReplyTo).val(d);c[0].focus();if(c[0].setSelectionRange){var a=c.val().length;c[0].setSelectionRange(a,a)}}}},NoticeFavor:function(){$(".form_favor").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_disfavor").live("click",function(){SN.U.FormXHR($(this));return false})},NoticeInlineReplyPlaceholder:function(b){var a=b.find("ul.threaded-replies");var c=$('<li class="notice-reply-placeholder"><input class="placeholder"></li>');c.click(function(){SN.U.NoticeInlineReplyTrigger(b)});c.find("input").val(SN.msg("reply_placeholder"));a.append(c)},NoticeInlineReplySetup:function(){$(".threaded-replies").each(function(){var b=$(this);var a=b.closest(".notice");SN.U.NoticeInlineReplyPlaceholder(a)})},NoticeRepeat:function(){$(".form_repeat").live("click",function(a){a.preventDefault();SN.U.NoticeRepeatConfirmation($(this));return false})},NoticeRepeatConfirmation:function(a){var c=a.find(".submit");var b=c.clone();b.addClass("submit_dialogbox").removeClass("submit");a.append(b);b.bind("click",function(){SN.U.FormXHR(a);return false});c.hide();a.addClass("dialogbox").append('<button class="close">&#215;</button>').closest(".notice-options").addClass("opaque");a.find("button.close").click(function(){$(this).remove();a.removeClass("dialogbox").closest(".notice-options").removeClass("opaque");a.find(".submit_dialogbox").remove();a.find(".submit").show();return false})},NoticeAttachments:function(){$(".notice a.attachment").each(function(){SN.U.NoticeWithAttachment($(this).closest(".notice"))})},NoticeWithAttachment:function(b){if(b.find(".attachment").length===0){return}var a=b.find(".attachment.more");if(a.length>0){$(a[0]).click(function(){var c=$(this);c.addClass(SN.C.S.Processing);$.get(c.attr("href")+"/ajax",null,function(d){c.parent(".entry-content").html($(d).find("#attachment_view .entry-content").html())});return false}).attr("title",SN.msg("showmore_tooltip"))}},NoticeDataAttach:function(){NDA=$("#"+SN.C.S.NoticeDataAttach);NDA.change(function(c){var a=$(this).val();if(!a){$("#"+SN.C.S.NoticeDataAttachSelected).remove();return false}S='<div id="'+SN.C.S.NoticeDataAttachSelected+'" class="'+SN.C.S.Success+'"><code>'+a+'</code> <button class="close">&#215;</button></div>';NDAS=$("#"+SN.C.S.NoticeDataAttachSelected);if(NDAS.length>0){NDAS.replaceWith(S)}else{$("#"+SN.C.S.FormNotice).append(S)}$("#"+SN.C.S.NoticeDataAttachSelected+" button").click(function(){$("#"+SN.C.S.NoticeDataAttachSelected).remove();NDA.val("");return false});if(typeof this.files=="object"){for(var b=0;b<this.files.length;b++){SN.U.PreviewAttach(this.files[b])}}})},maxFileSize:function(b){var a=$(b).find("input[name=MAX_FILE_SIZE]").attr("value");if(a){return parseInt(a)}else{return 0}},PreviewAttach:function(c){var d=c.type+" "+Math.round(c.size/1024)+"KB";var e=true;var g;if(typeof window.createObjectURL!="undefined"){g=function(h,i){i(window.createObjectURL(h))}}else{if(typeof window.FileReader!="undefined"){g=function(i,j){var h=new FileReader();h.onload=function(k){j(h.result)};h.readAsDataURL(i)}}else{e=false}}var a=["image/png","image/jpeg","image/gif","image/svg+xml"];if($.inArray(c.type,a)==-1){e=false}var f=8*1024*1024;if(c.size>f){e=false}if(e){g(c,function(i){var h=$("<img>").attr("title",d).attr("alt",d).attr("src",i).attr("style","height: 120px");$("#"+SN.C.S.NoticeDataAttachSelected).append(h)})}else{var b=$("<div></div>").text(d);$("#"+SN.C.S.NoticeDataAttachSelected).append(b)}},NoticeLocationAttach:function(){var c=$("#"+SN.C.S.NoticeLat).val();var h=$("#"+SN.C.S.NoticeLon).val();var d=$("#"+SN.C.S.NoticeLocationNs).val();var i=$("#"+SN.C.S.NoticeLocationId).val();var a=$("#"+SN.C.S.NoticeGeoName).text();var b=$("#"+SN.C.S.NoticeDataGeo);function e(k){$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",jQuery.trim($("label[for="+SN.C.S.NoticeDataGeo+"]").text())).removeClass("checked");$("#"+SN.C.S.NoticeLat).val("");$("#"+SN.C.S.NoticeLon).val("");$("#"+SN.C.S.NoticeLocationNs).val("");$("#"+SN.C.S.NoticeLocationId).val("");$("#"+SN.C.S.NoticeDataGeo).attr("checked",false);$.cookie(SN.C.S.NoticeDataGeoCookie,"disabled",{path:"/"});if(k){$(".geo_status_wrapper").removeClass("success").addClass("error");$(".geo_status_wrapper .geo_status").text(k)}else{$(".geo_status_wrapper").remove()}}function j(k,l){SN.U.NoticeGeoStatus("Looking up place name...");$.getJSON(k,l,function(m){var n,o;if(typeof(m.location_ns)!="undefined"){$("#"+SN.C.S.NoticeLocationNs).val(m.location_ns);n=m.location_ns}if(typeof(m.location_id)!="undefined"){$("#"+SN.C.S.NoticeLocationId).val(m.location_id);o=m.location_id}if(typeof(m.name)=="undefined"){NLN_text=l.lat+";"+l.lon}else{NLN_text=m.name}SN.U.NoticeGeoStatus(NLN_text,l.lat,l.lon,m.url);$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",NoticeDataGeo_text.ShareDisable+" ("+NLN_text+")");$("#"+SN.C.S.NoticeLat).val(l.lat);$("#"+SN.C.S.NoticeLon).val(l.lon);$("#"+SN.C.S.NoticeLocationNs).val(n);$("#"+SN.C.S.NoticeLocationId).val(o);$("#"+SN.C.S.NoticeDataGeo).attr("checked",true);var p={NLat:l.lat,NLon:l.lon,NLNS:n,NLID:o,NLN:NLN_text,NLNU:m.url,NDG:true};$.cookie(SN.C.S.NoticeDataGeoCookie,JSON.stringify(p),{path:"/"})})}if(b.length>0){if($.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){b.attr("checked",false)}else{b.attr("checked",true)}var f=$("#notice_data-geo_wrap");var g=f.attr("title");f.removeAttr("title");$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",jQuery.trim($("label[for="+SN.C.S.NoticeDataGeo+"]").text()));b.change(function(){if($("#"+SN.C.S.NoticeDataGeo).attr("checked")===true||$.cookie(SN.C.S.NoticeDataGeoCookie)===null){$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",NoticeDataGeo_text.ShareDisable).addClass("checked");if($.cookie(SN.C.S.NoticeDataGeoCookie)===null||$.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){if(navigator.geolocation){SN.U.NoticeGeoStatus("Requesting location from browser...");navigator.geolocation.getCurrentPosition(function(m){$("#"+SN.C.S.NoticeLat).val(m.coords.latitude);$("#"+SN.C.S.NoticeLon).val(m.coords.longitude);var n={lat:m.coords.latitude,lon:m.coords.longitude,token:$("#token").val()};j(g,n)},function(m){switch(m.code){case m.PERMISSION_DENIED:e("Location permission denied.");break;case m.TIMEOUT:e("Location lookup timeout.");break}},{timeout:10000})}else{if(c.length>0&&h.length>0){var k={lat:c,lon:h,token:$("#token").val()};j(g,k)}else{e();$("#"+SN.C.S.NoticeDataGeo).remove();$("label[for="+SN.C.S.NoticeDataGeo+"]").remove()}}}else{var l=JSON.parse($.cookie(SN.C.S.NoticeDataGeoCookie));$("#"+SN.C.S.NoticeLat).val(l.NLat);$("#"+SN.C.S.NoticeLon).val(l.NLon);$("#"+SN.C.S.NoticeLocationNs).val(l.NLNS);$("#"+SN.C.S.NoticeLocationId).val(l.NLID);$("#"+SN.C.S.NoticeDataGeo).attr("checked",l.NDG);SN.U.NoticeGeoStatus(l.NLN,l.NLat,l.NLon,l.NLNU);$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",NoticeDataGeo_text.ShareDisable+" ("+l.NLN+")").addClass("checked")}}else{e()}}).change()}},NoticeGeoStatus:function(a,f,g,c){var e=$("#form_notice");var h=e.find(".geo_status_wrapper");if(h.length==0){h=$('<div class="'+SN.C.S.Success+' geo_status_wrapper"><button class="close" style="float:right">&#215;</button><div class="geo_status"></div></div>');h.find("button.close").click(function(){$("#"+SN.C.S.NoticeDataGeo).removeAttr("checked").change()});e.append(h)}var b;if(c){b=$("<a></a>").attr("href",c)}else{b=$("<span></span>")}b.text(a);if(f||g){var d=f+";"+g;b.attr("title",d);if(!a){b.text(d)}}h.find(".geo_status").empty().append(b)},NewDirectMessage:function(){NDM=$(".entity_send-a-message a");NDM.attr({href:NDM.attr("href")+"&ajax=1"});NDM.bind("click",function(){var a=$(".entity_send-a-message form");if(a.length===0){$(this).addClass(SN.C.S.Processing);$.get(NDM.attr("href"),null,function(b){$(".entity_send-a-message").append(document._importNode($("form",b)[0],true));a=$(".entity_send-a-message .form_notice");SN.U.FormNoticeXHR(a);SN.U.FormNoticeEnhancements(a);a.append('<button class="close">&#215;</button>');$(".entity_send-a-message button").click(function(){a.hide();return false});NDM.removeClass(SN.C.S.Processing)})}else{a.show();$(".entity_send-a-message textarea").focus()}return false})},GetFullYear:function(c,d,a){var b=new Date();b.setFullYear(c,d,a);return b},StatusNetInstance:{Set:function(b){var a=SN.U.StatusNetInstance.Get();if(a!==null){b=$.extend(a,b)}$.cookie(SN.C.S.StatusNetInstance,JSON.stringify(b),{path:"/",expires:SN.U.GetFullYear(2029,0,1)})},Get:function(){var a=$.cookie(SN.C.S.StatusNetInstance);if(a!==null){return JSON.parse(a)}return null},Delete:function(){$.cookie(SN.C.S.StatusNetInstance,null)}},belongsOnTimeline:function(b){var a=$("body").attr("id");if(a=="public"){return true}var c=$("#nav_profile a").attr("href");if(c){var d=$(b).find(".entry-title .author a.url").attr("href");if(d==c){if(a=="all"||a=="showstream"){return true}}}return false}},Init:{NoticeForm:function(){if($("body.user_in").length>0){SN.U.NoticeLocationAttach();$("."+SN.C.S.FormNotice).each(function(){SN.U.FormNoticeXHR($(this));SN.U.FormNoticeEnhancements($(this))});SN.U.NoticeDataAttach()}},Notices:function(){if($("body.user_in").length>0){SN.U.NoticeFavor();SN.U.NoticeRepeat();SN.U.NoticeReply();SN.U.NoticeInlineReplySetup()}SN.U.NoticeAttachments()},EntityActions:function(){if($("body.user_in").length>0){$(".form_user_subscribe").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_user_unsubscribe").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_group_join").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_group_leave").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_user_nudge").live("click",function(){SN.U.FormXHR($(this));return false});SN.U.NewDirectMessage()}},Login:function(){if(SN.U.StatusNetInstance.Get()!==null){var a=SN.U.StatusNetInstance.Get().Nickname;if(a!==null){$("#form_login #nickname").val(a)}}$("#form_login").bind("submit",function(){SN.U.StatusNetInstance.Set({Nickname:$("#form_login #nickname").val()});return true})},UploadForms:function(){$("input[type=file]").change(function(d){if(typeof this.files=="object"&&this.files.length>0){var c=0;for(var b=0;b<this.files.length;b++){c+=this.files[b].size}var a=SN.U.maxFileSize($(this.form));if(a>0&&c>a){var e="File too large: maximum upload size is %d bytes.";alert(e.replace("%d",a));$(this).val("");d.preventDefault();return false}}})}}};$(document).ready(function(){SN.Init.UploadForms();if($("."+SN.C.S.FormNotice).length>0){SN.Init.NoticeForm()}if($("#content .notices").length>0){SN.Init.Notices()}if($("#content .entity_actions").length>0){SN.Init.EntityActions()}if($("#form_login").length>0){SN.Init.Login()}});if(!document.ELEMENT_NODE){document.ELEMENT_NODE=1;document.ATTRIBUTE_NODE=2;document.TEXT_NODE=3;document.CDATA_SECTION_NODE=4;document.ENTITY_REFERENCE_NODE=5;document.ENTITY_NODE=6;document.PROCESSING_INSTRUCTION_NODE=7;document.COMMENT_NODE=8;document.DOCUMENT_NODE=9;document.DOCUMENT_TYPE_NODE=10;document.DOCUMENT_FRAGMENT_NODE=11;document.NOTATION_NODE=12}document._importNode=function(e,a){switch(e.nodeType){case document.ELEMENT_NODE:var d=document.createElement(e.nodeName);if(e.attributes&&e.attributes.length>0){for(var c=0,b=e.attributes.length;c<b;){if(e.attributes[c].nodeName=="class"){d.className=e.getAttribute(e.attributes[c++].nodeName)}else{d.setAttribute(e.attributes[c].nodeName,e.getAttribute(e.attributes[c++].nodeName))}}}if(a&&e.childNodes&&e.childNodes.length>0){for(var c=0,b=e.childNodes.length;c<b;){d.appendChild(document._importNode(e.childNodes[c++],a))}}return d;break;case document.TEXT_NODE:case document.CDATA_SECTION_NODE:case document.COMMENT_NODE:return document.createTextNode(e.nodeValue);break}};if(typeof navigator.geolocation=="undefined"||navigator.geolocation.shim){(function(){(function(){if(window.google&&google.gears){return}var c=null;if(typeof GearsFactory!="undefined"){c=new GearsFactory()}else{try{c=new ActiveXObject("Gears.Factory");if(c.getBuildInfo().indexOf("ie_mobile")!=-1){c.privateSetGlobalObject(this)}}catch(d){if((typeof navigator.mimeTypes!="undefined")&&navigator.mimeTypes["application/x-googlegears"]){c=document.createElement("object");c.style.display="none";c.width=0;c.height=0;c.type="application/x-googlegears";document.documentElement.appendChild(c)}}}if(!c){return}if(!window.google){google={}}if(!google.gears){google.gears={factory:c}}})();var a=(function(){var d=google.gears.factory.create("beta.geolocation");var c=function(f,e){return function(g){f(g);e.lastPosition=g}};return{shim:true,type:"Gears",lastPosition:null,getCurrentPosition:function(e,g,h){var f=this;var i=c(e,f);d.getCurrentPosition(i,g,h)},watchPosition:function(e,f,g){d.watchPosition(e,f,g)},clearWatch:function(e){d.clearWatch(e)},getPermission:function(g,e,f){d.getPermission(g,e,f)}}});var b=(function(){var i=false;var e=function(){if(!d()&&!i){i=true;var j=document.createElement("script");j.src=(document.location.protocol=="https:"?"https://":"http://")+"www.google.com/jsapi?callback=_google_loader_apiLoaded";j.type="text/javascript";document.getElementsByTagName("body")[0].appendChild(j)}};var c=[];var h=function(j){c.push(j)};var f=function(){if(d()){while(c.length>0){var j=c.pop();j()}}};window._google_loader_apiLoaded=function(){f()};var d=function(){return(window.google&&google.loader)};var g=function(j){if(d()){return true}h(j);e();return false};e();return{shim:true,type:"ClientLocation",lastPosition:null,getCurrentPosition:function(k,n,o){var m=this;if(!g(function(){m.getCurrentPosition(k,n,o)})){return}if(google.loader.ClientLocation){var l=google.loader.ClientLocation;var j={coords:{latitude:l.latitude,longitude:l.longitude,altitude:null,accuracy:43000,altitudeAccuracy:null,heading:null,speed:null},address:{city:l.address.city,country:l.address.country,country_code:l.address.country_code,region:l.address.region},timestamp:new Date()};k(j);this.lastPosition=j}else{if(n==="function"){n({code:3,message:"Using the Google ClientLocation API and it is not able to calculate a location."})}}},watchPosition:function(j,l,m){this.getCurrentPosition(j,l,m);var k=this;var n=setInterval(function(){k.getCurrentPosition(j,l,m)},10000);return n},clearWatch:function(j){clearInterval(j)},getPermission:function(l,j,k){return true}}});navigator.geolocation=(window.google&&google.gears)?a():b()})()};
\ No newline at end of file

From 822f08e3ed71bee1f223e1551bcf60f0ba10d5ad Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Thu, 3 Mar 2011 16:14:36 -0800
Subject: [PATCH 381/655] Kill 'hit return to send'...

---
 js/util.js     | 27 ---------------------------
 js/util.min.js |  2 +-
 2 files changed, 1 insertion(+), 28 deletions(-)

diff --git a/js/util.js b/js/util.js
index 139057f7b6..00c9716557 100644
--- a/js/util.js
+++ b/js/util.js
@@ -132,10 +132,6 @@ var SN = { // StatusNet
                 // Note there's still no event for mouse-triggered 'delete'.
                 NDT.bind('cut', delayedUpdate)
                    .bind('paste', delayedUpdate);
-
-                NDT.bind('keydown', function(e) {
-                    SN.U.SubmitOnReturn(e, form);
-                });
             }
             else {
                 form.find('#'+SN.C.S.NoticeTextCount).text(jQuery.data(form[0], 'ElementData').MaxLength);
@@ -146,29 +142,6 @@ var SN = { // StatusNet
             }
         },
 
-        /**
-         * To be called from keydown event handler on the notice import form.
-         * Checks if return or enter key was pressed, and if so attempts to
-         * submit the form and cancel standard processing of the enter key.
-         *
-         * @param {Event} event
-         * @param {jQuery} el: jQuery object whose first element is the notice posting form
-         *
-         * @return {boolean} whether to cancel the event? Does this actually pass through?
-         * @access private
-         */
-        SubmitOnReturn: function(event, el) {
-            if (event.keyCode == 13 || event.keyCode == 10) {
-                el.submit();
-                event.preventDefault();
-                event.stopPropagation();
-                $('#'+el[0].id+' #'+SN.C.S.NoticeDataText).blur();
-                $('body').focus();
-                return false;
-            }
-            return true;
-        },
-
         /**
          * To be called from event handlers on the notice import form.
          * Triggers an update of the remaining-characters counter.
diff --git a/js/util.min.js b/js/util.min.js
index f9903920cc..1bcc86a8ba 100644
--- a/js/util.min.js
+++ b/js/util.min.js
@@ -1 +1 @@
-var SN={C:{I:{CounterBlackout:false,MaxLength:140,PatternUsername:/^[0-9a-zA-Z\-_.]*$/,HTTP20x30x:[200,201,202,203,204,205,206,300,301,302,303,304,305,306,307]},S:{Disabled:"disabled",Warning:"warning",Error:"error",Success:"success",Processing:"processing",CommandResult:"command_result",FormNotice:"form_notice",NoticeDataText:"notice_data-text",NoticeTextCount:"notice_text-count",NoticeInReplyTo:"notice_in-reply-to",NoticeDataAttach:"notice_data-attach",NoticeDataAttachSelected:"notice_data-attach_selected",NoticeActionSubmit:"notice_action-submit",NoticeLat:"notice_data-lat",NoticeLon:"notice_data-lon",NoticeLocationId:"notice_data-location_id",NoticeLocationNs:"notice_data-location_ns",NoticeGeoName:"notice_data-geo_name",NoticeDataGeo:"notice_data-geo",NoticeDataGeoCookie:"NoticeDataGeo",NoticeDataGeoSelected:"notice_data-geo_selected",StatusNetInstance:"StatusNetInstance"}},messages:{},msg:function(a){if(typeof SN.messages[a]=="undefined"){return"["+a+"]"}else{return SN.messages[a]}},U:{FormNoticeEnhancements:function(b){if(jQuery.data(b[0],"ElementData")===undefined){MaxLength=b.find("#"+SN.C.S.NoticeTextCount).text();if(typeof(MaxLength)=="undefined"){MaxLength=SN.C.I.MaxLength}jQuery.data(b[0],"ElementData",{MaxLength:MaxLength});SN.U.Counter(b);NDT=b.find("#"+SN.C.S.NoticeDataText);NDT.bind("keyup",function(c){SN.U.Counter(b)});var a=function(c){window.setTimeout(function(){SN.U.Counter(b)},50)};NDT.bind("cut",a).bind("paste",a);NDT.bind("keydown",function(c){SN.U.SubmitOnReturn(c,b)})}else{b.find("#"+SN.C.S.NoticeTextCount).text(jQuery.data(b[0],"ElementData").MaxLength)}if($("body")[0].id!="conversation"&&window.location.hash.length===0&&$(window).scrollTop()==0){b.find("textarea").focus()}},SubmitOnReturn:function(b,a){if(b.keyCode==13||b.keyCode==10){a.submit();b.preventDefault();b.stopPropagation();$("#"+a[0].id+" #"+SN.C.S.NoticeDataText).blur();$("body").focus();return false}return true},Counter:function(d){SN.C.I.FormNoticeCurrent=d;var b=jQuery.data(d[0],"ElementData").MaxLength;if(b<=0){return}var c=b-SN.U.CharacterCount(d);var a=d.find("#"+SN.C.S.NoticeTextCount);if(c.toString()!=a.text()){if(!SN.C.I.CounterBlackout||c===0){if(a.text()!=String(c)){a.text(c)}if(c<0){d.addClass(SN.C.S.Warning)}else{d.removeClass(SN.C.S.Warning)}if(!SN.C.I.CounterBlackout){SN.C.I.CounterBlackout=true;SN.C.I.FormNoticeCurrent=d;window.setTimeout("SN.U.ClearCounterBlackout(SN.C.I.FormNoticeCurrent);",500)}}}},CharacterCount:function(a){return a.find("#"+SN.C.S.NoticeDataText).val().length},ClearCounterBlackout:function(a){SN.C.I.CounterBlackout=false;SN.U.Counter(a)},RewriteAjaxAction:function(a){if(document.location.protocol=="https:"&&a.substr(0,5)=="http:"){return a.replace(/^http:\/\/[^:\/]+/,"https://"+document.location.host)}else{return a}},FormXHR:function(a){$.ajax({type:"POST",dataType:"xml",url:SN.U.RewriteAjaxAction(a.attr("action")),data:a.serialize()+"&ajax=1",beforeSend:function(b){a.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(c,d,b){alert(b||d)},success:function(b,c){if(typeof($("form",b)[0])!="undefined"){form_new=document._importNode($("form",b)[0],true);a.replaceWith(form_new)}else{a.replaceWith(document._importNode($("p",b)[0],true))}}})},FormNoticeXHR:function(b){SN.C.I.NoticeDataGeo={};b.append('<input type="hidden" name="ajax" value="1"/>');b.attr("action",SN.U.RewriteAjaxAction(b.attr("action")));var c=function(d,e){b.append($('<p class="form_response"></p>').addClass(d).text(e))};var a=function(){b.find(".form_response").remove()};b.ajaxForm({dataType:"xml",timeout:"60000",beforeSend:function(d){if(b.find("#"+SN.C.S.NoticeDataText)[0].value.length===0){b.addClass(SN.C.S.Warning);return false}b.addClass(SN.C.S.Processing).find("#"+SN.C.S.NoticeActionSubmit).addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled);SN.U.normalizeGeoData(b);return true},error:function(f,g,e){b.removeClass(SN.C.S.Processing).find("#"+SN.C.S.NoticeActionSubmit).removeClass(SN.C.S.Disabled).removeAttr(SN.C.S.Disabled,SN.C.S.Disabled);a();if(g=="timeout"){c("error","Sorry! We had trouble sending your notice. The servers are overloaded. Please try again, and contact the site administrator if this problem persists.")}else{var d=SN.U.GetResponseXML(f);if($("."+SN.C.S.Error,d).length>0){b.append(document._importNode($("."+SN.C.S.Error,d)[0],true))}else{if(parseInt(f.status)===0||jQuery.inArray(parseInt(f.status),SN.C.I.HTTP20x30x)>=0){b.resetForm().find("#"+SN.C.S.NoticeDataAttachSelected).remove();SN.U.FormNoticeEnhancements(b)}else{c("error","(Sorry! We had trouble sending your notice ("+f.status+" "+f.statusText+"). Please report the problem to the site administrator if this happens again.")}}}},success:function(i,k){a();var e=$("#"+SN.C.S.Error,i);if(e.length>0){c("error",e.text())}else{if($("body")[0].id=="bookmarklet"){self.close()}var d=$("#"+SN.C.S.CommandResult,i);if(d.length>0){c("success",d.text())}else{var h=document._importNode($("li",i)[0],true);var j=$("#notices_primary .notices:first");if(j.length>0&&SN.U.belongsOnTimeline(h)){if($("#"+h.id).length===0){var f=$("#"+SN.C.S.NoticeInReplyTo).val();var g="#notices_primary #notice-"+f;if($("body")[0].id=="conversation"){if(f.length>0&&$(g+" .notices").length<1){$(g).append('<ul class="notices"></ul>')}$($(g+" .notices")[0]).append(h)}else{j.prepend(h)}$("#"+h.id).css({display:"none"}).fadeIn(2500);SN.U.NoticeWithAttachment($("#"+h.id));SN.U.NoticeReplyTo($("#"+h.id))}}else{c("success",$("title",i).text())}}b.resetForm();b.find("#"+SN.C.S.NoticeInReplyTo).val("");b.find("#"+SN.C.S.NoticeDataAttachSelected).remove();SN.U.FormNoticeEnhancements(b)}},complete:function(d,e){b.removeClass(SN.C.S.Processing).find("#"+SN.C.S.NoticeActionSubmit).removeAttr(SN.C.S.Disabled).removeClass(SN.C.S.Disabled);$("#"+SN.C.S.NoticeLat).val(SN.C.I.NoticeDataGeo.NLat);$("#"+SN.C.S.NoticeLon).val(SN.C.I.NoticeDataGeo.NLon);if($("#"+SN.C.S.NoticeLocationNs)){$("#"+SN.C.S.NoticeLocationNs).val(SN.C.I.NoticeDataGeo.NLNS);$("#"+SN.C.S.NoticeLocationId).val(SN.C.I.NoticeDataGeo.NLID)}$("#"+SN.C.S.NoticeDataGeo).attr("checked",SN.C.I.NoticeDataGeo.NDG)}})},normalizeGeoData:function(a){SN.C.I.NoticeDataGeo.NLat=a.find("[name=lat]").val();SN.C.I.NoticeDataGeo.NLon=a.find("[name=lon]").val();SN.C.I.NoticeDataGeo.NLNS=a.find("[name=location_ns]").val();SN.C.I.NoticeDataGeo.NLID=a.find("[name=location_id]").val();SN.C.I.NoticeDataGeo.NDG=$("#"+SN.C.S.NoticeDataGeo).attr("checked");var b=$.cookie(SN.C.S.NoticeDataGeoCookie);if(b!==null&&b!="disabled"){b=JSON.parse(b);SN.C.I.NoticeDataGeo.NLat=a.find("[name=lat]").val(b.NLat).val();SN.C.I.NoticeDataGeo.NLon=a.find("[name=lon]").val(b.NLon).val();if(b.NLNS){SN.C.I.NoticeDataGeo.NLNS=a.find("[name=location_ns]").val(b.NLNS).val();SN.C.I.NoticeDataGeo.NLID=a.find("[name=location_id]").val(b.NLID).val()}else{a.find("[name=location_ns]").val("");a.find("[name=location_id]").val("")}}if(b=="disabled"){SN.C.I.NoticeDataGeo.NDG=$("#"+SN.C.S.NoticeDataGeo).attr("checked",false).attr("checked")}else{SN.C.I.NoticeDataGeo.NDG=$("#"+SN.C.S.NoticeDataGeo).attr("checked",true).attr("checked")}},GetResponseXML:function(b){try{return b.responseXML}catch(a){return(new DOMParser()).parseFromString(b.responseText,"text/xml")}},NoticeReply:function(){if($("#"+SN.C.S.NoticeDataText).length>0&&$("#content .notice_reply").length>0){$("#content .notice").each(function(){SN.U.NoticeReplyTo($(this))})}},NoticeReplyTo:function(a){a.find(".notice_reply").live("click",function(c){c.preventDefault();var b=($(".author .nickname",a).length>0)?$($(".author .nickname",a)[0]):$(".author .nickname.uid");SN.U.NoticeInlineReplyTrigger(a,"@"+b.text());return false})},NoticeInlineReplyTrigger:function(h,i){var c=$($(".notice_id",h)[0]).text();var d=h;var f=h.closest(".notices");if(f.hasClass("threaded-replies")){d=f.closest(".notice")}else{f=$("ul.threaded-replies",h);if(f.length==0){f=$('<ul class="notices threaded-replies xoxo"></ul>');h.append(f)}}var k=$(".notice-reply-form",f);if(k.length==0){$("li.notice-reply-placeholder").remove();var g=$("li.notice-reply",f);if(g.length==0){g=$('<li class="notice-reply"><form class="notice-reply-form" method="post"><textarea name="status_textarea"></textarea><div class="controls"><input type="hidden" name="token"><input type="hidden" name="inreplyto"><input type="submit" class="submit"></div></form></li>');var b=$("#form_notice");k=g.find("form");k.attr("action",b.attr("action"));k.find('input[name="token"]').val(b.find("input[name=token]").val());k.find('input[type="submit"]').val(SN.msg("reply_submit"));f.append(g);k.find("textarea").blur(function(){var m=$(this);var l=$.trim(m.val());if(l==""||l==m.data("initialText")){g.remove();if(f.find("li").length>0){SN.U.NoticeInlineReplyPlaceholder(d)}else{f.remove()}}});k.submit(function(m){var l=k;$.ajax({type:"POST",dataType:"xml",url:SN.U.RewriteAjaxAction(l.attr("action")),data:l.serialize()+"&ajax=1",beforeSend:function(n){l.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled).end().find("textarea").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(o,p,n){alert(n||p)},success:function(p,r){var o=$("li",p)[0];if(o){var n=document._importNode(o,true);var q=$(n).attr("id");if($("#"+q).length==0){g.replaceWith(n);SN.U.NoticeInlineReplyPlaceholder(d)}else{g.remove()}}}});m.preventDefault();return false})}}k.find("input[name=inreplyto]").val(c);var j=k.find("textarea");if(j.length==0){throw"No textarea"}var a="";if(i){a=i+" "}j.val(a+j.val().replace(RegExp(a,"i"),""));j.data("initialText",$.trim(i+""));j.focus();if(j[0].setSelectionRange){var e=j.val().length;j[0].setSelectionRange(e,e)}},NoticeReplySet:function(b,d){if(b.match(SN.C.I.PatternUsername)){var c=$("#"+SN.C.S.NoticeDataText);if(c.length>0){replyto="@"+b+" ";c.val(replyto+c.val().replace(RegExp(replyto,"i"),""));$("#"+SN.C.S.FormNotice+" #"+SN.C.S.NoticeInReplyTo).val(d);c[0].focus();if(c[0].setSelectionRange){var a=c.val().length;c[0].setSelectionRange(a,a)}}}},NoticeFavor:function(){$(".form_favor").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_disfavor").live("click",function(){SN.U.FormXHR($(this));return false})},NoticeInlineReplyPlaceholder:function(b){var a=b.find("ul.threaded-replies");var c=$('<li class="notice-reply-placeholder"><input class="placeholder"></li>');c.click(function(){SN.U.NoticeInlineReplyTrigger(b)});c.find("input").val(SN.msg("reply_placeholder"));a.append(c)},NoticeInlineReplySetup:function(){$(".threaded-replies").each(function(){var b=$(this);var a=b.closest(".notice");SN.U.NoticeInlineReplyPlaceholder(a)})},NoticeRepeat:function(){$(".form_repeat").live("click",function(a){a.preventDefault();SN.U.NoticeRepeatConfirmation($(this));return false})},NoticeRepeatConfirmation:function(a){var c=a.find(".submit");var b=c.clone();b.addClass("submit_dialogbox").removeClass("submit");a.append(b);b.bind("click",function(){SN.U.FormXHR(a);return false});c.hide();a.addClass("dialogbox").append('<button class="close">&#215;</button>').closest(".notice-options").addClass("opaque");a.find("button.close").click(function(){$(this).remove();a.removeClass("dialogbox").closest(".notice-options").removeClass("opaque");a.find(".submit_dialogbox").remove();a.find(".submit").show();return false})},NoticeAttachments:function(){$(".notice a.attachment").each(function(){SN.U.NoticeWithAttachment($(this).closest(".notice"))})},NoticeWithAttachment:function(b){if(b.find(".attachment").length===0){return}var a=b.find(".attachment.more");if(a.length>0){$(a[0]).click(function(){var c=$(this);c.addClass(SN.C.S.Processing);$.get(c.attr("href")+"/ajax",null,function(d){c.parent(".entry-content").html($(d).find("#attachment_view .entry-content").html())});return false}).attr("title",SN.msg("showmore_tooltip"))}},NoticeDataAttach:function(){NDA=$("#"+SN.C.S.NoticeDataAttach);NDA.change(function(c){var a=$(this).val();if(!a){$("#"+SN.C.S.NoticeDataAttachSelected).remove();return false}S='<div id="'+SN.C.S.NoticeDataAttachSelected+'" class="'+SN.C.S.Success+'"><code>'+a+'</code> <button class="close">&#215;</button></div>';NDAS=$("#"+SN.C.S.NoticeDataAttachSelected);if(NDAS.length>0){NDAS.replaceWith(S)}else{$("#"+SN.C.S.FormNotice).append(S)}$("#"+SN.C.S.NoticeDataAttachSelected+" button").click(function(){$("#"+SN.C.S.NoticeDataAttachSelected).remove();NDA.val("");return false});if(typeof this.files=="object"){for(var b=0;b<this.files.length;b++){SN.U.PreviewAttach(this.files[b])}}})},maxFileSize:function(b){var a=$(b).find("input[name=MAX_FILE_SIZE]").attr("value");if(a){return parseInt(a)}else{return 0}},PreviewAttach:function(c){var d=c.type+" "+Math.round(c.size/1024)+"KB";var e=true;var g;if(typeof window.createObjectURL!="undefined"){g=function(h,i){i(window.createObjectURL(h))}}else{if(typeof window.FileReader!="undefined"){g=function(i,j){var h=new FileReader();h.onload=function(k){j(h.result)};h.readAsDataURL(i)}}else{e=false}}var a=["image/png","image/jpeg","image/gif","image/svg+xml"];if($.inArray(c.type,a)==-1){e=false}var f=8*1024*1024;if(c.size>f){e=false}if(e){g(c,function(i){var h=$("<img>").attr("title",d).attr("alt",d).attr("src",i).attr("style","height: 120px");$("#"+SN.C.S.NoticeDataAttachSelected).append(h)})}else{var b=$("<div></div>").text(d);$("#"+SN.C.S.NoticeDataAttachSelected).append(b)}},NoticeLocationAttach:function(){var c=$("#"+SN.C.S.NoticeLat).val();var h=$("#"+SN.C.S.NoticeLon).val();var d=$("#"+SN.C.S.NoticeLocationNs).val();var i=$("#"+SN.C.S.NoticeLocationId).val();var a=$("#"+SN.C.S.NoticeGeoName).text();var b=$("#"+SN.C.S.NoticeDataGeo);function e(k){$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",jQuery.trim($("label[for="+SN.C.S.NoticeDataGeo+"]").text())).removeClass("checked");$("#"+SN.C.S.NoticeLat).val("");$("#"+SN.C.S.NoticeLon).val("");$("#"+SN.C.S.NoticeLocationNs).val("");$("#"+SN.C.S.NoticeLocationId).val("");$("#"+SN.C.S.NoticeDataGeo).attr("checked",false);$.cookie(SN.C.S.NoticeDataGeoCookie,"disabled",{path:"/"});if(k){$(".geo_status_wrapper").removeClass("success").addClass("error");$(".geo_status_wrapper .geo_status").text(k)}else{$(".geo_status_wrapper").remove()}}function j(k,l){SN.U.NoticeGeoStatus("Looking up place name...");$.getJSON(k,l,function(m){var n,o;if(typeof(m.location_ns)!="undefined"){$("#"+SN.C.S.NoticeLocationNs).val(m.location_ns);n=m.location_ns}if(typeof(m.location_id)!="undefined"){$("#"+SN.C.S.NoticeLocationId).val(m.location_id);o=m.location_id}if(typeof(m.name)=="undefined"){NLN_text=l.lat+";"+l.lon}else{NLN_text=m.name}SN.U.NoticeGeoStatus(NLN_text,l.lat,l.lon,m.url);$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",NoticeDataGeo_text.ShareDisable+" ("+NLN_text+")");$("#"+SN.C.S.NoticeLat).val(l.lat);$("#"+SN.C.S.NoticeLon).val(l.lon);$("#"+SN.C.S.NoticeLocationNs).val(n);$("#"+SN.C.S.NoticeLocationId).val(o);$("#"+SN.C.S.NoticeDataGeo).attr("checked",true);var p={NLat:l.lat,NLon:l.lon,NLNS:n,NLID:o,NLN:NLN_text,NLNU:m.url,NDG:true};$.cookie(SN.C.S.NoticeDataGeoCookie,JSON.stringify(p),{path:"/"})})}if(b.length>0){if($.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){b.attr("checked",false)}else{b.attr("checked",true)}var f=$("#notice_data-geo_wrap");var g=f.attr("title");f.removeAttr("title");$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",jQuery.trim($("label[for="+SN.C.S.NoticeDataGeo+"]").text()));b.change(function(){if($("#"+SN.C.S.NoticeDataGeo).attr("checked")===true||$.cookie(SN.C.S.NoticeDataGeoCookie)===null){$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",NoticeDataGeo_text.ShareDisable).addClass("checked");if($.cookie(SN.C.S.NoticeDataGeoCookie)===null||$.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){if(navigator.geolocation){SN.U.NoticeGeoStatus("Requesting location from browser...");navigator.geolocation.getCurrentPosition(function(m){$("#"+SN.C.S.NoticeLat).val(m.coords.latitude);$("#"+SN.C.S.NoticeLon).val(m.coords.longitude);var n={lat:m.coords.latitude,lon:m.coords.longitude,token:$("#token").val()};j(g,n)},function(m){switch(m.code){case m.PERMISSION_DENIED:e("Location permission denied.");break;case m.TIMEOUT:e("Location lookup timeout.");break}},{timeout:10000})}else{if(c.length>0&&h.length>0){var k={lat:c,lon:h,token:$("#token").val()};j(g,k)}else{e();$("#"+SN.C.S.NoticeDataGeo).remove();$("label[for="+SN.C.S.NoticeDataGeo+"]").remove()}}}else{var l=JSON.parse($.cookie(SN.C.S.NoticeDataGeoCookie));$("#"+SN.C.S.NoticeLat).val(l.NLat);$("#"+SN.C.S.NoticeLon).val(l.NLon);$("#"+SN.C.S.NoticeLocationNs).val(l.NLNS);$("#"+SN.C.S.NoticeLocationId).val(l.NLID);$("#"+SN.C.S.NoticeDataGeo).attr("checked",l.NDG);SN.U.NoticeGeoStatus(l.NLN,l.NLat,l.NLon,l.NLNU);$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",NoticeDataGeo_text.ShareDisable+" ("+l.NLN+")").addClass("checked")}}else{e()}}).change()}},NoticeGeoStatus:function(a,f,g,c){var e=$("#form_notice");var h=e.find(".geo_status_wrapper");if(h.length==0){h=$('<div class="'+SN.C.S.Success+' geo_status_wrapper"><button class="close" style="float:right">&#215;</button><div class="geo_status"></div></div>');h.find("button.close").click(function(){$("#"+SN.C.S.NoticeDataGeo).removeAttr("checked").change()});e.append(h)}var b;if(c){b=$("<a></a>").attr("href",c)}else{b=$("<span></span>")}b.text(a);if(f||g){var d=f+";"+g;b.attr("title",d);if(!a){b.text(d)}}h.find(".geo_status").empty().append(b)},NewDirectMessage:function(){NDM=$(".entity_send-a-message a");NDM.attr({href:NDM.attr("href")+"&ajax=1"});NDM.bind("click",function(){var a=$(".entity_send-a-message form");if(a.length===0){$(this).addClass(SN.C.S.Processing);$.get(NDM.attr("href"),null,function(b){$(".entity_send-a-message").append(document._importNode($("form",b)[0],true));a=$(".entity_send-a-message .form_notice");SN.U.FormNoticeXHR(a);SN.U.FormNoticeEnhancements(a);a.append('<button class="close">&#215;</button>');$(".entity_send-a-message button").click(function(){a.hide();return false});NDM.removeClass(SN.C.S.Processing)})}else{a.show();$(".entity_send-a-message textarea").focus()}return false})},GetFullYear:function(c,d,a){var b=new Date();b.setFullYear(c,d,a);return b},StatusNetInstance:{Set:function(b){var a=SN.U.StatusNetInstance.Get();if(a!==null){b=$.extend(a,b)}$.cookie(SN.C.S.StatusNetInstance,JSON.stringify(b),{path:"/",expires:SN.U.GetFullYear(2029,0,1)})},Get:function(){var a=$.cookie(SN.C.S.StatusNetInstance);if(a!==null){return JSON.parse(a)}return null},Delete:function(){$.cookie(SN.C.S.StatusNetInstance,null)}},belongsOnTimeline:function(b){var a=$("body").attr("id");if(a=="public"){return true}var c=$("#nav_profile a").attr("href");if(c){var d=$(b).find(".entry-title .author a.url").attr("href");if(d==c){if(a=="all"||a=="showstream"){return true}}}return false}},Init:{NoticeForm:function(){if($("body.user_in").length>0){SN.U.NoticeLocationAttach();$("."+SN.C.S.FormNotice).each(function(){SN.U.FormNoticeXHR($(this));SN.U.FormNoticeEnhancements($(this))});SN.U.NoticeDataAttach()}},Notices:function(){if($("body.user_in").length>0){SN.U.NoticeFavor();SN.U.NoticeRepeat();SN.U.NoticeReply();SN.U.NoticeInlineReplySetup()}SN.U.NoticeAttachments()},EntityActions:function(){if($("body.user_in").length>0){$(".form_user_subscribe").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_user_unsubscribe").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_group_join").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_group_leave").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_user_nudge").live("click",function(){SN.U.FormXHR($(this));return false});SN.U.NewDirectMessage()}},Login:function(){if(SN.U.StatusNetInstance.Get()!==null){var a=SN.U.StatusNetInstance.Get().Nickname;if(a!==null){$("#form_login #nickname").val(a)}}$("#form_login").bind("submit",function(){SN.U.StatusNetInstance.Set({Nickname:$("#form_login #nickname").val()});return true})},UploadForms:function(){$("input[type=file]").change(function(d){if(typeof this.files=="object"&&this.files.length>0){var c=0;for(var b=0;b<this.files.length;b++){c+=this.files[b].size}var a=SN.U.maxFileSize($(this.form));if(a>0&&c>a){var e="File too large: maximum upload size is %d bytes.";alert(e.replace("%d",a));$(this).val("");d.preventDefault();return false}}})}}};$(document).ready(function(){SN.Init.UploadForms();if($("."+SN.C.S.FormNotice).length>0){SN.Init.NoticeForm()}if($("#content .notices").length>0){SN.Init.Notices()}if($("#content .entity_actions").length>0){SN.Init.EntityActions()}if($("#form_login").length>0){SN.Init.Login()}});if(!document.ELEMENT_NODE){document.ELEMENT_NODE=1;document.ATTRIBUTE_NODE=2;document.TEXT_NODE=3;document.CDATA_SECTION_NODE=4;document.ENTITY_REFERENCE_NODE=5;document.ENTITY_NODE=6;document.PROCESSING_INSTRUCTION_NODE=7;document.COMMENT_NODE=8;document.DOCUMENT_NODE=9;document.DOCUMENT_TYPE_NODE=10;document.DOCUMENT_FRAGMENT_NODE=11;document.NOTATION_NODE=12}document._importNode=function(e,a){switch(e.nodeType){case document.ELEMENT_NODE:var d=document.createElement(e.nodeName);if(e.attributes&&e.attributes.length>0){for(var c=0,b=e.attributes.length;c<b;){if(e.attributes[c].nodeName=="class"){d.className=e.getAttribute(e.attributes[c++].nodeName)}else{d.setAttribute(e.attributes[c].nodeName,e.getAttribute(e.attributes[c++].nodeName))}}}if(a&&e.childNodes&&e.childNodes.length>0){for(var c=0,b=e.childNodes.length;c<b;){d.appendChild(document._importNode(e.childNodes[c++],a))}}return d;break;case document.TEXT_NODE:case document.CDATA_SECTION_NODE:case document.COMMENT_NODE:return document.createTextNode(e.nodeValue);break}};if(typeof navigator.geolocation=="undefined"||navigator.geolocation.shim){(function(){(function(){if(window.google&&google.gears){return}var c=null;if(typeof GearsFactory!="undefined"){c=new GearsFactory()}else{try{c=new ActiveXObject("Gears.Factory");if(c.getBuildInfo().indexOf("ie_mobile")!=-1){c.privateSetGlobalObject(this)}}catch(d){if((typeof navigator.mimeTypes!="undefined")&&navigator.mimeTypes["application/x-googlegears"]){c=document.createElement("object");c.style.display="none";c.width=0;c.height=0;c.type="application/x-googlegears";document.documentElement.appendChild(c)}}}if(!c){return}if(!window.google){google={}}if(!google.gears){google.gears={factory:c}}})();var a=(function(){var d=google.gears.factory.create("beta.geolocation");var c=function(f,e){return function(g){f(g);e.lastPosition=g}};return{shim:true,type:"Gears",lastPosition:null,getCurrentPosition:function(e,g,h){var f=this;var i=c(e,f);d.getCurrentPosition(i,g,h)},watchPosition:function(e,f,g){d.watchPosition(e,f,g)},clearWatch:function(e){d.clearWatch(e)},getPermission:function(g,e,f){d.getPermission(g,e,f)}}});var b=(function(){var i=false;var e=function(){if(!d()&&!i){i=true;var j=document.createElement("script");j.src=(document.location.protocol=="https:"?"https://":"http://")+"www.google.com/jsapi?callback=_google_loader_apiLoaded";j.type="text/javascript";document.getElementsByTagName("body")[0].appendChild(j)}};var c=[];var h=function(j){c.push(j)};var f=function(){if(d()){while(c.length>0){var j=c.pop();j()}}};window._google_loader_apiLoaded=function(){f()};var d=function(){return(window.google&&google.loader)};var g=function(j){if(d()){return true}h(j);e();return false};e();return{shim:true,type:"ClientLocation",lastPosition:null,getCurrentPosition:function(k,n,o){var m=this;if(!g(function(){m.getCurrentPosition(k,n,o)})){return}if(google.loader.ClientLocation){var l=google.loader.ClientLocation;var j={coords:{latitude:l.latitude,longitude:l.longitude,altitude:null,accuracy:43000,altitudeAccuracy:null,heading:null,speed:null},address:{city:l.address.city,country:l.address.country,country_code:l.address.country_code,region:l.address.region},timestamp:new Date()};k(j);this.lastPosition=j}else{if(n==="function"){n({code:3,message:"Using the Google ClientLocation API and it is not able to calculate a location."})}}},watchPosition:function(j,l,m){this.getCurrentPosition(j,l,m);var k=this;var n=setInterval(function(){k.getCurrentPosition(j,l,m)},10000);return n},clearWatch:function(j){clearInterval(j)},getPermission:function(l,j,k){return true}}});navigator.geolocation=(window.google&&google.gears)?a():b()})()};
\ No newline at end of file
+var SN={C:{I:{CounterBlackout:false,MaxLength:140,PatternUsername:/^[0-9a-zA-Z\-_.]*$/,HTTP20x30x:[200,201,202,203,204,205,206,300,301,302,303,304,305,306,307]},S:{Disabled:"disabled",Warning:"warning",Error:"error",Success:"success",Processing:"processing",CommandResult:"command_result",FormNotice:"form_notice",NoticeDataText:"notice_data-text",NoticeTextCount:"notice_text-count",NoticeInReplyTo:"notice_in-reply-to",NoticeDataAttach:"notice_data-attach",NoticeDataAttachSelected:"notice_data-attach_selected",NoticeActionSubmit:"notice_action-submit",NoticeLat:"notice_data-lat",NoticeLon:"notice_data-lon",NoticeLocationId:"notice_data-location_id",NoticeLocationNs:"notice_data-location_ns",NoticeGeoName:"notice_data-geo_name",NoticeDataGeo:"notice_data-geo",NoticeDataGeoCookie:"NoticeDataGeo",NoticeDataGeoSelected:"notice_data-geo_selected",StatusNetInstance:"StatusNetInstance"}},messages:{},msg:function(a){if(typeof SN.messages[a]=="undefined"){return"["+a+"]"}else{return SN.messages[a]}},U:{FormNoticeEnhancements:function(b){if(jQuery.data(b[0],"ElementData")===undefined){MaxLength=b.find("#"+SN.C.S.NoticeTextCount).text();if(typeof(MaxLength)=="undefined"){MaxLength=SN.C.I.MaxLength}jQuery.data(b[0],"ElementData",{MaxLength:MaxLength});SN.U.Counter(b);NDT=b.find("#"+SN.C.S.NoticeDataText);NDT.bind("keyup",function(c){SN.U.Counter(b)});var a=function(c){window.setTimeout(function(){SN.U.Counter(b)},50)};NDT.bind("cut",a).bind("paste",a)}else{b.find("#"+SN.C.S.NoticeTextCount).text(jQuery.data(b[0],"ElementData").MaxLength)}if($("body")[0].id!="conversation"&&window.location.hash.length===0&&$(window).scrollTop()==0){b.find("textarea").focus()}},Counter:function(d){SN.C.I.FormNoticeCurrent=d;var b=jQuery.data(d[0],"ElementData").MaxLength;if(b<=0){return}var c=b-SN.U.CharacterCount(d);var a=d.find("#"+SN.C.S.NoticeTextCount);if(c.toString()!=a.text()){if(!SN.C.I.CounterBlackout||c===0){if(a.text()!=String(c)){a.text(c)}if(c<0){d.addClass(SN.C.S.Warning)}else{d.removeClass(SN.C.S.Warning)}if(!SN.C.I.CounterBlackout){SN.C.I.CounterBlackout=true;SN.C.I.FormNoticeCurrent=d;window.setTimeout("SN.U.ClearCounterBlackout(SN.C.I.FormNoticeCurrent);",500)}}}},CharacterCount:function(a){return a.find("#"+SN.C.S.NoticeDataText).val().length},ClearCounterBlackout:function(a){SN.C.I.CounterBlackout=false;SN.U.Counter(a)},RewriteAjaxAction:function(a){if(document.location.protocol=="https:"&&a.substr(0,5)=="http:"){return a.replace(/^http:\/\/[^:\/]+/,"https://"+document.location.host)}else{return a}},FormXHR:function(a){$.ajax({type:"POST",dataType:"xml",url:SN.U.RewriteAjaxAction(a.attr("action")),data:a.serialize()+"&ajax=1",beforeSend:function(b){a.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(c,d,b){alert(b||d)},success:function(b,c){if(typeof($("form",b)[0])!="undefined"){form_new=document._importNode($("form",b)[0],true);a.replaceWith(form_new)}else{a.replaceWith(document._importNode($("p",b)[0],true))}}})},FormNoticeXHR:function(b){SN.C.I.NoticeDataGeo={};b.append('<input type="hidden" name="ajax" value="1"/>');b.attr("action",SN.U.RewriteAjaxAction(b.attr("action")));var c=function(d,e){b.append($('<p class="form_response"></p>').addClass(d).text(e))};var a=function(){b.find(".form_response").remove()};b.ajaxForm({dataType:"xml",timeout:"60000",beforeSend:function(d){if(b.find("#"+SN.C.S.NoticeDataText)[0].value.length===0){b.addClass(SN.C.S.Warning);return false}b.addClass(SN.C.S.Processing).find("#"+SN.C.S.NoticeActionSubmit).addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled);SN.U.normalizeGeoData(b);return true},error:function(f,g,e){b.removeClass(SN.C.S.Processing).find("#"+SN.C.S.NoticeActionSubmit).removeClass(SN.C.S.Disabled).removeAttr(SN.C.S.Disabled,SN.C.S.Disabled);a();if(g=="timeout"){c("error","Sorry! We had trouble sending your notice. The servers are overloaded. Please try again, and contact the site administrator if this problem persists.")}else{var d=SN.U.GetResponseXML(f);if($("."+SN.C.S.Error,d).length>0){b.append(document._importNode($("."+SN.C.S.Error,d)[0],true))}else{if(parseInt(f.status)===0||jQuery.inArray(parseInt(f.status),SN.C.I.HTTP20x30x)>=0){b.resetForm().find("#"+SN.C.S.NoticeDataAttachSelected).remove();SN.U.FormNoticeEnhancements(b)}else{c("error","(Sorry! We had trouble sending your notice ("+f.status+" "+f.statusText+"). Please report the problem to the site administrator if this happens again.")}}}},success:function(i,k){a();var e=$("#"+SN.C.S.Error,i);if(e.length>0){c("error",e.text())}else{if($("body")[0].id=="bookmarklet"){self.close()}var d=$("#"+SN.C.S.CommandResult,i);if(d.length>0){c("success",d.text())}else{var h=document._importNode($("li",i)[0],true);var j=$("#notices_primary .notices:first");if(j.length>0&&SN.U.belongsOnTimeline(h)){if($("#"+h.id).length===0){var f=$("#"+SN.C.S.NoticeInReplyTo).val();var g="#notices_primary #notice-"+f;if($("body")[0].id=="conversation"){if(f.length>0&&$(g+" .notices").length<1){$(g).append('<ul class="notices"></ul>')}$($(g+" .notices")[0]).append(h)}else{j.prepend(h)}$("#"+h.id).css({display:"none"}).fadeIn(2500);SN.U.NoticeWithAttachment($("#"+h.id));SN.U.NoticeReplyTo($("#"+h.id))}}else{c("success",$("title",i).text())}}b.resetForm();b.find("#"+SN.C.S.NoticeInReplyTo).val("");b.find("#"+SN.C.S.NoticeDataAttachSelected).remove();SN.U.FormNoticeEnhancements(b)}},complete:function(d,e){b.removeClass(SN.C.S.Processing).find("#"+SN.C.S.NoticeActionSubmit).removeAttr(SN.C.S.Disabled).removeClass(SN.C.S.Disabled);$("#"+SN.C.S.NoticeLat).val(SN.C.I.NoticeDataGeo.NLat);$("#"+SN.C.S.NoticeLon).val(SN.C.I.NoticeDataGeo.NLon);if($("#"+SN.C.S.NoticeLocationNs)){$("#"+SN.C.S.NoticeLocationNs).val(SN.C.I.NoticeDataGeo.NLNS);$("#"+SN.C.S.NoticeLocationId).val(SN.C.I.NoticeDataGeo.NLID)}$("#"+SN.C.S.NoticeDataGeo).attr("checked",SN.C.I.NoticeDataGeo.NDG)}})},normalizeGeoData:function(a){SN.C.I.NoticeDataGeo.NLat=a.find("[name=lat]").val();SN.C.I.NoticeDataGeo.NLon=a.find("[name=lon]").val();SN.C.I.NoticeDataGeo.NLNS=a.find("[name=location_ns]").val();SN.C.I.NoticeDataGeo.NLID=a.find("[name=location_id]").val();SN.C.I.NoticeDataGeo.NDG=$("#"+SN.C.S.NoticeDataGeo).attr("checked");var b=$.cookie(SN.C.S.NoticeDataGeoCookie);if(b!==null&&b!="disabled"){b=JSON.parse(b);SN.C.I.NoticeDataGeo.NLat=a.find("[name=lat]").val(b.NLat).val();SN.C.I.NoticeDataGeo.NLon=a.find("[name=lon]").val(b.NLon).val();if(b.NLNS){SN.C.I.NoticeDataGeo.NLNS=a.find("[name=location_ns]").val(b.NLNS).val();SN.C.I.NoticeDataGeo.NLID=a.find("[name=location_id]").val(b.NLID).val()}else{a.find("[name=location_ns]").val("");a.find("[name=location_id]").val("")}}if(b=="disabled"){SN.C.I.NoticeDataGeo.NDG=$("#"+SN.C.S.NoticeDataGeo).attr("checked",false).attr("checked")}else{SN.C.I.NoticeDataGeo.NDG=$("#"+SN.C.S.NoticeDataGeo).attr("checked",true).attr("checked")}},GetResponseXML:function(b){try{return b.responseXML}catch(a){return(new DOMParser()).parseFromString(b.responseText,"text/xml")}},NoticeReply:function(){if($("#"+SN.C.S.NoticeDataText).length>0&&$("#content .notice_reply").length>0){$("#content .notice").each(function(){SN.U.NoticeReplyTo($(this))})}},NoticeReplyTo:function(a){a.find(".notice_reply").live("click",function(c){c.preventDefault();var b=($(".author .nickname",a).length>0)?$($(".author .nickname",a)[0]):$(".author .nickname.uid");SN.U.NoticeInlineReplyTrigger(a,"@"+b.text());return false})},NoticeInlineReplyTrigger:function(h,i){var c=$($(".notice_id",h)[0]).text();var d=h;var f=h.closest(".notices");if(f.hasClass("threaded-replies")){d=f.closest(".notice")}else{f=$("ul.threaded-replies",h);if(f.length==0){f=$('<ul class="notices threaded-replies xoxo"></ul>');h.append(f)}}var k=$(".notice-reply-form",f);if(k.length==0){$("li.notice-reply-placeholder").remove();var g=$("li.notice-reply",f);if(g.length==0){g=$('<li class="notice-reply"><form class="notice-reply-form" method="post"><textarea name="status_textarea"></textarea><div class="controls"><input type="hidden" name="token"><input type="hidden" name="inreplyto"><input type="submit" class="submit"></div></form></li>');var b=$("#form_notice");k=g.find("form");k.attr("action",b.attr("action"));k.find('input[name="token"]').val(b.find("input[name=token]").val());k.find('input[type="submit"]').val(SN.msg("reply_submit"));f.append(g);k.find("textarea").blur(function(){var m=$(this);var l=$.trim(m.val());if(l==""||l==m.data("initialText")){g.remove();if(f.find("li").length>0){SN.U.NoticeInlineReplyPlaceholder(d)}else{f.remove()}}});k.submit(function(m){var l=k;$.ajax({type:"POST",dataType:"xml",url:SN.U.RewriteAjaxAction(l.attr("action")),data:l.serialize()+"&ajax=1",beforeSend:function(n){l.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled).end().find("textarea").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(o,p,n){alert(n||p)},success:function(p,r){var o=$("li",p)[0];if(o){var n=document._importNode(o,true);var q=$(n).attr("id");if($("#"+q).length==0){g.replaceWith(n);SN.U.NoticeInlineReplyPlaceholder(d)}else{g.remove()}}}});m.preventDefault();return false})}}k.find("input[name=inreplyto]").val(c);var j=k.find("textarea");if(j.length==0){throw"No textarea"}var a="";if(i){a=i+" "}j.val(a+j.val().replace(RegExp(a,"i"),""));j.data("initialText",$.trim(i+""));j.focus();if(j[0].setSelectionRange){var e=j.val().length;j[0].setSelectionRange(e,e)}},NoticeReplySet:function(b,d){if(b.match(SN.C.I.PatternUsername)){var c=$("#"+SN.C.S.NoticeDataText);if(c.length>0){replyto="@"+b+" ";c.val(replyto+c.val().replace(RegExp(replyto,"i"),""));$("#"+SN.C.S.FormNotice+" #"+SN.C.S.NoticeInReplyTo).val(d);c[0].focus();if(c[0].setSelectionRange){var a=c.val().length;c[0].setSelectionRange(a,a)}}}},NoticeFavor:function(){$(".form_favor").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_disfavor").live("click",function(){SN.U.FormXHR($(this));return false})},NoticeInlineReplyPlaceholder:function(b){var a=b.find("ul.threaded-replies");var c=$('<li class="notice-reply-placeholder"><input class="placeholder"></li>');c.click(function(){SN.U.NoticeInlineReplyTrigger(b)});c.find("input").val(SN.msg("reply_placeholder"));a.append(c)},NoticeInlineReplySetup:function(){$(".threaded-replies").each(function(){var b=$(this);var a=b.closest(".notice");SN.U.NoticeInlineReplyPlaceholder(a)})},NoticeRepeat:function(){$(".form_repeat").live("click",function(a){a.preventDefault();SN.U.NoticeRepeatConfirmation($(this));return false})},NoticeRepeatConfirmation:function(a){var c=a.find(".submit");var b=c.clone();b.addClass("submit_dialogbox").removeClass("submit");a.append(b);b.bind("click",function(){SN.U.FormXHR(a);return false});c.hide();a.addClass("dialogbox").append('<button class="close">&#215;</button>').closest(".notice-options").addClass("opaque");a.find("button.close").click(function(){$(this).remove();a.removeClass("dialogbox").closest(".notice-options").removeClass("opaque");a.find(".submit_dialogbox").remove();a.find(".submit").show();return false})},NoticeAttachments:function(){$(".notice a.attachment").each(function(){SN.U.NoticeWithAttachment($(this).closest(".notice"))})},NoticeWithAttachment:function(b){if(b.find(".attachment").length===0){return}var a=b.find(".attachment.more");if(a.length>0){$(a[0]).click(function(){var c=$(this);c.addClass(SN.C.S.Processing);$.get(c.attr("href")+"/ajax",null,function(d){c.parent(".entry-content").html($(d).find("#attachment_view .entry-content").html())});return false}).attr("title",SN.msg("showmore_tooltip"))}},NoticeDataAttach:function(){NDA=$("#"+SN.C.S.NoticeDataAttach);NDA.change(function(c){var a=$(this).val();if(!a){$("#"+SN.C.S.NoticeDataAttachSelected).remove();return false}S='<div id="'+SN.C.S.NoticeDataAttachSelected+'" class="'+SN.C.S.Success+'"><code>'+a+'</code> <button class="close">&#215;</button></div>';NDAS=$("#"+SN.C.S.NoticeDataAttachSelected);if(NDAS.length>0){NDAS.replaceWith(S)}else{$("#"+SN.C.S.FormNotice).append(S)}$("#"+SN.C.S.NoticeDataAttachSelected+" button").click(function(){$("#"+SN.C.S.NoticeDataAttachSelected).remove();NDA.val("");return false});if(typeof this.files=="object"){for(var b=0;b<this.files.length;b++){SN.U.PreviewAttach(this.files[b])}}})},maxFileSize:function(b){var a=$(b).find("input[name=MAX_FILE_SIZE]").attr("value");if(a){return parseInt(a)}else{return 0}},PreviewAttach:function(c){var d=c.type+" "+Math.round(c.size/1024)+"KB";var e=true;var g;if(typeof window.createObjectURL!="undefined"){g=function(h,i){i(window.createObjectURL(h))}}else{if(typeof window.FileReader!="undefined"){g=function(i,j){var h=new FileReader();h.onload=function(k){j(h.result)};h.readAsDataURL(i)}}else{e=false}}var a=["image/png","image/jpeg","image/gif","image/svg+xml"];if($.inArray(c.type,a)==-1){e=false}var f=8*1024*1024;if(c.size>f){e=false}if(e){g(c,function(i){var h=$("<img>").attr("title",d).attr("alt",d).attr("src",i).attr("style","height: 120px");$("#"+SN.C.S.NoticeDataAttachSelected).append(h)})}else{var b=$("<div></div>").text(d);$("#"+SN.C.S.NoticeDataAttachSelected).append(b)}},NoticeLocationAttach:function(){var c=$("#"+SN.C.S.NoticeLat).val();var h=$("#"+SN.C.S.NoticeLon).val();var d=$("#"+SN.C.S.NoticeLocationNs).val();var i=$("#"+SN.C.S.NoticeLocationId).val();var a=$("#"+SN.C.S.NoticeGeoName).text();var b=$("#"+SN.C.S.NoticeDataGeo);function e(k){$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",jQuery.trim($("label[for="+SN.C.S.NoticeDataGeo+"]").text())).removeClass("checked");$("#"+SN.C.S.NoticeLat).val("");$("#"+SN.C.S.NoticeLon).val("");$("#"+SN.C.S.NoticeLocationNs).val("");$("#"+SN.C.S.NoticeLocationId).val("");$("#"+SN.C.S.NoticeDataGeo).attr("checked",false);$.cookie(SN.C.S.NoticeDataGeoCookie,"disabled",{path:"/"});if(k){$(".geo_status_wrapper").removeClass("success").addClass("error");$(".geo_status_wrapper .geo_status").text(k)}else{$(".geo_status_wrapper").remove()}}function j(k,l){SN.U.NoticeGeoStatus("Looking up place name...");$.getJSON(k,l,function(m){var n,o;if(typeof(m.location_ns)!="undefined"){$("#"+SN.C.S.NoticeLocationNs).val(m.location_ns);n=m.location_ns}if(typeof(m.location_id)!="undefined"){$("#"+SN.C.S.NoticeLocationId).val(m.location_id);o=m.location_id}if(typeof(m.name)=="undefined"){NLN_text=l.lat+";"+l.lon}else{NLN_text=m.name}SN.U.NoticeGeoStatus(NLN_text,l.lat,l.lon,m.url);$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",NoticeDataGeo_text.ShareDisable+" ("+NLN_text+")");$("#"+SN.C.S.NoticeLat).val(l.lat);$("#"+SN.C.S.NoticeLon).val(l.lon);$("#"+SN.C.S.NoticeLocationNs).val(n);$("#"+SN.C.S.NoticeLocationId).val(o);$("#"+SN.C.S.NoticeDataGeo).attr("checked",true);var p={NLat:l.lat,NLon:l.lon,NLNS:n,NLID:o,NLN:NLN_text,NLNU:m.url,NDG:true};$.cookie(SN.C.S.NoticeDataGeoCookie,JSON.stringify(p),{path:"/"})})}if(b.length>0){if($.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){b.attr("checked",false)}else{b.attr("checked",true)}var f=$("#notice_data-geo_wrap");var g=f.attr("title");f.removeAttr("title");$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",jQuery.trim($("label[for="+SN.C.S.NoticeDataGeo+"]").text()));b.change(function(){if($("#"+SN.C.S.NoticeDataGeo).attr("checked")===true||$.cookie(SN.C.S.NoticeDataGeoCookie)===null){$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",NoticeDataGeo_text.ShareDisable).addClass("checked");if($.cookie(SN.C.S.NoticeDataGeoCookie)===null||$.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){if(navigator.geolocation){SN.U.NoticeGeoStatus("Requesting location from browser...");navigator.geolocation.getCurrentPosition(function(m){$("#"+SN.C.S.NoticeLat).val(m.coords.latitude);$("#"+SN.C.S.NoticeLon).val(m.coords.longitude);var n={lat:m.coords.latitude,lon:m.coords.longitude,token:$("#token").val()};j(g,n)},function(m){switch(m.code){case m.PERMISSION_DENIED:e("Location permission denied.");break;case m.TIMEOUT:e("Location lookup timeout.");break}},{timeout:10000})}else{if(c.length>0&&h.length>0){var k={lat:c,lon:h,token:$("#token").val()};j(g,k)}else{e();$("#"+SN.C.S.NoticeDataGeo).remove();$("label[for="+SN.C.S.NoticeDataGeo+"]").remove()}}}else{var l=JSON.parse($.cookie(SN.C.S.NoticeDataGeoCookie));$("#"+SN.C.S.NoticeLat).val(l.NLat);$("#"+SN.C.S.NoticeLon).val(l.NLon);$("#"+SN.C.S.NoticeLocationNs).val(l.NLNS);$("#"+SN.C.S.NoticeLocationId).val(l.NLID);$("#"+SN.C.S.NoticeDataGeo).attr("checked",l.NDG);SN.U.NoticeGeoStatus(l.NLN,l.NLat,l.NLon,l.NLNU);$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",NoticeDataGeo_text.ShareDisable+" ("+l.NLN+")").addClass("checked")}}else{e()}}).change()}},NoticeGeoStatus:function(a,f,g,c){var e=$("#form_notice");var h=e.find(".geo_status_wrapper");if(h.length==0){h=$('<div class="'+SN.C.S.Success+' geo_status_wrapper"><button class="close" style="float:right">&#215;</button><div class="geo_status"></div></div>');h.find("button.close").click(function(){$("#"+SN.C.S.NoticeDataGeo).removeAttr("checked").change()});e.append(h)}var b;if(c){b=$("<a></a>").attr("href",c)}else{b=$("<span></span>")}b.text(a);if(f||g){var d=f+";"+g;b.attr("title",d);if(!a){b.text(d)}}h.find(".geo_status").empty().append(b)},NewDirectMessage:function(){NDM=$(".entity_send-a-message a");NDM.attr({href:NDM.attr("href")+"&ajax=1"});NDM.bind("click",function(){var a=$(".entity_send-a-message form");if(a.length===0){$(this).addClass(SN.C.S.Processing);$.get(NDM.attr("href"),null,function(b){$(".entity_send-a-message").append(document._importNode($("form",b)[0],true));a=$(".entity_send-a-message .form_notice");SN.U.FormNoticeXHR(a);SN.U.FormNoticeEnhancements(a);a.append('<button class="close">&#215;</button>');$(".entity_send-a-message button").click(function(){a.hide();return false});NDM.removeClass(SN.C.S.Processing)})}else{a.show();$(".entity_send-a-message textarea").focus()}return false})},GetFullYear:function(c,d,a){var b=new Date();b.setFullYear(c,d,a);return b},StatusNetInstance:{Set:function(b){var a=SN.U.StatusNetInstance.Get();if(a!==null){b=$.extend(a,b)}$.cookie(SN.C.S.StatusNetInstance,JSON.stringify(b),{path:"/",expires:SN.U.GetFullYear(2029,0,1)})},Get:function(){var a=$.cookie(SN.C.S.StatusNetInstance);if(a!==null){return JSON.parse(a)}return null},Delete:function(){$.cookie(SN.C.S.StatusNetInstance,null)}},belongsOnTimeline:function(b){var a=$("body").attr("id");if(a=="public"){return true}var c=$("#nav_profile a").attr("href");if(c){var d=$(b).find(".entry-title .author a.url").attr("href");if(d==c){if(a=="all"||a=="showstream"){return true}}}return false}},Init:{NoticeForm:function(){if($("body.user_in").length>0){SN.U.NoticeLocationAttach();$("."+SN.C.S.FormNotice).each(function(){SN.U.FormNoticeXHR($(this));SN.U.FormNoticeEnhancements($(this))});SN.U.NoticeDataAttach()}},Notices:function(){if($("body.user_in").length>0){SN.U.NoticeFavor();SN.U.NoticeRepeat();SN.U.NoticeReply();SN.U.NoticeInlineReplySetup()}SN.U.NoticeAttachments()},EntityActions:function(){if($("body.user_in").length>0){$(".form_user_subscribe").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_user_unsubscribe").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_group_join").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_group_leave").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_user_nudge").live("click",function(){SN.U.FormXHR($(this));return false});SN.U.NewDirectMessage()}},Login:function(){if(SN.U.StatusNetInstance.Get()!==null){var a=SN.U.StatusNetInstance.Get().Nickname;if(a!==null){$("#form_login #nickname").val(a)}}$("#form_login").bind("submit",function(){SN.U.StatusNetInstance.Set({Nickname:$("#form_login #nickname").val()});return true})},UploadForms:function(){$("input[type=file]").change(function(d){if(typeof this.files=="object"&&this.files.length>0){var c=0;for(var b=0;b<this.files.length;b++){c+=this.files[b].size}var a=SN.U.maxFileSize($(this.form));if(a>0&&c>a){var e="File too large: maximum upload size is %d bytes.";alert(e.replace("%d",a));$(this).val("");d.preventDefault();return false}}})}}};$(document).ready(function(){SN.Init.UploadForms();if($("."+SN.C.S.FormNotice).length>0){SN.Init.NoticeForm()}if($("#content .notices").length>0){SN.Init.Notices()}if($("#content .entity_actions").length>0){SN.Init.EntityActions()}if($("#form_login").length>0){SN.Init.Login()}});if(!document.ELEMENT_NODE){document.ELEMENT_NODE=1;document.ATTRIBUTE_NODE=2;document.TEXT_NODE=3;document.CDATA_SECTION_NODE=4;document.ENTITY_REFERENCE_NODE=5;document.ENTITY_NODE=6;document.PROCESSING_INSTRUCTION_NODE=7;document.COMMENT_NODE=8;document.DOCUMENT_NODE=9;document.DOCUMENT_TYPE_NODE=10;document.DOCUMENT_FRAGMENT_NODE=11;document.NOTATION_NODE=12}document._importNode=function(e,a){switch(e.nodeType){case document.ELEMENT_NODE:var d=document.createElement(e.nodeName);if(e.attributes&&e.attributes.length>0){for(var c=0,b=e.attributes.length;c<b;){if(e.attributes[c].nodeName=="class"){d.className=e.getAttribute(e.attributes[c++].nodeName)}else{d.setAttribute(e.attributes[c].nodeName,e.getAttribute(e.attributes[c++].nodeName))}}}if(a&&e.childNodes&&e.childNodes.length>0){for(var c=0,b=e.childNodes.length;c<b;){d.appendChild(document._importNode(e.childNodes[c++],a))}}return d;break;case document.TEXT_NODE:case document.CDATA_SECTION_NODE:case document.COMMENT_NODE:return document.createTextNode(e.nodeValue);break}};if(typeof navigator.geolocation=="undefined"||navigator.geolocation.shim){(function(){(function(){if(window.google&&google.gears){return}var c=null;if(typeof GearsFactory!="undefined"){c=new GearsFactory()}else{try{c=new ActiveXObject("Gears.Factory");if(c.getBuildInfo().indexOf("ie_mobile")!=-1){c.privateSetGlobalObject(this)}}catch(d){if((typeof navigator.mimeTypes!="undefined")&&navigator.mimeTypes["application/x-googlegears"]){c=document.createElement("object");c.style.display="none";c.width=0;c.height=0;c.type="application/x-googlegears";document.documentElement.appendChild(c)}}}if(!c){return}if(!window.google){google={}}if(!google.gears){google.gears={factory:c}}})();var a=(function(){var d=google.gears.factory.create("beta.geolocation");var c=function(f,e){return function(g){f(g);e.lastPosition=g}};return{shim:true,type:"Gears",lastPosition:null,getCurrentPosition:function(e,g,h){var f=this;var i=c(e,f);d.getCurrentPosition(i,g,h)},watchPosition:function(e,f,g){d.watchPosition(e,f,g)},clearWatch:function(e){d.clearWatch(e)},getPermission:function(g,e,f){d.getPermission(g,e,f)}}});var b=(function(){var i=false;var e=function(){if(!d()&&!i){i=true;var j=document.createElement("script");j.src=(document.location.protocol=="https:"?"https://":"http://")+"www.google.com/jsapi?callback=_google_loader_apiLoaded";j.type="text/javascript";document.getElementsByTagName("body")[0].appendChild(j)}};var c=[];var h=function(j){c.push(j)};var f=function(){if(d()){while(c.length>0){var j=c.pop();j()}}};window._google_loader_apiLoaded=function(){f()};var d=function(){return(window.google&&google.loader)};var g=function(j){if(d()){return true}h(j);e();return false};e();return{shim:true,type:"ClientLocation",lastPosition:null,getCurrentPosition:function(k,n,o){var m=this;if(!g(function(){m.getCurrentPosition(k,n,o)})){return}if(google.loader.ClientLocation){var l=google.loader.ClientLocation;var j={coords:{latitude:l.latitude,longitude:l.longitude,altitude:null,accuracy:43000,altitudeAccuracy:null,heading:null,speed:null},address:{city:l.address.city,country:l.address.country,country_code:l.address.country_code,region:l.address.region},timestamp:new Date()};k(j);this.lastPosition=j}else{if(n==="function"){n({code:3,message:"Using the Google ClientLocation API and it is not able to calculate a location."})}}},watchPosition:function(j,l,m){this.getCurrentPosition(j,l,m);var k=this;var n=setInterval(function(){k.getCurrentPosition(j,l,m)},10000);return n},clearWatch:function(j){clearInterval(j)},getPermission:function(l,j,k){return true}}});navigator.geolocation=(window.google&&google.gears)?a():b()})()};
\ No newline at end of file

From 488230c3e1c5fb49263c0d9e7b2582e9cd8a3153 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Thu, 3 Mar 2011 16:15:28 -0800
Subject: [PATCH 382/655] Drop auto-focusing of the notice form.

---
 js/util.js     | 4 ----
 js/util.min.js | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/js/util.js b/js/util.js
index 00c9716557..ed8866aaa1 100644
--- a/js/util.js
+++ b/js/util.js
@@ -136,10 +136,6 @@ var SN = { // StatusNet
             else {
                 form.find('#'+SN.C.S.NoticeTextCount).text(jQuery.data(form[0], 'ElementData').MaxLength);
             }
-
-            if ($('body')[0].id != 'conversation' && window.location.hash.length === 0 && $(window).scrollTop() == 0) {
-                form.find('textarea').focus();
-            }
         },
 
         /**
diff --git a/js/util.min.js b/js/util.min.js
index 1bcc86a8ba..a61a905f60 100644
--- a/js/util.min.js
+++ b/js/util.min.js
@@ -1 +1 @@
-var SN={C:{I:{CounterBlackout:false,MaxLength:140,PatternUsername:/^[0-9a-zA-Z\-_.]*$/,HTTP20x30x:[200,201,202,203,204,205,206,300,301,302,303,304,305,306,307]},S:{Disabled:"disabled",Warning:"warning",Error:"error",Success:"success",Processing:"processing",CommandResult:"command_result",FormNotice:"form_notice",NoticeDataText:"notice_data-text",NoticeTextCount:"notice_text-count",NoticeInReplyTo:"notice_in-reply-to",NoticeDataAttach:"notice_data-attach",NoticeDataAttachSelected:"notice_data-attach_selected",NoticeActionSubmit:"notice_action-submit",NoticeLat:"notice_data-lat",NoticeLon:"notice_data-lon",NoticeLocationId:"notice_data-location_id",NoticeLocationNs:"notice_data-location_ns",NoticeGeoName:"notice_data-geo_name",NoticeDataGeo:"notice_data-geo",NoticeDataGeoCookie:"NoticeDataGeo",NoticeDataGeoSelected:"notice_data-geo_selected",StatusNetInstance:"StatusNetInstance"}},messages:{},msg:function(a){if(typeof SN.messages[a]=="undefined"){return"["+a+"]"}else{return SN.messages[a]}},U:{FormNoticeEnhancements:function(b){if(jQuery.data(b[0],"ElementData")===undefined){MaxLength=b.find("#"+SN.C.S.NoticeTextCount).text();if(typeof(MaxLength)=="undefined"){MaxLength=SN.C.I.MaxLength}jQuery.data(b[0],"ElementData",{MaxLength:MaxLength});SN.U.Counter(b);NDT=b.find("#"+SN.C.S.NoticeDataText);NDT.bind("keyup",function(c){SN.U.Counter(b)});var a=function(c){window.setTimeout(function(){SN.U.Counter(b)},50)};NDT.bind("cut",a).bind("paste",a)}else{b.find("#"+SN.C.S.NoticeTextCount).text(jQuery.data(b[0],"ElementData").MaxLength)}if($("body")[0].id!="conversation"&&window.location.hash.length===0&&$(window).scrollTop()==0){b.find("textarea").focus()}},Counter:function(d){SN.C.I.FormNoticeCurrent=d;var b=jQuery.data(d[0],"ElementData").MaxLength;if(b<=0){return}var c=b-SN.U.CharacterCount(d);var a=d.find("#"+SN.C.S.NoticeTextCount);if(c.toString()!=a.text()){if(!SN.C.I.CounterBlackout||c===0){if(a.text()!=String(c)){a.text(c)}if(c<0){d.addClass(SN.C.S.Warning)}else{d.removeClass(SN.C.S.Warning)}if(!SN.C.I.CounterBlackout){SN.C.I.CounterBlackout=true;SN.C.I.FormNoticeCurrent=d;window.setTimeout("SN.U.ClearCounterBlackout(SN.C.I.FormNoticeCurrent);",500)}}}},CharacterCount:function(a){return a.find("#"+SN.C.S.NoticeDataText).val().length},ClearCounterBlackout:function(a){SN.C.I.CounterBlackout=false;SN.U.Counter(a)},RewriteAjaxAction:function(a){if(document.location.protocol=="https:"&&a.substr(0,5)=="http:"){return a.replace(/^http:\/\/[^:\/]+/,"https://"+document.location.host)}else{return a}},FormXHR:function(a){$.ajax({type:"POST",dataType:"xml",url:SN.U.RewriteAjaxAction(a.attr("action")),data:a.serialize()+"&ajax=1",beforeSend:function(b){a.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(c,d,b){alert(b||d)},success:function(b,c){if(typeof($("form",b)[0])!="undefined"){form_new=document._importNode($("form",b)[0],true);a.replaceWith(form_new)}else{a.replaceWith(document._importNode($("p",b)[0],true))}}})},FormNoticeXHR:function(b){SN.C.I.NoticeDataGeo={};b.append('<input type="hidden" name="ajax" value="1"/>');b.attr("action",SN.U.RewriteAjaxAction(b.attr("action")));var c=function(d,e){b.append($('<p class="form_response"></p>').addClass(d).text(e))};var a=function(){b.find(".form_response").remove()};b.ajaxForm({dataType:"xml",timeout:"60000",beforeSend:function(d){if(b.find("#"+SN.C.S.NoticeDataText)[0].value.length===0){b.addClass(SN.C.S.Warning);return false}b.addClass(SN.C.S.Processing).find("#"+SN.C.S.NoticeActionSubmit).addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled);SN.U.normalizeGeoData(b);return true},error:function(f,g,e){b.removeClass(SN.C.S.Processing).find("#"+SN.C.S.NoticeActionSubmit).removeClass(SN.C.S.Disabled).removeAttr(SN.C.S.Disabled,SN.C.S.Disabled);a();if(g=="timeout"){c("error","Sorry! We had trouble sending your notice. The servers are overloaded. Please try again, and contact the site administrator if this problem persists.")}else{var d=SN.U.GetResponseXML(f);if($("."+SN.C.S.Error,d).length>0){b.append(document._importNode($("."+SN.C.S.Error,d)[0],true))}else{if(parseInt(f.status)===0||jQuery.inArray(parseInt(f.status),SN.C.I.HTTP20x30x)>=0){b.resetForm().find("#"+SN.C.S.NoticeDataAttachSelected).remove();SN.U.FormNoticeEnhancements(b)}else{c("error","(Sorry! We had trouble sending your notice ("+f.status+" "+f.statusText+"). Please report the problem to the site administrator if this happens again.")}}}},success:function(i,k){a();var e=$("#"+SN.C.S.Error,i);if(e.length>0){c("error",e.text())}else{if($("body")[0].id=="bookmarklet"){self.close()}var d=$("#"+SN.C.S.CommandResult,i);if(d.length>0){c("success",d.text())}else{var h=document._importNode($("li",i)[0],true);var j=$("#notices_primary .notices:first");if(j.length>0&&SN.U.belongsOnTimeline(h)){if($("#"+h.id).length===0){var f=$("#"+SN.C.S.NoticeInReplyTo).val();var g="#notices_primary #notice-"+f;if($("body")[0].id=="conversation"){if(f.length>0&&$(g+" .notices").length<1){$(g).append('<ul class="notices"></ul>')}$($(g+" .notices")[0]).append(h)}else{j.prepend(h)}$("#"+h.id).css({display:"none"}).fadeIn(2500);SN.U.NoticeWithAttachment($("#"+h.id));SN.U.NoticeReplyTo($("#"+h.id))}}else{c("success",$("title",i).text())}}b.resetForm();b.find("#"+SN.C.S.NoticeInReplyTo).val("");b.find("#"+SN.C.S.NoticeDataAttachSelected).remove();SN.U.FormNoticeEnhancements(b)}},complete:function(d,e){b.removeClass(SN.C.S.Processing).find("#"+SN.C.S.NoticeActionSubmit).removeAttr(SN.C.S.Disabled).removeClass(SN.C.S.Disabled);$("#"+SN.C.S.NoticeLat).val(SN.C.I.NoticeDataGeo.NLat);$("#"+SN.C.S.NoticeLon).val(SN.C.I.NoticeDataGeo.NLon);if($("#"+SN.C.S.NoticeLocationNs)){$("#"+SN.C.S.NoticeLocationNs).val(SN.C.I.NoticeDataGeo.NLNS);$("#"+SN.C.S.NoticeLocationId).val(SN.C.I.NoticeDataGeo.NLID)}$("#"+SN.C.S.NoticeDataGeo).attr("checked",SN.C.I.NoticeDataGeo.NDG)}})},normalizeGeoData:function(a){SN.C.I.NoticeDataGeo.NLat=a.find("[name=lat]").val();SN.C.I.NoticeDataGeo.NLon=a.find("[name=lon]").val();SN.C.I.NoticeDataGeo.NLNS=a.find("[name=location_ns]").val();SN.C.I.NoticeDataGeo.NLID=a.find("[name=location_id]").val();SN.C.I.NoticeDataGeo.NDG=$("#"+SN.C.S.NoticeDataGeo).attr("checked");var b=$.cookie(SN.C.S.NoticeDataGeoCookie);if(b!==null&&b!="disabled"){b=JSON.parse(b);SN.C.I.NoticeDataGeo.NLat=a.find("[name=lat]").val(b.NLat).val();SN.C.I.NoticeDataGeo.NLon=a.find("[name=lon]").val(b.NLon).val();if(b.NLNS){SN.C.I.NoticeDataGeo.NLNS=a.find("[name=location_ns]").val(b.NLNS).val();SN.C.I.NoticeDataGeo.NLID=a.find("[name=location_id]").val(b.NLID).val()}else{a.find("[name=location_ns]").val("");a.find("[name=location_id]").val("")}}if(b=="disabled"){SN.C.I.NoticeDataGeo.NDG=$("#"+SN.C.S.NoticeDataGeo).attr("checked",false).attr("checked")}else{SN.C.I.NoticeDataGeo.NDG=$("#"+SN.C.S.NoticeDataGeo).attr("checked",true).attr("checked")}},GetResponseXML:function(b){try{return b.responseXML}catch(a){return(new DOMParser()).parseFromString(b.responseText,"text/xml")}},NoticeReply:function(){if($("#"+SN.C.S.NoticeDataText).length>0&&$("#content .notice_reply").length>0){$("#content .notice").each(function(){SN.U.NoticeReplyTo($(this))})}},NoticeReplyTo:function(a){a.find(".notice_reply").live("click",function(c){c.preventDefault();var b=($(".author .nickname",a).length>0)?$($(".author .nickname",a)[0]):$(".author .nickname.uid");SN.U.NoticeInlineReplyTrigger(a,"@"+b.text());return false})},NoticeInlineReplyTrigger:function(h,i){var c=$($(".notice_id",h)[0]).text();var d=h;var f=h.closest(".notices");if(f.hasClass("threaded-replies")){d=f.closest(".notice")}else{f=$("ul.threaded-replies",h);if(f.length==0){f=$('<ul class="notices threaded-replies xoxo"></ul>');h.append(f)}}var k=$(".notice-reply-form",f);if(k.length==0){$("li.notice-reply-placeholder").remove();var g=$("li.notice-reply",f);if(g.length==0){g=$('<li class="notice-reply"><form class="notice-reply-form" method="post"><textarea name="status_textarea"></textarea><div class="controls"><input type="hidden" name="token"><input type="hidden" name="inreplyto"><input type="submit" class="submit"></div></form></li>');var b=$("#form_notice");k=g.find("form");k.attr("action",b.attr("action"));k.find('input[name="token"]').val(b.find("input[name=token]").val());k.find('input[type="submit"]').val(SN.msg("reply_submit"));f.append(g);k.find("textarea").blur(function(){var m=$(this);var l=$.trim(m.val());if(l==""||l==m.data("initialText")){g.remove();if(f.find("li").length>0){SN.U.NoticeInlineReplyPlaceholder(d)}else{f.remove()}}});k.submit(function(m){var l=k;$.ajax({type:"POST",dataType:"xml",url:SN.U.RewriteAjaxAction(l.attr("action")),data:l.serialize()+"&ajax=1",beforeSend:function(n){l.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled).end().find("textarea").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(o,p,n){alert(n||p)},success:function(p,r){var o=$("li",p)[0];if(o){var n=document._importNode(o,true);var q=$(n).attr("id");if($("#"+q).length==0){g.replaceWith(n);SN.U.NoticeInlineReplyPlaceholder(d)}else{g.remove()}}}});m.preventDefault();return false})}}k.find("input[name=inreplyto]").val(c);var j=k.find("textarea");if(j.length==0){throw"No textarea"}var a="";if(i){a=i+" "}j.val(a+j.val().replace(RegExp(a,"i"),""));j.data("initialText",$.trim(i+""));j.focus();if(j[0].setSelectionRange){var e=j.val().length;j[0].setSelectionRange(e,e)}},NoticeReplySet:function(b,d){if(b.match(SN.C.I.PatternUsername)){var c=$("#"+SN.C.S.NoticeDataText);if(c.length>0){replyto="@"+b+" ";c.val(replyto+c.val().replace(RegExp(replyto,"i"),""));$("#"+SN.C.S.FormNotice+" #"+SN.C.S.NoticeInReplyTo).val(d);c[0].focus();if(c[0].setSelectionRange){var a=c.val().length;c[0].setSelectionRange(a,a)}}}},NoticeFavor:function(){$(".form_favor").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_disfavor").live("click",function(){SN.U.FormXHR($(this));return false})},NoticeInlineReplyPlaceholder:function(b){var a=b.find("ul.threaded-replies");var c=$('<li class="notice-reply-placeholder"><input class="placeholder"></li>');c.click(function(){SN.U.NoticeInlineReplyTrigger(b)});c.find("input").val(SN.msg("reply_placeholder"));a.append(c)},NoticeInlineReplySetup:function(){$(".threaded-replies").each(function(){var b=$(this);var a=b.closest(".notice");SN.U.NoticeInlineReplyPlaceholder(a)})},NoticeRepeat:function(){$(".form_repeat").live("click",function(a){a.preventDefault();SN.U.NoticeRepeatConfirmation($(this));return false})},NoticeRepeatConfirmation:function(a){var c=a.find(".submit");var b=c.clone();b.addClass("submit_dialogbox").removeClass("submit");a.append(b);b.bind("click",function(){SN.U.FormXHR(a);return false});c.hide();a.addClass("dialogbox").append('<button class="close">&#215;</button>').closest(".notice-options").addClass("opaque");a.find("button.close").click(function(){$(this).remove();a.removeClass("dialogbox").closest(".notice-options").removeClass("opaque");a.find(".submit_dialogbox").remove();a.find(".submit").show();return false})},NoticeAttachments:function(){$(".notice a.attachment").each(function(){SN.U.NoticeWithAttachment($(this).closest(".notice"))})},NoticeWithAttachment:function(b){if(b.find(".attachment").length===0){return}var a=b.find(".attachment.more");if(a.length>0){$(a[0]).click(function(){var c=$(this);c.addClass(SN.C.S.Processing);$.get(c.attr("href")+"/ajax",null,function(d){c.parent(".entry-content").html($(d).find("#attachment_view .entry-content").html())});return false}).attr("title",SN.msg("showmore_tooltip"))}},NoticeDataAttach:function(){NDA=$("#"+SN.C.S.NoticeDataAttach);NDA.change(function(c){var a=$(this).val();if(!a){$("#"+SN.C.S.NoticeDataAttachSelected).remove();return false}S='<div id="'+SN.C.S.NoticeDataAttachSelected+'" class="'+SN.C.S.Success+'"><code>'+a+'</code> <button class="close">&#215;</button></div>';NDAS=$("#"+SN.C.S.NoticeDataAttachSelected);if(NDAS.length>0){NDAS.replaceWith(S)}else{$("#"+SN.C.S.FormNotice).append(S)}$("#"+SN.C.S.NoticeDataAttachSelected+" button").click(function(){$("#"+SN.C.S.NoticeDataAttachSelected).remove();NDA.val("");return false});if(typeof this.files=="object"){for(var b=0;b<this.files.length;b++){SN.U.PreviewAttach(this.files[b])}}})},maxFileSize:function(b){var a=$(b).find("input[name=MAX_FILE_SIZE]").attr("value");if(a){return parseInt(a)}else{return 0}},PreviewAttach:function(c){var d=c.type+" "+Math.round(c.size/1024)+"KB";var e=true;var g;if(typeof window.createObjectURL!="undefined"){g=function(h,i){i(window.createObjectURL(h))}}else{if(typeof window.FileReader!="undefined"){g=function(i,j){var h=new FileReader();h.onload=function(k){j(h.result)};h.readAsDataURL(i)}}else{e=false}}var a=["image/png","image/jpeg","image/gif","image/svg+xml"];if($.inArray(c.type,a)==-1){e=false}var f=8*1024*1024;if(c.size>f){e=false}if(e){g(c,function(i){var h=$("<img>").attr("title",d).attr("alt",d).attr("src",i).attr("style","height: 120px");$("#"+SN.C.S.NoticeDataAttachSelected).append(h)})}else{var b=$("<div></div>").text(d);$("#"+SN.C.S.NoticeDataAttachSelected).append(b)}},NoticeLocationAttach:function(){var c=$("#"+SN.C.S.NoticeLat).val();var h=$("#"+SN.C.S.NoticeLon).val();var d=$("#"+SN.C.S.NoticeLocationNs).val();var i=$("#"+SN.C.S.NoticeLocationId).val();var a=$("#"+SN.C.S.NoticeGeoName).text();var b=$("#"+SN.C.S.NoticeDataGeo);function e(k){$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",jQuery.trim($("label[for="+SN.C.S.NoticeDataGeo+"]").text())).removeClass("checked");$("#"+SN.C.S.NoticeLat).val("");$("#"+SN.C.S.NoticeLon).val("");$("#"+SN.C.S.NoticeLocationNs).val("");$("#"+SN.C.S.NoticeLocationId).val("");$("#"+SN.C.S.NoticeDataGeo).attr("checked",false);$.cookie(SN.C.S.NoticeDataGeoCookie,"disabled",{path:"/"});if(k){$(".geo_status_wrapper").removeClass("success").addClass("error");$(".geo_status_wrapper .geo_status").text(k)}else{$(".geo_status_wrapper").remove()}}function j(k,l){SN.U.NoticeGeoStatus("Looking up place name...");$.getJSON(k,l,function(m){var n,o;if(typeof(m.location_ns)!="undefined"){$("#"+SN.C.S.NoticeLocationNs).val(m.location_ns);n=m.location_ns}if(typeof(m.location_id)!="undefined"){$("#"+SN.C.S.NoticeLocationId).val(m.location_id);o=m.location_id}if(typeof(m.name)=="undefined"){NLN_text=l.lat+";"+l.lon}else{NLN_text=m.name}SN.U.NoticeGeoStatus(NLN_text,l.lat,l.lon,m.url);$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",NoticeDataGeo_text.ShareDisable+" ("+NLN_text+")");$("#"+SN.C.S.NoticeLat).val(l.lat);$("#"+SN.C.S.NoticeLon).val(l.lon);$("#"+SN.C.S.NoticeLocationNs).val(n);$("#"+SN.C.S.NoticeLocationId).val(o);$("#"+SN.C.S.NoticeDataGeo).attr("checked",true);var p={NLat:l.lat,NLon:l.lon,NLNS:n,NLID:o,NLN:NLN_text,NLNU:m.url,NDG:true};$.cookie(SN.C.S.NoticeDataGeoCookie,JSON.stringify(p),{path:"/"})})}if(b.length>0){if($.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){b.attr("checked",false)}else{b.attr("checked",true)}var f=$("#notice_data-geo_wrap");var g=f.attr("title");f.removeAttr("title");$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",jQuery.trim($("label[for="+SN.C.S.NoticeDataGeo+"]").text()));b.change(function(){if($("#"+SN.C.S.NoticeDataGeo).attr("checked")===true||$.cookie(SN.C.S.NoticeDataGeoCookie)===null){$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",NoticeDataGeo_text.ShareDisable).addClass("checked");if($.cookie(SN.C.S.NoticeDataGeoCookie)===null||$.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){if(navigator.geolocation){SN.U.NoticeGeoStatus("Requesting location from browser...");navigator.geolocation.getCurrentPosition(function(m){$("#"+SN.C.S.NoticeLat).val(m.coords.latitude);$("#"+SN.C.S.NoticeLon).val(m.coords.longitude);var n={lat:m.coords.latitude,lon:m.coords.longitude,token:$("#token").val()};j(g,n)},function(m){switch(m.code){case m.PERMISSION_DENIED:e("Location permission denied.");break;case m.TIMEOUT:e("Location lookup timeout.");break}},{timeout:10000})}else{if(c.length>0&&h.length>0){var k={lat:c,lon:h,token:$("#token").val()};j(g,k)}else{e();$("#"+SN.C.S.NoticeDataGeo).remove();$("label[for="+SN.C.S.NoticeDataGeo+"]").remove()}}}else{var l=JSON.parse($.cookie(SN.C.S.NoticeDataGeoCookie));$("#"+SN.C.S.NoticeLat).val(l.NLat);$("#"+SN.C.S.NoticeLon).val(l.NLon);$("#"+SN.C.S.NoticeLocationNs).val(l.NLNS);$("#"+SN.C.S.NoticeLocationId).val(l.NLID);$("#"+SN.C.S.NoticeDataGeo).attr("checked",l.NDG);SN.U.NoticeGeoStatus(l.NLN,l.NLat,l.NLon,l.NLNU);$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",NoticeDataGeo_text.ShareDisable+" ("+l.NLN+")").addClass("checked")}}else{e()}}).change()}},NoticeGeoStatus:function(a,f,g,c){var e=$("#form_notice");var h=e.find(".geo_status_wrapper");if(h.length==0){h=$('<div class="'+SN.C.S.Success+' geo_status_wrapper"><button class="close" style="float:right">&#215;</button><div class="geo_status"></div></div>');h.find("button.close").click(function(){$("#"+SN.C.S.NoticeDataGeo).removeAttr("checked").change()});e.append(h)}var b;if(c){b=$("<a></a>").attr("href",c)}else{b=$("<span></span>")}b.text(a);if(f||g){var d=f+";"+g;b.attr("title",d);if(!a){b.text(d)}}h.find(".geo_status").empty().append(b)},NewDirectMessage:function(){NDM=$(".entity_send-a-message a");NDM.attr({href:NDM.attr("href")+"&ajax=1"});NDM.bind("click",function(){var a=$(".entity_send-a-message form");if(a.length===0){$(this).addClass(SN.C.S.Processing);$.get(NDM.attr("href"),null,function(b){$(".entity_send-a-message").append(document._importNode($("form",b)[0],true));a=$(".entity_send-a-message .form_notice");SN.U.FormNoticeXHR(a);SN.U.FormNoticeEnhancements(a);a.append('<button class="close">&#215;</button>');$(".entity_send-a-message button").click(function(){a.hide();return false});NDM.removeClass(SN.C.S.Processing)})}else{a.show();$(".entity_send-a-message textarea").focus()}return false})},GetFullYear:function(c,d,a){var b=new Date();b.setFullYear(c,d,a);return b},StatusNetInstance:{Set:function(b){var a=SN.U.StatusNetInstance.Get();if(a!==null){b=$.extend(a,b)}$.cookie(SN.C.S.StatusNetInstance,JSON.stringify(b),{path:"/",expires:SN.U.GetFullYear(2029,0,1)})},Get:function(){var a=$.cookie(SN.C.S.StatusNetInstance);if(a!==null){return JSON.parse(a)}return null},Delete:function(){$.cookie(SN.C.S.StatusNetInstance,null)}},belongsOnTimeline:function(b){var a=$("body").attr("id");if(a=="public"){return true}var c=$("#nav_profile a").attr("href");if(c){var d=$(b).find(".entry-title .author a.url").attr("href");if(d==c){if(a=="all"||a=="showstream"){return true}}}return false}},Init:{NoticeForm:function(){if($("body.user_in").length>0){SN.U.NoticeLocationAttach();$("."+SN.C.S.FormNotice).each(function(){SN.U.FormNoticeXHR($(this));SN.U.FormNoticeEnhancements($(this))});SN.U.NoticeDataAttach()}},Notices:function(){if($("body.user_in").length>0){SN.U.NoticeFavor();SN.U.NoticeRepeat();SN.U.NoticeReply();SN.U.NoticeInlineReplySetup()}SN.U.NoticeAttachments()},EntityActions:function(){if($("body.user_in").length>0){$(".form_user_subscribe").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_user_unsubscribe").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_group_join").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_group_leave").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_user_nudge").live("click",function(){SN.U.FormXHR($(this));return false});SN.U.NewDirectMessage()}},Login:function(){if(SN.U.StatusNetInstance.Get()!==null){var a=SN.U.StatusNetInstance.Get().Nickname;if(a!==null){$("#form_login #nickname").val(a)}}$("#form_login").bind("submit",function(){SN.U.StatusNetInstance.Set({Nickname:$("#form_login #nickname").val()});return true})},UploadForms:function(){$("input[type=file]").change(function(d){if(typeof this.files=="object"&&this.files.length>0){var c=0;for(var b=0;b<this.files.length;b++){c+=this.files[b].size}var a=SN.U.maxFileSize($(this.form));if(a>0&&c>a){var e="File too large: maximum upload size is %d bytes.";alert(e.replace("%d",a));$(this).val("");d.preventDefault();return false}}})}}};$(document).ready(function(){SN.Init.UploadForms();if($("."+SN.C.S.FormNotice).length>0){SN.Init.NoticeForm()}if($("#content .notices").length>0){SN.Init.Notices()}if($("#content .entity_actions").length>0){SN.Init.EntityActions()}if($("#form_login").length>0){SN.Init.Login()}});if(!document.ELEMENT_NODE){document.ELEMENT_NODE=1;document.ATTRIBUTE_NODE=2;document.TEXT_NODE=3;document.CDATA_SECTION_NODE=4;document.ENTITY_REFERENCE_NODE=5;document.ENTITY_NODE=6;document.PROCESSING_INSTRUCTION_NODE=7;document.COMMENT_NODE=8;document.DOCUMENT_NODE=9;document.DOCUMENT_TYPE_NODE=10;document.DOCUMENT_FRAGMENT_NODE=11;document.NOTATION_NODE=12}document._importNode=function(e,a){switch(e.nodeType){case document.ELEMENT_NODE:var d=document.createElement(e.nodeName);if(e.attributes&&e.attributes.length>0){for(var c=0,b=e.attributes.length;c<b;){if(e.attributes[c].nodeName=="class"){d.className=e.getAttribute(e.attributes[c++].nodeName)}else{d.setAttribute(e.attributes[c].nodeName,e.getAttribute(e.attributes[c++].nodeName))}}}if(a&&e.childNodes&&e.childNodes.length>0){for(var c=0,b=e.childNodes.length;c<b;){d.appendChild(document._importNode(e.childNodes[c++],a))}}return d;break;case document.TEXT_NODE:case document.CDATA_SECTION_NODE:case document.COMMENT_NODE:return document.createTextNode(e.nodeValue);break}};if(typeof navigator.geolocation=="undefined"||navigator.geolocation.shim){(function(){(function(){if(window.google&&google.gears){return}var c=null;if(typeof GearsFactory!="undefined"){c=new GearsFactory()}else{try{c=new ActiveXObject("Gears.Factory");if(c.getBuildInfo().indexOf("ie_mobile")!=-1){c.privateSetGlobalObject(this)}}catch(d){if((typeof navigator.mimeTypes!="undefined")&&navigator.mimeTypes["application/x-googlegears"]){c=document.createElement("object");c.style.display="none";c.width=0;c.height=0;c.type="application/x-googlegears";document.documentElement.appendChild(c)}}}if(!c){return}if(!window.google){google={}}if(!google.gears){google.gears={factory:c}}})();var a=(function(){var d=google.gears.factory.create("beta.geolocation");var c=function(f,e){return function(g){f(g);e.lastPosition=g}};return{shim:true,type:"Gears",lastPosition:null,getCurrentPosition:function(e,g,h){var f=this;var i=c(e,f);d.getCurrentPosition(i,g,h)},watchPosition:function(e,f,g){d.watchPosition(e,f,g)},clearWatch:function(e){d.clearWatch(e)},getPermission:function(g,e,f){d.getPermission(g,e,f)}}});var b=(function(){var i=false;var e=function(){if(!d()&&!i){i=true;var j=document.createElement("script");j.src=(document.location.protocol=="https:"?"https://":"http://")+"www.google.com/jsapi?callback=_google_loader_apiLoaded";j.type="text/javascript";document.getElementsByTagName("body")[0].appendChild(j)}};var c=[];var h=function(j){c.push(j)};var f=function(){if(d()){while(c.length>0){var j=c.pop();j()}}};window._google_loader_apiLoaded=function(){f()};var d=function(){return(window.google&&google.loader)};var g=function(j){if(d()){return true}h(j);e();return false};e();return{shim:true,type:"ClientLocation",lastPosition:null,getCurrentPosition:function(k,n,o){var m=this;if(!g(function(){m.getCurrentPosition(k,n,o)})){return}if(google.loader.ClientLocation){var l=google.loader.ClientLocation;var j={coords:{latitude:l.latitude,longitude:l.longitude,altitude:null,accuracy:43000,altitudeAccuracy:null,heading:null,speed:null},address:{city:l.address.city,country:l.address.country,country_code:l.address.country_code,region:l.address.region},timestamp:new Date()};k(j);this.lastPosition=j}else{if(n==="function"){n({code:3,message:"Using the Google ClientLocation API and it is not able to calculate a location."})}}},watchPosition:function(j,l,m){this.getCurrentPosition(j,l,m);var k=this;var n=setInterval(function(){k.getCurrentPosition(j,l,m)},10000);return n},clearWatch:function(j){clearInterval(j)},getPermission:function(l,j,k){return true}}});navigator.geolocation=(window.google&&google.gears)?a():b()})()};
\ No newline at end of file
+var SN={C:{I:{CounterBlackout:false,MaxLength:140,PatternUsername:/^[0-9a-zA-Z\-_.]*$/,HTTP20x30x:[200,201,202,203,204,205,206,300,301,302,303,304,305,306,307]},S:{Disabled:"disabled",Warning:"warning",Error:"error",Success:"success",Processing:"processing",CommandResult:"command_result",FormNotice:"form_notice",NoticeDataText:"notice_data-text",NoticeTextCount:"notice_text-count",NoticeInReplyTo:"notice_in-reply-to",NoticeDataAttach:"notice_data-attach",NoticeDataAttachSelected:"notice_data-attach_selected",NoticeActionSubmit:"notice_action-submit",NoticeLat:"notice_data-lat",NoticeLon:"notice_data-lon",NoticeLocationId:"notice_data-location_id",NoticeLocationNs:"notice_data-location_ns",NoticeGeoName:"notice_data-geo_name",NoticeDataGeo:"notice_data-geo",NoticeDataGeoCookie:"NoticeDataGeo",NoticeDataGeoSelected:"notice_data-geo_selected",StatusNetInstance:"StatusNetInstance"}},messages:{},msg:function(a){if(typeof SN.messages[a]=="undefined"){return"["+a+"]"}else{return SN.messages[a]}},U:{FormNoticeEnhancements:function(b){if(jQuery.data(b[0],"ElementData")===undefined){MaxLength=b.find("#"+SN.C.S.NoticeTextCount).text();if(typeof(MaxLength)=="undefined"){MaxLength=SN.C.I.MaxLength}jQuery.data(b[0],"ElementData",{MaxLength:MaxLength});SN.U.Counter(b);NDT=b.find("#"+SN.C.S.NoticeDataText);NDT.bind("keyup",function(c){SN.U.Counter(b)});var a=function(c){window.setTimeout(function(){SN.U.Counter(b)},50)};NDT.bind("cut",a).bind("paste",a)}else{b.find("#"+SN.C.S.NoticeTextCount).text(jQuery.data(b[0],"ElementData").MaxLength)}},Counter:function(d){SN.C.I.FormNoticeCurrent=d;var b=jQuery.data(d[0],"ElementData").MaxLength;if(b<=0){return}var c=b-SN.U.CharacterCount(d);var a=d.find("#"+SN.C.S.NoticeTextCount);if(c.toString()!=a.text()){if(!SN.C.I.CounterBlackout||c===0){if(a.text()!=String(c)){a.text(c)}if(c<0){d.addClass(SN.C.S.Warning)}else{d.removeClass(SN.C.S.Warning)}if(!SN.C.I.CounterBlackout){SN.C.I.CounterBlackout=true;SN.C.I.FormNoticeCurrent=d;window.setTimeout("SN.U.ClearCounterBlackout(SN.C.I.FormNoticeCurrent);",500)}}}},CharacterCount:function(a){return a.find("#"+SN.C.S.NoticeDataText).val().length},ClearCounterBlackout:function(a){SN.C.I.CounterBlackout=false;SN.U.Counter(a)},RewriteAjaxAction:function(a){if(document.location.protocol=="https:"&&a.substr(0,5)=="http:"){return a.replace(/^http:\/\/[^:\/]+/,"https://"+document.location.host)}else{return a}},FormXHR:function(a){$.ajax({type:"POST",dataType:"xml",url:SN.U.RewriteAjaxAction(a.attr("action")),data:a.serialize()+"&ajax=1",beforeSend:function(b){a.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(c,d,b){alert(b||d)},success:function(b,c){if(typeof($("form",b)[0])!="undefined"){form_new=document._importNode($("form",b)[0],true);a.replaceWith(form_new)}else{a.replaceWith(document._importNode($("p",b)[0],true))}}})},FormNoticeXHR:function(b){SN.C.I.NoticeDataGeo={};b.append('<input type="hidden" name="ajax" value="1"/>');b.attr("action",SN.U.RewriteAjaxAction(b.attr("action")));var c=function(d,e){b.append($('<p class="form_response"></p>').addClass(d).text(e))};var a=function(){b.find(".form_response").remove()};b.ajaxForm({dataType:"xml",timeout:"60000",beforeSend:function(d){if(b.find("#"+SN.C.S.NoticeDataText)[0].value.length===0){b.addClass(SN.C.S.Warning);return false}b.addClass(SN.C.S.Processing).find("#"+SN.C.S.NoticeActionSubmit).addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled);SN.U.normalizeGeoData(b);return true},error:function(f,g,e){b.removeClass(SN.C.S.Processing).find("#"+SN.C.S.NoticeActionSubmit).removeClass(SN.C.S.Disabled).removeAttr(SN.C.S.Disabled,SN.C.S.Disabled);a();if(g=="timeout"){c("error","Sorry! We had trouble sending your notice. The servers are overloaded. Please try again, and contact the site administrator if this problem persists.")}else{var d=SN.U.GetResponseXML(f);if($("."+SN.C.S.Error,d).length>0){b.append(document._importNode($("."+SN.C.S.Error,d)[0],true))}else{if(parseInt(f.status)===0||jQuery.inArray(parseInt(f.status),SN.C.I.HTTP20x30x)>=0){b.resetForm().find("#"+SN.C.S.NoticeDataAttachSelected).remove();SN.U.FormNoticeEnhancements(b)}else{c("error","(Sorry! We had trouble sending your notice ("+f.status+" "+f.statusText+"). Please report the problem to the site administrator if this happens again.")}}}},success:function(i,k){a();var e=$("#"+SN.C.S.Error,i);if(e.length>0){c("error",e.text())}else{if($("body")[0].id=="bookmarklet"){self.close()}var d=$("#"+SN.C.S.CommandResult,i);if(d.length>0){c("success",d.text())}else{var h=document._importNode($("li",i)[0],true);var j=$("#notices_primary .notices:first");if(j.length>0&&SN.U.belongsOnTimeline(h)){if($("#"+h.id).length===0){var f=$("#"+SN.C.S.NoticeInReplyTo).val();var g="#notices_primary #notice-"+f;if($("body")[0].id=="conversation"){if(f.length>0&&$(g+" .notices").length<1){$(g).append('<ul class="notices"></ul>')}$($(g+" .notices")[0]).append(h)}else{j.prepend(h)}$("#"+h.id).css({display:"none"}).fadeIn(2500);SN.U.NoticeWithAttachment($("#"+h.id));SN.U.NoticeReplyTo($("#"+h.id))}}else{c("success",$("title",i).text())}}b.resetForm();b.find("#"+SN.C.S.NoticeInReplyTo).val("");b.find("#"+SN.C.S.NoticeDataAttachSelected).remove();SN.U.FormNoticeEnhancements(b)}},complete:function(d,e){b.removeClass(SN.C.S.Processing).find("#"+SN.C.S.NoticeActionSubmit).removeAttr(SN.C.S.Disabled).removeClass(SN.C.S.Disabled);$("#"+SN.C.S.NoticeLat).val(SN.C.I.NoticeDataGeo.NLat);$("#"+SN.C.S.NoticeLon).val(SN.C.I.NoticeDataGeo.NLon);if($("#"+SN.C.S.NoticeLocationNs)){$("#"+SN.C.S.NoticeLocationNs).val(SN.C.I.NoticeDataGeo.NLNS);$("#"+SN.C.S.NoticeLocationId).val(SN.C.I.NoticeDataGeo.NLID)}$("#"+SN.C.S.NoticeDataGeo).attr("checked",SN.C.I.NoticeDataGeo.NDG)}})},normalizeGeoData:function(a){SN.C.I.NoticeDataGeo.NLat=a.find("[name=lat]").val();SN.C.I.NoticeDataGeo.NLon=a.find("[name=lon]").val();SN.C.I.NoticeDataGeo.NLNS=a.find("[name=location_ns]").val();SN.C.I.NoticeDataGeo.NLID=a.find("[name=location_id]").val();SN.C.I.NoticeDataGeo.NDG=$("#"+SN.C.S.NoticeDataGeo).attr("checked");var b=$.cookie(SN.C.S.NoticeDataGeoCookie);if(b!==null&&b!="disabled"){b=JSON.parse(b);SN.C.I.NoticeDataGeo.NLat=a.find("[name=lat]").val(b.NLat).val();SN.C.I.NoticeDataGeo.NLon=a.find("[name=lon]").val(b.NLon).val();if(b.NLNS){SN.C.I.NoticeDataGeo.NLNS=a.find("[name=location_ns]").val(b.NLNS).val();SN.C.I.NoticeDataGeo.NLID=a.find("[name=location_id]").val(b.NLID).val()}else{a.find("[name=location_ns]").val("");a.find("[name=location_id]").val("")}}if(b=="disabled"){SN.C.I.NoticeDataGeo.NDG=$("#"+SN.C.S.NoticeDataGeo).attr("checked",false).attr("checked")}else{SN.C.I.NoticeDataGeo.NDG=$("#"+SN.C.S.NoticeDataGeo).attr("checked",true).attr("checked")}},GetResponseXML:function(b){try{return b.responseXML}catch(a){return(new DOMParser()).parseFromString(b.responseText,"text/xml")}},NoticeReply:function(){if($("#"+SN.C.S.NoticeDataText).length>0&&$("#content .notice_reply").length>0){$("#content .notice").each(function(){SN.U.NoticeReplyTo($(this))})}},NoticeReplyTo:function(a){a.find(".notice_reply").live("click",function(c){c.preventDefault();var b=($(".author .nickname",a).length>0)?$($(".author .nickname",a)[0]):$(".author .nickname.uid");SN.U.NoticeInlineReplyTrigger(a,"@"+b.text());return false})},NoticeInlineReplyTrigger:function(h,i){var c=$($(".notice_id",h)[0]).text();var d=h;var f=h.closest(".notices");if(f.hasClass("threaded-replies")){d=f.closest(".notice")}else{f=$("ul.threaded-replies",h);if(f.length==0){f=$('<ul class="notices threaded-replies xoxo"></ul>');h.append(f)}}var k=$(".notice-reply-form",f);if(k.length==0){$("li.notice-reply-placeholder").remove();var g=$("li.notice-reply",f);if(g.length==0){g=$('<li class="notice-reply"><form class="notice-reply-form" method="post"><textarea name="status_textarea"></textarea><div class="controls"><input type="hidden" name="token"><input type="hidden" name="inreplyto"><input type="submit" class="submit"></div></form></li>');var b=$("#form_notice");k=g.find("form");k.attr("action",b.attr("action"));k.find('input[name="token"]').val(b.find("input[name=token]").val());k.find('input[type="submit"]').val(SN.msg("reply_submit"));f.append(g);k.find("textarea").blur(function(){var m=$(this);var l=$.trim(m.val());if(l==""||l==m.data("initialText")){g.remove();if(f.find("li").length>0){SN.U.NoticeInlineReplyPlaceholder(d)}else{f.remove()}}});k.submit(function(m){var l=k;$.ajax({type:"POST",dataType:"xml",url:SN.U.RewriteAjaxAction(l.attr("action")),data:l.serialize()+"&ajax=1",beforeSend:function(n){l.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled).end().find("textarea").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(o,p,n){alert(n||p)},success:function(p,r){var o=$("li",p)[0];if(o){var n=document._importNode(o,true);var q=$(n).attr("id");if($("#"+q).length==0){g.replaceWith(n);SN.U.NoticeInlineReplyPlaceholder(d)}else{g.remove()}}}});m.preventDefault();return false})}}k.find("input[name=inreplyto]").val(c);var j=k.find("textarea");if(j.length==0){throw"No textarea"}var a="";if(i){a=i+" "}j.val(a+j.val().replace(RegExp(a,"i"),""));j.data("initialText",$.trim(i+""));j.focus();if(j[0].setSelectionRange){var e=j.val().length;j[0].setSelectionRange(e,e)}},NoticeReplySet:function(b,d){if(b.match(SN.C.I.PatternUsername)){var c=$("#"+SN.C.S.NoticeDataText);if(c.length>0){replyto="@"+b+" ";c.val(replyto+c.val().replace(RegExp(replyto,"i"),""));$("#"+SN.C.S.FormNotice+" #"+SN.C.S.NoticeInReplyTo).val(d);c[0].focus();if(c[0].setSelectionRange){var a=c.val().length;c[0].setSelectionRange(a,a)}}}},NoticeFavor:function(){$(".form_favor").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_disfavor").live("click",function(){SN.U.FormXHR($(this));return false})},NoticeInlineReplyPlaceholder:function(b){var a=b.find("ul.threaded-replies");var c=$('<li class="notice-reply-placeholder"><input class="placeholder"></li>');c.click(function(){SN.U.NoticeInlineReplyTrigger(b)});c.find("input").val(SN.msg("reply_placeholder"));a.append(c)},NoticeInlineReplySetup:function(){$(".threaded-replies").each(function(){var b=$(this);var a=b.closest(".notice");SN.U.NoticeInlineReplyPlaceholder(a)})},NoticeRepeat:function(){$(".form_repeat").live("click",function(a){a.preventDefault();SN.U.NoticeRepeatConfirmation($(this));return false})},NoticeRepeatConfirmation:function(a){var c=a.find(".submit");var b=c.clone();b.addClass("submit_dialogbox").removeClass("submit");a.append(b);b.bind("click",function(){SN.U.FormXHR(a);return false});c.hide();a.addClass("dialogbox").append('<button class="close">&#215;</button>').closest(".notice-options").addClass("opaque");a.find("button.close").click(function(){$(this).remove();a.removeClass("dialogbox").closest(".notice-options").removeClass("opaque");a.find(".submit_dialogbox").remove();a.find(".submit").show();return false})},NoticeAttachments:function(){$(".notice a.attachment").each(function(){SN.U.NoticeWithAttachment($(this).closest(".notice"))})},NoticeWithAttachment:function(b){if(b.find(".attachment").length===0){return}var a=b.find(".attachment.more");if(a.length>0){$(a[0]).click(function(){var c=$(this);c.addClass(SN.C.S.Processing);$.get(c.attr("href")+"/ajax",null,function(d){c.parent(".entry-content").html($(d).find("#attachment_view .entry-content").html())});return false}).attr("title",SN.msg("showmore_tooltip"))}},NoticeDataAttach:function(){NDA=$("#"+SN.C.S.NoticeDataAttach);NDA.change(function(c){var a=$(this).val();if(!a){$("#"+SN.C.S.NoticeDataAttachSelected).remove();return false}S='<div id="'+SN.C.S.NoticeDataAttachSelected+'" class="'+SN.C.S.Success+'"><code>'+a+'</code> <button class="close">&#215;</button></div>';NDAS=$("#"+SN.C.S.NoticeDataAttachSelected);if(NDAS.length>0){NDAS.replaceWith(S)}else{$("#"+SN.C.S.FormNotice).append(S)}$("#"+SN.C.S.NoticeDataAttachSelected+" button").click(function(){$("#"+SN.C.S.NoticeDataAttachSelected).remove();NDA.val("");return false});if(typeof this.files=="object"){for(var b=0;b<this.files.length;b++){SN.U.PreviewAttach(this.files[b])}}})},maxFileSize:function(b){var a=$(b).find("input[name=MAX_FILE_SIZE]").attr("value");if(a){return parseInt(a)}else{return 0}},PreviewAttach:function(c){var d=c.type+" "+Math.round(c.size/1024)+"KB";var e=true;var g;if(typeof window.createObjectURL!="undefined"){g=function(h,i){i(window.createObjectURL(h))}}else{if(typeof window.FileReader!="undefined"){g=function(i,j){var h=new FileReader();h.onload=function(k){j(h.result)};h.readAsDataURL(i)}}else{e=false}}var a=["image/png","image/jpeg","image/gif","image/svg+xml"];if($.inArray(c.type,a)==-1){e=false}var f=8*1024*1024;if(c.size>f){e=false}if(e){g(c,function(i){var h=$("<img>").attr("title",d).attr("alt",d).attr("src",i).attr("style","height: 120px");$("#"+SN.C.S.NoticeDataAttachSelected).append(h)})}else{var b=$("<div></div>").text(d);$("#"+SN.C.S.NoticeDataAttachSelected).append(b)}},NoticeLocationAttach:function(){var c=$("#"+SN.C.S.NoticeLat).val();var h=$("#"+SN.C.S.NoticeLon).val();var d=$("#"+SN.C.S.NoticeLocationNs).val();var i=$("#"+SN.C.S.NoticeLocationId).val();var a=$("#"+SN.C.S.NoticeGeoName).text();var b=$("#"+SN.C.S.NoticeDataGeo);function e(k){$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",jQuery.trim($("label[for="+SN.C.S.NoticeDataGeo+"]").text())).removeClass("checked");$("#"+SN.C.S.NoticeLat).val("");$("#"+SN.C.S.NoticeLon).val("");$("#"+SN.C.S.NoticeLocationNs).val("");$("#"+SN.C.S.NoticeLocationId).val("");$("#"+SN.C.S.NoticeDataGeo).attr("checked",false);$.cookie(SN.C.S.NoticeDataGeoCookie,"disabled",{path:"/"});if(k){$(".geo_status_wrapper").removeClass("success").addClass("error");$(".geo_status_wrapper .geo_status").text(k)}else{$(".geo_status_wrapper").remove()}}function j(k,l){SN.U.NoticeGeoStatus("Looking up place name...");$.getJSON(k,l,function(m){var n,o;if(typeof(m.location_ns)!="undefined"){$("#"+SN.C.S.NoticeLocationNs).val(m.location_ns);n=m.location_ns}if(typeof(m.location_id)!="undefined"){$("#"+SN.C.S.NoticeLocationId).val(m.location_id);o=m.location_id}if(typeof(m.name)=="undefined"){NLN_text=l.lat+";"+l.lon}else{NLN_text=m.name}SN.U.NoticeGeoStatus(NLN_text,l.lat,l.lon,m.url);$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",NoticeDataGeo_text.ShareDisable+" ("+NLN_text+")");$("#"+SN.C.S.NoticeLat).val(l.lat);$("#"+SN.C.S.NoticeLon).val(l.lon);$("#"+SN.C.S.NoticeLocationNs).val(n);$("#"+SN.C.S.NoticeLocationId).val(o);$("#"+SN.C.S.NoticeDataGeo).attr("checked",true);var p={NLat:l.lat,NLon:l.lon,NLNS:n,NLID:o,NLN:NLN_text,NLNU:m.url,NDG:true};$.cookie(SN.C.S.NoticeDataGeoCookie,JSON.stringify(p),{path:"/"})})}if(b.length>0){if($.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){b.attr("checked",false)}else{b.attr("checked",true)}var f=$("#notice_data-geo_wrap");var g=f.attr("title");f.removeAttr("title");$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",jQuery.trim($("label[for="+SN.C.S.NoticeDataGeo+"]").text()));b.change(function(){if($("#"+SN.C.S.NoticeDataGeo).attr("checked")===true||$.cookie(SN.C.S.NoticeDataGeoCookie)===null){$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",NoticeDataGeo_text.ShareDisable).addClass("checked");if($.cookie(SN.C.S.NoticeDataGeoCookie)===null||$.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){if(navigator.geolocation){SN.U.NoticeGeoStatus("Requesting location from browser...");navigator.geolocation.getCurrentPosition(function(m){$("#"+SN.C.S.NoticeLat).val(m.coords.latitude);$("#"+SN.C.S.NoticeLon).val(m.coords.longitude);var n={lat:m.coords.latitude,lon:m.coords.longitude,token:$("#token").val()};j(g,n)},function(m){switch(m.code){case m.PERMISSION_DENIED:e("Location permission denied.");break;case m.TIMEOUT:e("Location lookup timeout.");break}},{timeout:10000})}else{if(c.length>0&&h.length>0){var k={lat:c,lon:h,token:$("#token").val()};j(g,k)}else{e();$("#"+SN.C.S.NoticeDataGeo).remove();$("label[for="+SN.C.S.NoticeDataGeo+"]").remove()}}}else{var l=JSON.parse($.cookie(SN.C.S.NoticeDataGeoCookie));$("#"+SN.C.S.NoticeLat).val(l.NLat);$("#"+SN.C.S.NoticeLon).val(l.NLon);$("#"+SN.C.S.NoticeLocationNs).val(l.NLNS);$("#"+SN.C.S.NoticeLocationId).val(l.NLID);$("#"+SN.C.S.NoticeDataGeo).attr("checked",l.NDG);SN.U.NoticeGeoStatus(l.NLN,l.NLat,l.NLon,l.NLNU);$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",NoticeDataGeo_text.ShareDisable+" ("+l.NLN+")").addClass("checked")}}else{e()}}).change()}},NoticeGeoStatus:function(a,f,g,c){var e=$("#form_notice");var h=e.find(".geo_status_wrapper");if(h.length==0){h=$('<div class="'+SN.C.S.Success+' geo_status_wrapper"><button class="close" style="float:right">&#215;</button><div class="geo_status"></div></div>');h.find("button.close").click(function(){$("#"+SN.C.S.NoticeDataGeo).removeAttr("checked").change()});e.append(h)}var b;if(c){b=$("<a></a>").attr("href",c)}else{b=$("<span></span>")}b.text(a);if(f||g){var d=f+";"+g;b.attr("title",d);if(!a){b.text(d)}}h.find(".geo_status").empty().append(b)},NewDirectMessage:function(){NDM=$(".entity_send-a-message a");NDM.attr({href:NDM.attr("href")+"&ajax=1"});NDM.bind("click",function(){var a=$(".entity_send-a-message form");if(a.length===0){$(this).addClass(SN.C.S.Processing);$.get(NDM.attr("href"),null,function(b){$(".entity_send-a-message").append(document._importNode($("form",b)[0],true));a=$(".entity_send-a-message .form_notice");SN.U.FormNoticeXHR(a);SN.U.FormNoticeEnhancements(a);a.append('<button class="close">&#215;</button>');$(".entity_send-a-message button").click(function(){a.hide();return false});NDM.removeClass(SN.C.S.Processing)})}else{a.show();$(".entity_send-a-message textarea").focus()}return false})},GetFullYear:function(c,d,a){var b=new Date();b.setFullYear(c,d,a);return b},StatusNetInstance:{Set:function(b){var a=SN.U.StatusNetInstance.Get();if(a!==null){b=$.extend(a,b)}$.cookie(SN.C.S.StatusNetInstance,JSON.stringify(b),{path:"/",expires:SN.U.GetFullYear(2029,0,1)})},Get:function(){var a=$.cookie(SN.C.S.StatusNetInstance);if(a!==null){return JSON.parse(a)}return null},Delete:function(){$.cookie(SN.C.S.StatusNetInstance,null)}},belongsOnTimeline:function(b){var a=$("body").attr("id");if(a=="public"){return true}var c=$("#nav_profile a").attr("href");if(c){var d=$(b).find(".entry-title .author a.url").attr("href");if(d==c){if(a=="all"||a=="showstream"){return true}}}return false}},Init:{NoticeForm:function(){if($("body.user_in").length>0){SN.U.NoticeLocationAttach();$("."+SN.C.S.FormNotice).each(function(){SN.U.FormNoticeXHR($(this));SN.U.FormNoticeEnhancements($(this))});SN.U.NoticeDataAttach()}},Notices:function(){if($("body.user_in").length>0){SN.U.NoticeFavor();SN.U.NoticeRepeat();SN.U.NoticeReply();SN.U.NoticeInlineReplySetup()}SN.U.NoticeAttachments()},EntityActions:function(){if($("body.user_in").length>0){$(".form_user_subscribe").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_user_unsubscribe").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_group_join").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_group_leave").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_user_nudge").live("click",function(){SN.U.FormXHR($(this));return false});SN.U.NewDirectMessage()}},Login:function(){if(SN.U.StatusNetInstance.Get()!==null){var a=SN.U.StatusNetInstance.Get().Nickname;if(a!==null){$("#form_login #nickname").val(a)}}$("#form_login").bind("submit",function(){SN.U.StatusNetInstance.Set({Nickname:$("#form_login #nickname").val()});return true})},UploadForms:function(){$("input[type=file]").change(function(d){if(typeof this.files=="object"&&this.files.length>0){var c=0;for(var b=0;b<this.files.length;b++){c+=this.files[b].size}var a=SN.U.maxFileSize($(this.form));if(a>0&&c>a){var e="File too large: maximum upload size is %d bytes.";alert(e.replace("%d",a));$(this).val("");d.preventDefault();return false}}})}}};$(document).ready(function(){SN.Init.UploadForms();if($("."+SN.C.S.FormNotice).length>0){SN.Init.NoticeForm()}if($("#content .notices").length>0){SN.Init.Notices()}if($("#content .entity_actions").length>0){SN.Init.EntityActions()}if($("#form_login").length>0){SN.Init.Login()}});if(!document.ELEMENT_NODE){document.ELEMENT_NODE=1;document.ATTRIBUTE_NODE=2;document.TEXT_NODE=3;document.CDATA_SECTION_NODE=4;document.ENTITY_REFERENCE_NODE=5;document.ENTITY_NODE=6;document.PROCESSING_INSTRUCTION_NODE=7;document.COMMENT_NODE=8;document.DOCUMENT_NODE=9;document.DOCUMENT_TYPE_NODE=10;document.DOCUMENT_FRAGMENT_NODE=11;document.NOTATION_NODE=12}document._importNode=function(e,a){switch(e.nodeType){case document.ELEMENT_NODE:var d=document.createElement(e.nodeName);if(e.attributes&&e.attributes.length>0){for(var c=0,b=e.attributes.length;c<b;){if(e.attributes[c].nodeName=="class"){d.className=e.getAttribute(e.attributes[c++].nodeName)}else{d.setAttribute(e.attributes[c].nodeName,e.getAttribute(e.attributes[c++].nodeName))}}}if(a&&e.childNodes&&e.childNodes.length>0){for(var c=0,b=e.childNodes.length;c<b;){d.appendChild(document._importNode(e.childNodes[c++],a))}}return d;break;case document.TEXT_NODE:case document.CDATA_SECTION_NODE:case document.COMMENT_NODE:return document.createTextNode(e.nodeValue);break}};if(typeof navigator.geolocation=="undefined"||navigator.geolocation.shim){(function(){(function(){if(window.google&&google.gears){return}var c=null;if(typeof GearsFactory!="undefined"){c=new GearsFactory()}else{try{c=new ActiveXObject("Gears.Factory");if(c.getBuildInfo().indexOf("ie_mobile")!=-1){c.privateSetGlobalObject(this)}}catch(d){if((typeof navigator.mimeTypes!="undefined")&&navigator.mimeTypes["application/x-googlegears"]){c=document.createElement("object");c.style.display="none";c.width=0;c.height=0;c.type="application/x-googlegears";document.documentElement.appendChild(c)}}}if(!c){return}if(!window.google){google={}}if(!google.gears){google.gears={factory:c}}})();var a=(function(){var d=google.gears.factory.create("beta.geolocation");var c=function(f,e){return function(g){f(g);e.lastPosition=g}};return{shim:true,type:"Gears",lastPosition:null,getCurrentPosition:function(e,g,h){var f=this;var i=c(e,f);d.getCurrentPosition(i,g,h)},watchPosition:function(e,f,g){d.watchPosition(e,f,g)},clearWatch:function(e){d.clearWatch(e)},getPermission:function(g,e,f){d.getPermission(g,e,f)}}});var b=(function(){var i=false;var e=function(){if(!d()&&!i){i=true;var j=document.createElement("script");j.src=(document.location.protocol=="https:"?"https://":"http://")+"www.google.com/jsapi?callback=_google_loader_apiLoaded";j.type="text/javascript";document.getElementsByTagName("body")[0].appendChild(j)}};var c=[];var h=function(j){c.push(j)};var f=function(){if(d()){while(c.length>0){var j=c.pop();j()}}};window._google_loader_apiLoaded=function(){f()};var d=function(){return(window.google&&google.loader)};var g=function(j){if(d()){return true}h(j);e();return false};e();return{shim:true,type:"ClientLocation",lastPosition:null,getCurrentPosition:function(k,n,o){var m=this;if(!g(function(){m.getCurrentPosition(k,n,o)})){return}if(google.loader.ClientLocation){var l=google.loader.ClientLocation;var j={coords:{latitude:l.latitude,longitude:l.longitude,altitude:null,accuracy:43000,altitudeAccuracy:null,heading:null,speed:null},address:{city:l.address.city,country:l.address.country,country_code:l.address.country_code,region:l.address.region},timestamp:new Date()};k(j);this.lastPosition=j}else{if(n==="function"){n({code:3,message:"Using the Google ClientLocation API and it is not able to calculate a location."})}}},watchPosition:function(j,l,m){this.getCurrentPosition(j,l,m);var k=this;var n=setInterval(function(){k.getCurrentPosition(j,l,m)},10000);return n},clearWatch:function(j){clearInterval(j)},getPermission:function(l,j,k){return true}}});navigator.geolocation=(window.google&&google.gears)?a():b()})()};
\ No newline at end of file

From 77a3017e9edaadb708922fce17b957048096852f Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Thu, 3 Mar 2011 16:53:16 -0800
Subject: [PATCH 383/655] Can now set $config['site']['minify'] = false; to use
 util.js and friends non-minified; aids in browser-side debugging.

---
 lib/action.php  | 8 +++++++-
 lib/default.php | 1 +
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/lib/action.php b/lib/action.php
index 9b5f571c61..31e52dfcf2 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -295,7 +295,13 @@ class Action extends HTMLOutputter // lawsuit
             }
             if (Event::handle('StartShowStatusNetScripts', array($this)) &&
                 Event::handle('StartShowLaconicaScripts', array($this))) {
-                $this->script('util.min.js');
+                if (common_config('site', 'minify')) {
+                    $this->script('util.min.js');
+                } else {
+                    $this->script('util.js');
+                    $this->script('xbImportNode.js');
+                    $this->script('geometa.js');
+                }
                 $this->showScriptMessages();
                 // Frame-busting code to avoid clickjacking attacks.
                 $this->inlineScript('if (window.top !== window.self) { window.top.location.href = window.self.location.href; }');
diff --git a/lib/default.php b/lib/default.php
index 6090217d18..c612557d69 100644
--- a/lib/default.php
+++ b/lib/default.php
@@ -63,6 +63,7 @@ $default =
               'use_x_sendfile' => false,
               'notice' => null, // site wide notice text
               'build' => 1, // build number, for code-dependent cache
+              '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',

From 1ff17f0ed9f9f9314cebef7149f03e1a0ddc094f Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Thu, 3 Mar 2011 16:56:54 -0800
Subject: [PATCH 384/655] Notice form cleanup: removing hardcoded IDs from
 attachment handling (prep for reusable notice forms)

---
 js/util.js                        | 46 ++++++++++++++-----------------
 js/util.min.js                    |  2 +-
 theme/base/css/display.css        |  4 +--
 theme/base/css/ie.css             |  4 +--
 theme/biz/css/base.css            |  2 +-
 theme/clean/css/ie.css            |  4 +--
 theme/cleaner/css/ie.css          |  4 +--
 theme/cloudy/css/display.css      |  6 ++--
 theme/mnml/css/display.css        |  4 +--
 theme/mnml/css/ie.css             |  4 +--
 theme/pigeonthoughts/css/base.css |  4 +--
 theme/rebase/css/display.css      |  4 +--
 theme/rebase/css/ie.css           |  4 +--
 theme/shiny/css/ie.css            |  4 +--
 14 files changed, 46 insertions(+), 50 deletions(-)

diff --git a/js/util.js b/js/util.js
index ed8866aaa1..7edf5ee5b6 100644
--- a/js/util.js
+++ b/js/util.js
@@ -53,8 +53,6 @@ var SN = { // StatusNet
             NoticeDataText: 'notice_data-text',
             NoticeTextCount: 'notice_text-count',
             NoticeInReplyTo: 'notice_in-reply-to',
-            NoticeDataAttach: 'notice_data-attach',
-            NoticeDataAttachSelected: 'notice_data-attach_selected',
             NoticeActionSubmit: 'notice_action-submit',
             NoticeLat: 'notice_data-lat',
             NoticeLon: 'notice_data-lon',
@@ -368,7 +366,7 @@ var SN = { // StatusNet
                             if (parseInt(xhr.status) === 0 || jQuery.inArray(parseInt(xhr.status), SN.C.I.HTTP20x30x) >= 0) {
                                 form
                                     .resetForm()
-                                    .find('#'+SN.C.S.NoticeDataAttachSelected).remove();
+                                    .find('.attach-status').remove();
                                 SN.U.FormNoticeEnhancements(form);
                             }
                             else {
@@ -425,8 +423,8 @@ var SN = { // StatusNet
                             }
                         }
                         form.resetForm();
-                        form.find('#'+SN.C.S.NoticeInReplyTo).val('');
-                        form.find('#'+SN.C.S.NoticeDataAttachSelected).remove();
+                        form.find('[name=inreplyto]').val('');
+                        form.find('.attach-status').remove();
                         SN.U.FormNoticeEnhancements(form);
                     }
                 },
@@ -850,36 +848,34 @@ var SN = { // StatusNet
          *
          * This preview box will also allow removing the attachment
          * prior to posting.
+         *
+         * @param {jQuery} form
          */
-        NoticeDataAttach: function() {
-            NDA = $('#'+SN.C.S.NoticeDataAttach);
+        NoticeDataAttach: function(form) {
+            var NDA = form.find('input[type=file]');
             NDA.change(function(event) {
+                form.find('.attach-status').remove();
+
                 var filename = $(this).val();
                 if (!filename) {
                     // No file -- we've been tricked!
-                    $('#'+SN.C.S.NoticeDataAttachSelected).remove();
                     return false;
                 }
 
-                // @fixme appending filename straight in is potentially unsafe
-                S = '<div id="'+SN.C.S.NoticeDataAttachSelected+'" class="'+SN.C.S.Success+'"><code>'+filename+'</code> <button class="close">&#215;</button></div>';
-                NDAS = $('#'+SN.C.S.NoticeDataAttachSelected);
-                if (NDAS.length > 0) {
-                    NDAS.replaceWith(S);
-                }
-                else {
-                    $('#'+SN.C.S.FormNotice).append(S);
-                }
-                $('#'+SN.C.S.NoticeDataAttachSelected+' button').click(function(){
-                    $('#'+SN.C.S.NoticeDataAttachSelected).remove();
+                var attachStatus = $('<div class="attach-status '+SN.C.S.Success+'"><code></code> <button class="close">&#215;</button></div>');
+                attachStatus.find('code').text(filename);
+                attachStatus.find('button').click(function(){
+                    attachStatus.remove();
                     NDA.val('');
 
                     return false;
                 });
+                form.append(attachStatus);
+
                 if (typeof this.files == "object") {
                     // Some newer browsers will let us fetch the files for preview.
                     for (var i = 0; i < this.files.length; i++) {
-                        SN.U.PreviewAttach(this.files[i]);
+                        SN.U.PreviewAttach(form, this.files[i]);
                     }
                 }
             });
@@ -915,13 +911,14 @@ var SN = { // StatusNet
          * Known fail:
          * - Opera 10.63, 11 beta (no input.files interface)
          *
+         * @param {jQuery} form
          * @param {File} file
          *
          * @todo use configured thumbnail size
          * @todo detect pixel size?
          * @todo should we render a thumbnail to a canvas and then use the smaller image?
          */
-        PreviewAttach: function(file) {
+        PreviewAttach: function(form, file) {
             var tooltip = file.type + ' ' + Math.round(file.size / 1024) + 'KB';
             var preview = true;
 
@@ -981,11 +978,11 @@ var SN = { // StatusNet
                         .attr('alt', tooltip)
                         .attr('src', url)
                         .attr('style', 'height: 120px');
-                    $('#'+SN.C.S.NoticeDataAttachSelected).append(img);
+                    form.find('.attach-status').append(img);
                 });
             } else {
                 var img = $('<div></div>').text(tooltip);
-                $('#'+SN.C.S.NoticeDataAttachSelected).append(img);
+                form.find('.attach-status').append(img);
             }
         },
 
@@ -1365,9 +1362,8 @@ var SN = { // StatusNet
                 $('.'+SN.C.S.FormNotice).each(function() {
                     SN.U.FormNoticeXHR($(this));
                     SN.U.FormNoticeEnhancements($(this));
+                    SN.U.NoticeDataAttach($(this));
                 });
-
-                SN.U.NoticeDataAttach();
             }
         },
 
diff --git a/js/util.min.js b/js/util.min.js
index a61a905f60..7600ac9863 100644
--- a/js/util.min.js
+++ b/js/util.min.js
@@ -1 +1 @@
-var SN={C:{I:{CounterBlackout:false,MaxLength:140,PatternUsername:/^[0-9a-zA-Z\-_.]*$/,HTTP20x30x:[200,201,202,203,204,205,206,300,301,302,303,304,305,306,307]},S:{Disabled:"disabled",Warning:"warning",Error:"error",Success:"success",Processing:"processing",CommandResult:"command_result",FormNotice:"form_notice",NoticeDataText:"notice_data-text",NoticeTextCount:"notice_text-count",NoticeInReplyTo:"notice_in-reply-to",NoticeDataAttach:"notice_data-attach",NoticeDataAttachSelected:"notice_data-attach_selected",NoticeActionSubmit:"notice_action-submit",NoticeLat:"notice_data-lat",NoticeLon:"notice_data-lon",NoticeLocationId:"notice_data-location_id",NoticeLocationNs:"notice_data-location_ns",NoticeGeoName:"notice_data-geo_name",NoticeDataGeo:"notice_data-geo",NoticeDataGeoCookie:"NoticeDataGeo",NoticeDataGeoSelected:"notice_data-geo_selected",StatusNetInstance:"StatusNetInstance"}},messages:{},msg:function(a){if(typeof SN.messages[a]=="undefined"){return"["+a+"]"}else{return SN.messages[a]}},U:{FormNoticeEnhancements:function(b){if(jQuery.data(b[0],"ElementData")===undefined){MaxLength=b.find("#"+SN.C.S.NoticeTextCount).text();if(typeof(MaxLength)=="undefined"){MaxLength=SN.C.I.MaxLength}jQuery.data(b[0],"ElementData",{MaxLength:MaxLength});SN.U.Counter(b);NDT=b.find("#"+SN.C.S.NoticeDataText);NDT.bind("keyup",function(c){SN.U.Counter(b)});var a=function(c){window.setTimeout(function(){SN.U.Counter(b)},50)};NDT.bind("cut",a).bind("paste",a)}else{b.find("#"+SN.C.S.NoticeTextCount).text(jQuery.data(b[0],"ElementData").MaxLength)}},Counter:function(d){SN.C.I.FormNoticeCurrent=d;var b=jQuery.data(d[0],"ElementData").MaxLength;if(b<=0){return}var c=b-SN.U.CharacterCount(d);var a=d.find("#"+SN.C.S.NoticeTextCount);if(c.toString()!=a.text()){if(!SN.C.I.CounterBlackout||c===0){if(a.text()!=String(c)){a.text(c)}if(c<0){d.addClass(SN.C.S.Warning)}else{d.removeClass(SN.C.S.Warning)}if(!SN.C.I.CounterBlackout){SN.C.I.CounterBlackout=true;SN.C.I.FormNoticeCurrent=d;window.setTimeout("SN.U.ClearCounterBlackout(SN.C.I.FormNoticeCurrent);",500)}}}},CharacterCount:function(a){return a.find("#"+SN.C.S.NoticeDataText).val().length},ClearCounterBlackout:function(a){SN.C.I.CounterBlackout=false;SN.U.Counter(a)},RewriteAjaxAction:function(a){if(document.location.protocol=="https:"&&a.substr(0,5)=="http:"){return a.replace(/^http:\/\/[^:\/]+/,"https://"+document.location.host)}else{return a}},FormXHR:function(a){$.ajax({type:"POST",dataType:"xml",url:SN.U.RewriteAjaxAction(a.attr("action")),data:a.serialize()+"&ajax=1",beforeSend:function(b){a.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(c,d,b){alert(b||d)},success:function(b,c){if(typeof($("form",b)[0])!="undefined"){form_new=document._importNode($("form",b)[0],true);a.replaceWith(form_new)}else{a.replaceWith(document._importNode($("p",b)[0],true))}}})},FormNoticeXHR:function(b){SN.C.I.NoticeDataGeo={};b.append('<input type="hidden" name="ajax" value="1"/>');b.attr("action",SN.U.RewriteAjaxAction(b.attr("action")));var c=function(d,e){b.append($('<p class="form_response"></p>').addClass(d).text(e))};var a=function(){b.find(".form_response").remove()};b.ajaxForm({dataType:"xml",timeout:"60000",beforeSend:function(d){if(b.find("#"+SN.C.S.NoticeDataText)[0].value.length===0){b.addClass(SN.C.S.Warning);return false}b.addClass(SN.C.S.Processing).find("#"+SN.C.S.NoticeActionSubmit).addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled);SN.U.normalizeGeoData(b);return true},error:function(f,g,e){b.removeClass(SN.C.S.Processing).find("#"+SN.C.S.NoticeActionSubmit).removeClass(SN.C.S.Disabled).removeAttr(SN.C.S.Disabled,SN.C.S.Disabled);a();if(g=="timeout"){c("error","Sorry! We had trouble sending your notice. The servers are overloaded. Please try again, and contact the site administrator if this problem persists.")}else{var d=SN.U.GetResponseXML(f);if($("."+SN.C.S.Error,d).length>0){b.append(document._importNode($("."+SN.C.S.Error,d)[0],true))}else{if(parseInt(f.status)===0||jQuery.inArray(parseInt(f.status),SN.C.I.HTTP20x30x)>=0){b.resetForm().find("#"+SN.C.S.NoticeDataAttachSelected).remove();SN.U.FormNoticeEnhancements(b)}else{c("error","(Sorry! We had trouble sending your notice ("+f.status+" "+f.statusText+"). Please report the problem to the site administrator if this happens again.")}}}},success:function(i,k){a();var e=$("#"+SN.C.S.Error,i);if(e.length>0){c("error",e.text())}else{if($("body")[0].id=="bookmarklet"){self.close()}var d=$("#"+SN.C.S.CommandResult,i);if(d.length>0){c("success",d.text())}else{var h=document._importNode($("li",i)[0],true);var j=$("#notices_primary .notices:first");if(j.length>0&&SN.U.belongsOnTimeline(h)){if($("#"+h.id).length===0){var f=$("#"+SN.C.S.NoticeInReplyTo).val();var g="#notices_primary #notice-"+f;if($("body")[0].id=="conversation"){if(f.length>0&&$(g+" .notices").length<1){$(g).append('<ul class="notices"></ul>')}$($(g+" .notices")[0]).append(h)}else{j.prepend(h)}$("#"+h.id).css({display:"none"}).fadeIn(2500);SN.U.NoticeWithAttachment($("#"+h.id));SN.U.NoticeReplyTo($("#"+h.id))}}else{c("success",$("title",i).text())}}b.resetForm();b.find("#"+SN.C.S.NoticeInReplyTo).val("");b.find("#"+SN.C.S.NoticeDataAttachSelected).remove();SN.U.FormNoticeEnhancements(b)}},complete:function(d,e){b.removeClass(SN.C.S.Processing).find("#"+SN.C.S.NoticeActionSubmit).removeAttr(SN.C.S.Disabled).removeClass(SN.C.S.Disabled);$("#"+SN.C.S.NoticeLat).val(SN.C.I.NoticeDataGeo.NLat);$("#"+SN.C.S.NoticeLon).val(SN.C.I.NoticeDataGeo.NLon);if($("#"+SN.C.S.NoticeLocationNs)){$("#"+SN.C.S.NoticeLocationNs).val(SN.C.I.NoticeDataGeo.NLNS);$("#"+SN.C.S.NoticeLocationId).val(SN.C.I.NoticeDataGeo.NLID)}$("#"+SN.C.S.NoticeDataGeo).attr("checked",SN.C.I.NoticeDataGeo.NDG)}})},normalizeGeoData:function(a){SN.C.I.NoticeDataGeo.NLat=a.find("[name=lat]").val();SN.C.I.NoticeDataGeo.NLon=a.find("[name=lon]").val();SN.C.I.NoticeDataGeo.NLNS=a.find("[name=location_ns]").val();SN.C.I.NoticeDataGeo.NLID=a.find("[name=location_id]").val();SN.C.I.NoticeDataGeo.NDG=$("#"+SN.C.S.NoticeDataGeo).attr("checked");var b=$.cookie(SN.C.S.NoticeDataGeoCookie);if(b!==null&&b!="disabled"){b=JSON.parse(b);SN.C.I.NoticeDataGeo.NLat=a.find("[name=lat]").val(b.NLat).val();SN.C.I.NoticeDataGeo.NLon=a.find("[name=lon]").val(b.NLon).val();if(b.NLNS){SN.C.I.NoticeDataGeo.NLNS=a.find("[name=location_ns]").val(b.NLNS).val();SN.C.I.NoticeDataGeo.NLID=a.find("[name=location_id]").val(b.NLID).val()}else{a.find("[name=location_ns]").val("");a.find("[name=location_id]").val("")}}if(b=="disabled"){SN.C.I.NoticeDataGeo.NDG=$("#"+SN.C.S.NoticeDataGeo).attr("checked",false).attr("checked")}else{SN.C.I.NoticeDataGeo.NDG=$("#"+SN.C.S.NoticeDataGeo).attr("checked",true).attr("checked")}},GetResponseXML:function(b){try{return b.responseXML}catch(a){return(new DOMParser()).parseFromString(b.responseText,"text/xml")}},NoticeReply:function(){if($("#"+SN.C.S.NoticeDataText).length>0&&$("#content .notice_reply").length>0){$("#content .notice").each(function(){SN.U.NoticeReplyTo($(this))})}},NoticeReplyTo:function(a){a.find(".notice_reply").live("click",function(c){c.preventDefault();var b=($(".author .nickname",a).length>0)?$($(".author .nickname",a)[0]):$(".author .nickname.uid");SN.U.NoticeInlineReplyTrigger(a,"@"+b.text());return false})},NoticeInlineReplyTrigger:function(h,i){var c=$($(".notice_id",h)[0]).text();var d=h;var f=h.closest(".notices");if(f.hasClass("threaded-replies")){d=f.closest(".notice")}else{f=$("ul.threaded-replies",h);if(f.length==0){f=$('<ul class="notices threaded-replies xoxo"></ul>');h.append(f)}}var k=$(".notice-reply-form",f);if(k.length==0){$("li.notice-reply-placeholder").remove();var g=$("li.notice-reply",f);if(g.length==0){g=$('<li class="notice-reply"><form class="notice-reply-form" method="post"><textarea name="status_textarea"></textarea><div class="controls"><input type="hidden" name="token"><input type="hidden" name="inreplyto"><input type="submit" class="submit"></div></form></li>');var b=$("#form_notice");k=g.find("form");k.attr("action",b.attr("action"));k.find('input[name="token"]').val(b.find("input[name=token]").val());k.find('input[type="submit"]').val(SN.msg("reply_submit"));f.append(g);k.find("textarea").blur(function(){var m=$(this);var l=$.trim(m.val());if(l==""||l==m.data("initialText")){g.remove();if(f.find("li").length>0){SN.U.NoticeInlineReplyPlaceholder(d)}else{f.remove()}}});k.submit(function(m){var l=k;$.ajax({type:"POST",dataType:"xml",url:SN.U.RewriteAjaxAction(l.attr("action")),data:l.serialize()+"&ajax=1",beforeSend:function(n){l.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled).end().find("textarea").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(o,p,n){alert(n||p)},success:function(p,r){var o=$("li",p)[0];if(o){var n=document._importNode(o,true);var q=$(n).attr("id");if($("#"+q).length==0){g.replaceWith(n);SN.U.NoticeInlineReplyPlaceholder(d)}else{g.remove()}}}});m.preventDefault();return false})}}k.find("input[name=inreplyto]").val(c);var j=k.find("textarea");if(j.length==0){throw"No textarea"}var a="";if(i){a=i+" "}j.val(a+j.val().replace(RegExp(a,"i"),""));j.data("initialText",$.trim(i+""));j.focus();if(j[0].setSelectionRange){var e=j.val().length;j[0].setSelectionRange(e,e)}},NoticeReplySet:function(b,d){if(b.match(SN.C.I.PatternUsername)){var c=$("#"+SN.C.S.NoticeDataText);if(c.length>0){replyto="@"+b+" ";c.val(replyto+c.val().replace(RegExp(replyto,"i"),""));$("#"+SN.C.S.FormNotice+" #"+SN.C.S.NoticeInReplyTo).val(d);c[0].focus();if(c[0].setSelectionRange){var a=c.val().length;c[0].setSelectionRange(a,a)}}}},NoticeFavor:function(){$(".form_favor").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_disfavor").live("click",function(){SN.U.FormXHR($(this));return false})},NoticeInlineReplyPlaceholder:function(b){var a=b.find("ul.threaded-replies");var c=$('<li class="notice-reply-placeholder"><input class="placeholder"></li>');c.click(function(){SN.U.NoticeInlineReplyTrigger(b)});c.find("input").val(SN.msg("reply_placeholder"));a.append(c)},NoticeInlineReplySetup:function(){$(".threaded-replies").each(function(){var b=$(this);var a=b.closest(".notice");SN.U.NoticeInlineReplyPlaceholder(a)})},NoticeRepeat:function(){$(".form_repeat").live("click",function(a){a.preventDefault();SN.U.NoticeRepeatConfirmation($(this));return false})},NoticeRepeatConfirmation:function(a){var c=a.find(".submit");var b=c.clone();b.addClass("submit_dialogbox").removeClass("submit");a.append(b);b.bind("click",function(){SN.U.FormXHR(a);return false});c.hide();a.addClass("dialogbox").append('<button class="close">&#215;</button>').closest(".notice-options").addClass("opaque");a.find("button.close").click(function(){$(this).remove();a.removeClass("dialogbox").closest(".notice-options").removeClass("opaque");a.find(".submit_dialogbox").remove();a.find(".submit").show();return false})},NoticeAttachments:function(){$(".notice a.attachment").each(function(){SN.U.NoticeWithAttachment($(this).closest(".notice"))})},NoticeWithAttachment:function(b){if(b.find(".attachment").length===0){return}var a=b.find(".attachment.more");if(a.length>0){$(a[0]).click(function(){var c=$(this);c.addClass(SN.C.S.Processing);$.get(c.attr("href")+"/ajax",null,function(d){c.parent(".entry-content").html($(d).find("#attachment_view .entry-content").html())});return false}).attr("title",SN.msg("showmore_tooltip"))}},NoticeDataAttach:function(){NDA=$("#"+SN.C.S.NoticeDataAttach);NDA.change(function(c){var a=$(this).val();if(!a){$("#"+SN.C.S.NoticeDataAttachSelected).remove();return false}S='<div id="'+SN.C.S.NoticeDataAttachSelected+'" class="'+SN.C.S.Success+'"><code>'+a+'</code> <button class="close">&#215;</button></div>';NDAS=$("#"+SN.C.S.NoticeDataAttachSelected);if(NDAS.length>0){NDAS.replaceWith(S)}else{$("#"+SN.C.S.FormNotice).append(S)}$("#"+SN.C.S.NoticeDataAttachSelected+" button").click(function(){$("#"+SN.C.S.NoticeDataAttachSelected).remove();NDA.val("");return false});if(typeof this.files=="object"){for(var b=0;b<this.files.length;b++){SN.U.PreviewAttach(this.files[b])}}})},maxFileSize:function(b){var a=$(b).find("input[name=MAX_FILE_SIZE]").attr("value");if(a){return parseInt(a)}else{return 0}},PreviewAttach:function(c){var d=c.type+" "+Math.round(c.size/1024)+"KB";var e=true;var g;if(typeof window.createObjectURL!="undefined"){g=function(h,i){i(window.createObjectURL(h))}}else{if(typeof window.FileReader!="undefined"){g=function(i,j){var h=new FileReader();h.onload=function(k){j(h.result)};h.readAsDataURL(i)}}else{e=false}}var a=["image/png","image/jpeg","image/gif","image/svg+xml"];if($.inArray(c.type,a)==-1){e=false}var f=8*1024*1024;if(c.size>f){e=false}if(e){g(c,function(i){var h=$("<img>").attr("title",d).attr("alt",d).attr("src",i).attr("style","height: 120px");$("#"+SN.C.S.NoticeDataAttachSelected).append(h)})}else{var b=$("<div></div>").text(d);$("#"+SN.C.S.NoticeDataAttachSelected).append(b)}},NoticeLocationAttach:function(){var c=$("#"+SN.C.S.NoticeLat).val();var h=$("#"+SN.C.S.NoticeLon).val();var d=$("#"+SN.C.S.NoticeLocationNs).val();var i=$("#"+SN.C.S.NoticeLocationId).val();var a=$("#"+SN.C.S.NoticeGeoName).text();var b=$("#"+SN.C.S.NoticeDataGeo);function e(k){$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",jQuery.trim($("label[for="+SN.C.S.NoticeDataGeo+"]").text())).removeClass("checked");$("#"+SN.C.S.NoticeLat).val("");$("#"+SN.C.S.NoticeLon).val("");$("#"+SN.C.S.NoticeLocationNs).val("");$("#"+SN.C.S.NoticeLocationId).val("");$("#"+SN.C.S.NoticeDataGeo).attr("checked",false);$.cookie(SN.C.S.NoticeDataGeoCookie,"disabled",{path:"/"});if(k){$(".geo_status_wrapper").removeClass("success").addClass("error");$(".geo_status_wrapper .geo_status").text(k)}else{$(".geo_status_wrapper").remove()}}function j(k,l){SN.U.NoticeGeoStatus("Looking up place name...");$.getJSON(k,l,function(m){var n,o;if(typeof(m.location_ns)!="undefined"){$("#"+SN.C.S.NoticeLocationNs).val(m.location_ns);n=m.location_ns}if(typeof(m.location_id)!="undefined"){$("#"+SN.C.S.NoticeLocationId).val(m.location_id);o=m.location_id}if(typeof(m.name)=="undefined"){NLN_text=l.lat+";"+l.lon}else{NLN_text=m.name}SN.U.NoticeGeoStatus(NLN_text,l.lat,l.lon,m.url);$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",NoticeDataGeo_text.ShareDisable+" ("+NLN_text+")");$("#"+SN.C.S.NoticeLat).val(l.lat);$("#"+SN.C.S.NoticeLon).val(l.lon);$("#"+SN.C.S.NoticeLocationNs).val(n);$("#"+SN.C.S.NoticeLocationId).val(o);$("#"+SN.C.S.NoticeDataGeo).attr("checked",true);var p={NLat:l.lat,NLon:l.lon,NLNS:n,NLID:o,NLN:NLN_text,NLNU:m.url,NDG:true};$.cookie(SN.C.S.NoticeDataGeoCookie,JSON.stringify(p),{path:"/"})})}if(b.length>0){if($.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){b.attr("checked",false)}else{b.attr("checked",true)}var f=$("#notice_data-geo_wrap");var g=f.attr("title");f.removeAttr("title");$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",jQuery.trim($("label[for="+SN.C.S.NoticeDataGeo+"]").text()));b.change(function(){if($("#"+SN.C.S.NoticeDataGeo).attr("checked")===true||$.cookie(SN.C.S.NoticeDataGeoCookie)===null){$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",NoticeDataGeo_text.ShareDisable).addClass("checked");if($.cookie(SN.C.S.NoticeDataGeoCookie)===null||$.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){if(navigator.geolocation){SN.U.NoticeGeoStatus("Requesting location from browser...");navigator.geolocation.getCurrentPosition(function(m){$("#"+SN.C.S.NoticeLat).val(m.coords.latitude);$("#"+SN.C.S.NoticeLon).val(m.coords.longitude);var n={lat:m.coords.latitude,lon:m.coords.longitude,token:$("#token").val()};j(g,n)},function(m){switch(m.code){case m.PERMISSION_DENIED:e("Location permission denied.");break;case m.TIMEOUT:e("Location lookup timeout.");break}},{timeout:10000})}else{if(c.length>0&&h.length>0){var k={lat:c,lon:h,token:$("#token").val()};j(g,k)}else{e();$("#"+SN.C.S.NoticeDataGeo).remove();$("label[for="+SN.C.S.NoticeDataGeo+"]").remove()}}}else{var l=JSON.parse($.cookie(SN.C.S.NoticeDataGeoCookie));$("#"+SN.C.S.NoticeLat).val(l.NLat);$("#"+SN.C.S.NoticeLon).val(l.NLon);$("#"+SN.C.S.NoticeLocationNs).val(l.NLNS);$("#"+SN.C.S.NoticeLocationId).val(l.NLID);$("#"+SN.C.S.NoticeDataGeo).attr("checked",l.NDG);SN.U.NoticeGeoStatus(l.NLN,l.NLat,l.NLon,l.NLNU);$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",NoticeDataGeo_text.ShareDisable+" ("+l.NLN+")").addClass("checked")}}else{e()}}).change()}},NoticeGeoStatus:function(a,f,g,c){var e=$("#form_notice");var h=e.find(".geo_status_wrapper");if(h.length==0){h=$('<div class="'+SN.C.S.Success+' geo_status_wrapper"><button class="close" style="float:right">&#215;</button><div class="geo_status"></div></div>');h.find("button.close").click(function(){$("#"+SN.C.S.NoticeDataGeo).removeAttr("checked").change()});e.append(h)}var b;if(c){b=$("<a></a>").attr("href",c)}else{b=$("<span></span>")}b.text(a);if(f||g){var d=f+";"+g;b.attr("title",d);if(!a){b.text(d)}}h.find(".geo_status").empty().append(b)},NewDirectMessage:function(){NDM=$(".entity_send-a-message a");NDM.attr({href:NDM.attr("href")+"&ajax=1"});NDM.bind("click",function(){var a=$(".entity_send-a-message form");if(a.length===0){$(this).addClass(SN.C.S.Processing);$.get(NDM.attr("href"),null,function(b){$(".entity_send-a-message").append(document._importNode($("form",b)[0],true));a=$(".entity_send-a-message .form_notice");SN.U.FormNoticeXHR(a);SN.U.FormNoticeEnhancements(a);a.append('<button class="close">&#215;</button>');$(".entity_send-a-message button").click(function(){a.hide();return false});NDM.removeClass(SN.C.S.Processing)})}else{a.show();$(".entity_send-a-message textarea").focus()}return false})},GetFullYear:function(c,d,a){var b=new Date();b.setFullYear(c,d,a);return b},StatusNetInstance:{Set:function(b){var a=SN.U.StatusNetInstance.Get();if(a!==null){b=$.extend(a,b)}$.cookie(SN.C.S.StatusNetInstance,JSON.stringify(b),{path:"/",expires:SN.U.GetFullYear(2029,0,1)})},Get:function(){var a=$.cookie(SN.C.S.StatusNetInstance);if(a!==null){return JSON.parse(a)}return null},Delete:function(){$.cookie(SN.C.S.StatusNetInstance,null)}},belongsOnTimeline:function(b){var a=$("body").attr("id");if(a=="public"){return true}var c=$("#nav_profile a").attr("href");if(c){var d=$(b).find(".entry-title .author a.url").attr("href");if(d==c){if(a=="all"||a=="showstream"){return true}}}return false}},Init:{NoticeForm:function(){if($("body.user_in").length>0){SN.U.NoticeLocationAttach();$("."+SN.C.S.FormNotice).each(function(){SN.U.FormNoticeXHR($(this));SN.U.FormNoticeEnhancements($(this))});SN.U.NoticeDataAttach()}},Notices:function(){if($("body.user_in").length>0){SN.U.NoticeFavor();SN.U.NoticeRepeat();SN.U.NoticeReply();SN.U.NoticeInlineReplySetup()}SN.U.NoticeAttachments()},EntityActions:function(){if($("body.user_in").length>0){$(".form_user_subscribe").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_user_unsubscribe").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_group_join").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_group_leave").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_user_nudge").live("click",function(){SN.U.FormXHR($(this));return false});SN.U.NewDirectMessage()}},Login:function(){if(SN.U.StatusNetInstance.Get()!==null){var a=SN.U.StatusNetInstance.Get().Nickname;if(a!==null){$("#form_login #nickname").val(a)}}$("#form_login").bind("submit",function(){SN.U.StatusNetInstance.Set({Nickname:$("#form_login #nickname").val()});return true})},UploadForms:function(){$("input[type=file]").change(function(d){if(typeof this.files=="object"&&this.files.length>0){var c=0;for(var b=0;b<this.files.length;b++){c+=this.files[b].size}var a=SN.U.maxFileSize($(this.form));if(a>0&&c>a){var e="File too large: maximum upload size is %d bytes.";alert(e.replace("%d",a));$(this).val("");d.preventDefault();return false}}})}}};$(document).ready(function(){SN.Init.UploadForms();if($("."+SN.C.S.FormNotice).length>0){SN.Init.NoticeForm()}if($("#content .notices").length>0){SN.Init.Notices()}if($("#content .entity_actions").length>0){SN.Init.EntityActions()}if($("#form_login").length>0){SN.Init.Login()}});if(!document.ELEMENT_NODE){document.ELEMENT_NODE=1;document.ATTRIBUTE_NODE=2;document.TEXT_NODE=3;document.CDATA_SECTION_NODE=4;document.ENTITY_REFERENCE_NODE=5;document.ENTITY_NODE=6;document.PROCESSING_INSTRUCTION_NODE=7;document.COMMENT_NODE=8;document.DOCUMENT_NODE=9;document.DOCUMENT_TYPE_NODE=10;document.DOCUMENT_FRAGMENT_NODE=11;document.NOTATION_NODE=12}document._importNode=function(e,a){switch(e.nodeType){case document.ELEMENT_NODE:var d=document.createElement(e.nodeName);if(e.attributes&&e.attributes.length>0){for(var c=0,b=e.attributes.length;c<b;){if(e.attributes[c].nodeName=="class"){d.className=e.getAttribute(e.attributes[c++].nodeName)}else{d.setAttribute(e.attributes[c].nodeName,e.getAttribute(e.attributes[c++].nodeName))}}}if(a&&e.childNodes&&e.childNodes.length>0){for(var c=0,b=e.childNodes.length;c<b;){d.appendChild(document._importNode(e.childNodes[c++],a))}}return d;break;case document.TEXT_NODE:case document.CDATA_SECTION_NODE:case document.COMMENT_NODE:return document.createTextNode(e.nodeValue);break}};if(typeof navigator.geolocation=="undefined"||navigator.geolocation.shim){(function(){(function(){if(window.google&&google.gears){return}var c=null;if(typeof GearsFactory!="undefined"){c=new GearsFactory()}else{try{c=new ActiveXObject("Gears.Factory");if(c.getBuildInfo().indexOf("ie_mobile")!=-1){c.privateSetGlobalObject(this)}}catch(d){if((typeof navigator.mimeTypes!="undefined")&&navigator.mimeTypes["application/x-googlegears"]){c=document.createElement("object");c.style.display="none";c.width=0;c.height=0;c.type="application/x-googlegears";document.documentElement.appendChild(c)}}}if(!c){return}if(!window.google){google={}}if(!google.gears){google.gears={factory:c}}})();var a=(function(){var d=google.gears.factory.create("beta.geolocation");var c=function(f,e){return function(g){f(g);e.lastPosition=g}};return{shim:true,type:"Gears",lastPosition:null,getCurrentPosition:function(e,g,h){var f=this;var i=c(e,f);d.getCurrentPosition(i,g,h)},watchPosition:function(e,f,g){d.watchPosition(e,f,g)},clearWatch:function(e){d.clearWatch(e)},getPermission:function(g,e,f){d.getPermission(g,e,f)}}});var b=(function(){var i=false;var e=function(){if(!d()&&!i){i=true;var j=document.createElement("script");j.src=(document.location.protocol=="https:"?"https://":"http://")+"www.google.com/jsapi?callback=_google_loader_apiLoaded";j.type="text/javascript";document.getElementsByTagName("body")[0].appendChild(j)}};var c=[];var h=function(j){c.push(j)};var f=function(){if(d()){while(c.length>0){var j=c.pop();j()}}};window._google_loader_apiLoaded=function(){f()};var d=function(){return(window.google&&google.loader)};var g=function(j){if(d()){return true}h(j);e();return false};e();return{shim:true,type:"ClientLocation",lastPosition:null,getCurrentPosition:function(k,n,o){var m=this;if(!g(function(){m.getCurrentPosition(k,n,o)})){return}if(google.loader.ClientLocation){var l=google.loader.ClientLocation;var j={coords:{latitude:l.latitude,longitude:l.longitude,altitude:null,accuracy:43000,altitudeAccuracy:null,heading:null,speed:null},address:{city:l.address.city,country:l.address.country,country_code:l.address.country_code,region:l.address.region},timestamp:new Date()};k(j);this.lastPosition=j}else{if(n==="function"){n({code:3,message:"Using the Google ClientLocation API and it is not able to calculate a location."})}}},watchPosition:function(j,l,m){this.getCurrentPosition(j,l,m);var k=this;var n=setInterval(function(){k.getCurrentPosition(j,l,m)},10000);return n},clearWatch:function(j){clearInterval(j)},getPermission:function(l,j,k){return true}}});navigator.geolocation=(window.google&&google.gears)?a():b()})()};
\ No newline at end of file
+var SN={C:{I:{CounterBlackout:false,MaxLength:140,PatternUsername:/^[0-9a-zA-Z\-_.]*$/,HTTP20x30x:[200,201,202,203,204,205,206,300,301,302,303,304,305,306,307]},S:{Disabled:"disabled",Warning:"warning",Error:"error",Success:"success",Processing:"processing",CommandResult:"command_result",FormNotice:"form_notice",NoticeDataText:"notice_data-text",NoticeTextCount:"notice_text-count",NoticeInReplyTo:"notice_in-reply-to",NoticeActionSubmit:"notice_action-submit",NoticeLat:"notice_data-lat",NoticeLon:"notice_data-lon",NoticeLocationId:"notice_data-location_id",NoticeLocationNs:"notice_data-location_ns",NoticeGeoName:"notice_data-geo_name",NoticeDataGeo:"notice_data-geo",NoticeDataGeoCookie:"NoticeDataGeo",NoticeDataGeoSelected:"notice_data-geo_selected",StatusNetInstance:"StatusNetInstance"}},messages:{},msg:function(a){if(typeof SN.messages[a]=="undefined"){return"["+a+"]"}else{return SN.messages[a]}},U:{FormNoticeEnhancements:function(b){if(jQuery.data(b[0],"ElementData")===undefined){MaxLength=b.find("#"+SN.C.S.NoticeTextCount).text();if(typeof(MaxLength)=="undefined"){MaxLength=SN.C.I.MaxLength}jQuery.data(b[0],"ElementData",{MaxLength:MaxLength});SN.U.Counter(b);NDT=b.find("#"+SN.C.S.NoticeDataText);NDT.bind("keyup",function(c){SN.U.Counter(b)});var a=function(c){window.setTimeout(function(){SN.U.Counter(b)},50)};NDT.bind("cut",a).bind("paste",a)}else{b.find("#"+SN.C.S.NoticeTextCount).text(jQuery.data(b[0],"ElementData").MaxLength)}},Counter:function(d){SN.C.I.FormNoticeCurrent=d;var b=jQuery.data(d[0],"ElementData").MaxLength;if(b<=0){return}var c=b-SN.U.CharacterCount(d);var a=d.find("#"+SN.C.S.NoticeTextCount);if(c.toString()!=a.text()){if(!SN.C.I.CounterBlackout||c===0){if(a.text()!=String(c)){a.text(c)}if(c<0){d.addClass(SN.C.S.Warning)}else{d.removeClass(SN.C.S.Warning)}if(!SN.C.I.CounterBlackout){SN.C.I.CounterBlackout=true;SN.C.I.FormNoticeCurrent=d;window.setTimeout("SN.U.ClearCounterBlackout(SN.C.I.FormNoticeCurrent);",500)}}}},CharacterCount:function(a){return a.find("#"+SN.C.S.NoticeDataText).val().length},ClearCounterBlackout:function(a){SN.C.I.CounterBlackout=false;SN.U.Counter(a)},RewriteAjaxAction:function(a){if(document.location.protocol=="https:"&&a.substr(0,5)=="http:"){return a.replace(/^http:\/\/[^:\/]+/,"https://"+document.location.host)}else{return a}},FormXHR:function(a){$.ajax({type:"POST",dataType:"xml",url:SN.U.RewriteAjaxAction(a.attr("action")),data:a.serialize()+"&ajax=1",beforeSend:function(b){a.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(c,d,b){alert(b||d)},success:function(b,c){if(typeof($("form",b)[0])!="undefined"){form_new=document._importNode($("form",b)[0],true);a.replaceWith(form_new)}else{a.replaceWith(document._importNode($("p",b)[0],true))}}})},FormNoticeXHR:function(b){SN.C.I.NoticeDataGeo={};b.append('<input type="hidden" name="ajax" value="1"/>');b.attr("action",SN.U.RewriteAjaxAction(b.attr("action")));var c=function(d,e){b.append($('<p class="form_response"></p>').addClass(d).text(e))};var a=function(){b.find(".form_response").remove()};b.ajaxForm({dataType:"xml",timeout:"60000",beforeSend:function(d){if(b.find("#"+SN.C.S.NoticeDataText)[0].value.length===0){b.addClass(SN.C.S.Warning);return false}b.addClass(SN.C.S.Processing).find("#"+SN.C.S.NoticeActionSubmit).addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled);SN.U.normalizeGeoData(b);return true},error:function(f,g,e){b.removeClass(SN.C.S.Processing).find("#"+SN.C.S.NoticeActionSubmit).removeClass(SN.C.S.Disabled).removeAttr(SN.C.S.Disabled,SN.C.S.Disabled);a();if(g=="timeout"){c("error","Sorry! We had trouble sending your notice. The servers are overloaded. Please try again, and contact the site administrator if this problem persists.")}else{var d=SN.U.GetResponseXML(f);if($("."+SN.C.S.Error,d).length>0){b.append(document._importNode($("."+SN.C.S.Error,d)[0],true))}else{if(parseInt(f.status)===0||jQuery.inArray(parseInt(f.status),SN.C.I.HTTP20x30x)>=0){b.resetForm().find(".attach-status").remove();SN.U.FormNoticeEnhancements(b)}else{c("error","(Sorry! We had trouble sending your notice ("+f.status+" "+f.statusText+"). Please report the problem to the site administrator if this happens again.")}}}},success:function(i,k){a();var e=$("#"+SN.C.S.Error,i);if(e.length>0){c("error",e.text())}else{if($("body")[0].id=="bookmarklet"){self.close()}var d=$("#"+SN.C.S.CommandResult,i);if(d.length>0){c("success",d.text())}else{var h=document._importNode($("li",i)[0],true);var j=$("#notices_primary .notices:first");if(j.length>0&&SN.U.belongsOnTimeline(h)){if($("#"+h.id).length===0){var f=$("#"+SN.C.S.NoticeInReplyTo).val();var g="#notices_primary #notice-"+f;if($("body")[0].id=="conversation"){if(f.length>0&&$(g+" .notices").length<1){$(g).append('<ul class="notices"></ul>')}$($(g+" .notices")[0]).append(h)}else{j.prepend(h)}$("#"+h.id).css({display:"none"}).fadeIn(2500);SN.U.NoticeWithAttachment($("#"+h.id));SN.U.NoticeReplyTo($("#"+h.id))}}else{c("success",$("title",i).text())}}b.resetForm();b.find("[name=inreplyto]").val("");b.find(".attach-status").remove();SN.U.FormNoticeEnhancements(b)}},complete:function(d,e){b.removeClass(SN.C.S.Processing).find("#"+SN.C.S.NoticeActionSubmit).removeAttr(SN.C.S.Disabled).removeClass(SN.C.S.Disabled);$("#"+SN.C.S.NoticeLat).val(SN.C.I.NoticeDataGeo.NLat);$("#"+SN.C.S.NoticeLon).val(SN.C.I.NoticeDataGeo.NLon);if($("#"+SN.C.S.NoticeLocationNs)){$("#"+SN.C.S.NoticeLocationNs).val(SN.C.I.NoticeDataGeo.NLNS);$("#"+SN.C.S.NoticeLocationId).val(SN.C.I.NoticeDataGeo.NLID)}$("#"+SN.C.S.NoticeDataGeo).attr("checked",SN.C.I.NoticeDataGeo.NDG)}})},normalizeGeoData:function(a){SN.C.I.NoticeDataGeo.NLat=a.find("[name=lat]").val();SN.C.I.NoticeDataGeo.NLon=a.find("[name=lon]").val();SN.C.I.NoticeDataGeo.NLNS=a.find("[name=location_ns]").val();SN.C.I.NoticeDataGeo.NLID=a.find("[name=location_id]").val();SN.C.I.NoticeDataGeo.NDG=$("#"+SN.C.S.NoticeDataGeo).attr("checked");var b=$.cookie(SN.C.S.NoticeDataGeoCookie);if(b!==null&&b!="disabled"){b=JSON.parse(b);SN.C.I.NoticeDataGeo.NLat=a.find("[name=lat]").val(b.NLat).val();SN.C.I.NoticeDataGeo.NLon=a.find("[name=lon]").val(b.NLon).val();if(b.NLNS){SN.C.I.NoticeDataGeo.NLNS=a.find("[name=location_ns]").val(b.NLNS).val();SN.C.I.NoticeDataGeo.NLID=a.find("[name=location_id]").val(b.NLID).val()}else{a.find("[name=location_ns]").val("");a.find("[name=location_id]").val("")}}if(b=="disabled"){SN.C.I.NoticeDataGeo.NDG=$("#"+SN.C.S.NoticeDataGeo).attr("checked",false).attr("checked")}else{SN.C.I.NoticeDataGeo.NDG=$("#"+SN.C.S.NoticeDataGeo).attr("checked",true).attr("checked")}},GetResponseXML:function(b){try{return b.responseXML}catch(a){return(new DOMParser()).parseFromString(b.responseText,"text/xml")}},NoticeReply:function(){if($("#"+SN.C.S.NoticeDataText).length>0&&$("#content .notice_reply").length>0){$("#content .notice").each(function(){SN.U.NoticeReplyTo($(this))})}},NoticeReplyTo:function(a){a.find(".notice_reply").live("click",function(c){c.preventDefault();var b=($(".author .nickname",a).length>0)?$($(".author .nickname",a)[0]):$(".author .nickname.uid");SN.U.NoticeInlineReplyTrigger(a,"@"+b.text());return false})},NoticeInlineReplyTrigger:function(h,i){var c=$($(".notice_id",h)[0]).text();var d=h;var f=h.closest(".notices");if(f.hasClass("threaded-replies")){d=f.closest(".notice")}else{f=$("ul.threaded-replies",h);if(f.length==0){f=$('<ul class="notices threaded-replies xoxo"></ul>');h.append(f)}}var k=$(".notice-reply-form",f);if(k.length==0){$("li.notice-reply-placeholder").remove();var g=$("li.notice-reply",f);if(g.length==0){g=$('<li class="notice-reply"><form class="notice-reply-form" method="post"><textarea name="status_textarea"></textarea><div class="controls"><input type="hidden" name="token"><input type="hidden" name="inreplyto"><input type="submit" class="submit"></div></form></li>');var b=$("#form_notice");k=g.find("form");k.attr("action",b.attr("action"));k.find('input[name="token"]').val(b.find("input[name=token]").val());k.find('input[type="submit"]').val(SN.msg("reply_submit"));f.append(g);k.find("textarea").blur(function(){var m=$(this);var l=$.trim(m.val());if(l==""||l==m.data("initialText")){g.remove();if(f.find("li").length>0){SN.U.NoticeInlineReplyPlaceholder(d)}else{f.remove()}}});k.submit(function(m){var l=k;$.ajax({type:"POST",dataType:"xml",url:SN.U.RewriteAjaxAction(l.attr("action")),data:l.serialize()+"&ajax=1",beforeSend:function(n){l.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled).end().find("textarea").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(o,p,n){alert(n||p)},success:function(p,r){var o=$("li",p)[0];if(o){var n=document._importNode(o,true);var q=$(n).attr("id");if($("#"+q).length==0){g.replaceWith(n);SN.U.NoticeInlineReplyPlaceholder(d)}else{g.remove()}}}});m.preventDefault();return false})}}k.find("input[name=inreplyto]").val(c);var j=k.find("textarea");if(j.length==0){throw"No textarea"}var a="";if(i){a=i+" "}j.val(a+j.val().replace(RegExp(a,"i"),""));j.data("initialText",$.trim(i+""));j.focus();if(j[0].setSelectionRange){var e=j.val().length;j[0].setSelectionRange(e,e)}},NoticeReplySet:function(b,d){if(b.match(SN.C.I.PatternUsername)){var c=$("#"+SN.C.S.NoticeDataText);if(c.length>0){replyto="@"+b+" ";c.val(replyto+c.val().replace(RegExp(replyto,"i"),""));$("#"+SN.C.S.FormNotice+" #"+SN.C.S.NoticeInReplyTo).val(d);c[0].focus();if(c[0].setSelectionRange){var a=c.val().length;c[0].setSelectionRange(a,a)}}}},NoticeFavor:function(){$(".form_favor").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_disfavor").live("click",function(){SN.U.FormXHR($(this));return false})},NoticeInlineReplyPlaceholder:function(b){var a=b.find("ul.threaded-replies");var c=$('<li class="notice-reply-placeholder"><input class="placeholder"></li>');c.click(function(){SN.U.NoticeInlineReplyTrigger(b)});c.find("input").val(SN.msg("reply_placeholder"));a.append(c)},NoticeInlineReplySetup:function(){$(".threaded-replies").each(function(){var b=$(this);var a=b.closest(".notice");SN.U.NoticeInlineReplyPlaceholder(a)})},NoticeRepeat:function(){$(".form_repeat").live("click",function(a){a.preventDefault();SN.U.NoticeRepeatConfirmation($(this));return false})},NoticeRepeatConfirmation:function(a){var c=a.find(".submit");var b=c.clone();b.addClass("submit_dialogbox").removeClass("submit");a.append(b);b.bind("click",function(){SN.U.FormXHR(a);return false});c.hide();a.addClass("dialogbox").append('<button class="close">&#215;</button>').closest(".notice-options").addClass("opaque");a.find("button.close").click(function(){$(this).remove();a.removeClass("dialogbox").closest(".notice-options").removeClass("opaque");a.find(".submit_dialogbox").remove();a.find(".submit").show();return false})},NoticeAttachments:function(){$(".notice a.attachment").each(function(){SN.U.NoticeWithAttachment($(this).closest(".notice"))})},NoticeWithAttachment:function(b){if(b.find(".attachment").length===0){return}var a=b.find(".attachment.more");if(a.length>0){$(a[0]).click(function(){var c=$(this);c.addClass(SN.C.S.Processing);$.get(c.attr("href")+"/ajax",null,function(d){c.parent(".entry-content").html($(d).find("#attachment_view .entry-content").html())});return false}).attr("title",SN.msg("showmore_tooltip"))}},NoticeDataAttach:function(b){var a=b.find("input[type=file]");a.change(function(f){b.find(".attach-status").remove();var d=$(this).val();if(!d){return false}var c=$('<div class="attach-status '+SN.C.S.Success+'"><code></code> <button class="close">&#215;</button></div>');c.find("code").text(d);c.find("button").click(function(){c.remove();a.val("");return false});b.append(c);if(typeof this.files=="object"){for(var e=0;e<this.files.length;e++){SN.U.PreviewAttach(b,this.files[e])}}})},maxFileSize:function(b){var a=$(b).find("input[name=MAX_FILE_SIZE]").attr("value");if(a){return parseInt(a)}else{return 0}},PreviewAttach:function(d,c){var e=c.type+" "+Math.round(c.size/1024)+"KB";var f=true;var h;if(typeof window.createObjectURL!="undefined"){h=function(i,j){j(window.createObjectURL(i))}}else{if(typeof window.FileReader!="undefined"){h=function(j,k){var i=new FileReader();i.onload=function(l){k(i.result)};i.readAsDataURL(j)}}else{f=false}}var a=["image/png","image/jpeg","image/gif","image/svg+xml"];if($.inArray(c.type,a)==-1){f=false}var g=8*1024*1024;if(c.size>g){f=false}if(f){h(c,function(j){var i=$("<img>").attr("title",e).attr("alt",e).attr("src",j).attr("style","height: 120px");d.find(".attach-status").append(i)})}else{var b=$("<div></div>").text(e);d.find(".attach-status").append(b)}},NoticeLocationAttach:function(){var c=$("#"+SN.C.S.NoticeLat).val();var h=$("#"+SN.C.S.NoticeLon).val();var d=$("#"+SN.C.S.NoticeLocationNs).val();var i=$("#"+SN.C.S.NoticeLocationId).val();var a=$("#"+SN.C.S.NoticeGeoName).text();var b=$("#"+SN.C.S.NoticeDataGeo);function e(k){$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",jQuery.trim($("label[for="+SN.C.S.NoticeDataGeo+"]").text())).removeClass("checked");$("#"+SN.C.S.NoticeLat).val("");$("#"+SN.C.S.NoticeLon).val("");$("#"+SN.C.S.NoticeLocationNs).val("");$("#"+SN.C.S.NoticeLocationId).val("");$("#"+SN.C.S.NoticeDataGeo).attr("checked",false);$.cookie(SN.C.S.NoticeDataGeoCookie,"disabled",{path:"/"});if(k){$(".geo_status_wrapper").removeClass("success").addClass("error");$(".geo_status_wrapper .geo_status").text(k)}else{$(".geo_status_wrapper").remove()}}function j(k,l){SN.U.NoticeGeoStatus("Looking up place name...");$.getJSON(k,l,function(m){var n,o;if(typeof(m.location_ns)!="undefined"){$("#"+SN.C.S.NoticeLocationNs).val(m.location_ns);n=m.location_ns}if(typeof(m.location_id)!="undefined"){$("#"+SN.C.S.NoticeLocationId).val(m.location_id);o=m.location_id}if(typeof(m.name)=="undefined"){NLN_text=l.lat+";"+l.lon}else{NLN_text=m.name}SN.U.NoticeGeoStatus(NLN_text,l.lat,l.lon,m.url);$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",NoticeDataGeo_text.ShareDisable+" ("+NLN_text+")");$("#"+SN.C.S.NoticeLat).val(l.lat);$("#"+SN.C.S.NoticeLon).val(l.lon);$("#"+SN.C.S.NoticeLocationNs).val(n);$("#"+SN.C.S.NoticeLocationId).val(o);$("#"+SN.C.S.NoticeDataGeo).attr("checked",true);var p={NLat:l.lat,NLon:l.lon,NLNS:n,NLID:o,NLN:NLN_text,NLNU:m.url,NDG:true};$.cookie(SN.C.S.NoticeDataGeoCookie,JSON.stringify(p),{path:"/"})})}if(b.length>0){if($.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){b.attr("checked",false)}else{b.attr("checked",true)}var f=$("#notice_data-geo_wrap");var g=f.attr("title");f.removeAttr("title");$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",jQuery.trim($("label[for="+SN.C.S.NoticeDataGeo+"]").text()));b.change(function(){if($("#"+SN.C.S.NoticeDataGeo).attr("checked")===true||$.cookie(SN.C.S.NoticeDataGeoCookie)===null){$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",NoticeDataGeo_text.ShareDisable).addClass("checked");if($.cookie(SN.C.S.NoticeDataGeoCookie)===null||$.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){if(navigator.geolocation){SN.U.NoticeGeoStatus("Requesting location from browser...");navigator.geolocation.getCurrentPosition(function(m){$("#"+SN.C.S.NoticeLat).val(m.coords.latitude);$("#"+SN.C.S.NoticeLon).val(m.coords.longitude);var n={lat:m.coords.latitude,lon:m.coords.longitude,token:$("#token").val()};j(g,n)},function(m){switch(m.code){case m.PERMISSION_DENIED:e("Location permission denied.");break;case m.TIMEOUT:e("Location lookup timeout.");break}},{timeout:10000})}else{if(c.length>0&&h.length>0){var k={lat:c,lon:h,token:$("#token").val()};j(g,k)}else{e();$("#"+SN.C.S.NoticeDataGeo).remove();$("label[for="+SN.C.S.NoticeDataGeo+"]").remove()}}}else{var l=JSON.parse($.cookie(SN.C.S.NoticeDataGeoCookie));$("#"+SN.C.S.NoticeLat).val(l.NLat);$("#"+SN.C.S.NoticeLon).val(l.NLon);$("#"+SN.C.S.NoticeLocationNs).val(l.NLNS);$("#"+SN.C.S.NoticeLocationId).val(l.NLID);$("#"+SN.C.S.NoticeDataGeo).attr("checked",l.NDG);SN.U.NoticeGeoStatus(l.NLN,l.NLat,l.NLon,l.NLNU);$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",NoticeDataGeo_text.ShareDisable+" ("+l.NLN+")").addClass("checked")}}else{e()}}).change()}},NoticeGeoStatus:function(a,f,g,c){var e=$("#form_notice");var h=e.find(".geo_status_wrapper");if(h.length==0){h=$('<div class="'+SN.C.S.Success+' geo_status_wrapper"><button class="close" style="float:right">&#215;</button><div class="geo_status"></div></div>');h.find("button.close").click(function(){$("#"+SN.C.S.NoticeDataGeo).removeAttr("checked").change()});e.append(h)}var b;if(c){b=$("<a></a>").attr("href",c)}else{b=$("<span></span>")}b.text(a);if(f||g){var d=f+";"+g;b.attr("title",d);if(!a){b.text(d)}}h.find(".geo_status").empty().append(b)},NewDirectMessage:function(){NDM=$(".entity_send-a-message a");NDM.attr({href:NDM.attr("href")+"&ajax=1"});NDM.bind("click",function(){var a=$(".entity_send-a-message form");if(a.length===0){$(this).addClass(SN.C.S.Processing);$.get(NDM.attr("href"),null,function(b){$(".entity_send-a-message").append(document._importNode($("form",b)[0],true));a=$(".entity_send-a-message .form_notice");SN.U.FormNoticeXHR(a);SN.U.FormNoticeEnhancements(a);a.append('<button class="close">&#215;</button>');$(".entity_send-a-message button").click(function(){a.hide();return false});NDM.removeClass(SN.C.S.Processing)})}else{a.show();$(".entity_send-a-message textarea").focus()}return false})},GetFullYear:function(c,d,a){var b=new Date();b.setFullYear(c,d,a);return b},StatusNetInstance:{Set:function(b){var a=SN.U.StatusNetInstance.Get();if(a!==null){b=$.extend(a,b)}$.cookie(SN.C.S.StatusNetInstance,JSON.stringify(b),{path:"/",expires:SN.U.GetFullYear(2029,0,1)})},Get:function(){var a=$.cookie(SN.C.S.StatusNetInstance);if(a!==null){return JSON.parse(a)}return null},Delete:function(){$.cookie(SN.C.S.StatusNetInstance,null)}},belongsOnTimeline:function(b){var a=$("body").attr("id");if(a=="public"){return true}var c=$("#nav_profile a").attr("href");if(c){var d=$(b).find(".entry-title .author a.url").attr("href");if(d==c){if(a=="all"||a=="showstream"){return true}}}return false}},Init:{NoticeForm:function(){if($("body.user_in").length>0){SN.U.NoticeLocationAttach();$("."+SN.C.S.FormNotice).each(function(){SN.U.FormNoticeXHR($(this));SN.U.FormNoticeEnhancements($(this));SN.U.NoticeDataAttach($(this))})}},Notices:function(){if($("body.user_in").length>0){SN.U.NoticeFavor();SN.U.NoticeRepeat();SN.U.NoticeReply();SN.U.NoticeInlineReplySetup()}SN.U.NoticeAttachments()},EntityActions:function(){if($("body.user_in").length>0){$(".form_user_subscribe").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_user_unsubscribe").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_group_join").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_group_leave").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_user_nudge").live("click",function(){SN.U.FormXHR($(this));return false});SN.U.NewDirectMessage()}},Login:function(){if(SN.U.StatusNetInstance.Get()!==null){var a=SN.U.StatusNetInstance.Get().Nickname;if(a!==null){$("#form_login #nickname").val(a)}}$("#form_login").bind("submit",function(){SN.U.StatusNetInstance.Set({Nickname:$("#form_login #nickname").val()});return true})},UploadForms:function(){$("input[type=file]").change(function(d){if(typeof this.files=="object"&&this.files.length>0){var c=0;for(var b=0;b<this.files.length;b++){c+=this.files[b].size}var a=SN.U.maxFileSize($(this.form));if(a>0&&c>a){var e="File too large: maximum upload size is %d bytes.";alert(e.replace("%d",a));$(this).val("");d.preventDefault();return false}}})}}};$(document).ready(function(){SN.Init.UploadForms();if($("."+SN.C.S.FormNotice).length>0){SN.Init.NoticeForm()}if($("#content .notices").length>0){SN.Init.Notices()}if($("#content .entity_actions").length>0){SN.Init.EntityActions()}if($("#form_login").length>0){SN.Init.Login()}});if(!document.ELEMENT_NODE){document.ELEMENT_NODE=1;document.ATTRIBUTE_NODE=2;document.TEXT_NODE=3;document.CDATA_SECTION_NODE=4;document.ENTITY_REFERENCE_NODE=5;document.ENTITY_NODE=6;document.PROCESSING_INSTRUCTION_NODE=7;document.COMMENT_NODE=8;document.DOCUMENT_NODE=9;document.DOCUMENT_TYPE_NODE=10;document.DOCUMENT_FRAGMENT_NODE=11;document.NOTATION_NODE=12}document._importNode=function(e,a){switch(e.nodeType){case document.ELEMENT_NODE:var d=document.createElement(e.nodeName);if(e.attributes&&e.attributes.length>0){for(var c=0,b=e.attributes.length;c<b;){if(e.attributes[c].nodeName=="class"){d.className=e.getAttribute(e.attributes[c++].nodeName)}else{d.setAttribute(e.attributes[c].nodeName,e.getAttribute(e.attributes[c++].nodeName))}}}if(a&&e.childNodes&&e.childNodes.length>0){for(var c=0,b=e.childNodes.length;c<b;){d.appendChild(document._importNode(e.childNodes[c++],a))}}return d;break;case document.TEXT_NODE:case document.CDATA_SECTION_NODE:case document.COMMENT_NODE:return document.createTextNode(e.nodeValue);break}};if(typeof navigator.geolocation=="undefined"||navigator.geolocation.shim){(function(){(function(){if(window.google&&google.gears){return}var c=null;if(typeof GearsFactory!="undefined"){c=new GearsFactory()}else{try{c=new ActiveXObject("Gears.Factory");if(c.getBuildInfo().indexOf("ie_mobile")!=-1){c.privateSetGlobalObject(this)}}catch(d){if((typeof navigator.mimeTypes!="undefined")&&navigator.mimeTypes["application/x-googlegears"]){c=document.createElement("object");c.style.display="none";c.width=0;c.height=0;c.type="application/x-googlegears";document.documentElement.appendChild(c)}}}if(!c){return}if(!window.google){google={}}if(!google.gears){google.gears={factory:c}}})();var a=(function(){var d=google.gears.factory.create("beta.geolocation");var c=function(f,e){return function(g){f(g);e.lastPosition=g}};return{shim:true,type:"Gears",lastPosition:null,getCurrentPosition:function(e,g,h){var f=this;var i=c(e,f);d.getCurrentPosition(i,g,h)},watchPosition:function(e,f,g){d.watchPosition(e,f,g)},clearWatch:function(e){d.clearWatch(e)},getPermission:function(g,e,f){d.getPermission(g,e,f)}}});var b=(function(){var i=false;var e=function(){if(!d()&&!i){i=true;var j=document.createElement("script");j.src=(document.location.protocol=="https:"?"https://":"http://")+"www.google.com/jsapi?callback=_google_loader_apiLoaded";j.type="text/javascript";document.getElementsByTagName("body")[0].appendChild(j)}};var c=[];var h=function(j){c.push(j)};var f=function(){if(d()){while(c.length>0){var j=c.pop();j()}}};window._google_loader_apiLoaded=function(){f()};var d=function(){return(window.google&&google.loader)};var g=function(j){if(d()){return true}h(j);e();return false};e();return{shim:true,type:"ClientLocation",lastPosition:null,getCurrentPosition:function(k,n,o){var m=this;if(!g(function(){m.getCurrentPosition(k,n,o)})){return}if(google.loader.ClientLocation){var l=google.loader.ClientLocation;var j={coords:{latitude:l.latitude,longitude:l.longitude,altitude:null,accuracy:43000,altitudeAccuracy:null,heading:null,speed:null},address:{city:l.address.city,country:l.address.country,country_code:l.address.country_code,region:l.address.region},timestamp:new Date()};k(j);this.lastPosition=j}else{if(n==="function"){n({code:3,message:"Using the Google ClientLocation API and it is not able to calculate a location."})}}},watchPosition:function(j,l,m){this.getCurrentPosition(j,l,m);var k=this;var n=setInterval(function(){k.getCurrentPosition(j,l,m)},10000);return n},clearWatch:function(j){clearInterval(j)},getPermission:function(l,j,k){return true}}});navigator.geolocation=(window.google&&google.gears)?a():b()})()};
\ No newline at end of file
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 3306b8add3..085bfa66f9 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -651,7 +651,7 @@ width:81.5%;
 margin-bottom:0;
 line-height:1.618;
 }
-.form_notice #notice_data-attach_selected code {
+.form_notice .attach-status code {
 float:left;
 width:80%;
 display:block;
@@ -659,7 +659,7 @@ overflow:auto;
 margin-right:2.5%;
 font-size:1.1em;
 }
-.form_notice #notice_data-attach_selected button.close {
+.form_notice .attach-status button.close {
 float:right;
 font-size:0.8em;
 }
diff --git a/theme/base/css/ie.css b/theme/base/css/ie.css
index 48b5cd6af7..4efc56a338 100644
--- a/theme/base/css/ie.css
+++ b/theme/base/css/ie.css
@@ -26,11 +26,11 @@ display:block;
 width:17%;
 max-width:17%;
 }
-.form_notice #notice_data-attach_selected,
+.form_notice .attach-status,
 .form_notice #notice_data-geo_selected {
 width:78.75%;
 }
-.form_notice #notice_data-attach_selected button,
+.form_notice .attach-status button,
 .form_notice #notice_data-geo_selected button {
 padding:0 4px;
 }
diff --git a/theme/biz/css/base.css b/theme/biz/css/base.css
index c0ca648847..c14d4cd1e9 100644
--- a/theme/biz/css/base.css
+++ b/theme/biz/css/base.css
@@ -519,7 +519,7 @@ margin-bottom:0;
 line-height:1.618;
 }
 
-.form_notice #notice_data-attach_selected button.close {
+.form_notice .attach-status button.close {
 float:right;
 font-size:0.8em;
 }
diff --git a/theme/clean/css/ie.css b/theme/clean/css/ie.css
index 80c4dccbaf..9eb4d6db60 100644
--- a/theme/clean/css/ie.css
+++ b/theme/clean/css/ie.css
@@ -22,11 +22,11 @@ display:block;
     width: 96px;
     max-width: 96px;
 }
-.form_notice #notice_data-attach_selected,
+.form_notice .attach-status,
 .form_notice #notice_data-geo_selected {
 width:78.75%;
 }
-.form_notice #notice_data-attach_selected button,
+.form_notice .attach-status button,
 .form_notice #notice_data-geo_selected button {
 padding:0 4px;
 }
diff --git a/theme/cleaner/css/ie.css b/theme/cleaner/css/ie.css
index 41f7dc9f88..97957afd21 100644
--- a/theme/cleaner/css/ie.css
+++ b/theme/cleaner/css/ie.css
@@ -22,11 +22,11 @@ display:block;
     width: 106px;
     max-width: 106px;
 }
-.form_notice #notice_data-attach_selected,
+.form_notice .attach-status,
 .form_notice #notice_data-geo_selected {
 width:78.75%;
 }
-.form_notice #notice_data-attach_selected button,
+.form_notice .attach-status button,
 .form_notice #notice_data-geo_selected button {
 padding:0 4px;
 }
diff --git a/theme/cloudy/css/display.css b/theme/cloudy/css/display.css
index a113797730..4decf58b12 100644
--- a/theme/cloudy/css/display.css
+++ b/theme/cloudy/css/display.css
@@ -549,7 +549,7 @@ width:81.5%;
 margin-bottom:0;
 line-height:1.618;
 }
-.form_notice #notice_data-attach_selected code,
+.form_notice .attach-status code,
 .form_notice #notice_data-geo_name {
 float:left;
 width:80%;
@@ -557,10 +557,10 @@ display:block;
 overflow:auto;
 margin-right:2.5%;
 }
-.form_notice #notice_data-attach_selected code {
+.form_notice .attach-status code {
 font-size:1.1em;
 }
-.form_notice #notice_data-attach_selected button.close,
+.form_notice .attach-status button.close,
 .form_notice #notice_data-geo_selected button.close {
 float:right;
 font-size:0.8em;
diff --git a/theme/mnml/css/display.css b/theme/mnml/css/display.css
index f20a4a16a3..e4b9012955 100644
--- a/theme/mnml/css/display.css
+++ b/theme/mnml/css/display.css
@@ -992,7 +992,7 @@ width:81.5%;
 margin-bottom:0;
 line-height:1.618;
 }
-.form_notice #notice_data-attach_selected code {
+.form_notice .attach-status code {
 float:left;
 width:80%;
 display:block;
@@ -1000,7 +1000,7 @@ overflow:auto;
 margin-right:2.5%;
 font-size:1.1em;
 }
-.form_notice #notice_data-attach_selected button.close {
+.form_notice .attach-status button.close {
 float:right;
 font-size:0.8em;
 }
diff --git a/theme/mnml/css/ie.css b/theme/mnml/css/ie.css
index 01a8ffcbdc..0cc8c3acfa 100644
--- a/theme/mnml/css/ie.css
+++ b/theme/mnml/css/ie.css
@@ -33,11 +33,11 @@ display:block;
 width:17%;
 max-width:17%;
 }
-.form_notice #notice_data-attach_selected,
+.form_notice .attach-status,
 .form_notice #notice_data-geo_selected {
 width:78.75%;
 }
-.form_notice #notice_data-attach_selected button,
+.form_notice .attach-status button,
 .form_notice #notice_data-geo_selected button {
 padding:0 4px;
 }
diff --git a/theme/pigeonthoughts/css/base.css b/theme/pigeonthoughts/css/base.css
index c31ea6b678..66948f7318 100644
--- a/theme/pigeonthoughts/css/base.css
+++ b/theme/pigeonthoughts/css/base.css
@@ -506,7 +506,7 @@ width:81.5%;
 margin-bottom:0;
 line-height:1.618;
 }
-.form_notice #notice_data-attach_selected code {
+.form_notice .attach-status code {
 float:left;
 width:80%;
 display:block;
@@ -514,7 +514,7 @@ overflow:auto;
 margin-right:2.5%;
 font-size:1.1em;
 }
-.form_notice #notice_data-attach_selected button.close {
+.form_notice .attach-status button.close {
 float:right;
 font-size:0.8em;
 }
diff --git a/theme/rebase/css/display.css b/theme/rebase/css/display.css
index d4576092a6..ad462b947e 100644
--- a/theme/rebase/css/display.css
+++ b/theme/rebase/css/display.css
@@ -302,7 +302,7 @@ address .poweredby {
     margin-left: -2px;
 }
 
-.form_notice #notice_data-attach_selected code {
+.form_notice .attach-status code {
     font-size: 1.2em;
 }
 
@@ -312,7 +312,7 @@ address .poweredby {
     padding: 6px 2px 6px 5px;
 }
 
-.form_notice #notice_data-attach_selected button.close {
+.form_notice .attach-status button.close {
     float:right;
     font-size:0.8em;
 }
diff --git a/theme/rebase/css/ie.css b/theme/rebase/css/ie.css
index 5d38ca1029..f02a07c7b8 100644
--- a/theme/rebase/css/ie.css
+++ b/theme/rebase/css/ie.css
@@ -21,11 +21,11 @@ display:block;
     width: 106px;
     max-width: 106px;
 }
-.form_notice #notice_data-attach_selected,
+.form_notice .attach-status,
 .form_notice #notice_data-geo_selected {
 width:78.75%;
 }
-.form_notice #notice_data-attach_selected button,
+.form_notice .attach-status button,
 .form_notice #notice_data-geo_selected button {
 padding:0 4px;
 }
diff --git a/theme/shiny/css/ie.css b/theme/shiny/css/ie.css
index a901a15dd5..792c94a9d7 100644
--- a/theme/shiny/css/ie.css
+++ b/theme/shiny/css/ie.css
@@ -23,11 +23,11 @@ display:block;
     width: 96px;
     max-width: 96px;
 }
-.form_notice #notice_data-attach_selected,
+.form_notice .attach-status,
 .form_notice #notice_data-geo_selected {
 width:78.75%;
 }
-.form_notice #notice_data-attach_selected button,
+.form_notice .attach-status button,
 .form_notice #notice_data-geo_selected button {
 padding:0 4px;
 }

From f94a5e1a6adc1bd37785ae4635d313de80a54ac0 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Thu, 3 Mar 2011 17:05:19 -0800
Subject: [PATCH 385/655] Notice form cleanup: drop use of id for
 #notice_data-text (prep for reusable notice form)

---
 js/util.js                           | 38 +++-------------------------
 js/util.min.js                       |  2 +-
 theme/biz/css/display.css            |  2 +-
 theme/cloudy/css/display.css         |  4 +--
 theme/default/css/display.css        |  2 +-
 theme/h4ck3r/css/display.css         |  2 +-
 theme/identica/css/display.css       |  2 +-
 theme/pigeonthoughts/css/display.css |  2 +-
 theme/victorian/css/display.css      |  2 +-
 9 files changed, 13 insertions(+), 43 deletions(-)

diff --git a/js/util.js b/js/util.js
index 7edf5ee5b6..0834a2f2d3 100644
--- a/js/util.js
+++ b/js/util.js
@@ -50,7 +50,6 @@ var SN = { // StatusNet
             Processing: 'processing',
             CommandResult: 'command_result',
             FormNotice: 'form_notice',
-            NoticeDataText: 'notice_data-text',
             NoticeTextCount: 'notice_text-count',
             NoticeInReplyTo: 'notice_in-reply-to',
             NoticeActionSubmit: 'notice_action-submit',
@@ -112,7 +111,7 @@ var SN = { // StatusNet
 
                 SN.U.Counter(form);
 
-                NDT = form.find('#'+SN.C.S.NoticeDataText);
+                NDT = form.find('[name=status_textarea]');
 
                 NDT.bind('keyup', function(e) {
                     SN.U.Counter(form);
@@ -191,7 +190,7 @@ var SN = { // StatusNet
          * @return number of chars
          */
         CharacterCount: function(form) {
-            return form.find('#'+SN.C.S.NoticeDataText).val().length;
+            return form.find('[name=status_textarea]').val().length;
         },
 
         /**
@@ -332,7 +331,7 @@ var SN = { // StatusNet
                 dataType: 'xml',
                 timeout: '60000',
                 beforeSend: function(formData) {
-                    if (form.find('#'+SN.C.S.NoticeDataText)[0].value.length === 0) {
+                    if (form.find('[name=status_textarea]').val() == '') {
                         form.addClass(SN.C.S.Warning);
                         return false;
                     }
@@ -507,7 +506,7 @@ var SN = { // StatusNet
          * @access private
          */
         NoticeReply: function() {
-            if ($('#'+SN.C.S.NoticeDataText).length > 0 && $('#content .notice_reply').length > 0) {
+            if ($('#content .notice_reply').length > 0) {
                 $('#content .notice').each(function() { SN.U.NoticeReplyTo($(this)); });
             }
         },
@@ -530,7 +529,6 @@ var SN = { // StatusNet
             notice.find('.notice_reply').live('click', function(e) {
                 e.preventDefault();
                 var nickname = ($('.author .nickname', notice).length > 0) ? $($('.author .nickname', notice)[0]) : $('.author .nickname.uid');
-                /* SN.U.NoticeReplySet(nickname.text(), $($('.notice_id', notice)[0]).text()); */
                 SN.U.NoticeInlineReplyTrigger(notice, '@' + nickname.text());
                 return false;
             });
@@ -666,34 +664,6 @@ var SN = { // StatusNet
             }
         },
 
-        /**
-         * FIXME OBSOLETE?
-         * Updates the new notice posting form with bits for replying to the
-         * given user. Adds replyto parameter to the form, and a "@foo" to the
-         * text area.
-         *
-         * @fixme replyto is a global variable, but probably shouldn't be
-         *
-         * @param {String} nick
-         * @param {String} id
-         */
-        NoticeReplySet: function(nick,id) {
-            if (nick.match(SN.C.I.PatternUsername)) {
-                var text = $('#'+SN.C.S.NoticeDataText);
-                if (text.length > 0) {
-                    replyto = '@' + nick + ' ';
-                    text.val(replyto + text.val().replace(RegExp(replyto, 'i'), ''));
-                    $('#'+SN.C.S.FormNotice+' #'+SN.C.S.NoticeInReplyTo).val(id);
-
-                    text[0].focus();
-                    if (text[0].setSelectionRange) {
-                        var len = text.val().length;
-                        text[0].setSelectionRange(len,len);
-                    }
-                }
-            }
-        },
-
         /**
          * Setup function -- DOES NOT apply immediately.
          *
diff --git a/js/util.min.js b/js/util.min.js
index 7600ac9863..81494c9100 100644
--- a/js/util.min.js
+++ b/js/util.min.js
@@ -1 +1 @@
-var SN={C:{I:{CounterBlackout:false,MaxLength:140,PatternUsername:/^[0-9a-zA-Z\-_.]*$/,HTTP20x30x:[200,201,202,203,204,205,206,300,301,302,303,304,305,306,307]},S:{Disabled:"disabled",Warning:"warning",Error:"error",Success:"success",Processing:"processing",CommandResult:"command_result",FormNotice:"form_notice",NoticeDataText:"notice_data-text",NoticeTextCount:"notice_text-count",NoticeInReplyTo:"notice_in-reply-to",NoticeActionSubmit:"notice_action-submit",NoticeLat:"notice_data-lat",NoticeLon:"notice_data-lon",NoticeLocationId:"notice_data-location_id",NoticeLocationNs:"notice_data-location_ns",NoticeGeoName:"notice_data-geo_name",NoticeDataGeo:"notice_data-geo",NoticeDataGeoCookie:"NoticeDataGeo",NoticeDataGeoSelected:"notice_data-geo_selected",StatusNetInstance:"StatusNetInstance"}},messages:{},msg:function(a){if(typeof SN.messages[a]=="undefined"){return"["+a+"]"}else{return SN.messages[a]}},U:{FormNoticeEnhancements:function(b){if(jQuery.data(b[0],"ElementData")===undefined){MaxLength=b.find("#"+SN.C.S.NoticeTextCount).text();if(typeof(MaxLength)=="undefined"){MaxLength=SN.C.I.MaxLength}jQuery.data(b[0],"ElementData",{MaxLength:MaxLength});SN.U.Counter(b);NDT=b.find("#"+SN.C.S.NoticeDataText);NDT.bind("keyup",function(c){SN.U.Counter(b)});var a=function(c){window.setTimeout(function(){SN.U.Counter(b)},50)};NDT.bind("cut",a).bind("paste",a)}else{b.find("#"+SN.C.S.NoticeTextCount).text(jQuery.data(b[0],"ElementData").MaxLength)}},Counter:function(d){SN.C.I.FormNoticeCurrent=d;var b=jQuery.data(d[0],"ElementData").MaxLength;if(b<=0){return}var c=b-SN.U.CharacterCount(d);var a=d.find("#"+SN.C.S.NoticeTextCount);if(c.toString()!=a.text()){if(!SN.C.I.CounterBlackout||c===0){if(a.text()!=String(c)){a.text(c)}if(c<0){d.addClass(SN.C.S.Warning)}else{d.removeClass(SN.C.S.Warning)}if(!SN.C.I.CounterBlackout){SN.C.I.CounterBlackout=true;SN.C.I.FormNoticeCurrent=d;window.setTimeout("SN.U.ClearCounterBlackout(SN.C.I.FormNoticeCurrent);",500)}}}},CharacterCount:function(a){return a.find("#"+SN.C.S.NoticeDataText).val().length},ClearCounterBlackout:function(a){SN.C.I.CounterBlackout=false;SN.U.Counter(a)},RewriteAjaxAction:function(a){if(document.location.protocol=="https:"&&a.substr(0,5)=="http:"){return a.replace(/^http:\/\/[^:\/]+/,"https://"+document.location.host)}else{return a}},FormXHR:function(a){$.ajax({type:"POST",dataType:"xml",url:SN.U.RewriteAjaxAction(a.attr("action")),data:a.serialize()+"&ajax=1",beforeSend:function(b){a.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(c,d,b){alert(b||d)},success:function(b,c){if(typeof($("form",b)[0])!="undefined"){form_new=document._importNode($("form",b)[0],true);a.replaceWith(form_new)}else{a.replaceWith(document._importNode($("p",b)[0],true))}}})},FormNoticeXHR:function(b){SN.C.I.NoticeDataGeo={};b.append('<input type="hidden" name="ajax" value="1"/>');b.attr("action",SN.U.RewriteAjaxAction(b.attr("action")));var c=function(d,e){b.append($('<p class="form_response"></p>').addClass(d).text(e))};var a=function(){b.find(".form_response").remove()};b.ajaxForm({dataType:"xml",timeout:"60000",beforeSend:function(d){if(b.find("#"+SN.C.S.NoticeDataText)[0].value.length===0){b.addClass(SN.C.S.Warning);return false}b.addClass(SN.C.S.Processing).find("#"+SN.C.S.NoticeActionSubmit).addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled);SN.U.normalizeGeoData(b);return true},error:function(f,g,e){b.removeClass(SN.C.S.Processing).find("#"+SN.C.S.NoticeActionSubmit).removeClass(SN.C.S.Disabled).removeAttr(SN.C.S.Disabled,SN.C.S.Disabled);a();if(g=="timeout"){c("error","Sorry! We had trouble sending your notice. The servers are overloaded. Please try again, and contact the site administrator if this problem persists.")}else{var d=SN.U.GetResponseXML(f);if($("."+SN.C.S.Error,d).length>0){b.append(document._importNode($("."+SN.C.S.Error,d)[0],true))}else{if(parseInt(f.status)===0||jQuery.inArray(parseInt(f.status),SN.C.I.HTTP20x30x)>=0){b.resetForm().find(".attach-status").remove();SN.U.FormNoticeEnhancements(b)}else{c("error","(Sorry! We had trouble sending your notice ("+f.status+" "+f.statusText+"). Please report the problem to the site administrator if this happens again.")}}}},success:function(i,k){a();var e=$("#"+SN.C.S.Error,i);if(e.length>0){c("error",e.text())}else{if($("body")[0].id=="bookmarklet"){self.close()}var d=$("#"+SN.C.S.CommandResult,i);if(d.length>0){c("success",d.text())}else{var h=document._importNode($("li",i)[0],true);var j=$("#notices_primary .notices:first");if(j.length>0&&SN.U.belongsOnTimeline(h)){if($("#"+h.id).length===0){var f=$("#"+SN.C.S.NoticeInReplyTo).val();var g="#notices_primary #notice-"+f;if($("body")[0].id=="conversation"){if(f.length>0&&$(g+" .notices").length<1){$(g).append('<ul class="notices"></ul>')}$($(g+" .notices")[0]).append(h)}else{j.prepend(h)}$("#"+h.id).css({display:"none"}).fadeIn(2500);SN.U.NoticeWithAttachment($("#"+h.id));SN.U.NoticeReplyTo($("#"+h.id))}}else{c("success",$("title",i).text())}}b.resetForm();b.find("[name=inreplyto]").val("");b.find(".attach-status").remove();SN.U.FormNoticeEnhancements(b)}},complete:function(d,e){b.removeClass(SN.C.S.Processing).find("#"+SN.C.S.NoticeActionSubmit).removeAttr(SN.C.S.Disabled).removeClass(SN.C.S.Disabled);$("#"+SN.C.S.NoticeLat).val(SN.C.I.NoticeDataGeo.NLat);$("#"+SN.C.S.NoticeLon).val(SN.C.I.NoticeDataGeo.NLon);if($("#"+SN.C.S.NoticeLocationNs)){$("#"+SN.C.S.NoticeLocationNs).val(SN.C.I.NoticeDataGeo.NLNS);$("#"+SN.C.S.NoticeLocationId).val(SN.C.I.NoticeDataGeo.NLID)}$("#"+SN.C.S.NoticeDataGeo).attr("checked",SN.C.I.NoticeDataGeo.NDG)}})},normalizeGeoData:function(a){SN.C.I.NoticeDataGeo.NLat=a.find("[name=lat]").val();SN.C.I.NoticeDataGeo.NLon=a.find("[name=lon]").val();SN.C.I.NoticeDataGeo.NLNS=a.find("[name=location_ns]").val();SN.C.I.NoticeDataGeo.NLID=a.find("[name=location_id]").val();SN.C.I.NoticeDataGeo.NDG=$("#"+SN.C.S.NoticeDataGeo).attr("checked");var b=$.cookie(SN.C.S.NoticeDataGeoCookie);if(b!==null&&b!="disabled"){b=JSON.parse(b);SN.C.I.NoticeDataGeo.NLat=a.find("[name=lat]").val(b.NLat).val();SN.C.I.NoticeDataGeo.NLon=a.find("[name=lon]").val(b.NLon).val();if(b.NLNS){SN.C.I.NoticeDataGeo.NLNS=a.find("[name=location_ns]").val(b.NLNS).val();SN.C.I.NoticeDataGeo.NLID=a.find("[name=location_id]").val(b.NLID).val()}else{a.find("[name=location_ns]").val("");a.find("[name=location_id]").val("")}}if(b=="disabled"){SN.C.I.NoticeDataGeo.NDG=$("#"+SN.C.S.NoticeDataGeo).attr("checked",false).attr("checked")}else{SN.C.I.NoticeDataGeo.NDG=$("#"+SN.C.S.NoticeDataGeo).attr("checked",true).attr("checked")}},GetResponseXML:function(b){try{return b.responseXML}catch(a){return(new DOMParser()).parseFromString(b.responseText,"text/xml")}},NoticeReply:function(){if($("#"+SN.C.S.NoticeDataText).length>0&&$("#content .notice_reply").length>0){$("#content .notice").each(function(){SN.U.NoticeReplyTo($(this))})}},NoticeReplyTo:function(a){a.find(".notice_reply").live("click",function(c){c.preventDefault();var b=($(".author .nickname",a).length>0)?$($(".author .nickname",a)[0]):$(".author .nickname.uid");SN.U.NoticeInlineReplyTrigger(a,"@"+b.text());return false})},NoticeInlineReplyTrigger:function(h,i){var c=$($(".notice_id",h)[0]).text();var d=h;var f=h.closest(".notices");if(f.hasClass("threaded-replies")){d=f.closest(".notice")}else{f=$("ul.threaded-replies",h);if(f.length==0){f=$('<ul class="notices threaded-replies xoxo"></ul>');h.append(f)}}var k=$(".notice-reply-form",f);if(k.length==0){$("li.notice-reply-placeholder").remove();var g=$("li.notice-reply",f);if(g.length==0){g=$('<li class="notice-reply"><form class="notice-reply-form" method="post"><textarea name="status_textarea"></textarea><div class="controls"><input type="hidden" name="token"><input type="hidden" name="inreplyto"><input type="submit" class="submit"></div></form></li>');var b=$("#form_notice");k=g.find("form");k.attr("action",b.attr("action"));k.find('input[name="token"]').val(b.find("input[name=token]").val());k.find('input[type="submit"]').val(SN.msg("reply_submit"));f.append(g);k.find("textarea").blur(function(){var m=$(this);var l=$.trim(m.val());if(l==""||l==m.data("initialText")){g.remove();if(f.find("li").length>0){SN.U.NoticeInlineReplyPlaceholder(d)}else{f.remove()}}});k.submit(function(m){var l=k;$.ajax({type:"POST",dataType:"xml",url:SN.U.RewriteAjaxAction(l.attr("action")),data:l.serialize()+"&ajax=1",beforeSend:function(n){l.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled).end().find("textarea").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(o,p,n){alert(n||p)},success:function(p,r){var o=$("li",p)[0];if(o){var n=document._importNode(o,true);var q=$(n).attr("id");if($("#"+q).length==0){g.replaceWith(n);SN.U.NoticeInlineReplyPlaceholder(d)}else{g.remove()}}}});m.preventDefault();return false})}}k.find("input[name=inreplyto]").val(c);var j=k.find("textarea");if(j.length==0){throw"No textarea"}var a="";if(i){a=i+" "}j.val(a+j.val().replace(RegExp(a,"i"),""));j.data("initialText",$.trim(i+""));j.focus();if(j[0].setSelectionRange){var e=j.val().length;j[0].setSelectionRange(e,e)}},NoticeReplySet:function(b,d){if(b.match(SN.C.I.PatternUsername)){var c=$("#"+SN.C.S.NoticeDataText);if(c.length>0){replyto="@"+b+" ";c.val(replyto+c.val().replace(RegExp(replyto,"i"),""));$("#"+SN.C.S.FormNotice+" #"+SN.C.S.NoticeInReplyTo).val(d);c[0].focus();if(c[0].setSelectionRange){var a=c.val().length;c[0].setSelectionRange(a,a)}}}},NoticeFavor:function(){$(".form_favor").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_disfavor").live("click",function(){SN.U.FormXHR($(this));return false})},NoticeInlineReplyPlaceholder:function(b){var a=b.find("ul.threaded-replies");var c=$('<li class="notice-reply-placeholder"><input class="placeholder"></li>');c.click(function(){SN.U.NoticeInlineReplyTrigger(b)});c.find("input").val(SN.msg("reply_placeholder"));a.append(c)},NoticeInlineReplySetup:function(){$(".threaded-replies").each(function(){var b=$(this);var a=b.closest(".notice");SN.U.NoticeInlineReplyPlaceholder(a)})},NoticeRepeat:function(){$(".form_repeat").live("click",function(a){a.preventDefault();SN.U.NoticeRepeatConfirmation($(this));return false})},NoticeRepeatConfirmation:function(a){var c=a.find(".submit");var b=c.clone();b.addClass("submit_dialogbox").removeClass("submit");a.append(b);b.bind("click",function(){SN.U.FormXHR(a);return false});c.hide();a.addClass("dialogbox").append('<button class="close">&#215;</button>').closest(".notice-options").addClass("opaque");a.find("button.close").click(function(){$(this).remove();a.removeClass("dialogbox").closest(".notice-options").removeClass("opaque");a.find(".submit_dialogbox").remove();a.find(".submit").show();return false})},NoticeAttachments:function(){$(".notice a.attachment").each(function(){SN.U.NoticeWithAttachment($(this).closest(".notice"))})},NoticeWithAttachment:function(b){if(b.find(".attachment").length===0){return}var a=b.find(".attachment.more");if(a.length>0){$(a[0]).click(function(){var c=$(this);c.addClass(SN.C.S.Processing);$.get(c.attr("href")+"/ajax",null,function(d){c.parent(".entry-content").html($(d).find("#attachment_view .entry-content").html())});return false}).attr("title",SN.msg("showmore_tooltip"))}},NoticeDataAttach:function(b){var a=b.find("input[type=file]");a.change(function(f){b.find(".attach-status").remove();var d=$(this).val();if(!d){return false}var c=$('<div class="attach-status '+SN.C.S.Success+'"><code></code> <button class="close">&#215;</button></div>');c.find("code").text(d);c.find("button").click(function(){c.remove();a.val("");return false});b.append(c);if(typeof this.files=="object"){for(var e=0;e<this.files.length;e++){SN.U.PreviewAttach(b,this.files[e])}}})},maxFileSize:function(b){var a=$(b).find("input[name=MAX_FILE_SIZE]").attr("value");if(a){return parseInt(a)}else{return 0}},PreviewAttach:function(d,c){var e=c.type+" "+Math.round(c.size/1024)+"KB";var f=true;var h;if(typeof window.createObjectURL!="undefined"){h=function(i,j){j(window.createObjectURL(i))}}else{if(typeof window.FileReader!="undefined"){h=function(j,k){var i=new FileReader();i.onload=function(l){k(i.result)};i.readAsDataURL(j)}}else{f=false}}var a=["image/png","image/jpeg","image/gif","image/svg+xml"];if($.inArray(c.type,a)==-1){f=false}var g=8*1024*1024;if(c.size>g){f=false}if(f){h(c,function(j){var i=$("<img>").attr("title",e).attr("alt",e).attr("src",j).attr("style","height: 120px");d.find(".attach-status").append(i)})}else{var b=$("<div></div>").text(e);d.find(".attach-status").append(b)}},NoticeLocationAttach:function(){var c=$("#"+SN.C.S.NoticeLat).val();var h=$("#"+SN.C.S.NoticeLon).val();var d=$("#"+SN.C.S.NoticeLocationNs).val();var i=$("#"+SN.C.S.NoticeLocationId).val();var a=$("#"+SN.C.S.NoticeGeoName).text();var b=$("#"+SN.C.S.NoticeDataGeo);function e(k){$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",jQuery.trim($("label[for="+SN.C.S.NoticeDataGeo+"]").text())).removeClass("checked");$("#"+SN.C.S.NoticeLat).val("");$("#"+SN.C.S.NoticeLon).val("");$("#"+SN.C.S.NoticeLocationNs).val("");$("#"+SN.C.S.NoticeLocationId).val("");$("#"+SN.C.S.NoticeDataGeo).attr("checked",false);$.cookie(SN.C.S.NoticeDataGeoCookie,"disabled",{path:"/"});if(k){$(".geo_status_wrapper").removeClass("success").addClass("error");$(".geo_status_wrapper .geo_status").text(k)}else{$(".geo_status_wrapper").remove()}}function j(k,l){SN.U.NoticeGeoStatus("Looking up place name...");$.getJSON(k,l,function(m){var n,o;if(typeof(m.location_ns)!="undefined"){$("#"+SN.C.S.NoticeLocationNs).val(m.location_ns);n=m.location_ns}if(typeof(m.location_id)!="undefined"){$("#"+SN.C.S.NoticeLocationId).val(m.location_id);o=m.location_id}if(typeof(m.name)=="undefined"){NLN_text=l.lat+";"+l.lon}else{NLN_text=m.name}SN.U.NoticeGeoStatus(NLN_text,l.lat,l.lon,m.url);$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",NoticeDataGeo_text.ShareDisable+" ("+NLN_text+")");$("#"+SN.C.S.NoticeLat).val(l.lat);$("#"+SN.C.S.NoticeLon).val(l.lon);$("#"+SN.C.S.NoticeLocationNs).val(n);$("#"+SN.C.S.NoticeLocationId).val(o);$("#"+SN.C.S.NoticeDataGeo).attr("checked",true);var p={NLat:l.lat,NLon:l.lon,NLNS:n,NLID:o,NLN:NLN_text,NLNU:m.url,NDG:true};$.cookie(SN.C.S.NoticeDataGeoCookie,JSON.stringify(p),{path:"/"})})}if(b.length>0){if($.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){b.attr("checked",false)}else{b.attr("checked",true)}var f=$("#notice_data-geo_wrap");var g=f.attr("title");f.removeAttr("title");$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",jQuery.trim($("label[for="+SN.C.S.NoticeDataGeo+"]").text()));b.change(function(){if($("#"+SN.C.S.NoticeDataGeo).attr("checked")===true||$.cookie(SN.C.S.NoticeDataGeoCookie)===null){$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",NoticeDataGeo_text.ShareDisable).addClass("checked");if($.cookie(SN.C.S.NoticeDataGeoCookie)===null||$.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){if(navigator.geolocation){SN.U.NoticeGeoStatus("Requesting location from browser...");navigator.geolocation.getCurrentPosition(function(m){$("#"+SN.C.S.NoticeLat).val(m.coords.latitude);$("#"+SN.C.S.NoticeLon).val(m.coords.longitude);var n={lat:m.coords.latitude,lon:m.coords.longitude,token:$("#token").val()};j(g,n)},function(m){switch(m.code){case m.PERMISSION_DENIED:e("Location permission denied.");break;case m.TIMEOUT:e("Location lookup timeout.");break}},{timeout:10000})}else{if(c.length>0&&h.length>0){var k={lat:c,lon:h,token:$("#token").val()};j(g,k)}else{e();$("#"+SN.C.S.NoticeDataGeo).remove();$("label[for="+SN.C.S.NoticeDataGeo+"]").remove()}}}else{var l=JSON.parse($.cookie(SN.C.S.NoticeDataGeoCookie));$("#"+SN.C.S.NoticeLat).val(l.NLat);$("#"+SN.C.S.NoticeLon).val(l.NLon);$("#"+SN.C.S.NoticeLocationNs).val(l.NLNS);$("#"+SN.C.S.NoticeLocationId).val(l.NLID);$("#"+SN.C.S.NoticeDataGeo).attr("checked",l.NDG);SN.U.NoticeGeoStatus(l.NLN,l.NLat,l.NLon,l.NLNU);$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",NoticeDataGeo_text.ShareDisable+" ("+l.NLN+")").addClass("checked")}}else{e()}}).change()}},NoticeGeoStatus:function(a,f,g,c){var e=$("#form_notice");var h=e.find(".geo_status_wrapper");if(h.length==0){h=$('<div class="'+SN.C.S.Success+' geo_status_wrapper"><button class="close" style="float:right">&#215;</button><div class="geo_status"></div></div>');h.find("button.close").click(function(){$("#"+SN.C.S.NoticeDataGeo).removeAttr("checked").change()});e.append(h)}var b;if(c){b=$("<a></a>").attr("href",c)}else{b=$("<span></span>")}b.text(a);if(f||g){var d=f+";"+g;b.attr("title",d);if(!a){b.text(d)}}h.find(".geo_status").empty().append(b)},NewDirectMessage:function(){NDM=$(".entity_send-a-message a");NDM.attr({href:NDM.attr("href")+"&ajax=1"});NDM.bind("click",function(){var a=$(".entity_send-a-message form");if(a.length===0){$(this).addClass(SN.C.S.Processing);$.get(NDM.attr("href"),null,function(b){$(".entity_send-a-message").append(document._importNode($("form",b)[0],true));a=$(".entity_send-a-message .form_notice");SN.U.FormNoticeXHR(a);SN.U.FormNoticeEnhancements(a);a.append('<button class="close">&#215;</button>');$(".entity_send-a-message button").click(function(){a.hide();return false});NDM.removeClass(SN.C.S.Processing)})}else{a.show();$(".entity_send-a-message textarea").focus()}return false})},GetFullYear:function(c,d,a){var b=new Date();b.setFullYear(c,d,a);return b},StatusNetInstance:{Set:function(b){var a=SN.U.StatusNetInstance.Get();if(a!==null){b=$.extend(a,b)}$.cookie(SN.C.S.StatusNetInstance,JSON.stringify(b),{path:"/",expires:SN.U.GetFullYear(2029,0,1)})},Get:function(){var a=$.cookie(SN.C.S.StatusNetInstance);if(a!==null){return JSON.parse(a)}return null},Delete:function(){$.cookie(SN.C.S.StatusNetInstance,null)}},belongsOnTimeline:function(b){var a=$("body").attr("id");if(a=="public"){return true}var c=$("#nav_profile a").attr("href");if(c){var d=$(b).find(".entry-title .author a.url").attr("href");if(d==c){if(a=="all"||a=="showstream"){return true}}}return false}},Init:{NoticeForm:function(){if($("body.user_in").length>0){SN.U.NoticeLocationAttach();$("."+SN.C.S.FormNotice).each(function(){SN.U.FormNoticeXHR($(this));SN.U.FormNoticeEnhancements($(this));SN.U.NoticeDataAttach($(this))})}},Notices:function(){if($("body.user_in").length>0){SN.U.NoticeFavor();SN.U.NoticeRepeat();SN.U.NoticeReply();SN.U.NoticeInlineReplySetup()}SN.U.NoticeAttachments()},EntityActions:function(){if($("body.user_in").length>0){$(".form_user_subscribe").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_user_unsubscribe").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_group_join").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_group_leave").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_user_nudge").live("click",function(){SN.U.FormXHR($(this));return false});SN.U.NewDirectMessage()}},Login:function(){if(SN.U.StatusNetInstance.Get()!==null){var a=SN.U.StatusNetInstance.Get().Nickname;if(a!==null){$("#form_login #nickname").val(a)}}$("#form_login").bind("submit",function(){SN.U.StatusNetInstance.Set({Nickname:$("#form_login #nickname").val()});return true})},UploadForms:function(){$("input[type=file]").change(function(d){if(typeof this.files=="object"&&this.files.length>0){var c=0;for(var b=0;b<this.files.length;b++){c+=this.files[b].size}var a=SN.U.maxFileSize($(this.form));if(a>0&&c>a){var e="File too large: maximum upload size is %d bytes.";alert(e.replace("%d",a));$(this).val("");d.preventDefault();return false}}})}}};$(document).ready(function(){SN.Init.UploadForms();if($("."+SN.C.S.FormNotice).length>0){SN.Init.NoticeForm()}if($("#content .notices").length>0){SN.Init.Notices()}if($("#content .entity_actions").length>0){SN.Init.EntityActions()}if($("#form_login").length>0){SN.Init.Login()}});if(!document.ELEMENT_NODE){document.ELEMENT_NODE=1;document.ATTRIBUTE_NODE=2;document.TEXT_NODE=3;document.CDATA_SECTION_NODE=4;document.ENTITY_REFERENCE_NODE=5;document.ENTITY_NODE=6;document.PROCESSING_INSTRUCTION_NODE=7;document.COMMENT_NODE=8;document.DOCUMENT_NODE=9;document.DOCUMENT_TYPE_NODE=10;document.DOCUMENT_FRAGMENT_NODE=11;document.NOTATION_NODE=12}document._importNode=function(e,a){switch(e.nodeType){case document.ELEMENT_NODE:var d=document.createElement(e.nodeName);if(e.attributes&&e.attributes.length>0){for(var c=0,b=e.attributes.length;c<b;){if(e.attributes[c].nodeName=="class"){d.className=e.getAttribute(e.attributes[c++].nodeName)}else{d.setAttribute(e.attributes[c].nodeName,e.getAttribute(e.attributes[c++].nodeName))}}}if(a&&e.childNodes&&e.childNodes.length>0){for(var c=0,b=e.childNodes.length;c<b;){d.appendChild(document._importNode(e.childNodes[c++],a))}}return d;break;case document.TEXT_NODE:case document.CDATA_SECTION_NODE:case document.COMMENT_NODE:return document.createTextNode(e.nodeValue);break}};if(typeof navigator.geolocation=="undefined"||navigator.geolocation.shim){(function(){(function(){if(window.google&&google.gears){return}var c=null;if(typeof GearsFactory!="undefined"){c=new GearsFactory()}else{try{c=new ActiveXObject("Gears.Factory");if(c.getBuildInfo().indexOf("ie_mobile")!=-1){c.privateSetGlobalObject(this)}}catch(d){if((typeof navigator.mimeTypes!="undefined")&&navigator.mimeTypes["application/x-googlegears"]){c=document.createElement("object");c.style.display="none";c.width=0;c.height=0;c.type="application/x-googlegears";document.documentElement.appendChild(c)}}}if(!c){return}if(!window.google){google={}}if(!google.gears){google.gears={factory:c}}})();var a=(function(){var d=google.gears.factory.create("beta.geolocation");var c=function(f,e){return function(g){f(g);e.lastPosition=g}};return{shim:true,type:"Gears",lastPosition:null,getCurrentPosition:function(e,g,h){var f=this;var i=c(e,f);d.getCurrentPosition(i,g,h)},watchPosition:function(e,f,g){d.watchPosition(e,f,g)},clearWatch:function(e){d.clearWatch(e)},getPermission:function(g,e,f){d.getPermission(g,e,f)}}});var b=(function(){var i=false;var e=function(){if(!d()&&!i){i=true;var j=document.createElement("script");j.src=(document.location.protocol=="https:"?"https://":"http://")+"www.google.com/jsapi?callback=_google_loader_apiLoaded";j.type="text/javascript";document.getElementsByTagName("body")[0].appendChild(j)}};var c=[];var h=function(j){c.push(j)};var f=function(){if(d()){while(c.length>0){var j=c.pop();j()}}};window._google_loader_apiLoaded=function(){f()};var d=function(){return(window.google&&google.loader)};var g=function(j){if(d()){return true}h(j);e();return false};e();return{shim:true,type:"ClientLocation",lastPosition:null,getCurrentPosition:function(k,n,o){var m=this;if(!g(function(){m.getCurrentPosition(k,n,o)})){return}if(google.loader.ClientLocation){var l=google.loader.ClientLocation;var j={coords:{latitude:l.latitude,longitude:l.longitude,altitude:null,accuracy:43000,altitudeAccuracy:null,heading:null,speed:null},address:{city:l.address.city,country:l.address.country,country_code:l.address.country_code,region:l.address.region},timestamp:new Date()};k(j);this.lastPosition=j}else{if(n==="function"){n({code:3,message:"Using the Google ClientLocation API and it is not able to calculate a location."})}}},watchPosition:function(j,l,m){this.getCurrentPosition(j,l,m);var k=this;var n=setInterval(function(){k.getCurrentPosition(j,l,m)},10000);return n},clearWatch:function(j){clearInterval(j)},getPermission:function(l,j,k){return true}}});navigator.geolocation=(window.google&&google.gears)?a():b()})()};
\ No newline at end of file
+var SN={C:{I:{CounterBlackout:false,MaxLength:140,PatternUsername:/^[0-9a-zA-Z\-_.]*$/,HTTP20x30x:[200,201,202,203,204,205,206,300,301,302,303,304,305,306,307]},S:{Disabled:"disabled",Warning:"warning",Error:"error",Success:"success",Processing:"processing",CommandResult:"command_result",FormNotice:"form_notice",NoticeTextCount:"notice_text-count",NoticeInReplyTo:"notice_in-reply-to",NoticeActionSubmit:"notice_action-submit",NoticeLat:"notice_data-lat",NoticeLon:"notice_data-lon",NoticeLocationId:"notice_data-location_id",NoticeLocationNs:"notice_data-location_ns",NoticeGeoName:"notice_data-geo_name",NoticeDataGeo:"notice_data-geo",NoticeDataGeoCookie:"NoticeDataGeo",NoticeDataGeoSelected:"notice_data-geo_selected",StatusNetInstance:"StatusNetInstance"}},messages:{},msg:function(a){if(typeof SN.messages[a]=="undefined"){return"["+a+"]"}else{return SN.messages[a]}},U:{FormNoticeEnhancements:function(b){if(jQuery.data(b[0],"ElementData")===undefined){MaxLength=b.find("#"+SN.C.S.NoticeTextCount).text();if(typeof(MaxLength)=="undefined"){MaxLength=SN.C.I.MaxLength}jQuery.data(b[0],"ElementData",{MaxLength:MaxLength});SN.U.Counter(b);NDT=b.find("[name=status_textarea]");NDT.bind("keyup",function(c){SN.U.Counter(b)});var a=function(c){window.setTimeout(function(){SN.U.Counter(b)},50)};NDT.bind("cut",a).bind("paste",a)}else{b.find("#"+SN.C.S.NoticeTextCount).text(jQuery.data(b[0],"ElementData").MaxLength)}},Counter:function(d){SN.C.I.FormNoticeCurrent=d;var b=jQuery.data(d[0],"ElementData").MaxLength;if(b<=0){return}var c=b-SN.U.CharacterCount(d);var a=d.find("#"+SN.C.S.NoticeTextCount);if(c.toString()!=a.text()){if(!SN.C.I.CounterBlackout||c===0){if(a.text()!=String(c)){a.text(c)}if(c<0){d.addClass(SN.C.S.Warning)}else{d.removeClass(SN.C.S.Warning)}if(!SN.C.I.CounterBlackout){SN.C.I.CounterBlackout=true;SN.C.I.FormNoticeCurrent=d;window.setTimeout("SN.U.ClearCounterBlackout(SN.C.I.FormNoticeCurrent);",500)}}}},CharacterCount:function(a){return a.find("[name=status_textarea]").val().length},ClearCounterBlackout:function(a){SN.C.I.CounterBlackout=false;SN.U.Counter(a)},RewriteAjaxAction:function(a){if(document.location.protocol=="https:"&&a.substr(0,5)=="http:"){return a.replace(/^http:\/\/[^:\/]+/,"https://"+document.location.host)}else{return a}},FormXHR:function(a){$.ajax({type:"POST",dataType:"xml",url:SN.U.RewriteAjaxAction(a.attr("action")),data:a.serialize()+"&ajax=1",beforeSend:function(b){a.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(c,d,b){alert(b||d)},success:function(b,c){if(typeof($("form",b)[0])!="undefined"){form_new=document._importNode($("form",b)[0],true);a.replaceWith(form_new)}else{a.replaceWith(document._importNode($("p",b)[0],true))}}})},FormNoticeXHR:function(b){SN.C.I.NoticeDataGeo={};b.append('<input type="hidden" name="ajax" value="1"/>');b.attr("action",SN.U.RewriteAjaxAction(b.attr("action")));var c=function(d,e){b.append($('<p class="form_response"></p>').addClass(d).text(e))};var a=function(){b.find(".form_response").remove()};b.ajaxForm({dataType:"xml",timeout:"60000",beforeSend:function(d){if(b.find("[name=status_textarea]").val()==""){b.addClass(SN.C.S.Warning);return false}b.addClass(SN.C.S.Processing).find("#"+SN.C.S.NoticeActionSubmit).addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled);SN.U.normalizeGeoData(b);return true},error:function(f,g,e){b.removeClass(SN.C.S.Processing).find("#"+SN.C.S.NoticeActionSubmit).removeClass(SN.C.S.Disabled).removeAttr(SN.C.S.Disabled,SN.C.S.Disabled);a();if(g=="timeout"){c("error","Sorry! We had trouble sending your notice. The servers are overloaded. Please try again, and contact the site administrator if this problem persists.")}else{var d=SN.U.GetResponseXML(f);if($("."+SN.C.S.Error,d).length>0){b.append(document._importNode($("."+SN.C.S.Error,d)[0],true))}else{if(parseInt(f.status)===0||jQuery.inArray(parseInt(f.status),SN.C.I.HTTP20x30x)>=0){b.resetForm().find(".attach-status").remove();SN.U.FormNoticeEnhancements(b)}else{c("error","(Sorry! We had trouble sending your notice ("+f.status+" "+f.statusText+"). Please report the problem to the site administrator if this happens again.")}}}},success:function(i,k){a();var e=$("#"+SN.C.S.Error,i);if(e.length>0){c("error",e.text())}else{if($("body")[0].id=="bookmarklet"){self.close()}var d=$("#"+SN.C.S.CommandResult,i);if(d.length>0){c("success",d.text())}else{var h=document._importNode($("li",i)[0],true);var j=$("#notices_primary .notices:first");if(j.length>0&&SN.U.belongsOnTimeline(h)){if($("#"+h.id).length===0){var f=$("#"+SN.C.S.NoticeInReplyTo).val();var g="#notices_primary #notice-"+f;if($("body")[0].id=="conversation"){if(f.length>0&&$(g+" .notices").length<1){$(g).append('<ul class="notices"></ul>')}$($(g+" .notices")[0]).append(h)}else{j.prepend(h)}$("#"+h.id).css({display:"none"}).fadeIn(2500);SN.U.NoticeWithAttachment($("#"+h.id));SN.U.NoticeReplyTo($("#"+h.id))}}else{c("success",$("title",i).text())}}b.resetForm();b.find("[name=inreplyto]").val("");b.find(".attach-status").remove();SN.U.FormNoticeEnhancements(b)}},complete:function(d,e){b.removeClass(SN.C.S.Processing).find("#"+SN.C.S.NoticeActionSubmit).removeAttr(SN.C.S.Disabled).removeClass(SN.C.S.Disabled);$("#"+SN.C.S.NoticeLat).val(SN.C.I.NoticeDataGeo.NLat);$("#"+SN.C.S.NoticeLon).val(SN.C.I.NoticeDataGeo.NLon);if($("#"+SN.C.S.NoticeLocationNs)){$("#"+SN.C.S.NoticeLocationNs).val(SN.C.I.NoticeDataGeo.NLNS);$("#"+SN.C.S.NoticeLocationId).val(SN.C.I.NoticeDataGeo.NLID)}$("#"+SN.C.S.NoticeDataGeo).attr("checked",SN.C.I.NoticeDataGeo.NDG)}})},normalizeGeoData:function(a){SN.C.I.NoticeDataGeo.NLat=a.find("[name=lat]").val();SN.C.I.NoticeDataGeo.NLon=a.find("[name=lon]").val();SN.C.I.NoticeDataGeo.NLNS=a.find("[name=location_ns]").val();SN.C.I.NoticeDataGeo.NLID=a.find("[name=location_id]").val();SN.C.I.NoticeDataGeo.NDG=$("#"+SN.C.S.NoticeDataGeo).attr("checked");var b=$.cookie(SN.C.S.NoticeDataGeoCookie);if(b!==null&&b!="disabled"){b=JSON.parse(b);SN.C.I.NoticeDataGeo.NLat=a.find("[name=lat]").val(b.NLat).val();SN.C.I.NoticeDataGeo.NLon=a.find("[name=lon]").val(b.NLon).val();if(b.NLNS){SN.C.I.NoticeDataGeo.NLNS=a.find("[name=location_ns]").val(b.NLNS).val();SN.C.I.NoticeDataGeo.NLID=a.find("[name=location_id]").val(b.NLID).val()}else{a.find("[name=location_ns]").val("");a.find("[name=location_id]").val("")}}if(b=="disabled"){SN.C.I.NoticeDataGeo.NDG=$("#"+SN.C.S.NoticeDataGeo).attr("checked",false).attr("checked")}else{SN.C.I.NoticeDataGeo.NDG=$("#"+SN.C.S.NoticeDataGeo).attr("checked",true).attr("checked")}},GetResponseXML:function(b){try{return b.responseXML}catch(a){return(new DOMParser()).parseFromString(b.responseText,"text/xml")}},NoticeReply:function(){if($("#content .notice_reply").length>0){$("#content .notice").each(function(){SN.U.NoticeReplyTo($(this))})}},NoticeReplyTo:function(a){a.find(".notice_reply").live("click",function(c){c.preventDefault();var b=($(".author .nickname",a).length>0)?$($(".author .nickname",a)[0]):$(".author .nickname.uid");SN.U.NoticeInlineReplyTrigger(a,"@"+b.text());return false})},NoticeInlineReplyTrigger:function(h,i){var c=$($(".notice_id",h)[0]).text();var d=h;var f=h.closest(".notices");if(f.hasClass("threaded-replies")){d=f.closest(".notice")}else{f=$("ul.threaded-replies",h);if(f.length==0){f=$('<ul class="notices threaded-replies xoxo"></ul>');h.append(f)}}var k=$(".notice-reply-form",f);if(k.length==0){$("li.notice-reply-placeholder").remove();var g=$("li.notice-reply",f);if(g.length==0){g=$('<li class="notice-reply"><form class="notice-reply-form" method="post"><textarea name="status_textarea"></textarea><div class="controls"><input type="hidden" name="token"><input type="hidden" name="inreplyto"><input type="submit" class="submit"></div></form></li>');var b=$("#form_notice");k=g.find("form");k.attr("action",b.attr("action"));k.find('input[name="token"]').val(b.find("input[name=token]").val());k.find('input[type="submit"]').val(SN.msg("reply_submit"));f.append(g);k.find("textarea").blur(function(){var m=$(this);var l=$.trim(m.val());if(l==""||l==m.data("initialText")){g.remove();if(f.find("li").length>0){SN.U.NoticeInlineReplyPlaceholder(d)}else{f.remove()}}});k.submit(function(m){var l=k;$.ajax({type:"POST",dataType:"xml",url:SN.U.RewriteAjaxAction(l.attr("action")),data:l.serialize()+"&ajax=1",beforeSend:function(n){l.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled).end().find("textarea").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(o,p,n){alert(n||p)},success:function(p,r){var o=$("li",p)[0];if(o){var n=document._importNode(o,true);var q=$(n).attr("id");if($("#"+q).length==0){g.replaceWith(n);SN.U.NoticeInlineReplyPlaceholder(d)}else{g.remove()}}}});m.preventDefault();return false})}}k.find("input[name=inreplyto]").val(c);var j=k.find("textarea");if(j.length==0){throw"No textarea"}var a="";if(i){a=i+" "}j.val(a+j.val().replace(RegExp(a,"i"),""));j.data("initialText",$.trim(i+""));j.focus();if(j[0].setSelectionRange){var e=j.val().length;j[0].setSelectionRange(e,e)}},NoticeFavor:function(){$(".form_favor").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_disfavor").live("click",function(){SN.U.FormXHR($(this));return false})},NoticeInlineReplyPlaceholder:function(b){var a=b.find("ul.threaded-replies");var c=$('<li class="notice-reply-placeholder"><input class="placeholder"></li>');c.click(function(){SN.U.NoticeInlineReplyTrigger(b)});c.find("input").val(SN.msg("reply_placeholder"));a.append(c)},NoticeInlineReplySetup:function(){$(".threaded-replies").each(function(){var b=$(this);var a=b.closest(".notice");SN.U.NoticeInlineReplyPlaceholder(a)})},NoticeRepeat:function(){$(".form_repeat").live("click",function(a){a.preventDefault();SN.U.NoticeRepeatConfirmation($(this));return false})},NoticeRepeatConfirmation:function(a){var c=a.find(".submit");var b=c.clone();b.addClass("submit_dialogbox").removeClass("submit");a.append(b);b.bind("click",function(){SN.U.FormXHR(a);return false});c.hide();a.addClass("dialogbox").append('<button class="close">&#215;</button>').closest(".notice-options").addClass("opaque");a.find("button.close").click(function(){$(this).remove();a.removeClass("dialogbox").closest(".notice-options").removeClass("opaque");a.find(".submit_dialogbox").remove();a.find(".submit").show();return false})},NoticeAttachments:function(){$(".notice a.attachment").each(function(){SN.U.NoticeWithAttachment($(this).closest(".notice"))})},NoticeWithAttachment:function(b){if(b.find(".attachment").length===0){return}var a=b.find(".attachment.more");if(a.length>0){$(a[0]).click(function(){var c=$(this);c.addClass(SN.C.S.Processing);$.get(c.attr("href")+"/ajax",null,function(d){c.parent(".entry-content").html($(d).find("#attachment_view .entry-content").html())});return false}).attr("title",SN.msg("showmore_tooltip"))}},NoticeDataAttach:function(b){var a=b.find("input[type=file]");a.change(function(f){b.find(".attach-status").remove();var d=$(this).val();if(!d){return false}var c=$('<div class="attach-status '+SN.C.S.Success+'"><code></code> <button class="close">&#215;</button></div>');c.find("code").text(d);c.find("button").click(function(){c.remove();a.val("");return false});b.append(c);if(typeof this.files=="object"){for(var e=0;e<this.files.length;e++){SN.U.PreviewAttach(b,this.files[e])}}})},maxFileSize:function(b){var a=$(b).find("input[name=MAX_FILE_SIZE]").attr("value");if(a){return parseInt(a)}else{return 0}},PreviewAttach:function(d,c){var e=c.type+" "+Math.round(c.size/1024)+"KB";var f=true;var h;if(typeof window.createObjectURL!="undefined"){h=function(i,j){j(window.createObjectURL(i))}}else{if(typeof window.FileReader!="undefined"){h=function(j,k){var i=new FileReader();i.onload=function(l){k(i.result)};i.readAsDataURL(j)}}else{f=false}}var a=["image/png","image/jpeg","image/gif","image/svg+xml"];if($.inArray(c.type,a)==-1){f=false}var g=8*1024*1024;if(c.size>g){f=false}if(f){h(c,function(j){var i=$("<img>").attr("title",e).attr("alt",e).attr("src",j).attr("style","height: 120px");d.find(".attach-status").append(i)})}else{var b=$("<div></div>").text(e);d.find(".attach-status").append(b)}},NoticeLocationAttach:function(){var c=$("#"+SN.C.S.NoticeLat).val();var h=$("#"+SN.C.S.NoticeLon).val();var d=$("#"+SN.C.S.NoticeLocationNs).val();var i=$("#"+SN.C.S.NoticeLocationId).val();var a=$("#"+SN.C.S.NoticeGeoName).text();var b=$("#"+SN.C.S.NoticeDataGeo);function e(k){$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",jQuery.trim($("label[for="+SN.C.S.NoticeDataGeo+"]").text())).removeClass("checked");$("#"+SN.C.S.NoticeLat).val("");$("#"+SN.C.S.NoticeLon).val("");$("#"+SN.C.S.NoticeLocationNs).val("");$("#"+SN.C.S.NoticeLocationId).val("");$("#"+SN.C.S.NoticeDataGeo).attr("checked",false);$.cookie(SN.C.S.NoticeDataGeoCookie,"disabled",{path:"/"});if(k){$(".geo_status_wrapper").removeClass("success").addClass("error");$(".geo_status_wrapper .geo_status").text(k)}else{$(".geo_status_wrapper").remove()}}function j(k,l){SN.U.NoticeGeoStatus("Looking up place name...");$.getJSON(k,l,function(m){var n,o;if(typeof(m.location_ns)!="undefined"){$("#"+SN.C.S.NoticeLocationNs).val(m.location_ns);n=m.location_ns}if(typeof(m.location_id)!="undefined"){$("#"+SN.C.S.NoticeLocationId).val(m.location_id);o=m.location_id}if(typeof(m.name)=="undefined"){NLN_text=l.lat+";"+l.lon}else{NLN_text=m.name}SN.U.NoticeGeoStatus(NLN_text,l.lat,l.lon,m.url);$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",NoticeDataGeo_text.ShareDisable+" ("+NLN_text+")");$("#"+SN.C.S.NoticeLat).val(l.lat);$("#"+SN.C.S.NoticeLon).val(l.lon);$("#"+SN.C.S.NoticeLocationNs).val(n);$("#"+SN.C.S.NoticeLocationId).val(o);$("#"+SN.C.S.NoticeDataGeo).attr("checked",true);var p={NLat:l.lat,NLon:l.lon,NLNS:n,NLID:o,NLN:NLN_text,NLNU:m.url,NDG:true};$.cookie(SN.C.S.NoticeDataGeoCookie,JSON.stringify(p),{path:"/"})})}if(b.length>0){if($.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){b.attr("checked",false)}else{b.attr("checked",true)}var f=$("#notice_data-geo_wrap");var g=f.attr("title");f.removeAttr("title");$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",jQuery.trim($("label[for="+SN.C.S.NoticeDataGeo+"]").text()));b.change(function(){if($("#"+SN.C.S.NoticeDataGeo).attr("checked")===true||$.cookie(SN.C.S.NoticeDataGeoCookie)===null){$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",NoticeDataGeo_text.ShareDisable).addClass("checked");if($.cookie(SN.C.S.NoticeDataGeoCookie)===null||$.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){if(navigator.geolocation){SN.U.NoticeGeoStatus("Requesting location from browser...");navigator.geolocation.getCurrentPosition(function(m){$("#"+SN.C.S.NoticeLat).val(m.coords.latitude);$("#"+SN.C.S.NoticeLon).val(m.coords.longitude);var n={lat:m.coords.latitude,lon:m.coords.longitude,token:$("#token").val()};j(g,n)},function(m){switch(m.code){case m.PERMISSION_DENIED:e("Location permission denied.");break;case m.TIMEOUT:e("Location lookup timeout.");break}},{timeout:10000})}else{if(c.length>0&&h.length>0){var k={lat:c,lon:h,token:$("#token").val()};j(g,k)}else{e();$("#"+SN.C.S.NoticeDataGeo).remove();$("label[for="+SN.C.S.NoticeDataGeo+"]").remove()}}}else{var l=JSON.parse($.cookie(SN.C.S.NoticeDataGeoCookie));$("#"+SN.C.S.NoticeLat).val(l.NLat);$("#"+SN.C.S.NoticeLon).val(l.NLon);$("#"+SN.C.S.NoticeLocationNs).val(l.NLNS);$("#"+SN.C.S.NoticeLocationId).val(l.NLID);$("#"+SN.C.S.NoticeDataGeo).attr("checked",l.NDG);SN.U.NoticeGeoStatus(l.NLN,l.NLat,l.NLon,l.NLNU);$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",NoticeDataGeo_text.ShareDisable+" ("+l.NLN+")").addClass("checked")}}else{e()}}).change()}},NoticeGeoStatus:function(a,f,g,c){var e=$("#form_notice");var h=e.find(".geo_status_wrapper");if(h.length==0){h=$('<div class="'+SN.C.S.Success+' geo_status_wrapper"><button class="close" style="float:right">&#215;</button><div class="geo_status"></div></div>');h.find("button.close").click(function(){$("#"+SN.C.S.NoticeDataGeo).removeAttr("checked").change()});e.append(h)}var b;if(c){b=$("<a></a>").attr("href",c)}else{b=$("<span></span>")}b.text(a);if(f||g){var d=f+";"+g;b.attr("title",d);if(!a){b.text(d)}}h.find(".geo_status").empty().append(b)},NewDirectMessage:function(){NDM=$(".entity_send-a-message a");NDM.attr({href:NDM.attr("href")+"&ajax=1"});NDM.bind("click",function(){var a=$(".entity_send-a-message form");if(a.length===0){$(this).addClass(SN.C.S.Processing);$.get(NDM.attr("href"),null,function(b){$(".entity_send-a-message").append(document._importNode($("form",b)[0],true));a=$(".entity_send-a-message .form_notice");SN.U.FormNoticeXHR(a);SN.U.FormNoticeEnhancements(a);a.append('<button class="close">&#215;</button>');$(".entity_send-a-message button").click(function(){a.hide();return false});NDM.removeClass(SN.C.S.Processing)})}else{a.show();$(".entity_send-a-message textarea").focus()}return false})},GetFullYear:function(c,d,a){var b=new Date();b.setFullYear(c,d,a);return b},StatusNetInstance:{Set:function(b){var a=SN.U.StatusNetInstance.Get();if(a!==null){b=$.extend(a,b)}$.cookie(SN.C.S.StatusNetInstance,JSON.stringify(b),{path:"/",expires:SN.U.GetFullYear(2029,0,1)})},Get:function(){var a=$.cookie(SN.C.S.StatusNetInstance);if(a!==null){return JSON.parse(a)}return null},Delete:function(){$.cookie(SN.C.S.StatusNetInstance,null)}},belongsOnTimeline:function(b){var a=$("body").attr("id");if(a=="public"){return true}var c=$("#nav_profile a").attr("href");if(c){var d=$(b).find(".entry-title .author a.url").attr("href");if(d==c){if(a=="all"||a=="showstream"){return true}}}return false}},Init:{NoticeForm:function(){if($("body.user_in").length>0){SN.U.NoticeLocationAttach();$("."+SN.C.S.FormNotice).each(function(){SN.U.FormNoticeXHR($(this));SN.U.FormNoticeEnhancements($(this));SN.U.NoticeDataAttach($(this))})}},Notices:function(){if($("body.user_in").length>0){SN.U.NoticeFavor();SN.U.NoticeRepeat();SN.U.NoticeReply();SN.U.NoticeInlineReplySetup()}SN.U.NoticeAttachments()},EntityActions:function(){if($("body.user_in").length>0){$(".form_user_subscribe").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_user_unsubscribe").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_group_join").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_group_leave").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_user_nudge").live("click",function(){SN.U.FormXHR($(this));return false});SN.U.NewDirectMessage()}},Login:function(){if(SN.U.StatusNetInstance.Get()!==null){var a=SN.U.StatusNetInstance.Get().Nickname;if(a!==null){$("#form_login #nickname").val(a)}}$("#form_login").bind("submit",function(){SN.U.StatusNetInstance.Set({Nickname:$("#form_login #nickname").val()});return true})},UploadForms:function(){$("input[type=file]").change(function(d){if(typeof this.files=="object"&&this.files.length>0){var c=0;for(var b=0;b<this.files.length;b++){c+=this.files[b].size}var a=SN.U.maxFileSize($(this.form));if(a>0&&c>a){var e="File too large: maximum upload size is %d bytes.";alert(e.replace("%d",a));$(this).val("");d.preventDefault();return false}}})}}};$(document).ready(function(){SN.Init.UploadForms();if($("."+SN.C.S.FormNotice).length>0){SN.Init.NoticeForm()}if($("#content .notices").length>0){SN.Init.Notices()}if($("#content .entity_actions").length>0){SN.Init.EntityActions()}if($("#form_login").length>0){SN.Init.Login()}});if(!document.ELEMENT_NODE){document.ELEMENT_NODE=1;document.ATTRIBUTE_NODE=2;document.TEXT_NODE=3;document.CDATA_SECTION_NODE=4;document.ENTITY_REFERENCE_NODE=5;document.ENTITY_NODE=6;document.PROCESSING_INSTRUCTION_NODE=7;document.COMMENT_NODE=8;document.DOCUMENT_NODE=9;document.DOCUMENT_TYPE_NODE=10;document.DOCUMENT_FRAGMENT_NODE=11;document.NOTATION_NODE=12}document._importNode=function(e,a){switch(e.nodeType){case document.ELEMENT_NODE:var d=document.createElement(e.nodeName);if(e.attributes&&e.attributes.length>0){for(var c=0,b=e.attributes.length;c<b;){if(e.attributes[c].nodeName=="class"){d.className=e.getAttribute(e.attributes[c++].nodeName)}else{d.setAttribute(e.attributes[c].nodeName,e.getAttribute(e.attributes[c++].nodeName))}}}if(a&&e.childNodes&&e.childNodes.length>0){for(var c=0,b=e.childNodes.length;c<b;){d.appendChild(document._importNode(e.childNodes[c++],a))}}return d;break;case document.TEXT_NODE:case document.CDATA_SECTION_NODE:case document.COMMENT_NODE:return document.createTextNode(e.nodeValue);break}};if(typeof navigator.geolocation=="undefined"||navigator.geolocation.shim){(function(){(function(){if(window.google&&google.gears){return}var c=null;if(typeof GearsFactory!="undefined"){c=new GearsFactory()}else{try{c=new ActiveXObject("Gears.Factory");if(c.getBuildInfo().indexOf("ie_mobile")!=-1){c.privateSetGlobalObject(this)}}catch(d){if((typeof navigator.mimeTypes!="undefined")&&navigator.mimeTypes["application/x-googlegears"]){c=document.createElement("object");c.style.display="none";c.width=0;c.height=0;c.type="application/x-googlegears";document.documentElement.appendChild(c)}}}if(!c){return}if(!window.google){google={}}if(!google.gears){google.gears={factory:c}}})();var a=(function(){var d=google.gears.factory.create("beta.geolocation");var c=function(f,e){return function(g){f(g);e.lastPosition=g}};return{shim:true,type:"Gears",lastPosition:null,getCurrentPosition:function(e,g,h){var f=this;var i=c(e,f);d.getCurrentPosition(i,g,h)},watchPosition:function(e,f,g){d.watchPosition(e,f,g)},clearWatch:function(e){d.clearWatch(e)},getPermission:function(g,e,f){d.getPermission(g,e,f)}}});var b=(function(){var i=false;var e=function(){if(!d()&&!i){i=true;var j=document.createElement("script");j.src=(document.location.protocol=="https:"?"https://":"http://")+"www.google.com/jsapi?callback=_google_loader_apiLoaded";j.type="text/javascript";document.getElementsByTagName("body")[0].appendChild(j)}};var c=[];var h=function(j){c.push(j)};var f=function(){if(d()){while(c.length>0){var j=c.pop();j()}}};window._google_loader_apiLoaded=function(){f()};var d=function(){return(window.google&&google.loader)};var g=function(j){if(d()){return true}h(j);e();return false};e();return{shim:true,type:"ClientLocation",lastPosition:null,getCurrentPosition:function(k,n,o){var m=this;if(!g(function(){m.getCurrentPosition(k,n,o)})){return}if(google.loader.ClientLocation){var l=google.loader.ClientLocation;var j={coords:{latitude:l.latitude,longitude:l.longitude,altitude:null,accuracy:43000,altitudeAccuracy:null,heading:null,speed:null},address:{city:l.address.city,country:l.address.country,country_code:l.address.country_code,region:l.address.region},timestamp:new Date()};k(j);this.lastPosition=j}else{if(n==="function"){n({code:3,message:"Using the Google ClientLocation API and it is not able to calculate a location."})}}},watchPosition:function(j,l,m){this.getCurrentPosition(j,l,m);var k=this;var n=setInterval(function(){k.getCurrentPosition(j,l,m)},10000);return n},clearWatch:function(j){clearInterval(j)},getPermission:function(l,j,k){return true}}});navigator.geolocation=(window.google&&google.gears)?a():b()})()};
\ No newline at end of file
diff --git a/theme/biz/css/display.css b/theme/biz/css/display.css
index 8b49cbb247..c39464385e 100644
--- a/theme/biz/css/display.css
+++ b/theme/biz/css/display.css
@@ -82,7 +82,7 @@ border-color:transparent;
 background-color:transparent;
 }
 input:focus, textarea:focus, select:focus,
-.form_notice.warning #notice_data-text,
+.form_notice.warning textarea,
 .form_notice.warning #notice_text-count,
 .form_settings .form_note {
 border-color:#9BB43E;
diff --git a/theme/cloudy/css/display.css b/theme/cloudy/css/display.css
index 4decf58b12..6787d9f2b4 100644
--- a/theme/cloudy/css/display.css
+++ b/theme/cloudy/css/display.css
@@ -1690,7 +1690,7 @@ border-color:transparent;
 background-color:transparent;
 }
 input:focus, textarea:focus, select:focus,
-.form_notice.warning #notice_data-text,
+.form_notice.warning textarea,
 .form_notice.warning #notice_text-count,
 .form_settings .form_note {
 border-color:#9BB43E;
@@ -1705,7 +1705,7 @@ border-color:transparent;
 background-color:transparent;
 }
 input:focus, textarea:focus, select:focus,
-.form_notice.warning #notice_data-text,
+.form_notice.warning textarea,
 .form_notice.warning #notice_text-count,
 .form_settings .form_note {
 border-color:#9BB43E;
diff --git a/theme/default/css/display.css b/theme/default/css/display.css
index a2624ff4c5..17f10c30e7 100644
--- a/theme/default/css/display.css
+++ b/theme/default/css/display.css
@@ -80,7 +80,7 @@ border-color:transparent;
 background-color:transparent;
 }
 input:focus, textarea:focus, select:focus,
-.form_notice.warning #notice_data-text,
+.form_notice.warning textarea,
 .form_notice.warning #notice_text-count,
 .form_settings .form_note,
 .entity_actions .dialogbox .form_data input:focus {
diff --git a/theme/h4ck3r/css/display.css b/theme/h4ck3r/css/display.css
index edf071a659..96b9ce5661 100644
--- a/theme/h4ck3r/css/display.css
+++ b/theme/h4ck3r/css/display.css
@@ -51,7 +51,7 @@ background-color:rgba(0, 255, 0, 0.5);
 }
 
 input:focus, textarea:focus, select:focus,
-#form_notice.warning #notice_data-text {
+#form_notice.warning textarea {
 border-color:#9BB43E;
 }
 input.submit,
diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index 67068104bc..32b8d88d0b 100644
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -80,7 +80,7 @@ border-color:transparent;
 background-color:transparent;
 }
 input:focus, textarea:focus, select:focus,
-.form_notice.warning #notice_data-text,
+.form_notice.warning textarea,
 .form_notice.warning #notice_text-count,
 .form_settings .form_note,
 .entity_actions .dialogbox .form_data input:focus {
diff --git a/theme/pigeonthoughts/css/display.css b/theme/pigeonthoughts/css/display.css
index 91078806a6..768d030376 100644
--- a/theme/pigeonthoughts/css/display.css
+++ b/theme/pigeonthoughts/css/display.css
@@ -50,7 +50,7 @@ background-color:#8F0000;
 }
 
 input:focus, textarea:focus, select:focus,
-#form_notice.warning #notice_data-text {
+#form_notice.warning textarea {
 border-color:#8F0000;
 box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3);
 -moz-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3);
diff --git a/theme/victorian/css/display.css b/theme/victorian/css/display.css
index fa5f9c1ea9..d2695d163f 100644
--- a/theme/victorian/css/display.css
+++ b/theme/victorian/css/display.css
@@ -254,7 +254,7 @@ button {
 }
 
 input:focus, textarea:focus, select:focus,
-.form_notice.warning #notice_data-text,
+.form_notice.warning textarea,
 .form_notice.warning #notice_text-count,
 .form_settings .form_note,
 .entity_actions .dialogbox .form_data input:focus {

From b58aa291686b9ccc6db4ca79f9d52a2e2b6220a5 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Thu, 3 Mar 2011 17:15:17 -0800
Subject: [PATCH 386/655] Notice form cleanup: removing hardcoded id from
 counter references; prep for reusable notice forms.

---
 js/util.js                                     |  7 +++----
 js/util.min.js                                 |  2 +-
 lib/messageform.php                            |  3 +--
 lib/noticeform.php                             |  3 +--
 .../GroupPrivateMessage/groupmessageform.php   |  2 +-
 plugins/MobileProfile/MobileProfilePlugin.php  |  2 +-
 plugins/MobileProfile/mp-screen.css            |  4 ++--
 theme/base/css/display.css                     |  6 +++---
 theme/base/css/ie.css                          |  2 +-
 theme/biz/css/base.css                         |  6 +++---
 theme/biz/css/display.css                      | 10 +++++-----
 theme/clean/css/ie.css                         |  4 ++--
 theme/clean/css/mp-screen.css                  |  6 +++---
 theme/cleaner/css/ie.css                       |  4 ++--
 theme/cleaner/css/mp-screen.css                |  6 +++---
 theme/cloudy/css/display.css                   | 18 +++++++++---------
 theme/cloudy/css/ie.css                        |  4 ++--
 theme/default/css/display.css                  | 10 +++++-----
 theme/default/css/ie.css                       |  2 +-
 theme/h4ck3r/css/base.css                      |  6 +++---
 theme/h4ck3r/css/display.css                   |  6 +++---
 theme/identica/css/display.css                 | 10 +++++-----
 theme/identica/css/ie.css                      |  2 +-
 theme/mnml/css/display.css                     |  6 +++---
 theme/mnml/css/ie.css                          |  4 ++--
 theme/mnml/css/mp-screen.css                   |  4 ++--
 theme/pigeonthoughts/css/base.css              |  6 +++---
 theme/pigeonthoughts/css/display.css           |  6 +++---
 theme/rebase/css/display.css                   |  8 ++++----
 theme/rebase/css/ie.css                        |  4 ++--
 theme/shiny/css/ie.css                         |  4 ++--
 theme/shiny/css/mp-screen.css                  |  6 +++---
 theme/victorian/css/display.css                | 12 ++++++------
 theme/victorian/css/ie.css                     |  2 +-
 theme/victorian/css/mp-screen.css              |  4 ++--
 35 files changed, 94 insertions(+), 97 deletions(-)

diff --git a/js/util.js b/js/util.js
index 0834a2f2d3..538eb44602 100644
--- a/js/util.js
+++ b/js/util.js
@@ -50,7 +50,6 @@ var SN = { // StatusNet
             Processing: 'processing',
             CommandResult: 'command_result',
             FormNotice: 'form_notice',
-            NoticeTextCount: 'notice_text-count',
             NoticeInReplyTo: 'notice_in-reply-to',
             NoticeActionSubmit: 'notice_action-submit',
             NoticeLat: 'notice_data-lat',
@@ -103,7 +102,7 @@ var SN = { // StatusNet
          */
         FormNoticeEnhancements: function(form) {
             if (jQuery.data(form[0], 'ElementData') === undefined) {
-                MaxLength = form.find('#'+SN.C.S.NoticeTextCount).text();
+                MaxLength = form.find('.count').text();
                 if (typeof(MaxLength) == 'undefined') {
                      MaxLength = SN.C.I.MaxLength;
                 }
@@ -131,7 +130,7 @@ var SN = { // StatusNet
                    .bind('paste', delayedUpdate);
             }
             else {
-                form.find('#'+SN.C.S.NoticeTextCount).text(jQuery.data(form[0], 'ElementData').MaxLength);
+                form.find('.count').text(jQuery.data(form[0], 'ElementData').MaxLength);
             }
         },
 
@@ -159,7 +158,7 @@ var SN = { // StatusNet
             }
 
             var remaining = MaxLength - SN.U.CharacterCount(form);
-            var counter = form.find('#'+SN.C.S.NoticeTextCount);
+            var counter = form.find('.count');
 
             if (remaining.toString() != counter.text()) {
                 if (!SN.C.I.CounterBlackout || remaining === 0) {
diff --git a/js/util.min.js b/js/util.min.js
index 81494c9100..40b534cc87 100644
--- a/js/util.min.js
+++ b/js/util.min.js
@@ -1 +1 @@
-var SN={C:{I:{CounterBlackout:false,MaxLength:140,PatternUsername:/^[0-9a-zA-Z\-_.]*$/,HTTP20x30x:[200,201,202,203,204,205,206,300,301,302,303,304,305,306,307]},S:{Disabled:"disabled",Warning:"warning",Error:"error",Success:"success",Processing:"processing",CommandResult:"command_result",FormNotice:"form_notice",NoticeTextCount:"notice_text-count",NoticeInReplyTo:"notice_in-reply-to",NoticeActionSubmit:"notice_action-submit",NoticeLat:"notice_data-lat",NoticeLon:"notice_data-lon",NoticeLocationId:"notice_data-location_id",NoticeLocationNs:"notice_data-location_ns",NoticeGeoName:"notice_data-geo_name",NoticeDataGeo:"notice_data-geo",NoticeDataGeoCookie:"NoticeDataGeo",NoticeDataGeoSelected:"notice_data-geo_selected",StatusNetInstance:"StatusNetInstance"}},messages:{},msg:function(a){if(typeof SN.messages[a]=="undefined"){return"["+a+"]"}else{return SN.messages[a]}},U:{FormNoticeEnhancements:function(b){if(jQuery.data(b[0],"ElementData")===undefined){MaxLength=b.find("#"+SN.C.S.NoticeTextCount).text();if(typeof(MaxLength)=="undefined"){MaxLength=SN.C.I.MaxLength}jQuery.data(b[0],"ElementData",{MaxLength:MaxLength});SN.U.Counter(b);NDT=b.find("[name=status_textarea]");NDT.bind("keyup",function(c){SN.U.Counter(b)});var a=function(c){window.setTimeout(function(){SN.U.Counter(b)},50)};NDT.bind("cut",a).bind("paste",a)}else{b.find("#"+SN.C.S.NoticeTextCount).text(jQuery.data(b[0],"ElementData").MaxLength)}},Counter:function(d){SN.C.I.FormNoticeCurrent=d;var b=jQuery.data(d[0],"ElementData").MaxLength;if(b<=0){return}var c=b-SN.U.CharacterCount(d);var a=d.find("#"+SN.C.S.NoticeTextCount);if(c.toString()!=a.text()){if(!SN.C.I.CounterBlackout||c===0){if(a.text()!=String(c)){a.text(c)}if(c<0){d.addClass(SN.C.S.Warning)}else{d.removeClass(SN.C.S.Warning)}if(!SN.C.I.CounterBlackout){SN.C.I.CounterBlackout=true;SN.C.I.FormNoticeCurrent=d;window.setTimeout("SN.U.ClearCounterBlackout(SN.C.I.FormNoticeCurrent);",500)}}}},CharacterCount:function(a){return a.find("[name=status_textarea]").val().length},ClearCounterBlackout:function(a){SN.C.I.CounterBlackout=false;SN.U.Counter(a)},RewriteAjaxAction:function(a){if(document.location.protocol=="https:"&&a.substr(0,5)=="http:"){return a.replace(/^http:\/\/[^:\/]+/,"https://"+document.location.host)}else{return a}},FormXHR:function(a){$.ajax({type:"POST",dataType:"xml",url:SN.U.RewriteAjaxAction(a.attr("action")),data:a.serialize()+"&ajax=1",beforeSend:function(b){a.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(c,d,b){alert(b||d)},success:function(b,c){if(typeof($("form",b)[0])!="undefined"){form_new=document._importNode($("form",b)[0],true);a.replaceWith(form_new)}else{a.replaceWith(document._importNode($("p",b)[0],true))}}})},FormNoticeXHR:function(b){SN.C.I.NoticeDataGeo={};b.append('<input type="hidden" name="ajax" value="1"/>');b.attr("action",SN.U.RewriteAjaxAction(b.attr("action")));var c=function(d,e){b.append($('<p class="form_response"></p>').addClass(d).text(e))};var a=function(){b.find(".form_response").remove()};b.ajaxForm({dataType:"xml",timeout:"60000",beforeSend:function(d){if(b.find("[name=status_textarea]").val()==""){b.addClass(SN.C.S.Warning);return false}b.addClass(SN.C.S.Processing).find("#"+SN.C.S.NoticeActionSubmit).addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled);SN.U.normalizeGeoData(b);return true},error:function(f,g,e){b.removeClass(SN.C.S.Processing).find("#"+SN.C.S.NoticeActionSubmit).removeClass(SN.C.S.Disabled).removeAttr(SN.C.S.Disabled,SN.C.S.Disabled);a();if(g=="timeout"){c("error","Sorry! We had trouble sending your notice. The servers are overloaded. Please try again, and contact the site administrator if this problem persists.")}else{var d=SN.U.GetResponseXML(f);if($("."+SN.C.S.Error,d).length>0){b.append(document._importNode($("."+SN.C.S.Error,d)[0],true))}else{if(parseInt(f.status)===0||jQuery.inArray(parseInt(f.status),SN.C.I.HTTP20x30x)>=0){b.resetForm().find(".attach-status").remove();SN.U.FormNoticeEnhancements(b)}else{c("error","(Sorry! We had trouble sending your notice ("+f.status+" "+f.statusText+"). Please report the problem to the site administrator if this happens again.")}}}},success:function(i,k){a();var e=$("#"+SN.C.S.Error,i);if(e.length>0){c("error",e.text())}else{if($("body")[0].id=="bookmarklet"){self.close()}var d=$("#"+SN.C.S.CommandResult,i);if(d.length>0){c("success",d.text())}else{var h=document._importNode($("li",i)[0],true);var j=$("#notices_primary .notices:first");if(j.length>0&&SN.U.belongsOnTimeline(h)){if($("#"+h.id).length===0){var f=$("#"+SN.C.S.NoticeInReplyTo).val();var g="#notices_primary #notice-"+f;if($("body")[0].id=="conversation"){if(f.length>0&&$(g+" .notices").length<1){$(g).append('<ul class="notices"></ul>')}$($(g+" .notices")[0]).append(h)}else{j.prepend(h)}$("#"+h.id).css({display:"none"}).fadeIn(2500);SN.U.NoticeWithAttachment($("#"+h.id));SN.U.NoticeReplyTo($("#"+h.id))}}else{c("success",$("title",i).text())}}b.resetForm();b.find("[name=inreplyto]").val("");b.find(".attach-status").remove();SN.U.FormNoticeEnhancements(b)}},complete:function(d,e){b.removeClass(SN.C.S.Processing).find("#"+SN.C.S.NoticeActionSubmit).removeAttr(SN.C.S.Disabled).removeClass(SN.C.S.Disabled);$("#"+SN.C.S.NoticeLat).val(SN.C.I.NoticeDataGeo.NLat);$("#"+SN.C.S.NoticeLon).val(SN.C.I.NoticeDataGeo.NLon);if($("#"+SN.C.S.NoticeLocationNs)){$("#"+SN.C.S.NoticeLocationNs).val(SN.C.I.NoticeDataGeo.NLNS);$("#"+SN.C.S.NoticeLocationId).val(SN.C.I.NoticeDataGeo.NLID)}$("#"+SN.C.S.NoticeDataGeo).attr("checked",SN.C.I.NoticeDataGeo.NDG)}})},normalizeGeoData:function(a){SN.C.I.NoticeDataGeo.NLat=a.find("[name=lat]").val();SN.C.I.NoticeDataGeo.NLon=a.find("[name=lon]").val();SN.C.I.NoticeDataGeo.NLNS=a.find("[name=location_ns]").val();SN.C.I.NoticeDataGeo.NLID=a.find("[name=location_id]").val();SN.C.I.NoticeDataGeo.NDG=$("#"+SN.C.S.NoticeDataGeo).attr("checked");var b=$.cookie(SN.C.S.NoticeDataGeoCookie);if(b!==null&&b!="disabled"){b=JSON.parse(b);SN.C.I.NoticeDataGeo.NLat=a.find("[name=lat]").val(b.NLat).val();SN.C.I.NoticeDataGeo.NLon=a.find("[name=lon]").val(b.NLon).val();if(b.NLNS){SN.C.I.NoticeDataGeo.NLNS=a.find("[name=location_ns]").val(b.NLNS).val();SN.C.I.NoticeDataGeo.NLID=a.find("[name=location_id]").val(b.NLID).val()}else{a.find("[name=location_ns]").val("");a.find("[name=location_id]").val("")}}if(b=="disabled"){SN.C.I.NoticeDataGeo.NDG=$("#"+SN.C.S.NoticeDataGeo).attr("checked",false).attr("checked")}else{SN.C.I.NoticeDataGeo.NDG=$("#"+SN.C.S.NoticeDataGeo).attr("checked",true).attr("checked")}},GetResponseXML:function(b){try{return b.responseXML}catch(a){return(new DOMParser()).parseFromString(b.responseText,"text/xml")}},NoticeReply:function(){if($("#content .notice_reply").length>0){$("#content .notice").each(function(){SN.U.NoticeReplyTo($(this))})}},NoticeReplyTo:function(a){a.find(".notice_reply").live("click",function(c){c.preventDefault();var b=($(".author .nickname",a).length>0)?$($(".author .nickname",a)[0]):$(".author .nickname.uid");SN.U.NoticeInlineReplyTrigger(a,"@"+b.text());return false})},NoticeInlineReplyTrigger:function(h,i){var c=$($(".notice_id",h)[0]).text();var d=h;var f=h.closest(".notices");if(f.hasClass("threaded-replies")){d=f.closest(".notice")}else{f=$("ul.threaded-replies",h);if(f.length==0){f=$('<ul class="notices threaded-replies xoxo"></ul>');h.append(f)}}var k=$(".notice-reply-form",f);if(k.length==0){$("li.notice-reply-placeholder").remove();var g=$("li.notice-reply",f);if(g.length==0){g=$('<li class="notice-reply"><form class="notice-reply-form" method="post"><textarea name="status_textarea"></textarea><div class="controls"><input type="hidden" name="token"><input type="hidden" name="inreplyto"><input type="submit" class="submit"></div></form></li>');var b=$("#form_notice");k=g.find("form");k.attr("action",b.attr("action"));k.find('input[name="token"]').val(b.find("input[name=token]").val());k.find('input[type="submit"]').val(SN.msg("reply_submit"));f.append(g);k.find("textarea").blur(function(){var m=$(this);var l=$.trim(m.val());if(l==""||l==m.data("initialText")){g.remove();if(f.find("li").length>0){SN.U.NoticeInlineReplyPlaceholder(d)}else{f.remove()}}});k.submit(function(m){var l=k;$.ajax({type:"POST",dataType:"xml",url:SN.U.RewriteAjaxAction(l.attr("action")),data:l.serialize()+"&ajax=1",beforeSend:function(n){l.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled).end().find("textarea").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(o,p,n){alert(n||p)},success:function(p,r){var o=$("li",p)[0];if(o){var n=document._importNode(o,true);var q=$(n).attr("id");if($("#"+q).length==0){g.replaceWith(n);SN.U.NoticeInlineReplyPlaceholder(d)}else{g.remove()}}}});m.preventDefault();return false})}}k.find("input[name=inreplyto]").val(c);var j=k.find("textarea");if(j.length==0){throw"No textarea"}var a="";if(i){a=i+" "}j.val(a+j.val().replace(RegExp(a,"i"),""));j.data("initialText",$.trim(i+""));j.focus();if(j[0].setSelectionRange){var e=j.val().length;j[0].setSelectionRange(e,e)}},NoticeFavor:function(){$(".form_favor").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_disfavor").live("click",function(){SN.U.FormXHR($(this));return false})},NoticeInlineReplyPlaceholder:function(b){var a=b.find("ul.threaded-replies");var c=$('<li class="notice-reply-placeholder"><input class="placeholder"></li>');c.click(function(){SN.U.NoticeInlineReplyTrigger(b)});c.find("input").val(SN.msg("reply_placeholder"));a.append(c)},NoticeInlineReplySetup:function(){$(".threaded-replies").each(function(){var b=$(this);var a=b.closest(".notice");SN.U.NoticeInlineReplyPlaceholder(a)})},NoticeRepeat:function(){$(".form_repeat").live("click",function(a){a.preventDefault();SN.U.NoticeRepeatConfirmation($(this));return false})},NoticeRepeatConfirmation:function(a){var c=a.find(".submit");var b=c.clone();b.addClass("submit_dialogbox").removeClass("submit");a.append(b);b.bind("click",function(){SN.U.FormXHR(a);return false});c.hide();a.addClass("dialogbox").append('<button class="close">&#215;</button>').closest(".notice-options").addClass("opaque");a.find("button.close").click(function(){$(this).remove();a.removeClass("dialogbox").closest(".notice-options").removeClass("opaque");a.find(".submit_dialogbox").remove();a.find(".submit").show();return false})},NoticeAttachments:function(){$(".notice a.attachment").each(function(){SN.U.NoticeWithAttachment($(this).closest(".notice"))})},NoticeWithAttachment:function(b){if(b.find(".attachment").length===0){return}var a=b.find(".attachment.more");if(a.length>0){$(a[0]).click(function(){var c=$(this);c.addClass(SN.C.S.Processing);$.get(c.attr("href")+"/ajax",null,function(d){c.parent(".entry-content").html($(d).find("#attachment_view .entry-content").html())});return false}).attr("title",SN.msg("showmore_tooltip"))}},NoticeDataAttach:function(b){var a=b.find("input[type=file]");a.change(function(f){b.find(".attach-status").remove();var d=$(this).val();if(!d){return false}var c=$('<div class="attach-status '+SN.C.S.Success+'"><code></code> <button class="close">&#215;</button></div>');c.find("code").text(d);c.find("button").click(function(){c.remove();a.val("");return false});b.append(c);if(typeof this.files=="object"){for(var e=0;e<this.files.length;e++){SN.U.PreviewAttach(b,this.files[e])}}})},maxFileSize:function(b){var a=$(b).find("input[name=MAX_FILE_SIZE]").attr("value");if(a){return parseInt(a)}else{return 0}},PreviewAttach:function(d,c){var e=c.type+" "+Math.round(c.size/1024)+"KB";var f=true;var h;if(typeof window.createObjectURL!="undefined"){h=function(i,j){j(window.createObjectURL(i))}}else{if(typeof window.FileReader!="undefined"){h=function(j,k){var i=new FileReader();i.onload=function(l){k(i.result)};i.readAsDataURL(j)}}else{f=false}}var a=["image/png","image/jpeg","image/gif","image/svg+xml"];if($.inArray(c.type,a)==-1){f=false}var g=8*1024*1024;if(c.size>g){f=false}if(f){h(c,function(j){var i=$("<img>").attr("title",e).attr("alt",e).attr("src",j).attr("style","height: 120px");d.find(".attach-status").append(i)})}else{var b=$("<div></div>").text(e);d.find(".attach-status").append(b)}},NoticeLocationAttach:function(){var c=$("#"+SN.C.S.NoticeLat).val();var h=$("#"+SN.C.S.NoticeLon).val();var d=$("#"+SN.C.S.NoticeLocationNs).val();var i=$("#"+SN.C.S.NoticeLocationId).val();var a=$("#"+SN.C.S.NoticeGeoName).text();var b=$("#"+SN.C.S.NoticeDataGeo);function e(k){$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",jQuery.trim($("label[for="+SN.C.S.NoticeDataGeo+"]").text())).removeClass("checked");$("#"+SN.C.S.NoticeLat).val("");$("#"+SN.C.S.NoticeLon).val("");$("#"+SN.C.S.NoticeLocationNs).val("");$("#"+SN.C.S.NoticeLocationId).val("");$("#"+SN.C.S.NoticeDataGeo).attr("checked",false);$.cookie(SN.C.S.NoticeDataGeoCookie,"disabled",{path:"/"});if(k){$(".geo_status_wrapper").removeClass("success").addClass("error");$(".geo_status_wrapper .geo_status").text(k)}else{$(".geo_status_wrapper").remove()}}function j(k,l){SN.U.NoticeGeoStatus("Looking up place name...");$.getJSON(k,l,function(m){var n,o;if(typeof(m.location_ns)!="undefined"){$("#"+SN.C.S.NoticeLocationNs).val(m.location_ns);n=m.location_ns}if(typeof(m.location_id)!="undefined"){$("#"+SN.C.S.NoticeLocationId).val(m.location_id);o=m.location_id}if(typeof(m.name)=="undefined"){NLN_text=l.lat+";"+l.lon}else{NLN_text=m.name}SN.U.NoticeGeoStatus(NLN_text,l.lat,l.lon,m.url);$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",NoticeDataGeo_text.ShareDisable+" ("+NLN_text+")");$("#"+SN.C.S.NoticeLat).val(l.lat);$("#"+SN.C.S.NoticeLon).val(l.lon);$("#"+SN.C.S.NoticeLocationNs).val(n);$("#"+SN.C.S.NoticeLocationId).val(o);$("#"+SN.C.S.NoticeDataGeo).attr("checked",true);var p={NLat:l.lat,NLon:l.lon,NLNS:n,NLID:o,NLN:NLN_text,NLNU:m.url,NDG:true};$.cookie(SN.C.S.NoticeDataGeoCookie,JSON.stringify(p),{path:"/"})})}if(b.length>0){if($.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){b.attr("checked",false)}else{b.attr("checked",true)}var f=$("#notice_data-geo_wrap");var g=f.attr("title");f.removeAttr("title");$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",jQuery.trim($("label[for="+SN.C.S.NoticeDataGeo+"]").text()));b.change(function(){if($("#"+SN.C.S.NoticeDataGeo).attr("checked")===true||$.cookie(SN.C.S.NoticeDataGeoCookie)===null){$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",NoticeDataGeo_text.ShareDisable).addClass("checked");if($.cookie(SN.C.S.NoticeDataGeoCookie)===null||$.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){if(navigator.geolocation){SN.U.NoticeGeoStatus("Requesting location from browser...");navigator.geolocation.getCurrentPosition(function(m){$("#"+SN.C.S.NoticeLat).val(m.coords.latitude);$("#"+SN.C.S.NoticeLon).val(m.coords.longitude);var n={lat:m.coords.latitude,lon:m.coords.longitude,token:$("#token").val()};j(g,n)},function(m){switch(m.code){case m.PERMISSION_DENIED:e("Location permission denied.");break;case m.TIMEOUT:e("Location lookup timeout.");break}},{timeout:10000})}else{if(c.length>0&&h.length>0){var k={lat:c,lon:h,token:$("#token").val()};j(g,k)}else{e();$("#"+SN.C.S.NoticeDataGeo).remove();$("label[for="+SN.C.S.NoticeDataGeo+"]").remove()}}}else{var l=JSON.parse($.cookie(SN.C.S.NoticeDataGeoCookie));$("#"+SN.C.S.NoticeLat).val(l.NLat);$("#"+SN.C.S.NoticeLon).val(l.NLon);$("#"+SN.C.S.NoticeLocationNs).val(l.NLNS);$("#"+SN.C.S.NoticeLocationId).val(l.NLID);$("#"+SN.C.S.NoticeDataGeo).attr("checked",l.NDG);SN.U.NoticeGeoStatus(l.NLN,l.NLat,l.NLon,l.NLNU);$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",NoticeDataGeo_text.ShareDisable+" ("+l.NLN+")").addClass("checked")}}else{e()}}).change()}},NoticeGeoStatus:function(a,f,g,c){var e=$("#form_notice");var h=e.find(".geo_status_wrapper");if(h.length==0){h=$('<div class="'+SN.C.S.Success+' geo_status_wrapper"><button class="close" style="float:right">&#215;</button><div class="geo_status"></div></div>');h.find("button.close").click(function(){$("#"+SN.C.S.NoticeDataGeo).removeAttr("checked").change()});e.append(h)}var b;if(c){b=$("<a></a>").attr("href",c)}else{b=$("<span></span>")}b.text(a);if(f||g){var d=f+";"+g;b.attr("title",d);if(!a){b.text(d)}}h.find(".geo_status").empty().append(b)},NewDirectMessage:function(){NDM=$(".entity_send-a-message a");NDM.attr({href:NDM.attr("href")+"&ajax=1"});NDM.bind("click",function(){var a=$(".entity_send-a-message form");if(a.length===0){$(this).addClass(SN.C.S.Processing);$.get(NDM.attr("href"),null,function(b){$(".entity_send-a-message").append(document._importNode($("form",b)[0],true));a=$(".entity_send-a-message .form_notice");SN.U.FormNoticeXHR(a);SN.U.FormNoticeEnhancements(a);a.append('<button class="close">&#215;</button>');$(".entity_send-a-message button").click(function(){a.hide();return false});NDM.removeClass(SN.C.S.Processing)})}else{a.show();$(".entity_send-a-message textarea").focus()}return false})},GetFullYear:function(c,d,a){var b=new Date();b.setFullYear(c,d,a);return b},StatusNetInstance:{Set:function(b){var a=SN.U.StatusNetInstance.Get();if(a!==null){b=$.extend(a,b)}$.cookie(SN.C.S.StatusNetInstance,JSON.stringify(b),{path:"/",expires:SN.U.GetFullYear(2029,0,1)})},Get:function(){var a=$.cookie(SN.C.S.StatusNetInstance);if(a!==null){return JSON.parse(a)}return null},Delete:function(){$.cookie(SN.C.S.StatusNetInstance,null)}},belongsOnTimeline:function(b){var a=$("body").attr("id");if(a=="public"){return true}var c=$("#nav_profile a").attr("href");if(c){var d=$(b).find(".entry-title .author a.url").attr("href");if(d==c){if(a=="all"||a=="showstream"){return true}}}return false}},Init:{NoticeForm:function(){if($("body.user_in").length>0){SN.U.NoticeLocationAttach();$("."+SN.C.S.FormNotice).each(function(){SN.U.FormNoticeXHR($(this));SN.U.FormNoticeEnhancements($(this));SN.U.NoticeDataAttach($(this))})}},Notices:function(){if($("body.user_in").length>0){SN.U.NoticeFavor();SN.U.NoticeRepeat();SN.U.NoticeReply();SN.U.NoticeInlineReplySetup()}SN.U.NoticeAttachments()},EntityActions:function(){if($("body.user_in").length>0){$(".form_user_subscribe").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_user_unsubscribe").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_group_join").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_group_leave").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_user_nudge").live("click",function(){SN.U.FormXHR($(this));return false});SN.U.NewDirectMessage()}},Login:function(){if(SN.U.StatusNetInstance.Get()!==null){var a=SN.U.StatusNetInstance.Get().Nickname;if(a!==null){$("#form_login #nickname").val(a)}}$("#form_login").bind("submit",function(){SN.U.StatusNetInstance.Set({Nickname:$("#form_login #nickname").val()});return true})},UploadForms:function(){$("input[type=file]").change(function(d){if(typeof this.files=="object"&&this.files.length>0){var c=0;for(var b=0;b<this.files.length;b++){c+=this.files[b].size}var a=SN.U.maxFileSize($(this.form));if(a>0&&c>a){var e="File too large: maximum upload size is %d bytes.";alert(e.replace("%d",a));$(this).val("");d.preventDefault();return false}}})}}};$(document).ready(function(){SN.Init.UploadForms();if($("."+SN.C.S.FormNotice).length>0){SN.Init.NoticeForm()}if($("#content .notices").length>0){SN.Init.Notices()}if($("#content .entity_actions").length>0){SN.Init.EntityActions()}if($("#form_login").length>0){SN.Init.Login()}});if(!document.ELEMENT_NODE){document.ELEMENT_NODE=1;document.ATTRIBUTE_NODE=2;document.TEXT_NODE=3;document.CDATA_SECTION_NODE=4;document.ENTITY_REFERENCE_NODE=5;document.ENTITY_NODE=6;document.PROCESSING_INSTRUCTION_NODE=7;document.COMMENT_NODE=8;document.DOCUMENT_NODE=9;document.DOCUMENT_TYPE_NODE=10;document.DOCUMENT_FRAGMENT_NODE=11;document.NOTATION_NODE=12}document._importNode=function(e,a){switch(e.nodeType){case document.ELEMENT_NODE:var d=document.createElement(e.nodeName);if(e.attributes&&e.attributes.length>0){for(var c=0,b=e.attributes.length;c<b;){if(e.attributes[c].nodeName=="class"){d.className=e.getAttribute(e.attributes[c++].nodeName)}else{d.setAttribute(e.attributes[c].nodeName,e.getAttribute(e.attributes[c++].nodeName))}}}if(a&&e.childNodes&&e.childNodes.length>0){for(var c=0,b=e.childNodes.length;c<b;){d.appendChild(document._importNode(e.childNodes[c++],a))}}return d;break;case document.TEXT_NODE:case document.CDATA_SECTION_NODE:case document.COMMENT_NODE:return document.createTextNode(e.nodeValue);break}};if(typeof navigator.geolocation=="undefined"||navigator.geolocation.shim){(function(){(function(){if(window.google&&google.gears){return}var c=null;if(typeof GearsFactory!="undefined"){c=new GearsFactory()}else{try{c=new ActiveXObject("Gears.Factory");if(c.getBuildInfo().indexOf("ie_mobile")!=-1){c.privateSetGlobalObject(this)}}catch(d){if((typeof navigator.mimeTypes!="undefined")&&navigator.mimeTypes["application/x-googlegears"]){c=document.createElement("object");c.style.display="none";c.width=0;c.height=0;c.type="application/x-googlegears";document.documentElement.appendChild(c)}}}if(!c){return}if(!window.google){google={}}if(!google.gears){google.gears={factory:c}}})();var a=(function(){var d=google.gears.factory.create("beta.geolocation");var c=function(f,e){return function(g){f(g);e.lastPosition=g}};return{shim:true,type:"Gears",lastPosition:null,getCurrentPosition:function(e,g,h){var f=this;var i=c(e,f);d.getCurrentPosition(i,g,h)},watchPosition:function(e,f,g){d.watchPosition(e,f,g)},clearWatch:function(e){d.clearWatch(e)},getPermission:function(g,e,f){d.getPermission(g,e,f)}}});var b=(function(){var i=false;var e=function(){if(!d()&&!i){i=true;var j=document.createElement("script");j.src=(document.location.protocol=="https:"?"https://":"http://")+"www.google.com/jsapi?callback=_google_loader_apiLoaded";j.type="text/javascript";document.getElementsByTagName("body")[0].appendChild(j)}};var c=[];var h=function(j){c.push(j)};var f=function(){if(d()){while(c.length>0){var j=c.pop();j()}}};window._google_loader_apiLoaded=function(){f()};var d=function(){return(window.google&&google.loader)};var g=function(j){if(d()){return true}h(j);e();return false};e();return{shim:true,type:"ClientLocation",lastPosition:null,getCurrentPosition:function(k,n,o){var m=this;if(!g(function(){m.getCurrentPosition(k,n,o)})){return}if(google.loader.ClientLocation){var l=google.loader.ClientLocation;var j={coords:{latitude:l.latitude,longitude:l.longitude,altitude:null,accuracy:43000,altitudeAccuracy:null,heading:null,speed:null},address:{city:l.address.city,country:l.address.country,country_code:l.address.country_code,region:l.address.region},timestamp:new Date()};k(j);this.lastPosition=j}else{if(n==="function"){n({code:3,message:"Using the Google ClientLocation API and it is not able to calculate a location."})}}},watchPosition:function(j,l,m){this.getCurrentPosition(j,l,m);var k=this;var n=setInterval(function(){k.getCurrentPosition(j,l,m)},10000);return n},clearWatch:function(j){clearInterval(j)},getPermission:function(l,j,k){return true}}});navigator.geolocation=(window.google&&google.gears)?a():b()})()};
\ No newline at end of file
+var SN={C:{I:{CounterBlackout:false,MaxLength:140,PatternUsername:/^[0-9a-zA-Z\-_.]*$/,HTTP20x30x:[200,201,202,203,204,205,206,300,301,302,303,304,305,306,307]},S:{Disabled:"disabled",Warning:"warning",Error:"error",Success:"success",Processing:"processing",CommandResult:"command_result",FormNotice:"form_notice",NoticeInReplyTo:"notice_in-reply-to",NoticeActionSubmit:"notice_action-submit",NoticeLat:"notice_data-lat",NoticeLon:"notice_data-lon",NoticeLocationId:"notice_data-location_id",NoticeLocationNs:"notice_data-location_ns",NoticeGeoName:"notice_data-geo_name",NoticeDataGeo:"notice_data-geo",NoticeDataGeoCookie:"NoticeDataGeo",NoticeDataGeoSelected:"notice_data-geo_selected",StatusNetInstance:"StatusNetInstance"}},messages:{},msg:function(a){if(typeof SN.messages[a]=="undefined"){return"["+a+"]"}else{return SN.messages[a]}},U:{FormNoticeEnhancements:function(b){if(jQuery.data(b[0],"ElementData")===undefined){MaxLength=b.find(".count").text();if(typeof(MaxLength)=="undefined"){MaxLength=SN.C.I.MaxLength}jQuery.data(b[0],"ElementData",{MaxLength:MaxLength});SN.U.Counter(b);NDT=b.find("[name=status_textarea]");NDT.bind("keyup",function(c){SN.U.Counter(b)});var a=function(c){window.setTimeout(function(){SN.U.Counter(b)},50)};NDT.bind("cut",a).bind("paste",a)}else{b.find(".count").text(jQuery.data(b[0],"ElementData").MaxLength)}},Counter:function(d){SN.C.I.FormNoticeCurrent=d;var b=jQuery.data(d[0],"ElementData").MaxLength;if(b<=0){return}var c=b-SN.U.CharacterCount(d);var a=d.find(".count");if(c.toString()!=a.text()){if(!SN.C.I.CounterBlackout||c===0){if(a.text()!=String(c)){a.text(c)}if(c<0){d.addClass(SN.C.S.Warning)}else{d.removeClass(SN.C.S.Warning)}if(!SN.C.I.CounterBlackout){SN.C.I.CounterBlackout=true;SN.C.I.FormNoticeCurrent=d;window.setTimeout("SN.U.ClearCounterBlackout(SN.C.I.FormNoticeCurrent);",500)}}}},CharacterCount:function(a){return a.find("[name=status_textarea]").val().length},ClearCounterBlackout:function(a){SN.C.I.CounterBlackout=false;SN.U.Counter(a)},RewriteAjaxAction:function(a){if(document.location.protocol=="https:"&&a.substr(0,5)=="http:"){return a.replace(/^http:\/\/[^:\/]+/,"https://"+document.location.host)}else{return a}},FormXHR:function(a){$.ajax({type:"POST",dataType:"xml",url:SN.U.RewriteAjaxAction(a.attr("action")),data:a.serialize()+"&ajax=1",beforeSend:function(b){a.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(c,d,b){alert(b||d)},success:function(b,c){if(typeof($("form",b)[0])!="undefined"){form_new=document._importNode($("form",b)[0],true);a.replaceWith(form_new)}else{a.replaceWith(document._importNode($("p",b)[0],true))}}})},FormNoticeXHR:function(b){SN.C.I.NoticeDataGeo={};b.append('<input type="hidden" name="ajax" value="1"/>');b.attr("action",SN.U.RewriteAjaxAction(b.attr("action")));var c=function(d,e){b.append($('<p class="form_response"></p>').addClass(d).text(e))};var a=function(){b.find(".form_response").remove()};b.ajaxForm({dataType:"xml",timeout:"60000",beforeSend:function(d){if(b.find("[name=status_textarea]").val()==""){b.addClass(SN.C.S.Warning);return false}b.addClass(SN.C.S.Processing).find("#"+SN.C.S.NoticeActionSubmit).addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled);SN.U.normalizeGeoData(b);return true},error:function(f,g,e){b.removeClass(SN.C.S.Processing).find("#"+SN.C.S.NoticeActionSubmit).removeClass(SN.C.S.Disabled).removeAttr(SN.C.S.Disabled,SN.C.S.Disabled);a();if(g=="timeout"){c("error","Sorry! We had trouble sending your notice. The servers are overloaded. Please try again, and contact the site administrator if this problem persists.")}else{var d=SN.U.GetResponseXML(f);if($("."+SN.C.S.Error,d).length>0){b.append(document._importNode($("."+SN.C.S.Error,d)[0],true))}else{if(parseInt(f.status)===0||jQuery.inArray(parseInt(f.status),SN.C.I.HTTP20x30x)>=0){b.resetForm().find(".attach-status").remove();SN.U.FormNoticeEnhancements(b)}else{c("error","(Sorry! We had trouble sending your notice ("+f.status+" "+f.statusText+"). Please report the problem to the site administrator if this happens again.")}}}},success:function(i,k){a();var e=$("#"+SN.C.S.Error,i);if(e.length>0){c("error",e.text())}else{if($("body")[0].id=="bookmarklet"){self.close()}var d=$("#"+SN.C.S.CommandResult,i);if(d.length>0){c("success",d.text())}else{var h=document._importNode($("li",i)[0],true);var j=$("#notices_primary .notices:first");if(j.length>0&&SN.U.belongsOnTimeline(h)){if($("#"+h.id).length===0){var f=$("#"+SN.C.S.NoticeInReplyTo).val();var g="#notices_primary #notice-"+f;if($("body")[0].id=="conversation"){if(f.length>0&&$(g+" .notices").length<1){$(g).append('<ul class="notices"></ul>')}$($(g+" .notices")[0]).append(h)}else{j.prepend(h)}$("#"+h.id).css({display:"none"}).fadeIn(2500);SN.U.NoticeWithAttachment($("#"+h.id));SN.U.NoticeReplyTo($("#"+h.id))}}else{c("success",$("title",i).text())}}b.resetForm();b.find("[name=inreplyto]").val("");b.find(".attach-status").remove();SN.U.FormNoticeEnhancements(b)}},complete:function(d,e){b.removeClass(SN.C.S.Processing).find("#"+SN.C.S.NoticeActionSubmit).removeAttr(SN.C.S.Disabled).removeClass(SN.C.S.Disabled);$("#"+SN.C.S.NoticeLat).val(SN.C.I.NoticeDataGeo.NLat);$("#"+SN.C.S.NoticeLon).val(SN.C.I.NoticeDataGeo.NLon);if($("#"+SN.C.S.NoticeLocationNs)){$("#"+SN.C.S.NoticeLocationNs).val(SN.C.I.NoticeDataGeo.NLNS);$("#"+SN.C.S.NoticeLocationId).val(SN.C.I.NoticeDataGeo.NLID)}$("#"+SN.C.S.NoticeDataGeo).attr("checked",SN.C.I.NoticeDataGeo.NDG)}})},normalizeGeoData:function(a){SN.C.I.NoticeDataGeo.NLat=a.find("[name=lat]").val();SN.C.I.NoticeDataGeo.NLon=a.find("[name=lon]").val();SN.C.I.NoticeDataGeo.NLNS=a.find("[name=location_ns]").val();SN.C.I.NoticeDataGeo.NLID=a.find("[name=location_id]").val();SN.C.I.NoticeDataGeo.NDG=$("#"+SN.C.S.NoticeDataGeo).attr("checked");var b=$.cookie(SN.C.S.NoticeDataGeoCookie);if(b!==null&&b!="disabled"){b=JSON.parse(b);SN.C.I.NoticeDataGeo.NLat=a.find("[name=lat]").val(b.NLat).val();SN.C.I.NoticeDataGeo.NLon=a.find("[name=lon]").val(b.NLon).val();if(b.NLNS){SN.C.I.NoticeDataGeo.NLNS=a.find("[name=location_ns]").val(b.NLNS).val();SN.C.I.NoticeDataGeo.NLID=a.find("[name=location_id]").val(b.NLID).val()}else{a.find("[name=location_ns]").val("");a.find("[name=location_id]").val("")}}if(b=="disabled"){SN.C.I.NoticeDataGeo.NDG=$("#"+SN.C.S.NoticeDataGeo).attr("checked",false).attr("checked")}else{SN.C.I.NoticeDataGeo.NDG=$("#"+SN.C.S.NoticeDataGeo).attr("checked",true).attr("checked")}},GetResponseXML:function(b){try{return b.responseXML}catch(a){return(new DOMParser()).parseFromString(b.responseText,"text/xml")}},NoticeReply:function(){if($("#content .notice_reply").length>0){$("#content .notice").each(function(){SN.U.NoticeReplyTo($(this))})}},NoticeReplyTo:function(a){a.find(".notice_reply").live("click",function(c){c.preventDefault();var b=($(".author .nickname",a).length>0)?$($(".author .nickname",a)[0]):$(".author .nickname.uid");SN.U.NoticeInlineReplyTrigger(a,"@"+b.text());return false})},NoticeInlineReplyTrigger:function(h,i){var c=$($(".notice_id",h)[0]).text();var d=h;var f=h.closest(".notices");if(f.hasClass("threaded-replies")){d=f.closest(".notice")}else{f=$("ul.threaded-replies",h);if(f.length==0){f=$('<ul class="notices threaded-replies xoxo"></ul>');h.append(f)}}var k=$(".notice-reply-form",f);if(k.length==0){$("li.notice-reply-placeholder").remove();var g=$("li.notice-reply",f);if(g.length==0){g=$('<li class="notice-reply"><form class="notice-reply-form" method="post"><textarea name="status_textarea"></textarea><div class="controls"><input type="hidden" name="token"><input type="hidden" name="inreplyto"><input type="submit" class="submit"></div></form></li>');var b=$("#form_notice");k=g.find("form");k.attr("action",b.attr("action"));k.find('input[name="token"]').val(b.find("input[name=token]").val());k.find('input[type="submit"]').val(SN.msg("reply_submit"));f.append(g);k.find("textarea").blur(function(){var m=$(this);var l=$.trim(m.val());if(l==""||l==m.data("initialText")){g.remove();if(f.find("li").length>0){SN.U.NoticeInlineReplyPlaceholder(d)}else{f.remove()}}});k.submit(function(m){var l=k;$.ajax({type:"POST",dataType:"xml",url:SN.U.RewriteAjaxAction(l.attr("action")),data:l.serialize()+"&ajax=1",beforeSend:function(n){l.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled).end().find("textarea").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(o,p,n){alert(n||p)},success:function(p,r){var o=$("li",p)[0];if(o){var n=document._importNode(o,true);var q=$(n).attr("id");if($("#"+q).length==0){g.replaceWith(n);SN.U.NoticeInlineReplyPlaceholder(d)}else{g.remove()}}}});m.preventDefault();return false})}}k.find("input[name=inreplyto]").val(c);var j=k.find("textarea");if(j.length==0){throw"No textarea"}var a="";if(i){a=i+" "}j.val(a+j.val().replace(RegExp(a,"i"),""));j.data("initialText",$.trim(i+""));j.focus();if(j[0].setSelectionRange){var e=j.val().length;j[0].setSelectionRange(e,e)}},NoticeFavor:function(){$(".form_favor").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_disfavor").live("click",function(){SN.U.FormXHR($(this));return false})},NoticeInlineReplyPlaceholder:function(b){var a=b.find("ul.threaded-replies");var c=$('<li class="notice-reply-placeholder"><input class="placeholder"></li>');c.click(function(){SN.U.NoticeInlineReplyTrigger(b)});c.find("input").val(SN.msg("reply_placeholder"));a.append(c)},NoticeInlineReplySetup:function(){$(".threaded-replies").each(function(){var b=$(this);var a=b.closest(".notice");SN.U.NoticeInlineReplyPlaceholder(a)})},NoticeRepeat:function(){$(".form_repeat").live("click",function(a){a.preventDefault();SN.U.NoticeRepeatConfirmation($(this));return false})},NoticeRepeatConfirmation:function(a){var c=a.find(".submit");var b=c.clone();b.addClass("submit_dialogbox").removeClass("submit");a.append(b);b.bind("click",function(){SN.U.FormXHR(a);return false});c.hide();a.addClass("dialogbox").append('<button class="close">&#215;</button>').closest(".notice-options").addClass("opaque");a.find("button.close").click(function(){$(this).remove();a.removeClass("dialogbox").closest(".notice-options").removeClass("opaque");a.find(".submit_dialogbox").remove();a.find(".submit").show();return false})},NoticeAttachments:function(){$(".notice a.attachment").each(function(){SN.U.NoticeWithAttachment($(this).closest(".notice"))})},NoticeWithAttachment:function(b){if(b.find(".attachment").length===0){return}var a=b.find(".attachment.more");if(a.length>0){$(a[0]).click(function(){var c=$(this);c.addClass(SN.C.S.Processing);$.get(c.attr("href")+"/ajax",null,function(d){c.parent(".entry-content").html($(d).find("#attachment_view .entry-content").html())});return false}).attr("title",SN.msg("showmore_tooltip"))}},NoticeDataAttach:function(b){var a=b.find("input[type=file]");a.change(function(f){b.find(".attach-status").remove();var d=$(this).val();if(!d){return false}var c=$('<div class="attach-status '+SN.C.S.Success+'"><code></code> <button class="close">&#215;</button></div>');c.find("code").text(d);c.find("button").click(function(){c.remove();a.val("");return false});b.append(c);if(typeof this.files=="object"){for(var e=0;e<this.files.length;e++){SN.U.PreviewAttach(b,this.files[e])}}})},maxFileSize:function(b){var a=$(b).find("input[name=MAX_FILE_SIZE]").attr("value");if(a){return parseInt(a)}else{return 0}},PreviewAttach:function(d,c){var e=c.type+" "+Math.round(c.size/1024)+"KB";var f=true;var h;if(typeof window.createObjectURL!="undefined"){h=function(i,j){j(window.createObjectURL(i))}}else{if(typeof window.FileReader!="undefined"){h=function(j,k){var i=new FileReader();i.onload=function(l){k(i.result)};i.readAsDataURL(j)}}else{f=false}}var a=["image/png","image/jpeg","image/gif","image/svg+xml"];if($.inArray(c.type,a)==-1){f=false}var g=8*1024*1024;if(c.size>g){f=false}if(f){h(c,function(j){var i=$("<img>").attr("title",e).attr("alt",e).attr("src",j).attr("style","height: 120px");d.find(".attach-status").append(i)})}else{var b=$("<div></div>").text(e);d.find(".attach-status").append(b)}},NoticeLocationAttach:function(){var c=$("#"+SN.C.S.NoticeLat).val();var h=$("#"+SN.C.S.NoticeLon).val();var d=$("#"+SN.C.S.NoticeLocationNs).val();var i=$("#"+SN.C.S.NoticeLocationId).val();var a=$("#"+SN.C.S.NoticeGeoName).text();var b=$("#"+SN.C.S.NoticeDataGeo);function e(k){$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",jQuery.trim($("label[for="+SN.C.S.NoticeDataGeo+"]").text())).removeClass("checked");$("#"+SN.C.S.NoticeLat).val("");$("#"+SN.C.S.NoticeLon).val("");$("#"+SN.C.S.NoticeLocationNs).val("");$("#"+SN.C.S.NoticeLocationId).val("");$("#"+SN.C.S.NoticeDataGeo).attr("checked",false);$.cookie(SN.C.S.NoticeDataGeoCookie,"disabled",{path:"/"});if(k){$(".geo_status_wrapper").removeClass("success").addClass("error");$(".geo_status_wrapper .geo_status").text(k)}else{$(".geo_status_wrapper").remove()}}function j(k,l){SN.U.NoticeGeoStatus("Looking up place name...");$.getJSON(k,l,function(m){var n,o;if(typeof(m.location_ns)!="undefined"){$("#"+SN.C.S.NoticeLocationNs).val(m.location_ns);n=m.location_ns}if(typeof(m.location_id)!="undefined"){$("#"+SN.C.S.NoticeLocationId).val(m.location_id);o=m.location_id}if(typeof(m.name)=="undefined"){NLN_text=l.lat+";"+l.lon}else{NLN_text=m.name}SN.U.NoticeGeoStatus(NLN_text,l.lat,l.lon,m.url);$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",NoticeDataGeo_text.ShareDisable+" ("+NLN_text+")");$("#"+SN.C.S.NoticeLat).val(l.lat);$("#"+SN.C.S.NoticeLon).val(l.lon);$("#"+SN.C.S.NoticeLocationNs).val(n);$("#"+SN.C.S.NoticeLocationId).val(o);$("#"+SN.C.S.NoticeDataGeo).attr("checked",true);var p={NLat:l.lat,NLon:l.lon,NLNS:n,NLID:o,NLN:NLN_text,NLNU:m.url,NDG:true};$.cookie(SN.C.S.NoticeDataGeoCookie,JSON.stringify(p),{path:"/"})})}if(b.length>0){if($.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){b.attr("checked",false)}else{b.attr("checked",true)}var f=$("#notice_data-geo_wrap");var g=f.attr("title");f.removeAttr("title");$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",jQuery.trim($("label[for="+SN.C.S.NoticeDataGeo+"]").text()));b.change(function(){if($("#"+SN.C.S.NoticeDataGeo).attr("checked")===true||$.cookie(SN.C.S.NoticeDataGeoCookie)===null){$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",NoticeDataGeo_text.ShareDisable).addClass("checked");if($.cookie(SN.C.S.NoticeDataGeoCookie)===null||$.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){if(navigator.geolocation){SN.U.NoticeGeoStatus("Requesting location from browser...");navigator.geolocation.getCurrentPosition(function(m){$("#"+SN.C.S.NoticeLat).val(m.coords.latitude);$("#"+SN.C.S.NoticeLon).val(m.coords.longitude);var n={lat:m.coords.latitude,lon:m.coords.longitude,token:$("#token").val()};j(g,n)},function(m){switch(m.code){case m.PERMISSION_DENIED:e("Location permission denied.");break;case m.TIMEOUT:e("Location lookup timeout.");break}},{timeout:10000})}else{if(c.length>0&&h.length>0){var k={lat:c,lon:h,token:$("#token").val()};j(g,k)}else{e();$("#"+SN.C.S.NoticeDataGeo).remove();$("label[for="+SN.C.S.NoticeDataGeo+"]").remove()}}}else{var l=JSON.parse($.cookie(SN.C.S.NoticeDataGeoCookie));$("#"+SN.C.S.NoticeLat).val(l.NLat);$("#"+SN.C.S.NoticeLon).val(l.NLon);$("#"+SN.C.S.NoticeLocationNs).val(l.NLNS);$("#"+SN.C.S.NoticeLocationId).val(l.NLID);$("#"+SN.C.S.NoticeDataGeo).attr("checked",l.NDG);SN.U.NoticeGeoStatus(l.NLN,l.NLat,l.NLon,l.NLNU);$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",NoticeDataGeo_text.ShareDisable+" ("+l.NLN+")").addClass("checked")}}else{e()}}).change()}},NoticeGeoStatus:function(a,f,g,c){var e=$("#form_notice");var h=e.find(".geo_status_wrapper");if(h.length==0){h=$('<div class="'+SN.C.S.Success+' geo_status_wrapper"><button class="close" style="float:right">&#215;</button><div class="geo_status"></div></div>');h.find("button.close").click(function(){$("#"+SN.C.S.NoticeDataGeo).removeAttr("checked").change()});e.append(h)}var b;if(c){b=$("<a></a>").attr("href",c)}else{b=$("<span></span>")}b.text(a);if(f||g){var d=f+";"+g;b.attr("title",d);if(!a){b.text(d)}}h.find(".geo_status").empty().append(b)},NewDirectMessage:function(){NDM=$(".entity_send-a-message a");NDM.attr({href:NDM.attr("href")+"&ajax=1"});NDM.bind("click",function(){var a=$(".entity_send-a-message form");if(a.length===0){$(this).addClass(SN.C.S.Processing);$.get(NDM.attr("href"),null,function(b){$(".entity_send-a-message").append(document._importNode($("form",b)[0],true));a=$(".entity_send-a-message .form_notice");SN.U.FormNoticeXHR(a);SN.U.FormNoticeEnhancements(a);a.append('<button class="close">&#215;</button>');$(".entity_send-a-message button").click(function(){a.hide();return false});NDM.removeClass(SN.C.S.Processing)})}else{a.show();$(".entity_send-a-message textarea").focus()}return false})},GetFullYear:function(c,d,a){var b=new Date();b.setFullYear(c,d,a);return b},StatusNetInstance:{Set:function(b){var a=SN.U.StatusNetInstance.Get();if(a!==null){b=$.extend(a,b)}$.cookie(SN.C.S.StatusNetInstance,JSON.stringify(b),{path:"/",expires:SN.U.GetFullYear(2029,0,1)})},Get:function(){var a=$.cookie(SN.C.S.StatusNetInstance);if(a!==null){return JSON.parse(a)}return null},Delete:function(){$.cookie(SN.C.S.StatusNetInstance,null)}},belongsOnTimeline:function(b){var a=$("body").attr("id");if(a=="public"){return true}var c=$("#nav_profile a").attr("href");if(c){var d=$(b).find(".entry-title .author a.url").attr("href");if(d==c){if(a=="all"||a=="showstream"){return true}}}return false}},Init:{NoticeForm:function(){if($("body.user_in").length>0){SN.U.NoticeLocationAttach();$("."+SN.C.S.FormNotice).each(function(){SN.U.FormNoticeXHR($(this));SN.U.FormNoticeEnhancements($(this));SN.U.NoticeDataAttach($(this))})}},Notices:function(){if($("body.user_in").length>0){SN.U.NoticeFavor();SN.U.NoticeRepeat();SN.U.NoticeReply();SN.U.NoticeInlineReplySetup()}SN.U.NoticeAttachments()},EntityActions:function(){if($("body.user_in").length>0){$(".form_user_subscribe").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_user_unsubscribe").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_group_join").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_group_leave").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_user_nudge").live("click",function(){SN.U.FormXHR($(this));return false});SN.U.NewDirectMessage()}},Login:function(){if(SN.U.StatusNetInstance.Get()!==null){var a=SN.U.StatusNetInstance.Get().Nickname;if(a!==null){$("#form_login #nickname").val(a)}}$("#form_login").bind("submit",function(){SN.U.StatusNetInstance.Set({Nickname:$("#form_login #nickname").val()});return true})},UploadForms:function(){$("input[type=file]").change(function(d){if(typeof this.files=="object"&&this.files.length>0){var c=0;for(var b=0;b<this.files.length;b++){c+=this.files[b].size}var a=SN.U.maxFileSize($(this.form));if(a>0&&c>a){var e="File too large: maximum upload size is %d bytes.";alert(e.replace("%d",a));$(this).val("");d.preventDefault();return false}}})}}};$(document).ready(function(){SN.Init.UploadForms();if($("."+SN.C.S.FormNotice).length>0){SN.Init.NoticeForm()}if($("#content .notices").length>0){SN.Init.Notices()}if($("#content .entity_actions").length>0){SN.Init.EntityActions()}if($("#form_login").length>0){SN.Init.Login()}});if(!document.ELEMENT_NODE){document.ELEMENT_NODE=1;document.ATTRIBUTE_NODE=2;document.TEXT_NODE=3;document.CDATA_SECTION_NODE=4;document.ENTITY_REFERENCE_NODE=5;document.ENTITY_NODE=6;document.PROCESSING_INSTRUCTION_NODE=7;document.COMMENT_NODE=8;document.DOCUMENT_NODE=9;document.DOCUMENT_TYPE_NODE=10;document.DOCUMENT_FRAGMENT_NODE=11;document.NOTATION_NODE=12}document._importNode=function(e,a){switch(e.nodeType){case document.ELEMENT_NODE:var d=document.createElement(e.nodeName);if(e.attributes&&e.attributes.length>0){for(var c=0,b=e.attributes.length;c<b;){if(e.attributes[c].nodeName=="class"){d.className=e.getAttribute(e.attributes[c++].nodeName)}else{d.setAttribute(e.attributes[c].nodeName,e.getAttribute(e.attributes[c++].nodeName))}}}if(a&&e.childNodes&&e.childNodes.length>0){for(var c=0,b=e.childNodes.length;c<b;){d.appendChild(document._importNode(e.childNodes[c++],a))}}return d;break;case document.TEXT_NODE:case document.CDATA_SECTION_NODE:case document.COMMENT_NODE:return document.createTextNode(e.nodeValue);break}};if(typeof navigator.geolocation=="undefined"||navigator.geolocation.shim){(function(){(function(){if(window.google&&google.gears){return}var c=null;if(typeof GearsFactory!="undefined"){c=new GearsFactory()}else{try{c=new ActiveXObject("Gears.Factory");if(c.getBuildInfo().indexOf("ie_mobile")!=-1){c.privateSetGlobalObject(this)}}catch(d){if((typeof navigator.mimeTypes!="undefined")&&navigator.mimeTypes["application/x-googlegears"]){c=document.createElement("object");c.style.display="none";c.width=0;c.height=0;c.type="application/x-googlegears";document.documentElement.appendChild(c)}}}if(!c){return}if(!window.google){google={}}if(!google.gears){google.gears={factory:c}}})();var a=(function(){var d=google.gears.factory.create("beta.geolocation");var c=function(f,e){return function(g){f(g);e.lastPosition=g}};return{shim:true,type:"Gears",lastPosition:null,getCurrentPosition:function(e,g,h){var f=this;var i=c(e,f);d.getCurrentPosition(i,g,h)},watchPosition:function(e,f,g){d.watchPosition(e,f,g)},clearWatch:function(e){d.clearWatch(e)},getPermission:function(g,e,f){d.getPermission(g,e,f)}}});var b=(function(){var i=false;var e=function(){if(!d()&&!i){i=true;var j=document.createElement("script");j.src=(document.location.protocol=="https:"?"https://":"http://")+"www.google.com/jsapi?callback=_google_loader_apiLoaded";j.type="text/javascript";document.getElementsByTagName("body")[0].appendChild(j)}};var c=[];var h=function(j){c.push(j)};var f=function(){if(d()){while(c.length>0){var j=c.pop();j()}}};window._google_loader_apiLoaded=function(){f()};var d=function(){return(window.google&&google.loader)};var g=function(j){if(d()){return true}h(j);e();return false};e();return{shim:true,type:"ClientLocation",lastPosition:null,getCurrentPosition:function(k,n,o){var m=this;if(!g(function(){m.getCurrentPosition(k,n,o)})){return}if(google.loader.ClientLocation){var l=google.loader.ClientLocation;var j={coords:{latitude:l.latitude,longitude:l.longitude,altitude:null,accuracy:43000,altitudeAccuracy:null,heading:null,speed:null},address:{city:l.address.city,country:l.address.country,country_code:l.address.country_code,region:l.address.region},timestamp:new Date()};k(j);this.lastPosition=j}else{if(n==="function"){n({code:3,message:"Using the Google ClientLocation API and it is not able to calculate a location."})}}},watchPosition:function(j,l,m){this.getCurrentPosition(j,l,m);var k=this;var n=setInterval(function(){k.getCurrentPosition(j,l,m)},10000);return n},clearWatch:function(j){clearInterval(j)},getPermission:function(l,j,k){return true}}});navigator.geolocation=(window.google&&google.gears)?a():b()})()};
\ No newline at end of file
diff --git a/lib/messageform.php b/lib/messageform.php
index 7f21f7ecd0..9a4dfbb0f5 100644
--- a/lib/messageform.php
+++ b/lib/messageform.php
@@ -163,8 +163,7 @@ class MessageForm extends Form
 
         if ($contentLimit > 0) {
             $this->out->element('span',
-                                array('id' => 'notice_text-count',
-                                      'class' => 'form_note'),
+                                array('class' => 'count'),
                                 $contentLimit);
         }
     }
diff --git a/lib/noticeform.php b/lib/noticeform.php
index 4e8b842078..cd2d2cb979 100644
--- a/lib/noticeform.php
+++ b/lib/noticeform.php
@@ -183,8 +183,7 @@ class NoticeForm extends Form
 
             if ($contentLimit > 0) {
                 $this->out->element('span', 
-                                    array('id' => 'notice_text-count',
-                                          'class' => 'form_note'),
+                                    array('class' => 'count'),
                                     $contentLimit);
             }
 
diff --git a/plugins/GroupPrivateMessage/groupmessageform.php b/plugins/GroupPrivateMessage/groupmessageform.php
index 7205d3f0b9..a832ce5978 100644
--- a/plugins/GroupPrivateMessage/groupmessageform.php
+++ b/plugins/GroupPrivateMessage/groupmessageform.php
@@ -141,7 +141,7 @@ class GroupMessageForm extends Form
         if ($contentLimit > 0) {
             $this->out->elementStart('dl', 'form_note');
             $this->out->element('dt', null, _('Available characters'));
-            $this->out->element('dd', array('id' => 'notice_text-count'),
+            $this->out->element('dd', array('class' => 'count'),
                                 $contentLimit);
             $this->out->elementEnd('dl');
         }
diff --git a/plugins/MobileProfile/MobileProfilePlugin.php b/plugins/MobileProfile/MobileProfilePlugin.php
index ec08fa1e2c..fa0c4e7c22 100644
--- a/plugins/MobileProfile/MobileProfilePlugin.php
+++ b/plugins/MobileProfile/MobileProfilePlugin.php
@@ -355,7 +355,7 @@ class MobileProfilePlugin extends WAP20Plugin
         $contentLimit = Notice::maxContent();
 
         if ($contentLimit > 0) {
-            $form->out->element('div', array('id' => 'notice_text-count'),
+            $form->out->element('div', array('class' => 'count'),
                                 $contentLimit);
         }
 
diff --git a/plugins/MobileProfile/mp-screen.css b/plugins/MobileProfile/mp-screen.css
index 1f70b5612d..4b9930584f 100644
--- a/plugins/MobileProfile/mp-screen.css
+++ b/plugins/MobileProfile/mp-screen.css
@@ -94,7 +94,7 @@ width:60%;
 height:20px;
 }
 
-#notice_text-count {
+.form_notice .count {
 position:absolute;
 bottom:2px;
 right:40%;
@@ -104,7 +104,7 @@ z-index:9;
 /*input type=file no good in
 iPhone/iPod Touch, Android, Opera Mini Simulator
 */
-#form_notice #notice_text-count + label,
+.form_notice .count + label,
 #form_notice label[for="notice_data-attach"] {
 display:none;
 }
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 085bfa66f9..f4a3a12b13 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -611,17 +611,17 @@ height:16px;
 padding:0;
 height:16px;
 }
-.form_notice .form_note {
+.form_notice .count {
 position:absolute;
 bottom:2px;
 right:21.715%;
 z-index:9;
 }
-.form_notice .form_note dt {
+.form_notice .count dt {
 font-weight:bold;
 display:none;
 }
-.form_notice #notice_text-count {
+.form_notice .count {
 font-weight:bold;
 line-height:1.15;
 padding:1px 2px;
diff --git a/theme/base/css/ie.css b/theme/base/css/ie.css
index 4efc56a338..0a26f238b9 100644
--- a/theme/base/css/ie.css
+++ b/theme/base/css/ie.css
@@ -13,7 +13,7 @@ top:0;
 .form_notice textarea {
 width:78%;
 }
-.form_notice .form_note + label {
+.form_notice .count + label {
 position:absolute;
 top:25px;
 left:83%;
diff --git a/theme/biz/css/base.css b/theme/biz/css/base.css
index c14d4cd1e9..d0c445f482 100644
--- a/theme/biz/css/base.css
+++ b/theme/biz/css/base.css
@@ -480,17 +480,17 @@ text-indent:-279px;
 #form_notice #notice_submit label {
 display:none;
 }
-#form_notice .form_note {
+.form_notice .count {
 position:absolute;
 top:99px;
 right:98px;
 z-index:9;
 }
-#form_notice .form_note dt {
+.form_notice .count dt {
 font-weight:bold;
 display:none;
 }
-#notice_text-count {
+.form_notice .count {
 font-weight:bold;
 line-height:1.15;
 padding:1px 2px;
diff --git a/theme/biz/css/display.css b/theme/biz/css/display.css
index c39464385e..e562f7072a 100644
--- a/theme/biz/css/display.css
+++ b/theme/biz/css/display.css
@@ -60,12 +60,12 @@ border-color:#DDDDDD;
 background:none;
 }
 
-.form_notice.warning #notice_text-count,
+.form_notice.warning .count,
 .form_settings .form_note {
 background-color:#9BB43E;
 }
 input.submit,
-.form_notice.warning #notice_text-count,
+.form_notice.warning .count,
 .form_settings .form_note,
 .entity_actions a,
 .entity_actions input,
@@ -83,7 +83,7 @@ background-color:transparent;
 }
 input:focus, textarea:focus, select:focus,
 .form_notice.warning textarea,
-.form_notice.warning #notice_text-count,
+.form_notice.warning .count,
 .form_settings .form_note {
 border-color:#9BB43E;
 }
@@ -166,10 +166,10 @@ background-image:url(../images/illustrations/illu_pattern-02.png);
 background-repeat:no-repeat;
 }
 
-#notice_text-count {
+.form_notice .count {
 color:#333333;
 }
-#form_notice.warning #notice_text-count {
+#form_notice.warning .count {
 color:#000000;
 }
 .form_notice label[for=notice_data-attach] {
diff --git a/theme/clean/css/ie.css b/theme/clean/css/ie.css
index 9eb4d6db60..9e26313b0e 100644
--- a/theme/clean/css/ie.css
+++ b/theme/clean/css/ie.css
@@ -7,7 +7,7 @@ top:0;
 .form_notice textarea {
     width: 362px;
 }
-.form_notice .form_note + label {
+.form_notice .count + label {
 position:absolute;
 top:25px;
 left:83%;
@@ -65,7 +65,7 @@ line-height:auto;
     filter: alpha(opacity=0);
 }
 
-.form_notice .form_note + label {
+.form_notice .count + label {
     background:transparent url(../../rebase/images/icons/icons-01.gif) no-repeat 0 -328px;
 }
 
diff --git a/theme/clean/css/mp-screen.css b/theme/clean/css/mp-screen.css
index d544fcb767..4b19afd117 100644
--- a/theme/clean/css/mp-screen.css
+++ b/theme/clean/css/mp-screen.css
@@ -75,7 +75,7 @@ float:left;
     padding: 4px;
 }
 
-#notice_text-count {
+.form_notice .count {
 position:absolute;
 bottom:2px;
     left: 175px;
@@ -83,14 +83,14 @@ bottom:2px;
 z-index:9;
 }
 
-#form_notice-direct.form_notice #notice_text-count {
+#form_notice-direct.form_notice .count {
     left: 0px;
 }
 
 /*input type=file no good in
 iPhone/iPod Touch, Android, Opera Mini Simulator
 */
-.form_notice #notice_text-count + label,
+.form_notice .count + label,
 .form_notice label[for="notice_data-attach"] {
 display:none;
 }
diff --git a/theme/cleaner/css/ie.css b/theme/cleaner/css/ie.css
index 97957afd21..af883e7b4f 100644
--- a/theme/cleaner/css/ie.css
+++ b/theme/cleaner/css/ie.css
@@ -7,7 +7,7 @@ top:0;
 .form_notice textarea {
     width: 328px;
 }
-.form_notice .form_note + label {
+.form_notice .count + label {
 position:absolute;
 top:25px;
 left:83%;
@@ -69,7 +69,7 @@ line-height:auto;
     filter: alpha(opacity=0);
 }
 
-.form_notice .form_note + label {
+.form_notice .count + label {
     background:transparent url(../../rebase/images/icons/icons-01.gif) no-repeat 0 -328px;
 }
 
diff --git a/theme/cleaner/css/mp-screen.css b/theme/cleaner/css/mp-screen.css
index d3f95db9b6..22cc923e81 100644
--- a/theme/cleaner/css/mp-screen.css
+++ b/theme/cleaner/css/mp-screen.css
@@ -80,7 +80,7 @@ float:left;
     padding: 4px;
 }
 
-#notice_text-count {
+.form_notice .count {
 position:absolute;
 bottom:2px;
     left: 175px;
@@ -88,14 +88,14 @@ bottom:2px;
 z-index:9;
 }
 
-#form_notice-direct.form_notice #notice_text-count {
+#form_notice-direct.form_notice .count {
     left: 0px;
 }
 
 /*input type=file no good in
 iPhone/iPod Touch, Android, Opera Mini Simulator
 */
-.form_notice #notice_text-count + label,
+.form_notice .count + label,
 .form_notice label[for="notice_data-attach"] {
 display:none;
 }
diff --git a/theme/cloudy/css/display.css b/theme/cloudy/css/display.css
index 6787d9f2b4..814f879bc3 100644
--- a/theme/cloudy/css/display.css
+++ b/theme/cloudy/css/display.css
@@ -509,17 +509,17 @@ height:16px;
 padding:0;
 height:16px;
 }
-.form_notice .form_note {
+.form_notice .count {
 position:absolute;
 bottom:2px;
 right:21.715%;
 z-index:9;
 }
-.form_notice .form_note dt {
+.form_notice .count dt {
 font-weight:bold;
 display:none;
 }
-.form_notice #notice_text-count {
+.form_notice .count {
 font-weight:bold;
 line-height:1.15;
 padding:1px 2px;
@@ -1673,7 +1673,7 @@ background-position:0 -1912px;
 }
 
 input.submit,
-.form_notice.warning #notice_text-count,
+.form_notice.warning .count,
 .form_settings .form_note,
 .entity_actions a,
 .entity_actions input,
@@ -1691,7 +1691,7 @@ background-color:transparent;
 }
 input:focus, textarea:focus, select:focus,
 .form_notice.warning textarea,
-.form_notice.warning #notice_text-count,
+.form_notice.warning .count,
 .form_settings .form_note {
 border-color:#9BB43E;
 }
@@ -1706,7 +1706,7 @@ background-color:transparent;
 }
 input:focus, textarea:focus, select:focus,
 .form_notice.warning textarea,
-.form_notice.warning #notice_text-count,
+.form_notice.warning .count,
 .form_settings .form_note {
 border-color:#9BB43E;
 }
@@ -1781,10 +1781,10 @@ border-color:#AAAAAA;
 background-color:#DDFFCC;
 }
 
-#notice_text-count {
+.form_notice .count {
 color:#000000;
 }
-#form_notice.warning #notice_text-count {
+#form_notice.warning .count {
 color:#000000;
 }
 #form_notice label[for=notice_data-attach] {
@@ -2071,7 +2071,7 @@ border-color:#FFFF00;
 }
 
 
-#form_notice .form_note {
+.form_notice .count {
 color:#CCC;
 }
 
diff --git a/theme/cloudy/css/ie.css b/theme/cloudy/css/ie.css
index a7b34a2f39..03cfb23d3b 100644
--- a/theme/cloudy/css/ie.css
+++ b/theme/cloudy/css/ie.css
@@ -18,14 +18,14 @@ background-color:#ddffcc;
 #form_notice {
 width:525px;
 }
-#form_notice .form_note {
+.form_notice .count {
 top:-5px;
 right:0;
 }
 #form_notice textarea {
 width:97.75%;
 }
-#form_notice .form_note + label {
+.form_notice .count + label {
 position:absolute;
 top:87px;
 left:77%;
diff --git a/theme/default/css/display.css b/theme/default/css/display.css
index 17f10c30e7..63554aae18 100644
--- a/theme/default/css/display.css
+++ b/theme/default/css/display.css
@@ -57,12 +57,12 @@ border-color:#DDDDDD;
 background:none;
 }
 
-.form_notice.warning #notice_text-count,
+.form_notice.warning .count,
 .form_settings .form_note {
 background-color:#9BB43E;
 }
 input.submit,
-.form_notice.warning #notice_text-count,
+.form_notice.warning .count,
 .form_settings .form_note,
 .entity_actions a,
 .entity_actions input,
@@ -81,7 +81,7 @@ background-color:transparent;
 }
 input:focus, textarea:focus, select:focus,
 .form_notice.warning textarea,
-.form_notice.warning #notice_text-count,
+.form_notice.warning .count,
 .form_settings .form_note,
 .entity_actions .dialogbox .form_data input:focus {
 border-color:#9BB43E;
@@ -144,10 +144,10 @@ border-top-color:#C8D1D5;
 background-color:#C8D1D5;
 }
 
-#notice_text-count {
+.form_notice .count {
 color:#333333;
 }
-.form_notice.warning #notice_text-count,
+.form_notice.warning .count,
 .dialogbox,
 .entity_actions .dialogbox input {
 color:#000000;
diff --git a/theme/default/css/ie.css b/theme/default/css/ie.css
index 6a95e0369e..2bbeb7ffa4 100644
--- a/theme/default/css/ie.css
+++ b/theme/default/css/ie.css
@@ -13,7 +13,7 @@ color:#FFFFFF;
 #site_nav_local_views a {
 background-color:#C8D1D5;
 }
-.form_notice .form_note + label {
+.form_notice .count + label {
 background:transparent url(../../base/images/icons/icons-01.gif) no-repeat 0 -328px;
 }
 .form_notice #notice_data-attach {
diff --git a/theme/h4ck3r/css/base.css b/theme/h4ck3r/css/base.css
index a4dac0145a..22daceeba8 100644
--- a/theme/h4ck3r/css/base.css
+++ b/theme/h4ck3r/css/base.css
@@ -432,17 +432,17 @@ margin-bottom:7px;
 #form_notice #notice_submit label {
 display:none;
 }
-#form_notice .form_note {
+.form_notice .count {
 position:absolute;
 top:99px;
 right:98px;
 z-index:9;
 }
-#form_notice .form_note dt {
+.form_notice .count dt {
 font-weight:bold;
 display:none;
 }
-#notice_text-count {
+.form_notice .count {
 font-weight:bold;
 line-height:1.15;
 padding:1px 2px;
diff --git a/theme/h4ck3r/css/display.css b/theme/h4ck3r/css/display.css
index 96b9ce5661..8bd5ad9f4c 100644
--- a/theme/h4ck3r/css/display.css
+++ b/theme/h4ck3r/css/display.css
@@ -44,7 +44,7 @@ background:none;
 }
 
 input.submit,
-#form_notice.warning #notice_text-count,
+#form_notice.warning .count,
 .form_settings .form_note,
 .entity_remote_subscribe {
 background-color:rgba(0, 255, 0, 0.5);
@@ -82,10 +82,10 @@ border-top-color:#87B4C8;
 background-color:rgba(0,128,0,0.3);
 }
 
-#notice_text-count {
+.form_notice .count {
 color:#0f0;
 }
-#form_notice.warning #notice_text-count {
+#form_notice.warning .count {
 color:#000;
 }
 #form_notice.processing #notice_action-submit {
diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index 32b8d88d0b..211c539dcb 100644
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -57,12 +57,12 @@ border-color:#DDDDDD;
 background:none;
 }
 
-.form_notice.warning #notice_text-count,
+.form_notice.warning .count,
 .form_settings .form_note {
 background-color:#9BB43E;
 }
 input.submit,
-.form_notice.warning #notice_text-count,
+.form_notice.warning .count,
 .form_settings .form_note,
 .entity_actions a,
 .entity_actions input,
@@ -81,7 +81,7 @@ background-color:transparent;
 }
 input:focus, textarea:focus, select:focus,
 .form_notice.warning textarea,
-.form_notice.warning #notice_text-count,
+.form_notice.warning .count,
 .form_settings .form_note,
 .entity_actions .dialogbox .form_data input:focus {
 border-color:#9BB43E;
@@ -145,10 +145,10 @@ border-top-color:#CEE1E9;
 background-color:#CEE1E9;
 }
 
-#notice_text-count {
+.form_notice .count {
 color:#333333;
 }
-.form_notice.warning #notice_text-count,
+.form_notice.warning .count,
 .dialogbox,
 .entity_actions .dialogbox input {
 color:#000000;
diff --git a/theme/identica/css/ie.css b/theme/identica/css/ie.css
index 62b62748b0..888c486f40 100644
--- a/theme/identica/css/ie.css
+++ b/theme/identica/css/ie.css
@@ -13,7 +13,7 @@ color:#FFFFFF;
 #site_nav_local_views a {
 background-color:#D9DADB;
 }
-.form_notice .form_note + label {
+.form_notice .count + label {
 background:transparent url(../../base/images/icons/icons-01.gif) no-repeat 0 -328px;
 }
 .form_notice #notice_data-attach {
diff --git a/theme/mnml/css/display.css b/theme/mnml/css/display.css
index e4b9012955..ee2cefe619 100644
--- a/theme/mnml/css/display.css
+++ b/theme/mnml/css/display.css
@@ -954,17 +954,17 @@ opacity: 0;
 padding:0;
 height:1.6em;
 }
-.form_notice .form_note {
+.form_notice .count {
 position:absolute;
 bottom:2px;
 right:21.715%;
 z-index:9;
 }
-.form_notice .form_note dt {
+.form_notice .count dt {
 font-weight:bold;
 display:none;
 }
-.form_notice #notice_text-count {
+.form_notice .count {
 font-family: 'TeXGyreHerosBold', sans-serif;
 line-height:1.15;
 padding:1px 2px;
diff --git a/theme/mnml/css/ie.css b/theme/mnml/css/ie.css
index 0cc8c3acfa..c694d76404 100644
--- a/theme/mnml/css/ie.css
+++ b/theme/mnml/css/ie.css
@@ -20,7 +20,7 @@ img.logo {
 .form_notice textarea {
 width:78%;
 }
-.form_notice .form_note + label {
+.form_notice .count + label {
 position:absolute;
 top:25px;
 left:83%;
@@ -41,7 +41,7 @@ width:78.75%;
 .form_notice #notice_data-geo_selected button {
 padding:0 4px;
 }
-.form_notice .form_note + label {
+.form_notice .count + label {
     background:transparent url(../images/icons/icons-01.png) no-repeat 0 -328px;
 }
 
diff --git a/theme/mnml/css/mp-screen.css b/theme/mnml/css/mp-screen.css
index cc9514174a..ff8f044ca9 100644
--- a/theme/mnml/css/mp-screen.css
+++ b/theme/mnml/css/mp-screen.css
@@ -100,7 +100,7 @@ width:60%;
 height:20px;
 }
 
-#notice_text-count {
+.form_notice .count {
 position:absolute;
 bottom:2px;
 right:40%;
@@ -110,7 +110,7 @@ z-index:9;
 /*input type=file no good in
 iPhone/iPod Touch, Android, Opera Mini Simulator
 */
-#form_notice #notice_text-count + label,
+.form_notice .count + label,
 #form_notice label[for="notice_data-attach"] {
 display:none;
 }
diff --git a/theme/pigeonthoughts/css/base.css b/theme/pigeonthoughts/css/base.css
index 66948f7318..20a4f31548 100644
--- a/theme/pigeonthoughts/css/base.css
+++ b/theme/pigeonthoughts/css/base.css
@@ -467,17 +467,17 @@ left:183px;
 padding:0;
 height:16px;
 }
-#form_notice .form_note {
+.form_notice .count {
 position:absolute;
 top:76px;
 right:98px;
 z-index:9;
 }
-#form_notice .form_note dt {
+.form_notice .count dt {
 font-weight:bold;
 display:none;
 }
-#notice_text-count {
+.form_notice .count {
 font-weight:bold;
 line-height:1.15;
 padding:1px 2px;
diff --git a/theme/pigeonthoughts/css/display.css b/theme/pigeonthoughts/css/display.css
index 768d030376..155a473519 100644
--- a/theme/pigeonthoughts/css/display.css
+++ b/theme/pigeonthoughts/css/display.css
@@ -43,7 +43,7 @@ background:none;
 }
 
 input.submit,
-#form_notice.warning #notice_text-count,
+#form_notice.warning .count,
 .form_settings .form_note,
 .entity_remote_subscribe {
 background-color:#8F0000;
@@ -186,10 +186,10 @@ border-top-color:#87B4C8;
 background:url(../images/illustrations/illu_pigeons-02.png) no-repeat 10% 100%;
 }
 
-#notice_text-count {
+.form_notice .count {
 color:#333333;
 }
-#form_notice.warning #notice_text-count {
+#form_notice.warning .count {
 color:#000000;
 }
 #form_notice label[for=notice_data-attach] {
diff --git a/theme/rebase/css/display.css b/theme/rebase/css/display.css
index ad462b947e..21ef1988a7 100644
--- a/theme/rebase/css/display.css
+++ b/theme/rebase/css/display.css
@@ -245,7 +245,7 @@ address .poweredby {
     height:16px;
 }
 
-.form_notice .form_note {
+.form_notice .count {
     position: absolute;
     bottom: 0px;
     right: 125px;
@@ -253,15 +253,15 @@ address .poweredby {
     font-size: 0.8em; 
 }
 
-.form_notice .form_note dt {
+.form_notice .count dt {
     display:none;
 }
 
-.form_notice #notice_text-count {
+.form_notice .count {
     color: #777;
 }
 
-.form_notice.warning #notice_text-count {
+.form_notice.warning .count {
     color: #ff0000;
 }        
 
diff --git a/theme/rebase/css/ie.css b/theme/rebase/css/ie.css
index f02a07c7b8..e56c0c7810 100644
--- a/theme/rebase/css/ie.css
+++ b/theme/rebase/css/ie.css
@@ -7,7 +7,7 @@ top:0;
 .form_notice textarea {
     width: 485px;
 }
-.form_notice .form_note + label {
+.form_notice .count + label {
 position:absolute;
 top:25px;
 left:83%;
@@ -65,7 +65,7 @@ line-height:auto;
     filter: alpha(opacity=0);
 }
 
-.form_notice .form_note + label {
+.form_notice .count + label {
     background:transparent url(../images/icons/icons-01.gif) no-repeat 0 -328px;
 }
 
diff --git a/theme/shiny/css/ie.css b/theme/shiny/css/ie.css
index 792c94a9d7..a24ad40194 100644
--- a/theme/shiny/css/ie.css
+++ b/theme/shiny/css/ie.css
@@ -7,7 +7,7 @@ top:0;
 .form_notice textarea {
     width: 362px;
 }
-.form_notice .form_note + label {
+.form_notice .count + label {
 position:absolute;
 top:25px;
 left:83%;
@@ -67,7 +67,7 @@ line-height:auto;
     filter: alpha(opacity=0);
 }
 
-.form_notice .form_note + label {
+.form_notice .count + label {
     background:transparent url(../../rebase/images/icons/icons-01.gif) no-repeat 0 -328px;
 }
 
diff --git a/theme/shiny/css/mp-screen.css b/theme/shiny/css/mp-screen.css
index 6a47b8e7f4..4bde3db71e 100644
--- a/theme/shiny/css/mp-screen.css
+++ b/theme/shiny/css/mp-screen.css
@@ -80,7 +80,7 @@ float:left;
     padding: 4px;
 }
 
-#notice_text-count {
+.form_notice .count {
 position:absolute;
 bottom:2px;
     left: 175px;
@@ -88,14 +88,14 @@ bottom:2px;
 z-index:9;
 }
 
-#form_notice-direct.form_notice #notice_text-count {
+#form_notice-direct.form_notice .count {
     left: -185px;
 }
 
 /*input type=file no good in
 iPhone/iPod Touch, Android, Opera Mini Simulator
 */
-.form_notice #notice_text-count + label,
+.form_notice .count + label,
 .form_notice label[for="notice_data-attach"] {
 display:none;
 }
diff --git a/theme/victorian/css/display.css b/theme/victorian/css/display.css
index d2695d163f..3ab7fc601a 100644
--- a/theme/victorian/css/display.css
+++ b/theme/victorian/css/display.css
@@ -43,7 +43,7 @@
 
 /* bolding */
 
-caption, legend, input.submit, form label, .form_settings #settings_autosubscribe label, address .fn, .system_notice dt, #anon_notice, #site_nav_local_views a, #licenses dt, .form_notice .form_note dt, .form_notice #notice_text-count, button.close, button.minimize, .entity_profile dt, #entity_statistics dt, .entity_profile .fn, .entity_profile .nickname, .entity_actions a, .entity_moderation p, .entity_role p, #showapplication .entity_data dt, .notice .author .fn, .dialogbox .submit_dialogbox, #attachments dt, #attachment_view #oembed_info dt, #filter_tags_all a, .pagination dt, .pagination a, #tagcloud.section dt {
+caption, legend, input.submit, form label, .form_settings #settings_autosubscribe label, address .fn, .system_notice dt, #anon_notice, #site_nav_local_views a, #licenses dt, .form_notice .count dt, .form_notice .count, button.close, button.minimize, .entity_profile dt, #entity_statistics dt, .entity_profile .fn, .entity_profile .nickname, .entity_actions a, .entity_moderation p, .entity_role p, #showapplication .entity_data dt, .notice .author .fn, .dialogbox .submit_dialogbox, #attachments dt, #attachment_view #oembed_info dt, #filter_tags_all a, .pagination dt, .pagination a, #tagcloud.section dt {
     font-weight: normal;
     font-family: 'LinuxLibertineBold', serif;
 }
@@ -228,13 +228,13 @@ h1, h2, h3, h4, h5, h6 {
     background:none;
 }
 
-.form_notice.warning #notice_text-count,
+.form_notice.warning .count,
 .form_settings .form_note {
     background-color:#9BB43E;
 }
 
 input.submit,
-.form_notice.warning #notice_text-count,
+.form_notice.warning .count,
 .form_settings .form_note,
 .entity_actions a,
 .entity_actions input,
@@ -255,7 +255,7 @@ button {
 
 input:focus, textarea:focus, select:focus,
 .form_notice.warning textarea,
-.form_notice.warning #notice_text-count,
+.form_notice.warning .count,
 .form_settings .form_note,
 .entity_actions .dialogbox .form_data input:focus {
     border-color:#9BB43E;
@@ -318,11 +318,11 @@ a,
     border-top-color:#C8D1D5;
 }
 
-#notice_text-count {
+.form_notice .count {
     color:#333333;
 }
 
-.form_notice.warning #notice_text-count,
+.form_notice.warning .count,
 .dialogbox,
 .entity_actions .dialogbox input {
     color:#000000;
diff --git a/theme/victorian/css/ie.css b/theme/victorian/css/ie.css
index 2283471661..038195faaf 100644
--- a/theme/victorian/css/ie.css
+++ b/theme/victorian/css/ie.css
@@ -6,7 +6,7 @@ color:#FFFFFF;
 #site_nav_local_views a {
 background-color:#C8D1D5;
 }
-.form_notice .form_note + label {
+.form_notice .count + label {
 background:transparent url(../../base/images/icons/icons-01.gif) no-repeat 0 -328px;
 }
 .form_notice #notice_data-attach {
diff --git a/theme/victorian/css/mp-screen.css b/theme/victorian/css/mp-screen.css
index 5639f290fb..89f168fe0a 100644
--- a/theme/victorian/css/mp-screen.css
+++ b/theme/victorian/css/mp-screen.css
@@ -95,7 +95,7 @@ width:60%;
 height:20px;
 }
 
-#notice_text-count {
+.form_notice .count {
 position:absolute;
 bottom:2px;
 right:40%;
@@ -105,7 +105,7 @@ z-index:9;
 /*input type=file no good in
 iPhone/iPod Touch, Android, Opera Mini Simulator
 */
-#form_notice #notice_text-count + label,
+.form_notice .count + label,
 #form_notice label[for="notice_data-attach"] {
 display:none;
 }

From 9d40c8f835af6e68816c87b28879fc3bd1985d66 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Thu, 3 Mar 2011 17:39:37 -0800
Subject: [PATCH 387/655] Pulling out some more #-references to per-form items

---
 js/util.js     | 38 ++++++++++++++++++--------------------
 js/util.min.js |  2 +-
 2 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/js/util.js b/js/util.js
index 538eb44602..72eaa16d10 100644
--- a/js/util.js
+++ b/js/util.js
@@ -433,12 +433,10 @@ var SN = { // StatusNet
                             .removeAttr(SN.C.S.Disabled)
                             .removeClass(SN.C.S.Disabled);
 
-                    $('#'+SN.C.S.NoticeLat).val(SN.C.I.NoticeDataGeo.NLat);
-                    $('#'+SN.C.S.NoticeLon).val(SN.C.I.NoticeDataGeo.NLon);
-                    if ($('#'+SN.C.S.NoticeLocationNs)) {
-                        $('#'+SN.C.S.NoticeLocationNs).val(SN.C.I.NoticeDataGeo.NLNS);
-                        $('#'+SN.C.S.NoticeLocationId).val(SN.C.I.NoticeDataGeo.NLID);
-                    }
+                    form.find('[name=lat]').val(SN.C.I.NoticeDataGeo.NLat);
+                    form.find('[name=lon]').val(SN.C.I.NoticeDataGeo.NLon);
+                    form.find('[name=location_ns]').val(SN.C.I.NoticeDataGeo.NLNS);
+                    form.find('[name=location_id]').val(SN.C.I.NoticeDataGeo.NLID);
                     $('#'+SN.C.S.NoticeDataGeo).attr('checked', SN.C.I.NoticeDataGeo.NDG);
                 }
             });
@@ -981,10 +979,10 @@ var SN = { // StatusNet
                     .attr('title', jQuery.trim($('label[for='+SN.C.S.NoticeDataGeo+']').text()))
                     .removeClass('checked');
 
-                $('#'+SN.C.S.NoticeLat).val('');
-                $('#'+SN.C.S.NoticeLon).val('');
-                $('#'+SN.C.S.NoticeLocationNs).val('');
-                $('#'+SN.C.S.NoticeLocationId).val('');
+                $('.form_notice [name=lat]').val('');
+                $('.form_notice [name=lon]').val('');
+                $('.form_notice [name=location_ns]').val('');
+                $('.form_notice [name=location_id]').val('');
                 $('#'+SN.C.S.NoticeDataGeo).attr('checked', false);
 
                 $.cookie(SN.C.S.NoticeDataGeoCookie, 'disabled', { path: '/' });
@@ -1023,10 +1021,10 @@ var SN = { // StatusNet
                     $('label[for='+SN.C.S.NoticeDataGeo+']')
                         .attr('title', NoticeDataGeo_text.ShareDisable + ' (' + NLN_text + ')');
 
-                    $('#'+SN.C.S.NoticeLat).val(data.lat);
-                    $('#'+SN.C.S.NoticeLon).val(data.lon);
-                    $('#'+SN.C.S.NoticeLocationNs).val(lns);
-                    $('#'+SN.C.S.NoticeLocationId).val(lid);
+                    $('.form_notice [name=lat]').val(data.lat);
+                    $('.form_notice [name=lon]').val(data.lon);
+                    $('.form_notice [name=location_ns]').val(lns);
+                    $('.form_notice [name=location_id]').val(lid);
                     $('#'+SN.C.S.NoticeDataGeo).attr('checked', true);
 
                     var cookieValue = {
@@ -1069,8 +1067,8 @@ var SN = { // StatusNet
                                 SN.U.NoticeGeoStatus('Requesting location from browser...');
                                 navigator.geolocation.getCurrentPosition(
                                     function(position) {
-                                        $('#'+SN.C.S.NoticeLat).val(position.coords.latitude);
-                                        $('#'+SN.C.S.NoticeLon).val(position.coords.longitude);
+                                        $('.form_notice [name=lat]').val(position.coords.latitude);
+                                        $('.form_notice [name=lon]').val(position.coords.longitude);
 
                                         var data = {
                                             lat: position.coords.latitude,
@@ -1118,10 +1116,10 @@ var SN = { // StatusNet
                         else {
                             var cookieValue = JSON.parse($.cookie(SN.C.S.NoticeDataGeoCookie));
 
-                            $('#'+SN.C.S.NoticeLat).val(cookieValue.NLat);
-                            $('#'+SN.C.S.NoticeLon).val(cookieValue.NLon);
-                            $('#'+SN.C.S.NoticeLocationNs).val(cookieValue.NLNS);
-                            $('#'+SN.C.S.NoticeLocationId).val(cookieValue.NLID);
+                            $('.form_notice [name=lat]').val(cookieValue.NLat);
+                            $('.form_notice [name=lon]').val(cookieValue.NLon);
+                            $('.form_notice [name=location_ns]').val(cookieValue.NLNS);
+                            $('.form_notice [name=location_id]').val(cookieValue.NLID);
                             $('#'+SN.C.S.NoticeDataGeo).attr('checked', cookieValue.NDG);
 
                             SN.U.NoticeGeoStatus(cookieValue.NLN, cookieValue.NLat, cookieValue.NLon, cookieValue.NLNU);
diff --git a/js/util.min.js b/js/util.min.js
index 40b534cc87..791d19f6e9 100644
--- a/js/util.min.js
+++ b/js/util.min.js
@@ -1 +1 @@
-var SN={C:{I:{CounterBlackout:false,MaxLength:140,PatternUsername:/^[0-9a-zA-Z\-_.]*$/,HTTP20x30x:[200,201,202,203,204,205,206,300,301,302,303,304,305,306,307]},S:{Disabled:"disabled",Warning:"warning",Error:"error",Success:"success",Processing:"processing",CommandResult:"command_result",FormNotice:"form_notice",NoticeInReplyTo:"notice_in-reply-to",NoticeActionSubmit:"notice_action-submit",NoticeLat:"notice_data-lat",NoticeLon:"notice_data-lon",NoticeLocationId:"notice_data-location_id",NoticeLocationNs:"notice_data-location_ns",NoticeGeoName:"notice_data-geo_name",NoticeDataGeo:"notice_data-geo",NoticeDataGeoCookie:"NoticeDataGeo",NoticeDataGeoSelected:"notice_data-geo_selected",StatusNetInstance:"StatusNetInstance"}},messages:{},msg:function(a){if(typeof SN.messages[a]=="undefined"){return"["+a+"]"}else{return SN.messages[a]}},U:{FormNoticeEnhancements:function(b){if(jQuery.data(b[0],"ElementData")===undefined){MaxLength=b.find(".count").text();if(typeof(MaxLength)=="undefined"){MaxLength=SN.C.I.MaxLength}jQuery.data(b[0],"ElementData",{MaxLength:MaxLength});SN.U.Counter(b);NDT=b.find("[name=status_textarea]");NDT.bind("keyup",function(c){SN.U.Counter(b)});var a=function(c){window.setTimeout(function(){SN.U.Counter(b)},50)};NDT.bind("cut",a).bind("paste",a)}else{b.find(".count").text(jQuery.data(b[0],"ElementData").MaxLength)}},Counter:function(d){SN.C.I.FormNoticeCurrent=d;var b=jQuery.data(d[0],"ElementData").MaxLength;if(b<=0){return}var c=b-SN.U.CharacterCount(d);var a=d.find(".count");if(c.toString()!=a.text()){if(!SN.C.I.CounterBlackout||c===0){if(a.text()!=String(c)){a.text(c)}if(c<0){d.addClass(SN.C.S.Warning)}else{d.removeClass(SN.C.S.Warning)}if(!SN.C.I.CounterBlackout){SN.C.I.CounterBlackout=true;SN.C.I.FormNoticeCurrent=d;window.setTimeout("SN.U.ClearCounterBlackout(SN.C.I.FormNoticeCurrent);",500)}}}},CharacterCount:function(a){return a.find("[name=status_textarea]").val().length},ClearCounterBlackout:function(a){SN.C.I.CounterBlackout=false;SN.U.Counter(a)},RewriteAjaxAction:function(a){if(document.location.protocol=="https:"&&a.substr(0,5)=="http:"){return a.replace(/^http:\/\/[^:\/]+/,"https://"+document.location.host)}else{return a}},FormXHR:function(a){$.ajax({type:"POST",dataType:"xml",url:SN.U.RewriteAjaxAction(a.attr("action")),data:a.serialize()+"&ajax=1",beforeSend:function(b){a.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(c,d,b){alert(b||d)},success:function(b,c){if(typeof($("form",b)[0])!="undefined"){form_new=document._importNode($("form",b)[0],true);a.replaceWith(form_new)}else{a.replaceWith(document._importNode($("p",b)[0],true))}}})},FormNoticeXHR:function(b){SN.C.I.NoticeDataGeo={};b.append('<input type="hidden" name="ajax" value="1"/>');b.attr("action",SN.U.RewriteAjaxAction(b.attr("action")));var c=function(d,e){b.append($('<p class="form_response"></p>').addClass(d).text(e))};var a=function(){b.find(".form_response").remove()};b.ajaxForm({dataType:"xml",timeout:"60000",beforeSend:function(d){if(b.find("[name=status_textarea]").val()==""){b.addClass(SN.C.S.Warning);return false}b.addClass(SN.C.S.Processing).find("#"+SN.C.S.NoticeActionSubmit).addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled);SN.U.normalizeGeoData(b);return true},error:function(f,g,e){b.removeClass(SN.C.S.Processing).find("#"+SN.C.S.NoticeActionSubmit).removeClass(SN.C.S.Disabled).removeAttr(SN.C.S.Disabled,SN.C.S.Disabled);a();if(g=="timeout"){c("error","Sorry! We had trouble sending your notice. The servers are overloaded. Please try again, and contact the site administrator if this problem persists.")}else{var d=SN.U.GetResponseXML(f);if($("."+SN.C.S.Error,d).length>0){b.append(document._importNode($("."+SN.C.S.Error,d)[0],true))}else{if(parseInt(f.status)===0||jQuery.inArray(parseInt(f.status),SN.C.I.HTTP20x30x)>=0){b.resetForm().find(".attach-status").remove();SN.U.FormNoticeEnhancements(b)}else{c("error","(Sorry! We had trouble sending your notice ("+f.status+" "+f.statusText+"). Please report the problem to the site administrator if this happens again.")}}}},success:function(i,k){a();var e=$("#"+SN.C.S.Error,i);if(e.length>0){c("error",e.text())}else{if($("body")[0].id=="bookmarklet"){self.close()}var d=$("#"+SN.C.S.CommandResult,i);if(d.length>0){c("success",d.text())}else{var h=document._importNode($("li",i)[0],true);var j=$("#notices_primary .notices:first");if(j.length>0&&SN.U.belongsOnTimeline(h)){if($("#"+h.id).length===0){var f=$("#"+SN.C.S.NoticeInReplyTo).val();var g="#notices_primary #notice-"+f;if($("body")[0].id=="conversation"){if(f.length>0&&$(g+" .notices").length<1){$(g).append('<ul class="notices"></ul>')}$($(g+" .notices")[0]).append(h)}else{j.prepend(h)}$("#"+h.id).css({display:"none"}).fadeIn(2500);SN.U.NoticeWithAttachment($("#"+h.id));SN.U.NoticeReplyTo($("#"+h.id))}}else{c("success",$("title",i).text())}}b.resetForm();b.find("[name=inreplyto]").val("");b.find(".attach-status").remove();SN.U.FormNoticeEnhancements(b)}},complete:function(d,e){b.removeClass(SN.C.S.Processing).find("#"+SN.C.S.NoticeActionSubmit).removeAttr(SN.C.S.Disabled).removeClass(SN.C.S.Disabled);$("#"+SN.C.S.NoticeLat).val(SN.C.I.NoticeDataGeo.NLat);$("#"+SN.C.S.NoticeLon).val(SN.C.I.NoticeDataGeo.NLon);if($("#"+SN.C.S.NoticeLocationNs)){$("#"+SN.C.S.NoticeLocationNs).val(SN.C.I.NoticeDataGeo.NLNS);$("#"+SN.C.S.NoticeLocationId).val(SN.C.I.NoticeDataGeo.NLID)}$("#"+SN.C.S.NoticeDataGeo).attr("checked",SN.C.I.NoticeDataGeo.NDG)}})},normalizeGeoData:function(a){SN.C.I.NoticeDataGeo.NLat=a.find("[name=lat]").val();SN.C.I.NoticeDataGeo.NLon=a.find("[name=lon]").val();SN.C.I.NoticeDataGeo.NLNS=a.find("[name=location_ns]").val();SN.C.I.NoticeDataGeo.NLID=a.find("[name=location_id]").val();SN.C.I.NoticeDataGeo.NDG=$("#"+SN.C.S.NoticeDataGeo).attr("checked");var b=$.cookie(SN.C.S.NoticeDataGeoCookie);if(b!==null&&b!="disabled"){b=JSON.parse(b);SN.C.I.NoticeDataGeo.NLat=a.find("[name=lat]").val(b.NLat).val();SN.C.I.NoticeDataGeo.NLon=a.find("[name=lon]").val(b.NLon).val();if(b.NLNS){SN.C.I.NoticeDataGeo.NLNS=a.find("[name=location_ns]").val(b.NLNS).val();SN.C.I.NoticeDataGeo.NLID=a.find("[name=location_id]").val(b.NLID).val()}else{a.find("[name=location_ns]").val("");a.find("[name=location_id]").val("")}}if(b=="disabled"){SN.C.I.NoticeDataGeo.NDG=$("#"+SN.C.S.NoticeDataGeo).attr("checked",false).attr("checked")}else{SN.C.I.NoticeDataGeo.NDG=$("#"+SN.C.S.NoticeDataGeo).attr("checked",true).attr("checked")}},GetResponseXML:function(b){try{return b.responseXML}catch(a){return(new DOMParser()).parseFromString(b.responseText,"text/xml")}},NoticeReply:function(){if($("#content .notice_reply").length>0){$("#content .notice").each(function(){SN.U.NoticeReplyTo($(this))})}},NoticeReplyTo:function(a){a.find(".notice_reply").live("click",function(c){c.preventDefault();var b=($(".author .nickname",a).length>0)?$($(".author .nickname",a)[0]):$(".author .nickname.uid");SN.U.NoticeInlineReplyTrigger(a,"@"+b.text());return false})},NoticeInlineReplyTrigger:function(h,i){var c=$($(".notice_id",h)[0]).text();var d=h;var f=h.closest(".notices");if(f.hasClass("threaded-replies")){d=f.closest(".notice")}else{f=$("ul.threaded-replies",h);if(f.length==0){f=$('<ul class="notices threaded-replies xoxo"></ul>');h.append(f)}}var k=$(".notice-reply-form",f);if(k.length==0){$("li.notice-reply-placeholder").remove();var g=$("li.notice-reply",f);if(g.length==0){g=$('<li class="notice-reply"><form class="notice-reply-form" method="post"><textarea name="status_textarea"></textarea><div class="controls"><input type="hidden" name="token"><input type="hidden" name="inreplyto"><input type="submit" class="submit"></div></form></li>');var b=$("#form_notice");k=g.find("form");k.attr("action",b.attr("action"));k.find('input[name="token"]').val(b.find("input[name=token]").val());k.find('input[type="submit"]').val(SN.msg("reply_submit"));f.append(g);k.find("textarea").blur(function(){var m=$(this);var l=$.trim(m.val());if(l==""||l==m.data("initialText")){g.remove();if(f.find("li").length>0){SN.U.NoticeInlineReplyPlaceholder(d)}else{f.remove()}}});k.submit(function(m){var l=k;$.ajax({type:"POST",dataType:"xml",url:SN.U.RewriteAjaxAction(l.attr("action")),data:l.serialize()+"&ajax=1",beforeSend:function(n){l.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled).end().find("textarea").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(o,p,n){alert(n||p)},success:function(p,r){var o=$("li",p)[0];if(o){var n=document._importNode(o,true);var q=$(n).attr("id");if($("#"+q).length==0){g.replaceWith(n);SN.U.NoticeInlineReplyPlaceholder(d)}else{g.remove()}}}});m.preventDefault();return false})}}k.find("input[name=inreplyto]").val(c);var j=k.find("textarea");if(j.length==0){throw"No textarea"}var a="";if(i){a=i+" "}j.val(a+j.val().replace(RegExp(a,"i"),""));j.data("initialText",$.trim(i+""));j.focus();if(j[0].setSelectionRange){var e=j.val().length;j[0].setSelectionRange(e,e)}},NoticeFavor:function(){$(".form_favor").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_disfavor").live("click",function(){SN.U.FormXHR($(this));return false})},NoticeInlineReplyPlaceholder:function(b){var a=b.find("ul.threaded-replies");var c=$('<li class="notice-reply-placeholder"><input class="placeholder"></li>');c.click(function(){SN.U.NoticeInlineReplyTrigger(b)});c.find("input").val(SN.msg("reply_placeholder"));a.append(c)},NoticeInlineReplySetup:function(){$(".threaded-replies").each(function(){var b=$(this);var a=b.closest(".notice");SN.U.NoticeInlineReplyPlaceholder(a)})},NoticeRepeat:function(){$(".form_repeat").live("click",function(a){a.preventDefault();SN.U.NoticeRepeatConfirmation($(this));return false})},NoticeRepeatConfirmation:function(a){var c=a.find(".submit");var b=c.clone();b.addClass("submit_dialogbox").removeClass("submit");a.append(b);b.bind("click",function(){SN.U.FormXHR(a);return false});c.hide();a.addClass("dialogbox").append('<button class="close">&#215;</button>').closest(".notice-options").addClass("opaque");a.find("button.close").click(function(){$(this).remove();a.removeClass("dialogbox").closest(".notice-options").removeClass("opaque");a.find(".submit_dialogbox").remove();a.find(".submit").show();return false})},NoticeAttachments:function(){$(".notice a.attachment").each(function(){SN.U.NoticeWithAttachment($(this).closest(".notice"))})},NoticeWithAttachment:function(b){if(b.find(".attachment").length===0){return}var a=b.find(".attachment.more");if(a.length>0){$(a[0]).click(function(){var c=$(this);c.addClass(SN.C.S.Processing);$.get(c.attr("href")+"/ajax",null,function(d){c.parent(".entry-content").html($(d).find("#attachment_view .entry-content").html())});return false}).attr("title",SN.msg("showmore_tooltip"))}},NoticeDataAttach:function(b){var a=b.find("input[type=file]");a.change(function(f){b.find(".attach-status").remove();var d=$(this).val();if(!d){return false}var c=$('<div class="attach-status '+SN.C.S.Success+'"><code></code> <button class="close">&#215;</button></div>');c.find("code").text(d);c.find("button").click(function(){c.remove();a.val("");return false});b.append(c);if(typeof this.files=="object"){for(var e=0;e<this.files.length;e++){SN.U.PreviewAttach(b,this.files[e])}}})},maxFileSize:function(b){var a=$(b).find("input[name=MAX_FILE_SIZE]").attr("value");if(a){return parseInt(a)}else{return 0}},PreviewAttach:function(d,c){var e=c.type+" "+Math.round(c.size/1024)+"KB";var f=true;var h;if(typeof window.createObjectURL!="undefined"){h=function(i,j){j(window.createObjectURL(i))}}else{if(typeof window.FileReader!="undefined"){h=function(j,k){var i=new FileReader();i.onload=function(l){k(i.result)};i.readAsDataURL(j)}}else{f=false}}var a=["image/png","image/jpeg","image/gif","image/svg+xml"];if($.inArray(c.type,a)==-1){f=false}var g=8*1024*1024;if(c.size>g){f=false}if(f){h(c,function(j){var i=$("<img>").attr("title",e).attr("alt",e).attr("src",j).attr("style","height: 120px");d.find(".attach-status").append(i)})}else{var b=$("<div></div>").text(e);d.find(".attach-status").append(b)}},NoticeLocationAttach:function(){var c=$("#"+SN.C.S.NoticeLat).val();var h=$("#"+SN.C.S.NoticeLon).val();var d=$("#"+SN.C.S.NoticeLocationNs).val();var i=$("#"+SN.C.S.NoticeLocationId).val();var a=$("#"+SN.C.S.NoticeGeoName).text();var b=$("#"+SN.C.S.NoticeDataGeo);function e(k){$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",jQuery.trim($("label[for="+SN.C.S.NoticeDataGeo+"]").text())).removeClass("checked");$("#"+SN.C.S.NoticeLat).val("");$("#"+SN.C.S.NoticeLon).val("");$("#"+SN.C.S.NoticeLocationNs).val("");$("#"+SN.C.S.NoticeLocationId).val("");$("#"+SN.C.S.NoticeDataGeo).attr("checked",false);$.cookie(SN.C.S.NoticeDataGeoCookie,"disabled",{path:"/"});if(k){$(".geo_status_wrapper").removeClass("success").addClass("error");$(".geo_status_wrapper .geo_status").text(k)}else{$(".geo_status_wrapper").remove()}}function j(k,l){SN.U.NoticeGeoStatus("Looking up place name...");$.getJSON(k,l,function(m){var n,o;if(typeof(m.location_ns)!="undefined"){$("#"+SN.C.S.NoticeLocationNs).val(m.location_ns);n=m.location_ns}if(typeof(m.location_id)!="undefined"){$("#"+SN.C.S.NoticeLocationId).val(m.location_id);o=m.location_id}if(typeof(m.name)=="undefined"){NLN_text=l.lat+";"+l.lon}else{NLN_text=m.name}SN.U.NoticeGeoStatus(NLN_text,l.lat,l.lon,m.url);$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",NoticeDataGeo_text.ShareDisable+" ("+NLN_text+")");$("#"+SN.C.S.NoticeLat).val(l.lat);$("#"+SN.C.S.NoticeLon).val(l.lon);$("#"+SN.C.S.NoticeLocationNs).val(n);$("#"+SN.C.S.NoticeLocationId).val(o);$("#"+SN.C.S.NoticeDataGeo).attr("checked",true);var p={NLat:l.lat,NLon:l.lon,NLNS:n,NLID:o,NLN:NLN_text,NLNU:m.url,NDG:true};$.cookie(SN.C.S.NoticeDataGeoCookie,JSON.stringify(p),{path:"/"})})}if(b.length>0){if($.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){b.attr("checked",false)}else{b.attr("checked",true)}var f=$("#notice_data-geo_wrap");var g=f.attr("title");f.removeAttr("title");$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",jQuery.trim($("label[for="+SN.C.S.NoticeDataGeo+"]").text()));b.change(function(){if($("#"+SN.C.S.NoticeDataGeo).attr("checked")===true||$.cookie(SN.C.S.NoticeDataGeoCookie)===null){$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",NoticeDataGeo_text.ShareDisable).addClass("checked");if($.cookie(SN.C.S.NoticeDataGeoCookie)===null||$.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){if(navigator.geolocation){SN.U.NoticeGeoStatus("Requesting location from browser...");navigator.geolocation.getCurrentPosition(function(m){$("#"+SN.C.S.NoticeLat).val(m.coords.latitude);$("#"+SN.C.S.NoticeLon).val(m.coords.longitude);var n={lat:m.coords.latitude,lon:m.coords.longitude,token:$("#token").val()};j(g,n)},function(m){switch(m.code){case m.PERMISSION_DENIED:e("Location permission denied.");break;case m.TIMEOUT:e("Location lookup timeout.");break}},{timeout:10000})}else{if(c.length>0&&h.length>0){var k={lat:c,lon:h,token:$("#token").val()};j(g,k)}else{e();$("#"+SN.C.S.NoticeDataGeo).remove();$("label[for="+SN.C.S.NoticeDataGeo+"]").remove()}}}else{var l=JSON.parse($.cookie(SN.C.S.NoticeDataGeoCookie));$("#"+SN.C.S.NoticeLat).val(l.NLat);$("#"+SN.C.S.NoticeLon).val(l.NLon);$("#"+SN.C.S.NoticeLocationNs).val(l.NLNS);$("#"+SN.C.S.NoticeLocationId).val(l.NLID);$("#"+SN.C.S.NoticeDataGeo).attr("checked",l.NDG);SN.U.NoticeGeoStatus(l.NLN,l.NLat,l.NLon,l.NLNU);$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",NoticeDataGeo_text.ShareDisable+" ("+l.NLN+")").addClass("checked")}}else{e()}}).change()}},NoticeGeoStatus:function(a,f,g,c){var e=$("#form_notice");var h=e.find(".geo_status_wrapper");if(h.length==0){h=$('<div class="'+SN.C.S.Success+' geo_status_wrapper"><button class="close" style="float:right">&#215;</button><div class="geo_status"></div></div>');h.find("button.close").click(function(){$("#"+SN.C.S.NoticeDataGeo).removeAttr("checked").change()});e.append(h)}var b;if(c){b=$("<a></a>").attr("href",c)}else{b=$("<span></span>")}b.text(a);if(f||g){var d=f+";"+g;b.attr("title",d);if(!a){b.text(d)}}h.find(".geo_status").empty().append(b)},NewDirectMessage:function(){NDM=$(".entity_send-a-message a");NDM.attr({href:NDM.attr("href")+"&ajax=1"});NDM.bind("click",function(){var a=$(".entity_send-a-message form");if(a.length===0){$(this).addClass(SN.C.S.Processing);$.get(NDM.attr("href"),null,function(b){$(".entity_send-a-message").append(document._importNode($("form",b)[0],true));a=$(".entity_send-a-message .form_notice");SN.U.FormNoticeXHR(a);SN.U.FormNoticeEnhancements(a);a.append('<button class="close">&#215;</button>');$(".entity_send-a-message button").click(function(){a.hide();return false});NDM.removeClass(SN.C.S.Processing)})}else{a.show();$(".entity_send-a-message textarea").focus()}return false})},GetFullYear:function(c,d,a){var b=new Date();b.setFullYear(c,d,a);return b},StatusNetInstance:{Set:function(b){var a=SN.U.StatusNetInstance.Get();if(a!==null){b=$.extend(a,b)}$.cookie(SN.C.S.StatusNetInstance,JSON.stringify(b),{path:"/",expires:SN.U.GetFullYear(2029,0,1)})},Get:function(){var a=$.cookie(SN.C.S.StatusNetInstance);if(a!==null){return JSON.parse(a)}return null},Delete:function(){$.cookie(SN.C.S.StatusNetInstance,null)}},belongsOnTimeline:function(b){var a=$("body").attr("id");if(a=="public"){return true}var c=$("#nav_profile a").attr("href");if(c){var d=$(b).find(".entry-title .author a.url").attr("href");if(d==c){if(a=="all"||a=="showstream"){return true}}}return false}},Init:{NoticeForm:function(){if($("body.user_in").length>0){SN.U.NoticeLocationAttach();$("."+SN.C.S.FormNotice).each(function(){SN.U.FormNoticeXHR($(this));SN.U.FormNoticeEnhancements($(this));SN.U.NoticeDataAttach($(this))})}},Notices:function(){if($("body.user_in").length>0){SN.U.NoticeFavor();SN.U.NoticeRepeat();SN.U.NoticeReply();SN.U.NoticeInlineReplySetup()}SN.U.NoticeAttachments()},EntityActions:function(){if($("body.user_in").length>0){$(".form_user_subscribe").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_user_unsubscribe").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_group_join").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_group_leave").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_user_nudge").live("click",function(){SN.U.FormXHR($(this));return false});SN.U.NewDirectMessage()}},Login:function(){if(SN.U.StatusNetInstance.Get()!==null){var a=SN.U.StatusNetInstance.Get().Nickname;if(a!==null){$("#form_login #nickname").val(a)}}$("#form_login").bind("submit",function(){SN.U.StatusNetInstance.Set({Nickname:$("#form_login #nickname").val()});return true})},UploadForms:function(){$("input[type=file]").change(function(d){if(typeof this.files=="object"&&this.files.length>0){var c=0;for(var b=0;b<this.files.length;b++){c+=this.files[b].size}var a=SN.U.maxFileSize($(this.form));if(a>0&&c>a){var e="File too large: maximum upload size is %d bytes.";alert(e.replace("%d",a));$(this).val("");d.preventDefault();return false}}})}}};$(document).ready(function(){SN.Init.UploadForms();if($("."+SN.C.S.FormNotice).length>0){SN.Init.NoticeForm()}if($("#content .notices").length>0){SN.Init.Notices()}if($("#content .entity_actions").length>0){SN.Init.EntityActions()}if($("#form_login").length>0){SN.Init.Login()}});if(!document.ELEMENT_NODE){document.ELEMENT_NODE=1;document.ATTRIBUTE_NODE=2;document.TEXT_NODE=3;document.CDATA_SECTION_NODE=4;document.ENTITY_REFERENCE_NODE=5;document.ENTITY_NODE=6;document.PROCESSING_INSTRUCTION_NODE=7;document.COMMENT_NODE=8;document.DOCUMENT_NODE=9;document.DOCUMENT_TYPE_NODE=10;document.DOCUMENT_FRAGMENT_NODE=11;document.NOTATION_NODE=12}document._importNode=function(e,a){switch(e.nodeType){case document.ELEMENT_NODE:var d=document.createElement(e.nodeName);if(e.attributes&&e.attributes.length>0){for(var c=0,b=e.attributes.length;c<b;){if(e.attributes[c].nodeName=="class"){d.className=e.getAttribute(e.attributes[c++].nodeName)}else{d.setAttribute(e.attributes[c].nodeName,e.getAttribute(e.attributes[c++].nodeName))}}}if(a&&e.childNodes&&e.childNodes.length>0){for(var c=0,b=e.childNodes.length;c<b;){d.appendChild(document._importNode(e.childNodes[c++],a))}}return d;break;case document.TEXT_NODE:case document.CDATA_SECTION_NODE:case document.COMMENT_NODE:return document.createTextNode(e.nodeValue);break}};if(typeof navigator.geolocation=="undefined"||navigator.geolocation.shim){(function(){(function(){if(window.google&&google.gears){return}var c=null;if(typeof GearsFactory!="undefined"){c=new GearsFactory()}else{try{c=new ActiveXObject("Gears.Factory");if(c.getBuildInfo().indexOf("ie_mobile")!=-1){c.privateSetGlobalObject(this)}}catch(d){if((typeof navigator.mimeTypes!="undefined")&&navigator.mimeTypes["application/x-googlegears"]){c=document.createElement("object");c.style.display="none";c.width=0;c.height=0;c.type="application/x-googlegears";document.documentElement.appendChild(c)}}}if(!c){return}if(!window.google){google={}}if(!google.gears){google.gears={factory:c}}})();var a=(function(){var d=google.gears.factory.create("beta.geolocation");var c=function(f,e){return function(g){f(g);e.lastPosition=g}};return{shim:true,type:"Gears",lastPosition:null,getCurrentPosition:function(e,g,h){var f=this;var i=c(e,f);d.getCurrentPosition(i,g,h)},watchPosition:function(e,f,g){d.watchPosition(e,f,g)},clearWatch:function(e){d.clearWatch(e)},getPermission:function(g,e,f){d.getPermission(g,e,f)}}});var b=(function(){var i=false;var e=function(){if(!d()&&!i){i=true;var j=document.createElement("script");j.src=(document.location.protocol=="https:"?"https://":"http://")+"www.google.com/jsapi?callback=_google_loader_apiLoaded";j.type="text/javascript";document.getElementsByTagName("body")[0].appendChild(j)}};var c=[];var h=function(j){c.push(j)};var f=function(){if(d()){while(c.length>0){var j=c.pop();j()}}};window._google_loader_apiLoaded=function(){f()};var d=function(){return(window.google&&google.loader)};var g=function(j){if(d()){return true}h(j);e();return false};e();return{shim:true,type:"ClientLocation",lastPosition:null,getCurrentPosition:function(k,n,o){var m=this;if(!g(function(){m.getCurrentPosition(k,n,o)})){return}if(google.loader.ClientLocation){var l=google.loader.ClientLocation;var j={coords:{latitude:l.latitude,longitude:l.longitude,altitude:null,accuracy:43000,altitudeAccuracy:null,heading:null,speed:null},address:{city:l.address.city,country:l.address.country,country_code:l.address.country_code,region:l.address.region},timestamp:new Date()};k(j);this.lastPosition=j}else{if(n==="function"){n({code:3,message:"Using the Google ClientLocation API and it is not able to calculate a location."})}}},watchPosition:function(j,l,m){this.getCurrentPosition(j,l,m);var k=this;var n=setInterval(function(){k.getCurrentPosition(j,l,m)},10000);return n},clearWatch:function(j){clearInterval(j)},getPermission:function(l,j,k){return true}}});navigator.geolocation=(window.google&&google.gears)?a():b()})()};
\ No newline at end of file
+var SN={C:{I:{CounterBlackout:false,MaxLength:140,PatternUsername:/^[0-9a-zA-Z\-_.]*$/,HTTP20x30x:[200,201,202,203,204,205,206,300,301,302,303,304,305,306,307]},S:{Disabled:"disabled",Warning:"warning",Error:"error",Success:"success",Processing:"processing",CommandResult:"command_result",FormNotice:"form_notice",NoticeInReplyTo:"notice_in-reply-to",NoticeActionSubmit:"notice_action-submit",NoticeLat:"notice_data-lat",NoticeLon:"notice_data-lon",NoticeLocationId:"notice_data-location_id",NoticeLocationNs:"notice_data-location_ns",NoticeGeoName:"notice_data-geo_name",NoticeDataGeo:"notice_data-geo",NoticeDataGeoCookie:"NoticeDataGeo",NoticeDataGeoSelected:"notice_data-geo_selected",StatusNetInstance:"StatusNetInstance"}},messages:{},msg:function(a){if(typeof SN.messages[a]=="undefined"){return"["+a+"]"}else{return SN.messages[a]}},U:{FormNoticeEnhancements:function(b){if(jQuery.data(b[0],"ElementData")===undefined){MaxLength=b.find(".count").text();if(typeof(MaxLength)=="undefined"){MaxLength=SN.C.I.MaxLength}jQuery.data(b[0],"ElementData",{MaxLength:MaxLength});SN.U.Counter(b);NDT=b.find("[name=status_textarea]");NDT.bind("keyup",function(c){SN.U.Counter(b)});var a=function(c){window.setTimeout(function(){SN.U.Counter(b)},50)};NDT.bind("cut",a).bind("paste",a)}else{b.find(".count").text(jQuery.data(b[0],"ElementData").MaxLength)}},Counter:function(d){SN.C.I.FormNoticeCurrent=d;var b=jQuery.data(d[0],"ElementData").MaxLength;if(b<=0){return}var c=b-SN.U.CharacterCount(d);var a=d.find(".count");if(c.toString()!=a.text()){if(!SN.C.I.CounterBlackout||c===0){if(a.text()!=String(c)){a.text(c)}if(c<0){d.addClass(SN.C.S.Warning)}else{d.removeClass(SN.C.S.Warning)}if(!SN.C.I.CounterBlackout){SN.C.I.CounterBlackout=true;SN.C.I.FormNoticeCurrent=d;window.setTimeout("SN.U.ClearCounterBlackout(SN.C.I.FormNoticeCurrent);",500)}}}},CharacterCount:function(a){return a.find("[name=status_textarea]").val().length},ClearCounterBlackout:function(a){SN.C.I.CounterBlackout=false;SN.U.Counter(a)},RewriteAjaxAction:function(a){if(document.location.protocol=="https:"&&a.substr(0,5)=="http:"){return a.replace(/^http:\/\/[^:\/]+/,"https://"+document.location.host)}else{return a}},FormXHR:function(a){$.ajax({type:"POST",dataType:"xml",url:SN.U.RewriteAjaxAction(a.attr("action")),data:a.serialize()+"&ajax=1",beforeSend:function(b){a.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(c,d,b){alert(b||d)},success:function(b,c){if(typeof($("form",b)[0])!="undefined"){form_new=document._importNode($("form",b)[0],true);a.replaceWith(form_new)}else{a.replaceWith(document._importNode($("p",b)[0],true))}}})},FormNoticeXHR:function(b){SN.C.I.NoticeDataGeo={};b.append('<input type="hidden" name="ajax" value="1"/>');b.attr("action",SN.U.RewriteAjaxAction(b.attr("action")));var c=function(d,e){b.append($('<p class="form_response"></p>').addClass(d).text(e))};var a=function(){b.find(".form_response").remove()};b.ajaxForm({dataType:"xml",timeout:"60000",beforeSend:function(d){if(b.find("[name=status_textarea]").val()==""){b.addClass(SN.C.S.Warning);return false}b.addClass(SN.C.S.Processing).find("#"+SN.C.S.NoticeActionSubmit).addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled);SN.U.normalizeGeoData(b);return true},error:function(f,g,e){b.removeClass(SN.C.S.Processing).find("#"+SN.C.S.NoticeActionSubmit).removeClass(SN.C.S.Disabled).removeAttr(SN.C.S.Disabled,SN.C.S.Disabled);a();if(g=="timeout"){c("error","Sorry! We had trouble sending your notice. The servers are overloaded. Please try again, and contact the site administrator if this problem persists.")}else{var d=SN.U.GetResponseXML(f);if($("."+SN.C.S.Error,d).length>0){b.append(document._importNode($("."+SN.C.S.Error,d)[0],true))}else{if(parseInt(f.status)===0||jQuery.inArray(parseInt(f.status),SN.C.I.HTTP20x30x)>=0){b.resetForm().find(".attach-status").remove();SN.U.FormNoticeEnhancements(b)}else{c("error","(Sorry! We had trouble sending your notice ("+f.status+" "+f.statusText+"). Please report the problem to the site administrator if this happens again.")}}}},success:function(i,k){a();var e=$("#"+SN.C.S.Error,i);if(e.length>0){c("error",e.text())}else{if($("body")[0].id=="bookmarklet"){self.close()}var d=$("#"+SN.C.S.CommandResult,i);if(d.length>0){c("success",d.text())}else{var h=document._importNode($("li",i)[0],true);var j=$("#notices_primary .notices:first");if(j.length>0&&SN.U.belongsOnTimeline(h)){if($("#"+h.id).length===0){var f=$("#"+SN.C.S.NoticeInReplyTo).val();var g="#notices_primary #notice-"+f;if($("body")[0].id=="conversation"){if(f.length>0&&$(g+" .notices").length<1){$(g).append('<ul class="notices"></ul>')}$($(g+" .notices")[0]).append(h)}else{j.prepend(h)}$("#"+h.id).css({display:"none"}).fadeIn(2500);SN.U.NoticeWithAttachment($("#"+h.id));SN.U.NoticeReplyTo($("#"+h.id))}}else{c("success",$("title",i).text())}}b.resetForm();b.find("[name=inreplyto]").val("");b.find(".attach-status").remove();SN.U.FormNoticeEnhancements(b)}},complete:function(d,e){b.removeClass(SN.C.S.Processing).find("#"+SN.C.S.NoticeActionSubmit).removeAttr(SN.C.S.Disabled).removeClass(SN.C.S.Disabled);b.find("[name=lat]").val(SN.C.I.NoticeDataGeo.NLat);b.find("[name=lon]").val(SN.C.I.NoticeDataGeo.NLon);b.find("[name=location_ns]").val(SN.C.I.NoticeDataGeo.NLNS);b.find("[name=location_id]").val(SN.C.I.NoticeDataGeo.NLID);$("#"+SN.C.S.NoticeDataGeo).attr("checked",SN.C.I.NoticeDataGeo.NDG)}})},normalizeGeoData:function(a){SN.C.I.NoticeDataGeo.NLat=a.find("[name=lat]").val();SN.C.I.NoticeDataGeo.NLon=a.find("[name=lon]").val();SN.C.I.NoticeDataGeo.NLNS=a.find("[name=location_ns]").val();SN.C.I.NoticeDataGeo.NLID=a.find("[name=location_id]").val();SN.C.I.NoticeDataGeo.NDG=$("#"+SN.C.S.NoticeDataGeo).attr("checked");var b=$.cookie(SN.C.S.NoticeDataGeoCookie);if(b!==null&&b!="disabled"){b=JSON.parse(b);SN.C.I.NoticeDataGeo.NLat=a.find("[name=lat]").val(b.NLat).val();SN.C.I.NoticeDataGeo.NLon=a.find("[name=lon]").val(b.NLon).val();if(b.NLNS){SN.C.I.NoticeDataGeo.NLNS=a.find("[name=location_ns]").val(b.NLNS).val();SN.C.I.NoticeDataGeo.NLID=a.find("[name=location_id]").val(b.NLID).val()}else{a.find("[name=location_ns]").val("");a.find("[name=location_id]").val("")}}if(b=="disabled"){SN.C.I.NoticeDataGeo.NDG=$("#"+SN.C.S.NoticeDataGeo).attr("checked",false).attr("checked")}else{SN.C.I.NoticeDataGeo.NDG=$("#"+SN.C.S.NoticeDataGeo).attr("checked",true).attr("checked")}},GetResponseXML:function(b){try{return b.responseXML}catch(a){return(new DOMParser()).parseFromString(b.responseText,"text/xml")}},NoticeReply:function(){if($("#content .notice_reply").length>0){$("#content .notice").each(function(){SN.U.NoticeReplyTo($(this))})}},NoticeReplyTo:function(a){a.find(".notice_reply").live("click",function(c){c.preventDefault();var b=($(".author .nickname",a).length>0)?$($(".author .nickname",a)[0]):$(".author .nickname.uid");SN.U.NoticeInlineReplyTrigger(a,"@"+b.text());return false})},NoticeInlineReplyTrigger:function(h,i){var c=$($(".notice_id",h)[0]).text();var d=h;var f=h.closest(".notices");if(f.hasClass("threaded-replies")){d=f.closest(".notice")}else{f=$("ul.threaded-replies",h);if(f.length==0){f=$('<ul class="notices threaded-replies xoxo"></ul>');h.append(f)}}var k=$(".notice-reply-form",f);if(k.length==0){$("li.notice-reply-placeholder").remove();var g=$("li.notice-reply",f);if(g.length==0){g=$('<li class="notice-reply"><form class="notice-reply-form" method="post"><textarea name="status_textarea"></textarea><div class="controls"><input type="hidden" name="token"><input type="hidden" name="inreplyto"><input type="submit" class="submit"></div></form></li>');var b=$("#form_notice");k=g.find("form");k.attr("action",b.attr("action"));k.find('input[name="token"]').val(b.find("input[name=token]").val());k.find('input[type="submit"]').val(SN.msg("reply_submit"));f.append(g);k.find("textarea").blur(function(){var m=$(this);var l=$.trim(m.val());if(l==""||l==m.data("initialText")){g.remove();if(f.find("li").length>0){SN.U.NoticeInlineReplyPlaceholder(d)}else{f.remove()}}});k.submit(function(m){var l=k;$.ajax({type:"POST",dataType:"xml",url:SN.U.RewriteAjaxAction(l.attr("action")),data:l.serialize()+"&ajax=1",beforeSend:function(n){l.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled).end().find("textarea").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(o,p,n){alert(n||p)},success:function(p,r){var o=$("li",p)[0];if(o){var n=document._importNode(o,true);var q=$(n).attr("id");if($("#"+q).length==0){g.replaceWith(n);SN.U.NoticeInlineReplyPlaceholder(d)}else{g.remove()}}}});m.preventDefault();return false})}}k.find("input[name=inreplyto]").val(c);var j=k.find("textarea");if(j.length==0){throw"No textarea"}var a="";if(i){a=i+" "}j.val(a+j.val().replace(RegExp(a,"i"),""));j.data("initialText",$.trim(i+""));j.focus();if(j[0].setSelectionRange){var e=j.val().length;j[0].setSelectionRange(e,e)}},NoticeFavor:function(){$(".form_favor").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_disfavor").live("click",function(){SN.U.FormXHR($(this));return false})},NoticeInlineReplyPlaceholder:function(b){var a=b.find("ul.threaded-replies");var c=$('<li class="notice-reply-placeholder"><input class="placeholder"></li>');c.click(function(){SN.U.NoticeInlineReplyTrigger(b)});c.find("input").val(SN.msg("reply_placeholder"));a.append(c)},NoticeInlineReplySetup:function(){$(".threaded-replies").each(function(){var b=$(this);var a=b.closest(".notice");SN.U.NoticeInlineReplyPlaceholder(a)})},NoticeRepeat:function(){$(".form_repeat").live("click",function(a){a.preventDefault();SN.U.NoticeRepeatConfirmation($(this));return false})},NoticeRepeatConfirmation:function(a){var c=a.find(".submit");var b=c.clone();b.addClass("submit_dialogbox").removeClass("submit");a.append(b);b.bind("click",function(){SN.U.FormXHR(a);return false});c.hide();a.addClass("dialogbox").append('<button class="close">&#215;</button>').closest(".notice-options").addClass("opaque");a.find("button.close").click(function(){$(this).remove();a.removeClass("dialogbox").closest(".notice-options").removeClass("opaque");a.find(".submit_dialogbox").remove();a.find(".submit").show();return false})},NoticeAttachments:function(){$(".notice a.attachment").each(function(){SN.U.NoticeWithAttachment($(this).closest(".notice"))})},NoticeWithAttachment:function(b){if(b.find(".attachment").length===0){return}var a=b.find(".attachment.more");if(a.length>0){$(a[0]).click(function(){var c=$(this);c.addClass(SN.C.S.Processing);$.get(c.attr("href")+"/ajax",null,function(d){c.parent(".entry-content").html($(d).find("#attachment_view .entry-content").html())});return false}).attr("title",SN.msg("showmore_tooltip"))}},NoticeDataAttach:function(b){var a=b.find("input[type=file]");a.change(function(f){b.find(".attach-status").remove();var d=$(this).val();if(!d){return false}var c=$('<div class="attach-status '+SN.C.S.Success+'"><code></code> <button class="close">&#215;</button></div>');c.find("code").text(d);c.find("button").click(function(){c.remove();a.val("");return false});b.append(c);if(typeof this.files=="object"){for(var e=0;e<this.files.length;e++){SN.U.PreviewAttach(b,this.files[e])}}})},maxFileSize:function(b){var a=$(b).find("input[name=MAX_FILE_SIZE]").attr("value");if(a){return parseInt(a)}else{return 0}},PreviewAttach:function(d,c){var e=c.type+" "+Math.round(c.size/1024)+"KB";var f=true;var h;if(typeof window.createObjectURL!="undefined"){h=function(i,j){j(window.createObjectURL(i))}}else{if(typeof window.FileReader!="undefined"){h=function(j,k){var i=new FileReader();i.onload=function(l){k(i.result)};i.readAsDataURL(j)}}else{f=false}}var a=["image/png","image/jpeg","image/gif","image/svg+xml"];if($.inArray(c.type,a)==-1){f=false}var g=8*1024*1024;if(c.size>g){f=false}if(f){h(c,function(j){var i=$("<img>").attr("title",e).attr("alt",e).attr("src",j).attr("style","height: 120px");d.find(".attach-status").append(i)})}else{var b=$("<div></div>").text(e);d.find(".attach-status").append(b)}},NoticeLocationAttach:function(){var c=$("#"+SN.C.S.NoticeLat).val();var h=$("#"+SN.C.S.NoticeLon).val();var d=$("#"+SN.C.S.NoticeLocationNs).val();var i=$("#"+SN.C.S.NoticeLocationId).val();var a=$("#"+SN.C.S.NoticeGeoName).text();var b=$("#"+SN.C.S.NoticeDataGeo);function e(k){$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",jQuery.trim($("label[for="+SN.C.S.NoticeDataGeo+"]").text())).removeClass("checked");$(".form_notice [name=lat]").val("");$(".form_notice [name=lon]").val("");$(".form_notice [name=location_ns]").val("");$(".form_notice [name=location_id]").val("");$("#"+SN.C.S.NoticeDataGeo).attr("checked",false);$.cookie(SN.C.S.NoticeDataGeoCookie,"disabled",{path:"/"});if(k){$(".geo_status_wrapper").removeClass("success").addClass("error");$(".geo_status_wrapper .geo_status").text(k)}else{$(".geo_status_wrapper").remove()}}function j(k,l){SN.U.NoticeGeoStatus("Looking up place name...");$.getJSON(k,l,function(m){var n,o;if(typeof(m.location_ns)!="undefined"){$("#"+SN.C.S.NoticeLocationNs).val(m.location_ns);n=m.location_ns}if(typeof(m.location_id)!="undefined"){$("#"+SN.C.S.NoticeLocationId).val(m.location_id);o=m.location_id}if(typeof(m.name)=="undefined"){NLN_text=l.lat+";"+l.lon}else{NLN_text=m.name}SN.U.NoticeGeoStatus(NLN_text,l.lat,l.lon,m.url);$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",NoticeDataGeo_text.ShareDisable+" ("+NLN_text+")");$(".form_notice [name=lat]").val(l.lat);$(".form_notice [name=lon]").val(l.lon);$(".form_notice [name=location_ns]").val(n);$(".form_notice [name=location_id]").val(o);$("#"+SN.C.S.NoticeDataGeo).attr("checked",true);var p={NLat:l.lat,NLon:l.lon,NLNS:n,NLID:o,NLN:NLN_text,NLNU:m.url,NDG:true};$.cookie(SN.C.S.NoticeDataGeoCookie,JSON.stringify(p),{path:"/"})})}if(b.length>0){if($.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){b.attr("checked",false)}else{b.attr("checked",true)}var f=$("#notice_data-geo_wrap");var g=f.attr("title");f.removeAttr("title");$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",jQuery.trim($("label[for="+SN.C.S.NoticeDataGeo+"]").text()));b.change(function(){if($("#"+SN.C.S.NoticeDataGeo).attr("checked")===true||$.cookie(SN.C.S.NoticeDataGeoCookie)===null){$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",NoticeDataGeo_text.ShareDisable).addClass("checked");if($.cookie(SN.C.S.NoticeDataGeoCookie)===null||$.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){if(navigator.geolocation){SN.U.NoticeGeoStatus("Requesting location from browser...");navigator.geolocation.getCurrentPosition(function(m){$(".form_notice [name=lat]").val(m.coords.latitude);$(".form_notice [name=lon]").val(m.coords.longitude);var n={lat:m.coords.latitude,lon:m.coords.longitude,token:$("#token").val()};j(g,n)},function(m){switch(m.code){case m.PERMISSION_DENIED:e("Location permission denied.");break;case m.TIMEOUT:e("Location lookup timeout.");break}},{timeout:10000})}else{if(c.length>0&&h.length>0){var k={lat:c,lon:h,token:$("#token").val()};j(g,k)}else{e();$("#"+SN.C.S.NoticeDataGeo).remove();$("label[for="+SN.C.S.NoticeDataGeo+"]").remove()}}}else{var l=JSON.parse($.cookie(SN.C.S.NoticeDataGeoCookie));$(".form_notice [name=lat]").val(l.NLat);$(".form_notice [name=lon]").val(l.NLon);$(".form_notice [name=location_ns]").val(l.NLNS);$(".form_notice [name=location_id]").val(l.NLID);$("#"+SN.C.S.NoticeDataGeo).attr("checked",l.NDG);SN.U.NoticeGeoStatus(l.NLN,l.NLat,l.NLon,l.NLNU);$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",NoticeDataGeo_text.ShareDisable+" ("+l.NLN+")").addClass("checked")}}else{e()}}).change()}},NoticeGeoStatus:function(a,f,g,c){var e=$("#form_notice");var h=e.find(".geo_status_wrapper");if(h.length==0){h=$('<div class="'+SN.C.S.Success+' geo_status_wrapper"><button class="close" style="float:right">&#215;</button><div class="geo_status"></div></div>');h.find("button.close").click(function(){$("#"+SN.C.S.NoticeDataGeo).removeAttr("checked").change()});e.append(h)}var b;if(c){b=$("<a></a>").attr("href",c)}else{b=$("<span></span>")}b.text(a);if(f||g){var d=f+";"+g;b.attr("title",d);if(!a){b.text(d)}}h.find(".geo_status").empty().append(b)},NewDirectMessage:function(){NDM=$(".entity_send-a-message a");NDM.attr({href:NDM.attr("href")+"&ajax=1"});NDM.bind("click",function(){var a=$(".entity_send-a-message form");if(a.length===0){$(this).addClass(SN.C.S.Processing);$.get(NDM.attr("href"),null,function(b){$(".entity_send-a-message").append(document._importNode($("form",b)[0],true));a=$(".entity_send-a-message .form_notice");SN.U.FormNoticeXHR(a);SN.U.FormNoticeEnhancements(a);a.append('<button class="close">&#215;</button>');$(".entity_send-a-message button").click(function(){a.hide();return false});NDM.removeClass(SN.C.S.Processing)})}else{a.show();$(".entity_send-a-message textarea").focus()}return false})},GetFullYear:function(c,d,a){var b=new Date();b.setFullYear(c,d,a);return b},StatusNetInstance:{Set:function(b){var a=SN.U.StatusNetInstance.Get();if(a!==null){b=$.extend(a,b)}$.cookie(SN.C.S.StatusNetInstance,JSON.stringify(b),{path:"/",expires:SN.U.GetFullYear(2029,0,1)})},Get:function(){var a=$.cookie(SN.C.S.StatusNetInstance);if(a!==null){return JSON.parse(a)}return null},Delete:function(){$.cookie(SN.C.S.StatusNetInstance,null)}},belongsOnTimeline:function(b){var a=$("body").attr("id");if(a=="public"){return true}var c=$("#nav_profile a").attr("href");if(c){var d=$(b).find(".entry-title .author a.url").attr("href");if(d==c){if(a=="all"||a=="showstream"){return true}}}return false}},Init:{NoticeForm:function(){if($("body.user_in").length>0){SN.U.NoticeLocationAttach();$("."+SN.C.S.FormNotice).each(function(){SN.U.FormNoticeXHR($(this));SN.U.FormNoticeEnhancements($(this));SN.U.NoticeDataAttach($(this))})}},Notices:function(){if($("body.user_in").length>0){SN.U.NoticeFavor();SN.U.NoticeRepeat();SN.U.NoticeReply();SN.U.NoticeInlineReplySetup()}SN.U.NoticeAttachments()},EntityActions:function(){if($("body.user_in").length>0){$(".form_user_subscribe").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_user_unsubscribe").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_group_join").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_group_leave").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_user_nudge").live("click",function(){SN.U.FormXHR($(this));return false});SN.U.NewDirectMessage()}},Login:function(){if(SN.U.StatusNetInstance.Get()!==null){var a=SN.U.StatusNetInstance.Get().Nickname;if(a!==null){$("#form_login #nickname").val(a)}}$("#form_login").bind("submit",function(){SN.U.StatusNetInstance.Set({Nickname:$("#form_login #nickname").val()});return true})},UploadForms:function(){$("input[type=file]").change(function(d){if(typeof this.files=="object"&&this.files.length>0){var c=0;for(var b=0;b<this.files.length;b++){c+=this.files[b].size}var a=SN.U.maxFileSize($(this.form));if(a>0&&c>a){var e="File too large: maximum upload size is %d bytes.";alert(e.replace("%d",a));$(this).val("");d.preventDefault();return false}}})}}};$(document).ready(function(){SN.Init.UploadForms();if($("."+SN.C.S.FormNotice).length>0){SN.Init.NoticeForm()}if($("#content .notices").length>0){SN.Init.Notices()}if($("#content .entity_actions").length>0){SN.Init.EntityActions()}if($("#form_login").length>0){SN.Init.Login()}});if(!document.ELEMENT_NODE){document.ELEMENT_NODE=1;document.ATTRIBUTE_NODE=2;document.TEXT_NODE=3;document.CDATA_SECTION_NODE=4;document.ENTITY_REFERENCE_NODE=5;document.ENTITY_NODE=6;document.PROCESSING_INSTRUCTION_NODE=7;document.COMMENT_NODE=8;document.DOCUMENT_NODE=9;document.DOCUMENT_TYPE_NODE=10;document.DOCUMENT_FRAGMENT_NODE=11;document.NOTATION_NODE=12}document._importNode=function(e,a){switch(e.nodeType){case document.ELEMENT_NODE:var d=document.createElement(e.nodeName);if(e.attributes&&e.attributes.length>0){for(var c=0,b=e.attributes.length;c<b;){if(e.attributes[c].nodeName=="class"){d.className=e.getAttribute(e.attributes[c++].nodeName)}else{d.setAttribute(e.attributes[c].nodeName,e.getAttribute(e.attributes[c++].nodeName))}}}if(a&&e.childNodes&&e.childNodes.length>0){for(var c=0,b=e.childNodes.length;c<b;){d.appendChild(document._importNode(e.childNodes[c++],a))}}return d;break;case document.TEXT_NODE:case document.CDATA_SECTION_NODE:case document.COMMENT_NODE:return document.createTextNode(e.nodeValue);break}};if(typeof navigator.geolocation=="undefined"||navigator.geolocation.shim){(function(){(function(){if(window.google&&google.gears){return}var c=null;if(typeof GearsFactory!="undefined"){c=new GearsFactory()}else{try{c=new ActiveXObject("Gears.Factory");if(c.getBuildInfo().indexOf("ie_mobile")!=-1){c.privateSetGlobalObject(this)}}catch(d){if((typeof navigator.mimeTypes!="undefined")&&navigator.mimeTypes["application/x-googlegears"]){c=document.createElement("object");c.style.display="none";c.width=0;c.height=0;c.type="application/x-googlegears";document.documentElement.appendChild(c)}}}if(!c){return}if(!window.google){google={}}if(!google.gears){google.gears={factory:c}}})();var a=(function(){var d=google.gears.factory.create("beta.geolocation");var c=function(f,e){return function(g){f(g);e.lastPosition=g}};return{shim:true,type:"Gears",lastPosition:null,getCurrentPosition:function(e,g,h){var f=this;var i=c(e,f);d.getCurrentPosition(i,g,h)},watchPosition:function(e,f,g){d.watchPosition(e,f,g)},clearWatch:function(e){d.clearWatch(e)},getPermission:function(g,e,f){d.getPermission(g,e,f)}}});var b=(function(){var i=false;var e=function(){if(!d()&&!i){i=true;var j=document.createElement("script");j.src=(document.location.protocol=="https:"?"https://":"http://")+"www.google.com/jsapi?callback=_google_loader_apiLoaded";j.type="text/javascript";document.getElementsByTagName("body")[0].appendChild(j)}};var c=[];var h=function(j){c.push(j)};var f=function(){if(d()){while(c.length>0){var j=c.pop();j()}}};window._google_loader_apiLoaded=function(){f()};var d=function(){return(window.google&&google.loader)};var g=function(j){if(d()){return true}h(j);e();return false};e();return{shim:true,type:"ClientLocation",lastPosition:null,getCurrentPosition:function(k,n,o){var m=this;if(!g(function(){m.getCurrentPosition(k,n,o)})){return}if(google.loader.ClientLocation){var l=google.loader.ClientLocation;var j={coords:{latitude:l.latitude,longitude:l.longitude,altitude:null,accuracy:43000,altitudeAccuracy:null,heading:null,speed:null},address:{city:l.address.city,country:l.address.country,country_code:l.address.country_code,region:l.address.region},timestamp:new Date()};k(j);this.lastPosition=j}else{if(n==="function"){n({code:3,message:"Using the Google ClientLocation API and it is not able to calculate a location."})}}},watchPosition:function(j,l,m){this.getCurrentPosition(j,l,m);var k=this;var n=setInterval(function(){k.getCurrentPosition(j,l,m)},10000);return n},clearWatch:function(j){clearInterval(j)},getPermission:function(l,j,k){return true}}});navigator.geolocation=(window.google&&google.gears)?a():b()})()};
\ No newline at end of file

From cd20190ba5568c58be8effb0d6431650df69d686 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Thu, 3 Mar 2011 17:48:16 -0800
Subject: [PATCH 388/655] Remove hardcoded #notice_action-submit from JS/CSS
 (prep for reusable notice forms)

---
 js/util.js                          | 7 +++----
 js/util.min.js                      | 2 +-
 plugins/MobileProfile/mp-screen.css | 2 +-
 theme/base/css/display.css          | 2 +-
 theme/base/css/ie.css               | 2 +-
 theme/biz/css/base.css              | 2 +-
 theme/clean/css/display.css         | 2 +-
 theme/clean/css/ie.css              | 2 +-
 theme/clean/css/mp-screen.css       | 4 ++--
 theme/cleaner/css/display.css       | 6 +++---
 theme/cleaner/css/ie.css            | 2 +-
 theme/cleaner/css/mp-screen.css     | 4 ++--
 theme/cloudy/css/display.css        | 4 ++--
 theme/cloudy/css/ie.css             | 2 +-
 theme/h4ck3r/css/base.css           | 2 +-
 theme/h4ck3r/css/display.css        | 2 +-
 theme/mnml/css/display.css          | 2 +-
 theme/mnml/css/ie.css               | 2 +-
 theme/mnml/css/mp-screen.css        | 2 +-
 theme/pigeonthoughts/css/base.css   | 2 +-
 theme/rebase/css/display.css        | 6 +++---
 theme/rebase/css/ie.css             | 2 +-
 theme/shiny/css/display.css         | 4 ++--
 theme/shiny/css/ie.css              | 2 +-
 theme/shiny/css/mp-screen.css       | 4 ++--
 theme/victorian/css/mp-screen.css   | 2 +-
 26 files changed, 37 insertions(+), 38 deletions(-)

diff --git a/js/util.js b/js/util.js
index 72eaa16d10..47b8bbe6ca 100644
--- a/js/util.js
+++ b/js/util.js
@@ -51,7 +51,6 @@ var SN = { // StatusNet
             CommandResult: 'command_result',
             FormNotice: 'form_notice',
             NoticeInReplyTo: 'notice_in-reply-to',
-            NoticeActionSubmit: 'notice_action-submit',
             NoticeLat: 'notice_data-lat',
             NoticeLon: 'notice_data-lon',
             NoticeLocationId: 'notice_data-location_id',
@@ -336,7 +335,7 @@ var SN = { // StatusNet
                     }
                     form
                         .addClass(SN.C.S.Processing)
-                        .find('#'+SN.C.S.NoticeActionSubmit)
+                        .find('.submit')
                             .addClass(SN.C.S.Disabled)
                             .attr(SN.C.S.Disabled, SN.C.S.Disabled);
 
@@ -347,7 +346,7 @@ var SN = { // StatusNet
                 error: function (xhr, textStatus, errorThrown) {
                     form
                         .removeClass(SN.C.S.Processing)
-                        .find('#'+SN.C.S.NoticeActionSubmit)
+                        .find('.submit')
                             .removeClass(SN.C.S.Disabled)
                             .removeAttr(SN.C.S.Disabled, SN.C.S.Disabled);
                     removeFeedback();
@@ -429,7 +428,7 @@ var SN = { // StatusNet
                 complete: function(xhr, textStatus) {
                     form
                         .removeClass(SN.C.S.Processing)
-                        .find('#'+SN.C.S.NoticeActionSubmit)
+                        .find('.submit')
                             .removeAttr(SN.C.S.Disabled)
                             .removeClass(SN.C.S.Disabled);
 
diff --git a/js/util.min.js b/js/util.min.js
index 791d19f6e9..556a8b795e 100644
--- a/js/util.min.js
+++ b/js/util.min.js
@@ -1 +1 @@
-var SN={C:{I:{CounterBlackout:false,MaxLength:140,PatternUsername:/^[0-9a-zA-Z\-_.]*$/,HTTP20x30x:[200,201,202,203,204,205,206,300,301,302,303,304,305,306,307]},S:{Disabled:"disabled",Warning:"warning",Error:"error",Success:"success",Processing:"processing",CommandResult:"command_result",FormNotice:"form_notice",NoticeInReplyTo:"notice_in-reply-to",NoticeActionSubmit:"notice_action-submit",NoticeLat:"notice_data-lat",NoticeLon:"notice_data-lon",NoticeLocationId:"notice_data-location_id",NoticeLocationNs:"notice_data-location_ns",NoticeGeoName:"notice_data-geo_name",NoticeDataGeo:"notice_data-geo",NoticeDataGeoCookie:"NoticeDataGeo",NoticeDataGeoSelected:"notice_data-geo_selected",StatusNetInstance:"StatusNetInstance"}},messages:{},msg:function(a){if(typeof SN.messages[a]=="undefined"){return"["+a+"]"}else{return SN.messages[a]}},U:{FormNoticeEnhancements:function(b){if(jQuery.data(b[0],"ElementData")===undefined){MaxLength=b.find(".count").text();if(typeof(MaxLength)=="undefined"){MaxLength=SN.C.I.MaxLength}jQuery.data(b[0],"ElementData",{MaxLength:MaxLength});SN.U.Counter(b);NDT=b.find("[name=status_textarea]");NDT.bind("keyup",function(c){SN.U.Counter(b)});var a=function(c){window.setTimeout(function(){SN.U.Counter(b)},50)};NDT.bind("cut",a).bind("paste",a)}else{b.find(".count").text(jQuery.data(b[0],"ElementData").MaxLength)}},Counter:function(d){SN.C.I.FormNoticeCurrent=d;var b=jQuery.data(d[0],"ElementData").MaxLength;if(b<=0){return}var c=b-SN.U.CharacterCount(d);var a=d.find(".count");if(c.toString()!=a.text()){if(!SN.C.I.CounterBlackout||c===0){if(a.text()!=String(c)){a.text(c)}if(c<0){d.addClass(SN.C.S.Warning)}else{d.removeClass(SN.C.S.Warning)}if(!SN.C.I.CounterBlackout){SN.C.I.CounterBlackout=true;SN.C.I.FormNoticeCurrent=d;window.setTimeout("SN.U.ClearCounterBlackout(SN.C.I.FormNoticeCurrent);",500)}}}},CharacterCount:function(a){return a.find("[name=status_textarea]").val().length},ClearCounterBlackout:function(a){SN.C.I.CounterBlackout=false;SN.U.Counter(a)},RewriteAjaxAction:function(a){if(document.location.protocol=="https:"&&a.substr(0,5)=="http:"){return a.replace(/^http:\/\/[^:\/]+/,"https://"+document.location.host)}else{return a}},FormXHR:function(a){$.ajax({type:"POST",dataType:"xml",url:SN.U.RewriteAjaxAction(a.attr("action")),data:a.serialize()+"&ajax=1",beforeSend:function(b){a.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(c,d,b){alert(b||d)},success:function(b,c){if(typeof($("form",b)[0])!="undefined"){form_new=document._importNode($("form",b)[0],true);a.replaceWith(form_new)}else{a.replaceWith(document._importNode($("p",b)[0],true))}}})},FormNoticeXHR:function(b){SN.C.I.NoticeDataGeo={};b.append('<input type="hidden" name="ajax" value="1"/>');b.attr("action",SN.U.RewriteAjaxAction(b.attr("action")));var c=function(d,e){b.append($('<p class="form_response"></p>').addClass(d).text(e))};var a=function(){b.find(".form_response").remove()};b.ajaxForm({dataType:"xml",timeout:"60000",beforeSend:function(d){if(b.find("[name=status_textarea]").val()==""){b.addClass(SN.C.S.Warning);return false}b.addClass(SN.C.S.Processing).find("#"+SN.C.S.NoticeActionSubmit).addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled);SN.U.normalizeGeoData(b);return true},error:function(f,g,e){b.removeClass(SN.C.S.Processing).find("#"+SN.C.S.NoticeActionSubmit).removeClass(SN.C.S.Disabled).removeAttr(SN.C.S.Disabled,SN.C.S.Disabled);a();if(g=="timeout"){c("error","Sorry! We had trouble sending your notice. The servers are overloaded. Please try again, and contact the site administrator if this problem persists.")}else{var d=SN.U.GetResponseXML(f);if($("."+SN.C.S.Error,d).length>0){b.append(document._importNode($("."+SN.C.S.Error,d)[0],true))}else{if(parseInt(f.status)===0||jQuery.inArray(parseInt(f.status),SN.C.I.HTTP20x30x)>=0){b.resetForm().find(".attach-status").remove();SN.U.FormNoticeEnhancements(b)}else{c("error","(Sorry! We had trouble sending your notice ("+f.status+" "+f.statusText+"). Please report the problem to the site administrator if this happens again.")}}}},success:function(i,k){a();var e=$("#"+SN.C.S.Error,i);if(e.length>0){c("error",e.text())}else{if($("body")[0].id=="bookmarklet"){self.close()}var d=$("#"+SN.C.S.CommandResult,i);if(d.length>0){c("success",d.text())}else{var h=document._importNode($("li",i)[0],true);var j=$("#notices_primary .notices:first");if(j.length>0&&SN.U.belongsOnTimeline(h)){if($("#"+h.id).length===0){var f=$("#"+SN.C.S.NoticeInReplyTo).val();var g="#notices_primary #notice-"+f;if($("body")[0].id=="conversation"){if(f.length>0&&$(g+" .notices").length<1){$(g).append('<ul class="notices"></ul>')}$($(g+" .notices")[0]).append(h)}else{j.prepend(h)}$("#"+h.id).css({display:"none"}).fadeIn(2500);SN.U.NoticeWithAttachment($("#"+h.id));SN.U.NoticeReplyTo($("#"+h.id))}}else{c("success",$("title",i).text())}}b.resetForm();b.find("[name=inreplyto]").val("");b.find(".attach-status").remove();SN.U.FormNoticeEnhancements(b)}},complete:function(d,e){b.removeClass(SN.C.S.Processing).find("#"+SN.C.S.NoticeActionSubmit).removeAttr(SN.C.S.Disabled).removeClass(SN.C.S.Disabled);b.find("[name=lat]").val(SN.C.I.NoticeDataGeo.NLat);b.find("[name=lon]").val(SN.C.I.NoticeDataGeo.NLon);b.find("[name=location_ns]").val(SN.C.I.NoticeDataGeo.NLNS);b.find("[name=location_id]").val(SN.C.I.NoticeDataGeo.NLID);$("#"+SN.C.S.NoticeDataGeo).attr("checked",SN.C.I.NoticeDataGeo.NDG)}})},normalizeGeoData:function(a){SN.C.I.NoticeDataGeo.NLat=a.find("[name=lat]").val();SN.C.I.NoticeDataGeo.NLon=a.find("[name=lon]").val();SN.C.I.NoticeDataGeo.NLNS=a.find("[name=location_ns]").val();SN.C.I.NoticeDataGeo.NLID=a.find("[name=location_id]").val();SN.C.I.NoticeDataGeo.NDG=$("#"+SN.C.S.NoticeDataGeo).attr("checked");var b=$.cookie(SN.C.S.NoticeDataGeoCookie);if(b!==null&&b!="disabled"){b=JSON.parse(b);SN.C.I.NoticeDataGeo.NLat=a.find("[name=lat]").val(b.NLat).val();SN.C.I.NoticeDataGeo.NLon=a.find("[name=lon]").val(b.NLon).val();if(b.NLNS){SN.C.I.NoticeDataGeo.NLNS=a.find("[name=location_ns]").val(b.NLNS).val();SN.C.I.NoticeDataGeo.NLID=a.find("[name=location_id]").val(b.NLID).val()}else{a.find("[name=location_ns]").val("");a.find("[name=location_id]").val("")}}if(b=="disabled"){SN.C.I.NoticeDataGeo.NDG=$("#"+SN.C.S.NoticeDataGeo).attr("checked",false).attr("checked")}else{SN.C.I.NoticeDataGeo.NDG=$("#"+SN.C.S.NoticeDataGeo).attr("checked",true).attr("checked")}},GetResponseXML:function(b){try{return b.responseXML}catch(a){return(new DOMParser()).parseFromString(b.responseText,"text/xml")}},NoticeReply:function(){if($("#content .notice_reply").length>0){$("#content .notice").each(function(){SN.U.NoticeReplyTo($(this))})}},NoticeReplyTo:function(a){a.find(".notice_reply").live("click",function(c){c.preventDefault();var b=($(".author .nickname",a).length>0)?$($(".author .nickname",a)[0]):$(".author .nickname.uid");SN.U.NoticeInlineReplyTrigger(a,"@"+b.text());return false})},NoticeInlineReplyTrigger:function(h,i){var c=$($(".notice_id",h)[0]).text();var d=h;var f=h.closest(".notices");if(f.hasClass("threaded-replies")){d=f.closest(".notice")}else{f=$("ul.threaded-replies",h);if(f.length==0){f=$('<ul class="notices threaded-replies xoxo"></ul>');h.append(f)}}var k=$(".notice-reply-form",f);if(k.length==0){$("li.notice-reply-placeholder").remove();var g=$("li.notice-reply",f);if(g.length==0){g=$('<li class="notice-reply"><form class="notice-reply-form" method="post"><textarea name="status_textarea"></textarea><div class="controls"><input type="hidden" name="token"><input type="hidden" name="inreplyto"><input type="submit" class="submit"></div></form></li>');var b=$("#form_notice");k=g.find("form");k.attr("action",b.attr("action"));k.find('input[name="token"]').val(b.find("input[name=token]").val());k.find('input[type="submit"]').val(SN.msg("reply_submit"));f.append(g);k.find("textarea").blur(function(){var m=$(this);var l=$.trim(m.val());if(l==""||l==m.data("initialText")){g.remove();if(f.find("li").length>0){SN.U.NoticeInlineReplyPlaceholder(d)}else{f.remove()}}});k.submit(function(m){var l=k;$.ajax({type:"POST",dataType:"xml",url:SN.U.RewriteAjaxAction(l.attr("action")),data:l.serialize()+"&ajax=1",beforeSend:function(n){l.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled).end().find("textarea").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(o,p,n){alert(n||p)},success:function(p,r){var o=$("li",p)[0];if(o){var n=document._importNode(o,true);var q=$(n).attr("id");if($("#"+q).length==0){g.replaceWith(n);SN.U.NoticeInlineReplyPlaceholder(d)}else{g.remove()}}}});m.preventDefault();return false})}}k.find("input[name=inreplyto]").val(c);var j=k.find("textarea");if(j.length==0){throw"No textarea"}var a="";if(i){a=i+" "}j.val(a+j.val().replace(RegExp(a,"i"),""));j.data("initialText",$.trim(i+""));j.focus();if(j[0].setSelectionRange){var e=j.val().length;j[0].setSelectionRange(e,e)}},NoticeFavor:function(){$(".form_favor").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_disfavor").live("click",function(){SN.U.FormXHR($(this));return false})},NoticeInlineReplyPlaceholder:function(b){var a=b.find("ul.threaded-replies");var c=$('<li class="notice-reply-placeholder"><input class="placeholder"></li>');c.click(function(){SN.U.NoticeInlineReplyTrigger(b)});c.find("input").val(SN.msg("reply_placeholder"));a.append(c)},NoticeInlineReplySetup:function(){$(".threaded-replies").each(function(){var b=$(this);var a=b.closest(".notice");SN.U.NoticeInlineReplyPlaceholder(a)})},NoticeRepeat:function(){$(".form_repeat").live("click",function(a){a.preventDefault();SN.U.NoticeRepeatConfirmation($(this));return false})},NoticeRepeatConfirmation:function(a){var c=a.find(".submit");var b=c.clone();b.addClass("submit_dialogbox").removeClass("submit");a.append(b);b.bind("click",function(){SN.U.FormXHR(a);return false});c.hide();a.addClass("dialogbox").append('<button class="close">&#215;</button>').closest(".notice-options").addClass("opaque");a.find("button.close").click(function(){$(this).remove();a.removeClass("dialogbox").closest(".notice-options").removeClass("opaque");a.find(".submit_dialogbox").remove();a.find(".submit").show();return false})},NoticeAttachments:function(){$(".notice a.attachment").each(function(){SN.U.NoticeWithAttachment($(this).closest(".notice"))})},NoticeWithAttachment:function(b){if(b.find(".attachment").length===0){return}var a=b.find(".attachment.more");if(a.length>0){$(a[0]).click(function(){var c=$(this);c.addClass(SN.C.S.Processing);$.get(c.attr("href")+"/ajax",null,function(d){c.parent(".entry-content").html($(d).find("#attachment_view .entry-content").html())});return false}).attr("title",SN.msg("showmore_tooltip"))}},NoticeDataAttach:function(b){var a=b.find("input[type=file]");a.change(function(f){b.find(".attach-status").remove();var d=$(this).val();if(!d){return false}var c=$('<div class="attach-status '+SN.C.S.Success+'"><code></code> <button class="close">&#215;</button></div>');c.find("code").text(d);c.find("button").click(function(){c.remove();a.val("");return false});b.append(c);if(typeof this.files=="object"){for(var e=0;e<this.files.length;e++){SN.U.PreviewAttach(b,this.files[e])}}})},maxFileSize:function(b){var a=$(b).find("input[name=MAX_FILE_SIZE]").attr("value");if(a){return parseInt(a)}else{return 0}},PreviewAttach:function(d,c){var e=c.type+" "+Math.round(c.size/1024)+"KB";var f=true;var h;if(typeof window.createObjectURL!="undefined"){h=function(i,j){j(window.createObjectURL(i))}}else{if(typeof window.FileReader!="undefined"){h=function(j,k){var i=new FileReader();i.onload=function(l){k(i.result)};i.readAsDataURL(j)}}else{f=false}}var a=["image/png","image/jpeg","image/gif","image/svg+xml"];if($.inArray(c.type,a)==-1){f=false}var g=8*1024*1024;if(c.size>g){f=false}if(f){h(c,function(j){var i=$("<img>").attr("title",e).attr("alt",e).attr("src",j).attr("style","height: 120px");d.find(".attach-status").append(i)})}else{var b=$("<div></div>").text(e);d.find(".attach-status").append(b)}},NoticeLocationAttach:function(){var c=$("#"+SN.C.S.NoticeLat).val();var h=$("#"+SN.C.S.NoticeLon).val();var d=$("#"+SN.C.S.NoticeLocationNs).val();var i=$("#"+SN.C.S.NoticeLocationId).val();var a=$("#"+SN.C.S.NoticeGeoName).text();var b=$("#"+SN.C.S.NoticeDataGeo);function e(k){$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",jQuery.trim($("label[for="+SN.C.S.NoticeDataGeo+"]").text())).removeClass("checked");$(".form_notice [name=lat]").val("");$(".form_notice [name=lon]").val("");$(".form_notice [name=location_ns]").val("");$(".form_notice [name=location_id]").val("");$("#"+SN.C.S.NoticeDataGeo).attr("checked",false);$.cookie(SN.C.S.NoticeDataGeoCookie,"disabled",{path:"/"});if(k){$(".geo_status_wrapper").removeClass("success").addClass("error");$(".geo_status_wrapper .geo_status").text(k)}else{$(".geo_status_wrapper").remove()}}function j(k,l){SN.U.NoticeGeoStatus("Looking up place name...");$.getJSON(k,l,function(m){var n,o;if(typeof(m.location_ns)!="undefined"){$("#"+SN.C.S.NoticeLocationNs).val(m.location_ns);n=m.location_ns}if(typeof(m.location_id)!="undefined"){$("#"+SN.C.S.NoticeLocationId).val(m.location_id);o=m.location_id}if(typeof(m.name)=="undefined"){NLN_text=l.lat+";"+l.lon}else{NLN_text=m.name}SN.U.NoticeGeoStatus(NLN_text,l.lat,l.lon,m.url);$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",NoticeDataGeo_text.ShareDisable+" ("+NLN_text+")");$(".form_notice [name=lat]").val(l.lat);$(".form_notice [name=lon]").val(l.lon);$(".form_notice [name=location_ns]").val(n);$(".form_notice [name=location_id]").val(o);$("#"+SN.C.S.NoticeDataGeo).attr("checked",true);var p={NLat:l.lat,NLon:l.lon,NLNS:n,NLID:o,NLN:NLN_text,NLNU:m.url,NDG:true};$.cookie(SN.C.S.NoticeDataGeoCookie,JSON.stringify(p),{path:"/"})})}if(b.length>0){if($.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){b.attr("checked",false)}else{b.attr("checked",true)}var f=$("#notice_data-geo_wrap");var g=f.attr("title");f.removeAttr("title");$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",jQuery.trim($("label[for="+SN.C.S.NoticeDataGeo+"]").text()));b.change(function(){if($("#"+SN.C.S.NoticeDataGeo).attr("checked")===true||$.cookie(SN.C.S.NoticeDataGeoCookie)===null){$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",NoticeDataGeo_text.ShareDisable).addClass("checked");if($.cookie(SN.C.S.NoticeDataGeoCookie)===null||$.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){if(navigator.geolocation){SN.U.NoticeGeoStatus("Requesting location from browser...");navigator.geolocation.getCurrentPosition(function(m){$(".form_notice [name=lat]").val(m.coords.latitude);$(".form_notice [name=lon]").val(m.coords.longitude);var n={lat:m.coords.latitude,lon:m.coords.longitude,token:$("#token").val()};j(g,n)},function(m){switch(m.code){case m.PERMISSION_DENIED:e("Location permission denied.");break;case m.TIMEOUT:e("Location lookup timeout.");break}},{timeout:10000})}else{if(c.length>0&&h.length>0){var k={lat:c,lon:h,token:$("#token").val()};j(g,k)}else{e();$("#"+SN.C.S.NoticeDataGeo).remove();$("label[for="+SN.C.S.NoticeDataGeo+"]").remove()}}}else{var l=JSON.parse($.cookie(SN.C.S.NoticeDataGeoCookie));$(".form_notice [name=lat]").val(l.NLat);$(".form_notice [name=lon]").val(l.NLon);$(".form_notice [name=location_ns]").val(l.NLNS);$(".form_notice [name=location_id]").val(l.NLID);$("#"+SN.C.S.NoticeDataGeo).attr("checked",l.NDG);SN.U.NoticeGeoStatus(l.NLN,l.NLat,l.NLon,l.NLNU);$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",NoticeDataGeo_text.ShareDisable+" ("+l.NLN+")").addClass("checked")}}else{e()}}).change()}},NoticeGeoStatus:function(a,f,g,c){var e=$("#form_notice");var h=e.find(".geo_status_wrapper");if(h.length==0){h=$('<div class="'+SN.C.S.Success+' geo_status_wrapper"><button class="close" style="float:right">&#215;</button><div class="geo_status"></div></div>');h.find("button.close").click(function(){$("#"+SN.C.S.NoticeDataGeo).removeAttr("checked").change()});e.append(h)}var b;if(c){b=$("<a></a>").attr("href",c)}else{b=$("<span></span>")}b.text(a);if(f||g){var d=f+";"+g;b.attr("title",d);if(!a){b.text(d)}}h.find(".geo_status").empty().append(b)},NewDirectMessage:function(){NDM=$(".entity_send-a-message a");NDM.attr({href:NDM.attr("href")+"&ajax=1"});NDM.bind("click",function(){var a=$(".entity_send-a-message form");if(a.length===0){$(this).addClass(SN.C.S.Processing);$.get(NDM.attr("href"),null,function(b){$(".entity_send-a-message").append(document._importNode($("form",b)[0],true));a=$(".entity_send-a-message .form_notice");SN.U.FormNoticeXHR(a);SN.U.FormNoticeEnhancements(a);a.append('<button class="close">&#215;</button>');$(".entity_send-a-message button").click(function(){a.hide();return false});NDM.removeClass(SN.C.S.Processing)})}else{a.show();$(".entity_send-a-message textarea").focus()}return false})},GetFullYear:function(c,d,a){var b=new Date();b.setFullYear(c,d,a);return b},StatusNetInstance:{Set:function(b){var a=SN.U.StatusNetInstance.Get();if(a!==null){b=$.extend(a,b)}$.cookie(SN.C.S.StatusNetInstance,JSON.stringify(b),{path:"/",expires:SN.U.GetFullYear(2029,0,1)})},Get:function(){var a=$.cookie(SN.C.S.StatusNetInstance);if(a!==null){return JSON.parse(a)}return null},Delete:function(){$.cookie(SN.C.S.StatusNetInstance,null)}},belongsOnTimeline:function(b){var a=$("body").attr("id");if(a=="public"){return true}var c=$("#nav_profile a").attr("href");if(c){var d=$(b).find(".entry-title .author a.url").attr("href");if(d==c){if(a=="all"||a=="showstream"){return true}}}return false}},Init:{NoticeForm:function(){if($("body.user_in").length>0){SN.U.NoticeLocationAttach();$("."+SN.C.S.FormNotice).each(function(){SN.U.FormNoticeXHR($(this));SN.U.FormNoticeEnhancements($(this));SN.U.NoticeDataAttach($(this))})}},Notices:function(){if($("body.user_in").length>0){SN.U.NoticeFavor();SN.U.NoticeRepeat();SN.U.NoticeReply();SN.U.NoticeInlineReplySetup()}SN.U.NoticeAttachments()},EntityActions:function(){if($("body.user_in").length>0){$(".form_user_subscribe").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_user_unsubscribe").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_group_join").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_group_leave").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_user_nudge").live("click",function(){SN.U.FormXHR($(this));return false});SN.U.NewDirectMessage()}},Login:function(){if(SN.U.StatusNetInstance.Get()!==null){var a=SN.U.StatusNetInstance.Get().Nickname;if(a!==null){$("#form_login #nickname").val(a)}}$("#form_login").bind("submit",function(){SN.U.StatusNetInstance.Set({Nickname:$("#form_login #nickname").val()});return true})},UploadForms:function(){$("input[type=file]").change(function(d){if(typeof this.files=="object"&&this.files.length>0){var c=0;for(var b=0;b<this.files.length;b++){c+=this.files[b].size}var a=SN.U.maxFileSize($(this.form));if(a>0&&c>a){var e="File too large: maximum upload size is %d bytes.";alert(e.replace("%d",a));$(this).val("");d.preventDefault();return false}}})}}};$(document).ready(function(){SN.Init.UploadForms();if($("."+SN.C.S.FormNotice).length>0){SN.Init.NoticeForm()}if($("#content .notices").length>0){SN.Init.Notices()}if($("#content .entity_actions").length>0){SN.Init.EntityActions()}if($("#form_login").length>0){SN.Init.Login()}});if(!document.ELEMENT_NODE){document.ELEMENT_NODE=1;document.ATTRIBUTE_NODE=2;document.TEXT_NODE=3;document.CDATA_SECTION_NODE=4;document.ENTITY_REFERENCE_NODE=5;document.ENTITY_NODE=6;document.PROCESSING_INSTRUCTION_NODE=7;document.COMMENT_NODE=8;document.DOCUMENT_NODE=9;document.DOCUMENT_TYPE_NODE=10;document.DOCUMENT_FRAGMENT_NODE=11;document.NOTATION_NODE=12}document._importNode=function(e,a){switch(e.nodeType){case document.ELEMENT_NODE:var d=document.createElement(e.nodeName);if(e.attributes&&e.attributes.length>0){for(var c=0,b=e.attributes.length;c<b;){if(e.attributes[c].nodeName=="class"){d.className=e.getAttribute(e.attributes[c++].nodeName)}else{d.setAttribute(e.attributes[c].nodeName,e.getAttribute(e.attributes[c++].nodeName))}}}if(a&&e.childNodes&&e.childNodes.length>0){for(var c=0,b=e.childNodes.length;c<b;){d.appendChild(document._importNode(e.childNodes[c++],a))}}return d;break;case document.TEXT_NODE:case document.CDATA_SECTION_NODE:case document.COMMENT_NODE:return document.createTextNode(e.nodeValue);break}};if(typeof navigator.geolocation=="undefined"||navigator.geolocation.shim){(function(){(function(){if(window.google&&google.gears){return}var c=null;if(typeof GearsFactory!="undefined"){c=new GearsFactory()}else{try{c=new ActiveXObject("Gears.Factory");if(c.getBuildInfo().indexOf("ie_mobile")!=-1){c.privateSetGlobalObject(this)}}catch(d){if((typeof navigator.mimeTypes!="undefined")&&navigator.mimeTypes["application/x-googlegears"]){c=document.createElement("object");c.style.display="none";c.width=0;c.height=0;c.type="application/x-googlegears";document.documentElement.appendChild(c)}}}if(!c){return}if(!window.google){google={}}if(!google.gears){google.gears={factory:c}}})();var a=(function(){var d=google.gears.factory.create("beta.geolocation");var c=function(f,e){return function(g){f(g);e.lastPosition=g}};return{shim:true,type:"Gears",lastPosition:null,getCurrentPosition:function(e,g,h){var f=this;var i=c(e,f);d.getCurrentPosition(i,g,h)},watchPosition:function(e,f,g){d.watchPosition(e,f,g)},clearWatch:function(e){d.clearWatch(e)},getPermission:function(g,e,f){d.getPermission(g,e,f)}}});var b=(function(){var i=false;var e=function(){if(!d()&&!i){i=true;var j=document.createElement("script");j.src=(document.location.protocol=="https:"?"https://":"http://")+"www.google.com/jsapi?callback=_google_loader_apiLoaded";j.type="text/javascript";document.getElementsByTagName("body")[0].appendChild(j)}};var c=[];var h=function(j){c.push(j)};var f=function(){if(d()){while(c.length>0){var j=c.pop();j()}}};window._google_loader_apiLoaded=function(){f()};var d=function(){return(window.google&&google.loader)};var g=function(j){if(d()){return true}h(j);e();return false};e();return{shim:true,type:"ClientLocation",lastPosition:null,getCurrentPosition:function(k,n,o){var m=this;if(!g(function(){m.getCurrentPosition(k,n,o)})){return}if(google.loader.ClientLocation){var l=google.loader.ClientLocation;var j={coords:{latitude:l.latitude,longitude:l.longitude,altitude:null,accuracy:43000,altitudeAccuracy:null,heading:null,speed:null},address:{city:l.address.city,country:l.address.country,country_code:l.address.country_code,region:l.address.region},timestamp:new Date()};k(j);this.lastPosition=j}else{if(n==="function"){n({code:3,message:"Using the Google ClientLocation API and it is not able to calculate a location."})}}},watchPosition:function(j,l,m){this.getCurrentPosition(j,l,m);var k=this;var n=setInterval(function(){k.getCurrentPosition(j,l,m)},10000);return n},clearWatch:function(j){clearInterval(j)},getPermission:function(l,j,k){return true}}});navigator.geolocation=(window.google&&google.gears)?a():b()})()};
\ No newline at end of file
+var SN={C:{I:{CounterBlackout:false,MaxLength:140,PatternUsername:/^[0-9a-zA-Z\-_.]*$/,HTTP20x30x:[200,201,202,203,204,205,206,300,301,302,303,304,305,306,307]},S:{Disabled:"disabled",Warning:"warning",Error:"error",Success:"success",Processing:"processing",CommandResult:"command_result",FormNotice:"form_notice",NoticeInReplyTo:"notice_in-reply-to",NoticeLat:"notice_data-lat",NoticeLon:"notice_data-lon",NoticeLocationId:"notice_data-location_id",NoticeLocationNs:"notice_data-location_ns",NoticeGeoName:"notice_data-geo_name",NoticeDataGeo:"notice_data-geo",NoticeDataGeoCookie:"NoticeDataGeo",NoticeDataGeoSelected:"notice_data-geo_selected",StatusNetInstance:"StatusNetInstance"}},messages:{},msg:function(a){if(typeof SN.messages[a]=="undefined"){return"["+a+"]"}else{return SN.messages[a]}},U:{FormNoticeEnhancements:function(b){if(jQuery.data(b[0],"ElementData")===undefined){MaxLength=b.find(".count").text();if(typeof(MaxLength)=="undefined"){MaxLength=SN.C.I.MaxLength}jQuery.data(b[0],"ElementData",{MaxLength:MaxLength});SN.U.Counter(b);NDT=b.find("[name=status_textarea]");NDT.bind("keyup",function(c){SN.U.Counter(b)});var a=function(c){window.setTimeout(function(){SN.U.Counter(b)},50)};NDT.bind("cut",a).bind("paste",a)}else{b.find(".count").text(jQuery.data(b[0],"ElementData").MaxLength)}},Counter:function(d){SN.C.I.FormNoticeCurrent=d;var b=jQuery.data(d[0],"ElementData").MaxLength;if(b<=0){return}var c=b-SN.U.CharacterCount(d);var a=d.find(".count");if(c.toString()!=a.text()){if(!SN.C.I.CounterBlackout||c===0){if(a.text()!=String(c)){a.text(c)}if(c<0){d.addClass(SN.C.S.Warning)}else{d.removeClass(SN.C.S.Warning)}if(!SN.C.I.CounterBlackout){SN.C.I.CounterBlackout=true;SN.C.I.FormNoticeCurrent=d;window.setTimeout("SN.U.ClearCounterBlackout(SN.C.I.FormNoticeCurrent);",500)}}}},CharacterCount:function(a){return a.find("[name=status_textarea]").val().length},ClearCounterBlackout:function(a){SN.C.I.CounterBlackout=false;SN.U.Counter(a)},RewriteAjaxAction:function(a){if(document.location.protocol=="https:"&&a.substr(0,5)=="http:"){return a.replace(/^http:\/\/[^:\/]+/,"https://"+document.location.host)}else{return a}},FormXHR:function(a){$.ajax({type:"POST",dataType:"xml",url:SN.U.RewriteAjaxAction(a.attr("action")),data:a.serialize()+"&ajax=1",beforeSend:function(b){a.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(c,d,b){alert(b||d)},success:function(b,c){if(typeof($("form",b)[0])!="undefined"){form_new=document._importNode($("form",b)[0],true);a.replaceWith(form_new)}else{a.replaceWith(document._importNode($("p",b)[0],true))}}})},FormNoticeXHR:function(b){SN.C.I.NoticeDataGeo={};b.append('<input type="hidden" name="ajax" value="1"/>');b.attr("action",SN.U.RewriteAjaxAction(b.attr("action")));var c=function(d,e){b.append($('<p class="form_response"></p>').addClass(d).text(e))};var a=function(){b.find(".form_response").remove()};b.ajaxForm({dataType:"xml",timeout:"60000",beforeSend:function(d){if(b.find("[name=status_textarea]").val()==""){b.addClass(SN.C.S.Warning);return false}b.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled);SN.U.normalizeGeoData(b);return true},error:function(f,g,e){b.removeClass(SN.C.S.Processing).find(".submit").removeClass(SN.C.S.Disabled).removeAttr(SN.C.S.Disabled,SN.C.S.Disabled);a();if(g=="timeout"){c("error","Sorry! We had trouble sending your notice. The servers are overloaded. Please try again, and contact the site administrator if this problem persists.")}else{var d=SN.U.GetResponseXML(f);if($("."+SN.C.S.Error,d).length>0){b.append(document._importNode($("."+SN.C.S.Error,d)[0],true))}else{if(parseInt(f.status)===0||jQuery.inArray(parseInt(f.status),SN.C.I.HTTP20x30x)>=0){b.resetForm().find(".attach-status").remove();SN.U.FormNoticeEnhancements(b)}else{c("error","(Sorry! We had trouble sending your notice ("+f.status+" "+f.statusText+"). Please report the problem to the site administrator if this happens again.")}}}},success:function(i,k){a();var e=$("#"+SN.C.S.Error,i);if(e.length>0){c("error",e.text())}else{if($("body")[0].id=="bookmarklet"){self.close()}var d=$("#"+SN.C.S.CommandResult,i);if(d.length>0){c("success",d.text())}else{var h=document._importNode($("li",i)[0],true);var j=$("#notices_primary .notices:first");if(j.length>0&&SN.U.belongsOnTimeline(h)){if($("#"+h.id).length===0){var f=$("#"+SN.C.S.NoticeInReplyTo).val();var g="#notices_primary #notice-"+f;if($("body")[0].id=="conversation"){if(f.length>0&&$(g+" .notices").length<1){$(g).append('<ul class="notices"></ul>')}$($(g+" .notices")[0]).append(h)}else{j.prepend(h)}$("#"+h.id).css({display:"none"}).fadeIn(2500);SN.U.NoticeWithAttachment($("#"+h.id));SN.U.NoticeReplyTo($("#"+h.id))}}else{c("success",$("title",i).text())}}b.resetForm();b.find("[name=inreplyto]").val("");b.find(".attach-status").remove();SN.U.FormNoticeEnhancements(b)}},complete:function(d,e){b.removeClass(SN.C.S.Processing).find(".submit").removeAttr(SN.C.S.Disabled).removeClass(SN.C.S.Disabled);b.find("[name=lat]").val(SN.C.I.NoticeDataGeo.NLat);b.find("[name=lon]").val(SN.C.I.NoticeDataGeo.NLon);b.find("[name=location_ns]").val(SN.C.I.NoticeDataGeo.NLNS);b.find("[name=location_id]").val(SN.C.I.NoticeDataGeo.NLID);$("#"+SN.C.S.NoticeDataGeo).attr("checked",SN.C.I.NoticeDataGeo.NDG)}})},normalizeGeoData:function(a){SN.C.I.NoticeDataGeo.NLat=a.find("[name=lat]").val();SN.C.I.NoticeDataGeo.NLon=a.find("[name=lon]").val();SN.C.I.NoticeDataGeo.NLNS=a.find("[name=location_ns]").val();SN.C.I.NoticeDataGeo.NLID=a.find("[name=location_id]").val();SN.C.I.NoticeDataGeo.NDG=$("#"+SN.C.S.NoticeDataGeo).attr("checked");var b=$.cookie(SN.C.S.NoticeDataGeoCookie);if(b!==null&&b!="disabled"){b=JSON.parse(b);SN.C.I.NoticeDataGeo.NLat=a.find("[name=lat]").val(b.NLat).val();SN.C.I.NoticeDataGeo.NLon=a.find("[name=lon]").val(b.NLon).val();if(b.NLNS){SN.C.I.NoticeDataGeo.NLNS=a.find("[name=location_ns]").val(b.NLNS).val();SN.C.I.NoticeDataGeo.NLID=a.find("[name=location_id]").val(b.NLID).val()}else{a.find("[name=location_ns]").val("");a.find("[name=location_id]").val("")}}if(b=="disabled"){SN.C.I.NoticeDataGeo.NDG=$("#"+SN.C.S.NoticeDataGeo).attr("checked",false).attr("checked")}else{SN.C.I.NoticeDataGeo.NDG=$("#"+SN.C.S.NoticeDataGeo).attr("checked",true).attr("checked")}},GetResponseXML:function(b){try{return b.responseXML}catch(a){return(new DOMParser()).parseFromString(b.responseText,"text/xml")}},NoticeReply:function(){if($("#content .notice_reply").length>0){$("#content .notice").each(function(){SN.U.NoticeReplyTo($(this))})}},NoticeReplyTo:function(a){a.find(".notice_reply").live("click",function(c){c.preventDefault();var b=($(".author .nickname",a).length>0)?$($(".author .nickname",a)[0]):$(".author .nickname.uid");SN.U.NoticeInlineReplyTrigger(a,"@"+b.text());return false})},NoticeInlineReplyTrigger:function(h,i){var c=$($(".notice_id",h)[0]).text();var d=h;var f=h.closest(".notices");if(f.hasClass("threaded-replies")){d=f.closest(".notice")}else{f=$("ul.threaded-replies",h);if(f.length==0){f=$('<ul class="notices threaded-replies xoxo"></ul>');h.append(f)}}var k=$(".notice-reply-form",f);if(k.length==0){$("li.notice-reply-placeholder").remove();var g=$("li.notice-reply",f);if(g.length==0){g=$('<li class="notice-reply"><form class="notice-reply-form" method="post"><textarea name="status_textarea"></textarea><div class="controls"><input type="hidden" name="token"><input type="hidden" name="inreplyto"><input type="submit" class="submit"></div></form></li>');var b=$("#form_notice");k=g.find("form");k.attr("action",b.attr("action"));k.find('input[name="token"]').val(b.find("input[name=token]").val());k.find('input[type="submit"]').val(SN.msg("reply_submit"));f.append(g);k.find("textarea").blur(function(){var m=$(this);var l=$.trim(m.val());if(l==""||l==m.data("initialText")){g.remove();if(f.find("li").length>0){SN.U.NoticeInlineReplyPlaceholder(d)}else{f.remove()}}});k.submit(function(m){var l=k;$.ajax({type:"POST",dataType:"xml",url:SN.U.RewriteAjaxAction(l.attr("action")),data:l.serialize()+"&ajax=1",beforeSend:function(n){l.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled).end().find("textarea").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(o,p,n){alert(n||p)},success:function(p,r){var o=$("li",p)[0];if(o){var n=document._importNode(o,true);var q=$(n).attr("id");if($("#"+q).length==0){g.replaceWith(n);SN.U.NoticeInlineReplyPlaceholder(d)}else{g.remove()}}}});m.preventDefault();return false})}}k.find("input[name=inreplyto]").val(c);var j=k.find("textarea");if(j.length==0){throw"No textarea"}var a="";if(i){a=i+" "}j.val(a+j.val().replace(RegExp(a,"i"),""));j.data("initialText",$.trim(i+""));j.focus();if(j[0].setSelectionRange){var e=j.val().length;j[0].setSelectionRange(e,e)}},NoticeFavor:function(){$(".form_favor").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_disfavor").live("click",function(){SN.U.FormXHR($(this));return false})},NoticeInlineReplyPlaceholder:function(b){var a=b.find("ul.threaded-replies");var c=$('<li class="notice-reply-placeholder"><input class="placeholder"></li>');c.click(function(){SN.U.NoticeInlineReplyTrigger(b)});c.find("input").val(SN.msg("reply_placeholder"));a.append(c)},NoticeInlineReplySetup:function(){$(".threaded-replies").each(function(){var b=$(this);var a=b.closest(".notice");SN.U.NoticeInlineReplyPlaceholder(a)})},NoticeRepeat:function(){$(".form_repeat").live("click",function(a){a.preventDefault();SN.U.NoticeRepeatConfirmation($(this));return false})},NoticeRepeatConfirmation:function(a){var c=a.find(".submit");var b=c.clone();b.addClass("submit_dialogbox").removeClass("submit");a.append(b);b.bind("click",function(){SN.U.FormXHR(a);return false});c.hide();a.addClass("dialogbox").append('<button class="close">&#215;</button>').closest(".notice-options").addClass("opaque");a.find("button.close").click(function(){$(this).remove();a.removeClass("dialogbox").closest(".notice-options").removeClass("opaque");a.find(".submit_dialogbox").remove();a.find(".submit").show();return false})},NoticeAttachments:function(){$(".notice a.attachment").each(function(){SN.U.NoticeWithAttachment($(this).closest(".notice"))})},NoticeWithAttachment:function(b){if(b.find(".attachment").length===0){return}var a=b.find(".attachment.more");if(a.length>0){$(a[0]).click(function(){var c=$(this);c.addClass(SN.C.S.Processing);$.get(c.attr("href")+"/ajax",null,function(d){c.parent(".entry-content").html($(d).find("#attachment_view .entry-content").html())});return false}).attr("title",SN.msg("showmore_tooltip"))}},NoticeDataAttach:function(b){var a=b.find("input[type=file]");a.change(function(f){b.find(".attach-status").remove();var d=$(this).val();if(!d){return false}var c=$('<div class="attach-status '+SN.C.S.Success+'"><code></code> <button class="close">&#215;</button></div>');c.find("code").text(d);c.find("button").click(function(){c.remove();a.val("");return false});b.append(c);if(typeof this.files=="object"){for(var e=0;e<this.files.length;e++){SN.U.PreviewAttach(b,this.files[e])}}})},maxFileSize:function(b){var a=$(b).find("input[name=MAX_FILE_SIZE]").attr("value");if(a){return parseInt(a)}else{return 0}},PreviewAttach:function(d,c){var e=c.type+" "+Math.round(c.size/1024)+"KB";var f=true;var h;if(typeof window.createObjectURL!="undefined"){h=function(i,j){j(window.createObjectURL(i))}}else{if(typeof window.FileReader!="undefined"){h=function(j,k){var i=new FileReader();i.onload=function(l){k(i.result)};i.readAsDataURL(j)}}else{f=false}}var a=["image/png","image/jpeg","image/gif","image/svg+xml"];if($.inArray(c.type,a)==-1){f=false}var g=8*1024*1024;if(c.size>g){f=false}if(f){h(c,function(j){var i=$("<img>").attr("title",e).attr("alt",e).attr("src",j).attr("style","height: 120px");d.find(".attach-status").append(i)})}else{var b=$("<div></div>").text(e);d.find(".attach-status").append(b)}},NoticeLocationAttach:function(){var c=$("#"+SN.C.S.NoticeLat).val();var h=$("#"+SN.C.S.NoticeLon).val();var d=$("#"+SN.C.S.NoticeLocationNs).val();var i=$("#"+SN.C.S.NoticeLocationId).val();var a=$("#"+SN.C.S.NoticeGeoName).text();var b=$("#"+SN.C.S.NoticeDataGeo);function e(k){$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",jQuery.trim($("label[for="+SN.C.S.NoticeDataGeo+"]").text())).removeClass("checked");$(".form_notice [name=lat]").val("");$(".form_notice [name=lon]").val("");$(".form_notice [name=location_ns]").val("");$(".form_notice [name=location_id]").val("");$("#"+SN.C.S.NoticeDataGeo).attr("checked",false);$.cookie(SN.C.S.NoticeDataGeoCookie,"disabled",{path:"/"});if(k){$(".geo_status_wrapper").removeClass("success").addClass("error");$(".geo_status_wrapper .geo_status").text(k)}else{$(".geo_status_wrapper").remove()}}function j(k,l){SN.U.NoticeGeoStatus("Looking up place name...");$.getJSON(k,l,function(m){var n,o;if(typeof(m.location_ns)!="undefined"){$("#"+SN.C.S.NoticeLocationNs).val(m.location_ns);n=m.location_ns}if(typeof(m.location_id)!="undefined"){$("#"+SN.C.S.NoticeLocationId).val(m.location_id);o=m.location_id}if(typeof(m.name)=="undefined"){NLN_text=l.lat+";"+l.lon}else{NLN_text=m.name}SN.U.NoticeGeoStatus(NLN_text,l.lat,l.lon,m.url);$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",NoticeDataGeo_text.ShareDisable+" ("+NLN_text+")");$(".form_notice [name=lat]").val(l.lat);$(".form_notice [name=lon]").val(l.lon);$(".form_notice [name=location_ns]").val(n);$(".form_notice [name=location_id]").val(o);$("#"+SN.C.S.NoticeDataGeo).attr("checked",true);var p={NLat:l.lat,NLon:l.lon,NLNS:n,NLID:o,NLN:NLN_text,NLNU:m.url,NDG:true};$.cookie(SN.C.S.NoticeDataGeoCookie,JSON.stringify(p),{path:"/"})})}if(b.length>0){if($.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){b.attr("checked",false)}else{b.attr("checked",true)}var f=$("#notice_data-geo_wrap");var g=f.attr("title");f.removeAttr("title");$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",jQuery.trim($("label[for="+SN.C.S.NoticeDataGeo+"]").text()));b.change(function(){if($("#"+SN.C.S.NoticeDataGeo).attr("checked")===true||$.cookie(SN.C.S.NoticeDataGeoCookie)===null){$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",NoticeDataGeo_text.ShareDisable).addClass("checked");if($.cookie(SN.C.S.NoticeDataGeoCookie)===null||$.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){if(navigator.geolocation){SN.U.NoticeGeoStatus("Requesting location from browser...");navigator.geolocation.getCurrentPosition(function(m){$(".form_notice [name=lat]").val(m.coords.latitude);$(".form_notice [name=lon]").val(m.coords.longitude);var n={lat:m.coords.latitude,lon:m.coords.longitude,token:$("#token").val()};j(g,n)},function(m){switch(m.code){case m.PERMISSION_DENIED:e("Location permission denied.");break;case m.TIMEOUT:e("Location lookup timeout.");break}},{timeout:10000})}else{if(c.length>0&&h.length>0){var k={lat:c,lon:h,token:$("#token").val()};j(g,k)}else{e();$("#"+SN.C.S.NoticeDataGeo).remove();$("label[for="+SN.C.S.NoticeDataGeo+"]").remove()}}}else{var l=JSON.parse($.cookie(SN.C.S.NoticeDataGeoCookie));$(".form_notice [name=lat]").val(l.NLat);$(".form_notice [name=lon]").val(l.NLon);$(".form_notice [name=location_ns]").val(l.NLNS);$(".form_notice [name=location_id]").val(l.NLID);$("#"+SN.C.S.NoticeDataGeo).attr("checked",l.NDG);SN.U.NoticeGeoStatus(l.NLN,l.NLat,l.NLon,l.NLNU);$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",NoticeDataGeo_text.ShareDisable+" ("+l.NLN+")").addClass("checked")}}else{e()}}).change()}},NoticeGeoStatus:function(a,f,g,c){var e=$("#form_notice");var h=e.find(".geo_status_wrapper");if(h.length==0){h=$('<div class="'+SN.C.S.Success+' geo_status_wrapper"><button class="close" style="float:right">&#215;</button><div class="geo_status"></div></div>');h.find("button.close").click(function(){$("#"+SN.C.S.NoticeDataGeo).removeAttr("checked").change()});e.append(h)}var b;if(c){b=$("<a></a>").attr("href",c)}else{b=$("<span></span>")}b.text(a);if(f||g){var d=f+";"+g;b.attr("title",d);if(!a){b.text(d)}}h.find(".geo_status").empty().append(b)},NewDirectMessage:function(){NDM=$(".entity_send-a-message a");NDM.attr({href:NDM.attr("href")+"&ajax=1"});NDM.bind("click",function(){var a=$(".entity_send-a-message form");if(a.length===0){$(this).addClass(SN.C.S.Processing);$.get(NDM.attr("href"),null,function(b){$(".entity_send-a-message").append(document._importNode($("form",b)[0],true));a=$(".entity_send-a-message .form_notice");SN.U.FormNoticeXHR(a);SN.U.FormNoticeEnhancements(a);a.append('<button class="close">&#215;</button>');$(".entity_send-a-message button").click(function(){a.hide();return false});NDM.removeClass(SN.C.S.Processing)})}else{a.show();$(".entity_send-a-message textarea").focus()}return false})},GetFullYear:function(c,d,a){var b=new Date();b.setFullYear(c,d,a);return b},StatusNetInstance:{Set:function(b){var a=SN.U.StatusNetInstance.Get();if(a!==null){b=$.extend(a,b)}$.cookie(SN.C.S.StatusNetInstance,JSON.stringify(b),{path:"/",expires:SN.U.GetFullYear(2029,0,1)})},Get:function(){var a=$.cookie(SN.C.S.StatusNetInstance);if(a!==null){return JSON.parse(a)}return null},Delete:function(){$.cookie(SN.C.S.StatusNetInstance,null)}},belongsOnTimeline:function(b){var a=$("body").attr("id");if(a=="public"){return true}var c=$("#nav_profile a").attr("href");if(c){var d=$(b).find(".entry-title .author a.url").attr("href");if(d==c){if(a=="all"||a=="showstream"){return true}}}return false}},Init:{NoticeForm:function(){if($("body.user_in").length>0){SN.U.NoticeLocationAttach();$("."+SN.C.S.FormNotice).each(function(){SN.U.FormNoticeXHR($(this));SN.U.FormNoticeEnhancements($(this));SN.U.NoticeDataAttach($(this))})}},Notices:function(){if($("body.user_in").length>0){SN.U.NoticeFavor();SN.U.NoticeRepeat();SN.U.NoticeReply();SN.U.NoticeInlineReplySetup()}SN.U.NoticeAttachments()},EntityActions:function(){if($("body.user_in").length>0){$(".form_user_subscribe").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_user_unsubscribe").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_group_join").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_group_leave").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_user_nudge").live("click",function(){SN.U.FormXHR($(this));return false});SN.U.NewDirectMessage()}},Login:function(){if(SN.U.StatusNetInstance.Get()!==null){var a=SN.U.StatusNetInstance.Get().Nickname;if(a!==null){$("#form_login #nickname").val(a)}}$("#form_login").bind("submit",function(){SN.U.StatusNetInstance.Set({Nickname:$("#form_login #nickname").val()});return true})},UploadForms:function(){$("input[type=file]").change(function(d){if(typeof this.files=="object"&&this.files.length>0){var c=0;for(var b=0;b<this.files.length;b++){c+=this.files[b].size}var a=SN.U.maxFileSize($(this.form));if(a>0&&c>a){var e="File too large: maximum upload size is %d bytes.";alert(e.replace("%d",a));$(this).val("");d.preventDefault();return false}}})}}};$(document).ready(function(){SN.Init.UploadForms();if($("."+SN.C.S.FormNotice).length>0){SN.Init.NoticeForm()}if($("#content .notices").length>0){SN.Init.Notices()}if($("#content .entity_actions").length>0){SN.Init.EntityActions()}if($("#form_login").length>0){SN.Init.Login()}});if(!document.ELEMENT_NODE){document.ELEMENT_NODE=1;document.ATTRIBUTE_NODE=2;document.TEXT_NODE=3;document.CDATA_SECTION_NODE=4;document.ENTITY_REFERENCE_NODE=5;document.ENTITY_NODE=6;document.PROCESSING_INSTRUCTION_NODE=7;document.COMMENT_NODE=8;document.DOCUMENT_NODE=9;document.DOCUMENT_TYPE_NODE=10;document.DOCUMENT_FRAGMENT_NODE=11;document.NOTATION_NODE=12}document._importNode=function(e,a){switch(e.nodeType){case document.ELEMENT_NODE:var d=document.createElement(e.nodeName);if(e.attributes&&e.attributes.length>0){for(var c=0,b=e.attributes.length;c<b;){if(e.attributes[c].nodeName=="class"){d.className=e.getAttribute(e.attributes[c++].nodeName)}else{d.setAttribute(e.attributes[c].nodeName,e.getAttribute(e.attributes[c++].nodeName))}}}if(a&&e.childNodes&&e.childNodes.length>0){for(var c=0,b=e.childNodes.length;c<b;){d.appendChild(document._importNode(e.childNodes[c++],a))}}return d;break;case document.TEXT_NODE:case document.CDATA_SECTION_NODE:case document.COMMENT_NODE:return document.createTextNode(e.nodeValue);break}};if(typeof navigator.geolocation=="undefined"||navigator.geolocation.shim){(function(){(function(){if(window.google&&google.gears){return}var c=null;if(typeof GearsFactory!="undefined"){c=new GearsFactory()}else{try{c=new ActiveXObject("Gears.Factory");if(c.getBuildInfo().indexOf("ie_mobile")!=-1){c.privateSetGlobalObject(this)}}catch(d){if((typeof navigator.mimeTypes!="undefined")&&navigator.mimeTypes["application/x-googlegears"]){c=document.createElement("object");c.style.display="none";c.width=0;c.height=0;c.type="application/x-googlegears";document.documentElement.appendChild(c)}}}if(!c){return}if(!window.google){google={}}if(!google.gears){google.gears={factory:c}}})();var a=(function(){var d=google.gears.factory.create("beta.geolocation");var c=function(f,e){return function(g){f(g);e.lastPosition=g}};return{shim:true,type:"Gears",lastPosition:null,getCurrentPosition:function(e,g,h){var f=this;var i=c(e,f);d.getCurrentPosition(i,g,h)},watchPosition:function(e,f,g){d.watchPosition(e,f,g)},clearWatch:function(e){d.clearWatch(e)},getPermission:function(g,e,f){d.getPermission(g,e,f)}}});var b=(function(){var i=false;var e=function(){if(!d()&&!i){i=true;var j=document.createElement("script");j.src=(document.location.protocol=="https:"?"https://":"http://")+"www.google.com/jsapi?callback=_google_loader_apiLoaded";j.type="text/javascript";document.getElementsByTagName("body")[0].appendChild(j)}};var c=[];var h=function(j){c.push(j)};var f=function(){if(d()){while(c.length>0){var j=c.pop();j()}}};window._google_loader_apiLoaded=function(){f()};var d=function(){return(window.google&&google.loader)};var g=function(j){if(d()){return true}h(j);e();return false};e();return{shim:true,type:"ClientLocation",lastPosition:null,getCurrentPosition:function(k,n,o){var m=this;if(!g(function(){m.getCurrentPosition(k,n,o)})){return}if(google.loader.ClientLocation){var l=google.loader.ClientLocation;var j={coords:{latitude:l.latitude,longitude:l.longitude,altitude:null,accuracy:43000,altitudeAccuracy:null,heading:null,speed:null},address:{city:l.address.city,country:l.address.country,country_code:l.address.country_code,region:l.address.region},timestamp:new Date()};k(j);this.lastPosition=j}else{if(n==="function"){n({code:3,message:"Using the Google ClientLocation API and it is not able to calculate a location."})}}},watchPosition:function(j,l,m){this.getCurrentPosition(j,l,m);var k=this;var n=setInterval(function(){k.getCurrentPosition(j,l,m)},10000);return n},clearWatch:function(j){clearInterval(j)},getPermission:function(l,j,k){return true}}});navigator.geolocation=(window.google&&google.gears)?a():b()})()};
\ No newline at end of file
diff --git a/plugins/MobileProfile/mp-screen.css b/plugins/MobileProfile/mp-screen.css
index 4b9930584f..fcd88277e5 100644
--- a/plugins/MobileProfile/mp-screen.css
+++ b/plugins/MobileProfile/mp-screen.css
@@ -121,7 +121,7 @@ background:none;
 opacity:1;
 }
 
-#form_notice #notice_action-submit {
+#form_notice .submit {
 width:20%;
 right:2%;
 text-align:center;
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index f4a3a12b13..3605a448c3 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -626,7 +626,7 @@ font-weight:bold;
 line-height:1.15;
 padding:1px 2px;
 }
-.form_notice #notice_action-submit {
+.form_notice .submit {
 width:14%;
 height:47px;
 padding:0;
diff --git a/theme/base/css/ie.css b/theme/base/css/ie.css
index 0a26f238b9..b8b5e00bbc 100644
--- a/theme/base/css/ie.css
+++ b/theme/base/css/ie.css
@@ -22,7 +22,7 @@ height:16px;
 width:16px;
 display:block;
 }
-.form_notice #notice_action-submit {
+.form_notice .submit {
 width:17%;
 max-width:17%;
 }
diff --git a/theme/biz/css/base.css b/theme/biz/css/base.css
index d0c445f482..a92cc0b5ea 100644
--- a/theme/biz/css/base.css
+++ b/theme/biz/css/base.css
@@ -495,7 +495,7 @@ font-weight:bold;
 line-height:1.15;
 padding:1px 2px;
 }
-#form_notice #notice_action-submit {
+#form_notice .submit {
 width:14%;
 height:47px;
 padding:0;
diff --git a/theme/clean/css/display.css b/theme/clean/css/display.css
index 9cc8346fdf..36d05d1a55 100644
--- a/theme/clean/css/display.css
+++ b/theme/clean/css/display.css
@@ -124,7 +124,7 @@ address {
     top: 52px;
 }
 
-.form_notice #notice_action-submit {
+.form_notice .submit {
     font-size: 0.9em;
     top: 80px;
     right:0;
diff --git a/theme/clean/css/ie.css b/theme/clean/css/ie.css
index 9e26313b0e..7c8054b28c 100644
--- a/theme/clean/css/ie.css
+++ b/theme/clean/css/ie.css
@@ -18,7 +18,7 @@ display:block;
     left: 390px;
     top: 27px;
 }
-.form_notice #notice_action-submit {
+.form_notice .submit {
     width: 96px;
     max-width: 96px;
 }
diff --git a/theme/clean/css/mp-screen.css b/theme/clean/css/mp-screen.css
index 4b19afd117..35d8326a41 100644
--- a/theme/clean/css/mp-screen.css
+++ b/theme/clean/css/mp-screen.css
@@ -107,7 +107,7 @@ background:none;
 opacity:1;
 }
 
-.form_notice #notice_action-submit {
+.form_notice .submit {
     text-align: center;
     left: 230px;
     top: 32px;
@@ -115,7 +115,7 @@ opacity:1;
     font-size: 0.8em;
 }
 
-#form_notice-direct.form_notice #notice_action-submit {
+#form_notice-direct.form_notice .submit {
     top: 62px;
 }
 
diff --git a/theme/cleaner/css/display.css b/theme/cleaner/css/display.css
index 8d27c64732..37de39be88 100644
--- a/theme/cleaner/css/display.css
+++ b/theme/cleaner/css/display.css
@@ -173,7 +173,7 @@ address {
     right: 86px;
 }
 
-.form_notice #notice_action-submit {
+.form_notice .submit {
     font-size: 0.9em;
     top: 80px;
 	right: -2px;
@@ -409,7 +409,7 @@ div.entry-content a.response:after {
     border: 1px solid #7B4E82;
 }
 
-.entity_send-a-message .form_notice #notice_action-submit {
+.entity_send-a-message .form_notice .submit {
     color: #fff !important;
     top: 46px;
 }
@@ -589,7 +589,7 @@ padding-right:0;
     width: 325px !important;
 }
 
-.realtime-popup .form_notice #notice_action-submit {
+.realtime-popup .form_notice .submit {
     top: 59px !important;
     right: 6px !important;
 }
diff --git a/theme/cleaner/css/ie.css b/theme/cleaner/css/ie.css
index af883e7b4f..8d9cf961dd 100644
--- a/theme/cleaner/css/ie.css
+++ b/theme/cleaner/css/ie.css
@@ -18,7 +18,7 @@ display:block;
     left: 390px;
     top: 27px;
 }
-.form_notice #notice_action-submit {
+.form_notice .submit {
     width: 106px;
     max-width: 106px;
 }
diff --git a/theme/cleaner/css/mp-screen.css b/theme/cleaner/css/mp-screen.css
index 22cc923e81..8b55e596fe 100644
--- a/theme/cleaner/css/mp-screen.css
+++ b/theme/cleaner/css/mp-screen.css
@@ -112,7 +112,7 @@ background:none;
 opacity:1;
 }
 
-.form_notice #notice_action-submit {
+.form_notice .submit {
     text-align: center;
     left: 230px;
     top: 32px;
@@ -120,7 +120,7 @@ opacity:1;
     font-size: 0.8em;
 }
 
-#form_notice-direct.form_notice #notice_action-submit {
+#form_notice-direct.form_notice .submit {
     top: 62px;
 }
 
diff --git a/theme/cloudy/css/display.css b/theme/cloudy/css/display.css
index 814f879bc3..6347bab547 100644
--- a/theme/cloudy/css/display.css
+++ b/theme/cloudy/css/display.css
@@ -524,7 +524,7 @@ font-weight:bold;
 line-height:1.15;
 padding:1px 2px;
 }
-.form_notice #notice_action-submit {
+.form_notice .submit {
 width:14%;
 height:47px;
 padding:0;
@@ -1794,7 +1794,7 @@ background:transparent url(../../base/images/icons/twotone/green/clip-01.gif) no
 opacity:0;
 }
 
-#form_notice.processing #notice_action-submit {
+#form_notice.processing .submit {
 background:#fff url(../../base/images/icons/icon_processing.gif) no-repeat 47% 47%;
 cursor:wait;
 text-indent:-9999px;
diff --git a/theme/cloudy/css/ie.css b/theme/cloudy/css/ie.css
index 03cfb23d3b..edddc16d88 100644
--- a/theme/cloudy/css/ie.css
+++ b/theme/cloudy/css/ie.css
@@ -39,7 +39,7 @@ filter: alpha(opacity = 0);
 left:33.5%;
 }
 
-#form_notice #notice_action-submit {
+#form_notice .submit {
 right:0;
 }
 
diff --git a/theme/h4ck3r/css/base.css b/theme/h4ck3r/css/base.css
index 22daceeba8..d369a5ecdd 100644
--- a/theme/h4ck3r/css/base.css
+++ b/theme/h4ck3r/css/base.css
@@ -447,7 +447,7 @@ font-weight:bold;
 line-height:1.15;
 padding:1px 2px;
 }
-#form_notice #notice_action-submit {
+#form_notice .submit {
 width:14%;
 height:47px;
 padding:0;
diff --git a/theme/h4ck3r/css/display.css b/theme/h4ck3r/css/display.css
index 8bd5ad9f4c..45d958bbea 100644
--- a/theme/h4ck3r/css/display.css
+++ b/theme/h4ck3r/css/display.css
@@ -88,7 +88,7 @@ color:#0f0;
 #form_notice.warning .count {
 color:#000;
 }
-#form_notice.processing #notice_action-submit {
+#form_notice.processing .submit {
 background:#ccc url(../../base/images/icons/icon_processing.gif) no-repeat 47% 47%;
 cursor:wait;
 text-indent:-9999px;
diff --git a/theme/mnml/css/display.css b/theme/mnml/css/display.css
index ee2cefe619..7ee72fc4d5 100644
--- a/theme/mnml/css/display.css
+++ b/theme/mnml/css/display.css
@@ -969,7 +969,7 @@ font-family: 'TeXGyreHerosBold', sans-serif;
 line-height:1.15;
 padding:1px 2px;
 }
-.form_notice #notice_action-submit {
+.form_notice .submit {
 width:14%;
 height:47px;
 padding:0;
diff --git a/theme/mnml/css/ie.css b/theme/mnml/css/ie.css
index c694d76404..c5fd2a122d 100644
--- a/theme/mnml/css/ie.css
+++ b/theme/mnml/css/ie.css
@@ -29,7 +29,7 @@ height:16px;
 width:16px;
 display:block;
 }
-.form_notice #notice_action-submit {
+.form_notice .submit {
 width:17%;
 max-width:17%;
 }
diff --git a/theme/mnml/css/mp-screen.css b/theme/mnml/css/mp-screen.css
index ff8f044ca9..fdee4cdef3 100644
--- a/theme/mnml/css/mp-screen.css
+++ b/theme/mnml/css/mp-screen.css
@@ -127,7 +127,7 @@ background:none;
 opacity:1;
 }
 
-#form_notice #notice_action-submit {
+#form_notice .submit {
 width:20%;
 right:2%;
 text-align:center;
diff --git a/theme/pigeonthoughts/css/base.css b/theme/pigeonthoughts/css/base.css
index 20a4f31548..b4c79c4185 100644
--- a/theme/pigeonthoughts/css/base.css
+++ b/theme/pigeonthoughts/css/base.css
@@ -482,7 +482,7 @@ font-weight:bold;
 line-height:1.15;
 padding:1px 2px;
 }
-#form_notice #notice_action-submit {
+#form_notice .submit {
 width:14%;
 height:47px;
 padding:0;
diff --git a/theme/rebase/css/display.css b/theme/rebase/css/display.css
index 21ef1988a7..5fbf5c3ba7 100644
--- a/theme/rebase/css/display.css
+++ b/theme/rebase/css/display.css
@@ -265,7 +265,7 @@ address .poweredby {
     color: #ff0000;
 }        
 
-.form_notice #notice_action-submit {
+.form_notice .submit {
     padding:0;
     position:absolute;
     right:0;
@@ -1454,7 +1454,7 @@ margin-bottom:11px;
 .entity_send-a-message .form_notice select {
 display:none;
 }
-.entity_send-a-message .form_notice #notice_action-submit {
+.entity_send-a-message .form_notice .submit {
     position: absolute;
     top: 52px;
     right: 0px;
@@ -1717,7 +1717,7 @@ body.realtime-popup {
     width: 340px !important;
 }
 
-.realtime-popup .form_notice #notice_action-submit {
+.realtime-popup .form_notice .submit {
     top: 58px !important;
     height: 2em;
     font-size: 0.8em;
diff --git a/theme/rebase/css/ie.css b/theme/rebase/css/ie.css
index e56c0c7810..c8820ab7a6 100644
--- a/theme/rebase/css/ie.css
+++ b/theme/rebase/css/ie.css
@@ -17,7 +17,7 @@ width:16px;
 display:block;
     top: 30px;
 }
-.form_notice #notice_action-submit {
+.form_notice .submit {
     width: 106px;
     max-width: 106px;
 }
diff --git a/theme/shiny/css/display.css b/theme/shiny/css/display.css
index eb206e1c25..1e8eb3f465 100644
--- a/theme/shiny/css/display.css
+++ b/theme/shiny/css/display.css
@@ -242,7 +242,7 @@ h6 {font-size: 1em;}
     right: 86px;
 }
 
-.form_notice #notice_action-submit {
+.form_notice .submit {
     top: 79px;
     right: 0;
     width: 102px;
@@ -250,7 +250,7 @@ h6 {font-size: 1em;}
     height: 2.2em;
 }
 
-.entity_send-a-message .form_notice #notice_action-submit {
+.entity_send-a-message .form_notice .submit {
     color: #fff !important;
 }
 
diff --git a/theme/shiny/css/ie.css b/theme/shiny/css/ie.css
index a24ad40194..da3a317fee 100644
--- a/theme/shiny/css/ie.css
+++ b/theme/shiny/css/ie.css
@@ -19,7 +19,7 @@ display:block;
     top: 27px;
     right: 88px;
 }
-.form_notice #notice_action-submit {
+.form_notice .submit {
     width: 96px;
     max-width: 96px;
 }
diff --git a/theme/shiny/css/mp-screen.css b/theme/shiny/css/mp-screen.css
index 4bde3db71e..cb899b3557 100644
--- a/theme/shiny/css/mp-screen.css
+++ b/theme/shiny/css/mp-screen.css
@@ -112,7 +112,7 @@ background:none;
 opacity:1;
 }
 
-.form_notice #notice_action-submit {
+.form_notice .submit {
     text-align: center;
     left: 230px;
     top: 34px;
@@ -120,7 +120,7 @@ opacity:1;
     font-size: 0.8em;
 }
 
-#form_notice-direct.form_notice #notice_action-submit {
+#form_notice-direct.form_notice .submit {
     top: 64px;
 }
 
diff --git a/theme/victorian/css/mp-screen.css b/theme/victorian/css/mp-screen.css
index 89f168fe0a..94a534912f 100644
--- a/theme/victorian/css/mp-screen.css
+++ b/theme/victorian/css/mp-screen.css
@@ -122,7 +122,7 @@ background:none;
 opacity:1;
 }
 
-#form_notice #notice_action-submit {
+#form_notice .submit {
 width:20%;
 right:2%;
 text-align:center;

From e7662bb1d934f021ff7251f7e65ec72c8cc6bf86 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Thu, 3 Mar 2011 17:58:35 -0800
Subject: [PATCH 389/655] Moving bit by bit more towards reusable forms...
 per-form-izing some of the location setup (not all yet)

---
 js/util.js     | 72 ++++++++++++++++++++++++++------------------------
 js/util.min.js |  2 +-
 2 files changed, 38 insertions(+), 36 deletions(-)

diff --git a/js/util.js b/js/util.js
index 47b8bbe6ca..3cd4bbbe44 100644
--- a/js/util.js
+++ b/js/util.js
@@ -436,7 +436,7 @@ var SN = { // StatusNet
                     form.find('[name=lon]').val(SN.C.I.NoticeDataGeo.NLon);
                     form.find('[name=location_ns]').val(SN.C.I.NoticeDataGeo.NLNS);
                     form.find('[name=location_id]').val(SN.C.I.NoticeDataGeo.NLID);
-                    $('#'+SN.C.S.NoticeDataGeo).attr('checked', SN.C.I.NoticeDataGeo.NDG);
+                    form.find('[name=notice_data-geo]').attr('checked', SN.C.I.NoticeDataGeo.NDG);
                 }
             });
         },
@@ -446,7 +446,7 @@ var SN = { // StatusNet
             SN.C.I.NoticeDataGeo.NLon = form.find('[name=lon]').val();
             SN.C.I.NoticeDataGeo.NLNS = form.find('[name=location_ns]').val();
             SN.C.I.NoticeDataGeo.NLID = form.find('[name=location_id]').val();
-            SN.C.I.NoticeDataGeo.NDG = $('#'+SN.C.S.NoticeDataGeo).attr('checked'); // @fixme
+            SN.C.I.NoticeDataGeo.NDG = form.find('[name=notice_data-geo]').attr('checked'); // @fixme
 
             var cookieValue = $.cookie(SN.C.S.NoticeDataGeoCookie);
 
@@ -463,10 +463,10 @@ var SN = { // StatusNet
                 }
             }
             if (cookieValue == 'disabled') {
-                SN.C.I.NoticeDataGeo.NDG = $('#'+SN.C.S.NoticeDataGeo).attr('checked', false).attr('checked');
+                SN.C.I.NoticeDataGeo.NDG = form.find('[name=notice_data-geo]').attr('checked', false).attr('checked');
             }
             else {
-                SN.C.I.NoticeDataGeo.NDG = $('#'+SN.C.S.NoticeDataGeo).attr('checked', true).attr('checked');
+                SN.C.I.NoticeDataGeo.NDG = form.find('[name=notice_data-geo]').attr('checked', true).attr('checked');
             }
 
         },
@@ -959,30 +959,32 @@ var SN = { // StatusNet
          * new-notice form. Seems to set up some event handlers for
          * triggering lookups and using the new values.
          *
+         * @param {jQuery} form
+         *
          * @fixme tl;dr
          * @fixme there's not good visual state update here, so users have a
          *        hard time figuring out if it's working or fixing if it's wrong.
          *
          */
-        NoticeLocationAttach: function() {
+        NoticeLocationAttach: function(form) {
             // @fixme this should not be tied to the main notice form, as there may be multiple notice forms...
-            var NLat = $('#'+SN.C.S.NoticeLat).val();
-            var NLon = $('#'+SN.C.S.NoticeLon).val();
-            var NLNS = $('#'+SN.C.S.NoticeLocationNs).val();
-            var NLID = $('#'+SN.C.S.NoticeLocationId).val();
-            var NLN = $('#'+SN.C.S.NoticeGeoName).text();
-            var NDGe = $('#'+SN.C.S.NoticeDataGeo);
+            var NLat = form.find('[name=lat]')
+            var NLon = form.find('[name=lon]')
+            var NLNS = form.find('[name=location_ns]').val();
+            var NLID = form.find('[name=location_id]').val();
+            var NLN = $('#'+SN.C.S.NoticeGeoName).text(); // @fixme does this exist?
+            var NDGe = form.find('[name=notice_data-geo]');
 
             function removeNoticeDataGeo(error) {
                 $('label[for='+SN.C.S.NoticeDataGeo+']')
                     .attr('title', jQuery.trim($('label[for='+SN.C.S.NoticeDataGeo+']').text()))
                     .removeClass('checked');
 
-                $('.form_notice [name=lat]').val('');
-                $('.form_notice [name=lon]').val('');
-                $('.form_notice [name=location_ns]').val('');
-                $('.form_notice [name=location_id]').val('');
-                $('#'+SN.C.S.NoticeDataGeo).attr('checked', false);
+                form.find('[name=lat]').val('');
+                form.find('[name=lon]').val('');
+                form.find('[name=location_ns]').val('');
+                form.find('[name=location_id]').val('');
+                form.find('[name=notice_data-geo]').attr('checked', false);
 
                 $.cookie(SN.C.S.NoticeDataGeoCookie, 'disabled', { path: '/' });
 
@@ -1000,12 +1002,12 @@ var SN = { // StatusNet
                     var lns, lid;
 
                     if (typeof(location.location_ns) != 'undefined') {
-                        $('#'+SN.C.S.NoticeLocationNs).val(location.location_ns);
+                        form.find('[name=location_ns]').val(location.location_ns);
                         lns = location.location_ns;
                     }
 
                     if (typeof(location.location_id) != 'undefined') {
-                        $('#'+SN.C.S.NoticeLocationId).val(location.location_id);
+                        form.find('[name=location_id]').val(location.location_id);
                         lid = location.location_id;
                     }
 
@@ -1020,11 +1022,11 @@ var SN = { // StatusNet
                     $('label[for='+SN.C.S.NoticeDataGeo+']')
                         .attr('title', NoticeDataGeo_text.ShareDisable + ' (' + NLN_text + ')');
 
-                    $('.form_notice [name=lat]').val(data.lat);
-                    $('.form_notice [name=lon]').val(data.lon);
-                    $('.form_notice [name=location_ns]').val(lns);
-                    $('.form_notice [name=location_id]').val(lid);
-                    $('#'+SN.C.S.NoticeDataGeo).attr('checked', true);
+                    form.find('[name=lat]').val(data.lat);
+                    form.find('[name=lon]').val(data.lon);
+                    form.find('[name=location_ns]').val(lns);
+                    form.find('[name=location_id]').val(lid);
+                    form.find('[name=notice_data-geo]').attr('checked', true);
 
                     var cookieValue = {
                         NLat: data.lat,
@@ -1066,8 +1068,8 @@ var SN = { // StatusNet
                                 SN.U.NoticeGeoStatus('Requesting location from browser...');
                                 navigator.geolocation.getCurrentPosition(
                                     function(position) {
-                                        $('.form_notice [name=lat]').val(position.coords.latitude);
-                                        $('.form_notice [name=lon]').val(position.coords.longitude);
+                                        form.find('[name=lat]').val(position.coords.latitude);
+                                        form.find('[name=lon]').val(position.coords.longitude);
 
                                         var data = {
                                             lat: position.coords.latitude,
@@ -1115,11 +1117,11 @@ var SN = { // StatusNet
                         else {
                             var cookieValue = JSON.parse($.cookie(SN.C.S.NoticeDataGeoCookie));
 
-                            $('.form_notice [name=lat]').val(cookieValue.NLat);
-                            $('.form_notice [name=lon]').val(cookieValue.NLon);
-                            $('.form_notice [name=location_ns]').val(cookieValue.NLNS);
-                            $('.form_notice [name=location_id]').val(cookieValue.NLID);
-                            $('#'+SN.C.S.NoticeDataGeo).attr('checked', cookieValue.NDG);
+                            form.find('[name=lat]').val(cookieValue.NLat);
+                            form.find('[name=lon]').val(cookieValue.NLon);
+                            form.find('[name=location_ns]').val(cookieValue.NLNS);
+                            form.find('[name=location_id]').val(cookieValue.NLID);
+                            form.find('[name=notice_data-geo]').attr('checked', cookieValue.NDG);
 
                             SN.U.NoticeGeoStatus(cookieValue.NLN, cookieValue.NLat, cookieValue.NLon, cookieValue.NLNU);
                             $('label[for='+SN.C.S.NoticeDataGeo+']')
@@ -1323,12 +1325,12 @@ var SN = { // StatusNet
          */
         NoticeForm: function() {
             if ($('body.user_in').length > 0) {
-                SN.U.NoticeLocationAttach();
-
                 $('.'+SN.C.S.FormNotice).each(function() {
-                    SN.U.FormNoticeXHR($(this));
-                    SN.U.FormNoticeEnhancements($(this));
-                    SN.U.NoticeDataAttach($(this));
+                    var form = $(this);
+                    SN.U.NoticeLocationAttach(form);
+                    SN.U.FormNoticeXHR(form);
+                    SN.U.FormNoticeEnhancements(form);
+                    SN.U.NoticeDataAttach(form);
                 });
             }
         },
diff --git a/js/util.min.js b/js/util.min.js
index 556a8b795e..52a361bc13 100644
--- a/js/util.min.js
+++ b/js/util.min.js
@@ -1 +1 @@
-var SN={C:{I:{CounterBlackout:false,MaxLength:140,PatternUsername:/^[0-9a-zA-Z\-_.]*$/,HTTP20x30x:[200,201,202,203,204,205,206,300,301,302,303,304,305,306,307]},S:{Disabled:"disabled",Warning:"warning",Error:"error",Success:"success",Processing:"processing",CommandResult:"command_result",FormNotice:"form_notice",NoticeInReplyTo:"notice_in-reply-to",NoticeLat:"notice_data-lat",NoticeLon:"notice_data-lon",NoticeLocationId:"notice_data-location_id",NoticeLocationNs:"notice_data-location_ns",NoticeGeoName:"notice_data-geo_name",NoticeDataGeo:"notice_data-geo",NoticeDataGeoCookie:"NoticeDataGeo",NoticeDataGeoSelected:"notice_data-geo_selected",StatusNetInstance:"StatusNetInstance"}},messages:{},msg:function(a){if(typeof SN.messages[a]=="undefined"){return"["+a+"]"}else{return SN.messages[a]}},U:{FormNoticeEnhancements:function(b){if(jQuery.data(b[0],"ElementData")===undefined){MaxLength=b.find(".count").text();if(typeof(MaxLength)=="undefined"){MaxLength=SN.C.I.MaxLength}jQuery.data(b[0],"ElementData",{MaxLength:MaxLength});SN.U.Counter(b);NDT=b.find("[name=status_textarea]");NDT.bind("keyup",function(c){SN.U.Counter(b)});var a=function(c){window.setTimeout(function(){SN.U.Counter(b)},50)};NDT.bind("cut",a).bind("paste",a)}else{b.find(".count").text(jQuery.data(b[0],"ElementData").MaxLength)}},Counter:function(d){SN.C.I.FormNoticeCurrent=d;var b=jQuery.data(d[0],"ElementData").MaxLength;if(b<=0){return}var c=b-SN.U.CharacterCount(d);var a=d.find(".count");if(c.toString()!=a.text()){if(!SN.C.I.CounterBlackout||c===0){if(a.text()!=String(c)){a.text(c)}if(c<0){d.addClass(SN.C.S.Warning)}else{d.removeClass(SN.C.S.Warning)}if(!SN.C.I.CounterBlackout){SN.C.I.CounterBlackout=true;SN.C.I.FormNoticeCurrent=d;window.setTimeout("SN.U.ClearCounterBlackout(SN.C.I.FormNoticeCurrent);",500)}}}},CharacterCount:function(a){return a.find("[name=status_textarea]").val().length},ClearCounterBlackout:function(a){SN.C.I.CounterBlackout=false;SN.U.Counter(a)},RewriteAjaxAction:function(a){if(document.location.protocol=="https:"&&a.substr(0,5)=="http:"){return a.replace(/^http:\/\/[^:\/]+/,"https://"+document.location.host)}else{return a}},FormXHR:function(a){$.ajax({type:"POST",dataType:"xml",url:SN.U.RewriteAjaxAction(a.attr("action")),data:a.serialize()+"&ajax=1",beforeSend:function(b){a.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(c,d,b){alert(b||d)},success:function(b,c){if(typeof($("form",b)[0])!="undefined"){form_new=document._importNode($("form",b)[0],true);a.replaceWith(form_new)}else{a.replaceWith(document._importNode($("p",b)[0],true))}}})},FormNoticeXHR:function(b){SN.C.I.NoticeDataGeo={};b.append('<input type="hidden" name="ajax" value="1"/>');b.attr("action",SN.U.RewriteAjaxAction(b.attr("action")));var c=function(d,e){b.append($('<p class="form_response"></p>').addClass(d).text(e))};var a=function(){b.find(".form_response").remove()};b.ajaxForm({dataType:"xml",timeout:"60000",beforeSend:function(d){if(b.find("[name=status_textarea]").val()==""){b.addClass(SN.C.S.Warning);return false}b.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled);SN.U.normalizeGeoData(b);return true},error:function(f,g,e){b.removeClass(SN.C.S.Processing).find(".submit").removeClass(SN.C.S.Disabled).removeAttr(SN.C.S.Disabled,SN.C.S.Disabled);a();if(g=="timeout"){c("error","Sorry! We had trouble sending your notice. The servers are overloaded. Please try again, and contact the site administrator if this problem persists.")}else{var d=SN.U.GetResponseXML(f);if($("."+SN.C.S.Error,d).length>0){b.append(document._importNode($("."+SN.C.S.Error,d)[0],true))}else{if(parseInt(f.status)===0||jQuery.inArray(parseInt(f.status),SN.C.I.HTTP20x30x)>=0){b.resetForm().find(".attach-status").remove();SN.U.FormNoticeEnhancements(b)}else{c("error","(Sorry! We had trouble sending your notice ("+f.status+" "+f.statusText+"). Please report the problem to the site administrator if this happens again.")}}}},success:function(i,k){a();var e=$("#"+SN.C.S.Error,i);if(e.length>0){c("error",e.text())}else{if($("body")[0].id=="bookmarklet"){self.close()}var d=$("#"+SN.C.S.CommandResult,i);if(d.length>0){c("success",d.text())}else{var h=document._importNode($("li",i)[0],true);var j=$("#notices_primary .notices:first");if(j.length>0&&SN.U.belongsOnTimeline(h)){if($("#"+h.id).length===0){var f=$("#"+SN.C.S.NoticeInReplyTo).val();var g="#notices_primary #notice-"+f;if($("body")[0].id=="conversation"){if(f.length>0&&$(g+" .notices").length<1){$(g).append('<ul class="notices"></ul>')}$($(g+" .notices")[0]).append(h)}else{j.prepend(h)}$("#"+h.id).css({display:"none"}).fadeIn(2500);SN.U.NoticeWithAttachment($("#"+h.id));SN.U.NoticeReplyTo($("#"+h.id))}}else{c("success",$("title",i).text())}}b.resetForm();b.find("[name=inreplyto]").val("");b.find(".attach-status").remove();SN.U.FormNoticeEnhancements(b)}},complete:function(d,e){b.removeClass(SN.C.S.Processing).find(".submit").removeAttr(SN.C.S.Disabled).removeClass(SN.C.S.Disabled);b.find("[name=lat]").val(SN.C.I.NoticeDataGeo.NLat);b.find("[name=lon]").val(SN.C.I.NoticeDataGeo.NLon);b.find("[name=location_ns]").val(SN.C.I.NoticeDataGeo.NLNS);b.find("[name=location_id]").val(SN.C.I.NoticeDataGeo.NLID);$("#"+SN.C.S.NoticeDataGeo).attr("checked",SN.C.I.NoticeDataGeo.NDG)}})},normalizeGeoData:function(a){SN.C.I.NoticeDataGeo.NLat=a.find("[name=lat]").val();SN.C.I.NoticeDataGeo.NLon=a.find("[name=lon]").val();SN.C.I.NoticeDataGeo.NLNS=a.find("[name=location_ns]").val();SN.C.I.NoticeDataGeo.NLID=a.find("[name=location_id]").val();SN.C.I.NoticeDataGeo.NDG=$("#"+SN.C.S.NoticeDataGeo).attr("checked");var b=$.cookie(SN.C.S.NoticeDataGeoCookie);if(b!==null&&b!="disabled"){b=JSON.parse(b);SN.C.I.NoticeDataGeo.NLat=a.find("[name=lat]").val(b.NLat).val();SN.C.I.NoticeDataGeo.NLon=a.find("[name=lon]").val(b.NLon).val();if(b.NLNS){SN.C.I.NoticeDataGeo.NLNS=a.find("[name=location_ns]").val(b.NLNS).val();SN.C.I.NoticeDataGeo.NLID=a.find("[name=location_id]").val(b.NLID).val()}else{a.find("[name=location_ns]").val("");a.find("[name=location_id]").val("")}}if(b=="disabled"){SN.C.I.NoticeDataGeo.NDG=$("#"+SN.C.S.NoticeDataGeo).attr("checked",false).attr("checked")}else{SN.C.I.NoticeDataGeo.NDG=$("#"+SN.C.S.NoticeDataGeo).attr("checked",true).attr("checked")}},GetResponseXML:function(b){try{return b.responseXML}catch(a){return(new DOMParser()).parseFromString(b.responseText,"text/xml")}},NoticeReply:function(){if($("#content .notice_reply").length>0){$("#content .notice").each(function(){SN.U.NoticeReplyTo($(this))})}},NoticeReplyTo:function(a){a.find(".notice_reply").live("click",function(c){c.preventDefault();var b=($(".author .nickname",a).length>0)?$($(".author .nickname",a)[0]):$(".author .nickname.uid");SN.U.NoticeInlineReplyTrigger(a,"@"+b.text());return false})},NoticeInlineReplyTrigger:function(h,i){var c=$($(".notice_id",h)[0]).text();var d=h;var f=h.closest(".notices");if(f.hasClass("threaded-replies")){d=f.closest(".notice")}else{f=$("ul.threaded-replies",h);if(f.length==0){f=$('<ul class="notices threaded-replies xoxo"></ul>');h.append(f)}}var k=$(".notice-reply-form",f);if(k.length==0){$("li.notice-reply-placeholder").remove();var g=$("li.notice-reply",f);if(g.length==0){g=$('<li class="notice-reply"><form class="notice-reply-form" method="post"><textarea name="status_textarea"></textarea><div class="controls"><input type="hidden" name="token"><input type="hidden" name="inreplyto"><input type="submit" class="submit"></div></form></li>');var b=$("#form_notice");k=g.find("form");k.attr("action",b.attr("action"));k.find('input[name="token"]').val(b.find("input[name=token]").val());k.find('input[type="submit"]').val(SN.msg("reply_submit"));f.append(g);k.find("textarea").blur(function(){var m=$(this);var l=$.trim(m.val());if(l==""||l==m.data("initialText")){g.remove();if(f.find("li").length>0){SN.U.NoticeInlineReplyPlaceholder(d)}else{f.remove()}}});k.submit(function(m){var l=k;$.ajax({type:"POST",dataType:"xml",url:SN.U.RewriteAjaxAction(l.attr("action")),data:l.serialize()+"&ajax=1",beforeSend:function(n){l.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled).end().find("textarea").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(o,p,n){alert(n||p)},success:function(p,r){var o=$("li",p)[0];if(o){var n=document._importNode(o,true);var q=$(n).attr("id");if($("#"+q).length==0){g.replaceWith(n);SN.U.NoticeInlineReplyPlaceholder(d)}else{g.remove()}}}});m.preventDefault();return false})}}k.find("input[name=inreplyto]").val(c);var j=k.find("textarea");if(j.length==0){throw"No textarea"}var a="";if(i){a=i+" "}j.val(a+j.val().replace(RegExp(a,"i"),""));j.data("initialText",$.trim(i+""));j.focus();if(j[0].setSelectionRange){var e=j.val().length;j[0].setSelectionRange(e,e)}},NoticeFavor:function(){$(".form_favor").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_disfavor").live("click",function(){SN.U.FormXHR($(this));return false})},NoticeInlineReplyPlaceholder:function(b){var a=b.find("ul.threaded-replies");var c=$('<li class="notice-reply-placeholder"><input class="placeholder"></li>');c.click(function(){SN.U.NoticeInlineReplyTrigger(b)});c.find("input").val(SN.msg("reply_placeholder"));a.append(c)},NoticeInlineReplySetup:function(){$(".threaded-replies").each(function(){var b=$(this);var a=b.closest(".notice");SN.U.NoticeInlineReplyPlaceholder(a)})},NoticeRepeat:function(){$(".form_repeat").live("click",function(a){a.preventDefault();SN.U.NoticeRepeatConfirmation($(this));return false})},NoticeRepeatConfirmation:function(a){var c=a.find(".submit");var b=c.clone();b.addClass("submit_dialogbox").removeClass("submit");a.append(b);b.bind("click",function(){SN.U.FormXHR(a);return false});c.hide();a.addClass("dialogbox").append('<button class="close">&#215;</button>').closest(".notice-options").addClass("opaque");a.find("button.close").click(function(){$(this).remove();a.removeClass("dialogbox").closest(".notice-options").removeClass("opaque");a.find(".submit_dialogbox").remove();a.find(".submit").show();return false})},NoticeAttachments:function(){$(".notice a.attachment").each(function(){SN.U.NoticeWithAttachment($(this).closest(".notice"))})},NoticeWithAttachment:function(b){if(b.find(".attachment").length===0){return}var a=b.find(".attachment.more");if(a.length>0){$(a[0]).click(function(){var c=$(this);c.addClass(SN.C.S.Processing);$.get(c.attr("href")+"/ajax",null,function(d){c.parent(".entry-content").html($(d).find("#attachment_view .entry-content").html())});return false}).attr("title",SN.msg("showmore_tooltip"))}},NoticeDataAttach:function(b){var a=b.find("input[type=file]");a.change(function(f){b.find(".attach-status").remove();var d=$(this).val();if(!d){return false}var c=$('<div class="attach-status '+SN.C.S.Success+'"><code></code> <button class="close">&#215;</button></div>');c.find("code").text(d);c.find("button").click(function(){c.remove();a.val("");return false});b.append(c);if(typeof this.files=="object"){for(var e=0;e<this.files.length;e++){SN.U.PreviewAttach(b,this.files[e])}}})},maxFileSize:function(b){var a=$(b).find("input[name=MAX_FILE_SIZE]").attr("value");if(a){return parseInt(a)}else{return 0}},PreviewAttach:function(d,c){var e=c.type+" "+Math.round(c.size/1024)+"KB";var f=true;var h;if(typeof window.createObjectURL!="undefined"){h=function(i,j){j(window.createObjectURL(i))}}else{if(typeof window.FileReader!="undefined"){h=function(j,k){var i=new FileReader();i.onload=function(l){k(i.result)};i.readAsDataURL(j)}}else{f=false}}var a=["image/png","image/jpeg","image/gif","image/svg+xml"];if($.inArray(c.type,a)==-1){f=false}var g=8*1024*1024;if(c.size>g){f=false}if(f){h(c,function(j){var i=$("<img>").attr("title",e).attr("alt",e).attr("src",j).attr("style","height: 120px");d.find(".attach-status").append(i)})}else{var b=$("<div></div>").text(e);d.find(".attach-status").append(b)}},NoticeLocationAttach:function(){var c=$("#"+SN.C.S.NoticeLat).val();var h=$("#"+SN.C.S.NoticeLon).val();var d=$("#"+SN.C.S.NoticeLocationNs).val();var i=$("#"+SN.C.S.NoticeLocationId).val();var a=$("#"+SN.C.S.NoticeGeoName).text();var b=$("#"+SN.C.S.NoticeDataGeo);function e(k){$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",jQuery.trim($("label[for="+SN.C.S.NoticeDataGeo+"]").text())).removeClass("checked");$(".form_notice [name=lat]").val("");$(".form_notice [name=lon]").val("");$(".form_notice [name=location_ns]").val("");$(".form_notice [name=location_id]").val("");$("#"+SN.C.S.NoticeDataGeo).attr("checked",false);$.cookie(SN.C.S.NoticeDataGeoCookie,"disabled",{path:"/"});if(k){$(".geo_status_wrapper").removeClass("success").addClass("error");$(".geo_status_wrapper .geo_status").text(k)}else{$(".geo_status_wrapper").remove()}}function j(k,l){SN.U.NoticeGeoStatus("Looking up place name...");$.getJSON(k,l,function(m){var n,o;if(typeof(m.location_ns)!="undefined"){$("#"+SN.C.S.NoticeLocationNs).val(m.location_ns);n=m.location_ns}if(typeof(m.location_id)!="undefined"){$("#"+SN.C.S.NoticeLocationId).val(m.location_id);o=m.location_id}if(typeof(m.name)=="undefined"){NLN_text=l.lat+";"+l.lon}else{NLN_text=m.name}SN.U.NoticeGeoStatus(NLN_text,l.lat,l.lon,m.url);$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",NoticeDataGeo_text.ShareDisable+" ("+NLN_text+")");$(".form_notice [name=lat]").val(l.lat);$(".form_notice [name=lon]").val(l.lon);$(".form_notice [name=location_ns]").val(n);$(".form_notice [name=location_id]").val(o);$("#"+SN.C.S.NoticeDataGeo).attr("checked",true);var p={NLat:l.lat,NLon:l.lon,NLNS:n,NLID:o,NLN:NLN_text,NLNU:m.url,NDG:true};$.cookie(SN.C.S.NoticeDataGeoCookie,JSON.stringify(p),{path:"/"})})}if(b.length>0){if($.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){b.attr("checked",false)}else{b.attr("checked",true)}var f=$("#notice_data-geo_wrap");var g=f.attr("title");f.removeAttr("title");$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",jQuery.trim($("label[for="+SN.C.S.NoticeDataGeo+"]").text()));b.change(function(){if($("#"+SN.C.S.NoticeDataGeo).attr("checked")===true||$.cookie(SN.C.S.NoticeDataGeoCookie)===null){$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",NoticeDataGeo_text.ShareDisable).addClass("checked");if($.cookie(SN.C.S.NoticeDataGeoCookie)===null||$.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){if(navigator.geolocation){SN.U.NoticeGeoStatus("Requesting location from browser...");navigator.geolocation.getCurrentPosition(function(m){$(".form_notice [name=lat]").val(m.coords.latitude);$(".form_notice [name=lon]").val(m.coords.longitude);var n={lat:m.coords.latitude,lon:m.coords.longitude,token:$("#token").val()};j(g,n)},function(m){switch(m.code){case m.PERMISSION_DENIED:e("Location permission denied.");break;case m.TIMEOUT:e("Location lookup timeout.");break}},{timeout:10000})}else{if(c.length>0&&h.length>0){var k={lat:c,lon:h,token:$("#token").val()};j(g,k)}else{e();$("#"+SN.C.S.NoticeDataGeo).remove();$("label[for="+SN.C.S.NoticeDataGeo+"]").remove()}}}else{var l=JSON.parse($.cookie(SN.C.S.NoticeDataGeoCookie));$(".form_notice [name=lat]").val(l.NLat);$(".form_notice [name=lon]").val(l.NLon);$(".form_notice [name=location_ns]").val(l.NLNS);$(".form_notice [name=location_id]").val(l.NLID);$("#"+SN.C.S.NoticeDataGeo).attr("checked",l.NDG);SN.U.NoticeGeoStatus(l.NLN,l.NLat,l.NLon,l.NLNU);$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",NoticeDataGeo_text.ShareDisable+" ("+l.NLN+")").addClass("checked")}}else{e()}}).change()}},NoticeGeoStatus:function(a,f,g,c){var e=$("#form_notice");var h=e.find(".geo_status_wrapper");if(h.length==0){h=$('<div class="'+SN.C.S.Success+' geo_status_wrapper"><button class="close" style="float:right">&#215;</button><div class="geo_status"></div></div>');h.find("button.close").click(function(){$("#"+SN.C.S.NoticeDataGeo).removeAttr("checked").change()});e.append(h)}var b;if(c){b=$("<a></a>").attr("href",c)}else{b=$("<span></span>")}b.text(a);if(f||g){var d=f+";"+g;b.attr("title",d);if(!a){b.text(d)}}h.find(".geo_status").empty().append(b)},NewDirectMessage:function(){NDM=$(".entity_send-a-message a");NDM.attr({href:NDM.attr("href")+"&ajax=1"});NDM.bind("click",function(){var a=$(".entity_send-a-message form");if(a.length===0){$(this).addClass(SN.C.S.Processing);$.get(NDM.attr("href"),null,function(b){$(".entity_send-a-message").append(document._importNode($("form",b)[0],true));a=$(".entity_send-a-message .form_notice");SN.U.FormNoticeXHR(a);SN.U.FormNoticeEnhancements(a);a.append('<button class="close">&#215;</button>');$(".entity_send-a-message button").click(function(){a.hide();return false});NDM.removeClass(SN.C.S.Processing)})}else{a.show();$(".entity_send-a-message textarea").focus()}return false})},GetFullYear:function(c,d,a){var b=new Date();b.setFullYear(c,d,a);return b},StatusNetInstance:{Set:function(b){var a=SN.U.StatusNetInstance.Get();if(a!==null){b=$.extend(a,b)}$.cookie(SN.C.S.StatusNetInstance,JSON.stringify(b),{path:"/",expires:SN.U.GetFullYear(2029,0,1)})},Get:function(){var a=$.cookie(SN.C.S.StatusNetInstance);if(a!==null){return JSON.parse(a)}return null},Delete:function(){$.cookie(SN.C.S.StatusNetInstance,null)}},belongsOnTimeline:function(b){var a=$("body").attr("id");if(a=="public"){return true}var c=$("#nav_profile a").attr("href");if(c){var d=$(b).find(".entry-title .author a.url").attr("href");if(d==c){if(a=="all"||a=="showstream"){return true}}}return false}},Init:{NoticeForm:function(){if($("body.user_in").length>0){SN.U.NoticeLocationAttach();$("."+SN.C.S.FormNotice).each(function(){SN.U.FormNoticeXHR($(this));SN.U.FormNoticeEnhancements($(this));SN.U.NoticeDataAttach($(this))})}},Notices:function(){if($("body.user_in").length>0){SN.U.NoticeFavor();SN.U.NoticeRepeat();SN.U.NoticeReply();SN.U.NoticeInlineReplySetup()}SN.U.NoticeAttachments()},EntityActions:function(){if($("body.user_in").length>0){$(".form_user_subscribe").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_user_unsubscribe").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_group_join").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_group_leave").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_user_nudge").live("click",function(){SN.U.FormXHR($(this));return false});SN.U.NewDirectMessage()}},Login:function(){if(SN.U.StatusNetInstance.Get()!==null){var a=SN.U.StatusNetInstance.Get().Nickname;if(a!==null){$("#form_login #nickname").val(a)}}$("#form_login").bind("submit",function(){SN.U.StatusNetInstance.Set({Nickname:$("#form_login #nickname").val()});return true})},UploadForms:function(){$("input[type=file]").change(function(d){if(typeof this.files=="object"&&this.files.length>0){var c=0;for(var b=0;b<this.files.length;b++){c+=this.files[b].size}var a=SN.U.maxFileSize($(this.form));if(a>0&&c>a){var e="File too large: maximum upload size is %d bytes.";alert(e.replace("%d",a));$(this).val("");d.preventDefault();return false}}})}}};$(document).ready(function(){SN.Init.UploadForms();if($("."+SN.C.S.FormNotice).length>0){SN.Init.NoticeForm()}if($("#content .notices").length>0){SN.Init.Notices()}if($("#content .entity_actions").length>0){SN.Init.EntityActions()}if($("#form_login").length>0){SN.Init.Login()}});if(!document.ELEMENT_NODE){document.ELEMENT_NODE=1;document.ATTRIBUTE_NODE=2;document.TEXT_NODE=3;document.CDATA_SECTION_NODE=4;document.ENTITY_REFERENCE_NODE=5;document.ENTITY_NODE=6;document.PROCESSING_INSTRUCTION_NODE=7;document.COMMENT_NODE=8;document.DOCUMENT_NODE=9;document.DOCUMENT_TYPE_NODE=10;document.DOCUMENT_FRAGMENT_NODE=11;document.NOTATION_NODE=12}document._importNode=function(e,a){switch(e.nodeType){case document.ELEMENT_NODE:var d=document.createElement(e.nodeName);if(e.attributes&&e.attributes.length>0){for(var c=0,b=e.attributes.length;c<b;){if(e.attributes[c].nodeName=="class"){d.className=e.getAttribute(e.attributes[c++].nodeName)}else{d.setAttribute(e.attributes[c].nodeName,e.getAttribute(e.attributes[c++].nodeName))}}}if(a&&e.childNodes&&e.childNodes.length>0){for(var c=0,b=e.childNodes.length;c<b;){d.appendChild(document._importNode(e.childNodes[c++],a))}}return d;break;case document.TEXT_NODE:case document.CDATA_SECTION_NODE:case document.COMMENT_NODE:return document.createTextNode(e.nodeValue);break}};if(typeof navigator.geolocation=="undefined"||navigator.geolocation.shim){(function(){(function(){if(window.google&&google.gears){return}var c=null;if(typeof GearsFactory!="undefined"){c=new GearsFactory()}else{try{c=new ActiveXObject("Gears.Factory");if(c.getBuildInfo().indexOf("ie_mobile")!=-1){c.privateSetGlobalObject(this)}}catch(d){if((typeof navigator.mimeTypes!="undefined")&&navigator.mimeTypes["application/x-googlegears"]){c=document.createElement("object");c.style.display="none";c.width=0;c.height=0;c.type="application/x-googlegears";document.documentElement.appendChild(c)}}}if(!c){return}if(!window.google){google={}}if(!google.gears){google.gears={factory:c}}})();var a=(function(){var d=google.gears.factory.create("beta.geolocation");var c=function(f,e){return function(g){f(g);e.lastPosition=g}};return{shim:true,type:"Gears",lastPosition:null,getCurrentPosition:function(e,g,h){var f=this;var i=c(e,f);d.getCurrentPosition(i,g,h)},watchPosition:function(e,f,g){d.watchPosition(e,f,g)},clearWatch:function(e){d.clearWatch(e)},getPermission:function(g,e,f){d.getPermission(g,e,f)}}});var b=(function(){var i=false;var e=function(){if(!d()&&!i){i=true;var j=document.createElement("script");j.src=(document.location.protocol=="https:"?"https://":"http://")+"www.google.com/jsapi?callback=_google_loader_apiLoaded";j.type="text/javascript";document.getElementsByTagName("body")[0].appendChild(j)}};var c=[];var h=function(j){c.push(j)};var f=function(){if(d()){while(c.length>0){var j=c.pop();j()}}};window._google_loader_apiLoaded=function(){f()};var d=function(){return(window.google&&google.loader)};var g=function(j){if(d()){return true}h(j);e();return false};e();return{shim:true,type:"ClientLocation",lastPosition:null,getCurrentPosition:function(k,n,o){var m=this;if(!g(function(){m.getCurrentPosition(k,n,o)})){return}if(google.loader.ClientLocation){var l=google.loader.ClientLocation;var j={coords:{latitude:l.latitude,longitude:l.longitude,altitude:null,accuracy:43000,altitudeAccuracy:null,heading:null,speed:null},address:{city:l.address.city,country:l.address.country,country_code:l.address.country_code,region:l.address.region},timestamp:new Date()};k(j);this.lastPosition=j}else{if(n==="function"){n({code:3,message:"Using the Google ClientLocation API and it is not able to calculate a location."})}}},watchPosition:function(j,l,m){this.getCurrentPosition(j,l,m);var k=this;var n=setInterval(function(){k.getCurrentPosition(j,l,m)},10000);return n},clearWatch:function(j){clearInterval(j)},getPermission:function(l,j,k){return true}}});navigator.geolocation=(window.google&&google.gears)?a():b()})()};
\ No newline at end of file
+var SN={C:{I:{CounterBlackout:false,MaxLength:140,PatternUsername:/^[0-9a-zA-Z\-_.]*$/,HTTP20x30x:[200,201,202,203,204,205,206,300,301,302,303,304,305,306,307]},S:{Disabled:"disabled",Warning:"warning",Error:"error",Success:"success",Processing:"processing",CommandResult:"command_result",FormNotice:"form_notice",NoticeInReplyTo:"notice_in-reply-to",NoticeLat:"notice_data-lat",NoticeLon:"notice_data-lon",NoticeLocationId:"notice_data-location_id",NoticeLocationNs:"notice_data-location_ns",NoticeGeoName:"notice_data-geo_name",NoticeDataGeo:"notice_data-geo",NoticeDataGeoCookie:"NoticeDataGeo",NoticeDataGeoSelected:"notice_data-geo_selected",StatusNetInstance:"StatusNetInstance"}},messages:{},msg:function(a){if(typeof SN.messages[a]=="undefined"){return"["+a+"]"}else{return SN.messages[a]}},U:{FormNoticeEnhancements:function(b){if(jQuery.data(b[0],"ElementData")===undefined){MaxLength=b.find(".count").text();if(typeof(MaxLength)=="undefined"){MaxLength=SN.C.I.MaxLength}jQuery.data(b[0],"ElementData",{MaxLength:MaxLength});SN.U.Counter(b);NDT=b.find("[name=status_textarea]");NDT.bind("keyup",function(c){SN.U.Counter(b)});var a=function(c){window.setTimeout(function(){SN.U.Counter(b)},50)};NDT.bind("cut",a).bind("paste",a)}else{b.find(".count").text(jQuery.data(b[0],"ElementData").MaxLength)}},Counter:function(d){SN.C.I.FormNoticeCurrent=d;var b=jQuery.data(d[0],"ElementData").MaxLength;if(b<=0){return}var c=b-SN.U.CharacterCount(d);var a=d.find(".count");if(c.toString()!=a.text()){if(!SN.C.I.CounterBlackout||c===0){if(a.text()!=String(c)){a.text(c)}if(c<0){d.addClass(SN.C.S.Warning)}else{d.removeClass(SN.C.S.Warning)}if(!SN.C.I.CounterBlackout){SN.C.I.CounterBlackout=true;SN.C.I.FormNoticeCurrent=d;window.setTimeout("SN.U.ClearCounterBlackout(SN.C.I.FormNoticeCurrent);",500)}}}},CharacterCount:function(a){return a.find("[name=status_textarea]").val().length},ClearCounterBlackout:function(a){SN.C.I.CounterBlackout=false;SN.U.Counter(a)},RewriteAjaxAction:function(a){if(document.location.protocol=="https:"&&a.substr(0,5)=="http:"){return a.replace(/^http:\/\/[^:\/]+/,"https://"+document.location.host)}else{return a}},FormXHR:function(a){$.ajax({type:"POST",dataType:"xml",url:SN.U.RewriteAjaxAction(a.attr("action")),data:a.serialize()+"&ajax=1",beforeSend:function(b){a.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(c,d,b){alert(b||d)},success:function(b,c){if(typeof($("form",b)[0])!="undefined"){form_new=document._importNode($("form",b)[0],true);a.replaceWith(form_new)}else{a.replaceWith(document._importNode($("p",b)[0],true))}}})},FormNoticeXHR:function(b){SN.C.I.NoticeDataGeo={};b.append('<input type="hidden" name="ajax" value="1"/>');b.attr("action",SN.U.RewriteAjaxAction(b.attr("action")));var c=function(d,e){b.append($('<p class="form_response"></p>').addClass(d).text(e))};var a=function(){b.find(".form_response").remove()};b.ajaxForm({dataType:"xml",timeout:"60000",beforeSend:function(d){if(b.find("[name=status_textarea]").val()==""){b.addClass(SN.C.S.Warning);return false}b.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled);SN.U.normalizeGeoData(b);return true},error:function(f,g,e){b.removeClass(SN.C.S.Processing).find(".submit").removeClass(SN.C.S.Disabled).removeAttr(SN.C.S.Disabled,SN.C.S.Disabled);a();if(g=="timeout"){c("error","Sorry! We had trouble sending your notice. The servers are overloaded. Please try again, and contact the site administrator if this problem persists.")}else{var d=SN.U.GetResponseXML(f);if($("."+SN.C.S.Error,d).length>0){b.append(document._importNode($("."+SN.C.S.Error,d)[0],true))}else{if(parseInt(f.status)===0||jQuery.inArray(parseInt(f.status),SN.C.I.HTTP20x30x)>=0){b.resetForm().find(".attach-status").remove();SN.U.FormNoticeEnhancements(b)}else{c("error","(Sorry! We had trouble sending your notice ("+f.status+" "+f.statusText+"). Please report the problem to the site administrator if this happens again.")}}}},success:function(i,k){a();var e=$("#"+SN.C.S.Error,i);if(e.length>0){c("error",e.text())}else{if($("body")[0].id=="bookmarklet"){self.close()}var d=$("#"+SN.C.S.CommandResult,i);if(d.length>0){c("success",d.text())}else{var h=document._importNode($("li",i)[0],true);var j=$("#notices_primary .notices:first");if(j.length>0&&SN.U.belongsOnTimeline(h)){if($("#"+h.id).length===0){var f=$("#"+SN.C.S.NoticeInReplyTo).val();var g="#notices_primary #notice-"+f;if($("body")[0].id=="conversation"){if(f.length>0&&$(g+" .notices").length<1){$(g).append('<ul class="notices"></ul>')}$($(g+" .notices")[0]).append(h)}else{j.prepend(h)}$("#"+h.id).css({display:"none"}).fadeIn(2500);SN.U.NoticeWithAttachment($("#"+h.id));SN.U.NoticeReplyTo($("#"+h.id))}}else{c("success",$("title",i).text())}}b.resetForm();b.find("[name=inreplyto]").val("");b.find(".attach-status").remove();SN.U.FormNoticeEnhancements(b)}},complete:function(d,e){b.removeClass(SN.C.S.Processing).find(".submit").removeAttr(SN.C.S.Disabled).removeClass(SN.C.S.Disabled);b.find("[name=lat]").val(SN.C.I.NoticeDataGeo.NLat);b.find("[name=lon]").val(SN.C.I.NoticeDataGeo.NLon);b.find("[name=location_ns]").val(SN.C.I.NoticeDataGeo.NLNS);b.find("[name=location_id]").val(SN.C.I.NoticeDataGeo.NLID);b.find("[name=notice_data-geo]").attr("checked",SN.C.I.NoticeDataGeo.NDG)}})},normalizeGeoData:function(a){SN.C.I.NoticeDataGeo.NLat=a.find("[name=lat]").val();SN.C.I.NoticeDataGeo.NLon=a.find("[name=lon]").val();SN.C.I.NoticeDataGeo.NLNS=a.find("[name=location_ns]").val();SN.C.I.NoticeDataGeo.NLID=a.find("[name=location_id]").val();SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked");var b=$.cookie(SN.C.S.NoticeDataGeoCookie);if(b!==null&&b!="disabled"){b=JSON.parse(b);SN.C.I.NoticeDataGeo.NLat=a.find("[name=lat]").val(b.NLat).val();SN.C.I.NoticeDataGeo.NLon=a.find("[name=lon]").val(b.NLon).val();if(b.NLNS){SN.C.I.NoticeDataGeo.NLNS=a.find("[name=location_ns]").val(b.NLNS).val();SN.C.I.NoticeDataGeo.NLID=a.find("[name=location_id]").val(b.NLID).val()}else{a.find("[name=location_ns]").val("");a.find("[name=location_id]").val("")}}if(b=="disabled"){SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked",false).attr("checked")}else{SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked",true).attr("checked")}},GetResponseXML:function(b){try{return b.responseXML}catch(a){return(new DOMParser()).parseFromString(b.responseText,"text/xml")}},NoticeReply:function(){if($("#content .notice_reply").length>0){$("#content .notice").each(function(){SN.U.NoticeReplyTo($(this))})}},NoticeReplyTo:function(a){a.find(".notice_reply").live("click",function(c){c.preventDefault();var b=($(".author .nickname",a).length>0)?$($(".author .nickname",a)[0]):$(".author .nickname.uid");SN.U.NoticeInlineReplyTrigger(a,"@"+b.text());return false})},NoticeInlineReplyTrigger:function(h,i){var c=$($(".notice_id",h)[0]).text();var d=h;var f=h.closest(".notices");if(f.hasClass("threaded-replies")){d=f.closest(".notice")}else{f=$("ul.threaded-replies",h);if(f.length==0){f=$('<ul class="notices threaded-replies xoxo"></ul>');h.append(f)}}var k=$(".notice-reply-form",f);if(k.length==0){$("li.notice-reply-placeholder").remove();var g=$("li.notice-reply",f);if(g.length==0){g=$('<li class="notice-reply"><form class="notice-reply-form" method="post"><textarea name="status_textarea"></textarea><div class="controls"><input type="hidden" name="token"><input type="hidden" name="inreplyto"><input type="submit" class="submit"></div></form></li>');var b=$("#form_notice");k=g.find("form");k.attr("action",b.attr("action"));k.find('input[name="token"]').val(b.find("input[name=token]").val());k.find('input[type="submit"]').val(SN.msg("reply_submit"));f.append(g);k.find("textarea").blur(function(){var m=$(this);var l=$.trim(m.val());if(l==""||l==m.data("initialText")){g.remove();if(f.find("li").length>0){SN.U.NoticeInlineReplyPlaceholder(d)}else{f.remove()}}});k.submit(function(m){var l=k;$.ajax({type:"POST",dataType:"xml",url:SN.U.RewriteAjaxAction(l.attr("action")),data:l.serialize()+"&ajax=1",beforeSend:function(n){l.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled).end().find("textarea").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(o,p,n){alert(n||p)},success:function(p,r){var o=$("li",p)[0];if(o){var n=document._importNode(o,true);var q=$(n).attr("id");if($("#"+q).length==0){g.replaceWith(n);SN.U.NoticeInlineReplyPlaceholder(d)}else{g.remove()}}}});m.preventDefault();return false})}}k.find("input[name=inreplyto]").val(c);var j=k.find("textarea");if(j.length==0){throw"No textarea"}var a="";if(i){a=i+" "}j.val(a+j.val().replace(RegExp(a,"i"),""));j.data("initialText",$.trim(i+""));j.focus();if(j[0].setSelectionRange){var e=j.val().length;j[0].setSelectionRange(e,e)}},NoticeFavor:function(){$(".form_favor").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_disfavor").live("click",function(){SN.U.FormXHR($(this));return false})},NoticeInlineReplyPlaceholder:function(b){var a=b.find("ul.threaded-replies");var c=$('<li class="notice-reply-placeholder"><input class="placeholder"></li>');c.click(function(){SN.U.NoticeInlineReplyTrigger(b)});c.find("input").val(SN.msg("reply_placeholder"));a.append(c)},NoticeInlineReplySetup:function(){$(".threaded-replies").each(function(){var b=$(this);var a=b.closest(".notice");SN.U.NoticeInlineReplyPlaceholder(a)})},NoticeRepeat:function(){$(".form_repeat").live("click",function(a){a.preventDefault();SN.U.NoticeRepeatConfirmation($(this));return false})},NoticeRepeatConfirmation:function(a){var c=a.find(".submit");var b=c.clone();b.addClass("submit_dialogbox").removeClass("submit");a.append(b);b.bind("click",function(){SN.U.FormXHR(a);return false});c.hide();a.addClass("dialogbox").append('<button class="close">&#215;</button>').closest(".notice-options").addClass("opaque");a.find("button.close").click(function(){$(this).remove();a.removeClass("dialogbox").closest(".notice-options").removeClass("opaque");a.find(".submit_dialogbox").remove();a.find(".submit").show();return false})},NoticeAttachments:function(){$(".notice a.attachment").each(function(){SN.U.NoticeWithAttachment($(this).closest(".notice"))})},NoticeWithAttachment:function(b){if(b.find(".attachment").length===0){return}var a=b.find(".attachment.more");if(a.length>0){$(a[0]).click(function(){var c=$(this);c.addClass(SN.C.S.Processing);$.get(c.attr("href")+"/ajax",null,function(d){c.parent(".entry-content").html($(d).find("#attachment_view .entry-content").html())});return false}).attr("title",SN.msg("showmore_tooltip"))}},NoticeDataAttach:function(b){var a=b.find("input[type=file]");a.change(function(f){b.find(".attach-status").remove();var d=$(this).val();if(!d){return false}var c=$('<div class="attach-status '+SN.C.S.Success+'"><code></code> <button class="close">&#215;</button></div>');c.find("code").text(d);c.find("button").click(function(){c.remove();a.val("");return false});b.append(c);if(typeof this.files=="object"){for(var e=0;e<this.files.length;e++){SN.U.PreviewAttach(b,this.files[e])}}})},maxFileSize:function(b){var a=$(b).find("input[name=MAX_FILE_SIZE]").attr("value");if(a){return parseInt(a)}else{return 0}},PreviewAttach:function(d,c){var e=c.type+" "+Math.round(c.size/1024)+"KB";var f=true;var h;if(typeof window.createObjectURL!="undefined"){h=function(i,j){j(window.createObjectURL(i))}}else{if(typeof window.FileReader!="undefined"){h=function(j,k){var i=new FileReader();i.onload=function(l){k(i.result)};i.readAsDataURL(j)}}else{f=false}}var a=["image/png","image/jpeg","image/gif","image/svg+xml"];if($.inArray(c.type,a)==-1){f=false}var g=8*1024*1024;if(c.size>g){f=false}if(f){h(c,function(j){var i=$("<img>").attr("title",e).attr("alt",e).attr("src",j).attr("style","height: 120px");d.find(".attach-status").append(i)})}else{var b=$("<div></div>").text(e);d.find(".attach-status").append(b)}},NoticeLocationAttach:function(a){var d=a.find("[name=lat]");var i=a.find("[name=lon]");var e=a.find("[name=location_ns]").val();var j=a.find("[name=location_id]").val();var b=$("#"+SN.C.S.NoticeGeoName).text();var c=a.find("[name=notice_data-geo]");function f(l){$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",jQuery.trim($("label[for="+SN.C.S.NoticeDataGeo+"]").text())).removeClass("checked");a.find("[name=lat]").val("");a.find("[name=lon]").val("");a.find("[name=location_ns]").val("");a.find("[name=location_id]").val("");a.find("[name=notice_data-geo]").attr("checked",false);$.cookie(SN.C.S.NoticeDataGeoCookie,"disabled",{path:"/"});if(l){$(".geo_status_wrapper").removeClass("success").addClass("error");$(".geo_status_wrapper .geo_status").text(l)}else{$(".geo_status_wrapper").remove()}}function k(l,m){SN.U.NoticeGeoStatus("Looking up place name...");$.getJSON(l,m,function(n){var o,p;if(typeof(n.location_ns)!="undefined"){a.find("[name=location_ns]").val(n.location_ns);o=n.location_ns}if(typeof(n.location_id)!="undefined"){a.find("[name=location_id]").val(n.location_id);p=n.location_id}if(typeof(n.name)=="undefined"){NLN_text=m.lat+";"+m.lon}else{NLN_text=n.name}SN.U.NoticeGeoStatus(NLN_text,m.lat,m.lon,n.url);$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",NoticeDataGeo_text.ShareDisable+" ("+NLN_text+")");a.find("[name=lat]").val(m.lat);a.find("[name=lon]").val(m.lon);a.find("[name=location_ns]").val(o);a.find("[name=location_id]").val(p);a.find("[name=notice_data-geo]").attr("checked",true);var q={NLat:m.lat,NLon:m.lon,NLNS:o,NLID:p,NLN:NLN_text,NLNU:n.url,NDG:true};$.cookie(SN.C.S.NoticeDataGeoCookie,JSON.stringify(q),{path:"/"})})}if(c.length>0){if($.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){c.attr("checked",false)}else{c.attr("checked",true)}var g=$("#notice_data-geo_wrap");var h=g.attr("title");g.removeAttr("title");$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",jQuery.trim($("label[for="+SN.C.S.NoticeDataGeo+"]").text()));c.change(function(){if($("#"+SN.C.S.NoticeDataGeo).attr("checked")===true||$.cookie(SN.C.S.NoticeDataGeoCookie)===null){$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",NoticeDataGeo_text.ShareDisable).addClass("checked");if($.cookie(SN.C.S.NoticeDataGeoCookie)===null||$.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){if(navigator.geolocation){SN.U.NoticeGeoStatus("Requesting location from browser...");navigator.geolocation.getCurrentPosition(function(n){a.find("[name=lat]").val(n.coords.latitude);a.find("[name=lon]").val(n.coords.longitude);var o={lat:n.coords.latitude,lon:n.coords.longitude,token:$("#token").val()};k(h,o)},function(n){switch(n.code){case n.PERMISSION_DENIED:f("Location permission denied.");break;case n.TIMEOUT:f("Location lookup timeout.");break}},{timeout:10000})}else{if(d.length>0&&i.length>0){var l={lat:d,lon:i,token:$("#token").val()};k(h,l)}else{f();$("#"+SN.C.S.NoticeDataGeo).remove();$("label[for="+SN.C.S.NoticeDataGeo+"]").remove()}}}else{var m=JSON.parse($.cookie(SN.C.S.NoticeDataGeoCookie));a.find("[name=lat]").val(m.NLat);a.find("[name=lon]").val(m.NLon);a.find("[name=location_ns]").val(m.NLNS);a.find("[name=location_id]").val(m.NLID);a.find("[name=notice_data-geo]").attr("checked",m.NDG);SN.U.NoticeGeoStatus(m.NLN,m.NLat,m.NLon,m.NLNU);$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",NoticeDataGeo_text.ShareDisable+" ("+m.NLN+")").addClass("checked")}}else{f()}}).change()}},NoticeGeoStatus:function(a,f,g,c){var e=$("#form_notice");var h=e.find(".geo_status_wrapper");if(h.length==0){h=$('<div class="'+SN.C.S.Success+' geo_status_wrapper"><button class="close" style="float:right">&#215;</button><div class="geo_status"></div></div>');h.find("button.close").click(function(){$("#"+SN.C.S.NoticeDataGeo).removeAttr("checked").change()});e.append(h)}var b;if(c){b=$("<a></a>").attr("href",c)}else{b=$("<span></span>")}b.text(a);if(f||g){var d=f+";"+g;b.attr("title",d);if(!a){b.text(d)}}h.find(".geo_status").empty().append(b)},NewDirectMessage:function(){NDM=$(".entity_send-a-message a");NDM.attr({href:NDM.attr("href")+"&ajax=1"});NDM.bind("click",function(){var a=$(".entity_send-a-message form");if(a.length===0){$(this).addClass(SN.C.S.Processing);$.get(NDM.attr("href"),null,function(b){$(".entity_send-a-message").append(document._importNode($("form",b)[0],true));a=$(".entity_send-a-message .form_notice");SN.U.FormNoticeXHR(a);SN.U.FormNoticeEnhancements(a);a.append('<button class="close">&#215;</button>');$(".entity_send-a-message button").click(function(){a.hide();return false});NDM.removeClass(SN.C.S.Processing)})}else{a.show();$(".entity_send-a-message textarea").focus()}return false})},GetFullYear:function(c,d,a){var b=new Date();b.setFullYear(c,d,a);return b},StatusNetInstance:{Set:function(b){var a=SN.U.StatusNetInstance.Get();if(a!==null){b=$.extend(a,b)}$.cookie(SN.C.S.StatusNetInstance,JSON.stringify(b),{path:"/",expires:SN.U.GetFullYear(2029,0,1)})},Get:function(){var a=$.cookie(SN.C.S.StatusNetInstance);if(a!==null){return JSON.parse(a)}return null},Delete:function(){$.cookie(SN.C.S.StatusNetInstance,null)}},belongsOnTimeline:function(b){var a=$("body").attr("id");if(a=="public"){return true}var c=$("#nav_profile a").attr("href");if(c){var d=$(b).find(".entry-title .author a.url").attr("href");if(d==c){if(a=="all"||a=="showstream"){return true}}}return false}},Init:{NoticeForm:function(){if($("body.user_in").length>0){$("."+SN.C.S.FormNotice).each(function(){var a=$(this);SN.U.NoticeLocationAttach(a);SN.U.FormNoticeXHR(a);SN.U.FormNoticeEnhancements(a);SN.U.NoticeDataAttach(a)})}},Notices:function(){if($("body.user_in").length>0){SN.U.NoticeFavor();SN.U.NoticeRepeat();SN.U.NoticeReply();SN.U.NoticeInlineReplySetup()}SN.U.NoticeAttachments()},EntityActions:function(){if($("body.user_in").length>0){$(".form_user_subscribe").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_user_unsubscribe").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_group_join").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_group_leave").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_user_nudge").live("click",function(){SN.U.FormXHR($(this));return false});SN.U.NewDirectMessage()}},Login:function(){if(SN.U.StatusNetInstance.Get()!==null){var a=SN.U.StatusNetInstance.Get().Nickname;if(a!==null){$("#form_login #nickname").val(a)}}$("#form_login").bind("submit",function(){SN.U.StatusNetInstance.Set({Nickname:$("#form_login #nickname").val()});return true})},UploadForms:function(){$("input[type=file]").change(function(d){if(typeof this.files=="object"&&this.files.length>0){var c=0;for(var b=0;b<this.files.length;b++){c+=this.files[b].size}var a=SN.U.maxFileSize($(this.form));if(a>0&&c>a){var e="File too large: maximum upload size is %d bytes.";alert(e.replace("%d",a));$(this).val("");d.preventDefault();return false}}})}}};$(document).ready(function(){SN.Init.UploadForms();if($("."+SN.C.S.FormNotice).length>0){SN.Init.NoticeForm()}if($("#content .notices").length>0){SN.Init.Notices()}if($("#content .entity_actions").length>0){SN.Init.EntityActions()}if($("#form_login").length>0){SN.Init.Login()}});if(!document.ELEMENT_NODE){document.ELEMENT_NODE=1;document.ATTRIBUTE_NODE=2;document.TEXT_NODE=3;document.CDATA_SECTION_NODE=4;document.ENTITY_REFERENCE_NODE=5;document.ENTITY_NODE=6;document.PROCESSING_INSTRUCTION_NODE=7;document.COMMENT_NODE=8;document.DOCUMENT_NODE=9;document.DOCUMENT_TYPE_NODE=10;document.DOCUMENT_FRAGMENT_NODE=11;document.NOTATION_NODE=12}document._importNode=function(e,a){switch(e.nodeType){case document.ELEMENT_NODE:var d=document.createElement(e.nodeName);if(e.attributes&&e.attributes.length>0){for(var c=0,b=e.attributes.length;c<b;){if(e.attributes[c].nodeName=="class"){d.className=e.getAttribute(e.attributes[c++].nodeName)}else{d.setAttribute(e.attributes[c].nodeName,e.getAttribute(e.attributes[c++].nodeName))}}}if(a&&e.childNodes&&e.childNodes.length>0){for(var c=0,b=e.childNodes.length;c<b;){d.appendChild(document._importNode(e.childNodes[c++],a))}}return d;break;case document.TEXT_NODE:case document.CDATA_SECTION_NODE:case document.COMMENT_NODE:return document.createTextNode(e.nodeValue);break}};if(typeof navigator.geolocation=="undefined"||navigator.geolocation.shim){(function(){(function(){if(window.google&&google.gears){return}var c=null;if(typeof GearsFactory!="undefined"){c=new GearsFactory()}else{try{c=new ActiveXObject("Gears.Factory");if(c.getBuildInfo().indexOf("ie_mobile")!=-1){c.privateSetGlobalObject(this)}}catch(d){if((typeof navigator.mimeTypes!="undefined")&&navigator.mimeTypes["application/x-googlegears"]){c=document.createElement("object");c.style.display="none";c.width=0;c.height=0;c.type="application/x-googlegears";document.documentElement.appendChild(c)}}}if(!c){return}if(!window.google){google={}}if(!google.gears){google.gears={factory:c}}})();var a=(function(){var d=google.gears.factory.create("beta.geolocation");var c=function(f,e){return function(g){f(g);e.lastPosition=g}};return{shim:true,type:"Gears",lastPosition:null,getCurrentPosition:function(e,g,h){var f=this;var i=c(e,f);d.getCurrentPosition(i,g,h)},watchPosition:function(e,f,g){d.watchPosition(e,f,g)},clearWatch:function(e){d.clearWatch(e)},getPermission:function(g,e,f){d.getPermission(g,e,f)}}});var b=(function(){var i=false;var e=function(){if(!d()&&!i){i=true;var j=document.createElement("script");j.src=(document.location.protocol=="https:"?"https://":"http://")+"www.google.com/jsapi?callback=_google_loader_apiLoaded";j.type="text/javascript";document.getElementsByTagName("body")[0].appendChild(j)}};var c=[];var h=function(j){c.push(j)};var f=function(){if(d()){while(c.length>0){var j=c.pop();j()}}};window._google_loader_apiLoaded=function(){f()};var d=function(){return(window.google&&google.loader)};var g=function(j){if(d()){return true}h(j);e();return false};e();return{shim:true,type:"ClientLocation",lastPosition:null,getCurrentPosition:function(k,n,o){var m=this;if(!g(function(){m.getCurrentPosition(k,n,o)})){return}if(google.loader.ClientLocation){var l=google.loader.ClientLocation;var j={coords:{latitude:l.latitude,longitude:l.longitude,altitude:null,accuracy:43000,altitudeAccuracy:null,heading:null,speed:null},address:{city:l.address.city,country:l.address.country,country_code:l.address.country_code,region:l.address.region},timestamp:new Date()};k(j);this.lastPosition=j}else{if(n==="function"){n({code:3,message:"Using the Google ClientLocation API and it is not able to calculate a location."})}}},watchPosition:function(j,l,m){this.getCurrentPosition(j,l,m);var k=this;var n=setInterval(function(){k.getCurrentPosition(j,l,m)},10000);return n},clearWatch:function(j){clearInterval(j)},getPermission:function(l,j,k){return true}}});navigator.geolocation=(window.google&&google.gears)?a():b()})()};
\ No newline at end of file

From f157c523fd906f4b007d6f1b465b73832e291473 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Thu, 3 Mar 2011 21:12:24 -0800
Subject: [PATCH 390/655] * Reformat list of profiles in a table * Make table
 sortable

---
 plugins/Directory/DirectoryPlugin.php         |  11 +-
 plugins/Directory/actions/userdirectory.php   |  29 +-
 plugins/Directory/css/directory.css           |  30 +++
 .../Directory/images/control_arrow_down.gif   | Bin 0 -> 110 bytes
 plugins/Directory/images/control_arrow_up.gif | Bin 0 -> 111 bytes
 plugins/Directory/lib/alphanav.php            |  15 +-
 .../lib/sortablesubscriptionlist.php          | 248 ++++++++++++++++++
 7 files changed, 326 insertions(+), 7 deletions(-)
 create mode 100644 plugins/Directory/images/control_arrow_down.gif
 create mode 100644 plugins/Directory/images/control_arrow_up.gif
 create mode 100644 plugins/Directory/lib/sortablesubscriptionlist.php

diff --git a/plugins/Directory/DirectoryPlugin.php b/plugins/Directory/DirectoryPlugin.php
index aaa33a1ec1..8fd7785ec9 100644
--- a/plugins/Directory/DirectoryPlugin.php
+++ b/plugins/Directory/DirectoryPlugin.php
@@ -55,7 +55,6 @@ class DirectoryPlugin extends Plugin
      */
     function initialize()
     {
-        $this->dir = dirname(__FILE__);
         return true;
     }
 
@@ -82,14 +81,20 @@ class DirectoryPlugin extends Plugin
     {
         // common_debug("class = $cls");
 
+        $dir = dirname(__FILE__);
+
         switch ($cls)
         {
         case 'UserdirectoryAction':
-            include_once $this->dir
+            include_once $dir
                 . '/actions/' . strtolower(mb_substr($cls, 0, -6)) . '.php';
             return false;
         case 'AlphaNav':
-            include_once $this->dir
+            include_once $dir
+                . '/lib/' . strtolower($cls) . '.php';
+            return false;
+        case 'SortableSubscriptionList':
+            include_once $dir
                 . '/lib/' . strtolower($cls) . '.php';
             return false;
         default:
diff --git a/plugins/Directory/actions/userdirectory.php b/plugins/Directory/actions/userdirectory.php
index 7e9f20c369..7b8dbbdf60 100644
--- a/plugins/Directory/actions/userdirectory.php
+++ b/plugins/Directory/actions/userdirectory.php
@@ -120,6 +120,9 @@ class UserdirectoryAction extends Action
 
         $this->page   = ($this->arg('page')) ? ($this->arg('page') + 0) : 1;
         $this->filter = $this->arg('filter') ? $this->arg('filter') : 'all';
+        $this->sort   = $this->arg('sort');
+        $this->order  = $this->boolean('asc'); // ascending or decending
+
         common_set_returnto($this->selfUrl());
 
         return true;
@@ -192,7 +195,7 @@ class UserdirectoryAction extends Action
         $cnt     = 0;
 
         if (!empty($profile)) {
-            $profileList = new SubscriptionList(
+            $profileList = new SortableSubscriptionList(
                 $profile,
                 common_current_user(),
                 $this
@@ -235,7 +238,10 @@ class UserdirectoryAction extends Action
             );
         }
 
-        $profile->orderBy('created DESC, nickname');
+        $sort  = $this->getSortKey();
+        $order = ($this->order) ? 'ASC' : 'DESC';
+
+        $profile->orderBy("$sort $order, nickname");
         $profile->limit($limit, $offset);
 
         $profile->find();
@@ -243,6 +249,25 @@ class UserdirectoryAction extends Action
         return $profile;
     }
 
+    /**
+     * Filter the sort parameter
+     *
+     * @return string   a column name for sorting
+     */
+    function getSortKey()
+    {
+        switch ($this->sort) {
+        case 'nickname':
+            return $this->sort;
+            break;
+        case 'created':
+            return $this->sort;
+            break;
+        default:
+            return 'nickname';
+        }
+    }
+
     /**
      * Show a nice message when there's no search results
      */
diff --git a/plugins/Directory/css/directory.css b/plugins/Directory/css/directory.css
index 3778525a84..76c9fc2583 100644
--- a/plugins/Directory/css/directory.css
+++ b/plugins/Directory/css/directory.css
@@ -32,3 +32,33 @@ div#user_directory div.alpha_nav a:hover {
 div#user_directory div.alpha_nav a.current {
     background-color:#9BB43E;
 }
+
+table.profile_list {
+    width: 100%;
+}
+
+table.profile_list tr {
+    float: none;
+}
+
+table.profile_list tr.alt {
+    background-color: #def; /* zebra stripe */
+}
+
+table.profie_list td {
+    width: 100%;
+    padding: 0;
+}
+
+
+th.current {
+    background-image: url(../images/control_arrow_down.gif);
+    background-repeat: no-repeat;
+    background-position: 60% 2px;
+}
+
+th.current.asc {
+    background-image: url(../images/control_arrow_up.gif);
+    background-repeat: no-repeat;
+    background-position: 60% 2px;
+}
\ No newline at end of file
diff --git a/plugins/Directory/images/control_arrow_down.gif b/plugins/Directory/images/control_arrow_down.gif
new file mode 100644
index 0000000000000000000000000000000000000000..de28df6eb09f57780f20337be3df81ebfc714511
GIT binary patch
literal 110
zcmZ?wbhEHb<YeGv*vtR||NsAg`}XbCt5+{wx^(#P;h8gMhJ=L3$;okYaxybB17*Rg
zpoHR27DfgJZU!9?A7lmti*&(B&(&L%8~0w0VB0Qv`Jn8S28NCRQLjS55Ece&05w4(
AjsO4v

literal 0
HcmV?d00001

diff --git a/plugins/Directory/images/control_arrow_up.gif b/plugins/Directory/images/control_arrow_up.gif
new file mode 100644
index 0000000000000000000000000000000000000000..898aa604bb50b656c88a6b3ddad724d962cec6a6
GIT binary patch
literal 111
zcmZ?wbhEHb<YeGv*vtR||NsAg`}XbCt5+{wx^(#P;h8gMhJ=L3$;okYaxybB17*Rg
zpoHR27DfgJZU!9?A7lmti%h{u&(*O{#6nj&FenAEC&*1sTzAY!W%W#+=^~5_)&M)G
BA?W}B

literal 0
HcmV?d00001

diff --git a/plugins/Directory/lib/alphanav.php b/plugins/Directory/lib/alphanav.php
index 6829f3d2c3..33380b0b2b 100644
--- a/plugins/Directory/lib/alphanav.php
+++ b/plugins/Directory/lib/alphanav.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET') && !defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
@@ -114,11 +114,22 @@ class AlphaNav extends Widget
             );
 
             $params  = array('href' => $href);
+
+            // sort column
+            if (!empty($this->action->sort)) {
+                $params['sort'] = $this->action->sort;
+            }
+
+            // sort order
+            if (!empty($this->action->order)) {
+                $params['asc'] = 'true';
+            }
+
             $current = $this->action->arg('filter');
 
             // Highlight the selected filter. If there is no selected
             // filter, highlight the first filter in the list
-            if (empty($current) && $i == 0
+            if (!isset($current) && $i == 0
                 || $current === strtolower($filter)) {
                 $classes .= 'current ';
             }
diff --git a/plugins/Directory/lib/sortablesubscriptionlist.php b/plugins/Directory/lib/sortablesubscriptionlist.php
new file mode 100644
index 0000000000..2a412a628d
--- /dev/null
+++ b/plugins/Directory/lib/sortablesubscriptionlist.php
@@ -0,0 +1,248 @@
+<?php
+
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Widget to show a sortable list of profiles
+ *
+ * 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  Public
+ * @package   StatusNet
+ * @author    Zach Copley <zach@status.net>
+ * @copyright 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/
+ */
+
+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
+require_once INSTALLDIR . '/lib/subscriptionlist.php';
+
+/**
+ * Widget to show a sortable list of subscriptions
+ *
+ * @category Public
+ * @package  StatusNet
+ * @author   Zach Copley <zach@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://status.net/
+ */
+
+class SortableSubscriptionList extends SubscriptionList
+{
+    /** Owner of this list */
+    var $owner = null;
+
+    function __construct($profile, $owner=null, $action=null)
+    {
+        parent::__construct($profile, $owner, $action);
+
+        $this->owner = $owner;
+    }
+
+    function startList()
+    {
+        $this->out->elementStart('table', array('class' => 'profile_list xoxo'));
+        $this->out->elementStart('thead');
+        $this->out->elementStart('tr');
+
+        $tableHeaders = array(
+            'nickname'    => _m('Nickname'),
+            'created'     => _m('Created')
+        );
+
+        foreach ($tableHeaders as $id => $label) {
+            $attrs = array('id' => $id);
+
+            $current = (!empty($this->action->sort) && $this->action->sort == $id);
+
+            if ($current || empty($this->action->sort) && $id == 'nickname') {
+                $attrs['class'] = 'current';
+            }
+
+            if ($current && !$this->action->boolean('asc')) {
+                $attrs['class'] .= ' asc';
+                $attrs['class'] = trim($attrs['class']);
+            }
+
+            $this->out->elementStart('th', $attrs);
+
+            $linkAttrs = array();
+            $params    = array('sort' => $id);
+
+            if ($current && !$this->action->boolean('asc')) {
+                $params['asc'] = "true";
+            }
+
+            $args = array();
+
+            $filter = $this->action->arg('filter');
+
+            if (!empty($filter)) {
+                $args['filter'] = $filter;
+            }
+
+            $linkAttrs['href'] = common_local_url(
+                $this->action->arg('action'), $args, $params
+            );
+
+            $this->out->element('a', $linkAttrs, $label);
+            $this->out->elementEnd('th');
+        }
+
+        $this->out->element('th', array('id' => 'subscriptions'), 'Subscriptions');
+        $this->out->element('th', array('id' => 'notices'), 'Notices');
+        //$this->out->element('th', array('id' => 'controls'), 'Controls');
+
+        $this->out->elementEnd('tr');
+        $this->out->elementEnd('thead');
+
+        $this->out->elementStart('tbody');
+    }
+
+    function endList()
+    {
+        $this->out->elementEnd('tbody');
+        $this->out->elementEnd('table');
+    }
+
+    function showProfiles()
+    {
+        $cnt = 0;
+
+        while ($this->profile->fetch()) {
+            $cnt++;
+            if($cnt > PROFILES_PER_PAGE) {
+                break;
+            }
+
+            $odd = ($cnt % 2 == 0); // for zebra striping
+
+            $pli = $this->newListItem($this->profile, $odd);
+            $pli->show();
+        }
+
+        return $cnt;
+    }
+
+    function newListItem($profile, $odd)
+    {
+        return new SortableSubscriptionListItem($profile, $this->owner, $this->action, $odd);
+    }
+}
+
+class SortableSubscriptionListItem extends SubscriptionListItem
+{
+    /** Owner of this list */
+    var $owner = null;
+
+    function __construct($profile, $owner, $action, $alt)
+    {
+        parent::__construct($profile, $owner, $action);
+
+        $this->alt   = $alt; // is this row alternate?
+        $this->owner = $owner;
+    }
+
+    function startItem()
+    {
+        $attr = array(
+            'class' => 'profile',
+            'id'    => 'profile-' . $this->profile->id
+        );
+
+        if ($this->alt) {
+            $attr['class'] .= ' alt';
+        }
+
+        $this->out->elementStart('tr', $attr);
+    }
+
+    function endItem()
+    {
+        $this->out->elementEnd('tr');
+    }
+
+    function startProfile()
+    {
+        $this->out->elementStart('td', 'entity_profile vcard entry-content');
+    }
+
+    function endProfile()
+    {
+        $this->out->elementEnd('td');
+    }
+
+    function startActions()
+    {
+        $this->out->elementStart('td', 'entity_actions');
+        $this->out->elementStart('ul');
+    }
+
+    function endActions()
+    {
+        $this->out->elementEnd('ul');
+        $this->out->elementEnd('td');
+    }
+
+    function show()
+    {
+        if (Event::handle('StartProfileListItem', array($this))) {
+            $this->startItem();
+            if (Event::handle('StartProfileListItemProfile', array($this))) {
+                $this->showProfile();
+                Event::handle('EndProfileListItemProfile', array($this));
+            }
+
+            // XXX Add events?
+            $this->showCreatedDate();
+            $this->showSubscriberCount();
+            $this->showNoticeCount();
+
+            if (Event::handle('StartProfileListItemActions', array($this))) {
+                $this->showActions();
+                Event::handle('EndProfileListItemActions', array($this));
+            }
+            $this->endItem();
+            Event::handle('EndProfileListItem', array($this));
+        }
+    }
+
+    function showSubscriberCount()
+    {
+        $this->out->elementStart('td', 'entry_subscriber_count');
+        $this->out->raw($this->profile->subscriberCount());
+        $this->out->elementEnd('td');
+    }
+
+    function showCreatedDate()
+    {
+        $this->out->elementStart('td', 'entry_created');
+        $this->out->raw(date('j M Y', strtotime($this->profile->created)));
+        $this->out->elementEnd('td');
+    }
+
+    function showNoticeCount()
+    {
+        $this->out->elementStart('td', 'entry_notice_count');
+        $this->out->raw($this->profile->noticeCount());
+        $this->out->elementEnd('td');
+    }
+
+}

From 1c87e32cd14122eb7b7cdf2f275f77b71e787383 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Fri, 4 Mar 2011 16:09:59 -0500
Subject: [PATCH 391/655] 'link' to 'links' in feed document

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

diff --git a/lib/activitystreamjsondocument.php b/lib/activitystreamjsondocument.php
index 2b99d19eb7..0c64ebb998 100644
--- a/lib/activitystreamjsondocument.php
+++ b/lib/activitystreamjsondocument.php
@@ -127,7 +127,7 @@ class ActivityStreamJSONDocument
     function addLink($url = null, $rel = null, $mediaType = null)
     {
         $link = new ActivityStreamsLink($url, $rel, $mediaType);
-        $this->doc['link'][] = $link->asArray();
+        $this->doc['links'][] = $link->asArray();
     }
 
     /*

From 56d5c4a4d1a17d9dc561b4c37c5aba4db2ffe5f5 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Fri, 4 Mar 2011 13:40:33 -0800
Subject: [PATCH 392/655] More hardcoded id cleanup in notice form...

---
 js/util.js                        | 46 ++++++++++++++-----------------
 js/util.min.js                    |  2 +-
 lib/noticeform.php                |  2 +-
 theme/base/css/display.css        |  8 +++---
 theme/biz/css/base.css            |  8 +++---
 theme/clean/css/display.css       |  4 +--
 theme/clean/css/ie.css            |  4 +--
 theme/cleaner/css/display.css     |  6 ++--
 theme/cleaner/css/ie.css          |  4 +--
 theme/cloudy/css/display.css      |  6 ++--
 theme/mnml/css/display.css        |  8 +++---
 theme/mnml/css/ie.css             |  4 +--
 theme/pigeonthoughts/css/base.css |  8 +++---
 theme/rebase/css/display.css      | 10 +++----
 theme/rebase/css/ie.css           |  4 +--
 theme/shiny/css/display.css       |  4 +--
 theme/shiny/css/ie.css            |  4 +--
 17 files changed, 64 insertions(+), 68 deletions(-)

diff --git a/js/util.js b/js/util.js
index 3cd4bbbe44..7c51eb645a 100644
--- a/js/util.js
+++ b/js/util.js
@@ -50,12 +50,6 @@ var SN = { // StatusNet
             Processing: 'processing',
             CommandResult: 'command_result',
             FormNotice: 'form_notice',
-            NoticeInReplyTo: 'notice_in-reply-to',
-            NoticeLat: 'notice_data-lat',
-            NoticeLon: 'notice_data-lon',
-            NoticeLocationId: 'notice_data-location_id',
-            NoticeLocationNs: 'notice_data-location_ns',
-            NoticeGeoName: 'notice_data-geo_name',
             NoticeDataGeo: 'notice_data-geo',
             NoticeDataGeoCookie: 'NoticeDataGeo',
             NoticeDataGeoSelected: 'notice_data-geo_selected',
@@ -395,7 +389,7 @@ var SN = { // StatusNet
                             var notices = $('#notices_primary .notices:first');
                             if (notices.length > 0 && SN.U.belongsOnTimeline(notice)) {
                                 if ($('#'+notice.id).length === 0) {
-                                    var notice_irt_value = $('#'+SN.C.S.NoticeInReplyTo).val();
+                                    var notice_irt_value = form.find('[name=inreplyto]').val();
                                     var notice_irt = '#notices_primary #notice-'+notice_irt_value;
                                     if($('body')[0].id == 'conversation') {
                                         if(notice_irt_value.length > 0 && $(notice_irt+' .notices').length < 1) {
@@ -972,12 +966,14 @@ var SN = { // StatusNet
             var NLon = form.find('[name=lon]')
             var NLNS = form.find('[name=location_ns]').val();
             var NLID = form.find('[name=location_id]').val();
-            var NLN = $('#'+SN.C.S.NoticeGeoName).text(); // @fixme does this exist?
+            var NLN = ''; // @fixme
             var NDGe = form.find('[name=notice_data-geo]');
+            var check = form.find('[name=notice_data-geo]');
+            var label = $('label[for='+check.attr('id')+']');
 
             function removeNoticeDataGeo(error) {
-                $('label[for='+SN.C.S.NoticeDataGeo+']')
-                    .attr('title', jQuery.trim($('label[for='+SN.C.S.NoticeDataGeo+']').text()))
+                label
+                    .attr('title', jQuery.trim(label.text()))
                     .removeClass('checked');
 
                 form.find('[name=lat]').val('');
@@ -989,10 +985,10 @@ var SN = { // StatusNet
                 $.cookie(SN.C.S.NoticeDataGeoCookie, 'disabled', { path: '/' });
 
                 if (error) {
-                    $('.geo_status_wrapper').removeClass('success').addClass('error');
-                    $('.geo_status_wrapper .geo_status').text(error);
+                    form.find('.geo_status_wrapper').removeClass('success').addClass('error');
+                    form.find('.geo_status_wrapper .geo_status').text(error);
                 } else {
-                    $('.geo_status_wrapper').remove();
+                    form.find('.geo_status_wrapper').remove();
                 }
             }
 
@@ -1042,24 +1038,24 @@ var SN = { // StatusNet
                 });
             }
 
-            if (NDGe.length > 0) {
+            if (check.length > 0) {
                 if ($.cookie(SN.C.S.NoticeDataGeoCookie) == 'disabled') {
-                    NDGe.attr('checked', false);
+                    check.attr('checked', false);
                 }
                 else {
-                    NDGe.attr('checked', true);
+                    check.attr('checked', true);
                 }
 
-                var NGW = $('#notice_data-geo_wrap');
+                var NGW = form.find('.notice_data-geo_wrap');
                 var geocodeURL = NGW.attr('title');
                 NGW.removeAttr('title');
 
-                $('label[for='+SN.C.S.NoticeDataGeo+']')
-                    .attr('title', jQuery.trim($('label[for='+SN.C.S.NoticeDataGeo+']').text()));
+                label
+                    .attr('title', label.text());
 
-                NDGe.change(function() {
-                    if ($('#'+SN.C.S.NoticeDataGeo).attr('checked') === true || $.cookie(SN.C.S.NoticeDataGeoCookie) === null) {
-                        $('label[for='+SN.C.S.NoticeDataGeo+']')
+                check.change(function() {
+                    if (check.attr('checked') === true || $.cookie(SN.C.S.NoticeDataGeoCookie) === null) {
+                        label
                             .attr('title', NoticeDataGeo_text.ShareDisable)
                             .addClass('checked');
 
@@ -1109,8 +1105,8 @@ var SN = { // StatusNet
                                 }
                                 else {
                                     removeNoticeDataGeo();
-                                    $('#'+SN.C.S.NoticeDataGeo).remove();
-                                    $('label[for='+SN.C.S.NoticeDataGeo+']').remove();
+                                    check.remove();
+                                    label.remove();
                                 }
                             }
                         }
@@ -1124,7 +1120,7 @@ var SN = { // StatusNet
                             form.find('[name=notice_data-geo]').attr('checked', cookieValue.NDG);
 
                             SN.U.NoticeGeoStatus(cookieValue.NLN, cookieValue.NLat, cookieValue.NLon, cookieValue.NLNU);
-                            $('label[for='+SN.C.S.NoticeDataGeo+']')
+                            label
                                 .attr('title', NoticeDataGeo_text.ShareDisable + ' (' + cookieValue.NLN + ')')
                                 .addClass('checked');
                         }
diff --git a/js/util.min.js b/js/util.min.js
index 52a361bc13..7a2f35454b 100644
--- a/js/util.min.js
+++ b/js/util.min.js
@@ -1 +1 @@
-var SN={C:{I:{CounterBlackout:false,MaxLength:140,PatternUsername:/^[0-9a-zA-Z\-_.]*$/,HTTP20x30x:[200,201,202,203,204,205,206,300,301,302,303,304,305,306,307]},S:{Disabled:"disabled",Warning:"warning",Error:"error",Success:"success",Processing:"processing",CommandResult:"command_result",FormNotice:"form_notice",NoticeInReplyTo:"notice_in-reply-to",NoticeLat:"notice_data-lat",NoticeLon:"notice_data-lon",NoticeLocationId:"notice_data-location_id",NoticeLocationNs:"notice_data-location_ns",NoticeGeoName:"notice_data-geo_name",NoticeDataGeo:"notice_data-geo",NoticeDataGeoCookie:"NoticeDataGeo",NoticeDataGeoSelected:"notice_data-geo_selected",StatusNetInstance:"StatusNetInstance"}},messages:{},msg:function(a){if(typeof SN.messages[a]=="undefined"){return"["+a+"]"}else{return SN.messages[a]}},U:{FormNoticeEnhancements:function(b){if(jQuery.data(b[0],"ElementData")===undefined){MaxLength=b.find(".count").text();if(typeof(MaxLength)=="undefined"){MaxLength=SN.C.I.MaxLength}jQuery.data(b[0],"ElementData",{MaxLength:MaxLength});SN.U.Counter(b);NDT=b.find("[name=status_textarea]");NDT.bind("keyup",function(c){SN.U.Counter(b)});var a=function(c){window.setTimeout(function(){SN.U.Counter(b)},50)};NDT.bind("cut",a).bind("paste",a)}else{b.find(".count").text(jQuery.data(b[0],"ElementData").MaxLength)}},Counter:function(d){SN.C.I.FormNoticeCurrent=d;var b=jQuery.data(d[0],"ElementData").MaxLength;if(b<=0){return}var c=b-SN.U.CharacterCount(d);var a=d.find(".count");if(c.toString()!=a.text()){if(!SN.C.I.CounterBlackout||c===0){if(a.text()!=String(c)){a.text(c)}if(c<0){d.addClass(SN.C.S.Warning)}else{d.removeClass(SN.C.S.Warning)}if(!SN.C.I.CounterBlackout){SN.C.I.CounterBlackout=true;SN.C.I.FormNoticeCurrent=d;window.setTimeout("SN.U.ClearCounterBlackout(SN.C.I.FormNoticeCurrent);",500)}}}},CharacterCount:function(a){return a.find("[name=status_textarea]").val().length},ClearCounterBlackout:function(a){SN.C.I.CounterBlackout=false;SN.U.Counter(a)},RewriteAjaxAction:function(a){if(document.location.protocol=="https:"&&a.substr(0,5)=="http:"){return a.replace(/^http:\/\/[^:\/]+/,"https://"+document.location.host)}else{return a}},FormXHR:function(a){$.ajax({type:"POST",dataType:"xml",url:SN.U.RewriteAjaxAction(a.attr("action")),data:a.serialize()+"&ajax=1",beforeSend:function(b){a.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(c,d,b){alert(b||d)},success:function(b,c){if(typeof($("form",b)[0])!="undefined"){form_new=document._importNode($("form",b)[0],true);a.replaceWith(form_new)}else{a.replaceWith(document._importNode($("p",b)[0],true))}}})},FormNoticeXHR:function(b){SN.C.I.NoticeDataGeo={};b.append('<input type="hidden" name="ajax" value="1"/>');b.attr("action",SN.U.RewriteAjaxAction(b.attr("action")));var c=function(d,e){b.append($('<p class="form_response"></p>').addClass(d).text(e))};var a=function(){b.find(".form_response").remove()};b.ajaxForm({dataType:"xml",timeout:"60000",beforeSend:function(d){if(b.find("[name=status_textarea]").val()==""){b.addClass(SN.C.S.Warning);return false}b.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled);SN.U.normalizeGeoData(b);return true},error:function(f,g,e){b.removeClass(SN.C.S.Processing).find(".submit").removeClass(SN.C.S.Disabled).removeAttr(SN.C.S.Disabled,SN.C.S.Disabled);a();if(g=="timeout"){c("error","Sorry! We had trouble sending your notice. The servers are overloaded. Please try again, and contact the site administrator if this problem persists.")}else{var d=SN.U.GetResponseXML(f);if($("."+SN.C.S.Error,d).length>0){b.append(document._importNode($("."+SN.C.S.Error,d)[0],true))}else{if(parseInt(f.status)===0||jQuery.inArray(parseInt(f.status),SN.C.I.HTTP20x30x)>=0){b.resetForm().find(".attach-status").remove();SN.U.FormNoticeEnhancements(b)}else{c("error","(Sorry! We had trouble sending your notice ("+f.status+" "+f.statusText+"). Please report the problem to the site administrator if this happens again.")}}}},success:function(i,k){a();var e=$("#"+SN.C.S.Error,i);if(e.length>0){c("error",e.text())}else{if($("body")[0].id=="bookmarklet"){self.close()}var d=$("#"+SN.C.S.CommandResult,i);if(d.length>0){c("success",d.text())}else{var h=document._importNode($("li",i)[0],true);var j=$("#notices_primary .notices:first");if(j.length>0&&SN.U.belongsOnTimeline(h)){if($("#"+h.id).length===0){var f=$("#"+SN.C.S.NoticeInReplyTo).val();var g="#notices_primary #notice-"+f;if($("body")[0].id=="conversation"){if(f.length>0&&$(g+" .notices").length<1){$(g).append('<ul class="notices"></ul>')}$($(g+" .notices")[0]).append(h)}else{j.prepend(h)}$("#"+h.id).css({display:"none"}).fadeIn(2500);SN.U.NoticeWithAttachment($("#"+h.id));SN.U.NoticeReplyTo($("#"+h.id))}}else{c("success",$("title",i).text())}}b.resetForm();b.find("[name=inreplyto]").val("");b.find(".attach-status").remove();SN.U.FormNoticeEnhancements(b)}},complete:function(d,e){b.removeClass(SN.C.S.Processing).find(".submit").removeAttr(SN.C.S.Disabled).removeClass(SN.C.S.Disabled);b.find("[name=lat]").val(SN.C.I.NoticeDataGeo.NLat);b.find("[name=lon]").val(SN.C.I.NoticeDataGeo.NLon);b.find("[name=location_ns]").val(SN.C.I.NoticeDataGeo.NLNS);b.find("[name=location_id]").val(SN.C.I.NoticeDataGeo.NLID);b.find("[name=notice_data-geo]").attr("checked",SN.C.I.NoticeDataGeo.NDG)}})},normalizeGeoData:function(a){SN.C.I.NoticeDataGeo.NLat=a.find("[name=lat]").val();SN.C.I.NoticeDataGeo.NLon=a.find("[name=lon]").val();SN.C.I.NoticeDataGeo.NLNS=a.find("[name=location_ns]").val();SN.C.I.NoticeDataGeo.NLID=a.find("[name=location_id]").val();SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked");var b=$.cookie(SN.C.S.NoticeDataGeoCookie);if(b!==null&&b!="disabled"){b=JSON.parse(b);SN.C.I.NoticeDataGeo.NLat=a.find("[name=lat]").val(b.NLat).val();SN.C.I.NoticeDataGeo.NLon=a.find("[name=lon]").val(b.NLon).val();if(b.NLNS){SN.C.I.NoticeDataGeo.NLNS=a.find("[name=location_ns]").val(b.NLNS).val();SN.C.I.NoticeDataGeo.NLID=a.find("[name=location_id]").val(b.NLID).val()}else{a.find("[name=location_ns]").val("");a.find("[name=location_id]").val("")}}if(b=="disabled"){SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked",false).attr("checked")}else{SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked",true).attr("checked")}},GetResponseXML:function(b){try{return b.responseXML}catch(a){return(new DOMParser()).parseFromString(b.responseText,"text/xml")}},NoticeReply:function(){if($("#content .notice_reply").length>0){$("#content .notice").each(function(){SN.U.NoticeReplyTo($(this))})}},NoticeReplyTo:function(a){a.find(".notice_reply").live("click",function(c){c.preventDefault();var b=($(".author .nickname",a).length>0)?$($(".author .nickname",a)[0]):$(".author .nickname.uid");SN.U.NoticeInlineReplyTrigger(a,"@"+b.text());return false})},NoticeInlineReplyTrigger:function(h,i){var c=$($(".notice_id",h)[0]).text();var d=h;var f=h.closest(".notices");if(f.hasClass("threaded-replies")){d=f.closest(".notice")}else{f=$("ul.threaded-replies",h);if(f.length==0){f=$('<ul class="notices threaded-replies xoxo"></ul>');h.append(f)}}var k=$(".notice-reply-form",f);if(k.length==0){$("li.notice-reply-placeholder").remove();var g=$("li.notice-reply",f);if(g.length==0){g=$('<li class="notice-reply"><form class="notice-reply-form" method="post"><textarea name="status_textarea"></textarea><div class="controls"><input type="hidden" name="token"><input type="hidden" name="inreplyto"><input type="submit" class="submit"></div></form></li>');var b=$("#form_notice");k=g.find("form");k.attr("action",b.attr("action"));k.find('input[name="token"]').val(b.find("input[name=token]").val());k.find('input[type="submit"]').val(SN.msg("reply_submit"));f.append(g);k.find("textarea").blur(function(){var m=$(this);var l=$.trim(m.val());if(l==""||l==m.data("initialText")){g.remove();if(f.find("li").length>0){SN.U.NoticeInlineReplyPlaceholder(d)}else{f.remove()}}});k.submit(function(m){var l=k;$.ajax({type:"POST",dataType:"xml",url:SN.U.RewriteAjaxAction(l.attr("action")),data:l.serialize()+"&ajax=1",beforeSend:function(n){l.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled).end().find("textarea").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(o,p,n){alert(n||p)},success:function(p,r){var o=$("li",p)[0];if(o){var n=document._importNode(o,true);var q=$(n).attr("id");if($("#"+q).length==0){g.replaceWith(n);SN.U.NoticeInlineReplyPlaceholder(d)}else{g.remove()}}}});m.preventDefault();return false})}}k.find("input[name=inreplyto]").val(c);var j=k.find("textarea");if(j.length==0){throw"No textarea"}var a="";if(i){a=i+" "}j.val(a+j.val().replace(RegExp(a,"i"),""));j.data("initialText",$.trim(i+""));j.focus();if(j[0].setSelectionRange){var e=j.val().length;j[0].setSelectionRange(e,e)}},NoticeFavor:function(){$(".form_favor").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_disfavor").live("click",function(){SN.U.FormXHR($(this));return false})},NoticeInlineReplyPlaceholder:function(b){var a=b.find("ul.threaded-replies");var c=$('<li class="notice-reply-placeholder"><input class="placeholder"></li>');c.click(function(){SN.U.NoticeInlineReplyTrigger(b)});c.find("input").val(SN.msg("reply_placeholder"));a.append(c)},NoticeInlineReplySetup:function(){$(".threaded-replies").each(function(){var b=$(this);var a=b.closest(".notice");SN.U.NoticeInlineReplyPlaceholder(a)})},NoticeRepeat:function(){$(".form_repeat").live("click",function(a){a.preventDefault();SN.U.NoticeRepeatConfirmation($(this));return false})},NoticeRepeatConfirmation:function(a){var c=a.find(".submit");var b=c.clone();b.addClass("submit_dialogbox").removeClass("submit");a.append(b);b.bind("click",function(){SN.U.FormXHR(a);return false});c.hide();a.addClass("dialogbox").append('<button class="close">&#215;</button>').closest(".notice-options").addClass("opaque");a.find("button.close").click(function(){$(this).remove();a.removeClass("dialogbox").closest(".notice-options").removeClass("opaque");a.find(".submit_dialogbox").remove();a.find(".submit").show();return false})},NoticeAttachments:function(){$(".notice a.attachment").each(function(){SN.U.NoticeWithAttachment($(this).closest(".notice"))})},NoticeWithAttachment:function(b){if(b.find(".attachment").length===0){return}var a=b.find(".attachment.more");if(a.length>0){$(a[0]).click(function(){var c=$(this);c.addClass(SN.C.S.Processing);$.get(c.attr("href")+"/ajax",null,function(d){c.parent(".entry-content").html($(d).find("#attachment_view .entry-content").html())});return false}).attr("title",SN.msg("showmore_tooltip"))}},NoticeDataAttach:function(b){var a=b.find("input[type=file]");a.change(function(f){b.find(".attach-status").remove();var d=$(this).val();if(!d){return false}var c=$('<div class="attach-status '+SN.C.S.Success+'"><code></code> <button class="close">&#215;</button></div>');c.find("code").text(d);c.find("button").click(function(){c.remove();a.val("");return false});b.append(c);if(typeof this.files=="object"){for(var e=0;e<this.files.length;e++){SN.U.PreviewAttach(b,this.files[e])}}})},maxFileSize:function(b){var a=$(b).find("input[name=MAX_FILE_SIZE]").attr("value");if(a){return parseInt(a)}else{return 0}},PreviewAttach:function(d,c){var e=c.type+" "+Math.round(c.size/1024)+"KB";var f=true;var h;if(typeof window.createObjectURL!="undefined"){h=function(i,j){j(window.createObjectURL(i))}}else{if(typeof window.FileReader!="undefined"){h=function(j,k){var i=new FileReader();i.onload=function(l){k(i.result)};i.readAsDataURL(j)}}else{f=false}}var a=["image/png","image/jpeg","image/gif","image/svg+xml"];if($.inArray(c.type,a)==-1){f=false}var g=8*1024*1024;if(c.size>g){f=false}if(f){h(c,function(j){var i=$("<img>").attr("title",e).attr("alt",e).attr("src",j).attr("style","height: 120px");d.find(".attach-status").append(i)})}else{var b=$("<div></div>").text(e);d.find(".attach-status").append(b)}},NoticeLocationAttach:function(a){var d=a.find("[name=lat]");var i=a.find("[name=lon]");var e=a.find("[name=location_ns]").val();var j=a.find("[name=location_id]").val();var b=$("#"+SN.C.S.NoticeGeoName).text();var c=a.find("[name=notice_data-geo]");function f(l){$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",jQuery.trim($("label[for="+SN.C.S.NoticeDataGeo+"]").text())).removeClass("checked");a.find("[name=lat]").val("");a.find("[name=lon]").val("");a.find("[name=location_ns]").val("");a.find("[name=location_id]").val("");a.find("[name=notice_data-geo]").attr("checked",false);$.cookie(SN.C.S.NoticeDataGeoCookie,"disabled",{path:"/"});if(l){$(".geo_status_wrapper").removeClass("success").addClass("error");$(".geo_status_wrapper .geo_status").text(l)}else{$(".geo_status_wrapper").remove()}}function k(l,m){SN.U.NoticeGeoStatus("Looking up place name...");$.getJSON(l,m,function(n){var o,p;if(typeof(n.location_ns)!="undefined"){a.find("[name=location_ns]").val(n.location_ns);o=n.location_ns}if(typeof(n.location_id)!="undefined"){a.find("[name=location_id]").val(n.location_id);p=n.location_id}if(typeof(n.name)=="undefined"){NLN_text=m.lat+";"+m.lon}else{NLN_text=n.name}SN.U.NoticeGeoStatus(NLN_text,m.lat,m.lon,n.url);$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",NoticeDataGeo_text.ShareDisable+" ("+NLN_text+")");a.find("[name=lat]").val(m.lat);a.find("[name=lon]").val(m.lon);a.find("[name=location_ns]").val(o);a.find("[name=location_id]").val(p);a.find("[name=notice_data-geo]").attr("checked",true);var q={NLat:m.lat,NLon:m.lon,NLNS:o,NLID:p,NLN:NLN_text,NLNU:n.url,NDG:true};$.cookie(SN.C.S.NoticeDataGeoCookie,JSON.stringify(q),{path:"/"})})}if(c.length>0){if($.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){c.attr("checked",false)}else{c.attr("checked",true)}var g=$("#notice_data-geo_wrap");var h=g.attr("title");g.removeAttr("title");$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",jQuery.trim($("label[for="+SN.C.S.NoticeDataGeo+"]").text()));c.change(function(){if($("#"+SN.C.S.NoticeDataGeo).attr("checked")===true||$.cookie(SN.C.S.NoticeDataGeoCookie)===null){$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",NoticeDataGeo_text.ShareDisable).addClass("checked");if($.cookie(SN.C.S.NoticeDataGeoCookie)===null||$.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){if(navigator.geolocation){SN.U.NoticeGeoStatus("Requesting location from browser...");navigator.geolocation.getCurrentPosition(function(n){a.find("[name=lat]").val(n.coords.latitude);a.find("[name=lon]").val(n.coords.longitude);var o={lat:n.coords.latitude,lon:n.coords.longitude,token:$("#token").val()};k(h,o)},function(n){switch(n.code){case n.PERMISSION_DENIED:f("Location permission denied.");break;case n.TIMEOUT:f("Location lookup timeout.");break}},{timeout:10000})}else{if(d.length>0&&i.length>0){var l={lat:d,lon:i,token:$("#token").val()};k(h,l)}else{f();$("#"+SN.C.S.NoticeDataGeo).remove();$("label[for="+SN.C.S.NoticeDataGeo+"]").remove()}}}else{var m=JSON.parse($.cookie(SN.C.S.NoticeDataGeoCookie));a.find("[name=lat]").val(m.NLat);a.find("[name=lon]").val(m.NLon);a.find("[name=location_ns]").val(m.NLNS);a.find("[name=location_id]").val(m.NLID);a.find("[name=notice_data-geo]").attr("checked",m.NDG);SN.U.NoticeGeoStatus(m.NLN,m.NLat,m.NLon,m.NLNU);$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",NoticeDataGeo_text.ShareDisable+" ("+m.NLN+")").addClass("checked")}}else{f()}}).change()}},NoticeGeoStatus:function(a,f,g,c){var e=$("#form_notice");var h=e.find(".geo_status_wrapper");if(h.length==0){h=$('<div class="'+SN.C.S.Success+' geo_status_wrapper"><button class="close" style="float:right">&#215;</button><div class="geo_status"></div></div>');h.find("button.close").click(function(){$("#"+SN.C.S.NoticeDataGeo).removeAttr("checked").change()});e.append(h)}var b;if(c){b=$("<a></a>").attr("href",c)}else{b=$("<span></span>")}b.text(a);if(f||g){var d=f+";"+g;b.attr("title",d);if(!a){b.text(d)}}h.find(".geo_status").empty().append(b)},NewDirectMessage:function(){NDM=$(".entity_send-a-message a");NDM.attr({href:NDM.attr("href")+"&ajax=1"});NDM.bind("click",function(){var a=$(".entity_send-a-message form");if(a.length===0){$(this).addClass(SN.C.S.Processing);$.get(NDM.attr("href"),null,function(b){$(".entity_send-a-message").append(document._importNode($("form",b)[0],true));a=$(".entity_send-a-message .form_notice");SN.U.FormNoticeXHR(a);SN.U.FormNoticeEnhancements(a);a.append('<button class="close">&#215;</button>');$(".entity_send-a-message button").click(function(){a.hide();return false});NDM.removeClass(SN.C.S.Processing)})}else{a.show();$(".entity_send-a-message textarea").focus()}return false})},GetFullYear:function(c,d,a){var b=new Date();b.setFullYear(c,d,a);return b},StatusNetInstance:{Set:function(b){var a=SN.U.StatusNetInstance.Get();if(a!==null){b=$.extend(a,b)}$.cookie(SN.C.S.StatusNetInstance,JSON.stringify(b),{path:"/",expires:SN.U.GetFullYear(2029,0,1)})},Get:function(){var a=$.cookie(SN.C.S.StatusNetInstance);if(a!==null){return JSON.parse(a)}return null},Delete:function(){$.cookie(SN.C.S.StatusNetInstance,null)}},belongsOnTimeline:function(b){var a=$("body").attr("id");if(a=="public"){return true}var c=$("#nav_profile a").attr("href");if(c){var d=$(b).find(".entry-title .author a.url").attr("href");if(d==c){if(a=="all"||a=="showstream"){return true}}}return false}},Init:{NoticeForm:function(){if($("body.user_in").length>0){$("."+SN.C.S.FormNotice).each(function(){var a=$(this);SN.U.NoticeLocationAttach(a);SN.U.FormNoticeXHR(a);SN.U.FormNoticeEnhancements(a);SN.U.NoticeDataAttach(a)})}},Notices:function(){if($("body.user_in").length>0){SN.U.NoticeFavor();SN.U.NoticeRepeat();SN.U.NoticeReply();SN.U.NoticeInlineReplySetup()}SN.U.NoticeAttachments()},EntityActions:function(){if($("body.user_in").length>0){$(".form_user_subscribe").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_user_unsubscribe").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_group_join").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_group_leave").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_user_nudge").live("click",function(){SN.U.FormXHR($(this));return false});SN.U.NewDirectMessage()}},Login:function(){if(SN.U.StatusNetInstance.Get()!==null){var a=SN.U.StatusNetInstance.Get().Nickname;if(a!==null){$("#form_login #nickname").val(a)}}$("#form_login").bind("submit",function(){SN.U.StatusNetInstance.Set({Nickname:$("#form_login #nickname").val()});return true})},UploadForms:function(){$("input[type=file]").change(function(d){if(typeof this.files=="object"&&this.files.length>0){var c=0;for(var b=0;b<this.files.length;b++){c+=this.files[b].size}var a=SN.U.maxFileSize($(this.form));if(a>0&&c>a){var e="File too large: maximum upload size is %d bytes.";alert(e.replace("%d",a));$(this).val("");d.preventDefault();return false}}})}}};$(document).ready(function(){SN.Init.UploadForms();if($("."+SN.C.S.FormNotice).length>0){SN.Init.NoticeForm()}if($("#content .notices").length>0){SN.Init.Notices()}if($("#content .entity_actions").length>0){SN.Init.EntityActions()}if($("#form_login").length>0){SN.Init.Login()}});if(!document.ELEMENT_NODE){document.ELEMENT_NODE=1;document.ATTRIBUTE_NODE=2;document.TEXT_NODE=3;document.CDATA_SECTION_NODE=4;document.ENTITY_REFERENCE_NODE=5;document.ENTITY_NODE=6;document.PROCESSING_INSTRUCTION_NODE=7;document.COMMENT_NODE=8;document.DOCUMENT_NODE=9;document.DOCUMENT_TYPE_NODE=10;document.DOCUMENT_FRAGMENT_NODE=11;document.NOTATION_NODE=12}document._importNode=function(e,a){switch(e.nodeType){case document.ELEMENT_NODE:var d=document.createElement(e.nodeName);if(e.attributes&&e.attributes.length>0){for(var c=0,b=e.attributes.length;c<b;){if(e.attributes[c].nodeName=="class"){d.className=e.getAttribute(e.attributes[c++].nodeName)}else{d.setAttribute(e.attributes[c].nodeName,e.getAttribute(e.attributes[c++].nodeName))}}}if(a&&e.childNodes&&e.childNodes.length>0){for(var c=0,b=e.childNodes.length;c<b;){d.appendChild(document._importNode(e.childNodes[c++],a))}}return d;break;case document.TEXT_NODE:case document.CDATA_SECTION_NODE:case document.COMMENT_NODE:return document.createTextNode(e.nodeValue);break}};if(typeof navigator.geolocation=="undefined"||navigator.geolocation.shim){(function(){(function(){if(window.google&&google.gears){return}var c=null;if(typeof GearsFactory!="undefined"){c=new GearsFactory()}else{try{c=new ActiveXObject("Gears.Factory");if(c.getBuildInfo().indexOf("ie_mobile")!=-1){c.privateSetGlobalObject(this)}}catch(d){if((typeof navigator.mimeTypes!="undefined")&&navigator.mimeTypes["application/x-googlegears"]){c=document.createElement("object");c.style.display="none";c.width=0;c.height=0;c.type="application/x-googlegears";document.documentElement.appendChild(c)}}}if(!c){return}if(!window.google){google={}}if(!google.gears){google.gears={factory:c}}})();var a=(function(){var d=google.gears.factory.create("beta.geolocation");var c=function(f,e){return function(g){f(g);e.lastPosition=g}};return{shim:true,type:"Gears",lastPosition:null,getCurrentPosition:function(e,g,h){var f=this;var i=c(e,f);d.getCurrentPosition(i,g,h)},watchPosition:function(e,f,g){d.watchPosition(e,f,g)},clearWatch:function(e){d.clearWatch(e)},getPermission:function(g,e,f){d.getPermission(g,e,f)}}});var b=(function(){var i=false;var e=function(){if(!d()&&!i){i=true;var j=document.createElement("script");j.src=(document.location.protocol=="https:"?"https://":"http://")+"www.google.com/jsapi?callback=_google_loader_apiLoaded";j.type="text/javascript";document.getElementsByTagName("body")[0].appendChild(j)}};var c=[];var h=function(j){c.push(j)};var f=function(){if(d()){while(c.length>0){var j=c.pop();j()}}};window._google_loader_apiLoaded=function(){f()};var d=function(){return(window.google&&google.loader)};var g=function(j){if(d()){return true}h(j);e();return false};e();return{shim:true,type:"ClientLocation",lastPosition:null,getCurrentPosition:function(k,n,o){var m=this;if(!g(function(){m.getCurrentPosition(k,n,o)})){return}if(google.loader.ClientLocation){var l=google.loader.ClientLocation;var j={coords:{latitude:l.latitude,longitude:l.longitude,altitude:null,accuracy:43000,altitudeAccuracy:null,heading:null,speed:null},address:{city:l.address.city,country:l.address.country,country_code:l.address.country_code,region:l.address.region},timestamp:new Date()};k(j);this.lastPosition=j}else{if(n==="function"){n({code:3,message:"Using the Google ClientLocation API and it is not able to calculate a location."})}}},watchPosition:function(j,l,m){this.getCurrentPosition(j,l,m);var k=this;var n=setInterval(function(){k.getCurrentPosition(j,l,m)},10000);return n},clearWatch:function(j){clearInterval(j)},getPermission:function(l,j,k){return true}}});navigator.geolocation=(window.google&&google.gears)?a():b()})()};
\ No newline at end of file
+var SN={C:{I:{CounterBlackout:false,MaxLength:140,PatternUsername:/^[0-9a-zA-Z\-_.]*$/,HTTP20x30x:[200,201,202,203,204,205,206,300,301,302,303,304,305,306,307]},S:{Disabled:"disabled",Warning:"warning",Error:"error",Success:"success",Processing:"processing",CommandResult:"command_result",FormNotice:"form_notice",NoticeDataGeo:"notice_data-geo",NoticeDataGeoCookie:"NoticeDataGeo",NoticeDataGeoSelected:"notice_data-geo_selected",StatusNetInstance:"StatusNetInstance"}},messages:{},msg:function(a){if(typeof SN.messages[a]=="undefined"){return"["+a+"]"}else{return SN.messages[a]}},U:{FormNoticeEnhancements:function(b){if(jQuery.data(b[0],"ElementData")===undefined){MaxLength=b.find(".count").text();if(typeof(MaxLength)=="undefined"){MaxLength=SN.C.I.MaxLength}jQuery.data(b[0],"ElementData",{MaxLength:MaxLength});SN.U.Counter(b);NDT=b.find("[name=status_textarea]");NDT.bind("keyup",function(c){SN.U.Counter(b)});var a=function(c){window.setTimeout(function(){SN.U.Counter(b)},50)};NDT.bind("cut",a).bind("paste",a)}else{b.find(".count").text(jQuery.data(b[0],"ElementData").MaxLength)}},Counter:function(d){SN.C.I.FormNoticeCurrent=d;var b=jQuery.data(d[0],"ElementData").MaxLength;if(b<=0){return}var c=b-SN.U.CharacterCount(d);var a=d.find(".count");if(c.toString()!=a.text()){if(!SN.C.I.CounterBlackout||c===0){if(a.text()!=String(c)){a.text(c)}if(c<0){d.addClass(SN.C.S.Warning)}else{d.removeClass(SN.C.S.Warning)}if(!SN.C.I.CounterBlackout){SN.C.I.CounterBlackout=true;SN.C.I.FormNoticeCurrent=d;window.setTimeout("SN.U.ClearCounterBlackout(SN.C.I.FormNoticeCurrent);",500)}}}},CharacterCount:function(a){return a.find("[name=status_textarea]").val().length},ClearCounterBlackout:function(a){SN.C.I.CounterBlackout=false;SN.U.Counter(a)},RewriteAjaxAction:function(a){if(document.location.protocol=="https:"&&a.substr(0,5)=="http:"){return a.replace(/^http:\/\/[^:\/]+/,"https://"+document.location.host)}else{return a}},FormXHR:function(a){$.ajax({type:"POST",dataType:"xml",url:SN.U.RewriteAjaxAction(a.attr("action")),data:a.serialize()+"&ajax=1",beforeSend:function(b){a.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(c,d,b){alert(b||d)},success:function(b,c){if(typeof($("form",b)[0])!="undefined"){form_new=document._importNode($("form",b)[0],true);a.replaceWith(form_new)}else{a.replaceWith(document._importNode($("p",b)[0],true))}}})},FormNoticeXHR:function(b){SN.C.I.NoticeDataGeo={};b.append('<input type="hidden" name="ajax" value="1"/>');b.attr("action",SN.U.RewriteAjaxAction(b.attr("action")));var c=function(d,e){b.append($('<p class="form_response"></p>').addClass(d).text(e))};var a=function(){b.find(".form_response").remove()};b.ajaxForm({dataType:"xml",timeout:"60000",beforeSend:function(d){if(b.find("[name=status_textarea]").val()==""){b.addClass(SN.C.S.Warning);return false}b.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled);SN.U.normalizeGeoData(b);return true},error:function(f,g,e){b.removeClass(SN.C.S.Processing).find(".submit").removeClass(SN.C.S.Disabled).removeAttr(SN.C.S.Disabled,SN.C.S.Disabled);a();if(g=="timeout"){c("error","Sorry! We had trouble sending your notice. The servers are overloaded. Please try again, and contact the site administrator if this problem persists.")}else{var d=SN.U.GetResponseXML(f);if($("."+SN.C.S.Error,d).length>0){b.append(document._importNode($("."+SN.C.S.Error,d)[0],true))}else{if(parseInt(f.status)===0||jQuery.inArray(parseInt(f.status),SN.C.I.HTTP20x30x)>=0){b.resetForm().find(".attach-status").remove();SN.U.FormNoticeEnhancements(b)}else{c("error","(Sorry! We had trouble sending your notice ("+f.status+" "+f.statusText+"). Please report the problem to the site administrator if this happens again.")}}}},success:function(i,k){a();var e=$("#"+SN.C.S.Error,i);if(e.length>0){c("error",e.text())}else{if($("body")[0].id=="bookmarklet"){self.close()}var d=$("#"+SN.C.S.CommandResult,i);if(d.length>0){c("success",d.text())}else{var h=document._importNode($("li",i)[0],true);var j=$("#notices_primary .notices:first");if(j.length>0&&SN.U.belongsOnTimeline(h)){if($("#"+h.id).length===0){var f=b.find("[name=inreplyto]").val();var g="#notices_primary #notice-"+f;if($("body")[0].id=="conversation"){if(f.length>0&&$(g+" .notices").length<1){$(g).append('<ul class="notices"></ul>')}$($(g+" .notices")[0]).append(h)}else{j.prepend(h)}$("#"+h.id).css({display:"none"}).fadeIn(2500);SN.U.NoticeWithAttachment($("#"+h.id));SN.U.NoticeReplyTo($("#"+h.id))}}else{c("success",$("title",i).text())}}b.resetForm();b.find("[name=inreplyto]").val("");b.find(".attach-status").remove();SN.U.FormNoticeEnhancements(b)}},complete:function(d,e){b.removeClass(SN.C.S.Processing).find(".submit").removeAttr(SN.C.S.Disabled).removeClass(SN.C.S.Disabled);b.find("[name=lat]").val(SN.C.I.NoticeDataGeo.NLat);b.find("[name=lon]").val(SN.C.I.NoticeDataGeo.NLon);b.find("[name=location_ns]").val(SN.C.I.NoticeDataGeo.NLNS);b.find("[name=location_id]").val(SN.C.I.NoticeDataGeo.NLID);b.find("[name=notice_data-geo]").attr("checked",SN.C.I.NoticeDataGeo.NDG)}})},normalizeGeoData:function(a){SN.C.I.NoticeDataGeo.NLat=a.find("[name=lat]").val();SN.C.I.NoticeDataGeo.NLon=a.find("[name=lon]").val();SN.C.I.NoticeDataGeo.NLNS=a.find("[name=location_ns]").val();SN.C.I.NoticeDataGeo.NLID=a.find("[name=location_id]").val();SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked");var b=$.cookie(SN.C.S.NoticeDataGeoCookie);if(b!==null&&b!="disabled"){b=JSON.parse(b);SN.C.I.NoticeDataGeo.NLat=a.find("[name=lat]").val(b.NLat).val();SN.C.I.NoticeDataGeo.NLon=a.find("[name=lon]").val(b.NLon).val();if(b.NLNS){SN.C.I.NoticeDataGeo.NLNS=a.find("[name=location_ns]").val(b.NLNS).val();SN.C.I.NoticeDataGeo.NLID=a.find("[name=location_id]").val(b.NLID).val()}else{a.find("[name=location_ns]").val("");a.find("[name=location_id]").val("")}}if(b=="disabled"){SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked",false).attr("checked")}else{SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked",true).attr("checked")}},GetResponseXML:function(b){try{return b.responseXML}catch(a){return(new DOMParser()).parseFromString(b.responseText,"text/xml")}},NoticeReply:function(){if($("#content .notice_reply").length>0){$("#content .notice").each(function(){SN.U.NoticeReplyTo($(this))})}},NoticeReplyTo:function(a){a.find(".notice_reply").live("click",function(c){c.preventDefault();var b=($(".author .nickname",a).length>0)?$($(".author .nickname",a)[0]):$(".author .nickname.uid");SN.U.NoticeInlineReplyTrigger(a,"@"+b.text());return false})},NoticeInlineReplyTrigger:function(h,i){var c=$($(".notice_id",h)[0]).text();var d=h;var f=h.closest(".notices");if(f.hasClass("threaded-replies")){d=f.closest(".notice")}else{f=$("ul.threaded-replies",h);if(f.length==0){f=$('<ul class="notices threaded-replies xoxo"></ul>');h.append(f)}}var k=$(".notice-reply-form",f);if(k.length==0){$("li.notice-reply-placeholder").remove();var g=$("li.notice-reply",f);if(g.length==0){g=$('<li class="notice-reply"><form class="notice-reply-form" method="post"><textarea name="status_textarea"></textarea><div class="controls"><input type="hidden" name="token"><input type="hidden" name="inreplyto"><input type="submit" class="submit"></div></form></li>');var b=$("#form_notice");k=g.find("form");k.attr("action",b.attr("action"));k.find('input[name="token"]').val(b.find("input[name=token]").val());k.find('input[type="submit"]').val(SN.msg("reply_submit"));f.append(g);k.find("textarea").blur(function(){var m=$(this);var l=$.trim(m.val());if(l==""||l==m.data("initialText")){g.remove();if(f.find("li").length>0){SN.U.NoticeInlineReplyPlaceholder(d)}else{f.remove()}}});k.submit(function(m){var l=k;$.ajax({type:"POST",dataType:"xml",url:SN.U.RewriteAjaxAction(l.attr("action")),data:l.serialize()+"&ajax=1",beforeSend:function(n){l.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled).end().find("textarea").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(o,p,n){alert(n||p)},success:function(p,r){var o=$("li",p)[0];if(o){var n=document._importNode(o,true);var q=$(n).attr("id");if($("#"+q).length==0){g.replaceWith(n);SN.U.NoticeInlineReplyPlaceholder(d)}else{g.remove()}}}});m.preventDefault();return false})}}k.find("input[name=inreplyto]").val(c);var j=k.find("textarea");if(j.length==0){throw"No textarea"}var a="";if(i){a=i+" "}j.val(a+j.val().replace(RegExp(a,"i"),""));j.data("initialText",$.trim(i+""));j.focus();if(j[0].setSelectionRange){var e=j.val().length;j[0].setSelectionRange(e,e)}},NoticeFavor:function(){$(".form_favor").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_disfavor").live("click",function(){SN.U.FormXHR($(this));return false})},NoticeInlineReplyPlaceholder:function(b){var a=b.find("ul.threaded-replies");var c=$('<li class="notice-reply-placeholder"><input class="placeholder"></li>');c.click(function(){SN.U.NoticeInlineReplyTrigger(b)});c.find("input").val(SN.msg("reply_placeholder"));a.append(c)},NoticeInlineReplySetup:function(){$(".threaded-replies").each(function(){var b=$(this);var a=b.closest(".notice");SN.U.NoticeInlineReplyPlaceholder(a)})},NoticeRepeat:function(){$(".form_repeat").live("click",function(a){a.preventDefault();SN.U.NoticeRepeatConfirmation($(this));return false})},NoticeRepeatConfirmation:function(a){var c=a.find(".submit");var b=c.clone();b.addClass("submit_dialogbox").removeClass("submit");a.append(b);b.bind("click",function(){SN.U.FormXHR(a);return false});c.hide();a.addClass("dialogbox").append('<button class="close">&#215;</button>').closest(".notice-options").addClass("opaque");a.find("button.close").click(function(){$(this).remove();a.removeClass("dialogbox").closest(".notice-options").removeClass("opaque");a.find(".submit_dialogbox").remove();a.find(".submit").show();return false})},NoticeAttachments:function(){$(".notice a.attachment").each(function(){SN.U.NoticeWithAttachment($(this).closest(".notice"))})},NoticeWithAttachment:function(b){if(b.find(".attachment").length===0){return}var a=b.find(".attachment.more");if(a.length>0){$(a[0]).click(function(){var c=$(this);c.addClass(SN.C.S.Processing);$.get(c.attr("href")+"/ajax",null,function(d){c.parent(".entry-content").html($(d).find("#attachment_view .entry-content").html())});return false}).attr("title",SN.msg("showmore_tooltip"))}},NoticeDataAttach:function(b){var a=b.find("input[type=file]");a.change(function(f){b.find(".attach-status").remove();var d=$(this).val();if(!d){return false}var c=$('<div class="attach-status '+SN.C.S.Success+'"><code></code> <button class="close">&#215;</button></div>');c.find("code").text(d);c.find("button").click(function(){c.remove();a.val("");return false});b.append(c);if(typeof this.files=="object"){for(var e=0;e<this.files.length;e++){SN.U.PreviewAttach(b,this.files[e])}}})},maxFileSize:function(b){var a=$(b).find("input[name=MAX_FILE_SIZE]").attr("value");if(a){return parseInt(a)}else{return 0}},PreviewAttach:function(d,c){var e=c.type+" "+Math.round(c.size/1024)+"KB";var f=true;var h;if(typeof window.createObjectURL!="undefined"){h=function(i,j){j(window.createObjectURL(i))}}else{if(typeof window.FileReader!="undefined"){h=function(j,k){var i=new FileReader();i.onload=function(l){k(i.result)};i.readAsDataURL(j)}}else{f=false}}var a=["image/png","image/jpeg","image/gif","image/svg+xml"];if($.inArray(c.type,a)==-1){f=false}var g=8*1024*1024;if(c.size>g){f=false}if(f){h(c,function(j){var i=$("<img>").attr("title",e).attr("alt",e).attr("src",j).attr("style","height: 120px");d.find(".attach-status").append(i)})}else{var b=$("<div></div>").text(e);d.find(".attach-status").append(b)}},NoticeLocationAttach:function(a){var e=a.find("[name=lat]");var k=a.find("[name=lon]");var g=a.find("[name=location_ns]").val();var l=a.find("[name=location_id]").val();var b="";var d=a.find("[name=notice_data-geo]");var c=a.find("[name=notice_data-geo]");var j=$("label[for="+c.attr("id")+"]");function f(n){j.attr("title",jQuery.trim(j.text())).removeClass("checked");a.find("[name=lat]").val("");a.find("[name=lon]").val("");a.find("[name=location_ns]").val("");a.find("[name=location_id]").val("");a.find("[name=notice_data-geo]").attr("checked",false);$.cookie(SN.C.S.NoticeDataGeoCookie,"disabled",{path:"/"});if(n){a.find(".geo_status_wrapper").removeClass("success").addClass("error");a.find(".geo_status_wrapper .geo_status").text(n)}else{a.find(".geo_status_wrapper").remove()}}function m(n,o){SN.U.NoticeGeoStatus("Looking up place name...");$.getJSON(n,o,function(p){var q,r;if(typeof(p.location_ns)!="undefined"){a.find("[name=location_ns]").val(p.location_ns);q=p.location_ns}if(typeof(p.location_id)!="undefined"){a.find("[name=location_id]").val(p.location_id);r=p.location_id}if(typeof(p.name)=="undefined"){NLN_text=o.lat+";"+o.lon}else{NLN_text=p.name}SN.U.NoticeGeoStatus(NLN_text,o.lat,o.lon,p.url);$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",NoticeDataGeo_text.ShareDisable+" ("+NLN_text+")");a.find("[name=lat]").val(o.lat);a.find("[name=lon]").val(o.lon);a.find("[name=location_ns]").val(q);a.find("[name=location_id]").val(r);a.find("[name=notice_data-geo]").attr("checked",true);var s={NLat:o.lat,NLon:o.lon,NLNS:q,NLID:r,NLN:NLN_text,NLNU:p.url,NDG:true};$.cookie(SN.C.S.NoticeDataGeoCookie,JSON.stringify(s),{path:"/"})})}if(c.length>0){if($.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){c.attr("checked",false)}else{c.attr("checked",true)}var h=a.find(".notice_data-geo_wrap");var i=h.attr("title");h.removeAttr("title");j.attr("title",j.text());c.change(function(){if(c.attr("checked")===true||$.cookie(SN.C.S.NoticeDataGeoCookie)===null){j.attr("title",NoticeDataGeo_text.ShareDisable).addClass("checked");if($.cookie(SN.C.S.NoticeDataGeoCookie)===null||$.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){if(navigator.geolocation){SN.U.NoticeGeoStatus("Requesting location from browser...");navigator.geolocation.getCurrentPosition(function(p){a.find("[name=lat]").val(p.coords.latitude);a.find("[name=lon]").val(p.coords.longitude);var q={lat:p.coords.latitude,lon:p.coords.longitude,token:$("#token").val()};m(i,q)},function(p){switch(p.code){case p.PERMISSION_DENIED:f("Location permission denied.");break;case p.TIMEOUT:f("Location lookup timeout.");break}},{timeout:10000})}else{if(e.length>0&&k.length>0){var n={lat:e,lon:k,token:$("#token").val()};m(i,n)}else{f();c.remove();j.remove()}}}else{var o=JSON.parse($.cookie(SN.C.S.NoticeDataGeoCookie));a.find("[name=lat]").val(o.NLat);a.find("[name=lon]").val(o.NLon);a.find("[name=location_ns]").val(o.NLNS);a.find("[name=location_id]").val(o.NLID);a.find("[name=notice_data-geo]").attr("checked",o.NDG);SN.U.NoticeGeoStatus(o.NLN,o.NLat,o.NLon,o.NLNU);j.attr("title",NoticeDataGeo_text.ShareDisable+" ("+o.NLN+")").addClass("checked")}}else{f()}}).change()}},NoticeGeoStatus:function(a,f,g,c){var e=$("#form_notice");var h=e.find(".geo_status_wrapper");if(h.length==0){h=$('<div class="'+SN.C.S.Success+' geo_status_wrapper"><button class="close" style="float:right">&#215;</button><div class="geo_status"></div></div>');h.find("button.close").click(function(){$("#"+SN.C.S.NoticeDataGeo).removeAttr("checked").change()});e.append(h)}var b;if(c){b=$("<a></a>").attr("href",c)}else{b=$("<span></span>")}b.text(a);if(f||g){var d=f+";"+g;b.attr("title",d);if(!a){b.text(d)}}h.find(".geo_status").empty().append(b)},NewDirectMessage:function(){NDM=$(".entity_send-a-message a");NDM.attr({href:NDM.attr("href")+"&ajax=1"});NDM.bind("click",function(){var a=$(".entity_send-a-message form");if(a.length===0){$(this).addClass(SN.C.S.Processing);$.get(NDM.attr("href"),null,function(b){$(".entity_send-a-message").append(document._importNode($("form",b)[0],true));a=$(".entity_send-a-message .form_notice");SN.U.FormNoticeXHR(a);SN.U.FormNoticeEnhancements(a);a.append('<button class="close">&#215;</button>');$(".entity_send-a-message button").click(function(){a.hide();return false});NDM.removeClass(SN.C.S.Processing)})}else{a.show();$(".entity_send-a-message textarea").focus()}return false})},GetFullYear:function(c,d,a){var b=new Date();b.setFullYear(c,d,a);return b},StatusNetInstance:{Set:function(b){var a=SN.U.StatusNetInstance.Get();if(a!==null){b=$.extend(a,b)}$.cookie(SN.C.S.StatusNetInstance,JSON.stringify(b),{path:"/",expires:SN.U.GetFullYear(2029,0,1)})},Get:function(){var a=$.cookie(SN.C.S.StatusNetInstance);if(a!==null){return JSON.parse(a)}return null},Delete:function(){$.cookie(SN.C.S.StatusNetInstance,null)}},belongsOnTimeline:function(b){var a=$("body").attr("id");if(a=="public"){return true}var c=$("#nav_profile a").attr("href");if(c){var d=$(b).find(".entry-title .author a.url").attr("href");if(d==c){if(a=="all"||a=="showstream"){return true}}}return false}},Init:{NoticeForm:function(){if($("body.user_in").length>0){$("."+SN.C.S.FormNotice).each(function(){var a=$(this);SN.U.NoticeLocationAttach(a);SN.U.FormNoticeXHR(a);SN.U.FormNoticeEnhancements(a);SN.U.NoticeDataAttach(a)})}},Notices:function(){if($("body.user_in").length>0){SN.U.NoticeFavor();SN.U.NoticeRepeat();SN.U.NoticeReply();SN.U.NoticeInlineReplySetup()}SN.U.NoticeAttachments()},EntityActions:function(){if($("body.user_in").length>0){$(".form_user_subscribe").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_user_unsubscribe").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_group_join").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_group_leave").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_user_nudge").live("click",function(){SN.U.FormXHR($(this));return false});SN.U.NewDirectMessage()}},Login:function(){if(SN.U.StatusNetInstance.Get()!==null){var a=SN.U.StatusNetInstance.Get().Nickname;if(a!==null){$("#form_login #nickname").val(a)}}$("#form_login").bind("submit",function(){SN.U.StatusNetInstance.Set({Nickname:$("#form_login #nickname").val()});return true})},UploadForms:function(){$("input[type=file]").change(function(d){if(typeof this.files=="object"&&this.files.length>0){var c=0;for(var b=0;b<this.files.length;b++){c+=this.files[b].size}var a=SN.U.maxFileSize($(this.form));if(a>0&&c>a){var e="File too large: maximum upload size is %d bytes.";alert(e.replace("%d",a));$(this).val("");d.preventDefault();return false}}})}}};$(document).ready(function(){SN.Init.UploadForms();if($("."+SN.C.S.FormNotice).length>0){SN.Init.NoticeForm()}if($("#content .notices").length>0){SN.Init.Notices()}if($("#content .entity_actions").length>0){SN.Init.EntityActions()}if($("#form_login").length>0){SN.Init.Login()}});if(!document.ELEMENT_NODE){document.ELEMENT_NODE=1;document.ATTRIBUTE_NODE=2;document.TEXT_NODE=3;document.CDATA_SECTION_NODE=4;document.ENTITY_REFERENCE_NODE=5;document.ENTITY_NODE=6;document.PROCESSING_INSTRUCTION_NODE=7;document.COMMENT_NODE=8;document.DOCUMENT_NODE=9;document.DOCUMENT_TYPE_NODE=10;document.DOCUMENT_FRAGMENT_NODE=11;document.NOTATION_NODE=12}document._importNode=function(e,a){switch(e.nodeType){case document.ELEMENT_NODE:var d=document.createElement(e.nodeName);if(e.attributes&&e.attributes.length>0){for(var c=0,b=e.attributes.length;c<b;){if(e.attributes[c].nodeName=="class"){d.className=e.getAttribute(e.attributes[c++].nodeName)}else{d.setAttribute(e.attributes[c].nodeName,e.getAttribute(e.attributes[c++].nodeName))}}}if(a&&e.childNodes&&e.childNodes.length>0){for(var c=0,b=e.childNodes.length;c<b;){d.appendChild(document._importNode(e.childNodes[c++],a))}}return d;break;case document.TEXT_NODE:case document.CDATA_SECTION_NODE:case document.COMMENT_NODE:return document.createTextNode(e.nodeValue);break}};if(typeof navigator.geolocation=="undefined"||navigator.geolocation.shim){(function(){(function(){if(window.google&&google.gears){return}var c=null;if(typeof GearsFactory!="undefined"){c=new GearsFactory()}else{try{c=new ActiveXObject("Gears.Factory");if(c.getBuildInfo().indexOf("ie_mobile")!=-1){c.privateSetGlobalObject(this)}}catch(d){if((typeof navigator.mimeTypes!="undefined")&&navigator.mimeTypes["application/x-googlegears"]){c=document.createElement("object");c.style.display="none";c.width=0;c.height=0;c.type="application/x-googlegears";document.documentElement.appendChild(c)}}}if(!c){return}if(!window.google){google={}}if(!google.gears){google.gears={factory:c}}})();var a=(function(){var d=google.gears.factory.create("beta.geolocation");var c=function(f,e){return function(g){f(g);e.lastPosition=g}};return{shim:true,type:"Gears",lastPosition:null,getCurrentPosition:function(e,g,h){var f=this;var i=c(e,f);d.getCurrentPosition(i,g,h)},watchPosition:function(e,f,g){d.watchPosition(e,f,g)},clearWatch:function(e){d.clearWatch(e)},getPermission:function(g,e,f){d.getPermission(g,e,f)}}});var b=(function(){var i=false;var e=function(){if(!d()&&!i){i=true;var j=document.createElement("script");j.src=(document.location.protocol=="https:"?"https://":"http://")+"www.google.com/jsapi?callback=_google_loader_apiLoaded";j.type="text/javascript";document.getElementsByTagName("body")[0].appendChild(j)}};var c=[];var h=function(j){c.push(j)};var f=function(){if(d()){while(c.length>0){var j=c.pop();j()}}};window._google_loader_apiLoaded=function(){f()};var d=function(){return(window.google&&google.loader)};var g=function(j){if(d()){return true}h(j);e();return false};e();return{shim:true,type:"ClientLocation",lastPosition:null,getCurrentPosition:function(k,n,o){var m=this;if(!g(function(){m.getCurrentPosition(k,n,o)})){return}if(google.loader.ClientLocation){var l=google.loader.ClientLocation;var j={coords:{latitude:l.latitude,longitude:l.longitude,altitude:null,accuracy:43000,altitudeAccuracy:null,heading:null,speed:null},address:{city:l.address.city,country:l.address.country,country_code:l.address.country_code,region:l.address.region},timestamp:new Date()};k(j);this.lastPosition=j}else{if(n==="function"){n({code:3,message:"Using the Google ClientLocation API and it is not able to calculate a location."})}}},watchPosition:function(j,l,m){this.getCurrentPosition(j,l,m);var k=this;var n=setInterval(function(){k.getCurrentPosition(j,l,m)},10000);return n},clearWatch:function(j){clearInterval(j)},getPermission:function(l,j,k){return true}}});navigator.geolocation=(window.google&&google.gears)?a():b()})()};
\ No newline at end of file
diff --git a/lib/noticeform.php b/lib/noticeform.php
index cd2d2cb979..ae8023275a 100644
--- a/lib/noticeform.php
+++ b/lib/noticeform.php
@@ -206,7 +206,7 @@ class NoticeForm extends Form
                 $this->out->hidden('notice_data-location_id', empty($this->location_id) ? (empty($this->profile->location_id) ? null : $this->profile->location_id) : $this->location_id, 'location_id');
                 $this->out->hidden('notice_data-location_ns', empty($this->location_ns) ? (empty($this->profile->location_ns) ? null : $this->profile->location_ns) : $this->location_ns, 'location_ns');
 
-                $this->out->elementStart('div', array('id' => 'notice_data-geo_wrap',
+                $this->out->elementStart('div', array('class' => 'notice_data-geo_wrap',
                                                       'title' => common_local_url('geocode')));
                 $this->out->checkbox('notice_data-geo', _('Share my location'), true);
                 $this->out->elementEnd('div');
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 3605a448c3..5ab64c6d26 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -664,8 +664,8 @@ float:right;
 font-size:0.8em;
 }
 
-.form_notice #notice_data-geo_wrap label,
-.form_notice #notice_data-geo_wrap input {
+.form_notice .notice_data-geo_wrap label,
+.form_notice .notice_data-geo_wrap input {
 position:absolute;
 top:25px;
 right:4px;
@@ -675,10 +675,10 @@ width:16px;
 height:16px;
 display:block;
 }
-.form_notice #notice_data-geo_wrap input {
+.form_notice .notice_data-geo_wrap input {
 visibility:hidden;
 }
-.form_notice #notice_data-geo_wrap label {
+.form_notice .notice_data-geo_wrap label {
 font-weight:normal;
 font-size:1em;
 margin-bottom:0;
diff --git a/theme/biz/css/base.css b/theme/biz/css/base.css
index a92cc0b5ea..53aca59009 100644
--- a/theme/biz/css/base.css
+++ b/theme/biz/css/base.css
@@ -524,8 +524,8 @@ float:right;
 font-size:0.8em;
 }
 
-.form_notice #notice_data-geo_wrap label,
-.form_notice #notice_data-geo_wrap input {
+.form_notice .notice_data-geo_wrap label,
+.form_notice .notice_data-geo_wrap input {
 position:absolute;
 top:25px;
 right:4px;
@@ -535,10 +535,10 @@ width:16px;
 height:16px;
 display:block;
 }
-.form_notice #notice_data-geo_wrap input {
+.form_notice .notice_data-geo_wrap input {
 visibility:hidden;
 }
-.form_notice #notice_data-geo_wrap label {
+.form_notice .notice_data-geo_wrap label {
 font-weight:normal;
 font-size:1em;
 margin-bottom:0;
diff --git a/theme/clean/css/display.css b/theme/clean/css/display.css
index 36d05d1a55..96a5c02a56 100644
--- a/theme/clean/css/display.css
+++ b/theme/clean/css/display.css
@@ -119,8 +119,8 @@ address {
     top: 27px;
 }
 
-.form_notice #notice_data-geo_wrap label,
-.form_notice #notice_data-geo_wrap input {
+.form_notice .notice_data-geo_wrap label,
+.form_notice .notice_data-geo_wrap input {
     top: 52px;
 }
 
diff --git a/theme/clean/css/ie.css b/theme/clean/css/ie.css
index 7c8054b28c..994c1297d3 100644
--- a/theme/clean/css/ie.css
+++ b/theme/clean/css/ie.css
@@ -69,9 +69,9 @@ line-height:auto;
     background:transparent url(../../rebase/images/icons/icons-01.gif) no-repeat 0 -328px;
 }
 
-.form_notice #notice_data-geo_wrap label {
+.form_notice .notice_data-geo_wrap label {
    background:transparent url(../../rebase/images/icons/icons-01.gif) no-repeat 0 -1780px;
 }
-.form_notice #notice_data-geo_wrap label.checked {
+.form_notice .notice_data-geo_wrap label.checked {
    background:transparent url(../../rebase/images/icons/icons-01.gif) no-repeat 0 -1846px;
 }
diff --git a/theme/cleaner/css/display.css b/theme/cleaner/css/display.css
index 37de39be88..214c821e59 100644
--- a/theme/cleaner/css/display.css
+++ b/theme/cleaner/css/display.css
@@ -167,8 +167,8 @@ address {
     right: 86px;
 }
 
-.form_notice #notice_data-geo_wrap label,
-.form_notice #notice_data-geo_wrap input {
+.form_notice .notice_data-geo_wrap label,
+.form_notice .notice_data-geo_wrap input {
     top: 52px;
     right: 86px;
 }
@@ -599,7 +599,7 @@ padding-right:0;
     top: 3px !important;
 }
 
-.realtime-popup .form_notice #notice_data-geo_wrap label, .realtime-popup .form_notice #notice_data-geo_wrap input {
+.realtime-popup .form_notice .notice_data-geo_wrap label, .realtime-popup .form_notice .notice_data-geo_wrap input {
     right: 8px;
     top: 3px !important;
 }
diff --git a/theme/cleaner/css/ie.css b/theme/cleaner/css/ie.css
index 8d9cf961dd..dbc72b1c22 100644
--- a/theme/cleaner/css/ie.css
+++ b/theme/cleaner/css/ie.css
@@ -73,9 +73,9 @@ line-height:auto;
     background:transparent url(../../rebase/images/icons/icons-01.gif) no-repeat 0 -328px;
 }
 
-.form_notice #notice_data-geo_wrap label {
+.form_notice .notice_data-geo_wrap label {
    background:transparent url(../../rebase/images/icons/icons-01.gif) no-repeat 0 -1780px;
 }
-.form_notice #notice_data-geo_wrap label.checked {
+.form_notice .notice_data-geo_wrap label.checked {
    background:transparent url(../../rebase/images/icons/icons-01.gif) no-repeat 0 -1846px;
 }
diff --git a/theme/cloudy/css/display.css b/theme/cloudy/css/display.css
index 6347bab547..ab23896b2d 100644
--- a/theme/cloudy/css/display.css
+++ b/theme/cloudy/css/display.css
@@ -570,7 +570,7 @@ font-size:0.8em;
 float:left;
 }
 
-.form_notice #notice_data-geo_wrap label {
+.form_notice .notice_data-geo_wrap label {
 position:absolute;
 top:25px;
 right:4px;
@@ -580,10 +580,10 @@ width:16px;
 height:16px;
 display:block;
 }
-.form_notice #notice_data-geo_wrap input {
+.form_notice .notice_data-geo_wrap input {
 display:none;
 }
-.form_notice #notice_data-geo_wrap label {
+.form_notice .notice_data-geo_wrap label {
 font-weight:normal;
 font-size:1em;
 margin-bottom:0;
diff --git a/theme/mnml/css/display.css b/theme/mnml/css/display.css
index 7ee72fc4d5..f5b80b0e95 100644
--- a/theme/mnml/css/display.css
+++ b/theme/mnml/css/display.css
@@ -1005,8 +1005,8 @@ float:right;
 font-size:0.8em;
 }
 
-.form_notice #notice_data-geo_wrap label,
-.form_notice #notice_data-geo_wrap input {
+.form_notice .notice_data-geo_wrap label,
+.form_notice .notice_data-geo_wrap input {
 position:absolute;
 top:3.25em;
 right:0.4em;
@@ -1016,10 +1016,10 @@ width:1.6em;
 height:1.6em;
 display:block;
 }
-.form_notice #notice_data-geo_wrap input {
+.form_notice .notice_data-geo_wrap input {
 visibility:hidden;
 }
-.form_notice #notice_data-geo_wrap label {
+.form_notice .notice_data-geo_wrap label {
 font-weight:normal;
 font-size:1em;
 margin-bottom:0;
diff --git a/theme/mnml/css/ie.css b/theme/mnml/css/ie.css
index c5fd2a122d..fed65f8b9a 100644
--- a/theme/mnml/css/ie.css
+++ b/theme/mnml/css/ie.css
@@ -48,11 +48,11 @@ padding:0 4px;
 .form_notice #notice_data-attach {
     filter: alpha(opacity=0);
 }
-.form_notice #notice_data-geo_wrap label {
+.form_notice .notice_data-geo_wrap label {
     background:transparent url(../images/icons/icons-01.png) no-repeat
 0 -1780px;
 }
-.form_notice #notice_data-geo_wrap label.checked {
+.form_notice .notice_data-geo_wrap label.checked {
     background:transparent url(../images/icons/icons-01.png) no-repeat
 0 -1846px;
 }
diff --git a/theme/pigeonthoughts/css/base.css b/theme/pigeonthoughts/css/base.css
index b4c79c4185..59cba446ac 100644
--- a/theme/pigeonthoughts/css/base.css
+++ b/theme/pigeonthoughts/css/base.css
@@ -519,8 +519,8 @@ float:right;
 font-size:0.8em;
 }
 
-.form_notice #notice_data-geo_wrap label,
-.form_notice #notice_data-geo_wrap input {
+.form_notice .notice_data-geo_wrap label,
+.form_notice .notice_data-geo_wrap input {
 position:absolute;
 top:25px;
 right:4px;
@@ -530,10 +530,10 @@ width:16px;
 height:16px;
 display:block;
 }
-.form_notice #notice_data-geo_wrap input {
+.form_notice .notice_data-geo_wrap input {
 visibility:hidden;
 }
-.form_notice #notice_data-geo_wrap label {
+.form_notice .notice_data-geo_wrap label {
 font-weight:normal;
 font-size:1em;
 margin-bottom:0;
diff --git a/theme/rebase/css/display.css b/theme/rebase/css/display.css
index 5fbf5c3ba7..4038ab614a 100644
--- a/theme/rebase/css/display.css
+++ b/theme/rebase/css/display.css
@@ -317,8 +317,8 @@ address .poweredby {
     font-size:0.8em;
 }
 
-.form_notice #notice_data-geo_wrap label,
-.form_notice #notice_data-geo_wrap input {
+.form_notice .notice_data-geo_wrap label,
+.form_notice .notice_data-geo_wrap input {
     position:absolute;
     top: 55px;
     right: 88px;
@@ -329,11 +329,11 @@ address .poweredby {
     display:block;
 }
 
-.form_notice #notice_data-geo_wrap input {
+.form_notice .notice_data-geo_wrap input {
     visibility:hidden;
 }
 
-.form_notice #notice_data-geo_wrap label {
+.form_notice .notice_data-geo_wrap label {
     font-weight:normal;
     font-size:1em;
     margin-bottom:0;
@@ -1728,7 +1728,7 @@ body.realtime-popup {
     right: 70px;
 }
 
-.realtime-popup .form_notice #notice_data-geo_wrap label, .form_notice #notice_data-geo_wrap input {
+.realtime-popup .form_notice .notice_data-geo_wrap label, .form_notice .notice_data-geo_wrap input {
     right: 2px;
 }
 
diff --git a/theme/rebase/css/ie.css b/theme/rebase/css/ie.css
index c8820ab7a6..20e038998b 100644
--- a/theme/rebase/css/ie.css
+++ b/theme/rebase/css/ie.css
@@ -69,11 +69,11 @@ line-height:auto;
     background:transparent url(../images/icons/icons-01.gif) no-repeat 0 -328px;
 }
 
-.form_notice #notice_data-geo_wrap label {
+.form_notice .notice_data-geo_wrap label {
    background:transparent url(../images/icons/icons-01.gif) no-repeat 0 -1780px;
 }
 
-.form_notice #notice_data-geo_wrap label.checked {
+.form_notice .notice_data-geo_wrap label.checked {
    background:transparent url(../images/icons/icons-01.gif) no-repeat 0 -1846px;
 }
 
diff --git a/theme/shiny/css/display.css b/theme/shiny/css/display.css
index 1e8eb3f465..e027153dd7 100644
--- a/theme/shiny/css/display.css
+++ b/theme/shiny/css/display.css
@@ -236,8 +236,8 @@ h6 {font-size: 1em;}
     right: 86px;
 }
 
-.form_notice #notice_data-geo_wrap label,
-.form_notice #notice_data-geo_wrap input {
+.form_notice .notice_data-geo_wrap label,
+.form_notice .notice_data-geo_wrap input {
     top: 50px;
     right: 86px;
 }
diff --git a/theme/shiny/css/ie.css b/theme/shiny/css/ie.css
index da3a317fee..8145073db5 100644
--- a/theme/shiny/css/ie.css
+++ b/theme/shiny/css/ie.css
@@ -71,10 +71,10 @@ line-height:auto;
     background:transparent url(../../rebase/images/icons/icons-01.gif) no-repeat 0 -328px;
 }
 
-.form_notice #notice_data-geo_wrap label {
+.form_notice .notice_data-geo_wrap label {
    background:transparent url(../../rebase/images/icons/icons-01.gif) no-repeat 0 -1780px;
 }
-.form_notice #notice_data-geo_wrap label.checked {
+.form_notice .notice_data-geo_wrap label.checked {
    background:transparent url(../../rebase/images/icons/icons-01.gif) no-repeat 0 -1846px;
 }
 

From 0fb1f10480bc574bca28955ff16e174dff49c7c8 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Fri, 4 Mar 2011 16:41:17 -0500
Subject: [PATCH 393/655] correct length and default value for object_type

---
 db/core.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/db/core.php b/db/core.php
index 62730b853f..16a59462d4 100644
--- a/db/core.php
+++ b/db/core.php
@@ -201,7 +201,7 @@ $schema['notice'] = array(
         'location_id' => array('type' => 'int', 'description' => 'location id if possible'),
         'location_ns' => array('type' => 'int', 'description' => 'namespace for location'),
         'repeat_of' => array('type' => 'int', 'description' => 'notice this is a repeat of'),
-        'object_type' => array('type' => 'varchar', 'length' => 32, 'description' => 'URI representing activity streams object type'),
+        'object_type' => array('type' => 'varchar', 'length' => 255, 'description' => 'URI representing activity streams object type', 'default' => 'http://activitystrea.ms/schema/1.0/note'),
     ),
     'primary key' => array('id'),
     'unique keys' => array(

From b68f8643a2fdfe55fe0cc70c7f03120c4255f625 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Fri, 4 Mar 2011 13:53:41 -0800
Subject: [PATCH 394/655] Kill some more hardcoded ids...

---
 js/util.js     | 15 ++++++++-------
 js/util.min.js |  2 +-
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/js/util.js b/js/util.js
index 7c51eb645a..6d0998aa42 100644
--- a/js/util.js
+++ b/js/util.js
@@ -993,7 +993,7 @@ var SN = { // StatusNet
             }
 
             function getJSONgeocodeURL(geocodeURL, data) {
-                SN.U.NoticeGeoStatus('Looking up place name...');
+                SN.U.NoticeGeoStatus(form, 'Looking up place name...');
                 $.getJSON(geocodeURL, data, function(location) {
                     var lns, lid;
 
@@ -1014,8 +1014,8 @@ var SN = { // StatusNet
                         NLN_text = location.name;
                     }
 
-                    SN.U.NoticeGeoStatus(NLN_text, data.lat, data.lon, location.url);
-                    $('label[for='+SN.C.S.NoticeDataGeo+']')
+                    SN.U.NoticeGeoStatus(form, NLN_text, data.lat, data.lon, location.url);
+                    label
                         .attr('title', NoticeDataGeo_text.ShareDisable + ' (' + NLN_text + ')');
 
                     form.find('[name=lat]').val(data.lat);
@@ -1061,7 +1061,7 @@ var SN = { // StatusNet
 
                         if ($.cookie(SN.C.S.NoticeDataGeoCookie) === null || $.cookie(SN.C.S.NoticeDataGeoCookie) == 'disabled') {
                             if (navigator.geolocation) {
-                                SN.U.NoticeGeoStatus('Requesting location from browser...');
+                                SN.U.NoticeGeoStatus(form, 'Requesting location from browser...');
                                 navigator.geolocation.getCurrentPosition(
                                     function(position) {
                                         form.find('[name=lat]').val(position.coords.latitude);
@@ -1119,7 +1119,7 @@ var SN = { // StatusNet
                             form.find('[name=location_id]').val(cookieValue.NLID);
                             form.find('[name=notice_data-geo]').attr('checked', cookieValue.NDG);
 
-                            SN.U.NoticeGeoStatus(cookieValue.NLN, cookieValue.NLat, cookieValue.NLon, cookieValue.NLNU);
+                            SN.U.NoticeGeoStatus(form, cookieValue.NLN, cookieValue.NLat, cookieValue.NLon, cookieValue.NLNU);
                             label
                                 .attr('title', NoticeDataGeo_text.ShareDisable + ' (' + cookieValue.NLN + ')')
                                 .addClass('checked');
@@ -1135,19 +1135,20 @@ var SN = { // StatusNet
         /**
          * Create or update a geolocation status widget in this notice posting form.
          *
+         * @param {jQuery} form
          * @param {String} status
          * @param {String} lat (optional)
          * @param {String} lon (optional)
          * @param {String} url (optional)
          */
-        NoticeGeoStatus: function(status, lat, lon, url)
+        NoticeGeoStatus: function(form, status, lat, lon, url)
         {
             var form = $('#form_notice');
             var wrapper = form.find('.geo_status_wrapper');
             if (wrapper.length == 0) {
                 wrapper = $('<div class="'+SN.C.S.Success+' geo_status_wrapper"><button class="close" style="float:right">&#215;</button><div class="geo_status"></div></div>');
                 wrapper.find('button.close').click(function() {
-                    $('#'+SN.C.S.NoticeDataGeo).removeAttr('checked').change();
+                    form.find('[name=notice_data-geo]').removeAttr('checked').change();
                 });
                 form.append(wrapper);
             }
diff --git a/js/util.min.js b/js/util.min.js
index 7a2f35454b..bf73c4f54b 100644
--- a/js/util.min.js
+++ b/js/util.min.js
@@ -1 +1 @@
-var SN={C:{I:{CounterBlackout:false,MaxLength:140,PatternUsername:/^[0-9a-zA-Z\-_.]*$/,HTTP20x30x:[200,201,202,203,204,205,206,300,301,302,303,304,305,306,307]},S:{Disabled:"disabled",Warning:"warning",Error:"error",Success:"success",Processing:"processing",CommandResult:"command_result",FormNotice:"form_notice",NoticeDataGeo:"notice_data-geo",NoticeDataGeoCookie:"NoticeDataGeo",NoticeDataGeoSelected:"notice_data-geo_selected",StatusNetInstance:"StatusNetInstance"}},messages:{},msg:function(a){if(typeof SN.messages[a]=="undefined"){return"["+a+"]"}else{return SN.messages[a]}},U:{FormNoticeEnhancements:function(b){if(jQuery.data(b[0],"ElementData")===undefined){MaxLength=b.find(".count").text();if(typeof(MaxLength)=="undefined"){MaxLength=SN.C.I.MaxLength}jQuery.data(b[0],"ElementData",{MaxLength:MaxLength});SN.U.Counter(b);NDT=b.find("[name=status_textarea]");NDT.bind("keyup",function(c){SN.U.Counter(b)});var a=function(c){window.setTimeout(function(){SN.U.Counter(b)},50)};NDT.bind("cut",a).bind("paste",a)}else{b.find(".count").text(jQuery.data(b[0],"ElementData").MaxLength)}},Counter:function(d){SN.C.I.FormNoticeCurrent=d;var b=jQuery.data(d[0],"ElementData").MaxLength;if(b<=0){return}var c=b-SN.U.CharacterCount(d);var a=d.find(".count");if(c.toString()!=a.text()){if(!SN.C.I.CounterBlackout||c===0){if(a.text()!=String(c)){a.text(c)}if(c<0){d.addClass(SN.C.S.Warning)}else{d.removeClass(SN.C.S.Warning)}if(!SN.C.I.CounterBlackout){SN.C.I.CounterBlackout=true;SN.C.I.FormNoticeCurrent=d;window.setTimeout("SN.U.ClearCounterBlackout(SN.C.I.FormNoticeCurrent);",500)}}}},CharacterCount:function(a){return a.find("[name=status_textarea]").val().length},ClearCounterBlackout:function(a){SN.C.I.CounterBlackout=false;SN.U.Counter(a)},RewriteAjaxAction:function(a){if(document.location.protocol=="https:"&&a.substr(0,5)=="http:"){return a.replace(/^http:\/\/[^:\/]+/,"https://"+document.location.host)}else{return a}},FormXHR:function(a){$.ajax({type:"POST",dataType:"xml",url:SN.U.RewriteAjaxAction(a.attr("action")),data:a.serialize()+"&ajax=1",beforeSend:function(b){a.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(c,d,b){alert(b||d)},success:function(b,c){if(typeof($("form",b)[0])!="undefined"){form_new=document._importNode($("form",b)[0],true);a.replaceWith(form_new)}else{a.replaceWith(document._importNode($("p",b)[0],true))}}})},FormNoticeXHR:function(b){SN.C.I.NoticeDataGeo={};b.append('<input type="hidden" name="ajax" value="1"/>');b.attr("action",SN.U.RewriteAjaxAction(b.attr("action")));var c=function(d,e){b.append($('<p class="form_response"></p>').addClass(d).text(e))};var a=function(){b.find(".form_response").remove()};b.ajaxForm({dataType:"xml",timeout:"60000",beforeSend:function(d){if(b.find("[name=status_textarea]").val()==""){b.addClass(SN.C.S.Warning);return false}b.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled);SN.U.normalizeGeoData(b);return true},error:function(f,g,e){b.removeClass(SN.C.S.Processing).find(".submit").removeClass(SN.C.S.Disabled).removeAttr(SN.C.S.Disabled,SN.C.S.Disabled);a();if(g=="timeout"){c("error","Sorry! We had trouble sending your notice. The servers are overloaded. Please try again, and contact the site administrator if this problem persists.")}else{var d=SN.U.GetResponseXML(f);if($("."+SN.C.S.Error,d).length>0){b.append(document._importNode($("."+SN.C.S.Error,d)[0],true))}else{if(parseInt(f.status)===0||jQuery.inArray(parseInt(f.status),SN.C.I.HTTP20x30x)>=0){b.resetForm().find(".attach-status").remove();SN.U.FormNoticeEnhancements(b)}else{c("error","(Sorry! We had trouble sending your notice ("+f.status+" "+f.statusText+"). Please report the problem to the site administrator if this happens again.")}}}},success:function(i,k){a();var e=$("#"+SN.C.S.Error,i);if(e.length>0){c("error",e.text())}else{if($("body")[0].id=="bookmarklet"){self.close()}var d=$("#"+SN.C.S.CommandResult,i);if(d.length>0){c("success",d.text())}else{var h=document._importNode($("li",i)[0],true);var j=$("#notices_primary .notices:first");if(j.length>0&&SN.U.belongsOnTimeline(h)){if($("#"+h.id).length===0){var f=b.find("[name=inreplyto]").val();var g="#notices_primary #notice-"+f;if($("body")[0].id=="conversation"){if(f.length>0&&$(g+" .notices").length<1){$(g).append('<ul class="notices"></ul>')}$($(g+" .notices")[0]).append(h)}else{j.prepend(h)}$("#"+h.id).css({display:"none"}).fadeIn(2500);SN.U.NoticeWithAttachment($("#"+h.id));SN.U.NoticeReplyTo($("#"+h.id))}}else{c("success",$("title",i).text())}}b.resetForm();b.find("[name=inreplyto]").val("");b.find(".attach-status").remove();SN.U.FormNoticeEnhancements(b)}},complete:function(d,e){b.removeClass(SN.C.S.Processing).find(".submit").removeAttr(SN.C.S.Disabled).removeClass(SN.C.S.Disabled);b.find("[name=lat]").val(SN.C.I.NoticeDataGeo.NLat);b.find("[name=lon]").val(SN.C.I.NoticeDataGeo.NLon);b.find("[name=location_ns]").val(SN.C.I.NoticeDataGeo.NLNS);b.find("[name=location_id]").val(SN.C.I.NoticeDataGeo.NLID);b.find("[name=notice_data-geo]").attr("checked",SN.C.I.NoticeDataGeo.NDG)}})},normalizeGeoData:function(a){SN.C.I.NoticeDataGeo.NLat=a.find("[name=lat]").val();SN.C.I.NoticeDataGeo.NLon=a.find("[name=lon]").val();SN.C.I.NoticeDataGeo.NLNS=a.find("[name=location_ns]").val();SN.C.I.NoticeDataGeo.NLID=a.find("[name=location_id]").val();SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked");var b=$.cookie(SN.C.S.NoticeDataGeoCookie);if(b!==null&&b!="disabled"){b=JSON.parse(b);SN.C.I.NoticeDataGeo.NLat=a.find("[name=lat]").val(b.NLat).val();SN.C.I.NoticeDataGeo.NLon=a.find("[name=lon]").val(b.NLon).val();if(b.NLNS){SN.C.I.NoticeDataGeo.NLNS=a.find("[name=location_ns]").val(b.NLNS).val();SN.C.I.NoticeDataGeo.NLID=a.find("[name=location_id]").val(b.NLID).val()}else{a.find("[name=location_ns]").val("");a.find("[name=location_id]").val("")}}if(b=="disabled"){SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked",false).attr("checked")}else{SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked",true).attr("checked")}},GetResponseXML:function(b){try{return b.responseXML}catch(a){return(new DOMParser()).parseFromString(b.responseText,"text/xml")}},NoticeReply:function(){if($("#content .notice_reply").length>0){$("#content .notice").each(function(){SN.U.NoticeReplyTo($(this))})}},NoticeReplyTo:function(a){a.find(".notice_reply").live("click",function(c){c.preventDefault();var b=($(".author .nickname",a).length>0)?$($(".author .nickname",a)[0]):$(".author .nickname.uid");SN.U.NoticeInlineReplyTrigger(a,"@"+b.text());return false})},NoticeInlineReplyTrigger:function(h,i){var c=$($(".notice_id",h)[0]).text();var d=h;var f=h.closest(".notices");if(f.hasClass("threaded-replies")){d=f.closest(".notice")}else{f=$("ul.threaded-replies",h);if(f.length==0){f=$('<ul class="notices threaded-replies xoxo"></ul>');h.append(f)}}var k=$(".notice-reply-form",f);if(k.length==0){$("li.notice-reply-placeholder").remove();var g=$("li.notice-reply",f);if(g.length==0){g=$('<li class="notice-reply"><form class="notice-reply-form" method="post"><textarea name="status_textarea"></textarea><div class="controls"><input type="hidden" name="token"><input type="hidden" name="inreplyto"><input type="submit" class="submit"></div></form></li>');var b=$("#form_notice");k=g.find("form");k.attr("action",b.attr("action"));k.find('input[name="token"]').val(b.find("input[name=token]").val());k.find('input[type="submit"]').val(SN.msg("reply_submit"));f.append(g);k.find("textarea").blur(function(){var m=$(this);var l=$.trim(m.val());if(l==""||l==m.data("initialText")){g.remove();if(f.find("li").length>0){SN.U.NoticeInlineReplyPlaceholder(d)}else{f.remove()}}});k.submit(function(m){var l=k;$.ajax({type:"POST",dataType:"xml",url:SN.U.RewriteAjaxAction(l.attr("action")),data:l.serialize()+"&ajax=1",beforeSend:function(n){l.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled).end().find("textarea").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(o,p,n){alert(n||p)},success:function(p,r){var o=$("li",p)[0];if(o){var n=document._importNode(o,true);var q=$(n).attr("id");if($("#"+q).length==0){g.replaceWith(n);SN.U.NoticeInlineReplyPlaceholder(d)}else{g.remove()}}}});m.preventDefault();return false})}}k.find("input[name=inreplyto]").val(c);var j=k.find("textarea");if(j.length==0){throw"No textarea"}var a="";if(i){a=i+" "}j.val(a+j.val().replace(RegExp(a,"i"),""));j.data("initialText",$.trim(i+""));j.focus();if(j[0].setSelectionRange){var e=j.val().length;j[0].setSelectionRange(e,e)}},NoticeFavor:function(){$(".form_favor").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_disfavor").live("click",function(){SN.U.FormXHR($(this));return false})},NoticeInlineReplyPlaceholder:function(b){var a=b.find("ul.threaded-replies");var c=$('<li class="notice-reply-placeholder"><input class="placeholder"></li>');c.click(function(){SN.U.NoticeInlineReplyTrigger(b)});c.find("input").val(SN.msg("reply_placeholder"));a.append(c)},NoticeInlineReplySetup:function(){$(".threaded-replies").each(function(){var b=$(this);var a=b.closest(".notice");SN.U.NoticeInlineReplyPlaceholder(a)})},NoticeRepeat:function(){$(".form_repeat").live("click",function(a){a.preventDefault();SN.U.NoticeRepeatConfirmation($(this));return false})},NoticeRepeatConfirmation:function(a){var c=a.find(".submit");var b=c.clone();b.addClass("submit_dialogbox").removeClass("submit");a.append(b);b.bind("click",function(){SN.U.FormXHR(a);return false});c.hide();a.addClass("dialogbox").append('<button class="close">&#215;</button>').closest(".notice-options").addClass("opaque");a.find("button.close").click(function(){$(this).remove();a.removeClass("dialogbox").closest(".notice-options").removeClass("opaque");a.find(".submit_dialogbox").remove();a.find(".submit").show();return false})},NoticeAttachments:function(){$(".notice a.attachment").each(function(){SN.U.NoticeWithAttachment($(this).closest(".notice"))})},NoticeWithAttachment:function(b){if(b.find(".attachment").length===0){return}var a=b.find(".attachment.more");if(a.length>0){$(a[0]).click(function(){var c=$(this);c.addClass(SN.C.S.Processing);$.get(c.attr("href")+"/ajax",null,function(d){c.parent(".entry-content").html($(d).find("#attachment_view .entry-content").html())});return false}).attr("title",SN.msg("showmore_tooltip"))}},NoticeDataAttach:function(b){var a=b.find("input[type=file]");a.change(function(f){b.find(".attach-status").remove();var d=$(this).val();if(!d){return false}var c=$('<div class="attach-status '+SN.C.S.Success+'"><code></code> <button class="close">&#215;</button></div>');c.find("code").text(d);c.find("button").click(function(){c.remove();a.val("");return false});b.append(c);if(typeof this.files=="object"){for(var e=0;e<this.files.length;e++){SN.U.PreviewAttach(b,this.files[e])}}})},maxFileSize:function(b){var a=$(b).find("input[name=MAX_FILE_SIZE]").attr("value");if(a){return parseInt(a)}else{return 0}},PreviewAttach:function(d,c){var e=c.type+" "+Math.round(c.size/1024)+"KB";var f=true;var h;if(typeof window.createObjectURL!="undefined"){h=function(i,j){j(window.createObjectURL(i))}}else{if(typeof window.FileReader!="undefined"){h=function(j,k){var i=new FileReader();i.onload=function(l){k(i.result)};i.readAsDataURL(j)}}else{f=false}}var a=["image/png","image/jpeg","image/gif","image/svg+xml"];if($.inArray(c.type,a)==-1){f=false}var g=8*1024*1024;if(c.size>g){f=false}if(f){h(c,function(j){var i=$("<img>").attr("title",e).attr("alt",e).attr("src",j).attr("style","height: 120px");d.find(".attach-status").append(i)})}else{var b=$("<div></div>").text(e);d.find(".attach-status").append(b)}},NoticeLocationAttach:function(a){var e=a.find("[name=lat]");var k=a.find("[name=lon]");var g=a.find("[name=location_ns]").val();var l=a.find("[name=location_id]").val();var b="";var d=a.find("[name=notice_data-geo]");var c=a.find("[name=notice_data-geo]");var j=$("label[for="+c.attr("id")+"]");function f(n){j.attr("title",jQuery.trim(j.text())).removeClass("checked");a.find("[name=lat]").val("");a.find("[name=lon]").val("");a.find("[name=location_ns]").val("");a.find("[name=location_id]").val("");a.find("[name=notice_data-geo]").attr("checked",false);$.cookie(SN.C.S.NoticeDataGeoCookie,"disabled",{path:"/"});if(n){a.find(".geo_status_wrapper").removeClass("success").addClass("error");a.find(".geo_status_wrapper .geo_status").text(n)}else{a.find(".geo_status_wrapper").remove()}}function m(n,o){SN.U.NoticeGeoStatus("Looking up place name...");$.getJSON(n,o,function(p){var q,r;if(typeof(p.location_ns)!="undefined"){a.find("[name=location_ns]").val(p.location_ns);q=p.location_ns}if(typeof(p.location_id)!="undefined"){a.find("[name=location_id]").val(p.location_id);r=p.location_id}if(typeof(p.name)=="undefined"){NLN_text=o.lat+";"+o.lon}else{NLN_text=p.name}SN.U.NoticeGeoStatus(NLN_text,o.lat,o.lon,p.url);$("label[for="+SN.C.S.NoticeDataGeo+"]").attr("title",NoticeDataGeo_text.ShareDisable+" ("+NLN_text+")");a.find("[name=lat]").val(o.lat);a.find("[name=lon]").val(o.lon);a.find("[name=location_ns]").val(q);a.find("[name=location_id]").val(r);a.find("[name=notice_data-geo]").attr("checked",true);var s={NLat:o.lat,NLon:o.lon,NLNS:q,NLID:r,NLN:NLN_text,NLNU:p.url,NDG:true};$.cookie(SN.C.S.NoticeDataGeoCookie,JSON.stringify(s),{path:"/"})})}if(c.length>0){if($.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){c.attr("checked",false)}else{c.attr("checked",true)}var h=a.find(".notice_data-geo_wrap");var i=h.attr("title");h.removeAttr("title");j.attr("title",j.text());c.change(function(){if(c.attr("checked")===true||$.cookie(SN.C.S.NoticeDataGeoCookie)===null){j.attr("title",NoticeDataGeo_text.ShareDisable).addClass("checked");if($.cookie(SN.C.S.NoticeDataGeoCookie)===null||$.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){if(navigator.geolocation){SN.U.NoticeGeoStatus("Requesting location from browser...");navigator.geolocation.getCurrentPosition(function(p){a.find("[name=lat]").val(p.coords.latitude);a.find("[name=lon]").val(p.coords.longitude);var q={lat:p.coords.latitude,lon:p.coords.longitude,token:$("#token").val()};m(i,q)},function(p){switch(p.code){case p.PERMISSION_DENIED:f("Location permission denied.");break;case p.TIMEOUT:f("Location lookup timeout.");break}},{timeout:10000})}else{if(e.length>0&&k.length>0){var n={lat:e,lon:k,token:$("#token").val()};m(i,n)}else{f();c.remove();j.remove()}}}else{var o=JSON.parse($.cookie(SN.C.S.NoticeDataGeoCookie));a.find("[name=lat]").val(o.NLat);a.find("[name=lon]").val(o.NLon);a.find("[name=location_ns]").val(o.NLNS);a.find("[name=location_id]").val(o.NLID);a.find("[name=notice_data-geo]").attr("checked",o.NDG);SN.U.NoticeGeoStatus(o.NLN,o.NLat,o.NLon,o.NLNU);j.attr("title",NoticeDataGeo_text.ShareDisable+" ("+o.NLN+")").addClass("checked")}}else{f()}}).change()}},NoticeGeoStatus:function(a,f,g,c){var e=$("#form_notice");var h=e.find(".geo_status_wrapper");if(h.length==0){h=$('<div class="'+SN.C.S.Success+' geo_status_wrapper"><button class="close" style="float:right">&#215;</button><div class="geo_status"></div></div>');h.find("button.close").click(function(){$("#"+SN.C.S.NoticeDataGeo).removeAttr("checked").change()});e.append(h)}var b;if(c){b=$("<a></a>").attr("href",c)}else{b=$("<span></span>")}b.text(a);if(f||g){var d=f+";"+g;b.attr("title",d);if(!a){b.text(d)}}h.find(".geo_status").empty().append(b)},NewDirectMessage:function(){NDM=$(".entity_send-a-message a");NDM.attr({href:NDM.attr("href")+"&ajax=1"});NDM.bind("click",function(){var a=$(".entity_send-a-message form");if(a.length===0){$(this).addClass(SN.C.S.Processing);$.get(NDM.attr("href"),null,function(b){$(".entity_send-a-message").append(document._importNode($("form",b)[0],true));a=$(".entity_send-a-message .form_notice");SN.U.FormNoticeXHR(a);SN.U.FormNoticeEnhancements(a);a.append('<button class="close">&#215;</button>');$(".entity_send-a-message button").click(function(){a.hide();return false});NDM.removeClass(SN.C.S.Processing)})}else{a.show();$(".entity_send-a-message textarea").focus()}return false})},GetFullYear:function(c,d,a){var b=new Date();b.setFullYear(c,d,a);return b},StatusNetInstance:{Set:function(b){var a=SN.U.StatusNetInstance.Get();if(a!==null){b=$.extend(a,b)}$.cookie(SN.C.S.StatusNetInstance,JSON.stringify(b),{path:"/",expires:SN.U.GetFullYear(2029,0,1)})},Get:function(){var a=$.cookie(SN.C.S.StatusNetInstance);if(a!==null){return JSON.parse(a)}return null},Delete:function(){$.cookie(SN.C.S.StatusNetInstance,null)}},belongsOnTimeline:function(b){var a=$("body").attr("id");if(a=="public"){return true}var c=$("#nav_profile a").attr("href");if(c){var d=$(b).find(".entry-title .author a.url").attr("href");if(d==c){if(a=="all"||a=="showstream"){return true}}}return false}},Init:{NoticeForm:function(){if($("body.user_in").length>0){$("."+SN.C.S.FormNotice).each(function(){var a=$(this);SN.U.NoticeLocationAttach(a);SN.U.FormNoticeXHR(a);SN.U.FormNoticeEnhancements(a);SN.U.NoticeDataAttach(a)})}},Notices:function(){if($("body.user_in").length>0){SN.U.NoticeFavor();SN.U.NoticeRepeat();SN.U.NoticeReply();SN.U.NoticeInlineReplySetup()}SN.U.NoticeAttachments()},EntityActions:function(){if($("body.user_in").length>0){$(".form_user_subscribe").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_user_unsubscribe").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_group_join").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_group_leave").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_user_nudge").live("click",function(){SN.U.FormXHR($(this));return false});SN.U.NewDirectMessage()}},Login:function(){if(SN.U.StatusNetInstance.Get()!==null){var a=SN.U.StatusNetInstance.Get().Nickname;if(a!==null){$("#form_login #nickname").val(a)}}$("#form_login").bind("submit",function(){SN.U.StatusNetInstance.Set({Nickname:$("#form_login #nickname").val()});return true})},UploadForms:function(){$("input[type=file]").change(function(d){if(typeof this.files=="object"&&this.files.length>0){var c=0;for(var b=0;b<this.files.length;b++){c+=this.files[b].size}var a=SN.U.maxFileSize($(this.form));if(a>0&&c>a){var e="File too large: maximum upload size is %d bytes.";alert(e.replace("%d",a));$(this).val("");d.preventDefault();return false}}})}}};$(document).ready(function(){SN.Init.UploadForms();if($("."+SN.C.S.FormNotice).length>0){SN.Init.NoticeForm()}if($("#content .notices").length>0){SN.Init.Notices()}if($("#content .entity_actions").length>0){SN.Init.EntityActions()}if($("#form_login").length>0){SN.Init.Login()}});if(!document.ELEMENT_NODE){document.ELEMENT_NODE=1;document.ATTRIBUTE_NODE=2;document.TEXT_NODE=3;document.CDATA_SECTION_NODE=4;document.ENTITY_REFERENCE_NODE=5;document.ENTITY_NODE=6;document.PROCESSING_INSTRUCTION_NODE=7;document.COMMENT_NODE=8;document.DOCUMENT_NODE=9;document.DOCUMENT_TYPE_NODE=10;document.DOCUMENT_FRAGMENT_NODE=11;document.NOTATION_NODE=12}document._importNode=function(e,a){switch(e.nodeType){case document.ELEMENT_NODE:var d=document.createElement(e.nodeName);if(e.attributes&&e.attributes.length>0){for(var c=0,b=e.attributes.length;c<b;){if(e.attributes[c].nodeName=="class"){d.className=e.getAttribute(e.attributes[c++].nodeName)}else{d.setAttribute(e.attributes[c].nodeName,e.getAttribute(e.attributes[c++].nodeName))}}}if(a&&e.childNodes&&e.childNodes.length>0){for(var c=0,b=e.childNodes.length;c<b;){d.appendChild(document._importNode(e.childNodes[c++],a))}}return d;break;case document.TEXT_NODE:case document.CDATA_SECTION_NODE:case document.COMMENT_NODE:return document.createTextNode(e.nodeValue);break}};if(typeof navigator.geolocation=="undefined"||navigator.geolocation.shim){(function(){(function(){if(window.google&&google.gears){return}var c=null;if(typeof GearsFactory!="undefined"){c=new GearsFactory()}else{try{c=new ActiveXObject("Gears.Factory");if(c.getBuildInfo().indexOf("ie_mobile")!=-1){c.privateSetGlobalObject(this)}}catch(d){if((typeof navigator.mimeTypes!="undefined")&&navigator.mimeTypes["application/x-googlegears"]){c=document.createElement("object");c.style.display="none";c.width=0;c.height=0;c.type="application/x-googlegears";document.documentElement.appendChild(c)}}}if(!c){return}if(!window.google){google={}}if(!google.gears){google.gears={factory:c}}})();var a=(function(){var d=google.gears.factory.create("beta.geolocation");var c=function(f,e){return function(g){f(g);e.lastPosition=g}};return{shim:true,type:"Gears",lastPosition:null,getCurrentPosition:function(e,g,h){var f=this;var i=c(e,f);d.getCurrentPosition(i,g,h)},watchPosition:function(e,f,g){d.watchPosition(e,f,g)},clearWatch:function(e){d.clearWatch(e)},getPermission:function(g,e,f){d.getPermission(g,e,f)}}});var b=(function(){var i=false;var e=function(){if(!d()&&!i){i=true;var j=document.createElement("script");j.src=(document.location.protocol=="https:"?"https://":"http://")+"www.google.com/jsapi?callback=_google_loader_apiLoaded";j.type="text/javascript";document.getElementsByTagName("body")[0].appendChild(j)}};var c=[];var h=function(j){c.push(j)};var f=function(){if(d()){while(c.length>0){var j=c.pop();j()}}};window._google_loader_apiLoaded=function(){f()};var d=function(){return(window.google&&google.loader)};var g=function(j){if(d()){return true}h(j);e();return false};e();return{shim:true,type:"ClientLocation",lastPosition:null,getCurrentPosition:function(k,n,o){var m=this;if(!g(function(){m.getCurrentPosition(k,n,o)})){return}if(google.loader.ClientLocation){var l=google.loader.ClientLocation;var j={coords:{latitude:l.latitude,longitude:l.longitude,altitude:null,accuracy:43000,altitudeAccuracy:null,heading:null,speed:null},address:{city:l.address.city,country:l.address.country,country_code:l.address.country_code,region:l.address.region},timestamp:new Date()};k(j);this.lastPosition=j}else{if(n==="function"){n({code:3,message:"Using the Google ClientLocation API and it is not able to calculate a location."})}}},watchPosition:function(j,l,m){this.getCurrentPosition(j,l,m);var k=this;var n=setInterval(function(){k.getCurrentPosition(j,l,m)},10000);return n},clearWatch:function(j){clearInterval(j)},getPermission:function(l,j,k){return true}}});navigator.geolocation=(window.google&&google.gears)?a():b()})()};
\ No newline at end of file
+var SN={C:{I:{CounterBlackout:false,MaxLength:140,PatternUsername:/^[0-9a-zA-Z\-_.]*$/,HTTP20x30x:[200,201,202,203,204,205,206,300,301,302,303,304,305,306,307]},S:{Disabled:"disabled",Warning:"warning",Error:"error",Success:"success",Processing:"processing",CommandResult:"command_result",FormNotice:"form_notice",NoticeDataGeo:"notice_data-geo",NoticeDataGeoCookie:"NoticeDataGeo",NoticeDataGeoSelected:"notice_data-geo_selected",StatusNetInstance:"StatusNetInstance"}},messages:{},msg:function(a){if(typeof SN.messages[a]=="undefined"){return"["+a+"]"}else{return SN.messages[a]}},U:{FormNoticeEnhancements:function(b){if(jQuery.data(b[0],"ElementData")===undefined){MaxLength=b.find(".count").text();if(typeof(MaxLength)=="undefined"){MaxLength=SN.C.I.MaxLength}jQuery.data(b[0],"ElementData",{MaxLength:MaxLength});SN.U.Counter(b);NDT=b.find("[name=status_textarea]");NDT.bind("keyup",function(c){SN.U.Counter(b)});var a=function(c){window.setTimeout(function(){SN.U.Counter(b)},50)};NDT.bind("cut",a).bind("paste",a)}else{b.find(".count").text(jQuery.data(b[0],"ElementData").MaxLength)}},Counter:function(d){SN.C.I.FormNoticeCurrent=d;var b=jQuery.data(d[0],"ElementData").MaxLength;if(b<=0){return}var c=b-SN.U.CharacterCount(d);var a=d.find(".count");if(c.toString()!=a.text()){if(!SN.C.I.CounterBlackout||c===0){if(a.text()!=String(c)){a.text(c)}if(c<0){d.addClass(SN.C.S.Warning)}else{d.removeClass(SN.C.S.Warning)}if(!SN.C.I.CounterBlackout){SN.C.I.CounterBlackout=true;SN.C.I.FormNoticeCurrent=d;window.setTimeout("SN.U.ClearCounterBlackout(SN.C.I.FormNoticeCurrent);",500)}}}},CharacterCount:function(a){return a.find("[name=status_textarea]").val().length},ClearCounterBlackout:function(a){SN.C.I.CounterBlackout=false;SN.U.Counter(a)},RewriteAjaxAction:function(a){if(document.location.protocol=="https:"&&a.substr(0,5)=="http:"){return a.replace(/^http:\/\/[^:\/]+/,"https://"+document.location.host)}else{return a}},FormXHR:function(a){$.ajax({type:"POST",dataType:"xml",url:SN.U.RewriteAjaxAction(a.attr("action")),data:a.serialize()+"&ajax=1",beforeSend:function(b){a.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(c,d,b){alert(b||d)},success:function(b,c){if(typeof($("form",b)[0])!="undefined"){form_new=document._importNode($("form",b)[0],true);a.replaceWith(form_new)}else{a.replaceWith(document._importNode($("p",b)[0],true))}}})},FormNoticeXHR:function(b){SN.C.I.NoticeDataGeo={};b.append('<input type="hidden" name="ajax" value="1"/>');b.attr("action",SN.U.RewriteAjaxAction(b.attr("action")));var c=function(d,e){b.append($('<p class="form_response"></p>').addClass(d).text(e))};var a=function(){b.find(".form_response").remove()};b.ajaxForm({dataType:"xml",timeout:"60000",beforeSend:function(d){if(b.find("[name=status_textarea]").val()==""){b.addClass(SN.C.S.Warning);return false}b.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled);SN.U.normalizeGeoData(b);return true},error:function(f,g,e){b.removeClass(SN.C.S.Processing).find(".submit").removeClass(SN.C.S.Disabled).removeAttr(SN.C.S.Disabled,SN.C.S.Disabled);a();if(g=="timeout"){c("error","Sorry! We had trouble sending your notice. The servers are overloaded. Please try again, and contact the site administrator if this problem persists.")}else{var d=SN.U.GetResponseXML(f);if($("."+SN.C.S.Error,d).length>0){b.append(document._importNode($("."+SN.C.S.Error,d)[0],true))}else{if(parseInt(f.status)===0||jQuery.inArray(parseInt(f.status),SN.C.I.HTTP20x30x)>=0){b.resetForm().find(".attach-status").remove();SN.U.FormNoticeEnhancements(b)}else{c("error","(Sorry! We had trouble sending your notice ("+f.status+" "+f.statusText+"). Please report the problem to the site administrator if this happens again.")}}}},success:function(i,k){a();var e=$("#"+SN.C.S.Error,i);if(e.length>0){c("error",e.text())}else{if($("body")[0].id=="bookmarklet"){self.close()}var d=$("#"+SN.C.S.CommandResult,i);if(d.length>0){c("success",d.text())}else{var h=document._importNode($("li",i)[0],true);var j=$("#notices_primary .notices:first");if(j.length>0&&SN.U.belongsOnTimeline(h)){if($("#"+h.id).length===0){var f=b.find("[name=inreplyto]").val();var g="#notices_primary #notice-"+f;if($("body")[0].id=="conversation"){if(f.length>0&&$(g+" .notices").length<1){$(g).append('<ul class="notices"></ul>')}$($(g+" .notices")[0]).append(h)}else{j.prepend(h)}$("#"+h.id).css({display:"none"}).fadeIn(2500);SN.U.NoticeWithAttachment($("#"+h.id));SN.U.NoticeReplyTo($("#"+h.id))}}else{c("success",$("title",i).text())}}b.resetForm();b.find("[name=inreplyto]").val("");b.find(".attach-status").remove();SN.U.FormNoticeEnhancements(b)}},complete:function(d,e){b.removeClass(SN.C.S.Processing).find(".submit").removeAttr(SN.C.S.Disabled).removeClass(SN.C.S.Disabled);b.find("[name=lat]").val(SN.C.I.NoticeDataGeo.NLat);b.find("[name=lon]").val(SN.C.I.NoticeDataGeo.NLon);b.find("[name=location_ns]").val(SN.C.I.NoticeDataGeo.NLNS);b.find("[name=location_id]").val(SN.C.I.NoticeDataGeo.NLID);b.find("[name=notice_data-geo]").attr("checked",SN.C.I.NoticeDataGeo.NDG)}})},normalizeGeoData:function(a){SN.C.I.NoticeDataGeo.NLat=a.find("[name=lat]").val();SN.C.I.NoticeDataGeo.NLon=a.find("[name=lon]").val();SN.C.I.NoticeDataGeo.NLNS=a.find("[name=location_ns]").val();SN.C.I.NoticeDataGeo.NLID=a.find("[name=location_id]").val();SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked");var b=$.cookie(SN.C.S.NoticeDataGeoCookie);if(b!==null&&b!="disabled"){b=JSON.parse(b);SN.C.I.NoticeDataGeo.NLat=a.find("[name=lat]").val(b.NLat).val();SN.C.I.NoticeDataGeo.NLon=a.find("[name=lon]").val(b.NLon).val();if(b.NLNS){SN.C.I.NoticeDataGeo.NLNS=a.find("[name=location_ns]").val(b.NLNS).val();SN.C.I.NoticeDataGeo.NLID=a.find("[name=location_id]").val(b.NLID).val()}else{a.find("[name=location_ns]").val("");a.find("[name=location_id]").val("")}}if(b=="disabled"){SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked",false).attr("checked")}else{SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked",true).attr("checked")}},GetResponseXML:function(b){try{return b.responseXML}catch(a){return(new DOMParser()).parseFromString(b.responseText,"text/xml")}},NoticeReply:function(){if($("#content .notice_reply").length>0){$("#content .notice").each(function(){SN.U.NoticeReplyTo($(this))})}},NoticeReplyTo:function(a){a.find(".notice_reply").live("click",function(c){c.preventDefault();var b=($(".author .nickname",a).length>0)?$($(".author .nickname",a)[0]):$(".author .nickname.uid");SN.U.NoticeInlineReplyTrigger(a,"@"+b.text());return false})},NoticeInlineReplyTrigger:function(h,i){var c=$($(".notice_id",h)[0]).text();var d=h;var f=h.closest(".notices");if(f.hasClass("threaded-replies")){d=f.closest(".notice")}else{f=$("ul.threaded-replies",h);if(f.length==0){f=$('<ul class="notices threaded-replies xoxo"></ul>');h.append(f)}}var k=$(".notice-reply-form",f);if(k.length==0){$("li.notice-reply-placeholder").remove();var g=$("li.notice-reply",f);if(g.length==0){g=$('<li class="notice-reply"><form class="notice-reply-form" method="post"><textarea name="status_textarea"></textarea><div class="controls"><input type="hidden" name="token"><input type="hidden" name="inreplyto"><input type="submit" class="submit"></div></form></li>');var b=$("#form_notice");k=g.find("form");k.attr("action",b.attr("action"));k.find('input[name="token"]').val(b.find("input[name=token]").val());k.find('input[type="submit"]').val(SN.msg("reply_submit"));f.append(g);k.find("textarea").blur(function(){var m=$(this);var l=$.trim(m.val());if(l==""||l==m.data("initialText")){g.remove();if(f.find("li").length>0){SN.U.NoticeInlineReplyPlaceholder(d)}else{f.remove()}}});k.submit(function(m){var l=k;$.ajax({type:"POST",dataType:"xml",url:SN.U.RewriteAjaxAction(l.attr("action")),data:l.serialize()+"&ajax=1",beforeSend:function(n){l.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled).end().find("textarea").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(o,p,n){alert(n||p)},success:function(p,r){var o=$("li",p)[0];if(o){var n=document._importNode(o,true);var q=$(n).attr("id");if($("#"+q).length==0){g.replaceWith(n);SN.U.NoticeInlineReplyPlaceholder(d)}else{g.remove()}}}});m.preventDefault();return false})}}k.find("input[name=inreplyto]").val(c);var j=k.find("textarea");if(j.length==0){throw"No textarea"}var a="";if(i){a=i+" "}j.val(a+j.val().replace(RegExp(a,"i"),""));j.data("initialText",$.trim(i+""));j.focus();if(j[0].setSelectionRange){var e=j.val().length;j[0].setSelectionRange(e,e)}},NoticeFavor:function(){$(".form_favor").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_disfavor").live("click",function(){SN.U.FormXHR($(this));return false})},NoticeInlineReplyPlaceholder:function(b){var a=b.find("ul.threaded-replies");var c=$('<li class="notice-reply-placeholder"><input class="placeholder"></li>');c.click(function(){SN.U.NoticeInlineReplyTrigger(b)});c.find("input").val(SN.msg("reply_placeholder"));a.append(c)},NoticeInlineReplySetup:function(){$(".threaded-replies").each(function(){var b=$(this);var a=b.closest(".notice");SN.U.NoticeInlineReplyPlaceholder(a)})},NoticeRepeat:function(){$(".form_repeat").live("click",function(a){a.preventDefault();SN.U.NoticeRepeatConfirmation($(this));return false})},NoticeRepeatConfirmation:function(a){var c=a.find(".submit");var b=c.clone();b.addClass("submit_dialogbox").removeClass("submit");a.append(b);b.bind("click",function(){SN.U.FormXHR(a);return false});c.hide();a.addClass("dialogbox").append('<button class="close">&#215;</button>').closest(".notice-options").addClass("opaque");a.find("button.close").click(function(){$(this).remove();a.removeClass("dialogbox").closest(".notice-options").removeClass("opaque");a.find(".submit_dialogbox").remove();a.find(".submit").show();return false})},NoticeAttachments:function(){$(".notice a.attachment").each(function(){SN.U.NoticeWithAttachment($(this).closest(".notice"))})},NoticeWithAttachment:function(b){if(b.find(".attachment").length===0){return}var a=b.find(".attachment.more");if(a.length>0){$(a[0]).click(function(){var c=$(this);c.addClass(SN.C.S.Processing);$.get(c.attr("href")+"/ajax",null,function(d){c.parent(".entry-content").html($(d).find("#attachment_view .entry-content").html())});return false}).attr("title",SN.msg("showmore_tooltip"))}},NoticeDataAttach:function(b){var a=b.find("input[type=file]");a.change(function(f){b.find(".attach-status").remove();var d=$(this).val();if(!d){return false}var c=$('<div class="attach-status '+SN.C.S.Success+'"><code></code> <button class="close">&#215;</button></div>');c.find("code").text(d);c.find("button").click(function(){c.remove();a.val("");return false});b.append(c);if(typeof this.files=="object"){for(var e=0;e<this.files.length;e++){SN.U.PreviewAttach(b,this.files[e])}}})},maxFileSize:function(b){var a=$(b).find("input[name=MAX_FILE_SIZE]").attr("value");if(a){return parseInt(a)}else{return 0}},PreviewAttach:function(d,c){var e=c.type+" "+Math.round(c.size/1024)+"KB";var f=true;var h;if(typeof window.createObjectURL!="undefined"){h=function(i,j){j(window.createObjectURL(i))}}else{if(typeof window.FileReader!="undefined"){h=function(j,k){var i=new FileReader();i.onload=function(l){k(i.result)};i.readAsDataURL(j)}}else{f=false}}var a=["image/png","image/jpeg","image/gif","image/svg+xml"];if($.inArray(c.type,a)==-1){f=false}var g=8*1024*1024;if(c.size>g){f=false}if(f){h(c,function(j){var i=$("<img>").attr("title",e).attr("alt",e).attr("src",j).attr("style","height: 120px");d.find(".attach-status").append(i)})}else{var b=$("<div></div>").text(e);d.find(".attach-status").append(b)}},NoticeLocationAttach:function(a){var e=a.find("[name=lat]");var k=a.find("[name=lon]");var g=a.find("[name=location_ns]").val();var l=a.find("[name=location_id]").val();var b="";var d=a.find("[name=notice_data-geo]");var c=a.find("[name=notice_data-geo]");var j=$("label[for="+c.attr("id")+"]");function f(n){j.attr("title",jQuery.trim(j.text())).removeClass("checked");a.find("[name=lat]").val("");a.find("[name=lon]").val("");a.find("[name=location_ns]").val("");a.find("[name=location_id]").val("");a.find("[name=notice_data-geo]").attr("checked",false);$.cookie(SN.C.S.NoticeDataGeoCookie,"disabled",{path:"/"});if(n){a.find(".geo_status_wrapper").removeClass("success").addClass("error");a.find(".geo_status_wrapper .geo_status").text(n)}else{a.find(".geo_status_wrapper").remove()}}function m(n,o){SN.U.NoticeGeoStatus(a,"Looking up place name...");$.getJSON(n,o,function(p){var q,r;if(typeof(p.location_ns)!="undefined"){a.find("[name=location_ns]").val(p.location_ns);q=p.location_ns}if(typeof(p.location_id)!="undefined"){a.find("[name=location_id]").val(p.location_id);r=p.location_id}if(typeof(p.name)=="undefined"){NLN_text=o.lat+";"+o.lon}else{NLN_text=p.name}SN.U.NoticeGeoStatus(a,NLN_text,o.lat,o.lon,p.url);j.attr("title",NoticeDataGeo_text.ShareDisable+" ("+NLN_text+")");a.find("[name=lat]").val(o.lat);a.find("[name=lon]").val(o.lon);a.find("[name=location_ns]").val(q);a.find("[name=location_id]").val(r);a.find("[name=notice_data-geo]").attr("checked",true);var s={NLat:o.lat,NLon:o.lon,NLNS:q,NLID:r,NLN:NLN_text,NLNU:p.url,NDG:true};$.cookie(SN.C.S.NoticeDataGeoCookie,JSON.stringify(s),{path:"/"})})}if(c.length>0){if($.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){c.attr("checked",false)}else{c.attr("checked",true)}var h=a.find(".notice_data-geo_wrap");var i=h.attr("title");h.removeAttr("title");j.attr("title",j.text());c.change(function(){if(c.attr("checked")===true||$.cookie(SN.C.S.NoticeDataGeoCookie)===null){j.attr("title",NoticeDataGeo_text.ShareDisable).addClass("checked");if($.cookie(SN.C.S.NoticeDataGeoCookie)===null||$.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){if(navigator.geolocation){SN.U.NoticeGeoStatus(a,"Requesting location from browser...");navigator.geolocation.getCurrentPosition(function(p){a.find("[name=lat]").val(p.coords.latitude);a.find("[name=lon]").val(p.coords.longitude);var q={lat:p.coords.latitude,lon:p.coords.longitude,token:$("#token").val()};m(i,q)},function(p){switch(p.code){case p.PERMISSION_DENIED:f("Location permission denied.");break;case p.TIMEOUT:f("Location lookup timeout.");break}},{timeout:10000})}else{if(e.length>0&&k.length>0){var n={lat:e,lon:k,token:$("#token").val()};m(i,n)}else{f();c.remove();j.remove()}}}else{var o=JSON.parse($.cookie(SN.C.S.NoticeDataGeoCookie));a.find("[name=lat]").val(o.NLat);a.find("[name=lon]").val(o.NLon);a.find("[name=location_ns]").val(o.NLNS);a.find("[name=location_id]").val(o.NLID);a.find("[name=notice_data-geo]").attr("checked",o.NDG);SN.U.NoticeGeoStatus(a,o.NLN,o.NLat,o.NLon,o.NLNU);j.attr("title",NoticeDataGeo_text.ShareDisable+" ("+o.NLN+")").addClass("checked")}}else{f()}}).change()}},NoticeGeoStatus:function(e,a,f,g,c){var e=$("#form_notice");var h=e.find(".geo_status_wrapper");if(h.length==0){h=$('<div class="'+SN.C.S.Success+' geo_status_wrapper"><button class="close" style="float:right">&#215;</button><div class="geo_status"></div></div>');h.find("button.close").click(function(){e.find("[name=notice_data-geo]").removeAttr("checked").change()});e.append(h)}var b;if(c){b=$("<a></a>").attr("href",c)}else{b=$("<span></span>")}b.text(a);if(f||g){var d=f+";"+g;b.attr("title",d);if(!a){b.text(d)}}h.find(".geo_status").empty().append(b)},NewDirectMessage:function(){NDM=$(".entity_send-a-message a");NDM.attr({href:NDM.attr("href")+"&ajax=1"});NDM.bind("click",function(){var a=$(".entity_send-a-message form");if(a.length===0){$(this).addClass(SN.C.S.Processing);$.get(NDM.attr("href"),null,function(b){$(".entity_send-a-message").append(document._importNode($("form",b)[0],true));a=$(".entity_send-a-message .form_notice");SN.U.FormNoticeXHR(a);SN.U.FormNoticeEnhancements(a);a.append('<button class="close">&#215;</button>');$(".entity_send-a-message button").click(function(){a.hide();return false});NDM.removeClass(SN.C.S.Processing)})}else{a.show();$(".entity_send-a-message textarea").focus()}return false})},GetFullYear:function(c,d,a){var b=new Date();b.setFullYear(c,d,a);return b},StatusNetInstance:{Set:function(b){var a=SN.U.StatusNetInstance.Get();if(a!==null){b=$.extend(a,b)}$.cookie(SN.C.S.StatusNetInstance,JSON.stringify(b),{path:"/",expires:SN.U.GetFullYear(2029,0,1)})},Get:function(){var a=$.cookie(SN.C.S.StatusNetInstance);if(a!==null){return JSON.parse(a)}return null},Delete:function(){$.cookie(SN.C.S.StatusNetInstance,null)}},belongsOnTimeline:function(b){var a=$("body").attr("id");if(a=="public"){return true}var c=$("#nav_profile a").attr("href");if(c){var d=$(b).find(".entry-title .author a.url").attr("href");if(d==c){if(a=="all"||a=="showstream"){return true}}}return false}},Init:{NoticeForm:function(){if($("body.user_in").length>0){$("."+SN.C.S.FormNotice).each(function(){var a=$(this);SN.U.NoticeLocationAttach(a);SN.U.FormNoticeXHR(a);SN.U.FormNoticeEnhancements(a);SN.U.NoticeDataAttach(a)})}},Notices:function(){if($("body.user_in").length>0){SN.U.NoticeFavor();SN.U.NoticeRepeat();SN.U.NoticeReply();SN.U.NoticeInlineReplySetup()}SN.U.NoticeAttachments()},EntityActions:function(){if($("body.user_in").length>0){$(".form_user_subscribe").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_user_unsubscribe").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_group_join").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_group_leave").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_user_nudge").live("click",function(){SN.U.FormXHR($(this));return false});SN.U.NewDirectMessage()}},Login:function(){if(SN.U.StatusNetInstance.Get()!==null){var a=SN.U.StatusNetInstance.Get().Nickname;if(a!==null){$("#form_login #nickname").val(a)}}$("#form_login").bind("submit",function(){SN.U.StatusNetInstance.Set({Nickname:$("#form_login #nickname").val()});return true})},UploadForms:function(){$("input[type=file]").change(function(d){if(typeof this.files=="object"&&this.files.length>0){var c=0;for(var b=0;b<this.files.length;b++){c+=this.files[b].size}var a=SN.U.maxFileSize($(this.form));if(a>0&&c>a){var e="File too large: maximum upload size is %d bytes.";alert(e.replace("%d",a));$(this).val("");d.preventDefault();return false}}})}}};$(document).ready(function(){SN.Init.UploadForms();if($("."+SN.C.S.FormNotice).length>0){SN.Init.NoticeForm()}if($("#content .notices").length>0){SN.Init.Notices()}if($("#content .entity_actions").length>0){SN.Init.EntityActions()}if($("#form_login").length>0){SN.Init.Login()}});if(!document.ELEMENT_NODE){document.ELEMENT_NODE=1;document.ATTRIBUTE_NODE=2;document.TEXT_NODE=3;document.CDATA_SECTION_NODE=4;document.ENTITY_REFERENCE_NODE=5;document.ENTITY_NODE=6;document.PROCESSING_INSTRUCTION_NODE=7;document.COMMENT_NODE=8;document.DOCUMENT_NODE=9;document.DOCUMENT_TYPE_NODE=10;document.DOCUMENT_FRAGMENT_NODE=11;document.NOTATION_NODE=12}document._importNode=function(e,a){switch(e.nodeType){case document.ELEMENT_NODE:var d=document.createElement(e.nodeName);if(e.attributes&&e.attributes.length>0){for(var c=0,b=e.attributes.length;c<b;){if(e.attributes[c].nodeName=="class"){d.className=e.getAttribute(e.attributes[c++].nodeName)}else{d.setAttribute(e.attributes[c].nodeName,e.getAttribute(e.attributes[c++].nodeName))}}}if(a&&e.childNodes&&e.childNodes.length>0){for(var c=0,b=e.childNodes.length;c<b;){d.appendChild(document._importNode(e.childNodes[c++],a))}}return d;break;case document.TEXT_NODE:case document.CDATA_SECTION_NODE:case document.COMMENT_NODE:return document.createTextNode(e.nodeValue);break}};if(typeof navigator.geolocation=="undefined"||navigator.geolocation.shim){(function(){(function(){if(window.google&&google.gears){return}var c=null;if(typeof GearsFactory!="undefined"){c=new GearsFactory()}else{try{c=new ActiveXObject("Gears.Factory");if(c.getBuildInfo().indexOf("ie_mobile")!=-1){c.privateSetGlobalObject(this)}}catch(d){if((typeof navigator.mimeTypes!="undefined")&&navigator.mimeTypes["application/x-googlegears"]){c=document.createElement("object");c.style.display="none";c.width=0;c.height=0;c.type="application/x-googlegears";document.documentElement.appendChild(c)}}}if(!c){return}if(!window.google){google={}}if(!google.gears){google.gears={factory:c}}})();var a=(function(){var d=google.gears.factory.create("beta.geolocation");var c=function(f,e){return function(g){f(g);e.lastPosition=g}};return{shim:true,type:"Gears",lastPosition:null,getCurrentPosition:function(e,g,h){var f=this;var i=c(e,f);d.getCurrentPosition(i,g,h)},watchPosition:function(e,f,g){d.watchPosition(e,f,g)},clearWatch:function(e){d.clearWatch(e)},getPermission:function(g,e,f){d.getPermission(g,e,f)}}});var b=(function(){var i=false;var e=function(){if(!d()&&!i){i=true;var j=document.createElement("script");j.src=(document.location.protocol=="https:"?"https://":"http://")+"www.google.com/jsapi?callback=_google_loader_apiLoaded";j.type="text/javascript";document.getElementsByTagName("body")[0].appendChild(j)}};var c=[];var h=function(j){c.push(j)};var f=function(){if(d()){while(c.length>0){var j=c.pop();j()}}};window._google_loader_apiLoaded=function(){f()};var d=function(){return(window.google&&google.loader)};var g=function(j){if(d()){return true}h(j);e();return false};e();return{shim:true,type:"ClientLocation",lastPosition:null,getCurrentPosition:function(k,n,o){var m=this;if(!g(function(){m.getCurrentPosition(k,n,o)})){return}if(google.loader.ClientLocation){var l=google.loader.ClientLocation;var j={coords:{latitude:l.latitude,longitude:l.longitude,altitude:null,accuracy:43000,altitudeAccuracy:null,heading:null,speed:null},address:{city:l.address.city,country:l.address.country,country_code:l.address.country_code,region:l.address.region},timestamp:new Date()};k(j);this.lastPosition=j}else{if(n==="function"){n({code:3,message:"Using the Google ClientLocation API and it is not able to calculate a location."})}}},watchPosition:function(j,l,m){this.getCurrentPosition(j,l,m);var k=this;var n=setInterval(function(){k.getCurrentPosition(j,l,m)},10000);return n},clearWatch:function(j){clearInterval(j)},getPermission:function(l,j,k){return true}}});navigator.geolocation=(window.google&&google.gears)?a():b()})()};
\ No newline at end of file

From 9689bda21c0f001b3f331423805831ee1fd7801e Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Fri, 4 Mar 2011 14:11:11 -0800
Subject: [PATCH 395/655] Loading the original form instead of faking up our
 own. Sorta works but not pretty :D

---
 actions/newnotice.php | 33 ++++++++++++++++++++--
 js/util.js            | 65 ++++++++++++++++++++++++++++---------------
 2 files changed, 74 insertions(+), 24 deletions(-)

diff --git a/actions/newnotice.php b/actions/newnotice.php
index faafd9551d..bc7ab28950 100644
--- a/actions/newnotice.php
+++ b/actions/newnotice.php
@@ -269,6 +269,31 @@ class NewnoticeAction extends Action
         $this->elementEnd('html');
     }
 
+    /**
+     * Show an Ajax-y notice form
+     *
+     * Goes back to the browser, where it's shown in a popup.
+     *
+     * @param string $msg Message to show
+     *
+     * @return void
+     */
+
+    function ajaxShowForm()
+    {
+        $this->startHTML('text/xml;charset=utf-8', true);
+        $this->elementStart('head');
+        $this->element('title', null, _('New notice'));
+        $this->elementEnd('head');
+        $this->elementStart('body');
+
+        $form = new NoticeForm($this);
+        $form->show();
+
+        $this->elementEnd('body');
+        $this->elementEnd('html');
+    }
+
     /**
      * Formerly page output
      *
@@ -286,8 +311,12 @@ class NewnoticeAction extends Action
 
     function showForm($msg=null)
     {
-        if ($msg && $this->boolean('ajax')) {
-            $this->ajaxErrorMsg($msg);
+        if ($this->boolean('ajax')) {
+            if ($msg) {
+                $this->ajaxErrorMsg($msg);
+            } else {
+                $this->ajaxShowForm();
+            }
             return;
         }
 
diff --git a/js/util.js b/js/util.js
index 6d0998aa42..3a901b6c09 100644
--- a/js/util.js
+++ b/js/util.js
@@ -553,13 +553,54 @@ var SN = { // StatusNet
 
             // See if the form's already open...
             var replyForm = $('.notice-reply-form', list);
-            if (replyForm.length == 0) {
+
+            var nextStep = function() {
+                // Override...?
+                replyForm.find('input[name=inreplyto]').val(id);
+
+                // Set focus...
+                var text = replyForm.find('textarea');
+                if (text.length == 0) {
+                    throw "No textarea";
+                }
+                var replyto = '';
+                if (initialText) {
+                    replyto = initialText + ' ';
+                }
+                text.val(replyto + text.val().replace(RegExp(replyto, 'i'), ''));
+                text.data('initialText', $.trim(initialText + ''));
+                text.focus();
+                if (text[0].setSelectionRange) {
+                    var len = text.val().length;
+                    text[0].setSelectionRange(len,len);
+                }
+            };
+            if (replyForm.length > 0) {
+                // Update the existing form...
+                nextStep();
+            } else {
                 // Remove placeholder if any
                 $('li.notice-reply-placeholder').remove();
 
                 // Create the reply form entry at the end
                 var replyItem = $('li.notice-reply', list);
                 if (replyItem.length == 0) {
+                    var url = $('#form_notice').attr('action');
+                    replyItem = $('<li class="notice-reply"></li>');
+                    $.get(url, {ajax: 1}, function(data, textStatus, xhr) {
+                        var formEl = document._importNode($('form', data)[0], true);
+                        replyItem.append(formEl);
+                        list.append(replyItem);
+
+                        var form = replyForm = $(formEl);
+                        SN.U.NoticeLocationAttach(form);
+                        SN.U.FormNoticeXHR(form);
+                        SN.U.FormNoticeEnhancements(form);
+                        SN.U.NoticeDataAttach(form);
+
+                        nextStep();
+                    });
+                    /*
                     replyItem = $('<li class="notice-reply">' +
                                       '<form class="notice-reply-form" method="post">' +
                                           '<textarea name="status_textarea"></textarea>' +
@@ -570,7 +611,6 @@ var SN = { // StatusNet
                                       '</div>' +
                                       '</form>' +
                                   '</li>');
-
                     var baseForm = $('#form_notice');
                     replyForm = replyItem.find('form');
                     replyForm.attr('action', baseForm.attr('action'));
@@ -630,28 +670,9 @@ var SN = { // StatusNet
                         event.preventDefault();
                         return false;
                     });
+                                  */
                 }
             }
-
-            // Override...?
-            replyForm.find('input[name=inreplyto]').val(id);
-
-            // Set focus...
-            var text = replyForm.find('textarea');
-            if (text.length == 0) {
-                throw "No textarea";
-            }
-            var replyto = '';
-            if (initialText) {
-                replyto = initialText + ' ';
-            }
-            text.val(replyto + text.val().replace(RegExp(replyto, 'i'), ''));
-            text.data('initialText', $.trim(initialText + ''));
-            text.focus();
-            if (text[0].setSelectionRange) {
-                var len = text.val().length;
-                text[0].setSelectionRange(len,len);
-            }
         },
 
         /**

From 5358f78e824412919ddd8f3d7d2b0bf68a6292d4 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Fri, 4 Mar 2011 14:27:55 -0800
Subject: [PATCH 396/655] Reusable notice form fixes for geolocation

---
 js/util.js                           |  3 +--
 lib/noticeform.php                   | 20 ++++++++++++++++++--
 plugins/Realtime/realtimeupdate.css  |  2 +-
 theme/biz/css/display.css            |  6 +++---
 theme/cloudy/css/display.css         |  6 +++---
 theme/default/css/display.css        |  6 +++---
 theme/identica/css/display.css       |  6 +++---
 theme/mnml/css/display.css           |  6 +++---
 theme/pigeonthoughts/css/display.css |  6 +++---
 theme/rebase/css/display.css         |  6 +++---
 theme/victorian/css/display.css      |  6 +++---
 11 files changed, 44 insertions(+), 29 deletions(-)

diff --git a/js/util.js b/js/util.js
index 3a901b6c09..1bd011cb0d 100644
--- a/js/util.js
+++ b/js/util.js
@@ -990,7 +990,7 @@ var SN = { // StatusNet
             var NLN = ''; // @fixme
             var NDGe = form.find('[name=notice_data-geo]');
             var check = form.find('[name=notice_data-geo]');
-            var label = $('label[for='+check.attr('id')+']');
+            var label = form.find('label.notice_data-geo');
 
             function removeNoticeDataGeo(error) {
                 label
@@ -1164,7 +1164,6 @@ var SN = { // StatusNet
          */
         NoticeGeoStatus: function(form, status, lat, lon, url)
         {
-            var form = $('#form_notice');
             var wrapper = form.find('.geo_status_wrapper');
             if (wrapper.length == 0) {
                 wrapper = $('<div class="'+SN.C.S.Success+' geo_status_wrapper"><button class="close" style="float:right">&#215;</button><div class="geo_status"></div></div>');
diff --git a/lib/noticeform.php b/lib/noticeform.php
index ae8023275a..0f13147d00 100644
--- a/lib/noticeform.php
+++ b/lib/noticeform.php
@@ -94,6 +94,8 @@ class NoticeForm extends Form
 
     function __construct($out=null, $action=null, $content=null, $user=null, $inreplyto=null, $lat=null, $lon=null, $location_id=null, $location_ns=null)
     {
+        $this->id_suffix = time();
+
         parent::__construct($out);
 
         $this->action  = $action;
@@ -125,7 +127,7 @@ class NoticeForm extends Form
 
     function id()
     {
-        return 'form_notice';
+        return 'form_notice_' . $this->id_suffix;
     }
 
    /**
@@ -208,7 +210,21 @@ class NoticeForm extends Form
 
                 $this->out->elementStart('div', array('class' => 'notice_data-geo_wrap',
                                                       'title' => common_local_url('geocode')));
-                $this->out->checkbox('notice_data-geo', _('Share my location'), true);
+
+                // @fixme checkbox method allows no way to change the id without changing the name
+                //$this->out->checkbox('notice_data-geo', _('Share my location'), true);
+                $this->out->element('input', array(
+                    'name' => 'notice_data-geo',
+                    'type' => 'checkbox',
+                    'class' => 'checkbox',
+                    'id' => $this->id() . '-notice_data-geo',
+                    'checked' => true, // ?
+                ));
+                $this->out->text(' ');
+                $this->out->element('label', array('class' => 'notice_data-geo',
+                                              'for' => $this->id() . '-notice_data-geo'),
+                               _('Share my location'));
+
                 $this->out->elementEnd('div');
                 $this->out->inlineScript(' var NoticeDataGeo_text = {'.
                     'ShareDisable: ' .json_encode(_('Do not share my location')).','.
diff --git a/plugins/Realtime/realtimeupdate.css b/plugins/Realtime/realtimeupdate.css
index b277b30a14..7fd7fd5ed3 100644
--- a/plugins/Realtime/realtimeupdate.css
+++ b/plugins/Realtime/realtimeupdate.css
@@ -19,7 +19,7 @@ display:none;
 
 .realtime-popup #form_notice label[for=notice_data-attach],
 .realtime-popup #form_notice #notice_data-attach,
-.realtime-popup #form_notice label[for=notice_data-geo] {
+.realtime-popup #form_notice label.notice_data-geo {
 top:0;
 }
 
diff --git a/theme/biz/css/display.css b/theme/biz/css/display.css
index e562f7072a..0bb53f74a8 100644
--- a/theme/biz/css/display.css
+++ b/theme/biz/css/display.css
@@ -118,10 +118,10 @@ box-shadow:3px 3px 3px rgba(194, 194, 194, 0.1);
 text-shadow:none;
 }
 
-.form_notice label[for=notice_data-geo] {
+.form_notice label.notice_data-geo {
 background-position:0 -1780px;
 }
-.form_notice label[for=notice_data-geo].checked {
+.form_notice label.notice_data-geo.checked {
 background-position:0 -1846px;
 }
 
@@ -216,7 +216,7 @@ button.close,
 .entity_role_administrator input.submit,
 .entity_role_moderator input.submit,
 .notice-options .repeated,
-.form_notice label[for=notice_data-geo],
+.form_notice label.notice_data-geo,
 button.minimize,
 .form_reset_key input.submit,
 .entity_clear input.submit,
diff --git a/theme/cloudy/css/display.css b/theme/cloudy/css/display.css
index ab23896b2d..a5eabac4ad 100644
--- a/theme/cloudy/css/display.css
+++ b/theme/cloudy/css/display.css
@@ -1636,7 +1636,7 @@ button.close,
 .entity_silence input.submit,
 .entity_delete input.submit,
 .notice-options .repeated,
-.form_notice label[for=notice_data-geo],
+.form_notice label.notice_data-geo,
 button.minimize,
 .form_reset_key input.submit,
 .entity_clear input.submit,
@@ -1746,10 +1746,10 @@ background-position:0 47%;
 .form_notice a#notice_data-geo_name {
 background-position:0 -1711px;
 }
-.form_notice label[for=notice_data-geo] {
+.form_notice label.notice_data-geo {
 background-position:0 -1780px;
 }
-.form_notice label[for=notice_data-geo].checked {
+.form_notice label.notice_data-geo.checked {
 background-position:0 -1846px;
 }
 
diff --git a/theme/default/css/display.css b/theme/default/css/display.css
index 63554aae18..fbd3afb12c 100644
--- a/theme/default/css/display.css
+++ b/theme/default/css/display.css
@@ -116,10 +116,10 @@ box-shadow:3px 3px 3px rgba(194, 194, 194, 0.1);
 text-shadow:none;
 }
 
-.form_notice label[for=notice_data-geo] {
+.form_notice label.notice_data-geo {
 background-position:0 -1780px;
 }
-.form_notice label[for=notice_data-geo].checked {
+.form_notice label.notice_data-geo.checked {
 background-position:0 -1846px;
 }
 
@@ -196,7 +196,7 @@ button.close,
 .entity_role_administrator input.submit,
 .entity_role_moderator input.submit,
 .notice-options .repeated,
-.form_notice label[for=notice_data-geo],
+.form_notice label.notice_data-geo,
 button.minimize,
 .form_reset_key input.submit,
 .entity_clear input.submit,
diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index 211c539dcb..fba72a09d6 100644
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -117,10 +117,10 @@ box-shadow:3px 3px 3px rgba(194, 194, 194, 0.1);
 text-shadow:none;
 }
 
-.form_notice label[for=notice_data-geo] {
+.form_notice label.notice_data-geo {
 background-position:0 -1780px;
 }
-.form_notice label[for=notice_data-geo].checked {
+.form_notice label.notice_data-geo.checked {
 background-position:0 -1846px;
 }
 
@@ -197,7 +197,7 @@ button.close,
 .entity_role_administrator input.submit,
 .entity_role_moderator input.submit,
 .notice-options .repeated,
-.form_notice label[for=notice_data-geo],
+.form_notice label.notice_data-geo,
 button.minimize,
 .form_reset_key input.submit,
 .entity_clear input.submit,
diff --git a/theme/mnml/css/display.css b/theme/mnml/css/display.css
index f5b80b0e95..57ad426c55 100644
--- a/theme/mnml/css/display.css
+++ b/theme/mnml/css/display.css
@@ -271,7 +271,7 @@ button.close,
 .entity_role_administrator input.submit,
 .entity_role_moderator input.submit,
 .notice-options .repeated,
-.form_notice label[for=notice_data-geo],
+.form_notice label.notice_data-geo,
 button.minimize,
 .form_reset_key input.submit,
 .entity_clear input.submit,
@@ -286,10 +286,10 @@ button.minimize,
     background-color:transparent;
 }
 
-.form_notice label[for=notice_data-geo] {
+.form_notice label.notice_data-geo {
     background-position:0 -1780px;
 }
-.form_notice label[for=notice_data-geo].checked {
+.form_notice label.notice_data-geo.checked {
     background-position:0 -1846px;
 }
 .form_notice label[for=notice_data-attach] {
diff --git a/theme/pigeonthoughts/css/display.css b/theme/pigeonthoughts/css/display.css
index 155a473519..b4f2f297b0 100644
--- a/theme/pigeonthoughts/css/display.css
+++ b/theme/pigeonthoughts/css/display.css
@@ -84,10 +84,10 @@ box-shadow:3px 3px 3px rgba(194, 194, 194, 0.1);
 text-shadow:none;
 }
 
-.form_notice label[for=notice_data-geo] {
+.form_notice label.notice_data-geo {
 background-position:0 -1780px;
 }
-.form_notice label[for=notice_data-geo].checked {
+.form_notice label.notice_data-geo.checked {
 background-position:0 -1846px;
 }
 
@@ -233,7 +233,7 @@ button.close,
 .entity_silence input.submit,
 .entity_delete input.submit,
 .notice-options .repeated,
-.form_notice label[for=notice_data-geo],
+.form_notice label.notice_data-geo,
 button.minimize,
 .form_reset_key input.submit,
 .entity_clear input.submit,
diff --git a/theme/rebase/css/display.css b/theme/rebase/css/display.css
index 4038ab614a..32df41b93a 100644
--- a/theme/rebase/css/display.css
+++ b/theme/rebase/css/display.css
@@ -1771,7 +1771,7 @@ button.close,
 .entity_role_administrator input.submit,
 .entity_role_moderator input.submit,
 .notice-options .repeated,
-.form_notice label[for=notice_data-geo],
+.form_notice label.notice_data-geo,
 button.minimize,
 .form_reset_key input.submit,
 .entity_clear input.submit,
@@ -1924,10 +1924,10 @@ background-position:0 -1054px;
 .form_notice label[for=notice_data-attach] {
     background-position: 0 -328px;
 }
-.form_notice label[for=notice_data-geo] {
+.form_notice label.notice_data-geo {
     background-position: 0 -1780px;
 }
-.form_notice label[for=notice_data-geo].checked {
+.form_notice label.notice_data-geo.checked {
     background-position: 0 -1846px;
 }
 
diff --git a/theme/victorian/css/display.css b/theme/victorian/css/display.css
index 3ab7fc601a..6252fdf908 100644
--- a/theme/victorian/css/display.css
+++ b/theme/victorian/css/display.css
@@ -294,10 +294,10 @@ input.submit:focus {
     text-shadow:none;
 }
 
-.form_notice label[for=notice_data-geo] {
+.form_notice label.notice_data-geo {
     background-position:0 -1780px;
 }
-.form_notice label[for=notice_data-geo].checked {
+.form_notice label.notice_data-geo.checked {
     background-position:0 -1846px;
 }
 
@@ -373,7 +373,7 @@ button.close,
 .entity_role_administrator input.submit,
 .entity_role_moderator input.submit,
 .notice-options .repeated,
-.form_notice label[for=notice_data-geo],
+.form_notice label.notice_data-geo,
 button.minimize,
 .form_reset_key input.submit,
 .entity_clear input.submit,

From 97532a093ddf3da69753aa00584a5573a756b7d4 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Fri, 4 Mar 2011 14:30:30 -0800
Subject: [PATCH 397/655] style fixes for new notice form being reused in reply
 area

---
 theme/base/css/display.css | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 5ab64c6d26..16c2b6dce6 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -563,8 +563,10 @@ border-width:1px;
 border-style:solid;
 }
 
-.form_notice {
+#header .form_notice {
 width:45%;
+}
+.form_notice {
 float:left;
 position:relative;
 line-height:1;
@@ -1120,7 +1122,6 @@ border-top-style:solid;
 .threaded-replies .notice-reply {
     margin: 8px;
 }
-.threaded-replies .notice-reply textarea,
 .threaded-replies .notice-reply-placeholder input.placeholder {
     margin-left: 0;
     width: 95%;

From a1002cc1078593f899db6c2c2559e0f42f01d725 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Fri, 4 Mar 2011 14:58:30 -0800
Subject: [PATCH 398/655] Work in progress: inline reply form reusing the main
 reply form now inserts the successful result more or less right

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

diff --git a/js/util.js b/js/util.js
index 1bd011cb0d..09ab23344b 100644
--- a/js/util.js
+++ b/js/util.js
@@ -387,7 +387,22 @@ var SN = { // StatusNet
                             // New notice post was successful. If on our timeline, show it!
                             var notice = document._importNode($('li', data)[0], true);
                             var notices = $('#notices_primary .notices:first');
-                            if (notices.length > 0 && SN.U.belongsOnTimeline(notice)) {
+                            var replyItem = form.closest('li.notice-reply');
+
+                            if (replyItem.length > 0) {
+                                // If this is an inline reply, insert it in place.
+                                var id = $(notice).attr('id');
+                                if ($("#"+id).length == 0) {
+                                    var parentNotice = replyItem.closest('li.notice');
+                                    replyItem.replaceWith(notice);
+                                    SN.U.NoticeInlineReplyPlaceholder(parentNotice);
+                                } else {
+                                    // Realtime came through before us...
+                                    replyItem.remove();
+                                }
+                            } else if (notices.length > 0 && SN.U.belongsOnTimeline(notice)) {
+                                // Not a reply. If on our timeline, show it at the top!
+
                                 if ($('#'+notice.id).length === 0) {
                                     var notice_irt_value = form.find('[name=inreplyto]').val();
                                     var notice_irt = '#notices_primary #notice-'+notice_irt_value;
@@ -406,10 +421,10 @@ var SN = { // StatusNet
                                     SN.U.NoticeWithAttachment($('#'+notice.id));
                                     SN.U.NoticeReplyTo($('#'+notice.id));
                                 }
-                            }
-                            else {
+                            } else {
                                 // Not on a timeline that this belongs on?
                                 // Just show a success message.
+                                // @fixme inline
                                 showFeedback('success', $('title', data).text());
                             }
                         }

From 2fa95144ed9ffa3f2845d18e3c5d758303d710e8 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Fri, 4 Mar 2011 15:00:20 -0800
Subject: [PATCH 399/655] Cleanup & minification for migration to reusable
 notice form in inline replies. Yay!

---
 js/util.js     | 71 --------------------------------------------------
 js/util.min.js |  2 +-
 2 files changed, 1 insertion(+), 72 deletions(-)

diff --git a/js/util.js b/js/util.js
index 09ab23344b..cc94c5ced7 100644
--- a/js/util.js
+++ b/js/util.js
@@ -615,77 +615,6 @@ var SN = { // StatusNet
 
                         nextStep();
                     });
-                    /*
-                    replyItem = $('<li class="notice-reply">' +
-                                      '<form class="notice-reply-form" method="post">' +
-                                          '<textarea name="status_textarea"></textarea>' +
-                                          '<div class="controls">' +
-                                          '<input type="hidden" name="token">' +
-                                          '<input type="hidden" name="inreplyto">' +
-                                          '<input type="submit" class="submit">' +
-                                      '</div>' +
-                                      '</form>' +
-                                  '</li>');
-                    var baseForm = $('#form_notice');
-                    replyForm = replyItem.find('form');
-                    replyForm.attr('action', baseForm.attr('action'));
-                    replyForm.find('input[name="token"]').val(baseForm.find('input[name=token]').val());
-                    replyForm.find('input[type="submit"]').val(SN.msg('reply_submit'));
-                    list.append(replyItem);
-
-                    replyForm.find('textarea').blur(function() {
-                        var textarea = $(this);
-                        var txt = $.trim(textarea.val());
-                        if (txt == '' || txt == textarea.data('initialText')) {
-                            // Nothing to say? Begone!
-                            replyItem.remove();
-                            if (list.find('li').length > 0) {
-                                SN.U.NoticeInlineReplyPlaceholder(parentNotice);
-                            } else {
-                                list.remove();
-                            }
-                        }
-                    });
-                    replyForm.submit(function(event) {
-                        var form = replyForm;
-                        $.ajax({
-                            type: 'POST',
-                            dataType: 'xml',
-                            url: SN.U.RewriteAjaxAction(form.attr('action')),
-                            data: form.serialize() + '&ajax=1',
-                            beforeSend: function(xhr) {
-                                form
-                                    .addClass(SN.C.S.Processing)
-                                    .find('.submit')
-                                        .addClass(SN.C.S.Disabled)
-                                        .attr(SN.C.S.Disabled, SN.C.S.Disabled)
-                                        .end()
-                                    .find('textarea')
-                                        .addClass(SN.C.S.Disabled)
-                                        .attr(SN.C.S.Disabled, SN.C.S.Disabled);
-                            },
-                            error: function (xhr, textStatus, errorThrown) {
-                                alert(errorThrown || textStatus);
-                            },
-                            success: function(data, textStatus) {
-                                var orig_li = $('li', data)[0];
-                                if (orig_li) {
-                                    var li = document._importNode(orig_li, true);
-                                    var id = $(li).attr('id');
-                                    if ($("#"+id).length == 0) {
-                                        replyItem.replaceWith(li);
-                                        SN.U.NoticeInlineReplyPlaceholder(parentNotice);
-                                    } else {
-                                        // Realtime came through before us...
-                                        replyItem.remove();
-                                    }
-                                }
-                            }
-                        });
-                        event.preventDefault();
-                        return false;
-                    });
-                                  */
                 }
             }
         },
diff --git a/js/util.min.js b/js/util.min.js
index bf73c4f54b..280aca6a45 100644
--- a/js/util.min.js
+++ b/js/util.min.js
@@ -1 +1 @@
-var SN={C:{I:{CounterBlackout:false,MaxLength:140,PatternUsername:/^[0-9a-zA-Z\-_.]*$/,HTTP20x30x:[200,201,202,203,204,205,206,300,301,302,303,304,305,306,307]},S:{Disabled:"disabled",Warning:"warning",Error:"error",Success:"success",Processing:"processing",CommandResult:"command_result",FormNotice:"form_notice",NoticeDataGeo:"notice_data-geo",NoticeDataGeoCookie:"NoticeDataGeo",NoticeDataGeoSelected:"notice_data-geo_selected",StatusNetInstance:"StatusNetInstance"}},messages:{},msg:function(a){if(typeof SN.messages[a]=="undefined"){return"["+a+"]"}else{return SN.messages[a]}},U:{FormNoticeEnhancements:function(b){if(jQuery.data(b[0],"ElementData")===undefined){MaxLength=b.find(".count").text();if(typeof(MaxLength)=="undefined"){MaxLength=SN.C.I.MaxLength}jQuery.data(b[0],"ElementData",{MaxLength:MaxLength});SN.U.Counter(b);NDT=b.find("[name=status_textarea]");NDT.bind("keyup",function(c){SN.U.Counter(b)});var a=function(c){window.setTimeout(function(){SN.U.Counter(b)},50)};NDT.bind("cut",a).bind("paste",a)}else{b.find(".count").text(jQuery.data(b[0],"ElementData").MaxLength)}},Counter:function(d){SN.C.I.FormNoticeCurrent=d;var b=jQuery.data(d[0],"ElementData").MaxLength;if(b<=0){return}var c=b-SN.U.CharacterCount(d);var a=d.find(".count");if(c.toString()!=a.text()){if(!SN.C.I.CounterBlackout||c===0){if(a.text()!=String(c)){a.text(c)}if(c<0){d.addClass(SN.C.S.Warning)}else{d.removeClass(SN.C.S.Warning)}if(!SN.C.I.CounterBlackout){SN.C.I.CounterBlackout=true;SN.C.I.FormNoticeCurrent=d;window.setTimeout("SN.U.ClearCounterBlackout(SN.C.I.FormNoticeCurrent);",500)}}}},CharacterCount:function(a){return a.find("[name=status_textarea]").val().length},ClearCounterBlackout:function(a){SN.C.I.CounterBlackout=false;SN.U.Counter(a)},RewriteAjaxAction:function(a){if(document.location.protocol=="https:"&&a.substr(0,5)=="http:"){return a.replace(/^http:\/\/[^:\/]+/,"https://"+document.location.host)}else{return a}},FormXHR:function(a){$.ajax({type:"POST",dataType:"xml",url:SN.U.RewriteAjaxAction(a.attr("action")),data:a.serialize()+"&ajax=1",beforeSend:function(b){a.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(c,d,b){alert(b||d)},success:function(b,c){if(typeof($("form",b)[0])!="undefined"){form_new=document._importNode($("form",b)[0],true);a.replaceWith(form_new)}else{a.replaceWith(document._importNode($("p",b)[0],true))}}})},FormNoticeXHR:function(b){SN.C.I.NoticeDataGeo={};b.append('<input type="hidden" name="ajax" value="1"/>');b.attr("action",SN.U.RewriteAjaxAction(b.attr("action")));var c=function(d,e){b.append($('<p class="form_response"></p>').addClass(d).text(e))};var a=function(){b.find(".form_response").remove()};b.ajaxForm({dataType:"xml",timeout:"60000",beforeSend:function(d){if(b.find("[name=status_textarea]").val()==""){b.addClass(SN.C.S.Warning);return false}b.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled);SN.U.normalizeGeoData(b);return true},error:function(f,g,e){b.removeClass(SN.C.S.Processing).find(".submit").removeClass(SN.C.S.Disabled).removeAttr(SN.C.S.Disabled,SN.C.S.Disabled);a();if(g=="timeout"){c("error","Sorry! We had trouble sending your notice. The servers are overloaded. Please try again, and contact the site administrator if this problem persists.")}else{var d=SN.U.GetResponseXML(f);if($("."+SN.C.S.Error,d).length>0){b.append(document._importNode($("."+SN.C.S.Error,d)[0],true))}else{if(parseInt(f.status)===0||jQuery.inArray(parseInt(f.status),SN.C.I.HTTP20x30x)>=0){b.resetForm().find(".attach-status").remove();SN.U.FormNoticeEnhancements(b)}else{c("error","(Sorry! We had trouble sending your notice ("+f.status+" "+f.statusText+"). Please report the problem to the site administrator if this happens again.")}}}},success:function(i,k){a();var e=$("#"+SN.C.S.Error,i);if(e.length>0){c("error",e.text())}else{if($("body")[0].id=="bookmarklet"){self.close()}var d=$("#"+SN.C.S.CommandResult,i);if(d.length>0){c("success",d.text())}else{var h=document._importNode($("li",i)[0],true);var j=$("#notices_primary .notices:first");if(j.length>0&&SN.U.belongsOnTimeline(h)){if($("#"+h.id).length===0){var f=b.find("[name=inreplyto]").val();var g="#notices_primary #notice-"+f;if($("body")[0].id=="conversation"){if(f.length>0&&$(g+" .notices").length<1){$(g).append('<ul class="notices"></ul>')}$($(g+" .notices")[0]).append(h)}else{j.prepend(h)}$("#"+h.id).css({display:"none"}).fadeIn(2500);SN.U.NoticeWithAttachment($("#"+h.id));SN.U.NoticeReplyTo($("#"+h.id))}}else{c("success",$("title",i).text())}}b.resetForm();b.find("[name=inreplyto]").val("");b.find(".attach-status").remove();SN.U.FormNoticeEnhancements(b)}},complete:function(d,e){b.removeClass(SN.C.S.Processing).find(".submit").removeAttr(SN.C.S.Disabled).removeClass(SN.C.S.Disabled);b.find("[name=lat]").val(SN.C.I.NoticeDataGeo.NLat);b.find("[name=lon]").val(SN.C.I.NoticeDataGeo.NLon);b.find("[name=location_ns]").val(SN.C.I.NoticeDataGeo.NLNS);b.find("[name=location_id]").val(SN.C.I.NoticeDataGeo.NLID);b.find("[name=notice_data-geo]").attr("checked",SN.C.I.NoticeDataGeo.NDG)}})},normalizeGeoData:function(a){SN.C.I.NoticeDataGeo.NLat=a.find("[name=lat]").val();SN.C.I.NoticeDataGeo.NLon=a.find("[name=lon]").val();SN.C.I.NoticeDataGeo.NLNS=a.find("[name=location_ns]").val();SN.C.I.NoticeDataGeo.NLID=a.find("[name=location_id]").val();SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked");var b=$.cookie(SN.C.S.NoticeDataGeoCookie);if(b!==null&&b!="disabled"){b=JSON.parse(b);SN.C.I.NoticeDataGeo.NLat=a.find("[name=lat]").val(b.NLat).val();SN.C.I.NoticeDataGeo.NLon=a.find("[name=lon]").val(b.NLon).val();if(b.NLNS){SN.C.I.NoticeDataGeo.NLNS=a.find("[name=location_ns]").val(b.NLNS).val();SN.C.I.NoticeDataGeo.NLID=a.find("[name=location_id]").val(b.NLID).val()}else{a.find("[name=location_ns]").val("");a.find("[name=location_id]").val("")}}if(b=="disabled"){SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked",false).attr("checked")}else{SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked",true).attr("checked")}},GetResponseXML:function(b){try{return b.responseXML}catch(a){return(new DOMParser()).parseFromString(b.responseText,"text/xml")}},NoticeReply:function(){if($("#content .notice_reply").length>0){$("#content .notice").each(function(){SN.U.NoticeReplyTo($(this))})}},NoticeReplyTo:function(a){a.find(".notice_reply").live("click",function(c){c.preventDefault();var b=($(".author .nickname",a).length>0)?$($(".author .nickname",a)[0]):$(".author .nickname.uid");SN.U.NoticeInlineReplyTrigger(a,"@"+b.text());return false})},NoticeInlineReplyTrigger:function(h,i){var c=$($(".notice_id",h)[0]).text();var d=h;var f=h.closest(".notices");if(f.hasClass("threaded-replies")){d=f.closest(".notice")}else{f=$("ul.threaded-replies",h);if(f.length==0){f=$('<ul class="notices threaded-replies xoxo"></ul>');h.append(f)}}var k=$(".notice-reply-form",f);if(k.length==0){$("li.notice-reply-placeholder").remove();var g=$("li.notice-reply",f);if(g.length==0){g=$('<li class="notice-reply"><form class="notice-reply-form" method="post"><textarea name="status_textarea"></textarea><div class="controls"><input type="hidden" name="token"><input type="hidden" name="inreplyto"><input type="submit" class="submit"></div></form></li>');var b=$("#form_notice");k=g.find("form");k.attr("action",b.attr("action"));k.find('input[name="token"]').val(b.find("input[name=token]").val());k.find('input[type="submit"]').val(SN.msg("reply_submit"));f.append(g);k.find("textarea").blur(function(){var m=$(this);var l=$.trim(m.val());if(l==""||l==m.data("initialText")){g.remove();if(f.find("li").length>0){SN.U.NoticeInlineReplyPlaceholder(d)}else{f.remove()}}});k.submit(function(m){var l=k;$.ajax({type:"POST",dataType:"xml",url:SN.U.RewriteAjaxAction(l.attr("action")),data:l.serialize()+"&ajax=1",beforeSend:function(n){l.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled).end().find("textarea").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(o,p,n){alert(n||p)},success:function(p,r){var o=$("li",p)[0];if(o){var n=document._importNode(o,true);var q=$(n).attr("id");if($("#"+q).length==0){g.replaceWith(n);SN.U.NoticeInlineReplyPlaceholder(d)}else{g.remove()}}}});m.preventDefault();return false})}}k.find("input[name=inreplyto]").val(c);var j=k.find("textarea");if(j.length==0){throw"No textarea"}var a="";if(i){a=i+" "}j.val(a+j.val().replace(RegExp(a,"i"),""));j.data("initialText",$.trim(i+""));j.focus();if(j[0].setSelectionRange){var e=j.val().length;j[0].setSelectionRange(e,e)}},NoticeFavor:function(){$(".form_favor").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_disfavor").live("click",function(){SN.U.FormXHR($(this));return false})},NoticeInlineReplyPlaceholder:function(b){var a=b.find("ul.threaded-replies");var c=$('<li class="notice-reply-placeholder"><input class="placeholder"></li>');c.click(function(){SN.U.NoticeInlineReplyTrigger(b)});c.find("input").val(SN.msg("reply_placeholder"));a.append(c)},NoticeInlineReplySetup:function(){$(".threaded-replies").each(function(){var b=$(this);var a=b.closest(".notice");SN.U.NoticeInlineReplyPlaceholder(a)})},NoticeRepeat:function(){$(".form_repeat").live("click",function(a){a.preventDefault();SN.U.NoticeRepeatConfirmation($(this));return false})},NoticeRepeatConfirmation:function(a){var c=a.find(".submit");var b=c.clone();b.addClass("submit_dialogbox").removeClass("submit");a.append(b);b.bind("click",function(){SN.U.FormXHR(a);return false});c.hide();a.addClass("dialogbox").append('<button class="close">&#215;</button>').closest(".notice-options").addClass("opaque");a.find("button.close").click(function(){$(this).remove();a.removeClass("dialogbox").closest(".notice-options").removeClass("opaque");a.find(".submit_dialogbox").remove();a.find(".submit").show();return false})},NoticeAttachments:function(){$(".notice a.attachment").each(function(){SN.U.NoticeWithAttachment($(this).closest(".notice"))})},NoticeWithAttachment:function(b){if(b.find(".attachment").length===0){return}var a=b.find(".attachment.more");if(a.length>0){$(a[0]).click(function(){var c=$(this);c.addClass(SN.C.S.Processing);$.get(c.attr("href")+"/ajax",null,function(d){c.parent(".entry-content").html($(d).find("#attachment_view .entry-content").html())});return false}).attr("title",SN.msg("showmore_tooltip"))}},NoticeDataAttach:function(b){var a=b.find("input[type=file]");a.change(function(f){b.find(".attach-status").remove();var d=$(this).val();if(!d){return false}var c=$('<div class="attach-status '+SN.C.S.Success+'"><code></code> <button class="close">&#215;</button></div>');c.find("code").text(d);c.find("button").click(function(){c.remove();a.val("");return false});b.append(c);if(typeof this.files=="object"){for(var e=0;e<this.files.length;e++){SN.U.PreviewAttach(b,this.files[e])}}})},maxFileSize:function(b){var a=$(b).find("input[name=MAX_FILE_SIZE]").attr("value");if(a){return parseInt(a)}else{return 0}},PreviewAttach:function(d,c){var e=c.type+" "+Math.round(c.size/1024)+"KB";var f=true;var h;if(typeof window.createObjectURL!="undefined"){h=function(i,j){j(window.createObjectURL(i))}}else{if(typeof window.FileReader!="undefined"){h=function(j,k){var i=new FileReader();i.onload=function(l){k(i.result)};i.readAsDataURL(j)}}else{f=false}}var a=["image/png","image/jpeg","image/gif","image/svg+xml"];if($.inArray(c.type,a)==-1){f=false}var g=8*1024*1024;if(c.size>g){f=false}if(f){h(c,function(j){var i=$("<img>").attr("title",e).attr("alt",e).attr("src",j).attr("style","height: 120px");d.find(".attach-status").append(i)})}else{var b=$("<div></div>").text(e);d.find(".attach-status").append(b)}},NoticeLocationAttach:function(a){var e=a.find("[name=lat]");var k=a.find("[name=lon]");var g=a.find("[name=location_ns]").val();var l=a.find("[name=location_id]").val();var b="";var d=a.find("[name=notice_data-geo]");var c=a.find("[name=notice_data-geo]");var j=$("label[for="+c.attr("id")+"]");function f(n){j.attr("title",jQuery.trim(j.text())).removeClass("checked");a.find("[name=lat]").val("");a.find("[name=lon]").val("");a.find("[name=location_ns]").val("");a.find("[name=location_id]").val("");a.find("[name=notice_data-geo]").attr("checked",false);$.cookie(SN.C.S.NoticeDataGeoCookie,"disabled",{path:"/"});if(n){a.find(".geo_status_wrapper").removeClass("success").addClass("error");a.find(".geo_status_wrapper .geo_status").text(n)}else{a.find(".geo_status_wrapper").remove()}}function m(n,o){SN.U.NoticeGeoStatus(a,"Looking up place name...");$.getJSON(n,o,function(p){var q,r;if(typeof(p.location_ns)!="undefined"){a.find("[name=location_ns]").val(p.location_ns);q=p.location_ns}if(typeof(p.location_id)!="undefined"){a.find("[name=location_id]").val(p.location_id);r=p.location_id}if(typeof(p.name)=="undefined"){NLN_text=o.lat+";"+o.lon}else{NLN_text=p.name}SN.U.NoticeGeoStatus(a,NLN_text,o.lat,o.lon,p.url);j.attr("title",NoticeDataGeo_text.ShareDisable+" ("+NLN_text+")");a.find("[name=lat]").val(o.lat);a.find("[name=lon]").val(o.lon);a.find("[name=location_ns]").val(q);a.find("[name=location_id]").val(r);a.find("[name=notice_data-geo]").attr("checked",true);var s={NLat:o.lat,NLon:o.lon,NLNS:q,NLID:r,NLN:NLN_text,NLNU:p.url,NDG:true};$.cookie(SN.C.S.NoticeDataGeoCookie,JSON.stringify(s),{path:"/"})})}if(c.length>0){if($.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){c.attr("checked",false)}else{c.attr("checked",true)}var h=a.find(".notice_data-geo_wrap");var i=h.attr("title");h.removeAttr("title");j.attr("title",j.text());c.change(function(){if(c.attr("checked")===true||$.cookie(SN.C.S.NoticeDataGeoCookie)===null){j.attr("title",NoticeDataGeo_text.ShareDisable).addClass("checked");if($.cookie(SN.C.S.NoticeDataGeoCookie)===null||$.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){if(navigator.geolocation){SN.U.NoticeGeoStatus(a,"Requesting location from browser...");navigator.geolocation.getCurrentPosition(function(p){a.find("[name=lat]").val(p.coords.latitude);a.find("[name=lon]").val(p.coords.longitude);var q={lat:p.coords.latitude,lon:p.coords.longitude,token:$("#token").val()};m(i,q)},function(p){switch(p.code){case p.PERMISSION_DENIED:f("Location permission denied.");break;case p.TIMEOUT:f("Location lookup timeout.");break}},{timeout:10000})}else{if(e.length>0&&k.length>0){var n={lat:e,lon:k,token:$("#token").val()};m(i,n)}else{f();c.remove();j.remove()}}}else{var o=JSON.parse($.cookie(SN.C.S.NoticeDataGeoCookie));a.find("[name=lat]").val(o.NLat);a.find("[name=lon]").val(o.NLon);a.find("[name=location_ns]").val(o.NLNS);a.find("[name=location_id]").val(o.NLID);a.find("[name=notice_data-geo]").attr("checked",o.NDG);SN.U.NoticeGeoStatus(a,o.NLN,o.NLat,o.NLon,o.NLNU);j.attr("title",NoticeDataGeo_text.ShareDisable+" ("+o.NLN+")").addClass("checked")}}else{f()}}).change()}},NoticeGeoStatus:function(e,a,f,g,c){var e=$("#form_notice");var h=e.find(".geo_status_wrapper");if(h.length==0){h=$('<div class="'+SN.C.S.Success+' geo_status_wrapper"><button class="close" style="float:right">&#215;</button><div class="geo_status"></div></div>');h.find("button.close").click(function(){e.find("[name=notice_data-geo]").removeAttr("checked").change()});e.append(h)}var b;if(c){b=$("<a></a>").attr("href",c)}else{b=$("<span></span>")}b.text(a);if(f||g){var d=f+";"+g;b.attr("title",d);if(!a){b.text(d)}}h.find(".geo_status").empty().append(b)},NewDirectMessage:function(){NDM=$(".entity_send-a-message a");NDM.attr({href:NDM.attr("href")+"&ajax=1"});NDM.bind("click",function(){var a=$(".entity_send-a-message form");if(a.length===0){$(this).addClass(SN.C.S.Processing);$.get(NDM.attr("href"),null,function(b){$(".entity_send-a-message").append(document._importNode($("form",b)[0],true));a=$(".entity_send-a-message .form_notice");SN.U.FormNoticeXHR(a);SN.U.FormNoticeEnhancements(a);a.append('<button class="close">&#215;</button>');$(".entity_send-a-message button").click(function(){a.hide();return false});NDM.removeClass(SN.C.S.Processing)})}else{a.show();$(".entity_send-a-message textarea").focus()}return false})},GetFullYear:function(c,d,a){var b=new Date();b.setFullYear(c,d,a);return b},StatusNetInstance:{Set:function(b){var a=SN.U.StatusNetInstance.Get();if(a!==null){b=$.extend(a,b)}$.cookie(SN.C.S.StatusNetInstance,JSON.stringify(b),{path:"/",expires:SN.U.GetFullYear(2029,0,1)})},Get:function(){var a=$.cookie(SN.C.S.StatusNetInstance);if(a!==null){return JSON.parse(a)}return null},Delete:function(){$.cookie(SN.C.S.StatusNetInstance,null)}},belongsOnTimeline:function(b){var a=$("body").attr("id");if(a=="public"){return true}var c=$("#nav_profile a").attr("href");if(c){var d=$(b).find(".entry-title .author a.url").attr("href");if(d==c){if(a=="all"||a=="showstream"){return true}}}return false}},Init:{NoticeForm:function(){if($("body.user_in").length>0){$("."+SN.C.S.FormNotice).each(function(){var a=$(this);SN.U.NoticeLocationAttach(a);SN.U.FormNoticeXHR(a);SN.U.FormNoticeEnhancements(a);SN.U.NoticeDataAttach(a)})}},Notices:function(){if($("body.user_in").length>0){SN.U.NoticeFavor();SN.U.NoticeRepeat();SN.U.NoticeReply();SN.U.NoticeInlineReplySetup()}SN.U.NoticeAttachments()},EntityActions:function(){if($("body.user_in").length>0){$(".form_user_subscribe").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_user_unsubscribe").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_group_join").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_group_leave").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_user_nudge").live("click",function(){SN.U.FormXHR($(this));return false});SN.U.NewDirectMessage()}},Login:function(){if(SN.U.StatusNetInstance.Get()!==null){var a=SN.U.StatusNetInstance.Get().Nickname;if(a!==null){$("#form_login #nickname").val(a)}}$("#form_login").bind("submit",function(){SN.U.StatusNetInstance.Set({Nickname:$("#form_login #nickname").val()});return true})},UploadForms:function(){$("input[type=file]").change(function(d){if(typeof this.files=="object"&&this.files.length>0){var c=0;for(var b=0;b<this.files.length;b++){c+=this.files[b].size}var a=SN.U.maxFileSize($(this.form));if(a>0&&c>a){var e="File too large: maximum upload size is %d bytes.";alert(e.replace("%d",a));$(this).val("");d.preventDefault();return false}}})}}};$(document).ready(function(){SN.Init.UploadForms();if($("."+SN.C.S.FormNotice).length>0){SN.Init.NoticeForm()}if($("#content .notices").length>0){SN.Init.Notices()}if($("#content .entity_actions").length>0){SN.Init.EntityActions()}if($("#form_login").length>0){SN.Init.Login()}});if(!document.ELEMENT_NODE){document.ELEMENT_NODE=1;document.ATTRIBUTE_NODE=2;document.TEXT_NODE=3;document.CDATA_SECTION_NODE=4;document.ENTITY_REFERENCE_NODE=5;document.ENTITY_NODE=6;document.PROCESSING_INSTRUCTION_NODE=7;document.COMMENT_NODE=8;document.DOCUMENT_NODE=9;document.DOCUMENT_TYPE_NODE=10;document.DOCUMENT_FRAGMENT_NODE=11;document.NOTATION_NODE=12}document._importNode=function(e,a){switch(e.nodeType){case document.ELEMENT_NODE:var d=document.createElement(e.nodeName);if(e.attributes&&e.attributes.length>0){for(var c=0,b=e.attributes.length;c<b;){if(e.attributes[c].nodeName=="class"){d.className=e.getAttribute(e.attributes[c++].nodeName)}else{d.setAttribute(e.attributes[c].nodeName,e.getAttribute(e.attributes[c++].nodeName))}}}if(a&&e.childNodes&&e.childNodes.length>0){for(var c=0,b=e.childNodes.length;c<b;){d.appendChild(document._importNode(e.childNodes[c++],a))}}return d;break;case document.TEXT_NODE:case document.CDATA_SECTION_NODE:case document.COMMENT_NODE:return document.createTextNode(e.nodeValue);break}};if(typeof navigator.geolocation=="undefined"||navigator.geolocation.shim){(function(){(function(){if(window.google&&google.gears){return}var c=null;if(typeof GearsFactory!="undefined"){c=new GearsFactory()}else{try{c=new ActiveXObject("Gears.Factory");if(c.getBuildInfo().indexOf("ie_mobile")!=-1){c.privateSetGlobalObject(this)}}catch(d){if((typeof navigator.mimeTypes!="undefined")&&navigator.mimeTypes["application/x-googlegears"]){c=document.createElement("object");c.style.display="none";c.width=0;c.height=0;c.type="application/x-googlegears";document.documentElement.appendChild(c)}}}if(!c){return}if(!window.google){google={}}if(!google.gears){google.gears={factory:c}}})();var a=(function(){var d=google.gears.factory.create("beta.geolocation");var c=function(f,e){return function(g){f(g);e.lastPosition=g}};return{shim:true,type:"Gears",lastPosition:null,getCurrentPosition:function(e,g,h){var f=this;var i=c(e,f);d.getCurrentPosition(i,g,h)},watchPosition:function(e,f,g){d.watchPosition(e,f,g)},clearWatch:function(e){d.clearWatch(e)},getPermission:function(g,e,f){d.getPermission(g,e,f)}}});var b=(function(){var i=false;var e=function(){if(!d()&&!i){i=true;var j=document.createElement("script");j.src=(document.location.protocol=="https:"?"https://":"http://")+"www.google.com/jsapi?callback=_google_loader_apiLoaded";j.type="text/javascript";document.getElementsByTagName("body")[0].appendChild(j)}};var c=[];var h=function(j){c.push(j)};var f=function(){if(d()){while(c.length>0){var j=c.pop();j()}}};window._google_loader_apiLoaded=function(){f()};var d=function(){return(window.google&&google.loader)};var g=function(j){if(d()){return true}h(j);e();return false};e();return{shim:true,type:"ClientLocation",lastPosition:null,getCurrentPosition:function(k,n,o){var m=this;if(!g(function(){m.getCurrentPosition(k,n,o)})){return}if(google.loader.ClientLocation){var l=google.loader.ClientLocation;var j={coords:{latitude:l.latitude,longitude:l.longitude,altitude:null,accuracy:43000,altitudeAccuracy:null,heading:null,speed:null},address:{city:l.address.city,country:l.address.country,country_code:l.address.country_code,region:l.address.region},timestamp:new Date()};k(j);this.lastPosition=j}else{if(n==="function"){n({code:3,message:"Using the Google ClientLocation API and it is not able to calculate a location."})}}},watchPosition:function(j,l,m){this.getCurrentPosition(j,l,m);var k=this;var n=setInterval(function(){k.getCurrentPosition(j,l,m)},10000);return n},clearWatch:function(j){clearInterval(j)},getPermission:function(l,j,k){return true}}});navigator.geolocation=(window.google&&google.gears)?a():b()})()};
\ No newline at end of file
+var SN={C:{I:{CounterBlackout:false,MaxLength:140,PatternUsername:/^[0-9a-zA-Z\-_.]*$/,HTTP20x30x:[200,201,202,203,204,205,206,300,301,302,303,304,305,306,307]},S:{Disabled:"disabled",Warning:"warning",Error:"error",Success:"success",Processing:"processing",CommandResult:"command_result",FormNotice:"form_notice",NoticeDataGeo:"notice_data-geo",NoticeDataGeoCookie:"NoticeDataGeo",NoticeDataGeoSelected:"notice_data-geo_selected",StatusNetInstance:"StatusNetInstance"}},messages:{},msg:function(a){if(typeof SN.messages[a]=="undefined"){return"["+a+"]"}else{return SN.messages[a]}},U:{FormNoticeEnhancements:function(b){if(jQuery.data(b[0],"ElementData")===undefined){MaxLength=b.find(".count").text();if(typeof(MaxLength)=="undefined"){MaxLength=SN.C.I.MaxLength}jQuery.data(b[0],"ElementData",{MaxLength:MaxLength});SN.U.Counter(b);NDT=b.find("[name=status_textarea]");NDT.bind("keyup",function(c){SN.U.Counter(b)});var a=function(c){window.setTimeout(function(){SN.U.Counter(b)},50)};NDT.bind("cut",a).bind("paste",a)}else{b.find(".count").text(jQuery.data(b[0],"ElementData").MaxLength)}},Counter:function(d){SN.C.I.FormNoticeCurrent=d;var b=jQuery.data(d[0],"ElementData").MaxLength;if(b<=0){return}var c=b-SN.U.CharacterCount(d);var a=d.find(".count");if(c.toString()!=a.text()){if(!SN.C.I.CounterBlackout||c===0){if(a.text()!=String(c)){a.text(c)}if(c<0){d.addClass(SN.C.S.Warning)}else{d.removeClass(SN.C.S.Warning)}if(!SN.C.I.CounterBlackout){SN.C.I.CounterBlackout=true;SN.C.I.FormNoticeCurrent=d;window.setTimeout("SN.U.ClearCounterBlackout(SN.C.I.FormNoticeCurrent);",500)}}}},CharacterCount:function(a){return a.find("[name=status_textarea]").val().length},ClearCounterBlackout:function(a){SN.C.I.CounterBlackout=false;SN.U.Counter(a)},RewriteAjaxAction:function(a){if(document.location.protocol=="https:"&&a.substr(0,5)=="http:"){return a.replace(/^http:\/\/[^:\/]+/,"https://"+document.location.host)}else{return a}},FormXHR:function(a){$.ajax({type:"POST",dataType:"xml",url:SN.U.RewriteAjaxAction(a.attr("action")),data:a.serialize()+"&ajax=1",beforeSend:function(b){a.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(c,d,b){alert(b||d)},success:function(b,c){if(typeof($("form",b)[0])!="undefined"){form_new=document._importNode($("form",b)[0],true);a.replaceWith(form_new)}else{a.replaceWith(document._importNode($("p",b)[0],true))}}})},FormNoticeXHR:function(b){SN.C.I.NoticeDataGeo={};b.append('<input type="hidden" name="ajax" value="1"/>');b.attr("action",SN.U.RewriteAjaxAction(b.attr("action")));var c=function(d,e){b.append($('<p class="form_response"></p>').addClass(d).text(e))};var a=function(){b.find(".form_response").remove()};b.ajaxForm({dataType:"xml",timeout:"60000",beforeSend:function(d){if(b.find("[name=status_textarea]").val()==""){b.addClass(SN.C.S.Warning);return false}b.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled);SN.U.normalizeGeoData(b);return true},error:function(f,g,e){b.removeClass(SN.C.S.Processing).find(".submit").removeClass(SN.C.S.Disabled).removeAttr(SN.C.S.Disabled,SN.C.S.Disabled);a();if(g=="timeout"){c("error","Sorry! We had trouble sending your notice. The servers are overloaded. Please try again, and contact the site administrator if this problem persists.")}else{var d=SN.U.GetResponseXML(f);if($("."+SN.C.S.Error,d).length>0){b.append(document._importNode($("."+SN.C.S.Error,d)[0],true))}else{if(parseInt(f.status)===0||jQuery.inArray(parseInt(f.status),SN.C.I.HTTP20x30x)>=0){b.resetForm().find(".attach-status").remove();SN.U.FormNoticeEnhancements(b)}else{c("error","(Sorry! We had trouble sending your notice ("+f.status+" "+f.statusText+"). Please report the problem to the site administrator if this happens again.")}}}},success:function(i,f){a();var n=$("#"+SN.C.S.Error,i);if(n.length>0){c("error",n.text())}else{if($("body")[0].id=="bookmarklet"){self.close()}var d=$("#"+SN.C.S.CommandResult,i);if(d.length>0){c("success",d.text())}else{var m=document._importNode($("li",i)[0],true);var k=$("#notices_primary .notices:first");var l=b.closest("li.notice-reply");if(l.length>0){var e=$(m).attr("id");if($("#"+e).length==0){var j=l.closest("li.notice");l.replaceWith(m);SN.U.NoticeInlineReplyPlaceholder(j)}else{l.remove()}}else{if(k.length>0&&SN.U.belongsOnTimeline(m)){if($("#"+m.id).length===0){var h=b.find("[name=inreplyto]").val();var g="#notices_primary #notice-"+h;if($("body")[0].id=="conversation"){if(h.length>0&&$(g+" .notices").length<1){$(g).append('<ul class="notices"></ul>')}$($(g+" .notices")[0]).append(m)}else{k.prepend(m)}$("#"+m.id).css({display:"none"}).fadeIn(2500);SN.U.NoticeWithAttachment($("#"+m.id));SN.U.NoticeReplyTo($("#"+m.id))}}else{c("success",$("title",i).text())}}}b.resetForm();b.find("[name=inreplyto]").val("");b.find(".attach-status").remove();SN.U.FormNoticeEnhancements(b)}},complete:function(d,e){b.removeClass(SN.C.S.Processing).find(".submit").removeAttr(SN.C.S.Disabled).removeClass(SN.C.S.Disabled);b.find("[name=lat]").val(SN.C.I.NoticeDataGeo.NLat);b.find("[name=lon]").val(SN.C.I.NoticeDataGeo.NLon);b.find("[name=location_ns]").val(SN.C.I.NoticeDataGeo.NLNS);b.find("[name=location_id]").val(SN.C.I.NoticeDataGeo.NLID);b.find("[name=notice_data-geo]").attr("checked",SN.C.I.NoticeDataGeo.NDG)}})},normalizeGeoData:function(a){SN.C.I.NoticeDataGeo.NLat=a.find("[name=lat]").val();SN.C.I.NoticeDataGeo.NLon=a.find("[name=lon]").val();SN.C.I.NoticeDataGeo.NLNS=a.find("[name=location_ns]").val();SN.C.I.NoticeDataGeo.NLID=a.find("[name=location_id]").val();SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked");var b=$.cookie(SN.C.S.NoticeDataGeoCookie);if(b!==null&&b!="disabled"){b=JSON.parse(b);SN.C.I.NoticeDataGeo.NLat=a.find("[name=lat]").val(b.NLat).val();SN.C.I.NoticeDataGeo.NLon=a.find("[name=lon]").val(b.NLon).val();if(b.NLNS){SN.C.I.NoticeDataGeo.NLNS=a.find("[name=location_ns]").val(b.NLNS).val();SN.C.I.NoticeDataGeo.NLID=a.find("[name=location_id]").val(b.NLID).val()}else{a.find("[name=location_ns]").val("");a.find("[name=location_id]").val("")}}if(b=="disabled"){SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked",false).attr("checked")}else{SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked",true).attr("checked")}},GetResponseXML:function(b){try{return b.responseXML}catch(a){return(new DOMParser()).parseFromString(b.responseText,"text/xml")}},NoticeReply:function(){if($("#content .notice_reply").length>0){$("#content .notice").each(function(){SN.U.NoticeReplyTo($(this))})}},NoticeReplyTo:function(a){a.find(".notice_reply").live("click",function(c){c.preventDefault();var b=($(".author .nickname",a).length>0)?$($(".author .nickname",a)[0]):$(".author .nickname.uid");SN.U.NoticeInlineReplyTrigger(a,"@"+b.text());return false})},NoticeInlineReplyTrigger:function(g,h){var b=$($(".notice_id",g)[0]).text();var d=g;var e=g.closest(".notices");if(e.hasClass("threaded-replies")){d=e.closest(".notice")}else{e=$("ul.threaded-replies",g);if(e.length==0){e=$('<ul class="notices threaded-replies xoxo"></ul>');g.append(e)}}var i=$(".notice-reply-form",e);var c=function(){i.find("input[name=inreplyto]").val(b);var l=i.find("textarea");if(l.length==0){throw"No textarea"}var k="";if(h){k=h+" "}l.val(k+l.val().replace(RegExp(k,"i"),""));l.data("initialText",$.trim(h+""));l.focus();if(l[0].setSelectionRange){var j=l.val().length;l[0].setSelectionRange(j,j)}};if(i.length>0){c()}else{$("li.notice-reply-placeholder").remove();var f=$("li.notice-reply",e);if(f.length==0){var a=$("#form_notice").attr("action");f=$('<li class="notice-reply"></li>');$.get(a,{ajax:1},function(l,n,m){var j=document._importNode($("form",l)[0],true);f.append(j);e.append(f);var k=i=$(j);SN.U.NoticeLocationAttach(k);SN.U.FormNoticeXHR(k);SN.U.FormNoticeEnhancements(k);SN.U.NoticeDataAttach(k);c()})}}},NoticeFavor:function(){$(".form_favor").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_disfavor").live("click",function(){SN.U.FormXHR($(this));return false})},NoticeInlineReplyPlaceholder:function(b){var a=b.find("ul.threaded-replies");var c=$('<li class="notice-reply-placeholder"><input class="placeholder"></li>');c.click(function(){SN.U.NoticeInlineReplyTrigger(b)});c.find("input").val(SN.msg("reply_placeholder"));a.append(c)},NoticeInlineReplySetup:function(){$(".threaded-replies").each(function(){var b=$(this);var a=b.closest(".notice");SN.U.NoticeInlineReplyPlaceholder(a)})},NoticeRepeat:function(){$(".form_repeat").live("click",function(a){a.preventDefault();SN.U.NoticeRepeatConfirmation($(this));return false})},NoticeRepeatConfirmation:function(a){var c=a.find(".submit");var b=c.clone();b.addClass("submit_dialogbox").removeClass("submit");a.append(b);b.bind("click",function(){SN.U.FormXHR(a);return false});c.hide();a.addClass("dialogbox").append('<button class="close">&#215;</button>').closest(".notice-options").addClass("opaque");a.find("button.close").click(function(){$(this).remove();a.removeClass("dialogbox").closest(".notice-options").removeClass("opaque");a.find(".submit_dialogbox").remove();a.find(".submit").show();return false})},NoticeAttachments:function(){$(".notice a.attachment").each(function(){SN.U.NoticeWithAttachment($(this).closest(".notice"))})},NoticeWithAttachment:function(b){if(b.find(".attachment").length===0){return}var a=b.find(".attachment.more");if(a.length>0){$(a[0]).click(function(){var c=$(this);c.addClass(SN.C.S.Processing);$.get(c.attr("href")+"/ajax",null,function(d){c.parent(".entry-content").html($(d).find("#attachment_view .entry-content").html())});return false}).attr("title",SN.msg("showmore_tooltip"))}},NoticeDataAttach:function(b){var a=b.find("input[type=file]");a.change(function(f){b.find(".attach-status").remove();var d=$(this).val();if(!d){return false}var c=$('<div class="attach-status '+SN.C.S.Success+'"><code></code> <button class="close">&#215;</button></div>');c.find("code").text(d);c.find("button").click(function(){c.remove();a.val("");return false});b.append(c);if(typeof this.files=="object"){for(var e=0;e<this.files.length;e++){SN.U.PreviewAttach(b,this.files[e])}}})},maxFileSize:function(b){var a=$(b).find("input[name=MAX_FILE_SIZE]").attr("value");if(a){return parseInt(a)}else{return 0}},PreviewAttach:function(d,c){var e=c.type+" "+Math.round(c.size/1024)+"KB";var f=true;var h;if(typeof window.createObjectURL!="undefined"){h=function(i,j){j(window.createObjectURL(i))}}else{if(typeof window.FileReader!="undefined"){h=function(j,k){var i=new FileReader();i.onload=function(l){k(i.result)};i.readAsDataURL(j)}}else{f=false}}var a=["image/png","image/jpeg","image/gif","image/svg+xml"];if($.inArray(c.type,a)==-1){f=false}var g=8*1024*1024;if(c.size>g){f=false}if(f){h(c,function(j){var i=$("<img>").attr("title",e).attr("alt",e).attr("src",j).attr("style","height: 120px");d.find(".attach-status").append(i)})}else{var b=$("<div></div>").text(e);d.find(".attach-status").append(b)}},NoticeLocationAttach:function(a){var e=a.find("[name=lat]");var k=a.find("[name=lon]");var g=a.find("[name=location_ns]").val();var l=a.find("[name=location_id]").val();var b="";var d=a.find("[name=notice_data-geo]");var c=a.find("[name=notice_data-geo]");var j=a.find("label.notice_data-geo");function f(n){j.attr("title",jQuery.trim(j.text())).removeClass("checked");a.find("[name=lat]").val("");a.find("[name=lon]").val("");a.find("[name=location_ns]").val("");a.find("[name=location_id]").val("");a.find("[name=notice_data-geo]").attr("checked",false);$.cookie(SN.C.S.NoticeDataGeoCookie,"disabled",{path:"/"});if(n){a.find(".geo_status_wrapper").removeClass("success").addClass("error");a.find(".geo_status_wrapper .geo_status").text(n)}else{a.find(".geo_status_wrapper").remove()}}function m(n,o){SN.U.NoticeGeoStatus(a,"Looking up place name...");$.getJSON(n,o,function(p){var q,r;if(typeof(p.location_ns)!="undefined"){a.find("[name=location_ns]").val(p.location_ns);q=p.location_ns}if(typeof(p.location_id)!="undefined"){a.find("[name=location_id]").val(p.location_id);r=p.location_id}if(typeof(p.name)=="undefined"){NLN_text=o.lat+";"+o.lon}else{NLN_text=p.name}SN.U.NoticeGeoStatus(a,NLN_text,o.lat,o.lon,p.url);j.attr("title",NoticeDataGeo_text.ShareDisable+" ("+NLN_text+")");a.find("[name=lat]").val(o.lat);a.find("[name=lon]").val(o.lon);a.find("[name=location_ns]").val(q);a.find("[name=location_id]").val(r);a.find("[name=notice_data-geo]").attr("checked",true);var s={NLat:o.lat,NLon:o.lon,NLNS:q,NLID:r,NLN:NLN_text,NLNU:p.url,NDG:true};$.cookie(SN.C.S.NoticeDataGeoCookie,JSON.stringify(s),{path:"/"})})}if(c.length>0){if($.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){c.attr("checked",false)}else{c.attr("checked",true)}var h=a.find(".notice_data-geo_wrap");var i=h.attr("title");h.removeAttr("title");j.attr("title",j.text());c.change(function(){if(c.attr("checked")===true||$.cookie(SN.C.S.NoticeDataGeoCookie)===null){j.attr("title",NoticeDataGeo_text.ShareDisable).addClass("checked");if($.cookie(SN.C.S.NoticeDataGeoCookie)===null||$.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){if(navigator.geolocation){SN.U.NoticeGeoStatus(a,"Requesting location from browser...");navigator.geolocation.getCurrentPosition(function(p){a.find("[name=lat]").val(p.coords.latitude);a.find("[name=lon]").val(p.coords.longitude);var q={lat:p.coords.latitude,lon:p.coords.longitude,token:$("#token").val()};m(i,q)},function(p){switch(p.code){case p.PERMISSION_DENIED:f("Location permission denied.");break;case p.TIMEOUT:f("Location lookup timeout.");break}},{timeout:10000})}else{if(e.length>0&&k.length>0){var n={lat:e,lon:k,token:$("#token").val()};m(i,n)}else{f();c.remove();j.remove()}}}else{var o=JSON.parse($.cookie(SN.C.S.NoticeDataGeoCookie));a.find("[name=lat]").val(o.NLat);a.find("[name=lon]").val(o.NLon);a.find("[name=location_ns]").val(o.NLNS);a.find("[name=location_id]").val(o.NLID);a.find("[name=notice_data-geo]").attr("checked",o.NDG);SN.U.NoticeGeoStatus(a,o.NLN,o.NLat,o.NLon,o.NLNU);j.attr("title",NoticeDataGeo_text.ShareDisable+" ("+o.NLN+")").addClass("checked")}}else{f()}}).change()}},NoticeGeoStatus:function(e,a,f,g,c){var h=e.find(".geo_status_wrapper");if(h.length==0){h=$('<div class="'+SN.C.S.Success+' geo_status_wrapper"><button class="close" style="float:right">&#215;</button><div class="geo_status"></div></div>');h.find("button.close").click(function(){e.find("[name=notice_data-geo]").removeAttr("checked").change()});e.append(h)}var b;if(c){b=$("<a></a>").attr("href",c)}else{b=$("<span></span>")}b.text(a);if(f||g){var d=f+";"+g;b.attr("title",d);if(!a){b.text(d)}}h.find(".geo_status").empty().append(b)},NewDirectMessage:function(){NDM=$(".entity_send-a-message a");NDM.attr({href:NDM.attr("href")+"&ajax=1"});NDM.bind("click",function(){var a=$(".entity_send-a-message form");if(a.length===0){$(this).addClass(SN.C.S.Processing);$.get(NDM.attr("href"),null,function(b){$(".entity_send-a-message").append(document._importNode($("form",b)[0],true));a=$(".entity_send-a-message .form_notice");SN.U.FormNoticeXHR(a);SN.U.FormNoticeEnhancements(a);a.append('<button class="close">&#215;</button>');$(".entity_send-a-message button").click(function(){a.hide();return false});NDM.removeClass(SN.C.S.Processing)})}else{a.show();$(".entity_send-a-message textarea").focus()}return false})},GetFullYear:function(c,d,a){var b=new Date();b.setFullYear(c,d,a);return b},StatusNetInstance:{Set:function(b){var a=SN.U.StatusNetInstance.Get();if(a!==null){b=$.extend(a,b)}$.cookie(SN.C.S.StatusNetInstance,JSON.stringify(b),{path:"/",expires:SN.U.GetFullYear(2029,0,1)})},Get:function(){var a=$.cookie(SN.C.S.StatusNetInstance);if(a!==null){return JSON.parse(a)}return null},Delete:function(){$.cookie(SN.C.S.StatusNetInstance,null)}},belongsOnTimeline:function(b){var a=$("body").attr("id");if(a=="public"){return true}var c=$("#nav_profile a").attr("href");if(c){var d=$(b).find(".entry-title .author a.url").attr("href");if(d==c){if(a=="all"||a=="showstream"){return true}}}return false}},Init:{NoticeForm:function(){if($("body.user_in").length>0){$("."+SN.C.S.FormNotice).each(function(){var a=$(this);SN.U.NoticeLocationAttach(a);SN.U.FormNoticeXHR(a);SN.U.FormNoticeEnhancements(a);SN.U.NoticeDataAttach(a)})}},Notices:function(){if($("body.user_in").length>0){SN.U.NoticeFavor();SN.U.NoticeRepeat();SN.U.NoticeReply();SN.U.NoticeInlineReplySetup()}SN.U.NoticeAttachments()},EntityActions:function(){if($("body.user_in").length>0){$(".form_user_subscribe").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_user_unsubscribe").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_group_join").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_group_leave").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_user_nudge").live("click",function(){SN.U.FormXHR($(this));return false});SN.U.NewDirectMessage()}},Login:function(){if(SN.U.StatusNetInstance.Get()!==null){var a=SN.U.StatusNetInstance.Get().Nickname;if(a!==null){$("#form_login #nickname").val(a)}}$("#form_login").bind("submit",function(){SN.U.StatusNetInstance.Set({Nickname:$("#form_login #nickname").val()});return true})},UploadForms:function(){$("input[type=file]").change(function(d){if(typeof this.files=="object"&&this.files.length>0){var c=0;for(var b=0;b<this.files.length;b++){c+=this.files[b].size}var a=SN.U.maxFileSize($(this.form));if(a>0&&c>a){var e="File too large: maximum upload size is %d bytes.";alert(e.replace("%d",a));$(this).val("");d.preventDefault();return false}}})}}};$(document).ready(function(){SN.Init.UploadForms();if($("."+SN.C.S.FormNotice).length>0){SN.Init.NoticeForm()}if($("#content .notices").length>0){SN.Init.Notices()}if($("#content .entity_actions").length>0){SN.Init.EntityActions()}if($("#form_login").length>0){SN.Init.Login()}});if(!document.ELEMENT_NODE){document.ELEMENT_NODE=1;document.ATTRIBUTE_NODE=2;document.TEXT_NODE=3;document.CDATA_SECTION_NODE=4;document.ENTITY_REFERENCE_NODE=5;document.ENTITY_NODE=6;document.PROCESSING_INSTRUCTION_NODE=7;document.COMMENT_NODE=8;document.DOCUMENT_NODE=9;document.DOCUMENT_TYPE_NODE=10;document.DOCUMENT_FRAGMENT_NODE=11;document.NOTATION_NODE=12}document._importNode=function(e,a){switch(e.nodeType){case document.ELEMENT_NODE:var d=document.createElement(e.nodeName);if(e.attributes&&e.attributes.length>0){for(var c=0,b=e.attributes.length;c<b;){if(e.attributes[c].nodeName=="class"){d.className=e.getAttribute(e.attributes[c++].nodeName)}else{d.setAttribute(e.attributes[c].nodeName,e.getAttribute(e.attributes[c++].nodeName))}}}if(a&&e.childNodes&&e.childNodes.length>0){for(var c=0,b=e.childNodes.length;c<b;){d.appendChild(document._importNode(e.childNodes[c++],a))}}return d;break;case document.TEXT_NODE:case document.CDATA_SECTION_NODE:case document.COMMENT_NODE:return document.createTextNode(e.nodeValue);break}};if(typeof navigator.geolocation=="undefined"||navigator.geolocation.shim){(function(){(function(){if(window.google&&google.gears){return}var c=null;if(typeof GearsFactory!="undefined"){c=new GearsFactory()}else{try{c=new ActiveXObject("Gears.Factory");if(c.getBuildInfo().indexOf("ie_mobile")!=-1){c.privateSetGlobalObject(this)}}catch(d){if((typeof navigator.mimeTypes!="undefined")&&navigator.mimeTypes["application/x-googlegears"]){c=document.createElement("object");c.style.display="none";c.width=0;c.height=0;c.type="application/x-googlegears";document.documentElement.appendChild(c)}}}if(!c){return}if(!window.google){google={}}if(!google.gears){google.gears={factory:c}}})();var a=(function(){var d=google.gears.factory.create("beta.geolocation");var c=function(f,e){return function(g){f(g);e.lastPosition=g}};return{shim:true,type:"Gears",lastPosition:null,getCurrentPosition:function(e,g,h){var f=this;var i=c(e,f);d.getCurrentPosition(i,g,h)},watchPosition:function(e,f,g){d.watchPosition(e,f,g)},clearWatch:function(e){d.clearWatch(e)},getPermission:function(g,e,f){d.getPermission(g,e,f)}}});var b=(function(){var i=false;var e=function(){if(!d()&&!i){i=true;var j=document.createElement("script");j.src=(document.location.protocol=="https:"?"https://":"http://")+"www.google.com/jsapi?callback=_google_loader_apiLoaded";j.type="text/javascript";document.getElementsByTagName("body")[0].appendChild(j)}};var c=[];var h=function(j){c.push(j)};var f=function(){if(d()){while(c.length>0){var j=c.pop();j()}}};window._google_loader_apiLoaded=function(){f()};var d=function(){return(window.google&&google.loader)};var g=function(j){if(d()){return true}h(j);e();return false};e();return{shim:true,type:"ClientLocation",lastPosition:null,getCurrentPosition:function(k,n,o){var m=this;if(!g(function(){m.getCurrentPosition(k,n,o)})){return}if(google.loader.ClientLocation){var l=google.loader.ClientLocation;var j={coords:{latitude:l.latitude,longitude:l.longitude,altitude:null,accuracy:43000,altitudeAccuracy:null,heading:null,speed:null},address:{city:l.address.city,country:l.address.country,country_code:l.address.country_code,region:l.address.region},timestamp:new Date()};k(j);this.lastPosition=j}else{if(n==="function"){n({code:3,message:"Using the Google ClientLocation API and it is not able to calculate a location."})}}},watchPosition:function(j,l,m){this.getCurrentPosition(j,l,m);var k=this;var n=setInterval(function(){k.getCurrentPosition(j,l,m)},10000);return n},clearWatch:function(j){clearInterval(j)},getPermission:function(l,j,k){return true}}});navigator.geolocation=(window.google&&google.gears)?a():b()})()};
\ No newline at end of file

From b37e12ed3436e7616c491016a68342559752d178 Mon Sep 17 00:00:00 2001
From: Siebrand Mazeland <s.mazeland@xs4all.nl>
Date: Sat, 5 Mar 2011 00:12:38 +0100
Subject: [PATCH 400/655] * translator documntation updated * superfluous
 whitespace remove * minor L10n and i18n updates

---
 actions/licenseadminpanel.php | 46 ++++++++++++++++++++++++++++-------
 actions/login.php             | 17 ++++++++++++-
 actions/logout.php            |  1 -
 actions/makeadmin.php         | 14 +++++++++++
 actions/microsummary.php      | 12 +++++----
 actions/newmessage.php        | 19 +++++++++++++--
 actions/newnotice.php         |  5 ++++
 actions/nudge.php             |  5 +++-
 actions/oembed.php            | 12 +++++++++
 actions/opensearch.php        |  2 +-
 10 files changed, 113 insertions(+), 20 deletions(-)

diff --git a/actions/licenseadminpanel.php b/actions/licenseadminpanel.php
index 4adeb5c3c6..fda7cd4359 100644
--- a/actions/licenseadminpanel.php
+++ b/actions/licenseadminpanel.php
@@ -42,7 +42,6 @@ if (!defined('STATUSNET')) {
  */
 class LicenseadminpanelAction extends AdminPanelAction
 {
-
     /**
      * Returns the page title
      *
@@ -62,6 +61,7 @@ class LicenseadminpanelAction extends AdminPanelAction
      */
     function getInstructions()
     {
+        // TRANS: Form instructions for the site license admin panel.
         return _('License for this StatusNet site');
     }
 
@@ -131,7 +131,8 @@ class LicenseadminpanelAction extends AdminPanelAction
         $types = array('private', 'allrightsreserved', 'cc');
 
         if (!in_array($values['license']['type'], $types)) {
-            $this->clientError(_("Invalid license selection."));
+            // TRANS: Client error displayed selecting an invalid license in the license admin panel.
+            $this->clientError(_('Invalid license selection.'));
         }
 
         // Make sure the user has set an owner if the site has a private
@@ -141,13 +142,15 @@ class LicenseadminpanelAction extends AdminPanelAction
             && empty($values['license']['owner'])
         ) {
             $this->clientError(
-                _("You must specify the owner of the content when using the All Rights Reserved license.")
+                // TRANS: Client error displayed when not specifying an owner for the all rights reserved license in the license admin panel.
+                _('You must specify the owner of the content when using the All Rights Reserved license.')
             );
         }
 
         // Make sure the license title is not too long
         if (mb_strlen($values['license']['type']) > 255) {
             $this->clientError(
+                // TRANS: Client error displayed selecting a too long license title in the license admin panel.
                 _('Invalid license title. Maximum length is 255 characters.')
             );
         }
@@ -160,10 +163,12 @@ class LicenseadminpanelAction extends AdminPanelAction
 
         if ($values['license']['type'] == 'cc') {
             if (!Validate::uri($values['license']['url'], $options)) {
-                $this->clientError(_("Invalid license URL."));
+                // TRANS: Client error displayed specifying an invalid license URL in the license admin panel.
+                $this->clientError(_('Invalid license URL.'));
             }
             if (!Validate::uri($values['license']['image'], $options)) {
-                $this->clientError(_("Invalid license image URL."));
+                // TRANS: Client error displayed specifying an invalid license image URL in the license admin panel.
+                $this->clientError(_('Invalid license image URL.'));
             }
         }
 
@@ -171,7 +176,8 @@ class LicenseadminpanelAction extends AdminPanelAction
 
         if (!empty($values['license']['url'])) {
             if (!Validate::uri($values['license']['url'], $options)) {
-                $this->clientError(_("License URL must be blank or a valid URL."));
+                // TRANS: Client error displayed specifying an invalid license URL in the license admin panel.
+                $this->clientError(_('License URL must be blank or a valid URL.'));
             }
         }
 
@@ -179,7 +185,8 @@ class LicenseadminpanelAction extends AdminPanelAction
 
         if (!empty($values['license']['image'])) {
             if (!Validate::uri($values['license']['image'], $options)) {
-                $this->clientError(_("License image must be blank or valid URL."));
+                // TRANS: Client error displayed specifying an invalid license image URL in the license admin panel.
+                $this->clientError(_('License image must be blank or valid URL.'));
             }
         }
     }
@@ -229,22 +236,28 @@ class LicenseAdminPanelForm extends AdminForm
         $this->out->elementStart(
             'fieldset', array('id' => 'settings_license-selection')
         );
+        // TRANS: Form legend in the license admin panel.
         $this->out->element('legend', null, _('License selection'));
         $this->out->elementStart('ul', 'form_data');
 
         $this->li();
 
         $types = array(
+            // TRANS: License option in the license admin panel.
             'private' => _('Private'),
+            // TRANS: License option in the license admin panel.
             'allrightsreserved' => _('All Rights Reserved'),
+            // TRANS: License option in the license admin panel.
             'cc' => _('Creative Commons')
         );
 
         $this->out->dropdown(
             'type',
+            // TRANS: Dropdown field label in the license admin panel.
             _('Type'),
             $types,
-            _('Select license'),
+            // TRANS: Dropdown field instructions in the license admin panel.
+            _('Select a license.'),
             false,
             $this->value('type', 'license')
         );
@@ -258,13 +271,16 @@ class LicenseAdminPanelForm extends AdminForm
             'fieldset',
             array('id' => 'settings_license-details')
         );
+        // TRANS: Form legend in the license admin panel.
         $this->out->element('legend', null, _('License details'));
         $this->out->elementStart('ul', 'form_data');
 
         $this->li();
         $this->input(
             'owner',
+            // TRANS: Field label in the license admin panel.
             _('Owner'),
+            // TRANS: Field title in the license admin panel.
             _('Name of the owner of the site\'s content (if applicable).'),
             'license'
         );
@@ -273,7 +289,9 @@ class LicenseAdminPanelForm extends AdminForm
         $this->li();
         $this->input(
             'title',
+            // TRANS: Field label in the license admin panel.
             _('License Title'),
+            // TRANS: Field title in the license admin panel.
             _('The title of the license.'),
             'license'
         );
@@ -282,7 +300,9 @@ class LicenseAdminPanelForm extends AdminForm
         $this->li();
         $this->input(
             'url',
+            // TRANS: Field label in the license admin panel.
             _('License URL'),
+            // TRANS: Field title in the license admin panel.
             _('URL for more information about the license.'),
             'license'
         );
@@ -290,7 +310,9 @@ class LicenseAdminPanelForm extends AdminForm
 
         $this->li();
         $this->input(
+            // TRANS: Field label in the license admin panel.
             'image', _('License Image URL'),
+            // TRANS: Field title in the license admin panel.
             _('URL for an image to display with the license.'),
             'license'
         );
@@ -308,7 +330,13 @@ class LicenseAdminPanelForm extends AdminForm
     function formActions()
     {
         $this->out->submit(
-            'submit', _('Save'), 'submit', null, _('Save license settings')
+            'submit',
+            // TRANS: Button text in the license admin panel.
+            _m('BUTTON','Save'),
+            'submit',
+            null,
+            // TRANS: Button title in the license admin panel.
+            _('Save license settings.')
         );
     }
 }
diff --git a/actions/login.php b/actions/login.php
index 8d51a01449..768bc04cef 100644
--- a/actions/login.php
+++ b/actions/login.php
@@ -94,6 +94,7 @@ class LoginAction extends Action
         parent::handle($args);
 
         if (common_is_real_login()) {
+            // TRANS: Client error displayed when trying to log in while already logged in.
             $this->clientError(_('Already logged in.'));
         } else if ($_SERVER['REQUEST_METHOD'] == 'POST') {
             $this->checkLogin();
@@ -122,12 +123,14 @@ class LoginAction extends Action
         $user = common_check_user($nickname, $password);
 
         if (!$user) {
+            // TRANS: Form validation error displayed when trying to log in with incorrect credentials.
             $this->showForm(_('Incorrect username or password.'));
             return;
         }
 
         // success!
         if (!common_set_user($user)) {
+            // TRANS: Server error displayed when during login a server error occurs.
             $this->serverError(_('Error setting user. You are probably not authorized.'));
             return;
         }
@@ -182,6 +185,7 @@ class LoginAction extends Action
      */
     function title()
     {
+        // TRANS: Page title for login page.
         return _('Login');
     }
 
@@ -219,25 +223,32 @@ class LoginAction extends Action
                                           'class' => 'form_settings',
                                           'action' => common_local_url('login')));
         $this->elementStart('fieldset');
+        // TRANS: Form legend on login page.
         $this->element('legend', null, _('Login to site'));
         $this->elementStart('ul', 'form_data');
         $this->elementStart('li');
+        // TRANS: Field label on login page.
         $this->input('nickname', _('Nickname'));
         $this->elementEnd('li');
         $this->elementStart('li');
+        // TRANS: Field label on login page.
         $this->password('password', _('Password'));
         $this->elementEnd('li');
         $this->elementStart('li');
+        // TRANS: Checkbox label label on login page.
         $this->checkbox('rememberme', _('Remember me'), false,
+                        // TRANS: Checkbox title on login page.
                         _('Automatically login in the future; ' .
                           'not for shared computers!'));
         $this->elementEnd('li');
         $this->elementEnd('ul');
-        $this->submit('submit', _('Login'));
+        // TRANS: Button text for log in on login page.
+        $this->submit('submit', _m('BUTTON','Login'));
         $this->elementEnd('fieldset');
         $this->elementEnd('form');
         $this->elementStart('p');
         $this->element('a', array('href' => common_local_url('recoverpassword')),
+                       // TRANS: Link text for link to "reset password" on login page.
                        _('Lost or forgotten password?'));
         $this->elementEnd('p');
     }
@@ -256,13 +267,17 @@ class LoginAction extends Action
             common_get_returnto()) {
             // rememberme logins have to reauthenticate before
             // changing any profile settings (cookie-stealing protection)
+            // TRANS: Form instructions on login page before being able to change user settings.
             return _('For security reasons, please re-enter your ' .
                      'user name and password ' .
                      'before changing your settings.');
         } else {
+            // TRANS: Form instructions on login page.
             $prompt = _('Login with your username and password.');
             if (!common_config('site', 'closed') && !common_config('site', 'inviteonly')) {
                 $prompt .= ' ';
+                // TRANS: Form instructions on login page. This message contains Markdown links in the form [Link text](Link).
+                // TRANS: %%action.register%% is a link to the registration page.
                 $prompt .= _('Don\'t have a username yet? ' .
                              '[Register](%%action.register%%) a new account.');
             }
diff --git a/actions/logout.php b/actions/logout.php
index f747371225..8e903db221 100644
--- a/actions/logout.php
+++ b/actions/logout.php
@@ -44,7 +44,6 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
  */
 class LogoutAction extends Action
 {
-
     /**
      * This is read only.
      *
diff --git a/actions/makeadmin.php b/actions/makeadmin.php
index 4e6e97a569..3613e1eb70 100644
--- a/actions/makeadmin.php
+++ b/actions/makeadmin.php
@@ -58,6 +58,7 @@ class MakeadminAction extends RedirectingAction
     {
         parent::prepare($args);
         if (!common_logged_in()) {
+            // TRANS: Client error displayed when trying to access the "make admin" page while not logged in.
             $this->clientError(_('Not logged in.'));
             return false;
         }
@@ -68,31 +69,38 @@ class MakeadminAction extends RedirectingAction
         }
         $id = $this->trimmed('profileid');
         if (empty($id)) {
+            // TRANS: Client error displayed when not providing a profile ID on the Make Admin page.
             $this->clientError(_('No profile specified.'));
             return false;
         }
         $this->profile = Profile::staticGet('id', $id);
         if (empty($this->profile)) {
+            // TRANS: Client error displayed when specifying an invalid profile ID on the Make Admin page.
             $this->clientError(_('No profile with that ID.'));
             return false;
         }
         $group_id = $this->trimmed('groupid');
         if (empty($group_id)) {
+            // TRANS: Client error displayed when not providing a group ID on the Make Admin page.
             $this->clientError(_('No group specified.'));
             return false;
         }
         $this->group = User_group::staticGet('id', $group_id);
         if (empty($this->group)) {
+            // TRANS: Client error displayed when providing an invalid group ID on the Make Admin page.
             $this->clientError(_('No such group.'));
             return false;
         }
         $user = common_current_user();
         if (!$user->isAdmin($this->group) &&
             !$user->hasRight(Right::MAKEGROUPADMIN)) {
+            // TRANS: Client error displayed when trying to make another user admin on the Make Admin page while not an admin.
             $this->clientError(_('Only an admin can make another user an admin.'), 401);
             return false;
         }
         if ($this->profile->isAdmin($this->group)) {
+            // TRANS: Client error displayed when trying to make another user admin on the Make Admin page who already is admin.
+            // TRANS: %1$s is the user that is already admin, %2$s is the group user is already admin for.
             $this->clientError(sprintf(_('%1$s is already an admin for group "%2$s".'),
                                        $this->profile->getBestName(),
                                        $this->group->getBestName()),
@@ -130,6 +138,9 @@ class MakeadminAction extends RedirectingAction
                                               'profile_id' => $this->profile->id));
 
         if (empty($member)) {
+            // TRANS: Server error displayed when trying to make another user admin on the Make Admin page fails
+            // TRANS: because the group membership record could not be gotten.
+            // TRANS: %1$s is the to be admin user, %2$s is the group user should be admin for.
             $this->serverError(_('Can\'t get membership record for %1$s in group %2$s.'),
                                $this->profile->getBestName(),
                                $this->group->getBestName());
@@ -143,6 +154,9 @@ class MakeadminAction extends RedirectingAction
 
         if (!$result) {
             common_log_db_error($member, 'UPDATE', __FILE__);
+            // TRANS: Server error displayed when trying to make another user admin on the Make Admin page fails
+            // TRANS: because the group adminship record coud not be saved properly.
+            // TRANS: %1$s is the to be admin user, %2$s is the group user is already admin for.
             $this->serverError(_('Can\'t make %1$s an admin for group %2$s.'),
                                $this->profile->getBestName(),
                                $this->group->getBestName());
diff --git a/actions/microsummary.php b/actions/microsummary.php
index d145dc3bc7..6d47e85c68 100644
--- a/actions/microsummary.php
+++ b/actions/microsummary.php
@@ -46,7 +46,7 @@ class MicrosummaryAction extends Action
 {
     /**
      * Class handler.
-     * 
+     *
      * @param array $args array of arguments
      *
      * @return nothing
@@ -59,18 +59,20 @@ class MicrosummaryAction extends Action
         $user     = User::staticGet('nickname', $nickname);
 
         if (!$user) {
+            // TRANS: Client error displayed trying to make a micro summary without providing a valid user.
             $this->clientError(_('No such user.'), 404);
             return;
         }
-        
+
         $notice = $user->getCurrentNotice();
-        
+
         if (!$notice) {
+            // TRANS: Client error displayed trying to make a micro summary without providing a status.
             $this->clientError(_('No current status.'), 404);
         }
-        
+
         header('Content-Type: text/plain');
-        
+
         print $user->nickname . ': ' . $notice->content;
     }
 
diff --git a/actions/newmessage.php b/actions/newmessage.php
index 447a00580c..8a03aebfac 100644
--- a/actions/newmessage.php
+++ b/actions/newmessage.php
@@ -68,6 +68,7 @@ class NewmessageAction extends Action
 
     function title()
     {
+        // TRANS: Page title for new direct message page.
         return _('New message');
     }
 
@@ -84,6 +85,7 @@ class NewmessageAction extends Action
         parent::handle($args);
 
         if (!common_logged_in()) {
+            // TRANS: Client error displayed trying to create a new direct message while not logged in.
             $this->clientError(_('Not logged in.'), 403);
         } else if ($_SERVER['REQUEST_METHOD'] == 'POST') {
             $this->saveNewMessage();
@@ -113,12 +115,15 @@ class NewmessageAction extends Action
             $this->other = User::staticGet('id', $this->to);
 
             if (!$this->other) {
+                // TRANS: Client error displayed trying to send a direct message to a non-existing user.
                 $this->clientError(_('No such user.'), 404);
                 return false;
             }
 
             if (!$user->mutuallySubscribed($this->other)) {
-                $this->clientError(_('You can\'t send a message to this user.'), 404);
+                // TRANS: Client error displayed trying to send a direct message to a user while sender and
+                // TRANS: receiver are not subscribed to each other.
+                $this->clientError(_('You cannot send a message to this user.'), 404);
                 return false;
             }
         }
@@ -141,6 +146,7 @@ class NewmessageAction extends Action
         assert($user); // XXX: maybe an error instead...
 
         if (!$this->content) {
+            // TRANS: Form validator error displayed trying to send a direct message without content.
             $this->showForm(_('No content!'));
             return;
         } else {
@@ -158,12 +164,16 @@ class NewmessageAction extends Action
         }
 
         if (!$this->other) {
+            // TRANS: Form validation error displayed trying to send a direct message without specifying a recipient.
             $this->showForm(_('No recipient specified.'));
             return;
         } else if (!$user->mutuallySubscribed($this->other)) {
-            $this->clientError(_('You can\'t send a message to this user.'), 404);
+            // TRANS: Client error displayed trying to send a direct message to a user while sender and
+            // TRANS: receiver are not subscribed to each other.
+            $this->clientError(_('You cannot send a message to this user.'), 404);
             return;
         } else if ($user->id == $this->other->id) {
+            // TRANS: Client error displayed trying to send a direct message to self.
             $this->clientError(_('Don\'t send a message to yourself; ' .
                 'just say it to yourself quietly instead.'), 403);
             return;
@@ -181,10 +191,13 @@ class NewmessageAction extends Action
         if ($this->boolean('ajax')) {
             $this->startHTML('text/xml;charset=utf-8');
             $this->elementStart('head');
+            // TRANS: Page title after sending a direct message.
             $this->element('title', null, _('Message sent'));
             $this->elementEnd('head');
             $this->elementStart('body');
             $this->element('p', array('id' => 'command_result'),
+                // TRANS: Confirmation text after sending a direct message.
+                // TRANS: %s is the direct message recipient.
                 sprintf(_('Direct message to %s sent.'),
                     $this->other->nickname));
             $this->elementEnd('body');
@@ -210,6 +223,7 @@ class NewmessageAction extends Action
     {
         $this->startHTML('text/xml;charset=utf-8', true);
         $this->elementStart('head');
+        // TRANS: Page title after an AJAX error occurred on the "send direct message" page.
         $this->element('title', null, _('Ajax Error'));
         $this->elementEnd('head');
         $this->elementStart('body');
@@ -231,6 +245,7 @@ class NewmessageAction extends Action
             $this->xw->startDocument('1.0', 'UTF-8');
             $this->elementStart('html');
             $this->elementStart('head');
+            // TRANS: Page title on page for sending a direct message.
             $this->element('title', null, _('New message'));
             $this->elementEnd('head');
             $this->elementStart('body');
diff --git a/actions/newnotice.php b/actions/newnotice.php
index bc7ab28950..c145712f51 100644
--- a/actions/newnotice.php
+++ b/actions/newnotice.php
@@ -66,6 +66,7 @@ class NewnoticeAction extends Action
 
     function title()
     {
+        // TRANS: Page title for sending a new notice.
         return _('New notice');
     }
 
@@ -85,6 +86,7 @@ class NewnoticeAction extends Action
     function handle($args)
     {
         if (!common_logged_in()) {
+            // TRANS: Client error displayed trying to send a notice while not logged in.
             $this->clientError(_('Not logged in.'));
         } else if ($_SERVER['REQUEST_METHOD'] == 'POST') {
             // check for this before token since all POST and FILES data
@@ -137,6 +139,7 @@ class NewnoticeAction extends Action
         Event::handle('StartSaveNewNoticeWeb', array($this, $user, &$content, &$options));
 
         if (!$content) {
+            // TRANS: Client error displayed trying to send a notice without content.
             $this->clientError(_('No content!'));
             return;
         }
@@ -227,6 +230,7 @@ class NewnoticeAction extends Action
             $this->xw->startDocument('1.0', 'UTF-8');
             $this->elementStart('html');
             $this->elementStart('head');
+            // TRANS: Page title after sending a notice.
             $this->element('title', null, _('Notice posted'));
             $this->elementEnd('head');
             $this->elementStart('body');
@@ -261,6 +265,7 @@ class NewnoticeAction extends Action
     {
         $this->startHTML('text/xml;charset=utf-8', true);
         $this->elementStart('head');
+        // TRANS: Page title after an AJAX error occurs on the send notice page.
         $this->element('title', null, _('Ajax Error'));
         $this->elementEnd('head');
         $this->elementStart('body');
diff --git a/actions/nudge.php b/actions/nudge.php
index 219a8c9aba..61874c7505 100644
--- a/actions/nudge.php
+++ b/actions/nudge.php
@@ -60,6 +60,7 @@ class NudgeAction extends Action
         parent::handle($args);
 
         if (!common_logged_in()) {
+            // TRANS: Client error displayed trying to nudge a user without being logged in.
             $this->clientError(_('Not logged in.'));
             return;
         }
@@ -82,6 +83,7 @@ class NudgeAction extends Action
         }
 
         if (!$other->email || !$other->emailnotifynudge) {
+            // TRANS: Client error displayed trying to nudge a user that cannot be nudged.
             $this->clientError(_('This user doesn\'t allow nudges or hasn\'t confirmed or set their email address yet.'));
             return;
         }
@@ -91,9 +93,11 @@ class NudgeAction extends Action
         if ($this->boolean('ajax')) {
             $this->startHTML('text/xml;charset=utf-8');
             $this->elementStart('head');
+            // TRANS: Page title after sending a nudge.
             $this->element('title', null, _('Nudge sent'));
             $this->elementEnd('head');
             $this->elementStart('body');
+            // TRANS: Confirmation text after sending a nudge.
             $this->element('p', array('id' => 'nudge_response'), _('Nudge sent!'));
             $this->elementEnd('body');
             $this->elementEnd('html');
@@ -129,4 +133,3 @@ class NudgeAction extends Action
         return true;
     }
 }
-
diff --git a/actions/oembed.php b/actions/oembed.php
index 0d8be55656..e293e4d27d 100644
--- a/actions/oembed.php
+++ b/actions/oembed.php
@@ -61,6 +61,8 @@ class OembedAction extends Action
             $proxy_args = $r->map($path);
 
             if (!$proxy_args) {
+                // TRANS: Server error displayed in oEmbed action when path not found.
+                // TRANS: %s is a path.
                 $this->serverError(sprintf(_('"%s" not found.'),$path), 404);
             }
             $oembed=array();
@@ -73,13 +75,17 @@ class OembedAction extends Action
                     $id = $proxy_args['notice'];
                     $notice = Notice::staticGet($id);
                     if(empty($notice)){
+                        // TRANS: Server error displayed in oEmbed action when notice not found.
+                        // TRANS: %s is a notice.
                         $this->serverError(sprintf(_("Notice %s not found."),$id), 404);
                     }
                     $profile = $notice->getProfile();
                     if (empty($profile)) {
+                        // TRANS: Server error displayed in oEmbed action when notice has not profile.
                         $this->serverError(_('Notice has no profile.'), 500);
                     }
                     $authorname = $profile->getFancyName();
+                    // TRANS: oEmbed title. %1$s is the author name, %2$s is the creation date.
                     $oembed['title'] = sprintf(_('%1$s\'s status on %2$s'),
                         $authorname,
                         common_exact_date($notice->created));
@@ -92,6 +98,8 @@ class OembedAction extends Action
                     $id = $proxy_args['attachment'];
                     $attachment = File::staticGet($id);
                     if(empty($attachment)){
+                        // TRANS: Server error displayed in oEmbed action when attachment not found.
+                        // TRANS: %d is an attachment ID.
                         $this->serverError(sprintf(_('Attachment %s not found.'),$id), 404);
                     }
                     if(empty($attachment->filename) && $file_oembed = File_oembed::staticGet('file_id', $attachment->id)){
@@ -133,6 +141,8 @@ class OembedAction extends Action
                     if($attachment->title) $oembed['title']=$attachment->title;
                     break;
                 default:
+                    // TRANS: Server error displayed in oEmbed request when a path is not supported.
+                    // TRANS: %s is a path.
                     $this->serverError(sprintf(_('"%s" not supported for oembed requests.'),$path), 501);
             }
             switch($args['format']){
@@ -190,6 +200,7 @@ class OembedAction extends Action
             }
             break;
         default:
+            // TRANS: Server error displayed in oEmbed action when request specifies an unsupported data format.
             $this->serverError(_('Not a supported data format.'), 501);
             break;
         }
@@ -209,6 +220,7 @@ class OembedAction extends Action
             }
             break;
         default:
+            // TRANS: Server error displayed in oEmbed action when request specifies an unsupported data format.
             $this->serverError(_('Not a supported data format.'), 501);
             break;
         }
diff --git a/actions/opensearch.php b/actions/opensearch.php
index 7bf32277bb..b1529860a8 100644
--- a/actions/opensearch.php
+++ b/actions/opensearch.php
@@ -63,8 +63,8 @@ class OpensearchAction extends Action
             // TRANS: ShortName in the OpenSearch interface when trying to find users.
             $short_name = _('People Search');
         } else {
-            // TRANS: ShortName in the OpenSearch interface when trying to find notices.
             $type       = 'noticesearch';
+            // TRANS: ShortName in the OpenSearch interface when trying to find notices.
             $short_name = _('Notice Search');
         }
         header('Content-Type: application/opensearchdescription+xml');

From a127ba78a8177f453e9184633a1a90602e1b121e Mon Sep 17 00:00:00 2001
From: Siebrand Mazeland <s.mazeland@xs4all.nl>
Date: Sat, 5 Mar 2011 00:24:19 +0100
Subject: [PATCH 401/655] * translator documentation updated. * superfluous
 whitespace removed. * small refactoring in noticeform.php to allow proper
 translator hints.

---
 actions/newnotice.php | 10 ----------
 lib/noticeform.php    | 27 +++++++++++++++------------
 2 files changed, 15 insertions(+), 22 deletions(-)

diff --git a/actions/newnotice.php b/actions/newnotice.php
index c145712f51..3e601ae362 100644
--- a/actions/newnotice.php
+++ b/actions/newnotice.php
@@ -47,13 +47,11 @@ require_once INSTALLDIR . '/lib/mediafile.php';
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
-
 class NewnoticeAction extends Action
 {
     /**
      * Error message, if any
      */
-
     var $msg = null;
 
     /**
@@ -63,7 +61,6 @@ class NewnoticeAction extends Action
      *
      * @return string page title
      */
-
     function title()
     {
         // TRANS: Page title for sending a new notice.
@@ -129,7 +126,6 @@ class NewnoticeAction extends Action
      *
      * @return void
      */
-
     function saveNewNotice()
     {
         $user = common_current_user();
@@ -260,7 +256,6 @@ class NewnoticeAction extends Action
      *
      * @return void
      */
-
     function ajaxErrorMsg($msg)
     {
         $this->startHTML('text/xml;charset=utf-8', true);
@@ -283,7 +278,6 @@ class NewnoticeAction extends Action
      *
      * @return void
      */
-
     function ajaxShowForm()
     {
         $this->startHTML('text/xml;charset=utf-8', true);
@@ -313,7 +307,6 @@ class NewnoticeAction extends Action
      *
      * @return void
      */
-
     function showForm($msg=null)
     {
         if ($this->boolean('ajax')) {
@@ -336,7 +329,6 @@ class NewnoticeAction extends Action
      *
      * @return void
      */
-
     function showNoticeForm()
     {
         $content = $this->trimmed('status_textarea');
@@ -365,7 +357,6 @@ class NewnoticeAction extends Action
      *
      * @todo maybe show some instructions?
      */
-
     function showPageNotice()
     {
         if ($this->msg) {
@@ -382,7 +373,6 @@ class NewnoticeAction extends Action
      *
      * @return void
      */
-
     function showNotice($notice)
     {
         $nli = new NoticeListItem($notice, $this);
diff --git a/lib/noticeform.php b/lib/noticeform.php
index 0f13147d00..ace8e5582b 100644
--- a/lib/noticeform.php
+++ b/lib/noticeform.php
@@ -48,31 +48,26 @@ require_once INSTALLDIR.'/lib/form.php';
  *
  * @see      HTMLOutputter
  */
-
 class NoticeForm extends Form
 {
     /**
      * Current action, used for returning to this page.
      */
-
     var $action = null;
 
     /**
      * Pre-filled content of the form
      */
-
     var $content = null;
 
     /**
      * The current user
      */
-
     var $user = null;
 
     /**
      * The notice being replied to
      */
-
     var $inreplyto = null;
 
     /**
@@ -91,7 +86,6 @@ class NoticeForm extends Form
      * @param string        $action  action to return to, if any
      * @param string        $content content to pre-fill
      */
-
     function __construct($out=null, $action=null, $content=null, $user=null, $inreplyto=null, $lat=null, $lon=null, $location_id=null, $location_ns=null)
     {
         $this->id_suffix = time();
@@ -159,6 +153,7 @@ class NoticeForm extends Form
      */
     function formLegend()
     {
+        // TRANS: Form legend for notice form.
         $this->out->element('legend', null, _('Send a notice'));
     }
 
@@ -167,12 +162,12 @@ class NoticeForm extends Form
      *
      * @return void
      */
-
     function formData()
     {
         if (Event::handle('StartShowNoticeFormData', array($this))) {
             $this->out->element('label', array('for' => 'notice_data-text',
                                                'id' => 'notice_data-text-label'),
+                                // TRANS: Title for notice label. %s is the user's nickname.
                                 sprintf(_('What\'s up, %s?'), $this->user->nickname));
             // XXX: vary by defined max size
             $this->out->element('textarea', array('id' => 'notice_data-text',
@@ -184,18 +179,20 @@ class NoticeForm extends Form
             $contentLimit = Notice::maxContent();
 
             if ($contentLimit > 0) {
-                $this->out->element('span', 
+                $this->out->element('span',
                                     array('class' => 'count'),
                                     $contentLimit);
             }
 
             if (common_config('attachments', 'uploads')) {
                 $this->out->hidden('MAX_FILE_SIZE', common_config('attachments', 'file_quota'));
+                // TRANS: Input label in notice form for adding an attachment.
                 $this->out->element('label', array('for' => 'notice_data-attach'),_('Attach'));
                 $this->out->element('input', array('id' => 'notice_data-attach',
                                                    'type' => 'file',
                                                    'name' => 'attach',
-                                                   'title' => _('Attach a file')));
+                                                   // TRANS: Title for input field to attach a file to a notice.
+                                                   'title' => _('Attach a file.')));
             }
             if ($this->action) {
                 $this->out->hidden('notice_return-to', $this->action, 'returnto');
@@ -223,12 +220,17 @@ class NoticeForm extends Form
                 $this->out->text(' ');
                 $this->out->element('label', array('class' => 'notice_data-geo',
                                               'for' => $this->id() . '-notice_data-geo'),
+                               // TRANS: Field label to add location to a notice.
                                _('Share my location'));
 
                 $this->out->elementEnd('div');
+                // TRANS: Text to not share location for a notice in notice form.
+                $share_disable_text = _('Do not share my location');
+                // TRANS: Timeout error text for location retrieval in notice form.
+                $error_timeout_text = _('Sorry, retrieving your geo location is taking longer than expected, please try again later');
                 $this->out->inlineScript(' var NoticeDataGeo_text = {'.
-                    'ShareDisable: ' .json_encode(_('Do not share my location')).','.
-                    'ErrorTimeout: ' .json_encode(_('Sorry, retrieving your geo location is taking longer than expected, please try again later')).
+                    'ShareDisable: ' .json_encode($share_disable_text).','.
+                    'ErrorTimeout: ' .json_encode($error_timeout_text).
                     '}');
             }
 
@@ -248,6 +250,7 @@ class NoticeForm extends Form
                                            'class' => 'submit',
                                            'name' => 'status_submit',
                                            'type' => 'submit',
-                                           'value' => _m('Send button for sending notice', 'Send')));
+                                           // TRANS: Button text for sending notice.
+                                           'value' => _m('BUTTON', 'Send')));
     }
 }

From 52df926b8d7d1c284bc4f6dcf6ce4d8a74730087 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Fri, 4 Mar 2011 17:25:58 -0800
Subject: [PATCH 402/655] Only show profiles of local users

---
 plugins/Directory/actions/userdirectory.php   | 29 +++++++++++--------
 .../lib/sortablesubscriptionlist.php          | 11 +++++++
 2 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/plugins/Directory/actions/userdirectory.php b/plugins/Directory/actions/userdirectory.php
index 7b8dbbdf60..60ab43693b 100644
--- a/plugins/Directory/actions/userdirectory.php
+++ b/plugins/Directory/actions/userdirectory.php
@@ -119,7 +119,8 @@ class UserdirectoryAction extends Action
         parent::prepare($args);
 
         $this->page   = ($this->arg('page')) ? ($this->arg('page') + 0) : 1;
-        $this->filter = $this->arg('filter') ? $this->arg('filter') : 'all';
+        $filter       = $this->arg('filter');
+        $this->filter = isset($filter) ? $filter : 'all';
         $this->sort   = $this->arg('sort');
         $this->order  = $this->boolean('asc'); // ascending or decending
 
@@ -225,26 +226,30 @@ class UserdirectoryAction extends Action
      */
     function getUsers()
     {
-        $offset = ($this->page - 1) * PROFILES_PER_PAGE;
-        $limit  =  PROFILES_PER_PAGE + 1;
 
         $profile = new Profile();
 
-        // XXX Any chance of SQL injection here?
+        $offset = ($this->page - 1) * PROFILES_PER_PAGE;
+        $limit  = PROFILES_PER_PAGE + 1;
+        $sort   = $this->getSortKey();
+        $sql    = 'SELECT profile.* FROM profile, user WHERE profile.id = user.id';
 
         if ($this->filter != 'all') {
-            $profile->whereAdd(
-                sprintf('LEFT(lower(nickname), 1) = \'%s\'', $this->filter)
+            $sql .= sprintf(
+                ' AND LEFT(LOWER(profile.nickname), 1) = \'%s\'',
+                $this->filter
             );
         }
 
-        $sort  = $this->getSortKey();
-        $order = ($this->order) ? 'ASC' : 'DESC';
+        $sql .= sprintf(
+            ' ORDER BY profile.%s %s, profile.nickname DESC LIMIT %d, %d',
+            $sort,
+            ($this->order) ? 'ASC' : 'DESC',
+            $offset,
+            $limit
+        );
 
-        $profile->orderBy("$sort $order, nickname");
-        $profile->limit($limit, $offset);
-
-        $profile->find();
+        $profile->query($sql);
 
         return $profile;
     }
diff --git a/plugins/Directory/lib/sortablesubscriptionlist.php b/plugins/Directory/lib/sortablesubscriptionlist.php
index 2a412a628d..a22aeadb3d 100644
--- a/plugins/Directory/lib/sortablesubscriptionlist.php
+++ b/plugins/Directory/lib/sortablesubscriptionlist.php
@@ -245,4 +245,15 @@ class SortableSubscriptionListItem extends SubscriptionListItem
         $this->out->elementEnd('td');
     }
 
+    /**
+     * Only show the tags if we're logged in
+     */
+    function showTags()
+    {
+         if (common_logged_in()) {
+            parent::showTags();
+        }
+
+    }
+
 }

From 7d76b55da18df126372780e74f7943dd2e9b2323 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Fri, 4 Mar 2011 17:55:56 -0800
Subject: [PATCH 403/655] fixup comments

---
 plugins/Directory/actions/userdirectory.php | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/plugins/Directory/actions/userdirectory.php b/plugins/Directory/actions/userdirectory.php
index 60ab43693b..f6ff0b3eec 100644
--- a/plugins/Directory/actions/userdirectory.php
+++ b/plugins/Directory/actions/userdirectory.php
@@ -46,12 +46,16 @@ require_once INSTALLDIR . '/lib/publicgroupnav.php';
 class UserdirectoryAction extends Action
 {
     /**
-     * @var $page       integer  the page we're on
+     * The page we're on
+     *
+     * @var integer
      */
     protected $page   = null;
 
     /**
-     * @var $filter     string    what to filter the search results by
+     * what to filter the search results by
+     *
+     * @var string
      */
     protected $filter = null;
 
@@ -111,8 +115,6 @@ class UserdirectoryAction extends Action
      * @param array $args $_REQUEST args
      *
      * @return boolean success flag
-     *
-     * @todo move queries from showContent() to here
      */
     function prepare($args)
     {
@@ -222,7 +224,8 @@ class UserdirectoryAction extends Action
     }
 
     /*
-     * Get users filtered by the current filter and page
+     * Get users filtered by the current filter, sort key,
+     * sort order, and page
      */
     function getUsers()
     {
@@ -278,7 +281,7 @@ class UserdirectoryAction extends Action
      */
     function showEmptyListMessage()
     {
-        $message = sprintf(_m('No users starting with %s'), $this->filter);
+        $message = sprintf(_m('No users starting with **%s**'), $this->filter);
 
         $this->elementStart('div', 'guide');
         $this->raw(common_markup_to_html($message));

From 5f1a795b735e6054c7e9e7f2b32850c74ec95552 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Sat, 5 Mar 2011 01:54:47 -0800
Subject: [PATCH 404/655] Add some other ways to order searches to the base
 search engine class

---
 lib/search_engines.php | 31 +++++++++++++++++++++++++++++--
 1 file changed, 29 insertions(+), 2 deletions(-)

diff --git a/lib/search_engines.php b/lib/search_engines.php
index 19703e03fd..7f1684a3e7 100644
--- a/lib/search_engines.php
+++ b/lib/search_engines.php
@@ -41,8 +41,35 @@ class SearchEngine
 
     function set_sort_mode($mode)
     {
-        if ('chron' === $mode)
-            return $this->target->orderBy('created desc');
+        switch ($mode) {
+        case 'chron':
+            return $this->target->orderBy('created DESC');
+            break;
+        case 'reverse_chron':
+            return $this->target->orderBy('created ASC');
+            break;
+        case 'nickname_desc':
+            if ($this->table != 'profile') {
+                throw new Exception(
+                    'nickname_desc sort mode can only be use when searching profile.'
+                );
+            } else {
+                return $this->target->orderBy('nickname DESC');
+            }
+            break;
+        case 'nickname_asc':
+            if ($this->table != 'profile') {
+                throw new Exception(
+                    'nickname_desc sort mode can only be use when searching profile.'
+                );
+            } else {
+                return $this->target->orderBy('nickname ASC');
+            }
+            break;
+        default:
+            return $this->target->orderBy('created DESC');
+            break;
+        }
     }
 }
 

From 5d22f969a1ca27d2a81c27596978e7e0479310fb Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Sat, 5 Mar 2011 01:55:52 -0800
Subject: [PATCH 405/655] * Integrate search input box * Fix ordering

---
 plugins/Directory/DirectoryPlugin.php         |  12 +-
 plugins/Directory/actions/userdirectory.php   | 137 ++++++++++++++----
 plugins/Directory/css/directory.css           |   2 +-
 plugins/Directory/lib/alphanav.php            |   4 +-
 .../lib/sortablesubscriptionlist.php          |  16 +-
 5 files changed, 128 insertions(+), 43 deletions(-)

diff --git a/plugins/Directory/DirectoryPlugin.php b/plugins/Directory/DirectoryPlugin.php
index 8fd7785ec9..50a0da7cf9 100644
--- a/plugins/Directory/DirectoryPlugin.php
+++ b/plugins/Directory/DirectoryPlugin.php
@@ -112,18 +112,18 @@ class DirectoryPlugin extends Plugin
      */
     function onRouterInitialized($m)
     {
-        $m->connect(
-            'directory/users/:filter',
-            array('action' => 'userdirectory'),
-            array('filter' => '[0-9a-zA-Z_]{1,64}')
-        );
-
         $m->connect(
             'directory/users',
             array('action' => 'userdirectory'),
             array('filter' => 'all')
         );
 
+        $m->connect(
+            'directory/users/:filter',
+            array('action' => 'userdirectory'),
+            array('filter' => '[0-9a-zA-Z_]{1,64}')
+        );
+
         return true;
     }
 
diff --git a/plugins/Directory/actions/userdirectory.php b/plugins/Directory/actions/userdirectory.php
index f6ff0b3eec..005fb787d3 100644
--- a/plugins/Directory/actions/userdirectory.php
+++ b/plugins/Directory/actions/userdirectory.php
@@ -50,14 +50,35 @@ class UserdirectoryAction extends Action
      *
      * @var integer
      */
-    protected $page   = null;
+    public $page;
 
     /**
-     * what to filter the search results by
+     * What to filter the search results by
      *
      * @var string
      */
-    protected $filter = null;
+    public $filter;
+
+    /**
+     * Column to sort by
+     *
+     * @var string
+     */
+    public $sort;
+
+    /**
+     * How to order search results, ascending or descending
+     *
+     * @var string
+     */
+    public $reverse;
+
+    /**
+     * Query
+     *
+     * @var string
+     */
+    public $q;
 
     /**
      * Title of the page
@@ -120,11 +141,11 @@ class UserdirectoryAction extends Action
     {
         parent::prepare($args);
 
-        $this->page   = ($this->arg('page')) ? ($this->arg('page') + 0) : 1;
-        $filter       = $this->arg('filter');
-        $this->filter = isset($filter) ? $filter : 'all';
-        $this->sort   = $this->arg('sort');
-        $this->order  = $this->boolean('asc'); // ascending or decending
+        $this->page    = ($this->arg('page')) ? ($this->arg('page') + 0) : 1;
+        $this->filter  = $this->arg('filter', 'all');
+        $this->reverse = $this->boolean('reverse');
+        $this->q       = $this->trimmed('q');
+        $this->sort    = $this->arg('sort', 'nickname');
 
         common_set_returnto($this->selfUrl());
 
@@ -185,15 +206,14 @@ class UserdirectoryAction extends Action
      */
     function showContent()
     {
-        // XXX Need search bar
+        $this->showForm();
 
         $this->elementStart('div', array('id' => 'user_directory'));
 
         $alphaNav = new AlphaNav($this, true, array('All'));
         $alphaNav->show();
 
-        // XXX Maybe use a more specialized version of ProfileList here
-
+        $profile = null;
         $profile = $this->getUsers();
         $cnt     = 0;
 
@@ -205,55 +225,116 @@ class UserdirectoryAction extends Action
             );
 
             $cnt = $profileList->show();
+            $profile->free();
 
             if (0 == $cnt) {
                 $this->showEmptyListMessage();
             }
         }
 
+        $args = array();
+        if (isset($this->q)) {
+            $args['q'] = $this->q;
+        } else {
+            $args['filter'] = $this->filter;
+        }
+
         $this->pagination(
             $this->page > 1,
             $cnt > PROFILES_PER_PAGE,
             $this->page,
             'userdirectory',
-            array('filter' => $this->filter)
+            $args
         );
 
         $this->elementEnd('div');
 
     }
 
+    function showForm($error=null)
+    {
+        $this->elementStart(
+            'form',
+            array(
+                'method' => 'get',
+                'id'     => 'form_search',
+                'class'  => 'form_settings',
+                'action' => common_local_url('userdirectory')
+            )
+        );
+
+        $this->elementStart('fieldset');
+
+        $this->element('legend', null, _('Search site'));
+        $this->elementStart('ul', 'form_data');
+        $this->elementStart('li');
+
+        $this->input('q', _('Keyword(s)'), $this->q);
+
+        $this->submit('search', _m('BUTTON','Search'));
+        $this->elementEnd('li');
+        $this->elementEnd('ul');
+        $this->elementEnd('fieldset');
+        $this->elementEnd('form');
+    }
+
     /*
      * Get users filtered by the current filter, sort key,
      * sort order, and page
      */
     function getUsers()
     {
-
         $profile = new Profile();
 
         $offset = ($this->page - 1) * PROFILES_PER_PAGE;
         $limit  = PROFILES_PER_PAGE + 1;
-        $sort   = $this->getSortKey();
-        $sql    = 'SELECT profile.* FROM profile, user WHERE profile.id = user.id';
 
-        if ($this->filter != 'all') {
+        if (isset($this->q)) {
+             // User is searching via query
+             $search_engine = $profile->getSearchEngine('profile');
+
+             $mode = 'reverse_chron';
+
+             if ($this->sort == 'nickname') {
+                 if ($this->reverse) {
+                     $mode = 'nickname_desc';
+                 } else {
+                     $mode = 'nickname_asc';
+                 }
+             } else {
+                 if ($this->reverse) {
+                     $mode = 'chron';
+                 }
+             }
+
+             $search_engine->set_sort_mode($mode);
+             $search_engine->limit($offset, $limit);
+             $search_engine->query($this->q);
+
+             $profile->find();
+        } else {
+            // User is browsing via AlphaNav
+            $sort   = $this->getSortKey();
+            $sql    = 'SELECT profile.* FROM profile, user WHERE profile.id = user.id';
+
+            if ($this->filter != 'all') {
+                $sql .= sprintf(
+                    ' AND LEFT(LOWER(profile.nickname), 1) = \'%s\'',
+                    $this->filter
+                );
+            }
+
             $sql .= sprintf(
-                ' AND LEFT(LOWER(profile.nickname), 1) = \'%s\'',
-                $this->filter
+                ' ORDER BY profile.%s %s, profile.nickname ASC LIMIT %d, %d',
+                $sort,
+                $this->reverse ? 'DESC' : 'ASC',
+                $offset,
+                $limit
             );
+
+            $profile->query($sql);
         }
 
-        $sql .= sprintf(
-            ' ORDER BY profile.%s %s, profile.nickname DESC LIMIT %d, %d',
-            $sort,
-            ($this->order) ? 'ASC' : 'DESC',
-            $offset,
-            $limit
-        );
-
-        $profile->query($sql);
-
         return $profile;
     }
 
diff --git a/plugins/Directory/css/directory.css b/plugins/Directory/css/directory.css
index 76c9fc2583..14fd2ce23b 100644
--- a/plugins/Directory/css/directory.css
+++ b/plugins/Directory/css/directory.css
@@ -57,7 +57,7 @@ th.current {
     background-position: 60% 2px;
 }
 
-th.current.asc {
+th.current.reverse {
     background-image: url(../images/control_arrow_up.gif);
     background-repeat: no-repeat;
     background-position: 60% 2px;
diff --git a/plugins/Directory/lib/alphanav.php b/plugins/Directory/lib/alphanav.php
index 33380b0b2b..645cdfa601 100644
--- a/plugins/Directory/lib/alphanav.php
+++ b/plugins/Directory/lib/alphanav.php
@@ -121,8 +121,8 @@ class AlphaNav extends Widget
             }
 
             // sort order
-            if (!empty($this->action->order)) {
-                $params['asc'] = 'true';
+            if ($this->action->reverse) {
+                $params['reverse'] = 'true';
             }
 
             $current = $this->action->arg('filter');
diff --git a/plugins/Directory/lib/sortablesubscriptionlist.php b/plugins/Directory/lib/sortablesubscriptionlist.php
index a22aeadb3d..8f6e66d20a 100644
--- a/plugins/Directory/lib/sortablesubscriptionlist.php
+++ b/plugins/Directory/lib/sortablesubscriptionlist.php
@@ -68,16 +68,16 @@ class SortableSubscriptionList extends SubscriptionList
         );
 
         foreach ($tableHeaders as $id => $label) {
-            $attrs = array('id' => $id);
 
+            $attrs   = array('id' => $id);
             $current = (!empty($this->action->sort) && $this->action->sort == $id);
 
             if ($current || empty($this->action->sort) && $id == 'nickname') {
                 $attrs['class'] = 'current';
             }
 
-            if ($current && !$this->action->boolean('asc')) {
-                $attrs['class'] .= ' asc';
+            if ($current && $this->action->reverse) {
+                $attrs['class'] .= ' reverse';
                 $attrs['class'] = trim($attrs['class']);
             }
 
@@ -86,8 +86,12 @@ class SortableSubscriptionList extends SubscriptionList
             $linkAttrs = array();
             $params    = array('sort' => $id);
 
-            if ($current && !$this->action->boolean('asc')) {
-                $params['asc'] = "true";
+            if (!empty($this->action->q)) {
+                $params['q'] = $this->action->q;
+            }
+
+            if ($current && !$this->action->reverse) {
+                $params['reverse'] = 'true';
             }
 
             $args = array();
@@ -108,7 +112,7 @@ class SortableSubscriptionList extends SubscriptionList
 
         $this->out->element('th', array('id' => 'subscriptions'), 'Subscriptions');
         $this->out->element('th', array('id' => 'notices'), 'Notices');
-        //$this->out->element('th', array('id' => 'controls'), 'Controls');
+        $this->out->element('th', array('id' => 'controls'), null);
 
         $this->out->elementEnd('tr');
         $this->out->elementEnd('thead');

From e9933871e5ad8b6366684fc95275cd0e36dc8f10 Mon Sep 17 00:00:00 2001
From: Siebrand Mazeland <s.mazeland@xs4all.nl>
Date: Sat, 5 Mar 2011 17:03:12 +0100
Subject: [PATCH 406/655] * fix i18n and L10n issues. * update translator
 documentation. * remove superfluous whitespace.

---
 actions/apigroupprofileupdate.php | 67 ++++++++++++++++++-------------
 1 file changed, 38 insertions(+), 29 deletions(-)

diff --git a/actions/apigroupprofileupdate.php b/actions/apigroupprofileupdate.php
index 6ac4b5a4b5..9a629a47d7 100644
--- a/actions/apigroupprofileupdate.php
+++ b/actions/apigroupprofileupdate.php
@@ -42,10 +42,8 @@ require_once INSTALLDIR . '/lib/apiauth.php';
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
-
 class ApiGroupProfileUpdateAction extends ApiAuthAction
 {
-
     /**
      * Take arguments for running
      *
@@ -54,7 +52,6 @@ class ApiGroupProfileUpdateAction extends ApiAuthAction
      * @return boolean success flag
      *
      */
-
     function prepare($args)
     {
         parent::prepare($args);
@@ -82,7 +79,6 @@ class ApiGroupProfileUpdateAction extends ApiAuthAction
      *
      * @return void
      */
-
     function handle($args)
     {
         parent::handle($args);
@@ -97,6 +93,7 @@ class ApiGroupProfileUpdateAction extends ApiAuthAction
 
         if (!in_array($this->format, array('xml', 'json'))) {
             $this->clientError(
+                // TRANS: Client error displayed when using an unsupported API format.
                 _('API method not found.'),
                 404,
                 $this->format
@@ -105,16 +102,19 @@ class ApiGroupProfileUpdateAction extends ApiAuthAction
         }
 
         if (empty($this->user)) {
+            // TRANS: Client error displayed when not providing a user or an invalid user.
             $this->clientError(_('No such user.'), 404, $this->format);
             return;
         }
 
         if (empty($this->group)) {
+            // TRANS: Client error displayed when not providing a group or an invalid group.
             $this->clientError(_('Group not found.'), 404, $this->format);
             return false;
         }
 
         if (!$this->user->isAdmin($this->group)) {
+            // TRANS: Client error displayed when trying to edit a group without being an admin.
             $this->clientError(_('You must be an admin to edit the group.'), 403);
             return false;
         }
@@ -168,15 +168,15 @@ class ApiGroupProfileUpdateAction extends ApiAuthAction
 
         if (!$result) {
             common_log_db_error($this->group, 'UPDATE', __FILE__);
+            // TRANS: Server error displayed when group update fails.
             $this->serverError(_('Could not update group.'));
         }
 
         $aliases = array();
 
         try {
-
-			if (!empty($this->aliasstring)) {
-				$aliases = $this->validateAliases();
+            if (!empty($this->aliasstring)) {
+                $aliases = $this->validateAliases();
             }
 
         } catch (ApiValidationException $ave) {
@@ -191,6 +191,7 @@ class ApiGroupProfileUpdateAction extends ApiAuthAction
         $result = $this->group->setAliases($aliases);
 
         if (!$result) {
+            // TRANS: Server error displayed when adding group aliases fails.
             $this->serverError(_('Could not create aliases.'));
         }
 
@@ -210,6 +211,7 @@ class ApiGroupProfileUpdateAction extends ApiAuthAction
             $this->showSingleJsonGroup($this->group);
             break;
         default:
+            // TRANS: Client error displayed when using an unsupported API format.
             $this->clientError(_('API method not found.'), 404, $this->format);
             break;
         }
@@ -245,17 +247,17 @@ class ApiGroupProfileUpdateAction extends ApiAuthAction
             )
         ) {
             throw new ApiValidationException(
-                _(
-                    'Nickname must have only lowercase letters ' .
-                    'and numbers and no spaces.'
-                )
+                // TRANS: API validation exception thrown when nickname does not validate.
+                _('Nickname must have only lowercase letters and numbers and no spaces.')
             );
         } else if ($this->nicknameExists($this->nickname)) {
             throw new ApiValidationException(
+                // TRANS: API validation exception thrown when nickname is already used.
                 _('Nickname already in use. Try another one.')
             );
         } else if (!User_group::allowedNickname($this->nickname)) {
             throw new ApiValidationException(
+                // TRANS: API validation exception thrown when nickname does not validate.
                 _('Not a valid nickname.')
             );
         }
@@ -274,6 +276,7 @@ class ApiGroupProfileUpdateAction extends ApiAuthAction
             )
         ) {
             throw new ApiValidationException(
+                // TRANS: API validation exception thrown when homepage URL does not validate.
                 _('Homepage is not a valid URL.')
             );
         }
@@ -283,7 +286,8 @@ class ApiGroupProfileUpdateAction extends ApiAuthAction
     {
         if (!is_null($this->fullname) && mb_strlen($this->fullname) > 255) {
             throw new ApiValidationException(
-                _('Full name is too long (max 255 chars).')
+                // TRANS: API validation exception thrown when full name does not validate.
+                _('Full name is too long (maximum 255 characters).')
             );
         }
     }
@@ -291,12 +295,12 @@ class ApiGroupProfileUpdateAction extends ApiAuthAction
     function validateDescription()
     {
         if (User_group::descriptionTooLong($this->description)) {
-            throw new ApiValidationException(
-                sprintf(
-                    _('description is too long (max %d chars).'),
-                    User_group::maxDescription()
-                )
-            );
+            // TRANS: API validation exception thrown when description does not validate.
+            // TRANS: %d is the maximum description length and used for plural.
+            throw new ApiValidationException(sprintf(_m('Description is too long (maximum %d character).',
+                                                        'Description is too long (maximum %d characters).',
+                                                        User_group::maxDescription()),
+                                                     User_group::maxDescription()));
         }
     }
 
@@ -304,7 +308,8 @@ class ApiGroupProfileUpdateAction extends ApiAuthAction
     {
         if (!is_null($this->location) && mb_strlen($this->location) > 255) {
             throw new ApiValidationException(
-                _('Location is too long (max 255 chars).')
+                // TRANS: API validation exception thrown when location does not validate.
+                _('Location is too long (maximum 255 characters).')
             );
         }
     }
@@ -321,12 +326,12 @@ class ApiGroupProfileUpdateAction extends ApiAuthAction
         );
 
         if (count($aliases) > common_config('group', 'maxaliases')) {
-            throw new ApiValidationException(
-                sprintf(
-                    _('Too many aliases! Maximum %d.'),
-                    common_config('group', 'maxaliases')
-                )
-            );
+            // TRANS: API validation exception thrown when aliases do not validate.
+            // TRANS: %d is the maximum number of aliases and used for plural.
+            throw new ApiValidationException(sprintf(_m('Too many aliases! Maximum %d allowed.',
+                                                        'Too many aliases! Maximum %d allowed.',
+                                                        common_config('group', 'maxaliases')),
+                                                     common_config('group', 'maxaliases')));
         }
 
         foreach ($aliases as $alias) {
@@ -339,7 +344,9 @@ class ApiGroupProfileUpdateAction extends ApiAuthAction
             ) {
                 throw new ApiValidationException(
                     sprintf(
-                        _('Invalid alias: "%s"'),
+                        // TRANS: API validation exception thrown when aliases does not validate.
+                        // TRANS: %s is the invalid alias.
+                        _('Invalid alias: "%s".'),
                         $alias
                     )
                 );
@@ -348,6 +355,8 @@ class ApiGroupProfileUpdateAction extends ApiAuthAction
             if ($this->nicknameExists($alias)) {
                 throw new ApiValidationException(
                     sprintf(
+                        // TRANS: API validation exception thrown when aliases is already used.
+                        // TRANS: %s is the already used alias.
                         _('Alias "%s" already in use. Try another one.'),
                         $alias)
                 );
@@ -356,12 +365,12 @@ class ApiGroupProfileUpdateAction extends ApiAuthAction
             // XXX assumes alphanum nicknames
             if (strcmp($alias, $this->nickname) == 0) {
                 throw new ApiValidationException(
-                    _('Alias can\'t be the same as nickname.')
+                    // TRANS: API validation exception thrown when alias is the same as nickname.
+                    _('Alias cannot be the same as nickname.')
                 );
             }
         }
 
         return $aliases;
     }
-
-}
\ No newline at end of file
+}

From 031f5a98f7554c4a396903a010e4d99f93444f6c Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Sat, 5 Mar 2011 14:47:37 -0500
Subject: [PATCH 407/655] add a couple of methods to MicroAppPlugin

---
 lib/microapp.php | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/lib/microapp.php b/lib/microapp.php
index 77e6abb7e3..23b4b5bb84 100644
--- a/lib/microapp.php
+++ b/lib/microapp.php
@@ -49,11 +49,22 @@ if (!defined('STATUSNET')) {
  * @link      http://status.net/
  */
 
-class MicroAppPlugin extends Plugin
+abstract class MicroAppPlugin extends Plugin
 {
-    abstract function isMyNotice($notice);
-    abstract function isMyActivity($activity);
+    abstract function types();
     abstract function saveNoticeFromActivity($activity);
     abstract function activityFromNotice($notice);
     abstract function showNotice($notice, $out);
+    abstract function entryForm();
+
+    function isMyNotice($notice) {
+        $types = $this->types();
+        return in_array($notice->object_type, $types);
+    }
+
+    function isMyActivity($activity) {
+        $types = $this->types();
+        return (count($activity->objects) == 1 &&
+                in_array($activity->objects[0]->type, $types));
+    }
 }

From 7184036cf2f8dd0641b23449341be989f085c920 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Sat, 5 Mar 2011 14:48:10 -0500
Subject: [PATCH 408/655] move microapp.php to microappplugin.php

---
 lib/microappplugin.php | 70 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 70 insertions(+)
 create mode 100644 lib/microappplugin.php

diff --git a/lib/microappplugin.php b/lib/microappplugin.php
new file mode 100644
index 0000000000..23b4b5bb84
--- /dev/null
+++ b/lib/microappplugin.php
@@ -0,0 +1,70 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2011, StatusNet, Inc.
+ *
+ * Superclass for microapp plugin
+ * 
+ * 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  Microapp
+ * @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);
+}
+
+/**
+ * Superclass for microapp plugins
+ *
+ * This class lets you define micro-applications with different kinds of activities.
+ *
+ * The applications work more-or-less like other 
+ * 
+ * @category  Microapp
+ * @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/
+ */
+
+abstract class MicroAppPlugin extends Plugin
+{
+    abstract function types();
+    abstract function saveNoticeFromActivity($activity);
+    abstract function activityFromNotice($notice);
+    abstract function showNotice($notice, $out);
+    abstract function entryForm();
+
+    function isMyNotice($notice) {
+        $types = $this->types();
+        return in_array($notice->object_type, $types);
+    }
+
+    function isMyActivity($activity) {
+        $types = $this->types();
+        return (count($activity->objects) == 1 &&
+                in_array($activity->objects[0]->type, $types));
+    }
+}

From 7a9b989349a580a7ae8e90a15e4212b2f5a5fc8e Mon Sep 17 00:00:00 2001
From: Siebrand Mazeland <s.mazeland@xs4all.nl>
Date: Sun, 6 Mar 2011 02:52:28 +0100
Subject: [PATCH 409/655] Localisation updates from http://translatewiki.net.

Location information removed from translation files with msgmerge --no-location to decrease size of files and reduce diff size. Unfortunately there does not appear to be a setting in msgmerge or msgattrib to remove the extracted comments ("#.") from translation files. If you do know of such a switch, please let me know!
---
 locale/ar/LC_MESSAGES/statusnet.po            | 2378 ++--------------
 locale/arz/LC_MESSAGES/statusnet.po           | 2188 ++-------------
 locale/bg/LC_MESSAGES/statusnet.po            | 2212 ++-------------
 locale/br/LC_MESSAGES/statusnet.po            | 2242 ++-------------
 locale/ca/LC_MESSAGES/statusnet.po            | 2200 ++-------------
 locale/cs/LC_MESSAGES/statusnet.po            | 2208 ++-------------
 locale/de/LC_MESSAGES/statusnet.po            | 2221 ++-------------
 locale/en_GB/LC_MESSAGES/statusnet.po         | 2186 ++-------------
 locale/eo/LC_MESSAGES/statusnet.po            | 2198 ++-------------
 locale/es/LC_MESSAGES/statusnet.po            | 2205 ++-------------
 locale/fa/LC_MESSAGES/statusnet.po            | 2204 ++-------------
 locale/fi/LC_MESSAGES/statusnet.po            | 2191 ++-------------
 locale/fr/LC_MESSAGES/statusnet.po            | 2221 ++-------------
 locale/fur/LC_MESSAGES/statusnet.po           | 2109 ++-------------
 locale/gl/LC_MESSAGES/statusnet.po            | 2207 ++-------------
 locale/hsb/LC_MESSAGES/statusnet.po           | 2190 ++-------------
 locale/hu/LC_MESSAGES/statusnet.po            | 2123 ++-------------
 locale/ia/LC_MESSAGES/statusnet.po            | 2384 ++--------------
 locale/it/LC_MESSAGES/statusnet.po            | 2202 ++-------------
 locale/ja/LC_MESSAGES/statusnet.po            | 2199 ++-------------
 locale/ka/LC_MESSAGES/statusnet.po            | 2185 ++-------------
 locale/ko/LC_MESSAGES/statusnet.po            | 2189 ++-------------
 locale/mk/LC_MESSAGES/statusnet.po            | 2381 ++--------------
 locale/ml/LC_MESSAGES/statusnet.po            | 2143 ++-------------
 locale/nb/LC_MESSAGES/statusnet.po            | 2189 ++-------------
 locale/nl/LC_MESSAGES/statusnet.po            | 2398 ++---------------
 locale/nn/LC_MESSAGES/statusnet.po            | 2182 ++-------------
 locale/pl/LC_MESSAGES/statusnet.po            | 2212 ++-------------
 locale/pt/LC_MESSAGES/statusnet.po            | 2208 ++-------------
 locale/pt_BR/LC_MESSAGES/statusnet.po         | 2208 ++-------------
 locale/ru/LC_MESSAGES/statusnet.po            | 2220 ++-------------
 locale/statusnet.pot                          |  507 ++--
 locale/sv/LC_MESSAGES/statusnet.po            | 2206 ++-------------
 locale/te/LC_MESSAGES/statusnet.po            | 2185 ++-------------
 locale/tr/LC_MESSAGES/statusnet.po            | 2154 ++-------------
 locale/uk/LC_MESSAGES/statusnet.po            | 2213 ++-------------
 locale/zh_CN/LC_MESSAGES/statusnet.po         | 2193 ++-------------
 plugins/APC/locale/APC.pot                    |    2 +-
 .../APC/locale/be-tarask/LC_MESSAGES/APC.po   |    9 +-
 plugins/APC/locale/br/LC_MESSAGES/APC.po      |    9 +-
 plugins/APC/locale/de/LC_MESSAGES/APC.po      |    9 +-
 plugins/APC/locale/es/LC_MESSAGES/APC.po      |    9 +-
 plugins/APC/locale/fr/LC_MESSAGES/APC.po      |    9 +-
 plugins/APC/locale/gl/LC_MESSAGES/APC.po      |    9 +-
 plugins/APC/locale/he/LC_MESSAGES/APC.po      |    9 +-
 plugins/APC/locale/ia/LC_MESSAGES/APC.po      |    9 +-
 plugins/APC/locale/id/LC_MESSAGES/APC.po      |    9 +-
 plugins/APC/locale/mk/LC_MESSAGES/APC.po      |    9 +-
 plugins/APC/locale/nb/LC_MESSAGES/APC.po      |    9 +-
 plugins/APC/locale/nl/LC_MESSAGES/APC.po      |    9 +-
 plugins/APC/locale/pl/LC_MESSAGES/APC.po      |    9 +-
 plugins/APC/locale/pt/LC_MESSAGES/APC.po      |    9 +-
 plugins/APC/locale/pt_BR/LC_MESSAGES/APC.po   |    9 +-
 plugins/APC/locale/ru/LC_MESSAGES/APC.po      |    9 +-
 plugins/APC/locale/tl/LC_MESSAGES/APC.po      |    9 +-
 plugins/APC/locale/uk/LC_MESSAGES/APC.po      |    9 +-
 plugins/APC/locale/zh_CN/LC_MESSAGES/APC.po   |    9 +-
 .../AccountManager/locale/AccountManager.pot  |    2 +-
 .../locale/af/LC_MESSAGES/AccountManager.po   |   26 +
 .../locale/ia/LC_MESSAGES/AccountManager.po   |   28 +
 .../locale/mk/LC_MESSAGES/AccountManager.po   |   26 +
 .../locale/nl/LC_MESSAGES/AccountManager.po   |   26 +
 plugins/Adsense/locale/Adsense.pot            |    2 +-
 .../locale/be-tarask/LC_MESSAGES/Adsense.po   |   27 +-
 .../Adsense/locale/br/LC_MESSAGES/Adsense.po  |   27 +-
 .../Adsense/locale/de/LC_MESSAGES/Adsense.po  |   27 +-
 .../Adsense/locale/es/LC_MESSAGES/Adsense.po  |   27 +-
 .../Adsense/locale/fr/LC_MESSAGES/Adsense.po  |   27 +-
 .../Adsense/locale/gl/LC_MESSAGES/Adsense.po  |   27 +-
 .../Adsense/locale/ia/LC_MESSAGES/Adsense.po  |   27 +-
 .../Adsense/locale/it/LC_MESSAGES/Adsense.po  |   27 +-
 .../Adsense/locale/ka/LC_MESSAGES/Adsense.po  |   27 +-
 .../Adsense/locale/mk/LC_MESSAGES/Adsense.po  |   27 +-
 .../Adsense/locale/nl/LC_MESSAGES/Adsense.po  |   27 +-
 .../Adsense/locale/pt/LC_MESSAGES/Adsense.po  |   27 +-
 .../locale/pt_BR/LC_MESSAGES/Adsense.po       |   27 +-
 .../Adsense/locale/ru/LC_MESSAGES/Adsense.po  |   27 +-
 .../Adsense/locale/sv/LC_MESSAGES/Adsense.po  |   27 +-
 .../Adsense/locale/tl/LC_MESSAGES/Adsense.po  |   27 +-
 .../Adsense/locale/uk/LC_MESSAGES/Adsense.po  |   27 +-
 .../locale/zh_CN/LC_MESSAGES/Adsense.po       |   27 +-
 plugins/Aim/locale/Aim.pot                    |    2 +-
 plugins/Aim/locale/af/LC_MESSAGES/Aim.po      |   34 +
 plugins/Aim/locale/ia/LC_MESSAGES/Aim.po      |   34 +
 plugins/Aim/locale/mk/LC_MESSAGES/Aim.po      |   34 +
 plugins/Aim/locale/nl/LC_MESSAGES/Aim.po      |   34 +
 .../AnonymousFave/locale/AnonymousFave.pot    |   82 +-
 .../be-tarask/LC_MESSAGES/AnonymousFave.po    |   92 +-
 .../locale/br/LC_MESSAGES/AnonymousFave.po    |   92 +-
 .../locale/de/LC_MESSAGES/AnonymousFave.po    |   92 +-
 .../locale/es/LC_MESSAGES/AnonymousFave.po    |   94 +-
 .../locale/fr/LC_MESSAGES/AnonymousFave.po    |   96 +-
 .../locale/gl/LC_MESSAGES/AnonymousFave.po    |   88 +-
 .../locale/ia/LC_MESSAGES/AnonymousFave.po    |   92 +-
 .../locale/mk/LC_MESSAGES/AnonymousFave.po    |   92 +-
 .../locale/nl/LC_MESSAGES/AnonymousFave.po    |   96 +-
 .../locale/pt/LC_MESSAGES/AnonymousFave.po    |   92 +-
 .../locale/ru/LC_MESSAGES/AnonymousFave.po    |   88 +-
 .../locale/tl/LC_MESSAGES/AnonymousFave.po    |   96 +-
 .../locale/uk/LC_MESSAGES/AnonymousFave.po    |   92 +-
 plugins/AutoSandbox/locale/AutoSandbox.pot    |    2 +-
 .../be-tarask/LC_MESSAGES/AutoSandbox.po      |   11 +-
 .../locale/br/LC_MESSAGES/AutoSandbox.po      |   11 +-
 .../locale/de/LC_MESSAGES/AutoSandbox.po      |   11 +-
 .../locale/es/LC_MESSAGES/AutoSandbox.po      |   11 +-
 .../locale/fr/LC_MESSAGES/AutoSandbox.po      |   11 +-
 .../locale/ia/LC_MESSAGES/AutoSandbox.po      |   11 +-
 .../locale/mk/LC_MESSAGES/AutoSandbox.po      |   11 +-
 .../locale/nl/LC_MESSAGES/AutoSandbox.po      |   11 +-
 .../locale/ru/LC_MESSAGES/AutoSandbox.po      |   11 +-
 .../locale/tl/LC_MESSAGES/AutoSandbox.po      |   11 +-
 .../locale/uk/LC_MESSAGES/AutoSandbox.po      |   11 +-
 .../locale/zh_CN/LC_MESSAGES/AutoSandbox.po   |   11 +-
 plugins/Autocomplete/locale/Autocomplete.pot  |    2 +-
 .../be-tarask/LC_MESSAGES/Autocomplete.po     |    9 +-
 .../locale/br/LC_MESSAGES/Autocomplete.po     |    9 +-
 .../locale/de/LC_MESSAGES/Autocomplete.po     |    9 +-
 .../locale/es/LC_MESSAGES/Autocomplete.po     |    9 +-
 .../locale/fr/LC_MESSAGES/Autocomplete.po     |    9 +-
 .../locale/he/LC_MESSAGES/Autocomplete.po     |    9 +-
 .../locale/ia/LC_MESSAGES/Autocomplete.po     |    9 +-
 .../locale/id/LC_MESSAGES/Autocomplete.po     |    9 +-
 .../locale/ja/LC_MESSAGES/Autocomplete.po     |    9 +-
 .../locale/mk/LC_MESSAGES/Autocomplete.po     |    9 +-
 .../locale/nl/LC_MESSAGES/Autocomplete.po     |    9 +-
 .../locale/pt/LC_MESSAGES/Autocomplete.po     |    9 +-
 .../locale/pt_BR/LC_MESSAGES/Autocomplete.po  |    9 +-
 .../locale/ru/LC_MESSAGES/Autocomplete.po     |    9 +-
 .../locale/tl/LC_MESSAGES/Autocomplete.po     |    9 +-
 .../locale/uk/LC_MESSAGES/Autocomplete.po     |    9 +-
 .../locale/zh_CN/LC_MESSAGES/Autocomplete.po  |    9 +-
 plugins/Awesomeness/locale/Awesomeness.pot    |    2 +-
 .../be-tarask/LC_MESSAGES/Awesomeness.po      |    9 +-
 .../locale/de/LC_MESSAGES/Awesomeness.po      |    9 +-
 .../locale/fr/LC_MESSAGES/Awesomeness.po      |    9 +-
 .../locale/ia/LC_MESSAGES/Awesomeness.po      |    9 +-
 .../locale/mk/LC_MESSAGES/Awesomeness.po      |    9 +-
 .../locale/nl/LC_MESSAGES/Awesomeness.po      |    9 +-
 .../locale/pt/LC_MESSAGES/Awesomeness.po      |    9 +-
 .../locale/ru/LC_MESSAGES/Awesomeness.po      |    9 +-
 .../locale/uk/LC_MESSAGES/Awesomeness.po      |    9 +-
 plugins/BitlyUrl/locale/BitlyUrl.pot          |   30 +-
 .../locale/be-tarask/LC_MESSAGES/BitlyUrl.po  |   45 +-
 .../locale/ca/LC_MESSAGES/BitlyUrl.po         |   43 +-
 .../locale/de/LC_MESSAGES/BitlyUrl.po         |   41 +-
 .../locale/fr/LC_MESSAGES/BitlyUrl.po         |   45 +-
 .../locale/gl/LC_MESSAGES/BitlyUrl.po         |   45 +-
 .../locale/ia/LC_MESSAGES/BitlyUrl.po         |   41 +-
 .../locale/mk/LC_MESSAGES/BitlyUrl.po         |   45 +-
 .../locale/nb/LC_MESSAGES/BitlyUrl.po         |   41 +-
 .../locale/nl/LC_MESSAGES/BitlyUrl.po         |   45 +-
 .../locale/ru/LC_MESSAGES/BitlyUrl.po         |   41 +-
 .../locale/uk/LC_MESSAGES/BitlyUrl.po         |   45 +-
 plugins/Blacklist/locale/Blacklist.pot        |    2 +-
 .../locale/be-tarask/LC_MESSAGES/Blacklist.po |   29 +-
 .../locale/br/LC_MESSAGES/Blacklist.po        |   29 +-
 .../locale/de/LC_MESSAGES/Blacklist.po        |   29 +-
 .../locale/es/LC_MESSAGES/Blacklist.po        |   29 +-
 .../locale/fr/LC_MESSAGES/Blacklist.po        |   29 +-
 .../locale/ia/LC_MESSAGES/Blacklist.po        |   29 +-
 .../locale/mk/LC_MESSAGES/Blacklist.po        |   29 +-
 .../locale/nl/LC_MESSAGES/Blacklist.po        |   29 +-
 .../locale/ru/LC_MESSAGES/Blacklist.po        |   29 +-
 .../locale/uk/LC_MESSAGES/Blacklist.po        |   29 +-
 .../locale/zh_CN/LC_MESSAGES/Blacklist.po     |   29 +-
 plugins/BlankAd/locale/BlankAd.pot            |    2 +-
 .../locale/be-tarask/LC_MESSAGES/BlankAd.po   |    9 +-
 .../BlankAd/locale/br/LC_MESSAGES/BlankAd.po  |    9 +-
 .../BlankAd/locale/de/LC_MESSAGES/BlankAd.po  |    9 +-
 .../BlankAd/locale/es/LC_MESSAGES/BlankAd.po  |    9 +-
 .../BlankAd/locale/fr/LC_MESSAGES/BlankAd.po  |    9 +-
 .../BlankAd/locale/he/LC_MESSAGES/BlankAd.po  |    9 +-
 .../BlankAd/locale/ia/LC_MESSAGES/BlankAd.po  |    9 +-
 .../BlankAd/locale/mk/LC_MESSAGES/BlankAd.po  |    9 +-
 .../BlankAd/locale/nb/LC_MESSAGES/BlankAd.po  |    9 +-
 .../BlankAd/locale/nl/LC_MESSAGES/BlankAd.po  |    9 +-
 .../BlankAd/locale/pt/LC_MESSAGES/BlankAd.po  |    9 +-
 .../BlankAd/locale/ru/LC_MESSAGES/BlankAd.po  |    9 +-
 .../BlankAd/locale/tl/LC_MESSAGES/BlankAd.po  |    9 +-
 .../BlankAd/locale/uk/LC_MESSAGES/BlankAd.po  |    9 +-
 .../locale/zh_CN/LC_MESSAGES/BlankAd.po       |    9 +-
 plugins/BlogspamNet/locale/BlogspamNet.pot    |    2 +-
 .../be-tarask/LC_MESSAGES/BlogspamNet.po      |    9 +-
 .../locale/br/LC_MESSAGES/BlogspamNet.po      |    9 +-
 .../locale/de/LC_MESSAGES/BlogspamNet.po      |    9 +-
 .../locale/es/LC_MESSAGES/BlogspamNet.po      |    9 +-
 .../locale/fr/LC_MESSAGES/BlogspamNet.po      |    9 +-
 .../locale/he/LC_MESSAGES/BlogspamNet.po      |    9 +-
 .../locale/ia/LC_MESSAGES/BlogspamNet.po      |    9 +-
 .../locale/mk/LC_MESSAGES/BlogspamNet.po      |    9 +-
 .../locale/nb/LC_MESSAGES/BlogspamNet.po      |    9 +-
 .../locale/nl/LC_MESSAGES/BlogspamNet.po      |    9 +-
 .../locale/pt/LC_MESSAGES/BlogspamNet.po      |    9 +-
 .../locale/ru/LC_MESSAGES/BlogspamNet.po      |    9 +-
 .../locale/tl/LC_MESSAGES/BlogspamNet.po      |    9 +-
 .../locale/uk/LC_MESSAGES/BlogspamNet.po      |    9 +-
 .../locale/zh_CN/LC_MESSAGES/BlogspamNet.po   |    9 +-
 plugins/Bookmark/locale/Bookmark.pot          |   12 +-
 .../locale/br/LC_MESSAGES/Bookmark.po         |   21 +-
 .../locale/de/LC_MESSAGES/Bookmark.po         |   21 +-
 .../locale/fr/LC_MESSAGES/Bookmark.po         |   21 +-
 .../locale/ia/LC_MESSAGES/Bookmark.po         |   21 +-
 .../locale/mk/LC_MESSAGES/Bookmark.po         |   21 +-
 .../locale/my/LC_MESSAGES/Bookmark.po         |   21 +-
 .../locale/nl/LC_MESSAGES/Bookmark.po         |   21 +-
 .../locale/ru/LC_MESSAGES/Bookmark.po         |   21 +-
 .../locale/te/LC_MESSAGES/Bookmark.po         |   33 +
 .../locale/uk/LC_MESSAGES/Bookmark.po         |   21 +-
 .../locale/zh_CN/LC_MESSAGES/Bookmark.po      |   21 +-
 plugins/CacheLog/locale/CacheLog.pot          |    2 +-
 .../locale/be-tarask/LC_MESSAGES/CacheLog.po  |    9 +-
 .../locale/br/LC_MESSAGES/CacheLog.po         |    9 +-
 .../locale/es/LC_MESSAGES/CacheLog.po         |    9 +-
 .../locale/fr/LC_MESSAGES/CacheLog.po         |    9 +-
 .../locale/he/LC_MESSAGES/CacheLog.po         |    9 +-
 .../locale/ia/LC_MESSAGES/CacheLog.po         |    9 +-
 .../locale/mk/LC_MESSAGES/CacheLog.po         |    9 +-
 .../locale/nb/LC_MESSAGES/CacheLog.po         |    9 +-
 .../locale/nl/LC_MESSAGES/CacheLog.po         |    9 +-
 .../locale/pt/LC_MESSAGES/CacheLog.po         |    9 +-
 .../locale/ru/LC_MESSAGES/CacheLog.po         |    9 +-
 .../locale/tl/LC_MESSAGES/CacheLog.po         |    9 +-
 .../locale/uk/LC_MESSAGES/CacheLog.po         |    9 +-
 .../locale/zh_CN/LC_MESSAGES/CacheLog.po      |    9 +-
 .../locale/CasAuthentication.pot              |    2 +-
 .../LC_MESSAGES/CasAuthentication.po          |   18 +-
 .../br/LC_MESSAGES/CasAuthentication.po       |   18 +-
 .../de/LC_MESSAGES/CasAuthentication.po       |   18 +-
 .../es/LC_MESSAGES/CasAuthentication.po       |   18 +-
 .../fr/LC_MESSAGES/CasAuthentication.po       |   18 +-
 .../ia/LC_MESSAGES/CasAuthentication.po       |   18 +-
 .../mk/LC_MESSAGES/CasAuthentication.po       |   18 +-
 .../nl/LC_MESSAGES/CasAuthentication.po       |   18 +-
 .../pt_BR/LC_MESSAGES/CasAuthentication.po    |   18 +-
 .../ru/LC_MESSAGES/CasAuthentication.po       |   18 +-
 .../uk/LC_MESSAGES/CasAuthentication.po       |   18 +-
 .../zh_CN/LC_MESSAGES/CasAuthentication.po    |   18 +-
 .../locale/ClientSideShorten.pot              |    2 +-
 .../LC_MESSAGES/ClientSideShorten.po          |   10 +-
 .../br/LC_MESSAGES/ClientSideShorten.po       |   10 +-
 .../de/LC_MESSAGES/ClientSideShorten.po       |   10 +-
 .../es/LC_MESSAGES/ClientSideShorten.po       |   10 +-
 .../fr/LC_MESSAGES/ClientSideShorten.po       |   10 +-
 .../he/LC_MESSAGES/ClientSideShorten.po       |   10 +-
 .../ia/LC_MESSAGES/ClientSideShorten.po       |   10 +-
 .../id/LC_MESSAGES/ClientSideShorten.po       |   10 +-
 .../mk/LC_MESSAGES/ClientSideShorten.po       |   10 +-
 .../nb/LC_MESSAGES/ClientSideShorten.po       |   10 +-
 .../nl/LC_MESSAGES/ClientSideShorten.po       |   10 +-
 .../ru/LC_MESSAGES/ClientSideShorten.po       |   10 +-
 .../tl/LC_MESSAGES/ClientSideShorten.po       |   10 +-
 .../uk/LC_MESSAGES/ClientSideShorten.po       |   10 +-
 .../zh_CN/LC_MESSAGES/ClientSideShorten.po    |   10 +-
 plugins/Comet/locale/Comet.pot                |    2 +-
 .../locale/be-tarask/LC_MESSAGES/Comet.po     |    9 +-
 plugins/Comet/locale/br/LC_MESSAGES/Comet.po  |    9 +-
 plugins/Comet/locale/de/LC_MESSAGES/Comet.po  |    9 +-
 plugins/Comet/locale/es/LC_MESSAGES/Comet.po  |    9 +-
 plugins/Comet/locale/fr/LC_MESSAGES/Comet.po  |    9 +-
 plugins/Comet/locale/he/LC_MESSAGES/Comet.po  |    9 +-
 plugins/Comet/locale/ia/LC_MESSAGES/Comet.po  |    9 +-
 plugins/Comet/locale/id/LC_MESSAGES/Comet.po  |    9 +-
 plugins/Comet/locale/mk/LC_MESSAGES/Comet.po  |    9 +-
 plugins/Comet/locale/nb/LC_MESSAGES/Comet.po  |    9 +-
 plugins/Comet/locale/nl/LC_MESSAGES/Comet.po  |    9 +-
 plugins/Comet/locale/pt/LC_MESSAGES/Comet.po  |    9 +-
 .../Comet/locale/pt_BR/LC_MESSAGES/Comet.po   |    9 +-
 plugins/Comet/locale/ru/LC_MESSAGES/Comet.po  |    9 +-
 plugins/Comet/locale/tl/LC_MESSAGES/Comet.po  |    9 +-
 plugins/Comet/locale/uk/LC_MESSAGES/Comet.po  |    9 +-
 .../Comet/locale/zh_CN/LC_MESSAGES/Comet.po   |    9 +-
 .../locale/DirectionDetector.pot              |    2 +-
 .../LC_MESSAGES/DirectionDetector.po          |    9 +-
 .../br/LC_MESSAGES/DirectionDetector.po       |    9 +-
 .../de/LC_MESSAGES/DirectionDetector.po       |    9 +-
 .../es/LC_MESSAGES/DirectionDetector.po       |    9 +-
 .../fr/LC_MESSAGES/DirectionDetector.po       |    9 +-
 .../he/LC_MESSAGES/DirectionDetector.po       |    9 +-
 .../ia/LC_MESSAGES/DirectionDetector.po       |    9 +-
 .../id/LC_MESSAGES/DirectionDetector.po       |    9 +-
 .../ja/LC_MESSAGES/DirectionDetector.po       |    9 +-
 .../lb/LC_MESSAGES/DirectionDetector.po       |    9 +-
 .../mk/LC_MESSAGES/DirectionDetector.po       |    9 +-
 .../nb/LC_MESSAGES/DirectionDetector.po       |    9 +-
 .../nl/LC_MESSAGES/DirectionDetector.po       |    9 +-
 .../pt/LC_MESSAGES/DirectionDetector.po       |    9 +-
 .../ru/LC_MESSAGES/DirectionDetector.po       |    9 +-
 .../tl/LC_MESSAGES/DirectionDetector.po       |    9 +-
 .../uk/LC_MESSAGES/DirectionDetector.po       |    9 +-
 .../zh_CN/LC_MESSAGES/DirectionDetector.po    |    9 +-
 plugins/DiskCache/locale/DiskCache.pot        |    2 +-
 .../locale/be-tarask/LC_MESSAGES/DiskCache.po |    9 +-
 .../locale/br/LC_MESSAGES/DiskCache.po        |    9 +-
 .../locale/de/LC_MESSAGES/DiskCache.po        |    9 +-
 .../locale/es/LC_MESSAGES/DiskCache.po        |    9 +-
 .../locale/fr/LC_MESSAGES/DiskCache.po        |    9 +-
 .../locale/he/LC_MESSAGES/DiskCache.po        |    9 +-
 .../locale/ia/LC_MESSAGES/DiskCache.po        |    9 +-
 .../locale/id/LC_MESSAGES/DiskCache.po        |    9 +-
 .../locale/mk/LC_MESSAGES/DiskCache.po        |    9 +-
 .../locale/nb/LC_MESSAGES/DiskCache.po        |    9 +-
 .../locale/nl/LC_MESSAGES/DiskCache.po        |    9 +-
 .../locale/pt/LC_MESSAGES/DiskCache.po        |    9 +-
 .../locale/pt_BR/LC_MESSAGES/DiskCache.po     |    9 +-
 .../locale/ru/LC_MESSAGES/DiskCache.po        |    9 +-
 .../locale/tl/LC_MESSAGES/DiskCache.po        |    9 +-
 .../locale/uk/LC_MESSAGES/DiskCache.po        |    9 +-
 .../locale/zh_CN/LC_MESSAGES/DiskCache.po     |    9 +-
 plugins/Disqus/locale/Disqus.pot              |    2 +-
 .../locale/be-tarask/LC_MESSAGES/Disqus.po    |   12 +-
 .../Disqus/locale/br/LC_MESSAGES/Disqus.po    |   12 +-
 .../Disqus/locale/de/LC_MESSAGES/Disqus.po    |   12 +-
 .../Disqus/locale/es/LC_MESSAGES/Disqus.po    |   12 +-
 .../Disqus/locale/fr/LC_MESSAGES/Disqus.po    |   12 +-
 .../Disqus/locale/ia/LC_MESSAGES/Disqus.po    |   12 +-
 .../Disqus/locale/mk/LC_MESSAGES/Disqus.po    |   12 +-
 .../Disqus/locale/nb/LC_MESSAGES/Disqus.po    |   12 +-
 .../Disqus/locale/nl/LC_MESSAGES/Disqus.po    |   12 +-
 .../Disqus/locale/ru/LC_MESSAGES/Disqus.po    |   12 +-
 .../Disqus/locale/tl/LC_MESSAGES/Disqus.po    |   12 +-
 .../Disqus/locale/uk/LC_MESSAGES/Disqus.po    |   12 +-
 .../Disqus/locale/zh_CN/LC_MESSAGES/Disqus.po |   12 +-
 plugins/Echo/locale/Echo.pot                  |    2 +-
 plugins/Echo/locale/ar/LC_MESSAGES/Echo.po    |   31 +
 .../Echo/locale/be-tarask/LC_MESSAGES/Echo.po |    9 +-
 plugins/Echo/locale/br/LC_MESSAGES/Echo.po    |    9 +-
 plugins/Echo/locale/de/LC_MESSAGES/Echo.po    |    9 +-
 plugins/Echo/locale/es/LC_MESSAGES/Echo.po    |    9 +-
 plugins/Echo/locale/fi/LC_MESSAGES/Echo.po    |    9 +-
 plugins/Echo/locale/fr/LC_MESSAGES/Echo.po    |    9 +-
 plugins/Echo/locale/he/LC_MESSAGES/Echo.po    |    9 +-
 plugins/Echo/locale/ia/LC_MESSAGES/Echo.po    |    9 +-
 plugins/Echo/locale/id/LC_MESSAGES/Echo.po    |    9 +-
 plugins/Echo/locale/lb/LC_MESSAGES/Echo.po    |    9 +-
 plugins/Echo/locale/mk/LC_MESSAGES/Echo.po    |    9 +-
 plugins/Echo/locale/nb/LC_MESSAGES/Echo.po    |    9 +-
 plugins/Echo/locale/nl/LC_MESSAGES/Echo.po    |    9 +-
 plugins/Echo/locale/pt/LC_MESSAGES/Echo.po    |    9 +-
 plugins/Echo/locale/pt_BR/LC_MESSAGES/Echo.po |    9 +-
 plugins/Echo/locale/ru/LC_MESSAGES/Echo.po    |    9 +-
 plugins/Echo/locale/tl/LC_MESSAGES/Echo.po    |    9 +-
 plugins/Echo/locale/uk/LC_MESSAGES/Echo.po    |    9 +-
 plugins/Echo/locale/zh_CN/LC_MESSAGES/Echo.po |    9 +-
 .../locale/EmailAuthentication.pot            |    2 +-
 .../LC_MESSAGES/EmailAuthentication.po        |    9 +-
 .../br/LC_MESSAGES/EmailAuthentication.po     |    9 +-
 .../ca/LC_MESSAGES/EmailAuthentication.po     |    9 +-
 .../de/LC_MESSAGES/EmailAuthentication.po     |    9 +-
 .../es/LC_MESSAGES/EmailAuthentication.po     |    9 +-
 .../fr/LC_MESSAGES/EmailAuthentication.po     |    9 +-
 .../he/LC_MESSAGES/EmailAuthentication.po     |    9 +-
 .../ia/LC_MESSAGES/EmailAuthentication.po     |    9 +-
 .../id/LC_MESSAGES/EmailAuthentication.po     |    9 +-
 .../ja/LC_MESSAGES/EmailAuthentication.po     |    9 +-
 .../mk/LC_MESSAGES/EmailAuthentication.po     |    9 +-
 .../nb/LC_MESSAGES/EmailAuthentication.po     |    9 +-
 .../nl/LC_MESSAGES/EmailAuthentication.po     |    9 +-
 .../pt/LC_MESSAGES/EmailAuthentication.po     |    9 +-
 .../pt_BR/LC_MESSAGES/EmailAuthentication.po  |    9 +-
 .../ru/LC_MESSAGES/EmailAuthentication.po     |    9 +-
 .../tl/LC_MESSAGES/EmailAuthentication.po     |    9 +-
 .../uk/LC_MESSAGES/EmailAuthentication.po     |    9 +-
 .../zh_CN/LC_MESSAGES/EmailAuthentication.po  |    9 +-
 plugins/EmailSummary/locale/EmailSummary.pot  |    2 +-
 .../be-tarask/LC_MESSAGES/EmailSummary.po     |    9 +-
 .../locale/br/LC_MESSAGES/EmailSummary.po     |    9 +-
 .../locale/ca/LC_MESSAGES/EmailSummary.po     |    9 +-
 .../locale/de/LC_MESSAGES/EmailSummary.po     |    9 +-
 .../locale/fr/LC_MESSAGES/EmailSummary.po     |    9 +-
 .../locale/he/LC_MESSAGES/EmailSummary.po     |    9 +-
 .../locale/ia/LC_MESSAGES/EmailSummary.po     |    9 +-
 .../locale/id/LC_MESSAGES/EmailSummary.po     |    9 +-
 .../locale/mk/LC_MESSAGES/EmailSummary.po     |    9 +-
 .../locale/nl/LC_MESSAGES/EmailSummary.po     |    9 +-
 .../locale/pt/LC_MESSAGES/EmailSummary.po     |    9 +-
 .../locale/ru/LC_MESSAGES/EmailSummary.po     |    9 +-
 .../locale/uk/LC_MESSAGES/EmailSummary.po     |    9 +-
 .../locale/zh_CN/LC_MESSAGES/EmailSummary.po  |    9 +-
 .../locale/ExtendedProfile.pot                |   28 +-
 .../locale/br/LC_MESSAGES/ExtendedProfile.po  |   97 +
 .../locale/ia/LC_MESSAGES/ExtendedProfile.po  |   97 +
 .../locale/mk/LC_MESSAGES/ExtendedProfile.po  |   97 +
 .../locale/nl/LC_MESSAGES/ExtendedProfile.po  |   97 +
 .../FacebookBridge/locale/FacebookBridge.pot  |  256 +-
 .../locale/br/LC_MESSAGES/FacebookBridge.po   |  257 +-
 .../locale/ca/LC_MESSAGES/FacebookBridge.po   |  283 +-
 .../locale/de/LC_MESSAGES/FacebookBridge.po   |  283 +-
 .../locale/ia/LC_MESSAGES/FacebookBridge.po   |  283 +-
 .../locale/mk/LC_MESSAGES/FacebookBridge.po   |  279 +-
 .../locale/nl/LC_MESSAGES/FacebookBridge.po   |  287 +-
 .../locale/uk/LC_MESSAGES/FacebookBridge.po   |  281 +-
 .../zh_CN/LC_MESSAGES/FacebookBridge.po       |  271 +-
 plugins/FirePHP/locale/FirePHP.pot            |    2 +-
 .../FirePHP/locale/de/LC_MESSAGES/FirePHP.po  |    9 +-
 .../FirePHP/locale/es/LC_MESSAGES/FirePHP.po  |    9 +-
 .../FirePHP/locale/fi/LC_MESSAGES/FirePHP.po  |    9 +-
 .../FirePHP/locale/fr/LC_MESSAGES/FirePHP.po  |    9 +-
 .../FirePHP/locale/he/LC_MESSAGES/FirePHP.po  |    9 +-
 .../FirePHP/locale/ia/LC_MESSAGES/FirePHP.po  |    9 +-
 .../FirePHP/locale/id/LC_MESSAGES/FirePHP.po  |    9 +-
 .../FirePHP/locale/ja/LC_MESSAGES/FirePHP.po  |    9 +-
 .../FirePHP/locale/mk/LC_MESSAGES/FirePHP.po  |    9 +-
 .../FirePHP/locale/nb/LC_MESSAGES/FirePHP.po  |    9 +-
 .../FirePHP/locale/nl/LC_MESSAGES/FirePHP.po  |    9 +-
 .../FirePHP/locale/pt/LC_MESSAGES/FirePHP.po  |    9 +-
 .../FirePHP/locale/ru/LC_MESSAGES/FirePHP.po  |    9 +-
 .../FirePHP/locale/tl/LC_MESSAGES/FirePHP.po  |    9 +-
 .../FirePHP/locale/uk/LC_MESSAGES/FirePHP.po  |    9 +-
 .../locale/zh_CN/LC_MESSAGES/FirePHP.po       |    9 +-
 .../FollowEveryone/locale/FollowEveryone.pot  |    2 +-
 .../locale/de/LC_MESSAGES/FollowEveryone.po   |    9 +-
 .../locale/fr/LC_MESSAGES/FollowEveryone.po   |    9 +-
 .../locale/he/LC_MESSAGES/FollowEveryone.po   |    9 +-
 .../locale/ia/LC_MESSAGES/FollowEveryone.po   |    9 +-
 .../locale/mk/LC_MESSAGES/FollowEveryone.po   |    9 +-
 .../locale/nl/LC_MESSAGES/FollowEveryone.po   |    9 +-
 .../locale/pt/LC_MESSAGES/FollowEveryone.po   |    9 +-
 .../locale/ru/LC_MESSAGES/FollowEveryone.po   |    9 +-
 .../locale/uk/LC_MESSAGES/FollowEveryone.po   |    9 +-
 plugins/ForceGroup/locale/ForceGroup.pot      |    2 +-
 .../locale/br/LC_MESSAGES/ForceGroup.po       |   10 +-
 .../locale/de/LC_MESSAGES/ForceGroup.po       |   10 +-
 .../locale/es/LC_MESSAGES/ForceGroup.po       |   10 +-
 .../locale/fr/LC_MESSAGES/ForceGroup.po       |   10 +-
 .../locale/he/LC_MESSAGES/ForceGroup.po       |   10 +-
 .../locale/ia/LC_MESSAGES/ForceGroup.po       |   10 +-
 .../locale/id/LC_MESSAGES/ForceGroup.po       |   10 +-
 .../locale/mk/LC_MESSAGES/ForceGroup.po       |   10 +-
 .../locale/nl/LC_MESSAGES/ForceGroup.po       |   10 +-
 .../locale/te/LC_MESSAGES/ForceGroup.po       |   10 +-
 .../locale/tl/LC_MESSAGES/ForceGroup.po       |   10 +-
 .../locale/uk/LC_MESSAGES/ForceGroup.po       |   10 +-
 plugins/GeoURL/locale/GeoURL.pot              |    2 +-
 .../GeoURL/locale/ca/LC_MESSAGES/GeoURL.po    |    9 +-
 .../GeoURL/locale/de/LC_MESSAGES/GeoURL.po    |    9 +-
 .../GeoURL/locale/eo/LC_MESSAGES/GeoURL.po    |    9 +-
 .../GeoURL/locale/es/LC_MESSAGES/GeoURL.po    |    9 +-
 .../GeoURL/locale/fr/LC_MESSAGES/GeoURL.po    |    9 +-
 .../GeoURL/locale/he/LC_MESSAGES/GeoURL.po    |    9 +-
 .../GeoURL/locale/ia/LC_MESSAGES/GeoURL.po    |    9 +-
 .../GeoURL/locale/id/LC_MESSAGES/GeoURL.po    |    9 +-
 .../GeoURL/locale/mk/LC_MESSAGES/GeoURL.po    |    9 +-
 .../GeoURL/locale/nb/LC_MESSAGES/GeoURL.po    |    9 +-
 .../GeoURL/locale/nl/LC_MESSAGES/GeoURL.po    |    9 +-
 .../GeoURL/locale/pl/LC_MESSAGES/GeoURL.po    |    9 +-
 .../GeoURL/locale/pt/LC_MESSAGES/GeoURL.po    |    9 +-
 .../GeoURL/locale/ru/LC_MESSAGES/GeoURL.po    |    9 +-
 .../GeoURL/locale/tl/LC_MESSAGES/GeoURL.po    |    9 +-
 .../GeoURL/locale/uk/LC_MESSAGES/GeoURL.po    |    9 +-
 plugins/Geonames/locale/Geonames.pot          |    2 +-
 .../locale/br/LC_MESSAGES/Geonames.po         |    9 +-
 .../locale/ca/LC_MESSAGES/Geonames.po         |    9 +-
 .../locale/de/LC_MESSAGES/Geonames.po         |    9 +-
 .../locale/eo/LC_MESSAGES/Geonames.po         |    9 +-
 .../locale/es/LC_MESSAGES/Geonames.po         |    9 +-
 .../locale/fr/LC_MESSAGES/Geonames.po         |    9 +-
 .../locale/he/LC_MESSAGES/Geonames.po         |    9 +-
 .../locale/ia/LC_MESSAGES/Geonames.po         |    9 +-
 .../locale/id/LC_MESSAGES/Geonames.po         |    9 +-
 .../locale/mk/LC_MESSAGES/Geonames.po         |    9 +-
 .../locale/nb/LC_MESSAGES/Geonames.po         |    9 +-
 .../locale/nl/LC_MESSAGES/Geonames.po         |    9 +-
 .../locale/pt/LC_MESSAGES/Geonames.po         |    9 +-
 .../locale/pt_BR/LC_MESSAGES/Geonames.po      |    9 +-
 .../locale/ru/LC_MESSAGES/Geonames.po         |    9 +-
 .../locale/tl/LC_MESSAGES/Geonames.po         |    9 +-
 .../locale/uk/LC_MESSAGES/Geonames.po         |    9 +-
 .../locale/zh_CN/LC_MESSAGES/Geonames.po      |    9 +-
 .../locale/GoogleAnalytics.pot                |    2 +-
 .../locale/br/LC_MESSAGES/GoogleAnalytics.po  |    9 +-
 .../locale/de/LC_MESSAGES/GoogleAnalytics.po  |    9 +-
 .../locale/es/LC_MESSAGES/GoogleAnalytics.po  |    9 +-
 .../locale/fr/LC_MESSAGES/GoogleAnalytics.po  |    9 +-
 .../locale/he/LC_MESSAGES/GoogleAnalytics.po  |    9 +-
 .../locale/ia/LC_MESSAGES/GoogleAnalytics.po  |    9 +-
 .../locale/id/LC_MESSAGES/GoogleAnalytics.po  |    9 +-
 .../locale/mk/LC_MESSAGES/GoogleAnalytics.po  |    9 +-
 .../locale/nb/LC_MESSAGES/GoogleAnalytics.po  |    9 +-
 .../locale/nl/LC_MESSAGES/GoogleAnalytics.po  |    9 +-
 .../locale/pt/LC_MESSAGES/GoogleAnalytics.po  |    9 +-
 .../pt_BR/LC_MESSAGES/GoogleAnalytics.po      |    9 +-
 .../locale/ru/LC_MESSAGES/GoogleAnalytics.po  |    9 +-
 .../locale/tl/LC_MESSAGES/GoogleAnalytics.po  |    9 +-
 .../locale/uk/LC_MESSAGES/GoogleAnalytics.po  |    9 +-
 .../zh_CN/LC_MESSAGES/GoogleAnalytics.po      |    9 +-
 plugins/Gravatar/locale/Gravatar.pot          |    2 +-
 .../locale/ca/LC_MESSAGES/Gravatar.po         |   20 +-
 .../locale/de/LC_MESSAGES/Gravatar.po         |   20 +-
 .../locale/es/LC_MESSAGES/Gravatar.po         |   20 +-
 .../locale/fr/LC_MESSAGES/Gravatar.po         |   20 +-
 .../locale/ia/LC_MESSAGES/Gravatar.po         |   20 +-
 .../locale/mk/LC_MESSAGES/Gravatar.po         |   20 +-
 .../locale/nl/LC_MESSAGES/Gravatar.po         |   20 +-
 .../locale/pl/LC_MESSAGES/Gravatar.po         |   20 +-
 .../locale/pt/LC_MESSAGES/Gravatar.po         |   20 +-
 .../locale/tl/LC_MESSAGES/Gravatar.po         |   20 +-
 .../locale/uk/LC_MESSAGES/Gravatar.po         |   20 +-
 .../locale/zh_CN/LC_MESSAGES/Gravatar.po      |   20 +-
 .../GroupFavorited/locale/GroupFavorited.pot  |   26 +-
 .../locale/br/LC_MESSAGES/GroupFavorited.po   |   33 +-
 .../locale/ca/LC_MESSAGES/GroupFavorited.po   |   33 +-
 .../locale/de/LC_MESSAGES/GroupFavorited.po   |   33 +-
 .../locale/es/LC_MESSAGES/GroupFavorited.po   |   33 +-
 .../locale/fr/LC_MESSAGES/GroupFavorited.po   |   33 +-
 .../locale/ia/LC_MESSAGES/GroupFavorited.po   |   33 +-
 .../locale/mk/LC_MESSAGES/GroupFavorited.po   |   33 +-
 .../locale/nl/LC_MESSAGES/GroupFavorited.po   |   33 +-
 .../locale/ru/LC_MESSAGES/GroupFavorited.po   |   33 +-
 .../locale/te/LC_MESSAGES/GroupFavorited.po   |   33 +-
 .../locale/tl/LC_MESSAGES/GroupFavorited.po   |   33 +-
 .../locale/uk/LC_MESSAGES/GroupFavorited.po   |   33 +-
 .../locale/GroupPrivateMessage.pot            |   38 +-
 .../br/LC_MESSAGES/GroupPrivateMessage.po     |   59 +-
 .../ia/LC_MESSAGES/GroupPrivateMessage.po     |   47 +-
 .../mk/LC_MESSAGES/GroupPrivateMessage.po     |   43 +-
 .../nl/LC_MESSAGES/GroupPrivateMessage.po     |   43 +-
 .../sr-ec/LC_MESSAGES/GroupPrivateMessage.po  |   43 +-
 .../te/LC_MESSAGES/GroupPrivateMessage.po     |   43 +-
 .../uk/LC_MESSAGES/GroupPrivateMessage.po     |   45 +-
 .../zh_CN/LC_MESSAGES/GroupPrivateMessage.po  |   41 +-
 plugins/Imap/locale/Imap.pot                  |    2 +-
 plugins/Imap/locale/br/LC_MESSAGES/Imap.po    |   15 +-
 plugins/Imap/locale/de/LC_MESSAGES/Imap.po    |   15 +-
 plugins/Imap/locale/fr/LC_MESSAGES/Imap.po    |   15 +-
 plugins/Imap/locale/ia/LC_MESSAGES/Imap.po    |   15 +-
 plugins/Imap/locale/mk/LC_MESSAGES/Imap.po    |   15 +-
 plugins/Imap/locale/nb/LC_MESSAGES/Imap.po    |   15 +-
 plugins/Imap/locale/nl/LC_MESSAGES/Imap.po    |   15 +-
 plugins/Imap/locale/ru/LC_MESSAGES/Imap.po    |   15 +-
 plugins/Imap/locale/tl/LC_MESSAGES/Imap.po    |   15 +-
 plugins/Imap/locale/uk/LC_MESSAGES/Imap.po    |   15 +-
 plugins/Imap/locale/zh_CN/LC_MESSAGES/Imap.po |   15 +-
 .../InProcessCache/locale/InProcessCache.pot  |    2 +-
 .../locale/de/LC_MESSAGES/InProcessCache.po   |    9 +-
 .../locale/fr/LC_MESSAGES/InProcessCache.po   |    9 +-
 .../locale/ia/LC_MESSAGES/InProcessCache.po   |    9 +-
 .../locale/mk/LC_MESSAGES/InProcessCache.po   |    9 +-
 .../locale/nl/LC_MESSAGES/InProcessCache.po   |    9 +-
 .../locale/pt/LC_MESSAGES/InProcessCache.po   |    9 +-
 .../locale/ru/LC_MESSAGES/InProcessCache.po   |    9 +-
 .../locale/uk/LC_MESSAGES/InProcessCache.po   |    9 +-
 .../zh_CN/LC_MESSAGES/InProcessCache.po       |    9 +-
 .../InfiniteScroll/locale/InfiniteScroll.pot  |    2 +-
 .../locale/de/LC_MESSAGES/InfiniteScroll.po   |    9 +-
 .../locale/es/LC_MESSAGES/InfiniteScroll.po   |    9 +-
 .../locale/fr/LC_MESSAGES/InfiniteScroll.po   |    9 +-
 .../locale/he/LC_MESSAGES/InfiniteScroll.po   |    9 +-
 .../locale/ia/LC_MESSAGES/InfiniteScroll.po   |    9 +-
 .../locale/id/LC_MESSAGES/InfiniteScroll.po   |    9 +-
 .../locale/ja/LC_MESSAGES/InfiniteScroll.po   |    9 +-
 .../locale/mk/LC_MESSAGES/InfiniteScroll.po   |    9 +-
 .../locale/nb/LC_MESSAGES/InfiniteScroll.po   |    9 +-
 .../locale/nl/LC_MESSAGES/InfiniteScroll.po   |    9 +-
 .../pt_BR/LC_MESSAGES/InfiniteScroll.po       |    9 +-
 .../locale/ru/LC_MESSAGES/InfiniteScroll.po   |    9 +-
 .../locale/tl/LC_MESSAGES/InfiniteScroll.po   |    9 +-
 .../locale/uk/LC_MESSAGES/InfiniteScroll.po   |    9 +-
 .../zh_CN/LC_MESSAGES/InfiniteScroll.po       |    9 +-
 plugins/Irc/locale/Irc.pot                    |   20 +-
 plugins/Irc/locale/ia/LC_MESSAGES/Irc.po      |   40 +
 plugins/Irc/locale/mk/LC_MESSAGES/Irc.po      |   40 +
 plugins/Irc/locale/nl/LC_MESSAGES/Irc.po      |   40 +
 .../locale/LdapAuthentication.pot             |    2 +-
 .../de/LC_MESSAGES/LdapAuthentication.po      |    9 +-
 .../es/LC_MESSAGES/LdapAuthentication.po      |    9 +-
 .../fr/LC_MESSAGES/LdapAuthentication.po      |    9 +-
 .../he/LC_MESSAGES/LdapAuthentication.po      |    9 +-
 .../ia/LC_MESSAGES/LdapAuthentication.po      |    9 +-
 .../id/LC_MESSAGES/LdapAuthentication.po      |    9 +-
 .../ja/LC_MESSAGES/LdapAuthentication.po      |    9 +-
 .../mk/LC_MESSAGES/LdapAuthentication.po      |    9 +-
 .../nb/LC_MESSAGES/LdapAuthentication.po      |    9 +-
 .../nl/LC_MESSAGES/LdapAuthentication.po      |    9 +-
 .../pt/LC_MESSAGES/LdapAuthentication.po      |    9 +-
 .../pt_BR/LC_MESSAGES/LdapAuthentication.po   |    9 +-
 .../ru/LC_MESSAGES/LdapAuthentication.po      |    9 +-
 .../tl/LC_MESSAGES/LdapAuthentication.po      |    9 +-
 .../uk/LC_MESSAGES/LdapAuthentication.po      |    9 +-
 .../zh_CN/LC_MESSAGES/LdapAuthentication.po   |    9 +-
 .../locale/LdapAuthorization.pot              |    2 +-
 .../de/LC_MESSAGES/LdapAuthorization.po       |    9 +-
 .../es/LC_MESSAGES/LdapAuthorization.po       |    9 +-
 .../fr/LC_MESSAGES/LdapAuthorization.po       |    9 +-
 .../he/LC_MESSAGES/LdapAuthorization.po       |    9 +-
 .../ia/LC_MESSAGES/LdapAuthorization.po       |    9 +-
 .../id/LC_MESSAGES/LdapAuthorization.po       |    9 +-
 .../mk/LC_MESSAGES/LdapAuthorization.po       |    9 +-
 .../nb/LC_MESSAGES/LdapAuthorization.po       |    9 +-
 .../nl/LC_MESSAGES/LdapAuthorization.po       |    9 +-
 .../pt/LC_MESSAGES/LdapAuthorization.po       |    9 +-
 .../pt_BR/LC_MESSAGES/LdapAuthorization.po    |    9 +-
 .../ru/LC_MESSAGES/LdapAuthorization.po       |    9 +-
 .../tl/LC_MESSAGES/LdapAuthorization.po       |    9 +-
 .../uk/LC_MESSAGES/LdapAuthorization.po       |    9 +-
 .../zh_CN/LC_MESSAGES/LdapAuthorization.po    |    9 +-
 plugins/LilUrl/locale/LilUrl.pot              |    2 +-
 .../LilUrl/locale/de/LC_MESSAGES/LilUrl.po    |   10 +-
 .../LilUrl/locale/fr/LC_MESSAGES/LilUrl.po    |   10 +-
 .../LilUrl/locale/he/LC_MESSAGES/LilUrl.po    |   10 +-
 .../LilUrl/locale/ia/LC_MESSAGES/LilUrl.po    |   10 +-
 .../LilUrl/locale/id/LC_MESSAGES/LilUrl.po    |   10 +-
 .../LilUrl/locale/ja/LC_MESSAGES/LilUrl.po    |   10 +-
 .../LilUrl/locale/mk/LC_MESSAGES/LilUrl.po    |   10 +-
 .../LilUrl/locale/nb/LC_MESSAGES/LilUrl.po    |   10 +-
 .../LilUrl/locale/nl/LC_MESSAGES/LilUrl.po    |   10 +-
 .../LilUrl/locale/ru/LC_MESSAGES/LilUrl.po    |   10 +-
 .../LilUrl/locale/tl/LC_MESSAGES/LilUrl.po    |   10 +-
 .../LilUrl/locale/uk/LC_MESSAGES/LilUrl.po    |   10 +-
 .../LilUrl/locale/zh_CN/LC_MESSAGES/LilUrl.po |   10 +-
 plugins/LinkPreview/locale/LinkPreview.pot    |    2 +-
 .../locale/de/LC_MESSAGES/LinkPreview.po      |    9 +-
 .../locale/fr/LC_MESSAGES/LinkPreview.po      |    9 +-
 .../locale/he/LC_MESSAGES/LinkPreview.po      |    9 +-
 .../locale/ia/LC_MESSAGES/LinkPreview.po      |    9 +-
 .../locale/mk/LC_MESSAGES/LinkPreview.po      |    9 +-
 .../locale/nl/LC_MESSAGES/LinkPreview.po      |    9 +-
 .../locale/pt/LC_MESSAGES/LinkPreview.po      |    9 +-
 .../locale/ru/LC_MESSAGES/LinkPreview.po      |    9 +-
 .../locale/uk/LC_MESSAGES/LinkPreview.po      |    9 +-
 .../locale/zh_CN/LC_MESSAGES/LinkPreview.po   |    9 +-
 plugins/Linkback/locale/Linkback.pot          |    2 +-
 .../locale/de/LC_MESSAGES/Linkback.po         |    9 +-
 .../locale/es/LC_MESSAGES/Linkback.po         |    9 +-
 .../locale/fr/LC_MESSAGES/Linkback.po         |    9 +-
 .../locale/he/LC_MESSAGES/Linkback.po         |    9 +-
 .../locale/ia/LC_MESSAGES/Linkback.po         |    9 +-
 .../locale/id/LC_MESSAGES/Linkback.po         |    9 +-
 .../locale/mk/LC_MESSAGES/Linkback.po         |    9 +-
 .../locale/nb/LC_MESSAGES/Linkback.po         |    9 +-
 .../locale/nl/LC_MESSAGES/Linkback.po         |    9 +-
 .../locale/ru/LC_MESSAGES/Linkback.po         |    9 +-
 .../locale/tl/LC_MESSAGES/Linkback.po         |    9 +-
 .../locale/uk/LC_MESSAGES/Linkback.po         |    9 +-
 .../locale/zh_CN/LC_MESSAGES/Linkback.po      |    9 +-
 plugins/LogFilter/locale/LogFilter.pot        |    2 +-
 .../locale/de/LC_MESSAGES/LogFilter.po        |    9 +-
 .../locale/fr/LC_MESSAGES/LogFilter.po        |    9 +-
 .../locale/he/LC_MESSAGES/LogFilter.po        |    9 +-
 .../locale/ia/LC_MESSAGES/LogFilter.po        |    9 +-
 .../locale/mk/LC_MESSAGES/LogFilter.po        |    9 +-
 .../locale/nl/LC_MESSAGES/LogFilter.po        |    9 +-
 .../locale/pt/LC_MESSAGES/LogFilter.po        |    9 +-
 .../locale/ru/LC_MESSAGES/LogFilter.po        |    9 +-
 .../locale/uk/LC_MESSAGES/LogFilter.po        |    9 +-
 .../locale/zh_CN/LC_MESSAGES/LogFilter.po     |    9 +-
 plugins/Mapstraction/locale/Mapstraction.pot  |   18 +-
 .../locale/br/LC_MESSAGES/Mapstraction.po     |   28 +-
 .../locale/de/LC_MESSAGES/Mapstraction.po     |   28 +-
 .../locale/fi/LC_MESSAGES/Mapstraction.po     |   28 +-
 .../locale/fr/LC_MESSAGES/Mapstraction.po     |   28 +-
 .../locale/fur/LC_MESSAGES/Mapstraction.po    |   28 +-
 .../locale/gl/LC_MESSAGES/Mapstraction.po     |   28 +-
 .../locale/ia/LC_MESSAGES/Mapstraction.po     |   28 +-
 .../locale/mk/LC_MESSAGES/Mapstraction.po     |   28 +-
 .../locale/nb/LC_MESSAGES/Mapstraction.po     |   28 +-
 .../locale/nl/LC_MESSAGES/Mapstraction.po     |   28 +-
 .../locale/ru/LC_MESSAGES/Mapstraction.po     |   28 +-
 .../locale/ta/LC_MESSAGES/Mapstraction.po     |   28 +-
 .../locale/te/LC_MESSAGES/Mapstraction.po     |   28 +-
 .../locale/tl/LC_MESSAGES/Mapstraction.po     |   28 +-
 .../locale/uk/LC_MESSAGES/Mapstraction.po     |   28 +-
 .../locale/zh_CN/LC_MESSAGES/Mapstraction.po  |   28 +-
 plugins/Memcache/locale/Memcache.pot          |    2 +-
 .../locale/de/LC_MESSAGES/Memcache.po         |    9 +-
 .../locale/es/LC_MESSAGES/Memcache.po         |    9 +-
 .../locale/fr/LC_MESSAGES/Memcache.po         |    9 +-
 .../locale/he/LC_MESSAGES/Memcache.po         |    9 +-
 .../locale/ia/LC_MESSAGES/Memcache.po         |    9 +-
 .../locale/mk/LC_MESSAGES/Memcache.po         |    9 +-
 .../locale/nb/LC_MESSAGES/Memcache.po         |    9 +-
 .../locale/nl/LC_MESSAGES/Memcache.po         |    9 +-
 .../locale/pt/LC_MESSAGES/Memcache.po         |    9 +-
 .../locale/pt_BR/LC_MESSAGES/Memcache.po      |    9 +-
 .../locale/ru/LC_MESSAGES/Memcache.po         |    9 +-
 .../locale/tl/LC_MESSAGES/Memcache.po         |    9 +-
 .../locale/uk/LC_MESSAGES/Memcache.po         |    9 +-
 .../locale/zh_CN/LC_MESSAGES/Memcache.po      |    9 +-
 plugins/Memcached/locale/Memcached.pot        |    2 +-
 .../locale/de/LC_MESSAGES/Memcached.po        |    9 +-
 .../locale/es/LC_MESSAGES/Memcached.po        |    9 +-
 .../locale/fr/LC_MESSAGES/Memcached.po        |    9 +-
 .../locale/he/LC_MESSAGES/Memcached.po        |    9 +-
 .../locale/ia/LC_MESSAGES/Memcached.po        |    9 +-
 .../locale/id/LC_MESSAGES/Memcached.po        |    9 +-
 .../locale/ja/LC_MESSAGES/Memcached.po        |    9 +-
 .../locale/mk/LC_MESSAGES/Memcached.po        |    9 +-
 .../locale/nb/LC_MESSAGES/Memcached.po        |    9 +-
 .../locale/nl/LC_MESSAGES/Memcached.po        |    9 +-
 .../locale/pt/LC_MESSAGES/Memcached.po        |    9 +-
 .../locale/ru/LC_MESSAGES/Memcached.po        |    9 +-
 .../locale/tl/LC_MESSAGES/Memcached.po        |    9 +-
 .../locale/uk/LC_MESSAGES/Memcached.po        |    9 +-
 .../locale/zh_CN/LC_MESSAGES/Memcached.po     |    9 +-
 plugins/Meteor/locale/Meteor.pot              |    2 +-
 .../Meteor/locale/de/LC_MESSAGES/Meteor.po    |   11 +-
 .../Meteor/locale/fr/LC_MESSAGES/Meteor.po    |   11 +-
 .../Meteor/locale/ia/LC_MESSAGES/Meteor.po    |   11 +-
 .../Meteor/locale/id/LC_MESSAGES/Meteor.po    |   11 +-
 .../Meteor/locale/mk/LC_MESSAGES/Meteor.po    |   11 +-
 .../Meteor/locale/nb/LC_MESSAGES/Meteor.po    |   11 +-
 .../Meteor/locale/nl/LC_MESSAGES/Meteor.po    |   11 +-
 .../Meteor/locale/tl/LC_MESSAGES/Meteor.po    |   11 +-
 .../Meteor/locale/uk/LC_MESSAGES/Meteor.po    |   11 +-
 .../Meteor/locale/zh_CN/LC_MESSAGES/Meteor.po |   11 +-
 plugins/Minify/locale/Minify.pot              |   14 +-
 .../Minify/locale/de/LC_MESSAGES/Minify.po    |   30 +-
 .../Minify/locale/fr/LC_MESSAGES/Minify.po    |   30 +-
 .../Minify/locale/ia/LC_MESSAGES/Minify.po    |   30 +-
 .../Minify/locale/mk/LC_MESSAGES/Minify.po    |   30 +-
 .../Minify/locale/nb/LC_MESSAGES/Minify.po    |   30 +-
 .../Minify/locale/nl/LC_MESSAGES/Minify.po    |   30 +-
 .../Minify/locale/ru/LC_MESSAGES/Minify.po    |   30 +-
 .../Minify/locale/tl/LC_MESSAGES/Minify.po    |   30 +-
 .../Minify/locale/uk/LC_MESSAGES/Minify.po    |   30 +-
 .../Minify/locale/zh_CN/LC_MESSAGES/Minify.po |   30 +-
 .../MobileProfile/locale/MobileProfile.pot    |    2 +-
 .../locale/br/LC_MESSAGES/MobileProfile.po    |   24 +-
 .../locale/ce/LC_MESSAGES/MobileProfile.po    |   24 +-
 .../locale/de/LC_MESSAGES/MobileProfile.po    |   24 +-
 .../locale/fr/LC_MESSAGES/MobileProfile.po    |   24 +-
 .../locale/gl/LC_MESSAGES/MobileProfile.po    |   24 +-
 .../locale/ia/LC_MESSAGES/MobileProfile.po    |   28 +-
 .../locale/mk/LC_MESSAGES/MobileProfile.po    |   28 +-
 .../locale/nb/LC_MESSAGES/MobileProfile.po    |   24 +-
 .../locale/nl/LC_MESSAGES/MobileProfile.po    |   28 +-
 .../locale/ps/LC_MESSAGES/MobileProfile.po    |   24 +-
 .../locale/ru/LC_MESSAGES/MobileProfile.po    |   24 +-
 .../locale/ta/LC_MESSAGES/MobileProfile.po    |   24 +-
 .../locale/te/LC_MESSAGES/MobileProfile.po    |   24 +-
 .../locale/tl/LC_MESSAGES/MobileProfile.po    |   24 +-
 .../locale/uk/LC_MESSAGES/MobileProfile.po    |   24 +-
 .../locale/zh_CN/LC_MESSAGES/MobileProfile.po |   24 +-
 plugins/ModHelper/locale/ModHelper.pot        |    2 +-
 .../locale/de/LC_MESSAGES/ModHelper.po        |    9 +-
 .../locale/es/LC_MESSAGES/ModHelper.po        |    9 +-
 .../locale/fr/LC_MESSAGES/ModHelper.po        |    9 +-
 .../locale/he/LC_MESSAGES/ModHelper.po        |    9 +-
 .../locale/ia/LC_MESSAGES/ModHelper.po        |    9 +-
 .../locale/mk/LC_MESSAGES/ModHelper.po        |    9 +-
 .../locale/nl/LC_MESSAGES/ModHelper.po        |    9 +-
 .../locale/ru/LC_MESSAGES/ModHelper.po        |    9 +-
 .../locale/uk/LC_MESSAGES/ModHelper.po        |    9 +-
 plugins/ModPlus/locale/ModPlus.pot            |   18 +-
 .../ModPlus/locale/de/LC_MESSAGES/ModPlus.po  |   25 +-
 .../ModPlus/locale/fr/LC_MESSAGES/ModPlus.po  |   29 +-
 .../ModPlus/locale/ia/LC_MESSAGES/ModPlus.po  |   27 +-
 .../ModPlus/locale/mk/LC_MESSAGES/ModPlus.po  |   29 +-
 .../ModPlus/locale/nl/LC_MESSAGES/ModPlus.po  |   29 +-
 .../ModPlus/locale/uk/LC_MESSAGES/ModPlus.po  |   25 +-
 plugins/Msn/locale/Msn.pot                    |    2 +-
 plugins/Msn/locale/br/LC_MESSAGES/Msn.po      |   29 +
 plugins/Msn/locale/ia/LC_MESSAGES/Msn.po      |   31 +
 plugins/Msn/locale/mk/LC_MESSAGES/Msn.po      |   31 +
 plugins/Msn/locale/nl/LC_MESSAGES/Msn.po      |   31 +
 .../NewMenu/locale/ar/LC_MESSAGES/NewMenu.po  |   81 +
 .../NewMenu/locale/br/LC_MESSAGES/NewMenu.po  |   41 +-
 .../NewMenu/locale/de/LC_MESSAGES/NewMenu.po  |   27 +-
 .../NewMenu/locale/ia/LC_MESSAGES/NewMenu.po  |   25 +-
 .../NewMenu/locale/mk/LC_MESSAGES/NewMenu.po  |   25 +-
 .../NewMenu/locale/nl/LC_MESSAGES/NewMenu.po  |   25 +-
 .../NewMenu/locale/te/LC_MESSAGES/NewMenu.po  |   27 +-
 .../NewMenu/locale/uk/LC_MESSAGES/NewMenu.po  |   25 +-
 .../locale/zh_CN/LC_MESSAGES/NewMenu.po       |   27 +-
 plugins/NoticeTitle/locale/NoticeTitle.pot    |    2 +-
 .../locale/ar/LC_MESSAGES/NoticeTitle.po      |   10 +-
 .../locale/br/LC_MESSAGES/NoticeTitle.po      |   10 +-
 .../locale/de/LC_MESSAGES/NoticeTitle.po      |   10 +-
 .../locale/fr/LC_MESSAGES/NoticeTitle.po      |   10 +-
 .../locale/he/LC_MESSAGES/NoticeTitle.po      |   10 +-
 .../locale/ia/LC_MESSAGES/NoticeTitle.po      |   10 +-
 .../locale/mk/LC_MESSAGES/NoticeTitle.po      |   10 +-
 .../locale/nb/LC_MESSAGES/NoticeTitle.po      |   10 +-
 .../locale/ne/LC_MESSAGES/NoticeTitle.po      |   10 +-
 .../locale/nl/LC_MESSAGES/NoticeTitle.po      |   10 +-
 .../locale/pl/LC_MESSAGES/NoticeTitle.po      |   10 +-
 .../locale/ru/LC_MESSAGES/NoticeTitle.po      |   10 +-
 .../locale/te/LC_MESSAGES/NoticeTitle.po      |   10 +-
 .../locale/tl/LC_MESSAGES/NoticeTitle.po      |   10 +-
 .../locale/uk/LC_MESSAGES/NoticeTitle.po      |   10 +-
 .../locale/zh_CN/LC_MESSAGES/NoticeTitle.po   |   10 +-
 plugins/OStatus/locale/OStatus.pot            |  794 +++---
 .../OStatus/locale/de/LC_MESSAGES/OStatus.po  |  816 +++---
 .../OStatus/locale/fr/LC_MESSAGES/OStatus.po  |  848 +++---
 .../OStatus/locale/ia/LC_MESSAGES/OStatus.po  |  800 +++---
 .../OStatus/locale/mk/LC_MESSAGES/OStatus.po  |  810 +++---
 .../OStatus/locale/nl/LC_MESSAGES/OStatus.po  |  846 +++---
 .../OStatus/locale/uk/LC_MESSAGES/OStatus.po  |  824 +++---
 .../locale/OpenExternalLinkTarget.pot         |    2 +-
 .../ar/LC_MESSAGES/OpenExternalLinkTarget.po  |   28 +
 .../de/LC_MESSAGES/OpenExternalLinkTarget.po  |    9 +-
 .../es/LC_MESSAGES/OpenExternalLinkTarget.po  |    9 +-
 .../fr/LC_MESSAGES/OpenExternalLinkTarget.po  |    9 +-
 .../he/LC_MESSAGES/OpenExternalLinkTarget.po  |    9 +-
 .../ia/LC_MESSAGES/OpenExternalLinkTarget.po  |    9 +-
 .../mk/LC_MESSAGES/OpenExternalLinkTarget.po  |    9 +-
 .../nb/LC_MESSAGES/OpenExternalLinkTarget.po  |    9 +-
 .../nl/LC_MESSAGES/OpenExternalLinkTarget.po  |    9 +-
 .../pt/LC_MESSAGES/OpenExternalLinkTarget.po  |    9 +-
 .../ru/LC_MESSAGES/OpenExternalLinkTarget.po  |    9 +-
 .../uk/LC_MESSAGES/OpenExternalLinkTarget.po  |    9 +-
 .../LC_MESSAGES/OpenExternalLinkTarget.po     |    9 +-
 plugins/OpenID/locale/OpenID.pot              |  546 ++--
 .../OpenID/locale/br/LC_MESSAGES/OpenID.po    |  565 ++--
 .../OpenID/locale/ca/LC_MESSAGES/OpenID.po    |  609 ++---
 .../OpenID/locale/de/LC_MESSAGES/OpenID.po    |  631 ++---
 .../OpenID/locale/fr/LC_MESSAGES/OpenID.po    |  649 ++---
 .../OpenID/locale/ia/LC_MESSAGES/OpenID.po    |  631 ++---
 .../OpenID/locale/mk/LC_MESSAGES/OpenID.po    |  625 ++---
 .../OpenID/locale/nl/LC_MESSAGES/OpenID.po    |  631 ++---
 .../OpenID/locale/tl/LC_MESSAGES/OpenID.po    |  653 ++---
 .../OpenID/locale/uk/LC_MESSAGES/OpenID.po    |  633 ++---
 plugins/OpenX/locale/OpenX.pot                |    2 +-
 plugins/OpenX/locale/br/LC_MESSAGES/OpenX.po  |   25 +-
 plugins/OpenX/locale/de/LC_MESSAGES/OpenX.po  |   25 +-
 plugins/OpenX/locale/fr/LC_MESSAGES/OpenX.po  |   25 +-
 plugins/OpenX/locale/ia/LC_MESSAGES/OpenX.po  |   25 +-
 plugins/OpenX/locale/mk/LC_MESSAGES/OpenX.po  |   25 +-
 plugins/OpenX/locale/nl/LC_MESSAGES/OpenX.po  |   25 +-
 plugins/OpenX/locale/uk/LC_MESSAGES/OpenX.po  |   25 +-
 .../PiwikAnalytics/locale/PiwikAnalytics.pot  |    2 +-
 .../locale/de/LC_MESSAGES/PiwikAnalytics.po   |    9 +-
 .../locale/es/LC_MESSAGES/PiwikAnalytics.po   |    9 +-
 .../locale/fr/LC_MESSAGES/PiwikAnalytics.po   |    9 +-
 .../locale/he/LC_MESSAGES/PiwikAnalytics.po   |    9 +-
 .../locale/ia/LC_MESSAGES/PiwikAnalytics.po   |    9 +-
 .../locale/id/LC_MESSAGES/PiwikAnalytics.po   |    9 +-
 .../locale/mk/LC_MESSAGES/PiwikAnalytics.po   |    9 +-
 .../locale/nb/LC_MESSAGES/PiwikAnalytics.po   |    9 +-
 .../locale/nl/LC_MESSAGES/PiwikAnalytics.po   |    9 +-
 .../locale/pt/LC_MESSAGES/PiwikAnalytics.po   |    9 +-
 .../pt_BR/LC_MESSAGES/PiwikAnalytics.po       |    9 +-
 .../locale/ru/LC_MESSAGES/PiwikAnalytics.po   |    9 +-
 .../locale/tl/LC_MESSAGES/PiwikAnalytics.po   |    9 +-
 .../locale/uk/LC_MESSAGES/PiwikAnalytics.po   |    9 +-
 plugins/PostDebug/locale/PostDebug.pot        |    2 +-
 .../locale/de/LC_MESSAGES/PostDebug.po        |    9 +-
 .../locale/es/LC_MESSAGES/PostDebug.po        |    9 +-
 .../locale/fi/LC_MESSAGES/PostDebug.po        |    9 +-
 .../locale/fr/LC_MESSAGES/PostDebug.po        |    9 +-
 .../locale/he/LC_MESSAGES/PostDebug.po        |    9 +-
 .../locale/ia/LC_MESSAGES/PostDebug.po        |    9 +-
 .../locale/id/LC_MESSAGES/PostDebug.po        |    9 +-
 .../locale/ja/LC_MESSAGES/PostDebug.po        |    9 +-
 .../locale/mk/LC_MESSAGES/PostDebug.po        |    9 +-
 .../locale/nb/LC_MESSAGES/PostDebug.po        |    9 +-
 .../locale/nl/LC_MESSAGES/PostDebug.po        |    9 +-
 .../locale/pt/LC_MESSAGES/PostDebug.po        |    9 +-
 .../locale/pt_BR/LC_MESSAGES/PostDebug.po     |    9 +-
 .../locale/ru/LC_MESSAGES/PostDebug.po        |    9 +-
 .../locale/tl/LC_MESSAGES/PostDebug.po        |    9 +-
 .../locale/uk/LC_MESSAGES/PostDebug.po        |    9 +-
 .../locale/PoweredByStatusNet.pot             |    2 +-
 .../br/LC_MESSAGES/PoweredByStatusNet.po      |   11 +-
 .../ca/LC_MESSAGES/PoweredByStatusNet.po      |   11 +-
 .../de/LC_MESSAGES/PoweredByStatusNet.po      |   11 +-
 .../fr/LC_MESSAGES/PoweredByStatusNet.po      |   11 +-
 .../gl/LC_MESSAGES/PoweredByStatusNet.po      |   11 +-
 .../ia/LC_MESSAGES/PoweredByStatusNet.po      |   11 +-
 .../mk/LC_MESSAGES/PoweredByStatusNet.po      |   11 +-
 .../nl/LC_MESSAGES/PoweredByStatusNet.po      |   11 +-
 .../pt/LC_MESSAGES/PoweredByStatusNet.po      |   11 +-
 .../ru/LC_MESSAGES/PoweredByStatusNet.po      |   11 +-
 .../tl/LC_MESSAGES/PoweredByStatusNet.po      |   11 +-
 .../uk/LC_MESSAGES/PoweredByStatusNet.po      |   11 +-
 plugins/PtitUrl/locale/PtitUrl.pot            |    2 +-
 .../PtitUrl/locale/br/LC_MESSAGES/PtitUrl.po  |    9 +-
 .../PtitUrl/locale/de/LC_MESSAGES/PtitUrl.po  |    9 +-
 .../PtitUrl/locale/es/LC_MESSAGES/PtitUrl.po  |    9 +-
 .../PtitUrl/locale/fr/LC_MESSAGES/PtitUrl.po  |    9 +-
 .../PtitUrl/locale/gl/LC_MESSAGES/PtitUrl.po  |    9 +-
 .../PtitUrl/locale/he/LC_MESSAGES/PtitUrl.po  |    9 +-
 .../PtitUrl/locale/ia/LC_MESSAGES/PtitUrl.po  |    9 +-
 .../PtitUrl/locale/ja/LC_MESSAGES/PtitUrl.po  |    9 +-
 .../PtitUrl/locale/mk/LC_MESSAGES/PtitUrl.po  |    9 +-
 .../PtitUrl/locale/nb/LC_MESSAGES/PtitUrl.po  |    9 +-
 .../PtitUrl/locale/nl/LC_MESSAGES/PtitUrl.po  |    9 +-
 .../PtitUrl/locale/pt/LC_MESSAGES/PtitUrl.po  |    9 +-
 .../locale/pt_BR/LC_MESSAGES/PtitUrl.po       |    9 +-
 .../PtitUrl/locale/ru/LC_MESSAGES/PtitUrl.po  |    9 +-
 .../PtitUrl/locale/tl/LC_MESSAGES/PtitUrl.po  |    9 +-
 .../PtitUrl/locale/uk/LC_MESSAGES/PtitUrl.po  |    9 +-
 plugins/RSSCloud/locale/RSSCloud.pot          |   18 +-
 .../locale/de/LC_MESSAGES/RSSCloud.po         |   30 +-
 .../locale/fr/LC_MESSAGES/RSSCloud.po         |   30 +-
 .../locale/ia/LC_MESSAGES/RSSCloud.po         |   30 +-
 .../locale/mk/LC_MESSAGES/RSSCloud.po         |   30 +-
 .../locale/nl/LC_MESSAGES/RSSCloud.po         |   30 +-
 .../locale/tl/LC_MESSAGES/RSSCloud.po         |   30 +-
 .../locale/uk/LC_MESSAGES/RSSCloud.po         |   30 +-
 plugins/Realtime/locale/Realtime.pot          |    2 +-
 .../locale/af/LC_MESSAGES/Realtime.po         |   14 +-
 .../locale/br/LC_MESSAGES/Realtime.po         |   14 +-
 .../locale/ca/LC_MESSAGES/Realtime.po         |   14 +-
 .../locale/de/LC_MESSAGES/Realtime.po         |   14 +-
 .../locale/fr/LC_MESSAGES/Realtime.po         |   14 +-
 .../locale/ia/LC_MESSAGES/Realtime.po         |   14 +-
 .../locale/mk/LC_MESSAGES/Realtime.po         |   14 +-
 .../locale/ne/LC_MESSAGES/Realtime.po         |   14 +-
 .../locale/nl/LC_MESSAGES/Realtime.po         |   14 +-
 .../locale/tr/LC_MESSAGES/Realtime.po         |   14 +-
 .../locale/uk/LC_MESSAGES/Realtime.po         |   14 +-
 plugins/Recaptcha/locale/Recaptcha.pot        |    2 +-
 .../locale/de/LC_MESSAGES/Recaptcha.po        |   11 +-
 .../locale/fr/LC_MESSAGES/Recaptcha.po        |   11 +-
 .../locale/fur/LC_MESSAGES/Recaptcha.po       |   11 +-
 .../locale/ia/LC_MESSAGES/Recaptcha.po        |   11 +-
 .../locale/mk/LC_MESSAGES/Recaptcha.po        |   11 +-
 .../locale/nb/LC_MESSAGES/Recaptcha.po        |   11 +-
 .../locale/nl/LC_MESSAGES/Recaptcha.po        |   11 +-
 .../locale/pt/LC_MESSAGES/Recaptcha.po        |   11 +-
 .../locale/ru/LC_MESSAGES/Recaptcha.po        |   11 +-
 .../locale/tl/LC_MESSAGES/Recaptcha.po        |   11 +-
 .../locale/uk/LC_MESSAGES/Recaptcha.po        |   11 +-
 .../locale/RegisterThrottle.pot               |    2 +-
 .../locale/de/LC_MESSAGES/RegisterThrottle.po |   12 +-
 .../locale/fr/LC_MESSAGES/RegisterThrottle.po |   12 +-
 .../locale/ia/LC_MESSAGES/RegisterThrottle.po |   12 +-
 .../locale/mk/LC_MESSAGES/RegisterThrottle.po |   12 +-
 .../locale/nl/LC_MESSAGES/RegisterThrottle.po |   12 +-
 .../locale/tl/LC_MESSAGES/RegisterThrottle.po |   12 +-
 .../locale/uk/LC_MESSAGES/RegisterThrottle.po |   12 +-
 .../locale/RequireValidatedEmail.pot          |    2 +-
 .../de/LC_MESSAGES/RequireValidatedEmail.po   |   11 +-
 .../fr/LC_MESSAGES/RequireValidatedEmail.po   |   11 +-
 .../ia/LC_MESSAGES/RequireValidatedEmail.po   |   11 +-
 .../mk/LC_MESSAGES/RequireValidatedEmail.po   |   11 +-
 .../nl/LC_MESSAGES/RequireValidatedEmail.po   |   11 +-
 .../tl/LC_MESSAGES/RequireValidatedEmail.po   |   11 +-
 .../uk/LC_MESSAGES/RequireValidatedEmail.po   |   11 +-
 .../locale/ReverseUsernameAuthentication.pot  |    2 +-
 .../ReverseUsernameAuthentication.po          |    9 +-
 .../ReverseUsernameAuthentication.po          |    9 +-
 .../ReverseUsernameAuthentication.po          |    9 +-
 .../ReverseUsernameAuthentication.po          |    9 +-
 .../ReverseUsernameAuthentication.po          |    9 +-
 .../ReverseUsernameAuthentication.po          |    9 +-
 .../ReverseUsernameAuthentication.po          |    9 +-
 .../ReverseUsernameAuthentication.po          |    9 +-
 .../ReverseUsernameAuthentication.po          |    9 +-
 .../ReverseUsernameAuthentication.po          |    9 +-
 .../ReverseUsernameAuthentication.po          |    9 +-
 .../ReverseUsernameAuthentication.po          |    9 +-
 plugins/SQLProfile/locale/SQLProfile.pot      |    2 +-
 .../locale/de/LC_MESSAGES/SQLProfile.po       |    9 +-
 .../locale/fr/LC_MESSAGES/SQLProfile.po       |    9 +-
 .../locale/ia/LC_MESSAGES/SQLProfile.po       |    9 +-
 .../locale/mk/LC_MESSAGES/SQLProfile.po       |    9 +-
 .../locale/nl/LC_MESSAGES/SQLProfile.po       |    9 +-
 .../locale/pt/LC_MESSAGES/SQLProfile.po       |    9 +-
 .../locale/ru/LC_MESSAGES/SQLProfile.po       |    9 +-
 .../locale/uk/LC_MESSAGES/SQLProfile.po       |    9 +-
 plugins/Sample/locale/Sample.pot              |   48 +-
 .../Sample/locale/br/LC_MESSAGES/Sample.po    |   73 +-
 .../Sample/locale/de/LC_MESSAGES/Sample.po    |   69 +-
 .../Sample/locale/fr/LC_MESSAGES/Sample.po    |   73 +-
 .../Sample/locale/ia/LC_MESSAGES/Sample.po    |   73 +-
 .../Sample/locale/lb/LC_MESSAGES/Sample.po    |   69 +-
 .../Sample/locale/mk/LC_MESSAGES/Sample.po    |   71 +-
 .../Sample/locale/nl/LC_MESSAGES/Sample.po    |   71 +-
 .../Sample/locale/ru/LC_MESSAGES/Sample.po    |   53 +-
 .../Sample/locale/tl/LC_MESSAGES/Sample.po    |   73 +-
 .../Sample/locale/uk/LC_MESSAGES/Sample.po    |   53 +-
 .../Sample/locale/zh_CN/LC_MESSAGES/Sample.po |   67 +-
 plugins/ShareNotice/locale/ShareNotice.pot    |    2 +-
 .../locale/br/LC_MESSAGES/ShareNotice.po      |   13 +-
 .../locale/ca/LC_MESSAGES/ShareNotice.po      |   13 +-
 .../locale/de/LC_MESSAGES/ShareNotice.po      |   13 +-
 .../locale/fr/LC_MESSAGES/ShareNotice.po      |   13 +-
 .../locale/ia/LC_MESSAGES/ShareNotice.po      |   13 +-
 .../locale/mk/LC_MESSAGES/ShareNotice.po      |   13 +-
 .../locale/nl/LC_MESSAGES/ShareNotice.po      |   13 +-
 .../locale/tl/LC_MESSAGES/ShareNotice.po      |   13 +-
 .../locale/uk/LC_MESSAGES/ShareNotice.po      |   13 +-
 plugins/SimpleUrl/locale/SimpleUrl.pot        |    2 +-
 .../locale/br/LC_MESSAGES/SimpleUrl.po        |    9 +-
 .../locale/de/LC_MESSAGES/SimpleUrl.po        |    9 +-
 .../locale/es/LC_MESSAGES/SimpleUrl.po        |    9 +-
 .../locale/fr/LC_MESSAGES/SimpleUrl.po        |    9 +-
 .../locale/gl/LC_MESSAGES/SimpleUrl.po        |    9 +-
 .../locale/he/LC_MESSAGES/SimpleUrl.po        |    9 +-
 .../locale/ia/LC_MESSAGES/SimpleUrl.po        |    9 +-
 .../locale/id/LC_MESSAGES/SimpleUrl.po        |    9 +-
 .../locale/ja/LC_MESSAGES/SimpleUrl.po        |    9 +-
 .../locale/mk/LC_MESSAGES/SimpleUrl.po        |    9 +-
 .../locale/nb/LC_MESSAGES/SimpleUrl.po        |    9 +-
 .../locale/nl/LC_MESSAGES/SimpleUrl.po        |    9 +-
 .../locale/pt/LC_MESSAGES/SimpleUrl.po        |    9 +-
 .../locale/ru/LC_MESSAGES/SimpleUrl.po        |    9 +-
 .../locale/tl/LC_MESSAGES/SimpleUrl.po        |    9 +-
 .../locale/uk/LC_MESSAGES/SimpleUrl.po        |    9 +-
 plugins/Sitemap/locale/Sitemap.pot            |    2 +-
 .../Sitemap/locale/br/LC_MESSAGES/Sitemap.po  |   21 +-
 .../Sitemap/locale/de/LC_MESSAGES/Sitemap.po  |   21 +-
 .../Sitemap/locale/fr/LC_MESSAGES/Sitemap.po  |   21 +-
 .../Sitemap/locale/ia/LC_MESSAGES/Sitemap.po  |   21 +-
 .../Sitemap/locale/mk/LC_MESSAGES/Sitemap.po  |   21 +-
 .../Sitemap/locale/nl/LC_MESSAGES/Sitemap.po  |   21 +-
 .../Sitemap/locale/ru/LC_MESSAGES/Sitemap.po  |   21 +-
 .../Sitemap/locale/tl/LC_MESSAGES/Sitemap.po  |   21 +-
 .../Sitemap/locale/uk/LC_MESSAGES/Sitemap.po  |   21 +-
 .../locale/SlicedFavorites.pot                |    2 +-
 .../locale/de/LC_MESSAGES/SlicedFavorites.po  |   10 +-
 .../locale/fr/LC_MESSAGES/SlicedFavorites.po  |   10 +-
 .../locale/he/LC_MESSAGES/SlicedFavorites.po  |   10 +-
 .../locale/ia/LC_MESSAGES/SlicedFavorites.po  |   10 +-
 .../locale/id/LC_MESSAGES/SlicedFavorites.po  |   10 +-
 .../locale/mk/LC_MESSAGES/SlicedFavorites.po  |   10 +-
 .../locale/nl/LC_MESSAGES/SlicedFavorites.po  |   10 +-
 .../locale/ru/LC_MESSAGES/SlicedFavorites.po  |   10 +-
 .../locale/tl/LC_MESSAGES/SlicedFavorites.po  |   10 +-
 .../locale/uk/LC_MESSAGES/SlicedFavorites.po  |   10 +-
 plugins/SphinxSearch/locale/SphinxSearch.pot  |   12 +-
 .../locale/de/LC_MESSAGES/SphinxSearch.po     |   19 +-
 .../locale/fr/LC_MESSAGES/SphinxSearch.po     |   21 +-
 .../locale/ia/LC_MESSAGES/SphinxSearch.po     |   19 +-
 .../locale/mk/LC_MESSAGES/SphinxSearch.po     |   19 +-
 .../locale/nl/LC_MESSAGES/SphinxSearch.po     |   21 +-
 .../locale/ru/LC_MESSAGES/SphinxSearch.po     |   19 +-
 .../locale/tl/LC_MESSAGES/SphinxSearch.po     |   21 +-
 .../locale/uk/LC_MESSAGES/SphinxSearch.po     |   19 +-
 .../locale/StrictTransportSecurity.pot        |    2 +-
 .../ia/LC_MESSAGES/StrictTransportSecurity.po |   30 +
 .../mk/LC_MESSAGES/StrictTransportSecurity.po |   29 +
 .../nl/LC_MESSAGES/StrictTransportSecurity.po |   29 +
 plugins/SubMirror/locale/SubMirror.pot        |  120 +-
 .../locale/de/LC_MESSAGES/SubMirror.po        |  138 +-
 .../locale/fr/LC_MESSAGES/SubMirror.po        |  130 +-
 .../locale/ia/LC_MESSAGES/SubMirror.po        |  130 +-
 .../locale/mk/LC_MESSAGES/SubMirror.po        |  130 +-
 .../locale/nl/LC_MESSAGES/SubMirror.po        |  130 +-
 .../locale/tl/LC_MESSAGES/SubMirror.po        |  130 +-
 .../locale/uk/LC_MESSAGES/SubMirror.po        |  130 +-
 .../locale/SubscriptionThrottle.pot           |    2 +-
 .../de/LC_MESSAGES/SubscriptionThrottle.po    |    9 +-
 .../es/LC_MESSAGES/SubscriptionThrottle.po    |    9 +-
 .../fr/LC_MESSAGES/SubscriptionThrottle.po    |    9 +-
 .../he/LC_MESSAGES/SubscriptionThrottle.po    |    9 +-
 .../ia/LC_MESSAGES/SubscriptionThrottle.po    |    9 +-
 .../id/LC_MESSAGES/SubscriptionThrottle.po    |    9 +-
 .../mk/LC_MESSAGES/SubscriptionThrottle.po    |    9 +-
 .../nb/LC_MESSAGES/SubscriptionThrottle.po    |    9 +-
 .../nl/LC_MESSAGES/SubscriptionThrottle.po    |    9 +-
 .../pt/LC_MESSAGES/SubscriptionThrottle.po    |    9 +-
 .../ru/LC_MESSAGES/SubscriptionThrottle.po    |    9 +-
 .../tl/LC_MESSAGES/SubscriptionThrottle.po    |    9 +-
 .../uk/LC_MESSAGES/SubscriptionThrottle.po    |    9 +-
 plugins/TabFocus/locale/TabFocus.pot          |    2 +-
 .../locale/br/LC_MESSAGES/TabFocus.po         |    9 +-
 .../locale/es/LC_MESSAGES/TabFocus.po         |    9 +-
 .../locale/fr/LC_MESSAGES/TabFocus.po         |    9 +-
 .../locale/gl/LC_MESSAGES/TabFocus.po         |    9 +-
 .../locale/he/LC_MESSAGES/TabFocus.po         |    9 +-
 .../locale/ia/LC_MESSAGES/TabFocus.po         |    9 +-
 .../locale/id/LC_MESSAGES/TabFocus.po         |    9 +-
 .../locale/mk/LC_MESSAGES/TabFocus.po         |    9 +-
 .../locale/nb/LC_MESSAGES/TabFocus.po         |    9 +-
 .../locale/nl/LC_MESSAGES/TabFocus.po         |    9 +-
 .../locale/ru/LC_MESSAGES/TabFocus.po         |    9 +-
 .../locale/tl/LC_MESSAGES/TabFocus.po         |    9 +-
 .../locale/uk/LC_MESSAGES/TabFocus.po         |    9 +-
 plugins/TightUrl/locale/TightUrl.pot          |    2 +-
 .../locale/de/LC_MESSAGES/TightUrl.po         |    9 +-
 .../locale/es/LC_MESSAGES/TightUrl.po         |    9 +-
 .../locale/fr/LC_MESSAGES/TightUrl.po         |    9 +-
 .../locale/gl/LC_MESSAGES/TightUrl.po         |    9 +-
 .../locale/he/LC_MESSAGES/TightUrl.po         |    9 +-
 .../locale/ia/LC_MESSAGES/TightUrl.po         |    9 +-
 .../locale/id/LC_MESSAGES/TightUrl.po         |    9 +-
 .../locale/ja/LC_MESSAGES/TightUrl.po         |    9 +-
 .../locale/mk/LC_MESSAGES/TightUrl.po         |    9 +-
 .../locale/nb/LC_MESSAGES/TightUrl.po         |    9 +-
 .../locale/nl/LC_MESSAGES/TightUrl.po         |    9 +-
 .../locale/pt/LC_MESSAGES/TightUrl.po         |    9 +-
 .../locale/pt_BR/LC_MESSAGES/TightUrl.po      |    9 +-
 .../locale/ru/LC_MESSAGES/TightUrl.po         |    9 +-
 .../locale/tl/LC_MESSAGES/TightUrl.po         |    9 +-
 .../locale/uk/LC_MESSAGES/TightUrl.po         |    9 +-
 plugins/TinyMCE/locale/TinyMCE.pot            |    2 +-
 .../TinyMCE/locale/ca/LC_MESSAGES/TinyMCE.po  |    9 +-
 .../TinyMCE/locale/eo/LC_MESSAGES/TinyMCE.po  |    9 +-
 .../TinyMCE/locale/es/LC_MESSAGES/TinyMCE.po  |    9 +-
 .../TinyMCE/locale/fr/LC_MESSAGES/TinyMCE.po  |    9 +-
 .../TinyMCE/locale/he/LC_MESSAGES/TinyMCE.po  |    9 +-
 .../TinyMCE/locale/ia/LC_MESSAGES/TinyMCE.po  |    9 +-
 .../TinyMCE/locale/id/LC_MESSAGES/TinyMCE.po  |    9 +-
 .../TinyMCE/locale/mk/LC_MESSAGES/TinyMCE.po  |    9 +-
 .../TinyMCE/locale/nb/LC_MESSAGES/TinyMCE.po  |    9 +-
 .../TinyMCE/locale/nl/LC_MESSAGES/TinyMCE.po  |    9 +-
 .../TinyMCE/locale/pt/LC_MESSAGES/TinyMCE.po  |    9 +-
 .../locale/pt_BR/LC_MESSAGES/TinyMCE.po       |    9 +-
 .../TinyMCE/locale/ru/LC_MESSAGES/TinyMCE.po  |    9 +-
 .../TinyMCE/locale/tl/LC_MESSAGES/TinyMCE.po  |    9 +-
 .../TinyMCE/locale/uk/LC_MESSAGES/TinyMCE.po  |    9 +-
 .../TwitterBridge/locale/TwitterBridge.pot    |  376 +--
 .../locale/br/LC_MESSAGES/TwitterBridge.po    |  583 ++--
 .../locale/ca/LC_MESSAGES/TwitterBridge.po    |  629 ++---
 .../locale/fa/LC_MESSAGES/TwitterBridge.po    |  579 ++--
 .../locale/fr/LC_MESSAGES/TwitterBridge.po    |  633 ++---
 .../locale/ia/LC_MESSAGES/TwitterBridge.po    |  619 ++---
 .../locale/mk/LC_MESSAGES/TwitterBridge.po    |  623 ++---
 .../locale/nl/LC_MESSAGES/TwitterBridge.po    |  631 ++---
 .../locale/tr/LC_MESSAGES/TwitterBridge.po    |  601 ++---
 .../locale/uk/LC_MESSAGES/TwitterBridge.po    |  623 ++---
 .../locale/zh_CN/LC_MESSAGES/TwitterBridge.po |  597 ++--
 plugins/UserFlag/locale/UserFlag.pot          |   76 +-
 .../locale/ca/LC_MESSAGES/UserFlag.po         |   87 +-
 .../locale/fr/LC_MESSAGES/UserFlag.po         |   87 +-
 .../locale/ia/LC_MESSAGES/UserFlag.po         |   85 +-
 .../locale/mk/LC_MESSAGES/UserFlag.po         |   87 +-
 .../locale/nl/LC_MESSAGES/UserFlag.po         |   87 +-
 .../locale/pt/LC_MESSAGES/UserFlag.po         |   87 +-
 .../locale/ru/LC_MESSAGES/UserFlag.po         |   87 +-
 .../locale/uk/LC_MESSAGES/UserFlag.po         |   87 +-
 plugins/UserLimit/locale/UserLimit.pot        |    2 +-
 .../locale/br/LC_MESSAGES/UserLimit.po        |    9 +-
 .../locale/de/LC_MESSAGES/UserLimit.po        |    9 +-
 .../locale/es/LC_MESSAGES/UserLimit.po        |    9 +-
 .../locale/fi/LC_MESSAGES/UserLimit.po        |    9 +-
 .../locale/fr/LC_MESSAGES/UserLimit.po        |    9 +-
 .../locale/gl/LC_MESSAGES/UserLimit.po        |    9 +-
 .../locale/he/LC_MESSAGES/UserLimit.po        |    9 +-
 .../locale/ia/LC_MESSAGES/UserLimit.po        |    9 +-
 .../locale/id/LC_MESSAGES/UserLimit.po        |    9 +-
 .../locale/lb/LC_MESSAGES/UserLimit.po        |    9 +-
 .../locale/lv/LC_MESSAGES/UserLimit.po        |    9 +-
 .../locale/mk/LC_MESSAGES/UserLimit.po        |    9 +-
 .../locale/nb/LC_MESSAGES/UserLimit.po        |    9 +-
 .../locale/nl/LC_MESSAGES/UserLimit.po        |    9 +-
 .../locale/pt/LC_MESSAGES/UserLimit.po        |    9 +-
 .../locale/pt_BR/LC_MESSAGES/UserLimit.po     |    9 +-
 .../locale/ru/LC_MESSAGES/UserLimit.po        |    9 +-
 .../locale/tl/LC_MESSAGES/UserLimit.po        |    9 +-
 .../locale/tr/LC_MESSAGES/UserLimit.po        |    9 +-
 .../locale/uk/LC_MESSAGES/UserLimit.po        |    9 +-
 plugins/WikiHashtags/locale/WikiHashtags.pot  |    2 +-
 .../locale/br/LC_MESSAGES/WikiHashtags.po     |    9 +-
 .../locale/de/LC_MESSAGES/WikiHashtags.po     |    9 +-
 .../locale/fr/LC_MESSAGES/WikiHashtags.po     |    9 +-
 .../locale/he/LC_MESSAGES/WikiHashtags.po     |    9 +-
 .../locale/ia/LC_MESSAGES/WikiHashtags.po     |    9 +-
 .../locale/id/LC_MESSAGES/WikiHashtags.po     |    9 +-
 .../locale/mk/LC_MESSAGES/WikiHashtags.po     |    9 +-
 .../locale/nb/LC_MESSAGES/WikiHashtags.po     |    9 +-
 .../locale/nl/LC_MESSAGES/WikiHashtags.po     |    9 +-
 .../locale/pt/LC_MESSAGES/WikiHashtags.po     |    9 +-
 .../locale/pt_BR/LC_MESSAGES/WikiHashtags.po  |    9 +-
 .../locale/ru/LC_MESSAGES/WikiHashtags.po     |    9 +-
 .../locale/tl/LC_MESSAGES/WikiHashtags.po     |    9 +-
 .../locale/tr/LC_MESSAGES/WikiHashtags.po     |    9 +-
 .../locale/uk/LC_MESSAGES/WikiHashtags.po     |    9 +-
 .../WikiHowProfile/locale/WikiHowProfile.pot  |    2 +-
 .../locale/fr/LC_MESSAGES/WikiHowProfile.po   |   11 +-
 .../locale/ia/LC_MESSAGES/WikiHowProfile.po   |   11 +-
 .../locale/mk/LC_MESSAGES/WikiHowProfile.po   |   11 +-
 .../locale/nl/LC_MESSAGES/WikiHowProfile.po   |   11 +-
 .../locale/ru/LC_MESSAGES/WikiHowProfile.po   |   11 +-
 .../locale/tl/LC_MESSAGES/WikiHowProfile.po   |   11 +-
 .../locale/tr/LC_MESSAGES/WikiHowProfile.po   |   11 +-
 .../locale/uk/LC_MESSAGES/WikiHowProfile.po   |   11 +-
 plugins/XCache/locale/XCache.pot              |    2 +-
 .../XCache/locale/br/LC_MESSAGES/XCache.po    |    9 +-
 .../XCache/locale/es/LC_MESSAGES/XCache.po    |    9 +-
 .../XCache/locale/fi/LC_MESSAGES/XCache.po    |    9 +-
 .../XCache/locale/fr/LC_MESSAGES/XCache.po    |    9 +-
 .../XCache/locale/gl/LC_MESSAGES/XCache.po    |    9 +-
 .../XCache/locale/he/LC_MESSAGES/XCache.po    |    9 +-
 .../XCache/locale/ia/LC_MESSAGES/XCache.po    |    9 +-
 .../XCache/locale/id/LC_MESSAGES/XCache.po    |    9 +-
 .../XCache/locale/mk/LC_MESSAGES/XCache.po    |    9 +-
 .../XCache/locale/nb/LC_MESSAGES/XCache.po    |    9 +-
 .../XCache/locale/nl/LC_MESSAGES/XCache.po    |    9 +-
 .../XCache/locale/pt/LC_MESSAGES/XCache.po    |    9 +-
 .../XCache/locale/pt_BR/LC_MESSAGES/XCache.po |    9 +-
 .../XCache/locale/ru/LC_MESSAGES/XCache.po    |    9 +-
 .../XCache/locale/tl/LC_MESSAGES/XCache.po    |    9 +-
 .../XCache/locale/tr/LC_MESSAGES/XCache.po    |    9 +-
 .../XCache/locale/uk/LC_MESSAGES/XCache.po    |    9 +-
 plugins/Xmpp/locale/Xmpp.pot                  |   10 +-
 plugins/Xmpp/locale/ia/LC_MESSAGES/Xmpp.po    |   35 +
 plugins/Xmpp/locale/mk/LC_MESSAGES/Xmpp.po    |   35 +
 plugins/Xmpp/locale/nl/LC_MESSAGES/Xmpp.po    |   35 +
 plugins/YammerImport/locale/YammerImport.pot  |  168 +-
 .../locale/br/LC_MESSAGES/YammerImport.po     |  431 ++-
 .../locale/fr/LC_MESSAGES/YammerImport.po     |  433 ++-
 .../locale/gl/LC_MESSAGES/YammerImport.po     |  415 ++-
 .../locale/ia/LC_MESSAGES/YammerImport.po     |  433 ++-
 .../locale/mk/LC_MESSAGES/YammerImport.po     |  369 ++-
 .../locale/nl/LC_MESSAGES/YammerImport.po     |  433 ++-
 .../locale/ru/LC_MESSAGES/YammerImport.po     |  431 ++-
 .../locale/tr/LC_MESSAGES/YammerImport.po     |  399 ++-
 .../locale/uk/LC_MESSAGES/YammerImport.po     |  449 ++-
 1191 files changed, 25286 insertions(+), 97643 deletions(-)
 create mode 100644 plugins/AccountManager/locale/af/LC_MESSAGES/AccountManager.po
 create mode 100644 plugins/AccountManager/locale/ia/LC_MESSAGES/AccountManager.po
 create mode 100644 plugins/AccountManager/locale/mk/LC_MESSAGES/AccountManager.po
 create mode 100644 plugins/AccountManager/locale/nl/LC_MESSAGES/AccountManager.po
 create mode 100644 plugins/Aim/locale/af/LC_MESSAGES/Aim.po
 create mode 100644 plugins/Aim/locale/ia/LC_MESSAGES/Aim.po
 create mode 100644 plugins/Aim/locale/mk/LC_MESSAGES/Aim.po
 create mode 100644 plugins/Aim/locale/nl/LC_MESSAGES/Aim.po
 create mode 100644 plugins/Bookmark/locale/te/LC_MESSAGES/Bookmark.po
 create mode 100644 plugins/Echo/locale/ar/LC_MESSAGES/Echo.po
 create mode 100644 plugins/ExtendedProfile/locale/br/LC_MESSAGES/ExtendedProfile.po
 create mode 100644 plugins/ExtendedProfile/locale/ia/LC_MESSAGES/ExtendedProfile.po
 create mode 100644 plugins/ExtendedProfile/locale/mk/LC_MESSAGES/ExtendedProfile.po
 create mode 100644 plugins/ExtendedProfile/locale/nl/LC_MESSAGES/ExtendedProfile.po
 create mode 100644 plugins/Irc/locale/ia/LC_MESSAGES/Irc.po
 create mode 100644 plugins/Irc/locale/mk/LC_MESSAGES/Irc.po
 create mode 100644 plugins/Irc/locale/nl/LC_MESSAGES/Irc.po
 create mode 100644 plugins/Msn/locale/br/LC_MESSAGES/Msn.po
 create mode 100644 plugins/Msn/locale/ia/LC_MESSAGES/Msn.po
 create mode 100644 plugins/Msn/locale/mk/LC_MESSAGES/Msn.po
 create mode 100644 plugins/Msn/locale/nl/LC_MESSAGES/Msn.po
 create mode 100644 plugins/NewMenu/locale/ar/LC_MESSAGES/NewMenu.po
 create mode 100644 plugins/OpenExternalLinkTarget/locale/ar/LC_MESSAGES/OpenExternalLinkTarget.po
 create mode 100644 plugins/StrictTransportSecurity/locale/ia/LC_MESSAGES/StrictTransportSecurity.po
 create mode 100644 plugins/StrictTransportSecurity/locale/mk/LC_MESSAGES/StrictTransportSecurity.po
 create mode 100644 plugins/StrictTransportSecurity/locale/nl/LC_MESSAGES/StrictTransportSecurity.po
 create mode 100644 plugins/Xmpp/locale/ia/LC_MESSAGES/Xmpp.po
 create mode 100644 plugins/Xmpp/locale/mk/LC_MESSAGES/Xmpp.po
 create mode 100644 plugins/Xmpp/locale/nl/LC_MESSAGES/Xmpp.po

diff --git a/locale/ar/LC_MESSAGES/statusnet.po b/locale/ar/LC_MESSAGES/statusnet.po
index c207204036..5e39b68475 100644
--- a/locale/ar/LC_MESSAGES/statusnet.po
+++ b/locale/ar/LC_MESSAGES/statusnet.po
@@ -12,69 +12,59 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:23+0000\n"
-"PO-Revision-Date: 2011-03-03 17:25:35+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:06+0000\n"
 "Language-Team: Arabic <http://translatewiki.net/wiki/Portal:ar>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ar\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=6; plural=(n == 0) ? 0 : ( (n == 1) ? 1 : ( (n == "
 "2) ? 2 : ( (n%100 >= 3 && n%100 <= 10) ? 3 : ( (n%100 >= 11 && n%100 <= "
 "99) ? 4 : 5 ) ) ) );\n"
-"X-POT-Import-Date: 2011-02-25 23:49:23+0000\n"
+"X-POT-Import-Date: 2011-03-03 17:59:19+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
-#: actions/accessadminpanel.php:53 lib/adminpanelaction.php:363
 msgid "Access"
 msgstr "نفاذ"
 
 #. TRANS: Page notice.
-#: actions/accessadminpanel.php:64
 msgid "Site access settings"
 msgstr "إعدادات الوصول إلى الموقع"
 
 #. TRANS: Form legend for registration form.
-#: actions/accessadminpanel.php:151
 msgid "Registration"
 msgstr "تسجيل"
 
 #. TRANS: Checkbox instructions for admin setting "Private".
-#: actions/accessadminpanel.php:155
 msgid "Prohibit anonymous users (not logged in) from viewing site?"
 msgstr "أأمنع المستخدمين المجهولين (غير الوالجين) من عرض الموقع؟"
 
 #. TRANS: Checkbox label for prohibiting anonymous users from viewing site.
-#: actions/accessadminpanel.php:157
 msgctxt "LABEL"
 msgid "Private"
 msgstr "خاص"
 
 #. TRANS: Checkbox instructions for admin setting "Invite only".
-#: actions/accessadminpanel.php:164
 msgid "Make registration invitation only."
 msgstr "اجعل التسجيل عبر الدعوة فقط."
 
 #. TRANS: Checkbox label for configuring site as invite only.
-#: actions/accessadminpanel.php:166
 msgid "Invite only"
 msgstr "بالدعوة فقط"
 
 #. TRANS: Checkbox instructions for admin setting "Closed" (no new registrations).
-#: actions/accessadminpanel.php:173
 msgid "Disable new registrations."
 msgstr "عطّل التسجيل الجديد."
 
 #. TRANS: Checkbox label for disabling new user registrations.
-#: actions/accessadminpanel.php:175
 msgid "Closed"
 msgstr "مُغلق"
 
 #. TRANS: Title for button to save access settings in site admin panel.
-#: actions/accessadminpanel.php:191
 msgid "Save access settings"
 msgstr "حفظ إعدادت الوصول"
 
@@ -82,6 +72,7 @@ msgstr "حفظ إعدادت الوصول"
 #. TRANS: Button text for saving theme settings.
 #. TRANS: Button label to save e-mail preferences.
 #. TRANS: Button label to save IM preferences.
+#. TRANS: Button text in the license admin panel.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
 #. TRANS: Button text for saving site notice in admin panel.
@@ -91,21 +82,12 @@ msgstr "حفظ إعدادت الوصول"
 #. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
 #. TRANS: Button text on profile design page to save settings.
-#: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
-#: actions/emailsettings.php:251 actions/imsettings.php:199
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:198
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:204
-#: actions/subscriptions.php:261 actions/urlsettings.php:152
-#: actions/useradminpanel.php:298 lib/applicationeditform.php:355
-#: lib/designform.php:320 lib/groupeditform.php:201
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "احفظ"
 
 #. TRANS: Server error when page not found (404).
 #. TRANS: Server error when page not found (404)
-#: actions/all.php:68 actions/public.php:98 actions/replies.php:93
-#: actions/showfavorites.php:140 actions/tag.php:52
 msgid "No such page."
 msgstr "لا صفحة كهذه."
 
@@ -124,6 +106,7 @@ msgstr "لا صفحة كهذه."
 #. TRANS: Client error displayed when checking group membership for a non-existing user.
 #. TRANS: Client error displayed when trying to have a non-existing user join a group.
 #. TRANS: Client error displayed when trying to have a non-existing user leave a group.
+#. TRANS: Client error displayed when not providing a user or an invalid user.
 #. TRANS: Client error displayed when updating a status for a non-existing user.
 #. TRANS: Client error displayed when requesting a list of followers for a non-existing user.
 #. TRANS: Client error displayed when requesting most recent favourite notices by a user for a non-existing user.
@@ -136,6 +119,8 @@ msgstr "لا صفحة كهذه."
 #. 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.
 #. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
@@ -143,33 +128,10 @@ msgstr "لا صفحة كهذه."
 #. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when calling a profile action without specifying a user.
-#: actions/all.php:80 actions/allrss.php:69
-#: actions/apiaccountupdatedeliverydevice.php:110
-#: actions/apiaccountupdateprofile.php:103
-#: actions/apiaccountupdateprofilebackgroundimage.php:118
-#: actions/apiaccountupdateprofileimage.php:104 actions/apiatomservice.php:59
-#: actions/apiblockcreate.php:96 actions/apiblockdestroy.php:94
-#: actions/apidirectmessage.php:75 actions/apidirectmessagenew.php:72
-#: actions/apigroupcreate.php:111 actions/apigroupismember.php:89
-#: actions/apigroupjoin.php:98 actions/apigroupleave.php:98
-#: actions/apigrouplist.php:70 actions/apigroupprofileupdate.php:108
-#: actions/apistatusesupdate.php:230 actions/apisubscriptions.php:85
-#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:173
-#: actions/apitimelinehome.php:78 actions/apitimelinementions.php:77
-#: actions/apitimelineuser.php:79 actions/avatarbynickname.php:79
-#: actions/favoritesrss.php:72 actions/foaf.php:42 actions/foaf.php:61
-#: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116
-#: actions/otp.php:78 actions/remotesubscribe.php:144
-#: actions/remotesubscribe.php:153 actions/replies.php:73
-#: actions/repliesrss.php:38 actions/rsd.php:113 actions/showfavorites.php:106
-#: actions/userbyid.php:75 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/userxrd.php:59 actions/xrds.php:71 lib/command.php:509
-#: lib/galleryaction.php:59 lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "لا مستخدم كهذا."
 
 #. TRANS: Page title. %1$s is user nickname, %2$d is page number
-#: actions/all.php:91
 #, php-format
 msgid "%1$s and friends, page %2$d"
 msgstr "%1$s والأصدقاء, الصفحة %2$d"
@@ -178,50 +140,43 @@ msgstr "%1$s والأصدقاء, الصفحة %2$d"
 #. TRANS: H1 text for page. %s is a user nickname.
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Timeline title for user and friends. %s is a user nickname.
-#: actions/all.php:94 actions/all.php:191 actions/allrss.php:117
-#: actions/apitimelinefriends.php:207 actions/apitimelinehome.php:113
-#: lib/personalgroupnav.php:100
 #, php-format
 msgid "%s and friends"
 msgstr "%s والأصدقاء"
 
 #. TRANS: %s is user nickname.
-#: actions/all.php:108
 #, php-format
 msgid "Feed for friends of %s (RSS 1.0)"
 msgstr "تغذية أصدقاء %s (آرإس​إس 1.0)"
 
 #. TRANS: %s is user nickname.
-#: actions/all.php:117
 #, php-format
 msgid "Feed for friends of %s (RSS 2.0)"
 msgstr "تغذية أصدقاء %s (آرإس​إس 2.0)"
 
 #. TRANS: %s is user nickname.
-#: actions/all.php:126
 #, php-format
 msgid "Feed for friends of %s (Atom)"
 msgstr "تغذية أصدقاء %s (أتوم)"
 
 #. TRANS: Empty list message. %s is a user nickname.
-#: actions/all.php:139
 #, php-format
 msgid ""
 "This is the timeline for %s and friends but no one has posted anything yet."
-msgstr ""
+msgstr "هذا هو السجل الزمني ل%s وأصدقائه لكن لم يرسل أحد شيئًا إلى الآن."
 
 #. TRANS: Encouragement displayed on logged in user's empty timeline.
 #. TRANS: This message contains Markdown links. Keep "](" together.
-#: actions/all.php:146
 #, php-format
 msgid ""
 "Try subscribing to more people, [join a group](%%action.groups%%) or post "
 "something yourself."
 msgstr ""
+"حاول أن تشترك بمزيد من الأشخاص أو أن [تنضم إلى مجموعة](%%action.groups%%) أو "
+"أن تكتبت شيئا."
 
 #. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@".
 #. TRANS: This message contains Markdown links. Keep "](" together.
-#: actions/all.php:150
 #, php-format
 msgid ""
 "You can try to [nudge %1$s](../%2$s) from their profile or [post something "
@@ -232,7 +187,6 @@ msgstr ""
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
 #. TRANS: Second sentence of empty message for anonymous users. %s is a user nickname.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:221
 #, fuzzy, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -242,14 +196,11 @@ msgstr ""
 "register%%%%) وترسل شيئًا شيقًا ليضيفه إلى مفضلته. :)"
 
 #. TRANS: H1 text for page when viewing a list for self.
-#: actions/all.php:188
 msgid "You and friends"
 msgstr "أنت والأصدقاء"
 
 #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
 #. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name.
-#: actions/allrss.php:122 actions/apitimelinefriends.php:213
-#: actions/apitimelinehome.php:119
 #, fuzzy, php-format
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr "الإشعارات التي فضلها %1$s في %2$s!"
@@ -268,55 +219,20 @@ msgstr "الإشعارات التي فضلها %1$s في %2$s!"
 #. TRANS: Client error displayed trying to execute an unknown API method checking group membership.
 #. TRANS: Client error displayed trying to execute an unknown API method listing the latest 20 groups.
 #. TRANS: Client error displayed trying to execute an unknown API method showing group membership.
+#. TRANS: Client error displayed when using an unsupported API format.
 #. TRANS: Client error displayed trying to execute an unknown API method showing a group.
 #. TRANS: Client error displayed trying to execute an unknown API method testing API connectivity.
 #. TRANS: Client error displayed trying to execute an unknown API method deleting a status.
 #. TRANS: Client error displayed when trying to handle an unknown API method.
-#: actions/apiaccountratelimitstatus.php:69
-#: actions/apiaccountupdatedeliverydevice.php:92
-#: actions/apiaccountupdateprofile.php:94
-#: actions/apiaccountupdateprofilebackgroundimage.php:92
-#: actions/apiaccountupdateprofilecolors.php:115
-#: actions/apiaccountverifycredentials.php:68 actions/apidirectmessage.php:157
-#: actions/apifavoritecreate.php:98 actions/apifavoritedestroy.php:98
-#: actions/apifriendshipscreate.php:99 actions/apifriendshipsdestroy.php:99
-#: actions/apifriendshipsshow.php:124 actions/apigroupcreate.php:138
-#: actions/apigroupismember.php:115 actions/apigroupjoin.php:151
-#: actions/apigroupleave.php:141 actions/apigrouplist.php:134
-#: actions/apigrouplistall.php:120 actions/apigroupmembership.php:105
-#: actions/apigroupprofileupdate.php:100 actions/apigroupprofileupdate.php:213
-#: actions/apigroupshow.php:114 actions/apihelptest.php:84
-#: actions/apistatusesdestroy.php:101 actions/apistatusesretweets.php:110
-#: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:139
-#: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
-#: actions/apitimelinefavorites.php:182 actions/apitimelinefriends.php:276
-#: actions/apitimelinegroup.php:148 actions/apitimelinehome.php:181
-#: actions/apitimelinementions.php:182 actions/apitimelinepublic.php:247
-#: actions/apitimelineretweetedtome.php:147
-#: actions/apitimelineretweetsofme.php:147 actions/apitimelinetag.php:165
-#: actions/apitimelineuser.php:217 actions/apiusershow.php:100
 msgid "API method not found."
 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.
-#: actions/apiaccountupdatedeliverydevice.php:83
-#: actions/apiaccountupdateprofile.php:85
-#: actions/apiaccountupdateprofilebackgroundimage.php:83
-#: actions/apiaccountupdateprofilecolors.php:106
-#: actions/apiaccountupdateprofileimage.php:80 actions/apiblockcreate.php:87
-#: actions/apiblockdestroy.php:85 actions/apidirectmessagenew.php:107
-#: actions/apifavoritecreate.php:88 actions/apifavoritedestroy.php:88
-#: actions/apifriendshipscreate.php:89 actions/apifriendshipsdestroy.php:89
-#: actions/apigroupcreate.php:102 actions/apigroupjoin.php:89
-#: actions/apigroupleave.php:89 actions/apigroupprofileupdate.php:92
-#: actions/apimediaupload.php:66 actions/apistatusesretweet.php:63
-#: actions/apistatusesupdate.php:194
 msgid "This method requires a POST."
 msgstr "تتطلب هذه الطريقة POST."
 
 #. TRANS: Client error displayed when no valid device parameter is provided for a user's delivery device setting.
-#: actions/apiaccountupdatedeliverydevice.php:103
 msgid ""
 "You must specify a parameter named 'device' with a value of one of: sms, im, "
 "none."
@@ -329,10 +245,6 @@ msgstr ""
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
-#: actions/apiaccountupdatedeliverydevice.php:136
-#: actions/emailsettings.php:353 actions/emailsettings.php:499
-#: actions/profilesettings.php:323 actions/smssettings.php:300
-#: actions/smssettings.php:453 actions/urlsettings.php:211
 msgid "Could not update user."
 msgstr "تعذّر تحديث المستخدم."
 
@@ -345,32 +257,17 @@ msgstr "تعذّر تحديث المستخدم."
 #. TRANS: Server error displayed when requesting Friends of a Friend feed for a user for which the profile could not be found.
 #. TRANS: Server error displayed when trying to get a user hCard for a user without a profile.
 #. TRANS: Server error displayed when calling a profile action while the specified user does not have a profile.
-#: actions/apiaccountupdateprofile.php:111
-#: actions/apiaccountupdateprofilebackgroundimage.php:199
-#: actions/apiaccountupdateprofilecolors.php:183
-#: actions/apiaccountupdateprofileimage.php:131
-#: actions/apiuserprofileimage.php:88 actions/apiusershow.php:108
-#: actions/avatarbynickname.php:85 actions/foaf.php:69 actions/hcard.php:75
-#: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
-#: lib/profileaction.php:85
 msgid "User has no profile."
 msgstr "ليس للمستخدم ملف شخصي."
 
 #. TRANS: Server error displayed if a user profile could not be saved.
 #. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:419
 msgid "Could not save profile."
 msgstr "لم يمكن حفظ الملف."
 
 #. TRANS: Client error displayed when the number of bytes in a POST request exceeds a limit.
 #. TRANS: %s is the number of bytes of the CONTENT_LENGTH.
 #. TRANS: Form validation error in design settings form. POST should remain untranslated.
-#: actions/apiaccountupdateprofilebackgroundimage.php:108
-#: actions/apiaccountupdateprofileimage.php:95 actions/apimediaupload.php:81
-#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
-#: actions/designadminpanel.php:120 actions/editapplication.php:121
-#: actions/newapplication.php:102 actions/newnotice.php:95
-#: lib/designsettings.php:110
 #, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s byte) due to its "
@@ -390,26 +287,15 @@ msgstr[5] ""
 #. TRANS: Client error displayed when a database error occurs inserting profile colours.
 #. TRANS: Client error displayed when a database error occurs updating profile colours.
 #. TRANS: Form validation error displayed when group design settings could not be saved because of an application issue.
-#: actions/apiaccountupdateprofilebackgroundimage.php:138
-#: actions/apiaccountupdateprofilebackgroundimage.php:149
-#: actions/apiaccountupdateprofilecolors.php:160
-#: actions/apiaccountupdateprofilecolors.php:171
-#: actions/groupdesignsettings.php:285 actions/groupdesignsettings.php:296
-#: actions/userdesignsettings.php:218 actions/userdesignsettings.php:228
-#: actions/userdesignsettings.php:270 actions/userdesignsettings.php:280
 msgid "Unable to save your design settings."
 msgstr "تعذّر حفظ إعدادات تصميمك."
 
 #. TRANS: Error displayed when updating design settings fails.
 #. TRANS: Client error displayed when a database error occurs updating profile colours.
-#: actions/apiaccountupdateprofilebackgroundimage.php:191
-#: actions/apiaccountupdateprofilecolors.php:139
-#: actions/userdesignsettings.php:196
 msgid "Could not update your design."
 msgstr "تعذّر تحديث تصميمك."
 
 #. TRANS: Title for Atom feed.
-#: actions/apiatomservice.php:85
 msgctxt "ATOM"
 msgid "Main"
 msgstr ""
@@ -418,9 +304,6 @@ msgstr ""
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Title in atom group notice feed. %s is a group name.
 #. TRANS: Title in atom user notice feed. %s is a user name.
-#: actions/apiatomservice.php:93 actions/grouprss.php:138
-#: actions/userrss.php:94 lib/atomgroupnoticefeed.php:63
-#: lib/atomusernoticefeed.php:88
 #, php-format
 msgid "%s timeline"
 msgstr "مسار %s الزمني"
@@ -430,8 +313,6 @@ msgstr "مسار %s الزمني"
 #. TRANS: %s is a user nickname.
 #. TRANS: Header for subscriptions overview for a user (first page).
 #. TRANS: %s is a user nickname.
-#: actions/apiatomservice.php:104 actions/atompubsubscriptionfeed.php:148
-#: actions/subscriptions.php:51
 #, php-format
 msgid "%s subscriptions"
 msgstr "اشتراكات %s"
@@ -439,58 +320,48 @@ msgstr "اشتراكات %s"
 #. TRANS: Title for Atom feed with a user's favorite notices. %s is a user nickname.
 #. TRANS: Title for Atom favorites feed.
 #. TRANS: %s is a user nickname.
-#: actions/apiatomservice.php:115 actions/atompubfavoritefeed.php:142
-#, fuzzy, php-format
+#, php-format
 msgid "%s favorites"
-msgstr "المفضلات"
+msgstr "مفضلات %s"
 
 #. TRANS: Title for Atom feed with a user's memberships. %s is a user nickname.
-#: actions/apiatomservice.php:126
-#, fuzzy, php-format
+#, php-format
 msgid "%s memberships"
-msgstr "أعضاء مجموعة %s"
+msgstr "عضويات %s"
 
 #. TRANS: Client error displayed when users try to block themselves.
-#: actions/apiblockcreate.php:105
 msgid "You cannot block yourself!"
 msgstr "لا يمكنك منع نفسك!"
 
 #. TRANS: Server error displayed when blocking a user has failed.
-#: actions/apiblockcreate.php:127
 msgid "Block user failed."
 msgstr "فشل منع المستخدم."
 
 #. TRANS: Server error displayed when unblocking a user has failed.
-#: actions/apiblockdestroy.php:113
 msgid "Unblock user failed."
 msgstr "فشل إلغاء منع المستخدم."
 
 #. TRANS: Title. %s is a user nickname.
-#: actions/apidirectmessage.php:88
 #, php-format
 msgid "Direct messages from %s"
 msgstr "رسائل مباشرة من %s"
 
 #. TRANS: Subtitle. %s is a user nickname.
-#: actions/apidirectmessage.php:93
 #, php-format
 msgid "All the direct messages sent from %s"
 msgstr "جميع الرسائل المرسلة من %s"
 
 #. TRANS: Title. %s is a user nickname.
-#: actions/apidirectmessage.php:102
 #, php-format
 msgid "Direct messages to %s"
 msgstr "رسالة مباشرة %s"
 
 #. TRANS: Subtitle. %s is a user nickname.
-#: actions/apidirectmessage.php:107
 #, php-format
 msgid "All the direct messages sent to %s"
 msgstr "كل الرسائل المباشرة التي أرسلت إلى %s"
 
 #. TRANS: Client error displayed when no message text was submitted (406).
-#: actions/apidirectmessagenew.php:117
 msgid "No message text!"
 msgstr "لا نص في الرسالة!"
 
@@ -498,7 +369,6 @@ msgstr "لا نص في الرسالة!"
 #. TRANS: %d is the maximum number of characters for a message.
 #. TRANS: Form validation error displayed when message content is too long.
 #. TRANS: %d is the maximum number of characters for a message.
-#: actions/apidirectmessagenew.php:127 actions/newmessage.php:152
 #, fuzzy, php-format
 msgid "That's too long. Maximum message size is %d character."
 msgid_plural "That's too long. Maximum message size is %d characters."
@@ -510,134 +380,111 @@ msgstr[4] "هذه طويلة جدًا. أطول حجم للإشعار %d  حرف
 msgstr[5] "هذه طويلة جدًا. أطول حجم للإشعار %d  حرفًا."
 
 #. TRANS: Client error displayed if a recipient user could not be found (403).
-#: actions/apidirectmessagenew.php:139
 msgid "Recipient user not found."
 msgstr "لم يُعثر على المستخدم المستلم."
 
 #. TRANS: Client error displayed trying to direct message another user who's not a friend (403).
-#: actions/apidirectmessagenew.php:144
 msgid "Cannot send direct messages to users who aren't your friend."
-msgstr ""
+msgstr "لا يمكن أن ترسل رسائل مباشرة إلى مستخدمين ليسوا أصدقاءك."
 
 #. TRANS: Client error displayed trying to direct message self (403).
-#: actions/apidirectmessagenew.php:154
 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.
 #. TRANS: Client error displayed trying to delete a status with an invalid ID.
-#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:108
-#: actions/apistatusesdestroy.php:121
 msgid "No status found with that ID."
 msgstr "لا حالة وُجدت بهذا المُعرّف."
 
 #. TRANS: Client error displayed when trying to mark a notice favourite that already is a favourite.
-#: actions/apifavoritecreate.php:120
 msgid "This status is already a favorite."
 msgstr "هذه الحالة مفضلة بالفعل."
 
 #. TRANS: Client error displayed when marking a notice as favourite fails.
 #. TRANS: Server error displayed when trying to mark a notice as favorite fails in the database.
 #. TRANS: Error message text shown when a favorite could not be set.
-#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:306
 msgid "Could not create favorite."
 msgstr "تعذّر إنشاء مفضلة."
 
 #. TRANS: Client error displayed when trying to remove a favourite that was not a favourite.
-#: actions/apifavoritedestroy.php:122
 msgid "That status is not a favorite."
 msgstr "تلك الحالة ليست مفضلة."
 
 #. TRANS: Client error displayed when removing a favourite has failed.
 #. TRANS: Server error displayed when removing a favorite from the database fails.
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:90
 msgid "Could not delete favorite."
 msgstr "تعذّر حذف المفضلة."
 
 #. TRANS: Client error displayed when trying follow who's profile could not be found.
-#: actions/apifriendshipscreate.php:109
 msgid "Could not follow user: profile not found."
 msgstr "تعذر متابعة المستخدم: الحساب غير موجود."
 
 #. TRANS: Client error displayed when trying to follow a user that's already being followed.
 #. TRANS: %s is the nickname of the user that is already being followed.
-#: actions/apifriendshipscreate.php:120
 #, php-format
 msgid "Could not follow user: %s is already on your list."
 msgstr "تعذر متابعة المستخدم: %s موجود في قائمتك مسبقًا."
 
 #. TRANS: Client error displayed when trying to unfollow a user that cannot be found.
-#: actions/apifriendshipsdestroy.php:109
 msgid "Could not unfollow user: User not found."
 msgstr "تعذر إلغاء الاشتراك: المستخدم غير موجود."
 
 #. TRANS: Client error displayed when trying to unfollow self.
-#: actions/apifriendshipsdestroy.php:121
 msgid "You cannot unfollow yourself."
 msgstr "لا يمكنك عدم متابعة نفسك."
 
 #. TRANS: Client error displayed when supplying invalid parameters to an API call checking if a friendship exists.
-#: actions/apifriendshipsexists.php:88
 msgid "Two valid IDs or nick names must be supplied."
 msgstr ""
 
 #. TRANS: Client error displayed when a source user could not be determined showing friendship.
-#: actions/apifriendshipsshow.php:131
 msgid "Could not determine source user."
 msgstr "تعذّر تحديد المستخدم المصدر."
 
 #. TRANS: Client error displayed when a target user could not be determined showing friendship.
-#: actions/apifriendshipsshow.php:140
 msgid "Could not find target user."
 msgstr "تعذّر إيجاد المستخدم الهدف."
 
 #. TRANS: Client error trying to create a group with a nickname this is already in use.
+#. TRANS: API validation exception thrown when nickname is already used.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:156 actions/apigroupprofileupdate.php:255
-#: actions/editgroup.php:191 actions/newgroup.php:137
-#: actions/profilesettings.php:274 actions/register.php:199
 msgid "Nickname already in use. Try another one."
 msgstr "الاسم المستعار مستخدم بالفعل. جرّب اسمًا آخرًا."
 
 #. TRANS: Client error in form for group creation.
+#. TRANS: API validation exception thrown when nickname does not validate.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:164 actions/apigroupprofileupdate.php:259
-#: actions/editgroup.php:195 actions/newgroup.php:141
-#: actions/profilesettings.php:244 actions/register.php:201
 msgid "Not a valid nickname."
 msgstr "ليس اسمًا مستعارًا صحيحًا."
 
 #. TRANS: Client error in form for group creation.
+#. TRANS: API validation exception thrown when homepage URL does not validate.
 #. TRANS: Validation error shown when providing an invalid homepage URL in the "Edit application" form.
 #. TRANS: Group edit form validation error.
 #. TRANS: Validation error shown when providing an invalid homepage URL in the "New application" form.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:181 actions/apigroupprofileupdate.php:277
-#: actions/editapplication.php:235 actions/editgroup.php:202
-#: actions/newapplication.php:221 actions/newgroup.php:148
-#: actions/profilesettings.php:249 actions/register.php:208
 msgid "Homepage is not a valid URL."
 msgstr "الصفحة الرئيسية ليست عنونًا صالحًا."
 
 #. TRANS: Client error in form for group creation.
+#. TRANS: API validation exception thrown when full name does not validate.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:191 actions/editgroup.php:206
-#: actions/newgroup.php:152 actions/profilesettings.php:253
-#: actions/register.php:211
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "الاسم الكامل طويل جدًا (الحد الأقصى 255 حرفًا)."
 
 #. TRANS: Client error shown when providing too long a description during group creation.
 #. TRANS: %d is the maximum number of allowed characters.
+#. TRANS: API validation exception thrown when description does not validate.
+#. TRANS: %d is the maximum description length and used for plural.
 #. TRANS: Validation error shown when providing too long a description in the "Edit application" form.
 #. TRANS: %d is the maximum number of allowed characters.
 #. TRANS: Group edit form validation error.
@@ -645,9 +492,6 @@ msgstr "الاسم الكامل طويل جدًا (الحد الأقصى 255 ح
 #. TRANS: %d is the maximum number of characters for the description.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed characters.
-#: actions/apigroupcreate.php:201 actions/editapplication.php:202
-#: actions/editgroup.php:211 actions/newapplication.php:182
-#: actions/newgroup.php:157
 #, fuzzy, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."
@@ -659,24 +503,21 @@ msgstr[4] "المنظمة طويلة جدا (الأقصى %d حرفا)."
 msgstr[5] "المنظمة طويلة جدا (الأقصى %d حرفا)."
 
 #. TRANS: Client error shown when providing too long a location during group creation.
+#. TRANS: API validation exception thrown when location does not validate.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:215 actions/editgroup.php:218
-#: actions/newgroup.php:164 actions/profilesettings.php:266
-#: actions/register.php:220
-#, fuzzy
 msgid "Location is too long (maximum 255 characters)."
-msgstr "المنظمة طويلة جدا (الأقصى 255 حرفا)."
+msgstr "المنطقة طويلة جدا (الأقصى 255 حرفا)."
 
 #. TRANS: Client error shown when providing too many aliases during group creation.
 #. TRANS: %d is the maximum number of allowed aliases.
+#. TRANS: API validation exception thrown when aliases do not validate.
+#. TRANS: %d is the maximum number of aliases and used for plural.
 #. TRANS: Group edit form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.
-#: actions/apigroupcreate.php:236 actions/editgroup.php:231
-#: actions/newgroup.php:177
 #, fuzzy, php-format
 msgid "Too many aliases! Maximum %d allowed."
 msgid_plural "Too many aliases! Maximum %d allowed."
@@ -689,25 +530,24 @@ msgstr[5] "كنيات كيرة! العدد الأقصى هو %d."
 
 #. TRANS: Client error shown when providing an invalid alias during group creation.
 #. TRANS: %s is the invalid alias.
-#: actions/apigroupcreate.php:253
+#. TRANS: API validation exception thrown when aliases does not validate.
+#. TRANS: %s is the invalid alias.
 #, php-format
 msgid "Invalid alias: \"%s\"."
 msgstr "كنية غير صالحة: \"%s\"."
 
 #. TRANS: Client error displayed when trying to use an alias during group creation that is already in use.
 #. TRANS: %s is the alias that is already in use.
+#. TRANS: API validation exception thrown when aliases is already used.
+#. TRANS: %s is the already used alias.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error. %s is the already used alias.
-#: actions/apigroupcreate.php:264 actions/apigroupprofileupdate.php:351
-#: actions/editgroup.php:246 actions/newgroup.php:193
 #, fuzzy, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "هذا الاسم مستخدم بالفعل. جرّب اسمًا آخر."
 
 #. TRANS: Client error displayed when trying to use an alias during group creation that is the same as the group's nickname.
 #. TRANS: Group edit form validation error.
-#: actions/apigroupcreate.php:278 actions/apigroupprofileupdate.php:359
-#: actions/editgroup.php:253
 msgid "Alias can't be the same as nickname."
 msgstr ""
 
@@ -715,19 +555,15 @@ msgstr ""
 #. TRANS: Client error displayed when trying to join a group that does not exist.
 #. TRANS: Client error displayed when trying to leave a group that does not exist.
 #. TRANS: Client error displayed trying to show group membership on a non-existing group.
+#. TRANS: Client error displayed when not providing a group or an invalid group.
 #. TRANS: Client error displayed when trying to show a group that could not be found.
 #. TRANS: Client error displayed requesting most recent notices to a group for a non-existing group.
-#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
-#: actions/apigroupleave.php:104 actions/apigroupmembership.php:71
-#: actions/apigroupprofileupdate.php:113 actions/apigroupshow.php:81
-#: actions/apitimelinegroup.php:89
 msgid "Group not found."
 msgstr "المجموعة غير موجودة."
 
 #. TRANS: Server error displayed when trying to join a group the user is already a member of.
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:345
 #, fuzzy
 msgid "You are already a member of that group."
 msgstr "أنت بالفعل عضو في هذه المجموعة"
@@ -735,7 +571,6 @@ msgstr "أنت بالفعل عضو في هذه المجموعة"
 #. TRANS: Server error displayed when trying to join a group the user is blocked from joining.
 #. 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.
-#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:350
 #, fuzzy
 msgid "You have been blocked from that group by the admin."
 msgstr "لم تمنع هذا المستخدم."
@@ -744,13 +579,11 @@ msgstr "لم تمنع هذا المستخدم."
 #. TRANS: %1$s is the joining user's nickname, $2$s is the group nickname for which the join failed.
 #. TRANS: Message given having failed to add a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:136 actions/joingroup.php:139 lib/command.php:362
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "لم يمكن ضم المستخدم %1$s إلى المجموعة %2$s."
 
 #. TRANS: Server error displayed when trying to leave a group the user is not a member of.
-#: actions/apigroupleave.php:115
 msgid "You are not a member of this group."
 msgstr "لست عضوًا في هذه المجموعة"
 
@@ -758,118 +591,79 @@ msgstr "لست عضوًا في هذه المجموعة"
 #. TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
 #. TRANS: Message given having failed to remove a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupleave.php:127 actions/leavegroup.php:133
-#: lib/command.php:410
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
 msgstr "لم يمكن إزالة المستخدم %1$s من المجموعة %2$s."
 
 #. TRANS: Used as title in check for group membership. %s is a user name.
-#: actions/apigrouplist.php:94
 #, php-format
 msgid "%s's groups"
 msgstr "مجموعات %s"
 
 #. TRANS: Used as subtitle in check for group membership. %1$s is a user name, %2$s is the site name.
-#: actions/apigrouplist.php:104
 #, php-format
 msgid "%1$s groups %2$s is a member of."
 msgstr "مجموعات %1$s التي %2$s عضو فيها."
 
 #. TRANS: Message is used as a title when listing the lastest 20 groups. %s is a site name.
 #. TRANS: Message is used as a page title. %s is a nick name.
-#: actions/apigrouplistall.php:88 actions/usergroups.php:63
 #, php-format
 msgid "%s groups"
 msgstr "مجموعات %s"
 
 #. TRANS: Message is used as a subtitle when listing the lastest 20 groups. %s is a site name.
-#: actions/apigrouplistall.php:93
 #, php-format
 msgid "groups on %s"
 msgstr "مجموعات %s"
 
+#. TRANS: Client error displayed when trying to edit a group without being an admin.
 #. TRANS: Client error displayed trying to edit a group while not being a group admin.
 #. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
 #. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
-#: actions/apigroupprofileupdate.php:118 actions/editgroup.php:110
-#: actions/editgroup.php:176 actions/groupdesignsettings.php:109
-#: actions/grouplogo.php:111
 msgid "You must be an admin to edit the group."
 msgstr "يجب أن تكون إداريا لتعدل المجموعة."
 
+#. TRANS: Server error displayed when group update fails.
 #. TRANS: Server error displayed when editing a group fails.
-#: actions/apigroupprofileupdate.php:171 actions/editgroup.php:274
 msgid "Could not update group."
 msgstr "تعذر تحديث المجموعة."
 
+#. TRANS: Server error displayed when adding group aliases fails.
 #. TRANS: Server error displayed when group aliases could not be added.
 #. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/apigroupprofileupdate.php:194 actions/editgroup.php:281
-#: classes/User_group.php:540
 msgid "Could not create aliases."
 msgstr "تعذّر إنشاء الكنى."
 
+#. TRANS: API validation exception thrown when nickname does not validate.
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: actions/apigroupprofileupdate.php:249 lib/nickname.php:165
 #, fuzzy
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr "1-64 حرفًا إنجليزيًا أو رقمًا بدون نقاط أو مسافات"
 
-#: actions/apigroupprofileupdate.php:286
-#, fuzzy
-msgid "Full name is too long (max 255 chars)."
-msgstr "الاسم الكامل طويل جدًا (الحد الأقصى 255 حرفًا)."
-
-#: actions/apigroupprofileupdate.php:296
-#, fuzzy, php-format
-msgid "description is too long (max %d chars)."
-msgstr "المنظمة طويلة جدا (الأقصى %d حرفا)."
-
-#: actions/apigroupprofileupdate.php:307
-#, fuzzy
-msgid "Location is too long (max 255 chars)."
-msgstr "المنظمة طويلة جدا (الأقصى 255 حرفا)."
-
-#: actions/apigroupprofileupdate.php:326
-#, fuzzy, php-format
-msgid "Too many aliases! Maximum %d."
-msgstr "كنيات كيرة! العدد الأقصى هو %d."
-
-#. TRANS: Group edit form validation error.
+#. TRANS: API validation exception thrown when alias is the same as nickname.
 #. TRANS: Group create form validation error.
-#. TRANS: %s is the invalid alias.
-#: actions/apigroupprofileupdate.php:342 actions/editgroup.php:241
-#: actions/newgroup.php:188
-#, php-format
-msgid "Invalid alias: \"%s\""
-msgstr "كنية غير صالحة: \"%s\""
+msgid "Alias cannot be the same as nickname."
+msgstr ""
 
 #. TRANS: Client error displayed when uploading a media file has failed.
-#: actions/apimediaupload.php:101
-#, fuzzy
 msgid "Upload failed."
-msgstr "ارفع ملفًا"
+msgstr "فشل الرفع."
 
 #. TRANS: Client error given from the OAuth API when the request token or verifier is invalid.
-#: actions/apioauthaccesstoken.php:102
 #, fuzzy
 msgid "Invalid request token or verifier."
 msgstr "توكن دخول غير صحيح محدد."
 
 #. TRANS: Client error given when no oauth_token was passed to the OAuth API.
-#: actions/apioauthauthorize.php:107
 msgid "No oauth_token parameter provided."
 msgstr ""
 
 #. TRANS: Client error given when an invalid request token was passed to the OAuth API.
-#: actions/apioauthauthorize.php:115 actions/apioauthauthorize.php:129
 #, fuzzy
 msgid "Invalid request token."
 msgstr "حجم غير صالح."
 
 #. TRANS: Client error given when an invalid request token was passed to the OAuth API.
-#: actions/apioauthauthorize.php:121
 #, fuzzy
 msgid "Request token already authorized."
 msgstr "لا تملك تصريحًا."
@@ -880,31 +674,14 @@ msgstr "لا تملك تصريحًا."
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
 #. TRANS: Client error displayed when the session token is not okay.
-#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:75
-#: actions/emailsettings.php:292 actions/favor.php:75 actions/geocode.php:55
-#: actions/groupblock.php:65 actions/grouplogo.php:321
-#: actions/groupunblock.php:65 actions/imsettings.php:241
-#: actions/invite.php:60 actions/makeadmin.php:66 actions/newmessage.php:135
-#: actions/newnotice.php:105 actions/nudge.php:80
-#: actions/oauthappssettings.php:162 actions/oauthconnectionssettings.php:135
-#: actions/passwordsettings.php:137 actions/pluginenable.php:87
-#: actions/profilesettings.php:218 actions/recoverpassword.php:383
-#: actions/register.php:157 actions/remotesubscribe.php:76
-#: actions/repeat.php:82 actions/smssettings.php:249 actions/subedit.php:40
-#: actions/subscribe.php:87 actions/tagother.php:145
-#: actions/unsubscribe.php:69 actions/urlsettings.php:171
-#: actions/userauthorization.php:53 lib/designsettings.php:122
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 
 #. TRANS: Form validation error given when an invalid username and/or password was passed to the OAuth API.
-#: actions/apioauthauthorize.php:168
 msgid "Invalid nickname / password!"
 msgstr "اسم/كلمة سر غير صحيحة!"
 
 #. TRANS: Server error displayed when a database action fails.
-#: actions/apioauthauthorize.php:217
 #, fuzzy
 msgid "Database error inserting oauth_token_association."
 msgstr "خطأ في قاعدة البيانات أثناء حذف مستخدم تطبيق OAuth."
@@ -921,28 +698,19 @@ msgstr "خطأ في قاعدة البيانات أثناء حذف مستخدم 
 #. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
 #. TRANS: Message given submitting a form with an unknown action in SMS settings.
 #. TRANS: Unknown form validation error in design settings form.
-#: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
-#: actions/designadminpanel.php:100 actions/editapplication.php:144
-#: actions/emailsettings.php:311 actions/grouplogo.php:332
-#: actions/imsettings.php:256 actions/newapplication.php:124
-#: actions/oauthconnectionssettings.php:144 actions/recoverpassword.php:46
-#: actions/smssettings.php:270 lib/designsettings.php:133
 msgid "Unexpected form submission."
 msgstr ""
 
 #. TRANS: Title for a page where a user can confirm/deny account access by an external application.
-#: actions/apioauthauthorize.php:387
 msgid "An application would like to connect to your account"
 msgstr ""
 
 #. TRANS: Fieldset legend.
-#: actions/apioauthauthorize.php:404
 msgid "Allow or deny access"
 msgstr "اسمح أو امنع الوصول"
 
 #. TRANS: User notification of external application requesting account access.
 #. TRANS: %3$s is the access type requested (read-write or read-only), %4$s is the StatusNet sitename.
-#: actions/apioauthauthorize.php:425
 #, php-format
 msgid ""
 "An application would like the ability to <strong>%3$s</strong> your %4$s "
@@ -953,7 +721,6 @@ msgstr ""
 #. TRANS: User notification of external application requesting account access.
 #. TRANS: %1$s is the application name requesting access, %2$s is the organisation behind the application,
 #. TRANS: %3$s is the access type requested, %4$s is the StatusNet sitename.
-#: actions/apioauthauthorize.php:433
 #, php-format
 msgid ""
 "The application <strong>%1$s</strong> by <strong>%2$s</strong> would like "
@@ -962,22 +729,18 @@ msgid ""
 msgstr ""
 
 #. TRANS: Fieldset legend.
-#: actions/apioauthauthorize.php:455
 msgctxt "LEGEND"
 msgid "Account"
 msgstr "الحساب"
 
 #. TRANS: Field label on OAuth API authorisation form.
+#. TRANS: Field label on login page.
 #. TRANS: Field label in form for profile settings.
-#: actions/apioauthauthorize.php:459 actions/login.php:225
-#: actions/profilesettings.php:107 actions/register.php:411
-#: actions/userauthorization.php:145 lib/groupeditform.php:145
 msgid "Nickname"
 msgstr "الاسم المستعار"
 
 #. TRANS: Field label on OAuth API authorisation form.
-#: actions/apioauthauthorize.php:463 actions/login.php:228
-#: actions/register.php:415 lib/settingsnav.php:87
+#. TRANS: Field label on login page.
 msgid "Password"
 msgstr "كلمة السر"
 
@@ -987,45 +750,34 @@ msgstr "كلمة السر"
 #. TRANS: Button label to cancel an IM address confirmation procedure.
 #. TRANS: Button label to cancel a SMS address confirmation procedure.
 #. TRANS: Button label in the "Edit application" form.
-#: actions/apioauthauthorize.php:478 actions/emailsettings.php:125
-#: actions/imsettings.php:136 actions/smssettings.php:132
-#: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Cancel"
 msgstr "ألغِ"
 
 #. TRANS: Button text that when clicked will allow access to an account by an external application.
-#: actions/apioauthauthorize.php:485
 msgctxt "BUTTON"
 msgid "Allow"
 msgstr "اسمح"
 
 #. TRANS: Form instructions.
-#: actions/apioauthauthorize.php:502
 msgid "Authorize access to your account information."
-msgstr ""
+msgstr "صرّح بالوصول إلى معلومات حسابك."
 
 #. TRANS: Header for user notification after revoking OAuth access to an application.
-#: actions/apioauthauthorize.php:594
-#, fuzzy
 msgid "Authorization canceled."
-msgstr "أُلغي تأكيد المراسلة الفورية."
+msgstr "ألغي التصريح."
 
 #. TRANS: User notification after revoking OAuth access to an application.
 #. TRANS: %s is an OAuth token.
-#: actions/apioauthauthorize.php:598
 #, php-format
 msgid "The request token %s has been revoked."
 msgstr ""
 
 #. TRANS: Title of the page notifying the user that an anonymous client application was successfully authorized to access the user's account with OAuth.
-#: actions/apioauthauthorize.php:621
-#, fuzzy
 msgid "You have successfully authorized the application"
-msgstr "لا تملك تصريحًا."
+msgstr "صرّحت بنجاح للتطبيق"
 
 #. TRANS: Message notifying the user that an anonymous client application was successfully authorized to access the user's account with OAuth.
-#: actions/apioauthauthorize.php:625
 msgid ""
 "Please return to the application and enter the following security code to "
 "complete the process."
@@ -1033,14 +785,12 @@ msgstr ""
 
 #. TRANS: Title of the page notifying the user that the client application was successfully authorized to access the user's account with OAuth.
 #. TRANS: %s is the authorised application name.
-#: actions/apioauthauthorize.php:632
-#, fuzzy, php-format
+#, php-format
 msgid "You have successfully authorized %s"
-msgstr "لا تملك تصريحًا."
+msgstr "صرّحت بنجاح ل%s"
 
 #. TRANS: Message notifying the user that the client application was successfully authorized to access the user's account with OAuth.
 #. TRANS: %s is the authorised application name.
-#: actions/apioauthauthorize.php:639
 #, php-format
 msgid ""
 "Please return to %s and enter the following security code to complete the "
@@ -1049,36 +799,28 @@ msgstr ""
 
 #. TRANS: Client error displayed trying to delete a status not using POST or DELETE.
 #. TRANS: POST and DELETE should not be translated.
-#: actions/apistatusesdestroy.php:111
 #, fuzzy
 msgid "This method requires a POST or DELETE."
 msgstr "تتطلب هذه الطريقة POST."
 
 #. TRANS: Client error displayed trying to delete a status of another user.
-#: actions/apistatusesdestroy.php:136
-#, fuzzy
 msgid "You may not delete another user's status."
-msgstr "لا يمكنك حذف المستخدمين."
+msgstr "لا يسمح لك بحذف حالة مستخدم آخر."
 
 #. TRANS: Client error displayed trying to repeat a non-existing notice through the API.
 #. TRANS: Client error displayed trying to display redents of a non-exiting notice.
 #. TRANS: Client exception thrown when referencing a non-existing notice.
 #. TRANS: Error message displayed trying to delete a non-existing notice.
-#: actions/apistatusesretweet.php:74 actions/apistatusesretweets.php:70
-#: actions/atompubshowfavorite.php:82 actions/deletenotice.php:61
-#: actions/shownotice.php:92
 msgid "No such notice."
 msgstr "لا إشعار كهذا."
 
 #. TRANS: Client error displayed trying to repeat an own notice through the API.
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:549
 msgid "Cannot repeat your own notice."
 msgstr "لا يمكنك تكرار ملحوظتك الخاصة."
 
 #. TRANS: Client error displayed trying to re-repeat a notice through the API.
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:92 lib/command.php:555
 msgid "Already repeated that notice."
 msgstr "كرر بالفعل هذه الملاحظة."
 
@@ -1088,59 +830,44 @@ msgstr "كرر بالفعل هذه الملاحظة."
 #. TRANS: Client exception thrown when using an unsupported HTTP method.
 #. TRANS: Client error shown when using a non-supported HTTP method.
 #. TRANS: Client exception thrown when using an unsupported HTTP method.
-#: actions/apistatusesshow.php:118 actions/atompubfavoritefeed.php:103
-#: actions/atompubmembershipfeed.php:105 actions/atompubshowfavorite.php:117
-#: actions/atompubshowmembership.php:116
-#: actions/atompubshowsubscription.php:122
-#: actions/atompubsubscriptionfeed.php:109
 #, fuzzy
 msgid "HTTP method not supported."
 msgstr "لم يتم العثور على وسيلة API."
 
 #. TRANS: Exception thrown requesting an unsupported notice output format.
 #. TRANS: %s is the requested output format.
-#: actions/apistatusesshow.php:144
-#, fuzzy, php-format
+#, php-format
 msgid "Unsupported format: %s."
-msgstr "نسق غير مدعوم."
+msgstr "نسق غير مدعوم: %s."
 
 #. TRANS: Client error displayed requesting a deleted status.
-#: actions/apistatusesshow.php:155
 msgid "Status deleted."
 msgstr "حُذِفت الحالة."
 
 #. TRANS: Client error displayed requesting a status with an invalid ID.
-#: actions/apistatusesshow.php:162
 msgid "No status with that ID found."
 msgstr "لا حالة وُجدت بهذه الهوية."
 
 #. TRANS: Client error displayed when trying to delete a notice not using the Atom format.
-#: actions/apistatusesshow.php:227
 msgid "Can only delete using the Atom format."
 msgstr ""
 
 #. TRANS: Client error displayed when a user has no rights to delete notices of other users.
 #. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
-#: actions/apistatusesshow.php:235 actions/deletenotice.php:78
-#, fuzzy
 msgid "Cannot delete this notice."
-msgstr "تعذّر حذف هذا الإشعار."
+msgstr "تعذر حذف هذا الإشعار."
 
 #. TRANS: Confirmation of notice deletion in API. %d is the ID (number) of the deleted notice.
-#: actions/apistatusesshow.php:249
-#, fuzzy, php-format
+#, php-format
 msgid "Deleted notice %d"
-msgstr "احذف الإشعار"
+msgstr "حُذِف الإشعار %d"
 
 #. TRANS: Client error displayed when the parameter "status" is missing.
-#: actions/apistatusesupdate.php:221
 msgid "Client must provide a 'status' parameter with a value."
 msgstr ""
 
 #. TRANS: Client error displayed when the parameter "status" is missing.
 #. TRANS: %d is the maximum number of character for a notice.
-#: actions/apistatusesupdate.php:244 actions/newnotice.php:161
-#: lib/mailhandler.php:60
 #, fuzzy, php-format
 msgid "That's too long. Maximum notice size is %d character."
 msgid_plural "That's too long. Maximum notice size is %d characters."
@@ -1152,14 +879,11 @@ msgstr[4] "هذه طويلة جدًا. أطول حجم للإشعار %d  حرف
 msgstr[5] "هذه طويلة جدًا. أطول حجم للإشعار %d  حرفًا."
 
 #. TRANS: Client error displayed when replying to a non-existing notice.
-#: actions/apistatusesupdate.php:284
-#, fuzzy
 msgid "Parent notice not found."
-msgstr "لم يتم العثور على وسيلة API."
+msgstr "تعذر إيجاد الإشعار الوالد."
 
 #. TRANS: Client error displayed exceeding the maximum notice length.
 #. TRANS: %d is the maximum lenth for a notice.
-#: actions/apistatusesupdate.php:308 actions/newnotice.php:184
 #, php-format
 msgid "Maximum notice size is %d character, including attachment URL."
 msgid_plural "Maximum notice size is %d characters, including attachment URL."
@@ -1172,78 +896,66 @@ msgstr[5] ""
 
 #. TRANS: Client error displayed when requesting profiles of followers in an unsupported format.
 #. TRANS: Client error displayed when requesting IDs of followers in an unsupported format.
-#: actions/apisubscriptions.php:228 actions/apisubscriptions.php:258
 msgid "Unsupported format."
 msgstr "نسق غير مدعوم."
 
 #. TRANS: Title for timeline of most recent favourite notices by a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname.
-#: actions/apitimelinefavorites.php:108
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s / Favorites from %2$s"
-msgstr "%1$s انضم للمجموعة %2$s"
+msgstr "%1$s / مفضلات %2$s"
 
 #. TRANS: Subtitle for timeline of most recent favourite notices by a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user's full name,
 #. TRANS: %3$s is a user nickname.
-#: actions/apitimelinefavorites.php:120
 #, fuzzy, php-format
 msgid "%1$s updates favorited by %2$s / %3$s."
 msgstr "الإشعارات التي فضلها %1$s في %2$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.
-#: actions/apitimelinementions.php:115
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s / Updates mentioning %2$s"
-msgstr "حالة %1$s في يوم %2$s"
+msgstr "%1$s / التحديثات التي تذكر %2$s"
 
 #. TRANS: Subtitle for timeline of most recent mentions of a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname,
 #. TRANS: %3$s is a user's full name.
-#: actions/apitimelinementions.php:131
 #, php-format
 msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr ""
 
 #. TRANS: Title for site timeline. %s is the StatusNet sitename.
 #. TRANS: Public RSS feed title. %s is the StatusNet site name.
-#: actions/apitimelinepublic.php:193 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "مسار %s الزمني العام"
 
 #. TRANS: Subtitle for site timeline. %s is the StatusNet sitename.
-#: actions/apitimelinepublic.php:199
 #, php-format
 msgid "%s updates from everyone!"
 msgstr ""
 
 #. TRANS: Server error displayed calling unimplemented API method for 'retweeted by me'.
-#: actions/apitimelineretweetedbyme.php:71
 #, fuzzy
 msgid "Unimplemented."
 msgstr "الأمر لم يُجهزّ بعد."
 
 #. TRANS: Title for Atom feed "repeated to me". %s is the user nickname.
-#: actions/apitimelineretweetedtome.php:96
 #, php-format
 msgid "Repeated to %s"
 msgstr "كرر إلى %s"
 
-#: actions/apitimelineretweetedtome.php:98
 #, fuzzy, php-format
 msgid "%1$s notices that were to repeated to %2$s / %3$s."
 msgstr "الإشعارات التي فضلها %1$s في %2$s!"
 
 #. TRANS: Title of list of repeated notices of the logged in user.
 #. TRANS: %s is the nickname of the logged in user.
-#: actions/apitimelineretweetsofme.php:98
 #, php-format
 msgid "Repeats of %s"
 msgstr "تكرارات %s"
 
-#: actions/apitimelineretweetsofme.php:104
 #, fuzzy, php-format
 msgid "%1$s notices that %2$s / %3$s has repeated."
 msgstr "لقد أضاف %s (@%s) إشعارك إلى مفضلاته"
@@ -1252,182 +964,149 @@ msgstr "لقد أضاف %s (@%s) إشعارك إلى مفضلاته"
 #. TRANS: %s is the tag.
 #. TRANS: Title for first page of notices with tags.
 #. TRANS: %s is the tag.
-#: actions/apitimelinetag.php:101 actions/tag.php:69
 #, php-format
 msgid "Notices tagged with %s"
 msgstr "الإشعارات الموسومة ب%s"
 
 #. TRANS: Subtitle for timeline with lastest notices with a given tag.
 #. TRANS: %1$s is the tag, $2$s is the StatusNet sitename.
-#: actions/apitimelinetag.php:105 actions/tagrss.php:65
 #, fuzzy, php-format
 msgid "Updates tagged with %1$s on %2$s!"
 msgstr "الإشعارات التي فضلها %1$s في %2$s!"
 
 #. TRANS: Client error displayed trying to add a notice to another user's timeline.
-#: actions/apitimelineuser.php:308
 #, fuzzy
 msgid "Only the user can add to their own timeline."
 msgstr "يستطيع المستخدمون الوالجون وحدهم تكرار الإشعارات."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:315
 msgid "Only accept AtomPub for Atom feeds."
 msgstr ""
 
 #. TRANS: Client error displayed attempting to post an empty API notice.
-#: actions/apitimelineuser.php:322
 msgid "Atom post must not be empty."
 msgstr ""
 
 #. TRANS: Client error displayed attempting to post an API that is not well-formed XML.
-#: actions/apitimelineuser.php:328
 msgid "Atom post must be well-formed XML."
 msgstr ""
 
 #. TRANS: Client error displayed when not using an Atom entry.
-#: actions/apitimelineuser.php:334 actions/atompubfavoritefeed.php:228
-#: actions/atompubmembershipfeed.php:230
-#: actions/atompubsubscriptionfeed.php:236
 msgid "Atom post must be an Atom entry."
 msgstr ""
 
 #. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
-#: actions/apitimelineuser.php:345
 msgid "Can only handle POST activities."
 msgstr ""
 
 #. TRANS: Client error displayed when using an unsupported activity object type.
 #. TRANS: %s is the unsupported activity object type.
-#: actions/apitimelineuser.php:356
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
 #. TRANS: %d is the notice ID (number).
-#: actions/apitimelineuser.php:390
 #, fuzzy, php-format
 msgid "No content for notice %d."
 msgstr "ابحث عن محتويات في الإشعارات"
 
 #. TRANS: Client error displayed when using another format than AtomPub.
 #. TRANS: %s is the notice URI.
-#: actions/apitimelineuser.php:419
 #, fuzzy, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "لا ملف بهذه الهوية."
 
 #. TRANS: Server error for unfinished API method showTrends.
-#: actions/apitrends.php:85
 #, fuzzy
 msgid "API method under construction."
 msgstr "لم يتم العثور على وسيلة API."
 
 #. TRANS: Client error displayed when requesting user information for a non-existing user.
-#: actions/apiuserprofileimage.php:80 actions/apiusershow.php:94
 msgid "User not found."
 msgstr "لم يُعثرعلى المستخدم."
 
 #. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
 #. TRANS: Client exception.
 #. TRANS: Client error displayed trying to subscribe to a non-existing profile.
-#: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
-#: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
-#: actions/subscribe.php:110
 msgid "No such profile."
 msgstr "لا ملف كهذا."
 
 #. TRANS: Subtitle for Atom favorites feed.
 #. TRANS: %1$s is a user nickname, %2$s is the StatusNet sitename.
-#: actions/atompubfavoritefeed.php:147
 #, fuzzy, php-format
 msgid "Notices %1$s has favorited on %2$s"
 msgstr "الإشعارات التي فضلها %1$s في %2$s!"
 
 #. TRANS: Client exception thrown when trying to set a favorite for another user.
 #. TRANS: Client exception thrown when trying to subscribe another user.
-#: actions/atompubfavoritefeed.php:217 actions/atompubsubscriptionfeed.php:225
 #, fuzzy
 msgid "Cannot add someone else's subscription."
 msgstr "تعذّر إدراج اشتراك جديد."
 
 #. TRANS: Client exception thrown when trying use an incorrect activity verb for the Atom pub method.
-#: actions/atompubfavoritefeed.php:240
 #, fuzzy
 msgid "Can only handle favorite activities."
 msgstr "ابحث عن محتويات في الإشعارات"
 
 #. TRANS: Client exception thrown when trying favorite an object that is not a notice.
-#: actions/atompubfavoritefeed.php:250 actions/atompubmembershipfeed.php:250
 #, fuzzy
 msgid "Can only fave notices."
 msgstr "ابحث عن محتويات في الإشعارات"
 
 #. TRANS: Client exception thrown when trying favorite a notice without content.
-#: actions/atompubfavoritefeed.php:259
 #, fuzzy
 msgid "Unknown note."
 msgstr "غير معروفة"
 
 #. TRANS: Client exception thrown when trying favorite an already favorited notice.
-#: actions/atompubfavoritefeed.php:267
 #, fuzzy
 msgid "Already a favorite."
 msgstr "أضف إلى المفضلات"
 
 #. TRANS: Title for group membership feed.
 #. TRANS: %s is a username.
-#: actions/atompubmembershipfeed.php:144
 #, fuzzy, php-format
 msgid "%s group memberships"
 msgstr "أعضاء مجموعة %s"
 
 #. TRANS: Subtitle for group membership feed.
 #. TRANS: %1$s is a username, %2$s is the StatusNet sitename.
-#: actions/atompubmembershipfeed.php:149
 #, fuzzy, php-format
 msgid "Groups %1$s is a member of on %2$s"
 msgstr "المجموعات التي %s عضو فيها"
 
 #. TRANS: Client exception thrown when trying subscribe someone else to a group.
-#: actions/atompubmembershipfeed.php:219
 #, fuzzy
 msgid "Cannot add someone else's membership."
 msgstr "تعذّر إدراج اشتراك جديد."
 
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#: actions/atompubmembershipfeed.php:242
 #, fuzzy
 msgid "Can only handle join activities."
 msgstr "ابحث عن محتويات في الإشعارات"
 
 #. TRANS: Client exception thrown when trying to subscribe to a non-existing group.
-#: actions/atompubmembershipfeed.php:259
 #, fuzzy
 msgid "Unknown group."
 msgstr "غير معروفة"
 
 #. TRANS: Client exception thrown when trying to subscribe to an already subscribed group.
-#: actions/atompubmembershipfeed.php:267
 #, fuzzy
 msgid "Already a member."
 msgstr "جميع الأعضاء"
 
 #. TRANS: Client exception thrown when trying to subscribe to group while blocked from that group.
-#: actions/atompubmembershipfeed.php:275
 msgid "Blocked by admin."
 msgstr "أنت ممنوع من قِبل المدير."
 
 #. TRANS: Client exception thrown when referencing a non-existing favorite.
-#: actions/atompubshowfavorite.php:90
 #, fuzzy
 msgid "No such favorite."
 msgstr "لا ملف كهذا."
 
 #. TRANS: Client exception thrown when trying to remove a favorite notice of another user.
-#: actions/atompubshowfavorite.php:151
 #, fuzzy
 msgid "Cannot delete someone else's favorite."
 msgstr "تعذّر حذف المفضلة."
@@ -1454,93 +1133,67 @@ msgstr "تعذّر حذف المفضلة."
 #. TRANS: Client error displayed when trying to join a non-existing group.
 #. TRANS: Client error displayed when trying to leave a non-local group.
 #. TRANS: Client error displayed when trying to leave a non-existing group.
+#. TRANS: Client error displayed when providing an invalid group ID on the Make Admin page.
 #. 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.
 #. TRANS: Command exception text shown when a group is requested that does not exist.
 #. TRANS: Error text shown when trying to leave a group that does not exist.
-#: actions/atompubshowmembership.php:81 actions/blockedfromgroup.php:81
-#: actions/blockedfromgroup.php:89 actions/deletegroup.php:87
-#: actions/deletegroup.php:100 actions/editgroup.php:102
-#: actions/foafgroup.php:46 actions/foafgroup.php:65 actions/foafgroup.php:73
-#: actions/groupblock.php:89 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:101 actions/grouplogo.php:103
-#: actions/groupmembers.php:84 actions/groupmembers.php:92
-#: actions/grouprss.php:97 actions/grouprss.php:105
-#: actions/groupunblock.php:89 actions/joingroup.php:82
-#: actions/joingroup.php:95 actions/leavegroup.php:82
-#: actions/leavegroup.php:95 actions/makeadmin.php:86
-#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:392
 msgid "No such group."
 msgstr "لا مجموعة كهذه."
 
 #. TRANS: Client exception thrown when trying to show membership of a non-subscribed group
-#: actions/atompubshowmembership.php:91
 #, fuzzy
 msgid "Not a member."
 msgstr "جميع الأعضاء"
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
-#: actions/atompubshowmembership.php:150
 #, fuzzy
 msgid "Cannot delete someone else's membership."
 msgstr "تعذّر حفظ الاشتراك."
 
 #. TRANS: Client exception thrown when trying to display a subscription for a non-existing profile ID.
 #. TRANS: %d is the non-existing profile ID number.
-#: actions/atompubshowsubscription.php:72
-#: actions/atompubshowsubscription.php:83
-#: actions/atompubsubscriptionfeed.php:74
 #, fuzzy, php-format
 msgid "No such profile id: %d."
 msgstr "لا ملف كهذا."
 
 #. 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.
-#: actions/atompubshowsubscription.php:94
 #, fuzzy, php-format
 msgid "Profile %1$d not subscribed to profile %2$d."
 msgstr "لست مُشتركًا بأي أحد."
 
 #. TRANS: Client exception thrown when trying to delete a subscription of another user.
-#: actions/atompubshowsubscription.php:157
-#, fuzzy
 msgid "Cannot delete someone else's subscription."
-msgstr "تعذّر حفظ الاشتراك."
+msgstr "لا يمكن أن تحذف اشتراك شخص آخر."
 
 #. TRANS: Subtitle for Atom subscription feed.
 #. TRANS: %1$s is a user nickname, %s$s is the StatusNet sitename.
-#: actions/atompubsubscriptionfeed.php:153
 #, fuzzy, php-format
 msgid "People %1$s has subscribed to on %2$s"
 msgstr "الأشخاص المشتركون ب%s"
 
 #. TRANS: Client error displayed when not using the follow verb.
-#: actions/atompubsubscriptionfeed.php:248
 msgid "Can only handle Follow activities."
 msgstr ""
 
 #. TRANS: Client exception thrown when subscribing to an object that is not a person.
-#: actions/atompubsubscriptionfeed.php:256
 msgid "Can only follow people."
 msgstr ""
 
 #. TRANS: Client exception thrown when subscribing to a non-existing profile.
 #. TRANS: %s is the unknown profile ID.
-#: actions/atompubsubscriptionfeed.php:267
 #, fuzzy, php-format
 msgid "Unknown profile %s."
 msgstr "نوع ملف غير معروف"
 
 #. TRANS: Client error displayed trying to subscribe to an already subscribed profile.
 #. TRANS: %s is the profile the user already has a subscription on.
-#: actions/atompubsubscriptionfeed.php:275
 #, fuzzy, php-format
 msgid "Already subscribed to %s."
 msgstr "مُشترك أصلا!"
 
 #. TRANS: Client error displayed trying to get a non-existing attachment.
-#: actions/attachment.php:73
 msgid "No such attachment."
 msgstr "لا مرفق كهذا."
 
@@ -1552,31 +1205,23 @@ msgstr "لا مرفق كهذا."
 #. TRANS: Client error displayed when trying to view group members without providing a group nickname.
 #. TRANS: Client error displayed when requesting a group RSS feed without providing a group nickname.
 #. TRANS: Client error displayed if no nickname argument was given requesting a group page.
-#: actions/avatarbynickname.php:60 actions/blockedfromgroup.php:73
-#: actions/editgroup.php:85 actions/groupdesignsettings.php:84
-#: actions/grouplogo.php:86 actions/groupmembers.php:76
-#: actions/grouprss.php:89 actions/showgroup.php:116
 msgid "No nickname."
 msgstr "لا اسم مستعار."
 
 #. TRANS: Client error displayed trying to get an avatar without providing an avatar size.
-#: actions/avatarbynickname.php:66
 msgid "No size."
 msgstr "لا حجم."
 
 #. TRANS: Client error displayed trying to get an avatar providing an invalid avatar size.
-#: actions/avatarbynickname.php:72
 msgid "Invalid size."
 msgstr "حجم غير صالح."
 
 #. TRANS: Title for avatar upload page.
-#: actions/avatarsettings.php:66 lib/settingsnav.php:82
 msgid "Avatar"
 msgstr "أفتار"
 
 #. TRANS: Instruction for avatar upload page.
 #. TRANS: %s is the maximum file size, for example "500b", "10kB" or "2MB".
-#: actions/avatarsettings.php:78
 #, php-format
 msgid "You can upload your personal avatar. The maximum file size is %s."
 msgstr "بإمكانك رفع أفتارك الشخصي. أقصى حجم للملف هو %s."
@@ -1585,17 +1230,12 @@ msgstr "بإمكانك رفع أفتارك الشخصي. أقصى حجم للم
 #. TRANS: Server error displayed coming across a request from a user without a profile.
 #. TRANS: Server error displayed when trying to authorise a remote subscription request
 #. TRANS: while the user has no profile.
-#: actions/avatarsettings.php:108 actions/avatarsettings.php:192
-#: actions/grouplogo.php:184 actions/remotesubscribe.php:190
-#: actions/userauthorization.php:75 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr "المستخدم بدون ملف مطابق."
 
 #. TRANS: Avatar upload page form legend.
 #. TRANS: Avatar upload page crop form legend.
 #. TRANS: Legend for group logo settings fieldset.
-#: actions/avatarsettings.php:122 actions/avatarsettings.php:205
-#: actions/grouplogo.php:261
 msgid "Avatar settings"
 msgstr "إعدادات الأفتار"
 
@@ -1603,8 +1243,6 @@ msgstr "إعدادات الأفتار"
 #. TRANS: Header on avatar upload crop form for thumbnail of originally uploaded avatar (h2).
 #. TRANS: Uploaded original file in group logo form.
 #. TRANS: Header for originally uploaded file before a crop on the group logo page.
-#: actions/avatarsettings.php:131 actions/avatarsettings.php:214
-#: actions/grouplogo.php:207 actions/grouplogo.php:270
 msgid "Original"
 msgstr "الأصل"
 
@@ -1612,85 +1250,67 @@ msgstr "الأصل"
 #. TRANS: Header on avatar upload crop form for thumbnail of to be used rendition of uploaded avatar (h2).
 #. TRANS: Header for preview of to be displayed group logo.
 #. TRANS: Header for the cropped group logo on the group logo page.
-#: actions/avatarsettings.php:147 actions/avatarsettings.php:227
-#: actions/grouplogo.php:219 actions/grouplogo.php:283
 msgid "Preview"
 msgstr "معاينة"
 
 #. TRANS: Button on avatar upload page to delete current avatar.
 #. TRANS: Button text for user account deletion.
-#: actions/avatarsettings.php:155 actions/deleteaccount.php:319
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Delete"
 msgstr "احذف"
 
 #. TRANS: Button on avatar upload page to upload an avatar.
 #. TRANS: Submit button to confirm upload of a user backup file for account restore.
-#: actions/avatarsettings.php:173 actions/restoreaccount.php:369
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Upload"
 msgstr "ارفع"
 
 #. TRANS: Button on avatar upload crop form to confirm a selected crop as avatar.
-#: actions/avatarsettings.php:243
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Crop"
 msgstr "مجموعات"
 
 #. TRANS: Validation error on avatar upload form when no file was uploaded.
-#: actions/avatarsettings.php:318
 msgid "No file uploaded."
 msgstr "لم يُرفع ملف."
 
 #. TRANS: Avatar upload form instruction after uploading a file.
-#: actions/avatarsettings.php:345
-#, fuzzy
 msgid "Pick a square area of the image to be your avatar."
-msgstr "اختر منطقة مربعة من الصورة لتكون صورة أفتارك."
+msgstr "اختر منطقة مربعة من الصورة لتكون أفتارك."
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
 #. TRANS: Server error displayed trying to crop an uploaded group logo that is no longer present.
-#: actions/avatarsettings.php:360 actions/grouplogo.php:391
 msgid "Lost our file data."
-msgstr ""
+msgstr "ضاع ملف البيانات."
 
 #. TRANS: Success message for having updated a user avatar.
-#: actions/avatarsettings.php:384
 msgid "Avatar updated."
 msgstr "رُفع الأفتار."
 
 #. TRANS: Error displayed on the avatar upload page if the avatar could not be updated for an unknown reason.
-#: actions/avatarsettings.php:388
 msgid "Failed updating avatar."
 msgstr "فشل تحديث الأفتار."
 
 #. TRANS: Success message for deleting a user avatar.
-#: actions/avatarsettings.php:412
 msgid "Avatar deleted."
 msgstr "حُذف الأفتار."
 
 #. TRANS: Title for backup account page.
 #. TRANS: Option in profile settings to create a backup of the account of the currently logged in user.
-#: actions/backupaccount.php:61 actions/profilesettings.php:468
 msgid "Backup account"
-msgstr ""
+msgstr "انسخ الحساب احتياطيا"
 
 #. TRANS: Client exception thrown when trying to backup an account while not logged in.
-#: actions/backupaccount.php:79
 #, fuzzy
 msgid "Only logged-in users can backup their account."
 msgstr "يستطيع المستخدمون الوالجون وحدهم تكرار الإشعارات."
 
 #. TRANS: Client exception thrown when trying to backup an account without having backup rights.
-#: actions/backupaccount.php:84
 msgid "You may not backup your account."
-msgstr ""
+msgstr "لا يسمح لك بنسخ حسابك احتياطيًا."
 
 #. TRANS: Information displayed on the backup account page.
-#: actions/backupaccount.php:227
 msgid ""
 "You can backup your account data in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format. This is an experimental feature and provides "
@@ -1698,33 +1318,31 @@ msgid ""
 "addresses is not backed up. Additionally, uploaded files and direct messages "
 "are not backed up."
 msgstr ""
+"يمكنك نسخ بيانات حسابك بنسق <a href=\"http://activitystrea.ms/\">Activity "
+"Streams</a>. هذه الميزة تجريبية وتوفر نسخة احتياطية غير مكتملة. معلومات "
+"الحساب الخاصة كالبريد الإلكتروني وعناوين المحادثة الفورية لن تنسخ. الملفات "
+"المرفوعة والرسائل المباشرة أيضًا لن تنسخ."
 
 #. TRANS: Submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:250
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Backup"
-msgstr "الخلفية"
+msgstr "انسخ احتياطيًا"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:254
 msgid "Backup your account."
-msgstr ""
+msgstr "انسخ حسابك احتياطيًا."
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
-#: actions/block.php:68
 msgid "You already blocked that user."
 msgstr "لقد منعتَ هذا المستخدم مسبقًا."
 
 #. TRANS: Title for block user page.
 #. TRANS: Legend for block user form.
 #. TRANS: Fieldset legend for block user from group form.
-#: actions/block.php:106 actions/block.php:136 actions/groupblock.php:165
 msgid "Block user"
 msgstr "امنع المستخدم"
 
 #. TRANS: Explanation of consequences when blocking a user on the block user page.
-#: actions/block.php:139
 msgid ""
 "Are you sure you want to block this user? Afterwards, they will be "
 "unsubscribed from you, unable to subscribe to you in the future, and you "
@@ -1739,18 +1357,13 @@ msgstr ""
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:154 actions/deleteapplication.php:157
-#: actions/deletegroup.php:220 actions/deletenotice.php:155
-#: actions/deleteuser.php:154 actions/groupblock.php:187
 msgctxt "BUTTON"
 msgid "No"
 msgstr "لا"
 
 #. TRANS: Submit button title for 'No' when blocking a user.
-#: actions/block.php:158
-#, fuzzy
 msgid "Do not block this user."
-msgstr "لا تمنع هذا المستخدم"
+msgstr "لا تمنع هذا المستخدم."
 
 #. TRANS: Button label on the user block form.
 #. TRANS: Button label on the delete application form.
@@ -1758,310 +1371,244 @@ msgstr "لا تمنع هذا المستخدم"
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:161 actions/deleteapplication.php:164
-#: actions/deletegroup.php:227 actions/deletenotice.php:162
-#: actions/deleteuser.php:161 actions/groupblock.php:194
 msgctxt "BUTTON"
 msgid "Yes"
 msgstr "نعم"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:165
-#, fuzzy
 msgid "Block this user."
-msgstr "امنع هذا المستخدم"
+msgstr "امنع هذا المستخدم."
 
 #. TRANS: Server error displayed when blocking a user fails.
-#: actions/block.php:189
 msgid "Failed to save block information."
 msgstr "فشل حفظ معلومات المنع."
 
 #. TRANS: Title for first page with list of users blocked from a group.
 #. TRANS: %s is a group nickname.
-#: actions/blockedfromgroup.php:101
-#, fuzzy, php-format
+#, php-format
 msgid "%s blocked profiles"
-msgstr "%1$s ملفات ممنوعة, الصفحة %2$d"
+msgstr "الملفات الممنوعة من %s"
 
 #. TRANS: Title for any but the first page with list of users blocked from a group.
 #. TRANS: %1$s is a group nickname, %2$d is a page number.
-#: actions/blockedfromgroup.php:106
 #, php-format
 msgid "%1$s blocked profiles, page %2$d"
 msgstr "%1$s ملفات ممنوعة, الصفحة %2$d"
 
 #. TRANS: Instructions for list of users blocked from a group.
-#: actions/blockedfromgroup.php:122
-#, fuzzy
 msgid "A list of the users blocked from joining this group."
-msgstr "قائمة بمستخدمي هذه المجموعة."
+msgstr "قائمة بالمستخدمين الممنوعين من الانضمام إلى هذه المجموعة."
 
 #. TRANS: Form legend for unblocking a user from a group.
-#: actions/blockedfromgroup.php:291
 msgid "Unblock user from group"
 msgstr "ألغ منع المستخدم من المجموعة"
 
 #. TRANS: Button text for unblocking a user from a group.
-#: actions/blockedfromgroup.php:323
 msgctxt "BUTTON"
 msgid "Unblock"
 msgstr "ألغِ المنع"
 
 #. TRANS: Tooltip for button for unblocking a user from a group.
 #. TRANS: Description of the form to unblock a user.
-#: actions/blockedfromgroup.php:327 lib/unblockform.php:78
 msgid "Unblock this user"
 msgstr "ألغِ منع هذا المستخدم"
 
 #. TRANS: Title for mini-posting window loaded from bookmarklet.
 #. TRANS: %s is the StatusNet site name.
-#: actions/bookmarklet.php:51
 #, php-format
 msgid "Post to %s"
 msgstr "أرسل إلى %s"
 
 #. TRANS: Client error displayed when not providing a confirmation code in the contact address confirmation action.
-#: actions/confirmaddress.php:74
 msgid "No confirmation code."
 msgstr "لا رمز تأكيد."
 
 #. TRANS: Client error displayed when providing a non-existing confirmation code in the contact address confirmation action.
-#: actions/confirmaddress.php:80
 msgid "Confirmation code not found."
 msgstr "لم يوجد رمز التأكيد."
 
 #. TRANS: Client error displayed when not providing a confirmation code for another user in the contact address confirmation action.
-#: actions/confirmaddress.php:86
 msgid "That confirmation code is not for you!"
 msgstr "رمز التأكيد ليس لك!"
 
 #. TRANS: Server error for an unknown address type, which can be 'email', 'sms', or the name of an IM network (such as 'xmpp' or 'aim')
-#: actions/confirmaddress.php:94
 #, fuzzy, php-format
 msgid "Unrecognized address type %s"
 msgstr "نوع رسالة غير مدعوم: %s"
 
 #. TRANS: Client error for an already confirmed email/jabber/sms address.
-#: actions/confirmaddress.php:103 actions/confirmaddress.php:136
 #, fuzzy
 msgid "That address has already been confirmed."
 msgstr "هذا البريد الإلكتروني ملك مستخدم آخر بالفعل."
 
-#: actions/confirmaddress.php:121 actions/imsettings.php:444
-#: actions/userdesignsettings.php:306
-#, fuzzy
 msgid "Couldn't update user."
 msgstr "تعذّر تحديث المستخدم."
 
-#: actions/confirmaddress.php:144
 #, fuzzy
 msgid "Couldn't update user im preferences."
 msgstr "تعذّر تحديث سجل المستخدم."
 
-#: actions/confirmaddress.php:156
 #, fuzzy
 msgid "Couldn't insert user im preferences."
 msgstr "تعذّر إدراج اشتراك جديد."
 
 #. TRANS: Server error displayed when an address confirmation code deletion from the
 #. TRANS: database fails in the contact address confirmation action.
-#: actions/confirmaddress.php:169
 #, fuzzy
 msgid "Could not delete address confirmation."
 msgstr "تعذّر حذف تأكيد البريد المراسلة الفورية."
 
 #. TRANS: Title for the contact address confirmation action.
-#: actions/confirmaddress.php:185
 msgid "Confirm address"
 msgstr "أكد العنوان"
 
 #. TRANS: Success message for the contact address confirmation action.
 #. TRANS: %s can be 'email', 'jabber', or 'sms'.
-#: actions/confirmaddress.php:200
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr ""
 
 #. TRANS: Title for page with a conversion (multiple notices in context).
-#: actions/conversation.php:96
 msgid "Conversation"
 msgstr "محادثة"
 
 #. TRANS: Header on conversation page. Hidden by default (h2).
 #. TRANS: Label for user statistics.
-#: actions/conversation.php:149 lib/noticelist.php:87
-#: lib/profileaction.php:246 lib/searchgroupnav.php:82
-#: lib/threadednoticelist.php:66
 msgid "Notices"
 msgstr "الإشعارات"
 
 #. TRANS: Client exception displayed trying to delete a user account while not logged in.
-#: actions/deleteaccount.php:71
 #, fuzzy
 msgid "Only logged-in users can delete their account."
 msgstr "يستطيع المستخدمون الوالجون وحدهم تكرار الإشعارات."
 
 #. TRANS: Client exception displayed trying to delete a user account without have the rights to do that.
-#: actions/deleteaccount.php:77
 #, fuzzy
 msgid "You cannot delete your account."
 msgstr "لا يمكنك حذف المستخدمين."
 
 #. TRANS: Confirmation text for user deletion. The user has to type this exactly the same, including punctuation.
-#: actions/deleteaccount.php:160 actions/deleteaccount.php:297
 msgid "I am sure."
 msgstr "أنا متأكد."
 
 #. TRANS: Notification for user about the text that must be input to be able to delete a user account.
 #. TRANS: %s is the text that needs to be input.
-#: actions/deleteaccount.php:164
 #, php-format
 msgid "You must write \"%s\" exactly in the box."
 msgstr "يجب أن تكتب \"%s\" كما هي في الصندوق."
 
 #. TRANS: Confirmation that a user account has been deleted.
-#: actions/deleteaccount.php:206
 #, fuzzy
 msgid "Account deleted."
 msgstr "حُذف الأفتار."
 
 #. TRANS: Page title for page on which a user account can be deleted.
 #. TRANS: Option in profile settings to delete the account of the currently logged in user.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:476
-#, fuzzy
 msgid "Delete account"
-msgstr "أنشئ حسابًا"
+msgstr "حذف الحساب"
 
 #. TRANS: Form text for user deletion form.
-#: actions/deleteaccount.php:279
 msgid ""
 "This will <strong>permanently delete</strong> your account data from this "
 "server."
-msgstr ""
+msgstr "سوف هذا الخيار بيانات حسابك من هذا الخادوم <strong>إلى الأبد</strong>."
 
 #. TRANS: Additional form text for user deletion form shown if a user has account backup rights.
 #. TRANS: %s is a URL to the backup page.
-#: actions/deleteaccount.php:285
 #, php-format
 msgid ""
 "You are strongly advised to <a href=\"%s\">back up your data</a> before "
 "deletion."
-msgstr ""
+msgstr "يوصى بشدة أن <a href=\"%s\">تنسخ بيانتك احتياطيًا</a> قبل الحذف."
 
 #. TRANS: Field label for delete account confirmation entry.
 #. TRANS: Field label for password reset form where the password has to be typed again.
-#: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:262 actions/register.php:419
 msgid "Confirm"
 msgstr "أكّد"
 
 #. TRANS: Input title for the delete account field.
 #. TRANS: %s is the text that needs to be input.
-#: actions/deleteaccount.php:304
-#, fuzzy, php-format
+#, php-format
 msgid "Enter \"%s\" to confirm that you want to delete your account."
-msgstr "لا يمكنك حذف المستخدمين."
+msgstr "أدخل \"%s\" لتأكيد رغبتك في حذف حسابك."
 
 #. TRANS: Button title for user account deletion.
-#: actions/deleteaccount.php:323
-#, fuzzy
 msgid "Permanently delete your account"
-msgstr "لا يمكنك حذف المستخدمين."
+msgstr "احذف حسابك إلى الأبد"
 
 #. TRANS: Client error displayed trying to delete an application while not logged in.
-#: actions/deleteapplication.php:62
 msgid "You must be logged in to delete an application."
 msgstr "يجب أن تسجل الدخول لتحذف تطبيقا."
 
 #. TRANS: Client error displayed trying to delete an application that does not exist.
-#: actions/deleteapplication.php:71
 msgid "Application not found."
 msgstr "لم يوجد التطبيق."
 
 #. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
-#: actions/deleteapplication.php:79 actions/editapplication.php:78
-#: actions/showapplication.php:90
 msgid "You are not the owner of this application."
 msgstr "أنت لست مالك هذا التطبيق."
 
 #. TRANS: Client error text when there is a problem with the session token.
-#: actions/deleteapplication.php:102 actions/editapplication.php:131
-#: actions/newapplication.php:112 actions/showapplication.php:113
-#: lib/action.php:1391
 msgid "There was a problem with your session token."
 msgstr ""
 
 #. TRANS: Title for delete application page.
 #. TRANS: Fieldset legend on delete application page.
-#: actions/deleteapplication.php:124 actions/deleteapplication.php:149
 msgid "Delete application"
 msgstr "احذف هذا التطبيق"
 
 #. TRANS: Confirmation text on delete application page.
-#: actions/deleteapplication.php:152
 msgid ""
 "Are you sure you want to delete this application? This will clear all data "
 "about the application from the database, including all existing user "
 "connections."
 msgstr ""
+"أمتأكد أنك ترغب في حذف هذا التطبيق؟ سوف يمسح هذا الخيار جميع بيانات التطبيق "
+"من قاعدة البيانات بما فيها جميع اتصالات المستخدمين."
 
 #. TRANS: Submit button title for 'No' when deleting an application.
-#: actions/deleteapplication.php:161
-#, fuzzy
 msgid "Do not delete this application."
-msgstr "لا تحذف هذا التطبيق"
+msgstr "لا تحذف هذا التطبيق."
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
-#: actions/deleteapplication.php:167
-#, fuzzy
 msgid "Delete this application."
-msgstr "احذف هذا التطبيق"
+msgstr "احذف هذا التطبيق."
 
 #. TRANS: Client error when trying to delete group while not logged in.
-#: actions/deletegroup.php:64
-#, fuzzy
 msgid "You must be logged in to delete a group."
-msgstr "يجب أن تلج لتغادر مجموعة."
+msgstr "يجب أن تدخل لتحذف مجموعة."
 
 #. TRANS: Client error when trying to delete a group without providing a nickname or ID for the group.
 #. TRANS: Client error displayed when trying to join a group without providing a group name or group ID.
 #. TRANS: Client error displayed when trying to leave a group without providing a group name or group ID.
-#: actions/deletegroup.php:94 actions/joingroup.php:89
-#: actions/leavegroup.php:89
 #, fuzzy
 msgid "No nickname or ID."
 msgstr "لا اسم مستعار."
 
 #. TRANS: Client error when trying to delete a group without having the rights to delete it.
-#: actions/deletegroup.php:107
-#, fuzzy
 msgid "You are not allowed to delete this group."
-msgstr "لست عضوًا في هذه المجموعة"
+msgstr "لا يسمح لك بحذف هذه المجموعة."
 
 #. TRANS: Server error displayed if a group could not be deleted.
 #. TRANS: %s is the name of the group that could not be deleted.
-#: actions/deletegroup.php:150
 #, fuzzy, php-format
 msgid "Could not delete group %s."
 msgstr "تعذر تحديث المجموعة."
 
 #. TRANS: Message given after deleting a group.
 #. TRANS: %s is the deleted group's name.
-#: actions/deletegroup.php:159
 #, fuzzy, php-format
 msgid "Deleted group %s"
 msgstr "%1$s ترك المجموعة %2$s"
 
 #. TRANS: Title of delete group page.
 #. TRANS: Form legend for deleting a group.
-#: actions/deletegroup.php:176 actions/deletegroup.php:202
 #, fuzzy
 msgid "Delete group"
 msgstr "احذف المستخدم"
 
 #. TRANS: Warning in form for deleleting a group.
-#: actions/deletegroup.php:206
 msgid ""
 "Are you sure you want to delete this group? This will clear all data about "
 "the group from the database, without a backup. Public posts to this group "
@@ -2069,13 +1616,11 @@ msgid ""
 msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting a group.
-#: actions/deletegroup.php:224
 #, fuzzy
 msgid "Do not delete this group."
 msgstr "لا تحذف هذا الإشعار"
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
-#: actions/deletegroup.php:231
 #, fuzzy
 msgid "Delete this group."
 msgstr "احذف هذا المستخدم"
@@ -2086,22 +1631,18 @@ msgstr "احذف هذا المستخدم"
 #. TRANS: Client error displayed trying to block a user from a group while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying to log out when not logged in.
+#. TRANS: Client error displayed when trying to access the "make admin" page while not logged in.
+#. TRANS: Client error displayed trying to create a new direct message while not logged in.
+#. TRANS: Client error displayed trying to send a notice while not logged in.
+#. TRANS: Client error displayed trying to nudge a user without being logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
 #. TRANS: Client error displayed when trying to change user options while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
-#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:70
-#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
-#: actions/nudge.php:63 actions/pluginenable.php:97 actions/subedit.php:33
-#: actions/subscribe.php:98 actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:71 lib/profileformaction.php:63
-#: lib/settingsaction.php:72
 msgid "Not logged in."
 msgstr "لست والجًا."
 
 #. TRANS: Instructions for deleting a notice.
-#: actions/deletenotice.php:110
 msgid ""
 "You are about to permanently delete a notice. Once this is done, it cannot "
 "be undone."
@@ -2109,152 +1650,124 @@ msgstr ""
 
 #. TRANS: Page title when deleting a notice.
 #. TRANS: Fieldset legend for the delete notice form.
-#: actions/deletenotice.php:117 actions/deletenotice.php:148
 msgid "Delete notice"
 msgstr "احذف الإشعار"
 
 #. TRANS: Message for the delete notice form.
-#: actions/deletenotice.php:152
 msgid "Are you sure you want to delete this notice?"
 msgstr "أمتأكد من أنك تريد حذف هذا الإشعار؟"
 
 #. TRANS: Submit button title for 'No' when deleting a notice.
-#: actions/deletenotice.php:159
 #, fuzzy
 msgid "Do not delete this notice."
 msgstr "لا تحذف هذا الإشعار"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:166
 #, fuzzy
 msgid "Delete this notice."
 msgstr "احذف هذا الإشعار"
 
 #. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
-#: actions/deleteuser.php:66
 msgid "You cannot delete users."
 msgstr "لا يمكنك حذف المستخدمين."
 
 #. TRANS: Client error displayed when trying to delete a non-local user.
-#: actions/deleteuser.php:74
 msgid "You can only delete local users."
 msgstr "يمكنك حذف المستخدمين المحليين فقط."
 
 #. TRANS: Title of delete user page.
-#: actions/deleteuser.php:110
 #, fuzzy
 msgctxt "TITLE"
 msgid "Delete user"
 msgstr "احذف المستخدم"
 
 #. TRANS: Fieldset legend on delete user page.
-#: actions/deleteuser.php:134
 msgid "Delete user"
 msgstr "احذف المستخدم"
 
 #. TRANS: Information text to request if a user is certain that the described action has to be performed.
-#: actions/deleteuser.php:138
 msgid ""
 "Are you sure you want to delete this user? This will clear all data about "
 "the user from the database, without a backup."
 msgstr ""
+"أمتأكد أنك ترغب في حذف هذا المستخدم؟ سوف يؤدي ذلك إلى مسح كافة البيانات "
+"المتعلقة بالمستخدم من قاعدة البيانات دون نسخ احتياطي."
 
 #. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/deleteuser.php:158
-#, fuzzy
 msgid "Do not delete this user."
-msgstr "لا تحذف هذا الإشعار"
+msgstr "لا تحذف هذا المستخدم."
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
-#: actions/deleteuser.php:165
-#, fuzzy
 msgid "Delete this user."
-msgstr "احذف هذا المستخدم"
+msgstr "احذف هذا المستخدم."
 
 #. TRANS: Message used as title for design settings for the site.
-#: actions/designadminpanel.php:60 lib/settingsnav.php:97
 msgid "Design"
 msgstr "التصميم"
 
 #. TRANS: Instructions for design adminsitration panel.
-#: actions/designadminpanel.php:71
 msgid "Design settings for this StatusNet site"
-msgstr ""
+msgstr "إعدادات تصميم موقع ستاسنت هذا"
 
 #. TRANS: Client error displayed when a logo URL does is not valid.
-#: actions/designadminpanel.php:327
 msgid "Invalid logo URL."
 msgstr "مسار شعار غير صالح."
 
 #. TRANS: Client error displayed when an SSL logo URL is invalid.
-#: actions/designadminpanel.php:333
 #, fuzzy
 msgid "Invalid SSL logo URL."
 msgstr "مسار شعار غير صالح."
 
 #. TRANS: Client error displayed when a theme is submitted through the form that is not in the theme list.
 #. TRANS: %s is the chosen unavailable theme.
-#: actions/designadminpanel.php:339
 #, php-format
 msgid "Theme not available: %s."
 msgstr "السمة غير متوفرة: %s"
 
 #. TRANS: Fieldset legend for form to change logo.
-#: actions/designadminpanel.php:437
 msgid "Change logo"
 msgstr "غيّر الشعار"
 
 #. TRANS: Field label for StatusNet site logo.
-#: actions/designadminpanel.php:444
 msgid "Site logo"
 msgstr "شعار الموقع"
 
 #. TRANS: Field label for SSL StatusNet site logo.
-#: actions/designadminpanel.php:452
 #, fuzzy
 msgid "SSL logo"
 msgstr "شعار الموقع"
 
 #. TRANS: Fieldset legend for form change StatusNet site's theme.
-#: actions/designadminpanel.php:467
 msgid "Change theme"
 msgstr "غيّر السمة"
 
 #. TRANS: Field label for dropdown to choose site theme.
-#: actions/designadminpanel.php:485
 msgid "Site theme"
 msgstr "سمة الموقع"
 
 #. TRANS: Title for field label for dropdown to choose site theme.
-#: actions/designadminpanel.php:487
 msgid "Theme for the site."
 msgstr "سمة الموقع."
 
 #. TRANS: Field label for uploading a cutom theme.
-#: actions/designadminpanel.php:494
 msgid "Custom theme"
 msgstr "سمة مخصصة"
 
 #. TRANS: Form instructions for uploading a cutom StatusNet theme.
-#: actions/designadminpanel.php:499
 msgid "You can upload a custom StatusNet theme as a .ZIP archive."
 msgstr ""
 
 #. TRANS: Fieldset legend for theme background image.
-#: actions/designadminpanel.php:515
 msgid "Change background image"
 msgstr "تغيير صورة الخلفية"
 
 #. TRANS: Field label for background image on theme designer page.
 #. TRANS: Field label for background color selector.
 #. TRANS: Label on profile design page for setting a profile page background colour.
-#: actions/designadminpanel.php:525 actions/designadminpanel.php:609
-#: lib/designform.php:238
 msgid "Background"
 msgstr "الخلفية"
 
 #. TRANS: Form guide for background image upload form on theme designer page.
-#: actions/designadminpanel.php:531
 #, php-format
 msgid ""
 "You can upload a background image for the site. The maximum file size is %1"
@@ -2262,208 +1775,166 @@ msgid ""
 msgstr "بإمكانك رفع صورة خلفية للموقع. أقصى حجم للملف هو %1$s."
 
 #. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:558
 msgid "On"
 msgstr "مكّن"
 
 #. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:575
 msgid "Off"
 msgstr "عطّل"
 
 #. TRANS: Form guide for turning background image on or off on theme designer page.
 #. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
 #. TRANS: use of the uploaded profile image.
-#: actions/designadminpanel.php:577 lib/designform.php:214
 msgid "Turn background image on or off."
 msgstr "مكّن صورة الخلفية أو عطّلها."
 
 #. TRANS: Checkbox label to title background image on theme designer page.
 #. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-#: actions/designadminpanel.php:583 lib/designform.php:220
-#, fuzzy
 msgid "Tile background image"
-msgstr "تغيير صورة الخلفية"
+msgstr "كرّر صورة الخلفية"
 
 #. TRANS: Fieldset legend for theme colors.
-#: actions/designadminpanel.php:598
-#, fuzzy
 msgid "Change colors"
-msgstr "تغيير الألوان"
+msgstr "غيّر الألوان"
 
 #. TRANS: Field label for content color selector.
 #. TRANS: Label on profile design page for setting a profile page content colour.
-#: actions/designadminpanel.php:623 lib/designform.php:252
 msgid "Content"
 msgstr "المحتوى"
 
 #. TRANS: Field label for sidebar color selector.
 #. TRANS: Label on profile design page for setting a profile page sidebar colour.
-#: actions/designadminpanel.php:637 lib/designform.php:266
 msgid "Sidebar"
 msgstr "الشريط الجانبي"
 
 #. TRANS: Field label for text color selector.
 #. TRANS: Label on profile design page for setting a profile page text colour.
-#: actions/designadminpanel.php:651 lib/designform.php:280
 msgid "Text"
 msgstr "النص"
 
 #. TRANS: Field label for link color selector.
 #. TRANS: Label on profile design page for setting a profile page links colour.
-#: actions/designadminpanel.php:665 lib/designform.php:294
 msgid "Links"
 msgstr "وصلات"
 
 #. TRANS: Fieldset legend for advanced theme design settings.
-#: actions/designadminpanel.php:691
 msgid "Advanced"
 msgstr "متقدم"
 
 #. TRANS: Field label for custom CSS.
-#: actions/designadminpanel.php:696
 msgid "Custom CSS"
 msgstr "CSS مخصصة"
 
 #. TRANS: Button text for resetting theme settings.
-#: actions/designadminpanel.php:718
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Use defaults"
-msgstr "استخدم المبدئيات"
+msgstr "استخدم المبدئية"
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:720
-#, fuzzy
 msgid "Restore default designs."
-msgstr "استعد التصميمات المبدئية"
+msgstr "استعد التصاميم المبدئية."
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:728
 #, fuzzy
 msgid "Reset back to default."
 msgstr "ارجع إلى المبدئي"
 
 #. TRANS: Title for button for saving theme settings.
-#: actions/designadminpanel.php:736
-#, fuzzy
 msgid "Save design."
-msgstr "احفظ التصميم"
+msgstr "احفظ التصميم."
 
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
-#: actions/disfavor.php:83
 msgid "This notice is not a favorite!"
 msgstr "هذا الشعار ليس مفضلًا!"
 
 #. TRANS: Title for page on which favorites can be added.
-#: actions/disfavor.php:98
 msgid "Add to favorites"
 msgstr "أضف إلى المفضلات"
 
 #. TRANS: Client exception thrown when requesting a document from the documentation that does not exist.
 #. TRANS: %s is the non-existing document.
-#: actions/doc.php:155
-#, fuzzy, php-format
+#, php-format
 msgid "No such document \"%s\"."
-msgstr "لا مستند باسم \"%s\""
+msgstr "لا مستند باسم \"%s\"."
 
 #. TRANS: Title for "Edit application" form.
 #. TRANS: Form legend.
-#: actions/editapplication.php:54 lib/applicationeditform.php:129
 msgid "Edit application"
 msgstr "عدّل التطبيق"
 
 #. TRANS: Client error displayed trying to edit an application while not logged in.
-#: actions/editapplication.php:66
 msgid "You must be logged in to edit an application."
 msgstr "يجب أن تكون مسجل الدخول لتعدل تطبيقا."
 
 #. TRANS: Client error displayed trying to edit an application that does not exist.
-#: actions/editapplication.php:83 actions/showapplication.php:83
 msgid "No such application."
 msgstr "لا تطبيق كهذا."
 
 #. TRANS: Instructions for "Edit application" form.
-#: actions/editapplication.php:167
 msgid "Use this form to edit your application."
 msgstr "استخدم هذا النموذج لتعدل تطبيقك."
 
 #. TRANS: Validation error shown when not providing a name in the "Edit application" form.
 #. TRANS: Validation error shown when not providing a name in the "New application" form.
-#: actions/editapplication.php:184 actions/newapplication.php:164
 msgid "Name is required."
 msgstr "الاسم مطلوب."
 
 #. 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.
-#: actions/editapplication.php:188 actions/newapplication.php:172
-#, fuzzy
 msgid "Name is too long (maximum 255 characters)."
-msgstr "الاسم طويل جدا (الأقصى 255 حرفا)."
+msgstr "الاسم طويل جدا (الحد الأقصى 255 حرفا)."
 
 #. TRANS: Validation error shown when providing a name for an application that already exists in the "Edit application" form.
 #. TRANS: Validation error shown when providing a name for an application that already exists in the "New application" form.
-#: actions/editapplication.php:192 actions/newapplication.php:168
 #, fuzzy
 msgid "Name already in use. Try another one."
 msgstr "الاسم المستعار مستخدم بالفعل. جرّب اسمًا آخرًا."
 
 #. TRANS: Validation error shown when not providing a description in the "Edit application" form.
 #. TRANS: Validation error shown when not providing a description in the "New application" form.
-#: actions/editapplication.php:196 actions/newapplication.php:176
 msgid "Description is required."
 msgstr "الوصف مطلوب."
 
 #. TRANS: Validation error shown when providing too long a source URL in the "Edit application" form.
-#: actions/editapplication.php:209
 msgid "Source URL is too long."
 msgstr "المسار المصدر طويل جدًا."
 
 #. TRANS: Validation error shown when providing an invalid source URL in the "Edit application" form.
 #. TRANS: Validation error shown when providing an invalid source URL in the "New application" form.
-#: actions/editapplication.php:216 actions/newapplication.php:199
 msgid "Source URL is not valid."
 msgstr "مسار المصدر ليس صحيحا."
 
 #. 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.
-#: actions/editapplication.php:220 actions/newapplication.php:203
 msgid "Organization is required."
 msgstr "المنظمة مطلوبة."
 
 #. TRANS: Validation error shown when providing too long an arganisation name in the "Edit application" form.
-#: actions/editapplication.php:224 actions/newapplication.php:207
-#, fuzzy
 msgid "Organization is too long (maximum 255 characters)."
-msgstr "المنظمة طويلة جدا (الأقصى 255 حرفا)."
+msgstr "المنظمة طويلة جدا (الحد الأقصى 255 حرفا)."
 
 #. TRANS: Form validation error show when an organisation name has not been provided in the edit application form.
 #. TRANS: Form validation error show when an organisation name has not been provided in the new application form.
-#: actions/editapplication.php:228 actions/newapplication.php:211
 msgid "Organization homepage is required."
 msgstr "صفحة المنظمة الرئيسية مطلوبة."
 
 #. TRANS: Validation error shown when providing too long a callback URL in the "Edit application" form.
 #. TRANS: Validation error shown when providing too long a callback URL in the "New application" form.
-#: actions/editapplication.php:239 actions/newapplication.php:225
 #, fuzzy
 msgid "Callback is too long."
 msgstr "المسار المصدر طويل جدًا."
 
 #. TRANS: Validation error shown when providing an invalid callback URL in the "Edit application" form.
 #. TRANS: Validation error shown when providing an invalid callback URL in the "New application" form.
-#: actions/editapplication.php:247 actions/newapplication.php:235
 #, fuzzy
 msgid "Callback URL is not valid."
 msgstr "مسار المصدر ليس صحيحا."
 
 #. TRANS: Server error occuring when an application could not be updated from the "Edit application" form.
-#: actions/editapplication.php:284
 msgid "Could not update application."
 msgstr "لم يمكن تحديث التطبيق."
 
 #. TRANS: Title for form to edit a group. %s is a group nickname.
-#: actions/editgroup.php:55
 #, php-format
 msgid "Edit %s group"
 msgstr "عدّل مجموعة %s"
@@ -2471,40 +1942,40 @@ msgstr "عدّل مجموعة %s"
 #. TRANS: Client error displayed trying to edit a group while not logged in.
 #. TRANS: Client error displayed when trying to create a group while not logged in.
 #. TRANS: Client error displayed trying to create a group while not logged in.
-#: actions/editgroup.php:68 actions/grouplogo.php:69 actions/newgroup.php:65
 msgid "You must be logged in to create a group."
 msgstr "يجب أن تكون والجًا لتنشئ مجموعة."
 
 #. TRANS: Form instructions for group edit form.
-#: actions/editgroup.php:161
 msgid "Use this form to edit the group."
 msgstr "استخدم هذا النموذج لتعديل المجموعة."
 
+#. TRANS: Group edit form validation error.
+#. TRANS: Group create form validation error.
+#. TRANS: %s is the invalid alias.
+#, php-format
+msgid "Invalid alias: \"%s\""
+msgstr "كنية غير صالحة: \"%s\""
+
 #. TRANS: Group edit form success message.
-#: actions/editgroup.php:301
 msgid "Options saved."
 msgstr "حُفظت الخيارات."
 
 #. TRANS: Title for e-mail settings.
-#: actions/emailsettings.php:60
 msgid "Email settings"
 msgstr "إعدادات البريد الإلكتروني"
 
 #. TRANS: E-mail settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/emailsettings.php:74
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 msgstr "أدر كيف تستلم البريد الإلكتروني من %%site.name%%."
 
 #. TRANS: Form legend for e-mail settings form.
 #. TRANS: Field label for e-mail address input in e-mail settings form.
-#: actions/emailsettings.php:104 actions/emailsettings.php:130
 msgid "Email address"
 msgstr "عنوان البريد الإلكتروني"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:110
 msgid "Current confirmed email address."
 msgstr "عنوان البريد الإلكتروني المُؤكد الحالي."
 
@@ -2513,153 +1984,126 @@ msgstr "عنوان البريد الإلكتروني المُؤكد الحالي
 #. TRANS: Button label to remove a confirmed IM address.
 #. TRANS: Button label to remove a confirmed SMS address.
 #. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
-#: actions/emailsettings.php:113 actions/emailsettings.php:180
-#: actions/imsettings.php:119 actions/smssettings.php:119
-#: actions/smssettings.php:175
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "أزل"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:120
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
 msgstr ""
+"في انتظار تأكيد هذا العنوان. التمس رسالة تحوي مزيدًا من التعليمات في صندوق "
+"الوارد (وصندوق الرسائل المزعجة!)."
 
 #. TRANS: Instructions for e-mail address input form. Do not translate
 #. TRANS: "example.org". It is one of the domain names reserved for
 #. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
 #. TRANS: Any other domain may be owned by a legitimate person or
 #. TRANS: organization.
-#: actions/emailsettings.php:137
 msgid "Email address, like \"UserName@example.org\""
 msgstr "عنوان البريد الإلكتروني، مثل \"UserName@example.org\""
 
 #. TRANS: Button label for adding an e-mail address in e-mail settings form.
 #. TRANS: Button label for adding an IM address in IM settings form.
 #. TRANS: Button label for adding a SMS phone number in SMS settings form.
-#: actions/emailsettings.php:141 actions/imsettings.php:147
-#: actions/smssettings.php:157
 msgctxt "BUTTON"
 msgid "Add"
 msgstr "أضف"
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:149 actions/smssettings.php:166
 msgid "Incoming email"
 msgstr "البريد الإلكتروني الوارد"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:155
 msgid "I want to post notices by email."
 msgstr "أريد أن أرسل الملاحظات عبر البريد الإلكتروني."
 
 #. TRANS: Form instructions for incoming e-mail form in e-mail settings.
 #. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
-#: actions/emailsettings.php:177 actions/smssettings.php:173
 msgid "Send email to this address to post new notices."
 msgstr "أرسل بريدًا إلكترونيًا إلى هذا العنوان لترسل إشعارات جديدة."
 
 #. TRANS: Instructions for incoming e-mail address input form, when an address has already been assigned.
 #. TRANS: Instructions for incoming SMS e-mail address input form.
-#: actions/emailsettings.php:186 actions/smssettings.php:181
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr "أنشئ عنوان بريد إلكتروني لترسل إليه؛ ألغِ القديم."
 
 #. TRANS: Instructions for incoming e-mail address input form.
-#: actions/emailsettings.php:190
 msgid ""
 "To send notices via email, we need to create a unique email address for you "
 "on this server:"
 msgstr ""
+"لإرسال الإشعارات بالبريد الإلكتروني، يجب أن ننشئ بريدًا فريدًا لك على هذا "
+"الخادوم:"
 
 #. TRANS: Button label for adding an e-mail address to send notices from.
 #. TRANS: Button label for adding an SMS e-mail address to send notices from.
-#: actions/emailsettings.php:196 actions/smssettings.php:184
 msgctxt "BUTTON"
 msgid "New"
 msgstr "جديد"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:205
 msgid "Email preferences"
 msgstr "تفضيلات البريد الإلكتروني"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:213
 msgid "Send me notices of new subscriptions through email."
 msgstr "أرسل لي إشعارات بالاشتراكات الجديدة عبر البريد الإلكتروني."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:219
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr "أرسل لي بريدًا إلكرتونيًا عندما يضيف أحدهم إشعاري مفضلة."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:226
 msgid "Send me email when someone sends me a private message."
 msgstr "أرسل لي بريدًا إلكترونيًا عندما يرسل لي أحد رسالة خاصة."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:232
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr "أرسل لي بريدًا إلكترونيًا عندما يرسل لي أحد \"@-رد\"."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:238
 msgid "Allow friends to nudge me and send me an email."
 msgstr "اسمح لأصدقائي بتنبيهي ومراسلتي عبر البريد الإلكتروني."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:244
 msgid "Publish a MicroID for my email address."
 msgstr "انشر هوية مصغّرة لعنوان بريدي الإلكتروني."
 
 #. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:362
 msgid "Email preferences saved."
 msgstr "حُفظت تفضيلات البريد الإلكرتوني."
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:381
 msgid "No email address."
 msgstr "لا عنوان بريد إلكتروني."
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:389
 #, fuzzy
 msgid "Cannot normalize that email address."
 msgstr "عنوان البريد الإلكتروني المُؤكد الحالي."
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:394 actions/register.php:197
-#: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "ليس عنوان بريد صالح."
 
 #. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:398
 msgid "That is already your email address."
 msgstr "هذا هو عنوان بريدك الإكتروني سابقًا."
 
 #. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:402
 msgid "That email address already belongs to another user."
 msgstr "هذا البريد الإلكتروني ملك مستخدم آخر بالفعل."
 
 #. TRANS: Server error thrown on database error adding e-mail confirmation code.
 #. TRANS: Server error thrown on database error adding Instant Messaging confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:419 actions/imsettings.php:362
-#: actions/smssettings.php:364
-#, fuzzy
 msgid "Could not insert confirmation code."
 msgstr "تعذّر إدراج رمز التأكيد."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:426
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
@@ -2668,105 +2112,85 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling Instant Messaging address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:446 actions/imsettings.php:391
-#: actions/smssettings.php:398
 #, fuzzy
 msgid "No pending confirmation to cancel."
 msgstr "أُلغي تأكيد المراسلة الفورية."
 
 #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:451
 msgid "That is the wrong email address."
 msgstr "هذا عنوان بريد إلكتروني خطأ."
 
 #. TRANS: Server error thrown on database error canceling e-mail address confirmation.
 #. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
-#: actions/emailsettings.php:460 actions/smssettings.php:412
 #, fuzzy
 msgid "Could not delete email confirmation."
 msgstr "تعذّر حذف تأكيد البريد الإلكتروني."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:465
 msgid "Email confirmation cancelled."
 msgstr "أُلغي تأكيد البريد الإلكتروني."
 
 #. TRANS: Message given trying to remove an e-mail address that is not
 #. TRANS: registered for the active user.
-#: actions/emailsettings.php:484
 msgid "That is not your email address."
 msgstr "هذا ليس عنوان بريدك الإلكتروني."
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:505
 msgid "The email address was removed."
 msgstr "أزيل عنوان البريد الإلكتروني."
 
 #. TRANS: Form validation error displayed when trying to remove an incoming e-mail address while no address has been set.
-#: actions/emailsettings.php:519 actions/smssettings.php:554
 msgid "No incoming email address."
 msgstr "لا عنوان بريد إلكتروني وارد."
 
 #. 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.
-#: actions/emailsettings.php:531 actions/emailsettings.php:555
-#: actions/smssettings.php:565 actions/smssettings.php:590
 #, fuzzy
 msgid "Could not update user record."
 msgstr "تعذّر تحديث سجل المستخدم."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
 #. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:535 actions/smssettings.php:569
 #, fuzzy
 msgid "Incoming email address removed."
 msgstr "لا عنوان بريد إلكتروني وارد."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
 #. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:559 actions/smssettings.php:594
 #, fuzzy
 msgid "New incoming email address added."
 msgstr "لا عنوان بريد إلكتروني وارد."
 
 #. TRANS: Client error displayed when trying to mark a notice as favorite that already is a favorite.
-#: actions/favor.php:80
 msgid "This notice is already a favorite!"
 msgstr "هذا الإشعار مفضلة مسبقًا!"
 
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
-#: actions/favor.php:95
 #, fuzzy
 msgid "Disfavor favorite."
 msgstr "ألغِ تفضيل المفضلة"
 
 #. TRANS: Page title for first page of favorited notices.
 #. TRANS: Title for favourited notices section.
-#: actions/favorited.php:65 lib/popularnoticesection.php:62
-#: lib/publicgroupnav.php:93
 msgid "Popular notices"
 msgstr "إشعارات محبوبة"
 
 #. TRANS: Page title for all but first page of favorited notices.
 #. TRANS: %d is the page number being displayed.
-#: actions/favorited.php:69
 #, php-format
 msgid "Popular notices, page %d"
 msgstr "إشعارات محبوبة، الصفحة %d"
 
 #. TRANS: Description on page displaying favorited notices.
-#: actions/favorited.php:81
 msgid "The most popular notices on the site right now."
 msgstr "أشهر الإشعارات على الموقع حاليًا."
 
 #. TRANS: Text displayed instead of a list when a site does not yet have any favourited notices.
-#: actions/favorited.php:149
 msgid "Favorite notices appear on this page but no one has favorited one yet."
 msgstr ""
 
 #. TRANS: Additional text displayed instead of a list when a site does not yet have any favourited notices for logged in users.
-#: actions/favorited.php:153
 msgid ""
 "Be the first to add a notice to your favorites by clicking the fave button "
 "next to any notice you like."
@@ -2774,7 +2198,6 @@ msgstr ""
 
 #. TRANS: Additional text displayed instead of a list when a site does not yet have any favourited notices for not logged in users.
 #. TRANS: %%action.register%% is a registration link. "[link text](link)" is Mark Down. Do not change the formatting.
-#: actions/favorited.php:158
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to add a "
@@ -2785,184 +2208,149 @@ msgstr ""
 #. TRANS: %s is a user's nickname.
 #. TRANS: Title for first page of favourite notices of a user.
 #. TRANS: %s is the user for whom the favourite notices are displayed.
-#: actions/favoritesrss.php:111 actions/showfavorites.php:76
-#: lib/personalgroupnav.php:110
 #, php-format
 msgid "%s's favorite notices"
 msgstr "إشعارات %s المُفضلة"
 
 #. TRANS: Desciption of RSS feed with favourite notices of a user.
 #. TRANS: %1$s is a user's nickname, %2$s is the name of the StatusNet site.
-#: actions/favoritesrss.php:117
 #, php-format
 msgid "Updates favored by %1$s on %2$s!"
 msgstr "الإشعارات التي فضلها %1$s في %2$s!"
 
 #. TRANS: Page title for first page of featured users.
 #. TRANS: Title for featured users section.
-#: actions/featured.php:69 lib/featureduserssection.php:87
-#: lib/publicgroupnav.php:89
 msgid "Featured users"
 msgstr "مستخدمون مختارون"
 
 #. TRANS: Page title for all but first page of featured users.
 #. TRANS: %d is the page number being displayed.
-#: actions/featured.php:73
 #, php-format
 msgid "Featured users, page %d"
 msgstr "مستخدمون مختارون، صفحة %d"
 
 #. TRANS: Description on page displaying featured users.
-#: actions/featured.php:102
 #, fuzzy, php-format
 msgid "A selection of some great users on %s."
 msgstr "اختيار لبعض المستخدمين المتميزين على %s"
 
 #. TRANS: Client error displayed when no notice ID was given trying do display a file.
-#: actions/file.php:36
 msgid "No notice ID."
 msgstr "لا رقم ملاحظة."
 
 #. TRANS: Client error displayed when an invalid notice ID was given trying do display a file.
-#: actions/file.php:41
 msgid "No notice."
 msgstr "لا ملاحظة."
 
 #. TRANS: Client error displayed when trying do display a file for a notice without a file attachement.
-#: actions/file.php:46
 msgid "No attachments."
 msgstr "لا مرفقات."
 
 #. TRANS: Client error displayed when trying do display a file for a notice with file attachements
 #. TRANS: that could not be found.
-#: actions/file.php:58
 msgid "No uploaded attachments."
 msgstr "لا مرفقات مرفوعة."
 
 #. TRANS: Client error displayed when subscribing to a remote profile and an unexpected response is received.
-#: actions/finishremotesubscribe.php:69
 msgid "Not expecting this response!"
 msgstr "لم أتوقع هذا الرد!"
 
 #. TRANS: Client error displayed when subscribing to a remote profile that does not exist.
-#: actions/finishremotesubscribe.php:81
 msgid "User being listened to does not exist."
 msgstr "المستخدم الذي تستمع إليه غير موجود."
 
 #. TRANS: Client error displayed when subscribing to a remote profile that is a local profile.
-#: actions/finishremotesubscribe.php:89 actions/remotesubscribe.php:58
 msgid "You can use the local subscription!"
 msgstr "تستطيع استخدام الاشتراك المحلي!"
 
 #. TRANS: Client error displayed when subscribing to a remote profile that is blocked form subscribing to.
-#: actions/finishremotesubscribe.php:102
 #, fuzzy
 msgid "That user has blocked you from subscribing."
 msgstr "لقد منعك المستخدم."
 
 #. TRANS: Client error displayed when subscribing to a remote profile without providing an authorised token.
-#: actions/finishremotesubscribe.php:114
 msgid "You are not authorized."
 msgstr "لا تملك تصريحًا."
 
 #. TRANS: Client error displayed when subscribing to a remote profile and conversion of the request token to access token fails.
-#: actions/finishremotesubscribe.php:118
 msgid "Could not convert request token to access token."
 msgstr ""
 
 #. TRANS: Client error displayed when subscribing to a remote profile fails because of an unsupported version of the OMB protocol.
-#: actions/finishremotesubscribe.php:124
 msgid "Remote service uses unknown version of OMB protocol."
 msgstr ""
 
 #. TRANS: Server error displayed when subscribing to a remote profile fails because the remote profile could not be updated.
-#: actions/finishremotesubscribe.php:145 lib/oauthstore.php:317
 msgid "Error updating remote profile."
 msgstr "خطأ أثناء تحديث الملف الشخصي البعيد."
 
 #. TRANS: Client error displayed when requesting a non-existent file.
-#: actions/getfile.php:77
 msgid "No such file."
 msgstr "لا ملف كهذا."
 
 #. TRANS: Client error displayed when requesting a file without having read access to it.
-#: actions/getfile.php:82
 msgid "Cannot read file."
 msgstr "تعذّرت قراءة الملف."
 
 #. TRANS: Client error displayed when trying to assign an invalid role to a user.
-#: actions/grantrole.php:61 actions/revokerole.php:62
 #, fuzzy
 msgid "Invalid role."
 msgstr "حجم غير صالح."
 
 #. TRANS: Client error displayed when trying to assign an reserved role to a user.
-#: actions/grantrole.php:66 actions/revokerole.php:66
 msgid "This role is reserved and cannot be set."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to assign a role to a user while not being allowed to set roles.
-#: actions/grantrole.php:76
 msgid "You cannot grant user roles on this site."
 msgstr "لا يمكنك سحب أدوار المستخدمين على هذا الموقع."
 
 #. TRANS: Client error displayed when trying to assign a role to a user that already has that role.
-#: actions/grantrole.php:84
 msgid "User already has this role."
 msgstr "لدى المستخدم هذا الدور من قبل."
 
 #. TRANS: Client error displayed trying to block a user from a group while not specifying a to be blocked user profile.
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing a profile.
+#. TRANS: Client error displayed when not providing a profile ID on the Make Admin page.
 #. TRANS: Client error displayed trying a change a subscription without providing a profile.
 #. TRANS: Client error displayed when trying to change user options without specifying a user to work on.
-#: actions/groupblock.php:71 actions/groupunblock.php:71
-#: actions/makeadmin.php:71 actions/subedit.php:49
-#: lib/profileformaction.php:79
 msgid "No profile specified."
 msgstr "لا ملف شخصي مُحدّد."
 
 #. TRANS: Client error displayed trying to block a user from a group while specifying a non-existing profile.
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing an existing profile.
+#. TRANS: Client error displayed when specifying an invalid profile ID on the Make Admin page.
 #. TRANS: Client error displayed trying a change a subscription for a non-existant profile ID.
 #. TRANS: Client error displayed when trying to change user options without specifying an existing user to work on.
-#: actions/groupblock.php:77 actions/groupunblock.php:77
-#: actions/makeadmin.php:76 actions/subedit.php:57 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:87
 msgid "No profile with that ID."
 msgstr "لا ملف شخصي بهذه الهوية."
 
 #. TRANS: Client error displayed trying to block a user from a group while not specifying a group to block a profile from.
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing a group.
-#: actions/groupblock.php:83 actions/groupunblock.php:83
-#: actions/makeadmin.php:81
+#. TRANS: Client error displayed when not providing a group ID on the Make Admin page.
 msgid "No group specified."
 msgstr "لا مجموعة مُحدّدة."
 
 #. TRANS: Client error displayed trying to block a user from a group while not being an admin user.
-#: actions/groupblock.php:95
 msgid "Only an admin can block group members."
 msgstr ""
 
 #. TRANS: Client error displayed trying to block a user from a group while user is already blocked from the given group.
-#: actions/groupblock.php:100
 #, fuzzy
 msgid "User is already blocked from group."
 msgstr "المستخدم ليس ممنوعًا من المجموعة."
 
 #. TRANS: Client error displayed trying to block a user from a group while user is not a member of given group.
-#: actions/groupblock.php:106
 msgid "User is not a member of group."
 msgstr "المستخدم ليس عضوًا في المجموعة."
 
 #. TRANS: Title for block user from group page.
 #. TRANS: Form legend for form to block user from a group.
-#: actions/groupblock.php:141 actions/groupmembers.php:364
 msgid "Block user from group"
 msgstr "امنع المستخدم من المجموعة"
 
 #. TRANS: Explanatory text for block user from group form before setting the block.
 #. TRANS: %1$s is that to be blocked user, %2$s is the group the user will be blocked from.
-#: actions/groupblock.php:169
 #, php-format
 msgid ""
 "Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They "
@@ -2971,40 +2359,33 @@ msgid ""
 msgstr ""
 
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
-#: actions/groupblock.php:191
 #, fuzzy
 msgid "Do not block this user from this group."
 msgstr "لا تمنع هذا المستخدم من هذه المجموعة"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
-#: actions/groupblock.php:198
 #, fuzzy
 msgid "Block this user from this group."
 msgstr "امنع هذا المستخدم من هذه المجموعة"
 
 #. TRANS: Server error displayed when trying to block a user from a group fails because of an application error.
-#: actions/groupblock.php:215
 msgid "Database error blocking user from group."
 msgstr "خطأ في قاعدة البيانات أثناء منع المستخدم من المجموعة."
 
 #. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
 #. TRANS: Client error displayed trying to find a user by ID without providing an ID.
-#: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr "لا هوية."
 
 #. TRANS: Client error displayed trying to change group design settings while not logged in.
-#: actions/groupdesignsettings.php:67
 msgid "You must be logged in to edit a group."
 msgstr "يجب أن تلج لتُعدّل المجموعات."
 
 #. TRANS: Title group design settings page.
-#: actions/groupdesignsettings.php:146
 msgid "Group design"
 msgstr "تصميم المجموعة"
 
 #. TRANS: Instructions for group design settings page.
-#: actions/groupdesignsettings.php:157
 #, fuzzy
 msgid ""
 "Customize the way your group looks with a background image and a colour "
@@ -3012,117 +2393,97 @@ msgid ""
 msgstr "خصّص أسلوب عرض ملفك بصورة خلفية ومخطط ألوان من اختيارك."
 
 #. TRANS: Form validation error displayed when group design settings could not be updated because of an application issue.
-#: actions/groupdesignsettings.php:262
 #, fuzzy
 msgid "Unable to update your design settings."
 msgstr "تعذّر حفظ إعدادات تصميمك."
 
 #. TRANS: Form text to confirm saved group design settings.
-#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:239
 msgid "Design preferences saved."
 msgstr "حُفظت تفضيلات التصميم."
 
 #. TRANS: Title for group logo settings page.
 #. TRANS: Group logo form legend.
-#: actions/grouplogo.php:144 actions/grouplogo.php:199
 msgid "Group logo"
 msgstr "شعار المجموعة"
 
 #. TRANS: Instructions for group logo page.
 #. TRANS: %s is the maximum file size for that site.
-#: actions/grouplogo.php:156
 #, php-format
 msgid ""
 "You can upload a logo image for your group. The maximum file size is %s."
 msgstr "بإمكانك رفع صورة شعار مجموعتك. أقصى حجم للملف هو %s."
 
 #. TRANS: Submit button for uploading a group logo.
-#: actions/grouplogo.php:243
 msgid "Upload"
 msgstr "ارفع"
 
 #. TRANS: Button text for cropping an uploaded group logo.
-#: actions/grouplogo.php:299
 #, fuzzy
 msgid "Crop"
 msgstr "مجموعات"
 
 #. TRANS: Form instructions on the group logo page.
-#: actions/grouplogo.php:376
 msgid "Pick a square area of the image to be the logo."
 msgstr "اختر منطقة مربعة من الصورة لتكون الشعار."
 
 #. TRANS: Form success message after updating a group logo.
-#: actions/grouplogo.php:411
 msgid "Logo updated."
 msgstr "حُدّث الشعار."
 
 #. TRANS: Form failure message after failing to update a group logo.
-#: actions/grouplogo.php:414
 msgid "Failed updating logo."
 msgstr "فشل رفع الشعار."
 
 #. TRANS: Title of the page showing group members.
 #. TRANS: %s is the name of the group.
-#: actions/groupmembers.php:104
 #, php-format
 msgid "%s group members"
 msgstr "أعضاء مجموعة %s"
 
 #. TRANS: Title of the page showing group members.
 #. TRANS: %1$s is the name of the group, %2$d is the page number of the members list.
-#: actions/groupmembers.php:109
 #, php-format
 msgid "%1$s group members, page %2$d"
 msgstr "%1$s أعضاء المجموعة, الصفحة %2$d"
 
 #. TRANS: Page notice for group members page.
-#: actions/groupmembers.php:125
 msgid "A list of the users in this group."
 msgstr "قائمة بمستخدمي هذه المجموعة."
 
 #. TRANS: Indicator in group members list that this user is a group administrator.
-#: actions/groupmembers.php:190 lib/action.php:581
 msgid "Admin"
 msgstr "إداري"
 
 #. TRANS: Button text for the form that will block a user from a group.
-#: actions/groupmembers.php:397
 msgctxt "BUTTON"
 msgid "Block"
 msgstr "امنع"
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:401
 msgctxt "TOOLTIP"
 msgid "Block this user"
 msgstr "امنع هذا المستخدم"
 
 #. TRANS: Form legend for form to make a user a group admin.
-#: actions/groupmembers.php:488
 msgid "Make user an admin of the group"
 msgstr "اجعل المستخدم إداريًا في المجموعة"
 
 #. TRANS: Button text for the form that will make a user administrator.
-#: actions/groupmembers.php:521
 msgctxt "BUTTON"
 msgid "Make Admin"
 msgstr "اجعله إداريًا"
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:525
 msgctxt "TOOLTIP"
 msgid "Make this user an admin"
 msgstr "اجعل هذا المستخدم إداريًا"
 
 #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
-#: actions/grouprss.php:141
 #, fuzzy, php-format
 msgid "Updates from members of %1$s on %2$s!"
 msgstr "الإشعارات التي فضلها %1$s في %2$s!"
 
 #. TRANS: Title for first page of the groups list.
-#: actions/groups.php:62
 #, fuzzy
 msgctxt "TITLE"
 msgid "Groups"
@@ -3130,7 +2491,6 @@ msgstr "مجموعات"
 
 #. TRANS: Title for all but the first page of the groups list.
 #. TRANS: %d is the page number.
-#: actions/groups.php:66
 #, fuzzy, php-format
 msgctxt "TITLE"
 msgid "Groups, page %d"
@@ -3139,7 +2499,6 @@ msgstr "المجموعات، صفحة %d"
 #. TRANS: Page notice of group list. %%%%site.name%%%% is the StatusNet site name,
 #. TRANS: %%%%action.groupsearch%%%% and %%%%action.newgroup%%%% are URLs. Do not change them.
 #. TRANS: This message contains Markdown links in the form [link text](link).
-#: actions/groups.php:95
 #, fuzzy, php-format
 msgid ""
 "%%%%site.name%%%% groups let you find and talk with people of similar "
@@ -3154,12 +2513,10 @@ msgstr ""
 "%%action.groupsearch%%%%) أو [ابدأ مجموعتك!](%%%%action.newgroup%%%%)"
 
 #. TRANS: Link to create a new group on the group list page.
-#: actions/groups.php:113 actions/usergroups.php:126 lib/groupeditform.php:115
 msgid "Create a new group"
 msgstr "أنشئ مجموعة جديدة"
 
 #. TRANS: Instructions for page where groups can be searched. %%site.name%% is the name of the StatusNet site.
-#: actions/groupsearch.php:53
 #, php-format
 msgid ""
 "Search for groups on %%site.name%% by their name, location, or description. "
@@ -3169,21 +2526,17 @@ msgstr ""
 "عبارات البحث بمسافات؛ ويجب أن تتكون تلك العبارات من 3 أحرف أو أكثر."
 
 #. TRANS: Title for page where groups can be searched.
-#: actions/groupsearch.php:60
 msgid "Group search"
 msgstr "بحث في المجموعات"
 
 #. TRANS: Text on page where groups can be searched if no results were found for a query.
 #. TRANS: Text for notice search results is the query had no results.
 #. TRANS: Message on the "People search" page where a query has no results.
-#: actions/groupsearch.php:82 actions/noticesearch.php:122
-#: actions/peoplesearch.php:87
 msgid "No results."
 msgstr "لا نتائج."
 
 #. TRANS: Additional text on page where groups can be searched if no results were found for a query for a logged in user.
 #. TRANS: This message contains Markdown links in the form [link text](link).
-#: actions/groupsearch.php:87
 #, php-format
 msgid ""
 "If you cannot find the group you're looking for, you can [create it](%%"
@@ -3192,7 +2545,6 @@ msgstr ""
 
 #. TRANS: Additional text on page where groups can be searched if no results were found for a query for a not logged in user.
 #. TRANS: This message contains Markdown links in the form [link text](link).
-#: actions/groupsearch.php:92
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and [create the group](%%"
@@ -3200,30 +2552,25 @@ msgid ""
 msgstr ""
 
 #. TRANS: Client error displayed when trying to unblock a user from a group without being an administrator for the group.
-#: actions/groupunblock.php:95
 msgid "Only an admin can unblock group members."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to unblock a non-blocked user from a group.
-#: actions/groupunblock.php:100
 msgid "User is not blocked from group."
 msgstr "المستخدم ليس ممنوعًا من المجموعة."
 
 #. TRANS: Server error displayed when unblocking a user from a group fails because of an unknown error.
 #. TRANS: Server error displayed when removing a user block.
-#: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "خطأ أثناء منع الحجب."
 
 #. TRANS: Title for Instant Messaging settings.
-#: actions/imsettings.php:56
 msgid "IM settings"
 msgstr "إعدادات المراسلة الفورية"
 
 #. 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.
-#: actions/imsettings.php:69
 #, php-format
 msgid ""
 "You can send and receive notices through instant messaging [instant messages]"
@@ -3231,188 +2578,156 @@ msgid ""
 msgstr ""
 
 #. TRANS: Message given in the IM settings if IM is not enabled on the site.
-#: actions/imsettings.php:90
 msgid "IM is not available."
 msgstr "المراسلة الفورية غير متوفرة."
 
-#: actions/imsettings.php:116
 #, fuzzy, php-format
 msgid "Current confirmed %s address."
 msgstr "عنوان البريد الإلكتروني المُؤكد الحالي."
 
 #. TRANS: Form note in IM settings form.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:128
 #, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your %s account for a message "
 "with further instructions. (Did you add %s to your buddy list?)"
 msgstr ""
 
-#: actions/imsettings.php:140
 msgid "IM address"
 msgstr "عنوان المراسلة الفورية"
 
-#: actions/imsettings.php:142
 #, php-format
 msgid "%s screenname."
 msgstr ""
 
 #. TRANS: Header for IM preferences form.
-#: actions/imsettings.php:163
 #, fuzzy
 msgid "IM Preferences"
 msgstr "تفضيلات المحادثة الفورية"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:174
 #, fuzzy
 msgid "Send me notices"
 msgstr "أرسل إشعارًا"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:176
 msgid "Post a notice when my status changes."
 msgstr ""
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:178
 msgid "Send me replies from people I'm not subscribed to."
 msgstr ""
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:181
 #, fuzzy
 msgid "Publish a MicroID"
 msgstr "انشر هوية مصغّرة لعنوان بريدي الإلكتروني."
 
 #. TRANS: Server error thrown on database error updating IM preferences.
-#: actions/imsettings.php:291
 #, fuzzy
 msgid "Couldn't update IM preferences."
 msgstr "تعذّر تحديث المستخدم."
 
 #. TRANS: Confirmation message for successful IM preferences save.
 #. TRANS: Confirmation message after saving preferences.
-#: actions/imsettings.php:298 actions/urlsettings.php:244
 msgid "Preferences saved."
 msgstr "حُفِظت التفضيلات."
 
 #. TRANS: Message given saving IM address without having provided one.
-#: actions/imsettings.php:320
 #, fuzzy
 msgid "No screenname."
 msgstr "لا اسم مستعار."
 
-#: actions/imsettings.php:325
 #, fuzzy
 msgid "No transport."
 msgstr "لا ملاحظة."
 
 #. TRANS: Message given saving IM address that cannot be normalised.
-#: actions/imsettings.php:333
 #, fuzzy
 msgid "Cannot normalize that screenname"
 msgstr "ليست هوية جابر صالحة"
 
 #. TRANS: Message given saving IM address that not valid.
-#: actions/imsettings.php:340
 #, fuzzy
 msgid "Not a valid screenname"
 msgstr "ليس اسمًا مستعارًا صحيحًا."
 
 #. TRANS: Message given saving IM address that is already set for another user.
-#: actions/imsettings.php:344
 #, fuzzy
 msgid "Screenname already belongs to another user."
 msgstr "هذا البريد الإلكتروني ملك مستخدم آخر بالفعل."
 
 #. TRANS: Message given saving valid IM address that is to be confirmed.
-#: actions/imsettings.php:369
 #, fuzzy
 msgid "A confirmation code was sent to the IM address you added."
 msgstr "رمز التأكيد ليس لك!"
 
 #. TRANS: Message given canceling IM address confirmation for the wrong IM address.
-#: actions/imsettings.php:396
 msgid "That is the wrong IM address."
 msgstr "هذا عنوان محادثة فورية خاطئ."
 
 #. TRANS: Server error thrown on database error canceling IM address confirmation.
-#: actions/imsettings.php:405
 #, fuzzy
 msgid "Couldn't delete confirmation."
 msgstr "تعذّر حذف تأكيد البريد المراسلة الفورية."
 
 #. TRANS: Message given after successfully canceling IM address confirmation.
-#: actions/imsettings.php:410
 msgid "IM confirmation cancelled."
 msgstr "أُلغي تأكيد المراسلة الفورية."
 
 #. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.
-#: actions/imsettings.php:434
 #, fuzzy
 msgid "That is not your screenname."
 msgstr "هذا ليس رقم هاتفك."
 
 #. TRANS: Server error thrown on database error removing a registered IM address.
-#: actions/imsettings.php:443
 #, fuzzy
 msgid "Couldn't update user im prefs."
 msgstr "تعذّر تحديث سجل المستخدم."
 
 #. TRANS: Message given after successfully removing a registered Instant Messaging address.
-#: actions/imsettings.php:451
 msgid "The IM address was removed."
 msgstr "أزيل عنوان المراسلة الفورية هذا."
 
 #. TRANS: Title for all but the first page of the inbox page.
 #. TRANS: %1$s is the user's nickname, %2$s is the page number.
-#: actions/inbox.php:59
 #, php-format
 msgid "Inbox for %1$s - page %2$d"
 msgstr "صندوق %1$s الوارد - صفحة %2$d"
 
 #. TRANS: Title for the first page of the inbox page.
 #. TRANS: %s is the user's nickname.
-#: actions/inbox.php:64
 #, php-format
 msgid "Inbox for %s"
 msgstr "صندوق %s الوارد"
 
 #. TRANS: Instructions for user inbox page.
-#: actions/inbox.php:106
 msgid "This is your inbox, which lists your incoming private messages."
 msgstr "هذا صندوق بريدك الوارد، والذي يسرد رسائلك الخاصة الواردة."
 
 #. TRANS: Client error displayed when trying to sent invites while they have been disabled.
-#: actions/invite.php:41
 msgid "Invites have been disabled."
 msgstr "تم تعطيل الدعوات."
 
 #. TRANS: Client error displayed when trying to sent invites while not logged in.
 #. TRANS: %s is the StatusNet site name.
-#: actions/invite.php:45
 #, fuzzy, php-format
 msgid "You must be logged in to invite other users to use %s."
 msgstr "يجب أن تلج لتُعدّل المجموعات."
 
 #. TRANS: Form validation message when providing an e-mail address that does not validate.
 #. TRANS: %s is an invalid e-mail address.
-#: actions/invite.php:78
 #, fuzzy, php-format
 msgid "Invalid email address: %s."
 msgstr "عنوان بريد إلكتروني غير صالح: %s"
 
 #. TRANS: Page title when invitations have been sent.
-#: actions/invite.php:117
 #, fuzzy
 msgid "Invitations sent"
 msgstr "أُرسلت الدعوة"
 
 #. TRANS: Page title when inviting potential users.
-#: actions/invite.php:120
 msgid "Invite new users"
 msgstr "دعوة مستخدمين جدد"
 
@@ -3420,7 +2735,6 @@ msgstr "دعوة مستخدمين جدد"
 #. TRANS: is already subscribed to one or more users with the given e-mail address(es).
 #. TRANS: Plural form is based on the number of reported already subscribed e-mail addresses.
 #. TRANS: Followed by a bullet list.
-#: actions/invite.php:140
 #, fuzzy
 msgid "You are already subscribed to this user:"
 msgid_plural "You are already subscribed to these users:"
@@ -3433,7 +2747,6 @@ msgstr[5] "لست مشتركًا بأحد."
 
 #. TRANS: Used as list item for already subscribed users (%1$s is nickname, %2$s is e-mail address).
 #. TRANS: Used as list item for already registered people (%1$s is nickname, %2$s is e-mail address).
-#: actions/invite.php:146 actions/invite.php:160
 #, fuzzy, php-format
 msgctxt "INVITE"
 msgid "%1$s (%2$s)"
@@ -3442,7 +2755,6 @@ msgstr "%1$s (%2$s)"
 #. TRANS: Message displayed inviting users to use a StatusNet site while the invited user
 #. TRANS: already uses a this StatusNet site. Plural form is based on the number of
 #. TRANS: reported already present people. Followed by a bullet list.
-#: actions/invite.php:154
 msgid "This person is already a user and you were automatically subscribed:"
 msgid_plural ""
 "These people are already users and you were automatically subscribed to them:"
@@ -3456,7 +2768,6 @@ msgstr[5] ""
 #. TRANS: Message displayed inviting users to use a StatusNet site. Plural form is
 #. TRANS: based on the number of invitations sent. Followed by a bullet list of
 #. TRANS: e-mail addresses to which invitations were sent.
-#: actions/invite.php:168
 msgid "Invitation sent to the following person:"
 msgid_plural "Invitations sent to the following people:"
 msgstr[0] ""
@@ -3468,40 +2779,34 @@ msgstr[5] ""
 
 #. TRANS: Generic message displayed after sending out one or more invitations to
 #. TRANS: people to join a StatusNet site.
-#: actions/invite.php:178
 msgid ""
 "You will be notified when your invitees accept the invitation and register "
 "on the site. Thanks for growing the community!"
 msgstr ""
 
 #. TRANS: Form instructions.
-#: actions/invite.php:191
 msgid ""
 "Use this form to invite your friends and colleagues to use this service."
 msgstr "استخدم هذا النموذج لدعوة أصدقائك وزملائك لاستخدام هذه الخدمة."
 
 #. TRANS: Field label for a list of e-mail addresses.
-#: actions/invite.php:218
 msgid "Email addresses"
 msgstr "عناوين البريد الإلكتروني"
 
 #. TRANS: Tooltip for field label for a list of e-mail addresses.
-#: actions/invite.php:221
 msgid "Addresses of friends to invite (one per line)."
 msgstr ""
 
 #. TRANS: Field label for a personal message to send to invitees.
-#: actions/invite.php:225
 msgid "Personal message"
 msgstr "رسالة شخصية"
 
 #. TRANS: Tooltip for field label for a personal message to send to invitees.
-#: actions/invite.php:228
 msgid "Optionally add a personal message to the invitation."
 msgstr ""
 
 #. TRANS: Send button for inviting friends
-#: actions/invite.php:232
+#. TRANS: Button text for sending notice.
 msgctxt "BUTTON"
 msgid "Send"
 msgstr "أرسل"
@@ -3509,7 +2814,6 @@ msgstr "أرسل"
 #. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral
 #. TRANS: singular 3rd-person pronoun in English. %1$s is the inviting user, $2$s is
 #. TRANS: the StatusNet sitename.
-#: actions/invite.php:264
 #, fuzzy, php-format
 msgid "%1$s has invited you to join them on %2$s"
 msgstr "%1$s يستمع الآن إلى إشعاراتك على %2$s."
@@ -3519,7 +2823,6 @@ msgstr "%1$s يستمع الآن إلى إشعاراتك على %2$s."
 #. TRANS: StatusNet sitename, %3$s is the site URL, %4$s is the personal message from the
 #. TRANS: inviting user, %s%5 a link to the timeline for the inviting user, %s$6 is a link
 #. TRANS: to register with the StatusNet site.
-#: actions/invite.php:271
 #, php-format
 msgid ""
 "%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -3551,321 +2854,311 @@ msgid ""
 msgstr ""
 
 #. TRANS: Client error displayed when trying to join a group while not logged in.
-#: actions/joingroup.php:59
 msgid "You must be logged in to join a group."
 msgstr "يجب أن تلج لتنضم إلى مجموعة."
 
 #. TRANS: Title for join group page after joining.
-#: actions/joingroup.php:148
 #, fuzzy, php-format
 msgctxt "TITLE"
 msgid "%1$s joined group %2$s"
 msgstr "%1$s انضم للمجموعة %2$s"
 
 #. TRANS: Client error displayed when trying to leave a group while not logged in.
-#: actions/leavegroup.php:59
 msgid "You must be logged in to leave a group."
 msgstr "يجب أن تلج لتغادر مجموعة."
 
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
-#: actions/leavegroup.php:103 lib/command.php:398
 msgid "You are not a member of that group."
 msgstr "لست عضوا في تلك المجموعة."
 
 #. TRANS: Title for leave group page after leaving.
-#: actions/leavegroup.php:142
 #, fuzzy, php-format
 msgctxt "TITLE"
 msgid "%1$s left group %2$s"
 msgstr "%1$s ترك المجموعة %2$s"
 
 #. TRANS: User admin panel title
-#: actions/licenseadminpanel.php:55
 msgctxt "TITLE"
 msgid "License"
 msgstr ""
 
-#: actions/licenseadminpanel.php:65
+#. TRANS: Form instructions for the site license admin panel.
 msgid "License for this StatusNet site"
 msgstr ""
 
-#: actions/licenseadminpanel.php:134
+#. TRANS: Client error displayed selecting an invalid license in the license admin panel.
 msgid "Invalid license selection."
 msgstr ""
 
-#: actions/licenseadminpanel.php:144
+#. TRANS: Client error displayed when not specifying an owner for the all rights reserved license in the license admin panel.
 msgid ""
 "You must specify the owner of the content when using the All Rights Reserved "
 "license."
 msgstr ""
 
-#: actions/licenseadminpanel.php:151
+#. TRANS: Client error displayed selecting a too long license title in the license admin panel.
 #, fuzzy
 msgid "Invalid license title. Maximum length is 255 characters."
 msgstr "رسالة ترحيب غير صالحة. أقصى طول هو 255 حرف."
 
-#: actions/licenseadminpanel.php:163
+#. TRANS: Client error displayed specifying an invalid license URL in the license admin panel.
 msgid "Invalid license URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:166
+#. TRANS: Client error displayed specifying an invalid license image URL in the license admin panel.
 msgid "Invalid license image URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:174
+#. TRANS: Client error displayed specifying an invalid license URL in the license admin panel.
 msgid "License URL must be blank or a valid URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:182
+#. TRANS: Client error displayed specifying an invalid license image URL in the license admin panel.
 msgid "License image must be blank or valid URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:232
+#. TRANS: Form legend in the license admin panel.
 msgid "License selection"
 msgstr ""
 
-#: actions/licenseadminpanel.php:238
+#. TRANS: License option in the license admin panel.
 msgid "Private"
 msgstr "خاص"
 
-#: actions/licenseadminpanel.php:239
+#. TRANS: License option in the license admin panel.
 msgid "All Rights Reserved"
 msgstr "جميع الحقوق محفوظة"
 
-#: actions/licenseadminpanel.php:240
+#. TRANS: License option in the license admin panel.
 msgid "Creative Commons"
 msgstr "المشاع المبدع"
 
-#: actions/licenseadminpanel.php:245
+#. TRANS: Dropdown field label in the license admin panel.
 msgid "Type"
 msgstr "النوع"
 
-#: actions/licenseadminpanel.php:247
-msgid "Select license"
+#. TRANS: Dropdown field instructions in the license admin panel.
+#, fuzzy
+msgid "Select a license."
 msgstr "اختر رخصة"
 
-#: actions/licenseadminpanel.php:261
+#. TRANS: Form legend in the license admin panel.
 msgid "License details"
 msgstr ""
 
-#: actions/licenseadminpanel.php:267
+#. TRANS: Field label in the license admin panel.
 msgid "Owner"
 msgstr ""
 
-#: actions/licenseadminpanel.php:268
+#. TRANS: Field title in the license admin panel.
 msgid "Name of the owner of the site's content (if applicable)."
 msgstr ""
 
-#: actions/licenseadminpanel.php:276
+#. TRANS: Field label in the license admin panel.
 msgid "License Title"
 msgstr ""
 
-#: actions/licenseadminpanel.php:277
+#. TRANS: Field title in the license admin panel.
 msgid "The title of the license."
 msgstr ""
 
-#: actions/licenseadminpanel.php:285
+#. TRANS: Field label in the license admin panel.
 msgid "License URL"
-msgstr ""
+msgstr "مسار الرخصة"
 
-#: actions/licenseadminpanel.php:286
+#. TRANS: Field title in the license admin panel.
 msgid "URL for more information about the license."
-msgstr ""
+msgstr "مسار مزيد من المعلومات عن الرخصة."
 
-#: actions/licenseadminpanel.php:293
+#. TRANS: Field label in the license admin panel.
 msgid "License Image URL"
-msgstr ""
+msgstr "مسار صورة الرخصة"
 
-#: actions/licenseadminpanel.php:294
+#. TRANS: Field title in the license admin panel.
 msgid "URL for an image to display with the license."
-msgstr ""
+msgstr "مسار الصورة التي ستعرض مع الرخصة."
 
-#. TRANS: Submit button title.
-#: actions/licenseadminpanel.php:311 actions/sessionsadminpanel.php:199
-#: actions/siteadminpanel.php:292 actions/snapshotadminpanel.php:245
-#: actions/tagother.php:133 lib/applicationeditform.php:357
-msgid "Save"
-msgstr "أرسل"
-
-#: actions/licenseadminpanel.php:311
-msgid "Save license settings"
-msgstr ""
+#. TRANS: Button title in the license admin panel.
+#, fuzzy
+msgid "Save license settings."
+msgstr "احفظ إعدادات الرخصة"
 
+#. TRANS: Client error displayed when trying to log in while already logged in.
 #. TRANS: Client error displayed trying to use "one time password login" when already logged in.
-#: actions/login.php:97 actions/otp.php:62 actions/register.php:130
 msgid "Already logged in."
 msgstr "والج بالفعل."
 
-#: actions/login.php:125
+#. TRANS: Form validation error displayed when trying to log in with incorrect credentials.
 msgid "Incorrect username or password."
 msgstr "اسم المستخدم أو كلمة السر غير صحيحان."
 
+#. TRANS: Server error displayed when during login a server error occurs.
 #. TRANS: Server error displayed when a user object could not be created trying to login using "one time password login".
-#: actions/login.php:131 actions/otp.php:127
 msgid "Error setting user. You are probably not authorized."
 msgstr "خطأ أثناء ضبط المستخدم. لست مُصرحًا على الأرجح."
 
-#: actions/login.php:185 actions/login.php:236 lib/action.php:598
+#. TRANS: Page title for login page.
 msgid "Login"
 msgstr "لُج"
 
-#: actions/login.php:222
+#. TRANS: Form legend on login page.
 msgid "Login to site"
 msgstr "لُج إلى الموقع"
 
-#: actions/login.php:231 actions/register.php:469
+#. TRANS: Checkbox label label on login page.
 msgid "Remember me"
 msgstr "تذكّرني"
 
-#: actions/login.php:232 actions/register.php:471
+#. TRANS: Checkbox title on login page.
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "لُج تلقائيًا في المستقبل؛ هذا الخيار ليس مُعدًا للحواسيب المشتركة!"
 
-#: actions/login.php:241
+#. TRANS: Button text for log in on login page.
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Login"
+msgstr "لُج"
+
+#. TRANS: Link text for link to "reset password" on login page.
 msgid "Lost or forgotten password?"
 msgstr "أنسيت كلمة السر؟"
 
-#: actions/login.php:259
+#. TRANS: Form instructions on login page before being able to change user settings.
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
 msgstr ""
 "لأسباب أمنية، من فضلك أعد إدخال اسم مستخدمك وكلمة سرك قبل تغيير إعداداتك."
 
-#: actions/login.php:263
-#, fuzzy
+#. TRANS: Form instructions on login page.
 msgid "Login with your username and password."
-msgstr "لُج باسم مستخدم وكلمة سر"
+msgstr "ادخل باسم مستخدمك وكلمة سرك."
 
-#: actions/login.php:266
+#. TRANS: Form instructions on login page. This message contains Markdown links in the form [Link text](Link).
+#. TRANS: %%action.register%% is a link to the registration page.
 #, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
-msgstr ""
+msgstr "ليس لديك حساب؟ [سجل](%%action.register%%) حسابًا جديدًا"
 
-#: actions/makeadmin.php:92
+#. TRANS: Client error displayed when trying to make another user admin on the Make Admin page while not an admin.
 msgid "Only an admin can make another user an admin."
-msgstr ""
+msgstr "يمكن فقط للإداري أن يجعل مستخدمًا آخرًا إداريًا."
 
-#: actions/makeadmin.php:96
-#, fuzzy, php-format
+#. TRANS: Client error displayed when trying to make another user admin on the Make Admin page who already is admin.
+#. TRANS: %1$s is the user that is already admin, %2$s is the group user is already admin for.
+#, php-format
 msgid "%1$s is already an admin for group \"%2$s\"."
-msgstr "لم يمكن جعل %1$s إداريا للمجموعة %2$s."
+msgstr "%1$s إداري بالفعل لمجموعة \"%2$s\"."
 
-#: actions/makeadmin.php:133
+#. TRANS: Server error displayed when trying to make another user admin on the Make Admin page fails
+#. TRANS: because the group membership record could not be gotten.
+#. TRANS: %1$s is the to be admin user, %2$s is the group user should be admin for.
 #, php-format
 msgid "Can't get membership record for %1$s in group %2$s."
 msgstr "لم يمكن الحصول على تسجيل العضوية ل%1$s في المجموعة %2$s."
 
-#: actions/makeadmin.php:146
+#. TRANS: Server error displayed when trying to make another user admin on the Make Admin page fails
+#. TRANS: because the group adminship record coud not be saved properly.
+#. TRANS: %1$s is the to be admin user, %2$s is the group user is already admin for.
 #, php-format
 msgid "Can't make %1$s an admin for group %2$s."
 msgstr "لم يمكن جعل %1$s إداريا للمجموعة %2$s."
 
-#: actions/microsummary.php:69
+#. TRANS: Client error displayed trying to make a micro summary without providing a status.
 msgid "No current status."
 msgstr "لا حالة جارية."
 
 #. TRANS: This is the title of the form for adding a new application.
-#: actions/newapplication.php:52
 msgid "New application"
 msgstr "تطبيق جديد"
 
 #. TRANS: Client error displayed trying to add a new application while not logged in.
-#: actions/newapplication.php:64
 msgid "You must be logged in to register an application."
 msgstr "يجب أن تكون مسجل الدخول لتسجل تطبيقا."
 
 #. TRANS: Form instructions for registering a new application.
-#: actions/newapplication.php:147
 msgid "Use this form to register a new application."
 msgstr "استخدم هذا النموذج لتسجل تطبيقا جديدا."
 
 #. TRANS: Validation error shown when not providing a source URL in the "New application" form.
-#: actions/newapplication.php:189
 #, fuzzy
 msgid "Source URL is required."
 msgstr "مسار المصدر ليس صحيحا."
 
 #. TRANS: Server error displayed when an application could not be registered in the database through the "New application" form.
-#: actions/newapplication.php:279 actions/newapplication.php:289
 msgid "Could not create application."
 msgstr "لم يمكن إنشاء التطبيق."
 
 #. TRANS: Title for form to create a group.
-#: actions/newgroup.php:53
 msgid "New group"
 msgstr "مجموعة جديدة"
 
 #. TRANS: Client exception thrown when a user tries to create a group while banned.
-#: actions/newgroup.php:73 classes/User_group.php:485
 #, fuzzy
 msgid "You are not allowed to create groups on this site."
 msgstr "لست عضوًا في هذه المجموعة"
 
 #. TRANS: Form instructions for group create form.
-#: actions/newgroup.php:117
 msgid "Use this form to create a new group."
 msgstr "استخدم هذا النموذج لإنشاء مجموعة جديدة."
 
-#. TRANS: Group create form validation error.
-#: actions/newgroup.php:200
-msgid "Alias cannot be the same as nickname."
-msgstr ""
-
-#: actions/newmessage.php:71 actions/newmessage.php:234
+#. TRANS: Page title for new direct message page.
+#. TRANS: Page title on page for sending a direct message.
 msgid "New message"
 msgstr "رسالة جديدة"
 
-#. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
-#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:513
-msgid "You can't send a message to this user."
+#. TRANS: Client error displayed trying to send a direct message to a user while sender and
+#. TRANS: receiver are not subscribed to each other.
+#, fuzzy
+msgid "You cannot send a message to this user."
 msgstr "لا يمكنك إرسال رسائل إلى هذا المستخدم."
 
+#. TRANS: Form validator error displayed trying to send a direct message without content.
+#. TRANS: Client error displayed trying to send a notice without content.
 #. TRANS: Command exception text shown when trying to send a direct message to another user without content.
 #. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
-#: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:490
-#: lib/command.php:593
 msgid "No content!"
 msgstr "لا محتوى!"
 
-#: actions/newmessage.php:161
+#. TRANS: Form validation error displayed trying to send a direct message without specifying a recipient.
 msgid "No recipient specified."
 msgstr "لا مستلم حُدّد."
 
+#. TRANS: Client error displayed trying to send a direct message to self.
 #. TRANS: Error text shown when trying to send a direct message to self.
-#: actions/newmessage.php:167 lib/command.php:517
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr "لا ترسل رسالة إلى نفسك، قلها لنفسك في سرك بدلًا من ذلك."
 
-#: actions/newmessage.php:184
+#. TRANS: Page title after sending a direct message.
 msgid "Message sent"
 msgstr "أُرسلت الرسالة"
 
+#. TRANS: Confirmation text after sending a direct message.
+#. TRANS: %s is the direct message recipient.
 #. TRANS: Message given have sent a direct message to another user.
 #. TRANS: %s is the name of the other user.
-#: actions/newmessage.php:188 lib/command.php:525
 #, php-format
 msgid "Direct message to %s sent."
 msgstr "رسالة مباشرة ل%s تم إرسالها."
 
-#: actions/newmessage.php:213 actions/newnotice.php:264
+#. TRANS: Page title after an AJAX error occurred on the "send direct message" page.
+#. TRANS: Page title after an AJAX error occurs on the send notice page.
 msgid "Ajax Error"
 msgstr "خطأ أجاكس"
 
-#: actions/newnotice.php:69
+#. TRANS: Page title for sending a new notice.
 msgid "New notice"
 msgstr "إشعار جديد"
 
-#: actions/newnotice.php:230
+#. TRANS: Page title after sending a notice.
 msgid "Notice posted"
 msgstr "أُرسل الإشعار"
 
 #. TRANS: Instructions for Notice search page.
 #. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/noticesearch.php:69
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -3875,20 +3168,17 @@ msgstr ""
 "ويجب أن تتكون هذه العبارات من 3 أحرف أو أكثر."
 
 #. TRANS: Title of the page where users can search for notices.
-#: actions/noticesearch.php:80
 msgid "Text search"
 msgstr "بحث في النصوص"
 
 #. TRANS: Test in RSS notice search.
 #. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearch.php:95
 #, php-format
 msgid "Search results for \"%1$s\" on %2$s"
 msgstr "نتائج البحث ل\"%1$s\" على %2$s"
 
 #. TRANS: Text for logged in users making a query for notices without results.
 #. TRANS: This message contains a Markdown link.
-#: actions/noticesearch.php:128
 #, php-format
 msgid ""
 "Be the first to [post on this topic](%%%%action.newnotice%%%%?"
@@ -3897,7 +3187,6 @@ msgstr ""
 
 #. TRANS: Text for not logged in users making a query for notices without results.
 #. TRANS: This message contains Markdown links.
-#: actions/noticesearch.php:133
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and be the first to "
@@ -3905,79 +3194,67 @@ msgid ""
 msgstr ""
 
 #. TRANS: RSS notice search feed title. %s is the query.
-#: actions/noticesearchrss.php:95
 #, php-format
 msgid "Updates with \"%s\""
 msgstr ""
 
 #. TRANS: RSS notice search feed description.
 #. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearchrss.php:99
 #, fuzzy, php-format
 msgid "Updates matching search term \"%1$s\" on %2$s."
 msgstr "الإشعارات التي فضلها %1$s في %2$s!"
 
-#: actions/nudge.php:85
+#. TRANS: Client error displayed trying to nudge a user that cannot be nudged.
 msgid ""
 "This user doesn't allow nudges or hasn't confirmed or set their email "
 "address yet."
 msgstr ""
 
-#: actions/nudge.php:94
+#. TRANS: Page title after sending a nudge.
 msgid "Nudge sent"
 msgstr "أرسل التنبيه"
 
-#: actions/nudge.php:97
+#. TRANS: Confirmation text after sending a nudge.
 msgid "Nudge sent!"
 msgstr "أُرسل التنبيه!"
 
 #. TRANS: Message displayed to an anonymous user trying to view OAuth application list.
-#: actions/oauthappssettings.php:57
 msgid "You must be logged in to list your applications."
 msgstr "يجب أن تكون مسجل الدخول لعرض تطبيقاتك."
 
 #. TRANS: Page title for OAuth applications
-#: actions/oauthappssettings.php:73
 msgid "OAuth applications"
 msgstr "تطبيقات OAuth"
 
 #. TRANS: Page instructions for OAuth applications
-#: actions/oauthappssettings.php:85
 msgid "Applications you have registered"
-msgstr ""
+msgstr "التطبيقات التي سجلتها"
 
 #. TRANS: Empty list message on page with OAuth applications.
-#: actions/oauthappssettings.php:138
-#, fuzzy, php-format
+#, php-format
 msgid "You have not registered any applications yet."
-msgstr "يجب أن تكون مسجل الدخول لتسجل تطبيقا."
+msgstr "لم تسجل أي تطبيق إلى الآن."
 
 #. TRANS: Title for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:69
-#, fuzzy
 msgid "Connected applications"
-msgstr "احذف هذا التطبيق"
+msgstr "التطبيقات المتصلة"
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:80
 msgid "The following connections exist for your account."
 msgstr ""
 
 #. TRANS: Client error when trying to revoke access for an application while not being a user of it.
-#: actions/oauthconnectionssettings.php:165
 msgid "You are not a user of that application."
 msgstr "لست مستخدما لهذا التطبيق."
 
 #. TRANS: Client error when revoking access has failed for some reason.
 #. TRANS: %s is the application ID revoking access failed for.
-#: actions/oauthconnectionssettings.php:180
 #, fuzzy, php-format
 msgid "Unable to revoke access for application: %s."
 msgstr "استخدم هذا النموذج لتعدل تطبيقك."
 
 #. TRANS: Success message after revoking access for an application.
 #. TRANS: %1$s is the application name, %2$s is the first part of the user token.
-#: actions/oauthconnectionssettings.php:199
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -3985,473 +3262,390 @@ msgid ""
 msgstr ""
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:210
 msgid "You have not authorized any applications to use your account."
 msgstr ""
 
 #. TRANS: Note for developers in the OAuth connection settings form.
 #. TRANS: This message contains a Markdown link. Do not separate "](".
 #. TRANS: %s is the URL to the OAuth settings.
-#: actions/oauthconnectionssettings.php:230
 #, php-format
 msgid ""
 "Are you a developer? [Register an OAuth client application](%s) to use with "
 "this instance of StatusNet."
 msgstr ""
 
-#: actions/oembed.php:64
+#. TRANS: Server error displayed in oEmbed action when path not found.
+#. TRANS: %s is a path.
 #, fuzzy, php-format
 msgid "\"%s\" not found."
 msgstr "لم يُعثرعلى المستخدم."
 
-#: actions/oembed.php:76
+#. TRANS: Server error displayed in oEmbed action when notice not found.
+#. TRANS: %s is a notice.
 #, fuzzy, php-format
 msgid "Notice %s not found."
 msgstr "لم يتم العثور على وسيلة API."
 
-#: actions/oembed.php:80 actions/shownotice.php:100
+#. TRANS: Server error displayed in oEmbed action when notice has not profile.
 #, fuzzy
 msgid "Notice has no profile."
 msgstr "ليس للمستخدم ملف شخصي."
 
-#: actions/oembed.php:83 actions/shownotice.php:172
+#. TRANS: oEmbed title. %1$s is the author name, %2$s is the creation date.
 #, php-format
 msgid "%1$s's status on %2$s"
 msgstr "حالة %1$s في يوم %2$s"
 
-#: actions/oembed.php:95
+#. TRANS: Server error displayed in oEmbed action when attachment not found.
+#. TRANS: %d is an attachment ID.
 #, fuzzy, php-format
 msgid "Attachment %s not found."
 msgstr "لم يُعثر على المستخدم المستلم."
 
-#: actions/oembed.php:136
+#. TRANS: Server error displayed in oEmbed request when a path is not supported.
+#. TRANS: %s is a path.
 #, php-format
 msgid "\"%s\" not supported for oembed requests."
 msgstr ""
 
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
-#: actions/oembed.php:168
 #, fuzzy, php-format
 msgid "Content type %s not supported."
 msgstr "نوع المحتوى "
 
 #. TRANS: Error message displaying attachments. %s is the site's base URL.
-#: actions/oembed.php:172
 #, php-format
 msgid "Only %s URLs over plain HTTP please."
 msgstr ""
 
+#. TRANS: Server error displayed in oEmbed action when request specifies an unsupported data format.
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1207
-#: lib/apiaction.php:1234 lib/apiaction.php:1369
 msgid "Not a supported data format."
 msgstr "ليس نسق بيانات مدعوم."
 
 #. TRANS: ShortName in the OpenSearch interface when trying to find users.
-#: actions/opensearch.php:64
 msgid "People Search"
 msgstr "بحث في الأشخاص"
 
-#: actions/opensearch.php:68
+#. TRANS: ShortName in the OpenSearch interface when trying to find notices.
 msgid "Notice Search"
 msgstr "بحث الإشعارات"
 
 #. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
-#: actions/otp.php:70
 msgid "No user ID specified."
 msgstr "لا هوية مستخدم محددة."
 
 #. TRANS: Client error displayed trying to use "one time password login" without specifying a login token.
-#: actions/otp.php:86
 msgid "No login token specified."
 msgstr "لا محتوى دخول محدد."
 
 #. TRANS: Client error displayed trying to use "one time password login" without requesting a login token.
-#: actions/otp.php:94
 msgid "No login token requested."
 msgstr "لا طلب استيثاق."
 
 #. TRANS: Client error displayed trying to use "one time password login" while specifying an invalid login token.
-#: actions/otp.php:100
 msgid "Invalid login token specified."
 msgstr "توكن دخول غير صحيح محدد."
 
 #. TRANS: Client error displayed trying to use "one time password login" while specifying an expired login token.
-#: actions/otp.php:110
 msgid "Login token expired."
 msgstr "توكن الدخول انتهى."
 
 #. TRANS: Title for outbox for any but the fist page.
 #. TRANS: %1$s is the user nickname, %2$d is the page number.
-#: actions/outbox.php:57
 #, php-format
 msgid "Outbox for %1$s - page %2$d"
 msgstr "صندوق %1$s الصادر - صفحة %2$d"
 
 #. TRANS: Title for first page of outbox.
-#: actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
 msgstr "صندوق %s الصادر"
 
 #. TRANS: Instructions for outbox.
-#: actions/outbox.php:103
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr "هذا صندوق بريدك الصادر، والذي يسرد الرسائل الخاصة التي أرسلتها."
 
-#: actions/passwordsettings.php:58
 msgid "Change password"
 msgstr "تغيير كلمة السر"
 
-#: actions/passwordsettings.php:69
 msgid "Change your password."
 msgstr "غيّر كلمة سرك."
 
 #. TRANS: Fieldset legend for password reset form.
-#: actions/passwordsettings.php:96 actions/recoverpassword.php:251
 msgid "Password change"
 msgstr "تغيير كلمة السر"
 
-#: actions/passwordsettings.php:104
 msgid "Old password"
 msgstr "كلمة السر القديمة"
 
 #. TRANS: Field label for password reset form.
-#: actions/passwordsettings.php:108 actions/recoverpassword.php:256
 msgid "New password"
 msgstr "كلمة السر الجديدة"
 
-#: actions/passwordsettings.php:109 actions/register.php:416
 #, fuzzy
 msgid "6 or more characters."
 msgstr "6 أحرف أو أكثر"
 
 #. TRANS: Ttile for field label for password reset form where the password has to be typed again.
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:264
-#: actions/register.php:420
 #, fuzzy
 msgid "Same as password above."
 msgstr "نفس كلمة السر أعلاه"
 
-#: actions/passwordsettings.php:117
 msgid "Change"
 msgstr "غيّر"
 
-#: actions/passwordsettings.php:153 actions/register.php:223
 msgid "Password must be 6 or more characters."
 msgstr "يجب أن تكون كلمة السر 6 حروف أو أكثر."
 
-#: actions/passwordsettings.php:156 actions/register.php:226
 msgid "Passwords don't match."
 msgstr "كلمتا السر غير متطابقتين."
 
-#: actions/passwordsettings.php:164
 msgid "Incorrect old password"
 msgstr "كلمة السر القديمة غير صحيحة"
 
-#: actions/passwordsettings.php:180
 msgid "Error saving user; invalid."
 msgstr "خطأ أثناء حفظ المستخدم؛ غير صالح."
 
 #. TRANS: Reset password form validation error message.
-#: actions/passwordsettings.php:185 actions/recoverpassword.php:418
 #, fuzzy
 msgid "Cannot save new password."
 msgstr "تعذّر حفظ كلمة السر الجديدة."
 
-#: actions/passwordsettings.php:191
 msgid "Password saved."
 msgstr "حُفظت كلمة السر."
 
 #. TRANS: Title for Paths admin panel.
 #. TRANS: Menu item for site administration
-#: actions/pathsadminpanel.php:58 lib/adminpanelaction.php:371
 msgid "Paths"
 msgstr "المسارات"
 
 #. TRANS: Form instructions for Path admin panel.
-#: actions/pathsadminpanel.php:69
 msgid "Path and server settings for this StatusNet site"
 msgstr ""
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the directory that could not be read from.
-#: actions/pathsadminpanel.php:155
 #, php-format
 msgid "Theme directory not readable: %s."
 msgstr "لا يمكن قراءة دليل السمات: %s."
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the avatar directory that could not be written to.
-#: actions/pathsadminpanel.php:163
 #, php-format
 msgid "Avatar directory not writable: %s."
 msgstr "لا يمكن الكتابة في دليل الأفتارات: %s."
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the background directory that could not be written to.
-#: actions/pathsadminpanel.php:171
 #, php-format
 msgid "Background directory not writable: %s."
 msgstr "لا يمكن الكتابة في دليل الخلفيات: %s."
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the locales directory that could not be read from.
-#: actions/pathsadminpanel.php:181
 #, php-format
 msgid "Locales directory not readable: %s."
 msgstr "لا يمكن قراءة دليل المحليات: %s."
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the SSL server URL that is too long.
-#: actions/pathsadminpanel.php:189
 #, fuzzy
 msgid "Invalid SSL server. The maximum length is 255 characters."
 msgstr "رسالة ترحيب غير صالحة. أقصى طول هو 255 حرف."
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:235 actions/siteadminpanel.php:58
 msgid "Site"
 msgstr "الموقع"
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:241 actions/pathsadminpanel.php:279
-#: actions/pathsadminpanel.php:370 actions/pathsadminpanel.php:425
 msgid "Server"
 msgstr "خادوم"
 
-#: actions/pathsadminpanel.php:242
 msgid "Site's server hostname."
 msgstr "اسم مضيف خادوم الموقع."
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:248 actions/pathsadminpanel.php:288
-#: actions/pathsadminpanel.php:379 actions/pathsadminpanel.php:434
 msgid "Path"
 msgstr "المسار"
 
-#: actions/pathsadminpanel.php:249
 #, fuzzy
 msgid "Site path."
 msgstr "مسار الموقع"
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:255
 #, fuzzy
 msgid "Locale directory"
 msgstr "دليل السمات"
 
-#: actions/pathsadminpanel.php:256
 #, fuzzy
 msgid "Directory path to locales."
 msgstr "مسار دليل المحليات"
 
 #. TRANS: Checkbox label in Paths admin panel.
-#: actions/pathsadminpanel.php:263
 msgid "Fancy URLs"
 msgstr "مسارات فاخرة"
 
-#: actions/pathsadminpanel.php:265
 msgid "Use fancy (more readable and memorable) URLs?"
 msgstr "أأستخدم مسارات فاخرة (يمكن قراءتها وتذكرها بسهولة أكبر)؟"
 
-#: actions/pathsadminpanel.php:272
 msgid "Theme"
 msgstr "السمة"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:281
 #, fuzzy
 msgid "Server for themes."
 msgstr "سمة الموقع."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:290
 msgid "Web path to themes."
 msgstr ""
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:297 actions/pathsadminpanel.php:388
-#: actions/pathsadminpanel.php:443 actions/pathsadminpanel.php:495
 msgid "SSL server"
 msgstr "خادم SSL"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:299
 msgid "SSL server for themes (default: SSL server)."
 msgstr ""
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:306 actions/pathsadminpanel.php:397
-#: actions/pathsadminpanel.php:452
 #, fuzzy
 msgid "SSL path"
 msgstr "مسار الموقع"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:308
 msgid "SSL path to themes (default: /theme/)."
 msgstr ""
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:315 actions/pathsadminpanel.php:406
-#: actions/pathsadminpanel.php:461
 #, fuzzy
 msgid "Directory"
 msgstr "دليل السمات"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:317
 #, fuzzy
 msgid "Directory where themes are located."
 msgstr "مسار دليل المحليات"
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:326
 msgid "Avatars"
 msgstr "أفتارات"
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:333
 msgid "Avatar server"
 msgstr "خادوم الأفتارات"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:335
 #, fuzzy
 msgid "Server for avatars."
 msgstr "سمة الموقع."
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:342
 msgid "Avatar path"
 msgstr "مسار الأفتارات"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:344
 #, fuzzy
 msgid "Web path to avatars."
 msgstr "فشل تحديث الأفتار."
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:351
 msgid "Avatar directory"
 msgstr "دليل الأفتار."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:353
 #, fuzzy
 msgid "Directory where avatars are located."
 msgstr "مسار دليل المحليات"
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:364
 msgid "Backgrounds"
 msgstr "خلفيات"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:372
 #, fuzzy
 msgid "Server for backgrounds."
 msgstr "سمة الموقع."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:381
 msgid "Web path to backgrounds."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:390
 msgid "Server for backgrounds on SSL pages."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:399
 msgid "Web path to backgrounds on SSL pages."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:408
 #, fuzzy
 msgid "Directory where backgrounds are located."
 msgstr "مسار دليل المحليات"
 
 #. TRANS: Fieldset legens in Paths admin panel.
-#: actions/pathsadminpanel.php:419
 msgid "Attachments"
 msgstr "مرفقات"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:427
 #, fuzzy
 msgid "Server for attachments."
 msgstr "سمة الموقع."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:436
 #, fuzzy
 msgid "Web path to attachments."
 msgstr "لا مرفقات."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:445
 #, fuzzy
 msgid "Server for attachments on SSL pages."
 msgstr "سمة الموقع."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:454
 msgid "Web path to attachments on SSL pages."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:463
 #, fuzzy
 msgid "Directory where attachments are located."
 msgstr "مسار دليل المحليات"
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:472
 msgid "SSL"
 msgstr "SSL"
 
 #. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
-#: actions/pathsadminpanel.php:477 actions/snapshotadminpanel.php:202
 msgid "Never"
 msgstr "مطلقا"
 
 #. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
-#: actions/pathsadminpanel.php:479
 msgid "Sometimes"
 msgstr "أحيانًا"
 
 #. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
-#: actions/pathsadminpanel.php:481
 msgid "Always"
 msgstr "دائمًا"
 
-#: actions/pathsadminpanel.php:485
 msgid "Use SSL"
 msgstr "استخدم SSL"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:487
 msgid "When to use SSL."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:497
 msgid "Server to direct SSL requests to."
 msgstr ""
 
 #. TRANS: Button title text to store form data in the Paths admin panel.
-#: actions/pathsadminpanel.php:514
 msgid "Save paths"
 msgstr "احفظ المسارات"
 
 #. TRANS: Instructions for the "People search" page.
 #. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/peoplesearch.php:54
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
@@ -4461,57 +3655,46 @@ msgstr ""
 "عبارات البحث بمسافات؛ ويجب أن تتكون تلك العبارات من 3 أحرف أو أكثر."
 
 #. TRANS: Title of a page where users can search for other users.
-#: actions/peoplesearch.php:61
 msgid "People search"
 msgstr "بحث في الأشخاص"
 
-#: actions/peopletag.php:68
 #, php-format
 msgid "Not a valid people tag: %s."
 msgstr "ليس وسم أشخاص صالح: %s."
 
-#: actions/peopletag.php:142
 #, php-format
 msgid "Users self-tagged with %1$s - page %2$d"
 msgstr "المستخدمون الذين وسموا أنفسهم ب%1$s - الصفحة %2$d"
 
 #. TRANS: Page title for AJAX form return when a disabling a plugin.
-#: actions/plugindisable.php:69
 msgctxt "plugin"
 msgid "Disabled"
 msgstr ""
 
 #. TRANS: Client error displayed trying to perform any request method other than POST.
 #. TRANS: Do not translate POST.
-#: actions/pluginenable.php:78 actions/subscribe.php:77
 msgid "This action only accepts POST requests."
 msgstr "هذا الإجراء يقبل طلبات POST فقط."
 
-#: actions/pluginenable.php:102
 #, fuzzy
 msgid "You cannot administer plugins."
 msgstr "لا يمكنك حذف المستخدمين."
 
-#: actions/pluginenable.php:109
 #, fuzzy
 msgid "No such plugin."
 msgstr "لا صفحة كهذه."
 
 #. TRANS: Page title for AJAX form return when enabling a plugin.
-#: actions/pluginenable.php:159
 msgctxt "plugin"
 msgid "Enabled"
 msgstr ""
 
 #. TRANS: Tab and title for plugins admin panel.
 #. TRANS: Menu item for site administration
-#: actions/pluginsadminpanel.php:56 actions/version.php:191
-#: lib/adminpanelaction.php:411
 msgid "Plugins"
 msgstr "الملحقات"
 
 #. TRANS: Instructions at top of plugin admin page.
-#: actions/pluginsadminpanel.php:68
 msgid ""
 "Additional plugins can be enabled and configured manually. See the <a href="
 "\"http://status.net/wiki/Plugins\">online plugin documentation</a> for more "
@@ -4519,62 +3702,49 @@ msgid ""
 msgstr ""
 
 #. TRANS: Admin form section header
-#: actions/pluginsadminpanel.php:84
 #, fuzzy
 msgid "Default plugins"
 msgstr "اللغة المبدئية"
 
-#: actions/pluginsadminpanel.php:106
 msgid ""
 "All default plugins have been disabled from the site's configuration file."
 msgstr ""
 
-#: actions/postnotice.php:95
 msgid "Invalid notice content."
 msgstr "محتوى إشعار غير صالح."
 
-#: actions/postnotice.php:101
 #, php-format
 msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’."
 msgstr ""
 
 #. TRANS: Page title for profile settings.
-#: actions/profilesettings.php:60
 msgid "Profile settings"
 msgstr "إعدادات الملف الشخصي"
 
 #. TRANS: Usage instructions for profile settings.
-#: actions/profilesettings.php:71
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr "بإمكانك تحديث بيانات ملفك الشخصي ليعرف عنك الناس أكثر."
 
 #. TRANS: Profile settings form legend.
-#: actions/profilesettings.php:99
 msgid "Profile information"
 msgstr "معلومات الملف الشخصي"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:110 actions/register.php:412
 #, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr "1-64 حرفًا إنجليزيًا أو رقمًا بدون نقاط أو مسافات"
 
 #. TRANS: Field label in form for profile settings.
-#: actions/profilesettings.php:114 actions/register.php:434
-#: lib/groupeditform.php:150
 msgid "Full name"
 msgstr "الاسم الكامل"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:119 actions/register.php:439
-#: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "الصفحة الرئيسية"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:122 actions/register.php:441
 #, fuzzy
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr "مسار صفحتك الرئيسية أو مدونتك أو ملفك الشخصي على موقع آخر"
@@ -4582,7 +3752,6 @@ msgstr "مسار صفحتك الرئيسية أو مدونتك أو ملفك ا
 #. TRANS: Tooltip for field label in form for profile settings. Plural
 #. TRANS: is decided by the number of characters available for the
 #. TRANS: biography (%d).
-#: actions/profilesettings.php:130 actions/register.php:450
 #, fuzzy, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4594,41 +3763,31 @@ msgstr[4] "تكلم عن نفسك واهتمامتك في %d حرف"
 msgstr[5] "تكلم عن نفسك واهتمامتك في %d حرف"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:136 actions/register.php:455
 msgid "Describe yourself and your interests"
 msgstr "صِف نفسك واهتماماتك"
 
 #. TRANS: Text area label in form for profile settings where users can provide.
 #. TRANS: their biography.
-#: actions/profilesettings.php:140 actions/register.php:457
 msgid "Bio"
 msgstr "السيرة"
 
 #. TRANS: Field label in form for profile settings.
-#: actions/profilesettings.php:146 actions/register.php:462
-#: lib/groupeditform.php:173
 msgid "Location"
 msgstr "الموقع"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:149
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "مكان تواجدك، على سبيل المثال \"المدينة، الولاية (أو المنطقة)، الدولة\""
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:154
 msgid "Share my current location when posting notices"
 msgstr "شارك مكاني الحالي عند إرسال إشعارات"
 
 #. TRANS: Field label in form for profile settings.
-#: actions/profilesettings.php:162 actions/tagother.php:128
-#: actions/tagother.php:188 lib/subscriptionlist.php:104
-#: lib/subscriptionlist.php:106
 msgid "Tags"
 msgstr "الوسوم"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:165
 #, fuzzy
 msgid ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- "
@@ -4637,28 +3796,23 @@ msgstr ""
 "سِم نفسك (حروف وأرقام و \"-\" و \".\" و \"_\")، افصلها بفاصلة (',') أو مسافة."
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:170
 msgid "Language"
 msgstr "اللغة"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:172
 #, fuzzy
 msgid "Preferred language."
 msgstr "اللغة المفضلة"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:182
 msgid "Timezone"
 msgstr "المنطقة الزمنية"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:184
 msgid "What timezone are you normally in?"
 msgstr "ما المنطقة الزمنية التي تتواجد فيها عادة؟"
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:190
 #, fuzzy
 msgid ""
 "Automatically subscribe to whoever subscribes to me (best for non-humans)."
@@ -4667,7 +3821,6 @@ msgstr "اشترك تلقائيًا بأي شخص يشترك بي (يفضل أن
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Plural form is used based on the maximum number of allowed
 #. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:259 actions/register.php:214
 #, fuzzy, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4679,103 +3832,84 @@ msgstr[4] "الاسم طويل جدا (الأقصى %d حرفا)."
 msgstr[5] "الاسم طويل جدا (الأقصى %d حرفا)."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:270 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr "لم تُختر المنطقة الزمنية."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:278
 #, fuzzy
 msgid "Language is too long (maximum 50 characters)."
 msgstr "الاسم طويل جدا (الأقصى 255 حرفا)."
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:292
 #, fuzzy, php-format
 msgid "Invalid tag: \"%s\"."
 msgstr "وسم غير صالح: \"%s\""
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:348
 #, fuzzy
 msgid "Could not update user for autosubscribe."
 msgstr "تعذّر تحديث سجل المستخدم."
 
 #. TRANS: Server error thrown when user profile location preference settings could not be updated.
-#: actions/profilesettings.php:406
 #, fuzzy
 msgid "Could not save location prefs."
 msgstr "لم يمكن حفظ تفضيلات الموقع."
 
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:428 actions/tagother.php:179
 msgid "Could not save tags."
 msgstr "تعذّر حفظ الوسوم."
 
 #. TRANS: Confirmation shown when user profile settings are saved.
 #. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:437 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "حُفظت الإعدادات."
 
 #. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
 #. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:484 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "أنشئ حسابًا"
 
-#: actions/public.php:83
 #, php-format
 msgid "Beyond the page limit (%s)."
 msgstr "بعد حد الصفحة (%s)."
 
-#: actions/public.php:92
 #, fuzzy
 msgid "Could not retrieve public stream."
 msgstr "تعذّر إنشاء الكنى."
 
-#: actions/public.php:130
 #, php-format
 msgid "Public timeline, page %d"
 msgstr "المسار الزمني العام، صفحة %d"
 
-#: actions/public.php:132 lib/publicgroupnav.php:79
 msgid "Public timeline"
 msgstr "المسار الزمني العام"
 
-#: actions/public.php:160
 msgid "Public Stream Feed (RSS 1.0)"
 msgstr ""
 
-#: actions/public.php:164
 msgid "Public Stream Feed (RSS 2.0)"
 msgstr ""
 
-#: actions/public.php:168
 msgid "Public Stream Feed (Atom)"
 msgstr ""
 
-#: actions/public.php:188
 #, php-format
 msgid ""
 "This is the public timeline for %%site.name%% but no one has posted anything "
 "yet."
 msgstr ""
 
-#: actions/public.php:191
 msgid "Be the first to post!"
 msgstr "كن أول من يُرسل!"
 
-#: actions/public.php:195
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post!"
 msgstr ""
 
-#: actions/public.php:242
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -4788,7 +3922,6 @@ msgstr ""
 "الآن](%%action.register%%) لتشارك اشعاراتك مع أصدقائك وعائلتك وزملائك! "
 "([اقرأ المزيد](%%doc.help%%))"
 
-#: actions/public.php:247
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -4799,19 +3932,16 @@ msgstr ""
 "blogging) المبنية على البرنامج الحر [StatusNet](http://status.net/)."
 
 #. TRANS: Public RSS feed description. %s is the StatusNet site name.
-#: actions/publicrss.php:106
 #, php-format
 msgid "%s updates from everyone."
 msgstr ""
 
 #. TRANS: Title for public tag cloud.
-#: actions/publictagcloud.php:57
 msgid "Public tag cloud"
 msgstr "سحابة الوسوم العمومية"
 
 #. TRANS: Instructions (more used like an explanation/header).
 #. TRANS: %s is the StatusNet sitename.
-#: actions/publictagcloud.php:65
 #, fuzzy, php-format
 msgid "These are most popular recent tags on %s"
 msgstr "هذه هي أكثر الوسوم شهرة على %s "
@@ -4819,14 +3949,12 @@ msgstr "هذه هي أكثر الوسوم شهرة على %s "
 #. TRANS: This message contains a Markdown URL. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.
-#: actions/publictagcloud.php:74
 #, php-format
 msgid "No one has posted a notice with a [hashtag](%%doc.tags%%) yet."
 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.
-#: actions/publictagcloud.php:79
 msgid "Be the first to post one!"
 msgstr "كن أول من يُرسل!"
 
@@ -4835,7 +3963,6 @@ msgstr "كن أول من يُرسل!"
 #. TRANS: This message contains a Markdown URL. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.
-#: actions/publictagcloud.php:87
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post "
@@ -4843,275 +3970,222 @@ msgid ""
 msgstr ""
 
 #. TRANS: Client error displayed trying to recover password while already logged in.
-#: actions/recoverpassword.php:37
 msgid "You are already logged in!"
 msgstr "أنت والج بالفعل!"
 
 #. TRANS: Client error displayed when password recovery code is not correct.
-#: actions/recoverpassword.php:64
 msgid "No such recovery code."
 msgstr "لا رمز استعادة كهذا."
 
 #. TRANS: Client error displayed when no proper password recovery code was submitted.
-#: actions/recoverpassword.php:69
 msgid "Not a recovery code."
 msgstr "ليس رمز استعادة."
 
 #. TRANS: Server error displayed trying to recover password without providing a user.
-#: actions/recoverpassword.php:77
 msgid "Recovery code for unknown user."
 msgstr "رمز استعادة لمستخدم غير معروف."
 
 #. TRANS: Server error displayed removing a password recovery code from the database.
-#: actions/recoverpassword.php:91
 msgid "Error with confirmation code."
 msgstr "خطأ في رمز التأكيد."
 
 #. TRANS: Client error displayed trying to recover password with too old a recovery code.
-#: actions/recoverpassword.php:103
 msgid "This confirmation code is too old. Please start again."
 msgstr "رمز التأكيد هذا قديم جدًا. من فضلك ابدأ من جديد."
 
 #. TRANS: Server error displayed when updating a user's e-mail address in the database fails while recovering a password.
-#: actions/recoverpassword.php:118
 #, fuzzy
 msgid "Could not update user with confirmed email address."
 msgstr "عنوان البريد الإلكتروني المُؤكد الحالي."
 
 #. TRANS: Page notice for password recovery page.
-#: actions/recoverpassword.php:160
 msgid ""
 "If you have forgotten or lost your password, you can get a new one sent to "
 "the email address you have stored in your account."
 msgstr ""
 
-#: actions/recoverpassword.php:167
 msgid "You have been identified. Enter a new password below."
 msgstr ""
 
 #. TRANS: Fieldset legend for password recovery page.
-#: actions/recoverpassword.php:198
 msgid "Password recovery"
 msgstr "استعادة كلمة السر"
 
 #. TRANS: Field label on password recovery page.
-#: actions/recoverpassword.php:202
 msgid "Nickname or email address"
 msgstr "الاسم المستعار أو البريد الإلكتروني"
 
 #. TRANS: Title for field label on password recovery page.
-#: actions/recoverpassword.php:205
 msgid "Your nickname on this server, or your registered email address."
 msgstr ""
 
 #. TRANS: Field label on password recovery page.
-#: actions/recoverpassword.php:212
 msgid "Recover"
 msgstr "استرجع"
 
 #. TRANS: Button text on password recovery page.
-#: actions/recoverpassword.php:214
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Recover"
 msgstr "استرجع"
 
 #. TRANS: Title for password recovery page in password reset mode.
-#: actions/recoverpassword.php:223
 msgid "Reset password"
 msgstr "أعد ضبط كلمة السر"
 
 #. TRANS: Title for password recovery page in password recover mode.
-#: actions/recoverpassword.php:225
 msgid "Recover password"
 msgstr "استعد كلمة السر"
 
 #. TRANS: Title for password recovery page in email sent mode.
 #. TRANS: Subject for password recovery e-mail.
-#: actions/recoverpassword.php:227 actions/recoverpassword.php:366
 msgid "Password recovery requested"
 msgstr "طُلبت استعادة كلمة السر"
 
 #. TRANS: Title for password recovery page in password saved mode.
-#: actions/recoverpassword.php:229
 #, fuzzy
 msgid "Password saved"
 msgstr "حُفظت كلمة السر."
 
 #. TRANS: Title for password recovery page when an unknown action has been specified.
-#: actions/recoverpassword.php:232
 msgid "Unknown action"
 msgstr "إجراء غير معروف"
 
 #. TRANS: Title for field label for password reset form.
-#: actions/recoverpassword.php:258
 #, fuzzy
 msgid "6 or more characters, and do not forget it!"
 msgstr "6 أحرف أو أكثر"
 
 #. TRANS: Button text for password reset form.
 #. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: actions/recoverpassword.php:268 lib/designform.php:145
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Reset"
 msgstr "أعد الضبط"
 
 #. TRANS: Form instructions for password recovery form.
-#: actions/recoverpassword.php:278
 msgid "Enter a nickname or email address."
 msgstr "أدخل اسمًا مستعارًا أو عنوان بريد إلكتروني."
 
 #. TRANS: Information on password recovery form if no known username or e-mail address was specified.
-#: actions/recoverpassword.php:309
 #, fuzzy
 msgid "No user with that email address or username."
 msgstr "لا يوجد عنوان بريد إلكتروني مُسجّل لهذا المستخدم."
 
 #. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
-#: actions/recoverpassword.php:327
 msgid "No registered email address for that user."
 msgstr "لا يوجد عنوان بريد إلكتروني مُسجّل لهذا المستخدم."
 
 #. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
-#: actions/recoverpassword.php:342
 msgid "Error saving address confirmation."
 msgstr "خطأ أثناء حفظ تأكيد العنوان."
 
 #. TRANS: User notification after an e-mail with instructions was sent from the password recovery form.
-#: actions/recoverpassword.php:370
 msgid ""
 "Instructions for recovering your password have been sent to the email "
 "address registered to your account."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to reset as password without providing a user.
-#: actions/recoverpassword.php:391
 #, fuzzy
 msgid "Unexpected password reset."
 msgstr "أعد ضبط كلمة السر"
 
 #. TRANS: Reset password form validation error message.
-#: actions/recoverpassword.php:400
 #, fuzzy
 msgid "Password must be 6 characters or more."
 msgstr "يجب أن تكون كلمة السر 6 محارف أو أكثر."
 
 #. TRANS: Reset password form validation error message.
-#: actions/recoverpassword.php:405
 #, fuzzy
 msgid "Password and confirmation do not match."
 msgstr "كلمتا السر غير متطابقتين."
 
 #. TRANS: Server error displayed when something does wrong with the user object during password reset.
-#: actions/recoverpassword.php:426 actions/register.php:241
 msgid "Error setting user."
 msgstr "خطأ أثناء ضبط المستخدم."
 
 #. TRANS: Success message for user after password reset.
-#: actions/recoverpassword.php:434
 msgid "New password successfully saved. You are now logged in."
 msgstr "حُفظت كلمة السر الجديدة بنجاح. أنت الآن والج."
 
-#: actions/redirecturl.php:70
 #, fuzzy
 msgid "No id parameter"
 msgstr "لا مدخل هوية."
 
-#: actions/redirecturl.php:76
 #, fuzzy, php-format
 msgid "No such file \"%d\""
 msgstr "لا ملف كهذا."
 
-#: actions/register.php:80 actions/register.php:181 actions/register.php:392
 msgid "Sorry, only invited people can register."
 msgstr "عذرًا، الأشخاص المدعوون وحدهم يستطيعون التسجيل."
 
-#: actions/register.php:87
 msgid "Sorry, invalid invitation code."
 msgstr "عذرا، رمز دعوة غير صالح."
 
-#: actions/register.php:106
 msgid "Registration successful"
 msgstr "نجح التسجيل"
 
-#: actions/register.php:108 actions/register.php:490
 msgid "Register"
 msgstr "سجّل"
 
-#: actions/register.php:128
 msgid "Registration not allowed."
 msgstr "لا يُسمح بالتسجيل."
 
-#: actions/register.php:194
 #, fuzzy
 msgid "You cannot register if you don't agree to the license."
 msgstr "لا يمكنك تكرار ملاحظتك الشخصية."
 
-#: actions/register.php:203
 msgid "Email address already exists."
 msgstr "عنوان البريد الإلكتروني موجود مسبقًا."
 
-#: actions/register.php:236 actions/register.php:258
 msgid "Invalid username or password."
 msgstr "اسم مستخدم أو كلمة سر غير صالحة."
 
-#: actions/register.php:333
 msgid ""
 "With this form you can create a new account. You can then post notices and "
 "link up to friends and colleagues."
 msgstr ""
 
-#: actions/register.php:424 actions/register.php:428
-#: actions/siteadminpanel.php:238 lib/settingsnav.php:92
 msgid "Email"
 msgstr "البريد الإلكتروني"
 
-#: actions/register.php:425 actions/register.php:429
 #, fuzzy
 msgid "Used only for updates, announcements, and password recovery."
 msgstr "لا يُستخدم إلا عند التحديثات، والتعميمات، ولاستعادة كلمة السر"
 
-#: actions/register.php:436
 #, fuzzy
 msgid "Longer name, preferably your \"real\" name."
 msgstr "اسم أطول. يُفضَّل استخدام اسمك الحقيقي"
 
-#: actions/register.php:464
 #, fuzzy
 msgid "Where you are, like \"City, State (or Region), Country\"."
 msgstr "مكان تواجدك، على سبيل المثال \"المدينة، الولاية (أو المنطقة)، الدولة\""
 
-#: actions/register.php:503
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
 msgstr ""
 
-#: actions/register.php:513
 #, php-format
 msgid "My text and files are copyright by %1$s."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:517
 msgid "My text and files remain under my own copyright."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:520
 msgid "All rights reserved."
 msgstr "جميع الحقوق محفوظة."
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:525
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
 "email address, IM address, and phone number."
 msgstr ""
 
-#: actions/register.php:566
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -5130,13 +4204,11 @@ msgid ""
 "Thanks for signing up and we hope you enjoy using this service."
 msgstr ""
 
-#: actions/register.php:590
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
 msgstr ""
 
-#: actions/remotesubscribe.php:97
 #, php-format
 msgid ""
 "To subscribe, you can [login](%%action.login%%), or [register](%%action."
@@ -5144,122 +4216,95 @@ msgid ""
 "microblogging site](%%doc.openmublog%%),  enter your profile URL below."
 msgstr ""
 
-#: actions/remotesubscribe.php:111
 msgid "Remote subscribe"
 msgstr "اشتراك بعيد"
 
-#: actions/remotesubscribe.php:123
 msgid "Subscribe to a remote user"
 msgstr "اشترك بمستخدم بعيد"
 
-#: actions/remotesubscribe.php:128
 msgid "User nickname"
 msgstr "اسم المستخدم المستعار"
 
-#: actions/remotesubscribe.php:129
 msgid "Nickname of the user you want to follow."
 msgstr ""
 
-#: actions/remotesubscribe.php:132
 msgid "Profile URL"
 msgstr "مسار الملف الشخصي"
 
-#: actions/remotesubscribe.php:133
 msgid "URL of your profile on another compatible microblogging service."
 msgstr ""
 
 #. TRANS: Link text for link that will subscribe to a remote profile.
-#: actions/remotesubscribe.php:136 lib/subscribeform.php:139
-#: lib/userprofile.php:402
 msgid "Subscribe"
 msgstr "اشترك"
 
-#: actions/remotesubscribe.php:158
 #, fuzzy
 msgid "Invalid profile URL (bad format)."
 msgstr "حجم غير صالح."
 
-#: actions/remotesubscribe.php:167
 msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
 msgstr ""
 
-#: actions/remotesubscribe.php:175
 #, fuzzy
 msgid "That is a local profile! Login to subscribe."
 msgstr "هذا ملف شخصي محلي! لُج لتشترك."
 
-#: actions/remotesubscribe.php:182
 #, fuzzy
 msgid "Could not get a request token."
 msgstr "تعذّر إدراج الرسالة."
 
-#: actions/repeat.php:56
 msgid "Only logged-in users can repeat notices."
 msgstr "يستطيع المستخدمون الوالجون وحدهم تكرار الإشعارات."
 
-#: actions/repeat.php:63 actions/repeat.php:70
 msgid "No notice specified."
 msgstr "لا ملاحظة محددة."
 
-#: actions/repeat.php:75
 #, fuzzy
 msgid "You cannot repeat your own notice."
 msgstr "لا يمكنك تكرار ملاحظتك الشخصية."
 
-#: actions/repeat.php:89
 msgid "You already repeated that notice."
 msgstr "أنت كررت هذه الملاحظة بالفعل."
 
-#: actions/repeat.php:112 lib/noticelist.php:697
 msgid "Repeated"
 msgstr "مكرر"
 
-#: actions/repeat.php:117
 msgid "Repeated!"
 msgstr "مكرر!"
 
 #. TRANS: RSS reply feed title. %s is a user nickname.
-#: actions/replies.php:126 actions/repliesrss.php:68
-#: lib/personalgroupnav.php:105
 #, php-format
 msgid "Replies to %s"
 msgstr "الردود على %s"
 
-#: actions/replies.php:128
 #, php-format
 msgid "Replies to %1$s, page %2$d"
 msgstr "الردود على %1$s، الصفحة %2$d"
 
-#: actions/replies.php:145
 #, php-format
 msgid "Replies feed for %s (RSS 1.0)"
 msgstr ""
 
-#: actions/replies.php:152
 #, php-format
 msgid "Replies feed for %s (RSS 2.0)"
 msgstr ""
 
-#: actions/replies.php:159
 #, fuzzy, php-format
 msgid "Replies feed for %s (Atom)"
 msgstr "الردود على %s"
 
-#: actions/replies.php:199
 #, php-format
 msgid ""
 "This is the timeline showing replies to %1$s but %2$s hasn't received a "
 "notice to them yet."
 msgstr ""
 
-#: actions/replies.php:204
 #, php-format
 msgid ""
 "You can engage other users in a conversation, subscribe to more people or "
 "[join groups](%%action.groups%%)."
 msgstr ""
 
-#: actions/replies.php:206
 #, php-format
 msgid ""
 "You can try to [nudge %1$s](../%2$s) or [post something to them](%%%%action."
@@ -5268,229 +4313,188 @@ msgstr ""
 
 #. TRANS: RSS reply feed description.
 #. TRANS: %1$s is a user nickname, %2$s is the StatusNet site name.
-#: actions/repliesrss.php:74
 #, fuzzy, php-format
 msgid "Replies to %1$s on %2$s."
 msgstr "الردود على %1$s، الصفحة %2$d"
 
 #. TRANS: Client exception displayed when trying to restore an account while not logged in.
-#: actions/restoreaccount.php:78
 #, fuzzy
 msgid "Only logged-in users can restore their account."
 msgstr "يستطيع المستخدمون الوالجون وحدهم تكرار الإشعارات."
 
 #. TRANS: Client exception displayed when trying to restore an account without having restore rights.
-#: actions/restoreaccount.php:83
 #, fuzzy
 msgid "You may not restore your account."
 msgstr "يجب أن تكون مسجل الدخول لتسجل تطبيقا."
 
 #. TRANS: Client exception displayed trying to restore an account while something went wrong uploading a file.
 #. TRANS: Client exception. No file; probably just a non-AJAX submission.
-#: actions/restoreaccount.php:121 actions/restoreaccount.php:146
 #, fuzzy
 msgid "No uploaded file."
 msgstr "ارفع ملفًا"
 
 #. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
-#: actions/restoreaccount.php:129 lib/mediafile.php:194
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
 msgstr ""
 
 #. TRANS: Client exception.
-#: actions/restoreaccount.php:135 lib/mediafile.php:200
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form."
 msgstr ""
 
 #. TRANS: Client exception.
-#: actions/restoreaccount.php:141 lib/mediafile.php:206
 msgid "The uploaded file was only partially uploaded."
 msgstr ""
 
 #. TRANS: Client exception thrown when a temporary folder is not present to store a file upload.
-#: actions/restoreaccount.php:150 lib/mediafile.php:214
 msgid "Missing a temporary folder."
 msgstr ""
 
 #. TRANS: Client exception thrown when writing to disk is not possible during a file upload operation.
-#: actions/restoreaccount.php:154 lib/mediafile.php:218
 msgid "Failed to write file to disk."
 msgstr "فشل في كتابة الملف إلى القرص."
 
 #. TRANS: Client exception thrown when a file upload operation has been stopped by an extension.
-#: actions/restoreaccount.php:158 lib/mediafile.php:222
 msgid "File upload stopped by extension."
 msgstr "أوقفت إضافة رفع الملف."
 
 #. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
 #. TRANS: Exception thrown when uploading an image fails for an unknown reason.
 #. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
-#: actions/restoreaccount.php:164 lib/imagefile.php:106 lib/mediafile.php:228
 msgid "System error uploading file."
 msgstr ""
 
 #. TRANS: Client exception thrown when a feed is not an Atom feed.
-#: actions/restoreaccount.php:207
 #, fuzzy
 msgid "Not an Atom feed."
 msgstr "جميع الأعضاء"
 
 #. TRANS: Success message when a feed has been restored.
-#: actions/restoreaccount.php:241
 msgid ""
 "Feed has been restored. Your old posts should now appear in search and your "
 "profile page."
 msgstr ""
 
 #. TRANS: Message when a feed restore is in progress.
-#: actions/restoreaccount.php:245
 msgid "Feed will be restored. Please wait a few minutes for results."
 msgstr ""
 
 #. TRANS: Form instructions for feed restore.
-#: actions/restoreaccount.php:342
 msgid ""
 "You can upload a backed-up stream in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format."
 msgstr ""
 
 #. TRANS: Title for submit button to confirm upload of a user backup file for account restore.
-#: actions/restoreaccount.php:373
 #, fuzzy
 msgid "Upload the file"
 msgstr "ارفع ملفًا"
 
-#: actions/revokerole.php:75
 msgid "You cannot revoke user roles on this site."
 msgstr "لا يمكنك سحب أدوار المستخدمين على هذا الموقع."
 
-#: actions/revokerole.php:82
 msgid "User doesn't have this role."
 msgstr "ليس للمستخدم هذا الدور."
 
-#: actions/rsd.php:142 actions/version.php:159
 msgid "StatusNet"
 msgstr "ستاتس نت"
 
-#: actions/sandbox.php:65 actions/unsandbox.php:65
 #, fuzzy
 msgid "You cannot sandbox users on this site."
 msgstr "لا يمكنك إسكات المستخدمين على هذا الموقع."
 
-#: actions/sandbox.php:72
 #, fuzzy
 msgid "User is already sandboxed."
 msgstr "المستخدم مسكت من قبل."
 
 #. TRANS: Menu item for site administration
-#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
-#: lib/adminpanelaction.php:379
 msgid "Sessions"
 msgstr "الجلسات"
 
-#: actions/sessionsadminpanel.php:65
 msgid "Session settings for this StatusNet site"
 msgstr ""
 
-#: actions/sessionsadminpanel.php:175
 #, fuzzy
 msgid "Handle sessions"
 msgstr "الجلسات"
 
-#: actions/sessionsadminpanel.php:177
 msgid "Whether to handle sessions ourselves."
 msgstr ""
 
-#: actions/sessionsadminpanel.php:181
 msgid "Session debugging"
 msgstr "تنقيح الجلسة"
 
-#: actions/sessionsadminpanel.php:183
 msgid "Turn on debugging output for sessions."
 msgstr "مكّن تنقيح مُخرجات الجلسة."
 
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
+#. TRANS: Submit button title.
+msgid "Save"
+msgstr "أرسل"
+
 msgid "Save site settings"
 msgstr "اذف إعدادت الموقع"
 
-#: actions/showapplication.php:78
 msgid "You must be logged in to view an application."
 msgstr "يجب أن تكون مسجل الدخول لرؤية تطبيق."
 
-#: actions/showapplication.php:151
 #, fuzzy
 msgid "Application profile"
 msgstr "معلومات التطبيق"
 
-#: actions/showapplication.php:179
 #, php-format
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr ""
 
-#: actions/showapplication.php:189
 #, fuzzy
 msgid "Application actions"
 msgstr "معلومات التطبيق"
 
-#: actions/showapplication.php:212
 msgid "Reset key & secret"
 msgstr ""
 
 #. TRANS: Title of form for deleting a user.
-#: actions/showapplication.php:228 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:64 lib/noticelist.php:678
 msgid "Delete"
 msgstr "احذف"
 
-#: actions/showapplication.php:237
 msgid "Application info"
 msgstr "معلومات التطبيق"
 
-#: actions/showapplication.php:255
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
 msgstr ""
 
-#: actions/showapplication.php:275
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr "أمتأكد من أنك تريد إعادة ضبط مفتاح المستهلك وكلمة سره؟"
 
 #. TRANS: Title for all but the first page of favourite notices of a user.
 #. TRANS: %1$s is the user for whom the favourite notices are displayed, %2$d is the page number.
-#: actions/showfavorites.php:80
 #, php-format
 msgid "%1$s's favorite notices, page %2$d"
 msgstr "إشعارات %1$s المُفضلة، الصفحة %2$d"
 
 #. TRANS: Server error displayed when favourite notices could not be retrieved from the database.
-#: actions/showfavorites.php:134
 #, fuzzy
 msgid "Could not retrieve favorite notices."
 msgstr "تعذّر إنشاء مفضلة."
 
 #. TRANS: Feed link text. %s is a username.
-#: actions/showfavorites.php:172
 #, php-format
 msgid "Feed for favorites of %s (RSS 1.0)"
 msgstr ""
 
 #. TRANS: Feed link text. %s is a username.
-#: actions/showfavorites.php:180
 #, php-format
 msgid "Feed for favorites of %s (RSS 2.0)"
 msgstr ""
 
 #. TRANS: Feed link text. %s is a username.
-#: actions/showfavorites.php:188
 #, php-format
 msgid "Feed for favorites of %s (Atom)"
 msgstr ""
 
 #. TRANS: Text displayed instead of favourite notices for the current logged in user that has no favourites.
-#: actions/showfavorites.php:209
 msgid ""
 "You haven't chosen any favorite notices yet. Click the fave button on "
 "notices you like to bookmark them for later or shed a spotlight on them."
@@ -5498,7 +4502,6 @@ msgstr ""
 
 #. TRANS: Text displayed instead of favourite notices for a user that has no favourites while logged in.
 #. TRANS: %s is a username.
-#: actions/showfavorites.php:213
 #, fuzzy, php-format
 msgid ""
 "%s hasn't added any favorite notices yet. Post something interesting they "
@@ -5510,7 +4513,6 @@ msgstr ""
 #. TRANS: Text displayed instead of favourite notices for a user that has no favourites while not logged in.
 #. TRANS: %s is a username, %%%%action.register%%%% is a link to the user registration page.
 #. TRANS: (link text)[link] is a Mark Down link.
-#: actions/showfavorites.php:220
 #, fuzzy, php-format
 msgid ""
 "%s hasn't added any favorite notices yet. Why not [register an account](%%%%"
@@ -5521,65 +4523,54 @@ msgstr ""
 "register%%%%) وترسل شيئًا شيقًا ليضيفه إلى مفضلته. :)"
 
 #. TRANS: Page notice for show favourites page.
-#: actions/showfavorites.php:251
 msgid "This is a way to share what you like."
 msgstr "إنها إحدى وسائل مشاركة ما تحب."
 
 #. TRANS: Page title for first group page. %s is a group name.
-#: actions/showgroup.php:75
 #, php-format
 msgid "%s group"
 msgstr "مجموعة %s"
 
 #. TRANS: Page title for any but first group page.
 #. TRANS: %1$s is a group name, $2$s is a page number.
-#: actions/showgroup.php:79
 #, php-format
 msgid "%1$s group, page %2$d"
 msgstr "مجموعة %1$s، الصفحة %2$d"
 
 #. TRANS: Label for group description or group note (dt). Text hidden by default.
-#: actions/showgroup.php:266
 msgid "Note"
 msgstr "ملاحظة"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:277 lib/groupeditform.php:180
 msgid "Aliases"
 msgstr "الكنى"
 
 #. TRANS: Group actions header (h2). Text hidden by default.
-#: actions/showgroup.php:294
 #, fuzzy
 msgid "Group actions"
 msgstr "تصرفات المستخدم"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:338
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
 msgstr ""
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:345
 #, php-format
 msgid "Notice feed for %s group (RSS 2.0)"
 msgstr ""
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:352
 #, php-format
 msgid "Notice feed for %s group (Atom)"
 msgstr ""
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:358
 #, fuzzy, php-format
 msgid "FOAF for %s group"
 msgstr "مجموعة %s"
 
 #. TRANS: Header for mini list of group members on a group page (h2).
-#: actions/showgroup.php:395
 msgid "Members"
 msgstr "الأعضاء"
 
@@ -5587,31 +4578,24 @@ msgstr "الأعضاء"
 #. TRANS: Text for user subscription statistics if the user has no subscriptions.
 #. TRANS: Text for user subscriber statistics if user has no subscribers.
 #. TRANS: Text for user user group membership statistics if user is not a member of any group.
-#: actions/showgroup.php:401 lib/profileaction.php:137
-#: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
-#: lib/subscriptionlist.php:123 lib/tagcloudsection.php:71
 msgid "(None)"
 msgstr "(لا شيء)"
 
 #. TRANS: Link to all group members from mini list of group members if group has more than n members.
-#: actions/showgroup.php:410
 msgid "All members"
 msgstr "جميع الأعضاء"
 
 #. TRANS: Header for group statistics on a group page (h2).
 #. TRANS: H2 text for user statistics.
-#: actions/showgroup.php:441 lib/profileaction.php:205
 msgid "Statistics"
 msgstr "إحصاءات"
 
-#: actions/showgroup.php:444
 #, fuzzy
 msgctxt "LABEL"
 msgid "Created"
 msgstr "أنشئت"
 
 #. TRANS: Label for member count in statistics on group page.
-#: actions/showgroup.php:449
 #, fuzzy
 msgctxt "LABEL"
 msgid "Members"
@@ -5621,7 +4605,6 @@ msgstr "الأعضاء"
 #. TRANS: **%s** is the group alias, %%%%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).
-#: actions/showgroup.php:464
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5639,7 +4622,6 @@ 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: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
-#: actions/showgroup.php:474
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5652,99 +4634,83 @@ msgstr ""
 "(http://status.net/). يتشارك أعضاؤها رسائل قصيرة عن حياتهم واهتماماتهم. "
 
 #. TRANS: Header for list of group administrators on a group page (h2).
-#: actions/showgroup.php:503
 msgid "Admins"
 msgstr "الإداريون"
 
 #. TRANS: Client error displayed requesting a single message that does not exist.
-#: actions/showmessage.php:76
 msgid "No such message."
 msgstr "لا رسالة كهذه."
 
 #. TRANS: Client error displayed requesting a single direct message the requesting user was not a party in.
-#: actions/showmessage.php:86
 msgid "Only the sender and recipient may read this message."
 msgstr "يحق للمُرسل والمستلم فقط قراءة هذه الرسالة."
 
 #. TRANS: Page title for single direct message display when viewing user is the sender.
 #. TRANS: %1$s is the addressed user's nickname, $2$s is a timestamp.
-#: actions/showmessage.php:105
 #, fuzzy, php-format
 msgid "Message to %1$s on %2$s"
 msgstr "الإشعارات التي فضلها %1$s في %2$s!"
 
 #. TRANS: Page title for single message display.
 #. TRANS: %1$s is the sending user's nickname, $2$s is a timestamp.
-#: actions/showmessage.php:113
 #, fuzzy, php-format
 msgid "Message from %1$s on %2$s"
 msgstr "نتائج البحث ل\"%1$s\" على %2$s"
 
-#: actions/shownotice.php:90
 msgid "Notice deleted."
 msgstr "حُذف الإشعار."
 
 #. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
-#: actions/showstream.php:70
 #, fuzzy, php-format
 msgid "%1$s tagged %2$s"
 msgstr "%1$s، الصفحة %2$d"
 
 #. TRANS: Page title showing tagged notices in one user's stream.
 #. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
-#: actions/showstream.php:74
 #, fuzzy, php-format
 msgid "%1$s tagged %2$s, page %3$d"
 msgstr "الإشعارات الموسومة ب%s، الصفحة %2$d"
 
 #. TRANS: Extended page title showing tagged notices in one user's stream.
 #. TRANS: %1$s is the username, %2$d is the page number.
-#: actions/showstream.php:82
 #, php-format
 msgid "%1$s, page %2$d"
 msgstr "%1$s، الصفحة %2$d"
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %1$s is a user nickname, %2$s is a hashtag.
-#: actions/showstream.php:127
 #, php-format
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
 msgstr ""
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.
-#: actions/showstream.php:136
 #, php-format
 msgid "Notice feed for %s (RSS 1.0)"
 msgstr ""
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.
-#: actions/showstream.php:145
 #, php-format
 msgid "Notice feed for %s (RSS 2.0)"
 msgstr ""
 
-#: actions/showstream.php:152
 #, php-format
 msgid "Notice feed for %s (Atom)"
 msgstr ""
 
 #. TRANS: Title for link to notice feed. FOAF stands for Friend of a Friend.
 #. TRANS: More information at http://www.foaf-project.org. %s is a user nickname.
-#: actions/showstream.php:159
 #, fuzzy, php-format
 msgid "FOAF for %s"
 msgstr "صندوق %s الصادر"
 
 #. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
-#: actions/showstream.php:205
 #, php-format
 msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr ""
 
 #. TRANS: Second sentence of empty list message for a stream for the user themselves.
-#: actions/showstream.php:211
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
@@ -5752,7 +4718,6 @@ msgstr ""
 
 #. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:215
 #, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
@@ -5761,7 +4726,6 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:258
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5777,7 +4741,6 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:265
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5789,259 +4752,206 @@ msgstr ""
 "(http://status.net/). "
 
 #. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
-#: actions/showstream.php:322
 #, php-format
 msgid "Repeat of %s"
 msgstr "تكرار ل%s"
 
-#: actions/silence.php:65 actions/unsilence.php:65
 msgid "You cannot silence users on this site."
 msgstr "لا يمكنك إسكات المستخدمين على هذا الموقع."
 
-#: actions/silence.php:72
 msgid "User is already silenced."
 msgstr "المستخدم مسكت من قبل."
 
-#: actions/siteadminpanel.php:69
 msgid "Basic settings for this StatusNet site"
 msgstr "الإعدادات الأساسية لموقع StatusNet هذا."
 
-#: actions/siteadminpanel.php:133
 msgid "Site name must have non-zero length."
 msgstr "يجب ألا يكون طول اسم الموقع صفرًا."
 
-#: actions/siteadminpanel.php:141
 msgid "You must have a valid contact email address."
 msgstr "يجب أن تملك عنوان بريد إلكتروني صحيح."
 
-#: actions/siteadminpanel.php:159
 #, php-format
 msgid "Unknown language \"%s\"."
 msgstr "لغة غير معروفة \"%s\"."
 
-#: actions/siteadminpanel.php:165
 msgid "Minimum text limit is 0 (unlimited)."
 msgstr "حد النص الأدنى 0 (غير محدود)."
 
-#: actions/siteadminpanel.php:171
 msgid "Dupe limit must be one or more seconds."
 msgstr ""
 
-#: actions/siteadminpanel.php:221
 msgid "General"
 msgstr "عام"
 
-#: actions/siteadminpanel.php:224
 msgid "Site name"
 msgstr "اسم الموقع"
 
-#: actions/siteadminpanel.php:225
 msgid "The name of your site, like \"Yourcompany Microblog\""
 msgstr "اسم موقعك، \"التدوين المصغر لشركتك\" مثلا"
 
-#: actions/siteadminpanel.php:229
 msgid "Brought by"
 msgstr ""
 
-#: actions/siteadminpanel.php:230
 msgid "Text used for credits link in footer of each page"
 msgstr ""
 
-#: actions/siteadminpanel.php:234
 msgid "Brought by URL"
 msgstr ""
 
-#: actions/siteadminpanel.php:235
 msgid "URL used for credits link in footer of each page"
 msgstr ""
 
-#: actions/siteadminpanel.php:239
 msgid "Contact email address for your site"
 msgstr "عنوان البريد الإلكتروني للاتصال بموقعك"
 
-#: actions/siteadminpanel.php:245
 msgid "Local"
 msgstr "محلي"
 
-#: actions/siteadminpanel.php:256
 msgid "Default timezone"
 msgstr "المنطقة الزمنية المبدئية"
 
-#: actions/siteadminpanel.php:257
 msgid "Default timezone for the site; usually UTC."
 msgstr "المنطقة الزمنية المبدئية للموقع؛ ت‌ع‌م عادة."
 
-#: actions/siteadminpanel.php:262
 msgid "Default language"
 msgstr "اللغة المبدئية"
 
-#: actions/siteadminpanel.php:263
 msgid "Site language when autodetection from browser settings is not available"
 msgstr "لغة الموقع إذا لم يتوفر اكتشاف اللغة آليًا من إعدادات المتصفح"
 
-#: actions/siteadminpanel.php:271
 msgid "Limits"
 msgstr "الحدود"
 
-#: actions/siteadminpanel.php:274
 msgid "Text limit"
 msgstr "حد النص"
 
-#: actions/siteadminpanel.php:274
 msgid "Maximum number of characters for notices."
 msgstr "أقصى عدد للحروف في الإشعارات."
 
-#: actions/siteadminpanel.php:278
 #, fuzzy
 msgid "Dupe limit"
 msgstr "حد النص"
 
-#: actions/siteadminpanel.php:278
 msgid "How long users must wait (in seconds) to post the same thing again."
 msgstr ""
 "الفترة (بالثواني) التي ينبغي أن ينتظرها المستخدمون قبل أن ينشروا الرسالة "
 "نفسها مجددًا"
 
 #. TRANS: Page title for site-wide notice tab in admin panel.
-#: actions/sitenoticeadminpanel.php:55
 msgid "Site Notice"
 msgstr "إشعار الموقع"
 
 #. TRANS: Instructions for site-wide notice tab in admin panel.
-#: actions/sitenoticeadminpanel.php:66
 msgid "Edit site-wide message"
 msgstr "عدّل رسالة الموقع العامة"
 
 #. TRANS: Server error displayed when saving a site-wide notice was impossible.
-#: actions/sitenoticeadminpanel.php:101
 msgid "Unable to save site notice."
 msgstr "تعذّر حفظ إشعار الموقع."
 
 #. TRANS: Client error displayed when a site-wide notice was longer than allowed.
-#: actions/sitenoticeadminpanel.php:112
 msgid "Maximum length for the site-wide notice is 255 characters."
 msgstr ""
 
 #. TRANS: Label for site-wide notice text field in admin panel.
-#: actions/sitenoticeadminpanel.php:176
 msgid "Site notice text"
 msgstr "نص إشعار الموقع"
 
 #. TRANS: Tooltip for site-wide notice text field in admin panel.
-#: actions/sitenoticeadminpanel.php:179
 #, fuzzy
 msgid "Site-wide notice text (255 characters maximum; HTML allowed)"
 msgstr "نص إشعار عام للموقع (255 حرف كحد أقصى؛ يسمح بHTML)"
 
 #. TRANS: Title for button to save site notice in admin panel.
-#: actions/sitenoticeadminpanel.php:201
 #, fuzzy
 msgid "Save site notice."
 msgstr "احفظ إشعار الموقع"
 
 #. TRANS: Title for SMS settings.
-#: actions/smssettings.php:56
 msgid "SMS settings"
 msgstr "إعدادات الرسائل القصيرة"
 
 #. TRANS: SMS settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/smssettings.php:70
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr "لا يمكنك استلام رسائل قصيرة عبر البريد الإلكرتوني من %%site.name%%."
 
 #. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
-#: actions/smssettings.php:92
 msgid "SMS is not available."
 msgstr "الرسائل القصيرة غير متوفرة."
 
 #. TRANS: Form legend for SMS settings form.
-#: actions/smssettings.php:106
 msgid "SMS address"
 msgstr "عنوان الرسائل القصيرة"
 
 #. TRANS: Form guide in SMS settings form.
-#: actions/smssettings.php:115
 #, fuzzy
 msgid "Current confirmed SMS-enabled phone number."
 msgstr "عنوان البريد الإلكتروني المُؤكد الحالي."
 
 #. TRANS: Form guide in IM settings form.
-#: actions/smssettings.php:128
 #, fuzzy
 msgid "Awaiting confirmation on this phone number."
 msgstr "إن رقم التأكيد هذا خاطئ."
 
 #. TRANS: Field label for SMS address input in SMS settings form.
-#: actions/smssettings.php:137
 msgid "Confirmation code"
 msgstr "رمز التأكيد"
 
 #. TRANS: Form field instructions in SMS settings form.
-#: actions/smssettings.php:139
 msgid "Enter the code you received on your phone."
 msgstr "أدخِل الرمز الذي تلقيته على هاتفك."
 
 #. TRANS: Button label to confirm SMS confirmation code in SMS settings.
-#: actions/smssettings.php:143
 msgctxt "BUTTON"
 msgid "Confirm"
 msgstr "أكّد"
 
 #. TRANS: Field label for SMS phone number input in SMS settings form.
-#: actions/smssettings.php:148
 msgid "SMS phone number"
 msgstr "رقم هاتف SMS"
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
-#: actions/smssettings.php:151
 #, fuzzy
 msgid "Phone number, no punctuation or spaces, with area code."
 msgstr "رقم الهاتف بدون شرطات أو مسافات مع رمز المنطقة"
 
 #. TRANS: Form legend for SMS preferences form.
-#: actions/smssettings.php:190
 msgid "SMS preferences"
 msgstr "تفضيلات الرسائل القصيرة"
 
 #. TRANS: Checkbox label in SMS preferences form.
-#: actions/smssettings.php:196
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
 msgstr ""
 
 #. TRANS: Confirmation message for successful SMS preferences save.
-#: actions/smssettings.php:307
 msgid "SMS preferences saved."
 msgstr "حُفظت تفضيلات الرسائل القصيرة."
 
 #. TRANS: Message given saving SMS phone number without having provided one.
-#: actions/smssettings.php:329
 msgid "No phone number."
 msgstr "لا رقم هاتف."
 
 #. TRANS: Message given saving SMS phone number without having selected a carrier.
-#: actions/smssettings.php:335
 #, fuzzy
 msgid "No carrier selected."
 msgstr "حُذف الإشعار."
 
 #. TRANS: Message given saving SMS phone number that is already set.
-#: actions/smssettings.php:343
 #, fuzzy
 msgid "That is already your phone number."
 msgstr "هذا ليس رقم هاتفك."
 
 #. TRANS: Message given saving SMS phone number that is already set for another user.
-#: actions/smssettings.php:347
 #, fuzzy
 msgid "That phone number already belongs to another user."
 msgstr "هذا البريد الإلكتروني ملك مستخدم آخر بالفعل."
 
 #. TRANS: Message given saving valid SMS phone number that is to be confirmed.
-#: actions/smssettings.php:375
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
 "for the code and instructions on how to use it."
@@ -6050,39 +4960,32 @@ msgstr ""
 "والتعليمات لكيفية استخدامه."
 
 #. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
-#: actions/smssettings.php:403
 msgid "That is the wrong confirmation number."
 msgstr "إن رقم التأكيد هذا خاطئ."
 
 #. TRANS: Message given after successfully canceling SMS phone number confirmation.
-#: actions/smssettings.php:417
 msgid "SMS confirmation cancelled."
 msgstr "أُلغي تأكيد الرسائل القصيرة."
 
 #. TRANS: Message given trying to remove an SMS phone number that is not
 #. TRANS: registered for the active user.
-#: actions/smssettings.php:437
 msgid "That is not your phone number."
 msgstr "هذا ليس رقم هاتفك."
 
 #. TRANS: Message given after successfully removing a registered SMS phone number.
-#: actions/smssettings.php:459
 msgid "The SMS phone number was removed."
 msgstr "تمت إزالة رقم هاتف الرسائل القصيرة."
 
 #. TRANS: Label for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:498
 msgid "Mobile carrier"
 msgstr "شركة الهاتف الخليوي"
 
 #. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:503
 msgid "Select a carrier"
 msgstr "اختر شركة"
 
 #. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
 #. TRANS: %s is an administrative contact's e-mail address.
-#: actions/smssettings.php:512
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -6090,124 +4993,99 @@ msgid ""
 msgstr ""
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
-#: actions/smssettings.php:534
 #, fuzzy
 msgid "No code entered."
 msgstr "لم تدخل رمزًا"
 
 #. TRANS: Menu item for site administration
-#: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
-#: lib/adminpanelaction.php:395
 msgid "Snapshots"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:65
 #, fuzzy
 msgid "Manage snapshot configuration"
 msgstr "غيّر ضبط الموقع"
 
-#: actions/snapshotadminpanel.php:127
 #, fuzzy
 msgid "Invalid snapshot run value."
 msgstr "محتوى إشعار غير صالح."
 
-#: actions/snapshotadminpanel.php:133
 msgid "Snapshot frequency must be a number."
 msgstr ""
 
-#: actions/snapshotadminpanel.php:144
 #, fuzzy
 msgid "Invalid snapshot report URL."
 msgstr "مسار شعار غير صالح."
 
-#: actions/snapshotadminpanel.php:200
 msgid "Randomly during web hit"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:201
 msgid "In a scheduled job"
 msgstr "في مهمة مُجدولة"
 
-#: actions/snapshotadminpanel.php:206
 msgid "Data snapshots"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:208
 msgid "When to send statistical data to status.net servers"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:217
 msgid "Frequency"
 msgstr "التكرار"
 
-#: actions/snapshotadminpanel.php:218
 msgid "Snapshots will be sent once every N web hits"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:226
 msgid "Report URL"
 msgstr "بلّغ عن المسار"
 
-#: actions/snapshotadminpanel.php:227
 msgid "Snapshots will be sent to this URL"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:248
 #, fuzzy
 msgid "Save snapshot settings"
 msgstr "اذف إعدادت الموقع"
 
 #. TRANS: Client error displayed trying a change a subscription for a non-subscribed profile.
-#: actions/subedit.php:75
 #, fuzzy
 msgid "You are not subscribed to that profile."
 msgstr "لست مُشتركًا بأي أحد."
 
 #. TRANS: Server error displayed when updating a subscription fails with a database error.
 #. TRANS: Exception thrown when a subscription could not be stored on the server.
-#: actions/subedit.php:89 classes/Subscription.php:141
 msgid "Could not save subscription."
 msgstr "تعذّر حفظ الاشتراك."
 
 #. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
-#: actions/subscribe.php:121
 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
 msgstr ""
 
 #. TRANS: Page title when subscription succeeded.
-#: actions/subscribe.php:149
 msgid "Subscribed"
 msgstr "مُشترك"
 
 #. TRANS: Header for list of subscribers for a user (first page).
 #. TRANS: %s is the user's nickname.
-#: actions/subscribers.php:51
 #, php-format
 msgid "%s subscribers"
 msgstr "مشتركو %s"
 
 #. TRANS: Header for list of subscribers for a user (not first page).
 #. TRANS: %1$s is the user's nickname, $2$d is the page number.
-#: actions/subscribers.php:55
 #, php-format
 msgid "%1$s subscribers, page %2$d"
 msgstr "مشتركو %1$s, الصفحة %2$d"
 
 #. TRANS: Page notice for page with an overview of all subscribers
 #. TRANS: of the logged in user's own profile.
-#: actions/subscribers.php:68
 msgid "These are the people who listen to your notices."
 msgstr "هؤلاء هم الأشخاص الذين يستمعون إلى إشعاراتك."
 
 #. TRANS: Page notice for page with an overview of all subscribers of a user other
 #. TRANS: than the logged in user. %s is the user nickname.
-#: actions/subscribers.php:74
 #, fuzzy, php-format
 msgid "These are the people who listen to %s's notices."
 msgstr "هؤلاء هم الأشخاص الذين يستمعون إلى إشعاراتك."
 
 #. TRANS: Subscriber list text when the logged in user has no subscribers.
-#: actions/subscribers.php:114
 msgid ""
 "You have no subscribers. Try subscribing to people you know and they might "
 "return the favor."
@@ -6215,7 +5093,6 @@ msgstr "ليس لديك مشتركون. جرِّب الاشتراك مع أشخ
 
 #. TRANS: Subscriber list text when looking at the subscribers for a of a user other
 #. TRANS: than the logged in user that has no subscribers. %s is the user nickname.
-#: actions/subscribers.php:118
 #, php-format
 msgid "%s has no subscribers. Want to be the first?"
 msgstr ""
@@ -6225,7 +5102,6 @@ msgstr ""
 #. TRANS: This message contains a Markdown URL. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.
-#: actions/subscribers.php:127
 #, php-format
 msgid ""
 "%s has no subscribers. Why not [register an account](%%%%action.register%%%"
@@ -6234,20 +5110,17 @@ msgstr ""
 
 #. TRANS: Header for subscriptions overview for a user (not first page).
 #. TRANS: %1$s is a user nickname, %2$d is the page number.
-#: actions/subscriptions.php:55
 #, php-format
 msgid "%1$s subscriptions, page %2$d"
 msgstr "اشتراكات%1$s, الصفحة %2$d"
 
 #. TRANS: Page notice for page with an overview of all subscriptions
 #. TRANS: of the logged in user's own profile.
-#: actions/subscriptions.php:68
 msgid "These are the people whose notices you listen to."
 msgstr "هؤلاء الأشخاص الذي تستمع إليهم."
 
 #. TRANS: Page notice for page with an overview of all subscriptions of a user other
 #. TRANS: than the logged in user. %s is the user nickname.
-#: actions/subscriptions.php:74
 #, php-format
 msgid "These are the people whose notices %s listens to."
 msgstr "هؤلاء الأشخاص الذي يستمع %s إليهم."
@@ -6256,7 +5129,6 @@ 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.
-#: actions/subscriptions.php:133
 #, php-format
 msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "
@@ -6270,69 +5142,55 @@ msgstr ""
 #. TRANS: than the logged in user that has no subscriptions. %s is the user nickname.
 #. TRANS: Subscription list text when looking at the subscriptions for a of a user that has none
 #. TRANS: as an anonymous user. %s is the user nickname.
-#: actions/subscriptions.php:141 actions/subscriptions.php:147
 #, fuzzy, php-format
 msgid "%s is not listening to anyone."
 msgstr "%1$s يستمع الآن إلى إشعاراتك على %2$s."
 
 #. TRANS: Atom feed title. %s is a profile nickname.
-#: actions/subscriptions.php:176
 #, fuzzy, php-format
 msgid "Subscription feed for %s (Atom)"
 msgstr "الردود على %s"
 
 #. TRANS: Checkbox label for enabling Jabber messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:241 lib/settingsnav.php:110
-#, fuzzy
 msgid "IM"
 msgstr "محادثة فورية"
 
 #. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:256 lib/settingsnav.php:117
 msgid "SMS"
 msgstr "رسائل قصيرة"
 
 #. TRANS: Title for all but the first page of notices with tags.
 #. TRANS: %1$s is the tag, %2$d is the page number.
-#: actions/tag.php:73
 #, php-format
 msgid "Notices tagged with %1$s, page %2$d"
 msgstr "الإشعارات الموسومة ب%s، الصفحة %2$d"
 
-#: actions/tag.php:91
 #, php-format
 msgid "Notice feed for tag %s (RSS 1.0)"
 msgstr ""
 
-#: actions/tag.php:97
 #, php-format
 msgid "Notice feed for tag %s (RSS 2.0)"
 msgstr ""
 
-#: actions/tag.php:103
 #, php-format
 msgid "Notice feed for tag %s (Atom)"
 msgstr ""
 
-#: actions/tagother.php:39
 msgid "No ID argument."
 msgstr "لا مدخل هوية."
 
-#: actions/tagother.php:65
 #, fuzzy, php-format
 msgid "Tag %s"
 msgstr "الوسوم"
 
 #. TRANS: H2 for user profile information.
-#: actions/tagother.php:77 lib/userprofile.php:76
 msgid "User profile"
 msgstr "ملف المستخدم الشخصي"
 
-#: actions/tagother.php:120
 msgid "Tag user"
 msgstr "اوسم المستخدم"
 
-#: actions/tagother.php:130
 #, fuzzy
 msgid ""
 "Tags for this user (letters, numbers, -, ., and _), comma- or space- "
@@ -6340,224 +5198,179 @@ msgid ""
 msgstr ""
 "سِم نفسك (حروف وأرقام و \"-\" و \".\" و \"_\")، افصلها بفاصلة (',') أو مسافة."
 
-#: actions/tagother.php:157
 #, php-format
 msgid "Invalid tag: \"%s\""
 msgstr "وسم غير صالح: \"%s\""
 
-#: actions/tagother.php:172
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 
-#: actions/tagother.php:215
 #, fuzzy
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr "استخدم هذا النموذج لتعدل تطبيقك."
 
-#: actions/tagrss.php:35
 msgid "No such tag."
 msgstr "لا وسم كهذا."
 
 #. TRANS: Client error displayed when trying to unblock a non-blocked user.
-#: actions/unblock.php:59
 msgid "You haven't blocked that user."
 msgstr "لم تمنع هذا المستخدم."
 
-#: actions/unsandbox.php:72
 msgid "User is not sandboxed."
 msgstr "المستخدم ليس في صندوق الرمل."
 
-#: actions/unsilence.php:72
 msgid "User is not silenced."
 msgstr "المستخدم ليس مُسكتًا."
 
-#: actions/unsubscribe.php:77
 #, fuzzy
 msgid "No profile ID in request."
 msgstr "لا طلب استيثاق."
 
-#: actions/unsubscribe.php:98
 msgid "Unsubscribed"
 msgstr "غير مشترك"
 
-#: actions/updateprofile.php:64
 #, php-format
 msgid ""
 "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
 msgstr ""
 
-#: actions/urlsettings.php:60
 #, fuzzy
 msgid "URL settings"
 msgstr "إعدادات المراسلة الفورية"
 
 #. TRANS: Instructions for tab "Other" in user profile settings.
-#: actions/urlsettings.php:72
 msgid "Manage various other options."
 msgstr "أدر خيارات أخرى عديدة."
 
 #. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
 #. TRANS: user's profile settings. This message has one space at the beginning. Use your
 #. TRANS: language's word separator here if it has one (most likely a single space).
-#: actions/urlsettings.php:115
 msgid " (free service)"
 msgstr " (خدمة حرة)"
 
-#: actions/urlsettings.php:121
 #, fuzzy
 msgid "[none]"
 msgstr "لا شيء"
 
-#: actions/urlsettings.php:122
 msgid "[internal]"
 msgstr ""
 
 #. TRANS: Label for dropdown with URL shortener services.
-#: actions/urlsettings.php:130
 msgid "Shorten URLs with"
 msgstr "قصّر المسارات بـ"
 
 #. TRANS: Tooltip for for dropdown with URL shortener services.
-#: actions/urlsettings.php:132
 msgid "Automatic shortening service to use."
 msgstr "خدمة التقصير المطلوب استخدامها."
 
-#: actions/urlsettings.php:138
 msgid "URL longer than"
 msgstr ""
 
-#: actions/urlsettings.php:141
 msgid "URLs longer than this will be shortened, 0 means always shorten."
 msgstr ""
 
-#: actions/urlsettings.php:145
 msgid "Text longer than"
 msgstr ""
 
-#: actions/urlsettings.php:148
 msgid ""
 "URLs in notices longer than this will be shortened, 0 means always shorten."
 msgstr ""
 
 #. TRANS: Form validation error for form "Other settings" in user profile.
-#: actions/urlsettings.php:180
 #, fuzzy
 msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr "الاسم الكامل طويل جدا (الأقصى 255 حرفًا)"
 
-#: actions/urlsettings.php:187
 msgid "Invalid number for max url length."
 msgstr ""
 
-#: actions/urlsettings.php:193
 #, fuzzy
 msgid "Invalid number for max notice length."
 msgstr "محتوى إشعار غير صالح."
 
-#: actions/urlsettings.php:238
 msgid "Error saving user URL shortening preferences."
 msgstr ""
 
 #. TRANS: User admin panel title
-#: actions/useradminpanel.php:58
 msgctxt "TITLE"
 msgid "User"
 msgstr "المستخدم"
 
 #. TRANS: Instruction for user admin panel.
-#: actions/useradminpanel.php:69
 msgid "User settings for this StatusNet site"
 msgstr ""
 
 #. TRANS: Form validation error in user admin panel when a non-numeric character limit was set.
-#: actions/useradminpanel.php:147
 msgid "Invalid bio limit. Must be numeric."
 msgstr ""
 
 #. TRANS: Form validation error in user admin panel when welcome text is too long.
-#: actions/useradminpanel.php:154
 #, fuzzy
 msgid "Invalid welcome text. Maximum length is 255 characters."
 msgstr "رسالة ترحيب غير صالحة. أقصى طول هو 255 حرف."
 
 #. TRANS: Client error displayed when trying to set a non-existing user as default subscription for new
 #. TRANS: users in user admin panel. %1$s is the invalid nickname.
-#: actions/useradminpanel.php:166
 #, php-format
 msgid "Invalid default subscripton: \"%1$s\" is not a user."
 msgstr ""
 
-#: actions/useradminpanel.php:215 lib/action.php:565 lib/settingsnav.php:77
-#: lib/subgroupnav.php:81
 msgid "Profile"
 msgstr "الملف الشخصي"
 
 #. TRANS: Field label in user admin panel for setting the character limit for the bio field.
-#: actions/useradminpanel.php:220
 msgid "Bio Limit"
 msgstr "حد السيرة"
 
 #. TRANS: Tooltip in user admin panel for setting the character limit for the bio field.
-#: actions/useradminpanel.php:222
 msgid "Maximum length of a profile bio in characters."
 msgstr "الحد الأقصى لطول التعريف الشخصي في حساب المستخدم (بالأحرف)."
 
 #. TRANS: Form legend in user admin panel.
-#: actions/useradminpanel.php:231
 msgid "New users"
 msgstr "مستخدمون جدد"
 
 #. TRANS: Field label in user admin panel for setting new user welcome text.
-#: actions/useradminpanel.php:236
 msgid "New user welcome"
 msgstr "ترحيب المستخدمين الجدد"
 
 #. TRANS: Tooltip in user admin panel for setting new user welcome text.
-#: actions/useradminpanel.php:238
 #, fuzzy
 msgid "Welcome text for new users (maximum 255 characters)."
 msgstr "نص الترحيب بالمستخدمين الجدد (255 حرفًا كحد أقصى)."
 
 #. TRANS: Field label in user admin panel for setting default subscription for new users.
-#: actions/useradminpanel.php:244
 msgid "Default subscription"
 msgstr "الاشتراك المبدئي"
 
 #. TRANS: Tooltip in user admin panel for setting default subscription for new users.
-#: actions/useradminpanel.php:246
 msgid "Automatically subscribe new users to this user."
 msgstr "أشرك المستخدمين الجدد بهذا المستخدم تلقائيًا."
 
 #. TRANS: Form legend in user admin panel.
-#: actions/useradminpanel.php:256
 msgid "Invitations"
 msgstr "الدعوات"
 
 #. TRANS: Field label for checkbox in user admin panel for allowing users to invite friend using site e-mail.
-#: actions/useradminpanel.php:262
 msgid "Invitations enabled"
 msgstr "الدعوات مُفعلة"
 
 #. TRANS: Tooltip for checkbox in user admin panel for allowing users to invite friend using site e-mail.
-#: actions/useradminpanel.php:265
 msgid "Whether to allow users to invite new users."
 msgstr "اسمح للمستخدمين بدعوة مستخدمين جدد."
 
 #. TRANS: Title for button to save user settings in user admin panel.
-#: actions/useradminpanel.php:302
 #, fuzzy
 msgid "Save user settings."
 msgstr "احفظ إعدادات المستخدم"
 
 #. TRANS: Page title.
-#: actions/userauthorization.php:109
 #, fuzzy
 msgid "Authorize subscription"
 msgstr "جميع الاشتراكات"
 
 #. TRANS: Page notice on "Auhtorize subscription" page.
-#: actions/userauthorization.php:115
 #, fuzzy
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
@@ -6568,43 +5381,36 @@ msgstr ""
 "المستخدم. إذا لم تطلب للتو الاستماع لإشعارات شخص ما فانقر \"ارفض\"."
 
 #. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:200
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Accept"
 msgstr "اقبل"
 
 #. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:202
 #, fuzzy
 msgid "Subscribe to this user."
 msgstr "اشترك بهذا المستخدم"
 
 #. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:204
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Reject"
 msgstr "ارفض"
 
 #. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:206
 #, fuzzy
 msgid "Reject this subscription."
 msgstr "ارفض هذا الاشتراك"
 
 #. TRANS: Client error displayed for an empty authorisation request.
-#: actions/userauthorization.php:219
 msgid "No authorization request!"
 msgstr "لا طلب استيثاق!"
 
 #. TRANS: Accept message header from Authorise subscription page.
-#: actions/userauthorization.php:242
 #, fuzzy
 msgid "Subscription authorized"
 msgstr "رُفض الاشتراك"
 
-#: actions/userauthorization.php:245
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to authorize the "
@@ -6612,11 +5418,9 @@ msgid ""
 msgstr ""
 
 #. TRANS: Reject message header from Authorise subscription page.
-#: actions/userauthorization.php:256
 msgid "Subscription rejected"
 msgstr "رُفض الاشتراك"
 
-#: actions/userauthorization.php:259
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to fully reject the "
@@ -6625,35 +5429,30 @@ msgstr ""
 
 #. TRANS: Exception thrown when no valid user is found for an authorisation request.
 #. TRANS: %s is a listener URI.
-#: actions/userauthorization.php:296
 #, php-format
 msgid "Listener URI \"%s\" not found here."
 msgstr ""
 
 #. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
 #. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:303
 #, fuzzy, php-format
 msgid "Listenee URI \"%s\" is too long."
 msgstr "المسار المصدر طويل جدًا."
 
 #. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
 #. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:311
 #, php-format
 msgid "Listenee URI \"%s\" is a local user."
 msgstr ""
 
 #. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
 #. TRANS: %s is a profile URL.
-#: actions/userauthorization.php:329
 #, php-format
 msgid "Profile URL \"%s\" is for a local user."
 msgstr ""
 
 #. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
 #. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
-#: actions/userauthorization.php:339
 #, php-format
 msgid ""
 "Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
@@ -6662,75 +5461,61 @@ msgstr ""
 
 #. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
 #. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:349
 #, fuzzy, php-format
 msgid "Avatar URL \"%s\" is not valid."
 msgstr "مسار المصدر ليس صحيحا."
 
 #. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
 #. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:356
 #, fuzzy, php-format
 msgid "Cannot read avatar URL \"%s\"."
 msgstr "تعذر قراءة رابط الأفتار ‘%s’."
 
 #. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
 #. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:363
 #, php-format
 msgid "Wrong image type for avatar URL \"%s\"."
 msgstr ""
 
 #. TRANS: Page title for profile design page.
-#: actions/userdesignsettings.php:74 lib/designsettings.php:61
 msgid "Profile design"
 msgstr "تصميم الملف الشخصي"
 
 #. TRANS: Instructions for profile design page.
-#: actions/userdesignsettings.php:84 lib/designsettings.php:72
 msgid ""
 "Customize the way your profile looks with a background image and a colour "
 "palette of your choice."
 msgstr "خصّص أسلوب عرض ملفك بصورة خلفية ومخطط ألوان من اختيارك."
 
-#: actions/userdesignsettings.php:289
 msgid "Enjoy your hotdog!"
 msgstr "استمتع بالنقانق!"
 
-#: actions/userdesignsettings.php:325
 #, fuzzy
 msgid "Design settings"
 msgstr "اذف إعدادت الموقع"
 
-#: actions/userdesignsettings.php:340
 msgid "View profile designs"
 msgstr "اعرض تصاميم الملف الشخصي"
 
-#: actions/userdesignsettings.php:341
 msgid "Show or hide profile designs."
 msgstr "أظهر أو أخفِ تصاميم الملفات الشخصية."
 
-#: actions/userdesignsettings.php:348
 #, fuzzy
 msgid "Background file"
 msgstr "الخلفية"
 
 #. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number.
-#: actions/usergroups.php:66
 #, php-format
 msgid "%1$s groups, page %2$d"
 msgstr "مجموعات %1$s، الصفحة %2$d"
 
-#: actions/usergroups.php:132
 msgid "Search for more groups"
 msgstr "ابحث عن المزيد من المجموعات"
 
-#: actions/usergroups.php:159
 #, php-format
 msgid "%s is not a member of any group."
 msgstr "%s ليس عضوًا في أي مجموعة."
 
-#: actions/usergroups.php:164
 #, php-format
 msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
 msgstr "جرّب [البحث عن مجموعات](%%action.groupsearch%%) والانضمام إليها."
@@ -6740,18 +5525,14 @@ msgstr "جرّب [البحث عن مجموعات](%%action.groupsearch%%) وال
 #. TRANS: %1$s is a group name, %2$s is a site name.
 #. TRANS: Message is used as a subtitle in atom user notice feed.
 #. TRANS: %1$s is a user name, %2$s is a site name.
-#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:70
-#: lib/atomusernoticefeed.php:95
 #, fuzzy, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr "الإشعارات التي فضلها %1$s في %2$s!"
 
-#: actions/version.php:75
 #, php-format
 msgid "StatusNet %s"
 msgstr "ستاتس نت %s"
 
-#: actions/version.php:155
 #, php-format
 msgid ""
 "This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
@@ -6760,16 +5541,13 @@ msgstr ""
 "هذا الموقع يشغله %1$s النسخة %2$s، حقوق النشر 2008-2010 StatusNet, Inc "
 "ومساهموها."
 
-#: actions/version.php:163
 msgid "Contributors"
 msgstr "المساهمون"
 
 #. TRANS: Menu item for site administration
-#: actions/version.php:167 lib/adminpanelaction.php:403
 msgid "License"
 msgstr "الرخصة"
 
-#: actions/version.php:170
 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 "
@@ -6780,7 +5558,6 @@ msgstr ""
 "العمومية كما نشرتها مؤسسة البرمجيات الحرة، برخصتها الثالثة أو أي نسخة تليها "
 "(أيهما تشاء)."
 
-#: actions/version.php:176
 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 "
@@ -6788,7 +5565,6 @@ msgid ""
 "for more details. "
 msgstr ""
 
-#: actions/version.php:182
 #, php-format
 msgid ""
 "You should have received a copy of the GNU Affero General Public License "
@@ -6796,52 +5572,42 @@ msgid ""
 msgstr ""
 
 #. TRANS: Form input field label for application name.
-#: actions/version.php:197 lib/applicationeditform.php:190
 msgid "Name"
 msgstr "الاسم"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:885
 msgid "Version"
 msgstr "النسخة"
 
-#: actions/version.php:199
 msgid "Author(s)"
 msgstr "المؤلف(ون)"
 
 #. TRANS: Form input field label.
-#: actions/version.php:200 lib/applicationeditform.php:208
-#: lib/groupeditform.php:168
 msgid "Description"
 msgstr "الوصف"
 
 #. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:164
 msgid "Favor"
 msgstr "فضّل"
 
 #. TRANS: Ntofication given when a user marks a notice as favorite.
 #. TRANS: %1$s is a user nickname or full name, %2$s is a notice URI.
-#: classes/Fave.php:167
 #, fuzzy, php-format
 msgid "%1$s marked notice %2$s as a favorite."
 msgstr "لقد أضاف %s (@%s) إشعارك إلى مفضلاته"
 
 #. TRANS: Server exception thrown when a URL cannot be processed.
-#: classes/File.php:162
 #, php-format
 msgid "Cannot process URL '%s'"
 msgstr ""
 
 #. TRANS: Server exception thrown when... Robin thinks something is impossible!
-#: classes/File.php:194
 msgid "Robin thinks something is impossible."
 msgstr ""
 
 #. 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$s is used for plural.
-#: classes/File.php:210
 #, php-format
 msgid ""
 "No file may be larger than %1$d byte and the file you sent was %2$d bytes. "
@@ -6858,7 +5624,6 @@ msgstr[5] ""
 
 #. TRANS: Message given if an upload would exceed user quota.
 #. TRANS: %d (number) is the user quota in bytes and is used for plural.
-#: classes/File.php:223
 #, php-format
 msgid "A file this large would exceed your user quota of %d byte."
 msgid_plural "A file this large would exceed your user quota of %d bytes."
@@ -6871,7 +5636,6 @@ msgstr[5] ""
 
 #. TRANS: Message given id an upload would exceed a user's monthly quota.
 #. TRANS: $d (number) is the monthly user quota in bytes and is used for plural.
-#: classes/File.php:235
 #, php-format
 msgid "A file this large would exceed your monthly quota of %d byte."
 msgid_plural "A file this large would exceed your monthly quota of %d bytes."
@@ -6883,160 +5647,133 @@ msgstr[4] ""
 msgstr[5] ""
 
 #. TRANS: Client exception thrown if a file upload does not have a valid name.
-#: classes/File.php:282 classes/File.php:297
 #, fuzzy
 msgid "Invalid filename."
 msgstr "حجم غير صالح."
 
 #. TRANS: Exception thrown when joining a group fails.
-#: classes/Group_member.php:51
 msgid "Group join failed."
 msgstr "الانضمام للمجموعة فشل."
 
 #. TRANS: Exception thrown when trying to leave a group the user is not a member of.
-#: classes/Group_member.php:64
 msgid "Not part of group."
 msgstr "ليس جزءا من المجموعة."
 
 #. TRANS: Exception thrown when trying to leave a group fails.
-#: classes/Group_member.php:72
 msgid "Group leave failed."
 msgstr "ترك المجموعة فشل."
 
 #. TRANS: Exception thrown providing an invalid profile ID.
 #. TRANS: %s is the invalid profile ID.
-#: classes/Group_member.php:85
 #, php-format
 msgid "Profile ID %s is invalid."
 msgstr ""
 
 #. TRANS: Exception thrown providing an invalid group ID.
 #. TRANS: %s is the invalid group ID.
-#: classes/Group_member.php:98
 #, fuzzy, php-format
 msgid "Group ID %s is invalid."
 msgstr "خطأ أثناء حفظ المستخدم؛ غير صالح."
 
 #. TRANS: Activity title.
-#: classes/Group_member.php:147 lib/joinform.php:114
 msgid "Join"
 msgstr "انضم"
 
 #. TRANS: Success message for subscribe to group attempt through OStatus.
 #. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
-#: classes/Group_member.php:151
 #, php-format
 msgid "%1$s has joined group %2$s."
 msgstr ""
 
 #. TRANS: Server exception thrown when updating a local group fails.
-#: classes/Local_group.php:42
 msgid "Could not update local group."
 msgstr "تعذر تحديث المجموعة المحلية."
 
 #. TRANS: Exception thrown when trying creating a login token failed.
 #. TRANS: %s is the user nickname for which token creation failed.
-#: classes/Login_token.php:78
 #, php-format
 msgid "Could not create login token for %s"
 msgstr "لم يمكن إنشاء توكن الولوج ل%s"
 
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
-#: classes/Memcached_DataObject.php:556
 msgid "No database name or DSN found anywhere."
 msgstr ""
 
 #. TRANS: Client exception thrown when a user tries to send a direct message while being banned from sending them.
-#: classes/Message.php:45
 msgid "You are banned from sending direct messages."
 msgstr "أنت ممنوع من إرسال رسائل مباشرة."
 
 #. TRANS: Message given when a message could not be stored on the server.
-#: classes/Message.php:69
 msgid "Could not insert message."
 msgstr "تعذّر إدراج الرسالة."
 
 #. TRANS: Message given when a message could not be updated on the server.
-#: classes/Message.php:80
 #, fuzzy
 msgid "Could not update message with new URI."
 msgstr "تعذّر تحليل الرسالة."
 
 #. TRANS: Server exception thrown when a user profile for a notice cannot be found.
 #. TRANS: %1$d is a profile ID (number), %2$d is a notice ID (number).
-#: classes/Notice.php:98
 #, php-format
 msgid "No such profile (%1$d) for notice (%2$d)."
 msgstr ""
 
 #. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:199
 #, php-format
 msgid "Database error inserting hashtag: %s"
 msgstr "خطأ في قاعدة البيانات أثناء حذف مستخدم تطبيق OAuth."
 
 #. TRANS: Client exception thrown if a notice contains too many characters.
-#: classes/Notice.php:279
 msgid "Problem saving notice. Too long."
 msgstr "مشكلة في حفظ الإشعار. طويل جدًا."
 
 #. TRANS: Client exception thrown when trying to save a notice for an unknown user.
-#: classes/Notice.php:284
 msgid "Problem saving notice. Unknown user."
 msgstr "مشكلة في حفظ الإشعار. مستخدم غير معروف."
 
 #. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
-#: classes/Notice.php:290
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 
 #. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
-#: classes/Notice.php:297
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
 "few minutes."
 msgstr ""
 
 #. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:305
 #, fuzzy
 msgid "You are banned from posting notices on this site."
 msgstr "أنت ممنوع من إرسال رسائل مباشرة."
 
 #. TRANS: Server exception thrown when a notice cannot be saved.
 #. TRANS: Server exception thrown when a notice cannot be updated.
-#: classes/Notice.php:372 classes/Notice.php:399
 msgid "Problem saving notice."
 msgstr "مشكلة أثناء حفظ الإشعار."
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:929
 msgid "Bad type provided to saveKnownGroups."
 msgstr ""
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:1028
 #, fuzzy
 msgid "Problem saving group inbox."
 msgstr "مشكلة أثناء حفظ الإشعار."
 
 #. TRANS: Server exception thrown when a reply cannot be saved.
 #. TRANS: %1$d is a notice ID, %2$d is the ID of the mentioned user.
-#: classes/Notice.php:1144
 #, fuzzy, php-format
 msgid "Could not save reply for %1$d, %2$d."
 msgstr "تعذر تحديث المجموعة المحلية."
 
 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1663
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
 
 #. TRANS: Full name of a profile or group followed by nickname in parens
-#: classes/Profile.php:172 classes/User_group.php:242
 #, fuzzy, php-format
 msgctxt "FANCYNAME"
 msgid "%1$s (%2$s)"
@@ -7044,266 +5781,210 @@ msgstr "%1$s (%2$s)"
 
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:779
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:788
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
 
 #. TRANS: Exception thrown when a right for a non-existing user profile is checked.
-#: classes/Remote_profile.php:54
 #, fuzzy
 msgid "Missing profile."
 msgstr "ليس للمستخدم ملف شخصي."
 
 #. TRANS: Exception thrown when a tag cannot be saved.
-#: classes/Status_network.php:338
 #, fuzzy
 msgid "Unable to save tag."
 msgstr "تعذّر حفظ إشعار الموقع."
 
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#: classes/Subscription.php:77 lib/oauthstore.php:482
 msgid "You have been banned from subscribing."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to subscribe while already subscribed.
-#: classes/Subscription.php:82
 msgid "Already subscribed!"
 msgstr "مُشترك أصلا!"
 
 #. TRANS: Exception thrown when trying to subscribe to a user who has blocked the subscribing user.
-#: classes/Subscription.php:87
 msgid "User has blocked you."
 msgstr "لقد منعك المستخدم."
 
 #. TRANS: Exception thrown when trying to unsibscribe without a subscription.
-#: classes/Subscription.php:176
 msgid "Not subscribed!"
 msgstr "غير مشترك!"
 
 #. TRANS: Exception thrown when trying to unsubscribe a user from themselves.
-#: classes/Subscription.php:183
 msgid "Could not delete self-subscription."
 msgstr "تعذّر حذف الاشتراك الذاتي."
 
 #. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
-#: classes/Subscription.php:211
 msgid "Could not delete subscription OMB token."
 msgstr "تعذّر حفظ الاشتراك."
 
 #. TRANS: Exception thrown when a subscription could not be deleted on the server.
-#: classes/Subscription.php:223
 msgid "Could not delete subscription."
 msgstr "تعذّر حفظ الاشتراك."
 
 #. TRANS: Activity tile when subscribing to another person.
-#: classes/Subscription.php:265
 msgid "Follow"
 msgstr ""
 
 #. TRANS: Notification given when one person starts following another.
 #. TRANS: %1$s is the subscriber, %2$s is the subscribed.
-#: classes/Subscription.php:268
 #, fuzzy, php-format
 msgid "%1$s is now following %2$s."
 msgstr "%1$s يستمع الآن إلى إشعاراتك على %2$s."
 
 #. TRANS: Notice given on user registration.
 #. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:390
 #, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr "أهلا بكم في %1$s يا @%2$s!"
 
 #. TRANS: Server exception.
-#: classes/User.php:923
 msgid "No single user defined for single-user mode."
 msgstr ""
 
 #. TRANS: Server exception.
-#: classes/User.php:927
 msgid "Single-user mode code called when not enabled."
 msgstr ""
 
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:522
 msgid "Could not create group."
 msgstr "تعذّر إنشاء المجموعة."
 
 #. TRANS: Server exception thrown when updating a group URI failed.
-#: classes/User_group.php:532
 msgid "Could not set group URI."
 msgstr "تعذّر إنشاء المجموعة."
 
 #. TRANS: Server exception thrown when setting group membership failed.
-#: classes/User_group.php:555
 msgid "Could not set group membership."
 msgstr "تعذّر ضبط عضوية المجموعة."
 
 #. TRANS: Server exception thrown when saving local group information failed.
-#: classes/User_group.php:570
 msgid "Could not save local group info."
 msgstr "تعذر تحديث المجموعة المحلية."
 
 #. TRANS: Exception thrown when an account could not be located when it should be moved.
 #. TRANS: %s is the remote site.
-#: lib/accountmover.php:65
 #, fuzzy, php-format
 msgid "Cannot locate account %s."
 msgstr "لا يمكنك حذف المستخدمين."
 
 #. TRANS: Exception thrown when a service document could not be located account move.
 #. TRANS: %s is the remote site.
-#: lib/accountmover.php:106
 #, php-format
 msgid "Cannot find XRD for %s."
 msgstr ""
 
 #. TRANS: Exception thrown when an account could not be located when it should be moved.
 #. TRANS: %s is the remote site.
-#: lib/accountmover.php:131
 #, php-format
 msgid "No AtomPub API service for %s."
 msgstr ""
 
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: lib/action.php:161
 #, php-format
 msgid "%1$s - %2$s"
 msgstr "%1$s - %2$s"
 
 #. TRANS: Page title for a page without a title set.
-#: lib/action.php:177
 msgid "Untitled page"
 msgstr "صفحة غير مُعنونة"
 
 #. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.
-#: lib/action.php:325
 msgctxt "TOOLTIP"
 msgid "Show more"
 msgstr ""
 
 #. TRANS: Inline reply form submit button: submits a reply comment.
-#: lib/action.php:328
 #, fuzzy
 msgctxt "BUTTON"
-msgid "Comment"
-msgstr "المحتوى"
+msgid "Reply"
+msgstr "رُد"
 
 #. TRANS: Placeholder text for inline reply form. Clicking in this box will turn it into a mini notice form.
-#: lib/action.php:331
-msgid "Add a comment..."
+msgid "Write a reply..."
 msgstr ""
 
-#: lib/action.php:559 lib/personalgroupnav.php:99
-#, fuzzy
 msgid "Home"
-msgstr "الصفحة الرئيسية"
+msgstr "الرئيسية"
 
-#: lib/action.php:560
 #, fuzzy
 msgid "Friends timeline"
 msgstr "مسار %s الزمني"
 
-#: lib/action.php:566
-#, fuzzy
 msgid "Your profile"
-msgstr "ملف المجموعة الشخصي"
+msgstr "ملفك الشخصي"
 
-#: lib/action.php:570 lib/action.php:593 lib/publicgroupnav.php:78
 msgid "Public"
 msgstr "عام"
 
-#: lib/action.php:571 lib/action.php:594
 #, fuzzy
 msgid "Everyone on this site"
 msgstr "ابحث عن أشخاص على هذا الموقع"
 
-#: lib/action.php:575
-#, fuzzy
 msgid "Settings"
-msgstr "إعدادات الرسائل القصيرة"
+msgstr "إعدادات"
 
-#: lib/action.php:576
 #, fuzzy
 msgid "Change your personal settings"
 msgstr "غيّر إعدادات ملفك الشخصي"
 
-#: lib/action.php:582
 #, fuzzy
 msgid "Site configuration"
 msgstr "ضبط المستخدم"
 
-#: lib/action.php:587
-#, fuzzy
 msgid "Logout"
 msgstr "اخرج"
 
-#: lib/action.php:588
-#, fuzzy
 msgid "Logout from the site"
 msgstr "اخرج من الموقع"
 
-#: lib/action.php:599
-#, fuzzy
 msgid "Login to the site"
 msgstr "لُج إلى الموقع"
 
-#: lib/action.php:606
-#, fuzzy
 msgid "Search"
 msgstr "ابحث"
 
-#: lib/action.php:607
 #, fuzzy
 msgid "Search the site"
 msgstr "ابحث في الموقع"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:864
 msgid "Help"
 msgstr "مساعدة"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:867
 msgid "About"
 msgstr "عن"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:870
 msgid "FAQ"
 msgstr "الأسئلة المكررة"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:875
 msgid "TOS"
 msgstr "الشروط"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:879
 msgid "Privacy"
 msgstr "خصوصية"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:882
 msgid "Source"
 msgstr "المصدر"
 
 #. TRANS: Secondary navigation menu option leading to e-mail contact information on the
 #. TRANS: StatusNet site, where to report bugs, ...
-#: lib/action.php:889
 msgid "Contact"
 msgstr "اتصل"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:892
 msgid "Badge"
 msgstr "الجسر"
 
@@ -7311,7 +5992,6 @@ msgstr "الجسر"
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:921
 #, fuzzy, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7321,7 +6001,6 @@ msgstr ""
 "broughtbyurl%%). "
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:924
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr ""
@@ -7330,7 +6009,6 @@ msgstr ""
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:931
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7343,106 +6021,88 @@ msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:949
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:956
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:960
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:992
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1335
 msgid "After"
 msgstr "بعد"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1345
 msgid "Before"
 msgstr "قبل"
 
 #. TRANS: Client exception thrown when a feed instance is a DOMDocument.
-#: lib/activity.php:125
 msgid "Expecting a root feed element but got a whole XML document."
 msgstr ""
 
 #. TRANS: Client exception thrown when using an unknown verb for the activity importer.
-#: lib/activityimporter.php:81
 #, fuzzy, php-format
 msgid "Unknown verb: \"%s\"."
 msgstr "لغة غير معروفة \"%s\"."
 
 #. TRANS: Client exception thrown when trying to force a subscription for an untrusted user.
-#: lib/activityimporter.php:107
 msgid "Cannot force subscription for untrusted user."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to for a remote user to subscribe.
-#: lib/activityimporter.php:117
 #, fuzzy
 msgid "Cannot force remote user to subscribe."
 msgstr "تعذّر تحديث سجل المستخدم."
 
 #. TRANS: Client exception thrown when trying to subscribe to an unknown profile.
-#: lib/activityimporter.php:132
 #, fuzzy
 msgid "Unknown profile."
 msgstr "نوع ملف غير معروف"
 
 #. TRANS: Client exception thrown when trying to import an event not related to the importing user.
-#: lib/activityimporter.php:138
 msgid "This activity seems unrelated to our user."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to join a remote group that is not a group.
-#: lib/activityimporter.php:154
 msgid "Remote profile is not a group!"
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to join a group the importing user is already a member of.
-#: lib/activityimporter.php:163
 #, fuzzy
 msgid "User is already a member of this group."
 msgstr "أنت بالفعل عضو في هذه المجموعة"
 
 #. TRANS: Client exception thrown when trying to import a notice by another user.
 #. TRANS: %1$s is the source URI of the notice, %2$s is the URI of the author.
-#: lib/activityimporter.php:201
 #, php-format
 msgid "Already know about notice %1$s and  it has a different author %2$s."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to overwrite the author information for a non-trusted user during import.
-#: lib/activityimporter.php:207
 msgid "Not overwriting author info for non-trusted user."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to import a notice without content.
 #. TRANS: %s is the notice URI.
-#: lib/activityimporter.php:223
 #, fuzzy, php-format
 msgid "No content for notice %s."
 msgstr "ابحث عن محتويات في الإشعارات"
 
-#: lib/activitymover.php:84
 #, fuzzy, php-format
 msgid "No such user %s."
 msgstr "لا مستخدم كهذا."
@@ -7453,216 +6113,176 @@ msgstr "لا مستخدم كهذا."
 #. TRANS: %1$s is a URL, %2$s is the status, %s$s is the fail reason.
 #. TRANS: Exception thrown when post to collection fails with a status that is not handled.
 #. TRANS: %1$s is a URL, %2$s is the status, %s$s is the fail reason.
-#: lib/activitysink.php:163 lib/activitysink.php:167 lib/activitysink.php:172
 #, fuzzy, php-format
 msgctxt "URLSTATUSREASON"
 msgid "%1$s %2$s %3$s"
 msgstr "%1$s - %2$s"
 
 #. TRANS: Client exception thrown when there is no source attribute.
-#: lib/activityutils.php:200
 msgid "Can't handle remote content yet."
 msgstr ""
 
 #. TRANS: Client exception thrown when there embedded XML content is found that cannot be processed yet.
-#: lib/activityutils.php:237
 msgid "Can't handle embedded XML content yet."
 msgstr ""
 
 #. TRANS: Client exception thrown when base64 encoded content is found that cannot be processed yet.
-#: lib/activityutils.php:242
 msgid "Can't handle embedded Base64 content yet."
 msgstr ""
 
 #. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights.
-#: lib/adminpanelaction.php:96
 msgid "You cannot make changes to this site."
 msgstr "لا يمكنك إجراء تغييرات على هذا الموقع."
 
 #. TRANS: Client error message throw when a certain panel's settings cannot be changed.
-#: lib/adminpanelaction.php:108
 msgid "Changes to that panel are not allowed."
 msgstr "التغييرات لهذه اللوحة غير مسموح بها."
 
 #. TRANS: Client error message.
-#: lib/adminpanelaction.php:222
 #, fuzzy
 msgid "showForm() not implemented."
 msgstr "الأمر لم يُجهزّ بعد."
 
 #. TRANS: Client error message
-#: lib/adminpanelaction.php:250
 #, fuzzy
 msgid "saveSettings() not implemented."
 msgstr "الأمر لم يُجهزّ بعد."
 
 #. TRANS: Client error message thrown if design settings could not be deleted in
 #. TRANS: the admin panel Design.
-#: lib/adminpanelaction.php:274
 msgid "Unable to delete design setting."
 msgstr "تعذّر حذف إعدادات التصميم."
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:337
 msgid "Basic site configuration"
 msgstr "ضبط الموقع الأساسي"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:339
 msgctxt "MENU"
 msgid "Site"
 msgstr "الموقع"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:345
 msgid "Design configuration"
 msgstr "ضبط التصميم"
 
 #. TRANS: Menu item for site administration
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/adminpanelaction.php:347 lib/groupnav.php:135
 msgctxt "MENU"
 msgid "Design"
 msgstr "التصميم"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:353
 msgid "User configuration"
 msgstr "ضبط المستخدم"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:110
 msgid "User"
 msgstr "المستخدم"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:361
 msgid "Access configuration"
 msgstr "ضبط الحساب"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:369
 msgid "Paths configuration"
 msgstr "ضبط المسارات"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:377
 msgid "Sessions configuration"
 msgstr "ضبط الجلسات"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:385
 msgid "Edit site notice"
 msgstr "عدّل إشعار الموقع"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:387
 msgid "Site notice"
 msgstr "إشعار الموقع"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:393
 #, fuzzy
 msgid "Snapshots configuration"
 msgstr "ضبط المسارات"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:401
 msgid "Set site license"
 msgstr ""
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:409
 #, fuzzy
 msgid "Plugins configuration"
 msgstr "ضبط المسارات"
 
 #. TRANS: Client error 401.
-#: lib/apiauth.php:111
 msgid "API resource requires read-write access, but you only have read access."
 msgstr ""
 
 #. TRANS: OAuth exception thrown when no application is found for a given consumer key.
-#: lib/apiauth.php:177
 msgid "No application for that consumer key."
 msgstr ""
 
-#: lib/apiauth.php:202 lib/apiauth.php:284
 msgid "Not allowed to use API."
 msgstr ""
 
 #. TRANS: OAuth exception given when an incorrect access token was given for a user.
-#: lib/apiauth.php:225
 msgid "Bad access token."
 msgstr ""
 
 #. TRANS: OAuth exception given when no user was found for a given token (no token was found).
-#: lib/apiauth.php:230
 msgid "No user for that token."
 msgstr ""
 
 #. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel".
 #. TRANS: Client error thrown when authentication fails.
-#: lib/apiauth.php:272 lib/apiauth.php:302
 msgid "Could not authenticate you."
 msgstr ""
 
 #. TRANS: Server error displayed when trying to create an anynymous OAuth consumer.
-#: lib/apioauthstore.php:45
 #, fuzzy
 msgid "Could not create anonymous consumer."
 msgstr "تعذّر إنشاء الكنى."
 
 #. TRANS: Server error displayed when trying to create an anynymous OAuth application.
-#: lib/apioauthstore.php:69
 #, fuzzy
 msgid "Could not create anonymous OAuth application."
 msgstr "لم يمكن إنشاء التطبيق."
 
 #. TRANS: Exception thrown when no token association could be found.
-#: lib/apioauthstore.php:151
 msgid ""
 "Could not find a profile and application associated with the request token."
 msgstr ""
 
 #. TRANS: Exception thrown when no access token can be issued.
-#: lib/apioauthstore.php:209
 #, fuzzy
 msgid "Could not issue access token."
 msgstr "تعذّر إدراج الرسالة."
 
-#: lib/apioauthstore.php:317
 msgid "Database error inserting OAuth application user."
 msgstr "خطأ في قاعدة البيانات أثناء حذف مستخدم تطبيق OAuth."
 
-#: lib/apioauthstore.php:345
 #, fuzzy
 msgid "Database error updating OAuth application user."
 msgstr "خطأ في قاعدة البيانات أثناء حذف مستخدم تطبيق OAuth."
 
 #. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
-#: lib/apioauthstore.php:371
 msgid "Tried to revoke unknown token."
 msgstr ""
 
 #. TRANS: Exception thrown when an attempt is made to remove a revoked token.
-#: lib/apioauthstore.php:376
 msgid "Failed to delete revoked token."
 msgstr ""
 
 #. TRANS: Form input field label for application icon.
-#: lib/applicationeditform.php:177
 msgid "Icon"
 msgstr "أيقونة"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:182
 msgid "Icon for this application"
 msgstr "أيقونة لهذا التطبيق"
 
 #. TRANS: Form input field instructions.
 #. TRANS: %d is the number of available characters for the description.
-#: lib/applicationeditform.php:201
 #, fuzzy, php-format
 msgid "Describe your application in %d character"
 msgid_plural "Describe your application in %d characters"
@@ -7674,215 +6294,176 @@ msgstr[4] "صف تطبيقك"
 msgstr[5] "صف تطبيقك"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:205
 msgid "Describe your application"
 msgstr "صف تطبيقك"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:216
 msgid "URL of the homepage of this application"
 msgstr "مسار صفحة هذا التطبيق"
 
 #. TRANS: Form input field label.
-#: lib/applicationeditform.php:218
 msgid "Source URL"
 msgstr "مسار المصدر"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:225
 #, fuzzy
 msgid "Organization responsible for this application"
 msgstr "أيقونة لهذا التطبيق"
 
 #. TRANS: Form input field label.
-#: lib/applicationeditform.php:227
 msgid "Organization"
 msgstr "المنظمة"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:234
 #, fuzzy
 msgid "URL for the homepage of the organization"
 msgstr "مسار صفحة هذا التطبيق"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:243
 msgid "URL to redirect to after authentication"
 msgstr ""
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:271
 msgid "Browser"
 msgstr "متصفح"
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:288
 msgid "Desktop"
 msgstr ""
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:290
 msgid "Type of application, browser or desktop"
 msgstr ""
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:314
 msgid "Read-only"
 msgstr ""
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:334
 msgid "Read-write"
 msgstr ""
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:336
 msgid "Default access for this application: read-only, or read-write"
 msgstr ""
 
 #. TRANS: Submit button title.
-#: lib/applicationeditform.php:353
 msgid "Cancel"
 msgstr "ألغِ"
 
-#: lib/applicationlist.php:247
 msgid " by "
 msgstr ""
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:260
 msgid "read-write"
 msgstr ""
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:262
 msgid "read-only"
 msgstr ""
 
 #. TRANS: Used in application list. %1$s is a modified date, %2$s is access type ("read-write" or "read-only")
-#: lib/applicationlist.php:268
 #, php-format
 msgid "Approved %1$s - \"%2$s\" access."
 msgstr ""
 
 #. TRANS: Access token in the application list.
 #. TRANS: %s are the first 7 characters of the access token.
-#: lib/applicationlist.php:282
 #, php-format
 msgid "Access token starting with: %s"
 msgstr ""
 
 #. TRANS: Button label
-#: lib/applicationlist.php:298
 msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "أزل"
 
-#: lib/atom10feed.php:113
 msgid "Author element must contain a name element."
 msgstr ""
 
 #. TRANS: Server exception thrown when using the method setActivitySubject() in the class Atom10Feed.
-#: lib/atom10feed.php:160
 #, fuzzy
 msgid "Do not use this method!"
 msgstr "لا تحذف هذا الإشعار"
 
 #. TRANS: Title.
-#: lib/attachmentnoticesection.php:67
 #, fuzzy
 msgid "Notices where this attachment appears"
 msgstr "وسوم هذا المرفق"
 
 #. TRANS: Title.
-#: lib/attachmenttagcloudsection.php:48
 msgid "Tags for this attachment"
 msgstr "وسوم هذا المرفق"
 
 #. TRANS: Exception thrown when a password change fails.
-#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:227
 #, fuzzy
 msgid "Password changing failed."
 msgstr "تغيير كلمة السر فشل"
 
 #. TRANS: Exception thrown when a password change attempt fails because it is not allowed.
-#: lib/authenticationplugin.php:238
 #, fuzzy
 msgid "Password changing is not allowed."
 msgstr "تغيير كلمة السر غير مسموح به"
 
 #. TRANS: Title for the form to block a user.
-#: lib/blockform.php:68
 msgid "Block"
 msgstr "امنع"
 
 #. TRANS: Description of the form to block a user.
-#: lib/blockform.php:79
 msgid "Block this user"
 msgstr "امنع هذا المستخدم"
 
 #. TRANS: Title for command results.
-#: lib/channel.php:104 lib/channel.php:125
 msgid "Command results"
 msgstr "نتائج الأمر"
 
 #. TRANS: Title for command results.
-#: lib/channel.php:138
 #, fuzzy
 msgid "AJAX error"
 msgstr "خطأ أجاكس"
 
 #. TRANS: E-mail subject when a command has completed.
-#: lib/channel.php:177 lib/mailhandler.php:143
 msgid "Command complete"
 msgstr "اكتمل الأمر"
 
 #. TRANS: E-mail subject when a command has failed.
-#: lib/channel.php:188
 msgid "Command failed"
 msgstr "فشل الأمر"
 
 #. TRANS: Command exception text shown when a notice ID is requested that does not exist.
-#: lib/command.php:82 lib/command.php:106
 #, fuzzy
 msgid "Notice with that id does not exist."
 msgstr "لا ملف بهذه الهوية."
 
 #. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
 #. TRANS: Error text shown when a last user notice is requested and it does not exist.
-#: lib/command.php:99 lib/command.php:642
 #, fuzzy
 msgid "User has no last notice."
 msgstr "ليس للمستخدم إشعار أخير"
 
 #. TRANS: Message given requesting a profile for a non-existing user.
 #. TRANS: %s is the nickname of the user for which the profile could not be found.
-#: lib/command.php:128
 #, fuzzy, php-format
 msgid "Could not find a user with nickname %s."
 msgstr "تعذّر إيجاد المستخدم الهدف."
 
 #. TRANS: Message given getting a non-existing user.
 #. TRANS: %s is the nickname of the user that could not be found.
-#: lib/command.php:148
 #, php-format
 msgid "Could not find a local user with nickname %s."
 msgstr ""
 
 #. TRANS: Error text shown when an unimplemented command is given.
-#: lib/command.php:183
 #, fuzzy
 msgid "Sorry, this command is not yet implemented."
 msgstr "الأمر لم يُجهزّ بعد."
 
 #. TRANS: Command exception text shown when a user tries to nudge themselves.
-#: lib/command.php:229
 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr ""
 
 #. TRANS: Message given having nudged another user.
 #. TRANS: %s is the nickname of the user that was nudged.
-#: lib/command.php:238
 #, fuzzy, php-format
 msgid "Nudge sent to %s."
 msgstr "أرسل التنبيه"
@@ -7891,7 +6472,6 @@ msgstr "أرسل التنبيه"
 #. TRANS: %1$s is the number of other user the user is subscribed to.
 #. TRANS: %2$s is the number of users that are subscribed to the user.
 #. TRANS: %3$s is the number of notices the user has sent.
-#: lib/command.php:268
 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"
@@ -7903,41 +6483,35 @@ msgstr ""
 "الإشعارات: %3$s"
 
 #. TRANS: Error message text shown when a favorite could not be set because it has already been favorited.
-#: lib/command.php:298
 #, fuzzy
 msgid "Could not create favorite: already favorited."
 msgstr "تعذّر إنشاء مفضلة."
 
 #. TRANS: Text shown when a notice has been marked as favourite successfully.
-#: lib/command.php:324
 #, fuzzy
 msgid "Notice marked as fave."
 msgstr "هذا الإشعار مفضلة مسبقًا!"
 
 #. TRANS: Message given having added a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:369
 #, php-format
 msgid "%1$s joined group %2$s."
 msgstr ""
 
 #. TRANS: Message given having removed a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:417
 #, php-format
 msgid "%1$s left group %2$s."
 msgstr ""
 
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: lib/command.php:438
 #, fuzzy, php-format
 msgctxt "WHOIS"
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
 
 #. TRANS: Whois output. %s is the full name of the queried user.
-#: lib/command.php:442
 #, php-format
 msgid "Fullname: %s"
 msgstr "الاسم الكامل: %s"
@@ -7945,7 +6519,6 @@ msgstr "الاسم الكامل: %s"
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a location.
-#: lib/command.php:446 lib/mail.php:275
 #, php-format
 msgid "Location: %s"
 msgstr "الموقع: %s"
@@ -7953,20 +6526,17 @@ msgstr "الموقع: %s"
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a homepage.
-#: lib/command.php:450 lib/mail.php:279
 #, php-format
 msgid "Homepage: %s"
 msgstr "الصفحة الرئيسية: %s"
 
 #. TRANS: Whois output. %s is the bio information of the queried user.
-#: lib/command.php:454
 #, php-format
 msgid "About: %s"
 msgstr "عن: %s"
 
 #. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).
 #. TRANS: %s is a remote profile.
-#: lib/command.php:483
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
@@ -7975,7 +6545,6 @@ msgstr ""
 
 #. TRANS: Message given if content is too long. %1$sd is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:500
 #, fuzzy, php-format
 msgid "Message too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
@@ -7986,27 +6555,27 @@ msgstr[3] "هذه طويلة جدًا. أطول حجم للإشعار %d  حرف
 msgstr[4] "هذه طويلة جدًا. أطول حجم للإشعار %d  حرفًا."
 msgstr[5] "هذه طويلة جدًا. أطول حجم للإشعار %d  حرفًا."
 
+#. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
+msgid "You can't send a message to this user."
+msgstr "لا يمكنك إرسال رسائل إلى هذا المستخدم."
+
 #. TRANS: Error text shown sending a direct message fails with an unknown reason.
-#: lib/command.php:528
 #, fuzzy
 msgid "Error sending direct message."
 msgstr "أنت ممنوع من إرسال رسائل مباشرة."
 
 #. TRANS: Message given having repeated a notice from another user.
 #. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:565
 #, fuzzy, php-format
 msgid "Notice from %s repeated."
 msgstr "الإشعار من %s مكرر"
 
 #. TRANS: Error text shown when repeating a notice fails with an unknown reason.
-#: lib/command.php:568
 msgid "Error repeating notice."
 msgstr "خطأ تكرار الإشعار."
 
 #. TRANS: Message given if content of a notice for a reply is too long. %1$d is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:603
 #, fuzzy, php-format
 msgid "Notice too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Notice too long - maximum is %1$d characters, you sent %2$d."
@@ -8019,100 +6588,83 @@ msgstr[5] "هذه طويلة جدًا. أطول حجم للإشعار %d  حرف
 
 #. TRANS: Text shown having sent a reply to a notice successfully.
 #. TRANS: %s is the nickname of the user of the notice the reply was sent to.
-#: lib/command.php:616
 #, fuzzy, php-format
 msgid "Reply to %s sent."
 msgstr "رُد على رسالة %s"
 
 #. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
-#: lib/command.php:619
 msgid "Error saving notice."
 msgstr "خطأ أثناء حفظ الإشعار."
 
 #. TRANS: Error text shown when no username was provided when issuing a subscribe command.
-#: lib/command.php:666
 msgid "Specify the name of the user to subscribe to."
 msgstr ""
 
 #. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
-#: lib/command.php:675
 msgid "Can't subscribe to OMB profiles by command."
 msgstr ""
 
 #. TRANS: Text shown after having subscribed to another user successfully.
 #. TRANS: %s is the name of the user the subscription was requested for.
-#: lib/command.php:683
 #, php-format
 msgid "Subscribed to %s."
 msgstr ""
 
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.
-#: lib/command.php:704 lib/command.php:815
 msgid "Specify the name of the user to unsubscribe from."
 msgstr ""
 
 #. TRANS: Text shown after having unsubscribed from another user successfully.
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:715
 #, php-format
 msgid "Unsubscribed from %s."
 msgstr ""
 
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
-#: lib/command.php:735 lib/command.php:761
 msgid "Command not yet implemented."
 msgstr "الأمر لم يُجهزّ بعد."
 
 #. TRANS: Text shown when issuing the command "off" successfully.
-#: lib/command.php:739
 msgid "Notification off."
 msgstr "الإشعار مُطفأ."
 
 #. TRANS: Error text shown when the command "off" fails for an unknown reason.
-#: lib/command.php:742
 msgid "Can't turn off notification."
 msgstr "تعذّر إطفاء الإشعارات."
 
 #. TRANS: Text shown when issuing the command "on" successfully.
-#: lib/command.php:765
 msgid "Notification on."
 msgstr "الإشعار يعمل."
 
 #. TRANS: Error text shown when the command "on" fails for an unknown reason.
-#: lib/command.php:768
 msgid "Can't turn on notification."
 msgstr "تعذّر تشغيل الإشعار."
 
 #. TRANS: Error text shown when issuing the login command while login is disabled.
-#: lib/command.php:782
 msgid "Login command is disabled."
 msgstr ""
 
 #. TRANS: Text shown after issuing the login command successfully.
 #. TRANS: %s is a logon link..
-#: lib/command.php:795
 #, php-format
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
 
 #. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:824
 #, php-format
 msgid "Unsubscribed %s."
 msgstr ""
 
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
-#: lib/command.php:842
 msgid "You are not subscribed to anyone."
 msgstr "لست مُشتركًا بأي أحد."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
-#: lib/command.php:847
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "لست مشتركًا بأحد."
@@ -8124,14 +6676,12 @@ msgstr[5] ""
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user
 #. TRANS: (followers) without having any subscribers.
-#: lib/command.php:869
 msgid "No one is subscribed to you."
 msgstr "لا أحد مشترك بك."
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
-#: lib/command.php:874
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "لا أحد مشترك بك."
@@ -8143,14 +6693,12 @@ msgstr[5] ""
 
 #. TRANS: Text shown after requesting groups a user is subscribed to without having
 #. TRANS: any group subscriptions.
-#: lib/command.php:896
 msgid "You are not a member of any groups."
 msgstr "لست عضوًا في أي مجموعة."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
-#: lib/command.php:901
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "لست عضوًا في أي مجموعة."
@@ -8161,7 +6709,6 @@ msgstr[4] ""
 msgstr[5] ""
 
 #. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-#: lib/command.php:916
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -8242,119 +6789,98 @@ msgstr ""
 "tracking - لم يطبق بعد.\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:36
 #, fuzzy
 msgid "No configuration file found."
 msgstr "لا رمز تأكيد."
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:39
 msgid "I looked for configuration files in the following places:"
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:42
 msgid "You may wish to run the installer to fix this."
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:46
 msgid "Go to the installer."
 msgstr "اذهب إلى المُثبّت."
 
-#: lib/dberroraction.php:59
 msgid "Database error"
 msgstr "خطأ قاعدة بيانات"
 
 #. TRANS: Description of form for deleting a user.
-#: lib/deleteuserform.php:75
 msgid "Delete this user"
 msgstr "احذف هذا المستخدم"
 
-#: lib/designform.php:114
 #, fuzzy
 msgid "Change design"
 msgstr "احفظ التصميم"
 
 #. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: lib/designform.php:131
 msgid "Change colours"
 msgstr "تغيير الألوان"
 
 #. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: lib/designform.php:138
 msgid "Use defaults"
 msgstr "استخدم المبدئيات"
 
 #. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: lib/designform.php:140
 msgid "Restore default designs"
 msgstr "استعد التصميمات المبدئية"
 
 #. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: lib/designform.php:148
 msgid "Reset back to default"
 msgstr "ارجع إلى المبدئي"
 
 #. TRANS: Label in form on profile design page.
 #. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
-#: lib/designform.php:158
 msgid "Upload file"
 msgstr "ارفع ملفًا"
 
 #. TRANS: Instructions for form on profile design page.
-#: lib/designform.php:163
 #, fuzzy
 msgid ""
 "You can upload your personal background image. The maximum file size is 2Mb."
 msgstr "تستطيع رفع صورتك الشخصية. أقصى حجم للملف هو 2 م.ب."
 
 #. TRANS: Radio button on profile design page that will enable use of the uploaded profile image.
-#: lib/designform.php:194
 #, fuzzy
 msgctxt "RADIO"
 msgid "On"
 msgstr "مكّن"
 
 #. TRANS: Radio button on profile design page that will disable use of the uploaded profile image.
-#: lib/designform.php:211
 #, fuzzy
 msgctxt "RADIO"
 msgid "Off"
 msgstr "عطّل"
 
 #. TRANS: Title for button on profile design page to save settings.
-#: lib/designform.php:322
 msgid "Save design"
 msgstr "احفظ التصميم"
 
 #. TRANS: Error message displayed if design settings could not be saved.
 #. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
-#: lib/designsettings.php:216 lib/designsettings.php:238
 msgid "Couldn't update your design."
 msgstr "تعذّر تحديث تصميمك."
 
 #. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
-#: lib/designsettings.php:244
 msgid "Design defaults restored."
 msgstr "استعيدت مبدئيات التصميم."
 
 #. TRANS: Exception. %s is an ID.
-#: lib/discovery.php:153
 #, fuzzy, php-format
 msgid "Unable to find services for %s."
 msgstr "استخدم هذا النموذج لتعدل تطبيقك."
 
 #. TRANS: Form legend for removing the favourite status for a favourite notice.
 #. TRANS: Title for button text for removing the favourite status for a favourite notice.
-#: lib/disfavorform.php:108 lib/disfavorform.php:140
 msgid "Disfavor this notice"
 msgstr "ألغِ تفضيل هذا الإشعار"
 
 #. TRANS: Button text for removing the favourite status for a favourite notice.
-#: lib/disfavorform.php:136
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Disfavor favorite"
@@ -8362,90 +6888,70 @@ msgstr "ألغِ تفضيل المفضلة"
 
 #. TRANS: Form legend for adding the favourite status to a notice.
 #. TRANS: Title for button text for adding the favourite status to a notice.
-#: lib/favorform.php:108 lib/favorform.php:139
 msgid "Favor this notice"
 msgstr "فضّل هذا الإشعار"
 
 #. TRANS: Button text for adding the favourite status to a notice.
-#: lib/favorform.php:135
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Favor"
 msgstr "فضّل"
 
-#: lib/feed.php:84
 msgid "RSS 1.0"
 msgstr "آرإس​إس 1.0"
 
-#: lib/feed.php:86
 msgid "RSS 2.0"
 msgstr "آرإس​إس 2.0"
 
-#: lib/feed.php:88
 msgid "Atom"
 msgstr "أتوم"
 
-#: lib/feed.php:90
 msgid "FOAF"
 msgstr "FOAF"
 
-#: lib/feedimporter.php:75
 #, fuzzy
 msgid "Not an atom feed."
 msgstr "جميع الأعضاء"
 
-#: lib/feedimporter.php:82
 msgid "No author in the feed."
 msgstr ""
 
-#: lib/feedimporter.php:89
 msgid "Can't import without a user."
 msgstr ""
 
 #. TRANS: Header for feed links (h2).
-#: lib/feedlist.php:66
 msgid "Feeds"
 msgstr ""
 
-#: lib/galleryaction.php:128
 msgid "All"
 msgstr "الكل"
 
-#: lib/galleryaction.php:136
 msgid "Select tag to filter"
 msgstr "اختر وسمًا لترشيحه"
 
-#: lib/galleryaction.php:137
 msgid "Tag"
 msgstr "الوسم"
 
-#: lib/galleryaction.php:138
 msgid "Choose a tag to narrow list"
 msgstr ""
 
-#: lib/galleryaction.php:140
 msgid "Go"
 msgstr "اذهب"
 
-#: lib/grantroleform.php:91
 #, php-format
 msgid "Grant this user the \"%s\" role"
 msgstr ""
 
-#: lib/groupeditform.php:147
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "1-64 حرفًا إنجليزيًا أو رقمًا بدون نقاط أو مسافات"
 
-#: lib/groupeditform.php:156
 #, fuzzy
 msgid "URL of the homepage or blog of the group or topic."
 msgstr "مسار صفحة هذا التطبيق"
 
-#: lib/groupeditform.php:161
 msgid "Describe the group or topic"
 msgstr "صِف المجموعة أو الموضوع"
 
-#: lib/groupeditform.php:163
 #, fuzzy, php-format
 msgid "Describe the group or topic in %d character or less"
 msgid_plural "Describe the group or topic in %d characters or less"
@@ -8456,13 +6962,11 @@ msgstr[3] "صِف المجموعة أو الموضوع"
 msgstr[4] "صِف المجموعة أو الموضوع"
 msgstr[5] "صِف المجموعة أو الموضوع"
 
-#: lib/groupeditform.php:175
 #, fuzzy
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\"."
 msgstr "مكان تواجدك، على سبيل المثال \"المدينة، الولاية (أو المنطقة)، الدولة\""
 
-#: lib/groupeditform.php:183
 #, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -8478,70 +6982,60 @@ msgstr[4] ""
 msgstr[5] ""
 
 #. TRANS: Menu item in the group navigation page.
-#: lib/groupnav.php:86
 msgctxt "MENU"
 msgid "Group"
 msgstr ""
 
 #. TRANS: Tooltip for menu item in the group navigation page.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:89
 #, php-format
 msgctxt "TOOLTIP"
 msgid "%s group"
 msgstr ""
 
 #. TRANS: Menu item in the group navigation page.
-#: lib/groupnav.php:95
 msgctxt "MENU"
 msgid "Members"
 msgstr ""
 
 #. TRANS: Tooltip for menu item in the group navigation page.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:98
 #, php-format
 msgctxt "TOOLTIP"
 msgid "%s group members"
 msgstr ""
 
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/groupnav.php:108
 msgctxt "MENU"
 msgid "Blocked"
 msgstr ""
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:111
 #, php-format
 msgctxt "TOOLTIP"
 msgid "%s blocked users"
 msgstr ""
 
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "إداري"
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:120
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Edit %s group properties"
 msgstr ""
 
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/groupnav.php:126
 msgctxt "MENU"
 msgid "Logo"
 msgstr ""
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:129
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Add or edit %s logo"
@@ -8549,72 +7043,60 @@ msgstr ""
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:138
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Add or edit %s design"
 msgstr ""
 
 #. TRANS: Title for groups with the most members section.
-#: lib/groupsbymemberssection.php:71
 msgid "Groups with most members"
 msgstr "المجموعات الأكثر أعضاءً"
 
 #. TRANS: Title for groups with the most posts section.
-#: lib/groupsbypostssection.php:71
 msgid "Groups with most posts"
 msgstr "المجموعات الأكثر مرسلات"
 
 #. TRANS: Title for group tag cloud section.
 #. TRANS: %s is a group name.
-#: lib/grouptagcloudsection.php:57
 #, php-format
 msgid "Tags in %s group's notices"
 msgstr "وسوم في إشعارات مجموعة %s"
 
 #. TRANS: Client exception 406
-#: lib/htmloutputter.php:104
 msgid "This page is not available in a media type you accept"
 msgstr ""
 
 #. TRANS: Exception thrown when trying to upload an unsupported image file format.
-#: lib/imagefile.php:73
 #, fuzzy
 msgid "Unsupported image file format."
 msgstr "نسق غير مدعوم."
 
 #. TRANS: Exception thrown when too large a file is uploaded.
 #. TRANS: %s is the maximum file size, for example "500b", "10kB" or "2MB".
-#: lib/imagefile.php:91
 #, php-format
 msgid "That file is too big. The maximum file size is %s."
 msgstr "هذا الملف كبير جدًا. إن أقصى حجم للملفات هو %s."
 
 #. TRANS: Exception thrown when uploading an image and that action could not be completed.
-#: lib/imagefile.php:97
 #, fuzzy
 msgid "Partial upload."
 msgstr "لم يُرفع ملف."
 
 #. TRANS: Exception thrown when uploading a file as image that is not an image or is a corrupt file.
-#: lib/imagefile.php:115
 msgid "Not an image or corrupt file."
 msgstr ""
 
 #. TRANS: Exception thrown during resize when image has been registered as present, but is no longer there.
-#: lib/imagefile.php:178
 #, fuzzy
 msgid "Lost our file."
 msgstr "لا ملف كهذا."
 
 #. TRANS: Exception thrown when trying to resize an unknown file type.
 #. TRANS: Exception thrown when trying resize an unknown file type.
-#: lib/imagefile.php:216 lib/imagefile.php:257
 msgid "Unknown file type"
 msgstr "نوع ملف غير معروف"
 
 #. TRANS: Number of megabytes. %d is the number.
-#: lib/imagefile.php:303
 #, fuzzy, php-format
 msgid "%dMB"
 msgid_plural "%dMB"
@@ -8626,7 +7108,6 @@ msgstr[4] "ميجابايت"
 msgstr[5] "ميجابايت"
 
 #. TRANS: Number of kilobytes. %d is the number.
-#: lib/imagefile.php:307
 #, fuzzy, php-format
 msgid "%dkB"
 msgid_plural "%dkB"
@@ -8638,7 +7119,6 @@ msgstr[4] "كيلوبايت"
 msgstr[5] "كيلوبايت"
 
 #. TRANS: Number of bytes. %d is the number.
-#: lib/imagefile.php:310
 #, php-format
 msgid "%dB"
 msgid_plural "%dB"
@@ -8649,7 +7129,6 @@ msgstr[3] ""
 msgstr[4] ""
 msgstr[5] ""
 
-#: lib/implugin.php:262
 #, php-format
 msgid ""
 "User \"%s\" on %s has said that your %s screenname belongs to them. If "
@@ -8659,51 +7138,42 @@ msgid ""
 "message."
 msgstr ""
 
-#: lib/implugin.php:349
 #, php-format
 msgid "Unknown inbox source %d."
 msgstr "مصدر صندوق وارد غير معروف %d."
 
-#: lib/implugin.php:485
 #, fuzzy, php-format
 msgid "Message too long - maximum is %1$d characters, you sent %2$d."
 msgstr "هذه طويلة جدًا. أطول حجم للإشعار %d  حرفًا."
 
-#: lib/leaveform.php:114
 msgid "Leave"
 msgstr "غادر"
 
 #. TRANS: Menu item for logging in to the StatusNet site.
-#: lib/logingroupnav.php:77
 msgctxt "MENU"
 msgid "Login"
 msgstr "لُج"
 
 #. TRANS: Title for menu item for logging in to the StatusNet site.
-#: lib/logingroupnav.php:79
 msgid "Login with a username and password"
 msgstr "لُج باسم مستخدم وكلمة سر"
 
 #. TRANS: Menu item for registering with the StatusNet site.
-#: lib/logingroupnav.php:85
 msgctxt "MENU"
 msgid "Register"
 msgstr "سجّل"
 
 #. TRANS: Title for menu item for registering with the StatusNet site.
-#: lib/logingroupnav.php:87
 msgid "Sign up for a new account"
 msgstr "سجّل حسابًا جديدًا"
 
 #. TRANS: Subject for address confirmation email.
-#: lib/mail.php:172
 msgid "Email address confirmation"
 msgstr "تأكيد عنوان البريد الإلكتروني"
 
 #. TRANS: Body for address confirmation email.
 #. TRANS: %1$s is the addressed user's nickname, %2$s is the StatusNet sitename,
 #. TRANS: %3$s is the URL to confirm at.
-#: lib/mail.php:177
 #, fuzzy, php-format
 msgid ""
 "Hey, %1$s.\n"
@@ -8734,14 +7204,12 @@ msgstr ""
 
 #. TRANS: Subject of new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
-#: lib/mail.php:243
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1$s يستمع الآن إلى إشعاراتك على %2$s."
 
 #. TRANS: This is a paragraph in a new-subscriber e-mail.
 #. TRANS: %s is a URL where the subscriber can be reported as abusive.
-#: lib/mail.php:250
 #, php-format
 msgid ""
 "If you believe this account is being used abusively, you can block them from "
@@ -8753,7 +7221,6 @@ msgstr ""
 #. TRANS: %3$s is the subscriber's profile URL, %4$s is the subscriber's location (or empty)
 #. TRANS: %5$s is the subscriber's homepage URL (or empty), %6%s is the subscriber's bio (or empty)
 #. TRANS: %7$s is a link to the addressed user's e-mail settings.
-#: lib/mail.php:260
 #, fuzzy, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -8780,14 +7247,12 @@ msgstr ""
 
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is biographical information.
-#: lib/mail.php:283
 #, php-format
 msgid "Bio: %s"
 msgstr "السيرة: %s"
 
 #. TRANS: Subject of notification mail for new posting email address.
 #. TRANS: %s is the StatusNet sitename.
-#: lib/mail.php:312
 #, php-format
 msgid "New email address for posting to %s"
 msgstr "عنوان بريد إلكتروني جديد للإرسال إلى %s"
@@ -8795,7 +7260,6 @@ msgstr "عنوان بريد إلكتروني جديد للإرسال إلى %s"
 #. TRANS: Body of notification mail for new posting email address.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is the e-mail address to send
 #. TRANS: to to post by e-mail, %3$s is a URL to more instructions.
-#: lib/mail.php:318
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -8810,26 +7274,22 @@ msgstr ""
 
 #. TRANS: Subject line for SMS-by-email notification messages.
 #. TRANS: %s is the posting user's nickname.
-#: lib/mail.php:439
 #, php-format
 msgid "%s status"
 msgstr "حالة %s"
 
 #. TRANS: Subject line for SMS-by-email address confirmation message.
-#: lib/mail.php:465
 msgid "SMS confirmation"
 msgstr "تأكيد الرسالة القصيرة"
 
 #. TRANS: Main body heading for SMS-by-email address confirmation message.
 #. TRANS: %s is the addressed user's nickname.
-#: lib/mail.php:469
 #, php-format
 msgid "%s: confirm you own this phone number with this code:"
 msgstr ""
 
 #. TRANS: Subject for 'nudge' notification email.
 #. TRANS: %s is the nudging user.
-#: lib/mail.php:490
 #, fuzzy, php-format
 msgid "You have been nudged by %s"
 msgstr "لقد نبهك %s"
@@ -8837,7 +7297,6 @@ msgstr "لقد نبهك %s"
 #. TRANS: Body for 'nudge' notification email.
 #. TRANS: %1$s is the nuding user's long name, $2$s is the nudging user's nickname,
 #. TRANS: %3$s is a URL to post notices at, %4$s is the StatusNet sitename.
-#: lib/mail.php:497
 #, php-format
 msgid ""
 "%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -8855,7 +7314,6 @@ msgstr ""
 
 #. TRANS: Subject for direct-message notification email.
 #. TRANS: %s is the sending user's nickname.
-#: lib/mail.php:544
 #, php-format
 msgid "New private message from %s"
 msgstr "رسالة خاصة جديدة من %s"
@@ -8864,7 +7322,6 @@ msgstr "رسالة خاصة جديدة من %s"
 #. TRANS: %1$s is the sending user's long name, %2$s is the sending user's nickname,
 #. TRANS: %3$s is the message content, %4$s a URL to the message,
 #. TRANS: %5$s is the StatusNet sitename.
-#: lib/mail.php:552
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -8885,7 +7342,6 @@ msgstr ""
 
 #. TRANS: Subject for favorite notification e-mail.
 #. TRANS: %1$s is the adding user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:604
 #, fuzzy, php-format
 msgid "%1$s (@%2$s) added your notice as a favorite"
 msgstr "لقد أضاف %s (@%s) إشعارك إلى مفضلاته"
@@ -8895,7 +7351,6 @@ msgstr "لقد أضاف %s (@%s) إشعارك إلى مفضلاته"
 #. TRANS: %3$s is a URL to the faved notice, %4$s is the faved notice text,
 #. TRANS: %5$s is a URL to all faves of the adding user, %6$s is the StatusNet sitename,
 #. TRANS: %7$s is the adding user's nickname.
-#: lib/mail.php:611
 #, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -8917,7 +7372,6 @@ msgid ""
 msgstr ""
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:669
 #, php-format
 msgid ""
 "The full conversation can be read here:\n"
@@ -8927,7 +7381,6 @@ msgstr ""
 
 #. TRANS: E-mail subject for notice notification.
 #. TRANS: %1$s is the sending user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:677
 #, fuzzy, php-format
 msgid "%1$s (@%2$s) sent a notice to your attention"
 msgstr "لقد أرسل %s (@%s) إشعارًا إليك"
@@ -8938,7 +7391,6 @@ msgstr "لقد أرسل %s (@%s) إشعارًا إليك"
 #. TRANS: %5$s is a URL to the full conversion if it exists (otherwise empty),
 #. TRANS: %6$s is a URL to reply to the notice, %7$s is a URL to all @-replied for the addressed user,
 #. TRANS: %8$s is a URL to the addressed user's e-mail settings, %9$s is the sender's nickname.
-#: lib/mail.php:685
 #, php-format
 msgid ""
 "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -8965,66 +7417,54 @@ msgid ""
 "P.S. You can turn off these email notifications here: %8$s\n"
 msgstr ""
 
-#: lib/mailbox.php:87
 #, fuzzy
 msgid "Only the user can read their own mailboxes."
 msgstr "يستطيع المستخدمون الوالجون وحدهم تكرار الإشعارات."
 
-#: lib/mailbox.php:125
 msgid ""
 "You have no private messages. You can send private message to engage other "
 "users in conversation. People can send you messages for your eyes only."
 msgstr ""
 
-#: lib/mailhandler.php:37
 msgid "Could not parse message."
 msgstr "تعذّر تحليل الرسالة."
 
-#: lib/mailhandler.php:42
 msgid "Not a registered user."
 msgstr "ليس مستخدمًا مسجلًا."
 
-#: lib/mailhandler.php:46
 #, fuzzy
 msgid "Sorry, that is not your incoming email address."
 msgstr "هذا ليس عنوان بريدك الإلكتروني."
 
-#: lib/mailhandler.php:50
 #, fuzzy
 msgid "Sorry, no incoming email allowed."
 msgstr "لا عنوان بريد إلكتروني وارد."
 
-#: lib/mailhandler.php:229
 #, php-format
 msgid "Unsupported message type: %s"
 msgstr "نوع رسالة غير مدعوم: %s"
 
 #. TRANS: Client exception thrown when a database error was thrown during a file upload operation.
-#: lib/mediafile.php:102 lib/mediafile.php:174
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
 
 #. TRANS: Client exception thrown when a file upload operation would cause a user to exceed a set quota.
-#: lib/mediafile.php:238 lib/mediafile.php:281
 msgid "File exceeds user's quota."
 msgstr ""
 
 #. TRANS: Client exception thrown when a file upload operation fails because the file could
 #. TRANS: not be moved from the temporary folder to the permanent file location.
-#: lib/mediafile.php:258 lib/mediafile.php:300
 msgid "File could not be moved to destination directory."
 msgstr ""
 
 #. TRANS: Client exception thrown when a file upload operation has been stopped because the MIME
 #. TRANS: type of the uploaded file could not be determined.
-#: lib/mediafile.php:265 lib/mediafile.php:306
 msgid "Could not determine file's MIME type."
 msgstr "لم يمكن تحديد نوع MIME للملف."
 
 #. TRANS: Client exception thrown trying to upload a forbidden MIME type.
 #. TRANS: %1$s is the file type that was denied, %2$s is the application part of
 #. TRANS: the MIME type that was denied.
-#: lib/mediafile.php:396
 #, php-format
 msgid ""
 "\"%1$s\" is not a supported file type on this server. Try using another %2$s "
@@ -9033,52 +7473,42 @@ msgstr ""
 
 #. TRANS: Client exception thrown trying to upload a forbidden MIME type.
 #. TRANS: %s is the file type that was denied.
-#: lib/mediafile.php:401
 #, php-format
 msgid "\"%s\" is not a supported file type on this server."
 msgstr ""
 
-#: lib/messageform.php:120
 msgid "Send a direct notice"
 msgstr "أرسل إشعارًا مباشرًا"
 
 #. TRANS Label entry in drop-down selection box in direct-message inbox/outbox. This is the default entry in the drop-down box, doubling as instructions and a brake against accidental submissions with the first user in the list.
-#: lib/messageform.php:137
 #, fuzzy
 msgid "Select recipient:"
 msgstr "اختر وسمًا لترشيحه"
 
 #. TRANS Entry in drop-down selection box in direct-message inbox/outbox when no one is available to message.
-#: lib/messageform.php:150
 #, fuzzy
 msgid "No mutual subscribers."
 msgstr "غير مشترك!"
 
-#: lib/messageform.php:153
 msgid "To"
 msgstr "إلى"
 
-#: lib/messageform.php:184 lib/noticeform.php:236
 msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr "أرسل"
 
-#: lib/messagelist.php:77
 #, fuzzy
 msgid "Messages"
 msgstr "رسالة"
 
-#: lib/messagelistitem.php:123 lib/noticelist.php:527
 msgid "from"
 msgstr "من"
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:178
 msgid "Nickname cannot be empty."
 msgstr ""
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:191
 #, php-format
 msgid "Nickname cannot be more than %d character long."
 msgid_plural "Nickname cannot be more than %d characters long."
@@ -9089,453 +7519,353 @@ msgstr[3] ""
 msgstr[4] ""
 msgstr[5] ""
 
-#: lib/noticeform.php:160
+#. TRANS: Form legend for notice form.
 msgid "Send a notice"
 msgstr "أرسل إشعارًا"
 
-#: lib/noticeform.php:174
+#. TRANS: Title for notice label. %s is the user's nickname.
 #, php-format
 msgid "What's up, %s?"
 msgstr "ما الأخبار يا %s؟"
 
-#: lib/noticeform.php:193
+#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr "أرفق"
 
-#: lib/noticeform.php:197
-msgid "Attach a file"
+#. TRANS: Title for input field to attach a file to a notice.
+#, fuzzy
+msgid "Attach a file."
 msgstr "أرفق ملفًا"
 
-#: lib/noticeform.php:212
+#. TRANS: Field label to add location to a notice.
 msgid "Share my location"
 msgstr "شارك موقعي"
 
-#: lib/noticeform.php:215
+#. TRANS: Text to not share location for a notice in notice form.
 msgid "Do not share my location"
 msgstr "لا تشارك موقعي"
 
-#: lib/noticeform.php:216
+#. TRANS: Timeout error text for location retrieval in notice form.
 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
 "try again later"
 msgstr ""
 
 #. TRANS: Used in coordinates as abbreviation of north
-#: lib/noticelist.php:457
 msgid "N"
 msgstr "ش"
 
 #. TRANS: Used in coordinates as abbreviation of south
-#: lib/noticelist.php:459
 msgid "S"
 msgstr "ج"
 
 #. TRANS: Used in coordinates as abbreviation of east
-#: lib/noticelist.php:461
 msgid "E"
 msgstr "ر"
 
 #. TRANS: Used in coordinates as abbreviation of west
-#: lib/noticelist.php:463
 msgid "W"
 msgstr "غ"
 
-#: lib/noticelist.php:465
 #, php-format
 msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgstr ""
 
-#: lib/noticelist.php:474
 msgid "at"
 msgstr "في"
 
-#: lib/noticelist.php:523
 msgid "web"
 msgstr ""
 
-#: lib/noticelist.php:589
 msgid "in context"
 msgstr "في السياق"
 
-#: lib/noticelist.php:624
 msgid "Repeated by"
 msgstr "مكرر بواسطة"
 
-#: lib/noticelist.php:651
 msgid "Reply to this notice"
 msgstr "رُد على هذا الإشعار"
 
-#: lib/noticelist.php:652
 msgid "Reply"
 msgstr "رُد"
 
-#: lib/noticelist.php:678
 msgid "Delete this notice"
 msgstr "احذف هذا الإشعار"
 
-#: lib/noticelist.php:696
 msgid "Notice repeated"
 msgstr "الإشعار مكرر"
 
-#: lib/nudgeform.php:116
 msgid "Nudge this user"
 msgstr "نبّه هذا المستخدم"
 
-#: lib/nudgeform.php:128
 msgid "Nudge"
 msgstr "نبّه"
 
-#: lib/nudgeform.php:128
 #, fuzzy
 msgid "Send a nudge to this user"
 msgstr "أرسل رسالة مباشرة إلى هذا المستخدم"
 
-#: lib/oauthstore.php:294
 msgid "Error inserting new profile."
 msgstr ""
 
-#: lib/oauthstore.php:302
 msgid "Error inserting avatar."
 msgstr ""
 
-#: lib/oauthstore.php:322
 msgid "Error inserting remote profile."
 msgstr ""
 
 #. TRANS: Exception thrown when a notice is denied because it has been sent before.
-#: lib/oauthstore.php:362
 msgid "Duplicate notice."
 msgstr ""
 
-#: lib/oauthstore.php:507
 msgid "Couldn't insert new subscription."
 msgstr "تعذّر إدراج اشتراك جديد."
 
-#: lib/personalgroupnav.php:104
-#, fuzzy
 msgid "Replies"
 msgstr "الردود"
 
-#: lib/personalgroupnav.php:109
-#, fuzzy
 msgid "Favorites"
 msgstr "المفضلات"
 
-#: lib/personalgroupnav.php:120
-#, fuzzy
 msgid "Inbox"
 msgstr "صندوق الوارد"
 
-#: lib/personalgroupnav.php:121
 msgid "Your incoming messages"
 msgstr "رسائلك الواردة"
 
-#: lib/personalgroupnav.php:125
-#, fuzzy
 msgid "Outbox"
 msgstr "صندوق الصادر"
 
-#: lib/personalgroupnav.php:126
 msgid "Your sent messages"
 msgstr "رسائلك المُرسلة"
 
 #. TRANS: Title for personal tag cloud section. %s is a user nickname.
-#: lib/personaltagcloudsection.php:56
 #, php-format
 msgid "Tags in %s's notices"
 msgstr "وسوم في إشعارات %s"
 
 #. TRANS: Displayed as version information for a plugin if no version information was found.
-#: lib/plugin.php:126
 msgid "Unknown"
 msgstr "غير معروفة"
 
 #. TRANS: Plugin admin panel controls
-#: lib/plugindisableform.php:90
 msgctxt "plugin"
 msgid "Disable"
 msgstr ""
 
 #. TRANS: Plugin admin panel controls
-#: lib/pluginenableform.php:112
 msgctxt "plugin"
 msgid "Enable"
 msgstr ""
 
-#: lib/pluginlist.php:196
 msgctxt "plugin-description"
 msgid "(Plugin descriptions unavailable when disabled.)"
 msgstr ""
 
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:88
 msgid "Subscriptions"
 msgstr "الاشتراكات"
 
 #. TRANS: Text for user subscription statistics if user has more subscriptions than displayed.
-#: lib/profileaction.php:144
 msgid "All subscriptions"
 msgstr "جميع الاشتراكات"
 
 #. TRANS: H2 text for user subscriber statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:96
 msgid "Subscribers"
 msgstr "المشتركون"
 
 #. TRANS: Text for user subscription statistics if user has more subscribers than displayed.
-#: lib/profileaction.php:181
 msgid "All subscribers"
 msgstr "جميع المشتركين"
 
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:213
 msgid "User ID"
 msgstr "هوية المستخدم"
 
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:219
 msgid "Member since"
 msgstr "عضو منذ"
 
 #. TRANS: Label for user statistics.
 #. TRANS: H2 text for user group membership statistics.
-#: lib/profileaction.php:239 lib/profileaction.php:290
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:104
 msgid "Groups"
 msgstr "مجموعات"
 
 #. TRANS: Label for user statistics.
 #. TRANS: Average count of posts made per day since account registration.
-#: lib/profileaction.php:253
 msgid "Daily average"
 msgstr "المُعدّل اليومي"
 
 #. TRANS: Text for user group membership statistics if user has more subscriptions than displayed.
-#: lib/profileaction.php:305
 msgid "All groups"
 msgstr "كل المجموعات"
 
 #. TRANS: Server error displayed when using an unimplemented method.
-#: lib/profileformaction.php:123
 msgid "Unimplemented method."
 msgstr ""
 
-#: lib/publicgroupnav.php:82
 msgid "User groups"
 msgstr "مجموعات المستخدمين"
 
-#: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
 msgid "Recent tags"
 msgstr "الوسوم الحديثة"
 
-#: lib/publicgroupnav.php:88
 msgid "Featured"
 msgstr "مُختارون"
 
-#: lib/publicgroupnav.php:92
 msgid "Popular"
 msgstr "محبوبة"
 
-#: lib/redirectingaction.php:95
 msgid "No return-to arguments."
 msgstr "لا مدخلات رجوع إلى."
 
-#: lib/repeatform.php:107
 msgid "Repeat this notice?"
 msgstr "أأكرّر هذا الإشعار؟ّ"
 
-#: lib/repeatform.php:132
 msgid "Yes"
 msgstr "نعم"
 
-#: lib/repeatform.php:132
 msgid "Repeat this notice"
 msgstr "كرّر هذا الإشعار"
 
-#: lib/revokeroleform.php:91
 #, fuzzy, php-format
 msgid "Revoke the \"%s\" role from this user"
 msgstr "امنع هذا المستخدم من هذه المجموعة"
 
 #. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:1001
 #, fuzzy
 msgid "Page not found."
 msgstr "لم يتم العثور على وسيلة API."
 
-#: lib/sandboxform.php:67
 msgid "Sandbox"
 msgstr ""
 
-#: lib/sandboxform.php:78
 msgid "Sandbox this user"
 msgstr "أضف هذا المستخدم إلى صندوق الرمل"
 
 #. TRANS: Fieldset legend for the search form.
-#: lib/searchaction.php:120
 msgid "Search site"
 msgstr "ابحث في الموقع"
 
 #. TRANS: Used as a field label for the field where one or more keywords
 #. TRANS: for searching can be entered.
-#: lib/searchaction.php:128
 msgid "Keyword(s)"
 msgstr "الكلمات المفتاحية"
 
 #. TRANS: Button text for searching site.
-#: lib/searchaction.php:130
 msgctxt "BUTTON"
 msgid "Search"
 msgstr ""
 
-#: lib/searchgroupnav.php:80
 msgid "People"
 msgstr "أشخاص"
 
-#: lib/searchgroupnav.php:81
 msgid "Find people on this site"
 msgstr "ابحث عن أشخاص على هذا الموقع"
 
-#: lib/searchgroupnav.php:83
 msgid "Find content of notices"
 msgstr "ابحث عن محتويات في الإشعارات"
 
-#: lib/searchgroupnav.php:85
 msgid "Find groups on this site"
 msgstr "ابحث عن مجموعات على هذا الموقع"
 
-#: lib/section.php:89
 msgid "Untitled section"
 msgstr "قسم غير مُعنون"
 
-#: lib/section.php:106
 msgid "More..."
 msgstr "المزيد..."
 
-#: lib/settingsnav.php:78
 msgid "Change your profile settings"
 msgstr "غيّر إعدادات ملفك الشخصي"
 
-#: lib/settingsnav.php:83
 msgid "Upload an avatar"
 msgstr "ارفع أفتارًا"
 
-#: lib/settingsnav.php:88
 msgid "Change your password"
 msgstr "غير كلمة سرّك"
 
-#: lib/settingsnav.php:93
 msgid "Change email handling"
 msgstr "غير أسلوب التعامل مع البريد الإلكتروني"
 
-#: lib/settingsnav.php:98
 msgid "Design your profile"
 msgstr "صمّم ملفك الشخصي"
 
-#: lib/settingsnav.php:102
 msgid "URL"
 msgstr "مسار"
 
-#: lib/settingsnav.php:103
 msgid "URL shorteners"
 msgstr ""
 
-#: lib/settingsnav.php:111
 msgid "Updates by instant messenger (IM)"
 msgstr ""
 
-#: lib/settingsnav.php:118
 msgid "Updates by SMS"
 msgstr "تحديثات عبر الرسائل القصيرة"
 
-#: lib/settingsnav.php:123
-#, fuzzy
 msgid "Connections"
 msgstr "اتصالات"
 
-#: lib/settingsnav.php:124
 #, fuzzy
 msgid "Authorized connected applications"
 msgstr "تطبيقات OAuth"
 
-#: lib/silenceform.php:67
 msgid "Silence"
 msgstr "أسكت"
 
-#: lib/silenceform.php:78
 msgid "Silence this user"
 msgstr "أسكت هذا المستخدم"
 
-#: lib/subgroupnav.php:89
 #, php-format
 msgid "People %s subscribes to"
 msgstr "الأشخاص الذين اشترك بهم %s"
 
-#: lib/subgroupnav.php:97
 #, php-format
 msgid "People subscribed to %s"
 msgstr "الأشخاص المشتركون ب%s"
 
-#: lib/subgroupnav.php:105
 #, php-format
 msgid "Groups %s is a member of"
 msgstr "المجموعات التي %s عضو فيها"
 
-#: lib/subgroupnav.php:111
 msgid "Invite"
 msgstr "ادعُ"
 
-#: lib/subgroupnav.php:112
 #, fuzzy, php-format
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "ادعُ أصدقائك وزملائك للانضمام إليك في %s"
 
-#: lib/subscribeform.php:115 lib/subscribeform.php:139
 msgid "Subscribe to this user"
 msgstr "اشترك بهذا المستخدم"
 
-#: lib/subscriberspeopleselftagcloudsection.php:48
-#: lib/subscriptionspeopleselftagcloudsection.php:48
 msgid "People Tagcloud as self-tagged"
 msgstr ""
 
-#: lib/subscriberspeopletagcloudsection.php:48
-#: lib/subscriptionspeopletagcloudsection.php:48
 msgid "People Tagcloud as tagged"
 msgstr ""
 
-#: lib/tagcloudsection.php:56
 msgid "None"
 msgstr "لا شيء"
 
 #. TRANS: Server exception displayed if a theme name was invalid.
-#: lib/theme.php:74
 #, fuzzy
 msgid "Invalid theme name."
 msgstr "حجم غير صالح."
 
-#: lib/themeuploader.php:50
 msgid "This server cannot handle theme uploads without ZIP support."
 msgstr ""
 
-#: lib/themeuploader.php:58 lib/themeuploader.php:61
 msgid "The theme file is missing or the upload failed."
 msgstr ""
 
-#: lib/themeuploader.php:91 lib/themeuploader.php:102
-#: lib/themeuploader.php:279 lib/themeuploader.php:283
-#: lib/themeuploader.php:291 lib/themeuploader.php:298
 #, fuzzy
 msgid "Failed saving theme."
 msgstr "فشل تحديث الأفتار."
 
-#: lib/themeuploader.php:147
 msgid "Invalid theme: bad directory structure."
 msgstr ""
 
-#: lib/themeuploader.php:166
 #, php-format
 msgid "Uploaded theme is too large; must be less than %d byte uncompressed."
 msgid_plural ""
@@ -9547,33 +7877,27 @@ msgstr[3] ""
 msgstr[4] ""
 msgstr[5] ""
 
-#: lib/themeuploader.php:179
 msgid "Invalid theme archive: missing file css/display.css"
 msgstr ""
 
-#: lib/themeuploader.php:219
 msgid ""
 "Theme contains invalid file or folder name. Stick with ASCII letters, "
 "digits, underscore, and minus sign."
 msgstr ""
 
-#: lib/themeuploader.php:225
 msgid "Theme contains unsafe file extension names; may be unsafe."
 msgstr ""
 
-#: lib/themeuploader.php:242
 #, php-format
 msgid "Theme contains file of type '.%s', which is not allowed."
 msgstr ""
 
-#: lib/themeuploader.php:260
 msgid "Error opening theme archive."
 msgstr "خطأ أثناء تحديث الملف الشخصي البعيد."
 
-#: lib/threadednoticelist.php:270
 #, php-format
-msgid "Show all %d comment"
-msgid_plural "Show all %d comments"
+msgid "Show %d reply"
+msgid_plural "Show all %d replies"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
@@ -9581,123 +7905,99 @@ msgstr[3] ""
 msgstr[4] ""
 msgstr[5] ""
 
-#: lib/topposterssection.php:74
 msgid "Top posters"
 msgstr "أعلى المرسلين"
 
 #. TRANS: Title for the form to unblock a user.
-#: lib/unblockform.php:67
 #, fuzzy
 msgctxt "TITLE"
 msgid "Unblock"
 msgstr "ألغِ المنع"
 
-#: lib/unsandboxform.php:69
 #, fuzzy
 msgid "Unsandbox"
 msgstr "أزل هذا المستخدم من صندوق الرمل"
 
-#: lib/unsandboxform.php:80
 msgid "Unsandbox this user"
 msgstr "أزل هذا المستخدم من صندوق الرمل"
 
-#: lib/unsilenceform.php:67
 msgid "Unsilence"
 msgstr "ألغِ الإسكات"
 
-#: lib/unsilenceform.php:78
 msgid "Unsilence this user"
 msgstr "ألغِ إسكات هذا المستخدم"
 
-#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
 msgid "Unsubscribe from this user"
 msgstr "ألغِ الاشتراك مع هذا المستخدم"
 
-#: lib/unsubscribeform.php:137
 msgid "Unsubscribe"
 msgstr "ألغِ الاشتراك"
 
 #. 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).
-#: lib/usernoprofileexception.php:60
 #, fuzzy, php-format
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "ليس للمستخدم ملف شخصي."
 
-#: lib/userprofile.php:116
 msgid "Edit Avatar"
 msgstr "عدّل الأفتار"
 
 #. TRANS: H2 for user actions in a profile.
 #. TRANS: H2 for entity actions in a profile.
-#: lib/userprofile.php:216 lib/userprofile.php:232
 msgid "User actions"
 msgstr "تصرفات المستخدم"
 
 #. TRANS: Text shown in user profile of not yet compeltely deleted users.
-#: lib/userprofile.php:220
 msgid "User deletion in progress..."
 msgstr "حذف المستخدم قيد التنفيذ..."
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:248
 msgid "Edit profile settings"
 msgstr "عدّل إعدادات الملف الشخصي"
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:250
 msgid "Edit"
 msgstr "عدّل"
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:274
 msgid "Send a direct message to this user"
 msgstr "أرسل رسالة مباشرة إلى هذا المستخدم"
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:276
 msgid "Message"
 msgstr "رسالة"
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:318
 msgid "Moderate"
 msgstr "راقب"
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:357
 msgid "User role"
 msgstr "دور المستخدم"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:360
 msgctxt "role"
 msgid "Administrator"
 msgstr "إداري"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:362
 msgctxt "role"
 msgid "Moderator"
 msgstr "مراقب"
 
-#: lib/util.php:321
 #, fuzzy
 msgid "Not allowed to log in."
 msgstr "لست والجًا."
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1337
 msgid "a few seconds ago"
 msgstr "قبل لحظات قليلة"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1340
 msgid "about a minute ago"
 msgstr "قبل دقيقة تقريبًا"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1344
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
@@ -9709,12 +8009,10 @@ msgstr[4] ""
 msgstr[5] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1347
 msgid "about an hour ago"
 msgstr "قبل ساعة تقريبًا"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1351
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
@@ -9726,12 +8024,10 @@ msgstr[4] ""
 msgstr[5] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1354
 msgid "about a day ago"
 msgstr "قبل يوم تقريبا"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1358
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
@@ -9743,12 +8039,10 @@ msgstr[4] ""
 msgstr[5] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1361
 msgid "about a month ago"
 msgstr "قبل شهر تقريبًا"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1365
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
@@ -9760,193 +8054,43 @@ msgstr[4] ""
 msgstr[5] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1368
 msgid "about a year ago"
 msgstr "قبل سنة تقريبًا"
 
 #. TRANS: Web color exception thrown when a hexadecimal color code does not validate.
 #. TRANS: %s is the provided (invalid) color code.
-#: lib/webcolor.php:81 lib/webcolor.php:121
 #, fuzzy, php-format
 msgid "%s is not a valid color! Use 3 or 6 hex characters."
 msgstr "%s ليس لونًا صحيحًا!"
 
 #. TRANS: Exception.
-#: lib/xrd.php:63
 #, fuzzy
 msgid "Invalid XML."
 msgstr "حجم غير صالح."
 
 #. TRANS: Exception.
-#: lib/xrd.php:68
 msgid "Invalid XML, missing XRD root."
 msgstr ""
 
 #. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
-#: scripts/restoreuser.php:62
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
 
-#, fuzzy
-#~ msgid "Could not generate feed for group - %s"
-#~ msgstr "تعذر تحديث المجموعة."
+#~ msgid "Full name is too long (max 255 chars)."
+#~ msgstr "الاسم الكامل طويل جدا (الأقصى 255 حرفًا)"
+
+#~ msgid "description is too long (max %d chars)."
+#~ msgstr "المنظمة طويلة جدا (الأقصى %d حرفا)."
 
 #, fuzzy
-#~ msgid "Current confirmed Jabber/Google Talk address."
-#~ msgstr "عنوان جابر أو محادثة غوغل المعتمد حاليًا."
+#~ msgid "Location is too long (max 255 chars)."
+#~ msgstr "المنظمة طويلة جدا (الأقصى 255 حرفا)."
+
+#~ msgid "Too many aliases! Maximum %d."
+#~ msgstr "كنيات كيرة! العدد الأقصى هو %d."
 
 #, fuzzy
-#~ msgid "Send me notices through Jabber/Google Talk."
-#~ msgstr "أرسل لي إشعارات بالاشتراكات الجديدة عبر البريد الإلكتروني."
-
-#, fuzzy
-#~ msgid "Publish a MicroID for my Jabber/Google Talk address."
-#~ msgstr "انشر هوية مصغّرة لعنوان بريدي الإلكتروني."
-
-#~ msgid "No Jabber ID."
-#~ msgstr "لا هوية جابر."
-
-#, fuzzy
-#~ msgid "Not a valid Jabber ID."
-#~ msgstr "ليست هوية جابر صالحة"
-
-#, fuzzy
-#~ msgid "That is already your Jabber ID."
-#~ msgstr "هذه ليست هويتك في جابر."
-
-#~ msgid "That is not your Jabber ID."
-#~ msgstr "هذه ليست هويتك في جابر."
-
-#~ msgid "Other settings"
-#~ msgstr "إعدادات أخرى"
-
-#~ msgid "Tag cloud"
-#~ msgstr "سحابة الوسوم"
-
-#~ msgid "Authorize URL"
-#~ msgstr "اسمح بالمسار"
-
-#~ msgid "Jabber"
-#~ msgstr "جابر"
-
-#~ msgid "Photo"
-#~ msgstr "صورة"
-
-#~ msgid "Other options"
-#~ msgstr "خيارات أخرى"
-
-#~ msgid "Other"
-#~ msgstr "أخرى"
-
-#, fuzzy
-#~ msgid "Primary site navigation"
-#~ msgstr "ضبط الموقع الأساسي"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Personal profile and friends timeline"
-#~ msgstr "الملف الشخصي ومسار الأصدقاء الزمني"
-
-#~ msgctxt "MENU"
-#~ msgid "Personal"
-#~ msgstr "الصفحة الشخصية"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Change your email, avatar, password, profile"
-#~ msgstr "غير بريدك الإلكتروني وكلمة سرّك وأفتارك وملفك الشخصي"
-
-#~ msgid "Account"
-#~ msgstr "الحساب"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Connect to services"
-#~ msgstr "اتصل بالخدمات"
-
-#~ msgid "Connect"
-#~ msgstr "اتصل"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Change site configuration"
-#~ msgstr "غيّر ضبط الموقع"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Invite friends and colleagues to join you on %s"
-#~ msgstr "ادعُ أصدقائك وزملائك للانضمام إليك في %s"
-
-#~ msgctxt "MENU"
-#~ msgid "Invite"
-#~ msgstr "ادعُ"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Create an account"
-#~ msgstr "أنشئ حسابًا"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Help me!"
-#~ msgstr "ساعدني!"
-
-#~ msgctxt "MENU"
-#~ msgid "Help"
-#~ msgstr "مساعدة"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Search for people or text"
-#~ msgstr "ابحث عن أشخاص أو نصوص"
-
-#~ msgid "Local views"
-#~ msgstr "المشاهدات المحلية"
-
-#~ msgid "Page notice"
-#~ msgstr "إشعار الصفحة"
-
-#, fuzzy
-#~ msgid "Secondary site navigation"
-#~ msgstr "ضبط الموقع الأساسي"
-
-#~ msgid "StatusNet software license"
-#~ msgstr "رخصة برنامج StatusNet"
-
-#~ msgid "Site content license"
-#~ msgstr "رخصة محتوى الموقع"
-
-#, fuzzy
-#~ msgid "Pagination"
-#~ msgstr "تسجيل"
-
-#~ msgid "Author"
-#~ msgstr "المؤلف"
-
-#~ msgid "Provider"
-#~ msgstr "المزود"
-
-#, fuzzy
-#~ msgctxt "MENU"
-#~ msgid "SMS"
-#~ msgstr "رسائل قصيرة"
-
-#~ msgid "Filter tags"
-#~ msgstr "رشّح الوسوم"
-
-#~ msgid "[%s]"
-#~ msgstr "[%s]"
-
-#~ msgid "Available characters"
-#~ msgstr "المحارف المتوفرة"
-
-#, fuzzy
-#~ msgctxt "MENU"
-#~ msgid "Profile"
-#~ msgstr "الملف الشخصي"
-
-#~ msgid "Search help"
-#~ msgstr "ابحث في المساعدة"
-
-#, fuzzy
-#~ msgid "Message too long. Maximum is %1$d character, you sent %2$d."
-#~ msgid_plural "Message too long. Maximum is %1$d characters, you sent %2$d."
-#~ msgstr[0] "هذه طويلة جدًا. أطول حجم للإشعار %d  حرفًا."
-#~ msgstr[1] "هذه طويلة جدًا. أطول حجم للإشعار %d  حرفًا."
-#~ msgstr[2] "هذه طويلة جدًا. أطول حجم للإشعار %d  حرفًا."
-#~ msgstr[3] "هذه طويلة جدًا. أطول حجم للإشعار %d  حرفًا."
-#~ msgstr[4] "هذه طويلة جدًا. أطول حجم للإشعار %d  حرفًا."
-#~ msgstr[5] "هذه طويلة جدًا. أطول حجم للإشعار %d  حرفًا."
+#~ msgctxt "BUTTON"
+#~ msgid "Comment"
+#~ msgstr "المحتوى"
diff --git a/locale/arz/LC_MESSAGES/statusnet.po b/locale/arz/LC_MESSAGES/statusnet.po
index 46668d5b4d..0b1b7510a7 100644
--- a/locale/arz/LC_MESSAGES/statusnet.po
+++ b/locale/arz/LC_MESSAGES/statusnet.po
@@ -11,71 +11,61 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:23+0000\n"
-"PO-Revision-Date: 2011-03-03 17:25:40+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:07+0000\n"
 "Language-Team: Egyptian Spoken Arabic <http://translatewiki.net/wiki/Portal:"
 "arz>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: arz\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=6; plural= n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
 "&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
-"X-POT-Import-Date: 2011-02-25 23:49:23+0000\n"
+"X-POT-Import-Date: 2011-03-03 17:59:19+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
-#: actions/accessadminpanel.php:53 lib/adminpanelaction.php:363
 msgid "Access"
 msgstr "نفاذ"
 
 #. TRANS: Page notice.
-#: actions/accessadminpanel.php:64
 #, fuzzy
 msgid "Site access settings"
 msgstr "اذف إعدادت الموقع"
 
 #. TRANS: Form legend for registration form.
-#: actions/accessadminpanel.php:151
 #, fuzzy
 msgid "Registration"
 msgstr "سجّل"
 
 #. TRANS: Checkbox instructions for admin setting "Private".
-#: actions/accessadminpanel.php:155
 msgid "Prohibit anonymous users (not logged in) from viewing site?"
 msgstr "أأمنع المستخدمين المجهولين (غير الوالجين) من عرض الموقع؟"
 
 #. TRANS: Checkbox label for prohibiting anonymous users from viewing site.
-#: actions/accessadminpanel.php:157
 msgctxt "LABEL"
 msgid "Private"
 msgstr "خصوصية"
 
 #. TRANS: Checkbox instructions for admin setting "Invite only".
-#: actions/accessadminpanel.php:164
 msgid "Make registration invitation only."
 msgstr ""
 
 #. TRANS: Checkbox label for configuring site as invite only.
-#: actions/accessadminpanel.php:166
 msgid "Invite only"
 msgstr "بالدعوه فقط"
 
 #. TRANS: Checkbox instructions for admin setting "Closed" (no new registrations).
-#: actions/accessadminpanel.php:173
 msgid "Disable new registrations."
 msgstr "عطّل التسجيل الجديد."
 
 #. TRANS: Checkbox label for disabling new user registrations.
-#: actions/accessadminpanel.php:175
 msgid "Closed"
 msgstr "مُغلق"
 
 #. TRANS: Title for button to save access settings in site admin panel.
-#: actions/accessadminpanel.php:191
 #, fuzzy
 msgid "Save access settings"
 msgstr "اذف إعدادت الموقع"
@@ -84,6 +74,7 @@ msgstr "اذف إعدادت الموقع"
 #. TRANS: Button text for saving theme settings.
 #. TRANS: Button label to save e-mail preferences.
 #. TRANS: Button label to save IM preferences.
+#. TRANS: Button text in the license admin panel.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
 #. TRANS: Button text for saving site notice in admin panel.
@@ -93,13 +84,6 @@ msgstr "اذف إعدادت الموقع"
 #. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
 #. TRANS: Button text on profile design page to save settings.
-#: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
-#: actions/emailsettings.php:251 actions/imsettings.php:199
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:198
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:204
-#: actions/subscriptions.php:261 actions/urlsettings.php:152
-#: actions/useradminpanel.php:298 lib/applicationeditform.php:355
-#: lib/designform.php:320 lib/groupeditform.php:201
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Save"
@@ -107,8 +91,6 @@ msgstr "أرسل"
 
 #. TRANS: Server error when page not found (404).
 #. TRANS: Server error when page not found (404)
-#: actions/all.php:68 actions/public.php:98 actions/replies.php:93
-#: actions/showfavorites.php:140 actions/tag.php:52
 msgid "No such page."
 msgstr "لا وسم كهذا."
 
@@ -127,6 +109,7 @@ msgstr "لا وسم كهذا."
 #. TRANS: Client error displayed when checking group membership for a non-existing user.
 #. TRANS: Client error displayed when trying to have a non-existing user join a group.
 #. TRANS: Client error displayed when trying to have a non-existing user leave a group.
+#. TRANS: Client error displayed when not providing a user or an invalid user.
 #. TRANS: Client error displayed when updating a status for a non-existing user.
 #. TRANS: Client error displayed when requesting a list of followers for a non-existing user.
 #. TRANS: Client error displayed when requesting most recent favourite notices by a user for a non-existing user.
@@ -139,6 +122,8 @@ msgstr "لا وسم كهذا."
 #. 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.
 #. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
@@ -146,33 +131,10 @@ msgstr "لا وسم كهذا."
 #. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when calling a profile action without specifying a user.
-#: actions/all.php:80 actions/allrss.php:69
-#: actions/apiaccountupdatedeliverydevice.php:110
-#: actions/apiaccountupdateprofile.php:103
-#: actions/apiaccountupdateprofilebackgroundimage.php:118
-#: actions/apiaccountupdateprofileimage.php:104 actions/apiatomservice.php:59
-#: actions/apiblockcreate.php:96 actions/apiblockdestroy.php:94
-#: actions/apidirectmessage.php:75 actions/apidirectmessagenew.php:72
-#: actions/apigroupcreate.php:111 actions/apigroupismember.php:89
-#: actions/apigroupjoin.php:98 actions/apigroupleave.php:98
-#: actions/apigrouplist.php:70 actions/apigroupprofileupdate.php:108
-#: actions/apistatusesupdate.php:230 actions/apisubscriptions.php:85
-#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:173
-#: actions/apitimelinehome.php:78 actions/apitimelinementions.php:77
-#: actions/apitimelineuser.php:79 actions/avatarbynickname.php:79
-#: actions/favoritesrss.php:72 actions/foaf.php:42 actions/foaf.php:61
-#: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116
-#: actions/otp.php:78 actions/remotesubscribe.php:144
-#: actions/remotesubscribe.php:153 actions/replies.php:73
-#: actions/repliesrss.php:38 actions/rsd.php:113 actions/showfavorites.php:106
-#: actions/userbyid.php:75 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/userxrd.php:59 actions/xrds.php:71 lib/command.php:509
-#: lib/galleryaction.php:59 lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "لا مستخدم كهذا."
 
 #. TRANS: Page title. %1$s is user nickname, %2$d is page number
-#: actions/all.php:91
 #, php-format
 msgid "%1$s and friends, page %2$d"
 msgstr "%1$s و الصحاب, صفحه %2$d"
@@ -181,33 +143,26 @@ msgstr "%1$s و الصحاب, صفحه %2$d"
 #. TRANS: H1 text for page. %s is a user nickname.
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Timeline title for user and friends. %s is a user nickname.
-#: actions/all.php:94 actions/all.php:191 actions/allrss.php:117
-#: actions/apitimelinefriends.php:207 actions/apitimelinehome.php:113
-#: lib/personalgroupnav.php:100
 #, php-format
 msgid "%s and friends"
 msgstr "%s والأصدقاء"
 
 #. TRANS: %s is user nickname.
-#: actions/all.php:108
 #, php-format
 msgid "Feed for friends of %s (RSS 1.0)"
 msgstr ""
 
 #. TRANS: %s is user nickname.
-#: actions/all.php:117
 #, php-format
 msgid "Feed for friends of %s (RSS 2.0)"
 msgstr ""
 
 #. TRANS: %s is user nickname.
-#: actions/all.php:126
 #, php-format
 msgid "Feed for friends of %s (Atom)"
 msgstr ""
 
 #. TRANS: Empty list message. %s is a user nickname.
-#: actions/all.php:139
 #, php-format
 msgid ""
 "This is the timeline for %s and friends but no one has posted anything yet."
@@ -215,7 +170,6 @@ msgstr ""
 
 #. TRANS: Encouragement displayed on logged in user's empty timeline.
 #. TRANS: This message contains Markdown links. Keep "](" together.
-#: actions/all.php:146
 #, php-format
 msgid ""
 "Try subscribing to more people, [join a group](%%action.groups%%) or post "
@@ -224,7 +178,6 @@ msgstr ""
 
 #. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@".
 #. TRANS: This message contains Markdown links. Keep "](" together.
-#: actions/all.php:150
 #, php-format
 msgid ""
 "You can try to [nudge %1$s](../%2$s) from their profile or [post something "
@@ -235,7 +188,6 @@ msgstr ""
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
 #. TRANS: Second sentence of empty message for anonymous users. %s is a user nickname.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:221
 #, fuzzy, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -245,14 +197,11 @@ msgstr ""
 "register%%%%) وترسل شيئًا شيقًا ليضيفه إلى مفضلته. :)"
 
 #. TRANS: H1 text for page when viewing a list for self.
-#: actions/all.php:188
 msgid "You and friends"
 msgstr "أنت والأصدقاء"
 
 #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
 #. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name.
-#: actions/allrss.php:122 actions/apitimelinefriends.php:213
-#: actions/apitimelinehome.php:119
 #, fuzzy, php-format
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr "%1$s و الصحاب, صفحه %2$d"
@@ -271,55 +220,20 @@ msgstr "%1$s و الصحاب, صفحه %2$d"
 #. TRANS: Client error displayed trying to execute an unknown API method checking group membership.
 #. TRANS: Client error displayed trying to execute an unknown API method listing the latest 20 groups.
 #. TRANS: Client error displayed trying to execute an unknown API method showing group membership.
+#. TRANS: Client error displayed when using an unsupported API format.
 #. TRANS: Client error displayed trying to execute an unknown API method showing a group.
 #. TRANS: Client error displayed trying to execute an unknown API method testing API connectivity.
 #. TRANS: Client error displayed trying to execute an unknown API method deleting a status.
 #. TRANS: Client error displayed when trying to handle an unknown API method.
-#: actions/apiaccountratelimitstatus.php:69
-#: actions/apiaccountupdatedeliverydevice.php:92
-#: actions/apiaccountupdateprofile.php:94
-#: actions/apiaccountupdateprofilebackgroundimage.php:92
-#: actions/apiaccountupdateprofilecolors.php:115
-#: actions/apiaccountverifycredentials.php:68 actions/apidirectmessage.php:157
-#: actions/apifavoritecreate.php:98 actions/apifavoritedestroy.php:98
-#: actions/apifriendshipscreate.php:99 actions/apifriendshipsdestroy.php:99
-#: actions/apifriendshipsshow.php:124 actions/apigroupcreate.php:138
-#: actions/apigroupismember.php:115 actions/apigroupjoin.php:151
-#: actions/apigroupleave.php:141 actions/apigrouplist.php:134
-#: actions/apigrouplistall.php:120 actions/apigroupmembership.php:105
-#: actions/apigroupprofileupdate.php:100 actions/apigroupprofileupdate.php:213
-#: actions/apigroupshow.php:114 actions/apihelptest.php:84
-#: actions/apistatusesdestroy.php:101 actions/apistatusesretweets.php:110
-#: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:139
-#: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
-#: actions/apitimelinefavorites.php:182 actions/apitimelinefriends.php:276
-#: actions/apitimelinegroup.php:148 actions/apitimelinehome.php:181
-#: actions/apitimelinementions.php:182 actions/apitimelinepublic.php:247
-#: actions/apitimelineretweetedtome.php:147
-#: actions/apitimelineretweetsofme.php:147 actions/apitimelinetag.php:165
-#: actions/apitimelineuser.php:217 actions/apiusershow.php:100
 msgid "API method not found."
 msgstr "الـ API method مش موجوده."
 
 #. 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.
-#: actions/apiaccountupdatedeliverydevice.php:83
-#: actions/apiaccountupdateprofile.php:85
-#: actions/apiaccountupdateprofilebackgroundimage.php:83
-#: actions/apiaccountupdateprofilecolors.php:106
-#: actions/apiaccountupdateprofileimage.php:80 actions/apiblockcreate.php:87
-#: actions/apiblockdestroy.php:85 actions/apidirectmessagenew.php:107
-#: actions/apifavoritecreate.php:88 actions/apifavoritedestroy.php:88
-#: actions/apifriendshipscreate.php:89 actions/apifriendshipsdestroy.php:89
-#: actions/apigroupcreate.php:102 actions/apigroupjoin.php:89
-#: actions/apigroupleave.php:89 actions/apigroupprofileupdate.php:92
-#: actions/apimediaupload.php:66 actions/apistatusesretweet.php:63
-#: actions/apistatusesupdate.php:194
 msgid "This method requires a POST."
 msgstr "تتطلب هذه الطريقه POST."
 
 #. TRANS: Client error displayed when no valid device parameter is provided for a user's delivery device setting.
-#: actions/apiaccountupdatedeliverydevice.php:103
 msgid ""
 "You must specify a parameter named 'device' with a value of one of: sms, im, "
 "none."
@@ -332,10 +246,6 @@ msgstr ""
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
-#: actions/apiaccountupdatedeliverydevice.php:136
-#: actions/emailsettings.php:353 actions/emailsettings.php:499
-#: actions/profilesettings.php:323 actions/smssettings.php:300
-#: actions/smssettings.php:453 actions/urlsettings.php:211
 msgid "Could not update user."
 msgstr "تعذّر تحديث المستخدم."
 
@@ -348,32 +258,17 @@ msgstr "تعذّر تحديث المستخدم."
 #. TRANS: Server error displayed when requesting Friends of a Friend feed for a user for which the profile could not be found.
 #. TRANS: Server error displayed when trying to get a user hCard for a user without a profile.
 #. TRANS: Server error displayed when calling a profile action while the specified user does not have a profile.
-#: actions/apiaccountupdateprofile.php:111
-#: actions/apiaccountupdateprofilebackgroundimage.php:199
-#: actions/apiaccountupdateprofilecolors.php:183
-#: actions/apiaccountupdateprofileimage.php:131
-#: actions/apiuserprofileimage.php:88 actions/apiusershow.php:108
-#: actions/avatarbynickname.php:85 actions/foaf.php:69 actions/hcard.php:75
-#: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
-#: lib/profileaction.php:85
 msgid "User has no profile."
 msgstr "ليس للمستخدم ملف شخصى."
 
 #. TRANS: Server error displayed if a user profile could not be saved.
 #. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:419
 msgid "Could not save profile."
 msgstr "لم يمكن حفظ الملف."
 
 #. TRANS: Client error displayed when the number of bytes in a POST request exceeds a limit.
 #. TRANS: %s is the number of bytes of the CONTENT_LENGTH.
 #. TRANS: Form validation error in design settings form. POST should remain untranslated.
-#: actions/apiaccountupdateprofilebackgroundimage.php:108
-#: actions/apiaccountupdateprofileimage.php:95 actions/apimediaupload.php:81
-#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
-#: actions/designadminpanel.php:120 actions/editapplication.php:121
-#: actions/newapplication.php:102 actions/newnotice.php:95
-#: lib/designsettings.php:110
 #, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s byte) due to its "
@@ -393,27 +288,16 @@ msgstr[5] ""
 #. TRANS: Client error displayed when a database error occurs inserting profile colours.
 #. TRANS: Client error displayed when a database error occurs updating profile colours.
 #. TRANS: Form validation error displayed when group design settings could not be saved because of an application issue.
-#: actions/apiaccountupdateprofilebackgroundimage.php:138
-#: actions/apiaccountupdateprofilebackgroundimage.php:149
-#: actions/apiaccountupdateprofilecolors.php:160
-#: actions/apiaccountupdateprofilecolors.php:171
-#: actions/groupdesignsettings.php:285 actions/groupdesignsettings.php:296
-#: actions/userdesignsettings.php:218 actions/userdesignsettings.php:228
-#: actions/userdesignsettings.php:270 actions/userdesignsettings.php:280
 #, fuzzy
 msgid "Unable to save your design settings."
 msgstr "تعذّر حذف إعدادات التصميم."
 
 #. TRANS: Error displayed when updating design settings fails.
 #. TRANS: Client error displayed when a database error occurs updating profile colours.
-#: actions/apiaccountupdateprofilebackgroundimage.php:191
-#: actions/apiaccountupdateprofilecolors.php:139
-#: actions/userdesignsettings.php:196
 msgid "Could not update your design."
 msgstr "تعذّر تحديث تصميمك."
 
 #. TRANS: Title for Atom feed.
-#: actions/apiatomservice.php:85
 msgctxt "ATOM"
 msgid "Main"
 msgstr ""
@@ -422,9 +306,6 @@ msgstr ""
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Title in atom group notice feed. %s is a group name.
 #. TRANS: Title in atom user notice feed. %s is a user name.
-#: actions/apiatomservice.php:93 actions/grouprss.php:138
-#: actions/userrss.php:94 lib/atomgroupnoticefeed.php:63
-#: lib/atomusernoticefeed.php:88
 #, php-format
 msgid "%s timeline"
 msgstr "مسار %s الزمني"
@@ -434,8 +315,6 @@ msgstr "مسار %s الزمني"
 #. TRANS: %s is a user nickname.
 #. TRANS: Header for subscriptions overview for a user (first page).
 #. TRANS: %s is a user nickname.
-#: actions/apiatomservice.php:104 actions/atompubsubscriptionfeed.php:148
-#: actions/subscriptions.php:51
 #, php-format
 msgid "%s subscriptions"
 msgstr "اشتراكات %s"
@@ -443,58 +322,48 @@ msgstr "اشتراكات %s"
 #. TRANS: Title for Atom feed with a user's favorite notices. %s is a user nickname.
 #. TRANS: Title for Atom favorites feed.
 #. TRANS: %s is a user nickname.
-#: actions/apiatomservice.php:115 actions/atompubfavoritefeed.php:142
 #, fuzzy, php-format
 msgid "%s favorites"
 msgstr "المفضلات"
 
 #. TRANS: Title for Atom feed with a user's memberships. %s is a user nickname.
-#: actions/apiatomservice.php:126
 #, fuzzy, php-format
 msgid "%s memberships"
 msgstr "أعضاء مجموعه %s"
 
 #. TRANS: Client error displayed when users try to block themselves.
-#: actions/apiblockcreate.php:105
 msgid "You cannot block yourself!"
 msgstr "ما ينفعش تمنع نفسك!"
 
 #. TRANS: Server error displayed when blocking a user has failed.
-#: actions/apiblockcreate.php:127
 msgid "Block user failed."
 msgstr "فشل منع المستخدم."
 
 #. TRANS: Server error displayed when unblocking a user has failed.
-#: actions/apiblockdestroy.php:113
 msgid "Unblock user failed."
 msgstr "فشل إلغاء منع المستخدم."
 
 #. TRANS: Title. %s is a user nickname.
-#: actions/apidirectmessage.php:88
 #, php-format
 msgid "Direct messages from %s"
 msgstr "رسائل مباشره من %s"
 
 #. TRANS: Subtitle. %s is a user nickname.
-#: actions/apidirectmessage.php:93
 #, fuzzy, php-format
 msgid "All the direct messages sent from %s"
 msgstr "رسائل مباشره من %s"
 
 #. TRANS: Title. %s is a user nickname.
-#: actions/apidirectmessage.php:102
 #, php-format
 msgid "Direct messages to %s"
 msgstr "رساله مباشره %s"
 
 #. TRANS: Subtitle. %s is a user nickname.
-#: actions/apidirectmessage.php:107
 #, fuzzy, php-format
 msgid "All the direct messages sent to %s"
 msgstr "رساله مباشره %s"
 
 #. TRANS: Client error displayed when no message text was submitted (406).
-#: actions/apidirectmessagenew.php:117
 msgid "No message text!"
 msgstr "لا نص فى الرسالة!"
 
@@ -502,7 +371,6 @@ msgstr "لا نص فى الرسالة!"
 #. TRANS: %d is the maximum number of characters for a message.
 #. TRANS: Form validation error displayed when message content is too long.
 #. TRANS: %d is the maximum number of characters for a message.
-#: actions/apidirectmessagenew.php:127 actions/newmessage.php:152
 #, fuzzy, php-format
 msgid "That's too long. Maximum message size is %d character."
 msgid_plural "That's too long. Maximum message size is %d characters."
@@ -514,17 +382,14 @@ msgstr[4] "هذا الملف كبير جدًا. إن أقصى حجم للملف
 msgstr[5] "هذا الملف كبير جدًا. إن أقصى حجم للملفات هو %d."
 
 #. TRANS: Client error displayed if a recipient user could not be found (403).
-#: actions/apidirectmessagenew.php:139
 msgid "Recipient user not found."
 msgstr "لم يُعثر على المستخدم المستلم."
 
 #. TRANS: Client error displayed trying to direct message another user who's not a friend (403).
-#: actions/apidirectmessagenew.php:144
 msgid "Cannot send direct messages to users who aren't your friend."
 msgstr ""
 
 #. TRANS: Client error displayed trying to direct message self (403).
-#: actions/apidirectmessagenew.php:154
 msgid ""
 "Do not send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
@@ -532,121 +397,101 @@ 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.
 #. TRANS: Client error displayed trying to delete a status with an invalid ID.
-#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:108
-#: actions/apistatusesdestroy.php:121
 #, fuzzy
 msgid "No status found with that ID."
 msgstr "لا ملف شخصى بهذه الهويه."
 
 #. TRANS: Client error displayed when trying to mark a notice favourite that already is a favourite.
-#: actions/apifavoritecreate.php:120
 msgid "This status is already a favorite."
 msgstr "الحاله دى موجوده فعلا فى التفضيلات."
 
 #. TRANS: Client error displayed when marking a notice as favourite fails.
 #. TRANS: Server error displayed when trying to mark a notice as favorite fails in the database.
 #. TRANS: Error message text shown when a favorite could not be set.
-#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:306
 msgid "Could not create favorite."
 msgstr "تعذّر إنشاء مفضله."
 
 #. TRANS: Client error displayed when trying to remove a favourite that was not a favourite.
-#: actions/apifavoritedestroy.php:122
 msgid "That status is not a favorite."
 msgstr "الحاله دى مش محطوطه فى التفضيلات."
 
 #. TRANS: Client error displayed when removing a favourite has failed.
 #. TRANS: Server error displayed when removing a favorite from the database fails.
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:90
 msgid "Could not delete favorite."
 msgstr "تعذّر حذف المفضله."
 
 #. TRANS: Client error displayed when trying follow who's profile could not be found.
-#: actions/apifriendshipscreate.php:109
 #, fuzzy
 msgid "Could not follow user: profile not found."
 msgstr "لم يمكن حفظ الملف."
 
 #. TRANS: Client error displayed when trying to follow a user that's already being followed.
 #. TRANS: %s is the nickname of the user that is already being followed.
-#: actions/apifriendshipscreate.php:120
 #, fuzzy, php-format
 msgid "Could not follow user: %s is already on your list."
 msgstr "ما نفعش يضم %1$s للجروپ %2$s."
 
 #. TRANS: Client error displayed when trying to unfollow a user that cannot be found.
-#: actions/apifriendshipsdestroy.php:109
 #, fuzzy
 msgid "Could not unfollow user: User not found."
 msgstr "ما ينفعش عدم متابعة نفسك."
 
 #. TRANS: Client error displayed when trying to unfollow self.
-#: actions/apifriendshipsdestroy.php:121
 msgid "You cannot unfollow yourself."
 msgstr "ما ينفعش عدم متابعة نفسك."
 
 #. TRANS: Client error displayed when supplying invalid parameters to an API call checking if a friendship exists.
-#: actions/apifriendshipsexists.php:88
 msgid "Two valid IDs or nick names must be supplied."
 msgstr ""
 
 #. TRANS: Client error displayed when a source user could not be determined showing friendship.
-#: actions/apifriendshipsshow.php:131
 #, fuzzy
 msgid "Could not determine source user."
 msgstr "تعذّر إيجاد المستخدم الهدف."
 
 #. TRANS: Client error displayed when a target user could not be determined showing friendship.
-#: actions/apifriendshipsshow.php:140
 msgid "Could not find target user."
 msgstr "تعذّر إيجاد المستخدم الهدف."
 
 #. TRANS: Client error trying to create a group with a nickname this is already in use.
+#. TRANS: API validation exception thrown when nickname is already used.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:156 actions/apigroupprofileupdate.php:255
-#: actions/editgroup.php:191 actions/newgroup.php:137
-#: actions/profilesettings.php:274 actions/register.php:199
 msgid "Nickname already in use. Try another one."
 msgstr ""
 
 #. TRANS: Client error in form for group creation.
+#. TRANS: API validation exception thrown when nickname does not validate.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:164 actions/apigroupprofileupdate.php:259
-#: actions/editgroup.php:195 actions/newgroup.php:141
-#: actions/profilesettings.php:244 actions/register.php:201
 msgid "Not a valid nickname."
 msgstr "ليس اسمًا مستعارًا صحيحًا."
 
 #. TRANS: Client error in form for group creation.
+#. TRANS: API validation exception thrown when homepage URL does not validate.
 #. TRANS: Validation error shown when providing an invalid homepage URL in the "Edit application" form.
 #. TRANS: Group edit form validation error.
 #. TRANS: Validation error shown when providing an invalid homepage URL in the "New application" form.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:181 actions/apigroupprofileupdate.php:277
-#: actions/editapplication.php:235 actions/editgroup.php:202
-#: actions/newapplication.php:221 actions/newgroup.php:148
-#: actions/profilesettings.php:249 actions/register.php:208
 msgid "Homepage is not a valid URL."
 msgstr "الصفحه الرئيسيه ليست عنونًا صالحًا."
 
 #. TRANS: Client error in form for group creation.
+#. TRANS: API validation exception thrown when full name does not validate.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:191 actions/editgroup.php:206
-#: actions/newgroup.php:152 actions/profilesettings.php:253
-#: actions/register.php:211
 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "الاسم الكامل طويل جدا (الأقصى 255 حرفًا)"
 
 #. TRANS: Client error shown when providing too long a description during group creation.
 #. TRANS: %d is the maximum number of allowed characters.
+#. TRANS: API validation exception thrown when description does not validate.
+#. TRANS: %d is the maximum description length and used for plural.
 #. TRANS: Validation error shown when providing too long a description in the "Edit application" form.
 #. TRANS: %d is the maximum number of allowed characters.
 #. TRANS: Group edit form validation error.
@@ -654,9 +499,6 @@ msgstr "الاسم الكامل طويل جدا (الأقصى 255 حرفًا)"
 #. TRANS: %d is the maximum number of characters for the description.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed characters.
-#: actions/apigroupcreate.php:201 actions/editapplication.php:202
-#: actions/editgroup.php:211 actions/newapplication.php:182
-#: actions/newgroup.php:157
 #, fuzzy, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."
@@ -668,24 +510,22 @@ msgstr[4] "المنظمه طويله جدا (اكتر حاجه %d رمز)."
 msgstr[5] "المنظمه طويله جدا (اكتر حاجه %d رمز)."
 
 #. TRANS: Client error shown when providing too long a location during group creation.
+#. TRANS: API validation exception thrown when location does not validate.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:215 actions/editgroup.php:218
-#: actions/newgroup.php:164 actions/profilesettings.php:266
-#: actions/register.php:220
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
 msgstr "المنظمه طويله جدا (اكتر حاجه 255 رمز)."
 
 #. TRANS: Client error shown when providing too many aliases during group creation.
 #. TRANS: %d is the maximum number of allowed aliases.
+#. TRANS: API validation exception thrown when aliases do not validate.
+#. TRANS: %d is the maximum number of aliases and used for plural.
 #. TRANS: Group edit form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.
-#: actions/apigroupcreate.php:236 actions/editgroup.php:231
-#: actions/newgroup.php:177
 #, php-format
 msgid "Too many aliases! Maximum %d allowed."
 msgid_plural "Too many aliases! Maximum %d allowed."
@@ -698,25 +538,24 @@ msgstr[5] ""
 
 #. TRANS: Client error shown when providing an invalid alias during group creation.
 #. TRANS: %s is the invalid alias.
-#: actions/apigroupcreate.php:253
+#. TRANS: API validation exception thrown when aliases does not validate.
+#. TRANS: %s is the invalid alias.
 #, fuzzy, php-format
 msgid "Invalid alias: \"%s\"."
 msgstr "كنيه غير صالحة: \"%s\""
 
 #. TRANS: Client error displayed when trying to use an alias during group creation that is already in use.
 #. TRANS: %s is the alias that is already in use.
+#. TRANS: API validation exception thrown when aliases is already used.
+#. TRANS: %s is the already used alias.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error. %s is the already used alias.
-#: actions/apigroupcreate.php:264 actions/apigroupprofileupdate.php:351
-#: actions/editgroup.php:246 actions/newgroup.php:193
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to use an alias during group creation that is the same as the group's nickname.
 #. TRANS: Group edit form validation error.
-#: actions/apigroupcreate.php:278 actions/apigroupprofileupdate.php:359
-#: actions/editgroup.php:253
 msgid "Alias can't be the same as nickname."
 msgstr ""
 
@@ -724,19 +563,15 @@ msgstr ""
 #. TRANS: Client error displayed when trying to join a group that does not exist.
 #. TRANS: Client error displayed when trying to leave a group that does not exist.
 #. TRANS: Client error displayed trying to show group membership on a non-existing group.
+#. TRANS: Client error displayed when not providing a group or an invalid group.
 #. TRANS: Client error displayed when trying to show a group that could not be found.
 #. TRANS: Client error displayed requesting most recent notices to a group for a non-existing group.
-#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
-#: actions/apigroupleave.php:104 actions/apigroupmembership.php:71
-#: actions/apigroupprofileupdate.php:113 actions/apigroupshow.php:81
-#: actions/apitimelinegroup.php:89
 msgid "Group not found."
 msgstr "لم يوجد."
 
 #. TRANS: Server error displayed when trying to join a group the user is already a member of.
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:345
 #, fuzzy
 msgid "You are already a member of that group."
 msgstr "انت اصلا عضو فى الجروپ ده"
@@ -744,7 +579,6 @@ msgstr "انت اصلا عضو فى الجروپ ده"
 #. TRANS: Server error displayed when trying to join a group the user is blocked from joining.
 #. 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.
-#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:350
 #, fuzzy
 msgid "You have been blocked from that group by the admin."
 msgstr "لم تمنع هذا المستخدم."
@@ -753,13 +587,11 @@ msgstr "لم تمنع هذا المستخدم."
 #. TRANS: %1$s is the joining user's nickname, $2$s is the group nickname for which the join failed.
 #. TRANS: Message given having failed to add a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:136 actions/joingroup.php:139 lib/command.php:362
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "ما نفعش يضم %1$s للجروپ %2$s."
 
 #. TRANS: Server error displayed when trying to leave a group the user is not a member of.
-#: actions/apigroupleave.php:115
 #, fuzzy
 msgid "You are not a member of this group."
 msgstr "لست عضوا فى تلك المجموعه."
@@ -768,117 +600,79 @@ msgstr "لست عضوا فى تلك المجموعه."
 #. TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
 #. TRANS: Message given having failed to remove a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupleave.php:127 actions/leavegroup.php:133
-#: lib/command.php:410
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
 msgstr "ما نفعش يتشال اليوزر %1$s من الجروپ %2$s."
 
 #. TRANS: Used as title in check for group membership. %s is a user name.
-#: actions/apigrouplist.php:94
 #, php-format
 msgid "%s's groups"
 msgstr "مجموعات %s"
 
 #. TRANS: Used as subtitle in check for group membership. %1$s is a user name, %2$s is the site name.
-#: actions/apigrouplist.php:104
 #, fuzzy, php-format
 msgid "%1$s groups %2$s is a member of."
 msgstr "المجموعات التى %s عضو فيها"
 
 #. TRANS: Message is used as a title when listing the lastest 20 groups. %s is a site name.
 #. TRANS: Message is used as a page title. %s is a nick name.
-#: actions/apigrouplistall.php:88 actions/usergroups.php:63
 #, php-format
 msgid "%s groups"
 msgstr "مجموعات %s"
 
 #. TRANS: Message is used as a subtitle when listing the lastest 20 groups. %s is a site name.
-#: actions/apigrouplistall.php:93
 #, php-format
 msgid "groups on %s"
 msgstr "مجموعات %s"
 
+#. TRANS: Client error displayed when trying to edit a group without being an admin.
 #. TRANS: Client error displayed trying to edit a group while not being a group admin.
 #. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
 #. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
-#: actions/apigroupprofileupdate.php:118 actions/editgroup.php:110
-#: actions/editgroup.php:176 actions/groupdesignsettings.php:109
-#: actions/grouplogo.php:111
 msgid "You must be an admin to edit the group."
 msgstr "لازم تكون ادارى علشان تعدّل الجروپ."
 
+#. TRANS: Server error displayed when group update fails.
 #. TRANS: Server error displayed when editing a group fails.
-#: actions/apigroupprofileupdate.php:171 actions/editgroup.php:274
 msgid "Could not update group."
 msgstr "تعذر تحديث المجموعه."
 
+#. TRANS: Server error displayed when adding group aliases fails.
 #. TRANS: Server error displayed when group aliases could not be added.
 #. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/apigroupprofileupdate.php:194 actions/editgroup.php:281
-#: classes/User_group.php:540
 msgid "Could not create aliases."
 msgstr "تعذّر إنشاء الكنى."
 
+#. TRANS: API validation exception thrown when nickname does not validate.
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: actions/apigroupprofileupdate.php:249 lib/nickname.php:165
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr ""
 
-#: actions/apigroupprofileupdate.php:286
-#, fuzzy
-msgid "Full name is too long (max 255 chars)."
-msgstr "الاسم الكامل طويل جدا (الأقصى 255 حرفًا)"
-
-#: actions/apigroupprofileupdate.php:296
-#, fuzzy, php-format
-msgid "description is too long (max %d chars)."
-msgstr "المنظمه طويله جدا (اكتر حاجه %d رمز)."
-
-#: actions/apigroupprofileupdate.php:307
-#, fuzzy
-msgid "Location is too long (max 255 chars)."
-msgstr "المنظمه طويله جدا (اكتر حاجه 255 رمز)."
-
-#: actions/apigroupprofileupdate.php:326
-#, php-format
-msgid "Too many aliases! Maximum %d."
+#. TRANS: API validation exception thrown when alias is the same as nickname.
+#. TRANS: Group create form validation error.
+msgid "Alias cannot be the same as nickname."
 msgstr ""
 
-#. TRANS: Group edit form validation error.
-#. TRANS: Group create form validation error.
-#. TRANS: %s is the invalid alias.
-#: actions/apigroupprofileupdate.php:342 actions/editgroup.php:241
-#: actions/newgroup.php:188
-#, php-format
-msgid "Invalid alias: \"%s\""
-msgstr "كنيه غير صالحة: \"%s\""
-
 #. TRANS: Client error displayed when uploading a media file has failed.
-#: actions/apimediaupload.php:101
 #, fuzzy
 msgid "Upload failed."
 msgstr "ارفع ملفًا"
 
 #. TRANS: Client error given from the OAuth API when the request token or verifier is invalid.
-#: actions/apioauthaccesstoken.php:102
 #, fuzzy
 msgid "Invalid request token or verifier."
 msgstr "امارة تسجيل الدخول اللى اتحطت مش موجوده."
 
 #. TRANS: Client error given when no oauth_token was passed to the OAuth API.
-#: actions/apioauthauthorize.php:107
 msgid "No oauth_token parameter provided."
 msgstr ""
 
 #. TRANS: Client error given when an invalid request token was passed to the OAuth API.
-#: actions/apioauthauthorize.php:115 actions/apioauthauthorize.php:129
 #, fuzzy
 msgid "Invalid request token."
 msgstr "حجم غير صالح."
 
 #. TRANS: Client error given when an invalid request token was passed to the OAuth API.
-#: actions/apioauthauthorize.php:121
 #, fuzzy
 msgid "Request token already authorized."
 msgstr "لا تملك تصريحًا."
@@ -889,31 +683,14 @@ msgstr "لا تملك تصريحًا."
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
 #. TRANS: Client error displayed when the session token is not okay.
-#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:75
-#: actions/emailsettings.php:292 actions/favor.php:75 actions/geocode.php:55
-#: actions/groupblock.php:65 actions/grouplogo.php:321
-#: actions/groupunblock.php:65 actions/imsettings.php:241
-#: actions/invite.php:60 actions/makeadmin.php:66 actions/newmessage.php:135
-#: actions/newnotice.php:105 actions/nudge.php:80
-#: actions/oauthappssettings.php:162 actions/oauthconnectionssettings.php:135
-#: actions/passwordsettings.php:137 actions/pluginenable.php:87
-#: actions/profilesettings.php:218 actions/recoverpassword.php:383
-#: actions/register.php:157 actions/remotesubscribe.php:76
-#: actions/repeat.php:82 actions/smssettings.php:249 actions/subedit.php:40
-#: actions/subscribe.php:87 actions/tagother.php:145
-#: actions/unsubscribe.php:69 actions/urlsettings.php:171
-#: actions/userauthorization.php:53 lib/designsettings.php:122
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 
 #. TRANS: Form validation error given when an invalid username and/or password was passed to the OAuth API.
-#: actions/apioauthauthorize.php:168
 msgid "Invalid nickname / password!"
 msgstr "نيكنيم / پاسوورد مش مظبوطه!"
 
 #. TRANS: Server error displayed when a database action fails.
-#: actions/apioauthauthorize.php:217
 #, fuzzy
 msgid "Database error inserting oauth_token_association."
 msgstr "خطأ قاعده البيانات أثناء إدخال المستخدم OAuth app"
@@ -930,28 +707,19 @@ msgstr "خطأ قاعده البيانات أثناء إدخال المستخد
 #. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
 #. TRANS: Message given submitting a form with an unknown action in SMS settings.
 #. TRANS: Unknown form validation error in design settings form.
-#: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
-#: actions/designadminpanel.php:100 actions/editapplication.php:144
-#: actions/emailsettings.php:311 actions/grouplogo.php:332
-#: actions/imsettings.php:256 actions/newapplication.php:124
-#: actions/oauthconnectionssettings.php:144 actions/recoverpassword.php:46
-#: actions/smssettings.php:270 lib/designsettings.php:133
 msgid "Unexpected form submission."
 msgstr ""
 
 #. TRANS: Title for a page where a user can confirm/deny account access by an external application.
-#: actions/apioauthauthorize.php:387
 msgid "An application would like to connect to your account"
 msgstr ""
 
 #. TRANS: Fieldset legend.
-#: actions/apioauthauthorize.php:404
 msgid "Allow or deny access"
 msgstr ""
 
 #. TRANS: User notification of external application requesting account access.
 #. TRANS: %3$s is the access type requested (read-write or read-only), %4$s is the StatusNet sitename.
-#: actions/apioauthauthorize.php:425
 #, php-format
 msgid ""
 "An application would like the ability to <strong>%3$s</strong> your %4$s "
@@ -962,7 +730,6 @@ msgstr ""
 #. TRANS: User notification of external application requesting account access.
 #. TRANS: %1$s is the application name requesting access, %2$s is the organisation behind the application,
 #. TRANS: %3$s is the access type requested, %4$s is the StatusNet sitename.
-#: actions/apioauthauthorize.php:433
 #, php-format
 msgid ""
 "The application <strong>%1$s</strong> by <strong>%2$s</strong> would like "
@@ -971,23 +738,19 @@ msgid ""
 msgstr ""
 
 #. TRANS: Fieldset legend.
-#: actions/apioauthauthorize.php:455
 #, fuzzy
 msgctxt "LEGEND"
 msgid "Account"
 msgstr "الحساب"
 
 #. TRANS: Field label on OAuth API authorisation form.
+#. TRANS: Field label on login page.
 #. TRANS: Field label in form for profile settings.
-#: actions/apioauthauthorize.php:459 actions/login.php:225
-#: actions/profilesettings.php:107 actions/register.php:411
-#: actions/userauthorization.php:145 lib/groupeditform.php:145
 msgid "Nickname"
 msgstr "الاسم المستعار"
 
 #. TRANS: Field label on OAuth API authorisation form.
-#: actions/apioauthauthorize.php:463 actions/login.php:228
-#: actions/register.php:415 lib/settingsnav.php:87
+#. TRANS: Field label on login page.
 msgid "Password"
 msgstr "كلمه السر"
 
@@ -997,47 +760,38 @@ msgstr "كلمه السر"
 #. TRANS: Button label to cancel an IM address confirmation procedure.
 #. TRANS: Button label to cancel a SMS address confirmation procedure.
 #. TRANS: Button label in the "Edit application" form.
-#: actions/apioauthauthorize.php:478 actions/emailsettings.php:125
-#: actions/imsettings.php:136 actions/smssettings.php:132
-#: lib/applicationeditform.php:351
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Cancel"
 msgstr "ألغِ"
 
 #. TRANS: Button text that when clicked will allow access to an account by an external application.
-#: actions/apioauthauthorize.php:485
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Allow"
 msgstr "اسمح"
 
 #. TRANS: Form instructions.
-#: actions/apioauthauthorize.php:502
 msgid "Authorize access to your account information."
 msgstr ""
 
 #. TRANS: Header for user notification after revoking OAuth access to an application.
-#: actions/apioauthauthorize.php:594
 #, fuzzy
 msgid "Authorization canceled."
 msgstr "لا رمز تأكيد."
 
 #. TRANS: User notification after revoking OAuth access to an application.
 #. TRANS: %s is an OAuth token.
-#: actions/apioauthauthorize.php:598
 #, php-format
 msgid "The request token %s has been revoked."
 msgstr ""
 
 #. TRANS: Title of the page notifying the user that an anonymous client application was successfully authorized to access the user's account with OAuth.
-#: actions/apioauthauthorize.php:621
 #, fuzzy
 msgid "You have successfully authorized the application"
 msgstr "لا تملك تصريحًا."
 
 #. TRANS: Message notifying the user that an anonymous client application was successfully authorized to access the user's account with OAuth.
-#: actions/apioauthauthorize.php:625
 msgid ""
 "Please return to the application and enter the following security code to "
 "complete the process."
@@ -1045,14 +799,12 @@ msgstr ""
 
 #. TRANS: Title of the page notifying the user that the client application was successfully authorized to access the user's account with OAuth.
 #. TRANS: %s is the authorised application name.
-#: actions/apioauthauthorize.php:632
 #, fuzzy, php-format
 msgid "You have successfully authorized %s"
 msgstr "لا تملك تصريحًا."
 
 #. TRANS: Message notifying the user that the client application was successfully authorized to access the user's account with OAuth.
 #. TRANS: %s is the authorised application name.
-#: actions/apioauthauthorize.php:639
 #, php-format
 msgid ""
 "Please return to %s and enter the following security code to complete the "
@@ -1061,13 +813,11 @@ msgstr ""
 
 #. TRANS: Client error displayed trying to delete a status not using POST or DELETE.
 #. TRANS: POST and DELETE should not be translated.
-#: actions/apistatusesdestroy.php:111
 #, fuzzy
 msgid "This method requires a POST or DELETE."
 msgstr "تتطلب هذه الطريقه POST."
 
 #. TRANS: Client error displayed trying to delete a status of another user.
-#: actions/apistatusesdestroy.php:136
 #, fuzzy
 msgid "You may not delete another user's status."
 msgstr "لا يمكنك حذف المستخدمين."
@@ -1076,21 +826,16 @@ msgstr "لا يمكنك حذف المستخدمين."
 #. TRANS: Client error displayed trying to display redents of a non-exiting notice.
 #. TRANS: Client exception thrown when referencing a non-existing notice.
 #. TRANS: Error message displayed trying to delete a non-existing notice.
-#: actions/apistatusesretweet.php:74 actions/apistatusesretweets.php:70
-#: actions/atompubshowfavorite.php:82 actions/deletenotice.php:61
-#: actions/shownotice.php:92
 msgid "No such notice."
 msgstr "لا إشعار كهذا."
 
 #. TRANS: Client error displayed trying to repeat an own notice through the API.
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:549
 msgid "Cannot repeat your own notice."
 msgstr "مش نافعه تتكرر الملاحظتك بتاعتك."
 
 #. TRANS: Client error displayed trying to re-repeat a notice through the API.
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:92 lib/command.php:555
 msgid "Already repeated that notice."
 msgstr "الملاحظه اتكررت فعلا."
 
@@ -1100,60 +845,46 @@ msgstr "الملاحظه اتكررت فعلا."
 #. TRANS: Client exception thrown when using an unsupported HTTP method.
 #. TRANS: Client error shown when using a non-supported HTTP method.
 #. TRANS: Client exception thrown when using an unsupported HTTP method.
-#: actions/apistatusesshow.php:118 actions/atompubfavoritefeed.php:103
-#: actions/atompubmembershipfeed.php:105 actions/atompubshowfavorite.php:117
-#: actions/atompubshowmembership.php:116
-#: actions/atompubshowsubscription.php:122
-#: actions/atompubsubscriptionfeed.php:109
 #, fuzzy
 msgid "HTTP method not supported."
 msgstr "الـ API method مش موجوده."
 
 #. TRANS: Exception thrown requesting an unsupported notice output format.
 #. TRANS: %s is the requested output format.
-#: actions/apistatusesshow.php:144
 #, fuzzy, php-format
 msgid "Unsupported format: %s."
 msgstr "نسق غير مدعوم."
 
 #. TRANS: Client error displayed requesting a deleted status.
-#: actions/apistatusesshow.php:155
 msgid "Status deleted."
 msgstr "حُذِفت الحاله."
 
 #. TRANS: Client error displayed requesting a status with an invalid ID.
-#: actions/apistatusesshow.php:162
 #, fuzzy
 msgid "No status with that ID found."
 msgstr "لا ملف شخصى بهذه الهويه."
 
 #. TRANS: Client error displayed when trying to delete a notice not using the Atom format.
-#: actions/apistatusesshow.php:227
 msgid "Can only delete using the Atom format."
 msgstr ""
 
 #. TRANS: Client error displayed when a user has no rights to delete notices of other users.
 #. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
-#: actions/apistatusesshow.php:235 actions/deletenotice.php:78
 #, fuzzy
 msgid "Cannot delete this notice."
 msgstr "تعذّر حذف هذا الإشعار."
 
 #. TRANS: Confirmation of notice deletion in API. %d is the ID (number) of the deleted notice.
-#: actions/apistatusesshow.php:249
 #, fuzzy, php-format
 msgid "Deleted notice %d"
 msgstr "احذف الإشعار"
 
 #. TRANS: Client error displayed when the parameter "status" is missing.
-#: actions/apistatusesupdate.php:221
 msgid "Client must provide a 'status' parameter with a value."
 msgstr ""
 
 #. TRANS: Client error displayed when the parameter "status" is missing.
 #. TRANS: %d is the maximum number of character for a notice.
-#: actions/apistatusesupdate.php:244 actions/newnotice.php:161
-#: lib/mailhandler.php:60
 #, fuzzy, php-format
 msgid "That's too long. Maximum notice size is %d character."
 msgid_plural "That's too long. Maximum notice size is %d characters."
@@ -1165,14 +896,12 @@ msgstr[4] "هذا الملف كبير جدًا. إن أقصى حجم للملف
 msgstr[5] "هذا الملف كبير جدًا. إن أقصى حجم للملفات هو %d."
 
 #. TRANS: Client error displayed when replying to a non-existing notice.
-#: actions/apistatusesupdate.php:284
 #, fuzzy
 msgid "Parent notice not found."
 msgstr "الـ API method مش موجوده."
 
 #. TRANS: Client error displayed exceeding the maximum notice length.
 #. TRANS: %d is the maximum lenth for a notice.
-#: actions/apistatusesupdate.php:308 actions/newnotice.php:184
 #, php-format
 msgid "Maximum notice size is %d character, including attachment URL."
 msgid_plural "Maximum notice size is %d characters, including attachment URL."
@@ -1185,13 +914,11 @@ msgstr[5] ""
 
 #. TRANS: Client error displayed when requesting profiles of followers in an unsupported format.
 #. TRANS: Client error displayed when requesting IDs of followers in an unsupported format.
-#: actions/apisubscriptions.php:228 actions/apisubscriptions.php:258
 msgid "Unsupported format."
 msgstr "نسق غير مدعوم."
 
 #. TRANS: Title for timeline of most recent favourite notices by a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname.
-#: actions/apitimelinefavorites.php:108
 #, fuzzy, php-format
 msgid "%1$s / Favorites from %2$s"
 msgstr "%1$s دخل جروپ %2$s"
@@ -1199,14 +926,12 @@ msgstr "%1$s دخل جروپ %2$s"
 #. TRANS: Subtitle for timeline of most recent favourite notices by a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user's full name,
 #. TRANS: %3$s is a user nickname.
-#: actions/apitimelinefavorites.php:120
 #, fuzzy, php-format
 msgid "%1$s updates favorited by %2$s / %3$s."
 msgstr "نتايج التدوير لـ\"%1$s\" على %2$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.
-#: actions/apitimelinementions.php:115
 #, php-format
 msgid "%1$s / Updates mentioning %2$s"
 msgstr ""
@@ -1214,49 +939,41 @@ msgstr ""
 #. TRANS: Subtitle for timeline of most recent mentions of a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname,
 #. TRANS: %3$s is a user's full name.
-#: actions/apitimelinementions.php:131
 #, php-format
 msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr ""
 
 #. TRANS: Title for site timeline. %s is the StatusNet sitename.
 #. TRANS: Public RSS feed title. %s is the StatusNet site name.
-#: actions/apitimelinepublic.php:193 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "مسار %s الزمنى العام"
 
 #. TRANS: Subtitle for site timeline. %s is the StatusNet sitename.
-#: actions/apitimelinepublic.php:199
 #, php-format
 msgid "%s updates from everyone!"
 msgstr ""
 
 #. TRANS: Server error displayed calling unimplemented API method for 'retweeted by me'.
-#: actions/apitimelineretweetedbyme.php:71
 #, fuzzy
 msgid "Unimplemented."
 msgstr "اكتمل الأمر"
 
 #. TRANS: Title for Atom feed "repeated to me". %s is the user nickname.
-#: actions/apitimelineretweetedtome.php:96
 #, php-format
 msgid "Repeated to %s"
 msgstr "كرر إلى %s"
 
-#: actions/apitimelineretweetedtome.php:98
 #, fuzzy, php-format
 msgid "%1$s notices that were to repeated to %2$s / %3$s."
 msgstr "نتايج التدوير لـ\"%1$s\" على %2$s"
 
 #. TRANS: Title of list of repeated notices of the logged in user.
 #. TRANS: %s is the nickname of the logged in user.
-#: actions/apitimelineretweetsofme.php:98
 #, php-format
 msgid "Repeats of %s"
 msgstr "تكرارات %s"
 
-#: actions/apitimelineretweetsofme.php:104
 #, fuzzy, php-format
 msgid "%1$s notices that %2$s / %3$s has repeated."
 msgstr "أرسل لى بريدًا إلكرتونيًا عندما يضيف أحدهم إشعارى مفضله."
@@ -1265,80 +982,65 @@ msgstr "أرسل لى بريدًا إلكرتونيًا عندما يضيف أح
 #. TRANS: %s is the tag.
 #. TRANS: Title for first page of notices with tags.
 #. TRANS: %s is the tag.
-#: actions/apitimelinetag.php:101 actions/tag.php:69
 #, php-format
 msgid "Notices tagged with %s"
 msgstr "الإشعارات الموسومه ب%s"
 
 #. TRANS: Subtitle for timeline with lastest notices with a given tag.
 #. TRANS: %1$s is the tag, $2$s is the StatusNet sitename.
-#: actions/apitimelinetag.php:105 actions/tagrss.php:65
 #, fuzzy, php-format
 msgid "Updates tagged with %1$s on %2$s!"
 msgstr "الإشعارات الموسومه ب%s"
 
 #. TRANS: Client error displayed trying to add a notice to another user's timeline.
-#: actions/apitimelineuser.php:308
 #, fuzzy
 msgid "Only the user can add to their own timeline."
 msgstr "يحق للمُرسل والمستلم فقط قراءه هذه الرساله."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:315
 msgid "Only accept AtomPub for Atom feeds."
 msgstr ""
 
 #. TRANS: Client error displayed attempting to post an empty API notice.
-#: actions/apitimelineuser.php:322
 msgid "Atom post must not be empty."
 msgstr ""
 
 #. TRANS: Client error displayed attempting to post an API that is not well-formed XML.
-#: actions/apitimelineuser.php:328
 msgid "Atom post must be well-formed XML."
 msgstr ""
 
 #. TRANS: Client error displayed when not using an Atom entry.
-#: actions/apitimelineuser.php:334 actions/atompubfavoritefeed.php:228
-#: actions/atompubmembershipfeed.php:230
-#: actions/atompubsubscriptionfeed.php:236
 msgid "Atom post must be an Atom entry."
 msgstr ""
 
 #. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
-#: actions/apitimelineuser.php:345
 msgid "Can only handle POST activities."
 msgstr ""
 
 #. TRANS: Client error displayed when using an unsupported activity object type.
 #. TRANS: %s is the unsupported activity object type.
-#: actions/apitimelineuser.php:356
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
 #. TRANS: %d is the notice ID (number).
-#: actions/apitimelineuser.php:390
 #, fuzzy, php-format
 msgid "No content for notice %d."
 msgstr "ابحث عن محتويات فى الإشعارات"
 
 #. TRANS: Client error displayed when using another format than AtomPub.
 #. TRANS: %s is the notice URI.
-#: actions/apitimelineuser.php:419
 #, fuzzy, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "لا ملف بهذه الهويه."
 
 #. TRANS: Server error for unfinished API method showTrends.
-#: actions/apitrends.php:85
 #, fuzzy
 msgid "API method under construction."
 msgstr "الـ API method مش موجوده."
 
 #. TRANS: Client error displayed when requesting user information for a non-existing user.
-#: actions/apiuserprofileimage.php:80 actions/apiusershow.php:94
 #, fuzzy
 msgid "User not found."
 msgstr "الـ API method مش موجوده."
@@ -1346,103 +1048,85 @@ msgstr "الـ API method مش موجوده."
 #. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
 #. TRANS: Client exception.
 #. TRANS: Client error displayed trying to subscribe to a non-existing profile.
-#: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
-#: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
-#: actions/subscribe.php:110
 #, fuzzy
 msgid "No such profile."
 msgstr "لا ملف كهذا."
 
 #. TRANS: Subtitle for Atom favorites feed.
 #. TRANS: %1$s is a user nickname, %2$s is the StatusNet sitename.
-#: actions/atompubfavoritefeed.php:147
 #, fuzzy, php-format
 msgid "Notices %1$s has favorited on %2$s"
 msgstr "%1$s و الصحاب, صفحه %2$d"
 
 #. TRANS: Client exception thrown when trying to set a favorite for another user.
 #. TRANS: Client exception thrown when trying to subscribe another user.
-#: actions/atompubfavoritefeed.php:217 actions/atompubsubscriptionfeed.php:225
 #, fuzzy
 msgid "Cannot add someone else's subscription."
 msgstr "تعذّر إدراج اشتراك جديد."
 
 #. TRANS: Client exception thrown when trying use an incorrect activity verb for the Atom pub method.
-#: actions/atompubfavoritefeed.php:240
 #, fuzzy
 msgid "Can only handle favorite activities."
 msgstr "ابحث عن محتويات فى الإشعارات"
 
 #. TRANS: Client exception thrown when trying favorite an object that is not a notice.
-#: actions/atompubfavoritefeed.php:250 actions/atompubmembershipfeed.php:250
 #, fuzzy
 msgid "Can only fave notices."
 msgstr "ابحث عن محتويات فى الإشعارات"
 
 #. TRANS: Client exception thrown when trying favorite a notice without content.
-#: actions/atompubfavoritefeed.php:259
 #, fuzzy
 msgid "Unknown note."
 msgstr "مش معروف"
 
 #. TRANS: Client exception thrown when trying favorite an already favorited notice.
-#: actions/atompubfavoritefeed.php:267
 #, fuzzy
 msgid "Already a favorite."
 msgstr "أضف إلى المفضلات"
 
 #. TRANS: Title for group membership feed.
 #. TRANS: %s is a username.
-#: actions/atompubmembershipfeed.php:144
 #, fuzzy, php-format
 msgid "%s group memberships"
 msgstr "أعضاء مجموعه %s"
 
 #. TRANS: Subtitle for group membership feed.
 #. TRANS: %1$s is a username, %2$s is the StatusNet sitename.
-#: actions/atompubmembershipfeed.php:149
 #, fuzzy, php-format
 msgid "Groups %1$s is a member of on %2$s"
 msgstr "المجموعات التى %s عضو فيها"
 
 #. TRANS: Client exception thrown when trying subscribe someone else to a group.
-#: actions/atompubmembershipfeed.php:219
 #, fuzzy
 msgid "Cannot add someone else's membership."
 msgstr "تعذّر إدراج اشتراك جديد."
 
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#: actions/atompubmembershipfeed.php:242
 #, fuzzy
 msgid "Can only handle join activities."
 msgstr "ابحث عن محتويات فى الإشعارات"
 
 #. TRANS: Client exception thrown when trying to subscribe to a non-existing group.
-#: actions/atompubmembershipfeed.php:259
 #, fuzzy
 msgid "Unknown group."
 msgstr "مش معروف"
 
 #. TRANS: Client exception thrown when trying to subscribe to an already subscribed group.
-#: actions/atompubmembershipfeed.php:267
 #, fuzzy
 msgid "Already a member."
 msgstr "جميع الأعضاء"
 
 #. TRANS: Client exception thrown when trying to subscribe to group while blocked from that group.
-#: actions/atompubmembershipfeed.php:275
 msgid "Blocked by admin."
 msgstr ""
 
 #. TRANS: Client exception thrown when referencing a non-existing favorite.
-#: actions/atompubshowfavorite.php:90
 #, fuzzy
 msgid "No such favorite."
 msgstr "لا ملف كهذا."
 
 #. TRANS: Client exception thrown when trying to remove a favorite notice of another user.
-#: actions/atompubshowfavorite.php:151
 #, fuzzy
 msgid "Cannot delete someone else's favorite."
 msgstr "تعذّر حذف المفضله."
@@ -1469,93 +1153,68 @@ msgstr "تعذّر حذف المفضله."
 #. TRANS: Client error displayed when trying to join a non-existing group.
 #. TRANS: Client error displayed when trying to leave a non-local group.
 #. TRANS: Client error displayed when trying to leave a non-existing group.
+#. TRANS: Client error displayed when providing an invalid group ID on the Make Admin page.
 #. 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.
 #. TRANS: Command exception text shown when a group is requested that does not exist.
 #. TRANS: Error text shown when trying to leave a group that does not exist.
-#: actions/atompubshowmembership.php:81 actions/blockedfromgroup.php:81
-#: actions/blockedfromgroup.php:89 actions/deletegroup.php:87
-#: actions/deletegroup.php:100 actions/editgroup.php:102
-#: actions/foafgroup.php:46 actions/foafgroup.php:65 actions/foafgroup.php:73
-#: actions/groupblock.php:89 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:101 actions/grouplogo.php:103
-#: actions/groupmembers.php:84 actions/groupmembers.php:92
-#: actions/grouprss.php:97 actions/grouprss.php:105
-#: actions/groupunblock.php:89 actions/joingroup.php:82
-#: actions/joingroup.php:95 actions/leavegroup.php:82
-#: actions/leavegroup.php:95 actions/makeadmin.php:86
-#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:392
 msgid "No such group."
 msgstr "لا مجموعه كهذه."
 
 #. TRANS: Client exception thrown when trying to show membership of a non-subscribed group
-#: actions/atompubshowmembership.php:91
 #, fuzzy
 msgid "Not a member."
 msgstr "جميع الأعضاء"
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
-#: actions/atompubshowmembership.php:150
 #, fuzzy
 msgid "Cannot delete someone else's membership."
 msgstr "تعذّر حفظ الاشتراك."
 
 #. TRANS: Client exception thrown when trying to display a subscription for a non-existing profile ID.
 #. TRANS: %d is the non-existing profile ID number.
-#: actions/atompubshowsubscription.php:72
-#: actions/atompubshowsubscription.php:83
-#: actions/atompubsubscriptionfeed.php:74
 #, fuzzy, php-format
 msgid "No such profile id: %d."
 msgstr "لا ملف كهذا."
 
 #. 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.
-#: actions/atompubshowsubscription.php:94
 #, fuzzy, php-format
 msgid "Profile %1$d not subscribed to profile %2$d."
 msgstr "لست مُشتركًا بأى أحد."
 
 #. TRANS: Client exception thrown when trying to delete a subscription of another user.
-#: actions/atompubshowsubscription.php:157
 #, fuzzy
 msgid "Cannot delete someone else's subscription."
 msgstr "تعذّر حفظ الاشتراك."
 
 #. TRANS: Subtitle for Atom subscription feed.
 #. TRANS: %1$s is a user nickname, %s$s is the StatusNet sitename.
-#: actions/atompubsubscriptionfeed.php:153
 #, fuzzy, php-format
 msgid "People %1$s has subscribed to on %2$s"
 msgstr "الأشخاص المشتركون ب%s"
 
 #. TRANS: Client error displayed when not using the follow verb.
-#: actions/atompubsubscriptionfeed.php:248
 msgid "Can only handle Follow activities."
 msgstr ""
 
 #. TRANS: Client exception thrown when subscribing to an object that is not a person.
-#: actions/atompubsubscriptionfeed.php:256
 msgid "Can only follow people."
 msgstr ""
 
 #. TRANS: Client exception thrown when subscribing to a non-existing profile.
 #. TRANS: %s is the unknown profile ID.
-#: actions/atompubsubscriptionfeed.php:267
 #, fuzzy, php-format
 msgid "Unknown profile %s."
 msgstr "نوع ملف غير معروف"
 
 #. TRANS: Client error displayed trying to subscribe to an already subscribed profile.
 #. TRANS: %s is the profile the user already has a subscription on.
-#: actions/atompubsubscriptionfeed.php:275
 #, fuzzy, php-format
 msgid "Already subscribed to %s."
 msgstr "مُشترك أصلا!"
 
 #. TRANS: Client error displayed trying to get a non-existing attachment.
-#: actions/attachment.php:73
 msgid "No such attachment."
 msgstr "لا مرفق كهذا."
 
@@ -1567,31 +1226,23 @@ msgstr "لا مرفق كهذا."
 #. TRANS: Client error displayed when trying to view group members without providing a group nickname.
 #. TRANS: Client error displayed when requesting a group RSS feed without providing a group nickname.
 #. TRANS: Client error displayed if no nickname argument was given requesting a group page.
-#: actions/avatarbynickname.php:60 actions/blockedfromgroup.php:73
-#: actions/editgroup.php:85 actions/groupdesignsettings.php:84
-#: actions/grouplogo.php:86 actions/groupmembers.php:76
-#: actions/grouprss.php:89 actions/showgroup.php:116
 msgid "No nickname."
 msgstr "لا اسم مستعار."
 
 #. TRANS: Client error displayed trying to get an avatar without providing an avatar size.
-#: actions/avatarbynickname.php:66
 msgid "No size."
 msgstr "لا حجم."
 
 #. TRANS: Client error displayed trying to get an avatar providing an invalid avatar size.
-#: actions/avatarbynickname.php:72
 msgid "Invalid size."
 msgstr "حجم غير صالح."
 
 #. TRANS: Title for avatar upload page.
-#: actions/avatarsettings.php:66 lib/settingsnav.php:82
 msgid "Avatar"
 msgstr "أفتار"
 
 #. TRANS: Instruction for avatar upload page.
 #. TRANS: %s is the maximum file size, for example "500b", "10kB" or "2MB".
-#: actions/avatarsettings.php:78
 #, fuzzy, php-format
 msgid "You can upload your personal avatar. The maximum file size is %s."
 msgstr "تستطيع رفع صورتك الشخصيه. أقصى حجم للملف هو 2 م.ب."
@@ -1600,17 +1251,12 @@ msgstr "تستطيع رفع صورتك الشخصيه. أقصى حجم للمل
 #. TRANS: Server error displayed coming across a request from a user without a profile.
 #. TRANS: Server error displayed when trying to authorise a remote subscription request
 #. TRANS: while the user has no profile.
-#: actions/avatarsettings.php:108 actions/avatarsettings.php:192
-#: actions/grouplogo.php:184 actions/remotesubscribe.php:190
-#: actions/userauthorization.php:75 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr "يوزر من-غير پروفايل زيّه."
 
 #. TRANS: Avatar upload page form legend.
 #. TRANS: Avatar upload page crop form legend.
 #. TRANS: Legend for group logo settings fieldset.
-#: actions/avatarsettings.php:122 actions/avatarsettings.php:205
-#: actions/grouplogo.php:261
 msgid "Avatar settings"
 msgstr "إعدادات الأفتار"
 
@@ -1618,8 +1264,6 @@ msgstr "إعدادات الأفتار"
 #. TRANS: Header on avatar upload crop form for thumbnail of originally uploaded avatar (h2).
 #. TRANS: Uploaded original file in group logo form.
 #. TRANS: Header for originally uploaded file before a crop on the group logo page.
-#: actions/avatarsettings.php:131 actions/avatarsettings.php:214
-#: actions/grouplogo.php:207 actions/grouplogo.php:270
 msgid "Original"
 msgstr "الأصلي"
 
@@ -1627,14 +1271,11 @@ msgstr "الأصلي"
 #. TRANS: Header on avatar upload crop form for thumbnail of to be used rendition of uploaded avatar (h2).
 #. TRANS: Header for preview of to be displayed group logo.
 #. TRANS: Header for the cropped group logo on the group logo page.
-#: actions/avatarsettings.php:147 actions/avatarsettings.php:227
-#: actions/grouplogo.php:219 actions/grouplogo.php:283
 msgid "Preview"
 msgstr "عاين"
 
 #. TRANS: Button on avatar upload page to delete current avatar.
 #. TRANS: Button text for user account deletion.
-#: actions/avatarsettings.php:155 actions/deleteaccount.php:319
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Delete"
@@ -1642,70 +1283,58 @@ msgstr "احذف"
 
 #. TRANS: Button on avatar upload page to upload an avatar.
 #. TRANS: Submit button to confirm upload of a user backup file for account restore.
-#: actions/avatarsettings.php:173 actions/restoreaccount.php:369
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Upload"
 msgstr "ارفع"
 
 #. TRANS: Button on avatar upload crop form to confirm a selected crop as avatar.
-#: actions/avatarsettings.php:243
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Crop"
 msgstr "مجموعات"
 
 #. TRANS: Validation error on avatar upload form when no file was uploaded.
-#: actions/avatarsettings.php:318
 #, fuzzy
 msgid "No file uploaded."
 msgstr "لا ملف شخصى مُحدّد."
 
 #. TRANS: Avatar upload form instruction after uploading a file.
-#: actions/avatarsettings.php:345
 msgid "Pick a square area of the image to be your avatar."
 msgstr ""
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
 #. TRANS: Server error displayed trying to crop an uploaded group logo that is no longer present.
-#: actions/avatarsettings.php:360 actions/grouplogo.php:391
 msgid "Lost our file data."
 msgstr ""
 
 #. TRANS: Success message for having updated a user avatar.
-#: actions/avatarsettings.php:384
 msgid "Avatar updated."
 msgstr "رُفع الأفتار."
 
 #. TRANS: Error displayed on the avatar upload page if the avatar could not be updated for an unknown reason.
-#: actions/avatarsettings.php:388
 msgid "Failed updating avatar."
 msgstr "فشل تحديث الأفتار."
 
 #. TRANS: Success message for deleting a user avatar.
-#: actions/avatarsettings.php:412
 msgid "Avatar deleted."
 msgstr "حُذف الأفتار."
 
 #. TRANS: Title for backup account page.
 #. TRANS: Option in profile settings to create a backup of the account of the currently logged in user.
-#: actions/backupaccount.php:61 actions/profilesettings.php:468
 msgid "Backup account"
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to backup an account while not logged in.
-#: actions/backupaccount.php:79
 #, fuzzy
 msgid "Only logged-in users can backup their account."
 msgstr "يحق للمُرسل والمستلم فقط قراءه هذه الرساله."
 
 #. TRANS: Client exception thrown when trying to backup an account without having backup rights.
-#: actions/backupaccount.php:84
 msgid "You may not backup your account."
 msgstr ""
 
 #. TRANS: Information displayed on the backup account page.
-#: actions/backupaccount.php:227
 msgid ""
 "You can backup your account data in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format. This is an experimental feature and provides "
@@ -1715,31 +1344,26 @@ msgid ""
 msgstr ""
 
 #. TRANS: Submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:250
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Backup"
 msgstr "الخلفية"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:254
 msgid "Backup your account."
 msgstr ""
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
-#: actions/block.php:68
 msgid "You already blocked that user."
 msgstr "لقد منعت مسبقا هذا المستخدم."
 
 #. TRANS: Title for block user page.
 #. TRANS: Legend for block user form.
 #. TRANS: Fieldset legend for block user from group form.
-#: actions/block.php:106 actions/block.php:136 actions/groupblock.php:165
 msgid "Block user"
 msgstr "امنع المستخدم"
 
 #. TRANS: Explanation of consequences when blocking a user on the block user page.
-#: actions/block.php:139
 msgid ""
 "Are you sure you want to block this user? Afterwards, they will be "
 "unsubscribed from you, unable to subscribe to you in the future, and you "
@@ -1752,15 +1376,11 @@ msgstr ""
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:154 actions/deleteapplication.php:157
-#: actions/deletegroup.php:220 actions/deletenotice.php:155
-#: actions/deleteuser.php:154 actions/groupblock.php:187
 msgctxt "BUTTON"
 msgid "No"
 msgstr "ملاحظة"
 
 #. TRANS: Submit button title for 'No' when blocking a user.
-#: actions/block.php:158
 #, fuzzy
 msgid "Do not block this user."
 msgstr "لا تمنع هذا المستخدم"
@@ -1771,52 +1391,42 @@ msgstr "لا تمنع هذا المستخدم"
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:161 actions/deleteapplication.php:164
-#: actions/deletegroup.php:227 actions/deletenotice.php:162
-#: actions/deleteuser.php:161 actions/groupblock.php:194
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Yes"
 msgstr "نعم"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:165
 #, fuzzy
 msgid "Block this user."
 msgstr "امنع هذا المستخدم"
 
 #. TRANS: Server error displayed when blocking a user fails.
-#: actions/block.php:189
 msgid "Failed to save block information."
 msgstr "فشل حفظ معلومات المنع."
 
 #. TRANS: Title for first page with list of users blocked from a group.
 #. TRANS: %s is a group nickname.
-#: actions/blockedfromgroup.php:101
 #, fuzzy, php-format
 msgid "%s blocked profiles"
 msgstr "%1$s فايلات معمول ليها بلوك, الصفحه %2$d"
 
 #. TRANS: Title for any but the first page with list of users blocked from a group.
 #. TRANS: %1$s is a group nickname, %2$d is a page number.
-#: actions/blockedfromgroup.php:106
 #, php-format
 msgid "%1$s blocked profiles, page %2$d"
 msgstr "%1$s فايلات معمول ليها بلوك, الصفحه %2$d"
 
 #. TRANS: Instructions for list of users blocked from a group.
-#: actions/blockedfromgroup.php:122
 #, fuzzy
 msgid "A list of the users blocked from joining this group."
 msgstr "قائمه بمستخدمى هذه المجموعه."
 
 #. TRANS: Form legend for unblocking a user from a group.
-#: actions/blockedfromgroup.php:291
 msgid "Unblock user from group"
 msgstr "ألغ منع المستخدم من المجموعة"
 
 #. TRANS: Button text for unblocking a user from a group.
-#: actions/blockedfromgroup.php:323
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Unblock"
@@ -1824,131 +1434,105 @@ msgstr "ألغِ المنع"
 
 #. TRANS: Tooltip for button for unblocking a user from a group.
 #. TRANS: Description of the form to unblock a user.
-#: actions/blockedfromgroup.php:327 lib/unblockform.php:78
 msgid "Unblock this user"
 msgstr "ألغِ منع هذا المستخدم"
 
 #. TRANS: Title for mini-posting window loaded from bookmarklet.
 #. TRANS: %s is the StatusNet site name.
-#: actions/bookmarklet.php:51
 #, fuzzy, php-format
 msgid "Post to %s"
 msgstr "مجموعات %s"
 
 #. TRANS: Client error displayed when not providing a confirmation code in the contact address confirmation action.
-#: actions/confirmaddress.php:74
 msgid "No confirmation code."
 msgstr "لا رمز تأكيد."
 
 #. TRANS: Client error displayed when providing a non-existing confirmation code in the contact address confirmation action.
-#: actions/confirmaddress.php:80
 msgid "Confirmation code not found."
 msgstr "لم يوجد رمز التأكيد."
 
 #. TRANS: Client error displayed when not providing a confirmation code for another user in the contact address confirmation action.
-#: actions/confirmaddress.php:86
 msgid "That confirmation code is not for you!"
 msgstr "رمز التأكيد ليس لك!"
 
 #. TRANS: Server error for an unknown address type, which can be 'email', 'sms', or the name of an IM network (such as 'xmpp' or 'aim')
-#: actions/confirmaddress.php:94
 #, fuzzy, php-format
 msgid "Unrecognized address type %s"
 msgstr "نوع رساله مش مدعوم: %s"
 
 #. TRANS: Client error for an already confirmed email/jabber/sms address.
-#: actions/confirmaddress.php:103 actions/confirmaddress.php:136
 #, fuzzy
 msgid "That address has already been confirmed."
 msgstr "هذا البريد الإلكترونى ملك مستخدم آخر بالفعل."
 
-#: actions/confirmaddress.php:121 actions/imsettings.php:444
-#: actions/userdesignsettings.php:306
-#, fuzzy
 msgid "Couldn't update user."
 msgstr "تعذّر تحديث المستخدم."
 
-#: actions/confirmaddress.php:144
 #, fuzzy
 msgid "Couldn't update user im preferences."
 msgstr "تعذّر تحديث المستخدم."
 
-#: actions/confirmaddress.php:156
 #, fuzzy
 msgid "Couldn't insert user im preferences."
 msgstr "تعذّر إدراج اشتراك جديد."
 
 #. TRANS: Server error displayed when an address confirmation code deletion from the
 #. TRANS: database fails in the contact address confirmation action.
-#: actions/confirmaddress.php:169
 #, fuzzy
 msgid "Could not delete address confirmation."
 msgstr "تعذّر حذف تأكيد البريد الإلكترونى."
 
 #. TRANS: Title for the contact address confirmation action.
-#: actions/confirmaddress.php:185
 msgid "Confirm address"
 msgstr "اكد العنوان"
 
 #. TRANS: Success message for the contact address confirmation action.
 #. TRANS: %s can be 'email', 'jabber', or 'sms'.
-#: actions/confirmaddress.php:200
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr ""
 
 #. TRANS: Title for page with a conversion (multiple notices in context).
-#: actions/conversation.php:96
 msgid "Conversation"
 msgstr "محادثة"
 
 #. TRANS: Header on conversation page. Hidden by default (h2).
 #. TRANS: Label for user statistics.
-#: actions/conversation.php:149 lib/noticelist.php:87
-#: lib/profileaction.php:246 lib/searchgroupnav.php:82
-#: lib/threadednoticelist.php:66
 msgid "Notices"
 msgstr "الإشعارات"
 
 #. TRANS: Client exception displayed trying to delete a user account while not logged in.
-#: actions/deleteaccount.php:71
 #, fuzzy
 msgid "Only logged-in users can delete their account."
 msgstr "يحق للمُرسل والمستلم فقط قراءه هذه الرساله."
 
 #. TRANS: Client exception displayed trying to delete a user account without have the rights to do that.
-#: actions/deleteaccount.php:77
 #, fuzzy
 msgid "You cannot delete your account."
 msgstr "لا يمكنك حذف المستخدمين."
 
 #. TRANS: Confirmation text for user deletion. The user has to type this exactly the same, including punctuation.
-#: actions/deleteaccount.php:160 actions/deleteaccount.php:297
 msgid "I am sure."
 msgstr ""
 
 #. TRANS: Notification for user about the text that must be input to be able to delete a user account.
 #. TRANS: %s is the text that needs to be input.
-#: actions/deleteaccount.php:164
 #, php-format
 msgid "You must write \"%s\" exactly in the box."
 msgstr ""
 
 #. TRANS: Confirmation that a user account has been deleted.
-#: actions/deleteaccount.php:206
 #, fuzzy
 msgid "Account deleted."
 msgstr "حُذف الأفتار."
 
 #. TRANS: Page title for page on which a user account can be deleted.
 #. TRANS: Option in profile settings to delete the account of the currently logged in user.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:476
 #, fuzzy
 msgid "Delete account"
 msgstr "أنشئ مجموعه جديدة"
 
 #. TRANS: Form text for user deletion form.
-#: actions/deleteaccount.php:279
 msgid ""
 "This will <strong>permanently delete</strong> your account data from this "
 "server."
@@ -1956,7 +1540,6 @@ msgstr ""
 
 #. TRANS: Additional form text for user deletion form shown if a user has account backup rights.
 #. TRANS: %s is a URL to the backup page.
-#: actions/deleteaccount.php:285
 #, php-format
 msgid ""
 "You are strongly advised to <a href=\"%s\">back up your data</a> before "
@@ -1965,57 +1548,44 @@ msgstr ""
 
 #. TRANS: Field label for delete account confirmation entry.
 #. TRANS: Field label for password reset form where the password has to be typed again.
-#: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:262 actions/register.php:419
 msgid "Confirm"
 msgstr "أكّد"
 
 #. TRANS: Input title for the delete account field.
 #. TRANS: %s is the text that needs to be input.
-#: actions/deleteaccount.php:304
 #, fuzzy, php-format
 msgid "Enter \"%s\" to confirm that you want to delete your account."
 msgstr "لا يمكنك حذف المستخدمين."
 
 #. TRANS: Button title for user account deletion.
-#: actions/deleteaccount.php:323
 #, fuzzy
 msgid "Permanently delete your account"
 msgstr "لا يمكنك حذف المستخدمين."
 
 #. TRANS: Client error displayed trying to delete an application while not logged in.
-#: actions/deleteapplication.php:62
 msgid "You must be logged in to delete an application."
 msgstr "لازم يكون متسجل دخولك علشان تعدّل application."
 
 #. TRANS: Client error displayed trying to delete an application that does not exist.
-#: actions/deleteapplication.php:71
 #, fuzzy
 msgid "Application not found."
 msgstr "لم يوجد رمز التأكيد."
 
 #. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
-#: actions/deleteapplication.php:79 actions/editapplication.php:78
-#: actions/showapplication.php:90
 msgid "You are not the owner of this application."
 msgstr "انت مش بتملك الapplication دى."
 
 #. TRANS: Client error text when there is a problem with the session token.
-#: actions/deleteapplication.php:102 actions/editapplication.php:131
-#: actions/newapplication.php:112 actions/showapplication.php:113
-#: lib/action.php:1391
 msgid "There was a problem with your session token."
 msgstr ""
 
 #. TRANS: Title for delete application page.
 #. TRANS: Fieldset legend on delete application page.
-#: actions/deleteapplication.php:124 actions/deleteapplication.php:149
 msgid "Delete application"
 msgstr "OAuth applications"
 
 #. TRANS: Confirmation text on delete application page.
-#: actions/deleteapplication.php:152
 msgid ""
 "Are you sure you want to delete this application? This will clear all data "
 "about the application from the database, including all existing user "
@@ -2023,19 +1593,16 @@ msgid ""
 msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting an application.
-#: actions/deleteapplication.php:161
 #, fuzzy
 msgid "Do not delete this application."
 msgstr "لا تحذف هذا الإشعار"
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
-#: actions/deleteapplication.php:167
 #, fuzzy
 msgid "Delete this application."
 msgstr "احذف هذا الإشعار"
 
 #. TRANS: Client error when trying to delete group while not logged in.
-#: actions/deletegroup.php:64
 #, fuzzy
 msgid "You must be logged in to delete a group."
 msgstr "يجب أن تكون والجًا لتنشئ مجموعه."
@@ -2043,41 +1610,34 @@ msgstr "يجب أن تكون والجًا لتنشئ مجموعه."
 #. TRANS: Client error when trying to delete a group without providing a nickname or ID for the group.
 #. TRANS: Client error displayed when trying to join a group without providing a group name or group ID.
 #. TRANS: Client error displayed when trying to leave a group without providing a group name or group ID.
-#: actions/deletegroup.php:94 actions/joingroup.php:89
-#: actions/leavegroup.php:89
 #, fuzzy
 msgid "No nickname or ID."
 msgstr "لا اسم مستعار."
 
 #. TRANS: Client error when trying to delete a group without having the rights to delete it.
-#: actions/deletegroup.php:107
 #, fuzzy
 msgid "You are not allowed to delete this group."
 msgstr "لست عضوا فى تلك المجموعه."
 
 #. TRANS: Server error displayed if a group could not be deleted.
 #. TRANS: %s is the name of the group that could not be deleted.
-#: actions/deletegroup.php:150
 #, fuzzy, php-format
 msgid "Could not delete group %s."
 msgstr "تعذر تحديث المجموعه."
 
 #. TRANS: Message given after deleting a group.
 #. TRANS: %s is the deleted group's name.
-#: actions/deletegroup.php:159
 #, fuzzy, php-format
 msgid "Deleted group %s"
 msgstr "%1$s ساب جروپ %2$s"
 
 #. TRANS: Title of delete group page.
 #. TRANS: Form legend for deleting a group.
-#: actions/deletegroup.php:176 actions/deletegroup.php:202
 #, fuzzy
 msgid "Delete group"
 msgstr "احذف المستخدم"
 
 #. TRANS: Warning in form for deleleting a group.
-#: actions/deletegroup.php:206
 msgid ""
 "Are you sure you want to delete this group? This will clear all data about "
 "the group from the database, without a backup. Public posts to this group "
@@ -2085,13 +1645,11 @@ msgid ""
 msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting a group.
-#: actions/deletegroup.php:224
 #, fuzzy
 msgid "Do not delete this group."
 msgstr "لا تحذف هذا الإشعار"
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
-#: actions/deletegroup.php:231
 #, fuzzy
 msgid "Delete this group."
 msgstr "احذف هذا المستخدم"
@@ -2102,22 +1660,18 @@ msgstr "احذف هذا المستخدم"
 #. TRANS: Client error displayed trying to block a user from a group while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying to log out when not logged in.
+#. TRANS: Client error displayed when trying to access the "make admin" page while not logged in.
+#. TRANS: Client error displayed trying to create a new direct message while not logged in.
+#. TRANS: Client error displayed trying to send a notice while not logged in.
+#. TRANS: Client error displayed trying to nudge a user without being logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
 #. TRANS: Client error displayed when trying to change user options while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
-#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:70
-#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
-#: actions/nudge.php:63 actions/pluginenable.php:97 actions/subedit.php:33
-#: actions/subscribe.php:98 actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:71 lib/profileformaction.php:63
-#: lib/settingsaction.php:72
 msgid "Not logged in."
 msgstr "لست والجًا."
 
 #. TRANS: Instructions for deleting a notice.
-#: actions/deletenotice.php:110
 msgid ""
 "You are about to permanently delete a notice. Once this is done, it cannot "
 "be undone."
@@ -2125,153 +1679,125 @@ msgstr ""
 
 #. TRANS: Page title when deleting a notice.
 #. TRANS: Fieldset legend for the delete notice form.
-#: actions/deletenotice.php:117 actions/deletenotice.php:148
 msgid "Delete notice"
 msgstr "احذف الإشعار"
 
 #. TRANS: Message for the delete notice form.
-#: actions/deletenotice.php:152
 msgid "Are you sure you want to delete this notice?"
 msgstr "أمتأكد من أنك تريد حذف هذا الإشعار؟"
 
 #. TRANS: Submit button title for 'No' when deleting a notice.
-#: actions/deletenotice.php:159
 #, fuzzy
 msgid "Do not delete this notice."
 msgstr "لا تحذف هذا الإشعار"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:166
 #, fuzzy
 msgid "Delete this notice."
 msgstr "احذف هذا الإشعار"
 
 #. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
-#: actions/deleteuser.php:66
 msgid "You cannot delete users."
 msgstr "لا يمكنك حذف المستخدمين."
 
 #. TRANS: Client error displayed when trying to delete a non-local user.
-#: actions/deleteuser.php:74
 msgid "You can only delete local users."
 msgstr "يمكنك حذف المستخدمين المحليين فقط."
 
 #. TRANS: Title of delete user page.
-#: actions/deleteuser.php:110
 #, fuzzy
 msgctxt "TITLE"
 msgid "Delete user"
 msgstr "احذف المستخدم"
 
 #. TRANS: Fieldset legend on delete user page.
-#: actions/deleteuser.php:134
 msgid "Delete user"
 msgstr "احذف المستخدم"
 
 #. TRANS: Information text to request if a user is certain that the described action has to be performed.
-#: actions/deleteuser.php:138
 msgid ""
 "Are you sure you want to delete this user? This will clear all data about "
 "the user from the database, without a backup."
 msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/deleteuser.php:158
 #, fuzzy
 msgid "Do not delete this user."
 msgstr "لا تحذف هذا الإشعار"
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
-#: actions/deleteuser.php:165
 #, fuzzy
 msgid "Delete this user."
 msgstr "احذف هذا المستخدم"
 
 #. TRANS: Message used as title for design settings for the site.
-#: actions/designadminpanel.php:60 lib/settingsnav.php:97
 msgid "Design"
 msgstr "التصميم"
 
 #. TRANS: Instructions for design adminsitration panel.
-#: actions/designadminpanel.php:71
 msgid "Design settings for this StatusNet site"
 msgstr ""
 
 #. TRANS: Client error displayed when a logo URL does is not valid.
-#: actions/designadminpanel.php:327
 msgid "Invalid logo URL."
 msgstr "مسار شعار غير صالح."
 
 #. TRANS: Client error displayed when an SSL logo URL is invalid.
-#: actions/designadminpanel.php:333
 #, fuzzy
 msgid "Invalid SSL logo URL."
 msgstr "مسار شعار غير صالح."
 
 #. TRANS: Client error displayed when a theme is submitted through the form that is not in the theme list.
 #. TRANS: %s is the chosen unavailable theme.
-#: actions/designadminpanel.php:339
 #, php-format
 msgid "Theme not available: %s."
 msgstr "المراسله الفوريه غير متوفره."
 
 #. TRANS: Fieldset legend for form to change logo.
-#: actions/designadminpanel.php:437
 msgid "Change logo"
 msgstr "غيّر الشعار"
 
 #. TRANS: Field label for StatusNet site logo.
-#: actions/designadminpanel.php:444
 msgid "Site logo"
 msgstr "شعار الموقع"
 
 #. TRANS: Field label for SSL StatusNet site logo.
-#: actions/designadminpanel.php:452
 #, fuzzy
 msgid "SSL logo"
 msgstr "شعار الموقع"
 
 #. TRANS: Fieldset legend for form change StatusNet site's theme.
-#: actions/designadminpanel.php:467
 msgid "Change theme"
 msgstr "غيّر السمة"
 
 #. TRANS: Field label for dropdown to choose site theme.
-#: actions/designadminpanel.php:485
 msgid "Site theme"
 msgstr "سمه الموقع"
 
 #. TRANS: Title for field label for dropdown to choose site theme.
-#: actions/designadminpanel.php:487
 msgid "Theme for the site."
 msgstr "سمه الموقع."
 
 #. TRANS: Field label for uploading a cutom theme.
-#: actions/designadminpanel.php:494
 #, fuzzy
 msgid "Custom theme"
 msgstr "سمه الموقع"
 
 #. TRANS: Form instructions for uploading a cutom StatusNet theme.
-#: actions/designadminpanel.php:499
 msgid "You can upload a custom StatusNet theme as a .ZIP archive."
 msgstr ""
 
 #. TRANS: Fieldset legend for theme background image.
-#: actions/designadminpanel.php:515
 msgid "Change background image"
 msgstr "تغيير صوره الخلفية"
 
 #. TRANS: Field label for background image on theme designer page.
 #. TRANS: Field label for background color selector.
 #. TRANS: Label on profile design page for setting a profile page background colour.
-#: actions/designadminpanel.php:525 actions/designadminpanel.php:609
-#: lib/designform.php:238
 msgid "Background"
 msgstr "الخلفية"
 
 #. TRANS: Form guide for background image upload form on theme designer page.
-#: actions/designadminpanel.php:531
 #, fuzzy, php-format
 msgid ""
 "You can upload a background image for the site. The maximum file size is %1"
@@ -2279,210 +1805,175 @@ msgid ""
 msgstr "تستطيع رفع صورتك الشخصيه. أقصى حجم للملف هو 2 م.ب."
 
 #. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:558
 msgid "On"
 msgstr "مكّن"
 
 #. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:575
 msgid "Off"
 msgstr "عطّل"
 
 #. TRANS: Form guide for turning background image on or off on theme designer page.
 #. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
 #. TRANS: use of the uploaded profile image.
-#: actions/designadminpanel.php:577 lib/designform.php:214
 msgid "Turn background image on or off."
 msgstr "مكّن صوره الخلفيه أو عطّلها."
 
 #. TRANS: Checkbox label to title background image on theme designer page.
 #. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-#: actions/designadminpanel.php:583 lib/designform.php:220
 #, fuzzy
 msgid "Tile background image"
 msgstr "تغيير صوره الخلفية"
 
 #. TRANS: Fieldset legend for theme colors.
-#: actions/designadminpanel.php:598
 #, fuzzy
 msgid "Change colors"
 msgstr "تغيير الألوان"
 
 #. TRANS: Field label for content color selector.
 #. TRANS: Label on profile design page for setting a profile page content colour.
-#: actions/designadminpanel.php:623 lib/designform.php:252
 msgid "Content"
 msgstr "المحتوى"
 
 #. TRANS: Field label for sidebar color selector.
 #. TRANS: Label on profile design page for setting a profile page sidebar colour.
-#: actions/designadminpanel.php:637 lib/designform.php:266
 msgid "Sidebar"
 msgstr "الشريط الجانبي"
 
 #. TRANS: Field label for text color selector.
 #. TRANS: Label on profile design page for setting a profile page text colour.
-#: actions/designadminpanel.php:651 lib/designform.php:280
 msgid "Text"
 msgstr "النص"
 
 #. TRANS: Field label for link color selector.
 #. TRANS: Label on profile design page for setting a profile page links colour.
-#: actions/designadminpanel.php:665 lib/designform.php:294
 msgid "Links"
 msgstr "وصلات"
 
 #. TRANS: Fieldset legend for advanced theme design settings.
-#: actions/designadminpanel.php:691
 msgid "Advanced"
 msgstr ""
 
 #. TRANS: Field label for custom CSS.
-#: actions/designadminpanel.php:696
 msgid "Custom CSS"
 msgstr ""
 
 #. TRANS: Button text for resetting theme settings.
-#: actions/designadminpanel.php:718
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Use defaults"
 msgstr "استخدم المبدئيات"
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:720
 #, fuzzy
 msgid "Restore default designs."
 msgstr "استعد التصميمات المبدئية"
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:728
 #, fuzzy
 msgid "Reset back to default."
 msgstr "ارجع إلى المبدئي"
 
 #. TRANS: Title for button for saving theme settings.
-#: actions/designadminpanel.php:736
 #, fuzzy
 msgid "Save design."
 msgstr "احفظ التصميم"
 
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
-#: actions/disfavor.php:83
 msgid "This notice is not a favorite!"
 msgstr "هذا الشعار ليس مفضلًا!"
 
 #. TRANS: Title for page on which favorites can be added.
-#: actions/disfavor.php:98
 msgid "Add to favorites"
 msgstr "أضف إلى المفضلات"
 
 #. TRANS: Client exception thrown when requesting a document from the documentation that does not exist.
 #. TRANS: %s is the non-existing document.
-#: actions/doc.php:155
 #, fuzzy, php-format
 msgid "No such document \"%s\"."
 msgstr "لا مرفق كهذا."
 
 #. TRANS: Title for "Edit application" form.
 #. TRANS: Form legend.
-#: actions/editapplication.php:54 lib/applicationeditform.php:129
 #, fuzzy
 msgid "Edit application"
 msgstr "OAuth applications"
 
 #. TRANS: Client error displayed trying to edit an application while not logged in.
-#: actions/editapplication.php:66
 msgid "You must be logged in to edit an application."
 msgstr "لازم يكون متسجل دخولك علشان تعدّل application."
 
 #. TRANS: Client error displayed trying to edit an application that does not exist.
-#: actions/editapplication.php:83 actions/showapplication.php:83
 msgid "No such application."
 msgstr "ما فيش application زى كده."
 
 #. TRANS: Instructions for "Edit application" form.
-#: actions/editapplication.php:167
 msgid "Use this form to edit your application."
 msgstr "استعمل الفورمه دى علشان تعدّل الapplication بتاعتك."
 
 #. TRANS: Validation error shown when not providing a name in the "Edit application" form.
 #. TRANS: Validation error shown when not providing a name in the "New application" form.
-#: actions/editapplication.php:184 actions/newapplication.php:164
 msgid "Name is required."
 msgstr "الاسم مطلوب."
 
 #. 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.
-#: actions/editapplication.php:188 actions/newapplication.php:172
 #, fuzzy
 msgid "Name is too long (maximum 255 characters)."
 msgstr "الاسم طويل جدا (اكتر حاجه 255 رمز)."
 
 #. TRANS: Validation error shown when providing a name for an application that already exists in the "Edit application" form.
 #. TRANS: Validation error shown when providing a name for an application that already exists in the "New application" form.
-#: actions/editapplication.php:192 actions/newapplication.php:168
 msgid "Name already in use. Try another one."
 msgstr ""
 
 #. TRANS: Validation error shown when not providing a description in the "Edit application" form.
 #. TRANS: Validation error shown when not providing a description in the "New application" form.
-#: actions/editapplication.php:196 actions/newapplication.php:176
 msgid "Description is required."
 msgstr "الوصف مطلوب."
 
 #. TRANS: Validation error shown when providing too long a source URL in the "Edit application" form.
-#: actions/editapplication.php:209
 #, fuzzy
 msgid "Source URL is too long."
 msgstr "الSource URL مش مظبوط."
 
 #. TRANS: Validation error shown when providing an invalid source URL in the "Edit application" form.
 #. TRANS: Validation error shown when providing an invalid source URL in the "New application" form.
-#: actions/editapplication.php:216 actions/newapplication.php:199
 msgid "Source URL is not valid."
 msgstr "الSource URL مش مظبوط."
 
 #. 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.
-#: actions/editapplication.php:220 actions/newapplication.php:203
 #, fuzzy
 msgid "Organization is required."
 msgstr "الوصف مطلوب."
 
 #. TRANS: Validation error shown when providing too long an arganisation name in the "Edit application" form.
-#: actions/editapplication.php:224 actions/newapplication.php:207
 #, fuzzy
 msgid "Organization is too long (maximum 255 characters)."
 msgstr "المنظمه طويله جدا (اكتر حاجه 255 رمز)."
 
 #. TRANS: Form validation error show when an organisation name has not been provided in the edit application form.
 #. TRANS: Form validation error show when an organisation name has not been provided in the new application form.
-#: actions/editapplication.php:228 actions/newapplication.php:211
 #, fuzzy
 msgid "Organization homepage is required."
 msgstr "الوصف مطلوب."
 
 #. TRANS: Validation error shown when providing too long a callback URL in the "Edit application" form.
 #. TRANS: Validation error shown when providing too long a callback URL in the "New application" form.
-#: actions/editapplication.php:239 actions/newapplication.php:225
 msgid "Callback is too long."
 msgstr ""
 
 #. TRANS: Validation error shown when providing an invalid callback URL in the "Edit application" form.
 #. TRANS: Validation error shown when providing an invalid callback URL in the "New application" form.
-#: actions/editapplication.php:247 actions/newapplication.php:235
 #, fuzzy
 msgid "Callback URL is not valid."
 msgstr "الSource URL مش مظبوط."
 
 #. TRANS: Server error occuring when an application could not be updated from the "Edit application" form.
-#: actions/editapplication.php:284
 msgid "Could not update application."
 msgstr "ما نفعش تحديث الapplication."
 
 #. TRANS: Title for form to edit a group. %s is a group nickname.
-#: actions/editgroup.php:55
 #, php-format
 msgid "Edit %s group"
 msgstr "عدّل مجموعه %s"
@@ -2490,40 +1981,40 @@ msgstr "عدّل مجموعه %s"
 #. TRANS: Client error displayed trying to edit a group while not logged in.
 #. TRANS: Client error displayed when trying to create a group while not logged in.
 #. TRANS: Client error displayed trying to create a group while not logged in.
-#: actions/editgroup.php:68 actions/grouplogo.php:69 actions/newgroup.php:65
 msgid "You must be logged in to create a group."
 msgstr "يجب أن تكون والجًا لتنشئ مجموعه."
 
 #. TRANS: Form instructions for group edit form.
-#: actions/editgroup.php:161
 msgid "Use this form to edit the group."
 msgstr "استخدم هذا النموذج لتعديل المجموعه."
 
+#. TRANS: Group edit form validation error.
+#. TRANS: Group create form validation error.
+#. TRANS: %s is the invalid alias.
+#, php-format
+msgid "Invalid alias: \"%s\""
+msgstr "كنيه غير صالحة: \"%s\""
+
 #. TRANS: Group edit form success message.
-#: actions/editgroup.php:301
 msgid "Options saved."
 msgstr "حُفظت الخيارات."
 
 #. TRANS: Title for e-mail settings.
-#: actions/emailsettings.php:60
 msgid "Email settings"
 msgstr "تظبيطات الايميل"
 
 #. TRANS: E-mail settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/emailsettings.php:74
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 msgstr "أدر كيف تستلم البريد الإلكترونى من %%site.name%%."
 
 #. TRANS: Form legend for e-mail settings form.
 #. TRANS: Field label for e-mail address input in e-mail settings form.
-#: actions/emailsettings.php:104 actions/emailsettings.php:130
 msgid "Email address"
 msgstr "عنوان الايميل"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:110
 msgid "Current confirmed email address."
 msgstr "عنوان البريد الإلكترونى المُؤكد الحالى."
 
@@ -2532,15 +2023,11 @@ msgstr "عنوان البريد الإلكترونى المُؤكد الحالى
 #. TRANS: Button label to remove a confirmed IM address.
 #. TRANS: Button label to remove a confirmed SMS address.
 #. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
-#: actions/emailsettings.php:113 actions/emailsettings.php:180
-#: actions/imsettings.php:119 actions/smssettings.php:119
-#: actions/smssettings.php:175
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "استرجع"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:120
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -2551,15 +2038,12 @@ msgstr ""
 #. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
 #. TRANS: Any other domain may be owned by a legitimate person or
 #. TRANS: organization.
-#: actions/emailsettings.php:137
 msgid "Email address, like \"UserName@example.org\""
 msgstr "عنوان البريد الإلكترونى، مثل \"UserName@example.org\""
 
 #. TRANS: Button label for adding an e-mail address in e-mail settings form.
 #. TRANS: Button label for adding an IM address in IM settings form.
 #. TRANS: Button label for adding a SMS phone number in SMS settings form.
-#: actions/emailsettings.php:141 actions/imsettings.php:147
-#: actions/smssettings.php:157
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Add"
@@ -2567,29 +2051,24 @@ msgstr "أضف"
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:149 actions/smssettings.php:166
 msgid "Incoming email"
 msgstr "البريد الإلكترونى الوارد"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:155
 msgid "I want to post notices by email."
 msgstr "أريد أن أرسل الملاحظات عبر البريد الإلكترونى."
 
 #. TRANS: Form instructions for incoming e-mail form in e-mail settings.
 #. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
-#: actions/emailsettings.php:177 actions/smssettings.php:173
 msgid "Send email to this address to post new notices."
 msgstr "أرسل بريدًا إلكترونيًا إلى هذا العنوان لترسل إشعارات جديده."
 
 #. TRANS: Instructions for incoming e-mail address input form, when an address has already been assigned.
 #. TRANS: Instructions for incoming SMS e-mail address input form.
-#: actions/emailsettings.php:186 actions/smssettings.php:181
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr "أنشئ عنوان بريد إلكترونى لترسل إليه؛ ألغِ القديم."
 
 #. TRANS: Instructions for incoming e-mail address input form.
-#: actions/emailsettings.php:190
 msgid ""
 "To send notices via email, we need to create a unique email address for you "
 "on this server:"
@@ -2597,93 +2076,75 @@ msgstr ""
 
 #. TRANS: Button label for adding an e-mail address to send notices from.
 #. TRANS: Button label for adding an SMS e-mail address to send notices from.
-#: actions/emailsettings.php:196 actions/smssettings.php:184
 #, fuzzy
 msgctxt "BUTTON"
 msgid "New"
 msgstr "جديد"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:205
 msgid "Email preferences"
 msgstr "عناوين البريد الإلكتروني"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:213
 msgid "Send me notices of new subscriptions through email."
 msgstr "أرسل لى إشعارات بالاشتراكات الجديده عبر البريد الإلكترونى."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:219
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr "أرسل لى بريدًا إلكرتونيًا عندما يضيف أحدهم إشعارى مفضله."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:226
 #, fuzzy
 msgid "Send me email when someone sends me a private message."
 msgstr "أرسل لى بريدًا إلكترونيًا عندما يرسل لى أحدهم \"@-رد\"."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:232
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr "أرسل لى بريدًا إلكترونيًا عندما يرسل لى أحدهم \"@-رد\"."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:238
 msgid "Allow friends to nudge me and send me an email."
 msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:244
 #, fuzzy
 msgid "Publish a MicroID for my email address."
 msgstr "هذا ليس عنوان بريدك الإلكترونى."
 
 #. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:362
 #, fuzzy
 msgid "Email preferences saved."
 msgstr "حُفِظت التفضيلات."
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:381
 msgid "No email address."
 msgstr "لا عنوان بريد إلكترونى."
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:389
 #, fuzzy
 msgid "Cannot normalize that email address."
 msgstr "عنوان البريد الإلكترونى المُؤكد الحالى."
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:394 actions/register.php:197
-#: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "ليس عنوان بريد صالح."
 
 #. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:398
 msgid "That is already your email address."
 msgstr "هذا هو عنوان بريدك الإكترونى سابقًا."
 
 #. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:402
 msgid "That email address already belongs to another user."
 msgstr "هذا البريد الإلكترونى ملك مستخدم آخر بالفعل."
 
 #. TRANS: Server error thrown on database error adding e-mail confirmation code.
 #. TRANS: Server error thrown on database error adding Instant Messaging confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:419 actions/imsettings.php:362
-#: actions/smssettings.php:364
 #, fuzzy
 msgid "Could not insert confirmation code."
 msgstr "تعذّر إدراج رمز التأكيد."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:426
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
@@ -2692,43 +2153,35 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling Instant Messaging address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:446 actions/imsettings.php:391
-#: actions/smssettings.php:398
 #, fuzzy
 msgid "No pending confirmation to cancel."
 msgstr "لا رمز تأكيد."
 
 #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:451
 #, fuzzy
 msgid "That is the wrong email address."
 msgstr "هذا عنوان محادثه فوريه خاطئ."
 
 #. TRANS: Server error thrown on database error canceling e-mail address confirmation.
 #. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
-#: actions/emailsettings.php:460 actions/smssettings.php:412
 #, fuzzy
 msgid "Could not delete email confirmation."
 msgstr "تعذّر حذف تأكيد البريد الإلكترونى."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:465
 msgid "Email confirmation cancelled."
 msgstr "لا رمز تأكيد."
 
 #. TRANS: Message given trying to remove an e-mail address that is not
 #. TRANS: registered for the active user.
-#: actions/emailsettings.php:484
 msgid "That is not your email address."
 msgstr "هذا ليس عنوان بريدك الإلكترونى."
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:505
 msgid "The email address was removed."
 msgstr "لا عنوان بريد إلكترونى."
 
 #. TRANS: Form validation error displayed when trying to remove an incoming e-mail address while no address has been set.
-#: actions/emailsettings.php:519 actions/smssettings.php:554
 #, fuzzy
 msgid "No incoming email address."
 msgstr "لا عنوان بريد إلكترونى."
@@ -2736,63 +2189,51 @@ msgstr "لا عنوان بريد إلكترونى."
 #. 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.
-#: actions/emailsettings.php:531 actions/emailsettings.php:555
-#: actions/smssettings.php:565 actions/smssettings.php:590
 #, fuzzy
 msgid "Could not update user record."
 msgstr "تعذّر تحديث المستخدم."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
 #. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:535 actions/smssettings.php:569
 #, fuzzy
 msgid "Incoming email address removed."
 msgstr "لا عنوان بريد إلكترونى."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
 #. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:559 actions/smssettings.php:594
 #, fuzzy
 msgid "New incoming email address added."
 msgstr "لا عنوان بريد إلكترونى."
 
 #. TRANS: Client error displayed when trying to mark a notice as favorite that already is a favorite.
-#: actions/favor.php:80
 msgid "This notice is already a favorite!"
 msgstr "هذا الإشعار مفضله مسبقًا!"
 
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
-#: actions/favor.php:95
 #, fuzzy
 msgid "Disfavor favorite."
 msgstr "ألغِ تفضيل المفضلة"
 
 #. TRANS: Page title for first page of favorited notices.
 #. TRANS: Title for favourited notices section.
-#: actions/favorited.php:65 lib/popularnoticesection.php:62
-#: lib/publicgroupnav.php:93
 msgid "Popular notices"
 msgstr "إشعارات مشهورة"
 
 #. TRANS: Page title for all but first page of favorited notices.
 #. TRANS: %d is the page number being displayed.
-#: actions/favorited.php:69
 #, php-format
 msgid "Popular notices, page %d"
 msgstr "إشعارات مشهوره، الصفحه %d"
 
 #. TRANS: Description on page displaying favorited notices.
-#: actions/favorited.php:81
 msgid "The most popular notices on the site right now."
 msgstr "أشهر الإشعارات على الموقع حاليًا."
 
 #. TRANS: Text displayed instead of a list when a site does not yet have any favourited notices.
-#: actions/favorited.php:149
 msgid "Favorite notices appear on this page but no one has favorited one yet."
 msgstr ""
 
 #. TRANS: Additional text displayed instead of a list when a site does not yet have any favourited notices for logged in users.
-#: actions/favorited.php:153
 msgid ""
 "Be the first to add a notice to your favorites by clicking the fave button "
 "next to any notice you like."
@@ -2800,7 +2241,6 @@ msgstr ""
 
 #. TRANS: Additional text displayed instead of a list when a site does not yet have any favourited notices for not logged in users.
 #. TRANS: %%action.register%% is a registration link. "[link text](link)" is Mark Down. Do not change the formatting.
-#: actions/favorited.php:158
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to add a "
@@ -2811,188 +2251,153 @@ msgstr ""
 #. TRANS: %s is a user's nickname.
 #. TRANS: Title for first page of favourite notices of a user.
 #. TRANS: %s is the user for whom the favourite notices are displayed.
-#: actions/favoritesrss.php:111 actions/showfavorites.php:76
-#: lib/personalgroupnav.php:110
 #, php-format
 msgid "%s's favorite notices"
 msgstr "إشعارات %s المُفضلة"
 
 #. TRANS: Desciption of RSS feed with favourite notices of a user.
 #. TRANS: %1$s is a user's nickname, %2$s is the name of the StatusNet site.
-#: actions/favoritesrss.php:117
 #, fuzzy, php-format
 msgid "Updates favored by %1$s on %2$s!"
 msgstr "نتايج التدوير لـ\"%1$s\" على %2$s"
 
 #. TRANS: Page title for first page of featured users.
 #. TRANS: Title for featured users section.
-#: actions/featured.php:69 lib/featureduserssection.php:87
-#: lib/publicgroupnav.php:89
 msgid "Featured users"
 msgstr "مستخدمون مختارون"
 
 #. TRANS: Page title for all but first page of featured users.
 #. TRANS: %d is the page number being displayed.
-#: actions/featured.php:73
 #, php-format
 msgid "Featured users, page %d"
 msgstr "مستخدمون مختارون، صفحه %d"
 
 #. TRANS: Description on page displaying featured users.
-#: actions/featured.php:102
 #, fuzzy, php-format
 msgid "A selection of some great users on %s."
 msgstr "اختيار لبعض المستخدمين المتميزين على %s"
 
 #. TRANS: Client error displayed when no notice ID was given trying do display a file.
-#: actions/file.php:36
 msgid "No notice ID."
 msgstr "ما فيش ملاحظة ID."
 
 #. TRANS: Client error displayed when an invalid notice ID was given trying do display a file.
-#: actions/file.php:41
 msgid "No notice."
 msgstr "ما فيش ملاحظه."
 
 #. TRANS: Client error displayed when trying do display a file for a notice without a file attachement.
-#: actions/file.php:46
 msgid "No attachments."
 msgstr "لا مرفقات."
 
 #. TRANS: Client error displayed when trying do display a file for a notice with file attachements
 #. TRANS: that could not be found.
-#: actions/file.php:58
 msgid "No uploaded attachments."
 msgstr "ما فيش فايلات اتعمللها upload."
 
 #. TRANS: Client error displayed when subscribing to a remote profile and an unexpected response is received.
-#: actions/finishremotesubscribe.php:69
 msgid "Not expecting this response!"
 msgstr "لم أتوقع هذا الرد!"
 
 #. TRANS: Client error displayed when subscribing to a remote profile that does not exist.
-#: actions/finishremotesubscribe.php:81
 msgid "User being listened to does not exist."
 msgstr "المستخدم الذى تستمع إليه غير موجود."
 
 #. TRANS: Client error displayed when subscribing to a remote profile that is a local profile.
-#: actions/finishremotesubscribe.php:89 actions/remotesubscribe.php:58
 #, fuzzy
 msgid "You can use the local subscription!"
 msgstr "تعذّر حفظ الاشتراك."
 
 #. TRANS: Client error displayed when subscribing to a remote profile that is blocked form subscribing to.
-#: actions/finishremotesubscribe.php:102
 #, fuzzy
 msgid "That user has blocked you from subscribing."
 msgstr "لقد منعك المستخدم."
 
 #. TRANS: Client error displayed when subscribing to a remote profile without providing an authorised token.
-#: actions/finishremotesubscribe.php:114
 msgid "You are not authorized."
 msgstr "لا تملك تصريحًا."
 
 #. TRANS: Client error displayed when subscribing to a remote profile and conversion of the request token to access token fails.
-#: actions/finishremotesubscribe.php:118
 msgid "Could not convert request token to access token."
 msgstr ""
 
 #. TRANS: Client error displayed when subscribing to a remote profile fails because of an unsupported version of the OMB protocol.
-#: actions/finishremotesubscribe.php:124
 msgid "Remote service uses unknown version of OMB protocol."
 msgstr ""
 
 #. TRANS: Server error displayed when subscribing to a remote profile fails because the remote profile could not be updated.
-#: actions/finishremotesubscribe.php:145 lib/oauthstore.php:317
 #, fuzzy
 msgid "Error updating remote profile."
 msgstr "خطأ أثناء تحديث الملف الشخصى البعيد"
 
 #. TRANS: Client error displayed when requesting a non-existent file.
-#: actions/getfile.php:77
 msgid "No such file."
 msgstr "لا ملف كهذا."
 
 #. TRANS: Client error displayed when requesting a file without having read access to it.
-#: actions/getfile.php:82
 msgid "Cannot read file."
 msgstr "تعذّرت قراءه الملف."
 
 #. TRANS: Client error displayed when trying to assign an invalid role to a user.
-#: actions/grantrole.php:61 actions/revokerole.php:62
 #, fuzzy
 msgid "Invalid role."
 msgstr "حجم غير صالح."
 
 #. TRANS: Client error displayed when trying to assign an reserved role to a user.
-#: actions/grantrole.php:66 actions/revokerole.php:66
 msgid "This role is reserved and cannot be set."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to assign a role to a user while not being allowed to set roles.
-#: actions/grantrole.php:76
 #, fuzzy
 msgid "You cannot grant user roles on this site."
 msgstr "لا يمكنك إسكات المستخدمين على هذا الموقع."
 
 #. TRANS: Client error displayed when trying to assign a role to a user that already has that role.
-#: actions/grantrole.php:84
 #, fuzzy
 msgid "User already has this role."
 msgstr "المستخدم مسكت من قبل."
 
 #. TRANS: Client error displayed trying to block a user from a group while not specifying a to be blocked user profile.
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing a profile.
+#. TRANS: Client error displayed when not providing a profile ID on the Make Admin page.
 #. TRANS: Client error displayed trying a change a subscription without providing a profile.
 #. TRANS: Client error displayed when trying to change user options without specifying a user to work on.
-#: actions/groupblock.php:71 actions/groupunblock.php:71
-#: actions/makeadmin.php:71 actions/subedit.php:49
-#: lib/profileformaction.php:79
 msgid "No profile specified."
 msgstr "لا ملف شخصى مُحدّد."
 
 #. TRANS: Client error displayed trying to block a user from a group while specifying a non-existing profile.
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing an existing profile.
+#. TRANS: Client error displayed when specifying an invalid profile ID on the Make Admin page.
 #. TRANS: Client error displayed trying a change a subscription for a non-existant profile ID.
 #. TRANS: Client error displayed when trying to change user options without specifying an existing user to work on.
-#: actions/groupblock.php:77 actions/groupunblock.php:77
-#: actions/makeadmin.php:76 actions/subedit.php:57 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:87
 msgid "No profile with that ID."
 msgstr "لا ملف شخصى بهذه الهويه."
 
 #. TRANS: Client error displayed trying to block a user from a group while not specifying a group to block a profile from.
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing a group.
-#: actions/groupblock.php:83 actions/groupunblock.php:83
-#: actions/makeadmin.php:81
+#. TRANS: Client error displayed when not providing a group ID on the Make Admin page.
 msgid "No group specified."
 msgstr "لا مجموعه مُحدّده."
 
 #. TRANS: Client error displayed trying to block a user from a group while not being an admin user.
-#: actions/groupblock.php:95
 msgid "Only an admin can block group members."
 msgstr ""
 
 #. TRANS: Client error displayed trying to block a user from a group while user is already blocked from the given group.
-#: actions/groupblock.php:100
 #, fuzzy
 msgid "User is already blocked from group."
 msgstr "المستخدم ليس ممنوعًا من المجموعه."
 
 #. TRANS: Client error displayed trying to block a user from a group while user is not a member of given group.
-#: actions/groupblock.php:106
 msgid "User is not a member of group."
 msgstr "المستخدم ليس عضوًا فى المجموعه."
 
 #. TRANS: Title for block user from group page.
 #. TRANS: Form legend for form to block user from a group.
-#: actions/groupblock.php:141 actions/groupmembers.php:364
 msgid "Block user from group"
 msgstr "امنع المستخدم من المجموعة"
 
 #. TRANS: Explanatory text for block user from group form before setting the block.
 #. TRANS: %1$s is that to be blocked user, %2$s is the group the user will be blocked from.
-#: actions/groupblock.php:169
 #, php-format
 msgid ""
 "Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They "
@@ -3001,159 +2406,132 @@ msgid ""
 msgstr ""
 
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
-#: actions/groupblock.php:191
 #, fuzzy
 msgid "Do not block this user from this group."
 msgstr "لا تمنع هذا المستخدم من هذه المجموعة"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
-#: actions/groupblock.php:198
 #, fuzzy
 msgid "Block this user from this group."
 msgstr "امنع هذا المستخدم من هذه المجموعة"
 
 #. TRANS: Server error displayed when trying to block a user from a group fails because of an application error.
-#: actions/groupblock.php:215
 msgid "Database error blocking user from group."
 msgstr "خطأ فى قاعده البيانات أثناء منع المستخدم من المجموعه."
 
 #. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
 #. TRANS: Client error displayed trying to find a user by ID without providing an ID.
-#: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr "لا هويه."
 
 #. TRANS: Client error displayed trying to change group design settings while not logged in.
-#: actions/groupdesignsettings.php:67
 msgid "You must be logged in to edit a group."
 msgstr "يجب أن تلج لتُعدّل المجموعات."
 
 #. TRANS: Title group design settings page.
-#: actions/groupdesignsettings.php:146
 msgid "Group design"
 msgstr "تصميم المجموعة"
 
 #. TRANS: Instructions for group design settings page.
-#: actions/groupdesignsettings.php:157
 msgid ""
 "Customize the way your group looks with a background image and a colour "
 "palette of your choice."
 msgstr ""
 
 #. TRANS: Form validation error displayed when group design settings could not be updated because of an application issue.
-#: actions/groupdesignsettings.php:262
 #, fuzzy
 msgid "Unable to update your design settings."
 msgstr "تعذّر حذف إعدادات التصميم."
 
 #. TRANS: Form text to confirm saved group design settings.
-#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:239
 #, fuzzy
 msgid "Design preferences saved."
 msgstr "حُفِظت التفضيلات."
 
 #. TRANS: Title for group logo settings page.
 #. TRANS: Group logo form legend.
-#: actions/grouplogo.php:144 actions/grouplogo.php:199
 msgid "Group logo"
 msgstr "شعار المجموعة"
 
 #. TRANS: Instructions for group logo page.
 #. TRANS: %s is the maximum file size for that site.
-#: actions/grouplogo.php:156
 #, fuzzy, php-format
 msgid ""
 "You can upload a logo image for your group. The maximum file size is %s."
 msgstr "تستطيع رفع صورتك الشخصيه. أقصى حجم للملف هو 2 م.ب."
 
 #. TRANS: Submit button for uploading a group logo.
-#: actions/grouplogo.php:243
 msgid "Upload"
 msgstr "ارفع"
 
 #. TRANS: Button text for cropping an uploaded group logo.
-#: actions/grouplogo.php:299
 #, fuzzy
 msgid "Crop"
 msgstr "مجموعات"
 
 #. TRANS: Form instructions on the group logo page.
-#: actions/grouplogo.php:376
 msgid "Pick a square area of the image to be the logo."
 msgstr ""
 
 #. TRANS: Form success message after updating a group logo.
-#: actions/grouplogo.php:411
 msgid "Logo updated."
 msgstr "حُدّث الشعار."
 
 #. TRANS: Form failure message after failing to update a group logo.
-#: actions/grouplogo.php:414
 msgid "Failed updating logo."
 msgstr "فشل رفع الشعار."
 
 #. TRANS: Title of the page showing group members.
 #. TRANS: %s is the name of the group.
-#: actions/groupmembers.php:104
 #, php-format
 msgid "%s group members"
 msgstr "أعضاء مجموعه %s"
 
 #. TRANS: Title of the page showing group members.
 #. TRANS: %1$s is the name of the group, %2$d is the page number of the members list.
-#: actions/groupmembers.php:109
 #, php-format
 msgid "%1$s group members, page %2$d"
 msgstr "%1$s اعضاء الجروپ, صفحه %2$d"
 
 #. TRANS: Page notice for group members page.
-#: actions/groupmembers.php:125
 msgid "A list of the users in this group."
 msgstr "قائمه بمستخدمى هذه المجموعه."
 
 #. TRANS: Indicator in group members list that this user is a group administrator.
-#: actions/groupmembers.php:190 lib/action.php:581
 msgid "Admin"
 msgstr "إداري"
 
 #. TRANS: Button text for the form that will block a user from a group.
-#: actions/groupmembers.php:397
 msgctxt "BUTTON"
 msgid "Block"
 msgstr ""
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:401
 msgctxt "TOOLTIP"
 msgid "Block this user"
 msgstr ""
 
 #. TRANS: Form legend for form to make a user a group admin.
-#: actions/groupmembers.php:488
 #, fuzzy
 msgid "Make user an admin of the group"
 msgstr "لازم تكون ادارى علشان تعدّل الجروپ."
 
 #. TRANS: Button text for the form that will make a user administrator.
-#: actions/groupmembers.php:521
 msgctxt "BUTTON"
 msgid "Make Admin"
 msgstr ""
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:525
 msgctxt "TOOLTIP"
 msgid "Make this user an admin"
 msgstr ""
 
 #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
-#: actions/grouprss.php:141
 #, php-format
 msgid "Updates from members of %1$s on %2$s!"
 msgstr ""
 
 #. TRANS: Title for first page of the groups list.
-#: actions/groups.php:62
 #, fuzzy
 msgctxt "TITLE"
 msgid "Groups"
@@ -3161,7 +2539,6 @@ msgstr "مجموعات"
 
 #. TRANS: Title for all but the first page of the groups list.
 #. TRANS: %d is the page number.
-#: actions/groups.php:66
 #, fuzzy, php-format
 msgctxt "TITLE"
 msgid "Groups, page %d"
@@ -3170,7 +2547,6 @@ msgstr "المجموعات، صفحه %d"
 #. TRANS: Page notice of group list. %%%%site.name%%%% is the StatusNet site name,
 #. TRANS: %%%%action.groupsearch%%%% and %%%%action.newgroup%%%% are URLs. Do not change them.
 #. TRANS: This message contains Markdown links in the form [link text](link).
-#: actions/groups.php:95
 #, php-format
 msgid ""
 "%%%%site.name%%%% groups let you find and talk with people of similar "
@@ -3181,12 +2557,10 @@ msgid ""
 msgstr ""
 
 #. TRANS: Link to create a new group on the group list page.
-#: actions/groups.php:113 actions/usergroups.php:126 lib/groupeditform.php:115
 msgid "Create a new group"
 msgstr "أنشئ مجموعه جديدة"
 
 #. TRANS: Instructions for page where groups can be searched. %%site.name%% is the name of the StatusNet site.
-#: actions/groupsearch.php:53
 #, php-format
 msgid ""
 "Search for groups on %%site.name%% by their name, location, or description. "
@@ -3194,21 +2568,17 @@ msgid ""
 msgstr ""
 
 #. TRANS: Title for page where groups can be searched.
-#: actions/groupsearch.php:60
 msgid "Group search"
 msgstr "بحث فى المجموعات"
 
 #. TRANS: Text on page where groups can be searched if no results were found for a query.
 #. TRANS: Text for notice search results is the query had no results.
 #. TRANS: Message on the "People search" page where a query has no results.
-#: actions/groupsearch.php:82 actions/noticesearch.php:122
-#: actions/peoplesearch.php:87
 msgid "No results."
 msgstr "لا نتائج."
 
 #. TRANS: Additional text on page where groups can be searched if no results were found for a query for a logged in user.
 #. TRANS: This message contains Markdown links in the form [link text](link).
-#: actions/groupsearch.php:87
 #, php-format
 msgid ""
 "If you cannot find the group you're looking for, you can [create it](%%"
@@ -3217,7 +2587,6 @@ msgstr ""
 
 #. TRANS: Additional text on page where groups can be searched if no results were found for a query for a not logged in user.
 #. TRANS: This message contains Markdown links in the form [link text](link).
-#: actions/groupsearch.php:92
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and [create the group](%%"
@@ -3225,30 +2594,25 @@ msgid ""
 msgstr ""
 
 #. TRANS: Client error displayed when trying to unblock a user from a group without being an administrator for the group.
-#: actions/groupunblock.php:95
 msgid "Only an admin can unblock group members."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to unblock a non-blocked user from a group.
-#: actions/groupunblock.php:100
 msgid "User is not blocked from group."
 msgstr "المستخدم ليس ممنوعًا من المجموعه."
 
 #. TRANS: Server error displayed when unblocking a user from a group fails because of an unknown error.
 #. TRANS: Server error displayed when removing a user block.
-#: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "خطأ أثناء منع الحجب."
 
 #. TRANS: Title for Instant Messaging settings.
-#: actions/imsettings.php:56
 msgid "IM settings"
 msgstr "تظبيطات بعت الرسايل الفوريه"
 
 #. 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.
-#: actions/imsettings.php:69
 #, php-format
 msgid ""
 "You can send and receive notices through instant messaging [instant messages]"
@@ -3256,190 +2620,158 @@ msgid ""
 msgstr ""
 
 #. TRANS: Message given in the IM settings if IM is not enabled on the site.
-#: actions/imsettings.php:90
 msgid "IM is not available."
 msgstr "المراسله الفوريه غير متوفره."
 
-#: actions/imsettings.php:116
 #, fuzzy, php-format
 msgid "Current confirmed %s address."
 msgstr "عنوان البريد الإلكترونى المُؤكد الحالى."
 
 #. TRANS: Form note in IM settings form.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:128
 #, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your %s account for a message "
 "with further instructions. (Did you add %s to your buddy list?)"
 msgstr ""
 
-#: actions/imsettings.php:140
 msgid "IM address"
 msgstr "عنوان الرساله الفوريه"
 
-#: actions/imsettings.php:142
 #, php-format
 msgid "%s screenname."
 msgstr ""
 
 #. TRANS: Header for IM preferences form.
-#: actions/imsettings.php:163
 #, fuzzy
 msgid "IM Preferences"
 msgstr "حُفِظت التفضيلات."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:174
 #, fuzzy
 msgid "Send me notices"
 msgstr "أرسل إشعارًا"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:176
 msgid "Post a notice when my status changes."
 msgstr ""
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:178
 msgid "Send me replies from people I'm not subscribed to."
 msgstr ""
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:181
 #, fuzzy
 msgid "Publish a MicroID"
 msgstr "هذا ليس عنوان بريدك الإلكترونى."
 
 #. TRANS: Server error thrown on database error updating IM preferences.
-#: actions/imsettings.php:291
 #, fuzzy
 msgid "Couldn't update IM preferences."
 msgstr "تعذّر تحديث المستخدم."
 
 #. TRANS: Confirmation message for successful IM preferences save.
 #. TRANS: Confirmation message after saving preferences.
-#: actions/imsettings.php:298 actions/urlsettings.php:244
 msgid "Preferences saved."
 msgstr "حُفِظت التفضيلات."
 
 #. TRANS: Message given saving IM address without having provided one.
-#: actions/imsettings.php:320
 #, fuzzy
 msgid "No screenname."
 msgstr "لا اسم مستعار."
 
-#: actions/imsettings.php:325
 #, fuzzy
 msgid "No transport."
 msgstr "ما فيش ملاحظه."
 
 #. TRANS: Message given saving IM address that cannot be normalised.
-#: actions/imsettings.php:333
 #, fuzzy
 msgid "Cannot normalize that screenname"
 msgstr "ليست هويه جابر صالحة"
 
 #. TRANS: Message given saving IM address that not valid.
-#: actions/imsettings.php:340
 #, fuzzy
 msgid "Not a valid screenname"
 msgstr "ليس اسمًا مستعارًا صحيحًا."
 
 #. TRANS: Message given saving IM address that is already set for another user.
-#: actions/imsettings.php:344
 #, fuzzy
 msgid "Screenname already belongs to another user."
 msgstr "هذا البريد الإلكترونى ملك مستخدم آخر بالفعل."
 
 #. TRANS: Message given saving valid IM address that is to be confirmed.
-#: actions/imsettings.php:369
 #, fuzzy
 msgid "A confirmation code was sent to the IM address you added."
 msgstr "رمز التأكيد ليس لك!"
 
 #. TRANS: Message given canceling IM address confirmation for the wrong IM address.
-#: actions/imsettings.php:396
 msgid "That is the wrong IM address."
 msgstr "هذا عنوان محادثه فوريه خاطئ."
 
 #. TRANS: Server error thrown on database error canceling IM address confirmation.
-#: actions/imsettings.php:405
 #, fuzzy
 msgid "Couldn't delete confirmation."
 msgstr "تعذّر حذف تأكيد البريد الإلكترونى."
 
 #. TRANS: Message given after successfully canceling IM address confirmation.
-#: actions/imsettings.php:410
 msgid "IM confirmation cancelled."
 msgstr "لا رمز تأكيد."
 
 #. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.
-#: actions/imsettings.php:434
 #, fuzzy
 msgid "That is not your screenname."
 msgstr "هذا ليس رقم هاتفك."
 
 #. TRANS: Server error thrown on database error removing a registered IM address.
-#: actions/imsettings.php:443
 #, fuzzy
 msgid "Couldn't update user im prefs."
 msgstr "تعذّر تحديث المستخدم."
 
 #. TRANS: Message given after successfully removing a registered Instant Messaging address.
-#: actions/imsettings.php:451
 #, fuzzy
 msgid "The IM address was removed."
 msgstr "أزيل هذا العنوان."
 
 #. TRANS: Title for all but the first page of the inbox page.
 #. TRANS: %1$s is the user's nickname, %2$s is the page number.
-#: actions/inbox.php:59
 #, php-format
 msgid "Inbox for %1$s - page %2$d"
 msgstr ""
 
 #. TRANS: Title for the first page of the inbox page.
 #. TRANS: %s is the user's nickname.
-#: actions/inbox.php:64
 #, php-format
 msgid "Inbox for %s"
 msgstr ""
 
 #. TRANS: Instructions for user inbox page.
-#: actions/inbox.php:106
 msgid "This is your inbox, which lists your incoming private messages."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to sent invites while they have been disabled.
-#: actions/invite.php:41
 #, fuzzy
 msgid "Invites have been disabled."
 msgstr "الدعوات مُفعلة"
 
 #. TRANS: Client error displayed when trying to sent invites while not logged in.
 #. TRANS: %s is the StatusNet site name.
-#: actions/invite.php:45
 #, fuzzy, php-format
 msgid "You must be logged in to invite other users to use %s."
 msgstr "يجب أن تلج لتُعدّل المجموعات."
 
 #. TRANS: Form validation message when providing an e-mail address that does not validate.
 #. TRANS: %s is an invalid e-mail address.
-#: actions/invite.php:78
 #, fuzzy, php-format
 msgid "Invalid email address: %s."
 msgstr "عنوان بريد إلكترونى غير صالح: %s"
 
 #. TRANS: Page title when invitations have been sent.
-#: actions/invite.php:117
 #, fuzzy
 msgid "Invitations sent"
 msgstr "أُرسلت الدعوة"
 
 #. TRANS: Page title when inviting potential users.
-#: actions/invite.php:120
 msgid "Invite new users"
 msgstr "دعوه مستخدمين جدد"
 
@@ -3447,7 +2779,6 @@ msgstr "دعوه مستخدمين جدد"
 #. TRANS: is already subscribed to one or more users with the given e-mail address(es).
 #. TRANS: Plural form is based on the number of reported already subscribed e-mail addresses.
 #. TRANS: Followed by a bullet list.
-#: actions/invite.php:140
 #, fuzzy
 msgid "You are already subscribed to this user:"
 msgid_plural "You are already subscribed to these users:"
@@ -3460,7 +2791,6 @@ msgstr[5] "لست مشتركًا بأحد."
 
 #. TRANS: Used as list item for already subscribed users (%1$s is nickname, %2$s is e-mail address).
 #. TRANS: Used as list item for already registered people (%1$s is nickname, %2$s is e-mail address).
-#: actions/invite.php:146 actions/invite.php:160
 #, fuzzy, php-format
 msgctxt "INVITE"
 msgid "%1$s (%2$s)"
@@ -3469,7 +2799,6 @@ msgstr "%1$s (%2$s)"
 #. TRANS: Message displayed inviting users to use a StatusNet site while the invited user
 #. TRANS: already uses a this StatusNet site. Plural form is based on the number of
 #. TRANS: reported already present people. Followed by a bullet list.
-#: actions/invite.php:154
 msgid "This person is already a user and you were automatically subscribed:"
 msgid_plural ""
 "These people are already users and you were automatically subscribed to them:"
@@ -3483,7 +2812,6 @@ msgstr[5] ""
 #. TRANS: Message displayed inviting users to use a StatusNet site. Plural form is
 #. TRANS: based on the number of invitations sent. Followed by a bullet list of
 #. TRANS: e-mail addresses to which invitations were sent.
-#: actions/invite.php:168
 msgid "Invitation sent to the following person:"
 msgid_plural "Invitations sent to the following people:"
 msgstr[0] ""
@@ -3495,40 +2823,34 @@ msgstr[5] ""
 
 #. TRANS: Generic message displayed after sending out one or more invitations to
 #. TRANS: people to join a StatusNet site.
-#: actions/invite.php:178
 msgid ""
 "You will be notified when your invitees accept the invitation and register "
 "on the site. Thanks for growing the community!"
 msgstr ""
 
 #. TRANS: Form instructions.
-#: actions/invite.php:191
 msgid ""
 "Use this form to invite your friends and colleagues to use this service."
 msgstr ""
 
 #. TRANS: Field label for a list of e-mail addresses.
-#: actions/invite.php:218
 msgid "Email addresses"
 msgstr "عناوين البريد الإلكتروني"
 
 #. TRANS: Tooltip for field label for a list of e-mail addresses.
-#: actions/invite.php:221
 msgid "Addresses of friends to invite (one per line)."
 msgstr ""
 
 #. TRANS: Field label for a personal message to send to invitees.
-#: actions/invite.php:225
 msgid "Personal message"
 msgstr "رساله شخصية"
 
 #. TRANS: Tooltip for field label for a personal message to send to invitees.
-#: actions/invite.php:228
 msgid "Optionally add a personal message to the invitation."
 msgstr ""
 
 #. TRANS: Send button for inviting friends
-#: actions/invite.php:232
+#. TRANS: Button text for sending notice.
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Send"
@@ -3537,7 +2859,6 @@ msgstr "أرسل"
 #. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral
 #. TRANS: singular 3rd-person pronoun in English. %1$s is the inviting user, $2$s is
 #. TRANS: the StatusNet sitename.
-#: actions/invite.php:264
 #, php-format
 msgid "%1$s has invited you to join them on %2$s"
 msgstr ""
@@ -3547,7 +2868,6 @@ msgstr ""
 #. TRANS: StatusNet sitename, %3$s is the site URL, %4$s is the personal message from the
 #. TRANS: inviting user, %s%5 a link to the timeline for the inviting user, %s$6 is a link
 #. TRANS: to register with the StatusNet site.
-#: actions/invite.php:271
 #, php-format
 msgid ""
 "%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -3579,324 +2899,314 @@ msgid ""
 msgstr ""
 
 #. TRANS: Client error displayed when trying to join a group while not logged in.
-#: actions/joingroup.php:59
 #, fuzzy
 msgid "You must be logged in to join a group."
 msgstr "يجب أن تلج لتُعدّل المجموعات."
 
 #. TRANS: Title for join group page after joining.
-#: actions/joingroup.php:148
 #, fuzzy, php-format
 msgctxt "TITLE"
 msgid "%1$s joined group %2$s"
 msgstr "%1$s دخل جروپ %2$s"
 
 #. TRANS: Client error displayed when trying to leave a group while not logged in.
-#: actions/leavegroup.php:59
 #, fuzzy
 msgid "You must be logged in to leave a group."
 msgstr "يجب أن تكون والجًا لتنشئ مجموعه."
 
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
-#: actions/leavegroup.php:103 lib/command.php:398
 msgid "You are not a member of that group."
 msgstr "لست عضوا فى تلك المجموعه."
 
 #. TRANS: Title for leave group page after leaving.
-#: actions/leavegroup.php:142
 #, fuzzy, php-format
 msgctxt "TITLE"
 msgid "%1$s left group %2$s"
 msgstr "%1$s ساب جروپ %2$s"
 
 #. TRANS: User admin panel title
-#: actions/licenseadminpanel.php:55
 msgctxt "TITLE"
 msgid "License"
 msgstr ""
 
-#: actions/licenseadminpanel.php:65
+#. TRANS: Form instructions for the site license admin panel.
 msgid "License for this StatusNet site"
 msgstr ""
 
-#: actions/licenseadminpanel.php:134
+#. TRANS: Client error displayed selecting an invalid license in the license admin panel.
 msgid "Invalid license selection."
 msgstr ""
 
-#: actions/licenseadminpanel.php:144
+#. TRANS: Client error displayed when not specifying an owner for the all rights reserved license in the license admin panel.
 msgid ""
 "You must specify the owner of the content when using the All Rights Reserved "
 "license."
 msgstr ""
 
-#: actions/licenseadminpanel.php:151
+#. TRANS: Client error displayed selecting a too long license title in the license admin panel.
 #, fuzzy
 msgid "Invalid license title. Maximum length is 255 characters."
 msgstr "رساله ترحيب غير صالحه. أقصى طول هو 255 حرف."
 
-#: actions/licenseadminpanel.php:163
+#. TRANS: Client error displayed specifying an invalid license URL in the license admin panel.
 msgid "Invalid license URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:166
+#. TRANS: Client error displayed specifying an invalid license image URL in the license admin panel.
 msgid "Invalid license image URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:174
+#. TRANS: Client error displayed specifying an invalid license URL in the license admin panel.
 msgid "License URL must be blank or a valid URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:182
+#. TRANS: Client error displayed specifying an invalid license image URL in the license admin panel.
 msgid "License image must be blank or valid URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:232
+#. TRANS: Form legend in the license admin panel.
 msgid "License selection"
 msgstr ""
 
-#: actions/licenseadminpanel.php:238
+#. TRANS: License option in the license admin panel.
 msgid "Private"
 msgstr "خاص"
 
-#: actions/licenseadminpanel.php:239
+#. TRANS: License option in the license admin panel.
 msgid "All Rights Reserved"
 msgstr ""
 
-#: actions/licenseadminpanel.php:240
+#. TRANS: License option in the license admin panel.
 msgid "Creative Commons"
 msgstr ""
 
-#: actions/licenseadminpanel.php:245
+#. TRANS: Dropdown field label in the license admin panel.
 msgid "Type"
 msgstr ""
 
-#: actions/licenseadminpanel.php:247
-msgid "Select license"
-msgstr ""
+#. TRANS: Dropdown field instructions in the license admin panel.
+#, fuzzy
+msgid "Select a license."
+msgstr "اختر وسمًا لترشيحه"
 
-#: actions/licenseadminpanel.php:261
+#. TRANS: Form legend in the license admin panel.
 msgid "License details"
 msgstr ""
 
-#: actions/licenseadminpanel.php:267
+#. TRANS: Field label in the license admin panel.
 msgid "Owner"
 msgstr ""
 
-#: actions/licenseadminpanel.php:268
+#. TRANS: Field title in the license admin panel.
 msgid "Name of the owner of the site's content (if applicable)."
 msgstr ""
 
-#: actions/licenseadminpanel.php:276
+#. TRANS: Field label in the license admin panel.
 msgid "License Title"
 msgstr ""
 
-#: actions/licenseadminpanel.php:277
+#. TRANS: Field title in the license admin panel.
 msgid "The title of the license."
 msgstr ""
 
-#: actions/licenseadminpanel.php:285
+#. TRANS: Field label in the license admin panel.
 msgid "License URL"
 msgstr ""
 
-#: actions/licenseadminpanel.php:286
+#. TRANS: Field title in the license admin panel.
 msgid "URL for more information about the license."
 msgstr ""
 
-#: actions/licenseadminpanel.php:293
+#. TRANS: Field label in the license admin panel.
 msgid "License Image URL"
 msgstr ""
 
-#: actions/licenseadminpanel.php:294
+#. TRANS: Field title in the license admin panel.
 msgid "URL for an image to display with the license."
 msgstr ""
 
-#. TRANS: Submit button title.
-#: actions/licenseadminpanel.php:311 actions/sessionsadminpanel.php:199
-#: actions/siteadminpanel.php:292 actions/snapshotadminpanel.php:245
-#: actions/tagother.php:133 lib/applicationeditform.php:357
-msgid "Save"
-msgstr "أرسل"
-
-#: actions/licenseadminpanel.php:311
-msgid "Save license settings"
-msgstr ""
+#. TRANS: Button title in the license admin panel.
+#, fuzzy
+msgid "Save license settings."
+msgstr "اذف إعدادت الموقع"
 
+#. TRANS: Client error displayed when trying to log in while already logged in.
 #. TRANS: Client error displayed trying to use "one time password login" when already logged in.
-#: actions/login.php:97 actions/otp.php:62 actions/register.php:130
 msgid "Already logged in."
 msgstr "والج بالفعل."
 
-#: actions/login.php:125
+#. TRANS: Form validation error displayed when trying to log in with incorrect credentials.
 msgid "Incorrect username or password."
 msgstr "اسم المستخدم أو كلمه السر غير صحيحان."
 
+#. TRANS: Server error displayed when during login a server error occurs.
 #. TRANS: Server error displayed when a user object could not be created trying to login using "one time password login".
-#: actions/login.php:131 actions/otp.php:127
 msgid "Error setting user. You are probably not authorized."
 msgstr "خطأ أثناء ضبط المستخدم. لست مُصرحًا على الأرجح."
 
-#: actions/login.php:185 actions/login.php:236 lib/action.php:598
+#. TRANS: Page title for login page.
 msgid "Login"
 msgstr "لُج"
 
-#: actions/login.php:222
+#. TRANS: Form legend on login page.
 msgid "Login to site"
 msgstr "لُج إلى الموقع"
 
-#: actions/login.php:231 actions/register.php:469
+#. TRANS: Checkbox label label on login page.
 msgid "Remember me"
 msgstr "تذكّرني"
 
-#: actions/login.php:232 actions/register.php:471
+#. TRANS: Checkbox title on login page.
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 
-#: actions/login.php:241
+#. TRANS: Button text for log in on login page.
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Login"
+msgstr "لُج"
+
+#. TRANS: Link text for link to "reset password" on login page.
 msgid "Lost or forgotten password?"
 msgstr "أنسيت كلمه السر؟"
 
-#: actions/login.php:259
+#. TRANS: Form instructions on login page before being able to change user settings.
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
 msgstr ""
 
-#: actions/login.php:263
+#. TRANS: Form instructions on login page.
 #, fuzzy
 msgid "Login with your username and password."
 msgstr "اسم المستخدم أو كلمه السر غير صحيحان."
 
-#: actions/login.php:266
+#. TRANS: Form instructions on login page. This message contains Markdown links in the form [Link text](Link).
+#. TRANS: %%action.register%% is a link to the registration page.
 #, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
 msgstr ""
 
-#: actions/makeadmin.php:92
+#. TRANS: Client error displayed when trying to make another user admin on the Make Admin page while not an admin.
 msgid "Only an admin can make another user an admin."
 msgstr ""
 
-#: actions/makeadmin.php:96
+#. TRANS: Client error displayed when trying to make another user admin on the Make Admin page who already is admin.
+#. TRANS: %1$s is the user that is already admin, %2$s is the group user is already admin for.
 #, fuzzy, php-format
 msgid "%1$s is already an admin for group \"%2$s\"."
 msgstr "%1$s مش نافع يبقى ادارى لجروپ %2$s."
 
-#: actions/makeadmin.php:133
+#. TRANS: Server error displayed when trying to make another user admin on the Make Admin page fails
+#. TRANS: because the group membership record could not be gotten.
+#. TRANS: %1$s is the to be admin user, %2$s is the group user should be admin for.
 #, php-format
 msgid "Can't get membership record for %1$s in group %2$s."
 msgstr "مش نافع يتجاب سجل العضويه لـ%1$s فى جروپ %2$s."
 
-#: actions/makeadmin.php:146
+#. TRANS: Server error displayed when trying to make another user admin on the Make Admin page fails
+#. TRANS: because the group adminship record coud not be saved properly.
+#. TRANS: %1$s is the to be admin user, %2$s is the group user is already admin for.
 #, php-format
 msgid "Can't make %1$s an admin for group %2$s."
 msgstr "%1$s مش نافع يبقى ادارى لجروپ %2$s."
 
-#: actions/microsummary.php:69
+#. TRANS: Client error displayed trying to make a micro summary without providing a status.
 msgid "No current status."
 msgstr "لا نتائج."
 
 #. TRANS: This is the title of the form for adding a new application.
-#: actions/newapplication.php:52
 #, fuzzy
 msgid "New application"
 msgstr "ما فيش application زى كده."
 
 #. TRANS: Client error displayed trying to add a new application while not logged in.
-#: actions/newapplication.php:64
 msgid "You must be logged in to register an application."
 msgstr "لازم تكون مسجل دخوللك علشان تسجل application."
 
 #. TRANS: Form instructions for registering a new application.
-#: actions/newapplication.php:147
 msgid "Use this form to register a new application."
 msgstr "استعمل الفورمه دى علشان تسجل application جديد."
 
 #. TRANS: Validation error shown when not providing a source URL in the "New application" form.
-#: actions/newapplication.php:189
 #, fuzzy
 msgid "Source URL is required."
 msgstr "الSource URL مش مظبوط."
 
 #. TRANS: Server error displayed when an application could not be registered in the database through the "New application" form.
-#: actions/newapplication.php:279 actions/newapplication.php:289
 msgid "Could not create application."
 msgstr "مش ممكن إنشاء الapplication."
 
 #. TRANS: Title for form to create a group.
-#: actions/newgroup.php:53
 msgid "New group"
 msgstr "مجموعه جديدة"
 
 #. TRANS: Client exception thrown when a user tries to create a group while banned.
-#: actions/newgroup.php:73 classes/User_group.php:485
 #, fuzzy
 msgid "You are not allowed to create groups on this site."
 msgstr "لست عضوا فى تلك المجموعه."
 
 #. TRANS: Form instructions for group create form.
-#: actions/newgroup.php:117
 msgid "Use this form to create a new group."
 msgstr "استخدم هذا النموذج لإنشاء مجموعه جديده."
 
-#. TRANS: Group create form validation error.
-#: actions/newgroup.php:200
-msgid "Alias cannot be the same as nickname."
-msgstr ""
-
-#: actions/newmessage.php:71 actions/newmessage.php:234
+#. TRANS: Page title for new direct message page.
+#. TRANS: Page title on page for sending a direct message.
 msgid "New message"
 msgstr "رساله جديدة"
 
-#. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
-#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:513
+#. TRANS: Client error displayed trying to send a direct message to a user while sender and
+#. TRANS: receiver are not subscribed to each other.
 #, fuzzy
-msgid "You can't send a message to this user."
+msgid "You cannot send a message to this user."
 msgstr "أرسل رساله مباشره إلى هذا المستخدم"
 
+#. TRANS: Form validator error displayed trying to send a direct message without content.
+#. TRANS: Client error displayed trying to send a notice without content.
 #. TRANS: Command exception text shown when trying to send a direct message to another user without content.
 #. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
-#: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:490
-#: lib/command.php:593
 msgid "No content!"
 msgstr "لا محتوى!"
 
-#: actions/newmessage.php:161
+#. TRANS: Form validation error displayed trying to send a direct message without specifying a recipient.
 msgid "No recipient specified."
 msgstr "لا مستلم حُدّد."
 
+#. TRANS: Client error displayed trying to send a direct message to self.
 #. TRANS: Error text shown when trying to send a direct message to self.
-#: actions/newmessage.php:167 lib/command.php:517
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
 
-#: actions/newmessage.php:184
+#. TRANS: Page title after sending a direct message.
 msgid "Message sent"
 msgstr "أُرسلت الرسالة"
 
+#. TRANS: Confirmation text after sending a direct message.
+#. TRANS: %s is the direct message recipient.
 #. TRANS: Message given have sent a direct message to another user.
 #. TRANS: %s is the name of the other user.
-#: actions/newmessage.php:188 lib/command.php:525
 #, php-format
 msgid "Direct message to %s sent."
 msgstr "رساله مباشره اتبعتت لـ%s."
 
-#: actions/newmessage.php:213 actions/newnotice.php:264
+#. TRANS: Page title after an AJAX error occurred on the "send direct message" page.
+#. TRANS: Page title after an AJAX error occurs on the send notice page.
 msgid "Ajax Error"
 msgstr "خطأ أجاكس"
 
-#: actions/newnotice.php:69
+#. TRANS: Page title for sending a new notice.
 msgid "New notice"
 msgstr "إشعار جديد"
 
-#: actions/newnotice.php:230
+#. TRANS: Page title after sending a notice.
 msgid "Notice posted"
 msgstr "أُرسل الإشعار"
 
 #. TRANS: Instructions for Notice search page.
 #. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/noticesearch.php:69
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -3904,20 +3214,17 @@ msgid ""
 msgstr ""
 
 #. TRANS: Title of the page where users can search for notices.
-#: actions/noticesearch.php:80
 msgid "Text search"
 msgstr "بحث فى النصوص"
 
 #. TRANS: Test in RSS notice search.
 #. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearch.php:95
 #, php-format
 msgid "Search results for \"%1$s\" on %2$s"
 msgstr "نتايج التدوير لـ\"%1$s\" على %2$s"
 
 #. TRANS: Text for logged in users making a query for notices without results.
 #. TRANS: This message contains a Markdown link.
-#: actions/noticesearch.php:128
 #, php-format
 msgid ""
 "Be the first to [post on this topic](%%%%action.newnotice%%%%?"
@@ -3926,7 +3233,6 @@ msgstr ""
 
 #. TRANS: Text for not logged in users making a query for notices without results.
 #. TRANS: This message contains Markdown links.
-#: actions/noticesearch.php:133
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and be the first to "
@@ -3934,79 +3240,68 @@ msgid ""
 msgstr ""
 
 #. TRANS: RSS notice search feed title. %s is the query.
-#: actions/noticesearchrss.php:95
 #, php-format
 msgid "Updates with \"%s\""
 msgstr ""
 
 #. TRANS: RSS notice search feed description.
 #. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearchrss.php:99
 #, fuzzy, php-format
 msgid "Updates matching search term \"%1$s\" on %2$s."
 msgstr "الإشعارات الموسومه ب%s"
 
-#: actions/nudge.php:85
+#. TRANS: Client error displayed trying to nudge a user that cannot be nudged.
 msgid ""
 "This user doesn't allow nudges or hasn't confirmed or set their email "
 "address yet."
 msgstr ""
 
-#: actions/nudge.php:94
+#. TRANS: Page title after sending a nudge.
 msgid "Nudge sent"
 msgstr "أرسل التنبيه"
 
-#: actions/nudge.php:97
+#. TRANS: Confirmation text after sending a nudge.
 msgid "Nudge sent!"
 msgstr "أُرسل التنبيه!"
 
 #. TRANS: Message displayed to an anonymous user trying to view OAuth application list.
-#: actions/oauthappssettings.php:57
 msgid "You must be logged in to list your applications."
 msgstr "لازم تكون مسجل دخولك علشان تشوف ليستة الapplications بتاعتك."
 
 #. TRANS: Page title for OAuth applications
-#: actions/oauthappssettings.php:73
 msgid "OAuth applications"
 msgstr "OAuth applications"
 
 #. TRANS: Page instructions for OAuth applications
-#: actions/oauthappssettings.php:85
 msgid "Applications you have registered"
 msgstr ""
 
 #. TRANS: Empty list message on page with OAuth applications.
-#: actions/oauthappssettings.php:138
 #, fuzzy, php-format
 msgid "You have not registered any applications yet."
 msgstr "لازم تكون مسجل دخوللك علشان تسجل application."
 
 #. TRANS: Title for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:69
 #, fuzzy
 msgid "Connected applications"
 msgstr "مش ممكن إنشاء الapplication."
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:80
 msgid "The following connections exist for your account."
 msgstr ""
 
 #. TRANS: Client error when trying to revoke access for an application while not being a user of it.
-#: actions/oauthconnectionssettings.php:165
 msgid "You are not a user of that application."
 msgstr "انت مش يوزر للapplication دى."
 
 #. TRANS: Client error when revoking access has failed for some reason.
 #. TRANS: %s is the application ID revoking access failed for.
-#: actions/oauthconnectionssettings.php:180
 #, fuzzy, php-format
 msgid "Unable to revoke access for application: %s."
 msgstr "استعمل الفورمه دى علشان تعدّل الapplication بتاعتك."
 
 #. TRANS: Success message after revoking access for an application.
 #. TRANS: %1$s is the application name, %2$s is the first part of the user token.
-#: actions/oauthconnectionssettings.php:199
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -4014,473 +3309,390 @@ msgid ""
 msgstr ""
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:210
 msgid "You have not authorized any applications to use your account."
 msgstr ""
 
 #. TRANS: Note for developers in the OAuth connection settings form.
 #. TRANS: This message contains a Markdown link. Do not separate "](".
 #. TRANS: %s is the URL to the OAuth settings.
-#: actions/oauthconnectionssettings.php:230
 #, php-format
 msgid ""
 "Are you a developer? [Register an OAuth client application](%s) to use with "
 "this instance of StatusNet."
 msgstr ""
 
-#: actions/oembed.php:64
+#. TRANS: Server error displayed in oEmbed action when path not found.
+#. TRANS: %s is a path.
 #, fuzzy, php-format
 msgid "\"%s\" not found."
 msgstr "الـ API method مش موجوده."
 
-#: actions/oembed.php:76
+#. TRANS: Server error displayed in oEmbed action when notice not found.
+#. TRANS: %s is a notice.
 #, fuzzy, php-format
 msgid "Notice %s not found."
 msgstr "الـ API method مش موجوده."
 
-#: actions/oembed.php:80 actions/shownotice.php:100
+#. TRANS: Server error displayed in oEmbed action when notice has not profile.
 #, fuzzy
 msgid "Notice has no profile."
 msgstr "ليس للمستخدم ملف شخصى."
 
-#: actions/oembed.php:83 actions/shownotice.php:172
+#. TRANS: oEmbed title. %1$s is the author name, %2$s is the creation date.
 #, fuzzy, php-format
 msgid "%1$s's status on %2$s"
 msgstr "%1$s ساب جروپ %2$s"
 
-#: actions/oembed.php:95
+#. TRANS: Server error displayed in oEmbed action when attachment not found.
+#. TRANS: %d is an attachment ID.
 #, fuzzy, php-format
 msgid "Attachment %s not found."
 msgstr "لم يُعثر على المستخدم المستلم."
 
-#: actions/oembed.php:136
+#. TRANS: Server error displayed in oEmbed request when a path is not supported.
+#. TRANS: %s is a path.
 #, php-format
 msgid "\"%s\" not supported for oembed requests."
 msgstr ""
 
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
-#: actions/oembed.php:168
 #, fuzzy, php-format
 msgid "Content type %s not supported."
 msgstr "نوع المحتوى "
 
 #. TRANS: Error message displaying attachments. %s is the site's base URL.
-#: actions/oembed.php:172
 #, php-format
 msgid "Only %s URLs over plain HTTP please."
 msgstr ""
 
+#. TRANS: Server error displayed in oEmbed action when request specifies an unsupported data format.
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1207
-#: lib/apiaction.php:1234 lib/apiaction.php:1369
 msgid "Not a supported data format."
 msgstr " مش نظام بيانات مدعوم."
 
 #. TRANS: ShortName in the OpenSearch interface when trying to find users.
-#: actions/opensearch.php:64
 msgid "People Search"
 msgstr "تدوير فى الأشخاص"
 
-#: actions/opensearch.php:68
+#. TRANS: ShortName in the OpenSearch interface when trying to find notices.
 msgid "Notice Search"
 msgstr "بحث الإشعارات"
 
 #. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
-#: actions/otp.php:70
 msgid "No user ID specified."
 msgstr "ما فيش ID متحدد لليوزر."
 
 #. TRANS: Client error displayed trying to use "one time password login" without specifying a login token.
-#: actions/otp.php:86
 msgid "No login token specified."
 msgstr "ما فيش امارة دخول متحدده."
 
 #. TRANS: Client error displayed trying to use "one time password login" without requesting a login token.
-#: actions/otp.php:94
 msgid "No login token requested."
 msgstr "ما فيش طلب تسجيل دخول مطلوب."
 
 #. TRANS: Client error displayed trying to use "one time password login" while specifying an invalid login token.
-#: actions/otp.php:100
 msgid "Invalid login token specified."
 msgstr "امارة تسجيل الدخول اللى اتحطت مش موجوده."
 
 #. TRANS: Client error displayed trying to use "one time password login" while specifying an expired login token.
-#: actions/otp.php:110
 msgid "Login token expired."
 msgstr "تاريخ صلاحية الاماره خلص."
 
 #. TRANS: Title for outbox for any but the fist page.
 #. TRANS: %1$s is the user nickname, %2$d is the page number.
-#: actions/outbox.php:57
 #, php-format
 msgid "Outbox for %1$s - page %2$d"
 msgstr ""
 
 #. TRANS: Title for first page of outbox.
-#: actions/outbox.php:61
 #, fuzzy, php-format
 msgid "Outbox for %s"
 msgstr "صندوق الصادر"
 
 #. TRANS: Instructions for outbox.
-#: actions/outbox.php:103
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr ""
 
-#: actions/passwordsettings.php:58
 msgid "Change password"
 msgstr "غيّر كلمه السر"
 
-#: actions/passwordsettings.php:69
 msgid "Change your password."
 msgstr "غيّر كلمه سرك."
 
 #. TRANS: Fieldset legend for password reset form.
-#: actions/passwordsettings.php:96 actions/recoverpassword.php:251
 msgid "Password change"
 msgstr "تغيير كلمه السر"
 
-#: actions/passwordsettings.php:104
 msgid "Old password"
 msgstr "كلمه السر القديمة"
 
 #. TRANS: Field label for password reset form.
-#: actions/passwordsettings.php:108 actions/recoverpassword.php:256
 msgid "New password"
 msgstr "كلمه سر جديدة"
 
-#: actions/passwordsettings.php:109 actions/register.php:416
 #, fuzzy
 msgid "6 or more characters."
 msgstr "6 حروف أو أكثر. مطلوب."
 
 #. TRANS: Ttile for field label for password reset form where the password has to be typed again.
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:264
-#: actions/register.php:420
 #, fuzzy
 msgid "Same as password above."
 msgstr "نفس كلمه السر أعلاه"
 
-#: actions/passwordsettings.php:117
 msgid "Change"
 msgstr "غيّر"
 
-#: actions/passwordsettings.php:153 actions/register.php:223
 msgid "Password must be 6 or more characters."
 msgstr "يجب أن تكون كلمه السر 6 حروف أو أكثر."
 
-#: actions/passwordsettings.php:156 actions/register.php:226
 msgid "Passwords don't match."
 msgstr "كلمتا السر غير متطابقتين."
 
-#: actions/passwordsettings.php:164
 msgid "Incorrect old password"
 msgstr "كلمه السر القديمه غير صحيحة"
 
-#: actions/passwordsettings.php:180
 msgid "Error saving user; invalid."
 msgstr "خطأ أثناء حفظ المستخدم؛ غير صالح."
 
 #. TRANS: Reset password form validation error message.
-#: actions/passwordsettings.php:185 actions/recoverpassword.php:418
 #, fuzzy
 msgid "Cannot save new password."
 msgstr "تعذّر حفظ كلمه السر الجديده."
 
-#: actions/passwordsettings.php:191
 msgid "Password saved."
 msgstr "حُفظت كلمه السر."
 
 #. TRANS: Title for Paths admin panel.
 #. TRANS: Menu item for site administration
-#: actions/pathsadminpanel.php:58 lib/adminpanelaction.php:371
 msgid "Paths"
 msgstr "المسارات"
 
 #. TRANS: Form instructions for Path admin panel.
-#: actions/pathsadminpanel.php:69
 msgid "Path and server settings for this StatusNet site"
 msgstr ""
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the directory that could not be read from.
-#: actions/pathsadminpanel.php:155
 #, php-format
 msgid "Theme directory not readable: %s."
 msgstr "دليل السمات"
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the avatar directory that could not be written to.
-#: actions/pathsadminpanel.php:163
 #, php-format
 msgid "Avatar directory not writable: %s."
 msgstr "دليل الأفتار."
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the background directory that could not be written to.
-#: actions/pathsadminpanel.php:171
 #, php-format
 msgid "Background directory not writable: %s."
 msgstr "دليل الخلفيات"
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the locales directory that could not be read from.
-#: actions/pathsadminpanel.php:181
 #, fuzzy, php-format
 msgid "Locales directory not readable: %s."
 msgstr "لا يمكن قراءه دليل المحليات: %s"
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the SSL server URL that is too long.
-#: actions/pathsadminpanel.php:189
 #, fuzzy
 msgid "Invalid SSL server. The maximum length is 255 characters."
 msgstr "رساله ترحيب غير صالحه. أقصى طول هو 255 حرف."
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:235 actions/siteadminpanel.php:58
 msgid "Site"
 msgstr "الموقع"
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:241 actions/pathsadminpanel.php:279
-#: actions/pathsadminpanel.php:370 actions/pathsadminpanel.php:425
 msgid "Server"
 msgstr "خادوم"
 
-#: actions/pathsadminpanel.php:242
 msgid "Site's server hostname."
 msgstr "اسم مضيف خادوم الموقع."
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:248 actions/pathsadminpanel.php:288
-#: actions/pathsadminpanel.php:379 actions/pathsadminpanel.php:434
 msgid "Path"
 msgstr "المسار"
 
-#: actions/pathsadminpanel.php:249
 #, fuzzy
 msgid "Site path."
 msgstr "مسار الموقع"
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:255
 #, fuzzy
 msgid "Locale directory"
 msgstr "دليل السمات"
 
-#: actions/pathsadminpanel.php:256
 #, fuzzy
 msgid "Directory path to locales."
 msgstr "مسار دليل المحليات"
 
 #. TRANS: Checkbox label in Paths admin panel.
-#: actions/pathsadminpanel.php:263
 msgid "Fancy URLs"
 msgstr "مسارات فاخرة"
 
-#: actions/pathsadminpanel.php:265
 msgid "Use fancy (more readable and memorable) URLs?"
 msgstr "أأستخدم مسارات فاخره (يمكن قراءتها وتذكرها بسهوله أكبر)؟"
 
-#: actions/pathsadminpanel.php:272
 msgid "Theme"
 msgstr "السمة"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:281
 #, fuzzy
 msgid "Server for themes."
 msgstr "سمه الموقع."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:290
 msgid "Web path to themes."
 msgstr ""
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:297 actions/pathsadminpanel.php:388
-#: actions/pathsadminpanel.php:443 actions/pathsadminpanel.php:495
 msgid "SSL server"
 msgstr "SSL server"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:299
 msgid "SSL server for themes (default: SSL server)."
 msgstr ""
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:306 actions/pathsadminpanel.php:397
-#: actions/pathsadminpanel.php:452
 #, fuzzy
 msgid "SSL path"
 msgstr "مسار الموقع"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:308
 msgid "SSL path to themes (default: /theme/)."
 msgstr ""
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:315 actions/pathsadminpanel.php:406
-#: actions/pathsadminpanel.php:461
 #, fuzzy
 msgid "Directory"
 msgstr "دليل السمات"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:317
 #, fuzzy
 msgid "Directory where themes are located."
 msgstr "مسار دليل المحليات"
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:326
 msgid "Avatars"
 msgstr "أفتارات"
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:333
 msgid "Avatar server"
 msgstr "خادوم الأفتارات"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:335
 #, fuzzy
 msgid "Server for avatars."
 msgstr "سمه الموقع."
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:342
 msgid "Avatar path"
 msgstr "مسار الأفتارات"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:344
 #, fuzzy
 msgid "Web path to avatars."
 msgstr "فشل تحديث الأفتار."
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:351
 msgid "Avatar directory"
 msgstr "دليل الأفتار."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:353
 #, fuzzy
 msgid "Directory where avatars are located."
 msgstr "مسار دليل المحليات"
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:364
 msgid "Backgrounds"
 msgstr "خلفيات"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:372
 #, fuzzy
 msgid "Server for backgrounds."
 msgstr "سمه الموقع."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:381
 msgid "Web path to backgrounds."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:390
 msgid "Server for backgrounds on SSL pages."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:399
 msgid "Web path to backgrounds on SSL pages."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:408
 #, fuzzy
 msgid "Directory where backgrounds are located."
 msgstr "مسار دليل المحليات"
 
 #. TRANS: Fieldset legens in Paths admin panel.
-#: actions/pathsadminpanel.php:419
 msgid "Attachments"
 msgstr "مرفقات"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:427
 #, fuzzy
 msgid "Server for attachments."
 msgstr "سمه الموقع."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:436
 #, fuzzy
 msgid "Web path to attachments."
 msgstr "لا مرفقات."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:445
 #, fuzzy
 msgid "Server for attachments on SSL pages."
 msgstr "سمه الموقع."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:454
 msgid "Web path to attachments on SSL pages."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:463
 #, fuzzy
 msgid "Directory where attachments are located."
 msgstr "مسار دليل المحليات"
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:472
 msgid "SSL"
 msgstr "SSL"
 
 #. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
-#: actions/pathsadminpanel.php:477 actions/snapshotadminpanel.php:202
 msgid "Never"
 msgstr "مطلقا"
 
 #. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
-#: actions/pathsadminpanel.php:479
 msgid "Sometimes"
 msgstr "أحيانًا"
 
 #. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
-#: actions/pathsadminpanel.php:481
 msgid "Always"
 msgstr "دائمًا"
 
-#: actions/pathsadminpanel.php:485
 msgid "Use SSL"
 msgstr "استخدم SSL"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:487
 msgid "When to use SSL."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:497
 msgid "Server to direct SSL requests to."
 msgstr ""
 
 #. TRANS: Button title text to store form data in the Paths admin panel.
-#: actions/pathsadminpanel.php:514
 msgid "Save paths"
 msgstr "احفظ المسارات"
 
 #. TRANS: Instructions for the "People search" page.
 #. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/peoplesearch.php:54
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
@@ -4488,57 +3700,46 @@ msgid ""
 msgstr ""
 
 #. TRANS: Title of a page where users can search for other users.
-#: actions/peoplesearch.php:61
 msgid "People search"
 msgstr "بحث فى الأشخاص"
 
-#: actions/peopletag.php:68
 #, php-format
 msgid "Not a valid people tag: %s."
 msgstr "ليس عنوان بريد صالح."
 
-#: actions/peopletag.php:142
 #, php-format
 msgid "Users self-tagged with %1$s - page %2$d"
 msgstr ""
 
 #. TRANS: Page title for AJAX form return when a disabling a plugin.
-#: actions/plugindisable.php:69
 msgctxt "plugin"
 msgid "Disabled"
 msgstr ""
 
 #. TRANS: Client error displayed trying to perform any request method other than POST.
 #. TRANS: Do not translate POST.
-#: actions/pluginenable.php:78 actions/subscribe.php:77
 msgid "This action only accepts POST requests."
 msgstr ""
 
-#: actions/pluginenable.php:102
 #, fuzzy
 msgid "You cannot administer plugins."
 msgstr "لا يمكنك حذف المستخدمين."
 
-#: actions/pluginenable.php:109
 #, fuzzy
 msgid "No such plugin."
 msgstr "لا وسم كهذا."
 
 #. TRANS: Page title for AJAX form return when enabling a plugin.
-#: actions/pluginenable.php:159
 msgctxt "plugin"
 msgid "Enabled"
 msgstr ""
 
 #. TRANS: Tab and title for plugins admin panel.
 #. TRANS: Menu item for site administration
-#: actions/pluginsadminpanel.php:56 actions/version.php:191
-#: lib/adminpanelaction.php:411
 msgid "Plugins"
 msgstr ""
 
 #. TRANS: Instructions at top of plugin admin page.
-#: actions/pluginsadminpanel.php:68
 msgid ""
 "Additional plugins can be enabled and configured manually. See the <a href="
 "\"http://status.net/wiki/Plugins\">online plugin documentation</a> for more "
@@ -4546,68 +3747,54 @@ msgid ""
 msgstr ""
 
 #. TRANS: Admin form section header
-#: actions/pluginsadminpanel.php:84
 #, fuzzy
 msgid "Default plugins"
 msgstr "اللغه المفضلة"
 
-#: actions/pluginsadminpanel.php:106
 msgid ""
 "All default plugins have been disabled from the site's configuration file."
 msgstr ""
 
-#: actions/postnotice.php:95
 msgid "Invalid notice content."
 msgstr "حجم غير صالح."
 
-#: actions/postnotice.php:101
 #, php-format
 msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’."
 msgstr ""
 
 #. TRANS: Page title for profile settings.
-#: actions/profilesettings.php:60
 msgid "Profile settings"
 msgstr "إعدادات الملف الشخصي"
 
 #. TRANS: Usage instructions for profile settings.
-#: actions/profilesettings.php:71
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
 
 #. TRANS: Profile settings form legend.
-#: actions/profilesettings.php:99
 msgid "Profile information"
 msgstr "معلومات الملف الشخصي"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:110 actions/register.php:412
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr ""
 
 #. TRANS: Field label in form for profile settings.
-#: actions/profilesettings.php:114 actions/register.php:434
-#: lib/groupeditform.php:150
 msgid "Full name"
 msgstr "الاسم الكامل"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:119 actions/register.php:439
-#: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "الصفحه الرئيسية"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:122 actions/register.php:441
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr ""
 
 #. TRANS: Tooltip for field label in form for profile settings. Plural
 #. TRANS: is decided by the number of characters available for the
 #. TRANS: biography (%d).
-#: actions/profilesettings.php:130 actions/register.php:450
 #, fuzzy, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4619,69 +3806,54 @@ msgstr[4] "صِف نفسك واهتماماتك"
 msgstr[5] "صِف نفسك واهتماماتك"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:136 actions/register.php:455
 msgid "Describe yourself and your interests"
 msgstr "صِف نفسك واهتماماتك"
 
 #. TRANS: Text area label in form for profile settings where users can provide.
 #. TRANS: their biography.
-#: actions/profilesettings.php:140 actions/register.php:457
 msgid "Bio"
 msgstr "السيرة"
 
 #. TRANS: Field label in form for profile settings.
-#: actions/profilesettings.php:146 actions/register.php:462
-#: lib/groupeditform.php:173
 msgid "Location"
 msgstr "الموقع"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:149
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr ""
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:154
 msgid "Share my current location when posting notices"
 msgstr ""
 
 #. TRANS: Field label in form for profile settings.
-#: actions/profilesettings.php:162 actions/tagother.php:128
-#: actions/tagother.php:188 lib/subscriptionlist.php:104
-#: lib/subscriptionlist.php:106
 msgid "Tags"
 msgstr "الوسوم"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:165
 msgid ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- "
 "separated."
 msgstr ""
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:170
 msgid "Language"
 msgstr "اللغة"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:172
 #, fuzzy
 msgid "Preferred language."
 msgstr "اللغه المفضلة"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:182
 msgid "Timezone"
 msgstr "المنطقه الزمنية"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:184
 msgid "What timezone are you normally in?"
 msgstr "ما المنطقه الزمنيه التى تتواجد فيها عادة؟"
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:190
 #, fuzzy
 msgid ""
 "Automatically subscribe to whoever subscribes to me (best for non-humans)."
@@ -4690,7 +3862,6 @@ msgstr "أشرك المستخدمين الجدد بهذا المستخدم تل
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Plural form is used based on the maximum number of allowed
 #. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:259 actions/register.php:214
 #, fuzzy, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4702,103 +3873,84 @@ msgstr[4] "الاسم طويل جدا (اكتر حاجه %d رمز)."
 msgstr[5] "الاسم طويل جدا (اكتر حاجه %d رمز)."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:270 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr "لم تُختر المنطقه الزمنيه."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:278
 #, fuzzy
 msgid "Language is too long (maximum 50 characters)."
 msgstr "الاسم طويل جدا (اكتر حاجه 255 رمز)."
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:292
 #, fuzzy, php-format
 msgid "Invalid tag: \"%s\"."
 msgstr "وسم غير صالح: \"%s\""
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:348
 #, fuzzy
 msgid "Could not update user for autosubscribe."
 msgstr "تعذّر تحديث المستخدم."
 
 #. TRANS: Server error thrown when user profile location preference settings could not be updated.
-#: actions/profilesettings.php:406
 #, fuzzy
 msgid "Could not save location prefs."
 msgstr "لم يمكن حفظ تفضيلات الموقع."
 
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:428 actions/tagother.php:179
 msgid "Could not save tags."
 msgstr "تعذّر حفظ الوسوم."
 
 #. TRANS: Confirmation shown when user profile settings are saved.
 #. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:437 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "حُفظت الإعدادات."
 
 #. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
 #. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:484 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "أنشئ مجموعه جديدة"
 
-#: actions/public.php:83
 #, fuzzy, php-format
 msgid "Beyond the page limit (%s)."
 msgstr "وراء حد الصفحه (%s)"
 
-#: actions/public.php:92
 #, fuzzy
 msgid "Could not retrieve public stream."
 msgstr "تعذّر إنشاء الكنى."
 
-#: actions/public.php:130
 #, php-format
 msgid "Public timeline, page %d"
 msgstr "المسار الزمنى العام، صفحه %d"
 
-#: actions/public.php:132 lib/publicgroupnav.php:79
 msgid "Public timeline"
 msgstr "المسار الزمنى العام"
 
-#: actions/public.php:160
 msgid "Public Stream Feed (RSS 1.0)"
 msgstr ""
 
-#: actions/public.php:164
 msgid "Public Stream Feed (RSS 2.0)"
 msgstr ""
 
-#: actions/public.php:168
 msgid "Public Stream Feed (Atom)"
 msgstr ""
 
-#: actions/public.php:188
 #, php-format
 msgid ""
 "This is the public timeline for %%site.name%% but no one has posted anything "
 "yet."
 msgstr ""
 
-#: actions/public.php:191
 msgid "Be the first to post!"
 msgstr "كن أول من يُرسل!"
 
-#: actions/public.php:195
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post!"
 msgstr ""
 
-#: actions/public.php:242
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -4811,7 +3963,6 @@ msgstr ""
 "الآن](%%action.register%%) لتشارك اشعاراتك مع أصدقائك وعائلتك وزملائك! "
 "([اقرأ المزيد](%%doc.help%%))"
 
-#: actions/public.php:247
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -4822,19 +3973,16 @@ msgstr ""
 "blogging) المبنيه على البرنامج الحر [StatusNet](http://status.net/)."
 
 #. TRANS: Public RSS feed description. %s is the StatusNet site name.
-#: actions/publicrss.php:106
 #, php-format
 msgid "%s updates from everyone."
 msgstr ""
 
 #. TRANS: Title for public tag cloud.
-#: actions/publictagcloud.php:57
 msgid "Public tag cloud"
 msgstr "سحابه الوسوم العمومية"
 
 #. TRANS: Instructions (more used like an explanation/header).
 #. TRANS: %s is the StatusNet sitename.
-#: actions/publictagcloud.php:65
 #, fuzzy, php-format
 msgid "These are most popular recent tags on %s"
 msgstr "هذه هى أكثر الوسوم شهره على %s "
@@ -4842,14 +3990,12 @@ msgstr "هذه هى أكثر الوسوم شهره على %s "
 #. TRANS: This message contains a Markdown URL. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.
-#: actions/publictagcloud.php:74
 #, php-format
 msgid "No one has posted a notice with a [hashtag](%%doc.tags%%) yet."
 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.
-#: actions/publictagcloud.php:79
 msgid "Be the first to post one!"
 msgstr "كن أول من يُرسل!"
 
@@ -4858,7 +4004,6 @@ msgstr "كن أول من يُرسل!"
 #. TRANS: This message contains a Markdown URL. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.
-#: actions/publictagcloud.php:87
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post "
@@ -4866,273 +4011,220 @@ msgid ""
 msgstr ""
 
 #. TRANS: Client error displayed trying to recover password while already logged in.
-#: actions/recoverpassword.php:37
 msgid "You are already logged in!"
 msgstr "أنت والج بالفعل!"
 
 #. TRANS: Client error displayed when password recovery code is not correct.
-#: actions/recoverpassword.php:64
 msgid "No such recovery code."
 msgstr "لا رمز استعاده كهذا."
 
 #. TRANS: Client error displayed when no proper password recovery code was submitted.
-#: actions/recoverpassword.php:69
 msgid "Not a recovery code."
 msgstr "ليس رمز استعاده."
 
 #. TRANS: Server error displayed trying to recover password without providing a user.
-#: actions/recoverpassword.php:77
 msgid "Recovery code for unknown user."
 msgstr "رمز استعاده لمستخدم غير معروف."
 
 #. TRANS: Server error displayed removing a password recovery code from the database.
-#: actions/recoverpassword.php:91
 msgid "Error with confirmation code."
 msgstr "خطأ فى رمز التأكيد."
 
 #. TRANS: Client error displayed trying to recover password with too old a recovery code.
-#: actions/recoverpassword.php:103
 msgid "This confirmation code is too old. Please start again."
 msgstr "رمز التأكيد هذا قديم جدًا. من فضلك ابدأ من جديد."
 
 #. TRANS: Server error displayed when updating a user's e-mail address in the database fails while recovering a password.
-#: actions/recoverpassword.php:118
 #, fuzzy
 msgid "Could not update user with confirmed email address."
 msgstr "عنوان البريد الإلكترونى المُؤكد الحالى."
 
 #. TRANS: Page notice for password recovery page.
-#: actions/recoverpassword.php:160
 msgid ""
 "If you have forgotten or lost your password, you can get a new one sent to "
 "the email address you have stored in your account."
 msgstr ""
 
-#: actions/recoverpassword.php:167
 msgid "You have been identified. Enter a new password below."
 msgstr ""
 
 #. TRANS: Fieldset legend for password recovery page.
-#: actions/recoverpassword.php:198
 msgid "Password recovery"
 msgstr "استعاده كلمه السر"
 
 #. TRANS: Field label on password recovery page.
-#: actions/recoverpassword.php:202
 msgid "Nickname or email address"
 msgstr "الاسم المستعار أو البريد الإلكتروني"
 
 #. TRANS: Title for field label on password recovery page.
-#: actions/recoverpassword.php:205
 msgid "Your nickname on this server, or your registered email address."
 msgstr ""
 
 #. TRANS: Field label on password recovery page.
-#: actions/recoverpassword.php:212
 msgid "Recover"
 msgstr "استرجع"
 
 #. TRANS: Button text on password recovery page.
-#: actions/recoverpassword.php:214
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Recover"
 msgstr "استرجع"
 
 #. TRANS: Title for password recovery page in password reset mode.
-#: actions/recoverpassword.php:223
 msgid "Reset password"
 msgstr "أعد ضبط كلمه السر"
 
 #. TRANS: Title for password recovery page in password recover mode.
-#: actions/recoverpassword.php:225
 msgid "Recover password"
 msgstr "استعد كلمه السر"
 
 #. TRANS: Title for password recovery page in email sent mode.
 #. TRANS: Subject for password recovery e-mail.
-#: actions/recoverpassword.php:227 actions/recoverpassword.php:366
 msgid "Password recovery requested"
 msgstr "طُلبت استعاده كلمه السر"
 
 #. TRANS: Title for password recovery page in password saved mode.
-#: actions/recoverpassword.php:229
 #, fuzzy
 msgid "Password saved"
 msgstr "حُفظت كلمه السر."
 
 #. TRANS: Title for password recovery page when an unknown action has been specified.
-#: actions/recoverpassword.php:232
 msgid "Unknown action"
 msgstr "إجراء غير معروف"
 
 #. TRANS: Title for field label for password reset form.
-#: actions/recoverpassword.php:258
 #, fuzzy
 msgid "6 or more characters, and do not forget it!"
 msgstr "6 حروف أو أكثر. مطلوب."
 
 #. TRANS: Button text for password reset form.
 #. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: actions/recoverpassword.php:268 lib/designform.php:145
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Reset"
 msgstr "أعد الضبط"
 
 #. TRANS: Form instructions for password recovery form.
-#: actions/recoverpassword.php:278
 msgid "Enter a nickname or email address."
 msgstr "أدخل اسمًا مستعارًا أو عنوان بريد إلكترونى."
 
 #. TRANS: Information on password recovery form if no known username or e-mail address was specified.
-#: actions/recoverpassword.php:309
 #, fuzzy
 msgid "No user with that email address or username."
 msgstr "عنوان البريد الإلكترونى للاتصال بموقعك"
 
 #. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
-#: actions/recoverpassword.php:327
 #, fuzzy
 msgid "No registered email address for that user."
 msgstr "عنوان البريد الإلكترونى للاتصال بموقعك"
 
 #. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
-#: actions/recoverpassword.php:342
 msgid "Error saving address confirmation."
 msgstr "خطأ أثناء حفظ تأكيد العنوان."
 
 #. TRANS: User notification after an e-mail with instructions was sent from the password recovery form.
-#: actions/recoverpassword.php:370
 msgid ""
 "Instructions for recovering your password have been sent to the email "
 "address registered to your account."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to reset as password without providing a user.
-#: actions/recoverpassword.php:391
 #, fuzzy
 msgid "Unexpected password reset."
 msgstr "أعد ضبط كلمه السر"
 
 #. TRANS: Reset password form validation error message.
-#: actions/recoverpassword.php:400
 #, fuzzy
 msgid "Password must be 6 characters or more."
 msgstr "يجب أن تكون كلمه السر 6 محارف أو أكثر."
 
 #. TRANS: Reset password form validation error message.
-#: actions/recoverpassword.php:405
 #, fuzzy
 msgid "Password and confirmation do not match."
 msgstr "كلمتا السر غير متطابقتين."
 
 #. TRANS: Server error displayed when something does wrong with the user object during password reset.
-#: actions/recoverpassword.php:426 actions/register.php:241
 msgid "Error setting user."
 msgstr "خطأ أثناء ضبط المستخدم."
 
 #. TRANS: Success message for user after password reset.
-#: actions/recoverpassword.php:434
 msgid "New password successfully saved. You are now logged in."
 msgstr ""
 
-#: actions/redirecturl.php:70
 #, fuzzy
 msgid "No id parameter"
 msgstr "لا مدخل هويه."
 
-#: actions/redirecturl.php:76
 #, fuzzy, php-format
 msgid "No such file \"%d\""
 msgstr "لا ملف كهذا."
 
-#: actions/register.php:80 actions/register.php:181 actions/register.php:392
 msgid "Sorry, only invited people can register."
 msgstr "عذرًا، الأشخاص المدعوون وحدهم يستطيعون التسجيل."
 
-#: actions/register.php:87
 msgid "Sorry, invalid invitation code."
 msgstr "عذرا، رمز دعوه غير صالح."
 
-#: actions/register.php:106
 msgid "Registration successful"
 msgstr "نجح التسجيل"
 
-#: actions/register.php:108 actions/register.php:490
 msgid "Register"
 msgstr "سجّل"
 
-#: actions/register.php:128
 msgid "Registration not allowed."
 msgstr "لا يُسمح بالتسجيل."
 
-#: actions/register.php:194
 #, fuzzy
 msgid "You cannot register if you don't agree to the license."
 msgstr "ما ينفعش تكرر الملاحظه بتاعتك."
 
-#: actions/register.php:203
 msgid "Email address already exists."
 msgstr "عنوان البريد الإلكترونى موجود مسبقًا."
 
-#: actions/register.php:236 actions/register.php:258
 msgid "Invalid username or password."
 msgstr "اسم مستخدم أو كلمه سر غير صالحه."
 
-#: actions/register.php:333
 msgid ""
 "With this form you can create a new account. You can then post notices and "
 "link up to friends and colleagues."
 msgstr ""
 
-#: actions/register.php:424 actions/register.php:428
-#: actions/siteadminpanel.php:238 lib/settingsnav.php:92
 msgid "Email"
 msgstr "البريد الإلكتروني"
 
-#: actions/register.php:425 actions/register.php:429
 msgid "Used only for updates, announcements, and password recovery."
 msgstr ""
 
-#: actions/register.php:436
 msgid "Longer name, preferably your \"real\" name."
 msgstr ""
 
-#: actions/register.php:464
 msgid "Where you are, like \"City, State (or Region), Country\"."
 msgstr ""
 
-#: actions/register.php:503
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
 msgstr ""
 
-#: actions/register.php:513
 #, php-format
 msgid "My text and files are copyright by %1$s."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:517
 msgid "My text and files remain under my own copyright."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:520
 msgid "All rights reserved."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:525
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
 "email address, IM address, and phone number."
 msgstr ""
 
-#: actions/register.php:566
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -5151,13 +4243,11 @@ msgid ""
 "Thanks for signing up and we hope you enjoy using this service."
 msgstr ""
 
-#: actions/register.php:590
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
 msgstr ""
 
-#: actions/remotesubscribe.php:97
 #, php-format
 msgid ""
 "To subscribe, you can [login](%%action.login%%), or [register](%%action."
@@ -5165,122 +4255,95 @@ msgid ""
 "microblogging site](%%doc.openmublog%%),  enter your profile URL below."
 msgstr ""
 
-#: actions/remotesubscribe.php:111
 msgid "Remote subscribe"
 msgstr "اشتراك بعيد"
 
-#: actions/remotesubscribe.php:123
 msgid "Subscribe to a remote user"
 msgstr "اشترك بمستخدم بعيد"
 
-#: actions/remotesubscribe.php:128
 msgid "User nickname"
 msgstr "اسم المستخدم المستعار"
 
-#: actions/remotesubscribe.php:129
 msgid "Nickname of the user you want to follow."
 msgstr ""
 
-#: actions/remotesubscribe.php:132
 msgid "Profile URL"
 msgstr "مسار الملف الشخصي"
 
-#: actions/remotesubscribe.php:133
 msgid "URL of your profile on another compatible microblogging service."
 msgstr ""
 
 #. TRANS: Link text for link that will subscribe to a remote profile.
-#: actions/remotesubscribe.php:136 lib/subscribeform.php:139
-#: lib/userprofile.php:402
 msgid "Subscribe"
 msgstr "اشترك"
 
-#: actions/remotesubscribe.php:158
 #, fuzzy
 msgid "Invalid profile URL (bad format)."
 msgstr "حجم غير صالح."
 
-#: actions/remotesubscribe.php:167
 msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
 msgstr ""
 
-#: actions/remotesubscribe.php:175
 #, fuzzy
 msgid "That is a local profile! Login to subscribe."
 msgstr "لقد منعك المستخدم."
 
-#: actions/remotesubscribe.php:182
 #, fuzzy
 msgid "Could not get a request token."
 msgstr "تعذّر إدراج الرساله."
 
-#: actions/repeat.php:56
 msgid "Only logged-in users can repeat notices."
 msgstr ""
 
-#: actions/repeat.php:63 actions/repeat.php:70
 msgid "No notice specified."
 msgstr "ما فيش ملاحظه متحدده."
 
-#: actions/repeat.php:75
 #, fuzzy
 msgid "You cannot repeat your own notice."
 msgstr "ما ينفعش تكرر الملاحظه بتاعتك."
 
-#: actions/repeat.php:89
 msgid "You already repeated that notice."
 msgstr "انت عيدت الملاحظه دى فعلا."
 
-#: actions/repeat.php:112 lib/noticelist.php:697
 msgid "Repeated"
 msgstr "مكرر"
 
-#: actions/repeat.php:117
 msgid "Repeated!"
 msgstr "مكرر!"
 
 #. TRANS: RSS reply feed title. %s is a user nickname.
-#: actions/replies.php:126 actions/repliesrss.php:68
-#: lib/personalgroupnav.php:105
 #, php-format
 msgid "Replies to %s"
 msgstr "الردود على %s"
 
-#: actions/replies.php:128
 #, fuzzy, php-format
 msgid "Replies to %1$s, page %2$d"
 msgstr "الردود على %s"
 
-#: actions/replies.php:145
 #, php-format
 msgid "Replies feed for %s (RSS 1.0)"
 msgstr ""
 
-#: actions/replies.php:152
 #, php-format
 msgid "Replies feed for %s (RSS 2.0)"
 msgstr ""
 
-#: actions/replies.php:159
 #, fuzzy, php-format
 msgid "Replies feed for %s (Atom)"
 msgstr "الردود على %s"
 
-#: actions/replies.php:199
 #, php-format
 msgid ""
 "This is the timeline showing replies to %1$s but %2$s hasn't received a "
 "notice to them yet."
 msgstr ""
 
-#: actions/replies.php:204
 #, php-format
 msgid ""
 "You can engage other users in a conversation, subscribe to more people or "
 "[join groups](%%action.groups%%)."
 msgstr ""
 
-#: actions/replies.php:206
 #, php-format
 msgid ""
 "You can try to [nudge %1$s](../%2$s) or [post something to them](%%%%action."
@@ -5289,232 +4352,191 @@ msgstr ""
 
 #. TRANS: RSS reply feed description.
 #. TRANS: %1$s is a user nickname, %2$s is the StatusNet site name.
-#: actions/repliesrss.php:74
 #, fuzzy, php-format
 msgid "Replies to %1$s on %2$s."
 msgstr "أهلا بكم فى %1$s يا @%2$s!"
 
 #. TRANS: Client exception displayed when trying to restore an account while not logged in.
-#: actions/restoreaccount.php:78
 #, fuzzy
 msgid "Only logged-in users can restore their account."
 msgstr "يحق للمُرسل والمستلم فقط قراءه هذه الرساله."
 
 #. TRANS: Client exception displayed when trying to restore an account without having restore rights.
-#: actions/restoreaccount.php:83
 #, fuzzy
 msgid "You may not restore your account."
 msgstr "لازم تكون مسجل دخوللك علشان تسجل application."
 
 #. TRANS: Client exception displayed trying to restore an account while something went wrong uploading a file.
 #. TRANS: Client exception. No file; probably just a non-AJAX submission.
-#: actions/restoreaccount.php:121 actions/restoreaccount.php:146
 #, fuzzy
 msgid "No uploaded file."
 msgstr "ارفع ملفًا"
 
 #. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
-#: actions/restoreaccount.php:129 lib/mediafile.php:194
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
 msgstr ""
 
 #. TRANS: Client exception.
-#: actions/restoreaccount.php:135 lib/mediafile.php:200
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form."
 msgstr ""
 
 #. TRANS: Client exception.
-#: actions/restoreaccount.php:141 lib/mediafile.php:206
 msgid "The uploaded file was only partially uploaded."
 msgstr ""
 
 #. TRANS: Client exception thrown when a temporary folder is not present to store a file upload.
-#: actions/restoreaccount.php:150 lib/mediafile.php:214
 msgid "Missing a temporary folder."
 msgstr ""
 
 #. TRANS: Client exception thrown when writing to disk is not possible during a file upload operation.
-#: actions/restoreaccount.php:154 lib/mediafile.php:218
 msgid "Failed to write file to disk."
 msgstr "فشل فى كتابه الملف إلى القرص."
 
 #. TRANS: Client exception thrown when a file upload operation has been stopped by an extension.
-#: actions/restoreaccount.php:158 lib/mediafile.php:222
 msgid "File upload stopped by extension."
 msgstr ""
 
 #. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
 #. TRANS: Exception thrown when uploading an image fails for an unknown reason.
 #. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
-#: actions/restoreaccount.php:164 lib/imagefile.php:106 lib/mediafile.php:228
 msgid "System error uploading file."
 msgstr ""
 
 #. TRANS: Client exception thrown when a feed is not an Atom feed.
-#: actions/restoreaccount.php:207
 #, fuzzy
 msgid "Not an Atom feed."
 msgstr "جميع الأعضاء"
 
 #. TRANS: Success message when a feed has been restored.
-#: actions/restoreaccount.php:241
 msgid ""
 "Feed has been restored. Your old posts should now appear in search and your "
 "profile page."
 msgstr ""
 
 #. TRANS: Message when a feed restore is in progress.
-#: actions/restoreaccount.php:245
 msgid "Feed will be restored. Please wait a few minutes for results."
 msgstr ""
 
 #. TRANS: Form instructions for feed restore.
-#: actions/restoreaccount.php:342
 msgid ""
 "You can upload a backed-up stream in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format."
 msgstr ""
 
 #. TRANS: Title for submit button to confirm upload of a user backup file for account restore.
-#: actions/restoreaccount.php:373
 #, fuzzy
 msgid "Upload the file"
 msgstr "ارفع ملفًا"
 
-#: actions/revokerole.php:75
 #, fuzzy
 msgid "You cannot revoke user roles on this site."
 msgstr "لا يمكنك إسكات المستخدمين على هذا الموقع."
 
-#: actions/revokerole.php:82
 #, fuzzy
 msgid "User doesn't have this role."
 msgstr "يوزر من-غير پروفايل زيّه."
 
-#: actions/rsd.php:142 actions/version.php:159
 msgid "StatusNet"
 msgstr "StatusNet"
 
-#: actions/sandbox.php:65 actions/unsandbox.php:65
 #, fuzzy
 msgid "You cannot sandbox users on this site."
 msgstr "لا يمكنك إسكات المستخدمين على هذا الموقع."
 
-#: actions/sandbox.php:72
 #, fuzzy
 msgid "User is already sandboxed."
 msgstr "المستخدم مسكت من قبل."
 
 #. TRANS: Menu item for site administration
-#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
-#: lib/adminpanelaction.php:379
 msgid "Sessions"
 msgstr "الجلسات"
 
-#: actions/sessionsadminpanel.php:65
 msgid "Session settings for this StatusNet site"
 msgstr ""
 
-#: actions/sessionsadminpanel.php:175
 #, fuzzy
 msgid "Handle sessions"
 msgstr "الجلسات"
 
-#: actions/sessionsadminpanel.php:177
 msgid "Whether to handle sessions ourselves."
 msgstr ""
 
-#: actions/sessionsadminpanel.php:181
 msgid "Session debugging"
 msgstr "تنقيح الجلسة"
 
-#: actions/sessionsadminpanel.php:183
 msgid "Turn on debugging output for sessions."
 msgstr "مكّن تنقيح مُخرجات الجلسه."
 
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
+#. TRANS: Submit button title.
+msgid "Save"
+msgstr "أرسل"
+
 msgid "Save site settings"
 msgstr "اذف إعدادت الموقع"
 
-#: actions/showapplication.php:78
 msgid "You must be logged in to view an application."
 msgstr "لازم تكون مسجل دخولك علشان تشوف اى application."
 
-#: actions/showapplication.php:151
 msgid "Application profile"
 msgstr ""
 
-#: actions/showapplication.php:179
 #, php-format
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr ""
 
-#: actions/showapplication.php:189
 #, fuzzy
 msgid "Application actions"
 msgstr "OAuth applications"
 
-#: actions/showapplication.php:212
 msgid "Reset key & secret"
 msgstr ""
 
 #. TRANS: Title of form for deleting a user.
-#: actions/showapplication.php:228 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:64 lib/noticelist.php:678
 msgid "Delete"
 msgstr "احذف"
 
-#: actions/showapplication.php:237
 #, fuzzy
 msgid "Application info"
 msgstr "OAuth applications"
 
-#: actions/showapplication.php:255
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
 msgstr ""
 
-#: actions/showapplication.php:275
 #, fuzzy
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr "أمتأكد من أنك تريد حذف هذا الإشعار؟"
 
 #. TRANS: Title for all but the first page of favourite notices of a user.
 #. TRANS: %1$s is the user for whom the favourite notices are displayed, %2$d is the page number.
-#: actions/showfavorites.php:80
 #, fuzzy, php-format
 msgid "%1$s's favorite notices, page %2$d"
 msgstr "إشعارات %s المُفضلة"
 
 #. TRANS: Server error displayed when favourite notices could not be retrieved from the database.
-#: actions/showfavorites.php:134
 #, fuzzy
 msgid "Could not retrieve favorite notices."
 msgstr "تعذّر إنشاء مفضله."
 
 #. TRANS: Feed link text. %s is a username.
-#: actions/showfavorites.php:172
 #, php-format
 msgid "Feed for favorites of %s (RSS 1.0)"
 msgstr ""
 
 #. TRANS: Feed link text. %s is a username.
-#: actions/showfavorites.php:180
 #, php-format
 msgid "Feed for favorites of %s (RSS 2.0)"
 msgstr ""
 
 #. TRANS: Feed link text. %s is a username.
-#: actions/showfavorites.php:188
 #, php-format
 msgid "Feed for favorites of %s (Atom)"
 msgstr ""
 
 #. TRANS: Text displayed instead of favourite notices for the current logged in user that has no favourites.
-#: actions/showfavorites.php:209
 msgid ""
 "You haven't chosen any favorite notices yet. Click the fave button on "
 "notices you like to bookmark them for later or shed a spotlight on them."
@@ -5522,7 +4544,6 @@ msgstr ""
 
 #. TRANS: Text displayed instead of favourite notices for a user that has no favourites while logged in.
 #. TRANS: %s is a username.
-#: actions/showfavorites.php:213
 #, fuzzy, php-format
 msgid ""
 "%s hasn't added any favorite notices yet. Post something interesting they "
@@ -5534,7 +4555,6 @@ msgstr ""
 #. TRANS: Text displayed instead of favourite notices for a user that has no favourites while not logged in.
 #. TRANS: %s is a username, %%%%action.register%%%% is a link to the user registration page.
 #. TRANS: (link text)[link] is a Mark Down link.
-#: actions/showfavorites.php:220
 #, fuzzy, php-format
 msgid ""
 "%s hasn't added any favorite notices yet. Why not [register an account](%%%%"
@@ -5545,65 +4565,54 @@ msgstr ""
 "register%%%%) وترسل شيئًا شيقًا ليضيفه إلى مفضلته. :)"
 
 #. TRANS: Page notice for show favourites page.
-#: actions/showfavorites.php:251
 msgid "This is a way to share what you like."
 msgstr "إنها إحدى وسائل مشاركه ما تحب."
 
 #. TRANS: Page title for first group page. %s is a group name.
-#: actions/showgroup.php:75
 #, php-format
 msgid "%s group"
 msgstr "مجموعه %s"
 
 #. TRANS: Page title for any but first group page.
 #. TRANS: %1$s is a group name, $2$s is a page number.
-#: actions/showgroup.php:79
 #, php-format
 msgid "%1$s group, page %2$d"
 msgstr "%1$s اعضاء الجروپ, صفحه %2$d"
 
 #. TRANS: Label for group description or group note (dt). Text hidden by default.
-#: actions/showgroup.php:266
 msgid "Note"
 msgstr "ملاحظة"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:277 lib/groupeditform.php:180
 msgid "Aliases"
 msgstr "الكنى"
 
 #. TRANS: Group actions header (h2). Text hidden by default.
-#: actions/showgroup.php:294
 #, fuzzy
 msgid "Group actions"
 msgstr "تصرفات المستخدم"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:338
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
 msgstr ""
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:345
 #, php-format
 msgid "Notice feed for %s group (RSS 2.0)"
 msgstr ""
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:352
 #, php-format
 msgid "Notice feed for %s group (Atom)"
 msgstr ""
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:358
 #, fuzzy, php-format
 msgid "FOAF for %s group"
 msgstr "مجموعه %s"
 
 #. TRANS: Header for mini list of group members on a group page (h2).
-#: actions/showgroup.php:395
 msgid "Members"
 msgstr "الأعضاء"
 
@@ -5611,31 +4620,24 @@ msgstr "الأعضاء"
 #. TRANS: Text for user subscription statistics if the user has no subscriptions.
 #. TRANS: Text for user subscriber statistics if user has no subscribers.
 #. TRANS: Text for user user group membership statistics if user is not a member of any group.
-#: actions/showgroup.php:401 lib/profileaction.php:137
-#: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
-#: lib/subscriptionlist.php:123 lib/tagcloudsection.php:71
 msgid "(None)"
 msgstr "(لا شيء)"
 
 #. TRANS: Link to all group members from mini list of group members if group has more than n members.
-#: actions/showgroup.php:410
 msgid "All members"
 msgstr "جميع الأعضاء"
 
 #. TRANS: Header for group statistics on a group page (h2).
 #. TRANS: H2 text for user statistics.
-#: actions/showgroup.php:441 lib/profileaction.php:205
 msgid "Statistics"
 msgstr "إحصاءات"
 
-#: actions/showgroup.php:444
 #, fuzzy
 msgctxt "LABEL"
 msgid "Created"
 msgstr "أنشئ"
 
 #. TRANS: Label for member count in statistics on group page.
-#: actions/showgroup.php:449
 #, fuzzy
 msgctxt "LABEL"
 msgid "Members"
@@ -5645,7 +4647,6 @@ msgstr "الأعضاء"
 #. TRANS: **%s** is the group alias, %%%%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).
-#: actions/showgroup.php:464
 #, fuzzy, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5662,7 +4663,6 @@ 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: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
-#: actions/showgroup.php:474
 #, fuzzy, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5674,99 +4674,83 @@ msgstr ""
 "blogging) المبنيه على البرنامج الحر [StatusNet](http://status.net/)."
 
 #. TRANS: Header for list of group administrators on a group page (h2).
-#: actions/showgroup.php:503
 msgid "Admins"
 msgstr "الإداريون"
 
 #. TRANS: Client error displayed requesting a single message that does not exist.
-#: actions/showmessage.php:76
 msgid "No such message."
 msgstr "لا رساله كهذه."
 
 #. TRANS: Client error displayed requesting a single direct message the requesting user was not a party in.
-#: actions/showmessage.php:86
 msgid "Only the sender and recipient may read this message."
 msgstr "يحق للمُرسل والمستلم فقط قراءه هذه الرساله."
 
 #. TRANS: Page title for single direct message display when viewing user is the sender.
 #. TRANS: %1$s is the addressed user's nickname, $2$s is a timestamp.
-#: actions/showmessage.php:105
 #, fuzzy, php-format
 msgid "Message to %1$s on %2$s"
 msgstr "أهلا بكم فى %1$s يا @%2$s!"
 
 #. TRANS: Page title for single message display.
 #. TRANS: %1$s is the sending user's nickname, $2$s is a timestamp.
-#: actions/showmessage.php:113
 #, fuzzy, php-format
 msgid "Message from %1$s on %2$s"
 msgstr "نتايج التدوير لـ\"%1$s\" على %2$s"
 
-#: actions/shownotice.php:90
 msgid "Notice deleted."
 msgstr "حُذف الإشعار."
 
 #. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
-#: actions/showstream.php:70
 #, fuzzy, php-format
 msgid "%1$s tagged %2$s"
 msgstr "%1$s و الصحاب, صفحه %2$d"
 
 #. TRANS: Page title showing tagged notices in one user's stream.
 #. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
-#: actions/showstream.php:74
 #, fuzzy, php-format
 msgid "%1$s tagged %2$s, page %3$d"
 msgstr "الإشعارات الموسومه ب%s"
 
 #. TRANS: Extended page title showing tagged notices in one user's stream.
 #. TRANS: %1$s is the username, %2$d is the page number.
-#: actions/showstream.php:82
 #, php-format
 msgid "%1$s, page %2$d"
 msgstr "%1$s و الصحاب, صفحه %2$d"
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %1$s is a user nickname, %2$s is a hashtag.
-#: actions/showstream.php:127
 #, php-format
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
 msgstr ""
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.
-#: actions/showstream.php:136
 #, php-format
 msgid "Notice feed for %s (RSS 1.0)"
 msgstr ""
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.
-#: actions/showstream.php:145
 #, php-format
 msgid "Notice feed for %s (RSS 2.0)"
 msgstr ""
 
-#: actions/showstream.php:152
 #, php-format
 msgid "Notice feed for %s (Atom)"
 msgstr ""
 
 #. TRANS: Title for link to notice feed. FOAF stands for Friend of a Friend.
 #. TRANS: More information at http://www.foaf-project.org. %s is a user nickname.
-#: actions/showstream.php:159
 #, php-format
 msgid "FOAF for %s"
 msgstr ""
 
 #. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
-#: actions/showstream.php:205
 #, php-format
 msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr ""
 
 #. TRANS: Second sentence of empty list message for a stream for the user themselves.
-#: actions/showstream.php:211
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
@@ -5774,7 +4758,6 @@ msgstr ""
 
 #. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:215
 #, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
@@ -5783,7 +4766,6 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:258
 #, fuzzy, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5798,7 +4780,6 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:265
 #, fuzzy, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5809,306 +4790,246 @@ msgstr ""
 "blogging) المبنيه على البرنامج الحر [StatusNet](http://status.net/)."
 
 #. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
-#: actions/showstream.php:322
 #, php-format
 msgid "Repeat of %s"
 msgstr "تكرارات %s"
 
-#: actions/silence.php:65 actions/unsilence.php:65
 msgid "You cannot silence users on this site."
 msgstr "لا يمكنك إسكات المستخدمين على هذا الموقع."
 
-#: actions/silence.php:72
 msgid "User is already silenced."
 msgstr "المستخدم مسكت من قبل."
 
-#: actions/siteadminpanel.php:69
 #, fuzzy
 msgid "Basic settings for this StatusNet site"
 msgstr "الإعدادات الأساسيه لموقع StatusNet هذا."
 
-#: actions/siteadminpanel.php:133
 msgid "Site name must have non-zero length."
 msgstr "يجب ألا يكون طول اسم الموقع صفرًا."
 
-#: actions/siteadminpanel.php:141
 msgid "You must have a valid contact email address."
 msgstr "لازم يكون عندك عنوان ايميل صالح."
 
-#: actions/siteadminpanel.php:159
 #, php-format
 msgid "Unknown language \"%s\"."
 msgstr "لغه مش معروفه \"%s\"."
 
-#: actions/siteadminpanel.php:165
 #, fuzzy
 msgid "Minimum text limit is 0 (unlimited)."
 msgstr "حد النص الأدنى هو 140 حرفًا."
 
-#: actions/siteadminpanel.php:171
 msgid "Dupe limit must be one or more seconds."
 msgstr ""
 
-#: actions/siteadminpanel.php:221
 msgid "General"
 msgstr "عام"
 
-#: actions/siteadminpanel.php:224
 msgid "Site name"
 msgstr "اسم الموقع"
 
-#: actions/siteadminpanel.php:225
 msgid "The name of your site, like \"Yourcompany Microblog\""
 msgstr "اسم موقعك، \"التدوين المصغر لشركتك\" مثلا"
 
-#: actions/siteadminpanel.php:229
 msgid "Brought by"
 msgstr ""
 
-#: actions/siteadminpanel.php:230
 msgid "Text used for credits link in footer of each page"
 msgstr ""
 
-#: actions/siteadminpanel.php:234
 msgid "Brought by URL"
 msgstr ""
 
-#: actions/siteadminpanel.php:235
 msgid "URL used for credits link in footer of each page"
 msgstr ""
 
-#: actions/siteadminpanel.php:239
 msgid "Contact email address for your site"
 msgstr "عنوان البريد الإلكترونى للاتصال بموقعك"
 
-#: actions/siteadminpanel.php:245
 msgid "Local"
 msgstr "محلي"
 
-#: actions/siteadminpanel.php:256
 msgid "Default timezone"
 msgstr "المنطقه الزمنيه المبدئية"
 
-#: actions/siteadminpanel.php:257
 msgid "Default timezone for the site; usually UTC."
 msgstr "المنطقه الزمنيه المبدئيه للموقع؛ ت‌ع‌م عاده."
 
-#: actions/siteadminpanel.php:262
 msgid "Default language"
 msgstr "اللغه المفضلة"
 
-#: actions/siteadminpanel.php:263
 msgid "Site language when autodetection from browser settings is not available"
 msgstr ""
 
-#: actions/siteadminpanel.php:271
 msgid "Limits"
 msgstr "الحدود"
 
-#: actions/siteadminpanel.php:274
 msgid "Text limit"
 msgstr "حد النص"
 
-#: actions/siteadminpanel.php:274
 msgid "Maximum number of characters for notices."
 msgstr "أقصى عدد للحروف فى الإشعارات."
 
-#: actions/siteadminpanel.php:278
 #, fuzzy
 msgid "Dupe limit"
 msgstr "حد النص"
 
-#: actions/siteadminpanel.php:278
 msgid "How long users must wait (in seconds) to post the same thing again."
 msgstr ""
 
 #. TRANS: Page title for site-wide notice tab in admin panel.
-#: actions/sitenoticeadminpanel.php:55
 #, fuzzy
 msgid "Site Notice"
 msgstr "إشعار الموقع"
 
 #. TRANS: Instructions for site-wide notice tab in admin panel.
-#: actions/sitenoticeadminpanel.php:66
 #, fuzzy
 msgid "Edit site-wide message"
 msgstr "رساله جديدة"
 
 #. TRANS: Server error displayed when saving a site-wide notice was impossible.
-#: actions/sitenoticeadminpanel.php:101
 #, fuzzy
 msgid "Unable to save site notice."
 msgstr "مشكله أثناء حفظ الإشعار."
 
 #. TRANS: Client error displayed when a site-wide notice was longer than allowed.
-#: actions/sitenoticeadminpanel.php:112
 msgid "Maximum length for the site-wide notice is 255 characters."
 msgstr ""
 
 #. TRANS: Label for site-wide notice text field in admin panel.
-#: actions/sitenoticeadminpanel.php:176
 #, fuzzy
 msgid "Site notice text"
 msgstr "إشعار الموقع"
 
 #. TRANS: Tooltip for site-wide notice text field in admin panel.
-#: actions/sitenoticeadminpanel.php:179
 msgid "Site-wide notice text (255 characters maximum; HTML allowed)"
 msgstr ""
 
 #. TRANS: Title for button to save site notice in admin panel.
-#: actions/sitenoticeadminpanel.php:201
 #, fuzzy
 msgid "Save site notice."
 msgstr "إشعار الموقع"
 
 #. TRANS: Title for SMS settings.
-#: actions/smssettings.php:56
 msgid "SMS settings"
 msgstr "تظبيطات الـSMS"
 
 #. TRANS: SMS settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/smssettings.php:70
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr "لا يمكنك استلام رسائل قصيره عبر البريد الإلكرتونى من %%site.name%%."
 
 #. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
-#: actions/smssettings.php:92
 msgid "SMS is not available."
 msgstr "الرسائل القصيره غير متوفره."
 
 #. TRANS: Form legend for SMS settings form.
-#: actions/smssettings.php:106
 #, fuzzy
 msgid "SMS address"
 msgstr "عنوان الرساله الفوريه"
 
 #. TRANS: Form guide in SMS settings form.
-#: actions/smssettings.php:115
 #, fuzzy
 msgid "Current confirmed SMS-enabled phone number."
 msgstr "عنوان البريد الإلكترونى المُؤكد الحالى."
 
 #. TRANS: Form guide in IM settings form.
-#: actions/smssettings.php:128
 #, fuzzy
 msgid "Awaiting confirmation on this phone number."
 msgstr "هذا ليس رقم هاتفك."
 
 #. TRANS: Field label for SMS address input in SMS settings form.
-#: actions/smssettings.php:137
 msgid "Confirmation code"
 msgstr "رمز التأكيد"
 
 #. TRANS: Form field instructions in SMS settings form.
-#: actions/smssettings.php:139
 msgid "Enter the code you received on your phone."
 msgstr ""
 
 #. TRANS: Button label to confirm SMS confirmation code in SMS settings.
-#: actions/smssettings.php:143
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Confirm"
 msgstr "أكّد"
 
 #. TRANS: Field label for SMS phone number input in SMS settings form.
-#: actions/smssettings.php:148
 msgid "SMS phone number"
 msgstr "نمرة تليفون الـSMS"
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
-#: actions/smssettings.php:151
 msgid "Phone number, no punctuation or spaces, with area code."
 msgstr ""
 
 #. TRANS: Form legend for SMS preferences form.
-#: actions/smssettings.php:190
 msgid "SMS preferences"
 msgstr "حُفِظت التفضيلات."
 
 #. TRANS: Checkbox label in SMS preferences form.
-#: actions/smssettings.php:196
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
 msgstr ""
 
 #. TRANS: Confirmation message for successful SMS preferences save.
-#: actions/smssettings.php:307
 #, fuzzy
 msgid "SMS preferences saved."
 msgstr "حُفِظت التفضيلات."
 
 #. TRANS: Message given saving SMS phone number without having provided one.
-#: actions/smssettings.php:329
 msgid "No phone number."
 msgstr "لا رقم هاتف."
 
 #. TRANS: Message given saving SMS phone number without having selected a carrier.
-#: actions/smssettings.php:335
 #, fuzzy
 msgid "No carrier selected."
 msgstr "حُذف الإشعار."
 
 #. TRANS: Message given saving SMS phone number that is already set.
-#: actions/smssettings.php:343
 #, fuzzy
 msgid "That is already your phone number."
 msgstr "هذا ليس رقم هاتفك."
 
 #. TRANS: Message given saving SMS phone number that is already set for another user.
-#: actions/smssettings.php:347
 #, fuzzy
 msgid "That phone number already belongs to another user."
 msgstr "هذا البريد الإلكترونى ملك مستخدم آخر بالفعل."
 
 #. TRANS: Message given saving valid SMS phone number that is to be confirmed.
-#: actions/smssettings.php:375
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
 "for the code and instructions on how to use it."
 msgstr ""
 
 #. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
-#: actions/smssettings.php:403
 #, fuzzy
 msgid "That is the wrong confirmation number."
 msgstr "هذا ليس رقم هاتفك."
 
 #. TRANS: Message given after successfully canceling SMS phone number confirmation.
-#: actions/smssettings.php:417
 msgid "SMS confirmation cancelled."
 msgstr "لا رمز تأكيد."
 
 #. TRANS: Message given trying to remove an SMS phone number that is not
 #. TRANS: registered for the active user.
-#: actions/smssettings.php:437
 msgid "That is not your phone number."
 msgstr "هذا ليس رقم هاتفك."
 
 #. TRANS: Message given after successfully removing a registered SMS phone number.
-#: actions/smssettings.php:459
 #, fuzzy
 msgid "The SMS phone number was removed."
 msgstr "نمرة تليفون الـSMS"
 
 #. TRANS: Label for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:498
 msgid "Mobile carrier"
 msgstr ""
 
 #. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:503
 #, fuzzy
 msgid "Select a carrier"
 msgstr "اختر وسمًا لترشيحه"
 
 #. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
 #. TRANS: %s is an administrative contact's e-mail address.
-#: actions/smssettings.php:512
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -6116,122 +5037,97 @@ msgid ""
 msgstr ""
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
-#: actions/smssettings.php:534
 #, fuzzy
 msgid "No code entered."
 msgstr "لا محتوى!"
 
 #. TRANS: Menu item for site administration
-#: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
-#: lib/adminpanelaction.php:395
 msgid "Snapshots"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:65
 msgid "Manage snapshot configuration"
 msgstr "ضبط التصميم"
 
-#: actions/snapshotadminpanel.php:127
 msgid "Invalid snapshot run value."
 msgstr ""
 
-#: actions/snapshotadminpanel.php:133
 msgid "Snapshot frequency must be a number."
 msgstr ""
 
-#: actions/snapshotadminpanel.php:144
 #, fuzzy
 msgid "Invalid snapshot report URL."
 msgstr "مسار شعار غير صالح."
 
-#: actions/snapshotadminpanel.php:200
 msgid "Randomly during web hit"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:201
 msgid "In a scheduled job"
 msgstr "فى مهمه مُجدولة"
 
-#: actions/snapshotadminpanel.php:206
 msgid "Data snapshots"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:208
 msgid "When to send statistical data to status.net servers"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:217
 msgid "Frequency"
 msgstr "التكرار"
 
-#: actions/snapshotadminpanel.php:218
 msgid "Snapshots will be sent once every N web hits"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:226
 msgid "Report URL"
 msgstr "بلّغ عن المسار"
 
-#: actions/snapshotadminpanel.php:227
 msgid "Snapshots will be sent to this URL"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:248
 #, fuzzy
 msgid "Save snapshot settings"
 msgstr "اذف إعدادت الموقع"
 
 #. TRANS: Client error displayed trying a change a subscription for a non-subscribed profile.
-#: actions/subedit.php:75
 #, fuzzy
 msgid "You are not subscribed to that profile."
 msgstr "لست مُشتركًا بأى أحد."
 
 #. TRANS: Server error displayed when updating a subscription fails with a database error.
 #. TRANS: Exception thrown when a subscription could not be stored on the server.
-#: actions/subedit.php:89 classes/Subscription.php:141
 msgid "Could not save subscription."
 msgstr "تعذّر حفظ الاشتراك."
 
 #. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
-#: actions/subscribe.php:121
 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
 msgstr ""
 
 #. TRANS: Page title when subscription succeeded.
-#: actions/subscribe.php:149
 msgid "Subscribed"
 msgstr "مُشترك"
 
 #. TRANS: Header for list of subscribers for a user (first page).
 #. TRANS: %s is the user's nickname.
-#: actions/subscribers.php:51
 #, php-format
 msgid "%s subscribers"
 msgstr "مشتركو %s"
 
 #. TRANS: Header for list of subscribers for a user (not first page).
 #. TRANS: %1$s is the user's nickname, $2$d is the page number.
-#: actions/subscribers.php:55
 #, php-format
 msgid "%1$s subscribers, page %2$d"
 msgstr "%1$s مشتركين, صفحه %2$d"
 
 #. TRANS: Page notice for page with an overview of all subscribers
 #. TRANS: of the logged in user's own profile.
-#: actions/subscribers.php:68
 msgid "These are the people who listen to your notices."
 msgstr "هؤلاء هم الأشخاص الذين يستمعون إلى إشعاراتك."
 
 #. TRANS: Page notice for page with an overview of all subscribers of a user other
 #. TRANS: than the logged in user. %s is the user nickname.
-#: actions/subscribers.php:74
 #, fuzzy, php-format
 msgid "These are the people who listen to %s's notices."
 msgstr "هؤلاء هم الأشخاص الذين يستمعون إلى إشعاراتك."
 
 #. TRANS: Subscriber list text when the logged in user has no subscribers.
-#: actions/subscribers.php:114
 msgid ""
 "You have no subscribers. Try subscribing to people you know and they might "
 "return the favor."
@@ -6239,7 +5135,6 @@ msgstr ""
 
 #. TRANS: Subscriber list text when looking at the subscribers for a of a user other
 #. TRANS: than the logged in user that has no subscribers. %s is the user nickname.
-#: actions/subscribers.php:118
 #, php-format
 msgid "%s has no subscribers. Want to be the first?"
 msgstr ""
@@ -6249,7 +5144,6 @@ msgstr ""
 #. TRANS: This message contains a Markdown URL. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.
-#: actions/subscribers.php:127
 #, php-format
 msgid ""
 "%s has no subscribers. Why not [register an account](%%%%action.register%%%"
@@ -6258,20 +5152,17 @@ msgstr ""
 
 #. TRANS: Header for subscriptions overview for a user (not first page).
 #. TRANS: %1$s is a user nickname, %2$d is the page number.
-#: actions/subscriptions.php:55
 #, php-format
 msgid "%1$s subscriptions, page %2$d"
 msgstr "%1$s اشتراكات, صفحه %2$d"
 
 #. TRANS: Page notice for page with an overview of all subscriptions
 #. TRANS: of the logged in user's own profile.
-#: actions/subscriptions.php:68
 msgid "These are the people whose notices you listen to."
 msgstr "هؤلاء الأشخاص الذى تستمع إليهم."
 
 #. TRANS: Page notice for page with an overview of all subscriptions of a user other
 #. TRANS: than the logged in user. %s is the user nickname.
-#: actions/subscriptions.php:74
 #, php-format
 msgid "These are the people whose notices %s listens to."
 msgstr "هؤلاء الأشخاص الذى يستمع %s إليهم."
@@ -6280,7 +5171,6 @@ 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.
-#: actions/subscriptions.php:133
 #, php-format
 msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "
@@ -6294,294 +5184,235 @@ msgstr ""
 #. TRANS: than the logged in user that has no subscriptions. %s is the user nickname.
 #. TRANS: Subscription list text when looking at the subscriptions for a of a user that has none
 #. TRANS: as an anonymous user. %s is the user nickname.
-#: actions/subscriptions.php:141 actions/subscriptions.php:147
 #, fuzzy, php-format
 msgid "%s is not listening to anyone."
 msgstr "لست مُشتركًا بأى أحد."
 
 #. TRANS: Atom feed title. %s is a profile nickname.
-#: actions/subscriptions.php:176
 #, fuzzy, php-format
 msgid "Subscription feed for %s (Atom)"
 msgstr "الردود على %s"
 
 #. TRANS: Checkbox label for enabling Jabber messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:241 lib/settingsnav.php:110
-#, fuzzy
 msgid "IM"
 msgstr "محادثه فورية"
 
 #. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:256 lib/settingsnav.php:117
 msgid "SMS"
 msgstr "رسائل قصيرة"
 
 #. TRANS: Title for all but the first page of notices with tags.
 #. TRANS: %1$s is the tag, %2$d is the page number.
-#: actions/tag.php:73
 #, fuzzy, php-format
 msgid "Notices tagged with %1$s, page %2$d"
 msgstr "الإشعارات الموسومه ب%s"
 
-#: actions/tag.php:91
 #, php-format
 msgid "Notice feed for tag %s (RSS 1.0)"
 msgstr ""
 
-#: actions/tag.php:97
 #, php-format
 msgid "Notice feed for tag %s (RSS 2.0)"
 msgstr ""
 
-#: actions/tag.php:103
 #, php-format
 msgid "Notice feed for tag %s (Atom)"
 msgstr ""
 
-#: actions/tagother.php:39
 msgid "No ID argument."
 msgstr "لا مدخل هويه."
 
-#: actions/tagother.php:65
 #, fuzzy, php-format
 msgid "Tag %s"
 msgstr "الوسوم"
 
 #. TRANS: H2 for user profile information.
-#: actions/tagother.php:77 lib/userprofile.php:76
 msgid "User profile"
 msgstr "ملف المستخدم الشخصي"
 
-#: actions/tagother.php:120
 msgid "Tag user"
 msgstr "اعمل tag لليوزر"
 
-#: actions/tagother.php:130
 msgid ""
 "Tags for this user (letters, numbers, -, ., and _), comma- or space- "
 "separated"
 msgstr ""
 
-#: actions/tagother.php:157
 #, php-format
 msgid "Invalid tag: \"%s\""
 msgstr "وسم غير صالح: \"%s\""
 
-#: actions/tagother.php:172
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 
-#: actions/tagother.php:215
 #, fuzzy
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr "استعمل الفورمه دى علشان تعدّل الapplication بتاعتك."
 
-#: actions/tagrss.php:35
 msgid "No such tag."
 msgstr "لا وسم كهذا."
 
 #. TRANS: Client error displayed when trying to unblock a non-blocked user.
-#: actions/unblock.php:59
 msgid "You haven't blocked that user."
 msgstr "لم تمنع هذا المستخدم."
 
-#: actions/unsandbox.php:72
 msgid "User is not sandboxed."
 msgstr "اليوزر مش فى السبوره."
 
-#: actions/unsilence.php:72
 msgid "User is not silenced."
 msgstr "المستخدم ليس مُسكتًا."
 
-#: actions/unsubscribe.php:77
 #, fuzzy
 msgid "No profile ID in request."
 msgstr "ما فيش طلب تسجيل دخول مطلوب."
 
-#: actions/unsubscribe.php:98
 #, fuzzy
 msgid "Unsubscribed"
 msgstr "ألغِ الاشتراك"
 
-#: actions/updateprofile.php:64
 #, php-format
 msgid ""
 "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
 msgstr ""
 
-#: actions/urlsettings.php:60
 #, fuzzy
 msgid "URL settings"
 msgstr "تظبيطات بعت الرسايل الفوريه"
 
 #. TRANS: Instructions for tab "Other" in user profile settings.
-#: actions/urlsettings.php:72
 msgid "Manage various other options."
 msgstr "أدر خيارات أخرى عديده."
 
 #. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
 #. TRANS: user's profile settings. This message has one space at the beginning. Use your
 #. TRANS: language's word separator here if it has one (most likely a single space).
-#: actions/urlsettings.php:115
 msgid " (free service)"
 msgstr " (خدمه حرة)"
 
-#: actions/urlsettings.php:121
 #, fuzzy
 msgid "[none]"
 msgstr "لا شيء"
 
-#: actions/urlsettings.php:122
 msgid "[internal]"
 msgstr ""
 
 #. TRANS: Label for dropdown with URL shortener services.
-#: actions/urlsettings.php:130
 msgid "Shorten URLs with"
 msgstr "قصّر المسارات بـ"
 
 #. TRANS: Tooltip for for dropdown with URL shortener services.
-#: actions/urlsettings.php:132
 msgid "Automatic shortening service to use."
 msgstr "خدمه التقصير المطلوب استخدامها."
 
-#: actions/urlsettings.php:138
 msgid "URL longer than"
 msgstr ""
 
-#: actions/urlsettings.php:141
 msgid "URLs longer than this will be shortened, 0 means always shorten."
 msgstr ""
 
-#: actions/urlsettings.php:145
 msgid "Text longer than"
 msgstr ""
 
-#: actions/urlsettings.php:148
 msgid ""
 "URLs in notices longer than this will be shortened, 0 means always shorten."
 msgstr ""
 
 #. TRANS: Form validation error for form "Other settings" in user profile.
-#: actions/urlsettings.php:180
 #, fuzzy
 msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr "الاسم الكامل طويل جدا (الأقصى 255 حرفًا)"
 
-#: actions/urlsettings.php:187
 msgid "Invalid number for max url length."
 msgstr ""
 
-#: actions/urlsettings.php:193
 #, fuzzy
 msgid "Invalid number for max notice length."
 msgstr "حجم غير صالح."
 
-#: actions/urlsettings.php:238
 msgid "Error saving user URL shortening preferences."
 msgstr ""
 
 #. TRANS: User admin panel title
-#: actions/useradminpanel.php:58
 #, fuzzy
 msgctxt "TITLE"
 msgid "User"
 msgstr "المستخدم"
 
 #. TRANS: Instruction for user admin panel.
-#: actions/useradminpanel.php:69
 msgid "User settings for this StatusNet site"
 msgstr ""
 
 #. TRANS: Form validation error in user admin panel when a non-numeric character limit was set.
-#: actions/useradminpanel.php:147
 msgid "Invalid bio limit. Must be numeric."
 msgstr ""
 
 #. TRANS: Form validation error in user admin panel when welcome text is too long.
-#: actions/useradminpanel.php:154
 #, fuzzy
 msgid "Invalid welcome text. Maximum length is 255 characters."
 msgstr "رساله ترحيب غير صالحه. أقصى طول هو 255 حرف."
 
 #. TRANS: Client error displayed when trying to set a non-existing user as default subscription for new
 #. TRANS: users in user admin panel. %1$s is the invalid nickname.
-#: actions/useradminpanel.php:166
 #, php-format
 msgid "Invalid default subscripton: \"%1$s\" is not a user."
 msgstr ""
 
-#: actions/useradminpanel.php:215 lib/action.php:565 lib/settingsnav.php:77
-#: lib/subgroupnav.php:81
 msgid "Profile"
 msgstr "الملف الشخصي"
 
 #. TRANS: Field label in user admin panel for setting the character limit for the bio field.
-#: actions/useradminpanel.php:220
 msgid "Bio Limit"
 msgstr "حد السيرة"
 
 #. TRANS: Tooltip in user admin panel for setting the character limit for the bio field.
-#: actions/useradminpanel.php:222
 msgid "Maximum length of a profile bio in characters."
 msgstr ""
 
 #. TRANS: Form legend in user admin panel.
-#: actions/useradminpanel.php:231
 msgid "New users"
 msgstr "مستخدمون جدد"
 
 #. TRANS: Field label in user admin panel for setting new user welcome text.
-#: actions/useradminpanel.php:236
 msgid "New user welcome"
 msgstr "ترحيب المستخدمين الجدد"
 
 #. TRANS: Tooltip in user admin panel for setting new user welcome text.
-#: actions/useradminpanel.php:238
 #, fuzzy
 msgid "Welcome text for new users (maximum 255 characters)."
 msgstr "نص الترحيب بالمستخدمين الجدد (255 حرفًا كحد أقصى)."
 
 #. TRANS: Field label in user admin panel for setting default subscription for new users.
-#: actions/useradminpanel.php:244
 msgid "Default subscription"
 msgstr "الاشتراك المبدئي"
 
 #. TRANS: Tooltip in user admin panel for setting default subscription for new users.
-#: actions/useradminpanel.php:246
 msgid "Automatically subscribe new users to this user."
 msgstr "أشرك المستخدمين الجدد بهذا المستخدم تلقائيًا."
 
 #. TRANS: Form legend in user admin panel.
-#: actions/useradminpanel.php:256
 msgid "Invitations"
 msgstr "الدعوات"
 
 #. TRANS: Field label for checkbox in user admin panel for allowing users to invite friend using site e-mail.
-#: actions/useradminpanel.php:262
 msgid "Invitations enabled"
 msgstr "الدعوات مُفعلة"
 
 #. TRANS: Tooltip for checkbox in user admin panel for allowing users to invite friend using site e-mail.
-#: actions/useradminpanel.php:265
 msgid "Whether to allow users to invite new users."
 msgstr ""
 
 #. TRANS: Title for button to save user settings in user admin panel.
-#: actions/useradminpanel.php:302
 #, fuzzy
 msgid "Save user settings."
 msgstr "اذف إعدادت الموقع"
 
 #. TRANS: Page title.
-#: actions/userauthorization.php:109
 #, fuzzy
 msgid "Authorize subscription"
 msgstr "جميع الاشتراكات"
 
 #. TRANS: Page notice on "Auhtorize subscription" page.
-#: actions/userauthorization.php:115
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
 "user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
@@ -6589,43 +5420,36 @@ msgid ""
 msgstr ""
 
 #. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:200
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Accept"
 msgstr "اقبل"
 
 #. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:202
 #, fuzzy
 msgid "Subscribe to this user."
 msgstr "اشترك بهذا المستخدم"
 
 #. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:204
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Reject"
 msgstr "ارفض"
 
 #. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:206
 #, fuzzy
 msgid "Reject this subscription."
 msgstr "ارفض هذا الاشتراك"
 
 #. TRANS: Client error displayed for an empty authorisation request.
-#: actions/userauthorization.php:219
 msgid "No authorization request!"
 msgstr "لا طلب استيثاق!"
 
 #. TRANS: Accept message header from Authorise subscription page.
-#: actions/userauthorization.php:242
 #, fuzzy
 msgid "Subscription authorized"
 msgstr "رُفض الاشتراك"
 
-#: actions/userauthorization.php:245
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to authorize the "
@@ -6633,11 +5457,9 @@ msgid ""
 msgstr ""
 
 #. TRANS: Reject message header from Authorise subscription page.
-#: actions/userauthorization.php:256
 msgid "Subscription rejected"
 msgstr "رُفض الاشتراك"
 
-#: actions/userauthorization.php:259
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to fully reject the "
@@ -6646,35 +5468,30 @@ msgstr ""
 
 #. TRANS: Exception thrown when no valid user is found for an authorisation request.
 #. TRANS: %s is a listener URI.
-#: actions/userauthorization.php:296
 #, php-format
 msgid "Listener URI \"%s\" not found here."
 msgstr ""
 
 #. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
 #. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:303
 #, fuzzy, php-format
 msgid "Listenee URI \"%s\" is too long."
 msgstr "الSource URL مش مظبوط."
 
 #. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
 #. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:311
 #, php-format
 msgid "Listenee URI \"%s\" is a local user."
 msgstr ""
 
 #. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
 #. TRANS: %s is a profile URL.
-#: actions/userauthorization.php:329
 #, php-format
 msgid "Profile URL \"%s\" is for a local user."
 msgstr ""
 
 #. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
 #. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
-#: actions/userauthorization.php:339
 #, php-format
 msgid ""
 "Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
@@ -6683,75 +5500,61 @@ msgstr ""
 
 #. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
 #. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:349
 #, fuzzy, php-format
 msgid "Avatar URL \"%s\" is not valid."
 msgstr "الSource URL مش مظبوط."
 
 #. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
 #. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:356
 #, php-format
 msgid "Cannot read avatar URL \"%s\"."
 msgstr ""
 
 #. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
 #. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:363
 #, php-format
 msgid "Wrong image type for avatar URL \"%s\"."
 msgstr ""
 
 #. TRANS: Page title for profile design page.
-#: actions/userdesignsettings.php:74 lib/designsettings.php:61
 msgid "Profile design"
 msgstr "تصميم الملف الشخصي"
 
 #. TRANS: Instructions for profile design page.
-#: actions/userdesignsettings.php:84 lib/designsettings.php:72
 msgid ""
 "Customize the way your profile looks with a background image and a colour "
 "palette of your choice."
 msgstr ""
 
-#: actions/userdesignsettings.php:289
 msgid "Enjoy your hotdog!"
 msgstr "استمتع بالنقانق!"
 
-#: actions/userdesignsettings.php:325
 #, fuzzy
 msgid "Design settings"
 msgstr "اذف إعدادت الموقع"
 
-#: actions/userdesignsettings.php:340
 msgid "View profile designs"
 msgstr "اعرض تصاميم الملف الشخصي"
 
-#: actions/userdesignsettings.php:341
 msgid "Show or hide profile designs."
 msgstr "أظهر أو أخفِ تصاميم الملفات الشخصيه."
 
-#: actions/userdesignsettings.php:348
 #, fuzzy
 msgid "Background file"
 msgstr "الخلفية"
 
 #. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number.
-#: actions/usergroups.php:66
 #, php-format
 msgid "%1$s groups, page %2$d"
 msgstr "%1$s اعضاء الجروپ, صفحه %2$d"
 
-#: actions/usergroups.php:132
 msgid "Search for more groups"
 msgstr ""
 
-#: actions/usergroups.php:159
 #, fuzzy, php-format
 msgid "%s is not a member of any group."
 msgstr "المستخدم ليس عضوًا فى المجموعه."
 
-#: actions/usergroups.php:164
 #, php-format
 msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
 msgstr ""
@@ -6761,35 +5564,28 @@ msgstr ""
 #. TRANS: %1$s is a group name, %2$s is a site name.
 #. TRANS: Message is used as a subtitle in atom user notice feed.
 #. TRANS: %1$s is a user name, %2$s is a site name.
-#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:70
-#: lib/atomusernoticefeed.php:95
 #, fuzzy, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr "نتايج التدوير لـ\"%1$s\" على %2$s"
 
-#: actions/version.php:75
 #, php-format
 msgid "StatusNet %s"
 msgstr "StatusNet %s"
 
-#: actions/version.php:155
 #, php-format
 msgid ""
 "This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
 "Inc. and contributors."
 msgstr ""
 
-#: actions/version.php:163
 #, fuzzy
 msgid "Contributors"
 msgstr "كونيكشونات (Connections)"
 
 #. TRANS: Menu item for site administration
-#: actions/version.php:167 lib/adminpanelaction.php:403
 msgid "License"
 msgstr "الرخصة"
 
-#: actions/version.php:170
 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 "
@@ -6797,7 +5593,6 @@ msgid ""
 "any later version. "
 msgstr ""
 
-#: actions/version.php:176
 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 "
@@ -6805,7 +5600,6 @@ msgid ""
 "for more details. "
 msgstr ""
 
-#: actions/version.php:182
 #, php-format
 msgid ""
 "You should have received a copy of the GNU Affero General Public License "
@@ -6813,52 +5607,42 @@ msgid ""
 msgstr ""
 
 #. TRANS: Form input field label for application name.
-#: actions/version.php:197 lib/applicationeditform.php:190
 msgid "Name"
 msgstr "الاسم"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:885
 msgid "Version"
 msgstr "النسخه"
 
-#: actions/version.php:199
 msgid "Author(s)"
 msgstr "المؤلف/ين"
 
 #. TRANS: Form input field label.
-#: actions/version.php:200 lib/applicationeditform.php:208
-#: lib/groupeditform.php:168
 msgid "Description"
 msgstr "الوصف"
 
 #. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:164
 msgid "Favor"
 msgstr "فضّل"
 
 #. TRANS: Ntofication given when a user marks a notice as favorite.
 #. TRANS: %1$s is a user nickname or full name, %2$s is a notice URI.
-#: classes/Fave.php:167
 #, fuzzy, php-format
 msgid "%1$s marked notice %2$s as a favorite."
 msgstr "أرسل لى بريدًا إلكرتونيًا عندما يضيف أحدهم إشعارى مفضله."
 
 #. TRANS: Server exception thrown when a URL cannot be processed.
-#: classes/File.php:162
 #, php-format
 msgid "Cannot process URL '%s'"
 msgstr ""
 
 #. TRANS: Server exception thrown when... Robin thinks something is impossible!
-#: classes/File.php:194
 msgid "Robin thinks something is impossible."
 msgstr ""
 
 #. 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$s is used for plural.
-#: classes/File.php:210
 #, php-format
 msgid ""
 "No file may be larger than %1$d byte and the file you sent was %2$d bytes. "
@@ -6875,7 +5659,6 @@ msgstr[5] ""
 
 #. TRANS: Message given if an upload would exceed user quota.
 #. TRANS: %d (number) is the user quota in bytes and is used for plural.
-#: classes/File.php:223
 #, php-format
 msgid "A file this large would exceed your user quota of %d byte."
 msgid_plural "A file this large would exceed your user quota of %d bytes."
@@ -6888,7 +5671,6 @@ msgstr[5] ""
 
 #. TRANS: Message given id an upload would exceed a user's monthly quota.
 #. TRANS: $d (number) is the monthly user quota in bytes and is used for plural.
-#: classes/File.php:235
 #, php-format
 msgid "A file this large would exceed your monthly quota of %d byte."
 msgid_plural "A file this large would exceed your monthly quota of %d bytes."
@@ -6900,161 +5682,134 @@ msgstr[4] ""
 msgstr[5] ""
 
 #. TRANS: Client exception thrown if a file upload does not have a valid name.
-#: classes/File.php:282 classes/File.php:297
 #, fuzzy
 msgid "Invalid filename."
 msgstr "حجم غير صالح."
 
 #. TRANS: Exception thrown when joining a group fails.
-#: classes/Group_member.php:51
 msgid "Group join failed."
 msgstr "دخول الجروپ فشل."
 
 #. TRANS: Exception thrown when trying to leave a group the user is not a member of.
-#: classes/Group_member.php:64
 msgid "Not part of group."
 msgstr "مش جزء من الجروپ."
 
 #. TRANS: Exception thrown when trying to leave a group fails.
-#: classes/Group_member.php:72
 msgid "Group leave failed."
 msgstr "الخروج من الجروپ فشل."
 
 #. TRANS: Exception thrown providing an invalid profile ID.
 #. TRANS: %s is the invalid profile ID.
-#: classes/Group_member.php:85
 #, php-format
 msgid "Profile ID %s is invalid."
 msgstr ""
 
 #. TRANS: Exception thrown providing an invalid group ID.
 #. TRANS: %s is the invalid group ID.
-#: classes/Group_member.php:98
 #, fuzzy, php-format
 msgid "Group ID %s is invalid."
 msgstr "خطأ أثناء حفظ المستخدم؛ غير صالح."
 
 #. TRANS: Activity title.
-#: classes/Group_member.php:147 lib/joinform.php:114
 msgid "Join"
 msgstr "انضم"
 
 #. TRANS: Success message for subscribe to group attempt through OStatus.
 #. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
-#: classes/Group_member.php:151
 #, php-format
 msgid "%1$s has joined group %2$s."
 msgstr ""
 
 #. TRANS: Server exception thrown when updating a local group fails.
-#: classes/Local_group.php:42
 #, fuzzy
 msgid "Could not update local group."
 msgstr "تعذر تحديث المجموعه."
 
 #. TRANS: Exception thrown when trying creating a login token failed.
 #. TRANS: %s is the user nickname for which token creation failed.
-#: classes/Login_token.php:78
 #, php-format
 msgid "Could not create login token for %s"
 msgstr "ما نفعش يتعمل امارة تسجيل دخول لـ %s"
 
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
-#: classes/Memcached_DataObject.php:556
 msgid "No database name or DSN found anywhere."
 msgstr ""
 
 #. TRANS: Client exception thrown when a user tries to send a direct message while being banned from sending them.
-#: classes/Message.php:45
 msgid "You are banned from sending direct messages."
 msgstr "أنت ممنوع من إرسال رسائل مباشره."
 
 #. TRANS: Message given when a message could not be stored on the server.
-#: classes/Message.php:69
 msgid "Could not insert message."
 msgstr "تعذّر إدراج الرساله."
 
 #. TRANS: Message given when a message could not be updated on the server.
-#: classes/Message.php:80
 #, fuzzy
 msgid "Could not update message with new URI."
 msgstr "تعذّر تحليل الرساله."
 
 #. TRANS: Server exception thrown when a user profile for a notice cannot be found.
 #. TRANS: %1$d is a profile ID (number), %2$d is a notice ID (number).
-#: classes/Notice.php:98
 #, php-format
 msgid "No such profile (%1$d) for notice (%2$d)."
 msgstr ""
 
 #. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:199
 #, php-format
 msgid "Database error inserting hashtag: %s"
 msgstr "خطأ فى إدراج الأفتار"
 
 #. TRANS: Client exception thrown if a notice contains too many characters.
-#: classes/Notice.php:279
 msgid "Problem saving notice. Too long."
 msgstr "مشكله فى حفظ الإشعار. طويل جدًا."
 
 #. TRANS: Client exception thrown when trying to save a notice for an unknown user.
-#: classes/Notice.php:284
 msgid "Problem saving notice. Unknown user."
 msgstr "مشكله فى حفظ الإشعار. مستخدم غير معروف."
 
 #. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
-#: classes/Notice.php:290
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 
 #. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
-#: classes/Notice.php:297
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
 "few minutes."
 msgstr ""
 
 #. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:305
 #, fuzzy
 msgid "You are banned from posting notices on this site."
 msgstr "أنت ممنوع من إرسال رسائل مباشره."
 
 #. TRANS: Server exception thrown when a notice cannot be saved.
 #. TRANS: Server exception thrown when a notice cannot be updated.
-#: classes/Notice.php:372 classes/Notice.php:399
 msgid "Problem saving notice."
 msgstr "مشكله أثناء حفظ الإشعار."
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:929
 msgid "Bad type provided to saveKnownGroups."
 msgstr ""
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:1028
 #, fuzzy
 msgid "Problem saving group inbox."
 msgstr "مشكله أثناء حفظ الإشعار."
 
 #. TRANS: Server exception thrown when a reply cannot be saved.
 #. TRANS: %1$d is a notice ID, %2$d is the ID of the mentioned user.
-#: classes/Notice.php:1144
 #, fuzzy, php-format
 msgid "Could not save reply for %1$d, %2$d."
 msgstr "تعذّر حفظ الاشتراك."
 
 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1663
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "آر تى @%1$s %2$s"
 
 #. TRANS: Full name of a profile or group followed by nickname in parens
-#: classes/Profile.php:172 classes/User_group.php:242
 #, fuzzy, php-format
 msgctxt "FANCYNAME"
 msgid "%1$s (%2$s)"
@@ -7062,266 +5817,212 @@ msgstr "%1$s (%2$s)"
 
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:779
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:788
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
 
 #. TRANS: Exception thrown when a right for a non-existing user profile is checked.
-#: classes/Remote_profile.php:54
 #, fuzzy
 msgid "Missing profile."
 msgstr "ليس للمستخدم ملف شخصى."
 
 #. TRANS: Exception thrown when a tag cannot be saved.
-#: classes/Status_network.php:338
 msgid "Unable to save tag."
 msgstr "تعذّر حفظ الوسوم."
 
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#: classes/Subscription.php:77 lib/oauthstore.php:482
 msgid "You have been banned from subscribing."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to subscribe while already subscribed.
-#: classes/Subscription.php:82
 msgid "Already subscribed!"
 msgstr "مُشترك أصلا!"
 
 #. TRANS: Exception thrown when trying to subscribe to a user who has blocked the subscribing user.
-#: classes/Subscription.php:87
 msgid "User has blocked you."
 msgstr "لقد منعك المستخدم."
 
 #. TRANS: Exception thrown when trying to unsibscribe without a subscription.
-#: classes/Subscription.php:176
 msgid "Not subscribed!"
 msgstr "غير مشترك!"
 
 #. TRANS: Exception thrown when trying to unsubscribe a user from themselves.
-#: classes/Subscription.php:183
 msgid "Could not delete self-subscription."
 msgstr "تعذّر حفظ الاشتراك."
 
 #. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
-#: classes/Subscription.php:211
 msgid "Could not delete subscription OMB token."
 msgstr "تعذّر حفظ الاشتراك."
 
 #. TRANS: Exception thrown when a subscription could not be deleted on the server.
-#: classes/Subscription.php:223
 msgid "Could not delete subscription."
 msgstr "تعذّر حفظ الاشتراك."
 
 #. TRANS: Activity tile when subscribing to another person.
-#: classes/Subscription.php:265
 msgid "Follow"
 msgstr ""
 
 #. TRANS: Notification given when one person starts following another.
 #. TRANS: %1$s is the subscriber, %2$s is the subscribed.
-#: classes/Subscription.php:268
 #, fuzzy, php-format
 msgid "%1$s is now following %2$s."
 msgstr "هؤلاء هم الأشخاص الذين يستمعون إلى إشعاراتك."
 
 #. TRANS: Notice given on user registration.
 #. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:390
 #, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr "أهلا بكم فى %1$s يا @%2$s!"
 
 #. TRANS: Server exception.
-#: classes/User.php:923
 msgid "No single user defined for single-user mode."
 msgstr ""
 
 #. TRANS: Server exception.
-#: classes/User.php:927
 msgid "Single-user mode code called when not enabled."
 msgstr ""
 
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:522
 msgid "Could not create group."
 msgstr "تعذّر إنشاء المجموعه."
 
 #. TRANS: Server exception thrown when updating a group URI failed.
-#: classes/User_group.php:532
 msgid "Could not set group URI."
 msgstr "تعذّر إنشاء المجموعه."
 
 #. TRANS: Server exception thrown when setting group membership failed.
-#: classes/User_group.php:555
 msgid "Could not set group membership."
 msgstr "تعذّر ضبط عضويه المجموعه."
 
 #. TRANS: Server exception thrown when saving local group information failed.
-#: classes/User_group.php:570
 #, fuzzy
 msgid "Could not save local group info."
 msgstr "تعذّر حفظ الاشتراك."
 
 #. TRANS: Exception thrown when an account could not be located when it should be moved.
 #. TRANS: %s is the remote site.
-#: lib/accountmover.php:65
 #, fuzzy, php-format
 msgid "Cannot locate account %s."
 msgstr "لا يمكنك حذف المستخدمين."
 
 #. TRANS: Exception thrown when a service document could not be located account move.
 #. TRANS: %s is the remote site.
-#: lib/accountmover.php:106
 #, php-format
 msgid "Cannot find XRD for %s."
 msgstr ""
 
 #. TRANS: Exception thrown when an account could not be located when it should be moved.
 #. TRANS: %s is the remote site.
-#: lib/accountmover.php:131
 #, php-format
 msgid "No AtomPub API service for %s."
 msgstr ""
 
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: lib/action.php:161
 #, php-format
 msgid "%1$s - %2$s"
 msgstr "%1$s - %2$s"
 
 #. TRANS: Page title for a page without a title set.
-#: lib/action.php:177
 msgid "Untitled page"
 msgstr "صفحه غير مُعنونة"
 
 #. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.
-#: lib/action.php:325
 msgctxt "TOOLTIP"
 msgid "Show more"
 msgstr ""
 
 #. TRANS: Inline reply form submit button: submits a reply comment.
-#: lib/action.php:328
 #, fuzzy
 msgctxt "BUTTON"
-msgid "Comment"
-msgstr "المحتوى"
+msgid "Reply"
+msgstr "رُد"
 
 #. TRANS: Placeholder text for inline reply form. Clicking in this box will turn it into a mini notice form.
-#: lib/action.php:331
-msgid "Add a comment..."
+msgid "Write a reply..."
 msgstr ""
 
-#: lib/action.php:559 lib/personalgroupnav.php:99
-#, fuzzy
 msgid "Home"
-msgstr "الصفحه الرئيسية"
+msgstr "الرئيسية"
 
-#: lib/action.php:560
 #, fuzzy
 msgid "Friends timeline"
 msgstr "مسار %s الزمني"
 
-#: lib/action.php:566
 #, fuzzy
 msgid "Your profile"
 msgstr "ملف المجموعه الشخصي"
 
-#: lib/action.php:570 lib/action.php:593 lib/publicgroupnav.php:78
 msgid "Public"
 msgstr "عام"
 
-#: lib/action.php:571 lib/action.php:594
 #, fuzzy
 msgid "Everyone on this site"
 msgstr "ابحث عن أشخاص على هذا الموقع"
 
-#: lib/action.php:575
 #, fuzzy
 msgid "Settings"
 msgstr "تظبيطات الـSMS"
 
-#: lib/action.php:576
 #, fuzzy
 msgid "Change your personal settings"
 msgstr "غيّر إعدادات ملفك الشخصي"
 
-#: lib/action.php:582
 #, fuzzy
 msgid "Site configuration"
 msgstr "ضبط المسارات"
 
-#: lib/action.php:587
-#, fuzzy
 msgid "Logout"
-msgstr "الشعار"
+msgstr "اخرج"
 
-#: lib/action.php:588
-#, fuzzy
 msgid "Logout from the site"
-msgstr "سمه الموقع."
+msgstr "اخرج من الموقع"
 
-#: lib/action.php:599
-#, fuzzy
 msgid "Login to the site"
 msgstr "لُج إلى الموقع"
 
-#: lib/action.php:606
-#, fuzzy
 msgid "Search"
 msgstr "ابحث"
 
-#: lib/action.php:607
 #, fuzzy
 msgid "Search the site"
 msgstr "ابحث فى الموقع"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:864
 msgid "Help"
 msgstr "مساعدة"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:867
 msgid "About"
 msgstr "عن"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:870
 msgid "FAQ"
 msgstr "الأسئله المكررة"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:875
 msgid "TOS"
 msgstr "الشروط"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:879
 msgid "Privacy"
 msgstr "خصوصية"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:882
 msgid "Source"
 msgstr "المصدر"
 
 #. TRANS: Secondary navigation menu option leading to e-mail contact information on the
 #. TRANS: StatusNet site, where to report bugs, ...
-#: lib/action.php:889
 msgid "Contact"
 msgstr "اتصل"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:892
 #, fuzzy
 msgid "Badge"
 msgstr "نبّه"
@@ -7330,7 +6031,6 @@ msgstr "نبّه"
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:921
 #, fuzzy, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7340,7 +6040,6 @@ msgstr ""
 "broughtbyurl%%). "
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:924
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr ""
@@ -7349,7 +6048,6 @@ msgstr ""
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:931
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7362,106 +6060,88 @@ msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:949
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:956
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:960
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:992
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1335
 msgid "After"
 msgstr "بعد"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1345
 msgid "Before"
 msgstr "قبل"
 
 #. TRANS: Client exception thrown when a feed instance is a DOMDocument.
-#: lib/activity.php:125
 msgid "Expecting a root feed element but got a whole XML document."
 msgstr ""
 
 #. TRANS: Client exception thrown when using an unknown verb for the activity importer.
-#: lib/activityimporter.php:81
 #, fuzzy, php-format
 msgid "Unknown verb: \"%s\"."
 msgstr "لغه مش معروفه \"%s\"."
 
 #. TRANS: Client exception thrown when trying to force a subscription for an untrusted user.
-#: lib/activityimporter.php:107
 msgid "Cannot force subscription for untrusted user."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to for a remote user to subscribe.
-#: lib/activityimporter.php:117
 #, fuzzy
 msgid "Cannot force remote user to subscribe."
 msgstr "تعذّر تحديث المستخدم."
 
 #. TRANS: Client exception thrown when trying to subscribe to an unknown profile.
-#: lib/activityimporter.php:132
 #, fuzzy
 msgid "Unknown profile."
 msgstr "نوع ملف غير معروف"
 
 #. TRANS: Client exception thrown when trying to import an event not related to the importing user.
-#: lib/activityimporter.php:138
 msgid "This activity seems unrelated to our user."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to join a remote group that is not a group.
-#: lib/activityimporter.php:154
 msgid "Remote profile is not a group!"
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to join a group the importing user is already a member of.
-#: lib/activityimporter.php:163
 #, fuzzy
 msgid "User is already a member of this group."
 msgstr "انت اصلا عضو فى الجروپ ده"
 
 #. TRANS: Client exception thrown when trying to import a notice by another user.
 #. TRANS: %1$s is the source URI of the notice, %2$s is the URI of the author.
-#: lib/activityimporter.php:201
 #, php-format
 msgid "Already know about notice %1$s and  it has a different author %2$s."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to overwrite the author information for a non-trusted user during import.
-#: lib/activityimporter.php:207
 msgid "Not overwriting author info for non-trusted user."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to import a notice without content.
 #. TRANS: %s is the notice URI.
-#: lib/activityimporter.php:223
 #, fuzzy, php-format
 msgid "No content for notice %s."
 msgstr "ابحث عن محتويات فى الإشعارات"
 
-#: lib/activitymover.php:84
 #, fuzzy, php-format
 msgid "No such user %s."
 msgstr "لا مستخدم كهذا."
@@ -7472,224 +6152,184 @@ msgstr "لا مستخدم كهذا."
 #. TRANS: %1$s is a URL, %2$s is the status, %s$s is the fail reason.
 #. TRANS: Exception thrown when post to collection fails with a status that is not handled.
 #. TRANS: %1$s is a URL, %2$s is the status, %s$s is the fail reason.
-#: lib/activitysink.php:163 lib/activitysink.php:167 lib/activitysink.php:172
 #, fuzzy, php-format
 msgctxt "URLSTATUSREASON"
 msgid "%1$s %2$s %3$s"
 msgstr "%1$s - %2$s"
 
 #. TRANS: Client exception thrown when there is no source attribute.
-#: lib/activityutils.php:200
 msgid "Can't handle remote content yet."
 msgstr ""
 
 #. TRANS: Client exception thrown when there embedded XML content is found that cannot be processed yet.
-#: lib/activityutils.php:237
 msgid "Can't handle embedded XML content yet."
 msgstr ""
 
 #. TRANS: Client exception thrown when base64 encoded content is found that cannot be processed yet.
-#: lib/activityutils.php:242
 msgid "Can't handle embedded Base64 content yet."
 msgstr ""
 
 #. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights.
-#: lib/adminpanelaction.php:96
 #, fuzzy
 msgid "You cannot make changes to this site."
 msgstr "لا يمكنك إسكات المستخدمين على هذا الموقع."
 
 #. TRANS: Client error message throw when a certain panel's settings cannot be changed.
-#: lib/adminpanelaction.php:108
 msgid "Changes to that panel are not allowed."
 msgstr "التغييرات مش مسموحه للـ لوحه دى."
 
 #. TRANS: Client error message.
-#: lib/adminpanelaction.php:222
 msgid "showForm() not implemented."
 msgstr ""
 
 #. TRANS: Client error message
-#: lib/adminpanelaction.php:250
 #, fuzzy
 msgid "saveSettings() not implemented."
 msgstr "المستخدم ليس مُسكتًا."
 
 #. TRANS: Client error message thrown if design settings could not be deleted in
 #. TRANS: the admin panel Design.
-#: lib/adminpanelaction.php:274
 msgid "Unable to delete design setting."
 msgstr "تعذّر حذف إعدادات التصميم."
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:337
 msgid "Basic site configuration"
 msgstr "ضبط الموقع الأساسي"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:339
 #, fuzzy
 msgctxt "MENU"
 msgid "Site"
 msgstr "الموقع"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:345
 msgid "Design configuration"
 msgstr "ضبط التصميم"
 
 #. TRANS: Menu item for site administration
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/adminpanelaction.php:347 lib/groupnav.php:135
 #, fuzzy
 msgctxt "MENU"
 msgid "Design"
 msgstr "التصميم"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:353
 #, fuzzy
 msgid "User configuration"
 msgstr "ضبط المسارات"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:110
 msgid "User"
 msgstr "المستخدم"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:361
 #, fuzzy
 msgid "Access configuration"
 msgstr "ضبط التصميم"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:369
 msgid "Paths configuration"
 msgstr "ضبط المسارات"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:377
 #, fuzzy
 msgid "Sessions configuration"
 msgstr "ضبط التصميم"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:385
 #, fuzzy
 msgid "Edit site notice"
 msgstr "إشعار الموقع"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:387
 msgid "Site notice"
 msgstr "إشعار الموقع"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:393
 #, fuzzy
 msgid "Snapshots configuration"
 msgstr "ضبط المسارات"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:401
 msgid "Set site license"
 msgstr ""
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:409
 #, fuzzy
 msgid "Plugins configuration"
 msgstr "ضبط المسارات"
 
 #. TRANS: Client error 401.
-#: lib/apiauth.php:111
 msgid "API resource requires read-write access, but you only have read access."
 msgstr ""
 
 #. TRANS: OAuth exception thrown when no application is found for a given consumer key.
-#: lib/apiauth.php:177
 msgid "No application for that consumer key."
 msgstr ""
 
-#: lib/apiauth.php:202 lib/apiauth.php:284
 msgid "Not allowed to use API."
 msgstr ""
 
 #. TRANS: OAuth exception given when an incorrect access token was given for a user.
-#: lib/apiauth.php:225
 msgid "Bad access token."
 msgstr ""
 
 #. TRANS: OAuth exception given when no user was found for a given token (no token was found).
-#: lib/apiauth.php:230
 msgid "No user for that token."
 msgstr ""
 
 #. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel".
 #. TRANS: Client error thrown when authentication fails.
-#: lib/apiauth.php:272 lib/apiauth.php:302
 msgid "Could not authenticate you."
 msgstr ""
 
 #. TRANS: Server error displayed when trying to create an anynymous OAuth consumer.
-#: lib/apioauthstore.php:45
 #, fuzzy
 msgid "Could not create anonymous consumer."
 msgstr "تعذّر إنشاء الكنى."
 
 #. TRANS: Server error displayed when trying to create an anynymous OAuth application.
-#: lib/apioauthstore.php:69
 #, fuzzy
 msgid "Could not create anonymous OAuth application."
 msgstr "مش ممكن إنشاء الapplication."
 
 #. TRANS: Exception thrown when no token association could be found.
-#: lib/apioauthstore.php:151
 msgid ""
 "Could not find a profile and application associated with the request token."
 msgstr ""
 
 #. TRANS: Exception thrown when no access token can be issued.
-#: lib/apioauthstore.php:209
 #, fuzzy
 msgid "Could not issue access token."
 msgstr "تعذّر إدراج الرساله."
 
-#: lib/apioauthstore.php:317
 #, fuzzy
 msgid "Database error inserting OAuth application user."
 msgstr "خطأ قاعده البيانات أثناء إدخال المستخدم OAuth app"
 
-#: lib/apioauthstore.php:345
 #, fuzzy
 msgid "Database error updating OAuth application user."
 msgstr "خطأ قاعده البيانات أثناء إدخال المستخدم OAuth app"
 
 #. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
-#: lib/apioauthstore.php:371
 msgid "Tried to revoke unknown token."
 msgstr ""
 
 #. TRANS: Exception thrown when an attempt is made to remove a revoked token.
-#: lib/apioauthstore.php:376
 msgid "Failed to delete revoked token."
 msgstr ""
 
 #. TRANS: Form input field label for application icon.
-#: lib/applicationeditform.php:177
 msgid "Icon"
 msgstr ""
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:182
 #, fuzzy
 msgid "Icon for this application"
 msgstr "ما فيش application زى كده."
 
 #. TRANS: Form input field instructions.
 #. TRANS: %d is the number of available characters for the description.
-#: lib/applicationeditform.php:201
 #, fuzzy, php-format
 msgid "Describe your application in %d character"
 msgid_plural "Describe your application in %d characters"
@@ -7701,214 +6341,175 @@ msgstr[4] "اوصف الapplication بتاعتك"
 msgstr[5] "اوصف الapplication بتاعتك"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:205
 msgid "Describe your application"
 msgstr "اوصف الapplication بتاعتك"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:216
 #, fuzzy
 msgid "URL of the homepage of this application"
 msgstr "انت مش بتملك الapplication دى."
 
 #. TRANS: Form input field label.
-#: lib/applicationeditform.php:218
 msgid "Source URL"
 msgstr "Source URL"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:225
 #, fuzzy
 msgid "Organization responsible for this application"
 msgstr "انت مش بتملك الapplication دى."
 
 #. TRANS: Form input field label.
-#: lib/applicationeditform.php:227
 msgid "Organization"
 msgstr "المنظمه"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:234
 msgid "URL for the homepage of the organization"
 msgstr ""
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:243
 msgid "URL to redirect to after authentication"
 msgstr ""
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:271
 msgid "Browser"
 msgstr ""
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:288
 msgid "Desktop"
 msgstr ""
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:290
 msgid "Type of application, browser or desktop"
 msgstr ""
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:314
 msgid "Read-only"
 msgstr ""
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:334
 msgid "Read-write"
 msgstr ""
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:336
 msgid "Default access for this application: read-only, or read-write"
 msgstr ""
 
 #. TRANS: Submit button title.
-#: lib/applicationeditform.php:353
 msgid "Cancel"
 msgstr "ألغِ"
 
-#: lib/applicationlist.php:247
 msgid " by "
 msgstr ""
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:260
 msgid "read-write"
 msgstr ""
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:262
 msgid "read-only"
 msgstr ""
 
 #. TRANS: Used in application list. %1$s is a modified date, %2$s is access type ("read-write" or "read-only")
-#: lib/applicationlist.php:268
 #, php-format
 msgid "Approved %1$s - \"%2$s\" access."
 msgstr ""
 
 #. TRANS: Access token in the application list.
 #. TRANS: %s are the first 7 characters of the access token.
-#: lib/applicationlist.php:282
 #, php-format
 msgid "Access token starting with: %s"
 msgstr ""
 
 #. TRANS: Button label
-#: lib/applicationlist.php:298
 msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "استرجع"
 
-#: lib/atom10feed.php:113
 msgid "Author element must contain a name element."
 msgstr ""
 
 #. TRANS: Server exception thrown when using the method setActivitySubject() in the class Atom10Feed.
-#: lib/atom10feed.php:160
 #, fuzzy
 msgid "Do not use this method!"
 msgstr "لا تحذف هذا الإشعار"
 
 #. TRANS: Title.
-#: lib/attachmentnoticesection.php:67
 #, fuzzy
 msgid "Notices where this attachment appears"
 msgstr "وسوم هذا المرفق"
 
 #. TRANS: Title.
-#: lib/attachmenttagcloudsection.php:48
 msgid "Tags for this attachment"
 msgstr "وسوم هذا المرفق"
 
 #. TRANS: Exception thrown when a password change fails.
-#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:227
 #, fuzzy
 msgid "Password changing failed."
 msgstr "تغيير الپاسوورد فشل"
 
 #. TRANS: Exception thrown when a password change attempt fails because it is not allowed.
-#: lib/authenticationplugin.php:238
 #, fuzzy
 msgid "Password changing is not allowed."
 msgstr "تغيير الپاسوورد مش مسموح"
 
 #. TRANS: Title for the form to block a user.
-#: lib/blockform.php:68
 msgid "Block"
 msgstr "امنع"
 
 #. TRANS: Description of the form to block a user.
-#: lib/blockform.php:79
 msgid "Block this user"
 msgstr "امنع هذا المستخدم"
 
 #. TRANS: Title for command results.
-#: lib/channel.php:104 lib/channel.php:125
 msgid "Command results"
 msgstr "نتائج الأمر"
 
 #. TRANS: Title for command results.
-#: lib/channel.php:138
 #, fuzzy
 msgid "AJAX error"
 msgstr "خطأ أجاكس"
 
 #. TRANS: E-mail subject when a command has completed.
-#: lib/channel.php:177 lib/mailhandler.php:143
 msgid "Command complete"
 msgstr "اكتمل الأمر"
 
 #. TRANS: E-mail subject when a command has failed.
-#: lib/channel.php:188
 msgid "Command failed"
 msgstr "فشل الأمر"
 
 #. TRANS: Command exception text shown when a notice ID is requested that does not exist.
-#: lib/command.php:82 lib/command.php:106
 #, fuzzy
 msgid "Notice with that id does not exist."
 msgstr "لا ملف بهذه الهويه."
 
 #. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
 #. TRANS: Error text shown when a last user notice is requested and it does not exist.
-#: lib/command.php:99 lib/command.php:642
 #, fuzzy
 msgid "User has no last notice."
 msgstr "ليس للمستخدم إشعار أخير"
 
 #. TRANS: Message given requesting a profile for a non-existing user.
 #. TRANS: %s is the nickname of the user for which the profile could not be found.
-#: lib/command.php:128
 #, fuzzy, php-format
 msgid "Could not find a user with nickname %s."
 msgstr "تعذّر إيجاد المستخدم الهدف."
 
 #. TRANS: Message given getting a non-existing user.
 #. TRANS: %s is the nickname of the user that could not be found.
-#: lib/command.php:148
 #, php-format
 msgid "Could not find a local user with nickname %s."
 msgstr ""
 
 #. TRANS: Error text shown when an unimplemented command is given.
-#: lib/command.php:183
 msgid "Sorry, this command is not yet implemented."
 msgstr ""
 
 #. TRANS: Command exception text shown when a user tries to nudge themselves.
-#: lib/command.php:229
 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr ""
 
 #. TRANS: Message given having nudged another user.
 #. TRANS: %s is the nickname of the user that was nudged.
-#: lib/command.php:238
 #, fuzzy, php-format
 msgid "Nudge sent to %s."
 msgstr "أرسل التنبيه"
@@ -7917,7 +6518,6 @@ msgstr "أرسل التنبيه"
 #. TRANS: %1$s is the number of other user the user is subscribed to.
 #. TRANS: %2$s is the number of users that are subscribed to the user.
 #. TRANS: %3$s is the number of notices the user has sent.
-#: lib/command.php:268
 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"
@@ -7929,41 +6529,35 @@ msgstr ""
 "الإشعارات: %3$s"
 
 #. TRANS: Error message text shown when a favorite could not be set because it has already been favorited.
-#: lib/command.php:298
 #, fuzzy
 msgid "Could not create favorite: already favorited."
 msgstr "تعذّر إنشاء مفضله."
 
 #. TRANS: Text shown when a notice has been marked as favourite successfully.
-#: lib/command.php:324
 #, fuzzy
 msgid "Notice marked as fave."
 msgstr "هذا الإشعار مفضله مسبقًا!"
 
 #. TRANS: Message given having added a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:369
 #, php-format
 msgid "%1$s joined group %2$s."
 msgstr ""
 
 #. TRANS: Message given having removed a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:417
 #, php-format
 msgid "%1$s left group %2$s."
 msgstr ""
 
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: lib/command.php:438
 #, fuzzy, php-format
 msgctxt "WHOIS"
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
 
 #. TRANS: Whois output. %s is the full name of the queried user.
-#: lib/command.php:442
 #, php-format
 msgid "Fullname: %s"
 msgstr "الاسم الكامل: %s"
@@ -7971,7 +6565,6 @@ msgstr "الاسم الكامل: %s"
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a location.
-#: lib/command.php:446 lib/mail.php:275
 #, php-format
 msgid "Location: %s"
 msgstr "الموقع: %s"
@@ -7979,20 +6572,17 @@ msgstr "الموقع: %s"
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a homepage.
-#: lib/command.php:450 lib/mail.php:279
 #, php-format
 msgid "Homepage: %s"
 msgstr "الصفحه الرئيسية: %s"
 
 #. TRANS: Whois output. %s is the bio information of the queried user.
-#: lib/command.php:454
 #, php-format
 msgid "About: %s"
 msgstr "عن: %s"
 
 #. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).
 #. TRANS: %s is a remote profile.
-#: lib/command.php:483
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
@@ -8001,7 +6591,6 @@ msgstr ""
 
 #. TRANS: Message given if content is too long. %1$sd is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:500
 #, fuzzy, php-format
 msgid "Message too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
@@ -8012,27 +6601,28 @@ msgstr[3] "هذا الملف كبير جدًا. إن أقصى حجم للملف
 msgstr[4] "هذا الملف كبير جدًا. إن أقصى حجم للملفات هو %d."
 msgstr[5] "هذا الملف كبير جدًا. إن أقصى حجم للملفات هو %d."
 
+#. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
+#, fuzzy
+msgid "You can't send a message to this user."
+msgstr "أرسل رساله مباشره إلى هذا المستخدم"
+
 #. TRANS: Error text shown sending a direct message fails with an unknown reason.
-#: lib/command.php:528
 #, fuzzy
 msgid "Error sending direct message."
 msgstr "أنت ممنوع من إرسال رسائل مباشره."
 
 #. TRANS: Message given having repeated a notice from another user.
 #. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:565
 #, fuzzy, php-format
 msgid "Notice from %s repeated."
 msgstr "الإشعار من %s مكرر"
 
 #. TRANS: Error text shown when repeating a notice fails with an unknown reason.
-#: lib/command.php:568
 msgid "Error repeating notice."
 msgstr "خطأ تكرار الإشعار."
 
 #. TRANS: Message given if content of a notice for a reply is too long. %1$d is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:603
 #, fuzzy, php-format
 msgid "Notice too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Notice too long - maximum is %1$d characters, you sent %2$d."
@@ -8045,104 +6635,87 @@ msgstr[5] "هذا الملف كبير جدًا. إن أقصى حجم للملف
 
 #. TRANS: Text shown having sent a reply to a notice successfully.
 #. TRANS: %s is the nickname of the user of the notice the reply was sent to.
-#: lib/command.php:616
 #, fuzzy, php-format
 msgid "Reply to %s sent."
 msgstr "رُد على رساله %s"
 
 #. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
-#: lib/command.php:619
 msgid "Error saving notice."
 msgstr "خطأ أثناء حفظ الإشعار."
 
 #. TRANS: Error text shown when no username was provided when issuing a subscribe command.
-#: lib/command.php:666
 msgid "Specify the name of the user to subscribe to."
 msgstr ""
 
 #. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
-#: lib/command.php:675
 msgid "Can't subscribe to OMB profiles by command."
 msgstr ""
 
 #. TRANS: Text shown after having subscribed to another user successfully.
 #. TRANS: %s is the name of the user the subscription was requested for.
-#: lib/command.php:683
 #, php-format
 msgid "Subscribed to %s."
 msgstr ""
 
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.
-#: lib/command.php:704 lib/command.php:815
 msgid "Specify the name of the user to unsubscribe from."
 msgstr ""
 
 #. TRANS: Text shown after having unsubscribed from another user successfully.
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:715
 #, php-format
 msgid "Unsubscribed from %s."
 msgstr ""
 
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
-#: lib/command.php:735 lib/command.php:761
 #, fuzzy
 msgid "Command not yet implemented."
 msgstr "اكتمل الأمر"
 
 #. TRANS: Text shown when issuing the command "off" successfully.
-#: lib/command.php:739
 #, fuzzy
 msgid "Notification off."
 msgstr "لا رمز تأكيد."
 
 #. TRANS: Error text shown when the command "off" fails for an unknown reason.
-#: lib/command.php:742
 msgid "Can't turn off notification."
 msgstr ""
 
 #. TRANS: Text shown when issuing the command "on" successfully.
-#: lib/command.php:765
 #, fuzzy
 msgid "Notification on."
 msgstr "لا رمز تأكيد."
 
 #. TRANS: Error text shown when the command "on" fails for an unknown reason.
-#: lib/command.php:768
 #, fuzzy
 msgid "Can't turn on notification."
 msgstr "مش نافعه تتكرر الملاحظتك بتاعتك."
 
 #. TRANS: Error text shown when issuing the login command while login is disabled.
-#: lib/command.php:782
 msgid "Login command is disabled."
 msgstr ""
 
 #. TRANS: Text shown after issuing the login command successfully.
 #. TRANS: %s is a logon link..
-#: lib/command.php:795
 #, php-format
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
 
 #. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:824
 #, php-format
 msgid "Unsubscribed %s."
 msgstr ""
 
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
-#: lib/command.php:842
 msgid "You are not subscribed to anyone."
 msgstr "لست مُشتركًا بأى أحد."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
-#: lib/command.php:847
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "لست مشتركًا بأحد."
@@ -8154,14 +6727,12 @@ msgstr[5] ""
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user
 #. TRANS: (followers) without having any subscribers.
-#: lib/command.php:869
 msgid "No one is subscribed to you."
 msgstr "لا أحد مشترك بك."
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
-#: lib/command.php:874
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "لا أحد مشترك بك."
@@ -8173,14 +6744,12 @@ msgstr[5] ""
 
 #. TRANS: Text shown after requesting groups a user is subscribed to without having
 #. TRANS: any group subscriptions.
-#: lib/command.php:896
 msgid "You are not a member of any groups."
 msgstr "لست عضوًا فى أى مجموعه."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
-#: lib/command.php:901
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "لست عضوًا فى أى مجموعه."
@@ -8191,7 +6760,6 @@ msgstr[4] ""
 msgstr[5] ""
 
 #. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-#: lib/command.php:916
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -8234,119 +6802,98 @@ msgid ""
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:36
 #, fuzzy
 msgid "No configuration file found."
 msgstr "لا رمز تأكيد."
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:39
 msgid "I looked for configuration files in the following places:"
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:42
 msgid "You may wish to run the installer to fix this."
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:46
 msgid "Go to the installer."
 msgstr "اذهب إلى المُثبّت."
 
-#: lib/dberroraction.php:59
 msgid "Database error"
 msgstr "خطأ قاعده بيانات"
 
 #. TRANS: Description of form for deleting a user.
-#: lib/deleteuserform.php:75
 msgid "Delete this user"
 msgstr "احذف هذا المستخدم"
 
-#: lib/designform.php:114
 #, fuzzy
 msgid "Change design"
 msgstr "احفظ التصميم"
 
 #. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: lib/designform.php:131
 msgid "Change colours"
 msgstr "تغيير الألوان"
 
 #. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: lib/designform.php:138
 msgid "Use defaults"
 msgstr "استخدم المبدئيات"
 
 #. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: lib/designform.php:140
 msgid "Restore default designs"
 msgstr "استعد التصميمات المبدئية"
 
 #. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: lib/designform.php:148
 msgid "Reset back to default"
 msgstr "ارجع إلى المبدئي"
 
 #. TRANS: Label in form on profile design page.
 #. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
-#: lib/designform.php:158
 msgid "Upload file"
 msgstr "ارفع ملفًا"
 
 #. TRANS: Instructions for form on profile design page.
-#: lib/designform.php:163
 #, fuzzy
 msgid ""
 "You can upload your personal background image. The maximum file size is 2Mb."
 msgstr "تستطيع رفع صورتك الشخصيه. أقصى حجم للملف هو 2 م.ب."
 
 #. TRANS: Radio button on profile design page that will enable use of the uploaded profile image.
-#: lib/designform.php:194
 #, fuzzy
 msgctxt "RADIO"
 msgid "On"
 msgstr "مكّن"
 
 #. TRANS: Radio button on profile design page that will disable use of the uploaded profile image.
-#: lib/designform.php:211
 #, fuzzy
 msgctxt "RADIO"
 msgid "Off"
 msgstr "عطّل"
 
 #. TRANS: Title for button on profile design page to save settings.
-#: lib/designform.php:322
 msgid "Save design"
 msgstr "احفظ التصميم"
 
 #. TRANS: Error message displayed if design settings could not be saved.
 #. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
-#: lib/designsettings.php:216 lib/designsettings.php:238
 msgid "Couldn't update your design."
 msgstr "تعذّر تحديث تصميمك."
 
 #. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
-#: lib/designsettings.php:244
 msgid "Design defaults restored."
 msgstr "استعيدت مبدئيات التصميم."
 
 #. TRANS: Exception. %s is an ID.
-#: lib/discovery.php:153
 #, fuzzy, php-format
 msgid "Unable to find services for %s."
 msgstr "استعمل الفورمه دى علشان تعدّل الapplication بتاعتك."
 
 #. TRANS: Form legend for removing the favourite status for a favourite notice.
 #. TRANS: Title for button text for removing the favourite status for a favourite notice.
-#: lib/disfavorform.php:108 lib/disfavorform.php:140
 msgid "Disfavor this notice"
 msgstr "ألغِ تفضيل هذا الإشعار"
 
 #. TRANS: Button text for removing the favourite status for a favourite notice.
-#: lib/disfavorform.php:136
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Disfavor favorite"
@@ -8354,91 +6901,71 @@ msgstr "ألغِ تفضيل المفضلة"
 
 #. TRANS: Form legend for adding the favourite status to a notice.
 #. TRANS: Title for button text for adding the favourite status to a notice.
-#: lib/favorform.php:108 lib/favorform.php:139
 msgid "Favor this notice"
 msgstr "فضّل هذا الإشعار"
 
 #. TRANS: Button text for adding the favourite status to a notice.
-#: lib/favorform.php:135
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Favor"
 msgstr "فضّل"
 
-#: lib/feed.php:84
 msgid "RSS 1.0"
 msgstr "آرإس​إس 1.0"
 
-#: lib/feed.php:86
 msgid "RSS 2.0"
 msgstr "آرإس​إس 2.0"
 
-#: lib/feed.php:88
 msgid "Atom"
 msgstr "أتوم"
 
-#: lib/feed.php:90
 msgid "FOAF"
 msgstr "FOAF"
 
-#: lib/feedimporter.php:75
 #, fuzzy
 msgid "Not an atom feed."
 msgstr "جميع الأعضاء"
 
-#: lib/feedimporter.php:82
 msgid "No author in the feed."
 msgstr ""
 
-#: lib/feedimporter.php:89
 msgid "Can't import without a user."
 msgstr ""
 
 #. TRANS: Header for feed links (h2).
-#: lib/feedlist.php:66
 msgid "Feeds"
 msgstr ""
 
-#: lib/galleryaction.php:128
 msgid "All"
 msgstr "الكل"
 
-#: lib/galleryaction.php:136
 msgid "Select tag to filter"
 msgstr "اختر وسمًا لترشيحه"
 
-#: lib/galleryaction.php:137
 msgid "Tag"
 msgstr "الوسم"
 
-#: lib/galleryaction.php:138
 msgid "Choose a tag to narrow list"
 msgstr ""
 
-#: lib/galleryaction.php:140
 msgid "Go"
 msgstr "اذهب"
 
-#: lib/grantroleform.php:91
 #, php-format
 msgid "Grant this user the \"%s\" role"
 msgstr ""
 
-#: lib/groupeditform.php:147
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr ""
 
-#: lib/groupeditform.php:156
 #, fuzzy
 msgid "URL of the homepage or blog of the group or topic."
 msgstr "انت مش بتملك الapplication دى."
 
-#: lib/groupeditform.php:161
 #, fuzzy
 msgid "Describe the group or topic"
 msgstr "اوصف الapplication بتاعتك"
 
-#: lib/groupeditform.php:163
 #, fuzzy, php-format
 msgid "Describe the group or topic in %d character or less"
 msgid_plural "Describe the group or topic in %d characters or less"
@@ -8449,12 +6976,10 @@ msgstr[3] "اوصف الapplication بتاعتك"
 msgstr[4] "اوصف الapplication بتاعتك"
 msgstr[5] "اوصف الapplication بتاعتك"
 
-#: lib/groupeditform.php:175
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\"."
 msgstr ""
 
-#: lib/groupeditform.php:183
 #, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -8470,49 +6995,42 @@ msgstr[4] ""
 msgstr[5] ""
 
 #. TRANS: Menu item in the group navigation page.
-#: lib/groupnav.php:86
 msgctxt "MENU"
 msgid "Group"
 msgstr ""
 
 #. TRANS: Tooltip for menu item in the group navigation page.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:89
 #, php-format
 msgctxt "TOOLTIP"
 msgid "%s group"
 msgstr ""
 
 #. TRANS: Menu item in the group navigation page.
-#: lib/groupnav.php:95
 msgctxt "MENU"
 msgid "Members"
 msgstr ""
 
 #. TRANS: Tooltip for menu item in the group navigation page.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:98
 #, php-format
 msgctxt "TOOLTIP"
 msgid "%s group members"
 msgstr ""
 
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/groupnav.php:108
 msgctxt "MENU"
 msgid "Blocked"
 msgstr ""
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:111
 #, php-format
 msgctxt "TOOLTIP"
 msgid "%s blocked users"
 msgstr ""
 
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/groupnav.php:117
 #, fuzzy
 msgctxt "MENU"
 msgid "Admin"
@@ -8520,21 +7038,18 @@ msgstr "إداري"
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:120
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Edit %s group properties"
 msgstr ""
 
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/groupnav.php:126
 msgctxt "MENU"
 msgid "Logo"
 msgstr ""
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:129
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Add or edit %s logo"
@@ -8542,72 +7057,60 @@ msgstr ""
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:138
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Add or edit %s design"
 msgstr ""
 
 #. TRANS: Title for groups with the most members section.
-#: lib/groupsbymemberssection.php:71
 msgid "Groups with most members"
 msgstr "المجموعات الأكثر أعضاءً"
 
 #. TRANS: Title for groups with the most posts section.
-#: lib/groupsbypostssection.php:71
 msgid "Groups with most posts"
 msgstr "المجموعات الأكثر مرسلات"
 
 #. TRANS: Title for group tag cloud section.
 #. TRANS: %s is a group name.
-#: lib/grouptagcloudsection.php:57
 #, fuzzy, php-format
 msgid "Tags in %s group's notices"
 msgstr "عدّل خصائص مجموعه %s"
 
 #. TRANS: Client exception 406
-#: lib/htmloutputter.php:104
 msgid "This page is not available in a media type you accept"
 msgstr ""
 
 #. TRANS: Exception thrown when trying to upload an unsupported image file format.
-#: lib/imagefile.php:73
 #, fuzzy
 msgid "Unsupported image file format."
 msgstr "نسق غير مدعوم."
 
 #. TRANS: Exception thrown when too large a file is uploaded.
 #. TRANS: %s is the maximum file size, for example "500b", "10kB" or "2MB".
-#: lib/imagefile.php:91
 #, php-format
 msgid "That file is too big. The maximum file size is %s."
 msgstr "هذا الملف كبير جدًا. إن أقصى حجم للملفات هو %s."
 
 #. TRANS: Exception thrown when uploading an image and that action could not be completed.
-#: lib/imagefile.php:97
 #, fuzzy
 msgid "Partial upload."
 msgstr "رُفع الأفتار."
 
 #. TRANS: Exception thrown when uploading a file as image that is not an image or is a corrupt file.
-#: lib/imagefile.php:115
 msgid "Not an image or corrupt file."
 msgstr ""
 
 #. TRANS: Exception thrown during resize when image has been registered as present, but is no longer there.
-#: lib/imagefile.php:178
 #, fuzzy
 msgid "Lost our file."
 msgstr "لا ملف كهذا."
 
 #. TRANS: Exception thrown when trying to resize an unknown file type.
 #. TRANS: Exception thrown when trying resize an unknown file type.
-#: lib/imagefile.php:216 lib/imagefile.php:257
 msgid "Unknown file type"
 msgstr "نوع ملف غير معروف"
 
 #. TRANS: Number of megabytes. %d is the number.
-#: lib/imagefile.php:303
 #, fuzzy, php-format
 msgid "%dMB"
 msgid_plural "%dMB"
@@ -8619,7 +7122,6 @@ msgstr[4] "ميجابايت"
 msgstr[5] "ميجابايت"
 
 #. TRANS: Number of kilobytes. %d is the number.
-#: lib/imagefile.php:307
 #, fuzzy, php-format
 msgid "%dkB"
 msgid_plural "%dkB"
@@ -8631,7 +7133,6 @@ msgstr[4] "كيلوبايت"
 msgstr[5] "كيلوبايت"
 
 #. TRANS: Number of bytes. %d is the number.
-#: lib/imagefile.php:310
 #, php-format
 msgid "%dB"
 msgid_plural "%dB"
@@ -8642,7 +7143,6 @@ msgstr[3] ""
 msgstr[4] ""
 msgstr[5] ""
 
-#: lib/implugin.php:262
 #, php-format
 msgid ""
 "User \"%s\" on %s has said that your %s screenname belongs to them. If "
@@ -8652,54 +7152,45 @@ msgid ""
 "message."
 msgstr ""
 
-#: lib/implugin.php:349
 #, php-format
 msgid "Unknown inbox source %d."
 msgstr "مصدر الـinbox مش معروف %d."
 
-#: lib/implugin.php:485
 #, fuzzy, php-format
 msgid "Message too long - maximum is %1$d characters, you sent %2$d."
 msgstr "هذا الملف كبير جدًا. إن أقصى حجم للملفات هو %d."
 
-#: lib/leaveform.php:114
 msgid "Leave"
 msgstr "غادر"
 
 #. TRANS: Menu item for logging in to the StatusNet site.
-#: lib/logingroupnav.php:77
 #, fuzzy
 msgctxt "MENU"
 msgid "Login"
 msgstr "لُج"
 
 #. TRANS: Title for menu item for logging in to the StatusNet site.
-#: lib/logingroupnav.php:79
 #, fuzzy
 msgid "Login with a username and password"
 msgstr "اسم مستخدم أو كلمه سر غير صالحه."
 
 #. TRANS: Menu item for registering with the StatusNet site.
-#: lib/logingroupnav.php:85
 #, fuzzy
 msgctxt "MENU"
 msgid "Register"
 msgstr "سجّل"
 
 #. TRANS: Title for menu item for registering with the StatusNet site.
-#: lib/logingroupnav.php:87
 msgid "Sign up for a new account"
 msgstr ""
 
 #. TRANS: Subject for address confirmation email.
-#: lib/mail.php:172
 msgid "Email address confirmation"
 msgstr "تأكيد عنوان البريد الإلكتروني"
 
 #. TRANS: Body for address confirmation email.
 #. TRANS: %1$s is the addressed user's nickname, %2$s is the StatusNet sitename,
 #. TRANS: %3$s is the URL to confirm at.
-#: lib/mail.php:177
 #, php-format
 msgid ""
 "Hey, %1$s.\n"
@@ -8718,14 +7209,12 @@ msgstr ""
 
 #. TRANS: Subject of new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
-#: lib/mail.php:243
 #, fuzzy, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "هؤلاء هم الأشخاص الذين يستمعون إلى إشعاراتك."
 
 #. TRANS: This is a paragraph in a new-subscriber e-mail.
 #. TRANS: %s is a URL where the subscriber can be reported as abusive.
-#: lib/mail.php:250
 #, php-format
 msgid ""
 "If you believe this account is being used abusively, you can block them from "
@@ -8737,7 +7226,6 @@ msgstr ""
 #. TRANS: %3$s is the subscriber's profile URL, %4$s is the subscriber's location (or empty)
 #. TRANS: %5$s is the subscriber's homepage URL (or empty), %6%s is the subscriber's bio (or empty)
 #. TRANS: %7$s is a link to the addressed user's e-mail settings.
-#: lib/mail.php:260
 #, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -8754,14 +7242,12 @@ msgstr ""
 
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is biographical information.
-#: lib/mail.php:283
 #, php-format
 msgid "Bio: %s"
 msgstr "عن نفسك: %s"
 
 #. TRANS: Subject of notification mail for new posting email address.
 #. TRANS: %s is the StatusNet sitename.
-#: lib/mail.php:312
 #, fuzzy, php-format
 msgid "New email address for posting to %s"
 msgstr "أنشئ عنوان بريد إلكترونى لترسل إليه؛ ألغِ القديم."
@@ -8769,7 +7255,6 @@ msgstr "أنشئ عنوان بريد إلكترونى لترسل إليه؛ أل
 #. TRANS: Body of notification mail for new posting email address.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is the e-mail address to send
 #. TRANS: to to post by e-mail, %3$s is a URL to more instructions.
-#: lib/mail.php:318
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -8784,27 +7269,23 @@ msgstr ""
 
 #. TRANS: Subject line for SMS-by-email notification messages.
 #. TRANS: %s is the posting user's nickname.
-#: lib/mail.php:439
 #, php-format
 msgid "%s status"
 msgstr "حاله %s"
 
 #. TRANS: Subject line for SMS-by-email address confirmation message.
-#: lib/mail.php:465
 #, fuzzy
 msgid "SMS confirmation"
 msgstr "لا رمز تأكيد."
 
 #. TRANS: Main body heading for SMS-by-email address confirmation message.
 #. TRANS: %s is the addressed user's nickname.
-#: lib/mail.php:469
 #, php-format
 msgid "%s: confirm you own this phone number with this code:"
 msgstr ""
 
 #. TRANS: Subject for 'nudge' notification email.
 #. TRANS: %s is the nudging user.
-#: lib/mail.php:490
 #, php-format
 msgid "You have been nudged by %s"
 msgstr ""
@@ -8812,7 +7293,6 @@ msgstr ""
 #. TRANS: Body for 'nudge' notification email.
 #. TRANS: %1$s is the nuding user's long name, $2$s is the nudging user's nickname,
 #. TRANS: %3$s is a URL to post notices at, %4$s is the StatusNet sitename.
-#: lib/mail.php:497
 #, php-format
 msgid ""
 "%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -8830,7 +7310,6 @@ msgstr ""
 
 #. TRANS: Subject for direct-message notification email.
 #. TRANS: %s is the sending user's nickname.
-#: lib/mail.php:544
 #, php-format
 msgid "New private message from %s"
 msgstr "رساله خاصه جديده من %s"
@@ -8839,7 +7318,6 @@ msgstr "رساله خاصه جديده من %s"
 #. TRANS: %1$s is the sending user's long name, %2$s is the sending user's nickname,
 #. TRANS: %3$s is the message content, %4$s a URL to the message,
 #. TRANS: %5$s is the StatusNet sitename.
-#: lib/mail.php:552
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -8860,7 +7338,6 @@ msgstr ""
 
 #. TRANS: Subject for favorite notification e-mail.
 #. TRANS: %1$s is the adding user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:604
 #, fuzzy, php-format
 msgid "%1$s (@%2$s) added your notice as a favorite"
 msgstr "أرسل لى بريدًا إلكرتونيًا عندما يضيف أحدهم إشعارى مفضله."
@@ -8870,7 +7347,6 @@ msgstr "أرسل لى بريدًا إلكرتونيًا عندما يضيف أح
 #. TRANS: %3$s is a URL to the faved notice, %4$s is the faved notice text,
 #. TRANS: %5$s is a URL to all faves of the adding user, %6$s is the StatusNet sitename,
 #. TRANS: %7$s is the adding user's nickname.
-#: lib/mail.php:611
 #, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -8892,7 +7368,6 @@ msgid ""
 msgstr ""
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:669
 #, php-format
 msgid ""
 "The full conversation can be read here:\n"
@@ -8902,7 +7377,6 @@ msgstr ""
 
 #. TRANS: E-mail subject for notice notification.
 #. TRANS: %1$s is the sending user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:677
 #, php-format
 msgid "%1$s (@%2$s) sent a notice to your attention"
 msgstr ""
@@ -8913,7 +7387,6 @@ msgstr ""
 #. TRANS: %5$s is a URL to the full conversion if it exists (otherwise empty),
 #. TRANS: %6$s is a URL to reply to the notice, %7$s is a URL to all @-replied for the addressed user,
 #. TRANS: %8$s is a URL to the addressed user's e-mail settings, %9$s is the sender's nickname.
-#: lib/mail.php:685
 #, php-format
 msgid ""
 "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -8940,65 +7413,53 @@ msgid ""
 "P.S. You can turn off these email notifications here: %8$s\n"
 msgstr ""
 
-#: lib/mailbox.php:87
 #, fuzzy
 msgid "Only the user can read their own mailboxes."
 msgstr "يحق للمُرسل والمستلم فقط قراءه هذه الرساله."
 
-#: lib/mailbox.php:125
 msgid ""
 "You have no private messages. You can send private message to engage other "
 "users in conversation. People can send you messages for your eyes only."
 msgstr ""
 
-#: lib/mailhandler.php:37
 msgid "Could not parse message."
 msgstr "تعذّر تحليل الرساله."
 
-#: lib/mailhandler.php:42
 msgid "Not a registered user."
 msgstr "ليس مستخدمًا مسجلًا."
 
-#: lib/mailhandler.php:46
 #, fuzzy
 msgid "Sorry, that is not your incoming email address."
 msgstr "هذا ليس عنوان بريدك الإلكترونى."
 
-#: lib/mailhandler.php:50
 msgid "Sorry, no incoming email allowed."
 msgstr ""
 
-#: lib/mailhandler.php:229
 #, php-format
 msgid "Unsupported message type: %s"
 msgstr "نوع رساله مش مدعوم: %s"
 
 #. TRANS: Client exception thrown when a database error was thrown during a file upload operation.
-#: lib/mediafile.php:102 lib/mediafile.php:174
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
 
 #. TRANS: Client exception thrown when a file upload operation would cause a user to exceed a set quota.
-#: lib/mediafile.php:238 lib/mediafile.php:281
 msgid "File exceeds user's quota."
 msgstr ""
 
 #. TRANS: Client exception thrown when a file upload operation fails because the file could
 #. TRANS: not be moved from the temporary folder to the permanent file location.
-#: lib/mediafile.php:258 lib/mediafile.php:300
 msgid "File could not be moved to destination directory."
 msgstr ""
 
 #. TRANS: Client exception thrown when a file upload operation has been stopped because the MIME
 #. TRANS: type of the uploaded file could not be determined.
-#: lib/mediafile.php:265 lib/mediafile.php:306
 msgid "Could not determine file's MIME type."
 msgstr "مش نافع يتحدد نوع الـMIME بتاع الفايل."
 
 #. TRANS: Client exception thrown trying to upload a forbidden MIME type.
 #. TRANS: %1$s is the file type that was denied, %2$s is the application part of
 #. TRANS: the MIME type that was denied.
-#: lib/mediafile.php:396
 #, php-format
 msgid ""
 "\"%1$s\" is not a supported file type on this server. Try using another %2$s "
@@ -9007,53 +7468,43 @@ msgstr ""
 
 #. TRANS: Client exception thrown trying to upload a forbidden MIME type.
 #. TRANS: %s is the file type that was denied.
-#: lib/mediafile.php:401
 #, php-format
 msgid "\"%s\" is not a supported file type on this server."
 msgstr ""
 
-#: lib/messageform.php:120
 msgid "Send a direct notice"
 msgstr "أرسل إشعارًا مباشرًا"
 
 #. TRANS Label entry in drop-down selection box in direct-message inbox/outbox. This is the default entry in the drop-down box, doubling as instructions and a brake against accidental submissions with the first user in the list.
-#: lib/messageform.php:137
 #, fuzzy
 msgid "Select recipient:"
 msgstr "اختر وسمًا لترشيحه"
 
 #. TRANS Entry in drop-down selection box in direct-message inbox/outbox when no one is available to message.
-#: lib/messageform.php:150
 #, fuzzy
 msgid "No mutual subscribers."
 msgstr "غير مشترك!"
 
-#: lib/messageform.php:153
 msgid "To"
 msgstr "إلى"
 
-#: lib/messageform.php:184 lib/noticeform.php:236
 #, fuzzy
 msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr "أرسل"
 
-#: lib/messagelist.php:77
 #, fuzzy
 msgid "Messages"
 msgstr "رسالة"
 
-#: lib/messagelistitem.php:123 lib/noticelist.php:527
 msgid "from"
 msgstr "من"
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:178
 msgid "Nickname cannot be empty."
 msgstr ""
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:191
 #, php-format
 msgid "Nickname cannot be more than %d character long."
 msgid_plural "Nickname cannot be more than %d characters long."
@@ -9064,454 +7515,354 @@ msgstr[3] ""
 msgstr[4] ""
 msgstr[5] ""
 
-#: lib/noticeform.php:160
+#. TRANS: Form legend for notice form.
 msgid "Send a notice"
 msgstr "أرسل إشعارًا"
 
-#: lib/noticeform.php:174
+#. TRANS: Title for notice label. %s is the user's nickname.
 #, php-format
 msgid "What's up, %s?"
 msgstr "ما الأخبار يا %s؟"
 
-#: lib/noticeform.php:193
+#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr "أرفق"
 
-#: lib/noticeform.php:197
-msgid "Attach a file"
+#. TRANS: Title for input field to attach a file to a notice.
+#, fuzzy
+msgid "Attach a file."
 msgstr "أرفق ملفًا"
 
-#: lib/noticeform.php:212
+#. TRANS: Field label to add location to a notice.
 msgid "Share my location"
 msgstr "اعمل مشاركه لمكانى"
 
-#: lib/noticeform.php:215
+#. TRANS: Text to not share location for a notice in notice form.
 msgid "Do not share my location"
 msgstr "ما تعملش مشاركه لمكانى"
 
-#: lib/noticeform.php:216
+#. TRANS: Timeout error text for location retrieval in notice form.
 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
 "try again later"
 msgstr ""
 
 #. TRANS: Used in coordinates as abbreviation of north
-#: lib/noticelist.php:457
 msgid "N"
 msgstr "ش"
 
 #. TRANS: Used in coordinates as abbreviation of south
-#: lib/noticelist.php:459
 msgid "S"
 msgstr "ج"
 
 #. TRANS: Used in coordinates as abbreviation of east
-#: lib/noticelist.php:461
 msgid "E"
 msgstr "ر"
 
 #. TRANS: Used in coordinates as abbreviation of west
-#: lib/noticelist.php:463
 msgid "W"
 msgstr "غ"
 
-#: lib/noticelist.php:465
 #, php-format
 msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgstr ""
 
-#: lib/noticelist.php:474
 msgid "at"
 msgstr "في"
 
-#: lib/noticelist.php:523
 msgid "web"
 msgstr ""
 
-#: lib/noticelist.php:589
 msgid "in context"
 msgstr "فى السياق"
 
-#: lib/noticelist.php:624
 msgid "Repeated by"
 msgstr "متكرر من"
 
-#: lib/noticelist.php:651
 msgid "Reply to this notice"
 msgstr "رُد على هذا الإشعار"
 
-#: lib/noticelist.php:652
 msgid "Reply"
 msgstr "رُد"
 
-#: lib/noticelist.php:678
 msgid "Delete this notice"
 msgstr "احذف هذا الإشعار"
 
-#: lib/noticelist.php:696
 msgid "Notice repeated"
 msgstr "الإشعار مكرر"
 
-#: lib/nudgeform.php:116
 msgid "Nudge this user"
 msgstr "نبّه هذا المستخدم"
 
-#: lib/nudgeform.php:128
 msgid "Nudge"
 msgstr "نبّه"
 
-#: lib/nudgeform.php:128
 #, fuzzy
 msgid "Send a nudge to this user"
 msgstr "أرسل رساله مباشره إلى هذا المستخدم"
 
-#: lib/oauthstore.php:294
 msgid "Error inserting new profile."
 msgstr ""
 
-#: lib/oauthstore.php:302
 msgid "Error inserting avatar."
 msgstr ""
 
-#: lib/oauthstore.php:322
 msgid "Error inserting remote profile."
 msgstr ""
 
 #. TRANS: Exception thrown when a notice is denied because it has been sent before.
-#: lib/oauthstore.php:362
 msgid "Duplicate notice."
 msgstr ""
 
-#: lib/oauthstore.php:507
 msgid "Couldn't insert new subscription."
 msgstr "تعذّر إدراج اشتراك جديد."
 
-#: lib/personalgroupnav.php:104
-#, fuzzy
 msgid "Replies"
 msgstr "الردود"
 
-#: lib/personalgroupnav.php:109
-#, fuzzy
 msgid "Favorites"
 msgstr "المفضلات"
 
-#: lib/personalgroupnav.php:120
-#, fuzzy
 msgid "Inbox"
 msgstr "صندوق الوارد"
 
-#: lib/personalgroupnav.php:121
 msgid "Your incoming messages"
 msgstr "رسائلك الواردة"
 
-#: lib/personalgroupnav.php:125
-#, fuzzy
 msgid "Outbox"
 msgstr "صندوق الصادر"
 
-#: lib/personalgroupnav.php:126
 msgid "Your sent messages"
 msgstr "رسائلك المُرسلة"
 
 #. TRANS: Title for personal tag cloud section. %s is a user nickname.
-#: lib/personaltagcloudsection.php:56
 #, fuzzy, php-format
 msgid "Tags in %s's notices"
 msgstr "ليس للمستخدم إشعار أخير"
 
 #. TRANS: Displayed as version information for a plugin if no version information was found.
-#: lib/plugin.php:126
 msgid "Unknown"
 msgstr "مش معروف"
 
 #. TRANS: Plugin admin panel controls
-#: lib/plugindisableform.php:90
 msgctxt "plugin"
 msgid "Disable"
 msgstr ""
 
 #. TRANS: Plugin admin panel controls
-#: lib/pluginenableform.php:112
 msgctxt "plugin"
 msgid "Enable"
 msgstr ""
 
-#: lib/pluginlist.php:196
 msgctxt "plugin-description"
 msgid "(Plugin descriptions unavailable when disabled.)"
 msgstr ""
 
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:88
 msgid "Subscriptions"
 msgstr "الاشتراكات"
 
 #. TRANS: Text for user subscription statistics if user has more subscriptions than displayed.
-#: lib/profileaction.php:144
 msgid "All subscriptions"
 msgstr "جميع الاشتراكات"
 
 #. TRANS: H2 text for user subscriber statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:96
 msgid "Subscribers"
 msgstr "المشتركون"
 
 #. TRANS: Text for user subscription statistics if user has more subscribers than displayed.
-#: lib/profileaction.php:181
 msgid "All subscribers"
 msgstr "جميع المشتركين"
 
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:213
 msgid "User ID"
 msgstr "هويه المستخدم"
 
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:219
 msgid "Member since"
 msgstr "عضو منذ"
 
 #. TRANS: Label for user statistics.
 #. TRANS: H2 text for user group membership statistics.
-#: lib/profileaction.php:239 lib/profileaction.php:290
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:104
 msgid "Groups"
 msgstr "مجموعات"
 
 #. TRANS: Label for user statistics.
 #. TRANS: Average count of posts made per day since account registration.
-#: lib/profileaction.php:253
 msgid "Daily average"
 msgstr ""
 
 #. TRANS: Text for user group membership statistics if user has more subscriptions than displayed.
-#: lib/profileaction.php:305
 msgid "All groups"
 msgstr "كل المجموعات"
 
 #. TRANS: Server error displayed when using an unimplemented method.
-#: lib/profileformaction.php:123
 msgid "Unimplemented method."
 msgstr ""
 
-#: lib/publicgroupnav.php:82
 msgid "User groups"
 msgstr "مجموعات المستخدمين"
 
-#: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
 msgid "Recent tags"
 msgstr "الوسوم الحديثة"
 
-#: lib/publicgroupnav.php:88
 msgid "Featured"
 msgstr "مُختارون"
 
-#: lib/publicgroupnav.php:92
 msgid "Popular"
 msgstr "مشهورة"
 
-#: lib/redirectingaction.php:95
 msgid "No return-to arguments."
 msgstr "لا مدخلات رجوع إلى."
 
-#: lib/repeatform.php:107
 msgid "Repeat this notice?"
 msgstr "كرر هذا الإشعار؟"
 
-#: lib/repeatform.php:132
 msgid "Yes"
 msgstr "نعم"
 
-#: lib/repeatform.php:132
 msgid "Repeat this notice"
 msgstr "كرر هذا الإشعار"
 
-#: lib/revokeroleform.php:91
 #, fuzzy, php-format
 msgid "Revoke the \"%s\" role from this user"
 msgstr "امنع هذا المستخدم من هذه المجموعة"
 
 #. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:1001
 #, fuzzy
 msgid "Page not found."
 msgstr "الـ API method مش موجوده."
 
-#: lib/sandboxform.php:67
 #, fuzzy
 msgid "Sandbox"
 msgstr "صندوق الوارد"
 
-#: lib/sandboxform.php:78
 msgid "Sandbox this user"
 msgstr "أضف هذا المستخدم إلى صندوق الرمل"
 
 #. TRANS: Fieldset legend for the search form.
-#: lib/searchaction.php:120
 msgid "Search site"
 msgstr "ابحث فى الموقع"
 
 #. TRANS: Used as a field label for the field where one or more keywords
 #. TRANS: for searching can be entered.
-#: lib/searchaction.php:128
 msgid "Keyword(s)"
 msgstr "الكلمات المفتاحية"
 
 #. TRANS: Button text for searching site.
-#: lib/searchaction.php:130
 msgctxt "BUTTON"
 msgid "Search"
 msgstr ""
 
-#: lib/searchgroupnav.php:80
 msgid "People"
 msgstr "أشخاص"
 
-#: lib/searchgroupnav.php:81
 msgid "Find people on this site"
 msgstr "ابحث عن أشخاص على هذا الموقع"
 
-#: lib/searchgroupnav.php:83
 msgid "Find content of notices"
 msgstr "ابحث عن محتويات فى الإشعارات"
 
-#: lib/searchgroupnav.php:85
 msgid "Find groups on this site"
 msgstr "ابحث عن مجموعات على هذا الموقع"
 
-#: lib/section.php:89
 msgid "Untitled section"
 msgstr "قسم غير مُعنون"
 
-#: lib/section.php:106
 msgid "More..."
 msgstr "المزيد..."
 
-#: lib/settingsnav.php:78
 msgid "Change your profile settings"
 msgstr "غيّر إعدادات ملفك الشخصي"
 
-#: lib/settingsnav.php:83
 msgid "Upload an avatar"
 msgstr "ارفع أفتارًا"
 
-#: lib/settingsnav.php:88
 msgid "Change your password"
 msgstr "غير كلمه سرّك"
 
-#: lib/settingsnav.php:93
 msgid "Change email handling"
 msgstr "غير أسلوب التعامل مع البريد الإلكتروني"
 
-#: lib/settingsnav.php:98
 msgid "Design your profile"
 msgstr "صمّم ملفك الشخصي"
 
-#: lib/settingsnav.php:102
 msgid "URL"
 msgstr "مسار"
 
-#: lib/settingsnav.php:103
 msgid "URL shorteners"
 msgstr ""
 
-#: lib/settingsnav.php:111
 msgid "Updates by instant messenger (IM)"
 msgstr ""
 
-#: lib/settingsnav.php:118
 msgid "Updates by SMS"
 msgstr ""
 
-#: lib/settingsnav.php:123
-#, fuzzy
 msgid "Connections"
 msgstr "كونيكشونات (Connections)"
 
-#: lib/settingsnav.php:124
 #, fuzzy
 msgid "Authorized connected applications"
 msgstr "OAuth applications"
 
-#: lib/silenceform.php:67
 msgid "Silence"
 msgstr "أسكت"
 
-#: lib/silenceform.php:78
 msgid "Silence this user"
 msgstr "أسكت هذا المستخدم"
 
-#: lib/subgroupnav.php:89
 #, php-format
 msgid "People %s subscribes to"
 msgstr "الأشخاص الذين اشترك بهم %s"
 
-#: lib/subgroupnav.php:97
 #, php-format
 msgid "People subscribed to %s"
 msgstr "الأشخاص المشتركون ب%s"
 
-#: lib/subgroupnav.php:105
 #, php-format
 msgid "Groups %s is a member of"
 msgstr "المجموعات التى %s عضو فيها"
 
-#: lib/subgroupnav.php:111
 msgid "Invite"
 msgstr "ادعُ"
 
-#: lib/subgroupnav.php:112
 #, php-format
 msgid "Invite friends and colleagues to join you on %s"
 msgstr ""
 
-#: lib/subscribeform.php:115 lib/subscribeform.php:139
 msgid "Subscribe to this user"
 msgstr "اشترك بهذا المستخدم"
 
-#: lib/subscriberspeopleselftagcloudsection.php:48
-#: lib/subscriptionspeopleselftagcloudsection.php:48
 msgid "People Tagcloud as self-tagged"
 msgstr ""
 
-#: lib/subscriberspeopletagcloudsection.php:48
-#: lib/subscriptionspeopletagcloudsection.php:48
 msgid "People Tagcloud as tagged"
 msgstr ""
 
-#: lib/tagcloudsection.php:56
 msgid "None"
 msgstr "لا شيء"
 
 #. TRANS: Server exception displayed if a theme name was invalid.
-#: lib/theme.php:74
 #, fuzzy
 msgid "Invalid theme name."
 msgstr "حجم غير صالح."
 
-#: lib/themeuploader.php:50
 msgid "This server cannot handle theme uploads without ZIP support."
 msgstr ""
 
-#: lib/themeuploader.php:58 lib/themeuploader.php:61
 msgid "The theme file is missing or the upload failed."
 msgstr ""
 
-#: lib/themeuploader.php:91 lib/themeuploader.php:102
-#: lib/themeuploader.php:279 lib/themeuploader.php:283
-#: lib/themeuploader.php:291 lib/themeuploader.php:298
 #, fuzzy
 msgid "Failed saving theme."
 msgstr "فشل تحديث الأفتار."
 
-#: lib/themeuploader.php:147
 msgid "Invalid theme: bad directory structure."
 msgstr ""
 
-#: lib/themeuploader.php:166
 #, php-format
 msgid "Uploaded theme is too large; must be less than %d byte uncompressed."
 msgid_plural ""
@@ -9523,33 +7874,27 @@ msgstr[3] ""
 msgstr[4] ""
 msgstr[5] ""
 
-#: lib/themeuploader.php:179
 msgid "Invalid theme archive: missing file css/display.css"
 msgstr ""
 
-#: lib/themeuploader.php:219
 msgid ""
 "Theme contains invalid file or folder name. Stick with ASCII letters, "
 "digits, underscore, and minus sign."
 msgstr ""
 
-#: lib/themeuploader.php:225
 msgid "Theme contains unsafe file extension names; may be unsafe."
 msgstr ""
 
-#: lib/themeuploader.php:242
 #, php-format
 msgid "Theme contains file of type '.%s', which is not allowed."
 msgstr ""
 
-#: lib/themeuploader.php:260
 msgid "Error opening theme archive."
 msgstr "خطأ أثناء منع الحجب."
 
-#: lib/threadednoticelist.php:270
 #, php-format
-msgid "Show all %d comment"
-msgid_plural "Show all %d comments"
+msgid "Show %d reply"
+msgid_plural "Show all %d replies"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
@@ -9557,125 +7902,101 @@ msgstr[3] ""
 msgstr[4] ""
 msgstr[5] ""
 
-#: lib/topposterssection.php:74
 msgid "Top posters"
 msgstr "أعلى المرسلين"
 
 #. TRANS: Title for the form to unblock a user.
-#: lib/unblockform.php:67
 #, fuzzy
 msgctxt "TITLE"
 msgid "Unblock"
 msgstr "ألغِ المنع"
 
-#: lib/unsandboxform.php:69
 #, fuzzy
 msgid "Unsandbox"
 msgstr "أزل هذا المستخدم من صندوق الرمل"
 
-#: lib/unsandboxform.php:80
 msgid "Unsandbox this user"
 msgstr "أزل هذا المستخدم من صندوق الرمل"
 
-#: lib/unsilenceform.php:67
 msgid "Unsilence"
 msgstr "ألغِ الإسكات"
 
-#: lib/unsilenceform.php:78
 msgid "Unsilence this user"
 msgstr "ألغِ إسكات هذا المستخدم"
 
-#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
 msgid "Unsubscribe from this user"
 msgstr "ألغِ الاشتراك مع هذا المستخدم"
 
-#: lib/unsubscribeform.php:137
 msgid "Unsubscribe"
 msgstr "ألغِ الاشتراك"
 
 #. 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).
-#: lib/usernoprofileexception.php:60
 #, fuzzy, php-format
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "ليس للمستخدم ملف شخصى."
 
-#: lib/userprofile.php:116
 msgid "Edit Avatar"
 msgstr "عدّل الأفتار"
 
 #. TRANS: H2 for user actions in a profile.
 #. TRANS: H2 for entity actions in a profile.
-#: lib/userprofile.php:216 lib/userprofile.php:232
 msgid "User actions"
 msgstr "تصرفات المستخدم"
 
 #. TRANS: Text shown in user profile of not yet compeltely deleted users.
-#: lib/userprofile.php:220
 msgid "User deletion in progress..."
 msgstr ""
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:248
 msgid "Edit profile settings"
 msgstr "عدّل إعدادات الملف الشخصي"
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:250
 msgid "Edit"
 msgstr "عدّل"
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:274
 msgid "Send a direct message to this user"
 msgstr "أرسل رساله مباشره إلى هذا المستخدم"
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:276
 msgid "Message"
 msgstr "رسالة"
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:318
 msgid "Moderate"
 msgstr ""
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:357
 #, fuzzy
 msgid "User role"
 msgstr "ملف المستخدم الشخصي"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:360
 #, fuzzy
 msgctxt "role"
 msgid "Administrator"
 msgstr "الإداريون"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:362
 msgctxt "role"
 msgid "Moderator"
 msgstr ""
 
-#: lib/util.php:321
 #, fuzzy
 msgid "Not allowed to log in."
 msgstr "لست والجًا."
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1337
 msgid "a few seconds ago"
 msgstr "قبل لحظات قليلة"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1340
 msgid "about a minute ago"
 msgstr "قبل دقيقه تقريبًا"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1344
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
@@ -9687,12 +8008,10 @@ msgstr[4] ""
 msgstr[5] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1347
 msgid "about an hour ago"
 msgstr "قبل ساعه تقريبًا"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1351
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
@@ -9704,12 +8023,10 @@ msgstr[4] ""
 msgstr[5] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1354
 msgid "about a day ago"
 msgstr "قبل يوم تقريبا"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1358
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
@@ -9721,12 +8038,10 @@ msgstr[4] ""
 msgstr[5] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1361
 msgid "about a month ago"
 msgstr "قبل شهر تقريبًا"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1365
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
@@ -9738,197 +8053,40 @@ msgstr[4] ""
 msgstr[5] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1368
 msgid "about a year ago"
 msgstr "قبل سنه تقريبًا"
 
 #. TRANS: Web color exception thrown when a hexadecimal color code does not validate.
 #. TRANS: %s is the provided (invalid) color code.
-#: lib/webcolor.php:81 lib/webcolor.php:121
 #, fuzzy, php-format
 msgid "%s is not a valid color! Use 3 or 6 hex characters."
 msgstr "%s ليس لونًا صحيحًا!"
 
 #. TRANS: Exception.
-#: lib/xrd.php:63
 #, fuzzy
 msgid "Invalid XML."
 msgstr "حجم غير صالح."
 
 #. TRANS: Exception.
-#: lib/xrd.php:68
 msgid "Invalid XML, missing XRD root."
 msgstr ""
 
 #. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
-#: scripts/restoreuser.php:62
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
 
-#, fuzzy
-#~ msgid "Could not generate feed for group - %s"
-#~ msgstr "تعذر تحديث المجموعه."
+#~ msgid "Full name is too long (max 255 chars)."
+#~ msgstr "الاسم الكامل طويل جدا (الأقصى 255 حرفًا)"
+
+#~ msgid "description is too long (max %d chars)."
+#~ msgstr "المنظمه طويله جدا (اكتر حاجه %d رمز)."
 
 #, fuzzy
-#~ msgid "Current confirmed Jabber/Google Talk address."
-#~ msgstr "عنوان البريد الإلكترونى المُؤكد الحالى."
+#~ msgid "Location is too long (max 255 chars)."
+#~ msgstr "المنظمه طويله جدا (اكتر حاجه 255 رمز)."
 
 #, fuzzy
-#~ msgid "Send me notices through Jabber/Google Talk."
-#~ msgstr "أرسل لى إشعارات بالاشتراكات الجديده عبر البريد الإلكترونى."
-
-#, fuzzy
-#~ msgid "Publish a MicroID for my Jabber/Google Talk address."
-#~ msgstr "هذا ليس عنوان بريدك الإلكترونى."
-
-#~ msgid "No Jabber ID."
-#~ msgstr "لا هويه جابر."
-
-#, fuzzy
-#~ msgid "Not a valid Jabber ID."
-#~ msgstr "ليست هويه جابر صالحة"
-
-#, fuzzy
-#~ msgid "That is already your Jabber ID."
-#~ msgstr "هذه ليست هويتك فى جابر."
-
-#~ msgid "That is not your Jabber ID."
-#~ msgstr "هذه ليست هويتك فى جابر."
-
-#~ msgid "Other settings"
-#~ msgstr "تظبيطات تانيه"
-
-#~ msgid "Tag cloud"
-#~ msgstr "سحابه الوسوم"
-
-#~ msgid "Authorize URL"
-#~ msgstr "اسمح للURL"
-
-#~ msgid "Jabber"
-#~ msgstr "جابر"
-
-#~ msgid "Photo"
-#~ msgstr "صورة"
-
-#~ msgid "Other options"
-#~ msgstr "خيارات أخرى"
-
-#~ msgid "Other"
-#~ msgstr "أخرى"
-
-#, fuzzy
-#~ msgid "Primary site navigation"
-#~ msgstr "ضبط الموقع الأساسي"
-
-#, fuzzy
-#~ msgctxt "TOOLTIP"
-#~ msgid "Personal profile and friends timeline"
-#~ msgstr "الملف الشخصى ومسار الأصدقاء الزمني"
-
-#, fuzzy
-#~ msgctxt "MENU"
-#~ msgid "Personal"
-#~ msgstr "شخصية"
-
-#, fuzzy
-#~ msgctxt "TOOLTIP"
-#~ msgid "Change your email, avatar, password, profile"
-#~ msgstr "غير كلمه سرّك"
-
-#~ msgid "Account"
-#~ msgstr "الحساب"
-
-#, fuzzy
-#~ msgctxt "TOOLTIP"
-#~ msgid "Connect to services"
-#~ msgstr "كونيكشونات (Connections)"
-
-#~ msgid "Connect"
-#~ msgstr "اتصل"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Change site configuration"
-#~ msgstr "ضبط الموقع الأساسي"
-
-#, fuzzy
-#~ msgctxt "MENU"
-#~ msgid "Invite"
-#~ msgstr "ادعُ"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Create an account"
-#~ msgstr "أنشئ مجموعه جديدة"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Help me!"
-#~ msgstr "مساعدة"
-
-#, fuzzy
-#~ msgctxt "MENU"
-#~ msgid "Help"
-#~ msgstr "مساعدة"
-
-#, fuzzy
-#~ msgctxt "TOOLTIP"
-#~ msgid "Search for people or text"
-#~ msgstr "ابحث عن أشخاص أو نص"
-
-#~ msgid "Local views"
-#~ msgstr "المشاهدات المحلية"
-
-#~ msgid "Page notice"
-#~ msgstr "إشعار الصفحة"
-
-#, fuzzy
-#~ msgid "Secondary site navigation"
-#~ msgstr "ضبط الموقع الأساسي"
-
-#, fuzzy
-#~ msgid "StatusNet software license"
-#~ msgstr "رخصه محتوى الموقع"
-
-#~ msgid "Site content license"
-#~ msgstr "رخصه محتوى الموقع"
-
-#, fuzzy
-#~ msgid "Pagination"
-#~ msgstr "المنظمه"
-
-#~ msgid "Author"
-#~ msgstr "المؤلف"
-
-#~ msgid "Provider"
-#~ msgstr "المزود"
-
-#, fuzzy
-#~ msgctxt "MENU"
-#~ msgid "SMS"
-#~ msgstr "رسائل قصيرة"
-
-#~ msgid "Filter tags"
-#~ msgstr "رشّح الوسوم"
-
-#~ msgid "[%s]"
-#~ msgstr "[%s]"
-
-#~ msgid "Available characters"
-#~ msgstr "المحارف المتوفرة"
-
-#, fuzzy
-#~ msgctxt "MENU"
-#~ msgid "Profile"
-#~ msgstr "الملف الشخصي"
-
-#~ msgid "Search help"
-#~ msgstr "ابحث فى المساعدة"
-
-#, fuzzy
-#~ msgid "Message too long. Maximum is %1$d character, you sent %2$d."
-#~ msgid_plural "Message too long. Maximum is %1$d characters, you sent %2$d."
-#~ msgstr[0] "هذا الملف كبير جدًا. إن أقصى حجم للملفات هو %d."
-#~ msgstr[1] "هذا الملف كبير جدًا. إن أقصى حجم للملفات هو %d."
-#~ msgstr[2] "هذا الملف كبير جدًا. إن أقصى حجم للملفات هو %d."
-#~ msgstr[3] "هذا الملف كبير جدًا. إن أقصى حجم للملفات هو %d."
-#~ msgstr[4] "هذا الملف كبير جدًا. إن أقصى حجم للملفات هو %d."
-#~ msgstr[5] "هذا الملف كبير جدًا. إن أقصى حجم للملفات هو %d."
+#~ msgctxt "BUTTON"
+#~ msgid "Comment"
+#~ msgstr "المحتوى"
diff --git a/locale/bg/LC_MESSAGES/statusnet.po b/locale/bg/LC_MESSAGES/statusnet.po
index 8694f56413..b783c1fa31 100644
--- a/locale/bg/LC_MESSAGES/statusnet.po
+++ b/locale/bg/LC_MESSAGES/statusnet.po
@@ -11,67 +11,57 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:23+0000\n"
-"PO-Revision-Date: 2011-03-03 17:25:41+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:08+0000\n"
 "Language-Team: Bulgarian <http://translatewiki.net/wiki/Portal:bg>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: bg\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-02-25 23:49:23+0000\n"
+"X-POT-Import-Date: 2011-03-03 17:59:19+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
-#: actions/accessadminpanel.php:53 lib/adminpanelaction.php:363
 msgid "Access"
 msgstr "Достъп"
 
 #. TRANS: Page notice.
-#: actions/accessadminpanel.php:64
 msgid "Site access settings"
 msgstr "Настройки за достъп до сайта"
 
 #. TRANS: Form legend for registration form.
-#: actions/accessadminpanel.php:151
 msgid "Registration"
 msgstr "Регистриране"
 
 #. TRANS: Checkbox instructions for admin setting "Private".
-#: actions/accessadminpanel.php:155
 msgid "Prohibit anonymous users (not logged in) from viewing site?"
 msgstr ""
 
 #. TRANS: Checkbox label for prohibiting anonymous users from viewing site.
-#: actions/accessadminpanel.php:157
 msgctxt "LABEL"
 msgid "Private"
 msgstr "Поверителност"
 
 #. TRANS: Checkbox instructions for admin setting "Invite only".
-#: actions/accessadminpanel.php:164
 msgid "Make registration invitation only."
 msgstr "Новите регистрации да са само с покани."
 
 #. TRANS: Checkbox label for configuring site as invite only.
-#: actions/accessadminpanel.php:166
 msgid "Invite only"
 msgstr "Само с покани"
 
 #. TRANS: Checkbox instructions for admin setting "Closed" (no new registrations).
-#: actions/accessadminpanel.php:173
 msgid "Disable new registrations."
 msgstr "Изключване на новите регистрации."
 
 #. TRANS: Checkbox label for disabling new user registrations.
-#: actions/accessadminpanel.php:175
 msgid "Closed"
 msgstr "Затворен"
 
 #. TRANS: Title for button to save access settings in site admin panel.
-#: actions/accessadminpanel.php:191
 msgid "Save access settings"
 msgstr "Запазване настройките за достъп"
 
@@ -79,6 +69,7 @@ msgstr "Запазване настройките за достъп"
 #. TRANS: Button text for saving theme settings.
 #. TRANS: Button label to save e-mail preferences.
 #. TRANS: Button label to save IM preferences.
+#. TRANS: Button text in the license admin panel.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
 #. TRANS: Button text for saving site notice in admin panel.
@@ -88,21 +79,12 @@ msgstr "Запазване настройките за достъп"
 #. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
 #. TRANS: Button text on profile design page to save settings.
-#: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
-#: actions/emailsettings.php:251 actions/imsettings.php:199
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:198
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:204
-#: actions/subscriptions.php:261 actions/urlsettings.php:152
-#: actions/useradminpanel.php:298 lib/applicationeditform.php:355
-#: lib/designform.php:320 lib/groupeditform.php:201
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Запазване"
 
 #. TRANS: Server error when page not found (404).
 #. TRANS: Server error when page not found (404)
-#: actions/all.php:68 actions/public.php:98 actions/replies.php:93
-#: actions/showfavorites.php:140 actions/tag.php:52
 msgid "No such page."
 msgstr "Няма такака страница."
 
@@ -121,6 +103,7 @@ msgstr "Няма такака страница."
 #. TRANS: Client error displayed when checking group membership for a non-existing user.
 #. TRANS: Client error displayed when trying to have a non-existing user join a group.
 #. TRANS: Client error displayed when trying to have a non-existing user leave a group.
+#. TRANS: Client error displayed when not providing a user or an invalid user.
 #. TRANS: Client error displayed when updating a status for a non-existing user.
 #. TRANS: Client error displayed when requesting a list of followers for a non-existing user.
 #. TRANS: Client error displayed when requesting most recent favourite notices by a user for a non-existing user.
@@ -133,6 +116,8 @@ msgstr "Няма такака страница."
 #. 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.
 #. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
@@ -140,33 +125,10 @@ msgstr "Няма такака страница."
 #. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when calling a profile action without specifying a user.
-#: actions/all.php:80 actions/allrss.php:69
-#: actions/apiaccountupdatedeliverydevice.php:110
-#: actions/apiaccountupdateprofile.php:103
-#: actions/apiaccountupdateprofilebackgroundimage.php:118
-#: actions/apiaccountupdateprofileimage.php:104 actions/apiatomservice.php:59
-#: actions/apiblockcreate.php:96 actions/apiblockdestroy.php:94
-#: actions/apidirectmessage.php:75 actions/apidirectmessagenew.php:72
-#: actions/apigroupcreate.php:111 actions/apigroupismember.php:89
-#: actions/apigroupjoin.php:98 actions/apigroupleave.php:98
-#: actions/apigrouplist.php:70 actions/apigroupprofileupdate.php:108
-#: actions/apistatusesupdate.php:230 actions/apisubscriptions.php:85
-#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:173
-#: actions/apitimelinehome.php:78 actions/apitimelinementions.php:77
-#: actions/apitimelineuser.php:79 actions/avatarbynickname.php:79
-#: actions/favoritesrss.php:72 actions/foaf.php:42 actions/foaf.php:61
-#: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116
-#: actions/otp.php:78 actions/remotesubscribe.php:144
-#: actions/remotesubscribe.php:153 actions/replies.php:73
-#: actions/repliesrss.php:38 actions/rsd.php:113 actions/showfavorites.php:106
-#: actions/userbyid.php:75 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/userxrd.php:59 actions/xrds.php:71 lib/command.php:509
-#: lib/galleryaction.php:59 lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Няма такъв потребител"
 
 #. TRANS: Page title. %1$s is user nickname, %2$d is page number
-#: actions/all.php:91
 #, php-format
 msgid "%1$s and friends, page %2$d"
 msgstr "%1$s и приятели, страница %2$d"
@@ -175,33 +137,26 @@ msgstr "%1$s и приятели, страница %2$d"
 #. TRANS: H1 text for page. %s is a user nickname.
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Timeline title for user and friends. %s is a user nickname.
-#: actions/all.php:94 actions/all.php:191 actions/allrss.php:117
-#: actions/apitimelinefriends.php:207 actions/apitimelinehome.php:113
-#: lib/personalgroupnav.php:100
 #, php-format
 msgid "%s and friends"
 msgstr "%s и приятели"
 
 #. TRANS: %s is user nickname.
-#: actions/all.php:108
 #, php-format
 msgid "Feed for friends of %s (RSS 1.0)"
 msgstr "Емисия с приятелите на %s (RSS 1.0)"
 
 #. TRANS: %s is user nickname.
-#: actions/all.php:117
 #, php-format
 msgid "Feed for friends of %s (RSS 2.0)"
 msgstr "Емисия с приятелите на %s (RSS 2.0)"
 
 #. TRANS: %s is user nickname.
-#: actions/all.php:126
 #, php-format
 msgid "Feed for friends of %s (Atom)"
 msgstr "Емисия с приятелите на %s (Atom)"
 
 #. TRANS: Empty list message. %s is a user nickname.
-#: actions/all.php:139
 #, php-format
 msgid ""
 "This is the timeline for %s and friends but no one has posted anything yet."
@@ -209,7 +164,6 @@ msgstr ""
 
 #. TRANS: Encouragement displayed on logged in user's empty timeline.
 #. TRANS: This message contains Markdown links. Keep "](" together.
-#: actions/all.php:146
 #, php-format
 msgid ""
 "Try subscribing to more people, [join a group](%%action.groups%%) or post "
@@ -218,7 +172,6 @@ msgstr ""
 
 #. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@".
 #. TRANS: This message contains Markdown links. Keep "](" together.
-#: actions/all.php:150
 #, php-format
 msgid ""
 "You can try to [nudge %1$s](../%2$s) from their profile or [post something "
@@ -229,7 +182,6 @@ msgstr ""
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
 #. TRANS: Second sentence of empty message for anonymous users. %s is a user nickname.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:221
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -237,14 +189,11 @@ msgid ""
 msgstr ""
 
 #. TRANS: H1 text for page when viewing a list for self.
-#: actions/all.php:188
 msgid "You and friends"
 msgstr "Вие и приятелите"
 
 #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
 #. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name.
-#: actions/allrss.php:122 actions/apitimelinefriends.php:213
-#: actions/apitimelinehome.php:119
 #, php-format
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr "Бележки от %1$s и приятели в %2$s."
@@ -263,55 +212,20 @@ msgstr "Бележки от %1$s и приятели в %2$s."
 #. TRANS: Client error displayed trying to execute an unknown API method checking group membership.
 #. TRANS: Client error displayed trying to execute an unknown API method listing the latest 20 groups.
 #. TRANS: Client error displayed trying to execute an unknown API method showing group membership.
+#. TRANS: Client error displayed when using an unsupported API format.
 #. TRANS: Client error displayed trying to execute an unknown API method showing a group.
 #. TRANS: Client error displayed trying to execute an unknown API method testing API connectivity.
 #. TRANS: Client error displayed trying to execute an unknown API method deleting a status.
 #. TRANS: Client error displayed when trying to handle an unknown API method.
-#: actions/apiaccountratelimitstatus.php:69
-#: actions/apiaccountupdatedeliverydevice.php:92
-#: actions/apiaccountupdateprofile.php:94
-#: actions/apiaccountupdateprofilebackgroundimage.php:92
-#: actions/apiaccountupdateprofilecolors.php:115
-#: actions/apiaccountverifycredentials.php:68 actions/apidirectmessage.php:157
-#: actions/apifavoritecreate.php:98 actions/apifavoritedestroy.php:98
-#: actions/apifriendshipscreate.php:99 actions/apifriendshipsdestroy.php:99
-#: actions/apifriendshipsshow.php:124 actions/apigroupcreate.php:138
-#: actions/apigroupismember.php:115 actions/apigroupjoin.php:151
-#: actions/apigroupleave.php:141 actions/apigrouplist.php:134
-#: actions/apigrouplistall.php:120 actions/apigroupmembership.php:105
-#: actions/apigroupprofileupdate.php:100 actions/apigroupprofileupdate.php:213
-#: actions/apigroupshow.php:114 actions/apihelptest.php:84
-#: actions/apistatusesdestroy.php:101 actions/apistatusesretweets.php:110
-#: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:139
-#: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
-#: actions/apitimelinefavorites.php:182 actions/apitimelinefriends.php:276
-#: actions/apitimelinegroup.php:148 actions/apitimelinehome.php:181
-#: actions/apitimelinementions.php:182 actions/apitimelinepublic.php:247
-#: actions/apitimelineretweetedtome.php:147
-#: actions/apitimelineretweetsofme.php:147 actions/apitimelinetag.php:165
-#: actions/apitimelineuser.php:217 actions/apiusershow.php:100
 msgid "API method not found."
 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.
-#: actions/apiaccountupdatedeliverydevice.php:83
-#: actions/apiaccountupdateprofile.php:85
-#: actions/apiaccountupdateprofilebackgroundimage.php:83
-#: actions/apiaccountupdateprofilecolors.php:106
-#: actions/apiaccountupdateprofileimage.php:80 actions/apiblockcreate.php:87
-#: actions/apiblockdestroy.php:85 actions/apidirectmessagenew.php:107
-#: actions/apifavoritecreate.php:88 actions/apifavoritedestroy.php:88
-#: actions/apifriendshipscreate.php:89 actions/apifriendshipsdestroy.php:89
-#: actions/apigroupcreate.php:102 actions/apigroupjoin.php:89
-#: actions/apigroupleave.php:89 actions/apigroupprofileupdate.php:92
-#: actions/apimediaupload.php:66 actions/apistatusesretweet.php:63
-#: actions/apistatusesupdate.php:194
 msgid "This method requires a POST."
 msgstr "Този метод изисква заявка POST."
 
 #. TRANS: Client error displayed when no valid device parameter is provided for a user's delivery device setting.
-#: actions/apiaccountupdatedeliverydevice.php:103
 msgid ""
 "You must specify a parameter named 'device' with a value of one of: sms, im, "
 "none."
@@ -324,10 +238,6 @@ msgstr ""
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
-#: actions/apiaccountupdatedeliverydevice.php:136
-#: actions/emailsettings.php:353 actions/emailsettings.php:499
-#: actions/profilesettings.php:323 actions/smssettings.php:300
-#: actions/smssettings.php:453 actions/urlsettings.php:211
 msgid "Could not update user."
 msgstr "Грешка при обновяване на потребителя."
 
@@ -340,32 +250,17 @@ msgstr "Грешка при обновяване на потребителя."
 #. TRANS: Server error displayed when requesting Friends of a Friend feed for a user for which the profile could not be found.
 #. TRANS: Server error displayed when trying to get a user hCard for a user without a profile.
 #. TRANS: Server error displayed when calling a profile action while the specified user does not have a profile.
-#: actions/apiaccountupdateprofile.php:111
-#: actions/apiaccountupdateprofilebackgroundimage.php:199
-#: actions/apiaccountupdateprofilecolors.php:183
-#: actions/apiaccountupdateprofileimage.php:131
-#: actions/apiuserprofileimage.php:88 actions/apiusershow.php:108
-#: actions/avatarbynickname.php:85 actions/foaf.php:69 actions/hcard.php:75
-#: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
-#: lib/profileaction.php:85
 msgid "User has no profile."
 msgstr "Потребителят няма профил."
 
 #. TRANS: Server error displayed if a user profile could not be saved.
 #. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:419
 msgid "Could not save profile."
 msgstr "Грешка при запазване на профила."
 
 #. TRANS: Client error displayed when the number of bytes in a POST request exceeds a limit.
 #. TRANS: %s is the number of bytes of the CONTENT_LENGTH.
 #. TRANS: Form validation error in design settings form. POST should remain untranslated.
-#: actions/apiaccountupdateprofilebackgroundimage.php:108
-#: actions/apiaccountupdateprofileimage.php:95 actions/apimediaupload.php:81
-#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
-#: actions/designadminpanel.php:120 actions/editapplication.php:121
-#: actions/newapplication.php:102 actions/newnotice.php:95
-#: lib/designsettings.php:110
 #, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s byte) due to its "
@@ -381,28 +276,17 @@ msgstr[1] ""
 #. TRANS: Client error displayed when a database error occurs inserting profile colours.
 #. TRANS: Client error displayed when a database error occurs updating profile colours.
 #. TRANS: Form validation error displayed when group design settings could not be saved because of an application issue.
-#: actions/apiaccountupdateprofilebackgroundimage.php:138
-#: actions/apiaccountupdateprofilebackgroundimage.php:149
-#: actions/apiaccountupdateprofilecolors.php:160
-#: actions/apiaccountupdateprofilecolors.php:171
-#: actions/groupdesignsettings.php:285 actions/groupdesignsettings.php:296
-#: actions/userdesignsettings.php:218 actions/userdesignsettings.php:228
-#: actions/userdesignsettings.php:270 actions/userdesignsettings.php:280
 #, fuzzy
 msgid "Unable to save your design settings."
 msgstr "Грешка при записване настройките за Twitter"
 
 #. TRANS: Error displayed when updating design settings fails.
 #. TRANS: Client error displayed when a database error occurs updating profile colours.
-#: actions/apiaccountupdateprofilebackgroundimage.php:191
-#: actions/apiaccountupdateprofilecolors.php:139
-#: actions/userdesignsettings.php:196
 #, fuzzy
 msgid "Could not update your design."
 msgstr "Грешка при обновяване на потребителя."
 
 #. TRANS: Title for Atom feed.
-#: actions/apiatomservice.php:85
 msgctxt "ATOM"
 msgid "Main"
 msgstr ""
@@ -411,9 +295,6 @@ msgstr ""
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Title in atom group notice feed. %s is a group name.
 #. TRANS: Title in atom user notice feed. %s is a user name.
-#: actions/apiatomservice.php:93 actions/grouprss.php:138
-#: actions/userrss.php:94 lib/atomgroupnoticefeed.php:63
-#: lib/atomusernoticefeed.php:88
 #, php-format
 msgid "%s timeline"
 msgstr "Поток на %s"
@@ -423,8 +304,6 @@ msgstr "Поток на %s"
 #. TRANS: %s is a user nickname.
 #. TRANS: Header for subscriptions overview for a user (first page).
 #. TRANS: %s is a user nickname.
-#: actions/apiatomservice.php:104 actions/atompubsubscriptionfeed.php:148
-#: actions/subscriptions.php:51
 #, php-format
 msgid "%s subscriptions"
 msgstr "Абонаменти на %s"
@@ -432,58 +311,48 @@ msgstr "Абонаменти на %s"
 #. TRANS: Title for Atom feed with a user's favorite notices. %s is a user nickname.
 #. TRANS: Title for Atom favorites feed.
 #. TRANS: %s is a user nickname.
-#: actions/apiatomservice.php:115 actions/atompubfavoritefeed.php:142
 #, fuzzy, php-format
 msgid "%s favorites"
 msgstr "Любими"
 
 #. TRANS: Title for Atom feed with a user's memberships. %s is a user nickname.
-#: actions/apiatomservice.php:126
 #, fuzzy, php-format
 msgid "%s memberships"
 msgstr "Членове на групата %s"
 
 #. TRANS: Client error displayed when users try to block themselves.
-#: actions/apiblockcreate.php:105
 msgid "You cannot block yourself!"
 msgstr "Не можете да блокирате себе си!"
 
 #. TRANS: Server error displayed when blocking a user has failed.
-#: actions/apiblockcreate.php:127
 msgid "Block user failed."
 msgstr "Грешка при блокиране на потребителя."
 
 #. TRANS: Server error displayed when unblocking a user has failed.
-#: actions/apiblockdestroy.php:113
 msgid "Unblock user failed."
 msgstr "Грешка при разблокиране на потребителя."
 
 #. TRANS: Title. %s is a user nickname.
-#: actions/apidirectmessage.php:88
 #, php-format
 msgid "Direct messages from %s"
 msgstr "Преки съобщения от %s"
 
 #. TRANS: Subtitle. %s is a user nickname.
-#: actions/apidirectmessage.php:93
 #, php-format
 msgid "All the direct messages sent from %s"
 msgstr "Всички преки съобщения, изпратени от %s"
 
 #. TRANS: Title. %s is a user nickname.
-#: actions/apidirectmessage.php:102
 #, php-format
 msgid "Direct messages to %s"
 msgstr "Преки съобщения до %s"
 
 #. TRANS: Subtitle. %s is a user nickname.
-#: actions/apidirectmessage.php:107
 #, php-format
 msgid "All the direct messages sent to %s"
 msgstr "Всички преки съобщения, изпратени до %s"
 
 #. TRANS: Client error displayed when no message text was submitted (406).
-#: actions/apidirectmessagenew.php:117
 msgid "No message text!"
 msgstr "Липсва текст на съобщението"
 
@@ -491,7 +360,6 @@ msgstr "Липсва текст на съобщението"
 #. TRANS: %d is the maximum number of characters for a message.
 #. TRANS: Form validation error displayed when message content is too long.
 #. TRANS: %d is the maximum number of characters for a message.
-#: actions/apidirectmessagenew.php:127 actions/newmessage.php:152
 #, fuzzy, php-format
 msgid "That's too long. Maximum message size is %d character."
 msgid_plural "That's too long. Maximum message size is %d characters."
@@ -499,12 +367,10 @@ msgstr[0] "Твърде дълго. Може да е най-много %d зна
 msgstr[1] "Твърде дълго. Може да е най-много %d знака."
 
 #. TRANS: Client error displayed if a recipient user could not be found (403).
-#: actions/apidirectmessagenew.php:139
 msgid "Recipient user not found."
 msgstr "Получателят не е открит"
 
 #. TRANS: Client error displayed trying to direct message another user who's not a friend (403).
-#: actions/apidirectmessagenew.php:144
 #, fuzzy
 msgid "Cannot send direct messages to users who aren't your friend."
 msgstr ""
@@ -512,7 +378,6 @@ msgstr ""
 "приятели."
 
 #. TRANS: Client error displayed trying to direct message self (403).
-#: actions/apidirectmessagenew.php:154
 #, fuzzy
 msgid ""
 "Do not send a message to yourself; just say it to yourself quietly instead."
@@ -523,118 +388,98 @@ 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.
 #. TRANS: Client error displayed trying to delete a status with an invalid ID.
-#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:108
-#: actions/apistatusesdestroy.php:121
 msgid "No status found with that ID."
 msgstr "Не е открита бележка с такъв идентификатор."
 
 #. TRANS: Client error displayed when trying to mark a notice favourite that already is a favourite.
-#: actions/apifavoritecreate.php:120
 msgid "This status is already a favorite."
 msgstr "Тази бележка вече е отбелязана като любима."
 
 #. TRANS: Client error displayed when marking a notice as favourite fails.
 #. TRANS: Server error displayed when trying to mark a notice as favorite fails in the database.
 #. TRANS: Error message text shown when a favorite could not be set.
-#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:306
 msgid "Could not create favorite."
 msgstr "Грешка при отбелязване като любима."
 
 #. TRANS: Client error displayed when trying to remove a favourite that was not a favourite.
-#: actions/apifavoritedestroy.php:122
 msgid "That status is not a favorite."
 msgstr "Тази бележка не е отбелязана като любима."
 
 #. TRANS: Client error displayed when removing a favourite has failed.
 #. TRANS: Server error displayed when removing a favorite from the database fails.
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:90
 msgid "Could not delete favorite."
 msgstr "Грешка при изтриване на любима бележка."
 
 #. TRANS: Client error displayed when trying follow who's profile could not be found.
-#: actions/apifriendshipscreate.php:109
 msgid "Could not follow user: profile not found."
 msgstr "Грешка при спиране на проследяването — потребителят не е намерен."
 
 #. TRANS: Client error displayed when trying to follow a user that's already being followed.
 #. TRANS: %s is the nickname of the user that is already being followed.
-#: actions/apifriendshipscreate.php:120
 #, php-format
 msgid "Could not follow user: %s is already on your list."
 msgstr "Грешка при проследяване на потребител: %s вече е в списъка ви."
 
 #. TRANS: Client error displayed when trying to unfollow a user that cannot be found.
-#: actions/apifriendshipsdestroy.php:109
 msgid "Could not unfollow user: User not found."
 msgstr "Грешка при спиране на проследяването — потребителят не е намерен."
 
 #. TRANS: Client error displayed when trying to unfollow self.
-#: actions/apifriendshipsdestroy.php:121
 msgid "You cannot unfollow yourself."
 msgstr "Не можете да спрете да следите себе си."
 
 #. TRANS: Client error displayed when supplying invalid parameters to an API call checking if a friendship exists.
-#: actions/apifriendshipsexists.php:88
 #, fuzzy
 msgid "Two valid IDs or nick names must be supplied."
 msgstr "Трябва да се дадат два идентификатора или имена на потребители."
 
 #. TRANS: Client error displayed when a source user could not be determined showing friendship.
-#: actions/apifriendshipsshow.php:131
 msgid "Could not determine source user."
 msgstr "Целевият потребител не беше открит."
 
 #. TRANS: Client error displayed when a target user could not be determined showing friendship.
-#: actions/apifriendshipsshow.php:140
 msgid "Could not find target user."
 msgstr "Целевият потребител не беше открит."
 
 #. TRANS: Client error trying to create a group with a nickname this is already in use.
+#. TRANS: API validation exception thrown when nickname is already used.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:156 actions/apigroupprofileupdate.php:255
-#: actions/editgroup.php:191 actions/newgroup.php:137
-#: actions/profilesettings.php:274 actions/register.php:199
 msgid "Nickname already in use. Try another one."
 msgstr "Опитайте друг псевдоним, този вече е зает."
 
 #. TRANS: Client error in form for group creation.
+#. TRANS: API validation exception thrown when nickname does not validate.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:164 actions/apigroupprofileupdate.php:259
-#: actions/editgroup.php:195 actions/newgroup.php:141
-#: actions/profilesettings.php:244 actions/register.php:201
 msgid "Not a valid nickname."
 msgstr "Неправилен псевдоним."
 
 #. TRANS: Client error in form for group creation.
+#. TRANS: API validation exception thrown when homepage URL does not validate.
 #. TRANS: Validation error shown when providing an invalid homepage URL in the "Edit application" form.
 #. TRANS: Group edit form validation error.
 #. TRANS: Validation error shown when providing an invalid homepage URL in the "New application" form.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:181 actions/apigroupprofileupdate.php:277
-#: actions/editapplication.php:235 actions/editgroup.php:202
-#: actions/newapplication.php:221 actions/newgroup.php:148
-#: actions/profilesettings.php:249 actions/register.php:208
 msgid "Homepage is not a valid URL."
 msgstr "Адресът на личната страница не е правилен URL."
 
 #. TRANS: Client error in form for group creation.
+#. TRANS: API validation exception thrown when full name does not validate.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:191 actions/editgroup.php:206
-#: actions/newgroup.php:152 actions/profilesettings.php:253
-#: actions/register.php:211
 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "Пълното име е твърде дълго (макс. 255 знака)"
 
 #. TRANS: Client error shown when providing too long a description during group creation.
 #. TRANS: %d is the maximum number of allowed characters.
+#. TRANS: API validation exception thrown when description does not validate.
+#. TRANS: %d is the maximum description length and used for plural.
 #. TRANS: Validation error shown when providing too long a description in the "Edit application" form.
 #. TRANS: %d is the maximum number of allowed characters.
 #. TRANS: Group edit form validation error.
@@ -642,9 +487,6 @@ msgstr "Пълното име е твърде дълго (макс. 255 знак
 #. TRANS: %d is the maximum number of characters for the description.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed characters.
-#: actions/apigroupcreate.php:201 actions/editapplication.php:202
-#: actions/editgroup.php:211 actions/newapplication.php:182
-#: actions/newgroup.php:157
 #, fuzzy, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."
@@ -652,24 +494,22 @@ msgstr[0] "Описанието е твърде дълго (до %d символ
 msgstr[1] "Описанието е твърде дълго (до %d символа)."
 
 #. TRANS: Client error shown when providing too long a location during group creation.
+#. TRANS: API validation exception thrown when location does not validate.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:215 actions/editgroup.php:218
-#: actions/newgroup.php:164 actions/profilesettings.php:266
-#: actions/register.php:220
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
 msgstr "Името на местоположението е твърде дълго (макс. 255 знака)."
 
 #. TRANS: Client error shown when providing too many aliases during group creation.
 #. TRANS: %d is the maximum number of allowed aliases.
+#. TRANS: API validation exception thrown when aliases do not validate.
+#. TRANS: %d is the maximum number of aliases and used for plural.
 #. TRANS: Group edit form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.
-#: actions/apigroupcreate.php:236 actions/editgroup.php:231
-#: actions/newgroup.php:177
 #, php-format
 msgid "Too many aliases! Maximum %d allowed."
 msgid_plural "Too many aliases! Maximum %d allowed."
@@ -678,25 +518,24 @@ msgstr[1] ""
 
 #. TRANS: Client error shown when providing an invalid alias during group creation.
 #. TRANS: %s is the invalid alias.
-#: actions/apigroupcreate.php:253
+#. TRANS: API validation exception thrown when aliases does not validate.
+#. TRANS: %s is the invalid alias.
 #, php-format
 msgid "Invalid alias: \"%s\"."
 msgstr "Неправилен псевдоним: \"%s\""
 
 #. TRANS: Client error displayed when trying to use an alias during group creation that is already in use.
 #. TRANS: %s is the alias that is already in use.
+#. TRANS: API validation exception thrown when aliases is already used.
+#. TRANS: %s is the already used alias.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error. %s is the already used alias.
-#: actions/apigroupcreate.php:264 actions/apigroupprofileupdate.php:351
-#: actions/editgroup.php:246 actions/newgroup.php:193
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "Псевдонимът \"%s\" вече е зает. Опитайте друг."
 
 #. TRANS: Client error displayed when trying to use an alias during group creation that is the same as the group's nickname.
 #. TRANS: Group edit form validation error.
-#: actions/apigroupcreate.php:278 actions/apigroupprofileupdate.php:359
-#: actions/editgroup.php:253
 msgid "Alias can't be the same as nickname."
 msgstr ""
 
@@ -704,26 +543,21 @@ msgstr ""
 #. TRANS: Client error displayed when trying to join a group that does not exist.
 #. TRANS: Client error displayed when trying to leave a group that does not exist.
 #. TRANS: Client error displayed trying to show group membership on a non-existing group.
+#. TRANS: Client error displayed when not providing a group or an invalid group.
 #. TRANS: Client error displayed when trying to show a group that could not be found.
 #. TRANS: Client error displayed requesting most recent notices to a group for a non-existing group.
-#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
-#: actions/apigroupleave.php:104 actions/apigroupmembership.php:71
-#: actions/apigroupprofileupdate.php:113 actions/apigroupshow.php:81
-#: actions/apitimelinegroup.php:89
 msgid "Group not found."
 msgstr "Групата не е открита."
 
 #. TRANS: Server error displayed when trying to join a group the user is already a member of.
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:345
 msgid "You are already a member of that group."
 msgstr "Вече членувате в тази група."
 
 #. TRANS: Server error displayed when trying to join a group the user is blocked from joining.
 #. 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.
-#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:350
 #, fuzzy
 msgid "You have been blocked from that group by the admin."
 msgstr "Не сте блокирали този потребител."
@@ -732,13 +566,11 @@ msgstr "Не сте блокирали този потребител."
 #. TRANS: %1$s is the joining user's nickname, $2$s is the group nickname for which the join failed.
 #. TRANS: Message given having failed to add a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:136 actions/joingroup.php:139 lib/command.php:362
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "Грешка при обновяване на групата."
 
 #. TRANS: Server error displayed when trying to leave a group the user is not a member of.
-#: actions/apigroupleave.php:115
 msgid "You are not a member of this group."
 msgstr "Не членувате в тази група."
 
@@ -746,120 +578,82 @@ msgstr "Не членувате в тази група."
 #. TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
 #. TRANS: Message given having failed to remove a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupleave.php:127 actions/leavegroup.php:133
-#: lib/command.php:410
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
 msgstr "Грешка при създаване на групата."
 
 #. TRANS: Used as title in check for group membership. %s is a user name.
-#: actions/apigrouplist.php:94
 #, php-format
 msgid "%s's groups"
 msgstr "Групи на %s"
 
 #. TRANS: Used as subtitle in check for group membership. %1$s is a user name, %2$s is the site name.
-#: actions/apigrouplist.php:104
 #, fuzzy, php-format
 msgid "%1$s groups %2$s is a member of."
 msgstr "Групи, в които участва %s"
 
 #. TRANS: Message is used as a title when listing the lastest 20 groups. %s is a site name.
 #. TRANS: Message is used as a page title. %s is a nick name.
-#: actions/apigrouplistall.php:88 actions/usergroups.php:63
 #, php-format
 msgid "%s groups"
 msgstr "Групи на %s"
 
 #. TRANS: Message is used as a subtitle when listing the lastest 20 groups. %s is a site name.
-#: actions/apigrouplistall.php:93
 #, php-format
 msgid "groups on %s"
 msgstr "групи в %s"
 
+#. TRANS: Client error displayed when trying to edit a group without being an admin.
 #. TRANS: Client error displayed trying to edit a group while not being a group admin.
 #. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
 #. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
-#: actions/apigroupprofileupdate.php:118 actions/editgroup.php:110
-#: actions/editgroup.php:176 actions/groupdesignsettings.php:109
-#: actions/grouplogo.php:111
 msgid "You must be an admin to edit the group."
 msgstr "За да редактирате група, трябва да сте влезли."
 
+#. TRANS: Server error displayed when group update fails.
 #. TRANS: Server error displayed when editing a group fails.
-#: actions/apigroupprofileupdate.php:171 actions/editgroup.php:274
 msgid "Could not update group."
 msgstr "Грешка при обновяване на групата."
 
+#. TRANS: Server error displayed when adding group aliases fails.
 #. TRANS: Server error displayed when group aliases could not be added.
 #. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/apigroupprofileupdate.php:194 actions/editgroup.php:281
-#: classes/User_group.php:540
 #, fuzzy
 msgid "Could not create aliases."
 msgstr "Грешка при отбелязване като любима."
 
+#. TRANS: API validation exception thrown when nickname does not validate.
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: actions/apigroupprofileupdate.php:249 lib/nickname.php:165
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr ""
 "Псевдонимът може да съдържа само малки букви, числа и никакво разстояние "
 "между тях."
 
-#: actions/apigroupprofileupdate.php:286
-#, fuzzy
-msgid "Full name is too long (max 255 chars)."
-msgstr "Пълното име е твърде дълго (макс. 255 знака)"
-
-#: actions/apigroupprofileupdate.php:296
-#, fuzzy, php-format
-msgid "description is too long (max %d chars)."
-msgstr "Описанието е твърде дълго (до %d символа)."
-
-#: actions/apigroupprofileupdate.php:307
-#, fuzzy
-msgid "Location is too long (max 255 chars)."
-msgstr "Името на местоположението е твърде дълго (макс. 255 знака)."
-
-#: actions/apigroupprofileupdate.php:326
-#, php-format
-msgid "Too many aliases! Maximum %d."
+#. TRANS: API validation exception thrown when alias is the same as nickname.
+#. TRANS: Group create form validation error.
+msgid "Alias cannot be the same as nickname."
 msgstr ""
 
-#. TRANS: Group edit form validation error.
-#. TRANS: Group create form validation error.
-#. TRANS: %s is the invalid alias.
-#: actions/apigroupprofileupdate.php:342 actions/editgroup.php:241
-#: actions/newgroup.php:188
-#, php-format
-msgid "Invalid alias: \"%s\""
-msgstr "Неправилен псевдоним: \"%s\""
-
 #. TRANS: Client error displayed when uploading a media file has failed.
-#: actions/apimediaupload.php:101
 #, fuzzy
 msgid "Upload failed."
 msgstr "Качване на файл"
 
 #. TRANS: Client error given from the OAuth API when the request token or verifier is invalid.
-#: actions/apioauthaccesstoken.php:102
 #, fuzzy
 msgid "Invalid request token or verifier."
 msgstr "Не е указана бележка."
 
 #. TRANS: Client error given when no oauth_token was passed to the OAuth API.
-#: actions/apioauthauthorize.php:107
 msgid "No oauth_token parameter provided."
 msgstr ""
 
 #. TRANS: Client error given when an invalid request token was passed to the OAuth API.
-#: actions/apioauthauthorize.php:115 actions/apioauthauthorize.php:129
 #, fuzzy
 msgid "Invalid request token."
 msgstr "Неправилен размер."
 
 #. TRANS: Client error given when an invalid request token was passed to the OAuth API.
-#: actions/apioauthauthorize.php:121
 #, fuzzy
 msgid "Request token already authorized."
 msgstr "Не сте абонирани за никого."
@@ -870,31 +664,14 @@ msgstr "Не сте абонирани за никого."
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
 #. TRANS: Client error displayed when the session token is not okay.
-#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:75
-#: actions/emailsettings.php:292 actions/favor.php:75 actions/geocode.php:55
-#: actions/groupblock.php:65 actions/grouplogo.php:321
-#: actions/groupunblock.php:65 actions/imsettings.php:241
-#: actions/invite.php:60 actions/makeadmin.php:66 actions/newmessage.php:135
-#: actions/newnotice.php:105 actions/nudge.php:80
-#: actions/oauthappssettings.php:162 actions/oauthconnectionssettings.php:135
-#: actions/passwordsettings.php:137 actions/pluginenable.php:87
-#: actions/profilesettings.php:218 actions/recoverpassword.php:383
-#: actions/register.php:157 actions/remotesubscribe.php:76
-#: actions/repeat.php:82 actions/smssettings.php:249 actions/subedit.php:40
-#: actions/subscribe.php:87 actions/tagother.php:145
-#: actions/unsubscribe.php:69 actions/urlsettings.php:171
-#: actions/userauthorization.php:53 lib/designsettings.php:122
 msgid "There was a problem with your session token. Try again, please."
 msgstr "Имаше проблем със сесията ви в сайта. Моля, опитайте отново!"
 
 #. TRANS: Form validation error given when an invalid username and/or password was passed to the OAuth API.
-#: actions/apioauthauthorize.php:168
 msgid "Invalid nickname / password!"
 msgstr "Неправилно име или парола!"
 
 #. TRANS: Server error displayed when a database action fails.
-#: actions/apioauthauthorize.php:217
 #, fuzzy
 msgid "Database error inserting oauth_token_association."
 msgstr "Грешка в базата от данни — отговор при вмъкването: %s"
@@ -911,28 +688,19 @@ msgstr "Грешка в базата от данни — отговор при 
 #. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
 #. TRANS: Message given submitting a form with an unknown action in SMS settings.
 #. TRANS: Unknown form validation error in design settings form.
-#: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
-#: actions/designadminpanel.php:100 actions/editapplication.php:144
-#: actions/emailsettings.php:311 actions/grouplogo.php:332
-#: actions/imsettings.php:256 actions/newapplication.php:124
-#: actions/oauthconnectionssettings.php:144 actions/recoverpassword.php:46
-#: actions/smssettings.php:270 lib/designsettings.php:133
 msgid "Unexpected form submission."
 msgstr "Неочаквано изпращане на форма."
 
 #. TRANS: Title for a page where a user can confirm/deny account access by an external application.
-#: actions/apioauthauthorize.php:387
 msgid "An application would like to connect to your account"
 msgstr ""
 
 #. TRANS: Fieldset legend.
-#: actions/apioauthauthorize.php:404
 msgid "Allow or deny access"
 msgstr "Разрешение или забрана на достъпа"
 
 #. TRANS: User notification of external application requesting account access.
 #. TRANS: %3$s is the access type requested (read-write or read-only), %4$s is the StatusNet sitename.
-#: actions/apioauthauthorize.php:425
 #, php-format
 msgid ""
 "An application would like the ability to <strong>%3$s</strong> your %4$s "
@@ -943,7 +711,6 @@ msgstr ""
 #. TRANS: User notification of external application requesting account access.
 #. TRANS: %1$s is the application name requesting access, %2$s is the organisation behind the application,
 #. TRANS: %3$s is the access type requested, %4$s is the StatusNet sitename.
-#: actions/apioauthauthorize.php:433
 #, php-format
 msgid ""
 "The application <strong>%1$s</strong> by <strong>%2$s</strong> would like "
@@ -952,23 +719,18 @@ msgid ""
 msgstr ""
 
 #. TRANS: Fieldset legend.
-#: actions/apioauthauthorize.php:455
-#, fuzzy
 msgctxt "LEGEND"
 msgid "Account"
 msgstr "Сметка"
 
 #. TRANS: Field label on OAuth API authorisation form.
+#. TRANS: Field label on login page.
 #. TRANS: Field label in form for profile settings.
-#: actions/apioauthauthorize.php:459 actions/login.php:225
-#: actions/profilesettings.php:107 actions/register.php:411
-#: actions/userauthorization.php:145 lib/groupeditform.php:145
 msgid "Nickname"
 msgstr "Псевдоним"
 
 #. TRANS: Field label on OAuth API authorisation form.
-#: actions/apioauthauthorize.php:463 actions/login.php:228
-#: actions/register.php:415 lib/settingsnav.php:87
+#. TRANS: Field label on login page.
 msgid "Password"
 msgstr "Парола"
 
@@ -978,46 +740,37 @@ msgstr "Парола"
 #. TRANS: Button label to cancel an IM address confirmation procedure.
 #. TRANS: Button label to cancel a SMS address confirmation procedure.
 #. TRANS: Button label in the "Edit application" form.
-#: actions/apioauthauthorize.php:478 actions/emailsettings.php:125
-#: actions/imsettings.php:136 actions/smssettings.php:132
-#: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Cancel"
 msgstr "Отказ"
 
 #. TRANS: Button text that when clicked will allow access to an account by an external application.
-#: actions/apioauthauthorize.php:485
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Allow"
 msgstr "Разрешение"
 
 #. TRANS: Form instructions.
-#: actions/apioauthauthorize.php:502
 msgid "Authorize access to your account information."
 msgstr ""
 
 #. TRANS: Header for user notification after revoking OAuth access to an application.
-#: actions/apioauthauthorize.php:594
 #, fuzzy
 msgid "Authorization canceled."
 msgstr "Няма код за потвърждение."
 
 #. TRANS: User notification after revoking OAuth access to an application.
 #. TRANS: %s is an OAuth token.
-#: actions/apioauthauthorize.php:598
 #, php-format
 msgid "The request token %s has been revoked."
 msgstr ""
 
 #. TRANS: Title of the page notifying the user that an anonymous client application was successfully authorized to access the user's account with OAuth.
-#: actions/apioauthauthorize.php:621
 #, fuzzy
 msgid "You have successfully authorized the application"
 msgstr "Не сте абонирани за никого."
 
 #. TRANS: Message notifying the user that an anonymous client application was successfully authorized to access the user's account with OAuth.
-#: actions/apioauthauthorize.php:625
 msgid ""
 "Please return to the application and enter the following security code to "
 "complete the process."
@@ -1025,14 +778,12 @@ msgstr ""
 
 #. TRANS: Title of the page notifying the user that the client application was successfully authorized to access the user's account with OAuth.
 #. TRANS: %s is the authorised application name.
-#: actions/apioauthauthorize.php:632
 #, fuzzy, php-format
 msgid "You have successfully authorized %s"
 msgstr "Не сте абонирани за никого."
 
 #. TRANS: Message notifying the user that the client application was successfully authorized to access the user's account with OAuth.
 #. TRANS: %s is the authorised application name.
-#: actions/apioauthauthorize.php:639
 #, php-format
 msgid ""
 "Please return to %s and enter the following security code to complete the "
@@ -1041,12 +792,10 @@ msgstr ""
 
 #. TRANS: Client error displayed trying to delete a status not using POST or DELETE.
 #. TRANS: POST and DELETE should not be translated.
-#: actions/apistatusesdestroy.php:111
 msgid "This method requires a POST or DELETE."
 msgstr "Този метод изисква заявка POST или DELETE."
 
 #. TRANS: Client error displayed trying to delete a status of another user.
-#: actions/apistatusesdestroy.php:136
 msgid "You may not delete another user's status."
 msgstr "Не може да изтривате бележки на друг потребител."
 
@@ -1054,21 +803,16 @@ msgstr "Не може да изтривате бележки на друг по
 #. TRANS: Client error displayed trying to display redents of a non-exiting notice.
 #. TRANS: Client exception thrown when referencing a non-existing notice.
 #. TRANS: Error message displayed trying to delete a non-existing notice.
-#: actions/apistatusesretweet.php:74 actions/apistatusesretweets.php:70
-#: actions/atompubshowfavorite.php:82 actions/deletenotice.php:61
-#: actions/shownotice.php:92
 msgid "No such notice."
 msgstr "Няма такава бележка."
 
 #. TRANS: Client error displayed trying to repeat an own notice through the API.
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:549
 msgid "Cannot repeat your own notice."
 msgstr "Не можете да повтаряте собствени бележки."
 
 #. TRANS: Client error displayed trying to re-repeat a notice through the API.
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:92 lib/command.php:555
 msgid "Already repeated that notice."
 msgstr "Вече сте повторили тази бележка."
 
@@ -1078,59 +822,45 @@ msgstr "Вече сте повторили тази бележка."
 #. TRANS: Client exception thrown when using an unsupported HTTP method.
 #. TRANS: Client error shown when using a non-supported HTTP method.
 #. TRANS: Client exception thrown when using an unsupported HTTP method.
-#: actions/apistatusesshow.php:118 actions/atompubfavoritefeed.php:103
-#: actions/atompubmembershipfeed.php:105 actions/atompubshowfavorite.php:117
-#: actions/atompubshowmembership.php:116
-#: actions/atompubshowsubscription.php:122
-#: actions/atompubsubscriptionfeed.php:109
 #, fuzzy
 msgid "HTTP method not supported."
 msgstr "Не е открит методът в API."
 
 #. TRANS: Exception thrown requesting an unsupported notice output format.
 #. TRANS: %s is the requested output format.
-#: actions/apistatusesshow.php:144
 #, fuzzy, php-format
 msgid "Unsupported format: %s."
 msgstr "Неподдържан формат."
 
 #. TRANS: Client error displayed requesting a deleted status.
-#: actions/apistatusesshow.php:155
 msgid "Status deleted."
 msgstr "Бележката е изтрита."
 
 #. TRANS: Client error displayed requesting a status with an invalid ID.
-#: actions/apistatusesshow.php:162
 msgid "No status with that ID found."
 msgstr "Не е открита бележка с такъв идентификатор."
 
 #. TRANS: Client error displayed when trying to delete a notice not using the Atom format.
-#: actions/apistatusesshow.php:227
 msgid "Can only delete using the Atom format."
 msgstr ""
 
 #. TRANS: Client error displayed when a user has no rights to delete notices of other users.
 #. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
-#: actions/apistatusesshow.php:235 actions/deletenotice.php:78
 #, fuzzy
 msgid "Cannot delete this notice."
 msgstr "Грешка при изтриване на бележката."
 
 #. TRANS: Confirmation of notice deletion in API. %d is the ID (number) of the deleted notice.
-#: actions/apistatusesshow.php:249
 #, fuzzy, php-format
 msgid "Deleted notice %d"
 msgstr "Изтриване на бележката"
 
 #. TRANS: Client error displayed when the parameter "status" is missing.
-#: actions/apistatusesupdate.php:221
 msgid "Client must provide a 'status' parameter with a value."
 msgstr ""
 
 #. TRANS: Client error displayed when the parameter "status" is missing.
 #. TRANS: %d is the maximum number of character for a notice.
-#: actions/apistatusesupdate.php:244 actions/newnotice.php:161
-#: lib/mailhandler.php:60
 #, fuzzy, php-format
 msgid "That's too long. Maximum notice size is %d character."
 msgid_plural "That's too long. Maximum notice size is %d characters."
@@ -1138,14 +868,12 @@ msgstr[0] "Твърде дълго. Може да е най-много %d зна
 msgstr[1] "Твърде дълго. Може да е най-много %d знака."
 
 #. TRANS: Client error displayed when replying to a non-existing notice.
-#: actions/apistatusesupdate.php:284
 #, fuzzy
 msgid "Parent notice not found."
 msgstr "Не е открит методът в API."
 
 #. TRANS: Client error displayed exceeding the maximum notice length.
 #. TRANS: %d is the maximum lenth for a notice.
-#: actions/apistatusesupdate.php:308 actions/newnotice.php:184
 #, php-format
 msgid "Maximum notice size is %d character, including attachment URL."
 msgid_plural "Maximum notice size is %d characters, including attachment URL."
@@ -1154,13 +882,11 @@ msgstr[1] ""
 
 #. TRANS: Client error displayed when requesting profiles of followers in an unsupported format.
 #. TRANS: Client error displayed when requesting IDs of followers in an unsupported format.
-#: actions/apisubscriptions.php:228 actions/apisubscriptions.php:258
 msgid "Unsupported format."
 msgstr "Неподдържан формат."
 
 #. TRANS: Title for timeline of most recent favourite notices by a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname.
-#: actions/apitimelinefavorites.php:108
 #, php-format
 msgid "%1$s / Favorites from %2$s"
 msgstr "Бележка на %1$s от %2$s"
@@ -1168,14 +894,12 @@ msgstr "Бележка на %1$s от %2$s"
 #. TRANS: Subtitle for timeline of most recent favourite notices by a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user's full name,
 #. TRANS: %3$s is a user nickname.
-#: actions/apitimelinefavorites.php:120
 #, fuzzy, php-format
 msgid "%1$s updates favorited by %2$s / %3$s."
 msgstr "%1$s реплики на съобщения от %2$s / %3$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.
-#: actions/apitimelinementions.php:115
 #, php-format
 msgid "%1$s / Updates mentioning %2$s"
 msgstr "Бележка на %1$s от %2$s"
@@ -1183,49 +907,41 @@ msgstr "Бележка на %1$s от %2$s"
 #. TRANS: Subtitle for timeline of most recent mentions of a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname,
 #. TRANS: %3$s is a user's full name.
-#: actions/apitimelinementions.php:131
 #, php-format
 msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr "%1$s реплики на съобщения от %2$s / %3$s."
 
 #. TRANS: Title for site timeline. %s is the StatusNet sitename.
 #. TRANS: Public RSS feed title. %s is the StatusNet site name.
-#: actions/apitimelinepublic.php:193 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "Общ поток на %s"
 
 #. TRANS: Subtitle for site timeline. %s is the StatusNet sitename.
-#: actions/apitimelinepublic.php:199
 #, php-format
 msgid "%s updates from everyone!"
 msgstr ""
 
 #. TRANS: Server error displayed calling unimplemented API method for 'retweeted by me'.
-#: actions/apitimelineretweetedbyme.php:71
 #, fuzzy
 msgid "Unimplemented."
 msgstr "Командата все още не се поддържа."
 
 #. TRANS: Title for Atom feed "repeated to me". %s is the user nickname.
-#: actions/apitimelineretweetedtome.php:96
 #, php-format
 msgid "Repeated to %s"
 msgstr "Повторено за %s"
 
-#: actions/apitimelineretweetedtome.php:98
 #, fuzzy, php-format
 msgid "%1$s notices that were to repeated to %2$s / %3$s."
 msgstr "%1$s реплики на съобщения от %2$s / %3$s."
 
 #. TRANS: Title of list of repeated notices of the logged in user.
 #. TRANS: %s is the nickname of the logged in user.
-#: actions/apitimelineretweetsofme.php:98
 #, php-format
 msgid "Repeats of %s"
 msgstr "Повторения на %s"
 
-#: actions/apitimelineretweetsofme.php:104
 #, fuzzy, php-format
 msgid "%1$s notices that %2$s / %3$s has repeated."
 msgstr "%s (@%s) отбеляза бележката ви като любима"
@@ -1234,181 +950,146 @@ msgstr "%s (@%s) отбеляза бележката ви като любима"
 #. TRANS: %s is the tag.
 #. TRANS: Title for first page of notices with tags.
 #. TRANS: %s is the tag.
-#: actions/apitimelinetag.php:101 actions/tag.php:69
 #, php-format
 msgid "Notices tagged with %s"
 msgstr "Бележки с етикет %s"
 
 #. TRANS: Subtitle for timeline with lastest notices with a given tag.
 #. TRANS: %1$s is the tag, $2$s is the StatusNet sitename.
-#: actions/apitimelinetag.php:105 actions/tagrss.php:65
 #, fuzzy, php-format
 msgid "Updates tagged with %1$s on %2$s!"
 msgstr "Бележки от %1$s в %2$s."
 
 #. TRANS: Client error displayed trying to add a notice to another user's timeline.
-#: actions/apitimelineuser.php:308
 #, fuzzy
 msgid "Only the user can add to their own timeline."
 msgstr "Само потребителят може да отваря собствената си кутия."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:315
 msgid "Only accept AtomPub for Atom feeds."
 msgstr ""
 
 #. TRANS: Client error displayed attempting to post an empty API notice.
-#: actions/apitimelineuser.php:322
 msgid "Atom post must not be empty."
 msgstr ""
 
 #. TRANS: Client error displayed attempting to post an API that is not well-formed XML.
-#: actions/apitimelineuser.php:328
 msgid "Atom post must be well-formed XML."
 msgstr ""
 
 #. TRANS: Client error displayed when not using an Atom entry.
-#: actions/apitimelineuser.php:334 actions/atompubfavoritefeed.php:228
-#: actions/atompubmembershipfeed.php:230
-#: actions/atompubsubscriptionfeed.php:236
 msgid "Atom post must be an Atom entry."
 msgstr ""
 
 #. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
-#: actions/apitimelineuser.php:345
 msgid "Can only handle POST activities."
 msgstr ""
 
 #. TRANS: Client error displayed when using an unsupported activity object type.
 #. TRANS: %s is the unsupported activity object type.
-#: actions/apitimelineuser.php:356
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
 #. TRANS: %d is the notice ID (number).
-#: actions/apitimelineuser.php:390
 #, fuzzy, php-format
 msgid "No content for notice %d."
 msgstr "Търсене в съдържанието на бележките"
 
 #. TRANS: Client error displayed when using another format than AtomPub.
 #. TRANS: %s is the notice URI.
-#: actions/apitimelineuser.php:419
 #, fuzzy, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "Не е открита бележка с такъв идентификатор."
 
 #. TRANS: Server error for unfinished API method showTrends.
-#: actions/apitrends.php:85
 msgid "API method under construction."
 msgstr "Методът в API все още се разработва."
 
 #. TRANS: Client error displayed when requesting user information for a non-existing user.
-#: actions/apiuserprofileimage.php:80 actions/apiusershow.php:94
 msgid "User not found."
 msgstr "Не е открит методът в API."
 
 #. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
 #. TRANS: Client exception.
 #. TRANS: Client error displayed trying to subscribe to a non-existing profile.
-#: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
-#: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
-#: actions/subscribe.php:110
 msgid "No such profile."
 msgstr "Няма такъв профил."
 
 #. TRANS: Subtitle for Atom favorites feed.
 #. TRANS: %1$s is a user nickname, %2$s is the StatusNet sitename.
-#: actions/atompubfavoritefeed.php:147
 #, fuzzy, php-format
 msgid "Notices %1$s has favorited on %2$s"
 msgstr "Бележки от %1$s и приятели в %2$s."
 
 #. TRANS: Client exception thrown when trying to set a favorite for another user.
 #. TRANS: Client exception thrown when trying to subscribe another user.
-#: actions/atompubfavoritefeed.php:217 actions/atompubsubscriptionfeed.php:225
 #, fuzzy
 msgid "Cannot add someone else's subscription."
 msgstr "Грешка при добавяне на нов абонамент."
 
 #. TRANS: Client exception thrown when trying use an incorrect activity verb for the Atom pub method.
-#: actions/atompubfavoritefeed.php:240
 #, fuzzy
 msgid "Can only handle favorite activities."
 msgstr "Търсене в съдържанието на бележките"
 
 #. TRANS: Client exception thrown when trying favorite an object that is not a notice.
-#: actions/atompubfavoritefeed.php:250 actions/atompubmembershipfeed.php:250
 #, fuzzy
 msgid "Can only fave notices."
 msgstr "Търсене в съдържанието на бележките"
 
 #. TRANS: Client exception thrown when trying favorite a notice without content.
-#: actions/atompubfavoritefeed.php:259
 #, fuzzy
 msgid "Unknown note."
 msgstr "Непознато"
 
 #. TRANS: Client exception thrown when trying favorite an already favorited notice.
-#: actions/atompubfavoritefeed.php:267
-#, fuzzy
 msgid "Already a favorite."
-msgstr "Добавяне към любимите"
+msgstr "Вече е в любимите."
 
 #. TRANS: Title for group membership feed.
 #. TRANS: %s is a username.
-#: actions/atompubmembershipfeed.php:144
 #, fuzzy, php-format
 msgid "%s group memberships"
 msgstr "Членове на групата %s"
 
 #. TRANS: Subtitle for group membership feed.
 #. TRANS: %1$s is a username, %2$s is the StatusNet sitename.
-#: actions/atompubmembershipfeed.php:149
 #, fuzzy, php-format
 msgid "Groups %1$s is a member of on %2$s"
 msgstr "Групи, в които участва %s"
 
 #. TRANS: Client exception thrown when trying subscribe someone else to a group.
-#: actions/atompubmembershipfeed.php:219
 #, fuzzy
 msgid "Cannot add someone else's membership."
 msgstr "Грешка при добавяне на нов абонамент."
 
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#: actions/atompubmembershipfeed.php:242
 #, fuzzy
 msgid "Can only handle join activities."
 msgstr "Търсене в съдържанието на бележките"
 
 #. TRANS: Client exception thrown when trying to subscribe to a non-existing group.
-#: actions/atompubmembershipfeed.php:259
-#, fuzzy
 msgid "Unknown group."
-msgstr "Непознато"
+msgstr "Непозната група."
 
 #. TRANS: Client exception thrown when trying to subscribe to an already subscribed group.
-#: actions/atompubmembershipfeed.php:267
 #, fuzzy
 msgid "Already a member."
 msgstr "Всички членове"
 
 #. TRANS: Client exception thrown when trying to subscribe to group while blocked from that group.
-#: actions/atompubmembershipfeed.php:275
 msgid "Blocked by admin."
 msgstr ""
 
 #. TRANS: Client exception thrown when referencing a non-existing favorite.
-#: actions/atompubshowfavorite.php:90
 #, fuzzy
 msgid "No such favorite."
 msgstr "Няма такъв файл."
 
 #. TRANS: Client exception thrown when trying to remove a favorite notice of another user.
-#: actions/atompubshowfavorite.php:151
 #, fuzzy
 msgid "Cannot delete someone else's favorite."
 msgstr "Грешка при изтриване на любима бележка."
@@ -1435,93 +1116,68 @@ msgstr "Грешка при изтриване на любима бележка.
 #. TRANS: Client error displayed when trying to join a non-existing group.
 #. TRANS: Client error displayed when trying to leave a non-local group.
 #. TRANS: Client error displayed when trying to leave a non-existing group.
+#. TRANS: Client error displayed when providing an invalid group ID on the Make Admin page.
 #. 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.
 #. TRANS: Command exception text shown when a group is requested that does not exist.
 #. TRANS: Error text shown when trying to leave a group that does not exist.
-#: actions/atompubshowmembership.php:81 actions/blockedfromgroup.php:81
-#: actions/blockedfromgroup.php:89 actions/deletegroup.php:87
-#: actions/deletegroup.php:100 actions/editgroup.php:102
-#: actions/foafgroup.php:46 actions/foafgroup.php:65 actions/foafgroup.php:73
-#: actions/groupblock.php:89 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:101 actions/grouplogo.php:103
-#: actions/groupmembers.php:84 actions/groupmembers.php:92
-#: actions/grouprss.php:97 actions/grouprss.php:105
-#: actions/groupunblock.php:89 actions/joingroup.php:82
-#: actions/joingroup.php:95 actions/leavegroup.php:82
-#: actions/leavegroup.php:95 actions/makeadmin.php:86
-#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:392
 msgid "No such group."
 msgstr "Няма такава група"
 
 #. TRANS: Client exception thrown when trying to show membership of a non-subscribed group
-#: actions/atompubshowmembership.php:91
 #, fuzzy
 msgid "Not a member."
 msgstr "Всички членове"
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
-#: actions/atompubshowmembership.php:150
 #, fuzzy
 msgid "Cannot delete someone else's membership."
 msgstr "Грешка при добавяне на нов абонамент."
 
 #. TRANS: Client exception thrown when trying to display a subscription for a non-existing profile ID.
 #. TRANS: %d is the non-existing profile ID number.
-#: actions/atompubshowsubscription.php:72
-#: actions/atompubshowsubscription.php:83
-#: actions/atompubsubscriptionfeed.php:74
 #, fuzzy, php-format
 msgid "No such profile id: %d."
 msgstr "Няма такъв профил."
 
 #. 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.
-#: actions/atompubshowsubscription.php:94
 #, fuzzy, php-format
 msgid "Profile %1$d not subscribed to profile %2$d."
 msgstr "Не сте абонирани за този профил"
 
 #. TRANS: Client exception thrown when trying to delete a subscription of another user.
-#: actions/atompubshowsubscription.php:157
 #, fuzzy
 msgid "Cannot delete someone else's subscription."
 msgstr "Грешка при добавяне на нов абонамент."
 
 #. TRANS: Subtitle for Atom subscription feed.
 #. TRANS: %1$s is a user nickname, %s$s is the StatusNet sitename.
-#: actions/atompubsubscriptionfeed.php:153
 #, fuzzy, php-format
 msgid "People %1$s has subscribed to on %2$s"
 msgstr "Абонирани за %s"
 
 #. TRANS: Client error displayed when not using the follow verb.
-#: actions/atompubsubscriptionfeed.php:248
 msgid "Can only handle Follow activities."
 msgstr ""
 
 #. TRANS: Client exception thrown when subscribing to an object that is not a person.
-#: actions/atompubsubscriptionfeed.php:256
 msgid "Can only follow people."
 msgstr ""
 
 #. TRANS: Client exception thrown when subscribing to a non-existing profile.
 #. TRANS: %s is the unknown profile ID.
-#: actions/atompubsubscriptionfeed.php:267
 #, fuzzy, php-format
 msgid "Unknown profile %s."
 msgstr "Неподдържан вид файл"
 
 #. TRANS: Client error displayed trying to subscribe to an already subscribed profile.
 #. TRANS: %s is the profile the user already has a subscription on.
-#: actions/atompubsubscriptionfeed.php:275
 #, fuzzy, php-format
 msgid "Already subscribed to %s."
 msgstr "Не сте абонирани!"
 
 #. TRANS: Client error displayed trying to get a non-existing attachment.
-#: actions/attachment.php:73
 msgid "No such attachment."
 msgstr "Няма прикачени файлове."
 
@@ -1533,31 +1189,23 @@ msgstr "Няма прикачени файлове."
 #. TRANS: Client error displayed when trying to view group members without providing a group nickname.
 #. TRANS: Client error displayed when requesting a group RSS feed without providing a group nickname.
 #. TRANS: Client error displayed if no nickname argument was given requesting a group page.
-#: actions/avatarbynickname.php:60 actions/blockedfromgroup.php:73
-#: actions/editgroup.php:85 actions/groupdesignsettings.php:84
-#: actions/grouplogo.php:86 actions/groupmembers.php:76
-#: actions/grouprss.php:89 actions/showgroup.php:116
 msgid "No nickname."
 msgstr "Няма псевдоним."
 
 #. TRANS: Client error displayed trying to get an avatar without providing an avatar size.
-#: actions/avatarbynickname.php:66
 msgid "No size."
 msgstr "Няма размер."
 
 #. TRANS: Client error displayed trying to get an avatar providing an invalid avatar size.
-#: actions/avatarbynickname.php:72
 msgid "Invalid size."
 msgstr "Неправилен размер."
 
 #. TRANS: Title for avatar upload page.
-#: actions/avatarsettings.php:66 lib/settingsnav.php:82
 msgid "Avatar"
 msgstr "Аватар"
 
 #. TRANS: Instruction for avatar upload page.
 #. TRANS: %s is the maximum file size, for example "500b", "10kB" or "2MB".
-#: actions/avatarsettings.php:78
 #, php-format
 msgid "You can upload your personal avatar. The maximum file size is %s."
 msgstr ""
@@ -1567,17 +1215,12 @@ msgstr ""
 #. TRANS: Server error displayed coming across a request from a user without a profile.
 #. TRANS: Server error displayed when trying to authorise a remote subscription request
 #. TRANS: while the user has no profile.
-#: actions/avatarsettings.php:108 actions/avatarsettings.php:192
-#: actions/grouplogo.php:184 actions/remotesubscribe.php:190
-#: actions/userauthorization.php:75 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr "Потребителят няма профил."
 
 #. TRANS: Avatar upload page form legend.
 #. TRANS: Avatar upload page crop form legend.
 #. TRANS: Legend for group logo settings fieldset.
-#: actions/avatarsettings.php:122 actions/avatarsettings.php:205
-#: actions/grouplogo.php:261
 msgid "Avatar settings"
 msgstr "Настройки за аватар"
 
@@ -1585,8 +1228,6 @@ msgstr "Настройки за аватар"
 #. TRANS: Header on avatar upload crop form for thumbnail of originally uploaded avatar (h2).
 #. TRANS: Uploaded original file in group logo form.
 #. TRANS: Header for originally uploaded file before a crop on the group logo page.
-#: actions/avatarsettings.php:131 actions/avatarsettings.php:214
-#: actions/grouplogo.php:207 actions/grouplogo.php:270
 msgid "Original"
 msgstr "Оригинал"
 
@@ -1594,14 +1235,11 @@ msgstr "Оригинал"
 #. TRANS: Header on avatar upload crop form for thumbnail of to be used rendition of uploaded avatar (h2).
 #. TRANS: Header for preview of to be displayed group logo.
 #. TRANS: Header for the cropped group logo on the group logo page.
-#: actions/avatarsettings.php:147 actions/avatarsettings.php:227
-#: actions/grouplogo.php:219 actions/grouplogo.php:283
 msgid "Preview"
 msgstr "Преглед"
 
 #. TRANS: Button on avatar upload page to delete current avatar.
 #. TRANS: Button text for user account deletion.
-#: actions/avatarsettings.php:155 actions/deleteaccount.php:319
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Delete"
@@ -1609,70 +1247,58 @@ msgstr "Изтриване"
 
 #. TRANS: Button on avatar upload page to upload an avatar.
 #. TRANS: Submit button to confirm upload of a user backup file for account restore.
-#: actions/avatarsettings.php:173 actions/restoreaccount.php:369
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Upload"
 msgstr "Качване"
 
 #. TRANS: Button on avatar upload crop form to confirm a selected crop as avatar.
-#: actions/avatarsettings.php:243
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Crop"
 msgstr "Изрязване"
 
 #. TRANS: Validation error on avatar upload form when no file was uploaded.
-#: actions/avatarsettings.php:318
 msgid "No file uploaded."
 msgstr "Няма качен файл."
 
 #. TRANS: Avatar upload form instruction after uploading a file.
-#: actions/avatarsettings.php:345
 #, fuzzy
 msgid "Pick a square area of the image to be your avatar."
 msgstr "Изберете квадратна област от изображението за аватар"
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
 #. TRANS: Server error displayed trying to crop an uploaded group logo that is no longer present.
-#: actions/avatarsettings.php:360 actions/grouplogo.php:391
 msgid "Lost our file data."
 msgstr ""
 
 #. TRANS: Success message for having updated a user avatar.
-#: actions/avatarsettings.php:384
 msgid "Avatar updated."
 msgstr "Аватарът е обновен."
 
 #. TRANS: Error displayed on the avatar upload page if the avatar could not be updated for an unknown reason.
-#: actions/avatarsettings.php:388
 msgid "Failed updating avatar."
 msgstr "Неуспешно обновяване на аватара."
 
 #. TRANS: Success message for deleting a user avatar.
-#: actions/avatarsettings.php:412
 msgid "Avatar deleted."
 msgstr "Аватарът е изтрит."
 
 #. TRANS: Title for backup account page.
 #. TRANS: Option in profile settings to create a backup of the account of the currently logged in user.
-#: actions/backupaccount.php:61 actions/profilesettings.php:468
 msgid "Backup account"
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to backup an account while not logged in.
-#: actions/backupaccount.php:79
 #, fuzzy
 msgid "Only logged-in users can backup their account."
 msgstr "Само влезли потребители могат да повтарят бележки."
 
 #. TRANS: Client exception thrown when trying to backup an account without having backup rights.
-#: actions/backupaccount.php:84
 msgid "You may not backup your account."
 msgstr ""
 
 #. TRANS: Information displayed on the backup account page.
-#: actions/backupaccount.php:227
 msgid ""
 "You can backup your account data in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format. This is an experimental feature and provides "
@@ -1682,31 +1308,26 @@ msgid ""
 msgstr ""
 
 #. TRANS: Submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:250
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Backup"
 msgstr "Фон"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:254
 msgid "Backup your account."
 msgstr ""
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
-#: actions/block.php:68
 msgid "You already blocked that user."
 msgstr "Вече сте блокирали този потребител."
 
 #. TRANS: Title for block user page.
 #. TRANS: Legend for block user form.
 #. TRANS: Fieldset legend for block user from group form.
-#: actions/block.php:106 actions/block.php:136 actions/groupblock.php:165
 msgid "Block user"
 msgstr "Блокиране на потребителя"
 
 #. TRANS: Explanation of consequences when blocking a user on the block user page.
-#: actions/block.php:139
 msgid ""
 "Are you sure you want to block this user? Afterwards, they will be "
 "unsubscribed from you, unable to subscribe to you in the future, and you "
@@ -1719,18 +1340,13 @@ msgstr ""
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:154 actions/deleteapplication.php:157
-#: actions/deletegroup.php:220 actions/deletenotice.php:155
-#: actions/deleteuser.php:154 actions/groupblock.php:187
 msgctxt "BUTTON"
 msgid "No"
 msgstr "Не"
 
 #. TRANS: Submit button title for 'No' when blocking a user.
-#: actions/block.php:158
-#, fuzzy
 msgid "Do not block this user."
-msgstr "Да не се блокира този потребител"
+msgstr "Да не се блокира този потребител."
 
 #. TRANS: Button label on the user block form.
 #. TRANS: Button label on the delete application form.
@@ -1738,51 +1354,40 @@ msgstr "Да не се блокира този потребител"
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:161 actions/deleteapplication.php:164
-#: actions/deletegroup.php:227 actions/deletenotice.php:162
-#: actions/deleteuser.php:161 actions/groupblock.php:194
 msgctxt "BUTTON"
 msgid "Yes"
 msgstr "Да"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:165
-#, fuzzy
 msgid "Block this user."
-msgstr "Блокиране на потребителя"
+msgstr "Блокиране на потребителя."
 
 #. TRANS: Server error displayed when blocking a user fails.
-#: actions/block.php:189
 msgid "Failed to save block information."
 msgstr "Грешка при записване данните за блокирането."
 
 #. TRANS: Title for first page with list of users blocked from a group.
 #. TRANS: %s is a group nickname.
-#: actions/blockedfromgroup.php:101
 #, php-format
 msgid "%s blocked profiles"
 msgstr "Блокирани за %s"
 
 #. TRANS: Title for any but the first page with list of users blocked from a group.
 #. TRANS: %1$s is a group nickname, %2$d is a page number.
-#: actions/blockedfromgroup.php:106
 #, php-format
 msgid "%1$s blocked profiles, page %2$d"
 msgstr "%1$s и приятели, страница %2$d"
 
 #. TRANS: Instructions for list of users blocked from a group.
-#: actions/blockedfromgroup.php:122
 #, fuzzy
 msgid "A list of the users blocked from joining this group."
 msgstr "Списък с потребителите в тази група."
 
 #. TRANS: Form legend for unblocking a user from a group.
-#: actions/blockedfromgroup.php:291
 msgid "Unblock user from group"
 msgstr "Разблокиране на потребителя от групата"
 
 #. TRANS: Button text for unblocking a user from a group.
-#: actions/blockedfromgroup.php:323
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Unblock"
@@ -1790,130 +1395,102 @@ msgstr "Разблокиране"
 
 #. TRANS: Tooltip for button for unblocking a user from a group.
 #. TRANS: Description of the form to unblock a user.
-#: actions/blockedfromgroup.php:327 lib/unblockform.php:78
 msgid "Unblock this user"
 msgstr "Разблокиране на този потребител"
 
 #. TRANS: Title for mini-posting window loaded from bookmarklet.
 #. TRANS: %s is the StatusNet site name.
-#: actions/bookmarklet.php:51
 #, php-format
 msgid "Post to %s"
 msgstr "групи в %s"
 
 #. TRANS: Client error displayed when not providing a confirmation code in the contact address confirmation action.
-#: actions/confirmaddress.php:74
 msgid "No confirmation code."
 msgstr "Няма код за потвърждение."
 
 #. TRANS: Client error displayed when providing a non-existing confirmation code in the contact address confirmation action.
-#: actions/confirmaddress.php:80
 msgid "Confirmation code not found."
 msgstr "Кодът за потвърждение не е открит."
 
 #. TRANS: Client error displayed when not providing a confirmation code for another user in the contact address confirmation action.
-#: actions/confirmaddress.php:86
 msgid "That confirmation code is not for you!"
 msgstr "Този код за потвърждение не е за вас!"
 
 #. TRANS: Server error for an unknown address type, which can be 'email', 'sms', or the name of an IM network (such as 'xmpp' or 'aim')
-#: actions/confirmaddress.php:94
-#, fuzzy, php-format
+#, php-format
 msgid "Unrecognized address type %s"
 msgstr "Неразпознат вид адрес %s"
 
 #. TRANS: Client error for an already confirmed email/jabber/sms address.
-#: actions/confirmaddress.php:103 actions/confirmaddress.php:136
 msgid "That address has already been confirmed."
 msgstr "Този адрес е вече потвърден."
 
-#: actions/confirmaddress.php:121 actions/imsettings.php:444
-#: actions/userdesignsettings.php:306
-#, fuzzy
 msgid "Couldn't update user."
 msgstr "Грешка при обновяване на потребителя."
 
-#: actions/confirmaddress.php:144
 #, fuzzy
 msgid "Couldn't update user im preferences."
 msgstr "Грешка при обновяване записа на потребител."
 
-#: actions/confirmaddress.php:156
 #, fuzzy
 msgid "Couldn't insert user im preferences."
 msgstr "Грешка при добавяне на нов абонамент."
 
 #. TRANS: Server error displayed when an address confirmation code deletion from the
 #. TRANS: database fails in the contact address confirmation action.
-#: actions/confirmaddress.php:169
 #, fuzzy
 msgid "Could not delete address confirmation."
 msgstr "Грешка при изтриване потвърждението по е-поща."
 
 #. TRANS: Title for the contact address confirmation action.
-#: actions/confirmaddress.php:185
 msgid "Confirm address"
 msgstr "Потвърждаване на адрес"
 
 #. TRANS: Success message for the contact address confirmation action.
 #. TRANS: %s can be 'email', 'jabber', or 'sms'.
-#: actions/confirmaddress.php:200
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "Адресът \"%s\" е потвърден за сметката ви."
 
 #. TRANS: Title for page with a conversion (multiple notices in context).
-#: actions/conversation.php:96
 msgid "Conversation"
 msgstr "Разговор"
 
 #. TRANS: Header on conversation page. Hidden by default (h2).
 #. TRANS: Label for user statistics.
-#: actions/conversation.php:149 lib/noticelist.php:87
-#: lib/profileaction.php:246 lib/searchgroupnav.php:82
-#: lib/threadednoticelist.php:66
 msgid "Notices"
 msgstr "Бележки"
 
 #. TRANS: Client exception displayed trying to delete a user account while not logged in.
-#: actions/deleteaccount.php:71
 #, fuzzy
 msgid "Only logged-in users can delete their account."
 msgstr "Само влезли потребители могат да повтарят бележки."
 
 #. TRANS: Client exception displayed trying to delete a user account without have the rights to do that.
-#: actions/deleteaccount.php:77
 #, fuzzy
 msgid "You cannot delete your account."
 msgstr "Не можете да изтривате потребители."
 
 #. TRANS: Confirmation text for user deletion. The user has to type this exactly the same, including punctuation.
-#: actions/deleteaccount.php:160 actions/deleteaccount.php:297
 msgid "I am sure."
-msgstr ""
+msgstr "Сигурен съм."
 
 #. TRANS: Notification for user about the text that must be input to be able to delete a user account.
 #. TRANS: %s is the text that needs to be input.
-#: actions/deleteaccount.php:164
 #, php-format
 msgid "You must write \"%s\" exactly in the box."
 msgstr ""
 
 #. TRANS: Confirmation that a user account has been deleted.
-#: actions/deleteaccount.php:206
-#, fuzzy
 msgid "Account deleted."
-msgstr "Аватарът е изтрит."
+msgstr "Сметката е изтрита."
 
 #. TRANS: Page title for page on which a user account can be deleted.
 #. TRANS: Option in profile settings to delete the account of the currently logged in user.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:476
-#, fuzzy
 msgid "Delete account"
-msgstr "Създаване на нова сметка"
+msgstr "Изтриване на сметка"
 
 #. TRANS: Form text for user deletion form.
-#: actions/deleteaccount.php:279
 msgid ""
 "This will <strong>permanently delete</strong> your account data from this "
 "server."
@@ -1921,7 +1498,6 @@ msgstr ""
 
 #. TRANS: Additional form text for user deletion form shown if a user has account backup rights.
 #. TRANS: %s is a URL to the backup page.
-#: actions/deleteaccount.php:285
 #, php-format
 msgid ""
 "You are strongly advised to <a href=\"%s\">back up your data</a> before "
@@ -1930,56 +1506,43 @@ msgstr ""
 
 #. TRANS: Field label for delete account confirmation entry.
 #. TRANS: Field label for password reset form where the password has to be typed again.
-#: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:262 actions/register.php:419
 msgid "Confirm"
 msgstr "Потвърждаване"
 
 #. TRANS: Input title for the delete account field.
 #. TRANS: %s is the text that needs to be input.
-#: actions/deleteaccount.php:304
 #, fuzzy, php-format
 msgid "Enter \"%s\" to confirm that you want to delete your account."
 msgstr "Не можете да изтривате потребители."
 
 #. TRANS: Button title for user account deletion.
-#: actions/deleteaccount.php:323
 #, fuzzy
 msgid "Permanently delete your account"
 msgstr "Не можете да изтривате потребители."
 
 #. TRANS: Client error displayed trying to delete an application while not logged in.
-#: actions/deleteapplication.php:62
 msgid "You must be logged in to delete an application."
 msgstr "За да изтриете приложение, трябва да сте влезли."
 
 #. TRANS: Client error displayed trying to delete an application that does not exist.
-#: actions/deleteapplication.php:71
 msgid "Application not found."
 msgstr "Приложението не е открито."
 
 #. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
-#: actions/deleteapplication.php:79 actions/editapplication.php:78
-#: actions/showapplication.php:90
 msgid "You are not the owner of this application."
 msgstr "Не сте собственик на това приложение."
 
 #. TRANS: Client error text when there is a problem with the session token.
-#: actions/deleteapplication.php:102 actions/editapplication.php:131
-#: actions/newapplication.php:112 actions/showapplication.php:113
-#: lib/action.php:1391
 msgid "There was a problem with your session token."
 msgstr "Имаше проблем със сесията ви в сайта."
 
 #. TRANS: Title for delete application page.
 #. TRANS: Fieldset legend on delete application page.
-#: actions/deleteapplication.php:124 actions/deleteapplication.php:149
 msgid "Delete application"
 msgstr "Изтриване на приложението"
 
 #. TRANS: Confirmation text on delete application page.
-#: actions/deleteapplication.php:152
 msgid ""
 "Are you sure you want to delete this application? This will clear all data "
 "about the application from the database, including all existing user "
@@ -1987,19 +1550,16 @@ msgid ""
 msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting an application.
-#: actions/deleteapplication.php:161
 #, fuzzy
 msgid "Do not delete this application."
 msgstr "Да не се изтрива приложението"
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
-#: actions/deleteapplication.php:167
 #, fuzzy
 msgid "Delete this application."
 msgstr "Изтриване на това приложение"
 
 #. TRANS: Client error when trying to delete group while not logged in.
-#: actions/deletegroup.php:64
 #, fuzzy
 msgid "You must be logged in to delete a group."
 msgstr "За напуснете група, трябва да сте влезли."
@@ -2007,41 +1567,34 @@ msgstr "За напуснете група, трябва да сте влезл
 #. TRANS: Client error when trying to delete a group without providing a nickname or ID for the group.
 #. TRANS: Client error displayed when trying to join a group without providing a group name or group ID.
 #. TRANS: Client error displayed when trying to leave a group without providing a group name or group ID.
-#: actions/deletegroup.php:94 actions/joingroup.php:89
-#: actions/leavegroup.php:89
 #, fuzzy
 msgid "No nickname or ID."
 msgstr "Няма псевдоним."
 
 #. TRANS: Client error when trying to delete a group without having the rights to delete it.
-#: actions/deletegroup.php:107
 #, fuzzy
 msgid "You are not allowed to delete this group."
 msgstr "Не членувате в тази група."
 
 #. TRANS: Server error displayed if a group could not be deleted.
 #. TRANS: %s is the name of the group that could not be deleted.
-#: actions/deletegroup.php:150
 #, fuzzy, php-format
 msgid "Could not delete group %s."
 msgstr "Грешка при обновяване на групата."
 
 #. TRANS: Message given after deleting a group.
 #. TRANS: %s is the deleted group's name.
-#: actions/deletegroup.php:159
 #, fuzzy, php-format
 msgid "Deleted group %s"
 msgstr "%1$s напусна групата %2$s"
 
 #. TRANS: Title of delete group page.
 #. TRANS: Form legend for deleting a group.
-#: actions/deletegroup.php:176 actions/deletegroup.php:202
 #, fuzzy
 msgid "Delete group"
 msgstr "Изтриване на потребител"
 
 #. TRANS: Warning in form for deleleting a group.
-#: actions/deletegroup.php:206
 msgid ""
 "Are you sure you want to delete this group? This will clear all data about "
 "the group from the database, without a backup. Public posts to this group "
@@ -2049,13 +1602,11 @@ msgid ""
 msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting a group.
-#: actions/deletegroup.php:224
 #, fuzzy
 msgid "Do not delete this group."
 msgstr "Да не се изтрива бележката"
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
-#: actions/deletegroup.php:231
 #, fuzzy
 msgid "Delete this group."
 msgstr "Изтриване на този потребител"
@@ -2066,22 +1617,18 @@ msgstr "Изтриване на този потребител"
 #. TRANS: Client error displayed trying to block a user from a group while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying to log out when not logged in.
+#. TRANS: Client error displayed when trying to access the "make admin" page while not logged in.
+#. TRANS: Client error displayed trying to create a new direct message while not logged in.
+#. TRANS: Client error displayed trying to send a notice while not logged in.
+#. TRANS: Client error displayed trying to nudge a user without being logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
 #. TRANS: Client error displayed when trying to change user options while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
-#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:70
-#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
-#: actions/nudge.php:63 actions/pluginenable.php:97 actions/subedit.php:33
-#: actions/subscribe.php:98 actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:71 lib/profileformaction.php:63
-#: lib/settingsaction.php:72
 msgid "Not logged in."
 msgstr "Не сте влезли в системата."
 
 #. TRANS: Instructions for deleting a notice.
-#: actions/deletenotice.php:110
 msgid ""
 "You are about to permanently delete a notice. Once this is done, it cannot "
 "be undone."
@@ -2089,157 +1636,129 @@ msgstr "Ще изтриете напълно бележката. Изтрива
 
 #. TRANS: Page title when deleting a notice.
 #. TRANS: Fieldset legend for the delete notice form.
-#: actions/deletenotice.php:117 actions/deletenotice.php:148
 msgid "Delete notice"
 msgstr "Изтриване на бележката"
 
 #. TRANS: Message for the delete notice form.
-#: actions/deletenotice.php:152
 msgid "Are you sure you want to delete this notice?"
 msgstr "Наистина ли искате да изтриете тази бележка?"
 
 #. TRANS: Submit button title for 'No' when deleting a notice.
-#: actions/deletenotice.php:159
 #, fuzzy
 msgid "Do not delete this notice."
 msgstr "Да не се изтрива бележката"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:166
 #, fuzzy
 msgid "Delete this notice."
 msgstr "Изтриване на бележката"
 
 #. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
-#: actions/deleteuser.php:66
 msgid "You cannot delete users."
 msgstr "Не можете да изтривате потребители."
 
 #. TRANS: Client error displayed when trying to delete a non-local user.
-#: actions/deleteuser.php:74
 msgid "You can only delete local users."
 msgstr "Може да изтривате само локални потребители."
 
 #. TRANS: Title of delete user page.
-#: actions/deleteuser.php:110
 #, fuzzy
 msgctxt "TITLE"
 msgid "Delete user"
 msgstr "Изтриване на потребител"
 
 #. TRANS: Fieldset legend on delete user page.
-#: actions/deleteuser.php:134
 msgid "Delete user"
 msgstr "Изтриване на потребител"
 
 #. TRANS: Information text to request if a user is certain that the described action has to be performed.
-#: actions/deleteuser.php:138
 msgid ""
 "Are you sure you want to delete this user? This will clear all data about "
 "the user from the database, without a backup."
 msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/deleteuser.php:158
 #, fuzzy
 msgid "Do not delete this user."
 msgstr "Да не се изтрива бележката"
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
-#: actions/deleteuser.php:165
 #, fuzzy
 msgid "Delete this user."
 msgstr "Изтриване на този потребител"
 
 #. TRANS: Message used as title for design settings for the site.
-#: actions/designadminpanel.php:60 lib/settingsnav.php:97
 #, fuzzy
 msgid "Design"
 msgstr "Версия"
 
 #. TRANS: Instructions for design adminsitration panel.
-#: actions/designadminpanel.php:71
 msgid "Design settings for this StatusNet site"
 msgstr ""
 
 #. TRANS: Client error displayed when a logo URL does is not valid.
-#: actions/designadminpanel.php:327
 #, fuzzy
 msgid "Invalid logo URL."
 msgstr "Неправилен размер."
 
 #. TRANS: Client error displayed when an SSL logo URL is invalid.
-#: actions/designadminpanel.php:333
 #, fuzzy
 msgid "Invalid SSL logo URL."
 msgstr "Неправилен размер."
 
 #. TRANS: Client error displayed when a theme is submitted through the form that is not in the theme list.
 #. TRANS: %s is the chosen unavailable theme.
-#: actions/designadminpanel.php:339
 #, fuzzy, php-format
 msgid "Theme not available: %s."
 msgstr "Страницата не е достъпна във вида медия, който приемате"
 
 #. TRANS: Fieldset legend for form to change logo.
-#: actions/designadminpanel.php:437
 msgid "Change logo"
 msgstr "Смяна на логото"
 
 #. TRANS: Field label for StatusNet site logo.
-#: actions/designadminpanel.php:444
 msgid "Site logo"
 msgstr "Лого на сайта"
 
 #. TRANS: Field label for SSL StatusNet site logo.
-#: actions/designadminpanel.php:452
 #, fuzzy
 msgid "SSL logo"
 msgstr "Лого на сайта"
 
 #. TRANS: Fieldset legend for form change StatusNet site's theme.
-#: actions/designadminpanel.php:467
 #, fuzzy
 msgid "Change theme"
 msgstr "Промяна"
 
 #. TRANS: Field label for dropdown to choose site theme.
-#: actions/designadminpanel.php:485
 msgid "Site theme"
 msgstr "Път до сайта"
 
 #. TRANS: Title for field label for dropdown to choose site theme.
-#: actions/designadminpanel.php:487
 #, fuzzy
 msgid "Theme for the site."
 msgstr "Излизане от сайта"
 
 #. TRANS: Field label for uploading a cutom theme.
-#: actions/designadminpanel.php:494
 #, fuzzy
 msgid "Custom theme"
 msgstr "Нова бележка"
 
 #. TRANS: Form instructions for uploading a cutom StatusNet theme.
-#: actions/designadminpanel.php:499
 msgid "You can upload a custom StatusNet theme as a .ZIP archive."
 msgstr ""
 
 #. TRANS: Fieldset legend for theme background image.
-#: actions/designadminpanel.php:515
 msgid "Change background image"
 msgstr "Смяна на изображението за фон"
 
 #. TRANS: Field label for background image on theme designer page.
 #. TRANS: Field label for background color selector.
 #. TRANS: Label on profile design page for setting a profile page background colour.
-#: actions/designadminpanel.php:525 actions/designadminpanel.php:609
-#: lib/designform.php:238
 msgid "Background"
 msgstr "Фон"
 
 #. TRANS: Form guide for background image upload form on theme designer page.
-#: actions/designadminpanel.php:531
 #, php-format
 msgid ""
 "You can upload a background image for the site. The maximum file size is %1"
@@ -2249,211 +1768,176 @@ msgstr ""
 "2MB."
 
 #. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:558
 msgid "On"
 msgstr "Вкл."
 
 #. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:575
 msgid "Off"
 msgstr "Изкл."
 
 #. TRANS: Form guide for turning background image on or off on theme designer page.
 #. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
 #. TRANS: use of the uploaded profile image.
-#: actions/designadminpanel.php:577 lib/designform.php:214
 #, fuzzy
 msgid "Turn background image on or off."
 msgstr "Смяна на изображението за фон"
 
 #. TRANS: Checkbox label to title background image on theme designer page.
 #. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-#: actions/designadminpanel.php:583 lib/designform.php:220
 #, fuzzy
 msgid "Tile background image"
 msgstr "Смяна на изображението за фон"
 
 #. TRANS: Fieldset legend for theme colors.
-#: actions/designadminpanel.php:598
 #, fuzzy
 msgid "Change colors"
 msgstr "Смяна на цветовете"
 
 #. TRANS: Field label for content color selector.
 #. TRANS: Label on profile design page for setting a profile page content colour.
-#: actions/designadminpanel.php:623 lib/designform.php:252
 msgid "Content"
 msgstr "Съдържание"
 
 #. TRANS: Field label for sidebar color selector.
 #. TRANS: Label on profile design page for setting a profile page sidebar colour.
-#: actions/designadminpanel.php:637 lib/designform.php:266
 msgid "Sidebar"
 msgstr "Страничен панел"
 
 #. TRANS: Field label for text color selector.
 #. TRANS: Label on profile design page for setting a profile page text colour.
-#: actions/designadminpanel.php:651 lib/designform.php:280
 msgid "Text"
 msgstr "Текст"
 
 #. TRANS: Field label for link color selector.
 #. TRANS: Label on profile design page for setting a profile page links colour.
-#: actions/designadminpanel.php:665 lib/designform.php:294
 msgid "Links"
 msgstr "Лиценз"
 
 #. TRANS: Fieldset legend for advanced theme design settings.
-#: actions/designadminpanel.php:691
 msgid "Advanced"
 msgstr ""
 
 #. TRANS: Field label for custom CSS.
-#: actions/designadminpanel.php:696
 msgid "Custom CSS"
 msgstr ""
 
 #. TRANS: Button text for resetting theme settings.
-#: actions/designadminpanel.php:718
 msgctxt "BUTTON"
 msgid "Use defaults"
 msgstr ""
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:720
 #, fuzzy
 msgid "Restore default designs."
 msgstr "Грешка при записване настройките за Twitter"
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:728
 msgid "Reset back to default."
 msgstr ""
 
 #. TRANS: Title for button for saving theme settings.
-#: actions/designadminpanel.php:736
 #, fuzzy
 msgid "Save design."
 msgstr "Запазване настройките на сайта"
 
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
-#: actions/disfavor.php:83
 msgid "This notice is not a favorite!"
 msgstr "Тази бележка не е отбелязана като любима!"
 
 #. TRANS: Title for page on which favorites can be added.
-#: actions/disfavor.php:98
 msgid "Add to favorites"
 msgstr "Добавяне към любимите"
 
 #. TRANS: Client exception thrown when requesting a document from the documentation that does not exist.
 #. TRANS: %s is the non-existing document.
-#: actions/doc.php:155
 #, fuzzy, php-format
 msgid "No such document \"%s\"."
 msgstr "Няма такава бележка."
 
 #. TRANS: Title for "Edit application" form.
 #. TRANS: Form legend.
-#: actions/editapplication.php:54 lib/applicationeditform.php:129
 #, fuzzy
 msgid "Edit application"
 msgstr "Редактиране на приложението"
 
 #. TRANS: Client error displayed trying to edit an application while not logged in.
-#: actions/editapplication.php:66
 msgid "You must be logged in to edit an application."
 msgstr "За да редактирате приложение, трябва да сте влезли."
 
 #. TRANS: Client error displayed trying to edit an application that does not exist.
-#: actions/editapplication.php:83 actions/showapplication.php:83
 msgid "No such application."
 msgstr "Няма такова приложение."
 
 #. TRANS: Instructions for "Edit application" form.
-#: actions/editapplication.php:167
 #, fuzzy
 msgid "Use this form to edit your application."
 msgstr "Използвайте тази бланка за създаване на нова група."
 
 #. TRANS: Validation error shown when not providing a name in the "Edit application" form.
 #. TRANS: Validation error shown when not providing a name in the "New application" form.
-#: actions/editapplication.php:184 actions/newapplication.php:164
 msgid "Name is required."
 msgstr "Името е задължително."
 
 #. 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.
-#: actions/editapplication.php:188 actions/newapplication.php:172
 #, fuzzy
 msgid "Name is too long (maximum 255 characters)."
 msgstr "Пълното име е твърде дълго (макс. 255 знака)"
 
 #. TRANS: Validation error shown when providing a name for an application that already exists in the "Edit application" form.
 #. TRANS: Validation error shown when providing a name for an application that already exists in the "New application" form.
-#: actions/editapplication.php:192 actions/newapplication.php:168
 #, fuzzy
 msgid "Name already in use. Try another one."
 msgstr "Опитайте друг псевдоним, този вече е зает."
 
 #. TRANS: Validation error shown when not providing a description in the "Edit application" form.
 #. TRANS: Validation error shown when not providing a description in the "New application" form.
-#: actions/editapplication.php:196 actions/newapplication.php:176
 msgid "Description is required."
 msgstr "Описанието е задължително."
 
 #. TRANS: Validation error shown when providing too long a source URL in the "Edit application" form.
-#: actions/editapplication.php:209
 msgid "Source URL is too long."
 msgstr "Изходният адрес е твърде дълъг."
 
 #. TRANS: Validation error shown when providing an invalid source URL in the "Edit application" form.
 #. TRANS: Validation error shown when providing an invalid source URL in the "New application" form.
-#: actions/editapplication.php:216 actions/newapplication.php:199
 #, fuzzy
 msgid "Source URL is not valid."
 msgstr "Адресът на личната страница не е правилен URL."
 
 #. 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.
-#: actions/editapplication.php:220 actions/newapplication.php:203
 #, fuzzy
 msgid "Organization is required."
 msgstr "Описанието е задължително."
 
 #. TRANS: Validation error shown when providing too long an arganisation name in the "Edit application" form.
-#: actions/editapplication.php:224 actions/newapplication.php:207
 #, fuzzy
 msgid "Organization is too long (maximum 255 characters)."
 msgstr "Името на организацията е твърде дълго (макс. 255 знака)."
 
 #. TRANS: Form validation error show when an organisation name has not been provided in the edit application form.
 #. TRANS: Form validation error show when an organisation name has not been provided in the new application form.
-#: actions/editapplication.php:228 actions/newapplication.php:211
 #, fuzzy
 msgid "Organization homepage is required."
 msgstr "Описанието е задължително."
 
 #. TRANS: Validation error shown when providing too long a callback URL in the "Edit application" form.
 #. TRANS: Validation error shown when providing too long a callback URL in the "New application" form.
-#: actions/editapplication.php:239 actions/newapplication.php:225
 msgid "Callback is too long."
 msgstr ""
 
 #. TRANS: Validation error shown when providing an invalid callback URL in the "Edit application" form.
 #. TRANS: Validation error shown when providing an invalid callback URL in the "New application" form.
-#: actions/editapplication.php:247 actions/newapplication.php:235
 msgid "Callback URL is not valid."
 msgstr ""
 
 #. TRANS: Server error occuring when an application could not be updated from the "Edit application" form.
-#: actions/editapplication.php:284
 #, fuzzy
 msgid "Could not update application."
 msgstr "Грешка при обновяване на групата."
 
 #. TRANS: Title for form to edit a group. %s is a group nickname.
-#: actions/editgroup.php:55
 #, php-format
 msgid "Edit %s group"
 msgstr "Редактиране на групата %s"
@@ -2461,41 +1945,41 @@ msgstr "Редактиране на групата %s"
 #. TRANS: Client error displayed trying to edit a group while not logged in.
 #. TRANS: Client error displayed when trying to create a group while not logged in.
 #. TRANS: Client error displayed trying to create a group while not logged in.
-#: actions/editgroup.php:68 actions/grouplogo.php:69 actions/newgroup.php:65
 msgid "You must be logged in to create a group."
 msgstr "За да създавате група, трябва да сте влезли."
 
 #. TRANS: Form instructions for group edit form.
-#: actions/editgroup.php:161
 #, fuzzy
 msgid "Use this form to edit the group."
 msgstr "Използвайте тази бланка за създаване на нова група."
 
+#. TRANS: Group edit form validation error.
+#. TRANS: Group create form validation error.
+#. TRANS: %s is the invalid alias.
+#, php-format
+msgid "Invalid alias: \"%s\""
+msgstr "Неправилен псевдоним: \"%s\""
+
 #. TRANS: Group edit form success message.
-#: actions/editgroup.php:301
 msgid "Options saved."
 msgstr "Настройките са запазени."
 
 #. TRANS: Title for e-mail settings.
-#: actions/emailsettings.php:60
 msgid "Email settings"
 msgstr "Настройки на е-поща"
 
 #. TRANS: E-mail settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/emailsettings.php:74
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 msgstr "Управление на пощата, идваща от %%site.name%%."
 
 #. TRANS: Form legend for e-mail settings form.
 #. TRANS: Field label for e-mail address input in e-mail settings form.
-#: actions/emailsettings.php:104 actions/emailsettings.php:130
 msgid "Email address"
 msgstr "Адрес на е-поща"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:110
 msgid "Current confirmed email address."
 msgstr "Текущ потвърден адрес на е-поща."
 
@@ -2504,15 +1988,11 @@ msgstr "Текущ потвърден адрес на е-поща."
 #. TRANS: Button label to remove a confirmed IM address.
 #. TRANS: Button label to remove a confirmed SMS address.
 #. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
-#: actions/emailsettings.php:113 actions/emailsettings.php:180
-#: actions/imsettings.php:119 actions/smssettings.php:119
-#: actions/smssettings.php:175
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Премахване"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:120
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -2525,44 +2005,36 @@ msgstr ""
 #. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
 #. TRANS: Any other domain may be owned by a legitimate person or
 #. TRANS: organization.
-#: actions/emailsettings.php:137
 msgid "Email address, like \"UserName@example.org\""
 msgstr "Адрес на е-поща, като \"UserName@example.org\""
 
 #. TRANS: Button label for adding an e-mail address in e-mail settings form.
 #. TRANS: Button label for adding an IM address in IM settings form.
 #. TRANS: Button label for adding a SMS phone number in SMS settings form.
-#: actions/emailsettings.php:141 actions/imsettings.php:147
-#: actions/smssettings.php:157
 msgctxt "BUTTON"
 msgid "Add"
 msgstr "Добавяне"
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:149 actions/smssettings.php:166
 msgid "Incoming email"
 msgstr "Входяща поща"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:155
 msgid "I want to post notices by email."
 msgstr "Искам да изпращам бележки по пощата."
 
 #. TRANS: Form instructions for incoming e-mail form in e-mail settings.
 #. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
-#: actions/emailsettings.php:177 actions/smssettings.php:173
 msgid "Send email to this address to post new notices."
 msgstr "Изпратете писмо до този адрес за публикуване като бележка."
 
 #. TRANS: Instructions for incoming e-mail address input form, when an address has already been assigned.
 #. TRANS: Instructions for incoming SMS e-mail address input form.
-#: actions/emailsettings.php:186 actions/smssettings.php:181
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr "Задаване на нова е-поща, от която да се публикува. Отменя предишната."
 
 #. TRANS: Instructions for incoming e-mail address input form.
-#: actions/emailsettings.php:190
 msgid ""
 "To send notices via email, we need to create a unique email address for you "
 "on this server:"
@@ -2570,91 +2042,73 @@ msgstr ""
 
 #. TRANS: Button label for adding an e-mail address to send notices from.
 #. TRANS: Button label for adding an SMS e-mail address to send notices from.
-#: actions/emailsettings.php:196 actions/smssettings.php:184
 #, fuzzy
 msgctxt "BUTTON"
 msgid "New"
 msgstr "Ново"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:205
 msgid "Email preferences"
 msgstr "Настройки на е-поща"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:213
 msgid "Send me notices of new subscriptions through email."
 msgstr "Изпращане на уведомления за нови абонаменти по пощата."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:219
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr "Изпращане на писмо при отбелязване на моя бележка като любима."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:226
 msgid "Send me email when someone sends me a private message."
 msgstr "Изпращане на писмо при ново лично съобщение."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:232
 #, fuzzy
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr "Изпращане на писмо при ново лично съобщение."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:238
 msgid "Allow friends to nudge me and send me an email."
 msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:244
 msgid "Publish a MicroID for my email address."
 msgstr "Публикуване на MicroID за адреса на е-пощата."
 
 #. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:362
 msgid "Email preferences saved."
 msgstr "Настройките на е-поща са запазени."
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:381
 msgid "No email address."
 msgstr "Не е въведена е-поща."
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:389
 #, fuzzy
 msgid "Cannot normalize that email address."
 msgstr "Грешка при нормализиране адреса на е-пощата"
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:394 actions/register.php:197
-#: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "Неправилен адрес на е-поща."
 
 #. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:398
 msgid "That is already your email address."
 msgstr "Това и сега е адресът на е-пощата ви."
 
 #. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:402
 msgid "That email address already belongs to another user."
 msgstr "Тази е-поща вече се използва от друг потребител."
 
 #. TRANS: Server error thrown on database error adding e-mail confirmation code.
 #. TRANS: Server error thrown on database error adding Instant Messaging confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:419 actions/imsettings.php:362
-#: actions/smssettings.php:364
 #, fuzzy
 msgid "Could not insert confirmation code."
 msgstr "Не може да се вмъкне код за потвърждение."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:426
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
@@ -2666,103 +2120,83 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling Instant Messaging address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:446 actions/imsettings.php:391
-#: actions/smssettings.php:398
 msgid "No pending confirmation to cancel."
 msgstr "Няма потвърждения, очакващи да бъдат отказани."
 
 #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:451
 #, fuzzy
 msgid "That is the wrong email address."
 msgstr "Грешен IM адрес."
 
 #. TRANS: Server error thrown on database error canceling e-mail address confirmation.
 #. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
-#: actions/emailsettings.php:460 actions/smssettings.php:412
 #, fuzzy
 msgid "Could not delete email confirmation."
 msgstr "Грешка при изтриване потвърждението по е-поща."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:465
 msgid "Email confirmation cancelled."
 msgstr "Няма потвърждения, очакващи да бъдат отказани."
 
 #. TRANS: Message given trying to remove an e-mail address that is not
 #. TRANS: registered for the active user.
-#: actions/emailsettings.php:484
 msgid "That is not your email address."
 msgstr "Това не е вашият адрес на е-поща."
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:505
 msgid "The email address was removed."
 msgstr "Входящият адрес на е-поща е премахнат."
 
 #. TRANS: Form validation error displayed when trying to remove an incoming e-mail address while no address has been set.
-#: actions/emailsettings.php:519 actions/smssettings.php:554
 msgid "No incoming email address."
 msgstr "Няма входящ адрес на е-поща."
 
 #. 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.
-#: actions/emailsettings.php:531 actions/emailsettings.php:555
-#: actions/smssettings.php:565 actions/smssettings.php:590
 #, fuzzy
 msgid "Could not update user record."
 msgstr "Грешка при обновяване записа на потребител."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
 #. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:535 actions/smssettings.php:569
 msgid "Incoming email address removed."
 msgstr "Входящият адрес на е-поща е премахнат."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
 #. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:559 actions/smssettings.php:594
 msgid "New incoming email address added."
 msgstr "Добавен е нов входящ адрес на е-поща."
 
 #. TRANS: Client error displayed when trying to mark a notice as favorite that already is a favorite.
-#: actions/favor.php:80
 msgid "This notice is already a favorite!"
 msgstr "Тази бележка вече е отбелязана като любима!"
 
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
-#: actions/favor.php:95
 #, fuzzy
 msgid "Disfavor favorite."
 msgstr "Добавяне към любимите"
 
 #. TRANS: Page title for first page of favorited notices.
 #. TRANS: Title for favourited notices section.
-#: actions/favorited.php:65 lib/popularnoticesection.php:62
-#: lib/publicgroupnav.php:93
 msgid "Popular notices"
 msgstr "Популярни бележки"
 
 #. TRANS: Page title for all but first page of favorited notices.
 #. TRANS: %d is the page number being displayed.
-#: actions/favorited.php:69
 #, php-format
 msgid "Popular notices, page %d"
 msgstr "Популярни бележки, страница %d"
 
 #. TRANS: Description on page displaying favorited notices.
-#: actions/favorited.php:81
 msgid "The most popular notices on the site right now."
 msgstr "Най-популярните бележки в момента в сайта."
 
 #. TRANS: Text displayed instead of a list when a site does not yet have any favourited notices.
-#: actions/favorited.php:149
 msgid "Favorite notices appear on this page but no one has favorited one yet."
 msgstr ""
 
 #. TRANS: Additional text displayed instead of a list when a site does not yet have any favourited notices for logged in users.
-#: actions/favorited.php:153
 msgid ""
 "Be the first to add a notice to your favorites by clicking the fave button "
 "next to any notice you like."
@@ -2770,7 +2204,6 @@ msgstr ""
 
 #. TRANS: Additional text displayed instead of a list when a site does not yet have any favourited notices for not logged in users.
 #. TRANS: %%action.register%% is a registration link. "[link text](link)" is Mark Down. Do not change the formatting.
-#: actions/favorited.php:158
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to add a "
@@ -2781,187 +2214,152 @@ msgstr ""
 #. TRANS: %s is a user's nickname.
 #. TRANS: Title for first page of favourite notices of a user.
 #. TRANS: %s is the user for whom the favourite notices are displayed.
-#: actions/favoritesrss.php:111 actions/showfavorites.php:76
-#: lib/personalgroupnav.php:110
 #, php-format
 msgid "%s's favorite notices"
 msgstr "Любими бележки на %s"
 
 #. TRANS: Desciption of RSS feed with favourite notices of a user.
 #. TRANS: %1$s is a user's nickname, %2$s is the name of the StatusNet site.
-#: actions/favoritesrss.php:117
 #, fuzzy, php-format
 msgid "Updates favored by %1$s on %2$s!"
 msgstr "Бележки от %1$s в %2$s."
 
 #. TRANS: Page title for first page of featured users.
 #. TRANS: Title for featured users section.
-#: actions/featured.php:69 lib/featureduserssection.php:87
-#: lib/publicgroupnav.php:89
 msgid "Featured users"
 msgstr "Избрани потребители"
 
 #. TRANS: Page title for all but first page of featured users.
 #. TRANS: %d is the page number being displayed.
-#: actions/featured.php:73
 #, php-format
 msgid "Featured users, page %d"
 msgstr "Избрани потребители, страница %d"
 
 #. TRANS: Description on page displaying featured users.
-#: actions/featured.php:102
 #, php-format
 msgid "A selection of some great users on %s."
 msgstr ""
 
 #. TRANS: Client error displayed when no notice ID was given trying do display a file.
-#: actions/file.php:36
 msgid "No notice ID."
 msgstr "Липсва ID на бележка."
 
 #. TRANS: Client error displayed when an invalid notice ID was given trying do display a file.
-#: actions/file.php:41
 msgid "No notice."
 msgstr "Липсва бележка."
 
 #. TRANS: Client error displayed when trying do display a file for a notice without a file attachement.
-#: actions/file.php:46
 msgid "No attachments."
 msgstr "Няма прикачени файлове."
 
 #. TRANS: Client error displayed when trying do display a file for a notice with file attachements
 #. TRANS: that could not be found.
-#: actions/file.php:58
 msgid "No uploaded attachments."
 msgstr "Няма прикачени файлове."
 
 #. TRANS: Client error displayed when subscribing to a remote profile and an unexpected response is received.
-#: actions/finishremotesubscribe.php:69
 msgid "Not expecting this response!"
 msgstr "Неочакван отговор."
 
 #. TRANS: Client error displayed when subscribing to a remote profile that does not exist.
-#: actions/finishremotesubscribe.php:81
 #, fuzzy
 msgid "User being listened to does not exist."
 msgstr "Потребителят, когото проследявате, не съществува. "
 
 #. TRANS: Client error displayed when subscribing to a remote profile that is a local profile.
-#: actions/finishremotesubscribe.php:89 actions/remotesubscribe.php:58
 msgid "You can use the local subscription!"
 msgstr "Можете да ползвате локален абонамент!"
 
 #. TRANS: Client error displayed when subscribing to a remote profile that is blocked form subscribing to.
-#: actions/finishremotesubscribe.php:102
 msgid "That user has blocked you from subscribing."
 msgstr "Потребителят е забранил да се абонирате за него."
 
 #. TRANS: Client error displayed when subscribing to a remote profile without providing an authorised token.
-#: actions/finishremotesubscribe.php:114
 msgid "You are not authorized."
 msgstr "Не сте абонирани за никого."
 
 #. TRANS: Client error displayed when subscribing to a remote profile and conversion of the request token to access token fails.
-#: actions/finishremotesubscribe.php:118
 #, fuzzy
 msgid "Could not convert request token to access token."
 msgstr "Грешка при преобразуване на tokens за одобрение в tokens за достъп."
 
 #. TRANS: Client error displayed when subscribing to a remote profile fails because of an unsupported version of the OMB protocol.
-#: actions/finishremotesubscribe.php:124
 #, fuzzy
 msgid "Remote service uses unknown version of OMB protocol."
 msgstr "Непозната версия на протокола OMB."
 
 #. TRANS: Server error displayed when subscribing to a remote profile fails because the remote profile could not be updated.
-#: actions/finishremotesubscribe.php:145 lib/oauthstore.php:317
 #, fuzzy
 msgid "Error updating remote profile."
 msgstr "Грешка при обновяване на отдалечен профил"
 
 #. TRANS: Client error displayed when requesting a non-existent file.
-#: actions/getfile.php:77
 msgid "No such file."
 msgstr "Няма такъв файл."
 
 #. TRANS: Client error displayed when requesting a file without having read access to it.
-#: actions/getfile.php:82
 msgid "Cannot read file."
 msgstr "Грешка при четене на файла."
 
 #. TRANS: Client error displayed when trying to assign an invalid role to a user.
-#: actions/grantrole.php:61 actions/revokerole.php:62
 #, fuzzy
 msgid "Invalid role."
 msgstr "Неправилен размер."
 
 #. TRANS: Client error displayed when trying to assign an reserved role to a user.
-#: actions/grantrole.php:66 actions/revokerole.php:66
 msgid "This role is reserved and cannot be set."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to assign a role to a user while not being allowed to set roles.
-#: actions/grantrole.php:76
 msgid "You cannot grant user roles on this site."
 msgstr "Не можете да заглушавате потребители на този сайт."
 
 #. TRANS: Client error displayed when trying to assign a role to a user that already has that role.
-#: actions/grantrole.php:84
 #, fuzzy
 msgid "User already has this role."
 msgstr "Потребителят вече е заглушен."
 
 #. TRANS: Client error displayed trying to block a user from a group while not specifying a to be blocked user profile.
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing a profile.
+#. TRANS: Client error displayed when not providing a profile ID on the Make Admin page.
 #. TRANS: Client error displayed trying a change a subscription without providing a profile.
 #. TRANS: Client error displayed when trying to change user options without specifying a user to work on.
-#: actions/groupblock.php:71 actions/groupunblock.php:71
-#: actions/makeadmin.php:71 actions/subedit.php:49
-#: lib/profileformaction.php:79
 msgid "No profile specified."
 msgstr "Не е указан профил."
 
 #. TRANS: Client error displayed trying to block a user from a group while specifying a non-existing profile.
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing an existing profile.
+#. TRANS: Client error displayed when specifying an invalid profile ID on the Make Admin page.
 #. TRANS: Client error displayed trying a change a subscription for a non-existant profile ID.
 #. TRANS: Client error displayed when trying to change user options without specifying an existing user to work on.
-#: actions/groupblock.php:77 actions/groupunblock.php:77
-#: actions/makeadmin.php:76 actions/subedit.php:57 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:87
 msgid "No profile with that ID."
 msgstr "Не е открит профил с такъв идентификатор."
 
 #. TRANS: Client error displayed trying to block a user from a group while not specifying a group to block a profile from.
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing a group.
-#: actions/groupblock.php:83 actions/groupunblock.php:83
-#: actions/makeadmin.php:81
+#. TRANS: Client error displayed when not providing a group ID on the Make Admin page.
 msgid "No group specified."
 msgstr "Не е указана група."
 
 #. TRANS: Client error displayed trying to block a user from a group while not being an admin user.
-#: actions/groupblock.php:95
 msgid "Only an admin can block group members."
 msgstr "Само администратор може да блокира членове от групата."
 
 #. TRANS: Client error displayed trying to block a user from a group while user is already blocked from the given group.
-#: actions/groupblock.php:100
 msgid "User is already blocked from group."
 msgstr "Потребителят вече е блокиран за групата."
 
 #. TRANS: Client error displayed trying to block a user from a group while user is not a member of given group.
-#: actions/groupblock.php:106
 msgid "User is not a member of group."
 msgstr "Потребителят не членува в групата."
 
 #. TRANS: Title for block user from group page.
 #. TRANS: Form legend for form to block user from a group.
-#: actions/groupblock.php:141 actions/groupmembers.php:364
 msgid "Block user from group"
 msgstr "Разблокиране на потребителя от групата"
 
 #. TRANS: Explanatory text for block user from group form before setting the block.
 #. TRANS: %1$s is that to be blocked user, %2$s is the group the user will be blocked from.
-#: actions/groupblock.php:169
 #, php-format
 msgid ""
 "Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They "
@@ -2970,67 +2368,56 @@ msgid ""
 msgstr ""
 
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
-#: actions/groupblock.php:191
 #, fuzzy
 msgid "Do not block this user from this group."
 msgstr "Да не се блокира този потребител"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
-#: actions/groupblock.php:198
 #, fuzzy
 msgid "Block this user from this group."
 msgstr "Разблокиране на потребителя от групата"
 
 #. TRANS: Server error displayed when trying to block a user from a group fails because of an application error.
-#: actions/groupblock.php:215
 #, fuzzy
 msgid "Database error blocking user from group."
 msgstr "Разблокиране на потребителя от групата"
 
 #. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
 #. TRANS: Client error displayed trying to find a user by ID without providing an ID.
-#: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr "Липсва ID."
 
 #. TRANS: Client error displayed trying to change group design settings while not logged in.
-#: actions/groupdesignsettings.php:67
 msgid "You must be logged in to edit a group."
 msgstr "За да редактирате група, трябва да сте влезли."
 
 #. TRANS: Title group design settings page.
-#: actions/groupdesignsettings.php:146
 #, fuzzy
 msgid "Group design"
 msgstr "Групи"
 
 #. TRANS: Instructions for group design settings page.
-#: actions/groupdesignsettings.php:157
 msgid ""
 "Customize the way your group looks with a background image and a colour "
 "palette of your choice."
 msgstr ""
 
 #. TRANS: Form validation error displayed when group design settings could not be updated because of an application issue.
-#: actions/groupdesignsettings.php:262
 #, fuzzy
 msgid "Unable to update your design settings."
 msgstr "Грешка при записване настройките за Twitter"
 
 #. TRANS: Form text to confirm saved group design settings.
-#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:239
 msgid "Design preferences saved."
 msgstr "Настройките на е-поща са запазени."
 
 #. TRANS: Title for group logo settings page.
 #. TRANS: Group logo form legend.
-#: actions/grouplogo.php:144 actions/grouplogo.php:199
 msgid "Group logo"
 msgstr "Лого на групата"
 
 #. TRANS: Instructions for group logo page.
 #. TRANS: %s is the maximum file size for that site.
-#: actions/grouplogo.php:156
 #, php-format
 msgid ""
 "You can upload a logo image for your group. The maximum file size is %s."
@@ -3038,93 +2425,77 @@ msgstr ""
 "Можете да качите личен аватар тук. Максималната големина на файла е %s."
 
 #. TRANS: Submit button for uploading a group logo.
-#: actions/grouplogo.php:243
 msgid "Upload"
 msgstr "Качване"
 
 #. TRANS: Button text for cropping an uploaded group logo.
-#: actions/grouplogo.php:299
 msgid "Crop"
 msgstr "Изрязване"
 
 #. TRANS: Form instructions on the group logo page.
-#: actions/grouplogo.php:376
 #, fuzzy
 msgid "Pick a square area of the image to be the logo."
 msgstr "Изберете квадратна област от изображението за аватар"
 
 #. TRANS: Form success message after updating a group logo.
-#: actions/grouplogo.php:411
 msgid "Logo updated."
 msgstr "Лотого е обновено."
 
 #. TRANS: Form failure message after failing to update a group logo.
-#: actions/grouplogo.php:414
 msgid "Failed updating logo."
 msgstr "Неуспешно обновяване на логото."
 
 #. TRANS: Title of the page showing group members.
 #. TRANS: %s is the name of the group.
-#: actions/groupmembers.php:104
 #, php-format
 msgid "%s group members"
 msgstr "Членове на групата %s"
 
 #. TRANS: Title of the page showing group members.
 #. TRANS: %1$s is the name of the group, %2$d is the page number of the members list.
-#: actions/groupmembers.php:109
 #, php-format
 msgid "%1$s group members, page %2$d"
 msgstr "Абонати на %1$s, страница %2$d"
 
 #. TRANS: Page notice for group members page.
-#: actions/groupmembers.php:125
 msgid "A list of the users in this group."
 msgstr "Списък с потребителите в тази група."
 
 #. TRANS: Indicator in group members list that this user is a group administrator.
-#: actions/groupmembers.php:190 lib/action.php:581
 msgid "Admin"
 msgstr "Настройки"
 
 #. TRANS: Button text for the form that will block a user from a group.
-#: actions/groupmembers.php:397
 msgctxt "BUTTON"
 msgid "Block"
 msgstr "Блокиране"
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:401
 msgctxt "TOOLTIP"
 msgid "Block this user"
 msgstr "Блокиране на този потребител"
 
 #. TRANS: Form legend for form to make a user a group admin.
-#: actions/groupmembers.php:488
 #, fuzzy
 msgid "Make user an admin of the group"
 msgstr "За да редактирате групата, трябва да сте й администратор."
 
 #. TRANS: Button text for the form that will make a user administrator.
-#: actions/groupmembers.php:521
 msgctxt "BUTTON"
 msgid "Make Admin"
 msgstr ""
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:525
 msgctxt "TOOLTIP"
 msgid "Make this user an admin"
 msgstr ""
 
 #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
-#: actions/grouprss.php:141
 #, fuzzy, php-format
 msgid "Updates from members of %1$s on %2$s!"
 msgstr "Бележки от %1$s в %2$s."
 
 #. TRANS: Title for first page of the groups list.
-#: actions/groups.php:62
 #, fuzzy
 msgctxt "TITLE"
 msgid "Groups"
@@ -3132,7 +2503,6 @@ msgstr "Групи"
 
 #. TRANS: Title for all but the first page of the groups list.
 #. TRANS: %d is the page number.
-#: actions/groups.php:66
 #, fuzzy, php-format
 msgctxt "TITLE"
 msgid "Groups, page %d"
@@ -3141,7 +2511,6 @@ msgstr "Групи, страница %d"
 #. TRANS: Page notice of group list. %%%%site.name%%%% is the StatusNet site name,
 #. TRANS: %%%%action.groupsearch%%%% and %%%%action.newgroup%%%% are URLs. Do not change them.
 #. TRANS: This message contains Markdown links in the form [link text](link).
-#: actions/groups.php:95
 #, php-format
 msgid ""
 "%%%%site.name%%%% groups let you find and talk with people of similar "
@@ -3152,12 +2521,10 @@ msgid ""
 msgstr ""
 
 #. TRANS: Link to create a new group on the group list page.
-#: actions/groups.php:113 actions/usergroups.php:126 lib/groupeditform.php:115
 msgid "Create a new group"
 msgstr "Създаване на нова група"
 
 #. TRANS: Instructions for page where groups can be searched. %%site.name%% is the name of the StatusNet site.
-#: actions/groupsearch.php:53
 #, fuzzy, php-format
 msgid ""
 "Search for groups on %%site.name%% by their name, location, or description. "
@@ -3167,21 +2534,17 @@ msgstr ""
 "Отделяйте фразите за "
 
 #. TRANS: Title for page where groups can be searched.
-#: actions/groupsearch.php:60
 msgid "Group search"
 msgstr "Търсене на групи"
 
 #. TRANS: Text on page where groups can be searched if no results were found for a query.
 #. TRANS: Text for notice search results is the query had no results.
 #. TRANS: Message on the "People search" page where a query has no results.
-#: actions/groupsearch.php:82 actions/noticesearch.php:122
-#: actions/peoplesearch.php:87
 msgid "No results."
 msgstr "Няма резултати."
 
 #. TRANS: Additional text on page where groups can be searched if no results were found for a query for a logged in user.
 #. TRANS: This message contains Markdown links in the form [link text](link).
-#: actions/groupsearch.php:87
 #, php-format
 msgid ""
 "If you cannot find the group you're looking for, you can [create it](%%"
@@ -3190,7 +2553,6 @@ msgstr ""
 
 #. TRANS: Additional text on page where groups can be searched if no results were found for a query for a not logged in user.
 #. TRANS: This message contains Markdown links in the form [link text](link).
-#: actions/groupsearch.php:92
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and [create the group](%%"
@@ -3198,31 +2560,26 @@ msgid ""
 msgstr ""
 
 #. TRANS: Client error displayed when trying to unblock a user from a group without being an administrator for the group.
-#: actions/groupunblock.php:95
 #, fuzzy
 msgid "Only an admin can unblock group members."
 msgstr "Само администратор може да блокира членове от групата."
 
 #. TRANS: Client error displayed when trying to unblock a non-blocked user from a group.
-#: actions/groupunblock.php:100
 msgid "User is not blocked from group."
 msgstr "Потребителят вече е блокиран за групата."
 
 #. TRANS: Server error displayed when unblocking a user from a group fails because of an unknown error.
 #. TRANS: Server error displayed when removing a user block.
-#: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "Грешка при повтаряне на бележката."
 
 #. TRANS: Title for Instant Messaging settings.
-#: actions/imsettings.php:56
 msgid "IM settings"
 msgstr "Настройки за SMS"
 
 #. 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.
-#: actions/imsettings.php:69
 #, fuzzy, php-format
 msgid ""
 "You can send and receive notices through instant messaging [instant messages]"
@@ -3232,19 +2589,16 @@ msgstr ""
 "%). Въведете адреса си в настройките по-долу."
 
 #. TRANS: Message given in the IM settings if IM is not enabled on the site.
-#: actions/imsettings.php:90
 #, fuzzy
 msgid "IM is not available."
 msgstr "Страницата не е достъпна във вида медия, който приемате"
 
-#: actions/imsettings.php:116
 #, fuzzy, php-format
 msgid "Current confirmed %s address."
 msgstr "Текущ потвърден адрес на е-поща."
 
 #. TRANS: Form note in IM settings form.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:128
 #, fuzzy, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your %s account for a message "
@@ -3253,88 +2607,73 @@ msgstr ""
 "Oчаква се потвърждение на този адрес. Проверете акаунта си в Jabber/GTalk за "
 "съобщение с инструкции. (Добавихте ли %s в списъка си там?)"
 
-#: actions/imsettings.php:140
 msgid "IM address"
 msgstr "Адрес на е-поща"
 
-#: actions/imsettings.php:142
 #, php-format
 msgid "%s screenname."
 msgstr ""
 
 #. TRANS: Header for IM preferences form.
-#: actions/imsettings.php:163
 #, fuzzy
 msgid "IM Preferences"
 msgstr "Настройки на е-поща"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:174
 #, fuzzy
 msgid "Send me notices"
 msgstr "Изпращане на бележка"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:176
 #, fuzzy
 msgid "Post a notice when my status changes."
 msgstr "Публикуване промяната на състоянието ми в Jabber/GTalk."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:178
 #, fuzzy
 msgid "Send me replies from people I'm not subscribed to."
 msgstr "Изпращане по Jabber/GTalk на отговори от хора, "
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:181
 #, fuzzy
 msgid "Publish a MicroID"
 msgstr "Публикуване на MicroID за адреса на е-пощата."
 
 #. TRANS: Server error thrown on database error updating IM preferences.
-#: actions/imsettings.php:291
 #, fuzzy
 msgid "Couldn't update IM preferences."
 msgstr "Грешка при обновяване на потребителя."
 
 #. TRANS: Confirmation message for successful IM preferences save.
 #. TRANS: Confirmation message after saving preferences.
-#: actions/imsettings.php:298 actions/urlsettings.php:244
 msgid "Preferences saved."
 msgstr "Настройките са запазени."
 
 #. TRANS: Message given saving IM address without having provided one.
-#: actions/imsettings.php:320
 #, fuzzy
 msgid "No screenname."
 msgstr "Няма псевдоним."
 
-#: actions/imsettings.php:325
 #, fuzzy
 msgid "No transport."
 msgstr "Липсва бележка."
 
 #. TRANS: Message given saving IM address that cannot be normalised.
-#: actions/imsettings.php:333
 #, fuzzy
 msgid "Cannot normalize that screenname"
 msgstr "Грешка при нормализация на този Jabber ID"
 
 #. TRANS: Message given saving IM address that not valid.
-#: actions/imsettings.php:340
 #, fuzzy
 msgid "Not a valid screenname"
 msgstr "Неправилен псевдоним."
 
 #. TRANS: Message given saving IM address that is already set for another user.
-#: actions/imsettings.php:344
 #, fuzzy
 msgid "Screenname already belongs to another user."
 msgstr "Този Jabber ID принадлежи на друг потребител."
 
 #. TRANS: Message given saving valid IM address that is to be confirmed.
-#: actions/imsettings.php:369
 #, fuzzy
 msgid "A confirmation code was sent to the IM address you added."
 msgstr ""
@@ -3342,85 +2681,71 @@ msgstr ""
 "от %s, трябва да го одобрите."
 
 #. TRANS: Message given canceling IM address confirmation for the wrong IM address.
-#: actions/imsettings.php:396
 msgid "That is the wrong IM address."
 msgstr "Грешен IM адрес."
 
 #. TRANS: Server error thrown on database error canceling IM address confirmation.
-#: actions/imsettings.php:405
 #, fuzzy
 msgid "Couldn't delete confirmation."
 msgstr "Грешка при изтриване потвърждението по е-поща."
 
 #. TRANS: Message given after successfully canceling IM address confirmation.
-#: actions/imsettings.php:410
 msgid "IM confirmation cancelled."
 msgstr "Няма код за потвърждение."
 
 #. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.
-#: actions/imsettings.php:434
 #, fuzzy
 msgid "That is not your screenname."
 msgstr "Това не е вашият телефонен номер."
 
 #. TRANS: Server error thrown on database error removing a registered IM address.
-#: actions/imsettings.php:443
 #, fuzzy
 msgid "Couldn't update user im prefs."
 msgstr "Грешка при обновяване записа на потребител."
 
 #. TRANS: Message given after successfully removing a registered Instant Messaging address.
-#: actions/imsettings.php:451
 msgid "The IM address was removed."
 msgstr "Входящият адрес на е-поща е премахнат."
 
 #. TRANS: Title for all but the first page of the inbox page.
 #. TRANS: %1$s is the user's nickname, %2$s is the page number.
-#: actions/inbox.php:59
 #, php-format
 msgid "Inbox for %1$s - page %2$d"
 msgstr "%1$s, страница %2$d"
 
 #. TRANS: Title for the first page of the inbox page.
 #. TRANS: %s is the user's nickname.
-#: actions/inbox.php:64
 #, php-format
 msgid "Inbox for %s"
 msgstr "Входяща кутия за %s"
 
 #. TRANS: Instructions for user inbox page.
-#: actions/inbox.php:106
 msgid "This is your inbox, which lists your incoming private messages."
 msgstr "Това е входящата ви кутия с лични съобщения от други потребители."
 
 #. TRANS: Client error displayed when trying to sent invites while they have been disabled.
-#: actions/invite.php:41
 msgid "Invites have been disabled."
 msgstr "Поканите са изключени."
 
 #. TRANS: Client error displayed when trying to sent invites while not logged in.
 #. TRANS: %s is the StatusNet site name.
-#: actions/invite.php:45
 #, php-format
 msgid "You must be logged in to invite other users to use %s."
 msgstr "За да редактирате група, трябва да сте влезли."
 
 #. TRANS: Form validation message when providing an e-mail address that does not validate.
 #. TRANS: %s is an invalid e-mail address.
-#: actions/invite.php:78
 #, fuzzy, php-format
 msgid "Invalid email address: %s."
 msgstr "Неправилен адрес на е-поща: %s"
 
 #. TRANS: Page title when invitations have been sent.
-#: actions/invite.php:117
 #, fuzzy
 msgid "Invitations sent"
 msgstr "Поканите са изпратени."
 
 #. TRANS: Page title when inviting potential users.
-#: actions/invite.php:120
 msgid "Invite new users"
 msgstr "Покани за нови потребители"
 
@@ -3428,7 +2753,6 @@ msgstr "Покани за нови потребители"
 #. TRANS: is already subscribed to one or more users with the given e-mail address(es).
 #. TRANS: Plural form is based on the number of reported already subscribed e-mail addresses.
 #. TRANS: Followed by a bullet list.
-#: actions/invite.php:140
 #, fuzzy
 msgid "You are already subscribed to this user:"
 msgid_plural "You are already subscribed to these users:"
@@ -3437,7 +2761,6 @@ msgstr[1] "Вече сте абонирани за следните потреб
 
 #. TRANS: Used as list item for already subscribed users (%1$s is nickname, %2$s is e-mail address).
 #. TRANS: Used as list item for already registered people (%1$s is nickname, %2$s is e-mail address).
-#: actions/invite.php:146 actions/invite.php:160
 #, fuzzy, php-format
 msgctxt "INVITE"
 msgid "%1$s (%2$s)"
@@ -3446,7 +2769,6 @@ msgstr "%1$s (%2$s)"
 #. TRANS: Message displayed inviting users to use a StatusNet site while the invited user
 #. TRANS: already uses a this StatusNet site. Plural form is based on the number of
 #. TRANS: reported already present people. Followed by a bullet list.
-#: actions/invite.php:154
 #, fuzzy
 msgid "This person is already a user and you were automatically subscribed:"
 msgid_plural ""
@@ -3457,7 +2779,6 @@ msgstr[1] "Тези хора са потребители тук и автома
 #. TRANS: Message displayed inviting users to use a StatusNet site. Plural form is
 #. TRANS: based on the number of invitations sent. Followed by a bullet list of
 #. TRANS: e-mail addresses to which invitations were sent.
-#: actions/invite.php:168
 #, fuzzy
 msgid "Invitation sent to the following person:"
 msgid_plural "Invitations sent to the following people:"
@@ -3466,7 +2787,6 @@ msgstr[1] "Изпратени са покани до следните хора:"
 
 #. TRANS: Generic message displayed after sending out one or more invitations to
 #. TRANS: people to join a StatusNet site.
-#: actions/invite.php:178
 msgid ""
 "You will be notified when your invitees accept the invitation and register "
 "on the site. Thanks for growing the community!"
@@ -3475,7 +2795,6 @@ msgstr ""
 "увеличаването на общността тук!"
 
 #. TRANS: Form instructions.
-#: actions/invite.php:191
 msgid ""
 "Use this form to invite your friends and colleagues to use this service."
 msgstr ""
@@ -3483,28 +2802,24 @@ msgstr ""
 "услугата на сайта."
 
 #. TRANS: Field label for a list of e-mail addresses.
-#: actions/invite.php:218
 msgid "Email addresses"
 msgstr "Адреси на е-поща"
 
 #. TRANS: Tooltip for field label for a list of e-mail addresses.
-#: actions/invite.php:221
 #, fuzzy
 msgid "Addresses of friends to invite (one per line)."
 msgstr "Адреси на приятели, които каните (по един на ред)"
 
 #. TRANS: Field label for a personal message to send to invitees.
-#: actions/invite.php:225
 msgid "Personal message"
 msgstr "Лично съобщение"
 
 #. TRANS: Tooltip for field label for a personal message to send to invitees.
-#: actions/invite.php:228
 msgid "Optionally add a personal message to the invitation."
 msgstr "Може да добавите и лично съобщение към поканата."
 
 #. TRANS: Send button for inviting friends
-#: actions/invite.php:232
+#. TRANS: Button text for sending notice.
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Send"
@@ -3513,7 +2828,6 @@ msgstr "Прати"
 #. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral
 #. TRANS: singular 3rd-person pronoun in English. %1$s is the inviting user, $2$s is
 #. TRANS: the StatusNet sitename.
-#: actions/invite.php:264
 #, php-format
 msgid "%1$s has invited you to join them on %2$s"
 msgstr "%1$s ви кани да ползвате заедно %2$s"
@@ -3523,7 +2837,6 @@ msgstr "%1$s ви кани да ползвате заедно %2$s"
 #. TRANS: StatusNet sitename, %3$s is the site URL, %4$s is the personal message from the
 #. TRANS: inviting user, %s%5 a link to the timeline for the inviting user, %s$6 is a link
 #. TRANS: to register with the StatusNet site.
-#: actions/invite.php:271
 #, php-format
 msgid ""
 "%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -3581,183 +2894,178 @@ msgstr ""
 "Искрено ваши, %2$s\n"
 
 #. TRANS: Client error displayed when trying to join a group while not logged in.
-#: actions/joingroup.php:59
 msgid "You must be logged in to join a group."
 msgstr "За да се присъедините към група, трябва да сте влезли."
 
 #. TRANS: Title for join group page after joining.
-#: actions/joingroup.php:148
 #, fuzzy, php-format
 msgctxt "TITLE"
 msgid "%1$s joined group %2$s"
 msgstr "%1$s напусна групата %2$s"
 
 #. TRANS: Client error displayed when trying to leave a group while not logged in.
-#: actions/leavegroup.php:59
 msgid "You must be logged in to leave a group."
 msgstr "За напуснете група, трябва да сте влезли."
 
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
-#: actions/leavegroup.php:103 lib/command.php:398
 msgid "You are not a member of that group."
 msgstr "Не членувате в тази група."
 
 #. TRANS: Title for leave group page after leaving.
-#: actions/leavegroup.php:142
 #, fuzzy, php-format
 msgctxt "TITLE"
 msgid "%1$s left group %2$s"
 msgstr "%1$s напусна групата %2$s"
 
 #. TRANS: User admin panel title
-#: actions/licenseadminpanel.php:55
 msgctxt "TITLE"
 msgid "License"
 msgstr "Лиценз"
 
-#: actions/licenseadminpanel.php:65
+#. TRANS: Form instructions for the site license admin panel.
 msgid "License for this StatusNet site"
 msgstr ""
 
-#: actions/licenseadminpanel.php:134
+#. TRANS: Client error displayed selecting an invalid license in the license admin panel.
 msgid "Invalid license selection."
 msgstr ""
 
-#: actions/licenseadminpanel.php:144
+#. TRANS: Client error displayed when not specifying an owner for the all rights reserved license in the license admin panel.
 msgid ""
 "You must specify the owner of the content when using the All Rights Reserved "
 "license."
 msgstr ""
 
-#: actions/licenseadminpanel.php:151
+#. TRANS: Client error displayed selecting a too long license title in the license admin panel.
 #, fuzzy
 msgid "Invalid license title. Maximum length is 255 characters."
 msgstr "Името на местоположението е твърде дълго (макс. 255 знака)."
 
-#: actions/licenseadminpanel.php:163
+#. TRANS: Client error displayed specifying an invalid license URL in the license admin panel.
 msgid "Invalid license URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:166
+#. TRANS: Client error displayed specifying an invalid license image URL in the license admin panel.
 msgid "Invalid license image URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:174
+#. TRANS: Client error displayed specifying an invalid license URL in the license admin panel.
 msgid "License URL must be blank or a valid URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:182
+#. TRANS: Client error displayed specifying an invalid license image URL in the license admin panel.
 msgid "License image must be blank or valid URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:232
+#. TRANS: Form legend in the license admin panel.
 msgid "License selection"
 msgstr ""
 
-#: actions/licenseadminpanel.php:238
+#. TRANS: License option in the license admin panel.
 msgid "Private"
 msgstr "Частен"
 
-#: actions/licenseadminpanel.php:239
+#. TRANS: License option in the license admin panel.
 msgid "All Rights Reserved"
 msgstr "Всички права запазени"
 
-#: actions/licenseadminpanel.php:240
+#. TRANS: License option in the license admin panel.
 msgid "Creative Commons"
 msgstr ""
 
-#: actions/licenseadminpanel.php:245
+#. TRANS: Dropdown field label in the license admin panel.
 msgid "Type"
-msgstr ""
+msgstr "Вид"
 
-#: actions/licenseadminpanel.php:247
-msgid "Select license"
-msgstr ""
+#. TRANS: Dropdown field instructions in the license admin panel.
+#, fuzzy
+msgid "Select a license."
+msgstr "Изберете оператор"
 
-#: actions/licenseadminpanel.php:261
+#. TRANS: Form legend in the license admin panel.
 msgid "License details"
 msgstr ""
 
-#: actions/licenseadminpanel.php:267
+#. TRANS: Field label in the license admin panel.
 msgid "Owner"
 msgstr ""
 
-#: actions/licenseadminpanel.php:268
+#. TRANS: Field title in the license admin panel.
 msgid "Name of the owner of the site's content (if applicable)."
 msgstr ""
 
-#: actions/licenseadminpanel.php:276
+#. TRANS: Field label in the license admin panel.
 msgid "License Title"
 msgstr ""
 
-#: actions/licenseadminpanel.php:277
+#. TRANS: Field title in the license admin panel.
 msgid "The title of the license."
 msgstr ""
 
-#: actions/licenseadminpanel.php:285
+#. TRANS: Field label in the license admin panel.
 msgid "License URL"
 msgstr ""
 
-#: actions/licenseadminpanel.php:286
+#. TRANS: Field title in the license admin panel.
 msgid "URL for more information about the license."
 msgstr ""
 
-#: actions/licenseadminpanel.php:293
+#. TRANS: Field label in the license admin panel.
 msgid "License Image URL"
 msgstr ""
 
-#: actions/licenseadminpanel.php:294
+#. TRANS: Field title in the license admin panel.
 msgid "URL for an image to display with the license."
 msgstr ""
 
-#. TRANS: Submit button title.
-#: actions/licenseadminpanel.php:311 actions/sessionsadminpanel.php:199
-#: actions/siteadminpanel.php:292 actions/snapshotadminpanel.php:245
-#: actions/tagother.php:133 lib/applicationeditform.php:357
-msgid "Save"
-msgstr "Запазване"
-
-#: actions/licenseadminpanel.php:311
-msgid "Save license settings"
-msgstr ""
+#. TRANS: Button title in the license admin panel.
+#, fuzzy
+msgid "Save license settings."
+msgstr "Запазване настройките на сайта"
 
+#. TRANS: Client error displayed when trying to log in while already logged in.
 #. TRANS: Client error displayed trying to use "one time password login" when already logged in.
-#: actions/login.php:97 actions/otp.php:62 actions/register.php:130
 msgid "Already logged in."
 msgstr "Вече сте влезли."
 
-#: actions/login.php:125
+#. TRANS: Form validation error displayed when trying to log in with incorrect credentials.
 msgid "Incorrect username or password."
 msgstr "Грешно име или парола."
 
+#. TRANS: Server error displayed when during login a server error occurs.
 #. TRANS: Server error displayed when a user object could not be created trying to login using "one time password login".
-#: actions/login.php:131 actions/otp.php:127
 #, fuzzy
 msgid "Error setting user. You are probably not authorized."
 msgstr "Забранено."
 
-#: actions/login.php:185 actions/login.php:236 lib/action.php:598
+#. TRANS: Page title for login page.
 msgid "Login"
 msgstr "Вход"
 
-#: actions/login.php:222
+#. TRANS: Form legend on login page.
 msgid "Login to site"
 msgstr "Вход в сайта"
 
-#: actions/login.php:231 actions/register.php:469
+#. TRANS: Checkbox label label on login page.
 msgid "Remember me"
 msgstr "Запомни ме"
 
-#: actions/login.php:232 actions/register.php:471
+#. TRANS: Checkbox title on login page.
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "Автоматично влизане занапред. Да не се ползва на общи компютри!"
 
-#: actions/login.php:241
+#. TRANS: Button text for log in on login page.
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Login"
+msgstr "Вход"
+
+#. TRANS: Link text for link to "reset password" on login page.
 msgid "Lost or forgotten password?"
 msgstr "Загубена или забравена парола"
 
-#: actions/login.php:259
+#. TRANS: Form instructions on login page before being able to change user settings.
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -3765,12 +3073,13 @@ msgstr ""
 "За по-голяма сигурност, моля въведете отново потребителското си име и парола "
 "при промяна на настройките."
 
-#: actions/login.php:263
+#. TRANS: Form instructions on login page.
 #, fuzzy
 msgid "Login with your username and password."
 msgstr "Вход с име и парола"
 
-#: actions/login.php:266
+#. TRANS: Form instructions on login page. This message contains Markdown links in the form [Link text](Link).
+#. TRANS: %%action.register%% is a link to the registration page.
 #, fuzzy, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -3778,135 +3087,129 @@ msgstr ""
 "Влезте с име и парола. Нямате такива? [Регистрирайте](%%action.register%%) "
 "нова сметка или опитайте с [OpenID](%%action.openidlogin%%). "
 
-#: actions/makeadmin.php:92
+#. TRANS: Client error displayed when trying to make another user admin on the Make Admin page while not an admin.
 #, fuzzy
 msgid "Only an admin can make another user an admin."
 msgstr "Само администратор може да блокира членове от групата."
 
-#: actions/makeadmin.php:96
+#. TRANS: Client error displayed when trying to make another user admin on the Make Admin page who already is admin.
+#. TRANS: %1$s is the user that is already admin, %2$s is the group user is already admin for.
 #, fuzzy, php-format
 msgid "%1$s is already an admin for group \"%2$s\"."
 msgstr "Потребителят вече е блокиран за групата."
 
-#: actions/makeadmin.php:133
+#. TRANS: Server error displayed when trying to make another user admin on the Make Admin page fails
+#. TRANS: because the group membership record could not be gotten.
+#. TRANS: %1$s is the to be admin user, %2$s is the group user should be admin for.
 #, fuzzy, php-format
 msgid "Can't get membership record for %1$s in group %2$s."
 msgstr "Грешка при проследяване — потребителят не е намерен."
 
-#: actions/makeadmin.php:146
+#. TRANS: Server error displayed when trying to make another user admin on the Make Admin page fails
+#. TRANS: because the group adminship record coud not be saved properly.
+#. TRANS: %1$s is the to be admin user, %2$s is the group user is already admin for.
 #, fuzzy, php-format
 msgid "Can't make %1$s an admin for group %2$s."
 msgstr "За да редактирате групата, трябва да сте й администратор."
 
-#: actions/microsummary.php:69
+#. TRANS: Client error displayed trying to make a micro summary without providing a status.
 #, fuzzy
 msgid "No current status."
 msgstr "Няма резултати."
 
 #. TRANS: This is the title of the form for adding a new application.
-#: actions/newapplication.php:52
-#, fuzzy
 msgid "New application"
 msgstr "Ново приложение"
 
 #. TRANS: Client error displayed trying to add a new application while not logged in.
-#: actions/newapplication.php:64
 msgid "You must be logged in to register an application."
 msgstr "За да редактирате приложение, трябва да сте влезли."
 
 #. TRANS: Form instructions for registering a new application.
-#: actions/newapplication.php:147
 #, fuzzy
 msgid "Use this form to register a new application."
 msgstr "Използвайте тази бланка за създаване на нова група."
 
 #. TRANS: Validation error shown when not providing a source URL in the "New application" form.
-#: actions/newapplication.php:189
 #, fuzzy
 msgid "Source URL is required."
 msgstr "Името е задължително."
 
 #. TRANS: Server error displayed when an application could not be registered in the database through the "New application" form.
-#: actions/newapplication.php:279 actions/newapplication.php:289
 #, fuzzy
 msgid "Could not create application."
 msgstr "Грешка при отбелязване като любима."
 
 #. TRANS: Title for form to create a group.
-#: actions/newgroup.php:53
 msgid "New group"
 msgstr "Нова група"
 
 #. TRANS: Client exception thrown when a user tries to create a group while banned.
-#: actions/newgroup.php:73 classes/User_group.php:485
 #, fuzzy
 msgid "You are not allowed to create groups on this site."
 msgstr "Не членувате в тази група."
 
 #. TRANS: Form instructions for group create form.
-#: actions/newgroup.php:117
 msgid "Use this form to create a new group."
 msgstr "Използвайте тази бланка за създаване на нова група."
 
-#. TRANS: Group create form validation error.
-#: actions/newgroup.php:200
-msgid "Alias cannot be the same as nickname."
-msgstr ""
-
-#: actions/newmessage.php:71 actions/newmessage.php:234
+#. TRANS: Page title for new direct message page.
+#. TRANS: Page title on page for sending a direct message.
 msgid "New message"
 msgstr "Ново съобщение"
 
-#. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
-#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:513
-msgid "You can't send a message to this user."
+#. TRANS: Client error displayed trying to send a direct message to a user while sender and
+#. TRANS: receiver are not subscribed to each other.
+#, fuzzy
+msgid "You cannot send a message to this user."
 msgstr "Не може да изпращате съобщения до този потребител."
 
+#. TRANS: Form validator error displayed trying to send a direct message without content.
+#. TRANS: Client error displayed trying to send a notice without content.
 #. TRANS: Command exception text shown when trying to send a direct message to another user without content.
 #. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
-#: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:490
-#: lib/command.php:593
 msgid "No content!"
 msgstr "Няма съдържание!"
 
-#: actions/newmessage.php:161
+#. TRANS: Form validation error displayed trying to send a direct message without specifying a recipient.
 msgid "No recipient specified."
 msgstr "Не е указан получател."
 
+#. TRANS: Client error displayed trying to send a direct message to self.
 #. TRANS: Error text shown when trying to send a direct message to self.
-#: actions/newmessage.php:167 lib/command.php:517
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
 "Не може да изпращате съобщения до себе си. По-добре си го кажете на себе си "
 "тихичко."
 
-#: actions/newmessage.php:184
+#. TRANS: Page title after sending a direct message.
 msgid "Message sent"
 msgstr "Съобщението е изпратено"
 
+#. TRANS: Confirmation text after sending a direct message.
+#. TRANS: %s is the direct message recipient.
 #. TRANS: Message given have sent a direct message to another user.
 #. TRANS: %s is the name of the other user.
-#: actions/newmessage.php:188 lib/command.php:525
 #, fuzzy, php-format
 msgid "Direct message to %s sent."
 msgstr "Прякото съобщение до %s е изпратено."
 
-#: actions/newmessage.php:213 actions/newnotice.php:264
+#. TRANS: Page title after an AJAX error occurred on the "send direct message" page.
+#. TRANS: Page title after an AJAX error occurs on the send notice page.
 msgid "Ajax Error"
 msgstr "Грешка в Ajax"
 
-#: actions/newnotice.php:69
+#. TRANS: Page title for sending a new notice.
 msgid "New notice"
 msgstr "Нова бележка"
 
-#: actions/newnotice.php:230
+#. TRANS: Page title after sending a notice.
 msgid "Notice posted"
 msgstr "Бележката е публикувана"
 
 #. TRANS: Instructions for Notice search page.
 #. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/noticesearch.php:69
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -3916,20 +3219,17 @@ msgstr ""
 "търсене (трябва да са по-дълги от 3 символа) с интервали."
 
 #. TRANS: Title of the page where users can search for notices.
-#: actions/noticesearch.php:80
 msgid "Text search"
 msgstr "Търсене на текст"
 
 #. TRANS: Test in RSS notice search.
 #. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearch.php:95
 #, php-format
 msgid "Search results for \"%1$s\" on %2$s"
 msgstr "Съобщение от %1$s в %2$s"
 
 #. TRANS: Text for logged in users making a query for notices without results.
 #. TRANS: This message contains a Markdown link.
-#: actions/noticesearch.php:128
 #, php-format
 msgid ""
 "Be the first to [post on this topic](%%%%action.newnotice%%%%?"
@@ -3938,7 +3238,6 @@ msgstr ""
 
 #. TRANS: Text for not logged in users making a query for notices without results.
 #. TRANS: This message contains Markdown links.
-#: actions/noticesearch.php:133
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and be the first to "
@@ -3946,79 +3245,68 @@ msgid ""
 msgstr ""
 
 #. TRANS: RSS notice search feed title. %s is the query.
-#: actions/noticesearchrss.php:95
 #, php-format
 msgid "Updates with \"%s\""
 msgstr "Бележки, съдържащи \"%s\""
 
 #. TRANS: RSS notice search feed description.
 #. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearchrss.php:99
 #, fuzzy, php-format
 msgid "Updates matching search term \"%1$s\" on %2$s."
 msgstr "Бележки, съдържащи търсеното \"%1$s\" в %2$s!"
 
-#: actions/nudge.php:85
+#. TRANS: Client error displayed trying to nudge a user that cannot be nudged.
 msgid ""
 "This user doesn't allow nudges or hasn't confirmed or set their email "
 "address yet."
 msgstr ""
 
-#: actions/nudge.php:94
+#. TRANS: Page title after sending a nudge.
 msgid "Nudge sent"
 msgstr "Побутването е изпратено"
 
-#: actions/nudge.php:97
+#. TRANS: Confirmation text after sending a nudge.
 msgid "Nudge sent!"
 msgstr "Побутването е изпратено!"
 
 #. TRANS: Message displayed to an anonymous user trying to view OAuth application list.
-#: actions/oauthappssettings.php:57
 msgid "You must be logged in to list your applications."
 msgstr "За да редактирате приложение, трябва да сте влезли."
 
 #. TRANS: Page title for OAuth applications
-#: actions/oauthappssettings.php:73
 msgid "OAuth applications"
 msgstr "Няма такова приложение."
 
 #. TRANS: Page instructions for OAuth applications
-#: actions/oauthappssettings.php:85
 msgid "Applications you have registered"
 msgstr ""
 
 #. TRANS: Empty list message on page with OAuth applications.
-#: actions/oauthappssettings.php:138
 #, fuzzy, php-format
 msgid "You have not registered any applications yet."
 msgstr "Не сте собственик на това приложение."
 
 #. TRANS: Title for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:69
 #, fuzzy
 msgid "Connected applications"
 msgstr "Изтриване на приложението"
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:80
 msgid "The following connections exist for your account."
 msgstr ""
 
 #. TRANS: Client error when trying to revoke access for an application while not being a user of it.
-#: actions/oauthconnectionssettings.php:165
 msgid "You are not a user of that application."
 msgstr "Не сте собственик на това приложение."
 
 #. TRANS: Client error when revoking access has failed for some reason.
 #. TRANS: %s is the application ID revoking access failed for.
-#: actions/oauthconnectionssettings.php:180
 #, fuzzy, php-format
 msgid "Unable to revoke access for application: %s."
 msgstr "Използвайте тази бланка за създаване на нова група."
 
 #. TRANS: Success message after revoking access for an application.
 #. TRANS: %1$s is the application name, %2$s is the first part of the user token.
-#: actions/oauthconnectionssettings.php:199
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -4026,471 +3314,388 @@ msgid ""
 msgstr ""
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:210
 msgid "You have not authorized any applications to use your account."
 msgstr ""
 
 #. TRANS: Note for developers in the OAuth connection settings form.
 #. TRANS: This message contains a Markdown link. Do not separate "](".
 #. TRANS: %s is the URL to the OAuth settings.
-#: actions/oauthconnectionssettings.php:230
 #, php-format
 msgid ""
 "Are you a developer? [Register an OAuth client application](%s) to use with "
 "this instance of StatusNet."
 msgstr ""
 
-#: actions/oembed.php:64
+#. TRANS: Server error displayed in oEmbed action when path not found.
+#. TRANS: %s is a path.
 #, fuzzy, php-format
 msgid "\"%s\" not found."
 msgstr "Не е открит методът в API."
 
-#: actions/oembed.php:76
+#. TRANS: Server error displayed in oEmbed action when notice not found.
+#. TRANS: %s is a notice.
 #, fuzzy, php-format
 msgid "Notice %s not found."
 msgstr "Не е открит методът в API."
 
-#: actions/oembed.php:80 actions/shownotice.php:100
+#. TRANS: Server error displayed in oEmbed action when notice has not profile.
 msgid "Notice has no profile."
 msgstr "Потребителят няма профил."
 
-#: actions/oembed.php:83 actions/shownotice.php:172
+#. TRANS: oEmbed title. %1$s is the author name, %2$s is the creation date.
 #, php-format
 msgid "%1$s's status on %2$s"
 msgstr "Бележка на %1$s от %2$s"
 
-#: actions/oembed.php:95
+#. TRANS: Server error displayed in oEmbed action when attachment not found.
+#. TRANS: %d is an attachment ID.
 #, fuzzy, php-format
 msgid "Attachment %s not found."
 msgstr "Получателят не е открит"
 
-#: actions/oembed.php:136
+#. TRANS: Server error displayed in oEmbed request when a path is not supported.
+#. TRANS: %s is a path.
 #, php-format
 msgid "\"%s\" not supported for oembed requests."
 msgstr ""
 
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
-#: actions/oembed.php:168
 #, fuzzy, php-format
 msgid "Content type %s not supported."
 msgstr "вид съдържание "
 
 #. TRANS: Error message displaying attachments. %s is the site's base URL.
-#: actions/oembed.php:172
 #, php-format
 msgid "Only %s URLs over plain HTTP please."
 msgstr ""
 
+#. TRANS: Server error displayed in oEmbed action when request specifies an unsupported data format.
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1207
-#: lib/apiaction.php:1234 lib/apiaction.php:1369
 msgid "Not a supported data format."
 msgstr "Неподдържан формат на данните"
 
 #. TRANS: ShortName in the OpenSearch interface when trying to find users.
-#: actions/opensearch.php:64
 msgid "People Search"
 msgstr "Търсене на хора"
 
-#: actions/opensearch.php:68
+#. TRANS: ShortName in the OpenSearch interface when trying to find notices.
 msgid "Notice Search"
 msgstr "Търсене на бележки"
 
 #. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
-#: actions/otp.php:70
 #, fuzzy
 msgid "No user ID specified."
 msgstr "Не е указана група."
 
 #. TRANS: Client error displayed trying to use "one time password login" without specifying a login token.
-#: actions/otp.php:86
 #, fuzzy
 msgid "No login token specified."
 msgstr "Не е указана бележка."
 
 #. TRANS: Client error displayed trying to use "one time password login" without requesting a login token.
-#: actions/otp.php:94
 msgid "No login token requested."
 msgstr "Няма заявка за одобрение."
 
 #. TRANS: Client error displayed trying to use "one time password login" while specifying an invalid login token.
-#: actions/otp.php:100
 msgid "Invalid login token specified."
 msgstr "Не е указана бележка."
 
 #. TRANS: Client error displayed trying to use "one time password login" while specifying an expired login token.
-#: actions/otp.php:110
 msgid "Login token expired."
 msgstr "Вход в сайта"
 
 #. TRANS: Title for outbox for any but the fist page.
 #. TRANS: %1$s is the user nickname, %2$d is the page number.
-#: actions/outbox.php:57
 #, php-format
 msgid "Outbox for %1$s - page %2$d"
 msgstr "%1$s, страница %2$d"
 
 #. TRANS: Title for first page of outbox.
-#: actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
 msgstr "Изходяща кутия за %s"
 
 #. TRANS: Instructions for outbox.
-#: actions/outbox.php:103
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr "Това е изходящата ви кутия с лични съобщения до други потребители."
 
-#: actions/passwordsettings.php:58
 msgid "Change password"
 msgstr "Смяна на паролата"
 
-#: actions/passwordsettings.php:69
 msgid "Change your password."
 msgstr "Смяна на паролата."
 
 #. TRANS: Fieldset legend for password reset form.
-#: actions/passwordsettings.php:96 actions/recoverpassword.php:251
 #, fuzzy
 msgid "Password change"
 msgstr "Паролата е записана."
 
-#: actions/passwordsettings.php:104
 msgid "Old password"
 msgstr "Стара парола"
 
 #. TRANS: Field label for password reset form.
-#: actions/passwordsettings.php:108 actions/recoverpassword.php:256
 msgid "New password"
 msgstr "Нова парола"
 
-#: actions/passwordsettings.php:109 actions/register.php:416
 #, fuzzy
 msgid "6 or more characters."
 msgstr "6 или повече знака"
 
 #. TRANS: Ttile for field label for password reset form where the password has to be typed again.
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:264
-#: actions/register.php:420
 #, fuzzy
 msgid "Same as password above."
 msgstr "Също като паролата по-горе"
 
-#: actions/passwordsettings.php:117
 msgid "Change"
 msgstr "Промяна"
 
-#: actions/passwordsettings.php:153 actions/register.php:223
 msgid "Password must be 6 or more characters."
 msgstr "Паролата трябва да е 6 или повече знака."
 
-#: actions/passwordsettings.php:156 actions/register.php:226
 msgid "Passwords don't match."
 msgstr "Паролите не съвпадат."
 
-#: actions/passwordsettings.php:164
 msgid "Incorrect old password"
 msgstr "Грешна стара парола"
 
-#: actions/passwordsettings.php:180
 msgid "Error saving user; invalid."
 msgstr "Грешка при запазване на потребител — невалидност."
 
 #. TRANS: Reset password form validation error message.
-#: actions/passwordsettings.php:185 actions/recoverpassword.php:418
 #, fuzzy
 msgid "Cannot save new password."
 msgstr "Грешка при запазване на новата парола."
 
-#: actions/passwordsettings.php:191
 msgid "Password saved."
 msgstr "Паролата е записана."
 
 #. TRANS: Title for Paths admin panel.
 #. TRANS: Menu item for site administration
-#: actions/pathsadminpanel.php:58 lib/adminpanelaction.php:371
 msgid "Paths"
 msgstr "Пътища"
 
 #. TRANS: Form instructions for Path admin panel.
-#: actions/pathsadminpanel.php:69
 msgid "Path and server settings for this StatusNet site"
 msgstr ""
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the directory that could not be read from.
-#: actions/pathsadminpanel.php:155
 #, fuzzy, php-format
 msgid "Theme directory not readable: %s."
 msgstr "Страницата не е достъпна във вида медия, който приемате"
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the avatar directory that could not be written to.
-#: actions/pathsadminpanel.php:163
 #, php-format
 msgid "Avatar directory not writable: %s."
 msgstr "Директория на аватара"
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the background directory that could not be written to.
-#: actions/pathsadminpanel.php:171
 #, fuzzy, php-format
 msgid "Background directory not writable: %s."
 msgstr "Директория на фона"
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the locales directory that could not be read from.
-#: actions/pathsadminpanel.php:181
 #, fuzzy, php-format
 msgid "Locales directory not readable: %s."
 msgstr "Страницата не е достъпна във вида медия, който приемате"
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the SSL server URL that is too long.
-#: actions/pathsadminpanel.php:189
 msgid "Invalid SSL server. The maximum length is 255 characters."
 msgstr ""
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:235 actions/siteadminpanel.php:58
 msgid "Site"
 msgstr "Сайт"
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:241 actions/pathsadminpanel.php:279
-#: actions/pathsadminpanel.php:370 actions/pathsadminpanel.php:425
 msgid "Server"
 msgstr "Сървър"
 
-#: actions/pathsadminpanel.php:242
 msgid "Site's server hostname."
 msgstr ""
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:248 actions/pathsadminpanel.php:288
-#: actions/pathsadminpanel.php:379 actions/pathsadminpanel.php:434
 msgid "Path"
 msgstr "Път"
 
-#: actions/pathsadminpanel.php:249
 #, fuzzy
 msgid "Site path."
 msgstr "Път до сайта"
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:255
 #, fuzzy
 msgid "Locale directory"
 msgstr "Директория на аватара"
 
-#: actions/pathsadminpanel.php:256
 msgid "Directory path to locales."
 msgstr ""
 
 #. TRANS: Checkbox label in Paths admin panel.
-#: actions/pathsadminpanel.php:263
 msgid "Fancy URLs"
 msgstr "Кратки URL-адреси"
 
-#: actions/pathsadminpanel.php:265
 msgid "Use fancy (more readable and memorable) URLs?"
 msgstr ""
 
-#: actions/pathsadminpanel.php:272
 msgid "Theme"
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:281
 #, fuzzy
 msgid "Server for themes."
 msgstr "Излизане от сайта"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:290
 msgid "Web path to themes."
 msgstr ""
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:297 actions/pathsadminpanel.php:388
-#: actions/pathsadminpanel.php:443 actions/pathsadminpanel.php:495
 msgid "SSL server"
 msgstr "SSL-сървър"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:299
 msgid "SSL server for themes (default: SSL server)."
 msgstr ""
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:306 actions/pathsadminpanel.php:397
-#: actions/pathsadminpanel.php:452
 #, fuzzy
 msgid "SSL path"
 msgstr "Път до сайта"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:308
 msgid "SSL path to themes (default: /theme/)."
 msgstr ""
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:315 actions/pathsadminpanel.php:406
-#: actions/pathsadminpanel.php:461
 #, fuzzy
 msgid "Directory"
 msgstr "Директория на аватара"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:317
 msgid "Directory where themes are located."
 msgstr ""
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:326
 msgid "Avatars"
 msgstr "Аватари"
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:333
 msgid "Avatar server"
 msgstr "Сървър на аватара"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:335
 #, fuzzy
 msgid "Server for avatars."
 msgstr "Излизане от сайта"
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:342
 msgid "Avatar path"
 msgstr "Път до аватара"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:344
 #, fuzzy
 msgid "Web path to avatars."
 msgstr "Неуспешно обновяване на аватара."
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:351
 msgid "Avatar directory"
 msgstr "Директория на аватара"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:353
 msgid "Directory where avatars are located."
 msgstr ""
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:364
 msgid "Backgrounds"
 msgstr "Фонове"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:372
 #, fuzzy
 msgid "Server for backgrounds."
 msgstr "Излизане от сайта"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:381
 msgid "Web path to backgrounds."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:390
 msgid "Server for backgrounds on SSL pages."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:399
 msgid "Web path to backgrounds on SSL pages."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:408
 msgid "Directory where backgrounds are located."
 msgstr ""
 
 #. TRANS: Fieldset legens in Paths admin panel.
-#: actions/pathsadminpanel.php:419
 #, fuzzy
 msgid "Attachments"
 msgstr "Няма прикачени файлове."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:427
 #, fuzzy
 msgid "Server for attachments."
 msgstr "Излизане от сайта"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:436
 #, fuzzy
 msgid "Web path to attachments."
 msgstr "Няма прикачени файлове."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:445
 #, fuzzy
 msgid "Server for attachments on SSL pages."
 msgstr "Излизане от сайта"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:454
 msgid "Web path to attachments on SSL pages."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:463
 msgid "Directory where attachments are located."
 msgstr ""
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:472
 msgid "SSL"
 msgstr "SSL"
 
 #. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
-#: actions/pathsadminpanel.php:477 actions/snapshotadminpanel.php:202
 msgid "Never"
 msgstr "Никога"
 
 #. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
-#: actions/pathsadminpanel.php:479
 msgid "Sometimes"
 msgstr "Понякога"
 
 #. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
-#: actions/pathsadminpanel.php:481
 msgid "Always"
 msgstr "Винаги"
 
-#: actions/pathsadminpanel.php:485
 msgid "Use SSL"
 msgstr "Използване на SSL"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:487
 #, fuzzy
 msgid "When to use SSL."
 msgstr "Кога да се използва SSL"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:497
 msgid "Server to direct SSL requests to."
 msgstr ""
 
 #. TRANS: Button title text to store form data in the Paths admin panel.
-#: actions/pathsadminpanel.php:514
 msgid "Save paths"
 msgstr "Запазване на пътищата"
 
 #. TRANS: Instructions for the "People search" page.
 #. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/peoplesearch.php:54
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
@@ -4500,57 +3705,46 @@ msgstr ""
 "Отделяйте фразите за "
 
 #. TRANS: Title of a page where users can search for other users.
-#: actions/peoplesearch.php:61
 msgid "People search"
 msgstr "Търсене на хора"
 
-#: actions/peopletag.php:68
 #, php-format
 msgid "Not a valid people tag: %s."
 msgstr "Неправилен адрес на е-поща."
 
-#: actions/peopletag.php:142
 #, fuzzy, php-format
 msgid "Users self-tagged with %1$s - page %2$d"
 msgstr "Бележки с етикет %s, страница %d"
 
 #. TRANS: Page title for AJAX form return when a disabling a plugin.
-#: actions/plugindisable.php:69
 msgctxt "plugin"
 msgid "Disabled"
 msgstr ""
 
 #. TRANS: Client error displayed trying to perform any request method other than POST.
 #. TRANS: Do not translate POST.
-#: actions/pluginenable.php:78 actions/subscribe.php:77
 msgid "This action only accepts POST requests."
 msgstr ""
 
-#: actions/pluginenable.php:102
 #, fuzzy
 msgid "You cannot administer plugins."
 msgstr "Не можете да изтривате потребители."
 
-#: actions/pluginenable.php:109
 #, fuzzy
 msgid "No such plugin."
 msgstr "Няма такака страница."
 
 #. TRANS: Page title for AJAX form return when enabling a plugin.
-#: actions/pluginenable.php:159
 msgctxt "plugin"
 msgid "Enabled"
 msgstr ""
 
 #. TRANS: Tab and title for plugins admin panel.
 #. TRANS: Menu item for site administration
-#: actions/pluginsadminpanel.php:56 actions/version.php:191
-#: lib/adminpanelaction.php:411
 msgid "Plugins"
 msgstr "Приставки"
 
 #. TRANS: Instructions at top of plugin admin page.
-#: actions/pluginsadminpanel.php:68
 msgid ""
 "Additional plugins can be enabled and configured manually. See the <a href="
 "\"http://status.net/wiki/Plugins\">online plugin documentation</a> for more "
@@ -4558,62 +3752,49 @@ msgid ""
 msgstr ""
 
 #. TRANS: Admin form section header
-#: actions/pluginsadminpanel.php:84
 #, fuzzy
 msgid "Default plugins"
 msgstr "Език по подразбиране"
 
-#: actions/pluginsadminpanel.php:106
 msgid ""
 "All default plugins have been disabled from the site's configuration file."
 msgstr ""
 
-#: actions/postnotice.php:95
 msgid "Invalid notice content."
 msgstr "Неправилен размер."
 
-#: actions/postnotice.php:101
 #, php-format
 msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’."
 msgstr ""
 
 #. TRANS: Page title for profile settings.
-#: actions/profilesettings.php:60
 msgid "Profile settings"
 msgstr "Настройки на профила"
 
 #. TRANS: Usage instructions for profile settings.
-#: actions/profilesettings.php:71
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr "Можете да обновите личния си профил, за да знаят хората повече за вас."
 
 #. TRANS: Profile settings form legend.
-#: actions/profilesettings.php:99
 msgid "Profile information"
 msgstr "Данни на профила"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:110 actions/register.php:412
 #, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr "От 1 до 64 малки букви или цифри, без пунктоация и интервали"
 
 #. TRANS: Field label in form for profile settings.
-#: actions/profilesettings.php:114 actions/register.php:434
-#: lib/groupeditform.php:150
 msgid "Full name"
 msgstr "Пълно име"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:119 actions/register.php:439
-#: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "Лична страница"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:122 actions/register.php:441
 #, fuzzy
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr "Адрес на личната ви страница, блог или профил в друг сайт"
@@ -4621,7 +3802,6 @@ msgstr "Адрес на личната ви страница, блог или п
 #. TRANS: Tooltip for field label in form for profile settings. Plural
 #. TRANS: is decided by the number of characters available for the
 #. TRANS: biography (%d).
-#: actions/profilesettings.php:130 actions/register.php:450
 #, fuzzy, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4629,69 +3809,54 @@ msgstr[0] "Опишете себе си и интересите си в до %d
 msgstr[1] "Опишете себе си и интересите си в до %d букви"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:136 actions/register.php:455
 msgid "Describe yourself and your interests"
 msgstr "Опишете себе си и интересите си"
 
 #. TRANS: Text area label in form for profile settings where users can provide.
 #. TRANS: their biography.
-#: actions/profilesettings.php:140 actions/register.php:457
 msgid "Bio"
 msgstr "За мен"
 
 #. TRANS: Field label in form for profile settings.
-#: actions/profilesettings.php:146 actions/register.php:462
-#: lib/groupeditform.php:173
 msgid "Location"
 msgstr "Местоположение"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:149
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Къде се намирате (град, община, държава и т.н.)"
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:154
 msgid "Share my current location when posting notices"
 msgstr ""
 
 #. TRANS: Field label in form for profile settings.
-#: actions/profilesettings.php:162 actions/tagother.php:128
-#: actions/tagother.php:188 lib/subscriptionlist.php:104
-#: lib/subscriptionlist.php:106
 msgid "Tags"
 msgstr "Етикети"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:165
 msgid ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- "
 "separated."
 msgstr ""
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:170
 msgid "Language"
 msgstr "Език"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:172
 #, fuzzy
 msgid "Preferred language."
 msgstr "Предпочитан език"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:182
 msgid "Timezone"
 msgstr "Часови пояс"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:184
 msgid "What timezone are you normally in?"
 msgstr "В кой часови пояс сте обикновено?"
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:190
 #, fuzzy
 msgid ""
 "Automatically subscribe to whoever subscribes to me (best for non-humans)."
@@ -4702,7 +3867,6 @@ msgstr ""
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Plural form is used based on the maximum number of allowed
 #. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:259 actions/register.php:214
 #, fuzzy, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4710,102 +3874,83 @@ msgstr[0] "Биографията е твърде дълга (до %d симво
 msgstr[1] "Биографията е твърде дълга (до %d символа)."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:270 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr "Не е избран часови пояс"
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:278
 #, fuzzy
 msgid "Language is too long (maximum 50 characters)."
 msgstr "Името на езика е твърде дълго (може да е до 50 знака)."
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:292
 #, fuzzy, php-format
 msgid "Invalid tag: \"%s\"."
 msgstr "Неправилен етикет: \"%s\""
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:348
 #, fuzzy
 msgid "Could not update user for autosubscribe."
 msgstr "Грешка при обновяване записа на потребител."
 
 #. TRANS: Server error thrown when user profile location preference settings could not be updated.
-#: actions/profilesettings.php:406
 #, fuzzy
 msgid "Could not save location prefs."
 msgstr "Грешка при запазване етикетите."
 
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:428 actions/tagother.php:179
 msgid "Could not save tags."
 msgstr "Грешка при запазване на етикетите."
 
 #. TRANS: Confirmation shown when user profile settings are saved.
 #. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:437 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "Настройките са запазени."
 
 #. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
 #. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:484 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "Създаване на нова сметка"
 
-#: actions/public.php:83
 #, php-format
 msgid "Beyond the page limit (%s)."
 msgstr ""
 
-#: actions/public.php:92
 msgid "Could not retrieve public stream."
 msgstr "Грешка при изтегляне на общия поток"
 
-#: actions/public.php:130
 #, php-format
 msgid "Public timeline, page %d"
 msgstr "Общ поток, страница %d"
 
-#: actions/public.php:132 lib/publicgroupnav.php:79
 msgid "Public timeline"
 msgstr "Общ поток"
 
-#: actions/public.php:160
 msgid "Public Stream Feed (RSS 1.0)"
 msgstr "Емисия на общия поток (RSS 1.0)"
 
-#: actions/public.php:164
 msgid "Public Stream Feed (RSS 2.0)"
 msgstr "Емисия на общия поток (RSS 2.0)"
 
-#: actions/public.php:168
 msgid "Public Stream Feed (Atom)"
 msgstr "Емисия на общия поток (Atom)"
 
-#: actions/public.php:188
 #, php-format
 msgid ""
 "This is the public timeline for %%site.name%% but no one has posted anything "
 "yet."
 msgstr ""
 
-#: actions/public.php:191
 msgid "Be the first to post!"
 msgstr ""
 
-#: actions/public.php:195
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post!"
 msgstr ""
 
-#: actions/public.php:242
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -4814,7 +3959,6 @@ msgid ""
 "friends, family, and colleagues! ([Read more](%%doc.help%%))"
 msgstr ""
 
-#: actions/public.php:247
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -4823,19 +3967,16 @@ msgid ""
 msgstr ""
 
 #. TRANS: Public RSS feed description. %s is the StatusNet site name.
-#: actions/publicrss.php:106
 #, php-format
 msgid "%s updates from everyone."
 msgstr ""
 
 #. TRANS: Title for public tag cloud.
-#: actions/publictagcloud.php:57
 msgid "Public tag cloud"
 msgstr "Общ поток, страница %d"
 
 #. TRANS: Instructions (more used like an explanation/header).
 #. TRANS: %s is the StatusNet sitename.
-#: actions/publictagcloud.php:65
 #, php-format
 msgid "These are most popular recent tags on %s"
 msgstr ""
@@ -4843,14 +3984,12 @@ msgstr ""
 #. TRANS: This message contains a Markdown URL. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.
-#: actions/publictagcloud.php:74
 #, php-format
 msgid "No one has posted a notice with a [hashtag](%%doc.tags%%) yet."
 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.
-#: actions/publictagcloud.php:79
 msgid "Be the first to post one!"
 msgstr ""
 
@@ -4859,7 +3998,6 @@ msgstr ""
 #. TRANS: This message contains a Markdown URL. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.
-#: actions/publictagcloud.php:87
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post "
@@ -4867,42 +4005,34 @@ msgid ""
 msgstr ""
 
 #. TRANS: Client error displayed trying to recover password while already logged in.
-#: actions/recoverpassword.php:37
 msgid "You are already logged in!"
 msgstr "Вече сте влезли!"
 
 #. TRANS: Client error displayed when password recovery code is not correct.
-#: actions/recoverpassword.php:64
 msgid "No such recovery code."
 msgstr "Няма такъв код за възстановяване."
 
 #. TRANS: Client error displayed when no proper password recovery code was submitted.
-#: actions/recoverpassword.php:69
 msgid "Not a recovery code."
 msgstr "Това не е код за възстановяване."
 
 #. TRANS: Server error displayed trying to recover password without providing a user.
-#: actions/recoverpassword.php:77
 msgid "Recovery code for unknown user."
 msgstr "Код за възстановяване на непознат потребител."
 
 #. TRANS: Server error displayed removing a password recovery code from the database.
-#: actions/recoverpassword.php:91
 msgid "Error with confirmation code."
 msgstr "Грешка в кода за потвърждение."
 
 #. TRANS: Client error displayed trying to recover password with too old a recovery code.
-#: actions/recoverpassword.php:103
 msgid "This confirmation code is too old. Please start again."
 msgstr "Кодът за потвърждение е твърде стар. Започнете процеса отново."
 
 #. TRANS: Server error displayed when updating a user's e-mail address in the database fails while recovering a password.
-#: actions/recoverpassword.php:118
 msgid "Could not update user with confirmed email address."
 msgstr "Грешка при обновяване на потребител с потвърден email адрес."
 
 #. TRANS: Page notice for password recovery page.
-#: actions/recoverpassword.php:160
 #, fuzzy
 msgid ""
 "If you have forgotten or lost your password, you can get a new one sent to "
@@ -4911,100 +4041,82 @@ msgstr ""
 "На е-пощата, с която сте регистрирани са изпратени инструкции за "
 "възстановяване на паролата."
 
-#: actions/recoverpassword.php:167
 msgid "You have been identified. Enter a new password below."
 msgstr ""
 
 #. TRANS: Fieldset legend for password recovery page.
-#: actions/recoverpassword.php:198
 msgid "Password recovery"
 msgstr "Възстановяване на парола"
 
 #. TRANS: Field label on password recovery page.
-#: actions/recoverpassword.php:202
 msgid "Nickname or email address"
 msgstr "Псевдоним или е-поща"
 
 #. TRANS: Title for field label on password recovery page.
-#: actions/recoverpassword.php:205
 msgid "Your nickname on this server, or your registered email address."
 msgstr "Псевдонимът ви на този сървър или е-пощата, с която сте регистрирани."
 
 #. TRANS: Field label on password recovery page.
-#: actions/recoverpassword.php:212
 msgid "Recover"
 msgstr "Възстановяване"
 
 #. TRANS: Button text on password recovery page.
-#: actions/recoverpassword.php:214
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Recover"
 msgstr "Възстановяване"
 
 #. TRANS: Title for password recovery page in password reset mode.
-#: actions/recoverpassword.php:223
 msgid "Reset password"
 msgstr "Нова парола"
 
 #. TRANS: Title for password recovery page in password recover mode.
-#: actions/recoverpassword.php:225
 msgid "Recover password"
 msgstr "Възстановяване на паролата"
 
 #. TRANS: Title for password recovery page in email sent mode.
 #. TRANS: Subject for password recovery e-mail.
-#: actions/recoverpassword.php:227 actions/recoverpassword.php:366
 msgid "Password recovery requested"
 msgstr "Поискано е възстановяване на парола"
 
 #. TRANS: Title for password recovery page in password saved mode.
-#: actions/recoverpassword.php:229
 #, fuzzy
 msgid "Password saved"
 msgstr "Паролата е записана."
 
 #. TRANS: Title for password recovery page when an unknown action has been specified.
-#: actions/recoverpassword.php:232
 msgid "Unknown action"
 msgstr "Непознато действие"
 
 #. TRANS: Title for field label for password reset form.
-#: actions/recoverpassword.php:258
 #, fuzzy
 msgid "6 or more characters, and do not forget it!"
 msgstr "6 или повече знака. И не ги забравяйте!"
 
 #. TRANS: Button text for password reset form.
 #. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: actions/recoverpassword.php:268 lib/designform.php:145
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Reset"
 msgstr "Обновяване"
 
 #. TRANS: Form instructions for password recovery form.
-#: actions/recoverpassword.php:278
 msgid "Enter a nickname or email address."
 msgstr "Въведете псевдоним или е-поща."
 
 #. TRANS: Information on password recovery form if no known username or e-mail address was specified.
-#: actions/recoverpassword.php:309
 msgid "No user with that email address or username."
 msgstr "Няма потребител с такава е-поща или потребителско име."
 
 #. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
-#: actions/recoverpassword.php:327
 msgid "No registered email address for that user."
 msgstr "Няма указана е-поща за този потребител."
 
 #. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
-#: actions/recoverpassword.php:342
 msgid "Error saving address confirmation."
 msgstr "Грешка при запазване на потвърждение за адрес"
 
 #. TRANS: User notification after an e-mail with instructions was sent from the password recovery form.
-#: actions/recoverpassword.php:370
 msgid ""
 "Instructions for recovering your password have been sent to the email "
 "address registered to your account."
@@ -5013,131 +4125,104 @@ msgstr ""
 "възстановяване на паролата."
 
 #. TRANS: Client error displayed when trying to reset as password without providing a user.
-#: actions/recoverpassword.php:391
 msgid "Unexpected password reset."
 msgstr "Неочаквано подновяване на паролата."
 
 #. TRANS: Reset password form validation error message.
-#: actions/recoverpassword.php:400
 #, fuzzy
 msgid "Password must be 6 characters or more."
 msgstr "Паролата трябва да е от поне 6 знака."
 
 #. TRANS: Reset password form validation error message.
-#: actions/recoverpassword.php:405
 msgid "Password and confirmation do not match."
 msgstr "Паролата и потвърждението й не съвпадат."
 
 #. TRANS: Server error displayed when something does wrong with the user object during password reset.
-#: actions/recoverpassword.php:426 actions/register.php:241
 msgid "Error setting user."
 msgstr "Грешка в настройките на потребителя."
 
 #. TRANS: Success message for user after password reset.
-#: actions/recoverpassword.php:434
 msgid "New password successfully saved. You are now logged in."
 msgstr "Новата парола е запазена. Влязохте успешно."
 
-#: actions/redirecturl.php:70
 #, fuzzy
 msgid "No id parameter"
 msgstr "Липсват аргументи return-to."
 
-#: actions/redirecturl.php:76
 #, fuzzy, php-format
 msgid "No such file \"%d\""
 msgstr "Няма такъв файл."
 
-#: actions/register.php:80 actions/register.php:181 actions/register.php:392
 msgid "Sorry, only invited people can register."
 msgstr ""
 
-#: actions/register.php:87
 #, fuzzy
 msgid "Sorry, invalid invitation code."
 msgstr "Грешка в кода за потвърждение."
 
-#: actions/register.php:106
 msgid "Registration successful"
 msgstr "Записването е успешно."
 
-#: actions/register.php:108 actions/register.php:490
 msgid "Register"
 msgstr "Регистриране"
 
-#: actions/register.php:128
 msgid "Registration not allowed."
 msgstr "Записването не е позволено."
 
-#: actions/register.php:194
 #, fuzzy
 msgid "You cannot register if you don't agree to the license."
 msgstr "Не можете да се регистрате, ако не сте съгласни с  лиценза."
 
-#: actions/register.php:203
 msgid "Email address already exists."
 msgstr "Адресът на е-поща вече се използва."
 
-#: actions/register.php:236 actions/register.php:258
 msgid "Invalid username or password."
 msgstr "Неправилно име или парола."
 
-#: actions/register.php:333
 msgid ""
 "With this form you can create a new account. You can then post notices and "
 "link up to friends and colleagues."
 msgstr ""
 
-#: actions/register.php:424 actions/register.php:428
-#: actions/siteadminpanel.php:238 lib/settingsnav.php:92
 msgid "Email"
 msgstr "Е-поща"
 
-#: actions/register.php:425 actions/register.php:429
 #, fuzzy
 msgid "Used only for updates, announcements, and password recovery."
 msgstr "Използва се само за промени, обяви или възстановяване на паролата"
 
-#: actions/register.php:436
 #, fuzzy
 msgid "Longer name, preferably your \"real\" name."
 msgstr "По-дълго име, за предпочитане \"истинското\" ви име."
 
-#: actions/register.php:464
 #, fuzzy
 msgid "Where you are, like \"City, State (or Region), Country\"."
 msgstr "Къде се намирате (град, община, държава и т.н.)"
 
-#: actions/register.php:503
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
 msgstr ""
 
-#: actions/register.php:513
 #, php-format
 msgid "My text and files are copyright by %1$s."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:517
 msgid "My text and files remain under my own copyright."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:520
 msgid "All rights reserved."
 msgstr "Всички права запазени."
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:525
 #, fuzzy, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
 "email address, IM address, and phone number."
 msgstr " освен тези лични данни: парола, е-поща, месинджър, телефон."
 
-#: actions/register.php:566
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -5170,7 +4255,6 @@ msgstr ""
 "Благодарим, че се включихте в сайта и дано ползването на услугата ви носи "
 "само приятни мигове!"
 
-#: actions/register.php:590
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5178,7 +4262,6 @@ msgstr ""
 "(Трябва да получите веднага електронно писмо с указания за потвърждаване "
 "адреса на е-пощата ви.)"
 
-#: actions/remotesubscribe.php:97
 #, php-format
 msgid ""
 "To subscribe, you can [login](%%action.login%%), or [register](%%action."
@@ -5190,125 +4273,98 @@ msgstr ""
 "[подобна услуга за микроблогване](%%doc.openmublog%%), въведете адреса на "
 "профила си в нея по-долу."
 
-#: actions/remotesubscribe.php:111
 msgid "Remote subscribe"
 msgstr "Отдалечен абонамент"
 
-#: actions/remotesubscribe.php:123
 msgid "Subscribe to a remote user"
 msgstr "Абониране за отдалечен потребител"
 
-#: actions/remotesubscribe.php:128
 msgid "User nickname"
 msgstr "Потребителски псевдоним"
 
-#: actions/remotesubscribe.php:129
 #, fuzzy
 msgid "Nickname of the user you want to follow."
 msgstr "Псевдоним на потребител, когото искате да следите"
 
-#: actions/remotesubscribe.php:132
 msgid "Profile URL"
 msgstr "Адрес на профила"
 
-#: actions/remotesubscribe.php:133
 #, fuzzy
 msgid "URL of your profile on another compatible microblogging service."
 msgstr "Адрес на профила ви в друга, съвместима услуга за микроблогване"
 
 #. TRANS: Link text for link that will subscribe to a remote profile.
-#: actions/remotesubscribe.php:136 lib/subscribeform.php:139
-#: lib/userprofile.php:402
 msgid "Subscribe"
 msgstr "Абониране"
 
-#: actions/remotesubscribe.php:158
 #, fuzzy
 msgid "Invalid profile URL (bad format)."
 msgstr "Неправилен адрес на профил (грешен формат)"
 
-#: actions/remotesubscribe.php:167
 msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
 msgstr ""
 "Неправилен адрес на профил (няма документ YADIS или XRDS е неправилен)."
 
-#: actions/remotesubscribe.php:175
 #, fuzzy
 msgid "That is a local profile! Login to subscribe."
 msgstr "Това е локален профил! Влезте, за да се абонирате."
 
-#: actions/remotesubscribe.php:182
 #, fuzzy
 msgid "Could not get a request token."
 msgstr "Не е получен token за одобрение."
 
-#: actions/repeat.php:56
 msgid "Only logged-in users can repeat notices."
 msgstr "Само влезли потребители могат да повтарят бележки."
 
-#: actions/repeat.php:63 actions/repeat.php:70
 msgid "No notice specified."
 msgstr "Не е указана бележка."
 
-#: actions/repeat.php:75
 #, fuzzy
 msgid "You cannot repeat your own notice."
 msgstr "Не можете да повтаряте собствена бележка."
 
-#: actions/repeat.php:89
 msgid "You already repeated that notice."
 msgstr "Вече сте повторили тази бележка."
 
-#: actions/repeat.php:112 lib/noticelist.php:697
 msgid "Repeated"
 msgstr "Повторено"
 
-#: actions/repeat.php:117
 msgid "Repeated!"
 msgstr "Повторено!"
 
 #. TRANS: RSS reply feed title. %s is a user nickname.
-#: actions/replies.php:126 actions/repliesrss.php:68
-#: lib/personalgroupnav.php:105
 #, php-format
 msgid "Replies to %s"
 msgstr "Отговори на %s"
 
-#: actions/replies.php:128
 #, fuzzy, php-format
 msgid "Replies to %1$s, page %2$d"
 msgstr "Отговори до %1$s в %2$s!"
 
-#: actions/replies.php:145
 #, php-format
 msgid "Replies feed for %s (RSS 1.0)"
 msgstr "Емисия с отговори на %s (RSS 1.0)"
 
-#: actions/replies.php:152
 #, php-format
 msgid "Replies feed for %s (RSS 2.0)"
 msgstr "Емисия с отговори на %s (RSS 2.0)"
 
-#: actions/replies.php:159
 #, php-format
 msgid "Replies feed for %s (Atom)"
 msgstr "Емисия с отговори на %s (Atom)"
 
-#: actions/replies.php:199
 #, php-format
 msgid ""
 "This is the timeline showing replies to %1$s but %2$s hasn't received a "
 "notice to them yet."
 msgstr ""
 
-#: actions/replies.php:204
 #, php-format
 msgid ""
 "You can engage other users in a conversation, subscribe to more people or "
 "[join groups](%%action.groups%%)."
 msgstr ""
 
-#: actions/replies.php:206
 #, php-format
 msgid ""
 "You can try to [nudge %1$s](../%2$s) or [post something to them](%%%%action."
@@ -5317,227 +4373,186 @@ msgstr ""
 
 #. TRANS: RSS reply feed description.
 #. TRANS: %1$s is a user nickname, %2$s is the StatusNet site name.
-#: actions/repliesrss.php:74
 #, fuzzy, php-format
 msgid "Replies to %1$s on %2$s."
 msgstr "Отговори до %1$s в %2$s!"
 
 #. TRANS: Client exception displayed when trying to restore an account while not logged in.
-#: actions/restoreaccount.php:78
 #, fuzzy
 msgid "Only logged-in users can restore their account."
 msgstr "Само влезли потребители могат да повтарят бележки."
 
 #. TRANS: Client exception displayed when trying to restore an account without having restore rights.
-#: actions/restoreaccount.php:83
 #, fuzzy
 msgid "You may not restore your account."
 msgstr "Не сте собственик на това приложение."
 
 #. TRANS: Client exception displayed trying to restore an account while something went wrong uploading a file.
 #. TRANS: Client exception. No file; probably just a non-AJAX submission.
-#: actions/restoreaccount.php:121 actions/restoreaccount.php:146
 #, fuzzy
 msgid "No uploaded file."
 msgstr "Качване на файл"
 
 #. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
-#: actions/restoreaccount.php:129 lib/mediafile.php:194
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
 msgstr ""
 
 #. TRANS: Client exception.
-#: actions/restoreaccount.php:135 lib/mediafile.php:200
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form."
 msgstr ""
 
 #. TRANS: Client exception.
-#: actions/restoreaccount.php:141 lib/mediafile.php:206
 msgid "The uploaded file was only partially uploaded."
 msgstr ""
 
 #. TRANS: Client exception thrown when a temporary folder is not present to store a file upload.
-#: actions/restoreaccount.php:150 lib/mediafile.php:214
 msgid "Missing a temporary folder."
 msgstr "Липсва временна папка."
 
 #. TRANS: Client exception thrown when writing to disk is not possible during a file upload operation.
-#: actions/restoreaccount.php:154 lib/mediafile.php:218
 msgid "Failed to write file to disk."
 msgstr "Грешка при записване файла на диска."
 
 #. TRANS: Client exception thrown when a file upload operation has been stopped by an extension.
-#: actions/restoreaccount.php:158 lib/mediafile.php:222
 msgid "File upload stopped by extension."
 msgstr ""
 
 #. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
 #. TRANS: Exception thrown when uploading an image fails for an unknown reason.
 #. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
-#: actions/restoreaccount.php:164 lib/imagefile.php:106 lib/mediafile.php:228
 msgid "System error uploading file."
 msgstr "Системна грешка при качване на файл."
 
 #. TRANS: Client exception thrown when a feed is not an Atom feed.
-#: actions/restoreaccount.php:207
 #, fuzzy
 msgid "Not an Atom feed."
 msgstr "Всички членове"
 
 #. TRANS: Success message when a feed has been restored.
-#: actions/restoreaccount.php:241
 msgid ""
 "Feed has been restored. Your old posts should now appear in search and your "
 "profile page."
 msgstr ""
 
 #. TRANS: Message when a feed restore is in progress.
-#: actions/restoreaccount.php:245
 msgid "Feed will be restored. Please wait a few minutes for results."
 msgstr ""
 
 #. TRANS: Form instructions for feed restore.
-#: actions/restoreaccount.php:342
 msgid ""
 "You can upload a backed-up stream in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format."
 msgstr ""
 
 #. TRANS: Title for submit button to confirm upload of a user backup file for account restore.
-#: actions/restoreaccount.php:373
 #, fuzzy
 msgid "Upload the file"
 msgstr "Качване на файл"
 
-#: actions/revokerole.php:75
 #, fuzzy
 msgid "You cannot revoke user roles on this site."
 msgstr "Не можете да заглушавате потребители на този сайт."
 
-#: actions/revokerole.php:82
 #, fuzzy
 msgid "User doesn't have this role."
 msgstr "Потребител без съответстващ профил"
 
-#: actions/rsd.php:142 actions/version.php:159
 msgid "StatusNet"
 msgstr "StatusNet"
 
-#: actions/sandbox.php:65 actions/unsandbox.php:65
 msgid "You cannot sandbox users on this site."
 msgstr "Не можете да заглушавате потребители на този сайт."
 
-#: actions/sandbox.php:72
 msgid "User is already sandboxed."
 msgstr "Потребителят вече е заглушен."
 
 #. TRANS: Menu item for site administration
-#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
-#: lib/adminpanelaction.php:379
 msgid "Sessions"
 msgstr "Сесии"
 
-#: actions/sessionsadminpanel.php:65
 msgid "Session settings for this StatusNet site"
 msgstr ""
 
-#: actions/sessionsadminpanel.php:175
 msgid "Handle sessions"
 msgstr "Управление на сесии"
 
-#: actions/sessionsadminpanel.php:177
 msgid "Whether to handle sessions ourselves."
 msgstr ""
 
-#: actions/sessionsadminpanel.php:181
 msgid "Session debugging"
 msgstr ""
 
-#: actions/sessionsadminpanel.php:183
 msgid "Turn on debugging output for sessions."
 msgstr ""
 
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
+#. TRANS: Submit button title.
+msgid "Save"
+msgstr "Запазване"
+
 msgid "Save site settings"
 msgstr "Запазване настройките на сайта"
 
-#: actions/showapplication.php:78
 msgid "You must be logged in to view an application."
 msgstr "За прегледате приложение, трябва да сте влезли."
 
-#: actions/showapplication.php:151
 msgid "Application profile"
 msgstr "Профил на приложението"
 
-#: actions/showapplication.php:179
 #, php-format
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr ""
 
-#: actions/showapplication.php:189
 #, fuzzy
 msgid "Application actions"
 msgstr "Данни за приложението"
 
-#: actions/showapplication.php:212
 msgid "Reset key & secret"
 msgstr ""
 
 #. TRANS: Title of form for deleting a user.
-#: actions/showapplication.php:228 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:64 lib/noticelist.php:678
 msgid "Delete"
 msgstr "Изтриване"
 
-#: actions/showapplication.php:237
 msgid "Application info"
 msgstr "Данни за приложението"
 
-#: actions/showapplication.php:255
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
 msgstr ""
 
-#: actions/showapplication.php:275
 #, fuzzy
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr "Наистина ли искате да изтриете тази бележка?"
 
 #. TRANS: Title for all but the first page of favourite notices of a user.
 #. TRANS: %1$s is the user for whom the favourite notices are displayed, %2$d is the page number.
-#: actions/showfavorites.php:80
 #, php-format
 msgid "%1$s's favorite notices, page %2$d"
 msgstr "Любими бележки на %1$s, страница %2$d"
 
 #. TRANS: Server error displayed when favourite notices could not be retrieved from the database.
-#: actions/showfavorites.php:134
 msgid "Could not retrieve favorite notices."
 msgstr "Грешка при изтегляне на любимите бележки"
 
 #. TRANS: Feed link text. %s is a username.
-#: actions/showfavorites.php:172
 #, php-format
 msgid "Feed for favorites of %s (RSS 1.0)"
 msgstr "Емисия с приятелите на %s"
 
 #. TRANS: Feed link text. %s is a username.
-#: actions/showfavorites.php:180
 #, php-format
 msgid "Feed for favorites of %s (RSS 2.0)"
 msgstr "Емисия с приятелите на %s"
 
 #. TRANS: Feed link text. %s is a username.
-#: actions/showfavorites.php:188
 #, php-format
 msgid "Feed for favorites of %s (Atom)"
 msgstr "Емисия с приятелите на %s"
 
 #. TRANS: Text displayed instead of favourite notices for the current logged in user that has no favourites.
-#: actions/showfavorites.php:209
 msgid ""
 "You haven't chosen any favorite notices yet. Click the fave button on "
 "notices you like to bookmark them for later or shed a spotlight on them."
@@ -5545,7 +4560,6 @@ msgstr ""
 
 #. TRANS: Text displayed instead of favourite notices for a user that has no favourites while logged in.
 #. TRANS: %s is a username.
-#: actions/showfavorites.php:213
 #, php-format
 msgid ""
 "%s hasn't added any favorite notices yet. Post something interesting they "
@@ -5555,7 +4569,6 @@ msgstr ""
 #. TRANS: Text displayed instead of favourite notices for a user that has no favourites while not logged in.
 #. TRANS: %s is a username, %%%%action.register%%%% is a link to the user registration page.
 #. TRANS: (link text)[link] is a Mark Down link.
-#: actions/showfavorites.php:220
 #, php-format
 msgid ""
 "%s hasn't added any favorite notices yet. Why not [register an account](%%%%"
@@ -5564,65 +4577,54 @@ msgid ""
 msgstr ""
 
 #. TRANS: Page notice for show favourites page.
-#: actions/showfavorites.php:251
 msgid "This is a way to share what you like."
 msgstr "Така можете да споделите какво харесвате."
 
 #. TRANS: Page title for first group page. %s is a group name.
-#: actions/showgroup.php:75
 #, php-format
 msgid "%s group"
 msgstr "Група %s"
 
 #. TRANS: Page title for any but first group page.
 #. TRANS: %1$s is a group name, $2$s is a page number.
-#: actions/showgroup.php:79
 #, php-format
 msgid "%1$s group, page %2$d"
 msgstr "%1$s, страница %2$d"
 
 #. TRANS: Label for group description or group note (dt). Text hidden by default.
-#: actions/showgroup.php:266
 msgid "Note"
 msgstr "Бележка"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:277 lib/groupeditform.php:180
 msgid "Aliases"
 msgstr "Псевдоними"
 
 #. TRANS: Group actions header (h2). Text hidden by default.
-#: actions/showgroup.php:294
 #, fuzzy
 msgid "Group actions"
 msgstr "Потребителски действия"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:338
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
 msgstr "Емисия с бележки на %s (RSS 1.0)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:345
 #, php-format
 msgid "Notice feed for %s group (RSS 2.0)"
 msgstr "Емисия с бележки на %s (RSS 2.0)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:352
 #, php-format
 msgid "Notice feed for %s group (Atom)"
 msgstr "Емисия с бележки на %s (Atom)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:358
 #, php-format
 msgid "FOAF for %s group"
 msgstr "Изходяща кутия за %s"
 
 #. TRANS: Header for mini list of group members on a group page (h2).
-#: actions/showgroup.php:395
 msgid "Members"
 msgstr "Членове"
 
@@ -5630,31 +4632,24 @@ msgstr "Членове"
 #. TRANS: Text for user subscription statistics if the user has no subscriptions.
 #. TRANS: Text for user subscriber statistics if user has no subscribers.
 #. TRANS: Text for user user group membership statistics if user is not a member of any group.
-#: actions/showgroup.php:401 lib/profileaction.php:137
-#: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
-#: lib/subscriptionlist.php:123 lib/tagcloudsection.php:71
 msgid "(None)"
 msgstr "(Без)"
 
 #. TRANS: Link to all group members from mini list of group members if group has more than n members.
-#: actions/showgroup.php:410
 msgid "All members"
 msgstr "Всички членове"
 
 #. TRANS: Header for group statistics on a group page (h2).
 #. TRANS: H2 text for user statistics.
-#: actions/showgroup.php:441 lib/profileaction.php:205
 msgid "Statistics"
 msgstr "Статистики"
 
-#: actions/showgroup.php:444
 #, fuzzy
 msgctxt "LABEL"
 msgid "Created"
 msgstr "Създадена на"
 
 #. TRANS: Label for member count in statistics on group page.
-#: actions/showgroup.php:449
 #, fuzzy
 msgctxt "LABEL"
 msgid "Members"
@@ -5664,7 +4659,6 @@ msgstr "Членове"
 #. TRANS: **%s** is the group alias, %%%%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).
-#: actions/showgroup.php:464
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5677,7 +4671,6 @@ 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: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
-#: actions/showgroup.php:474
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5687,99 +4680,83 @@ msgid ""
 msgstr ""
 
 #. TRANS: Header for list of group administrators on a group page (h2).
-#: actions/showgroup.php:503
 msgid "Admins"
 msgstr "Администратори"
 
 #. TRANS: Client error displayed requesting a single message that does not exist.
-#: actions/showmessage.php:76
 msgid "No such message."
 msgstr "Няма такова съобщение"
 
 #. TRANS: Client error displayed requesting a single direct message the requesting user was not a party in.
-#: actions/showmessage.php:86
 msgid "Only the sender and recipient may read this message."
 msgstr "Само подателят и получателят могат да четат това съобщение."
 
 #. TRANS: Page title for single direct message display when viewing user is the sender.
 #. TRANS: %1$s is the addressed user's nickname, $2$s is a timestamp.
-#: actions/showmessage.php:105
 #, php-format
 msgid "Message to %1$s on %2$s"
 msgstr "Съобщение до %1$s в %2$s"
 
 #. TRANS: Page title for single message display.
 #. TRANS: %1$s is the sending user's nickname, $2$s is a timestamp.
-#: actions/showmessage.php:113
 #, php-format
 msgid "Message from %1$s on %2$s"
 msgstr "Съобщение от %1$s в %2$s"
 
-#: actions/shownotice.php:90
 msgid "Notice deleted."
 msgstr "Бележката е изтрита."
 
 #. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
-#: actions/showstream.php:70
 #, fuzzy, php-format
 msgid "%1$s tagged %2$s"
 msgstr "%1$s, страница %2$d"
 
 #. TRANS: Page title showing tagged notices in one user's stream.
 #. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
-#: actions/showstream.php:74
 #, fuzzy, php-format
 msgid "%1$s tagged %2$s, page %3$d"
 msgstr "Бележки с етикет %s"
 
 #. TRANS: Extended page title showing tagged notices in one user's stream.
 #. TRANS: %1$s is the username, %2$d is the page number.
-#: actions/showstream.php:82
 #, php-format
 msgid "%1$s, page %2$d"
 msgstr "%1$s, страница %2$d"
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %1$s is a user nickname, %2$s is a hashtag.
-#: actions/showstream.php:127
 #, php-format
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
 msgstr "Емисия с бележки на %s (RSS 1.0)"
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.
-#: actions/showstream.php:136
 #, php-format
 msgid "Notice feed for %s (RSS 1.0)"
 msgstr "Емисия с бележки на %s (RSS 1.0)"
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.
-#: actions/showstream.php:145
 #, php-format
 msgid "Notice feed for %s (RSS 2.0)"
 msgstr "Емисия с бележки на %s (RSS 2.0)"
 
-#: actions/showstream.php:152
 #, php-format
 msgid "Notice feed for %s (Atom)"
 msgstr "Емисия с бележки на %s (Atom)"
 
 #. TRANS: Title for link to notice feed. FOAF stands for Friend of a Friend.
 #. TRANS: More information at http://www.foaf-project.org. %s is a user nickname.
-#: actions/showstream.php:159
 #, php-format
 msgid "FOAF for %s"
 msgstr "FOAF за %s"
 
 #. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
-#: actions/showstream.php:205
 #, php-format
 msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr ""
 
 #. TRANS: Second sentence of empty list message for a stream for the user themselves.
-#: actions/showstream.php:211
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
@@ -5787,7 +4764,6 @@ msgstr ""
 
 #. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:215
 #, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
@@ -5796,7 +4772,6 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:258
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5807,7 +4782,6 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:265
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5816,224 +4790,177 @@ msgid ""
 msgstr ""
 
 #. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
-#: actions/showstream.php:322
 #, php-format
 msgid "Repeat of %s"
 msgstr "Повторения на %s"
 
-#: actions/silence.php:65 actions/unsilence.php:65
 msgid "You cannot silence users on this site."
 msgstr "Не можете да заглушавате потребители на този сайт."
 
-#: actions/silence.php:72
 msgid "User is already silenced."
 msgstr "Потребителят вече е заглушен."
 
-#: actions/siteadminpanel.php:69
 msgid "Basic settings for this StatusNet site"
 msgstr "Пътища и сървърни настройки за тази инсталация на StatusNet."
 
-#: actions/siteadminpanel.php:133
 msgid "Site name must have non-zero length."
 msgstr "Името на сайта е задължително."
 
-#: actions/siteadminpanel.php:141
 msgid "You must have a valid contact email address."
 msgstr "Неправилен адрес на е-поща."
 
-#: actions/siteadminpanel.php:159
 #, php-format
 msgid "Unknown language \"%s\"."
 msgstr "Непознат език \"%s\"."
 
-#: actions/siteadminpanel.php:165
 #, fuzzy
 msgid "Minimum text limit is 0 (unlimited)."
 msgstr "Минималното ограничение на текста е 140 знака."
 
-#: actions/siteadminpanel.php:171
 msgid "Dupe limit must be one or more seconds."
 msgstr ""
 
-#: actions/siteadminpanel.php:221
 msgid "General"
 msgstr "Общи"
 
-#: actions/siteadminpanel.php:224
 msgid "Site name"
 msgstr "Име на сайта"
 
-#: actions/siteadminpanel.php:225
 msgid "The name of your site, like \"Yourcompany Microblog\""
 msgstr ""
 
-#: actions/siteadminpanel.php:229
 msgid "Brought by"
 msgstr ""
 
-#: actions/siteadminpanel.php:230
 msgid "Text used for credits link in footer of each page"
 msgstr ""
 
-#: actions/siteadminpanel.php:234
 msgid "Brought by URL"
 msgstr ""
 
-#: actions/siteadminpanel.php:235
 msgid "URL used for credits link in footer of each page"
 msgstr ""
 
-#: actions/siteadminpanel.php:239
 msgid "Contact email address for your site"
 msgstr "Адрес на е-поща за контакт със сайта"
 
-#: actions/siteadminpanel.php:245
 #, fuzzy
 msgid "Local"
 msgstr "Местоположение"
 
-#: actions/siteadminpanel.php:256
 msgid "Default timezone"
 msgstr "Часови пояс по подразбиране"
 
-#: actions/siteadminpanel.php:257
 msgid "Default timezone for the site; usually UTC."
 msgstr "Часови пояс по подразбиране за сайта (обикновено UTC)."
 
-#: actions/siteadminpanel.php:262
 msgid "Default language"
 msgstr "Език по подразбиране"
 
-#: actions/siteadminpanel.php:263
 msgid "Site language when autodetection from browser settings is not available"
 msgstr ""
 
-#: actions/siteadminpanel.php:271
 msgid "Limits"
 msgstr "Ограничения"
 
-#: actions/siteadminpanel.php:274
 msgid "Text limit"
 msgstr ""
 
-#: actions/siteadminpanel.php:274
 msgid "Maximum number of characters for notices."
 msgstr ""
 
-#: actions/siteadminpanel.php:278
 msgid "Dupe limit"
 msgstr ""
 
-#: actions/siteadminpanel.php:278
 msgid "How long users must wait (in seconds) to post the same thing again."
 msgstr ""
 
 #. TRANS: Page title for site-wide notice tab in admin panel.
-#: actions/sitenoticeadminpanel.php:55
 msgid "Site Notice"
 msgstr "Бележки"
 
 #. TRANS: Instructions for site-wide notice tab in admin panel.
-#: actions/sitenoticeadminpanel.php:66
 #, fuzzy
 msgid "Edit site-wide message"
 msgstr "Ново съобщение"
 
 #. TRANS: Server error displayed when saving a site-wide notice was impossible.
-#: actions/sitenoticeadminpanel.php:101
 #, fuzzy
 msgid "Unable to save site notice."
 msgstr "Грешка при записване настройките за Twitter"
 
 #. TRANS: Client error displayed when a site-wide notice was longer than allowed.
-#: actions/sitenoticeadminpanel.php:112
 msgid "Maximum length for the site-wide notice is 255 characters."
 msgstr ""
 
 #. TRANS: Label for site-wide notice text field in admin panel.
-#: actions/sitenoticeadminpanel.php:176
 msgid "Site notice text"
 msgstr "Изтриване на бележката"
 
 #. TRANS: Tooltip for site-wide notice text field in admin panel.
-#: actions/sitenoticeadminpanel.php:179
 msgid "Site-wide notice text (255 characters maximum; HTML allowed)"
 msgstr ""
 
 #. TRANS: Title for button to save site notice in admin panel.
-#: actions/sitenoticeadminpanel.php:201
 #, fuzzy
 msgid "Save site notice."
 msgstr "Запазване настройките на сайта"
 
 #. TRANS: Title for SMS settings.
-#: actions/smssettings.php:56
 msgid "SMS settings"
 msgstr "Настройки за SMS"
 
 #. TRANS: SMS settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/smssettings.php:70
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr "Може да получавате на е-пощата си SMS-съобщения от %%site.name%%."
 
 #. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
-#: actions/smssettings.php:92
 #, fuzzy
 msgid "SMS is not available."
 msgstr "Страницата не е достъпна във вида медия, който приемате"
 
 #. TRANS: Form legend for SMS settings form.
-#: actions/smssettings.php:106
 msgid "SMS address"
 msgstr "Адрес на е-поща"
 
 #. TRANS: Form guide in SMS settings form.
-#: actions/smssettings.php:115
 msgid "Current confirmed SMS-enabled phone number."
 msgstr "Текущ потвърден телефонен номер за SMS-и."
 
 #. TRANS: Form guide in IM settings form.
-#: actions/smssettings.php:128
 msgid "Awaiting confirmation on this phone number."
 msgstr "Очаква се потвърждение за този телефонен номер."
 
 #. TRANS: Field label for SMS address input in SMS settings form.
-#: actions/smssettings.php:137
 msgid "Confirmation code"
 msgstr "Код за потвърждение"
 
 #. TRANS: Form field instructions in SMS settings form.
-#: actions/smssettings.php:139
 msgid "Enter the code you received on your phone."
 msgstr "Въведете кода, който получихте по телефона."
 
 #. TRANS: Button label to confirm SMS confirmation code in SMS settings.
-#: actions/smssettings.php:143
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Confirm"
 msgstr "Потвърждаване"
 
 #. TRANS: Field label for SMS phone number input in SMS settings form.
-#: actions/smssettings.php:148
 msgid "SMS phone number"
 msgstr "Телефонен номер за SMS"
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
-#: actions/smssettings.php:151
 #, fuzzy
 msgid "Phone number, no punctuation or spaces, with area code."
 msgstr "Телефонен номер — с код, без пунктоация и без интервали."
 
 #. TRANS: Form legend for SMS preferences form.
-#: actions/smssettings.php:190
 msgid "SMS preferences"
 msgstr "Настройки на е-поща"
 
 #. TRANS: Checkbox label in SMS preferences form.
-#: actions/smssettings.php:196
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
@@ -6042,33 +4969,27 @@ msgstr ""
 "такси от оператора."
 
 #. TRANS: Confirmation message for successful SMS preferences save.
-#: actions/smssettings.php:307
 #, fuzzy
 msgid "SMS preferences saved."
 msgstr "Настройките са запазени."
 
 #. TRANS: Message given saving SMS phone number without having provided one.
-#: actions/smssettings.php:329
 msgid "No phone number."
 msgstr "Не е въведен телефонен номер."
 
 #. TRANS: Message given saving SMS phone number without having selected a carrier.
-#: actions/smssettings.php:335
 msgid "No carrier selected."
 msgstr "Не е избран оператор."
 
 #. TRANS: Message given saving SMS phone number that is already set.
-#: actions/smssettings.php:343
 msgid "That is already your phone number."
 msgstr "Това и сега е номерът на телефона ви."
 
 #. TRANS: Message given saving SMS phone number that is already set for another user.
-#: actions/smssettings.php:347
 msgid "That phone number already belongs to another user."
 msgstr "Този телефонен номер вече се използва от друг потребител."
 
 #. TRANS: Message given saving valid SMS phone number that is to be confirmed.
-#: actions/smssettings.php:375
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
 "for the code and instructions on how to use it."
@@ -6078,40 +4999,33 @@ msgstr ""
 "му."
 
 #. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
-#: actions/smssettings.php:403
 msgid "That is the wrong confirmation number."
 msgstr "Този код за потвърждение е грешен."
 
 #. TRANS: Message given after successfully canceling SMS phone number confirmation.
-#: actions/smssettings.php:417
 msgid "SMS confirmation cancelled."
 msgstr "Потвърждение за SMS"
 
 #. TRANS: Message given trying to remove an SMS phone number that is not
 #. TRANS: registered for the active user.
-#: actions/smssettings.php:437
 msgid "That is not your phone number."
 msgstr "Това не е вашият телефонен номер."
 
 #. TRANS: Message given after successfully removing a registered SMS phone number.
-#: actions/smssettings.php:459
 #, fuzzy
 msgid "The SMS phone number was removed."
 msgstr "Телефонен номер за SMS"
 
 #. TRANS: Label for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:498
 msgid "Mobile carrier"
 msgstr "Мобилен оператор"
 
 #. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:503
 msgid "Select a carrier"
 msgstr "Изберете оператор"
 
 #. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
 #. TRANS: %s is an administrative contact's e-mail address.
-#: actions/smssettings.php:512
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -6121,123 +5035,98 @@ msgstr ""
 "не фигурира тук, пишете ни на адрес %s."
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
-#: actions/smssettings.php:534
 #, fuzzy
 msgid "No code entered."
 msgstr "Не е въведен код."
 
 #. TRANS: Menu item for site administration
-#: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
-#: lib/adminpanelaction.php:395
 msgid "Snapshots"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:65
 #, fuzzy
 msgid "Manage snapshot configuration"
 msgstr "Промяна настройките на сайта"
 
-#: actions/snapshotadminpanel.php:127
 msgid "Invalid snapshot run value."
 msgstr ""
 
-#: actions/snapshotadminpanel.php:133
 msgid "Snapshot frequency must be a number."
 msgstr ""
 
-#: actions/snapshotadminpanel.php:144
 msgid "Invalid snapshot report URL."
 msgstr ""
 
-#: actions/snapshotadminpanel.php:200
 msgid "Randomly during web hit"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:201
 msgid "In a scheduled job"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:206
 msgid "Data snapshots"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:208
 msgid "When to send statistical data to status.net servers"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:217
 msgid "Frequency"
 msgstr "Честота"
 
-#: actions/snapshotadminpanel.php:218
 msgid "Snapshots will be sent once every N web hits"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:226
 msgid "Report URL"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:227
 msgid "Snapshots will be sent to this URL"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:248
 #, fuzzy
 msgid "Save snapshot settings"
 msgstr "Запазване настройките на сайта"
 
 #. TRANS: Client error displayed trying a change a subscription for a non-subscribed profile.
-#: actions/subedit.php:75
 msgid "You are not subscribed to that profile."
 msgstr "Не сте абонирани за този профил"
 
 #. TRANS: Server error displayed when updating a subscription fails with a database error.
 #. TRANS: Exception thrown when a subscription could not be stored on the server.
-#: actions/subedit.php:89 classes/Subscription.php:141
 msgid "Could not save subscription."
 msgstr "Грешка при добавяне на нов абонамент."
 
 #. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
-#: actions/subscribe.php:121
 #, fuzzy
 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
 msgstr "Не сте абонирани за този профил"
 
 #. TRANS: Page title when subscription succeeded.
-#: actions/subscribe.php:149
 #, fuzzy
 msgid "Subscribed"
 msgstr "Абониране"
 
 #. TRANS: Header for list of subscribers for a user (first page).
 #. TRANS: %s is the user's nickname.
-#: actions/subscribers.php:51
 #, php-format
 msgid "%s subscribers"
 msgstr "%s абоната"
 
 #. TRANS: Header for list of subscribers for a user (not first page).
 #. TRANS: %1$s is the user's nickname, $2$d is the page number.
-#: actions/subscribers.php:55
 #, php-format
 msgid "%1$s subscribers, page %2$d"
 msgstr "Абонати на %1$s, страница %2$d"
 
 #. TRANS: Page notice for page with an overview of all subscribers
 #. TRANS: of the logged in user's own profile.
-#: actions/subscribers.php:68
 msgid "These are the people who listen to your notices."
 msgstr "Tова са хората, които четат бележките ви."
 
 #. TRANS: Page notice for page with an overview of all subscribers of a user other
 #. TRANS: than the logged in user. %s is the user nickname.
-#: actions/subscribers.php:74
 #, php-format
 msgid "These are the people who listen to %s's notices."
 msgstr "Това са хората, които четат бележките на %s."
 
 #. TRANS: Subscriber list text when the logged in user has no subscribers.
-#: actions/subscribers.php:114
 msgid ""
 "You have no subscribers. Try subscribing to people you know and they might "
 "return the favor."
@@ -6245,7 +5134,6 @@ msgstr ""
 
 #. TRANS: Subscriber list text when looking at the subscribers for a of a user other
 #. TRANS: than the logged in user that has no subscribers. %s is the user nickname.
-#: actions/subscribers.php:118
 #, php-format
 msgid "%s has no subscribers. Want to be the first?"
 msgstr ""
@@ -6255,7 +5143,6 @@ msgstr ""
 #. TRANS: This message contains a Markdown URL. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.
-#: actions/subscribers.php:127
 #, php-format
 msgid ""
 "%s has no subscribers. Why not [register an account](%%%%action.register%%%"
@@ -6264,20 +5151,17 @@ msgstr ""
 
 #. TRANS: Header for subscriptions overview for a user (not first page).
 #. TRANS: %1$s is a user nickname, %2$d is the page number.
-#: actions/subscriptions.php:55
 #, php-format
 msgid "%1$s subscriptions, page %2$d"
 msgstr "Абонаменти на %1$s, страница %2$d"
 
 #. TRANS: Page notice for page with an overview of all subscriptions
 #. TRANS: of the logged in user's own profile.
-#: actions/subscriptions.php:68
 msgid "These are the people whose notices you listen to."
 msgstr "Няма хора, чийто бележки четете."
 
 #. TRANS: Page notice for page with an overview of all subscriptions of a user other
 #. TRANS: than the logged in user. %s is the user nickname.
-#: actions/subscriptions.php:74
 #, php-format
 msgid "These are the people whose notices %s listens to."
 msgstr "Хора, чийто бележки %s чете."
@@ -6286,7 +5170,6 @@ 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.
-#: actions/subscriptions.php:133
 #, php-format
 msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "
@@ -6300,262 +5183,209 @@ msgstr ""
 #. TRANS: than the logged in user that has no subscriptions. %s is the user nickname.
 #. TRANS: Subscription list text when looking at the subscriptions for a of a user that has none
 #. TRANS: as an anonymous user. %s is the user nickname.
-#: actions/subscriptions.php:141 actions/subscriptions.php:147
 #, php-format
 msgid "%s is not listening to anyone."
 msgstr "%s не получава ничии бележки."
 
 #. TRANS: Atom feed title. %s is a profile nickname.
-#: actions/subscriptions.php:176
 #, fuzzy, php-format
 msgid "Subscription feed for %s (Atom)"
 msgstr "Емисия с бележки на %s (Atom)"
 
 #. TRANS: Checkbox label for enabling Jabber messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:241 lib/settingsnav.php:110
-#, fuzzy
 msgid "IM"
 msgstr "IM"
 
 #. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:256 lib/settingsnav.php:117
 msgid "SMS"
 msgstr "SMS"
 
 #. TRANS: Title for all but the first page of notices with tags.
 #. TRANS: %1$s is the tag, %2$d is the page number.
-#: actions/tag.php:73
 #, php-format
 msgid "Notices tagged with %1$s, page %2$d"
 msgstr "Бележки с етикет %s"
 
-#: actions/tag.php:91
 #, php-format
 msgid "Notice feed for tag %s (RSS 1.0)"
 msgstr "Емисия с бележки на %s (RSS 1.0)"
 
-#: actions/tag.php:97
 #, php-format
 msgid "Notice feed for tag %s (RSS 2.0)"
 msgstr "Емисия с бележки на %s (RSS 2.0)"
 
-#: actions/tag.php:103
 #, php-format
 msgid "Notice feed for tag %s (Atom)"
 msgstr "Емисия с бележки на %s (Atom)"
 
-#: actions/tagother.php:39
 msgid "No ID argument."
 msgstr "Липсват аргументи return-to."
 
-#: actions/tagother.php:65
 #, fuzzy, php-format
 msgid "Tag %s"
 msgstr "Етикети"
 
 #. TRANS: H2 for user profile information.
-#: actions/tagother.php:77 lib/userprofile.php:76
 msgid "User profile"
 msgstr "Потребителски профил"
 
-#: actions/tagother.php:120
 #, fuzzy
 msgid "Tag user"
 msgstr "Етикети"
 
-#: actions/tagother.php:130
 msgid ""
 "Tags for this user (letters, numbers, -, ., and _), comma- or space- "
 "separated"
 msgstr ""
 
-#: actions/tagother.php:157
 #, php-format
 msgid "Invalid tag: \"%s\""
 msgstr "Неправилен етикет: \"%s\""
 
-#: actions/tagother.php:172
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 
-#: actions/tagother.php:215
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
 
-#: actions/tagrss.php:35
 msgid "No such tag."
 msgstr "Няма такъв етикет."
 
 #. TRANS: Client error displayed when trying to unblock a non-blocked user.
-#: actions/unblock.php:59
 msgid "You haven't blocked that user."
 msgstr "Не сте блокирали този потребител."
 
-#: actions/unsandbox.php:72
 msgid "User is not sandboxed."
 msgstr "Потребителят не е заглушен."
 
-#: actions/unsilence.php:72
 msgid "User is not silenced."
 msgstr "Потребителят не е заглушен."
 
-#: actions/unsubscribe.php:77
 msgid "No profile ID in request."
 msgstr "Не е открит профил с такъв идентификатор."
 
-#: actions/unsubscribe.php:98
 #, fuzzy
 msgid "Unsubscribed"
 msgstr "Отписване"
 
-#: actions/updateprofile.php:64
 #, php-format
 msgid ""
 "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
 msgstr ""
 
-#: actions/urlsettings.php:60
 #, fuzzy
 msgid "URL settings"
 msgstr "Настройки за SMS"
 
 #. TRANS: Instructions for tab "Other" in user profile settings.
-#: actions/urlsettings.php:72
 msgid "Manage various other options."
 msgstr "Управление на различни други настройки."
 
 #. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
 #. TRANS: user's profile settings. This message has one space at the beginning. Use your
 #. TRANS: language's word separator here if it has one (most likely a single space).
-#: actions/urlsettings.php:115
 msgid " (free service)"
 msgstr " (свободна услуга)"
 
-#: actions/urlsettings.php:121
 #, fuzzy
 msgid "[none]"
 msgstr "Без"
 
-#: actions/urlsettings.php:122
 msgid "[internal]"
 msgstr ""
 
 #. TRANS: Label for dropdown with URL shortener services.
-#: actions/urlsettings.php:130
 msgid "Shorten URLs with"
 msgstr "Съкращаване на адресите с"
 
 #. TRANS: Tooltip for for dropdown with URL shortener services.
-#: actions/urlsettings.php:132
 msgid "Automatic shortening service to use."
 msgstr "Услуга за автоматично съкращаване, която да се ползва."
 
-#: actions/urlsettings.php:138
 msgid "URL longer than"
 msgstr ""
 
-#: actions/urlsettings.php:141
 msgid "URLs longer than this will be shortened, 0 means always shorten."
 msgstr ""
 
-#: actions/urlsettings.php:145
 msgid "Text longer than"
 msgstr ""
 
-#: actions/urlsettings.php:148
 msgid ""
 "URLs in notices longer than this will be shortened, 0 means always shorten."
 msgstr ""
 
 #. TRANS: Form validation error for form "Other settings" in user profile.
-#: actions/urlsettings.php:180
 #, fuzzy
 msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr "Услугата за съкращаване е твърде дълга (може да е до 50 знака)."
 
-#: actions/urlsettings.php:187
 msgid "Invalid number for max url length."
 msgstr ""
 
-#: actions/urlsettings.php:193
 #, fuzzy
 msgid "Invalid number for max notice length."
 msgstr "Неправилен размер."
 
-#: actions/urlsettings.php:238
 msgid "Error saving user URL shortening preferences."
 msgstr ""
 
 #. TRANS: User admin panel title
-#: actions/useradminpanel.php:58
 msgctxt "TITLE"
 msgid "User"
 msgstr "Потребител"
 
 #. TRANS: Instruction for user admin panel.
-#: actions/useradminpanel.php:69
 msgid "User settings for this StatusNet site"
 msgstr ""
 
 #. TRANS: Form validation error in user admin panel when a non-numeric character limit was set.
-#: actions/useradminpanel.php:147
 msgid "Invalid bio limit. Must be numeric."
 msgstr ""
 
 #. TRANS: Form validation error in user admin panel when welcome text is too long.
-#: actions/useradminpanel.php:154
 msgid "Invalid welcome text. Maximum length is 255 characters."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to set a non-existing user as default subscription for new
 #. TRANS: users in user admin panel. %1$s is the invalid nickname.
-#: actions/useradminpanel.php:166
 #, php-format
 msgid "Invalid default subscripton: \"%1$s\" is not a user."
 msgstr ""
 
-#: actions/useradminpanel.php:215 lib/action.php:565 lib/settingsnav.php:77
-#: lib/subgroupnav.php:81
 msgid "Profile"
 msgstr "Профил"
 
 #. TRANS: Field label in user admin panel for setting the character limit for the bio field.
-#: actions/useradminpanel.php:220
 #, fuzzy
 msgid "Bio Limit"
 msgstr "Ограничения"
 
 #. TRANS: Tooltip in user admin panel for setting the character limit for the bio field.
-#: actions/useradminpanel.php:222
 msgid "Maximum length of a profile bio in characters."
 msgstr ""
 
 #. TRANS: Form legend in user admin panel.
-#: actions/useradminpanel.php:231
 msgid "New users"
 msgstr "Нови потребители"
 
 #. TRANS: Field label in user admin panel for setting new user welcome text.
-#: actions/useradminpanel.php:236
 #, fuzzy
 msgid "New user welcome"
 msgstr "Нови потребители"
 
 #. TRANS: Tooltip in user admin panel for setting new user welcome text.
-#: actions/useradminpanel.php:238
 #, fuzzy
 msgid "Welcome text for new users (maximum 255 characters)."
 msgstr "Пълното име е твърде дълго (макс. 255 знака)"
 
 #. TRANS: Field label in user admin panel for setting default subscription for new users.
-#: actions/useradminpanel.php:244
 #, fuzzy
 msgid "Default subscription"
 msgstr "Всички абонаменти"
 
 #. TRANS: Tooltip in user admin panel for setting default subscription for new users.
-#: actions/useradminpanel.php:246
 #, fuzzy
 msgid "Automatically subscribe new users to this user."
 msgstr ""
@@ -6563,33 +5393,27 @@ msgstr ""
 "ботове)."
 
 #. TRANS: Form legend in user admin panel.
-#: actions/useradminpanel.php:256
 msgid "Invitations"
 msgstr "Покани"
 
 #. TRANS: Field label for checkbox in user admin panel for allowing users to invite friend using site e-mail.
-#: actions/useradminpanel.php:262
 msgid "Invitations enabled"
 msgstr "Поканите са включени"
 
 #. TRANS: Tooltip for checkbox in user admin panel for allowing users to invite friend using site e-mail.
-#: actions/useradminpanel.php:265
 msgid "Whether to allow users to invite new users."
 msgstr ""
 
 #. TRANS: Title for button to save user settings in user admin panel.
-#: actions/useradminpanel.php:302
 #, fuzzy
 msgid "Save user settings."
 msgstr "Запазване настройките на сайта"
 
 #. TRANS: Page title.
-#: actions/userauthorization.php:109
 msgid "Authorize subscription"
 msgstr "Одобряване на абонамента"
 
 #. TRANS: Page notice on "Auhtorize subscription" page.
-#: actions/userauthorization.php:115
 #, fuzzy
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
@@ -6600,42 +5424,35 @@ msgstr ""
 "на този потребител. Ако не искате абонамента, натиснете \"Cancel\" (Отказ)."
 
 #. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:200
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Accept"
 msgstr "Приемане"
 
 #. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:202
 #, fuzzy
 msgid "Subscribe to this user."
 msgstr "Абониране за този потребител"
 
 #. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:204
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Reject"
 msgstr "Охвърляне"
 
 #. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:206
 #, fuzzy
 msgid "Reject this subscription."
 msgstr "Абонаменти на %s"
 
 #. TRANS: Client error displayed for an empty authorisation request.
-#: actions/userauthorization.php:219
 msgid "No authorization request!"
 msgstr "Няма заявка за одобрение."
 
 #. TRANS: Accept message header from Authorise subscription page.
-#: actions/userauthorization.php:242
 msgid "Subscription authorized"
 msgstr "Абонаментът е одобрен"
 
-#: actions/userauthorization.php:245
 #, fuzzy
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
@@ -6646,11 +5463,9 @@ msgstr ""
 "одобряването, проверете инструкциите на сайта. Вашият token за абонамент е:"
 
 #. TRANS: Reject message header from Authorise subscription page.
-#: actions/userauthorization.php:256
 msgid "Subscription rejected"
 msgstr "Абонаментът е отказан"
 
-#: actions/userauthorization.php:259
 #, fuzzy
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
@@ -6662,35 +5477,30 @@ msgstr ""
 
 #. TRANS: Exception thrown when no valid user is found for an authorisation request.
 #. TRANS: %s is a listener URI.
-#: actions/userauthorization.php:296
 #, php-format
 msgid "Listener URI \"%s\" not found here."
 msgstr ""
 
 #. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
 #. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:303
 #, fuzzy, php-format
 msgid "Listenee URI \"%s\" is too long."
 msgstr "Изходният адрес е твърде дълъг."
 
 #. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
 #. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:311
 #, php-format
 msgid "Listenee URI \"%s\" is a local user."
 msgstr ""
 
 #. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
 #. TRANS: %s is a profile URL.
-#: actions/userauthorization.php:329
 #, php-format
 msgid "Profile URL \"%s\" is for a local user."
 msgstr ""
 
 #. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
 #. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
-#: actions/userauthorization.php:339
 #, php-format
 msgid ""
 "Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
@@ -6699,76 +5509,62 @@ msgstr ""
 
 #. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
 #. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:349
 #, fuzzy, php-format
 msgid "Avatar URL \"%s\" is not valid."
 msgstr "Адресът на личната страница не е правилен URL."
 
 #. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
 #. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:356
 #, fuzzy, php-format
 msgid "Cannot read avatar URL \"%s\"."
 msgstr "Грешка при четене адреса на аватара '%s'"
 
 #. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
 #. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:363
 #, fuzzy, php-format
 msgid "Wrong image type for avatar URL \"%s\"."
 msgstr "Грешен вид изображение за '%s'"
 
 #. TRANS: Page title for profile design page.
-#: actions/userdesignsettings.php:74 lib/designsettings.php:61
 #, fuzzy
 msgid "Profile design"
 msgstr "Настройки на профила"
 
 #. TRANS: Instructions for profile design page.
-#: actions/userdesignsettings.php:84 lib/designsettings.php:72
 msgid ""
 "Customize the way your profile looks with a background image and a colour "
 "palette of your choice."
 msgstr ""
 
-#: actions/userdesignsettings.php:289
 msgid "Enjoy your hotdog!"
 msgstr ""
 
-#: actions/userdesignsettings.php:325
 #, fuzzy
 msgid "Design settings"
 msgstr "Запазване настройките на сайта"
 
-#: actions/userdesignsettings.php:340
 msgid "View profile designs"
 msgstr "Редактиране на профила"
 
-#: actions/userdesignsettings.php:341
 msgid "Show or hide profile designs."
 msgstr ""
 
-#: actions/userdesignsettings.php:348
 #, fuzzy
 msgid "Background file"
 msgstr "Фон"
 
 #. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number.
-#: actions/usergroups.php:66
 #, php-format
 msgid "%1$s groups, page %2$d"
 msgstr "%1$s, страница %2$d"
 
-#: actions/usergroups.php:132
 msgid "Search for more groups"
 msgstr "Търсене на още групи"
 
-#: actions/usergroups.php:159
 #, php-format
 msgid "%s is not a member of any group."
 msgstr "%s не членува в никоя група."
 
-#: actions/usergroups.php:164
 #, php-format
 msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
 msgstr ""
@@ -6778,34 +5574,27 @@ msgstr ""
 #. TRANS: %1$s is a group name, %2$s is a site name.
 #. TRANS: Message is used as a subtitle in atom user notice feed.
 #. TRANS: %1$s is a user name, %2$s is a site name.
-#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:70
-#: lib/atomusernoticefeed.php:95
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr "Бележки от %1$s в %2$s."
 
-#: actions/version.php:75
 #, php-format
 msgid "StatusNet %s"
 msgstr "StatusNet %s"
 
-#: actions/version.php:155
 #, php-format
 msgid ""
 "This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
 "Inc. and contributors."
 msgstr ""
 
-#: actions/version.php:163
 msgid "Contributors"
 msgstr ""
 
 #. TRANS: Menu item for site administration
-#: actions/version.php:167 lib/adminpanelaction.php:403
 msgid "License"
 msgstr "Лиценз"
 
-#: actions/version.php:170
 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 "
@@ -6813,7 +5602,6 @@ msgid ""
 "any later version. "
 msgstr ""
 
-#: actions/version.php:176
 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 "
@@ -6821,7 +5609,6 @@ msgid ""
 "for more details. "
 msgstr ""
 
-#: actions/version.php:182
 #, php-format
 msgid ""
 "You should have received a copy of the GNU Affero General Public License "
@@ -6829,52 +5616,42 @@ msgid ""
 msgstr ""
 
 #. TRANS: Form input field label for application name.
-#: actions/version.php:197 lib/applicationeditform.php:190
 msgid "Name"
 msgstr "Име"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:885
 msgid "Version"
 msgstr "Версия"
 
-#: actions/version.php:199
 msgid "Author(s)"
 msgstr "Автор(и)"
 
 #. TRANS: Form input field label.
-#: actions/version.php:200 lib/applicationeditform.php:208
-#: lib/groupeditform.php:168
 msgid "Description"
 msgstr "Описание"
 
 #. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:164
 msgid "Favor"
 msgstr "Любимо"
 
 #. TRANS: Ntofication given when a user marks a notice as favorite.
 #. TRANS: %1$s is a user nickname or full name, %2$s is a notice URI.
-#: classes/Fave.php:167
 #, fuzzy, php-format
 msgid "%1$s marked notice %2$s as a favorite."
 msgstr "%s (@%s) отбеляза бележката ви като любима"
 
 #. TRANS: Server exception thrown when a URL cannot be processed.
-#: classes/File.php:162
 #, php-format
 msgid "Cannot process URL '%s'"
 msgstr ""
 
 #. TRANS: Server exception thrown when... Robin thinks something is impossible!
-#: classes/File.php:194
 msgid "Robin thinks something is impossible."
 msgstr ""
 
 #. 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$s is used for plural.
-#: classes/File.php:210
 #, php-format
 msgid ""
 "No file may be larger than %1$d byte and the file you sent was %2$d bytes. "
@@ -6887,7 +5664,6 @@ msgstr[1] ""
 
 #. TRANS: Message given if an upload would exceed user quota.
 #. TRANS: %d (number) is the user quota in bytes and is used for plural.
-#: classes/File.php:223
 #, php-format
 msgid "A file this large would exceed your user quota of %d byte."
 msgid_plural "A file this large would exceed your user quota of %d bytes."
@@ -6896,7 +5672,6 @@ msgstr[1] ""
 
 #. TRANS: Message given id an upload would exceed a user's monthly quota.
 #. TRANS: $d (number) is the monthly user quota in bytes and is used for plural.
-#: classes/File.php:235
 #, php-format
 msgid "A file this large would exceed your monthly quota of %d byte."
 msgid_plural "A file this large would exceed your monthly quota of %d bytes."
@@ -6904,115 +5679,96 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Client exception thrown if a file upload does not have a valid name.
-#: classes/File.php:282 classes/File.php:297
 #, fuzzy
 msgid "Invalid filename."
 msgstr "Неправилен размер."
 
 #. TRANS: Exception thrown when joining a group fails.
-#: classes/Group_member.php:51
 #, fuzzy
 msgid "Group join failed."
 msgstr "Профил на групата"
 
 #. TRANS: Exception thrown when trying to leave a group the user is not a member of.
-#: classes/Group_member.php:64
 #, fuzzy
 msgid "Not part of group."
 msgstr "Грешка при обновяване на групата."
 
 #. TRANS: Exception thrown when trying to leave a group fails.
-#: classes/Group_member.php:72
 #, fuzzy
 msgid "Group leave failed."
 msgstr "Профил на групата"
 
 #. TRANS: Exception thrown providing an invalid profile ID.
 #. TRANS: %s is the invalid profile ID.
-#: classes/Group_member.php:85
 #, php-format
 msgid "Profile ID %s is invalid."
 msgstr ""
 
 #. TRANS: Exception thrown providing an invalid group ID.
 #. TRANS: %s is the invalid group ID.
-#: classes/Group_member.php:98
 #, fuzzy, php-format
 msgid "Group ID %s is invalid."
 msgstr "Грешка при запазване на потребител — невалидност."
 
 #. TRANS: Activity title.
-#: classes/Group_member.php:147 lib/joinform.php:114
 msgid "Join"
 msgstr "Присъединяване"
 
 #. TRANS: Success message for subscribe to group attempt through OStatus.
 #. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
-#: classes/Group_member.php:151
 #, php-format
 msgid "%1$s has joined group %2$s."
 msgstr ""
 
 #. TRANS: Server exception thrown when updating a local group fails.
-#: classes/Local_group.php:42
 #, fuzzy
 msgid "Could not update local group."
 msgstr "Грешка при обновяване на групата."
 
 #. TRANS: Exception thrown when trying creating a login token failed.
 #. TRANS: %s is the user nickname for which token creation failed.
-#: classes/Login_token.php:78
 #, fuzzy, php-format
 msgid "Could not create login token for %s"
 msgstr "Грешка при отбелязване като любима."
 
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
-#: classes/Memcached_DataObject.php:556
 msgid "No database name or DSN found anywhere."
 msgstr ""
 
 #. TRANS: Client exception thrown when a user tries to send a direct message while being banned from sending them.
-#: classes/Message.php:45
 #, fuzzy
 msgid "You are banned from sending direct messages."
 msgstr "Грешка при изпращане на прякото съобщение"
 
 #. TRANS: Message given when a message could not be stored on the server.
-#: classes/Message.php:69
 msgid "Could not insert message."
 msgstr "Грешка при вмъкване на съобщението."
 
 #. TRANS: Message given when a message could not be updated on the server.
-#: classes/Message.php:80
 msgid "Could not update message with new URI."
 msgstr "Грешка при обновяване на бележката с нов URL-адрес."
 
 #. TRANS: Server exception thrown when a user profile for a notice cannot be found.
 #. TRANS: %1$d is a profile ID (number), %2$d is a notice ID (number).
-#: classes/Notice.php:98
 #, php-format
 msgid "No such profile (%1$d) for notice (%2$d)."
 msgstr ""
 
 #. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:199
 #, php-format
 msgid "Database error inserting hashtag: %s"
 msgstr "Грешка при вмъкване на аватар"
 
 #. TRANS: Client exception thrown if a notice contains too many characters.
-#: classes/Notice.php:279
 #, fuzzy
 msgid "Problem saving notice. Too long."
 msgstr "Проблем при записване на бележката."
 
 #. TRANS: Client exception thrown when trying to save a notice for an unknown user.
-#: classes/Notice.php:284
 msgid "Problem saving notice. Unknown user."
 msgstr "Грешка при записване на бележката. Непознат потребител."
 
 #. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
-#: classes/Notice.php:290
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
@@ -7020,7 +5776,6 @@ msgstr ""
 "отново след няколко минути."
 
 #. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
-#: classes/Notice.php:297
 #, fuzzy
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
@@ -7030,43 +5785,36 @@ msgstr ""
 "отново след няколко минути."
 
 #. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:305
 msgid "You are banned from posting notices on this site."
 msgstr "Забранено ви е да публикувате бележки в този сайт."
 
 #. TRANS: Server exception thrown when a notice cannot be saved.
 #. TRANS: Server exception thrown when a notice cannot be updated.
-#: classes/Notice.php:372 classes/Notice.php:399
 msgid "Problem saving notice."
 msgstr "Проблем при записване на бележката."
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:929
 msgid "Bad type provided to saveKnownGroups."
 msgstr ""
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:1028
 #, fuzzy
 msgid "Problem saving group inbox."
 msgstr "Проблем при записване на бележката."
 
 #. TRANS: Server exception thrown when a reply cannot be saved.
 #. TRANS: %1$d is a notice ID, %2$d is the ID of the mentioned user.
-#: classes/Notice.php:1144
 #, fuzzy, php-format
 msgid "Could not save reply for %1$d, %2$d."
 msgstr "Грешка при запазване на етикетите."
 
 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1663
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
 
 #. TRANS: Full name of a profile or group followed by nickname in parens
-#: classes/Profile.php:172 classes/User_group.php:242
 #, fuzzy, php-format
 msgctxt "FANCYNAME"
 msgid "%1$s (%2$s)"
@@ -7074,268 +5822,213 @@ msgstr "%1$s (%2$s)"
 
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:779
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:788
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
 
 #. TRANS: Exception thrown when a right for a non-existing user profile is checked.
-#: classes/Remote_profile.php:54
 #, fuzzy
 msgid "Missing profile."
 msgstr "Потребителят няма профил."
 
 #. TRANS: Exception thrown when a tag cannot be saved.
-#: classes/Status_network.php:338
 msgid "Unable to save tag."
 msgstr "Грешка при запазване на етикетите."
 
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#: classes/Subscription.php:77 lib/oauthstore.php:482
 #, fuzzy
 msgid "You have been banned from subscribing."
 msgstr "Потребителят е забранил да се абонирате за него."
 
 #. TRANS: Exception thrown when trying to subscribe while already subscribed.
-#: classes/Subscription.php:82
 #, fuzzy
 msgid "Already subscribed!"
 msgstr "Не сте абонирани!"
 
 #. TRANS: Exception thrown when trying to subscribe to a user who has blocked the subscribing user.
-#: classes/Subscription.php:87
 msgid "User has blocked you."
 msgstr "Потребителят ви е блокирал."
 
 #. TRANS: Exception thrown when trying to unsibscribe without a subscription.
-#: classes/Subscription.php:176
 #, fuzzy
 msgid "Not subscribed!"
 msgstr "Не сте абонирани!"
 
 #. TRANS: Exception thrown when trying to unsubscribe a user from themselves.
-#: classes/Subscription.php:183
 msgid "Could not delete self-subscription."
 msgstr "Грешка при добавяне на нов абонамент."
 
 #. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
-#: classes/Subscription.php:211
 msgid "Could not delete subscription OMB token."
 msgstr "Грешка при добавяне на нов абонамент."
 
 #. TRANS: Exception thrown when a subscription could not be deleted on the server.
-#: classes/Subscription.php:223
 msgid "Could not delete subscription."
 msgstr "Грешка при добавяне на нов абонамент."
 
 #. TRANS: Activity tile when subscribing to another person.
-#: classes/Subscription.php:265
 msgid "Follow"
 msgstr ""
 
 #. TRANS: Notification given when one person starts following another.
 #. TRANS: %1$s is the subscriber, %2$s is the subscribed.
-#: classes/Subscription.php:268
 #, fuzzy, php-format
 msgid "%1$s is now following %2$s."
 msgstr "%1$s вече получава бележките ви в %2$s."
 
 #. TRANS: Notice given on user registration.
 #. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:390
 #, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr "Добре дошли в %1$s, @%2$s!"
 
 #. TRANS: Server exception.
-#: classes/User.php:923
 msgid "No single user defined for single-user mode."
 msgstr ""
 
 #. TRANS: Server exception.
-#: classes/User.php:927
 msgid "Single-user mode code called when not enabled."
 msgstr ""
 
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:522
 msgid "Could not create group."
 msgstr "Грешка при създаване на групата."
 
 #. TRANS: Server exception thrown when updating a group URI failed.
-#: classes/User_group.php:532
 msgid "Could not set group URI."
 msgstr "Грешка при създаване на групата."
 
 #. TRANS: Server exception thrown when setting group membership failed.
-#: classes/User_group.php:555
 msgid "Could not set group membership."
 msgstr "Грешка при създаване на групата."
 
 #. TRANS: Server exception thrown when saving local group information failed.
-#: classes/User_group.php:570
 msgid "Could not save local group info."
 msgstr "Грешка при запазване на етикетите."
 
 #. TRANS: Exception thrown when an account could not be located when it should be moved.
 #. TRANS: %s is the remote site.
-#: lib/accountmover.php:65
 #, fuzzy, php-format
 msgid "Cannot locate account %s."
 msgstr "Не можете да изтривате потребители."
 
 #. TRANS: Exception thrown when a service document could not be located account move.
 #. TRANS: %s is the remote site.
-#: lib/accountmover.php:106
 #, php-format
 msgid "Cannot find XRD for %s."
 msgstr ""
 
 #. TRANS: Exception thrown when an account could not be located when it should be moved.
 #. TRANS: %s is the remote site.
-#: lib/accountmover.php:131
 #, php-format
 msgid "No AtomPub API service for %s."
 msgstr ""
 
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: lib/action.php:161
 #, php-format
 msgid "%1$s - %2$s"
 msgstr "%1$s - %2$s"
 
 #. TRANS: Page title for a page without a title set.
-#: lib/action.php:177
 msgid "Untitled page"
 msgstr "Неозаглавена страница"
 
 #. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.
-#: lib/action.php:325
 msgctxt "TOOLTIP"
 msgid "Show more"
 msgstr ""
 
 #. TRANS: Inline reply form submit button: submits a reply comment.
-#: lib/action.php:328
 #, fuzzy
 msgctxt "BUTTON"
-msgid "Comment"
-msgstr "Съдържание"
+msgid "Reply"
+msgstr "Отговор"
 
 #. TRANS: Placeholder text for inline reply form. Clicking in this box will turn it into a mini notice form.
-#: lib/action.php:331
-msgid "Add a comment..."
+msgid "Write a reply..."
 msgstr ""
 
-#: lib/action.php:559 lib/personalgroupnav.php:99
-#, fuzzy
 msgid "Home"
 msgstr "Лична страница"
 
-#: lib/action.php:560
 #, fuzzy
 msgid "Friends timeline"
 msgstr "Поток на %s"
 
-#: lib/action.php:566
 #, fuzzy
 msgid "Your profile"
 msgstr "Профил на групата"
 
-#: lib/action.php:570 lib/action.php:593 lib/publicgroupnav.php:78
 msgid "Public"
 msgstr "Общ поток"
 
-#: lib/action.php:571 lib/action.php:594
 #, fuzzy
 msgid "Everyone on this site"
 msgstr "Търсене на хора в сайта"
 
-#: lib/action.php:575
-#, fuzzy
 msgid "Settings"
 msgstr "Настройки за SMS"
 
-#: lib/action.php:576
 #, fuzzy
 msgid "Change your personal settings"
 msgstr "Промяна настройките на профила"
 
-#: lib/action.php:582
 #, fuzzy
 msgid "Site configuration"
 msgstr "Настройка на пътищата"
 
-#: lib/action.php:587
-#, fuzzy
 msgid "Logout"
 msgstr "Изход"
 
-#: lib/action.php:588
-#, fuzzy
 msgid "Logout from the site"
 msgstr "Излизане от сайта"
 
-#: lib/action.php:599
-#, fuzzy
 msgid "Login to the site"
 msgstr "Влизане в сайта"
 
-#: lib/action.php:606
-#, fuzzy
 msgid "Search"
 msgstr "Търсене"
 
-#: lib/action.php:607
 #, fuzzy
 msgid "Search the site"
 msgstr "Търсене в сайта"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:864
 msgid "Help"
 msgstr "Помощ"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:867
 msgid "About"
 msgstr "Относно"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:870
 msgid "FAQ"
 msgstr "Въпроси"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:875
 msgid "TOS"
 msgstr "Условия"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:879
 msgid "Privacy"
 msgstr "Поверителност"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:882
 msgid "Source"
 msgstr "Изходен код"
 
 #. TRANS: Secondary navigation menu option leading to e-mail contact information on the
 #. TRANS: StatusNet site, where to report bugs, ...
-#: lib/action.php:889
 msgid "Contact"
 msgstr "Контакт"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:892
 msgid "Badge"
 msgstr "Табелка"
 
@@ -7343,7 +6036,6 @@ msgstr "Табелка"
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:921
 #, fuzzy, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7353,7 +6045,6 @@ msgstr ""
 "broughtby%%](%%site.broughtbyurl%%). "
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:924
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** е услуга за микроблогване."
@@ -7362,7 +6053,6 @@ msgstr "**%%site.name%%** е услуга за микроблогване."
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:931
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7375,106 +6065,88 @@ msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:949
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:956
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:960
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:992
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1335
 msgid "After"
 msgstr "След"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1345
 msgid "Before"
 msgstr "Преди"
 
 #. TRANS: Client exception thrown when a feed instance is a DOMDocument.
-#: lib/activity.php:125
 msgid "Expecting a root feed element but got a whole XML document."
 msgstr ""
 
 #. TRANS: Client exception thrown when using an unknown verb for the activity importer.
-#: lib/activityimporter.php:81
 #, fuzzy, php-format
 msgid "Unknown verb: \"%s\"."
 msgstr "Непознат език \"%s\"."
 
 #. TRANS: Client exception thrown when trying to force a subscription for an untrusted user.
-#: lib/activityimporter.php:107
 msgid "Cannot force subscription for untrusted user."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to for a remote user to subscribe.
-#: lib/activityimporter.php:117
 #, fuzzy
 msgid "Cannot force remote user to subscribe."
 msgstr "Уточнете името на потребителя, за когото се абонирате."
 
 #. TRANS: Client exception thrown when trying to subscribe to an unknown profile.
-#: lib/activityimporter.php:132
 #, fuzzy
 msgid "Unknown profile."
 msgstr "Неподдържан вид файл"
 
 #. TRANS: Client exception thrown when trying to import an event not related to the importing user.
-#: lib/activityimporter.php:138
 msgid "This activity seems unrelated to our user."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to join a remote group that is not a group.
-#: lib/activityimporter.php:154
 msgid "Remote profile is not a group!"
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to join a group the importing user is already a member of.
-#: lib/activityimporter.php:163
 #, fuzzy
 msgid "User is already a member of this group."
 msgstr "Вече членувате в тази група."
 
 #. TRANS: Client exception thrown when trying to import a notice by another user.
 #. TRANS: %1$s is the source URI of the notice, %2$s is the URI of the author.
-#: lib/activityimporter.php:201
 #, php-format
 msgid "Already know about notice %1$s and  it has a different author %2$s."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to overwrite the author information for a non-trusted user during import.
-#: lib/activityimporter.php:207
 msgid "Not overwriting author info for non-trusted user."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to import a notice without content.
 #. TRANS: %s is the notice URI.
-#: lib/activityimporter.php:223
 #, fuzzy, php-format
 msgid "No content for notice %s."
 msgstr "Търсене в съдържанието на бележките"
 
-#: lib/activitymover.php:84
 #, fuzzy, php-format
 msgid "No such user %s."
 msgstr "Няма такъв потребител"
@@ -7485,225 +6157,185 @@ msgstr "Няма такъв потребител"
 #. TRANS: %1$s is a URL, %2$s is the status, %s$s is the fail reason.
 #. TRANS: Exception thrown when post to collection fails with a status that is not handled.
 #. TRANS: %1$s is a URL, %2$s is the status, %s$s is the fail reason.
-#: lib/activitysink.php:163 lib/activitysink.php:167 lib/activitysink.php:172
 #, fuzzy, php-format
 msgctxt "URLSTATUSREASON"
 msgid "%1$s %2$s %3$s"
 msgstr "%1$s - %2$s"
 
 #. TRANS: Client exception thrown when there is no source attribute.
-#: lib/activityutils.php:200
 msgid "Can't handle remote content yet."
 msgstr ""
 
 #. TRANS: Client exception thrown when there embedded XML content is found that cannot be processed yet.
-#: lib/activityutils.php:237
 msgid "Can't handle embedded XML content yet."
 msgstr ""
 
 #. TRANS: Client exception thrown when base64 encoded content is found that cannot be processed yet.
-#: lib/activityutils.php:242
 msgid "Can't handle embedded Base64 content yet."
 msgstr ""
 
 #. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights.
-#: lib/adminpanelaction.php:96
 msgid "You cannot make changes to this site."
 msgstr "Не можете да променяте този сайт."
 
 #. TRANS: Client error message throw when a certain panel's settings cannot be changed.
-#: lib/adminpanelaction.php:108
 #, fuzzy
 msgid "Changes to that panel are not allowed."
 msgstr "Записването не е позволено."
 
 #. TRANS: Client error message.
-#: lib/adminpanelaction.php:222
 #, fuzzy
 msgid "showForm() not implemented."
 msgstr "Командата все още не се поддържа."
 
 #. TRANS: Client error message
-#: lib/adminpanelaction.php:250
 #, fuzzy
 msgid "saveSettings() not implemented."
 msgstr "Командата все още не се поддържа."
 
 #. TRANS: Client error message thrown if design settings could not be deleted in
 #. TRANS: the admin panel Design.
-#: lib/adminpanelaction.php:274
 #, fuzzy
 msgid "Unable to delete design setting."
 msgstr "Грешка при записване настройките за Twitter"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:337
 msgid "Basic site configuration"
 msgstr "Основна настройка на сайта"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:339
 msgctxt "MENU"
 msgid "Site"
 msgstr "Сайт"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:345
 msgid "Design configuration"
 msgstr "Настройка на оформлението"
 
 #. TRANS: Menu item for site administration
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/adminpanelaction.php:347 lib/groupnav.php:135
 #, fuzzy
 msgctxt "MENU"
 msgid "Design"
 msgstr "Версия"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:353
 #, fuzzy
 msgid "User configuration"
 msgstr "Настройка на пътищата"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:110
 msgid "User"
 msgstr "Потребител"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:361
 #, fuzzy
 msgid "Access configuration"
 msgstr "Настройка на оформлението"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:369
 msgid "Paths configuration"
 msgstr "Настройка на пътищата"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:377
 #, fuzzy
 msgid "Sessions configuration"
 msgstr "Настройка на оформлението"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:385
 msgid "Edit site notice"
 msgstr "Изтриване на бележката"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:387
 #, fuzzy
 msgid "Site notice"
 msgstr "Нова бележка"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:393
 #, fuzzy
 msgid "Snapshots configuration"
 msgstr "Настройка на пътищата"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:401
 msgid "Set site license"
 msgstr ""
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:409
 #, fuzzy
 msgid "Plugins configuration"
 msgstr "Настройка на пътищата"
 
 #. TRANS: Client error 401.
-#: lib/apiauth.php:111
 msgid "API resource requires read-write access, but you only have read access."
 msgstr ""
 
 #. TRANS: OAuth exception thrown when no application is found for a given consumer key.
-#: lib/apiauth.php:177
 msgid "No application for that consumer key."
 msgstr ""
 
-#: lib/apiauth.php:202 lib/apiauth.php:284
 msgid "Not allowed to use API."
 msgstr ""
 
 #. TRANS: OAuth exception given when an incorrect access token was given for a user.
-#: lib/apiauth.php:225
 msgid "Bad access token."
 msgstr ""
 
 #. TRANS: OAuth exception given when no user was found for a given token (no token was found).
-#: lib/apiauth.php:230
 msgid "No user for that token."
 msgstr ""
 
 #. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel".
 #. TRANS: Client error thrown when authentication fails.
-#: lib/apiauth.php:272 lib/apiauth.php:302
 msgid "Could not authenticate you."
 msgstr ""
 
 #. TRANS: Server error displayed when trying to create an anynymous OAuth consumer.
-#: lib/apioauthstore.php:45
 #, fuzzy
 msgid "Could not create anonymous consumer."
 msgstr "Грешка при отбелязване като любима."
 
 #. TRANS: Server error displayed when trying to create an anynymous OAuth application.
-#: lib/apioauthstore.php:69
 #, fuzzy
 msgid "Could not create anonymous OAuth application."
 msgstr "Грешка при отбелязване като любима."
 
 #. TRANS: Exception thrown when no token association could be found.
-#: lib/apioauthstore.php:151
 msgid ""
 "Could not find a profile and application associated with the request token."
 msgstr ""
 
 #. TRANS: Exception thrown when no access token can be issued.
-#: lib/apioauthstore.php:209
 #, fuzzy
 msgid "Could not issue access token."
 msgstr "Грешка при вмъкване на съобщението."
 
-#: lib/apioauthstore.php:317
 #, fuzzy
 msgid "Database error inserting OAuth application user."
 msgstr "Грешка в базата от данни — отговор при вмъкването: %s"
 
-#: lib/apioauthstore.php:345
 #, fuzzy
 msgid "Database error updating OAuth application user."
 msgstr "Грешка в базата от данни — отговор при вмъкването: %s"
 
 #. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
-#: lib/apioauthstore.php:371
 msgid "Tried to revoke unknown token."
 msgstr ""
 
 #. TRANS: Exception thrown when an attempt is made to remove a revoked token.
-#: lib/apioauthstore.php:376
 msgid "Failed to delete revoked token."
 msgstr ""
 
 #. TRANS: Form input field label for application icon.
-#: lib/applicationeditform.php:177
 msgid "Icon"
 msgstr "Икона"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:182
 #, fuzzy
 msgid "Icon for this application"
 msgstr "Да не се изтрива приложението"
 
 #. TRANS: Form input field instructions.
 #. TRANS: %d is the number of available characters for the description.
-#: lib/applicationeditform.php:201
 #, fuzzy, php-format
 msgid "Describe your application in %d character"
 msgid_plural "Describe your application in %d characters"
@@ -7711,216 +6343,177 @@ msgstr[0] "Опишете групата или темата в до %d букв
 msgstr[1] "Опишете групата или темата в до %d букви"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:205
 msgid "Describe your application"
 msgstr "Изтриване на приложението"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:216
 msgid "URL of the homepage of this application"
 msgstr "Не сте собственик на това приложение."
 
 #. TRANS: Form input field label.
-#: lib/applicationeditform.php:218
 #, fuzzy
 msgid "Source URL"
 msgstr "Изходен код"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:225
 #, fuzzy
 msgid "Organization responsible for this application"
 msgstr "Не сте собственик на това приложение."
 
 #. TRANS: Form input field label.
-#: lib/applicationeditform.php:227
 msgid "Organization"
 msgstr "Организация"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:234
 #, fuzzy
 msgid "URL for the homepage of the organization"
 msgstr "Адрес на страница, блог или профил в друг сайт на групата"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:243
 msgid "URL to redirect to after authentication"
 msgstr ""
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:271
 msgid "Browser"
 msgstr ""
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:288
 msgid "Desktop"
 msgstr ""
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:290
 msgid "Type of application, browser or desktop"
 msgstr ""
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:314
 msgid "Read-only"
 msgstr ""
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:334
 msgid "Read-write"
 msgstr ""
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:336
 msgid "Default access for this application: read-only, or read-write"
 msgstr ""
 
 #. TRANS: Submit button title.
-#: lib/applicationeditform.php:353
 msgid "Cancel"
 msgstr "Отказ"
 
-#: lib/applicationlist.php:247
 msgid " by "
 msgstr ""
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:260
 msgid "read-write"
 msgstr ""
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:262
 msgid "read-only"
 msgstr ""
 
 #. TRANS: Used in application list. %1$s is a modified date, %2$s is access type ("read-write" or "read-only")
-#: lib/applicationlist.php:268
 #, php-format
 msgid "Approved %1$s - \"%2$s\" access."
 msgstr ""
 
 #. TRANS: Access token in the application list.
 #. TRANS: %s are the first 7 characters of the access token.
-#: lib/applicationlist.php:282
 #, php-format
 msgid "Access token starting with: %s"
 msgstr ""
 
 #. TRANS: Button label
-#: lib/applicationlist.php:298
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "Премахване"
 
-#: lib/atom10feed.php:113
 msgid "Author element must contain a name element."
 msgstr ""
 
 #. TRANS: Server exception thrown when using the method setActivitySubject() in the class Atom10Feed.
-#: lib/atom10feed.php:160
 #, fuzzy
 msgid "Do not use this method!"
 msgstr "Да не се изтрива бележката"
 
 #. TRANS: Title.
-#: lib/attachmentnoticesection.php:67
 msgid "Notices where this attachment appears"
 msgstr ""
 
 #. TRANS: Title.
-#: lib/attachmenttagcloudsection.php:48
 #, fuzzy
 msgid "Tags for this attachment"
 msgstr "Няма прикачени файлове."
 
 #. TRANS: Exception thrown when a password change fails.
-#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:227
 #, fuzzy
 msgid "Password changing failed."
 msgstr "Паролата е записана."
 
 #. TRANS: Exception thrown when a password change attempt fails because it is not allowed.
-#: lib/authenticationplugin.php:238
 #, fuzzy
 msgid "Password changing is not allowed."
 msgstr "Паролата е записана."
 
 #. TRANS: Title for the form to block a user.
-#: lib/blockform.php:68
 msgid "Block"
 msgstr "Блокиране"
 
 #. TRANS: Description of the form to block a user.
-#: lib/blockform.php:79
 msgid "Block this user"
 msgstr "Блокиране на потребителя"
 
 #. TRANS: Title for command results.
-#: lib/channel.php:104 lib/channel.php:125
 msgid "Command results"
 msgstr "Резултат от командата"
 
 #. TRANS: Title for command results.
-#: lib/channel.php:138
 #, fuzzy
 msgid "AJAX error"
 msgstr "Грешка в Ajax"
 
 #. TRANS: E-mail subject when a command has completed.
-#: lib/channel.php:177 lib/mailhandler.php:143
 msgid "Command complete"
 msgstr "Командата е изпълнена"
 
 #. TRANS: E-mail subject when a command has failed.
-#: lib/channel.php:188
 msgid "Command failed"
 msgstr "Грешка при изпълнение на командата"
 
 #. TRANS: Command exception text shown when a notice ID is requested that does not exist.
-#: lib/command.php:82 lib/command.php:106
 #, fuzzy
 msgid "Notice with that id does not exist."
 msgstr "Не е открита бележка с такъв идентификатор."
 
 #. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
 #. TRANS: Error text shown when a last user notice is requested and it does not exist.
-#: lib/command.php:99 lib/command.php:642
 #, fuzzy
 msgid "User has no last notice."
 msgstr "Потребителят няма последна бележка"
 
 #. TRANS: Message given requesting a profile for a non-existing user.
 #. TRANS: %s is the nickname of the user for which the profile could not be found.
-#: lib/command.php:128
 #, fuzzy, php-format
 msgid "Could not find a user with nickname %s."
 msgstr "Грешка при обновяване на потребител с потвърден email адрес."
 
 #. TRANS: Message given getting a non-existing user.
 #. TRANS: %s is the nickname of the user that could not be found.
-#: lib/command.php:148
 #, php-format
 msgid "Could not find a local user with nickname %s."
 msgstr ""
 
 #. TRANS: Error text shown when an unimplemented command is given.
-#: lib/command.php:183
 msgid "Sorry, this command is not yet implemented."
 msgstr "За съжаление тази команда все още не се поддържа."
 
 #. TRANS: Command exception text shown when a user tries to nudge themselves.
-#: lib/command.php:229
 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr ""
 
 #. TRANS: Message given having nudged another user.
 #. TRANS: %s is the nickname of the user that was nudged.
-#: lib/command.php:238
 #, fuzzy, php-format
 msgid "Nudge sent to %s."
 msgstr "Изпратено е побутване на %s"
@@ -7929,7 +6522,6 @@ msgstr "Изпратено е побутване на %s"
 #. TRANS: %1$s is the number of other user the user is subscribed to.
 #. TRANS: %2$s is the number of users that are subscribed to the user.
 #. TRANS: %3$s is the number of notices the user has sent.
-#: lib/command.php:268
 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"
@@ -7941,40 +6533,34 @@ msgstr ""
 "Бележки: %3$s"
 
 #. TRANS: Error message text shown when a favorite could not be set because it has already been favorited.
-#: lib/command.php:298
 #, fuzzy
 msgid "Could not create favorite: already favorited."
 msgstr "Грешка при отбелязване като любима."
 
 #. TRANS: Text shown when a notice has been marked as favourite successfully.
-#: lib/command.php:324
 msgid "Notice marked as fave."
 msgstr "Бележката е отбелязана като любима."
 
 #. TRANS: Message given having added a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:369
 #, php-format
 msgid "%1$s joined group %2$s."
 msgstr ""
 
 #. TRANS: Message given having removed a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:417
 #, php-format
 msgid "%1$s left group %2$s."
 msgstr ""
 
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: lib/command.php:438
 #, fuzzy, php-format
 msgctxt "WHOIS"
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
 
 #. TRANS: Whois output. %s is the full name of the queried user.
-#: lib/command.php:442
 #, php-format
 msgid "Fullname: %s"
 msgstr "Пълно име: %s"
@@ -7982,7 +6568,6 @@ msgstr "Пълно име: %s"
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a location.
-#: lib/command.php:446 lib/mail.php:275
 #, php-format
 msgid "Location: %s"
 msgstr "Местоположение: %s"
@@ -7990,20 +6575,17 @@ msgstr "Местоположение: %s"
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a homepage.
-#: lib/command.php:450 lib/mail.php:279
 #, php-format
 msgid "Homepage: %s"
 msgstr "Домашна страница: %s"
 
 #. TRANS: Whois output. %s is the bio information of the queried user.
-#: lib/command.php:454
 #, php-format
 msgid "About: %s"
 msgstr "Относно: %s"
 
 #. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).
 #. TRANS: %s is a remote profile.
-#: lib/command.php:483
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
@@ -8012,7 +6594,6 @@ msgstr ""
 
 #. TRANS: Message given if content is too long. %1$sd is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:500
 #, fuzzy, php-format
 msgid "Message too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
@@ -8023,26 +6604,26 @@ msgstr[1] ""
 "Съобщението е твърде дълго. Най-много може да е %1$d знака, а сте въвели %2"
 "$d."
 
+#. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
+msgid "You can't send a message to this user."
+msgstr "Не може да изпращате съобщения до този потребител."
+
 #. TRANS: Error text shown sending a direct message fails with an unknown reason.
-#: lib/command.php:528
 msgid "Error sending direct message."
 msgstr "Грешка при изпращане на прякото съобщение"
 
 #. TRANS: Message given having repeated a notice from another user.
 #. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:565
 #, fuzzy, php-format
 msgid "Notice from %s repeated."
 msgstr "Бележката от %s е повторена"
 
 #. TRANS: Error text shown when repeating a notice fails with an unknown reason.
-#: lib/command.php:568
 msgid "Error repeating notice."
 msgstr "Грешка при повтаряне на бележката."
 
 #. TRANS: Message given if content of a notice for a reply is too long. %1$d is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:603
 #, fuzzy, php-format
 msgid "Notice too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Notice too long - maximum is %1$d characters, you sent %2$d."
@@ -8053,103 +6634,86 @@ msgstr[1] ""
 
 #. TRANS: Text shown having sent a reply to a notice successfully.
 #. TRANS: %s is the nickname of the user of the notice the reply was sent to.
-#: lib/command.php:616
 #, fuzzy, php-format
 msgid "Reply to %s sent."
 msgstr "Отговорът до %s е изпратен"
 
 #. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
-#: lib/command.php:619
 msgid "Error saving notice."
 msgstr "Грешка при записване на бележката."
 
 #. TRANS: Error text shown when no username was provided when issuing a subscribe command.
-#: lib/command.php:666
 #, fuzzy
 msgid "Specify the name of the user to subscribe to."
 msgstr "Уточнете името на потребителя, за когото се абонирате."
 
 #. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
-#: lib/command.php:675
 #, fuzzy
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "Не сте абонирани за този профил"
 
 #. TRANS: Text shown after having subscribed to another user successfully.
 #. TRANS: %s is the name of the user the subscription was requested for.
-#: lib/command.php:683
 #, php-format
 msgid "Subscribed to %s."
 msgstr ""
 
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.
-#: lib/command.php:704 lib/command.php:815
 #, fuzzy
 msgid "Specify the name of the user to unsubscribe from."
 msgstr "Уточнете името на потребителя, от когото се отписвате."
 
 #. TRANS: Text shown after having unsubscribed from another user successfully.
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:715
 #, php-format
 msgid "Unsubscribed from %s."
 msgstr ""
 
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
-#: lib/command.php:735 lib/command.php:761
 msgid "Command not yet implemented."
 msgstr "Командата все още не се поддържа."
 
 #. TRANS: Text shown when issuing the command "off" successfully.
-#: lib/command.php:739
 msgid "Notification off."
 msgstr "Уведомлението е изключено."
 
 #. TRANS: Error text shown when the command "off" fails for an unknown reason.
-#: lib/command.php:742
 msgid "Can't turn off notification."
 msgstr "Грешка при изключване на уведомлението."
 
 #. TRANS: Text shown when issuing the command "on" successfully.
-#: lib/command.php:765
 msgid "Notification on."
 msgstr "Уведомлението е включено."
 
 #. TRANS: Error text shown when the command "on" fails for an unknown reason.
-#: lib/command.php:768
 msgid "Can't turn on notification."
 msgstr "Грешка при включване на уведомлението."
 
 #. TRANS: Error text shown when issuing the login command while login is disabled.
-#: lib/command.php:782
 msgid "Login command is disabled."
 msgstr ""
 
 #. TRANS: Text shown after issuing the login command successfully.
 #. TRANS: %s is a logon link..
-#: lib/command.php:795
 #, php-format
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
 
 #. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:824
 #, php-format
 msgid "Unsubscribed %s."
 msgstr ""
 
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
-#: lib/command.php:842
 msgid "You are not subscribed to anyone."
 msgstr "Не сте абонирани за никого."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
-#: lib/command.php:847
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Вече сте абонирани за следните потребители:"
@@ -8157,14 +6721,12 @@ msgstr[1] "Вече сте абонирани за следните потреб
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user
 #. TRANS: (followers) without having any subscribers.
-#: lib/command.php:869
 msgid "No one is subscribed to you."
 msgstr "Никой не е абониран за вас."
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
-#: lib/command.php:874
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Грешка при абониране на друг потребител за вас."
@@ -8172,21 +6734,18 @@ msgstr[1] "Грешка при абониране на друг потребит
 
 #. TRANS: Text shown after requesting groups a user is subscribed to without having
 #. TRANS: any group subscriptions.
-#: lib/command.php:896
 msgid "You are not a member of any groups."
 msgstr "Не членувате в нито една група."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
-#: lib/command.php:901
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "Не членувате в тази група."
 msgstr[1] "Не членувате в тази група."
 
 #. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-#: lib/command.php:916
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -8229,72 +6788,59 @@ msgid ""
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:36
 #, fuzzy
 msgid "No configuration file found."
 msgstr "Не е открит файл с настройки. "
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:39
 #, fuzzy
 msgid "I looked for configuration files in the following places:"
 msgstr "Изпратени са покани до следните хора:"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:42
 msgid "You may wish to run the installer to fix this."
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:46
 #, fuzzy
 msgid "Go to the installer."
 msgstr "Влизане в сайта"
 
-#: lib/dberroraction.php:59
 msgid "Database error"
 msgstr "Грешка в базата от данни"
 
 #. TRANS: Description of form for deleting a user.
-#: lib/deleteuserform.php:75
 msgid "Delete this user"
 msgstr "Изтриване на този потребител"
 
-#: lib/designform.php:114
 #, fuzzy
 msgid "Change design"
 msgstr "Запазване настройките на сайта"
 
 #. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: lib/designform.php:131
 msgid "Change colours"
 msgstr "Смяна на цветовете"
 
 #. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: lib/designform.php:138
 msgid "Use defaults"
 msgstr ""
 
 #. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: lib/designform.php:140
 msgid "Restore default designs"
 msgstr ""
 
 #. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: lib/designform.php:148
 msgid "Reset back to default"
 msgstr ""
 
 #. TRANS: Label in form on profile design page.
 #. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
-#: lib/designform.php:158
 msgid "Upload file"
 msgstr "Качване на файл"
 
 #. TRANS: Instructions for form on profile design page.
-#: lib/designform.php:163
 #, fuzzy
 msgid ""
 "You can upload your personal background image. The maximum file size is 2Mb."
@@ -8303,51 +6849,43 @@ msgstr ""
 "2MB."
 
 #. TRANS: Radio button on profile design page that will enable use of the uploaded profile image.
-#: lib/designform.php:194
 #, fuzzy
 msgctxt "RADIO"
 msgid "On"
 msgstr "Вкл."
 
 #. TRANS: Radio button on profile design page that will disable use of the uploaded profile image.
-#: lib/designform.php:211
 #, fuzzy
 msgctxt "RADIO"
 msgid "Off"
 msgstr "Изкл."
 
 #. TRANS: Title for button on profile design page to save settings.
-#: lib/designform.php:322
 #, fuzzy
 msgid "Save design"
 msgstr "Запазване настройките на сайта"
 
 #. TRANS: Error message displayed if design settings could not be saved.
 #. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
-#: lib/designsettings.php:216 lib/designsettings.php:238
 #, fuzzy
 msgid "Couldn't update your design."
 msgstr "Грешка при обновяване на потребителя."
 
 #. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
-#: lib/designsettings.php:244
 msgid "Design defaults restored."
 msgstr ""
 
 #. TRANS: Exception. %s is an ID.
-#: lib/discovery.php:153
 #, fuzzy, php-format
 msgid "Unable to find services for %s."
 msgstr "Използвайте тази бланка за създаване на нова група."
 
 #. TRANS: Form legend for removing the favourite status for a favourite notice.
 #. TRANS: Title for button text for removing the favourite status for a favourite notice.
-#: lib/disfavorform.php:108 lib/disfavorform.php:140
 msgid "Disfavor this notice"
 msgstr "Отбелязване като любимо"
 
 #. TRANS: Button text for removing the favourite status for a favourite notice.
-#: lib/disfavorform.php:136
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Disfavor favorite"
@@ -8355,104 +6893,82 @@ msgstr "Добавяне към любимите"
 
 #. TRANS: Form legend for adding the favourite status to a notice.
 #. TRANS: Title for button text for adding the favourite status to a notice.
-#: lib/favorform.php:108 lib/favorform.php:139
 msgid "Favor this notice"
 msgstr "Отбелязване като любимо"
 
 #. TRANS: Button text for adding the favourite status to a notice.
-#: lib/favorform.php:135
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Favor"
 msgstr "Любимо"
 
-#: lib/feed.php:84
 msgid "RSS 1.0"
 msgstr "RSS 1.0"
 
-#: lib/feed.php:86
 msgid "RSS 2.0"
 msgstr "RSS 2.0"
 
-#: lib/feed.php:88
 msgid "Atom"
 msgstr "Atom"
 
-#: lib/feed.php:90
 msgid "FOAF"
 msgstr "FOAF"
 
-#: lib/feedimporter.php:75
 #, fuzzy
 msgid "Not an atom feed."
 msgstr "Всички членове"
 
-#: lib/feedimporter.php:82
 msgid "No author in the feed."
 msgstr ""
 
-#: lib/feedimporter.php:89
 msgid "Can't import without a user."
 msgstr ""
 
 #. TRANS: Header for feed links (h2).
-#: lib/feedlist.php:66
 msgid "Feeds"
 msgstr ""
 
-#: lib/galleryaction.php:128
 msgid "All"
 msgstr "Всички"
 
-#: lib/galleryaction.php:136
 msgid "Select tag to filter"
 msgstr "Изберете етикет за филтриране"
 
-#: lib/galleryaction.php:137
 msgid "Tag"
 msgstr "Етикет"
 
-#: lib/galleryaction.php:138
 msgid "Choose a tag to narrow list"
 msgstr "Изберете етикет за конкретизиране"
 
-#: lib/galleryaction.php:140
 msgid "Go"
 msgstr ""
 
-#: lib/grantroleform.php:91
 #, php-format
 msgid "Grant this user the \"%s\" role"
 msgstr ""
 
-#: lib/groupeditform.php:147
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "От 1 до 64 малки букви или цифри, без пунктоация и интервали"
 
-#: lib/groupeditform.php:156
 #, fuzzy
 msgid "URL of the homepage or blog of the group or topic."
 msgstr "Адрес на страница, блог или профил в друг сайт на групата"
 
-#: lib/groupeditform.php:161
 msgid "Describe the group or topic"
 msgstr "Опишете групата или темата"
 
-#: lib/groupeditform.php:163
 #, fuzzy, php-format
 msgid "Describe the group or topic in %d character or less"
 msgid_plural "Describe the group or topic in %d characters or less"
 msgstr[0] "Опишете групата или темата в до %d букви"
 msgstr[1] "Опишете групата или темата в до %d букви"
 
-#: lib/groupeditform.php:175
 #, fuzzy
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\"."
 msgstr ""
 "Къде се намира групата — град, община, държава и т.н. (ако е приложимо)"
 
-#: lib/groupeditform.php:183
 #, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -8464,49 +6980,42 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Menu item in the group navigation page.
-#: lib/groupnav.php:86
 msgctxt "MENU"
 msgid "Group"
 msgstr ""
 
 #. TRANS: Tooltip for menu item in the group navigation page.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:89
 #, php-format
 msgctxt "TOOLTIP"
 msgid "%s group"
 msgstr ""
 
 #. TRANS: Menu item in the group navigation page.
-#: lib/groupnav.php:95
 msgctxt "MENU"
 msgid "Members"
 msgstr ""
 
 #. TRANS: Tooltip for menu item in the group navigation page.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:98
 #, php-format
 msgctxt "TOOLTIP"
 msgid "%s group members"
 msgstr ""
 
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/groupnav.php:108
 msgctxt "MENU"
 msgid "Blocked"
 msgstr ""
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:111
 #, php-format
 msgctxt "TOOLTIP"
 msgid "%s blocked users"
 msgstr ""
 
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/groupnav.php:117
 #, fuzzy
 msgctxt "MENU"
 msgid "Admin"
@@ -8514,21 +7023,18 @@ msgstr "Настройки"
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:120
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Edit %s group properties"
 msgstr ""
 
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/groupnav.php:126
 msgctxt "MENU"
 msgid "Logo"
 msgstr ""
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:129
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Add or edit %s logo"
@@ -8536,69 +7042,57 @@ msgstr ""
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:138
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Add or edit %s design"
 msgstr ""
 
 #. TRANS: Title for groups with the most members section.
-#: lib/groupsbymemberssection.php:71
 msgid "Groups with most members"
 msgstr "Групи с най-много членове"
 
 #. TRANS: Title for groups with the most posts section.
-#: lib/groupsbypostssection.php:71
 msgid "Groups with most posts"
 msgstr "Групи с най-много бележки"
 
 #. TRANS: Title for group tag cloud section.
 #. TRANS: %s is a group name.
-#: lib/grouptagcloudsection.php:57
 #, php-format
 msgid "Tags in %s group's notices"
 msgstr "Етикети в бележките към групата %s"
 
 #. TRANS: Client exception 406
-#: lib/htmloutputter.php:104
 msgid "This page is not available in a media type you accept"
 msgstr "Страницата не е достъпна във вида медия, който приемате"
 
 #. TRANS: Exception thrown when trying to upload an unsupported image file format.
-#: lib/imagefile.php:73
 msgid "Unsupported image file format."
 msgstr "Форматът на файла с изображението не се поддържа."
 
 #. TRANS: Exception thrown when too large a file is uploaded.
 #. TRANS: %s is the maximum file size, for example "500b", "10kB" or "2MB".
-#: lib/imagefile.php:91
 #, fuzzy, php-format
 msgid "That file is too big. The maximum file size is %s."
 msgstr "Може да качите лого за групата ви."
 
 #. TRANS: Exception thrown when uploading an image and that action could not be completed.
-#: lib/imagefile.php:97
 msgid "Partial upload."
 msgstr "Частично качване на файла."
 
 #. TRANS: Exception thrown when uploading a file as image that is not an image or is a corrupt file.
-#: lib/imagefile.php:115
 msgid "Not an image or corrupt file."
 msgstr "Файлът не е изображение или е повреден."
 
 #. TRANS: Exception thrown during resize when image has been registered as present, but is no longer there.
-#: lib/imagefile.php:178
 msgid "Lost our file."
 msgstr "Няма такъв файл."
 
 #. TRANS: Exception thrown when trying to resize an unknown file type.
 #. TRANS: Exception thrown when trying resize an unknown file type.
-#: lib/imagefile.php:216 lib/imagefile.php:257
 msgid "Unknown file type"
 msgstr "Неподдържан вид файл"
 
 #. TRANS: Number of megabytes. %d is the number.
-#: lib/imagefile.php:303
 #, fuzzy, php-format
 msgid "%dMB"
 msgid_plural "%dMB"
@@ -8606,7 +7100,6 @@ msgstr[0] "MB"
 msgstr[1] "MB"
 
 #. TRANS: Number of kilobytes. %d is the number.
-#: lib/imagefile.php:307
 #, fuzzy, php-format
 msgid "%dkB"
 msgid_plural "%dkB"
@@ -8614,14 +7107,12 @@ msgstr[0] "kB"
 msgstr[1] "kB"
 
 #. TRANS: Number of bytes. %d is the number.
-#: lib/imagefile.php:310
 #, php-format
 msgid "%dB"
 msgid_plural "%dB"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/implugin.php:262
 #, php-format
 msgid ""
 "User \"%s\" on %s has said that your %s screenname belongs to them. If "
@@ -8631,53 +7122,44 @@ msgid ""
 "message."
 msgstr ""
 
-#: lib/implugin.php:349
 #, php-format
 msgid "Unknown inbox source %d."
 msgstr "Непознат език \"%s\"."
 
-#: lib/implugin.php:485
-#, fuzzy, php-format
+#, php-format
 msgid "Message too long - maximum is %1$d characters, you sent %2$d."
 msgstr ""
 "Съобщението е твърде дълго. Най-много може да е %1$d знака, а сте въвели %2"
 "$d."
 
-#: lib/leaveform.php:114
 msgid "Leave"
 msgstr "Напускане"
 
 #. TRANS: Menu item for logging in to the StatusNet site.
-#: lib/logingroupnav.php:77
 msgctxt "MENU"
 msgid "Login"
 msgstr "Вход"
 
 #. TRANS: Title for menu item for logging in to the StatusNet site.
-#: lib/logingroupnav.php:79
 msgid "Login with a username and password"
 msgstr "Вход с име и парола"
 
 #. TRANS: Menu item for registering with the StatusNet site.
-#: lib/logingroupnav.php:85
 msgctxt "MENU"
 msgid "Register"
 msgstr "Регистриране"
 
 #. TRANS: Title for menu item for registering with the StatusNet site.
-#: lib/logingroupnav.php:87
 msgid "Sign up for a new account"
 msgstr "Създаване на нова сметка"
 
 #. TRANS: Subject for address confirmation email.
-#: lib/mail.php:172
 msgid "Email address confirmation"
 msgstr "Потвърждаване адреса на е-поща"
 
 #. TRANS: Body for address confirmation email.
 #. TRANS: %1$s is the addressed user's nickname, %2$s is the StatusNet sitename,
 #. TRANS: %3$s is the URL to confirm at.
-#: lib/mail.php:177
 #, php-format
 msgid ""
 "Hey, %1$s.\n"
@@ -8696,14 +7178,12 @@ msgstr ""
 
 #. TRANS: Subject of new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
-#: lib/mail.php:243
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1$s вече получава бележките ви в %2$s."
 
 #. TRANS: This is a paragraph in a new-subscriber e-mail.
 #. TRANS: %s is a URL where the subscriber can be reported as abusive.
-#: lib/mail.php:250
 #, php-format
 msgid ""
 "If you believe this account is being used abusively, you can block them from "
@@ -8715,7 +7195,6 @@ msgstr ""
 #. TRANS: %3$s is the subscriber's profile URL, %4$s is the subscriber's location (or empty)
 #. TRANS: %5$s is the subscriber's homepage URL (or empty), %6%s is the subscriber's bio (or empty)
 #. TRANS: %7$s is a link to the addressed user's e-mail settings.
-#: lib/mail.php:260
 #, fuzzy, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -8742,14 +7221,12 @@ msgstr ""
 
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is biographical information.
-#: lib/mail.php:283
 #, php-format
 msgid "Bio: %s"
 msgstr "Биография: %s"
 
 #. TRANS: Subject of notification mail for new posting email address.
 #. TRANS: %s is the StatusNet sitename.
-#: lib/mail.php:312
 #, php-format
 msgid "New email address for posting to %s"
 msgstr "Нов адрес на е-поща за публикщуване в %s"
@@ -8757,7 +7234,6 @@ msgstr "Нов адрес на е-поща за публикщуване в %s"
 #. TRANS: Body of notification mail for new posting email address.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is the e-mail address to send
 #. TRANS: to to post by e-mail, %3$s is a URL to more instructions.
-#: lib/mail.php:318
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -8772,26 +7248,22 @@ msgstr ""
 
 #. TRANS: Subject line for SMS-by-email notification messages.
 #. TRANS: %s is the posting user's nickname.
-#: lib/mail.php:439
 #, php-format
 msgid "%s status"
 msgstr "Състояние на %s"
 
 #. TRANS: Subject line for SMS-by-email address confirmation message.
-#: lib/mail.php:465
 msgid "SMS confirmation"
 msgstr "Потвърждение за SMS"
 
 #. TRANS: Main body heading for SMS-by-email address confirmation message.
 #. TRANS: %s is the addressed user's nickname.
-#: lib/mail.php:469
 #, fuzzy, php-format
 msgid "%s: confirm you own this phone number with this code:"
 msgstr "Очаква се потвърждение за този телефонен номер."
 
 #. TRANS: Subject for 'nudge' notification email.
 #. TRANS: %s is the nudging user.
-#: lib/mail.php:490
 #, fuzzy, php-format
 msgid "You have been nudged by %s"
 msgstr "Побутнати сте от %s"
@@ -8799,7 +7271,6 @@ msgstr "Побутнати сте от %s"
 #. TRANS: Body for 'nudge' notification email.
 #. TRANS: %1$s is the nuding user's long name, $2$s is the nudging user's nickname,
 #. TRANS: %3$s is a URL to post notices at, %4$s is the StatusNet sitename.
-#: lib/mail.php:497
 #, php-format
 msgid ""
 "%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -8817,7 +7288,6 @@ msgstr ""
 
 #. TRANS: Subject for direct-message notification email.
 #. TRANS: %s is the sending user's nickname.
-#: lib/mail.php:544
 #, php-format
 msgid "New private message from %s"
 msgstr "Ново лично съобщение от %s"
@@ -8826,7 +7296,6 @@ msgstr "Ново лично съобщение от %s"
 #. TRANS: %1$s is the sending user's long name, %2$s is the sending user's nickname,
 #. TRANS: %3$s is the message content, %4$s a URL to the message,
 #. TRANS: %5$s is the StatusNet sitename.
-#: lib/mail.php:552
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -8847,7 +7316,6 @@ msgstr ""
 
 #. TRANS: Subject for favorite notification e-mail.
 #. TRANS: %1$s is the adding user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:604
 #, fuzzy, php-format
 msgid "%1$s (@%2$s) added your notice as a favorite"
 msgstr "%s (@%s) отбеляза бележката ви като любима"
@@ -8857,7 +7325,6 @@ msgstr "%s (@%s) отбеляза бележката ви като любима"
 #. TRANS: %3$s is a URL to the faved notice, %4$s is the faved notice text,
 #. TRANS: %5$s is a URL to all faves of the adding user, %6$s is the StatusNet sitename,
 #. TRANS: %7$s is the adding user's nickname.
-#: lib/mail.php:611
 #, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -8879,7 +7346,6 @@ msgid ""
 msgstr ""
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:669
 #, php-format
 msgid ""
 "The full conversation can be read here:\n"
@@ -8889,7 +7355,6 @@ msgstr ""
 
 #. TRANS: E-mail subject for notice notification.
 #. TRANS: %1$s is the sending user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:677
 #, fuzzy, php-format
 msgid "%1$s (@%2$s) sent a notice to your attention"
 msgstr "%s (@%s) отбеляза бележката ви като любима"
@@ -8900,7 +7365,6 @@ msgstr "%s (@%s) отбеляза бележката ви като любима"
 #. TRANS: %5$s is a URL to the full conversion if it exists (otherwise empty),
 #. TRANS: %6$s is a URL to reply to the notice, %7$s is a URL to all @-replied for the addressed user,
 #. TRANS: %8$s is a URL to the addressed user's e-mail settings, %9$s is the sender's nickname.
-#: lib/mail.php:685
 #, php-format
 msgid ""
 "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -8927,63 +7391,51 @@ msgid ""
 "P.S. You can turn off these email notifications here: %8$s\n"
 msgstr ""
 
-#: lib/mailbox.php:87
 msgid "Only the user can read their own mailboxes."
 msgstr "Само потребителят може да отваря собствената си кутия."
 
-#: lib/mailbox.php:125
 msgid ""
 "You have no private messages. You can send private message to engage other "
 "users in conversation. People can send you messages for your eyes only."
 msgstr ""
 
-#: lib/mailhandler.php:37
 msgid "Could not parse message."
 msgstr "Грешка при обработка на съобщението"
 
-#: lib/mailhandler.php:42
 msgid "Not a registered user."
 msgstr "Това не е регистриран потребител."
 
-#: lib/mailhandler.php:46
 msgid "Sorry, that is not your incoming email address."
 msgstr "Това не е вашият входящ адрес."
 
-#: lib/mailhandler.php:50
 msgid "Sorry, no incoming email allowed."
 msgstr "Входящата поща не е разрешена."
 
-#: lib/mailhandler.php:229
 #, fuzzy, php-format
 msgid "Unsupported message type: %s"
 msgstr "Форматът на файла с изображението не се поддържа."
 
 #. TRANS: Client exception thrown when a database error was thrown during a file upload operation.
-#: lib/mediafile.php:102 lib/mediafile.php:174
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
 
 #. TRANS: Client exception thrown when a file upload operation would cause a user to exceed a set quota.
-#: lib/mediafile.php:238 lib/mediafile.php:281
 msgid "File exceeds user's quota."
 msgstr ""
 
 #. TRANS: Client exception thrown when a file upload operation fails because the file could
 #. TRANS: not be moved from the temporary folder to the permanent file location.
-#: lib/mediafile.php:258 lib/mediafile.php:300
 msgid "File could not be moved to destination directory."
 msgstr ""
 
 #. TRANS: Client exception thrown when a file upload operation has been stopped because the MIME
 #. TRANS: type of the uploaded file could not be determined.
-#: lib/mediafile.php:265 lib/mediafile.php:306
 msgid "Could not determine file's MIME type."
 msgstr "Грешка при изтриване на любима бележка."
 
 #. TRANS: Client exception thrown trying to upload a forbidden MIME type.
 #. TRANS: %1$s is the file type that was denied, %2$s is the application part of
 #. TRANS: the MIME type that was denied.
-#: lib/mediafile.php:396
 #, php-format
 msgid ""
 "\"%1$s\" is not a supported file type on this server. Try using another %2$s "
@@ -8992,510 +7444,401 @@ msgstr ""
 
 #. TRANS: Client exception thrown trying to upload a forbidden MIME type.
 #. TRANS: %s is the file type that was denied.
-#: lib/mediafile.php:401
 #, php-format
 msgid "\"%s\" is not a supported file type on this server."
 msgstr ""
 
-#: lib/messageform.php:120
 msgid "Send a direct notice"
 msgstr "Изпращане на пряко съобщеие"
 
 #. TRANS Label entry in drop-down selection box in direct-message inbox/outbox. This is the default entry in the drop-down box, doubling as instructions and a brake against accidental submissions with the first user in the list.
-#: lib/messageform.php:137
 #, fuzzy
 msgid "Select recipient:"
 msgstr "Изберете оператор"
 
 #. TRANS Entry in drop-down selection box in direct-message inbox/outbox when no one is available to message.
-#: lib/messageform.php:150
 #, fuzzy
 msgid "No mutual subscribers."
 msgstr "Не сте абонирани!"
 
-#: lib/messageform.php:153
 msgid "To"
 msgstr "До"
 
-#: lib/messageform.php:184 lib/noticeform.php:236
 #, fuzzy
 msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr "Прати"
 
-#: lib/messagelist.php:77
 #, fuzzy
 msgid "Messages"
 msgstr "Съобщение"
 
-#: lib/messagelistitem.php:123 lib/noticelist.php:527
 msgid "from"
 msgstr "от"
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:178
 msgid "Nickname cannot be empty."
 msgstr ""
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:191
 #, php-format
 msgid "Nickname cannot be more than %d character long."
 msgid_plural "Nickname cannot be more than %d characters long."
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/noticeform.php:160
+#. TRANS: Form legend for notice form.
 msgid "Send a notice"
 msgstr "Изпращане на бележка"
 
-#: lib/noticeform.php:174
+#. TRANS: Title for notice label. %s is the user's nickname.
 #, php-format
 msgid "What's up, %s?"
 msgstr "Какво става, %s?"
 
-#: lib/noticeform.php:193
+#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr "Прикрепяне"
 
-#: lib/noticeform.php:197
-msgid "Attach a file"
+#. TRANS: Title for input field to attach a file to a notice.
+#, fuzzy
+msgid "Attach a file."
 msgstr "Прикрепяне на файл"
 
-#: lib/noticeform.php:212
+#. TRANS: Field label to add location to a notice.
 msgid "Share my location"
 msgstr "Споделяне на местоположението ми"
 
-#: lib/noticeform.php:215
+#. TRANS: Text to not share location for a notice in notice form.
 msgid "Do not share my location"
 msgstr "Без споделяне на местоположението ми"
 
-#: lib/noticeform.php:216
+#. TRANS: Timeout error text for location retrieval in notice form.
 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
 "try again later"
 msgstr ""
 
 #. TRANS: Used in coordinates as abbreviation of north
-#: lib/noticelist.php:457
 msgid "N"
 msgstr "С"
 
 #. TRANS: Used in coordinates as abbreviation of south
-#: lib/noticelist.php:459
 msgid "S"
 msgstr "Ю"
 
 #. TRANS: Used in coordinates as abbreviation of east
-#: lib/noticelist.php:461
 msgid "E"
 msgstr "И"
 
 #. TRANS: Used in coordinates as abbreviation of west
-#: lib/noticelist.php:463
 msgid "W"
 msgstr "З"
 
-#: lib/noticelist.php:465
 #, php-format
 msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgstr ""
 
-#: lib/noticelist.php:474
 #, fuzzy
 msgid "at"
 msgstr "Път"
 
-#: lib/noticelist.php:523
 msgid "web"
 msgstr ""
 
-#: lib/noticelist.php:589
 msgid "in context"
 msgstr "в контекст"
 
-#: lib/noticelist.php:624
 msgid "Repeated by"
 msgstr "Повторено от"
 
-#: lib/noticelist.php:651
 msgid "Reply to this notice"
 msgstr "Отговаряне на тази бележка"
 
-#: lib/noticelist.php:652
 msgid "Reply"
 msgstr "Отговор"
 
-#: lib/noticelist.php:678
 msgid "Delete this notice"
 msgstr "Изтриване на бележката"
 
-#: lib/noticelist.php:696
 msgid "Notice repeated"
 msgstr "Бележката е повторена."
 
-#: lib/nudgeform.php:116
 msgid "Nudge this user"
 msgstr "Побутване на този потребител"
 
-#: lib/nudgeform.php:128
 msgid "Nudge"
 msgstr "Побутване"
 
-#: lib/nudgeform.php:128
 msgid "Send a nudge to this user"
 msgstr "Побутване на този потребител"
 
-#: lib/oauthstore.php:294
 msgid "Error inserting new profile."
 msgstr ""
 
-#: lib/oauthstore.php:302
 msgid "Error inserting avatar."
 msgstr ""
 
-#: lib/oauthstore.php:322
 msgid "Error inserting remote profile."
 msgstr ""
 
 #. TRANS: Exception thrown when a notice is denied because it has been sent before.
-#: lib/oauthstore.php:362
 msgid "Duplicate notice."
 msgstr ""
 
-#: lib/oauthstore.php:507
 msgid "Couldn't insert new subscription."
 msgstr "Грешка при добавяне на нов абонамент."
 
-#: lib/personalgroupnav.php:104
-#, fuzzy
 msgid "Replies"
 msgstr "Отговори"
 
-#: lib/personalgroupnav.php:109
-#, fuzzy
 msgid "Favorites"
 msgstr "Любими"
 
-#: lib/personalgroupnav.php:120
-#, fuzzy
 msgid "Inbox"
 msgstr "Входящи"
 
-#: lib/personalgroupnav.php:121
 msgid "Your incoming messages"
 msgstr "Получените от вас съобщения"
 
-#: lib/personalgroupnav.php:125
-#, fuzzy
 msgid "Outbox"
 msgstr "Изходящи"
 
-#: lib/personalgroupnav.php:126
 msgid "Your sent messages"
 msgstr "Изпратените от вас съобщения"
 
 #. TRANS: Title for personal tag cloud section. %s is a user nickname.
-#: lib/personaltagcloudsection.php:56
 #, php-format
 msgid "Tags in %s's notices"
 msgstr "Етикети в бележките на %s"
 
 #. TRANS: Displayed as version information for a plugin if no version information was found.
-#: lib/plugin.php:126
 msgid "Unknown"
 msgstr "Непознато"
 
 #. TRANS: Plugin admin panel controls
-#: lib/plugindisableform.php:90
 msgctxt "plugin"
 msgid "Disable"
 msgstr ""
 
 #. TRANS: Plugin admin panel controls
-#: lib/pluginenableform.php:112
 msgctxt "plugin"
 msgid "Enable"
 msgstr ""
 
-#: lib/pluginlist.php:196
 msgctxt "plugin-description"
 msgid "(Plugin descriptions unavailable when disabled.)"
 msgstr ""
 
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:88
 msgid "Subscriptions"
 msgstr "Абонаменти"
 
 #. TRANS: Text for user subscription statistics if user has more subscriptions than displayed.
-#: lib/profileaction.php:144
 msgid "All subscriptions"
 msgstr "Всички абонаменти"
 
 #. TRANS: H2 text for user subscriber statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:96
 msgid "Subscribers"
 msgstr "Абонати"
 
 #. TRANS: Text for user subscription statistics if user has more subscribers than displayed.
-#: lib/profileaction.php:181
 msgid "All subscribers"
 msgstr "Всички абонати"
 
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:213
 #, fuzzy
 msgid "User ID"
 msgstr "Потребител"
 
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:219
 msgid "Member since"
 msgstr "Участник от"
 
 #. TRANS: Label for user statistics.
 #. TRANS: H2 text for user group membership statistics.
-#: lib/profileaction.php:239 lib/profileaction.php:290
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:104
 msgid "Groups"
 msgstr "Групи"
 
 #. TRANS: Label for user statistics.
 #. TRANS: Average count of posts made per day since account registration.
-#: lib/profileaction.php:253
 msgid "Daily average"
 msgstr ""
 
 #. TRANS: Text for user group membership statistics if user has more subscriptions than displayed.
-#: lib/profileaction.php:305
 msgid "All groups"
 msgstr "Всички групи"
 
 #. TRANS: Server error displayed when using an unimplemented method.
-#: lib/profileformaction.php:123
 msgid "Unimplemented method."
 msgstr ""
 
-#: lib/publicgroupnav.php:82
 msgid "User groups"
 msgstr "Групи"
 
-#: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
 msgid "Recent tags"
 msgstr "Скорошни етикети"
 
-#: lib/publicgroupnav.php:88
 msgid "Featured"
 msgstr "Избрано"
 
-#: lib/publicgroupnav.php:92
 msgid "Popular"
 msgstr "Популярно"
 
-#: lib/redirectingaction.php:95
 msgid "No return-to arguments."
 msgstr "Липсват аргументи return-to."
 
-#: lib/repeatform.php:107
 msgid "Repeat this notice?"
 msgstr "Да се повтори ли тази бележка?"
 
-#: lib/repeatform.php:132
 msgid "Yes"
 msgstr "Да"
 
-#: lib/repeatform.php:132
 msgid "Repeat this notice"
 msgstr "Повтаряне на тази бележка"
 
-#: lib/revokeroleform.php:91
 #, fuzzy, php-format
 msgid "Revoke the \"%s\" role from this user"
 msgstr "Списък с потребителите в тази група."
 
 #. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:1001
 #, fuzzy
 msgid "Page not found."
 msgstr "Не е открит методът в API."
 
-#: lib/sandboxform.php:67
 #, fuzzy
 msgid "Sandbox"
 msgstr "Входящи"
 
-#: lib/sandboxform.php:78
 #, fuzzy
 msgid "Sandbox this user"
 msgstr "Разблокиране на този потребител"
 
 #. TRANS: Fieldset legend for the search form.
-#: lib/searchaction.php:120
 msgid "Search site"
 msgstr "Търсене в сайта"
 
 #. TRANS: Used as a field label for the field where one or more keywords
 #. TRANS: for searching can be entered.
-#: lib/searchaction.php:128
 msgid "Keyword(s)"
 msgstr "Ключови думи"
 
 #. TRANS: Button text for searching site.
-#: lib/searchaction.php:130
 msgctxt "BUTTON"
 msgid "Search"
 msgstr "Търсене"
 
-#: lib/searchgroupnav.php:80
 msgid "People"
 msgstr "Хора"
 
-#: lib/searchgroupnav.php:81
 msgid "Find people on this site"
 msgstr "Търсене на хора в сайта"
 
-#: lib/searchgroupnav.php:83
 msgid "Find content of notices"
 msgstr "Търсене в съдържанието на бележките"
 
-#: lib/searchgroupnav.php:85
 msgid "Find groups on this site"
 msgstr "Търсене на групи в сайта"
 
-#: lib/section.php:89
 msgid "Untitled section"
 msgstr "Неозаглавен раздел"
 
-#: lib/section.php:106
 msgid "More..."
 msgstr "Още…"
 
-#: lib/settingsnav.php:78
 msgid "Change your profile settings"
 msgstr "Промяна настройките на профила"
 
-#: lib/settingsnav.php:83
 msgid "Upload an avatar"
 msgstr "Качване на аватар"
 
-#: lib/settingsnav.php:88
 msgid "Change your password"
 msgstr "Смяна на паролата"
 
-#: lib/settingsnav.php:93
 msgid "Change email handling"
 msgstr "Промяна обработката на писмата"
 
-#: lib/settingsnav.php:98
 #, fuzzy
 msgid "Design your profile"
 msgstr "Потребителски профил"
 
-#: lib/settingsnav.php:102
 msgid "URL"
 msgstr "URL"
 
-#: lib/settingsnav.php:103
 msgid "URL shorteners"
 msgstr ""
 
-#: lib/settingsnav.php:111
 msgid "Updates by instant messenger (IM)"
 msgstr "Бележки през месинджър (IM)"
 
-#: lib/settingsnav.php:118
 msgid "Updates by SMS"
 msgstr "Бележки през SMS"
 
-#: lib/settingsnav.php:123
 #, fuzzy
 msgid "Connections"
 msgstr "Свързване"
 
-#: lib/settingsnav.php:124
 #, fuzzy
 msgid "Authorized connected applications"
 msgstr "Изтриване на приложението"
 
-#: lib/silenceform.php:67
 msgid "Silence"
 msgstr "Заглушаване"
 
-#: lib/silenceform.php:78
 msgid "Silence this user"
 msgstr "Заглушаване на този потребител."
 
-#: lib/subgroupnav.php:89
 #, php-format
 msgid "People %s subscribes to"
 msgstr "Абонаменти на %s"
 
-#: lib/subgroupnav.php:97
 #, php-format
 msgid "People subscribed to %s"
 msgstr "Абонирани за %s"
 
-#: lib/subgroupnav.php:105
 #, php-format
 msgid "Groups %s is a member of"
 msgstr "Групи, в които участва %s"
 
-#: lib/subgroupnav.php:111
 msgid "Invite"
 msgstr "Покани"
 
-#: lib/subgroupnav.php:112
 #, php-format
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Поканете приятели и колеги да се присъединят към вас в %s"
 
-#: lib/subscribeform.php:115 lib/subscribeform.php:139
 msgid "Subscribe to this user"
 msgstr "Абониране за този потребител"
 
-#: lib/subscriberspeopleselftagcloudsection.php:48
-#: lib/subscriptionspeopleselftagcloudsection.php:48
 msgid "People Tagcloud as self-tagged"
 msgstr ""
 
-#: lib/subscriberspeopletagcloudsection.php:48
-#: lib/subscriptionspeopletagcloudsection.php:48
 msgid "People Tagcloud as tagged"
 msgstr ""
 
-#: lib/tagcloudsection.php:56
 msgid "None"
 msgstr "Без"
 
 #. TRANS: Server exception displayed if a theme name was invalid.
-#: lib/theme.php:74
 #, fuzzy
 msgid "Invalid theme name."
 msgstr "Неправилен размер."
 
-#: lib/themeuploader.php:50
 msgid "This server cannot handle theme uploads without ZIP support."
 msgstr ""
 
-#: lib/themeuploader.php:58 lib/themeuploader.php:61
 msgid "The theme file is missing or the upload failed."
 msgstr ""
 
-#: lib/themeuploader.php:91 lib/themeuploader.php:102
-#: lib/themeuploader.php:279 lib/themeuploader.php:283
-#: lib/themeuploader.php:291 lib/themeuploader.php:298
 #, fuzzy
 msgid "Failed saving theme."
 msgstr "Неуспешно обновяване на аватара."
 
-#: lib/themeuploader.php:147
 msgid "Invalid theme: bad directory structure."
 msgstr ""
 
-#: lib/themeuploader.php:166
 #, php-format
 msgid "Uploaded theme is too large; must be less than %d byte uncompressed."
 msgid_plural ""
@@ -9503,155 +7846,125 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/themeuploader.php:179
 msgid "Invalid theme archive: missing file css/display.css"
 msgstr ""
 
-#: lib/themeuploader.php:219
 msgid ""
 "Theme contains invalid file or folder name. Stick with ASCII letters, "
 "digits, underscore, and minus sign."
 msgstr ""
 
-#: lib/themeuploader.php:225
 msgid "Theme contains unsafe file extension names; may be unsafe."
 msgstr ""
 
-#: lib/themeuploader.php:242
 #, php-format
 msgid "Theme contains file of type '.%s', which is not allowed."
 msgstr ""
 
-#: lib/themeuploader.php:260
 msgid "Error opening theme archive."
 msgstr "Грешка при изпращане на прякото съобщение"
 
-#: lib/threadednoticelist.php:270
 #, php-format
-msgid "Show all %d comment"
-msgid_plural "Show all %d comments"
+msgid "Show %d reply"
+msgid_plural "Show all %d replies"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/topposterssection.php:74
 msgid "Top posters"
 msgstr "Най-често пишещи"
 
 #. TRANS: Title for the form to unblock a user.
-#: lib/unblockform.php:67
 #, fuzzy
 msgctxt "TITLE"
 msgid "Unblock"
 msgstr "Разблокиране"
 
-#: lib/unsandboxform.php:69
 msgid "Unsandbox"
 msgstr ""
 
-#: lib/unsandboxform.php:80
 #, fuzzy
 msgid "Unsandbox this user"
 msgstr "Разблокиране на този потребител"
 
-#: lib/unsilenceform.php:67
 #, fuzzy
 msgid "Unsilence"
 msgstr "Заглушаване"
 
-#: lib/unsilenceform.php:78
 msgid "Unsilence this user"
 msgstr "Заглушаване на този потребител."
 
-#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
 msgid "Unsubscribe from this user"
 msgstr "Отписване от този потребител"
 
-#: lib/unsubscribeform.php:137
 msgid "Unsubscribe"
 msgstr "Отписване"
 
 #. 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).
-#: lib/usernoprofileexception.php:60
 #, fuzzy, php-format
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "Потребителят няма профил."
 
-#: lib/userprofile.php:116
 msgid "Edit Avatar"
 msgstr "Редактиране на аватара"
 
 #. TRANS: H2 for user actions in a profile.
 #. TRANS: H2 for entity actions in a profile.
-#: lib/userprofile.php:216 lib/userprofile.php:232
 msgid "User actions"
 msgstr "Потребителски действия"
 
 #. TRANS: Text shown in user profile of not yet compeltely deleted users.
-#: lib/userprofile.php:220
 msgid "User deletion in progress..."
 msgstr ""
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:248
 msgid "Edit profile settings"
 msgstr "Редактиране на профила"
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:250
 msgid "Edit"
 msgstr "Редактиране"
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:274
 msgid "Send a direct message to this user"
 msgstr "Изпращате на пряко съобщение до този потребител."
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:276
 msgid "Message"
 msgstr "Съобщение"
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:318
 #, fuzzy
 msgid "Moderate"
 msgstr "Модератор"
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:357
 msgid "User role"
 msgstr "Потребителска роля"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:360
 msgctxt "role"
 msgid "Administrator"
 msgstr "Администратор"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:362
 msgctxt "role"
 msgid "Moderator"
 msgstr "Модератор"
 
-#: lib/util.php:321
 #, fuzzy
 msgid "Not allowed to log in."
 msgstr "Не сте влезли в системата."
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1337
 msgid "a few seconds ago"
 msgstr "преди няколко секунди"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1340
 msgid "about a minute ago"
 msgstr "преди около минута"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1344
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
@@ -9659,12 +7972,10 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1347
 msgid "about an hour ago"
 msgstr "преди около час"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1351
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
@@ -9672,12 +7983,10 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1354
 msgid "about a day ago"
 msgstr "преди около ден"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1358
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
@@ -9685,12 +7994,10 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1361
 msgid "about a month ago"
 msgstr "преди около месец"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1365
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
@@ -9698,196 +8005,39 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1368
 msgid "about a year ago"
 msgstr "преди около година"
 
 #. TRANS: Web color exception thrown when a hexadecimal color code does not validate.
 #. TRANS: %s is the provided (invalid) color code.
-#: lib/webcolor.php:81 lib/webcolor.php:121
 #, fuzzy, php-format
 msgid "%s is not a valid color! Use 3 or 6 hex characters."
 msgstr "%s не е допустим цвят! Използвайте 3 или 6 шестнадесетични знака."
 
 #. TRANS: Exception.
-#: lib/xrd.php:63
 #, fuzzy
 msgid "Invalid XML."
 msgstr "Неправилен размер."
 
 #. TRANS: Exception.
-#: lib/xrd.php:68
 msgid "Invalid XML, missing XRD root."
 msgstr ""
 
 #. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
-#: scripts/restoreuser.php:62
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
 
-#, fuzzy
-#~ msgid "Could not generate feed for group - %s"
-#~ msgstr "Грешка при обновяване на групата."
+#~ msgid "Full name is too long (max 255 chars)."
+#~ msgstr "Пълното име е твърде дълго (макс. 255 знака)"
+
+#~ msgid "description is too long (max %d chars)."
+#~ msgstr "Описанието е твърде дълго (до %d символа)."
+
+#~ msgid "Location is too long (max 255 chars)."
+#~ msgstr "Името на местоположението е твърде дълго (макс. 255 знака)."
 
 #, fuzzy
-#~ msgid "Current confirmed Jabber/Google Talk address."
-#~ msgstr "Текущ потвърден Jabber/GTalk адрес."
-
-#, fuzzy
-#~ msgid ""
-#~ "Jabber or Google Talk address, like \"UserName@example.org\". First, make "
-#~ "sure to add %s to your buddy list in your IM client or on Google Talk."
-#~ msgstr ""
-#~ "Jabber или GTalk адрес, като \"UserName@example.org\". Първо се уверете, "
-#~ "че сте добавили %s в списъка си с приятели в IM или GTalk клиента си."
-
-#, fuzzy
-#~ msgid "Send me notices through Jabber/Google Talk."
-#~ msgstr "Изпращане на бележките по Jabber/GTalk."
-
-#, fuzzy
-#~ msgid "Publish a MicroID for my Jabber/Google Talk address."
-#~ msgstr "Публикуване на MicroID за адреса в Jabber/GTalk."
-
-#~ msgid "No Jabber ID."
-#~ msgstr "Няма Jabber ID."
-
-#, fuzzy
-#~ msgid "Not a valid Jabber ID."
-#~ msgstr "Неправилен Jabber ID"
-
-#~ msgid "That is already your Jabber ID."
-#~ msgstr "Това вече е вашият Jabber ID."
-
-#~ msgid "That is not your Jabber ID."
-#~ msgstr "Това не е вашият Jabber ID."
-
-#~ msgid "Other settings"
-#~ msgstr "Други настройки"
-
-#, fuzzy
-#~ msgid "Tag cloud"
-#~ msgstr "Смяна на цветовете"
-
-#, fuzzy
-#~ msgid "Authorize URL"
-#~ msgstr "Автор"
-
-#~ msgid "Jabber"
-#~ msgstr "Jabber"
-
-#~ msgid "Photo"
-#~ msgstr "Снимка"
-
-#~ msgid "Other options"
-#~ msgstr "Други настройки"
-
-#~ msgid "Other"
-#~ msgstr "Друго"
-
-#, fuzzy
-#~ msgid "Primary site navigation"
-#~ msgstr "Основна настройка на сайта"
-
-#~ msgctxt "MENU"
-#~ msgid "Personal"
-#~ msgstr "Лично"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Change your email, avatar, password, profile"
-#~ msgstr "Промяна на поща, аватар, парола, профил"
-
-#~ msgid "Account"
-#~ msgstr "Сметка"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Connect to services"
-#~ msgstr "Свързване към услуги"
-
-#~ msgid "Connect"
-#~ msgstr "Свързване"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Change site configuration"
-#~ msgstr "Промяна настройките на сайта"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Invite friends and colleagues to join you on %s"
-#~ msgstr "Поканете приятели и колеги да се присъединят към вас в %s"
-
-#, fuzzy
-#~ msgctxt "MENU"
-#~ msgid "Invite"
-#~ msgstr "Покани"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Create an account"
-#~ msgstr "Създаване на нова сметка"
-
-#, fuzzy
-#~ msgctxt "TOOLTIP"
-#~ msgid "Help me!"
-#~ msgstr "Помощ"
-
-#~ msgctxt "MENU"
-#~ msgid "Help"
-#~ msgstr "Помощ"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Search for people or text"
-#~ msgstr "Търсене за хора или бележки"
-
-#, fuzzy
-#~ msgid "Page notice"
-#~ msgstr "Нова бележка"
-
-#~ msgid "Secondary site navigation"
-#~ msgstr "Основна настройка на сайта"
-
-#~ msgid "StatusNet software license"
-#~ msgstr "Лиценз на програмата StatusNet"
-
-#~ msgid "Site content license"
-#~ msgstr "Лиценз на съдържанието"
-
-#~ msgid "Pagination"
-#~ msgstr "Страниране"
-
-#~ msgid "Author"
-#~ msgstr "Автор"
-
-#~ msgid "Provider"
-#~ msgstr "Доставчик"
-
-#, fuzzy
-#~ msgctxt "MENU"
-#~ msgid "SMS"
-#~ msgstr "SMS"
-
-#~ msgid "Filter tags"
-#~ msgstr "Филтриране на етикетите"
-
-#~ msgid "[%s]"
-#~ msgstr "[%s]"
-
-#~ msgid "Available characters"
-#~ msgstr "Налични знаци"
-
-#, fuzzy
-#~ msgctxt "MENU"
-#~ msgid "Profile"
-#~ msgstr "Профил"
-
-#~ msgid "Search help"
-#~ msgstr "Помощ за търсенето"
-
-#, fuzzy
-#~ msgid "Message too long. Maximum is %1$d character, you sent %2$d."
-#~ msgid_plural "Message too long. Maximum is %1$d characters, you sent %2$d."
-#~ msgstr[0] ""
-#~ "Съобщението е твърде дълго. Най-много може да е %1$d знака, а сте въвели %"
-#~ "2$d."
-#~ msgstr[1] ""
-#~ "Съобщението е твърде дълго. Най-много може да е %1$d знака, а сте въвели %"
-#~ "2$d."
+#~ msgctxt "BUTTON"
+#~ msgid "Comment"
+#~ msgstr "Съдържание"
diff --git a/locale/br/LC_MESSAGES/statusnet.po b/locale/br/LC_MESSAGES/statusnet.po
index 27d00a8860..9e987d19f4 100644
--- a/locale/br/LC_MESSAGES/statusnet.po
+++ b/locale/br/LC_MESSAGES/statusnet.po
@@ -12,68 +12,58 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:23+0000\n"
-"PO-Revision-Date: 2011-03-03 17:25:42+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:09+0000\n"
 "Language-Team: Breton <http://translatewiki.net/wiki/Portal:br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-POT-Import-Date: 2011-02-25 23:49:23+0000\n"
+"X-POT-Import-Date: 2011-03-03 17:59:19+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
-#: actions/accessadminpanel.php:53 lib/adminpanelaction.php:363
 msgid "Access"
 msgstr "Moned"
 
 #. TRANS: Page notice.
-#: actions/accessadminpanel.php:64
 msgid "Site access settings"
 msgstr "Arventennoù moned d'al lec'hienn"
 
 #. TRANS: Form legend for registration form.
-#: actions/accessadminpanel.php:151
 msgid "Registration"
 msgstr "Enskrivadur"
 
 #. TRANS: Checkbox instructions for admin setting "Private".
-#: actions/accessadminpanel.php:155
 msgid "Prohibit anonymous users (not logged in) from viewing site?"
 msgstr ""
 "Nac'h ouzh an implijerien dizanv (nann-kevreet) da welet al lec'hienn ?"
 
 #. TRANS: Checkbox label for prohibiting anonymous users from viewing site.
-#: actions/accessadminpanel.php:157
 msgctxt "LABEL"
 msgid "Private"
 msgstr "Prevez"
 
 #. TRANS: Checkbox instructions for admin setting "Invite only".
-#: actions/accessadminpanel.php:164
 msgid "Make registration invitation only."
 msgstr "Aotreañ an enskrivadur goude bezañ bet pedet hepken."
 
 #. TRANS: Checkbox label for configuring site as invite only.
-#: actions/accessadminpanel.php:166
 msgid "Invite only"
 msgstr "Tud pedet hepken"
 
 #. TRANS: Checkbox instructions for admin setting "Closed" (no new registrations).
-#: actions/accessadminpanel.php:173
 msgid "Disable new registrations."
 msgstr "Diweredekaat an enskrivadurioù nevez."
 
 #. TRANS: Checkbox label for disabling new user registrations.
-#: actions/accessadminpanel.php:175
 msgid "Closed"
 msgstr "Serr"
 
 #. TRANS: Title for button to save access settings in site admin panel.
-#: actions/accessadminpanel.php:191
 msgid "Save access settings"
 msgstr "Enrollañ an arventennoù moned"
 
@@ -81,6 +71,7 @@ msgstr "Enrollañ an arventennoù moned"
 #. TRANS: Button text for saving theme settings.
 #. TRANS: Button label to save e-mail preferences.
 #. TRANS: Button label to save IM preferences.
+#. TRANS: Button text in the license admin panel.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
 #. TRANS: Button text for saving site notice in admin panel.
@@ -90,21 +81,12 @@ msgstr "Enrollañ an arventennoù moned"
 #. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
 #. TRANS: Button text on profile design page to save settings.
-#: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
-#: actions/emailsettings.php:251 actions/imsettings.php:199
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:198
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:204
-#: actions/subscriptions.php:261 actions/urlsettings.php:152
-#: actions/useradminpanel.php:298 lib/applicationeditform.php:355
-#: lib/designform.php:320 lib/groupeditform.php:201
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Enrollañ"
 
 #. TRANS: Server error when page not found (404).
 #. TRANS: Server error when page not found (404)
-#: actions/all.php:68 actions/public.php:98 actions/replies.php:93
-#: actions/showfavorites.php:140 actions/tag.php:52
 msgid "No such page."
 msgstr "N'eus ket eus ar bajenn-se."
 
@@ -123,6 +105,7 @@ msgstr "N'eus ket eus ar bajenn-se."
 #. TRANS: Client error displayed when checking group membership for a non-existing user.
 #. TRANS: Client error displayed when trying to have a non-existing user join a group.
 #. TRANS: Client error displayed when trying to have a non-existing user leave a group.
+#. TRANS: Client error displayed when not providing a user or an invalid user.
 #. TRANS: Client error displayed when updating a status for a non-existing user.
 #. TRANS: Client error displayed when requesting a list of followers for a non-existing user.
 #. TRANS: Client error displayed when requesting most recent favourite notices by a user for a non-existing user.
@@ -135,6 +118,8 @@ msgstr "N'eus ket eus ar bajenn-se."
 #. 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.
 #. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
@@ -142,33 +127,10 @@ msgstr "N'eus ket eus ar bajenn-se."
 #. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when calling a profile action without specifying a user.
-#: actions/all.php:80 actions/allrss.php:69
-#: actions/apiaccountupdatedeliverydevice.php:110
-#: actions/apiaccountupdateprofile.php:103
-#: actions/apiaccountupdateprofilebackgroundimage.php:118
-#: actions/apiaccountupdateprofileimage.php:104 actions/apiatomservice.php:59
-#: actions/apiblockcreate.php:96 actions/apiblockdestroy.php:94
-#: actions/apidirectmessage.php:75 actions/apidirectmessagenew.php:72
-#: actions/apigroupcreate.php:111 actions/apigroupismember.php:89
-#: actions/apigroupjoin.php:98 actions/apigroupleave.php:98
-#: actions/apigrouplist.php:70 actions/apigroupprofileupdate.php:108
-#: actions/apistatusesupdate.php:230 actions/apisubscriptions.php:85
-#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:173
-#: actions/apitimelinehome.php:78 actions/apitimelinementions.php:77
-#: actions/apitimelineuser.php:79 actions/avatarbynickname.php:79
-#: actions/favoritesrss.php:72 actions/foaf.php:42 actions/foaf.php:61
-#: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116
-#: actions/otp.php:78 actions/remotesubscribe.php:144
-#: actions/remotesubscribe.php:153 actions/replies.php:73
-#: actions/repliesrss.php:38 actions/rsd.php:113 actions/showfavorites.php:106
-#: actions/userbyid.php:75 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/userxrd.php:59 actions/xrds.php:71 lib/command.php:509
-#: lib/galleryaction.php:59 lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "N'eus ket eus an implijer-se."
 
 #. TRANS: Page title. %1$s is user nickname, %2$d is page number
-#: actions/all.php:91
 #, php-format
 msgid "%1$s and friends, page %2$d"
 msgstr "%1$s hag e vignoned, pajenn %2$d"
@@ -177,33 +139,26 @@ msgstr "%1$s hag e vignoned, pajenn %2$d"
 #. TRANS: H1 text for page. %s is a user nickname.
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Timeline title for user and friends. %s is a user nickname.
-#: actions/all.php:94 actions/all.php:191 actions/allrss.php:117
-#: actions/apitimelinefriends.php:207 actions/apitimelinehome.php:113
-#: lib/personalgroupnav.php:100
 #, php-format
 msgid "%s and friends"
 msgstr "%s hag e vignoned"
 
 #. TRANS: %s is user nickname.
-#: actions/all.php:108
 #, php-format
 msgid "Feed for friends of %s (RSS 1.0)"
 msgstr "Gwazh evit mignoned %s (RSS 1.0)"
 
 #. TRANS: %s is user nickname.
-#: actions/all.php:117
 #, php-format
 msgid "Feed for friends of %s (RSS 2.0)"
 msgstr "Gwazh evit mignoned %s (RSS 2.0)"
 
 #. TRANS: %s is user nickname.
-#: actions/all.php:126
 #, php-format
 msgid "Feed for friends of %s (Atom)"
 msgstr "Gwazh evit mignoned %s (Atom)"
 
 #. TRANS: Empty list message. %s is a user nickname.
-#: actions/all.php:139
 #, php-format
 msgid ""
 "This is the timeline for %s and friends but no one has posted anything yet."
@@ -213,7 +168,6 @@ msgstr ""
 
 #. TRANS: Encouragement displayed on logged in user's empty timeline.
 #. TRANS: This message contains Markdown links. Keep "](" together.
-#: actions/all.php:146
 #, php-format
 msgid ""
 "Try subscribing to more people, [join a group](%%action.groups%%) or post "
@@ -224,7 +178,6 @@ msgstr ""
 
 #. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@".
 #. TRANS: This message contains Markdown links. Keep "](" together.
-#: actions/all.php:150
 #, php-format
 msgid ""
 "You can try to [nudge %1$s](../%2$s) from their profile or [post something "
@@ -235,7 +188,6 @@ msgstr ""
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
 #. TRANS: Second sentence of empty message for anonymous users. %s is a user nickname.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:221
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -245,14 +197,11 @@ msgstr ""
 "%s pe postañ ur c'hemenn bennak evitañ."
 
 #. TRANS: H1 text for page when viewing a list for self.
-#: actions/all.php:188
 msgid "You and friends"
 msgstr "C'hwi hag o mignoned"
 
 #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
 #. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name.
-#: actions/allrss.php:122 actions/apitimelinefriends.php:213
-#: actions/apitimelinehome.php:119
 #, php-format
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr "Hizivadennoù %1$s ha mignoned e %2$s!"
@@ -271,55 +220,20 @@ msgstr "Hizivadennoù %1$s ha mignoned e %2$s!"
 #. TRANS: Client error displayed trying to execute an unknown API method checking group membership.
 #. TRANS: Client error displayed trying to execute an unknown API method listing the latest 20 groups.
 #. TRANS: Client error displayed trying to execute an unknown API method showing group membership.
+#. TRANS: Client error displayed when using an unsupported API format.
 #. TRANS: Client error displayed trying to execute an unknown API method showing a group.
 #. TRANS: Client error displayed trying to execute an unknown API method testing API connectivity.
 #. TRANS: Client error displayed trying to execute an unknown API method deleting a status.
 #. TRANS: Client error displayed when trying to handle an unknown API method.
-#: actions/apiaccountratelimitstatus.php:69
-#: actions/apiaccountupdatedeliverydevice.php:92
-#: actions/apiaccountupdateprofile.php:94
-#: actions/apiaccountupdateprofilebackgroundimage.php:92
-#: actions/apiaccountupdateprofilecolors.php:115
-#: actions/apiaccountverifycredentials.php:68 actions/apidirectmessage.php:157
-#: actions/apifavoritecreate.php:98 actions/apifavoritedestroy.php:98
-#: actions/apifriendshipscreate.php:99 actions/apifriendshipsdestroy.php:99
-#: actions/apifriendshipsshow.php:124 actions/apigroupcreate.php:138
-#: actions/apigroupismember.php:115 actions/apigroupjoin.php:151
-#: actions/apigroupleave.php:141 actions/apigrouplist.php:134
-#: actions/apigrouplistall.php:120 actions/apigroupmembership.php:105
-#: actions/apigroupprofileupdate.php:100 actions/apigroupprofileupdate.php:213
-#: actions/apigroupshow.php:114 actions/apihelptest.php:84
-#: actions/apistatusesdestroy.php:101 actions/apistatusesretweets.php:110
-#: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:139
-#: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
-#: actions/apitimelinefavorites.php:182 actions/apitimelinefriends.php:276
-#: actions/apitimelinegroup.php:148 actions/apitimelinehome.php:181
-#: actions/apitimelinementions.php:182 actions/apitimelinepublic.php:247
-#: actions/apitimelineretweetedtome.php:147
-#: actions/apitimelineretweetsofme.php:147 actions/apitimelinetag.php:165
-#: actions/apitimelineuser.php:217 actions/apiusershow.php:100
 msgid "API method not found."
 msgstr "N'eo ket bet kavet an hentenn 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.
-#: actions/apiaccountupdatedeliverydevice.php:83
-#: actions/apiaccountupdateprofile.php:85
-#: actions/apiaccountupdateprofilebackgroundimage.php:83
-#: actions/apiaccountupdateprofilecolors.php:106
-#: actions/apiaccountupdateprofileimage.php:80 actions/apiblockcreate.php:87
-#: actions/apiblockdestroy.php:85 actions/apidirectmessagenew.php:107
-#: actions/apifavoritecreate.php:88 actions/apifavoritedestroy.php:88
-#: actions/apifriendshipscreate.php:89 actions/apifriendshipsdestroy.php:89
-#: actions/apigroupcreate.php:102 actions/apigroupjoin.php:89
-#: actions/apigroupleave.php:89 actions/apigroupprofileupdate.php:92
-#: actions/apimediaupload.php:66 actions/apistatusesretweet.php:63
-#: actions/apistatusesupdate.php:194
 msgid "This method requires a POST."
 msgstr "Ezhomm en deus an argerzh-mañ eus ur POST."
 
 #. TRANS: Client error displayed when no valid device parameter is provided for a user's delivery device setting.
-#: actions/apiaccountupdatedeliverydevice.php:103
 msgid ""
 "You must specify a parameter named 'device' with a value of one of: sms, im, "
 "none."
@@ -332,10 +246,6 @@ msgstr ""
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
-#: actions/apiaccountupdatedeliverydevice.php:136
-#: actions/emailsettings.php:353 actions/emailsettings.php:499
-#: actions/profilesettings.php:323 actions/smssettings.php:300
-#: actions/smssettings.php:453 actions/urlsettings.php:211
 msgid "Could not update user."
 msgstr "Dibosupl hizivaat an implijer."
 
@@ -348,32 +258,17 @@ msgstr "Dibosupl hizivaat an implijer."
 #. TRANS: Server error displayed when requesting Friends of a Friend feed for a user for which the profile could not be found.
 #. TRANS: Server error displayed when trying to get a user hCard for a user without a profile.
 #. TRANS: Server error displayed when calling a profile action while the specified user does not have a profile.
-#: actions/apiaccountupdateprofile.php:111
-#: actions/apiaccountupdateprofilebackgroundimage.php:199
-#: actions/apiaccountupdateprofilecolors.php:183
-#: actions/apiaccountupdateprofileimage.php:131
-#: actions/apiuserprofileimage.php:88 actions/apiusershow.php:108
-#: actions/avatarbynickname.php:85 actions/foaf.php:69 actions/hcard.php:75
-#: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
-#: lib/profileaction.php:85
 msgid "User has no profile."
 msgstr "An implijer-mañ n'eus profil ebet dezhañ."
 
 #. TRANS: Server error displayed if a user profile could not be saved.
 #. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:419
 msgid "Could not save profile."
 msgstr "Dibosupl eo enrollañ ar profil."
 
 #. TRANS: Client error displayed when the number of bytes in a POST request exceeds a limit.
 #. TRANS: %s is the number of bytes of the CONTENT_LENGTH.
 #. TRANS: Form validation error in design settings form. POST should remain untranslated.
-#: actions/apiaccountupdateprofilebackgroundimage.php:108
-#: actions/apiaccountupdateprofileimage.php:95 actions/apimediaupload.php:81
-#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
-#: actions/designadminpanel.php:120 actions/editapplication.php:121
-#: actions/newapplication.php:102 actions/newnotice.php:95
-#: lib/designsettings.php:110
 #, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s byte) due to its "
@@ -389,26 +284,15 @@ msgstr[1] ""
 #. TRANS: Client error displayed when a database error occurs inserting profile colours.
 #. TRANS: Client error displayed when a database error occurs updating profile colours.
 #. TRANS: Form validation error displayed when group design settings could not be saved because of an application issue.
-#: actions/apiaccountupdateprofilebackgroundimage.php:138
-#: actions/apiaccountupdateprofilebackgroundimage.php:149
-#: actions/apiaccountupdateprofilecolors.php:160
-#: actions/apiaccountupdateprofilecolors.php:171
-#: actions/groupdesignsettings.php:285 actions/groupdesignsettings.php:296
-#: actions/userdesignsettings.php:218 actions/userdesignsettings.php:228
-#: actions/userdesignsettings.php:270 actions/userdesignsettings.php:280
 msgid "Unable to save your design settings."
 msgstr "Dibosupl eo enrollañ an arventennoù empentiñ."
 
 #. TRANS: Error displayed when updating design settings fails.
 #. TRANS: Client error displayed when a database error occurs updating profile colours.
-#: actions/apiaccountupdateprofilebackgroundimage.php:191
-#: actions/apiaccountupdateprofilecolors.php:139
-#: actions/userdesignsettings.php:196
 msgid "Could not update your design."
 msgstr "Dibosupl eo hizivaat ho design."
 
 #. TRANS: Title for Atom feed.
-#: actions/apiatomservice.php:85
 msgctxt "ATOM"
 msgid "Main"
 msgstr "Pennañ"
@@ -417,9 +301,6 @@ msgstr "Pennañ"
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Title in atom group notice feed. %s is a group name.
 #. TRANS: Title in atom user notice feed. %s is a user name.
-#: actions/apiatomservice.php:93 actions/grouprss.php:138
-#: actions/userrss.php:94 lib/atomgroupnoticefeed.php:63
-#: lib/atomusernoticefeed.php:88
 #, php-format
 msgid "%s timeline"
 msgstr "Oberezhioù %s"
@@ -429,8 +310,6 @@ msgstr "Oberezhioù %s"
 #. TRANS: %s is a user nickname.
 #. TRANS: Header for subscriptions overview for a user (first page).
 #. TRANS: %s is a user nickname.
-#: actions/apiatomservice.php:104 actions/atompubsubscriptionfeed.php:148
-#: actions/subscriptions.php:51
 #, php-format
 msgid "%s subscriptions"
 msgstr "Koumanantoù %s"
@@ -438,58 +317,48 @@ msgstr "Koumanantoù %s"
 #. TRANS: Title for Atom feed with a user's favorite notices. %s is a user nickname.
 #. TRANS: Title for Atom favorites feed.
 #. TRANS: %s is a user nickname.
-#: actions/apiatomservice.php:115 actions/atompubfavoritefeed.php:142
 #, php-format
 msgid "%s favorites"
 msgstr "%s Pennrolloù"
 
 #. TRANS: Title for Atom feed with a user's memberships. %s is a user nickname.
-#: actions/apiatomservice.php:126
 #, php-format
 msgid "%s memberships"
 msgstr "Izili ar strollad %s"
 
 #. TRANS: Client error displayed when users try to block themselves.
-#: actions/apiblockcreate.php:105
 msgid "You cannot block yourself!"
 msgstr "N'hallit ket en em stankañ hoc'h-unan !"
 
 #. TRANS: Server error displayed when blocking a user has failed.
-#: actions/apiblockcreate.php:127
 msgid "Block user failed."
 msgstr "N'eus ket bet tu da stankañ an implijer."
 
 #. TRANS: Server error displayed when unblocking a user has failed.
-#: actions/apiblockdestroy.php:113
 msgid "Unblock user failed."
 msgstr "N'eus ket bet tu da zistankañ an implijer."
 
 #. TRANS: Title. %s is a user nickname.
-#: actions/apidirectmessage.php:88
 #, php-format
 msgid "Direct messages from %s"
 msgstr "Kemennadennoù war-eeun kaset gant %s"
 
 #. TRANS: Subtitle. %s is a user nickname.
-#: actions/apidirectmessage.php:93
 #, php-format
 msgid "All the direct messages sent from %s"
 msgstr "An holl gemennadennoù war-eeun kaset gant %s"
 
 #. TRANS: Title. %s is a user nickname.
-#: actions/apidirectmessage.php:102
 #, php-format
 msgid "Direct messages to %s"
 msgstr "Kemennadennoù war-eeun kaset da %s"
 
 #. TRANS: Subtitle. %s is a user nickname.
-#: actions/apidirectmessage.php:107
 #, php-format
 msgid "All the direct messages sent to %s"
 msgstr "An holl gemennadennoù war-eeun kaset da %s"
 
 #. TRANS: Client error displayed when no message text was submitted (406).
-#: actions/apidirectmessagenew.php:117
 msgid "No message text!"
 msgstr "Kemenadenn hep testenn !"
 
@@ -497,7 +366,6 @@ msgstr "Kemenadenn hep testenn !"
 #. TRANS: %d is the maximum number of characters for a message.
 #. TRANS: Form validation error displayed when message content is too long.
 #. TRANS: %d is the maximum number of characters for a message.
-#: actions/apidirectmessagenew.php:127 actions/newmessage.php:152
 #, php-format
 msgid "That's too long. Maximum message size is %d character."
 msgid_plural "That's too long. Maximum message size is %d characters."
@@ -505,12 +373,10 @@ msgstr[0] "Re hir eo. %d arouezenn a c'hall bezañ er gemennadenn d'ar muiañ."
 msgstr[1] "Re hir eo. %d arouezenn a c'hall bezañ er gemennadenn d'ar muiañ."
 
 #. TRANS: Client error displayed if a recipient user could not be found (403).
-#: actions/apidirectmessagenew.php:139
 msgid "Recipient user not found."
 msgstr "N'eo ket bet kavet ar resever."
 
 #. TRANS: Client error displayed trying to direct message another user who's not a friend (403).
-#: actions/apidirectmessagenew.php:144
 #, fuzzy
 msgid "Cannot send direct messages to users who aren't your friend."
 msgstr ""
@@ -518,7 +384,6 @@ msgstr ""
 "mignoned."
 
 #. TRANS: Client error displayed trying to direct message self (403).
-#: actions/apidirectmessagenew.php:154
 msgid ""
 "Do not send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
@@ -528,117 +393,97 @@ 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.
 #. TRANS: Client error displayed trying to delete a status with an invalid ID.
-#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:108
-#: actions/apistatusesdestroy.php:121
 msgid "No status found with that ID."
 msgstr "N'eo bet kavet statud ebet gant an ID-mañ."
 
 #. TRANS: Client error displayed when trying to mark a notice favourite that already is a favourite.
-#: actions/apifavoritecreate.php:120
 msgid "This status is already a favorite."
 msgstr "Ur pennroll eo dija ar c'hemenn-mañ."
 
 #. TRANS: Client error displayed when marking a notice as favourite fails.
 #. TRANS: Server error displayed when trying to mark a notice as favorite fails in the database.
 #. TRANS: Error message text shown when a favorite could not be set.
-#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:306
 msgid "Could not create favorite."
 msgstr "Diposupl eo krouiñ ar pennroll-mañ."
 
 #. TRANS: Client error displayed when trying to remove a favourite that was not a favourite.
-#: actions/apifavoritedestroy.php:122
 msgid "That status is not a favorite."
 msgstr "N'eo ket ar statud-mañ ur pennroll."
 
 #. TRANS: Client error displayed when removing a favourite has failed.
 #. TRANS: Server error displayed when removing a favorite from the database fails.
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:90
 msgid "Could not delete favorite."
 msgstr "Diposupl eo dilemel ar pennroll-mañ."
 
 #. TRANS: Client error displayed when trying follow who's profile could not be found.
-#: actions/apifriendshipscreate.php:109
 msgid "Could not follow user: profile not found."
 msgstr "Dibosupl eo heuliañ an implijer : n'eo ket bet kavet ar profil."
 
 #. TRANS: Client error displayed when trying to follow a user that's already being followed.
 #. TRANS: %s is the nickname of the user that is already being followed.
-#: actions/apifriendshipscreate.php:120
 #, php-format
 msgid "Could not follow user: %s is already on your list."
 msgstr "Dibosupl eo heuliañ an implijer : war ho listenn emañ %s dija."
 
 #. TRANS: Client error displayed when trying to unfollow a user that cannot be found.
-#: actions/apifriendshipsdestroy.php:109
 msgid "Could not unfollow user: User not found."
 msgstr ""
 "Diposupl eo paouez heuliañ an implijer : N'eo ket bet kavet an implijer."
 
 #. TRANS: Client error displayed when trying to unfollow self.
-#: actions/apifriendshipsdestroy.php:121
 msgid "You cannot unfollow yourself."
 msgstr "Ne c'hallit ket chom hep ho heuliañ hoc'h-unan."
 
 #. TRANS: Client error displayed when supplying invalid parameters to an API call checking if a friendship exists.
-#: actions/apifriendshipsexists.php:88
 msgid "Two valid IDs or nick names must be supplied."
 msgstr "Rankout a reoc'h reiñ daou id pe lesanv."
 
 #. TRANS: Client error displayed when a source user could not be determined showing friendship.
-#: actions/apifriendshipsshow.php:131
 msgid "Could not determine source user."
 msgstr "Dibosupl eo termeniñ an implijer mammenn."
 
 #. TRANS: Client error displayed when a target user could not be determined showing friendship.
-#: actions/apifriendshipsshow.php:140
 msgid "Could not find target user."
 msgstr "Dibosupl eo kavout an implijer pal."
 
 #. TRANS: Client error trying to create a group with a nickname this is already in use.
+#. TRANS: API validation exception thrown when nickname is already used.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:156 actions/apigroupprofileupdate.php:255
-#: actions/editgroup.php:191 actions/newgroup.php:137
-#: actions/profilesettings.php:274 actions/register.php:199
 msgid "Nickname already in use. Try another one."
 msgstr "Implijet eo dija al lesanv-se. Klaskit unan all."
 
 #. TRANS: Client error in form for group creation.
+#. TRANS: API validation exception thrown when nickname does not validate.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:164 actions/apigroupprofileupdate.php:259
-#: actions/editgroup.php:195 actions/newgroup.php:141
-#: actions/profilesettings.php:244 actions/register.php:201
 msgid "Not a valid nickname."
 msgstr "N'eo ket ul lesanv mat."
 
 #. TRANS: Client error in form for group creation.
+#. TRANS: API validation exception thrown when homepage URL does not validate.
 #. TRANS: Validation error shown when providing an invalid homepage URL in the "Edit application" form.
 #. TRANS: Group edit form validation error.
 #. TRANS: Validation error shown when providing an invalid homepage URL in the "New application" form.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:181 actions/apigroupprofileupdate.php:277
-#: actions/editapplication.php:235 actions/editgroup.php:202
-#: actions/newapplication.php:221 actions/newgroup.php:148
-#: actions/profilesettings.php:249 actions/register.php:208
 msgid "Homepage is not a valid URL."
 msgstr "N'eo ket chomlec'h al lec'hienn personel un URL reizh."
 
 #. TRANS: Client error in form for group creation.
+#. TRANS: API validation exception thrown when full name does not validate.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:191 actions/editgroup.php:206
-#: actions/newgroup.php:152 actions/profilesettings.php:253
-#: actions/register.php:211
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "Re hir eo an anv klok (255 arouezenn d'ar muiañ)."
 
 #. TRANS: Client error shown when providing too long a description during group creation.
 #. TRANS: %d is the maximum number of allowed characters.
+#. TRANS: API validation exception thrown when description does not validate.
+#. TRANS: %d is the maximum description length and used for plural.
 #. TRANS: Validation error shown when providing too long a description in the "Edit application" form.
 #. TRANS: %d is the maximum number of allowed characters.
 #. TRANS: Group edit form validation error.
@@ -646,9 +491,6 @@ msgstr "Re hir eo an anv klok (255 arouezenn d'ar muiañ)."
 #. TRANS: %d is the maximum number of characters for the description.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed characters.
-#: actions/apigroupcreate.php:201 actions/editapplication.php:202
-#: actions/editgroup.php:211 actions/newapplication.php:182
-#: actions/newgroup.php:157
 #, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."
@@ -656,23 +498,21 @@ msgstr[0] "Re hir eo an deskrivadur (%d arouezenn d'ar muiañ)."
 msgstr[1] "Re hir eo an deskrivadur (%d arouezenn d'ar muiañ)."
 
 #. TRANS: Client error shown when providing too long a location during group creation.
+#. TRANS: API validation exception thrown when location does not validate.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:215 actions/editgroup.php:218
-#: actions/newgroup.php:164 actions/profilesettings.php:266
-#: actions/register.php:220
 msgid "Location is too long (maximum 255 characters)."
 msgstr "Re hir eo al lec'hiadur (255 arouezenn d'ar muiañ)."
 
 #. TRANS: Client error shown when providing too many aliases during group creation.
 #. TRANS: %d is the maximum number of allowed aliases.
+#. TRANS: API validation exception thrown when aliases do not validate.
+#. TRANS: %d is the maximum number of aliases and used for plural.
 #. TRANS: Group edit form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.
-#: actions/apigroupcreate.php:236 actions/editgroup.php:231
-#: actions/newgroup.php:177
 #, php-format
 msgid "Too many aliases! Maximum %d allowed."
 msgid_plural "Too many aliases! Maximum %d allowed."
@@ -681,25 +521,24 @@ msgstr[1] "Re a aliasoù ! %d d'ar muiañ."
 
 #. TRANS: Client error shown when providing an invalid alias during group creation.
 #. TRANS: %s is the invalid alias.
-#: actions/apigroupcreate.php:253
+#. TRANS: API validation exception thrown when aliases does not validate.
+#. TRANS: %s is the invalid alias.
 #, php-format
 msgid "Invalid alias: \"%s\"."
 msgstr "Alias fall : \"%s\"."
 
 #. TRANS: Client error displayed when trying to use an alias during group creation that is already in use.
 #. TRANS: %s is the alias that is already in use.
+#. TRANS: API validation exception thrown when aliases is already used.
+#. TRANS: %s is the already used alias.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error. %s is the already used alias.
-#: actions/apigroupcreate.php:264 actions/apigroupprofileupdate.php:351
-#: actions/editgroup.php:246 actions/newgroup.php:193
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "Implijet e vez an alias \"%s\" dija. Klaskit gant unan all."
 
 #. TRANS: Client error displayed when trying to use an alias during group creation that is the same as the group's nickname.
 #. TRANS: Group edit form validation error.
-#: actions/apigroupcreate.php:278 actions/apigroupprofileupdate.php:359
-#: actions/editgroup.php:253
 msgid "Alias can't be the same as nickname."
 msgstr "Ne c'hell ket an alias bezañ ar memes hini eget al lesanv."
 
@@ -707,26 +546,21 @@ msgstr "Ne c'hell ket an alias bezañ ar memes hini eget al lesanv."
 #. TRANS: Client error displayed when trying to join a group that does not exist.
 #. TRANS: Client error displayed when trying to leave a group that does not exist.
 #. TRANS: Client error displayed trying to show group membership on a non-existing group.
+#. TRANS: Client error displayed when not providing a group or an invalid group.
 #. TRANS: Client error displayed when trying to show a group that could not be found.
 #. TRANS: Client error displayed requesting most recent notices to a group for a non-existing group.
-#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
-#: actions/apigroupleave.php:104 actions/apigroupmembership.php:71
-#: actions/apigroupprofileupdate.php:113 actions/apigroupshow.php:81
-#: actions/apitimelinegroup.php:89
 msgid "Group not found."
 msgstr "N'eo ket bet kavet ar strollad."
 
 #. TRANS: Server error displayed when trying to join a group the user is already a member of.
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:345
 msgid "You are already a member of that group."
 msgstr "Un ezel eus ar strollad-mañ eo dija."
 
 #. TRANS: Server error displayed when trying to join a group the user is blocked from joining.
 #. 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.
-#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:350
 msgid "You have been blocked from that group by the admin."
 msgstr "Stanket oc'h bet eus ar strollad-mañ gant ur merour."
 
@@ -734,13 +568,11 @@ msgstr "Stanket oc'h bet eus ar strollad-mañ gant ur merour."
 #. TRANS: %1$s is the joining user's nickname, $2$s is the group nickname for which the join failed.
 #. TRANS: Message given having failed to add a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:136 actions/joingroup.php:139 lib/command.php:362
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "Dibosupl eo stagañ an implijer %1$s d'ar strollad %2$s."
 
 #. TRANS: Server error displayed when trying to leave a group the user is not a member of.
-#: actions/apigroupleave.php:115
 msgid "You are not a member of this group."
 msgstr "N'oc'h ket ezel eus ar strollad-mañ."
 
@@ -748,115 +580,78 @@ msgstr "N'oc'h ket ezel eus ar strollad-mañ."
 #. TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
 #. TRANS: Message given having failed to remove a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupleave.php:127 actions/leavegroup.php:133
-#: lib/command.php:410
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
 msgstr "Dibosupl eo dilemel an implijer %1$s deus ar strollad %2$s."
 
 #. TRANS: Used as title in check for group membership. %s is a user name.
-#: actions/apigrouplist.php:94
 #, php-format
 msgid "%s's groups"
 msgstr "Strollad %s"
 
 #. TRANS: Used as subtitle in check for group membership. %1$s is a user name, %2$s is the site name.
-#: actions/apigrouplist.php:104
 #, php-format
 msgid "%1$s groups %2$s is a member of."
 msgstr "Strolladoù %1s m'eo ezel %2s."
 
 #. TRANS: Message is used as a title when listing the lastest 20 groups. %s is a site name.
 #. TRANS: Message is used as a page title. %s is a nick name.
-#: actions/apigrouplistall.php:88 actions/usergroups.php:63
 #, php-format
 msgid "%s groups"
 msgstr "Strolladoù %s"
 
 #. TRANS: Message is used as a subtitle when listing the lastest 20 groups. %s is a site name.
-#: actions/apigrouplistall.php:93
 #, php-format
 msgid "groups on %s"
 msgstr "strolladoù war %s"
 
+#. TRANS: Client error displayed when trying to edit a group without being an admin.
 #. TRANS: Client error displayed trying to edit a group while not being a group admin.
 #. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
 #. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
-#: actions/apigroupprofileupdate.php:118 actions/editgroup.php:110
-#: actions/editgroup.php:176 actions/groupdesignsettings.php:109
-#: actions/grouplogo.php:111
 msgid "You must be an admin to edit the group."
 msgstr "Rankout a reer bezañ merour evit kemmañ ar strollad."
 
+#. TRANS: Server error displayed when group update fails.
 #. TRANS: Server error displayed when editing a group fails.
-#: actions/apigroupprofileupdate.php:171 actions/editgroup.php:274
 msgid "Could not update group."
 msgstr "Dibosupl eo hizivaat ar strollad."
 
+#. TRANS: Server error displayed when adding group aliases fails.
 #. TRANS: Server error displayed when group aliases could not be added.
 #. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/apigroupprofileupdate.php:194 actions/editgroup.php:281
-#: classes/User_group.php:540
 msgid "Could not create aliases."
 msgstr "Dibosupl eo krouiñ an aliasoù."
 
+#. TRANS: API validation exception thrown when nickname does not validate.
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: actions/apigroupprofileupdate.php:249 lib/nickname.php:165
 #, fuzzy
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr "1 da 64 lizherenn vihan pe sifr, hep poentaouiñ nag esaouenn"
 
-#: actions/apigroupprofileupdate.php:286
-#, fuzzy
-msgid "Full name is too long (max 255 chars)."
-msgstr "Re hir eo an anv klok (255 arouezenn d'ar muiañ)."
-
-#: actions/apigroupprofileupdate.php:296
-#, fuzzy, php-format
-msgid "description is too long (max %d chars)."
-msgstr "Re hir eo an deskrivadur (%d arouezenn d'ar muiañ)."
-
-#: actions/apigroupprofileupdate.php:307
-#, fuzzy
-msgid "Location is too long (max 255 chars)."
-msgstr "Re hir eo al lec'hiadur (255 arouezenn d'ar muiañ)."
-
-#: actions/apigroupprofileupdate.php:326
-#, fuzzy, php-format
-msgid "Too many aliases! Maximum %d."
-msgstr "Re a aliasoù ! %d d'ar muiañ."
-
-#. TRANS: Group edit form validation error.
+#. TRANS: API validation exception thrown when alias is the same as nickname.
 #. TRANS: Group create form validation error.
-#. TRANS: %s is the invalid alias.
-#: actions/apigroupprofileupdate.php:342 actions/editgroup.php:241
-#: actions/newgroup.php:188
-#, php-format
-msgid "Invalid alias: \"%s\""
-msgstr "Alias fall : \"%s\""
+#, fuzzy
+msgid "Alias cannot be the same as nickname."
+msgstr "Ne c'hell ket an alias bezañ ar memes hini eget al lesanv."
 
 #. TRANS: Client error displayed when uploading a media file has failed.
-#: actions/apimediaupload.php:101
 msgid "Upload failed."
 msgstr "Enporzhiadenn c'hwitet."
 
 #. TRANS: Client error given from the OAuth API when the request token or verifier is invalid.
-#: actions/apioauthaccesstoken.php:102
 msgid "Invalid request token or verifier."
 msgstr "Jedouer pe gwirier reked direizh."
 
 #. TRANS: Client error given when no oauth_token was passed to the OAuth API.
-#: actions/apioauthauthorize.php:107
 msgid "No oauth_token parameter provided."
 msgstr "Arventenn oauth_token nann-roet."
 
 #. TRANS: Client error given when an invalid request token was passed to the OAuth API.
-#: actions/apioauthauthorize.php:115 actions/apioauthauthorize.php:129
 msgid "Invalid request token."
 msgstr "Jedouer reked direizh."
 
 #. TRANS: Client error given when an invalid request token was passed to the OAuth API.
-#: actions/apioauthauthorize.php:121
 msgid "Request token already authorized."
 msgstr "Aotreet eo bet ar jedouer reked dija."
 
@@ -866,31 +661,14 @@ msgstr "Aotreet eo bet ar jedouer reked dija."
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
 #. TRANS: Client error displayed when the session token is not okay.
-#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:75
-#: actions/emailsettings.php:292 actions/favor.php:75 actions/geocode.php:55
-#: actions/groupblock.php:65 actions/grouplogo.php:321
-#: actions/groupunblock.php:65 actions/imsettings.php:241
-#: actions/invite.php:60 actions/makeadmin.php:66 actions/newmessage.php:135
-#: actions/newnotice.php:105 actions/nudge.php:80
-#: actions/oauthappssettings.php:162 actions/oauthconnectionssettings.php:135
-#: actions/passwordsettings.php:137 actions/pluginenable.php:87
-#: actions/profilesettings.php:218 actions/recoverpassword.php:383
-#: actions/register.php:157 actions/remotesubscribe.php:76
-#: actions/repeat.php:82 actions/smssettings.php:249 actions/subedit.php:40
-#: actions/subscribe.php:87 actions/tagother.php:145
-#: actions/unsubscribe.php:69 actions/urlsettings.php:171
-#: actions/userauthorization.php:53 lib/designsettings.php:122
 msgid "There was a problem with your session token. Try again, please."
 msgstr "Ur gudenn 'zo bet gant ho jedaouer dalc'h. Mar plij adklaskit."
 
 #. TRANS: Form validation error given when an invalid username and/or password was passed to the OAuth API.
-#: actions/apioauthauthorize.php:168
 msgid "Invalid nickname / password!"
 msgstr "Lesanv / ger tremen direizh !"
 
 #. TRANS: Server error displayed when a database action fails.
-#: actions/apioauthauthorize.php:217
 msgid "Database error inserting oauth_token_association."
 msgstr ""
 "Fazi diaz roadennoù p'eo bet ensoc'het ar jedouer kenstrollañ implijer "
@@ -908,28 +686,19 @@ msgstr ""
 #. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
 #. TRANS: Message given submitting a form with an unknown action in SMS settings.
 #. TRANS: Unknown form validation error in design settings form.
-#: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
-#: actions/designadminpanel.php:100 actions/editapplication.php:144
-#: actions/emailsettings.php:311 actions/grouplogo.php:332
-#: actions/imsettings.php:256 actions/newapplication.php:124
-#: actions/oauthconnectionssettings.php:144 actions/recoverpassword.php:46
-#: actions/smssettings.php:270 lib/designsettings.php:133
 msgid "Unexpected form submission."
 msgstr "Kinnig ar furmskrid dic'hortoz."
 
 #. TRANS: Title for a page where a user can confirm/deny account access by an external application.
-#: actions/apioauthauthorize.php:387
 msgid "An application would like to connect to your account"
 msgstr "C'hoant 'zo gant ur poellad kevreañ gant ho kont"
 
 #. TRANS: Fieldset legend.
-#: actions/apioauthauthorize.php:404
 msgid "Allow or deny access"
 msgstr "Aotreañ pe nac'h ar moned"
 
 #. TRANS: User notification of external application requesting account access.
 #. TRANS: %3$s is the access type requested (read-write or read-only), %4$s is the StatusNet sitename.
-#: actions/apioauthauthorize.php:425
 #, php-format
 msgid ""
 "An application would like the ability to <strong>%3$s</strong> your %4$s "
@@ -940,7 +709,6 @@ msgstr ""
 #. TRANS: User notification of external application requesting account access.
 #. TRANS: %1$s is the application name requesting access, %2$s is the organisation behind the application,
 #. TRANS: %3$s is the access type requested, %4$s is the StatusNet sitename.
-#: actions/apioauthauthorize.php:433
 #, php-format
 msgid ""
 "The application <strong>%1$s</strong> by <strong>%2$s</strong> would like "
@@ -949,22 +717,18 @@ msgid ""
 msgstr ""
 
 #. TRANS: Fieldset legend.
-#: actions/apioauthauthorize.php:455
 msgctxt "LEGEND"
 msgid "Account"
 msgstr "Kont"
 
 #. TRANS: Field label on OAuth API authorisation form.
+#. TRANS: Field label on login page.
 #. TRANS: Field label in form for profile settings.
-#: actions/apioauthauthorize.php:459 actions/login.php:225
-#: actions/profilesettings.php:107 actions/register.php:411
-#: actions/userauthorization.php:145 lib/groupeditform.php:145
 msgid "Nickname"
 msgstr "Lesanv"
 
 #. TRANS: Field label on OAuth API authorisation form.
-#: actions/apioauthauthorize.php:463 actions/login.php:228
-#: actions/register.php:415 lib/settingsnav.php:87
+#. TRANS: Field label on login page.
 msgid "Password"
 msgstr "Ger-tremen"
 
@@ -974,43 +738,34 @@ msgstr "Ger-tremen"
 #. TRANS: Button label to cancel an IM address confirmation procedure.
 #. TRANS: Button label to cancel a SMS address confirmation procedure.
 #. TRANS: Button label in the "Edit application" form.
-#: actions/apioauthauthorize.php:478 actions/emailsettings.php:125
-#: actions/imsettings.php:136 actions/smssettings.php:132
-#: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Cancel"
 msgstr "Nullañ"
 
 #. TRANS: Button text that when clicked will allow access to an account by an external application.
-#: actions/apioauthauthorize.php:485
 msgctxt "BUTTON"
 msgid "Allow"
 msgstr "Aotreañ"
 
 #. TRANS: Form instructions.
-#: actions/apioauthauthorize.php:502
 msgid "Authorize access to your account information."
 msgstr "Aotreañ ar moned da ditouroù ho kont."
 
 #. TRANS: Header for user notification after revoking OAuth access to an application.
-#: actions/apioauthauthorize.php:594
 msgid "Authorization canceled."
 msgstr "Nullet eo bet aotre."
 
 #. TRANS: User notification after revoking OAuth access to an application.
 #. TRANS: %s is an OAuth token.
-#: actions/apioauthauthorize.php:598
 #, php-format
 msgid "The request token %s has been revoked."
 msgstr ""
 
 #. TRANS: Title of the page notifying the user that an anonymous client application was successfully authorized to access the user's account with OAuth.
-#: actions/apioauthauthorize.php:621
 msgid "You have successfully authorized the application"
 msgstr "Aotreet ho peus ar poellad."
 
 #. TRANS: Message notifying the user that an anonymous client application was successfully authorized to access the user's account with OAuth.
-#: actions/apioauthauthorize.php:625
 msgid ""
 "Please return to the application and enter the following security code to "
 "complete the process."
@@ -1020,14 +775,12 @@ msgstr ""
 
 #. TRANS: Title of the page notifying the user that the client application was successfully authorized to access the user's account with OAuth.
 #. TRANS: %s is the authorised application name.
-#: actions/apioauthauthorize.php:632
 #, php-format
 msgid "You have successfully authorized %s"
 msgstr "Aotreet ho peus %s"
 
 #. TRANS: Message notifying the user that the client application was successfully authorized to access the user's account with OAuth.
 #. TRANS: %s is the authorised application name.
-#: actions/apioauthauthorize.php:639
 #, php-format
 msgid ""
 "Please return to %s and enter the following security code to complete the "
@@ -1038,12 +791,10 @@ msgstr ""
 
 #. TRANS: Client error displayed trying to delete a status not using POST or DELETE.
 #. TRANS: POST and DELETE should not be translated.
-#: actions/apistatusesdestroy.php:111
 msgid "This method requires a POST or DELETE."
 msgstr "Ezhomm en deus an argerzh-mañ ur POST pe un DELETE."
 
 #. TRANS: Client error displayed trying to delete a status of another user.
-#: actions/apistatusesdestroy.php:136
 msgid "You may not delete another user's status."
 msgstr "Ne c'helloc'h ket dilemel statud un implijer all."
 
@@ -1051,21 +802,16 @@ msgstr "Ne c'helloc'h ket dilemel statud un implijer all."
 #. TRANS: Client error displayed trying to display redents of a non-exiting notice.
 #. TRANS: Client exception thrown when referencing a non-existing notice.
 #. TRANS: Error message displayed trying to delete a non-existing notice.
-#: actions/apistatusesretweet.php:74 actions/apistatusesretweets.php:70
-#: actions/atompubshowfavorite.php:82 actions/deletenotice.php:61
-#: actions/shownotice.php:92
 msgid "No such notice."
 msgstr "N'eus ket eus an ali-se."
 
 #. TRANS: Client error displayed trying to repeat an own notice through the API.
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:549
 msgid "Cannot repeat your own notice."
 msgstr "Ne c'helloc'h ket adlavar ho alioù."
 
 #. TRANS: Client error displayed trying to re-repeat a notice through the API.
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:92 lib/command.php:555
 msgid "Already repeated that notice."
 msgstr "Kemenn bet adkemeret dija."
 
@@ -1075,57 +821,43 @@ msgstr "Kemenn bet adkemeret dija."
 #. TRANS: Client exception thrown when using an unsupported HTTP method.
 #. TRANS: Client error shown when using a non-supported HTTP method.
 #. TRANS: Client exception thrown when using an unsupported HTTP method.
-#: actions/apistatusesshow.php:118 actions/atompubfavoritefeed.php:103
-#: actions/atompubmembershipfeed.php:105 actions/atompubshowfavorite.php:117
-#: actions/atompubshowmembership.php:116
-#: actions/atompubshowsubscription.php:122
-#: actions/atompubsubscriptionfeed.php:109
 msgid "HTTP method not supported."
 msgstr "N'eo ket skoret an hentenn HTTP."
 
 #. TRANS: Exception thrown requesting an unsupported notice output format.
 #. TRANS: %s is the requested output format.
-#: actions/apistatusesshow.php:144
 #, fuzzy, php-format
 msgid "Unsupported format: %s."
 msgstr "Diembreget eo ar furmad : %s"
 
 #. TRANS: Client error displayed requesting a deleted status.
-#: actions/apistatusesshow.php:155
 msgid "Status deleted."
 msgstr "Statud diverket."
 
 #. TRANS: Client error displayed requesting a status with an invalid ID.
-#: actions/apistatusesshow.php:162
 msgid "No status with that ID found."
 msgstr "N'eo ket bet kavet a statud evit an ID-mañ"
 
 #. TRANS: Client error displayed when trying to delete a notice not using the Atom format.
-#: actions/apistatusesshow.php:227
 msgid "Can only delete using the Atom format."
 msgstr "Ne c'hallit dilemel nemet dre implijout ar furmad Atom."
 
 #. TRANS: Client error displayed when a user has no rights to delete notices of other users.
 #. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
-#: actions/apistatusesshow.php:235 actions/deletenotice.php:78
 msgid "Cannot delete this notice."
 msgstr "Dibosupl eo dilemel ar c'hemenn-mañ."
 
 #. TRANS: Confirmation of notice deletion in API. %d is the ID (number) of the deleted notice.
-#: actions/apistatusesshow.php:249
 #, php-format
 msgid "Deleted notice %d"
 msgstr "Kemenn dilamet %d"
 
 #. TRANS: Client error displayed when the parameter "status" is missing.
-#: actions/apistatusesupdate.php:221
 msgid "Client must provide a 'status' parameter with a value."
 msgstr "Ret eo d'an arval pourchas un arventenn « statut » gant un talvoud."
 
 #. TRANS: Client error displayed when the parameter "status" is missing.
 #. TRANS: %d is the maximum number of character for a notice.
-#: actions/apistatusesupdate.php:244 actions/newnotice.php:161
-#: lib/mailhandler.php:60
 #, fuzzy, php-format
 msgid "That's too long. Maximum notice size is %d character."
 msgid_plural "That's too long. Maximum notice size is %d characters."
@@ -1133,14 +865,12 @@ msgstr[0] "Re hir eo ! Ment hirañ an ali a zo a %d arouezenn."
 msgstr[1] "Re hir eo ! Ment hirañ an ali a zo a %d arouezenn."
 
 #. TRANS: Client error displayed when replying to a non-existing notice.
-#: actions/apistatusesupdate.php:284
 #, fuzzy
 msgid "Parent notice not found."
 msgstr "N'eo ket bet kavet an hentenn API !"
 
 #. TRANS: Client error displayed exceeding the maximum notice length.
 #. TRANS: %d is the maximum lenth for a notice.
-#: actions/apistatusesupdate.php:308 actions/newnotice.php:184
 #, php-format
 msgid "Maximum notice size is %d character, including attachment URL."
 msgid_plural "Maximum notice size is %d characters, including attachment URL."
@@ -1149,13 +879,11 @@ msgstr[1] ""
 
 #. TRANS: Client error displayed when requesting profiles of followers in an unsupported format.
 #. TRANS: Client error displayed when requesting IDs of followers in an unsupported format.
-#: actions/apisubscriptions.php:228 actions/apisubscriptions.php:258
 msgid "Unsupported format."
 msgstr "Diembreget eo ar furmad-se."
 
 #. TRANS: Title for timeline of most recent favourite notices by a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname.
-#: actions/apitimelinefavorites.php:108
 #, php-format
 msgid "%1$s / Favorites from %2$s"
 msgstr "%1$s / Pennroll %2$s"
@@ -1163,14 +891,12 @@ msgstr "%1$s / Pennroll %2$s"
 #. TRANS: Subtitle for timeline of most recent favourite notices by a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user's full name,
 #. TRANS: %3$s is a user nickname.
-#: actions/apitimelinefavorites.php:120
 #, php-format
 msgid "%1$s updates favorited by %2$s / %3$s."
 msgstr "%1$s kemennadenn garetañ gant %2$s / %3$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.
-#: actions/apitimelinementions.php:115
 #, php-format
 msgid "%1$s / Updates mentioning %2$s"
 msgstr "%1$s / Hizivadennoù a veneg %2$s"
@@ -1178,49 +904,41 @@ msgstr "%1$s / Hizivadennoù a veneg %2$s"
 #. TRANS: Subtitle for timeline of most recent mentions of a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname,
 #. TRANS: %3$s is a user's full name.
-#: actions/apitimelinementions.php:131
 #, fuzzy, php-format
 msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr "%1$s statud pennroll da %2$s / %2$s."
 
 #. TRANS: Title for site timeline. %s is the StatusNet sitename.
 #. TRANS: Public RSS feed title. %s is the StatusNet site name.
-#: actions/apitimelinepublic.php:193 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "Oberezhioù publik %s"
 
 #. TRANS: Subtitle for site timeline. %s is the StatusNet sitename.
-#: actions/apitimelinepublic.php:199
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "%s statud an holl !"
 
 #. TRANS: Server error displayed calling unimplemented API method for 'retweeted by me'.
-#: actions/apitimelineretweetedbyme.php:71
 #, fuzzy
 msgid "Unimplemented."
 msgstr "N'eo ket bet emplementet showForm()."
 
 #. TRANS: Title for Atom feed "repeated to me". %s is the user nickname.
-#: actions/apitimelineretweetedtome.php:96
 #, php-format
 msgid "Repeated to %s"
 msgstr "Adkemeret evit %s"
 
-#: actions/apitimelineretweetedtome.php:98
 #, fuzzy, php-format
 msgid "%1$s notices that were to repeated to %2$s / %3$s."
 msgstr "%1$s statud pennroll da %2$s / %2$s."
 
 #. TRANS: Title of list of repeated notices of the logged in user.
 #. TRANS: %s is the nickname of the logged in user.
-#: actions/apitimelineretweetsofme.php:98
 #, php-format
 msgid "Repeats of %s"
 msgstr "Adkemeret eus %s"
 
-#: actions/apitimelineretweetsofme.php:104
 #, fuzzy, php-format
 msgid "%1$s notices that %2$s / %3$s has repeated."
 msgstr "Kas din ur postel pa lak unan bennak unan eus va alioù evel pennroll."
@@ -1229,176 +947,143 @@ msgstr "Kas din ur postel pa lak unan bennak unan eus va alioù evel pennroll."
 #. TRANS: %s is the tag.
 #. TRANS: Title for first page of notices with tags.
 #. TRANS: %s is the tag.
-#: actions/apitimelinetag.php:101 actions/tag.php:69
 #, php-format
 msgid "Notices tagged with %s"
 msgstr "Alioù merket gant %s"
 
 #. TRANS: Subtitle for timeline with lastest notices with a given tag.
 #. TRANS: %1$s is the tag, $2$s is the StatusNet sitename.
-#: actions/apitimelinetag.php:105 actions/tagrss.php:65
 #, php-format
 msgid "Updates tagged with %1$s on %2$s!"
 msgstr "Hizivadennoù merket gant %1$s e %2$s !"
 
 #. TRANS: Client error displayed trying to add a notice to another user's timeline.
-#: actions/apitimelineuser.php:308
 msgid "Only the user can add to their own timeline."
 msgstr ""
 "N'eus nemet an implijer a c'hall ouzhpennañ traoù d'e lanvad dezhañ e-unan."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:315
 msgid "Only accept AtomPub for Atom feeds."
 msgstr ""
 
 #. TRANS: Client error displayed attempting to post an empty API notice.
-#: actions/apitimelineuser.php:322
 msgid "Atom post must not be empty."
 msgstr ""
 
 #. TRANS: Client error displayed attempting to post an API that is not well-formed XML.
-#: actions/apitimelineuser.php:328
 msgid "Atom post must be well-formed XML."
 msgstr ""
 
 #. TRANS: Client error displayed when not using an Atom entry.
-#: actions/apitimelineuser.php:334 actions/atompubfavoritefeed.php:228
-#: actions/atompubmembershipfeed.php:230
-#: actions/atompubsubscriptionfeed.php:236
 msgid "Atom post must be an Atom entry."
 msgstr ""
 
 #. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
-#: actions/apitimelineuser.php:345
 msgid "Can only handle POST activities."
 msgstr ""
 
 #. TRANS: Client error displayed when using an unsupported activity object type.
 #. TRANS: %s is the unsupported activity object type.
-#: actions/apitimelineuser.php:356
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
 #. TRANS: %d is the notice ID (number).
-#: actions/apitimelineuser.php:390
 #, php-format
 msgid "No content for notice %d."
 msgstr "N'eus danvez ebet evit ar gemennadenn%d."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
 #. TRANS: %s is the notice URI.
-#: actions/apitimelineuser.php:419
 #, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr ""
 
 #. TRANS: Server error for unfinished API method showTrends.
-#: actions/apitrends.php:85
 msgid "API method under construction."
 msgstr "Hentenn API war sevel."
 
 #. TRANS: Client error displayed when requesting user information for a non-existing user.
-#: actions/apiuserprofileimage.php:80 actions/apiusershow.php:94
 msgid "User not found."
 msgstr "N'eo ket bet kavet an implijer."
 
 #. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
 #. TRANS: Client exception.
 #. TRANS: Client error displayed trying to subscribe to a non-existing profile.
-#: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
-#: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
-#: actions/subscribe.php:110
 msgid "No such profile."
 msgstr "N'eus ket eus ar profil-se."
 
 #. TRANS: Subtitle for Atom favorites feed.
 #. TRANS: %1$s is a user nickname, %2$s is the StatusNet sitename.
-#: actions/atompubfavoritefeed.php:147
 #, fuzzy, php-format
 msgid "Notices %1$s has favorited on %2$s"
 msgstr "Hizivadennoù %1$s ha mignoned e %2$s!"
 
 #. TRANS: Client exception thrown when trying to set a favorite for another user.
 #. TRANS: Client exception thrown when trying to subscribe another user.
-#: actions/atompubfavoritefeed.php:217 actions/atompubsubscriptionfeed.php:225
 msgid "Cannot add someone else's subscription."
 msgstr "Dibosupl eo ouzhpennañ koumanant un den all."
 
 #. TRANS: Client exception thrown when trying use an incorrect activity verb for the Atom pub method.
-#: actions/atompubfavoritefeed.php:240
 #, fuzzy
 msgid "Can only handle favorite activities."
 msgstr "Klask alioù en danvez"
 
 #. TRANS: Client exception thrown when trying favorite an object that is not a notice.
-#: actions/atompubfavoritefeed.php:250 actions/atompubmembershipfeed.php:250
 #, fuzzy
 msgid "Can only fave notices."
 msgstr "Klask alioù en danvez"
 
 #. TRANS: Client exception thrown when trying favorite a notice without content.
-#: actions/atompubfavoritefeed.php:259
 msgid "Unknown note."
 msgstr "Notenn dianav."
 
 #. TRANS: Client exception thrown when trying favorite an already favorited notice.
-#: actions/atompubfavoritefeed.php:267
 msgid "Already a favorite."
 msgstr "Er pennroll dija."
 
 #. TRANS: Title for group membership feed.
 #. TRANS: %s is a username.
-#: actions/atompubmembershipfeed.php:144
 #, fuzzy, php-format
 msgid "%s group memberships"
 msgstr "Izili ar strollad %s"
 
 #. TRANS: Subtitle for group membership feed.
 #. TRANS: %1$s is a username, %2$s is the StatusNet sitename.
-#: actions/atompubmembershipfeed.php:149
 #, fuzzy, php-format
 msgid "Groups %1$s is a member of on %2$s"
 msgstr "Ezel eo %s eus ar strolladoù"
 
 #. TRANS: Client exception thrown when trying subscribe someone else to a group.
-#: actions/atompubmembershipfeed.php:219
 #, fuzzy
 msgid "Cannot add someone else's membership."
 msgstr "Dibosupl eo dilemel ar c'houmanant."
 
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#: actions/atompubmembershipfeed.php:242
 #, fuzzy
 msgid "Can only handle join activities."
 msgstr "Klask alioù en danvez"
 
 #. TRANS: Client exception thrown when trying to subscribe to a non-existing group.
-#: actions/atompubmembershipfeed.php:259
 msgid "Unknown group."
 msgstr "Strollad dianav."
 
 #. TRANS: Client exception thrown when trying to subscribe to an already subscribed group.
-#: actions/atompubmembershipfeed.php:267
 msgid "Already a member."
 msgstr "Ezel eo dija."
 
 #. TRANS: Client exception thrown when trying to subscribe to group while blocked from that group.
-#: actions/atompubmembershipfeed.php:275
 msgid "Blocked by admin."
 msgstr "Stanket gant ar merour."
 
 #. TRANS: Client exception thrown when referencing a non-existing favorite.
-#: actions/atompubshowfavorite.php:90
 #, fuzzy
 msgid "No such favorite."
 msgstr "Restr ezvezant."
 
 #. TRANS: Client exception thrown when trying to remove a favorite notice of another user.
-#: actions/atompubshowfavorite.php:151
 msgid "Cannot delete someone else's favorite."
 msgstr "Diposupl eo dilemel pennroll un den all."
 
@@ -1424,91 +1109,66 @@ msgstr "Diposupl eo dilemel pennroll un den all."
 #. TRANS: Client error displayed when trying to join a non-existing group.
 #. TRANS: Client error displayed when trying to leave a non-local group.
 #. TRANS: Client error displayed when trying to leave a non-existing group.
+#. TRANS: Client error displayed when providing an invalid group ID on the Make Admin page.
 #. 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.
 #. TRANS: Command exception text shown when a group is requested that does not exist.
 #. TRANS: Error text shown when trying to leave a group that does not exist.
-#: actions/atompubshowmembership.php:81 actions/blockedfromgroup.php:81
-#: actions/blockedfromgroup.php:89 actions/deletegroup.php:87
-#: actions/deletegroup.php:100 actions/editgroup.php:102
-#: actions/foafgroup.php:46 actions/foafgroup.php:65 actions/foafgroup.php:73
-#: actions/groupblock.php:89 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:101 actions/grouplogo.php:103
-#: actions/groupmembers.php:84 actions/groupmembers.php:92
-#: actions/grouprss.php:97 actions/grouprss.php:105
-#: actions/groupunblock.php:89 actions/joingroup.php:82
-#: actions/joingroup.php:95 actions/leavegroup.php:82
-#: actions/leavegroup.php:95 actions/makeadmin.php:86
-#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:392
 msgid "No such group."
 msgstr "N'eus ket eus ar strollad-se."
 
 #. TRANS: Client exception thrown when trying to show membership of a non-subscribed group
-#: actions/atompubshowmembership.php:91
 msgid "Not a member."
 msgstr "N'eo ket ezel."
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
-#: actions/atompubshowmembership.php:150
 #, fuzzy
 msgid "Cannot delete someone else's membership."
 msgstr "Dibosupl eo dilemel ar c'houmanant."
 
 #. TRANS: Client exception thrown when trying to display a subscription for a non-existing profile ID.
 #. TRANS: %d is the non-existing profile ID number.
-#: actions/atompubshowsubscription.php:72
-#: actions/atompubshowsubscription.php:83
-#: actions/atompubsubscriptionfeed.php:74
 #, php-format
 msgid "No such profile id: %d."
 msgstr "N'eus ket eus ar profil : %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.
-#: actions/atompubshowsubscription.php:94
 #, php-format
 msgid "Profile %1$d not subscribed to profile %2$d."
 msgstr "Ar profil %1$d n'eo ket koumanantet d'ar profil %2$d."
 
 #. TRANS: Client exception thrown when trying to delete a subscription of another user.
-#: actions/atompubshowsubscription.php:157
 msgid "Cannot delete someone else's subscription."
 msgstr "Dibosupl eo dilemel koumanant un den all."
 
 #. TRANS: Subtitle for Atom subscription feed.
 #. TRANS: %1$s is a user nickname, %s$s is the StatusNet sitename.
-#: actions/atompubsubscriptionfeed.php:153
 #, fuzzy, php-format
 msgid "People %1$s has subscribed to on %2$s"
 msgstr "Koumananterien %s"
 
 #. TRANS: Client error displayed when not using the follow verb.
-#: actions/atompubsubscriptionfeed.php:248
 msgid "Can only handle Follow activities."
 msgstr ""
 
 #. TRANS: Client exception thrown when subscribing to an object that is not a person.
-#: actions/atompubsubscriptionfeed.php:256
 msgid "Can only follow people."
 msgstr ""
 
 #. TRANS: Client exception thrown when subscribing to a non-existing profile.
 #. TRANS: %s is the unknown profile ID.
-#: actions/atompubsubscriptionfeed.php:267
 #, php-format
 msgid "Unknown profile %s."
 msgstr "Profil dianav %s."
 
 #. TRANS: Client error displayed trying to subscribe to an already subscribed profile.
 #. TRANS: %s is the profile the user already has a subscription on.
-#: actions/atompubsubscriptionfeed.php:275
 #, fuzzy, php-format
 msgid "Already subscribed to %s."
 msgstr "Koumanantet dija !"
 
 #. TRANS: Client error displayed trying to get a non-existing attachment.
-#: actions/attachment.php:73
 msgid "No such attachment."
 msgstr "N'eo ket bet kavet ar restr stag."
 
@@ -1520,31 +1180,23 @@ msgstr "N'eo ket bet kavet ar restr stag."
 #. TRANS: Client error displayed when trying to view group members without providing a group nickname.
 #. TRANS: Client error displayed when requesting a group RSS feed without providing a group nickname.
 #. TRANS: Client error displayed if no nickname argument was given requesting a group page.
-#: actions/avatarbynickname.php:60 actions/blockedfromgroup.php:73
-#: actions/editgroup.php:85 actions/groupdesignsettings.php:84
-#: actions/grouplogo.php:86 actions/groupmembers.php:76
-#: actions/grouprss.php:89 actions/showgroup.php:116
 msgid "No nickname."
 msgstr "Lesanv ebet."
 
 #. TRANS: Client error displayed trying to get an avatar without providing an avatar size.
-#: actions/avatarbynickname.php:66
 msgid "No size."
 msgstr "Ment ebet."
 
 #. TRANS: Client error displayed trying to get an avatar providing an invalid avatar size.
-#: actions/avatarbynickname.php:72
 msgid "Invalid size."
 msgstr "Ment direizh."
 
 #. TRANS: Title for avatar upload page.
-#: actions/avatarsettings.php:66 lib/settingsnav.php:82
 msgid "Avatar"
 msgstr "Avatar"
 
 #. TRANS: Instruction for avatar upload page.
 #. TRANS: %s is the maximum file size, for example "500b", "10kB" or "2MB".
-#: actions/avatarsettings.php:78
 #, php-format
 msgid "You can upload your personal avatar. The maximum file size is %s."
 msgstr ""
@@ -1554,17 +1206,12 @@ msgstr ""
 #. TRANS: Server error displayed coming across a request from a user without a profile.
 #. TRANS: Server error displayed when trying to authorise a remote subscription request
 #. TRANS: while the user has no profile.
-#: actions/avatarsettings.php:108 actions/avatarsettings.php:192
-#: actions/grouplogo.php:184 actions/remotesubscribe.php:190
-#: actions/userauthorization.php:75 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr "Implijer hep profil klotus."
 
 #. TRANS: Avatar upload page form legend.
 #. TRANS: Avatar upload page crop form legend.
 #. TRANS: Legend for group logo settings fieldset.
-#: actions/avatarsettings.php:122 actions/avatarsettings.php:205
-#: actions/grouplogo.php:261
 msgid "Avatar settings"
 msgstr "Arventennoù an avatar"
 
@@ -1572,8 +1219,6 @@ msgstr "Arventennoù an avatar"
 #. TRANS: Header on avatar upload crop form for thumbnail of originally uploaded avatar (h2).
 #. TRANS: Uploaded original file in group logo form.
 #. TRANS: Header for originally uploaded file before a crop on the group logo page.
-#: actions/avatarsettings.php:131 actions/avatarsettings.php:214
-#: actions/grouplogo.php:207 actions/grouplogo.php:270
 msgid "Original"
 msgstr "Orin"
 
@@ -1581,81 +1226,66 @@ msgstr "Orin"
 #. TRANS: Header on avatar upload crop form for thumbnail of to be used rendition of uploaded avatar (h2).
 #. TRANS: Header for preview of to be displayed group logo.
 #. TRANS: Header for the cropped group logo on the group logo page.
-#: actions/avatarsettings.php:147 actions/avatarsettings.php:227
-#: actions/grouplogo.php:219 actions/grouplogo.php:283
 msgid "Preview"
 msgstr "Rakwelet"
 
 #. TRANS: Button on avatar upload page to delete current avatar.
 #. TRANS: Button text for user account deletion.
-#: actions/avatarsettings.php:155 actions/deleteaccount.php:319
 msgctxt "BUTTON"
 msgid "Delete"
 msgstr "Dilemel"
 
 #. TRANS: Button on avatar upload page to upload an avatar.
 #. TRANS: Submit button to confirm upload of a user backup file for account restore.
-#: actions/avatarsettings.php:173 actions/restoreaccount.php:369
 msgctxt "BUTTON"
 msgid "Upload"
 msgstr "Enporzhiañ"
 
 #. TRANS: Button on avatar upload crop form to confirm a selected crop as avatar.
-#: actions/avatarsettings.php:243
 msgctxt "BUTTON"
 msgid "Crop"
 msgstr "Adframmañ"
 
 #. TRANS: Validation error on avatar upload form when no file was uploaded.
-#: actions/avatarsettings.php:318
 msgid "No file uploaded."
 msgstr "N'eus bet enporzhiet restr ebet."
 
 #. TRANS: Avatar upload form instruction after uploading a file.
-#: actions/avatarsettings.php:345
 #, fuzzy
 msgid "Pick a square area of the image to be your avatar."
 msgstr "Diuzit ur zonenn gant ur stumm karrez evit tremeniñ ho avatar"
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
 #. TRANS: Server error displayed trying to crop an uploaded group logo that is no longer present.
-#: actions/avatarsettings.php:360 actions/grouplogo.php:391
 msgid "Lost our file data."
 msgstr "Kollet eo bet roadennoù."
 
 #. TRANS: Success message for having updated a user avatar.
-#: actions/avatarsettings.php:384
 msgid "Avatar updated."
 msgstr "Hizivaet eo bet an avatar."
 
 #. TRANS: Error displayed on the avatar upload page if the avatar could not be updated for an unknown reason.
-#: actions/avatarsettings.php:388
 msgid "Failed updating avatar."
 msgstr "Ur gudenn 'zo bet e-pad hizivadenn an avatar."
 
 #. TRANS: Success message for deleting a user avatar.
-#: actions/avatarsettings.php:412
 msgid "Avatar deleted."
 msgstr "Dilammet eo bet an Avatar."
 
 #. TRANS: Title for backup account page.
 #. TRANS: Option in profile settings to create a backup of the account of the currently logged in user.
-#: actions/backupaccount.php:61 actions/profilesettings.php:468
 msgid "Backup account"
 msgstr "Saveteiñ ar gont"
 
 #. TRANS: Client exception thrown when trying to backup an account while not logged in.
-#: actions/backupaccount.php:79
 msgid "Only logged-in users can backup their account."
 msgstr "N'eus nemet an implijerien kevreet hag a c'hell saveteiñ o c'hont."
 
 #. TRANS: Client exception thrown when trying to backup an account without having backup rights.
-#: actions/backupaccount.php:84
 msgid "You may not backup your account."
 msgstr "Ne c'hallit ket saveteiñ ho kont."
 
 #. TRANS: Information displayed on the backup account page.
-#: actions/backupaccount.php:227
 msgid ""
 "You can backup your account data in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format. This is an experimental feature and provides "
@@ -1665,31 +1295,26 @@ msgid ""
 msgstr ""
 
 #. TRANS: Submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:250
 msgctxt "BUTTON"
 msgid "Backup"
 msgstr "Eilenn savete"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:254
 #, fuzzy
 msgid "Backup your account."
 msgstr "Saveteiñ ho kont"
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
-#: actions/block.php:68
 msgid "You already blocked that user."
 msgstr "Stanket ho peus dija an implijer-mañ."
 
 #. TRANS: Title for block user page.
 #. TRANS: Legend for block user form.
 #. TRANS: Fieldset legend for block user from group form.
-#: actions/block.php:106 actions/block.php:136 actions/groupblock.php:165
 msgid "Block user"
 msgstr "Stankañ an implijer-mañ"
 
 #. TRANS: Explanation of consequences when blocking a user on the block user page.
-#: actions/block.php:139
 msgid ""
 "Are you sure you want to block this user? Afterwards, they will be "
 "unsubscribed from you, unable to subscribe to you in the future, and you "
@@ -1702,15 +1327,11 @@ msgstr ""
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:154 actions/deleteapplication.php:157
-#: actions/deletegroup.php:220 actions/deletenotice.php:155
-#: actions/deleteuser.php:154 actions/groupblock.php:187
 msgctxt "BUTTON"
 msgid "No"
 msgstr "Ket"
 
 #. TRANS: Submit button title for 'No' when blocking a user.
-#: actions/block.php:158
 #, fuzzy
 msgid "Do not block this user."
 msgstr "Arabat stankañ an implijer-mañ"
@@ -1721,176 +1342,140 @@ msgstr "Arabat stankañ an implijer-mañ"
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:161 actions/deleteapplication.php:164
-#: actions/deletegroup.php:227 actions/deletenotice.php:162
-#: actions/deleteuser.php:161 actions/groupblock.php:194
 msgctxt "BUTTON"
 msgid "Yes"
 msgstr "Ya"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:165
 #, fuzzy
 msgid "Block this user."
 msgstr "Stankañ an implijer-mañ"
 
 #. TRANS: Server error displayed when blocking a user fails.
-#: actions/block.php:189
 msgid "Failed to save block information."
 msgstr "Dibosupl eo enrollañ an titouroù stankañ."
 
 #. TRANS: Title for first page with list of users blocked from a group.
 #. TRANS: %s is a group nickname.
-#: actions/blockedfromgroup.php:101
 #, php-format
 msgid "%s blocked profiles"
 msgstr "%s profil stanket"
 
 #. TRANS: Title for any but the first page with list of users blocked from a group.
 #. TRANS: %1$s is a group nickname, %2$d is a page number.
-#: actions/blockedfromgroup.php:106
 #, php-format
 msgid "%1$s blocked profiles, page %2$d"
 msgstr "%1$s profil stanket, pajenn %2$d"
 
 #. TRANS: Instructions for list of users blocked from a group.
-#: actions/blockedfromgroup.php:122
 msgid "A list of the users blocked from joining this group."
 msgstr ""
 "Ur roll eus an implijerien evit pere eo stanket an enskrivadur d'ar strollad."
 
 #. TRANS: Form legend for unblocking a user from a group.
-#: actions/blockedfromgroup.php:291
 msgid "Unblock user from group"
 msgstr "Distankañ implijer ar strollad"
 
 #. TRANS: Button text for unblocking a user from a group.
-#: actions/blockedfromgroup.php:323
 msgctxt "BUTTON"
 msgid "Unblock"
 msgstr "Distankañ"
 
 #. TRANS: Tooltip for button for unblocking a user from a group.
 #. TRANS: Description of the form to unblock a user.
-#: actions/blockedfromgroup.php:327 lib/unblockform.php:78
 msgid "Unblock this user"
 msgstr "Distankañ an implijer-mañ"
 
 #. TRANS: Title for mini-posting window loaded from bookmarklet.
 #. TRANS: %s is the StatusNet site name.
-#: actions/bookmarklet.php:51
 #, php-format
 msgid "Post to %s"
 msgstr "Postañ war %s"
 
 #. TRANS: Client error displayed when not providing a confirmation code in the contact address confirmation action.
-#: actions/confirmaddress.php:74
 msgid "No confirmation code."
 msgstr "Kod kadarnaat ebet."
 
 #. TRANS: Client error displayed when providing a non-existing confirmation code in the contact address confirmation action.
-#: actions/confirmaddress.php:80
 msgid "Confirmation code not found."
 msgstr "N'eo ket bet kavet ar c'hod kadarnaat."
 
 #. TRANS: Client error displayed when not providing a confirmation code for another user in the contact address confirmation action.
-#: actions/confirmaddress.php:86
 msgid "That confirmation code is not for you!"
 msgstr "N'eo ket ar c'hod-se evidoc'h !"
 
 #. TRANS: Server error for an unknown address type, which can be 'email', 'sms', or the name of an IM network (such as 'xmpp' or 'aim')
-#: actions/confirmaddress.php:94
-#, fuzzy, php-format
+#, php-format
 msgid "Unrecognized address type %s"
-msgstr "Doare chomlec'h dianav %s."
+msgstr "N'eo ket bet anavezet seurt ar chomlec'h %s"
 
 #. TRANS: Client error for an already confirmed email/jabber/sms address.
-#: actions/confirmaddress.php:103 actions/confirmaddress.php:136
 msgid "That address has already been confirmed."
 msgstr "Kadarnaet eo bet dija ar chomlec'h-mañ."
 
-#: actions/confirmaddress.php:121 actions/imsettings.php:444
-#: actions/userdesignsettings.php:306
-#, fuzzy
 msgid "Couldn't update user."
-msgstr "Dibosupl hizivaat an implijer."
+msgstr "Dibosupl eo hizivaat an implijer."
 
-#: actions/confirmaddress.php:144
 #, fuzzy
 msgid "Couldn't update user im preferences."
 msgstr "Dibosupl hizivaat teuliad an implijer."
 
-#: actions/confirmaddress.php:156
 #, fuzzy
 msgid "Couldn't insert user im preferences."
 msgstr "Dibosupl eo dilemel ar c'houmanant."
 
 #. TRANS: Server error displayed when an address confirmation code deletion from the
 #. TRANS: database fails in the contact address confirmation action.
-#: actions/confirmaddress.php:169
 msgid "Could not delete address confirmation."
 msgstr "Dibosupl dilemel ar gadarnadenn chomlec'h."
 
 #. TRANS: Title for the contact address confirmation action.
-#: actions/confirmaddress.php:185
 msgid "Confirm address"
 msgstr "Chomlec'h kadarnaet"
 
 #. TRANS: Success message for the contact address confirmation action.
 #. TRANS: %s can be 'email', 'jabber', or 'sms'.
-#: actions/confirmaddress.php:200
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "Kadarnaet eo bet ar chomlec'h \"%s\" evit ho kont."
 
 #. TRANS: Title for page with a conversion (multiple notices in context).
-#: actions/conversation.php:96
 msgid "Conversation"
 msgstr "Kaozeadenn"
 
 #. TRANS: Header on conversation page. Hidden by default (h2).
 #. TRANS: Label for user statistics.
-#: actions/conversation.php:149 lib/noticelist.php:87
-#: lib/profileaction.php:246 lib/searchgroupnav.php:82
-#: lib/threadednoticelist.php:66
 msgid "Notices"
 msgstr "Ali"
 
 #. TRANS: Client exception displayed trying to delete a user account while not logged in.
-#: actions/deleteaccount.php:71
 msgid "Only logged-in users can delete their account."
 msgstr "N'eus nemet an implijerien kevreet a c'hell dilemel o c'hont."
 
 #. TRANS: Client exception displayed trying to delete a user account without have the rights to do that.
-#: actions/deleteaccount.php:77
 msgid "You cannot delete your account."
 msgstr "N'hallit ket dilemel ho kont."
 
 #. TRANS: Confirmation text for user deletion. The user has to type this exactly the same, including punctuation.
-#: actions/deleteaccount.php:160 actions/deleteaccount.php:297
 msgid "I am sure."
 msgstr "Sur on."
 
 #. TRANS: Notification for user about the text that must be input to be able to delete a user account.
 #. TRANS: %s is the text that needs to be input.
-#: actions/deleteaccount.php:164
 #, fuzzy, php-format
 msgid "You must write \"%s\" exactly in the box."
 msgstr "Ret eo deoc'h skrivañ \"%s\" dres er voest."
 
 #. TRANS: Confirmation that a user account has been deleted.
-#: actions/deleteaccount.php:206
 msgid "Account deleted."
 msgstr "Dilamet eo bet ar gont."
 
 #. TRANS: Page title for page on which a user account can be deleted.
 #. TRANS: Option in profile settings to delete the account of the currently logged in user.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:476
 msgid "Delete account"
 msgstr "Dilemel ar gont"
 
 #. TRANS: Form text for user deletion form.
-#: actions/deleteaccount.php:279
 msgid ""
 "This will <strong>permanently delete</strong> your account data from this "
 "server."
@@ -1898,7 +1483,6 @@ msgstr ""
 
 #. TRANS: Additional form text for user deletion form shown if a user has account backup rights.
 #. TRANS: %s is a URL to the backup page.
-#: actions/deleteaccount.php:285
 #, php-format
 msgid ""
 "You are strongly advised to <a href=\"%s\">back up your data</a> before "
@@ -1907,55 +1491,42 @@ msgstr ""
 
 #. TRANS: Field label for delete account confirmation entry.
 #. TRANS: Field label for password reset form where the password has to be typed again.
-#: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:262 actions/register.php:419
 msgid "Confirm"
 msgstr "Kadarnaat"
 
 #. TRANS: Input title for the delete account field.
 #. TRANS: %s is the text that needs to be input.
-#: actions/deleteaccount.php:304
 #, php-format
 msgid "Enter \"%s\" to confirm that you want to delete your account."
 msgstr "Ebarzhit \"%s\" evit kadarnaat e fell deoc'h dilemel ho kont."
 
 #. TRANS: Button title for user account deletion.
-#: actions/deleteaccount.php:323
 msgid "Permanently delete your account"
 msgstr "Dilemel ho kont da vat"
 
 #. TRANS: Client error displayed trying to delete an application while not logged in.
-#: actions/deleteapplication.php:62
 msgid "You must be logged in to delete an application."
 msgstr "Rankout a reoc'h bezañ kevreet evit dilemel ur poellad."
 
 #. TRANS: Client error displayed trying to delete an application that does not exist.
-#: actions/deleteapplication.php:71
 msgid "Application not found."
 msgstr "N'eo ket bet kavet ar poellad"
 
 #. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
-#: actions/deleteapplication.php:79 actions/editapplication.php:78
-#: actions/showapplication.php:90
 msgid "You are not the owner of this application."
 msgstr "N'oc'h ket perc'henn ar poellad-se."
 
 #. TRANS: Client error text when there is a problem with the session token.
-#: actions/deleteapplication.php:102 actions/editapplication.php:131
-#: actions/newapplication.php:112 actions/showapplication.php:113
-#: lib/action.php:1391
 msgid "There was a problem with your session token."
 msgstr "Ur gudenn 'zo bet gant ho jedaouer dalc'h."
 
 #. TRANS: Title for delete application page.
 #. TRANS: Fieldset legend on delete application page.
-#: actions/deleteapplication.php:124 actions/deleteapplication.php:149
 msgid "Delete application"
 msgstr "Dilemel ar poelad"
 
 #. TRANS: Confirmation text on delete application page.
-#: actions/deleteapplication.php:152
 msgid ""
 "Are you sure you want to delete this application? This will clear all data "
 "about the application from the database, including all existing user "
@@ -1963,57 +1534,47 @@ msgid ""
 msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting an application.
-#: actions/deleteapplication.php:161
 #, fuzzy
 msgid "Do not delete this application."
 msgstr "Arabat eo dilemel ar poellad-mañ"
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
-#: actions/deleteapplication.php:167
 #, fuzzy
 msgid "Delete this application."
 msgstr "Dilemel ar poelad-se"
 
 #. TRANS: Client error when trying to delete group while not logged in.
-#: actions/deletegroup.php:64
 msgid "You must be logged in to delete a group."
 msgstr "Ret eo deoc'h bezañ kevreet evit dilemel ur strollad."
 
 #. TRANS: Client error when trying to delete a group without providing a nickname or ID for the group.
 #. TRANS: Client error displayed when trying to join a group without providing a group name or group ID.
 #. TRANS: Client error displayed when trying to leave a group without providing a group name or group ID.
-#: actions/deletegroup.php:94 actions/joingroup.php:89
-#: actions/leavegroup.php:89
 msgid "No nickname or ID."
 msgstr "Lesanv pe ID ebet."
 
 #. TRANS: Client error when trying to delete a group without having the rights to delete it.
-#: actions/deletegroup.php:107
 msgid "You are not allowed to delete this group."
 msgstr "N'oc'h ket aotreet da zilemel ar gont-mañ."
 
 #. TRANS: Server error displayed if a group could not be deleted.
 #. TRANS: %s is the name of the group that could not be deleted.
-#: actions/deletegroup.php:150
 #, php-format
 msgid "Could not delete group %s."
 msgstr "Dibosubl eo dilemel ar strollad %s."
 
 #. TRANS: Message given after deleting a group.
 #. TRANS: %s is the deleted group's name.
-#: actions/deletegroup.php:159
 #, fuzzy, php-format
 msgid "Deleted group %s"
 msgstr "%1$s en deus kuitaet ar strollad %2$s"
 
 #. TRANS: Title of delete group page.
 #. TRANS: Form legend for deleting a group.
-#: actions/deletegroup.php:176 actions/deletegroup.php:202
 msgid "Delete group"
 msgstr "Dilemel ar strollad"
 
 #. TRANS: Warning in form for deleleting a group.
-#: actions/deletegroup.php:206
 msgid ""
 "Are you sure you want to delete this group? This will clear all data about "
 "the group from the database, without a backup. Public posts to this group "
@@ -2021,13 +1582,11 @@ msgid ""
 msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting a group.
-#: actions/deletegroup.php:224
 #, fuzzy
 msgid "Do not delete this group."
 msgstr "Arabat dilemel ar strollad-mañ"
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
-#: actions/deletegroup.php:231
 #, fuzzy
 msgid "Delete this group."
 msgstr "Dilemel ar strollad-mañ"
@@ -2038,22 +1597,18 @@ msgstr "Dilemel ar strollad-mañ"
 #. TRANS: Client error displayed trying to block a user from a group while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying to log out when not logged in.
+#. TRANS: Client error displayed when trying to access the "make admin" page while not logged in.
+#. TRANS: Client error displayed trying to create a new direct message while not logged in.
+#. TRANS: Client error displayed trying to send a notice while not logged in.
+#. TRANS: Client error displayed trying to nudge a user without being logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
 #. TRANS: Client error displayed when trying to change user options while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
-#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:70
-#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
-#: actions/nudge.php:63 actions/pluginenable.php:97 actions/subedit.php:33
-#: actions/subscribe.php:98 actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:71 lib/profileformaction.php:63
-#: lib/settingsaction.php:72
 msgid "Not logged in."
 msgstr "Nann-kevreet."
 
 #. TRANS: Instructions for deleting a notice.
-#: actions/deletenotice.php:110
 msgid ""
 "You are about to permanently delete a notice. Once this is done, it cannot "
 "be undone."
@@ -2061,149 +1616,121 @@ msgstr ""
 
 #. TRANS: Page title when deleting a notice.
 #. TRANS: Fieldset legend for the delete notice form.
-#: actions/deletenotice.php:117 actions/deletenotice.php:148
 msgid "Delete notice"
 msgstr "Dilemel un ali"
 
 #. TRANS: Message for the delete notice form.
-#: actions/deletenotice.php:152
 msgid "Are you sure you want to delete this notice?"
 msgstr "Ha sur oc'h hoc'h eus c'hoant da zilemel ar c'hemenn-mañ ?"
 
 #. TRANS: Submit button title for 'No' when deleting a notice.
-#: actions/deletenotice.php:159
 #, fuzzy
 msgid "Do not delete this notice."
 msgstr "Arabat dilemel ar c'hemenn-mañ"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:166
 #, fuzzy
 msgid "Delete this notice."
 msgstr "Dilemel ar c'hemenn-mañ"
 
 #. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
-#: actions/deleteuser.php:66
 msgid "You cannot delete users."
 msgstr "N'hallit ket diverkañ implijerien."
 
 #. TRANS: Client error displayed when trying to delete a non-local user.
-#: actions/deleteuser.php:74
 msgid "You can only delete local users."
 msgstr "Ne c'helloc'h nemet dilemel an implijerien lec'hel."
 
 #. TRANS: Title of delete user page.
-#: actions/deleteuser.php:110
 msgctxt "TITLE"
 msgid "Delete user"
 msgstr "Dilemel an implijer"
 
 #. TRANS: Fieldset legend on delete user page.
-#: actions/deleteuser.php:134
 msgid "Delete user"
 msgstr "Diverkañ an implijer"
 
 #. TRANS: Information text to request if a user is certain that the described action has to be performed.
-#: actions/deleteuser.php:138
 msgid ""
 "Are you sure you want to delete this user? This will clear all data about "
 "the user from the database, without a backup."
 msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/deleteuser.php:158
 #, fuzzy
 msgid "Do not delete this user."
 msgstr "Arabat dilemel an implijer-mañ"
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
-#: actions/deleteuser.php:165
 #, fuzzy
 msgid "Delete this user."
 msgstr "Diverkañ an implijer-mañ"
 
 #. TRANS: Message used as title for design settings for the site.
-#: actions/designadminpanel.php:60 lib/settingsnav.php:97
 msgid "Design"
 msgstr "Design"
 
 #. TRANS: Instructions for design adminsitration panel.
-#: actions/designadminpanel.php:71
 msgid "Design settings for this StatusNet site"
 msgstr ""
 
 #. TRANS: Client error displayed when a logo URL does is not valid.
-#: actions/designadminpanel.php:327
 msgid "Invalid logo URL."
 msgstr "URL fall evit al logo."
 
 #. TRANS: Client error displayed when an SSL logo URL is invalid.
-#: actions/designadminpanel.php:333
 msgid "Invalid SSL logo URL."
 msgstr "Chomlec'h URL fall evit al logo SSL."
 
 #. TRANS: Client error displayed when a theme is submitted through the form that is not in the theme list.
 #. TRANS: %s is the chosen unavailable theme.
-#: actions/designadminpanel.php:339
 #, php-format
 msgid "Theme not available: %s."
 msgstr "N'eus ket eus ar gaoz-se : %s."
 
 #. TRANS: Fieldset legend for form to change logo.
-#: actions/designadminpanel.php:437
 msgid "Change logo"
 msgstr "Cheñch al logo"
 
 #. TRANS: Field label for StatusNet site logo.
-#: actions/designadminpanel.php:444
 msgid "Site logo"
 msgstr "Logo al lec'hienn"
 
 #. TRANS: Field label for SSL StatusNet site logo.
-#: actions/designadminpanel.php:452
 msgid "SSL logo"
 msgstr "Logo SSL"
 
 #. TRANS: Fieldset legend for form change StatusNet site's theme.
-#: actions/designadminpanel.php:467
 msgid "Change theme"
 msgstr "Lakaat un dodenn all"
 
 #. TRANS: Field label for dropdown to choose site theme.
-#: actions/designadminpanel.php:485
 msgid "Site theme"
 msgstr "Dodenn al lec'hienn"
 
 #. TRANS: Title for field label for dropdown to choose site theme.
-#: actions/designadminpanel.php:487
 msgid "Theme for the site."
 msgstr "Dodenn evit al lec'hienn."
 
 #. TRANS: Field label for uploading a cutom theme.
-#: actions/designadminpanel.php:494
 msgid "Custom theme"
 msgstr "Dodenn personelaet"
 
 #. TRANS: Form instructions for uploading a cutom StatusNet theme.
-#: actions/designadminpanel.php:499
 msgid "You can upload a custom StatusNet theme as a .ZIP archive."
 msgstr ""
 
 #. TRANS: Fieldset legend for theme background image.
-#: actions/designadminpanel.php:515
 msgid "Change background image"
 msgstr "Kemmañ ar skeudenn foñs"
 
 #. TRANS: Field label for background image on theme designer page.
 #. TRANS: Field label for background color selector.
 #. TRANS: Label on profile design page for setting a profile page background colour.
-#: actions/designadminpanel.php:525 actions/designadminpanel.php:609
-#: lib/designform.php:238
 msgid "Background"
 msgstr "Background"
 
 #. TRANS: Form guide for background image upload form on theme designer page.
-#: actions/designadminpanel.php:531
 #, php-format
 msgid ""
 "You can upload a background image for the site. The maximum file size is %1"
@@ -2211,204 +1738,169 @@ msgid ""
 msgstr ""
 
 #. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:558
 msgid "On"
 msgstr "Gweredekaet"
 
 #. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:575
 msgid "Off"
 msgstr "Diweredekaet"
 
 #. TRANS: Form guide for turning background image on or off on theme designer page.
 #. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
 #. TRANS: use of the uploaded profile image.
-#: actions/designadminpanel.php:577 lib/designform.php:214
 msgid "Turn background image on or off."
 msgstr "Gweredekaat pe diweredekaat ar skeudenn foñs."
 
 #. TRANS: Checkbox label to title background image on theme designer page.
 #. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-#: actions/designadminpanel.php:583 lib/designform.php:220
 msgid "Tile background image"
 msgstr "Adober gant ar skeudenn drekleur"
 
 #. TRANS: Fieldset legend for theme colors.
-#: actions/designadminpanel.php:598
 #, fuzzy
 msgid "Change colors"
 msgstr "Kemmañ al livioù"
 
 #. TRANS: Field label for content color selector.
 #. TRANS: Label on profile design page for setting a profile page content colour.
-#: actions/designadminpanel.php:623 lib/designform.php:252
 msgid "Content"
 msgstr "Endalc'h"
 
 #. TRANS: Field label for sidebar color selector.
 #. TRANS: Label on profile design page for setting a profile page sidebar colour.
-#: actions/designadminpanel.php:637 lib/designform.php:266
 msgid "Sidebar"
 msgstr "Barenn kostez"
 
 #. TRANS: Field label for text color selector.
 #. TRANS: Label on profile design page for setting a profile page text colour.
-#: actions/designadminpanel.php:651 lib/designform.php:280
 msgid "Text"
 msgstr "Testenn"
 
 #. TRANS: Field label for link color selector.
 #. TRANS: Label on profile design page for setting a profile page links colour.
-#: actions/designadminpanel.php:665 lib/designform.php:294
 msgid "Links"
 msgstr "Liammoù"
 
 #. TRANS: Fieldset legend for advanced theme design settings.
-#: actions/designadminpanel.php:691
 msgid "Advanced"
 msgstr "Araokaet"
 
 #. TRANS: Field label for custom CSS.
-#: actions/designadminpanel.php:696
 msgid "Custom CSS"
 msgstr "CSS personelaet"
 
 #. TRANS: Button text for resetting theme settings.
-#: actions/designadminpanel.php:718
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Use defaults"
 msgstr "Implijout an talvoudoù dre ziouer"
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:720
 #, fuzzy
 msgid "Restore default designs."
 msgstr "Adlakaat an neuz dre ziouer."
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:728
 #, fuzzy
 msgid "Reset back to default."
 msgstr "Adlakaat an arventennoù dre ziouer"
 
 #. TRANS: Title for button for saving theme settings.
-#: actions/designadminpanel.php:736
 #, fuzzy
 msgid "Save design."
 msgstr "Enrollañ an design"
 
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
-#: actions/disfavor.php:83
 msgid "This notice is not a favorite!"
 msgstr "N'eo ket ar c'hemenn-mañ ur pennroll !"
 
 #. TRANS: Title for page on which favorites can be added.
-#: actions/disfavor.php:98
 msgid "Add to favorites"
 msgstr "Ouzhpennañ d'ar pennrolloù"
 
 #. TRANS: Client exception thrown when requesting a document from the documentation that does not exist.
 #. TRANS: %s is the non-existing document.
-#: actions/doc.php:155
 #, fuzzy, php-format
 msgid "No such document \"%s\"."
 msgstr "N'eo ket bet kavet ar restr \"%s\""
 
 #. TRANS: Title for "Edit application" form.
 #. TRANS: Form legend.
-#: actions/editapplication.php:54 lib/applicationeditform.php:129
 msgid "Edit application"
 msgstr "Kemmañ an arload"
 
 #. TRANS: Client error displayed trying to edit an application while not logged in.
-#: actions/editapplication.php:66
 msgid "You must be logged in to edit an application."
 msgstr "Ret eo bezañ kevreet evit kemmañ ur poellad."
 
 #. TRANS: Client error displayed trying to edit an application that does not exist.
-#: actions/editapplication.php:83 actions/showapplication.php:83
 msgid "No such application."
 msgstr "N'eus ket eus an arload-mañ."
 
 #. TRANS: Instructions for "Edit application" form.
-#: actions/editapplication.php:167
 msgid "Use this form to edit your application."
 msgstr "Implijit ar furmskrid-mañ evit kemmañ ho poellad."
 
 #. TRANS: Validation error shown when not providing a name in the "Edit application" form.
 #. TRANS: Validation error shown when not providing a name in the "New application" form.
-#: actions/editapplication.php:184 actions/newapplication.php:164
 msgid "Name is required."
 msgstr "Ret eo lakaat un anv."
 
 #. TRANS: Validation error shown when providing too long a name in the "Edit application" form.
 #. TRANS: Validation error shown when providing too long a name in the "New application" form.
-#: actions/editapplication.php:188 actions/newapplication.php:172
 #, fuzzy
 msgid "Name is too long (maximum 255 characters)."
 msgstr "Re hir eo an anv (255 arouezenn d'ar muiañ)."
 
 #. TRANS: Validation error shown when providing a name for an application that already exists in the "Edit application" form.
 #. TRANS: Validation error shown when providing a name for an application that already exists in the "New application" form.
-#: actions/editapplication.php:192 actions/newapplication.php:168
 msgid "Name already in use. Try another one."
 msgstr "Implijet eo dija an anv-mañ. Klaskit unan all."
 
 #. TRANS: Validation error shown when not providing a description in the "Edit application" form.
 #. TRANS: Validation error shown when not providing a description in the "New application" form.
-#: actions/editapplication.php:196 actions/newapplication.php:176
 msgid "Description is required."
 msgstr "Ezhomm 'zo un deskrivadur."
 
 #. TRANS: Validation error shown when providing too long a source URL in the "Edit application" form.
-#: actions/editapplication.php:209
 msgid "Source URL is too long."
 msgstr "Mammenn URL re hir."
 
 #. TRANS: Validation error shown when providing an invalid source URL in the "Edit application" form.
 #. TRANS: Validation error shown when providing an invalid source URL in the "New application" form.
-#: actions/editapplication.php:216 actions/newapplication.php:199
 msgid "Source URL is not valid."
 msgstr "N'eo ket mat an URL mammenn."
 
 #. 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.
-#: actions/editapplication.php:220 actions/newapplication.php:203
 msgid "Organization is required."
 msgstr "Ezhomm 'zo eus an aozadur."
 
 #. TRANS: Validation error shown when providing too long an arganisation name in the "Edit application" form.
-#: actions/editapplication.php:224 actions/newapplication.php:207
 #, fuzzy
 msgid "Organization is too long (maximum 255 characters)."
 msgstr "Re hir eo an aozadur (255 arouezenn d'ar muiañ)."
 
 #. TRANS: Form validation error show when an organisation name has not been provided in the edit application form.
 #. TRANS: Form validation error show when an organisation name has not been provided in the new application form.
-#: actions/editapplication.php:228 actions/newapplication.php:211
 msgid "Organization homepage is required."
 msgstr "Ret eo kaout pajenn degemer an aozadur."
 
 #. TRANS: Validation error shown when providing too long a callback URL in the "Edit application" form.
 #. TRANS: Validation error shown when providing too long a callback URL in the "New application" form.
-#: actions/editapplication.php:239 actions/newapplication.php:225
 msgid "Callback is too long."
 msgstr "Rez hir eo ar c'hounadur (Callback)."
 
 #. TRANS: Validation error shown when providing an invalid callback URL in the "Edit application" form.
 #. TRANS: Validation error shown when providing an invalid callback URL in the "New application" form.
-#: actions/editapplication.php:247 actions/newapplication.php:235
 msgid "Callback URL is not valid."
 msgstr "N'eo ket mat an URL kounadur (Callback)."
 
 #. TRANS: Server error occuring when an application could not be updated from the "Edit application" form.
-#: actions/editapplication.php:284
 msgid "Could not update application."
 msgstr "Dibosupl eo hizivaat ar poellad"
 
 #. TRANS: Title for form to edit a group. %s is a group nickname.
-#: actions/editgroup.php:55
 #, php-format
 msgid "Edit %s group"
 msgstr "Kemmañ ar strollad  %s"
@@ -2416,40 +1908,40 @@ msgstr "Kemmañ ar strollad  %s"
 #. TRANS: Client error displayed trying to edit a group while not logged in.
 #. TRANS: Client error displayed when trying to create a group while not logged in.
 #. TRANS: Client error displayed trying to create a group while not logged in.
-#: actions/editgroup.php:68 actions/grouplogo.php:69 actions/newgroup.php:65
 msgid "You must be logged in to create a group."
 msgstr "Rankout a reoc'h bezañ luget evit krouiñ ur strollad."
 
 #. TRANS: Form instructions for group edit form.
-#: actions/editgroup.php:161
 msgid "Use this form to edit the group."
 msgstr "Leunit ar furmskrid-mañ evit kemmañ dibarzhioù ar strollad."
 
+#. TRANS: Group edit form validation error.
+#. TRANS: Group create form validation error.
+#. TRANS: %s is the invalid alias.
+#, php-format
+msgid "Invalid alias: \"%s\""
+msgstr "Alias fall : \"%s\""
+
 #. TRANS: Group edit form success message.
-#: actions/editgroup.php:301
 msgid "Options saved."
 msgstr "Enrollet eo bet ho dibarzhioù."
 
 #. TRANS: Title for e-mail settings.
-#: actions/emailsettings.php:60
 msgid "Email settings"
 msgstr "Arventennoù ar postel"
 
 #. TRANS: E-mail settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/emailsettings.php:74
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 msgstr "Merañ ar posteloù a fell deoc'h resevout a-berzh %%site.name%%."
 
 #. TRANS: Form legend for e-mail settings form.
 #. TRANS: Field label for e-mail address input in e-mail settings form.
-#: actions/emailsettings.php:104 actions/emailsettings.php:130
 msgid "Email address"
 msgstr "Chomlec'h postel"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:110
 msgid "Current confirmed email address."
 msgstr "Chomlec'h postel gwiriekaet er mare-mañ."
 
@@ -2458,15 +1950,11 @@ msgstr "Chomlec'h postel gwiriekaet er mare-mañ."
 #. TRANS: Button label to remove a confirmed IM address.
 #. TRANS: Button label to remove a confirmed SMS address.
 #. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
-#: actions/emailsettings.php:113 actions/emailsettings.php:180
-#: actions/imsettings.php:119 actions/smssettings.php:119
-#: actions/smssettings.php:175
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Dilemel"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:120
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -2477,46 +1965,38 @@ msgstr ""
 #. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
 #. TRANS: Any other domain may be owned by a legitimate person or
 #. TRANS: organization.
-#: actions/emailsettings.php:137
 msgid "Email address, like \"UserName@example.org\""
 msgstr "Chomlec'h postel, evel \"AnvImplijer@example.org\""
 
 #. TRANS: Button label for adding an e-mail address in e-mail settings form.
 #. TRANS: Button label for adding an IM address in IM settings form.
 #. TRANS: Button label for adding a SMS phone number in SMS settings form.
-#: actions/emailsettings.php:141 actions/imsettings.php:147
-#: actions/smssettings.php:157
 msgctxt "BUTTON"
 msgid "Add"
 msgstr "Ouzhpennañ"
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:149 actions/smssettings.php:166
 msgid "Incoming email"
 msgstr "Postel o tont"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:155
 msgid "I want to post notices by email."
 msgstr "C'hoant am eus kas va alioù dre bostel."
 
 #. TRANS: Form instructions for incoming e-mail form in e-mail settings.
 #. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
-#: actions/emailsettings.php:177 actions/smssettings.php:173
 #, fuzzy
 msgid "Send email to this address to post new notices."
 msgstr "Chomlec'h postel nevez evit embann e %s"
 
 #. TRANS: Instructions for incoming e-mail address input form, when an address has already been assigned.
 #. TRANS: Instructions for incoming SMS e-mail address input form.
-#: actions/emailsettings.php:186 actions/smssettings.php:181
 #, fuzzy
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr "Chomlec'h postel nevez evit embann e %s"
 
 #. TRANS: Instructions for incoming e-mail address input form.
-#: actions/emailsettings.php:190
 msgid ""
 "To send notices via email, we need to create a unique email address for you "
 "on this server:"
@@ -2524,90 +2004,72 @@ msgstr ""
 
 #. TRANS: Button label for adding an e-mail address to send notices from.
 #. TRANS: Button label for adding an SMS e-mail address to send notices from.
-#: actions/emailsettings.php:196 actions/smssettings.php:184
 msgctxt "BUTTON"
 msgid "New"
 msgstr "Nevez"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:205
 msgid "Email preferences"
 msgstr "Penndibaboù ar posteloù"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:213
 #, fuzzy
 msgid "Send me notices of new subscriptions through email."
 msgstr "Kas din an alioù dre Jabber/GTalk."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:219
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr "Kas din ur postel pa lak unan bennak unan eus va alioù evel pennroll."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:226
 msgid "Send me email when someone sends me a private message."
 msgstr "Kas din ur postel pa gas unan bennak ur gemennadenn bersonel din."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:232
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr "Kas din ur postel pa gas unan bennak ur \"@-respont\" din."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:238
 msgid "Allow friends to nudge me and send me an email."
 msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:244
 msgid "Publish a MicroID for my email address."
 msgstr "Embann ur MicroID evit ma chomlec'h postel."
 
 #. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:362
 msgid "Email preferences saved."
 msgstr "Enrollet eo bet an arventennoù postel."
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:381
 msgid "No email address."
 msgstr "Chomlec'h postel ebet."
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:389
 #, fuzzy
 msgid "Cannot normalize that email address."
 msgstr "Diposubl eo implijout an ID Jabber-mañ"
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:394 actions/register.php:197
-#: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "N'eo ket ur chomlec'h postel reizh."
 
 #. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:398
 msgid "That is already your email address."
 msgstr "Ho postel eo dija."
 
 #. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:402
 msgid "That email address already belongs to another user."
 msgstr "D'un implijer all eo ar chomlec'h postel-mañ."
 
 #. TRANS: Server error thrown on database error adding e-mail confirmation code.
 #. TRANS: Server error thrown on database error adding Instant Messaging confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:419 actions/imsettings.php:362
-#: actions/smssettings.php:364
 #, fuzzy
 msgid "Could not insert confirmation code."
 msgstr "Dibosupl eo ensoc'hañ ar c'hod gwiriekaat."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:426
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
@@ -2616,100 +2078,80 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling Instant Messaging address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:446 actions/imsettings.php:391
-#: actions/smssettings.php:398
 msgid "No pending confirmation to cancel."
 msgstr "Kadarnadenn ebet da vezañ nullet."
 
 #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:451
 msgid "That is the wrong email address."
 msgstr "N'eo ket mat ar chomlec'h postelerezh prim."
 
 #. TRANS: Server error thrown on database error canceling e-mail address confirmation.
 #. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
-#: actions/emailsettings.php:460 actions/smssettings.php:412
 msgid "Could not delete email confirmation."
 msgstr "Dibosupl dilemel ar postel kadarnaat."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:465
 msgid "Email confirmation cancelled."
 msgstr "Nullet eo bet kadarnadenn ar postel."
 
 #. TRANS: Message given trying to remove an e-mail address that is not
 #. TRANS: registered for the active user.
-#: actions/emailsettings.php:484
 msgid "That is not your email address."
 msgstr "N'eo ket ho postel."
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:505
 msgid "The email address was removed."
 msgstr "Dilamet eo bet ar chomlec'h postel."
 
 #. TRANS: Form validation error displayed when trying to remove an incoming e-mail address while no address has been set.
-#: actions/emailsettings.php:519 actions/smssettings.php:554
 msgid "No incoming email address."
 msgstr "Chomlec'h postel ebet o tont."
 
 #. 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.
-#: actions/emailsettings.php:531 actions/emailsettings.php:555
-#: actions/smssettings.php:565 actions/smssettings.php:590
 msgid "Could not update user record."
 msgstr "Dibosupl hizivaat teuliad an implijer."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
 #. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:535 actions/smssettings.php:569
 msgid "Incoming email address removed."
 msgstr "Diverket eo bet ar chomlec'h postel o tont tre."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
 #. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:559 actions/smssettings.php:594
 msgid "New incoming email address added."
 msgstr "Ouzhpennet ez eus bet ur chomlec'h postel nevez o tont tre"
 
 #. TRANS: Client error displayed when trying to mark a notice as favorite that already is a favorite.
-#: actions/favor.php:80
 msgid "This notice is already a favorite!"
 msgstr "Ouzhpennet eo bet ar c'hemenn-mañ d'ho pennrolloù dija !"
 
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
-#: actions/favor.php:95
 #, fuzzy
 msgid "Disfavor favorite."
 msgstr "Tennañ ar pennroll"
 
 #. TRANS: Page title for first page of favorited notices.
 #. TRANS: Title for favourited notices section.
-#: actions/favorited.php:65 lib/popularnoticesection.php:62
-#: lib/publicgroupnav.php:93
 msgid "Popular notices"
 msgstr "Alioù poblek"
 
 #. TRANS: Page title for all but first page of favorited notices.
 #. TRANS: %d is the page number being displayed.
-#: actions/favorited.php:69
 #, php-format
 msgid "Popular notices, page %d"
 msgstr "Alioù poblek, pajenn %d"
 
 #. TRANS: Description on page displaying favorited notices.
-#: actions/favorited.php:81
 msgid "The most popular notices on the site right now."
 msgstr "An alioù ar brudetañ el lec'hienn er mare-mañ."
 
 #. TRANS: Text displayed instead of a list when a site does not yet have any favourited notices.
-#: actions/favorited.php:149
 msgid "Favorite notices appear on this page but no one has favorited one yet."
 msgstr ""
 
 #. TRANS: Additional text displayed instead of a list when a site does not yet have any favourited notices for logged in users.
-#: actions/favorited.php:153
 msgid ""
 "Be the first to add a notice to your favorites by clicking the fave button "
 "next to any notice you like."
@@ -2717,7 +2159,6 @@ msgstr ""
 
 #. TRANS: Additional text displayed instead of a list when a site does not yet have any favourited notices for not logged in users.
 #. TRANS: %%action.register%% is a registration link. "[link text](link)" is Mark Down. Do not change the formatting.
-#: actions/favorited.php:158
 #, fuzzy, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to add a "
@@ -2730,185 +2171,150 @@ msgstr ""
 #. TRANS: %s is a user's nickname.
 #. TRANS: Title for first page of favourite notices of a user.
 #. TRANS: %s is the user for whom the favourite notices are displayed.
-#: actions/favoritesrss.php:111 actions/showfavorites.php:76
-#: lib/personalgroupnav.php:110
 #, php-format
 msgid "%s's favorite notices"
 msgstr "Alioù pennrollet eus %s"
 
 #. TRANS: Desciption of RSS feed with favourite notices of a user.
 #. TRANS: %1$s is a user's nickname, %2$s is the name of the StatusNet site.
-#: actions/favoritesrss.php:117
 #, php-format
 msgid "Updates favored by %1$s on %2$s!"
 msgstr "Hizivadennoù brientek gant %1$s war %2$s !"
 
 #. TRANS: Page title for first page of featured users.
 #. TRANS: Title for featured users section.
-#: actions/featured.php:69 lib/featureduserssection.php:87
-#: lib/publicgroupnav.php:89
 #, fuzzy
 msgid "Featured users"
 msgstr "Diverkañ an implijer"
 
 #. TRANS: Page title for all but first page of featured users.
 #. TRANS: %d is the page number being displayed.
-#: actions/featured.php:73
 #, fuzzy, php-format
 msgid "Featured users, page %d"
 msgstr "Strollad, pajenn %d"
 
 #. TRANS: Description on page displaying featured users.
-#: actions/featured.php:102
 #, fuzzy, php-format
 msgid "A selection of some great users on %s."
 msgstr "Un dibab eus implijerien vat e %s"
 
 #. TRANS: Client error displayed when no notice ID was given trying do display a file.
-#: actions/file.php:36
 msgid "No notice ID."
 msgstr "ID ali ebet."
 
 #. TRANS: Client error displayed when an invalid notice ID was given trying do display a file.
-#: actions/file.php:41
 msgid "No notice."
 msgstr "Ali ebet."
 
 #. TRANS: Client error displayed when trying do display a file for a notice without a file attachement.
-#: actions/file.php:46
 msgid "No attachments."
 msgstr "N'eus restr stag ebet."
 
 #. TRANS: Client error displayed when trying do display a file for a notice with file attachements
 #. TRANS: that could not be found.
-#: actions/file.php:58
 #, fuzzy
 msgid "No uploaded attachments."
 msgstr "N'eus restr stag ebet."
 
 #. TRANS: Client error displayed when subscribing to a remote profile and an unexpected response is received.
-#: actions/finishremotesubscribe.php:69
 msgid "Not expecting this response!"
 msgstr "Ne oa ket gortozet ar respont-mañ !"
 
 #. TRANS: Client error displayed when subscribing to a remote profile that does not exist.
-#: actions/finishremotesubscribe.php:81
 msgid "User being listened to does not exist."
 msgstr ""
 
 #. TRANS: Client error displayed when subscribing to a remote profile that is a local profile.
-#: actions/finishremotesubscribe.php:89 actions/remotesubscribe.php:58
 #, fuzzy
 msgid "You can use the local subscription!"
 msgstr "Dibosupl eo dilemel ar c'houmanant."
 
 #. TRANS: Client error displayed when subscribing to a remote profile that is blocked form subscribing to.
-#: actions/finishremotesubscribe.php:102
 msgid "That user has blocked you from subscribing."
 msgstr "An implijer-se en deus ho stanket evit en enskrivañ."
 
 #. TRANS: Client error displayed when subscribing to a remote profile without providing an authorised token.
-#: actions/finishremotesubscribe.php:114
 msgid "You are not authorized."
 msgstr "N'oc'h ket aotreet."
 
 #. TRANS: Client error displayed when subscribing to a remote profile and conversion of the request token to access token fails.
-#: actions/finishremotesubscribe.php:118
 #, fuzzy
 msgid "Could not convert request token to access token."
 msgstr "Dibosupl eo kaout ur jedaouer reked."
 
 #. TRANS: Client error displayed when subscribing to a remote profile fails because of an unsupported version of the OMB protocol.
-#: actions/finishremotesubscribe.php:124
 msgid "Remote service uses unknown version of OMB protocol."
 msgstr ""
 
 #. TRANS: Server error displayed when subscribing to a remote profile fails because the remote profile could not be updated.
-#: actions/finishremotesubscribe.php:145 lib/oauthstore.php:317
 msgid "Error updating remote profile."
 msgstr "Fazi en ur hizivaat ar profil a-bell."
 
 #. TRANS: Client error displayed when requesting a non-existent file.
-#: actions/getfile.php:77
 msgid "No such file."
 msgstr "Restr ezvezant."
 
 #. TRANS: Client error displayed when requesting a file without having read access to it.
-#: actions/getfile.php:82
 msgid "Cannot read file."
 msgstr "Diposupl eo lenn ar restr."
 
 #. TRANS: Client error displayed when trying to assign an invalid role to a user.
-#: actions/grantrole.php:61 actions/revokerole.php:62
 msgid "Invalid role."
 msgstr "Roll direizh."
 
 #. TRANS: Client error displayed when trying to assign an reserved role to a user.
-#: actions/grantrole.php:66 actions/revokerole.php:66
 msgid "This role is reserved and cannot be set."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to assign a role to a user while not being allowed to set roles.
-#: actions/grantrole.php:76
 msgid "You cannot grant user roles on this site."
 msgstr "Ne c'helloc'h ket reiñ rolloù d'an implijerien eus al lec'hienn-mañ."
 
 #. TRANS: Client error displayed when trying to assign a role to a user that already has that role.
-#: actions/grantrole.php:84
 msgid "User already has this role."
 msgstr "An implijer-mañ en deus dija ar roll-mañ."
 
 #. TRANS: Client error displayed trying to block a user from a group while not specifying a to be blocked user profile.
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing a profile.
+#. TRANS: Client error displayed when not providing a profile ID on the Make Admin page.
 #. TRANS: Client error displayed trying a change a subscription without providing a profile.
 #. TRANS: Client error displayed when trying to change user options without specifying a user to work on.
-#: actions/groupblock.php:71 actions/groupunblock.php:71
-#: actions/makeadmin.php:71 actions/subedit.php:49
-#: lib/profileformaction.php:79
 msgid "No profile specified."
 msgstr "N'eo bet resisaet profil ebet"
 
 #. TRANS: Client error displayed trying to block a user from a group while specifying a non-existing profile.
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing an existing profile.
+#. TRANS: Client error displayed when specifying an invalid profile ID on the Make Admin page.
 #. TRANS: Client error displayed trying a change a subscription for a non-existant profile ID.
 #. TRANS: Client error displayed when trying to change user options without specifying an existing user to work on.
-#: actions/groupblock.php:77 actions/groupunblock.php:77
-#: actions/makeadmin.php:76 actions/subedit.php:57 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:87
 msgid "No profile with that ID."
 msgstr "N'eus profil ebet gant an ID-mañ."
 
 #. TRANS: Client error displayed trying to block a user from a group while not specifying a group to block a profile from.
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing a group.
-#: actions/groupblock.php:83 actions/groupunblock.php:83
-#: actions/makeadmin.php:81
+#. TRANS: Client error displayed when not providing a group ID on the Make Admin page.
 msgid "No group specified."
 msgstr "N'eo bet resisaet strollad ebet"
 
 #. TRANS: Client error displayed trying to block a user from a group while not being an admin user.
-#: actions/groupblock.php:95
 msgid "Only an admin can block group members."
 msgstr "N'eus neme ur merour a c'hell stankañ izili ur strollad."
 
 #. TRANS: Client error displayed trying to block a user from a group while user is already blocked from the given group.
-#: actions/groupblock.php:100
 msgid "User is already blocked from group."
 msgstr "An implijer-mañ a zo stanket dija eus ar strollad."
 
 #. TRANS: Client error displayed trying to block a user from a group while user is not a member of given group.
-#: actions/groupblock.php:106
 msgid "User is not a member of group."
 msgstr "N'eo ket an implijer-mañ ezel eus ur strollad."
 
 #. TRANS: Title for block user from group page.
 #. TRANS: Form legend for form to block user from a group.
-#: actions/groupblock.php:141 actions/groupmembers.php:364
 msgid "Block user from group"
 msgstr "Stankañ an implijer-mañ eus ar strollad"
 
 #. TRANS: Explanatory text for block user from group form before setting the block.
 #. TRANS: %1$s is that to be blocked user, %2$s is the group the user will be blocked from.
-#: actions/groupblock.php:169
 #, php-format
 msgid ""
 "Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They "
@@ -2917,157 +2323,130 @@ msgid ""
 msgstr ""
 
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
-#: actions/groupblock.php:191
 msgid "Do not block this user from this group."
 msgstr "Arabat stankañ an implijer-mañ er strollad-mañ."
 
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
-#: actions/groupblock.php:198
 msgid "Block this user from this group."
 msgstr "Stankañ an implijer-mañ er strollad-mañ."
 
 #. TRANS: Server error displayed when trying to block a user from a group fails because of an application error.
-#: actions/groupblock.php:215
 #, fuzzy
 msgid "Database error blocking user from group."
 msgstr "Distankañ implijer ar strollad"
 
 #. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
 #. TRANS: Client error displayed trying to find a user by ID without providing an ID.
-#: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr "ID ebet"
 
 #. TRANS: Client error displayed trying to change group design settings while not logged in.
-#: actions/groupdesignsettings.php:67
 #, fuzzy
 msgid "You must be logged in to edit a group."
 msgstr "Rankout a reoc'h bezañ luget evit krouiñ ur strollad."
 
 #. TRANS: Title group design settings page.
-#: actions/groupdesignsettings.php:146
 msgid "Group design"
 msgstr "Design ar strollad"
 
 #. TRANS: Instructions for group design settings page.
-#: actions/groupdesignsettings.php:157
 msgid ""
 "Customize the way your group looks with a background image and a colour "
 "palette of your choice."
 msgstr ""
 
 #. TRANS: Form validation error displayed when group design settings could not be updated because of an application issue.
-#: actions/groupdesignsettings.php:262
 #, fuzzy
 msgid "Unable to update your design settings."
 msgstr "Dibosupl eo enrollañ an arventennoù empentiñ."
 
 #. TRANS: Form text to confirm saved group design settings.
-#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:239
 msgid "Design preferences saved."
 msgstr "Enrollet eo bet an arventennoù design."
 
 #. TRANS: Title for group logo settings page.
 #. TRANS: Group logo form legend.
-#: actions/grouplogo.php:144 actions/grouplogo.php:199
 msgid "Group logo"
 msgstr "Logo ar strollad"
 
 #. TRANS: Instructions for group logo page.
 #. TRANS: %s is the maximum file size for that site.
-#: actions/grouplogo.php:156
 #, php-format
 msgid ""
 "You can upload a logo image for your group. The maximum file size is %s."
 msgstr ""
 
 #. TRANS: Submit button for uploading a group logo.
-#: actions/grouplogo.php:243
 msgid "Upload"
 msgstr "Enporzhiañ"
 
 #. TRANS: Button text for cropping an uploaded group logo.
-#: actions/grouplogo.php:299
 msgid "Crop"
 msgstr "Adframmañ"
 
 #. TRANS: Form instructions on the group logo page.
-#: actions/grouplogo.php:376
 #, fuzzy
 msgid "Pick a square area of the image to be the logo."
 msgstr "Diuzit ur zonenn gant ur stumm karrez evit tremeniñ ho avatar"
 
 #. TRANS: Form success message after updating a group logo.
-#: actions/grouplogo.php:411
 msgid "Logo updated."
 msgstr "Logo hizivaet."
 
 #. TRANS: Form failure message after failing to update a group logo.
-#: actions/grouplogo.php:414
 msgid "Failed updating logo."
 msgstr "N'eo ket bet kaset da benn an hizivadenn."
 
 #. TRANS: Title of the page showing group members.
 #. TRANS: %s is the name of the group.
-#: actions/groupmembers.php:104
 #, php-format
 msgid "%s group members"
 msgstr "Izili ar strollad %s"
 
 #. TRANS: Title of the page showing group members.
 #. TRANS: %1$s is the name of the group, %2$d is the page number of the members list.
-#: actions/groupmembers.php:109
 #, php-format
 msgid "%1$s group members, page %2$d"
 msgstr "Izili ar strollad %1$s, pajenn %2$d"
 
 #. TRANS: Page notice for group members page.
-#: actions/groupmembers.php:125
 msgid "A list of the users in this group."
 msgstr "Roll an implijerien enrollet er strollad-mañ."
 
 #. TRANS: Indicator in group members list that this user is a group administrator.
-#: actions/groupmembers.php:190 lib/action.php:581
 msgid "Admin"
 msgstr "Merañ"
 
 #. TRANS: Button text for the form that will block a user from a group.
-#: actions/groupmembers.php:397
 msgctxt "BUTTON"
 msgid "Block"
 msgstr "Stankañ"
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:401
 msgctxt "TOOLTIP"
 msgid "Block this user"
 msgstr "Stankañ an implijer-mañ"
 
 #. TRANS: Form legend for form to make a user a group admin.
-#: actions/groupmembers.php:488
 msgid "Make user an admin of the group"
 msgstr "Lakaat an implijer da vezañ ur merour eus ar strollad"
 
 #. TRANS: Button text for the form that will make a user administrator.
-#: actions/groupmembers.php:521
 msgctxt "BUTTON"
 msgid "Make Admin"
 msgstr "Lakaat ur merour"
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:525
 msgctxt "TOOLTIP"
 msgid "Make this user an admin"
 msgstr "Lakaat an implijer-mañ da verour"
 
 #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
-#: actions/grouprss.php:141
 #, php-format
 msgid "Updates from members of %1$s on %2$s!"
 msgstr "Hizivadenn izili %1$s e %2$s !"
 
 #. TRANS: Title for first page of the groups list.
-#: actions/groups.php:62
 #, fuzzy
 msgctxt "TITLE"
 msgid "Groups"
@@ -3075,7 +2454,6 @@ msgstr "Strolladoù"
 
 #. TRANS: Title for all but the first page of the groups list.
 #. TRANS: %d is the page number.
-#: actions/groups.php:66
 #, fuzzy, php-format
 msgctxt "TITLE"
 msgid "Groups, page %d"
@@ -3084,7 +2462,6 @@ msgstr "Strollad, pajenn %d"
 #. TRANS: Page notice of group list. %%%%site.name%%%% is the StatusNet site name,
 #. TRANS: %%%%action.groupsearch%%%% and %%%%action.newgroup%%%% are URLs. Do not change them.
 #. TRANS: This message contains Markdown links in the form [link text](link).
-#: actions/groups.php:95
 #, php-format
 msgid ""
 "%%%%site.name%%%% groups let you find and talk with people of similar "
@@ -3095,12 +2472,10 @@ msgid ""
 msgstr ""
 
 #. TRANS: Link to create a new group on the group list page.
-#: actions/groups.php:113 actions/usergroups.php:126 lib/groupeditform.php:115
 msgid "Create a new group"
 msgstr "Krouiñ ur strollad nevez"
 
 #. TRANS: Instructions for page where groups can be searched. %%site.name%% is the name of the StatusNet site.
-#: actions/groupsearch.php:53
 #, fuzzy, php-format
 msgid ""
 "Search for groups on %%site.name%% by their name, location, or description. "
@@ -3111,21 +2486,17 @@ msgstr ""
 "arouezenn."
 
 #. TRANS: Title for page where groups can be searched.
-#: actions/groupsearch.php:60
 msgid "Group search"
 msgstr "Klask strolladoù"
 
 #. TRANS: Text on page where groups can be searched if no results were found for a query.
 #. TRANS: Text for notice search results is the query had no results.
 #. TRANS: Message on the "People search" page where a query has no results.
-#: actions/groupsearch.php:82 actions/noticesearch.php:122
-#: actions/peoplesearch.php:87
 msgid "No results."
 msgstr "Disoc'h ebet."
 
 #. TRANS: Additional text on page where groups can be searched if no results were found for a query for a logged in user.
 #. TRANS: This message contains Markdown links in the form [link text](link).
-#: actions/groupsearch.php:87
 #, fuzzy, php-format
 msgid ""
 "If you cannot find the group you're looking for, you can [create it](%%"
@@ -3136,7 +2507,6 @@ msgstr ""
 
 #. TRANS: Additional text on page where groups can be searched if no results were found for a query for a not logged in user.
 #. TRANS: This message contains Markdown links in the form [link text](link).
-#: actions/groupsearch.php:92
 #, fuzzy, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and [create the group](%%"
@@ -3146,30 +2516,25 @@ msgstr ""
 "gentañ da embann un dra !"
 
 #. TRANS: Client error displayed when trying to unblock a user from a group without being an administrator for the group.
-#: actions/groupunblock.php:95
 msgid "Only an admin can unblock group members."
 msgstr "N'eus nemet ur merour a c'hell distankañ izili ur strollad."
 
 #. TRANS: Client error displayed when trying to unblock a non-blocked user from a group.
-#: actions/groupunblock.php:100
 msgid "User is not blocked from group."
 msgstr "N'eo ket stanket an implijer-mañ eus ar strollad."
 
 #. TRANS: Server error displayed when unblocking a user from a group fails because of an unknown error.
 #. TRANS: Server error displayed when removing a user block.
-#: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "Ur fazi a zo bet e-pad nulladenn ar stankadenn."
 
 #. TRANS: Title for Instant Messaging settings.
-#: actions/imsettings.php:56
 msgid "IM settings"
 msgstr "Arventennoù ar bostelerezh prim"
 
 #. 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.
-#: actions/imsettings.php:69
 #, php-format
 msgid ""
 "You can send and receive notices through instant messaging [instant messages]"
@@ -3177,189 +2542,157 @@ msgid ""
 msgstr ""
 
 #. TRANS: Message given in the IM settings if IM is not enabled on the site.
-#: actions/imsettings.php:90
 msgid "IM is not available."
 msgstr "Dizimplijadus eo ar bostelerezh prim"
 
-#: actions/imsettings.php:116
 #, fuzzy, php-format
 msgid "Current confirmed %s address."
 msgstr "Chomlec'h postel gwiriekaet er mare-mañ."
 
 #. TRANS: Form note in IM settings form.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:128
 #, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your %s account for a message "
 "with further instructions. (Did you add %s to your buddy list?)"
 msgstr ""
 
-#: actions/imsettings.php:140
 msgid "IM address"
 msgstr "Chomlec'h postelerezh prim"
 
-#: actions/imsettings.php:142
 #, php-format
 msgid "%s screenname."
 msgstr ""
 
 #. TRANS: Header for IM preferences form.
-#: actions/imsettings.php:163
 #, fuzzy
 msgid "IM Preferences"
 msgstr "Penndibaboù ar bostelerezh prim"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:174
 #, fuzzy
 msgid "Send me notices"
 msgstr "Kas un ali"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:176
 #, fuzzy
 msgid "Post a notice when my status changes."
 msgstr "Embann ur MicroID evit ma chomlec'h Jabber/GTalk."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:178
 #, fuzzy
 msgid "Send me replies from people I'm not subscribed to."
 msgstr "Kas din an alioù dre Jabber/GTalk."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:181
 #, fuzzy
 msgid "Publish a MicroID"
 msgstr "Embann ur MicroID evit ma chomlec'h postel."
 
 #. TRANS: Server error thrown on database error updating IM preferences.
-#: actions/imsettings.php:291
 #, fuzzy
 msgid "Couldn't update IM preferences."
 msgstr "Dibosupl hizivaat an implijer."
 
 #. TRANS: Confirmation message for successful IM preferences save.
 #. TRANS: Confirmation message after saving preferences.
-#: actions/imsettings.php:298 actions/urlsettings.php:244
 msgid "Preferences saved."
 msgstr "Penndibaboù enrollet"
 
 #. TRANS: Message given saving IM address without having provided one.
-#: actions/imsettings.php:320
 #, fuzzy
 msgid "No screenname."
 msgstr "Lesanv ebet."
 
-#: actions/imsettings.php:325
 #, fuzzy
 msgid "No transport."
 msgstr "Ali ebet."
 
 #. TRANS: Message given saving IM address that cannot be normalised.
-#: actions/imsettings.php:333
 #, fuzzy
 msgid "Cannot normalize that screenname"
 msgstr "Dibosupl eo implijout an ID Jabber-mañ"
 
 #. TRANS: Message given saving IM address that not valid.
-#: actions/imsettings.php:340
 #, fuzzy
 msgid "Not a valid screenname"
 msgstr "N'eo ket ul lesanv mat."
 
 #. TRANS: Message given saving IM address that is already set for another user.
-#: actions/imsettings.php:344
 #, fuzzy
 msgid "Screenname already belongs to another user."
 msgstr "Implijet eo an Jabber ID-mañ gant un implijer all."
 
 #. TRANS: Message given saving valid IM address that is to be confirmed.
-#: actions/imsettings.php:369
 #, fuzzy
 msgid "A confirmation code was sent to the IM address you added."
 msgstr "N'eo ket ar c'hod-se evidoc'h !"
 
 #. TRANS: Message given canceling IM address confirmation for the wrong IM address.
-#: actions/imsettings.php:396
 msgid "That is the wrong IM address."
 msgstr "N'eo ket mat ar chomlec'h postelerezh prim."
 
 #. TRANS: Server error thrown on database error canceling IM address confirmation.
-#: actions/imsettings.php:405
 #, fuzzy
 msgid "Couldn't delete confirmation."
 msgstr "Diposubl eo dilemel ar postel kadarnadur."
 
 #. TRANS: Message given after successfully canceling IM address confirmation.
-#: actions/imsettings.php:410
 msgid "IM confirmation cancelled."
 msgstr "Nullet eo bet kadarnadenn ar bostelerezh prim."
 
 #. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.
-#: actions/imsettings.php:434
 #, fuzzy
 msgid "That is not your screenname."
 msgstr "n'eo ket ho niverenn pellgomz."
 
 #. TRANS: Server error thrown on database error removing a registered IM address.
-#: actions/imsettings.php:443
 #, fuzzy
 msgid "Couldn't update user im prefs."
 msgstr "Dibosupl hizivaat teuliad an implijer."
 
 #. TRANS: Message given after successfully removing a registered Instant Messaging address.
-#: actions/imsettings.php:451
 msgid "The IM address was removed."
 msgstr "Dilamet eo bet ar chomlec'h IM."
 
 #. TRANS: Title for all but the first page of the inbox page.
 #. TRANS: %1$s is the user's nickname, %2$s is the page number.
-#: actions/inbox.php:59
 #, php-format
 msgid "Inbox for %1$s - page %2$d"
 msgstr "Boest degemer %1$s - pajenn %2$d"
 
 #. TRANS: Title for the first page of the inbox page.
 #. TRANS: %s is the user's nickname.
-#: actions/inbox.php:64
 #, php-format
 msgid "Inbox for %s"
 msgstr "Bost resevout %s"
 
 #. TRANS: Instructions for user inbox page.
-#: actions/inbox.php:106
 msgid "This is your inbox, which lists your incoming private messages."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to sent invites while they have been disabled.
-#: actions/invite.php:41
 msgid "Invites have been disabled."
 msgstr "Diweredekaat eo bet ar bedadennoù."
 
 #. TRANS: Client error displayed when trying to sent invites while not logged in.
 #. TRANS: %s is the StatusNet site name.
-#: actions/invite.php:45
 #, php-format
 msgid "You must be logged in to invite other users to use %s."
 msgstr "Rankout a reoc'h bezañ luget evit pediñ implijerien all e %s."
 
 #. TRANS: Form validation message when providing an e-mail address that does not validate.
 #. TRANS: %s is an invalid e-mail address.
-#: actions/invite.php:78
 #, php-format
 msgid "Invalid email address: %s."
 msgstr "Fall eo ar postel : %s."
 
 #. TRANS: Page title when invitations have been sent.
-#: actions/invite.php:117
 msgid "Invitations sent"
 msgstr "Pedadennoù kaset"
 
 #. TRANS: Page title when inviting potential users.
-#: actions/invite.php:120
 msgid "Invite new users"
 msgstr "Pediñ implijerien nevez"
 
@@ -3367,7 +2700,6 @@ msgstr "Pediñ implijerien nevez"
 #. TRANS: is already subscribed to one or more users with the given e-mail address(es).
 #. TRANS: Plural form is based on the number of reported already subscribed e-mail addresses.
 #. TRANS: Followed by a bullet list.
-#: actions/invite.php:140
 #, fuzzy
 msgid "You are already subscribed to this user:"
 msgid_plural "You are already subscribed to these users:"
@@ -3376,7 +2708,6 @@ msgstr[1] "Koumanantet oc'h dija d'an implijerien-mañ :"
 
 #. TRANS: Used as list item for already subscribed users (%1$s is nickname, %2$s is e-mail address).
 #. TRANS: Used as list item for already registered people (%1$s is nickname, %2$s is e-mail address).
-#: actions/invite.php:146 actions/invite.php:160
 #, fuzzy, php-format
 msgctxt "INVITE"
 msgid "%1$s (%2$s)"
@@ -3385,7 +2716,6 @@ msgstr "%1$s (%2$s)"
 #. TRANS: Message displayed inviting users to use a StatusNet site while the invited user
 #. TRANS: already uses a this StatusNet site. Plural form is based on the number of
 #. TRANS: reported already present people. Followed by a bullet list.
-#: actions/invite.php:154
 #, fuzzy
 msgid "This person is already a user and you were automatically subscribed:"
 msgid_plural ""
@@ -3400,7 +2730,6 @@ msgstr[1] ""
 #. TRANS: Message displayed inviting users to use a StatusNet site. Plural form is
 #. TRANS: based on the number of invitations sent. Followed by a bullet list of
 #. TRANS: e-mail addresses to which invitations were sent.
-#: actions/invite.php:168
 #, fuzzy
 msgid "Invitation sent to the following person:"
 msgid_plural "Invitations sent to the following people:"
@@ -3409,42 +2738,36 @@ msgstr[1] "Pedadennoù bet kaset d'an implijerien da-heul :"
 
 #. TRANS: Generic message displayed after sending out one or more invitations to
 #. TRANS: people to join a StatusNet site.
-#: actions/invite.php:178
 msgid ""
 "You will be notified when your invitees accept the invitation and register "
 "on the site. Thanks for growing the community!"
 msgstr ""
 
 #. TRANS: Form instructions.
-#: actions/invite.php:191
 #, fuzzy
 msgid ""
 "Use this form to invite your friends and colleagues to use this service."
 msgstr "Pediñ mignoned hag kenseurted da zont ganeoc'h war %s"
 
 #. TRANS: Field label for a list of e-mail addresses.
-#: actions/invite.php:218
 msgid "Email addresses"
 msgstr "Chomlec'hioù postel"
 
 #. TRANS: Tooltip for field label for a list of e-mail addresses.
-#: actions/invite.php:221
 #, fuzzy
 msgid "Addresses of friends to invite (one per line)."
 msgstr "Chomlec'hioù an implijerien da bediñ (unan dre linenn)"
 
 #. TRANS: Field label for a personal message to send to invitees.
-#: actions/invite.php:225
 msgid "Personal message"
 msgstr "Kemennadenn bersonel"
 
 #. TRANS: Tooltip for field label for a personal message to send to invitees.
-#: actions/invite.php:228
 msgid "Optionally add a personal message to the invitation."
 msgstr "Ouzhpennañ ur gemennadenn bersonel d'ar bedadenn (diret)."
 
 #. TRANS: Send button for inviting friends
-#: actions/invite.php:232
+#. TRANS: Button text for sending notice.
 msgctxt "BUTTON"
 msgid "Send"
 msgstr "Kas"
@@ -3452,7 +2775,6 @@ msgstr "Kas"
 #. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral
 #. TRANS: singular 3rd-person pronoun in English. %1$s is the inviting user, $2$s is
 #. TRANS: the StatusNet sitename.
-#: actions/invite.php:264
 #, php-format
 msgid "%1$s has invited you to join them on %2$s"
 msgstr "%1$s a bed ac'hanoc'h d'en em enskrivañ war %2$s"
@@ -3462,7 +2784,6 @@ msgstr "%1$s a bed ac'hanoc'h d'en em enskrivañ war %2$s"
 #. TRANS: StatusNet sitename, %3$s is the site URL, %4$s is the personal message from the
 #. TRANS: inviting user, %s%5 a link to the timeline for the inviting user, %s$6 is a link
 #. TRANS: to register with the StatusNet site.
-#: actions/invite.php:271
 #, php-format
 msgid ""
 "%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -3494,186 +2815,181 @@ msgid ""
 msgstr ""
 
 #. TRANS: Client error displayed when trying to join a group while not logged in.
-#: actions/joingroup.php:59
 msgid "You must be logged in to join a group."
 msgstr "Rankout a reoc'h bezañ luget evit mont en ur strollad."
 
 #. TRANS: Title for join group page after joining.
-#: actions/joingroup.php:148
 #, php-format
 msgctxt "TITLE"
 msgid "%1$s joined group %2$s"
 msgstr "%1$s en deus emezelet er strollad %2$s"
 
 #. TRANS: Client error displayed when trying to leave a group while not logged in.
-#: actions/leavegroup.php:59
 msgid "You must be logged in to leave a group."
 msgstr "Ret eo deoc'h bezañ kevreet evit kuitaat ur strollad"
 
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
-#: actions/leavegroup.php:103 lib/command.php:398
 msgid "You are not a member of that group."
 msgstr "N'oc'h ket un ezel eus ar strollad-mañ."
 
 #. TRANS: Title for leave group page after leaving.
-#: actions/leavegroup.php:142
 #, fuzzy, php-format
 msgctxt "TITLE"
 msgid "%1$s left group %2$s"
 msgstr "%1$s en deus kuitaet ar strollad %2$s"
 
 #. TRANS: User admin panel title
-#: actions/licenseadminpanel.php:55
 msgctxt "TITLE"
 msgid "License"
 msgstr "Aotre-implijout"
 
-#: actions/licenseadminpanel.php:65
+#. TRANS: Form instructions for the site license admin panel.
 msgid "License for this StatusNet site"
 msgstr "Aotre-implijout al lec'hienn StatusNet-mañ"
 
-#: actions/licenseadminpanel.php:134
+#. TRANS: Client error displayed selecting an invalid license in the license admin panel.
 msgid "Invalid license selection."
 msgstr "Diuzadenn aotre-implijout direizh"
 
-#: actions/licenseadminpanel.php:144
+#. TRANS: Client error displayed when not specifying an owner for the all rights reserved license in the license admin panel.
 msgid ""
 "You must specify the owner of the content when using the All Rights Reserved "
 "license."
 msgstr ""
 
-#: actions/licenseadminpanel.php:151
+#. TRANS: Client error displayed selecting a too long license title in the license admin panel.
 #, fuzzy
 msgid "Invalid license title. Maximum length is 255 characters."
 msgstr "Re hir eo al lec'hiadur (255 arouezenn d'ar muiañ)."
 
-#: actions/licenseadminpanel.php:163
+#. TRANS: Client error displayed specifying an invalid license URL in the license admin panel.
 msgid "Invalid license URL."
 msgstr "Direizh eo URL an aotre-implijout"
 
-#: actions/licenseadminpanel.php:166
+#. TRANS: Client error displayed specifying an invalid license image URL in the license admin panel.
 msgid "Invalid license image URL."
 msgstr "Direizh eo URL skeudenn an aotre-implijout"
 
-#: actions/licenseadminpanel.php:174
+#. TRANS: Client error displayed specifying an invalid license URL in the license admin panel.
 msgid "License URL must be blank or a valid URL."
 msgstr "Goullo pe reizh e rank bezañ URL an aotre-implijout"
 
-#: actions/licenseadminpanel.php:182
+#. TRANS: Client error displayed specifying an invalid license image URL in the license admin panel.
 msgid "License image must be blank or valid URL."
 msgstr "Goullo pe reizh e rank bezañ URL skeudenn an aotre-implijout"
 
-#: actions/licenseadminpanel.php:232
+#. TRANS: Form legend in the license admin panel.
 msgid "License selection"
 msgstr "Diuzadenn un aotre-implijout"
 
-#: actions/licenseadminpanel.php:238
+#. TRANS: License option in the license admin panel.
 msgid "Private"
 msgstr "Prevez"
 
-#: actions/licenseadminpanel.php:239
+#. TRANS: License option in the license admin panel.
 msgid "All Rights Reserved"
 msgstr "Pep gwir miret strizh."
 
-#: actions/licenseadminpanel.php:240
+#. TRANS: License option in the license admin panel.
 msgid "Creative Commons"
 msgstr "Creative Commons"
 
-#: actions/licenseadminpanel.php:245
+#. TRANS: Dropdown field label in the license admin panel.
 msgid "Type"
 msgstr "Seurt"
 
-#: actions/licenseadminpanel.php:247
-msgid "Select license"
+#. TRANS: Dropdown field instructions in the license admin panel.
+#, fuzzy
+msgid "Select a license."
 msgstr "Dibab un aotre-implijout"
 
-#: actions/licenseadminpanel.php:261
+#. TRANS: Form legend in the license admin panel.
 msgid "License details"
 msgstr "Munudoù an aotre-implijout"
 
-#: actions/licenseadminpanel.php:267
+#. TRANS: Field label in the license admin panel.
 msgid "Owner"
 msgstr "Perc'henn"
 
-#: actions/licenseadminpanel.php:268
+#. TRANS: Field title in the license admin panel.
 msgid "Name of the owner of the site's content (if applicable)."
 msgstr "Anv perc'henn danvez la lec'hienn (ma c'heller lakaat e pleustr)."
 
-#: actions/licenseadminpanel.php:276
+#. TRANS: Field label in the license admin panel.
 msgid "License Title"
 msgstr "Titl an aotre-implijout"
 
-#: actions/licenseadminpanel.php:277
+#. TRANS: Field title in the license admin panel.
 msgid "The title of the license."
 msgstr "Titl an aotre-implijout"
 
-#: actions/licenseadminpanel.php:285
+#. TRANS: Field label in the license admin panel.
 msgid "License URL"
 msgstr "URL an aotre-implijout"
 
-#: actions/licenseadminpanel.php:286
+#. TRANS: Field title in the license admin panel.
 msgid "URL for more information about the license."
 msgstr "URL lec'h ma c'heller kaout titouroù diwar-benn an aotre-implijout."
 
-#: actions/licenseadminpanel.php:293
+#. TRANS: Field label in the license admin panel.
 msgid "License Image URL"
 msgstr "URL skeudenn an aotre-implijout"
 
-#: actions/licenseadminpanel.php:294
+#. TRANS: Field title in the license admin panel.
 msgid "URL for an image to display with the license."
 msgstr "URL ur skeudenn da ziskouez gant an aotre-implijout."
 
-#. TRANS: Submit button title.
-#: actions/licenseadminpanel.php:311 actions/sessionsadminpanel.php:199
-#: actions/siteadminpanel.php:292 actions/snapshotadminpanel.php:245
-#: actions/tagother.php:133 lib/applicationeditform.php:357
-msgid "Save"
-msgstr "Enrollañ"
-
-#: actions/licenseadminpanel.php:311
-msgid "Save license settings"
+#. TRANS: Button title in the license admin panel.
+#, fuzzy
+msgid "Save license settings."
 msgstr "Enrollañ arventennoù an aotre-implijout"
 
+#. TRANS: Client error displayed when trying to log in while already logged in.
 #. TRANS: Client error displayed trying to use "one time password login" when already logged in.
-#: actions/login.php:97 actions/otp.php:62 actions/register.php:130
 msgid "Already logged in."
 msgstr "Kevreet oc'h dija."
 
-#: actions/login.php:125
+#. TRANS: Form validation error displayed when trying to log in with incorrect credentials.
 msgid "Incorrect username or password."
 msgstr "Anv implijer pe ger-tremen direizh."
 
+#. TRANS: Server error displayed when during login a server error occurs.
 #. TRANS: Server error displayed when a user object could not be created trying to login using "one time password login".
-#: actions/login.php:131 actions/otp.php:127
 msgid "Error setting user. You are probably not authorized."
 msgstr ""
 "Ur fazi 'zo bet e-pad hizivadenn an implijer. Moarvat n'oc'h ket aotreet "
 "evit en ober."
 
-#: actions/login.php:185 actions/login.php:236 lib/action.php:598
+#. TRANS: Page title for login page.
 msgid "Login"
 msgstr "Kevreañ"
 
-#: actions/login.php:222
+#. TRANS: Form legend on login page.
 msgid "Login to site"
 msgstr "Kevreañ d'al lec'hienn"
 
-#: actions/login.php:231 actions/register.php:469
+#. TRANS: Checkbox label label on login page.
 msgid "Remember me"
 msgstr "Kaout soñj"
 
-#: actions/login.php:232 actions/register.php:471
+#. TRANS: Checkbox title on login page.
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 "Digeriñ va dalc'h war-eeun ar wechoù o tont ; arabat en ober war "
 "urzhiataeroù rannet pe publik !"
 
-#: actions/login.php:241
+#. TRANS: Button text for log in on login page.
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Login"
+msgstr "Kevreañ"
+
+#. TRANS: Link text for link to "reset password" on login page.
 msgid "Lost or forgotten password?"
 msgstr "Ha kollet ho peus ho ker-tremen ?"
 
-#: actions/login.php:259
+#. TRANS: Form instructions on login page before being able to change user settings.
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -3681,11 +2997,12 @@ msgstr ""
 "Evit abegoù a surentezh, mar plij adlakait hoc'h anv implijer hag ho ker-"
 "tremen a-benn enrollañ ho penndibaboù."
 
-#: actions/login.php:263
+#. TRANS: Form instructions on login page.
 msgid "Login with your username and password."
 msgstr "Kevreit gant ho anv implijer hag ho ker-tremen."
 
-#: actions/login.php:266
+#. TRANS: Form instructions on login page. This message contains Markdown links in the form [Link text](Link).
+#. TRANS: %%action.register%% is a link to the registration page.
 #, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -3693,130 +3010,124 @@ msgstr ""
 "N'ho peus ket a anv implijer evit c'hoazh ? [Krouit](%%action.register%%) ur "
 "gont nevez."
 
-#: actions/makeadmin.php:92
+#. TRANS: Client error displayed when trying to make another user admin on the Make Admin page while not an admin.
 msgid "Only an admin can make another user an admin."
 msgstr "N'eus nemet ur merour a c'hall lakaat un implijer all da vezañ merour."
 
-#: actions/makeadmin.php:96
+#. TRANS: Client error displayed when trying to make another user admin on the Make Admin page who already is admin.
+#. TRANS: %1$s is the user that is already admin, %2$s is the group user is already admin for.
 #, php-format
 msgid "%1$s is already an admin for group \"%2$s\"."
 msgstr "%1$s a zo dija merour ar strollad \"%2$s\"."
 
-#: actions/makeadmin.php:133
+#. TRANS: Server error displayed when trying to make another user admin on the Make Admin page fails
+#. TRANS: because the group membership record could not be gotten.
+#. TRANS: %1$s is the to be admin user, %2$s is the group user should be admin for.
 #, fuzzy, php-format
 msgid "Can't get membership record for %1$s in group %2$s."
 msgstr "Diposubl eo lakaat %1$s da merour ar strollad %2$s."
 
-#: actions/makeadmin.php:146
+#. TRANS: Server error displayed when trying to make another user admin on the Make Admin page fails
+#. TRANS: because the group adminship record coud not be saved properly.
+#. TRANS: %1$s is the to be admin user, %2$s is the group user is already admin for.
 #, php-format
 msgid "Can't make %1$s an admin for group %2$s."
 msgstr "Dibosupl eo lakaat %1$s da merour ar strollad %2$s."
 
-#: actions/microsummary.php:69
+#. TRANS: Client error displayed trying to make a micro summary without providing a status.
 msgid "No current status."
 msgstr "Statud ebet er mare-mañ."
 
 #. TRANS: This is the title of the form for adding a new application.
-#: actions/newapplication.php:52
 msgid "New application"
 msgstr "Arload nevez"
 
 #. TRANS: Client error displayed trying to add a new application while not logged in.
-#: actions/newapplication.php:64
 msgid "You must be logged in to register an application."
 msgstr "Ret eo deoc'h bezañ luget evit enrollañ ur poellad."
 
 #. TRANS: Form instructions for registering a new application.
-#: actions/newapplication.php:147
 msgid "Use this form to register a new application."
 msgstr "Implijit ar furmskrid-mañ evit enskrivañ ur poellad nevez."
 
 #. TRANS: Validation error shown when not providing a source URL in the "New application" form.
-#: actions/newapplication.php:189
 msgid "Source URL is required."
 msgstr "Ezhomm 'zo eus ar vammenn URL."
 
 #. TRANS: Server error displayed when an application could not be registered in the database through the "New application" form.
-#: actions/newapplication.php:279 actions/newapplication.php:289
 msgid "Could not create application."
 msgstr "N'eo ket posubl krouiñ ar poellad."
 
 #. TRANS: Title for form to create a group.
-#: actions/newgroup.php:53
 msgid "New group"
 msgstr "Strollad nevez"
 
 #. TRANS: Client exception thrown when a user tries to create a group while banned.
-#: actions/newgroup.php:73 classes/User_group.php:485
 #, fuzzy
 msgid "You are not allowed to create groups on this site."
 msgstr "N'oc'h ket ezel eus ar strollad-mañ."
 
 #. TRANS: Form instructions for group create form.
-#: actions/newgroup.php:117
 msgid "Use this form to create a new group."
 msgstr "Implijit ar furmskrid-mañ a-benn krouiñ ur strollad nevez."
 
-#. TRANS: Group create form validation error.
-#: actions/newgroup.php:200
-#, fuzzy
-msgid "Alias cannot be the same as nickname."
-msgstr "Ne c'hell ket an alias bezañ ar memes hini eget al lesanv."
-
-#: actions/newmessage.php:71 actions/newmessage.php:234
+#. TRANS: Page title for new direct message page.
+#. TRANS: Page title on page for sending a direct message.
 msgid "New message"
 msgstr "Kemennadenn nevez"
 
-#. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
-#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:513
-msgid "You can't send a message to this user."
+#. TRANS: Client error displayed trying to send a direct message to a user while sender and
+#. TRANS: receiver are not subscribed to each other.
+#, fuzzy
+msgid "You cannot send a message to this user."
 msgstr "Ne c'helloc'h ket kas kemennadennoù d'an implijer-mañ."
 
+#. TRANS: Form validator error displayed trying to send a direct message without content.
+#. TRANS: Client error displayed trying to send a notice without content.
 #. TRANS: Command exception text shown when trying to send a direct message to another user without content.
 #. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
-#: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:490
-#: lib/command.php:593
 msgid "No content!"
 msgstr "Goullo eo !"
 
-#: actions/newmessage.php:161
+#. TRANS: Form validation error displayed trying to send a direct message without specifying a recipient.
 msgid "No recipient specified."
 msgstr "N'ho peus ket lakaet a resever."
 
+#. TRANS: Client error displayed trying to send a direct message to self.
 #. TRANS: Error text shown when trying to send a direct message to self.
-#: actions/newmessage.php:167 lib/command.php:517
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
 "Na gasit ket a gemennadenn deoc'h c'hwi ho unan ; lavarit an traoù-se en ho "
 "penn kentoc'h."
 
-#: actions/newmessage.php:184
+#. TRANS: Page title after sending a direct message.
 msgid "Message sent"
 msgstr "Kemennadenn kaset"
 
+#. TRANS: Confirmation text after sending a direct message.
+#. TRANS: %s is the direct message recipient.
 #. TRANS: Message given have sent a direct message to another user.
 #. TRANS: %s is the name of the other user.
-#: actions/newmessage.php:188 lib/command.php:525
 #, php-format
 msgid "Direct message to %s sent."
 msgstr "Kaset eo bet da %s ar gemennadenn war-eeun."
 
-#: actions/newmessage.php:213 actions/newnotice.php:264
+#. TRANS: Page title after an AJAX error occurred on the "send direct message" page.
+#. TRANS: Page title after an AJAX error occurs on the send notice page.
 msgid "Ajax Error"
 msgstr "Fazi Ajax"
 
-#: actions/newnotice.php:69
+#. TRANS: Page title for sending a new notice.
 msgid "New notice"
 msgstr "Ali nevez"
 
-#: actions/newnotice.php:230
+#. TRANS: Page title after sending a notice.
 msgid "Notice posted"
 msgstr "Ali embannet"
 
 #. TRANS: Instructions for Notice search page.
 #. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/noticesearch.php:69
 #, fuzzy, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -3827,20 +3138,17 @@ msgstr ""
 "arouezenn."
 
 #. TRANS: Title of the page where users can search for notices.
-#: actions/noticesearch.php:80
 msgid "Text search"
 msgstr "Klask testennoù"
 
 #. TRANS: Test in RSS notice search.
 #. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearch.php:95
 #, php-format
 msgid "Search results for \"%1$s\" on %2$s"
 msgstr "Disoc'hoù ar c'hlask evit \"%1$s\" e %2$s"
 
 #. TRANS: Text for logged in users making a query for notices without results.
 #. TRANS: This message contains a Markdown link.
-#: actions/noticesearch.php:128
 #, php-format
 msgid ""
 "Be the first to [post on this topic](%%%%action.newnotice%%%%?"
@@ -3849,7 +3157,6 @@ msgstr ""
 
 #. TRANS: Text for not logged in users making a query for notices without results.
 #. TRANS: This message contains Markdown links.
-#: actions/noticesearch.php:133
 #, fuzzy, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and be the first to "
@@ -3859,78 +3166,67 @@ msgstr ""
 "gentañ da embann un dra !"
 
 #. TRANS: RSS notice search feed title. %s is the query.
-#: actions/noticesearchrss.php:95
 #, php-format
 msgid "Updates with \"%s\""
 msgstr "Hizivadenn gant \"%s\""
 
 #. TRANS: RSS notice search feed description.
 #. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearchrss.php:99
 #, fuzzy, php-format
 msgid "Updates matching search term \"%1$s\" on %2$s."
 msgstr "Hizivadennoù merket gant %1$s e %2$s !"
 
-#: actions/nudge.php:85
+#. TRANS: Client error displayed trying to nudge a user that cannot be nudged.
 msgid ""
 "This user doesn't allow nudges or hasn't confirmed or set their email "
 "address yet."
 msgstr ""
 
-#: actions/nudge.php:94
+#. TRANS: Page title after sending a nudge.
 msgid "Nudge sent"
 msgstr "Kaset eo bet ar blinkadenn"
 
-#: actions/nudge.php:97
+#. TRANS: Confirmation text after sending a nudge.
 msgid "Nudge sent!"
 msgstr "Kaset eo bet ar blinkadenn !"
 
 #. TRANS: Message displayed to an anonymous user trying to view OAuth application list.
-#: actions/oauthappssettings.php:57
 msgid "You must be logged in to list your applications."
 msgstr "Rankout a reoc'h bezañ kevreet evit rollañ ho poelladoù."
 
 #. TRANS: Page title for OAuth applications
-#: actions/oauthappssettings.php:73
 msgid "OAuth applications"
 msgstr "Poelladoù OAuth"
 
 #. TRANS: Page instructions for OAuth applications
-#: actions/oauthappssettings.php:85
 msgid "Applications you have registered"
 msgstr "Ar poelladoù ho peus enrollet"
 
 #. TRANS: Empty list message on page with OAuth applications.
-#: actions/oauthappssettings.php:138
 #, php-format
 msgid "You have not registered any applications yet."
 msgstr "N'ho peus enrollet poellad ebet evit poent."
 
 #. TRANS: Title for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:69
 msgid "Connected applications"
 msgstr "Poeladoù kevreet."
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:80
 msgid "The following connections exist for your account."
 msgstr ""
 
 #. TRANS: Client error when trying to revoke access for an application while not being a user of it.
-#: actions/oauthconnectionssettings.php:165
 msgid "You are not a user of that application."
 msgstr "N'oc'h ket un implijer eus ar poellad-mañ."
 
 #. TRANS: Client error when revoking access has failed for some reason.
 #. TRANS: %s is the application ID revoking access failed for.
-#: actions/oauthconnectionssettings.php:180
 #, fuzzy, php-format
 msgid "Unable to revoke access for application: %s."
 msgstr "Dibosupl eo nullañ moned ar poellad : "
 
 #. TRANS: Success message after revoking access for an application.
 #. TRANS: %1$s is the application name, %2$s is the first part of the user token.
-#: actions/oauthconnectionssettings.php:199
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -3938,472 +3234,389 @@ msgid ""
 msgstr ""
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:210
 msgid "You have not authorized any applications to use your account."
 msgstr "N'ho peus aotreet poellad ebet da implijout ho kont."
 
 #. TRANS: Note for developers in the OAuth connection settings form.
 #. TRANS: This message contains a Markdown link. Do not separate "](".
 #. TRANS: %s is the URL to the OAuth settings.
-#: actions/oauthconnectionssettings.php:230
 #, php-format
 msgid ""
 "Are you a developer? [Register an OAuth client application](%s) to use with "
 "this instance of StatusNet."
 msgstr ""
 
-#: actions/oembed.php:64
+#. TRANS: Server error displayed in oEmbed action when path not found.
+#. TRANS: %s is a path.
 #, fuzzy, php-format
 msgid "\"%s\" not found."
 msgstr "N'eo ket bet kavet an implijer."
 
-#: actions/oembed.php:76
+#. TRANS: Server error displayed in oEmbed action when notice not found.
+#. TRANS: %s is a notice.
 #, fuzzy, php-format
 msgid "Notice %s not found."
 msgstr "N'eo ket bet kavet an hentenn API !"
 
-#: actions/oembed.php:80 actions/shownotice.php:100
+#. TRANS: Server error displayed in oEmbed action when notice has not profile.
 msgid "Notice has no profile."
 msgstr "N'en deus ket an ali a profil."
 
-#: actions/oembed.php:83 actions/shownotice.php:172
+#. TRANS: oEmbed title. %1$s is the author name, %2$s is the creation date.
 #, php-format
 msgid "%1$s's status on %2$s"
 msgstr "Statud %1$s war %2$s"
 
-#: actions/oembed.php:95
+#. TRANS: Server error displayed in oEmbed action when attachment not found.
+#. TRANS: %d is an attachment ID.
 #, fuzzy, php-format
 msgid "Attachment %s not found."
 msgstr "N'eo ket bet kavet ar resever."
 
-#: actions/oembed.php:136
+#. TRANS: Server error displayed in oEmbed request when a path is not supported.
+#. TRANS: %s is a path.
 #, php-format
 msgid "\"%s\" not supported for oembed requests."
 msgstr ""
 
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
-#: actions/oembed.php:168
 #, fuzzy, php-format
 msgid "Content type %s not supported."
 msgstr "seurt an danvez "
 
 #. TRANS: Error message displaying attachments. %s is the site's base URL.
-#: actions/oembed.php:172
 #, php-format
 msgid "Only %s URLs over plain HTTP please."
 msgstr ""
 
+#. TRANS: Server error displayed in oEmbed action when request specifies an unsupported data format.
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1207
-#: lib/apiaction.php:1234 lib/apiaction.php:1369
 #, fuzzy
 msgid "Not a supported data format."
 msgstr "Diembreget eo ar furmad-se."
 
 #. TRANS: ShortName in the OpenSearch interface when trying to find users.
-#: actions/opensearch.php:64
 msgid "People Search"
 msgstr "Klask tud"
 
-#: actions/opensearch.php:68
+#. TRANS: ShortName in the OpenSearch interface when trying to find notices.
 msgid "Notice Search"
 msgstr "Klask alioù"
 
 #. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
-#: actions/otp.php:70
 msgid "No user ID specified."
 msgstr "N'eus bet diferet ID implijer ebet."
 
 #. TRANS: Client error displayed trying to use "one time password login" without specifying a login token.
-#: actions/otp.php:86
 #, fuzzy
 msgid "No login token specified."
 msgstr "N'eus bet diferet ali ebet."
 
 #. TRANS: Client error displayed trying to use "one time password login" without requesting a login token.
-#: actions/otp.php:94
 #, fuzzy
 msgid "No login token requested."
 msgstr "N'eus profil ID ebet er reked."
 
 #. TRANS: Client error displayed trying to use "one time password login" while specifying an invalid login token.
-#: actions/otp.php:100
 #, fuzzy
 msgid "Invalid login token specified."
 msgstr "Fichenn direizh."
 
 #. TRANS: Client error displayed trying to use "one time password login" while specifying an expired login token.
-#: actions/otp.php:110
 #, fuzzy
 msgid "Login token expired."
 msgstr "Kevreañ d'al lec'hienn"
 
 #. TRANS: Title for outbox for any but the fist page.
 #. TRANS: %1$s is the user nickname, %2$d is the page number.
-#: actions/outbox.php:57
 #, php-format
 msgid "Outbox for %1$s - page %2$d"
 msgstr "Boest kas %1$s - pajenn %2$d"
 
 #. TRANS: Title for first page of outbox.
-#: actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
 msgstr "Boest kas %s"
 
 #. TRANS: Instructions for outbox.
-#: actions/outbox.php:103
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr ""
 
-#: actions/passwordsettings.php:58
 msgid "Change password"
 msgstr "Cheñch ger-tremen"
 
-#: actions/passwordsettings.php:69
 msgid "Change your password."
 msgstr "Cheñch ger-tremen."
 
 #. TRANS: Fieldset legend for password reset form.
-#: actions/passwordsettings.php:96 actions/recoverpassword.php:251
 msgid "Password change"
 msgstr "Kemmañ ger-tremen"
 
-#: actions/passwordsettings.php:104
 msgid "Old password"
 msgstr "Ger-tremen kozh"
 
 #. TRANS: Field label for password reset form.
-#: actions/passwordsettings.php:108 actions/recoverpassword.php:256
 msgid "New password"
 msgstr "Ger-tremen nevez"
 
-#: actions/passwordsettings.php:109 actions/register.php:416
 #, fuzzy
 msgid "6 or more characters."
 msgstr "6 arouezenn pe muioc'h"
 
 #. TRANS: Ttile for field label for password reset form where the password has to be typed again.
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:264
-#: actions/register.php:420
 #, fuzzy
 msgid "Same as password above."
 msgstr "Memestra eget ar ger tremen a-us"
 
-#: actions/passwordsettings.php:117
 msgid "Change"
 msgstr "Kemmañ"
 
-#: actions/passwordsettings.php:153 actions/register.php:223
 msgid "Password must be 6 or more characters."
 msgstr "Rankout a ra ar ger-tremen bezañ gant 6 arouezenn d'an nebeutañ."
 
-#: actions/passwordsettings.php:156 actions/register.php:226
 msgid "Passwords don't match."
 msgstr "Ne glot ket ar gerioù-tremen."
 
-#: actions/passwordsettings.php:164
 msgid "Incorrect old password"
 msgstr "Ger-termen kozh direizh"
 
-#: actions/passwordsettings.php:180
 msgid "Error saving user; invalid."
 msgstr "Ur fazi 'zo bet e-pad enolladenn an implijer ; diwiriek."
 
 #. TRANS: Reset password form validation error message.
-#: actions/passwordsettings.php:185 actions/recoverpassword.php:418
 #, fuzzy
 msgid "Cannot save new password."
 msgstr "Dibosupl eo enrollañ ar ger-tremen nevez."
 
-#: actions/passwordsettings.php:191
 msgid "Password saved."
 msgstr "Ger-tremen enrollet."
 
 #. TRANS: Title for Paths admin panel.
 #. TRANS: Menu item for site administration
-#: actions/pathsadminpanel.php:58 lib/adminpanelaction.php:371
 msgid "Paths"
 msgstr "Hentoù"
 
 #. TRANS: Form instructions for Path admin panel.
-#: actions/pathsadminpanel.php:69
 msgid "Path and server settings for this StatusNet site"
 msgstr ""
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the directory that could not be read from.
-#: actions/pathsadminpanel.php:155
 #, php-format
 msgid "Theme directory not readable: %s."
 msgstr "N'eus ket eus ar gaoz-se : %s."
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the avatar directory that could not be written to.
-#: actions/pathsadminpanel.php:163
 #, php-format
 msgid "Avatar directory not writable: %s."
 msgstr "N'eus ket eus ar gaoz-se : %s."
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the background directory that could not be written to.
-#: actions/pathsadminpanel.php:171
 #, fuzzy, php-format
 msgid "Background directory not writable: %s."
 msgstr "N'eus ket eus ar gaoz-se : %s."
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the locales directory that could not be read from.
-#: actions/pathsadminpanel.php:181
 #, fuzzy, php-format
 msgid "Locales directory not readable: %s."
 msgstr "N'eus ket eus ar gaoz-se : %s."
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the SSL server URL that is too long.
-#: actions/pathsadminpanel.php:189
 msgid "Invalid SSL server. The maximum length is 255 characters."
 msgstr ""
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:235 actions/siteadminpanel.php:58
 msgid "Site"
 msgstr "Lec'hienn"
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:241 actions/pathsadminpanel.php:279
-#: actions/pathsadminpanel.php:370 actions/pathsadminpanel.php:425
 msgid "Server"
 msgstr "Servijer"
 
-#: actions/pathsadminpanel.php:242
 msgid "Site's server hostname."
 msgstr "Anv ostiz servijer al lec'hienn."
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:248 actions/pathsadminpanel.php:288
-#: actions/pathsadminpanel.php:379 actions/pathsadminpanel.php:434
 msgid "Path"
 msgstr "Hent"
 
-#: actions/pathsadminpanel.php:249
 #, fuzzy
 msgid "Site path."
 msgstr "Hent al lec'hienn"
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:255
 #, fuzzy
 msgid "Locale directory"
 msgstr "Doser an temoù"
 
-#: actions/pathsadminpanel.php:256
 msgid "Directory path to locales."
 msgstr ""
 
 #. TRANS: Checkbox label in Paths admin panel.
-#: actions/pathsadminpanel.php:263
 msgid "Fancy URLs"
 msgstr "URLioù brav"
 
-#: actions/pathsadminpanel.php:265
 msgid "Use fancy (more readable and memorable) URLs?"
 msgstr ""
 
-#: actions/pathsadminpanel.php:272
 msgid "Theme"
 msgstr "Danvez"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:281
 #, fuzzy
 msgid "Server for themes."
 msgstr "Dodenn evit al lec'hienn."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:290
 msgid "Web path to themes."
 msgstr ""
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:297 actions/pathsadminpanel.php:388
-#: actions/pathsadminpanel.php:443 actions/pathsadminpanel.php:495
 msgid "SSL server"
 msgstr "Servijer SSL"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:299
 msgid "SSL server for themes (default: SSL server)."
 msgstr ""
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:306 actions/pathsadminpanel.php:397
-#: actions/pathsadminpanel.php:452
 #, fuzzy
 msgid "SSL path"
 msgstr "Hent al lec'hienn"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:308
 msgid "SSL path to themes (default: /theme/)."
 msgstr ""
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:315 actions/pathsadminpanel.php:406
-#: actions/pathsadminpanel.php:461
 #, fuzzy
 msgid "Directory"
 msgstr "Doser an temoù"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:317
 msgid "Directory where themes are located."
 msgstr ""
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:326
 msgid "Avatars"
 msgstr "Avataroù"
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:333
 msgid "Avatar server"
 msgstr "Servijer avatar"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:335
 #, fuzzy
 msgid "Server for avatars."
 msgstr "Dodenn evit al lec'hienn."
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:342
 msgid "Avatar path"
 msgstr "Hent an avataroù"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:344
 #, fuzzy
 msgid "Web path to avatars."
 msgstr "Ur gudenn 'zo bet e-pad hizivadenn an avatar."
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:351
 msgid "Avatar directory"
 msgstr "Restroù an avataroù"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:353
 msgid "Directory where avatars are located."
 msgstr ""
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:364
 msgid "Backgrounds"
 msgstr "Backgroundoù"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:372
 #, fuzzy
 msgid "Server for backgrounds."
 msgstr "Dodenn evit al lec'hienn."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:381
 msgid "Web path to backgrounds."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:390
 msgid "Server for backgrounds on SSL pages."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:399
 msgid "Web path to backgrounds on SSL pages."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:408
 msgid "Directory where backgrounds are located."
 msgstr ""
 
 #. TRANS: Fieldset legens in Paths admin panel.
-#: actions/pathsadminpanel.php:419
 msgid "Attachments"
 msgstr "Pezhioù stag"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:427
 #, fuzzy
 msgid "Server for attachments."
 msgstr "Dodenn evit al lec'hienn."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:436
 #, fuzzy
 msgid "Web path to attachments."
 msgstr "N'eus restr stag ebet."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:445
 #, fuzzy
 msgid "Server for attachments on SSL pages."
 msgstr "Dodenn evit al lec'hienn."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:454
 msgid "Web path to attachments on SSL pages."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:463
 msgid "Directory where attachments are located."
 msgstr ""
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:472
 msgid "SSL"
 msgstr "SSL"
 
 #. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
-#: actions/pathsadminpanel.php:477 actions/snapshotadminpanel.php:202
 msgid "Never"
 msgstr "Morse"
 
 #. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
-#: actions/pathsadminpanel.php:479
 msgid "Sometimes"
 msgstr "A-wechoù"
 
 #. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
-#: actions/pathsadminpanel.php:481
 msgid "Always"
 msgstr "Atav"
 
-#: actions/pathsadminpanel.php:485
 msgid "Use SSL"
 msgstr "Implijout SSL"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:487
 #, fuzzy
 msgid "When to use SSL."
 msgstr "Peur implijout SSL"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:497
 msgid "Server to direct SSL requests to."
 msgstr ""
 
 #. TRANS: Button title text to store form data in the Paths admin panel.
-#: actions/pathsadminpanel.php:514
 msgid "Save paths"
 msgstr "Enrollañ an hentadoù."
 
 #. TRANS: Instructions for the "People search" page.
 #. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/peoplesearch.php:54
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
@@ -4414,57 +3627,46 @@ msgstr ""
 "arouezenn."
 
 #. TRANS: Title of a page where users can search for other users.
-#: actions/peoplesearch.php:61
 msgid "People search"
 msgstr "Klask tud"
 
-#: actions/peopletag.php:68
 #, php-format
 msgid "Not a valid people tag: %s."
 msgstr "N'eo ket reizh ar merk-se : %s."
 
-#: actions/peopletag.php:142
 #, php-format
 msgid "Users self-tagged with %1$s - page %2$d"
 msgstr "Implijerien bet merket drezo o unan gant %1$s - pajenn %2$d"
 
 #. TRANS: Page title for AJAX form return when a disabling a plugin.
-#: actions/plugindisable.php:69
 msgctxt "plugin"
 msgid "Disabled"
 msgstr ""
 
 #. TRANS: Client error displayed trying to perform any request method other than POST.
 #. TRANS: Do not translate POST.
-#: actions/pluginenable.php:78 actions/subscribe.php:77
 msgid "This action only accepts POST requests."
 msgstr ""
 
-#: actions/pluginenable.php:102
 #, fuzzy
 msgid "You cannot administer plugins."
 msgstr "N'hallit ket diverkañ implijerien."
 
-#: actions/pluginenable.php:109
 #, fuzzy
 msgid "No such plugin."
 msgstr "N'eus ket eus ar bajenn-se."
 
 #. TRANS: Page title for AJAX form return when enabling a plugin.
-#: actions/pluginenable.php:159
 msgctxt "plugin"
 msgid "Enabled"
 msgstr ""
 
 #. TRANS: Tab and title for plugins admin panel.
 #. TRANS: Menu item for site administration
-#: actions/pluginsadminpanel.php:56 actions/version.php:191
-#: lib/adminpanelaction.php:411
 msgid "Plugins"
 msgstr "Pluginoù"
 
 #. TRANS: Instructions at top of plugin admin page.
-#: actions/pluginsadminpanel.php:68
 msgid ""
 "Additional plugins can be enabled and configured manually. See the <a href="
 "\"http://status.net/wiki/Plugins\">online plugin documentation</a> for more "
@@ -4472,21 +3674,17 @@ msgid ""
 msgstr ""
 
 #. TRANS: Admin form section header
-#: actions/pluginsadminpanel.php:84
 #, fuzzy
 msgid "Default plugins"
 msgstr "Yezh dre ziouer"
 
-#: actions/pluginsadminpanel.php:106
 msgid ""
 "All default plugins have been disabled from the site's configuration file."
 msgstr ""
 
-#: actions/postnotice.php:95
 msgid "Invalid notice content."
 msgstr "Danvez direizh an ali."
 
-#: actions/postnotice.php:101
 #, php-format
 msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’."
 msgstr ""
@@ -4494,12 +3692,10 @@ msgstr ""
 "lec'hienn \"%2$s\"."
 
 #. TRANS: Page title for profile settings.
-#: actions/profilesettings.php:60
 msgid "Profile settings"
 msgstr "Arventennoù ar profil"
 
 #. TRANS: Usage instructions for profile settings.
-#: actions/profilesettings.php:71
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
@@ -4507,31 +3703,24 @@ msgstr ""
 "diwar ho penn."
 
 #. TRANS: Profile settings form legend.
-#: actions/profilesettings.php:99
 msgid "Profile information"
 msgstr "Titouroù ar profil"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:110 actions/register.php:412
 #, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr "1 da 64 lizherenn vihan pe sifr, hep poentaouiñ nag esaouenn"
 
 #. TRANS: Field label in form for profile settings.
-#: actions/profilesettings.php:114 actions/register.php:434
-#: lib/groupeditform.php:150
 msgid "Full name"
 msgstr "Anv klok"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:119 actions/register.php:439
-#: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "Pajenn degemer"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:122 actions/register.php:441
 #, fuzzy
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr "URL ho pajenn degemer, ho blog, pe ho profil en ul lec'hienn all"
@@ -4539,7 +3728,6 @@ msgstr "URL ho pajenn degemer, ho blog, pe ho profil en ul lec'hienn all"
 #. TRANS: Tooltip for field label in form for profile settings. Plural
 #. TRANS: is decided by the number of characters available for the
 #. TRANS: biography (%d).
-#: actions/profilesettings.php:130 actions/register.php:450
 #, fuzzy, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4547,41 +3735,31 @@ msgstr[0] "Deskrivit ac'hanoc'h hag ho interestoù, gant %d arouezenn"
 msgstr[1] "Deskrivit ac'hanoc'h hag ho interestoù, gant %d arouezenn"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:136 actions/register.php:455
 msgid "Describe yourself and your interests"
 msgstr "Deskrivit hoc'h-unan hag ar pezh a zedenn ac'hanoc'h"
 
 #. TRANS: Text area label in form for profile settings where users can provide.
 #. TRANS: their biography.
-#: actions/profilesettings.php:140 actions/register.php:457
 msgid "Bio"
 msgstr "Buhezskrid"
 
 #. TRANS: Field label in form for profile settings.
-#: actions/profilesettings.php:146 actions/register.php:462
-#: lib/groupeditform.php:173
 msgid "Location"
 msgstr "Lec'hiadur"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:149
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "El lec'h m'emaoc'h, da skouer \"Kêr, Stad (pe Rannvro), Bro\""
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:154
 msgid "Share my current location when posting notices"
 msgstr "Rannañ va lec'hiadur pa bostan un ali."
 
 #. TRANS: Field label in form for profile settings.
-#: actions/profilesettings.php:162 actions/tagother.php:128
-#: actions/tagother.php:188 lib/subscriptionlist.php:104
-#: lib/subscriptionlist.php:106
 msgid "Tags"
 msgstr "Balizennoù"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:165
 #, fuzzy
 msgid ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- "
@@ -4591,28 +3769,23 @@ msgstr ""
 "virgulennoù pe esaouennoù"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:170
 msgid "Language"
 msgstr "Yezh"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:172
 #, fuzzy
 msgid "Preferred language."
 msgstr "Yezh d'ober ganti da gentañ"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:182
 msgid "Timezone"
 msgstr "Takad eur"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:184
 msgid "What timezone are you normally in?"
 msgstr "Pehini eo gwerzhid-eur boaz ?"
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:190
 #, fuzzy
 msgid ""
 "Automatically subscribe to whoever subscribes to me (best for non-humans)."
@@ -4623,7 +3796,6 @@ msgstr ""
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Plural form is used based on the maximum number of allowed
 #. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:259 actions/register.php:214
 #, fuzzy, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4631,85 +3803,69 @@ msgstr[0] "Re hir eo ar bio (%d arouezenn d'ar muiañ)."
 msgstr[1] "Re hir eo ar bio (%d arouezenn d'ar muiañ)."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:270 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr "N'eo bet dibabet gwerzhid-eur ebet."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:278
 #, fuzzy
 msgid "Language is too long (maximum 50 characters)."
 msgstr "Re hir eo ar yezh (255 arouezenn d'ar muiañ)."
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:292
 #, fuzzy, php-format
 msgid "Invalid tag: \"%s\"."
 msgstr "Balizenn direizh : \"%s\""
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:348
 #, fuzzy
 msgid "Could not update user for autosubscribe."
 msgstr "Dibosupl eo hizivaat ar c'houmanant ez emgefre."
 
 #. TRANS: Server error thrown when user profile location preference settings could not be updated.
-#: actions/profilesettings.php:406
 #, fuzzy
 msgid "Could not save location prefs."
 msgstr "Dibosupl eo enrollañ an dibaboù lec'hiadur."
 
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:428 actions/tagother.php:179
 msgid "Could not save tags."
 msgstr "Dibosupl eo enrollañ ar merkoù."
 
 #. TRANS: Confirmation shown when user profile settings are saved.
 #. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:437 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "Enrollet eo bet an arventennoù."
 
 #. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
 #. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:484 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "Krouiñ ur gont"
 
-#: actions/public.php:83
 #, php-format
 msgid "Beyond the page limit (%s)."
 msgstr "Dreist da bevennoù ar bajenn (%s)."
 
-#: actions/public.php:92
 msgid "Could not retrieve public stream."
 msgstr "Dibosupl eo adtapout al lanv foran."
 
-#: actions/public.php:130
 #, php-format
 msgid "Public timeline, page %d"
 msgstr "Lanv foran - pajenn %d"
 
-#: actions/public.php:132 lib/publicgroupnav.php:79
 msgid "Public timeline"
 msgstr "Lanv foran"
 
-#: actions/public.php:160
 msgid "Public Stream Feed (RSS 1.0)"
 msgstr "Neudenn gwazh foran (RSS 1.0)"
 
-#: actions/public.php:164
 msgid "Public Stream Feed (RSS 2.0)"
 msgstr "Neudenn gwazh foran (RSS 2.0)"
 
-#: actions/public.php:168
 msgid "Public Stream Feed (Atom)"
 msgstr "Neudenn gwazh foran (Atom)"
 
-#: actions/public.php:188
 #, php-format
 msgid ""
 "This is the public timeline for %%site.name%% but no one has posted anything "
@@ -4717,11 +3873,9 @@ msgid ""
 msgstr ""
 "Kronologiezh foran %%site.name%% eo, met den n'en deus skrivet tra ebet."
 
-#: actions/public.php:191
 msgid "Be the first to post!"
 msgstr "Bezit an hini gentañ da bostañ !"
 
-#: actions/public.php:195
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post!"
@@ -4729,7 +3883,6 @@ msgstr ""
 "Perak ne [groufec'h ket ur gont](%%action.register%%) ha bezañ an hini "
 "gentañ da embann un dra !"
 
-#: actions/public.php:242
 #, fuzzy, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -4740,7 +3893,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/)."
 
-#: actions/public.php:247
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -4751,19 +3903,16 @@ msgstr ""
 "Microblog) diazezet war ar meziant frank [StatusNet](http://status.net/)."
 
 #. TRANS: Public RSS feed description. %s is the StatusNet site name.
-#: actions/publicrss.php:106
 #, fuzzy, php-format
 msgid "%s updates from everyone."
 msgstr "%s statud an holl !"
 
 #. TRANS: Title for public tag cloud.
-#: actions/publictagcloud.php:57
 msgid "Public tag cloud"
 msgstr "Koumoulenn a merkoù foran"
 
 #. TRANS: Instructions (more used like an explanation/header).
 #. TRANS: %s is the StatusNet sitename.
-#: actions/publictagcloud.php:65
 #, fuzzy, php-format
 msgid "These are most popular recent tags on %s"
 msgstr "Ar merkoù ziwezhañ evit ar re vrudetañ war %s "
@@ -4771,14 +3920,12 @@ msgstr "Ar merkoù ziwezhañ evit ar re vrudetañ war %s "
 #. TRANS: This message contains a Markdown URL. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.
-#: actions/publictagcloud.php:74
 #, php-format
 msgid "No one has posted a notice with a [hashtag](%%doc.tags%%) yet."
 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.
-#: actions/publictagcloud.php:79
 msgid "Be the first to post one!"
 msgstr "Bezit an hini gentañ oc'h embann unan !"
 
@@ -4787,7 +3934,6 @@ msgstr "Bezit an hini gentañ oc'h embann unan !"
 #. TRANS: This message contains a Markdown URL. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.
-#: actions/publictagcloud.php:87
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post "
@@ -4797,42 +3943,34 @@ msgstr ""
 "gentañ da embann un dra !"
 
 #. TRANS: Client error displayed trying to recover password while already logged in.
-#: actions/recoverpassword.php:37
 msgid "You are already logged in!"
 msgstr "Luget oc'h dija !"
 
 #. TRANS: Client error displayed when password recovery code is not correct.
-#: actions/recoverpassword.php:64
 msgid "No such recovery code."
 msgstr "Kod adtapout nann-kavet."
 
 #. TRANS: Client error displayed when no proper password recovery code was submitted.
-#: actions/recoverpassword.php:69
 msgid "Not a recovery code."
 msgstr "N'eo ket ur c'hod adtapout an dra-mañ."
 
 #. TRANS: Server error displayed trying to recover password without providing a user.
-#: actions/recoverpassword.php:77
 msgid "Recovery code for unknown user."
 msgstr "Kod adtapout evit un implijer dizanv."
 
 #. TRANS: Server error displayed removing a password recovery code from the database.
-#: actions/recoverpassword.php:91
 msgid "Error with confirmation code."
 msgstr "Ur fazi 'zo bet gant ar c'hod kadarnaat."
 
 #. TRANS: Client error displayed trying to recover password with too old a recovery code.
-#: actions/recoverpassword.php:103
 msgid "This confirmation code is too old. Please start again."
 msgstr "Re gozh eo ar c'hod gwiriañ. Adkrogit mar plij."
 
 #. TRANS: Server error displayed when updating a user's e-mail address in the database fails while recovering a password.
-#: actions/recoverpassword.php:118
 msgid "Could not update user with confirmed email address."
 msgstr "Dibosupl eo hizivaat an implijer gant ar chomlec'h postel gwiriekaet."
 
 #. TRANS: Page notice for password recovery page.
-#: actions/recoverpassword.php:160
 msgid ""
 "If you have forgotten or lost your password, you can get a new one sent to "
 "the email address you have stored in your account."
@@ -4840,100 +3978,82 @@ msgstr ""
 "M'o peus disoñjet pe kollet ho ger-tremen, e c'helloc'h kaout unan nevez hag "
 "a vo kaset deoc'h d'ar chomlec'h postel termenet en ho kont."
 
-#: actions/recoverpassword.php:167
 msgid "You have been identified. Enter a new password below."
 msgstr "Diskleriet oc'h bet. Lakait ur ger-tremen nevez amañ da heul."
 
 #. TRANS: Fieldset legend for password recovery page.
-#: actions/recoverpassword.php:198
 msgid "Password recovery"
 msgstr "Adtapout ar ger-tremen"
 
 #. TRANS: Field label on password recovery page.
-#: actions/recoverpassword.php:202
 msgid "Nickname or email address"
 msgstr "Lesanv pe chomlec'h postel"
 
 #. TRANS: Title for field label on password recovery page.
-#: actions/recoverpassword.php:205
 msgid "Your nickname on this server, or your registered email address."
 msgstr ""
 "Ho lesanv war ar servijer-mañ, pe ar chomlec'h postel ho peus enrollet."
 
 #. TRANS: Field label on password recovery page.
-#: actions/recoverpassword.php:212
 msgid "Recover"
 msgstr "Adtapout"
 
 #. TRANS: Button text on password recovery page.
-#: actions/recoverpassword.php:214
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Recover"
 msgstr "Adtapout"
 
 #. TRANS: Title for password recovery page in password reset mode.
-#: actions/recoverpassword.php:223
 msgid "Reset password"
 msgstr "Adderaouekaat ar ger-tremen"
 
 #. TRANS: Title for password recovery page in password recover mode.
-#: actions/recoverpassword.php:225
 msgid "Recover password"
 msgstr "Adtapout ar ger-tremen"
 
 #. TRANS: Title for password recovery page in email sent mode.
 #. TRANS: Subject for password recovery e-mail.
-#: actions/recoverpassword.php:227 actions/recoverpassword.php:366
 msgid "Password recovery requested"
 msgstr "Goulennet eo an adtapout gerioù-tremen"
 
 #. TRANS: Title for password recovery page in password saved mode.
-#: actions/recoverpassword.php:229
 #, fuzzy
 msgid "Password saved"
 msgstr "Ger-tremen enrollet."
 
 #. TRANS: Title for password recovery page when an unknown action has been specified.
-#: actions/recoverpassword.php:232
 msgid "Unknown action"
 msgstr "Oberiadenn dianav"
 
 #. TRANS: Title for field label for password reset form.
-#: actions/recoverpassword.php:258
 #, fuzzy
 msgid "6 or more characters, and do not forget it!"
 msgstr "6 arouezenn pe muioc'h, ha n'e zisoñjit ket !"
 
 #. TRANS: Button text for password reset form.
 #. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: actions/recoverpassword.php:268 lib/designform.php:145
 msgctxt "BUTTON"
 msgid "Reset"
 msgstr "Adderaouiñ"
 
 #. TRANS: Form instructions for password recovery form.
-#: actions/recoverpassword.php:278
 msgid "Enter a nickname or email address."
 msgstr "Lakait ul lesanv pe ur chomlec'h postel."
 
 #. TRANS: Information on password recovery form if no known username or e-mail address was specified.
-#: actions/recoverpassword.php:309
 msgid "No user with that email address or username."
 msgstr "N'eus bet kavet implijer ebet gant ar postel-se pe an anv-se."
 
 #. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
-#: actions/recoverpassword.php:327
 msgid "No registered email address for that user."
 msgstr "Chomlec'h postel enrollet ebet evit an implijer-mañ."
 
 #. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
-#: actions/recoverpassword.php:342
 msgid "Error saving address confirmation."
 msgstr "Ur fazi 'zo bet pa voe enrollet kod kadarnaat ar postel."
 
 #. TRANS: User notification after an e-mail with instructions was sent from the password recovery form.
-#: actions/recoverpassword.php:370
 msgid ""
 "Instructions for recovering your password have been sent to the email "
 "address registered to your account."
@@ -4942,136 +4062,109 @@ msgstr ""
 "ret evit gouzout penaos adtapout o ger-tremen."
 
 #. TRANS: Client error displayed when trying to reset as password without providing a user.
-#: actions/recoverpassword.php:391
 msgid "Unexpected password reset."
 msgstr "Adderaouekadur dic'hortoz ar ger-tremen."
 
 #. TRANS: Reset password form validation error message.
-#: actions/recoverpassword.php:400
 #, fuzzy
 msgid "Password must be 6 characters or more."
 msgstr "Rankout a ra ar ger-tremen bezañ 6 arouezenn d'an nebeutañ."
 
 #. TRANS: Reset password form validation error message.
-#: actions/recoverpassword.php:405
 msgid "Password and confirmation do not match."
 msgstr "Ne glot ket ar ger-tremen gant ar c'hadarnadur."
 
 #. TRANS: Server error displayed when something does wrong with the user object during password reset.
-#: actions/recoverpassword.php:426 actions/register.php:241
 msgid "Error setting user."
 msgstr "Ur fazi 'zo bet e-pad kefluniadur an implijer."
 
 #. TRANS: Success message for user after password reset.
-#: actions/recoverpassword.php:434
 msgid "New password successfully saved. You are now logged in."
 msgstr "Krouet eo bet ar ger-tremen nevez. Kevreet oc'h bremañ."
 
-#: actions/redirecturl.php:70
 #, fuzzy
 msgid "No id parameter"
 msgstr "Arguzenn ID ebet."
 
-#: actions/redirecturl.php:76
 #, fuzzy, php-format
 msgid "No such file \"%d\""
 msgstr "Restr ezvezant."
 
-#: actions/register.php:80 actions/register.php:181 actions/register.php:392
 msgid "Sorry, only invited people can register."
 msgstr ""
 "Digarezit, met n'eus nemet an implijerien bet pedet hag a c'hell en em "
 "enskrivañ."
 
-#: actions/register.php:87
 msgid "Sorry, invalid invitation code."
 msgstr "Digarezit, kod pedadenn direizh."
 
-#: actions/register.php:106
 msgid "Registration successful"
 msgstr "Krouet eo bet ar gont."
 
-#: actions/register.php:108 actions/register.php:490
 msgid "Register"
 msgstr "Krouiñ ur gont"
 
-#: actions/register.php:128
 msgid "Registration not allowed."
 msgstr "N'eo ket aotreet krouiñ kontoù."
 
-#: actions/register.php:194
 #, fuzzy
 msgid "You cannot register if you don't agree to the license."
 msgstr ""
 "Rankout a rit bezañ a-du gant termenoù an aotre-implijout evit krouiñ ur "
 "gont."
 
-#: actions/register.php:203
 msgid "Email address already exists."
 msgstr "Implijet eo dija ar chomlec'h postel-se."
 
-#: actions/register.php:236 actions/register.php:258
 msgid "Invalid username or password."
 msgstr "Anv implijer pe ger-tremen direizh."
 
-#: actions/register.php:333
 msgid ""
 "With this form you can create a new account. You can then post notices and "
 "link up to friends and colleagues."
 msgstr ""
 
-#: actions/register.php:424 actions/register.php:428
-#: actions/siteadminpanel.php:238 lib/settingsnav.php:92
 msgid "Email"
 msgstr "Postel"
 
-#: actions/register.php:425 actions/register.php:429
 #, fuzzy
 msgid "Used only for updates, announcements, and password recovery."
 msgstr ""
 "Implijet hepken evit an hizivadennoù, ar c'hemennoù, pe adtapout gerioù-"
 "tremen"
 
-#: actions/register.php:436
 #, fuzzy
 msgid "Longer name, preferably your \"real\" name."
 msgstr "Anv hiroc'h, ho anv \"gwir\" a zo gwelloc'h"
 
-#: actions/register.php:464
 #, fuzzy
 msgid "Where you are, like \"City, State (or Region), Country\"."
 msgstr "El lec'h m'emaoc'h, da skouer \"Kêr, Stad (pe Rannvro), Bro\""
 
-#: actions/register.php:503
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
 msgstr "Kompren a ran ez eo prevez danvez ha roadennoù %1$s."
 
-#: actions/register.php:513
 #, php-format
 msgid "My text and files are copyright by %1$s."
 msgstr "Ma zestenn ha ma restroù a zo gwarezet dre copyright gant %1$s."
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:517
 msgid "My text and files remain under my own copyright."
 msgstr "Ma zestenn ha ma restroù a chom dindan ma gwirioù oberour."
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:520
 msgid "All rights reserved."
 msgstr "Holl gwrioù miret strizh."
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:525
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
 "email address, IM address, and phone number."
 msgstr ""
 
-#: actions/register.php:566
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -5090,7 +4183,6 @@ msgid ""
 "Thanks for signing up and we hope you enjoy using this service."
 msgstr ""
 
-#: actions/register.php:590
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5098,7 +4190,6 @@ msgstr ""
 "(Resevout a reoc'h a-benn nebeut ur postel gant an titouroù evit kadarnaat "
 "ho chomlec'h.)"
 
-#: actions/remotesubscribe.php:97
 #, php-format
 msgid ""
 "To subscribe, you can [login](%%action.login%%), or [register](%%action."
@@ -5106,109 +4197,84 @@ msgid ""
 "microblogging site](%%doc.openmublog%%),  enter your profile URL below."
 msgstr ""
 
-#: actions/remotesubscribe.php:111
 msgid "Remote subscribe"
 msgstr "Koumanant eus a-bell"
 
-#: actions/remotesubscribe.php:123
 msgid "Subscribe to a remote user"
 msgstr "Koumanantiñ d'un implijer pell"
 
-#: actions/remotesubscribe.php:128
 msgid "User nickname"
 msgstr "Lesanv an implijer"
 
-#: actions/remotesubscribe.php:129
 #, fuzzy
 msgid "Nickname of the user you want to follow."
 msgstr "Lesanv an implijer ho peus c'hoant heuliañ"
 
-#: actions/remotesubscribe.php:132
 msgid "Profile URL"
 msgstr "URL ar profil"
 
-#: actions/remotesubscribe.php:133
 msgid "URL of your profile on another compatible microblogging service."
 msgstr ""
 
 #. TRANS: Link text for link that will subscribe to a remote profile.
-#: actions/remotesubscribe.php:136 lib/subscribeform.php:139
-#: lib/userprofile.php:402
 msgid "Subscribe"
 msgstr "En em enskrivañ"
 
-#: actions/remotesubscribe.php:158
 #, fuzzy
 msgid "Invalid profile URL (bad format)."
 msgstr "URL direizh evit ar profil (furmad fall)"
 
-#: actions/remotesubscribe.php:167
 msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
 msgstr ""
 
-#: actions/remotesubscribe.php:175
 #, fuzzy
 msgid "That is a local profile! Login to subscribe."
 msgstr "Lec'hel eo ar profil-mañ ! Kevreit evit koumananti."
 
-#: actions/remotesubscribe.php:182
 #, fuzzy
 msgid "Could not get a request token."
 msgstr "Dibosupl eo kaout ur jedaouer reked."
 
-#: actions/repeat.php:56
 msgid "Only logged-in users can repeat notices."
 msgstr "N'eus nemet an implijerien kevreet hag a c'hell adkemer alioù."
 
-#: actions/repeat.php:63 actions/repeat.php:70
 msgid "No notice specified."
 msgstr "N'eus bet diferet ali ebet."
 
-#: actions/repeat.php:75
 #, fuzzy
 msgid "You cannot repeat your own notice."
 msgstr "Ne c'helloc'h ket adkemer ho ali deoc'h."
 
-#: actions/repeat.php:89
 msgid "You already repeated that notice."
 msgstr "Adkemeret ho peus ar c'hemenn-mañ c'hoazh."
 
-#: actions/repeat.php:112 lib/noticelist.php:697
 msgid "Repeated"
 msgstr "Adlavaret"
 
-#: actions/repeat.php:117
 msgid "Repeated!"
 msgstr "Adlavaret !"
 
 #. TRANS: RSS reply feed title. %s is a user nickname.
-#: actions/replies.php:126 actions/repliesrss.php:68
-#: lib/personalgroupnav.php:105
 #, php-format
 msgid "Replies to %s"
 msgstr "Respontoù da %s"
 
-#: actions/replies.php:128
 #, php-format
 msgid "Replies to %1$s, page %2$d"
 msgstr "Respontoù da %1$s, pajenn %2$d"
 
-#: actions/replies.php:145
 #, php-format
 msgid "Replies feed for %s (RSS 1.0)"
 msgstr "Gwazh respontoù evit %s (RSS 1.0)"
 
-#: actions/replies.php:152
 #, php-format
 msgid "Replies feed for %s (RSS 2.0)"
 msgstr "Gwazh respontoù evit %s (RSS 2.0)"
 
-#: actions/replies.php:159
 #, php-format
 msgid "Replies feed for %s (Atom)"
 msgstr "Gwazh respontoù evit %s (Atom)"
 
-#: actions/replies.php:199
 #, fuzzy, php-format
 msgid ""
 "This is the timeline showing replies to %1$s but %2$s hasn't received a "
@@ -5217,14 +4283,12 @@ msgstr ""
 "Hemañ eo al lanvad evit %s hag e vignoned met den n'en deus skrivet tra ebet "
 "evit ar mare."
 
-#: actions/replies.php:204
 #, php-format
 msgid ""
 "You can engage other users in a conversation, subscribe to more people or "
 "[join groups](%%action.groups%%)."
 msgstr ""
 
-#: actions/replies.php:206
 #, php-format
 msgid ""
 "You can try to [nudge %1$s](../%2$s) or [post something to them](%%%%action."
@@ -5233,225 +4297,184 @@ msgstr ""
 
 #. TRANS: RSS reply feed description.
 #. TRANS: %1$s is a user nickname, %2$s is the StatusNet site name.
-#: actions/repliesrss.php:74
 #, fuzzy, php-format
 msgid "Replies to %1$s on %2$s."
 msgstr "Respontoù da %1$s war %2$s !"
 
 #. TRANS: Client exception displayed when trying to restore an account while not logged in.
-#: actions/restoreaccount.php:78
 #, fuzzy
 msgid "Only logged-in users can restore their account."
 msgstr "N'eus nemet an implijerien kevreet hag a c'hell adkemer alioù."
 
 #. TRANS: Client exception displayed when trying to restore an account without having restore rights.
-#: actions/restoreaccount.php:83
 #, fuzzy
 msgid "You may not restore your account."
 msgstr "N'ho peus enrollet poellad ebet evit poent."
 
 #. TRANS: Client exception displayed trying to restore an account while something went wrong uploading a file.
 #. TRANS: Client exception. No file; probably just a non-AJAX submission.
-#: actions/restoreaccount.php:121 actions/restoreaccount.php:146
 #, fuzzy
 msgid "No uploaded file."
 msgstr "Enporzhiañ ar restr"
 
 #. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
-#: actions/restoreaccount.php:129 lib/mediafile.php:194
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
 msgstr ""
 
 #. TRANS: Client exception.
-#: actions/restoreaccount.php:135 lib/mediafile.php:200
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form."
 msgstr ""
 
 #. TRANS: Client exception.
-#: actions/restoreaccount.php:141 lib/mediafile.php:206
 msgid "The uploaded file was only partially uploaded."
 msgstr ""
 
 #. TRANS: Client exception thrown when a temporary folder is not present to store a file upload.
-#: actions/restoreaccount.php:150 lib/mediafile.php:214
 msgid "Missing a temporary folder."
 msgstr "Mankout a ra un doser padennek."
 
 #. TRANS: Client exception thrown when writing to disk is not possible during a file upload operation.
-#: actions/restoreaccount.php:154 lib/mediafile.php:218
 msgid "Failed to write file to disk."
 msgstr ""
 
 #. TRANS: Client exception thrown when a file upload operation has been stopped by an extension.
-#: actions/restoreaccount.php:158 lib/mediafile.php:222
 msgid "File upload stopped by extension."
 msgstr ""
 
 #. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
 #. TRANS: Exception thrown when uploading an image fails for an unknown reason.
 #. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
-#: actions/restoreaccount.php:164 lib/imagefile.php:106 lib/mediafile.php:228
 msgid "System error uploading file."
 msgstr ""
 
 #. TRANS: Client exception thrown when a feed is not an Atom feed.
-#: actions/restoreaccount.php:207
 #, fuzzy
 msgid "Not an Atom feed."
 msgstr "An holl izili"
 
 #. TRANS: Success message when a feed has been restored.
-#: actions/restoreaccount.php:241
 msgid ""
 "Feed has been restored. Your old posts should now appear in search and your "
 "profile page."
 msgstr ""
 
 #. TRANS: Message when a feed restore is in progress.
-#: actions/restoreaccount.php:245
 msgid "Feed will be restored. Please wait a few minutes for results."
 msgstr ""
 
 #. TRANS: Form instructions for feed restore.
-#: actions/restoreaccount.php:342
 msgid ""
 "You can upload a backed-up stream in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format."
 msgstr ""
 
 #. TRANS: Title for submit button to confirm upload of a user backup file for account restore.
-#: actions/restoreaccount.php:373
 #, fuzzy
 msgid "Upload the file"
 msgstr "Enporzhiañ ar restr"
 
-#: actions/revokerole.php:75
 msgid "You cannot revoke user roles on this site."
 msgstr "Ne c'helloc'h ket reiñ rolloù d'an implijerien eus al lec'hienn-mañ."
 
-#: actions/revokerole.php:82
 msgid "User doesn't have this role."
 msgstr "n'en deus ket an implijer-mañ ar rol-se."
 
-#: actions/rsd.php:142 actions/version.php:159
 msgid "StatusNet"
 msgstr "StatusNet"
 
-#: actions/sandbox.php:65 actions/unsandbox.php:65
 #, fuzzy
 msgid "You cannot sandbox users on this site."
 msgstr "Ne c'helloc'h ket reiñ rolloù d'an implijerien eus al lec'hienn-mañ."
 
-#: actions/sandbox.php:72
 msgid "User is already sandboxed."
 msgstr "Er poull-traezh emañ dija an implijer."
 
 #. TRANS: Menu item for site administration
-#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
-#: lib/adminpanelaction.php:379
 msgid "Sessions"
 msgstr "Dalc'hoù"
 
-#: actions/sessionsadminpanel.php:65
 msgid "Session settings for this StatusNet site"
 msgstr ""
 
-#: actions/sessionsadminpanel.php:175
 msgid "Handle sessions"
 msgstr "Merañ an dalc'hoù"
 
-#: actions/sessionsadminpanel.php:177
 msgid "Whether to handle sessions ourselves."
 msgstr "Ma rankomp merañ an dalc'hoù hon unan."
 
-#: actions/sessionsadminpanel.php:181
 msgid "Session debugging"
 msgstr "Dizreinadenn an dalc'h"
 
-#: actions/sessionsadminpanel.php:183
 msgid "Turn on debugging output for sessions."
 msgstr ""
 
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
+#. TRANS: Submit button title.
+msgid "Save"
+msgstr "Enrollañ"
+
 msgid "Save site settings"
 msgstr "Enrollañ arventennoù al lec'hienn"
 
-#: actions/showapplication.php:78
 msgid "You must be logged in to view an application."
 msgstr "Rankout a reoc'h bezañ kevreet evit gwelet ur poellad."
 
-#: actions/showapplication.php:151
 msgid "Application profile"
 msgstr "Profil ar poellad"
 
-#: actions/showapplication.php:179
 #, php-format
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr "Krouet gant %1$s - moned %2$s dre ziouer - %3$d implijer"
 
-#: actions/showapplication.php:189
 msgid "Application actions"
 msgstr "Obererezhioù ar poellad"
 
-#: actions/showapplication.php:212
 msgid "Reset key & secret"
 msgstr "Adderaouekaat an alc'hwez hag ar sekred"
 
 #. TRANS: Title of form for deleting a user.
-#: actions/showapplication.php:228 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:64 lib/noticelist.php:678
 msgid "Delete"
 msgstr "Diverkañ"
 
-#: actions/showapplication.php:237
 msgid "Application info"
 msgstr "Titouroù ar poelad"
 
-#: actions/showapplication.php:255
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
 msgstr ""
 
-#: actions/showapplication.php:275
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr ""
 "Ha sur oc'h ho peus c'hoant adderaouekaat ho alc'hwez bevezer ha sekred ?"
 
 #. TRANS: Title for all but the first page of favourite notices of a user.
 #. TRANS: %1$s is the user for whom the favourite notices are displayed, %2$d is the page number.
-#: actions/showfavorites.php:80
 #, php-format
 msgid "%1$s's favorite notices, page %2$d"
 msgstr "Alioù karetañ %1$s, pajenn %2$d"
 
 #. TRANS: Server error displayed when favourite notices could not be retrieved from the database.
-#: actions/showfavorites.php:134
 msgid "Could not retrieve favorite notices."
 msgstr "Diposupl eo diskwel ar pennrolloù."
 
 #. TRANS: Feed link text. %s is a username.
-#: actions/showfavorites.php:172
 #, php-format
 msgid "Feed for favorites of %s (RSS 1.0)"
 msgstr "Gwazh evit mignoned %s (RSS 1.0)"
 
 #. TRANS: Feed link text. %s is a username.
-#: actions/showfavorites.php:180
 #, php-format
 msgid "Feed for favorites of %s (RSS 2.0)"
 msgstr "Gwazh evit mignoned %s (RSS 2.0)"
 
 #. TRANS: Feed link text. %s is a username.
-#: actions/showfavorites.php:188
 #, php-format
 msgid "Feed for favorites of %s (Atom)"
 msgstr "Gwazh evit mignoned %s (Atom)"
 
 #. TRANS: Text displayed instead of favourite notices for the current logged in user that has no favourites.
-#: actions/showfavorites.php:209
 msgid ""
 "You haven't chosen any favorite notices yet. Click the fave button on "
 "notices you like to bookmark them for later or shed a spotlight on them."
@@ -5459,7 +4482,6 @@ msgstr ""
 
 #. TRANS: Text displayed instead of favourite notices for a user that has no favourites while logged in.
 #. TRANS: %s is a username.
-#: actions/showfavorites.php:213
 #, php-format
 msgid ""
 "%s hasn't added any favorite notices yet. Post something interesting they "
@@ -5469,7 +4491,6 @@ msgstr ""
 #. TRANS: Text displayed instead of favourite notices for a user that has no favourites while not logged in.
 #. TRANS: %s is a username, %%%%action.register%%%% is a link to the user registration page.
 #. TRANS: (link text)[link] is a Mark Down link.
-#: actions/showfavorites.php:220
 #, php-format
 msgid ""
 "%s hasn't added any favorite notices yet. Why not [register an account](%%%%"
@@ -5478,64 +4499,53 @@ msgid ""
 msgstr ""
 
 #. TRANS: Page notice for show favourites page.
-#: actions/showfavorites.php:251
 msgid "This is a way to share what you like."
 msgstr "Un doare eo evit kevranañ ar pezh a blij deoc'h."
 
 #. TRANS: Page title for first group page. %s is a group name.
-#: actions/showgroup.php:75
 #, php-format
 msgid "%s group"
 msgstr "strollad %s"
 
 #. TRANS: Page title for any but first group page.
 #. TRANS: %1$s is a group name, $2$s is a page number.
-#: actions/showgroup.php:79
 #, php-format
 msgid "%1$s group, page %2$d"
 msgstr "Strollad %1$s, pajenn %2$d"
 
 #. TRANS: Label for group description or group note (dt). Text hidden by default.
-#: actions/showgroup.php:266
 msgid "Note"
 msgstr "Notenn"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:277 lib/groupeditform.php:180
 msgid "Aliases"
 msgstr "Aliasoù"
 
 #. TRANS: Group actions header (h2). Text hidden by default.
-#: actions/showgroup.php:294
 msgid "Group actions"
 msgstr "Obererezh ar strollad"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:338
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
 msgstr "Neudenn alioù ar strollad %s (RSS 1.0)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:345
 #, php-format
 msgid "Notice feed for %s group (RSS 2.0)"
 msgstr "Neudenn alioù ar strollad %s (RSS 2.0)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:352
 #, php-format
 msgid "Notice feed for %s group (Atom)"
 msgstr "Neudenn alioù ar strollad %s (Atom)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:358
 #, php-format
 msgid "FOAF for %s group"
 msgstr "Mignon ur mignon evit ar strollad %s"
 
 #. TRANS: Header for mini list of group members on a group page (h2).
-#: actions/showgroup.php:395
 msgid "Members"
 msgstr "Izili"
 
@@ -5543,30 +4553,23 @@ msgstr "Izili"
 #. TRANS: Text for user subscription statistics if the user has no subscriptions.
 #. TRANS: Text for user subscriber statistics if user has no subscribers.
 #. TRANS: Text for user user group membership statistics if user is not a member of any group.
-#: actions/showgroup.php:401 lib/profileaction.php:137
-#: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
-#: lib/subscriptionlist.php:123 lib/tagcloudsection.php:71
 msgid "(None)"
 msgstr "(Hini ebet)"
 
 #. TRANS: Link to all group members from mini list of group members if group has more than n members.
-#: actions/showgroup.php:410
 msgid "All members"
 msgstr "An holl izili"
 
 #. TRANS: Header for group statistics on a group page (h2).
 #. TRANS: H2 text for user statistics.
-#: actions/showgroup.php:441 lib/profileaction.php:205
 msgid "Statistics"
 msgstr "Stadegoù"
 
-#: actions/showgroup.php:444
 msgctxt "LABEL"
 msgid "Created"
 msgstr "Krouet"
 
 #. TRANS: Label for member count in statistics on group page.
-#: actions/showgroup.php:449
 msgctxt "LABEL"
 msgid "Members"
 msgstr "Izili"
@@ -5575,7 +4578,6 @@ msgstr "Izili"
 #. TRANS: **%s** is the group alias, %%%%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).
-#: actions/showgroup.php:464
 #, fuzzy, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5590,7 +4592,6 @@ 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: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
-#: actions/showgroup.php:474
 #, fuzzy, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5602,17 +4603,14 @@ msgstr ""
 "Microblog) diazezet war ar meziant frank [StatusNet](http://status.net/)."
 
 #. TRANS: Header for list of group administrators on a group page (h2).
-#: actions/showgroup.php:503
 msgid "Admins"
 msgstr "Merourien"
 
 #. TRANS: Client error displayed requesting a single message that does not exist.
-#: actions/showmessage.php:76
 msgid "No such message."
 msgstr "N'eus ket eus ar gemennadenn-se."
 
 #. TRANS: Client error displayed requesting a single direct message the requesting user was not a party in.
-#: actions/showmessage.php:86
 msgid "Only the sender and recipient may read this message."
 msgstr ""
 "Ne c'hell bezañ lennet ar gemenadenn-mañ nemet gant ar c'haser hag ar "
@@ -5620,77 +4618,65 @@ msgstr ""
 
 #. TRANS: Page title for single direct message display when viewing user is the sender.
 #. TRANS: %1$s is the addressed user's nickname, $2$s is a timestamp.
-#: actions/showmessage.php:105
 #, php-format
 msgid "Message to %1$s on %2$s"
 msgstr "Kemanadenn kaset da %1$s d'an %2$s"
 
 #. TRANS: Page title for single message display.
 #. TRANS: %1$s is the sending user's nickname, $2$s is a timestamp.
-#: actions/showmessage.php:113
 #, php-format
 msgid "Message from %1$s on %2$s"
 msgstr "Kemenadenn resevet eus %1$s d'an %2$s"
 
-#: actions/shownotice.php:90
 msgid "Notice deleted."
 msgstr "Ali dilammet."
 
 #. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
-#: actions/showstream.php:70
 #, fuzzy, php-format
 msgid "%1$s tagged %2$s"
 msgstr "%1$s, pajenn %2$d"
 
 #. TRANS: Page title showing tagged notices in one user's stream.
 #. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
-#: actions/showstream.php:74
 #, fuzzy, php-format
 msgid "%1$s tagged %2$s, page %3$d"
 msgstr "Alioù merket gant %1$s, pajenn %2$d"
 
 #. TRANS: Extended page title showing tagged notices in one user's stream.
 #. TRANS: %1$s is the username, %2$d is the page number.
-#: actions/showstream.php:82
 #, php-format
 msgid "%1$s, page %2$d"
 msgstr "%1$s, pajenn %2$d"
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %1$s is a user nickname, %2$s is a hashtag.
-#: actions/showstream.php:127
 #, php-format
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
 msgstr "Neudenn an alioù evit %1$s merket %2$s (RSS 1.0)"
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.
-#: actions/showstream.php:136
 #, php-format
 msgid "Notice feed for %s (RSS 1.0)"
 msgstr "Neudenn an alioù evit %s (RSS 1.0)"
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.
-#: actions/showstream.php:145
 #, php-format
 msgid "Notice feed for %s (RSS 2.0)"
 msgstr "Neudenn an alioù evit %s (RSS 2.0)"
 
-#: actions/showstream.php:152
 #, php-format
 msgid "Notice feed for %s (Atom)"
 msgstr "Gwazh alioù %s (Atom)"
 
 #. TRANS: Title for link to notice feed. FOAF stands for Friend of a Friend.
 #. TRANS: More information at http://www.foaf-project.org. %s is a user nickname.
-#: actions/showstream.php:159
 #, php-format
 msgid "FOAF for %s"
 msgstr "mignon ur mignon evit %s"
 
 #. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
-#: actions/showstream.php:205
 #, fuzzy, php-format
 msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr ""
@@ -5698,7 +4684,6 @@ msgstr ""
 "evit ar mare."
 
 #. TRANS: Second sentence of empty list message for a stream for the user themselves.
-#: actions/showstream.php:211
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
@@ -5706,7 +4691,6 @@ msgstr ""
 
 #. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:215
 #, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
@@ -5715,7 +4699,6 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:258
 #, fuzzy, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5728,7 +4711,6 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:265
 #, fuzzy, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5739,146 +4721,113 @@ msgstr ""
 "Microblog) diazezet war ar meziant frank [StatusNet](http://status.net/)."
 
 #. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
-#: actions/showstream.php:322
 #, php-format
 msgid "Repeat of %s"
 msgstr "Adkemeret eus %s"
 
-#: actions/silence.php:65 actions/unsilence.php:65
 #, fuzzy
 msgid "You cannot silence users on this site."
 msgstr "Ne c'helloc'h ket reiñ rolloù d'an implijerien eus al lec'hienn-mañ."
 
-#: actions/silence.php:72
 msgid "User is already silenced."
 msgstr "Lakaet eo bet da mut an implijer-mañ dija."
 
-#: actions/siteadminpanel.php:69
 msgid "Basic settings for this StatusNet site"
 msgstr "Arventennoù diazez evit al lec'hienn StatusNet-mañ."
 
-#: actions/siteadminpanel.php:133
 msgid "Site name must have non-zero length."
 msgstr "Ne c'hell ket bezañ goullo anv al lec'hienn."
 
-#: actions/siteadminpanel.php:141
 #, fuzzy
 msgid "You must have a valid contact email address."
 msgstr "N'eo ket ur chomlec'h postel reizh."
 
-#: actions/siteadminpanel.php:159
 #, php-format
 msgid "Unknown language \"%s\"."
 msgstr "Yezh \"%s\" dizanv."
 
-#: actions/siteadminpanel.php:165
 msgid "Minimum text limit is 0 (unlimited)."
 msgstr "Ar vevenn izelañ evit an destenn a zo 0 arouezenn (anvevenn)."
 
-#: actions/siteadminpanel.php:171
 msgid "Dupe limit must be one or more seconds."
 msgstr ""
 
-#: actions/siteadminpanel.php:221
 msgid "General"
 msgstr "Hollek"
 
-#: actions/siteadminpanel.php:224
 msgid "Site name"
 msgstr "Anv al lec'hienn"
 
-#: actions/siteadminpanel.php:225
 msgid "The name of your site, like \"Yourcompany Microblog\""
 msgstr "Anv ho lec'hienn, evel \"Microblog ho embregerezh\""
 
-#: actions/siteadminpanel.php:229
 msgid "Brought by"
 msgstr "Degaset gant"
 
-#: actions/siteadminpanel.php:230
 msgid "Text used for credits link in footer of each page"
 msgstr ""
 
-#: actions/siteadminpanel.php:234
 msgid "Brought by URL"
 msgstr "Degaset dre URL"
 
-#: actions/siteadminpanel.php:235
 msgid "URL used for credits link in footer of each page"
 msgstr ""
 
-#: actions/siteadminpanel.php:239
 msgid "Contact email address for your site"
 msgstr "Chomlec'h postel daremprediñ ho lec'hienn"
 
-#: actions/siteadminpanel.php:245
 msgid "Local"
 msgstr "Lec'hel"
 
-#: actions/siteadminpanel.php:256
 #, fuzzy
 msgid "Default timezone"
 msgstr "Koumanantoù dre ziouer"
 
-#: actions/siteadminpanel.php:257
 msgid "Default timezone for the site; usually UTC."
 msgstr ""
 
-#: actions/siteadminpanel.php:262
 msgid "Default language"
 msgstr "Yezh dre ziouer"
 
-#: actions/siteadminpanel.php:263
 msgid "Site language when autodetection from browser settings is not available"
 msgstr ""
 
-#: actions/siteadminpanel.php:271
 msgid "Limits"
 msgstr "Bevennoù"
 
-#: actions/siteadminpanel.php:274
 msgid "Text limit"
 msgstr "Bevenn testenn"
 
-#: actions/siteadminpanel.php:274
 msgid "Maximum number of characters for notices."
 msgstr "Niver brasañ a arouezennoù evit an alioù."
 
-#: actions/siteadminpanel.php:278
 msgid "Dupe limit"
 msgstr "Bevenn a doublennoù"
 
-#: actions/siteadminpanel.php:278
 msgid "How long users must wait (in seconds) to post the same thing again."
 msgstr ""
 
 #. TRANS: Page title for site-wide notice tab in admin panel.
-#: actions/sitenoticeadminpanel.php:55
 msgid "Site Notice"
 msgstr "Ali al lec'hienn"
 
 #. TRANS: Instructions for site-wide notice tab in admin panel.
-#: actions/sitenoticeadminpanel.php:66
 msgid "Edit site-wide message"
 msgstr "Kemmañ ur gemennadenn hag a zo diwar-benn al lec'hienn a-bezh"
 
 #. TRANS: Server error displayed when saving a site-wide notice was impossible.
-#: actions/sitenoticeadminpanel.php:101
 msgid "Unable to save site notice."
 msgstr "Dibosupl eo enrollañ ali al lec'hienn."
 
 #. TRANS: Client error displayed when a site-wide notice was longer than allowed.
-#: actions/sitenoticeadminpanel.php:112
 msgid "Maximum length for the site-wide notice is 255 characters."
 msgstr ""
 
 #. TRANS: Label for site-wide notice text field in admin panel.
-#: actions/sitenoticeadminpanel.php:176
 msgid "Site notice text"
 msgstr "Testenn ali al lec'hienn"
 
 #. TRANS: Tooltip for site-wide notice text field in admin panel.
-#: actions/sitenoticeadminpanel.php:179
 #, fuzzy
 msgid "Site-wide notice text (255 characters maximum; HTML allowed)"
 msgstr ""
@@ -5886,19 +4835,16 @@ msgstr ""
 "HTML gweredekaet)"
 
 #. TRANS: Title for button to save site notice in admin panel.
-#: actions/sitenoticeadminpanel.php:201
 #, fuzzy
 msgid "Save site notice."
 msgstr "Enrollañ ali ul lec'hienn"
 
 #. TRANS: Title for SMS settings.
-#: actions/smssettings.php:56
 msgid "SMS settings"
 msgstr "Arventennoù SMS"
 
 #. TRANS: SMS settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/smssettings.php:70
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr ""
@@ -5906,131 +4852,107 @@ msgstr ""
 "%."
 
 #. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
-#: actions/smssettings.php:92
 msgid "SMS is not available."
 msgstr "Dizimplijadus eo an SMS."
 
 #. TRANS: Form legend for SMS settings form.
-#: actions/smssettings.php:106
 msgid "SMS address"
 msgstr "Chomlec'h SMS"
 
 #. TRANS: Form guide in SMS settings form.
-#: actions/smssettings.php:115
 msgid "Current confirmed SMS-enabled phone number."
 msgstr "Niverenn pellgomz bet gwiriekaet evit resevout SMSoù."
 
 #. TRANS: Form guide in IM settings form.
-#: actions/smssettings.php:128
 msgid "Awaiting confirmation on this phone number."
 msgstr "Niverenn pellgomz o c'hortoz bezañ kadarnaet."
 
 #. TRANS: Field label for SMS address input in SMS settings form.
-#: actions/smssettings.php:137
 msgid "Confirmation code"
 msgstr "Kod kadarnaat"
 
 #. TRANS: Form field instructions in SMS settings form.
-#: actions/smssettings.php:139
 msgid "Enter the code you received on your phone."
 msgstr "Lakait ar c'hod ho peus resevet war ho pellgomzer hezoug."
 
 #. TRANS: Button label to confirm SMS confirmation code in SMS settings.
-#: actions/smssettings.php:143
 msgctxt "BUTTON"
 msgid "Confirm"
 msgstr "Kadarnaat"
 
 #. TRANS: Field label for SMS phone number input in SMS settings form.
-#: actions/smssettings.php:148
 msgid "SMS phone number"
 msgstr "Niverenn bellgomz evit an SMS"
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
-#: actions/smssettings.php:151
 #, fuzzy
 msgid "Phone number, no punctuation or spaces, with area code."
 msgstr "1 da 64 lizherenn vihan pe sifr, hep poentaouiñ nag esaouenn"
 
 #. TRANS: Form legend for SMS preferences form.
-#: actions/smssettings.php:190
 msgid "SMS preferences"
 msgstr "Penndibaboù an SMSoù"
 
 #. TRANS: Checkbox label in SMS preferences form.
-#: actions/smssettings.php:196
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
 msgstr ""
 
 #. TRANS: Confirmation message for successful SMS preferences save.
-#: actions/smssettings.php:307
 msgid "SMS preferences saved."
 msgstr "Penndibaboù an SMSoù enrollet."
 
 #. TRANS: Message given saving SMS phone number without having provided one.
-#: actions/smssettings.php:329
 msgid "No phone number."
 msgstr "Niverenn bellgomz ebet."
 
 #. TRANS: Message given saving SMS phone number without having selected a carrier.
-#: actions/smssettings.php:335
 #, fuzzy
 msgid "No carrier selected."
 msgstr "Ali dilammet."
 
 #. TRANS: Message given saving SMS phone number that is already set.
-#: actions/smssettings.php:343
 msgid "That is already your phone number."
 msgstr "Ho niverenn pellgomz eo dija."
 
 #. TRANS: Message given saving SMS phone number that is already set for another user.
-#: actions/smssettings.php:347
 msgid "That phone number already belongs to another user."
 msgstr "D'un implijer all eo an niverenn-mañ dija."
 
 #. TRANS: Message given saving valid SMS phone number that is to be confirmed.
-#: actions/smssettings.php:375
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
 "for the code and instructions on how to use it."
 msgstr ""
 
 #. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
-#: actions/smssettings.php:403
 msgid "That is the wrong confirmation number."
 msgstr "Direizh eo ar c'hod gwiriekaat-mañ."
 
 #. TRANS: Message given after successfully canceling SMS phone number confirmation.
-#: actions/smssettings.php:417
 msgid "SMS confirmation cancelled."
 msgstr "Nullet eo bet ar gadarnadenn SMS."
 
 #. TRANS: Message given trying to remove an SMS phone number that is not
 #. TRANS: registered for the active user.
-#: actions/smssettings.php:437
 msgid "That is not your phone number."
 msgstr "n'eo ket ho niverenn pellgomz."
 
 #. TRANS: Message given after successfully removing a registered SMS phone number.
-#: actions/smssettings.php:459
 msgid "The SMS phone number was removed."
 msgstr "Dilamet eo bet an niverenn bellgomz evit an SMSoù."
 
 #. TRANS: Label for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:498
 msgid "Mobile carrier"
 msgstr "Pourvezer pellgomzerezh hezoug"
 
 #. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:503
 msgid "Select a carrier"
 msgstr "Dibab un douger"
 
 #. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
 #. TRANS: %s is an administrative contact's e-mail address.
-#: actions/smssettings.php:512
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -6038,125 +4960,100 @@ msgid ""
 msgstr ""
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
-#: actions/smssettings.php:534
 #, fuzzy
 msgid "No code entered."
 msgstr "N'eo bet lakaet kod ebet"
 
 #. TRANS: Menu item for site administration
-#: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
-#: lib/adminpanelaction.php:395
 msgid "Snapshots"
 msgstr "Prim"
 
-#: actions/snapshotadminpanel.php:65
 #, fuzzy
 msgid "Manage snapshot configuration"
 msgstr "Kefluniadur ar primoù"
 
-#: actions/snapshotadminpanel.php:127
 #, fuzzy
 msgid "Invalid snapshot run value."
 msgstr "Roll direizh."
 
-#: actions/snapshotadminpanel.php:133
 msgid "Snapshot frequency must be a number."
 msgstr ""
 
-#: actions/snapshotadminpanel.php:144
 #, fuzzy
 msgid "Invalid snapshot report URL."
 msgstr "URL fall evit al logo."
 
-#: actions/snapshotadminpanel.php:200
 msgid "Randomly during web hit"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:201
 msgid "In a scheduled job"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:206
 #, fuzzy
 msgid "Data snapshots"
 msgstr "Prim"
 
-#: actions/snapshotadminpanel.php:208
 msgid "When to send statistical data to status.net servers"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:217
 msgid "Frequency"
 msgstr "Stankter"
 
-#: actions/snapshotadminpanel.php:218
 msgid "Snapshots will be sent once every N web hits"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:226
 msgid "Report URL"
 msgstr "URL an danevell"
 
-#: actions/snapshotadminpanel.php:227
 msgid "Snapshots will be sent to this URL"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:248
 msgid "Save snapshot settings"
 msgstr "Enrollañ arventennoù al lec'hienn"
 
 #. TRANS: Client error displayed trying a change a subscription for a non-subscribed profile.
-#: actions/subedit.php:75
 msgid "You are not subscribed to that profile."
 msgstr "N'oc'h ket koumanantet d'ar profil-se."
 
 #. TRANS: Server error displayed when updating a subscription fails with a database error.
 #. TRANS: Exception thrown when a subscription could not be stored on the server.
-#: actions/subedit.php:89 classes/Subscription.php:141
 #, fuzzy
 msgid "Could not save subscription."
 msgstr "Dibosupl eo dilemel ar c'houmanant."
 
 #. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
-#: actions/subscribe.php:121
 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
 msgstr ""
 
 #. TRANS: Page title when subscription succeeded.
-#: actions/subscribe.php:149
 msgid "Subscribed"
 msgstr "Koumanantet"
 
 #. TRANS: Header for list of subscribers for a user (first page).
 #. TRANS: %s is the user's nickname.
-#: actions/subscribers.php:51
 #, php-format
 msgid "%s subscribers"
 msgstr "Koumanantet da %s"
 
 #. TRANS: Header for list of subscribers for a user (not first page).
 #. TRANS: %1$s is the user's nickname, $2$d is the page number.
-#: actions/subscribers.php:55
 #, php-format
 msgid "%1$s subscribers, page %2$d"
 msgstr "Koumanantet da %1$s, pajenn %2$d"
 
 #. TRANS: Page notice for page with an overview of all subscribers
 #. TRANS: of the logged in user's own profile.
-#: actions/subscribers.php:68
 #, fuzzy
 msgid "These are the people who listen to your notices."
 msgstr "Heuliañ a reoc'h alioù an dud-se."
 
 #. TRANS: Page notice for page with an overview of all subscribers of a user other
 #. TRANS: than the logged in user. %s is the user nickname.
-#: actions/subscribers.php:74
 #, fuzzy, php-format
 msgid "These are the people who listen to %s's notices."
 msgstr "Heuliet eo alioù an den-mañ gant %s."
 
 #. TRANS: Subscriber list text when the logged in user has no subscribers.
-#: actions/subscribers.php:114
 msgid ""
 "You have no subscribers. Try subscribing to people you know and they might "
 "return the favor."
@@ -6164,7 +5061,6 @@ msgstr ""
 
 #. TRANS: Subscriber list text when looking at the subscribers for a of a user other
 #. TRANS: than the logged in user that has no subscribers. %s is the user nickname.
-#: actions/subscribers.php:118
 #, php-format
 msgid "%s has no subscribers. Want to be the first?"
 msgstr ""
@@ -6176,7 +5072,6 @@ msgstr ""
 #. TRANS: This message contains a Markdown URL. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.
-#: actions/subscribers.php:127
 #, fuzzy, php-format
 msgid ""
 "%s has no subscribers. Why not [register an account](%%%%action.register%%%"
@@ -6187,20 +5082,17 @@ msgstr ""
 
 #. TRANS: Header for subscriptions overview for a user (not first page).
 #. TRANS: %1$s is a user nickname, %2$d is the page number.
-#: actions/subscriptions.php:55
 #, php-format
 msgid "%1$s subscriptions, page %2$d"
 msgstr "Koumanantoù %1$s, pajenn %2$d"
 
 #. TRANS: Page notice for page with an overview of all subscriptions
 #. TRANS: of the logged in user's own profile.
-#: actions/subscriptions.php:68
 msgid "These are the people whose notices you listen to."
 msgstr "Heuliañ a reoc'h alioù an dud-se."
 
 #. TRANS: Page notice for page with an overview of all subscriptions of a user other
 #. TRANS: than the logged in user. %s is the user nickname.
-#: actions/subscriptions.php:74
 #, php-format
 msgid "These are the people whose notices %s listens to."
 msgstr "Heuliet eo alioù an den-mañ gant %s."
@@ -6209,7 +5101,6 @@ msgstr "Heuliet eo alioù an den-mañ gant %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.
-#: actions/subscriptions.php:133
 #, php-format
 msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "
@@ -6223,69 +5114,55 @@ msgstr ""
 #. TRANS: than the logged in user that has no subscriptions. %s is the user nickname.
 #. TRANS: Subscription list text when looking at the subscriptions for a of a user that has none
 #. TRANS: as an anonymous user. %s is the user nickname.
-#: actions/subscriptions.php:141 actions/subscriptions.php:147
 #, php-format
 msgid "%s is not listening to anyone."
 msgstr "Ne heuilh %s den ebet."
 
 #. TRANS: Atom feed title. %s is a profile nickname.
-#: actions/subscriptions.php:176
 #, fuzzy, php-format
 msgid "Subscription feed for %s (Atom)"
 msgstr "Gwazh alioù %s (Atom)"
 
 #. TRANS: Checkbox label for enabling Jabber messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:241 lib/settingsnav.php:110
-#, fuzzy
 msgid "IM"
 msgstr "IM"
 
 #. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:256 lib/settingsnav.php:117
 msgid "SMS"
 msgstr "SMS"
 
 #. TRANS: Title for all but the first page of notices with tags.
 #. TRANS: %1$s is the tag, %2$d is the page number.
-#: actions/tag.php:73
 #, php-format
 msgid "Notices tagged with %1$s, page %2$d"
 msgstr "Alioù merket gant %1$s, pajenn %2$d"
 
-#: actions/tag.php:91
 #, php-format
 msgid "Notice feed for tag %s (RSS 1.0)"
 msgstr "Gwazh an alioù evit ar merk %s (RSS 1.0)"
 
-#: actions/tag.php:97
 #, php-format
 msgid "Notice feed for tag %s (RSS 2.0)"
 msgstr "Gwazh an alioù evit ar merk %s (RSS 2.0)"
 
-#: actions/tag.php:103
 #, php-format
 msgid "Notice feed for tag %s (Atom)"
 msgstr "Gwazh an alioù evit ar merk %s (Atom)"
 
-#: actions/tagother.php:39
 msgid "No ID argument."
 msgstr "Arguzenn ID ebet."
 
-#: actions/tagother.php:65
 #, php-format
 msgid "Tag %s"
 msgstr "Merk %s"
 
 #. TRANS: H2 for user profile information.
-#: actions/tagother.php:77 lib/userprofile.php:76
 msgid "User profile"
 msgstr "Profil an implijer"
 
-#: actions/tagother.php:120
 msgid "Tag user"
 msgstr "Merkañ an implijer"
 
-#: actions/tagother.php:130
 msgid ""
 "Tags for this user (letters, numbers, -, ., and _), comma- or space- "
 "separated"
@@ -6293,50 +5170,40 @@ msgstr ""
 "Merkoù evit an implijer-mañ (lizherennoù, sifroù, -, ., ha  _), dispartiet "
 "gant virgulennoù pe gant esaouennoù"
 
-#: actions/tagother.php:157
 #, php-format
 msgid "Invalid tag: \"%s\""
 msgstr "Balizenn direizh : \"%s\""
 
-#: actions/tagother.php:172
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 
-#: actions/tagother.php:215
 #, fuzzy
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr "Implijit ar furmskrid-mañ evit kemmañ ho poellad."
 
-#: actions/tagrss.php:35
 #, fuzzy
 msgid "No such tag."
 msgstr "N'eus ket eus ar bajenn-se."
 
 #. TRANS: Client error displayed when trying to unblock a non-blocked user.
-#: actions/unblock.php:59
 msgid "You haven't blocked that user."
 msgstr "N'ho peus ket stanket an implijer-mañ."
 
-#: actions/unsandbox.php:72
 #, fuzzy
 msgid "User is not sandboxed."
 msgstr "Er poull-traezh emañ dija an implijer."
 
-#: actions/unsilence.php:72
 #, fuzzy
 msgid "User is not silenced."
 msgstr "Lakaet eo bet da mut an implijer-mañ dija."
 
-#: actions/unsubscribe.php:77
 msgid "No profile ID in request."
 msgstr "N'eus profil ID ebet er reked."
 
-#: actions/unsubscribe.php:98
 msgid "Unsubscribed"
 msgstr "Digoumanantet"
 
-#: actions/updateprofile.php:64
 #, fuzzy, php-format
 msgid ""
 "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
@@ -6344,144 +5211,115 @@ msgstr ""
 "Aotre-implijout ar menegoù \"%1$s\" ne ya ket gant aotre-implijout al "
 "lec'hienn \"%2$s\"."
 
-#: actions/urlsettings.php:60
 #, fuzzy
 msgid "URL settings"
 msgstr "Arventennoù ar bostelerezh prim"
 
 #. TRANS: Instructions for tab "Other" in user profile settings.
-#: actions/urlsettings.php:72
 msgid "Manage various other options."
 msgstr "Dibarzhioù all da gefluniañ."
 
 #. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
 #. TRANS: user's profile settings. This message has one space at the beginning. Use your
 #. TRANS: language's word separator here if it has one (most likely a single space).
-#: actions/urlsettings.php:115
 msgid " (free service)"
 msgstr " (servij digoust)"
 
-#: actions/urlsettings.php:121
 #, fuzzy
 msgid "[none]"
 msgstr "Hini ebet"
 
-#: actions/urlsettings.php:122
 msgid "[internal]"
-msgstr ""
+msgstr "[diabarzh]"
 
 #. TRANS: Label for dropdown with URL shortener services.
-#: actions/urlsettings.php:130
 msgid "Shorten URLs with"
 msgstr ""
 
 #. TRANS: Tooltip for for dropdown with URL shortener services.
-#: actions/urlsettings.php:132
 msgid "Automatic shortening service to use."
 msgstr ""
 
-#: actions/urlsettings.php:138
 msgid "URL longer than"
 msgstr ""
 
-#: actions/urlsettings.php:141
 msgid "URLs longer than this will be shortened, 0 means always shorten."
 msgstr ""
 
-#: actions/urlsettings.php:145
 msgid "Text longer than"
 msgstr ""
 
-#: actions/urlsettings.php:148
 msgid ""
 "URLs in notices longer than this will be shortened, 0 means always shorten."
 msgstr ""
 
 #. TRANS: Form validation error for form "Other settings" in user profile.
-#: actions/urlsettings.php:180
 #, fuzzy
 msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr "Re hir eo ar yezh (255 arouezenn d'ar muiañ)."
 
-#: actions/urlsettings.php:187
 msgid "Invalid number for max url length."
 msgstr ""
 
-#: actions/urlsettings.php:193
 #, fuzzy
 msgid "Invalid number for max notice length."
 msgstr "Danvez direizh an ali."
 
-#: actions/urlsettings.php:238
 msgid "Error saving user URL shortening preferences."
 msgstr ""
 
 #. TRANS: User admin panel title
-#: actions/useradminpanel.php:58
 msgctxt "TITLE"
 msgid "User"
 msgstr "Implijer"
 
 #. TRANS: Instruction for user admin panel.
-#: actions/useradminpanel.php:69
 msgid "User settings for this StatusNet site"
 msgstr ""
 
 #. TRANS: Form validation error in user admin panel when a non-numeric character limit was set.
-#: actions/useradminpanel.php:147
 msgid "Invalid bio limit. Must be numeric."
 msgstr ""
 
 #. TRANS: Form validation error in user admin panel when welcome text is too long.
-#: actions/useradminpanel.php:154
 msgid "Invalid welcome text. Maximum length is 255 characters."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to set a non-existing user as default subscription for new
 #. TRANS: users in user admin panel. %1$s is the invalid nickname.
-#: actions/useradminpanel.php:166
 #, php-format
 msgid "Invalid default subscripton: \"%1$s\" is not a user."
 msgstr ""
 
-#: actions/useradminpanel.php:215 lib/action.php:565 lib/settingsnav.php:77
-#: lib/subgroupnav.php:81
 msgid "Profile"
 msgstr "Profil"
 
 #. TRANS: Field label in user admin panel for setting the character limit for the bio field.
-#: actions/useradminpanel.php:220
 msgid "Bio Limit"
 msgstr "Bevenn ar bio"
 
 #. TRANS: Tooltip in user admin panel for setting the character limit for the bio field.
-#: actions/useradminpanel.php:222
 msgid "Maximum length of a profile bio in characters."
 msgstr ""
 
 #. TRANS: Form legend in user admin panel.
-#: actions/useradminpanel.php:231
 msgid "New users"
 msgstr "Implijerien nevez"
 
 #. TRANS: Field label in user admin panel for setting new user welcome text.
-#: actions/useradminpanel.php:236
 msgid "New user welcome"
 msgstr "Degemer an implijerien nevez"
 
 #. TRANS: Tooltip in user admin panel for setting new user welcome text.
-#: actions/useradminpanel.php:238
 #, fuzzy
 msgid "Welcome text for new users (maximum 255 characters)."
 msgstr "Re hir eo an anv (255 arouezenn d'ar muiañ)."
 
 #. TRANS: Field label in user admin panel for setting default subscription for new users.
-#: actions/useradminpanel.php:244
 msgid "Default subscription"
 msgstr "Koumanantoù dre ziouer"
 
 #. TRANS: Tooltip in user admin panel for setting default subscription for new users.
-#: actions/useradminpanel.php:246
 #, fuzzy
 msgid "Automatically subscribe new users to this user."
 msgstr ""
@@ -6489,34 +5327,28 @@ msgstr ""
 "evit an implijerien nann-denel)"
 
 #. TRANS: Form legend in user admin panel.
-#: actions/useradminpanel.php:256
 msgid "Invitations"
 msgstr "Pedadennoù"
 
 #. TRANS: Field label for checkbox in user admin panel for allowing users to invite friend using site e-mail.
-#: actions/useradminpanel.php:262
 msgid "Invitations enabled"
 msgstr "Pedadennoù gweredekaet"
 
 #. TRANS: Tooltip for checkbox in user admin panel for allowing users to invite friend using site e-mail.
-#: actions/useradminpanel.php:265
 #, fuzzy
 msgid "Whether to allow users to invite new users."
 msgstr "Ma rankomp merañ an dalc'hoù hon unan."
 
 #. TRANS: Title for button to save user settings in user admin panel.
-#: actions/useradminpanel.php:302
 #, fuzzy
 msgid "Save user settings."
 msgstr "Enrollañ arventennoù an implijer"
 
 #. TRANS: Page title.
-#: actions/userauthorization.php:109
 msgid "Authorize subscription"
 msgstr "Aotreañ ar c'houmanant"
 
 #. TRANS: Page notice on "Auhtorize subscription" page.
-#: actions/userauthorization.php:115
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
 "user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
@@ -6524,42 +5356,33 @@ msgid ""
 msgstr ""
 
 #. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:200
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Accept"
-msgstr "Degemer"
+msgstr "Asantiñ"
 
 #. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:202
 #, fuzzy
 msgid "Subscribe to this user."
 msgstr "En em goumanantiñ d'an implijer-mañ"
 
 #. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:204
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Reject"
 msgstr "Disteurel"
 
 #. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:206
 #, fuzzy
 msgid "Reject this subscription."
 msgstr "Nac'hañ ar c'houmanant"
 
 #. TRANS: Client error displayed for an empty authorisation request.
-#: actions/userauthorization.php:219
 msgid "No authorization request!"
 msgstr "Reked aotreañ ebet !"
 
 #. TRANS: Accept message header from Authorise subscription page.
-#: actions/userauthorization.php:242
 msgid "Subscription authorized"
 msgstr "Koumanant aotreet"
 
-#: actions/userauthorization.php:245
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to authorize the "
@@ -6567,11 +5390,9 @@ msgid ""
 msgstr ""
 
 #. TRANS: Reject message header from Authorise subscription page.
-#: actions/userauthorization.php:256
 msgid "Subscription rejected"
 msgstr "Koumanant bet nac'het"
 
-#: actions/userauthorization.php:259
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to fully reject the "
@@ -6580,35 +5401,30 @@ msgstr ""
 
 #. TRANS: Exception thrown when no valid user is found for an authorisation request.
 #. TRANS: %s is a listener URI.
-#: actions/userauthorization.php:296
 #, fuzzy, php-format
 msgid "Listener URI \"%s\" not found here."
 msgstr "N'eo ket bet kavet amañ URI ar selaouer \"%s\"."
 
 #. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
 #. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:303
 #, fuzzy, php-format
 msgid "Listenee URI \"%s\" is too long."
 msgstr "Re hir eo an URI \"%s\" ez oc'h koumanantet dezhi."
 
 #. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
 #. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:311
 #, fuzzy, php-format
 msgid "Listenee URI \"%s\" is a local user."
 msgstr "An URI \"%s\" ez oc'h koumanantet dezhi a zo un implijer lec'hel."
 
 #. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
 #. TRANS: %s is a profile URL.
-#: actions/userauthorization.php:329
 #, fuzzy, php-format
 msgid "Profile URL \"%s\" is for a local user."
 msgstr "URI ar profil \"%s\" a zo evit un implijer lec'hel."
 
 #. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
 #. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
-#: actions/userauthorization.php:339
 #, fuzzy, php-format
 msgid ""
 "Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
@@ -6619,76 +5435,62 @@ msgstr ""
 
 #. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
 #. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:349
 #, fuzzy, php-format
 msgid "Avatar URL \"%s\" is not valid."
 msgstr "N'eo ket reizh URL an avatar \"%s\"."
 
 #. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
 #. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:356
 #, fuzzy, php-format
 msgid "Cannot read avatar URL \"%s\"."
 msgstr "Dibosupl eo lenn URL an avatar \"%s\"."
 
 #. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
 #. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:363
 #, fuzzy, php-format
 msgid "Wrong image type for avatar URL \"%s\"."
 msgstr "Seurt skeudenn direizh evit URL an avatar \"%s\"."
 
 #. TRANS: Page title for profile design page.
-#: actions/userdesignsettings.php:74 lib/designsettings.php:61
 msgid "Profile design"
 msgstr "Design ar profil"
 
 #. TRANS: Instructions for profile design page.
-#: actions/userdesignsettings.php:84 lib/designsettings.php:72
 msgid ""
 "Customize the way your profile looks with a background image and a colour "
 "palette of your choice."
 msgstr ""
 
-#: actions/userdesignsettings.php:289
 msgid "Enjoy your hotdog!"
 msgstr "Bez plijadur gant da hotdog !"
 
-#: actions/userdesignsettings.php:325
 #, fuzzy
 msgid "Design settings"
 msgstr "Enrollañ arventennoù al lec'hienn"
 
-#: actions/userdesignsettings.php:340
 #, fuzzy
 msgid "View profile designs"
 msgstr "Design ar profil"
 
-#: actions/userdesignsettings.php:341
 msgid "Show or hide profile designs."
 msgstr "Diskouez pe kuzhat designoù ar profil."
 
-#: actions/userdesignsettings.php:348
 #, fuzzy
 msgid "Background file"
 msgstr "Background"
 
 #. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number.
-#: actions/usergroups.php:66
 #, php-format
 msgid "%1$s groups, page %2$d"
 msgstr "Strolladoù %1$s, pajenn %2$d"
 
-#: actions/usergroups.php:132
 msgid "Search for more groups"
 msgstr "Klask muioc'h a strolladoù"
 
-#: actions/usergroups.php:159
 #, php-format
 msgid "%s is not a member of any group."
 msgstr "N'eo ket ezel %s eus ur strollad."
 
-#: actions/usergroups.php:164
 #, php-format
 msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
 msgstr ""
@@ -6698,34 +5500,27 @@ msgstr ""
 #. TRANS: %1$s is a group name, %2$s is a site name.
 #. TRANS: Message is used as a subtitle in atom user notice feed.
 #. TRANS: %1$s is a user name, %2$s is a site name.
-#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:70
-#: lib/atomusernoticefeed.php:95
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr "Hizivadennoù eus %1$s e %2$s!"
 
-#: actions/version.php:75
 #, php-format
 msgid "StatusNet %s"
 msgstr "StatusNet %s"
 
-#: actions/version.php:155
 #, php-format
 msgid ""
 "This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
 "Inc. and contributors."
 msgstr ""
 
-#: actions/version.php:163
 msgid "Contributors"
 msgstr "Aozerien"
 
 #. TRANS: Menu item for site administration
-#: actions/version.php:167 lib/adminpanelaction.php:403
 msgid "License"
 msgstr "Aotre implijout"
 
-#: actions/version.php:170
 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 "
@@ -6733,7 +5528,6 @@ msgid ""
 "any later version. "
 msgstr ""
 
-#: actions/version.php:176
 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 "
@@ -6741,7 +5535,6 @@ msgid ""
 "for more details. "
 msgstr ""
 
-#: actions/version.php:182
 #, php-format
 msgid ""
 "You should have received a copy of the GNU Affero General Public License "
@@ -6749,52 +5542,42 @@ msgid ""
 msgstr ""
 
 #. TRANS: Form input field label for application name.
-#: actions/version.php:197 lib/applicationeditform.php:190
 msgid "Name"
 msgstr "Anv"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:885
 msgid "Version"
 msgstr "Stumm"
 
-#: actions/version.php:199
 msgid "Author(s)"
 msgstr "Aozer(ien)"
 
 #. TRANS: Form input field label.
-#: actions/version.php:200 lib/applicationeditform.php:208
-#: lib/groupeditform.php:168
 msgid "Description"
 msgstr "Deskrivadur"
 
 #. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:164
 msgid "Favor"
 msgstr "Pennrolloù"
 
 #. TRANS: Ntofication given when a user marks a notice as favorite.
 #. TRANS: %1$s is a user nickname or full name, %2$s is a notice URI.
-#: classes/Fave.php:167
 #, fuzzy, php-format
 msgid "%1$s marked notice %2$s as a favorite."
 msgstr "Kas din ur postel pa lak unan bennak unan eus va alioù evel pennroll."
 
 #. TRANS: Server exception thrown when a URL cannot be processed.
-#: classes/File.php:162
 #, php-format
 msgid "Cannot process URL '%s'"
 msgstr ""
 
 #. TRANS: Server exception thrown when... Robin thinks something is impossible!
-#: classes/File.php:194
 msgid "Robin thinks something is impossible."
 msgstr ""
 
 #. 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$s is used for plural.
-#: classes/File.php:210
 #, php-format
 msgid ""
 "No file may be larger than %1$d byte and the file you sent was %2$d bytes. "
@@ -6807,7 +5590,6 @@ msgstr[1] ""
 
 #. TRANS: Message given if an upload would exceed user quota.
 #. TRANS: %d (number) is the user quota in bytes and is used for plural.
-#: classes/File.php:223
 #, php-format
 msgid "A file this large would exceed your user quota of %d byte."
 msgid_plural "A file this large would exceed your user quota of %d bytes."
@@ -6816,7 +5598,6 @@ msgstr[1] ""
 
 #. TRANS: Message given id an upload would exceed a user's monthly quota.
 #. TRANS: $d (number) is the monthly user quota in bytes and is used for plural.
-#: classes/File.php:235
 #, php-format
 msgid "A file this large would exceed your monthly quota of %d byte."
 msgid_plural "A file this large would exceed your monthly quota of %d bytes."
@@ -6824,425 +5605,340 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Client exception thrown if a file upload does not have a valid name.
-#: classes/File.php:282 classes/File.php:297
 #, fuzzy
 msgid "Invalid filename."
 msgstr "Ment direizh."
 
 #. TRANS: Exception thrown when joining a group fails.
-#: classes/Group_member.php:51
 msgid "Group join failed."
 msgstr "C'hwitet eo bet an enskrivadur d'ar strollad."
 
 #. TRANS: Exception thrown when trying to leave a group the user is not a member of.
-#: classes/Group_member.php:64
 msgid "Not part of group."
 msgstr "N'eo ezel eus strollad ebet."
 
 #. TRANS: Exception thrown when trying to leave a group fails.
-#: classes/Group_member.php:72
 msgid "Group leave failed."
 msgstr "C'hwitet eo bet an disenskrivadur d'ar strollad."
 
 #. TRANS: Exception thrown providing an invalid profile ID.
 #. TRANS: %s is the invalid profile ID.
-#: classes/Group_member.php:85
 #, php-format
 msgid "Profile ID %s is invalid."
 msgstr ""
 
 #. TRANS: Exception thrown providing an invalid group ID.
 #. TRANS: %s is the invalid group ID.
-#: classes/Group_member.php:98
 #, fuzzy, php-format
 msgid "Group ID %s is invalid."
 msgstr "Ur fazi 'zo bet e-pad enolladenn an implijer ; diwiriek."
 
 #. TRANS: Activity title.
-#: classes/Group_member.php:147 lib/joinform.php:114
 msgid "Join"
 msgstr "Stagañ"
 
 #. TRANS: Success message for subscribe to group attempt through OStatus.
 #. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
-#: classes/Group_member.php:151
 #, php-format
 msgid "%1$s has joined group %2$s."
 msgstr ""
 
 #. TRANS: Server exception thrown when updating a local group fails.
-#: classes/Local_group.php:42
 #, fuzzy
 msgid "Could not update local group."
 msgstr "Diposubl eo hizivaat ar strollad."
 
 #. TRANS: Exception thrown when trying creating a login token failed.
 #. TRANS: %s is the user nickname for which token creation failed.
-#: classes/Login_token.php:78
 #, fuzzy, php-format
 msgid "Could not create login token for %s"
 msgstr "Diposubl eo krouiñ an aliasoù."
 
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
-#: classes/Memcached_DataObject.php:556
 msgid "No database name or DSN found anywhere."
 msgstr ""
 
 #. TRANS: Client exception thrown when a user tries to send a direct message while being banned from sending them.
-#: classes/Message.php:45
 #, fuzzy
 msgid "You are banned from sending direct messages."
 msgstr "Ur gudenn 'zo bet pa veze kaset ho kemennadenn."
 
 #. TRANS: Message given when a message could not be stored on the server.
-#: classes/Message.php:69
 msgid "Could not insert message."
 msgstr "Dibosupl eo ensoc'hañ ur gemennadenn"
 
 #. TRANS: Message given when a message could not be updated on the server.
-#: classes/Message.php:80
 msgid "Could not update message with new URI."
 msgstr "Dibosupl eo hizivaat ar gemennadenn gant un URI nevez."
 
 #. TRANS: Server exception thrown when a user profile for a notice cannot be found.
 #. TRANS: %1$d is a profile ID (number), %2$d is a notice ID (number).
-#: classes/Notice.php:98
 #, php-format
 msgid "No such profile (%1$d) for notice (%2$d)."
 msgstr ""
 
 #. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:199
 #, fuzzy, php-format
 msgid "Database error inserting hashtag: %s"
 msgstr "Ur fazi 'zo bet en ur ensoc'hañ an avatar"
 
 #. TRANS: Client exception thrown if a notice contains too many characters.
-#: classes/Notice.php:279
 msgid "Problem saving notice. Too long."
 msgstr "Ur gudenn a zo bet e-pad enrolladenn ar c'hemenn. Re hir."
 
 #. TRANS: Client exception thrown when trying to save a notice for an unknown user.
-#: classes/Notice.php:284
 msgid "Problem saving notice. Unknown user."
 msgstr "Ur gudenn a zo bet e-pad enrolladenn ar c'hemenn. Implijer dianav."
 
 #. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
-#: classes/Notice.php:290
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 
 #. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
-#: classes/Notice.php:297
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
 "few minutes."
 msgstr ""
 
 #. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:305
 #, fuzzy
 msgid "You are banned from posting notices on this site."
 msgstr "Ne c'helloc'h ket reiñ rolloù d'an implijerien eus al lec'hienn-mañ."
 
 #. TRANS: Server exception thrown when a notice cannot be saved.
 #. TRANS: Server exception thrown when a notice cannot be updated.
-#: classes/Notice.php:372 classes/Notice.php:399
 msgid "Problem saving notice."
 msgstr "Ur gudenn 'zo bet pa veze enrollet an ali."
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:929
 msgid "Bad type provided to saveKnownGroups."
 msgstr ""
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:1028
 msgid "Problem saving group inbox."
 msgstr "Ur gudenn 'zo bet pa veze enrollet boest degemer ar strollad."
 
 #. TRANS: Server exception thrown when a reply cannot be saved.
 #. TRANS: %1$d is a notice ID, %2$d is the ID of the mentioned user.
-#: classes/Notice.php:1144
 #, fuzzy, php-format
 msgid "Could not save reply for %1$d, %2$d."
 msgstr "Dibosupl eo enrollañ titouroù ar strollad lec'hel."
 
 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1663
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
 
 #. TRANS: Full name of a profile or group followed by nickname in parens
-#: classes/Profile.php:172 classes/User_group.php:242
-#, fuzzy, php-format
+#, php-format
 msgctxt "FANCYNAME"
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
 
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:779
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:788
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
 
 #. TRANS: Exception thrown when a right for a non-existing user profile is checked.
-#: classes/Remote_profile.php:54
 msgid "Missing profile."
 msgstr "Mankout a ra ar profil."
 
 #. TRANS: Exception thrown when a tag cannot be saved.
-#: classes/Status_network.php:338
 msgid "Unable to save tag."
 msgstr "Dibosupl eo enrollañ an tikedenn."
 
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#: classes/Subscription.php:77 lib/oauthstore.php:482
 msgid "You have been banned from subscribing."
 msgstr "Nac'het ez eus bet deoc'h en em goumanantiñ."
 
 #. TRANS: Exception thrown when trying to subscribe while already subscribed.
-#: classes/Subscription.php:82
 msgid "Already subscribed!"
 msgstr "Koumanantet dija !"
 
 #. TRANS: Exception thrown when trying to subscribe to a user who has blocked the subscribing user.
-#: classes/Subscription.php:87
 msgid "User has blocked you."
 msgstr "An implijer-mañ en deus stanket ac'hanoc'h."
 
 #. TRANS: Exception thrown when trying to unsibscribe without a subscription.
-#: classes/Subscription.php:176
 msgid "Not subscribed!"
 msgstr "Nann-koumanantet !"
 
 #. TRANS: Exception thrown when trying to unsubscribe a user from themselves.
-#: classes/Subscription.php:183
 msgid "Could not delete self-subscription."
 msgstr "Dibosupl eo dilemel ar c'houmanant."
 
 #. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
-#: classes/Subscription.php:211
 msgid "Could not delete subscription OMB token."
 msgstr "Dibosupl eo dilemel ar c'houmanant."
 
 #. TRANS: Exception thrown when a subscription could not be deleted on the server.
-#: classes/Subscription.php:223
 msgid "Could not delete subscription."
 msgstr "Dibosupl eo dilemel ar c'houmanant."
 
 #. TRANS: Activity tile when subscribing to another person.
-#: classes/Subscription.php:265
 msgid "Follow"
 msgstr "Heuliañ"
 
 #. TRANS: Notification given when one person starts following another.
 #. TRANS: %1$s is the subscriber, %2$s is the subscribed.
-#: classes/Subscription.php:268
 #, fuzzy, php-format
 msgid "%1$s is now following %2$s."
 msgstr "Ne heuilh %s den ebet."
 
 #. TRANS: Notice given on user registration.
 #. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:390
 #, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr "Deuet mat da %1$s, @%2$s !"
 
 #. TRANS: Server exception.
-#: classes/User.php:923
 msgid "No single user defined for single-user mode."
 msgstr ""
 
 #. TRANS: Server exception.
-#: classes/User.php:927
 msgid "Single-user mode code called when not enabled."
 msgstr ""
 
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:522
 msgid "Could not create group."
 msgstr "Dibosupl eo krouiñ ar strollad."
 
 #. TRANS: Server exception thrown when updating a group URI failed.
-#: classes/User_group.php:532
 msgid "Could not set group URI."
 msgstr "Dibosupl eo termeniñ URI ar strollad."
 
 #. TRANS: Server exception thrown when setting group membership failed.
-#: classes/User_group.php:555
 msgid "Could not set group membership."
 msgstr "Dibosupl eo en em enskrivañ d'ar strollad."
 
 #. TRANS: Server exception thrown when saving local group information failed.
-#: classes/User_group.php:570
 msgid "Could not save local group info."
 msgstr "Dibosupl eo enrollañ titouroù ar strollad lec'hel."
 
 #. TRANS: Exception thrown when an account could not be located when it should be moved.
 #. TRANS: %s is the remote site.
-#: lib/accountmover.php:65
 #, fuzzy, php-format
 msgid "Cannot locate account %s."
 msgstr "N'hallit ket dilemel ho kont."
 
 #. TRANS: Exception thrown when a service document could not be located account move.
 #. TRANS: %s is the remote site.
-#: lib/accountmover.php:106
 #, php-format
 msgid "Cannot find XRD for %s."
 msgstr ""
 
 #. TRANS: Exception thrown when an account could not be located when it should be moved.
 #. TRANS: %s is the remote site.
-#: lib/accountmover.php:131
 #, php-format
 msgid "No AtomPub API service for %s."
 msgstr ""
 
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: lib/action.php:161
 #, php-format
 msgid "%1$s - %2$s"
 msgstr "%1$s - %2$s"
 
 #. TRANS: Page title for a page without a title set.
-#: lib/action.php:177
 msgid "Untitled page"
 msgstr "Pajenn hep anv"
 
 #. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.
-#: lib/action.php:325
 msgctxt "TOOLTIP"
 msgid "Show more"
 msgstr "Diskouez muioc'h"
 
 #. TRANS: Inline reply form submit button: submits a reply comment.
-#: lib/action.php:328
 #, fuzzy
 msgctxt "BUTTON"
-msgid "Comment"
-msgstr "Endalc'h"
+msgid "Reply"
+msgstr "Respont"
 
 #. TRANS: Placeholder text for inline reply form. Clicking in this box will turn it into a mini notice form.
-#: lib/action.php:331
-msgid "Add a comment..."
+msgid "Write a reply..."
 msgstr ""
 
-#: lib/action.php:559 lib/personalgroupnav.php:99
-#, fuzzy
 msgid "Home"
-msgstr "Pajenn degemer"
+msgstr "Degemer"
 
-#: lib/action.php:560
 #, fuzzy
 msgid "Friends timeline"
 msgstr "Oberezhioù %s"
 
-#: lib/action.php:566
-#, fuzzy
 msgid "Your profile"
-msgstr "Profil ar strollad"
+msgstr "Ho profil"
 
-#: lib/action.php:570 lib/action.php:593 lib/publicgroupnav.php:78
 msgid "Public"
 msgstr "Foran"
 
-#: lib/action.php:571 lib/action.php:594
 #, fuzzy
 msgid "Everyone on this site"
 msgstr "Klask tud el lec'hienn-mañ"
 
-#: lib/action.php:575
-#, fuzzy
 msgid "Settings"
-msgstr "Arventennoù SMS"
+msgstr "Arventennoù"
 
-#: lib/action.php:576
-#, fuzzy
 msgid "Change your personal settings"
-msgstr "Kemmañ arventennoù ho profil"
+msgstr "Kemmañ ho arventennoù hiniennel"
 
-#: lib/action.php:582
 #, fuzzy
 msgid "Site configuration"
 msgstr "Kefluniadur an implijer"
 
-#: lib/action.php:587
-#, fuzzy
 msgid "Logout"
 msgstr "Digevreañ"
 
-#: lib/action.php:588
-#, fuzzy
 msgid "Logout from the site"
 msgstr "Digevreañ diouzh al lec'hienn"
 
-#: lib/action.php:599
-#, fuzzy
 msgid "Login to the site"
 msgstr "Kevreañ d'al lec'hienn"
 
-#: lib/action.php:606
-#, fuzzy
 msgid "Search"
 msgstr "Klask"
 
-#: lib/action.php:607
-#, fuzzy
 msgid "Search the site"
 msgstr "Klask el lec'hienn"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:864
 msgid "Help"
 msgstr "Skoazell"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:867
 msgid "About"
 msgstr "Diwar-benn"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:870
 msgid "FAQ"
 msgstr "FAG"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:875
 msgid "TOS"
 msgstr "AIH"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:879
 msgid "Privacy"
 msgstr "Prevezded"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:882
 msgid "Source"
 msgstr "Mammenn"
 
 #. TRANS: Secondary navigation menu option leading to e-mail contact information on the
 #. TRANS: StatusNet site, where to report bugs, ...
-#: lib/action.php:889
 msgid "Contact"
 msgstr "Darempred"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:892
 msgid "Badge"
 msgstr "Badj"
 
@@ -7250,7 +5946,6 @@ msgstr "Badj"
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:921
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7258,7 +5953,6 @@ msgid ""
 msgstr ""
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:924
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** a zo ur servij microblogging."
@@ -7267,7 +5961,6 @@ msgstr "**%%site.name%%** a zo ur servij microblogging."
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:931
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7277,109 +5970,91 @@ msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:949
 #, fuzzy, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr "Kompren a ran ez eo prevez danvez ha roadennoù %1$s."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:956
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:960
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:992
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1335
 msgid "After"
 msgstr "War-lerc'h"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1345
 msgid "Before"
 msgstr "Kent"
 
 #. TRANS: Client exception thrown when a feed instance is a DOMDocument.
-#: lib/activity.php:125
 msgid "Expecting a root feed element but got a whole XML document."
 msgstr ""
 
 #. TRANS: Client exception thrown when using an unknown verb for the activity importer.
-#: lib/activityimporter.php:81
-#, fuzzy, php-format
+#, php-format
 msgid "Unknown verb: \"%s\"."
-msgstr "Yezh \"%s\" dizanv."
+msgstr "Verb dizanv : \"%s\"."
 
 #. TRANS: Client exception thrown when trying to force a subscription for an untrusted user.
-#: lib/activityimporter.php:107
 msgid "Cannot force subscription for untrusted user."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to for a remote user to subscribe.
-#: lib/activityimporter.php:117
 #, fuzzy
 msgid "Cannot force remote user to subscribe."
 msgstr "Dibosupl eo hizivaat ar c'houmanant ez emgefre."
 
 #. TRANS: Client exception thrown when trying to subscribe to an unknown profile.
-#: lib/activityimporter.php:132
 #, fuzzy
 msgid "Unknown profile."
 msgstr "Dizanv eo seurt ar restr"
 
 #. TRANS: Client exception thrown when trying to import an event not related to the importing user.
-#: lib/activityimporter.php:138
 msgid "This activity seems unrelated to our user."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to join a remote group that is not a group.
-#: lib/activityimporter.php:154
 msgid "Remote profile is not a group!"
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to join a group the importing user is already a member of.
-#: lib/activityimporter.php:163
 #, fuzzy
 msgid "User is already a member of this group."
 msgstr "Un ezel eus ar strollad-mañ eo dija."
 
 #. TRANS: Client exception thrown when trying to import a notice by another user.
 #. TRANS: %1$s is the source URI of the notice, %2$s is the URI of the author.
-#: lib/activityimporter.php:201
 #, php-format
 msgid "Already know about notice %1$s and  it has a different author %2$s."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to overwrite the author information for a non-trusted user during import.
-#: lib/activityimporter.php:207
 msgid "Not overwriting author info for non-trusted user."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to import a notice without content.
 #. TRANS: %s is the notice URI.
-#: lib/activityimporter.php:223
-#, fuzzy, php-format
+#, php-format
 msgid "No content for notice %s."
-msgstr "Klask alioù en danvez"
+msgstr "N'eus danvez ebet evit ar gemennadenn %s."
 
-#: lib/activitymover.php:84
-#, fuzzy, php-format
+#, php-format
 msgid "No such user %s."
-msgstr "N'eus ket eus an implijer-se."
+msgstr "N'eus ket eus an implijer %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.
@@ -7387,214 +6062,174 @@ msgstr "N'eus ket eus an implijer-se."
 #. TRANS: %1$s is a URL, %2$s is the status, %s$s is the fail reason.
 #. TRANS: Exception thrown when post to collection fails with a status that is not handled.
 #. TRANS: %1$s is a URL, %2$s is the status, %s$s is the fail reason.
-#: lib/activitysink.php:163 lib/activitysink.php:167 lib/activitysink.php:172
-#, fuzzy, php-format
+#, php-format
 msgctxt "URLSTATUSREASON"
 msgid "%1$s %2$s %3$s"
-msgstr "%1$s - %2$s"
+msgstr "%1$s %2$s %3$s"
 
 #. TRANS: Client exception thrown when there is no source attribute.
-#: lib/activityutils.php:200
 msgid "Can't handle remote content yet."
 msgstr ""
 
 #. TRANS: Client exception thrown when there embedded XML content is found that cannot be processed yet.
-#: lib/activityutils.php:237
 msgid "Can't handle embedded XML content yet."
 msgstr ""
 
 #. TRANS: Client exception thrown when base64 encoded content is found that cannot be processed yet.
-#: lib/activityutils.php:242
 msgid "Can't handle embedded Base64 content yet."
 msgstr ""
 
 #. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights.
-#: lib/adminpanelaction.php:96
 #, fuzzy
 msgid "You cannot make changes to this site."
 msgstr "Ne c'helloc'h ket reiñ rolloù d'an implijerien eus al lec'hienn-mañ."
 
 #. TRANS: Client error message throw when a certain panel's settings cannot be changed.
-#: lib/adminpanelaction.php:108
 msgid "Changes to that panel are not allowed."
 msgstr "N'eo ket aotreet kemmañ ar panell-se"
 
 #. TRANS: Client error message.
-#: lib/adminpanelaction.php:222
 msgid "showForm() not implemented."
 msgstr "N'eo ket bet emplementet showForm()."
 
 #. TRANS: Client error message
-#: lib/adminpanelaction.php:250
 msgid "saveSettings() not implemented."
 msgstr "N'eo ket bet emplementet saveSettings()."
 
 #. TRANS: Client error message thrown if design settings could not be deleted in
 #. TRANS: the admin panel Design.
-#: lib/adminpanelaction.php:274
 msgid "Unable to delete design setting."
 msgstr "Dibosupl eo dilemel an arventennoù krouiñ."
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:337
 msgid "Basic site configuration"
 msgstr "Arventennoù diazez al lec'hienn"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:339
 msgctxt "MENU"
 msgid "Site"
 msgstr "Lec'hienn"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:345
 msgid "Design configuration"
 msgstr "Kefluniadur ar c'hrouiñ"
 
 #. TRANS: Menu item for site administration
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/adminpanelaction.php:347 lib/groupnav.php:135
 msgctxt "MENU"
 msgid "Design"
 msgstr "Design"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:353
 msgid "User configuration"
 msgstr "Kefluniadur an implijer"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:110
 msgid "User"
 msgstr "Implijer"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:361
 msgid "Access configuration"
 msgstr "Kefluniadur ar moned"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:369
 msgid "Paths configuration"
 msgstr "Kefluniadur an hentoù"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:377
 msgid "Sessions configuration"
 msgstr "Kefluniadur an dalc'hoù"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:385
 msgid "Edit site notice"
 msgstr "Kemmañ ali al lec'hienn"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:387
 msgid "Site notice"
 msgstr "Ali al lec'hienn"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:393
 msgid "Snapshots configuration"
 msgstr "Kefluniadur ar primoù"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:401
 msgid "Set site license"
 msgstr ""
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:409
 #, fuzzy
 msgid "Plugins configuration"
 msgstr "Kefluniadur an hentoù"
 
 #. TRANS: Client error 401.
-#: lib/apiauth.php:111
 msgid "API resource requires read-write access, but you only have read access."
 msgstr ""
 
 #. TRANS: OAuth exception thrown when no application is found for a given consumer key.
-#: lib/apiauth.php:177
 msgid "No application for that consumer key."
 msgstr ""
 
-#: lib/apiauth.php:202 lib/apiauth.php:284
 msgid "Not allowed to use API."
 msgstr ""
 
 #. TRANS: OAuth exception given when an incorrect access token was given for a user.
-#: lib/apiauth.php:225
 msgid "Bad access token."
 msgstr ""
 
 #. TRANS: OAuth exception given when no user was found for a given token (no token was found).
-#: lib/apiauth.php:230
 msgid "No user for that token."
 msgstr ""
 
 #. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel".
 #. TRANS: Client error thrown when authentication fails.
-#: lib/apiauth.php:272 lib/apiauth.php:302
 msgid "Could not authenticate you."
 msgstr ""
 
 #. TRANS: Server error displayed when trying to create an anynymous OAuth consumer.
-#: lib/apioauthstore.php:45
 #, fuzzy
 msgid "Could not create anonymous consumer."
 msgstr "Diposubl eo krouiñ an aliasoù."
 
 #. TRANS: Server error displayed when trying to create an anynymous OAuth application.
-#: lib/apioauthstore.php:69
 #, fuzzy
 msgid "Could not create anonymous OAuth application."
 msgstr "N'eo ket posubl krouiñ ar poellad."
 
 #. TRANS: Exception thrown when no token association could be found.
-#: lib/apioauthstore.php:151
 msgid ""
 "Could not find a profile and application associated with the request token."
 msgstr ""
 
 #. TRANS: Exception thrown when no access token can be issued.
-#: lib/apioauthstore.php:209
 #, fuzzy
 msgid "Could not issue access token."
 msgstr "Diposubl eo ensoc'hañ ur gemenadenn"
 
-#: lib/apioauthstore.php:317
 msgid "Database error inserting OAuth application user."
 msgstr ""
 
-#: lib/apioauthstore.php:345
 #, fuzzy
 msgid "Database error updating OAuth application user."
 msgstr "Ur fazi 'zo bet en ur ensoc'hañ an avatar"
 
 #. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
-#: lib/apioauthstore.php:371
 msgid "Tried to revoke unknown token."
 msgstr ""
 
 #. TRANS: Exception thrown when an attempt is made to remove a revoked token.
-#: lib/apioauthstore.php:376
 msgid "Failed to delete revoked token."
 msgstr ""
 
 #. TRANS: Form input field label for application icon.
-#: lib/applicationeditform.php:177
 msgid "Icon"
 msgstr "Arlun"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:182
 msgid "Icon for this application"
 msgstr "Arlun evit ar poellad-mañ"
 
 #. TRANS: Form input field instructions.
 #. TRANS: %d is the number of available characters for the description.
-#: lib/applicationeditform.php:201
 #, fuzzy, php-format
 msgid "Describe your application in %d character"
 msgid_plural "Describe your application in %d characters"
@@ -7602,211 +6237,172 @@ msgstr[0] "Diskrivit ho poellad gant %d arouezenn"
 msgstr[1] "Diskrivit ho poellad gant %d arouezenn"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:205
 msgid "Describe your application"
 msgstr "Deskrivit ho poellad"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:216
 msgid "URL of the homepage of this application"
 msgstr "URL pajenn degemer ar poellad-mañ"
 
 #. TRANS: Form input field label.
-#: lib/applicationeditform.php:218
 msgid "Source URL"
 msgstr "Mammenn URL"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:225
 msgid "Organization responsible for this application"
 msgstr "An aozadur e karg eus ar poellad-mañ"
 
 #. TRANS: Form input field label.
-#: lib/applicationeditform.php:227
 msgid "Organization"
 msgstr "Aozadur"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:234
 msgid "URL for the homepage of the organization"
 msgstr "URL pajenn degemer an aozadur-se"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:243
 msgid "URL to redirect to after authentication"
 msgstr "URL davet pehini e o ret adkas goude bezañ kevreet"
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:271
 msgid "Browser"
 msgstr "Merdeer"
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:288
 msgid "Desktop"
 msgstr "Burev"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:290
 msgid "Type of application, browser or desktop"
 msgstr "Seurt ar poellad, merdeer pe burev"
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:314
 msgid "Read-only"
 msgstr "Lenn hepken"
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:334
 msgid "Read-write"
 msgstr "Lenn-skrivañ"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:336
 msgid "Default access for this application: read-only, or read-write"
 msgstr ""
 
 #. TRANS: Submit button title.
-#: lib/applicationeditform.php:353
 msgid "Cancel"
 msgstr "Nullañ"
 
-#: lib/applicationlist.php:247
 msgid " by "
 msgstr " gant "
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:260
 msgid "read-write"
 msgstr "lenn-skrivañ"
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:262
 msgid "read-only"
 msgstr "lenn hepken"
 
 #. TRANS: Used in application list. %1$s is a modified date, %2$s is access type ("read-write" or "read-only")
-#: lib/applicationlist.php:268
 #, php-format
 msgid "Approved %1$s - \"%2$s\" access."
 msgstr "Aprouet d'an %1$s - moned \"%2$s\"."
 
 #. TRANS: Access token in the application list.
 #. TRANS: %s are the first 7 characters of the access token.
-#: lib/applicationlist.php:282
 #, php-format
 msgid "Access token starting with: %s"
 msgstr ""
 
 #. TRANS: Button label
-#: lib/applicationlist.php:298
 msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "Disteuler"
 
-#: lib/atom10feed.php:113
 msgid "Author element must contain a name element."
 msgstr ""
 
 #. TRANS: Server exception thrown when using the method setActivitySubject() in the class Atom10Feed.
-#: lib/atom10feed.php:160
 #, fuzzy
 msgid "Do not use this method!"
 msgstr "Arabat dilemel ar c'hemenn-mañ"
 
 #. TRANS: Title.
-#: lib/attachmentnoticesection.php:67
 msgid "Notices where this attachment appears"
 msgstr ""
 
 #. TRANS: Title.
-#: lib/attachmenttagcloudsection.php:48
 #, fuzzy
 msgid "Tags for this attachment"
 msgstr "N'eo ket bet kavet ar restr stag."
 
 #. TRANS: Exception thrown when a password change fails.
-#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:227
 #, fuzzy
 msgid "Password changing failed."
 msgstr "N'eo ket aet betek penn kemmañ ar ger-tremen"
 
 #. TRANS: Exception thrown when a password change attempt fails because it is not allowed.
-#: lib/authenticationplugin.php:238
 #, fuzzy
 msgid "Password changing is not allowed."
 msgstr "N'eo ket aotreet kemmañ ar ger-tremen"
 
 #. TRANS: Title for the form to block a user.
-#: lib/blockform.php:68
 msgid "Block"
 msgstr "Stankañ"
 
 #. TRANS: Description of the form to block a user.
-#: lib/blockform.php:79
 msgid "Block this user"
 msgstr "Stankañ an implijer-mañ"
 
 #. TRANS: Title for command results.
-#: lib/channel.php:104 lib/channel.php:125
 msgid "Command results"
 msgstr "Disoc'hoù an urzhiad"
 
 #. TRANS: Title for command results.
-#: lib/channel.php:138
 #, fuzzy
 msgid "AJAX error"
 msgstr "Fazi Ajax"
 
 #. TRANS: E-mail subject when a command has completed.
-#: lib/channel.php:177 lib/mailhandler.php:143
 msgid "Command complete"
 msgstr "Urzhiad bet klokaet"
 
 #. TRANS: E-mail subject when a command has failed.
-#: lib/channel.php:188
 msgid "Command failed"
 msgstr "C'hwitet en deus an urzhiad"
 
 #. TRANS: Command exception text shown when a notice ID is requested that does not exist.
-#: lib/command.php:82 lib/command.php:106
 msgid "Notice with that id does not exist."
 msgstr ""
 
 #. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
 #. TRANS: Error text shown when a last user notice is requested and it does not exist.
-#: lib/command.php:99 lib/command.php:642
 msgid "User has no last notice."
 msgstr ""
 
 #. TRANS: Message given requesting a profile for a non-existing user.
 #. TRANS: %s is the nickname of the user for which the profile could not be found.
-#: lib/command.php:128
 #, php-format
 msgid "Could not find a user with nickname %s."
 msgstr ""
 
 #. TRANS: Message given getting a non-existing user.
 #. TRANS: %s is the nickname of the user that could not be found.
-#: lib/command.php:148
 #, php-format
 msgid "Could not find a local user with nickname %s."
 msgstr ""
 
 #. TRANS: Error text shown when an unimplemented command is given.
-#: lib/command.php:183
 msgid "Sorry, this command is not yet implemented."
 msgstr "Digarezit, n'eo ket bet emplementet an urzhiad-mañ c'hoazh."
 
 #. TRANS: Command exception text shown when a user tries to nudge themselves.
-#: lib/command.php:229
 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr ""
 "N'eus tamm talvoudegezh ebet ober ur blinkadenn deoc'h c'hwi oc'h unan !"
 
 #. TRANS: Message given having nudged another user.
 #. TRANS: %s is the nickname of the user that was nudged.
-#: lib/command.php:238
 #, php-format
 msgid "Nudge sent to %s."
 msgstr ""
@@ -7815,7 +6411,6 @@ msgstr ""
 #. TRANS: %1$s is the number of other user the user is subscribed to.
 #. TRANS: %2$s is the number of users that are subscribed to the user.
 #. TRANS: %3$s is the number of notices the user has sent.
-#: lib/command.php:268
 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"
@@ -7827,40 +6422,34 @@ msgstr ""
 "kemennadennoù : %3$s"
 
 #. TRANS: Error message text shown when a favorite could not be set because it has already been favorited.
-#: lib/command.php:298
 #, fuzzy
 msgid "Could not create favorite: already favorited."
 msgstr "Diposupl eo krouiñ ar pennroll-mañ."
 
 #. TRANS: Text shown when a notice has been marked as favourite successfully.
-#: lib/command.php:324
 msgid "Notice marked as fave."
 msgstr "Kemenn bet ouzhpennet d'ar pennroll."
 
 #. TRANS: Message given having added a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:369
 #, php-format
 msgid "%1$s joined group %2$s."
 msgstr "%1$s a zo bet er strollad %2$s."
 
 #. TRANS: Message given having removed a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:417
 #, php-format
 msgid "%1$s left group %2$s."
 msgstr "%1$s en deus kuitaet ar strollad %2$s."
 
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: lib/command.php:438
 #, php-format
 msgctxt "WHOIS"
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
 
 #. TRANS: Whois output. %s is the full name of the queried user.
-#: lib/command.php:442
 #, php-format
 msgid "Fullname: %s"
 msgstr "Anv klok : %s"
@@ -7868,7 +6457,6 @@ msgstr "Anv klok : %s"
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a location.
-#: lib/command.php:446 lib/mail.php:275
 #, php-format
 msgid "Location: %s"
 msgstr "Lec'hiadur : %s"
@@ -7876,20 +6464,17 @@ msgstr "Lec'hiadur : %s"
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a homepage.
-#: lib/command.php:450 lib/mail.php:279
 #, php-format
 msgid "Homepage: %s"
 msgstr "Lec'hienn Web : %s"
 
 #. TRANS: Whois output. %s is the bio information of the queried user.
-#: lib/command.php:454
 #, php-format
 msgid "About: %s"
 msgstr "Diwar-benn : %s"
 
 #. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).
 #. TRANS: %s is a remote profile.
-#: lib/command.php:483
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
@@ -7898,7 +6483,6 @@ msgstr ""
 
 #. TRANS: Message given if content is too long. %1$sd is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:500
 #, fuzzy, php-format
 msgid "Message too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
@@ -7909,27 +6493,27 @@ msgstr[1] ""
 "Re hir eo ar gemennadenn - ar ment brasañ a zo %1$d arouezenn, %2$d "
 "arouezenn ho peus lakaet."
 
+#. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
+msgid "You can't send a message to this user."
+msgstr "Ne c'helloc'h ket kas kemennadennoù d'an implijer-mañ."
+
 #. TRANS: Error text shown sending a direct message fails with an unknown reason.
-#: lib/command.php:528
 msgid "Error sending direct message."
 msgstr "Ur gudenn 'zo bet pa veze kaset ho kemennadenn."
 
 #. TRANS: Message given having repeated a notice from another user.
 #. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:565
 #, php-format
 msgid "Notice from %s repeated."
 msgstr ""
 
 #. TRANS: Error text shown when repeating a notice fails with an unknown reason.
-#: lib/command.php:568
 #, fuzzy
 msgid "Error repeating notice."
 msgstr "Fazi en ur hizivaat ar profil a-bell."
 
 #. TRANS: Message given if content of a notice for a reply is too long. %1$d is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:603
 #, fuzzy, php-format
 msgid "Notice too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Notice too long - maximum is %1$d characters, you sent %2$d."
@@ -7942,102 +6526,85 @@ msgstr[1] ""
 
 #. TRANS: Text shown having sent a reply to a notice successfully.
 #. TRANS: %s is the nickname of the user of the notice the reply was sent to.
-#: lib/command.php:616
 #, php-format
 msgid "Reply to %s sent."
 msgstr "Respont kaset da %s."
 
 #. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
-#: lib/command.php:619
 #, fuzzy
 msgid "Error saving notice."
 msgstr "Ur gudenn 'zo bet pa veze enrollet an ali."
 
 #. TRANS: Error text shown when no username was provided when issuing a subscribe command.
-#: lib/command.php:666
 msgid "Specify the name of the user to subscribe to."
 msgstr ""
 
 #. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
-#: lib/command.php:675
 msgid "Can't subscribe to OMB profiles by command."
 msgstr ""
 
 #. TRANS: Text shown after having subscribed to another user successfully.
 #. TRANS: %s is the name of the user the subscription was requested for.
-#: lib/command.php:683
 #, php-format
 msgid "Subscribed to %s."
 msgstr "Koumanantet da %s."
 
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.
-#: lib/command.php:704 lib/command.php:815
 msgid "Specify the name of the user to unsubscribe from."
 msgstr ""
 
 #. TRANS: Text shown after having unsubscribed from another user successfully.
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:715
 #, php-format
 msgid "Unsubscribed from %s."
 msgstr ""
 
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
-#: lib/command.php:735 lib/command.php:761
 #, fuzzy
 msgid "Command not yet implemented."
 msgstr "Digarezit, n'eo ket bet emplementet an urzhiad-mañ c'hoazh."
 
 #. TRANS: Text shown when issuing the command "off" successfully.
-#: lib/command.php:739
 msgid "Notification off."
 msgstr "Kemennoù diweredekaet."
 
 #. TRANS: Error text shown when the command "off" fails for an unknown reason.
-#: lib/command.php:742
 msgid "Can't turn off notification."
 msgstr "Dibosupl eo diweredekaat ar c'hemennoù."
 
 #. TRANS: Text shown when issuing the command "on" successfully.
-#: lib/command.php:765
 msgid "Notification on."
 msgstr "Kemennoù gweredekaet"
 
 #. TRANS: Error text shown when the command "on" fails for an unknown reason.
-#: lib/command.php:768
 msgid "Can't turn on notification."
 msgstr "Dibosupl eo gweredekaat ar c'hemennoù."
 
 #. TRANS: Error text shown when issuing the login command while login is disabled.
-#: lib/command.php:782
 msgid "Login command is disabled."
 msgstr ""
 
 #. TRANS: Text shown after issuing the login command successfully.
 #. TRANS: %s is a logon link..
-#: lib/command.php:795
 #, php-format
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
 
 #. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:824
 #, php-format
 msgid "Unsubscribed %s."
 msgstr "Digoumanatet %s."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
-#: lib/command.php:842
 msgid "You are not subscribed to anyone."
 msgstr "N'oc'h ket koumanantet da zen ebet."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
-#: lib/command.php:847
 #, fuzzy
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
@@ -8046,14 +6613,12 @@ msgstr[1] "You are subscribed to these people:"
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user
 #. TRANS: (followers) without having any subscribers.
-#: lib/command.php:869
 msgid "No one is subscribed to you."
 msgstr "Den n'eo koumanantet deoc'h."
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
-#: lib/command.php:874
 #, fuzzy
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
@@ -8062,14 +6627,12 @@ msgstr[1] "These people are subscribed to you:"
 
 #. TRANS: Text shown after requesting groups a user is subscribed to without having
 #. TRANS: any group subscriptions.
-#: lib/command.php:896
 msgid "You are not a member of any groups."
 msgstr "N'oc'h ezel eus strollad ebet."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
-#: lib/command.php:901
 #, fuzzy
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
@@ -8077,7 +6640,6 @@ msgstr[0] "You are a member of this group:"
 msgstr[1] "You are a member of these groups:"
 
 #. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-#: lib/command.php:916
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -8120,71 +6682,58 @@ msgid ""
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:36
 #, fuzzy
 msgid "No configuration file found."
 msgstr "N'eo bet kavet restr kefluniadur ebet. "
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:39
 #, fuzzy
 msgid "I looked for configuration files in the following places:"
 msgstr "Pedadennoù bet kaset d'an implijerien da-heul :"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:42
 msgid "You may wish to run the installer to fix this."
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:46
 msgid "Go to the installer."
 msgstr "Mont d'ar meziant staliañ"
 
-#: lib/dberroraction.php:59
 msgid "Database error"
 msgstr "Fazi bank roadennoù"
 
 #. TRANS: Description of form for deleting a user.
-#: lib/deleteuserform.php:75
 msgid "Delete this user"
 msgstr "Diverkañ an implijer-mañ"
 
-#: lib/designform.php:114
 #, fuzzy
 msgid "Change design"
 msgstr "Enrollañ an design"
 
 #. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: lib/designform.php:131
 msgid "Change colours"
 msgstr "Kemmañ al livioù"
 
 #. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: lib/designform.php:138
 msgid "Use defaults"
 msgstr "Implijout an talvoudoù dre ziouer"
 
 #. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: lib/designform.php:140
 msgid "Restore default designs"
 msgstr "Adlakaat an neuz dre ziouer."
 
 #. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: lib/designform.php:148
 msgid "Reset back to default"
 msgstr "Adlakaat an arventennoù dre ziouer"
 
 #. TRANS: Label in form on profile design page.
 #. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
-#: lib/designform.php:158
 msgid "Upload file"
 msgstr "Enporzhiañ ar restr"
 
 #. TRANS: Instructions for form on profile design page.
-#: lib/designform.php:163
 #, fuzzy
 msgid ""
 "You can upload your personal background image. The maximum file size is 2Mb."
@@ -8192,48 +6741,40 @@ msgstr ""
 "Gallout a rit kargañ hoc'h avatar personel. Ment vrasañ ar restr zo %s."
 
 #. TRANS: Radio button on profile design page that will enable use of the uploaded profile image.
-#: lib/designform.php:194
 msgctxt "RADIO"
 msgid "On"
 msgstr "Gweredekaet"
 
 #. TRANS: Radio button on profile design page that will disable use of the uploaded profile image.
-#: lib/designform.php:211
 msgctxt "RADIO"
 msgid "Off"
 msgstr "Diweredekaet"
 
 #. TRANS: Title for button on profile design page to save settings.
-#: lib/designform.php:322
 msgid "Save design"
 msgstr "Enrollañ an design"
 
 #. TRANS: Error message displayed if design settings could not be saved.
 #. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
-#: lib/designsettings.php:216 lib/designsettings.php:238
 msgid "Couldn't update your design."
 msgstr "Dibosupl eo hizivaat ho design."
 
 #. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
-#: lib/designsettings.php:244
 #, fuzzy
 msgid "Design defaults restored."
 msgstr "Enrollet eo bet an arventennoù design."
 
 #. TRANS: Exception. %s is an ID.
-#: lib/discovery.php:153
 #, fuzzy, php-format
 msgid "Unable to find services for %s."
 msgstr "Dibosupl eo nullañ moned ar poellad : "
 
 #. TRANS: Form legend for removing the favourite status for a favourite notice.
 #. TRANS: Title for button text for removing the favourite status for a favourite notice.
-#: lib/disfavorform.php:108 lib/disfavorform.php:140
 msgid "Disfavor this notice"
 msgstr "Tennañ eus ar pennrolloù"
 
 #. TRANS: Button text for removing the favourite status for a favourite notice.
-#: lib/disfavorform.php:136
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Disfavor favorite"
@@ -8241,105 +6782,83 @@ msgstr "Tennañ ar pennroll"
 
 #. TRANS: Form legend for adding the favourite status to a notice.
 #. TRANS: Title for button text for adding the favourite status to a notice.
-#: lib/favorform.php:108 lib/favorform.php:139
 msgid "Favor this notice"
 msgstr "Ouzhpennañ d'ar pennrolloù"
 
 #. TRANS: Button text for adding the favourite status to a notice.
-#: lib/favorform.php:135
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Favor"
 msgstr "Pennrolloù"
 
-#: lib/feed.php:84
 msgid "RSS 1.0"
 msgstr "RSS 1.0"
 
-#: lib/feed.php:86
 msgid "RSS 2.0"
 msgstr "RSS 2.0"
 
-#: lib/feed.php:88
 msgid "Atom"
 msgstr "Atom"
 
-#: lib/feed.php:90
 msgid "FOAF"
 msgstr "Mignon ur mignon (FOAF)"
 
-#: lib/feedimporter.php:75
 #, fuzzy
 msgid "Not an atom feed."
 msgstr "An holl izili"
 
-#: lib/feedimporter.php:82
 msgid "No author in the feed."
 msgstr ""
 
-#: lib/feedimporter.php:89
 msgid "Can't import without a user."
 msgstr ""
 
 #. TRANS: Header for feed links (h2).
-#: lib/feedlist.php:66
 msgid "Feeds"
 msgstr "Lanvioù"
 
-#: lib/galleryaction.php:128
 msgid "All"
 msgstr "An holl"
 
-#: lib/galleryaction.php:136
 #, fuzzy
 msgid "Select tag to filter"
 msgstr "Dibab un douger"
 
-#: lib/galleryaction.php:137
 msgid "Tag"
 msgstr "Balizenn"
 
-#: lib/galleryaction.php:138
 msgid "Choose a tag to narrow list"
 msgstr ""
 
-#: lib/galleryaction.php:140
 msgid "Go"
 msgstr "Mont"
 
-#: lib/grantroleform.php:91
 #, php-format
 msgid "Grant this user the \"%s\" role"
 msgstr ""
 
-#: lib/groupeditform.php:147
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "1 da 64 lizherenn vihan pe sifr, hep poentaouiñ nag esaouenn"
 
-#: lib/groupeditform.php:156
 #, fuzzy
 msgid "URL of the homepage or blog of the group or topic."
 msgstr "URL pajenn degemer ar poellad-mañ"
 
-#: lib/groupeditform.php:161
 #, fuzzy
 msgid "Describe the group or topic"
 msgstr "Deskrivit ho poellad"
 
-#: lib/groupeditform.php:163
 #, fuzzy, php-format
 msgid "Describe the group or topic in %d character or less"
 msgid_plural "Describe the group or topic in %d characters or less"
 msgstr[0] "Diskrivit ho poellad gant %d arouezenn"
 msgstr[1] "Diskrivit ho poellad gant %d arouezenn"
 
-#: lib/groupeditform.php:175
 #, fuzzy
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\"."
 msgstr "El lec'h m'emaoc'h, da skouer \"Kêr, Stad (pe Rannvro), Bro\""
 
-#: lib/groupeditform.php:183
 #, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -8351,70 +6870,60 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Menu item in the group navigation page.
-#: lib/groupnav.php:86
 msgctxt "MENU"
 msgid "Group"
 msgstr "Strollad"
 
 #. TRANS: Tooltip for menu item in the group navigation page.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:89
 #, php-format
 msgctxt "TOOLTIP"
 msgid "%s group"
 msgstr "strollad %s"
 
 #. TRANS: Menu item in the group navigation page.
-#: lib/groupnav.php:95
 msgctxt "MENU"
 msgid "Members"
 msgstr "Izili"
 
 #. TRANS: Tooltip for menu item in the group navigation page.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:98
 #, php-format
 msgctxt "TOOLTIP"
 msgid "%s group members"
 msgstr "Izili ar strollad %s"
 
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/groupnav.php:108
 msgctxt "MENU"
 msgid "Blocked"
 msgstr "Stanket"
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:111
 #, php-format
 msgctxt "TOOLTIP"
 msgid "%s blocked users"
 msgstr "implijerien stanket ar strollad %s"
 
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "Merañ"
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:120
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Edit %s group properties"
 msgstr "Kemmañ perzhioù ar strollad %s"
 
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/groupnav.php:126
 msgctxt "MENU"
 msgid "Logo"
 msgstr "Logo"
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:129
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Add or edit %s logo"
@@ -8422,71 +6931,59 @@ msgstr "Ouzhpennañ pe kemmañ logo ar strollad %s"
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:138
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Add or edit %s design"
 msgstr "Ouzhpennañ pe kemmañ tres ar strollad %s"
 
 #. TRANS: Title for groups with the most members section.
-#: lib/groupsbymemberssection.php:71
 #, fuzzy
 msgid "Groups with most members"
 msgstr "Ezel eo %s eus ar strolladoù"
 
 #. TRANS: Title for groups with the most posts section.
-#: lib/groupsbypostssection.php:71
 msgid "Groups with most posts"
 msgstr ""
 
 #. TRANS: Title for group tag cloud section.
 #. TRANS: %s is a group name.
-#: lib/grouptagcloudsection.php:57
 #, php-format
 msgid "Tags in %s group's notices"
 msgstr ""
 
 #. TRANS: Client exception 406
-#: lib/htmloutputter.php:104
 msgid "This page is not available in a media type you accept"
 msgstr ""
 
 #. TRANS: Exception thrown when trying to upload an unsupported image file format.
-#: lib/imagefile.php:73
 #, fuzzy
 msgid "Unsupported image file format."
 msgstr "Diembreget eo ar furmad-se."
 
 #. TRANS: Exception thrown when too large a file is uploaded.
 #. TRANS: %s is the maximum file size, for example "500b", "10kB" or "2MB".
-#: lib/imagefile.php:91
 #, fuzzy, php-format
 msgid "That file is too big. The maximum file size is %s."
 msgstr "Re vras eo ar restr ! %d eo ar vent vrasañ evit ur restr."
 
 #. TRANS: Exception thrown when uploading an image and that action could not be completed.
-#: lib/imagefile.php:97
 msgid "Partial upload."
 msgstr "Enporzhiadenn diglok."
 
 #. TRANS: Exception thrown when uploading a file as image that is not an image or is a corrupt file.
-#: lib/imagefile.php:115
 msgid "Not an image or corrupt file."
 msgstr ""
 
 #. TRANS: Exception thrown during resize when image has been registered as present, but is no longer there.
-#: lib/imagefile.php:178
 msgid "Lost our file."
 msgstr "Restr bet kollet."
 
 #. TRANS: Exception thrown when trying to resize an unknown file type.
 #. TRANS: Exception thrown when trying resize an unknown file type.
-#: lib/imagefile.php:216 lib/imagefile.php:257
 msgid "Unknown file type"
 msgstr "Dizanv eo seurt ar restr"
 
 #. TRANS: Number of megabytes. %d is the number.
-#: lib/imagefile.php:303
 #, php-format
 msgid "%dMB"
 msgid_plural "%dMB"
@@ -8494,7 +6991,6 @@ msgstr[0] "%d&nbsp;Mo"
 msgstr[1] "%d&nbsp;Mo"
 
 #. TRANS: Number of kilobytes. %d is the number.
-#: lib/imagefile.php:307
 #, php-format
 msgid "%dkB"
 msgid_plural "%dkB"
@@ -8502,14 +6998,12 @@ msgstr[0] "%d&nbsp;Ko"
 msgstr[1] "%d&nbsp;Ko"
 
 #. TRANS: Number of bytes. %d is the number.
-#: lib/imagefile.php:310
 #, php-format
 msgid "%dB"
 msgid_plural "%dB"
 msgstr[0] "%d&nbsp;o"
 msgstr[1] "%d&nbsp;o"
 
-#: lib/implugin.php:262
 #, php-format
 msgid ""
 "User \"%s\" on %s has said that your %s screenname belongs to them. If "
@@ -8519,54 +7013,45 @@ msgid ""
 "message."
 msgstr ""
 
-#: lib/implugin.php:349
 #, fuzzy, php-format
 msgid "Unknown inbox source %d."
 msgstr "Yezh \"%s\" dizanv."
 
-#: lib/implugin.php:485
-#, fuzzy, php-format
+#, php-format
 msgid "Message too long - maximum is %1$d characters, you sent %2$d."
 msgstr ""
 "Re hir eo ar gemennadenn - ar ment brasañ a zo %1$d arouezenn, %2$d "
 "arouezenn ho peus lakaet."
 
-#: lib/leaveform.php:114
 msgid "Leave"
 msgstr "Kuitaat"
 
 #. TRANS: Menu item for logging in to the StatusNet site.
-#: lib/logingroupnav.php:77
 msgctxt "MENU"
 msgid "Login"
 msgstr "Kevreañ"
 
 #. TRANS: Title for menu item for logging in to the StatusNet site.
-#: lib/logingroupnav.php:79
 #, fuzzy
 msgid "Login with a username and password"
 msgstr "Kevreit gant ho anv implijer hag ho ker-tremen."
 
 #. TRANS: Menu item for registering with the StatusNet site.
-#: lib/logingroupnav.php:85
 msgctxt "MENU"
 msgid "Register"
 msgstr "En em enskrivañ"
 
 #. TRANS: Title for menu item for registering with the StatusNet site.
-#: lib/logingroupnav.php:87
 msgid "Sign up for a new account"
 msgstr "Digeriñ ur gont nevez"
 
 #. TRANS: Subject for address confirmation email.
-#: lib/mail.php:172
 msgid "Email address confirmation"
 msgstr "Kadarnadur ar chomlec'h postel"
 
 #. TRANS: Body for address confirmation email.
 #. TRANS: %1$s is the addressed user's nickname, %2$s is the StatusNet sitename,
 #. TRANS: %3$s is the URL to confirm at.
-#: lib/mail.php:177
 #, php-format
 msgid ""
 "Hey, %1$s.\n"
@@ -8585,14 +7070,12 @@ msgstr ""
 
 #. TRANS: Subject of new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
-#: lib/mail.php:243
 #, fuzzy, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "Ne heuilh %s den ebet."
 
 #. TRANS: This is a paragraph in a new-subscriber e-mail.
 #. TRANS: %s is a URL where the subscriber can be reported as abusive.
-#: lib/mail.php:250
 #, php-format
 msgid ""
 "If you believe this account is being used abusively, you can block them from "
@@ -8604,7 +7087,6 @@ msgstr ""
 #. TRANS: %3$s is the subscriber's profile URL, %4$s is the subscriber's location (or empty)
 #. TRANS: %5$s is the subscriber's homepage URL (or empty), %6%s is the subscriber's bio (or empty)
 #. TRANS: %7$s is a link to the addressed user's e-mail settings.
-#: lib/mail.php:260
 #, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -8621,14 +7103,12 @@ msgstr ""
 
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is biographical information.
-#: lib/mail.php:283
 #, fuzzy, php-format
 msgid "Bio: %s"
 msgstr "Lec'hiadur : %s"
 
 #. TRANS: Subject of notification mail for new posting email address.
 #. TRANS: %s is the StatusNet sitename.
-#: lib/mail.php:312
 #, php-format
 msgid "New email address for posting to %s"
 msgstr "Chomlec'h postel nevez evit embann e %s"
@@ -8636,7 +7116,6 @@ msgstr "Chomlec'h postel nevez evit embann e %s"
 #. TRANS: Body of notification mail for new posting email address.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is the e-mail address to send
 #. TRANS: to to post by e-mail, %3$s is a URL to more instructions.
-#: lib/mail.php:318
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -8651,26 +7130,22 @@ msgstr ""
 
 #. TRANS: Subject line for SMS-by-email notification messages.
 #. TRANS: %s is the posting user's nickname.
-#: lib/mail.php:439
 #, php-format
 msgid "%s status"
 msgstr "Statud %s"
 
 #. TRANS: Subject line for SMS-by-email address confirmation message.
-#: lib/mail.php:465
 msgid "SMS confirmation"
 msgstr "Kadarnadur SMS"
 
 #. TRANS: Main body heading for SMS-by-email address confirmation message.
 #. TRANS: %s is the addressed user's nickname.
-#: lib/mail.php:469
 #, fuzzy, php-format
 msgid "%s: confirm you own this phone number with this code:"
 msgstr "Niverenn pellgomz o c'hortoz bezañ kadarnaet."
 
 #. TRANS: Subject for 'nudge' notification email.
 #. TRANS: %s is the nudging user.
-#: lib/mail.php:490
 #, fuzzy, php-format
 msgid "You have been nudged by %s"
 msgstr "Nac'het ez eus bet deoc'h en em goumanantiñ."
@@ -8678,7 +7153,6 @@ msgstr "Nac'het ez eus bet deoc'h en em goumanantiñ."
 #. TRANS: Body for 'nudge' notification email.
 #. TRANS: %1$s is the nuding user's long name, $2$s is the nudging user's nickname,
 #. TRANS: %3$s is a URL to post notices at, %4$s is the StatusNet sitename.
-#: lib/mail.php:497
 #, php-format
 msgid ""
 "%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -8696,7 +7170,6 @@ msgstr ""
 
 #. TRANS: Subject for direct-message notification email.
 #. TRANS: %s is the sending user's nickname.
-#: lib/mail.php:544
 #, php-format
 msgid "New private message from %s"
 msgstr "Kemenadenn personel nevez a-berzh %s"
@@ -8705,7 +7178,6 @@ msgstr "Kemenadenn personel nevez a-berzh %s"
 #. TRANS: %1$s is the sending user's long name, %2$s is the sending user's nickname,
 #. TRANS: %3$s is the message content, %4$s a URL to the message,
 #. TRANS: %5$s is the StatusNet sitename.
-#: lib/mail.php:552
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -8726,7 +7198,6 @@ msgstr ""
 
 #. TRANS: Subject for favorite notification e-mail.
 #. TRANS: %1$s is the adding user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:604
 #, fuzzy, php-format
 msgid "%1$s (@%2$s) added your notice as a favorite"
 msgstr "Kas din ur postel pa lak unan bennak unan eus va alioù evel pennroll."
@@ -8736,7 +7207,6 @@ msgstr "Kas din ur postel pa lak unan bennak unan eus va alioù evel pennroll."
 #. TRANS: %3$s is a URL to the faved notice, %4$s is the faved notice text,
 #. TRANS: %5$s is a URL to all faves of the adding user, %6$s is the StatusNet sitename,
 #. TRANS: %7$s is the adding user's nickname.
-#: lib/mail.php:611
 #, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -8758,7 +7228,6 @@ msgid ""
 msgstr ""
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:669
 #, php-format
 msgid ""
 "The full conversation can be read here:\n"
@@ -8771,7 +7240,6 @@ msgstr ""
 
 #. TRANS: E-mail subject for notice notification.
 #. TRANS: %1$s is the sending user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:677
 #, fuzzy, php-format
 msgid "%1$s (@%2$s) sent a notice to your attention"
 msgstr "%s (@%s) en deus kaset deoc'h ur c'hemenn"
@@ -8782,7 +7250,6 @@ msgstr "%s (@%s) en deus kaset deoc'h ur c'hemenn"
 #. TRANS: %5$s is a URL to the full conversion if it exists (otherwise empty),
 #. TRANS: %6$s is a URL to reply to the notice, %7$s is a URL to all @-replied for the addressed user,
 #. TRANS: %8$s is a URL to the addressed user's e-mail settings, %9$s is the sender's nickname.
-#: lib/mail.php:685
 #, php-format
 msgid ""
 "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -8809,60 +7276,49 @@ msgid ""
 "P.S. You can turn off these email notifications here: %8$s\n"
 msgstr ""
 
-#: lib/mailbox.php:87
 #, fuzzy
 msgid "Only the user can read their own mailboxes."
 msgstr "N'eus nemet an implijerien kevreet hag a c'hell adkemer alioù."
 
-#: lib/mailbox.php:125
 msgid ""
 "You have no private messages. You can send private message to engage other "
 "users in conversation. People can send you messages for your eyes only."
 msgstr ""
 
-#: lib/mailhandler.php:37
 #, fuzzy
 msgid "Could not parse message."
 msgstr "Diposubl eo ensoc'hañ ur gemenadenn"
 
-#: lib/mailhandler.php:42
 msgid "Not a registered user."
 msgstr "N'eo ket un implijer enrollet."
 
-#: lib/mailhandler.php:46
 #, fuzzy
 msgid "Sorry, that is not your incoming email address."
 msgstr "N'eo ket ho postel."
 
-#: lib/mailhandler.php:50
 #, fuzzy
 msgid "Sorry, no incoming email allowed."
 msgstr "Chomlec'h postel ebet o tont."
 
-#: lib/mailhandler.php:229
 #, fuzzy, php-format
 msgid "Unsupported message type: %s"
 msgstr "Diembreget eo ar furmad-se."
 
 #. TRANS: Client exception thrown when a database error was thrown during a file upload operation.
-#: lib/mediafile.php:102 lib/mediafile.php:174
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
 
 #. TRANS: Client exception thrown when a file upload operation would cause a user to exceed a set quota.
-#: lib/mediafile.php:238 lib/mediafile.php:281
 msgid "File exceeds user's quota."
 msgstr ""
 
 #. TRANS: Client exception thrown when a file upload operation fails because the file could
 #. TRANS: not be moved from the temporary folder to the permanent file location.
-#: lib/mediafile.php:258 lib/mediafile.php:300
 msgid "File could not be moved to destination directory."
 msgstr ""
 
 #. TRANS: Client exception thrown when a file upload operation has been stopped because the MIME
 #. TRANS: type of the uploaded file could not be determined.
-#: lib/mediafile.php:265 lib/mediafile.php:306
 #, fuzzy
 msgid "Could not determine file's MIME type."
 msgstr "Diposubl eo termeniñ an implijer mammenn."
@@ -8870,7 +7326,6 @@ msgstr "Diposubl eo termeniñ an implijer mammenn."
 #. TRANS: Client exception thrown trying to upload a forbidden MIME type.
 #. TRANS: %1$s is the file type that was denied, %2$s is the application part of
 #. TRANS: the MIME type that was denied.
-#: lib/mediafile.php:396
 #, php-format
 msgid ""
 "\"%1$s\" is not a supported file type on this server. Try using another %2$s "
@@ -8879,508 +7334,397 @@ msgstr ""
 
 #. TRANS: Client exception thrown trying to upload a forbidden MIME type.
 #. TRANS: %s is the file type that was denied.
-#: lib/mediafile.php:401
 #, php-format
 msgid "\"%s\" is not a supported file type on this server."
 msgstr ""
 
-#: lib/messageform.php:120
 msgid "Send a direct notice"
 msgstr "Kas ur gemennadenn war-eeun"
 
 #. TRANS Label entry in drop-down selection box in direct-message inbox/outbox. This is the default entry in the drop-down box, doubling as instructions and a brake against accidental submissions with the first user in the list.
-#: lib/messageform.php:137
 #, fuzzy
 msgid "Select recipient:"
 msgstr "Dibab un aotre-implijout"
 
 #. TRANS Entry in drop-down selection box in direct-message inbox/outbox when no one is available to message.
-#: lib/messageform.php:150
 #, fuzzy
 msgid "No mutual subscribers."
 msgstr "Nann-koumanantet !"
 
-#: lib/messageform.php:153
 msgid "To"
 msgstr "Da"
 
-#: lib/messageform.php:184 lib/noticeform.php:236
 msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr "Kas"
 
-#: lib/messagelist.php:77
-#, fuzzy
 msgid "Messages"
-msgstr "Kemennadenn"
+msgstr "Kemennadennoù"
 
-#: lib/messagelistitem.php:123 lib/noticelist.php:527
 msgid "from"
 msgstr "eus"
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:178
 msgid "Nickname cannot be empty."
 msgstr ""
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:191
 #, php-format
 msgid "Nickname cannot be more than %d character long."
 msgid_plural "Nickname cannot be more than %d characters long."
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/noticeform.php:160
+#. TRANS: Form legend for notice form.
 msgid "Send a notice"
 msgstr "Kas un ali"
 
-#: lib/noticeform.php:174
+#. TRANS: Title for notice label. %s is the user's nickname.
 #, php-format
 msgid "What's up, %s?"
 msgstr "Penaos 'mañ kont, %s ?"
 
-#: lib/noticeform.php:193
+#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr "Stagañ"
 
-#: lib/noticeform.php:197
-msgid "Attach a file"
+#. TRANS: Title for input field to attach a file to a notice.
+#, fuzzy
+msgid "Attach a file."
 msgstr "Stagañ ur restr"
 
-#: lib/noticeform.php:212
+#. TRANS: Field label to add location to a notice.
 msgid "Share my location"
 msgstr "Rannañ va lec'hiadur."
 
-#: lib/noticeform.php:215
+#. TRANS: Text to not share location for a notice in notice form.
 msgid "Do not share my location"
 msgstr "Chom hep rannañ va lec'hiadur."
 
-#: lib/noticeform.php:216
+#. TRANS: Timeout error text for location retrieval in notice form.
 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
 "try again later"
 msgstr ""
 
 #. TRANS: Used in coordinates as abbreviation of north
-#: lib/noticelist.php:457
 msgid "N"
 msgstr "N"
 
 #. TRANS: Used in coordinates as abbreviation of south
-#: lib/noticelist.php:459
 msgid "S"
 msgstr "S"
 
 #. TRANS: Used in coordinates as abbreviation of east
-#: lib/noticelist.php:461
 msgid "E"
 msgstr "R"
 
 #. TRANS: Used in coordinates as abbreviation of west
-#: lib/noticelist.php:463
 msgid "W"
 msgstr "K"
 
-#: lib/noticelist.php:465
 #, php-format
 msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 
-#: lib/noticelist.php:474
 msgid "at"
 msgstr "e"
 
-#: lib/noticelist.php:523
 msgid "web"
 msgstr "web"
 
-#: lib/noticelist.php:589
 msgid "in context"
 msgstr "en amdro"
 
-#: lib/noticelist.php:624
 msgid "Repeated by"
 msgstr "Adkemeret gant"
 
-#: lib/noticelist.php:651
 msgid "Reply to this notice"
 msgstr "Respont d'ar c'hemenn-mañ"
 
-#: lib/noticelist.php:652
 msgid "Reply"
 msgstr "Respont"
 
-#: lib/noticelist.php:678
 msgid "Delete this notice"
 msgstr "Dilemel ar c'hemenn-mañ"
 
-#: lib/noticelist.php:696
 msgid "Notice repeated"
 msgstr "Ali adkemeret"
 
-#: lib/nudgeform.php:116
 msgid "Nudge this user"
 msgstr "Kas ur blinkadenn d'an implijer-mañ"
 
-#: lib/nudgeform.php:128
 msgid "Nudge"
 msgstr "Blinkadenn"
 
-#: lib/nudgeform.php:128
 msgid "Send a nudge to this user"
 msgstr "Kas ur blinkadenn d'an implijer-mañ"
 
-#: lib/oauthstore.php:294
 msgid "Error inserting new profile."
 msgstr ""
 
-#: lib/oauthstore.php:302
 msgid "Error inserting avatar."
 msgstr ""
 
-#: lib/oauthstore.php:322
 msgid "Error inserting remote profile."
 msgstr ""
 
 #. TRANS: Exception thrown when a notice is denied because it has been sent before.
-#: lib/oauthstore.php:362
 msgid "Duplicate notice."
 msgstr ""
 
-#: lib/oauthstore.php:507
 #, fuzzy
 msgid "Couldn't insert new subscription."
 msgstr "Dibosupl eo dilemel ar c'houmanant."
 
-#: lib/personalgroupnav.php:104
-#, fuzzy
 msgid "Replies"
 msgstr "Respontoù"
 
-#: lib/personalgroupnav.php:109
-#, fuzzy
 msgid "Favorites"
 msgstr "Pennrolloù"
 
-#: lib/personalgroupnav.php:120
-#, fuzzy
 msgid "Inbox"
 msgstr "Boest resev"
 
-#: lib/personalgroupnav.php:121
 msgid "Your incoming messages"
 msgstr "Ar gemennadennoù ho peus resevet"
 
-#: lib/personalgroupnav.php:125
-#, fuzzy
 msgid "Outbox"
 msgstr "Boest kas"
 
-#: lib/personalgroupnav.php:126
 msgid "Your sent messages"
 msgstr "Ar c'hemenadennoù kaset ganeoc'h"
 
 #. TRANS: Title for personal tag cloud section. %s is a user nickname.
-#: lib/personaltagcloudsection.php:56
 #, fuzzy, php-format
 msgid "Tags in %s's notices"
 msgstr "N'eus ali nevez evit an implijer-mañ"
 
 #. TRANS: Displayed as version information for a plugin if no version information was found.
-#: lib/plugin.php:126
 msgid "Unknown"
 msgstr "Dianav"
 
 #. TRANS: Plugin admin panel controls
-#: lib/plugindisableform.php:90
 msgctxt "plugin"
 msgid "Disable"
-msgstr ""
+msgstr "Diweredekaat"
 
 #. TRANS: Plugin admin panel controls
-#: lib/pluginenableform.php:112
 msgctxt "plugin"
 msgid "Enable"
-msgstr ""
+msgstr "Gweredekaat"
 
-#: lib/pluginlist.php:196
 msgctxt "plugin-description"
 msgid "(Plugin descriptions unavailable when disabled.)"
 msgstr ""
 
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:88
 msgid "Subscriptions"
 msgstr "Koumanantoù"
 
 #. TRANS: Text for user subscription statistics if user has more subscriptions than displayed.
-#: lib/profileaction.php:144
 msgid "All subscriptions"
 msgstr "An holl koumanantoù"
 
 #. TRANS: H2 text for user subscriber statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:96
 msgid "Subscribers"
 msgstr "Ar re koumanantet"
 
 #. TRANS: Text for user subscription statistics if user has more subscribers than displayed.
-#: lib/profileaction.php:181
 msgid "All subscribers"
 msgstr "An holl re koumanantet"
 
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:213
 msgid "User ID"
 msgstr "ID an implijer"
 
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:219
 msgid "Member since"
 msgstr "Ezel abaoe"
 
 #. TRANS: Label for user statistics.
 #. TRANS: H2 text for user group membership statistics.
-#: lib/profileaction.php:239 lib/profileaction.php:290
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:104
 msgid "Groups"
 msgstr "Strolladoù"
 
 #. TRANS: Label for user statistics.
 #. TRANS: Average count of posts made per day since account registration.
-#: lib/profileaction.php:253
 msgid "Daily average"
 msgstr "Keidenn pemdeziek"
 
 #. TRANS: Text for user group membership statistics if user has more subscriptions than displayed.
-#: lib/profileaction.php:305
 msgid "All groups"
 msgstr "An holl strolladoù"
 
 #. TRANS: Server error displayed when using an unimplemented method.
-#: lib/profileformaction.php:123
 msgid "Unimplemented method."
 msgstr ""
 
-#: lib/publicgroupnav.php:82
 msgid "User groups"
 msgstr "Strolladoù implijerien"
 
-#: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
 msgid "Recent tags"
 msgstr "Merkoù nevez"
 
-#: lib/publicgroupnav.php:88
 msgid "Featured"
 msgstr "Heverk"
 
-#: lib/publicgroupnav.php:92
 msgid "Popular"
 msgstr "Poblek"
 
-#: lib/redirectingaction.php:95
 #, fuzzy
 msgid "No return-to arguments."
 msgstr "Arguzenn ID ebet."
 
-#: lib/repeatform.php:107
 msgid "Repeat this notice?"
 msgstr "Adkregiñ gant ar c'hemenn-mañ ?"
 
-#: lib/repeatform.php:132
 msgid "Yes"
 msgstr "Ya"
 
-#: lib/repeatform.php:132
 msgid "Repeat this notice"
 msgstr "Adkregiñ gant ar c'hemenn-mañ"
 
-#: lib/revokeroleform.php:91
 #, fuzzy, php-format
 msgid "Revoke the \"%s\" role from this user"
 msgstr "Stankañ an implijer-mañ eus ar strollad-se"
 
 #. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:1001
 #, fuzzy
 msgid "Page not found."
 msgstr "N'eo ket bet kavet an hentenn API !"
 
-#: lib/sandboxform.php:67
 msgid "Sandbox"
 msgstr "Poull-traezh"
 
-#: lib/sandboxform.php:78
 #, fuzzy
 msgid "Sandbox this user"
 msgstr "Distankañ an implijer-mañ"
 
 #. TRANS: Fieldset legend for the search form.
-#: lib/searchaction.php:120
 msgid "Search site"
 msgstr "Klask el lec'hienn"
 
 #. TRANS: Used as a field label for the field where one or more keywords
 #. TRANS: for searching can be entered.
-#: lib/searchaction.php:128
 msgid "Keyword(s)"
 msgstr "Ger(ioù) alc'hwez"
 
 #. TRANS: Button text for searching site.
-#: lib/searchaction.php:130
 msgctxt "BUTTON"
 msgid "Search"
 msgstr "Klask"
 
-#: lib/searchgroupnav.php:80
 msgid "People"
 msgstr "Tud"
 
-#: lib/searchgroupnav.php:81
 msgid "Find people on this site"
 msgstr "Klask tud el lec'hienn-mañ"
 
-#: lib/searchgroupnav.php:83
 msgid "Find content of notices"
 msgstr "Klask alioù en danvez"
 
-#: lib/searchgroupnav.php:85
 msgid "Find groups on this site"
 msgstr "Klask strolladoù el lec'hienn-mañ"
 
-#: lib/section.php:89
 msgid "Untitled section"
 msgstr "Rann hep titl"
 
-#: lib/section.php:106
 msgid "More..."
 msgstr "Muioc'h..."
 
-#: lib/settingsnav.php:78
 msgid "Change your profile settings"
 msgstr "Kemmañ arventennoù ho profil"
 
-#: lib/settingsnav.php:83
 msgid "Upload an avatar"
 msgstr "Enporzhiañ un avatar"
 
-#: lib/settingsnav.php:88
 msgid "Change your password"
 msgstr "Cheñch ar ger-tremen"
 
-#: lib/settingsnav.php:93
 msgid "Change email handling"
 msgstr "Kemmañ tretadur ar posteloù"
 
-#: lib/settingsnav.php:98
 msgid "Design your profile"
 msgstr "Krouit ho profil"
 
-#: lib/settingsnav.php:102
 msgid "URL"
 msgstr "URL"
 
-#: lib/settingsnav.php:103
 msgid "URL shorteners"
 msgstr ""
 
-#: lib/settingsnav.php:111
 msgid "Updates by instant messenger (IM)"
 msgstr ""
 
-#: lib/settingsnav.php:118
 msgid "Updates by SMS"
 msgstr "Hizivadennoù dre SMS"
 
-#: lib/settingsnav.php:123
-#, fuzzy
 msgid "Connections"
 msgstr "Kevreadennoù"
 
-#: lib/settingsnav.php:124
 #, fuzzy
 msgid "Authorized connected applications"
 msgstr "Poeladoù kevreet."
 
-#: lib/silenceform.php:67
 msgid "Silence"
 msgstr "Didrouz"
 
-#: lib/silenceform.php:78
 #, fuzzy
 msgid "Silence this user"
 msgstr "Diverkañ an implijer-mañ"
 
-#: lib/subgroupnav.php:89
 #, php-format
 msgid "People %s subscribes to"
 msgstr "Koumanantoù %s"
 
-#: lib/subgroupnav.php:97
 #, php-format
 msgid "People subscribed to %s"
 msgstr "Koumananterien %s"
 
-#: lib/subgroupnav.php:105
 #, php-format
 msgid "Groups %s is a member of"
 msgstr "Ezel eo %s eus ar strolladoù"
 
-#: lib/subgroupnav.php:111
 msgid "Invite"
 msgstr "Pediñ"
 
-#: lib/subgroupnav.php:112
 #, php-format
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Pediñ mignoned hag kenseurted da zont ganeoc'h war %s"
 
-#: lib/subscribeform.php:115 lib/subscribeform.php:139
 msgid "Subscribe to this user"
 msgstr "En em goumanantiñ d'an implijer-mañ"
 
-#: lib/subscriberspeopleselftagcloudsection.php:48
-#: lib/subscriptionspeopleselftagcloudsection.php:48
 msgid "People Tagcloud as self-tagged"
 msgstr ""
 
-#: lib/subscriberspeopletagcloudsection.php:48
-#: lib/subscriptionspeopletagcloudsection.php:48
 msgid "People Tagcloud as tagged"
 msgstr ""
 
-#: lib/tagcloudsection.php:56
 msgid "None"
 msgstr "Hini ebet"
 
 #. TRANS: Server exception displayed if a theme name was invalid.
-#: lib/theme.php:74
 #, fuzzy
 msgid "Invalid theme name."
 msgstr "Ment direizh."
 
-#: lib/themeuploader.php:50
 msgid "This server cannot handle theme uploads without ZIP support."
 msgstr ""
 
-#: lib/themeuploader.php:58 lib/themeuploader.php:61
 msgid "The theme file is missing or the upload failed."
 msgstr ""
 
-#: lib/themeuploader.php:91 lib/themeuploader.php:102
-#: lib/themeuploader.php:279 lib/themeuploader.php:283
-#: lib/themeuploader.php:291 lib/themeuploader.php:298
 #, fuzzy
 msgid "Failed saving theme."
 msgstr "Ur gudenn 'zo bet e-pad hizivadenn an avatar."
 
-#: lib/themeuploader.php:147
 msgid "Invalid theme: bad directory structure."
 msgstr ""
 
-#: lib/themeuploader.php:166
 #, php-format
 msgid "Uploaded theme is too large; must be less than %d byte uncompressed."
 msgid_plural ""
@@ -9388,155 +7732,125 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/themeuploader.php:179
 msgid "Invalid theme archive: missing file css/display.css"
 msgstr ""
 
-#: lib/themeuploader.php:219
 msgid ""
 "Theme contains invalid file or folder name. Stick with ASCII letters, "
 "digits, underscore, and minus sign."
 msgstr ""
 
-#: lib/themeuploader.php:225
 msgid "Theme contains unsafe file extension names; may be unsafe."
 msgstr ""
 
-#: lib/themeuploader.php:242
 #, php-format
 msgid "Theme contains file of type '.%s', which is not allowed."
 msgstr ""
 
-#: lib/themeuploader.php:260
 #, fuzzy
 msgid "Error opening theme archive."
 msgstr "Fazi en ur hizivaat ar profil a-bell."
 
-#: lib/threadednoticelist.php:270
-#, php-format
-msgid "Show all %d comment"
-msgid_plural "Show all %d comments"
-msgstr[0] ""
-msgstr[1] ""
+#, fuzzy, php-format
+msgid "Show %d reply"
+msgid_plural "Show all %d replies"
+msgstr[0] "Diskouez muioc'h"
+msgstr[1] "Diskouez muioc'h"
 
-#: lib/topposterssection.php:74
 msgid "Top posters"
 msgstr "An implijerien an efedusañ"
 
 #. TRANS: Title for the form to unblock a user.
-#: lib/unblockform.php:67
 msgctxt "TITLE"
 msgid "Unblock"
 msgstr "Distankañ"
 
-#: lib/unsandboxform.php:69
 msgid "Unsandbox"
 msgstr "Kuitaat ar poull-traezh"
 
-#: lib/unsandboxform.php:80
 #, fuzzy
 msgid "Unsandbox this user"
 msgstr "Distankañ an implijer-mañ"
 
-#: lib/unsilenceform.php:67
 #, fuzzy
 msgid "Unsilence"
 msgstr "Didrouz"
 
-#: lib/unsilenceform.php:78
 #, fuzzy
 msgid "Unsilence this user"
 msgstr "Distankañ an implijer-mañ"
 
-#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
 msgid "Unsubscribe from this user"
 msgstr "En em zigoumanantiñ eus an implijer-mañ"
 
-#: lib/unsubscribeform.php:137
 msgid "Unsubscribe"
 msgstr "Digoumanantiñ"
 
 #. 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).
-#: lib/usernoprofileexception.php:60
 #, fuzzy, php-format
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "An implijer-mañ n'eus profil ebet dezhañ."
 
-#: lib/userprofile.php:116
 msgid "Edit Avatar"
 msgstr "Kemmañ an Avatar"
 
 #. TRANS: H2 for user actions in a profile.
 #. TRANS: H2 for entity actions in a profile.
-#: lib/userprofile.php:216 lib/userprofile.php:232
 msgid "User actions"
 msgstr "Obererezh an implijer"
 
 #. TRANS: Text shown in user profile of not yet compeltely deleted users.
-#: lib/userprofile.php:220
 msgid "User deletion in progress..."
 msgstr "Diverkadenn an implijer o vont war-raok..."
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:248
 msgid "Edit profile settings"
 msgstr "Kemmañ arventennoù ar profil"
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:250
 msgid "Edit"
 msgstr "Aozañ"
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:274
 msgid "Send a direct message to this user"
 msgstr "Kas ur gemennadenn war-eeun d'an implijer-mañ"
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:276
 msgid "Message"
 msgstr "Kemennadenn"
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:318
 msgid "Moderate"
 msgstr "Habaskaat"
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:357
 msgid "User role"
 msgstr "Rol an implijer"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:360
 msgctxt "role"
 msgid "Administrator"
 msgstr "Merour"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:362
 msgctxt "role"
 msgid "Moderator"
 msgstr "Habasker"
 
-#: lib/util.php:321
 #, fuzzy
 msgid "Not allowed to log in."
 msgstr "Nann-kevreet."
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1337
 msgid "a few seconds ago"
 msgstr "un nebeud eilennoù zo"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1340
 msgid "about a minute ago"
 msgstr "1 vunutenn zo well-wazh"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1344
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
@@ -9544,12 +7858,10 @@ msgstr[0] "tro ur vunutenn zo"
 msgstr[1] "tro %d munutenn zo"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1347
 msgid "about an hour ago"
 msgstr "1 eurvezh zo well-wazh"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1351
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
@@ -9557,12 +7869,10 @@ msgstr[0] "tro un eur zo"
 msgstr[1] "tro %d eur zo"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1354
 msgid "about a day ago"
 msgstr "1 devezh zo well-wazh"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1358
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
@@ -9570,12 +7880,10 @@ msgstr[0] "tro un devezh zo"
 msgstr[1] "tro %d devezh zo"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1361
 msgid "about a month ago"
 msgstr "miz zo well-wazh"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1365
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
@@ -9583,200 +7891,44 @@ msgstr[0] "tro ur miz zo"
 msgstr[1] "tro %d miz zo"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1368
 msgid "about a year ago"
 msgstr "bloaz zo well-wazh"
 
 #. TRANS: Web color exception thrown when a hexadecimal color code does not validate.
 #. TRANS: %s is the provided (invalid) color code.
-#: lib/webcolor.php:81 lib/webcolor.php:121
 #, php-format
 msgid "%s is not a valid color! Use 3 or 6 hex characters."
 msgstr "N'eo ket %s ul liv reizh ! Implijit 3 pe 6 arouezenn heksdekvedennel."
 
 #. TRANS: Exception.
-#: lib/xrd.php:63
 #, fuzzy
 msgid "Invalid XML."
 msgstr "Ment direizh."
 
 #. TRANS: Exception.
-#: lib/xrd.php:68
 msgid "Invalid XML, missing XRD root."
 msgstr ""
 
 #. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
-#: scripts/restoreuser.php:62
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
 
-#, fuzzy
-#~ msgid "Could not generate feed for group - %s"
-#~ msgstr "Diposubl eo hizivaat ar strollad."
+#~ msgid "Full name is too long (max 255 chars)."
+#~ msgstr "Re hir eo an anv klok (255 arouezenn d'ar muiañ)."
 
-#, fuzzy
-#~ msgid "Current confirmed Jabber/Google Talk address."
-#~ msgstr "Chomlec'h Jabber/GTalk kadarnaet er mare-mañ."
+#~ msgid "description is too long (max %d chars)."
+#~ msgstr "re hir eo an deskrivadur (%d arouezenn d'ar muiañ)."
 
-#, fuzzy
-#~ msgid "Send me notices through Jabber/Google Talk."
-#~ msgstr "Kas din an alioù dre Jabber/GTalk."
+#~ msgid "Location is too long (max 255 chars)."
+#~ msgstr "Re hir eo al lec'hiadur (255 arouezenn d'ar muiañ)."
 
-#, fuzzy
-#~ msgid "Publish a MicroID for my Jabber/Google Talk address."
-#~ msgstr "Embann ur MicroID evit ma chomlec'h Jabber/GTalk."
+#~ msgid "Too many aliases! Maximum %d."
+#~ msgstr "Re a aliasoù ! %d d'ar muiañ."
 
-#~ msgid "No Jabber ID."
-#~ msgstr "ID Jabber ebet."
+#~ msgctxt "BUTTON"
+#~ msgid "Comment"
+#~ msgstr "Evezhiadenn"
 
-#, fuzzy
-#~ msgid "Not a valid Jabber ID."
-#~ msgstr "N'eo ket un ID Jabber reizh."
-
-#~ msgid "That is already your Jabber ID."
-#~ msgstr "Ho ID Jabber eo dija"
-
-#~ msgid "That is not your Jabber ID."
-#~ msgstr "N'eo ket ho ID Jabber."
-
-#~ msgid "Other settings"
-#~ msgstr "Arventennoù all"
-
-#~ msgid "Tag cloud"
-#~ msgstr "Nivlennad tikedennoù"
-
-#~ msgid "Consumer key"
-#~ msgstr "Alc'hwez implijer"
-
-#~ msgid "Consumer secret"
-#~ msgstr "Sekred an implijer"
-
-#~ msgid "Request token URL"
-#~ msgstr "URL ar jedouer reked"
-
-#~ msgid "Access token URL"
-#~ msgstr "URL ar jedouer moned"
-
-#~ msgid "Authorize URL"
-#~ msgstr "aotren an URL"
-
-#~ msgid "Jabber"
-#~ msgstr "Jabber"
-
-#~ msgid "Photo"
-#~ msgstr "Skeudenn"
-
-#~ msgid "Other options"
-#~ msgstr "Dibarzhioù all"
-
-#~ msgid "Other"
-#~ msgstr "All"
-
-#, fuzzy
-#~ msgid "Primary site navigation"
-#~ msgstr "Arventennoù diazez al lec'hienn"
-
-#~ msgctxt "MENU"
-#~ msgid "Personal"
-#~ msgstr "Personel"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Change your email, avatar, password, profile"
-#~ msgstr "Kemmañ ho chomlec'h postel, hoc'h avatar, ho ger-tremen, ho profil"
-
-#~ msgid "Account"
-#~ msgstr "Kont"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Connect to services"
-#~ msgstr "Liammañ d'ar servijoù"
-
-#~ msgid "Connect"
-#~ msgstr "Kevreañ"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Change site configuration"
-#~ msgstr "Kemmañ arventennoù al lec'hienn"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Invite friends and colleagues to join you on %s"
-#~ msgstr "Pediñ mignoned hag kenseurted da zont ganeoc'h war %s"
-
-#~ msgctxt "MENU"
-#~ msgid "Invite"
-#~ msgstr "Pediñ"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Create an account"
-#~ msgstr "Krouiñ ur gont"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Help me!"
-#~ msgstr "Sikour din !"
-
-#~ msgctxt "MENU"
-#~ msgid "Help"
-#~ msgstr "Skoazell"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Search for people or text"
-#~ msgstr "Klask tud pe un tamm testenn"
-
-#~ msgid "Local views"
-#~ msgstr "Selloù lec'hel"
-
-#~ msgid "Page notice"
-#~ msgstr "Ali ar bajenn"
-
-#, fuzzy
-#~ msgid "Secondary site navigation"
-#~ msgstr "Arventennoù diazez al lec'hienn"
-
-#~ msgid "StatusNet software license"
-#~ msgstr "Aotre-implijout ar meziant StatusNet"
-
-#~ msgid "Site content license"
-#~ msgstr "Aotre-implijout diwar-benn danvez al lec'hienn"
-
-#~ msgid "Pagination"
-#~ msgstr "Pajennadur"
-
-#~ msgid "Author"
-#~ msgstr "Aozer"
-
-#~ msgid "Provider"
-#~ msgstr "Pourvezer"
-
-#, fuzzy
-#~ msgctxt "MENU"
-#~ msgid "SMS"
-#~ msgstr "SMS"
-
-#~ msgid "Filter tags"
-#~ msgstr "Silañ ar balizennoù"
-
-#~ msgid "[%s]"
-#~ msgstr "[%s]"
-
-#, fuzzy
-#~ msgid "Available characters"
-#~ msgstr "6 arouezenn pe muioc'h"
-
-#, fuzzy
-#~ msgctxt "MENU"
-#~ msgid "Profile"
-#~ msgstr "Profil"
-
-#~ msgid "Search help"
-#~ msgstr "Skoazell diwar-benn ar c'hlask"
-
-#, fuzzy
-#~ msgid "Message too long. Maximum is %1$d character, you sent %2$d."
-#~ msgid_plural "Message too long. Maximum is %1$d characters, you sent %2$d."
-#~ msgstr[0] ""
-#~ "Re hir eo ar gemennadenn - ar ment brasañ a zo %1$d arouezenn, %2$d "
-#~ "arouezenn ho peus lakaet."
-#~ msgstr[1] ""
-#~ "Re hir eo ar gemennadenn - ar ment brasañ a zo %1$d arouezenn, %2$d "
-#~ "arouezenn ho peus lakaet."
+#~ msgid "Add a comment..."
+#~ msgstr "Ouzhpennañ un evezhiadenn..."
diff --git a/locale/ca/LC_MESSAGES/statusnet.po b/locale/ca/LC_MESSAGES/statusnet.po
index b4fc4baf12..0ccbd9d1d9 100644
--- a/locale/ca/LC_MESSAGES/statusnet.po
+++ b/locale/ca/LC_MESSAGES/statusnet.po
@@ -16,69 +16,59 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:23+0000\n"
-"PO-Revision-Date: 2011-03-03 17:25:44+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:10+0000\n"
 "Language-Team: Catalan <http://translatewiki.net/wiki/Portal:ca>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ca\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-02-25 23:49:23+0000\n"
+"X-POT-Import-Date: 2011-03-03 17:59:19+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
-#: actions/accessadminpanel.php:53 lib/adminpanelaction.php:363
 msgid "Access"
 msgstr "Accés"
 
 #. TRANS: Page notice.
-#: actions/accessadminpanel.php:64
 msgid "Site access settings"
 msgstr "Paràmetres d'accés al lloc"
 
 #. TRANS: Form legend for registration form.
-#: actions/accessadminpanel.php:151
 msgid "Registration"
 msgstr "Registre"
 
 #. TRANS: Checkbox instructions for admin setting "Private".
-#: actions/accessadminpanel.php:155
 msgid "Prohibit anonymous users (not logged in) from viewing site?"
 msgstr ""
 "Voleu prohibir als usuaris anònims (que no han iniciat cap sessió) "
 "visualitzar el lloc?"
 
 #. TRANS: Checkbox label for prohibiting anonymous users from viewing site.
-#: actions/accessadminpanel.php:157
 msgctxt "LABEL"
 msgid "Private"
 msgstr "Privat"
 
 #. TRANS: Checkbox instructions for admin setting "Invite only".
-#: actions/accessadminpanel.php:164
 msgid "Make registration invitation only."
 msgstr "Fes que el registre sigui només amb invitacions."
 
 #. TRANS: Checkbox label for configuring site as invite only.
-#: actions/accessadminpanel.php:166
 msgid "Invite only"
 msgstr "Només invitació"
 
 #. TRANS: Checkbox instructions for admin setting "Closed" (no new registrations).
-#: actions/accessadminpanel.php:173
 msgid "Disable new registrations."
 msgstr "Inhabilita els nous registres."
 
 #. TRANS: Checkbox label for disabling new user registrations.
-#: actions/accessadminpanel.php:175
 msgid "Closed"
 msgstr "Tancat"
 
 #. TRANS: Title for button to save access settings in site admin panel.
-#: actions/accessadminpanel.php:191
 msgid "Save access settings"
 msgstr "Desa els paràmetres d'accés"
 
@@ -86,6 +76,7 @@ msgstr "Desa els paràmetres d'accés"
 #. TRANS: Button text for saving theme settings.
 #. TRANS: Button label to save e-mail preferences.
 #. TRANS: Button label to save IM preferences.
+#. TRANS: Button text in the license admin panel.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
 #. TRANS: Button text for saving site notice in admin panel.
@@ -95,21 +86,12 @@ msgstr "Desa els paràmetres d'accés"
 #. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
 #. TRANS: Button text on profile design page to save settings.
-#: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
-#: actions/emailsettings.php:251 actions/imsettings.php:199
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:198
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:204
-#: actions/subscriptions.php:261 actions/urlsettings.php:152
-#: actions/useradminpanel.php:298 lib/applicationeditform.php:355
-#: lib/designform.php:320 lib/groupeditform.php:201
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Desa"
 
 #. TRANS: Server error when page not found (404).
 #. TRANS: Server error when page not found (404)
-#: actions/all.php:68 actions/public.php:98 actions/replies.php:93
-#: actions/showfavorites.php:140 actions/tag.php:52
 msgid "No such page."
 msgstr "No existeix la pàgina."
 
@@ -128,6 +110,7 @@ msgstr "No existeix la pàgina."
 #. TRANS: Client error displayed when checking group membership for a non-existing user.
 #. TRANS: Client error displayed when trying to have a non-existing user join a group.
 #. TRANS: Client error displayed when trying to have a non-existing user leave a group.
+#. TRANS: Client error displayed when not providing a user or an invalid user.
 #. TRANS: Client error displayed when updating a status for a non-existing user.
 #. TRANS: Client error displayed when requesting a list of followers for a non-existing user.
 #. TRANS: Client error displayed when requesting most recent favourite notices by a user for a non-existing user.
@@ -140,6 +123,8 @@ msgstr "No existeix la pàgina."
 #. 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.
 #. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
@@ -147,33 +132,10 @@ msgstr "No existeix la pàgina."
 #. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when calling a profile action without specifying a user.
-#: actions/all.php:80 actions/allrss.php:69
-#: actions/apiaccountupdatedeliverydevice.php:110
-#: actions/apiaccountupdateprofile.php:103
-#: actions/apiaccountupdateprofilebackgroundimage.php:118
-#: actions/apiaccountupdateprofileimage.php:104 actions/apiatomservice.php:59
-#: actions/apiblockcreate.php:96 actions/apiblockdestroy.php:94
-#: actions/apidirectmessage.php:75 actions/apidirectmessagenew.php:72
-#: actions/apigroupcreate.php:111 actions/apigroupismember.php:89
-#: actions/apigroupjoin.php:98 actions/apigroupleave.php:98
-#: actions/apigrouplist.php:70 actions/apigroupprofileupdate.php:108
-#: actions/apistatusesupdate.php:230 actions/apisubscriptions.php:85
-#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:173
-#: actions/apitimelinehome.php:78 actions/apitimelinementions.php:77
-#: actions/apitimelineuser.php:79 actions/avatarbynickname.php:79
-#: actions/favoritesrss.php:72 actions/foaf.php:42 actions/foaf.php:61
-#: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116
-#: actions/otp.php:78 actions/remotesubscribe.php:144
-#: actions/remotesubscribe.php:153 actions/replies.php:73
-#: actions/repliesrss.php:38 actions/rsd.php:113 actions/showfavorites.php:106
-#: actions/userbyid.php:75 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/userxrd.php:59 actions/xrds.php:71 lib/command.php:509
-#: lib/galleryaction.php:59 lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "No existeix l'usuari."
 
 #. TRANS: Page title. %1$s is user nickname, %2$d is page number
-#: actions/all.php:91
 #, php-format
 msgid "%1$s and friends, page %2$d"
 msgstr "%1$s i amics, pàgina %2$d"
@@ -182,33 +144,26 @@ msgstr "%1$s i amics, pàgina %2$d"
 #. TRANS: H1 text for page. %s is a user nickname.
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Timeline title for user and friends. %s is a user nickname.
-#: actions/all.php:94 actions/all.php:191 actions/allrss.php:117
-#: actions/apitimelinefriends.php:207 actions/apitimelinehome.php:113
-#: lib/personalgroupnav.php:100
 #, php-format
 msgid "%s and friends"
 msgstr "%s i amics"
 
 #. TRANS: %s is user nickname.
-#: actions/all.php:108
 #, php-format
 msgid "Feed for friends of %s (RSS 1.0)"
 msgstr "Canal dels amics de %s (RSS 1.0)"
 
 #. TRANS: %s is user nickname.
-#: actions/all.php:117
 #, php-format
 msgid "Feed for friends of %s (RSS 2.0)"
 msgstr "Canal dels amics de %s (RSS 2.0)"
 
 #. TRANS: %s is user nickname.
-#: actions/all.php:126
 #, php-format
 msgid "Feed for friends of %s (Atom)"
 msgstr "Canal dels amics de %s (Atom)"
 
 #. TRANS: Empty list message. %s is a user nickname.
-#: actions/all.php:139
 #, php-format
 msgid ""
 "This is the timeline for %s and friends but no one has posted anything yet."
@@ -218,7 +173,6 @@ msgstr ""
 
 #. TRANS: Encouragement displayed on logged in user's empty timeline.
 #. TRANS: This message contains Markdown links. Keep "](" together.
-#: actions/all.php:146
 #, php-format
 msgid ""
 "Try subscribing to more people, [join a group](%%action.groups%%) or post "
@@ -229,7 +183,6 @@ msgstr ""
 
 #. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@".
 #. TRANS: This message contains Markdown links. Keep "](" together.
-#: actions/all.php:150
 #, php-format
 msgid ""
 "You can try to [nudge %1$s](../%2$s) from their profile or [post something "
@@ -242,7 +195,6 @@ msgstr ""
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
 #. TRANS: Second sentence of empty message for anonymous users. %s is a user nickname.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:221
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -252,14 +204,11 @@ msgstr ""
 "escriure'n un!"
 
 #. TRANS: H1 text for page when viewing a list for self.
-#: actions/all.php:188
 msgid "You and friends"
 msgstr "Un mateix i amics"
 
 #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
 #. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name.
-#: actions/allrss.php:122 actions/apitimelinefriends.php:213
-#: actions/apitimelinehome.php:119
 #, php-format
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr "Actualitzacions de %1$s i amics a %2$s!"
@@ -278,55 +227,20 @@ msgstr "Actualitzacions de %1$s i amics a %2$s!"
 #. TRANS: Client error displayed trying to execute an unknown API method checking group membership.
 #. TRANS: Client error displayed trying to execute an unknown API method listing the latest 20 groups.
 #. TRANS: Client error displayed trying to execute an unknown API method showing group membership.
+#. TRANS: Client error displayed when using an unsupported API format.
 #. TRANS: Client error displayed trying to execute an unknown API method showing a group.
 #. TRANS: Client error displayed trying to execute an unknown API method testing API connectivity.
 #. TRANS: Client error displayed trying to execute an unknown API method deleting a status.
 #. TRANS: Client error displayed when trying to handle an unknown API method.
-#: actions/apiaccountratelimitstatus.php:69
-#: actions/apiaccountupdatedeliverydevice.php:92
-#: actions/apiaccountupdateprofile.php:94
-#: actions/apiaccountupdateprofilebackgroundimage.php:92
-#: actions/apiaccountupdateprofilecolors.php:115
-#: actions/apiaccountverifycredentials.php:68 actions/apidirectmessage.php:157
-#: actions/apifavoritecreate.php:98 actions/apifavoritedestroy.php:98
-#: actions/apifriendshipscreate.php:99 actions/apifriendshipsdestroy.php:99
-#: actions/apifriendshipsshow.php:124 actions/apigroupcreate.php:138
-#: actions/apigroupismember.php:115 actions/apigroupjoin.php:151
-#: actions/apigroupleave.php:141 actions/apigrouplist.php:134
-#: actions/apigrouplistall.php:120 actions/apigroupmembership.php:105
-#: actions/apigroupprofileupdate.php:100 actions/apigroupprofileupdate.php:213
-#: actions/apigroupshow.php:114 actions/apihelptest.php:84
-#: actions/apistatusesdestroy.php:101 actions/apistatusesretweets.php:110
-#: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:139
-#: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
-#: actions/apitimelinefavorites.php:182 actions/apitimelinefriends.php:276
-#: actions/apitimelinegroup.php:148 actions/apitimelinehome.php:181
-#: actions/apitimelinementions.php:182 actions/apitimelinepublic.php:247
-#: actions/apitimelineretweetedtome.php:147
-#: actions/apitimelineretweetsofme.php:147 actions/apitimelinetag.php:165
-#: actions/apitimelineuser.php:217 actions/apiusershow.php:100
 msgid "API method not found."
 msgstr "No s'ha trobat el mètode 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.
-#: actions/apiaccountupdatedeliverydevice.php:83
-#: actions/apiaccountupdateprofile.php:85
-#: actions/apiaccountupdateprofilebackgroundimage.php:83
-#: actions/apiaccountupdateprofilecolors.php:106
-#: actions/apiaccountupdateprofileimage.php:80 actions/apiblockcreate.php:87
-#: actions/apiblockdestroy.php:85 actions/apidirectmessagenew.php:107
-#: actions/apifavoritecreate.php:88 actions/apifavoritedestroy.php:88
-#: actions/apifriendshipscreate.php:89 actions/apifriendshipsdestroy.php:89
-#: actions/apigroupcreate.php:102 actions/apigroupjoin.php:89
-#: actions/apigroupleave.php:89 actions/apigroupprofileupdate.php:92
-#: actions/apimediaupload.php:66 actions/apistatusesretweet.php:63
-#: actions/apistatusesupdate.php:194
 msgid "This method requires a POST."
 msgstr "Aquest mètode requereix POST."
 
 #. TRANS: Client error displayed when no valid device parameter is provided for a user's delivery device setting.
-#: actions/apiaccountupdatedeliverydevice.php:103
 msgid ""
 "You must specify a parameter named 'device' with a value of one of: sms, im, "
 "none."
@@ -341,10 +255,6 @@ msgstr ""
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
-#: actions/apiaccountupdatedeliverydevice.php:136
-#: actions/emailsettings.php:353 actions/emailsettings.php:499
-#: actions/profilesettings.php:323 actions/smssettings.php:300
-#: actions/smssettings.php:453 actions/urlsettings.php:211
 msgid "Could not update user."
 msgstr "No s'ha pogut actualitzar l'usuari."
 
@@ -357,32 +267,17 @@ msgstr "No s'ha pogut actualitzar l'usuari."
 #. TRANS: Server error displayed when requesting Friends of a Friend feed for a user for which the profile could not be found.
 #. TRANS: Server error displayed when trying to get a user hCard for a user without a profile.
 #. TRANS: Server error displayed when calling a profile action while the specified user does not have a profile.
-#: actions/apiaccountupdateprofile.php:111
-#: actions/apiaccountupdateprofilebackgroundimage.php:199
-#: actions/apiaccountupdateprofilecolors.php:183
-#: actions/apiaccountupdateprofileimage.php:131
-#: actions/apiuserprofileimage.php:88 actions/apiusershow.php:108
-#: actions/avatarbynickname.php:85 actions/foaf.php:69 actions/hcard.php:75
-#: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
-#: lib/profileaction.php:85
 msgid "User has no profile."
 msgstr "L'usuari no té perfil."
 
 #. TRANS: Server error displayed if a user profile could not be saved.
 #. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:419
 msgid "Could not save profile."
 msgstr "No s'ha pogut desar el perfil."
 
 #. TRANS: Client error displayed when the number of bytes in a POST request exceeds a limit.
 #. TRANS: %s is the number of bytes of the CONTENT_LENGTH.
 #. TRANS: Form validation error in design settings form. POST should remain untranslated.
-#: actions/apiaccountupdateprofilebackgroundimage.php:108
-#: actions/apiaccountupdateprofileimage.php:95 actions/apimediaupload.php:81
-#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
-#: actions/designadminpanel.php:120 actions/editapplication.php:121
-#: actions/newapplication.php:102 actions/newnotice.php:95
-#: lib/designsettings.php:110
 #, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s byte) due to its "
@@ -402,26 +297,15 @@ msgstr[1] ""
 #. TRANS: Client error displayed when a database error occurs inserting profile colours.
 #. TRANS: Client error displayed when a database error occurs updating profile colours.
 #. TRANS: Form validation error displayed when group design settings could not be saved because of an application issue.
-#: actions/apiaccountupdateprofilebackgroundimage.php:138
-#: actions/apiaccountupdateprofilebackgroundimage.php:149
-#: actions/apiaccountupdateprofilecolors.php:160
-#: actions/apiaccountupdateprofilecolors.php:171
-#: actions/groupdesignsettings.php:285 actions/groupdesignsettings.php:296
-#: actions/userdesignsettings.php:218 actions/userdesignsettings.php:228
-#: actions/userdesignsettings.php:270 actions/userdesignsettings.php:280
 msgid "Unable to save your design settings."
 msgstr "No s'han pogut desar els paràmetres de disseny."
 
 #. TRANS: Error displayed when updating design settings fails.
 #. TRANS: Client error displayed when a database error occurs updating profile colours.
-#: actions/apiaccountupdateprofilebackgroundimage.php:191
-#: actions/apiaccountupdateprofilecolors.php:139
-#: actions/userdesignsettings.php:196
 msgid "Could not update your design."
 msgstr "No s'ha pogut actualitzar el vostre disseny."
 
 #. TRANS: Title for Atom feed.
-#: actions/apiatomservice.php:85
 msgctxt "ATOM"
 msgid "Main"
 msgstr "Principal"
@@ -430,9 +314,6 @@ msgstr "Principal"
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Title in atom group notice feed. %s is a group name.
 #. TRANS: Title in atom user notice feed. %s is a user name.
-#: actions/apiatomservice.php:93 actions/grouprss.php:138
-#: actions/userrss.php:94 lib/atomgroupnoticefeed.php:63
-#: lib/atomusernoticefeed.php:88
 #, php-format
 msgid "%s timeline"
 msgstr "%s línia temporal"
@@ -442,8 +323,6 @@ msgstr "%s línia temporal"
 #. TRANS: %s is a user nickname.
 #. TRANS: Header for subscriptions overview for a user (first page).
 #. TRANS: %s is a user nickname.
-#: actions/apiatomservice.php:104 actions/atompubsubscriptionfeed.php:148
-#: actions/subscriptions.php:51
 #, php-format
 msgid "%s subscriptions"
 msgstr "Subscripcions de %s"
@@ -451,58 +330,48 @@ msgstr "Subscripcions de %s"
 #. TRANS: Title for Atom feed with a user's favorite notices. %s is a user nickname.
 #. TRANS: Title for Atom favorites feed.
 #. TRANS: %s is a user nickname.
-#: actions/apiatomservice.php:115 actions/atompubfavoritefeed.php:142
 #, php-format
 msgid "%s favorites"
 msgstr "%s preferits"
 
 #. TRANS: Title for Atom feed with a user's memberships. %s is a user nickname.
-#: actions/apiatomservice.php:126
 #, php-format
 msgid "%s memberships"
 msgstr "%s pertinències al grup"
 
 #. TRANS: Client error displayed when users try to block themselves.
-#: actions/apiblockcreate.php:105
 msgid "You cannot block yourself!"
 msgstr "No podeu bloquejar-vos a vosaltres mateixos!"
 
 #. TRANS: Server error displayed when blocking a user has failed.
-#: actions/apiblockcreate.php:127
 msgid "Block user failed."
 msgstr "Ha fallat el blocatge de l'usuari."
 
 #. TRANS: Server error displayed when unblocking a user has failed.
-#: actions/apiblockdestroy.php:113
 msgid "Unblock user failed."
 msgstr "Ha fallat el desblocatge de l'usuari."
 
 #. TRANS: Title. %s is a user nickname.
-#: actions/apidirectmessage.php:88
 #, php-format
 msgid "Direct messages from %s"
 msgstr "Missatges directes de %s"
 
 #. TRANS: Subtitle. %s is a user nickname.
-#: actions/apidirectmessage.php:93
 #, php-format
 msgid "All the direct messages sent from %s"
 msgstr "Tots els missatges directes enviats per %s"
 
 #. TRANS: Title. %s is a user nickname.
-#: actions/apidirectmessage.php:102
 #, php-format
 msgid "Direct messages to %s"
 msgstr "Missatges directes a %s"
 
 #. TRANS: Subtitle. %s is a user nickname.
-#: actions/apidirectmessage.php:107
 #, php-format
 msgid "All the direct messages sent to %s"
 msgstr "Tots els missatges directes enviats a %s"
 
 #. TRANS: Client error displayed when no message text was submitted (406).
-#: actions/apidirectmessagenew.php:117
 msgid "No message text!"
 msgstr "No hi ha text al missatge!"
 
@@ -510,7 +379,6 @@ msgstr "No hi ha text al missatge!"
 #. TRANS: %d is the maximum number of characters for a message.
 #. TRANS: Form validation error displayed when message content is too long.
 #. TRANS: %d is the maximum number of characters for a message.
-#: actions/apidirectmessagenew.php:127 actions/newmessage.php:152
 #, php-format
 msgid "That's too long. Maximum message size is %d character."
 msgid_plural "That's too long. Maximum message size is %d characters."
@@ -518,19 +386,16 @@ msgstr[0] "És massa llarg. La mida màxima del missatge és %d caràcter."
 msgstr[1] "És massa llarg. La mida màxima del missatge és %d caràcters."
 
 #. TRANS: Client error displayed if a recipient user could not be found (403).
-#: actions/apidirectmessagenew.php:139
 msgid "Recipient user not found."
 msgstr "No s'ha trobat l'usuari destinatari."
 
 #. TRANS: Client error displayed trying to direct message another user who's not a friend (403).
-#: actions/apidirectmessagenew.php:144
 msgid "Cannot send direct messages to users who aren't your friend."
 msgstr ""
 "No es poden enviar missatges directes a usuaris que no siguin els vostres "
 "amics."
 
 #. TRANS: Client error displayed trying to direct message self (403).
-#: actions/apidirectmessagenew.php:154
 msgid ""
 "Do not send a message to yourself; just say it to yourself quietly instead."
 msgstr "No us envieu un missatge a un mateix; simplement comentar-vos-ho."
@@ -538,116 +403,96 @@ msgstr "No us envieu un missatge a un mateix; simplement comentar-vos-ho."
 #. 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.
 #. TRANS: Client error displayed trying to delete a status with an invalid ID.
-#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:108
-#: actions/apistatusesdestroy.php:121
 msgid "No status found with that ID."
 msgstr "No s'ha trobat cap estat amb aquest ID."
 
 #. TRANS: Client error displayed when trying to mark a notice favourite that already is a favourite.
-#: actions/apifavoritecreate.php:120
 msgid "This status is already a favorite."
 msgstr "Aquest estat ja és un preferit."
 
 #. TRANS: Client error displayed when marking a notice as favourite fails.
 #. TRANS: Server error displayed when trying to mark a notice as favorite fails in the database.
 #. TRANS: Error message text shown when a favorite could not be set.
-#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:306
 msgid "Could not create favorite."
 msgstr "No es pot crear el preferit."
 
 #. TRANS: Client error displayed when trying to remove a favourite that was not a favourite.
-#: actions/apifavoritedestroy.php:122
 msgid "That status is not a favorite."
 msgstr "L'estat no és un preferit."
 
 #. TRANS: Client error displayed when removing a favourite has failed.
 #. TRANS: Server error displayed when removing a favorite from the database fails.
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:90
 msgid "Could not delete favorite."
 msgstr "No s'ha pogut eliminar el preferit."
 
 #. TRANS: Client error displayed when trying follow who's profile could not be found.
-#: actions/apifriendshipscreate.php:109
 msgid "Could not follow user: profile not found."
 msgstr "No es pot deixar de seguir l'usuari: no s'ha trobat l'usuari."
 
 #. TRANS: Client error displayed when trying to follow a user that's already being followed.
 #. TRANS: %s is the nickname of the user that is already being followed.
-#: actions/apifriendshipscreate.php:120
 #, php-format
 msgid "Could not follow user: %s is already on your list."
 msgstr "No s'ha pogut seguir l'usuari: %s ja està a la vostra llista."
 
 #. TRANS: Client error displayed when trying to unfollow a user that cannot be found.
-#: actions/apifriendshipsdestroy.php:109
 msgid "Could not unfollow user: User not found."
 msgstr "No es pot deixar de seguir l'usuari: no s'ha trobat l'usuari."
 
 #. TRANS: Client error displayed when trying to unfollow self.
-#: actions/apifriendshipsdestroy.php:121
 msgid "You cannot unfollow yourself."
 msgstr "No podeu deixar de seguir-vos a un mateix."
 
 #. TRANS: Client error displayed when supplying invalid parameters to an API call checking if a friendship exists.
-#: actions/apifriendshipsexists.php:88
 msgid "Two valid IDs or nick names must be supplied."
 msgstr "Cal proporcionar dos identificadors o sobrenoms."
 
 #. TRANS: Client error displayed when a source user could not be determined showing friendship.
-#: actions/apifriendshipsshow.php:131
 msgid "Could not determine source user."
 msgstr "No s'ha pogut determinar l'usuari d'origen."
 
 #. TRANS: Client error displayed when a target user could not be determined showing friendship.
-#: actions/apifriendshipsshow.php:140
 msgid "Could not find target user."
 msgstr "No s'ha pogut trobar l'usuari de destinació."
 
 #. TRANS: Client error trying to create a group with a nickname this is already in use.
+#. TRANS: API validation exception thrown when nickname is already used.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:156 actions/apigroupprofileupdate.php:255
-#: actions/editgroup.php:191 actions/newgroup.php:137
-#: actions/profilesettings.php:274 actions/register.php:199
 msgid "Nickname already in use. Try another one."
 msgstr "Aquest sobrenom ja existeix. Prova un altre. "
 
 #. TRANS: Client error in form for group creation.
+#. TRANS: API validation exception thrown when nickname does not validate.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:164 actions/apigroupprofileupdate.php:259
-#: actions/editgroup.php:195 actions/newgroup.php:141
-#: actions/profilesettings.php:244 actions/register.php:201
 msgid "Not a valid nickname."
 msgstr "Sobrenom no vàlid."
 
 #. TRANS: Client error in form for group creation.
+#. TRANS: API validation exception thrown when homepage URL does not validate.
 #. TRANS: Validation error shown when providing an invalid homepage URL in the "Edit application" form.
 #. TRANS: Group edit form validation error.
 #. TRANS: Validation error shown when providing an invalid homepage URL in the "New application" form.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:181 actions/apigroupprofileupdate.php:277
-#: actions/editapplication.php:235 actions/editgroup.php:202
-#: actions/newapplication.php:221 actions/newgroup.php:148
-#: actions/profilesettings.php:249 actions/register.php:208
 msgid "Homepage is not a valid URL."
 msgstr "La pàgina personal no és un URL vàlid."
 
 #. TRANS: Client error in form for group creation.
+#. TRANS: API validation exception thrown when full name does not validate.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:191 actions/editgroup.php:206
-#: actions/newgroup.php:152 actions/profilesettings.php:253
-#: actions/register.php:211
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "El vostre nom sencer és massa llarg (màx. 255 caràcters)."
 
 #. TRANS: Client error shown when providing too long a description during group creation.
 #. TRANS: %d is the maximum number of allowed characters.
+#. TRANS: API validation exception thrown when description does not validate.
+#. TRANS: %d is the maximum description length and used for plural.
 #. TRANS: Validation error shown when providing too long a description in the "Edit application" form.
 #. TRANS: %d is the maximum number of allowed characters.
 #. TRANS: Group edit form validation error.
@@ -655,9 +500,6 @@ msgstr "El vostre nom sencer és massa llarg (màx. 255 caràcters)."
 #. TRANS: %d is the maximum number of characters for the description.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed characters.
-#: actions/apigroupcreate.php:201 actions/editapplication.php:202
-#: actions/editgroup.php:211 actions/newapplication.php:182
-#: actions/newgroup.php:157
 #, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."
@@ -665,23 +507,21 @@ msgstr[0] "La descripció és massa llarga (màx. %d caràcter)."
 msgstr[1] "La descripció és massa llarga (màx. %d caràcters)."
 
 #. TRANS: Client error shown when providing too long a location during group creation.
+#. TRANS: API validation exception thrown when location does not validate.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:215 actions/editgroup.php:218
-#: actions/newgroup.php:164 actions/profilesettings.php:266
-#: actions/register.php:220
 msgid "Location is too long (maximum 255 characters)."
 msgstr "La localització és massa llarga (màx. 255 caràcters)."
 
 #. TRANS: Client error shown when providing too many aliases during group creation.
 #. TRANS: %d is the maximum number of allowed aliases.
+#. TRANS: API validation exception thrown when aliases do not validate.
+#. TRANS: %d is the maximum number of aliases and used for plural.
 #. TRANS: Group edit form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.
-#: actions/apigroupcreate.php:236 actions/editgroup.php:231
-#: actions/newgroup.php:177
 #, php-format
 msgid "Too many aliases! Maximum %d allowed."
 msgid_plural "Too many aliases! Maximum %d allowed."
@@ -690,25 +530,24 @@ msgstr[1] "Hi ha massa àlies! Es permeten %d com a màxim."
 
 #. TRANS: Client error shown when providing an invalid alias during group creation.
 #. TRANS: %s is the invalid alias.
-#: actions/apigroupcreate.php:253
+#. TRANS: API validation exception thrown when aliases does not validate.
+#. TRANS: %s is the invalid alias.
 #, php-format
 msgid "Invalid alias: \"%s\"."
 msgstr "L'àlies no és vàlid: «%s»."
 
 #. TRANS: Client error displayed when trying to use an alias during group creation that is already in use.
 #. TRANS: %s is the alias that is already in use.
+#. TRANS: API validation exception thrown when aliases is already used.
+#. TRANS: %s is the already used alias.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error. %s is the already used alias.
-#: actions/apigroupcreate.php:264 actions/apigroupprofileupdate.php:351
-#: actions/editgroup.php:246 actions/newgroup.php:193
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "L'àlies «%s» ja està en ús. Proveu-ne un altre."
 
 #. TRANS: Client error displayed when trying to use an alias during group creation that is the same as the group's nickname.
 #. TRANS: Group edit form validation error.
-#: actions/apigroupcreate.php:278 actions/apigroupprofileupdate.php:359
-#: actions/editgroup.php:253
 msgid "Alias can't be the same as nickname."
 msgstr "L'àlies no pot ser el mateix que el sobrenom."
 
@@ -716,26 +555,21 @@ msgstr "L'àlies no pot ser el mateix que el sobrenom."
 #. TRANS: Client error displayed when trying to join a group that does not exist.
 #. TRANS: Client error displayed when trying to leave a group that does not exist.
 #. TRANS: Client error displayed trying to show group membership on a non-existing group.
+#. TRANS: Client error displayed when not providing a group or an invalid group.
 #. TRANS: Client error displayed when trying to show a group that could not be found.
 #. TRANS: Client error displayed requesting most recent notices to a group for a non-existing group.
-#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
-#: actions/apigroupleave.php:104 actions/apigroupmembership.php:71
-#: actions/apigroupprofileupdate.php:113 actions/apigroupshow.php:81
-#: actions/apitimelinegroup.php:89
 msgid "Group not found."
 msgstr "No s'ha trobat el grup."
 
 #. TRANS: Server error displayed when trying to join a group the user is already a member of.
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:345
 msgid "You are already a member of that group."
 msgstr "Ja sou membre del grup."
 
 #. TRANS: Server error displayed when trying to join a group the user is blocked from joining.
 #. 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.
-#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:350
 msgid "You have been blocked from that group by the admin."
 msgstr "L'administrador us ha blocat del grup."
 
@@ -743,13 +577,11 @@ msgstr "L'administrador us ha blocat del grup."
 #. TRANS: %1$s is the joining user's nickname, $2$s is the group nickname for which the join failed.
 #. TRANS: Message given having failed to add a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:136 actions/joingroup.php:139 lib/command.php:362
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "No s'ha pogut afegir l'usuari %1$s al grup %2$s."
 
 #. TRANS: Server error displayed when trying to leave a group the user is not a member of.
-#: actions/apigroupleave.php:115
 msgid "You are not a member of this group."
 msgstr "No sou un membre del grup."
 
@@ -757,116 +589,78 @@ msgstr "No sou un membre del grup."
 #. TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
 #. TRANS: Message given having failed to remove a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupleave.php:127 actions/leavegroup.php:133
-#: lib/command.php:410
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
 msgstr "No s'ha pogut eliminar l'usuari %1$s del grup %2$s."
 
 #. TRANS: Used as title in check for group membership. %s is a user name.
-#: actions/apigrouplist.php:94
 #, php-format
 msgid "%s's groups"
 msgstr "Grups de %s"
 
 #. TRANS: Used as subtitle in check for group membership. %1$s is a user name, %2$s is the site name.
-#: actions/apigrouplist.php:104
 #, php-format
 msgid "%1$s groups %2$s is a member of."
 msgstr "%1$s grups dels que %2$s és membre."
 
 #. TRANS: Message is used as a title when listing the lastest 20 groups. %s is a site name.
 #. TRANS: Message is used as a page title. %s is a nick name.
-#: actions/apigrouplistall.php:88 actions/usergroups.php:63
 #, php-format
 msgid "%s groups"
 msgstr "Grups de %s"
 
 #. TRANS: Message is used as a subtitle when listing the lastest 20 groups. %s is a site name.
-#: actions/apigrouplistall.php:93
 #, php-format
 msgid "groups on %s"
 msgstr "grups sobre %s"
 
+#. TRANS: Client error displayed when trying to edit a group without being an admin.
 #. TRANS: Client error displayed trying to edit a group while not being a group admin.
 #. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
 #. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
-#: actions/apigroupprofileupdate.php:118 actions/editgroup.php:110
-#: actions/editgroup.php:176 actions/groupdesignsettings.php:109
-#: actions/grouplogo.php:111
 msgid "You must be an admin to edit the group."
 msgstr "Heu de ser administrador per editar el grup."
 
+#. TRANS: Server error displayed when group update fails.
 #. TRANS: Server error displayed when editing a group fails.
-#: actions/apigroupprofileupdate.php:171 actions/editgroup.php:274
 msgid "Could not update group."
 msgstr "No s'ha pogut actualitzar el grup."
 
+#. TRANS: Server error displayed when adding group aliases fails.
 #. TRANS: Server error displayed when group aliases could not be added.
 #. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/apigroupprofileupdate.php:194 actions/editgroup.php:281
-#: classes/User_group.php:540
 msgid "Could not create aliases."
 msgstr "No s'han pogut crear els àlies."
 
+#. TRANS: API validation exception thrown when nickname does not validate.
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: actions/apigroupprofileupdate.php:249 lib/nickname.php:165
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr ""
 "El sobrenom ha de tenir només lletres minúscules i números i no pot tenir "
 "espais."
 
-#: actions/apigroupprofileupdate.php:286
-#, fuzzy
-msgid "Full name is too long (max 255 chars)."
-msgstr "El vostre nom sencer és massa llarg (màx. 255 caràcters)."
-
-#: actions/apigroupprofileupdate.php:296
-#, fuzzy, php-format
-msgid "description is too long (max %d chars)."
-msgstr "La descripció és massa llarga (màx. %d caràcter)."
-
-#: actions/apigroupprofileupdate.php:307
-#, fuzzy
-msgid "Location is too long (max 255 chars)."
-msgstr "La localització és massa llarga (màx. 255 caràcters)."
-
-#: actions/apigroupprofileupdate.php:326
-#, fuzzy, php-format
-msgid "Too many aliases! Maximum %d."
-msgstr "Hi ha massa àlies! Es permet %d com a màxim."
-
-#. TRANS: Group edit form validation error.
+#. TRANS: API validation exception thrown when alias is the same as nickname.
 #. TRANS: Group create form validation error.
-#. TRANS: %s is the invalid alias.
-#: actions/apigroupprofileupdate.php:342 actions/editgroup.php:241
-#: actions/newgroup.php:188
-#, php-format
-msgid "Invalid alias: \"%s\""
-msgstr "L'àlies no és vàlid «%s»"
+msgid "Alias cannot be the same as nickname."
+msgstr "L'àlies no pot ser el mateix que el sobrenom."
 
 #. TRANS: Client error displayed when uploading a media file has failed.
-#: actions/apimediaupload.php:101
 msgid "Upload failed."
 msgstr "La pujada ha fallat."
 
 #. TRANS: Client error given from the OAuth API when the request token or verifier is invalid.
-#: actions/apioauthaccesstoken.php:102
 msgid "Invalid request token or verifier."
 msgstr "El testimoni de sol·licitud o verificador no és vàlid."
 
 #. TRANS: Client error given when no oauth_token was passed to the OAuth API.
-#: actions/apioauthauthorize.php:107
 msgid "No oauth_token parameter provided."
 msgstr "No s'ha proporcionat cap paràmetre oauth_token."
 
 #. TRANS: Client error given when an invalid request token was passed to the OAuth API.
-#: actions/apioauthauthorize.php:115 actions/apioauthauthorize.php:129
 msgid "Invalid request token."
 msgstr "El testimoni de sol·licitud no és vàlid."
 
 #. TRANS: Client error given when an invalid request token was passed to the OAuth API.
-#: actions/apioauthauthorize.php:121
 msgid "Request token already authorized."
 msgstr "El testimoni de sol·licitud ja està autoritzat."
 
@@ -876,33 +670,16 @@ msgstr "El testimoni de sol·licitud ja està autoritzat."
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
 #. TRANS: Client error displayed when the session token is not okay.
-#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:75
-#: actions/emailsettings.php:292 actions/favor.php:75 actions/geocode.php:55
-#: actions/groupblock.php:65 actions/grouplogo.php:321
-#: actions/groupunblock.php:65 actions/imsettings.php:241
-#: actions/invite.php:60 actions/makeadmin.php:66 actions/newmessage.php:135
-#: actions/newnotice.php:105 actions/nudge.php:80
-#: actions/oauthappssettings.php:162 actions/oauthconnectionssettings.php:135
-#: actions/passwordsettings.php:137 actions/pluginenable.php:87
-#: actions/profilesettings.php:218 actions/recoverpassword.php:383
-#: actions/register.php:157 actions/remotesubscribe.php:76
-#: actions/repeat.php:82 actions/smssettings.php:249 actions/subedit.php:40
-#: actions/subscribe.php:87 actions/tagother.php:145
-#: actions/unsubscribe.php:69 actions/urlsettings.php:171
-#: actions/userauthorization.php:53 lib/designsettings.php:122
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 "Sembla que hi ha hagut un problema amb la teva sessió. Prova-ho de nou, si "
 "us plau."
 
 #. TRANS: Form validation error given when an invalid username and/or password was passed to the OAuth API.
-#: actions/apioauthauthorize.php:168
 msgid "Invalid nickname / password!"
 msgstr "Nom d'usuari / contrasenya no vàlid!"
 
 #. TRANS: Server error displayed when a database action fails.
-#: actions/apioauthauthorize.php:217
 msgid "Database error inserting oauth_token_association."
 msgstr "Error de la base de dades en inserir l'oauth_token_association."
 
@@ -918,28 +695,19 @@ msgstr "Error de la base de dades en inserir l'oauth_token_association."
 #. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
 #. TRANS: Message given submitting a form with an unknown action in SMS settings.
 #. TRANS: Unknown form validation error in design settings form.
-#: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
-#: actions/designadminpanel.php:100 actions/editapplication.php:144
-#: actions/emailsettings.php:311 actions/grouplogo.php:332
-#: actions/imsettings.php:256 actions/newapplication.php:124
-#: actions/oauthconnectionssettings.php:144 actions/recoverpassword.php:46
-#: actions/smssettings.php:270 lib/designsettings.php:133
 msgid "Unexpected form submission."
 msgstr "Enviament de formulari inesperat."
 
 #. TRANS: Title for a page where a user can confirm/deny account access by an external application.
-#: actions/apioauthauthorize.php:387
 msgid "An application would like to connect to your account"
 msgstr "Una aplicació voldria connectar-se al vostre compte"
 
 #. TRANS: Fieldset legend.
-#: actions/apioauthauthorize.php:404
 msgid "Allow or deny access"
 msgstr "Permet o denega l'accés"
 
 #. TRANS: User notification of external application requesting account access.
 #. TRANS: %3$s is the access type requested (read-write or read-only), %4$s is the StatusNet sitename.
-#: actions/apioauthauthorize.php:425
 #, php-format
 msgid ""
 "An application would like the ability to <strong>%3$s</strong> your %4$s "
@@ -953,7 +721,6 @@ msgstr ""
 #. TRANS: User notification of external application requesting account access.
 #. TRANS: %1$s is the application name requesting access, %2$s is the organisation behind the application,
 #. TRANS: %3$s is the access type requested, %4$s is the StatusNet sitename.
-#: actions/apioauthauthorize.php:433
 #, php-format
 msgid ""
 "The application <strong>%1$s</strong> by <strong>%2$s</strong> would like "
@@ -965,22 +732,18 @@ msgstr ""
 "hauríeu de donar accés al compte %4$s a terceres parts en què confieu."
 
 #. TRANS: Fieldset legend.
-#: actions/apioauthauthorize.php:455
 msgctxt "LEGEND"
 msgid "Account"
 msgstr "Compte"
 
 #. TRANS: Field label on OAuth API authorisation form.
+#. TRANS: Field label on login page.
 #. TRANS: Field label in form for profile settings.
-#: actions/apioauthauthorize.php:459 actions/login.php:225
-#: actions/profilesettings.php:107 actions/register.php:411
-#: actions/userauthorization.php:145 lib/groupeditform.php:145
 msgid "Nickname"
 msgstr "Sobrenom"
 
 #. TRANS: Field label on OAuth API authorisation form.
-#: actions/apioauthauthorize.php:463 actions/login.php:228
-#: actions/register.php:415 lib/settingsnav.php:87
+#. TRANS: Field label on login page.
 msgid "Password"
 msgstr "Contrasenya"
 
@@ -990,43 +753,34 @@ msgstr "Contrasenya"
 #. TRANS: Button label to cancel an IM address confirmation procedure.
 #. TRANS: Button label to cancel a SMS address confirmation procedure.
 #. TRANS: Button label in the "Edit application" form.
-#: actions/apioauthauthorize.php:478 actions/emailsettings.php:125
-#: actions/imsettings.php:136 actions/smssettings.php:132
-#: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Cancel"
 msgstr "Cancel·la"
 
 #. TRANS: Button text that when clicked will allow access to an account by an external application.
-#: actions/apioauthauthorize.php:485
 msgctxt "BUTTON"
 msgid "Allow"
 msgstr "Permet"
 
 #. TRANS: Form instructions.
-#: actions/apioauthauthorize.php:502
 msgid "Authorize access to your account information."
 msgstr "Autoritza l'accés a la informació del vostre compte."
 
 #. TRANS: Header for user notification after revoking OAuth access to an application.
-#: actions/apioauthauthorize.php:594
 msgid "Authorization canceled."
 msgstr "S'ha cancel·lat l'autorització."
 
 #. TRANS: User notification after revoking OAuth access to an application.
 #. TRANS: %s is an OAuth token.
-#: actions/apioauthauthorize.php:598
 #, php-format
 msgid "The request token %s has been revoked."
 msgstr "S'ha revocat el testimoni de sol·licitud %s."
 
 #. TRANS: Title of the page notifying the user that an anonymous client application was successfully authorized to access the user's account with OAuth.
-#: actions/apioauthauthorize.php:621
 msgid "You have successfully authorized the application"
 msgstr "Heu autoritzat l'aplicació amb èxit."
 
 #. TRANS: Message notifying the user that an anonymous client application was successfully authorized to access the user's account with OAuth.
-#: actions/apioauthauthorize.php:625
 msgid ""
 "Please return to the application and enter the following security code to "
 "complete the process."
@@ -1036,14 +790,12 @@ msgstr ""
 
 #. TRANS: Title of the page notifying the user that the client application was successfully authorized to access the user's account with OAuth.
 #. TRANS: %s is the authorised application name.
-#: actions/apioauthauthorize.php:632
 #, php-format
 msgid "You have successfully authorized %s"
 msgstr "Heu autoritzat amb èxit %s"
 
 #. TRANS: Message notifying the user that the client application was successfully authorized to access the user's account with OAuth.
 #. TRANS: %s is the authorised application name.
-#: actions/apioauthauthorize.php:639
 #, php-format
 msgid ""
 "Please return to %s and enter the following security code to complete the "
@@ -1053,12 +805,10 @@ msgstr ""
 
 #. TRANS: Client error displayed trying to delete a status not using POST or DELETE.
 #. TRANS: POST and DELETE should not be translated.
-#: actions/apistatusesdestroy.php:111
 msgid "This method requires a POST or DELETE."
 msgstr "Aquest mètode requereix POST o DELETE."
 
 #. TRANS: Client error displayed trying to delete a status of another user.
-#: actions/apistatusesdestroy.php:136
 msgid "You may not delete another user's status."
 msgstr "No podeu eliminar l'estat d'un altre usuari."
 
@@ -1066,21 +816,16 @@ msgstr "No podeu eliminar l'estat d'un altre usuari."
 #. TRANS: Client error displayed trying to display redents of a non-exiting notice.
 #. TRANS: Client exception thrown when referencing a non-existing notice.
 #. TRANS: Error message displayed trying to delete a non-existing notice.
-#: actions/apistatusesretweet.php:74 actions/apistatusesretweets.php:70
-#: actions/atompubshowfavorite.php:82 actions/deletenotice.php:61
-#: actions/shownotice.php:92
 msgid "No such notice."
 msgstr "No existeix aquest avís."
 
 #. TRANS: Client error displayed trying to repeat an own notice through the API.
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:549
 msgid "Cannot repeat your own notice."
 msgstr "No podeu repetir els vostres propis avisos."
 
 #. TRANS: Client error displayed trying to re-repeat a notice through the API.
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:92 lib/command.php:555
 msgid "Already repeated that notice."
 msgstr "Avís duplicat."
 
@@ -1090,57 +835,43 @@ msgstr "Avís duplicat."
 #. TRANS: Client exception thrown when using an unsupported HTTP method.
 #. TRANS: Client error shown when using a non-supported HTTP method.
 #. TRANS: Client exception thrown when using an unsupported HTTP method.
-#: actions/apistatusesshow.php:118 actions/atompubfavoritefeed.php:103
-#: actions/atompubmembershipfeed.php:105 actions/atompubshowfavorite.php:117
-#: actions/atompubshowmembership.php:116
-#: actions/atompubshowsubscription.php:122
-#: actions/atompubsubscriptionfeed.php:109
 msgid "HTTP method not supported."
 msgstr "El mètode HTTP no està implementat."
 
 #. TRANS: Exception thrown requesting an unsupported notice output format.
 #. TRANS: %s is the requested output format.
-#: actions/apistatusesshow.php:144
 #, php-format
 msgid "Unsupported format: %s."
 msgstr "Format no permès: %s."
 
 #. TRANS: Client error displayed requesting a deleted status.
-#: actions/apistatusesshow.php:155
 msgid "Status deleted."
 msgstr "S'ha eliminat l'estat."
 
 #. TRANS: Client error displayed requesting a status with an invalid ID.
-#: actions/apistatusesshow.php:162
 msgid "No status with that ID found."
 msgstr "No s'ha trobat cap estatus amb la ID trobada."
 
 #. TRANS: Client error displayed when trying to delete a notice not using the Atom format.
-#: actions/apistatusesshow.php:227
 msgid "Can only delete using the Atom format."
 msgstr "Només es pot eliminar fent servir el format Atom."
 
 #. TRANS: Client error displayed when a user has no rights to delete notices of other users.
 #. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
-#: actions/apistatusesshow.php:235 actions/deletenotice.php:78
 msgid "Cannot delete this notice."
 msgstr "No es pot eliminar l'avís."
 
 #. TRANS: Confirmation of notice deletion in API. %d is the ID (number) of the deleted notice.
-#: actions/apistatusesshow.php:249
 #, php-format
 msgid "Deleted notice %d"
 msgstr "S'ha eliminat l'avís %d"
 
 #. TRANS: Client error displayed when the parameter "status" is missing.
-#: actions/apistatusesupdate.php:221
 msgid "Client must provide a 'status' parameter with a value."
 msgstr "El client ha de proporcionar un paràmetre 'status' amb un valor."
 
 #. TRANS: Client error displayed when the parameter "status" is missing.
 #. TRANS: %d is the maximum number of character for a notice.
-#: actions/apistatusesupdate.php:244 actions/newnotice.php:161
-#: lib/mailhandler.php:60
 #, php-format
 msgid "That's too long. Maximum notice size is %d character."
 msgid_plural "That's too long. Maximum notice size is %d characters."
@@ -1148,13 +879,11 @@ msgstr[0] "És massa llarg. La longitud màxima de l'avís és de %d caràcter."
 msgstr[1] "És massa llarg. La longitud màxima de l'avís és de %d caràcters."
 
 #. TRANS: Client error displayed when replying to a non-existing notice.
-#: actions/apistatusesupdate.php:284
 msgid "Parent notice not found."
 msgstr "No s'ha trobat l'avís pare."
 
 #. TRANS: Client error displayed exceeding the maximum notice length.
 #. TRANS: %d is the maximum lenth for a notice.
-#: actions/apistatusesupdate.php:308 actions/newnotice.php:184
 #, php-format
 msgid "Maximum notice size is %d character, including attachment URL."
 msgid_plural "Maximum notice size is %d characters, including attachment URL."
@@ -1165,13 +894,11 @@ msgstr[1] ""
 
 #. TRANS: Client error displayed when requesting profiles of followers in an unsupported format.
 #. TRANS: Client error displayed when requesting IDs of followers in an unsupported format.
-#: actions/apisubscriptions.php:228 actions/apisubscriptions.php:258
 msgid "Unsupported format."
 msgstr "El format no està permès."
 
 #. TRANS: Title for timeline of most recent favourite notices by a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname.
-#: actions/apitimelinefavorites.php:108
 #, php-format
 msgid "%1$s / Favorites from %2$s"
 msgstr "%1$s / Preferits de %2$s"
@@ -1179,14 +906,12 @@ msgstr "%1$s / Preferits de %2$s"
 #. TRANS: Subtitle for timeline of most recent favourite notices by a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user's full name,
 #. TRANS: %3$s is a user nickname.
-#: actions/apitimelinefavorites.php:120
 #, php-format
 msgid "%1$s updates favorited by %2$s / %3$s."
 msgstr "%1$s actualitzacions preferides per %2$s / %3$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.
-#: actions/apitimelinementions.php:115
 #, php-format
 msgid "%1$s / Updates mentioning %2$s"
 msgstr "%1$s / Actualitzacions que mencionen %2$s"
@@ -1194,48 +919,40 @@ msgstr "%1$s / Actualitzacions que mencionen %2$s"
 #. TRANS: Subtitle for timeline of most recent mentions of a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname,
 #. TRANS: %3$s is a user's full name.
-#: actions/apitimelinementions.php:131
 #, php-format
 msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr "%1$s actualitzacions que responen a avisos de %2$s / %3$s."
 
 #. TRANS: Title for site timeline. %s is the StatusNet sitename.
 #. TRANS: Public RSS feed title. %s is the StatusNet site name.
-#: actions/apitimelinepublic.php:193 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "%s línia temporal pública"
 
 #. TRANS: Subtitle for site timeline. %s is the StatusNet sitename.
-#: actions/apitimelinepublic.php:199
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "%s actualitzacions de tothom!"
 
 #. TRANS: Server error displayed calling unimplemented API method for 'retweeted by me'.
-#: actions/apitimelineretweetedbyme.php:71
 msgid "Unimplemented."
 msgstr "No implementat."
 
 #. TRANS: Title for Atom feed "repeated to me". %s is the user nickname.
-#: actions/apitimelineretweetedtome.php:96
 #, php-format
 msgid "Repeated to %s"
 msgstr "Repetit a %s"
 
-#: actions/apitimelineretweetedtome.php:98
 #, fuzzy, php-format
 msgid "%1$s notices that were to repeated to %2$s / %3$s."
 msgstr "%1$s actualitzacions que responen a avisos de %2$s / %3$s."
 
 #. TRANS: Title of list of repeated notices of the logged in user.
 #. TRANS: %s is the nickname of the logged in user.
-#: actions/apitimelineretweetsofme.php:98
 #, php-format
 msgid "Repeats of %s"
 msgstr "Repeticions de %s"
 
-#: actions/apitimelineretweetsofme.php:104
 #, fuzzy, php-format
 msgid "%1$s notices that %2$s / %3$s has repeated."
 msgstr "%1$s ha marcat l'avís %2$s com a preferit"
@@ -1244,170 +961,137 @@ msgstr "%1$s ha marcat l'avís %2$s com a preferit"
 #. TRANS: %s is the tag.
 #. TRANS: Title for first page of notices with tags.
 #. TRANS: %s is the tag.
-#: actions/apitimelinetag.php:101 actions/tag.php:69
 #, php-format
 msgid "Notices tagged with %s"
 msgstr "Avisos etiquetats amb %s"
 
 #. TRANS: Subtitle for timeline with lastest notices with a given tag.
 #. TRANS: %1$s is the tag, $2$s is the StatusNet sitename.
-#: actions/apitimelinetag.php:105 actions/tagrss.php:65
 #, php-format
 msgid "Updates tagged with %1$s on %2$s!"
 msgstr "Actualitzacions etiquetades amb %1$s el %2$s!"
 
 #. TRANS: Client error displayed trying to add a notice to another user's timeline.
-#: actions/apitimelineuser.php:308
 msgid "Only the user can add to their own timeline."
 msgstr "Només l'usuari pot afegir a la pròpia línia temporal."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:315
 msgid "Only accept AtomPub for Atom feeds."
 msgstr "Només accepta AtomPub per als canals Atom."
 
 #. TRANS: Client error displayed attempting to post an empty API notice.
-#: actions/apitimelineuser.php:322
 msgid "Atom post must not be empty."
 msgstr "L'enviament Atom no ha de ser buit."
 
 #. TRANS: Client error displayed attempting to post an API that is not well-formed XML.
-#: actions/apitimelineuser.php:328
 msgid "Atom post must be well-formed XML."
 msgstr "L'enviament Atom ha de ser un XML ben format."
 
 #. TRANS: Client error displayed when not using an Atom entry.
-#: actions/apitimelineuser.php:334 actions/atompubfavoritefeed.php:228
-#: actions/atompubmembershipfeed.php:230
-#: actions/atompubsubscriptionfeed.php:236
 msgid "Atom post must be an Atom entry."
 msgstr "L'enviament Atom ha de ser una entrada Atom."
 
 #. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
-#: actions/apitimelineuser.php:345
 msgid "Can only handle POST activities."
 msgstr "Només es poden gestionar les activitats POST."
 
 #. TRANS: Client error displayed when using an unsupported activity object type.
 #. TRANS: %s is the unsupported activity object type.
-#: actions/apitimelineuser.php:356
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr "No es pot gestionar l'activitat del tipus d'objecte «%s»"
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
 #. TRANS: %d is the notice ID (number).
-#: actions/apitimelineuser.php:390
 #, php-format
 msgid "No content for notice %d."
 msgstr "No hi ha contingut de l'avís %d"
 
 #. TRANS: Client error displayed when using another format than AtomPub.
 #. TRANS: %s is the notice URI.
-#: actions/apitimelineuser.php:419
 #, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "L'avís amb URI «%s» amb ja existeix."
 
 #. TRANS: Server error for unfinished API method showTrends.
-#: actions/apitrends.php:85
 msgid "API method under construction."
 msgstr "Mètode API en construcció."
 
 #. TRANS: Client error displayed when requesting user information for a non-existing user.
-#: actions/apiuserprofileimage.php:80 actions/apiusershow.php:94
 msgid "User not found."
 msgstr "No s'ha trobat el mètode API!"
 
 #. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
 #. TRANS: Client exception.
 #. TRANS: Client error displayed trying to subscribe to a non-existing profile.
-#: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
-#: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
-#: actions/subscribe.php:110
 msgid "No such profile."
 msgstr "No existeix el perfil."
 
 #. TRANS: Subtitle for Atom favorites feed.
 #. TRANS: %1$s is a user nickname, %2$s is the StatusNet sitename.
-#: actions/atompubfavoritefeed.php:147
 #, php-format
 msgid "Notices %1$s has favorited on %2$s"
 msgstr "Avisos que %1$s ha preferit a %2$s"
 
 #. TRANS: Client exception thrown when trying to set a favorite for another user.
 #. TRANS: Client exception thrown when trying to subscribe another user.
-#: actions/atompubfavoritefeed.php:217 actions/atompubsubscriptionfeed.php:225
 msgid "Cannot add someone else's subscription."
 msgstr "No es pot afegir la subscripció d'algú altre."
 
 #. TRANS: Client exception thrown when trying use an incorrect activity verb for the Atom pub method.
-#: actions/atompubfavoritefeed.php:240
 msgid "Can only handle favorite activities."
 msgstr "Només es poden gestionar les activitats preferides."
 
 #. TRANS: Client exception thrown when trying favorite an object that is not a notice.
-#: actions/atompubfavoritefeed.php:250 actions/atompubmembershipfeed.php:250
 msgid "Can only fave notices."
 msgstr "Només es poden preferir els avisos."
 
 #. TRANS: Client exception thrown when trying favorite a notice without content.
-#: actions/atompubfavoritefeed.php:259
 msgid "Unknown note."
 msgstr "Nota desconeguda."
 
 #. TRANS: Client exception thrown when trying favorite an already favorited notice.
-#: actions/atompubfavoritefeed.php:267
 msgid "Already a favorite."
 msgstr "Ja és una preferit."
 
 #. TRANS: Title for group membership feed.
 #. TRANS: %s is a username.
-#: actions/atompubmembershipfeed.php:144
 #, php-format
 msgid "%s group memberships"
 msgstr "%s pertinències a grup"
 
 #. TRANS: Subtitle for group membership feed.
 #. TRANS: %1$s is a username, %2$s is the StatusNet sitename.
-#: actions/atompubmembershipfeed.php:149
 #, php-format
 msgid "Groups %1$s is a member of on %2$s"
 msgstr "Els grups en què %1$s n'és membre a %2$s"
 
 #. TRANS: Client exception thrown when trying subscribe someone else to a group.
-#: actions/atompubmembershipfeed.php:219
 msgid "Cannot add someone else's membership."
 msgstr "No es pot afegir la pertinència d'algú altre."
 
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#: actions/atompubmembershipfeed.php:242
 msgid "Can only handle join activities."
 msgstr "Només es poden gestionar les activitats d'unió."
 
 #. TRANS: Client exception thrown when trying to subscribe to a non-existing group.
-#: actions/atompubmembershipfeed.php:259
 msgid "Unknown group."
 msgstr "Grup desconegut."
 
 #. TRANS: Client exception thrown when trying to subscribe to an already subscribed group.
-#: actions/atompubmembershipfeed.php:267
 msgid "Already a member."
 msgstr "Ja és un membre."
 
 #. TRANS: Client exception thrown when trying to subscribe to group while blocked from that group.
-#: actions/atompubmembershipfeed.php:275
 msgid "Blocked by admin."
 msgstr "Bloquejat per l'administrador."
 
 #. TRANS: Client exception thrown when referencing a non-existing favorite.
-#: actions/atompubshowfavorite.php:90
 msgid "No such favorite."
 msgstr "No existeix el preferit."
 
 #. TRANS: Client exception thrown when trying to remove a favorite notice of another user.
-#: actions/atompubshowfavorite.php:151
 msgid "Cannot delete someone else's favorite."
 msgstr "No es pot eliminar què ha preferit algú altre."
 
@@ -1433,90 +1117,65 @@ msgstr "No es pot eliminar què ha preferit algú altre."
 #. TRANS: Client error displayed when trying to join a non-existing group.
 #. TRANS: Client error displayed when trying to leave a non-local group.
 #. TRANS: Client error displayed when trying to leave a non-existing group.
+#. TRANS: Client error displayed when providing an invalid group ID on the Make Admin page.
 #. 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.
 #. TRANS: Command exception text shown when a group is requested that does not exist.
 #. TRANS: Error text shown when trying to leave a group that does not exist.
-#: actions/atompubshowmembership.php:81 actions/blockedfromgroup.php:81
-#: actions/blockedfromgroup.php:89 actions/deletegroup.php:87
-#: actions/deletegroup.php:100 actions/editgroup.php:102
-#: actions/foafgroup.php:46 actions/foafgroup.php:65 actions/foafgroup.php:73
-#: actions/groupblock.php:89 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:101 actions/grouplogo.php:103
-#: actions/groupmembers.php:84 actions/groupmembers.php:92
-#: actions/grouprss.php:97 actions/grouprss.php:105
-#: actions/groupunblock.php:89 actions/joingroup.php:82
-#: actions/joingroup.php:95 actions/leavegroup.php:82
-#: actions/leavegroup.php:95 actions/makeadmin.php:86
-#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:392
 msgid "No such group."
 msgstr "No s'ha trobat el grup."
 
 #. TRANS: Client exception thrown when trying to show membership of a non-subscribed group
-#: actions/atompubshowmembership.php:91
 msgid "Not a member."
 msgstr "No és un membre."
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
-#: actions/atompubshowmembership.php:150
 msgid "Cannot delete someone else's membership."
 msgstr "No es pot eliminar la pertinència d'algú altre."
 
 #. TRANS: Client exception thrown when trying to display a subscription for a non-existing profile ID.
 #. TRANS: %d is the non-existing profile ID number.
-#: actions/atompubshowsubscription.php:72
-#: actions/atompubshowsubscription.php:83
-#: actions/atompubsubscriptionfeed.php:74
 #, php-format
 msgid "No such profile id: %d."
 msgstr "No existeix l'id de perfil: %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.
-#: actions/atompubshowsubscription.php:94
 #, php-format
 msgid "Profile %1$d not subscribed to profile %2$d."
 msgstr "El perfil %1$d no està subscrit al perfil %2$d."
 
 #. TRANS: Client exception thrown when trying to delete a subscription of another user.
-#: actions/atompubshowsubscription.php:157
 msgid "Cannot delete someone else's subscription."
 msgstr "No es pot eliminar la subscripció d'algú altre."
 
 #. TRANS: Subtitle for Atom subscription feed.
 #. TRANS: %1$s is a user nickname, %s$s is the StatusNet sitename.
-#: actions/atompubsubscriptionfeed.php:153
 #, php-format
 msgid "People %1$s has subscribed to on %2$s"
 msgstr "Gent a qui %1$s ha subscrit a %2$s"
 
 #. TRANS: Client error displayed when not using the follow verb.
-#: actions/atompubsubscriptionfeed.php:248
 msgid "Can only handle Follow activities."
 msgstr "Només es poden gestionar les activitats de seguiment."
 
 #. TRANS: Client exception thrown when subscribing to an object that is not a person.
-#: actions/atompubsubscriptionfeed.php:256
 msgid "Can only follow people."
 msgstr "Només es pot seguir gent."
 
 #. TRANS: Client exception thrown when subscribing to a non-existing profile.
 #. TRANS: %s is the unknown profile ID.
-#: actions/atompubsubscriptionfeed.php:267
 #, php-format
 msgid "Unknown profile %s."
 msgstr "Perfil desconegut %s"
 
 #. TRANS: Client error displayed trying to subscribe to an already subscribed profile.
 #. TRANS: %s is the profile the user already has a subscription on.
-#: actions/atompubsubscriptionfeed.php:275
 #, php-format
 msgid "Already subscribed to %s."
 msgstr "Ja esteu subscrit a %s."
 
 #. TRANS: Client error displayed trying to get a non-existing attachment.
-#: actions/attachment.php:73
 msgid "No such attachment."
 msgstr "No existeix l'adjunció."
 
@@ -1528,31 +1187,23 @@ msgstr "No existeix l'adjunció."
 #. TRANS: Client error displayed when trying to view group members without providing a group nickname.
 #. TRANS: Client error displayed when requesting a group RSS feed without providing a group nickname.
 #. TRANS: Client error displayed if no nickname argument was given requesting a group page.
-#: actions/avatarbynickname.php:60 actions/blockedfromgroup.php:73
-#: actions/editgroup.php:85 actions/groupdesignsettings.php:84
-#: actions/grouplogo.php:86 actions/groupmembers.php:76
-#: actions/grouprss.php:89 actions/showgroup.php:116
 msgid "No nickname."
 msgstr "Cap sobrenom."
 
 #. TRANS: Client error displayed trying to get an avatar without providing an avatar size.
-#: actions/avatarbynickname.php:66
 msgid "No size."
 msgstr "Cap mida."
 
 #. TRANS: Client error displayed trying to get an avatar providing an invalid avatar size.
-#: actions/avatarbynickname.php:72
 msgid "Invalid size."
 msgstr "La mida no és vàlida."
 
 #. TRANS: Title for avatar upload page.
-#: actions/avatarsettings.php:66 lib/settingsnav.php:82
 msgid "Avatar"
 msgstr "Avatar"
 
 #. TRANS: Instruction for avatar upload page.
 #. TRANS: %s is the maximum file size, for example "500b", "10kB" or "2MB".
-#: actions/avatarsettings.php:78
 #, php-format
 msgid "You can upload your personal avatar. The maximum file size is %s."
 msgstr ""
@@ -1562,17 +1213,12 @@ msgstr ""
 #. TRANS: Server error displayed coming across a request from a user without a profile.
 #. TRANS: Server error displayed when trying to authorise a remote subscription request
 #. TRANS: while the user has no profile.
-#: actions/avatarsettings.php:108 actions/avatarsettings.php:192
-#: actions/grouplogo.php:184 actions/remotesubscribe.php:190
-#: actions/userauthorization.php:75 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr "L'usuari que no coincideix amb cap perfil"
 
 #. TRANS: Avatar upload page form legend.
 #. TRANS: Avatar upload page crop form legend.
 #. TRANS: Legend for group logo settings fieldset.
-#: actions/avatarsettings.php:122 actions/avatarsettings.php:205
-#: actions/grouplogo.php:261
 msgid "Avatar settings"
 msgstr "Configuració de l'avatar"
 
@@ -1580,8 +1226,6 @@ msgstr "Configuració de l'avatar"
 #. TRANS: Header on avatar upload crop form for thumbnail of originally uploaded avatar (h2).
 #. TRANS: Uploaded original file in group logo form.
 #. TRANS: Header for originally uploaded file before a crop on the group logo page.
-#: actions/avatarsettings.php:131 actions/avatarsettings.php:214
-#: actions/grouplogo.php:207 actions/grouplogo.php:270
 msgid "Original"
 msgstr "Original"
 
@@ -1589,38 +1233,31 @@ msgstr "Original"
 #. TRANS: Header on avatar upload crop form for thumbnail of to be used rendition of uploaded avatar (h2).
 #. TRANS: Header for preview of to be displayed group logo.
 #. TRANS: Header for the cropped group logo on the group logo page.
-#: actions/avatarsettings.php:147 actions/avatarsettings.php:227
-#: actions/grouplogo.php:219 actions/grouplogo.php:283
 msgid "Preview"
 msgstr "Vista prèvia"
 
 #. TRANS: Button on avatar upload page to delete current avatar.
 #. TRANS: Button text for user account deletion.
-#: actions/avatarsettings.php:155 actions/deleteaccount.php:319
 msgctxt "BUTTON"
 msgid "Delete"
 msgstr "Elimina"
 
 #. TRANS: Button on avatar upload page to upload an avatar.
 #. TRANS: Submit button to confirm upload of a user backup file for account restore.
-#: actions/avatarsettings.php:173 actions/restoreaccount.php:369
 msgctxt "BUTTON"
 msgid "Upload"
 msgstr "Puja"
 
 #. TRANS: Button on avatar upload crop form to confirm a selected crop as avatar.
-#: actions/avatarsettings.php:243
 msgctxt "BUTTON"
 msgid "Crop"
 msgstr "Retalla"
 
 #. TRANS: Validation error on avatar upload form when no file was uploaded.
-#: actions/avatarsettings.php:318
 msgid "No file uploaded."
 msgstr "No s'ha carregat cap fitxer."
 
 #. TRANS: Avatar upload form instruction after uploading a file.
-#: actions/avatarsettings.php:345
 msgid "Pick a square area of the image to be your avatar."
 msgstr ""
 "Seleccioneu una àrea quadrada de la imatge que voleu que sigui el vostre "
@@ -1628,45 +1265,37 @@ msgstr ""
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
 #. TRANS: Server error displayed trying to crop an uploaded group logo that is no longer present.
-#: actions/avatarsettings.php:360 actions/grouplogo.php:391
 msgid "Lost our file data."
 msgstr "S'ha perdut el nostre fitxer de dades."
 
 #. TRANS: Success message for having updated a user avatar.
-#: actions/avatarsettings.php:384
 msgid "Avatar updated."
 msgstr "Avatar actualitzat."
 
 #. TRANS: Error displayed on the avatar upload page if the avatar could not be updated for an unknown reason.
-#: actions/avatarsettings.php:388
 msgid "Failed updating avatar."
 msgstr "Error en actualitzar avatar."
 
 #. TRANS: Success message for deleting a user avatar.
-#: actions/avatarsettings.php:412
 msgid "Avatar deleted."
 msgstr "S'ha eliminat l'avatar."
 
 #. TRANS: Title for backup account page.
 #. TRANS: Option in profile settings to create a backup of the account of the currently logged in user.
-#: actions/backupaccount.php:61 actions/profilesettings.php:468
 msgid "Backup account"
 msgstr "Fes una còpia de seguretat del compte"
 
 #. TRANS: Client exception thrown when trying to backup an account while not logged in.
-#: actions/backupaccount.php:79
 msgid "Only logged-in users can backup their account."
 msgstr ""
 "Només els usuaris que han iniciat una sessió poden fer una còpia de "
 "seguretat del compte."
 
 #. TRANS: Client exception thrown when trying to backup an account without having backup rights.
-#: actions/backupaccount.php:84
 msgid "You may not backup your account."
 msgstr "No podeu fer una còpia de seguretat del compte."
 
 #. TRANS: Information displayed on the backup account page.
-#: actions/backupaccount.php:227
 msgid ""
 "You can backup your account data in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format. This is an experimental feature and provides "
@@ -1682,30 +1311,25 @@ msgstr ""
 "directes tampoc es copien."
 
 #. TRANS: Submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:250
 msgctxt "BUTTON"
 msgid "Backup"
 msgstr "Còpia de seguretat"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:254
 msgid "Backup your account."
 msgstr "Fes una còpia de seguretat del compte."
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
-#: actions/block.php:68
 msgid "You already blocked that user."
 msgstr "Ja heu blocat l'usuari."
 
 #. TRANS: Title for block user page.
 #. TRANS: Legend for block user form.
 #. TRANS: Fieldset legend for block user from group form.
-#: actions/block.php:106 actions/block.php:136 actions/groupblock.php:165
 msgid "Block user"
 msgstr "Bloca l'usuari"
 
 #. TRANS: Explanation of consequences when blocking a user on the block user page.
-#: actions/block.php:139
 msgid ""
 "Are you sure you want to block this user? Afterwards, they will be "
 "unsubscribed from you, unable to subscribe to you in the future, and you "
@@ -1721,15 +1345,11 @@ msgstr ""
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:154 actions/deleteapplication.php:157
-#: actions/deletegroup.php:220 actions/deletenotice.php:155
-#: actions/deleteuser.php:154 actions/groupblock.php:187
 msgctxt "BUTTON"
 msgid "No"
 msgstr "No"
 
 #. TRANS: Submit button title for 'No' when blocking a user.
-#: actions/block.php:158
 msgid "Do not block this user."
 msgstr "No bloquis l'usuari."
 
@@ -1739,174 +1359,138 @@ msgstr "No bloquis l'usuari."
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:161 actions/deleteapplication.php:164
-#: actions/deletegroup.php:227 actions/deletenotice.php:162
-#: actions/deleteuser.php:161 actions/groupblock.php:194
 msgctxt "BUTTON"
 msgid "Yes"
 msgstr "Sí"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:165
 msgid "Block this user."
 msgstr "Bloca l'usuari."
 
 #. TRANS: Server error displayed when blocking a user fails.
-#: actions/block.php:189
 msgid "Failed to save block information."
 msgstr "No s'ha pogut desar la informació del bloc."
 
 #. TRANS: Title for first page with list of users blocked from a group.
 #. TRANS: %s is a group nickname.
-#: actions/blockedfromgroup.php:101
 #, php-format
 msgid "%s blocked profiles"
 msgstr "%s perfils blocats"
 
 #. TRANS: Title for any but the first page with list of users blocked from a group.
 #. TRANS: %1$s is a group nickname, %2$d is a page number.
-#: actions/blockedfromgroup.php:106
 #, php-format
 msgid "%1$s blocked profiles, page %2$d"
 msgstr "%1$s perfils blocats, pàgina %2$d"
 
 #. TRANS: Instructions for list of users blocked from a group.
-#: actions/blockedfromgroup.php:122
 msgid "A list of the users blocked from joining this group."
 msgstr "Una llista d'usuaris que han estat blocats d'afegir-se a aquest grup."
 
 #. TRANS: Form legend for unblocking a user from a group.
-#: actions/blockedfromgroup.php:291
 msgid "Unblock user from group"
 msgstr "Desbloca l'usuari del grup"
 
 #. TRANS: Button text for unblocking a user from a group.
-#: actions/blockedfromgroup.php:323
 msgctxt "BUTTON"
 msgid "Unblock"
 msgstr "Desbloca"
 
 #. TRANS: Tooltip for button for unblocking a user from a group.
 #. TRANS: Description of the form to unblock a user.
-#: actions/blockedfromgroup.php:327 lib/unblockform.php:78
 msgid "Unblock this user"
 msgstr "Desbloca l'usuari"
 
 #. TRANS: Title for mini-posting window loaded from bookmarklet.
 #. TRANS: %s is the StatusNet site name.
-#: actions/bookmarklet.php:51
 #, php-format
 msgid "Post to %s"
 msgstr "Publica a %s"
 
 #. TRANS: Client error displayed when not providing a confirmation code in the contact address confirmation action.
-#: actions/confirmaddress.php:74
 msgid "No confirmation code."
 msgstr "Cap codi de confirmació."
 
 #. TRANS: Client error displayed when providing a non-existing confirmation code in the contact address confirmation action.
-#: actions/confirmaddress.php:80
 msgid "Confirmation code not found."
 msgstr "Codi de confirmació no trobat. "
 
 #. TRANS: Client error displayed when not providing a confirmation code for another user in the contact address confirmation action.
-#: actions/confirmaddress.php:86
 msgid "That confirmation code is not for you!"
 msgstr "Aquest codi de confirmació no és vostre!"
 
 #. TRANS: Server error for an unknown address type, which can be 'email', 'sms', or the name of an IM network (such as 'xmpp' or 'aim')
-#: actions/confirmaddress.php:94
-#, fuzzy, php-format
+#, php-format
 msgid "Unrecognized address type %s"
 msgstr "Tipus d'adreça desconeguda %s."
 
 #. TRANS: Client error for an already confirmed email/jabber/sms address.
-#: actions/confirmaddress.php:103 actions/confirmaddress.php:136
 msgid "That address has already been confirmed."
 msgstr "Aquesta adreça ja ha estat confirmada."
 
-#: actions/confirmaddress.php:121 actions/imsettings.php:444
-#: actions/userdesignsettings.php:306
-#, fuzzy
 msgid "Couldn't update user."
 msgstr "No s'ha pogut actualitzar l'usuari."
 
-#: actions/confirmaddress.php:144
 #, fuzzy
 msgid "Couldn't update user im preferences."
 msgstr "No s'ha pogut actualitzar el registre de l'usuari."
 
-#: actions/confirmaddress.php:156
 #, fuzzy
 msgid "Couldn't insert user im preferences."
 msgstr "No s'ha pogut inserir una nova subscripció."
 
 #. TRANS: Server error displayed when an address confirmation code deletion from the
 #. TRANS: database fails in the contact address confirmation action.
-#: actions/confirmaddress.php:169
 msgid "Could not delete address confirmation."
 msgstr "No s'ha pogut eliminar la confirmació de l'adreça."
 
 #. TRANS: Title for the contact address confirmation action.
-#: actions/confirmaddress.php:185
 msgid "Confirm address"
 msgstr "Confirmeu l'adreça de correu electrònic"
 
 #. TRANS: Success message for the contact address confirmation action.
 #. TRANS: %s can be 'email', 'jabber', or 'sms'.
-#: actions/confirmaddress.php:200
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "L'adreça «%s» ha estat confirmada per al vostre compte."
 
 #. TRANS: Title for page with a conversion (multiple notices in context).
-#: actions/conversation.php:96
 msgid "Conversation"
 msgstr "Conversa"
 
 #. TRANS: Header on conversation page. Hidden by default (h2).
 #. TRANS: Label for user statistics.
-#: actions/conversation.php:149 lib/noticelist.php:87
-#: lib/profileaction.php:246 lib/searchgroupnav.php:82
-#: lib/threadednoticelist.php:66
 msgid "Notices"
 msgstr "Avisos"
 
 #. TRANS: Client exception displayed trying to delete a user account while not logged in.
-#: actions/deleteaccount.php:71
 msgid "Only logged-in users can delete their account."
 msgstr "Només els usuaris que han iniciat una sessió poden eliminar el compte."
 
 #. TRANS: Client exception displayed trying to delete a user account without have the rights to do that.
-#: actions/deleteaccount.php:77
 msgid "You cannot delete your account."
 msgstr "No podeu eliminar el vostre compte."
 
 #. TRANS: Confirmation text for user deletion. The user has to type this exactly the same, including punctuation.
-#: actions/deleteaccount.php:160 actions/deleteaccount.php:297
 msgid "I am sure."
 msgstr "N'estic segur."
 
 #. TRANS: Notification for user about the text that must be input to be able to delete a user account.
 #. TRANS: %s is the text that needs to be input.
-#: actions/deleteaccount.php:164
 #, php-format
 msgid "You must write \"%s\" exactly in the box."
 msgstr "Heu d'escriure «%s» exactament dins del quadre."
 
 #. TRANS: Confirmation that a user account has been deleted.
-#: actions/deleteaccount.php:206
 msgid "Account deleted."
 msgstr "S'ha eliminat el compte."
 
 #. TRANS: Page title for page on which a user account can be deleted.
 #. TRANS: Option in profile settings to delete the account of the currently logged in user.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:476
 msgid "Delete account"
 msgstr "Elimina el compte"
 
 #. TRANS: Form text for user deletion form.
-#: actions/deleteaccount.php:279
 msgid ""
 "This will <strong>permanently delete</strong> your account data from this "
 "server."
@@ -1916,7 +1500,6 @@ msgstr ""
 
 #. TRANS: Additional form text for user deletion form shown if a user has account backup rights.
 #. TRANS: %s is a URL to the backup page.
-#: actions/deleteaccount.php:285
 #, php-format
 msgid ""
 "You are strongly advised to <a href=\"%s\">back up your data</a> before "
@@ -1927,55 +1510,42 @@ msgstr ""
 
 #. TRANS: Field label for delete account confirmation entry.
 #. TRANS: Field label for password reset form where the password has to be typed again.
-#: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:262 actions/register.php:419
 msgid "Confirm"
 msgstr "Confirma"
 
 #. TRANS: Input title for the delete account field.
 #. TRANS: %s is the text that needs to be input.
-#: actions/deleteaccount.php:304
 #, php-format
 msgid "Enter \"%s\" to confirm that you want to delete your account."
 msgstr "Introduïu «%s» per a confirmar que voleu eliminar el vostre compte."
 
 #. TRANS: Button title for user account deletion.
-#: actions/deleteaccount.php:323
 msgid "Permanently delete your account"
 msgstr "Elimina permanentment el compte"
 
 #. TRANS: Client error displayed trying to delete an application while not logged in.
-#: actions/deleteapplication.php:62
 msgid "You must be logged in to delete an application."
 msgstr "Heu d'haver iniciat una sessió per eliminar una aplicació."
 
 #. TRANS: Client error displayed trying to delete an application that does not exist.
-#: actions/deleteapplication.php:71
 msgid "Application not found."
 msgstr "No s'ha trobat l'aplicació."
 
 #. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
-#: actions/deleteapplication.php:79 actions/editapplication.php:78
-#: actions/showapplication.php:90
 msgid "You are not the owner of this application."
 msgstr "No sou el propietari d'aquesta aplicació."
 
 #. TRANS: Client error text when there is a problem with the session token.
-#: actions/deleteapplication.php:102 actions/editapplication.php:131
-#: actions/newapplication.php:112 actions/showapplication.php:113
-#: lib/action.php:1391
 msgid "There was a problem with your session token."
 msgstr "S'ha produït un problema amb el testimoni de la vostra sessió."
 
 #. TRANS: Title for delete application page.
 #. TRANS: Fieldset legend on delete application page.
-#: actions/deleteapplication.php:124 actions/deleteapplication.php:149
 msgid "Delete application"
 msgstr "Elimina l'aplicació"
 
 #. TRANS: Confirmation text on delete application page.
-#: actions/deleteapplication.php:152
 msgid ""
 "Are you sure you want to delete this application? This will clear all data "
 "about the application from the database, including all existing user "
@@ -1986,55 +1556,45 @@ msgstr ""
 "existents."
 
 #. TRANS: Submit button title for 'No' when deleting an application.
-#: actions/deleteapplication.php:161
 msgid "Do not delete this application."
 msgstr "No eliminis l'aplicació."
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
-#: actions/deleteapplication.php:167
 msgid "Delete this application."
 msgstr "Elimina l'aplicació."
 
 #. TRANS: Client error when trying to delete group while not logged in.
-#: actions/deletegroup.php:64
 msgid "You must be logged in to delete a group."
 msgstr "Heu d'haver iniciat una sessió per eliminar un grup."
 
 #. TRANS: Client error when trying to delete a group without providing a nickname or ID for the group.
 #. TRANS: Client error displayed when trying to join a group without providing a group name or group ID.
 #. TRANS: Client error displayed when trying to leave a group without providing a group name or group ID.
-#: actions/deletegroup.php:94 actions/joingroup.php:89
-#: actions/leavegroup.php:89
 msgid "No nickname or ID."
 msgstr "Cap sobrenom o ID."
 
 #. TRANS: Client error when trying to delete a group without having the rights to delete it.
-#: actions/deletegroup.php:107
 msgid "You are not allowed to delete this group."
 msgstr "No teniu permisos per eliminar el grup."
 
 #. TRANS: Server error displayed if a group could not be deleted.
 #. TRANS: %s is the name of the group that could not be deleted.
-#: actions/deletegroup.php:150
 #, php-format
 msgid "Could not delete group %s."
 msgstr "No s'ha pogut eliminar el grup %s."
 
 #. TRANS: Message given after deleting a group.
 #. TRANS: %s is the deleted group's name.
-#: actions/deletegroup.php:159
 #, php-format
 msgid "Deleted group %s"
 msgstr "S'ha eliminat el grup %s"
 
 #. TRANS: Title of delete group page.
 #. TRANS: Form legend for deleting a group.
-#: actions/deletegroup.php:176 actions/deletegroup.php:202
 msgid "Delete group"
 msgstr "Elimina el grup"
 
 #. TRANS: Warning in form for deleleting a group.
-#: actions/deletegroup.php:206
 msgid ""
 "Are you sure you want to delete this group? This will clear all data about "
 "the group from the database, without a backup. Public posts to this group "
@@ -2045,12 +1605,10 @@ msgstr ""
 "grup encara apareixeran a les línies temporals individuals."
 
 #. TRANS: Submit button title for 'No' when deleting a group.
-#: actions/deletegroup.php:224
 msgid "Do not delete this group."
 msgstr "No eliminis el grup."
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
-#: actions/deletegroup.php:231
 msgid "Delete this group."
 msgstr "Elimina el grup."
 
@@ -2060,22 +1618,18 @@ msgstr "Elimina el grup."
 #. TRANS: Client error displayed trying to block a user from a group while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying to log out when not logged in.
+#. TRANS: Client error displayed when trying to access the "make admin" page while not logged in.
+#. TRANS: Client error displayed trying to create a new direct message while not logged in.
+#. TRANS: Client error displayed trying to send a notice while not logged in.
+#. TRANS: Client error displayed trying to nudge a user without being logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
 #. TRANS: Client error displayed when trying to change user options while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
-#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:70
-#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
-#: actions/nudge.php:63 actions/pluginenable.php:97 actions/subedit.php:33
-#: actions/subscribe.php:98 actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:71 lib/profileformaction.php:63
-#: lib/settingsaction.php:72
 msgid "Not logged in."
 msgstr "No heu iniciat una sessió."
 
 #. TRANS: Instructions for deleting a notice.
-#: actions/deletenotice.php:110
 msgid ""
 "You are about to permanently delete a notice. Once this is done, it cannot "
 "be undone."
@@ -2085,48 +1639,39 @@ msgstr ""
 
 #. TRANS: Page title when deleting a notice.
 #. TRANS: Fieldset legend for the delete notice form.
-#: actions/deletenotice.php:117 actions/deletenotice.php:148
 msgid "Delete notice"
 msgstr "Elimina l'avís"
 
 #. TRANS: Message for the delete notice form.
-#: actions/deletenotice.php:152
 msgid "Are you sure you want to delete this notice?"
 msgstr "Esteu segur que voleu eliminar aquest avís?"
 
 #. TRANS: Submit button title for 'No' when deleting a notice.
-#: actions/deletenotice.php:159
 msgid "Do not delete this notice."
 msgstr "No eliminis l'avís."
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:166
 msgid "Delete this notice."
 msgstr "Elimina l'avís."
 
 #. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
-#: actions/deleteuser.php:66
 msgid "You cannot delete users."
 msgstr "No podeu eliminar els usuaris."
 
 #. TRANS: Client error displayed when trying to delete a non-local user.
-#: actions/deleteuser.php:74
 msgid "You can only delete local users."
 msgstr "Només podeu eliminar usuaris locals."
 
 #. TRANS: Title of delete user page.
-#: actions/deleteuser.php:110
 msgctxt "TITLE"
 msgid "Delete user"
 msgstr "Elimina l'usuari"
 
 #. TRANS: Fieldset legend on delete user page.
-#: actions/deleteuser.php:134
 msgid "Delete user"
 msgstr "Elimina l'usuari"
 
 #. TRANS: Information text to request if a user is certain that the described action has to be performed.
-#: actions/deleteuser.php:138
 msgid ""
 "Are you sure you want to delete this user? This will clear all data about "
 "the user from the database, without a backup."
@@ -2135,97 +1680,78 @@ msgstr ""
 "l'usuari de la base de dades, sense cap còpia de seguretat."
 
 #. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/deleteuser.php:158
 msgid "Do not delete this user."
 msgstr "No eliminis l'usuari."
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
-#: actions/deleteuser.php:165
 msgid "Delete this user."
 msgstr "Elimina l'usuari."
 
 #. TRANS: Message used as title for design settings for the site.
-#: actions/designadminpanel.php:60 lib/settingsnav.php:97
 msgid "Design"
 msgstr "Disseny"
 
 #. TRANS: Instructions for design adminsitration panel.
-#: actions/designadminpanel.php:71
 msgid "Design settings for this StatusNet site"
 msgstr "Paràmetres de disseny d'aquest lloc StatusNet."
 
 #. TRANS: Client error displayed when a logo URL does is not valid.
-#: actions/designadminpanel.php:327
 msgid "Invalid logo URL."
 msgstr "L'URL del logotip no és vàlid."
 
 #. TRANS: Client error displayed when an SSL logo URL is invalid.
-#: actions/designadminpanel.php:333
 msgid "Invalid SSL logo URL."
 msgstr "L'URL SSL del logotip no és vàlid."
 
 #. TRANS: Client error displayed when a theme is submitted through the form that is not in the theme list.
 #. TRANS: %s is the chosen unavailable theme.
-#: actions/designadminpanel.php:339
 #, php-format
 msgid "Theme not available: %s."
 msgstr "Tema no disponible: %s."
 
 #. TRANS: Fieldset legend for form to change logo.
-#: actions/designadminpanel.php:437
 msgid "Change logo"
 msgstr "Canvia el logotip"
 
 #. TRANS: Field label for StatusNet site logo.
-#: actions/designadminpanel.php:444
 msgid "Site logo"
 msgstr "Logotip del lloc"
 
 #. TRANS: Field label for SSL StatusNet site logo.
-#: actions/designadminpanel.php:452
 msgid "SSL logo"
 msgstr "Logotip SSL"
 
 #. TRANS: Fieldset legend for form change StatusNet site's theme.
-#: actions/designadminpanel.php:467
 msgid "Change theme"
 msgstr "Canvia el tema"
 
 #. TRANS: Field label for dropdown to choose site theme.
-#: actions/designadminpanel.php:485
 msgid "Site theme"
 msgstr "Tema del lloc"
 
 #. TRANS: Title for field label for dropdown to choose site theme.
-#: actions/designadminpanel.php:487
 msgid "Theme for the site."
 msgstr "Tema del lloc."
 
 #. TRANS: Field label for uploading a cutom theme.
-#: actions/designadminpanel.php:494
 msgid "Custom theme"
 msgstr "Tema personalitzat"
 
 #. TRANS: Form instructions for uploading a cutom StatusNet theme.
-#: actions/designadminpanel.php:499
 msgid "You can upload a custom StatusNet theme as a .ZIP archive."
 msgstr "Podeu pujar un tema personalitzat de l'StatusNet amb un arxiu ZIP."
 
 #. TRANS: Fieldset legend for theme background image.
-#: actions/designadminpanel.php:515
 msgid "Change background image"
 msgstr "Canvia la imatge de fons"
 
 #. TRANS: Field label for background image on theme designer page.
 #. TRANS: Field label for background color selector.
 #. TRANS: Label on profile design page for setting a profile page background colour.
-#: actions/designadminpanel.php:525 actions/designadminpanel.php:609
-#: lib/designform.php:238
 msgid "Background"
 msgstr "Fons"
 
 #. TRANS: Form guide for background image upload form on theme designer page.
-#: actions/designadminpanel.php:531
 #, php-format
 msgid ""
 "You can upload a background image for the site. The maximum file size is %1"
@@ -2234,197 +1760,162 @@ msgstr ""
 "Podeu pujar una imatge de fons per al lloc. La mida màxima de fitxer és %1$s."
 
 #. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:558
 msgid "On"
 msgstr "Activada"
 
 #. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:575
 msgid "Off"
 msgstr "Desactivada"
 
 #. TRANS: Form guide for turning background image on or off on theme designer page.
 #. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
 #. TRANS: use of the uploaded profile image.
-#: actions/designadminpanel.php:577 lib/designform.php:214
 msgid "Turn background image on or off."
 msgstr "Activa o desactiva la imatge de fons."
 
 #. TRANS: Checkbox label to title background image on theme designer page.
 #. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-#: actions/designadminpanel.php:583 lib/designform.php:220
 msgid "Tile background image"
 msgstr "Posa en mosaic la imatge de fons"
 
 #. TRANS: Fieldset legend for theme colors.
-#: actions/designadminpanel.php:598
 msgid "Change colors"
 msgstr "Canvia els colors"
 
 #. TRANS: Field label for content color selector.
 #. TRANS: Label on profile design page for setting a profile page content colour.
-#: actions/designadminpanel.php:623 lib/designform.php:252
 msgid "Content"
 msgstr "Contingut"
 
 #. TRANS: Field label for sidebar color selector.
 #. TRANS: Label on profile design page for setting a profile page sidebar colour.
-#: actions/designadminpanel.php:637 lib/designform.php:266
 msgid "Sidebar"
 msgstr "Barra lateral"
 
 #. TRANS: Field label for text color selector.
 #. TRANS: Label on profile design page for setting a profile page text colour.
-#: actions/designadminpanel.php:651 lib/designform.php:280
 msgid "Text"
 msgstr "Text"
 
 #. TRANS: Field label for link color selector.
 #. TRANS: Label on profile design page for setting a profile page links colour.
-#: actions/designadminpanel.php:665 lib/designform.php:294
 msgid "Links"
 msgstr "Enllaços"
 
 #. TRANS: Fieldset legend for advanced theme design settings.
-#: actions/designadminpanel.php:691
 msgid "Advanced"
 msgstr "Avançat"
 
 #. TRANS: Field label for custom CSS.
-#: actions/designadminpanel.php:696
 msgid "Custom CSS"
 msgstr "CSS personalitzat"
 
 #. TRANS: Button text for resetting theme settings.
-#: actions/designadminpanel.php:718
 msgctxt "BUTTON"
 msgid "Use defaults"
 msgstr "Utilitza els paràmetres per defecte"
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:720
 msgid "Restore default designs."
 msgstr "Restaura els dissenys per defecte."
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:728
 msgid "Reset back to default."
 msgstr "Torna a restaurar els paràmetres per defecte."
 
 #. TRANS: Title for button for saving theme settings.
-#: actions/designadminpanel.php:736
 msgid "Save design."
 msgstr "Desa el disseny."
 
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
-#: actions/disfavor.php:83
 msgid "This notice is not a favorite!"
 msgstr "Aquesta avís no és un preferit!"
 
 #. TRANS: Title for page on which favorites can be added.
-#: actions/disfavor.php:98
 msgid "Add to favorites"
 msgstr "Afegeix als preferits"
 
 #. TRANS: Client exception thrown when requesting a document from the documentation that does not exist.
 #. TRANS: %s is the non-existing document.
-#: actions/doc.php:155
 #, php-format
 msgid "No such document \"%s\"."
 msgstr "No existeix el document «%s»"
 
 #. TRANS: Title for "Edit application" form.
 #. TRANS: Form legend.
-#: actions/editapplication.php:54 lib/applicationeditform.php:129
 msgid "Edit application"
 msgstr "Edita l'aplicació"
 
 #. TRANS: Client error displayed trying to edit an application while not logged in.
-#: actions/editapplication.php:66
 msgid "You must be logged in to edit an application."
 msgstr "Heu d'iniciar una sessió per editar una aplicació."
 
 #. TRANS: Client error displayed trying to edit an application that does not exist.
-#: actions/editapplication.php:83 actions/showapplication.php:83
 msgid "No such application."
 msgstr "No hi ha tal aplicació."
 
 #. TRANS: Instructions for "Edit application" form.
-#: actions/editapplication.php:167
 msgid "Use this form to edit your application."
 msgstr "Utilitza el formulari per editar la vostra aplicació."
 
 #. TRANS: Validation error shown when not providing a name in the "Edit application" form.
 #. TRANS: Validation error shown when not providing a name in the "New application" form.
-#: actions/editapplication.php:184 actions/newapplication.php:164
 msgid "Name is required."
 msgstr "Cal un nom."
 
 #. 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.
-#: actions/editapplication.php:188 actions/newapplication.php:172
 msgid "Name is too long (maximum 255 characters)."
 msgstr "El nom és massa llarg (màx. 255 caràcters)."
 
 #. TRANS: Validation error shown when providing a name for an application that already exists in the "Edit application" form.
 #. TRANS: Validation error shown when providing a name for an application that already exists in the "New application" form.
-#: actions/editapplication.php:192 actions/newapplication.php:168
 msgid "Name already in use. Try another one."
 msgstr "El nom ja es troba en ús. Proveu-ne un altre."
 
 #. TRANS: Validation error shown when not providing a description in the "Edit application" form.
 #. TRANS: Validation error shown when not providing a description in the "New application" form.
-#: actions/editapplication.php:196 actions/newapplication.php:176
 msgid "Description is required."
 msgstr "Cal una descripció."
 
 #. TRANS: Validation error shown when providing too long a source URL in the "Edit application" form.
-#: actions/editapplication.php:209
 msgid "Source URL is too long."
 msgstr "L'URL font és massa llarg."
 
 #. TRANS: Validation error shown when providing an invalid source URL in the "Edit application" form.
 #. TRANS: Validation error shown when providing an invalid source URL in the "New application" form.
-#: actions/editapplication.php:216 actions/newapplication.php:199
 msgid "Source URL is not valid."
 msgstr "La URL d'origen no és vàlida."
 
 #. 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.
-#: actions/editapplication.php:220 actions/newapplication.php:203
 msgid "Organization is required."
 msgstr "Cal una organització."
 
 #. TRANS: Validation error shown when providing too long an arganisation name in the "Edit application" form.
-#: actions/editapplication.php:224 actions/newapplication.php:207
 msgid "Organization is too long (maximum 255 characters)."
 msgstr "El camp organització és massa llarg (màx. 255 caràcters)."
 
 #. TRANS: Form validation error show when an organisation name has not been provided in the edit application form.
 #. TRANS: Form validation error show when an organisation name has not been provided in the new application form.
-#: actions/editapplication.php:228 actions/newapplication.php:211
 msgid "Organization homepage is required."
 msgstr "Cal una pàgina d'inici de l'organització."
 
 #. TRANS: Validation error shown when providing too long a callback URL in the "Edit application" form.
 #. TRANS: Validation error shown when providing too long a callback URL in the "New application" form.
-#: actions/editapplication.php:239 actions/newapplication.php:225
 msgid "Callback is too long."
 msgstr "La crida de retorn és massa llarga."
 
 #. TRANS: Validation error shown when providing an invalid callback URL in the "Edit application" form.
 #. TRANS: Validation error shown when providing an invalid callback URL in the "New application" form.
-#: actions/editapplication.php:247 actions/newapplication.php:235
 msgid "Callback URL is not valid."
 msgstr "L'URL de la crida de retorn no és vàlid."
 
 #. TRANS: Server error occuring when an application could not be updated from the "Edit application" form.
-#: actions/editapplication.php:284
 msgid "Could not update application."
 msgstr "No s'ha pogut actualitzar l'aplicació."
 
 #. TRANS: Title for form to edit a group. %s is a group nickname.
-#: actions/editgroup.php:55
 #, php-format
 msgid "Edit %s group"
 msgstr "Edita el grup %s"
@@ -2432,40 +1923,40 @@ msgstr "Edita el grup %s"
 #. TRANS: Client error displayed trying to edit a group while not logged in.
 #. TRANS: Client error displayed when trying to create a group while not logged in.
 #. TRANS: Client error displayed trying to create a group while not logged in.
-#: actions/editgroup.php:68 actions/grouplogo.php:69 actions/newgroup.php:65
 msgid "You must be logged in to create a group."
 msgstr "Heu d'haver iniciat una sessió per crear un grup."
 
 #. TRANS: Form instructions for group edit form.
-#: actions/editgroup.php:161
 msgid "Use this form to edit the group."
 msgstr "Utilitza aquest formulari per editar el grup."
 
+#. TRANS: Group edit form validation error.
+#. TRANS: Group create form validation error.
+#. TRANS: %s is the invalid alias.
+#, php-format
+msgid "Invalid alias: \"%s\""
+msgstr "L'àlies no és vàlid «%s»"
+
 #. TRANS: Group edit form success message.
-#: actions/editgroup.php:301
 msgid "Options saved."
 msgstr "Configuració guardada."
 
 #. TRANS: Title for e-mail settings.
-#: actions/emailsettings.php:60
 msgid "Email settings"
 msgstr "Paràmetres del correu electrònic"
 
 #. TRANS: E-mail settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/emailsettings.php:74
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 msgstr "Gestioneu com rebeu correu de %%site.name%%."
 
 #. TRANS: Form legend for e-mail settings form.
 #. TRANS: Field label for e-mail address input in e-mail settings form.
-#: actions/emailsettings.php:104 actions/emailsettings.php:130
 msgid "Email address"
 msgstr "Adreça de correu electrònic"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:110
 msgid "Current confirmed email address."
 msgstr "Adreça electrònica confirmada actualment."
 
@@ -2474,15 +1965,11 @@ msgstr "Adreça electrònica confirmada actualment."
 #. TRANS: Button label to remove a confirmed IM address.
 #. TRANS: Button label to remove a confirmed SMS address.
 #. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
-#: actions/emailsettings.php:113 actions/emailsettings.php:180
-#: actions/imsettings.php:119 actions/smssettings.php:119
-#: actions/smssettings.php:175
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Elimina"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:120
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -2495,44 +1982,36 @@ msgstr ""
 #. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
 #. TRANS: Any other domain may be owned by a legitimate person or
 #. TRANS: organization.
-#: actions/emailsettings.php:137
 msgid "Email address, like \"UserName@example.org\""
 msgstr "Adreça electrònica, com ara «nomusuari@example.org»"
 
 #. TRANS: Button label for adding an e-mail address in e-mail settings form.
 #. TRANS: Button label for adding an IM address in IM settings form.
 #. TRANS: Button label for adding a SMS phone number in SMS settings form.
-#: actions/emailsettings.php:141 actions/imsettings.php:147
-#: actions/smssettings.php:157
 msgctxt "BUTTON"
 msgid "Add"
 msgstr "Afegeix"
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:149 actions/smssettings.php:166
 msgid "Incoming email"
 msgstr "Correu electrònic entrant"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:155
 msgid "I want to post notices by email."
 msgstr "Vull publicar avisos amb el correu electrònic."
 
 #. TRANS: Form instructions for incoming e-mail form in e-mail settings.
 #. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
-#: actions/emailsettings.php:177 actions/smssettings.php:173
 msgid "Send email to this address to post new notices."
 msgstr "Envia correu electrònic a aquesta adreça per publicar nous avisos."
 
 #. TRANS: Instructions for incoming e-mail address input form, when an address has already been assigned.
 #. TRANS: Instructions for incoming SMS e-mail address input form.
-#: actions/emailsettings.php:186 actions/smssettings.php:181
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr "Estableix una nova adreça electrònica d'enviament; cancel·la l'antiga."
 
 #. TRANS: Instructions for incoming e-mail address input form.
-#: actions/emailsettings.php:190
 msgid ""
 "To send notices via email, we need to create a unique email address for you "
 "on this server:"
@@ -2542,89 +2021,71 @@ msgstr ""
 
 #. TRANS: Button label for adding an e-mail address to send notices from.
 #. TRANS: Button label for adding an SMS e-mail address to send notices from.
-#: actions/emailsettings.php:196 actions/smssettings.php:184
 msgctxt "BUTTON"
 msgid "New"
 msgstr "Nou"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:205
 msgid "Email preferences"
 msgstr "Preferències del correu electrònic"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:213
 msgid "Send me notices of new subscriptions through email."
 msgstr "Envia'm avisos per correu electrònic quan algú nou se'm subscrigui."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:219
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr ""
 "Envia'm un correu electrònic quan algú afegeixi un avís meu com a preferit."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:226
 msgid "Send me email when someone sends me a private message."
 msgstr "Envia'm un correu electrònic quan algú m'envii un missatge privat."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:232
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr "Envia'm un correu electrònic quan algú m'enviï una resposta amb @."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:238
 msgid "Allow friends to nudge me and send me an email."
 msgstr ""
 "Permetre que els amics em cridin l'atenció i m'enviïn un correu electrònic."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:244
 msgid "Publish a MicroID for my email address."
 msgstr "Publica una MicroID per al meu correu electrònic."
 
 #. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:362
 msgid "Email preferences saved."
 msgstr "S'han desat les preferències del correu electrònic."
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:381
 msgid "No email address."
 msgstr "No hi ha cap adreça electrònica."
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:389
 msgid "Cannot normalize that email address."
 msgstr "No es pot normalitzar l'adreça electrònica."
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:394 actions/register.php:197
-#: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "Adreça de correu electrònic no vàlida."
 
 #. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:398
 msgid "That is already your email address."
 msgstr "Ja és la vostra adreça electrònica."
 
 #. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:402
 msgid "That email address already belongs to another user."
 msgstr "L'adreça electrònica ja pertany a un altre usuari."
 
 #. TRANS: Server error thrown on database error adding e-mail confirmation code.
 #. TRANS: Server error thrown on database error adding Instant Messaging confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:419 actions/imsettings.php:362
-#: actions/smssettings.php:364
 msgid "Could not insert confirmation code."
 msgstr "No s'ha pogut inserir el codi de confirmació."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:426
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
@@ -2636,101 +2097,81 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling Instant Messaging address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:446 actions/imsettings.php:391
-#: actions/smssettings.php:398
 msgid "No pending confirmation to cancel."
 msgstr "Cap confirmació pendent per cancel·lar."
 
 #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:451
 msgid "That is the wrong email address."
 msgstr "Aquesta l'adreça de correu electrònic incorrecta."
 
 #. TRANS: Server error thrown on database error canceling e-mail address confirmation.
 #. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
-#: actions/emailsettings.php:460 actions/smssettings.php:412
 msgid "Could not delete email confirmation."
 msgstr "No s'ha pogut eliminar la confirmació de correu electrònic."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:465
 msgid "Email confirmation cancelled."
 msgstr "S'ha cancel·lat la confirmació de correu electrònic."
 
 #. TRANS: Message given trying to remove an e-mail address that is not
 #. TRANS: registered for the active user.
-#: actions/emailsettings.php:484
 msgid "That is not your email address."
 msgstr "Aquest no és el teu correu electrònic"
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:505
 msgid "The email address was removed."
 msgstr "S'ha eliminat l'adreça de correu electrònic."
 
 #. TRANS: Form validation error displayed when trying to remove an incoming e-mail address while no address has been set.
-#: actions/emailsettings.php:519 actions/smssettings.php:554
 msgid "No incoming email address."
 msgstr "No hi ha cap direcció de correu electrònic entrant."
 
 #. 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.
-#: actions/emailsettings.php:531 actions/emailsettings.php:555
-#: actions/smssettings.php:565 actions/smssettings.php:590
 msgid "Could not update user record."
 msgstr "No s'ha pogut actualitzar el registre de l'usuari."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
 #. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:535 actions/smssettings.php:569
 msgid "Incoming email address removed."
 msgstr "Eliminat el correu electrònic entrant."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
 #. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:559 actions/smssettings.php:594
 msgid "New incoming email address added."
 msgstr "Nou correu electrònic entrant afegit."
 
 #. TRANS: Client error displayed when trying to mark a notice as favorite that already is a favorite.
-#: actions/favor.php:80
 msgid "This notice is already a favorite!"
 msgstr "Aquest avís ja és un preferit."
 
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
-#: actions/favor.php:95
 msgid "Disfavor favorite."
 msgstr "Fes que deixi de ser preferit."
 
 #. TRANS: Page title for first page of favorited notices.
 #. TRANS: Title for favourited notices section.
-#: actions/favorited.php:65 lib/popularnoticesection.php:62
-#: lib/publicgroupnav.php:93
 msgid "Popular notices"
 msgstr "Avisos populars"
 
 #. TRANS: Page title for all but first page of favorited notices.
 #. TRANS: %d is the page number being displayed.
-#: actions/favorited.php:69
 #, php-format
 msgid "Popular notices, page %d"
 msgstr "Avisos populars, pàgina %d"
 
 #. TRANS: Description on page displaying favorited notices.
-#: actions/favorited.php:81
 msgid "The most popular notices on the site right now."
 msgstr "Els avisos més populars en aquest lloc ara mateix."
 
 #. TRANS: Text displayed instead of a list when a site does not yet have any favourited notices.
-#: actions/favorited.php:149
 msgid "Favorite notices appear on this page but no one has favorited one yet."
 msgstr ""
 "Els avisos de preferits apareixen en aquesta pàgina però ningú n'ha preferit "
 "cap encara."
 
 #. TRANS: Additional text displayed instead of a list when a site does not yet have any favourited notices for logged in users.
-#: actions/favorited.php:153
 msgid ""
 "Be the first to add a notice to your favorites by clicking the fave button "
 "next to any notice you like."
@@ -2740,7 +2181,6 @@ msgstr ""
 
 #. TRANS: Additional text displayed instead of a list when a site does not yet have any favourited notices for not logged in users.
 #. TRANS: %%action.register%% is a registration link. "[link text](link)" is Mark Down. Do not change the formatting.
-#: actions/favorited.php:158
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to add a "
@@ -2753,181 +2193,146 @@ msgstr ""
 #. TRANS: %s is a user's nickname.
 #. TRANS: Title for first page of favourite notices of a user.
 #. TRANS: %s is the user for whom the favourite notices are displayed.
-#: actions/favoritesrss.php:111 actions/showfavorites.php:76
-#: lib/personalgroupnav.php:110
 #, php-format
 msgid "%s's favorite notices"
 msgstr "Avisos preferits de %s"
 
 #. TRANS: Desciption of RSS feed with favourite notices of a user.
 #. TRANS: %1$s is a user's nickname, %2$s is the name of the StatusNet site.
-#: actions/favoritesrss.php:117
 #, php-format
 msgid "Updates favored by %1$s on %2$s!"
 msgstr "Actualitzacions preferides per %1$s a %2$s!"
 
 #. TRANS: Page title for first page of featured users.
 #. TRANS: Title for featured users section.
-#: actions/featured.php:69 lib/featureduserssection.php:87
-#: lib/publicgroupnav.php:89
 msgid "Featured users"
 msgstr "Usuaris destacats"
 
 #. TRANS: Page title for all but first page of featured users.
 #. TRANS: %d is the page number being displayed.
-#: actions/featured.php:73
 #, php-format
 msgid "Featured users, page %d"
 msgstr "Usuaris destacats, pàgina %d"
 
 #. TRANS: Description on page displaying featured users.
-#: actions/featured.php:102
 #, php-format
 msgid "A selection of some great users on %s."
 msgstr "Una selecció d'alguns dels millors usuaris a %s."
 
 #. TRANS: Client error displayed when no notice ID was given trying do display a file.
-#: actions/file.php:36
 msgid "No notice ID."
 msgstr "Cap ID d'avís."
 
 #. TRANS: Client error displayed when an invalid notice ID was given trying do display a file.
-#: actions/file.php:41
 msgid "No notice."
 msgstr "Cap avís."
 
 #. TRANS: Client error displayed when trying do display a file for a notice without a file attachement.
-#: actions/file.php:46
 msgid "No attachments."
 msgstr "Cap adjunció."
 
 #. TRANS: Client error displayed when trying do display a file for a notice with file attachements
 #. TRANS: that could not be found.
-#: actions/file.php:58
 msgid "No uploaded attachments."
 msgstr "No s'ha pujat cap adjunt."
 
 #. TRANS: Client error displayed when subscribing to a remote profile and an unexpected response is received.
-#: actions/finishremotesubscribe.php:69
 msgid "Not expecting this response!"
 msgstr "Resposta inesperada!"
 
 #. TRANS: Client error displayed when subscribing to a remote profile that does not exist.
-#: actions/finishremotesubscribe.php:81
 msgid "User being listened to does not exist."
 msgstr "L'usuari que s'escolta no existeix."
 
 #. TRANS: Client error displayed when subscribing to a remote profile that is a local profile.
-#: actions/finishremotesubscribe.php:89 actions/remotesubscribe.php:58
 msgid "You can use the local subscription!"
 msgstr "Podeu utilitzar la subscripció local!"
 
 #. TRANS: Client error displayed when subscribing to a remote profile that is blocked form subscribing to.
-#: actions/finishremotesubscribe.php:102
 msgid "That user has blocked you from subscribing."
 msgstr "Aquest usuari t'ha bloquejat com a subscriptor."
 
 #. TRANS: Client error displayed when subscribing to a remote profile without providing an authorised token.
-#: actions/finishremotesubscribe.php:114
 msgid "You are not authorized."
 msgstr "No esteu autoritzat."
 
 #. TRANS: Client error displayed when subscribing to a remote profile and conversion of the request token to access token fails.
-#: actions/finishremotesubscribe.php:118
 msgid "Could not convert request token to access token."
 msgstr "No s'ha pogut convertir el testimoni de sol·licitud a un d'accés."
 
 #. TRANS: Client error displayed when subscribing to a remote profile fails because of an unsupported version of the OMB protocol.
-#: actions/finishremotesubscribe.php:124
 msgid "Remote service uses unknown version of OMB protocol."
 msgstr "El servei remot utilitza una versió desconeguda del protocol OMB."
 
 #. TRANS: Server error displayed when subscribing to a remote profile fails because the remote profile could not be updated.
-#: actions/finishremotesubscribe.php:145 lib/oauthstore.php:317
 msgid "Error updating remote profile."
 msgstr "S'ha produït un error en actualitzar el perfil remot."
 
 #. TRANS: Client error displayed when requesting a non-existent file.
-#: actions/getfile.php:77
 msgid "No such file."
 msgstr "No existeix el fitxer."
 
 #. TRANS: Client error displayed when requesting a file without having read access to it.
-#: actions/getfile.php:82
 msgid "Cannot read file."
 msgstr "No es pot llegir el fitxer."
 
 #. TRANS: Client error displayed when trying to assign an invalid role to a user.
-#: actions/grantrole.php:61 actions/revokerole.php:62
 msgid "Invalid role."
 msgstr "Rol no vàlid."
 
 #. TRANS: Client error displayed when trying to assign an reserved role to a user.
-#: actions/grantrole.php:66 actions/revokerole.php:66
 msgid "This role is reserved and cannot be set."
 msgstr "Aquest rol està reservat i no pot definir-se."
 
 #. TRANS: Client error displayed when trying to assign a role to a user while not being allowed to set roles.
-#: actions/grantrole.php:76
 msgid "You cannot grant user roles on this site."
 msgstr "No podeu establir rols d'usuari en aquest lloc."
 
 #. TRANS: Client error displayed when trying to assign a role to a user that already has that role.
-#: actions/grantrole.php:84
 msgid "User already has this role."
 msgstr "L'usuari ja té aquest rol."
 
 #. TRANS: Client error displayed trying to block a user from a group while not specifying a to be blocked user profile.
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing a profile.
+#. TRANS: Client error displayed when not providing a profile ID on the Make Admin page.
 #. TRANS: Client error displayed trying a change a subscription without providing a profile.
 #. TRANS: Client error displayed when trying to change user options without specifying a user to work on.
-#: actions/groupblock.php:71 actions/groupunblock.php:71
-#: actions/makeadmin.php:71 actions/subedit.php:49
-#: lib/profileformaction.php:79
 msgid "No profile specified."
 msgstr "No s'ha especificat cap perfil."
 
 #. TRANS: Client error displayed trying to block a user from a group while specifying a non-existing profile.
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing an existing profile.
+#. TRANS: Client error displayed when specifying an invalid profile ID on the Make Admin page.
 #. TRANS: Client error displayed trying a change a subscription for a non-existant profile ID.
 #. TRANS: Client error displayed when trying to change user options without specifying an existing user to work on.
-#: actions/groupblock.php:77 actions/groupunblock.php:77
-#: actions/makeadmin.php:76 actions/subedit.php:57 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:87
 msgid "No profile with that ID."
 msgstr "No hi ha cap perfil amb aquesta ID."
 
 #. TRANS: Client error displayed trying to block a user from a group while not specifying a group to block a profile from.
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing a group.
-#: actions/groupblock.php:83 actions/groupunblock.php:83
-#: actions/makeadmin.php:81
+#. TRANS: Client error displayed when not providing a group ID on the Make Admin page.
 msgid "No group specified."
 msgstr "No s'ha especificat cap grup."
 
 #. TRANS: Client error displayed trying to block a user from a group while not being an admin user.
-#: actions/groupblock.php:95
 msgid "Only an admin can block group members."
 msgstr "Només un administrador pot blocar membres del grup."
 
 #. TRANS: Client error displayed trying to block a user from a group while user is already blocked from the given group.
-#: actions/groupblock.php:100
 msgid "User is already blocked from group."
 msgstr "L'usuari ja està blocat del grup."
 
 #. TRANS: Client error displayed trying to block a user from a group while user is not a member of given group.
-#: actions/groupblock.php:106
 msgid "User is not a member of group."
 msgstr "L'usuari no és membre del grup."
 
 #. TRANS: Title for block user from group page.
 #. TRANS: Form legend for form to block user from a group.
-#: actions/groupblock.php:141 actions/groupmembers.php:364
 msgid "Block user from group"
 msgstr "Bloca l'usuari del grup"
 
 #. TRANS: Explanatory text for block user from group form before setting the block.
 #. TRANS: %1$s is that to be blocked user, %2$s is the group the user will be blocked from.
-#: actions/groupblock.php:169
 #, php-format
 msgid ""
 "Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They "
@@ -2938,38 +2343,31 @@ msgstr ""
 "grup, i no podrà enviar-hi res ni subscriure-s'hi en el futur."
 
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
-#: actions/groupblock.php:191
 msgid "Do not block this user from this group."
 msgstr "No bloquis l'usuari del grup."
 
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
-#: actions/groupblock.php:198
 msgid "Block this user from this group."
 msgstr "Bloca l'usuari del grup."
 
 #. TRANS: Server error displayed when trying to block a user from a group fails because of an application error.
-#: actions/groupblock.php:215
 msgid "Database error blocking user from group."
 msgstr "S'ha produït un error en la base de dades en blocar l'usuari del grup."
 
 #. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
 #. TRANS: Client error displayed trying to find a user by ID without providing an ID.
-#: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr "Sense ID."
 
 #. TRANS: Client error displayed trying to change group design settings while not logged in.
-#: actions/groupdesignsettings.php:67
 msgid "You must be logged in to edit a group."
 msgstr "Heu d'iniciar una sessió per editar un grup."
 
 #. TRANS: Title group design settings page.
-#: actions/groupdesignsettings.php:146
 msgid "Group design"
 msgstr "Disseny de grup"
 
 #. TRANS: Instructions for group design settings page.
-#: actions/groupdesignsettings.php:157
 msgid ""
 "Customize the way your group looks with a background image and a colour "
 "palette of your choice."
@@ -2978,24 +2376,20 @@ msgstr ""
 "de colors de la vostra elecció."
 
 #. TRANS: Form validation error displayed when group design settings could not be updated because of an application issue.
-#: actions/groupdesignsettings.php:262
 msgid "Unable to update your design settings."
 msgstr "No s'han pogut actualitzar els paràmetres de disseny."
 
 #. TRANS: Form text to confirm saved group design settings.
-#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:239
 msgid "Design preferences saved."
 msgstr "S'han desat les preferències de disseny."
 
 #. TRANS: Title for group logo settings page.
 #. TRANS: Group logo form legend.
-#: actions/grouplogo.php:144 actions/grouplogo.php:199
 msgid "Group logo"
 msgstr "Logo del grup"
 
 #. TRANS: Instructions for group logo page.
 #. TRANS: %s is the maximum file size for that site.
-#: actions/grouplogo.php:156
 #, php-format
 msgid ""
 "You can upload a logo image for your group. The maximum file size is %s."
@@ -3004,98 +2398,81 @@ msgstr ""
 "fitxer és %s."
 
 #. TRANS: Submit button for uploading a group logo.
-#: actions/grouplogo.php:243
 msgid "Upload"
 msgstr "Puja"
 
 #. TRANS: Button text for cropping an uploaded group logo.
-#: actions/grouplogo.php:299
 msgid "Crop"
 msgstr "Retalla"
 
 #. TRANS: Form instructions on the group logo page.
-#: actions/grouplogo.php:376
 msgid "Pick a square area of the image to be the logo."
 msgstr "Trieu una àrea quadrada de la imatge perquè en sigui el logotip."
 
 #. TRANS: Form success message after updating a group logo.
-#: actions/grouplogo.php:411
 msgid "Logo updated."
 msgstr "Logo actualitzat."
 
 #. TRANS: Form failure message after failing to update a group logo.
-#: actions/grouplogo.php:414
 msgid "Failed updating logo."
 msgstr "Error en actualitzar logo."
 
 #. TRANS: Title of the page showing group members.
 #. TRANS: %s is the name of the group.
-#: actions/groupmembers.php:104
 #, php-format
 msgid "%s group members"
 msgstr "%s membre/s en el grup"
 
 #. TRANS: Title of the page showing group members.
 #. TRANS: %1$s is the name of the group, %2$d is the page number of the members list.
-#: actions/groupmembers.php:109
 #, php-format
 msgid "%1$s group members, page %2$d"
 msgstr "%1$s membres del grup, pàgina %2$d"
 
 #. TRANS: Page notice for group members page.
-#: actions/groupmembers.php:125
 msgid "A list of the users in this group."
 msgstr "La llista dels usuaris d'aquest grup."
 
 #. TRANS: Indicator in group members list that this user is a group administrator.
-#: actions/groupmembers.php:190 lib/action.php:581
 msgid "Admin"
 msgstr "Admin"
 
 #. TRANS: Button text for the form that will block a user from a group.
-#: actions/groupmembers.php:397
 msgctxt "BUTTON"
 msgid "Block"
 msgstr "Bloca"
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:401
 msgctxt "TOOLTIP"
 msgid "Block this user"
 msgstr "Bloca aquest usuari"
 
 #. TRANS: Form legend for form to make a user a group admin.
-#: actions/groupmembers.php:488
 msgid "Make user an admin of the group"
 msgstr "Fes l'usuari un administrador del grup"
 
 #. TRANS: Button text for the form that will make a user administrator.
-#: actions/groupmembers.php:521
 msgctxt "BUTTON"
 msgid "Make Admin"
 msgstr "Fes-lo administrador"
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:525
 msgctxt "TOOLTIP"
 msgid "Make this user an admin"
 msgstr "Fes aquest usuari administrador"
 
 #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
-#: actions/grouprss.php:141
 #, php-format
 msgid "Updates from members of %1$s on %2$s!"
 msgstr "Actualitzacions dels membres de %1$s el %2$s!"
 
 #. TRANS: Title for first page of the groups list.
-#: actions/groups.php:62
 msgctxt "TITLE"
 msgid "Groups"
 msgstr "Grups"
 
 #. TRANS: Title for all but the first page of the groups list.
 #. TRANS: %d is the page number.
-#: actions/groups.php:66
 #, php-format
 msgctxt "TITLE"
 msgid "Groups, page %d"
@@ -3104,7 +2481,6 @@ msgstr "Grups, pàgina %d"
 #. TRANS: Page notice of group list. %%%%site.name%%%% is the StatusNet site name,
 #. TRANS: %%%%action.groupsearch%%%% and %%%%action.newgroup%%%% are URLs. Do not change them.
 #. TRANS: This message contains Markdown links in the form [link text](link).
-#: actions/groups.php:95
 #, php-format
 msgid ""
 "%%%%site.name%%%% groups let you find and talk with people of similar "
@@ -3120,12 +2496,10 @@ msgstr ""
 "un de propi!](%%%%action.newgroup%%%%)!"
 
 #. TRANS: Link to create a new group on the group list page.
-#: actions/groups.php:113 actions/usergroups.php:126 lib/groupeditform.php:115
 msgid "Create a new group"
 msgstr "Crea un grup nou"
 
 #. TRANS: Instructions for page where groups can be searched. %%site.name%% is the name of the StatusNet site.
-#: actions/groupsearch.php:53
 #, php-format
 msgid ""
 "Search for groups on %%site.name%% by their name, location, or description. "
@@ -3135,21 +2509,17 @@ msgstr ""
 "termes de cerca amb espais; han de contenir com a mínim 3 caràcters."
 
 #. TRANS: Title for page where groups can be searched.
-#: actions/groupsearch.php:60
 msgid "Group search"
 msgstr "Cerca de grups"
 
 #. TRANS: Text on page where groups can be searched if no results were found for a query.
 #. TRANS: Text for notice search results is the query had no results.
 #. TRANS: Message on the "People search" page where a query has no results.
-#: actions/groupsearch.php:82 actions/noticesearch.php:122
-#: actions/peoplesearch.php:87
 msgid "No results."
 msgstr "Cap resultat."
 
 #. TRANS: Additional text on page where groups can be searched if no results were found for a query for a logged in user.
 #. TRANS: This message contains Markdown links in the form [link text](link).
-#: actions/groupsearch.php:87
 #, php-format
 msgid ""
 "If you cannot find the group you're looking for, you can [create it](%%"
@@ -3160,7 +2530,6 @@ msgstr ""
 
 #. TRANS: Additional text on page where groups can be searched if no results were found for a query for a not logged in user.
 #. TRANS: This message contains Markdown links in the form [link text](link).
-#: actions/groupsearch.php:92
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and [create the group](%%"
@@ -3170,30 +2539,25 @@ msgstr ""
 "un grup](%%action.newgroup%%)!"
 
 #. TRANS: Client error displayed when trying to unblock a user from a group without being an administrator for the group.
-#: actions/groupunblock.php:95
 msgid "Only an admin can unblock group members."
 msgstr "Només un administrador pot desblocar els membres del grup."
 
 #. TRANS: Client error displayed when trying to unblock a non-blocked user from a group.
-#: actions/groupunblock.php:100
 msgid "User is not blocked from group."
 msgstr "L'usuari no està blocat del grup."
 
 #. TRANS: Server error displayed when unblocking a user from a group fails because of an unknown error.
 #. TRANS: Server error displayed when removing a user block.
-#: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "S'ha produït un error en eliminar el bloc."
 
 #. TRANS: Title for Instant Messaging settings.
-#: actions/imsettings.php:56
 msgid "IM settings"
 msgstr "Paràmetres de missatgeria instantània"
 
 #. 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.
-#: actions/imsettings.php:69
 #, fuzzy, php-format
 msgid ""
 "You can send and receive notices through instant messaging [instant messages]"
@@ -3203,18 +2567,15 @@ msgstr ""
 "de Jabber/GTalk. Configureu la vostra adreça i opcions a continuació."
 
 #. TRANS: Message given in the IM settings if IM is not enabled on the site.
-#: actions/imsettings.php:90
 msgid "IM is not available."
 msgstr "La MI no és disponible."
 
-#: actions/imsettings.php:116
 #, fuzzy, php-format
 msgid "Current confirmed %s address."
 msgstr "Adreça electrònica confirmada actualment."
 
 #. TRANS: Form note in IM settings form.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:128
 #, fuzzy, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your %s account for a message "
@@ -3224,35 +2585,29 @@ msgstr ""
 "de Jabber/GTalk si hi ha un missatge amb més instruccions. (Heu afegit a %s "
 "a la llista d'amics?)"
 
-#: actions/imsettings.php:140
 msgid "IM address"
 msgstr "Adreça de missatgeria instantània"
 
-#: actions/imsettings.php:142
 #, php-format
 msgid "%s screenname."
 msgstr ""
 
 #. TRANS: Header for IM preferences form.
-#: actions/imsettings.php:163
 #, fuzzy
 msgid "IM Preferences"
 msgstr "Preferències de MI"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:174
 #, fuzzy
 msgid "Send me notices"
 msgstr "Envia un avís"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:176
 #, fuzzy
 msgid "Post a notice when my status changes."
 msgstr "Envia un avís quan el meu estat Jabber/GTalk canviï."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:178
 #, fuzzy
 msgid "Send me replies from people I'm not subscribed to."
 msgstr ""
@@ -3260,54 +2615,45 @@ msgstr ""
 "subscrita."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:181
 #, fuzzy
 msgid "Publish a MicroID"
 msgstr "Publica una MicroID per al meu correu electrònic."
 
 #. TRANS: Server error thrown on database error updating IM preferences.
-#: actions/imsettings.php:291
 #, fuzzy
 msgid "Couldn't update IM preferences."
 msgstr "No s'ha pogut actualitzar l'usuari."
 
 #. TRANS: Confirmation message for successful IM preferences save.
 #. TRANS: Confirmation message after saving preferences.
-#: actions/imsettings.php:298 actions/urlsettings.php:244
 msgid "Preferences saved."
 msgstr "S'han desat les preferències."
 
 #. TRANS: Message given saving IM address without having provided one.
-#: actions/imsettings.php:320
 #, fuzzy
 msgid "No screenname."
 msgstr "Cap sobrenom."
 
-#: actions/imsettings.php:325
 #, fuzzy
 msgid "No transport."
 msgstr "Cap avís."
 
 #. TRANS: Message given saving IM address that cannot be normalised.
-#: actions/imsettings.php:333
 #, fuzzy
 msgid "Cannot normalize that screenname"
 msgstr "No es pot normalitzar aquest Jabber ID."
 
 #. TRANS: Message given saving IM address that not valid.
-#: actions/imsettings.php:340
 #, fuzzy
 msgid "Not a valid screenname"
 msgstr "Sobrenom no vàlid."
 
 #. TRANS: Message given saving IM address that is already set for another user.
-#: actions/imsettings.php:344
 #, fuzzy
 msgid "Screenname already belongs to another user."
 msgstr "Aquest Jabber ID ja està sent utilitzat per un altre usuari."
 
 #. TRANS: Message given saving valid IM address that is to be confirmed.
-#: actions/imsettings.php:369
 #, fuzzy
 msgid "A confirmation code was sent to the IM address you added."
 msgstr ""
@@ -3315,68 +2661,57 @@ msgstr ""
 "heu afegit. Heu d'acceptar que %s us pugui enviar missatges."
 
 #. TRANS: Message given canceling IM address confirmation for the wrong IM address.
-#: actions/imsettings.php:396
 msgid "That is the wrong IM address."
 msgstr "Aquesta adreça de missatgeria instantània és incorrecta."
 
 #. TRANS: Server error thrown on database error canceling IM address confirmation.
-#: actions/imsettings.php:405
 #, fuzzy
 msgid "Couldn't delete confirmation."
 msgstr "No s'ha pogut eliminar la confirmació de MI."
 
 #. TRANS: Message given after successfully canceling IM address confirmation.
-#: actions/imsettings.php:410
 msgid "IM confirmation cancelled."
 msgstr "S'ha cancel·lat la confirmació de MI."
 
 #. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.
-#: actions/imsettings.php:434
 #, fuzzy
 msgid "That is not your screenname."
 msgstr "Aquest no és el teu número de telèfon."
 
 #. TRANS: Server error thrown on database error removing a registered IM address.
-#: actions/imsettings.php:443
 #, fuzzy
 msgid "Couldn't update user im prefs."
 msgstr "No s'ha pogut actualitzar el registre de l'usuari."
 
 #. TRANS: Message given after successfully removing a registered Instant Messaging address.
-#: actions/imsettings.php:451
 msgid "The IM address was removed."
 msgstr "S'ha eliminat l'adreça de MI."
 
 #. TRANS: Title for all but the first page of the inbox page.
 #. TRANS: %1$s is the user's nickname, %2$s is the page number.
-#: actions/inbox.php:59
 #, php-format
 msgid "Inbox for %1$s - page %2$d"
 msgstr "Safata d'entrada de %1$s - pàgina %2$d"
 
 #. TRANS: Title for the first page of the inbox page.
 #. TRANS: %s is the user's nickname.
-#: actions/inbox.php:64
 #, php-format
 msgid "Inbox for %s"
 msgstr "Safata d'entrada de %s"
 
 #. TRANS: Instructions for user inbox page.
-#: actions/inbox.php:106
 msgid "This is your inbox, which lists your incoming private messages."
 msgstr ""
 "Aquesta és la teva safata d'entrada, que et mostrarà els teus missatges "
 "privats."
 
 #. TRANS: Client error displayed when trying to sent invites while they have been disabled.
-#: actions/invite.php:41
 msgid "Invites have been disabled."
 msgstr "S'han inhabilitat les invitacions."
 
 #. TRANS: Client error displayed when trying to sent invites while not logged in.
 #. TRANS: %s is the StatusNet site name.
-#: actions/invite.php:45
 #, php-format
 msgid "You must be logged in to invite other users to use %s."
 msgstr ""
@@ -3384,18 +2719,15 @@ msgstr ""
 
 #. TRANS: Form validation message when providing an e-mail address that does not validate.
 #. TRANS: %s is an invalid e-mail address.
-#: actions/invite.php:78
 #, php-format
 msgid "Invalid email address: %s."
 msgstr "L'adreça electrònica no és vàlida: %s"
 
 #. TRANS: Page title when invitations have been sent.
-#: actions/invite.php:117
 msgid "Invitations sent"
 msgstr "S'han enviat les invitacions"
 
 #. TRANS: Page title when inviting potential users.
-#: actions/invite.php:120
 msgid "Invite new users"
 msgstr "Convida nous usuaris"
 
@@ -3403,7 +2735,6 @@ msgstr "Convida nous usuaris"
 #. TRANS: is already subscribed to one or more users with the given e-mail address(es).
 #. TRANS: Plural form is based on the number of reported already subscribed e-mail addresses.
 #. TRANS: Followed by a bullet list.
-#: actions/invite.php:140
 msgid "You are already subscribed to this user:"
 msgid_plural "You are already subscribed to these users:"
 msgstr[0] "Ja esteu subscrit a aquests usuari:"
@@ -3411,7 +2742,6 @@ msgstr[1] "Ja esteu subscrit a aquests usuaris:"
 
 #. TRANS: Used as list item for already subscribed users (%1$s is nickname, %2$s is e-mail address).
 #. TRANS: Used as list item for already registered people (%1$s is nickname, %2$s is e-mail address).
-#: actions/invite.php:146 actions/invite.php:160
 #, php-format
 msgctxt "INVITE"
 msgid "%1$s (%2$s)"
@@ -3420,7 +2750,6 @@ msgstr "%1$s (%2$s)"
 #. TRANS: Message displayed inviting users to use a StatusNet site while the invited user
 #. TRANS: already uses a this StatusNet site. Plural form is based on the number of
 #. TRANS: reported already present people. Followed by a bullet list.
-#: actions/invite.php:154
 msgid "This person is already a user and you were automatically subscribed:"
 msgid_plural ""
 "These people are already users and you were automatically subscribed to them:"
@@ -3431,7 +2760,6 @@ msgstr[1] ""
 #. TRANS: Message displayed inviting users to use a StatusNet site. Plural form is
 #. TRANS: based on the number of invitations sent. Followed by a bullet list of
 #. TRANS: e-mail addresses to which invitations were sent.
-#: actions/invite.php:168
 msgid "Invitation sent to the following person:"
 msgid_plural "Invitations sent to the following people:"
 msgstr[0] "Invitació enviada a la persona següent:"
@@ -3439,7 +2767,6 @@ msgstr[1] "Invitacions enviades a les persones següents:"
 
 #. TRANS: Generic message displayed after sending out one or more invitations to
 #. TRANS: people to join a StatusNet site.
-#: actions/invite.php:178
 msgid ""
 "You will be notified when your invitees accept the invitation and register "
 "on the site. Thanks for growing the community!"
@@ -3448,7 +2775,6 @@ msgstr ""
 "registrin al lloc. Gràcies per fer créixer la comunitat!"
 
 #. TRANS: Form instructions.
-#: actions/invite.php:191
 msgid ""
 "Use this form to invite your friends and colleagues to use this service."
 msgstr ""
@@ -3456,27 +2782,23 @@ msgstr ""
 "utilitzar aquest servei."
 
 #. TRANS: Field label for a list of e-mail addresses.
-#: actions/invite.php:218
 msgid "Email addresses"
 msgstr "Adreces de correu electrònic"
 
 #. TRANS: Tooltip for field label for a list of e-mail addresses.
-#: actions/invite.php:221
 msgid "Addresses of friends to invite (one per line)."
 msgstr "Adreces d'amics per convidar (una per línia)."
 
 #. TRANS: Field label for a personal message to send to invitees.
-#: actions/invite.php:225
 msgid "Personal message"
 msgstr "Missatge personal"
 
 #. TRANS: Tooltip for field label for a personal message to send to invitees.
-#: actions/invite.php:228
 msgid "Optionally add a personal message to the invitation."
 msgstr "Opcionalment podeu afegir un missatge a la invitació."
 
 #. TRANS: Send button for inviting friends
-#: actions/invite.php:232
+#. TRANS: Button text for sending notice.
 msgctxt "BUTTON"
 msgid "Send"
 msgstr "Envia"
@@ -3484,7 +2806,6 @@ msgstr "Envia"
 #. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral
 #. TRANS: singular 3rd-person pronoun in English. %1$s is the inviting user, $2$s is
 #. TRANS: the StatusNet sitename.
-#: actions/invite.php:264
 #, php-format
 msgid "%1$s has invited you to join them on %2$s"
 msgstr "%1$s us ha convidat a unir-vos al grup %2$s"
@@ -3494,7 +2815,6 @@ msgstr "%1$s us ha convidat a unir-vos al grup %2$s"
 #. TRANS: StatusNet sitename, %3$s is the site URL, %4$s is the personal message from the
 #. TRANS: inviting user, %s%5 a link to the timeline for the inviting user, %s$6 is a link
 #. TRANS: to register with the StatusNet site.
-#: actions/invite.php:271
 #, php-format
 msgid ""
 "%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -3552,50 +2872,44 @@ msgstr ""
 "Sincerely, %2$s\n"
 
 #. TRANS: Client error displayed when trying to join a group while not logged in.
-#: actions/joingroup.php:59
 msgid "You must be logged in to join a group."
 msgstr "Heu d'haver iniciat una sessió per unir-vos a un grup."
 
 #. TRANS: Title for join group page after joining.
-#: actions/joingroup.php:148
 #, php-format
 msgctxt "TITLE"
 msgid "%1$s joined group %2$s"
 msgstr "%1$s s'ha unit al grup %2$s"
 
 #. TRANS: Client error displayed when trying to leave a group while not logged in.
-#: actions/leavegroup.php:59
 msgid "You must be logged in to leave a group."
 msgstr "Heu d'haver iniciat una sessió per deixar un grup."
 
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
-#: actions/leavegroup.php:103 lib/command.php:398
 msgid "You are not a member of that group."
 msgstr "No ets membre d'aquest grup."
 
 #. TRANS: Title for leave group page after leaving.
-#: actions/leavegroup.php:142
 #, php-format
 msgctxt "TITLE"
 msgid "%1$s left group %2$s"
 msgstr "%1$s ha abandonat el grup %2$s"
 
 #. TRANS: User admin panel title
-#: actions/licenseadminpanel.php:55
 msgctxt "TITLE"
 msgid "License"
 msgstr "Llicència"
 
-#: actions/licenseadminpanel.php:65
+#. TRANS: Form instructions for the site license admin panel.
 msgid "License for this StatusNet site"
 msgstr "Llicència d'aquest lloc basat en StatusNet"
 
-#: actions/licenseadminpanel.php:134
+#. TRANS: Client error displayed selecting an invalid license in the license admin panel.
 msgid "Invalid license selection."
 msgstr "La selecció de la llicència no és vàlida."
 
-#: actions/licenseadminpanel.php:144
+#. TRANS: Client error displayed when not specifying an owner for the all rights reserved license in the license admin panel.
 msgid ""
 "You must specify the owner of the content when using the All Rights Reserved "
 "license."
@@ -3603,137 +2917,138 @@ msgstr ""
 "Heu d'especificar el propietari del contingut quan utilitzeu la llicència "
 "«Tots els drets reservats»."
 
-#: actions/licenseadminpanel.php:151
+#. TRANS: Client error displayed selecting a too long license title in the license admin panel.
 msgid "Invalid license title. Maximum length is 255 characters."
 msgstr ""
 "El títol de la llicència no és vàlid. La longitud màxima és 255 caràcters."
 
-#: actions/licenseadminpanel.php:163
+#. TRANS: Client error displayed specifying an invalid license URL in the license admin panel.
 msgid "Invalid license URL."
 msgstr "L'URL de la llicència no és vàlid."
 
-#: actions/licenseadminpanel.php:166
+#. TRANS: Client error displayed specifying an invalid license image URL in the license admin panel.
 msgid "Invalid license image URL."
 msgstr "L'URL de la imatge de la llicència no és vàlid."
 
-#: actions/licenseadminpanel.php:174
+#. TRANS: Client error displayed specifying an invalid license URL in the license admin panel.
 msgid "License URL must be blank or a valid URL."
 msgstr "L'URL de la llicència ha de ser en blanc o bé un URL vàlid."
 
-#: actions/licenseadminpanel.php:182
+#. TRANS: Client error displayed specifying an invalid license image URL in the license admin panel.
 msgid "License image must be blank or valid URL."
 msgstr "La imatge de la llicència ha de ser en blanc o bé un URL vàlid."
 
-#: actions/licenseadminpanel.php:232
+#. TRANS: Form legend in the license admin panel.
 msgid "License selection"
 msgstr "Selecció de llicència"
 
-#: actions/licenseadminpanel.php:238
+#. TRANS: License option in the license admin panel.
 msgid "Private"
 msgstr "Privat"
 
-#: actions/licenseadminpanel.php:239
+#. TRANS: License option in the license admin panel.
 msgid "All Rights Reserved"
 msgstr "Tots els drets reservats"
 
-#: actions/licenseadminpanel.php:240
+#. TRANS: License option in the license admin panel.
 msgid "Creative Commons"
 msgstr "Creative Commons"
 
-#: actions/licenseadminpanel.php:245
+#. TRANS: Dropdown field label in the license admin panel.
 msgid "Type"
 msgstr "Tipus"
 
-#: actions/licenseadminpanel.php:247
-msgid "Select license"
+#. TRANS: Dropdown field instructions in the license admin panel.
+#, fuzzy
+msgid "Select a license."
 msgstr "Seleccioneu la llicència"
 
-#: actions/licenseadminpanel.php:261
+#. TRANS: Form legend in the license admin panel.
 msgid "License details"
 msgstr "Detalls de la llicència"
 
-#: actions/licenseadminpanel.php:267
+#. TRANS: Field label in the license admin panel.
 msgid "Owner"
 msgstr "Propietari"
 
-#: actions/licenseadminpanel.php:268
+#. TRANS: Field title in the license admin panel.
 msgid "Name of the owner of the site's content (if applicable)."
 msgstr "Nom del propietari del contingut del lloc (si s'hi aplica)."
 
-#: actions/licenseadminpanel.php:276
+#. TRANS: Field label in the license admin panel.
 msgid "License Title"
 msgstr "Títol de la llicència"
 
-#: actions/licenseadminpanel.php:277
+#. TRANS: Field title in the license admin panel.
 msgid "The title of the license."
 msgstr "El títol de la llicència."
 
-#: actions/licenseadminpanel.php:285
+#. TRANS: Field label in the license admin panel.
 msgid "License URL"
 msgstr "URL de la llicència"
 
-#: actions/licenseadminpanel.php:286
+#. TRANS: Field title in the license admin panel.
 msgid "URL for more information about the license."
 msgstr "URL per a més informació de la llicència."
 
-#: actions/licenseadminpanel.php:293
+#. TRANS: Field label in the license admin panel.
 msgid "License Image URL"
 msgstr "URL de la imatge de la llicència"
 
-#: actions/licenseadminpanel.php:294
+#. TRANS: Field title in the license admin panel.
 msgid "URL for an image to display with the license."
 msgstr "URL de la imatge que es mostrarà juntament amb la llicència."
 
-#. TRANS: Submit button title.
-#: actions/licenseadminpanel.php:311 actions/sessionsadminpanel.php:199
-#: actions/siteadminpanel.php:292 actions/snapshotadminpanel.php:245
-#: actions/tagother.php:133 lib/applicationeditform.php:357
-msgid "Save"
-msgstr "Desa"
-
-#: actions/licenseadminpanel.php:311
-msgid "Save license settings"
+#. TRANS: Button title in the license admin panel.
+#, fuzzy
+msgid "Save license settings."
 msgstr "Desa els paràmetres de la llicència"
 
+#. TRANS: Client error displayed when trying to log in while already logged in.
 #. TRANS: Client error displayed trying to use "one time password login" when already logged in.
-#: actions/login.php:97 actions/otp.php:62 actions/register.php:130
 msgid "Already logged in."
 msgstr "Ja hi heu iniciat una sessió."
 
-#: actions/login.php:125
+#. TRANS: Form validation error displayed when trying to log in with incorrect credentials.
 msgid "Incorrect username or password."
 msgstr "Nom d'usuari o contrasenya incorrectes."
 
+#. TRANS: Server error displayed when during login a server error occurs.
 #. TRANS: Server error displayed when a user object could not be created trying to login using "one time password login".
-#: actions/login.php:131 actions/otp.php:127
 msgid "Error setting user. You are probably not authorized."
 msgstr ""
 "S'ha produït un error en definir l'usuari. Probablement no hi esteu "
 "autoritzat."
 
-#: actions/login.php:185 actions/login.php:236 lib/action.php:598
+#. TRANS: Page title for login page.
 msgid "Login"
 msgstr "Inici de sessió"
 
-#: actions/login.php:222
+#. TRANS: Form legend on login page.
 msgid "Login to site"
 msgstr "Accedir al lloc"
 
-#: actions/login.php:231 actions/register.php:469
+#. TRANS: Checkbox label label on login page.
 msgid "Remember me"
 msgstr "Recorda'm"
 
-#: actions/login.php:232 actions/register.php:471
+#. TRANS: Checkbox title on login page.
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 "Inicia la sessió automàticament en el futur; no ho activeu en ordinadors "
 "compartits!"
 
-#: actions/login.php:241
+#. TRANS: Button text for log in on login page.
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Login"
+msgstr "Inici de sessió"
+
+#. TRANS: Link text for link to "reset password" on login page.
 msgid "Lost or forgotten password?"
 msgstr "Contrasenya oblidada o perduda?"
 
-#: actions/login.php:259
+#. TRANS: Form instructions on login page before being able to change user settings.
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -3741,11 +3056,12 @@ msgstr ""
 "Per raons de seguretat, torneu a escriure el vostre nom d'usuari i "
 "contrasenya abans de canviar la vostra configuració."
 
-#: actions/login.php:263
+#. TRANS: Form instructions on login page.
 msgid "Login with your username and password."
 msgstr "Inicieu una sessió amb nom d'usuari i contrasenya"
 
-#: actions/login.php:266
+#. TRANS: Form instructions on login page. This message contains Markdown links in the form [Link text](Link).
+#. TRANS: %%action.register%% is a link to the registration page.
 #, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -3753,126 +3069,121 @@ msgstr ""
 "No teniu cap nom d'usuari encara? [Registreu-hi](%%action.register%%) un nou "
 "compte."
 
-#: actions/makeadmin.php:92
+#. TRANS: Client error displayed when trying to make another user admin on the Make Admin page while not an admin.
 msgid "Only an admin can make another user an admin."
 msgstr "Només un administrador poc fer a un altre usuari administrador."
 
-#: actions/makeadmin.php:96
+#. TRANS: Client error displayed when trying to make another user admin on the Make Admin page who already is admin.
+#. TRANS: %1$s is the user that is already admin, %2$s is the group user is already admin for.
 #, php-format
 msgid "%1$s is already an admin for group \"%2$s\"."
 msgstr "%1$s ja és un administrador del grup «%2$s»."
 
-#: actions/makeadmin.php:133
+#. TRANS: Server error displayed when trying to make another user admin on the Make Admin page fails
+#. TRANS: because the group membership record could not be gotten.
+#. TRANS: %1$s is the to be admin user, %2$s is the group user should be admin for.
 #, php-format
 msgid "Can't get membership record for %1$s in group %2$s."
 msgstr "No s'ha pogut obtenir el registre de pertinència de %1$s al grup %2$s."
 
-#: actions/makeadmin.php:146
+#. TRANS: Server error displayed when trying to make another user admin on the Make Admin page fails
+#. TRANS: because the group adminship record coud not be saved properly.
+#. TRANS: %1$s is the to be admin user, %2$s is the group user is already admin for.
 #, php-format
 msgid "Can't make %1$s an admin for group %2$s."
 msgstr "No es pot fer %1$s administrador del grup %2$s."
 
-#: actions/microsummary.php:69
+#. TRANS: Client error displayed trying to make a micro summary without providing a status.
 msgid "No current status."
 msgstr "No hi ha cap estat actual."
 
 #. TRANS: This is the title of the form for adding a new application.
-#: actions/newapplication.php:52
 msgid "New application"
 msgstr "Aplicació nova"
 
 #. TRANS: Client error displayed trying to add a new application while not logged in.
-#: actions/newapplication.php:64
 msgid "You must be logged in to register an application."
 msgstr "Heu d'haver iniciat una sessió per registrar-hi una aplicació."
 
 #. TRANS: Form instructions for registering a new application.
-#: actions/newapplication.php:147
 msgid "Use this form to register a new application."
 msgstr "Utilitzeu aquest formulari per crear una nova aplicació."
 
 #. TRANS: Validation error shown when not providing a source URL in the "New application" form.
-#: actions/newapplication.php:189
 msgid "Source URL is required."
 msgstr "URL d'origen requerida."
 
 #. TRANS: Server error displayed when an application could not be registered in the database through the "New application" form.
-#: actions/newapplication.php:279 actions/newapplication.php:289
 msgid "Could not create application."
 msgstr "No s'ha pogut crear l'aplicació."
 
 #. TRANS: Title for form to create a group.
-#: actions/newgroup.php:53
 msgid "New group"
 msgstr "Nou grup"
 
 #. TRANS: Client exception thrown when a user tries to create a group while banned.
-#: actions/newgroup.php:73 classes/User_group.php:485
 msgid "You are not allowed to create groups on this site."
 msgstr "No teniu permisos per crear grups en aquest lloc."
 
 #. TRANS: Form instructions for group create form.
-#: actions/newgroup.php:117
 msgid "Use this form to create a new group."
 msgstr "Utilitza aquest formulari per crear un nou grup."
 
-#. TRANS: Group create form validation error.
-#: actions/newgroup.php:200
-msgid "Alias cannot be the same as nickname."
-msgstr "L'àlies no pot ser el mateix que el sobrenom."
-
-#: actions/newmessage.php:71 actions/newmessage.php:234
+#. TRANS: Page title for new direct message page.
+#. TRANS: Page title on page for sending a direct message.
 msgid "New message"
 msgstr "Nou missatge"
 
-#. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
-#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:513
-msgid "You can't send a message to this user."
+#. TRANS: Client error displayed trying to send a direct message to a user while sender and
+#. TRANS: receiver are not subscribed to each other.
+#, fuzzy
+msgid "You cannot send a message to this user."
 msgstr "No podeu enviar un misssatge a aquest usuari."
 
+#. TRANS: Form validator error displayed trying to send a direct message without content.
+#. TRANS: Client error displayed trying to send a notice without content.
 #. TRANS: Command exception text shown when trying to send a direct message to another user without content.
 #. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
-#: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:490
-#: lib/command.php:593
 msgid "No content!"
 msgstr "Cap contingut!"
 
-#: actions/newmessage.php:161
+#. TRANS: Form validation error displayed trying to send a direct message without specifying a recipient.
 msgid "No recipient specified."
 msgstr "No has especificat el destinatari."
 
+#. TRANS: Client error displayed trying to send a direct message to self.
 #. TRANS: Error text shown when trying to send a direct message to self.
-#: actions/newmessage.php:167 lib/command.php:517
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr "No t'enviïs missatges a tu mateix, simplement dir-te això."
 
-#: actions/newmessage.php:184
+#. TRANS: Page title after sending a direct message.
 msgid "Message sent"
 msgstr "S'ha enviat el missatge"
 
+#. TRANS: Confirmation text after sending a direct message.
+#. TRANS: %s is the direct message recipient.
 #. TRANS: Message given have sent a direct message to another user.
 #. TRANS: %s is the name of the other user.
-#: actions/newmessage.php:188 lib/command.php:525
 #, php-format
 msgid "Direct message to %s sent."
 msgstr "S'ha enviat un missatge directe a %s."
 
-#: actions/newmessage.php:213 actions/newnotice.php:264
+#. TRANS: Page title after an AJAX error occurred on the "send direct message" page.
+#. TRANS: Page title after an AJAX error occurs on the send notice page.
 msgid "Ajax Error"
 msgstr "Ajax Error"
 
-#: actions/newnotice.php:69
+#. TRANS: Page title for sending a new notice.
 msgid "New notice"
 msgstr "Nou avís"
 
-#: actions/newnotice.php:230
+#. TRANS: Page title after sending a notice.
 msgid "Notice posted"
 msgstr "S'ha publicat l'avís"
 
 #. TRANS: Instructions for Notice search page.
 #. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/noticesearch.php:69
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -3882,20 +3193,17 @@ msgstr ""
 "espais; han de ser majors a 3 caràcters."
 
 #. TRANS: Title of the page where users can search for notices.
-#: actions/noticesearch.php:80
 msgid "Text search"
 msgstr "Cerca de text"
 
 #. TRANS: Test in RSS notice search.
 #. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearch.php:95
 #, php-format
 msgid "Search results for \"%1$s\" on %2$s"
 msgstr "Cerca els resultats de «%s» a %s"
 
 #. TRANS: Text for logged in users making a query for notices without results.
 #. TRANS: This message contains a Markdown link.
-#: actions/noticesearch.php:128
 #, php-format
 msgid ""
 "Be the first to [post on this topic](%%%%action.newnotice%%%%?"
@@ -3906,7 +3214,6 @@ msgstr ""
 
 #. TRANS: Text for not logged in users making a query for notices without results.
 #. TRANS: This message contains Markdown links.
-#: actions/noticesearch.php:133
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and be the first to "
@@ -3916,20 +3223,18 @@ msgstr ""
 "[en parlar del tema](%%%%action.newnotice%%%%?status_textarea=%s)!"
 
 #. TRANS: RSS notice search feed title. %s is the query.
-#: actions/noticesearchrss.php:95
 #, php-format
 msgid "Updates with \"%s\""
 msgstr "Actualitzacions amb «%s»"
 
 #. TRANS: RSS notice search feed description.
 #. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearchrss.php:99
 #, php-format
 msgid "Updates matching search term \"%1$s\" on %2$s."
 msgstr ""
 "Les actualitzacions que coincideixen amb el terme de cerca «%1$s» el %2$s."
 
-#: actions/nudge.php:85
+#. TRANS: Client error displayed trying to nudge a user that cannot be nudged.
 msgid ""
 "This user doesn't allow nudges or hasn't confirmed or set their email "
 "address yet."
@@ -3937,60 +3242,51 @@ msgstr ""
 "Aquest usuari no permet que li cridin l'atenció o no ha confirmat encara "
 "l'adreça electrònica."
 
-#: actions/nudge.php:94
+#. TRANS: Page title after sending a nudge.
 msgid "Nudge sent"
 msgstr "S'ha cridat l'atenció"
 
-#: actions/nudge.php:97
+#. TRANS: Confirmation text after sending a nudge.
 msgid "Nudge sent!"
 msgstr "S'ha cridat l'atenció!"
 
 #. TRANS: Message displayed to an anonymous user trying to view OAuth application list.
-#: actions/oauthappssettings.php:57
 msgid "You must be logged in to list your applications."
 msgstr "Heu d'haver iniciat una sessió per llistar les vostres aplicacions."
 
 #. TRANS: Page title for OAuth applications
-#: actions/oauthappssettings.php:73
 msgid "OAuth applications"
 msgstr "Aplicacions OAuth"
 
 #. TRANS: Page instructions for OAuth applications
-#: actions/oauthappssettings.php:85
 msgid "Applications you have registered"
 msgstr "Aplicacions que heu registrat"
 
 #. TRANS: Empty list message on page with OAuth applications.
-#: actions/oauthappssettings.php:138
 #, php-format
 msgid "You have not registered any applications yet."
 msgstr "No teniu cap aplicació registrada encara."
 
 #. TRANS: Title for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:69
 msgid "Connected applications"
 msgstr "Aplicacions connectades"
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:80
 msgid "The following connections exist for your account."
 msgstr "Les connexions següents existeixen per al vostre compte."
 
 #. TRANS: Client error when trying to revoke access for an application while not being a user of it.
-#: actions/oauthconnectionssettings.php:165
 msgid "You are not a user of that application."
 msgstr "No sou usuari de l'aplicació."
 
 #. TRANS: Client error when revoking access has failed for some reason.
 #. TRANS: %s is the application ID revoking access failed for.
-#: actions/oauthconnectionssettings.php:180
 #, php-format
 msgid "Unable to revoke access for application: %s."
 msgstr "No s'ha pogut revocar l'accés de l'aplicació: %s"
 
 #. TRANS: Success message after revoking access for an application.
 #. TRANS: %1$s is the application name, %2$s is the first part of the user token.
-#: actions/oauthconnectionssettings.php:199
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -4000,14 +3296,12 @@ msgstr ""
 "2$s."
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:210
 msgid "You have not authorized any applications to use your account."
 msgstr "No heu autoritzat cap aplicació perquè utilitzi el vostre compte."
 
 #. TRANS: Note for developers in the OAuth connection settings form.
 #. TRANS: This message contains a Markdown link. Do not separate "](".
 #. TRANS: %s is the URL to the OAuth settings.
-#: actions/oauthconnectionssettings.php:230
 #, php-format
 msgid ""
 "Are you a developer? [Register an OAuth client application](%s) to use with "
@@ -4016,440 +3310,359 @@ msgstr ""
 "Sou un desenvolupador? [Registreu una aplicació de client OAuth](%s) per "
 "utilitzar-la amb una instància de l'StatusNet."
 
-#: actions/oembed.php:64
+#. TRANS: Server error displayed in oEmbed action when path not found.
+#. TRANS: %s is a path.
 #, php-format
 msgid "\"%s\" not found."
 msgstr "No s'ha trobat «%s»."
 
-#: actions/oembed.php:76
+#. TRANS: Server error displayed in oEmbed action when notice not found.
+#. TRANS: %s is a notice.
 #, php-format
 msgid "Notice %s not found."
 msgstr "No s'ha trobat l'avís «%s»."
 
-#: actions/oembed.php:80 actions/shownotice.php:100
+#. TRANS: Server error displayed in oEmbed action when notice has not profile.
 msgid "Notice has no profile."
 msgstr "L'avís no té cap perfil."
 
-#: actions/oembed.php:83 actions/shownotice.php:172
+#. TRANS: oEmbed title. %1$s is the author name, %2$s is the creation date.
 #, php-format
 msgid "%1$s's status on %2$s"
 msgstr "estat de %1$s a %2$s"
 
-#: actions/oembed.php:95
+#. TRANS: Server error displayed in oEmbed action when attachment not found.
+#. TRANS: %d is an attachment ID.
 #, php-format
 msgid "Attachment %s not found."
 msgstr "No s'ha trobat l'adjunció %s."
 
-#: actions/oembed.php:136
+#. TRANS: Server error displayed in oEmbed request when a path is not supported.
+#. TRANS: %s is a path.
 #, php-format
 msgid "\"%s\" not supported for oembed requests."
 msgstr "No es permet «%s» per a sol·licituds oembed."
 
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
-#: actions/oembed.php:168
 #, php-format
 msgid "Content type %s not supported."
 msgstr "El tipus de contingut %s no està permès."
 
 #. TRANS: Error message displaying attachments. %s is the site's base URL.
-#: actions/oembed.php:172
 #, php-format
 msgid "Only %s URLs over plain HTTP please."
 msgstr "Si us plau, només URL %s sobre HTTP pla."
 
+#. TRANS: Server error displayed in oEmbed action when request specifies an unsupported data format.
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1207
-#: lib/apiaction.php:1234 lib/apiaction.php:1369
 msgid "Not a supported data format."
 msgstr "Format de data no suportat."
 
 #. TRANS: ShortName in the OpenSearch interface when trying to find users.
-#: actions/opensearch.php:64
 msgid "People Search"
 msgstr "Cerca de gent"
 
-#: actions/opensearch.php:68
+#. TRANS: ShortName in the OpenSearch interface when trying to find notices.
 msgid "Notice Search"
 msgstr "Cerca d'avisos"
 
 #. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
-#: actions/otp.php:70
 msgid "No user ID specified."
 msgstr "No s'ha especificat cap ID d'usuari."
 
 #. TRANS: Client error displayed trying to use "one time password login" without specifying a login token.
-#: actions/otp.php:86
 msgid "No login token specified."
 msgstr "No s'ha especificat cap testimoni d'inici de sessió."
 
 #. TRANS: Client error displayed trying to use "one time password login" without requesting a login token.
-#: actions/otp.php:94
 msgid "No login token requested."
 msgstr "No s'ha sol·licitat cap testimoni d'inici de sessió."
 
 #. TRANS: Client error displayed trying to use "one time password login" while specifying an invalid login token.
-#: actions/otp.php:100
 msgid "Invalid login token specified."
 msgstr "No s'ha especificat un testimoni d'inici de sessió vàlid."
 
 #. TRANS: Client error displayed trying to use "one time password login" while specifying an expired login token.
-#: actions/otp.php:110
 msgid "Login token expired."
 msgstr "El testimoni d'inici de sessió ha vençut."
 
 #. TRANS: Title for outbox for any but the fist page.
 #. TRANS: %1$s is the user nickname, %2$d is the page number.
-#: actions/outbox.php:57
 #, php-format
 msgid "Outbox for %1$s - page %2$d"
 msgstr "Safata de sortida de %1$s - pàgina %2$d"
 
 #. TRANS: Title for first page of outbox.
-#: actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
 msgstr "Safata de sortida per %s"
 
 #. TRANS: Instructions for outbox.
-#: actions/outbox.php:103
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr ""
 "Aquesta és la teva safata de sortida, que et mostrarà els missatges privats "
 "que has enviat."
 
-#: actions/passwordsettings.php:58
 msgid "Change password"
 msgstr "Canvia la contrasenya"
 
-#: actions/passwordsettings.php:69
 msgid "Change your password."
 msgstr "Canvieu la vostra contrasenya"
 
 #. TRANS: Fieldset legend for password reset form.
-#: actions/passwordsettings.php:96 actions/recoverpassword.php:251
 msgid "Password change"
 msgstr "Contrasenya canviada."
 
-#: actions/passwordsettings.php:104
 msgid "Old password"
 msgstr "Antiga contrasenya"
 
 #. TRANS: Field label for password reset form.
-#: actions/passwordsettings.php:108 actions/recoverpassword.php:256
 msgid "New password"
 msgstr "Nova contrasenya"
 
-#: actions/passwordsettings.php:109 actions/register.php:416
 msgid "6 or more characters."
 msgstr "6 o més caràcters."
 
 #. TRANS: Ttile for field label for password reset form where the password has to be typed again.
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:264
-#: actions/register.php:420
 msgid "Same as password above."
 msgstr "Igual que la contrasenya de dalt"
 
-#: actions/passwordsettings.php:117
 msgid "Change"
 msgstr "Canvia"
 
-#: actions/passwordsettings.php:153 actions/register.php:223
 msgid "Password must be 6 or more characters."
 msgstr "La contrasenya hauria de ser d'entre 6 a més caràcters."
 
-#: actions/passwordsettings.php:156 actions/register.php:226
 msgid "Passwords don't match."
 msgstr "Les contrasenyes no coincideixen."
 
-#: actions/passwordsettings.php:164
 msgid "Incorrect old password"
 msgstr "Contrasenya antiga incorrecta"
 
-#: actions/passwordsettings.php:180
 msgid "Error saving user; invalid."
 msgstr "S'ha produït un error en desar l'usuari; no és vàlid."
 
 #. TRANS: Reset password form validation error message.
-#: actions/passwordsettings.php:185 actions/recoverpassword.php:418
 msgid "Cannot save new password."
 msgstr "No es pot desar la nova contrasenya."
 
-#: actions/passwordsettings.php:191
 msgid "Password saved."
 msgstr "Contrasenya guardada."
 
 #. TRANS: Title for Paths admin panel.
 #. TRANS: Menu item for site administration
-#: actions/pathsadminpanel.php:58 lib/adminpanelaction.php:371
 msgid "Paths"
 msgstr "Camins"
 
 #. TRANS: Form instructions for Path admin panel.
-#: actions/pathsadminpanel.php:69
 msgid "Path and server settings for this StatusNet site"
 msgstr "Camí i paràmetres del servidor d'aquest lloc basat en StatusNet"
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the directory that could not be read from.
-#: actions/pathsadminpanel.php:155
 #, php-format
 msgid "Theme directory not readable: %s."
 msgstr "No es pot llegir el directori de temes: %s"
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the avatar directory that could not be written to.
-#: actions/pathsadminpanel.php:163
 #, php-format
 msgid "Avatar directory not writable: %s."
 msgstr "No es pot escriure al directori d'avatars: %s"
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the background directory that could not be written to.
-#: actions/pathsadminpanel.php:171
 #, php-format
 msgid "Background directory not writable: %s."
 msgstr "No es pot escriure al directori de fons: %s"
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the locales directory that could not be read from.
-#: actions/pathsadminpanel.php:181
 #, php-format
 msgid "Locales directory not readable: %s."
 msgstr "No es pot llegir el directori de les traduccions: %s"
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the SSL server URL that is too long.
-#: actions/pathsadminpanel.php:189
 msgid "Invalid SSL server. The maximum length is 255 characters."
 msgstr "El servidor SSL no és vàlid. La mida màxima és de 255 caràcters."
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:235 actions/siteadminpanel.php:58
 msgid "Site"
 msgstr "Lloc"
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:241 actions/pathsadminpanel.php:279
-#: actions/pathsadminpanel.php:370 actions/pathsadminpanel.php:425
 msgid "Server"
 msgstr "Servidor"
 
-#: actions/pathsadminpanel.php:242
 msgid "Site's server hostname."
 msgstr "Servidor central del lloc."
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:248 actions/pathsadminpanel.php:288
-#: actions/pathsadminpanel.php:379 actions/pathsadminpanel.php:434
 msgid "Path"
 msgstr "Camí"
 
-#: actions/pathsadminpanel.php:249
 msgid "Site path."
 msgstr "Camí del lloc."
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:255
 msgid "Locale directory"
 msgstr "Directori de les traduccions"
 
-#: actions/pathsadminpanel.php:256
 msgid "Directory path to locales."
 msgstr "Camí del directori a les traduccions."
 
 #. TRANS: Checkbox label in Paths admin panel.
-#: actions/pathsadminpanel.php:263
 msgid "Fancy URLs"
 msgstr "URL atractius"
 
-#: actions/pathsadminpanel.php:265
 msgid "Use fancy (more readable and memorable) URLs?"
 msgstr "Voleu fer servir URL atractius (més fàcils de llegir i de recordar)?"
 
-#: actions/pathsadminpanel.php:272
 msgid "Theme"
 msgstr "Tema"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:281
 msgid "Server for themes."
 msgstr "Servidor de temes."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:290
 msgid "Web path to themes."
 msgstr "Camí web dels temes."
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:297 actions/pathsadminpanel.php:388
-#: actions/pathsadminpanel.php:443 actions/pathsadminpanel.php:495
 msgid "SSL server"
 msgstr "Servidor SSL"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:299
 msgid "SSL server for themes (default: SSL server)."
 msgstr "Servidor SSL dels temes (per defecte: servidor SSL)."
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:306 actions/pathsadminpanel.php:397
-#: actions/pathsadminpanel.php:452
 msgid "SSL path"
 msgstr "Camí SSL"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:308
 msgid "SSL path to themes (default: /theme/)."
 msgstr "Camí SSL als temes (per defecte: /theme/)."
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:315 actions/pathsadminpanel.php:406
-#: actions/pathsadminpanel.php:461
 msgid "Directory"
 msgstr "Directori"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:317
 msgid "Directory where themes are located."
 msgstr "Directori on es troben els temes."
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:326
 msgid "Avatars"
 msgstr "Avatars"
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:333
 msgid "Avatar server"
 msgstr "Servidor d'avatars"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:335
 msgid "Server for avatars."
 msgstr "Servidor d'avatars."
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:342
 msgid "Avatar path"
 msgstr "Camí de l'avatar"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:344
 msgid "Web path to avatars."
 msgstr "Camí web dels avatars."
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:351
 msgid "Avatar directory"
 msgstr "Directori d'avatars"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:353
 msgid "Directory where avatars are located."
 msgstr "Directori on es troben els avatars."
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:364
 msgid "Backgrounds"
 msgstr "Fons"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:372
 msgid "Server for backgrounds."
 msgstr "Servidor de fons."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:381
 msgid "Web path to backgrounds."
 msgstr "Camí web de fons."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:390
 msgid "Server for backgrounds on SSL pages."
 msgstr "Servidor de fons a pàgines SSL."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:399
 msgid "Web path to backgrounds on SSL pages."
 msgstr "Camí web de fons a pàgines SSL."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:408
 msgid "Directory where backgrounds are located."
 msgstr "Directori on es troben els fons."
 
 #. TRANS: Fieldset legens in Paths admin panel.
-#: actions/pathsadminpanel.php:419
 msgid "Attachments"
 msgstr "Adjuncions"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:427
 msgid "Server for attachments."
 msgstr "Servidor d'adjuncions."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:436
 msgid "Web path to attachments."
 msgstr "Camí web de les adjuncions."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:445
 msgid "Server for attachments on SSL pages."
 msgstr "Servidor d'adjuncions a les pàgines SSL."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:454
 msgid "Web path to attachments on SSL pages."
 msgstr "Camí web de les adjuncions a les pàgines SSL."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:463
 msgid "Directory where attachments are located."
 msgstr "Directori on es troben les adjuncions."
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:472
 msgid "SSL"
 msgstr "SSL"
 
 #. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
-#: actions/pathsadminpanel.php:477 actions/snapshotadminpanel.php:202
 msgid "Never"
 msgstr "Mai"
 
 #. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
-#: actions/pathsadminpanel.php:479
 msgid "Sometimes"
 msgstr "A vegades"
 
 #. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
-#: actions/pathsadminpanel.php:481
 msgid "Always"
 msgstr "Sempre"
 
-#: actions/pathsadminpanel.php:485
 msgid "Use SSL"
 msgstr "Utilitza l'SSL"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:487
 msgid "When to use SSL."
 msgstr "Quan utilitzar l'SSL."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:497
 msgid "Server to direct SSL requests to."
 msgstr "Servidor on dirigir les sol·licituds SSL."
 
 #. TRANS: Button title text to store form data in the Paths admin panel.
-#: actions/pathsadminpanel.php:514
 msgid "Save paths"
 msgstr "Desa els camins"
 
 #. TRANS: Instructions for the "People search" page.
 #. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/peoplesearch.php:54
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
@@ -4459,57 +3672,46 @@ msgstr ""
 "de cerca amb espais; han de ser majors a 3 caràcters."
 
 #. TRANS: Title of a page where users can search for other users.
-#: actions/peoplesearch.php:61
 msgid "People search"
 msgstr "Cerca de gent"
 
-#: actions/peopletag.php:68
 #, php-format
 msgid "Not a valid people tag: %s."
 msgstr "No és una etiqueta de gent vàlida: %s"
 
-#: actions/peopletag.php:142
 #, php-format
 msgid "Users self-tagged with %1$s - page %2$d"
 msgstr "Usuaris que s'han etiquetat amb %1$s - pàgina %2$d"
 
 #. TRANS: Page title for AJAX form return when a disabling a plugin.
-#: actions/plugindisable.php:69
 msgctxt "plugin"
 msgid "Disabled"
 msgstr ""
 
 #. TRANS: Client error displayed trying to perform any request method other than POST.
 #. TRANS: Do not translate POST.
-#: actions/pluginenable.php:78 actions/subscribe.php:77
 msgid "This action only accepts POST requests."
 msgstr "Aquesta acció només accepta sol·licituds POST."
 
-#: actions/pluginenable.php:102
 #, fuzzy
 msgid "You cannot administer plugins."
 msgstr "No podeu eliminar els usuaris."
 
-#: actions/pluginenable.php:109
 #, fuzzy
 msgid "No such plugin."
 msgstr "No existeix la pàgina."
 
 #. TRANS: Page title for AJAX form return when enabling a plugin.
-#: actions/pluginenable.php:159
 msgctxt "plugin"
 msgid "Enabled"
 msgstr ""
 
 #. TRANS: Tab and title for plugins admin panel.
 #. TRANS: Menu item for site administration
-#: actions/pluginsadminpanel.php:56 actions/version.php:191
-#: lib/adminpanelaction.php:411
 msgid "Plugins"
 msgstr "Connectors"
 
 #. TRANS: Instructions at top of plugin admin page.
-#: actions/pluginsadminpanel.php:68
 msgid ""
 "Additional plugins can be enabled and configured manually. See the <a href="
 "\"http://status.net/wiki/Plugins\">online plugin documentation</a> for more "
@@ -4517,21 +3719,17 @@ msgid ""
 msgstr ""
 
 #. TRANS: Admin form section header
-#: actions/pluginsadminpanel.php:84
 #, fuzzy
 msgid "Default plugins"
 msgstr "Llengua per defecte"
 
-#: actions/pluginsadminpanel.php:106
 msgid ""
 "All default plugins have been disabled from the site's configuration file."
 msgstr ""
 
-#: actions/postnotice.php:95
 msgid "Invalid notice content."
 msgstr "El contingut de l'avís no és vàlid."
 
-#: actions/postnotice.php:101
 #, php-format
 msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’."
 msgstr ""
@@ -4539,12 +3737,10 @@ msgstr ""
 "lloc."
 
 #. TRANS: Page title for profile settings.
-#: actions/profilesettings.php:60
 msgid "Profile settings"
 msgstr "Configuració del perfil"
 
 #. TRANS: Usage instructions for profile settings.
-#: actions/profilesettings.php:71
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
@@ -4552,38 +3748,30 @@ msgstr ""
 "pugui conèixer millor."
 
 #. TRANS: Profile settings form legend.
-#: actions/profilesettings.php:99
 msgid "Profile information"
 msgstr "Informació del perfil"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:110 actions/register.php:412
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr ""
 "1-64 lletres en minúscula o nombres, sense signes de puntuació o espais."
 
 #. TRANS: Field label in form for profile settings.
-#: actions/profilesettings.php:114 actions/register.php:434
-#: lib/groupeditform.php:150
 msgid "Full name"
 msgstr "Nom complet"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:119 actions/register.php:439
-#: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "Pàgina personal"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:122 actions/register.php:441
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr "URL del vostre web, blog o perfil en un altre lloc."
 
 #. TRANS: Tooltip for field label in form for profile settings. Plural
 #. TRANS: is decided by the number of characters available for the
 #. TRANS: biography (%d).
-#: actions/profilesettings.php:130 actions/register.php:450
 #, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4591,41 +3779,31 @@ msgstr[0] "Descriviu qui sou i els vostres interessos en %d caràcter"
 msgstr[1] "Descriviu qui sou i els vostres interessos en %d caràcters"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:136 actions/register.php:455
 msgid "Describe yourself and your interests"
 msgstr "Feu una descripció personal i interessos"
 
 #. TRANS: Text area label in form for profile settings where users can provide.
 #. TRANS: their biography.
-#: actions/profilesettings.php:140 actions/register.php:457
 msgid "Bio"
 msgstr "Biografia"
 
 #. TRANS: Field label in form for profile settings.
-#: actions/profilesettings.php:146 actions/register.php:462
-#: lib/groupeditform.php:173
 msgid "Location"
 msgstr "Ubicació"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:149
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "On us trobeu, per exemple «ciutat, comarca (o illa), país»"
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:154
 msgid "Share my current location when posting notices"
 msgstr "Comparteix la ubicació on estic en enviar avisos"
 
 #. TRANS: Field label in form for profile settings.
-#: actions/profilesettings.php:162 actions/tagother.php:128
-#: actions/tagother.php:188 lib/subscriptionlist.php:104
-#: lib/subscriptionlist.php:106
 msgid "Tags"
 msgstr "Etiquetes"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:165
 msgid ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- "
 "separated."
@@ -4634,27 +3812,22 @@ msgstr ""
 "espais."
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:170
 msgid "Language"
 msgstr "Llengua"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:172
 msgid "Preferred language."
 msgstr "Llengua preferida."
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:182
 msgid "Timezone"
 msgstr "Fus horari"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:184
 msgid "What timezone are you normally in?"
 msgstr "En quin fus horari us trobeu normalment?"
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:190
 msgid ""
 "Automatically subscribe to whoever subscribes to me (best for non-humans)."
 msgstr ""
@@ -4664,7 +3837,6 @@ msgstr ""
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Plural form is used based on the maximum number of allowed
 #. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:259 actions/register.php:214
 #, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4672,81 +3844,65 @@ msgstr[0] "La biografia és massa llarga (màx. %d caràcter)."
 msgstr[1] "La biografia és massa llarga (màx. %d caràcters)."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:270 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr "No s'ha seleccionat el fus horari."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:278
 msgid "Language is too long (maximum 50 characters)."
 msgstr "La llengua és massa llarga (màxim 50 caràcters)."
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:292
 #, php-format
 msgid "Invalid tag: \"%s\"."
 msgstr "Etiqueta no vàlida: «%s»."
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:348
 msgid "Could not update user for autosubscribe."
 msgstr "No es pot actualitzar l'usuari per autosubscriure."
 
 #. TRANS: Server error thrown when user profile location preference settings could not be updated.
-#: actions/profilesettings.php:406
 msgid "Could not save location prefs."
 msgstr "No s'han pogut desar les preferències d'ubicació."
 
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:428 actions/tagother.php:179
 msgid "Could not save tags."
 msgstr "No s'han pogut guardar les etiquetes."
 
 #. TRANS: Confirmation shown when user profile settings are saved.
 #. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:437 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "S'ha desat la configuració."
 
 #. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
 #. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:484 actions/restoreaccount.php:60
 msgid "Restore account"
 msgstr "Restaura el compte"
 
-#: actions/public.php:83
 #, php-format
 msgid "Beyond the page limit (%s)."
 msgstr "Més enllà del límit de la pàgina (%s)"
 
-#: actions/public.php:92
 msgid "Could not retrieve public stream."
 msgstr "No s'ha pogut recuperar la conversa pública."
 
-#: actions/public.php:130
 #, php-format
 msgid "Public timeline, page %d"
 msgstr "Línia temporal pública, pàgina %d"
 
-#: actions/public.php:132 lib/publicgroupnav.php:79
 msgid "Public timeline"
 msgstr "Línia temporal pública"
 
-#: actions/public.php:160
 msgid "Public Stream Feed (RSS 1.0)"
 msgstr "Flux de canal públic (RSS 1.0)"
 
-#: actions/public.php:164
 msgid "Public Stream Feed (RSS 2.0)"
 msgstr "Flux de canal públic (RSS 2.0)"
 
-#: actions/public.php:168
 msgid "Public Stream Feed (Atom)"
 msgstr "Flux de canal públic (Atom)"
 
-#: actions/public.php:188
 #, php-format
 msgid ""
 "This is the public timeline for %%site.name%% but no one has posted anything "
@@ -4755,11 +3911,9 @@ msgstr ""
 "Aquesta és la línia temporal pública de %%site.name%%, però ningú no hi ha "
 "enviat res encara."
 
-#: actions/public.php:191
 msgid "Be the first to post!"
 msgstr "Sigueu el primer en escriure-hi!"
 
-#: actions/public.php:195
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post!"
@@ -4767,7 +3921,6 @@ msgstr ""
 "Per què no [registreu un compte](%%action.register%%) i sou el primer en "
 "escriure-hi!"
 
-#: actions/public.php:242
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -4780,7 +3933,6 @@ msgstr ""
 "[Uniu-vos-hi ara](%%action.register%%) per compartir què feu amb els vostres "
 "amics, familiars, i companys! ([Més informació](%%doc.help%%))"
 
-#: actions/public.php:247
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -4791,19 +3943,16 @@ msgstr ""
 "wiki/Microblogging) basat en l'eina lliure [StatusNet](http://status.net/)."
 
 #. TRANS: Public RSS feed description. %s is the StatusNet site name.
-#: actions/publicrss.php:106
 #, php-format
 msgid "%s updates from everyone."
 msgstr "%s actualitzacions de tothom."
 
 #. TRANS: Title for public tag cloud.
-#: actions/publictagcloud.php:57
 msgid "Public tag cloud"
 msgstr "Núvol públic d'etiquetes"
 
 #. TRANS: Instructions (more used like an explanation/header).
 #. TRANS: %s is the StatusNet sitename.
-#: actions/publictagcloud.php:65
 #, php-format
 msgid "These are most popular recent tags on %s"
 msgstr "Aquestes són les etiquetes recents més populars a %s"
@@ -4811,7 +3960,6 @@ msgstr "Aquestes són les etiquetes recents més populars a %s"
 #. TRANS: This message contains a Markdown URL. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.
-#: actions/publictagcloud.php:74
 #, php-format
 msgid "No one has posted a notice with a [hashtag](%%doc.tags%%) yet."
 msgstr ""
@@ -4820,7 +3968,6 @@ 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.
-#: actions/publictagcloud.php:79
 msgid "Be the first to post one!"
 msgstr "Sigueu el primer en escriure'n un!"
 
@@ -4829,7 +3976,6 @@ msgstr "Sigueu el primer en escriure'n un!"
 #. TRANS: This message contains a Markdown URL. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.
-#: actions/publictagcloud.php:87
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post "
@@ -4839,42 +3985,34 @@ msgstr ""
 "escriure'n un!"
 
 #. TRANS: Client error displayed trying to recover password while already logged in.
-#: actions/recoverpassword.php:37
 msgid "You are already logged in!"
 msgstr "Ja heu iniciat una sessió!"
 
 #. TRANS: Client error displayed when password recovery code is not correct.
-#: actions/recoverpassword.php:64
 msgid "No such recovery code."
 msgstr "No existeix aquest codi de recuperació."
 
 #. TRANS: Client error displayed when no proper password recovery code was submitted.
-#: actions/recoverpassword.php:69
 msgid "Not a recovery code."
 msgstr "No és un codi de recuperació."
 
 #. TRANS: Server error displayed trying to recover password without providing a user.
-#: actions/recoverpassword.php:77
 msgid "Recovery code for unknown user."
 msgstr "Codi de recuperació d'un usuari desconegut."
 
 #. TRANS: Server error displayed removing a password recovery code from the database.
-#: actions/recoverpassword.php:91
 msgid "Error with confirmation code."
 msgstr "Error amb el codi de confirmació."
 
 #. TRANS: Client error displayed trying to recover password with too old a recovery code.
-#: actions/recoverpassword.php:103
 msgid "This confirmation code is too old. Please start again."
 msgstr "Aquest codi de confirmació és massa vell. Si us plau comença de nou."
 
 #. TRANS: Server error displayed when updating a user's e-mail address in the database fails while recovering a password.
-#: actions/recoverpassword.php:118
 msgid "Could not update user with confirmed email address."
 msgstr "No es pot actualitzar l'usuari amb el correu electrònic confirmat"
 
 #. TRANS: Page notice for password recovery page.
-#: actions/recoverpassword.php:160
 msgid ""
 "If you have forgotten or lost your password, you can get a new one sent to "
 "the email address you have stored in your account."
@@ -4882,98 +4020,80 @@ msgstr ""
 "Si heu oblidat o perdut la vostra contrasenya, podeu aconseguir-ne una de "
 "nova a partir de l'adreça electrònica que s'ha associat al vostre compte."
 
-#: actions/recoverpassword.php:167
 msgid "You have been identified. Enter a new password below."
 msgstr "Esteu identificat. Introduïu una contrasenya nova a continuació."
 
 #. TRANS: Fieldset legend for password recovery page.
-#: actions/recoverpassword.php:198
 msgid "Password recovery"
 msgstr "Recuperació de la contrasenya"
 
 #. TRANS: Field label on password recovery page.
-#: actions/recoverpassword.php:202
 msgid "Nickname or email address"
 msgstr "Sobrenom o adreça electrònica"
 
 #. TRANS: Title for field label on password recovery page.
-#: actions/recoverpassword.php:205
 msgid "Your nickname on this server, or your registered email address."
 msgstr ""
 "El vostre nom d'usuari en aquest servidor, o la vostra adreça de correu "
 "electrònic registrada."
 
 #. TRANS: Field label on password recovery page.
-#: actions/recoverpassword.php:212
 msgid "Recover"
 msgstr "Recupera"
 
 #. TRANS: Button text on password recovery page.
-#: actions/recoverpassword.php:214
 msgctxt "BUTTON"
 msgid "Recover"
 msgstr "Recupera"
 
 #. TRANS: Title for password recovery page in password reset mode.
-#: actions/recoverpassword.php:223
 msgid "Reset password"
 msgstr "Reinicialitza la contrasenya"
 
 #. TRANS: Title for password recovery page in password recover mode.
-#: actions/recoverpassword.php:225
 msgid "Recover password"
 msgstr "Recupera la contrasenya"
 
 #. TRANS: Title for password recovery page in email sent mode.
 #. TRANS: Subject for password recovery e-mail.
-#: actions/recoverpassword.php:227 actions/recoverpassword.php:366
 msgid "Password recovery requested"
 msgstr "Recuperació de contrasenya sol·licitada"
 
 #. TRANS: Title for password recovery page in password saved mode.
-#: actions/recoverpassword.php:229
 msgid "Password saved"
 msgstr "Contrasenya desada"
 
 #. TRANS: Title for password recovery page when an unknown action has been specified.
-#: actions/recoverpassword.php:232
 msgid "Unknown action"
 msgstr "Acció desconeguda"
 
 #. TRANS: Title for field label for password reset form.
-#: actions/recoverpassword.php:258
 msgid "6 or more characters, and do not forget it!"
 msgstr "6 o més caràcters, i no ho oblideu!"
 
 #. TRANS: Button text for password reset form.
 #. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: actions/recoverpassword.php:268 lib/designform.php:145
 msgctxt "BUTTON"
 msgid "Reset"
 msgstr "Reinicialitza"
 
 #. TRANS: Form instructions for password recovery form.
-#: actions/recoverpassword.php:278
 msgid "Enter a nickname or email address."
 msgstr "Escriviu un sobrenom o una adreça de correu electrònic."
 
 #. TRANS: Information on password recovery form if no known username or e-mail address was specified.
-#: actions/recoverpassword.php:309
 msgid "No user with that email address or username."
 msgstr "No hi ha cap usuari amb aquesta direcció o usuari."
 
 #. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
-#: actions/recoverpassword.php:327
 msgid "No registered email address for that user."
 msgstr "No hi ha cap adreça de correu electrònic registrada d'aquest usuari."
 
 #. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
-#: actions/recoverpassword.php:342
 msgid "Error saving address confirmation."
 msgstr "S'ha produït un error en desar la confirmació de l'adreça."
 
 #. TRANS: User notification after an e-mail with instructions was sent from the password recovery form.
-#: actions/recoverpassword.php:370
 msgid ""
 "Instructions for recovering your password have been sent to the email "
 "address registered to your account."
@@ -4982,73 +4102,57 @@ msgstr ""
 "correu electrònic registrada."
 
 #. TRANS: Client error displayed when trying to reset as password without providing a user.
-#: actions/recoverpassword.php:391
 msgid "Unexpected password reset."
 msgstr "Restabliment de contrasenya inesperat."
 
 #. TRANS: Reset password form validation error message.
-#: actions/recoverpassword.php:400
 msgid "Password must be 6 characters or more."
 msgstr "La contrasenya ha de tenir 6 o més caràcters."
 
 #. TRANS: Reset password form validation error message.
-#: actions/recoverpassword.php:405
 msgid "Password and confirmation do not match."
 msgstr "La contrasenya i la confirmació no coincideixen."
 
 #. TRANS: Server error displayed when something does wrong with the user object during password reset.
-#: actions/recoverpassword.php:426 actions/register.php:241
 msgid "Error setting user."
 msgstr "Error en configurar l'usuari."
 
 #. TRANS: Success message for user after password reset.
-#: actions/recoverpassword.php:434
 msgid "New password successfully saved. You are now logged in."
 msgstr "Nova contrasenya guardada correctament. Has iniciat una sessió."
 
-#: actions/redirecturl.php:70
 #, fuzzy
 msgid "No id parameter"
 msgstr "No hi ha cap argument ID."
 
-#: actions/redirecturl.php:76
 #, fuzzy, php-format
 msgid "No such file \"%d\""
 msgstr "No existeix el fitxer."
 
-#: actions/register.php:80 actions/register.php:181 actions/register.php:392
 msgid "Sorry, only invited people can register."
 msgstr "Ho sentim, però només la gent convidada pot registrar-s'hi."
 
-#: actions/register.php:87
 msgid "Sorry, invalid invitation code."
 msgstr "El codi d'invitació no és vàlid."
 
-#: actions/register.php:106
 msgid "Registration successful"
 msgstr "Registre satisfactori"
 
-#: actions/register.php:108 actions/register.php:490
 msgid "Register"
 msgstr "Registre"
 
-#: actions/register.php:128
 msgid "Registration not allowed."
 msgstr "Registre no permès."
 
-#: actions/register.php:194
 msgid "You cannot register if you don't agree to the license."
 msgstr "No podeu registrar-vos-hi si no accepteu la llicència."
 
-#: actions/register.php:203
 msgid "Email address already exists."
 msgstr "L'adreça de correu electrònic ja existeix."
 
-#: actions/register.php:236 actions/register.php:258
 msgid "Invalid username or password."
 msgstr "El nom d'usuari o la contrasenya no són vàlids."
 
-#: actions/register.php:333
 msgid ""
 "With this form you can create a new account. You can then post notices and "
 "link up to friends and colleagues."
@@ -5056,48 +4160,38 @@ msgstr ""
 "Amb aquest formulari, podeu crear un compte nou. Podeu enviar avisos i "
 "enllaçar a amics i col·legues."
 
-#: actions/register.php:424 actions/register.php:428
-#: actions/siteadminpanel.php:238 lib/settingsnav.php:92
 msgid "Email"
 msgstr "Correu electrònic"
 
-#: actions/register.php:425 actions/register.php:429
 msgid "Used only for updates, announcements, and password recovery."
 msgstr ""
 "Utilitzat només per a actualitzacions, anuncis i recuperació de contrasenya."
 
-#: actions/register.php:436
 msgid "Longer name, preferably your \"real\" name."
 msgstr "Nom més llarg, preferiblement el vostre nom «real»."
 
-#: actions/register.php:464
 msgid "Where you are, like \"City, State (or Region), Country\"."
 msgstr "On us trobeu, per exemple «ciutat, comarca (o illa), país»."
 
-#: actions/register.php:503
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
 msgstr ""
 "Entenc que el contingut i les dades de %1$s són privades i confidencials."
 
-#: actions/register.php:513
 #, php-format
 msgid "My text and files are copyright by %1$s."
 msgstr "El meu text i els meus fitxers són copyright de %1$s."
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:517
 msgid "My text and files remain under my own copyright."
 msgstr "El meu text i els meus fitxers es troben sota el meu propi copyright."
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:520
 msgid "All rights reserved."
 msgstr "Tots els drets reservats."
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:525
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -5107,7 +4201,6 @@ msgstr ""
 "les dades privades: contrasenya, adreça de correu electrònic, adreça de "
 "missatgeria instantània i número de telèfon."
 
-#: actions/register.php:566
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -5140,7 +4233,6 @@ msgstr ""
 "\n"
 "Gràcies per registrar-vos-hi i esperem que en gaudiu."
 
-#: actions/register.php:590
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5148,7 +4240,6 @@ msgstr ""
 "(Hauries de rebre un missatge per correu electrònic d'aquí uns moments, amb "
 "instruccions sobre com confirmar la teva direcció de correu electrònic.)"
 
-#: actions/remotesubscribe.php:97
 #, php-format
 msgid ""
 "To subscribe, you can [login](%%action.login%%), or [register](%%action."
@@ -5160,106 +4251,81 @@ msgstr ""
 "[servei de microblogging compatible](%%doc.openmublog%%), escriviu l'URL del "
 "vostre perfil a continuació."
 
-#: actions/remotesubscribe.php:111
 msgid "Remote subscribe"
 msgstr "Subscripció remota"
 
-#: actions/remotesubscribe.php:123
 msgid "Subscribe to a remote user"
 msgstr "Subscriu a un usuari remot"
 
-#: actions/remotesubscribe.php:128
 msgid "User nickname"
 msgstr "Sobrenom de l'usuari"
 
-#: actions/remotesubscribe.php:129
 msgid "Nickname of the user you want to follow."
 msgstr "Sobrenom de l'usuari que voleu seguir."
 
-#: actions/remotesubscribe.php:132
 msgid "Profile URL"
 msgstr "URL del perfil"
 
-#: actions/remotesubscribe.php:133
 msgid "URL of your profile on another compatible microblogging service."
 msgstr "URL del vostre perfil en un altre servei de microblogging compatible."
 
 #. TRANS: Link text for link that will subscribe to a remote profile.
-#: actions/remotesubscribe.php:136 lib/subscribeform.php:139
-#: lib/userprofile.php:402
 msgid "Subscribe"
 msgstr "Subscriu-m'hi"
 
-#: actions/remotesubscribe.php:158
 msgid "Invalid profile URL (bad format)."
 msgstr "L'URL del perfil no és vàlid (format incorrecte)."
 
-#: actions/remotesubscribe.php:167
 msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
 msgstr ""
 "L'URL del perfil no és vàlid (no és un document YADIS o no s'ha definit un "
 "XRDS vàlid)."
 
-#: actions/remotesubscribe.php:175
 msgid "That is a local profile! Login to subscribe."
 msgstr "Aquest és un perfil local! Inicieu una sessió per subscriure-us-hi."
 
-#: actions/remotesubscribe.php:182
 msgid "Could not get a request token."
 msgstr "No s'ha pogut obtenir un testimoni de sol·licitud."
 
-#: actions/repeat.php:56
 msgid "Only logged-in users can repeat notices."
 msgstr "Només els usuaris que han iniciat una sessió poden enviar avisos."
 
-#: actions/repeat.php:63 actions/repeat.php:70
 msgid "No notice specified."
 msgstr "No s'ha especificat cap avís."
 
-#: actions/repeat.php:75
 msgid "You cannot repeat your own notice."
 msgstr "No podeu repetir el vostre propi avís."
 
-#: actions/repeat.php:89
 msgid "You already repeated that notice."
 msgstr "Ja havíeu repetit l'avís."
 
-#: actions/repeat.php:112 lib/noticelist.php:697
 msgid "Repeated"
 msgstr "Repetit"
 
-#: actions/repeat.php:117
 msgid "Repeated!"
 msgstr "Repetit!"
 
 #. TRANS: RSS reply feed title. %s is a user nickname.
-#: actions/replies.php:126 actions/repliesrss.php:68
-#: lib/personalgroupnav.php:105
 #, php-format
 msgid "Replies to %s"
 msgstr "Respostes a %s"
 
-#: actions/replies.php:128
 #, php-format
 msgid "Replies to %1$s, page %2$d"
 msgstr "Respostes a %1$s, pàgina %2$d"
 
-#: actions/replies.php:145
 #, php-format
 msgid "Replies feed for %s (RSS 1.0)"
 msgstr "Canal de respostes de %s (RSS 1.0)"
 
-#: actions/replies.php:152
 #, php-format
 msgid "Replies feed for %s (RSS 2.0)"
 msgstr "Canal de respostes de %s (RSS 2.0)"
 
-#: actions/replies.php:159
 #, php-format
 msgid "Replies feed for %s (Atom)"
 msgstr "Canal de respostes de %s (Atom)"
 
-#: actions/replies.php:199
 #, php-format
 msgid ""
 "This is the timeline showing replies to %1$s but %2$s hasn't received a "
@@ -5267,7 +4333,6 @@ msgid ""
 msgstr ""
 "Aquesta és la línia temporal de %1$s, però %2$s no hi ha enviat res encara."
 
-#: actions/replies.php:204
 #, php-format
 msgid ""
 "You can engage other users in a conversation, subscribe to more people or "
@@ -5276,7 +4341,6 @@ msgstr ""
 "Podeu animar altres usuaris a una conversa, subscriviu-vos a més gent o "
 "[uniu-vos a grups](%%action.groups%%)."
 
-#: actions/replies.php:206
 #, php-format
 msgid ""
 "You can try to [nudge %1$s](../%2$s) or [post something to them](%%%%action."
@@ -5287,37 +4351,31 @@ msgstr ""
 
 #. TRANS: RSS reply feed description.
 #. TRANS: %1$s is a user nickname, %2$s is the StatusNet site name.
-#: actions/repliesrss.php:74
 #, php-format
 msgid "Replies to %1$s on %2$s."
 msgstr "Respostes a %1$s el %2$s."
 
 #. TRANS: Client exception displayed when trying to restore an account while not logged in.
-#: actions/restoreaccount.php:78
 msgid "Only logged-in users can restore their account."
 msgstr ""
 "Només els usuaris que han iniciat una sessió poden restaurar el compte."
 
 #. TRANS: Client exception displayed when trying to restore an account without having restore rights.
-#: actions/restoreaccount.php:83
 msgid "You may not restore your account."
 msgstr "Potser no podeu restaurar el vostre compte."
 
 #. TRANS: Client exception displayed trying to restore an account while something went wrong uploading a file.
 #. TRANS: Client exception. No file; probably just a non-AJAX submission.
-#: actions/restoreaccount.php:121 actions/restoreaccount.php:146
 msgid "No uploaded file."
 msgstr "No s'ha pujat cap fitxer."
 
 #. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
-#: actions/restoreaccount.php:129 lib/mediafile.php:194
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
 msgstr ""
 "El fitxer pujat excedeix la mida de la directiva upload_max_filesize del php."
 "ini."
 
 #. TRANS: Client exception.
-#: actions/restoreaccount.php:135 lib/mediafile.php:200
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form."
@@ -5326,39 +4384,32 @@ msgstr ""
 "en el formulari HTML."
 
 #. TRANS: Client exception.
-#: actions/restoreaccount.php:141 lib/mediafile.php:206
 msgid "The uploaded file was only partially uploaded."
 msgstr "El fitxer pujat només s'ha pujat parcialment."
 
 #. TRANS: Client exception thrown when a temporary folder is not present to store a file upload.
-#: actions/restoreaccount.php:150 lib/mediafile.php:214
 msgid "Missing a temporary folder."
 msgstr "Manca una carpeta temporal."
 
 #. TRANS: Client exception thrown when writing to disk is not possible during a file upload operation.
-#: actions/restoreaccount.php:154 lib/mediafile.php:218
 msgid "Failed to write file to disk."
 msgstr "No s'ha pogut escriure el fitxer al disc."
 
 #. TRANS: Client exception thrown when a file upload operation has been stopped by an extension.
-#: actions/restoreaccount.php:158 lib/mediafile.php:222
 msgid "File upload stopped by extension."
 msgstr "L'extensió ha aturat la càrrega del fitxer."
 
 #. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
 #. TRANS: Exception thrown when uploading an image fails for an unknown reason.
 #. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
-#: actions/restoreaccount.php:164 lib/imagefile.php:106 lib/mediafile.php:228
 msgid "System error uploading file."
 msgstr "Error del sistema en pujar el fitxer."
 
 #. TRANS: Client exception thrown when a feed is not an Atom feed.
-#: actions/restoreaccount.php:207
 msgid "Not an Atom feed."
 msgstr "No és un canal Atom."
 
 #. TRANS: Success message when a feed has been restored.
-#: actions/restoreaccount.php:241
 msgid ""
 "Feed has been restored. Your old posts should now appear in search and your "
 "profile page."
@@ -5367,12 +4418,10 @@ msgstr ""
 "i a la vostra pàgina de perfil."
 
 #. TRANS: Message when a feed restore is in progress.
-#: actions/restoreaccount.php:245
 msgid "Feed will be restored. Please wait a few minutes for results."
 msgstr "Es restaurarà el perfil. Espereu uns pocs minuts per als resultats."
 
 #. TRANS: Form instructions for feed restore.
-#: actions/restoreaccount.php:342
 msgid ""
 "You can upload a backed-up stream in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format."
@@ -5381,92 +4430,73 @@ msgstr ""
 "activitystrea.ms/\">Activity Streams</a>."
 
 #. TRANS: Title for submit button to confirm upload of a user backup file for account restore.
-#: actions/restoreaccount.php:373
 msgid "Upload the file"
 msgstr "Puja el fitxer"
 
-#: actions/revokerole.php:75
 msgid "You cannot revoke user roles on this site."
 msgstr "No podeu revocar els rols d'usuari en aquest lloc."
 
-#: actions/revokerole.php:82
 msgid "User doesn't have this role."
 msgstr "L'usuari no té aquest rol."
 
-#: actions/rsd.php:142 actions/version.php:159
 msgid "StatusNet"
 msgstr "StatusNet"
 
-#: actions/sandbox.php:65 actions/unsandbox.php:65
 msgid "You cannot sandbox users on this site."
 msgstr "No podeu posar els usuaris en un entorn de prova en aquest lloc."
 
-#: actions/sandbox.php:72
 msgid "User is already sandboxed."
 msgstr "L'usuari ja es troba en un entorn de proves."
 
 #. TRANS: Menu item for site administration
-#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
-#: lib/adminpanelaction.php:379
 msgid "Sessions"
 msgstr "Sessions"
 
-#: actions/sessionsadminpanel.php:65
 msgid "Session settings for this StatusNet site"
 msgstr "Paràmetres de sessió d'aquest lloc basat en StatusNet"
 
-#: actions/sessionsadminpanel.php:175
 msgid "Handle sessions"
 msgstr "Gestiona les sessions"
 
-#: actions/sessionsadminpanel.php:177
 msgid "Whether to handle sessions ourselves."
 msgstr "Si cal gestionar les sessions nosaltres mateixos."
 
-#: actions/sessionsadminpanel.php:181
 msgid "Session debugging"
 msgstr "Depuració de la sessió"
 
-#: actions/sessionsadminpanel.php:183
 msgid "Turn on debugging output for sessions."
 msgstr "Activa la sortida de depuració per a les sessions."
 
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
+#. TRANS: Submit button title.
+msgid "Save"
+msgstr "Desa"
+
 msgid "Save site settings"
 msgstr "Desa els paràmetres del lloc"
 
-#: actions/showapplication.php:78
 msgid "You must be logged in to view an application."
 msgstr "Heu d'haver iniciat una sessió per visualitzar una aplicació."
 
-#: actions/showapplication.php:151
 msgid "Application profile"
 msgstr "Perfil de l'aplicació"
 
-#: actions/showapplication.php:179
 #, php-format
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr "Creat per %1$s - %2$s accés per defecte - %3$d usuaris"
 
-#: actions/showapplication.php:189
 msgid "Application actions"
 msgstr "Accions d'aplicació"
 
-#: actions/showapplication.php:212
 msgid "Reset key & secret"
 msgstr "Reinicialitza la clau i la secreta"
 
 #. TRANS: Title of form for deleting a user.
-#: actions/showapplication.php:228 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:64 lib/noticelist.php:678
 msgid "Delete"
 msgstr "Elimina"
 
-#: actions/showapplication.php:237
 msgid "Application info"
 msgstr "Informació de l'aplicació"
 
-#: actions/showapplication.php:255
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
@@ -5474,43 +4504,36 @@ msgstr ""
 "Nota: Les signatures HMAC-SHA1 són vàlides; però no es permet el mètode de "
 "signatures en text net."
 
-#: actions/showapplication.php:275
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr ""
 "Esteu segur que voleu reinicialitzar la clau del consumidor i la secreta?"
 
 #. TRANS: Title for all but the first page of favourite notices of a user.
 #. TRANS: %1$s is the user for whom the favourite notices are displayed, %2$d is the page number.
-#: actions/showfavorites.php:80
 #, php-format
 msgid "%1$s's favorite notices, page %2$d"
 msgstr "Avisos preferits de %1$s, pàgina %2$d"
 
 #. TRANS: Server error displayed when favourite notices could not be retrieved from the database.
-#: actions/showfavorites.php:134
 msgid "Could not retrieve favorite notices."
 msgstr "No s'han pogut recuperar els avisos preferits."
 
 #. TRANS: Feed link text. %s is a username.
-#: actions/showfavorites.php:172
 #, php-format
 msgid "Feed for favorites of %s (RSS 1.0)"
 msgstr "Canal dels preferits de %s (RSS 1.0)"
 
 #. TRANS: Feed link text. %s is a username.
-#: actions/showfavorites.php:180
 #, php-format
 msgid "Feed for favorites of %s (RSS 2.0)"
 msgstr "Canal dels preferits de %s (RSS 2.0)"
 
 #. TRANS: Feed link text. %s is a username.
-#: actions/showfavorites.php:188
 #, php-format
 msgid "Feed for favorites of %s (Atom)"
 msgstr "Canal dels preferits de %s (Atom)"
 
 #. TRANS: Text displayed instead of favourite notices for the current logged in user that has no favourites.
-#: actions/showfavorites.php:209
 msgid ""
 "You haven't chosen any favorite notices yet. Click the fave button on "
 "notices you like to bookmark them for later or shed a spotlight on them."
@@ -5520,7 +4543,6 @@ msgstr ""
 
 #. TRANS: Text displayed instead of favourite notices for a user that has no favourites while logged in.
 #. TRANS: %s is a username.
-#: actions/showfavorites.php:213
 #, php-format
 msgid ""
 "%s hasn't added any favorite notices yet. Post something interesting they "
@@ -5532,7 +4554,6 @@ msgstr ""
 #. TRANS: Text displayed instead of favourite notices for a user that has no favourites while not logged in.
 #. TRANS: %s is a username, %%%%action.register%%%% is a link to the user registration page.
 #. TRANS: (link text)[link] is a Mark Down link.
-#: actions/showfavorites.php:220
 #, php-format
 msgid ""
 "%s hasn't added any favorite notices yet. Why not [register an account](%%%%"
@@ -5543,64 +4564,53 @@ msgstr ""
 "afegir un avís als vostres preferits!"
 
 #. TRANS: Page notice for show favourites page.
-#: actions/showfavorites.php:251
 msgid "This is a way to share what you like."
 msgstr "És una forma de compartir allò que us agrada."
 
 #. TRANS: Page title for first group page. %s is a group name.
-#: actions/showgroup.php:75
 #, php-format
 msgid "%s group"
 msgstr "%s grup"
 
 #. TRANS: Page title for any but first group page.
 #. TRANS: %1$s is a group name, $2$s is a page number.
-#: actions/showgroup.php:79
 #, php-format
 msgid "%1$s group, page %2$d"
 msgstr "grup %1$s, pàgina %2$d"
 
 #. TRANS: Label for group description or group note (dt). Text hidden by default.
-#: actions/showgroup.php:266
 msgid "Note"
 msgstr "Avisos"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:277 lib/groupeditform.php:180
 msgid "Aliases"
 msgstr "Àlies"
 
 #. TRANS: Group actions header (h2). Text hidden by default.
-#: actions/showgroup.php:294
 msgid "Group actions"
 msgstr "Accions del grup"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:338
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
 msgstr "Canal d'avisos del grup %s (RSS 1.0)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:345
 #, php-format
 msgid "Notice feed for %s group (RSS 2.0)"
 msgstr "Canal d'avisos del grup %s (RSS 2.0)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:352
 #, php-format
 msgid "Notice feed for %s group (Atom)"
 msgstr "Canal d'avisos del grup %s (Atom)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:358
 #, php-format
 msgid "FOAF for %s group"
 msgstr "Safata de sortida per %s"
 
 #. TRANS: Header for mini list of group members on a group page (h2).
-#: actions/showgroup.php:395
 msgid "Members"
 msgstr "Membres"
 
@@ -5608,30 +4618,23 @@ msgstr "Membres"
 #. TRANS: Text for user subscription statistics if the user has no subscriptions.
 #. TRANS: Text for user subscriber statistics if user has no subscribers.
 #. TRANS: Text for user user group membership statistics if user is not a member of any group.
-#: actions/showgroup.php:401 lib/profileaction.php:137
-#: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
-#: lib/subscriptionlist.php:123 lib/tagcloudsection.php:71
 msgid "(None)"
 msgstr "(Cap)"
 
 #. TRANS: Link to all group members from mini list of group members if group has more than n members.
-#: actions/showgroup.php:410
 msgid "All members"
 msgstr "Tots els membres"
 
 #. TRANS: Header for group statistics on a group page (h2).
 #. TRANS: H2 text for user statistics.
-#: actions/showgroup.php:441 lib/profileaction.php:205
 msgid "Statistics"
 msgstr "Estadístiques"
 
-#: actions/showgroup.php:444
 msgctxt "LABEL"
 msgid "Created"
 msgstr "S'ha creat"
 
 #. TRANS: Label for member count in statistics on group page.
-#: actions/showgroup.php:449
 msgctxt "LABEL"
 msgid "Members"
 msgstr "Membres"
@@ -5640,7 +4643,6 @@ msgstr "Membres"
 #. TRANS: **%s** is the group alias, %%%%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).
-#: actions/showgroup.php:464
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5659,7 +4661,6 @@ 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: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
-#: actions/showgroup.php:474
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5673,100 +4674,84 @@ msgstr ""
 "curts sobre llur vida i interessos. "
 
 #. TRANS: Header for list of group administrators on a group page (h2).
-#: actions/showgroup.php:503
 msgid "Admins"
 msgstr "Administradors"
 
 #. TRANS: Client error displayed requesting a single message that does not exist.
-#: actions/showmessage.php:76
 msgid "No such message."
 msgstr "No existeix el missatge."
 
 #. TRANS: Client error displayed requesting a single direct message the requesting user was not a party in.
-#: actions/showmessage.php:86
 msgid "Only the sender and recipient may read this message."
 msgstr "Només el remitent i el receptor poden llegir aquest missatge."
 
 #. TRANS: Page title for single direct message display when viewing user is the sender.
 #. TRANS: %1$s is the addressed user's nickname, $2$s is a timestamp.
-#: actions/showmessage.php:105
 #, php-format
 msgid "Message to %1$s on %2$s"
 msgstr "Missatge per a %1$s a %2$s"
 
 #. TRANS: Page title for single message display.
 #. TRANS: %1$s is the sending user's nickname, $2$s is a timestamp.
-#: actions/showmessage.php:113
 #, php-format
 msgid "Message from %1$s on %2$s"
 msgstr "Missatge de %1$s a %2$s"
 
-#: actions/shownotice.php:90
 msgid "Notice deleted."
 msgstr "S'ha eliminat l'avís."
 
 #. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
-#: actions/showstream.php:70
 #, php-format
 msgid "%1$s tagged %2$s"
 msgstr "%1$s etiquetats %2$s"
 
 #. TRANS: Page title showing tagged notices in one user's stream.
 #. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
-#: actions/showstream.php:74
 #, php-format
 msgid "%1$s tagged %2$s, page %3$d"
 msgstr "%1$s etiquetats %2$s, pàgina %3$d"
 
 #. TRANS: Extended page title showing tagged notices in one user's stream.
 #. TRANS: %1$s is the username, %2$d is the page number.
-#: actions/showstream.php:82
 #, php-format
 msgid "%1$s, page %2$d"
 msgstr "%1$s, pàgina %2$d"
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %1$s is a user nickname, %2$s is a hashtag.
-#: actions/showstream.php:127
 #, php-format
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
 msgstr "Canal d'avisos de %1$s etiquetats amb %2$s (RSS 1.0)"
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.
-#: actions/showstream.php:136
 #, php-format
 msgid "Notice feed for %s (RSS 1.0)"
 msgstr "Canal d'avisos de %s (RSS 1.0)"
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.
-#: actions/showstream.php:145
 #, php-format
 msgid "Notice feed for %s (RSS 2.0)"
 msgstr "Canal d'avisos de %s (RSS 2.0)"
 
-#: actions/showstream.php:152
 #, php-format
 msgid "Notice feed for %s (Atom)"
 msgstr "Canal d'avisos de %s (Atom)"
 
 #. TRANS: Title for link to notice feed. FOAF stands for Friend of a Friend.
 #. TRANS: More information at http://www.foaf-project.org. %s is a user nickname.
-#: actions/showstream.php:159
 #, php-format
 msgid "FOAF for %s"
 msgstr "FOAF de %s"
 
 #. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
-#: actions/showstream.php:205
 #, php-format
 msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr ""
 "Aquesta és la línia temporal de %1$s, però %1$s no hi ha enviat encara res."
 
 #. TRANS: Second sentence of empty list message for a stream for the user themselves.
-#: actions/showstream.php:211
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
@@ -5776,7 +4761,6 @@ msgstr ""
 
 #. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:215
 #, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
@@ -5787,7 +4771,6 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:258
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5804,7 +4787,6 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:265
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5816,163 +4798,127 @@ msgstr ""
 "(http://status.net/). "
 
 #. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
-#: actions/showstream.php:322
 #, php-format
 msgid "Repeat of %s"
 msgstr "Repetició de %s"
 
-#: actions/silence.php:65 actions/unsilence.php:65
 msgid "You cannot silence users on this site."
 msgstr "No podeu silenciar els usuaris d'aquest lloc."
 
-#: actions/silence.php:72
 msgid "User is already silenced."
 msgstr "L'usuari ja està silenciat."
 
-#: actions/siteadminpanel.php:69
 msgid "Basic settings for this StatusNet site"
 msgstr "Paràmetres bàsics d'aquest lloc basat en l'StatusNet."
 
-#: actions/siteadminpanel.php:133
 msgid "Site name must have non-zero length."
 msgstr "El nom del lloc ha de tenir una longitud superior a zero."
 
-#: actions/siteadminpanel.php:141
 msgid "You must have a valid contact email address."
 msgstr "Heu de tenir una adreça electrònica de contacte vàlida."
 
-#: actions/siteadminpanel.php:159
 #, php-format
 msgid "Unknown language \"%s\"."
 msgstr "Llengua desconeguda «%s»."
 
-#: actions/siteadminpanel.php:165
 msgid "Minimum text limit is 0 (unlimited)."
 msgstr "El límit de text mínim és 0 (sense cap límit)."
 
-#: actions/siteadminpanel.php:171
 msgid "Dupe limit must be one or more seconds."
 msgstr "El límit de duplicats ha de ser d'un o més segons."
 
-#: actions/siteadminpanel.php:221
 msgid "General"
 msgstr "General"
 
-#: actions/siteadminpanel.php:224
 msgid "Site name"
 msgstr "Nom del lloc"
 
-#: actions/siteadminpanel.php:225
 msgid "The name of your site, like \"Yourcompany Microblog\""
 msgstr "El nom del vostre lloc, com ara «El microblog de l'empresa»"
 
-#: actions/siteadminpanel.php:229
 msgid "Brought by"
 msgstr "Funciona gràcies a"
 
-#: actions/siteadminpanel.php:230
 msgid "Text used for credits link in footer of each page"
 msgstr "El text que s'utilitza a l'enllaç dels crèdits al peu de cada pàgina"
 
-#: actions/siteadminpanel.php:234
 msgid "Brought by URL"
 msgstr "URL de «Funciona gràcies a»"
 
-#: actions/siteadminpanel.php:235
 msgid "URL used for credits link in footer of each page"
 msgstr "L'URL que s'utilitza en els enllaços de crèdits al peu de cada pàgina"
 
-#: actions/siteadminpanel.php:239
 msgid "Contact email address for your site"
 msgstr "Adreça electrònica de contacte del vostre lloc"
 
-#: actions/siteadminpanel.php:245
 msgid "Local"
 msgstr "Local"
 
-#: actions/siteadminpanel.php:256
 msgid "Default timezone"
 msgstr "Fus horari per defecte"
 
-#: actions/siteadminpanel.php:257
 msgid "Default timezone for the site; usually UTC."
 msgstr "Fus horari per defecte del lloc; normalment UTC."
 
-#: actions/siteadminpanel.php:262
 msgid "Default language"
 msgstr "Llengua per defecte"
 
-#: actions/siteadminpanel.php:263
 msgid "Site language when autodetection from browser settings is not available"
 msgstr ""
 "Llengua del lloc quan la detecció automàtica des de la configuració del "
 "navegador no està disponible"
 
-#: actions/siteadminpanel.php:271
 msgid "Limits"
 msgstr "Límits"
 
-#: actions/siteadminpanel.php:274
 msgid "Text limit"
 msgstr "Límits del text"
 
-#: actions/siteadminpanel.php:274
 msgid "Maximum number of characters for notices."
 msgstr "Nombre màxim de caràcters dels avisos."
 
-#: actions/siteadminpanel.php:278
 msgid "Dupe limit"
 msgstr "Límit de duplicats"
 
-#: actions/siteadminpanel.php:278
 msgid "How long users must wait (in seconds) to post the same thing again."
 msgstr ""
 "Quant de temps cal que esperin els usuaris (en segons) per enviar el mateix "
 "de nou."
 
 #. TRANS: Page title for site-wide notice tab in admin panel.
-#: actions/sitenoticeadminpanel.php:55
 msgid "Site Notice"
 msgstr "Avís per a tot el lloc"
 
 #. TRANS: Instructions for site-wide notice tab in admin panel.
-#: actions/sitenoticeadminpanel.php:66
 msgid "Edit site-wide message"
 msgstr "Edita el missatge per a tot el lloc"
 
 #. TRANS: Server error displayed when saving a site-wide notice was impossible.
-#: actions/sitenoticeadminpanel.php:101
 msgid "Unable to save site notice."
 msgstr "No s'ha pogut desar l'avís per a tot el lloc."
 
 #. TRANS: Client error displayed when a site-wide notice was longer than allowed.
-#: actions/sitenoticeadminpanel.php:112
 msgid "Maximum length for the site-wide notice is 255 characters."
 msgstr "La mida màxima per als avisos per a tot el lloc és de 255 caràcters."
 
 #. TRANS: Label for site-wide notice text field in admin panel.
-#: actions/sitenoticeadminpanel.php:176
 msgid "Site notice text"
 msgstr "Text d'avís per a tot el lloc"
 
 #. TRANS: Tooltip for site-wide notice text field in admin panel.
-#: actions/sitenoticeadminpanel.php:179
 msgid "Site-wide notice text (255 characters maximum; HTML allowed)"
 msgstr "Text d'avís per a tot el lloc (màxim 255 caràcters; es permet l'HTML)"
 
 #. TRANS: Title for button to save site notice in admin panel.
-#: actions/sitenoticeadminpanel.php:201
 msgid "Save site notice."
 msgstr "Desa l'avís per a tot el lloc."
 
 #. TRANS: Title for SMS settings.
-#: actions/smssettings.php:56
 msgid "SMS settings"
 msgstr "Paràmetres de l'SMS"
 
 #. TRANS: SMS settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/smssettings.php:70
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr ""
@@ -5980,58 +4926,47 @@ msgstr ""
 "site.name%%."
 
 #. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
-#: actions/smssettings.php:92
 msgid "SMS is not available."
 msgstr "L'SMS no és disponible."
 
 #. TRANS: Form legend for SMS settings form.
-#: actions/smssettings.php:106
 msgid "SMS address"
 msgstr "Adreça SMS"
 
 #. TRANS: Form guide in SMS settings form.
-#: actions/smssettings.php:115
 msgid "Current confirmed SMS-enabled phone number."
 msgstr "Número de telèfon actualment confirmat i activat per SMS."
 
 #. TRANS: Form guide in IM settings form.
-#: actions/smssettings.php:128
 msgid "Awaiting confirmation on this phone number."
 msgstr "S'està esperant la confirmació d'aquest número de telèfon."
 
 #. TRANS: Field label for SMS address input in SMS settings form.
-#: actions/smssettings.php:137
 msgid "Confirmation code"
 msgstr "Codi de confirmació"
 
 #. TRANS: Form field instructions in SMS settings form.
-#: actions/smssettings.php:139
 msgid "Enter the code you received on your phone."
 msgstr "Escriu el codi que has rebut en el teu telèfon mòbil."
 
 #. TRANS: Button label to confirm SMS confirmation code in SMS settings.
-#: actions/smssettings.php:143
 msgctxt "BUTTON"
 msgid "Confirm"
 msgstr "Confirma"
 
 #. TRANS: Field label for SMS phone number input in SMS settings form.
-#: actions/smssettings.php:148
 msgid "SMS phone number"
 msgstr "Número de telèfon per als SMS"
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
-#: actions/smssettings.php:151
 msgid "Phone number, no punctuation or spaces, with area code."
 msgstr "Número de telèfon, no puntuació ni espais, en l'àrea del codi."
 
 #. TRANS: Form legend for SMS preferences form.
-#: actions/smssettings.php:190
 msgid "SMS preferences"
 msgstr "Preferències de l'SMS"
 
 #. TRANS: Checkbox label in SMS preferences form.
-#: actions/smssettings.php:196
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
@@ -6040,32 +4975,26 @@ msgstr ""
 "exorbitant càrrega del meu transport."
 
 #. TRANS: Confirmation message for successful SMS preferences save.
-#: actions/smssettings.php:307
 msgid "SMS preferences saved."
 msgstr "S'han desat les preferències de l'SMS."
 
 #. TRANS: Message given saving SMS phone number without having provided one.
-#: actions/smssettings.php:329
 msgid "No phone number."
 msgstr "No hi ha cap número de telèfon."
 
 #. TRANS: Message given saving SMS phone number without having selected a carrier.
-#: actions/smssettings.php:335
 msgid "No carrier selected."
 msgstr "No s'ha sel·leccionat cap transport."
 
 #. TRANS: Message given saving SMS phone number that is already set.
-#: actions/smssettings.php:343
 msgid "That is already your phone number."
 msgstr "Aquest ja és el vostre número de telèfon."
 
 #. TRANS: Message given saving SMS phone number that is already set for another user.
-#: actions/smssettings.php:347
 msgid "That phone number already belongs to another user."
 msgstr "Aquest número de telèfon pertany a un altre usuari."
 
 #. TRANS: Message given saving valid SMS phone number that is to be confirmed.
-#: actions/smssettings.php:375
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
 "for the code and instructions on how to use it."
@@ -6075,39 +5004,32 @@ msgstr ""
 "servir."
 
 #. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
-#: actions/smssettings.php:403
 msgid "That is the wrong confirmation number."
 msgstr "Aquest és un número de confirmació incorrecte."
 
 #. TRANS: Message given after successfully canceling SMS phone number confirmation.
-#: actions/smssettings.php:417
 msgid "SMS confirmation cancelled."
 msgstr "La confirmació d'SMS s'ha cancel·lat."
 
 #. TRANS: Message given trying to remove an SMS phone number that is not
 #. TRANS: registered for the active user.
-#: actions/smssettings.php:437
 msgid "That is not your phone number."
 msgstr "Aquest no és el teu número de telèfon."
 
 #. TRANS: Message given after successfully removing a registered SMS phone number.
-#: actions/smssettings.php:459
 msgid "The SMS phone number was removed."
 msgstr "S'ha eliminat el número de telèfon de l'SMS."
 
 #. TRANS: Label for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:498
 msgid "Mobile carrier"
 msgstr "Transport mòbil"
 
 #. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:503
 msgid "Select a carrier"
 msgstr "Selecciona un transport"
 
 #. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
 #. TRANS: %s is an administrative contact's e-mail address.
-#: actions/smssettings.php:512
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -6118,118 +5040,93 @@ msgstr ""
 "un missatge de correu per fer-nos-ho saber %s."
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
-#: actions/smssettings.php:534
 msgid "No code entered."
 msgstr "No s'ha introduït cap codi."
 
 #. TRANS: Menu item for site administration
-#: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
-#: lib/adminpanelaction.php:395
 msgid "Snapshots"
 msgstr "Instantànies"
 
-#: actions/snapshotadminpanel.php:65
 msgid "Manage snapshot configuration"
 msgstr "Gestiona la configuració de les instantànies"
 
-#: actions/snapshotadminpanel.php:127
 msgid "Invalid snapshot run value."
 msgstr "El valor d'execució d'instantànies no és vàlid."
 
-#: actions/snapshotadminpanel.php:133
 msgid "Snapshot frequency must be a number."
 msgstr "La freqüència de les instantànies ha de ser un nombre."
 
-#: actions/snapshotadminpanel.php:144
 msgid "Invalid snapshot report URL."
 msgstr "L'URL d'informe d'instantànies no és vàlid."
 
-#: actions/snapshotadminpanel.php:200
 msgid "Randomly during web hit"
 msgstr "A l'atzar durant les sol·licituds web"
 
-#: actions/snapshotadminpanel.php:201
 msgid "In a scheduled job"
 msgstr "En una tasca planificada"
 
-#: actions/snapshotadminpanel.php:206
 msgid "Data snapshots"
 msgstr "Instantànies de dades"
 
-#: actions/snapshotadminpanel.php:208
 msgid "When to send statistical data to status.net servers"
 msgstr "Quan enviar dades estadístiques als servidors de l'status.net"
 
-#: actions/snapshotadminpanel.php:217
 msgid "Frequency"
 msgstr "Freqüència"
 
-#: actions/snapshotadminpanel.php:218
 msgid "Snapshots will be sent once every N web hits"
 msgstr "Les instantànies s'enviaran una vegada cada N sol·licituds web"
 
-#: actions/snapshotadminpanel.php:226
 msgid "Report URL"
 msgstr "Informa de l'URL"
 
-#: actions/snapshotadminpanel.php:227
 msgid "Snapshots will be sent to this URL"
 msgstr "Les instantànies s'enviaran a aquest URL"
 
-#: actions/snapshotadminpanel.php:248
 msgid "Save snapshot settings"
 msgstr "Desa els paràmetres de les instantànies"
 
 #. TRANS: Client error displayed trying a change a subscription for a non-subscribed profile.
-#: actions/subedit.php:75
 msgid "You are not subscribed to that profile."
 msgstr "No estàs subscrit a aquest perfil."
 
 #. TRANS: Server error displayed when updating a subscription fails with a database error.
 #. TRANS: Exception thrown when a subscription could not be stored on the server.
-#: actions/subedit.php:89 classes/Subscription.php:141
 msgid "Could not save subscription."
 msgstr "No s'ha pogut guardar la subscripció."
 
 #. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
-#: actions/subscribe.php:121
 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
 msgstr "No podeu subscriure-us a un perfil remot OMB 0.1 amb aquesta acció."
 
 #. TRANS: Page title when subscription succeeded.
-#: actions/subscribe.php:149
 msgid "Subscribed"
 msgstr "Subscrit"
 
 #. TRANS: Header for list of subscribers for a user (first page).
 #. TRANS: %s is the user's nickname.
-#: actions/subscribers.php:51
 #, php-format
 msgid "%s subscribers"
 msgstr "Subscriptors de %s"
 
 #. TRANS: Header for list of subscribers for a user (not first page).
 #. TRANS: %1$s is the user's nickname, $2$d is the page number.
-#: actions/subscribers.php:55
 #, php-format
 msgid "%1$s subscribers, page %2$d"
 msgstr "%1$s subscriptors, pàgina %2$d"
 
 #. TRANS: Page notice for page with an overview of all subscribers
 #. TRANS: of the logged in user's own profile.
-#: actions/subscribers.php:68
 msgid "These are the people who listen to your notices."
 msgstr "Aquestes són les persones que escolten els vostres avisos."
 
 #. TRANS: Page notice for page with an overview of all subscribers of a user other
 #. TRANS: than the logged in user. %s is the user nickname.
-#: actions/subscribers.php:74
 #, php-format
 msgid "These are the people who listen to %s's notices."
 msgstr "Aquestes són les persones que escolten els avisos de %s."
 
 #. TRANS: Subscriber list text when the logged in user has no subscribers.
-#: actions/subscribers.php:114
 msgid ""
 "You have no subscribers. Try subscribing to people you know and they might "
 "return the favor."
@@ -6239,7 +5136,6 @@ msgstr ""
 
 #. TRANS: Subscriber list text when looking at the subscribers for a of a user other
 #. TRANS: than the logged in user that has no subscribers. %s is the user nickname.
-#: actions/subscribers.php:118
 #, php-format
 msgid "%s has no subscribers. Want to be the first?"
 msgstr "%s no té subscriptors. Voleu ser-ne el primer?"
@@ -6249,7 +5145,6 @@ msgstr "%s no té subscriptors. Voleu ser-ne el primer?"
 #. TRANS: This message contains a Markdown URL. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.
-#: actions/subscribers.php:127
 #, php-format
 msgid ""
 "%s has no subscribers. Why not [register an account](%%%%action.register%%%"
@@ -6260,20 +5155,17 @@ msgstr ""
 
 #. TRANS: Header for subscriptions overview for a user (not first page).
 #. TRANS: %1$s is a user nickname, %2$d is the page number.
-#: actions/subscriptions.php:55
 #, php-format
 msgid "%1$s subscriptions, page %2$d"
 msgstr "%1$s subscripcions, pàgina %2$d"
 
 #. TRANS: Page notice for page with an overview of all subscriptions
 #. TRANS: of the logged in user's own profile.
-#: actions/subscriptions.php:68
 msgid "These are the people whose notices you listen to."
 msgstr "Aquestes són les persones que escolteu."
 
 #. TRANS: Page notice for page with an overview of all subscriptions of a user other
 #. TRANS: than the logged in user. %s is the user nickname.
-#: actions/subscriptions.php:74
 #, php-format
 msgid "These are the people whose notices %s listens to."
 msgstr "Aquestes són les persones que %s escolta."
@@ -6282,7 +5174,6 @@ msgstr "Aquestes són les persones que %s escolta."
 #. 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.
-#: actions/subscriptions.php:133
 #, php-format
 msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "
@@ -6302,69 +5193,55 @@ msgstr ""
 #. TRANS: than the logged in user that has no subscriptions. %s is the user nickname.
 #. TRANS: Subscription list text when looking at the subscriptions for a of a user that has none
 #. TRANS: as an anonymous user. %s is the user nickname.
-#: actions/subscriptions.php:141 actions/subscriptions.php:147
 #, php-format
 msgid "%s is not listening to anyone."
 msgstr "%s no escolta a ningú."
 
 #. TRANS: Atom feed title. %s is a profile nickname.
-#: actions/subscriptions.php:176
 #, php-format
 msgid "Subscription feed for %s (Atom)"
 msgstr "Canal de subscripció de %s (Atom)"
 
 #. TRANS: Checkbox label for enabling Jabber messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:241 lib/settingsnav.php:110
-#, fuzzy
 msgid "IM"
 msgstr "MI"
 
 #. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:256 lib/settingsnav.php:117
 msgid "SMS"
 msgstr "SMS"
 
 #. TRANS: Title for all but the first page of notices with tags.
 #. TRANS: %1$s is the tag, %2$d is the page number.
-#: actions/tag.php:73
 #, php-format
 msgid "Notices tagged with %1$s, page %2$d"
 msgstr "Avisos etiquetats amb %1$s, pàgina %2$d"
 
-#: actions/tag.php:91
 #, php-format
 msgid "Notice feed for tag %s (RSS 1.0)"
 msgstr "Canal d'avisos de l'etiqueta %s (RSS 1.0)"
 
-#: actions/tag.php:97
 #, php-format
 msgid "Notice feed for tag %s (RSS 2.0)"
 msgstr "Canal d'avisos de l'etiqueta %s (RSS 2.0)"
 
-#: actions/tag.php:103
 #, php-format
 msgid "Notice feed for tag %s (Atom)"
 msgstr "Canal d'avisos de l'etiqueta %s (Atom)"
 
-#: actions/tagother.php:39
 msgid "No ID argument."
 msgstr "No hi ha cap argument ID."
 
-#: actions/tagother.php:65
 #, php-format
 msgid "Tag %s"
 msgstr "Etiqueta %s"
 
 #. TRANS: H2 for user profile information.
-#: actions/tagother.php:77 lib/userprofile.php:76
 msgid "User profile"
 msgstr "Perfil de l'usuari"
 
-#: actions/tagother.php:120
 msgid "Tag user"
 msgstr "Etiqueta usuari"
 
-#: actions/tagother.php:130
 msgid ""
 "Tags for this user (letters, numbers, -, ., and _), comma- or space- "
 "separated"
@@ -6372,50 +5249,40 @@ msgstr ""
 "Etiquetes d'aquest usuari (lletres, nombres,, -, ., i _), comes o separades "
 "amb espais"
 
-#: actions/tagother.php:157
 #, php-format
 msgid "Invalid tag: \"%s\""
 msgstr "L'etiqueta no és vàlida: «%s»"
 
-#: actions/tagother.php:172
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 "Només podeu etiquetar gent a la qual estigueu subscrit o que us hagin "
 "subscrit."
 
-#: actions/tagother.php:215
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
 "Utilitzeu aquest formulari per afegir etiquetes als vostres subscriptors i "
 "subscripcions."
 
-#: actions/tagrss.php:35
 msgid "No such tag."
 msgstr "No existeix aquesta etiqueta."
 
 #. TRANS: Client error displayed when trying to unblock a non-blocked user.
-#: actions/unblock.php:59
 msgid "You haven't blocked that user."
 msgstr "No heu blocat l'usuari."
 
-#: actions/unsandbox.php:72
 msgid "User is not sandboxed."
 msgstr "L'usuari no està a l'entorn de proves."
 
-#: actions/unsilence.php:72
 msgid "User is not silenced."
 msgstr "L'usuari no està silenciat."
 
-#: actions/unsubscribe.php:77
 msgid "No profile ID in request."
 msgstr "No hi ha cap identificador del perfil en la sol·licitud."
 
-#: actions/unsubscribe.php:98
 msgid "Unsubscribed"
 msgstr "No subscrit"
 
-#: actions/updateprofile.php:64
 #, php-format
 msgid ""
 "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
@@ -6423,174 +5290,139 @@ msgstr ""
 "La llicència del flux de qui escolteu, «%1$s», no és compatible amb la "
 "llicència del lloc, «%2$s»."
 
-#: actions/urlsettings.php:60
 #, fuzzy
 msgid "URL settings"
 msgstr "Paràmetres de missatgeria instantània"
 
 #. TRANS: Instructions for tab "Other" in user profile settings.
-#: actions/urlsettings.php:72
 msgid "Manage various other options."
 msgstr "Gestiona altres opcions diferents."
 
 #. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
 #. TRANS: user's profile settings. This message has one space at the beginning. Use your
 #. TRANS: language's word separator here if it has one (most likely a single space).
-#: actions/urlsettings.php:115
 msgid " (free service)"
 msgstr " (servei lliure)"
 
-#: actions/urlsettings.php:121
 #, fuzzy
 msgid "[none]"
 msgstr "Cap"
 
-#: actions/urlsettings.php:122
 msgid "[internal]"
 msgstr ""
 
 #. TRANS: Label for dropdown with URL shortener services.
-#: actions/urlsettings.php:130
 msgid "Shorten URLs with"
 msgstr "Escurça els URL amb"
 
 #. TRANS: Tooltip for for dropdown with URL shortener services.
-#: actions/urlsettings.php:132
 msgid "Automatic shortening service to use."
 msgstr "Servei d'auto-escurçament a utilitzar."
 
-#: actions/urlsettings.php:138
 msgid "URL longer than"
 msgstr ""
 
-#: actions/urlsettings.php:141
 msgid "URLs longer than this will be shortened, 0 means always shorten."
 msgstr ""
 
-#: actions/urlsettings.php:145
 msgid "Text longer than"
 msgstr ""
 
-#: actions/urlsettings.php:148
 msgid ""
 "URLs in notices longer than this will be shortened, 0 means always shorten."
 msgstr ""
 
 #. TRANS: Form validation error for form "Other settings" in user profile.
-#: actions/urlsettings.php:180
 msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr ""
 "El servei d'autoescurçament d'URL és massa llarga (màxim 50 caràcters)."
 
-#: actions/urlsettings.php:187
 msgid "Invalid number for max url length."
 msgstr ""
 
-#: actions/urlsettings.php:193
 #, fuzzy
 msgid "Invalid number for max notice length."
 msgstr "El contingut de l'avís no és vàlid."
 
-#: actions/urlsettings.php:238
 msgid "Error saving user URL shortening preferences."
 msgstr ""
 
 #. TRANS: User admin panel title
-#: actions/useradminpanel.php:58
 msgctxt "TITLE"
 msgid "User"
 msgstr "Usuari"
 
 #. TRANS: Instruction for user admin panel.
-#: actions/useradminpanel.php:69
 msgid "User settings for this StatusNet site"
 msgstr "Paràmetres d'usuari d'aquest lloc basat en StatusNet"
 
 #. TRANS: Form validation error in user admin panel when a non-numeric character limit was set.
-#: actions/useradminpanel.php:147
 msgid "Invalid bio limit. Must be numeric."
 msgstr "El límit de la biografia no és vàlid. Cal que sigui numèric."
 
 #. TRANS: Form validation error in user admin panel when welcome text is too long.
-#: actions/useradminpanel.php:154
 msgid "Invalid welcome text. Maximum length is 255 characters."
 msgstr ""
 "El text de benvinguda no és vàlid. La longitud màxima és de 255 caràcters."
 
 #. TRANS: Client error displayed when trying to set a non-existing user as default subscription for new
 #. TRANS: users in user admin panel. %1$s is the invalid nickname.
-#: actions/useradminpanel.php:166
 #, php-format
 msgid "Invalid default subscripton: \"%1$s\" is not a user."
 msgstr "La subscripció per defecte no és vàlida: «%1$s» no és cap usuari."
 
-#: actions/useradminpanel.php:215 lib/action.php:565 lib/settingsnav.php:77
-#: lib/subgroupnav.php:81
 msgid "Profile"
 msgstr "Perfil"
 
 #. TRANS: Field label in user admin panel for setting the character limit for the bio field.
-#: actions/useradminpanel.php:220
 msgid "Bio Limit"
 msgstr "Límit de la biografia"
 
 #. TRANS: Tooltip in user admin panel for setting the character limit for the bio field.
-#: actions/useradminpanel.php:222
 msgid "Maximum length of a profile bio in characters."
 msgstr "Límit màxim de la biografia d'un perfil (en caràcters)."
 
 #. TRANS: Form legend in user admin panel.
-#: actions/useradminpanel.php:231
 msgid "New users"
 msgstr "Usuaris nous"
 
 #. TRANS: Field label in user admin panel for setting new user welcome text.
-#: actions/useradminpanel.php:236
 msgid "New user welcome"
 msgstr "Benvinguda als usuaris nous"
 
 #. TRANS: Tooltip in user admin panel for setting new user welcome text.
-#: actions/useradminpanel.php:238
 msgid "Welcome text for new users (maximum 255 characters)."
 msgstr "Text de benvinguda per a nous usuaris (màxim 255 caràcters)."
 
 #. TRANS: Field label in user admin panel for setting default subscription for new users.
-#: actions/useradminpanel.php:244
 msgid "Default subscription"
 msgstr "Subscripció per defecte"
 
 #. TRANS: Tooltip in user admin panel for setting default subscription for new users.
-#: actions/useradminpanel.php:246
 msgid "Automatically subscribe new users to this user."
 msgstr "Subscriviu automàticament els usuaris nous a aquest usuari."
 
 #. TRANS: Form legend in user admin panel.
-#: actions/useradminpanel.php:256
 msgid "Invitations"
 msgstr "Invitacions"
 
 #. TRANS: Field label for checkbox in user admin panel for allowing users to invite friend using site e-mail.
-#: actions/useradminpanel.php:262
 msgid "Invitations enabled"
 msgstr "S'han habilitat les invitacions"
 
 #. TRANS: Tooltip for checkbox in user admin panel for allowing users to invite friend using site e-mail.
-#: actions/useradminpanel.php:265
 msgid "Whether to allow users to invite new users."
 msgstr "Si es permet als usuaris invitar-ne de nous."
 
 #. TRANS: Title for button to save user settings in user admin panel.
-#: actions/useradminpanel.php:302
 msgid "Save user settings."
 msgstr "Desa els paràmetres d'usuari."
 
 #. TRANS: Page title.
-#: actions/userauthorization.php:109
 msgid "Authorize subscription"
 msgstr "Autoritza la subscripció"
 
 #. TRANS: Page notice on "Auhtorize subscription" page.
-#: actions/userauthorization.php:115
 #, fuzzy
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
@@ -6602,40 +5434,33 @@ msgstr ""
 "ningú, feu clic a «Rebutja»."
 
 #. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:200
 msgctxt "BUTTON"
 msgid "Accept"
 msgstr "Accepta"
 
 #. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:202
 msgid "Subscribe to this user."
 msgstr "Subscriu-me a aquest usuari"
 
 #. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:204
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Reject"
 msgstr "Rebutja"
 
 #. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:206
 #, fuzzy
 msgid "Reject this subscription."
 msgstr "Rebutja la subscripció"
 
 #. TRANS: Client error displayed for an empty authorisation request.
-#: actions/userauthorization.php:219
 msgid "No authorization request!"
 msgstr "No és una sol·licitud d'autorització!"
 
 #. TRANS: Accept message header from Authorise subscription page.
-#: actions/userauthorization.php:242
 msgid "Subscription authorized"
 msgstr "Subscripció autoritzada"
 
-#: actions/userauthorization.php:245
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to authorize the "
@@ -6646,11 +5471,9 @@ msgstr ""
 "com autoritzar la subscripció. El vostre testimoni de subscripció és:"
 
 #. TRANS: Reject message header from Authorise subscription page.
-#: actions/userauthorization.php:256
 msgid "Subscription rejected"
 msgstr "Subscripció rebutjada"
 
-#: actions/userauthorization.php:259
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to fully reject the "
@@ -6662,35 +5485,30 @@ msgstr ""
 
 #. TRANS: Exception thrown when no valid user is found for an authorisation request.
 #. TRANS: %s is a listener URI.
-#: actions/userauthorization.php:296
 #, fuzzy, php-format
 msgid "Listener URI \"%s\" not found here."
 msgstr "No s'hi ha trobat l'URI de qui us escolta, «%s»."
 
 #. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
 #. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:303
 #, fuzzy, php-format
 msgid "Listenee URI \"%s\" is too long."
 msgstr "L'URI de qui escolteu, «%s», és massa llarga."
 
 #. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
 #. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:311
 #, fuzzy, php-format
 msgid "Listenee URI \"%s\" is a local user."
 msgstr "L'URI de qui escolteu, «%s», és un usuari local."
 
 #. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
 #. TRANS: %s is a profile URL.
-#: actions/userauthorization.php:329
 #, fuzzy, php-format
 msgid "Profile URL \"%s\" is for a local user."
 msgstr "L'URL del perfil «%s» és només per a un usuari local."
 
 #. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
 #. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
-#: actions/userauthorization.php:339
 #, fuzzy, php-format
 msgid ""
 "Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
@@ -6701,32 +5519,27 @@ msgstr ""
 
 #. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
 #. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:349
 #, fuzzy, php-format
 msgid "Avatar URL \"%s\" is not valid."
 msgstr "L'URL de l'avatar «%s» no és vàlid."
 
 #. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
 #. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:356
 #, php-format
 msgid "Cannot read avatar URL \"%s\"."
 msgstr "No es pot llegir l'URL de l'avatar «%s»."
 
 #. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
 #. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:363
 #, php-format
 msgid "Wrong image type for avatar URL \"%s\"."
 msgstr "Tipus d'imatge incorrecta per a l'URL de l'avatar «%s»."
 
 #. TRANS: Page title for profile design page.
-#: actions/userdesignsettings.php:74 lib/designsettings.php:61
 msgid "Profile design"
 msgstr "Disseny del perfil"
 
 #. TRANS: Instructions for profile design page.
-#: actions/userdesignsettings.php:84 lib/designsettings.php:72
 msgid ""
 "Customize the way your profile looks with a background image and a colour "
 "palette of your choice."
@@ -6734,44 +5547,35 @@ msgstr ""
 "Personalitzeu l'aspecte del vostre perfil amb una imatge de fons o una "
 "paleta de colors de la vostra elecció."
 
-#: actions/userdesignsettings.php:289
 msgid "Enjoy your hotdog!"
 msgstr "Gaudiu de l'entrepà!"
 
-#: actions/userdesignsettings.php:325
 #, fuzzy
 msgid "Design settings"
 msgstr "Desa els paràmetres del lloc"
 
-#: actions/userdesignsettings.php:340
 msgid "View profile designs"
 msgstr "Visualitza els dissenys de perfil"
 
-#: actions/userdesignsettings.php:341
 msgid "Show or hide profile designs."
 msgstr "Mostra o amaga els dissenys de perfil."
 
-#: actions/userdesignsettings.php:348
 #, fuzzy
 msgid "Background file"
 msgstr "Fons"
 
 #. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number.
-#: actions/usergroups.php:66
 #, php-format
 msgid "%1$s groups, page %2$d"
 msgstr "Grups de %1$s, pàgina %2$d"
 
-#: actions/usergroups.php:132
 msgid "Search for more groups"
 msgstr "Cerca més grups"
 
-#: actions/usergroups.php:159
 #, php-format
 msgid "%s is not a member of any group."
 msgstr "%s no és membre de cap grup."
 
-#: actions/usergroups.php:164
 #, php-format
 msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
 msgstr "Proveu de [cercar grups](%%action.groupsearch%%) i unir-vos-hi."
@@ -6781,18 +5585,14 @@ msgstr "Proveu de [cercar grups](%%action.groupsearch%%) i unir-vos-hi."
 #. TRANS: %1$s is a group name, %2$s is a site name.
 #. TRANS: Message is used as a subtitle in atom user notice feed.
 #. TRANS: %1$s is a user name, %2$s is a site name.
-#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:70
-#: lib/atomusernoticefeed.php:95
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr "Actualitzacions de %1$s a %2$s!"
 
-#: actions/version.php:75
 #, php-format
 msgid "StatusNet %s"
 msgstr "StatusNet %s"
 
-#: actions/version.php:155
 #, php-format
 msgid ""
 "This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
@@ -6801,16 +5601,13 @@ msgstr ""
 "El lloc funciona gràcies a %1$s versió %2$s. Copyright 2008-2010 StatusNet, "
 "Inc. i col·laboradors."
 
-#: actions/version.php:163
 msgid "Contributors"
 msgstr "Col·laboració"
 
 #. TRANS: Menu item for site administration
-#: actions/version.php:167 lib/adminpanelaction.php:403
 msgid "License"
 msgstr "Llicència"
 
-#: actions/version.php:170
 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 "
@@ -6822,7 +5619,6 @@ msgstr ""
 "i 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. "
 
-#: actions/version.php:176
 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 "
@@ -6834,7 +5630,6 @@ msgstr ""
 "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. "
 
-#: actions/version.php:182
 #, php-format
 msgid ""
 "You should have received a copy of the GNU Affero General Public License "
@@ -6844,52 +5639,42 @@ msgstr ""
 "License juntament amb el programa. Si no és així, consulteu %s."
 
 #. TRANS: Form input field label for application name.
-#: actions/version.php:197 lib/applicationeditform.php:190
 msgid "Name"
 msgstr "Nom"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:885
 msgid "Version"
 msgstr "Versió"
 
-#: actions/version.php:199
 msgid "Author(s)"
 msgstr "Autoria"
 
 #. TRANS: Form input field label.
-#: actions/version.php:200 lib/applicationeditform.php:208
-#: lib/groupeditform.php:168
 msgid "Description"
 msgstr "Descripció"
 
 #. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:164
 msgid "Favor"
 msgstr "Preferit"
 
 #. TRANS: Ntofication given when a user marks a notice as favorite.
 #. TRANS: %1$s is a user nickname or full name, %2$s is a notice URI.
-#: classes/Fave.php:167
 #, php-format
 msgid "%1$s marked notice %2$s as a favorite."
 msgstr "%1$s ha marcat l'avís %2$s com a preferit"
 
 #. TRANS: Server exception thrown when a URL cannot be processed.
-#: classes/File.php:162
 #, php-format
 msgid "Cannot process URL '%s'"
 msgstr "No es pot processar l'URL «%s»"
 
 #. TRANS: Server exception thrown when... Robin thinks something is impossible!
-#: classes/File.php:194
 msgid "Robin thinks something is impossible."
 msgstr "El Robin pensa que quelcom és impossible."
 
 #. 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$s is used for plural.
-#: classes/File.php:210
 #, php-format
 msgid ""
 "No file may be larger than %1$d byte and the file you sent was %2$d bytes. "
@@ -6906,7 +5691,6 @@ msgstr[1] ""
 
 #. TRANS: Message given if an upload would exceed user quota.
 #. TRANS: %d (number) is the user quota in bytes and is used for plural.
-#: classes/File.php:223
 #, php-format
 msgid "A file this large would exceed your user quota of %d byte."
 msgid_plural "A file this large would exceed your user quota of %d bytes."
@@ -6917,7 +5701,6 @@ msgstr[1] ""
 
 #. TRANS: Message given id an upload would exceed a user's monthly quota.
 #. TRANS: $d (number) is the monthly user quota in bytes and is used for plural.
-#: classes/File.php:235
 #, php-format
 msgid "A file this large would exceed your monthly quota of %d byte."
 msgid_plural "A file this large would exceed your monthly quota of %d bytes."
@@ -6927,92 +5710,76 @@ msgstr[1] ""
 "Un fitxer d'aquesta mida excediria la vostra quota mensual de %d bytes."
 
 #. TRANS: Client exception thrown if a file upload does not have a valid name.
-#: classes/File.php:282 classes/File.php:297
 msgid "Invalid filename."
 msgstr "El nom del fitxer no és vàlid."
 
 #. TRANS: Exception thrown when joining a group fails.
-#: classes/Group_member.php:51
 msgid "Group join failed."
 msgstr "No s'ha pogut unir al grup."
 
 #. TRANS: Exception thrown when trying to leave a group the user is not a member of.
-#: classes/Group_member.php:64
 msgid "Not part of group."
 msgstr "No s'és part del grup."
 
 #. TRANS: Exception thrown when trying to leave a group fails.
-#: classes/Group_member.php:72
 msgid "Group leave failed."
 msgstr "La sortida del grup ha fallat."
 
 #. TRANS: Exception thrown providing an invalid profile ID.
 #. TRANS: %s is the invalid profile ID.
-#: classes/Group_member.php:85
 #, php-format
 msgid "Profile ID %s is invalid."
 msgstr "L'identificador del perfil %s no és vàlid."
 
 #. TRANS: Exception thrown providing an invalid group ID.
 #. TRANS: %s is the invalid group ID.
-#: classes/Group_member.php:98
 #, php-format
 msgid "Group ID %s is invalid."
 msgstr "L'identificador del grup %s no és vàlid."
 
 #. TRANS: Activity title.
-#: classes/Group_member.php:147 lib/joinform.php:114
 msgid "Join"
 msgstr "Inici de sessió"
 
 #. TRANS: Success message for subscribe to group attempt through OStatus.
 #. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
-#: classes/Group_member.php:151
 #, php-format
 msgid "%1$s has joined group %2$s."
 msgstr "%1$s s'ha unit al grup %2$s."
 
 #. TRANS: Server exception thrown when updating a local group fails.
-#: classes/Local_group.php:42
 msgid "Could not update local group."
 msgstr "No s'ha pogut actualitzar el grup local."
 
 #. TRANS: Exception thrown when trying creating a login token failed.
 #. TRANS: %s is the user nickname for which token creation failed.
-#: classes/Login_token.php:78
 #, php-format
 msgid "Could not create login token for %s"
 msgstr "No s'ha pogut crear un testimoni d'inici de sessió per a %s"
 
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
-#: classes/Memcached_DataObject.php:556
 msgid "No database name or DSN found anywhere."
 msgstr "No s'ha trobat el nom de la base de dades o el DSN enlloc."
 
 #. TRANS: Client exception thrown when a user tries to send a direct message while being banned from sending them.
-#: classes/Message.php:45
 msgid "You are banned from sending direct messages."
 msgstr "Se us ha bandejat enviar missatges directes."
 
 #. TRANS: Message given when a message could not be stored on the server.
-#: classes/Message.php:69
 msgid "Could not insert message."
 msgstr "No s'ha pogut inserir el missatge."
 
 #. TRANS: Message given when a message could not be updated on the server.
-#: classes/Message.php:80
 msgid "Could not update message with new URI."
 msgstr "No s'ha pogut inserir el missatge amb la nova URI."
 
 #. TRANS: Server exception thrown when a user profile for a notice cannot be found.
 #. TRANS: %1$d is a profile ID (number), %2$d is a notice ID (number).
-#: classes/Notice.php:98
 #, php-format
 msgid "No such profile (%1$d) for notice (%2$d)."
 msgstr "No hi ha cap perfil (%1$d) per a l'avís (%2$d)."
 
 #. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:199
 #, php-format
 msgid "Database error inserting hashtag: %s"
 msgstr ""
@@ -7020,24 +5787,20 @@ msgstr ""
 "coixinet (%): %s"
 
 #. TRANS: Client exception thrown if a notice contains too many characters.
-#: classes/Notice.php:279
 msgid "Problem saving notice. Too long."
 msgstr "S'ha produït un problema en desar l'avís. És massa llarg."
 
 #. TRANS: Client exception thrown when trying to save a notice for an unknown user.
-#: classes/Notice.php:284
 msgid "Problem saving notice. Unknown user."
 msgstr "S'ha produït un problema en desar l'avís. Usuari desconegut."
 
 #. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
-#: classes/Notice.php:290
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 "Massa avisos massa ràpid; pren un respir i publica de nou en uns minuts."
 
 #. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
-#: classes/Notice.php:297
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
 "few minutes."
@@ -7046,42 +5809,35 @@ msgstr ""
 "enviar en uns minuts."
 
 #. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:305
 msgid "You are banned from posting notices on this site."
 msgstr "Ha estat bandejat de publicar avisos en aquest lloc."
 
 #. TRANS: Server exception thrown when a notice cannot be saved.
 #. TRANS: Server exception thrown when a notice cannot be updated.
-#: classes/Notice.php:372 classes/Notice.php:399
 msgid "Problem saving notice."
 msgstr "S'ha produït un problema en desar l'avís."
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:929
 msgid "Bad type provided to saveKnownGroups."
 msgstr "S'ha proporcionat un tipus incorrecte per a saveKnownGroups."
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:1028
 msgid "Problem saving group inbox."
 msgstr "S'ha produït un problema en desar la safata d'entrada del grup."
 
 #. TRANS: Server exception thrown when a reply cannot be saved.
 #. TRANS: %1$d is a notice ID, %2$d is the ID of the mentioned user.
-#: classes/Notice.php:1144
 #, php-format
 msgid "Could not save reply for %1$d, %2$d."
 msgstr "No s'ha pogut desar la resposta de %1$d, %2$d."
 
 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1663
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
 
 #. TRANS: Full name of a profile or group followed by nickname in parens
-#: classes/Profile.php:172 classes/User_group.php:242
 #, php-format
 msgctxt "FANCYNAME"
 msgid "%1$s (%2$s)"
@@ -7089,14 +5845,12 @@ msgstr "%1$s (%2$s)"
 
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:779
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr "No es pot revocar el rol «%1$s» de l'usuari #%2$d; no existeix."
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:788
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -7104,251 +5858,198 @@ msgstr ""
 "la base de dades."
 
 #. TRANS: Exception thrown when a right for a non-existing user profile is checked.
-#: classes/Remote_profile.php:54
 msgid "Missing profile."
 msgstr "Manca el perfil."
 
 #. TRANS: Exception thrown when a tag cannot be saved.
-#: classes/Status_network.php:338
 msgid "Unable to save tag."
 msgstr "No s'ha pogut desar l'etiqueta."
 
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#: classes/Subscription.php:77 lib/oauthstore.php:482
 msgid "You have been banned from subscribing."
 msgstr "Se us ha banejat la subscripció."
 
 #. TRANS: Exception thrown when trying to subscribe while already subscribed.
-#: classes/Subscription.php:82
 msgid "Already subscribed!"
 msgstr "Ja hi esteu subscrit!"
 
 #. TRANS: Exception thrown when trying to subscribe to a user who has blocked the subscribing user.
-#: classes/Subscription.php:87
 msgid "User has blocked you."
 msgstr "Un usuari t'ha bloquejat."
 
 #. TRANS: Exception thrown when trying to unsibscribe without a subscription.
-#: classes/Subscription.php:176
 msgid "Not subscribed!"
 msgstr "No hi esteu subscrit!"
 
 #. TRANS: Exception thrown when trying to unsubscribe a user from themselves.
-#: classes/Subscription.php:183
 msgid "Could not delete self-subscription."
 msgstr "No s'ha pogut eliminar l'autosubscripció."
 
 #. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
-#: classes/Subscription.php:211
 msgid "Could not delete subscription OMB token."
 msgstr "No s'ha pogut eliminar el testimoni OMB de la subscripció."
 
 #. TRANS: Exception thrown when a subscription could not be deleted on the server.
-#: classes/Subscription.php:223
 msgid "Could not delete subscription."
 msgstr "No s'ha pogut eliminar la subscripció."
 
 #. TRANS: Activity tile when subscribing to another person.
-#: classes/Subscription.php:265
 msgid "Follow"
 msgstr "Segueix"
 
 #. TRANS: Notification given when one person starts following another.
 #. TRANS: %1$s is the subscriber, %2$s is the subscribed.
-#: classes/Subscription.php:268
 #, php-format
 msgid "%1$s is now following %2$s."
 msgstr "%1$s ara està seguint %2$s."
 
 #. TRANS: Notice given on user registration.
 #. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:390
 #, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr "Us donem la benvinguda a %1$s, @%2$s!"
 
 #. TRANS: Server exception.
-#: classes/User.php:923
 msgid "No single user defined for single-user mode."
 msgstr "No s'ha definit cap usuari únic per al mode d'usuari únic."
 
 #. TRANS: Server exception.
-#: classes/User.php:927
 msgid "Single-user mode code called when not enabled."
 msgstr "S'ha cridat el codi del mode d'únic usuari quan no està habilitat."
 
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:522
 msgid "Could not create group."
 msgstr "No s'ha pogut crear el grup."
 
 #. TRANS: Server exception thrown when updating a group URI failed.
-#: classes/User_group.php:532
 msgid "Could not set group URI."
 msgstr "No es pot definir l'URI del grup."
 
 #. TRANS: Server exception thrown when setting group membership failed.
-#: classes/User_group.php:555
 msgid "Could not set group membership."
 msgstr "No s'ha pogut establir la pertinença d'aquest grup."
 
 #. TRANS: Server exception thrown when saving local group information failed.
-#: classes/User_group.php:570
 msgid "Could not save local group info."
 msgstr "No s'ha pogut desar la informació del grup local."
 
 #. TRANS: Exception thrown when an account could not be located when it should be moved.
 #. TRANS: %s is the remote site.
-#: lib/accountmover.php:65
 #, php-format
 msgid "Cannot locate account %s."
 msgstr "No es pot trobar el compte %s."
 
 #. TRANS: Exception thrown when a service document could not be located account move.
 #. TRANS: %s is the remote site.
-#: lib/accountmover.php:106
 #, php-format
 msgid "Cannot find XRD for %s."
 msgstr "No es pot trobar l'XRD de %s."
 
 #. TRANS: Exception thrown when an account could not be located when it should be moved.
 #. TRANS: %s is the remote site.
-#: lib/accountmover.php:131
 #, php-format
 msgid "No AtomPub API service for %s."
 msgstr "No hi ha cap servei API d'AtomPub de %s."
 
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: lib/action.php:161
 #, php-format
 msgid "%1$s - %2$s"
 msgstr "%1$s - %2$s"
 
 #. TRANS: Page title for a page without a title set.
-#: lib/action.php:177
 msgid "Untitled page"
 msgstr "Pàgina sense titol"
 
 #. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.
-#: lib/action.php:325
 msgctxt "TOOLTIP"
 msgid "Show more"
 msgstr "Mostra més"
 
 #. TRANS: Inline reply form submit button: submits a reply comment.
-#: lib/action.php:328
 #, fuzzy
 msgctxt "BUTTON"
-msgid "Comment"
-msgstr "Contingut"
+msgid "Reply"
+msgstr "Respon"
 
 #. TRANS: Placeholder text for inline reply form. Clicking in this box will turn it into a mini notice form.
-#: lib/action.php:331
-msgid "Add a comment..."
+msgid "Write a reply..."
 msgstr ""
 
-#: lib/action.php:559 lib/personalgroupnav.php:99
-#, fuzzy
 msgid "Home"
 msgstr "Pàgina personal"
 
-#: lib/action.php:560
 #, fuzzy
 msgid "Friends timeline"
 msgstr "%s línia temporal"
 
-#: lib/action.php:566
 #, fuzzy
 msgid "Your profile"
 msgstr "Perfil del grup"
 
-#: lib/action.php:570 lib/action.php:593 lib/publicgroupnav.php:78
 msgid "Public"
 msgstr "Públic"
 
-#: lib/action.php:571 lib/action.php:594
 #, fuzzy
 msgid "Everyone on this site"
 msgstr "Cerca gent en aquest lloc"
 
-#: lib/action.php:575
-#, fuzzy
 msgid "Settings"
 msgstr "Paràmetres de l'SMS"
 
-#: lib/action.php:576
 #, fuzzy
 msgid "Change your personal settings"
 msgstr "Canvieu els paràmetres del vostre perfil"
 
-#: lib/action.php:582
 #, fuzzy
 msgid "Site configuration"
 msgstr "Configuració de l'usuari"
 
-#: lib/action.php:587
-#, fuzzy
 msgid "Logout"
 msgstr "Finalitza la sessió"
 
-#: lib/action.php:588
-#, fuzzy
 msgid "Logout from the site"
 msgstr "Finalitza la sessió del lloc"
 
-#: lib/action.php:599
-#, fuzzy
 msgid "Login to the site"
 msgstr "Inicia una sessió al lloc"
 
-#: lib/action.php:606
-#, fuzzy
 msgid "Search"
 msgstr "Cerca"
 
-#: lib/action.php:607
 #, fuzzy
 msgid "Search the site"
 msgstr "Cerca al lloc"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:864
 msgid "Help"
 msgstr "Ajuda"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:867
 msgid "About"
 msgstr "Quant a"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:870
 msgid "FAQ"
 msgstr "Preguntes més freqüents"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:875
 msgid "TOS"
 msgstr "Termes del servei"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:879
 msgid "Privacy"
 msgstr "Privadesa"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:882
 msgid "Source"
 msgstr "Font"
 
 #. TRANS: Secondary navigation menu option leading to e-mail contact information on the
 #. TRANS: StatusNet site, where to report bugs, ...
-#: lib/action.php:889
 msgid "Contact"
 msgstr "Contacte"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:892
 msgid "Badge"
 msgstr "Insígnia"
 
@@ -7356,7 +6057,6 @@ msgstr "Insígnia"
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:921
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7366,7 +6066,6 @@ msgstr ""
 "site.broughtbyurl%%)."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:924
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** és un servei de microblogging."
@@ -7375,7 +6074,6 @@ msgstr "**%%site.name%%** és un servei de microblogging."
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:931
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7388,21 +6086,18 @@ msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:949
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr "El contingut i les dades de %1$s són privades i confidencials."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:956
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
 "El contingut i les dades són copyright de %1$s. Tots els drets reservats."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:960
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 "El contingut i les dades són copyright dels col·laboradors. Tots els drets "
@@ -7410,7 +6105,6 @@ msgstr ""
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:992
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
@@ -7419,81 +6113,67 @@ msgstr ""
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1335
 msgid "After"
 msgstr "Posteriors"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1345
 msgid "Before"
 msgstr "Anteriors"
 
 #. TRANS: Client exception thrown when a feed instance is a DOMDocument.
-#: lib/activity.php:125
 msgid "Expecting a root feed element but got a whole XML document."
 msgstr ""
 "S'esperava un element del canal arrel, però se n'ha obtingut tot un document "
 "XML sencer."
 
 #. TRANS: Client exception thrown when using an unknown verb for the activity importer.
-#: lib/activityimporter.php:81
 #, php-format
 msgid "Unknown verb: \"%s\"."
 msgstr "Verb desconegut: «%s»."
 
 #. TRANS: Client exception thrown when trying to force a subscription for an untrusted user.
-#: lib/activityimporter.php:107
 msgid "Cannot force subscription for untrusted user."
 msgstr "No es pot forçar la subscripció d'usuaris en què no s'hi confia."
 
 #. TRANS: Client exception thrown when trying to for a remote user to subscribe.
-#: lib/activityimporter.php:117
 msgid "Cannot force remote user to subscribe."
 msgstr "No es pot forçar els usuaris remots a subscriure-s'hi."
 
 #. TRANS: Client exception thrown when trying to subscribe to an unknown profile.
-#: lib/activityimporter.php:132
 msgid "Unknown profile."
 msgstr "Perfil desconegut."
 
 #. TRANS: Client exception thrown when trying to import an event not related to the importing user.
-#: lib/activityimporter.php:138
 msgid "This activity seems unrelated to our user."
 msgstr ""
 "Aquesta activitat sembla que no tingui cap relació amb el nostre usuari."
 
 #. TRANS: Client exception thrown when trying to join a remote group that is not a group.
-#: lib/activityimporter.php:154
 msgid "Remote profile is not a group!"
 msgstr "El perfil remot no és un grup!"
 
 #. TRANS: Client exception thrown when trying to join a group the importing user is already a member of.
-#: lib/activityimporter.php:163
 msgid "User is already a member of this group."
 msgstr "L'usuari ja és membre d'aquest grup."
 
 #. TRANS: Client exception thrown when trying to import a notice by another user.
 #. TRANS: %1$s is the source URI of the notice, %2$s is the URI of the author.
-#: lib/activityimporter.php:201
 #, php-format
 msgid "Already know about notice %1$s and  it has a different author %2$s."
 msgstr "Ja es coneix l'avís %1$s i té un autor diferent %2$s."
 
 #. TRANS: Client exception thrown when trying to overwrite the author information for a non-trusted user during import.
-#: lib/activityimporter.php:207
 msgid "Not overwriting author info for non-trusted user."
 msgstr ""
 "No se sobreescriu la informació d'usuari dels usuaris en què no s'hi confia."
 
 #. TRANS: Client exception thrown when trying to import a notice without content.
 #. TRANS: %s is the notice URI.
-#: lib/activityimporter.php:223
 #, php-format
 msgid "No content for notice %s."
 msgstr "No hi ha contingut a l'avís %s."
 
-#: lib/activitymover.php:84
 #, php-format
 msgid "No such user %s."
 msgstr "No existeix l'usuari %s."
@@ -7504,171 +6184,139 @@ msgstr "No existeix l'usuari %s."
 #. TRANS: %1$s is a URL, %2$s is the status, %s$s is the fail reason.
 #. TRANS: Exception thrown when post to collection fails with a status that is not handled.
 #. TRANS: %1$s is a URL, %2$s is the status, %s$s is the fail reason.
-#: lib/activitysink.php:163 lib/activitysink.php:167 lib/activitysink.php:172
 #, php-format
 msgctxt "URLSTATUSREASON"
 msgid "%1$s %2$s %3$s"
 msgstr "%1$s %2$s %3$s"
 
 #. TRANS: Client exception thrown when there is no source attribute.
-#: lib/activityutils.php:200
 msgid "Can't handle remote content yet."
 msgstr "No es pot gestionar el contingut remot encara."
 
 #. TRANS: Client exception thrown when there embedded XML content is found that cannot be processed yet.
-#: lib/activityutils.php:237
 msgid "Can't handle embedded XML content yet."
 msgstr "No es pot gestionar el contingut XML incrustat encara."
 
 #. TRANS: Client exception thrown when base64 encoded content is found that cannot be processed yet.
-#: lib/activityutils.php:242
 msgid "Can't handle embedded Base64 content yet."
 msgstr "No es pot gestionar el contingut Base64 incrustat encara."
 
 #. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights.
-#: lib/adminpanelaction.php:96
 msgid "You cannot make changes to this site."
 msgstr "No podeu fer canvis al lloc."
 
 #. TRANS: Client error message throw when a certain panel's settings cannot be changed.
-#: lib/adminpanelaction.php:108
 msgid "Changes to that panel are not allowed."
 msgstr "No es permeten canvis a aquell tauler."
 
 #. TRANS: Client error message.
-#: lib/adminpanelaction.php:222
 msgid "showForm() not implemented."
 msgstr "El showForm() no està implementat."
 
 #. TRANS: Client error message
-#: lib/adminpanelaction.php:250
 msgid "saveSettings() not implemented."
 msgstr "El saveSettings() no està implementat."
 
 #. TRANS: Client error message thrown if design settings could not be deleted in
 #. TRANS: the admin panel Design.
-#: lib/adminpanelaction.php:274
 msgid "Unable to delete design setting."
 msgstr "No s'ha pogut eliminar el paràmetre de disseny."
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:337
 msgid "Basic site configuration"
 msgstr "Configuració bàsica del lloc"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:339
 msgctxt "MENU"
 msgid "Site"
 msgstr "Lloc"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:345
 msgid "Design configuration"
 msgstr "Configuració del disseny"
 
 #. TRANS: Menu item for site administration
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/adminpanelaction.php:347 lib/groupnav.php:135
 msgctxt "MENU"
 msgid "Design"
 msgstr "Disseny"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:353
 msgid "User configuration"
 msgstr "Configuració de l'usuari"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:110
 msgid "User"
 msgstr "Usuari"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:361
 msgid "Access configuration"
 msgstr "Configuració de l'accés"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:369
 msgid "Paths configuration"
 msgstr "Configuració dels camins"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:377
 msgid "Sessions configuration"
 msgstr "Configuració de les sessions"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:385
 msgid "Edit site notice"
 msgstr "Edita l'avís del lloc"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:387
 msgid "Site notice"
 msgstr "Avís del lloc"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:393
 msgid "Snapshots configuration"
 msgstr "Configuració de les instantànies"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:401
 msgid "Set site license"
 msgstr "Defineix la llicència del lloc"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:409
 #, fuzzy
 msgid "Plugins configuration"
 msgstr "Configuració dels camins"
 
 #. TRANS: Client error 401.
-#: lib/apiauth.php:111
 msgid "API resource requires read-write access, but you only have read access."
 msgstr ""
 "El recurs API requereix accés de lectura i d'escriptura, però només en teniu "
 "de lectura."
 
 #. TRANS: OAuth exception thrown when no application is found for a given consumer key.
-#: lib/apiauth.php:177
 msgid "No application for that consumer key."
 msgstr "No hi ha cap aplicació per a aquest clau de consumidor."
 
-#: lib/apiauth.php:202 lib/apiauth.php:284
 msgid "Not allowed to use API."
 msgstr "No es permet l'ús de l'API."
 
 #. TRANS: OAuth exception given when an incorrect access token was given for a user.
-#: lib/apiauth.php:225
 msgid "Bad access token."
 msgstr "Testimoni d'accés incorrecte."
 
 #. TRANS: OAuth exception given when no user was found for a given token (no token was found).
-#: lib/apiauth.php:230
 msgid "No user for that token."
 msgstr "No hi ha cap usuari per aquest testimoni."
 
 #. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel".
 #. TRANS: Client error thrown when authentication fails.
-#: lib/apiauth.php:272 lib/apiauth.php:302
 msgid "Could not authenticate you."
 msgstr "No se us ha pogut autenticar."
 
 #. TRANS: Server error displayed when trying to create an anynymous OAuth consumer.
-#: lib/apioauthstore.php:45
 msgid "Could not create anonymous consumer."
 msgstr "No s'ha pogut crear un consumidor anònim."
 
 #. TRANS: Server error displayed when trying to create an anynymous OAuth application.
-#: lib/apioauthstore.php:69
 msgid "Could not create anonymous OAuth application."
 msgstr "No s'ha pogut crear l'aplicació OAuth anònima."
 
 #. TRANS: Exception thrown when no token association could be found.
-#: lib/apioauthstore.php:151
 msgid ""
 "Could not find a profile and application associated with the request token."
 msgstr ""
@@ -7676,42 +6324,34 @@ msgstr ""
 "sol·licitat."
 
 #. TRANS: Exception thrown when no access token can be issued.
-#: lib/apioauthstore.php:209
 msgid "Could not issue access token."
 msgstr "No s'ha pogut emetre un testimoni d'accés."
 
-#: lib/apioauthstore.php:317
 msgid "Database error inserting OAuth application user."
 msgstr "Error de la base de dades en inserir l'usuari de l'aplicació OAuth."
 
-#: lib/apioauthstore.php:345
 msgid "Database error updating OAuth application user."
 msgstr ""
 "Error de la base de dades en actualitzar l'usuari de l'aplicació OAuth."
 
 #. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
-#: lib/apioauthstore.php:371
 msgid "Tried to revoke unknown token."
 msgstr "S'ha provat de revocar el testimoni desconegut."
 
 #. TRANS: Exception thrown when an attempt is made to remove a revoked token.
-#: lib/apioauthstore.php:376
 msgid "Failed to delete revoked token."
 msgstr "No s'ha pogut suprimir el testimoni revocat."
 
 #. TRANS: Form input field label for application icon.
-#: lib/applicationeditform.php:177
 msgid "Icon"
 msgstr "Icona"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:182
 msgid "Icon for this application"
 msgstr "Icona de l'aplicació"
 
 #. TRANS: Form input field instructions.
 #. TRANS: %d is the number of available characters for the description.
-#: lib/applicationeditform.php:201
 #, php-format
 msgid "Describe your application in %d character"
 msgid_plural "Describe your application in %d characters"
@@ -7719,206 +6359,167 @@ msgstr[0] "Descriviu la vostra aplicació en %d caràcter"
 msgstr[1] "Descriviu la vostra aplicació en %d caràcters"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:205
 msgid "Describe your application"
 msgstr "Descriviu la vostra aplicació"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:216
 msgid "URL of the homepage of this application"
 msgstr "URL de la pàgina d'inici de l'aplicació"
 
 #. TRANS: Form input field label.
-#: lib/applicationeditform.php:218
 msgid "Source URL"
 msgstr "URL d'origen"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:225
 msgid "Organization responsible for this application"
 msgstr "Organització responsable de l'aplicació"
 
 #. TRANS: Form input field label.
-#: lib/applicationeditform.php:227
 msgid "Organization"
 msgstr "Organització"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:234
 msgid "URL for the homepage of the organization"
 msgstr "L'URL de la pàgina d'inici de l'organització"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:243
 msgid "URL to redirect to after authentication"
 msgstr "URL on redirigir-hi després de l'autenticació."
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:271
 msgid "Browser"
 msgstr "Navegador"
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:288
 msgid "Desktop"
 msgstr "Escriptori"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:290
 msgid "Type of application, browser or desktop"
 msgstr "Tipus d'aplicació, navegador o escriptori"
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:314
 msgid "Read-only"
 msgstr "Només lectura"
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:334
 msgid "Read-write"
 msgstr "Lectura i escriptura"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:336
 msgid "Default access for this application: read-only, or read-write"
 msgstr ""
 "Accés per defecte per a l'aplicació: només lectura, o lectura i escriptura"
 
 #. TRANS: Submit button title.
-#: lib/applicationeditform.php:353
 msgid "Cancel"
 msgstr "Cancel·la"
 
-#: lib/applicationlist.php:247
 msgid " by "
 msgstr " per "
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:260
 msgid "read-write"
 msgstr "de lectura i d'escriptura"
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:262
 msgid "read-only"
 msgstr "només de lectura"
 
 #. TRANS: Used in application list. %1$s is a modified date, %2$s is access type ("read-write" or "read-only")
-#: lib/applicationlist.php:268
 #, php-format
 msgid "Approved %1$s - \"%2$s\" access."
 msgstr "Aprovat: %1$s - accés «%2$s»."
 
 #. TRANS: Access token in the application list.
 #. TRANS: %s are the first 7 characters of the access token.
-#: lib/applicationlist.php:282
 #, php-format
 msgid "Access token starting with: %s"
 msgstr "Testimoni d'accés que comença amb: %s"
 
 #. TRANS: Button label
-#: lib/applicationlist.php:298
 msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "Revoca"
 
-#: lib/atom10feed.php:113
 msgid "Author element must contain a name element."
 msgstr "L'element autor ha de contenir un element nom."
 
 #. TRANS: Server exception thrown when using the method setActivitySubject() in the class Atom10Feed.
-#: lib/atom10feed.php:160
 msgid "Do not use this method!"
 msgstr "No feu servir aquest mètode!"
 
 #. TRANS: Title.
-#: lib/attachmentnoticesection.php:67
 msgid "Notices where this attachment appears"
 msgstr "Avisos on apareix l'adjunt"
 
 #. TRANS: Title.
-#: lib/attachmenttagcloudsection.php:48
 msgid "Tags for this attachment"
 msgstr "Etiquetes de l'adjunció"
 
 #. TRANS: Exception thrown when a password change fails.
-#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:227
 msgid "Password changing failed."
 msgstr "El canvi de contrasenya ha fallat."
 
 #. TRANS: Exception thrown when a password change attempt fails because it is not allowed.
-#: lib/authenticationplugin.php:238
 msgid "Password changing is not allowed."
 msgstr "No es permet el canvi de contrasenya."
 
 #. TRANS: Title for the form to block a user.
-#: lib/blockform.php:68
 msgid "Block"
 msgstr "Bloca"
 
 #. TRANS: Description of the form to block a user.
-#: lib/blockform.php:79
 msgid "Block this user"
 msgstr "Bloca aquest usuari"
 
 #. TRANS: Title for command results.
-#: lib/channel.php:104 lib/channel.php:125
 msgid "Command results"
 msgstr "Resultats de les comandes"
 
 #. TRANS: Title for command results.
-#: lib/channel.php:138
 msgid "AJAX error"
 msgstr "Error de l'AJAX"
 
 #. TRANS: E-mail subject when a command has completed.
-#: lib/channel.php:177 lib/mailhandler.php:143
 msgid "Command complete"
 msgstr "Comanda completada"
 
 #. TRANS: E-mail subject when a command has failed.
-#: lib/channel.php:188
 msgid "Command failed"
 msgstr "Comanda fallida"
 
 #. TRANS: Command exception text shown when a notice ID is requested that does not exist.
-#: lib/command.php:82 lib/command.php:106
 msgid "Notice with that id does not exist."
 msgstr "No existeix cap avís amb aquest identificador."
 
 #. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
 #. TRANS: Error text shown when a last user notice is requested and it does not exist.
-#: lib/command.php:99 lib/command.php:642
 msgid "User has no last notice."
 msgstr "L'usuari no té un darrer avís."
 
 #. TRANS: Message given requesting a profile for a non-existing user.
 #. TRANS: %s is the nickname of the user for which the profile could not be found.
-#: lib/command.php:128
 #, php-format
 msgid "Could not find a user with nickname %s."
 msgstr "No es pot trobar un usuari amb el sobrenom %s."
 
 #. TRANS: Message given getting a non-existing user.
 #. TRANS: %s is the nickname of the user that could not be found.
-#: lib/command.php:148
 #, php-format
 msgid "Could not find a local user with nickname %s."
 msgstr "No s'ha pogut trobar un usuari local amb el sobrenom %s."
 
 #. TRANS: Error text shown when an unimplemented command is given.
-#: lib/command.php:183
 msgid "Sorry, this command is not yet implemented."
 msgstr "Perdona, aquesta comanda no està implementada."
 
 #. TRANS: Command exception text shown when a user tries to nudge themselves.
-#: lib/command.php:229
 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr "No té massa sentit avisar-se a un mateix!"
 
 #. TRANS: Message given having nudged another user.
 #. TRANS: %s is the nickname of the user that was nudged.
-#: lib/command.php:238
 #, php-format
 msgid "Nudge sent to %s."
 msgstr "S'ha cridat l'atenció a %s."
@@ -7927,7 +6528,6 @@ msgstr "S'ha cridat l'atenció a %s."
 #. TRANS: %1$s is the number of other user the user is subscribed to.
 #. TRANS: %2$s is the number of users that are subscribed to the user.
 #. TRANS: %3$s is the number of notices the user has sent.
-#: lib/command.php:268
 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"
@@ -7939,40 +6539,34 @@ msgstr ""
 "Avisos: %3$s"
 
 #. TRANS: Error message text shown when a favorite could not be set because it has already been favorited.
-#: lib/command.php:298
 #, fuzzy
 msgid "Could not create favorite: already favorited."
 msgstr "No es pot crear el preferit."
 
 #. TRANS: Text shown when a notice has been marked as favourite successfully.
-#: lib/command.php:324
 msgid "Notice marked as fave."
 msgstr "L'avís està marcat com a preferit."
 
 #. TRANS: Message given having added a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:369
 #, php-format
 msgid "%1$s joined group %2$s."
 msgstr "%1$s s'ha unit al grup %2$s."
 
 #. TRANS: Message given having removed a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:417
 #, php-format
 msgid "%1$s left group %2$s."
 msgstr "%1$s ha deixat el grup %2$s."
 
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: lib/command.php:438
 #, php-format
 msgctxt "WHOIS"
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
 
 #. TRANS: Whois output. %s is the full name of the queried user.
-#: lib/command.php:442
 #, php-format
 msgid "Fullname: %s"
 msgstr "Nom complet: %s"
@@ -7980,7 +6574,6 @@ msgstr "Nom complet: %s"
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a location.
-#: lib/command.php:446 lib/mail.php:275
 #, php-format
 msgid "Location: %s"
 msgstr "Localització: %s"
@@ -7988,20 +6581,17 @@ msgstr "Localització: %s"
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a homepage.
-#: lib/command.php:450 lib/mail.php:279
 #, php-format
 msgid "Homepage: %s"
 msgstr "Pàgina web: %s"
 
 #. TRANS: Whois output. %s is the bio information of the queried user.
-#: lib/command.php:454
 #, php-format
 msgid "About: %s"
 msgstr "Informació personal: %s"
 
 #. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).
 #. TRANS: %s is a remote profile.
-#: lib/command.php:483
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
@@ -8012,7 +6602,6 @@ msgstr ""
 
 #. TRANS: Message given if content is too long. %1$sd is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:500
 #, php-format
 msgid "Message too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
@@ -8021,26 +6610,26 @@ msgstr[0] ""
 msgstr[1] ""
 "El missatge és massa llarg - el màxim és %1$d caràcters, i n'heu enviat %2$d."
 
+#. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
+msgid "You can't send a message to this user."
+msgstr "No podeu enviar un misssatge a aquest usuari."
+
 #. TRANS: Error text shown sending a direct message fails with an unknown reason.
-#: lib/command.php:528
 msgid "Error sending direct message."
 msgstr "S'ha produït un error en enviar el missatge directe."
 
 #. TRANS: Message given having repeated a notice from another user.
 #. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:565
 #, php-format
 msgid "Notice from %s repeated."
 msgstr "S'ha repetit l'avís de %s."
 
 #. TRANS: Error text shown when repeating a notice fails with an unknown reason.
-#: lib/command.php:568
 msgid "Error repeating notice."
 msgstr "S'ha produït un error en repetir l'avís."
 
 #. TRANS: Message given if content of a notice for a reply is too long. %1$d is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:603
 #, php-format
 msgid "Notice too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Notice too long - maximum is %1$d characters, you sent %2$d."
@@ -8051,80 +6640,66 @@ msgstr[1] ""
 
 #. TRANS: Text shown having sent a reply to a notice successfully.
 #. TRANS: %s is the nickname of the user of the notice the reply was sent to.
-#: lib/command.php:616
 #, php-format
 msgid "Reply to %s sent."
 msgstr "S'ha enviat la resposta a %s."
 
 #. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
-#: lib/command.php:619
 msgid "Error saving notice."
 msgstr "S'ha produït un error en desar l'avís."
 
 #. TRANS: Error text shown when no username was provided when issuing a subscribe command.
-#: lib/command.php:666
 msgid "Specify the name of the user to subscribe to."
 msgstr "Especifiqueu el nom de l'usuari al qual voleu subscriure-us."
 
 #. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
-#: lib/command.php:675
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "No es pot subscriure a perfils de OMB amb ordres."
 
 #. TRANS: Text shown after having subscribed to another user successfully.
 #. TRANS: %s is the name of the user the subscription was requested for.
-#: lib/command.php:683
 #, php-format
 msgid "Subscribed to %s."
 msgstr "Subscrit a %s."
 
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.
-#: lib/command.php:704 lib/command.php:815
 msgid "Specify the name of the user to unsubscribe from."
 msgstr "Especifiqueu el nom de l'usuari del qui voleu deixar la subscripció."
 
 #. TRANS: Text shown after having unsubscribed from another user successfully.
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:715
 #, php-format
 msgid "Unsubscribed from %s."
 msgstr "S'ha deixat d'estar subscrit a %s."
 
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
-#: lib/command.php:735 lib/command.php:761
 msgid "Command not yet implemented."
 msgstr "Comanda encara no implementada."
 
 #. TRANS: Text shown when issuing the command "off" successfully.
-#: lib/command.php:739
 msgid "Notification off."
 msgstr "Avisos desactivats."
 
 #. TRANS: Error text shown when the command "off" fails for an unknown reason.
-#: lib/command.php:742
 msgid "Can't turn off notification."
 msgstr "No es poden desactivar els avisos."
 
 #. TRANS: Text shown when issuing the command "on" successfully.
-#: lib/command.php:765
 msgid "Notification on."
 msgstr "Avisos activitats."
 
 #. TRANS: Error text shown when the command "on" fails for an unknown reason.
-#: lib/command.php:768
 msgid "Can't turn on notification."
 msgstr "No es poden activar els avisos."
 
 #. TRANS: Error text shown when issuing the login command while login is disabled.
-#: lib/command.php:782
 msgid "Login command is disabled."
 msgstr "L'ordre d'inici de sessió no està habilitada."
 
 #. TRANS: Text shown after issuing the login command successfully.
 #. TRANS: %s is a logon link..
-#: lib/command.php:795
 #, php-format
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
@@ -8133,20 +6708,17 @@ msgstr ""
 
 #. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:824
 #, php-format
 msgid "Unsubscribed %s."
 msgstr "S'ha cancel·lat la subscripció de %s."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
-#: lib/command.php:842
 msgid "You are not subscribed to anyone."
 msgstr "No esteu subscrit a ningú."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
-#: lib/command.php:847
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Ja estàs subscrit a aquests usuaris:"
@@ -8154,14 +6726,12 @@ msgstr[1] "Ja estàs subscrit a aquests usuaris:"
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user
 #. TRANS: (followers) without having any subscribers.
-#: lib/command.php:869
 msgid "No one is subscribed to you."
 msgstr "Ningú no us ha subscrit."
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
-#: lib/command.php:874
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "No pots subscriure a un altre a tu mateix."
@@ -8169,21 +6739,18 @@ msgstr[1] "No pots subscriure a un altre a tu mateix."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to without having
 #. TRANS: any group subscriptions.
-#: lib/command.php:896
 msgid "You are not a member of any groups."
 msgstr "No sou membre de cap grup."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
-#: lib/command.php:901
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "Sou un membre d'aquest grup:"
 msgstr[1] "Sou un membre d'aquests grups:"
 
 #. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-#: lib/command.php:916
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -8264,69 +6831,56 @@ msgstr ""
 "tracking - no s'ha implementat encara.\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:36
 msgid "No configuration file found."
 msgstr "No s'ha trobat cap fitxer de configuració. "
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:39
 msgid "I looked for configuration files in the following places:"
 msgstr "S'han cercat fitxers de configuracions en els llocs següents: "
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:42
 msgid "You may wish to run the installer to fix this."
 msgstr "Podeu voler executar l'instal·lador per corregir-ho."
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:46
 msgid "Go to the installer."
 msgstr "Vés a l'instal·lador."
 
-#: lib/dberroraction.php:59
 msgid "Database error"
 msgstr "Error de la base de dades"
 
 #. TRANS: Description of form for deleting a user.
-#: lib/deleteuserform.php:75
 msgid "Delete this user"
 msgstr "Elimina l'usuari"
 
-#: lib/designform.php:114
 #, fuzzy
 msgid "Change design"
 msgstr "Desa el disseny"
 
 #. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: lib/designform.php:131
 msgid "Change colours"
 msgstr "Canvia els colors"
 
 #. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: lib/designform.php:138
 msgid "Use defaults"
 msgstr "Utilitza els paràmetres per defecte"
 
 #. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: lib/designform.php:140
 msgid "Restore default designs"
 msgstr "Restaura els dissenys per defecte"
 
 #. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: lib/designform.php:148
 msgid "Reset back to default"
 msgstr "Torna a restaurar al valor per defecte"
 
 #. TRANS: Label in form on profile design page.
 #. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
-#: lib/designform.php:158
 msgid "Upload file"
 msgstr "Puja un fitxer"
 
 #. TRANS: Instructions for form on profile design page.
-#: lib/designform.php:163
 #, fuzzy
 msgid ""
 "You can upload your personal background image. The maximum file size is 2Mb."
@@ -8335,148 +6889,118 @@ msgstr ""
 "2MB."
 
 #. TRANS: Radio button on profile design page that will enable use of the uploaded profile image.
-#: lib/designform.php:194
 msgctxt "RADIO"
 msgid "On"
 msgstr "Activada"
 
 #. TRANS: Radio button on profile design page that will disable use of the uploaded profile image.
-#: lib/designform.php:211
 msgctxt "RADIO"
 msgid "Off"
 msgstr "Desactivada"
 
 #. TRANS: Title for button on profile design page to save settings.
-#: lib/designform.php:322
 msgid "Save design"
 msgstr "Desa el disseny"
 
 #. TRANS: Error message displayed if design settings could not be saved.
 #. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
-#: lib/designsettings.php:216 lib/designsettings.php:238
 msgid "Couldn't update your design."
 msgstr "No s'ha pogut actualitzar el vostre disseny."
 
 #. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
-#: lib/designsettings.php:244
 msgid "Design defaults restored."
 msgstr "S'han restaurat els paràmetres de disseny per defecte."
 
 #. TRANS: Exception. %s is an ID.
-#: lib/discovery.php:153
 #, php-format
 msgid "Unable to find services for %s."
 msgstr "No s'han pogut trobar els serveis de %s."
 
 #. TRANS: Form legend for removing the favourite status for a favourite notice.
 #. TRANS: Title for button text for removing the favourite status for a favourite notice.
-#: lib/disfavorform.php:108 lib/disfavorform.php:140
 msgid "Disfavor this notice"
 msgstr "Deixa de tenir com a preferit aquest avís"
 
 #. TRANS: Button text for removing the favourite status for a favourite notice.
-#: lib/disfavorform.php:136
 msgctxt "BUTTON"
 msgid "Disfavor favorite"
 msgstr "Fes que deixi de ser preferit"
 
 #. TRANS: Form legend for adding the favourite status to a notice.
 #. TRANS: Title for button text for adding the favourite status to a notice.
-#: lib/favorform.php:108 lib/favorform.php:139
 msgid "Favor this notice"
 msgstr "Fes preferit aquest avís"
 
 #. TRANS: Button text for adding the favourite status to a notice.
-#: lib/favorform.php:135
 msgctxt "BUTTON"
 msgid "Favor"
 msgstr "Preferit"
 
-#: lib/feed.php:84
 msgid "RSS 1.0"
 msgstr "RSS 1.0"
 
-#: lib/feed.php:86
 msgid "RSS 2.0"
 msgstr "RSS 2.0"
 
-#: lib/feed.php:88
 msgid "Atom"
 msgstr "Atom"
 
-#: lib/feed.php:90
 msgid "FOAF"
 msgstr "FOAF"
 
-#: lib/feedimporter.php:75
 msgid "Not an atom feed."
 msgstr "No és un canal atom."
 
-#: lib/feedimporter.php:82
 msgid "No author in the feed."
 msgstr "No hi ha cap autor al canal."
 
-#: lib/feedimporter.php:89
 msgid "Can't import without a user."
 msgstr "No es pot importar sense un usuari."
 
 #. TRANS: Header for feed links (h2).
-#: lib/feedlist.php:66
 msgid "Feeds"
 msgstr "Canals"
 
-#: lib/galleryaction.php:128
 msgid "All"
 msgstr "Tot"
 
-#: lib/galleryaction.php:136
 msgid "Select tag to filter"
 msgstr "Seleccioneu l'etiqueta per filtrar"
 
-#: lib/galleryaction.php:137
 msgid "Tag"
 msgstr "Etiqueta"
 
-#: lib/galleryaction.php:138
 msgid "Choose a tag to narrow list"
 msgstr "Trieu una etiqueta per escurçar la llista"
 
-#: lib/galleryaction.php:140
 msgid "Go"
 msgstr "Vés-hi"
 
-#: lib/grantroleform.php:91
 #, php-format
 msgid "Grant this user the \"%s\" role"
 msgstr "Atorga a l'usuari el rol «%s»"
 
-#: lib/groupeditform.php:147
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr ""
 "1-64 lletres en minúscula o nombres, sense signes de puntuació o espais."
 
-#: lib/groupeditform.php:156
 msgid "URL of the homepage or blog of the group or topic."
 msgstr "URL de la pàgina o blog del grup o de la temàtica."
 
-#: lib/groupeditform.php:161
 msgid "Describe the group or topic"
 msgstr "Descriviu el grup o la temàtica"
 
-#: lib/groupeditform.php:163
 #, php-format
 msgid "Describe the group or topic in %d character or less"
 msgid_plural "Describe the group or topic in %d characters or less"
 msgstr[0] "Descriviu el grup o la temàtica en %d caràcter"
 msgstr[1] "Descriviu el grup o la temàtica en %d caràcters"
 
-#: lib/groupeditform.php:175
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\"."
 msgstr ""
 "Ubicació del grup, si s'hi adiu cap, com ara «ciutat, comarca (o illa), país»."
 
-#: lib/groupeditform.php:183
 #, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -8492,70 +7016,60 @@ msgstr[1] ""
 "màxim de %d àlies."
 
 #. TRANS: Menu item in the group navigation page.
-#: lib/groupnav.php:86
 msgctxt "MENU"
 msgid "Group"
 msgstr "Grup"
 
 #. TRANS: Tooltip for menu item in the group navigation page.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:89
 #, php-format
 msgctxt "TOOLTIP"
 msgid "%s group"
 msgstr "Grup %s"
 
 #. TRANS: Menu item in the group navigation page.
-#: lib/groupnav.php:95
 msgctxt "MENU"
 msgid "Members"
 msgstr "Membres"
 
 #. TRANS: Tooltip for menu item in the group navigation page.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:98
 #, php-format
 msgctxt "TOOLTIP"
 msgid "%s group members"
 msgstr "Membres del grup %s"
 
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/groupnav.php:108
 msgctxt "MENU"
 msgid "Blocked"
 msgstr "Blocats"
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:111
 #, php-format
 msgctxt "TOOLTIP"
 msgid "%s blocked users"
 msgstr "%s usuaris blocats"
 
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "Administrador"
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:120
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Edit %s group properties"
 msgstr "Edita les propietats del grup %s"
 
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/groupnav.php:126
 msgctxt "MENU"
 msgid "Logo"
 msgstr "Logotip"
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:129
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Add or edit %s logo"
@@ -8563,69 +7077,57 @@ msgstr "Afegeix o edita el logotip de %s"
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:138
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Add or edit %s design"
 msgstr "Afegeix o edita el disseny de %s"
 
 #. TRANS: Title for groups with the most members section.
-#: lib/groupsbymemberssection.php:71
 msgid "Groups with most members"
 msgstr "Grups amb més membres"
 
 #. TRANS: Title for groups with the most posts section.
-#: lib/groupsbypostssection.php:71
 msgid "Groups with most posts"
 msgstr "Grups amb més entrades"
 
 #. TRANS: Title for group tag cloud section.
 #. TRANS: %s is a group name.
-#: lib/grouptagcloudsection.php:57
 #, php-format
 msgid "Tags in %s group's notices"
 msgstr "Etiquetes en els avisos del grup %s"
 
 #. TRANS: Client exception 406
-#: lib/htmloutputter.php:104
 msgid "This page is not available in a media type you accept"
 msgstr "Aquesta pàgina no està disponible en un tipus de mèdia que acceptis."
 
 #. TRANS: Exception thrown when trying to upload an unsupported image file format.
-#: lib/imagefile.php:73
 msgid "Unsupported image file format."
 msgstr "Format d'imatge no suportat."
 
 #. TRANS: Exception thrown when too large a file is uploaded.
 #. TRANS: %s is the maximum file size, for example "500b", "10kB" or "2MB".
-#: lib/imagefile.php:91
 #, php-format
 msgid "That file is too big. The maximum file size is %s."
 msgstr "La mida del fitxer és massa gran, La mida màxima és %s."
 
 #. TRANS: Exception thrown when uploading an image and that action could not be completed.
-#: lib/imagefile.php:97
 msgid "Partial upload."
 msgstr "Càrrega parcial."
 
 #. TRANS: Exception thrown when uploading a file as image that is not an image or is a corrupt file.
-#: lib/imagefile.php:115
 msgid "Not an image or corrupt file."
 msgstr "No és una imatge o és un fitxer corrupte."
 
 #. TRANS: Exception thrown during resize when image has been registered as present, but is no longer there.
-#: lib/imagefile.php:178
 msgid "Lost our file."
 msgstr "Hem perdut el nostre fitxer."
 
 #. TRANS: Exception thrown when trying to resize an unknown file type.
 #. TRANS: Exception thrown when trying resize an unknown file type.
-#: lib/imagefile.php:216 lib/imagefile.php:257
 msgid "Unknown file type"
 msgstr "Tipus de fitxer desconegut"
 
 #. TRANS: Number of megabytes. %d is the number.
-#: lib/imagefile.php:303
 #, php-format
 msgid "%dMB"
 msgid_plural "%dMB"
@@ -8633,7 +7135,6 @@ msgstr[0] "%dMB"
 msgstr[1] "%dMB"
 
 #. TRANS: Number of kilobytes. %d is the number.
-#: lib/imagefile.php:307
 #, php-format
 msgid "%dkB"
 msgid_plural "%dkB"
@@ -8641,14 +7142,12 @@ msgstr[0] "%dkB"
 msgstr[1] "%dkB"
 
 #. TRANS: Number of bytes. %d is the number.
-#: lib/imagefile.php:310
 #, php-format
 msgid "%dB"
 msgid_plural "%dB"
 msgstr[0] "%dB"
 msgstr[1] "%dB"
 
-#: lib/implugin.php:262
 #, php-format
 msgid ""
 "User \"%s\" on %s has said that your %s screenname belongs to them. If "
@@ -8658,52 +7157,43 @@ msgid ""
 "message."
 msgstr ""
 
-#: lib/implugin.php:349
 #, php-format
 msgid "Unknown inbox source %d."
 msgstr "Font %d de la safata d'entrada desconeguda."
 
-#: lib/implugin.php:485
-#, fuzzy, php-format
+#, php-format
 msgid "Message too long - maximum is %1$d characters, you sent %2$d."
 msgstr ""
-"El missatge és massa llarg - el màxim és %1$d caràcter, i n'heu enviat %2$d."
+"El missatge és massa llarg - el màxim és %1$d caràcters, i n'heu enviat %2$d."
 
-#: lib/leaveform.php:114
 msgid "Leave"
 msgstr "Deixa"
 
 #. TRANS: Menu item for logging in to the StatusNet site.
-#: lib/logingroupnav.php:77
 msgctxt "MENU"
 msgid "Login"
 msgstr "Inici de sessió"
 
 #. TRANS: Title for menu item for logging in to the StatusNet site.
-#: lib/logingroupnav.php:79
 msgid "Login with a username and password"
 msgstr "Accedir amb el nom d'usuari i contrasenya"
 
 #. TRANS: Menu item for registering with the StatusNet site.
-#: lib/logingroupnav.php:85
 msgctxt "MENU"
 msgid "Register"
 msgstr "Registre"
 
 #. TRANS: Title for menu item for registering with the StatusNet site.
-#: lib/logingroupnav.php:87
 msgid "Sign up for a new account"
 msgstr "Registreu-vos-hi si voleu un compte nou"
 
 #. TRANS: Subject for address confirmation email.
-#: lib/mail.php:172
 msgid "Email address confirmation"
 msgstr "Confirmació de l'adreça de correu electrònic"
 
 #. TRANS: Body for address confirmation email.
 #. TRANS: %1$s is the addressed user's nickname, %2$s is the StatusNet sitename,
 #. TRANS: %3$s is the URL to confirm at.
-#: lib/mail.php:177
 #, php-format
 msgid ""
 "Hey, %1$s.\n"
@@ -8735,14 +7225,12 @@ msgstr ""
 
 #. TRANS: Subject of new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
-#: lib/mail.php:243
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1$s ara està escoltant els vostres avisos a %2$s."
 
 #. TRANS: This is a paragraph in a new-subscriber e-mail.
 #. TRANS: %s is a URL where the subscriber can be reported as abusive.
-#: lib/mail.php:250
 #, php-format
 msgid ""
 "If you believe this account is being used abusively, you can block them from "
@@ -8757,7 +7245,6 @@ msgstr ""
 #. TRANS: %3$s is the subscriber's profile URL, %4$s is the subscriber's location (or empty)
 #. TRANS: %5$s is the subscriber's homepage URL (or empty), %6%s is the subscriber's bio (or empty)
 #. TRANS: %7$s is a link to the addressed user's e-mail settings.
-#: lib/mail.php:260
 #, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -8784,14 +7271,12 @@ msgstr ""
 
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is biographical information.
-#: lib/mail.php:283
 #, php-format
 msgid "Bio: %s"
 msgstr "Biografia: %s"
 
 #. TRANS: Subject of notification mail for new posting email address.
 #. TRANS: %s is the StatusNet sitename.
-#: lib/mail.php:312
 #, php-format
 msgid "New email address for posting to %s"
 msgstr "Nou correu electrònic per publicar a %s"
@@ -8799,7 +7284,6 @@ msgstr "Nou correu electrònic per publicar a %s"
 #. TRANS: Body of notification mail for new posting email address.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is the e-mail address to send
 #. TRANS: to to post by e-mail, %3$s is a URL to more instructions.
-#: lib/mail.php:318
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -8822,26 +7306,22 @@ msgstr ""
 
 #. TRANS: Subject line for SMS-by-email notification messages.
 #. TRANS: %s is the posting user's nickname.
-#: lib/mail.php:439
 #, php-format
 msgid "%s status"
 msgstr "%s estat"
 
 #. TRANS: Subject line for SMS-by-email address confirmation message.
-#: lib/mail.php:465
 msgid "SMS confirmation"
 msgstr "Confirmació SMS"
 
 #. TRANS: Main body heading for SMS-by-email address confirmation message.
 #. TRANS: %s is the addressed user's nickname.
-#: lib/mail.php:469
 #, php-format
 msgid "%s: confirm you own this phone number with this code:"
 msgstr "%s: confirmeu-ho si teniu aquest número de telèfon amb aquest codi:"
 
 #. TRANS: Subject for 'nudge' notification email.
 #. TRANS: %s is the nudging user.
-#: lib/mail.php:490
 #, php-format
 msgid "You have been nudged by %s"
 msgstr "%s us ha cridat l'atenció"
@@ -8849,7 +7329,6 @@ msgstr "%s us ha cridat l'atenció"
 #. TRANS: Body for 'nudge' notification email.
 #. TRANS: %1$s is the nuding user's long name, $2$s is the nudging user's nickname,
 #. TRANS: %3$s is a URL to post notices at, %4$s is the StatusNet sitename.
-#: lib/mail.php:497
 #, php-format
 msgid ""
 "%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -8877,7 +7356,6 @@ msgstr ""
 
 #. TRANS: Subject for direct-message notification email.
 #. TRANS: %s is the sending user's nickname.
-#: lib/mail.php:544
 #, php-format
 msgid "New private message from %s"
 msgstr "Nou missatge privat de %s"
@@ -8886,7 +7364,6 @@ msgstr "Nou missatge privat de %s"
 #. TRANS: %1$s is the sending user's long name, %2$s is the sending user's nickname,
 #. TRANS: %3$s is the message content, %4$s a URL to the message,
 #. TRANS: %5$s is the StatusNet sitename.
-#: lib/mail.php:552
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -8921,7 +7398,6 @@ msgstr ""
 
 #. TRANS: Subject for favorite notification e-mail.
 #. TRANS: %1$s is the adding user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:604
 #, php-format
 msgid "%1$s (@%2$s) added your notice as a favorite"
 msgstr "%1$s (@%2$s) ha afegit el vostre avís com a preferit"
@@ -8931,7 +7407,6 @@ msgstr "%1$s (@%2$s) ha afegit el vostre avís com a preferit"
 #. TRANS: %3$s is a URL to the faved notice, %4$s is the faved notice text,
 #. TRANS: %5$s is a URL to all faves of the adding user, %6$s is the StatusNet sitename,
 #. TRANS: %7$s is the adding user's nickname.
-#: lib/mail.php:611
 #, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -8969,7 +7444,6 @@ msgstr ""
 "%6$s\n"
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:669
 #, php-format
 msgid ""
 "The full conversation can be read here:\n"
@@ -8982,7 +7456,6 @@ msgstr ""
 
 #. TRANS: E-mail subject for notice notification.
 #. TRANS: %1$s is the sending user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:677
 #, php-format
 msgid "%1$s (@%2$s) sent a notice to your attention"
 msgstr "%1$s (@%2$s) us ha enviat un avís a la vostra atenció"
@@ -8993,7 +7466,6 @@ msgstr "%1$s (@%2$s) us ha enviat un avís a la vostra atenció"
 #. TRANS: %5$s is a URL to the full conversion if it exists (otherwise empty),
 #. TRANS: %6$s is a URL to reply to the notice, %7$s is a URL to all @-replied for the addressed user,
 #. TRANS: %8$s is a URL to the addressed user's e-mail settings, %9$s is the sender's nickname.
-#: lib/mail.php:685
 #, php-format
 msgid ""
 "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -9043,11 +7515,9 @@ msgstr ""
 "\n"
 "P.S. Podeu desactivar els avisos per correu aquí: %8$s\n"
 
-#: lib/mailbox.php:87
 msgid "Only the user can read their own mailboxes."
 msgstr "Només l'usuari pot llegir les seves safates de correu."
 
-#: lib/mailbox.php:125
 msgid ""
 "You have no private messages. You can send private message to engage other "
 "users in conversation. People can send you messages for your eyes only."
@@ -9056,55 +7526,45 @@ msgstr ""
 "usuaris en la conversa. La gent pot enviar-vos missatges només per als "
 "vostres ulls."
 
-#: lib/mailhandler.php:37
 msgid "Could not parse message."
 msgstr "No es pot analitzar el missatge."
 
-#: lib/mailhandler.php:42
 msgid "Not a registered user."
 msgstr "Usuari no registrat."
 
-#: lib/mailhandler.php:46
 msgid "Sorry, that is not your incoming email address."
 msgstr "Ho sentim, aquesta no és la vostra adreça electrònica d'entrada."
 
-#: lib/mailhandler.php:50
 msgid "Sorry, no incoming email allowed."
 msgstr "Ho sentim, no s'hi permet correu d'entrada."
 
-#: lib/mailhandler.php:229
 #, php-format
 msgid "Unsupported message type: %s"
 msgstr "Tipus de missatge no permès: %s"
 
 #. TRANS: Client exception thrown when a database error was thrown during a file upload operation.
-#: lib/mediafile.php:102 lib/mediafile.php:174
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
 "S'ha produït un error a la base de dades mentre es desava el vostre fitxer. "
 "Torneu-ho a provar."
 
 #. TRANS: Client exception thrown when a file upload operation would cause a user to exceed a set quota.
-#: lib/mediafile.php:238 lib/mediafile.php:281
 msgid "File exceeds user's quota."
 msgstr "El fitxer excedeix la quota de l'usuari."
 
 #. TRANS: Client exception thrown when a file upload operation fails because the file could
 #. TRANS: not be moved from the temporary folder to the permanent file location.
-#: lib/mediafile.php:258 lib/mediafile.php:300
 msgid "File could not be moved to destination directory."
 msgstr "No s'ha pogut moure el fitxer al directori de destinació."
 
 #. TRANS: Client exception thrown when a file upload operation has been stopped because the MIME
 #. TRANS: type of the uploaded file could not be determined.
-#: lib/mediafile.php:265 lib/mediafile.php:306
 msgid "Could not determine file's MIME type."
 msgstr "No s'ha pogut determinar el tipus MIME del fitxer."
 
 #. TRANS: Client exception thrown trying to upload a forbidden MIME type.
 #. TRANS: %1$s is the file type that was denied, %2$s is the application part of
 #. TRANS: the MIME type that was denied.
-#: lib/mediafile.php:396
 #, php-format
 msgid ""
 "\"%1$s\" is not a supported file type on this server. Try using another %2$s "
@@ -9115,81 +7575,72 @@ msgstr ""
 
 #. TRANS: Client exception thrown trying to upload a forbidden MIME type.
 #. TRANS: %s is the file type that was denied.
-#: lib/mediafile.php:401
 #, php-format
 msgid "\"%s\" is not a supported file type on this server."
 msgstr "«%s» no és un tipus de fitxer compatible en aquest servidor."
 
-#: lib/messageform.php:120
 msgid "Send a direct notice"
 msgstr "Envia un avís directe"
 
 #. TRANS Label entry in drop-down selection box in direct-message inbox/outbox. This is the default entry in the drop-down box, doubling as instructions and a brake against accidental submissions with the first user in the list.
-#: lib/messageform.php:137
 msgid "Select recipient:"
 msgstr "Seleccioneu el destinatari"
 
 #. TRANS Entry in drop-down selection box in direct-message inbox/outbox when no one is available to message.
-#: lib/messageform.php:150
 msgid "No mutual subscribers."
 msgstr "No teniu subscriptors mutus."
 
-#: lib/messageform.php:153
 msgid "To"
 msgstr "A"
 
-#: lib/messageform.php:184 lib/noticeform.php:236
 msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr "Envia"
 
-#: lib/messagelist.php:77
 msgid "Messages"
 msgstr "Missatges"
 
-#: lib/messagelistitem.php:123 lib/noticelist.php:527
 msgid "from"
 msgstr "de"
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:178
 msgid "Nickname cannot be empty."
 msgstr "El sobrenom no pot estar en blanc."
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:191
 #, php-format
 msgid "Nickname cannot be more than %d character long."
 msgid_plural "Nickname cannot be more than %d characters long."
 msgstr[0] "El sobrenom no pot contenir més de %d caràcter."
 msgstr[1] "El sobrenom no pot contenir més de %d caràcters."
 
-#: lib/noticeform.php:160
+#. TRANS: Form legend for notice form.
 msgid "Send a notice"
 msgstr "Envia un avís"
 
-#: lib/noticeform.php:174
+#. TRANS: Title for notice label. %s is the user's nickname.
 #, php-format
 msgid "What's up, %s?"
 msgstr "Què tal, %s?"
 
-#: lib/noticeform.php:193
+#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr "Adjunta"
 
-#: lib/noticeform.php:197
-msgid "Attach a file"
+#. TRANS: Title for input field to attach a file to a notice.
+#, fuzzy
+msgid "Attach a file."
 msgstr "Adjunta un fitxer"
 
-#: lib/noticeform.php:212
+#. TRANS: Field label to add location to a notice.
 msgid "Share my location"
 msgstr "Comparteix la ubicació on estic"
 
-#: lib/noticeform.php:215
+#. TRANS: Text to not share location for a notice in notice form.
 msgid "Do not share my location"
 msgstr "Amaga la ubicació on estic"
 
-#: lib/noticeform.php:216
+#. TRANS: Timeout error text for location retrieval in notice form.
 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
 "try again later"
@@ -9198,416 +7649,315 @@ msgstr ""
 "l'esperat; torneu-ho a provar més tard"
 
 #. TRANS: Used in coordinates as abbreviation of north
-#: lib/noticelist.php:457
 msgid "N"
 msgstr "N"
 
 #. TRANS: Used in coordinates as abbreviation of south
-#: lib/noticelist.php:459
 msgid "S"
 msgstr "S"
 
 #. TRANS: Used in coordinates as abbreviation of east
-#: lib/noticelist.php:461
 msgid "E"
 msgstr "E"
 
 #. TRANS: Used in coordinates as abbreviation of west
-#: lib/noticelist.php:463
 msgid "W"
 msgstr "O"
 
-#: lib/noticelist.php:465
 #, php-format
 msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 
-#: lib/noticelist.php:474
 msgid "at"
 msgstr "a"
 
-#: lib/noticelist.php:523
 msgid "web"
 msgstr "web"
 
-#: lib/noticelist.php:589
 msgid "in context"
 msgstr "en context"
 
-#: lib/noticelist.php:624
 msgid "Repeated by"
 msgstr "Repetit per"
 
-#: lib/noticelist.php:651
 msgid "Reply to this notice"
 msgstr "Respon a aquest avís"
 
-#: lib/noticelist.php:652
 msgid "Reply"
 msgstr "Respon"
 
-#: lib/noticelist.php:678
 msgid "Delete this notice"
 msgstr "Elimina aquest avís"
 
-#: lib/noticelist.php:696
 msgid "Notice repeated"
 msgstr "Avís repetit"
 
-#: lib/nudgeform.php:116
 msgid "Nudge this user"
 msgstr "Crida l'atenció a l'usuari"
 
-#: lib/nudgeform.php:128
 msgid "Nudge"
 msgstr "Crida l'atenció"
 
-#: lib/nudgeform.php:128
 msgid "Send a nudge to this user"
 msgstr "Crida l'atenció a l'usuari"
 
-#: lib/oauthstore.php:294
 msgid "Error inserting new profile."
 msgstr "S'ha produït un error en inserir un perfil nou."
 
-#: lib/oauthstore.php:302
 msgid "Error inserting avatar."
 msgstr "S'ha produït un error en inserir un avatar."
 
-#: lib/oauthstore.php:322
 msgid "Error inserting remote profile."
 msgstr "S'ha produït un error en inserir un perfil remot."
 
 #. TRANS: Exception thrown when a notice is denied because it has been sent before.
-#: lib/oauthstore.php:362
 msgid "Duplicate notice."
 msgstr "Avís duplicat."
 
-#: lib/oauthstore.php:507
 msgid "Couldn't insert new subscription."
 msgstr "No s'ha pogut inserir una nova subscripció."
 
-#: lib/personalgroupnav.php:104
-#, fuzzy
 msgid "Replies"
 msgstr "Respostes"
 
-#: lib/personalgroupnav.php:109
-#, fuzzy
 msgid "Favorites"
 msgstr "Preferits"
 
-#: lib/personalgroupnav.php:120
-#, fuzzy
 msgid "Inbox"
 msgstr "Safata d'entrada"
 
-#: lib/personalgroupnav.php:121
 msgid "Your incoming messages"
 msgstr "Els teus missatges rebuts"
 
-#: lib/personalgroupnav.php:125
-#, fuzzy
 msgid "Outbox"
 msgstr "Safata de sortida"
 
-#: lib/personalgroupnav.php:126
 msgid "Your sent messages"
 msgstr "Els teus missatges enviats"
 
 #. TRANS: Title for personal tag cloud section. %s is a user nickname.
-#: lib/personaltagcloudsection.php:56
 #, php-format
 msgid "Tags in %s's notices"
 msgstr "Etiquetes en els avisos de %s"
 
 #. TRANS: Displayed as version information for a plugin if no version information was found.
-#: lib/plugin.php:126
 msgid "Unknown"
 msgstr "Desconegut"
 
 #. TRANS: Plugin admin panel controls
-#: lib/plugindisableform.php:90
 msgctxt "plugin"
 msgid "Disable"
 msgstr ""
 
 #. TRANS: Plugin admin panel controls
-#: lib/pluginenableform.php:112
 msgctxt "plugin"
 msgid "Enable"
 msgstr ""
 
-#: lib/pluginlist.php:196
 msgctxt "plugin-description"
 msgid "(Plugin descriptions unavailable when disabled.)"
 msgstr ""
 
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:88
 msgid "Subscriptions"
 msgstr "Subscripcions"
 
 #. TRANS: Text for user subscription statistics if user has more subscriptions than displayed.
-#: lib/profileaction.php:144
 msgid "All subscriptions"
 msgstr "Totes les subscripcions"
 
 #. TRANS: H2 text for user subscriber statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:96
 msgid "Subscribers"
 msgstr "Subscriptors"
 
 #. TRANS: Text for user subscription statistics if user has more subscribers than displayed.
-#: lib/profileaction.php:181
 msgid "All subscribers"
 msgstr "Tots els subscriptors"
 
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:213
 msgid "User ID"
 msgstr "ID de l'usuari"
 
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:219
 msgid "Member since"
 msgstr "Membre des de"
 
 #. TRANS: Label for user statistics.
 #. TRANS: H2 text for user group membership statistics.
-#: lib/profileaction.php:239 lib/profileaction.php:290
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:104
 msgid "Groups"
 msgstr "Grups"
 
 #. TRANS: Label for user statistics.
 #. TRANS: Average count of posts made per day since account registration.
-#: lib/profileaction.php:253
 msgid "Daily average"
 msgstr "Mitjana diària"
 
 #. TRANS: Text for user group membership statistics if user has more subscriptions than displayed.
-#: lib/profileaction.php:305
 msgid "All groups"
 msgstr "Tots els grups"
 
 #. TRANS: Server error displayed when using an unimplemented method.
-#: lib/profileformaction.php:123
 msgid "Unimplemented method."
 msgstr "Mètode no implementat"
 
-#: lib/publicgroupnav.php:82
 msgid "User groups"
 msgstr "Grups d'usuaris"
 
-#: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
 msgid "Recent tags"
 msgstr "Etiquetes recents"
 
-#: lib/publicgroupnav.php:88
 msgid "Featured"
 msgstr "Destacat"
 
-#: lib/publicgroupnav.php:92
 msgid "Popular"
 msgstr "Popular"
 
-#: lib/redirectingaction.php:95
 msgid "No return-to arguments."
 msgstr "No hi ha arguments de retorn."
 
-#: lib/repeatform.php:107
 msgid "Repeat this notice?"
 msgstr "Voleu repetir l'avís?"
 
-#: lib/repeatform.php:132
 msgid "Yes"
 msgstr "Sí"
 
-#: lib/repeatform.php:132
 msgid "Repeat this notice"
 msgstr "Repeteix l'avís"
 
-#: lib/revokeroleform.php:91
 #, php-format
 msgid "Revoke the \"%s\" role from this user"
 msgstr "Revoca el rol «%s» de l'usuari"
 
 #. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:1001
 msgid "Page not found."
 msgstr "No s'ha trobat la pàgina."
 
-#: lib/sandboxform.php:67
 msgid "Sandbox"
 msgstr "Entorn de proves"
 
-#: lib/sandboxform.php:78
 msgid "Sandbox this user"
 msgstr "Posa l'usuari a l'entorn de proves"
 
 #. TRANS: Fieldset legend for the search form.
-#: lib/searchaction.php:120
 msgid "Search site"
 msgstr "Cerca al lloc"
 
 #. TRANS: Used as a field label for the field where one or more keywords
 #. TRANS: for searching can be entered.
-#: lib/searchaction.php:128
 msgid "Keyword(s)"
 msgstr "Paraules clau"
 
 #. TRANS: Button text for searching site.
-#: lib/searchaction.php:130
 msgctxt "BUTTON"
 msgid "Search"
 msgstr "Cerca"
 
-#: lib/searchgroupnav.php:80
 msgid "People"
 msgstr "Gent"
 
-#: lib/searchgroupnav.php:81
 msgid "Find people on this site"
 msgstr "Cerca gent en aquest lloc"
 
-#: lib/searchgroupnav.php:83
 msgid "Find content of notices"
 msgstr "Cerca el contingut dels avisos"
 
-#: lib/searchgroupnav.php:85
 msgid "Find groups on this site"
 msgstr "Cerca grups en aquest lloc"
 
-#: lib/section.php:89
 msgid "Untitled section"
 msgstr "Secció sense títol"
 
-#: lib/section.php:106
 msgid "More..."
 msgstr "Més..."
 
-#: lib/settingsnav.php:78
 msgid "Change your profile settings"
 msgstr "Canvieu els paràmetres del vostre perfil"
 
-#: lib/settingsnav.php:83
 msgid "Upload an avatar"
 msgstr "Puja un avatar"
 
-#: lib/settingsnav.php:88
 msgid "Change your password"
 msgstr "Canvieu la vostra contrasenya"
 
-#: lib/settingsnav.php:93
 msgid "Change email handling"
 msgstr "Canvieu la gestió del correu"
 
-#: lib/settingsnav.php:98
 msgid "Design your profile"
 msgstr "Dissenyeu el vostre perfil"
 
-#: lib/settingsnav.php:102
 msgid "URL"
 msgstr "URL"
 
-#: lib/settingsnav.php:103
 msgid "URL shorteners"
 msgstr ""
 
-#: lib/settingsnav.php:111
 msgid "Updates by instant messenger (IM)"
 msgstr "Actualitzacions per missatgeria instantània (MI)"
 
-#: lib/settingsnav.php:118
 msgid "Updates by SMS"
 msgstr "Actualitzacions per SMS"
 
-#: lib/settingsnav.php:123
-#, fuzzy
 msgid "Connections"
 msgstr "Connexions"
 
-#: lib/settingsnav.php:124
 msgid "Authorized connected applications"
 msgstr "Aplicacions de connexió autoritzades"
 
-#: lib/silenceform.php:67
 msgid "Silence"
 msgstr "Silencia"
 
-#: lib/silenceform.php:78
 msgid "Silence this user"
 msgstr "Silencia l'usuari"
 
-#: lib/subgroupnav.php:89
 #, php-format
 msgid "People %s subscribes to"
 msgstr "Persones %s subscrites a"
 
-#: lib/subgroupnav.php:97
 #, php-format
 msgid "People subscribed to %s"
 msgstr "Gent subscrita a %s"
 
-#: lib/subgroupnav.php:105
 #, php-format
 msgid "Groups %s is a member of"
 msgstr "%s grups són membres de"
 
-#: lib/subgroupnav.php:111
 msgid "Invite"
 msgstr "Convida"
 
-#: lib/subgroupnav.php:112
 #, php-format
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Convida amics i companys perquè participin a %s"
 
-#: lib/subscribeform.php:115 lib/subscribeform.php:139
 msgid "Subscribe to this user"
 msgstr "Subscriu-me a aquest usuari"
 
-#: lib/subscriberspeopleselftagcloudsection.php:48
-#: lib/subscriptionspeopleselftagcloudsection.php:48
 msgid "People Tagcloud as self-tagged"
 msgstr "Núvol d'etiquetes personals (etiquetes pròpies)"
 
-#: lib/subscriberspeopletagcloudsection.php:48
-#: lib/subscriptionspeopletagcloudsection.php:48
 msgid "People Tagcloud as tagged"
 msgstr "Núvol d'etiquetes personals"
 
-#: lib/tagcloudsection.php:56
 msgid "None"
 msgstr "Cap"
 
 #. TRANS: Server exception displayed if a theme name was invalid.
-#: lib/theme.php:74
 msgid "Invalid theme name."
 msgstr "El nom del tema no és vàlid."
 
-#: lib/themeuploader.php:50
 msgid "This server cannot handle theme uploads without ZIP support."
 msgstr "El servidor no pot gestionar la pujada de temes si no pot tractar ZIP."
 
-#: lib/themeuploader.php:58 lib/themeuploader.php:61
 msgid "The theme file is missing or the upload failed."
 msgstr "Manca el fitxer del tema o la pujada ha fallat."
 
-#: lib/themeuploader.php:91 lib/themeuploader.php:102
-#: lib/themeuploader.php:279 lib/themeuploader.php:283
-#: lib/themeuploader.php:291 lib/themeuploader.php:298
 msgid "Failed saving theme."
 msgstr "Ha fallat el desament del tema."
 
-#: lib/themeuploader.php:147
 msgid "Invalid theme: bad directory structure."
 msgstr "El tema no és vàlid: l'estructura del directori no és correcta"
 
-#: lib/themeuploader.php:166
 #, php-format
 msgid "Uploaded theme is too large; must be less than %d byte uncompressed."
 msgid_plural ""
@@ -9617,11 +7967,9 @@ msgstr[0] ""
 msgstr[1] ""
 "El tema pujat és massa gran; ha de tenir menys de %d bytes descomprimit."
 
-#: lib/themeuploader.php:179
 msgid "Invalid theme archive: missing file css/display.css"
 msgstr "L'arxiu del tema no és vàlid: manca el fitxer css/display.css"
 
-#: lib/themeuploader.php:219
 msgid ""
 "Theme contains invalid file or folder name. Stick with ASCII letters, "
 "digits, underscore, and minus sign."
@@ -9629,140 +7977,112 @@ msgstr ""
 "El tema conté un fitxer o un nom de carpeta que no és vàlida. Feu servir "
 "només lletres ASCII, dígits, caràcters de subratllat i el símbol de menys."
 
-#: lib/themeuploader.php:225
 msgid "Theme contains unsafe file extension names; may be unsafe."
 msgstr "El tema conté uns noms d'extensió de fitxer que no són segurs."
 
-#: lib/themeuploader.php:242
 #, php-format
 msgid "Theme contains file of type '.%s', which is not allowed."
 msgstr "El tema conté un tipus de fitxer «.%s», que no està permès."
 
-#: lib/themeuploader.php:260
 msgid "Error opening theme archive."
 msgstr "S'ha produït un error en obrir l'arxiu del tema."
 
-#: lib/threadednoticelist.php:270
-#, php-format
-msgid "Show all %d comment"
-msgid_plural "Show all %d comments"
-msgstr[0] ""
-msgstr[1] ""
+#, fuzzy, php-format
+msgid "Show %d reply"
+msgid_plural "Show all %d replies"
+msgstr[0] "Mostra més"
+msgstr[1] "Mostra més"
 
-#: lib/topposterssection.php:74
 msgid "Top posters"
 msgstr "Qui més publica"
 
 #. TRANS: Title for the form to unblock a user.
-#: lib/unblockform.php:67
 msgctxt "TITLE"
 msgid "Unblock"
 msgstr "Desbloca"
 
-#: lib/unsandboxform.php:69
 msgid "Unsandbox"
 msgstr "Treu de l'entorn de proves"
 
-#: lib/unsandboxform.php:80
 msgid "Unsandbox this user"
 msgstr "Treu l'usuari de l'entorn de proves"
 
-#: lib/unsilenceform.php:67
 msgid "Unsilence"
 msgstr "Dessilencia"
 
-#: lib/unsilenceform.php:78
 msgid "Unsilence this user"
 msgstr "Dessilencia l'usuari"
 
-#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
 msgid "Unsubscribe from this user"
 msgstr "Cancel·la la subscripció d'aquest usuari"
 
-#: lib/unsubscribeform.php:137
 msgid "Unsubscribe"
 msgstr "Cancel·la la subscripció"
 
 #. 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).
-#: lib/usernoprofileexception.php:60
 #, php-format
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "L'usuari %1$s (%2$d) no té un registre de perfil."
 
-#: lib/userprofile.php:116
 msgid "Edit Avatar"
 msgstr "Edita l'avatar"
 
 #. TRANS: H2 for user actions in a profile.
 #. TRANS: H2 for entity actions in a profile.
-#: lib/userprofile.php:216 lib/userprofile.php:232
 msgid "User actions"
 msgstr "Accions de l'usuari"
 
 #. TRANS: Text shown in user profile of not yet compeltely deleted users.
-#: lib/userprofile.php:220
 msgid "User deletion in progress..."
 msgstr "S'està eliminant l'usuari..."
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:248
 msgid "Edit profile settings"
 msgstr "Edita la configuració del perfil"
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:250
 msgid "Edit"
 msgstr "Edita"
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:274
 msgid "Send a direct message to this user"
 msgstr "Envia un missatge directe a aquest usuari"
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:276
 msgid "Message"
 msgstr "Missatge"
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:318
 msgid "Moderate"
 msgstr "Modera"
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:357
 msgid "User role"
 msgstr "Rol de l'usuari"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:360
 msgctxt "role"
 msgid "Administrator"
 msgstr "Administrador"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:362
 msgctxt "role"
 msgid "Moderator"
 msgstr "Moderador"
 
-#: lib/util.php:321
 msgid "Not allowed to log in."
 msgstr "No es permet iniciar una sessió."
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1337
 msgid "a few seconds ago"
 msgstr "fa pocs segons"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1340
 msgid "about a minute ago"
 msgstr "fa un minut"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1344
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
@@ -9770,12 +8090,10 @@ msgstr[0] "aproximadament fa un minut"
 msgstr[1] "aproximadament fa %d minuts"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1347
 msgid "about an hour ago"
 msgstr "fa una hora"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1351
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
@@ -9783,12 +8101,10 @@ msgstr[0] "aproximadament fa una hora"
 msgstr[1] "aproximadament fa %d hores"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1354
 msgid "about a day ago"
 msgstr "fa un dia"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1358
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
@@ -9796,12 +8112,10 @@ msgstr[0] "aproximadament fa un dia"
 msgstr[1] "aproximadament fa %d dies"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1361
 msgid "about a month ago"
 msgstr "fa un mes"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1365
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
@@ -9809,203 +8123,41 @@ msgstr[0] "aproximadament fa un mes"
 msgstr[1] "aproximadament fa %d mesos"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1368
 msgid "about a year ago"
 msgstr "fa un any"
 
 #. TRANS: Web color exception thrown when a hexadecimal color code does not validate.
 #. TRANS: %s is the provided (invalid) color code.
-#: lib/webcolor.php:81 lib/webcolor.php:121
 #, php-format
 msgid "%s is not a valid color! Use 3 or 6 hex characters."
 msgstr "%s no és un color vàlid! Feu servir 3 o 6 caràcters hexadecimals."
 
 #. TRANS: Exception.
-#: lib/xrd.php:63
 msgid "Invalid XML."
 msgstr "L'XML no és vàlid."
 
 #. TRANS: Exception.
-#: lib/xrd.php:68
 msgid "Invalid XML, missing XRD root."
 msgstr "L'XML no és vàlid, hi manca l'arrel XRD."
 
 #. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
-#: scripts/restoreuser.php:62
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr "Es recupera la còpia de seguretat del fitxer '%s'."
 
-#~ msgid "Could not generate feed for group - %s"
-#~ msgstr "No s'ha pogut generar un canal per al grup - %s."
+#~ msgid "Full name is too long (max 255 chars)."
+#~ msgstr "El vostre nom sencer és massa llarg (màx. 255 caràcters)."
 
-#~ msgid "Current confirmed Jabber/Google Talk address."
-#~ msgstr "Adreça actual Jabber/Gtalk confirmada."
+#~ msgid "description is too long (max %d chars)."
+#~ msgstr "la descripció és massa llarga (màx. %d caràcters)."
 
-#~ msgid ""
-#~ "Jabber or Google Talk address, like \"UserName@example.org\". First, make "
-#~ "sure to add %s to your buddy list in your IM client or on Google Talk."
-#~ msgstr ""
-#~ "Adreça Jabber o GTalk, per exemple «NomUsuari@example.org». Primer, "
-#~ "assegureu-vos d'afegir %s a la vostra llista d'amics en el vostre client "
-#~ "de missatgeria instantània o al GTalk."
+#~ msgid "Location is too long (max 255 chars)."
+#~ msgstr "La localització és massa llarga (màx. 255 caràcters)."
 
-#~ msgid "Send me notices through Jabber/Google Talk."
-#~ msgstr "Envia'm avisos per Jabber/GTalk."
+#~ msgid "Too many aliases! Maximum %d."
+#~ msgstr "Hi ha massa àlies! Màxim %d."
 
-#~ msgid "Publish a MicroID for my Jabber/Google Talk address."
-#~ msgstr "Publica una MicroID per a la meva adreça de Jabber/GTalk."
-
-#~ msgid "No Jabber ID."
-#~ msgstr "Cap Jabber ID."
-
-#~ msgid "Not a valid Jabber ID."
-#~ msgstr "No és un ID de Jabber vàlid."
-
-#~ msgid "That is already your Jabber ID."
-#~ msgstr "Aquest ja és el teu Jabber ID."
-
-#~ msgid "That is not your Jabber ID."
-#~ msgstr "Aquest no és el teu Jabber ID."
-
-#~ msgid "Other settings"
-#~ msgstr "Altres paràmetres"
-
-#~ msgid "Tag cloud"
-#~ msgstr "Núvol d'etiquetes"
-
-#~ msgid "Consumer key"
-#~ msgstr "Clau del consumidor"
-
-#~ msgid "Consumer secret"
-#~ msgstr "Secreta del consumidor"
-
-#~ msgid "Request token URL"
-#~ msgstr "Sol·licita l'URL del testimoni"
-
-#~ msgid "Access token URL"
-#~ msgstr "Accedeix a l'URL del testimoni"
-
-#~ msgid "Authorize URL"
-#~ msgstr "Autoritza l'URL"
-
-#~ msgid "Jabber"
-#~ msgstr "Jabber"
-
-#~ msgid "Photo"
-#~ msgstr "Foto"
-
-#~ msgid "Other options"
-#~ msgstr "Altres opcions"
-
-#~ msgid "Other"
-#~ msgstr "Altres"
-
-#~ msgid "Primary site navigation"
-#~ msgstr "Navegació primària del lloc"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Personal profile and friends timeline"
-#~ msgstr "Perfil personal i línia temporal dels amics"
-
-#~ msgctxt "MENU"
-#~ msgid "Personal"
-#~ msgstr "Personal"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Change your email, avatar, password, profile"
-#~ msgstr "Canvia l'adreça electrònica, l'avatar, la contrasenya o el perfil"
-
-#~ msgid "Account"
-#~ msgstr "Compte"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Connect to services"
-#~ msgstr "Connecta als serveis"
-
-#~ msgid "Connect"
-#~ msgstr "Connexió"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Change site configuration"
-#~ msgstr "Canvia la configuració del lloc"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Invite friends and colleagues to join you on %s"
-#~ msgstr "Convida amics i coneguts perquè participin a %s"
-
-#~ msgctxt "MENU"
-#~ msgid "Invite"
-#~ msgstr "Convida"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Create an account"
-#~ msgstr "Crea un compte"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Help me!"
-#~ msgstr "Ajuda'm!"
-
-#~ msgctxt "MENU"
-#~ msgid "Help"
-#~ msgstr "Ajuda"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Search for people or text"
-#~ msgstr "Cerca gent o text"
-
-#~ msgid "Local views"
-#~ msgstr "Vistes locals"
-
-#~ msgid "Page notice"
-#~ msgstr "Avís de pàgina"
-
-#~ msgid "Secondary site navigation"
-#~ msgstr "Navegació del lloc secundària"
-
-#~ msgid "StatusNet software license"
-#~ msgstr "Llicència del programari StatusNet"
-
-#~ msgid "Site content license"
-#~ msgstr "Llicència de contingut del lloc"
-
-#~ msgid "Pagination"
-#~ msgstr "Paginació"
-
-#~ msgid "Author"
-#~ msgstr "Autoria"
-
-#~ msgid "Provider"
-#~ msgstr "Proveïdor"
-
-#~ msgctxt "MENU"
-#~ msgid "SMS"
-#~ msgstr "SMS"
-
-#~ msgid "Filter tags"
-#~ msgstr "Filtre d'etiquetes"
-
-#~ msgid "[%s]"
-#~ msgstr "[%s]"
-
-#~ msgid "Available characters"
-#~ msgstr "Caràcters disponibles"
-
-#~ msgctxt "MENU"
-#~ msgid "Profile"
-#~ msgstr "Perfil"
-
-#~ msgid "Search help"
-#~ msgstr "Ajuda de la cerca"
-
-#~ msgid "Unknown user. Go to %s to add your address to your account"
-#~ msgstr "Usuari desconegut. Aneu a %s per afegir una adreça al vostre compte"
-
-#~ msgid "Message too long. Maximum is %1$d character, you sent %2$d."
-#~ msgid_plural "Message too long. Maximum is %1$d characters, you sent %2$d."
-#~ msgstr[0] ""
-#~ "El missatge és massa llarg - el màxim és %1$d caràcter, i n'heu enviat %2"
-#~ "$d."
-#~ msgstr[1] ""
-#~ "El missatge és massa llarg - el màxim és %1$d caràcters, i n'heu enviat %2"
-#~ "$d."
+#, fuzzy
+#~ msgctxt "BUTTON"
+#~ msgid "Comment"
+#~ msgstr "Contingut"
diff --git a/locale/cs/LC_MESSAGES/statusnet.po b/locale/cs/LC_MESSAGES/statusnet.po
index b60c98a351..041a6ca799 100644
--- a/locale/cs/LC_MESSAGES/statusnet.po
+++ b/locale/cs/LC_MESSAGES/statusnet.po
@@ -11,68 +11,58 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:23+0000\n"
-"PO-Revision-Date: 2011-03-03 17:25:45+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:11+0000\n"
 "Language-Team: Czech <http://translatewiki.net/wiki/Portal:cs>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: cs\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=3; plural=(n == 1) ? 0 : ( (n >= 2 && n <= 4) ? 1 : "
 "2 );\n"
-"X-POT-Import-Date: 2011-02-25 23:49:23+0000\n"
+"X-POT-Import-Date: 2011-03-03 17:59:19+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
-#: actions/accessadminpanel.php:53 lib/adminpanelaction.php:363
 msgid "Access"
 msgstr "Přístup"
 
 #. TRANS: Page notice.
-#: actions/accessadminpanel.php:64
 msgid "Site access settings"
 msgstr "Nastavení přístupu"
 
 #. TRANS: Form legend for registration form.
-#: actions/accessadminpanel.php:151
 msgid "Registration"
 msgstr "Registrace"
 
 #. TRANS: Checkbox instructions for admin setting "Private".
-#: actions/accessadminpanel.php:155
 msgid "Prohibit anonymous users (not logged in) from viewing site?"
 msgstr "Zakázat anonymním (nepřihlášeným) uživatelům prohlížet stránky"
 
 #. TRANS: Checkbox label for prohibiting anonymous users from viewing site.
-#: actions/accessadminpanel.php:157
 msgctxt "LABEL"
 msgid "Private"
 msgstr "Soukromé"
 
 #. TRANS: Checkbox instructions for admin setting "Invite only".
-#: actions/accessadminpanel.php:164
 msgid "Make registration invitation only."
 msgstr "Registrace jen na pozvánku"
 
 #. TRANS: Checkbox label for configuring site as invite only.
-#: actions/accessadminpanel.php:166
 msgid "Invite only"
 msgstr "Pouze na pozvánku"
 
 #. TRANS: Checkbox instructions for admin setting "Closed" (no new registrations).
-#: actions/accessadminpanel.php:173
 msgid "Disable new registrations."
 msgstr "Znemožnit nové registrace"
 
 #. TRANS: Checkbox label for disabling new user registrations.
-#: actions/accessadminpanel.php:175
 msgid "Closed"
 msgstr "Uzavřené"
 
 #. TRANS: Title for button to save access settings in site admin panel.
-#: actions/accessadminpanel.php:191
 msgid "Save access settings"
 msgstr "uložit nastavení přístupu"
 
@@ -80,6 +70,7 @@ msgstr "uložit nastavení přístupu"
 #. TRANS: Button text for saving theme settings.
 #. TRANS: Button label to save e-mail preferences.
 #. TRANS: Button label to save IM preferences.
+#. TRANS: Button text in the license admin panel.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
 #. TRANS: Button text for saving site notice in admin panel.
@@ -89,21 +80,12 @@ msgstr "uložit nastavení přístupu"
 #. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
 #. TRANS: Button text on profile design page to save settings.
-#: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
-#: actions/emailsettings.php:251 actions/imsettings.php:199
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:198
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:204
-#: actions/subscriptions.php:261 actions/urlsettings.php:152
-#: actions/useradminpanel.php:298 lib/applicationeditform.php:355
-#: lib/designform.php:320 lib/groupeditform.php:201
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Uložit"
 
 #. TRANS: Server error when page not found (404).
 #. TRANS: Server error when page not found (404)
-#: actions/all.php:68 actions/public.php:98 actions/replies.php:93
-#: actions/showfavorites.php:140 actions/tag.php:52
 msgid "No such page."
 msgstr "Tady žádná taková stránka není."
 
@@ -122,6 +104,7 @@ msgstr "Tady žádná taková stránka není."
 #. TRANS: Client error displayed when checking group membership for a non-existing user.
 #. TRANS: Client error displayed when trying to have a non-existing user join a group.
 #. TRANS: Client error displayed when trying to have a non-existing user leave a group.
+#. TRANS: Client error displayed when not providing a user or an invalid user.
 #. TRANS: Client error displayed when updating a status for a non-existing user.
 #. TRANS: Client error displayed when requesting a list of followers for a non-existing user.
 #. TRANS: Client error displayed when requesting most recent favourite notices by a user for a non-existing user.
@@ -134,6 +117,8 @@ msgstr "Tady žádná taková stránka není."
 #. 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.
 #. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
@@ -141,33 +126,10 @@ msgstr "Tady žádná taková stránka není."
 #. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when calling a profile action without specifying a user.
-#: actions/all.php:80 actions/allrss.php:69
-#: actions/apiaccountupdatedeliverydevice.php:110
-#: actions/apiaccountupdateprofile.php:103
-#: actions/apiaccountupdateprofilebackgroundimage.php:118
-#: actions/apiaccountupdateprofileimage.php:104 actions/apiatomservice.php:59
-#: actions/apiblockcreate.php:96 actions/apiblockdestroy.php:94
-#: actions/apidirectmessage.php:75 actions/apidirectmessagenew.php:72
-#: actions/apigroupcreate.php:111 actions/apigroupismember.php:89
-#: actions/apigroupjoin.php:98 actions/apigroupleave.php:98
-#: actions/apigrouplist.php:70 actions/apigroupprofileupdate.php:108
-#: actions/apistatusesupdate.php:230 actions/apisubscriptions.php:85
-#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:173
-#: actions/apitimelinehome.php:78 actions/apitimelinementions.php:77
-#: actions/apitimelineuser.php:79 actions/avatarbynickname.php:79
-#: actions/favoritesrss.php:72 actions/foaf.php:42 actions/foaf.php:61
-#: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116
-#: actions/otp.php:78 actions/remotesubscribe.php:144
-#: actions/remotesubscribe.php:153 actions/replies.php:73
-#: actions/repliesrss.php:38 actions/rsd.php:113 actions/showfavorites.php:106
-#: actions/userbyid.php:75 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/userxrd.php:59 actions/xrds.php:71 lib/command.php:509
-#: lib/galleryaction.php:59 lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Uživatel neexistuje."
 
 #. TRANS: Page title. %1$s is user nickname, %2$d is page number
-#: actions/all.php:91
 #, php-format
 msgid "%1$s and friends, page %2$d"
 msgstr "%1$s a přátelé, strana %2$d"
@@ -176,33 +138,26 @@ msgstr "%1$s a přátelé, strana %2$d"
 #. TRANS: H1 text for page. %s is a user nickname.
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Timeline title for user and friends. %s is a user nickname.
-#: actions/all.php:94 actions/all.php:191 actions/allrss.php:117
-#: actions/apitimelinefriends.php:207 actions/apitimelinehome.php:113
-#: lib/personalgroupnav.php:100
 #, php-format
 msgid "%s and friends"
 msgstr "%s a přátelé"
 
 #. TRANS: %s is user nickname.
-#: actions/all.php:108
 #, php-format
 msgid "Feed for friends of %s (RSS 1.0)"
 msgstr "Feed pro přátele uživatele: %s (RSS 1.0)"
 
 #. TRANS: %s is user nickname.
-#: actions/all.php:117
 #, php-format
 msgid "Feed for friends of %s (RSS 2.0)"
 msgstr "Feed pro přátele uživatele: %s (RSS 2.0)"
 
 #. TRANS: %s is user nickname.
-#: actions/all.php:126
 #, php-format
 msgid "Feed for friends of %s (Atom)"
 msgstr "Feed pro přátele uživatele: %s (Atom)"
 
 #. TRANS: Empty list message. %s is a user nickname.
-#: actions/all.php:139
 #, php-format
 msgid ""
 "This is the timeline for %s and friends but no one has posted anything yet."
@@ -212,7 +167,6 @@ msgstr ""
 
 #. TRANS: Encouragement displayed on logged in user's empty timeline.
 #. TRANS: This message contains Markdown links. Keep "](" together.
-#: actions/all.php:146
 #, php-format
 msgid ""
 "Try subscribing to more people, [join a group](%%action.groups%%) or post "
@@ -223,7 +177,6 @@ msgstr ""
 
 #. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@".
 #. TRANS: This message contains Markdown links. Keep "](" together.
-#: actions/all.php:150
 #, php-format
 msgid ""
 "You can try to [nudge %1$s](../%2$s) from their profile or [post something "
@@ -236,7 +189,6 @@ msgstr ""
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
 #. TRANS: Second sentence of empty message for anonymous users. %s is a user nickname.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:221
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -246,14 +198,11 @@ msgstr ""
 "uživatele %s nebo jim poslat hlášku."
 
 #. TRANS: H1 text for page when viewing a list for self.
-#: actions/all.php:188
 msgid "You and friends"
 msgstr "Vy a přátelé"
 
 #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
 #. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name.
-#: actions/allrss.php:122 actions/apitimelinefriends.php:213
-#: actions/apitimelinehome.php:119
 #, php-format
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr "Novinky od uživatele %1$s a přátel na %2$s!"
@@ -272,55 +221,20 @@ msgstr "Novinky od uživatele %1$s a přátel na %2$s!"
 #. TRANS: Client error displayed trying to execute an unknown API method checking group membership.
 #. TRANS: Client error displayed trying to execute an unknown API method listing the latest 20 groups.
 #. TRANS: Client error displayed trying to execute an unknown API method showing group membership.
+#. TRANS: Client error displayed when using an unsupported API format.
 #. TRANS: Client error displayed trying to execute an unknown API method showing a group.
 #. TRANS: Client error displayed trying to execute an unknown API method testing API connectivity.
 #. TRANS: Client error displayed trying to execute an unknown API method deleting a status.
 #. TRANS: Client error displayed when trying to handle an unknown API method.
-#: actions/apiaccountratelimitstatus.php:69
-#: actions/apiaccountupdatedeliverydevice.php:92
-#: actions/apiaccountupdateprofile.php:94
-#: actions/apiaccountupdateprofilebackgroundimage.php:92
-#: actions/apiaccountupdateprofilecolors.php:115
-#: actions/apiaccountverifycredentials.php:68 actions/apidirectmessage.php:157
-#: actions/apifavoritecreate.php:98 actions/apifavoritedestroy.php:98
-#: actions/apifriendshipscreate.php:99 actions/apifriendshipsdestroy.php:99
-#: actions/apifriendshipsshow.php:124 actions/apigroupcreate.php:138
-#: actions/apigroupismember.php:115 actions/apigroupjoin.php:151
-#: actions/apigroupleave.php:141 actions/apigrouplist.php:134
-#: actions/apigrouplistall.php:120 actions/apigroupmembership.php:105
-#: actions/apigroupprofileupdate.php:100 actions/apigroupprofileupdate.php:213
-#: actions/apigroupshow.php:114 actions/apihelptest.php:84
-#: actions/apistatusesdestroy.php:101 actions/apistatusesretweets.php:110
-#: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:139
-#: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
-#: actions/apitimelinefavorites.php:182 actions/apitimelinefriends.php:276
-#: actions/apitimelinegroup.php:148 actions/apitimelinehome.php:181
-#: actions/apitimelinementions.php:182 actions/apitimelinepublic.php:247
-#: actions/apitimelineretweetedtome.php:147
-#: actions/apitimelineretweetsofme.php:147 actions/apitimelinetag.php:165
-#: actions/apitimelineuser.php:217 actions/apiusershow.php:100
 msgid "API method not found."
 msgstr " API metoda nebyla nalezena."
 
 #. 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.
-#: actions/apiaccountupdatedeliverydevice.php:83
-#: actions/apiaccountupdateprofile.php:85
-#: actions/apiaccountupdateprofilebackgroundimage.php:83
-#: actions/apiaccountupdateprofilecolors.php:106
-#: actions/apiaccountupdateprofileimage.php:80 actions/apiblockcreate.php:87
-#: actions/apiblockdestroy.php:85 actions/apidirectmessagenew.php:107
-#: actions/apifavoritecreate.php:88 actions/apifavoritedestroy.php:88
-#: actions/apifriendshipscreate.php:89 actions/apifriendshipsdestroy.php:89
-#: actions/apigroupcreate.php:102 actions/apigroupjoin.php:89
-#: actions/apigroupleave.php:89 actions/apigroupprofileupdate.php:92
-#: actions/apimediaupload.php:66 actions/apistatusesretweet.php:63
-#: actions/apistatusesupdate.php:194
 msgid "This method requires a POST."
 msgstr "Tato metoda vyžaduje POST."
 
 #. TRANS: Client error displayed when no valid device parameter is provided for a user's delivery device setting.
-#: actions/apiaccountupdatedeliverydevice.php:103
 msgid ""
 "You must specify a parameter named 'device' with a value of one of: sms, im, "
 "none."
@@ -334,10 +248,6 @@ msgstr ""
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
-#: actions/apiaccountupdatedeliverydevice.php:136
-#: actions/emailsettings.php:353 actions/emailsettings.php:499
-#: actions/profilesettings.php:323 actions/smssettings.php:300
-#: actions/smssettings.php:453 actions/urlsettings.php:211
 msgid "Could not update user."
 msgstr "Nepodařilo se aktualizovat nastavení uživatele"
 
@@ -350,32 +260,17 @@ msgstr "Nepodařilo se aktualizovat nastavení uživatele"
 #. TRANS: Server error displayed when requesting Friends of a Friend feed for a user for which the profile could not be found.
 #. TRANS: Server error displayed when trying to get a user hCard for a user without a profile.
 #. TRANS: Server error displayed when calling a profile action while the specified user does not have a profile.
-#: actions/apiaccountupdateprofile.php:111
-#: actions/apiaccountupdateprofilebackgroundimage.php:199
-#: actions/apiaccountupdateprofilecolors.php:183
-#: actions/apiaccountupdateprofileimage.php:131
-#: actions/apiuserprofileimage.php:88 actions/apiusershow.php:108
-#: actions/avatarbynickname.php:85 actions/foaf.php:69 actions/hcard.php:75
-#: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
-#: lib/profileaction.php:85
 msgid "User has no profile."
 msgstr "Uživatel nemá profil."
 
 #. TRANS: Server error displayed if a user profile could not be saved.
 #. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:419
 msgid "Could not save profile."
 msgstr "Nepodařilo se uložit profil."
 
 #. TRANS: Client error displayed when the number of bytes in a POST request exceeds a limit.
 #. TRANS: %s is the number of bytes of the CONTENT_LENGTH.
 #. TRANS: Form validation error in design settings form. POST should remain untranslated.
-#: actions/apiaccountupdateprofilebackgroundimage.php:108
-#: actions/apiaccountupdateprofileimage.php:95 actions/apimediaupload.php:81
-#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
-#: actions/designadminpanel.php:120 actions/editapplication.php:121
-#: actions/newapplication.php:102 actions/newnotice.php:95
-#: lib/designsettings.php:110
 #, fuzzy, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s byte) due to its "
@@ -398,26 +293,15 @@ msgstr[2] ""
 #. TRANS: Client error displayed when a database error occurs inserting profile colours.
 #. TRANS: Client error displayed when a database error occurs updating profile colours.
 #. TRANS: Form validation error displayed when group design settings could not be saved because of an application issue.
-#: actions/apiaccountupdateprofilebackgroundimage.php:138
-#: actions/apiaccountupdateprofilebackgroundimage.php:149
-#: actions/apiaccountupdateprofilecolors.php:160
-#: actions/apiaccountupdateprofilecolors.php:171
-#: actions/groupdesignsettings.php:285 actions/groupdesignsettings.php:296
-#: actions/userdesignsettings.php:218 actions/userdesignsettings.php:228
-#: actions/userdesignsettings.php:270 actions/userdesignsettings.php:280
 msgid "Unable to save your design settings."
 msgstr "Nelze uložit vaše nastavení designu."
 
 #. TRANS: Error displayed when updating design settings fails.
 #. TRANS: Client error displayed when a database error occurs updating profile colours.
-#: actions/apiaccountupdateprofilebackgroundimage.php:191
-#: actions/apiaccountupdateprofilecolors.php:139
-#: actions/userdesignsettings.php:196
 msgid "Could not update your design."
 msgstr "Nelze uložit design."
 
 #. TRANS: Title for Atom feed.
-#: actions/apiatomservice.php:85
 msgctxt "ATOM"
 msgid "Main"
 msgstr ""
@@ -426,9 +310,6 @@ msgstr ""
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Title in atom group notice feed. %s is a group name.
 #. TRANS: Title in atom user notice feed. %s is a user name.
-#: actions/apiatomservice.php:93 actions/grouprss.php:138
-#: actions/userrss.php:94 lib/atomgroupnoticefeed.php:63
-#: lib/atomusernoticefeed.php:88
 #, php-format
 msgid "%s timeline"
 msgstr "časová osa %s"
@@ -438,8 +319,6 @@ msgstr "časová osa %s"
 #. TRANS: %s is a user nickname.
 #. TRANS: Header for subscriptions overview for a user (first page).
 #. TRANS: %s is a user nickname.
-#: actions/apiatomservice.php:104 actions/atompubsubscriptionfeed.php:148
-#: actions/subscriptions.php:51
 #, php-format
 msgid "%s subscriptions"
 msgstr "Odběry uživatele %s"
@@ -447,58 +326,48 @@ msgstr "Odběry uživatele %s"
 #. TRANS: Title for Atom feed with a user's favorite notices. %s is a user nickname.
 #. TRANS: Title for Atom favorites feed.
 #. TRANS: %s is a user nickname.
-#: actions/apiatomservice.php:115 actions/atompubfavoritefeed.php:142
 #, fuzzy, php-format
 msgid "%s favorites"
 msgstr "Oblíbené"
 
 #. TRANS: Title for Atom feed with a user's memberships. %s is a user nickname.
-#: actions/apiatomservice.php:126
 #, fuzzy, php-format
 msgid "%s memberships"
 msgstr "členové skupiny %s"
 
 #. TRANS: Client error displayed when users try to block themselves.
-#: actions/apiblockcreate.php:105
 msgid "You cannot block yourself!"
 msgstr "Nemůžete zablokovat sami sebe!"
 
 #. TRANS: Server error displayed when blocking a user has failed.
-#: actions/apiblockcreate.php:127
 msgid "Block user failed."
 msgstr "Zablokovat uživatele se nezdařilo."
 
 #. TRANS: Server error displayed when unblocking a user has failed.
-#: actions/apiblockdestroy.php:113
 msgid "Unblock user failed."
 msgstr "Odblokovat uživatele se nezdařilo."
 
 #. TRANS: Title. %s is a user nickname.
-#: actions/apidirectmessage.php:88
 #, php-format
 msgid "Direct messages from %s"
 msgstr "Přímá zpráva od %s"
 
 #. TRANS: Subtitle. %s is a user nickname.
-#: actions/apidirectmessage.php:93
 #, php-format
 msgid "All the direct messages sent from %s"
 msgstr "Všechny přímé zprávy od uživatele %s"
 
 #. TRANS: Title. %s is a user nickname.
-#: actions/apidirectmessage.php:102
 #, php-format
 msgid "Direct messages to %s"
 msgstr "Přímé zprávy uživateli %s"
 
 #. TRANS: Subtitle. %s is a user nickname.
-#: actions/apidirectmessage.php:107
 #, php-format
 msgid "All the direct messages sent to %s"
 msgstr "Všechny přímé zprávy odeslané uživateli %s"
 
 #. TRANS: Client error displayed when no message text was submitted (406).
-#: actions/apidirectmessagenew.php:117
 msgid "No message text!"
 msgstr "zpráva bez textu!"
 
@@ -506,7 +375,6 @@ msgstr "zpráva bez textu!"
 #. TRANS: %d is the maximum number of characters for a message.
 #. TRANS: Form validation error displayed when message content is too long.
 #. TRANS: %d is the maximum number of characters for a message.
-#: actions/apidirectmessagenew.php:127 actions/newmessage.php:152
 #, fuzzy, php-format
 msgid "That's too long. Maximum message size is %d character."
 msgid_plural "That's too long. Maximum message size is %d characters."
@@ -515,18 +383,15 @@ msgstr[1] "Je to příliš dlouhé. Maximální délka sdělení je %d znaků."
 msgstr[2] "Je to příliš dlouhé. Maximální délka sdělení je %d znaků."
 
 #. TRANS: Client error displayed if a recipient user could not be found (403).
-#: actions/apidirectmessagenew.php:139
 msgid "Recipient user not found."
 msgstr "Příjemce nebyl nalezen."
 
 #. TRANS: Client error displayed trying to direct message another user who's not a friend (403).
-#: actions/apidirectmessagenew.php:144
 #, fuzzy
 msgid "Cannot send direct messages to users who aren't your friend."
 msgstr "Nelze odesílat zprávy uživatelům, kteří nejsou vašimi přáteli."
 
 #. TRANS: Client error displayed trying to direct message self (403).
-#: actions/apidirectmessagenew.php:154
 #, fuzzy
 msgid ""
 "Do not send a message to yourself; just say it to yourself quietly instead."
@@ -535,118 +400,98 @@ msgstr "Neposílejte si zprávu, potichu si ji pro sebe řekněte."
 #. 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.
 #. TRANS: Client error displayed trying to delete a status with an invalid ID.
-#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:108
-#: actions/apistatusesdestroy.php:121
 msgid "No status found with that ID."
 msgstr "Hláška s tímto ID nenalezena."
 
 #. TRANS: Client error displayed when trying to mark a notice favourite that already is a favourite.
-#: actions/apifavoritecreate.php:120
 msgid "This status is already a favorite."
 msgstr "Tuto hlášku již máte v oblíbených."
 
 #. TRANS: Client error displayed when marking a notice as favourite fails.
 #. TRANS: Server error displayed when trying to mark a notice as favorite fails in the database.
 #. TRANS: Error message text shown when a favorite could not be set.
-#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:306
 msgid "Could not create favorite."
 msgstr "Nelze vytvořit oblíbenou položku."
 
 #. TRANS: Client error displayed when trying to remove a favourite that was not a favourite.
-#: actions/apifavoritedestroy.php:122
 msgid "That status is not a favorite."
 msgstr "Tato hláška není oblíbená."
 
 #. TRANS: Client error displayed when removing a favourite has failed.
 #. TRANS: Server error displayed when removing a favorite from the database fails.
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:90
 msgid "Could not delete favorite."
 msgstr "Nelze smazat oblíbenou položku."
 
 #. TRANS: Client error displayed when trying follow who's profile could not be found.
-#: actions/apifriendshipscreate.php:109
 msgid "Could not follow user: profile not found."
 msgstr "Nemůžu začít sledovat uživatele, profil nenalezen."
 
 #. TRANS: Client error displayed when trying to follow a user that's already being followed.
 #. TRANS: %s is the nickname of the user that is already being followed.
-#: actions/apifriendshipscreate.php:120
 #, php-format
 msgid "Could not follow user: %s is already on your list."
 msgstr "Nemohu začít sledovat uživatele: %s je již na vašem seznamu."
 
 #. TRANS: Client error displayed when trying to unfollow a user that cannot be found.
-#: actions/apifriendshipsdestroy.php:109
 msgid "Could not unfollow user: User not found."
 msgstr "Nemohu přestat sledovat uživatele, uživatel nebyl nalezen."
 
 #. TRANS: Client error displayed when trying to unfollow self.
-#: actions/apifriendshipsdestroy.php:121
 msgid "You cannot unfollow yourself."
 msgstr "Nemůžete přestat sledovat sami sebe."
 
 #. TRANS: Client error displayed when supplying invalid parameters to an API call checking if a friendship exists.
-#: actions/apifriendshipsexists.php:88
 #, fuzzy
 msgid "Two valid IDs or nick names must be supplied."
 msgstr "Dva platné ID nebo screen_names musí být dodány."
 
 #. TRANS: Client error displayed when a source user could not be determined showing friendship.
-#: actions/apifriendshipsshow.php:131
 msgid "Could not determine source user."
 msgstr "Nelze určit zdrojového uživatele."
 
 #. TRANS: Client error displayed when a target user could not be determined showing friendship.
-#: actions/apifriendshipsshow.php:140
 msgid "Could not find target user."
 msgstr "Nepodařilo se najít cílového uživatele."
 
 #. TRANS: Client error trying to create a group with a nickname this is already in use.
+#. TRANS: API validation exception thrown when nickname is already used.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:156 actions/apigroupprofileupdate.php:255
-#: actions/editgroup.php:191 actions/newgroup.php:137
-#: actions/profilesettings.php:274 actions/register.php:199
 msgid "Nickname already in use. Try another one."
 msgstr "Přezdívku již někdo používá. Zkuste jinou."
 
 #. TRANS: Client error in form for group creation.
+#. TRANS: API validation exception thrown when nickname does not validate.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:164 actions/apigroupprofileupdate.php:259
-#: actions/editgroup.php:195 actions/newgroup.php:141
-#: actions/profilesettings.php:244 actions/register.php:201
 msgid "Not a valid nickname."
 msgstr "Není platnou přezdívkou."
 
 #. TRANS: Client error in form for group creation.
+#. TRANS: API validation exception thrown when homepage URL does not validate.
 #. TRANS: Validation error shown when providing an invalid homepage URL in the "Edit application" form.
 #. TRANS: Group edit form validation error.
 #. TRANS: Validation error shown when providing an invalid homepage URL in the "New application" form.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:181 actions/apigroupprofileupdate.php:277
-#: actions/editapplication.php:235 actions/editgroup.php:202
-#: actions/newapplication.php:221 actions/newgroup.php:148
-#: actions/profilesettings.php:249 actions/register.php:208
 msgid "Homepage is not a valid URL."
 msgstr "Domovská stránka není platná URL."
 
 #. TRANS: Client error in form for group creation.
+#. TRANS: API validation exception thrown when full name does not validate.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:191 actions/editgroup.php:206
-#: actions/newgroup.php:152 actions/profilesettings.php:253
-#: actions/register.php:211
 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "Celé jméno je moc dlouhé (maximální délka je 255 znaků)."
 
 #. TRANS: Client error shown when providing too long a description during group creation.
 #. TRANS: %d is the maximum number of allowed characters.
+#. TRANS: API validation exception thrown when description does not validate.
+#. TRANS: %d is the maximum description length and used for plural.
 #. TRANS: Validation error shown when providing too long a description in the "Edit application" form.
 #. TRANS: %d is the maximum number of allowed characters.
 #. TRANS: Group edit form validation error.
@@ -654,9 +499,6 @@ msgstr "Celé jméno je moc dlouhé (maximální délka je 255 znaků)."
 #. TRANS: %d is the maximum number of characters for the description.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed characters.
-#: actions/apigroupcreate.php:201 actions/editapplication.php:202
-#: actions/editgroup.php:211 actions/newapplication.php:182
-#: actions/newgroup.php:157
 #, fuzzy, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."
@@ -665,24 +507,22 @@ msgstr[1] "Popis je příliš dlouhý (maximálně %d znaků)."
 msgstr[2] "Popis je příliš dlouhý (maximálně %d znaků)."
 
 #. TRANS: Client error shown when providing too long a location during group creation.
+#. TRANS: API validation exception thrown when location does not validate.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:215 actions/editgroup.php:218
-#: actions/newgroup.php:164 actions/profilesettings.php:266
-#: actions/register.php:220
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
 msgstr "Umístění je příliš dlouhé (maximálně 255 znaků)."
 
 #. TRANS: Client error shown when providing too many aliases during group creation.
 #. TRANS: %d is the maximum number of allowed aliases.
+#. TRANS: API validation exception thrown when aliases do not validate.
+#. TRANS: %d is the maximum number of aliases and used for plural.
 #. TRANS: Group edit form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.
-#: actions/apigroupcreate.php:236 actions/editgroup.php:231
-#: actions/newgroup.php:177
 #, fuzzy, php-format
 msgid "Too many aliases! Maximum %d allowed."
 msgid_plural "Too many aliases! Maximum %d allowed."
@@ -692,25 +532,24 @@ msgstr[2] "Příliš mnoho aliasů! Maximálně %d."
 
 #. TRANS: Client error shown when providing an invalid alias during group creation.
 #. TRANS: %s is the invalid alias.
-#: actions/apigroupcreate.php:253
+#. TRANS: API validation exception thrown when aliases does not validate.
+#. TRANS: %s is the invalid alias.
 #, php-format
 msgid "Invalid alias: \"%s\"."
 msgstr "Neplatný alias: \"%s\"."
 
 #. TRANS: Client error displayed when trying to use an alias during group creation that is already in use.
 #. TRANS: %s is the alias that is already in use.
+#. TRANS: API validation exception thrown when aliases is already used.
+#. TRANS: %s is the already used alias.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error. %s is the already used alias.
-#: actions/apigroupcreate.php:264 actions/apigroupprofileupdate.php:351
-#: actions/editgroup.php:246 actions/newgroup.php:193
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "Alias \"%s\" se již používá. Zkuste jiný."
 
 #. TRANS: Client error displayed when trying to use an alias during group creation that is the same as the group's nickname.
 #. TRANS: Group edit form validation error.
-#: actions/apigroupcreate.php:278 actions/apigroupprofileupdate.php:359
-#: actions/editgroup.php:253
 msgid "Alias can't be the same as nickname."
 msgstr "Alias nemůže být stejný jako přezdívka."
 
@@ -718,26 +557,21 @@ msgstr "Alias nemůže být stejný jako přezdívka."
 #. TRANS: Client error displayed when trying to join a group that does not exist.
 #. TRANS: Client error displayed when trying to leave a group that does not exist.
 #. TRANS: Client error displayed trying to show group membership on a non-existing group.
+#. TRANS: Client error displayed when not providing a group or an invalid group.
 #. TRANS: Client error displayed when trying to show a group that could not be found.
 #. TRANS: Client error displayed requesting most recent notices to a group for a non-existing group.
-#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
-#: actions/apigroupleave.php:104 actions/apigroupmembership.php:71
-#: actions/apigroupprofileupdate.php:113 actions/apigroupshow.php:81
-#: actions/apitimelinegroup.php:89
 msgid "Group not found."
 msgstr "Skupina nebyla nalezena."
 
 #. TRANS: Server error displayed when trying to join a group the user is already a member of.
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:345
 msgid "You are already a member of that group."
 msgstr "Jste již členem této skupiny."
 
 #. TRANS: Server error displayed when trying to join a group the user is blocked from joining.
 #. 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.
-#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:350
 msgid "You have been blocked from that group by the admin."
 msgstr "Z této skupiny jste byl zablokován adminem."
 
@@ -745,13 +579,11 @@ msgstr "Z této skupiny jste byl zablokován adminem."
 #. TRANS: %1$s is the joining user's nickname, $2$s is the group nickname for which the join failed.
 #. TRANS: Message given having failed to add a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:136 actions/joingroup.php:139 lib/command.php:362
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "Nemohu připojit uživatele %1$s do skupiny %2$s."
 
 #. TRANS: Server error displayed when trying to leave a group the user is not a member of.
-#: actions/apigroupleave.php:115
 msgid "You are not a member of this group."
 msgstr "Nejste členem této skupiny."
 
@@ -759,116 +591,79 @@ msgstr "Nejste členem této skupiny."
 #. TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
 #. TRANS: Message given having failed to remove a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupleave.php:127 actions/leavegroup.php:133
-#: lib/command.php:410
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
 msgstr "Nelze odebrat uživatele %1$S ze skupiny %2$s."
 
 #. TRANS: Used as title in check for group membership. %s is a user name.
-#: actions/apigrouplist.php:94
 #, php-format
 msgid "%s's groups"
 msgstr "skupiny uživatele %s"
 
 #. TRANS: Used as subtitle in check for group membership. %1$s is a user name, %2$s is the site name.
-#: actions/apigrouplist.php:104
 #, php-format
 msgid "%1$s groups %2$s is a member of."
 msgstr "skupiny na %1$s, kterych je %2$s členem."
 
 #. TRANS: Message is used as a title when listing the lastest 20 groups. %s is a site name.
 #. TRANS: Message is used as a page title. %s is a nick name.
-#: actions/apigrouplistall.php:88 actions/usergroups.php:63
 #, php-format
 msgid "%s groups"
 msgstr "skupiny uživatele %s"
 
 #. TRANS: Message is used as a subtitle when listing the lastest 20 groups. %s is a site name.
-#: actions/apigrouplistall.php:93
 #, php-format
 msgid "groups on %s"
 msgstr "skupiny na %s"
 
+#. TRANS: Client error displayed when trying to edit a group without being an admin.
 #. TRANS: Client error displayed trying to edit a group while not being a group admin.
 #. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
 #. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
-#: actions/apigroupprofileupdate.php:118 actions/editgroup.php:110
-#: actions/editgroup.php:176 actions/groupdesignsettings.php:109
-#: actions/grouplogo.php:111
 msgid "You must be an admin to edit the group."
 msgstr "K úpravě skupiny musíte být admin."
 
+#. TRANS: Server error displayed when group update fails.
 #. TRANS: Server error displayed when editing a group fails.
-#: actions/apigroupprofileupdate.php:171 actions/editgroup.php:274
 msgid "Could not update group."
 msgstr "Nelze aktualizovat skupinu."
 
+#. TRANS: Server error displayed when adding group aliases fails.
 #. TRANS: Server error displayed when group aliases could not be added.
 #. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/apigroupprofileupdate.php:194 actions/editgroup.php:281
-#: classes/User_group.php:540
 msgid "Could not create aliases."
 msgstr "Nelze vytvořit aliasy."
 
+#. TRANS: API validation exception thrown when nickname does not validate.
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: actions/apigroupprofileupdate.php:249 lib/nickname.php:165
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr "Přezdívka může obsahovat pouze malá písmena a čísla a žádné mezery."
 
-#: actions/apigroupprofileupdate.php:286
-#, fuzzy
-msgid "Full name is too long (max 255 chars)."
-msgstr "Celé jméno je moc dlouhé (maximální délka je 255 znaků)."
-
-#: actions/apigroupprofileupdate.php:296
-#, fuzzy, php-format
-msgid "description is too long (max %d chars)."
-msgstr "Popis je příliš dlouhý (maximálně %d znaků)."
-
-#: actions/apigroupprofileupdate.php:307
-#, fuzzy
-msgid "Location is too long (max 255 chars)."
-msgstr "Umístění je příliš dlouhé (maximálně 255 znaků)."
-
-#: actions/apigroupprofileupdate.php:326
-#, fuzzy, php-format
-msgid "Too many aliases! Maximum %d."
-msgstr "Příliš mnoho aliasů! Maximálně %d."
-
-#. TRANS: Group edit form validation error.
+#. TRANS: API validation exception thrown when alias is the same as nickname.
 #. TRANS: Group create form validation error.
-#. TRANS: %s is the invalid alias.
-#: actions/apigroupprofileupdate.php:342 actions/editgroup.php:241
-#: actions/newgroup.php:188
-#, php-format
-msgid "Invalid alias: \"%s\""
-msgstr "Neplatný alias: \"%s\""
+#, fuzzy
+msgid "Alias cannot be the same as nickname."
+msgstr "Alias nemůže být stejný jako přezdívka."
 
 #. TRANS: Client error displayed when uploading a media file has failed.
-#: actions/apimediaupload.php:101
 msgid "Upload failed."
 msgstr "Nahrání se nezdařilo."
 
 #. TRANS: Client error given from the OAuth API when the request token or verifier is invalid.
-#: actions/apioauthaccesstoken.php:102
 #, fuzzy
 msgid "Invalid request token or verifier."
 msgstr "Neplatný přihlašovací token."
 
 #. TRANS: Client error given when no oauth_token was passed to the OAuth API.
-#: actions/apioauthauthorize.php:107
 msgid "No oauth_token parameter provided."
 msgstr "nebyl dodán parametr oauth_token"
 
 #. TRANS: Client error given when an invalid request token was passed to the OAuth API.
-#: actions/apioauthauthorize.php:115 actions/apioauthauthorize.php:129
 #, fuzzy
 msgid "Invalid request token."
 msgstr "Neplatný token."
 
 #. TRANS: Client error given when an invalid request token was passed to the OAuth API.
-#: actions/apioauthauthorize.php:121
 #, fuzzy
 msgid "Request token already authorized."
 msgstr "Nejste autorizován."
@@ -879,31 +674,14 @@ msgstr "Nejste autorizován."
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
 #. TRANS: Client error displayed when the session token is not okay.
-#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:75
-#: actions/emailsettings.php:292 actions/favor.php:75 actions/geocode.php:55
-#: actions/groupblock.php:65 actions/grouplogo.php:321
-#: actions/groupunblock.php:65 actions/imsettings.php:241
-#: actions/invite.php:60 actions/makeadmin.php:66 actions/newmessage.php:135
-#: actions/newnotice.php:105 actions/nudge.php:80
-#: actions/oauthappssettings.php:162 actions/oauthconnectionssettings.php:135
-#: actions/passwordsettings.php:137 actions/pluginenable.php:87
-#: actions/profilesettings.php:218 actions/recoverpassword.php:383
-#: actions/register.php:157 actions/remotesubscribe.php:76
-#: actions/repeat.php:82 actions/smssettings.php:249 actions/subedit.php:40
-#: actions/subscribe.php:87 actions/tagother.php:145
-#: actions/unsubscribe.php:69 actions/urlsettings.php:171
-#: actions/userauthorization.php:53 lib/designsettings.php:122
 msgid "There was a problem with your session token. Try again, please."
 msgstr "Nastal problém s vaším session tokenem. Zkuste to znovu, prosím."
 
 #. TRANS: Form validation error given when an invalid username and/or password was passed to the OAuth API.
-#: actions/apioauthauthorize.php:168
 msgid "Invalid nickname / password!"
 msgstr "Neplatné jméno nebo heslo!"
 
 #. TRANS: Server error displayed when a database action fails.
-#: actions/apioauthauthorize.php:217
 #, fuzzy
 msgid "Database error inserting oauth_token_association."
 msgstr "Chyba databáze při vkládání uživatele aplikace OAuth."
@@ -920,28 +698,19 @@ msgstr "Chyba databáze při vkládání uživatele aplikace OAuth."
 #. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
 #. TRANS: Message given submitting a form with an unknown action in SMS settings.
 #. TRANS: Unknown form validation error in design settings form.
-#: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
-#: actions/designadminpanel.php:100 actions/editapplication.php:144
-#: actions/emailsettings.php:311 actions/grouplogo.php:332
-#: actions/imsettings.php:256 actions/newapplication.php:124
-#: actions/oauthconnectionssettings.php:144 actions/recoverpassword.php:46
-#: actions/smssettings.php:270 lib/designsettings.php:133
 msgid "Unexpected form submission."
 msgstr "Nečekaný požadavek."
 
 #. TRANS: Title for a page where a user can confirm/deny account access by an external application.
-#: actions/apioauthauthorize.php:387
 msgid "An application would like to connect to your account"
 msgstr "Aplikace se chce připojit k vašemu účtu"
 
 #. TRANS: Fieldset legend.
-#: actions/apioauthauthorize.php:404
 msgid "Allow or deny access"
 msgstr "Povolit nebo zamítnout přístup"
 
 #. TRANS: User notification of external application requesting account access.
 #. TRANS: %3$s is the access type requested (read-write or read-only), %4$s is the StatusNet sitename.
-#: actions/apioauthauthorize.php:425
 #, fuzzy, php-format
 msgid ""
 "An application would like the ability to <strong>%3$s</strong> your %4$s "
@@ -955,7 +724,6 @@ msgstr ""
 #. TRANS: User notification of external application requesting account access.
 #. TRANS: %1$s is the application name requesting access, %2$s is the organisation behind the application,
 #. TRANS: %3$s is the access type requested, %4$s is the StatusNet sitename.
-#: actions/apioauthauthorize.php:433
 #, php-format
 msgid ""
 "The application <strong>%1$s</strong> by <strong>%2$s</strong> would like "
@@ -967,23 +735,19 @@ msgstr ""
 "vašeho účtu na %4$s jen třetím stranám kterým věříte.."
 
 #. TRANS: Fieldset legend.
-#: actions/apioauthauthorize.php:455
 #, fuzzy
 msgctxt "LEGEND"
 msgid "Account"
 msgstr "Účet"
 
 #. TRANS: Field label on OAuth API authorisation form.
+#. TRANS: Field label on login page.
 #. TRANS: Field label in form for profile settings.
-#: actions/apioauthauthorize.php:459 actions/login.php:225
-#: actions/profilesettings.php:107 actions/register.php:411
-#: actions/userauthorization.php:145 lib/groupeditform.php:145
 msgid "Nickname"
 msgstr "Přezdívka"
 
 #. TRANS: Field label on OAuth API authorisation form.
-#: actions/apioauthauthorize.php:463 actions/login.php:228
-#: actions/register.php:415 lib/settingsnav.php:87
+#. TRANS: Field label on login page.
 msgid "Password"
 msgstr "Heslo"
 
@@ -993,47 +757,38 @@ msgstr "Heslo"
 #. TRANS: Button label to cancel an IM address confirmation procedure.
 #. TRANS: Button label to cancel a SMS address confirmation procedure.
 #. TRANS: Button label in the "Edit application" form.
-#: actions/apioauthauthorize.php:478 actions/emailsettings.php:125
-#: actions/imsettings.php:136 actions/smssettings.php:132
-#: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Cancel"
 msgstr "Zrušit"
 
 #. TRANS: Button text that when clicked will allow access to an account by an external application.
-#: actions/apioauthauthorize.php:485
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Allow"
 msgstr "Povolit"
 
 #. TRANS: Form instructions.
-#: actions/apioauthauthorize.php:502
 #, fuzzy
 msgid "Authorize access to your account information."
 msgstr "Povolit nebo zakázat přístup k vašemu účtu."
 
 #. TRANS: Header for user notification after revoking OAuth access to an application.
-#: actions/apioauthauthorize.php:594
 #, fuzzy
 msgid "Authorization canceled."
 msgstr "IM potvrzení zrušeno."
 
 #. TRANS: User notification after revoking OAuth access to an application.
 #. TRANS: %s is an OAuth token.
-#: actions/apioauthauthorize.php:598
 #, fuzzy, php-format
 msgid "The request token %s has been revoked."
 msgstr "Token žádosti %s byl odepřen a zrušen."
 
 #. TRANS: Title of the page notifying the user that an anonymous client application was successfully authorized to access the user's account with OAuth.
-#: actions/apioauthauthorize.php:621
 #, fuzzy
 msgid "You have successfully authorized the application"
 msgstr "Nejste autorizován."
 
 #. TRANS: Message notifying the user that an anonymous client application was successfully authorized to access the user's account with OAuth.
-#: actions/apioauthauthorize.php:625
 msgid ""
 "Please return to the application and enter the following security code to "
 "complete the process."
@@ -1041,14 +796,12 @@ msgstr ""
 
 #. TRANS: Title of the page notifying the user that the client application was successfully authorized to access the user's account with OAuth.
 #. TRANS: %s is the authorised application name.
-#: actions/apioauthauthorize.php:632
 #, fuzzy, php-format
 msgid "You have successfully authorized %s"
 msgstr "Nejste autorizován."
 
 #. TRANS: Message notifying the user that the client application was successfully authorized to access the user's account with OAuth.
 #. TRANS: %s is the authorised application name.
-#: actions/apioauthauthorize.php:639
 #, php-format
 msgid ""
 "Please return to %s and enter the following security code to complete the "
@@ -1057,12 +810,10 @@ msgstr ""
 
 #. TRANS: Client error displayed trying to delete a status not using POST or DELETE.
 #. TRANS: POST and DELETE should not be translated.
-#: actions/apistatusesdestroy.php:111
 msgid "This method requires a POST or DELETE."
 msgstr "Tato metoda vyžaduje POST nebo DELETE."
 
 #. TRANS: Client error displayed trying to delete a status of another user.
-#: actions/apistatusesdestroy.php:136
 msgid "You may not delete another user's status."
 msgstr "Nesmíte odstraňovat status jiného uživatele."
 
@@ -1070,21 +821,16 @@ msgstr "Nesmíte odstraňovat status jiného uživatele."
 #. TRANS: Client error displayed trying to display redents of a non-exiting notice.
 #. TRANS: Client exception thrown when referencing a non-existing notice.
 #. TRANS: Error message displayed trying to delete a non-existing notice.
-#: actions/apistatusesretweet.php:74 actions/apistatusesretweets.php:70
-#: actions/atompubshowfavorite.php:82 actions/deletenotice.php:61
-#: actions/shownotice.php:92
 msgid "No such notice."
 msgstr "Žádné takové oznámení."
 
 #. TRANS: Client error displayed trying to repeat an own notice through the API.
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:549
 msgid "Cannot repeat your own notice."
 msgstr "Nelze opakovat své vlastní oznámení."
 
 #. TRANS: Client error displayed trying to re-repeat a notice through the API.
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:92 lib/command.php:555
 msgid "Already repeated that notice."
 msgstr "Již jste zopakoval toto oznámení."
 
@@ -1094,59 +840,45 @@ msgstr "Již jste zopakoval toto oznámení."
 #. TRANS: Client exception thrown when using an unsupported HTTP method.
 #. TRANS: Client error shown when using a non-supported HTTP method.
 #. TRANS: Client exception thrown when using an unsupported HTTP method.
-#: actions/apistatusesshow.php:118 actions/atompubfavoritefeed.php:103
-#: actions/atompubmembershipfeed.php:105 actions/atompubshowfavorite.php:117
-#: actions/atompubshowmembership.php:116
-#: actions/atompubshowsubscription.php:122
-#: actions/atompubsubscriptionfeed.php:109
 #, fuzzy
 msgid "HTTP method not supported."
 msgstr " API metoda nebyla nalezena."
 
 #. TRANS: Exception thrown requesting an unsupported notice output format.
 #. TRANS: %s is the requested output format.
-#: actions/apistatusesshow.php:144
 #, fuzzy, php-format
 msgid "Unsupported format: %s."
 msgstr "Nepodporovaný formát."
 
 #. TRANS: Client error displayed requesting a deleted status.
-#: actions/apistatusesshow.php:155
 msgid "Status deleted."
 msgstr "Status smazán."
 
 #. TRANS: Client error displayed requesting a status with an invalid ID.
-#: actions/apistatusesshow.php:162
 msgid "No status with that ID found."
 msgstr "Nenalezen status s tímto ID."
 
 #. TRANS: Client error displayed when trying to delete a notice not using the Atom format.
-#: actions/apistatusesshow.php:227
 msgid "Can only delete using the Atom format."
 msgstr ""
 
 #. TRANS: Client error displayed when a user has no rights to delete notices of other users.
 #. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
-#: actions/apistatusesshow.php:235 actions/deletenotice.php:78
 #, fuzzy
 msgid "Cannot delete this notice."
 msgstr "Toto oznámení nelze odstranit."
 
 #. TRANS: Confirmation of notice deletion in API. %d is the ID (number) of the deleted notice.
-#: actions/apistatusesshow.php:249
 #, fuzzy, php-format
 msgid "Deleted notice %d"
 msgstr "Odstranit oznámení"
 
 #. TRANS: Client error displayed when the parameter "status" is missing.
-#: actions/apistatusesupdate.php:221
 msgid "Client must provide a 'status' parameter with a value."
 msgstr "Klient musí poskytnout 'status' parametr s hodnotou."
 
 #. TRANS: Client error displayed when the parameter "status" is missing.
 #. TRANS: %d is the maximum number of character for a notice.
-#: actions/apistatusesupdate.php:244 actions/newnotice.php:161
-#: lib/mailhandler.php:60
 #, fuzzy, php-format
 msgid "That's too long. Maximum notice size is %d character."
 msgid_plural "That's too long. Maximum notice size is %d characters."
@@ -1155,14 +887,12 @@ msgstr[1] "Je to příliš dlouhé. Maximální délka sdělení je %d znaků"
 msgstr[2] "Je to příliš dlouhé. Maximální délka sdělení je %d znaků"
 
 #. TRANS: Client error displayed when replying to a non-existing notice.
-#: actions/apistatusesupdate.php:284
 #, fuzzy
 msgid "Parent notice not found."
 msgstr " API metoda nebyla nalezena."
 
 #. TRANS: Client error displayed exceeding the maximum notice length.
 #. TRANS: %d is the maximum lenth for a notice.
-#: actions/apistatusesupdate.php:308 actions/newnotice.php:184
 #, fuzzy, php-format
 msgid "Maximum notice size is %d character, including attachment URL."
 msgid_plural "Maximum notice size is %d characters, including attachment URL."
@@ -1172,13 +902,11 @@ msgstr[2] "Maximální délka notice je %d znaků včetně přiložené URL."
 
 #. TRANS: Client error displayed when requesting profiles of followers in an unsupported format.
 #. TRANS: Client error displayed when requesting IDs of followers in an unsupported format.
-#: actions/apisubscriptions.php:228 actions/apisubscriptions.php:258
 msgid "Unsupported format."
 msgstr "Nepodporovaný formát."
 
 #. TRANS: Title for timeline of most recent favourite notices by a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname.
-#: actions/apitimelinefavorites.php:108
 #, php-format
 msgid "%1$s / Favorites from %2$s"
 msgstr "%1$s / Oblíbené z %2$s"
@@ -1186,14 +914,12 @@ msgstr "%1$s / Oblíbené z %2$s"
 #. TRANS: Subtitle for timeline of most recent favourite notices by a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user's full name,
 #. TRANS: %3$s is a user nickname.
-#: actions/apitimelinefavorites.php:120
 #, fuzzy, php-format
 msgid "%1$s updates favorited by %2$s / %3$s."
 msgstr "Updaty na %1$s od %2$s / %2$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.
-#: actions/apitimelinementions.php:115
 #, php-format
 msgid "%1$s / Updates mentioning %2$s"
 msgstr "%1$s / Updaty zmiňující %2$s"
@@ -1201,49 +927,41 @@ msgstr "%1$s / Updaty zmiňující %2$s"
 #. TRANS: Subtitle for timeline of most recent mentions of a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname,
 #. TRANS: %3$s is a user's full name.
-#: actions/apitimelinementions.php:131
 #, php-format
 msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr "updaty na %1$s odpovídající na updaty od %2$s / %3$s."
 
 #. TRANS: Title for site timeline. %s is the StatusNet sitename.
 #. TRANS: Public RSS feed title. %s is the StatusNet site name.
-#: actions/apitimelinepublic.php:193 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "Veřejná časová osa %s"
 
 #. TRANS: Subtitle for site timeline. %s is the StatusNet sitename.
-#: actions/apitimelinepublic.php:199
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "Všechny updaty na %s!"
 
 #. TRANS: Server error displayed calling unimplemented API method for 'retweeted by me'.
-#: actions/apitimelineretweetedbyme.php:71
 #, fuzzy
 msgid "Unimplemented."
 msgstr "Neimplementovaná metoda."
 
 #. TRANS: Title for Atom feed "repeated to me". %s is the user nickname.
-#: actions/apitimelineretweetedtome.php:96
 #, php-format
 msgid "Repeated to %s"
 msgstr "Opakováno uživatelem %s"
 
-#: actions/apitimelineretweetedtome.php:98
 #, fuzzy, php-format
 msgid "%1$s notices that were to repeated to %2$s / %3$s."
 msgstr "updaty na %1$s odpovídající na updaty od %2$s / %3$s."
 
 #. TRANS: Title of list of repeated notices of the logged in user.
 #. TRANS: %s is the nickname of the logged in user.
-#: actions/apitimelineretweetsofme.php:98
 #, php-format
 msgid "Repeats of %s"
 msgstr "Opakování %s"
 
-#: actions/apitimelineretweetsofme.php:104
 #, fuzzy, php-format
 msgid "%1$s notices that %2$s / %3$s has repeated."
 msgstr "%s (@%s) přidal vaše oznámení jako oblíbené"
@@ -1252,79 +970,64 @@ msgstr "%s (@%s) přidal vaše oznámení jako oblíbené"
 #. TRANS: %s is the tag.
 #. TRANS: Title for first page of notices with tags.
 #. TRANS: %s is the tag.
-#: actions/apitimelinetag.php:101 actions/tag.php:69
 #, php-format
 msgid "Notices tagged with %s"
 msgstr "Noticy taglé %s"
 
 #. TRANS: Subtitle for timeline with lastest notices with a given tag.
 #. TRANS: %1$s is the tag, $2$s is the StatusNet sitename.
-#: actions/apitimelinetag.php:105 actions/tagrss.php:65
 #, php-format
 msgid "Updates tagged with %1$s on %2$s!"
 msgstr "Aktualizace označené %1$s na %2$s!"
 
 #. TRANS: Client error displayed trying to add a notice to another user's timeline.
-#: actions/apitimelineuser.php:308
 #, fuzzy
 msgid "Only the user can add to their own timeline."
 msgstr "Pouze uživatel může přečíst své vlastní schránky."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:315
 msgid "Only accept AtomPub for Atom feeds."
 msgstr ""
 
 #. TRANS: Client error displayed attempting to post an empty API notice.
-#: actions/apitimelineuser.php:322
 msgid "Atom post must not be empty."
 msgstr ""
 
 #. TRANS: Client error displayed attempting to post an API that is not well-formed XML.
-#: actions/apitimelineuser.php:328
 msgid "Atom post must be well-formed XML."
 msgstr ""
 
 #. TRANS: Client error displayed when not using an Atom entry.
-#: actions/apitimelineuser.php:334 actions/atompubfavoritefeed.php:228
-#: actions/atompubmembershipfeed.php:230
-#: actions/atompubsubscriptionfeed.php:236
 msgid "Atom post must be an Atom entry."
 msgstr ""
 
 #. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
-#: actions/apitimelineuser.php:345
 msgid "Can only handle POST activities."
 msgstr ""
 
 #. TRANS: Client error displayed when using an unsupported activity object type.
 #. TRANS: %s is the unsupported activity object type.
-#: actions/apitimelineuser.php:356
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
 #. TRANS: %d is the notice ID (number).
-#: actions/apitimelineuser.php:390
 #, fuzzy, php-format
 msgid "No content for notice %d."
 msgstr "Najít v obsahu oznámení"
 
 #. TRANS: Client error displayed when using another format than AtomPub.
 #. TRANS: %s is the notice URI.
-#: actions/apitimelineuser.php:419
 #, fuzzy, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "Oznámení s tímto id neexistuje."
 
 #. TRANS: Server error for unfinished API method showTrends.
-#: actions/apitrends.php:85
 msgid "API method under construction."
 msgstr "API metoda ve výstavbě."
 
 #. TRANS: Client error displayed when requesting user information for a non-existing user.
-#: actions/apiuserprofileimage.php:80 actions/apiusershow.php:94
 #, fuzzy
 msgid "User not found."
 msgstr " API metoda nebyla nalezena."
@@ -1332,102 +1035,84 @@ msgstr " API metoda nebyla nalezena."
 #. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
 #. TRANS: Client exception.
 #. TRANS: Client error displayed trying to subscribe to a non-existing profile.
-#: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
-#: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
-#: actions/subscribe.php:110
 msgid "No such profile."
 msgstr "Žádný takový profil."
 
 #. TRANS: Subtitle for Atom favorites feed.
 #. TRANS: %1$s is a user nickname, %2$s is the StatusNet sitename.
-#: actions/atompubfavoritefeed.php:147
 #, fuzzy, php-format
 msgid "Notices %1$s has favorited on %2$s"
 msgstr "Novinky od uživatele %1$s a přátel na %2$s!"
 
 #. TRANS: Client exception thrown when trying to set a favorite for another user.
 #. TRANS: Client exception thrown when trying to subscribe another user.
-#: actions/atompubfavoritefeed.php:217 actions/atompubsubscriptionfeed.php:225
 #, fuzzy
 msgid "Cannot add someone else's subscription."
 msgstr "Nelze vložit odebírání"
 
 #. TRANS: Client exception thrown when trying use an incorrect activity verb for the Atom pub method.
-#: actions/atompubfavoritefeed.php:240
 #, fuzzy
 msgid "Can only handle favorite activities."
 msgstr "Najít v obsahu oznámení"
 
 #. TRANS: Client exception thrown when trying favorite an object that is not a notice.
-#: actions/atompubfavoritefeed.php:250 actions/atompubmembershipfeed.php:250
 #, fuzzy
 msgid "Can only fave notices."
 msgstr "Najít v obsahu oznámení"
 
 #. TRANS: Client exception thrown when trying favorite a notice without content.
-#: actions/atompubfavoritefeed.php:259
 #, fuzzy
 msgid "Unknown note."
 msgstr "Neznámé"
 
 #. TRANS: Client exception thrown when trying favorite an already favorited notice.
-#: actions/atompubfavoritefeed.php:267
 #, fuzzy
 msgid "Already a favorite."
 msgstr "Přidat do oblíbených"
 
 #. TRANS: Title for group membership feed.
 #. TRANS: %s is a username.
-#: actions/atompubmembershipfeed.php:144
 #, fuzzy, php-format
 msgid "%s group memberships"
 msgstr "členové skupiny %s"
 
 #. TRANS: Subtitle for group membership feed.
 #. TRANS: %1$s is a username, %2$s is the StatusNet sitename.
-#: actions/atompubmembershipfeed.php:149
 #, fuzzy, php-format
 msgid "Groups %1$s is a member of on %2$s"
 msgstr "Skupiny kterých je %s členem"
 
 #. TRANS: Client exception thrown when trying subscribe someone else to a group.
-#: actions/atompubmembershipfeed.php:219
 #, fuzzy
 msgid "Cannot add someone else's membership."
 msgstr "Nelze vložit odebírání"
 
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#: actions/atompubmembershipfeed.php:242
 #, fuzzy
 msgid "Can only handle join activities."
 msgstr "Najít v obsahu oznámení"
 
 #. TRANS: Client exception thrown when trying to subscribe to a non-existing group.
-#: actions/atompubmembershipfeed.php:259
 #, fuzzy
 msgid "Unknown group."
 msgstr "Neznámé"
 
 #. TRANS: Client exception thrown when trying to subscribe to an already subscribed group.
-#: actions/atompubmembershipfeed.php:267
 #, fuzzy
 msgid "Already a member."
 msgstr "Všichni členové"
 
 #. TRANS: Client exception thrown when trying to subscribe to group while blocked from that group.
-#: actions/atompubmembershipfeed.php:275
 msgid "Blocked by admin."
 msgstr ""
 
 #. TRANS: Client exception thrown when referencing a non-existing favorite.
-#: actions/atompubshowfavorite.php:90
 #, fuzzy
 msgid "No such favorite."
 msgstr "Žádný takový soubor."
 
 #. TRANS: Client exception thrown when trying to remove a favorite notice of another user.
-#: actions/atompubshowfavorite.php:151
 #, fuzzy
 msgid "Cannot delete someone else's favorite."
 msgstr "Nelze smazat oblíbenou položku."
@@ -1454,93 +1139,68 @@ msgstr "Nelze smazat oblíbenou položku."
 #. TRANS: Client error displayed when trying to join a non-existing group.
 #. TRANS: Client error displayed when trying to leave a non-local group.
 #. TRANS: Client error displayed when trying to leave a non-existing group.
+#. TRANS: Client error displayed when providing an invalid group ID on the Make Admin page.
 #. 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.
 #. TRANS: Command exception text shown when a group is requested that does not exist.
 #. TRANS: Error text shown when trying to leave a group that does not exist.
-#: actions/atompubshowmembership.php:81 actions/blockedfromgroup.php:81
-#: actions/blockedfromgroup.php:89 actions/deletegroup.php:87
-#: actions/deletegroup.php:100 actions/editgroup.php:102
-#: actions/foafgroup.php:46 actions/foafgroup.php:65 actions/foafgroup.php:73
-#: actions/groupblock.php:89 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:101 actions/grouplogo.php:103
-#: actions/groupmembers.php:84 actions/groupmembers.php:92
-#: actions/grouprss.php:97 actions/grouprss.php:105
-#: actions/groupunblock.php:89 actions/joingroup.php:82
-#: actions/joingroup.php:95 actions/leavegroup.php:82
-#: actions/leavegroup.php:95 actions/makeadmin.php:86
-#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:392
 msgid "No such group."
 msgstr "Žádný takový uživatel."
 
 #. TRANS: Client exception thrown when trying to show membership of a non-subscribed group
-#: actions/atompubshowmembership.php:91
 #, fuzzy
 msgid "Not a member."
 msgstr "Všichni členové"
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
-#: actions/atompubshowmembership.php:150
 #, fuzzy
 msgid "Cannot delete someone else's membership."
 msgstr "Nelze smazat odebírání sebe sama"
 
 #. TRANS: Client exception thrown when trying to display a subscription for a non-existing profile ID.
 #. TRANS: %d is the non-existing profile ID number.
-#: actions/atompubshowsubscription.php:72
-#: actions/atompubshowsubscription.php:83
-#: actions/atompubsubscriptionfeed.php:74
 #, fuzzy, php-format
 msgid "No such profile id: %d."
 msgstr "Žádný takový profil."
 
 #. 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.
-#: actions/atompubshowsubscription.php:94
 #, fuzzy, php-format
 msgid "Profile %1$d not subscribed to profile %2$d."
 msgstr "Nejste přihlášen k tomuto profilu."
 
 #. TRANS: Client exception thrown when trying to delete a subscription of another user.
-#: actions/atompubshowsubscription.php:157
 #, fuzzy
 msgid "Cannot delete someone else's subscription."
 msgstr "Nelze smazat odebírání sebe sama"
 
 #. TRANS: Subtitle for Atom subscription feed.
 #. TRANS: %1$s is a user nickname, %s$s is the StatusNet sitename.
-#: actions/atompubsubscriptionfeed.php:153
 #, fuzzy, php-format
 msgid "People %1$s has subscribed to on %2$s"
 msgstr "Lidé přihlášení k %s"
 
 #. TRANS: Client error displayed when not using the follow verb.
-#: actions/atompubsubscriptionfeed.php:248
 msgid "Can only handle Follow activities."
 msgstr ""
 
 #. TRANS: Client exception thrown when subscribing to an object that is not a person.
-#: actions/atompubsubscriptionfeed.php:256
 msgid "Can only follow people."
 msgstr ""
 
 #. TRANS: Client exception thrown when subscribing to a non-existing profile.
 #. TRANS: %s is the unknown profile ID.
-#: actions/atompubsubscriptionfeed.php:267
 #, fuzzy, php-format
 msgid "Unknown profile %s."
 msgstr "Neznámý typ souboru"
 
 #. TRANS: Client error displayed trying to subscribe to an already subscribed profile.
 #. TRANS: %s is the profile the user already has a subscription on.
-#: actions/atompubsubscriptionfeed.php:275
 #, fuzzy, php-format
 msgid "Already subscribed to %s."
 msgstr "Již přihlášen!"
 
 #. TRANS: Client error displayed trying to get a non-existing attachment.
-#: actions/attachment.php:73
 msgid "No such attachment."
 msgstr "Žádná taková příloha."
 
@@ -1552,31 +1212,23 @@ msgstr "Žádná taková příloha."
 #. TRANS: Client error displayed when trying to view group members without providing a group nickname.
 #. TRANS: Client error displayed when requesting a group RSS feed without providing a group nickname.
 #. TRANS: Client error displayed if no nickname argument was given requesting a group page.
-#: actions/avatarbynickname.php:60 actions/blockedfromgroup.php:73
-#: actions/editgroup.php:85 actions/groupdesignsettings.php:84
-#: actions/grouplogo.php:86 actions/groupmembers.php:76
-#: actions/grouprss.php:89 actions/showgroup.php:116
 msgid "No nickname."
 msgstr "Žádná přezdívka."
 
 #. TRANS: Client error displayed trying to get an avatar without providing an avatar size.
-#: actions/avatarbynickname.php:66
 msgid "No size."
 msgstr "Žádná velikost"
 
 #. TRANS: Client error displayed trying to get an avatar providing an invalid avatar size.
-#: actions/avatarbynickname.php:72
 msgid "Invalid size."
 msgstr "Neplatná velikost"
 
 #. TRANS: Title for avatar upload page.
-#: actions/avatarsettings.php:66 lib/settingsnav.php:82
 msgid "Avatar"
 msgstr "Avatar"
 
 #. TRANS: Instruction for avatar upload page.
 #. TRANS: %s is the maximum file size, for example "500b", "10kB" or "2MB".
-#: actions/avatarsettings.php:78
 #, php-format
 msgid "You can upload your personal avatar. The maximum file size is %s."
 msgstr "Můžete nahrát váš osobní avatar. Maximální velikost souboru je %s."
@@ -1585,17 +1237,12 @@ msgstr "Můžete nahrát váš osobní avatar. Maximální velikost souboru je %
 #. TRANS: Server error displayed coming across a request from a user without a profile.
 #. TRANS: Server error displayed when trying to authorise a remote subscription request
 #. TRANS: while the user has no profile.
-#: actions/avatarsettings.php:108 actions/avatarsettings.php:192
-#: actions/grouplogo.php:184 actions/remotesubscribe.php:190
-#: actions/userauthorization.php:75 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr "Uživatel bez odpovídajícího profilu."
 
 #. TRANS: Avatar upload page form legend.
 #. TRANS: Avatar upload page crop form legend.
 #. TRANS: Legend for group logo settings fieldset.
-#: actions/avatarsettings.php:122 actions/avatarsettings.php:205
-#: actions/grouplogo.php:261
 msgid "Avatar settings"
 msgstr "Nastavené Profilu"
 
@@ -1603,8 +1250,6 @@ msgstr "Nastavené Profilu"
 #. TRANS: Header on avatar upload crop form for thumbnail of originally uploaded avatar (h2).
 #. TRANS: Uploaded original file in group logo form.
 #. TRANS: Header for originally uploaded file before a crop on the group logo page.
-#: actions/avatarsettings.php:131 actions/avatarsettings.php:214
-#: actions/grouplogo.php:207 actions/grouplogo.php:270
 msgid "Original"
 msgstr "Originál"
 
@@ -1612,14 +1257,11 @@ msgstr "Originál"
 #. TRANS: Header on avatar upload crop form for thumbnail of to be used rendition of uploaded avatar (h2).
 #. TRANS: Header for preview of to be displayed group logo.
 #. TRANS: Header for the cropped group logo on the group logo page.
-#: actions/avatarsettings.php:147 actions/avatarsettings.php:227
-#: actions/grouplogo.php:219 actions/grouplogo.php:283
 msgid "Preview"
 msgstr "Náhled"
 
 #. TRANS: Button on avatar upload page to delete current avatar.
 #. TRANS: Button text for user account deletion.
-#: actions/avatarsettings.php:155 actions/deleteaccount.php:319
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Delete"
@@ -1627,70 +1269,58 @@ msgstr "Odstranit"
 
 #. TRANS: Button on avatar upload page to upload an avatar.
 #. TRANS: Submit button to confirm upload of a user backup file for account restore.
-#: actions/avatarsettings.php:173 actions/restoreaccount.php:369
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Upload"
 msgstr "Upload"
 
 #. TRANS: Button on avatar upload crop form to confirm a selected crop as avatar.
-#: actions/avatarsettings.php:243
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Crop"
 msgstr "Oříznout"
 
 #. TRANS: Validation error on avatar upload form when no file was uploaded.
-#: actions/avatarsettings.php:318
 msgid "No file uploaded."
 msgstr "žádný soubor nebyl nahrán."
 
 #. TRANS: Avatar upload form instruction after uploading a file.
-#: actions/avatarsettings.php:345
 #, fuzzy
 msgid "Pick a square area of the image to be your avatar."
 msgstr "Vyberte čtvercovou plochu obrázku, která bude váš avatar"
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
 #. TRANS: Server error displayed trying to crop an uploaded group logo that is no longer present.
-#: actions/avatarsettings.php:360 actions/grouplogo.php:391
 msgid "Lost our file data."
 msgstr "Ztratili jsme údaje souboru."
 
 #. TRANS: Success message for having updated a user avatar.
-#: actions/avatarsettings.php:384
 msgid "Avatar updated."
 msgstr "Obrázek nahrán"
 
 #. TRANS: Error displayed on the avatar upload page if the avatar could not be updated for an unknown reason.
-#: actions/avatarsettings.php:388
 msgid "Failed updating avatar."
 msgstr "Nahrávání obrázku selhalo."
 
 #. TRANS: Success message for deleting a user avatar.
-#: actions/avatarsettings.php:412
 msgid "Avatar deleted."
 msgstr "Avatar smazán."
 
 #. TRANS: Title for backup account page.
 #. TRANS: Option in profile settings to create a backup of the account of the currently logged in user.
-#: actions/backupaccount.php:61 actions/profilesettings.php:468
 msgid "Backup account"
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to backup an account while not logged in.
-#: actions/backupaccount.php:79
 #, fuzzy
 msgid "Only logged-in users can backup their account."
 msgstr "Pouze přihlášení uživatelé mohou opakovat oznámení."
 
 #. TRANS: Client exception thrown when trying to backup an account without having backup rights.
-#: actions/backupaccount.php:84
 msgid "You may not backup your account."
 msgstr ""
 
 #. TRANS: Information displayed on the backup account page.
-#: actions/backupaccount.php:227
 msgid ""
 "You can backup your account data in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format. This is an experimental feature and provides "
@@ -1700,31 +1330,26 @@ msgid ""
 msgstr ""
 
 #. TRANS: Submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:250
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Backup"
 msgstr "Pozadí"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:254
 msgid "Backup your account."
 msgstr ""
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
-#: actions/block.php:68
 msgid "You already blocked that user."
 msgstr "Jabber ID již patří jinému uživateli"
 
 #. TRANS: Title for block user page.
 #. TRANS: Legend for block user form.
 #. TRANS: Fieldset legend for block user from group form.
-#: actions/block.php:106 actions/block.php:136 actions/groupblock.php:165
 msgid "Block user"
 msgstr "Zablokovat tohoto uživatele"
 
 #. TRANS: Explanation of consequences when blocking a user on the block user page.
-#: actions/block.php:139
 msgid ""
 "Are you sure you want to block this user? Afterwards, they will be "
 "unsubscribed from you, unable to subscribe to you in the future, and you "
@@ -1740,15 +1365,11 @@ msgstr ""
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:154 actions/deleteapplication.php:157
-#: actions/deletegroup.php:220 actions/deletenotice.php:155
-#: actions/deleteuser.php:154 actions/groupblock.php:187
 msgctxt "BUTTON"
 msgid "No"
 msgstr "Poznámka"
 
 #. TRANS: Submit button title for 'No' when blocking a user.
-#: actions/block.php:158
 #, fuzzy
 msgid "Do not block this user."
 msgstr "Zablokovat tohoto uživatele"
@@ -1759,50 +1380,40 @@ msgstr "Zablokovat tohoto uživatele"
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:161 actions/deleteapplication.php:164
-#: actions/deletegroup.php:227 actions/deletenotice.php:162
-#: actions/deleteuser.php:161 actions/groupblock.php:194
 msgctxt "BUTTON"
 msgid "Yes"
 msgstr "Ano"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:165
 #, fuzzy
 msgid "Block this user."
 msgstr "Zablokovat tohoto uživatele"
 
 #. TRANS: Server error displayed when blocking a user fails.
-#: actions/block.php:189
 msgid "Failed to save block information."
 msgstr "Nepodařilo se uložit blokování."
 
 #. TRANS: Title for first page with list of users blocked from a group.
 #. TRANS: %s is a group nickname.
-#: actions/blockedfromgroup.php:101
 #, php-format
 msgid "%s blocked profiles"
 msgstr "profily blokovány skupinou %s"
 
 #. TRANS: Title for any but the first page with list of users blocked from a group.
 #. TRANS: %1$s is a group nickname, %2$d is a page number.
-#: actions/blockedfromgroup.php:106
 #, php-format
 msgid "%1$s blocked profiles, page %2$d"
 msgstr "blokované profily %1$s, strana  %2$d"
 
 #. TRANS: Instructions for list of users blocked from a group.
-#: actions/blockedfromgroup.php:122
 msgid "A list of the users blocked from joining this group."
 msgstr "Seznam uživatelů blokovaných od připojení k této skupině."
 
 #. TRANS: Form legend for unblocking a user from a group.
-#: actions/blockedfromgroup.php:291
 msgid "Unblock user from group"
 msgstr "Odblokovat uživatele ze skupiny"
 
 #. TRANS: Button text for unblocking a user from a group.
-#: actions/blockedfromgroup.php:323
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Unblock"
@@ -1810,130 +1421,104 @@ msgstr "Odblokovat"
 
 #. TRANS: Tooltip for button for unblocking a user from a group.
 #. TRANS: Description of the form to unblock a user.
-#: actions/blockedfromgroup.php:327 lib/unblockform.php:78
 msgid "Unblock this user"
 msgstr "Odblokovat tohoto uživatele"
 
 #. TRANS: Title for mini-posting window loaded from bookmarklet.
 #. TRANS: %s is the StatusNet site name.
-#: actions/bookmarklet.php:51
 #, php-format
 msgid "Post to %s"
 msgstr "Poslat na %s"
 
 #. TRANS: Client error displayed when not providing a confirmation code in the contact address confirmation action.
-#: actions/confirmaddress.php:74
 msgid "No confirmation code."
 msgstr "Žádný potvrzující kód."
 
 #. TRANS: Client error displayed when providing a non-existing confirmation code in the contact address confirmation action.
-#: actions/confirmaddress.php:80
 msgid "Confirmation code not found."
 msgstr "Potvrzující kód nebyl nalezen"
 
 #. TRANS: Client error displayed when not providing a confirmation code for another user in the contact address confirmation action.
-#: actions/confirmaddress.php:86
 msgid "That confirmation code is not for you!"
 msgstr "Tento potvrzující kód vám nepatří!"
 
 #. TRANS: Server error for an unknown address type, which can be 'email', 'sms', or the name of an IM network (such as 'xmpp' or 'aim')
-#: actions/confirmaddress.php:94
-#, fuzzy, php-format
+#, php-format
 msgid "Unrecognized address type %s"
 msgstr "Neznámý typ adresy %s."
 
 #. TRANS: Client error for an already confirmed email/jabber/sms address.
-#: actions/confirmaddress.php:103 actions/confirmaddress.php:136
 msgid "That address has already been confirmed."
 msgstr "Adresa již byla potvrzena"
 
-#: actions/confirmaddress.php:121 actions/imsettings.php:444
-#: actions/userdesignsettings.php:306
-#, fuzzy
 msgid "Couldn't update user."
 msgstr "Nepodařilo se aktualizovat nastavení uživatele"
 
-#: actions/confirmaddress.php:144
 #, fuzzy
 msgid "Couldn't update user im preferences."
 msgstr "Nelze aktualizovat záznam uživatele."
 
-#: actions/confirmaddress.php:156
 #, fuzzy
 msgid "Couldn't insert user im preferences."
 msgstr "Nelze vložit odebírání"
 
 #. TRANS: Server error displayed when an address confirmation code deletion from the
 #. TRANS: database fails in the contact address confirmation action.
-#: actions/confirmaddress.php:169
 #, fuzzy
 msgid "Could not delete address confirmation."
 msgstr "Nelze smazat potvrzení IM"
 
 #. TRANS: Title for the contact address confirmation action.
-#: actions/confirmaddress.php:185
 msgid "Confirm address"
 msgstr "Heslo znovu"
 
 #. TRANS: Success message for the contact address confirmation action.
 #. TRANS: %s can be 'email', 'jabber', or 'sms'.
-#: actions/confirmaddress.php:200
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "Adresa \"%s\" byla potvrzena pro váš účet"
 
 #. TRANS: Title for page with a conversion (multiple notices in context).
-#: actions/conversation.php:96
 msgid "Conversation"
 msgstr "Konverzace"
 
 #. TRANS: Header on conversation page. Hidden by default (h2).
 #. TRANS: Label for user statistics.
-#: actions/conversation.php:149 lib/noticelist.php:87
-#: lib/profileaction.php:246 lib/searchgroupnav.php:82
-#: lib/threadednoticelist.php:66
 msgid "Notices"
 msgstr "Sdělení"
 
 #. TRANS: Client exception displayed trying to delete a user account while not logged in.
-#: actions/deleteaccount.php:71
 #, fuzzy
 msgid "Only logged-in users can delete their account."
 msgstr "Pouze přihlášení uživatelé mohou opakovat oznámení."
 
 #. TRANS: Client exception displayed trying to delete a user account without have the rights to do that.
-#: actions/deleteaccount.php:77
 #, fuzzy
 msgid "You cannot delete your account."
 msgstr "Nemůžete odstranit uživatele."
 
 #. TRANS: Confirmation text for user deletion. The user has to type this exactly the same, including punctuation.
-#: actions/deleteaccount.php:160 actions/deleteaccount.php:297
 msgid "I am sure."
 msgstr ""
 
 #. TRANS: Notification for user about the text that must be input to be able to delete a user account.
 #. TRANS: %s is the text that needs to be input.
-#: actions/deleteaccount.php:164
 #, php-format
 msgid "You must write \"%s\" exactly in the box."
 msgstr ""
 
 #. TRANS: Confirmation that a user account has been deleted.
-#: actions/deleteaccount.php:206
 #, fuzzy
 msgid "Account deleted."
 msgstr "Avatar smazán."
 
 #. TRANS: Page title for page on which a user account can be deleted.
 #. TRANS: Option in profile settings to delete the account of the currently logged in user.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:476
 #, fuzzy
 msgid "Delete account"
 msgstr "Zaregistrujte se"
 
 #. TRANS: Form text for user deletion form.
-#: actions/deleteaccount.php:279
 msgid ""
 "This will <strong>permanently delete</strong> your account data from this "
 "server."
@@ -1941,7 +1526,6 @@ msgstr ""
 
 #. TRANS: Additional form text for user deletion form shown if a user has account backup rights.
 #. TRANS: %s is a URL to the backup page.
-#: actions/deleteaccount.php:285
 #, php-format
 msgid ""
 "You are strongly advised to <a href=\"%s\">back up your data</a> before "
@@ -1950,56 +1534,43 @@ msgstr ""
 
 #. TRANS: Field label for delete account confirmation entry.
 #. TRANS: Field label for password reset form where the password has to be typed again.
-#: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:262 actions/register.php:419
 msgid "Confirm"
 msgstr "Potvrdit"
 
 #. TRANS: Input title for the delete account field.
 #. TRANS: %s is the text that needs to be input.
-#: actions/deleteaccount.php:304
 #, fuzzy, php-format
 msgid "Enter \"%s\" to confirm that you want to delete your account."
 msgstr "Nemůžete odstranit uživatele."
 
 #. TRANS: Button title for user account deletion.
-#: actions/deleteaccount.php:323
 #, fuzzy
 msgid "Permanently delete your account"
 msgstr "Nemůžete odstranit uživatele."
 
 #. TRANS: Client error displayed trying to delete an application while not logged in.
-#: actions/deleteapplication.php:62
 msgid "You must be logged in to delete an application."
 msgstr "Pro vymazání aplikace musíte být přihlášen."
 
 #. TRANS: Client error displayed trying to delete an application that does not exist.
-#: actions/deleteapplication.php:71
 msgid "Application not found."
 msgstr "Aplikace nebyla nalezena."
 
 #. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
-#: actions/deleteapplication.php:79 actions/editapplication.php:78
-#: actions/showapplication.php:90
 msgid "You are not the owner of this application."
 msgstr "Nejste vlastníkem této aplikace."
 
 #. TRANS: Client error text when there is a problem with the session token.
-#: actions/deleteapplication.php:102 actions/editapplication.php:131
-#: actions/newapplication.php:112 actions/showapplication.php:113
-#: lib/action.php:1391
 msgid "There was a problem with your session token."
 msgstr "Nastal problém s vaším session tokenem."
 
 #. TRANS: Title for delete application page.
 #. TRANS: Fieldset legend on delete application page.
-#: actions/deleteapplication.php:124 actions/deleteapplication.php:149
 msgid "Delete application"
 msgstr "Odstranit aplikaci"
 
 #. TRANS: Confirmation text on delete application page.
-#: actions/deleteapplication.php:152
 msgid ""
 "Are you sure you want to delete this application? This will clear all data "
 "about the application from the database, including all existing user "
@@ -2009,19 +1580,16 @@ msgstr ""
 "aplikace z databáze, včetně všech existujících uživatelských spojení."
 
 #. TRANS: Submit button title for 'No' when deleting an application.
-#: actions/deleteapplication.php:161
 #, fuzzy
 msgid "Do not delete this application."
 msgstr "Neodstraňujte tuto aplikaci"
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
-#: actions/deleteapplication.php:167
 #, fuzzy
 msgid "Delete this application."
 msgstr "Odstranit tuto aplikaci"
 
 #. TRANS: Client error when trying to delete group while not logged in.
-#: actions/deletegroup.php:64
 #, fuzzy
 msgid "You must be logged in to delete a group."
 msgstr "Musíte být přihlášen abyste mohl opustit skupinu."
@@ -2029,40 +1597,33 @@ msgstr "Musíte být přihlášen abyste mohl opustit skupinu."
 #. TRANS: Client error when trying to delete a group without providing a nickname or ID for the group.
 #. TRANS: Client error displayed when trying to join a group without providing a group name or group ID.
 #. TRANS: Client error displayed when trying to leave a group without providing a group name or group ID.
-#: actions/deletegroup.php:94 actions/joingroup.php:89
-#: actions/leavegroup.php:89
 msgid "No nickname or ID."
 msgstr "Žádná přezdívka nebo ID."
 
 #. TRANS: Client error when trying to delete a group without having the rights to delete it.
-#: actions/deletegroup.php:107
 #, fuzzy
 msgid "You are not allowed to delete this group."
 msgstr "Nejste členem této skupiny."
 
 #. TRANS: Server error displayed if a group could not be deleted.
 #. TRANS: %s is the name of the group that could not be deleted.
-#: actions/deletegroup.php:150
 #, fuzzy, php-format
 msgid "Could not delete group %s."
 msgstr "Nelze aktualizovat skupinu."
 
 #. TRANS: Message given after deleting a group.
 #. TRANS: %s is the deleted group's name.
-#: actions/deletegroup.php:159
 #, fuzzy, php-format
 msgid "Deleted group %s"
 msgstr "%1$s opustil(a) skupinu %2$s"
 
 #. TRANS: Title of delete group page.
 #. TRANS: Form legend for deleting a group.
-#: actions/deletegroup.php:176 actions/deletegroup.php:202
 #, fuzzy
 msgid "Delete group"
 msgstr "Smazat uživatele"
 
 #. TRANS: Warning in form for deleleting a group.
-#: actions/deletegroup.php:206
 #, fuzzy
 msgid ""
 "Are you sure you want to delete this group? This will clear all data about "
@@ -2073,13 +1634,11 @@ msgstr ""
 "o uživateli z databáze, bez zálohy."
 
 #. TRANS: Submit button title for 'No' when deleting a group.
-#: actions/deletegroup.php:224
 #, fuzzy
 msgid "Do not delete this group."
 msgstr "Neodstraňujte toto oznámení"
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
-#: actions/deletegroup.php:231
 #, fuzzy
 msgid "Delete this group."
 msgstr "Odstranit tohoto uživatele"
@@ -2090,22 +1649,18 @@ msgstr "Odstranit tohoto uživatele"
 #. TRANS: Client error displayed trying to block a user from a group while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying to log out when not logged in.
+#. TRANS: Client error displayed when trying to access the "make admin" page while not logged in.
+#. TRANS: Client error displayed trying to create a new direct message while not logged in.
+#. TRANS: Client error displayed trying to send a notice while not logged in.
+#. TRANS: Client error displayed trying to nudge a user without being logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
 #. TRANS: Client error displayed when trying to change user options while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
-#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:70
-#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
-#: actions/nudge.php:63 actions/pluginenable.php:97 actions/subedit.php:33
-#: actions/subscribe.php:98 actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:71 lib/profileformaction.php:63
-#: lib/settingsaction.php:72
 msgid "Not logged in."
 msgstr "Nejste přihlášen(a)."
 
 #. TRANS: Instructions for deleting a notice.
-#: actions/deletenotice.php:110
 msgid ""
 "You are about to permanently delete a notice. Once this is done, it cannot "
 "be undone."
@@ -2115,51 +1670,42 @@ msgstr ""
 
 #. TRANS: Page title when deleting a notice.
 #. TRANS: Fieldset legend for the delete notice form.
-#: actions/deletenotice.php:117 actions/deletenotice.php:148
 msgid "Delete notice"
 msgstr "Odstranit oznámení"
 
 #. TRANS: Message for the delete notice form.
-#: actions/deletenotice.php:152
 msgid "Are you sure you want to delete this notice?"
 msgstr "Jste si jisti, že chcete smazat tohoto oznámení?"
 
 #. TRANS: Submit button title for 'No' when deleting a notice.
-#: actions/deletenotice.php:159
 #, fuzzy
 msgid "Do not delete this notice."
 msgstr "Neodstraňujte toto oznámení"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:166
 #, fuzzy
 msgid "Delete this notice."
 msgstr "Odstranit toto oznámení"
 
 #. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
-#: actions/deleteuser.php:66
 msgid "You cannot delete users."
 msgstr "Nemůžete odstranit uživatele."
 
 #. TRANS: Client error displayed when trying to delete a non-local user.
-#: actions/deleteuser.php:74
 msgid "You can only delete local users."
 msgstr "Můžete smazat pouze místní uživatele."
 
 #. TRANS: Title of delete user page.
-#: actions/deleteuser.php:110
 #, fuzzy
 msgctxt "TITLE"
 msgid "Delete user"
 msgstr "Smazat uživatele"
 
 #. TRANS: Fieldset legend on delete user page.
-#: actions/deleteuser.php:134
 msgid "Delete user"
 msgstr "Smazat uživatele"
 
 #. TRANS: Information text to request if a user is certain that the described action has to be performed.
-#: actions/deleteuser.php:138
 msgid ""
 "Are you sure you want to delete this user? This will clear all data about "
 "the user from the database, without a backup."
@@ -2168,101 +1714,82 @@ msgstr ""
 "o uživateli z databáze, bez zálohy."
 
 #. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/deleteuser.php:158
 #, fuzzy
 msgid "Do not delete this user."
 msgstr "Neodstraňujte toto oznámení"
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
-#: actions/deleteuser.php:165
 #, fuzzy
 msgid "Delete this user."
 msgstr "Odstranit tohoto uživatele"
 
 #. TRANS: Message used as title for design settings for the site.
-#: actions/designadminpanel.php:60 lib/settingsnav.php:97
 msgid "Design"
 msgstr "Vzhled"
 
 #. TRANS: Instructions for design adminsitration panel.
-#: actions/designadminpanel.php:71
 msgid "Design settings for this StatusNet site"
 msgstr ""
 
 #. TRANS: Client error displayed when a logo URL does is not valid.
-#: actions/designadminpanel.php:327
 msgid "Invalid logo URL."
 msgstr "Neplatná URL loga."
 
 #. TRANS: Client error displayed when an SSL logo URL is invalid.
-#: actions/designadminpanel.php:333
 #, fuzzy
 msgid "Invalid SSL logo URL."
 msgstr "Neplatná URL loga."
 
 #. TRANS: Client error displayed when a theme is submitted through the form that is not in the theme list.
 #. TRANS: %s is the chosen unavailable theme.
-#: actions/designadminpanel.php:339
 #, php-format
 msgid "Theme not available: %s."
 msgstr "Téma není k dispozici: %s."
 
 #. TRANS: Fieldset legend for form to change logo.
-#: actions/designadminpanel.php:437
 msgid "Change logo"
 msgstr "Změňte logo"
 
 #. TRANS: Field label for StatusNet site logo.
-#: actions/designadminpanel.php:444
 msgid "Site logo"
 msgstr "Logo stránek"
 
 #. TRANS: Field label for SSL StatusNet site logo.
-#: actions/designadminpanel.php:452
 #, fuzzy
 msgid "SSL logo"
 msgstr "Logo stránek"
 
 #. TRANS: Fieldset legend for form change StatusNet site's theme.
-#: actions/designadminpanel.php:467
 msgid "Change theme"
 msgstr "Změnit téma"
 
 #. TRANS: Field label for dropdown to choose site theme.
-#: actions/designadminpanel.php:485
 msgid "Site theme"
 msgstr "Téma stránek"
 
 #. TRANS: Title for field label for dropdown to choose site theme.
-#: actions/designadminpanel.php:487
 msgid "Theme for the site."
 msgstr "Téma stránek"
 
 #. TRANS: Field label for uploading a cutom theme.
-#: actions/designadminpanel.php:494
 msgid "Custom theme"
 msgstr "Vlastní téma"
 
 #. TRANS: Form instructions for uploading a cutom StatusNet theme.
-#: actions/designadminpanel.php:499
 msgid "You can upload a custom StatusNet theme as a .ZIP archive."
 msgstr "Můžete nahrát vlastní StatusNet téma jako .ZIP archiv."
 
 #. TRANS: Fieldset legend for theme background image.
-#: actions/designadminpanel.php:515
 msgid "Change background image"
 msgstr "Změnit obrázek na pozadí"
 
 #. TRANS: Field label for background image on theme designer page.
 #. TRANS: Field label for background color selector.
 #. TRANS: Label on profile design page for setting a profile page background colour.
-#: actions/designadminpanel.php:525 actions/designadminpanel.php:609
-#: lib/designform.php:238
 msgid "Background"
 msgstr "Pozadí"
 
 #. TRANS: Form guide for background image upload form on theme designer page.
-#: actions/designadminpanel.php:531
 #, php-format
 msgid ""
 "You can upload a background image for the site. The maximum file size is %1"
@@ -2271,204 +1798,169 @@ msgstr ""
 "Můžete nahrát obrázek na pozadí stránek. Maximální velikost souboru je %1$s."
 
 #. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:558
 msgid "On"
 msgstr "zap."
 
 #. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:575
 msgid "Off"
 msgstr "vyp."
 
 #. TRANS: Form guide for turning background image on or off on theme designer page.
 #. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
 #. TRANS: use of the uploaded profile image.
-#: actions/designadminpanel.php:577 lib/designform.php:214
 msgid "Turn background image on or off."
 msgstr "Zapněte nebů vypněte obrázek na pozadí."
 
 #. TRANS: Checkbox label to title background image on theme designer page.
 #. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-#: actions/designadminpanel.php:583 lib/designform.php:220
 msgid "Tile background image"
 msgstr "Dlaždicovat obrázek na pozadí"
 
 #. TRANS: Fieldset legend for theme colors.
-#: actions/designadminpanel.php:598
 #, fuzzy
 msgid "Change colors"
 msgstr "Změnit barvy"
 
 #. TRANS: Field label for content color selector.
 #. TRANS: Label on profile design page for setting a profile page content colour.
-#: actions/designadminpanel.php:623 lib/designform.php:252
 msgid "Content"
 msgstr "Obsah"
 
 #. TRANS: Field label for sidebar color selector.
 #. TRANS: Label on profile design page for setting a profile page sidebar colour.
-#: actions/designadminpanel.php:637 lib/designform.php:266
 msgid "Sidebar"
 msgstr "Boční panel"
 
 #. TRANS: Field label for text color selector.
 #. TRANS: Label on profile design page for setting a profile page text colour.
-#: actions/designadminpanel.php:651 lib/designform.php:280
 msgid "Text"
 msgstr "Text"
 
 #. TRANS: Field label for link color selector.
 #. TRANS: Label on profile design page for setting a profile page links colour.
-#: actions/designadminpanel.php:665 lib/designform.php:294
 msgid "Links"
 msgstr "Odkazy"
 
 #. TRANS: Fieldset legend for advanced theme design settings.
-#: actions/designadminpanel.php:691
 msgid "Advanced"
 msgstr "Rozšířené"
 
 #. TRANS: Field label for custom CSS.
-#: actions/designadminpanel.php:696
 msgid "Custom CSS"
 msgstr "Vlastní CSS"
 
 #. TRANS: Button text for resetting theme settings.
-#: actions/designadminpanel.php:718
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Use defaults"
 msgstr "Použít výchozí"
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:720
 #, fuzzy
 msgid "Restore default designs."
 msgstr "Obnovit výchozí vzhledy"
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:728
 #, fuzzy
 msgid "Reset back to default."
 msgstr "Reset zpět do výchozího"
 
 #. TRANS: Title for button for saving theme settings.
-#: actions/designadminpanel.php:736
 #, fuzzy
 msgid "Save design."
 msgstr "Uložit vzhled"
 
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
-#: actions/disfavor.php:83
 msgid "This notice is not a favorite!"
 msgstr "Toto oznámení není oblíbeno!"
 
 #. TRANS: Title for page on which favorites can be added.
-#: actions/disfavor.php:98
 msgid "Add to favorites"
 msgstr "Přidat do oblíbených"
 
 #. TRANS: Client exception thrown when requesting a document from the documentation that does not exist.
 #. TRANS: %s is the non-existing document.
-#: actions/doc.php:155
 #, fuzzy, php-format
 msgid "No such document \"%s\"."
 msgstr "Žádný dokument \"%s\" neexistuje"
 
 #. TRANS: Title for "Edit application" form.
 #. TRANS: Form legend.
-#: actions/editapplication.php:54 lib/applicationeditform.php:129
 msgid "Edit application"
 msgstr "Upravit aplikaci"
 
 #. TRANS: Client error displayed trying to edit an application while not logged in.
-#: actions/editapplication.php:66
 msgid "You must be logged in to edit an application."
 msgstr "Pro úpravy aplikace musíte být přihlášen."
 
 #. TRANS: Client error displayed trying to edit an application that does not exist.
-#: actions/editapplication.php:83 actions/showapplication.php:83
 msgid "No such application."
 msgstr "Aplikace neexistuje."
 
 #. TRANS: Instructions for "Edit application" form.
-#: actions/editapplication.php:167
 msgid "Use this form to edit your application."
 msgstr "Pomocí tohoto formuláře můžete upravovat svou aplikaci."
 
 #. TRANS: Validation error shown when not providing a name in the "Edit application" form.
 #. TRANS: Validation error shown when not providing a name in the "New application" form.
-#: actions/editapplication.php:184 actions/newapplication.php:164
 msgid "Name is required."
 msgstr "Název je povinný."
 
 #. 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.
-#: actions/editapplication.php:188 actions/newapplication.php:172
 #, fuzzy
 msgid "Name is too long (maximum 255 characters)."
 msgstr "Jméno je moc dlouhé (maximální délka je 255 znaků)."
 
 #. TRANS: Validation error shown when providing a name for an application that already exists in the "Edit application" form.
 #. TRANS: Validation error shown when providing a name for an application that already exists in the "New application" form.
-#: actions/editapplication.php:192 actions/newapplication.php:168
 msgid "Name already in use. Try another one."
 msgstr "Název již někdo používá. Zkuste jinou"
 
 #. TRANS: Validation error shown when not providing a description in the "Edit application" form.
 #. TRANS: Validation error shown when not providing a description in the "New application" form.
-#: actions/editapplication.php:196 actions/newapplication.php:176
 msgid "Description is required."
 msgstr "Popis je třeba."
 
 #. TRANS: Validation error shown when providing too long a source URL in the "Edit application" form.
-#: actions/editapplication.php:209
 msgid "Source URL is too long."
 msgstr "URL zdroje je příliš dlouhý."
 
 #. TRANS: Validation error shown when providing an invalid source URL in the "Edit application" form.
 #. TRANS: Validation error shown when providing an invalid source URL in the "New application" form.
-#: actions/editapplication.php:216 actions/newapplication.php:199
 msgid "Source URL is not valid."
 msgstr "URL zdroje není platný."
 
 #. 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.
-#: actions/editapplication.php:220 actions/newapplication.php:203
 msgid "Organization is required."
 msgstr "Organizace je nutná."
 
 #. TRANS: Validation error shown when providing too long an arganisation name in the "Edit application" form.
-#: actions/editapplication.php:224 actions/newapplication.php:207
 #, fuzzy
 msgid "Organization is too long (maximum 255 characters)."
 msgstr "Organizace je příliš dlouhá (max 255 znaků)."
 
 #. TRANS: Form validation error show when an organisation name has not been provided in the edit application form.
 #. TRANS: Form validation error show when an organisation name has not been provided in the new application form.
-#: actions/editapplication.php:228 actions/newapplication.php:211
 msgid "Organization homepage is required."
 msgstr "Homepage organizace je nutná."
 
 #. TRANS: Validation error shown when providing too long a callback URL in the "Edit application" form.
 #. TRANS: Validation error shown when providing too long a callback URL in the "New application" form.
-#: actions/editapplication.php:239 actions/newapplication.php:225
 msgid "Callback is too long."
 msgstr "Callback je příliš dlouhý."
 
 #. TRANS: Validation error shown when providing an invalid callback URL in the "Edit application" form.
 #. TRANS: Validation error shown when providing an invalid callback URL in the "New application" form.
-#: actions/editapplication.php:247 actions/newapplication.php:235
 msgid "Callback URL is not valid."
 msgstr "Callback URL není platný."
 
 #. TRANS: Server error occuring when an application could not be updated from the "Edit application" form.
-#: actions/editapplication.php:284
 msgid "Could not update application."
 msgstr "Nelze aktualizovat aplikaci."
 
 #. TRANS: Title for form to edit a group. %s is a group nickname.
-#: actions/editgroup.php:55
 #, php-format
 msgid "Edit %s group"
 msgstr "Upravit skupinu %s"
@@ -2476,40 +1968,40 @@ msgstr "Upravit skupinu %s"
 #. TRANS: Client error displayed trying to edit a group while not logged in.
 #. TRANS: Client error displayed when trying to create a group while not logged in.
 #. TRANS: Client error displayed trying to create a group while not logged in.
-#: actions/editgroup.php:68 actions/grouplogo.php:69 actions/newgroup.php:65
 msgid "You must be logged in to create a group."
 msgstr "K vytvoření skupiny musíte být přihlášen."
 
 #. TRANS: Form instructions for group edit form.
-#: actions/editgroup.php:161
 msgid "Use this form to edit the group."
 msgstr "Použijte tento formulář k úpravám skupiny."
 
+#. TRANS: Group edit form validation error.
+#. TRANS: Group create form validation error.
+#. TRANS: %s is the invalid alias.
+#, php-format
+msgid "Invalid alias: \"%s\""
+msgstr "Neplatný alias: \"%s\""
+
 #. TRANS: Group edit form success message.
-#: actions/editgroup.php:301
 msgid "Options saved."
 msgstr "Nastavení uloženo."
 
 #. TRANS: Title for e-mail settings.
-#: actions/emailsettings.php:60
 msgid "Email settings"
 msgstr "Nastavení e-mailu"
 
 #. TRANS: E-mail settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/emailsettings.php:74
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 msgstr "Spravovat posílání e-mailů z %%site.name%%."
 
 #. TRANS: Form legend for e-mail settings form.
 #. TRANS: Field label for e-mail address input in e-mail settings form.
-#: actions/emailsettings.php:104 actions/emailsettings.php:130
 msgid "Email address"
 msgstr "E-mailová adresa"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:110
 msgid "Current confirmed email address."
 msgstr "Aktuální potvrzená e-mailová adresa."
 
@@ -2518,15 +2010,11 @@ msgstr "Aktuální potvrzená e-mailová adresa."
 #. TRANS: Button label to remove a confirmed IM address.
 #. TRANS: Button label to remove a confirmed SMS address.
 #. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
-#: actions/emailsettings.php:113 actions/emailsettings.php:180
-#: actions/imsettings.php:119 actions/smssettings.php:119
-#: actions/smssettings.php:175
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Odstranit"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:120
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -2539,44 +2027,36 @@ msgstr ""
 #. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
 #. TRANS: Any other domain may be owned by a legitimate person or
 #. TRANS: organization.
-#: actions/emailsettings.php:137
 msgid "Email address, like \"UserName@example.org\""
 msgstr "E-mailová adresa, ve stylu \"UzivatelskeJmeno@example.org\""
 
 #. TRANS: Button label for adding an e-mail address in e-mail settings form.
 #. TRANS: Button label for adding an IM address in IM settings form.
 #. TRANS: Button label for adding a SMS phone number in SMS settings form.
-#: actions/emailsettings.php:141 actions/imsettings.php:147
-#: actions/smssettings.php:157
 msgctxt "BUTTON"
 msgid "Add"
 msgstr "Přidat"
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:149 actions/smssettings.php:166
 msgid "Incoming email"
 msgstr "Příchozí e-mail"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:155
 msgid "I want to post notices by email."
 msgstr "Chci posílat oznámení e-mailem."
 
 #. TRANS: Form instructions for incoming e-mail form in e-mail settings.
 #. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
-#: actions/emailsettings.php:177 actions/smssettings.php:173
 msgid "Send email to this address to post new notices."
 msgstr "Pošlete e-mail na tuto adresu pro poslání nového oznámení."
 
 #. TRANS: Instructions for incoming e-mail address input form, when an address has already been assigned.
 #. TRANS: Instructions for incoming SMS e-mail address input form.
-#: actions/emailsettings.php:186 actions/smssettings.php:181
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr "Vytvoření nové e-mailové adresy pro zasílání, ruší starou."
 
 #. TRANS: Instructions for incoming e-mail address input form.
-#: actions/emailsettings.php:190
 msgid ""
 "To send notices via email, we need to create a unique email address for you "
 "on this server:"
@@ -2584,89 +2064,71 @@ msgstr ""
 
 #. TRANS: Button label for adding an e-mail address to send notices from.
 #. TRANS: Button label for adding an SMS e-mail address to send notices from.
-#: actions/emailsettings.php:196 actions/smssettings.php:184
 msgctxt "BUTTON"
 msgid "New"
 msgstr "Nová"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:205
 msgid "Email preferences"
 msgstr "Nastavení e-mailu"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:213
 msgid "Send me notices of new subscriptions through email."
 msgstr "Pošlete mi oznámení o nových přihlášeních e-mailem."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:219
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr "Pošlete mi e-mail, když někdo přidá moje oznámení mezi oblíbené."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:226
 msgid "Send me email when someone sends me a private message."
 msgstr "Pošlete mi e-mail, když mi někdo pošle soukromou zprávu."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:232
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr "Pošlete mi e-mail, když mi někdo pošle \"@-odpověď\"."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:238
 msgid "Allow friends to nudge me and send me an email."
 msgstr "Povolit přátelům mě pošťouchnout a poslat mi email."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:244
 msgid "Publish a MicroID for my email address."
 msgstr "Publikovat MicroID pro mou e-mailovou adresu."
 
 #. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:362
 msgid "Email preferences saved."
 msgstr "Email nastavení uloženo."
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:381
 msgid "No email address."
 msgstr "Chybí e-mailová adresa."
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:389
 #, fuzzy
 msgid "Cannot normalize that email address."
 msgstr "Nepodařilo se normalizovat (kanonizovat) e-mailovou adresu."
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:394 actions/register.php:197
-#: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "Není platnou mailovou adresou."
 
 #. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:398
 msgid "That is already your email address."
 msgstr "To je již vaší e-mailovou adresou."
 
 #. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:402
 msgid "That email address already belongs to another user."
 msgstr "Tato e-mailová adresa již patří jinému uživateli."
 
 #. TRANS: Server error thrown on database error adding e-mail confirmation code.
 #. TRANS: Server error thrown on database error adding Instant Messaging confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:419 actions/imsettings.php:362
-#: actions/smssettings.php:364
 #, fuzzy
 msgid "Could not insert confirmation code."
 msgstr "Nelze vložit potvrzující kód."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:426
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
@@ -2678,104 +2140,84 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling Instant Messaging address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:446 actions/imsettings.php:391
-#: actions/smssettings.php:398
 msgid "No pending confirmation to cancel."
 msgstr "Žádné potvrzení ke zrušení."
 
 #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:451
 msgid "That is the wrong email address."
 msgstr "Toto je špatná e-mailová adresa."
 
 #. TRANS: Server error thrown on database error canceling e-mail address confirmation.
 #. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
-#: actions/emailsettings.php:460 actions/smssettings.php:412
 #, fuzzy
 msgid "Could not delete email confirmation."
 msgstr "Nelze smazat potvrzení emailu"
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:465
 msgid "Email confirmation cancelled."
 msgstr "Potvrzení e-mailu zrušeno."
 
 #. TRANS: Message given trying to remove an e-mail address that is not
 #. TRANS: registered for the active user.
-#: actions/emailsettings.php:484
 msgid "That is not your email address."
 msgstr "To není vaše e-mailová adresa."
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:505
 msgid "The email address was removed."
 msgstr "E-mailová adresa byla odstraněna."
 
 #. TRANS: Form validation error displayed when trying to remove an incoming e-mail address while no address has been set.
-#: actions/emailsettings.php:519 actions/smssettings.php:554
 msgid "No incoming email address."
 msgstr "Nemáte příchozí e-mailovou adresu."
 
 #. 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.
-#: actions/emailsettings.php:531 actions/emailsettings.php:555
-#: actions/smssettings.php:565 actions/smssettings.php:590
 #, fuzzy
 msgid "Could not update user record."
 msgstr "Nelze aktualizovat záznam uživatele."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
 #. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:535 actions/smssettings.php:569
 msgid "Incoming email address removed."
 msgstr "Příchozí e-mailová adresa odstraněna."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
 #. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:559 actions/smssettings.php:594
 msgid "New incoming email address added."
 msgstr "Přidána nová příchozí e-mailová adresa."
 
 #. TRANS: Client error displayed when trying to mark a notice as favorite that already is a favorite.
-#: actions/favor.php:80
 msgid "This notice is already a favorite!"
 msgstr "Tuto hlášku již máte v oblíbených."
 
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
-#: actions/favor.php:95
 #, fuzzy
 msgid "Disfavor favorite."
 msgstr "Znemilostnit oblíbenou"
 
 #. TRANS: Page title for first page of favorited notices.
 #. TRANS: Title for favourited notices section.
-#: actions/favorited.php:65 lib/popularnoticesection.php:62
-#: lib/publicgroupnav.php:93
 msgid "Popular notices"
 msgstr "Populární oznámení"
 
 #. TRANS: Page title for all but first page of favorited notices.
 #. TRANS: %d is the page number being displayed.
-#: actions/favorited.php:69
 #, php-format
 msgid "Popular notices, page %d"
 msgstr "Populární oznámení, strana %d"
 
 #. TRANS: Description on page displaying favorited notices.
-#: actions/favorited.php:81
 msgid "The most popular notices on the site right now."
 msgstr "Právě teď nejpopulárnější oznámení na stránkách."
 
 #. TRANS: Text displayed instead of a list when a site does not yet have any favourited notices.
-#: actions/favorited.php:149
 msgid "Favorite notices appear on this page but no one has favorited one yet."
 msgstr ""
 "Oblíbená oznámení se objeví na této stránce, ale nikdo zatím oblíbené ještě "
 "nemá."
 
 #. TRANS: Additional text displayed instead of a list when a site does not yet have any favourited notices for logged in users.
-#: actions/favorited.php:153
 msgid ""
 "Be the first to add a notice to your favorites by clicking the fave button "
 "next to any notice you like."
@@ -2785,7 +2227,6 @@ msgstr ""
 
 #. TRANS: Additional text displayed instead of a list when a site does not yet have any favourited notices for not logged in users.
 #. TRANS: %%action.register%% is a registration link. "[link text](link)" is Mark Down. Do not change the formatting.
-#: actions/favorited.php:158
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to add a "
@@ -2798,181 +2239,146 @@ msgstr ""
 #. TRANS: %s is a user's nickname.
 #. TRANS: Title for first page of favourite notices of a user.
 #. TRANS: %s is the user for whom the favourite notices are displayed.
-#: actions/favoritesrss.php:111 actions/showfavorites.php:76
-#: lib/personalgroupnav.php:110
 #, php-format
 msgid "%s's favorite notices"
 msgstr "oblíbená oznámení uživatele %s"
 
 #. TRANS: Desciption of RSS feed with favourite notices of a user.
 #. TRANS: %1$s is a user's nickname, %2$s is the name of the StatusNet site.
-#: actions/favoritesrss.php:117
 #, php-format
 msgid "Updates favored by %1$s on %2$s!"
 msgstr "Aktualizace oblíbené uživatelem %1$s na %2$s!"
 
 #. TRANS: Page title for first page of featured users.
 #. TRANS: Title for featured users section.
-#: actions/featured.php:69 lib/featureduserssection.php:87
-#: lib/publicgroupnav.php:89
 msgid "Featured users"
 msgstr "Nejlepší uživatelé"
 
 #. TRANS: Page title for all but first page of featured users.
 #. TRANS: %d is the page number being displayed.
-#: actions/featured.php:73
 #, php-format
 msgid "Featured users, page %d"
 msgstr "Nejlepší uživatelé, strana %d"
 
 #. TRANS: Description on page displaying featured users.
-#: actions/featured.php:102
 #, fuzzy, php-format
 msgid "A selection of some great users on %s."
 msgstr "Výběr některých skvělých uživatelů na %s"
 
 #. TRANS: Client error displayed when no notice ID was given trying do display a file.
-#: actions/file.php:36
 msgid "No notice ID."
 msgstr "Chybí ID oznámení."
 
 #. TRANS: Client error displayed when an invalid notice ID was given trying do display a file.
-#: actions/file.php:41
 msgid "No notice."
 msgstr "Žádné takové oznámení."
 
 #. TRANS: Client error displayed when trying do display a file for a notice without a file attachement.
-#: actions/file.php:46
 msgid "No attachments."
 msgstr "Bez příloh."
 
 #. TRANS: Client error displayed when trying do display a file for a notice with file attachements
 #. TRANS: that could not be found.
-#: actions/file.php:58
 msgid "No uploaded attachments."
 msgstr "Žádné nahrané přílohy."
 
 #. TRANS: Client error displayed when subscribing to a remote profile and an unexpected response is received.
-#: actions/finishremotesubscribe.php:69
 msgid "Not expecting this response!"
 msgstr "Nečekaná odpověď!"
 
 #. TRANS: Client error displayed when subscribing to a remote profile that does not exist.
-#: actions/finishremotesubscribe.php:81
 msgid "User being listened to does not exist."
 msgstr "Úživatel, kterému nasloucháte neexistuje."
 
 #. TRANS: Client error displayed when subscribing to a remote profile that is a local profile.
-#: actions/finishremotesubscribe.php:89 actions/remotesubscribe.php:58
 msgid "You can use the local subscription!"
 msgstr "Můžete použít místní odebírání."
 
 #. TRANS: Client error displayed when subscribing to a remote profile that is blocked form subscribing to.
-#: actions/finishremotesubscribe.php:102
 msgid "That user has blocked you from subscribing."
 msgstr "Uživatel vaše odebírání zablokoval."
 
 #. TRANS: Client error displayed when subscribing to a remote profile without providing an authorised token.
-#: actions/finishremotesubscribe.php:114
 msgid "You are not authorized."
 msgstr "Nejste autorizován."
 
 #. TRANS: Client error displayed when subscribing to a remote profile and conversion of the request token to access token fails.
-#: actions/finishremotesubscribe.php:118
 msgid "Could not convert request token to access token."
 msgstr "Nemohu převést žádost token na přístup token."
 
 #. TRANS: Client error displayed when subscribing to a remote profile fails because of an unsupported version of the OMB protocol.
-#: actions/finishremotesubscribe.php:124
 msgid "Remote service uses unknown version of OMB protocol."
 msgstr "Vzdálená služba používá neznámou verzi protokolu OMB."
 
 #. TRANS: Server error displayed when subscribing to a remote profile fails because the remote profile could not be updated.
-#: actions/finishremotesubscribe.php:145 lib/oauthstore.php:317
 msgid "Error updating remote profile."
 msgstr "Chyba při aktualizaci vzdáleného profilu."
 
 #. TRANS: Client error displayed when requesting a non-existent file.
-#: actions/getfile.php:77
 msgid "No such file."
 msgstr "Žádný takový soubor."
 
 #. TRANS: Client error displayed when requesting a file without having read access to it.
-#: actions/getfile.php:82
 msgid "Cannot read file."
 msgstr "Nelze přečíst soubor."
 
 #. TRANS: Client error displayed when trying to assign an invalid role to a user.
-#: actions/grantrole.php:61 actions/revokerole.php:62
 msgid "Invalid role."
 msgstr "Neplatná role."
 
 #. TRANS: Client error displayed when trying to assign an reserved role to a user.
-#: actions/grantrole.php:66 actions/revokerole.php:66
 msgid "This role is reserved and cannot be set."
 msgstr "Tato role je vyhrazena a nelze jí nastavit."
 
 #. TRANS: Client error displayed when trying to assign a role to a user while not being allowed to set roles.
-#: actions/grantrole.php:76
 msgid "You cannot grant user roles on this site."
 msgstr "Nemůžete dávat uživatelské role na této stránce."
 
 #. TRANS: Client error displayed when trying to assign a role to a user that already has that role.
-#: actions/grantrole.php:84
 msgid "User already has this role."
 msgstr "Uživatel již tuto roli má."
 
 #. TRANS: Client error displayed trying to block a user from a group while not specifying a to be blocked user profile.
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing a profile.
+#. TRANS: Client error displayed when not providing a profile ID on the Make Admin page.
 #. TRANS: Client error displayed trying a change a subscription without providing a profile.
 #. TRANS: Client error displayed when trying to change user options without specifying a user to work on.
-#: actions/groupblock.php:71 actions/groupunblock.php:71
-#: actions/makeadmin.php:71 actions/subedit.php:49
-#: lib/profileformaction.php:79
 msgid "No profile specified."
 msgstr "Nebyl vybrán profil."
 
 #. TRANS: Client error displayed trying to block a user from a group while specifying a non-existing profile.
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing an existing profile.
+#. TRANS: Client error displayed when specifying an invalid profile ID on the Make Admin page.
 #. TRANS: Client error displayed trying a change a subscription for a non-existant profile ID.
 #. TRANS: Client error displayed when trying to change user options without specifying an existing user to work on.
-#: actions/groupblock.php:77 actions/groupunblock.php:77
-#: actions/makeadmin.php:76 actions/subedit.php:57 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:87
 msgid "No profile with that ID."
 msgstr "Neexistuje profil s tímto ID."
 
 #. TRANS: Client error displayed trying to block a user from a group while not specifying a group to block a profile from.
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing a group.
-#: actions/groupblock.php:83 actions/groupunblock.php:83
-#: actions/makeadmin.php:81
+#. TRANS: Client error displayed when not providing a group ID on the Make Admin page.
 msgid "No group specified."
 msgstr "Nebyla vybrána skupina."
 
 #. TRANS: Client error displayed trying to block a user from a group while not being an admin user.
-#: actions/groupblock.php:95
 msgid "Only an admin can block group members."
 msgstr "Pouze admin může blokovat členy skupiny."
 
 #. TRANS: Client error displayed trying to block a user from a group while user is already blocked from the given group.
-#: actions/groupblock.php:100
 msgid "User is already blocked from group."
 msgstr "Uživatel již je zablokován ze skupiny."
 
 #. TRANS: Client error displayed trying to block a user from a group while user is not a member of given group.
-#: actions/groupblock.php:106
 msgid "User is not a member of group."
 msgstr "Uživatel není členem skupiny."
 
 #. TRANS: Title for block user from group page.
 #. TRANS: Form legend for form to block user from a group.
-#: actions/groupblock.php:141 actions/groupmembers.php:364
 msgid "Block user from group"
 msgstr "Zablokovat uživatele ze skupiny"
 
 #. TRANS: Explanatory text for block user from group form before setting the block.
 #. TRANS: %1$s is that to be blocked user, %2$s is the group the user will be blocked from.
-#: actions/groupblock.php:169
 #, php-format
 msgid ""
 "Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They "
@@ -2983,40 +2389,33 @@ msgstr ""
 "Bude odstraněn ze skupiny a nebude moci přispívat nebo se přihlásit k odběru."
 
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
-#: actions/groupblock.php:191
 #, fuzzy
 msgid "Do not block this user from this group."
 msgstr "Neblokujte tohoto uživatele z této skupiny"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
-#: actions/groupblock.php:198
 #, fuzzy
 msgid "Block this user from this group."
 msgstr "Blokovat tohoto uživatele z této skupiny"
 
 #. TRANS: Server error displayed when trying to block a user from a group fails because of an application error.
-#: actions/groupblock.php:215
 msgid "Database error blocking user from group."
 msgstr "Chyba databáze při blokování uživatele ze skupiny."
 
 #. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
 #. TRANS: Client error displayed trying to find a user by ID without providing an ID.
-#: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr "Chybí ID."
 
 #. TRANS: Client error displayed trying to change group design settings while not logged in.
-#: actions/groupdesignsettings.php:67
 msgid "You must be logged in to edit a group."
 msgstr "K úpravě skupiny musíte být přihlášen."
 
 #. TRANS: Title group design settings page.
-#: actions/groupdesignsettings.php:146
 msgid "Group design"
 msgstr "Vzhled skupiny"
 
 #. TRANS: Instructions for group design settings page.
-#: actions/groupdesignsettings.php:157
 msgid ""
 "Customize the way your group looks with a background image and a colour "
 "palette of your choice."
@@ -3025,25 +2424,21 @@ msgstr ""
 "výběru."
 
 #. TRANS: Form validation error displayed when group design settings could not be updated because of an application issue.
-#: actions/groupdesignsettings.php:262
 #, fuzzy
 msgid "Unable to update your design settings."
 msgstr "Nelze uložit vaše nastavení designu."
 
 #. TRANS: Form text to confirm saved group design settings.
-#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:239
 msgid "Design preferences saved."
 msgstr "Nastavení vzhledu uloženo."
 
 #. TRANS: Title for group logo settings page.
 #. TRANS: Group logo form legend.
-#: actions/grouplogo.php:144 actions/grouplogo.php:199
 msgid "Group logo"
 msgstr "Logo skupiny"
 
 #. TRANS: Instructions for group logo page.
 #. TRANS: %s is the maximum file size for that site.
-#: actions/grouplogo.php:156
 #, php-format
 msgid ""
 "You can upload a logo image for your group. The maximum file size is %s."
@@ -3052,91 +2447,75 @@ msgstr ""
 "s."
 
 #. TRANS: Submit button for uploading a group logo.
-#: actions/grouplogo.php:243
 msgid "Upload"
 msgstr "Upload"
 
 #. TRANS: Button text for cropping an uploaded group logo.
-#: actions/grouplogo.php:299
 msgid "Crop"
 msgstr "Oříznout"
 
 #. TRANS: Form instructions on the group logo page.
-#: actions/grouplogo.php:376
 msgid "Pick a square area of the image to be the logo."
 msgstr "Vyberte čtvercovou oblast obrázku, která bude vaše logo."
 
 #. TRANS: Form success message after updating a group logo.
-#: actions/grouplogo.php:411
 msgid "Logo updated."
 msgstr "Logo aktualizováno."
 
 #. TRANS: Form failure message after failing to update a group logo.
-#: actions/grouplogo.php:414
 msgid "Failed updating logo."
 msgstr "Nepodařilo se aktualizovat logo."
 
 #. TRANS: Title of the page showing group members.
 #. TRANS: %s is the name of the group.
-#: actions/groupmembers.php:104
 #, php-format
 msgid "%s group members"
 msgstr "členové skupiny %s"
 
 #. TRANS: Title of the page showing group members.
 #. TRANS: %1$s is the name of the group, %2$d is the page number of the members list.
-#: actions/groupmembers.php:109
 #, php-format
 msgid "%1$s group members, page %2$d"
 msgstr "členové skupiny %1$s, strana %2$d"
 
 #. TRANS: Page notice for group members page.
-#: actions/groupmembers.php:125
 msgid "A list of the users in this group."
 msgstr "Seznam uživatelů v této skupině."
 
 #. TRANS: Indicator in group members list that this user is a group administrator.
-#: actions/groupmembers.php:190 lib/action.php:581
 msgid "Admin"
 msgstr "Admin"
 
 #. TRANS: Button text for the form that will block a user from a group.
-#: actions/groupmembers.php:397
 msgctxt "BUTTON"
 msgid "Block"
 msgstr ""
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:401
 msgctxt "TOOLTIP"
 msgid "Block this user"
 msgstr ""
 
 #. TRANS: Form legend for form to make a user a group admin.
-#: actions/groupmembers.php:488
 msgid "Make user an admin of the group"
 msgstr "Uďelat uživatele adminem skupiny"
 
 #. TRANS: Button text for the form that will make a user administrator.
-#: actions/groupmembers.php:521
 msgctxt "BUTTON"
 msgid "Make Admin"
 msgstr ""
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:525
 msgctxt "TOOLTIP"
 msgid "Make this user an admin"
 msgstr ""
 
 #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
-#: actions/grouprss.php:141
 #, php-format
 msgid "Updates from members of %1$s on %2$s!"
 msgstr "Novinky od členů %1$s na %2$s!"
 
 #. TRANS: Title for first page of the groups list.
-#: actions/groups.php:62
 #, fuzzy
 msgctxt "TITLE"
 msgid "Groups"
@@ -3144,7 +2523,6 @@ msgstr "Skupiny"
 
 #. TRANS: Title for all but the first page of the groups list.
 #. TRANS: %d is the page number.
-#: actions/groups.php:66
 #, fuzzy, php-format
 msgctxt "TITLE"
 msgid "Groups, page %d"
@@ -3153,7 +2531,6 @@ msgstr "Skupiny, strana %d"
 #. TRANS: Page notice of group list. %%%%site.name%%%% is the StatusNet site name,
 #. TRANS: %%%%action.groupsearch%%%% and %%%%action.newgroup%%%% are URLs. Do not change them.
 #. TRANS: This message contains Markdown links in the form [link text](link).
-#: actions/groups.php:95
 #, fuzzy, php-format
 msgid ""
 "%%%%site.name%%%% groups let you find and talk with people of similar "
@@ -3169,12 +2546,10 @@ msgstr ""
 "newgroup%%%%)"
 
 #. TRANS: Link to create a new group on the group list page.
-#: actions/groups.php:113 actions/usergroups.php:126 lib/groupeditform.php:115
 msgid "Create a new group"
 msgstr "Vytvořit novou skupinu"
 
 #. TRANS: Instructions for page where groups can be searched. %%site.name%% is the name of the StatusNet site.
-#: actions/groupsearch.php:53
 #, php-format
 msgid ""
 "Search for groups on %%site.name%% by their name, location, or description. "
@@ -3184,21 +2559,17 @@ msgstr ""
 "Oddělte slova mezerami;  musí být nejméně 3 znaky dlouhá."
 
 #. TRANS: Title for page where groups can be searched.
-#: actions/groupsearch.php:60
 msgid "Group search"
 msgstr "Hledání skupin"
 
 #. TRANS: Text on page where groups can be searched if no results were found for a query.
 #. TRANS: Text for notice search results is the query had no results.
 #. TRANS: Message on the "People search" page where a query has no results.
-#: actions/groupsearch.php:82 actions/noticesearch.php:122
-#: actions/peoplesearch.php:87
 msgid "No results."
 msgstr "Žádné výsledky."
 
 #. TRANS: Additional text on page where groups can be searched if no results were found for a query for a logged in user.
 #. TRANS: This message contains Markdown links in the form [link text](link).
-#: actions/groupsearch.php:87
 #, fuzzy, php-format
 msgid ""
 "If you cannot find the group you're looking for, you can [create it](%%"
@@ -3209,7 +2580,6 @@ msgstr ""
 
 #. TRANS: Additional text on page where groups can be searched if no results were found for a query for a not logged in user.
 #. TRANS: This message contains Markdown links in the form [link text](link).
-#: actions/groupsearch.php:92
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and [create the group](%%"
@@ -3219,30 +2589,25 @@ msgstr ""
 "%action.newgroup%%) sami!"
 
 #. TRANS: Client error displayed when trying to unblock a user from a group without being an administrator for the group.
-#: actions/groupunblock.php:95
 msgid "Only an admin can unblock group members."
 msgstr "Pouze admin může odblokovat členy skupiny."
 
 #. TRANS: Client error displayed when trying to unblock a non-blocked user from a group.
-#: actions/groupunblock.php:100
 msgid "User is not blocked from group."
 msgstr "Uživatel není blokován ze skupiny."
 
 #. TRANS: Server error displayed when unblocking a user from a group fails because of an unknown error.
 #. TRANS: Server error displayed when removing a user block.
-#: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "Chyba při odstraňování bloku."
 
 #. TRANS: Title for Instant Messaging settings.
-#: actions/imsettings.php:56
 msgid "IM settings"
 msgstr "Nastavení 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.
-#: actions/imsettings.php:69
 #, fuzzy, php-format
 msgid ""
 "You can send and receive notices through instant messaging [instant messages]"
@@ -3252,18 +2617,15 @@ msgstr ""
 "%) .Zadejte svou adresu a nastavení níže."
 
 #. TRANS: Message given in the IM settings if IM is not enabled on the site.
-#: actions/imsettings.php:90
 msgid "IM is not available."
 msgstr "IM není k dispozici."
 
-#: actions/imsettings.php:116
 #, fuzzy, php-format
 msgid "Current confirmed %s address."
 msgstr "Aktuální potvrzená e-mailová adresa."
 
 #. TRANS: Form note in IM settings form.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:128
 #, fuzzy, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your %s account for a message "
@@ -3272,89 +2634,74 @@ msgstr ""
 "Čakám na potvrzení této adresy. Hledejte zprávu s dalšími instrukcemi na "
 "vašem Jabber/GTalk účtu. (Přidal jste si %s do vašich kontaktů?)"
 
-#: actions/imsettings.php:140
 msgid "IM address"
 msgstr "IM adresa"
 
-#: actions/imsettings.php:142
 #, php-format
 msgid "%s screenname."
 msgstr ""
 
 #. TRANS: Header for IM preferences form.
-#: actions/imsettings.php:163
 #, fuzzy
 msgid "IM Preferences"
 msgstr "Nastavení IM"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:174
 #, fuzzy
 msgid "Send me notices"
 msgstr "Poslat oznámení"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:176
 #, fuzzy
 msgid "Post a notice when my status changes."
 msgstr "Poslat oznámení, když se změní můj Jabber/Gtalk status."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:178
 #, fuzzy
 msgid "Send me replies from people I'm not subscribed to."
 msgstr ""
 "Pošlete mi odpovědi přes Jabber / GTalk od lidí, ke kterým nejsem přihlášen."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:181
 #, fuzzy
 msgid "Publish a MicroID"
 msgstr "Publikovat MicroID pro mou e-mailovou adresu."
 
 #. TRANS: Server error thrown on database error updating IM preferences.
-#: actions/imsettings.php:291
 #, fuzzy
 msgid "Couldn't update IM preferences."
 msgstr "Nepodařilo se aktualizovat nastavení uživatele"
 
 #. TRANS: Confirmation message for successful IM preferences save.
 #. TRANS: Confirmation message after saving preferences.
-#: actions/imsettings.php:298 actions/urlsettings.php:244
 msgid "Preferences saved."
 msgstr "Nastavení uloženo"
 
 #. TRANS: Message given saving IM address without having provided one.
-#: actions/imsettings.php:320
 #, fuzzy
 msgid "No screenname."
 msgstr "Žádná přezdívka."
 
-#: actions/imsettings.php:325
 #, fuzzy
 msgid "No transport."
 msgstr "Žádné takové oznámení."
 
 #. TRANS: Message given saving IM address that cannot be normalised.
-#: actions/imsettings.php:333
 #, fuzzy
 msgid "Cannot normalize that screenname"
 msgstr "Nelze normalizovat tento JabberID"
 
 #. TRANS: Message given saving IM address that not valid.
-#: actions/imsettings.php:340
 #, fuzzy
 msgid "Not a valid screenname"
 msgstr "Není platnou přezdívkou."
 
 #. TRANS: Message given saving IM address that is already set for another user.
-#: actions/imsettings.php:344
 #, fuzzy
 msgid "Screenname already belongs to another user."
 msgstr "Jabber ID již patří jinému uživateli"
 
 #. TRANS: Message given saving valid IM address that is to be confirmed.
-#: actions/imsettings.php:369
 #, fuzzy
 msgid "A confirmation code was sent to the IM address you added."
 msgstr ""
@@ -3362,85 +2709,71 @@ msgstr ""
 "posílal zprávy."
 
 #. TRANS: Message given canceling IM address confirmation for the wrong IM address.
-#: actions/imsettings.php:396
 msgid "That is the wrong IM address."
 msgstr "Toto je špatná IM adresa"
 
 #. TRANS: Server error thrown on database error canceling IM address confirmation.
-#: actions/imsettings.php:405
 #, fuzzy
 msgid "Couldn't delete confirmation."
 msgstr "Nelze smazat potvrzení IM"
 
 #. TRANS: Message given after successfully canceling IM address confirmation.
-#: actions/imsettings.php:410
 msgid "IM confirmation cancelled."
 msgstr "IM potvrzení zrušeno."
 
 #. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.
-#: actions/imsettings.php:434
 #, fuzzy
 msgid "That is not your screenname."
 msgstr "To není vaše telefonní číslo."
 
 #. TRANS: Server error thrown on database error removing a registered IM address.
-#: actions/imsettings.php:443
 #, fuzzy
 msgid "Couldn't update user im prefs."
 msgstr "Nelze aktualizovat záznam uživatele."
 
 #. TRANS: Message given after successfully removing a registered Instant Messaging address.
-#: actions/imsettings.php:451
 msgid "The IM address was removed."
 msgstr "IM adresa byla odstraněna."
 
 #. TRANS: Title for all but the first page of the inbox page.
 #. TRANS: %1$s is the user's nickname, %2$s is the page number.
-#: actions/inbox.php:59
 #, php-format
 msgid "Inbox for %1$s - page %2$d"
 msgstr "Pošta doručená pro %1$s - strana %2$d"
 
 #. TRANS: Title for the first page of the inbox page.
 #. TRANS: %s is the user's nickname.
-#: actions/inbox.php:64
 #, php-format
 msgid "Inbox for %s"
 msgstr "Doručená pošta pro %s"
 
 #. TRANS: Instructions for user inbox page.
-#: actions/inbox.php:106
 msgid "This is your inbox, which lists your incoming private messages."
 msgstr "To je váš inbox, obsahuje seznam příchozích soukromých zpráv."
 
 #. TRANS: Client error displayed when trying to sent invites while they have been disabled.
-#: actions/invite.php:41
 msgid "Invites have been disabled."
 msgstr "Pozvánky byly zakázány."
 
 #. TRANS: Client error displayed when trying to sent invites while not logged in.
 #. TRANS: %s is the StatusNet site name.
-#: actions/invite.php:45
 #, php-format
 msgid "You must be logged in to invite other users to use %s."
 msgstr "Musíte být přihlášen aby jste mohl zvát další uživatele k použití %s."
 
 #. TRANS: Form validation message when providing an e-mail address that does not validate.
 #. TRANS: %s is an invalid e-mail address.
-#: actions/invite.php:78
 #, fuzzy, php-format
 msgid "Invalid email address: %s."
 msgstr "Neplatný e-mail: %s"
 
 #. TRANS: Page title when invitations have been sent.
-#: actions/invite.php:117
 #, fuzzy
 msgid "Invitations sent"
 msgstr "Pozvánka(y) zaslána(y)"
 
 #. TRANS: Page title when inviting potential users.
-#: actions/invite.php:120
 msgid "Invite new users"
 msgstr "Pozvat nové uživatele"
 
@@ -3448,7 +2781,6 @@ msgstr "Pozvat nové uživatele"
 #. TRANS: is already subscribed to one or more users with the given e-mail address(es).
 #. TRANS: Plural form is based on the number of reported already subscribed e-mail addresses.
 #. TRANS: Followed by a bullet list.
-#: actions/invite.php:140
 #, fuzzy
 msgid "You are already subscribed to this user:"
 msgid_plural "You are already subscribed to these users:"
@@ -3458,7 +2790,6 @@ msgstr[2] "Jste již přihlášeni k těmto uživatelům:"
 
 #. TRANS: Used as list item for already subscribed users (%1$s is nickname, %2$s is e-mail address).
 #. TRANS: Used as list item for already registered people (%1$s is nickname, %2$s is e-mail address).
-#: actions/invite.php:146 actions/invite.php:160
 #, fuzzy, php-format
 msgctxt "INVITE"
 msgid "%1$s (%2$s)"
@@ -3467,7 +2798,6 @@ msgstr "%1$s (%2$s)"
 #. TRANS: Message displayed inviting users to use a StatusNet site while the invited user
 #. TRANS: already uses a this StatusNet site. Plural form is based on the number of
 #. TRANS: reported already present people. Followed by a bullet list.
-#: actions/invite.php:154
 #, fuzzy
 msgid "This person is already a user and you were automatically subscribed:"
 msgid_plural ""
@@ -3479,7 +2809,6 @@ msgstr[2] "Tito lidé jsou již uživatelé a jste k nim automaticky přihláše
 #. TRANS: Message displayed inviting users to use a StatusNet site. Plural form is
 #. TRANS: based on the number of invitations sent. Followed by a bullet list of
 #. TRANS: e-mail addresses to which invitations were sent.
-#: actions/invite.php:168
 #, fuzzy
 msgid "Invitation sent to the following person:"
 msgid_plural "Invitations sent to the following people:"
@@ -3489,7 +2818,6 @@ msgstr[2] "Pozvánka (y) zaslány následujícím osobám:"
 
 #. TRANS: Generic message displayed after sending out one or more invitations to
 #. TRANS: people to join a StatusNet site.
-#: actions/invite.php:178
 msgid ""
 "You will be notified when your invitees accept the invitation and register "
 "on the site. Thanks for growing the community!"
@@ -3498,7 +2826,6 @@ msgstr ""
 "na tomto webu. Díky za zvetšení komunity!"
 
 #. TRANS: Form instructions.
-#: actions/invite.php:191
 msgid ""
 "Use this form to invite your friends and colleagues to use this service."
 msgstr ""
@@ -3506,28 +2833,24 @@ msgstr ""
 "služby."
 
 #. TRANS: Field label for a list of e-mail addresses.
-#: actions/invite.php:218
 msgid "Email addresses"
 msgstr "E-mailové adresy"
 
 #. TRANS: Tooltip for field label for a list of e-mail addresses.
-#: actions/invite.php:221
 #, fuzzy
 msgid "Addresses of friends to invite (one per line)."
 msgstr "Adresy přátel k pozvání (jedna na řádek)"
 
 #. TRANS: Field label for a personal message to send to invitees.
-#: actions/invite.php:225
 msgid "Personal message"
 msgstr "Osobní zpráva"
 
 #. TRANS: Tooltip for field label for a personal message to send to invitees.
-#: actions/invite.php:228
 msgid "Optionally add a personal message to the invitation."
 msgstr "Volitelně přidat osobní zprávu."
 
 #. TRANS: Send button for inviting friends
-#: actions/invite.php:232
+#. TRANS: Button text for sending notice.
 msgctxt "BUTTON"
 msgid "Send"
 msgstr "Odeslat"
@@ -3535,7 +2858,6 @@ msgstr "Odeslat"
 #. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral
 #. TRANS: singular 3rd-person pronoun in English. %1$s is the inviting user, $2$s is
 #. TRANS: the StatusNet sitename.
-#: actions/invite.php:264
 #, php-format
 msgid "%1$s has invited you to join them on %2$s"
 msgstr "%1$s vás pozval, abyste se k nim připojil(a) na %2$s"
@@ -3545,7 +2867,6 @@ msgstr "%1$s vás pozval, abyste se k nim připojil(a) na %2$s"
 #. TRANS: StatusNet sitename, %3$s is the site URL, %4$s is the personal message from the
 #. TRANS: inviting user, %s%5 a link to the timeline for the inviting user, %s$6 is a link
 #. TRANS: to register with the StatusNet site.
-#: actions/invite.php:271
 #, php-format
 msgid ""
 "%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -3602,184 +2923,179 @@ msgstr ""
 "S pozdravem, %2$s \n"
 
 #. TRANS: Client error displayed when trying to join a group while not logged in.
-#: actions/joingroup.php:59
 msgid "You must be logged in to join a group."
 msgstr "Musíte být přihlášen pro vstup do skupiny."
 
 #. TRANS: Title for join group page after joining.
-#: actions/joingroup.php:148
 #, fuzzy, php-format
 msgctxt "TITLE"
 msgid "%1$s joined group %2$s"
 msgstr "%1$s se připojil(a) ke skupině %2$s"
 
 #. TRANS: Client error displayed when trying to leave a group while not logged in.
-#: actions/leavegroup.php:59
 msgid "You must be logged in to leave a group."
 msgstr "Musíte být přihlášen abyste mohl opustit skupinu."
 
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
-#: actions/leavegroup.php:103 lib/command.php:398
 msgid "You are not a member of that group."
 msgstr "Nejste členem této skupiny."
 
 #. TRANS: Title for leave group page after leaving.
-#: actions/leavegroup.php:142
 #, fuzzy, php-format
 msgctxt "TITLE"
 msgid "%1$s left group %2$s"
 msgstr "%1$s opustil(a) skupinu %2$s"
 
 #. TRANS: User admin panel title
-#: actions/licenseadminpanel.php:55
 msgctxt "TITLE"
 msgid "License"
 msgstr ""
 
-#: actions/licenseadminpanel.php:65
+#. TRANS: Form instructions for the site license admin panel.
 msgid "License for this StatusNet site"
 msgstr ""
 
-#: actions/licenseadminpanel.php:134
+#. TRANS: Client error displayed selecting an invalid license in the license admin panel.
 msgid "Invalid license selection."
 msgstr ""
 
-#: actions/licenseadminpanel.php:144
+#. TRANS: Client error displayed when not specifying an owner for the all rights reserved license in the license admin panel.
 msgid ""
 "You must specify the owner of the content when using the All Rights Reserved "
 "license."
 msgstr ""
 
-#: actions/licenseadminpanel.php:151
+#. TRANS: Client error displayed selecting a too long license title in the license admin panel.
 #, fuzzy
 msgid "Invalid license title. Maximum length is 255 characters."
 msgstr "Neplatné uvítací text. Max délka je 255 znaků."
 
-#: actions/licenseadminpanel.php:163
+#. TRANS: Client error displayed specifying an invalid license URL in the license admin panel.
 msgid "Invalid license URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:166
+#. TRANS: Client error displayed specifying an invalid license image URL in the license admin panel.
 msgid "Invalid license image URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:174
+#. TRANS: Client error displayed specifying an invalid license URL in the license admin panel.
 msgid "License URL must be blank or a valid URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:182
+#. TRANS: Client error displayed specifying an invalid license image URL in the license admin panel.
 msgid "License image must be blank or valid URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:232
+#. TRANS: Form legend in the license admin panel.
 msgid "License selection"
 msgstr ""
 
-#: actions/licenseadminpanel.php:238
+#. TRANS: License option in the license admin panel.
 #, fuzzy
 msgid "Private"
 msgstr "Soukromí"
 
-#: actions/licenseadminpanel.php:239
+#. TRANS: License option in the license admin panel.
 msgid "All Rights Reserved"
 msgstr ""
 
-#: actions/licenseadminpanel.php:240
+#. TRANS: License option in the license admin panel.
 msgid "Creative Commons"
 msgstr ""
 
-#: actions/licenseadminpanel.php:245
+#. TRANS: Dropdown field label in the license admin panel.
 msgid "Type"
 msgstr ""
 
-#: actions/licenseadminpanel.php:247
-msgid "Select license"
-msgstr ""
+#. TRANS: Dropdown field instructions in the license admin panel.
+#, fuzzy
+msgid "Select a license."
+msgstr "Vyberte operátora"
 
-#: actions/licenseadminpanel.php:261
+#. TRANS: Form legend in the license admin panel.
 msgid "License details"
 msgstr ""
 
-#: actions/licenseadminpanel.php:267
+#. TRANS: Field label in the license admin panel.
 msgid "Owner"
 msgstr ""
 
-#: actions/licenseadminpanel.php:268
+#. TRANS: Field title in the license admin panel.
 msgid "Name of the owner of the site's content (if applicable)."
 msgstr ""
 
-#: actions/licenseadminpanel.php:276
+#. TRANS: Field label in the license admin panel.
 msgid "License Title"
 msgstr ""
 
-#: actions/licenseadminpanel.php:277
+#. TRANS: Field title in the license admin panel.
 msgid "The title of the license."
 msgstr ""
 
-#: actions/licenseadminpanel.php:285
+#. TRANS: Field label in the license admin panel.
 msgid "License URL"
 msgstr ""
 
-#: actions/licenseadminpanel.php:286
+#. TRANS: Field title in the license admin panel.
 msgid "URL for more information about the license."
 msgstr ""
 
-#: actions/licenseadminpanel.php:293
+#. TRANS: Field label in the license admin panel.
 msgid "License Image URL"
 msgstr ""
 
-#: actions/licenseadminpanel.php:294
+#. TRANS: Field title in the license admin panel.
 msgid "URL for an image to display with the license."
 msgstr ""
 
-#. TRANS: Submit button title.
-#: actions/licenseadminpanel.php:311 actions/sessionsadminpanel.php:199
-#: actions/siteadminpanel.php:292 actions/snapshotadminpanel.php:245
-#: actions/tagother.php:133 lib/applicationeditform.php:357
-msgid "Save"
-msgstr "Uložit"
-
-#: actions/licenseadminpanel.php:311
-msgid "Save license settings"
-msgstr ""
+#. TRANS: Button title in the license admin panel.
+#, fuzzy
+msgid "Save license settings."
+msgstr "Uložit Nastavení webu"
 
+#. TRANS: Client error displayed when trying to log in while already logged in.
 #. TRANS: Client error displayed trying to use "one time password login" when already logged in.
-#: actions/login.php:97 actions/otp.php:62 actions/register.php:130
 msgid "Already logged in."
 msgstr "Již přihlášen"
 
-#: actions/login.php:125
+#. TRANS: Form validation error displayed when trying to log in with incorrect credentials.
 msgid "Incorrect username or password."
 msgstr "Neplatné jméno nebo heslo"
 
+#. TRANS: Server error displayed when during login a server error occurs.
 #. TRANS: Server error displayed when a user object could not be created trying to login using "one time password login".
-#: actions/login.php:131 actions/otp.php:127
 msgid "Error setting user. You are probably not authorized."
 msgstr "Chyba při nastavení uživatele. Pravděpodobně nejste autorizován."
 
-#: actions/login.php:185 actions/login.php:236 lib/action.php:598
+#. TRANS: Page title for login page.
 msgid "Login"
 msgstr "Přihlásit"
 
-#: actions/login.php:222
+#. TRANS: Form legend on login page.
 msgid "Login to site"
 msgstr "Přihlásit se na stránky"
 
-#: actions/login.php:231 actions/register.php:469
+#. TRANS: Checkbox label label on login page.
 msgid "Remember me"
 msgstr "Zapamatuj si mě"
 
-#: actions/login.php:232 actions/register.php:471
+#. TRANS: Checkbox title on login page.
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 "Příště automaticky přihlásit; ne pro počítače, které používá více lidí! "
 
-#: actions/login.php:241
+#. TRANS: Button text for log in on login page.
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Login"
+msgstr "Přihlásit"
+
+#. TRANS: Link text for link to "reset password" on login page.
 msgid "Lost or forgotten password?"
 msgstr "Ztracené nebo zapomenuté heslo?"
 
-#: actions/login.php:259
+#. TRANS: Form instructions on login page before being able to change user settings.
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -3787,141 +3103,136 @@ msgstr ""
 "Z bezpečnostních důvodů, prosím zadejte znovu své jméno a heslo než budete "
 "měnit svá nastavení."
 
-#: actions/login.php:263
+#. TRANS: Form instructions on login page.
 msgid "Login with your username and password."
 msgstr "Přihlásit se pomocí svého uživatelského jména a hesla."
 
-#: actions/login.php:266
+#. TRANS: Form instructions on login page. This message contains Markdown links in the form [Link text](Link).
+#. TRANS: %%action.register%% is a link to the registration page.
 #, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
 msgstr ""
 "Zatím nemáte uživatelské jméno? [Registrovat](%%action.register%%) nový účet."
 
-#: actions/makeadmin.php:92
+#. TRANS: Client error displayed when trying to make another user admin on the Make Admin page while not an admin.
 msgid "Only an admin can make another user an admin."
 msgstr "Pouze admin může udělat adminem dalšího uživatele."
 
-#: actions/makeadmin.php:96
+#. TRANS: Client error displayed when trying to make another user admin on the Make Admin page who already is admin.
+#. TRANS: %1$s is the user that is already admin, %2$s is the group user is already admin for.
 #, php-format
 msgid "%1$s is already an admin for group \"%2$s\"."
 msgstr "%1$s je již admin pro skupinu \"%2$S\"."
 
-#: actions/makeadmin.php:133
+#. TRANS: Server error displayed when trying to make another user admin on the Make Admin page fails
+#. TRANS: because the group membership record could not be gotten.
+#. TRANS: %1$s is the to be admin user, %2$s is the group user should be admin for.
 #, php-format
 msgid "Can't get membership record for %1$s in group %2$s."
 msgstr "Nelze získat záznam o členství %1$s ve skupině %2$s."
 
-#: actions/makeadmin.php:146
+#. TRANS: Server error displayed when trying to make another user admin on the Make Admin page fails
+#. TRANS: because the group adminship record coud not be saved properly.
+#. TRANS: %1$s is the to be admin user, %2$s is the group user is already admin for.
 #, php-format
 msgid "Can't make %1$s an admin for group %2$s."
 msgstr "Nelze učinit %1$s adminem skupiny %2$s."
 
-#: actions/microsummary.php:69
+#. TRANS: Client error displayed trying to make a micro summary without providing a status.
 msgid "No current status."
 msgstr "V současné době žádný stav."
 
 #. TRANS: This is the title of the form for adding a new application.
-#: actions/newapplication.php:52
 #, fuzzy
 msgid "New application"
 msgstr "Nová aplikace"
 
 #. TRANS: Client error displayed trying to add a new application while not logged in.
-#: actions/newapplication.php:64
 msgid "You must be logged in to register an application."
 msgstr "Musíte být přihlášen k registraci aplikace."
 
 #. TRANS: Form instructions for registering a new application.
-#: actions/newapplication.php:147
 msgid "Use this form to register a new application."
 msgstr "Použijte tento formulář pro registraci nové aplikace."
 
 #. TRANS: Validation error shown when not providing a source URL in the "New application" form.
-#: actions/newapplication.php:189
 msgid "Source URL is required."
 msgstr "Zdrojové URL je nutné."
 
 #. TRANS: Server error displayed when an application could not be registered in the database through the "New application" form.
-#: actions/newapplication.php:279 actions/newapplication.php:289
 msgid "Could not create application."
 msgstr "Nelze vytvořit aplikaci."
 
 #. TRANS: Title for form to create a group.
-#: actions/newgroup.php:53
 msgid "New group"
 msgstr "Nová skupina"
 
 #. TRANS: Client exception thrown when a user tries to create a group while banned.
-#: actions/newgroup.php:73 classes/User_group.php:485
 #, fuzzy
 msgid "You are not allowed to create groups on this site."
 msgstr "Nejste členem této skupiny."
 
 #. TRANS: Form instructions for group create form.
-#: actions/newgroup.php:117
 msgid "Use this form to create a new group."
 msgstr "Použijte tento formulář k vytvoření nové skupiny."
 
-#. TRANS: Group create form validation error.
-#: actions/newgroup.php:200
-#, fuzzy
-msgid "Alias cannot be the same as nickname."
-msgstr "Alias nemůže být stejný jako přezdívka."
-
-#: actions/newmessage.php:71 actions/newmessage.php:234
+#. TRANS: Page title for new direct message page.
+#. TRANS: Page title on page for sending a direct message.
 msgid "New message"
 msgstr "Nová zpráva"
 
-#. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
-#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:513
-msgid "You can't send a message to this user."
+#. TRANS: Client error displayed trying to send a direct message to a user while sender and
+#. TRANS: receiver are not subscribed to each other.
+#, fuzzy
+msgid "You cannot send a message to this user."
 msgstr ""
 "Nemůžete odesílat zprávy tomuto uživateli. (musíte být vzájemně prihlášení)"
 
+#. TRANS: Form validator error displayed trying to send a direct message without content.
+#. TRANS: Client error displayed trying to send a notice without content.
 #. TRANS: Command exception text shown when trying to send a direct message to another user without content.
 #. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
-#: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:490
-#: lib/command.php:593
 msgid "No content!"
 msgstr "Chybí obsah!"
 
-#: actions/newmessage.php:161
+#. TRANS: Form validation error displayed trying to send a direct message without specifying a recipient.
 msgid "No recipient specified."
 msgstr "Neuveden příjemce."
 
+#. TRANS: Client error displayed trying to send a direct message to self.
 #. TRANS: Error text shown when trying to send a direct message to self.
-#: actions/newmessage.php:167 lib/command.php:517
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr "Neposílejte si zprávu, potichu si ji pro sebe řekněte."
 
-#: actions/newmessage.php:184
+#. TRANS: Page title after sending a direct message.
 msgid "Message sent"
 msgstr "Zpráva odeslána"
 
+#. TRANS: Confirmation text after sending a direct message.
+#. TRANS: %s is the direct message recipient.
 #. TRANS: Message given have sent a direct message to another user.
 #. TRANS: %s is the name of the other user.
-#: actions/newmessage.php:188 lib/command.php:525
 #, php-format
 msgid "Direct message to %s sent."
 msgstr "Přímá zpráva pro %s odeslána."
 
-#: actions/newmessage.php:213 actions/newnotice.php:264
+#. TRANS: Page title after an AJAX error occurred on the "send direct message" page.
+#. TRANS: Page title after an AJAX error occurs on the send notice page.
 msgid "Ajax Error"
 msgstr "Ajax Chyba"
 
-#: actions/newnotice.php:69
+#. TRANS: Page title for sending a new notice.
 msgid "New notice"
 msgstr "Nové sdělení"
 
-#: actions/newnotice.php:230
+#. TRANS: Page title after sending a notice.
 msgid "Notice posted"
 msgstr "Sdělení posláno"
 
 #. TRANS: Instructions for Notice search page.
 #. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/noticesearch.php:69
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -3931,20 +3242,17 @@ msgstr ""
 "mít alespoň 3 znaky"
 
 #. TRANS: Title of the page where users can search for notices.
-#: actions/noticesearch.php:80
 msgid "Text search"
 msgstr "Text vyhledávání"
 
 #. TRANS: Test in RSS notice search.
 #. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearch.php:95
 #, php-format
 msgid "Search results for \"%1$s\" on %2$s"
 msgstr "Výsledky hledání \"%1$s\" na %2$s"
 
 #. TRANS: Text for logged in users making a query for notices without results.
 #. TRANS: This message contains a Markdown link.
-#: actions/noticesearch.php:128
 #, php-format
 msgid ""
 "Be the first to [post on this topic](%%%%action.newnotice%%%%?"
@@ -3955,7 +3263,6 @@ msgstr ""
 
 #. TRANS: Text for not logged in users making a query for notices without results.
 #. TRANS: This message contains Markdown links.
-#: actions/noticesearch.php:133
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and be the first to "
@@ -3965,19 +3272,17 @@ msgstr ""
 "[příspěje](%%%%action.newnotice %%%%?status_textarea =%s) na toto téma!"
 
 #. TRANS: RSS notice search feed title. %s is the query.
-#: actions/noticesearchrss.php:95
 #, php-format
 msgid "Updates with \"%s\""
 msgstr "Hlášky s \"%s\""
 
 #. TRANS: RSS notice search feed description.
 #. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearchrss.php:99
 #, fuzzy, php-format
 msgid "Updates matching search term \"%1$s\" on %2$s."
 msgstr "Aktualizace odpovídající hledanému výrazu \"%1$s\" na %2$s!"
 
-#: actions/nudge.php:85
+#. TRANS: Client error displayed trying to nudge a user that cannot be nudged.
 #, fuzzy
 msgid ""
 "This user doesn't allow nudges or hasn't confirmed or set their email "
@@ -3986,60 +3291,51 @@ msgstr ""
 "Tento uživatel neumožňuje pošťouchnutí nebo nepotvrdil(a) nebo nenestavil(a) "
 "svůj e-mail."
 
-#: actions/nudge.php:94
+#. TRANS: Page title after sending a nudge.
 msgid "Nudge sent"
 msgstr "Pošťouchnutí posláno"
 
-#: actions/nudge.php:97
+#. TRANS: Confirmation text after sending a nudge.
 msgid "Nudge sent!"
 msgstr "Pošťouchnutí posláno!"
 
 #. TRANS: Message displayed to an anonymous user trying to view OAuth application list.
-#: actions/oauthappssettings.php:57
 msgid "You must be logged in to list your applications."
 msgstr "Musíte být přihlášen k vypsání seznamu aplikací."
 
 #. TRANS: Page title for OAuth applications
-#: actions/oauthappssettings.php:73
 msgid "OAuth applications"
 msgstr "OAuth aplikace"
 
 #. TRANS: Page instructions for OAuth applications
-#: actions/oauthappssettings.php:85
 msgid "Applications you have registered"
 msgstr "Aplikace které jste zaregistrovali"
 
 #. TRANS: Empty list message on page with OAuth applications.
-#: actions/oauthappssettings.php:138
 #, php-format
 msgid "You have not registered any applications yet."
 msgstr "Ještě jste nezaregistrovali žádné aplikace."
 
 #. TRANS: Title for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:69
 msgid "Connected applications"
 msgstr "Propojené aplikace"
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:80
 msgid "The following connections exist for your account."
 msgstr ""
 
 #. TRANS: Client error when trying to revoke access for an application while not being a user of it.
-#: actions/oauthconnectionssettings.php:165
 msgid "You are not a user of that application."
 msgstr "Nejste uživatel této aplikace."
 
 #. TRANS: Client error when revoking access has failed for some reason.
 #. TRANS: %s is the application ID revoking access failed for.
-#: actions/oauthconnectionssettings.php:180
 #, fuzzy, php-format
 msgid "Unable to revoke access for application: %s."
 msgstr "Nelze zrušit přístup aplikace %s."
 
 #. TRANS: Success message after revoking access for an application.
 #. TRANS: %1$s is the application name, %2$s is the first part of the user token.
-#: actions/oauthconnectionssettings.php:199
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -4047,475 +3343,392 @@ msgid ""
 msgstr ""
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:210
 msgid "You have not authorized any applications to use your account."
 msgstr "Žádným aplikacím jste nepovolili používat váš účet."
 
 #. TRANS: Note for developers in the OAuth connection settings form.
 #. TRANS: This message contains a Markdown link. Do not separate "](".
 #. TRANS: %s is the URL to the OAuth settings.
-#: actions/oauthconnectionssettings.php:230
 #, php-format
 msgid ""
 "Are you a developer? [Register an OAuth client application](%s) to use with "
 "this instance of StatusNet."
 msgstr ""
 
-#: actions/oembed.php:64
+#. TRANS: Server error displayed in oEmbed action when path not found.
+#. TRANS: %s is a path.
 #, fuzzy, php-format
 msgid "\"%s\" not found."
 msgstr " API metoda nebyla nalezena."
 
-#: actions/oembed.php:76
+#. TRANS: Server error displayed in oEmbed action when notice not found.
+#. TRANS: %s is a notice.
 #, fuzzy, php-format
 msgid "Notice %s not found."
 msgstr " API metoda nebyla nalezena."
 
-#: actions/oembed.php:80 actions/shownotice.php:100
+#. TRANS: Server error displayed in oEmbed action when notice has not profile.
 msgid "Notice has no profile."
 msgstr "Uživatel nemá profil."
 
-#: actions/oembed.php:83 actions/shownotice.php:172
+#. TRANS: oEmbed title. %1$s is the author name, %2$s is the creation date.
 #, php-format
 msgid "%1$s's status on %2$s"
 msgstr "status %1 na %2"
 
-#: actions/oembed.php:95
+#. TRANS: Server error displayed in oEmbed action when attachment not found.
+#. TRANS: %d is an attachment ID.
 #, fuzzy, php-format
 msgid "Attachment %s not found."
 msgstr "Příjemce nebyl nalezen."
 
-#: actions/oembed.php:136
+#. TRANS: Server error displayed in oEmbed request when a path is not supported.
+#. TRANS: %s is a path.
 #, php-format
 msgid "\"%s\" not supported for oembed requests."
 msgstr ""
 
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
-#: actions/oembed.php:168
 #, php-format
 msgid "Content type %s not supported."
 msgstr "Typ obsahu %s není podporován."
 
 #. TRANS: Error message displaying attachments. %s is the site's base URL.
-#: actions/oembed.php:172
 #, php-format
 msgid "Only %s URLs over plain HTTP please."
 msgstr "Only %s URLs over plain HTTP please."
 
+#. TRANS: Server error displayed in oEmbed action when request specifies an unsupported data format.
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1207
-#: lib/apiaction.php:1234 lib/apiaction.php:1369
 msgid "Not a supported data format."
 msgstr "Nepodporovaný formát dat."
 
 #. TRANS: ShortName in the OpenSearch interface when trying to find users.
-#: actions/opensearch.php:64
 msgid "People Search"
 msgstr "Hledání lidí"
 
-#: actions/opensearch.php:68
+#. TRANS: ShortName in the OpenSearch interface when trying to find notices.
 msgid "Notice Search"
 msgstr "Hledání oznámení"
 
 #. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
-#: actions/otp.php:70
 msgid "No user ID specified."
 msgstr "Nebylo zadáno uživatelské ID."
 
 #. TRANS: Client error displayed trying to use "one time password login" without specifying a login token.
-#: actions/otp.php:86
 msgid "No login token specified."
 msgstr "Přihlašovací token nezadán."
 
 #. TRANS: Client error displayed trying to use "one time password login" without requesting a login token.
-#: actions/otp.php:94
 msgid "No login token requested."
 msgstr "Nepožadován přihlašovací token."
 
 #. TRANS: Client error displayed trying to use "one time password login" while specifying an invalid login token.
-#: actions/otp.php:100
 msgid "Invalid login token specified."
 msgstr "Neplatný přihlašovací token."
 
 #. TRANS: Client error displayed trying to use "one time password login" while specifying an expired login token.
-#: actions/otp.php:110
 msgid "Login token expired."
 msgstr "Přihlašovací token vypršel."
 
 #. TRANS: Title for outbox for any but the fist page.
 #. TRANS: %1$s is the user nickname, %2$d is the page number.
-#: actions/outbox.php:57
 #, php-format
 msgid "Outbox for %1$s - page %2$d"
 msgstr "Odeslaná pošta uživatele %1$s - strana %2$d"
 
 #. TRANS: Title for first page of outbox.
-#: actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
 msgstr "Odeslané uživatele %s"
 
 #. TRANS: Instructions for outbox.
-#: actions/outbox.php:103
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr ""
 "Toto je váš outbox, který obsahuje seznam soukromých zpráv které jste "
 "odeslali."
 
-#: actions/passwordsettings.php:58
 msgid "Change password"
 msgstr "Změnit heslo"
 
-#: actions/passwordsettings.php:69
 msgid "Change your password."
 msgstr "Změňte své heslo."
 
 #. TRANS: Fieldset legend for password reset form.
-#: actions/passwordsettings.php:96 actions/recoverpassword.php:251
 msgid "Password change"
 msgstr "Změna hesla"
 
-#: actions/passwordsettings.php:104
 msgid "Old password"
 msgstr "Staré heslo"
 
 #. TRANS: Field label for password reset form.
-#: actions/passwordsettings.php:108 actions/recoverpassword.php:256
 msgid "New password"
 msgstr "Nové heslo"
 
-#: actions/passwordsettings.php:109 actions/register.php:416
 #, fuzzy
 msgid "6 or more characters."
 msgstr "6 a více znaků"
 
 #. TRANS: Ttile for field label for password reset form where the password has to be typed again.
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:264
-#: actions/register.php:420
 #, fuzzy
 msgid "Same as password above."
 msgstr "Stejné jako heslo výše"
 
-#: actions/passwordsettings.php:117
 msgid "Change"
 msgstr "Změnit"
 
-#: actions/passwordsettings.php:153 actions/register.php:223
 msgid "Password must be 6 or more characters."
 msgstr "Heslo musí být alespoň 6 znaků dlouhé"
 
-#: actions/passwordsettings.php:156 actions/register.php:226
 msgid "Passwords don't match."
 msgstr "Hesla nesouhlasí"
 
-#: actions/passwordsettings.php:164
 msgid "Incorrect old password"
 msgstr "Nesprávné staré heslo"
 
-#: actions/passwordsettings.php:180
 msgid "Error saving user; invalid."
 msgstr "Chyba při ukládaní uživatele; neplatný."
 
 #. TRANS: Reset password form validation error message.
-#: actions/passwordsettings.php:185 actions/recoverpassword.php:418
 #, fuzzy
 msgid "Cannot save new password."
 msgstr "Nelze uložit nové heslo"
 
-#: actions/passwordsettings.php:191
 msgid "Password saved."
 msgstr "Heslo uloženo"
 
 #. TRANS: Title for Paths admin panel.
 #. TRANS: Menu item for site administration
-#: actions/pathsadminpanel.php:58 lib/adminpanelaction.php:371
 msgid "Paths"
 msgstr "Cesty"
 
 #. TRANS: Form instructions for Path admin panel.
-#: actions/pathsadminpanel.php:69
 msgid "Path and server settings for this StatusNet site"
 msgstr ""
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the directory that could not be read from.
-#: actions/pathsadminpanel.php:155
 #, php-format
 msgid "Theme directory not readable: %s."
 msgstr "Adresář témat není čitelný: %s."
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the avatar directory that could not be written to.
-#: actions/pathsadminpanel.php:163
 #, php-format
 msgid "Avatar directory not writable: %s."
 msgstr "Nelze zapisovat do adresáře avatarů: %s."
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the background directory that could not be written to.
-#: actions/pathsadminpanel.php:171
 #, php-format
 msgid "Background directory not writable: %s."
 msgstr "Nelze zapisovat do adresáře pozadí: %s."
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the locales directory that could not be read from.
-#: actions/pathsadminpanel.php:181
 #, php-format
 msgid "Locales directory not readable: %s."
 msgstr "Locales adresář není čitelný: %s."
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the SSL server URL that is too long.
-#: actions/pathsadminpanel.php:189
 msgid "Invalid SSL server. The maximum length is 255 characters."
 msgstr "Neplatný SSL server. Maximální délka je 255 znaků."
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:235 actions/siteadminpanel.php:58
 msgid "Site"
 msgstr "Stránky"
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:241 actions/pathsadminpanel.php:279
-#: actions/pathsadminpanel.php:370 actions/pathsadminpanel.php:425
 msgid "Server"
 msgstr "Server"
 
-#: actions/pathsadminpanel.php:242
 msgid "Site's server hostname."
 msgstr "Hostname (jméno) serveru stránek."
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:248 actions/pathsadminpanel.php:288
-#: actions/pathsadminpanel.php:379 actions/pathsadminpanel.php:434
 msgid "Path"
 msgstr "Cesta"
 
-#: actions/pathsadminpanel.php:249
 #, fuzzy
 msgid "Site path."
 msgstr "Cesta ke stránkám (za jménem serveru)"
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:255
 #, fuzzy
 msgid "Locale directory"
 msgstr "adresář tématu"
 
-#: actions/pathsadminpanel.php:256
 #, fuzzy
 msgid "Directory path to locales."
 msgstr "Cesta k adresáři locales"
 
 #. TRANS: Checkbox label in Paths admin panel.
-#: actions/pathsadminpanel.php:263
 msgid "Fancy URLs"
 msgstr "Hezké URL"
 
-#: actions/pathsadminpanel.php:265
 msgid "Use fancy (more readable and memorable) URLs?"
 msgstr "Použijte Fancy (více čitelné a zapamatovatelné) URL?"
 
-#: actions/pathsadminpanel.php:272
 msgid "Theme"
 msgstr "Téma"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:281
 #, fuzzy
 msgid "Server for themes."
 msgstr "Téma stránek"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:290
 msgid "Web path to themes."
 msgstr ""
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:297 actions/pathsadminpanel.php:388
-#: actions/pathsadminpanel.php:443 actions/pathsadminpanel.php:495
 msgid "SSL server"
 msgstr "SSL server"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:299
 msgid "SSL server for themes (default: SSL server)."
 msgstr ""
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:306 actions/pathsadminpanel.php:397
-#: actions/pathsadminpanel.php:452
 #, fuzzy
 msgid "SSL path"
 msgstr "Cesta ke stránkám (za jménem serveru)"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:308
 msgid "SSL path to themes (default: /theme/)."
 msgstr ""
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:315 actions/pathsadminpanel.php:406
-#: actions/pathsadminpanel.php:461
 #, fuzzy
 msgid "Directory"
 msgstr "adresář tématu"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:317
 #, fuzzy
 msgid "Directory where themes are located."
 msgstr "Cesta k adresáři locales"
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:326
 msgid "Avatars"
 msgstr "Avatary"
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:333
 msgid "Avatar server"
 msgstr "Server s avatary"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:335
 #, fuzzy
 msgid "Server for avatars."
 msgstr "Téma stránek"
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:342
 msgid "Avatar path"
 msgstr "Cesta k avatarům"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:344
 #, fuzzy
 msgid "Web path to avatars."
 msgstr "Nahrávání obrázku selhalo."
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:351
 msgid "Avatar directory"
 msgstr "Adresář avatarů"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:353
 #, fuzzy
 msgid "Directory where avatars are located."
 msgstr "Cesta k adresáři locales"
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:364
 msgid "Backgrounds"
 msgstr "Pozadí"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:372
 #, fuzzy
 msgid "Server for backgrounds."
 msgstr "Téma stránek"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:381
 msgid "Web path to backgrounds."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:390
 msgid "Server for backgrounds on SSL pages."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:399
 msgid "Web path to backgrounds on SSL pages."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:408
 #, fuzzy
 msgid "Directory where backgrounds are located."
 msgstr "Cesta k adresáři locales"
 
 #. TRANS: Fieldset legens in Paths admin panel.
-#: actions/pathsadminpanel.php:419
 msgid "Attachments"
 msgstr "Přílohy"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:427
 #, fuzzy
 msgid "Server for attachments."
 msgstr "Téma stránek"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:436
 #, fuzzy
 msgid "Web path to attachments."
 msgstr "Bez příloh."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:445
 #, fuzzy
 msgid "Server for attachments on SSL pages."
 msgstr "Téma stránek"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:454
 msgid "Web path to attachments on SSL pages."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:463
 #, fuzzy
 msgid "Directory where attachments are located."
 msgstr "Cesta k adresáři locales"
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:472
 msgid "SSL"
 msgstr "SSL"
 
 #. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
-#: actions/pathsadminpanel.php:477 actions/snapshotadminpanel.php:202
 msgid "Never"
 msgstr "Nikdy"
 
 #. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
-#: actions/pathsadminpanel.php:479
 msgid "Sometimes"
 msgstr "Někdy"
 
 #. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
-#: actions/pathsadminpanel.php:481
 msgid "Always"
 msgstr "Vždy"
 
-#: actions/pathsadminpanel.php:485
 msgid "Use SSL"
 msgstr "Použít SSL"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:487
 #, fuzzy
 msgid "When to use SSL."
 msgstr "Kdy použít SSL"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:497
 #, fuzzy
 msgid "Server to direct SSL requests to."
 msgstr "Server kam směrovat SSL žádosti"
 
 #. TRANS: Button title text to store form data in the Paths admin panel.
-#: actions/pathsadminpanel.php:514
 msgid "Save paths"
 msgstr "Uložit cesty"
 
 #. TRANS: Instructions for the "People search" page.
 #. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/peoplesearch.php:54
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
@@ -4525,57 +3738,46 @@ msgstr ""
 "Minimální délka musí být alespoň 3 znaky"
 
 #. TRANS: Title of a page where users can search for other users.
-#: actions/peoplesearch.php:61
 msgid "People search"
 msgstr "Hledání lidí"
 
-#: actions/peopletag.php:68
 #, php-format
 msgid "Not a valid people tag: %s."
 msgstr "Není platný člověkotag: %s."
 
-#: actions/peopletag.php:142
 #, php-format
 msgid "Users self-tagged with %1$s - page %2$d"
 msgstr "Uživatelé kteří se sami otagovali %1$s - strana %2$d"
 
 #. TRANS: Page title for AJAX form return when a disabling a plugin.
-#: actions/plugindisable.php:69
 msgctxt "plugin"
 msgid "Disabled"
 msgstr ""
 
 #. TRANS: Client error displayed trying to perform any request method other than POST.
 #. TRANS: Do not translate POST.
-#: actions/pluginenable.php:78 actions/subscribe.php:77
 msgid "This action only accepts POST requests."
 msgstr "Tato akce přijímá pouze POST požadavky."
 
-#: actions/pluginenable.php:102
 #, fuzzy
 msgid "You cannot administer plugins."
 msgstr "Nemůžete odstranit uživatele."
 
-#: actions/pluginenable.php:109
 #, fuzzy
 msgid "No such plugin."
 msgstr "Tady žádná taková stránka není."
 
 #. TRANS: Page title for AJAX form return when enabling a plugin.
-#: actions/pluginenable.php:159
 msgctxt "plugin"
 msgid "Enabled"
 msgstr ""
 
 #. TRANS: Tab and title for plugins admin panel.
 #. TRANS: Menu item for site administration
-#: actions/pluginsadminpanel.php:56 actions/version.php:191
-#: lib/adminpanelaction.php:411
 msgid "Plugins"
 msgstr "Pluginy"
 
 #. TRANS: Instructions at top of plugin admin page.
-#: actions/pluginsadminpanel.php:68
 msgid ""
 "Additional plugins can be enabled and configured manually. See the <a href="
 "\"http://status.net/wiki/Plugins\">online plugin documentation</a> for more "
@@ -4583,32 +3785,26 @@ msgid ""
 msgstr ""
 
 #. TRANS: Admin form section header
-#: actions/pluginsadminpanel.php:84
 #, fuzzy
 msgid "Default plugins"
 msgstr "Výchozí jazyk"
 
-#: actions/pluginsadminpanel.php:106
 msgid ""
 "All default plugins have been disabled from the site's configuration file."
 msgstr ""
 
-#: actions/postnotice.php:95
 msgid "Invalid notice content."
 msgstr "Neplatná velikost"
 
-#: actions/postnotice.php:101
 #, php-format
 msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’."
 msgstr "Licence hlášky ‘%1$s’ není kompatibilní s licencí webu ‘%2$s’."
 
 #. TRANS: Page title for profile settings.
-#: actions/profilesettings.php:60
 msgid "Profile settings"
 msgstr "Nastavené Profilu"
 
 #. TRANS: Usage instructions for profile settings.
-#: actions/profilesettings.php:71
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
@@ -4616,31 +3812,24 @@ msgstr ""
 "více dozvědět."
 
 #. TRANS: Profile settings form legend.
-#: actions/profilesettings.php:99
 msgid "Profile information"
 msgstr "Nastavené Profilu"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:110 actions/register.php:412
 #, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr "1-64 znaků nebo čísel, bez teček, čárek a mezer"
 
 #. TRANS: Field label in form for profile settings.
-#: actions/profilesettings.php:114 actions/register.php:434
-#: lib/groupeditform.php:150
 msgid "Full name"
 msgstr "Celé jméno"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:119 actions/register.php:439
-#: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "Moje stránky"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:122 actions/register.php:441
 #, fuzzy
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr "Adresa vašich stránek, blogu nebo profilu na jiných stránkách."
@@ -4648,7 +3837,6 @@ msgstr "Adresa vašich stránek, blogu nebo profilu na jiných stránkách."
 #. TRANS: Tooltip for field label in form for profile settings. Plural
 #. TRANS: is decided by the number of characters available for the
 #. TRANS: biography (%d).
-#: actions/profilesettings.php:130 actions/register.php:450
 #, fuzzy, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4657,41 +3845,31 @@ msgstr[1] "Popište sebe a své zájmy"
 msgstr[2] "Popište sebe a své zájmy"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:136 actions/register.php:455
 msgid "Describe yourself and your interests"
 msgstr "Popište sebe a své zájmy"
 
 #. TRANS: Text area label in form for profile settings where users can provide.
 #. TRANS: their biography.
-#: actions/profilesettings.php:140 actions/register.php:457
 msgid "Bio"
 msgstr "O mě"
 
 #. TRANS: Field label in form for profile settings.
-#: actions/profilesettings.php:146 actions/register.php:462
-#: lib/groupeditform.php:173
 msgid "Location"
 msgstr "Umístění"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:149
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Místo. Město, stát."
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:154
 msgid "Share my current location when posting notices"
 msgstr "Sdělit mou aktuální polohu při posílání hlášek"
 
 #. TRANS: Field label in form for profile settings.
-#: actions/profilesettings.php:162 actions/tagother.php:128
-#: actions/tagother.php:188 lib/subscriptionlist.php:104
-#: lib/subscriptionlist.php:106
 msgid "Tags"
 msgstr "Tagy"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:165
 #, fuzzy
 msgid ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- "
@@ -4699,28 +3877,23 @@ msgid ""
 msgstr "Otagujte se (písmena, čísla, -, . a _), oddělené čárkami nebo mezerami"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:170
 msgid "Language"
 msgstr "Jazyk"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:172
 #, fuzzy
 msgid "Preferred language."
 msgstr "Preferovaný jazyk"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:182
 msgid "Timezone"
 msgstr "Časové pásmo"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:184
 msgid "What timezone are you normally in?"
 msgstr "V jaké časové zóně se obyčejně nacházíte?"
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:190
 #, fuzzy
 msgid ""
 "Automatically subscribe to whoever subscribes to me (best for non-humans)."
@@ -4731,7 +3904,6 @@ msgstr ""
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Plural form is used based on the maximum number of allowed
 #. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:259 actions/register.php:214
 #, fuzzy, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4740,85 +3912,69 @@ msgstr[1] "Umístění příliš dlouhé (maximálně %d znaků)"
 msgstr[2] "Umístění příliš dlouhé (maximálně %d znaků)"
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:270 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr "Časové pásmo není vybráno."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:278
 #, fuzzy
 msgid "Language is too long (maximum 50 characters)."
 msgstr "Jazyk je příliš dlouhý (max. 50 znaků)."
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:292
 #, fuzzy, php-format
 msgid "Invalid tag: \"%s\"."
 msgstr "Neplatná velikost"
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:348
 #, fuzzy
 msgid "Could not update user for autosubscribe."
 msgstr "Nelze aktualizovat nastavení automatického přihlašování."
 
 #. TRANS: Server error thrown when user profile location preference settings could not be updated.
-#: actions/profilesettings.php:406
 #, fuzzy
 msgid "Could not save location prefs."
 msgstr "Nelze uložit nastavení umístění."
 
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:428 actions/tagother.php:179
 msgid "Could not save tags."
 msgstr "Nelze uložit nálepky"
 
 #. TRANS: Confirmation shown when user profile settings are saved.
 #. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:437 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "Nastavení uloženo"
 
 #. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
 #. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:484 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "Zaregistrujte se"
 
-#: actions/public.php:83
 #, php-format
 msgid "Beyond the page limit (%s)."
 msgstr "Přes limit stránky (%s)."
 
-#: actions/public.php:92
 msgid "Could not retrieve public stream."
 msgstr "Nepodařilo se získat veřejný proud."
 
-#: actions/public.php:130
 #, php-format
 msgid "Public timeline, page %d"
 msgstr "Veřejná časová osa, strana %d"
 
-#: actions/public.php:132 lib/publicgroupnav.php:79
 msgid "Public timeline"
 msgstr "Veřejné zprávy"
 
-#: actions/public.php:160
 msgid "Public Stream Feed (RSS 1.0)"
 msgstr "Veřejný Stream Feed (RSS 1.0)"
 
-#: actions/public.php:164
 msgid "Public Stream Feed (RSS 2.0)"
 msgstr "Veřejný Stream Feed (RSS 2.0)"
 
-#: actions/public.php:168
 msgid "Public Stream Feed (Atom)"
 msgstr "Veřejný Stream Feed (Atom)"
 
-#: actions/public.php:188
 #, php-format
 msgid ""
 "This is the public timeline for %%site.name%% but no one has posted anything "
@@ -4826,18 +3982,15 @@ msgid ""
 msgstr ""
 "Tohle je veřejná časová osa %%site.name%%, ale nikdo zatím nic nenapsal."
 
-#: actions/public.php:191
 msgid "Be the first to post!"
 msgstr "Pošlete něco jako první!"
 
-#: actions/public.php:195
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post!"
 msgstr ""
 "Proč ne [zaregistrovat účet](%%action.register%%) a poslat něco jako první!"
 
-#: actions/public.php:242
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -4850,7 +4003,6 @@ msgstr ""
 "status.net/). [Zaregistrujte se](%%action.register%%) a sdílejte hlášky o "
 "sobě s přáteli, rodinou a kolegy! ([Čtěte více](%%doc.help%%))"
 
-#: actions/public.php:247
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -4862,19 +4014,16 @@ msgstr ""
 "status.net/)."
 
 #. TRANS: Public RSS feed description. %s is the StatusNet site name.
-#: actions/publicrss.php:106
 #, fuzzy, php-format
 msgid "%s updates from everyone."
 msgstr "Všechny updaty na %s!"
 
 #. TRANS: Title for public tag cloud.
-#: actions/publictagcloud.php:57
 msgid "Public tag cloud"
 msgstr "Veřejný tag cloud"
 
 #. TRANS: Instructions (more used like an explanation/header).
 #. TRANS: %s is the StatusNet sitename.
-#: actions/publictagcloud.php:65
 #, fuzzy, php-format
 msgid "These are most popular recent tags on %s"
 msgstr "Poslední nejpopulárnější značky na %s "
@@ -4882,14 +4031,12 @@ msgstr "Poslední nejpopulárnější značky na %s "
 #. TRANS: This message contains a Markdown URL. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.
-#: actions/publictagcloud.php:74
 #, php-format
 msgid "No one has posted a notice with a [hashtag](%%doc.tags%%) yet."
 msgstr "Nikdo ještě neposlal oznámení s [tagem](%%doc.tags%%)."
 
 #. 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.
-#: actions/publictagcloud.php:79
 msgid "Be the first to post one!"
 msgstr "Pošlete něco jako první!"
 
@@ -4898,7 +4045,6 @@ msgstr "Pošlete něco jako první!"
 #. TRANS: This message contains a Markdown URL. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.
-#: actions/publictagcloud.php:87
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post "
@@ -4907,42 +4053,34 @@ msgstr ""
 "Proč ne [zaregistrovat účet](%%action.register%%) a poslat něco jako první!"
 
 #. TRANS: Client error displayed trying to recover password while already logged in.
-#: actions/recoverpassword.php:37
 msgid "You are already logged in!"
 msgstr "Již jste přihlášen"
 
 #. TRANS: Client error displayed when password recovery code is not correct.
-#: actions/recoverpassword.php:64
 msgid "No such recovery code."
 msgstr "Žádný takový obnovující kód."
 
 #. TRANS: Client error displayed when no proper password recovery code was submitted.
-#: actions/recoverpassword.php:69
 msgid "Not a recovery code."
 msgstr "Není obnovujícím kódem"
 
 #. TRANS: Server error displayed trying to recover password without providing a user.
-#: actions/recoverpassword.php:77
 msgid "Recovery code for unknown user."
 msgstr "Obnovovací kód pro neznámého uživatele."
 
 #. TRANS: Server error displayed removing a password recovery code from the database.
-#: actions/recoverpassword.php:91
 msgid "Error with confirmation code."
 msgstr "Chyba v ověřovacím kódu"
 
 #. TRANS: Client error displayed trying to recover password with too old a recovery code.
-#: actions/recoverpassword.php:103
 msgid "This confirmation code is too old. Please start again."
 msgstr "Tento potvrzující kód je příliš starý Prosím zkuste znovu"
 
 #. TRANS: Server error displayed when updating a user's e-mail address in the database fails while recovering a password.
-#: actions/recoverpassword.php:118
 msgid "Could not update user with confirmed email address."
 msgstr "Nemohu aktualizovat uživatele s potvrzenou e-mailovou adresu."
 
 #. TRANS: Page notice for password recovery page.
-#: actions/recoverpassword.php:160
 msgid ""
 "If you have forgotten or lost your password, you can get a new one sent to "
 "the email address you have stored in your account."
@@ -4950,100 +4088,82 @@ msgstr ""
 "Pokud jste zapomněli nebo ztratili své heslo, můžeme zaslat nové na e-"
 "mailovou adresu, kterou jste uložili ve vašem účtu."
 
-#: actions/recoverpassword.php:167
 msgid "You have been identified. Enter a new password below."
 msgstr "Byl jste identifikován. Vložte níže nové heslo."
 
 #. TRANS: Fieldset legend for password recovery page.
-#: actions/recoverpassword.php:198
 msgid "Password recovery"
 msgstr "Obnovení hesla"
 
 #. TRANS: Field label on password recovery page.
-#: actions/recoverpassword.php:202
 msgid "Nickname or email address"
 msgstr "Zadej přezdívku nebo emailovou adresu"
 
 #. TRANS: Title for field label on password recovery page.
-#: actions/recoverpassword.php:205
 msgid "Your nickname on this server, or your registered email address."
 msgstr "Vaše přezdívka na tomto servu, nebo váš email zadaný při registraci"
 
 #. TRANS: Field label on password recovery page.
-#: actions/recoverpassword.php:212
 msgid "Recover"
 msgstr "Obnovit"
 
 #. TRANS: Button text on password recovery page.
-#: actions/recoverpassword.php:214
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Recover"
 msgstr "Obnovit"
 
 #. TRANS: Title for password recovery page in password reset mode.
-#: actions/recoverpassword.php:223
 msgid "Reset password"
 msgstr "Resetovat heslo"
 
 #. TRANS: Title for password recovery page in password recover mode.
-#: actions/recoverpassword.php:225
 msgid "Recover password"
 msgstr "Obnovit heslo"
 
 #. TRANS: Title for password recovery page in email sent mode.
 #. TRANS: Subject for password recovery e-mail.
-#: actions/recoverpassword.php:227 actions/recoverpassword.php:366
 msgid "Password recovery requested"
 msgstr "Zažádáno o obnovu hesla"
 
 #. TRANS: Title for password recovery page in password saved mode.
-#: actions/recoverpassword.php:229
 #, fuzzy
 msgid "Password saved"
 msgstr "Heslo uloženo"
 
 #. TRANS: Title for password recovery page when an unknown action has been specified.
-#: actions/recoverpassword.php:232
 msgid "Unknown action"
 msgstr "Neznámá akce"
 
 #. TRANS: Title for field label for password reset form.
-#: actions/recoverpassword.php:258
 #, fuzzy
 msgid "6 or more characters, and do not forget it!"
 msgstr "6 a více znaků, a nezapomeňte ho!"
 
 #. TRANS: Button text for password reset form.
 #. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: actions/recoverpassword.php:268 lib/designform.php:145
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Reset"
 msgstr "Reset"
 
 #. TRANS: Form instructions for password recovery form.
-#: actions/recoverpassword.php:278
 msgid "Enter a nickname or email address."
 msgstr "Zadej přezdívku nebo emailovou adresu"
 
 #. TRANS: Information on password recovery form if no known username or e-mail address was specified.
-#: actions/recoverpassword.php:309
 msgid "No user with that email address or username."
 msgstr "Žádný uživatel s touto e-mailovou adresu nebo uživatelským jménem."
 
 #. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
-#: actions/recoverpassword.php:327
 msgid "No registered email address for that user."
 msgstr "Žádný registrovaný email pro tohoto uživatele."
 
 #. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
-#: actions/recoverpassword.php:342
 msgid "Error saving address confirmation."
 msgstr "Chyba při ukládání potvrzení adresy"
 
 #. TRANS: User notification after an e-mail with instructions was sent from the password recovery form.
-#: actions/recoverpassword.php:370
 msgid ""
 "Instructions for recovering your password have been sent to the email "
 "address registered to your account."
@@ -5052,75 +4172,59 @@ msgstr ""
 "u vašeho účtu."
 
 #. TRANS: Client error displayed when trying to reset as password without providing a user.
-#: actions/recoverpassword.php:391
 msgid "Unexpected password reset."
 msgstr "Nečekané resetování hesla."
 
 #. TRANS: Reset password form validation error message.
-#: actions/recoverpassword.php:400
 #, fuzzy
 msgid "Password must be 6 characters or more."
 msgstr "Heslo musí být alespoň 6 znaků dlouhé"
 
 #. TRANS: Reset password form validation error message.
-#: actions/recoverpassword.php:405
 msgid "Password and confirmation do not match."
 msgstr "Heslo a potvrzení nesouhlasí"
 
 #. TRANS: Server error displayed when something does wrong with the user object during password reset.
-#: actions/recoverpassword.php:426 actions/register.php:241
 msgid "Error setting user."
 msgstr "Chyba nastavení uživatele"
 
 #. TRANS: Success message for user after password reset.
-#: actions/recoverpassword.php:434
 msgid "New password successfully saved. You are now logged in."
 msgstr "Nové heslo bylo uloženo. Nyní jste přihlášen."
 
-#: actions/redirecturl.php:70
 #, fuzzy
 msgid "No id parameter"
 msgstr "Žádný argument ID."
 
-#: actions/redirecturl.php:76
 #, fuzzy, php-format
 msgid "No such file \"%d\""
 msgstr "Žádný takový soubor."
 
-#: actions/register.php:80 actions/register.php:181 actions/register.php:392
 msgid "Sorry, only invited people can register."
 msgstr "Litujeme, jen pozvaní se mohou registrovat."
 
-#: actions/register.php:87
 msgid "Sorry, invalid invitation code."
 msgstr "Litujeme, neplatný kód pozvánky."
 
-#: actions/register.php:106
 msgid "Registration successful"
 msgstr "Registrace úspěšná"
 
-#: actions/register.php:108 actions/register.php:490
 msgid "Register"
 msgstr "Registrovat"
 
-#: actions/register.php:128
 msgid "Registration not allowed."
 msgstr "Registrace není povolena."
 
-#: actions/register.php:194
 #, fuzzy
 msgid "You cannot register if you don't agree to the license."
 msgstr "Nemůžete se registrovat, pokud nesouhlasíte s licencí."
 
-#: actions/register.php:203
 msgid "Email address already exists."
 msgstr "Emailová adresa již existuje"
 
-#: actions/register.php:236 actions/register.php:258
 msgid "Invalid username or password."
 msgstr "Neplatné jméno nebo heslo"
 
-#: actions/register.php:333
 #, fuzzy
 msgid ""
 "With this form you can create a new account. You can then post notices and "
@@ -5129,49 +4233,39 @@ msgstr ""
 "Pomocí tohoto formuláře můžete vytvořit nový účet. Můžete pak posílat "
 "oznámení a propojit se s přáteli a kolegy. "
 
-#: actions/register.php:424 actions/register.php:428
-#: actions/siteadminpanel.php:238 lib/settingsnav.php:92
 msgid "Email"
 msgstr "Email"
 
-#: actions/register.php:425 actions/register.php:429
 #, fuzzy
 msgid "Used only for updates, announcements, and password recovery."
 msgstr "Použije se pouze pro aktualizace, oznámení a obnovu hesla."
 
-#: actions/register.php:436
 #, fuzzy
 msgid "Longer name, preferably your \"real\" name."
 msgstr "Delší jméno, nejlépe vaše \"skutečné\" jméno"
 
-#: actions/register.php:464
 #, fuzzy
 msgid "Where you are, like \"City, State (or Region), Country\"."
 msgstr "Místo. Město, stát."
 
-#: actions/register.php:503
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
 msgstr "Chápu, že obsah a data %1$S jsou soukromé a důvěrné."
 
-#: actions/register.php:513
 #, php-format
 msgid "My text and files are copyright by %1$s."
 msgstr "Můj text a soubory jsou copyrightovány %1$s."
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:517
 msgid "My text and files remain under my own copyright."
 msgstr "Můj text a soubory zůstanou pod mým vlastním copyrightem."
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:520
 msgid "All rights reserved."
 msgstr "Všechna práva vyhrazena."
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:525
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -5180,7 +4274,6 @@ msgstr ""
 "Můj text a soubory jsou k dispozici pod %s výjimkou těchto soukromých dat: "
 "heslo, e-mailová adresa, IM adresa a telefonní číslo."
 
-#: actions/register.php:566
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -5213,7 +4306,6 @@ msgstr ""
 "\n"
 "Díky za registraci a doufáme, že se vám používání této služby bude líbít."
 
-#: actions/register.php:590
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5221,7 +4313,6 @@ msgstr ""
 "(Měli byste za okamžik obdržet e-mailem zprávu s instrukcemi, jak potvrdit "
 "svou e-mailovou adresu.)"
 
-#: actions/remotesubscribe.php:97
 #, php-format
 msgid ""
 "To subscribe, you can [login](%%action.login%%), or [register](%%action."
@@ -5232,112 +4323,87 @@ msgstr ""
 "action.register%%) nový účet. Pokud již máte účet na [kompatibilních "
 "mikroblozích](%%doc.openmublog%%), vložte níže adresu."
 
-#: actions/remotesubscribe.php:111
 msgid "Remote subscribe"
 msgstr "Vzdálený odběr"
 
-#: actions/remotesubscribe.php:123
 msgid "Subscribe to a remote user"
 msgstr "Přihlásit se ke vzdálenému uživateli"
 
-#: actions/remotesubscribe.php:128
 msgid "User nickname"
 msgstr "Přezdívka uživatele"
 
-#: actions/remotesubscribe.php:129
 #, fuzzy
 msgid "Nickname of the user you want to follow."
 msgstr "Přezdívka uživatele, kterého chcete sledovat"
 
-#: actions/remotesubscribe.php:132
 msgid "Profile URL"
 msgstr "Adresa Profilu"
 
-#: actions/remotesubscribe.php:133
 #, fuzzy
 msgid "URL of your profile on another compatible microblogging service."
 msgstr "Adresa profilu na jiných kompatibilních mikroblozích."
 
 #. TRANS: Link text for link that will subscribe to a remote profile.
-#: actions/remotesubscribe.php:136 lib/subscribeform.php:139
-#: lib/userprofile.php:402
 msgid "Subscribe"
 msgstr "Odebírat"
 
-#: actions/remotesubscribe.php:158
 #, fuzzy
 msgid "Invalid profile URL (bad format)."
 msgstr "Neplatná adresa profilu (špatný formát)"
 
-#: actions/remotesubscribe.php:167
 msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
 msgstr ""
 "Není platnou adresou profilu (není YADIS dokumentem nebo definováno neplatné "
 "XRDS)."
 
-#: actions/remotesubscribe.php:175
 #, fuzzy
 msgid "That is a local profile! Login to subscribe."
 msgstr "To je místní profil! Pro přihlášení k odběru se přihlášte."
 
-#: actions/remotesubscribe.php:182
 #, fuzzy
 msgid "Could not get a request token."
 msgstr "Nelze získat řetězec požadavku."
 
-#: actions/repeat.php:56
 msgid "Only logged-in users can repeat notices."
 msgstr "Pouze přihlášení uživatelé mohou opakovat oznámení."
 
-#: actions/repeat.php:63 actions/repeat.php:70
 msgid "No notice specified."
 msgstr "Oznámení neuvedeno."
 
-#: actions/repeat.php:75
 #, fuzzy
 msgid "You cannot repeat your own notice."
 msgstr "Nemůžete opakovat své vlastní oznámení."
 
-#: actions/repeat.php:89
 msgid "You already repeated that notice."
 msgstr "Již jste zopakoval toto oznámení."
 
-#: actions/repeat.php:112 lib/noticelist.php:697
 msgid "Repeated"
 msgstr "Opakované"
 
-#: actions/repeat.php:117
 msgid "Repeated!"
 msgstr "Opakované!"
 
 #. TRANS: RSS reply feed title. %s is a user nickname.
-#: actions/replies.php:126 actions/repliesrss.php:68
-#: lib/personalgroupnav.php:105
 #, php-format
 msgid "Replies to %s"
 msgstr "Odpovědi na %s"
 
-#: actions/replies.php:128
 #, php-format
 msgid "Replies to %1$s, page %2$d"
 msgstr "Odpovědi na %1$s, strana %2$d"
 
-#: actions/replies.php:145
 #, php-format
 msgid "Replies feed for %s (RSS 1.0)"
 msgstr "Feed odpovědí pro %s (RSS 1.0)"
 
-#: actions/replies.php:152
 #, php-format
 msgid "Replies feed for %s (RSS 2.0)"
 msgstr "Feed odpovědí pro %s (RSS 2.0)"
 
-#: actions/replies.php:159
 #, php-format
 msgid "Replies feed for %s (Atom)"
 msgstr "Feed odpovědí pro %s (Atom)"
 
-#: actions/replies.php:199
 #, php-format
 msgid ""
 "This is the timeline showing replies to %1$s but %2$s hasn't received a "
@@ -5346,7 +4412,6 @@ msgstr ""
 "Toto je časová osa ukazující odpovědi na %1$s, ale %2$s, ještě neobdržel "
 "žádná oznámení."
 
-#: actions/replies.php:204
 #, php-format
 msgid ""
 "You can engage other users in a conversation, subscribe to more people or "
@@ -5355,7 +4420,6 @@ msgstr ""
 "Můžete zapojit ostatní uživatele v rozhovoru, přihlaste se k více lidem nebo "
 "se [připojit do skupin](%%action.groups%%)."
 
-#: actions/replies.php:206
 #, php-format
 msgid ""
 "You can try to [nudge %1$s](../%2$s) or [post something to them](%%%%action."
@@ -5366,38 +4430,32 @@ msgstr ""
 
 #. TRANS: RSS reply feed description.
 #. TRANS: %1$s is a user nickname, %2$s is the StatusNet site name.
-#: actions/repliesrss.php:74
 #, fuzzy, php-format
 msgid "Replies to %1$s on %2$s."
 msgstr "Odpovědi na %1$s na %2$s!"
 
 #. TRANS: Client exception displayed when trying to restore an account while not logged in.
-#: actions/restoreaccount.php:78
 #, fuzzy
 msgid "Only logged-in users can restore their account."
 msgstr "Pouze přihlášení uživatelé mohou opakovat oznámení."
 
 #. TRANS: Client exception displayed when trying to restore an account without having restore rights.
-#: actions/restoreaccount.php:83
 #, fuzzy
 msgid "You may not restore your account."
 msgstr "Ještě jste nezaregistrovali žádné aplikace."
 
 #. TRANS: Client exception displayed trying to restore an account while something went wrong uploading a file.
 #. TRANS: Client exception. No file; probably just a non-AJAX submission.
-#: actions/restoreaccount.php:121 actions/restoreaccount.php:146
 #, fuzzy
 msgid "No uploaded file."
 msgstr "Nahrát soubor"
 
 #. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
-#: actions/restoreaccount.php:129 lib/mediafile.php:194
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
 msgstr ""
 "Velkost uploadovaného souboru překračuje upload_max_filesize limit v php.ini."
 
 #. TRANS: Client exception.
-#: actions/restoreaccount.php:135 lib/mediafile.php:200
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form."
@@ -5406,188 +4464,153 @@ msgstr ""
 "uvedeno v HTML formuláři."
 
 #. TRANS: Client exception.
-#: actions/restoreaccount.php:141 lib/mediafile.php:206
 msgid "The uploaded file was only partially uploaded."
 msgstr "Nahrávaný soubor byl nahrán pouze částečně."
 
 #. TRANS: Client exception thrown when a temporary folder is not present to store a file upload.
-#: actions/restoreaccount.php:150 lib/mediafile.php:214
 msgid "Missing a temporary folder."
 msgstr "Chybí dočasný adresář."
 
 #. TRANS: Client exception thrown when writing to disk is not possible during a file upload operation.
-#: actions/restoreaccount.php:154 lib/mediafile.php:218
 msgid "Failed to write file to disk."
 msgstr "Nepodařilo se zapsat soubor na disk."
 
 #. TRANS: Client exception thrown when a file upload operation has been stopped by an extension.
-#: actions/restoreaccount.php:158 lib/mediafile.php:222
 msgid "File upload stopped by extension."
 msgstr "Nahrávání souboru zastaveno rozšířením PHP."
 
 #. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
 #. TRANS: Exception thrown when uploading an image fails for an unknown reason.
 #. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
-#: actions/restoreaccount.php:164 lib/imagefile.php:106 lib/mediafile.php:228
 msgid "System error uploading file."
 msgstr "Chyba systému při nahrávání souboru"
 
 #. TRANS: Client exception thrown when a feed is not an Atom feed.
-#: actions/restoreaccount.php:207
 #, fuzzy
 msgid "Not an Atom feed."
 msgstr "Všichni členové"
 
 #. TRANS: Success message when a feed has been restored.
-#: actions/restoreaccount.php:241
 msgid ""
 "Feed has been restored. Your old posts should now appear in search and your "
 "profile page."
 msgstr ""
 
 #. TRANS: Message when a feed restore is in progress.
-#: actions/restoreaccount.php:245
 msgid "Feed will be restored. Please wait a few minutes for results."
 msgstr ""
 
 #. TRANS: Form instructions for feed restore.
-#: actions/restoreaccount.php:342
 msgid ""
 "You can upload a backed-up stream in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format."
 msgstr ""
 
 #. TRANS: Title for submit button to confirm upload of a user backup file for account restore.
-#: actions/restoreaccount.php:373
 #, fuzzy
 msgid "Upload the file"
 msgstr "Nahrát soubor"
 
-#: actions/revokerole.php:75
 msgid "You cannot revoke user roles on this site."
 msgstr "Nemůžete rušit uživatelské role na této stránce."
 
-#: actions/revokerole.php:82
 msgid "User doesn't have this role."
 msgstr "Uživatel nemá tuto roli."
 
-#: actions/rsd.php:142 actions/version.php:159
 msgid "StatusNet"
 msgstr "StatusNet"
 
-#: actions/sandbox.php:65 actions/unsandbox.php:65
 msgid "You cannot sandbox users on this site."
 msgstr "Nemůžete sandboxovat uživatele na této stránce."
 
-#: actions/sandbox.php:72
 msgid "User is already sandboxed."
 msgstr "Uživatel je již sandboxován."
 
 #. TRANS: Menu item for site administration
-#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
-#: lib/adminpanelaction.php:379
 msgid "Sessions"
 msgstr "Sessions"
 
-#: actions/sessionsadminpanel.php:65
 msgid "Session settings for this StatusNet site"
 msgstr ""
 
-#: actions/sessionsadminpanel.php:175
 msgid "Handle sessions"
 msgstr "Zpracovávat sessions"
 
-#: actions/sessionsadminpanel.php:177
 msgid "Whether to handle sessions ourselves."
 msgstr "Máme sami zpracovávat sessions?"
 
-#: actions/sessionsadminpanel.php:181
 msgid "Session debugging"
 msgstr "Debugování sessions"
 
-#: actions/sessionsadminpanel.php:183
 msgid "Turn on debugging output for sessions."
 msgstr "Zapnout výstup pro debugování sessions"
 
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
+#. TRANS: Submit button title.
+msgid "Save"
+msgstr "Uložit"
+
 msgid "Save site settings"
 msgstr "Uložit Nastavení webu"
 
-#: actions/showapplication.php:78
 msgid "You must be logged in to view an application."
 msgstr "Musíte být přihlášeni pro zobrazení aplikace."
 
-#: actions/showapplication.php:151
 msgid "Application profile"
 msgstr "Profil aplikace"
 
-#: actions/showapplication.php:179
 #, php-format
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr ""
 "Vytvořil %1$s - s \"%2$s\" přístupem ve výchozím nastavení - %3$d uživatelů"
 
-#: actions/showapplication.php:189
 msgid "Application actions"
 msgstr "Akce aplikace"
 
-#: actions/showapplication.php:212
 msgid "Reset key & secret"
 msgstr "Resetovat klíč a tajemství"
 
 #. TRANS: Title of form for deleting a user.
-#: actions/showapplication.php:228 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:64 lib/noticelist.php:678
 msgid "Delete"
 msgstr "Odstranit"
 
-#: actions/showapplication.php:237
 msgid "Application info"
 msgstr "Info o aplikaci"
 
-#: actions/showapplication.php:255
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
 msgstr "Poznámka: podpora HMAC-SHA1 podpisů. Nepodporujeme plaintext."
 
-#: actions/showapplication.php:275
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr ""
 "Jste si jisti, že chcete resetovat svůj spotřebitelský klíč a tajemství?"
 
 #. TRANS: Title for all but the first page of favourite notices of a user.
 #. TRANS: %1$s is the user for whom the favourite notices are displayed, %2$d is the page number.
-#: actions/showfavorites.php:80
 #, php-format
 msgid "%1$s's favorite notices, page %2$d"
 msgstr "Oblíbená oznámení uživatele %1$s, strana %2$d"
 
 #. TRANS: Server error displayed when favourite notices could not be retrieved from the database.
-#: actions/showfavorites.php:134
 msgid "Could not retrieve favorite notices."
 msgstr "Nepodařilo se získat oblíbená oznámení."
 
 #. TRANS: Feed link text. %s is a username.
-#: actions/showfavorites.php:172
 #, php-format
 msgid "Feed for favorites of %s (RSS 1.0)"
 msgstr "Feed oblíbených oznámení uživatele %s (RSS 1.0)"
 
 #. TRANS: Feed link text. %s is a username.
-#: actions/showfavorites.php:180
 #, php-format
 msgid "Feed for favorites of %s (RSS 2.0)"
 msgstr "Feed oblíbených oznámení uživatele %s (RSS 2.0)"
 
 #. TRANS: Feed link text. %s is a username.
-#: actions/showfavorites.php:188
 #, php-format
 msgid "Feed for favorites of %s (Atom)"
 msgstr "Feed oblíbených oznámení uživatele %s (Atom)"
 
 #. TRANS: Text displayed instead of favourite notices for the current logged in user that has no favourites.
-#: actions/showfavorites.php:209
 msgid ""
 "You haven't chosen any favorite notices yet. Click the fave button on "
 "notices you like to bookmark them for later or shed a spotlight on them."
@@ -5598,7 +4621,6 @@ msgstr ""
 
 #. TRANS: Text displayed instead of favourite notices for a user that has no favourites while logged in.
 #. TRANS: %s is a username.
-#: actions/showfavorites.php:213
 #, php-format
 msgid ""
 "%s hasn't added any favorite notices yet. Post something interesting they "
@@ -5610,7 +4632,6 @@ msgstr ""
 #. TRANS: Text displayed instead of favourite notices for a user that has no favourites while not logged in.
 #. TRANS: %s is a username, %%%%action.register%%%% is a link to the user registration page.
 #. TRANS: (link text)[link] is a Mark Down link.
-#: actions/showfavorites.php:220
 #, php-format
 msgid ""
 "%s hasn't added any favorite notices yet. Why not [register an account](%%%%"
@@ -5621,64 +4642,53 @@ msgstr ""
 "register%%%%) a neposlat neco zajímavého co by si přidali do oblíbených :)"
 
 #. TRANS: Page notice for show favourites page.
-#: actions/showfavorites.php:251
 msgid "This is a way to share what you like."
 msgstr "Toto je způsob, jak sdílet to, co se vám líbí."
 
 #. TRANS: Page title for first group page. %s is a group name.
-#: actions/showgroup.php:75
 #, php-format
 msgid "%s group"
 msgstr "skupina %s"
 
 #. TRANS: Page title for any but first group page.
 #. TRANS: %1$s is a group name, $2$s is a page number.
-#: actions/showgroup.php:79
 #, php-format
 msgid "%1$s group, page %2$d"
 msgstr "skupina %1$s, str. %2$d"
 
 #. TRANS: Label for group description or group note (dt). Text hidden by default.
-#: actions/showgroup.php:266
 msgid "Note"
 msgstr "Poznámka"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:277 lib/groupeditform.php:180
 msgid "Aliases"
 msgstr "Aliasy"
 
 #. TRANS: Group actions header (h2). Text hidden by default.
-#: actions/showgroup.php:294
 msgid "Group actions"
 msgstr "Akce skupiny"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:338
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
 msgstr "Feed sdělení skupiny %s (RSS 1.0"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:345
 #, php-format
 msgid "Notice feed for %s group (RSS 2.0)"
 msgstr "Feed sdělení skupiny %s (RSS 2.0)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:352
 #, php-format
 msgid "Notice feed for %s group (Atom)"
 msgstr "Feed sdělení skupiny %s (Atom)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:358
 #, php-format
 msgid "FOAF for %s group"
 msgstr "FOAF pro skupinu %s"
 
 #. TRANS: Header for mini list of group members on a group page (h2).
-#: actions/showgroup.php:395
 msgid "Members"
 msgstr "Členové"
 
@@ -5686,31 +4696,24 @@ msgstr "Členové"
 #. TRANS: Text for user subscription statistics if the user has no subscriptions.
 #. TRANS: Text for user subscriber statistics if user has no subscribers.
 #. TRANS: Text for user user group membership statistics if user is not a member of any group.
-#: actions/showgroup.php:401 lib/profileaction.php:137
-#: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
-#: lib/subscriptionlist.php:123 lib/tagcloudsection.php:71
 msgid "(None)"
 msgstr "(nic)"
 
 #. TRANS: Link to all group members from mini list of group members if group has more than n members.
-#: actions/showgroup.php:410
 msgid "All members"
 msgstr "Všichni členové"
 
 #. TRANS: Header for group statistics on a group page (h2).
 #. TRANS: H2 text for user statistics.
-#: actions/showgroup.php:441 lib/profileaction.php:205
 msgid "Statistics"
 msgstr "Statistiky"
 
-#: actions/showgroup.php:444
 #, fuzzy
 msgctxt "LABEL"
 msgid "Created"
 msgstr "Vytvořeno"
 
 #. TRANS: Label for member count in statistics on group page.
-#: actions/showgroup.php:449
 #, fuzzy
 msgctxt "LABEL"
 msgid "Members"
@@ -5720,7 +4723,6 @@ msgstr "Členové"
 #. TRANS: **%s** is the group alias, %%%%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).
-#: actions/showgroup.php:464
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5738,7 +4740,6 @@ 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: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
-#: actions/showgroup.php:474
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5752,99 +4753,83 @@ msgstr ""
 "životě a zájmech.  "
 
 #. TRANS: Header for list of group administrators on a group page (h2).
-#: actions/showgroup.php:503
 msgid "Admins"
 msgstr "Adminové"
 
 #. TRANS: Client error displayed requesting a single message that does not exist.
-#: actions/showmessage.php:76
 msgid "No such message."
 msgstr "Žádné takové zprávy."
 
 #. TRANS: Client error displayed requesting a single direct message the requesting user was not a party in.
-#: actions/showmessage.php:86
 msgid "Only the sender and recipient may read this message."
 msgstr "Pouze odesílatel a příjemce může přečíst tuto zprávu."
 
 #. TRANS: Page title for single direct message display when viewing user is the sender.
 #. TRANS: %1$s is the addressed user's nickname, $2$s is a timestamp.
-#: actions/showmessage.php:105
 #, php-format
 msgid "Message to %1$s on %2$s"
 msgstr "Zpráva pro %1$s na %2$s"
 
 #. TRANS: Page title for single message display.
 #. TRANS: %1$s is the sending user's nickname, $2$s is a timestamp.
-#: actions/showmessage.php:113
 #, php-format
 msgid "Message from %1$s on %2$s"
 msgstr "Zpráva od %1$s na %2$s"
 
-#: actions/shownotice.php:90
 msgid "Notice deleted."
 msgstr "Oznámení smazáno."
 
 #. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
-#: actions/showstream.php:70
 #, fuzzy, php-format
 msgid "%1$s tagged %2$s"
 msgstr "%1$s, strana %2$d"
 
 #. TRANS: Page title showing tagged notices in one user's stream.
 #. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
-#: actions/showstream.php:74
 #, fuzzy, php-format
 msgid "%1$s tagged %2$s, page %3$d"
 msgstr "Oznámení označená %1$s, strana %2$d"
 
 #. TRANS: Extended page title showing tagged notices in one user's stream.
 #. TRANS: %1$s is the username, %2$d is the page number.
-#: actions/showstream.php:82
 #, php-format
 msgid "%1$s, page %2$d"
 msgstr "%1$s, strana %2$d"
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %1$s is a user nickname, %2$s is a hashtag.
-#: actions/showstream.php:127
 #, php-format
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
 msgstr "Feed oznámení pro %1$s otagovaných %2$s (RSS 1.0)"
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.
-#: actions/showstream.php:136
 #, php-format
 msgid "Notice feed for %s (RSS 1.0)"
 msgstr "Feed oznámení pro %1$s (RSS 1.0)"
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.
-#: actions/showstream.php:145
 #, php-format
 msgid "Notice feed for %s (RSS 2.0)"
 msgstr "Feed oznámení pro %1$s (RSS 2.0)"
 
-#: actions/showstream.php:152
 #, php-format
 msgid "Notice feed for %s (Atom)"
 msgstr "Feed oznámení pro %1$s (Atom)"
 
 #. TRANS: Title for link to notice feed. FOAF stands for Friend of a Friend.
 #. TRANS: More information at http://www.foaf-project.org. %s is a user nickname.
-#: actions/showstream.php:159
 #, php-format
 msgid "FOAF for %s"
 msgstr "FOAF pro %s"
 
 #. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
-#: actions/showstream.php:205
 #, fuzzy, php-format
 msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr "Toto je časová osa pro %1$s, ale %2$s zatím ničím nepřispěli."
 
 #. TRANS: Second sentence of empty list message for a stream for the user themselves.
-#: actions/showstream.php:211
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
@@ -5854,7 +4839,6 @@ msgstr ""
 
 #. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:215
 #, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
@@ -5865,7 +4849,6 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:258
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5880,7 +4863,6 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:265
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5892,221 +4874,174 @@ msgstr ""
 "(http://status.net/). "
 
 #. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
-#: actions/showstream.php:322
 #, php-format
 msgid "Repeat of %s"
 msgstr "Opakování %s"
 
-#: actions/silence.php:65 actions/unsilence.php:65
 msgid "You cannot silence users on this site."
 msgstr "Na tomto webu nemůžete ztišovat uživatele."
 
-#: actions/silence.php:72
 msgid "User is already silenced."
 msgstr "Uživatel je už umlčen."
 
-#: actions/siteadminpanel.php:69
 msgid "Basic settings for this StatusNet site"
 msgstr "Základní nastavení pro tuto stránku StatusNet"
 
-#: actions/siteadminpanel.php:133
 msgid "Site name must have non-zero length."
 msgstr "Název webu musí mít nenulovou délku."
 
-#: actions/siteadminpanel.php:141
 msgid "You must have a valid contact email address."
 msgstr "Musíte mít platnou kontaktní emailovou adresu."
 
-#: actions/siteadminpanel.php:159
 #, php-format
 msgid "Unknown language \"%s\"."
 msgstr "Neznámý jazyk \"%s\"."
 
-#: actions/siteadminpanel.php:165
 msgid "Minimum text limit is 0 (unlimited)."
 msgstr "Minimální limit textu je 0 (bez omezení)."
 
-#: actions/siteadminpanel.php:171
 msgid "Dupe limit must be one or more seconds."
 msgstr "Duplikační limit musí být jedna nebo více sekund."
 
-#: actions/siteadminpanel.php:221
 msgid "General"
 msgstr "Obecné"
 
-#: actions/siteadminpanel.php:224
 msgid "Site name"
 msgstr "Název stránky"
 
-#: actions/siteadminpanel.php:225
 msgid "The name of your site, like \"Yourcompany Microblog\""
 msgstr "Název vaší stránky, jako \"Mikroblog VašíSpolečnosti\""
 
-#: actions/siteadminpanel.php:229
 msgid "Brought by"
 msgstr "Přineseno"
 
-#: actions/siteadminpanel.php:230
 msgid "Text used for credits link in footer of each page"
 msgstr "Text pro děkovný odkaz (credits) v zápatí každé stránky."
 
-#: actions/siteadminpanel.php:234
 msgid "Brought by URL"
 msgstr "Přineseno URL"
 
-#: actions/siteadminpanel.php:235
 msgid "URL used for credits link in footer of each page"
 msgstr "Text pro děkovný odkaz (credits) v zápatí každé stránky."
 
-#: actions/siteadminpanel.php:239
 msgid "Contact email address for your site"
 msgstr "Kontaktní e-mailová adresa pro vaše stránky"
 
-#: actions/siteadminpanel.php:245
 msgid "Local"
 msgstr "Místní"
 
-#: actions/siteadminpanel.php:256
 msgid "Default timezone"
 msgstr "Výchozí časové pásmo"
 
-#: actions/siteadminpanel.php:257
 msgid "Default timezone for the site; usually UTC."
 msgstr "Výchozí časové pásmo pro web, obvykle UTC."
 
-#: actions/siteadminpanel.php:262
 msgid "Default language"
 msgstr "Výchozí jazyk"
 
-#: actions/siteadminpanel.php:263
 msgid "Site language when autodetection from browser settings is not available"
 msgstr "Jazyk stránky když není k dispozici autodetekce z nastavení prohlížeče"
 
-#: actions/siteadminpanel.php:271
 msgid "Limits"
 msgstr "Omezení"
 
-#: actions/siteadminpanel.php:274
 msgid "Text limit"
 msgstr "Omezení textu"
 
-#: actions/siteadminpanel.php:274
 msgid "Maximum number of characters for notices."
 msgstr "Maximální počet znaků v oznámení."
 
-#: actions/siteadminpanel.php:278
 msgid "Dupe limit"
 msgstr "Limit duplikace"
 
-#: actions/siteadminpanel.php:278
 msgid "How long users must wait (in seconds) to post the same thing again."
 msgstr ""
 "Jak dlouho uživatel musí čekat (v sekundách) než může poslat totéž znovu."
 
 #. TRANS: Page title for site-wide notice tab in admin panel.
-#: actions/sitenoticeadminpanel.php:55
 msgid "Site Notice"
 msgstr "Oznámení stránky"
 
 #. TRANS: Instructions for site-wide notice tab in admin panel.
-#: actions/sitenoticeadminpanel.php:66
 msgid "Edit site-wide message"
 msgstr "Upravit celo-webovou zprávu"
 
 #. TRANS: Server error displayed when saving a site-wide notice was impossible.
-#: actions/sitenoticeadminpanel.php:101
 msgid "Unable to save site notice."
 msgstr "Problém při ukládání sdělení stránky"
 
 #. TRANS: Client error displayed when a site-wide notice was longer than allowed.
-#: actions/sitenoticeadminpanel.php:112
 #, fuzzy
 msgid "Maximum length for the site-wide notice is 255 characters."
 msgstr "Max délka pro celo-webové oznámení je 255 znaků."
 
 #. TRANS: Label for site-wide notice text field in admin panel.
-#: actions/sitenoticeadminpanel.php:176
 msgid "Site notice text"
 msgstr "Text sdělení stránky"
 
 #. TRANS: Tooltip for site-wide notice text field in admin panel.
-#: actions/sitenoticeadminpanel.php:179
 #, fuzzy
 msgid "Site-wide notice text (255 characters maximum; HTML allowed)"
 msgstr "Celo-webové sdělení (255 znaků max., s HTML)"
 
 #. TRANS: Title for button to save site notice in admin panel.
-#: actions/sitenoticeadminpanel.php:201
 #, fuzzy
 msgid "Save site notice."
 msgstr "Uložit oznámení stránky"
 
 #. TRANS: Title for SMS settings.
-#: actions/smssettings.php:56
 msgid "SMS settings"
 msgstr "nastavení SMS"
 
 #. TRANS: SMS settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/smssettings.php:70
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr "Z %%site.name%% můžete přijímat SMS e-mailem."
 
 #. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
-#: actions/smssettings.php:92
 msgid "SMS is not available."
 msgstr "SMS není k dispozici."
 
 #. TRANS: Form legend for SMS settings form.
-#: actions/smssettings.php:106
 msgid "SMS address"
 msgstr "SMS adresa"
 
 #. TRANS: Form guide in SMS settings form.
-#: actions/smssettings.php:115
 msgid "Current confirmed SMS-enabled phone number."
 msgstr "Aktuální potvrzené SMS-schopné telefonní číslo."
 
 #. TRANS: Form guide in IM settings form.
-#: actions/smssettings.php:128
 msgid "Awaiting confirmation on this phone number."
 msgstr "Čeká na potvrzení na tomto telefonním čísle."
 
 #. TRANS: Field label for SMS address input in SMS settings form.
-#: actions/smssettings.php:137
 msgid "Confirmation code"
 msgstr "Potvrzovací kód"
 
 #. TRANS: Form field instructions in SMS settings form.
-#: actions/smssettings.php:139
 msgid "Enter the code you received on your phone."
 msgstr "Zadejte kód, který jste obdrželi na telefonu."
 
 #. TRANS: Button label to confirm SMS confirmation code in SMS settings.
-#: actions/smssettings.php:143
 msgctxt "BUTTON"
 msgid "Confirm"
 msgstr "Potvrdit"
 
 #. TRANS: Field label for SMS phone number input in SMS settings form.
-#: actions/smssettings.php:148
 msgid "SMS phone number"
 msgstr "SMS telefonní číslo"
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
-#: actions/smssettings.php:151
 #, fuzzy
 msgid "Phone number, no punctuation or spaces, with area code."
 msgstr "Telefonní číslo, Nepoužívej interpunkci nebo mezery, s předčíslím"
 
 #. TRANS: Form legend for SMS preferences form.
-#: actions/smssettings.php:190
 msgid "SMS preferences"
 msgstr "Nastavení SMS"
 
 #. TRANS: Checkbox label in SMS preferences form.
-#: actions/smssettings.php:196
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
@@ -6115,32 +5050,26 @@ msgstr ""
 "provider může naůčtovat nesmyslně vysoké částky."
 
 #. TRANS: Confirmation message for successful SMS preferences save.
-#: actions/smssettings.php:307
 msgid "SMS preferences saved."
 msgstr "Nastavení SMS uloženo."
 
 #. TRANS: Message given saving SMS phone number without having provided one.
-#: actions/smssettings.php:329
 msgid "No phone number."
 msgstr "Žádné telefonní číslo."
 
 #. TRANS: Message given saving SMS phone number without having selected a carrier.
-#: actions/smssettings.php:335
 msgid "No carrier selected."
 msgstr "Nevybrán poskytovatel."
 
 #. TRANS: Message given saving SMS phone number that is already set.
-#: actions/smssettings.php:343
 msgid "That is already your phone number."
 msgstr "Toto je již vaše telefonní číslo."
 
 #. TRANS: Message given saving SMS phone number that is already set for another user.
-#: actions/smssettings.php:347
 msgid "That phone number already belongs to another user."
 msgstr "Toto telefonní číslo již patří jinému uživateli"
 
 #. TRANS: Message given saving valid SMS phone number that is to be confirmed.
-#: actions/smssettings.php:375
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
 "for the code and instructions on how to use it."
@@ -6149,39 +5078,32 @@ msgstr ""
 "použít."
 
 #. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
-#: actions/smssettings.php:403
 msgid "That is the wrong confirmation number."
 msgstr "Toto je špatné ověřovací číslo."
 
 #. TRANS: Message given after successfully canceling SMS phone number confirmation.
-#: actions/smssettings.php:417
 msgid "SMS confirmation cancelled."
 msgstr "SMS potvrzení zrušeno."
 
 #. TRANS: Message given trying to remove an SMS phone number that is not
 #. TRANS: registered for the active user.
-#: actions/smssettings.php:437
 msgid "That is not your phone number."
 msgstr "To není vaše telefonní číslo."
 
 #. TRANS: Message given after successfully removing a registered SMS phone number.
-#: actions/smssettings.php:459
 msgid "The SMS phone number was removed."
 msgstr "SMS Telefonní číslo bylo odstraněno."
 
 #. TRANS: Label for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:498
 msgid "Mobile carrier"
 msgstr "Mobilní operátor"
 
 #. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:503
 msgid "Select a carrier"
 msgstr "Vyberte operátora"
 
 #. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
 #. TRANS: %s is an administrative contact's e-mail address.
-#: actions/smssettings.php:512
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -6191,120 +5113,95 @@ msgstr ""
 "přes e-mail, ale zde není uveden, pošlete e-mail a dejte nám vědět na% s."
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
-#: actions/smssettings.php:534
 #, fuzzy
 msgid "No code entered."
 msgstr "Nezadán kód"
 
 #. TRANS: Menu item for site administration
-#: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
-#: lib/adminpanelaction.php:395
 msgid "Snapshots"
 msgstr "Snímky (snapshoty)"
 
-#: actions/snapshotadminpanel.php:65
 msgid "Manage snapshot configuration"
 msgstr "Konfigurace snímků"
 
-#: actions/snapshotadminpanel.php:127
 msgid "Invalid snapshot run value."
 msgstr "Neplatná hodnota run. (kdy provádět snapshoty)"
 
-#: actions/snapshotadminpanel.php:133
 msgid "Snapshot frequency must be a number."
 msgstr "Frekvence snímků musí být číslo."
 
-#: actions/snapshotadminpanel.php:144
 msgid "Invalid snapshot report URL."
 msgstr "Neplatná URL na reportování snímků"
 
-#: actions/snapshotadminpanel.php:200
 msgid "Randomly during web hit"
 msgstr "Náhodně při dodávání stránek"
 
-#: actions/snapshotadminpanel.php:201
 msgid "In a scheduled job"
 msgstr "V naplánovaném úkolu"
 
-#: actions/snapshotadminpanel.php:206
 msgid "Data snapshots"
 msgstr "Snímky dat"
 
-#: actions/snapshotadminpanel.php:208
 msgid "When to send statistical data to status.net servers"
 msgstr "Kdy posílat statistická data na status.net servery"
 
-#: actions/snapshotadminpanel.php:217
 msgid "Frequency"
 msgstr "Frekvence"
 
-#: actions/snapshotadminpanel.php:218
 msgid "Snapshots will be sent once every N web hits"
 msgstr "Snímky budou odeslány jednou za N web hitů"
 
-#: actions/snapshotadminpanel.php:226
 msgid "Report URL"
 msgstr "Reportovací URL"
 
-#: actions/snapshotadminpanel.php:227
 msgid "Snapshots will be sent to this URL"
 msgstr "Na tuto adresu budou poslány snímky"
 
-#: actions/snapshotadminpanel.php:248
 msgid "Save snapshot settings"
 msgstr "Uložit nastavení snímkování"
 
 #. TRANS: Client error displayed trying a change a subscription for a non-subscribed profile.
-#: actions/subedit.php:75
 msgid "You are not subscribed to that profile."
 msgstr "Nejste přihlášen k tomuto profilu."
 
 #. TRANS: Server error displayed when updating a subscription fails with a database error.
 #. TRANS: Exception thrown when a subscription could not be stored on the server.
-#: actions/subedit.php:89 classes/Subscription.php:141
 msgid "Could not save subscription."
 msgstr "Nelze uložit odebírání"
 
 #. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
-#: actions/subscribe.php:121
 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
 msgstr ""
 "Touto akcí se nemůžete se přihlásit k odběru vzdáleného OMB 0.1 profilu."
 
 #. TRANS: Page title when subscription succeeded.
-#: actions/subscribe.php:149
 msgid "Subscribed"
 msgstr "Prihlášen"
 
 #. TRANS: Header for list of subscribers for a user (first page).
 #. TRANS: %s is the user's nickname.
-#: actions/subscribers.php:51
 #, php-format
 msgid "%s subscribers"
 msgstr "Odběratelé %s"
 
 #. TRANS: Header for list of subscribers for a user (not first page).
 #. TRANS: %1$s is the user's nickname, $2$d is the page number.
-#: actions/subscribers.php:55
 #, php-format
 msgid "%1$s subscribers, page %2$d"
 msgstr "odběratelé %1$s, strana %2$d"
 
 #. TRANS: Page notice for page with an overview of all subscribers
 #. TRANS: of the logged in user's own profile.
-#: actions/subscribers.php:68
 msgid "These are the people who listen to your notices."
 msgstr "Toto jsou lidé, kteří naslouchají vašim sdělením."
 
 #. TRANS: Page notice for page with an overview of all subscribers of a user other
 #. TRANS: than the logged in user. %s is the user nickname.
-#: actions/subscribers.php:74
 #, php-format
 msgid "These are the people who listen to %s's notices."
 msgstr "Toto jsou lidé, kteří naslouchají sdělením od %s."
 
 #. TRANS: Subscriber list text when the logged in user has no subscribers.
-#: actions/subscribers.php:114
 #, fuzzy
 msgid ""
 "You have no subscribers. Try subscribing to people you know and they might "
@@ -6315,7 +5212,6 @@ msgstr ""
 
 #. TRANS: Subscriber list text when looking at the subscribers for a of a user other
 #. TRANS: than the logged in user that has no subscribers. %s is the user nickname.
-#: actions/subscribers.php:118
 #, php-format
 msgid "%s has no subscribers. Want to be the first?"
 msgstr "Uživatele %s nikdo nesleduje. Chcete být první?"
@@ -6325,7 +5221,6 @@ msgstr "Uživatele %s nikdo nesleduje. Chcete být první?"
 #. TRANS: This message contains a Markdown URL. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.
-#: actions/subscribers.php:127
 #, php-format
 msgid ""
 "%s has no subscribers. Why not [register an account](%%%%action.register%%%"
@@ -6336,20 +5231,17 @@ msgstr ""
 
 #. TRANS: Header for subscriptions overview for a user (not first page).
 #. TRANS: %1$s is a user nickname, %2$d is the page number.
-#: actions/subscriptions.php:55
 #, php-format
 msgid "%1$s subscriptions, page %2$d"
 msgstr "Odběry uživatele %1$s, strana %2$d"
 
 #. TRANS: Page notice for page with an overview of all subscriptions
 #. TRANS: of the logged in user's own profile.
-#: actions/subscriptions.php:68
 msgid "These are the people whose notices you listen to."
 msgstr "Toto jsou lidé, jejiž sdělením nasloucháte"
 
 #. TRANS: Page notice for page with an overview of all subscriptions of a user other
 #. TRANS: than the logged in user. %s is the user nickname.
-#: actions/subscriptions.php:74
 #, php-format
 msgid "These are the people whose notices %s listens to."
 msgstr "Toto jsou lidé, jejímž sdělením %s naslouchá"
@@ -6358,7 +5250,6 @@ 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.
-#: actions/subscriptions.php:133
 #, php-format
 msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "
@@ -6377,69 +5268,55 @@ msgstr ""
 #. TRANS: than the logged in user that has no subscriptions. %s is the user nickname.
 #. TRANS: Subscription list text when looking at the subscriptions for a of a user that has none
 #. TRANS: as an anonymous user. %s is the user nickname.
-#: actions/subscriptions.php:141 actions/subscriptions.php:147
 #, php-format
 msgid "%s is not listening to anyone."
 msgstr "%s nikoho nesleduje."
 
 #. TRANS: Atom feed title. %s is a profile nickname.
-#: actions/subscriptions.php:176
 #, fuzzy, php-format
 msgid "Subscription feed for %s (Atom)"
 msgstr "Feed oznámení pro %1$s (Atom)"
 
 #. TRANS: Checkbox label for enabling Jabber messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:241 lib/settingsnav.php:110
-#, fuzzy
 msgid "IM"
 msgstr "IM"
 
 #. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:256 lib/settingsnav.php:117
 msgid "SMS"
 msgstr "SMS"
 
 #. TRANS: Title for all but the first page of notices with tags.
 #. TRANS: %1$s is the tag, %2$d is the page number.
-#: actions/tag.php:73
 #, php-format
 msgid "Notices tagged with %1$s, page %2$d"
 msgstr "Oznámení označená %1$s, strana %2$d"
 
-#: actions/tag.php:91
 #, php-format
 msgid "Notice feed for tag %s (RSS 1.0)"
 msgstr "Feed oznámení označených %s (RSS 1.0)"
 
-#: actions/tag.php:97
 #, php-format
 msgid "Notice feed for tag %s (RSS 2.0)"
 msgstr "Feed oznámení označených %s (RSS 2.0)"
 
-#: actions/tag.php:103
 #, php-format
 msgid "Notice feed for tag %s (Atom)"
 msgstr "Feed oznámení označených %s (Atom)"
 
-#: actions/tagother.php:39
 msgid "No ID argument."
 msgstr "Žádný argument ID."
 
-#: actions/tagother.php:65
 #, php-format
 msgid "Tag %s"
 msgstr "Otagujte %s"
 
 #. TRANS: H2 for user profile information.
-#: actions/tagother.php:77 lib/userprofile.php:76
 msgid "User profile"
 msgstr "Uživatelský profil"
 
-#: actions/tagother.php:120
 msgid "Tag user"
 msgstr "Otagujte uživatele"
 
-#: actions/tagother.php:130
 msgid ""
 "Tags for this user (letters, numbers, -, ., and _), comma- or space- "
 "separated"
@@ -6447,226 +5324,181 @@ msgstr ""
 "Tagy pro tohoto uživatele (písmena, číslice, -,., a _), oddělené čárkou nebo "
 "mezerou"
 
-#: actions/tagother.php:157
 #, php-format
 msgid "Invalid tag: \"%s\""
 msgstr "Neplatná velikost"
 
-#: actions/tagother.php:172
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 "Můžete označovat pouze lidi, ke kterým jste přihlášen nebo kteří jsou "
 "přihlášeni k vám."
 
-#: actions/tagother.php:215
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
 "Použijte tento formulář k přidání nálepek na vaše posluchače nebo ty které "
 "posloucháte."
 
-#: actions/tagrss.php:35
 msgid "No such tag."
 msgstr "Žádná taková nálepka."
 
 #. TRANS: Client error displayed when trying to unblock a non-blocked user.
-#: actions/unblock.php:59
 msgid "You haven't blocked that user."
 msgstr "Nemáte zablokováno tohoto uživatele."
 
-#: actions/unsandbox.php:72
 msgid "User is not sandboxed."
 msgstr "Uživatel není sandboxován."
 
-#: actions/unsilence.php:72
 msgid "User is not silenced."
 msgstr "Uživatel není umlčen."
 
-#: actions/unsubscribe.php:77
 msgid "No profile ID in request."
 msgstr "CHybí ID profilu v žádosti."
 
-#: actions/unsubscribe.php:98
 msgid "Unsubscribed"
 msgstr "Odhlášeno"
 
-#: actions/updateprofile.php:64
 #, php-format
 msgid ""
 "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
 msgstr ""
 "Licence naslouchaného '%1$s' není kompatibilní s licencí stránky '%2$s'."
 
-#: actions/urlsettings.php:60
 #, fuzzy
 msgid "URL settings"
 msgstr "Nastavení IM"
 
 #. TRANS: Instructions for tab "Other" in user profile settings.
-#: actions/urlsettings.php:72
 msgid "Manage various other options."
 msgstr "Správa různých dalších možností."
 
 #. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
 #. TRANS: user's profile settings. This message has one space at the beginning. Use your
 #. TRANS: language's word separator here if it has one (most likely a single space).
-#: actions/urlsettings.php:115
 msgid " (free service)"
 msgstr " (Služba zdarma)"
 
-#: actions/urlsettings.php:121
 #, fuzzy
 msgid "[none]"
 msgstr "Nic"
 
-#: actions/urlsettings.php:122
 msgid "[internal]"
 msgstr ""
 
 #. TRANS: Label for dropdown with URL shortener services.
-#: actions/urlsettings.php:130
 msgid "Shorten URLs with"
 msgstr "Zkrácovat URL s"
 
 #. TRANS: Tooltip for for dropdown with URL shortener services.
-#: actions/urlsettings.php:132
 msgid "Automatic shortening service to use."
 msgstr "Služba automatického zkracování, kterou použít."
 
-#: actions/urlsettings.php:138
 msgid "URL longer than"
 msgstr ""
 
-#: actions/urlsettings.php:141
 msgid "URLs longer than this will be shortened, 0 means always shorten."
 msgstr ""
 
-#: actions/urlsettings.php:145
 msgid "Text longer than"
 msgstr ""
 
-#: actions/urlsettings.php:148
 msgid ""
 "URLs in notices longer than this will be shortened, 0 means always shorten."
 msgstr ""
 
 #. TRANS: Form validation error for form "Other settings" in user profile.
-#: actions/urlsettings.php:180
 #, fuzzy
 msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr "adresa služby zkracování URL je příliš dlouhá (max. 50 znaků)."
 
-#: actions/urlsettings.php:187
 msgid "Invalid number for max url length."
 msgstr ""
 
-#: actions/urlsettings.php:193
 #, fuzzy
 msgid "Invalid number for max notice length."
 msgstr "Neplatná velikost"
 
-#: actions/urlsettings.php:238
 msgid "Error saving user URL shortening preferences."
 msgstr ""
 
 #. TRANS: User admin panel title
-#: actions/useradminpanel.php:58
 msgctxt "TITLE"
 msgid "User"
 msgstr "Uživatel"
 
 #. TRANS: Instruction for user admin panel.
-#: actions/useradminpanel.php:69
 msgid "User settings for this StatusNet site"
 msgstr ""
 
 #. TRANS: Form validation error in user admin panel when a non-numeric character limit was set.
-#: actions/useradminpanel.php:147
 msgid "Invalid bio limit. Must be numeric."
 msgstr "Neplatný bio limit. Musí být číslo."
 
 #. TRANS: Form validation error in user admin panel when welcome text is too long.
-#: actions/useradminpanel.php:154
 #, fuzzy
 msgid "Invalid welcome text. Maximum length is 255 characters."
 msgstr "Neplatné uvítací text. Max délka je 255 znaků."
 
 #. TRANS: Client error displayed when trying to set a non-existing user as default subscription for new
 #. TRANS: users in user admin panel. %1$s is the invalid nickname.
-#: actions/useradminpanel.php:166
 #, fuzzy, php-format
 msgid "Invalid default subscripton: \"%1$s\" is not a user."
 msgstr "Neplatné výchozí přihlášení: '%1$s' není uživatel."
 
-#: actions/useradminpanel.php:215 lib/action.php:565 lib/settingsnav.php:77
-#: lib/subgroupnav.php:81
 msgid "Profile"
 msgstr "Profil"
 
 #. TRANS: Field label in user admin panel for setting the character limit for the bio field.
-#: actions/useradminpanel.php:220
 msgid "Bio Limit"
 msgstr "Limit Bia"
 
 #. TRANS: Tooltip in user admin panel for setting the character limit for the bio field.
-#: actions/useradminpanel.php:222
 msgid "Maximum length of a profile bio in characters."
 msgstr "Maximální počet znaků bia profilu."
 
 #. TRANS: Form legend in user admin panel.
-#: actions/useradminpanel.php:231
 msgid "New users"
 msgstr "Noví uživatelé"
 
 #. TRANS: Field label in user admin panel for setting new user welcome text.
-#: actions/useradminpanel.php:236
 msgid "New user welcome"
 msgstr "Uvítání nového uživatele"
 
 #. TRANS: Tooltip in user admin panel for setting new user welcome text.
-#: actions/useradminpanel.php:238
 #, fuzzy
 msgid "Welcome text for new users (maximum 255 characters)."
 msgstr "Uvítání nových uživatel (Max 255 znaků)."
 
 #. TRANS: Field label in user admin panel for setting default subscription for new users.
-#: actions/useradminpanel.php:244
 msgid "Default subscription"
 msgstr "Výchozí odběr"
 
 #. TRANS: Tooltip in user admin panel for setting default subscription for new users.
-#: actions/useradminpanel.php:246
 msgid "Automatically subscribe new users to this user."
 msgstr "Automaticky přihlásit nové uživatele k tomuto uživateli."
 
 #. TRANS: Form legend in user admin panel.
-#: actions/useradminpanel.php:256
 msgid "Invitations"
 msgstr "Pozvánky"
 
 #. TRANS: Field label for checkbox in user admin panel for allowing users to invite friend using site e-mail.
-#: actions/useradminpanel.php:262
 msgid "Invitations enabled"
 msgstr "Pozvánky povoleny"
 
 #. TRANS: Tooltip for checkbox in user admin panel for allowing users to invite friend using site e-mail.
-#: actions/useradminpanel.php:265
 msgid "Whether to allow users to invite new users."
 msgstr "Zda chcete uživatelům umožnit pozvat nové uživatele."
 
 #. TRANS: Title for button to save user settings in user admin panel.
-#: actions/useradminpanel.php:302
 #, fuzzy
 msgid "Save user settings."
 msgstr "Uložit Nastavení webu"
 
 #. TRANS: Page title.
-#: actions/userauthorization.php:109
 msgid "Authorize subscription"
 msgstr "Autorizujte přihlášení"
 
 #. TRANS: Page notice on "Auhtorize subscription" page.
-#: actions/userauthorization.php:115
 #, fuzzy
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
@@ -6678,42 +5510,35 @@ msgstr ""
 "uživteli, klikněte na \"Zrušit\""
 
 #. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:200
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Accept"
 msgstr "Přijmout"
 
 #. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:202
 #, fuzzy
 msgid "Subscribe to this user."
 msgstr "Přihlásit se k tomuto uživateli"
 
 #. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:204
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Reject"
 msgstr "Odmítnout"
 
 #. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:206
 #, fuzzy
 msgid "Reject this subscription."
 msgstr "Odmítnout toto přihlášení"
 
 #. TRANS: Client error displayed for an empty authorisation request.
-#: actions/userauthorization.php:219
 msgid "No authorization request!"
 msgstr "Žádná žádost o autorizaci!"
 
 #. TRANS: Accept message header from Authorise subscription page.
-#: actions/userauthorization.php:242
 msgid "Subscription authorized"
 msgstr "Odběr autorizován"
 
-#: actions/userauthorization.php:245
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to authorize the "
@@ -6724,11 +5549,9 @@ msgstr ""
 "je:"
 
 #. TRANS: Reject message header from Authorise subscription page.
-#: actions/userauthorization.php:256
 msgid "Subscription rejected"
 msgstr "Odběr odmítnut"
 
-#: actions/userauthorization.php:259
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to fully reject the "
@@ -6739,35 +5562,30 @@ msgstr ""
 
 #. TRANS: Exception thrown when no valid user is found for an authorisation request.
 #. TRANS: %s is a listener URI.
-#: actions/userauthorization.php:296
 #, fuzzy, php-format
 msgid "Listener URI \"%s\" not found here."
 msgstr "Naslouchací URI ‘%s’ zde nebyl nalezen."
 
 #. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
 #. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:303
 #, fuzzy, php-format
 msgid "Listenee URI \"%s\" is too long."
 msgstr "Naslouchací URI ‘%s’ je příliš dlouhý."
 
 #. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
 #. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:311
 #, fuzzy, php-format
 msgid "Listenee URI \"%s\" is a local user."
 msgstr "Naslouchací URI ‘%s’ je místní uživatel."
 
 #. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
 #. TRANS: %s is a profile URL.
-#: actions/userauthorization.php:329
 #, fuzzy, php-format
 msgid "Profile URL \"%s\" is for a local user."
 msgstr "URL profilu '%s' je pro místního uživatele."
 
 #. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
 #. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
-#: actions/userauthorization.php:339
 #, fuzzy, php-format
 msgid ""
 "Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
@@ -6777,32 +5595,27 @@ msgstr ""
 
 #. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
 #. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:349
 #, fuzzy, php-format
 msgid "Avatar URL \"%s\" is not valid."
 msgstr "URL avataru ‘%s’ není platný."
 
 #. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
 #. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:356
 #, fuzzy, php-format
 msgid "Cannot read avatar URL \"%s\"."
 msgstr "Nelze načíst avatara z URL '%s'"
 
 #. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
 #. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:363
 #, fuzzy, php-format
 msgid "Wrong image type for avatar URL \"%s\"."
 msgstr "Špatný typ obrázku na URL '%s'"
 
 #. TRANS: Page title for profile design page.
-#: actions/userdesignsettings.php:74 lib/designsettings.php:61
 msgid "Profile design"
 msgstr "Vzhled profilu"
 
 #. TRANS: Instructions for profile design page.
-#: actions/userdesignsettings.php:84 lib/designsettings.php:72
 msgid ""
 "Customize the way your profile looks with a background image and a colour "
 "palette of your choice."
@@ -6810,44 +5623,35 @@ msgstr ""
 "Přizpůsobit vzhled vašeho profilu obrázkem na pozadí a barevnou paletou "
 "vašeho výběru."
 
-#: actions/userdesignsettings.php:289
 msgid "Enjoy your hotdog!"
 msgstr "Užijte si svůj párek v rohlíku!"
 
-#: actions/userdesignsettings.php:325
 #, fuzzy
 msgid "Design settings"
 msgstr "Uložit Nastavení webu"
 
-#: actions/userdesignsettings.php:340
 msgid "View profile designs"
 msgstr "Zobrazit vzhledy profilu"
 
-#: actions/userdesignsettings.php:341
 msgid "Show or hide profile designs."
 msgstr "Zobrazit nebo skrýt vzhledy profilu."
 
-#: actions/userdesignsettings.php:348
 #, fuzzy
 msgid "Background file"
 msgstr "Pozadí"
 
 #. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number.
-#: actions/usergroups.php:66
 #, php-format
 msgid "%1$s groups, page %2$d"
 msgstr "skupiny uživatele %1$s, strana %2$d"
 
-#: actions/usergroups.php:132
 msgid "Search for more groups"
 msgstr "Vyhledat další skupiny"
 
-#: actions/usergroups.php:159
 #, php-format
 msgid "%s is not a member of any group."
 msgstr "%s není členem žádné skupiny."
 
-#: actions/usergroups.php:164
 #, php-format
 msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
 msgstr ""
@@ -6858,18 +5662,14 @@ msgstr ""
 #. TRANS: %1$s is a group name, %2$s is a site name.
 #. TRANS: Message is used as a subtitle in atom user notice feed.
 #. TRANS: %1$s is a user name, %2$s is a site name.
-#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:70
-#: lib/atomusernoticefeed.php:95
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr "Oznámení od %1$s na %2$s!"
 
-#: actions/version.php:75
 #, php-format
 msgid "StatusNet %s"
 msgstr "StatusNet %s"
 
-#: actions/version.php:155
 #, php-format
 msgid ""
 "This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
@@ -6878,16 +5678,13 @@ msgstr ""
 "Tato webová stránka je poháněna a běží na programu %1$S verze %2$s, "
 "Copyright 2008-2010 StatusNet, Inc a přispěvatelé."
 
-#: actions/version.php:163
 msgid "Contributors"
 msgstr "Přispěvatelé"
 
 #. TRANS: Menu item for site administration
-#: actions/version.php:167 lib/adminpanelaction.php:403
 msgid "License"
 msgstr "Licence"
 
-#: actions/version.php:170
 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 "
@@ -6899,7 +5696,6 @@ msgstr ""
 "Foundation, a to buď ve verzi 3 této licence anebo (podle vašeho uvážení) "
 "kterékoli pozdější verze. "
 
-#: actions/version.php:176
 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 "
@@ -6911,7 +5707,6 @@ msgstr ""
 "URČITÝ ÚČEL. Podívejte se na GNU Affero General Public License pro bližší "
 "informace. "
 
-#: actions/version.php:182
 #, php-format
 msgid ""
 "You should have received a copy of the GNU Affero General Public License "
@@ -6921,52 +5716,42 @@ msgstr ""
 "programem. Pokud ne, jděte na %s."
 
 #. TRANS: Form input field label for application name.
-#: actions/version.php:197 lib/applicationeditform.php:190
 msgid "Name"
 msgstr "Název"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:885
 msgid "Version"
 msgstr "Verze"
 
-#: actions/version.php:199
 msgid "Author(s)"
 msgstr "Autoři"
 
 #. TRANS: Form input field label.
-#: actions/version.php:200 lib/applicationeditform.php:208
-#: lib/groupeditform.php:168
 msgid "Description"
 msgstr "Popis"
 
 #. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:164
 msgid "Favor"
 msgstr "Oblíbit"
 
 #. TRANS: Ntofication given when a user marks a notice as favorite.
 #. TRANS: %1$s is a user nickname or full name, %2$s is a notice URI.
-#: classes/Fave.php:167
 #, fuzzy, php-format
 msgid "%1$s marked notice %2$s as a favorite."
 msgstr "%s (@%s) přidal vaše oznámení jako oblíbené"
 
 #. TRANS: Server exception thrown when a URL cannot be processed.
-#: classes/File.php:162
 #, php-format
 msgid "Cannot process URL '%s'"
 msgstr "Nemůžu zpracovat URL '%s'"
 
 #. TRANS: Server exception thrown when... Robin thinks something is impossible!
-#: classes/File.php:194
 msgid "Robin thinks something is impossible."
 msgstr "Robin si myslí, že je něco nemožné."
 
 #. 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$s is used for plural.
-#: classes/File.php:210
 #, fuzzy, php-format
 msgid ""
 "No file may be larger than %1$d byte and the file you sent was %2$d bytes. "
@@ -6986,7 +5771,6 @@ msgstr[2] ""
 
 #. TRANS: Message given if an upload would exceed user quota.
 #. TRANS: %d (number) is the user quota in bytes and is used for plural.
-#: classes/File.php:223
 #, fuzzy, php-format
 msgid "A file this large would exceed your user quota of %d byte."
 msgid_plural "A file this large would exceed your user quota of %d bytes."
@@ -6996,7 +5780,6 @@ msgstr[2] "Takto velký soubor by překročil vaši uživatelskou kvótu %d bajt
 
 #. TRANS: Message given id an upload would exceed a user's monthly quota.
 #. TRANS: $d (number) is the monthly user quota in bytes and is used for plural.
-#: classes/File.php:235
 #, fuzzy, php-format
 msgid "A file this large would exceed your monthly quota of %d byte."
 msgid_plural "A file this large would exceed your monthly quota of %d bytes."
@@ -7005,108 +5788,89 @@ msgstr[1] "Takto velký soubor by překročil vaši měsíční kvótu %d bajtů
 msgstr[2] "Takto velký soubor by překročil vaši měsíční kvótu %d bajtů."
 
 #. TRANS: Client exception thrown if a file upload does not have a valid name.
-#: classes/File.php:282 classes/File.php:297
 msgid "Invalid filename."
 msgstr "Neplatné jméno souboru."
 
 #. TRANS: Exception thrown when joining a group fails.
-#: classes/Group_member.php:51
 msgid "Group join failed."
 msgstr "Nepodařilo se připojit ke skupině."
 
 #. TRANS: Exception thrown when trying to leave a group the user is not a member of.
-#: classes/Group_member.php:64
 msgid "Not part of group."
 msgstr "Není součástí skupiny."
 
 #. TRANS: Exception thrown when trying to leave a group fails.
-#: classes/Group_member.php:72
 msgid "Group leave failed."
 msgstr "Nepodařilo se opustit skupinu."
 
 #. TRANS: Exception thrown providing an invalid profile ID.
 #. TRANS: %s is the invalid profile ID.
-#: classes/Group_member.php:85
 #, php-format
 msgid "Profile ID %s is invalid."
 msgstr ""
 
 #. TRANS: Exception thrown providing an invalid group ID.
 #. TRANS: %s is the invalid group ID.
-#: classes/Group_member.php:98
 #, fuzzy, php-format
 msgid "Group ID %s is invalid."
 msgstr "Chyba při ukládaní uživatele; neplatný."
 
 #. TRANS: Activity title.
-#: classes/Group_member.php:147 lib/joinform.php:114
 msgid "Join"
 msgstr "Připojit se"
 
 #. TRANS: Success message for subscribe to group attempt through OStatus.
 #. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
-#: classes/Group_member.php:151
 #, php-format
 msgid "%1$s has joined group %2$s."
 msgstr ""
 
 #. TRANS: Server exception thrown when updating a local group fails.
-#: classes/Local_group.php:42
 msgid "Could not update local group."
 msgstr "Nelze aktualizovat místní skupinu."
 
 #. TRANS: Exception thrown when trying creating a login token failed.
 #. TRANS: %s is the user nickname for which token creation failed.
-#: classes/Login_token.php:78
 #, php-format
 msgid "Could not create login token for %s"
 msgstr "Nelze vytvořit přihlašovací token pro %s"
 
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
-#: classes/Memcached_DataObject.php:556
 msgid "No database name or DSN found anywhere."
 msgstr "Nenalezeno jméno databáze ani DSN."
 
 #. TRANS: Client exception thrown when a user tries to send a direct message while being banned from sending them.
-#: classes/Message.php:45
 msgid "You are banned from sending direct messages."
 msgstr "Nemůžete posílat přímé zprávy (banned)"
 
 #. TRANS: Message given when a message could not be stored on the server.
-#: classes/Message.php:69
 msgid "Could not insert message."
 msgstr "Nemohu vložit zprávu."
 
 #. TRANS: Message given when a message could not be updated on the server.
-#: classes/Message.php:80
 msgid "Could not update message with new URI."
 msgstr "Nelze aktualizovat zprávu novým URI."
 
 #. TRANS: Server exception thrown when a user profile for a notice cannot be found.
 #. TRANS: %1$d is a profile ID (number), %2$d is a notice ID (number).
-#: classes/Notice.php:98
 #, php-format
 msgid "No such profile (%1$d) for notice (%2$d)."
 msgstr "Nenalezen profil (%1$d) pro oznámení (%2$d)."
 
 #. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:199
 #, php-format
 msgid "Database error inserting hashtag: %s"
 msgstr "Chyba databáze při vkládání nálepky: %s"
 
 #. TRANS: Client exception thrown if a notice contains too many characters.
-#: classes/Notice.php:279
 msgid "Problem saving notice. Too long."
 msgstr "Problém ukládání sdělení. Příliš dlouhé."
 
 #. TRANS: Client exception thrown when trying to save a notice for an unknown user.
-#: classes/Notice.php:284
 msgid "Problem saving notice. Unknown user."
 msgstr "Problém při ukládání sdělení. Neznámý uživatel."
 
 #. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
-#: classes/Notice.php:290
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
@@ -7114,7 +5878,6 @@ msgstr ""
 "několik minut."
 
 #. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
-#: classes/Notice.php:297
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
 "few minutes."
@@ -7123,43 +5886,36 @@ msgstr ""
 "několik minut."
 
 #. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:305
 msgid "You are banned from posting notices on this site."
 msgstr "Máte zakázáno (banned) posílat upozornění na tomto webu."
 
 #. TRANS: Server exception thrown when a notice cannot be saved.
 #. TRANS: Server exception thrown when a notice cannot be updated.
-#: classes/Notice.php:372 classes/Notice.php:399
 msgid "Problem saving notice."
 msgstr "Problém při ukládání sdělení"
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:929
 #, fuzzy
 msgid "Bad type provided to saveKnownGroups."
 msgstr "saveKnownGroups obdrželo špatný typ."
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:1028
 msgid "Problem saving group inbox."
 msgstr "Problém při ukládání skupinového inboxu"
 
 #. TRANS: Server exception thrown when a reply cannot be saved.
 #. TRANS: %1$d is a notice ID, %2$d is the ID of the mentioned user.
-#: classes/Notice.php:1144
 #, fuzzy, php-format
 msgid "Could not save reply for %1$d, %2$d."
 msgstr "Nelze uložit místní info skupiny."
 
 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1663
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
 
 #. TRANS: Full name of a profile or group followed by nickname in parens
-#: classes/Profile.php:172 classes/User_group.php:242
 #, fuzzy, php-format
 msgctxt "FANCYNAME"
 msgid "%1$s (%2$s)"
@@ -7167,264 +5923,210 @@ msgstr "%1$s (%2$s)"
 
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:779
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr "Nelze zrušit roli \"%1$s\" pro uživatele #%2$d, neexistuje."
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:788
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr "Nelze zrušit roli \"%1$s\" pro uživatele #%2$d, chyba databáze."
 
 #. TRANS: Exception thrown when a right for a non-existing user profile is checked.
-#: classes/Remote_profile.php:54
 msgid "Missing profile."
 msgstr "Chybějící profil."
 
 #. TRANS: Exception thrown when a tag cannot be saved.
-#: classes/Status_network.php:338
 msgid "Unable to save tag."
 msgstr "Nelze uložit tag."
 
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#: classes/Subscription.php:77 lib/oauthstore.php:482
 msgid "You have been banned from subscribing."
 msgstr "Byl jste vykázán (banned) z přihlašování se."
 
 #. TRANS: Exception thrown when trying to subscribe while already subscribed.
-#: classes/Subscription.php:82
 msgid "Already subscribed!"
 msgstr "Již přihlášen!"
 
 #. TRANS: Exception thrown when trying to subscribe to a user who has blocked the subscribing user.
-#: classes/Subscription.php:87
 msgid "User has blocked you."
 msgstr "Uživatel vás zablokoval."
 
 #. TRANS: Exception thrown when trying to unsibscribe without a subscription.
-#: classes/Subscription.php:176
 msgid "Not subscribed!"
 msgstr "Nepřihlášen!"
 
 #. TRANS: Exception thrown when trying to unsubscribe a user from themselves.
-#: classes/Subscription.php:183
 msgid "Could not delete self-subscription."
 msgstr "Nelze smazat odebírání sebe sama"
 
 #. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
-#: classes/Subscription.php:211
 msgid "Could not delete subscription OMB token."
 msgstr "Nelze smazat OMB token přihlášení."
 
 #. TRANS: Exception thrown when a subscription could not be deleted on the server.
-#: classes/Subscription.php:223
 msgid "Could not delete subscription."
 msgstr "Nelze smazat odebírání"
 
 #. TRANS: Activity tile when subscribing to another person.
-#: classes/Subscription.php:265
 msgid "Follow"
 msgstr ""
 
 #. TRANS: Notification given when one person starts following another.
 #. TRANS: %1$s is the subscriber, %2$s is the subscribed.
-#: classes/Subscription.php:268
 #, fuzzy, php-format
 msgid "%1$s is now following %2$s."
 msgstr "%1$s od teď naslouchá tvým sdělením na %2$s."
 
 #. TRANS: Notice given on user registration.
 #. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:390
 #, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr "Vítejte na %1$s, @%2$s!"
 
 #. TRANS: Server exception.
-#: classes/User.php:923
 msgid "No single user defined for single-user mode."
 msgstr "Nenastaven uživatel pro jednouživatelský mód"
 
 #. TRANS: Server exception.
-#: classes/User.php:927
 msgid "Single-user mode code called when not enabled."
 msgstr ""
 
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:522
 msgid "Could not create group."
 msgstr "Nelze vytvořit skupinu."
 
 #. TRANS: Server exception thrown when updating a group URI failed.
-#: classes/User_group.php:532
 msgid "Could not set group URI."
 msgstr "Nelze nastavit URI skupiny."
 
 #. TRANS: Server exception thrown when setting group membership failed.
-#: classes/User_group.php:555
 msgid "Could not set group membership."
 msgstr "Nelze nastavit členství ve skupině."
 
 #. TRANS: Server exception thrown when saving local group information failed.
-#: classes/User_group.php:570
 msgid "Could not save local group info."
 msgstr "Nelze uložit místní info skupiny."
 
 #. TRANS: Exception thrown when an account could not be located when it should be moved.
 #. TRANS: %s is the remote site.
-#: lib/accountmover.php:65
 #, fuzzy, php-format
 msgid "Cannot locate account %s."
 msgstr "Nemůžete odstranit uživatele."
 
 #. TRANS: Exception thrown when a service document could not be located account move.
 #. TRANS: %s is the remote site.
-#: lib/accountmover.php:106
 #, php-format
 msgid "Cannot find XRD for %s."
 msgstr ""
 
 #. TRANS: Exception thrown when an account could not be located when it should be moved.
 #. TRANS: %s is the remote site.
-#: lib/accountmover.php:131
 #, php-format
 msgid "No AtomPub API service for %s."
 msgstr ""
 
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: lib/action.php:161
 #, php-format
 msgid "%1$s - %2$s"
 msgstr "%1$s - %2$s"
 
 #. TRANS: Page title for a page without a title set.
-#: lib/action.php:177
 msgid "Untitled page"
 msgstr "stránka bez názvu"
 
 #. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.
-#: lib/action.php:325
 msgctxt "TOOLTIP"
 msgid "Show more"
 msgstr ""
 
 #. TRANS: Inline reply form submit button: submits a reply comment.
-#: lib/action.php:328
 #, fuzzy
 msgctxt "BUTTON"
-msgid "Comment"
-msgstr "Obsah"
+msgid "Reply"
+msgstr "Odpovědět"
 
 #. TRANS: Placeholder text for inline reply form. Clicking in this box will turn it into a mini notice form.
-#: lib/action.php:331
-msgid "Add a comment..."
+msgid "Write a reply..."
 msgstr ""
 
-#: lib/action.php:559 lib/personalgroupnav.php:99
-#, fuzzy
 msgid "Home"
 msgstr "Moje stránky"
 
-#: lib/action.php:560
 #, fuzzy
 msgid "Friends timeline"
 msgstr "časová osa %s"
 
-#: lib/action.php:566
-#, fuzzy
 msgid "Your profile"
 msgstr "Profil skupiny"
 
-#: lib/action.php:570 lib/action.php:593 lib/publicgroupnav.php:78
 msgid "Public"
 msgstr "Veřejné"
 
-#: lib/action.php:571 lib/action.php:594
 #, fuzzy
 msgid "Everyone on this site"
 msgstr "Najít lidi na této stránce"
 
-#: lib/action.php:575
-#, fuzzy
 msgid "Settings"
 msgstr "nastavení SMS"
 
-#: lib/action.php:576
 #, fuzzy
 msgid "Change your personal settings"
 msgstr "Změňte nastavení profilu"
 
-#: lib/action.php:582
 #, fuzzy
 msgid "Site configuration"
 msgstr "Akce uživatele"
 
-#: lib/action.php:587
-#, fuzzy
 msgid "Logout"
 msgstr "Odhlásit se"
 
-#: lib/action.php:588
 #, fuzzy
 msgid "Logout from the site"
 msgstr "Odhlášení z webu"
 
-#: lib/action.php:599
 #, fuzzy
 msgid "Login to the site"
 msgstr "Přihlásit se na stránky"
 
-#: lib/action.php:606
-#, fuzzy
 msgid "Search"
 msgstr "Hledat"
 
-#: lib/action.php:607
 #, fuzzy
 msgid "Search the site"
 msgstr "Prohledat stránky"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:864
 msgid "Help"
 msgstr "Nápověda"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:867
 msgid "About"
 msgstr "O nás"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:870
 msgid "FAQ"
 msgstr "FAQ"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:875
 msgid "TOS"
 msgstr "TOS (pravidla použití služby)"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:879
 msgid "Privacy"
 msgstr "Soukromí"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:882
 msgid "Source"
 msgstr "Zdroj"
 
 #. TRANS: Secondary navigation menu option leading to e-mail contact information on the
 #. TRANS: StatusNet site, where to report bugs, ...
-#: lib/action.php:889
 msgid "Contact"
 msgstr "Kontakt"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:892
 msgid "Badge"
 msgstr "Odznak"
 
@@ -7432,7 +6134,6 @@ msgstr "Odznak"
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:921
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7442,7 +6143,6 @@ msgstr ""
 "broughtby%%](%%site.broughtbyurl%%)."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:924
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** je služba mikroblogů."
@@ -7451,7 +6151,6 @@ msgstr "**%%site.name%%** je služba mikroblogů."
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:931
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7464,106 +6163,88 @@ msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:949
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr "Obsah a data z %1$S jsou soukromé a důvěrné."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:956
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr "Obsah a data copyright %1$s. Všechna práva vyhrazena."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:960
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr "Obsah a data copyright přispěvatelů. Všechna práva vyhrazena."
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:992
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr "Všechen obsah a data %1$s jsou k dispozici v rámci licence %2$s."
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1335
 msgid "After"
 msgstr "Po"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1345
 msgid "Before"
 msgstr "Před"
 
 #. TRANS: Client exception thrown when a feed instance is a DOMDocument.
-#: lib/activity.php:125
 msgid "Expecting a root feed element but got a whole XML document."
 msgstr "Očekávám kořenový element feedu, ale dostal jsem celý XML dokument."
 
 #. TRANS: Client exception thrown when using an unknown verb for the activity importer.
-#: lib/activityimporter.php:81
 #, fuzzy, php-format
 msgid "Unknown verb: \"%s\"."
 msgstr "Neznámý jazyk \"%s\"."
 
 #. TRANS: Client exception thrown when trying to force a subscription for an untrusted user.
-#: lib/activityimporter.php:107
 msgid "Cannot force subscription for untrusted user."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to for a remote user to subscribe.
-#: lib/activityimporter.php:117
 #, fuzzy
 msgid "Cannot force remote user to subscribe."
 msgstr "Uveďte jméno uživatele ke kterému se přihlásit."
 
 #. TRANS: Client exception thrown when trying to subscribe to an unknown profile.
-#: lib/activityimporter.php:132
 #, fuzzy
 msgid "Unknown profile."
 msgstr "Neznámý typ souboru"
 
 #. TRANS: Client exception thrown when trying to import an event not related to the importing user.
-#: lib/activityimporter.php:138
 msgid "This activity seems unrelated to our user."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to join a remote group that is not a group.
-#: lib/activityimporter.php:154
 msgid "Remote profile is not a group!"
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to join a group the importing user is already a member of.
-#: lib/activityimporter.php:163
 #, fuzzy
 msgid "User is already a member of this group."
 msgstr "Jste již členem této skupiny."
 
 #. TRANS: Client exception thrown when trying to import a notice by another user.
 #. TRANS: %1$s is the source URI of the notice, %2$s is the URI of the author.
-#: lib/activityimporter.php:201
 #, php-format
 msgid "Already know about notice %1$s and  it has a different author %2$s."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to overwrite the author information for a non-trusted user during import.
-#: lib/activityimporter.php:207
 msgid "Not overwriting author info for non-trusted user."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to import a notice without content.
 #. TRANS: %s is the notice URI.
-#: lib/activityimporter.php:223
 #, fuzzy, php-format
 msgid "No content for notice %s."
 msgstr "Najít v obsahu oznámení"
 
-#: lib/activitymover.php:84
 #, fuzzy, php-format
 msgid "No such user %s."
 msgstr "Uživatel neexistuje."
@@ -7574,215 +6255,175 @@ msgstr "Uživatel neexistuje."
 #. TRANS: %1$s is a URL, %2$s is the status, %s$s is the fail reason.
 #. TRANS: Exception thrown when post to collection fails with a status that is not handled.
 #. TRANS: %1$s is a URL, %2$s is the status, %s$s is the fail reason.
-#: lib/activitysink.php:163 lib/activitysink.php:167 lib/activitysink.php:172
 #, fuzzy, php-format
 msgctxt "URLSTATUSREASON"
 msgid "%1$s %2$s %3$s"
 msgstr "%1$s - %2$s"
 
 #. TRANS: Client exception thrown when there is no source attribute.
-#: lib/activityutils.php:200
 msgid "Can't handle remote content yet."
 msgstr "Ještě neumí zpracovat vzdálený obsah."
 
 #. TRANS: Client exception thrown when there embedded XML content is found that cannot be processed yet.
-#: lib/activityutils.php:237
 msgid "Can't handle embedded XML content yet."
 msgstr "Neumí zacházet s vloženým XML obsahem."
 
 #. TRANS: Client exception thrown when base64 encoded content is found that cannot be processed yet.
-#: lib/activityutils.php:242
 msgid "Can't handle embedded Base64 content yet."
 msgstr "Neumí zacházet s vloženým Base64 obsahem."
 
 #. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights.
-#: lib/adminpanelaction.php:96
 msgid "You cannot make changes to this site."
 msgstr "Nemůžete provádět změny na této stránce."
 
 #. TRANS: Client error message throw when a certain panel's settings cannot be changed.
-#: lib/adminpanelaction.php:108
 msgid "Changes to that panel are not allowed."
 msgstr "Změny, tohoto panelu nejsou povoleny."
 
 #. TRANS: Client error message.
-#: lib/adminpanelaction.php:222
 msgid "showForm() not implemented."
 msgstr "showForm () není implementována."
 
 #. TRANS: Client error message
-#: lib/adminpanelaction.php:250
 msgid "saveSettings() not implemented."
 msgstr "saveSettings () není implementována."
 
 #. TRANS: Client error message thrown if design settings could not be deleted in
 #. TRANS: the admin panel Design.
-#: lib/adminpanelaction.php:274
 msgid "Unable to delete design setting."
 msgstr "Nelze smazat nastavení vzhledu."
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:337
 msgid "Basic site configuration"
 msgstr "Základní konfigurace webu"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:339
 msgctxt "MENU"
 msgid "Site"
 msgstr "Stránky"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:345
 msgid "Design configuration"
 msgstr "Nastavení vzhledu"
 
 #. TRANS: Menu item for site administration
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/adminpanelaction.php:347 lib/groupnav.php:135
 msgctxt "MENU"
 msgid "Design"
 msgstr "Vzhled"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:353
 msgid "User configuration"
 msgstr "Akce uživatele"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:110
 msgid "User"
 msgstr "Uživatel"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:361
 msgid "Access configuration"
 msgstr "Nastavení přístupu"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:369
 msgid "Paths configuration"
 msgstr "Naastavení cest"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:377
 msgid "Sessions configuration"
 msgstr "Nastavení sessions"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:385
 msgid "Edit site notice"
 msgstr "Upravit oznámení stránky"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:387
 msgid "Site notice"
 msgstr "Sdělení"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:393
 msgid "Snapshots configuration"
 msgstr "Konfigurace snímků"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:401
 msgid "Set site license"
 msgstr ""
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:409
 #, fuzzy
 msgid "Plugins configuration"
 msgstr "Naastavení cest"
 
 #. TRANS: Client error 401.
-#: lib/apiauth.php:111
 msgid "API resource requires read-write access, but you only have read access."
 msgstr ""
 "API droj vyžaduje přístup pro čtení a zápis, ale vy máte přístup pouze pro "
 "čtení."
 
 #. TRANS: OAuth exception thrown when no application is found for a given consumer key.
-#: lib/apiauth.php:177
 msgid "No application for that consumer key."
 msgstr ""
 
-#: lib/apiauth.php:202 lib/apiauth.php:284
 msgid "Not allowed to use API."
 msgstr ""
 
 #. TRANS: OAuth exception given when an incorrect access token was given for a user.
-#: lib/apiauth.php:225
 msgid "Bad access token."
 msgstr ""
 
 #. TRANS: OAuth exception given when no user was found for a given token (no token was found).
-#: lib/apiauth.php:230
 msgid "No user for that token."
 msgstr ""
 
 #. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel".
 #. TRANS: Client error thrown when authentication fails.
-#: lib/apiauth.php:272 lib/apiauth.php:302
 msgid "Could not authenticate you."
 msgstr ""
 
 #. TRANS: Server error displayed when trying to create an anynymous OAuth consumer.
-#: lib/apioauthstore.php:45
 #, fuzzy
 msgid "Could not create anonymous consumer."
 msgstr "Nelze vytvořit aliasy."
 
 #. TRANS: Server error displayed when trying to create an anynymous OAuth application.
-#: lib/apioauthstore.php:69
 #, fuzzy
 msgid "Could not create anonymous OAuth application."
 msgstr "Nelze vytvořit aplikaci."
 
 #. TRANS: Exception thrown when no token association could be found.
-#: lib/apioauthstore.php:151
 msgid ""
 "Could not find a profile and application associated with the request token."
 msgstr ""
 
 #. TRANS: Exception thrown when no access token can be issued.
-#: lib/apioauthstore.php:209
 #, fuzzy
 msgid "Could not issue access token."
 msgstr "Nemohu vložit zprávu."
 
-#: lib/apioauthstore.php:317
 msgid "Database error inserting OAuth application user."
 msgstr "Chyba databáze při vkládání uživatele aplikace OAuth."
 
-#: lib/apioauthstore.php:345
 #, fuzzy
 msgid "Database error updating OAuth application user."
 msgstr "Chyba databáze při vkládání uživatele aplikace OAuth."
 
 #. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
-#: lib/apioauthstore.php:371
 msgid "Tried to revoke unknown token."
 msgstr ""
 
 #. TRANS: Exception thrown when an attempt is made to remove a revoked token.
-#: lib/apioauthstore.php:376
 msgid "Failed to delete revoked token."
 msgstr ""
 
 #. TRANS: Form input field label for application icon.
-#: lib/applicationeditform.php:177
 msgid "Icon"
 msgstr "Ikona"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:182
 msgid "Icon for this application"
 msgstr "Ikona pro tuto aplikaci"
 
 #. TRANS: Form input field instructions.
 #. TRANS: %d is the number of available characters for the description.
-#: lib/applicationeditform.php:201
 #, fuzzy, php-format
 msgid "Describe your application in %d character"
 msgid_plural "Describe your application in %d characters"
@@ -7791,209 +6432,170 @@ msgstr[1] "Popište vaši aplikaci v %d znacích"
 msgstr[2] "Popište vaši aplikaci v %d znacích"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:205
 msgid "Describe your application"
 msgstr "Popište vaši aplikaci"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:216
 msgid "URL of the homepage of this application"
 msgstr "URL domovské stránky této aplikace"
 
 #. TRANS: Form input field label.
-#: lib/applicationeditform.php:218
 msgid "Source URL"
 msgstr "Zdrojové URL"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:225
 msgid "Organization responsible for this application"
 msgstr "Organizace odpovědná za tuto aplikaci"
 
 #. TRANS: Form input field label.
-#: lib/applicationeditform.php:227
 msgid "Organization"
 msgstr "Organizace"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:234
 msgid "URL for the homepage of the organization"
 msgstr "URL homepage organizace"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:243
 msgid "URL to redirect to after authentication"
 msgstr "URL pro přesměrování po autentikaci"
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:271
 msgid "Browser"
 msgstr "Prohlížeč"
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:288
 msgid "Desktop"
 msgstr "Desktop"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:290
 msgid "Type of application, browser or desktop"
 msgstr "Typ aplikace, prohlížeč nebo desktop"
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:314
 msgid "Read-only"
 msgstr "pouze pro čtení"
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:334
 msgid "Read-write"
 msgstr "čtení a zápis"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:336
 msgid "Default access for this application: read-only, or read-write"
 msgstr "Výchozí přístup pro tuto aplikaci: pouze pro čtení, nebo číst-psát"
 
 #. TRANS: Submit button title.
-#: lib/applicationeditform.php:353
 msgid "Cancel"
 msgstr "Zrušit"
 
-#: lib/applicationlist.php:247
 msgid " by "
 msgstr ""
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:260
 msgid "read-write"
 msgstr "číst-psát"
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:262
 msgid "read-only"
 msgstr "pouze pro čtení"
 
 #. TRANS: Used in application list. %1$s is a modified date, %2$s is access type ("read-write" or "read-only")
-#: lib/applicationlist.php:268
 #, php-format
 msgid "Approved %1$s - \"%2$s\" access."
 msgstr "Schváleno %1$s - přístup \"%2$s\""
 
 #. TRANS: Access token in the application list.
 #. TRANS: %s are the first 7 characters of the access token.
-#: lib/applicationlist.php:282
 #, php-format
 msgid "Access token starting with: %s"
 msgstr ""
 
 #. TRANS: Button label
-#: lib/applicationlist.php:298
 msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "Obnovit"
 
-#: lib/atom10feed.php:113
 msgid "Author element must contain a name element."
 msgstr ""
 
 #. TRANS: Server exception thrown when using the method setActivitySubject() in the class Atom10Feed.
-#: lib/atom10feed.php:160
 #, fuzzy
 msgid "Do not use this method!"
 msgstr "Neodstraňujte toto oznámení"
 
 #. TRANS: Title.
-#: lib/attachmentnoticesection.php:67
 msgid "Notices where this attachment appears"
 msgstr "Notices where this attachment appears"
 
 #. TRANS: Title.
-#: lib/attachmenttagcloudsection.php:48
 msgid "Tags for this attachment"
 msgstr "Označení této přílohy"
 
 #. TRANS: Exception thrown when a password change fails.
-#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:227
 #, fuzzy
 msgid "Password changing failed."
 msgstr "Změna hesla se nezdařila"
 
 #. TRANS: Exception thrown when a password change attempt fails because it is not allowed.
-#: lib/authenticationplugin.php:238
 #, fuzzy
 msgid "Password changing is not allowed."
 msgstr "Změna hesla není povolena"
 
 #. TRANS: Title for the form to block a user.
-#: lib/blockform.php:68
 msgid "Block"
 msgstr "Blokovat"
 
 #. TRANS: Description of the form to block a user.
-#: lib/blockform.php:79
 msgid "Block this user"
 msgstr "Zablokovat tohoto uživatele"
 
 #. TRANS: Title for command results.
-#: lib/channel.php:104 lib/channel.php:125
 msgid "Command results"
 msgstr "Výsledky příkazu"
 
 #. TRANS: Title for command results.
-#: lib/channel.php:138
 #, fuzzy
 msgid "AJAX error"
 msgstr "Ajax Chyba"
 
 #. TRANS: E-mail subject when a command has completed.
-#: lib/channel.php:177 lib/mailhandler.php:143
 msgid "Command complete"
 msgstr "Příkaz dokončen"
 
 #. TRANS: E-mail subject when a command has failed.
-#: lib/channel.php:188
 msgid "Command failed"
 msgstr "Příkaz selhal"
 
 #. TRANS: Command exception text shown when a notice ID is requested that does not exist.
-#: lib/command.php:82 lib/command.php:106
 msgid "Notice with that id does not exist."
 msgstr "Oznámení s tímto id neexistuje."
 
 #. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
 #. TRANS: Error text shown when a last user notice is requested and it does not exist.
-#: lib/command.php:99 lib/command.php:642
 msgid "User has no last notice."
 msgstr "Uživatel nemá žádné poslední oznámení"
 
 #. TRANS: Message given requesting a profile for a non-existing user.
 #. TRANS: %s is the nickname of the user for which the profile could not be found.
-#: lib/command.php:128
 #, php-format
 msgid "Could not find a user with nickname %s."
 msgstr "Nelze nalézt uživatele s přezdívkou %s"
 
 #. TRANS: Message given getting a non-existing user.
 #. TRANS: %s is the nickname of the user that could not be found.
-#: lib/command.php:148
 #, php-format
 msgid "Could not find a local user with nickname %s."
 msgstr "Nelze nalézt místního uživatele s přezdívkou %s"
 
 #. TRANS: Error text shown when an unimplemented command is given.
-#: lib/command.php:183
 msgid "Sorry, this command is not yet implemented."
 msgstr "Je nám líto, ale tento příkaz dosud nebyl implementován."
 
 #. TRANS: Command exception text shown when a user tries to nudge themselves.
-#: lib/command.php:229
 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr "To nemá moc smyslu postrkovat sám sebe!"
 
 #. TRANS: Message given having nudged another user.
 #. TRANS: %s is the nickname of the user that was nudged.
-#: lib/command.php:238
 #, php-format
 msgid "Nudge sent to %s."
 msgstr "Šťouchnutí posláno %s."
@@ -8002,7 +6604,6 @@ msgstr "Šťouchnutí posláno %s."
 #. TRANS: %1$s is the number of other user the user is subscribed to.
 #. TRANS: %2$s is the number of users that are subscribed to the user.
 #. TRANS: %3$s is the number of notices the user has sent.
-#: lib/command.php:268
 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"
@@ -8014,40 +6615,34 @@ msgstr ""
 "Hlášky: %3$s"
 
 #. TRANS: Error message text shown when a favorite could not be set because it has already been favorited.
-#: lib/command.php:298
 #, fuzzy
 msgid "Could not create favorite: already favorited."
 msgstr "Nelze vytvořit oblíbenou položku."
 
 #. TRANS: Text shown when a notice has been marked as favourite successfully.
-#: lib/command.php:324
 msgid "Notice marked as fave."
 msgstr "Oznámení označené jako oblíbené."
 
 #. TRANS: Message given having added a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:369
 #, php-format
 msgid "%1$s joined group %2$s."
 msgstr "%1$s se připojil(a) ke skupině %2$s."
 
 #. TRANS: Message given having removed a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:417
 #, php-format
 msgid "%1$s left group %2$s."
 msgstr "%1$s opustil(a) skupinu %2$s."
 
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: lib/command.php:438
 #, fuzzy, php-format
 msgctxt "WHOIS"
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
 
 #. TRANS: Whois output. %s is the full name of the queried user.
-#: lib/command.php:442
 #, php-format
 msgid "Fullname: %s"
 msgstr "Celé jméno %s"
@@ -8055,7 +6650,6 @@ msgstr "Celé jméno %s"
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a location.
-#: lib/command.php:446 lib/mail.php:275
 #, php-format
 msgid "Location: %s"
 msgstr "Poloha: %s"
@@ -8063,20 +6657,17 @@ msgstr "Poloha: %s"
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a homepage.
-#: lib/command.php:450 lib/mail.php:279
 #, php-format
 msgid "Homepage: %s"
 msgstr "Domovská stránka: %s"
 
 #. TRANS: Whois output. %s is the bio information of the queried user.
-#: lib/command.php:454
 #, php-format
 msgid "About: %s"
 msgstr "O uživateli: %s"
 
 #. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).
 #. TRANS: %s is a remote profile.
-#: lib/command.php:483
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
@@ -8087,7 +6678,6 @@ msgstr ""
 
 #. TRANS: Message given if content is too long. %1$sd is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:500
 #, fuzzy, php-format
 msgid "Message too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
@@ -8095,26 +6685,27 @@ msgstr[0] "Zpráva je příliš dlouhá - maximum je %1$d znaků, poslal jsi %2$
 msgstr[1] "Zpráva je příliš dlouhá - maximum je %1$d znaků, poslal jsi %2$d."
 msgstr[2] "Zpráva je příliš dlouhá - maximum je %1$d znaků, poslal jsi %2$d."
 
+#. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
+msgid "You can't send a message to this user."
+msgstr ""
+"Nemůžete odesílat zprávy tomuto uživateli. (musíte být vzájemně prihlášení)"
+
 #. TRANS: Error text shown sending a direct message fails with an unknown reason.
-#: lib/command.php:528
 msgid "Error sending direct message."
 msgstr "Chyba při odesílání přímé zprávy."
 
 #. TRANS: Message given having repeated a notice from another user.
 #. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:565
 #, php-format
 msgid "Notice from %s repeated."
 msgstr "Oznámení od %s opakováno."
 
 #. TRANS: Error text shown when repeating a notice fails with an unknown reason.
-#: lib/command.php:568
 msgid "Error repeating notice."
 msgstr "Chyba nastavení uživatele"
 
 #. TRANS: Message given if content of a notice for a reply is too long. %1$d is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:603
 #, fuzzy, php-format
 msgid "Notice too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Notice too long - maximum is %1$d characters, you sent %2$d."
@@ -8124,100 +6715,83 @@ msgstr[2] "Oznámení je příliš dlouhé - maximum je %1$d znaků, poslal jsi
 
 #. TRANS: Text shown having sent a reply to a notice successfully.
 #. TRANS: %s is the nickname of the user of the notice the reply was sent to.
-#: lib/command.php:616
 #, php-format
 msgid "Reply to %s sent."
 msgstr "Odpověď %s odeslána."
 
 #. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
-#: lib/command.php:619
 msgid "Error saving notice."
 msgstr "Problém při ukládání sdělení."
 
 #. TRANS: Error text shown when no username was provided when issuing a subscribe command.
-#: lib/command.php:666
 msgid "Specify the name of the user to subscribe to."
 msgstr "Uveďte jméno uživatele ke kterému se přihlásit."
 
 #. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
-#: lib/command.php:675
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "Nelze se přihlásit k odběru OMB profilů příkazem."
 
 #. TRANS: Text shown after having subscribed to another user successfully.
 #. TRANS: %s is the name of the user the subscription was requested for.
-#: lib/command.php:683
 #, php-format
 msgid "Subscribed to %s."
 msgstr "Přihlášeno k %s."
 
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.
-#: lib/command.php:704 lib/command.php:815
 msgid "Specify the name of the user to unsubscribe from."
 msgstr "Uveďte jméno uživatele od kterého se odhlásit."
 
 #. TRANS: Text shown after having unsubscribed from another user successfully.
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:715
 #, php-format
 msgid "Unsubscribed from %s."
 msgstr "Odhlášeno od %s."
 
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
-#: lib/command.php:735 lib/command.php:761
 msgid "Command not yet implemented."
 msgstr "Příkaz ještě nebyl implementován."
 
 #. TRANS: Text shown when issuing the command "off" successfully.
-#: lib/command.php:739
 msgid "Notification off."
 msgstr "Oznámení vypnuta."
 
 #. TRANS: Error text shown when the command "off" fails for an unknown reason.
-#: lib/command.php:742
 msgid "Can't turn off notification."
 msgstr "Nelze vypnout oznámení."
 
 #. TRANS: Text shown when issuing the command "on" successfully.
-#: lib/command.php:765
 msgid "Notification on."
 msgstr "Oznámení zapnuta."
 
 #. TRANS: Error text shown when the command "on" fails for an unknown reason.
-#: lib/command.php:768
 msgid "Can't turn on notification."
 msgstr "Nelze zapnout oznámení."
 
 #. TRANS: Error text shown when issuing the login command while login is disabled.
-#: lib/command.php:782
 msgid "Login command is disabled."
 msgstr "Příkaz login je vypnut."
 
 #. TRANS: Text shown after issuing the login command successfully.
 #. TRANS: %s is a logon link..
-#: lib/command.php:795
 #, php-format
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr "Tento odkaz je použitelný pouze jednou a je platný pouze 2 minuty: %s."
 
 #. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:824
 #, php-format
 msgid "Unsubscribed %s."
 msgstr "%s odhlášen."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
-#: lib/command.php:842
 msgid "You are not subscribed to anyone."
 msgstr "Nejste přihlášen k nikomu."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
-#: lib/command.php:847
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Jste přihlášeni k této osobě:"
@@ -8226,14 +6800,12 @@ msgstr[2] "Jste přihlášeni k těmto lidem:"
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user
 #. TRANS: (followers) without having any subscribers.
-#: lib/command.php:869
 msgid "No one is subscribed to you."
 msgstr "Nikdo k vám není přihlášen."
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
-#: lib/command.php:874
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Tato osoba je k vám přihlášena:"
@@ -8242,14 +6814,12 @@ msgstr[2] "Tito lidé jsou k vám přihlášeni:"
 
 #. TRANS: Text shown after requesting groups a user is subscribed to without having
 #. TRANS: any group subscriptions.
-#: lib/command.php:896
 msgid "You are not a member of any groups."
 msgstr "Nejste členem žádné skupiny."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
-#: lib/command.php:901
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "Jste členem této skupiny:"
@@ -8257,7 +6827,6 @@ msgstr[1] "Jste členem těchto skupin:"
 msgstr[2] ""
 
 #. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-#: lib/command.php:916
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -8338,71 +6907,58 @@ msgstr ""
 "tracking - Dosud neimplementován.\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:36
 #, fuzzy
 msgid "No configuration file found."
 msgstr "Žádný konfigurační soubor nalezen. "
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:39
 #, fuzzy
 msgid "I looked for configuration files in the following places:"
 msgstr "Díval jsem se po konfiguračních souborech na těchto místech: "
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:42
 msgid "You may wish to run the installer to fix this."
 msgstr "Možná budete chtít spustit instalační program abyste to vyřešili."
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:46
 msgid "Go to the installer."
 msgstr "Jdi na instalaci."
 
-#: lib/dberroraction.php:59
 msgid "Database error"
 msgstr "Chyba databáze"
 
 #. TRANS: Description of form for deleting a user.
-#: lib/deleteuserform.php:75
 msgid "Delete this user"
 msgstr "Odstranit tohoto uživatele"
 
-#: lib/designform.php:114
 #, fuzzy
 msgid "Change design"
 msgstr "Uložit vzhled"
 
 #. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: lib/designform.php:131
 msgid "Change colours"
 msgstr "Změnit barvy"
 
 #. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: lib/designform.php:138
 msgid "Use defaults"
 msgstr "Použít výchozí"
 
 #. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: lib/designform.php:140
 msgid "Restore default designs"
 msgstr "Obnovit výchozí vzhledy"
 
 #. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: lib/designform.php:148
 msgid "Reset back to default"
 msgstr "Reset zpět do výchozího"
 
 #. TRANS: Label in form on profile design page.
 #. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
-#: lib/designform.php:158
 msgid "Upload file"
 msgstr "Nahrát soubor"
 
 #. TRANS: Instructions for form on profile design page.
-#: lib/designform.php:163
 #, fuzzy
 msgid ""
 "You can upload your personal background image. The maximum file size is 2Mb."
@@ -8411,49 +6967,41 @@ msgstr ""
 "MB."
 
 #. TRANS: Radio button on profile design page that will enable use of the uploaded profile image.
-#: lib/designform.php:194
 #, fuzzy
 msgctxt "RADIO"
 msgid "On"
 msgstr "zap."
 
 #. TRANS: Radio button on profile design page that will disable use of the uploaded profile image.
-#: lib/designform.php:211
 #, fuzzy
 msgctxt "RADIO"
 msgid "Off"
 msgstr "vyp."
 
 #. TRANS: Title for button on profile design page to save settings.
-#: lib/designform.php:322
 msgid "Save design"
 msgstr "Uložit vzhled"
 
 #. TRANS: Error message displayed if design settings could not be saved.
 #. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
-#: lib/designsettings.php:216 lib/designsettings.php:238
 msgid "Couldn't update your design."
 msgstr "Nelze uložit vzhled."
 
 #. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
-#: lib/designsettings.php:244
 msgid "Design defaults restored."
 msgstr "Obnoveno výchozí nastavení vzhledu."
 
 #. TRANS: Exception. %s is an ID.
-#: lib/discovery.php:153
 #, fuzzy, php-format
 msgid "Unable to find services for %s."
 msgstr "Nelze zrušit přístup aplikace %s."
 
 #. TRANS: Form legend for removing the favourite status for a favourite notice.
 #. TRANS: Title for button text for removing the favourite status for a favourite notice.
-#: lib/disfavorform.php:108 lib/disfavorform.php:140
 msgid "Disfavor this notice"
 msgstr "Odebrat toto oznámení z oblíbených"
 
 #. TRANS: Button text for removing the favourite status for a favourite notice.
-#: lib/disfavorform.php:136
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Disfavor favorite"
@@ -8461,90 +7009,70 @@ msgstr "Znemilostnit oblíbenou"
 
 #. TRANS: Form legend for adding the favourite status to a notice.
 #. TRANS: Title for button text for adding the favourite status to a notice.
-#: lib/favorform.php:108 lib/favorform.php:139
 msgid "Favor this notice"
 msgstr "Přidat toto oznámení do oblíbených"
 
 #. TRANS: Button text for adding the favourite status to a notice.
-#: lib/favorform.php:135
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Favor"
 msgstr "Oblíbit"
 
-#: lib/feed.php:84
 msgid "RSS 1.0"
 msgstr "RSS 1.0"
 
-#: lib/feed.php:86
 msgid "RSS 2.0"
 msgstr "RSS 2.0"
 
-#: lib/feed.php:88
 msgid "Atom"
 msgstr "Atom"
 
-#: lib/feed.php:90
 msgid "FOAF"
 msgstr "FOAF"
 
-#: lib/feedimporter.php:75
 #, fuzzy
 msgid "Not an atom feed."
 msgstr "Všichni členové"
 
-#: lib/feedimporter.php:82
 msgid "No author in the feed."
 msgstr ""
 
-#: lib/feedimporter.php:89
 msgid "Can't import without a user."
 msgstr ""
 
 #. TRANS: Header for feed links (h2).
-#: lib/feedlist.php:66
 msgid "Feeds"
 msgstr ""
 
-#: lib/galleryaction.php:128
 msgid "All"
 msgstr "Všechny"
 
-#: lib/galleryaction.php:136
 msgid "Select tag to filter"
 msgstr "Zvolte značku k filtrování"
 
-#: lib/galleryaction.php:137
 msgid "Tag"
 msgstr "Značka"
 
-#: lib/galleryaction.php:138
 msgid "Choose a tag to narrow list"
 msgstr "Vyberte si značku k zúžení seznamu"
 
-#: lib/galleryaction.php:140
 msgid "Go"
 msgstr "Jdi"
 
-#: lib/grantroleform.php:91
 #, php-format
 msgid "Grant this user the \"%s\" role"
 msgstr "Dát tomuto uživateli roli \"%s\""
 
-#: lib/groupeditform.php:147
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "1-64 znaků nebo čísel, bez teček, čárek a mezer"
 
-#: lib/groupeditform.php:156
 #, fuzzy
 msgid "URL of the homepage or blog of the group or topic."
 msgstr "URL domovské stránky nebo blogu skupiny nebo tématu"
 
-#: lib/groupeditform.php:161
 msgid "Describe the group or topic"
 msgstr "Popište skupinu nebo téma"
 
-#: lib/groupeditform.php:163
 #, fuzzy, php-format
 msgid "Describe the group or topic in %d character or less"
 msgid_plural "Describe the group or topic in %d characters or less"
@@ -8552,7 +7080,6 @@ msgstr[0] "Popište skupinu nebo téma ve %d znacích"
 msgstr[1] "Popište skupinu nebo téma ve %d znacích"
 msgstr[2] "Popište skupinu nebo téma ve %d znacích"
 
-#: lib/groupeditform.php:175
 #, fuzzy
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\"."
@@ -8560,7 +7087,6 @@ msgstr ""
 "Umístění skupiny, pokud je nějaké, ve stylu \"město, stát (nebo region), země"
 "\""
 
-#: lib/groupeditform.php:183
 #, fuzzy, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -8573,70 +7099,60 @@ msgstr[1] "Další přezdívky pro skupinu, oddělené čárkou nebo mezerou, ma
 msgstr[2] "Další přezdívky pro skupinu, oddělené čárkou nebo mezerou, max %d"
 
 #. TRANS: Menu item in the group navigation page.
-#: lib/groupnav.php:86
 msgctxt "MENU"
 msgid "Group"
 msgstr ""
 
 #. TRANS: Tooltip for menu item in the group navigation page.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:89
 #, php-format
 msgctxt "TOOLTIP"
 msgid "%s group"
 msgstr ""
 
 #. TRANS: Menu item in the group navigation page.
-#: lib/groupnav.php:95
 msgctxt "MENU"
 msgid "Members"
 msgstr ""
 
 #. TRANS: Tooltip for menu item in the group navigation page.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:98
 #, php-format
 msgctxt "TOOLTIP"
 msgid "%s group members"
 msgstr ""
 
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/groupnav.php:108
 msgctxt "MENU"
 msgid "Blocked"
 msgstr ""
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:111
 #, php-format
 msgctxt "TOOLTIP"
 msgid "%s blocked users"
 msgstr ""
 
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "Admin"
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:120
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Edit %s group properties"
 msgstr ""
 
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/groupnav.php:126
 msgctxt "MENU"
 msgid "Logo"
 msgstr ""
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:129
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Add or edit %s logo"
@@ -8644,69 +7160,57 @@ msgstr ""
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:138
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Add or edit %s design"
 msgstr ""
 
 #. TRANS: Title for groups with the most members section.
-#: lib/groupsbymemberssection.php:71
 msgid "Groups with most members"
 msgstr "Skupiny s nejvíce členy"
 
 #. TRANS: Title for groups with the most posts section.
-#: lib/groupsbypostssection.php:71
 msgid "Groups with most posts"
 msgstr "Skupiny s nejvíce příspěvky"
 
 #. TRANS: Title for group tag cloud section.
 #. TRANS: %s is a group name.
-#: lib/grouptagcloudsection.php:57
 #, php-format
 msgid "Tags in %s group's notices"
 msgstr "Značky v oznámeních skupiny %s"
 
 #. TRANS: Client exception 406
-#: lib/htmloutputter.php:104
 msgid "This page is not available in a media type you accept"
 msgstr "Tato stránka není k dispozici v typu média která přijímáte."
 
 #. TRANS: Exception thrown when trying to upload an unsupported image file format.
-#: lib/imagefile.php:73
 msgid "Unsupported image file format."
 msgstr "Nepodporovaný formát obrázku."
 
 #. TRANS: Exception thrown when too large a file is uploaded.
 #. TRANS: %s is the maximum file size, for example "500b", "10kB" or "2MB".
-#: lib/imagefile.php:91
 #, php-format
 msgid "That file is too big. The maximum file size is %s."
 msgstr "Ten soubor je příliš velký. Maximální velikost souboru je %s."
 
 #. TRANS: Exception thrown when uploading an image and that action could not be completed.
-#: lib/imagefile.php:97
 msgid "Partial upload."
 msgstr "Částečné náhrání."
 
 #. TRANS: Exception thrown when uploading a file as image that is not an image or is a corrupt file.
-#: lib/imagefile.php:115
 msgid "Not an image or corrupt file."
 msgstr "Není obrázkem, nebo jde o poškozený soubor."
 
 #. TRANS: Exception thrown during resize when image has been registered as present, but is no longer there.
-#: lib/imagefile.php:178
 msgid "Lost our file."
 msgstr "Ztratili jsme náš soubor."
 
 #. TRANS: Exception thrown when trying to resize an unknown file type.
 #. TRANS: Exception thrown when trying resize an unknown file type.
-#: lib/imagefile.php:216 lib/imagefile.php:257
 msgid "Unknown file type"
 msgstr "Neznámý typ souboru"
 
 #. TRANS: Number of megabytes. %d is the number.
-#: lib/imagefile.php:303
 #, fuzzy, php-format
 msgid "%dMB"
 msgid_plural "%dMB"
@@ -8715,7 +7219,6 @@ msgstr[1] "MB"
 msgstr[2] "MB"
 
 #. TRANS: Number of kilobytes. %d is the number.
-#: lib/imagefile.php:307
 #, fuzzy, php-format
 msgid "%dkB"
 msgid_plural "%dkB"
@@ -8724,7 +7227,6 @@ msgstr[1] "kB"
 msgstr[2] "kB"
 
 #. TRANS: Number of bytes. %d is the number.
-#: lib/imagefile.php:310
 #, php-format
 msgid "%dB"
 msgid_plural "%dB"
@@ -8732,7 +7234,6 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: lib/implugin.php:262
 #, php-format
 msgid ""
 "User \"%s\" on %s has said that your %s screenname belongs to them. If "
@@ -8742,51 +7243,42 @@ msgid ""
 "message."
 msgstr ""
 
-#: lib/implugin.php:349
 #, php-format
 msgid "Unknown inbox source %d."
 msgstr "Neznámý zdroj inboxu %d."
 
-#: lib/implugin.php:485
-#, fuzzy, php-format
+#, php-format
 msgid "Message too long - maximum is %1$d characters, you sent %2$d."
 msgstr "Zpráva je příliš dlouhá - maximum je %1$d znaků, poslal jsi %2$d."
 
-#: lib/leaveform.php:114
 msgid "Leave"
 msgstr "Opustit"
 
 #. TRANS: Menu item for logging in to the StatusNet site.
-#: lib/logingroupnav.php:77
 msgctxt "MENU"
 msgid "Login"
 msgstr "Přihlásit"
 
 #. TRANS: Title for menu item for logging in to the StatusNet site.
-#: lib/logingroupnav.php:79
 msgid "Login with a username and password"
 msgstr "Přihlásit se pomocí svého uživatelského jména a hesla."
 
 #. TRANS: Menu item for registering with the StatusNet site.
-#: lib/logingroupnav.php:85
 msgctxt "MENU"
 msgid "Register"
 msgstr "Registrovat"
 
 #. TRANS: Title for menu item for registering with the StatusNet site.
-#: lib/logingroupnav.php:87
 msgid "Sign up for a new account"
 msgstr "Vytvořit nový účet"
 
 #. TRANS: Subject for address confirmation email.
-#: lib/mail.php:172
 msgid "Email address confirmation"
 msgstr "Potvrzení emailové adresy"
 
 #. TRANS: Body for address confirmation email.
 #. TRANS: %1$s is the addressed user's nickname, %2$s is the StatusNet sitename,
 #. TRANS: %3$s is the URL to confirm at.
-#: lib/mail.php:177
 #, fuzzy, php-format
 msgid ""
 "Hey, %1$s.\n"
@@ -8818,14 +7310,12 @@ msgstr ""
 
 #. TRANS: Subject of new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
-#: lib/mail.php:243
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1$s od teď naslouchá tvým sdělením na %2$s."
 
 #. TRANS: This is a paragraph in a new-subscriber e-mail.
 #. TRANS: %s is a URL where the subscriber can be reported as abusive.
-#: lib/mail.php:250
 #, php-format
 msgid ""
 "If you believe this account is being used abusively, you can block them from "
@@ -8839,7 +7329,6 @@ msgstr ""
 #. TRANS: %3$s is the subscriber's profile URL, %4$s is the subscriber's location (or empty)
 #. TRANS: %5$s is the subscriber's homepage URL (or empty), %6%s is the subscriber's bio (or empty)
 #. TRANS: %7$s is a link to the addressed user's e-mail settings.
-#: lib/mail.php:260
 #, fuzzy, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -8866,14 +7355,12 @@ msgstr ""
 
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is biographical information.
-#: lib/mail.php:283
 #, php-format
 msgid "Bio: %s"
 msgstr "O: %s"
 
 #. TRANS: Subject of notification mail for new posting email address.
 #. TRANS: %s is the StatusNet sitename.
-#: lib/mail.php:312
 #, php-format
 msgid "New email address for posting to %s"
 msgstr "Nová e-mailová adresa pro psaní na %s"
@@ -8881,7 +7368,6 @@ msgstr "Nová e-mailová adresa pro psaní na %s"
 #. TRANS: Body of notification mail for new posting email address.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is the e-mail address to send
 #. TRANS: to to post by e-mail, %3$s is a URL to more instructions.
-#: lib/mail.php:318
 #, fuzzy, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -8904,26 +7390,22 @@ msgstr ""
 
 #. TRANS: Subject line for SMS-by-email notification messages.
 #. TRANS: %s is the posting user's nickname.
-#: lib/mail.php:439
 #, php-format
 msgid "%s status"
 msgstr "status %s"
 
 #. TRANS: Subject line for SMS-by-email address confirmation message.
-#: lib/mail.php:465
 msgid "SMS confirmation"
 msgstr "SMS potvrzení"
 
 #. TRANS: Main body heading for SMS-by-email address confirmation message.
 #. TRANS: %s is the addressed user's nickname.
-#: lib/mail.php:469
 #, php-format
 msgid "%s: confirm you own this phone number with this code:"
 msgstr "%s: potvrďte že vlastníte toto telefonní číslo tímto kódem:"
 
 #. TRANS: Subject for 'nudge' notification email.
 #. TRANS: %s is the nudging user.
-#: lib/mail.php:490
 #, fuzzy, php-format
 msgid "You have been nudged by %s"
 msgstr "%s Vás pošťouchl"
@@ -8931,7 +7413,6 @@ msgstr "%s Vás pošťouchl"
 #. TRANS: Body for 'nudge' notification email.
 #. TRANS: %1$s is the nuding user's long name, $2$s is the nudging user's nickname,
 #. TRANS: %3$s is a URL to post notices at, %4$s is the StatusNet sitename.
-#: lib/mail.php:497
 #, php-format
 msgid ""
 "%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -8960,7 +7441,6 @@ msgstr ""
 
 #. TRANS: Subject for direct-message notification email.
 #. TRANS: %s is the sending user's nickname.
-#: lib/mail.php:544
 #, php-format
 msgid "New private message from %s"
 msgstr "Nová soukromá zpráva od %s"
@@ -8969,7 +7449,6 @@ msgstr "Nová soukromá zpráva od %s"
 #. TRANS: %1$s is the sending user's long name, %2$s is the sending user's nickname,
 #. TRANS: %3$s is the message content, %4$s a URL to the message,
 #. TRANS: %5$s is the StatusNet sitename.
-#: lib/mail.php:552
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -9004,7 +7483,6 @@ msgstr ""
 
 #. TRANS: Subject for favorite notification e-mail.
 #. TRANS: %1$s is the adding user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:604
 #, fuzzy, php-format
 msgid "%1$s (@%2$s) added your notice as a favorite"
 msgstr "%s (@%s) přidal vaše oznámení jako oblíbené"
@@ -9014,7 +7492,6 @@ msgstr "%s (@%s) přidal vaše oznámení jako oblíbené"
 #. TRANS: %3$s is a URL to the faved notice, %4$s is the faved notice text,
 #. TRANS: %5$s is a URL to all faves of the adding user, %6$s is the StatusNet sitename,
 #. TRANS: %7$s is the adding user's nickname.
-#: lib/mail.php:611
 #, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -9053,7 +7530,6 @@ msgstr ""
 " %6$s \n"
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:669
 #, php-format
 msgid ""
 "The full conversation can be read here:\n"
@@ -9066,7 +7542,6 @@ msgstr ""
 
 #. TRANS: E-mail subject for notice notification.
 #. TRANS: %1$s is the sending user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:677
 #, fuzzy, php-format
 msgid "%1$s (@%2$s) sent a notice to your attention"
 msgstr "%s (@%s) poslal oznámení žádající o vaši pozornost"
@@ -9077,7 +7552,6 @@ msgstr "%s (@%s) poslal oznámení žádající o vaši pozornost"
 #. TRANS: %5$s is a URL to the full conversion if it exists (otherwise empty),
 #. TRANS: %6$s is a URL to reply to the notice, %7$s is a URL to all @-replied for the addressed user,
 #. TRANS: %8$s is a URL to the addressed user's e-mail settings, %9$s is the sender's nickname.
-#: lib/mail.php:685
 #, php-format
 msgid ""
 "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -9127,11 +7601,9 @@ msgstr ""
 "\n"
 "P.S. Tato upozornění můžete vypnout zde: %8$s\n"
 
-#: lib/mailbox.php:87
 msgid "Only the user can read their own mailboxes."
 msgstr "Pouze uživatel může přečíst své vlastní schránky."
 
-#: lib/mailbox.php:125
 msgid ""
 "You have no private messages. You can send private message to engage other "
 "users in conversation. People can send you messages for your eyes only."
@@ -9140,53 +7612,43 @@ msgstr ""
 "zapojili ostatní uživatelé v rozhovoru. Lidé mohou posílat zprávy jen pro "
 "vaše oči."
 
-#: lib/mailhandler.php:37
 msgid "Could not parse message."
 msgstr "Nelze zpracovat zprávu."
 
-#: lib/mailhandler.php:42
 msgid "Not a registered user."
 msgstr "Není registrovaný uživatel."
 
-#: lib/mailhandler.php:46
 msgid "Sorry, that is not your incoming email address."
 msgstr "Je nám líto, toto není vaše příchozí e-mailová adresa."
 
-#: lib/mailhandler.php:50
 msgid "Sorry, no incoming email allowed."
 msgstr "Je nám líto, žádný příchozí e-mail není dovolen."
 
-#: lib/mailhandler.php:229
 #, php-format
 msgid "Unsupported message type: %s"
 msgstr "Nepodporovaný typ zprávy: %s"
 
 #. TRANS: Client exception thrown when a database error was thrown during a file upload operation.
-#: lib/mediafile.php:102 lib/mediafile.php:174
 msgid "There was a database error while saving your file. Please try again."
 msgstr "Nastala chyba v databázi při ukládání souboru. Prosím zkuste to znovu."
 
 #. TRANS: Client exception thrown when a file upload operation would cause a user to exceed a set quota.
-#: lib/mediafile.php:238 lib/mediafile.php:281
 msgid "File exceeds user's quota."
 msgstr "Soubor překračuje kvótu uživatele."
 
 #. TRANS: Client exception thrown when a file upload operation fails because the file could
 #. TRANS: not be moved from the temporary folder to the permanent file location.
-#: lib/mediafile.php:258 lib/mediafile.php:300
 msgid "File could not be moved to destination directory."
 msgstr "Soubor nemohl být přesunut do cílového adresáře."
 
 #. TRANS: Client exception thrown when a file upload operation has been stopped because the MIME
 #. TRANS: type of the uploaded file could not be determined.
-#: lib/mediafile.php:265 lib/mediafile.php:306
 msgid "Could not determine file's MIME type."
 msgstr "Nelze určit typ MIME souboru."
 
 #. TRANS: Client exception thrown trying to upload a forbidden MIME type.
 #. TRANS: %1$s is the file type that was denied, %2$s is the application part of
 #. TRANS: the MIME type that was denied.
-#: lib/mediafile.php:396
 #, php-format
 msgid ""
 "\"%1$s\" is not a supported file type on this server. Try using another %2$s "
@@ -9195,52 +7657,42 @@ msgstr ""
 
 #. TRANS: Client exception thrown trying to upload a forbidden MIME type.
 #. TRANS: %s is the file type that was denied.
-#: lib/mediafile.php:401
 #, php-format
 msgid "\"%s\" is not a supported file type on this server."
 msgstr ""
 
-#: lib/messageform.php:120
 msgid "Send a direct notice"
 msgstr "Pošlete přímou zprávu"
 
 #. TRANS Label entry in drop-down selection box in direct-message inbox/outbox. This is the default entry in the drop-down box, doubling as instructions and a brake against accidental submissions with the first user in the list.
-#: lib/messageform.php:137
 #, fuzzy
 msgid "Select recipient:"
 msgstr "Vyberte operátora"
 
 #. TRANS Entry in drop-down selection box in direct-message inbox/outbox when no one is available to message.
-#: lib/messageform.php:150
 #, fuzzy
 msgid "No mutual subscribers."
 msgstr "Nepřihlášen!"
 
-#: lib/messageform.php:153
 msgid "To"
 msgstr "Komu:"
 
-#: lib/messageform.php:184 lib/noticeform.php:236
 msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr "Odeslat"
 
-#: lib/messagelist.php:77
 #, fuzzy
 msgid "Messages"
 msgstr "Zpráva"
 
-#: lib/messagelistitem.php:123 lib/noticelist.php:527
 msgid "from"
 msgstr "od"
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:178
 msgid "Nickname cannot be empty."
 msgstr ""
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:191
 #, php-format
 msgid "Nickname cannot be more than %d character long."
 msgid_plural "Nickname cannot be more than %d characters long."
@@ -9248,32 +7700,33 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: lib/noticeform.php:160
+#. TRANS: Form legend for notice form.
 msgid "Send a notice"
 msgstr "Poslat oznámení"
 
-#: lib/noticeform.php:174
+#. TRANS: Title for notice label. %s is the user's nickname.
 #, php-format
 msgid "What's up, %s?"
 msgstr "Co se děje, %s?"
 
-#: lib/noticeform.php:193
+#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr "Připojit"
 
-#: lib/noticeform.php:197
-msgid "Attach a file"
+#. TRANS: Title for input field to attach a file to a notice.
+#, fuzzy
+msgid "Attach a file."
 msgstr "Přiložit soubor"
 
-#: lib/noticeform.php:212
+#. TRANS: Field label to add location to a notice.
 msgid "Share my location"
 msgstr "Sdílet mé umístění"
 
-#: lib/noticeform.php:215
+#. TRANS: Text to not share location for a notice in notice form.
 msgid "Do not share my location"
 msgstr "Nesdílet moje umístění"
 
-#: lib/noticeform.php:216
+#. TRANS: Timeout error text for location retrieval in notice form.
 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
 "try again later"
@@ -9282,418 +7735,317 @@ msgstr ""
 "prosím znovu později"
 
 #. TRANS: Used in coordinates as abbreviation of north
-#: lib/noticelist.php:457
 msgid "N"
 msgstr "S"
 
 #. TRANS: Used in coordinates as abbreviation of south
-#: lib/noticelist.php:459
 msgid "S"
 msgstr "J"
 
 #. TRANS: Used in coordinates as abbreviation of east
-#: lib/noticelist.php:461
 msgid "E"
 msgstr "V"
 
 #. TRANS: Used in coordinates as abbreviation of west
-#: lib/noticelist.php:463
 msgid "W"
 msgstr "Z"
 
-#: lib/noticelist.php:465
 #, php-format
 msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 
-#: lib/noticelist.php:474
 msgid "at"
 msgstr "v"
 
-#: lib/noticelist.php:523
 msgid "web"
 msgstr "web"
 
-#: lib/noticelist.php:589
 msgid "in context"
 msgstr "v kontextu"
 
-#: lib/noticelist.php:624
 msgid "Repeated by"
 msgstr "Opakováno"
 
-#: lib/noticelist.php:651
 msgid "Reply to this notice"
 msgstr "Odpovědět na toto oznámení"
 
-#: lib/noticelist.php:652
 msgid "Reply"
 msgstr "Odpovědět"
 
-#: lib/noticelist.php:678
 msgid "Delete this notice"
 msgstr "Odstranit toto oznámení"
 
-#: lib/noticelist.php:696
 msgid "Notice repeated"
 msgstr "Sdělení opakováno"
 
-#: lib/nudgeform.php:116
 msgid "Nudge this user"
 msgstr "Pošťuchovat tohoto uživatele"
 
-#: lib/nudgeform.php:128
 msgid "Nudge"
 msgstr "Pošťouchnout"
 
-#: lib/nudgeform.php:128
 msgid "Send a nudge to this user"
 msgstr "Poslat pošťouchnutí tomuto uživateli"
 
-#: lib/oauthstore.php:294
 msgid "Error inserting new profile."
 msgstr ""
 
-#: lib/oauthstore.php:302
 msgid "Error inserting avatar."
 msgstr ""
 
-#: lib/oauthstore.php:322
 msgid "Error inserting remote profile."
 msgstr ""
 
 #. TRANS: Exception thrown when a notice is denied because it has been sent before.
-#: lib/oauthstore.php:362
 msgid "Duplicate notice."
 msgstr ""
 
-#: lib/oauthstore.php:507
 msgid "Couldn't insert new subscription."
 msgstr "Nelze vložit odebírání"
 
-#: lib/personalgroupnav.php:104
-#, fuzzy
 msgid "Replies"
 msgstr "Odpovědi"
 
-#: lib/personalgroupnav.php:109
-#, fuzzy
 msgid "Favorites"
 msgstr "Oblíbené"
 
-#: lib/personalgroupnav.php:120
-#, fuzzy
 msgid "Inbox"
 msgstr "Doručená pošta"
 
-#: lib/personalgroupnav.php:121
 msgid "Your incoming messages"
 msgstr "Vaše příchozí zprávy"
 
-#: lib/personalgroupnav.php:125
-#, fuzzy
 msgid "Outbox"
 msgstr "Odeslaná pošta"
 
-#: lib/personalgroupnav.php:126
 msgid "Your sent messages"
 msgstr "Vaše odeslané zprávy"
 
 #. TRANS: Title for personal tag cloud section. %s is a user nickname.
-#: lib/personaltagcloudsection.php:56
 #, php-format
 msgid "Tags in %s's notices"
 msgstr "Značky v oznámeních %s"
 
 #. TRANS: Displayed as version information for a plugin if no version information was found.
-#: lib/plugin.php:126
 msgid "Unknown"
 msgstr "Neznámé"
 
 #. TRANS: Plugin admin panel controls
-#: lib/plugindisableform.php:90
 msgctxt "plugin"
 msgid "Disable"
 msgstr ""
 
 #. TRANS: Plugin admin panel controls
-#: lib/pluginenableform.php:112
 msgctxt "plugin"
 msgid "Enable"
 msgstr ""
 
-#: lib/pluginlist.php:196
 msgctxt "plugin-description"
 msgid "(Plugin descriptions unavailable when disabled.)"
 msgstr ""
 
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:88
 msgid "Subscriptions"
 msgstr "Odběry"
 
 #. TRANS: Text for user subscription statistics if user has more subscriptions than displayed.
-#: lib/profileaction.php:144
 msgid "All subscriptions"
 msgstr "Všechny odběry"
 
 #. TRANS: H2 text for user subscriber statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:96
 msgid "Subscribers"
 msgstr "Odběratelé"
 
 #. TRANS: Text for user subscription statistics if user has more subscribers than displayed.
-#: lib/profileaction.php:181
 msgid "All subscribers"
 msgstr "Všichni odběratelé"
 
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:213
 msgid "User ID"
 msgstr "ID uživatele"
 
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:219
 msgid "Member since"
 msgstr "Členem od"
 
 #. TRANS: Label for user statistics.
 #. TRANS: H2 text for user group membership statistics.
-#: lib/profileaction.php:239 lib/profileaction.php:290
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:104
 msgid "Groups"
 msgstr "Skupiny"
 
 #. TRANS: Label for user statistics.
 #. TRANS: Average count of posts made per day since account registration.
-#: lib/profileaction.php:253
 msgid "Daily average"
 msgstr "Denní průměr"
 
 #. TRANS: Text for user group membership statistics if user has more subscriptions than displayed.
-#: lib/profileaction.php:305
 msgid "All groups"
 msgstr "Všechny skupiny"
 
 #. TRANS: Server error displayed when using an unimplemented method.
-#: lib/profileformaction.php:123
 msgid "Unimplemented method."
 msgstr "Neimplementovaná metoda."
 
-#: lib/publicgroupnav.php:82
 msgid "User groups"
 msgstr "Skupin uživatel"
 
-#: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
 msgid "Recent tags"
 msgstr "Nedávné značky"
 
-#: lib/publicgroupnav.php:88
 msgid "Featured"
 msgstr "Doporučení"
 
-#: lib/publicgroupnav.php:92
 msgid "Popular"
 msgstr "Populární"
 
-#: lib/redirectingaction.php:95
 msgid "No return-to arguments."
 msgstr "Chybí argument return-to."
 
-#: lib/repeatform.php:107
 msgid "Repeat this notice?"
 msgstr "Opakovat toto oznámení?"
 
-#: lib/repeatform.php:132
 msgid "Yes"
 msgstr "Ano"
 
-#: lib/repeatform.php:132
 msgid "Repeat this notice"
 msgstr "Opakovat toto oznámení"
 
-#: lib/revokeroleform.php:91
 #, php-format
 msgid "Revoke the \"%s\" role from this user"
 msgstr "Odebrat uživateli roli \"%s\""
 
 #. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:1001
 #, fuzzy
 msgid "Page not found."
 msgstr " API metoda nebyla nalezena."
 
-#: lib/sandboxform.php:67
 msgid "Sandbox"
 msgstr "Sandbox"
 
-#: lib/sandboxform.php:78
 msgid "Sandbox this user"
 msgstr "Sandboxovat tohoto uživatele"
 
 #. TRANS: Fieldset legend for the search form.
-#: lib/searchaction.php:120
 msgid "Search site"
 msgstr "Prohledat stránky"
 
 #. TRANS: Used as a field label for the field where one or more keywords
 #. TRANS: for searching can be entered.
-#: lib/searchaction.php:128
 msgid "Keyword(s)"
 msgstr "Klíčová slova"
 
 #. TRANS: Button text for searching site.
-#: lib/searchaction.php:130
 msgctxt "BUTTON"
 msgid "Search"
 msgstr ""
 
-#: lib/searchgroupnav.php:80
 msgid "People"
 msgstr "Lidé"
 
-#: lib/searchgroupnav.php:81
 msgid "Find people on this site"
 msgstr "Najít lidi na této stránce"
 
-#: lib/searchgroupnav.php:83
 msgid "Find content of notices"
 msgstr "Najít v obsahu oznámení"
 
-#: lib/searchgroupnav.php:85
 msgid "Find groups on this site"
 msgstr "Najít skupiny na této stránce"
 
-#: lib/section.php:89
 msgid "Untitled section"
 msgstr "Oddíl bez názvu"
 
-#: lib/section.php:106
 msgid "More..."
 msgstr "Další…"
 
-#: lib/settingsnav.php:78
 msgid "Change your profile settings"
 msgstr "Změňte nastavení profilu"
 
-#: lib/settingsnav.php:83
 msgid "Upload an avatar"
 msgstr "Nahrát avatar"
 
-#: lib/settingsnav.php:88
 msgid "Change your password"
 msgstr "Změňte své heslo"
 
-#: lib/settingsnav.php:93
 msgid "Change email handling"
 msgstr "Změnit manipulaci emailu"
 
-#: lib/settingsnav.php:98
 msgid "Design your profile"
 msgstr "Změňte vzhled svého profilu"
 
-#: lib/settingsnav.php:102
 msgid "URL"
 msgstr "URL"
 
-#: lib/settingsnav.php:103
 msgid "URL shorteners"
 msgstr ""
 
-#: lib/settingsnav.php:111
 msgid "Updates by instant messenger (IM)"
 msgstr "Aktualizace z a na instant messenger (IM)"
 
-#: lib/settingsnav.php:118
 msgid "Updates by SMS"
 msgstr "Aktualizace z a na SMS"
 
-#: lib/settingsnav.php:123
-#, fuzzy
 msgid "Connections"
 msgstr "Připojení"
 
-#: lib/settingsnav.php:124
 msgid "Authorized connected applications"
 msgstr "Autorizované propojené aplikace"
 
-#: lib/silenceform.php:67
 msgid "Silence"
 msgstr "Uťišit"
 
-#: lib/silenceform.php:78
 msgid "Silence this user"
 msgstr "Utišit tohoto uživatele"
 
-#: lib/subgroupnav.php:89
 #, php-format
 msgid "People %s subscribes to"
 msgstr "Lidé ke kterým je %s přihlášen"
 
-#: lib/subgroupnav.php:97
 #, php-format
 msgid "People subscribed to %s"
 msgstr "Lidé přihlášení k %s"
 
-#: lib/subgroupnav.php:105
 #, php-format
 msgid "Groups %s is a member of"
 msgstr "Skupiny kterých je %s členem"
 
-#: lib/subgroupnav.php:111
 msgid "Invite"
 msgstr "Pozvat"
 
-#: lib/subgroupnav.php:112
 #, php-format
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Pozvěte přátele a kolegy, aby se k vám připojili na %s"
 
-#: lib/subscribeform.php:115 lib/subscribeform.php:139
 msgid "Subscribe to this user"
 msgstr "Přihlásit se k tomuto uživateli"
 
-#: lib/subscriberspeopleselftagcloudsection.php:48
-#: lib/subscriptionspeopleselftagcloudsection.php:48
 msgid "People Tagcloud as self-tagged"
 msgstr "Mrak štítků kterými se uživatelé sami označili"
 
-#: lib/subscriberspeopletagcloudsection.php:48
-#: lib/subscriptionspeopletagcloudsection.php:48
 msgid "People Tagcloud as tagged"
 msgstr "Mrak štítků kterými jsou uživatelé označeni"
 
-#: lib/tagcloudsection.php:56
 msgid "None"
 msgstr "Nic"
 
 #. TRANS: Server exception displayed if a theme name was invalid.
-#: lib/theme.php:74
 #, fuzzy
 msgid "Invalid theme name."
 msgstr "Neplatné jméno souboru."
 
-#: lib/themeuploader.php:50
 msgid "This server cannot handle theme uploads without ZIP support."
 msgstr "Tento server nemůže zpracovat nahrání tématu bez podpory ZIP."
 
-#: lib/themeuploader.php:58 lib/themeuploader.php:61
 msgid "The theme file is missing or the upload failed."
 msgstr "Chybí soubor tématu nebo se nepodařilo nahrání."
 
-#: lib/themeuploader.php:91 lib/themeuploader.php:102
-#: lib/themeuploader.php:279 lib/themeuploader.php:283
-#: lib/themeuploader.php:291 lib/themeuploader.php:298
 msgid "Failed saving theme."
 msgstr "Chyba při ukládání tématu."
 
-#: lib/themeuploader.php:147
 msgid "Invalid theme: bad directory structure."
 msgstr "Neplatné téma: špatná adresářová struktura."
 
-#: lib/themeuploader.php:166
 #, fuzzy, php-format
 msgid "Uploaded theme is too large; must be less than %d byte uncompressed."
 msgid_plural ""
@@ -9705,11 +8057,9 @@ msgstr[1] ""
 msgstr[2] ""
 "Nahrané téma je příliš velké, nezkomprimované musí být menší než %d bajtů."
 
-#: lib/themeuploader.php:179
 msgid "Invalid theme archive: missing file css/display.css"
 msgstr "Neplatný archiv tématu: chybí soubor css/display.css"
 
-#: lib/themeuploader.php:219
 msgid ""
 "Theme contains invalid file or folder name. Stick with ASCII letters, "
 "digits, underscore, and minus sign."
@@ -9717,143 +8067,115 @@ msgstr ""
 "Téma obsahuje neplatné jméno souboru nebo složky. Zůstaňte u písmen ASCII, "
 "číslic, podtržítka a mínusu."
 
-#: lib/themeuploader.php:225
 msgid "Theme contains unsafe file extension names; may be unsafe."
 msgstr "Téma obsahuje nebezpečné přípony souborů, může být nebezpečné."
 
-#: lib/themeuploader.php:242
 #, php-format
 msgid "Theme contains file of type '.%s', which is not allowed."
 msgstr "Téma obsahuje soubor typu '.%s', což není povoleno."
 
-#: lib/themeuploader.php:260
 msgid "Error opening theme archive."
 msgstr "Chyba při otevírání archivu tématu."
 
-#: lib/threadednoticelist.php:270
 #, php-format
-msgid "Show all %d comment"
-msgid_plural "Show all %d comments"
+msgid "Show %d reply"
+msgid_plural "Show all %d replies"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: lib/topposterssection.php:74
 msgid "Top posters"
 msgstr "Nejlepší pisálci"
 
 #. TRANS: Title for the form to unblock a user.
-#: lib/unblockform.php:67
 #, fuzzy
 msgctxt "TITLE"
 msgid "Unblock"
 msgstr "Odblokovat"
 
-#: lib/unsandboxform.php:69
 msgid "Unsandbox"
 msgstr "Odsandboxovat"
 
-#: lib/unsandboxform.php:80
 msgid "Unsandbox this user"
 msgstr "Odsandboxovat tohoto uživatele"
 
-#: lib/unsilenceform.php:67
 msgid "Unsilence"
 msgstr "Zrušit utišení"
 
-#: lib/unsilenceform.php:78
 msgid "Unsilence this user"
 msgstr "Zrušit utišení tohoto uživatele"
 
-#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
 msgid "Unsubscribe from this user"
 msgstr "Odhlásit se od tohoto uživatele"
 
-#: lib/unsubscribeform.php:137
 msgid "Unsubscribe"
 msgstr "Odhlásit"
 
 #. 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).
-#: lib/usernoprofileexception.php:60
 #, fuzzy, php-format
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "Uživatel nemá profil."
 
-#: lib/userprofile.php:116
 msgid "Edit Avatar"
 msgstr "Upravit avatar"
 
 #. TRANS: H2 for user actions in a profile.
 #. TRANS: H2 for entity actions in a profile.
-#: lib/userprofile.php:216 lib/userprofile.php:232
 msgid "User actions"
 msgstr "Akce uživatele"
 
 #. TRANS: Text shown in user profile of not yet compeltely deleted users.
-#: lib/userprofile.php:220
 msgid "User deletion in progress..."
 msgstr "Probíhá mazání uživatele..."
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:248
 msgid "Edit profile settings"
 msgstr "Upravit nastavení profilu"
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:250
 msgid "Edit"
 msgstr "Editovat"
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:274
 msgid "Send a direct message to this user"
 msgstr "Odeslat přímou zprávu tomuto uživateli"
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:276
 msgid "Message"
 msgstr "Zpráva"
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:318
 msgid "Moderate"
 msgstr "Moderovat"
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:357
 msgid "User role"
 msgstr "Role uživatele"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:360
 msgctxt "role"
 msgid "Administrator"
 msgstr "Administrátor"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:362
 msgctxt "role"
 msgid "Moderator"
 msgstr "Moderátor"
 
-#: lib/util.php:321
 #, fuzzy
 msgid "Not allowed to log in."
 msgstr "Nejste přihlášen(a)."
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1337
 msgid "a few seconds ago"
 msgstr "před pár sekundami"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1340
 msgid "about a minute ago"
 msgstr "asi před minutou"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1344
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
@@ -9862,12 +8184,10 @@ msgstr[1] ""
 msgstr[2] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1347
 msgid "about an hour ago"
 msgstr "asi před hodinou"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1351
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
@@ -9876,12 +8196,10 @@ msgstr[1] ""
 msgstr[2] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1354
 msgid "about a day ago"
 msgstr "asi přede dnem"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1358
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
@@ -9890,12 +8208,10 @@ msgstr[1] ""
 msgstr[2] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1361
 msgid "about a month ago"
 msgstr "asi před měsícem"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1365
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
@@ -9904,210 +8220,42 @@ msgstr[1] ""
 msgstr[2] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1368
 msgid "about a year ago"
 msgstr "asi před rokem"
 
 #. TRANS: Web color exception thrown when a hexadecimal color code does not validate.
 #. TRANS: %s is the provided (invalid) color code.
-#: lib/webcolor.php:81 lib/webcolor.php:121
 #, fuzzy, php-format
 msgid "%s is not a valid color! Use 3 or 6 hex characters."
 msgstr "%s není platná barva! Použijte 3 nebo 6 hex znaků."
 
 #. TRANS: Exception.
-#: lib/xrd.php:63
 #, fuzzy
 msgid "Invalid XML."
 msgstr "Neplatná velikost"
 
 #. TRANS: Exception.
-#: lib/xrd.php:68
 msgid "Invalid XML, missing XRD root."
 msgstr ""
 
 #. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
-#: scripts/restoreuser.php:62
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
 
-#, fuzzy
-#~ msgid "Could not generate feed for group - %s"
-#~ msgstr "Nelze aktualizovat skupinu."
+#~ msgid "Full name is too long (max 255 chars)."
+#~ msgstr "Celé jméno je moc dlouhé (maximální délka je 255 znaků)."
+
+#~ msgid "description is too long (max %d chars)."
+#~ msgstr "Popis je příliš dlouhý (maximálně %d znaků)."
+
+#~ msgid "Location is too long (max 255 chars)."
+#~ msgstr "Umístění je příliš dlouhé (maximálně 255 znaků)."
+
+#~ msgid "Too many aliases! Maximum %d."
+#~ msgstr "Příliš mnoho aliasů! Maximálně %d."
 
 #, fuzzy
-#~ msgid "Current confirmed Jabber/Google Talk address."
-#~ msgstr "Aktuální potvrzená Jabber / GTalk adresa."
-
-#, fuzzy
-#~ msgid ""
-#~ "Jabber or Google Talk address, like \"UserName@example.org\". First, make "
-#~ "sure to add %s to your buddy list in your IM client or on Google Talk."
-#~ msgstr ""
-#~ "Jabber nebo GTalk adresa, například \"jmeno@example.org\". Neprve se "
-#~ "ujistěte že jste přidal %s do vašeho seznamu kontaktů ve vašem IM klientu "
-#~ "nebo na GTalku."
-
-#, fuzzy
-#~ msgid "Send me notices through Jabber/Google Talk."
-#~ msgstr "Zasílat oznámení pomocí Jabber/GTalk"
-
-#, fuzzy
-#~ msgid "Publish a MicroID for my Jabber/Google Talk address."
-#~ msgstr "Publikovat MicroID pro mou Jabber / GTalk adresu."
-
-#~ msgid "No Jabber ID."
-#~ msgstr "Chybí Jabber ID."
-
-#, fuzzy
-#~ msgid "Not a valid Jabber ID."
-#~ msgstr "Není platným Jabber ID"
-
-#~ msgid "That is already your Jabber ID."
-#~ msgstr "Toto je již vaše Jabber ID"
-
-#~ msgid "That is not your Jabber ID."
-#~ msgstr "Toto není váš Jabber ID"
-
-#~ msgid "Other settings"
-#~ msgstr "Další nastavení"
-
-#~ msgid "Tag cloud"
-#~ msgstr "Tag cloud"
-
-#~ msgid "Consumer key"
-#~ msgstr "Spotřebitelský klíč"
-
-#~ msgid "Consumer secret"
-#~ msgstr "Spotřebitelské tajemství"
-
-#~ msgid "Request token URL"
-#~ msgstr "Adresa řetězce požadavku"
-
-#~ msgid "Access token URL"
-#~ msgstr "URL Access tokenu"
-
-#~ msgid "Authorize URL"
-#~ msgstr "Authorizační URL"
-
-#~ msgid "Jabber"
-#~ msgstr "Jabber"
-
-#~ msgid "Photo"
-#~ msgstr "Fotka"
-
-#~ msgid "Other options"
-#~ msgstr "Další možnosti"
-
-#~ msgid "Other"
-#~ msgstr "Jiné"
-
-#~ msgid "Primary site navigation"
-#~ msgstr "Primární navigace na webu"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Personal profile and friends timeline"
-#~ msgstr "Osobní profil a časová osa přátel"
-
-#~ msgctxt "MENU"
-#~ msgid "Personal"
-#~ msgstr "Osobní"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Change your email, avatar, password, profile"
-#~ msgstr "Změňte svůj e-mail, avatar, heslo, profil"
-
-#~ msgid "Account"
-#~ msgstr "Účet"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Connect to services"
-#~ msgstr "Připojení ke službám"
-
-#~ msgid "Connect"
-#~ msgstr "Připojit"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Change site configuration"
-#~ msgstr "Změna konfigurace webu"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Invite friends and colleagues to join you on %s"
-#~ msgstr "Pozvěte přátele a kolegy, aby se k vám připojili na %s"
-
-#~ msgctxt "MENU"
-#~ msgid "Invite"
-#~ msgstr "Pozvat"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Create an account"
-#~ msgstr "Zaregistrujte se"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Help me!"
-#~ msgstr "Nápověda"
-
-#~ msgctxt "MENU"
-#~ msgid "Help"
-#~ msgstr "Nápověda"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Search for people or text"
-#~ msgstr "Vyhledávání osob nebo textu"
-
-#~ msgid "Local views"
-#~ msgstr "Místní zobrazení"
-
-#~ msgid "Page notice"
-#~ msgstr "Sdělení stránky"
-
-#~ msgid "Secondary site navigation"
-#~ msgstr "Sekundární navigace na webu"
-
-#~ msgid "StatusNet software license"
-#~ msgstr "Licence softwaru StatusNet"
-
-#~ msgid "Site content license"
-#~ msgstr "Licence k obsahu stránek"
-
-#~ msgid "Pagination"
-#~ msgstr "Stránkování"
-
-#~ msgid "Author"
-#~ msgstr "Autor"
-
-#~ msgid "Provider"
-#~ msgstr "Poskytovatel"
-
-#, fuzzy
-#~ msgctxt "MENU"
-#~ msgid "SMS"
-#~ msgstr "SMS"
-
-#~ msgid "Filter tags"
-#~ msgstr "Filtrovat tagy"
-
-#~ msgid "[%s]"
-#~ msgstr "[%s]"
-
-#~ msgid "Available characters"
-#~ msgstr "Zbývá znaků"
-
-#, fuzzy
-#~ msgctxt "MENU"
-#~ msgid "Profile"
-#~ msgstr "Profil"
-
-#~ msgid "Search help"
-#~ msgstr "Nápověda k hledání"
-
-#, fuzzy
-#~ msgid "Message too long. Maximum is %1$d character, you sent %2$d."
-#~ msgid_plural "Message too long. Maximum is %1$d characters, you sent %2$d."
-#~ msgstr[0] ""
-#~ "Zpráva je příliš dlouhá - maximum je %1$d znaků, poslal jsi %2$d."
-#~ msgstr[1] ""
-#~ "Zpráva je příliš dlouhá - maximum je %1$d znaků, poslal jsi %2$d."
-#~ msgstr[2] ""
-#~ "Zpráva je příliš dlouhá - maximum je %1$d znaků, poslal jsi %2$d."
+#~ msgctxt "BUTTON"
+#~ msgid "Comment"
+#~ msgstr "Obsah"
diff --git a/locale/de/LC_MESSAGES/statusnet.po b/locale/de/LC_MESSAGES/statusnet.po
index 7760f6f949..1c7cad4a6e 100644
--- a/locale/de/LC_MESSAGES/statusnet.po
+++ b/locale/de/LC_MESSAGES/statusnet.po
@@ -11,6 +11,7 @@
 # Author: McDutchie
 # Author: Michael
 # Author: Michi
+# Author: Purodha
 # Author: The Evil IP address
 # Author: Umherirrender
 # --
@@ -20,68 +21,58 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:23+0000\n"
-"PO-Revision-Date: 2011-03-03 17:25:46+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:12+0000\n"
 "Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-02-25 23:49:23+0000\n"
+"X-POT-Import-Date: 2011-03-03 17:59:19+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
-#: actions/accessadminpanel.php:53 lib/adminpanelaction.php:363
 msgid "Access"
 msgstr "Zugang"
 
 #. TRANS: Page notice.
-#: actions/accessadminpanel.php:64
 msgid "Site access settings"
 msgstr "Zugangseinstellungen speichern"
 
 #. TRANS: Form legend for registration form.
-#: actions/accessadminpanel.php:151
 msgid "Registration"
 msgstr "Registrieren"
 
 #. TRANS: Checkbox instructions for admin setting "Private".
-#: actions/accessadminpanel.php:155
 msgid "Prohibit anonymous users (not logged in) from viewing site?"
 msgstr ""
 "Anonymen (nicht eingeloggten) Benutzern das Betrachten der Seite verbieten?"
 
 #. TRANS: Checkbox label for prohibiting anonymous users from viewing site.
-#: actions/accessadminpanel.php:157
 msgctxt "LABEL"
 msgid "Private"
 msgstr "Privat"
 
 #. TRANS: Checkbox instructions for admin setting "Invite only".
-#: actions/accessadminpanel.php:164
 msgid "Make registration invitation only."
 msgstr "Registrierung nur bei vorheriger Einladung erlauben."
 
 #. TRANS: Checkbox label for configuring site as invite only.
-#: actions/accessadminpanel.php:166
 msgid "Invite only"
 msgstr "Nur auf Einladung"
 
 #. TRANS: Checkbox instructions for admin setting "Closed" (no new registrations).
-#: actions/accessadminpanel.php:173
 msgid "Disable new registrations."
 msgstr "Neuregistrierungen deaktivieren."
 
 #. TRANS: Checkbox label for disabling new user registrations.
-#: actions/accessadminpanel.php:175
 msgid "Closed"
 msgstr "Geschlossen"
 
 #. TRANS: Title for button to save access settings in site admin panel.
-#: actions/accessadminpanel.php:191
 msgid "Save access settings"
 msgstr "Zugangs-Einstellungen speichern"
 
@@ -89,6 +80,7 @@ msgstr "Zugangs-Einstellungen speichern"
 #. TRANS: Button text for saving theme settings.
 #. TRANS: Button label to save e-mail preferences.
 #. TRANS: Button label to save IM preferences.
+#. TRANS: Button text in the license admin panel.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
 #. TRANS: Button text for saving site notice in admin panel.
@@ -98,21 +90,12 @@ msgstr "Zugangs-Einstellungen speichern"
 #. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
 #. TRANS: Button text on profile design page to save settings.
-#: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
-#: actions/emailsettings.php:251 actions/imsettings.php:199
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:198
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:204
-#: actions/subscriptions.php:261 actions/urlsettings.php:152
-#: actions/useradminpanel.php:298 lib/applicationeditform.php:355
-#: lib/designform.php:320 lib/groupeditform.php:201
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Speichern"
 
 #. TRANS: Server error when page not found (404).
 #. TRANS: Server error when page not found (404)
-#: actions/all.php:68 actions/public.php:98 actions/replies.php:93
-#: actions/showfavorites.php:140 actions/tag.php:52
 msgid "No such page."
 msgstr "Seite nicht vorhanden"
 
@@ -131,6 +114,7 @@ msgstr "Seite nicht vorhanden"
 #. TRANS: Client error displayed when checking group membership for a non-existing user.
 #. TRANS: Client error displayed when trying to have a non-existing user join a group.
 #. TRANS: Client error displayed when trying to have a non-existing user leave a group.
+#. TRANS: Client error displayed when not providing a user or an invalid user.
 #. TRANS: Client error displayed when updating a status for a non-existing user.
 #. TRANS: Client error displayed when requesting a list of followers for a non-existing user.
 #. TRANS: Client error displayed when requesting most recent favourite notices by a user for a non-existing user.
@@ -143,6 +127,8 @@ msgstr "Seite nicht vorhanden"
 #. 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.
 #. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
@@ -150,33 +136,10 @@ msgstr "Seite nicht vorhanden"
 #. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when calling a profile action without specifying a user.
-#: actions/all.php:80 actions/allrss.php:69
-#: actions/apiaccountupdatedeliverydevice.php:110
-#: actions/apiaccountupdateprofile.php:103
-#: actions/apiaccountupdateprofilebackgroundimage.php:118
-#: actions/apiaccountupdateprofileimage.php:104 actions/apiatomservice.php:59
-#: actions/apiblockcreate.php:96 actions/apiblockdestroy.php:94
-#: actions/apidirectmessage.php:75 actions/apidirectmessagenew.php:72
-#: actions/apigroupcreate.php:111 actions/apigroupismember.php:89
-#: actions/apigroupjoin.php:98 actions/apigroupleave.php:98
-#: actions/apigrouplist.php:70 actions/apigroupprofileupdate.php:108
-#: actions/apistatusesupdate.php:230 actions/apisubscriptions.php:85
-#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:173
-#: actions/apitimelinehome.php:78 actions/apitimelinementions.php:77
-#: actions/apitimelineuser.php:79 actions/avatarbynickname.php:79
-#: actions/favoritesrss.php:72 actions/foaf.php:42 actions/foaf.php:61
-#: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116
-#: actions/otp.php:78 actions/remotesubscribe.php:144
-#: actions/remotesubscribe.php:153 actions/replies.php:73
-#: actions/repliesrss.php:38 actions/rsd.php:113 actions/showfavorites.php:106
-#: actions/userbyid.php:75 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/userxrd.php:59 actions/xrds.php:71 lib/command.php:509
-#: lib/galleryaction.php:59 lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Unbekannter Benutzer."
 
 #. TRANS: Page title. %1$s is user nickname, %2$d is page number
-#: actions/all.php:91
 #, php-format
 msgid "%1$s and friends, page %2$d"
 msgstr "%1$s und Freunde, Seite% 2$d"
@@ -185,33 +148,26 @@ msgstr "%1$s und Freunde, Seite% 2$d"
 #. TRANS: H1 text for page. %s is a user nickname.
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Timeline title for user and friends. %s is a user nickname.
-#: actions/all.php:94 actions/all.php:191 actions/allrss.php:117
-#: actions/apitimelinefriends.php:207 actions/apitimelinehome.php:113
-#: lib/personalgroupnav.php:100
 #, php-format
 msgid "%s and friends"
 msgstr "%s und Freunde"
 
 #. TRANS: %s is user nickname.
-#: actions/all.php:108
 #, php-format
 msgid "Feed for friends of %s (RSS 1.0)"
 msgstr "Feed der Freunde von %s (RSS 1.0)"
 
 #. TRANS: %s is user nickname.
-#: actions/all.php:117
 #, php-format
 msgid "Feed for friends of %s (RSS 2.0)"
 msgstr "Feed der Freunde von %s (RSS 2.0)"
 
 #. TRANS: %s is user nickname.
-#: actions/all.php:126
 #, php-format
 msgid "Feed for friends of %s (Atom)"
 msgstr "Feed der Freunde von %s (Atom)"
 
 #. TRANS: Empty list message. %s is a user nickname.
-#: actions/all.php:139
 #, php-format
 msgid ""
 "This is the timeline for %s and friends but no one has posted anything yet."
@@ -221,7 +177,6 @@ msgstr ""
 
 #. TRANS: Encouragement displayed on logged in user's empty timeline.
 #. TRANS: This message contains Markdown links. Keep "](" together.
-#: actions/all.php:146
 #, php-format
 msgid ""
 "Try subscribing to more people, [join a group](%%action.groups%%) or post "
@@ -232,7 +187,6 @@ msgstr ""
 
 #. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@".
 #. TRANS: This message contains Markdown links. Keep "](" together.
-#: actions/all.php:150
 #, php-format
 msgid ""
 "You can try to [nudge %1$s](../%2$s) from their profile or [post something "
@@ -245,7 +199,6 @@ msgstr ""
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
 #. TRANS: Second sentence of empty message for anonymous users. %s is a user nickname.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:221
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -255,14 +208,11 @@ msgstr ""
 "gibst %s dann einen Stups oder postest ihm etwas."
 
 #. TRANS: H1 text for page when viewing a list for self.
-#: actions/all.php:188
 msgid "You and friends"
 msgstr "Du und Freunde"
 
 #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
 #. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name.
-#: actions/allrss.php:122 actions/apitimelinefriends.php:213
-#: actions/apitimelinehome.php:119
 #, php-format
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr "Aktualisierungen von %1$s und Freunden auf %2$s!"
@@ -281,55 +231,20 @@ msgstr "Aktualisierungen von %1$s und Freunden auf %2$s!"
 #. TRANS: Client error displayed trying to execute an unknown API method checking group membership.
 #. TRANS: Client error displayed trying to execute an unknown API method listing the latest 20 groups.
 #. TRANS: Client error displayed trying to execute an unknown API method showing group membership.
+#. TRANS: Client error displayed when using an unsupported API format.
 #. TRANS: Client error displayed trying to execute an unknown API method showing a group.
 #. TRANS: Client error displayed trying to execute an unknown API method testing API connectivity.
 #. TRANS: Client error displayed trying to execute an unknown API method deleting a status.
 #. TRANS: Client error displayed when trying to handle an unknown API method.
-#: actions/apiaccountratelimitstatus.php:69
-#: actions/apiaccountupdatedeliverydevice.php:92
-#: actions/apiaccountupdateprofile.php:94
-#: actions/apiaccountupdateprofilebackgroundimage.php:92
-#: actions/apiaccountupdateprofilecolors.php:115
-#: actions/apiaccountverifycredentials.php:68 actions/apidirectmessage.php:157
-#: actions/apifavoritecreate.php:98 actions/apifavoritedestroy.php:98
-#: actions/apifriendshipscreate.php:99 actions/apifriendshipsdestroy.php:99
-#: actions/apifriendshipsshow.php:124 actions/apigroupcreate.php:138
-#: actions/apigroupismember.php:115 actions/apigroupjoin.php:151
-#: actions/apigroupleave.php:141 actions/apigrouplist.php:134
-#: actions/apigrouplistall.php:120 actions/apigroupmembership.php:105
-#: actions/apigroupprofileupdate.php:100 actions/apigroupprofileupdate.php:213
-#: actions/apigroupshow.php:114 actions/apihelptest.php:84
-#: actions/apistatusesdestroy.php:101 actions/apistatusesretweets.php:110
-#: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:139
-#: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
-#: actions/apitimelinefavorites.php:182 actions/apitimelinefriends.php:276
-#: actions/apitimelinegroup.php:148 actions/apitimelinehome.php:181
-#: actions/apitimelinementions.php:182 actions/apitimelinepublic.php:247
-#: actions/apitimelineretweetedtome.php:147
-#: actions/apitimelineretweetsofme.php:147 actions/apitimelinetag.php:165
-#: actions/apitimelineuser.php:217 actions/apiusershow.php:100
 msgid "API method not found."
 msgstr "API-Methode nicht gefunden."
 
 #. 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.
-#: actions/apiaccountupdatedeliverydevice.php:83
-#: actions/apiaccountupdateprofile.php:85
-#: actions/apiaccountupdateprofilebackgroundimage.php:83
-#: actions/apiaccountupdateprofilecolors.php:106
-#: actions/apiaccountupdateprofileimage.php:80 actions/apiblockcreate.php:87
-#: actions/apiblockdestroy.php:85 actions/apidirectmessagenew.php:107
-#: actions/apifavoritecreate.php:88 actions/apifavoritedestroy.php:88
-#: actions/apifriendshipscreate.php:89 actions/apifriendshipsdestroy.php:89
-#: actions/apigroupcreate.php:102 actions/apigroupjoin.php:89
-#: actions/apigroupleave.php:89 actions/apigroupprofileupdate.php:92
-#: actions/apimediaupload.php:66 actions/apistatusesretweet.php:63
-#: actions/apistatusesupdate.php:194
 msgid "This method requires a POST."
 msgstr "Diese Methode benötigt ein POST."
 
 #. TRANS: Client error displayed when no valid device parameter is provided for a user's delivery device setting.
-#: actions/apiaccountupdatedeliverydevice.php:103
 msgid ""
 "You must specify a parameter named 'device' with a value of one of: sms, im, "
 "none."
@@ -344,10 +259,6 @@ msgstr ""
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
-#: actions/apiaccountupdatedeliverydevice.php:136
-#: actions/emailsettings.php:353 actions/emailsettings.php:499
-#: actions/profilesettings.php:323 actions/smssettings.php:300
-#: actions/smssettings.php:453 actions/urlsettings.php:211
 msgid "Could not update user."
 msgstr "Konnte Benutzerdaten nicht aktualisieren."
 
@@ -360,32 +271,17 @@ msgstr "Konnte Benutzerdaten nicht aktualisieren."
 #. TRANS: Server error displayed when requesting Friends of a Friend feed for a user for which the profile could not be found.
 #. TRANS: Server error displayed when trying to get a user hCard for a user without a profile.
 #. TRANS: Server error displayed when calling a profile action while the specified user does not have a profile.
-#: actions/apiaccountupdateprofile.php:111
-#: actions/apiaccountupdateprofilebackgroundimage.php:199
-#: actions/apiaccountupdateprofilecolors.php:183
-#: actions/apiaccountupdateprofileimage.php:131
-#: actions/apiuserprofileimage.php:88 actions/apiusershow.php:108
-#: actions/avatarbynickname.php:85 actions/foaf.php:69 actions/hcard.php:75
-#: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
-#: lib/profileaction.php:85
 msgid "User has no profile."
 msgstr "Benutzer hat kein Profil."
 
 #. TRANS: Server error displayed if a user profile could not be saved.
 #. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:419
 msgid "Could not save profile."
 msgstr "Konnte Profil nicht speichern."
 
 #. TRANS: Client error displayed when the number of bytes in a POST request exceeds a limit.
 #. TRANS: %s is the number of bytes of the CONTENT_LENGTH.
 #. TRANS: Form validation error in design settings form. POST should remain untranslated.
-#: actions/apiaccountupdateprofilebackgroundimage.php:108
-#: actions/apiaccountupdateprofileimage.php:95 actions/apimediaupload.php:81
-#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
-#: actions/designadminpanel.php:120 actions/editapplication.php:121
-#: actions/newapplication.php:102 actions/newnotice.php:95
-#: lib/designsettings.php:110
 #, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s byte) due to its "
@@ -405,26 +301,15 @@ msgstr[1] ""
 #. TRANS: Client error displayed when a database error occurs inserting profile colours.
 #. TRANS: Client error displayed when a database error occurs updating profile colours.
 #. TRANS: Form validation error displayed when group design settings could not be saved because of an application issue.
-#: actions/apiaccountupdateprofilebackgroundimage.php:138
-#: actions/apiaccountupdateprofilebackgroundimage.php:149
-#: actions/apiaccountupdateprofilecolors.php:160
-#: actions/apiaccountupdateprofilecolors.php:171
-#: actions/groupdesignsettings.php:285 actions/groupdesignsettings.php:296
-#: actions/userdesignsettings.php:218 actions/userdesignsettings.php:228
-#: actions/userdesignsettings.php:270 actions/userdesignsettings.php:280
 msgid "Unable to save your design settings."
-msgstr "Konnte Twitter-Einstellungen nicht speichern."
+msgstr "Konnte Design-Einstellungen nicht speichern."
 
 #. TRANS: Error displayed when updating design settings fails.
 #. TRANS: Client error displayed when a database error occurs updating profile colours.
-#: actions/apiaccountupdateprofilebackgroundimage.php:191
-#: actions/apiaccountupdateprofilecolors.php:139
-#: actions/userdesignsettings.php:196
 msgid "Could not update your design."
 msgstr "Konnte Benutzerdesign nicht aktualisieren."
 
 #. TRANS: Title for Atom feed.
-#: actions/apiatomservice.php:85
 msgctxt "ATOM"
 msgid "Main"
 msgstr ""
@@ -433,9 +318,6 @@ msgstr ""
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Title in atom group notice feed. %s is a group name.
 #. TRANS: Title in atom user notice feed. %s is a user name.
-#: actions/apiatomservice.php:93 actions/grouprss.php:138
-#: actions/userrss.php:94 lib/atomgroupnoticefeed.php:63
-#: lib/atomusernoticefeed.php:88
 #, php-format
 msgid "%s timeline"
 msgstr "%s-Zeitleiste"
@@ -445,8 +327,6 @@ msgstr "%s-Zeitleiste"
 #. TRANS: %s is a user nickname.
 #. TRANS: Header for subscriptions overview for a user (first page).
 #. TRANS: %s is a user nickname.
-#: actions/apiatomservice.php:104 actions/atompubsubscriptionfeed.php:148
-#: actions/subscriptions.php:51
 #, php-format
 msgid "%s subscriptions"
 msgstr "%s Abonnements"
@@ -454,58 +334,48 @@ msgstr "%s Abonnements"
 #. TRANS: Title for Atom feed with a user's favorite notices. %s is a user nickname.
 #. TRANS: Title for Atom favorites feed.
 #. TRANS: %s is a user nickname.
-#: actions/apiatomservice.php:115 actions/atompubfavoritefeed.php:142
 #, php-format
 msgid "%s favorites"
 msgstr "%s Favoriten"
 
 #. TRANS: Title for Atom feed with a user's memberships. %s is a user nickname.
-#: actions/apiatomservice.php:126
 #, php-format
 msgid "%s memberships"
 msgstr "%s Mitgliedschaften"
 
 #. TRANS: Client error displayed when users try to block themselves.
-#: actions/apiblockcreate.php:105
 msgid "You cannot block yourself!"
 msgstr "Du kannst dich nicht selbst blockieren!"
 
 #. TRANS: Server error displayed when blocking a user has failed.
-#: actions/apiblockcreate.php:127
 msgid "Block user failed."
 msgstr "Blockieren des Benutzers fehlgeschlagen."
 
 #. TRANS: Server error displayed when unblocking a user has failed.
-#: actions/apiblockdestroy.php:113
 msgid "Unblock user failed."
 msgstr "Freigeben des Benutzers fehlgeschlagen."
 
 #. TRANS: Title. %s is a user nickname.
-#: actions/apidirectmessage.php:88
 #, php-format
 msgid "Direct messages from %s"
 msgstr "Direkte Nachrichten von %s"
 
 #. TRANS: Subtitle. %s is a user nickname.
-#: actions/apidirectmessage.php:93
 #, php-format
 msgid "All the direct messages sent from %s"
 msgstr "Alle von %s gesendeten direkten Nachrichten"
 
 #. TRANS: Title. %s is a user nickname.
-#: actions/apidirectmessage.php:102
 #, php-format
 msgid "Direct messages to %s"
 msgstr "Direkte Nachrichten an %s"
 
 #. TRANS: Subtitle. %s is a user nickname.
-#: actions/apidirectmessage.php:107
 #, php-format
 msgid "All the direct messages sent to %s"
 msgstr "Alle an %s gesendeten direkten Nachrichten"
 
 #. TRANS: Client error displayed when no message text was submitted (406).
-#: actions/apidirectmessagenew.php:117
 msgid "No message text!"
 msgstr "Fehlender Nachrichtentext!"
 
@@ -513,7 +383,6 @@ msgstr "Fehlender Nachrichtentext!"
 #. TRANS: %d is the maximum number of characters for a message.
 #. TRANS: Form validation error displayed when message content is too long.
 #. TRANS: %d is the maximum number of characters for a message.
-#: actions/apidirectmessagenew.php:127 actions/newmessage.php:152
 #, php-format
 msgid "That's too long. Maximum message size is %d character."
 msgid_plural "That's too long. Maximum message size is %d characters."
@@ -523,12 +392,10 @@ msgstr[1] ""
 "Die Nachricht ist zu lang. Die maximale Nachrichtenlänge ist %d Zeichen."
 
 #. TRANS: Client error displayed if a recipient user could not be found (403).
-#: actions/apidirectmessagenew.php:139
 msgid "Recipient user not found."
 msgstr "Empfänger nicht gefunden."
 
 #. TRANS: Client error displayed trying to direct message another user who's not a friend (403).
-#: actions/apidirectmessagenew.php:144
 #, fuzzy
 msgid "Cannot send direct messages to users who aren't your friend."
 msgstr ""
@@ -536,7 +403,6 @@ msgstr ""
 "du nicht befreundet bist."
 
 #. TRANS: Client error displayed trying to direct message self (403).
-#: actions/apidirectmessagenew.php:154
 msgid ""
 "Do not send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
@@ -545,118 +411,98 @@ 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.
 #. TRANS: Client error displayed trying to delete a status with an invalid ID.
-#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:108
-#: actions/apistatusesdestroy.php:121
 msgid "No status found with that ID."
 msgstr "Keine Nachricht mit dieser ID gefunden."
 
 #. TRANS: Client error displayed when trying to mark a notice favourite that already is a favourite.
-#: actions/apifavoritecreate.php:120
 msgid "This status is already a favorite."
 msgstr "Diese Nachricht ist bereits ein Favorit!"
 
 #. TRANS: Client error displayed when marking a notice as favourite fails.
 #. TRANS: Server error displayed when trying to mark a notice as favorite fails in the database.
 #. TRANS: Error message text shown when a favorite could not be set.
-#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:306
 msgid "Could not create favorite."
 msgstr "Konnte keinen Favoriten erstellen."
 
 #. TRANS: Client error displayed when trying to remove a favourite that was not a favourite.
-#: actions/apifavoritedestroy.php:122
 msgid "That status is not a favorite."
 msgstr "Diese Nachricht ist kein Favorit!"
 
 #. TRANS: Client error displayed when removing a favourite has failed.
 #. TRANS: Server error displayed when removing a favorite from the database fails.
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:90
 msgid "Could not delete favorite."
 msgstr "Konnte Favoriten nicht löschen."
 
 #. TRANS: Client error displayed when trying follow who's profile could not be found.
-#: actions/apifriendshipscreate.php:109
 msgid "Could not follow user: profile not found."
 msgstr "Konnte Benutzer nicht folgen: Profil nicht gefunden"
 
 #. TRANS: Client error displayed when trying to follow a user that's already being followed.
 #. TRANS: %s is the nickname of the user that is already being followed.
-#: actions/apifriendshipscreate.php:120
 #, php-format
 msgid "Could not follow user: %s is already on your list."
 msgstr ""
 "Kann Benutzer %s nicht folgen: schon in deiner Kontaktliste eingetragen"
 
 #. TRANS: Client error displayed when trying to unfollow a user that cannot be found.
-#: actions/apifriendshipsdestroy.php:109
 msgid "Could not unfollow user: User not found."
 msgstr "Kann Benutzer nicht entfolgen: Benutzer nicht gefunden."
 
 #. TRANS: Client error displayed when trying to unfollow self.
-#: actions/apifriendshipsdestroy.php:121
 msgid "You cannot unfollow yourself."
 msgstr "Du kannst dich nicht selbst entfolgen!"
 
 #. TRANS: Client error displayed when supplying invalid parameters to an API call checking if a friendship exists.
-#: actions/apifriendshipsexists.php:88
 msgid "Two valid IDs or nick names must be supplied."
 msgstr "Zwei gültige IDs oder Benutzernamen müssen angegeben werden."
 
 #. TRANS: Client error displayed when a source user could not be determined showing friendship.
-#: actions/apifriendshipsshow.php:131
 msgid "Could not determine source user."
 msgstr "Konnte öffentlichen Stream nicht abrufen."
 
 #. TRANS: Client error displayed when a target user could not be determined showing friendship.
-#: actions/apifriendshipsshow.php:140
 msgid "Could not find target user."
 msgstr "Konnte keine Statusmeldungen finden."
 
 #. TRANS: Client error trying to create a group with a nickname this is already in use.
+#. TRANS: API validation exception thrown when nickname is already used.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:156 actions/apigroupprofileupdate.php:255
-#: actions/editgroup.php:191 actions/newgroup.php:137
-#: actions/profilesettings.php:274 actions/register.php:199
 msgid "Nickname already in use. Try another one."
 msgstr "Benutzername wird bereits verwendet. Suche dir einen anderen aus."
 
 #. TRANS: Client error in form for group creation.
+#. TRANS: API validation exception thrown when nickname does not validate.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:164 actions/apigroupprofileupdate.php:259
-#: actions/editgroup.php:195 actions/newgroup.php:141
-#: actions/profilesettings.php:244 actions/register.php:201
 msgid "Not a valid nickname."
 msgstr "Ungültiger Benutzername."
 
 #. TRANS: Client error in form for group creation.
+#. TRANS: API validation exception thrown when homepage URL does not validate.
 #. TRANS: Validation error shown when providing an invalid homepage URL in the "Edit application" form.
 #. TRANS: Group edit form validation error.
 #. TRANS: Validation error shown when providing an invalid homepage URL in the "New application" form.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:181 actions/apigroupprofileupdate.php:277
-#: actions/editapplication.php:235 actions/editgroup.php:202
-#: actions/newapplication.php:221 actions/newgroup.php:148
-#: actions/profilesettings.php:249 actions/register.php:208
 msgid "Homepage is not a valid URL."
 msgstr ""
 "Homepage ist keine gültige URL. URLs müssen ein Präfix wie http enthalten."
 
 #. TRANS: Client error in form for group creation.
+#. TRANS: API validation exception thrown when full name does not validate.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:191 actions/editgroup.php:206
-#: actions/newgroup.php:152 actions/profilesettings.php:253
-#: actions/register.php:211
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "Der bürgerliche Name ist zu lang (maximal 255 Zeichen)."
 
 #. TRANS: Client error shown when providing too long a description during group creation.
 #. TRANS: %d is the maximum number of allowed characters.
+#. TRANS: API validation exception thrown when description does not validate.
+#. TRANS: %d is the maximum description length and used for plural.
 #. TRANS: Validation error shown when providing too long a description in the "Edit application" form.
 #. TRANS: %d is the maximum number of allowed characters.
 #. TRANS: Group edit form validation error.
@@ -664,9 +510,6 @@ msgstr "Der bürgerliche Name ist zu lang (maximal 255 Zeichen)."
 #. TRANS: %d is the maximum number of characters for the description.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed characters.
-#: actions/apigroupcreate.php:201 actions/editapplication.php:202
-#: actions/editgroup.php:211 actions/newapplication.php:182
-#: actions/newgroup.php:157
 #, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."
@@ -674,23 +517,21 @@ msgstr[0] "Die Beschreibung ist zu lang (max. %d Zeichen)."
 msgstr[1] "Die Beschreibung ist zu lang (max. %d Zeichen)."
 
 #. TRANS: Client error shown when providing too long a location during group creation.
+#. TRANS: API validation exception thrown when location does not validate.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:215 actions/editgroup.php:218
-#: actions/newgroup.php:164 actions/profilesettings.php:266
-#: actions/register.php:220
 msgid "Location is too long (maximum 255 characters)."
 msgstr "Der eingegebene Aufenthaltsort ist zu lang (maximal 255 Zeichen)."
 
 #. TRANS: Client error shown when providing too many aliases during group creation.
 #. TRANS: %d is the maximum number of allowed aliases.
+#. TRANS: API validation exception thrown when aliases do not validate.
+#. TRANS: %d is the maximum number of aliases and used for plural.
 #. TRANS: Group edit form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.
-#: actions/apigroupcreate.php:236 actions/editgroup.php:231
-#: actions/newgroup.php:177
 #, php-format
 msgid "Too many aliases! Maximum %d allowed."
 msgid_plural "Too many aliases! Maximum %d allowed."
@@ -699,25 +540,24 @@ msgstr[1] "Zu viele Pseudonyme! Maximal %d sind erlaubt."
 
 #. TRANS: Client error shown when providing an invalid alias during group creation.
 #. TRANS: %s is the invalid alias.
-#: actions/apigroupcreate.php:253
+#. TRANS: API validation exception thrown when aliases does not validate.
+#. TRANS: %s is the invalid alias.
 #, php-format
 msgid "Invalid alias: \"%s\"."
 msgstr "Ungültiges Alias: „%s“"
 
 #. TRANS: Client error displayed when trying to use an alias during group creation that is already in use.
 #. TRANS: %s is the alias that is already in use.
+#. TRANS: API validation exception thrown when aliases is already used.
+#. TRANS: %s is the already used alias.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error. %s is the already used alias.
-#: actions/apigroupcreate.php:264 actions/apigroupprofileupdate.php:351
-#: actions/editgroup.php:246 actions/newgroup.php:193
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "Benutzername „%s“ wird bereits verwendet. Suche dir einen anderen aus."
 
 #. TRANS: Client error displayed when trying to use an alias during group creation that is the same as the group's nickname.
 #. TRANS: Group edit form validation error.
-#: actions/apigroupcreate.php:278 actions/apigroupprofileupdate.php:359
-#: actions/editgroup.php:253
 msgid "Alias can't be the same as nickname."
 msgstr "Alias kann nicht das gleiche wie der Spitzname sein."
 
@@ -725,26 +565,21 @@ msgstr "Alias kann nicht das gleiche wie der Spitzname sein."
 #. TRANS: Client error displayed when trying to join a group that does not exist.
 #. TRANS: Client error displayed when trying to leave a group that does not exist.
 #. TRANS: Client error displayed trying to show group membership on a non-existing group.
+#. TRANS: Client error displayed when not providing a group or an invalid group.
 #. TRANS: Client error displayed when trying to show a group that could not be found.
 #. TRANS: Client error displayed requesting most recent notices to a group for a non-existing group.
-#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
-#: actions/apigroupleave.php:104 actions/apigroupmembership.php:71
-#: actions/apigroupprofileupdate.php:113 actions/apigroupshow.php:81
-#: actions/apitimelinegroup.php:89
 msgid "Group not found."
 msgstr "Gruppe nicht gefunden!"
 
 #. TRANS: Server error displayed when trying to join a group the user is already a member of.
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:345
 msgid "You are already a member of that group."
 msgstr "Du bist bereits Mitglied dieser Gruppe"
 
 #. TRANS: Server error displayed when trying to join a group the user is blocked from joining.
 #. 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.
-#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:350
 msgid "You have been blocked from that group by the admin."
 msgstr "Der Admin dieser Gruppe hat dich blockiert."
 
@@ -752,13 +587,11 @@ msgstr "Der Admin dieser Gruppe hat dich blockiert."
 #. TRANS: %1$s is the joining user's nickname, $2$s is the group nickname for which the join failed.
 #. TRANS: Message given having failed to add a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:136 actions/joingroup.php:139 lib/command.php:362
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "Konnte Benutzer %1$s nicht der Gruppe %2$s hinzufügen."
 
 #. TRANS: Server error displayed when trying to leave a group the user is not a member of.
-#: actions/apigroupleave.php:115
 msgid "You are not a member of this group."
 msgstr "Du bist kein Mitglied dieser Gruppe."
 
@@ -766,116 +599,79 @@ msgstr "Du bist kein Mitglied dieser Gruppe."
 #. TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
 #. TRANS: Message given having failed to remove a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupleave.php:127 actions/leavegroup.php:133
-#: lib/command.php:410
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
 msgstr "Konnte Benutzer %1$s nicht aus der Gruppe %2$s entfernen."
 
 #. TRANS: Used as title in check for group membership. %s is a user name.
-#: actions/apigrouplist.php:94
 #, php-format
 msgid "%s's groups"
 msgstr "Gruppen von %s"
 
 #. TRANS: Used as subtitle in check for group membership. %1$s is a user name, %2$s is the site name.
-#: actions/apigrouplist.php:104
 #, php-format
 msgid "%1$s groups %2$s is a member of."
 msgstr "%1$s Gruppen in denen %2$s Mitglied ist"
 
 #. TRANS: Message is used as a title when listing the lastest 20 groups. %s is a site name.
 #. TRANS: Message is used as a page title. %s is a nick name.
-#: actions/apigrouplistall.php:88 actions/usergroups.php:63
 #, php-format
 msgid "%s groups"
 msgstr "%s Gruppen"
 
 #. TRANS: Message is used as a subtitle when listing the lastest 20 groups. %s is a site name.
-#: actions/apigrouplistall.php:93
 #, php-format
 msgid "groups on %s"
 msgstr "Gruppen von %s"
 
+#. TRANS: Client error displayed when trying to edit a group without being an admin.
 #. TRANS: Client error displayed trying to edit a group while not being a group admin.
 #. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
 #. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
-#: actions/apigroupprofileupdate.php:118 actions/editgroup.php:110
-#: actions/editgroup.php:176 actions/groupdesignsettings.php:109
-#: actions/grouplogo.php:111
 msgid "You must be an admin to edit the group."
 msgstr "Du musst ein Admin sein, um die Gruppe zu bearbeiten"
 
+#. TRANS: Server error displayed when group update fails.
 #. TRANS: Server error displayed when editing a group fails.
-#: actions/apigroupprofileupdate.php:171 actions/editgroup.php:274
 msgid "Could not update group."
 msgstr "Konnte Gruppe nicht aktualisieren."
 
+#. TRANS: Server error displayed when adding group aliases fails.
 #. TRANS: Server error displayed when group aliases could not be added.
 #. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/apigroupprofileupdate.php:194 actions/editgroup.php:281
-#: classes/User_group.php:540
 msgid "Could not create aliases."
 msgstr "Konnte keinen Favoriten erstellen."
 
+#. TRANS: API validation exception thrown when nickname does not validate.
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: actions/apigroupprofileupdate.php:249 lib/nickname.php:165
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr ""
 "Der Benutzername darf nur aus Kleinbuchstaben und Zahlen bestehen. "
 "Leerzeichen sind nicht erlaubt."
 
-#: actions/apigroupprofileupdate.php:286
-#, fuzzy
-msgid "Full name is too long (max 255 chars)."
-msgstr "Der bürgerliche Name ist zu lang (maximal 255 Zeichen)."
-
-#: actions/apigroupprofileupdate.php:296
-#, fuzzy, php-format
-msgid "description is too long (max %d chars)."
-msgstr "Die Beschreibung ist zu lang (max. %d Zeichen)."
-
-#: actions/apigroupprofileupdate.php:307
-#, fuzzy
-msgid "Location is too long (max 255 chars)."
-msgstr "Der eingegebene Aufenthaltsort ist zu lang (maximal 255 Zeichen)."
-
-#: actions/apigroupprofileupdate.php:326
-#, fuzzy, php-format
-msgid "Too many aliases! Maximum %d."
-msgstr "Zu viele Pseudonyme! Maximal eins ist erlaubt."
-
-#. TRANS: Group edit form validation error.
+#. TRANS: API validation exception thrown when alias is the same as nickname.
 #. TRANS: Group create form validation error.
-#. TRANS: %s is the invalid alias.
-#: actions/apigroupprofileupdate.php:342 actions/editgroup.php:241
-#: actions/newgroup.php:188
-#, php-format
-msgid "Invalid alias: \"%s\""
-msgstr "Ungültiges Stichwort: „%s“"
+#, fuzzy
+msgid "Alias cannot be the same as nickname."
+msgstr "Alias kann nicht das gleiche wie der Spitzname sein."
 
 #. TRANS: Client error displayed when uploading a media file has failed.
-#: actions/apimediaupload.php:101
 msgid "Upload failed."
 msgstr "Hochladen fehlgeschlagen."
 
 #. TRANS: Client error given from the OAuth API when the request token or verifier is invalid.
-#: actions/apioauthaccesstoken.php:102
 msgid "Invalid request token or verifier."
 msgstr "Anmelde-Token ungültig oder abgelaufen."
 
 #. TRANS: Client error given when no oauth_token was passed to the OAuth API.
-#: actions/apioauthauthorize.php:107
 msgid "No oauth_token parameter provided."
 msgstr "Kein oauth_token Parameter angegeben."
 
 #. TRANS: Client error given when an invalid request token was passed to the OAuth API.
-#: actions/apioauthauthorize.php:115 actions/apioauthauthorize.php:129
 msgid "Invalid request token."
 msgstr "Ungültiges Token."
 
 #. TRANS: Client error given when an invalid request token was passed to the OAuth API.
-#: actions/apioauthauthorize.php:121
 msgid "Request token already authorized."
 msgstr "Anfrage-Token bereits autorisiert."
 
@@ -885,31 +681,14 @@ msgstr "Anfrage-Token bereits autorisiert."
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
 #. TRANS: Client error displayed when the session token is not okay.
-#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:75
-#: actions/emailsettings.php:292 actions/favor.php:75 actions/geocode.php:55
-#: actions/groupblock.php:65 actions/grouplogo.php:321
-#: actions/groupunblock.php:65 actions/imsettings.php:241
-#: actions/invite.php:60 actions/makeadmin.php:66 actions/newmessage.php:135
-#: actions/newnotice.php:105 actions/nudge.php:80
-#: actions/oauthappssettings.php:162 actions/oauthconnectionssettings.php:135
-#: actions/passwordsettings.php:137 actions/pluginenable.php:87
-#: actions/profilesettings.php:218 actions/recoverpassword.php:383
-#: actions/register.php:157 actions/remotesubscribe.php:76
-#: actions/repeat.php:82 actions/smssettings.php:249 actions/subedit.php:40
-#: actions/subscribe.php:87 actions/tagother.php:145
-#: actions/unsubscribe.php:69 actions/urlsettings.php:171
-#: actions/userauthorization.php:53 lib/designsettings.php:122
 msgid "There was a problem with your session token. Try again, please."
 msgstr "Es gab ein Problem mit deinem Sitzungstoken. Bitte versuche es erneut."
 
 #. TRANS: Form validation error given when an invalid username and/or password was passed to the OAuth API.
-#: actions/apioauthauthorize.php:168
 msgid "Invalid nickname / password!"
 msgstr "Benutzername oder Passwort falsch."
 
 #. TRANS: Server error displayed when a database action fails.
-#: actions/apioauthauthorize.php:217
 msgid "Database error inserting oauth_token_association."
 msgstr "Datenbankfehler beim Einfügen von oauth_token_association."
 
@@ -925,28 +704,19 @@ msgstr "Datenbankfehler beim Einfügen von oauth_token_association."
 #. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
 #. TRANS: Message given submitting a form with an unknown action in SMS settings.
 #. TRANS: Unknown form validation error in design settings form.
-#: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
-#: actions/designadminpanel.php:100 actions/editapplication.php:144
-#: actions/emailsettings.php:311 actions/grouplogo.php:332
-#: actions/imsettings.php:256 actions/newapplication.php:124
-#: actions/oauthconnectionssettings.php:144 actions/recoverpassword.php:46
-#: actions/smssettings.php:270 lib/designsettings.php:133
 msgid "Unexpected form submission."
 msgstr "Unerwartete Formulareingabe."
 
 #. TRANS: Title for a page where a user can confirm/deny account access by an external application.
-#: actions/apioauthauthorize.php:387
 msgid "An application would like to connect to your account"
 msgstr "Ein Programm will eine Verbindung zu deinem Konto aufbauen"
 
 #. TRANS: Fieldset legend.
-#: actions/apioauthauthorize.php:404
 msgid "Allow or deny access"
 msgstr "Zugriff erlauben oder ablehnen"
 
 #. TRANS: User notification of external application requesting account access.
 #. TRANS: %3$s is the access type requested (read-write or read-only), %4$s is the StatusNet sitename.
-#: actions/apioauthauthorize.php:425
 #, php-format
 msgid ""
 "An application would like the ability to <strong>%3$s</strong> your %4$s "
@@ -960,7 +730,6 @@ msgstr ""
 #. TRANS: User notification of external application requesting account access.
 #. TRANS: %1$s is the application name requesting access, %2$s is the organisation behind the application,
 #. TRANS: %3$s is the access type requested, %4$s is the StatusNet sitename.
-#: actions/apioauthauthorize.php:433
 #, php-format
 msgid ""
 "The application <strong>%1$s</strong> by <strong>%2$s</strong> would like "
@@ -972,22 +741,18 @@ msgstr ""
 "vertrauenswürdigen Quellen Erlaubnis zu deinem %4$s Zugang geben."
 
 #. TRANS: Fieldset legend.
-#: actions/apioauthauthorize.php:455
 msgctxt "LEGEND"
 msgid "Account"
 msgstr "Profil"
 
 #. TRANS: Field label on OAuth API authorisation form.
+#. TRANS: Field label on login page.
 #. TRANS: Field label in form for profile settings.
-#: actions/apioauthauthorize.php:459 actions/login.php:225
-#: actions/profilesettings.php:107 actions/register.php:411
-#: actions/userauthorization.php:145 lib/groupeditform.php:145
 msgid "Nickname"
 msgstr "Benutzername"
 
 #. TRANS: Field label on OAuth API authorisation form.
-#: actions/apioauthauthorize.php:463 actions/login.php:228
-#: actions/register.php:415 lib/settingsnav.php:87
+#. TRANS: Field label on login page.
 msgid "Password"
 msgstr "Passwort"
 
@@ -997,43 +762,34 @@ msgstr "Passwort"
 #. TRANS: Button label to cancel an IM address confirmation procedure.
 #. TRANS: Button label to cancel a SMS address confirmation procedure.
 #. TRANS: Button label in the "Edit application" form.
-#: actions/apioauthauthorize.php:478 actions/emailsettings.php:125
-#: actions/imsettings.php:136 actions/smssettings.php:132
-#: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Cancel"
 msgstr "Abbrechen"
 
 #. TRANS: Button text that when clicked will allow access to an account by an external application.
-#: actions/apioauthauthorize.php:485
 msgctxt "BUTTON"
 msgid "Allow"
 msgstr "Erlauben"
 
 #. TRANS: Form instructions.
-#: actions/apioauthauthorize.php:502
 msgid "Authorize access to your account information."
 msgstr "Zugang zu deinem Benutzerkonto autorisieren."
 
 #. TRANS: Header for user notification after revoking OAuth access to an application.
-#: actions/apioauthauthorize.php:594
 msgid "Authorization canceled."
 msgstr "Authorisierung abgebrochen."
 
 #. TRANS: User notification after revoking OAuth access to an application.
 #. TRANS: %s is an OAuth token.
-#: actions/apioauthauthorize.php:598
 #, php-format
 msgid "The request token %s has been revoked."
 msgstr "Die Anfrage %s wurde gesperrt und widerrufen."
 
 #. TRANS: Title of the page notifying the user that an anonymous client application was successfully authorized to access the user's account with OAuth.
-#: actions/apioauthauthorize.php:621
 msgid "You have successfully authorized the application"
 msgstr "Du hast das Programm erfolgreich autorisiert."
 
 #. TRANS: Message notifying the user that an anonymous client application was successfully authorized to access the user's account with OAuth.
-#: actions/apioauthauthorize.php:625
 msgid ""
 "Please return to the application and enter the following security code to "
 "complete the process."
@@ -1043,14 +799,12 @@ msgstr ""
 
 #. TRANS: Title of the page notifying the user that the client application was successfully authorized to access the user's account with OAuth.
 #. TRANS: %s is the authorised application name.
-#: actions/apioauthauthorize.php:632
 #, php-format
 msgid "You have successfully authorized %s"
 msgstr "Du hast %s erfolgreich autorisiert."
 
 #. TRANS: Message notifying the user that the client application was successfully authorized to access the user's account with OAuth.
 #. TRANS: %s is the authorised application name.
-#: actions/apioauthauthorize.php:639
 #, php-format
 msgid ""
 "Please return to %s and enter the following security code to complete the "
@@ -1061,12 +815,10 @@ msgstr ""
 
 #. TRANS: Client error displayed trying to delete a status not using POST or DELETE.
 #. TRANS: POST and DELETE should not be translated.
-#: actions/apistatusesdestroy.php:111
 msgid "This method requires a POST or DELETE."
 msgstr "Diese Methode benötigt ein POST oder DELETE."
 
 #. TRANS: Client error displayed trying to delete a status of another user.
-#: actions/apistatusesdestroy.php:136
 msgid "You may not delete another user's status."
 msgstr "Du kannst den Status eines anderen Benutzers nicht löschen."
 
@@ -1074,21 +826,16 @@ msgstr "Du kannst den Status eines anderen Benutzers nicht löschen."
 #. TRANS: Client error displayed trying to display redents of a non-exiting notice.
 #. TRANS: Client exception thrown when referencing a non-existing notice.
 #. TRANS: Error message displayed trying to delete a non-existing notice.
-#: actions/apistatusesretweet.php:74 actions/apistatusesretweets.php:70
-#: actions/atompubshowfavorite.php:82 actions/deletenotice.php:61
-#: actions/shownotice.php:92
 msgid "No such notice."
 msgstr "Unbekannte Nachricht."
 
 #. TRANS: Client error displayed trying to repeat an own notice through the API.
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:549
 msgid "Cannot repeat your own notice."
 msgstr "Du kannst deine eigenen Nachrichten nicht wiederholen."
 
 #. TRANS: Client error displayed trying to re-repeat a notice through the API.
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:92 lib/command.php:555
 msgid "Already repeated that notice."
 msgstr "Nachricht bereits wiederholt"
 
@@ -1098,50 +845,38 @@ msgstr "Nachricht bereits wiederholt"
 #. TRANS: Client exception thrown when using an unsupported HTTP method.
 #. TRANS: Client error shown when using a non-supported HTTP method.
 #. TRANS: Client exception thrown when using an unsupported HTTP method.
-#: actions/apistatusesshow.php:118 actions/atompubfavoritefeed.php:103
-#: actions/atompubmembershipfeed.php:105 actions/atompubshowfavorite.php:117
-#: actions/atompubshowmembership.php:116
-#: actions/atompubshowsubscription.php:122
-#: actions/atompubsubscriptionfeed.php:109
 msgid "HTTP method not supported."
 msgstr "HTTP-Methode wird nicht unterstützt."
 
 #. TRANS: Exception thrown requesting an unsupported notice output format.
 #. TRANS: %s is the requested output format.
-#: actions/apistatusesshow.php:144
-#, fuzzy, php-format
+#, php-format
 msgid "Unsupported format: %s."
 msgstr "Nicht unterstütztes Bildformat: %s"
 
 #. TRANS: Client error displayed requesting a deleted status.
-#: actions/apistatusesshow.php:155
 msgid "Status deleted."
 msgstr "Status gelöscht."
 
 #. TRANS: Client error displayed requesting a status with an invalid ID.
-#: actions/apistatusesshow.php:162
 msgid "No status with that ID found."
-msgstr "Keine Nachricht mit dieser ID gefunden."
+msgstr "Kein Status mit dieser ID gefunden."
 
 #. TRANS: Client error displayed when trying to delete a notice not using the Atom format.
-#: actions/apistatusesshow.php:227
 msgid "Can only delete using the Atom format."
 msgstr ""
 
 #. TRANS: Client error displayed when a user has no rights to delete notices of other users.
 #. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
-#: actions/apistatusesshow.php:235 actions/deletenotice.php:78
 msgid "Cannot delete this notice."
 msgstr "Die Nachricht konnte nicht gelöscht werden."
 
 #. TRANS: Confirmation of notice deletion in API. %d is the ID (number) of the deleted notice.
-#: actions/apistatusesshow.php:249
 #, php-format
 msgid "Deleted notice %d"
-msgstr "Notiz %d löschen"
+msgstr "Notiz %d ist gelöscht"
 
 #. TRANS: Client error displayed when the parameter "status" is missing.
-#: actions/apistatusesupdate.php:221
 msgid "Client must provide a 'status' parameter with a value."
 msgstr ""
 "Der Client muss einen „status“-Parameter mit einen Wert zur Verfügung "
@@ -1149,8 +884,6 @@ msgstr ""
 
 #. TRANS: Client error displayed when the parameter "status" is missing.
 #. TRANS: %d is the maximum number of character for a notice.
-#: actions/apistatusesupdate.php:244 actions/newnotice.php:161
-#: lib/mailhandler.php:60
 #, php-format
 msgid "That's too long. Maximum notice size is %d character."
 msgid_plural "That's too long. Maximum notice size is %d characters."
@@ -1160,13 +893,11 @@ msgstr[1] ""
 "Das war zu lang. Die Länge einer Nachricht ist auf %d Zeichen beschränkt."
 
 #. TRANS: Client error displayed when replying to a non-existing notice.
-#: actions/apistatusesupdate.php:284
 msgid "Parent notice not found."
 msgstr "API-Methode nicht gefunden."
 
 #. TRANS: Client error displayed exceeding the maximum notice length.
 #. TRANS: %d is the maximum lenth for a notice.
-#: actions/apistatusesupdate.php:308 actions/newnotice.php:184
 #, php-format
 msgid "Maximum notice size is %d character, including attachment URL."
 msgid_plural "Maximum notice size is %d characters, including attachment URL."
@@ -1179,13 +910,11 @@ msgstr[1] ""
 
 #. TRANS: Client error displayed when requesting profiles of followers in an unsupported format.
 #. TRANS: Client error displayed when requesting IDs of followers in an unsupported format.
-#: actions/apisubscriptions.php:228 actions/apisubscriptions.php:258
 msgid "Unsupported format."
 msgstr "Bildformat wird nicht unterstützt."
 
 #. TRANS: Title for timeline of most recent favourite notices by a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname.
-#: actions/apitimelinefavorites.php:108
 #, php-format
 msgid "%1$s / Favorites from %2$s"
 msgstr "%1$s / Favoriten von %2$s"
@@ -1193,14 +922,12 @@ msgstr "%1$s / Favoriten von %2$s"
 #. TRANS: Subtitle for timeline of most recent favourite notices by a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user's full name,
 #. TRANS: %3$s is a user nickname.
-#: actions/apitimelinefavorites.php:120
 #, php-format
 msgid "%1$s updates favorited by %2$s / %3$s."
 msgstr "%1$s-Aktualisierungen favorisiert von %2$s / %3$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.
-#: actions/apitimelinementions.php:115
 #, php-format
 msgid "%1$s / Updates mentioning %2$s"
 msgstr "%1$s / Aktualisierungen erwähnen %2$s"
@@ -1208,48 +935,40 @@ msgstr "%1$s / Aktualisierungen erwähnen %2$s"
 #. TRANS: Subtitle for timeline of most recent mentions of a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname,
 #. TRANS: %3$s is a user's full name.
-#: actions/apitimelinementions.php:131
 #, php-format
 msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr "Nachrichten von %1$s, die auf Nachrichten von %2$s / %3$s antworten."
 
 #. TRANS: Title for site timeline. %s is the StatusNet sitename.
 #. TRANS: Public RSS feed title. %s is the StatusNet site name.
-#: actions/apitimelinepublic.php:193 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "%s öffentliche Zeitleiste"
 
 #. TRANS: Subtitle for site timeline. %s is the StatusNet sitename.
-#: actions/apitimelinepublic.php:199
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "%s Nachrichten von allen!"
 
 #. TRANS: Server error displayed calling unimplemented API method for 'retweeted by me'.
-#: actions/apitimelineretweetedbyme.php:71
 msgid "Unimplemented."
 msgstr "Nicht unterstützte Methode."
 
 #. TRANS: Title for Atom feed "repeated to me". %s is the user nickname.
-#: actions/apitimelineretweetedtome.php:96
 #, php-format
 msgid "Repeated to %s"
 msgstr "Antworten an %s"
 
-#: actions/apitimelineretweetedtome.php:98
 #, fuzzy, php-format
 msgid "%1$s notices that were to repeated to %2$s / %3$s."
 msgstr "Nachrichten von %1$s, die auf Nachrichten von %2$s / %3$s antworten."
 
 #. TRANS: Title of list of repeated notices of the logged in user.
 #. TRANS: %s is the nickname of the logged in user.
-#: actions/apitimelineretweetsofme.php:98
 #, php-format
 msgid "Repeats of %s"
 msgstr "Antworten von %s"
 
-#: actions/apitimelineretweetsofme.php:104
 #, fuzzy, php-format
 msgid "%1$s notices that %2$s / %3$s has repeated."
 msgstr "%1$s markierte Nachricht %2$s als Favorit."
@@ -1258,175 +977,142 @@ msgstr "%1$s markierte Nachricht %2$s als Favorit."
 #. TRANS: %s is the tag.
 #. TRANS: Title for first page of notices with tags.
 #. TRANS: %s is the tag.
-#: actions/apitimelinetag.php:101 actions/tag.php:69
 #, php-format
 msgid "Notices tagged with %s"
 msgstr "Mit „%s“ getaggte Nachrichten"
 
 #. TRANS: Subtitle for timeline with lastest notices with a given tag.
 #. TRANS: %1$s is the tag, $2$s is the StatusNet sitename.
-#: actions/apitimelinetag.php:105 actions/tagrss.php:65
 #, php-format
 msgid "Updates tagged with %1$s on %2$s!"
 msgstr "Mit „%1$s“ getaggte Nachrichten auf „%2$s“!"
 
 #. TRANS: Client error displayed trying to add a notice to another user's timeline.
-#: actions/apitimelineuser.php:308
 msgid "Only the user can add to their own timeline."
 msgstr "Nur der Benutzer kann Nachrichten in die eigene Timeline hinzufügen."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:315
 msgid "Only accept AtomPub for Atom feeds."
 msgstr "Es wird nur AtomPub als Atom Feed akzeptiert"
 
 #. TRANS: Client error displayed attempting to post an empty API notice.
-#: actions/apitimelineuser.php:322
 msgid "Atom post must not be empty."
 msgstr "Atom Post darf nicht leer sein."
 
 #. TRANS: Client error displayed attempting to post an API that is not well-formed XML.
-#: actions/apitimelineuser.php:328
 msgid "Atom post must be well-formed XML."
 msgstr "Atom Post muss wohlgeformtes XML sein."
 
 #. TRANS: Client error displayed when not using an Atom entry.
-#: actions/apitimelineuser.php:334 actions/atompubfavoritefeed.php:228
-#: actions/atompubmembershipfeed.php:230
-#: actions/atompubsubscriptionfeed.php:236
 msgid "Atom post must be an Atom entry."
 msgstr "Atom-Post muss ein Atom-Eintrag sein."
 
 #. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
-#: actions/apitimelineuser.php:345
 msgid "Can only handle POST activities."
 msgstr "Nur POST verwenden"
 
 #. TRANS: Client error displayed when using an unsupported activity object type.
 #. TRANS: %s is the unsupported activity object type.
-#: actions/apitimelineuser.php:356
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
 #. TRANS: %d is the notice ID (number).
-#: actions/apitimelineuser.php:390
 #, php-format
 msgid "No content for notice %d."
 msgstr "Kein Inhalt für Nachricht %d."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
 #. TRANS: %s is the notice URI.
-#: actions/apitimelineuser.php:419
 #, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "Nachricht mit URI „%s“ existiert bereits."
 
 #. TRANS: Server error for unfinished API method showTrends.
-#: actions/apitrends.php:85
 msgid "API method under construction."
 msgstr "API-Methode im Aufbau."
 
 #. TRANS: Client error displayed when requesting user information for a non-existing user.
-#: actions/apiuserprofileimage.php:80 actions/apiusershow.php:94
 msgid "User not found."
 msgstr "API-Methode nicht gefunden."
 
 #. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
 #. TRANS: Client exception.
 #. TRANS: Client error displayed trying to subscribe to a non-existing profile.
-#: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
-#: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
-#: actions/subscribe.php:110
 msgid "No such profile."
 msgstr "Profil nicht gefunden."
 
 #. TRANS: Subtitle for Atom favorites feed.
 #. TRANS: %1$s is a user nickname, %2$s is the StatusNet sitename.
-#: actions/atompubfavoritefeed.php:147
 #, fuzzy, php-format
 msgid "Notices %1$s has favorited on %2$s"
 msgstr "Aktualisierungen von %1$s und Freunden auf %2$s!"
 
 #. TRANS: Client exception thrown when trying to set a favorite for another user.
 #. TRANS: Client exception thrown when trying to subscribe another user.
-#: actions/atompubfavoritefeed.php:217 actions/atompubsubscriptionfeed.php:225
 #, fuzzy
 msgid "Cannot add someone else's subscription."
 msgstr "Konnte neues Abonnement nicht eintragen."
 
 #. TRANS: Client exception thrown when trying use an incorrect activity verb for the Atom pub method.
-#: actions/atompubfavoritefeed.php:240
 #, fuzzy
 msgid "Can only handle favorite activities."
 msgstr "Durchsuche den Inhalt der Nachrichten"
 
 #. TRANS: Client exception thrown when trying favorite an object that is not a notice.
-#: actions/atompubfavoritefeed.php:250 actions/atompubmembershipfeed.php:250
 #, fuzzy
 msgid "Can only fave notices."
 msgstr "Durchsuche den Inhalt der Nachrichten"
 
 #. TRANS: Client exception thrown when trying favorite a notice without content.
-#: actions/atompubfavoritefeed.php:259
 msgid "Unknown note."
 msgstr "Unbekannter Hinweis."
 
 #. TRANS: Client exception thrown when trying favorite an already favorited notice.
-#: actions/atompubfavoritefeed.php:267
 msgid "Already a favorite."
 msgstr "Bereits ein Favorit."
 
 #. TRANS: Title for group membership feed.
 #. TRANS: %s is a username.
-#: actions/atompubmembershipfeed.php:144
 #, php-format
 msgid "%s group memberships"
 msgstr "%s Gruppen-Mitgliedschaften"
 
 #. TRANS: Subtitle for group membership feed.
 #. TRANS: %1$s is a username, %2$s is the StatusNet sitename.
-#: actions/atompubmembershipfeed.php:149
 #, fuzzy, php-format
 msgid "Groups %1$s is a member of on %2$s"
 msgstr "Gruppen, in denen „%s“ Mitglied ist"
 
 #. TRANS: Client exception thrown when trying subscribe someone else to a group.
-#: actions/atompubmembershipfeed.php:219
 #, fuzzy
 msgid "Cannot add someone else's membership."
 msgstr "Konnte neues Abonnement nicht eintragen."
 
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#: actions/atompubmembershipfeed.php:242
 #, fuzzy
 msgid "Can only handle join activities."
 msgstr "Durchsuche den Inhalt der Nachrichten"
 
 #. TRANS: Client exception thrown when trying to subscribe to a non-existing group.
-#: actions/atompubmembershipfeed.php:259
 msgid "Unknown group."
 msgstr "Unbekannte Gruppe."
 
 #. TRANS: Client exception thrown when trying to subscribe to an already subscribed group.
-#: actions/atompubmembershipfeed.php:267
 msgid "Already a member."
 msgstr "Bereits Mitglied."
 
 #. TRANS: Client exception thrown when trying to subscribe to group while blocked from that group.
-#: actions/atompubmembershipfeed.php:275
 msgid "Blocked by admin."
 msgstr "blockiert vom Administrator"
 
 #. TRANS: Client exception thrown when referencing a non-existing favorite.
-#: actions/atompubshowfavorite.php:90
 msgid "No such favorite."
 msgstr "Favorit nicht gefunden."
 
 #. TRANS: Client exception thrown when trying to remove a favorite notice of another user.
-#: actions/atompubshowfavorite.php:151
 #, fuzzy
 msgid "Cannot delete someone else's favorite."
 msgstr "Konnte Favoriten nicht löschen."
@@ -1453,92 +1139,67 @@ msgstr "Konnte Favoriten nicht löschen."
 #. TRANS: Client error displayed when trying to join a non-existing group.
 #. TRANS: Client error displayed when trying to leave a non-local group.
 #. TRANS: Client error displayed when trying to leave a non-existing group.
+#. TRANS: Client error displayed when providing an invalid group ID on the Make Admin page.
 #. 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.
 #. TRANS: Command exception text shown when a group is requested that does not exist.
 #. TRANS: Error text shown when trying to leave a group that does not exist.
-#: actions/atompubshowmembership.php:81 actions/blockedfromgroup.php:81
-#: actions/blockedfromgroup.php:89 actions/deletegroup.php:87
-#: actions/deletegroup.php:100 actions/editgroup.php:102
-#: actions/foafgroup.php:46 actions/foafgroup.php:65 actions/foafgroup.php:73
-#: actions/groupblock.php:89 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:101 actions/grouplogo.php:103
-#: actions/groupmembers.php:84 actions/groupmembers.php:92
-#: actions/grouprss.php:97 actions/grouprss.php:105
-#: actions/groupunblock.php:89 actions/joingroup.php:82
-#: actions/joingroup.php:95 actions/leavegroup.php:82
-#: actions/leavegroup.php:95 actions/makeadmin.php:86
-#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:392
 msgid "No such group."
 msgstr "Keine derartige Gruppe."
 
 #. TRANS: Client exception thrown when trying to show membership of a non-subscribed group
-#: actions/atompubshowmembership.php:91
 msgid "Not a member."
 msgstr "Kein Mitglied"
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
-#: actions/atompubshowmembership.php:150
 #, fuzzy
 msgid "Cannot delete someone else's membership."
 msgstr "Konnte Selbst-Abonnement nicht löschen."
 
 #. TRANS: Client exception thrown when trying to display a subscription for a non-existing profile ID.
 #. TRANS: %d is the non-existing profile ID number.
-#: actions/atompubshowsubscription.php:72
-#: actions/atompubshowsubscription.php:83
-#: actions/atompubsubscriptionfeed.php:74
 #, php-format
 msgid "No such profile id: %d."
 msgstr "Keine Profil-Id: %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.
-#: actions/atompubshowsubscription.php:94
 #, fuzzy, php-format
 msgid "Profile %1$d not subscribed to profile %2$d."
 msgstr "Du hast dieses Profil nicht abonniert."
 
 #. TRANS: Client exception thrown when trying to delete a subscription of another user.
-#: actions/atompubshowsubscription.php:157
 #, fuzzy
 msgid "Cannot delete someone else's subscription."
 msgstr "Konnte Selbst-Abonnement nicht löschen."
 
 #. TRANS: Subtitle for Atom subscription feed.
 #. TRANS: %1$s is a user nickname, %s$s is the StatusNet sitename.
-#: actions/atompubsubscriptionfeed.php:153
 #, fuzzy, php-format
 msgid "People %1$s has subscribed to on %2$s"
 msgstr "Leute, die „%s“ abonniert haben"
 
 #. TRANS: Client error displayed when not using the follow verb.
-#: actions/atompubsubscriptionfeed.php:248
 msgid "Can only handle Follow activities."
 msgstr ""
 
 #. TRANS: Client exception thrown when subscribing to an object that is not a person.
-#: actions/atompubsubscriptionfeed.php:256
 msgid "Can only follow people."
 msgstr "Man kann nur Personen folgen"
 
 #. TRANS: Client exception thrown when subscribing to a non-existing profile.
 #. TRANS: %s is the unknown profile ID.
-#: actions/atompubsubscriptionfeed.php:267
 #, php-format
 msgid "Unknown profile %s."
 msgstr "Profil %s ist unbekannt"
 
 #. TRANS: Client error displayed trying to subscribe to an already subscribed profile.
 #. TRANS: %s is the profile the user already has a subscription on.
-#: actions/atompubsubscriptionfeed.php:275
 #, fuzzy, php-format
 msgid "Already subscribed to %s."
 msgstr "Bereits abonniert!"
 
 #. TRANS: Client error displayed trying to get a non-existing attachment.
-#: actions/attachment.php:73
 msgid "No such attachment."
 msgstr "Kein solcher Anhang."
 
@@ -1550,31 +1211,23 @@ msgstr "Kein solcher Anhang."
 #. TRANS: Client error displayed when trying to view group members without providing a group nickname.
 #. TRANS: Client error displayed when requesting a group RSS feed without providing a group nickname.
 #. TRANS: Client error displayed if no nickname argument was given requesting a group page.
-#: actions/avatarbynickname.php:60 actions/blockedfromgroup.php:73
-#: actions/editgroup.php:85 actions/groupdesignsettings.php:84
-#: actions/grouplogo.php:86 actions/groupmembers.php:76
-#: actions/grouprss.php:89 actions/showgroup.php:116
 msgid "No nickname."
 msgstr "Kein Benutzername."
 
 #. TRANS: Client error displayed trying to get an avatar without providing an avatar size.
-#: actions/avatarbynickname.php:66
 msgid "No size."
 msgstr "Keine Größe."
 
 #. TRANS: Client error displayed trying to get an avatar providing an invalid avatar size.
-#: actions/avatarbynickname.php:72
 msgid "Invalid size."
 msgstr "Ungültige Größe."
 
 #. TRANS: Title for avatar upload page.
-#: actions/avatarsettings.php:66 lib/settingsnav.php:82
 msgid "Avatar"
 msgstr "Avatar"
 
 #. TRANS: Instruction for avatar upload page.
 #. TRANS: %s is the maximum file size, for example "500b", "10kB" or "2MB".
-#: actions/avatarsettings.php:78
 #, php-format
 msgid "You can upload your personal avatar. The maximum file size is %s."
 msgstr ""
@@ -1584,17 +1237,12 @@ msgstr ""
 #. TRANS: Server error displayed coming across a request from a user without a profile.
 #. TRANS: Server error displayed when trying to authorise a remote subscription request
 #. TRANS: while the user has no profile.
-#: actions/avatarsettings.php:108 actions/avatarsettings.php:192
-#: actions/grouplogo.php:184 actions/remotesubscribe.php:190
-#: actions/userauthorization.php:75 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr "Benutzer ohne passendes Profil"
 
 #. TRANS: Avatar upload page form legend.
 #. TRANS: Avatar upload page crop form legend.
 #. TRANS: Legend for group logo settings fieldset.
-#: actions/avatarsettings.php:122 actions/avatarsettings.php:205
-#: actions/grouplogo.php:261
 msgid "Avatar settings"
 msgstr "Avatar-Einstellungen"
 
@@ -1602,8 +1250,6 @@ msgstr "Avatar-Einstellungen"
 #. TRANS: Header on avatar upload crop form for thumbnail of originally uploaded avatar (h2).
 #. TRANS: Uploaded original file in group logo form.
 #. TRANS: Header for originally uploaded file before a crop on the group logo page.
-#: actions/avatarsettings.php:131 actions/avatarsettings.php:214
-#: actions/grouplogo.php:207 actions/grouplogo.php:270
 msgid "Original"
 msgstr "Original"
 
@@ -1611,38 +1257,31 @@ msgstr "Original"
 #. TRANS: Header on avatar upload crop form for thumbnail of to be used rendition of uploaded avatar (h2).
 #. TRANS: Header for preview of to be displayed group logo.
 #. TRANS: Header for the cropped group logo on the group logo page.
-#: actions/avatarsettings.php:147 actions/avatarsettings.php:227
-#: actions/grouplogo.php:219 actions/grouplogo.php:283
 msgid "Preview"
 msgstr "Vorschau"
 
 #. TRANS: Button on avatar upload page to delete current avatar.
 #. TRANS: Button text for user account deletion.
-#: actions/avatarsettings.php:155 actions/deleteaccount.php:319
 msgctxt "BUTTON"
 msgid "Delete"
 msgstr "Löschen"
 
 #. TRANS: Button on avatar upload page to upload an avatar.
 #. TRANS: Submit button to confirm upload of a user backup file for account restore.
-#: actions/avatarsettings.php:173 actions/restoreaccount.php:369
 msgctxt "BUTTON"
 msgid "Upload"
 msgstr "Hochladen"
 
 #. TRANS: Button on avatar upload crop form to confirm a selected crop as avatar.
-#: actions/avatarsettings.php:243
 msgctxt "BUTTON"
 msgid "Crop"
 msgstr "Zuschneiden"
 
 #. TRANS: Validation error on avatar upload form when no file was uploaded.
-#: actions/avatarsettings.php:318
 msgid "No file uploaded."
 msgstr "Keine Datei hoch geladen."
 
 #. TRANS: Avatar upload form instruction after uploading a file.
-#: actions/avatarsettings.php:345
 #, fuzzy
 msgid "Pick a square area of the image to be your avatar."
 msgstr ""
@@ -1650,44 +1289,36 @@ msgstr ""
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
 #. TRANS: Server error displayed trying to crop an uploaded group logo that is no longer present.
-#: actions/avatarsettings.php:360 actions/grouplogo.php:391
 msgid "Lost our file data."
 msgstr "Daten verloren."
 
 #. TRANS: Success message for having updated a user avatar.
-#: actions/avatarsettings.php:384
 msgid "Avatar updated."
 msgstr "Avatar aktualisiert."
 
 #. TRANS: Error displayed on the avatar upload page if the avatar could not be updated for an unknown reason.
-#: actions/avatarsettings.php:388
 msgid "Failed updating avatar."
 msgstr "Aktualisierung des Avatars fehlgeschlagen."
 
 #. TRANS: Success message for deleting a user avatar.
-#: actions/avatarsettings.php:412
 msgid "Avatar deleted."
 msgstr "Avatar gelöscht."
 
 #. TRANS: Title for backup account page.
 #. TRANS: Option in profile settings to create a backup of the account of the currently logged in user.
-#: actions/backupaccount.php:61 actions/profilesettings.php:468
 msgid "Backup account"
 msgstr "Backup-Konto"
 
 #. TRANS: Client exception thrown when trying to backup an account while not logged in.
-#: actions/backupaccount.php:79
 #, fuzzy
 msgid "Only logged-in users can backup their account."
 msgstr "Nur angemeldete Benutzer können Nachrichten wiederholen."
 
 #. TRANS: Client exception thrown when trying to backup an account without having backup rights.
-#: actions/backupaccount.php:84
 msgid "You may not backup your account."
 msgstr ""
 
 #. TRANS: Information displayed on the backup account page.
-#: actions/backupaccount.php:227
 msgid ""
 "You can backup your account data in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format. This is an experimental feature and provides "
@@ -1697,31 +1328,26 @@ msgid ""
 msgstr ""
 
 #. TRANS: Submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:250
 msgctxt "BUTTON"
 msgid "Backup"
 msgstr "Backup"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:254
 #, fuzzy
 msgid "Backup your account."
 msgstr "Backup-Konto"
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
-#: actions/block.php:68
 msgid "You already blocked that user."
 msgstr "Du hast diesen Benutzer bereits blockiert."
 
 #. TRANS: Title for block user page.
 #. TRANS: Legend for block user form.
 #. TRANS: Fieldset legend for block user from group form.
-#: actions/block.php:106 actions/block.php:136 actions/groupblock.php:165
 msgid "Block user"
 msgstr "Benutzer blockieren"
 
 #. TRANS: Explanation of consequences when blocking a user on the block user page.
-#: actions/block.php:139
 msgid ""
 "Are you sure you want to block this user? Afterwards, they will be "
 "unsubscribed from you, unable to subscribe to you in the future, and you "
@@ -1737,15 +1363,11 @@ msgstr ""
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:154 actions/deleteapplication.php:157
-#: actions/deletegroup.php:220 actions/deletenotice.php:155
-#: actions/deleteuser.php:154 actions/groupblock.php:187
 msgctxt "BUTTON"
 msgid "No"
 msgstr "Nein"
 
 #. TRANS: Submit button title for 'No' when blocking a user.
-#: actions/block.php:158
 #, fuzzy
 msgid "Do not block this user."
 msgstr "Diesen Benutzer freigeben"
@@ -1756,175 +1378,139 @@ msgstr "Diesen Benutzer freigeben"
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:161 actions/deleteapplication.php:164
-#: actions/deletegroup.php:227 actions/deletenotice.php:162
-#: actions/deleteuser.php:161 actions/groupblock.php:194
 msgctxt "BUTTON"
 msgid "Yes"
 msgstr "Ja"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:165
 msgid "Block this user."
 msgstr "Diesen Benutzer blockieren."
 
 #. TRANS: Server error displayed when blocking a user fails.
-#: actions/block.php:189
 msgid "Failed to save block information."
 msgstr "Konnte Blockierungsdaten nicht speichern."
 
 #. TRANS: Title for first page with list of users blocked from a group.
 #. TRANS: %s is a group nickname.
-#: actions/blockedfromgroup.php:101
 #, php-format
 msgid "%s blocked profiles"
 msgstr "%s blockierte Benutzerprofile"
 
 #. TRANS: Title for any but the first page with list of users blocked from a group.
 #. TRANS: %1$s is a group nickname, %2$d is a page number.
-#: actions/blockedfromgroup.php:106
 #, php-format
 msgid "%1$s blocked profiles, page %2$d"
 msgstr "%1$s blockierte Benutzerprofile, Seite %2$d"
 
 #. TRANS: Instructions for list of users blocked from a group.
-#: actions/blockedfromgroup.php:122
 msgid "A list of the users blocked from joining this group."
 msgstr "Liste der blockierten Benutzer in dieser Gruppe."
 
 #. TRANS: Form legend for unblocking a user from a group.
-#: actions/blockedfromgroup.php:291
 msgid "Unblock user from group"
 msgstr "Blockierung des Benutzers für die Gruppe aufheben."
 
 #. TRANS: Button text for unblocking a user from a group.
-#: actions/blockedfromgroup.php:323
 msgctxt "BUTTON"
 msgid "Unblock"
 msgstr "Freigeben"
 
 #. TRANS: Tooltip for button for unblocking a user from a group.
 #. TRANS: Description of the form to unblock a user.
-#: actions/blockedfromgroup.php:327 lib/unblockform.php:78
 msgid "Unblock this user"
 msgstr "Diesen Benutzer freigeben"
 
 #. TRANS: Title for mini-posting window loaded from bookmarklet.
 #. TRANS: %s is the StatusNet site name.
-#: actions/bookmarklet.php:51
 #, php-format
 msgid "Post to %s"
 msgstr "Versenden an %s"
 
 #. TRANS: Client error displayed when not providing a confirmation code in the contact address confirmation action.
-#: actions/confirmaddress.php:74
 msgid "No confirmation code."
 msgstr "Kein Bestätigungs-Code."
 
 #. TRANS: Client error displayed when providing a non-existing confirmation code in the contact address confirmation action.
-#: actions/confirmaddress.php:80
 msgid "Confirmation code not found."
 msgstr "Bestätigungscode nicht gefunden."
 
 #. TRANS: Client error displayed when not providing a confirmation code for another user in the contact address confirmation action.
-#: actions/confirmaddress.php:86
 msgid "That confirmation code is not for you!"
 msgstr "Dieser Bestätigungscode ist nicht für dich!"
 
 #. TRANS: Server error for an unknown address type, which can be 'email', 'sms', or the name of an IM network (such as 'xmpp' or 'aim')
-#: actions/confirmaddress.php:94
-#, fuzzy, php-format
+#, php-format
 msgid "Unrecognized address type %s"
 msgstr "Nicht erkannter Adresstyp %s"
 
 #. TRANS: Client error for an already confirmed email/jabber/sms address.
-#: actions/confirmaddress.php:103 actions/confirmaddress.php:136
 msgid "That address has already been confirmed."
 msgstr "Diese Adresse wurde bereits bestätigt."
 
-#: actions/confirmaddress.php:121 actions/imsettings.php:444
-#: actions/userdesignsettings.php:306
-#, fuzzy
 msgid "Couldn't update user."
 msgstr "Konnte Benutzerdaten nicht aktualisieren."
 
-#: actions/confirmaddress.php:144
 #, fuzzy
 msgid "Couldn't update user im preferences."
 msgstr "Konnte Benutzereintrag nicht schreiben"
 
-#: actions/confirmaddress.php:156
 #, fuzzy
 msgid "Couldn't insert user im preferences."
 msgstr "Konnte neues Abonnement nicht eintragen."
 
 #. TRANS: Server error displayed when an address confirmation code deletion from the
 #. TRANS: database fails in the contact address confirmation action.
-#: actions/confirmaddress.php:169
 msgid "Could not delete address confirmation."
 msgstr "Konnte Adressen-Bestätigung nicht löschen."
 
 #. TRANS: Title for the contact address confirmation action.
-#: actions/confirmaddress.php:185
 msgid "Confirm address"
 msgstr "Adresse bestätigen"
 
 #. TRANS: Success message for the contact address confirmation action.
 #. TRANS: %s can be 'email', 'jabber', or 'sms'.
-#: actions/confirmaddress.php:200
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "Die Adresse „%s“ wurde für dein Konto bestätigt."
 
 #. TRANS: Title for page with a conversion (multiple notices in context).
-#: actions/conversation.php:96
 msgid "Conversation"
 msgstr "Unterhaltung"
 
 #. TRANS: Header on conversation page. Hidden by default (h2).
 #. TRANS: Label for user statistics.
-#: actions/conversation.php:149 lib/noticelist.php:87
-#: lib/profileaction.php:246 lib/searchgroupnav.php:82
-#: lib/threadednoticelist.php:66
 msgid "Notices"
 msgstr "Nachrichten"
 
 #. TRANS: Client exception displayed trying to delete a user account while not logged in.
-#: actions/deleteaccount.php:71
 #, fuzzy
 msgid "Only logged-in users can delete their account."
 msgstr "Nur angemeldete Benutzer können Nachrichten wiederholen."
 
 #. TRANS: Client exception displayed trying to delete a user account without have the rights to do that.
-#: actions/deleteaccount.php:77
 msgid "You cannot delete your account."
 msgstr "Du kannst keine Benutzer löschen."
 
 #. TRANS: Confirmation text for user deletion. The user has to type this exactly the same, including punctuation.
-#: actions/deleteaccount.php:160 actions/deleteaccount.php:297
 msgid "I am sure."
 msgstr "Ich bin mir sicher."
 
 #. TRANS: Notification for user about the text that must be input to be able to delete a user account.
 #. TRANS: %s is the text that needs to be input.
-#: actions/deleteaccount.php:164
 #, php-format
 msgid "You must write \"%s\" exactly in the box."
 msgstr ""
 
 #. TRANS: Confirmation that a user account has been deleted.
-#: actions/deleteaccount.php:206
 msgid "Account deleted."
 msgstr "Konto gelöscht."
 
 #. TRANS: Page title for page on which a user account can be deleted.
 #. TRANS: Option in profile settings to delete the account of the currently logged in user.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:476
 msgid "Delete account"
 msgstr "Konto löschen"
 
 #. TRANS: Form text for user deletion form.
-#: actions/deleteaccount.php:279
 msgid ""
 "This will <strong>permanently delete</strong> your account data from this "
 "server."
@@ -1932,7 +1518,6 @@ msgstr ""
 
 #. TRANS: Additional form text for user deletion form shown if a user has account backup rights.
 #. TRANS: %s is a URL to the backup page.
-#: actions/deleteaccount.php:285
 #, php-format
 msgid ""
 "You are strongly advised to <a href=\"%s\">back up your data</a> before "
@@ -1941,56 +1526,43 @@ msgstr ""
 
 #. TRANS: Field label for delete account confirmation entry.
 #. TRANS: Field label for password reset form where the password has to be typed again.
-#: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:262 actions/register.php:419
 msgid "Confirm"
 msgstr "Bestätigen"
 
 #. TRANS: Input title for the delete account field.
 #. TRANS: %s is the text that needs to be input.
-#: actions/deleteaccount.php:304
 #, fuzzy, php-format
 msgid "Enter \"%s\" to confirm that you want to delete your account."
 msgstr "Du kannst keine Benutzer löschen."
 
 #. TRANS: Button title for user account deletion.
-#: actions/deleteaccount.php:323
 #, fuzzy
 msgid "Permanently delete your account"
 msgstr "Du kannst keine Benutzer löschen."
 
 #. TRANS: Client error displayed trying to delete an application while not logged in.
-#: actions/deleteapplication.php:62
 msgid "You must be logged in to delete an application."
 msgstr "Du musst angemeldet sein, um dieses Programm zu entfernen."
 
 #. TRANS: Client error displayed trying to delete an application that does not exist.
-#: actions/deleteapplication.php:71
 msgid "Application not found."
 msgstr "Programm nicht gefunden."
 
 #. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
-#: actions/deleteapplication.php:79 actions/editapplication.php:78
-#: actions/showapplication.php:90
 msgid "You are not the owner of this application."
 msgstr "Du bist Besitzer dieses Programms"
 
 #. TRANS: Client error text when there is a problem with the session token.
-#: actions/deleteapplication.php:102 actions/editapplication.php:131
-#: actions/newapplication.php:112 actions/showapplication.php:113
-#: lib/action.php:1391
 msgid "There was a problem with your session token."
 msgstr "Es gab ein Problem mit deinem Sessiontoken."
 
 #. TRANS: Title for delete application page.
 #. TRANS: Fieldset legend on delete application page.
-#: actions/deleteapplication.php:124 actions/deleteapplication.php:149
 msgid "Delete application"
 msgstr "Programm entfernen"
 
 #. TRANS: Confirmation text on delete application page.
-#: actions/deleteapplication.php:152
 msgid ""
 "Are you sure you want to delete this application? This will clear all data "
 "about the application from the database, including all existing user "
@@ -2000,57 +1572,47 @@ msgstr ""
 "aus der Datenbank entfernt, auch alle bestehenden Benutzer-Verbindungen."
 
 #. TRANS: Submit button title for 'No' when deleting an application.
-#: actions/deleteapplication.php:161
 #, fuzzy
 msgid "Do not delete this application."
 msgstr "Dieses Programm nicht löschen"
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
-#: actions/deleteapplication.php:167
 #, fuzzy
 msgid "Delete this application."
 msgstr "Programm löschen"
 
 #. TRANS: Client error when trying to delete group while not logged in.
-#: actions/deletegroup.php:64
 msgid "You must be logged in to delete a group."
 msgstr "Du musst angemeldet sein, um eine Gruppe zu löschen."
 
 #. TRANS: Client error when trying to delete a group without providing a nickname or ID for the group.
 #. TRANS: Client error displayed when trying to join a group without providing a group name or group ID.
 #. TRANS: Client error displayed when trying to leave a group without providing a group name or group ID.
-#: actions/deletegroup.php:94 actions/joingroup.php:89
-#: actions/leavegroup.php:89
 msgid "No nickname or ID."
 msgstr "Kein Benutzername oder ID"
 
 #. TRANS: Client error when trying to delete a group without having the rights to delete it.
-#: actions/deletegroup.php:107
 msgid "You are not allowed to delete this group."
 msgstr "Du darfst diese Gruppe nicht löschen."
 
 #. TRANS: Server error displayed if a group could not be deleted.
 #. TRANS: %s is the name of the group that could not be deleted.
-#: actions/deletegroup.php:150
 #, php-format
 msgid "Could not delete group %s."
 msgstr "Konnte %s-Gruppe nicht löschen."
 
 #. TRANS: Message given after deleting a group.
 #. TRANS: %s is the deleted group's name.
-#: actions/deletegroup.php:159
 #, php-format
 msgid "Deleted group %s"
 msgstr "%s-Gruppe gelöscht"
 
 #. TRANS: Title of delete group page.
 #. TRANS: Form legend for deleting a group.
-#: actions/deletegroup.php:176 actions/deletegroup.php:202
 msgid "Delete group"
 msgstr "Gruppe löschen"
 
 #. TRANS: Warning in form for deleleting a group.
-#: actions/deletegroup.php:206
 msgid ""
 "Are you sure you want to delete this group? This will clear all data about "
 "the group from the database, without a backup. Public posts to this group "
@@ -2061,13 +1623,11 @@ msgstr ""
 "dieser Gruppe werden noch in einzelnen Zeitleisten erscheinen."
 
 #. TRANS: Submit button title for 'No' when deleting a group.
-#: actions/deletegroup.php:224
 #, fuzzy
 msgid "Do not delete this group."
 msgstr "Diese Gruppe nicht löschen"
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
-#: actions/deletegroup.php:231
 #, fuzzy
 msgid "Delete this group."
 msgstr "Diese Gruppe löschen"
@@ -2078,22 +1638,18 @@ msgstr "Diese Gruppe löschen"
 #. TRANS: Client error displayed trying to block a user from a group while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying to log out when not logged in.
+#. TRANS: Client error displayed when trying to access the "make admin" page while not logged in.
+#. TRANS: Client error displayed trying to create a new direct message while not logged in.
+#. TRANS: Client error displayed trying to send a notice while not logged in.
+#. TRANS: Client error displayed trying to nudge a user without being logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
 #. TRANS: Client error displayed when trying to change user options while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
-#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:70
-#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
-#: actions/nudge.php:63 actions/pluginenable.php:97 actions/subedit.php:33
-#: actions/subscribe.php:98 actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:71 lib/profileformaction.php:63
-#: lib/settingsaction.php:72
 msgid "Not logged in."
 msgstr "Nicht angemeldet."
 
 #. TRANS: Instructions for deleting a notice.
-#: actions/deletenotice.php:110
 msgid ""
 "You are about to permanently delete a notice. Once this is done, it cannot "
 "be undone."
@@ -2103,50 +1659,41 @@ msgstr ""
 
 #. TRANS: Page title when deleting a notice.
 #. TRANS: Fieldset legend for the delete notice form.
-#: actions/deletenotice.php:117 actions/deletenotice.php:148
 msgid "Delete notice"
 msgstr "Notiz löschen"
 
 #. TRANS: Message for the delete notice form.
-#: actions/deletenotice.php:152
 msgid "Are you sure you want to delete this notice?"
 msgstr "Bist du sicher, dass du diese Nachricht löschen möchtest?"
 
 #. TRANS: Submit button title for 'No' when deleting a notice.
-#: actions/deletenotice.php:159
 #, fuzzy
 msgid "Do not delete this notice."
 msgstr "Diese Nachricht nicht löschen"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:166
 #, fuzzy
 msgid "Delete this notice."
 msgstr "Nachricht löschen"
 
 #. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
-#: actions/deleteuser.php:66
 msgid "You cannot delete users."
 msgstr "Du kannst keine Benutzer löschen."
 
 #. TRANS: Client error displayed when trying to delete a non-local user.
-#: actions/deleteuser.php:74
 msgid "You can only delete local users."
 msgstr "Du kannst nur lokale Benutzer löschen."
 
 #. TRANS: Title of delete user page.
-#: actions/deleteuser.php:110
 msgctxt "TITLE"
 msgid "Delete user"
 msgstr "Benutzer löschen"
 
 #. TRANS: Fieldset legend on delete user page.
-#: actions/deleteuser.php:134
 msgid "Delete user"
 msgstr "Benutzer löschen"
 
 #. TRANS: Information text to request if a user is certain that the described action has to be performed.
-#: actions/deleteuser.php:138
 msgid ""
 "Are you sure you want to delete this user? This will clear all data about "
 "the user from the database, without a backup."
@@ -2155,99 +1702,80 @@ msgstr ""
 "werden aus der Datenbank gelöscht (ohne ein Backup)."
 
 #. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/deleteuser.php:158
 #, fuzzy
 msgid "Do not delete this user."
 msgstr "Diesen Benutzer nicht löschen"
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
-#: actions/deleteuser.php:165
 #, fuzzy
 msgid "Delete this user."
 msgstr "Diesen Benutzer löschen"
 
 #. TRANS: Message used as title for design settings for the site.
-#: actions/designadminpanel.php:60 lib/settingsnav.php:97
 msgid "Design"
 msgstr "Design"
 
 #. TRANS: Instructions for design adminsitration panel.
-#: actions/designadminpanel.php:71
 msgid "Design settings for this StatusNet site"
 msgstr "Design-Einstellungen dieser StatusNet-Website"
 
 #. TRANS: Client error displayed when a logo URL does is not valid.
-#: actions/designadminpanel.php:327
 msgid "Invalid logo URL."
 msgstr "Ungültige URL für das Logo"
 
 #. TRANS: Client error displayed when an SSL logo URL is invalid.
-#: actions/designadminpanel.php:333
 msgid "Invalid SSL logo URL."
 msgstr "Ungültige URL für das SSL-Logo."
 
 #. TRANS: Client error displayed when a theme is submitted through the form that is not in the theme list.
 #. TRANS: %s is the chosen unavailable theme.
-#: actions/designadminpanel.php:339
 #, php-format
 msgid "Theme not available: %s."
 msgstr "Theme nicht verfügbar: %s"
 
 #. TRANS: Fieldset legend for form to change logo.
-#: actions/designadminpanel.php:437
 msgid "Change logo"
 msgstr "Logo ändern"
 
 #. TRANS: Field label for StatusNet site logo.
-#: actions/designadminpanel.php:444
 msgid "Site logo"
 msgstr "Seitenlogo"
 
 #. TRANS: Field label for SSL StatusNet site logo.
-#: actions/designadminpanel.php:452
 msgid "SSL logo"
 msgstr "SSL-Logo"
 
 #. TRANS: Fieldset legend for form change StatusNet site's theme.
-#: actions/designadminpanel.php:467
 msgid "Change theme"
 msgstr "Theme ändern"
 
 #. TRANS: Field label for dropdown to choose site theme.
-#: actions/designadminpanel.php:485
 msgid "Site theme"
 msgstr "Seitentheme"
 
 #. TRANS: Title for field label for dropdown to choose site theme.
-#: actions/designadminpanel.php:487
 msgid "Theme for the site."
 msgstr "Theme dieser Seite."
 
 #. TRANS: Field label for uploading a cutom theme.
-#: actions/designadminpanel.php:494
 msgid "Custom theme"
 msgstr "Angepasster Skin"
 
 #. TRANS: Form instructions for uploading a cutom StatusNet theme.
-#: actions/designadminpanel.php:499
 msgid "You can upload a custom StatusNet theme as a .ZIP archive."
 msgstr "Du kannst ein angepasstes StatusNet-Theme als .ZIP-Archiv hochladen."
 
 #. TRANS: Fieldset legend for theme background image.
-#: actions/designadminpanel.php:515
 msgid "Change background image"
 msgstr "Hintergrundbild ändern"
 
 #. TRANS: Field label for background image on theme designer page.
 #. TRANS: Field label for background color selector.
 #. TRANS: Label on profile design page for setting a profile page background colour.
-#: actions/designadminpanel.php:525 actions/designadminpanel.php:609
-#: lib/designform.php:238
 msgid "Background"
 msgstr "Hintergrund"
 
 #. TRANS: Form guide for background image upload form on theme designer page.
-#: actions/designadminpanel.php:531
 #, php-format
 msgid ""
 "You can upload a background image for the site. The maximum file size is %1"
@@ -2257,202 +1785,167 @@ msgstr ""
 "Dateigröße beträgt %1$s."
 
 #. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:558
 msgid "On"
 msgstr "An"
 
 #. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:575
 msgid "Off"
 msgstr "Aus"
 
 #. TRANS: Form guide for turning background image on or off on theme designer page.
 #. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
 #. TRANS: use of the uploaded profile image.
-#: actions/designadminpanel.php:577 lib/designform.php:214
 msgid "Turn background image on or off."
 msgstr "Hintergrundbild ein- oder ausschalten."
 
 #. TRANS: Checkbox label to title background image on theme designer page.
 #. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-#: actions/designadminpanel.php:583 lib/designform.php:220
 msgid "Tile background image"
 msgstr "Hintergrundbild kacheln"
 
 #. TRANS: Fieldset legend for theme colors.
-#: actions/designadminpanel.php:598
 msgid "Change colors"
 msgstr "Farben ändern"
 
 #. TRANS: Field label for content color selector.
 #. TRANS: Label on profile design page for setting a profile page content colour.
-#: actions/designadminpanel.php:623 lib/designform.php:252
 msgid "Content"
 msgstr "Inhalt"
 
 #. TRANS: Field label for sidebar color selector.
 #. TRANS: Label on profile design page for setting a profile page sidebar colour.
-#: actions/designadminpanel.php:637 lib/designform.php:266
 msgid "Sidebar"
 msgstr "Seitenleiste"
 
 #. TRANS: Field label for text color selector.
 #. TRANS: Label on profile design page for setting a profile page text colour.
-#: actions/designadminpanel.php:651 lib/designform.php:280
 msgid "Text"
 msgstr "Text"
 
 #. TRANS: Field label for link color selector.
 #. TRANS: Label on profile design page for setting a profile page links colour.
-#: actions/designadminpanel.php:665 lib/designform.php:294
 msgid "Links"
 msgstr "Links"
 
 #. TRANS: Fieldset legend for advanced theme design settings.
-#: actions/designadminpanel.php:691
 msgid "Advanced"
 msgstr "Erweitert"
 
 #. TRANS: Field label for custom CSS.
-#: actions/designadminpanel.php:696
 msgid "Custom CSS"
 msgstr "Eigene CSS"
 
 #. TRANS: Button text for resetting theme settings.
-#: actions/designadminpanel.php:718
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Use defaults"
 msgstr "Standardeinstellungen benutzen"
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:720
 #, fuzzy
 msgid "Restore default designs."
 msgstr "Standard-Design wiederherstellen"
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:728
 #, fuzzy
 msgid "Reset back to default."
 msgstr "Standard wiederherstellen"
 
 #. TRANS: Title for button for saving theme settings.
-#: actions/designadminpanel.php:736
 #, fuzzy
 msgid "Save design."
 msgstr "Design speichern"
 
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
-#: actions/disfavor.php:83
 msgid "This notice is not a favorite!"
 msgstr "Diese Nachricht ist kein Favorit!"
 
 #. TRANS: Title for page on which favorites can be added.
-#: actions/disfavor.php:98
 msgid "Add to favorites"
 msgstr "Zu Favoriten hinzufügen"
 
 #. TRANS: Client exception thrown when requesting a document from the documentation that does not exist.
 #. TRANS: %s is the non-existing document.
-#: actions/doc.php:155
 #, php-format
 msgid "No such document \"%s\"."
 msgstr "Unbekanntes Dokument „%s“"
 
 #. TRANS: Title for "Edit application" form.
 #. TRANS: Form legend.
-#: actions/editapplication.php:54 lib/applicationeditform.php:129
 msgid "Edit application"
 msgstr "Programm bearbeiten"
 
 #. TRANS: Client error displayed trying to edit an application while not logged in.
-#: actions/editapplication.php:66
 msgid "You must be logged in to edit an application."
 msgstr "Du musst angemeldet sein, um eine Anwendung zu bearbeiten."
 
 #. TRANS: Client error displayed trying to edit an application that does not exist.
-#: actions/editapplication.php:83 actions/showapplication.php:83
 msgid "No such application."
 msgstr "Anwendung nicht bekannt."
 
 #. TRANS: Instructions for "Edit application" form.
-#: actions/editapplication.php:167
 msgid "Use this form to edit your application."
 msgstr "Benutze dieses Formular, um die Anwendung zu bearbeiten."
 
 #. TRANS: Validation error shown when not providing a name in the "Edit application" form.
 #. TRANS: Validation error shown when not providing a name in the "New application" form.
-#: actions/editapplication.php:184 actions/newapplication.php:164
 msgid "Name is required."
 msgstr "Name ist erforderlich."
 
 #. 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.
-#: actions/editapplication.php:188 actions/newapplication.php:172
 msgid "Name is too long (maximum 255 characters)."
 msgstr "Der Name ist zu lang (maximal 255 Zeichen)."
 
 #. TRANS: Validation error shown when providing a name for an application that already exists in the "Edit application" form.
 #. TRANS: Validation error shown when providing a name for an application that already exists in the "New application" form.
-#: actions/editapplication.php:192 actions/newapplication.php:168
 msgid "Name already in use. Try another one."
 msgstr "Der Name wird bereits verwendet. Suche dir einen anderen aus."
 
 #. TRANS: Validation error shown when not providing a description in the "Edit application" form.
 #. TRANS: Validation error shown when not providing a description in the "New application" form.
-#: actions/editapplication.php:196 actions/newapplication.php:176
 msgid "Description is required."
 msgstr "Beschreibung ist erforderlich."
 
 #. TRANS: Validation error shown when providing too long a source URL in the "Edit application" form.
-#: actions/editapplication.php:209
 msgid "Source URL is too long."
 msgstr "Homepage ist zu lang."
 
 #. TRANS: Validation error shown when providing an invalid source URL in the "Edit application" form.
 #. TRANS: Validation error shown when providing an invalid source URL in the "New application" form.
-#: actions/editapplication.php:216 actions/newapplication.php:199
 msgid "Source URL is not valid."
 msgstr ""
 "Homepage ist keine gültige URL. URLs müssen ein Präfix wie http enthalten."
 
 #. 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.
-#: actions/editapplication.php:220 actions/newapplication.php:203
 msgid "Organization is required."
 msgstr "Organisation ist erforderlich. (Pflichtangabe)"
 
 #. TRANS: Validation error shown when providing too long an arganisation name in the "Edit application" form.
-#: actions/editapplication.php:224 actions/newapplication.php:207
 msgid "Organization is too long (maximum 255 characters)."
 msgstr "Die angegebene Organisation ist zu lang (maximal 255 Zeichen)."
 
 #. TRANS: Form validation error show when an organisation name has not been provided in the edit application form.
 #. TRANS: Form validation error show when an organisation name has not been provided in the new application form.
-#: actions/editapplication.php:228 actions/newapplication.php:211
 msgid "Organization homepage is required."
 msgstr "Homepage der Organisation ist erforderlich (Pflichtangabe)."
 
 #. TRANS: Validation error shown when providing too long a callback URL in the "Edit application" form.
 #. TRANS: Validation error shown when providing too long a callback URL in the "New application" form.
-#: actions/editapplication.php:239 actions/newapplication.php:225
 msgid "Callback is too long."
 msgstr "Antwort ist zu lang"
 
 #. TRANS: Validation error shown when providing an invalid callback URL in the "Edit application" form.
 #. TRANS: Validation error shown when providing an invalid callback URL in the "New application" form.
-#: actions/editapplication.php:247 actions/newapplication.php:235
 msgid "Callback URL is not valid."
 msgstr "Antwort-URL ist nicht gültig"
 
 #. TRANS: Server error occuring when an application could not be updated from the "Edit application" form.
-#: actions/editapplication.php:284
 msgid "Could not update application."
 msgstr "Konnte Programm nicht aktualisieren."
 
 #. TRANS: Title for form to edit a group. %s is a group nickname.
-#: actions/editgroup.php:55
 #, php-format
 msgid "Edit %s group"
 msgstr "Gruppe %s bearbeiten"
@@ -2460,40 +1953,40 @@ msgstr "Gruppe %s bearbeiten"
 #. TRANS: Client error displayed trying to edit a group while not logged in.
 #. TRANS: Client error displayed when trying to create a group while not logged in.
 #. TRANS: Client error displayed trying to create a group while not logged in.
-#: actions/editgroup.php:68 actions/grouplogo.php:69 actions/newgroup.php:65
 msgid "You must be logged in to create a group."
 msgstr "Du musst angemeldet sein, um eine Gruppe zu erstellen."
 
 #. TRANS: Form instructions for group edit form.
-#: actions/editgroup.php:161
 msgid "Use this form to edit the group."
 msgstr "Benutze dieses Formular, um die Gruppe zu bearbeiten."
 
+#. TRANS: Group edit form validation error.
+#. TRANS: Group create form validation error.
+#. TRANS: %s is the invalid alias.
+#, php-format
+msgid "Invalid alias: \"%s\""
+msgstr "Ungültiges Stichwort: „%s“"
+
 #. TRANS: Group edit form success message.
-#: actions/editgroup.php:301
 msgid "Options saved."
 msgstr "Einstellungen gespeichert."
 
 #. TRANS: Title for e-mail settings.
-#: actions/emailsettings.php:60
 msgid "Email settings"
 msgstr "E-Mail-Einstellungen"
 
 #. TRANS: E-mail settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/emailsettings.php:74
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 msgstr "Einstellen, wie und wann du E-Mails von %%site.name%% bekommst."
 
 #. TRANS: Form legend for e-mail settings form.
 #. TRANS: Field label for e-mail address input in e-mail settings form.
-#: actions/emailsettings.php:104 actions/emailsettings.php:130
 msgid "Email address"
 msgstr "E-Mail-Adresse"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:110
 msgid "Current confirmed email address."
 msgstr "Aktuelle bestätigte E-Mail-Adresse."
 
@@ -2502,15 +1995,11 @@ msgstr "Aktuelle bestätigte E-Mail-Adresse."
 #. TRANS: Button label to remove a confirmed IM address.
 #. TRANS: Button label to remove a confirmed SMS address.
 #. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
-#: actions/emailsettings.php:113 actions/emailsettings.php:180
-#: actions/imsettings.php:119 actions/smssettings.php:119
-#: actions/smssettings.php:175
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Entfernen"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:120
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -2523,46 +2012,38 @@ msgstr ""
 #. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
 #. TRANS: Any other domain may be owned by a legitimate person or
 #. TRANS: organization.
-#: actions/emailsettings.php:137
 msgid "Email address, like \"UserName@example.org\""
 msgstr "E-Mail-Adresse, beispielsweise „Benutzername@example.org“"
 
 #. TRANS: Button label for adding an e-mail address in e-mail settings form.
 #. TRANS: Button label for adding an IM address in IM settings form.
 #. TRANS: Button label for adding a SMS phone number in SMS settings form.
-#: actions/emailsettings.php:141 actions/imsettings.php:147
-#: actions/smssettings.php:157
 msgctxt "BUTTON"
 msgid "Add"
 msgstr "Hinzufügen"
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:149 actions/smssettings.php:166
 msgid "Incoming email"
 msgstr "Eingehende E-Mail"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:155
 msgid "I want to post notices by email."
 msgstr "Ich möchte Einträge per E-Mail veröffentlichen."
 
 #. TRANS: Form instructions for incoming e-mail form in e-mail settings.
 #. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
-#: actions/emailsettings.php:177 actions/smssettings.php:173
 msgid "Send email to this address to post new notices."
 msgstr "Schicke eine E-Mail an diese Adresse um eine Nachricht zu posten."
 
 #. TRANS: Instructions for incoming e-mail address input form, when an address has already been assigned.
 #. TRANS: Instructions for incoming SMS e-mail address input form.
-#: actions/emailsettings.php:186 actions/smssettings.php:181
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr ""
 "Neue E-Mail-Adresse für Postings aktivieren; die alte wird automatisch "
 "deaktiviert."
 
 #. TRANS: Instructions for incoming e-mail address input form.
-#: actions/emailsettings.php:190
 msgid ""
 "To send notices via email, we need to create a unique email address for you "
 "on this server:"
@@ -2570,91 +2051,73 @@ msgstr ""
 
 #. TRANS: Button label for adding an e-mail address to send notices from.
 #. TRANS: Button label for adding an SMS e-mail address to send notices from.
-#: actions/emailsettings.php:196 actions/smssettings.php:184
 msgctxt "BUTTON"
 msgid "New"
 msgstr "Neu"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:205
 msgid "Email preferences"
 msgstr "E-Mail Einstellungen"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:213
 msgid "Send me notices of new subscriptions through email."
 msgstr "Informiere mich über neues Abonnements per E-Mail."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:219
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr ""
 "Mir eine E-Mail schicken, wenn jemand meine Nachricht als Favorit speichert."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:226
 msgid "Send me email when someone sends me a private message."
 msgstr ""
 "Mir eine E-Mail schicken, wenn mir jemand eine private Nachricht schickt."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:232
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr "Schick mir eine E-Mail, wenn mir jemand eine @Nachricht schickt."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:238
 msgid "Allow friends to nudge me and send me an email."
 msgstr "Erlaube Freunden mich zu stupsen und mir E-Mails zu senden."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:244
 msgid "Publish a MicroID for my email address."
 msgstr "MicroID für meine E-Mail-Adresse veröffentlichen."
 
 #. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:362
 msgid "Email preferences saved."
 msgstr "E-Mail-Einstellungen gespeichert."
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:381
 msgid "No email address."
 msgstr "Keine E-Mail-Adresse."
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:389
 #, fuzzy
 msgid "Cannot normalize that email address."
 msgstr "Konnte diese E-Mail-Adresse nicht normalisieren"
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:394 actions/register.php:197
-#: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "Ungültige E-Mail-Adresse."
 
 #. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:398
 msgid "That is already your email address."
 msgstr "Dies ist bereits deine E-Mail-Adresse."
 
 #. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:402
 msgid "That email address already belongs to another user."
 msgstr "Diese E-Mail-Adresse gehört bereits einem anderen Benutzer."
 
 #. TRANS: Server error thrown on database error adding e-mail confirmation code.
 #. TRANS: Server error thrown on database error adding Instant Messaging confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:419 actions/imsettings.php:362
-#: actions/smssettings.php:364
 #, fuzzy
 msgid "Could not insert confirmation code."
 msgstr "Konnte keinen Bestätigungscode einfügen."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:426
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
@@ -2666,104 +2129,84 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling Instant Messaging address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:446 actions/imsettings.php:391
-#: actions/smssettings.php:398
 msgid "No pending confirmation to cancel."
 msgstr "Keine ausstehende Bestätigung, die abgebrochen werden kann."
 
 #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:451
 msgid "That is the wrong email address."
 msgstr "Dies ist die falsche E-Mail Adresse"
 
 #. TRANS: Server error thrown on database error canceling e-mail address confirmation.
 #. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
-#: actions/emailsettings.php:460 actions/smssettings.php:412
 #, fuzzy
 msgid "Could not delete email confirmation."
 msgstr "Konnte E-Mail-Bestätigung nicht löschen."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:465
 msgid "Email confirmation cancelled."
 msgstr "E-Mail-Bestätigung abgebrochen."
 
 #. TRANS: Message given trying to remove an e-mail address that is not
 #. TRANS: registered for the active user.
-#: actions/emailsettings.php:484
 msgid "That is not your email address."
 msgstr "Dies ist nicht deine E-Mail-Adresse."
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:505
 msgid "The email address was removed."
 msgstr "Die E-Mail-Adresse wurde entfernt."
 
 #. TRANS: Form validation error displayed when trying to remove an incoming e-mail address while no address has been set.
-#: actions/emailsettings.php:519 actions/smssettings.php:554
 msgid "No incoming email address."
 msgstr "Keine Eingangs-E-Mail-Adresse."
 
 #. 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.
-#: actions/emailsettings.php:531 actions/emailsettings.php:555
-#: actions/smssettings.php:565 actions/smssettings.php:590
 #, fuzzy
 msgid "Could not update user record."
 msgstr "Konnte Benutzereintrag nicht schreiben"
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
 #. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:535 actions/smssettings.php:569
 msgid "Incoming email address removed."
 msgstr "Eingehende E-Mail-Adresse entfernt"
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
 #. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:559 actions/smssettings.php:594
 msgid "New incoming email address added."
 msgstr "Neue Eingangs-E-Mail-Adresse hinzugefügt."
 
 #. TRANS: Client error displayed when trying to mark a notice as favorite that already is a favorite.
-#: actions/favor.php:80
 msgid "This notice is already a favorite!"
 msgstr "Diese Nachricht ist bereits ein Favorit!"
 
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
-#: actions/favor.php:95
 #, fuzzy
 msgid "Disfavor favorite."
 msgstr "Aus Favoriten entfernen"
 
 #. TRANS: Page title for first page of favorited notices.
 #. TRANS: Title for favourited notices section.
-#: actions/favorited.php:65 lib/popularnoticesection.php:62
-#: lib/publicgroupnav.php:93
 msgid "Popular notices"
 msgstr "Beliebte Nachrichten"
 
 #. TRANS: Page title for all but first page of favorited notices.
 #. TRANS: %d is the page number being displayed.
-#: actions/favorited.php:69
 #, php-format
 msgid "Popular notices, page %d"
 msgstr "Beliebte Nachrichten, Seite %d"
 
 #. TRANS: Description on page displaying favorited notices.
-#: actions/favorited.php:81
 msgid "The most popular notices on the site right now."
 msgstr "Die momentan beliebtesten Nachrichten auf dieser Seite."
 
 #. TRANS: Text displayed instead of a list when a site does not yet have any favourited notices.
-#: actions/favorited.php:149
 msgid "Favorite notices appear on this page but no one has favorited one yet."
 msgstr ""
 "Favorisierte Mitteilungen werden auf dieser Seite angezeigt; es wurden aber "
 "noch keine Favoriten markiert."
 
 #. TRANS: Additional text displayed instead of a list when a site does not yet have any favourited notices for logged in users.
-#: actions/favorited.php:153
 msgid ""
 "Be the first to add a notice to your favorites by clicking the fave button "
 "next to any notice you like."
@@ -2773,7 +2216,6 @@ msgstr ""
 
 #. TRANS: Additional text displayed instead of a list when a site does not yet have any favourited notices for not logged in users.
 #. TRANS: %%action.register%% is a registration link. "[link text](link)" is Mark Down. Do not change the formatting.
-#: actions/favorited.php:158
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to add a "
@@ -2786,181 +2228,146 @@ msgstr ""
 #. TRANS: %s is a user's nickname.
 #. TRANS: Title for first page of favourite notices of a user.
 #. TRANS: %s is the user for whom the favourite notices are displayed.
-#: actions/favoritesrss.php:111 actions/showfavorites.php:76
-#: lib/personalgroupnav.php:110
 #, php-format
 msgid "%s's favorite notices"
 msgstr "%ss favorisierte Nachrichten"
 
 #. TRANS: Desciption of RSS feed with favourite notices of a user.
 #. TRANS: %1$s is a user's nickname, %2$s is the name of the StatusNet site.
-#: actions/favoritesrss.php:117
 #, php-format
 msgid "Updates favored by %1$s on %2$s!"
 msgstr "Aktualisierungen von %1$s auf %2$s!"
 
 #. TRANS: Page title for first page of featured users.
 #. TRANS: Title for featured users section.
-#: actions/featured.php:69 lib/featureduserssection.php:87
-#: lib/publicgroupnav.php:89
 msgid "Featured users"
 msgstr "Top-Benutzer"
 
 #. TRANS: Page title for all but first page of featured users.
 #. TRANS: %d is the page number being displayed.
-#: actions/featured.php:73
 #, php-format
 msgid "Featured users, page %d"
 msgstr "Top-Benutzer, Seite %d"
 
 #. TRANS: Description on page displaying featured users.
-#: actions/featured.php:102
 #, fuzzy, php-format
 msgid "A selection of some great users on %s."
 msgstr "Eine Auswahl toller Benutzer auf %s"
 
 #. TRANS: Client error displayed when no notice ID was given trying do display a file.
-#: actions/file.php:36
 msgid "No notice ID."
 msgstr "Keine Nachrichten-ID"
 
 #. TRANS: Client error displayed when an invalid notice ID was given trying do display a file.
-#: actions/file.php:41
 msgid "No notice."
 msgstr "Keine Nachricht"
 
 #. TRANS: Client error displayed when trying do display a file for a notice without a file attachement.
-#: actions/file.php:46
 msgid "No attachments."
 msgstr "Keine Anhänge vorhanden"
 
 #. TRANS: Client error displayed when trying do display a file for a notice with file attachements
 #. TRANS: that could not be found.
-#: actions/file.php:58
 msgid "No uploaded attachments."
 msgstr "Kein Anhang geladen."
 
 #. TRANS: Client error displayed when subscribing to a remote profile and an unexpected response is received.
-#: actions/finishremotesubscribe.php:69
 msgid "Not expecting this response!"
 msgstr "Unerwartete Antwort!"
 
 #. TRANS: Client error displayed when subscribing to a remote profile that does not exist.
-#: actions/finishremotesubscribe.php:81
 msgid "User being listened to does not exist."
 msgstr "Aufgeführter Benutzer existiert nicht."
 
 #. TRANS: Client error displayed when subscribing to a remote profile that is a local profile.
-#: actions/finishremotesubscribe.php:89 actions/remotesubscribe.php:58
 msgid "You can use the local subscription!"
 msgstr "Du kannst ein lokales Abonnement erstellen!"
 
 #. TRANS: Client error displayed when subscribing to a remote profile that is blocked form subscribing to.
-#: actions/finishremotesubscribe.php:102
 msgid "That user has blocked you from subscribing."
 msgstr "Dieser Benutzer erlaubt dir nicht ihn zu abonnieren."
 
 #. TRANS: Client error displayed when subscribing to a remote profile without providing an authorised token.
-#: actions/finishremotesubscribe.php:114
 msgid "You are not authorized."
 msgstr "Du bist nicht autorisiert."
 
 #. TRANS: Client error displayed when subscribing to a remote profile and conversion of the request token to access token fails.
-#: actions/finishremotesubscribe.php:118
 msgid "Could not convert request token to access token."
 msgstr "Konnte Anfrage-Token nicht in Zugriffs-Token umwandeln."
 
 #. TRANS: Client error displayed when subscribing to a remote profile fails because of an unsupported version of the OMB protocol.
-#: actions/finishremotesubscribe.php:124
 msgid "Remote service uses unknown version of OMB protocol."
 msgstr "Service nutzt unbekannte OMB-Protokollversion."
 
 #. TRANS: Server error displayed when subscribing to a remote profile fails because the remote profile could not be updated.
-#: actions/finishremotesubscribe.php:145 lib/oauthstore.php:317
 msgid "Error updating remote profile."
 msgstr "Fehler beim Aktualisieren des entfernten Profils."
 
 #. TRANS: Client error displayed when requesting a non-existent file.
-#: actions/getfile.php:77
 msgid "No such file."
 msgstr "Datei nicht gefunden."
 
 #. TRANS: Client error displayed when requesting a file without having read access to it.
-#: actions/getfile.php:82
 msgid "Cannot read file."
 msgstr "Datei konnte nicht gelesen werden."
 
 #. TRANS: Client error displayed when trying to assign an invalid role to a user.
-#: actions/grantrole.php:61 actions/revokerole.php:62
 msgid "Invalid role."
 msgstr "Ungültige Aufgabe"
 
 #. TRANS: Client error displayed when trying to assign an reserved role to a user.
-#: actions/grantrole.php:66 actions/revokerole.php:66
 msgid "This role is reserved and cannot be set."
 msgstr "Diese Aufgabe ist reserviert und kann nicht gesetzt werden"
 
 #. TRANS: Client error displayed when trying to assign a role to a user while not being allowed to set roles.
-#: actions/grantrole.php:76
 msgid "You cannot grant user roles on this site."
 msgstr "Auf dieser Seite können keine Benutzerrollen gewährt werden."
 
 #. TRANS: Client error displayed when trying to assign a role to a user that already has that role.
-#: actions/grantrole.php:84
 msgid "User already has this role."
 msgstr "Benutzer hat bereits diese Aufgabe"
 
 #. TRANS: Client error displayed trying to block a user from a group while not specifying a to be blocked user profile.
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing a profile.
+#. TRANS: Client error displayed when not providing a profile ID on the Make Admin page.
 #. TRANS: Client error displayed trying a change a subscription without providing a profile.
 #. TRANS: Client error displayed when trying to change user options without specifying a user to work on.
-#: actions/groupblock.php:71 actions/groupunblock.php:71
-#: actions/makeadmin.php:71 actions/subedit.php:49
-#: lib/profileformaction.php:79
 msgid "No profile specified."
 msgstr "Kein Profil angegeben."
 
 #. TRANS: Client error displayed trying to block a user from a group while specifying a non-existing profile.
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing an existing profile.
+#. TRANS: Client error displayed when specifying an invalid profile ID on the Make Admin page.
 #. TRANS: Client error displayed trying a change a subscription for a non-existant profile ID.
 #. TRANS: Client error displayed when trying to change user options without specifying an existing user to work on.
-#: actions/groupblock.php:77 actions/groupunblock.php:77
-#: actions/makeadmin.php:76 actions/subedit.php:57 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:87
 msgid "No profile with that ID."
 msgstr "Kein Benutzer-Profil mit dieser ID."
 
 #. TRANS: Client error displayed trying to block a user from a group while not specifying a group to block a profile from.
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing a group.
-#: actions/groupblock.php:83 actions/groupunblock.php:83
-#: actions/makeadmin.php:81
+#. TRANS: Client error displayed when not providing a group ID on the Make Admin page.
 msgid "No group specified."
 msgstr "Keine Gruppe angegeben"
 
 #. TRANS: Client error displayed trying to block a user from a group while not being an admin user.
-#: actions/groupblock.php:95
 msgid "Only an admin can block group members."
 msgstr "Nur ein Admin kann Mitglieder der Gruppe blockieren."
 
 #. TRANS: Client error displayed trying to block a user from a group while user is already blocked from the given group.
-#: actions/groupblock.php:100
 msgid "User is already blocked from group."
 msgstr "Dieser Benutzer ist bereits von der Gruppe blockiert"
 
 #. TRANS: Client error displayed trying to block a user from a group while user is not a member of given group.
-#: actions/groupblock.php:106
 msgid "User is not a member of group."
 msgstr "Benutzer ist kein Mitglied dieser Gruppe."
 
 #. TRANS: Title for block user from group page.
 #. TRANS: Form legend for form to block user from a group.
-#: actions/groupblock.php:141 actions/groupmembers.php:364
 msgid "Block user from group"
 msgstr "Benutzerzugang zu der Gruppe blockieren"
 
 #. TRANS: Explanatory text for block user from group form before setting the block.
 #. TRANS: %1$s is that to be blocked user, %2$s is the group the user will be blocked from.
-#: actions/groupblock.php:169
 #, php-format
 msgid ""
 "Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They "
@@ -2972,41 +2379,34 @@ msgstr ""
 "und wird auch in Zukunft dieser Gruppe nicht mehr beitreten können."
 
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
-#: actions/groupblock.php:191
 #, fuzzy
 msgid "Do not block this user from this group."
 msgstr "Diesen Benutzerzugang nicht für diese Gruppe blockieren."
 
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
-#: actions/groupblock.php:198
 #, fuzzy
 msgid "Block this user from this group."
 msgstr "Diesen Benutzer von der Gruppe blockieren"
 
 #. TRANS: Server error displayed when trying to block a user from a group fails because of an application error.
-#: actions/groupblock.php:215
 msgid "Database error blocking user from group."
 msgstr ""
 "Datenbankfehler beim Versuch den Benutzer aus der Gruppe zu blockieren."
 
 #. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
 #. TRANS: Client error displayed trying to find a user by ID without providing an ID.
-#: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr "Keine ID"
 
 #. TRANS: Client error displayed trying to change group design settings while not logged in.
-#: actions/groupdesignsettings.php:67
 msgid "You must be logged in to edit a group."
 msgstr "Du musst angemeldet sein, um eine Gruppe zu bearbeiten."
 
 #. TRANS: Title group design settings page.
-#: actions/groupdesignsettings.php:146
 msgid "Group design"
 msgstr "Gruppen-Design"
 
 #. TRANS: Instructions for group design settings page.
-#: actions/groupdesignsettings.php:157
 msgid ""
 "Customize the way your group looks with a background image and a colour "
 "palette of your choice."
@@ -3015,25 +2415,21 @@ msgstr ""
 "Farbpalette frei wählbar."
 
 #. TRANS: Form validation error displayed when group design settings could not be updated because of an application issue.
-#: actions/groupdesignsettings.php:262
 #, fuzzy
 msgid "Unable to update your design settings."
 msgstr "Konnte Twitter-Einstellungen nicht speichern."
 
 #. TRANS: Form text to confirm saved group design settings.
-#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:239
 msgid "Design preferences saved."
 msgstr "Design-Einstellungen gespeichert."
 
 #. TRANS: Title for group logo settings page.
 #. TRANS: Group logo form legend.
-#: actions/grouplogo.php:144 actions/grouplogo.php:199
 msgid "Group logo"
 msgstr "Gruppen-Logo"
 
 #. TRANS: Instructions for group logo page.
 #. TRANS: %s is the maximum file size for that site.
-#: actions/grouplogo.php:156
 #, php-format
 msgid ""
 "You can upload a logo image for your group. The maximum file size is %s."
@@ -3042,98 +2438,81 @@ msgstr ""
 "s."
 
 #. TRANS: Submit button for uploading a group logo.
-#: actions/grouplogo.php:243
 msgid "Upload"
 msgstr "Hochladen"
 
 #. TRANS: Button text for cropping an uploaded group logo.
-#: actions/grouplogo.php:299
 msgid "Crop"
 msgstr "Zuschneiden"
 
 #. TRANS: Form instructions on the group logo page.
-#: actions/grouplogo.php:376
 msgid "Pick a square area of the image to be the logo."
 msgstr "Wähle eine quadratische Fläche aus dem Bild, um das Logo zu speichern."
 
 #. TRANS: Form success message after updating a group logo.
-#: actions/grouplogo.php:411
 msgid "Logo updated."
 msgstr "Logo aktualisiert."
 
 #. TRANS: Form failure message after failing to update a group logo.
-#: actions/grouplogo.php:414
 msgid "Failed updating logo."
 msgstr "Aktualisierung des Logos fehlgeschlagen."
 
 #. TRANS: Title of the page showing group members.
 #. TRANS: %s is the name of the group.
-#: actions/groupmembers.php:104
 #, php-format
 msgid "%s group members"
 msgstr "%s Gruppen-Mitglieder"
 
 #. TRANS: Title of the page showing group members.
 #. TRANS: %1$s is the name of the group, %2$d is the page number of the members list.
-#: actions/groupmembers.php:109
 #, php-format
 msgid "%1$s group members, page %2$d"
 msgstr "%1$s Gruppen-Mitglieder, Seite %2$d"
 
 #. TRANS: Page notice for group members page.
-#: actions/groupmembers.php:125
 msgid "A list of the users in this group."
 msgstr "Liste der Benutzer in dieser Gruppe."
 
 #. TRANS: Indicator in group members list that this user is a group administrator.
-#: actions/groupmembers.php:190 lib/action.php:581
 msgid "Admin"
 msgstr "Admin"
 
 #. TRANS: Button text for the form that will block a user from a group.
-#: actions/groupmembers.php:397
 msgctxt "BUTTON"
 msgid "Block"
 msgstr "Blockieren"
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:401
 msgctxt "TOOLTIP"
 msgid "Block this user"
 msgstr "Diesen Benutzer blockieren"
 
 #. TRANS: Form legend for form to make a user a group admin.
-#: actions/groupmembers.php:488
 msgid "Make user an admin of the group"
 msgstr "Benutzer zu einem Admin dieser Gruppe ernennen"
 
 #. TRANS: Button text for the form that will make a user administrator.
-#: actions/groupmembers.php:521
 msgctxt "BUTTON"
 msgid "Make Admin"
 msgstr "Zum Admin ernennen"
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:525
 msgctxt "TOOLTIP"
 msgid "Make this user an admin"
 msgstr "Diesen Benutzer zum Admin ernennen"
 
 #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
-#: actions/grouprss.php:141
 #, php-format
 msgid "Updates from members of %1$s on %2$s!"
 msgstr "Aktualisierungen von %1$s auf %2$s!"
 
 #. TRANS: Title for first page of the groups list.
-#: actions/groups.php:62
 msgctxt "TITLE"
 msgid "Groups"
 msgstr "Gruppen"
 
 #. TRANS: Title for all but the first page of the groups list.
 #. TRANS: %d is the page number.
-#: actions/groups.php:66
 #, fuzzy, php-format
 msgctxt "TITLE"
 msgid "Groups, page %d"
@@ -3142,7 +2521,6 @@ msgstr "Gruppen, Seite %d"
 #. TRANS: Page notice of group list. %%%%site.name%%%% is the StatusNet site name,
 #. TRANS: %%%%action.groupsearch%%%% and %%%%action.newgroup%%%% are URLs. Do not change them.
 #. TRANS: This message contains Markdown links in the form [link text](link).
-#: actions/groups.php:95
 #, fuzzy, php-format
 msgid ""
 "%%%%site.name%%%% groups let you find and talk with people of similar "
@@ -3158,12 +2536,10 @@ msgstr ""
 "newgroup%%%%)"
 
 #. TRANS: Link to create a new group on the group list page.
-#: actions/groups.php:113 actions/usergroups.php:126 lib/groupeditform.php:115
 msgid "Create a new group"
 msgstr "Neue Gruppe erstellen"
 
 #. TRANS: Instructions for page where groups can be searched. %%site.name%% is the name of the StatusNet site.
-#: actions/groupsearch.php:53
 #, php-format
 msgid ""
 "Search for groups on %%site.name%% by their name, location, or description. "
@@ -3174,21 +2550,17 @@ msgstr ""
 "mindestens 3 Zeichen bestehen."
 
 #. TRANS: Title for page where groups can be searched.
-#: actions/groupsearch.php:60
 msgid "Group search"
 msgstr "Gruppen-Suche"
 
 #. TRANS: Text on page where groups can be searched if no results were found for a query.
 #. TRANS: Text for notice search results is the query had no results.
 #. TRANS: Message on the "People search" page where a query has no results.
-#: actions/groupsearch.php:82 actions/noticesearch.php:122
-#: actions/peoplesearch.php:87
 msgid "No results."
 msgstr "Keine Ergebnisse."
 
 #. TRANS: Additional text on page where groups can be searched if no results were found for a query for a logged in user.
 #. TRANS: This message contains Markdown links in the form [link text](link).
-#: actions/groupsearch.php:87
 #, fuzzy, php-format
 msgid ""
 "If you cannot find the group you're looking for, you can [create it](%%"
@@ -3199,7 +2571,6 @@ msgstr ""
 
 #. TRANS: Additional text on page where groups can be searched if no results were found for a query for a not logged in user.
 #. TRANS: This message contains Markdown links in the form [link text](link).
-#: actions/groupsearch.php:92
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and [create the group](%%"
@@ -3209,30 +2580,25 @@ msgstr ""
 "diese Gruppe selbst an](%%action.newgroup%%)?"
 
 #. TRANS: Client error displayed when trying to unblock a user from a group without being an administrator for the group.
-#: actions/groupunblock.php:95
 msgid "Only an admin can unblock group members."
 msgstr "Nur Admins können Blockierungen von Gruppenmitglieder aufheben."
 
 #. TRANS: Client error displayed when trying to unblock a non-blocked user from a group.
-#: actions/groupunblock.php:100
 msgid "User is not blocked from group."
 msgstr "Dieser Benutzer ist nicht von der Gruppe blockiert."
 
 #. TRANS: Server error displayed when unblocking a user from a group fails because of an unknown error.
 #. TRANS: Server error displayed when removing a user block.
-#: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "Fehler beim Freigeben des Benutzers."
 
 #. TRANS: Title for Instant Messaging settings.
-#: actions/imsettings.php:56
 msgid "IM settings"
 msgstr "IM-Einstellungen"
 
 #. 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.
-#: actions/imsettings.php:69
 #, fuzzy, php-format
 msgid ""
 "You can send and receive notices through instant messaging [instant messages]"
@@ -3242,18 +2608,15 @@ msgstr ""
 "senden. Stelle deine Adresse und Einstellungen unten ein."
 
 #. TRANS: Message given in the IM settings if IM is not enabled on the site.
-#: actions/imsettings.php:90
 msgid "IM is not available."
 msgstr "IM ist nicht verfügbar."
 
-#: actions/imsettings.php:116
 #, fuzzy, php-format
 msgid "Current confirmed %s address."
 msgstr "Aktuelle bestätigte E-Mail-Adresse."
 
 #. TRANS: Form note in IM settings form.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:128
 #, fuzzy, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your %s account for a message "
@@ -3263,35 +2626,29 @@ msgstr ""
 "sollte in deinem Jabber/GTalk-Konto eingehen. (Hast du %s zu deiner "
 "Freundesliste hinzugefügt?)"
 
-#: actions/imsettings.php:140
 msgid "IM address"
 msgstr "IM-Adresse"
 
-#: actions/imsettings.php:142
 #, php-format
 msgid "%s screenname."
 msgstr ""
 
 #. TRANS: Header for IM preferences form.
-#: actions/imsettings.php:163
 #, fuzzy
 msgid "IM Preferences"
 msgstr "IM-Einstellungen"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:174
 #, fuzzy
 msgid "Send me notices"
 msgstr "Nachricht senden"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:176
 #, fuzzy
 msgid "Post a notice when my status changes."
 msgstr "Schicke eine Nachricht, wenn sich mein Jabber/GTalk-Status verändert."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:178
 #, fuzzy
 msgid "Send me replies from people I'm not subscribed to."
 msgstr ""
@@ -3299,54 +2656,45 @@ msgstr ""
 "GTalk."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:181
 #, fuzzy
 msgid "Publish a MicroID"
 msgstr "MicroID für meine E-Mail-Adresse veröffentlichen."
 
 #. TRANS: Server error thrown on database error updating IM preferences.
-#: actions/imsettings.php:291
 #, fuzzy
 msgid "Couldn't update IM preferences."
 msgstr "Konnte Benutzerdaten nicht aktualisieren."
 
 #. TRANS: Confirmation message for successful IM preferences save.
 #. TRANS: Confirmation message after saving preferences.
-#: actions/imsettings.php:298 actions/urlsettings.php:244
 msgid "Preferences saved."
 msgstr "Einstellungen gesichert."
 
 #. TRANS: Message given saving IM address without having provided one.
-#: actions/imsettings.php:320
 #, fuzzy
 msgid "No screenname."
 msgstr "Kein Benutzername."
 
-#: actions/imsettings.php:325
 #, fuzzy
 msgid "No transport."
 msgstr "Keine Nachricht"
 
 #. TRANS: Message given saving IM address that cannot be normalised.
-#: actions/imsettings.php:333
 #, fuzzy
 msgid "Cannot normalize that screenname"
 msgstr "Konnte diese Jabber-ID nicht normalisieren"
 
 #. TRANS: Message given saving IM address that not valid.
-#: actions/imsettings.php:340
 #, fuzzy
 msgid "Not a valid screenname"
 msgstr "Ungültiger Benutzername."
 
 #. TRANS: Message given saving IM address that is already set for another user.
-#: actions/imsettings.php:344
 #, fuzzy
 msgid "Screenname already belongs to another user."
 msgstr "Diese Jabber-ID wird bereits von einem anderen Benutzer verwendet."
 
 #. TRANS: Message given saving valid IM address that is to be confirmed.
-#: actions/imsettings.php:369
 #, fuzzy
 msgid "A confirmation code was sent to the IM address you added."
 msgstr ""
@@ -3354,86 +2702,72 @@ msgstr ""
 "hast. Du musst zulassen, dass %s dir Nachrichten schicken darf."
 
 #. TRANS: Message given canceling IM address confirmation for the wrong IM address.
-#: actions/imsettings.php:396
 msgid "That is the wrong IM address."
 msgstr "Das ist die falsche IM-Adresse."
 
 #. TRANS: Server error thrown on database error canceling IM address confirmation.
-#: actions/imsettings.php:405
 #, fuzzy
 msgid "Couldn't delete confirmation."
 msgstr "Konnte die IM-Bestätigung nicht löschen."
 
 #. TRANS: Message given after successfully canceling IM address confirmation.
-#: actions/imsettings.php:410
 msgid "IM confirmation cancelled."
 msgstr "IM-Bestätigung abgebrochen."
 
 #. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.
-#: actions/imsettings.php:434
 #, fuzzy
 msgid "That is not your screenname."
 msgstr "Dies ist nicht deine Telefonnummer."
 
 #. TRANS: Server error thrown on database error removing a registered IM address.
-#: actions/imsettings.php:443
 #, fuzzy
 msgid "Couldn't update user im prefs."
 msgstr "Konnte Benutzereintrag nicht schreiben"
 
 #. TRANS: Message given after successfully removing a registered Instant Messaging address.
-#: actions/imsettings.php:451
 msgid "The IM address was removed."
 msgstr "Die IM-Adresse wurde entfernt."
 
 #. TRANS: Title for all but the first page of the inbox page.
 #. TRANS: %1$s is the user's nickname, %2$s is the page number.
-#: actions/inbox.php:59
 #, php-format
 msgid "Inbox for %1$s - page %2$d"
 msgstr "Posteingang von %s - Seite %2$d"
 
 #. TRANS: Title for the first page of the inbox page.
 #. TRANS: %s is the user's nickname.
-#: actions/inbox.php:64
 #, php-format
 msgid "Inbox for %s"
 msgstr "Posteingang von %s"
 
 #. TRANS: Instructions for user inbox page.
-#: actions/inbox.php:106
 msgid "This is your inbox, which lists your incoming private messages."
 msgstr ""
 "Das hier ist dein Posteingang, der deine eingehenden privaten Nachrichten "
 "enthält."
 
 #. TRANS: Client error displayed when trying to sent invites while they have been disabled.
-#: actions/invite.php:41
 msgid "Invites have been disabled."
 msgstr "Einladungen wurden deaktiviert."
 
 #. TRANS: Client error displayed when trying to sent invites while not logged in.
 #. TRANS: %s is the StatusNet site name.
-#: actions/invite.php:45
 #, php-format
 msgid "You must be logged in to invite other users to use %s."
 msgstr "Du musst angemeldet sein, um andere Benutzer zu %s einzuladen"
 
 #. TRANS: Form validation message when providing an e-mail address that does not validate.
 #. TRANS: %s is an invalid e-mail address.
-#: actions/invite.php:78
 #, php-format
 msgid "Invalid email address: %s."
 msgstr "Ungültige E-Mail-Adresse: %s"
 
 #. TRANS: Page title when invitations have been sent.
-#: actions/invite.php:117
 msgid "Invitations sent"
 msgstr "Einladung(en) verschickt"
 
 #. TRANS: Page title when inviting potential users.
-#: actions/invite.php:120
 msgid "Invite new users"
 msgstr "Lade neue Leute ein"
 
@@ -3441,7 +2775,6 @@ msgstr "Lade neue Leute ein"
 #. TRANS: is already subscribed to one or more users with the given e-mail address(es).
 #. TRANS: Plural form is based on the number of reported already subscribed e-mail addresses.
 #. TRANS: Followed by a bullet list.
-#: actions/invite.php:140
 msgid "You are already subscribed to this user:"
 msgid_plural "You are already subscribed to these users:"
 msgstr[0] "Du hast diesen Benutzer bereits abonniert:"
@@ -3449,7 +2782,6 @@ msgstr[1] "Du hast diese Benutzer bereits abonniert:"
 
 #. TRANS: Used as list item for already subscribed users (%1$s is nickname, %2$s is e-mail address).
 #. TRANS: Used as list item for already registered people (%1$s is nickname, %2$s is e-mail address).
-#: actions/invite.php:146 actions/invite.php:160
 #, php-format
 msgctxt "INVITE"
 msgid "%1$s (%2$s)"
@@ -3458,7 +2790,6 @@ msgstr "%1$s (%2$s)"
 #. TRANS: Message displayed inviting users to use a StatusNet site while the invited user
 #. TRANS: already uses a this StatusNet site. Plural form is based on the number of
 #. TRANS: reported already present people. Followed by a bullet list.
-#: actions/invite.php:154
 msgid "This person is already a user and you were automatically subscribed:"
 msgid_plural ""
 "These people are already users and you were automatically subscribed to them:"
@@ -3472,7 +2803,6 @@ msgstr[1] ""
 #. TRANS: Message displayed inviting users to use a StatusNet site. Plural form is
 #. TRANS: based on the number of invitations sent. Followed by a bullet list of
 #. TRANS: e-mail addresses to which invitations were sent.
-#: actions/invite.php:168
 msgid "Invitation sent to the following person:"
 msgid_plural "Invitations sent to the following people:"
 msgstr[0] "Einladung an folgende Personen geschickt:"
@@ -3480,7 +2810,6 @@ msgstr[1] "Einladungen an folgende Personen geschickt:"
 
 #. TRANS: Generic message displayed after sending out one or more invitations to
 #. TRANS: people to join a StatusNet site.
-#: actions/invite.php:178
 msgid ""
 "You will be notified when your invitees accept the invitation and register "
 "on the site. Thanks for growing the community!"
@@ -3490,18 +2819,15 @@ msgstr ""
 "wachsen!"
 
 #. TRANS: Form instructions.
-#: actions/invite.php:191
 msgid ""
 "Use this form to invite your friends and colleagues to use this service."
 msgstr "Lade deine Freunde und Kollegen ein diesen Dienst zu nutzen."
 
 #. TRANS: Field label for a list of e-mail addresses.
-#: actions/invite.php:218
 msgid "Email addresses"
 msgstr "E-Mail-Adressen"
 
 #. TRANS: Tooltip for field label for a list of e-mail addresses.
-#: actions/invite.php:221
 #, fuzzy
 msgid "Addresses of friends to invite (one per line)."
 msgstr ""
@@ -3509,19 +2835,17 @@ msgstr ""
 "Zeile)"
 
 #. TRANS: Field label for a personal message to send to invitees.
-#: actions/invite.php:225
 msgid "Personal message"
 msgstr "Private Nachricht"
 
 #. TRANS: Tooltip for field label for a personal message to send to invitees.
-#: actions/invite.php:228
 msgid "Optionally add a personal message to the invitation."
 msgstr ""
 "Wenn du möchtest kannst du zu der Einladung eine persönliche Nachricht "
 "anfügen."
 
 #. TRANS: Send button for inviting friends
-#: actions/invite.php:232
+#. TRANS: Button text for sending notice.
 msgctxt "BUTTON"
 msgid "Send"
 msgstr "Senden"
@@ -3529,7 +2853,6 @@ msgstr "Senden"
 #. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral
 #. TRANS: singular 3rd-person pronoun in English. %1$s is the inviting user, $2$s is
 #. TRANS: the StatusNet sitename.
-#: actions/invite.php:264
 #, php-format
 msgid "%1$s has invited you to join them on %2$s"
 msgstr "%1$s hat dich eingeladen, auch bei %2$s mitzumachen."
@@ -3539,7 +2862,6 @@ msgstr "%1$s hat dich eingeladen, auch bei %2$s mitzumachen."
 #. TRANS: StatusNet sitename, %3$s is the site URL, %4$s is the personal message from the
 #. TRANS: inviting user, %s%5 a link to the timeline for the inviting user, %s$6 is a link
 #. TRANS: to register with the StatusNet site.
-#: actions/invite.php:271
 #, php-format
 msgid ""
 "%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -3596,50 +2918,44 @@ msgstr ""
 "Schöne Grüße von %2$s\n"
 
 #. TRANS: Client error displayed when trying to join a group while not logged in.
-#: actions/joingroup.php:59
 msgid "You must be logged in to join a group."
 msgstr "Du musst angemeldet sein, um Mitglied einer Gruppe zu werden."
 
 #. TRANS: Title for join group page after joining.
-#: actions/joingroup.php:148
 #, fuzzy, php-format
 msgctxt "TITLE"
 msgid "%1$s joined group %2$s"
 msgstr "%1$s ist der Gruppe %2$s beigetreten"
 
 #. TRANS: Client error displayed when trying to leave a group while not logged in.
-#: actions/leavegroup.php:59
 msgid "You must be logged in to leave a group."
 msgstr "Du musst angemeldet sein, um aus einer Gruppe auszutreten."
 
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
-#: actions/leavegroup.php:103 lib/command.php:398
 msgid "You are not a member of that group."
 msgstr "Du bist kein Mitglied dieser Gruppe."
 
 #. TRANS: Title for leave group page after leaving.
-#: actions/leavegroup.php:142
 #, fuzzy, php-format
 msgctxt "TITLE"
 msgid "%1$s left group %2$s"
 msgstr "%1$s hat die Gruppe %2$s verlassen"
 
 #. TRANS: User admin panel title
-#: actions/licenseadminpanel.php:55
 msgctxt "TITLE"
 msgid "License"
 msgstr "Lizenz"
 
-#: actions/licenseadminpanel.php:65
+#. TRANS: Form instructions for the site license admin panel.
 msgid "License for this StatusNet site"
 msgstr "Lizenz dieser StatusNet-Website"
 
-#: actions/licenseadminpanel.php:134
+#. TRANS: Client error displayed selecting an invalid license in the license admin panel.
 msgid "Invalid license selection."
 msgstr "Ungültige Lizenzauswahl."
 
-#: actions/licenseadminpanel.php:144
+#. TRANS: Client error displayed when not specifying an owner for the all rights reserved license in the license admin panel.
 msgid ""
 "You must specify the owner of the content when using the All Rights Reserved "
 "license."
@@ -3647,133 +2963,134 @@ msgstr ""
 "Du musst den Besitzer des Inhalts angeben, wenn du „Alle Rechte vorbehalten“ "
 "wählst."
 
-#: actions/licenseadminpanel.php:151
+#. TRANS: Client error displayed selecting a too long license title in the license admin panel.
 msgid "Invalid license title. Maximum length is 255 characters."
 msgstr "Ungültiger Lizenztitel. Die maximale Länge liegt bei 255 Zeichen."
 
-#: actions/licenseadminpanel.php:163
+#. TRANS: Client error displayed specifying an invalid license URL in the license admin panel.
 msgid "Invalid license URL."
 msgstr "Ungültige Lizenz-URL."
 
-#: actions/licenseadminpanel.php:166
+#. TRANS: Client error displayed specifying an invalid license image URL in the license admin panel.
 msgid "Invalid license image URL."
 msgstr "Ungültige Lizenz-Bild-URL."
 
-#: actions/licenseadminpanel.php:174
+#. TRANS: Client error displayed specifying an invalid license URL in the license admin panel.
 msgid "License URL must be blank or a valid URL."
 msgstr "Lizenz-URL muss leer oder eine gültige URL sein."
 
-#: actions/licenseadminpanel.php:182
+#. TRANS: Client error displayed specifying an invalid license image URL in the license admin panel.
 msgid "License image must be blank or valid URL."
 msgstr "Lizenz-Bild muss leer oder eine gültige URL sein."
 
-#: actions/licenseadminpanel.php:232
+#. TRANS: Form legend in the license admin panel.
 msgid "License selection"
 msgstr "Lizenzauswahl"
 
-#: actions/licenseadminpanel.php:238
+#. TRANS: License option in the license admin panel.
 msgid "Private"
 msgstr "Privat"
 
-#: actions/licenseadminpanel.php:239
+#. TRANS: License option in the license admin panel.
 msgid "All Rights Reserved"
 msgstr "Alle Rechte vorbehalten"
 
-#: actions/licenseadminpanel.php:240
+#. TRANS: License option in the license admin panel.
 msgid "Creative Commons"
 msgstr "Creative Commons"
 
-#: actions/licenseadminpanel.php:245
+#. TRANS: Dropdown field label in the license admin panel.
 msgid "Type"
 msgstr "Typ"
 
-#: actions/licenseadminpanel.php:247
-msgid "Select license"
+#. TRANS: Dropdown field instructions in the license admin panel.
+#, fuzzy
+msgid "Select a license."
 msgstr "Lizenz auswählen"
 
-#: actions/licenseadminpanel.php:261
+#. TRANS: Form legend in the license admin panel.
 msgid "License details"
 msgstr "Lizenz-Details"
 
-#: actions/licenseadminpanel.php:267
+#. TRANS: Field label in the license admin panel.
 msgid "Owner"
 msgstr "Besitzer"
 
-#: actions/licenseadminpanel.php:268
+#. TRANS: Field title in the license admin panel.
 msgid "Name of the owner of the site's content (if applicable)."
 msgstr "Name von dem Besitzer des Inhalts dieser Website (falls notwendig)"
 
-#: actions/licenseadminpanel.php:276
+#. TRANS: Field label in the license admin panel.
 msgid "License Title"
 msgstr "Lizenz-Titel"
 
-#: actions/licenseadminpanel.php:277
+#. TRANS: Field title in the license admin panel.
 msgid "The title of the license."
 msgstr "Der Titel der Lizenz."
 
-#: actions/licenseadminpanel.php:285
+#. TRANS: Field label in the license admin panel.
 msgid "License URL"
 msgstr "Lizenz-URL"
 
-#: actions/licenseadminpanel.php:286
+#. TRANS: Field title in the license admin panel.
 msgid "URL for more information about the license."
 msgstr "URL mit weiteren Informationen über die Lizenz."
 
-#: actions/licenseadminpanel.php:293
+#. TRANS: Field label in the license admin panel.
 msgid "License Image URL"
 msgstr "Lizenz-Bild-URl"
 
-#: actions/licenseadminpanel.php:294
+#. TRANS: Field title in the license admin panel.
 msgid "URL for an image to display with the license."
 msgstr "URL eines mit der Lizenz anzuzeigenden Bildes."
 
-#. TRANS: Submit button title.
-#: actions/licenseadminpanel.php:311 actions/sessionsadminpanel.php:199
-#: actions/siteadminpanel.php:292 actions/snapshotadminpanel.php:245
-#: actions/tagother.php:133 lib/applicationeditform.php:357
-msgid "Save"
-msgstr "Speichern"
-
-#: actions/licenseadminpanel.php:311
-msgid "Save license settings"
+#. TRANS: Button title in the license admin panel.
+#, fuzzy
+msgid "Save license settings."
 msgstr "Lizenz-Einstellungen speichern"
 
+#. TRANS: Client error displayed when trying to log in while already logged in.
 #. TRANS: Client error displayed trying to use "one time password login" when already logged in.
-#: actions/login.php:97 actions/otp.php:62 actions/register.php:130
 msgid "Already logged in."
 msgstr "Bereits angemeldet."
 
-#: actions/login.php:125
+#. TRANS: Form validation error displayed when trying to log in with incorrect credentials.
 msgid "Incorrect username or password."
 msgstr "Falscher Benutzername oder Passwort."
 
+#. TRANS: Server error displayed when during login a server error occurs.
 #. TRANS: Server error displayed when a user object could not be created trying to login using "one time password login".
-#: actions/login.php:131 actions/otp.php:127
 msgid "Error setting user. You are probably not authorized."
 msgstr ""
 "Fehler beim Setzen des Benutzers. Du bist vermutlich nicht autorisiert."
 
-#: actions/login.php:185 actions/login.php:236 lib/action.php:598
+#. TRANS: Page title for login page.
 msgid "Login"
 msgstr "Anmelden"
 
-#: actions/login.php:222
+#. TRANS: Form legend on login page.
 msgid "Login to site"
 msgstr "An Seite anmelden"
 
-#: actions/login.php:231 actions/register.php:469
+#. TRANS: Checkbox label label on login page.
 msgid "Remember me"
 msgstr "Anmeldedaten merken"
 
-#: actions/login.php:232 actions/register.php:471
+#. TRANS: Checkbox title on login page.
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "Automatisch anmelden; nicht bei gemeinsam genutzten PCs einsetzen!"
 
-#: actions/login.php:241
+#. TRANS: Button text for log in on login page.
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Login"
+msgstr "Anmelden"
+
+#. TRANS: Link text for link to "reset password" on login page.
 msgid "Lost or forgotten password?"
 msgstr "Passwort vergessen?"
 
-#: actions/login.php:259
+#. TRANS: Form instructions on login page before being able to change user settings.
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -3781,11 +3098,12 @@ msgstr ""
 "Bitte gebe aus Sicherheitsgründen deinen Benutzernamen und dein Passwort "
 "ein, bevor die Änderungen an deinen Einstellungen übernommen werden."
 
-#: actions/login.php:263
+#. TRANS: Form instructions on login page.
 msgid "Login with your username and password."
 msgstr "Mit Benutzernamen und Passwort anmelden."
 
-#: actions/login.php:266
+#. TRANS: Form instructions on login page. This message contains Markdown links in the form [Link text](Link).
+#. TRANS: %%action.register%% is a link to the registration page.
 #, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -3793,129 +3111,123 @@ msgstr ""
 "Du hast noch keinen Benutzernamen? [Registriere](%%action.register%%) ein "
 "neues Konto."
 
-#: actions/makeadmin.php:92
+#. TRANS: Client error displayed when trying to make another user admin on the Make Admin page while not an admin.
 msgid "Only an admin can make another user an admin."
 msgstr "Nur Admins können andere Benutzer zu Admins ernennen."
 
-#: actions/makeadmin.php:96
+#. TRANS: Client error displayed when trying to make another user admin on the Make Admin page who already is admin.
+#. TRANS: %1$s is the user that is already admin, %2$s is the group user is already admin for.
 #, php-format
 msgid "%1$s is already an admin for group \"%2$s\"."
 msgstr "%1$s ist bereits Admin der Gruppe „%2$s“."
 
-#: actions/makeadmin.php:133
+#. TRANS: Server error displayed when trying to make another user admin on the Make Admin page fails
+#. TRANS: because the group membership record could not be gotten.
+#. TRANS: %1$s is the to be admin user, %2$s is the group user should be admin for.
 #, php-format
 msgid "Can't get membership record for %1$s in group %2$s."
 msgstr "Konnte keinen Mitgliedseintrag für %1$s aus Gruppe %2$s empfangen."
 
-#: actions/makeadmin.php:146
+#. TRANS: Server error displayed when trying to make another user admin on the Make Admin page fails
+#. TRANS: because the group adminship record coud not be saved properly.
+#. TRANS: %1$s is the to be admin user, %2$s is the group user is already admin for.
 #, php-format
 msgid "Can't make %1$s an admin for group %2$s."
 msgstr "Konnte %1$s nicht zum Admin der Gruppe %2$s machen"
 
-#: actions/microsummary.php:69
+#. TRANS: Client error displayed trying to make a micro summary without providing a status.
 msgid "No current status."
 msgstr "Kein aktueller Status."
 
 #. TRANS: This is the title of the form for adding a new application.
-#: actions/newapplication.php:52
 msgid "New application"
 msgstr "Neues Programm"
 
 #. TRANS: Client error displayed trying to add a new application while not logged in.
-#: actions/newapplication.php:64
 msgid "You must be logged in to register an application."
 msgstr "Du musst angemeldet sein, um ein Programm zu registrieren."
 
 #. TRANS: Form instructions for registering a new application.
-#: actions/newapplication.php:147
 msgid "Use this form to register a new application."
 msgstr "Benutzer dieses Formular, um eine neues Programm zu erstellen."
 
 #. TRANS: Validation error shown when not providing a source URL in the "New application" form.
-#: actions/newapplication.php:189
 msgid "Source URL is required."
 msgstr "Quell-URL ist erforderlich."
 
 #. TRANS: Server error displayed when an application could not be registered in the database through the "New application" form.
-#: actions/newapplication.php:279 actions/newapplication.php:289
 msgid "Could not create application."
 msgstr "Konnte das Programm nicht erstellen."
 
 #. TRANS: Title for form to create a group.
-#: actions/newgroup.php:53
 msgid "New group"
 msgstr "Neue Gruppe"
 
 #. TRANS: Client exception thrown when a user tries to create a group while banned.
-#: actions/newgroup.php:73 classes/User_group.php:485
 #, fuzzy
 msgid "You are not allowed to create groups on this site."
 msgstr "Du darfst diese Gruppe nicht löschen."
 
 #. TRANS: Form instructions for group create form.
-#: actions/newgroup.php:117
 msgid "Use this form to create a new group."
 msgstr "Benutze dieses Formular, um eine neue Gruppe zu erstellen."
 
-#. TRANS: Group create form validation error.
-#: actions/newgroup.php:200
-#, fuzzy
-msgid "Alias cannot be the same as nickname."
-msgstr "Alias kann nicht das gleiche wie der Spitzname sein."
-
-#: actions/newmessage.php:71 actions/newmessage.php:234
+#. TRANS: Page title for new direct message page.
+#. TRANS: Page title on page for sending a direct message.
 msgid "New message"
 msgstr "Neue Nachricht"
 
-#. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
-#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:513
-msgid "You can't send a message to this user."
+#. TRANS: Client error displayed trying to send a direct message to a user while sender and
+#. TRANS: receiver are not subscribed to each other.
+#, fuzzy
+msgid "You cannot send a message to this user."
 msgstr "Du kannst diesem Benutzer keine Nachricht schicken."
 
+#. TRANS: Form validator error displayed trying to send a direct message without content.
+#. TRANS: Client error displayed trying to send a notice without content.
 #. TRANS: Command exception text shown when trying to send a direct message to another user without content.
 #. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
-#: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:490
-#: lib/command.php:593
 msgid "No content!"
 msgstr "Kein Inhalt!"
 
-#: actions/newmessage.php:161
+#. TRANS: Form validation error displayed trying to send a direct message without specifying a recipient.
 msgid "No recipient specified."
 msgstr "Kein Empfänger angegeben."
 
+#. TRANS: Client error displayed trying to send a direct message to self.
 #. TRANS: Error text shown when trying to send a direct message to self.
-#: actions/newmessage.php:167 lib/command.php:517
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
 "Schicke dir selbst keine Nachrichten; sag es dir stattdessen einfach leise."
 
-#: actions/newmessage.php:184
+#. TRANS: Page title after sending a direct message.
 msgid "Message sent"
 msgstr "Nachricht gesendet"
 
+#. TRANS: Confirmation text after sending a direct message.
+#. TRANS: %s is the direct message recipient.
 #. TRANS: Message given have sent a direct message to another user.
 #. TRANS: %s is the name of the other user.
-#: actions/newmessage.php:188 lib/command.php:525
 #, php-format
 msgid "Direct message to %s sent."
 msgstr "Direkte Nachricht an %s abgeschickt"
 
-#: actions/newmessage.php:213 actions/newnotice.php:264
+#. TRANS: Page title after an AJAX error occurred on the "send direct message" page.
+#. TRANS: Page title after an AJAX error occurs on the send notice page.
 msgid "Ajax Error"
 msgstr "Ajax-Fehler"
 
-#: actions/newnotice.php:69
+#. TRANS: Page title for sending a new notice.
 msgid "New notice"
 msgstr "Neue Nachricht"
 
-#: actions/newnotice.php:230
+#. TRANS: Page title after sending a notice.
 msgid "Notice posted"
 msgstr "Nachricht hinzugefügt"
 
 #. TRANS: Instructions for Notice search page.
 #. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/noticesearch.php:69
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -3926,20 +3238,17 @@ msgstr ""
 "Zeichen bestehen."
 
 #. TRANS: Title of the page where users can search for notices.
-#: actions/noticesearch.php:80
 msgid "Text search"
 msgstr "Volltextsuche"
 
 #. TRANS: Test in RSS notice search.
 #. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearch.php:95
 #, php-format
 msgid "Search results for \"%1$s\" on %2$s"
 msgstr "Suchergebnisse für „%1$s“ auf %2$s"
 
 #. TRANS: Text for logged in users making a query for notices without results.
 #. TRANS: This message contains a Markdown link.
-#: actions/noticesearch.php:128
 #, php-format
 msgid ""
 "Be the first to [post on this topic](%%%%action.newnotice%%%%?"
@@ -3950,7 +3259,6 @@ msgstr ""
 
 #. TRANS: Text for not logged in users making a query for notices without results.
 #. TRANS: This message contains Markdown links.
-#: actions/noticesearch.php:133
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and be the first to "
@@ -3961,19 +3269,17 @@ msgstr ""
 "status_textarea=%s)!"
 
 #. TRANS: RSS notice search feed title. %s is the query.
-#: actions/noticesearchrss.php:95
 #, php-format
 msgid "Updates with \"%s\""
 msgstr "Aktualisierungen mit „%s“"
 
 #. TRANS: RSS notice search feed description.
 #. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearchrss.php:99
 #, fuzzy, php-format
 msgid "Updates matching search term \"%1$s\" on %2$s."
 msgstr "Alle Aktualisierungen, die den Suchbegriff „%s“ enthalten"
 
-#: actions/nudge.php:85
+#. TRANS: Client error displayed trying to nudge a user that cannot be nudged.
 msgid ""
 "This user doesn't allow nudges or hasn't confirmed or set their email "
 "address yet."
@@ -3981,61 +3287,52 @@ msgstr ""
 "Dieser Benutzer erlaubt keine Stupser oder hat seine E-Mail-Adresse noch "
 "nicht bestätigt oder eingestellt."
 
-#: actions/nudge.php:94
+#. TRANS: Page title after sending a nudge.
 msgid "Nudge sent"
 msgstr "Stups abgeschickt"
 
-#: actions/nudge.php:97
+#. TRANS: Confirmation text after sending a nudge.
 msgid "Nudge sent!"
 msgstr "Stups gesendet!"
 
 #. TRANS: Message displayed to an anonymous user trying to view OAuth application list.
-#: actions/oauthappssettings.php:57
 msgid "You must be logged in to list your applications."
 msgstr "Du musst angemeldet sein, um deine Programm anzuzeigen"
 
 #. TRANS: Page title for OAuth applications
-#: actions/oauthappssettings.php:73
 msgid "OAuth applications"
 msgstr "OAuth-Anwendungen"
 
 #. TRANS: Page instructions for OAuth applications
-#: actions/oauthappssettings.php:85
 msgid "Applications you have registered"
 msgstr "Registrierte Programme"
 
 #. TRANS: Empty list message on page with OAuth applications.
-#: actions/oauthappssettings.php:138
 #, php-format
 msgid "You have not registered any applications yet."
 msgstr "Du hast noch keine Programme registriert"
 
 #. TRANS: Title for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:69
 msgid "Connected applications"
 msgstr "Verbundene Programme"
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:80
 msgid "The following connections exist for your account."
 msgstr ""
 "Du hast den folgenden Programmen erlaubt, auf dein Benutzerkonto zuzugreifen."
 
 #. TRANS: Client error when trying to revoke access for an application while not being a user of it.
-#: actions/oauthconnectionssettings.php:165
 msgid "You are not a user of that application."
 msgstr "Du bist kein Benutzer dieses Programms."
 
 #. TRANS: Client error when revoking access has failed for some reason.
 #. TRANS: %s is the application ID revoking access failed for.
-#: actions/oauthconnectionssettings.php:180
 #, php-format
 msgid "Unable to revoke access for application: %s."
 msgstr "Kann Zugang dieses Programm nicht entfernen: %s."
 
 #. TRANS: Success message after revoking access for an application.
 #. TRANS: %1$s is the application name, %2$s is the first part of the user token.
-#: actions/oauthconnectionssettings.php:199
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -4044,7 +3341,6 @@ msgstr ""
 "Sie haben den Zugang von %1$s und den Tokem mit %2$s erfolgreich entfernt."
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:210
 msgid "You have not authorized any applications to use your account."
 msgstr ""
 "Du hast noch keinem Programm die Erlaubnis gegeben, dein Profil zu benutzen."
@@ -4052,7 +3348,6 @@ msgstr ""
 #. TRANS: Note for developers in the OAuth connection settings form.
 #. TRANS: This message contains a Markdown link. Do not separate "](".
 #. TRANS: %s is the URL to the OAuth settings.
-#: actions/oauthconnectionssettings.php:230
 #, php-format
 msgid ""
 "Are you a developer? [Register an OAuth client application](%s) to use with "
@@ -4061,440 +3356,359 @@ msgstr ""
 "Sie sind Entwickler? [Registrieren einer OAuth-Client-Anwendung] (%s), um "
 "mit dieser Instanz von StatusNet zu verwenden."
 
-#: actions/oembed.php:64
+#. TRANS: Server error displayed in oEmbed action when path not found.
+#. TRANS: %s is a path.
 #, fuzzy, php-format
 msgid "\"%s\" not found."
 msgstr "API-Methode nicht gefunden."
 
-#: actions/oembed.php:76
+#. TRANS: Server error displayed in oEmbed action when notice not found.
+#. TRANS: %s is a notice.
 #, fuzzy, php-format
 msgid "Notice %s not found."
 msgstr "API-Methode nicht gefunden."
 
-#: actions/oembed.php:80 actions/shownotice.php:100
+#. TRANS: Server error displayed in oEmbed action when notice has not profile.
 msgid "Notice has no profile."
 msgstr "Nachricht hat kein Profil"
 
-#: actions/oembed.php:83 actions/shownotice.php:172
+#. TRANS: oEmbed title. %1$s is the author name, %2$s is the creation date.
 #, php-format
 msgid "%1$s's status on %2$s"
 msgstr "Status von %1$s auf %2$s"
 
-#: actions/oembed.php:95
+#. TRANS: Server error displayed in oEmbed action when attachment not found.
+#. TRANS: %d is an attachment ID.
 #, fuzzy, php-format
 msgid "Attachment %s not found."
 msgstr "Empfänger nicht gefunden."
 
-#: actions/oembed.php:136
+#. TRANS: Server error displayed in oEmbed request when a path is not supported.
+#. TRANS: %s is a path.
 #, php-format
 msgid "\"%s\" not supported for oembed requests."
 msgstr ""
 
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
-#: actions/oembed.php:168
 #, php-format
 msgid "Content type %s not supported."
 msgstr "Content-Typ %s wird nicht untersützt."
 
 #. TRANS: Error message displaying attachments. %s is the site's base URL.
-#: actions/oembed.php:172
 #, php-format
 msgid "Only %s URLs over plain HTTP please."
 msgstr "Bitte nur %s URLs über einfaches HTTP."
 
+#. TRANS: Server error displayed in oEmbed action when request specifies an unsupported data format.
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1207
-#: lib/apiaction.php:1234 lib/apiaction.php:1369
 msgid "Not a supported data format."
 msgstr "Kein unterstütztes Datenformat."
 
 #. TRANS: ShortName in the OpenSearch interface when trying to find users.
-#: actions/opensearch.php:64
 msgid "People Search"
 msgstr "Suche nach Benutzern"
 
-#: actions/opensearch.php:68
+#. TRANS: ShortName in the OpenSearch interface when trying to find notices.
 msgid "Notice Search"
 msgstr "Nachrichtensuche"
 
 #. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
-#: actions/otp.php:70
 msgid "No user ID specified."
 msgstr "Keine Benutzer-ID angegeben"
 
 #. TRANS: Client error displayed trying to use "one time password login" without specifying a login token.
-#: actions/otp.php:86
 msgid "No login token specified."
 msgstr "Kein Zugangstoken angegeben."
 
 #. TRANS: Client error displayed trying to use "one time password login" without requesting a login token.
-#: actions/otp.php:94
 msgid "No login token requested."
 msgstr "Kein Login-Token angefordert."
 
 #. TRANS: Client error displayed trying to use "one time password login" while specifying an invalid login token.
-#: actions/otp.php:100
 msgid "Invalid login token specified."
 msgstr "Login-Token ungültig oder abgelaufen."
 
 #. TRANS: Client error displayed trying to use "one time password login" while specifying an expired login token.
-#: actions/otp.php:110
 msgid "Login token expired."
 msgstr "Zugangstoken ist abgelaufen."
 
 #. TRANS: Title for outbox for any but the fist page.
 #. TRANS: %1$s is the user nickname, %2$d is the page number.
-#: actions/outbox.php:57
 #, php-format
 msgid "Outbox for %1$s - page %2$d"
 msgstr "Postausgang für %1$s - Seite %2$d"
 
 #. TRANS: Title for first page of outbox.
-#: actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
 msgstr "Postausgang von %s"
 
 #. TRANS: Instructions for outbox.
-#: actions/outbox.php:103
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr ""
 "Das hier ist dein Postausgang, er beinhaltet deine gesendeten Nachrichten."
 
-#: actions/passwordsettings.php:58
 msgid "Change password"
 msgstr "Passwort ändern"
 
-#: actions/passwordsettings.php:69
 msgid "Change your password."
 msgstr "Ändere dein Passwort."
 
 #. TRANS: Fieldset legend for password reset form.
-#: actions/passwordsettings.php:96 actions/recoverpassword.php:251
 msgid "Password change"
 msgstr "Passwort geändert"
 
-#: actions/passwordsettings.php:104
 msgid "Old password"
 msgstr "Altes Passwort"
 
 #. TRANS: Field label for password reset form.
-#: actions/passwordsettings.php:108 actions/recoverpassword.php:256
 msgid "New password"
 msgstr "Neues Passwort"
 
-#: actions/passwordsettings.php:109 actions/register.php:416
 msgid "6 or more characters."
 msgstr "6 oder mehr Zeichen"
 
 #. TRANS: Ttile for field label for password reset form where the password has to be typed again.
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:264
-#: actions/register.php:420
 msgid "Same as password above."
 msgstr "Gleiches Passwort wie zuvor"
 
-#: actions/passwordsettings.php:117
 msgid "Change"
 msgstr "Ändern"
 
-#: actions/passwordsettings.php:153 actions/register.php:223
 msgid "Password must be 6 or more characters."
 msgstr "Das Passwort muss aus 6 oder mehr Zeichen bestehen."
 
-#: actions/passwordsettings.php:156 actions/register.php:226
 msgid "Passwords don't match."
 msgstr "Passwörter stimmen nicht überein."
 
-#: actions/passwordsettings.php:164
 msgid "Incorrect old password"
 msgstr "Altes Passwort falsch"
 
-#: actions/passwordsettings.php:180
 msgid "Error saving user; invalid."
 msgstr "Fehler beim Speichern des Benutzers, ungültig."
 
 #. TRANS: Reset password form validation error message.
-#: actions/passwordsettings.php:185 actions/recoverpassword.php:418
 #, fuzzy
 msgid "Cannot save new password."
 msgstr "Konnte neues Passwort nicht speichern"
 
-#: actions/passwordsettings.php:191
 msgid "Password saved."
 msgstr "Passwort gespeichert."
 
 #. TRANS: Title for Paths admin panel.
 #. TRANS: Menu item for site administration
-#: actions/pathsadminpanel.php:58 lib/adminpanelaction.php:371
 msgid "Paths"
 msgstr "Pfad"
 
 #. TRANS: Form instructions for Path admin panel.
-#: actions/pathsadminpanel.php:69
 msgid "Path and server settings for this StatusNet site"
 msgstr "Pfad- und Servereinstellungen dieser StatusNet-Website"
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the directory that could not be read from.
-#: actions/pathsadminpanel.php:155
 #, php-format
 msgid "Theme directory not readable: %s."
 msgstr "Theme-Verzeichnis nicht lesbar: %s."
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the avatar directory that could not be written to.
-#: actions/pathsadminpanel.php:163
 #, php-format
 msgid "Avatar directory not writable: %s."
 msgstr "Avatar-Verzeichnis ist nicht beschreibbar: %s."
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the background directory that could not be written to.
-#: actions/pathsadminpanel.php:171
 #, php-format
 msgid "Background directory not writable: %s."
 msgstr "Hintergrund-Verzeichnis ist nicht beschreibbar: %s."
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the locales directory that could not be read from.
-#: actions/pathsadminpanel.php:181
 #, php-format
 msgid "Locales directory not readable: %s."
 msgstr "Sprachverzeichnis nicht lesbar: %s."
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the SSL server URL that is too long.
-#: actions/pathsadminpanel.php:189
 msgid "Invalid SSL server. The maximum length is 255 characters."
 msgstr "Ungültiger SSL-Server. Die maximale Länge ist 255 Zeichen."
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:235 actions/siteadminpanel.php:58
 msgid "Site"
 msgstr "Seite"
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:241 actions/pathsadminpanel.php:279
-#: actions/pathsadminpanel.php:370 actions/pathsadminpanel.php:425
 msgid "Server"
 msgstr "Server"
 
-#: actions/pathsadminpanel.php:242
 msgid "Site's server hostname."
 msgstr "Server-Name der Seite"
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:248 actions/pathsadminpanel.php:288
-#: actions/pathsadminpanel.php:379 actions/pathsadminpanel.php:434
 msgid "Path"
 msgstr "Pfad"
 
-#: actions/pathsadminpanel.php:249
 msgid "Site path."
 msgstr "Seitenpfad."
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:255
 msgid "Locale directory"
 msgstr "Sprachpfad"
 
-#: actions/pathsadminpanel.php:256
 msgid "Directory path to locales."
 msgstr "Pfad zu den Sprachen."
 
 #. TRANS: Checkbox label in Paths admin panel.
-#: actions/pathsadminpanel.php:263
 msgid "Fancy URLs"
 msgstr "Schicke URLs."
 
-#: actions/pathsadminpanel.php:265
 msgid "Use fancy (more readable and memorable) URLs?"
 msgstr "Schicke URLs (lesbarer und besser zu merken) verwenden?"
 
-#: actions/pathsadminpanel.php:272
 msgid "Theme"
 msgstr "Motiv"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:281
 msgid "Server for themes."
 msgstr "Theme-Server"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:290
 msgid "Web path to themes."
 msgstr "Web-Pfad zu den Themes."
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:297 actions/pathsadminpanel.php:388
-#: actions/pathsadminpanel.php:443 actions/pathsadminpanel.php:495
 msgid "SSL server"
 msgstr "SSL-Server"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:299
 msgid "SSL server for themes (default: SSL server)."
 msgstr "SSL-Server der Themes (Standard: SSL-Server)."
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:306 actions/pathsadminpanel.php:397
-#: actions/pathsadminpanel.php:452
 msgid "SSL path"
 msgstr "SSL-Pfad"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:308
 msgid "SSL path to themes (default: /theme/)."
 msgstr "SSL-Pfad der Themes (Standard: /theme/)."
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:315 actions/pathsadminpanel.php:406
-#: actions/pathsadminpanel.php:461
 msgid "Directory"
 msgstr "Verzeichnis"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:317
 msgid "Directory where themes are located."
 msgstr "Pfad, wo sich die Themes befinden."
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:326
 msgid "Avatars"
 msgstr "Avatare"
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:333
 msgid "Avatar server"
 msgstr "Avatar-Server"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:335
 msgid "Server for avatars."
 msgstr "Server für Avatare."
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:342
 msgid "Avatar path"
 msgstr "Avatarpfad"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:344
 msgid "Web path to avatars."
 msgstr "Web-Pfad zu den Avataren."
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:351
 msgid "Avatar directory"
 msgstr "Avatarverzeichnis"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:353
 msgid "Directory where avatars are located."
 msgstr "Pfad, in dem sich die Avatare befinden."
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:364
 msgid "Backgrounds"
 msgstr "Hintergrundbilder"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:372
 msgid "Server for backgrounds."
 msgstr "Server für Hintergründe."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:381
 msgid "Web path to backgrounds."
 msgstr "Web-Pfad zu den Hintergründen."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:390
 msgid "Server for backgrounds on SSL pages."
 msgstr "Server für Hintergründe auf SSL-Seiten."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:399
 msgid "Web path to backgrounds on SSL pages."
 msgstr "Web Pfad zu Hintergründen auf SSL-Seiten."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:408
 msgid "Directory where backgrounds are located."
 msgstr "Verzeichnis, in dem sich die Hintergründe befinden."
 
 #. TRANS: Fieldset legens in Paths admin panel.
-#: actions/pathsadminpanel.php:419
 msgid "Attachments"
 msgstr "Anhänge"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:427
 msgid "Server for attachments."
 msgstr "Server für Anhänge."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:436
 msgid "Web path to attachments."
 msgstr "Web-Pfad zu den Anhängen."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:445
 msgid "Server for attachments on SSL pages."
 msgstr "Server für Anhängen auf SSL-Seiten."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:454
 msgid "Web path to attachments on SSL pages."
 msgstr "Web-Pfad, für Anlagen auf SSL-Seiten."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:463
 msgid "Directory where attachments are located."
 msgstr "Pfad, in dem sich die Themes befinden."
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:472
 msgid "SSL"
 msgstr "SSL"
 
 #. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
-#: actions/pathsadminpanel.php:477 actions/snapshotadminpanel.php:202
 msgid "Never"
 msgstr "Nie"
 
 #. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
-#: actions/pathsadminpanel.php:479
 msgid "Sometimes"
 msgstr "Manchmal"
 
 #. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
-#: actions/pathsadminpanel.php:481
 msgid "Always"
 msgstr "Immer"
 
-#: actions/pathsadminpanel.php:485
 msgid "Use SSL"
 msgstr "SSL verwenden"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:487
 msgid "When to use SSL."
 msgstr "Wann soll SSL verwendet werden."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:497
 msgid "Server to direct SSL requests to."
 msgstr "Server an den SSL Anfragen gerichtet werden sollen"
 
 #. TRANS: Button title text to store form data in the Paths admin panel.
-#: actions/pathsadminpanel.php:514
 msgid "Save paths"
 msgstr "Speicherpfade"
 
 #. TRANS: Instructions for the "People search" page.
 #. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/peoplesearch.php:54
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
@@ -4505,57 +3719,46 @@ msgstr ""
 "mindestens 3 Zeichen bestehen."
 
 #. TRANS: Title of a page where users can search for other users.
-#: actions/peoplesearch.php:61
 msgid "People search"
 msgstr "Suche nach anderen Benutzern"
 
-#: actions/peopletag.php:68
 #, php-format
 msgid "Not a valid people tag: %s."
 msgstr "Ungültiger Personen-Tag: „%s“."
 
-#: actions/peopletag.php:142
 #, php-format
 msgid "Users self-tagged with %1$s - page %2$d"
 msgstr "Benutzer, die sich selbst mit „%1$s“ getaggt haben - Seite %2$d"
 
 #. TRANS: Page title for AJAX form return when a disabling a plugin.
-#: actions/plugindisable.php:69
 msgctxt "plugin"
 msgid "Disabled"
 msgstr ""
 
 #. TRANS: Client error displayed trying to perform any request method other than POST.
 #. TRANS: Do not translate POST.
-#: actions/pluginenable.php:78 actions/subscribe.php:77
 msgid "This action only accepts POST requests."
 msgstr "Diese Aktion nimmt nur POST-Requests"
 
-#: actions/pluginenable.php:102
 #, fuzzy
 msgid "You cannot administer plugins."
 msgstr "Du kannst keine Benutzer löschen."
 
-#: actions/pluginenable.php:109
 #, fuzzy
 msgid "No such plugin."
 msgstr "Seite nicht vorhanden"
 
 #. TRANS: Page title for AJAX form return when enabling a plugin.
-#: actions/pluginenable.php:159
 msgctxt "plugin"
 msgid "Enabled"
 msgstr ""
 
 #. TRANS: Tab and title for plugins admin panel.
 #. TRANS: Menu item for site administration
-#: actions/pluginsadminpanel.php:56 actions/version.php:191
-#: lib/adminpanelaction.php:411
 msgid "Plugins"
 msgstr "Erweiterungen"
 
 #. TRANS: Instructions at top of plugin admin page.
-#: actions/pluginsadminpanel.php:68
 msgid ""
 "Additional plugins can be enabled and configured manually. See the <a href="
 "\"http://status.net/wiki/Plugins\">online plugin documentation</a> for more "
@@ -4563,21 +3766,17 @@ msgid ""
 msgstr ""
 
 #. TRANS: Admin form section header
-#: actions/pluginsadminpanel.php:84
 #, fuzzy
 msgid "Default plugins"
 msgstr "Bevorzugte Sprache"
 
-#: actions/pluginsadminpanel.php:106
 msgid ""
 "All default plugins have been disabled from the site's configuration file."
 msgstr ""
 
-#: actions/postnotice.php:95
 msgid "Invalid notice content."
 msgstr "Ungültiger Nachrichteninhalt."
 
-#: actions/postnotice.php:101
 #, php-format
 msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’."
 msgstr ""
@@ -4585,12 +3784,10 @@ msgstr ""
 "2$s“."
 
 #. TRANS: Page title for profile settings.
-#: actions/profilesettings.php:60
 msgid "Profile settings"
 msgstr "Profil-Einstellungen"
 
 #. TRANS: Usage instructions for profile settings.
-#: actions/profilesettings.php:71
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
@@ -4598,30 +3795,23 @@ msgstr ""
 "über dich erfahren können."
 
 #. TRANS: Profile settings form legend.
-#: actions/profilesettings.php:99
 msgid "Profile information"
 msgstr "Profilinformation"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:110 actions/register.php:412
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr "1-64 Kleinbuchstaben oder Zahlen, keine Satz- oder Leerzeichen."
 
 #. TRANS: Field label in form for profile settings.
-#: actions/profilesettings.php:114 actions/register.php:434
-#: lib/groupeditform.php:150
 msgid "Full name"
 msgstr "Bürgerlicher Name"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:119 actions/register.php:439
-#: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "Homepage"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:122 actions/register.php:441
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr ""
 "URL deiner Homepage, deines Blogs, oder deines Profils auf einer anderen "
@@ -4630,7 +3820,6 @@ msgstr ""
 #. TRANS: Tooltip for field label in form for profile settings. Plural
 #. TRANS: is decided by the number of characters available for the
 #. TRANS: biography (%d).
-#: actions/profilesettings.php:130 actions/register.php:450
 #, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4638,41 +3827,31 @@ msgstr[0] "Beschreibe dich selbst und deine Interessen in einem Zeichen"
 msgstr[1] "Beschreibe dich selbst und deine Interessen in %d Zeichen"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:136 actions/register.php:455
 msgid "Describe yourself and your interests"
 msgstr "Beschreibe dich selbst und deine Interessen"
 
 #. TRANS: Text area label in form for profile settings where users can provide.
 #. TRANS: their biography.
-#: actions/profilesettings.php:140 actions/register.php:457
 msgid "Bio"
 msgstr "Biografie"
 
 #. TRANS: Field label in form for profile settings.
-#: actions/profilesettings.php:146 actions/register.php:462
-#: lib/groupeditform.php:173
 msgid "Location"
 msgstr "Aufenthaltsort"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:149
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Wo du bist, beispielsweise „Stadt, Region, Land“"
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:154
 msgid "Share my current location when posting notices"
 msgstr "Teile meine aktuelle Position, wenn ich Nachrichten sende"
 
 #. TRANS: Field label in form for profile settings.
-#: actions/profilesettings.php:162 actions/tagother.php:128
-#: actions/tagother.php:188 lib/subscriptionlist.php:104
-#: lib/subscriptionlist.php:106
 msgid "Tags"
 msgstr "Tags"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:165
 #, fuzzy
 msgid ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- "
@@ -4682,28 +3861,23 @@ msgstr ""
 "Leerzeichen getrennt"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:170
 msgid "Language"
 msgstr "Sprache"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:172
 #, fuzzy
 msgid "Preferred language."
 msgstr "Bevorzugte Sprache"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:182
 msgid "Timezone"
 msgstr "Zeitzone"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:184
 msgid "What timezone are you normally in?"
 msgstr "In welcher Zeitzone befindest du dich üblicherweise?"
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:190
 #, fuzzy
 msgid ""
 "Automatically subscribe to whoever subscribes to me (best for non-humans)."
@@ -4714,7 +3888,6 @@ msgstr ""
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Plural form is used based on the maximum number of allowed
 #. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:259 actions/register.php:214
 #, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4722,84 +3895,68 @@ msgstr[0] "Die Biografie ist zu lang (maximal ein Zeichen)."
 msgstr[1] "Die Biografie ist zu lang (maximal %d Zeichen)."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:270 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr "Keine Zeitzone ausgewählt."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:278
 msgid "Language is too long (maximum 50 characters)."
 msgstr "Die eingegebene Sprache ist zu lang (maximal 50 Zeichen)."
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:292
 #, fuzzy, php-format
 msgid "Invalid tag: \"%s\"."
 msgstr "Ungültiges Stichwort: „%s“"
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:348
 #, fuzzy
 msgid "Could not update user for autosubscribe."
 msgstr "Autosubscribe konnte nicht aktiviert werden."
 
 #. TRANS: Server error thrown when user profile location preference settings could not be updated.
-#: actions/profilesettings.php:406
 #, fuzzy
 msgid "Could not save location prefs."
 msgstr "Konnte Positions-Einstellungen nicht speichern."
 
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:428 actions/tagother.php:179
 msgid "Could not save tags."
 msgstr "Konnte Tags nicht speichern."
 
 #. TRANS: Confirmation shown when user profile settings are saved.
 #. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:437 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "Einstellungen gespeichert."
 
 #. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
 #. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:484 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "Neues Benutzerkonto erstellen"
 
-#: actions/public.php:83
 #, php-format
 msgid "Beyond the page limit (%s)."
 msgstr "Jenseits des Seitenlimits (%s)."
 
-#: actions/public.php:92
 msgid "Could not retrieve public stream."
 msgstr "Konnte öffentlichen Stream nicht abrufen."
 
-#: actions/public.php:130
 #, php-format
 msgid "Public timeline, page %d"
 msgstr "Öffentliche Zeitleiste, Seite %d"
 
-#: actions/public.php:132 lib/publicgroupnav.php:79
 msgid "Public timeline"
 msgstr "Öffentliche Zeitleiste"
 
-#: actions/public.php:160
 msgid "Public Stream Feed (RSS 1.0)"
 msgstr "Feed des öffentlichen Streams (RSS 1.0)"
 
-#: actions/public.php:164
 msgid "Public Stream Feed (RSS 2.0)"
 msgstr "Feed des öffentlichen Streams (RSS 2.0)"
 
-#: actions/public.php:168
 msgid "Public Stream Feed (Atom)"
 msgstr "Feed des öffentlichen Streams (Atom)"
 
-#: actions/public.php:188
 #, php-format
 msgid ""
 "This is the public timeline for %%site.name%% but no one has posted anything "
@@ -4808,11 +3965,9 @@ msgstr ""
 "Dies ist die öffentliche Zeitleiste von %%site.name%%, es wurde allerdings "
 "noch nichts gepostet."
 
-#: actions/public.php:191
 msgid "Be the first to post!"
 msgstr "Sei der erste, der etwas schreibt!"
 
-#: actions/public.php:195
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post!"
@@ -4820,7 +3975,6 @@ msgstr ""
 "Warum nicht ein [Benutzerkonto anlegen](%%action.register%%) und den ersten "
 "Beitrag abschicken!"
 
-#: actions/public.php:242
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -4834,7 +3988,6 @@ msgstr ""
 "Nachrichten mit deinen Freunden, Familie oder Kollegen aus! ([Mehr "
 "Informationen](%%doc.help%%))"
 
-#: actions/public.php:247
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -4846,19 +3999,16 @@ msgstr ""
 "status.net/)."
 
 #. TRANS: Public RSS feed description. %s is the StatusNet site name.
-#: actions/publicrss.php:106
 #, fuzzy, php-format
 msgid "%s updates from everyone."
 msgstr "%s Nachrichten von allen!"
 
 #. TRANS: Title for public tag cloud.
-#: actions/publictagcloud.php:57
 msgid "Public tag cloud"
 msgstr "Öffentliche Tag-Wolke"
 
 #. TRANS: Instructions (more used like an explanation/header).
 #. TRANS: %s is the StatusNet sitename.
-#: actions/publictagcloud.php:65
 #, php-format
 msgid "These are most popular recent tags on %s"
 msgstr "Das sind die beliebtesten Tags auf „%s“"
@@ -4866,7 +4016,6 @@ msgstr "Das sind die beliebtesten Tags auf „%s“"
 #. TRANS: This message contains a Markdown URL. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.
-#: actions/publictagcloud.php:74
 #, php-format
 msgid "No one has posted a notice with a [hashtag](%%doc.tags%%) yet."
 msgstr ""
@@ -4875,7 +4024,6 @@ 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.
-#: actions/publictagcloud.php:79
 msgid "Be the first to post one!"
 msgstr "Sei der erste, der etwas schreibt!"
 
@@ -4884,7 +4032,6 @@ msgstr "Sei der erste, der etwas schreibt!"
 #. TRANS: This message contains a Markdown URL. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.
-#: actions/publictagcloud.php:87
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post "
@@ -4894,42 +4041,34 @@ msgstr ""
 "bist der erste der eine Nachricht abschickt!"
 
 #. TRANS: Client error displayed trying to recover password while already logged in.
-#: actions/recoverpassword.php:37
 msgid "You are already logged in!"
 msgstr "Du bist bereits angemeldet!"
 
 #. TRANS: Client error displayed when password recovery code is not correct.
-#: actions/recoverpassword.php:64
 msgid "No such recovery code."
 msgstr "Unbekannter Wiederherstellungscode."
 
 #. TRANS: Client error displayed when no proper password recovery code was submitted.
-#: actions/recoverpassword.php:69
 msgid "Not a recovery code."
 msgstr "Kein Wiederherstellungscode."
 
 #. TRANS: Server error displayed trying to recover password without providing a user.
-#: actions/recoverpassword.php:77
 msgid "Recovery code for unknown user."
 msgstr "Wiederherstellungscode für unbekannten Benutzer."
 
 #. TRANS: Server error displayed removing a password recovery code from the database.
-#: actions/recoverpassword.php:91
 msgid "Error with confirmation code."
 msgstr "Fehler beim Bestätigungscode."
 
 #. TRANS: Client error displayed trying to recover password with too old a recovery code.
-#: actions/recoverpassword.php:103
 msgid "This confirmation code is too old. Please start again."
 msgstr "Der Bestätigungscode ist zu alt. Bitte fange nochmal von vorne an."
 
 #. TRANS: Server error displayed when updating a user's e-mail address in the database fails while recovering a password.
-#: actions/recoverpassword.php:118
 msgid "Could not update user with confirmed email address."
 msgstr "Die bestätigte E-Mail-Adresse konnte nicht gespeichert werden."
 
 #. TRANS: Page notice for password recovery page.
-#: actions/recoverpassword.php:160
 msgid ""
 "If you have forgotten or lost your password, you can get a new one sent to "
 "the email address you have stored in your account."
@@ -4937,99 +4076,81 @@ msgstr ""
 "Wenn du dein Passwort vergessen hast, kannst du dir ein neues an deine "
 "hinterlegte Email schicken lassen."
 
-#: actions/recoverpassword.php:167
 msgid "You have been identified. Enter a new password below."
 msgstr "Du wurdest identifiziert. Gib ein neues Passwort ein."
 
 #. TRANS: Fieldset legend for password recovery page.
-#: actions/recoverpassword.php:198
 msgid "Password recovery"
 msgstr "Passwort-Wiederherstellung"
 
 #. TRANS: Field label on password recovery page.
-#: actions/recoverpassword.php:202
 msgid "Nickname or email address"
 msgstr "Spitzname oder E-Mail-Adresse"
 
 #. TRANS: Title for field label on password recovery page.
-#: actions/recoverpassword.php:205
 msgid "Your nickname on this server, or your registered email address."
 msgstr "Dein Benutzername oder E-Mail-Adresse auf diesem Server."
 
 #. TRANS: Field label on password recovery page.
-#: actions/recoverpassword.php:212
 msgid "Recover"
 msgstr "Wiederherstellung"
 
 #. TRANS: Button text on password recovery page.
-#: actions/recoverpassword.php:214
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Recover"
 msgstr "Wiederherstellung"
 
 #. TRANS: Title for password recovery page in password reset mode.
-#: actions/recoverpassword.php:223
 msgid "Reset password"
 msgstr "Passwort zurücksetzen"
 
 #. TRANS: Title for password recovery page in password recover mode.
-#: actions/recoverpassword.php:225
 msgid "Recover password"
 msgstr "Stelle Passwort wieder her"
 
 #. TRANS: Title for password recovery page in email sent mode.
 #. TRANS: Subject for password recovery e-mail.
-#: actions/recoverpassword.php:227 actions/recoverpassword.php:366
 msgid "Password recovery requested"
 msgstr "Wiederherstellung des Passworts angefordert"
 
 #. TRANS: Title for password recovery page in password saved mode.
-#: actions/recoverpassword.php:229
 #, fuzzy
 msgid "Password saved"
 msgstr "Passwort gespeichert."
 
 #. TRANS: Title for password recovery page when an unknown action has been specified.
-#: actions/recoverpassword.php:232
 msgid "Unknown action"
 msgstr "Unbekannter Befehl"
 
 #. TRANS: Title for field label for password reset form.
-#: actions/recoverpassword.php:258
 #, fuzzy
 msgid "6 or more characters, and do not forget it!"
 msgstr "6 oder mehr Zeichen, und nicht vergessen!"
 
 #. TRANS: Button text for password reset form.
 #. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: actions/recoverpassword.php:268 lib/designform.php:145
 msgctxt "BUTTON"
 msgid "Reset"
 msgstr "Zurücksetzen"
 
 #. TRANS: Form instructions for password recovery form.
-#: actions/recoverpassword.php:278
 msgid "Enter a nickname or email address."
 msgstr "Gib einen Spitznamen oder eine E-Mail-Adresse ein."
 
 #. TRANS: Information on password recovery form if no known username or e-mail address was specified.
-#: actions/recoverpassword.php:309
 msgid "No user with that email address or username."
 msgstr "Kein Benutzer mit dieser E-Mail-Adresse oder mit diesem Nutzernamen."
 
 #. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
-#: actions/recoverpassword.php:327
 msgid "No registered email address for that user."
 msgstr "Der Benutzer hat keine registrierte E-Mail-Adresse."
 
 #. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
-#: actions/recoverpassword.php:342
 msgid "Error saving address confirmation."
 msgstr "Fehler beim Speichern der Adressbestätigung."
 
 #. TRANS: User notification after an e-mail with instructions was sent from the password recovery form.
-#: actions/recoverpassword.php:370
 msgid ""
 "Instructions for recovering your password have been sent to the email "
 "address registered to your account."
@@ -5038,75 +4159,59 @@ msgstr ""
 "hinterlegte E-Mail-Adresse geschickt."
 
 #. TRANS: Client error displayed when trying to reset as password without providing a user.
-#: actions/recoverpassword.php:391
 msgid "Unexpected password reset."
 msgstr "Unerwarteter Passwortreset."
 
 #. TRANS: Reset password form validation error message.
-#: actions/recoverpassword.php:400
 msgid "Password must be 6 characters or more."
 msgstr "Passwort muss mehr als 6 Zeichen enthalten."
 
 #. TRANS: Reset password form validation error message.
-#: actions/recoverpassword.php:405
 msgid "Password and confirmation do not match."
 msgstr "Passwort und seine Bestätigung stimmen nicht überein."
 
 #. TRANS: Server error displayed when something does wrong with the user object during password reset.
-#: actions/recoverpassword.php:426 actions/register.php:241
 msgid "Error setting user."
 msgstr "Fehler bei den Benutzereinstellungen."
 
 #. TRANS: Success message for user after password reset.
-#: actions/recoverpassword.php:434
 msgid "New password successfully saved. You are now logged in."
 msgstr "Neues Passwort erfolgreich gespeichert. Du bist jetzt angemeldet."
 
-#: actions/redirecturl.php:70
 #, fuzzy
 msgid "No id parameter"
 msgstr "Kein ID-Argument."
 
-#: actions/redirecturl.php:76
 #, fuzzy, php-format
 msgid "No such file \"%d\""
 msgstr "Datei nicht gefunden."
 
-#: actions/register.php:80 actions/register.php:181 actions/register.php:392
 msgid "Sorry, only invited people can register."
 msgstr "Es tut uns leid, zum Registrieren benötigst du eine Einladung."
 
-#: actions/register.php:87
 msgid "Sorry, invalid invitation code."
 msgstr "Entschuldigung, ungültiger Einladungscode."
 
-#: actions/register.php:106
 msgid "Registration successful"
 msgstr "Registrierung erfolgreich"
 
-#: actions/register.php:108 actions/register.php:490
 msgid "Register"
 msgstr "Registrieren"
 
-#: actions/register.php:128
 msgid "Registration not allowed."
 msgstr "Registrierung nicht erlaubt."
 
-#: actions/register.php:194
 #, fuzzy
 msgid "You cannot register if you don't agree to the license."
 msgstr ""
 "Du kannst dich nicht registrieren, wenn du die Lizenz nicht akzeptierst."
 
-#: actions/register.php:203
 msgid "Email address already exists."
 msgstr "Diese E-Mail-Adresse existiert bereits."
 
-#: actions/register.php:236 actions/register.php:258
 msgid "Invalid username or password."
 msgstr "Benutzername oder Passwort falsch."
 
-#: actions/register.php:333
 #, fuzzy
 msgid ""
 "With this form you can create a new account. You can then post notices and "
@@ -5115,52 +4220,42 @@ msgstr ""
 "Hier kannst du einen neuen Zugang einrichten. Anschließend kannst du "
 "Nachrichten und Links mit deinen Freunden und Kollegen teilen. "
 
-#: actions/register.php:424 actions/register.php:428
-#: actions/siteadminpanel.php:238 lib/settingsnav.php:92
 msgid "Email"
 msgstr "E-Mail"
 
-#: actions/register.php:425 actions/register.php:429
 #, fuzzy
 msgid "Used only for updates, announcements, and password recovery."
 msgstr ""
 "Wird nur für Updates, wichtige Mitteilungen und zur "
 "Passwortwiederherstellung verwendet"
 
-#: actions/register.php:436
 #, fuzzy
 msgid "Longer name, preferably your \"real\" name."
 msgstr "Längerer Name, bevorzugt dein bürgerlicher Name"
 
-#: actions/register.php:464
 #, fuzzy
 msgid "Where you are, like \"City, State (or Region), Country\"."
 msgstr "Wo du bist, beispielsweise „Stadt, Region, Land“"
 
-#: actions/register.php:503
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
 msgstr ""
 "Mir ist bewusst, dass Inhalte und Daten von %1$s privat und vertraulich sind."
 
-#: actions/register.php:513
 #, php-format
 msgid "My text and files are copyright by %1$s."
 msgstr "Meine Texte und Dateien sind urheberrechtlich geschützt durch %1$s."
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:517
 msgid "My text and files remain under my own copyright."
 msgstr "Meine Texte und Dateien verbleiben unter meinem eigenen Urheberrecht."
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:520
 msgid "All rights reserved."
 msgstr "Alle Rechte vorbehalten."
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:525
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -5169,7 +4264,6 @@ msgstr ""
 "Abgesehen von den folgenden Daten: Passwort, E-Mail-Adresse, IM-Adresse und "
 "Telefonnummer, sind all meine Texte und Dateien unter %s verfügbar."
 
-#: actions/register.php:566
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -5202,7 +4296,6 @@ msgstr ""
 "\n"
 "Danke für deine Anmeldung, wir hoffen, dass dir der Service gefällt."
 
-#: actions/register.php:590
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5210,7 +4303,6 @@ msgstr ""
 "(Du solltest in Kürze eine E-Mail mit der Anleitung zur Überprüfung deiner "
 "Mailadresse erhalten.)"
 
-#: actions/remotesubscribe.php:97
 #, php-format
 msgid ""
 "To subscribe, you can [login](%%action.login%%), or [register](%%action."
@@ -5222,111 +4314,86 @@ msgstr ""
 "auf einer [kompatiblen Mikrobloggingsite](%%doc.openmublog%%) hast, dann gib "
 "deine Profil-URL unten an."
 
-#: actions/remotesubscribe.php:111
 msgid "Remote subscribe"
 msgstr "Entferntes Abonnement"
 
-#: actions/remotesubscribe.php:123
 msgid "Subscribe to a remote user"
 msgstr "Abonniere diesen Benutzer"
 
-#: actions/remotesubscribe.php:128
 msgid "User nickname"
 msgstr "Benutzername"
 
-#: actions/remotesubscribe.php:129
 #, fuzzy
 msgid "Nickname of the user you want to follow."
 msgstr "Name des Benutzers, dem du folgen möchtest"
 
-#: actions/remotesubscribe.php:132
 msgid "Profile URL"
 msgstr "Profil-URL"
 
-#: actions/remotesubscribe.php:133
 #, fuzzy
 msgid "URL of your profile on another compatible microblogging service."
 msgstr "Profil-URL bei einem anderen kompatiblen Mikrobloggingdienst"
 
 #. TRANS: Link text for link that will subscribe to a remote profile.
-#: actions/remotesubscribe.php:136 lib/subscribeform.php:139
-#: lib/userprofile.php:402
 msgid "Subscribe"
 msgstr "Abonnieren"
 
-#: actions/remotesubscribe.php:158
 #, fuzzy
 msgid "Invalid profile URL (bad format)."
 msgstr "Ungültige Profil-URL (falsches Format)"
 
-#: actions/remotesubscribe.php:167
 msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
 msgstr ""
 "Ungültige Profil-URL (kein YADIS-Dokument oder ungültige XRDS definiert)."
 
-#: actions/remotesubscribe.php:175
 #, fuzzy
 msgid "That is a local profile! Login to subscribe."
 msgstr "Das ist ein lokales Profil! Zum Abonnieren anmelden."
 
-#: actions/remotesubscribe.php:182
 #, fuzzy
 msgid "Could not get a request token."
 msgstr "Konnte keinen Anfrage-Token bekommen."
 
-#: actions/repeat.php:56
 msgid "Only logged-in users can repeat notices."
 msgstr "Nur angemeldete Benutzer können Nachrichten wiederholen."
 
-#: actions/repeat.php:63 actions/repeat.php:70
 msgid "No notice specified."
 msgstr "Keine Nachricht angegeben."
 
-#: actions/repeat.php:75
 #, fuzzy
 msgid "You cannot repeat your own notice."
 msgstr "Du kannst deine eigene Nachricht nicht wiederholen."
 
-#: actions/repeat.php:89
 msgid "You already repeated that notice."
 msgstr "Nachricht bereits wiederholt"
 
-#: actions/repeat.php:112 lib/noticelist.php:697
 msgid "Repeated"
 msgstr "Wiederholt"
 
-#: actions/repeat.php:117
 msgid "Repeated!"
 msgstr "Wiederholt!"
 
 #. TRANS: RSS reply feed title. %s is a user nickname.
-#: actions/replies.php:126 actions/repliesrss.php:68
-#: lib/personalgroupnav.php:105
 #, php-format
 msgid "Replies to %s"
 msgstr "Antworten an %s"
 
-#: actions/replies.php:128
 #, php-format
 msgid "Replies to %1$s, page %2$d"
 msgstr "Antworten an %1$s, Seite %2$d"
 
-#: actions/replies.php:145
 #, php-format
 msgid "Replies feed for %s (RSS 1.0)"
 msgstr "Feed der Antworten an %s (RSS 1.0)"
 
-#: actions/replies.php:152
 #, php-format
 msgid "Replies feed for %s (RSS 2.0)"
 msgstr "Feed der Antworten an %s (RSS 2.0)"
 
-#: actions/replies.php:159
 #, php-format
 msgid "Replies feed for %s (Atom)"
 msgstr "Feed der Nachrichten von %s (Atom)"
 
-#: actions/replies.php:199
 #, php-format
 msgid ""
 "This is the timeline showing replies to %1$s but %2$s hasn't received a "
@@ -5335,7 +4402,6 @@ msgstr ""
 "Dies ist die Zeitleiste für %1$s, aber %2$s hat noch keine Notiz dazu "
 "erhalten."
 
-#: actions/replies.php:204
 #, php-format
 msgid ""
 "You can engage other users in a conversation, subscribe to more people or "
@@ -5344,7 +4410,6 @@ msgstr ""
 "Du kannst andere Benutzer ansprechen, mehr Leuten folgen oder [Gruppen "
 "beitreten](%%action.groups%%)."
 
-#: actions/replies.php:206
 #, php-format
 msgid ""
 "You can try to [nudge %1$s](../%2$s) or [post something to them](%%%%action."
@@ -5355,39 +4420,33 @@ msgstr ""
 
 #. TRANS: RSS reply feed description.
 #. TRANS: %1$s is a user nickname, %2$s is the StatusNet site name.
-#: actions/repliesrss.php:74
 #, fuzzy, php-format
 msgid "Replies to %1$s on %2$s."
 msgstr "Antworten an %1$s auf %2$s!"
 
 #. TRANS: Client exception displayed when trying to restore an account while not logged in.
-#: actions/restoreaccount.php:78
 #, fuzzy
 msgid "Only logged-in users can restore their account."
 msgstr "Nur angemeldete Benutzer können Nachrichten wiederholen."
 
 #. TRANS: Client exception displayed when trying to restore an account without having restore rights.
-#: actions/restoreaccount.php:83
 #, fuzzy
 msgid "You may not restore your account."
 msgstr "Du hast noch keine Programme registriert"
 
 #. TRANS: Client exception displayed trying to restore an account while something went wrong uploading a file.
 #. TRANS: Client exception. No file; probably just a non-AJAX submission.
-#: actions/restoreaccount.php:121 actions/restoreaccount.php:146
 #, fuzzy
 msgid "No uploaded file."
 msgstr "Datei hochladen"
 
 #. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
-#: actions/restoreaccount.php:129 lib/mediafile.php:194
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
 msgstr ""
 "Die Größe der hochgeladenen Datei überschreitet die upload_max_filesize "
 "Angabe in der php.ini."
 
 #. TRANS: Client exception.
-#: actions/restoreaccount.php:135 lib/mediafile.php:200
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form."
@@ -5396,144 +4455,116 @@ msgstr ""
 "die im HTML-Formular angegeben wurde."
 
 #. TRANS: Client exception.
-#: actions/restoreaccount.php:141 lib/mediafile.php:206
 msgid "The uploaded file was only partially uploaded."
 msgstr "Die Datei wurde nur teilweise auf den Server geladen."
 
 #. TRANS: Client exception thrown when a temporary folder is not present to store a file upload.
-#: actions/restoreaccount.php:150 lib/mediafile.php:214
 msgid "Missing a temporary folder."
 msgstr "Kein temporäres Verzeichnis gefunden."
 
 #. TRANS: Client exception thrown when writing to disk is not possible during a file upload operation.
-#: actions/restoreaccount.php:154 lib/mediafile.php:218
 msgid "Failed to write file to disk."
 msgstr "Konnte die Datei nicht auf die Festplatte schreiben."
 
 #. TRANS: Client exception thrown when a file upload operation has been stopped by an extension.
-#: actions/restoreaccount.php:158 lib/mediafile.php:222
 msgid "File upload stopped by extension."
 msgstr "Upload der Datei wurde wegen der Dateiendung gestoppt."
 
 #. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
 #. TRANS: Exception thrown when uploading an image fails for an unknown reason.
 #. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
-#: actions/restoreaccount.php:164 lib/imagefile.php:106 lib/mediafile.php:228
 msgid "System error uploading file."
 msgstr "Systemfehler beim Hochladen der Datei."
 
 #. TRANS: Client exception thrown when a feed is not an Atom feed.
-#: actions/restoreaccount.php:207
 #, fuzzy
 msgid "Not an Atom feed."
 msgstr "Kein Mitglied"
 
 #. TRANS: Success message when a feed has been restored.
-#: actions/restoreaccount.php:241
 msgid ""
 "Feed has been restored. Your old posts should now appear in search and your "
 "profile page."
 msgstr ""
 
 #. TRANS: Message when a feed restore is in progress.
-#: actions/restoreaccount.php:245
 msgid "Feed will be restored. Please wait a few minutes for results."
 msgstr ""
 
 #. TRANS: Form instructions for feed restore.
-#: actions/restoreaccount.php:342
 msgid ""
 "You can upload a backed-up stream in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format."
 msgstr ""
 
 #. TRANS: Title for submit button to confirm upload of a user backup file for account restore.
-#: actions/restoreaccount.php:373
 msgid "Upload the file"
 msgstr "Datei hochladen"
 
-#: actions/revokerole.php:75
 msgid "You cannot revoke user roles on this site."
 msgstr "Du kannst die Rollen von Benutzern dieser Seite nicht widerrufen."
 
-#: actions/revokerole.php:82
 msgid "User doesn't have this role."
 msgstr "Benutzer verfügt nicht über diese Rolle."
 
-#: actions/rsd.php:142 actions/version.php:159
 msgid "StatusNet"
 msgstr "StatusNet"
 
-#: actions/sandbox.php:65 actions/unsandbox.php:65
 msgid "You cannot sandbox users on this site."
 msgstr "Du kannst Benutzer auf dieser Seite nicht auf den Spielplaz schicken."
 
-#: actions/sandbox.php:72
 msgid "User is already sandboxed."
 msgstr "Benutzer ist schon blockiert."
 
 #. TRANS: Menu item for site administration
-#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
-#: lib/adminpanelaction.php:379
 msgid "Sessions"
 msgstr "Sitzung"
 
-#: actions/sessionsadminpanel.php:65
 msgid "Session settings for this StatusNet site"
 msgstr "Sitzungs-Einstellungen dieser StatusNet-Website"
 
-#: actions/sessionsadminpanel.php:175
 msgid "Handle sessions"
 msgstr "Sitzung verwalten"
 
-#: actions/sessionsadminpanel.php:177
 msgid "Whether to handle sessions ourselves."
 msgstr "Sitzungsverwaltung selber übernehmen."
 
-#: actions/sessionsadminpanel.php:181
 msgid "Session debugging"
 msgstr "Sitzung untersuchen"
 
-#: actions/sessionsadminpanel.php:183
 msgid "Turn on debugging output for sessions."
 msgstr "Fehleruntersuchung für Sitzungen aktivieren"
 
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
+#. TRANS: Submit button title.
+msgid "Save"
+msgstr "Speichern"
+
 msgid "Save site settings"
 msgstr "Website-Einstellungen speichern"
 
-#: actions/showapplication.php:78
 msgid "You must be logged in to view an application."
 msgstr "Du musst angemeldet sein, um dieses Programm zu betrachten."
 
-#: actions/showapplication.php:151
 msgid "Application profile"
 msgstr "Anwendungsprofil"
 
-#: actions/showapplication.php:179
 #, php-format
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr "Erstellt von %1$s - %2$s Standard Zugang - %3$d Benutzer"
 
-#: actions/showapplication.php:189
 msgid "Application actions"
 msgstr "Programmaktionen"
 
-#: actions/showapplication.php:212
 msgid "Reset key & secret"
 msgstr "Schlüssel zurücksetzen"
 
 #. TRANS: Title of form for deleting a user.
-#: actions/showapplication.php:228 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:64 lib/noticelist.php:678
 msgid "Delete"
 msgstr "Löschen"
 
-#: actions/showapplication.php:237
 msgid "Application info"
 msgstr "Programminformation"
 
-#: actions/showapplication.php:255
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
@@ -5541,42 +4572,35 @@ msgstr ""
 "Hinweis: Wir unterstützen HMAC-SHA1-Signaturen. Wir unterstützen keine "
 "Klartext-Signaturen."
 
-#: actions/showapplication.php:275
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr "Bist du sicher, dass du den Schlüssel zurücksetzen willst?"
 
 #. TRANS: Title for all but the first page of favourite notices of a user.
 #. TRANS: %1$s is the user for whom the favourite notices are displayed, %2$d is the page number.
-#: actions/showfavorites.php:80
 #, php-format
 msgid "%1$s's favorite notices, page %2$d"
 msgstr "Favorisierte Nachrichten von %1$s, Seite %2$d"
 
 #. TRANS: Server error displayed when favourite notices could not be retrieved from the database.
-#: actions/showfavorites.php:134
 msgid "Could not retrieve favorite notices."
 msgstr "Konnte Favoriten nicht abrufen."
 
 #. TRANS: Feed link text. %s is a username.
-#: actions/showfavorites.php:172
 #, php-format
 msgid "Feed for favorites of %s (RSS 1.0)"
 msgstr "Feed der Freunde von %s (RSS 1.0)"
 
 #. TRANS: Feed link text. %s is a username.
-#: actions/showfavorites.php:180
 #, php-format
 msgid "Feed for favorites of %s (RSS 2.0)"
 msgstr "Feed der Freunde von %s (RSS 2.0)"
 
 #. TRANS: Feed link text. %s is a username.
-#: actions/showfavorites.php:188
 #, php-format
 msgid "Feed for favorites of %s (Atom)"
 msgstr "Feed der Freunde von %s (Atom)"
 
 #. TRANS: Text displayed instead of favourite notices for the current logged in user that has no favourites.
-#: actions/showfavorites.php:209
 msgid ""
 "You haven't chosen any favorite notices yet. Click the fave button on "
 "notices you like to bookmark them for later or shed a spotlight on them."
@@ -5587,7 +4611,6 @@ msgstr ""
 
 #. TRANS: Text displayed instead of favourite notices for a user that has no favourites while logged in.
 #. TRANS: %s is a username.
-#: actions/showfavorites.php:213
 #, php-format
 msgid ""
 "%s hasn't added any favorite notices yet. Post something interesting they "
@@ -5599,7 +4622,6 @@ msgstr ""
 #. TRANS: Text displayed instead of favourite notices for a user that has no favourites while not logged in.
 #. TRANS: %s is a username, %%%%action.register%%%% is a link to the user registration page.
 #. TRANS: (link text)[link] is a Mark Down link.
-#: actions/showfavorites.php:220
 #, php-format
 msgid ""
 "%s hasn't added any favorite notices yet. Why not [register an account](%%%%"
@@ -5611,64 +4633,53 @@ msgstr ""
 "%s hinzufügen kann!"
 
 #. TRANS: Page notice for show favourites page.
-#: actions/showfavorites.php:251
 msgid "This is a way to share what you like."
 msgstr "Dies ist ein Weg, Dinge zu teilen, die dir gefallen."
 
 #. TRANS: Page title for first group page. %s is a group name.
-#: actions/showgroup.php:75
 #, php-format
 msgid "%s group"
 msgstr "%s-Gruppe"
 
 #. TRANS: Page title for any but first group page.
 #. TRANS: %1$s is a group name, $2$s is a page number.
-#: actions/showgroup.php:79
 #, php-format
 msgid "%1$s group, page %2$d"
 msgstr "%1$s Gruppe, Seite %d"
 
 #. TRANS: Label for group description or group note (dt). Text hidden by default.
-#: actions/showgroup.php:266
 msgid "Note"
 msgstr "Nachricht"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:277 lib/groupeditform.php:180
 msgid "Aliases"
 msgstr "Pseudonyme"
 
 #. TRANS: Group actions header (h2). Text hidden by default.
-#: actions/showgroup.php:294
 msgid "Group actions"
 msgstr "Gruppenaktionen"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:338
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
 msgstr "Nachrichtenfeed der Gruppe %s (RSS 1.0)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:345
 #, php-format
 msgid "Notice feed for %s group (RSS 2.0)"
 msgstr "Nachrichtenfeed der Gruppe %s (RSS 2.0)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:352
 #, php-format
 msgid "Notice feed for %s group (Atom)"
 msgstr "Nachrichtenfeed der Gruppe %s (Atom)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:358
 #, php-format
 msgid "FOAF for %s group"
 msgstr "Postausgang von %s"
 
 #. TRANS: Header for mini list of group members on a group page (h2).
-#: actions/showgroup.php:395
 msgid "Members"
 msgstr "Mitglieder"
 
@@ -5676,30 +4687,23 @@ msgstr "Mitglieder"
 #. TRANS: Text for user subscription statistics if the user has no subscriptions.
 #. TRANS: Text for user subscriber statistics if user has no subscribers.
 #. TRANS: Text for user user group membership statistics if user is not a member of any group.
-#: actions/showgroup.php:401 lib/profileaction.php:137
-#: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
-#: lib/subscriptionlist.php:123 lib/tagcloudsection.php:71
 msgid "(None)"
 msgstr "(Kein)"
 
 #. TRANS: Link to all group members from mini list of group members if group has more than n members.
-#: actions/showgroup.php:410
 msgid "All members"
 msgstr "Alle Mitglieder"
 
 #. TRANS: Header for group statistics on a group page (h2).
 #. TRANS: H2 text for user statistics.
-#: actions/showgroup.php:441 lib/profileaction.php:205
 msgid "Statistics"
 msgstr "Statistik"
 
-#: actions/showgroup.php:444
 msgctxt "LABEL"
 msgid "Created"
 msgstr "Erstellt"
 
 #. TRANS: Label for member count in statistics on group page.
-#: actions/showgroup.php:449
 msgctxt "LABEL"
 msgid "Members"
 msgstr "Mitglieder"
@@ -5708,7 +4712,6 @@ msgstr "Mitglieder"
 #. TRANS: **%s** is the group alias, %%%%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).
-#: actions/showgroup.php:464
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5726,7 +4729,6 @@ 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: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
-#: actions/showgroup.php:474
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5740,100 +4742,84 @@ msgstr ""
 "Nachrichten über ihr Leben und Interessen. "
 
 #. TRANS: Header for list of group administrators on a group page (h2).
-#: actions/showgroup.php:503
 msgid "Admins"
 msgstr "Admins"
 
 #. TRANS: Client error displayed requesting a single message that does not exist.
-#: actions/showmessage.php:76
 msgid "No such message."
 msgstr "Keine derartige Nachricht."
 
 #. TRANS: Client error displayed requesting a single direct message the requesting user was not a party in.
-#: actions/showmessage.php:86
 msgid "Only the sender and recipient may read this message."
 msgstr "Nur der Absender und der Empfänger können diese Nachricht lesen."
 
 #. TRANS: Page title for single direct message display when viewing user is the sender.
 #. TRANS: %1$s is the addressed user's nickname, $2$s is a timestamp.
-#: actions/showmessage.php:105
 #, php-format
 msgid "Message to %1$s on %2$s"
 msgstr "Nachricht an %1$s auf %2$s"
 
 #. TRANS: Page title for single message display.
 #. TRANS: %1$s is the sending user's nickname, $2$s is a timestamp.
-#: actions/showmessage.php:113
 #, php-format
 msgid "Message from %1$s on %2$s"
 msgstr "Nachricht von %1$s auf %2$s"
 
-#: actions/shownotice.php:90
 msgid "Notice deleted."
 msgstr "Nachricht gelöscht."
 
 #. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
-#: actions/showstream.php:70
 #, php-format
 msgid "%1$s tagged %2$s"
 msgstr "Von „%1$s“ mit „%2$s“ getaggte Nachrichten"
 
 #. TRANS: Page title showing tagged notices in one user's stream.
 #. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
-#: actions/showstream.php:74
 #, php-format
 msgid "%1$s tagged %2$s, page %3$d"
 msgstr "Von „%1$s“ mit „%2$s“ getaggte Nachrichten, Seite %3$d"
 
 #. TRANS: Extended page title showing tagged notices in one user's stream.
 #. TRANS: %1$s is the username, %2$d is the page number.
-#: actions/showstream.php:82
 #, php-format
 msgid "%1$s, page %2$d"
 msgstr "%1$s, Seite %2$d"
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %1$s is a user nickname, %2$s is a hashtag.
-#: actions/showstream.php:127
 #, php-format
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
 msgstr "Feed aller von „%1$s“ mit „%2$s“ getaggten Nachrichten (RSS 1.0)"
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.
-#: actions/showstream.php:136
 #, php-format
 msgid "Notice feed for %s (RSS 1.0)"
 msgstr "Feed der Nachrichten von %s (RSS 1.0)"
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.
-#: actions/showstream.php:145
 #, php-format
 msgid "Notice feed for %s (RSS 2.0)"
 msgstr "Feed der Nachrichten von %s (RSS 2.0)"
 
-#: actions/showstream.php:152
 #, php-format
 msgid "Notice feed for %s (Atom)"
 msgstr "Feed der Nachrichten von %s (Atom)"
 
 #. TRANS: Title for link to notice feed. FOAF stands for Friend of a Friend.
 #. TRANS: More information at http://www.foaf-project.org. %s is a user nickname.
-#: actions/showstream.php:159
 #, php-format
 msgid "FOAF for %s"
 msgstr "FOAF von %s"
 
 #. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
-#: actions/showstream.php:205
 #, php-format
 msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr ""
 "Dies ist die Zeitleiste von %1$s, aber bisher hat %1$s noch nichts gepostet."
 
 #. TRANS: Second sentence of empty list message for a stream for the user themselves.
-#: actions/showstream.php:211
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
@@ -5843,7 +4829,6 @@ msgstr ""
 
 #. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:215
 #, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
@@ -5854,7 +4839,6 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:258
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5870,7 +4854,6 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:265
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5882,224 +4865,177 @@ msgstr ""
 "[StatusNet](http://status.net/). "
 
 #. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
-#: actions/showstream.php:322
 #, php-format
 msgid "Repeat of %s"
 msgstr "Wiederholung von %s"
 
-#: actions/silence.php:65 actions/unsilence.php:65
 msgid "You cannot silence users on this site."
 msgstr "Du kannst Benutzer dieser Seite nicht ruhig stellen."
 
-#: actions/silence.php:72
 msgid "User is already silenced."
 msgstr "Benutzer ist bereits ruhig gestellt."
 
-#: actions/siteadminpanel.php:69
 msgid "Basic settings for this StatusNet site"
 msgstr "Grundeinstellungen dieser StatusNet-Website"
 
-#: actions/siteadminpanel.php:133
 msgid "Site name must have non-zero length."
 msgstr "Der Seitenname darf nicht leer sein."
 
-#: actions/siteadminpanel.php:141
 msgid "You must have a valid contact email address."
 msgstr "Du musst eine gültige E-Mail-Adresse haben."
 
-#: actions/siteadminpanel.php:159
 #, php-format
 msgid "Unknown language \"%s\"."
 msgstr "Unbekannte Sprache „%s“"
 
-#: actions/siteadminpanel.php:165
 msgid "Minimum text limit is 0 (unlimited)."
 msgstr "Minimale Textlänge ist 0 Zeichen (unbegrenzt)"
 
-#: actions/siteadminpanel.php:171
 msgid "Dupe limit must be one or more seconds."
 msgstr "Duplikatlimit muss mehr als 1 Sekunde sein"
 
-#: actions/siteadminpanel.php:221
 msgid "General"
 msgstr "Allgemein"
 
-#: actions/siteadminpanel.php:224
 msgid "Site name"
 msgstr "Seitenname"
 
-#: actions/siteadminpanel.php:225
 msgid "The name of your site, like \"Yourcompany Microblog\""
 msgstr "Der Name deiner Seite, sowas wie „DeinUnternehmen-Mikroblog“"
 
-#: actions/siteadminpanel.php:229
 msgid "Brought by"
 msgstr "Erstellt von"
 
-#: actions/siteadminpanel.php:230
 msgid "Text used for credits link in footer of each page"
 msgstr ""
 "Text der für den Credit-Link im Fußbereich auf jeder Seite benutzt wird"
 
-#: actions/siteadminpanel.php:234
 msgid "Brought by URL"
 msgstr "Erstellt von Adresse"
 
-#: actions/siteadminpanel.php:235
 msgid "URL used for credits link in footer of each page"
 msgstr ""
 "Adresse, die für den Credit-Link im Fußbereich auf jeder Seite benutzt wird"
 
-#: actions/siteadminpanel.php:239
 msgid "Contact email address for your site"
 msgstr "Kontakt-E-Mail-Adresse für deine Website."
 
-#: actions/siteadminpanel.php:245
 msgid "Local"
 msgstr "Lokal"
 
-#: actions/siteadminpanel.php:256
 msgid "Default timezone"
 msgstr "Standard-Zeitzone"
 
-#: actions/siteadminpanel.php:257
 msgid "Default timezone for the site; usually UTC."
 msgstr "Standard-Zeitzone für die Seite (meistens UTC)."
 
-#: actions/siteadminpanel.php:262
 msgid "Default language"
 msgstr "Bevorzugte Sprache"
 
-#: actions/siteadminpanel.php:263
 msgid "Site language when autodetection from browser settings is not available"
 msgstr ""
 "Sprache der Seite für den Fall, dass die automatische Erkennung anhand der "
 "Browser-Einstellungen nicht verfügbar ist."
 
-#: actions/siteadminpanel.php:271
 msgid "Limits"
 msgstr "Limit"
 
-#: actions/siteadminpanel.php:274
 msgid "Text limit"
 msgstr "Textlimit"
 
-#: actions/siteadminpanel.php:274
 msgid "Maximum number of characters for notices."
 msgstr "Maximale Anzahl von Zeichen pro Nachricht"
 
-#: actions/siteadminpanel.php:278
 msgid "Dupe limit"
 msgstr "Wiederholungslimit"
 
-#: actions/siteadminpanel.php:278
 msgid "How long users must wait (in seconds) to post the same thing again."
 msgstr ""
 "Wie lange muss ein Benutzer warten, bis er eine identische Nachricht "
 "abschicken kann (in Sekunden)."
 
 #. TRANS: Page title for site-wide notice tab in admin panel.
-#: actions/sitenoticeadminpanel.php:55
 msgid "Site Notice"
 msgstr "Seitenbenachrichtigung"
 
 #. TRANS: Instructions for site-wide notice tab in admin panel.
-#: actions/sitenoticeadminpanel.php:66
 msgid "Edit site-wide message"
 msgstr "Neue Nachricht"
 
 #. TRANS: Server error displayed when saving a site-wide notice was impossible.
-#: actions/sitenoticeadminpanel.php:101
 msgid "Unable to save site notice."
 msgstr "Konnte Seitenbenachrichtigung nicht speichern"
 
 #. TRANS: Client error displayed when a site-wide notice was longer than allowed.
-#: actions/sitenoticeadminpanel.php:112
 msgid "Maximum length for the site-wide notice is 255 characters."
 msgstr "Maximale Länge von Systembenachrichtigungen ist 255 Zeichen."
 
 #. TRANS: Label for site-wide notice text field in admin panel.
-#: actions/sitenoticeadminpanel.php:176
 msgid "Site notice text"
 msgstr "Seitenbenachrichtigung"
 
 #. TRANS: Tooltip for site-wide notice text field in admin panel.
-#: actions/sitenoticeadminpanel.php:179
 msgid "Site-wide notice text (255 characters maximum; HTML allowed)"
 msgstr "Systembenachrichtigung (maximal 255 Zeichen; HTML erlaubt)"
 
 #. TRANS: Title for button to save site notice in admin panel.
-#: actions/sitenoticeadminpanel.php:201
 #, fuzzy
 msgid "Save site notice."
 msgstr "Systemnachricht speichern"
 
 #. TRANS: Title for SMS settings.
-#: actions/smssettings.php:56
 msgid "SMS settings"
 msgstr "SMS-Einstellungen"
 
 #. TRANS: SMS settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/smssettings.php:70
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr "Du kannst SMS von %%site.name%% per E-Mail empfangen."
 
 #. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
-#: actions/smssettings.php:92
 msgid "SMS is not available."
 msgstr "SMS ist nicht verfügbar."
 
 #. TRANS: Form legend for SMS settings form.
-#: actions/smssettings.php:106
 msgid "SMS address"
 msgstr "SMS-Adresse"
 
 #. TRANS: Form guide in SMS settings form.
-#: actions/smssettings.php:115
 msgid "Current confirmed SMS-enabled phone number."
 msgstr "Aktuelle für den SMS-Dienst bestätigte Telefonnummer."
 
 #. TRANS: Form guide in IM settings form.
-#: actions/smssettings.php:128
 msgid "Awaiting confirmation on this phone number."
 msgstr "Warte auf die Bestätigung dieser Telefonnummer."
 
 #. TRANS: Field label for SMS address input in SMS settings form.
-#: actions/smssettings.php:137
 msgid "Confirmation code"
 msgstr "Bestätigungscode"
 
 #. TRANS: Form field instructions in SMS settings form.
-#: actions/smssettings.php:139
 msgid "Enter the code you received on your phone."
 msgstr "Gib den Code ein, den du auf deinem Handy via SMS bekommen hast."
 
 #. TRANS: Button label to confirm SMS confirmation code in SMS settings.
-#: actions/smssettings.php:143
 msgctxt "BUTTON"
 msgid "Confirm"
 msgstr "Bestätigen"
 
 #. TRANS: Field label for SMS phone number input in SMS settings form.
-#: actions/smssettings.php:148
 msgid "SMS phone number"
 msgstr "SMS-Telefonnummer"
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
-#: actions/smssettings.php:151
 #, fuzzy
 msgid "Phone number, no punctuation or spaces, with area code."
 msgstr "Telefonnummer, keine Sonder- oder Leerzeichen mit Vorwahl"
 
 #. TRANS: Form legend for SMS preferences form.
-#: actions/smssettings.php:190
 msgid "SMS preferences"
 msgstr "SMS-Einstellungen"
 
 #. TRANS: Checkbox label in SMS preferences form.
-#: actions/smssettings.php:196
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
@@ -6108,32 +5044,26 @@ msgstr ""
 "meinem Netzbetreiber entstehen können."
 
 #. TRANS: Confirmation message for successful SMS preferences save.
-#: actions/smssettings.php:307
 msgid "SMS preferences saved."
 msgstr "SMS-Einstellungen gesichert."
 
 #. TRANS: Message given saving SMS phone number without having provided one.
-#: actions/smssettings.php:329
 msgid "No phone number."
 msgstr "Keine Telefonnummer."
 
 #. TRANS: Message given saving SMS phone number without having selected a carrier.
-#: actions/smssettings.php:335
 msgid "No carrier selected."
 msgstr "Kein Netzanbieter ausgewählt."
 
 #. TRANS: Message given saving SMS phone number that is already set.
-#: actions/smssettings.php:343
 msgid "That is already your phone number."
 msgstr "Dies ist bereits deine Telefonnummer."
 
 #. TRANS: Message given saving SMS phone number that is already set for another user.
-#: actions/smssettings.php:347
 msgid "That phone number already belongs to another user."
 msgstr "Diese Telefonnummer wird bereits von einem anderen Benutzer verwendet."
 
 #. TRANS: Message given saving valid SMS phone number that is to be confirmed.
-#: actions/smssettings.php:375
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
 "for the code and instructions on how to use it."
@@ -6143,39 +5073,32 @@ msgstr ""
 "die Anweisungen, um ihn zu benutzen."
 
 #. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
-#: actions/smssettings.php:403
 msgid "That is the wrong confirmation number."
 msgstr "Die Bestätigungsnummer ist falsch."
 
 #. TRANS: Message given after successfully canceling SMS phone number confirmation.
-#: actions/smssettings.php:417
 msgid "SMS confirmation cancelled."
 msgstr "SMS-Bestätigung abgebrochen."
 
 #. TRANS: Message given trying to remove an SMS phone number that is not
 #. TRANS: registered for the active user.
-#: actions/smssettings.php:437
 msgid "That is not your phone number."
 msgstr "Dies ist nicht deine Telefonnummer."
 
 #. TRANS: Message given after successfully removing a registered SMS phone number.
-#: actions/smssettings.php:459
 msgid "The SMS phone number was removed."
 msgstr "SMS-Telefonnummer wurde entfernt."
 
 #. TRANS: Label for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:498
 msgid "Mobile carrier"
 msgstr "Netzanbieter"
 
 #. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:503
 msgid "Select a carrier"
 msgstr "Wähle einen Netzanbieter"
 
 #. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
 #. TRANS: %s is an administrative contact's e-mail address.
-#: actions/smssettings.php:512
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -6186,119 +5109,94 @@ msgstr ""
 "s."
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
-#: actions/smssettings.php:534
 #, fuzzy
 msgid "No code entered."
 msgstr "Kein Code eingegeben"
 
 #. TRANS: Menu item for site administration
-#: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
-#: lib/adminpanelaction.php:395
 msgid "Snapshots"
 msgstr "Snapshots"
 
-#: actions/snapshotadminpanel.php:65
 msgid "Manage snapshot configuration"
 msgstr "Snapshot-Konfiguration verwalten"
 
-#: actions/snapshotadminpanel.php:127
 msgid "Invalid snapshot run value."
 msgstr "Der Wert zum Ausführen von Snapshots ist ungültig."
 
-#: actions/snapshotadminpanel.php:133
 msgid "Snapshot frequency must be a number."
 msgstr "Die Snapshot-Frequenz muss eine Zahl sein."
 
-#: actions/snapshotadminpanel.php:144
 msgid "Invalid snapshot report URL."
 msgstr "Ungültige Snapshot-Berichts-URL."
 
-#: actions/snapshotadminpanel.php:200
 msgid "Randomly during web hit"
 msgstr "Zufällig während Webseitenbesuchen"
 
-#: actions/snapshotadminpanel.php:201
 msgid "In a scheduled job"
 msgstr "Als zeitlich geplanten Auftrag"
 
-#: actions/snapshotadminpanel.php:206
 msgid "Data snapshots"
 msgstr "Daten-Snapshot"
 
-#: actions/snapshotadminpanel.php:208
 msgid "When to send statistical data to status.net servers"
 msgstr "Wann sollen Statistiken zum status.net-Server geschickt werden"
 
-#: actions/snapshotadminpanel.php:217
 msgid "Frequency"
 msgstr "Frequenz"
 
-#: actions/snapshotadminpanel.php:218
 msgid "Snapshots will be sent once every N web hits"
 msgstr "Snapshots werden alle N Webseitenbesuche gesendet"
 
-#: actions/snapshotadminpanel.php:226
 msgid "Report URL"
 msgstr "URL melden"
 
-#: actions/snapshotadminpanel.php:227
 msgid "Snapshots will be sent to this URL"
 msgstr "An diese Adresse werden Snapshots gesendet"
 
-#: actions/snapshotadminpanel.php:248
 msgid "Save snapshot settings"
 msgstr "Snapshot-Einstellungen speichern"
 
 #. TRANS: Client error displayed trying a change a subscription for a non-subscribed profile.
-#: actions/subedit.php:75
 msgid "You are not subscribed to that profile."
 msgstr "Du hast dieses Profil nicht abonniert."
 
 #. TRANS: Server error displayed when updating a subscription fails with a database error.
 #. TRANS: Exception thrown when a subscription could not be stored on the server.
-#: actions/subedit.php:89 classes/Subscription.php:141
 msgid "Could not save subscription."
 msgstr "Konnte Abonnement nicht erstellen."
 
 #. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
-#: actions/subscribe.php:121
 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
 msgstr "Du hast dieses OMB 0.1 Profil nicht abonniert."
 
 #. TRANS: Page title when subscription succeeded.
-#: actions/subscribe.php:149
 msgid "Subscribed"
 msgstr "Abonniert"
 
 #. TRANS: Header for list of subscribers for a user (first page).
 #. TRANS: %s is the user's nickname.
-#: actions/subscribers.php:51
 #, php-format
 msgid "%s subscribers"
 msgstr "%s Abonnenten"
 
 #. TRANS: Header for list of subscribers for a user (not first page).
 #. TRANS: %1$s is the user's nickname, $2$d is the page number.
-#: actions/subscribers.php:55
 #, php-format
 msgid "%1$s subscribers, page %2$d"
 msgstr "%1$s Abonnenten, Seite %2$d"
 
 #. TRANS: Page notice for page with an overview of all subscribers
 #. TRANS: of the logged in user's own profile.
-#: actions/subscribers.php:68
 msgid "These are the people who listen to your notices."
 msgstr "Dies sind die Leute, die deine Nachrichten lesen."
 
 #. TRANS: Page notice for page with an overview of all subscribers of a user other
 #. TRANS: than the logged in user. %s is the user nickname.
-#: actions/subscribers.php:74
 #, php-format
 msgid "These are the people who listen to %s's notices."
 msgstr "Dies sind die Leute, die Nachrichten von %s lesen."
 
 #. TRANS: Subscriber list text when the logged in user has no subscribers.
-#: actions/subscribers.php:114
 msgid ""
 "You have no subscribers. Try subscribing to people you know and they might "
 "return the favor."
@@ -6308,7 +5206,6 @@ msgstr ""
 
 #. TRANS: Subscriber list text when looking at the subscribers for a of a user other
 #. TRANS: than the logged in user that has no subscribers. %s is the user nickname.
-#: actions/subscribers.php:118
 #, php-format
 msgid "%s has no subscribers. Want to be the first?"
 msgstr "%s hat keine Abonnenten. Willst du der erste sein?"
@@ -6318,7 +5215,6 @@ msgstr "%s hat keine Abonnenten. Willst du der erste sein?"
 #. TRANS: This message contains a Markdown URL. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.
-#: actions/subscribers.php:127
 #, php-format
 msgid ""
 "%s has no subscribers. Why not [register an account](%%%%action.register%%%"
@@ -6329,20 +5225,17 @@ msgstr ""
 
 #. TRANS: Header for subscriptions overview for a user (not first page).
 #. TRANS: %1$s is a user nickname, %2$d is the page number.
-#: actions/subscriptions.php:55
 #, php-format
 msgid "%1$s subscriptions, page %2$d"
 msgstr "%1$s Abonnements, Seite %2$d"
 
 #. TRANS: Page notice for page with an overview of all subscriptions
 #. TRANS: of the logged in user's own profile.
-#: actions/subscriptions.php:68
 msgid "These are the people whose notices you listen to."
 msgstr "Dies sind die Leute, deren Nachrichten du liest."
 
 #. TRANS: Page notice for page with an overview of all subscriptions of a user other
 #. TRANS: than the logged in user. %s is the user nickname.
-#: actions/subscriptions.php:74
 #, php-format
 msgid "These are the people whose notices %s listens to."
 msgstr "Dies sind die Leute, deren Nachrichten %s liest."
@@ -6351,7 +5244,6 @@ msgstr "Dies sind die Leute, deren Nachrichten %s liest."
 #. 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.
-#: actions/subscriptions.php:133
 #, php-format
 msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "
@@ -6370,69 +5262,55 @@ msgstr ""
 #. TRANS: than the logged in user that has no subscriptions. %s is the user nickname.
 #. TRANS: Subscription list text when looking at the subscriptions for a of a user that has none
 #. TRANS: as an anonymous user. %s is the user nickname.
-#: actions/subscriptions.php:141 actions/subscriptions.php:147
 #, php-format
 msgid "%s is not listening to anyone."
 msgstr "%s hat niemanden abonniert."
 
 #. TRANS: Atom feed title. %s is a profile nickname.
-#: actions/subscriptions.php:176
 #, fuzzy, php-format
 msgid "Subscription feed for %s (Atom)"
 msgstr "Feed der Nachrichten von %s (Atom)"
 
 #. TRANS: Checkbox label for enabling Jabber messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:241 lib/settingsnav.php:110
-#, fuzzy
 msgid "IM"
 msgstr "IM"
 
 #. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:256 lib/settingsnav.php:117
 msgid "SMS"
 msgstr "SMS"
 
 #. TRANS: Title for all but the first page of notices with tags.
 #. TRANS: %1$s is the tag, %2$d is the page number.
-#: actions/tag.php:73
 #, php-format
 msgid "Notices tagged with %1$s, page %2$d"
 msgstr "Mit „%1$s“ getaggte Nachrichten, Seite %2$d"
 
-#: actions/tag.php:91
 #, php-format
 msgid "Notice feed for tag %s (RSS 1.0)"
 msgstr "Nachrichten-Feed des Tags „%s“ (RSS 1.0)"
 
-#: actions/tag.php:97
 #, php-format
 msgid "Notice feed for tag %s (RSS 2.0)"
 msgstr "Nachrichten-Feed des Tag „%s“ (RSS 2.0)"
 
-#: actions/tag.php:103
 #, php-format
 msgid "Notice feed for tag %s (Atom)"
 msgstr "Nachrichten-Feed des Tags „%s“ (Atom)"
 
-#: actions/tagother.php:39
 msgid "No ID argument."
 msgstr "Kein ID-Argument."
 
-#: actions/tagother.php:65
 #, php-format
 msgid "Tag %s"
 msgstr "Tag „%s“"
 
 #. TRANS: H2 for user profile information.
-#: actions/tagother.php:77 lib/userprofile.php:76
 msgid "User profile"
 msgstr "Benutzerprofil"
 
-#: actions/tagother.php:120
 msgid "Tag user"
 msgstr "Benutzer taggen"
 
-#: actions/tagother.php:130
 msgid ""
 "Tags for this user (letters, numbers, -, ., and _), comma- or space- "
 "separated"
@@ -6440,50 +5318,40 @@ msgstr ""
 "Tags dieses Benutzers (Buchstaben, Nummer, -, ., und _), durch Komma oder "
 "Leerzeichen getrennt"
 
-#: actions/tagother.php:157
 #, php-format
 msgid "Invalid tag: \"%s\""
 msgstr "Ungültiges Stichwort: „%s“"
 
-#: actions/tagother.php:172
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 "Du kannst nur Benutzer taggen, die du abonniert hast oder die dich abonniert "
 "haben."
 
-#: actions/tagother.php:215
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
 "Benutze dieses Formular, um Tags deinen Abonnenten oder Abonnements "
 "hinzuzufügen."
 
-#: actions/tagrss.php:35
 msgid "No such tag."
 msgstr "Tag nicht vorhanden."
 
 #. TRANS: Client error displayed when trying to unblock a non-blocked user.
-#: actions/unblock.php:59
 msgid "You haven't blocked that user."
 msgstr "Du hast diesen Benutzer nicht blockiert."
 
-#: actions/unsandbox.php:72
 msgid "User is not sandboxed."
 msgstr "Benutzer ist nicht blockiert."
 
-#: actions/unsilence.php:72
 msgid "User is not silenced."
 msgstr "Der Benutzer ist nicht ruhig gestellt."
 
-#: actions/unsubscribe.php:77
 msgid "No profile ID in request."
 msgstr "Keine Profil-ID in der Anfrage."
 
-#: actions/unsubscribe.php:98
 msgid "Unsubscribed"
 msgstr "Abbestellt"
 
-#: actions/updateprofile.php:64
 #, php-format
 msgid ""
 "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
@@ -6491,173 +5359,138 @@ msgstr ""
 "Die Benutzerlizenz „%1$s“ ist nicht kompatibel mit der Lizenz der Seite „%2"
 "$s“."
 
-#: actions/urlsettings.php:60
 #, fuzzy
 msgid "URL settings"
 msgstr "IM-Einstellungen"
 
 #. TRANS: Instructions for tab "Other" in user profile settings.
-#: actions/urlsettings.php:72
 msgid "Manage various other options."
 msgstr "Verwalte zahlreiche andere Einstellungen."
 
 #. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
 #. TRANS: user's profile settings. This message has one space at the beginning. Use your
 #. TRANS: language's word separator here if it has one (most likely a single space).
-#: actions/urlsettings.php:115
 msgid " (free service)"
 msgstr " (freier Dienst)"
 
-#: actions/urlsettings.php:121
 #, fuzzy
 msgid "[none]"
 msgstr "Nichts"
 
-#: actions/urlsettings.php:122
 msgid "[internal]"
 msgstr ""
 
 #. TRANS: Label for dropdown with URL shortener services.
-#: actions/urlsettings.php:130
 msgid "Shorten URLs with"
 msgstr "URLs kürzen mit"
 
 #. TRANS: Tooltip for for dropdown with URL shortener services.
-#: actions/urlsettings.php:132
 msgid "Automatic shortening service to use."
 msgstr "URL-Auto-Kürzungs-Dienst."
 
-#: actions/urlsettings.php:138
 msgid "URL longer than"
 msgstr ""
 
-#: actions/urlsettings.php:141
 msgid "URLs longer than this will be shortened, 0 means always shorten."
 msgstr ""
 
-#: actions/urlsettings.php:145
 msgid "Text longer than"
 msgstr ""
 
-#: actions/urlsettings.php:148
 msgid ""
 "URLs in notices longer than this will be shortened, 0 means always shorten."
 msgstr ""
 
 #. TRANS: Form validation error for form "Other settings" in user profile.
-#: actions/urlsettings.php:180
 msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr "URL-Auto-Kürzungs-Dienst ist zu lang (maximal 50 Zeichen)."
 
-#: actions/urlsettings.php:187
 msgid "Invalid number for max url length."
 msgstr ""
 
-#: actions/urlsettings.php:193
 #, fuzzy
 msgid "Invalid number for max notice length."
 msgstr "Ungültiger Nachrichteninhalt."
 
-#: actions/urlsettings.php:238
 msgid "Error saving user URL shortening preferences."
 msgstr ""
 
 #. TRANS: User admin panel title
-#: actions/useradminpanel.php:58
 msgctxt "TITLE"
 msgid "User"
 msgstr "Benutzer"
 
 #. TRANS: Instruction for user admin panel.
-#: actions/useradminpanel.php:69
 msgid "User settings for this StatusNet site"
 msgstr "Benutzer-Einstellungen dieser StatusNet-Website"
 
 #. TRANS: Form validation error in user admin panel when a non-numeric character limit was set.
-#: actions/useradminpanel.php:147
 msgid "Invalid bio limit. Must be numeric."
 msgstr "Das Zeichenlimit der Biografie muss numerisch sein!"
 
 #. TRANS: Form validation error in user admin panel when welcome text is too long.
-#: actions/useradminpanel.php:154
 msgid "Invalid welcome text. Maximum length is 255 characters."
 msgstr "Willkommens-Nachricht ungültig. Maximale Länge sind 255 Zeichen."
 
 #. TRANS: Client error displayed when trying to set a non-existing user as default subscription for new
 #. TRANS: users in user admin panel. %1$s is the invalid nickname.
-#: actions/useradminpanel.php:166
 #, fuzzy, php-format
 msgid "Invalid default subscripton: \"%1$s\" is not a user."
 msgstr "Ungültiges Standard-Abonnement: „%1$s“ ist kein Benutzer."
 
-#: actions/useradminpanel.php:215 lib/action.php:565 lib/settingsnav.php:77
-#: lib/subgroupnav.php:81
 msgid "Profile"
 msgstr "Profil"
 
 #. TRANS: Field label in user admin panel for setting the character limit for the bio field.
-#: actions/useradminpanel.php:220
 msgid "Bio Limit"
 msgstr "Bio-Limit"
 
 #. TRANS: Tooltip in user admin panel for setting the character limit for the bio field.
-#: actions/useradminpanel.php:222
 msgid "Maximum length of a profile bio in characters."
 msgstr "Maximale Länge in Zeichen der Profil-Bio."
 
 #. TRANS: Form legend in user admin panel.
-#: actions/useradminpanel.php:231
 msgid "New users"
 msgstr "Neue Benutzer"
 
 #. TRANS: Field label in user admin panel for setting new user welcome text.
-#: actions/useradminpanel.php:236
 msgid "New user welcome"
 msgstr "Neue Benutzer empfangen"
 
 #. TRANS: Tooltip in user admin panel for setting new user welcome text.
-#: actions/useradminpanel.php:238
 msgid "Welcome text for new users (maximum 255 characters)."
 msgstr "Willkommens-Nachricht für neue Benutzer (maximal 255 Zeichen)."
 
 #. TRANS: Field label in user admin panel for setting default subscription for new users.
-#: actions/useradminpanel.php:244
 msgid "Default subscription"
 msgstr "Standard-Abonnement"
 
 #. TRANS: Tooltip in user admin panel for setting default subscription for new users.
-#: actions/useradminpanel.php:246
 msgid "Automatically subscribe new users to this user."
 msgstr "Neue Benutzer abonnieren automatisch diesen Benutzer"
 
 #. TRANS: Form legend in user admin panel.
-#: actions/useradminpanel.php:256
 msgid "Invitations"
 msgstr "Einladungen"
 
 #. TRANS: Field label for checkbox in user admin panel for allowing users to invite friend using site e-mail.
-#: actions/useradminpanel.php:262
 msgid "Invitations enabled"
 msgstr "Einladungen aktivieren"
 
 #. TRANS: Tooltip for checkbox in user admin panel for allowing users to invite friend using site e-mail.
-#: actions/useradminpanel.php:265
 msgid "Whether to allow users to invite new users."
 msgstr "Ist es Benutzern erlaubt, neue Benutzer einzuladen."
 
 #. TRANS: Title for button to save user settings in user admin panel.
-#: actions/useradminpanel.php:302
 #, fuzzy
 msgid "Save user settings."
 msgstr "Benutzer-Einstellungen speichern"
 
 #. TRANS: Page title.
-#: actions/userauthorization.php:109
 msgid "Authorize subscription"
 msgstr "Abonnement bestätigen"
 
 #. TRANS: Page notice on "Auhtorize subscription" page.
-#: actions/userauthorization.php:115
 #, fuzzy
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
@@ -6669,42 +5502,35 @@ msgstr ""
 "„Abbrechen“."
 
 #. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:200
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Accept"
 msgstr "Akzeptieren"
 
 #. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:202
 #, fuzzy
 msgid "Subscribe to this user."
 msgstr "Abonniere diesen Benutzer"
 
 #. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:204
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Reject"
 msgstr "Ablehnen"
 
 #. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:206
 #, fuzzy
 msgid "Reject this subscription."
 msgstr "Abonnement ablehnen"
 
 #. TRANS: Client error displayed for an empty authorisation request.
-#: actions/userauthorization.php:219
 msgid "No authorization request!"
 msgstr "Keine Bestätigungsanfrage!"
 
 #. TRANS: Accept message header from Authorise subscription page.
-#: actions/userauthorization.php:242
 msgid "Subscription authorized"
 msgstr "Abonnement autorisiert"
 
-#: actions/userauthorization.php:245
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to authorize the "
@@ -6715,11 +5541,9 @@ msgstr ""
 "Dein Abonnement-Token ist:"
 
 #. TRANS: Reject message header from Authorise subscription page.
-#: actions/userauthorization.php:256
 msgid "Subscription rejected"
 msgstr "Abonnement abgelehnt"
 
-#: actions/userauthorization.php:259
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to fully reject the "
@@ -6731,35 +5555,30 @@ msgstr ""
 
 #. TRANS: Exception thrown when no valid user is found for an authorisation request.
 #. TRANS: %s is a listener URI.
-#: actions/userauthorization.php:296
 #, fuzzy, php-format
 msgid "Listener URI \"%s\" not found here."
 msgstr "Eine Listener-URI „%s“ wurde hier nicht gefunden."
 
 #. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
 #. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:303
 #, fuzzy, php-format
 msgid "Listenee URI \"%s\" is too long."
 msgstr "Die URI „%s“ für den Stream ist zu lang."
 
 #. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
 #. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:311
 #, fuzzy, php-format
 msgid "Listenee URI \"%s\" is a local user."
 msgstr "Die URI „%s“ für den Stream ist ein lokaler Benutzer."
 
 #. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
 #. TRANS: %s is a profile URL.
-#: actions/userauthorization.php:329
 #, fuzzy, php-format
 msgid "Profile URL \"%s\" is for a local user."
 msgstr "Profiladresse „%s“ ist für einen lokalen Benutzer."
 
 #. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
 #. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
-#: actions/userauthorization.php:339
 #, fuzzy, php-format
 msgid ""
 "Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
@@ -6770,32 +5589,27 @@ msgstr ""
 
 #. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
 #. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:349
 #, fuzzy, php-format
 msgid "Avatar URL \"%s\" is not valid."
 msgstr "Avataradresse „%s“ ist nicht gültig."
 
 #. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
 #. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:356
 #, fuzzy, php-format
 msgid "Cannot read avatar URL \"%s\"."
 msgstr "Konnte Avatar-URL nicht öffnen „%s“"
 
 #. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
 #. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:363
 #, fuzzy, php-format
 msgid "Wrong image type for avatar URL \"%s\"."
 msgstr "Falscher Bildtyp für „%s“"
 
 #. TRANS: Page title for profile design page.
-#: actions/userdesignsettings.php:74 lib/designsettings.php:61
 msgid "Profile design"
 msgstr "Profil-Design-Einstellungen"
 
 #. TRANS: Instructions for profile design page.
-#: actions/userdesignsettings.php:84 lib/designsettings.php:72
 msgid ""
 "Customize the way your profile looks with a background image and a colour "
 "palette of your choice."
@@ -6803,44 +5617,35 @@ msgstr ""
 "Stelle ein wie deine Profilseite aussehen soll. Hintergrundbild und "
 "Farbpalette sind frei wählbar."
 
-#: actions/userdesignsettings.php:289
 msgid "Enjoy your hotdog!"
 msgstr "Hab Spaß!"
 
-#: actions/userdesignsettings.php:325
 #, fuzzy
 msgid "Design settings"
 msgstr "Website-Einstellungen speichern"
 
-#: actions/userdesignsettings.php:340
 msgid "View profile designs"
 msgstr "Profil-Designs ansehen"
 
-#: actions/userdesignsettings.php:341
 msgid "Show or hide profile designs."
 msgstr "Profil-Designs anzeigen oder verstecken."
 
-#: actions/userdesignsettings.php:348
 #, fuzzy
 msgid "Background file"
 msgstr "Hintergrund"
 
 #. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number.
-#: actions/usergroups.php:66
 #, php-format
 msgid "%1$s groups, page %2$d"
 msgstr "%1$s Gruppen, Seite %2$d"
 
-#: actions/usergroups.php:132
 msgid "Search for more groups"
 msgstr "Suche nach weiteren Gruppen"
 
-#: actions/usergroups.php:159
 #, php-format
 msgid "%s is not a member of any group."
 msgstr "%s ist in keiner Gruppe Mitglied."
 
-#: actions/usergroups.php:164
 #, php-format
 msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
 msgstr ""
@@ -6851,18 +5656,14 @@ msgstr ""
 #. TRANS: %1$s is a group name, %2$s is a site name.
 #. TRANS: Message is used as a subtitle in atom user notice feed.
 #. TRANS: %1$s is a user name, %2$s is a site name.
-#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:70
-#: lib/atomusernoticefeed.php:95
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr "Aktualisierungen von %1$s auf %2$s!"
 
-#: actions/version.php:75
 #, php-format
 msgid "StatusNet %s"
 msgstr "StatusNet %s"
 
-#: actions/version.php:155
 #, php-format
 msgid ""
 "This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
@@ -6871,16 +5672,13 @@ msgstr ""
 "Diese Seite wird mit %1$s Version %2$s betrieben. Copyright 2008–2010 "
 "StatusNet, Inc. und Mitarbeiter"
 
-#: actions/version.php:163
 msgid "Contributors"
 msgstr "Mitarbeiter"
 
 #. TRANS: Menu item for site administration
-#: actions/version.php:167 lib/adminpanelaction.php:403
 msgid "License"
 msgstr "Lizenz"
 
-#: actions/version.php:170
 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 "
@@ -6892,7 +5690,6 @@ msgstr ""
 "wie veröffentlicht durch die Free Software Foundation, entweder Version 3 "
 "der Lizenz, oder jede höhere Version."
 
-#: actions/version.php:176
 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 "
@@ -6904,7 +5701,6 @@ msgstr ""
 "MARKTREIFE oder der EIGNUNG FÜR EINEN BESTIMMTEN ZWECK. Lesen Sie die GNU "
 "Affero General Public License für weitere Details. "
 
-#: actions/version.php:182
 #, php-format
 msgid ""
 "You should have received a copy of the GNU Affero General Public License "
@@ -6914,52 +5710,42 @@ msgstr ""
 "Programm erhalten. Wenn nicht, siehe %s."
 
 #. TRANS: Form input field label for application name.
-#: actions/version.php:197 lib/applicationeditform.php:190
 msgid "Name"
 msgstr "Name"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:885
 msgid "Version"
 msgstr "Version"
 
-#: actions/version.php:199
 msgid "Author(s)"
 msgstr "Autor(en)"
 
 #. TRANS: Form input field label.
-#: actions/version.php:200 lib/applicationeditform.php:208
-#: lib/groupeditform.php:168
 msgid "Description"
 msgstr "Beschreibung"
 
 #. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:164
 msgid "Favor"
 msgstr "Zu Favoriten hinzufügen"
 
 #. TRANS: Ntofication given when a user marks a notice as favorite.
 #. TRANS: %1$s is a user nickname or full name, %2$s is a notice URI.
-#: classes/Fave.php:167
 #, php-format
 msgid "%1$s marked notice %2$s as a favorite."
 msgstr "%1$s markierte Nachricht %2$s als Favorit."
 
 #. TRANS: Server exception thrown when a URL cannot be processed.
-#: classes/File.php:162
 #, php-format
 msgid "Cannot process URL '%s'"
 msgstr "Die URL „%s“ konnte nicht verarbeitet werden"
 
 #. TRANS: Server exception thrown when... Robin thinks something is impossible!
-#: classes/File.php:194
 msgid "Robin thinks something is impossible."
 msgstr "Robin denkt, dass etwas unmöglich ist."
 
 #. 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$s is used for plural.
-#: classes/File.php:210
 #, php-format
 msgid ""
 "No file may be larger than %1$d byte and the file you sent was %2$d bytes. "
@@ -6976,7 +5762,6 @@ msgstr[1] ""
 
 #. TRANS: Message given if an upload would exceed user quota.
 #. TRANS: %d (number) is the user quota in bytes and is used for plural.
-#: classes/File.php:223
 #, php-format
 msgid "A file this large would exceed your user quota of %d byte."
 msgid_plural "A file this large would exceed your user quota of %d bytes."
@@ -6987,7 +5772,6 @@ msgstr[1] ""
 
 #. TRANS: Message given id an upload would exceed a user's monthly quota.
 #. TRANS: $d (number) is the monthly user quota in bytes and is used for plural.
-#: classes/File.php:235
 #, php-format
 msgid "A file this large would exceed your monthly quota of %d byte."
 msgid_plural "A file this large would exceed your monthly quota of %d bytes."
@@ -6999,108 +5783,89 @@ msgstr[1] ""
 "überschreiten."
 
 #. TRANS: Client exception thrown if a file upload does not have a valid name.
-#: classes/File.php:282 classes/File.php:297
 msgid "Invalid filename."
 msgstr "Ungültiger Dateiname."
 
 #. TRANS: Exception thrown when joining a group fails.
-#: classes/Group_member.php:51
 msgid "Group join failed."
 msgstr "Konnte Gruppe nicht beitreten"
 
 #. TRANS: Exception thrown when trying to leave a group the user is not a member of.
-#: classes/Group_member.php:64
 msgid "Not part of group."
 msgstr "Nicht Mitglied der Gruppe"
 
 #. TRANS: Exception thrown when trying to leave a group fails.
-#: classes/Group_member.php:72
 msgid "Group leave failed."
 msgstr "Konnte Gruppe nicht verlassen"
 
 #. TRANS: Exception thrown providing an invalid profile ID.
 #. TRANS: %s is the invalid profile ID.
-#: classes/Group_member.php:85
 #, php-format
 msgid "Profile ID %s is invalid."
 msgstr "Profil-ID %s ist ungültig."
 
 #. TRANS: Exception thrown providing an invalid group ID.
 #. TRANS: %s is the invalid group ID.
-#: classes/Group_member.php:98
 #, php-format
 msgid "Group ID %s is invalid."
 msgstr "Gruppen-ID %s ist ungültig."
 
 #. TRANS: Activity title.
-#: classes/Group_member.php:147 lib/joinform.php:114
 msgid "Join"
 msgstr "Beitreten"
 
 #. TRANS: Success message for subscribe to group attempt through OStatus.
 #. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
-#: classes/Group_member.php:151
 #, php-format
 msgid "%1$s has joined group %2$s."
 msgstr "%1$s ist der Gruppe „%2$s“ beigetreten."
 
 #. TRANS: Server exception thrown when updating a local group fails.
-#: classes/Local_group.php:42
 msgid "Could not update local group."
 msgstr "Konnte Gruppe nicht aktualisieren."
 
 #. TRANS: Exception thrown when trying creating a login token failed.
 #. TRANS: %s is the user nickname for which token creation failed.
-#: classes/Login_token.php:78
 #, php-format
 msgid "Could not create login token for %s"
 msgstr "Konnte keinen Login-Token für %s erstellen"
 
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
-#: classes/Memcached_DataObject.php:556
 msgid "No database name or DSN found anywhere."
 msgstr "Nirgendwo einen Datenbanknamen oder DSN gefunden."
 
 #. TRANS: Client exception thrown when a user tries to send a direct message while being banned from sending them.
-#: classes/Message.php:45
 msgid "You are banned from sending direct messages."
 msgstr "Direktes Senden von Nachrichten wurde blockiert"
 
 #. TRANS: Message given when a message could not be stored on the server.
-#: classes/Message.php:69
 msgid "Could not insert message."
 msgstr "Konnte Nachricht nicht einfügen."
 
 #. TRANS: Message given when a message could not be updated on the server.
-#: classes/Message.php:80
 msgid "Could not update message with new URI."
 msgstr "Konnte Nachricht nicht mit neuer URI versehen."
 
 #. TRANS: Server exception thrown when a user profile for a notice cannot be found.
 #. TRANS: %1$d is a profile ID (number), %2$d is a notice ID (number).
-#: classes/Notice.php:98
 #, php-format
 msgid "No such profile (%1$d) for notice (%2$d)."
 msgstr "Kein Profil (%1$d) für eine Notiz gefunden (%2$d)."
 
 #. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:199
 #, php-format
 msgid "Database error inserting hashtag: %s"
 msgstr "Datenbankfehler beim Einfügen des Hashtags: %s"
 
 #. TRANS: Client exception thrown if a notice contains too many characters.
-#: classes/Notice.php:279
 msgid "Problem saving notice. Too long."
 msgstr "Problem bei Speichern der Nachricht. Sie ist zu lang."
 
 #. TRANS: Client exception thrown when trying to save a notice for an unknown user.
-#: classes/Notice.php:284
 msgid "Problem saving notice. Unknown user."
 msgstr "Problem bei Speichern der Nachricht. Unbekannter Benutzer."
 
 #. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
-#: classes/Notice.php:290
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
@@ -7108,7 +5873,6 @@ msgstr ""
 "ein paar Minuten ab."
 
 #. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
-#: classes/Notice.php:297
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
 "few minutes."
@@ -7117,45 +5881,38 @@ msgstr ""
 "ein paar Minuten ab."
 
 #. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:305
 msgid "You are banned from posting notices on this site."
 msgstr ""
 "Du wurdest für das Schreiben von Nachrichten auf dieser Seite gesperrt."
 
 #. TRANS: Server exception thrown when a notice cannot be saved.
 #. TRANS: Server exception thrown when a notice cannot be updated.
-#: classes/Notice.php:372 classes/Notice.php:399
 msgid "Problem saving notice."
 msgstr "Problem bei Speichern der Nachricht."
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:929
 msgid "Bad type provided to saveKnownGroups."
 msgstr ""
 "Der Methode „saveKnownGroups“ wurde ein schlechter Typ zur Verfügung "
 "gestellt."
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:1028
 msgid "Problem saving group inbox."
 msgstr "Problem bei Speichern der Nachricht."
 
 #. TRANS: Server exception thrown when a reply cannot be saved.
 #. TRANS: %1$d is a notice ID, %2$d is the ID of the mentioned user.
-#: classes/Notice.php:1144
 #, php-format
 msgid "Could not save reply for %1$d, %2$d."
 msgstr "Konnte Antwort auf %1$d, %2$d nicht speichern."
 
 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1663
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
 
 #. TRANS: Full name of a profile or group followed by nickname in parens
-#: classes/Profile.php:172 classes/User_group.php:242
 #, php-format
 msgctxt "FANCYNAME"
 msgid "%1$s (%2$s)"
@@ -7163,7 +5920,6 @@ msgstr "%1$s (%2$s)"
 
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:779
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
@@ -7172,7 +5928,6 @@ msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:788
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -7180,251 +5935,198 @@ msgstr ""
 "Datenbankfehler."
 
 #. TRANS: Exception thrown when a right for a non-existing user profile is checked.
-#: classes/Remote_profile.php:54
 msgid "Missing profile."
 msgstr "Benutzer hat kein Profil."
 
 #. TRANS: Exception thrown when a tag cannot be saved.
-#: classes/Status_network.php:338
 msgid "Unable to save tag."
 msgstr "Konnte Tag nicht speichern."
 
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#: classes/Subscription.php:77 lib/oauthstore.php:482
 msgid "You have been banned from subscribing."
 msgstr "Dieser Benutzer erlaubt dir nicht ihn zu abonnieren."
 
 #. TRANS: Exception thrown when trying to subscribe while already subscribed.
-#: classes/Subscription.php:82
 msgid "Already subscribed!"
 msgstr "Bereits abonniert!"
 
 #. TRANS: Exception thrown when trying to subscribe to a user who has blocked the subscribing user.
-#: classes/Subscription.php:87
 msgid "User has blocked you."
 msgstr "Dieser Benutzer hat dich blockiert."
 
 #. TRANS: Exception thrown when trying to unsibscribe without a subscription.
-#: classes/Subscription.php:176
 msgid "Not subscribed!"
 msgstr "Nicht abonniert!"
 
 #. TRANS: Exception thrown when trying to unsubscribe a user from themselves.
-#: classes/Subscription.php:183
 msgid "Could not delete self-subscription."
 msgstr "Konnte Selbst-Abonnement nicht löschen."
 
 #. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
-#: classes/Subscription.php:211
 msgid "Could not delete subscription OMB token."
 msgstr "Konnte OMB-Abonnement-Token nicht löschen."
 
 #. TRANS: Exception thrown when a subscription could not be deleted on the server.
-#: classes/Subscription.php:223
 msgid "Could not delete subscription."
 msgstr "Konnte Abonnement nicht löschen."
 
 #. TRANS: Activity tile when subscribing to another person.
-#: classes/Subscription.php:265
 msgid "Follow"
 msgstr "Folgen"
 
 #. TRANS: Notification given when one person starts following another.
 #. TRANS: %1$s is the subscriber, %2$s is the subscribed.
-#: classes/Subscription.php:268
 #, php-format
 msgid "%1$s is now following %2$s."
 msgstr "%1$s folgt nun %2$s."
 
 #. TRANS: Notice given on user registration.
 #. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:390
 #, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr "Herzlich willkommen bei %1$s, @%2$s!"
 
 #. TRANS: Server exception.
-#: classes/User.php:923
 msgid "No single user defined for single-user mode."
 msgstr "Kein einzelner Benutzer für den Ein-Benutzer-Modus ausgewählt."
 
 #. TRANS: Server exception.
-#: classes/User.php:927
 msgid "Single-user mode code called when not enabled."
 msgstr ""
 
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:522
 msgid "Could not create group."
 msgstr "Konnte Gruppe nicht erstellen."
 
 #. TRANS: Server exception thrown when updating a group URI failed.
-#: classes/User_group.php:532
 msgid "Could not set group URI."
 msgstr "Konnte die Gruppen-URI nicht setzen."
 
 #. TRANS: Server exception thrown when setting group membership failed.
-#: classes/User_group.php:555
 msgid "Could not set group membership."
 msgstr "Konnte Gruppenmitgliedschaft nicht setzen."
 
 #. TRANS: Server exception thrown when saving local group information failed.
-#: classes/User_group.php:570
 msgid "Could not save local group info."
 msgstr "Konnte die lokale Gruppen Information nicht speichern."
 
 #. TRANS: Exception thrown when an account could not be located when it should be moved.
 #. TRANS: %s is the remote site.
-#: lib/accountmover.php:65
 #, fuzzy, php-format
 msgid "Cannot locate account %s."
 msgstr "Du kannst keine Benutzer löschen."
 
 #. TRANS: Exception thrown when a service document could not be located account move.
 #. TRANS: %s is the remote site.
-#: lib/accountmover.php:106
 #, php-format
 msgid "Cannot find XRD for %s."
 msgstr ""
 
 #. TRANS: Exception thrown when an account could not be located when it should be moved.
 #. TRANS: %s is the remote site.
-#: lib/accountmover.php:131
 #, php-format
 msgid "No AtomPub API service for %s."
 msgstr ""
 
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: lib/action.php:161
 #, php-format
 msgid "%1$s - %2$s"
 msgstr "%1$s – %2$s"
 
 #. TRANS: Page title for a page without a title set.
-#: lib/action.php:177
 msgid "Untitled page"
 msgstr "Seite ohne Titel"
 
 #. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.
-#: lib/action.php:325
 msgctxt "TOOLTIP"
 msgid "Show more"
 msgstr "Mehr anzeigen"
 
 #. TRANS: Inline reply form submit button: submits a reply comment.
-#: lib/action.php:328
 #, fuzzy
 msgctxt "BUTTON"
-msgid "Comment"
-msgstr "Inhalt"
+msgid "Reply"
+msgstr "Antworten"
 
 #. TRANS: Placeholder text for inline reply form. Clicking in this box will turn it into a mini notice form.
-#: lib/action.php:331
-msgid "Add a comment..."
+msgid "Write a reply..."
 msgstr ""
 
-#: lib/action.php:559 lib/personalgroupnav.php:99
-#, fuzzy
 msgid "Home"
 msgstr "Homepage"
 
-#: lib/action.php:560
 #, fuzzy
 msgid "Friends timeline"
 msgstr "%s-Zeitleiste"
 
-#: lib/action.php:566
 #, fuzzy
 msgid "Your profile"
 msgstr "Gruppenprofil"
 
-#: lib/action.php:570 lib/action.php:593 lib/publicgroupnav.php:78
 msgid "Public"
 msgstr "Zeitleiste"
 
-#: lib/action.php:571 lib/action.php:594
 #, fuzzy
 msgid "Everyone on this site"
 msgstr "Finde Leute auf dieser Seite"
 
-#: lib/action.php:575
-#, fuzzy
 msgid "Settings"
 msgstr "SMS-Einstellungen"
 
-#: lib/action.php:576
 #, fuzzy
 msgid "Change your personal settings"
 msgstr "Ändern der Profileinstellungen"
 
-#: lib/action.php:582
 #, fuzzy
 msgid "Site configuration"
 msgstr "Benutzereinstellung"
 
-#: lib/action.php:587
-#, fuzzy
 msgid "Logout"
 msgstr "Abmelden"
 
-#: lib/action.php:588
-#, fuzzy
 msgid "Logout from the site"
 msgstr "Von der Seite abmelden"
 
-#: lib/action.php:599
-#, fuzzy
 msgid "Login to the site"
 msgstr "Auf der Seite anmelden"
 
-#: lib/action.php:606
-#, fuzzy
 msgid "Search"
 msgstr "Suchen"
 
-#: lib/action.php:607
 #, fuzzy
 msgid "Search the site"
 msgstr "Website durchsuchen"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:864
 msgid "Help"
 msgstr "Hilfe"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:867
 msgid "About"
 msgstr "Über"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:870
 msgid "FAQ"
 msgstr "FAQ"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:875
 msgid "TOS"
 msgstr "AGB"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:879
 msgid "Privacy"
 msgstr "Privatsphäre"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:882
 msgid "Source"
 msgstr "Quellcode"
 
 #. TRANS: Secondary navigation menu option leading to e-mail contact information on the
 #. TRANS: StatusNet site, where to report bugs, ...
-#: lib/action.php:889
 msgid "Contact"
 msgstr "Kontakt"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:892
 msgid "Badge"
 msgstr "Plakette"
 
@@ -7432,7 +6134,6 @@ msgstr "Plakette"
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:921
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7442,7 +6143,6 @@ msgstr ""
 "site.broughtbyurl%%)."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:924
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** ist ein Mikrobloggingdienst."
@@ -7451,7 +6151,6 @@ msgstr "**%%site.name%%** ist ein Mikrobloggingdienst."
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:931
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7464,14 +6163,12 @@ msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:949
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr "Inhalte und Daten von %1$s sind privat und vertraulich."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:956
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
@@ -7479,7 +6176,6 @@ msgstr ""
 "vorbehalten."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:960
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 "Urheberrecht von Inhalt und Daten liegt bei den Beteiligten. Alle Rechte "
@@ -7487,87 +6183,72 @@ msgstr ""
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:992
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr "Alle Inhalte und Daten von %1$s sind unter der %2$s Lizenz verfügbar."
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1335
 msgid "After"
 msgstr "Später"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1345
 msgid "Before"
 msgstr "Vorher"
 
 #. TRANS: Client exception thrown when a feed instance is a DOMDocument.
-#: lib/activity.php:125
 msgid "Expecting a root feed element but got a whole XML document."
 msgstr "Root-Element eines Feeds erwartet, aber ganzes XML-Dokument erhalten."
 
 #. TRANS: Client exception thrown when using an unknown verb for the activity importer.
-#: lib/activityimporter.php:81
 #, fuzzy, php-format
 msgid "Unknown verb: \"%s\"."
 msgstr "Unbekannte Sprache „%s“"
 
 #. TRANS: Client exception thrown when trying to force a subscription for an untrusted user.
-#: lib/activityimporter.php:107
 msgid "Cannot force subscription for untrusted user."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to for a remote user to subscribe.
-#: lib/activityimporter.php:117
 #, fuzzy
 msgid "Cannot force remote user to subscribe."
 msgstr "Gib den Namen des Benutzers an, den du abonnieren möchtest."
 
 #. TRANS: Client exception thrown when trying to subscribe to an unknown profile.
-#: lib/activityimporter.php:132
 #, fuzzy
 msgid "Unknown profile."
 msgstr "Profil %s ist unbekannt"
 
 #. TRANS: Client exception thrown when trying to import an event not related to the importing user.
-#: lib/activityimporter.php:138
 msgid "This activity seems unrelated to our user."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to join a remote group that is not a group.
-#: lib/activityimporter.php:154
 msgid "Remote profile is not a group!"
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to join a group the importing user is already a member of.
-#: lib/activityimporter.php:163
 #, fuzzy
 msgid "User is already a member of this group."
 msgstr "Du bist bereits Mitglied dieser Gruppe"
 
 #. TRANS: Client exception thrown when trying to import a notice by another user.
 #. TRANS: %1$s is the source URI of the notice, %2$s is the URI of the author.
-#: lib/activityimporter.php:201
 #, php-format
 msgid "Already know about notice %1$s and  it has a different author %2$s."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to overwrite the author information for a non-trusted user during import.
-#: lib/activityimporter.php:207
 msgid "Not overwriting author info for non-trusted user."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to import a notice without content.
 #. TRANS: %s is the notice URI.
-#: lib/activityimporter.php:223
 #, fuzzy, php-format
 msgid "No content for notice %s."
 msgstr "Kein Inhalt für Nachricht %d."
 
-#: lib/activitymover.php:84
 #, fuzzy, php-format
 msgid "No such user %s."
 msgstr "Unbekannter Benutzer."
@@ -7578,211 +6259,171 @@ msgstr "Unbekannter Benutzer."
 #. TRANS: %1$s is a URL, %2$s is the status, %s$s is the fail reason.
 #. TRANS: Exception thrown when post to collection fails with a status that is not handled.
 #. TRANS: %1$s is a URL, %2$s is the status, %s$s is the fail reason.
-#: lib/activitysink.php:163 lib/activitysink.php:167 lib/activitysink.php:172
 #, fuzzy, php-format
 msgctxt "URLSTATUSREASON"
 msgid "%1$s %2$s %3$s"
 msgstr "%1$s – %2$s"
 
 #. TRANS: Client exception thrown when there is no source attribute.
-#: lib/activityutils.php:200
 msgid "Can't handle remote content yet."
 msgstr "Fremdinhalt kann noch nicht eingebunden werden."
 
 #. TRANS: Client exception thrown when there embedded XML content is found that cannot be processed yet.
-#: lib/activityutils.php:237
 msgid "Can't handle embedded XML content yet."
 msgstr "Kann eingebundenen XML-Inhalt nicht verarbeiten."
 
 #. TRANS: Client exception thrown when base64 encoded content is found that cannot be processed yet.
-#: lib/activityutils.php:242
 msgid "Can't handle embedded Base64 content yet."
 msgstr "Eingebundener Base64-Inhalt kann noch nicht verarbeitet werden."
 
 #. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights.
-#: lib/adminpanelaction.php:96
 msgid "You cannot make changes to this site."
 msgstr "Du kannst keine Änderungen an dieser Seite vornehmen."
 
 #. TRANS: Client error message throw when a certain panel's settings cannot be changed.
-#: lib/adminpanelaction.php:108
 msgid "Changes to that panel are not allowed."
 msgstr "Änderungen an dieser Seite sind nicht erlaubt."
 
 #. TRANS: Client error message.
-#: lib/adminpanelaction.php:222
 msgid "showForm() not implemented."
 msgstr "showForm() noch nicht implementiert."
 
 #. TRANS: Client error message
-#: lib/adminpanelaction.php:250
 msgid "saveSettings() not implemented."
 msgstr "saveSettings() noch nicht implementiert."
 
 #. TRANS: Client error message thrown if design settings could not be deleted in
 #. TRANS: the admin panel Design.
-#: lib/adminpanelaction.php:274
 msgid "Unable to delete design setting."
 msgstr "Konnte die Design-Einstellungen nicht löschen."
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:337
 msgid "Basic site configuration"
 msgstr "Basis-Seiteneinstellungen"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:339
 msgctxt "MENU"
 msgid "Site"
 msgstr "Seite"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:345
 msgid "Design configuration"
 msgstr "Design-Konfiguration"
 
 #. TRANS: Menu item for site administration
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/adminpanelaction.php:347 lib/groupnav.php:135
 msgctxt "MENU"
 msgid "Design"
 msgstr "Design"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:353
 msgid "User configuration"
 msgstr "Benutzereinstellung"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:110
 msgid "User"
 msgstr "Benutzer"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:361
 msgid "Access configuration"
 msgstr "Zugangskonfiguration"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:369
 msgid "Paths configuration"
 msgstr "Pfadkonfiguration"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:377
 msgid "Sessions configuration"
 msgstr "Sitzungseinstellungen"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:385
 msgid "Edit site notice"
 msgstr "Seitennachricht bearbeiten"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:387
 msgid "Site notice"
 msgstr "Seitennachricht"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:393
 msgid "Snapshots configuration"
 msgstr "Snapshot-Konfiguration"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:401
 msgid "Set site license"
 msgstr "Website-Lizenz einstellen"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:409
 #, fuzzy
 msgid "Plugins configuration"
 msgstr "Pfadkonfiguration"
 
 #. TRANS: Client error 401.
-#: lib/apiauth.php:111
 msgid "API resource requires read-write access, but you only have read access."
 msgstr "API-Ressource erfordert lesen/schreib Zugriff; du hast nur Leserechte."
 
 #. TRANS: OAuth exception thrown when no application is found for a given consumer key.
-#: lib/apiauth.php:177
 msgid "No application for that consumer key."
 msgstr "Kein Programm mit diesem Anwender-Schlüssel."
 
-#: lib/apiauth.php:202 lib/apiauth.php:284
 msgid "Not allowed to use API."
 msgstr ""
 
 #. TRANS: OAuth exception given when an incorrect access token was given for a user.
-#: lib/apiauth.php:225
 msgid "Bad access token."
 msgstr "Schlechter Zugangstoken."
 
 #. TRANS: OAuth exception given when no user was found for a given token (no token was found).
-#: lib/apiauth.php:230
 msgid "No user for that token."
 msgstr "Kein Benutzer mit diesem Token."
 
 #. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel".
 #. TRANS: Client error thrown when authentication fails.
-#: lib/apiauth.php:272 lib/apiauth.php:302
 msgid "Could not authenticate you."
 msgstr "Konnte dich nicht authentifizieren."
 
 #. TRANS: Server error displayed when trying to create an anynymous OAuth consumer.
-#: lib/apioauthstore.php:45
 msgid "Could not create anonymous consumer."
 msgstr "Anonymer Zugang konnte nicht erstellt werden"
 
 #. TRANS: Server error displayed when trying to create an anynymous OAuth application.
-#: lib/apioauthstore.php:69
 msgid "Could not create anonymous OAuth application."
 msgstr "Anonyme OAuth-Anwendung konnte nicht erstellt werden."
 
 #. TRANS: Exception thrown when no token association could be found.
-#: lib/apioauthstore.php:151
 msgid ""
 "Could not find a profile and application associated with the request token."
 msgstr ""
 
 #. TRANS: Exception thrown when no access token can be issued.
-#: lib/apioauthstore.php:209
 #, fuzzy
 msgid "Could not issue access token."
 msgstr "Konnte Nachricht nicht einfügen."
 
-#: lib/apioauthstore.php:317
 msgid "Database error inserting OAuth application user."
 msgstr "Datenbankfehler beim Einfügen des OAuth-Programm-Benutzers."
 
-#: lib/apioauthstore.php:345
 #, fuzzy
 msgid "Database error updating OAuth application user."
 msgstr "Datenbankfehler beim Einfügen des OAuth-Programm-Benutzers."
 
 #. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
-#: lib/apioauthstore.php:371
 msgid "Tried to revoke unknown token."
 msgstr "Versuchte, unbekanntes Token ungültig zu machen."
 
 #. TRANS: Exception thrown when an attempt is made to remove a revoked token.
-#: lib/apioauthstore.php:376
 msgid "Failed to delete revoked token."
 msgstr "Konnte ungültig gemachtes Token nicht löschen."
 
 #. TRANS: Form input field label for application icon.
-#: lib/applicationeditform.php:177
 msgid "Icon"
 msgstr "Symbol"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:182
 msgid "Icon for this application"
 msgstr "Programmsymbol"
 
 #. TRANS: Form input field instructions.
 #. TRANS: %d is the number of available characters for the description.
-#: lib/applicationeditform.php:201
 #, php-format
 msgid "Describe your application in %d character"
 msgid_plural "Describe your application in %d characters"
@@ -7790,209 +6431,170 @@ msgstr[0] "Beschreibe dein Programm in einem Zeichen."
 msgstr[1] "Beschreibe dein Programm in %d Zeichen."
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:205
 msgid "Describe your application"
 msgstr "Beschreibe dein Programm"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:216
 msgid "URL of the homepage of this application"
 msgstr "Adresse der Homepage dieses Programms"
 
 #. TRANS: Form input field label.
-#: lib/applicationeditform.php:218
 msgid "Source URL"
 msgstr "Quelladresse"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:225
 msgid "Organization responsible for this application"
 msgstr "Für diese Anwendung verantwortliche Organisation"
 
 #. TRANS: Form input field label.
-#: lib/applicationeditform.php:227
 msgid "Organization"
 msgstr "Organisation"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:234
 msgid "URL for the homepage of the organization"
 msgstr "Homepage der Gruppe oder des Themas"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:243
 msgid "URL to redirect to after authentication"
 msgstr "aufzurufende Adresse nach der Authentifizierung"
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:271
 msgid "Browser"
 msgstr "Browser"
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:288
 msgid "Desktop"
 msgstr "Arbeitsfläche"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:290
 msgid "Type of application, browser or desktop"
 msgstr "Typ der Anwendung, Browser oder Arbeitsfläche"
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:314
 msgid "Read-only"
 msgstr "Schreibgeschützt"
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:334
 msgid "Read-write"
 msgstr "Lese/Schreibzugriff"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:336
 msgid "Default access for this application: read-only, or read-write"
 msgstr ""
 "Standardeinstellung dieses Programms: Schreibgeschützt oder Lese/"
 "Schreibzugriff"
 
 #. TRANS: Submit button title.
-#: lib/applicationeditform.php:353
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: lib/applicationlist.php:247
 msgid " by "
 msgstr " von "
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:260
 msgid "read-write"
 msgstr "Lese/Schreibzugriff"
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:262
 msgid "read-only"
 msgstr "Schreibgeschützt"
 
 #. TRANS: Used in application list. %1$s is a modified date, %2$s is access type ("read-write" or "read-only")
-#: lib/applicationlist.php:268
 #, php-format
 msgid "Approved %1$s - \"%2$s\" access."
 msgstr "Genehmigte %1$s - „%2$s“ Zugriff."
 
 #. TRANS: Access token in the application list.
 #. TRANS: %s are the first 7 characters of the access token.
-#: lib/applicationlist.php:282
 #, php-format
 msgid "Access token starting with: %s"
 msgstr "Zugriffstoken beginnend mit „%s“"
 
 #. TRANS: Button label
-#: lib/applicationlist.php:298
 msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "Widerrufen"
 
-#: lib/atom10feed.php:113
 #, fuzzy
 msgid "Author element must contain a name element."
 msgstr "Das „author“-Element muss ein „name“-Element erhaten."
 
 #. TRANS: Server exception thrown when using the method setActivitySubject() in the class Atom10Feed.
-#: lib/atom10feed.php:160
 #, fuzzy
 msgid "Do not use this method!"
 msgstr "Diese Gruppe nicht löschen"
 
 #. TRANS: Title.
-#: lib/attachmentnoticesection.php:67
 msgid "Notices where this attachment appears"
 msgstr "Nachrichten, in denen dieser Anhang erscheint"
 
 #. TRANS: Title.
-#: lib/attachmenttagcloudsection.php:48
 msgid "Tags for this attachment"
 msgstr "Tags dieses Anhangs"
 
 #. TRANS: Exception thrown when a password change fails.
-#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:227
 msgid "Password changing failed."
 msgstr "Passwort konnte nicht geändert werden."
 
 #. TRANS: Exception thrown when a password change attempt fails because it is not allowed.
-#: lib/authenticationplugin.php:238
 msgid "Password changing is not allowed."
 msgstr "Passwort kann nicht geändert werden."
 
 #. TRANS: Title for the form to block a user.
-#: lib/blockform.php:68
 msgid "Block"
 msgstr "Blockieren"
 
 #. TRANS: Description of the form to block a user.
-#: lib/blockform.php:79
 msgid "Block this user"
 msgstr "Diesen Benutzer blockieren"
 
 #. TRANS: Title for command results.
-#: lib/channel.php:104 lib/channel.php:125
 msgid "Command results"
 msgstr "Befehl-Ergebnisse"
 
 #. TRANS: Title for command results.
-#: lib/channel.php:138
 msgid "AJAX error"
 msgstr "Ajax-Fehler"
 
 #. TRANS: E-mail subject when a command has completed.
-#: lib/channel.php:177 lib/mailhandler.php:143
 msgid "Command complete"
 msgstr "Befehl ausgeführt"
 
 #. TRANS: E-mail subject when a command has failed.
-#: lib/channel.php:188
 msgid "Command failed"
 msgstr "Befehl fehlgeschlagen"
 
 #. TRANS: Command exception text shown when a notice ID is requested that does not exist.
-#: lib/command.php:82 lib/command.php:106
 msgid "Notice with that id does not exist."
 msgstr "Nachricht mit dieser ID existiert nicht."
 
 #. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
 #. TRANS: Error text shown when a last user notice is requested and it does not exist.
-#: lib/command.php:99 lib/command.php:642
 msgid "User has no last notice."
 msgstr "Benutzer hat keine letzte Nachricht."
 
 #. TRANS: Message given requesting a profile for a non-existing user.
 #. TRANS: %s is the nickname of the user for which the profile could not be found.
-#: lib/command.php:128
 #, php-format
 msgid "Could not find a user with nickname %s."
 msgstr "Konnte keinen Benutzer mit dem Namen „%s“ finden."
 
 #. TRANS: Message given getting a non-existing user.
 #. TRANS: %s is the nickname of the user that could not be found.
-#: lib/command.php:148
 #, php-format
 msgid "Could not find a local user with nickname %s."
 msgstr "Konnte keinen lokalen Benutzer mit dem Namen „%s“ finden."
 
 #. TRANS: Error text shown when an unimplemented command is given.
-#: lib/command.php:183
 msgid "Sorry, this command is not yet implemented."
 msgstr "Leider ist dieser Befehl noch nicht implementiert."
 
 #. TRANS: Command exception text shown when a user tries to nudge themselves.
-#: lib/command.php:229
 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr "Es macht keinen Sinn, dich selbst anzustupsen!"
 
 #. TRANS: Message given having nudged another user.
 #. TRANS: %s is the nickname of the user that was nudged.
-#: lib/command.php:238
 #, php-format
 msgid "Nudge sent to %s."
 msgstr "Stups an „%s“ abgeschickt."
@@ -8001,7 +6603,6 @@ msgstr "Stups an „%s“ abgeschickt."
 #. TRANS: %1$s is the number of other user the user is subscribed to.
 #. TRANS: %2$s is the number of users that are subscribed to the user.
 #. TRANS: %3$s is the number of notices the user has sent.
-#: lib/command.php:268
 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"
@@ -8013,40 +6614,34 @@ msgstr ""
 "Mitteilungen: %3$s"
 
 #. TRANS: Error message text shown when a favorite could not be set because it has already been favorited.
-#: lib/command.php:298
 #, fuzzy
 msgid "Could not create favorite: already favorited."
 msgstr "Konnte keinen Favoriten erstellen."
 
 #. TRANS: Text shown when a notice has been marked as favourite successfully.
-#: lib/command.php:324
 msgid "Notice marked as fave."
 msgstr "Nachricht als Favorit markiert."
 
 #. TRANS: Message given having added a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:369
 #, php-format
 msgid "%1$s joined group %2$s."
 msgstr "%1$s ist der Gruppe „%2$s“ beigetreten."
 
 #. TRANS: Message given having removed a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:417
 #, php-format
 msgid "%1$s left group %2$s."
 msgstr "%1$s hat die Gruppe „%2$s“ verlassen."
 
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: lib/command.php:438
 #, php-format
 msgctxt "WHOIS"
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
 
 #. TRANS: Whois output. %s is the full name of the queried user.
-#: lib/command.php:442
 #, php-format
 msgid "Fullname: %s"
 msgstr "Bürgerlicher Name: %s"
@@ -8054,7 +6649,6 @@ msgstr "Bürgerlicher Name: %s"
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a location.
-#: lib/command.php:446 lib/mail.php:275
 #, php-format
 msgid "Location: %s"
 msgstr "Standort: %s"
@@ -8062,20 +6656,17 @@ msgstr "Standort: %s"
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a homepage.
-#: lib/command.php:450 lib/mail.php:279
 #, php-format
 msgid "Homepage: %s"
 msgstr "Homepage: %s"
 
 #. TRANS: Whois output. %s is the bio information of the queried user.
-#: lib/command.php:454
 #, php-format
 msgid "About: %s"
 msgstr "Über: %s"
 
 #. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).
 #. TRANS: %s is a remote profile.
-#: lib/command.php:483
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
@@ -8086,7 +6677,6 @@ msgstr ""
 
 #. TRANS: Message given if content is too long. %1$sd is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:500
 #, php-format
 msgid "Message too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
@@ -8095,26 +6685,26 @@ msgstr[0] ""
 msgstr[1] ""
 "Nachricht zu lang - maximal %1$d Zeichen erlaubt, du hast %2$d gesendet."
 
+#. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
+msgid "You can't send a message to this user."
+msgstr "Du kannst diesem Benutzer keine Nachricht schicken."
+
 #. TRANS: Error text shown sending a direct message fails with an unknown reason.
-#: lib/command.php:528
 msgid "Error sending direct message."
 msgstr "Fehler beim Senden der Nachricht."
 
 #. TRANS: Message given having repeated a notice from another user.
 #. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:565
 #, php-format
 msgid "Notice from %s repeated."
 msgstr "Nachricht von „%s“ wiederholt."
 
 #. TRANS: Error text shown when repeating a notice fails with an unknown reason.
-#: lib/command.php:568
 msgid "Error repeating notice."
 msgstr "Fehler beim Wiederholen der Nachricht."
 
 #. TRANS: Message given if content of a notice for a reply is too long. %1$d is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:603
 #, php-format
 msgid "Notice too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Notice too long - maximum is %1$d characters, you sent %2$d."
@@ -8125,100 +6715,83 @@ msgstr[1] ""
 
 #. TRANS: Text shown having sent a reply to a notice successfully.
 #. TRANS: %s is the nickname of the user of the notice the reply was sent to.
-#: lib/command.php:616
 #, php-format
 msgid "Reply to %s sent."
 msgstr "Antwort an „%s“ gesendet"
 
 #. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
-#: lib/command.php:619
 msgid "Error saving notice."
 msgstr "Problem beim Speichern der Nachricht."
 
 #. TRANS: Error text shown when no username was provided when issuing a subscribe command.
-#: lib/command.php:666
 msgid "Specify the name of the user to subscribe to."
 msgstr "Gib den Namen des Benutzers an, den du abonnieren möchtest."
 
 #. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
-#: lib/command.php:675
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "OMB-Profile können nicht mit einem Kommando abonniert werden."
 
 #. TRANS: Text shown after having subscribed to another user successfully.
 #. TRANS: %s is the name of the user the subscription was requested for.
-#: lib/command.php:683
 #, php-format
 msgid "Subscribed to %s."
 msgstr "%s abboniert."
 
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.
-#: lib/command.php:704 lib/command.php:815
 msgid "Specify the name of the user to unsubscribe from."
 msgstr "Gib den Namen des Benutzers ein, den du nicht mehr abonnieren möchtest"
 
 #. TRANS: Text shown after having unsubscribed from another user successfully.
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:715
 #, php-format
 msgid "Unsubscribed from %s."
 msgstr "%s abbestellt."
 
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
-#: lib/command.php:735 lib/command.php:761
 msgid "Command not yet implemented."
 msgstr "Befehl noch nicht implementiert."
 
 #. TRANS: Text shown when issuing the command "off" successfully.
-#: lib/command.php:739
 msgid "Notification off."
 msgstr "Benachrichtigung deaktiviert."
 
 #. TRANS: Error text shown when the command "off" fails for an unknown reason.
-#: lib/command.php:742
 msgid "Can't turn off notification."
 msgstr "Konnte Benachrichtigung nicht deaktivieren."
 
 #. TRANS: Text shown when issuing the command "on" successfully.
-#: lib/command.php:765
 msgid "Notification on."
 msgstr "Benachrichtigung aktiviert."
 
 #. TRANS: Error text shown when the command "on" fails for an unknown reason.
-#: lib/command.php:768
 msgid "Can't turn on notification."
 msgstr "Konnte Benachrichtigung nicht aktivieren."
 
 #. TRANS: Error text shown when issuing the login command while login is disabled.
-#: lib/command.php:782
 msgid "Login command is disabled."
 msgstr "Die Anmeldung ist deaktiviert."
 
 #. TRANS: Text shown after issuing the login command successfully.
 #. TRANS: %s is a logon link..
-#: lib/command.php:795
 #, php-format
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr "Der Link ist nur einmal und für eine Dauer von 2 Minuten gültig: %s"
 
 #. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:824
 #, php-format
 msgid "Unsubscribed %s."
 msgstr "%s nicht mehr abonniert"
 
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
-#: lib/command.php:842
 msgid "You are not subscribed to anyone."
 msgstr "Du hast niemanden abonniert."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
-#: lib/command.php:847
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Du hast diesen Benutzer bereits abonniert:"
@@ -8226,14 +6799,12 @@ msgstr[1] "Du hast diese Benutzer bereits abonniert:"
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user
 #. TRANS: (followers) without having any subscribers.
-#: lib/command.php:869
 msgid "No one is subscribed to you."
 msgstr "Niemand hat dich abonniert."
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
-#: lib/command.php:874
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Diese Person abonniert dich:"
@@ -8241,21 +6812,18 @@ msgstr[1] "Diese Personen abonnieren dich:"
 
 #. TRANS: Text shown after requesting groups a user is subscribed to without having
 #. TRANS: any group subscriptions.
-#: lib/command.php:896
 msgid "You are not a member of any groups."
 msgstr "Du bist in keiner Gruppe Mitglied."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
-#: lib/command.php:901
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "Du bist Mitglied dieser Gruppe:"
 msgstr[1] "Du bist Mitglied dieser Gruppen:"
 
 #. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-#: lib/command.php:916
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -8336,69 +6904,56 @@ msgstr ""
 "tracking - noch nicht implementiert\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:36
 msgid "No configuration file found."
 msgstr "Keine Konfigurationsdatei gefunden."
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:39
 msgid "I looked for configuration files in the following places:"
 msgstr "Ich habe an folgenden Stellen nach Konfigurationsdateien gesucht:"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:42
 msgid "You may wish to run the installer to fix this."
 msgstr "Bitte die Installation erneut starten, um das Problem zu beheben."
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:46
 msgid "Go to the installer."
 msgstr "Zur Installation gehen."
 
-#: lib/dberroraction.php:59
 msgid "Database error"
 msgstr "Datenbankfehler."
 
 #. TRANS: Description of form for deleting a user.
-#: lib/deleteuserform.php:75
 msgid "Delete this user"
 msgstr "Diesen Benutzer löschen"
 
-#: lib/designform.php:114
 #, fuzzy
 msgid "Change design"
 msgstr "Design speichern"
 
 #. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: lib/designform.php:131
 msgid "Change colours"
 msgstr "Farben ändern"
 
 #. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: lib/designform.php:138
 msgid "Use defaults"
 msgstr "Standardeinstellungen benutzen"
 
 #. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: lib/designform.php:140
 msgid "Restore default designs"
 msgstr "Standard-Design wiederherstellen"
 
 #. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: lib/designform.php:148
 msgid "Reset back to default"
 msgstr "Standard wiederherstellen"
 
 #. TRANS: Label in form on profile design page.
 #. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
-#: lib/designform.php:158
 msgid "Upload file"
 msgstr "Datei hochladen"
 
 #. TRANS: Instructions for form on profile design page.
-#: lib/designform.php:163
 #, fuzzy
 msgid ""
 "You can upload your personal background image. The maximum file size is 2Mb."
@@ -8407,47 +6962,39 @@ msgstr ""
 "Dateigröße ist 2 MB."
 
 #. TRANS: Radio button on profile design page that will enable use of the uploaded profile image.
-#: lib/designform.php:194
 msgctxt "RADIO"
 msgid "On"
 msgstr "An"
 
 #. TRANS: Radio button on profile design page that will disable use of the uploaded profile image.
-#: lib/designform.php:211
 msgctxt "RADIO"
 msgid "Off"
 msgstr "Aus"
 
 #. TRANS: Title for button on profile design page to save settings.
-#: lib/designform.php:322
 msgid "Save design"
 msgstr "Design speichern"
 
 #. TRANS: Error message displayed if design settings could not be saved.
 #. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
-#: lib/designsettings.php:216 lib/designsettings.php:238
 msgid "Couldn't update your design."
 msgstr "Konnte dein Design nicht aktualisieren."
 
 #. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
-#: lib/designsettings.php:244
 msgid "Design defaults restored."
 msgstr "Standard-Design wieder hergestellt."
 
 #. TRANS: Exception. %s is an ID.
-#: lib/discovery.php:153
 #, fuzzy, php-format
 msgid "Unable to find services for %s."
 msgstr "Kann Zugang dieses Programm nicht entfernen: %s."
 
 #. TRANS: Form legend for removing the favourite status for a favourite notice.
 #. TRANS: Title for button text for removing the favourite status for a favourite notice.
-#: lib/disfavorform.php:108 lib/disfavorform.php:140
 msgid "Disfavor this notice"
 msgstr "Aus Favoriten entfernen"
 
 #. TRANS: Button text for removing the favourite status for a favourite notice.
-#: lib/disfavorform.php:136
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Disfavor favorite"
@@ -8455,101 +7002,79 @@ msgstr "Aus Favoriten entfernen"
 
 #. TRANS: Form legend for adding the favourite status to a notice.
 #. TRANS: Title for button text for adding the favourite status to a notice.
-#: lib/favorform.php:108 lib/favorform.php:139
 msgid "Favor this notice"
 msgstr "Zu den Favoriten hinzufügen"
 
 #. TRANS: Button text for adding the favourite status to a notice.
-#: lib/favorform.php:135
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Favor"
 msgstr "Zu Favoriten hinzufügen"
 
-#: lib/feed.php:84
 msgid "RSS 1.0"
 msgstr "RSS 1.0"
 
-#: lib/feed.php:86
 msgid "RSS 2.0"
 msgstr "RSS 2.0"
 
-#: lib/feed.php:88
 msgid "Atom"
 msgstr "Atom"
 
-#: lib/feed.php:90
 msgid "FOAF"
 msgstr "FOAF"
 
-#: lib/feedimporter.php:75
 #, fuzzy
 msgid "Not an atom feed."
 msgstr "Kein Mitglied"
 
-#: lib/feedimporter.php:82
 msgid "No author in the feed."
 msgstr ""
 
-#: lib/feedimporter.php:89
 msgid "Can't import without a user."
 msgstr ""
 
 #. TRANS: Header for feed links (h2).
-#: lib/feedlist.php:66
 msgid "Feeds"
 msgstr "Feeds"
 
-#: lib/galleryaction.php:128
 msgid "All"
 msgstr "Alle"
 
-#: lib/galleryaction.php:136
 msgid "Select tag to filter"
 msgstr "Wähle ein Tag, um die Liste einzuschränken"
 
-#: lib/galleryaction.php:137
 msgid "Tag"
 msgstr "Tag"
 
-#: lib/galleryaction.php:138
 msgid "Choose a tag to narrow list"
 msgstr "Wähle ein Tag, um die Liste einzuschränken"
 
-#: lib/galleryaction.php:140
 msgid "Go"
 msgstr "Los geht's"
 
-#: lib/grantroleform.php:91
 #, php-format
 msgid "Grant this user the \"%s\" role"
 msgstr "Teile dem Benutzer die „%s“-Rolle zu"
 
-#: lib/groupeditform.php:147
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "1-64 Kleinbuchstaben oder Zahlen, keine Satz- oder Leerzeichen"
 
-#: lib/groupeditform.php:156
 msgid "URL of the homepage or blog of the group or topic."
 msgstr "Adresse der Homepage oder Blogs der Gruppe oder des Themas."
 
-#: lib/groupeditform.php:161
 msgid "Describe the group or topic"
 msgstr "Beschreibe die Gruppe oder das Thema"
 
-#: lib/groupeditform.php:163
 #, php-format
 msgid "Describe the group or topic in %d character or less"
 msgid_plural "Describe the group or topic in %d characters or less"
 msgstr[0] "Beschreibe die Gruppe oder das Thema in einem Zeichen"
 msgstr[1] "Beschreibe die Gruppe oder das Thema in %d Zeichen"
 
-#: lib/groupeditform.php:175
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\"."
 msgstr "Ort der Gruppe, optional, beispielsweise „Stadt, Region, Land“."
 
-#: lib/groupeditform.php:183
 #, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -8565,70 +7090,60 @@ msgstr[1] ""
 "maximal %d."
 
 #. TRANS: Menu item in the group navigation page.
-#: lib/groupnav.php:86
 msgctxt "MENU"
 msgid "Group"
 msgstr "Gruppe"
 
 #. TRANS: Tooltip for menu item in the group navigation page.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:89
 #, php-format
 msgctxt "TOOLTIP"
 msgid "%s group"
 msgstr "%s-Gruppe"
 
 #. TRANS: Menu item in the group navigation page.
-#: lib/groupnav.php:95
 msgctxt "MENU"
 msgid "Members"
 msgstr "Mitglieder"
 
 #. TRANS: Tooltip for menu item in the group navigation page.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:98
 #, php-format
 msgctxt "TOOLTIP"
 msgid "%s group members"
 msgstr "%s-Gruppen-Mitglieder"
 
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/groupnav.php:108
 msgctxt "MENU"
 msgid "Blocked"
 msgstr "Blockiert"
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:111
 #, php-format
 msgctxt "TOOLTIP"
 msgid "%s blocked users"
 msgstr "Blockierte Benutzer der Gruppe „%s“"
 
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "Admin"
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:120
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Edit %s group properties"
 msgstr "%s-Gruppen-Einstellungen bearbeiten"
 
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/groupnav.php:126
 msgctxt "MENU"
 msgid "Logo"
 msgstr "Logo"
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:129
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Add or edit %s logo"
@@ -8636,69 +7151,57 @@ msgstr "%s-Logo hinzufügen oder bearbeiten"
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:138
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Add or edit %s design"
 msgstr "%s-Design hinzufügen oder bearbeiten"
 
 #. TRANS: Title for groups with the most members section.
-#: lib/groupsbymemberssection.php:71
 msgid "Groups with most members"
 msgstr "Gruppen mit den meisten Mitgliedern"
 
 #. TRANS: Title for groups with the most posts section.
-#: lib/groupsbypostssection.php:71
 msgid "Groups with most posts"
 msgstr "Gruppen mit den meisten Beiträgen"
 
 #. TRANS: Title for group tag cloud section.
 #. TRANS: %s is a group name.
-#: lib/grouptagcloudsection.php:57
 #, php-format
 msgid "Tags in %s group's notices"
 msgstr "Tags in den Nachrichten der Gruppe „%s“"
 
 #. TRANS: Client exception 406
-#: lib/htmloutputter.php:104
 msgid "This page is not available in a media type you accept"
 msgstr "Dies Seite liegt in keinem von dir akzeptierten Mediatype vor."
 
 #. TRANS: Exception thrown when trying to upload an unsupported image file format.
-#: lib/imagefile.php:73
 msgid "Unsupported image file format."
 msgstr "Bildformat wird nicht unterstützt."
 
 #. TRANS: Exception thrown when too large a file is uploaded.
 #. TRANS: %s is the maximum file size, for example "500b", "10kB" or "2MB".
-#: lib/imagefile.php:91
 #, php-format
 msgid "That file is too big. The maximum file size is %s."
 msgstr "Diese Datei ist zu groß. Die maximale Dateigröße ist %s."
 
 #. TRANS: Exception thrown when uploading an image and that action could not be completed.
-#: lib/imagefile.php:97
 msgid "Partial upload."
 msgstr "Unvollständiges Hochladen."
 
 #. TRANS: Exception thrown when uploading a file as image that is not an image or is a corrupt file.
-#: lib/imagefile.php:115
 msgid "Not an image or corrupt file."
 msgstr "Kein Bild oder defekte Datei."
 
 #. TRANS: Exception thrown during resize when image has been registered as present, but is no longer there.
-#: lib/imagefile.php:178
 msgid "Lost our file."
 msgstr "Daten verloren."
 
 #. TRANS: Exception thrown when trying to resize an unknown file type.
 #. TRANS: Exception thrown when trying resize an unknown file type.
-#: lib/imagefile.php:216 lib/imagefile.php:257
 msgid "Unknown file type"
 msgstr "Unbekannter Dateityp"
 
 #. TRANS: Number of megabytes. %d is the number.
-#: lib/imagefile.php:303
 #, php-format
 msgid "%dMB"
 msgid_plural "%dMB"
@@ -8706,7 +7209,6 @@ msgstr[0] "%d MB"
 msgstr[1] "%d MB"
 
 #. TRANS: Number of kilobytes. %d is the number.
-#: lib/imagefile.php:307
 #, php-format
 msgid "%dkB"
 msgid_plural "%dkB"
@@ -8714,14 +7216,12 @@ msgstr[0] "%d KB"
 msgstr[1] "%d KB"
 
 #. TRANS: Number of bytes. %d is the number.
-#: lib/imagefile.php:310
 #, php-format
 msgid "%dB"
 msgid_plural "%dB"
 msgstr[0] "%d Byte"
 msgstr[1] "%d Bytes"
 
-#: lib/implugin.php:262
 #, php-format
 msgid ""
 "User \"%s\" on %s has said that your %s screenname belongs to them. If "
@@ -8731,52 +7231,43 @@ msgid ""
 "message."
 msgstr ""
 
-#: lib/implugin.php:349
 #, php-format
 msgid "Unknown inbox source %d."
 msgstr "Unbekannte inbox-Quelle %d."
 
-#: lib/implugin.php:485
-#, fuzzy, php-format
+#, php-format
 msgid "Message too long - maximum is %1$d characters, you sent %2$d."
 msgstr ""
-"Nachricht zu lang - maximal ein Zeichen erlaubt, du hast %2$d gesendet."
+"Nachricht zu lang - maximal %1$d Zeichen erlaubt, du hast %2$d gesendet."
 
-#: lib/leaveform.php:114
 msgid "Leave"
 msgstr "Verlassen"
 
 #. TRANS: Menu item for logging in to the StatusNet site.
-#: lib/logingroupnav.php:77
 msgctxt "MENU"
 msgid "Login"
 msgstr "Anmelden"
 
 #. TRANS: Title for menu item for logging in to the StatusNet site.
-#: lib/logingroupnav.php:79
 msgid "Login with a username and password"
 msgstr "Mit Benutzernamen und Passwort anmelden"
 
 #. TRANS: Menu item for registering with the StatusNet site.
-#: lib/logingroupnav.php:85
 msgctxt "MENU"
 msgid "Register"
 msgstr "Registrieren"
 
 #. TRANS: Title for menu item for registering with the StatusNet site.
-#: lib/logingroupnav.php:87
 msgid "Sign up for a new account"
 msgstr "Registriere ein neues Benutzerkonto"
 
 #. TRANS: Subject for address confirmation email.
-#: lib/mail.php:172
 msgid "Email address confirmation"
 msgstr "Bestätigung der E-Mail-Adresse"
 
 #. TRANS: Body for address confirmation email.
 #. TRANS: %1$s is the addressed user's nickname, %2$s is the StatusNet sitename,
 #. TRANS: %3$s is the URL to confirm at.
-#: lib/mail.php:177
 #, php-format
 msgid ""
 "Hey, %1$s.\n"
@@ -8808,14 +7299,12 @@ msgstr ""
 
 #. TRANS: Subject of new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
-#: lib/mail.php:243
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1$s hat deine Nachrichten auf „%2$s“ abonniert."
 
 #. TRANS: This is a paragraph in a new-subscriber e-mail.
 #. TRANS: %s is a URL where the subscriber can be reported as abusive.
-#: lib/mail.php:250
 #, php-format
 msgid ""
 "If you believe this account is being used abusively, you can block them from "
@@ -8830,7 +7319,6 @@ msgstr ""
 #. TRANS: %3$s is the subscriber's profile URL, %4$s is the subscriber's location (or empty)
 #. TRANS: %5$s is the subscriber's homepage URL (or empty), %6%s is the subscriber's bio (or empty)
 #. TRANS: %7$s is a link to the addressed user's e-mail settings.
-#: lib/mail.php:260
 #, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -8858,14 +7346,12 @@ msgstr ""
 
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is biographical information.
-#: lib/mail.php:283
 #, php-format
 msgid "Bio: %s"
 msgstr "Biografie: %s"
 
 #. TRANS: Subject of notification mail for new posting email address.
 #. TRANS: %s is the StatusNet sitename.
-#: lib/mail.php:312
 #, php-format
 msgid "New email address for posting to %s"
 msgstr "Neue E-Mail-Adresse, um auf „%s“ zu schreiben"
@@ -8873,7 +7359,6 @@ msgstr "Neue E-Mail-Adresse, um auf „%s“ zu schreiben"
 #. TRANS: Body of notification mail for new posting email address.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is the e-mail address to send
 #. TRANS: to to post by e-mail, %3$s is a URL to more instructions.
-#: lib/mail.php:318
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -8896,19 +7381,16 @@ msgstr ""
 
 #. TRANS: Subject line for SMS-by-email notification messages.
 #. TRANS: %s is the posting user's nickname.
-#: lib/mail.php:439
 #, php-format
 msgid "%s status"
 msgstr "%s Status"
 
 #. TRANS: Subject line for SMS-by-email address confirmation message.
-#: lib/mail.php:465
 msgid "SMS confirmation"
 msgstr "SMS-Konfiguration"
 
 #. TRANS: Main body heading for SMS-by-email address confirmation message.
 #. TRANS: %s is the addressed user's nickname.
-#: lib/mail.php:469
 #, php-format
 msgid "%s: confirm you own this phone number with this code:"
 msgstr ""
@@ -8917,7 +7399,6 @@ msgstr ""
 
 #. TRANS: Subject for 'nudge' notification email.
 #. TRANS: %s is the nudging user.
-#: lib/mail.php:490
 #, fuzzy, php-format
 msgid "You have been nudged by %s"
 msgstr "Du wurdest von „%s“ angestupst"
@@ -8925,7 +7406,6 @@ msgstr "Du wurdest von „%s“ angestupst"
 #. TRANS: Body for 'nudge' notification email.
 #. TRANS: %1$s is the nuding user's long name, $2$s is the nudging user's nickname,
 #. TRANS: %3$s is a URL to post notices at, %4$s is the StatusNet sitename.
-#: lib/mail.php:497
 #, php-format
 msgid ""
 "%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -8954,7 +7434,6 @@ msgstr ""
 
 #. TRANS: Subject for direct-message notification email.
 #. TRANS: %s is the sending user's nickname.
-#: lib/mail.php:544
 #, php-format
 msgid "New private message from %s"
 msgstr "Neue private Nachricht von „%s“"
@@ -8963,7 +7442,6 @@ msgstr "Neue private Nachricht von „%s“"
 #. TRANS: %1$s is the sending user's long name, %2$s is the sending user's nickname,
 #. TRANS: %3$s is the message content, %4$s a URL to the message,
 #. TRANS: %5$s is the StatusNet sitename.
-#: lib/mail.php:552
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -8998,7 +7476,6 @@ msgstr ""
 
 #. TRANS: Subject for favorite notification e-mail.
 #. TRANS: %1$s is the adding user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:604
 #, php-format
 msgid "%1$s (@%2$s) added your notice as a favorite"
 msgstr "%1$s (@%2$s) hat deine Nachricht als Favorit gespeichert"
@@ -9008,7 +7485,6 @@ msgstr "%1$s (@%2$s) hat deine Nachricht als Favorit gespeichert"
 #. TRANS: %3$s is a URL to the faved notice, %4$s is the faved notice text,
 #. TRANS: %5$s is a URL to all faves of the adding user, %6$s is the StatusNet sitename,
 #. TRANS: %7$s is the adding user's nickname.
-#: lib/mail.php:611
 #, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -9040,7 +7516,6 @@ msgstr ""
 "%6$s\n"
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:669
 #, php-format
 msgid ""
 "The full conversation can be read here:\n"
@@ -9053,7 +7528,6 @@ msgstr ""
 
 #. TRANS: E-mail subject for notice notification.
 #. TRANS: %1$s is the sending user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:677
 #, php-format
 msgid "%1$s (@%2$s) sent a notice to your attention"
 msgstr ""
@@ -9066,7 +7540,6 @@ msgstr ""
 #. TRANS: %5$s is a URL to the full conversion if it exists (otherwise empty),
 #. TRANS: %6$s is a URL to reply to the notice, %7$s is a URL to all @-replied for the addressed user,
 #. TRANS: %8$s is a URL to the addressed user's e-mail settings, %9$s is the sender's nickname.
-#: lib/mail.php:685
 #, php-format
 msgid ""
 "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -9116,11 +7589,9 @@ msgstr ""
 "\n"
 "P.S. Diese E-Mail Benachrichtigung kannst du hier deaktivieren: %8$s\n"
 
-#: lib/mailbox.php:87
 msgid "Only the user can read their own mailboxes."
 msgstr "Nur der Benutzer selbst kann seinen Posteingang lesen."
 
-#: lib/mailbox.php:125
 msgid ""
 "You have no private messages. You can send private message to engage other "
 "users in conversation. People can send you messages for your eyes only."
@@ -9129,55 +7600,45 @@ msgstr ""
 "schicken, um sie in eine Konversation zu verwickeln. Andere Leute können dir "
 "Nachrichten schicken, die nur du sehen kannst."
 
-#: lib/mailhandler.php:37
 msgid "Could not parse message."
 msgstr "Konnte Nachricht nicht parsen."
 
-#: lib/mailhandler.php:42
 msgid "Not a registered user."
 msgstr "Kein registrierter Benutzer."
 
-#: lib/mailhandler.php:46
 msgid "Sorry, that is not your incoming email address."
 msgstr "Sorry, das ist nicht deine Adresse für eingehende E-Mails."
 
-#: lib/mailhandler.php:50
 msgid "Sorry, no incoming email allowed."
 msgstr "Sorry, keine eingehenden E-Mails gestattet."
 
-#: lib/mailhandler.php:229
 #, php-format
 msgid "Unsupported message type: %s"
 msgstr "Nachrichten-Typ „%s“ wird nicht unterstützt."
 
 #. TRANS: Client exception thrown when a database error was thrown during a file upload operation.
-#: lib/mediafile.php:102 lib/mediafile.php:174
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
 "Beim Speichern der Datei trat ein Datenbankfehler auf. Bitte versuche es "
 "noch einmal."
 
 #. TRANS: Client exception thrown when a file upload operation would cause a user to exceed a set quota.
-#: lib/mediafile.php:238 lib/mediafile.php:281
 msgid "File exceeds user's quota."
 msgstr "Dateigröße liegt über dem Benutzerlimit"
 
 #. TRANS: Client exception thrown when a file upload operation fails because the file could
 #. TRANS: not be moved from the temporary folder to the permanent file location.
-#: lib/mediafile.php:258 lib/mediafile.php:300
 msgid "File could not be moved to destination directory."
 msgstr "Datei konnte nicht in das Zielverzeichnis verschoben werden."
 
 #. TRANS: Client exception thrown when a file upload operation has been stopped because the MIME
 #. TRANS: type of the uploaded file could not be determined.
-#: lib/mediafile.php:265 lib/mediafile.php:306
 msgid "Could not determine file's MIME type."
 msgstr "Konnte den MIME-Typ nicht feststellen."
 
 #. TRANS: Client exception thrown trying to upload a forbidden MIME type.
 #. TRANS: %1$s is the file type that was denied, %2$s is the application part of
 #. TRANS: the MIME type that was denied.
-#: lib/mediafile.php:396
 #, php-format
 msgid ""
 "\"%1$s\" is not a supported file type on this server. Try using another %2$s "
@@ -9188,83 +7649,74 @@ msgstr ""
 
 #. TRANS: Client exception thrown trying to upload a forbidden MIME type.
 #. TRANS: %s is the file type that was denied.
-#: lib/mediafile.php:401
 #, php-format
 msgid "\"%s\" is not a supported file type on this server."
 msgstr "„%s“ ist kein unterstütztes Dateiformat auf diesem Server."
 
-#: lib/messageform.php:120
 msgid "Send a direct notice"
 msgstr "Versende eine direkte Nachricht"
 
 #. TRANS Label entry in drop-down selection box in direct-message inbox/outbox. This is the default entry in the drop-down box, doubling as instructions and a brake against accidental submissions with the first user in the list.
-#: lib/messageform.php:137
 msgid "Select recipient:"
 msgstr "Empfänger auswählen"
 
 #. TRANS Entry in drop-down selection box in direct-message inbox/outbox when no one is available to message.
-#: lib/messageform.php:150
 #, fuzzy
 msgid "No mutual subscribers."
 msgstr "Nicht abonniert!"
 
-#: lib/messageform.php:153
 msgid "To"
 msgstr "An"
 
-#: lib/messageform.php:184 lib/noticeform.php:236
 msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr "Senden"
 
-#: lib/messagelist.php:77
 #, fuzzy
 msgid "Messages"
 msgstr "Nachricht"
 
-#: lib/messagelistitem.php:123 lib/noticelist.php:527
 msgid "from"
 msgstr "von"
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:178
 msgid "Nickname cannot be empty."
 msgstr ""
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:191
 #, php-format
 msgid "Nickname cannot be more than %d character long."
 msgid_plural "Nickname cannot be more than %d characters long."
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/noticeform.php:160
+#. TRANS: Form legend for notice form.
 msgid "Send a notice"
 msgstr "Nachricht senden"
 
-#: lib/noticeform.php:174
+#. TRANS: Title for notice label. %s is the user's nickname.
 #, php-format
 msgid "What's up, %s?"
 msgstr "Was geht, %s?"
 
-#: lib/noticeform.php:193
+#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr "Anhängen"
 
-#: lib/noticeform.php:197
-msgid "Attach a file"
+#. TRANS: Title for input field to attach a file to a notice.
+#, fuzzy
+msgid "Attach a file."
 msgstr "Datei anhängen"
 
-#: lib/noticeform.php:212
+#. TRANS: Field label to add location to a notice.
 msgid "Share my location"
 msgstr "Teile meinen Aufenthaltsort"
 
-#: lib/noticeform.php:215
+#. TRANS: Text to not share location for a notice in notice form.
 msgid "Do not share my location"
 msgstr "Teile meinen Aufenthaltsort nicht"
 
-#: lib/noticeform.php:216
+#. TRANS: Timeout error text for location retrieval in notice form.
 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
 "try again later"
@@ -9273,417 +7725,316 @@ msgstr ""
 "Bitte versuche es später wieder."
 
 #. TRANS: Used in coordinates as abbreviation of north
-#: lib/noticelist.php:457
 msgid "N"
 msgstr "N"
 
 #. TRANS: Used in coordinates as abbreviation of south
-#: lib/noticelist.php:459
 msgid "S"
 msgstr "S"
 
 #. TRANS: Used in coordinates as abbreviation of east
-#: lib/noticelist.php:461
 msgid "E"
 msgstr "O"
 
 #. TRANS: Used in coordinates as abbreviation of west
-#: lib/noticelist.php:463
 msgid "W"
 msgstr "W"
 
-#: lib/noticelist.php:465
 #, php-format
 msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 
-#: lib/noticelist.php:474
 msgid "at"
 msgstr "in"
 
-#: lib/noticelist.php:523
 msgid "web"
 msgstr "Web"
 
-#: lib/noticelist.php:589
 msgid "in context"
 msgstr "im Zusammenhang"
 
-#: lib/noticelist.php:624
 msgid "Repeated by"
 msgstr "Wiederholt von"
 
-#: lib/noticelist.php:651
 msgid "Reply to this notice"
 msgstr "Auf diese Nachricht antworten"
 
-#: lib/noticelist.php:652
 msgid "Reply"
 msgstr "Antworten"
 
-#: lib/noticelist.php:678
 msgid "Delete this notice"
 msgstr "Nachricht löschen"
 
-#: lib/noticelist.php:696
 msgid "Notice repeated"
 msgstr "Nachricht wiederholt"
 
-#: lib/nudgeform.php:116
 msgid "Nudge this user"
 msgstr "Gib diesem Benutzer einen Stups"
 
-#: lib/nudgeform.php:128
 msgid "Nudge"
 msgstr "Stups"
 
-#: lib/nudgeform.php:128
 msgid "Send a nudge to this user"
 msgstr "Sende diesem Benutzer einen Stups"
 
-#: lib/oauthstore.php:294
 msgid "Error inserting new profile."
 msgstr "Neues Profil konnte nicht angelegt werden."
 
-#: lib/oauthstore.php:302
 msgid "Error inserting avatar."
 msgstr "Fehler beim Einfügen des Avatars."
 
-#: lib/oauthstore.php:322
 msgid "Error inserting remote profile."
 msgstr "Fehler beim Einfügen des entfernten Profils."
 
 #. TRANS: Exception thrown when a notice is denied because it has been sent before.
-#: lib/oauthstore.php:362
 msgid "Duplicate notice."
 msgstr "Doppelte Nachricht."
 
-#: lib/oauthstore.php:507
 msgid "Couldn't insert new subscription."
 msgstr "Konnte neues Abonnement nicht eintragen."
 
-#: lib/personalgroupnav.php:104
-#, fuzzy
 msgid "Replies"
 msgstr "Antworten"
 
-#: lib/personalgroupnav.php:109
-#, fuzzy
 msgid "Favorites"
 msgstr "Favoriten"
 
-#: lib/personalgroupnav.php:120
-#, fuzzy
 msgid "Inbox"
 msgstr "Posteingang"
 
-#: lib/personalgroupnav.php:121
 msgid "Your incoming messages"
 msgstr "Deine eingehenden Nachrichten"
 
-#: lib/personalgroupnav.php:125
-#, fuzzy
 msgid "Outbox"
 msgstr "Postausgang"
 
-#: lib/personalgroupnav.php:126
 msgid "Your sent messages"
 msgstr "Deine gesendeten Nachrichten"
 
 #. TRANS: Title for personal tag cloud section. %s is a user nickname.
-#: lib/personaltagcloudsection.php:56
 #, php-format
 msgid "Tags in %s's notices"
 msgstr "Tags in den Nachrichten von „%s“"
 
 #. TRANS: Displayed as version information for a plugin if no version information was found.
-#: lib/plugin.php:126
 msgid "Unknown"
 msgstr "Unbekannt"
 
 #. TRANS: Plugin admin panel controls
-#: lib/plugindisableform.php:90
 msgctxt "plugin"
 msgid "Disable"
 msgstr ""
 
 #. TRANS: Plugin admin panel controls
-#: lib/pluginenableform.php:112
 msgctxt "plugin"
 msgid "Enable"
 msgstr ""
 
-#: lib/pluginlist.php:196
 msgctxt "plugin-description"
 msgid "(Plugin descriptions unavailable when disabled.)"
 msgstr ""
 
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:88
 msgid "Subscriptions"
 msgstr "Abonnements"
 
 #. TRANS: Text for user subscription statistics if user has more subscriptions than displayed.
-#: lib/profileaction.php:144
 msgid "All subscriptions"
 msgstr "Alle Abonnements"
 
 #. TRANS: H2 text for user subscriber statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:96
 msgid "Subscribers"
 msgstr "Abonnenten"
 
 #. TRANS: Text for user subscription statistics if user has more subscribers than displayed.
-#: lib/profileaction.php:181
 msgid "All subscribers"
 msgstr "Alle Abonnenten"
 
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:213
 msgid "User ID"
 msgstr "Benutzer-ID"
 
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:219
 msgid "Member since"
 msgstr "Mitglied seit"
 
 #. TRANS: Label for user statistics.
 #. TRANS: H2 text for user group membership statistics.
-#: lib/profileaction.php:239 lib/profileaction.php:290
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:104
 msgid "Groups"
 msgstr "Gruppen"
 
 #. TRANS: Label for user statistics.
 #. TRANS: Average count of posts made per day since account registration.
-#: lib/profileaction.php:253
 msgid "Daily average"
 msgstr "Tagesdurchschnitt"
 
 #. TRANS: Text for user group membership statistics if user has more subscriptions than displayed.
-#: lib/profileaction.php:305
 msgid "All groups"
 msgstr "Alle Gruppen"
 
 #. TRANS: Server error displayed when using an unimplemented method.
-#: lib/profileformaction.php:123
 msgid "Unimplemented method."
 msgstr "Nicht unterstützte Methode."
 
-#: lib/publicgroupnav.php:82
 msgid "User groups"
 msgstr "Benutzer-Gruppen"
 
-#: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
 msgid "Recent tags"
 msgstr "Aktuelle Tags"
 
-#: lib/publicgroupnav.php:88
 msgid "Featured"
 msgstr "Beliebte Benutzer"
 
-#: lib/publicgroupnav.php:92
 msgid "Popular"
 msgstr "Beliebte Beiträge"
 
-#: lib/redirectingaction.php:95
 msgid "No return-to arguments."
 msgstr "Kein Rückkehr-Argument."
 
-#: lib/repeatform.php:107
 msgid "Repeat this notice?"
 msgstr "Diese Nachricht wiederholen?"
 
-#: lib/repeatform.php:132
 msgid "Yes"
 msgstr "Ja"
 
-#: lib/repeatform.php:132
 msgid "Repeat this notice"
 msgstr "Diese Nachricht wiederholen"
 
-#: lib/revokeroleform.php:91
 #, php-format
 msgid "Revoke the \"%s\" role from this user"
 msgstr "Widerrufe die „%s“-Rolle von diesem Benutzer"
 
 #. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:1001
 msgid "Page not found."
 msgstr "Seite nicht gefunden."
 
-#: lib/sandboxform.php:67
 msgid "Sandbox"
 msgstr "Spielwiese"
 
-#: lib/sandboxform.php:78
 msgid "Sandbox this user"
 msgstr "Diesen Benutzer auf die Spielwiese setzen"
 
 #. TRANS: Fieldset legend for the search form.
-#: lib/searchaction.php:120
 msgid "Search site"
 msgstr "Website durchsuchen"
 
 #. TRANS: Used as a field label for the field where one or more keywords
 #. TRANS: for searching can be entered.
-#: lib/searchaction.php:128
 msgid "Keyword(s)"
 msgstr "Suchbegriffe"
 
 #. TRANS: Button text for searching site.
-#: lib/searchaction.php:130
 msgctxt "BUTTON"
 msgid "Search"
 msgstr "Suchen"
 
-#: lib/searchgroupnav.php:80
 msgid "People"
 msgstr "Leute"
 
-#: lib/searchgroupnav.php:81
 msgid "Find people on this site"
 msgstr "Finde Leute auf dieser Seite"
 
-#: lib/searchgroupnav.php:83
 msgid "Find content of notices"
 msgstr "Durchsuche den Inhalt der Nachrichten"
 
-#: lib/searchgroupnav.php:85
 msgid "Find groups on this site"
 msgstr "Finde Gruppen auf dieser Seite"
 
-#: lib/section.php:89
 msgid "Untitled section"
 msgstr "Abschnitt ohne Titel"
 
-#: lib/section.php:106
 msgid "More..."
 msgstr "Mehr …"
 
-#: lib/settingsnav.php:78
 msgid "Change your profile settings"
 msgstr "Ändern der Profileinstellungen"
 
-#: lib/settingsnav.php:83
 msgid "Upload an avatar"
 msgstr "Avatar hochladen"
 
-#: lib/settingsnav.php:88
 msgid "Change your password"
 msgstr "Ändere dein Passwort"
 
-#: lib/settingsnav.php:93
 msgid "Change email handling"
 msgstr "Ändere die E-Mail-Verarbeitung"
 
-#: lib/settingsnav.php:98
 msgid "Design your profile"
 msgstr "Passe dein Profil an"
 
-#: lib/settingsnav.php:102
 msgid "URL"
 msgstr "URL"
 
-#: lib/settingsnav.php:103
 msgid "URL shorteners"
 msgstr ""
 
-#: lib/settingsnav.php:111
 msgid "Updates by instant messenger (IM)"
 msgstr "Aktualisierungen via Instant Messenger (IM)"
 
-#: lib/settingsnav.php:118
 msgid "Updates by SMS"
 msgstr "Aktualisierungen via SMS"
 
-#: lib/settingsnav.php:123
-#, fuzzy
 msgid "Connections"
 msgstr "Verbindungen"
 
-#: lib/settingsnav.php:124
 msgid "Authorized connected applications"
 msgstr "Programme mit Zugriffserlaubnis"
 
-#: lib/silenceform.php:67
 msgid "Silence"
 msgstr "Stummschalten"
 
-#: lib/silenceform.php:78
 msgid "Silence this user"
 msgstr "Benutzer verstummen lassen"
 
-#: lib/subgroupnav.php:89
 #, php-format
 msgid "People %s subscribes to"
 msgstr "Leute, die „%s“ abonniert hat"
 
-#: lib/subgroupnav.php:97
 #, php-format
 msgid "People subscribed to %s"
 msgstr "Leute, die „%s“ abonniert haben"
 
-#: lib/subgroupnav.php:105
 #, php-format
 msgid "Groups %s is a member of"
 msgstr "Gruppen, in denen „%s“ Mitglied ist"
 
-#: lib/subgroupnav.php:111
 msgid "Invite"
 msgstr "Einladen"
 
-#: lib/subgroupnav.php:112
 #, php-format
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Lade Freunde und Kollegen ein, dir auf „%s“ zu folgen"
 
-#: lib/subscribeform.php:115 lib/subscribeform.php:139
 msgid "Subscribe to this user"
 msgstr "Abonniere diesen Benutzer"
 
-#: lib/subscriberspeopleselftagcloudsection.php:48
-#: lib/subscriptionspeopleselftagcloudsection.php:48
 msgid "People Tagcloud as self-tagged"
 msgstr "Personen-Tagwolke, wie man sich selbst markiert hat."
 
-#: lib/subscriberspeopletagcloudsection.php:48
-#: lib/subscriptionspeopletagcloudsection.php:48
 msgid "People Tagcloud as tagged"
 msgstr "Personen-Tag, wie markiert wurde"
 
-#: lib/tagcloudsection.php:56
 msgid "None"
 msgstr "Nichts"
 
 #. TRANS: Server exception displayed if a theme name was invalid.
-#: lib/theme.php:74
 msgid "Invalid theme name."
 msgstr "Ungültiger Theme-Name."
 
-#: lib/themeuploader.php:50
 msgid "This server cannot handle theme uploads without ZIP support."
 msgstr ""
 "Dieser Server kann nicht mit Theme-Uploads ohne ZIP-Unterstützung umgehen."
 
-#: lib/themeuploader.php:58 lib/themeuploader.php:61
 msgid "The theme file is missing or the upload failed."
 msgstr "Die Theme-Datei fehlt oder das Hochladen ist fehlgeschlagen."
 
-#: lib/themeuploader.php:91 lib/themeuploader.php:102
-#: lib/themeuploader.php:279 lib/themeuploader.php:283
-#: lib/themeuploader.php:291 lib/themeuploader.php:298
 msgid "Failed saving theme."
 msgstr "Speicherung des Themes fehlgeschlagen."
 
-#: lib/themeuploader.php:147
 msgid "Invalid theme: bad directory structure."
 msgstr "Ungültiger Theme: schlechte Ordner-Struktur."
 
-#: lib/themeuploader.php:166
 #, php-format
 msgid "Uploaded theme is too large; must be less than %d byte uncompressed."
 msgid_plural ""
@@ -9695,11 +8046,9 @@ msgstr[1] ""
 "Der hochgeladene Theme ist zu groß; er muss unkomprimiert unter %d Bytes "
 "sein."
 
-#: lib/themeuploader.php:179
 msgid "Invalid theme archive: missing file css/display.css"
 msgstr "Ungültigges Theme-Archiv: fehlende Datei css/display.css"
 
-#: lib/themeuploader.php:219
 msgid ""
 "Theme contains invalid file or folder name. Stick with ASCII letters, "
 "digits, underscore, and minus sign."
@@ -9707,141 +8056,113 @@ msgstr ""
 "Der Theme enthält einen ungültigen Datei- oder Ordnernamen. Bleib bei ASCII-"
 "Buchstaben, Zahlen, Unterstrichen und Minuszeichen."
 
-#: lib/themeuploader.php:225
 msgid "Theme contains unsafe file extension names; may be unsafe."
 msgstr "Theme enthält unsichere Dateierweiterungen; könnte unsicher sein."
 
-#: lib/themeuploader.php:242
 #, php-format
 msgid "Theme contains file of type '.%s', which is not allowed."
 msgstr "Das Theme enthält Dateien des Types „.%s“, die nicht erlaubt sind."
 
-#: lib/themeuploader.php:260
 msgid "Error opening theme archive."
 msgstr "Fehler beim Öffnen des Theme-Archives."
 
-#: lib/threadednoticelist.php:270
-#, php-format
-msgid "Show all %d comment"
-msgid_plural "Show all %d comments"
-msgstr[0] ""
-msgstr[1] ""
+#, fuzzy, php-format
+msgid "Show %d reply"
+msgid_plural "Show all %d replies"
+msgstr[0] "Mehr anzeigen"
+msgstr[1] "Mehr anzeigen"
 
-#: lib/topposterssection.php:74
 msgid "Top posters"
 msgstr "Top-Schreiber"
 
 #. TRANS: Title for the form to unblock a user.
-#: lib/unblockform.php:67
 msgctxt "TITLE"
 msgid "Unblock"
 msgstr "Freigeben"
 
-#: lib/unsandboxform.php:69
 msgid "Unsandbox"
 msgstr "Von Spielwiese freigeben"
 
-#: lib/unsandboxform.php:80
 msgid "Unsandbox this user"
 msgstr "Benutzer freigeben"
 
-#: lib/unsilenceform.php:67
 msgid "Unsilence"
 msgstr "Stummschalten aufheben"
 
-#: lib/unsilenceform.php:78
 msgid "Unsilence this user"
 msgstr "Benutzer freigeben"
 
-#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
 msgid "Unsubscribe from this user"
 msgstr "Abonnement von diesem Benutzer abbestellen"
 
-#: lib/unsubscribeform.php:137
 msgid "Unsubscribe"
 msgstr "Abbestellen"
 
 #. 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).
-#: lib/usernoprofileexception.php:60
 #, php-format
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "Benutzer „%1$s“ (%2$d) hat kein Profil."
 
-#: lib/userprofile.php:116
 msgid "Edit Avatar"
 msgstr "Avatar bearbeiten"
 
 #. TRANS: H2 for user actions in a profile.
 #. TRANS: H2 for entity actions in a profile.
-#: lib/userprofile.php:216 lib/userprofile.php:232
 msgid "User actions"
 msgstr "Benutzeraktionen"
 
 #. TRANS: Text shown in user profile of not yet compeltely deleted users.
-#: lib/userprofile.php:220
 msgid "User deletion in progress..."
 msgstr "Löschung des Benutzers in Arbeit …"
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:248
 msgid "Edit profile settings"
 msgstr "Profil-Einstellungen ändern"
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:250
 msgid "Edit"
 msgstr "Bearbeiten"
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:274
 msgid "Send a direct message to this user"
 msgstr "Direkte Nachricht an Benutzer versenden"
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:276
 msgid "Message"
 msgstr "Nachricht"
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:318
 msgid "Moderate"
 msgstr "Moderieren"
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:357
 msgid "User role"
 msgstr "Benutzerrolle"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:360
 msgctxt "role"
 msgid "Administrator"
 msgstr "Administrator"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:362
 msgctxt "role"
 msgid "Moderator"
 msgstr "Moderator"
 
-#: lib/util.php:321
 #, fuzzy
 msgid "Not allowed to log in."
 msgstr "Nicht angemeldet."
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1337
 msgid "a few seconds ago"
 msgstr "vor wenigen Sekunden"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1340
 msgid "about a minute ago"
 msgstr "vor einer Minute"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1344
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
@@ -9849,12 +8170,10 @@ msgstr[0] "vor ca. einer Minute"
 msgstr[1] "vor ca. %d Minuten"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1347
 msgid "about an hour ago"
 msgstr "vor einer Stunde"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1351
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
@@ -9862,12 +8181,10 @@ msgstr[0] "vor ca. einer Stunde"
 msgstr[1] "vor ca. %d Stunden"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1354
 msgid "about a day ago"
 msgstr "vor einem Tag"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1358
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
@@ -9875,12 +8192,10 @@ msgstr[0] "vor ca. einem Tag"
 msgstr[1] "vor ca. %d Tagen"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1361
 msgid "about a month ago"
 msgstr "vor einem Monat"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1365
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
@@ -9888,209 +8203,41 @@ msgstr[0] "vor ca. einem Monat"
 msgstr[1] "vor ca. %d Monaten"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1368
 msgid "about a year ago"
 msgstr "vor ca. einem Jahr"
 
 #. TRANS: Web color exception thrown when a hexadecimal color code does not validate.
 #. TRANS: %s is the provided (invalid) color code.
-#: lib/webcolor.php:81 lib/webcolor.php:121
 #, php-format
 msgid "%s is not a valid color! Use 3 or 6 hex characters."
 msgstr "„%s“ ist keine gültige Farbe! Verwende 3 oder 6 Hex-Zeichen."
 
 #. TRANS: Exception.
-#: lib/xrd.php:63
 msgid "Invalid XML."
 msgstr "Ungültiges XML."
 
 #. TRANS: Exception.
-#: lib/xrd.php:68
 msgid "Invalid XML, missing XRD root."
 msgstr ""
 
 #. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
-#: scripts/restoreuser.php:62
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr "Hole Backup von der Datei „%s“."
 
-#~ msgid "Could not generate feed for group - %s"
-#~ msgstr "Konnte keinen Gruppen-Feed erstellen - %s"
+#~ msgid "Full name is too long (max 255 chars)."
+#~ msgstr "Der vollständige Name ist zu lang (maximal 255 Zeichen)."
+
+#~ msgid "description is too long (max %d chars)."
+#~ msgstr "Die Beschreibung ist zu lang (max. %d Zeichen)."
+
+#~ msgid "Location is too long (max 255 chars)."
+#~ msgstr "Der eingegebene Aufenthaltsort ist zu lang (maximal 255 Zeichen)."
+
+#~ msgid "Too many aliases! Maximum %d."
+#~ msgstr "Zu viele Pseudonyme! Maximale Anzahl ist %d."
 
 #, fuzzy
-#~ msgid "Current confirmed Jabber/Google Talk address."
-#~ msgstr "Aktuelle bestätigte Jabber/GTalk-Adresse"
-
-#, fuzzy
-#~ msgid ""
-#~ "Jabber or Google Talk address, like \"UserName@example.org\". First, make "
-#~ "sure to add %s to your buddy list in your IM client or on Google Talk."
-#~ msgstr ""
-#~ "Jabber- oder GoogleTalk-Adresse, beispielsweise „Benutzername@example."
-#~ "org“. Aber versichere dich zuerst, dass du %s in deine Kontaktliste in "
-#~ "deinem IM-Programm oder GTalk aufgenommen hast."
-
-#, fuzzy
-#~ msgid "Send me notices through Jabber/Google Talk."
-#~ msgstr "Schicke mir Nachrichten mittels Jabber/GTalk."
-
-#, fuzzy
-#~ msgid "Publish a MicroID for my Jabber/Google Talk address."
-#~ msgstr "MicroID für meine Jabber/GTalk-Adresse veröffentlichen."
-
-#~ msgid "No Jabber ID."
-#~ msgstr "Keine Jabber-ID"
-
-#, fuzzy
-#~ msgid "Not a valid Jabber ID."
-#~ msgstr "Ungültige Jabber-ID"
-
-#~ msgid "That is already your Jabber ID."
-#~ msgstr "Diese Jabber-ID hast du schon angegeben."
-
-#~ msgid "That is not your Jabber ID."
-#~ msgstr "Dies ist nicht deine Jabber-ID."
-
-#~ msgid "Other settings"
-#~ msgstr "Andere Einstellungen"
-
-#~ msgid "Tag cloud"
-#~ msgstr "Tag-Wolke"
-
-#~ msgid "Consumer key"
-#~ msgstr "Anwender-Schlüssel"
-
-#~ msgid "Consumer secret"
-#~ msgstr "Anwender-Geheimnis"
-
-#~ msgid "Request token URL"
-#~ msgstr "Anfrage-Token Adresse"
-
-#~ msgid "Access token URL"
-#~ msgstr "Zugriffs-Token-Adresse"
-
-#~ msgid "Authorize URL"
-#~ msgstr "Autorisationadresse"
-
-#~ msgid "Jabber"
-#~ msgstr "Jabber"
-
-#~ msgid "Photo"
-#~ msgstr "Foto"
-
-#~ msgid "Other options"
-#~ msgstr "Sonstige Optionen"
-
-#~ msgid "Other"
-#~ msgstr "Sonstige"
-
-#~ msgid "Primary site navigation"
-#~ msgstr "Hauptnavigation"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Personal profile and friends timeline"
-#~ msgstr "Persönliches Profil und Freundes-Zeitleiste"
-
-#~ msgctxt "MENU"
-#~ msgid "Personal"
-#~ msgstr "Eigene"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Change your email, avatar, password, profile"
-#~ msgstr "Ändere deine E-Mail, Avatar, Passwort und Profil"
-
-#~ msgid "Account"
-#~ msgstr "Profil"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Connect to services"
-#~ msgstr "Zum Dienst verbinden"
-
-#~ msgid "Connect"
-#~ msgstr "Verbinden"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Change site configuration"
-#~ msgstr "Seiteneinstellung ändern"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Invite friends and colleagues to join you on %s"
-#~ msgstr "Lade Freunde und Kollegen ein dir auf %s zu folgen"
-
-#~ msgctxt "MENU"
-#~ msgid "Invite"
-#~ msgstr "Einladen"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Create an account"
-#~ msgstr "Neues Benutzerkonto erstellen"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Help me!"
-#~ msgstr "Hilf mir!"
-
-#~ msgctxt "MENU"
-#~ msgid "Help"
-#~ msgstr "Hilfe"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Search for people or text"
-#~ msgstr "Suche nach Leuten oder Text"
-
-#~ msgid "Local views"
-#~ msgstr "Lokale Ansichten"
-
-#~ msgid "Page notice"
-#~ msgstr "Neue Nachricht"
-
-#~ msgid "Secondary site navigation"
-#~ msgstr "Unternavigation"
-
-#~ msgid "StatusNet software license"
-#~ msgstr "StatusNet-Software-Lizenz"
-
-#~ msgid "Site content license"
-#~ msgstr "StatusNet-Software-Lizenz"
-
-#~ msgid "Pagination"
-#~ msgstr "Seitenerstellung"
-
-#~ msgid "Author"
-#~ msgstr "Autor"
-
-#~ msgid "Provider"
-#~ msgstr "Anbieter"
-
-#~ msgctxt "MENU"
-#~ msgid "SMS"
-#~ msgstr "SMS"
-
-#~ msgid "Filter tags"
-#~ msgstr "Tags filtern"
-
-#~ msgid "[%s]"
-#~ msgstr "[%s]"
-
-#~ msgid "Available characters"
-#~ msgstr "Verfügbare Zeichen"
-
-#, fuzzy
-#~ msgctxt "MENU"
-#~ msgid "Profile"
-#~ msgstr "Profil"
-
-#~ msgid "Search help"
-#~ msgstr "Hilfe suchen"
-
-#~ msgid "Unknown user. Go to %s to add your address to your account"
-#~ msgstr ""
-#~ "Unbekannter Benutzer. Gehe zu %s, um deine Adresse deinem Benutzerkonto "
-#~ "hinzuzufügen."
-
-#~ msgid "Message too long. Maximum is %1$d character, you sent %2$d."
-#~ msgid_plural "Message too long. Maximum is %1$d characters, you sent %2$d."
-#~ msgstr[0] ""
-#~ "Nachricht zu lang - maximal ein Zeichen erlaubt, du hast %2$d gesendet."
-#~ msgstr[1] ""
-#~ "Nachricht zu lang - maximal %1$d Zeichen erlaubt, du hast %2$d gesendet."
+#~ msgctxt "BUTTON"
+#~ msgid "Comment"
+#~ msgstr "Inhalt"
diff --git a/locale/en_GB/LC_MESSAGES/statusnet.po b/locale/en_GB/LC_MESSAGES/statusnet.po
index 2be861f699..af6016977d 100644
--- a/locale/en_GB/LC_MESSAGES/statusnet.po
+++ b/locale/en_GB/LC_MESSAGES/statusnet.po
@@ -13,67 +13,57 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:23+0000\n"
-"PO-Revision-Date: 2011-03-03 17:25:52+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:13+0000\n"
 "Language-Team: British English <http://translatewiki.net/wiki/Portal:en-gb>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: en-gb\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-02-25 23:49:23+0000\n"
+"X-POT-Import-Date: 2011-03-03 17:59:19+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
-#: actions/accessadminpanel.php:53 lib/adminpanelaction.php:363
 msgid "Access"
 msgstr "Access"
 
 #. TRANS: Page notice.
-#: actions/accessadminpanel.php:64
 msgid "Site access settings"
 msgstr "Site access settings"
 
 #. TRANS: Form legend for registration form.
-#: actions/accessadminpanel.php:151
 msgid "Registration"
 msgstr "Registration"
 
 #. TRANS: Checkbox instructions for admin setting "Private".
-#: actions/accessadminpanel.php:155
 msgid "Prohibit anonymous users (not logged in) from viewing site?"
 msgstr "Prohibit anonymous users (not logged in) from viewing site?"
 
 #. TRANS: Checkbox label for prohibiting anonymous users from viewing site.
-#: actions/accessadminpanel.php:157
 msgctxt "LABEL"
 msgid "Private"
 msgstr "Private"
 
 #. TRANS: Checkbox instructions for admin setting "Invite only".
-#: actions/accessadminpanel.php:164
 msgid "Make registration invitation only."
 msgstr "Make registration invitation only."
 
 #. TRANS: Checkbox label for configuring site as invite only.
-#: actions/accessadminpanel.php:166
 msgid "Invite only"
 msgstr "Invite only"
 
 #. TRANS: Checkbox instructions for admin setting "Closed" (no new registrations).
-#: actions/accessadminpanel.php:173
 msgid "Disable new registrations."
 msgstr "Disable new registrations."
 
 #. TRANS: Checkbox label for disabling new user registrations.
-#: actions/accessadminpanel.php:175
 msgid "Closed"
 msgstr "Closed"
 
 #. TRANS: Title for button to save access settings in site admin panel.
-#: actions/accessadminpanel.php:191
 msgid "Save access settings"
 msgstr "Save access settings"
 
@@ -81,6 +71,7 @@ msgstr "Save access settings"
 #. TRANS: Button text for saving theme settings.
 #. TRANS: Button label to save e-mail preferences.
 #. TRANS: Button label to save IM preferences.
+#. TRANS: Button text in the license admin panel.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
 #. TRANS: Button text for saving site notice in admin panel.
@@ -90,21 +81,12 @@ msgstr "Save access settings"
 #. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
 #. TRANS: Button text on profile design page to save settings.
-#: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
-#: actions/emailsettings.php:251 actions/imsettings.php:199
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:198
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:204
-#: actions/subscriptions.php:261 actions/urlsettings.php:152
-#: actions/useradminpanel.php:298 lib/applicationeditform.php:355
-#: lib/designform.php:320 lib/groupeditform.php:201
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Save"
 
 #. TRANS: Server error when page not found (404).
 #. TRANS: Server error when page not found (404)
-#: actions/all.php:68 actions/public.php:98 actions/replies.php:93
-#: actions/showfavorites.php:140 actions/tag.php:52
 msgid "No such page."
 msgstr "No such page."
 
@@ -123,6 +105,7 @@ msgstr "No such page."
 #. TRANS: Client error displayed when checking group membership for a non-existing user.
 #. TRANS: Client error displayed when trying to have a non-existing user join a group.
 #. TRANS: Client error displayed when trying to have a non-existing user leave a group.
+#. TRANS: Client error displayed when not providing a user or an invalid user.
 #. TRANS: Client error displayed when updating a status for a non-existing user.
 #. TRANS: Client error displayed when requesting a list of followers for a non-existing user.
 #. TRANS: Client error displayed when requesting most recent favourite notices by a user for a non-existing user.
@@ -135,6 +118,8 @@ msgstr "No such page."
 #. 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.
 #. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
@@ -142,33 +127,10 @@ msgstr "No such page."
 #. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when calling a profile action without specifying a user.
-#: actions/all.php:80 actions/allrss.php:69
-#: actions/apiaccountupdatedeliverydevice.php:110
-#: actions/apiaccountupdateprofile.php:103
-#: actions/apiaccountupdateprofilebackgroundimage.php:118
-#: actions/apiaccountupdateprofileimage.php:104 actions/apiatomservice.php:59
-#: actions/apiblockcreate.php:96 actions/apiblockdestroy.php:94
-#: actions/apidirectmessage.php:75 actions/apidirectmessagenew.php:72
-#: actions/apigroupcreate.php:111 actions/apigroupismember.php:89
-#: actions/apigroupjoin.php:98 actions/apigroupleave.php:98
-#: actions/apigrouplist.php:70 actions/apigroupprofileupdate.php:108
-#: actions/apistatusesupdate.php:230 actions/apisubscriptions.php:85
-#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:173
-#: actions/apitimelinehome.php:78 actions/apitimelinementions.php:77
-#: actions/apitimelineuser.php:79 actions/avatarbynickname.php:79
-#: actions/favoritesrss.php:72 actions/foaf.php:42 actions/foaf.php:61
-#: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116
-#: actions/otp.php:78 actions/remotesubscribe.php:144
-#: actions/remotesubscribe.php:153 actions/replies.php:73
-#: actions/repliesrss.php:38 actions/rsd.php:113 actions/showfavorites.php:106
-#: actions/userbyid.php:75 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/userxrd.php:59 actions/xrds.php:71 lib/command.php:509
-#: lib/galleryaction.php:59 lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "No such user."
 
 #. TRANS: Page title. %1$s is user nickname, %2$d is page number
-#: actions/all.php:91
 #, php-format
 msgid "%1$s and friends, page %2$d"
 msgstr "%1$s and friends, page %2$d"
@@ -177,33 +139,26 @@ msgstr "%1$s and friends, page %2$d"
 #. TRANS: H1 text for page. %s is a user nickname.
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Timeline title for user and friends. %s is a user nickname.
-#: actions/all.php:94 actions/all.php:191 actions/allrss.php:117
-#: actions/apitimelinefriends.php:207 actions/apitimelinehome.php:113
-#: lib/personalgroupnav.php:100
 #, php-format
 msgid "%s and friends"
 msgstr "%s and friends"
 
 #. TRANS: %s is user nickname.
-#: actions/all.php:108
 #, php-format
 msgid "Feed for friends of %s (RSS 1.0)"
 msgstr "Feed for friends of %s (RSS 1.0)"
 
 #. TRANS: %s is user nickname.
-#: actions/all.php:117
 #, php-format
 msgid "Feed for friends of %s (RSS 2.0)"
 msgstr "Feed for friends of %s (RSS 2.0)"
 
 #. TRANS: %s is user nickname.
-#: actions/all.php:126
 #, php-format
 msgid "Feed for friends of %s (Atom)"
 msgstr "Feed for friends of %s (Atom)"
 
 #. TRANS: Empty list message. %s is a user nickname.
-#: actions/all.php:139
 #, php-format
 msgid ""
 "This is the timeline for %s and friends but no one has posted anything yet."
@@ -212,7 +167,6 @@ msgstr ""
 
 #. TRANS: Encouragement displayed on logged in user's empty timeline.
 #. TRANS: This message contains Markdown links. Keep "](" together.
-#: actions/all.php:146
 #, php-format
 msgid ""
 "Try subscribing to more people, [join a group](%%action.groups%%) or post "
@@ -223,7 +177,6 @@ msgstr ""
 
 #. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@".
 #. TRANS: This message contains Markdown links. Keep "](" together.
-#: actions/all.php:150
 #, php-format
 msgid ""
 "You can try to [nudge %1$s](../%2$s) from their profile or [post something "
@@ -236,7 +189,6 @@ msgstr ""
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
 #. TRANS: Second sentence of empty message for anonymous users. %s is a user nickname.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:221
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -246,14 +198,11 @@ msgstr ""
 "post a notice to them."
 
 #. TRANS: H1 text for page when viewing a list for self.
-#: actions/all.php:188
 msgid "You and friends"
 msgstr "You and friends"
 
 #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
 #. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name.
-#: actions/allrss.php:122 actions/apitimelinefriends.php:213
-#: actions/apitimelinehome.php:119
 #, php-format
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr "Updates from %1$s and friends on %2$s!"
@@ -272,55 +221,20 @@ msgstr "Updates from %1$s and friends on %2$s!"
 #. TRANS: Client error displayed trying to execute an unknown API method checking group membership.
 #. TRANS: Client error displayed trying to execute an unknown API method listing the latest 20 groups.
 #. TRANS: Client error displayed trying to execute an unknown API method showing group membership.
+#. TRANS: Client error displayed when using an unsupported API format.
 #. TRANS: Client error displayed trying to execute an unknown API method showing a group.
 #. TRANS: Client error displayed trying to execute an unknown API method testing API connectivity.
 #. TRANS: Client error displayed trying to execute an unknown API method deleting a status.
 #. TRANS: Client error displayed when trying to handle an unknown API method.
-#: actions/apiaccountratelimitstatus.php:69
-#: actions/apiaccountupdatedeliverydevice.php:92
-#: actions/apiaccountupdateprofile.php:94
-#: actions/apiaccountupdateprofilebackgroundimage.php:92
-#: actions/apiaccountupdateprofilecolors.php:115
-#: actions/apiaccountverifycredentials.php:68 actions/apidirectmessage.php:157
-#: actions/apifavoritecreate.php:98 actions/apifavoritedestroy.php:98
-#: actions/apifriendshipscreate.php:99 actions/apifriendshipsdestroy.php:99
-#: actions/apifriendshipsshow.php:124 actions/apigroupcreate.php:138
-#: actions/apigroupismember.php:115 actions/apigroupjoin.php:151
-#: actions/apigroupleave.php:141 actions/apigrouplist.php:134
-#: actions/apigrouplistall.php:120 actions/apigroupmembership.php:105
-#: actions/apigroupprofileupdate.php:100 actions/apigroupprofileupdate.php:213
-#: actions/apigroupshow.php:114 actions/apihelptest.php:84
-#: actions/apistatusesdestroy.php:101 actions/apistatusesretweets.php:110
-#: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:139
-#: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
-#: actions/apitimelinefavorites.php:182 actions/apitimelinefriends.php:276
-#: actions/apitimelinegroup.php:148 actions/apitimelinehome.php:181
-#: actions/apitimelinementions.php:182 actions/apitimelinepublic.php:247
-#: actions/apitimelineretweetedtome.php:147
-#: actions/apitimelineretweetsofme.php:147 actions/apitimelinetag.php:165
-#: actions/apitimelineuser.php:217 actions/apiusershow.php:100
 msgid "API method not found."
 msgstr "API method not found."
 
 #. 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.
-#: actions/apiaccountupdatedeliverydevice.php:83
-#: actions/apiaccountupdateprofile.php:85
-#: actions/apiaccountupdateprofilebackgroundimage.php:83
-#: actions/apiaccountupdateprofilecolors.php:106
-#: actions/apiaccountupdateprofileimage.php:80 actions/apiblockcreate.php:87
-#: actions/apiblockdestroy.php:85 actions/apidirectmessagenew.php:107
-#: actions/apifavoritecreate.php:88 actions/apifavoritedestroy.php:88
-#: actions/apifriendshipscreate.php:89 actions/apifriendshipsdestroy.php:89
-#: actions/apigroupcreate.php:102 actions/apigroupjoin.php:89
-#: actions/apigroupleave.php:89 actions/apigroupprofileupdate.php:92
-#: actions/apimediaupload.php:66 actions/apistatusesretweet.php:63
-#: actions/apistatusesupdate.php:194
 msgid "This method requires a POST."
 msgstr "This method requires a POST."
 
 #. TRANS: Client error displayed when no valid device parameter is provided for a user's delivery device setting.
-#: actions/apiaccountupdatedeliverydevice.php:103
 msgid ""
 "You must specify a parameter named 'device' with a value of one of: sms, im, "
 "none."
@@ -335,10 +249,6 @@ msgstr ""
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
-#: actions/apiaccountupdatedeliverydevice.php:136
-#: actions/emailsettings.php:353 actions/emailsettings.php:499
-#: actions/profilesettings.php:323 actions/smssettings.php:300
-#: actions/smssettings.php:453 actions/urlsettings.php:211
 msgid "Could not update user."
 msgstr "Could not update user."
 
@@ -351,32 +261,17 @@ msgstr "Could not update user."
 #. TRANS: Server error displayed when requesting Friends of a Friend feed for a user for which the profile could not be found.
 #. TRANS: Server error displayed when trying to get a user hCard for a user without a profile.
 #. TRANS: Server error displayed when calling a profile action while the specified user does not have a profile.
-#: actions/apiaccountupdateprofile.php:111
-#: actions/apiaccountupdateprofilebackgroundimage.php:199
-#: actions/apiaccountupdateprofilecolors.php:183
-#: actions/apiaccountupdateprofileimage.php:131
-#: actions/apiuserprofileimage.php:88 actions/apiusershow.php:108
-#: actions/avatarbynickname.php:85 actions/foaf.php:69 actions/hcard.php:75
-#: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
-#: lib/profileaction.php:85
 msgid "User has no profile."
 msgstr "User has no profile."
 
 #. TRANS: Server error displayed if a user profile could not be saved.
 #. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:419
 msgid "Could not save profile."
 msgstr "Could not save profile."
 
 #. TRANS: Client error displayed when the number of bytes in a POST request exceeds a limit.
 #. TRANS: %s is the number of bytes of the CONTENT_LENGTH.
 #. TRANS: Form validation error in design settings form. POST should remain untranslated.
-#: actions/apiaccountupdateprofilebackgroundimage.php:108
-#: actions/apiaccountupdateprofileimage.php:95 actions/apimediaupload.php:81
-#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
-#: actions/designadminpanel.php:120 actions/editapplication.php:121
-#: actions/newapplication.php:102 actions/newnotice.php:95
-#: lib/designsettings.php:110
 #, fuzzy, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s byte) due to its "
@@ -396,26 +291,15 @@ msgstr[1] ""
 #. TRANS: Client error displayed when a database error occurs inserting profile colours.
 #. TRANS: Client error displayed when a database error occurs updating profile colours.
 #. TRANS: Form validation error displayed when group design settings could not be saved because of an application issue.
-#: actions/apiaccountupdateprofilebackgroundimage.php:138
-#: actions/apiaccountupdateprofilebackgroundimage.php:149
-#: actions/apiaccountupdateprofilecolors.php:160
-#: actions/apiaccountupdateprofilecolors.php:171
-#: actions/groupdesignsettings.php:285 actions/groupdesignsettings.php:296
-#: actions/userdesignsettings.php:218 actions/userdesignsettings.php:228
-#: actions/userdesignsettings.php:270 actions/userdesignsettings.php:280
 msgid "Unable to save your design settings."
 msgstr "Unable to save your design settings."
 
 #. TRANS: Error displayed when updating design settings fails.
 #. TRANS: Client error displayed when a database error occurs updating profile colours.
-#: actions/apiaccountupdateprofilebackgroundimage.php:191
-#: actions/apiaccountupdateprofilecolors.php:139
-#: actions/userdesignsettings.php:196
 msgid "Could not update your design."
 msgstr "Could not update your design."
 
 #. TRANS: Title for Atom feed.
-#: actions/apiatomservice.php:85
 msgctxt "ATOM"
 msgid "Main"
 msgstr ""
@@ -424,9 +308,6 @@ msgstr ""
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Title in atom group notice feed. %s is a group name.
 #. TRANS: Title in atom user notice feed. %s is a user name.
-#: actions/apiatomservice.php:93 actions/grouprss.php:138
-#: actions/userrss.php:94 lib/atomgroupnoticefeed.php:63
-#: lib/atomusernoticefeed.php:88
 #, php-format
 msgid "%s timeline"
 msgstr "%s timeline"
@@ -436,8 +317,6 @@ msgstr "%s timeline"
 #. TRANS: %s is a user nickname.
 #. TRANS: Header for subscriptions overview for a user (first page).
 #. TRANS: %s is a user nickname.
-#: actions/apiatomservice.php:104 actions/atompubsubscriptionfeed.php:148
-#: actions/subscriptions.php:51
 #, php-format
 msgid "%s subscriptions"
 msgstr "%s subscriptions"
@@ -445,58 +324,48 @@ msgstr "%s subscriptions"
 #. TRANS: Title for Atom feed with a user's favorite notices. %s is a user nickname.
 #. TRANS: Title for Atom favorites feed.
 #. TRANS: %s is a user nickname.
-#: actions/apiatomservice.php:115 actions/atompubfavoritefeed.php:142
 #, fuzzy, php-format
 msgid "%s favorites"
 msgstr "Favourites"
 
 #. TRANS: Title for Atom feed with a user's memberships. %s is a user nickname.
-#: actions/apiatomservice.php:126
 #, fuzzy, php-format
 msgid "%s memberships"
 msgstr "%s group members"
 
 #. TRANS: Client error displayed when users try to block themselves.
-#: actions/apiblockcreate.php:105
 msgid "You cannot block yourself!"
 msgstr "You cannot block yourself!"
 
 #. TRANS: Server error displayed when blocking a user has failed.
-#: actions/apiblockcreate.php:127
 msgid "Block user failed."
 msgstr "Block user failed."
 
 #. TRANS: Server error displayed when unblocking a user has failed.
-#: actions/apiblockdestroy.php:113
 msgid "Unblock user failed."
 msgstr "Unblock user failed."
 
 #. TRANS: Title. %s is a user nickname.
-#: actions/apidirectmessage.php:88
 #, php-format
 msgid "Direct messages from %s"
 msgstr "Direct messages from %s"
 
 #. TRANS: Subtitle. %s is a user nickname.
-#: actions/apidirectmessage.php:93
 #, php-format
 msgid "All the direct messages sent from %s"
 msgstr "All the direct messages sent from %s"
 
 #. TRANS: Title. %s is a user nickname.
-#: actions/apidirectmessage.php:102
 #, php-format
 msgid "Direct messages to %s"
 msgstr "Direct messages to %s"
 
 #. TRANS: Subtitle. %s is a user nickname.
-#: actions/apidirectmessage.php:107
 #, php-format
 msgid "All the direct messages sent to %s"
 msgstr "All the direct messages sent to %s"
 
 #. TRANS: Client error displayed when no message text was submitted (406).
-#: actions/apidirectmessagenew.php:117
 msgid "No message text!"
 msgstr "No message text!"
 
@@ -504,7 +373,6 @@ msgstr "No message text!"
 #. TRANS: %d is the maximum number of characters for a message.
 #. TRANS: Form validation error displayed when message content is too long.
 #. TRANS: %d is the maximum number of characters for a message.
-#: actions/apidirectmessagenew.php:127 actions/newmessage.php:152
 #, php-format
 msgid "That's too long. Maximum message size is %d character."
 msgid_plural "That's too long. Maximum message size is %d characters."
@@ -512,18 +380,15 @@ msgstr[0] "That's too long. Maximum message size is %d character."
 msgstr[1] "That's too long. Maximum message size is %d characters."
 
 #. TRANS: Client error displayed if a recipient user could not be found (403).
-#: actions/apidirectmessagenew.php:139
 msgid "Recipient user not found."
 msgstr "Recipient user not found."
 
 #. TRANS: Client error displayed trying to direct message another user who's not a friend (403).
-#: actions/apidirectmessagenew.php:144
 #, fuzzy
 msgid "Cannot send direct messages to users who aren't your friend."
 msgstr "Can't send direct messages to users who aren't your friend."
 
 #. TRANS: Client error displayed trying to direct message self (403).
-#: actions/apidirectmessagenew.php:154
 msgid ""
 "Do not send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
@@ -532,118 +397,98 @@ 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.
 #. TRANS: Client error displayed trying to delete a status with an invalid ID.
-#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:108
-#: actions/apistatusesdestroy.php:121
 msgid "No status found with that ID."
 msgstr "No status found with that ID."
 
 #. TRANS: Client error displayed when trying to mark a notice favourite that already is a favourite.
-#: actions/apifavoritecreate.php:120
 msgid "This status is already a favorite."
 msgstr "This status is already a favourite."
 
 #. TRANS: Client error displayed when marking a notice as favourite fails.
 #. TRANS: Server error displayed when trying to mark a notice as favorite fails in the database.
 #. TRANS: Error message text shown when a favorite could not be set.
-#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:306
 msgid "Could not create favorite."
 msgstr "Could not create favourite."
 
 #. TRANS: Client error displayed when trying to remove a favourite that was not a favourite.
-#: actions/apifavoritedestroy.php:122
 msgid "That status is not a favorite."
 msgstr "That status is not a favourite."
 
 #. TRANS: Client error displayed when removing a favourite has failed.
 #. TRANS: Server error displayed when removing a favorite from the database fails.
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:90
 msgid "Could not delete favorite."
 msgstr "Could not delete favourite."
 
 #. TRANS: Client error displayed when trying follow who's profile could not be found.
-#: actions/apifriendshipscreate.php:109
 msgid "Could not follow user: profile not found."
 msgstr "Could not follow user: profile not found."
 
 #. TRANS: Client error displayed when trying to follow a user that's already being followed.
 #. TRANS: %s is the nickname of the user that is already being followed.
-#: actions/apifriendshipscreate.php:120
 #, php-format
 msgid "Could not follow user: %s is already on your list."
 msgstr "Could not follow user: %s is already on your list."
 
 #. TRANS: Client error displayed when trying to unfollow a user that cannot be found.
-#: actions/apifriendshipsdestroy.php:109
 msgid "Could not unfollow user: User not found."
 msgstr "Could not unfollow user: User not found."
 
 #. TRANS: Client error displayed when trying to unfollow self.
-#: actions/apifriendshipsdestroy.php:121
 msgid "You cannot unfollow yourself."
 msgstr "You cannot unfollow yourself."
 
 #. TRANS: Client error displayed when supplying invalid parameters to an API call checking if a friendship exists.
-#: actions/apifriendshipsexists.php:88
 #, fuzzy
 msgid "Two valid IDs or nick names must be supplied."
 msgstr "Two valid IDs or screen_names must be supplied."
 
 #. TRANS: Client error displayed when a source user could not be determined showing friendship.
-#: actions/apifriendshipsshow.php:131
 msgid "Could not determine source user."
 msgstr "Could not determine source user."
 
 #. TRANS: Client error displayed when a target user could not be determined showing friendship.
-#: actions/apifriendshipsshow.php:140
 msgid "Could not find target user."
 msgstr "Could not find target user."
 
 #. TRANS: Client error trying to create a group with a nickname this is already in use.
+#. TRANS: API validation exception thrown when nickname is already used.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:156 actions/apigroupprofileupdate.php:255
-#: actions/editgroup.php:191 actions/newgroup.php:137
-#: actions/profilesettings.php:274 actions/register.php:199
 msgid "Nickname already in use. Try another one."
 msgstr "Nickname already in use. Try another one."
 
 #. TRANS: Client error in form for group creation.
+#. TRANS: API validation exception thrown when nickname does not validate.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:164 actions/apigroupprofileupdate.php:259
-#: actions/editgroup.php:195 actions/newgroup.php:141
-#: actions/profilesettings.php:244 actions/register.php:201
 msgid "Not a valid nickname."
 msgstr "Not a valid nickname."
 
 #. TRANS: Client error in form for group creation.
+#. TRANS: API validation exception thrown when homepage URL does not validate.
 #. TRANS: Validation error shown when providing an invalid homepage URL in the "Edit application" form.
 #. TRANS: Group edit form validation error.
 #. TRANS: Validation error shown when providing an invalid homepage URL in the "New application" form.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:181 actions/apigroupprofileupdate.php:277
-#: actions/editapplication.php:235 actions/editgroup.php:202
-#: actions/newapplication.php:221 actions/newgroup.php:148
-#: actions/profilesettings.php:249 actions/register.php:208
 msgid "Homepage is not a valid URL."
 msgstr "Homepage is not a valid URL."
 
 #. TRANS: Client error in form for group creation.
+#. TRANS: API validation exception thrown when full name does not validate.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:191 actions/editgroup.php:206
-#: actions/newgroup.php:152 actions/profilesettings.php:253
-#: actions/register.php:211
 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "Full name is too long (max 255 chars)."
 
 #. TRANS: Client error shown when providing too long a description during group creation.
 #. TRANS: %d is the maximum number of allowed characters.
+#. TRANS: API validation exception thrown when description does not validate.
+#. TRANS: %d is the maximum description length and used for plural.
 #. TRANS: Validation error shown when providing too long a description in the "Edit application" form.
 #. TRANS: %d is the maximum number of allowed characters.
 #. TRANS: Group edit form validation error.
@@ -651,9 +496,6 @@ msgstr "Full name is too long (max 255 chars)."
 #. TRANS: %d is the maximum number of characters for the description.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed characters.
-#: actions/apigroupcreate.php:201 actions/editapplication.php:202
-#: actions/editgroup.php:211 actions/newapplication.php:182
-#: actions/newgroup.php:157
 #, fuzzy, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."
@@ -661,24 +503,22 @@ msgstr[0] "Description is too long (max %d chars)"
 msgstr[1] "Description is too long (max %d chars)"
 
 #. TRANS: Client error shown when providing too long a location during group creation.
+#. TRANS: API validation exception thrown when location does not validate.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:215 actions/editgroup.php:218
-#: actions/newgroup.php:164 actions/profilesettings.php:266
-#: actions/register.php:220
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
 msgstr "Location is too long (max 255 chars)."
 
 #. TRANS: Client error shown when providing too many aliases during group creation.
 #. TRANS: %d is the maximum number of allowed aliases.
+#. TRANS: API validation exception thrown when aliases do not validate.
+#. TRANS: %d is the maximum number of aliases and used for plural.
 #. TRANS: Group edit form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.
-#: actions/apigroupcreate.php:236 actions/editgroup.php:231
-#: actions/newgroup.php:177
 #, fuzzy, php-format
 msgid "Too many aliases! Maximum %d allowed."
 msgid_plural "Too many aliases! Maximum %d allowed."
@@ -687,25 +527,24 @@ msgstr[1] "Too many aliases! Maximum %d."
 
 #. TRANS: Client error shown when providing an invalid alias during group creation.
 #. TRANS: %s is the invalid alias.
-#: actions/apigroupcreate.php:253
+#. TRANS: API validation exception thrown when aliases does not validate.
+#. TRANS: %s is the invalid alias.
 #, php-format
 msgid "Invalid alias: \"%s\"."
 msgstr "Invalid alias: \"%s\"."
 
 #. TRANS: Client error displayed when trying to use an alias during group creation that is already in use.
 #. TRANS: %s is the alias that is already in use.
+#. TRANS: API validation exception thrown when aliases is already used.
+#. TRANS: %s is the already used alias.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error. %s is the already used alias.
-#: actions/apigroupcreate.php:264 actions/apigroupprofileupdate.php:351
-#: actions/editgroup.php:246 actions/newgroup.php:193
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "Alias \"%s\" already in use. Try another one."
 
 #. TRANS: Client error displayed when trying to use an alias during group creation that is the same as the group's nickname.
 #. TRANS: Group edit form validation error.
-#: actions/apigroupcreate.php:278 actions/apigroupprofileupdate.php:359
-#: actions/editgroup.php:253
 msgid "Alias can't be the same as nickname."
 msgstr "Alias can't be the same as nickname."
 
@@ -713,26 +552,21 @@ msgstr "Alias can't be the same as nickname."
 #. TRANS: Client error displayed when trying to join a group that does not exist.
 #. TRANS: Client error displayed when trying to leave a group that does not exist.
 #. TRANS: Client error displayed trying to show group membership on a non-existing group.
+#. TRANS: Client error displayed when not providing a group or an invalid group.
 #. TRANS: Client error displayed when trying to show a group that could not be found.
 #. TRANS: Client error displayed requesting most recent notices to a group for a non-existing group.
-#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
-#: actions/apigroupleave.php:104 actions/apigroupmembership.php:71
-#: actions/apigroupprofileupdate.php:113 actions/apigroupshow.php:81
-#: actions/apitimelinegroup.php:89
 msgid "Group not found."
 msgstr "Group not found."
 
 #. TRANS: Server error displayed when trying to join a group the user is already a member of.
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:345
 msgid "You are already a member of that group."
 msgstr "You are already a member of that group."
 
 #. TRANS: Server error displayed when trying to join a group the user is blocked from joining.
 #. 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.
-#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:350
 msgid "You have been blocked from that group by the admin."
 msgstr "You have been blocked from that group by the admin."
 
@@ -740,13 +574,11 @@ msgstr "You have been blocked from that group by the admin."
 #. TRANS: %1$s is the joining user's nickname, $2$s is the group nickname for which the join failed.
 #. TRANS: Message given having failed to add a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:136 actions/joingroup.php:139 lib/command.php:362
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "Could not join user %1$s to group %2$s."
 
 #. TRANS: Server error displayed when trying to leave a group the user is not a member of.
-#: actions/apigroupleave.php:115
 msgid "You are not a member of this group."
 msgstr "You are not a member of this group."
 
@@ -754,114 +586,77 @@ msgstr "You are not a member of this group."
 #. TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
 #. TRANS: Message given having failed to remove a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupleave.php:127 actions/leavegroup.php:133
-#: lib/command.php:410
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
 msgstr "Could not remove user %1$s from group %2$s."
 
 #. TRANS: Used as title in check for group membership. %s is a user name.
-#: actions/apigrouplist.php:94
 #, php-format
 msgid "%s's groups"
 msgstr "%s's groups"
 
 #. TRANS: Used as subtitle in check for group membership. %1$s is a user name, %2$s is the site name.
-#: actions/apigrouplist.php:104
 #, php-format
 msgid "%1$s groups %2$s is a member of."
 msgstr "%1$s groups %2$s is a member of."
 
 #. TRANS: Message is used as a title when listing the lastest 20 groups. %s is a site name.
 #. TRANS: Message is used as a page title. %s is a nick name.
-#: actions/apigrouplistall.php:88 actions/usergroups.php:63
 #, php-format
 msgid "%s groups"
 msgstr "%s groups"
 
 #. TRANS: Message is used as a subtitle when listing the lastest 20 groups. %s is a site name.
-#: actions/apigrouplistall.php:93
 #, php-format
 msgid "groups on %s"
 msgstr "groups on %s"
 
+#. TRANS: Client error displayed when trying to edit a group without being an admin.
 #. TRANS: Client error displayed trying to edit a group while not being a group admin.
 #. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
 #. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
-#: actions/apigroupprofileupdate.php:118 actions/editgroup.php:110
-#: actions/editgroup.php:176 actions/groupdesignsettings.php:109
-#: actions/grouplogo.php:111
 msgid "You must be an admin to edit the group."
 msgstr "You must be an admin to edit the group."
 
+#. TRANS: Server error displayed when group update fails.
 #. TRANS: Server error displayed when editing a group fails.
-#: actions/apigroupprofileupdate.php:171 actions/editgroup.php:274
 msgid "Could not update group."
 msgstr "Could not update group."
 
+#. TRANS: Server error displayed when adding group aliases fails.
 #. TRANS: Server error displayed when group aliases could not be added.
 #. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/apigroupprofileupdate.php:194 actions/editgroup.php:281
-#: classes/User_group.php:540
 msgid "Could not create aliases."
 msgstr "Could not create aliases."
 
+#. TRANS: API validation exception thrown when nickname does not validate.
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: actions/apigroupprofileupdate.php:249 lib/nickname.php:165
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr "Nickname must have only lowercase letters and numbers, and no spaces."
 
-#: actions/apigroupprofileupdate.php:286
-#, fuzzy
-msgid "Full name is too long (max 255 chars)."
-msgstr "Full name is too long (max 255 chars)."
-
-#: actions/apigroupprofileupdate.php:296
-#, fuzzy, php-format
-msgid "description is too long (max %d chars)."
-msgstr "Description is too long (max %d chars)"
-
-#: actions/apigroupprofileupdate.php:307
-#, fuzzy
-msgid "Location is too long (max 255 chars)."
-msgstr "Location is too long (max 255 chars)."
-
-#: actions/apigroupprofileupdate.php:326
-#, fuzzy, php-format
-msgid "Too many aliases! Maximum %d."
-msgstr "Too many aliases! Maximum %d."
-
-#. TRANS: Group edit form validation error.
+#. TRANS: API validation exception thrown when alias is the same as nickname.
 #. TRANS: Group create form validation error.
-#. TRANS: %s is the invalid alias.
-#: actions/apigroupprofileupdate.php:342 actions/editgroup.php:241
-#: actions/newgroup.php:188
-#, php-format
-msgid "Invalid alias: \"%s\""
-msgstr "Invalid alias: \"%s\""
+#, fuzzy
+msgid "Alias cannot be the same as nickname."
+msgstr "Alias can't be the same as nickname."
 
 #. TRANS: Client error displayed when uploading a media file has failed.
-#: actions/apimediaupload.php:101
 msgid "Upload failed."
 msgstr "Upload failed."
 
 #. TRANS: Client error given from the OAuth API when the request token or verifier is invalid.
-#: actions/apioauthaccesstoken.php:102
 msgid "Invalid request token or verifier."
 msgstr "Invalid request token or verifier."
 
 #. TRANS: Client error given when no oauth_token was passed to the OAuth API.
-#: actions/apioauthauthorize.php:107
 msgid "No oauth_token parameter provided."
 msgstr "No oauth_token parameter provided."
 
 #. TRANS: Client error given when an invalid request token was passed to the OAuth API.
-#: actions/apioauthauthorize.php:115 actions/apioauthauthorize.php:129
 msgid "Invalid request token."
 msgstr "Invalid request token."
 
 #. TRANS: Client error given when an invalid request token was passed to the OAuth API.
-#: actions/apioauthauthorize.php:121
 #, fuzzy
 msgid "Request token already authorized."
 msgstr "You are not authorised."
@@ -872,31 +667,14 @@ msgstr "You are not authorised."
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
 #. TRANS: Client error displayed when the session token is not okay.
-#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:75
-#: actions/emailsettings.php:292 actions/favor.php:75 actions/geocode.php:55
-#: actions/groupblock.php:65 actions/grouplogo.php:321
-#: actions/groupunblock.php:65 actions/imsettings.php:241
-#: actions/invite.php:60 actions/makeadmin.php:66 actions/newmessage.php:135
-#: actions/newnotice.php:105 actions/nudge.php:80
-#: actions/oauthappssettings.php:162 actions/oauthconnectionssettings.php:135
-#: actions/passwordsettings.php:137 actions/pluginenable.php:87
-#: actions/profilesettings.php:218 actions/recoverpassword.php:383
-#: actions/register.php:157 actions/remotesubscribe.php:76
-#: actions/repeat.php:82 actions/smssettings.php:249 actions/subedit.php:40
-#: actions/subscribe.php:87 actions/tagother.php:145
-#: actions/unsubscribe.php:69 actions/urlsettings.php:171
-#: actions/userauthorization.php:53 lib/designsettings.php:122
 msgid "There was a problem with your session token. Try again, please."
 msgstr "There was a problem with your session token. Try again, please."
 
 #. TRANS: Form validation error given when an invalid username and/or password was passed to the OAuth API.
-#: actions/apioauthauthorize.php:168
 msgid "Invalid nickname / password!"
 msgstr "Invalid nickname / password!"
 
 #. TRANS: Server error displayed when a database action fails.
-#: actions/apioauthauthorize.php:217
 #, fuzzy
 msgid "Database error inserting oauth_token_association."
 msgstr "Database error inserting OAuth application user."
@@ -913,28 +691,19 @@ msgstr "Database error inserting OAuth application user."
 #. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
 #. TRANS: Message given submitting a form with an unknown action in SMS settings.
 #. TRANS: Unknown form validation error in design settings form.
-#: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
-#: actions/designadminpanel.php:100 actions/editapplication.php:144
-#: actions/emailsettings.php:311 actions/grouplogo.php:332
-#: actions/imsettings.php:256 actions/newapplication.php:124
-#: actions/oauthconnectionssettings.php:144 actions/recoverpassword.php:46
-#: actions/smssettings.php:270 lib/designsettings.php:133
 msgid "Unexpected form submission."
 msgstr "Unexpected form submission."
 
 #. TRANS: Title for a page where a user can confirm/deny account access by an external application.
-#: actions/apioauthauthorize.php:387
 msgid "An application would like to connect to your account"
 msgstr "An application would like to connect to your account"
 
 #. TRANS: Fieldset legend.
-#: actions/apioauthauthorize.php:404
 msgid "Allow or deny access"
 msgstr "Allow or deny access"
 
 #. TRANS: User notification of external application requesting account access.
 #. TRANS: %3$s is the access type requested (read-write or read-only), %4$s is the StatusNet sitename.
-#: actions/apioauthauthorize.php:425
 #, fuzzy, php-format
 msgid ""
 "An application would like the ability to <strong>%3$s</strong> your %4$s "
@@ -948,7 +717,6 @@ msgstr ""
 #. TRANS: User notification of external application requesting account access.
 #. TRANS: %1$s is the application name requesting access, %2$s is the organisation behind the application,
 #. TRANS: %3$s is the access type requested, %4$s is the StatusNet sitename.
-#: actions/apioauthauthorize.php:433
 #, php-format
 msgid ""
 "The application <strong>%1$s</strong> by <strong>%2$s</strong> would like "
@@ -960,23 +728,19 @@ msgstr ""
 "give access to your %4$s account to third parties you trust."
 
 #. TRANS: Fieldset legend.
-#: actions/apioauthauthorize.php:455
 #, fuzzy
 msgctxt "LEGEND"
 msgid "Account"
 msgstr "Account"
 
 #. TRANS: Field label on OAuth API authorisation form.
+#. TRANS: Field label on login page.
 #. TRANS: Field label in form for profile settings.
-#: actions/apioauthauthorize.php:459 actions/login.php:225
-#: actions/profilesettings.php:107 actions/register.php:411
-#: actions/userauthorization.php:145 lib/groupeditform.php:145
 msgid "Nickname"
 msgstr "Nickname"
 
 #. TRANS: Field label on OAuth API authorisation form.
-#: actions/apioauthauthorize.php:463 actions/login.php:228
-#: actions/register.php:415 lib/settingsnav.php:87
+#. TRANS: Field label on login page.
 msgid "Password"
 msgstr "Password"
 
@@ -986,45 +750,36 @@ msgstr "Password"
 #. TRANS: Button label to cancel an IM address confirmation procedure.
 #. TRANS: Button label to cancel a SMS address confirmation procedure.
 #. TRANS: Button label in the "Edit application" form.
-#: actions/apioauthauthorize.php:478 actions/emailsettings.php:125
-#: actions/imsettings.php:136 actions/smssettings.php:132
-#: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Cancel"
 msgstr "Cancel"
 
 #. TRANS: Button text that when clicked will allow access to an account by an external application.
-#: actions/apioauthauthorize.php:485
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Allow"
 msgstr "Allow"
 
 #. TRANS: Form instructions.
-#: actions/apioauthauthorize.php:502
 msgid "Authorize access to your account information."
 msgstr "Authorise access to your account information."
 
 #. TRANS: Header for user notification after revoking OAuth access to an application.
-#: actions/apioauthauthorize.php:594
 msgid "Authorization canceled."
 msgstr "Authorisation cancelled."
 
 #. TRANS: User notification after revoking OAuth access to an application.
 #. TRANS: %s is an OAuth token.
-#: actions/apioauthauthorize.php:598
 #, php-format
 msgid "The request token %s has been revoked."
 msgstr "The request token %s has been revoked."
 
 #. TRANS: Title of the page notifying the user that an anonymous client application was successfully authorized to access the user's account with OAuth.
-#: actions/apioauthauthorize.php:621
 #, fuzzy
 msgid "You have successfully authorized the application"
 msgstr "You have successfully authorised %s."
 
 #. TRANS: Message notifying the user that an anonymous client application was successfully authorized to access the user's account with OAuth.
-#: actions/apioauthauthorize.php:625
 msgid ""
 "Please return to the application and enter the following security code to "
 "complete the process."
@@ -1032,14 +787,12 @@ msgstr ""
 
 #. TRANS: Title of the page notifying the user that the client application was successfully authorized to access the user's account with OAuth.
 #. TRANS: %s is the authorised application name.
-#: actions/apioauthauthorize.php:632
 #, fuzzy, php-format
 msgid "You have successfully authorized %s"
 msgstr "You have successfully authorised %s."
 
 #. TRANS: Message notifying the user that the client application was successfully authorized to access the user's account with OAuth.
 #. TRANS: %s is the authorised application name.
-#: actions/apioauthauthorize.php:639
 #, php-format
 msgid ""
 "Please return to %s and enter the following security code to complete the "
@@ -1048,12 +801,10 @@ msgstr ""
 
 #. TRANS: Client error displayed trying to delete a status not using POST or DELETE.
 #. TRANS: POST and DELETE should not be translated.
-#: actions/apistatusesdestroy.php:111
 msgid "This method requires a POST or DELETE."
 msgstr "This method requires a POST or DELETE."
 
 #. TRANS: Client error displayed trying to delete a status of another user.
-#: actions/apistatusesdestroy.php:136
 msgid "You may not delete another user's status."
 msgstr "You may not delete another user's status."
 
@@ -1061,21 +812,16 @@ msgstr "You may not delete another user's status."
 #. TRANS: Client error displayed trying to display redents of a non-exiting notice.
 #. TRANS: Client exception thrown when referencing a non-existing notice.
 #. TRANS: Error message displayed trying to delete a non-existing notice.
-#: actions/apistatusesretweet.php:74 actions/apistatusesretweets.php:70
-#: actions/atompubshowfavorite.php:82 actions/deletenotice.php:61
-#: actions/shownotice.php:92
 msgid "No such notice."
 msgstr "No such notice."
 
 #. TRANS: Client error displayed trying to repeat an own notice through the API.
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:549
 msgid "Cannot repeat your own notice."
 msgstr "Cannot repeat your own notice."
 
 #. TRANS: Client error displayed trying to re-repeat a notice through the API.
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:92 lib/command.php:555
 msgid "Already repeated that notice."
 msgstr "Already repeated that notice."
 
@@ -1085,59 +831,45 @@ msgstr "Already repeated that notice."
 #. TRANS: Client exception thrown when using an unsupported HTTP method.
 #. TRANS: Client error shown when using a non-supported HTTP method.
 #. TRANS: Client exception thrown when using an unsupported HTTP method.
-#: actions/apistatusesshow.php:118 actions/atompubfavoritefeed.php:103
-#: actions/atompubmembershipfeed.php:105 actions/atompubshowfavorite.php:117
-#: actions/atompubshowmembership.php:116
-#: actions/atompubshowsubscription.php:122
-#: actions/atompubsubscriptionfeed.php:109
 #, fuzzy
 msgid "HTTP method not supported."
 msgstr "API method not found."
 
 #. TRANS: Exception thrown requesting an unsupported notice output format.
 #. TRANS: %s is the requested output format.
-#: actions/apistatusesshow.php:144
 #, fuzzy, php-format
 msgid "Unsupported format: %s."
 msgstr "Unsupported format."
 
 #. TRANS: Client error displayed requesting a deleted status.
-#: actions/apistatusesshow.php:155
 msgid "Status deleted."
 msgstr "Status deleted."
 
 #. TRANS: Client error displayed requesting a status with an invalid ID.
-#: actions/apistatusesshow.php:162
 msgid "No status with that ID found."
 msgstr "No status with that ID found."
 
 #. TRANS: Client error displayed when trying to delete a notice not using the Atom format.
-#: actions/apistatusesshow.php:227
 msgid "Can only delete using the Atom format."
 msgstr ""
 
 #. TRANS: Client error displayed when a user has no rights to delete notices of other users.
 #. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
-#: actions/apistatusesshow.php:235 actions/deletenotice.php:78
 #, fuzzy
 msgid "Cannot delete this notice."
 msgstr "Can't delete this notice."
 
 #. TRANS: Confirmation of notice deletion in API. %d is the ID (number) of the deleted notice.
-#: actions/apistatusesshow.php:249
 #, fuzzy, php-format
 msgid "Deleted notice %d"
 msgstr "Delete notice"
 
 #. TRANS: Client error displayed when the parameter "status" is missing.
-#: actions/apistatusesupdate.php:221
 msgid "Client must provide a 'status' parameter with a value."
 msgstr ""
 
 #. TRANS: Client error displayed when the parameter "status" is missing.
 #. TRANS: %d is the maximum number of character for a notice.
-#: actions/apistatusesupdate.php:244 actions/newnotice.php:161
-#: lib/mailhandler.php:60
 #, fuzzy, php-format
 msgid "That's too long. Maximum notice size is %d character."
 msgid_plural "That's too long. Maximum notice size is %d characters."
@@ -1145,14 +877,12 @@ msgstr[0] "That's too long. Max notice size is %d chars."
 msgstr[1] "That's too long. Max notice size is %d chars."
 
 #. TRANS: Client error displayed when replying to a non-existing notice.
-#: actions/apistatusesupdate.php:284
 #, fuzzy
 msgid "Parent notice not found."
 msgstr "API method not found."
 
 #. TRANS: Client error displayed exceeding the maximum notice length.
 #. TRANS: %d is the maximum lenth for a notice.
-#: actions/apistatusesupdate.php:308 actions/newnotice.php:184
 #, fuzzy, php-format
 msgid "Maximum notice size is %d character, including attachment URL."
 msgid_plural "Maximum notice size is %d characters, including attachment URL."
@@ -1161,13 +891,11 @@ msgstr[1] "Max notice size is %d chars, including attachment URL."
 
 #. TRANS: Client error displayed when requesting profiles of followers in an unsupported format.
 #. TRANS: Client error displayed when requesting IDs of followers in an unsupported format.
-#: actions/apisubscriptions.php:228 actions/apisubscriptions.php:258
 msgid "Unsupported format."
 msgstr "Unsupported format."
 
 #. TRANS: Title for timeline of most recent favourite notices by a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname.
-#: actions/apitimelinefavorites.php:108
 #, php-format
 msgid "%1$s / Favorites from %2$s"
 msgstr "%1$s / Favourites from %2$s"
@@ -1175,14 +903,12 @@ msgstr "%1$s / Favourites from %2$s"
 #. TRANS: Subtitle for timeline of most recent favourite notices by a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user's full name,
 #. TRANS: %3$s is a user nickname.
-#: actions/apitimelinefavorites.php:120
 #, fuzzy, php-format
 msgid "%1$s updates favorited by %2$s / %3$s."
 msgstr "%1$s updates favourited by %2$s / %2$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.
-#: actions/apitimelinementions.php:115
 #, php-format
 msgid "%1$s / Updates mentioning %2$s"
 msgstr "%1$s / Updates mentioning %2$s"
@@ -1190,49 +916,41 @@ msgstr "%1$s / Updates mentioning %2$s"
 #. TRANS: Subtitle for timeline of most recent mentions of a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname,
 #. TRANS: %3$s is a user's full name.
-#: actions/apitimelinementions.php:131
 #, php-format
 msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr "%1$s updates that reply to updates from %2$s / %3$s."
 
 #. TRANS: Title for site timeline. %s is the StatusNet sitename.
 #. TRANS: Public RSS feed title. %s is the StatusNet site name.
-#: actions/apitimelinepublic.php:193 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "%s public timeline"
 
 #. TRANS: Subtitle for site timeline. %s is the StatusNet sitename.
-#: actions/apitimelinepublic.php:199
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "%s updates from everyone!"
 
 #. TRANS: Server error displayed calling unimplemented API method for 'retweeted by me'.
-#: actions/apitimelineretweetedbyme.php:71
 #, fuzzy
 msgid "Unimplemented."
 msgstr "showForm() not implemented."
 
 #. TRANS: Title for Atom feed "repeated to me". %s is the user nickname.
-#: actions/apitimelineretweetedtome.php:96
 #, php-format
 msgid "Repeated to %s"
 msgstr "Repeated to %s"
 
-#: actions/apitimelineretweetedtome.php:98
 #, fuzzy, php-format
 msgid "%1$s notices that were to repeated to %2$s / %3$s."
 msgstr "%1$s updates that reply to updates from %2$s / %3$s."
 
 #. TRANS: Title of list of repeated notices of the logged in user.
 #. TRANS: %s is the nickname of the logged in user.
-#: actions/apitimelineretweetsofme.php:98
 #, php-format
 msgid "Repeats of %s"
 msgstr "Repeats of %s"
 
-#: actions/apitimelineretweetsofme.php:104
 #, fuzzy, php-format
 msgid "%1$s notices that %2$s / %3$s has repeated."
 msgstr "%1$s marked notice %2$s as a favourite."
@@ -1241,181 +959,148 @@ msgstr "%1$s marked notice %2$s as a favourite."
 #. TRANS: %s is the tag.
 #. TRANS: Title for first page of notices with tags.
 #. TRANS: %s is the tag.
-#: actions/apitimelinetag.php:101 actions/tag.php:69
 #, php-format
 msgid "Notices tagged with %s"
 msgstr "Notices tagged with %s"
 
 #. TRANS: Subtitle for timeline with lastest notices with a given tag.
 #. TRANS: %1$s is the tag, $2$s is the StatusNet sitename.
-#: actions/apitimelinetag.php:105 actions/tagrss.php:65
 #, php-format
 msgid "Updates tagged with %1$s on %2$s!"
 msgstr "Updates tagged with %1$s on %2$s!"
 
 #. TRANS: Client error displayed trying to add a notice to another user's timeline.
-#: actions/apitimelineuser.php:308
 #, fuzzy
 msgid "Only the user can add to their own timeline."
 msgstr "Only the user can read their own mailboxes."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:315
 msgid "Only accept AtomPub for Atom feeds."
 msgstr ""
 
 #. TRANS: Client error displayed attempting to post an empty API notice.
-#: actions/apitimelineuser.php:322
 msgid "Atom post must not be empty."
 msgstr ""
 
 #. TRANS: Client error displayed attempting to post an API that is not well-formed XML.
-#: actions/apitimelineuser.php:328
 msgid "Atom post must be well-formed XML."
 msgstr ""
 
 #. TRANS: Client error displayed when not using an Atom entry.
-#: actions/apitimelineuser.php:334 actions/atompubfavoritefeed.php:228
-#: actions/atompubmembershipfeed.php:230
-#: actions/atompubsubscriptionfeed.php:236
 msgid "Atom post must be an Atom entry."
 msgstr ""
 
 #. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
-#: actions/apitimelineuser.php:345
 msgid "Can only handle POST activities."
 msgstr ""
 
 #. TRANS: Client error displayed when using an unsupported activity object type.
 #. TRANS: %s is the unsupported activity object type.
-#: actions/apitimelineuser.php:356
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
 #. TRANS: %d is the notice ID (number).
-#: actions/apitimelineuser.php:390
 #, fuzzy, php-format
 msgid "No content for notice %d."
 msgstr "Find content of notices"
 
 #. TRANS: Client error displayed when using another format than AtomPub.
 #. TRANS: %s is the notice URI.
-#: actions/apitimelineuser.php:419
 #, fuzzy, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "Notice with that id does not exist."
 
 #. TRANS: Server error for unfinished API method showTrends.
-#: actions/apitrends.php:85
 msgid "API method under construction."
 msgstr "API method under construction."
 
 #. TRANS: Client error displayed when requesting user information for a non-existing user.
-#: actions/apiuserprofileimage.php:80 actions/apiusershow.php:94
 msgid "User not found."
 msgstr "API method not found."
 
 #. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
 #. TRANS: Client exception.
 #. TRANS: Client error displayed trying to subscribe to a non-existing profile.
-#: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
-#: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
-#: actions/subscribe.php:110
 msgid "No such profile."
 msgstr "No such profile."
 
 #. TRANS: Subtitle for Atom favorites feed.
 #. TRANS: %1$s is a user nickname, %2$s is the StatusNet sitename.
-#: actions/atompubfavoritefeed.php:147
 #, fuzzy, php-format
 msgid "Notices %1$s has favorited on %2$s"
 msgstr "Updates from %1$s and friends on %2$s!"
 
 #. TRANS: Client exception thrown when trying to set a favorite for another user.
 #. TRANS: Client exception thrown when trying to subscribe another user.
-#: actions/atompubfavoritefeed.php:217 actions/atompubsubscriptionfeed.php:225
 #, fuzzy
 msgid "Cannot add someone else's subscription."
 msgstr "Couldn't insert new subscription."
 
 #. TRANS: Client exception thrown when trying use an incorrect activity verb for the Atom pub method.
-#: actions/atompubfavoritefeed.php:240
 #, fuzzy
 msgid "Can only handle favorite activities."
 msgstr "Find content of notices"
 
 #. TRANS: Client exception thrown when trying favorite an object that is not a notice.
-#: actions/atompubfavoritefeed.php:250 actions/atompubmembershipfeed.php:250
 #, fuzzy
 msgid "Can only fave notices."
 msgstr "Find content of notices"
 
 #. TRANS: Client exception thrown when trying favorite a notice without content.
-#: actions/atompubfavoritefeed.php:259
 #, fuzzy
 msgid "Unknown note."
 msgstr "Unknown"
 
 #. TRANS: Client exception thrown when trying favorite an already favorited notice.
-#: actions/atompubfavoritefeed.php:267
 #, fuzzy
 msgid "Already a favorite."
 msgstr "Add to favourites"
 
 #. TRANS: Title for group membership feed.
 #. TRANS: %s is a username.
-#: actions/atompubmembershipfeed.php:144
 #, fuzzy, php-format
 msgid "%s group memberships"
 msgstr "%s group members"
 
 #. TRANS: Subtitle for group membership feed.
 #. TRANS: %1$s is a username, %2$s is the StatusNet sitename.
-#: actions/atompubmembershipfeed.php:149
 #, fuzzy, php-format
 msgid "Groups %1$s is a member of on %2$s"
 msgstr "Groups %s is a member of"
 
 #. TRANS: Client exception thrown when trying subscribe someone else to a group.
-#: actions/atompubmembershipfeed.php:219
 #, fuzzy
 msgid "Cannot add someone else's membership."
 msgstr "Couldn't insert new subscription."
 
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#: actions/atompubmembershipfeed.php:242
 #, fuzzy
 msgid "Can only handle join activities."
 msgstr "Find content of notices"
 
 #. TRANS: Client exception thrown when trying to subscribe to a non-existing group.
-#: actions/atompubmembershipfeed.php:259
 #, fuzzy
 msgid "Unknown group."
 msgstr "Unknown"
 
 #. TRANS: Client exception thrown when trying to subscribe to an already subscribed group.
-#: actions/atompubmembershipfeed.php:267
 #, fuzzy
 msgid "Already a member."
 msgstr "All members"
 
 #. TRANS: Client exception thrown when trying to subscribe to group while blocked from that group.
-#: actions/atompubmembershipfeed.php:275
 msgid "Blocked by admin."
 msgstr ""
 
 #. TRANS: Client exception thrown when referencing a non-existing favorite.
-#: actions/atompubshowfavorite.php:90
 #, fuzzy
 msgid "No such favorite."
 msgstr "No such file."
 
 #. TRANS: Client exception thrown when trying to remove a favorite notice of another user.
-#: actions/atompubshowfavorite.php:151
 #, fuzzy
 msgid "Cannot delete someone else's favorite."
 msgstr "Could not delete favourite."
@@ -1442,93 +1127,68 @@ msgstr "Could not delete favourite."
 #. TRANS: Client error displayed when trying to join a non-existing group.
 #. TRANS: Client error displayed when trying to leave a non-local group.
 #. TRANS: Client error displayed when trying to leave a non-existing group.
+#. TRANS: Client error displayed when providing an invalid group ID on the Make Admin page.
 #. 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.
 #. TRANS: Command exception text shown when a group is requested that does not exist.
 #. TRANS: Error text shown when trying to leave a group that does not exist.
-#: actions/atompubshowmembership.php:81 actions/blockedfromgroup.php:81
-#: actions/blockedfromgroup.php:89 actions/deletegroup.php:87
-#: actions/deletegroup.php:100 actions/editgroup.php:102
-#: actions/foafgroup.php:46 actions/foafgroup.php:65 actions/foafgroup.php:73
-#: actions/groupblock.php:89 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:101 actions/grouplogo.php:103
-#: actions/groupmembers.php:84 actions/groupmembers.php:92
-#: actions/grouprss.php:97 actions/grouprss.php:105
-#: actions/groupunblock.php:89 actions/joingroup.php:82
-#: actions/joingroup.php:95 actions/leavegroup.php:82
-#: actions/leavegroup.php:95 actions/makeadmin.php:86
-#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:392
 msgid "No such group."
 msgstr "No such group."
 
 #. TRANS: Client exception thrown when trying to show membership of a non-subscribed group
-#: actions/atompubshowmembership.php:91
 #, fuzzy
 msgid "Not a member."
 msgstr "All members"
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
-#: actions/atompubshowmembership.php:150
 #, fuzzy
 msgid "Cannot delete someone else's membership."
 msgstr "Could not delete self-subscription."
 
 #. TRANS: Client exception thrown when trying to display a subscription for a non-existing profile ID.
 #. TRANS: %d is the non-existing profile ID number.
-#: actions/atompubshowsubscription.php:72
-#: actions/atompubshowsubscription.php:83
-#: actions/atompubsubscriptionfeed.php:74
 #, fuzzy, php-format
 msgid "No such profile id: %d."
 msgstr "No such profile."
 
 #. 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.
-#: actions/atompubshowsubscription.php:94
 #, fuzzy, php-format
 msgid "Profile %1$d not subscribed to profile %2$d."
 msgstr "You are not subscribed to that profile."
 
 #. TRANS: Client exception thrown when trying to delete a subscription of another user.
-#: actions/atompubshowsubscription.php:157
 #, fuzzy
 msgid "Cannot delete someone else's subscription."
 msgstr "Could not delete self-subscription."
 
 #. TRANS: Subtitle for Atom subscription feed.
 #. TRANS: %1$s is a user nickname, %s$s is the StatusNet sitename.
-#: actions/atompubsubscriptionfeed.php:153
 #, fuzzy, php-format
 msgid "People %1$s has subscribed to on %2$s"
 msgstr "People subscribed to %s"
 
 #. TRANS: Client error displayed when not using the follow verb.
-#: actions/atompubsubscriptionfeed.php:248
 msgid "Can only handle Follow activities."
 msgstr ""
 
 #. TRANS: Client exception thrown when subscribing to an object that is not a person.
-#: actions/atompubsubscriptionfeed.php:256
 msgid "Can only follow people."
 msgstr ""
 
 #. TRANS: Client exception thrown when subscribing to a non-existing profile.
 #. TRANS: %s is the unknown profile ID.
-#: actions/atompubsubscriptionfeed.php:267
 #, fuzzy, php-format
 msgid "Unknown profile %s."
 msgstr "Unknown file type"
 
 #. TRANS: Client error displayed trying to subscribe to an already subscribed profile.
 #. TRANS: %s is the profile the user already has a subscription on.
-#: actions/atompubsubscriptionfeed.php:275
 #, fuzzy, php-format
 msgid "Already subscribed to %s."
 msgstr "Already subscribed!"
 
 #. TRANS: Client error displayed trying to get a non-existing attachment.
-#: actions/attachment.php:73
 msgid "No such attachment."
 msgstr "No such attachment."
 
@@ -1540,31 +1200,23 @@ msgstr "No such attachment."
 #. TRANS: Client error displayed when trying to view group members without providing a group nickname.
 #. TRANS: Client error displayed when requesting a group RSS feed without providing a group nickname.
 #. TRANS: Client error displayed if no nickname argument was given requesting a group page.
-#: actions/avatarbynickname.php:60 actions/blockedfromgroup.php:73
-#: actions/editgroup.php:85 actions/groupdesignsettings.php:84
-#: actions/grouplogo.php:86 actions/groupmembers.php:76
-#: actions/grouprss.php:89 actions/showgroup.php:116
 msgid "No nickname."
 msgstr "No nickname."
 
 #. TRANS: Client error displayed trying to get an avatar without providing an avatar size.
-#: actions/avatarbynickname.php:66
 msgid "No size."
 msgstr "No size."
 
 #. TRANS: Client error displayed trying to get an avatar providing an invalid avatar size.
-#: actions/avatarbynickname.php:72
 msgid "Invalid size."
 msgstr "Invalid size."
 
 #. TRANS: Title for avatar upload page.
-#: actions/avatarsettings.php:66 lib/settingsnav.php:82
 msgid "Avatar"
 msgstr "Avatar"
 
 #. TRANS: Instruction for avatar upload page.
 #. TRANS: %s is the maximum file size, for example "500b", "10kB" or "2MB".
-#: actions/avatarsettings.php:78
 #, php-format
 msgid "You can upload your personal avatar. The maximum file size is %s."
 msgstr "You can upload your personal avatar. The maximum file size is %s."
@@ -1573,17 +1225,12 @@ msgstr "You can upload your personal avatar. The maximum file size is %s."
 #. TRANS: Server error displayed coming across a request from a user without a profile.
 #. TRANS: Server error displayed when trying to authorise a remote subscription request
 #. TRANS: while the user has no profile.
-#: actions/avatarsettings.php:108 actions/avatarsettings.php:192
-#: actions/grouplogo.php:184 actions/remotesubscribe.php:190
-#: actions/userauthorization.php:75 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr "User without matching profile."
 
 #. TRANS: Avatar upload page form legend.
 #. TRANS: Avatar upload page crop form legend.
 #. TRANS: Legend for group logo settings fieldset.
-#: actions/avatarsettings.php:122 actions/avatarsettings.php:205
-#: actions/grouplogo.php:261
 msgid "Avatar settings"
 msgstr "Avatar settings"
 
@@ -1591,8 +1238,6 @@ msgstr "Avatar settings"
 #. TRANS: Header on avatar upload crop form for thumbnail of originally uploaded avatar (h2).
 #. TRANS: Uploaded original file in group logo form.
 #. TRANS: Header for originally uploaded file before a crop on the group logo page.
-#: actions/avatarsettings.php:131 actions/avatarsettings.php:214
-#: actions/grouplogo.php:207 actions/grouplogo.php:270
 msgid "Original"
 msgstr "Original"
 
@@ -1600,14 +1245,11 @@ msgstr "Original"
 #. TRANS: Header on avatar upload crop form for thumbnail of to be used rendition of uploaded avatar (h2).
 #. TRANS: Header for preview of to be displayed group logo.
 #. TRANS: Header for the cropped group logo on the group logo page.
-#: actions/avatarsettings.php:147 actions/avatarsettings.php:227
-#: actions/grouplogo.php:219 actions/grouplogo.php:283
 msgid "Preview"
 msgstr "Preview"
 
 #. TRANS: Button on avatar upload page to delete current avatar.
 #. TRANS: Button text for user account deletion.
-#: actions/avatarsettings.php:155 actions/deleteaccount.php:319
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Delete"
@@ -1615,70 +1257,58 @@ msgstr "Delete"
 
 #. TRANS: Button on avatar upload page to upload an avatar.
 #. TRANS: Submit button to confirm upload of a user backup file for account restore.
-#: actions/avatarsettings.php:173 actions/restoreaccount.php:369
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Upload"
 msgstr "Upload"
 
 #. TRANS: Button on avatar upload crop form to confirm a selected crop as avatar.
-#: actions/avatarsettings.php:243
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Crop"
 msgstr "Crop"
 
 #. TRANS: Validation error on avatar upload form when no file was uploaded.
-#: actions/avatarsettings.php:318
 msgid "No file uploaded."
 msgstr "No file uploaded."
 
 #. TRANS: Avatar upload form instruction after uploading a file.
-#: actions/avatarsettings.php:345
 #, fuzzy
 msgid "Pick a square area of the image to be your avatar."
 msgstr "Pick a square area of the image to be your avatar"
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
 #. TRANS: Server error displayed trying to crop an uploaded group logo that is no longer present.
-#: actions/avatarsettings.php:360 actions/grouplogo.php:391
 msgid "Lost our file data."
 msgstr "Lost our file data."
 
 #. TRANS: Success message for having updated a user avatar.
-#: actions/avatarsettings.php:384
 msgid "Avatar updated."
 msgstr "Avatar updated."
 
 #. TRANS: Error displayed on the avatar upload page if the avatar could not be updated for an unknown reason.
-#: actions/avatarsettings.php:388
 msgid "Failed updating avatar."
 msgstr "Failed updating avatar."
 
 #. TRANS: Success message for deleting a user avatar.
-#: actions/avatarsettings.php:412
 msgid "Avatar deleted."
 msgstr "Avatar deleted."
 
 #. TRANS: Title for backup account page.
 #. TRANS: Option in profile settings to create a backup of the account of the currently logged in user.
-#: actions/backupaccount.php:61 actions/profilesettings.php:468
 msgid "Backup account"
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to backup an account while not logged in.
-#: actions/backupaccount.php:79
 #, fuzzy
 msgid "Only logged-in users can backup their account."
 msgstr "Only logged-in users can repeat notices."
 
 #. TRANS: Client exception thrown when trying to backup an account without having backup rights.
-#: actions/backupaccount.php:84
 msgid "You may not backup your account."
 msgstr ""
 
 #. TRANS: Information displayed on the backup account page.
-#: actions/backupaccount.php:227
 msgid ""
 "You can backup your account data in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format. This is an experimental feature and provides "
@@ -1688,31 +1318,26 @@ msgid ""
 msgstr ""
 
 #. TRANS: Submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:250
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Backup"
 msgstr "Background"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:254
 msgid "Backup your account."
 msgstr ""
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
-#: actions/block.php:68
 msgid "You already blocked that user."
 msgstr "You already blocked that user."
 
 #. TRANS: Title for block user page.
 #. TRANS: Legend for block user form.
 #. TRANS: Fieldset legend for block user from group form.
-#: actions/block.php:106 actions/block.php:136 actions/groupblock.php:165
 msgid "Block user"
 msgstr "Block user"
 
 #. TRANS: Explanation of consequences when blocking a user on the block user page.
-#: actions/block.php:139
 msgid ""
 "Are you sure you want to block this user? Afterwards, they will be "
 "unsubscribed from you, unable to subscribe to you in the future, and you "
@@ -1728,15 +1353,11 @@ msgstr ""
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:154 actions/deleteapplication.php:157
-#: actions/deletegroup.php:220 actions/deletenotice.php:155
-#: actions/deleteuser.php:154 actions/groupblock.php:187
 msgctxt "BUTTON"
 msgid "No"
 msgstr "No"
 
 #. TRANS: Submit button title for 'No' when blocking a user.
-#: actions/block.php:158
 #, fuzzy
 msgid "Do not block this user."
 msgstr "Do not block this user"
@@ -1747,50 +1368,40 @@ msgstr "Do not block this user"
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:161 actions/deleteapplication.php:164
-#: actions/deletegroup.php:227 actions/deletenotice.php:162
-#: actions/deleteuser.php:161 actions/groupblock.php:194
 msgctxt "BUTTON"
 msgid "Yes"
 msgstr "Yes"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:165
 #, fuzzy
 msgid "Block this user."
 msgstr "Block this user"
 
 #. TRANS: Server error displayed when blocking a user fails.
-#: actions/block.php:189
 msgid "Failed to save block information."
 msgstr "Failed to save block information."
 
 #. TRANS: Title for first page with list of users blocked from a group.
 #. TRANS: %s is a group nickname.
-#: actions/blockedfromgroup.php:101
 #, php-format
 msgid "%s blocked profiles"
 msgstr "%s blocked profiles"
 
 #. TRANS: Title for any but the first page with list of users blocked from a group.
 #. TRANS: %1$s is a group nickname, %2$d is a page number.
-#: actions/blockedfromgroup.php:106
 #, php-format
 msgid "%1$s blocked profiles, page %2$d"
 msgstr "%1$s blocked profiles, page %2$d"
 
 #. TRANS: Instructions for list of users blocked from a group.
-#: actions/blockedfromgroup.php:122
 msgid "A list of the users blocked from joining this group."
 msgstr "A list of the users blocked from joining this group."
 
 #. TRANS: Form legend for unblocking a user from a group.
-#: actions/blockedfromgroup.php:291
 msgid "Unblock user from group"
 msgstr "Unblock user from group"
 
 #. TRANS: Button text for unblocking a user from a group.
-#: actions/blockedfromgroup.php:323
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Unblock"
@@ -1798,130 +1409,104 @@ msgstr "Unblock"
 
 #. TRANS: Tooltip for button for unblocking a user from a group.
 #. TRANS: Description of the form to unblock a user.
-#: actions/blockedfromgroup.php:327 lib/unblockform.php:78
 msgid "Unblock this user"
 msgstr "Unblock this user"
 
 #. TRANS: Title for mini-posting window loaded from bookmarklet.
 #. TRANS: %s is the StatusNet site name.
-#: actions/bookmarklet.php:51
 #, php-format
 msgid "Post to %s"
 msgstr "Post to %s"
 
 #. TRANS: Client error displayed when not providing a confirmation code in the contact address confirmation action.
-#: actions/confirmaddress.php:74
 msgid "No confirmation code."
 msgstr "No confirmation code."
 
 #. TRANS: Client error displayed when providing a non-existing confirmation code in the contact address confirmation action.
-#: actions/confirmaddress.php:80
 msgid "Confirmation code not found."
 msgstr "Confirmation code not found."
 
 #. TRANS: Client error displayed when not providing a confirmation code for another user in the contact address confirmation action.
-#: actions/confirmaddress.php:86
 msgid "That confirmation code is not for you!"
 msgstr "That confirmation code is not for you!"
 
 #. TRANS: Server error for an unknown address type, which can be 'email', 'sms', or the name of an IM network (such as 'xmpp' or 'aim')
-#: actions/confirmaddress.php:94
-#, fuzzy, php-format
+#, php-format
 msgid "Unrecognized address type %s"
 msgstr "Unrecognized address type %s."
 
 #. TRANS: Client error for an already confirmed email/jabber/sms address.
-#: actions/confirmaddress.php:103 actions/confirmaddress.php:136
 msgid "That address has already been confirmed."
 msgstr "That address has already been confirmed."
 
-#: actions/confirmaddress.php:121 actions/imsettings.php:444
-#: actions/userdesignsettings.php:306
-#, fuzzy
 msgid "Couldn't update user."
 msgstr "Could not update user."
 
-#: actions/confirmaddress.php:144
 #, fuzzy
 msgid "Couldn't update user im preferences."
 msgstr "Couldn't update user record."
 
-#: actions/confirmaddress.php:156
 #, fuzzy
 msgid "Couldn't insert user im preferences."
 msgstr "Couldn't insert new subscription."
 
 #. TRANS: Server error displayed when an address confirmation code deletion from the
 #. TRANS: database fails in the contact address confirmation action.
-#: actions/confirmaddress.php:169
 #, fuzzy
 msgid "Could not delete address confirmation."
 msgstr "Couldn't delete IM confirmation."
 
 #. TRANS: Title for the contact address confirmation action.
-#: actions/confirmaddress.php:185
 msgid "Confirm address"
 msgstr "Confirm address"
 
 #. TRANS: Success message for the contact address confirmation action.
 #. TRANS: %s can be 'email', 'jabber', or 'sms'.
-#: actions/confirmaddress.php:200
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "The address \"%s\" has been confirmed for your account."
 
 #. TRANS: Title for page with a conversion (multiple notices in context).
-#: actions/conversation.php:96
 msgid "Conversation"
 msgstr "Conversation"
 
 #. TRANS: Header on conversation page. Hidden by default (h2).
 #. TRANS: Label for user statistics.
-#: actions/conversation.php:149 lib/noticelist.php:87
-#: lib/profileaction.php:246 lib/searchgroupnav.php:82
-#: lib/threadednoticelist.php:66
 msgid "Notices"
 msgstr "Notices"
 
 #. TRANS: Client exception displayed trying to delete a user account while not logged in.
-#: actions/deleteaccount.php:71
 #, fuzzy
 msgid "Only logged-in users can delete their account."
 msgstr "Only logged-in users can repeat notices."
 
 #. TRANS: Client exception displayed trying to delete a user account without have the rights to do that.
-#: actions/deleteaccount.php:77
 #, fuzzy
 msgid "You cannot delete your account."
 msgstr "You cannot delete users."
 
 #. TRANS: Confirmation text for user deletion. The user has to type this exactly the same, including punctuation.
-#: actions/deleteaccount.php:160 actions/deleteaccount.php:297
 msgid "I am sure."
 msgstr ""
 
 #. TRANS: Notification for user about the text that must be input to be able to delete a user account.
 #. TRANS: %s is the text that needs to be input.
-#: actions/deleteaccount.php:164
 #, php-format
 msgid "You must write \"%s\" exactly in the box."
 msgstr ""
 
 #. TRANS: Confirmation that a user account has been deleted.
-#: actions/deleteaccount.php:206
 #, fuzzy
 msgid "Account deleted."
 msgstr "Avatar deleted."
 
 #. TRANS: Page title for page on which a user account can be deleted.
 #. TRANS: Option in profile settings to delete the account of the currently logged in user.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:476
 #, fuzzy
 msgid "Delete account"
 msgstr "Create an account"
 
 #. TRANS: Form text for user deletion form.
-#: actions/deleteaccount.php:279
 msgid ""
 "This will <strong>permanently delete</strong> your account data from this "
 "server."
@@ -1929,7 +1514,6 @@ msgstr ""
 
 #. TRANS: Additional form text for user deletion form shown if a user has account backup rights.
 #. TRANS: %s is a URL to the backup page.
-#: actions/deleteaccount.php:285
 #, php-format
 msgid ""
 "You are strongly advised to <a href=\"%s\">back up your data</a> before "
@@ -1938,56 +1522,43 @@ msgstr ""
 
 #. TRANS: Field label for delete account confirmation entry.
 #. TRANS: Field label for password reset form where the password has to be typed again.
-#: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:262 actions/register.php:419
 msgid "Confirm"
 msgstr "Confirm"
 
 #. TRANS: Input title for the delete account field.
 #. TRANS: %s is the text that needs to be input.
-#: actions/deleteaccount.php:304
 #, fuzzy, php-format
 msgid "Enter \"%s\" to confirm that you want to delete your account."
 msgstr "You cannot delete users."
 
 #. TRANS: Button title for user account deletion.
-#: actions/deleteaccount.php:323
 #, fuzzy
 msgid "Permanently delete your account"
 msgstr "You cannot delete users."
 
 #. TRANS: Client error displayed trying to delete an application while not logged in.
-#: actions/deleteapplication.php:62
 msgid "You must be logged in to delete an application."
 msgstr "You must be logged in to delete an application."
 
 #. TRANS: Client error displayed trying to delete an application that does not exist.
-#: actions/deleteapplication.php:71
 msgid "Application not found."
 msgstr "Application not found."
 
 #. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
-#: actions/deleteapplication.php:79 actions/editapplication.php:78
-#: actions/showapplication.php:90
 msgid "You are not the owner of this application."
 msgstr "You are not the owner of this application."
 
 #. TRANS: Client error text when there is a problem with the session token.
-#: actions/deleteapplication.php:102 actions/editapplication.php:131
-#: actions/newapplication.php:112 actions/showapplication.php:113
-#: lib/action.php:1391
 msgid "There was a problem with your session token."
 msgstr "There was a problem with your session token."
 
 #. TRANS: Title for delete application page.
 #. TRANS: Fieldset legend on delete application page.
-#: actions/deleteapplication.php:124 actions/deleteapplication.php:149
 msgid "Delete application"
 msgstr "Delete application"
 
 #. TRANS: Confirmation text on delete application page.
-#: actions/deleteapplication.php:152
 msgid ""
 "Are you sure you want to delete this application? This will clear all data "
 "about the application from the database, including all existing user "
@@ -1998,57 +1569,47 @@ msgstr ""
 "connections."
 
 #. TRANS: Submit button title for 'No' when deleting an application.
-#: actions/deleteapplication.php:161
 #, fuzzy
 msgid "Do not delete this application."
 msgstr "Do not delete this application"
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
-#: actions/deleteapplication.php:167
 #, fuzzy
 msgid "Delete this application."
 msgstr "Delete this application"
 
 #. TRANS: Client error when trying to delete group while not logged in.
-#: actions/deletegroup.php:64
 msgid "You must be logged in to delete a group."
 msgstr "You must be logged in to delete a group."
 
 #. TRANS: Client error when trying to delete a group without providing a nickname or ID for the group.
 #. TRANS: Client error displayed when trying to join a group without providing a group name or group ID.
 #. TRANS: Client error displayed when trying to leave a group without providing a group name or group ID.
-#: actions/deletegroup.php:94 actions/joingroup.php:89
-#: actions/leavegroup.php:89
 msgid "No nickname or ID."
 msgstr "No nickname or ID."
 
 #. TRANS: Client error when trying to delete a group without having the rights to delete it.
-#: actions/deletegroup.php:107
 msgid "You are not allowed to delete this group."
 msgstr "You are not allowed to delete this group."
 
 #. TRANS: Server error displayed if a group could not be deleted.
 #. TRANS: %s is the name of the group that could not be deleted.
-#: actions/deletegroup.php:150
 #, php-format
 msgid "Could not delete group %s."
 msgstr "Could not delete group %s."
 
 #. TRANS: Message given after deleting a group.
 #. TRANS: %s is the deleted group's name.
-#: actions/deletegroup.php:159
 #, php-format
 msgid "Deleted group %s"
 msgstr "Deleted group %s"
 
 #. TRANS: Title of delete group page.
 #. TRANS: Form legend for deleting a group.
-#: actions/deletegroup.php:176 actions/deletegroup.php:202
 msgid "Delete group"
 msgstr "Delete group"
 
 #. TRANS: Warning in form for deleleting a group.
-#: actions/deletegroup.php:206
 msgid ""
 "Are you sure you want to delete this group? This will clear all data about "
 "the group from the database, without a backup. Public posts to this group "
@@ -2059,13 +1620,11 @@ msgstr ""
 "will still appear in individual timelines."
 
 #. TRANS: Submit button title for 'No' when deleting a group.
-#: actions/deletegroup.php:224
 #, fuzzy
 msgid "Do not delete this group."
 msgstr "Do not delete this group"
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
-#: actions/deletegroup.php:231
 #, fuzzy
 msgid "Delete this group."
 msgstr "Delete this group"
@@ -2076,22 +1635,18 @@ msgstr "Delete this group"
 #. TRANS: Client error displayed trying to block a user from a group while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying to log out when not logged in.
+#. TRANS: Client error displayed when trying to access the "make admin" page while not logged in.
+#. TRANS: Client error displayed trying to create a new direct message while not logged in.
+#. TRANS: Client error displayed trying to send a notice while not logged in.
+#. TRANS: Client error displayed trying to nudge a user without being logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
 #. TRANS: Client error displayed when trying to change user options while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
-#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:70
-#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
-#: actions/nudge.php:63 actions/pluginenable.php:97 actions/subedit.php:33
-#: actions/subscribe.php:98 actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:71 lib/profileformaction.php:63
-#: lib/settingsaction.php:72
 msgid "Not logged in."
 msgstr "Not logged in."
 
 #. TRANS: Instructions for deleting a notice.
-#: actions/deletenotice.php:110
 msgid ""
 "You are about to permanently delete a notice. Once this is done, it cannot "
 "be undone."
@@ -2101,51 +1656,42 @@ msgstr ""
 
 #. TRANS: Page title when deleting a notice.
 #. TRANS: Fieldset legend for the delete notice form.
-#: actions/deletenotice.php:117 actions/deletenotice.php:148
 msgid "Delete notice"
 msgstr "Delete notice"
 
 #. TRANS: Message for the delete notice form.
-#: actions/deletenotice.php:152
 msgid "Are you sure you want to delete this notice?"
 msgstr "Are you sure you want to delete this notice?"
 
 #. TRANS: Submit button title for 'No' when deleting a notice.
-#: actions/deletenotice.php:159
 #, fuzzy
 msgid "Do not delete this notice."
 msgstr "Do not delete this notice"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:166
 #, fuzzy
 msgid "Delete this notice."
 msgstr "Delete this notice"
 
 #. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
-#: actions/deleteuser.php:66
 msgid "You cannot delete users."
 msgstr "You cannot delete users."
 
 #. TRANS: Client error displayed when trying to delete a non-local user.
-#: actions/deleteuser.php:74
 msgid "You can only delete local users."
 msgstr "You can only delete local users."
 
 #. TRANS: Title of delete user page.
-#: actions/deleteuser.php:110
 #, fuzzy
 msgctxt "TITLE"
 msgid "Delete user"
 msgstr "Delete user"
 
 #. TRANS: Fieldset legend on delete user page.
-#: actions/deleteuser.php:134
 msgid "Delete user"
 msgstr "Delete user"
 
 #. TRANS: Information text to request if a user is certain that the described action has to be performed.
-#: actions/deleteuser.php:138
 msgid ""
 "Are you sure you want to delete this user? This will clear all data about "
 "the user from the database, without a backup."
@@ -2154,99 +1700,80 @@ msgstr ""
 "the user from the database, without a backup."
 
 #. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/deleteuser.php:158
 #, fuzzy
 msgid "Do not delete this user."
 msgstr "Do not delete this group"
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
-#: actions/deleteuser.php:165
 #, fuzzy
 msgid "Delete this user."
 msgstr "Delete this user"
 
 #. TRANS: Message used as title for design settings for the site.
-#: actions/designadminpanel.php:60 lib/settingsnav.php:97
 msgid "Design"
 msgstr "Design"
 
 #. TRANS: Instructions for design adminsitration panel.
-#: actions/designadminpanel.php:71
 msgid "Design settings for this StatusNet site"
 msgstr ""
 
 #. TRANS: Client error displayed when a logo URL does is not valid.
-#: actions/designadminpanel.php:327
 msgid "Invalid logo URL."
 msgstr "Invalid logo URL."
 
 #. TRANS: Client error displayed when an SSL logo URL is invalid.
-#: actions/designadminpanel.php:333
 msgid "Invalid SSL logo URL."
 msgstr "Invalid SSL logo URL."
 
 #. TRANS: Client error displayed when a theme is submitted through the form that is not in the theme list.
 #. TRANS: %s is the chosen unavailable theme.
-#: actions/designadminpanel.php:339
 #, php-format
 msgid "Theme not available: %s."
 msgstr "Theme not available: %s."
 
 #. TRANS: Fieldset legend for form to change logo.
-#: actions/designadminpanel.php:437
 msgid "Change logo"
 msgstr "Change logo"
 
 #. TRANS: Field label for StatusNet site logo.
-#: actions/designadminpanel.php:444
 msgid "Site logo"
 msgstr "Site logo"
 
 #. TRANS: Field label for SSL StatusNet site logo.
-#: actions/designadminpanel.php:452
 msgid "SSL logo"
 msgstr "SSL logo"
 
 #. TRANS: Fieldset legend for form change StatusNet site's theme.
-#: actions/designadminpanel.php:467
 msgid "Change theme"
 msgstr "Change theme"
 
 #. TRANS: Field label for dropdown to choose site theme.
-#: actions/designadminpanel.php:485
 msgid "Site theme"
 msgstr "Site theme"
 
 #. TRANS: Title for field label for dropdown to choose site theme.
-#: actions/designadminpanel.php:487
 msgid "Theme for the site."
 msgstr "Theme for the site."
 
 #. TRANS: Field label for uploading a cutom theme.
-#: actions/designadminpanel.php:494
 msgid "Custom theme"
 msgstr "Custom theme"
 
 #. TRANS: Form instructions for uploading a cutom StatusNet theme.
-#: actions/designadminpanel.php:499
 msgid "You can upload a custom StatusNet theme as a .ZIP archive."
 msgstr ""
 
 #. TRANS: Fieldset legend for theme background image.
-#: actions/designadminpanel.php:515
 msgid "Change background image"
 msgstr "Change background image"
 
 #. TRANS: Field label for background image on theme designer page.
 #. TRANS: Field label for background color selector.
 #. TRANS: Label on profile design page for setting a profile page background colour.
-#: actions/designadminpanel.php:525 actions/designadminpanel.php:609
-#: lib/designform.php:238
 msgid "Background"
 msgstr "Background"
 
 #. TRANS: Form guide for background image upload form on theme designer page.
-#: actions/designadminpanel.php:531
 #, php-format
 msgid ""
 "You can upload a background image for the site. The maximum file size is %1"
@@ -2256,204 +1783,169 @@ msgstr ""
 "$s."
 
 #. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:558
 msgid "On"
 msgstr "On"
 
 #. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:575
 msgid "Off"
 msgstr "Off"
 
 #. TRANS: Form guide for turning background image on or off on theme designer page.
 #. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
 #. TRANS: use of the uploaded profile image.
-#: actions/designadminpanel.php:577 lib/designform.php:214
 msgid "Turn background image on or off."
 msgstr "Turn background image on or off."
 
 #. TRANS: Checkbox label to title background image on theme designer page.
 #. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-#: actions/designadminpanel.php:583 lib/designform.php:220
 msgid "Tile background image"
 msgstr "Tile background image"
 
 #. TRANS: Fieldset legend for theme colors.
-#: actions/designadminpanel.php:598
 #, fuzzy
 msgid "Change colors"
 msgstr "Change colours"
 
 #. TRANS: Field label for content color selector.
 #. TRANS: Label on profile design page for setting a profile page content colour.
-#: actions/designadminpanel.php:623 lib/designform.php:252
 msgid "Content"
 msgstr "Content"
 
 #. TRANS: Field label for sidebar color selector.
 #. TRANS: Label on profile design page for setting a profile page sidebar colour.
-#: actions/designadminpanel.php:637 lib/designform.php:266
 msgid "Sidebar"
 msgstr "Sidebar"
 
 #. TRANS: Field label for text color selector.
 #. TRANS: Label on profile design page for setting a profile page text colour.
-#: actions/designadminpanel.php:651 lib/designform.php:280
 msgid "Text"
 msgstr "Text"
 
 #. TRANS: Field label for link color selector.
 #. TRANS: Label on profile design page for setting a profile page links colour.
-#: actions/designadminpanel.php:665 lib/designform.php:294
 msgid "Links"
 msgstr "Links"
 
 #. TRANS: Fieldset legend for advanced theme design settings.
-#: actions/designadminpanel.php:691
 msgid "Advanced"
 msgstr ""
 
 #. TRANS: Field label for custom CSS.
-#: actions/designadminpanel.php:696
 msgid "Custom CSS"
 msgstr ""
 
 #. TRANS: Button text for resetting theme settings.
-#: actions/designadminpanel.php:718
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Use defaults"
 msgstr "Use defaults"
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:720
 #, fuzzy
 msgid "Restore default designs."
 msgstr "Restore default designs"
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:728
 #, fuzzy
 msgid "Reset back to default."
 msgstr "Reset back to default"
 
 #. TRANS: Title for button for saving theme settings.
-#: actions/designadminpanel.php:736
 #, fuzzy
 msgid "Save design."
 msgstr "Save design"
 
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
-#: actions/disfavor.php:83
 msgid "This notice is not a favorite!"
 msgstr "This notice is not a favourite!"
 
 #. TRANS: Title for page on which favorites can be added.
-#: actions/disfavor.php:98
 msgid "Add to favorites"
 msgstr "Add to favourites"
 
 #. TRANS: Client exception thrown when requesting a document from the documentation that does not exist.
 #. TRANS: %s is the non-existing document.
-#: actions/doc.php:155
 #, fuzzy, php-format
 msgid "No such document \"%s\"."
 msgstr "No such document \"%s\""
 
 #. TRANS: Title for "Edit application" form.
 #. TRANS: Form legend.
-#: actions/editapplication.php:54 lib/applicationeditform.php:129
 msgid "Edit application"
 msgstr "Edit application"
 
 #. TRANS: Client error displayed trying to edit an application while not logged in.
-#: actions/editapplication.php:66
 msgid "You must be logged in to edit an application."
 msgstr "You must be logged in to edit an application."
 
 #. TRANS: Client error displayed trying to edit an application that does not exist.
-#: actions/editapplication.php:83 actions/showapplication.php:83
 msgid "No such application."
 msgstr "No such application."
 
 #. TRANS: Instructions for "Edit application" form.
-#: actions/editapplication.php:167
 msgid "Use this form to edit your application."
 msgstr "Use this form to edit your application."
 
 #. TRANS: Validation error shown when not providing a name in the "Edit application" form.
 #. TRANS: Validation error shown when not providing a name in the "New application" form.
-#: actions/editapplication.php:184 actions/newapplication.php:164
 msgid "Name is required."
 msgstr "Name is required."
 
 #. 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.
-#: actions/editapplication.php:188 actions/newapplication.php:172
 #, fuzzy
 msgid "Name is too long (maximum 255 characters)."
 msgstr "Name is too long (max 255 chars)."
 
 #. TRANS: Validation error shown when providing a name for an application that already exists in the "Edit application" form.
 #. TRANS: Validation error shown when providing a name for an application that already exists in the "New application" form.
-#: actions/editapplication.php:192 actions/newapplication.php:168
 msgid "Name already in use. Try another one."
 msgstr "Name already in use. Try another one."
 
 #. TRANS: Validation error shown when not providing a description in the "Edit application" form.
 #. TRANS: Validation error shown when not providing a description in the "New application" form.
-#: actions/editapplication.php:196 actions/newapplication.php:176
 msgid "Description is required."
 msgstr "Description is required."
 
 #. TRANS: Validation error shown when providing too long a source URL in the "Edit application" form.
-#: actions/editapplication.php:209
 msgid "Source URL is too long."
 msgstr "Source URL is too long."
 
 #. TRANS: Validation error shown when providing an invalid source URL in the "Edit application" form.
 #. TRANS: Validation error shown when providing an invalid source URL in the "New application" form.
-#: actions/editapplication.php:216 actions/newapplication.php:199
 msgid "Source URL is not valid."
 msgstr "Source URL is not valid."
 
 #. 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.
-#: actions/editapplication.php:220 actions/newapplication.php:203
 msgid "Organization is required."
 msgstr "Organisation is required."
 
 #. TRANS: Validation error shown when providing too long an arganisation name in the "Edit application" form.
-#: actions/editapplication.php:224 actions/newapplication.php:207
 #, fuzzy
 msgid "Organization is too long (maximum 255 characters)."
 msgstr "Organisation is too long (max 255 chars)."
 
 #. TRANS: Form validation error show when an organisation name has not been provided in the edit application form.
 #. TRANS: Form validation error show when an organisation name has not been provided in the new application form.
-#: actions/editapplication.php:228 actions/newapplication.php:211
 msgid "Organization homepage is required."
 msgstr "Organisation homepage is required."
 
 #. TRANS: Validation error shown when providing too long a callback URL in the "Edit application" form.
 #. TRANS: Validation error shown when providing too long a callback URL in the "New application" form.
-#: actions/editapplication.php:239 actions/newapplication.php:225
 msgid "Callback is too long."
 msgstr "Callback is too long."
 
 #. TRANS: Validation error shown when providing an invalid callback URL in the "Edit application" form.
 #. TRANS: Validation error shown when providing an invalid callback URL in the "New application" form.
-#: actions/editapplication.php:247 actions/newapplication.php:235
 msgid "Callback URL is not valid."
 msgstr "Callback URL is not valid."
 
 #. TRANS: Server error occuring when an application could not be updated from the "Edit application" form.
-#: actions/editapplication.php:284
 msgid "Could not update application."
 msgstr "Could not update application."
 
 #. TRANS: Title for form to edit a group. %s is a group nickname.
-#: actions/editgroup.php:55
 #, php-format
 msgid "Edit %s group"
 msgstr "Edit %s group"
@@ -2461,40 +1953,40 @@ msgstr "Edit %s group"
 #. TRANS: Client error displayed trying to edit a group while not logged in.
 #. TRANS: Client error displayed when trying to create a group while not logged in.
 #. TRANS: Client error displayed trying to create a group while not logged in.
-#: actions/editgroup.php:68 actions/grouplogo.php:69 actions/newgroup.php:65
 msgid "You must be logged in to create a group."
 msgstr "You must be logged in to create a group."
 
 #. TRANS: Form instructions for group edit form.
-#: actions/editgroup.php:161
 msgid "Use this form to edit the group."
 msgstr "Use this form to edit the group."
 
+#. TRANS: Group edit form validation error.
+#. TRANS: Group create form validation error.
+#. TRANS: %s is the invalid alias.
+#, php-format
+msgid "Invalid alias: \"%s\""
+msgstr "Invalid alias: \"%s\""
+
 #. TRANS: Group edit form success message.
-#: actions/editgroup.php:301
 msgid "Options saved."
 msgstr "Options saved."
 
 #. TRANS: Title for e-mail settings.
-#: actions/emailsettings.php:60
 msgid "Email settings"
 msgstr "E-mail settings"
 
 #. TRANS: E-mail settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/emailsettings.php:74
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 msgstr "Manage how you get e-mail from %%site.name%%."
 
 #. TRANS: Form legend for e-mail settings form.
 #. TRANS: Field label for e-mail address input in e-mail settings form.
-#: actions/emailsettings.php:104 actions/emailsettings.php:130
 msgid "Email address"
 msgstr "E-mail address"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:110
 msgid "Current confirmed email address."
 msgstr "Current confirmed e-mail address."
 
@@ -2503,15 +1995,11 @@ msgstr "Current confirmed e-mail address."
 #. TRANS: Button label to remove a confirmed IM address.
 #. TRANS: Button label to remove a confirmed SMS address.
 #. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
-#: actions/emailsettings.php:113 actions/emailsettings.php:180
-#: actions/imsettings.php:119 actions/smssettings.php:119
-#: actions/smssettings.php:175
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Remove"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:120
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -2524,44 +2012,36 @@ msgstr ""
 #. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
 #. TRANS: Any other domain may be owned by a legitimate person or
 #. TRANS: organization.
-#: actions/emailsettings.php:137
 msgid "Email address, like \"UserName@example.org\""
 msgstr "E-mail address, like \"UserName@example.org\""
 
 #. TRANS: Button label for adding an e-mail address in e-mail settings form.
 #. TRANS: Button label for adding an IM address in IM settings form.
 #. TRANS: Button label for adding a SMS phone number in SMS settings form.
-#: actions/emailsettings.php:141 actions/imsettings.php:147
-#: actions/smssettings.php:157
 msgctxt "BUTTON"
 msgid "Add"
 msgstr "Add"
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:149 actions/smssettings.php:166
 msgid "Incoming email"
 msgstr "Incoming e-mail"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:155
 msgid "I want to post notices by email."
 msgstr "I want to post notices by e-mail."
 
 #. TRANS: Form instructions for incoming e-mail form in e-mail settings.
 #. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
-#: actions/emailsettings.php:177 actions/smssettings.php:173
 msgid "Send email to this address to post new notices."
 msgstr "Send e-mail to this address to post new notices."
 
 #. TRANS: Instructions for incoming e-mail address input form, when an address has already been assigned.
 #. TRANS: Instructions for incoming SMS e-mail address input form.
-#: actions/emailsettings.php:186 actions/smssettings.php:181
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr "Make a new e-mail address for posting to - cancels the old one."
 
 #. TRANS: Instructions for incoming e-mail address input form.
-#: actions/emailsettings.php:190
 msgid ""
 "To send notices via email, we need to create a unique email address for you "
 "on this server:"
@@ -2569,89 +2049,71 @@ msgstr ""
 
 #. TRANS: Button label for adding an e-mail address to send notices from.
 #. TRANS: Button label for adding an SMS e-mail address to send notices from.
-#: actions/emailsettings.php:196 actions/smssettings.php:184
 msgctxt "BUTTON"
 msgid "New"
 msgstr "New"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:205
 msgid "Email preferences"
 msgstr "Email preferences"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:213
 msgid "Send me notices of new subscriptions through email."
 msgstr "Send me notices of new subscriptions through e-mail."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:219
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr "Send me e-mail when someone adds my notice as a favourite."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:226
 msgid "Send me email when someone sends me a private message."
 msgstr "Send me e-mail when someone sends me a private message."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:232
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr "Send me e-mail when someone sends me an \"@-reply\"."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:238
 msgid "Allow friends to nudge me and send me an email."
 msgstr "Allow friends to nudge me and send me an e-mail."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:244
 msgid "Publish a MicroID for my email address."
 msgstr "Publish a MicroID for my e-mail address."
 
 #. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:362
 msgid "Email preferences saved."
 msgstr "E-mail preferences saved."
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:381
 msgid "No email address."
 msgstr "No e-mail address."
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:389
 #, fuzzy
 msgid "Cannot normalize that email address."
 msgstr "Cannot normalise that e-mail address"
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:394 actions/register.php:197
-#: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "Not a valid e-mail address."
 
 #. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:398
 msgid "That is already your email address."
 msgstr "That is already your e-mail address."
 
 #. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:402
 msgid "That email address already belongs to another user."
 msgstr "That e-mail address already belongs to another user."
 
 #. TRANS: Server error thrown on database error adding e-mail confirmation code.
 #. TRANS: Server error thrown on database error adding Instant Messaging confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:419 actions/imsettings.php:362
-#: actions/smssettings.php:364
 #, fuzzy
 msgid "Could not insert confirmation code."
 msgstr "Couldn't insert confirmation code."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:426
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
@@ -2662,103 +2124,83 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling Instant Messaging address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:446 actions/imsettings.php:391
-#: actions/smssettings.php:398
 msgid "No pending confirmation to cancel."
 msgstr "No pending confirmation to cancel."
 
 #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:451
 msgid "That is the wrong email address."
 msgstr "That is the wrong e-mail address."
 
 #. TRANS: Server error thrown on database error canceling e-mail address confirmation.
 #. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
-#: actions/emailsettings.php:460 actions/smssettings.php:412
 #, fuzzy
 msgid "Could not delete email confirmation."
 msgstr "Couldn't delete email confirmation."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:465
 msgid "Email confirmation cancelled."
 msgstr "E-mail confirmation cancelled."
 
 #. TRANS: Message given trying to remove an e-mail address that is not
 #. TRANS: registered for the active user.
-#: actions/emailsettings.php:484
 msgid "That is not your email address."
 msgstr "That is not your e-mail address."
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:505
 msgid "The email address was removed."
 msgstr "The email address was removed."
 
 #. TRANS: Form validation error displayed when trying to remove an incoming e-mail address while no address has been set.
-#: actions/emailsettings.php:519 actions/smssettings.php:554
 msgid "No incoming email address."
 msgstr "No incoming e-mail address."
 
 #. 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.
-#: actions/emailsettings.php:531 actions/emailsettings.php:555
-#: actions/smssettings.php:565 actions/smssettings.php:590
 #, fuzzy
 msgid "Could not update user record."
 msgstr "Couldn't update user record."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
 #. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:535 actions/smssettings.php:569
 msgid "Incoming email address removed."
 msgstr "Incoming e-mail address removed."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
 #. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:559 actions/smssettings.php:594
 msgid "New incoming email address added."
 msgstr "New incoming e-mail address added."
 
 #. TRANS: Client error displayed when trying to mark a notice as favorite that already is a favorite.
-#: actions/favor.php:80
 msgid "This notice is already a favorite!"
 msgstr "This notice is already a favourite!"
 
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
-#: actions/favor.php:95
 #, fuzzy
 msgid "Disfavor favorite."
 msgstr "Disfavor favourite"
 
 #. TRANS: Page title for first page of favorited notices.
 #. TRANS: Title for favourited notices section.
-#: actions/favorited.php:65 lib/popularnoticesection.php:62
-#: lib/publicgroupnav.php:93
 msgid "Popular notices"
 msgstr "Popular notices"
 
 #. TRANS: Page title for all but first page of favorited notices.
 #. TRANS: %d is the page number being displayed.
-#: actions/favorited.php:69
 #, php-format
 msgid "Popular notices, page %d"
 msgstr "Popular notices, page %d"
 
 #. TRANS: Description on page displaying favorited notices.
-#: actions/favorited.php:81
 msgid "The most popular notices on the site right now."
 msgstr "The most popular notices on the site right now."
 
 #. TRANS: Text displayed instead of a list when a site does not yet have any favourited notices.
-#: actions/favorited.php:149
 msgid "Favorite notices appear on this page but no one has favorited one yet."
 msgstr ""
 "Favourite notices appear on this page but no one has favourited one yet"
 
 #. TRANS: Additional text displayed instead of a list when a site does not yet have any favourited notices for logged in users.
-#: actions/favorited.php:153
 msgid ""
 "Be the first to add a notice to your favorites by clicking the fave button "
 "next to any notice you like."
@@ -2768,7 +2210,6 @@ msgstr ""
 
 #. TRANS: Additional text displayed instead of a list when a site does not yet have any favourited notices for not logged in users.
 #. TRANS: %%action.register%% is a registration link. "[link text](link)" is Mark Down. Do not change the formatting.
-#: actions/favorited.php:158
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to add a "
@@ -2781,181 +2222,146 @@ msgstr ""
 #. TRANS: %s is a user's nickname.
 #. TRANS: Title for first page of favourite notices of a user.
 #. TRANS: %s is the user for whom the favourite notices are displayed.
-#: actions/favoritesrss.php:111 actions/showfavorites.php:76
-#: lib/personalgroupnav.php:110
 #, php-format
 msgid "%s's favorite notices"
 msgstr "%s's favourite notices"
 
 #. TRANS: Desciption of RSS feed with favourite notices of a user.
 #. TRANS: %1$s is a user's nickname, %2$s is the name of the StatusNet site.
-#: actions/favoritesrss.php:117
 #, php-format
 msgid "Updates favored by %1$s on %2$s!"
 msgstr "Updates favoured by %1$s on %2$s!"
 
 #. TRANS: Page title for first page of featured users.
 #. TRANS: Title for featured users section.
-#: actions/featured.php:69 lib/featureduserssection.php:87
-#: lib/publicgroupnav.php:89
 msgid "Featured users"
 msgstr "Featured users"
 
 #. TRANS: Page title for all but first page of featured users.
 #. TRANS: %d is the page number being displayed.
-#: actions/featured.php:73
 #, php-format
 msgid "Featured users, page %d"
 msgstr "Featured users, page %d"
 
 #. TRANS: Description on page displaying featured users.
-#: actions/featured.php:102
 #, fuzzy, php-format
 msgid "A selection of some great users on %s."
 msgstr "A selection of some great users on %s"
 
 #. TRANS: Client error displayed when no notice ID was given trying do display a file.
-#: actions/file.php:36
 msgid "No notice ID."
 msgstr "No notice ID."
 
 #. TRANS: Client error displayed when an invalid notice ID was given trying do display a file.
-#: actions/file.php:41
 msgid "No notice."
 msgstr "No notice."
 
 #. TRANS: Client error displayed when trying do display a file for a notice without a file attachement.
-#: actions/file.php:46
 msgid "No attachments."
 msgstr "No attachments."
 
 #. TRANS: Client error displayed when trying do display a file for a notice with file attachements
 #. TRANS: that could not be found.
-#: actions/file.php:58
 msgid "No uploaded attachments."
 msgstr "No uploaded attachments."
 
 #. TRANS: Client error displayed when subscribing to a remote profile and an unexpected response is received.
-#: actions/finishremotesubscribe.php:69
 msgid "Not expecting this response!"
 msgstr "Not expecting this response!"
 
 #. TRANS: Client error displayed when subscribing to a remote profile that does not exist.
-#: actions/finishremotesubscribe.php:81
 msgid "User being listened to does not exist."
 msgstr "User being listened to does not exist."
 
 #. TRANS: Client error displayed when subscribing to a remote profile that is a local profile.
-#: actions/finishremotesubscribe.php:89 actions/remotesubscribe.php:58
 msgid "You can use the local subscription!"
 msgstr "You can use the local subscription!"
 
 #. TRANS: Client error displayed when subscribing to a remote profile that is blocked form subscribing to.
-#: actions/finishremotesubscribe.php:102
 msgid "That user has blocked you from subscribing."
 msgstr "That user has blocked you from subscribing."
 
 #. TRANS: Client error displayed when subscribing to a remote profile without providing an authorised token.
-#: actions/finishremotesubscribe.php:114
 msgid "You are not authorized."
 msgstr "You are not authorised."
 
 #. TRANS: Client error displayed when subscribing to a remote profile and conversion of the request token to access token fails.
-#: actions/finishremotesubscribe.php:118
 msgid "Could not convert request token to access token."
 msgstr "Could not convert request token to access token."
 
 #. TRANS: Client error displayed when subscribing to a remote profile fails because of an unsupported version of the OMB protocol.
-#: actions/finishremotesubscribe.php:124
 msgid "Remote service uses unknown version of OMB protocol."
 msgstr "Remote service uses unknown version of OMB protocol."
 
 #. TRANS: Server error displayed when subscribing to a remote profile fails because the remote profile could not be updated.
-#: actions/finishremotesubscribe.php:145 lib/oauthstore.php:317
 msgid "Error updating remote profile."
 msgstr "Error updating remote profile."
 
 #. TRANS: Client error displayed when requesting a non-existent file.
-#: actions/getfile.php:77
 msgid "No such file."
 msgstr "No such file."
 
 #. TRANS: Client error displayed when requesting a file without having read access to it.
-#: actions/getfile.php:82
 msgid "Cannot read file."
 msgstr "Cannot read file."
 
 #. TRANS: Client error displayed when trying to assign an invalid role to a user.
-#: actions/grantrole.php:61 actions/revokerole.php:62
 msgid "Invalid role."
 msgstr "Invalid role."
 
 #. TRANS: Client error displayed when trying to assign an reserved role to a user.
-#: actions/grantrole.php:66 actions/revokerole.php:66
 msgid "This role is reserved and cannot be set."
 msgstr "This role is reserved and cannot be set."
 
 #. TRANS: Client error displayed when trying to assign a role to a user while not being allowed to set roles.
-#: actions/grantrole.php:76
 msgid "You cannot grant user roles on this site."
 msgstr "You cannot grant user roles on this site."
 
 #. TRANS: Client error displayed when trying to assign a role to a user that already has that role.
-#: actions/grantrole.php:84
 msgid "User already has this role."
 msgstr "User already has this role."
 
 #. TRANS: Client error displayed trying to block a user from a group while not specifying a to be blocked user profile.
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing a profile.
+#. TRANS: Client error displayed when not providing a profile ID on the Make Admin page.
 #. TRANS: Client error displayed trying a change a subscription without providing a profile.
 #. TRANS: Client error displayed when trying to change user options without specifying a user to work on.
-#: actions/groupblock.php:71 actions/groupunblock.php:71
-#: actions/makeadmin.php:71 actions/subedit.php:49
-#: lib/profileformaction.php:79
 msgid "No profile specified."
 msgstr "No profile specified."
 
 #. TRANS: Client error displayed trying to block a user from a group while specifying a non-existing profile.
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing an existing profile.
+#. TRANS: Client error displayed when specifying an invalid profile ID on the Make Admin page.
 #. TRANS: Client error displayed trying a change a subscription for a non-existant profile ID.
 #. TRANS: Client error displayed when trying to change user options without specifying an existing user to work on.
-#: actions/groupblock.php:77 actions/groupunblock.php:77
-#: actions/makeadmin.php:76 actions/subedit.php:57 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:87
 msgid "No profile with that ID."
 msgstr "No profile with that ID."
 
 #. TRANS: Client error displayed trying to block a user from a group while not specifying a group to block a profile from.
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing a group.
-#: actions/groupblock.php:83 actions/groupunblock.php:83
-#: actions/makeadmin.php:81
+#. TRANS: Client error displayed when not providing a group ID on the Make Admin page.
 msgid "No group specified."
 msgstr "No group specified."
 
 #. TRANS: Client error displayed trying to block a user from a group while not being an admin user.
-#: actions/groupblock.php:95
 msgid "Only an admin can block group members."
 msgstr "Only an admin can block group members."
 
 #. TRANS: Client error displayed trying to block a user from a group while user is already blocked from the given group.
-#: actions/groupblock.php:100
 msgid "User is already blocked from group."
 msgstr "User is already blocked from group."
 
 #. TRANS: Client error displayed trying to block a user from a group while user is not a member of given group.
-#: actions/groupblock.php:106
 msgid "User is not a member of group."
 msgstr "User is not a member of group."
 
 #. TRANS: Title for block user from group page.
 #. TRANS: Form legend for form to block user from a group.
-#: actions/groupblock.php:141 actions/groupmembers.php:364
 msgid "Block user from group"
 msgstr "Block user from group"
 
 #. TRANS: Explanatory text for block user from group form before setting the block.
 #. TRANS: %1$s is that to be blocked user, %2$s is the group the user will be blocked from.
-#: actions/groupblock.php:169
 #, php-format
 msgid ""
 "Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They "
@@ -2967,40 +2373,33 @@ msgstr ""
 "the group in the future."
 
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
-#: actions/groupblock.php:191
 #, fuzzy
 msgid "Do not block this user from this group."
 msgstr "Do not block this user from this group"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
-#: actions/groupblock.php:198
 #, fuzzy
 msgid "Block this user from this group."
 msgstr "Block this user from this group"
 
 #. TRANS: Server error displayed when trying to block a user from a group fails because of an application error.
-#: actions/groupblock.php:215
 msgid "Database error blocking user from group."
 msgstr "Database error blocking user from group."
 
 #. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
 #. TRANS: Client error displayed trying to find a user by ID without providing an ID.
-#: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr "No ID."
 
 #. TRANS: Client error displayed trying to change group design settings while not logged in.
-#: actions/groupdesignsettings.php:67
 msgid "You must be logged in to edit a group."
 msgstr "You must be logged in to edit a group."
 
 #. TRANS: Title group design settings page.
-#: actions/groupdesignsettings.php:146
 msgid "Group design"
 msgstr "Group design"
 
 #. TRANS: Instructions for group design settings page.
-#: actions/groupdesignsettings.php:157
 msgid ""
 "Customize the way your group looks with a background image and a colour "
 "palette of your choice."
@@ -3009,25 +2408,21 @@ msgstr ""
 "palette of your choice."
 
 #. TRANS: Form validation error displayed when group design settings could not be updated because of an application issue.
-#: actions/groupdesignsettings.php:262
 #, fuzzy
 msgid "Unable to update your design settings."
 msgstr "Unable to save your design settings."
 
 #. TRANS: Form text to confirm saved group design settings.
-#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:239
 msgid "Design preferences saved."
 msgstr "Design preferences saved."
 
 #. TRANS: Title for group logo settings page.
 #. TRANS: Group logo form legend.
-#: actions/grouplogo.php:144 actions/grouplogo.php:199
 msgid "Group logo"
 msgstr "Group logo"
 
 #. TRANS: Instructions for group logo page.
 #. TRANS: %s is the maximum file size for that site.
-#: actions/grouplogo.php:156
 #, php-format
 msgid ""
 "You can upload a logo image for your group. The maximum file size is %s."
@@ -3035,91 +2430,75 @@ msgstr ""
 "You can upload a logo image for your group. The maximum file size is %s."
 
 #. TRANS: Submit button for uploading a group logo.
-#: actions/grouplogo.php:243
 msgid "Upload"
 msgstr "Upload"
 
 #. TRANS: Button text for cropping an uploaded group logo.
-#: actions/grouplogo.php:299
 msgid "Crop"
 msgstr "Crop"
 
 #. TRANS: Form instructions on the group logo page.
-#: actions/grouplogo.php:376
 msgid "Pick a square area of the image to be the logo."
 msgstr "Pick a square area of the image to be the logo."
 
 #. TRANS: Form success message after updating a group logo.
-#: actions/grouplogo.php:411
 msgid "Logo updated."
 msgstr "Logo updated."
 
 #. TRANS: Form failure message after failing to update a group logo.
-#: actions/grouplogo.php:414
 msgid "Failed updating logo."
 msgstr "Failed updating logo."
 
 #. TRANS: Title of the page showing group members.
 #. TRANS: %s is the name of the group.
-#: actions/groupmembers.php:104
 #, php-format
 msgid "%s group members"
 msgstr "%s group members"
 
 #. TRANS: Title of the page showing group members.
 #. TRANS: %1$s is the name of the group, %2$d is the page number of the members list.
-#: actions/groupmembers.php:109
 #, php-format
 msgid "%1$s group members, page %2$d"
 msgstr "%1$s group members, page %2$d"
 
 #. TRANS: Page notice for group members page.
-#: actions/groupmembers.php:125
 msgid "A list of the users in this group."
 msgstr "A list of the users in this group."
 
 #. TRANS: Indicator in group members list that this user is a group administrator.
-#: actions/groupmembers.php:190 lib/action.php:581
 msgid "Admin"
 msgstr "Admin"
 
 #. TRANS: Button text for the form that will block a user from a group.
-#: actions/groupmembers.php:397
 msgctxt "BUTTON"
 msgid "Block"
 msgstr ""
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:401
 msgctxt "TOOLTIP"
 msgid "Block this user"
 msgstr ""
 
 #. TRANS: Form legend for form to make a user a group admin.
-#: actions/groupmembers.php:488
 msgid "Make user an admin of the group"
 msgstr "Make user an admin of the group"
 
 #. TRANS: Button text for the form that will make a user administrator.
-#: actions/groupmembers.php:521
 msgctxt "BUTTON"
 msgid "Make Admin"
 msgstr ""
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:525
 msgctxt "TOOLTIP"
 msgid "Make this user an admin"
 msgstr ""
 
 #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
-#: actions/grouprss.php:141
 #, php-format
 msgid "Updates from members of %1$s on %2$s!"
 msgstr "Updates from members of %1$s on %2$s!"
 
 #. TRANS: Title for first page of the groups list.
-#: actions/groups.php:62
 #, fuzzy
 msgctxt "TITLE"
 msgid "Groups"
@@ -3127,7 +2506,6 @@ msgstr "Groups"
 
 #. TRANS: Title for all but the first page of the groups list.
 #. TRANS: %d is the page number.
-#: actions/groups.php:66
 #, fuzzy, php-format
 msgctxt "TITLE"
 msgid "Groups, page %d"
@@ -3136,7 +2514,6 @@ msgstr "Groups, page %d"
 #. TRANS: Page notice of group list. %%%%site.name%%%% is the StatusNet site name,
 #. TRANS: %%%%action.groupsearch%%%% and %%%%action.newgroup%%%% are URLs. Do not change them.
 #. TRANS: This message contains Markdown links in the form [link text](link).
-#: actions/groups.php:95
 #, fuzzy, php-format
 msgid ""
 "%%%%site.name%%%% groups let you find and talk with people of similar "
@@ -3152,12 +2529,10 @@ msgstr ""
 "%%%%)"
 
 #. TRANS: Link to create a new group on the group list page.
-#: actions/groups.php:113 actions/usergroups.php:126 lib/groupeditform.php:115
 msgid "Create a new group"
 msgstr "Create a new group"
 
 #. TRANS: Instructions for page where groups can be searched. %%site.name%% is the name of the StatusNet site.
-#: actions/groupsearch.php:53
 #, php-format
 msgid ""
 "Search for groups on %%site.name%% by their name, location, or description. "
@@ -3167,21 +2542,17 @@ msgstr ""
 "Separate the terms by spaces; they must be 3 characters or more."
 
 #. TRANS: Title for page where groups can be searched.
-#: actions/groupsearch.php:60
 msgid "Group search"
 msgstr "Group search"
 
 #. TRANS: Text on page where groups can be searched if no results were found for a query.
 #. TRANS: Text for notice search results is the query had no results.
 #. TRANS: Message on the "People search" page where a query has no results.
-#: actions/groupsearch.php:82 actions/noticesearch.php:122
-#: actions/peoplesearch.php:87
 msgid "No results."
 msgstr "No results."
 
 #. TRANS: Additional text on page where groups can be searched if no results were found for a query for a logged in user.
 #. TRANS: This message contains Markdown links in the form [link text](link).
-#: actions/groupsearch.php:87
 #, fuzzy, php-format
 msgid ""
 "If you cannot find the group you're looking for, you can [create it](%%"
@@ -3192,7 +2563,6 @@ msgstr ""
 
 #. TRANS: Additional text on page where groups can be searched if no results were found for a query for a not logged in user.
 #. TRANS: This message contains Markdown links in the form [link text](link).
-#: actions/groupsearch.php:92
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and [create the group](%%"
@@ -3202,30 +2572,25 @@ msgstr ""
 "action.newgroup%%) yourself!"
 
 #. TRANS: Client error displayed when trying to unblock a user from a group without being an administrator for the group.
-#: actions/groupunblock.php:95
 msgid "Only an admin can unblock group members."
 msgstr "Only an admin can unblock group members."
 
 #. TRANS: Client error displayed when trying to unblock a non-blocked user from a group.
-#: actions/groupunblock.php:100
 msgid "User is not blocked from group."
 msgstr "User is not blocked from group."
 
 #. TRANS: Server error displayed when unblocking a user from a group fails because of an unknown error.
 #. TRANS: Server error displayed when removing a user block.
-#: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "Error removing the block."
 
 #. TRANS: Title for Instant Messaging settings.
-#: actions/imsettings.php:56
 msgid "IM settings"
 msgstr "IM settings"
 
 #. 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.
-#: actions/imsettings.php:69
 #, fuzzy, php-format
 msgid ""
 "You can send and receive notices through instant messaging [instant messages]"
@@ -3235,18 +2600,15 @@ msgstr ""
 "doc.im%%). Configure your address and settings below."
 
 #. TRANS: Message given in the IM settings if IM is not enabled on the site.
-#: actions/imsettings.php:90
 msgid "IM is not available."
 msgstr "IM is not available."
 
-#: actions/imsettings.php:116
 #, fuzzy, php-format
 msgid "Current confirmed %s address."
 msgstr "Current confirmed e-mail address."
 
 #. TRANS: Form note in IM settings form.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:128
 #, fuzzy, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your %s account for a message "
@@ -3255,89 +2617,74 @@ msgstr ""
 "Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
 "message with further instructions. (Did you add %s to your buddy list?)"
 
-#: actions/imsettings.php:140
 msgid "IM address"
 msgstr "IM address"
 
-#: actions/imsettings.php:142
 #, php-format
 msgid "%s screenname."
 msgstr ""
 
 #. TRANS: Header for IM preferences form.
-#: actions/imsettings.php:163
 #, fuzzy
 msgid "IM Preferences"
 msgstr "IM preferences"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:174
 #, fuzzy
 msgid "Send me notices"
 msgstr "Send a notice"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:176
 #, fuzzy
 msgid "Post a notice when my status changes."
 msgstr "Post a notice when my Jabber/GTalk status changes."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:178
 #, fuzzy
 msgid "Send me replies from people I'm not subscribed to."
 msgstr ""
 "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:181
 #, fuzzy
 msgid "Publish a MicroID"
 msgstr "Publish a MicroID for my e-mail address."
 
 #. TRANS: Server error thrown on database error updating IM preferences.
-#: actions/imsettings.php:291
 #, fuzzy
 msgid "Couldn't update IM preferences."
 msgstr "Could not update user."
 
 #. TRANS: Confirmation message for successful IM preferences save.
 #. TRANS: Confirmation message after saving preferences.
-#: actions/imsettings.php:298 actions/urlsettings.php:244
 msgid "Preferences saved."
 msgstr "Preferences saved."
 
 #. TRANS: Message given saving IM address without having provided one.
-#: actions/imsettings.php:320
 #, fuzzy
 msgid "No screenname."
 msgstr "No nickname."
 
-#: actions/imsettings.php:325
 #, fuzzy
 msgid "No transport."
 msgstr "No notice."
 
 #. TRANS: Message given saving IM address that cannot be normalised.
-#: actions/imsettings.php:333
 #, fuzzy
 msgid "Cannot normalize that screenname"
 msgstr "Cannot normalize that Jabber ID"
 
 #. TRANS: Message given saving IM address that not valid.
-#: actions/imsettings.php:340
 #, fuzzy
 msgid "Not a valid screenname"
 msgstr "Not a valid nickname."
 
 #. TRANS: Message given saving IM address that is already set for another user.
-#: actions/imsettings.php:344
 #, fuzzy
 msgid "Screenname already belongs to another user."
 msgstr "Jabber ID already belongs to another user."
 
 #. TRANS: Message given saving valid IM address that is to be confirmed.
-#: actions/imsettings.php:369
 #, fuzzy
 msgid "A confirmation code was sent to the IM address you added."
 msgstr ""
@@ -3345,85 +2692,71 @@ msgstr ""
 "s for sending messages to you."
 
 #. TRANS: Message given canceling IM address confirmation for the wrong IM address.
-#: actions/imsettings.php:396
 msgid "That is the wrong IM address."
 msgstr "That is the wrong IM address."
 
 #. TRANS: Server error thrown on database error canceling IM address confirmation.
-#: actions/imsettings.php:405
 #, fuzzy
 msgid "Couldn't delete confirmation."
 msgstr "Couldn't delete IM confirmation."
 
 #. TRANS: Message given after successfully canceling IM address confirmation.
-#: actions/imsettings.php:410
 msgid "IM confirmation cancelled."
 msgstr "IM confirmation cancelled."
 
 #. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.
-#: actions/imsettings.php:434
 #, fuzzy
 msgid "That is not your screenname."
 msgstr "That is not your phone number."
 
 #. TRANS: Server error thrown on database error removing a registered IM address.
-#: actions/imsettings.php:443
 #, fuzzy
 msgid "Couldn't update user im prefs."
 msgstr "Couldn't update user record."
 
 #. TRANS: Message given after successfully removing a registered Instant Messaging address.
-#: actions/imsettings.php:451
 msgid "The IM address was removed."
 msgstr "The IM address was removed."
 
 #. TRANS: Title for all but the first page of the inbox page.
 #. TRANS: %1$s is the user's nickname, %2$s is the page number.
-#: actions/inbox.php:59
 #, php-format
 msgid "Inbox for %1$s - page %2$d"
 msgstr "Inbox for %1$s - page %2$d"
 
 #. TRANS: Title for the first page of the inbox page.
 #. TRANS: %s is the user's nickname.
-#: actions/inbox.php:64
 #, php-format
 msgid "Inbox for %s"
 msgstr "Inbox for %s"
 
 #. TRANS: Instructions for user inbox page.
-#: actions/inbox.php:106
 msgid "This is your inbox, which lists your incoming private messages."
 msgstr "This is your inbox, which lists your incoming private messages."
 
 #. TRANS: Client error displayed when trying to sent invites while they have been disabled.
-#: actions/invite.php:41
 msgid "Invites have been disabled."
 msgstr "Invites have been disabled."
 
 #. TRANS: Client error displayed when trying to sent invites while not logged in.
 #. TRANS: %s is the StatusNet site name.
-#: actions/invite.php:45
 #, php-format
 msgid "You must be logged in to invite other users to use %s."
 msgstr "You must be logged in to invite other users to use %s."
 
 #. TRANS: Form validation message when providing an e-mail address that does not validate.
 #. TRANS: %s is an invalid e-mail address.
-#: actions/invite.php:78
 #, fuzzy, php-format
 msgid "Invalid email address: %s."
 msgstr "Invalid e-mail address: %s"
 
 #. TRANS: Page title when invitations have been sent.
-#: actions/invite.php:117
 #, fuzzy
 msgid "Invitations sent"
 msgstr "Invitation(s) sent"
 
 #. TRANS: Page title when inviting potential users.
-#: actions/invite.php:120
 msgid "Invite new users"
 msgstr "Invite new users"
 
@@ -3431,7 +2764,6 @@ msgstr "Invite new users"
 #. TRANS: is already subscribed to one or more users with the given e-mail address(es).
 #. TRANS: Plural form is based on the number of reported already subscribed e-mail addresses.
 #. TRANS: Followed by a bullet list.
-#: actions/invite.php:140
 #, fuzzy
 msgid "You are already subscribed to this user:"
 msgid_plural "You are already subscribed to these users:"
@@ -3440,7 +2772,6 @@ msgstr[1] "You are already subscribed to these users:"
 
 #. TRANS: Used as list item for already subscribed users (%1$s is nickname, %2$s is e-mail address).
 #. TRANS: Used as list item for already registered people (%1$s is nickname, %2$s is e-mail address).
-#: actions/invite.php:146 actions/invite.php:160
 #, fuzzy, php-format
 msgctxt "INVITE"
 msgid "%1$s (%2$s)"
@@ -3449,7 +2780,6 @@ msgstr "%1$s (%2$s)"
 #. TRANS: Message displayed inviting users to use a StatusNet site while the invited user
 #. TRANS: already uses a this StatusNet site. Plural form is based on the number of
 #. TRANS: reported already present people. Followed by a bullet list.
-#: actions/invite.php:154
 #, fuzzy
 msgid "This person is already a user and you were automatically subscribed:"
 msgid_plural ""
@@ -3462,7 +2792,6 @@ msgstr[1] ""
 #. TRANS: Message displayed inviting users to use a StatusNet site. Plural form is
 #. TRANS: based on the number of invitations sent. Followed by a bullet list of
 #. TRANS: e-mail addresses to which invitations were sent.
-#: actions/invite.php:168
 #, fuzzy
 msgid "Invitation sent to the following person:"
 msgid_plural "Invitations sent to the following people:"
@@ -3471,7 +2800,6 @@ msgstr[1] "Invitation(s) sent to the following people:"
 
 #. TRANS: Generic message displayed after sending out one or more invitations to
 #. TRANS: people to join a StatusNet site.
-#: actions/invite.php:178
 msgid ""
 "You will be notified when your invitees accept the invitation and register "
 "on the site. Thanks for growing the community!"
@@ -3480,35 +2808,30 @@ msgstr ""
 "on the site. Thanks for growing the community!"
 
 #. TRANS: Form instructions.
-#: actions/invite.php:191
 msgid ""
 "Use this form to invite your friends and colleagues to use this service."
 msgstr ""
 "Use this form to invite your friends and colleagues to use this service."
 
 #. TRANS: Field label for a list of e-mail addresses.
-#: actions/invite.php:218
 msgid "Email addresses"
 msgstr "E-mail addresses"
 
 #. TRANS: Tooltip for field label for a list of e-mail addresses.
-#: actions/invite.php:221
 #, fuzzy
 msgid "Addresses of friends to invite (one per line)."
 msgstr "Addresses of friends to invite (one per line)"
 
 #. TRANS: Field label for a personal message to send to invitees.
-#: actions/invite.php:225
 msgid "Personal message"
 msgstr "Personal message"
 
 #. TRANS: Tooltip for field label for a personal message to send to invitees.
-#: actions/invite.php:228
 msgid "Optionally add a personal message to the invitation."
 msgstr "Optionally add a personal message to the invitation."
 
 #. TRANS: Send button for inviting friends
-#: actions/invite.php:232
+#. TRANS: Button text for sending notice.
 msgctxt "BUTTON"
 msgid "Send"
 msgstr "Send"
@@ -3516,7 +2839,6 @@ msgstr "Send"
 #. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral
 #. TRANS: singular 3rd-person pronoun in English. %1$s is the inviting user, $2$s is
 #. TRANS: the StatusNet sitename.
-#: actions/invite.php:264
 #, php-format
 msgid "%1$s has invited you to join them on %2$s"
 msgstr "%1$s has invited you to join them on %2$s"
@@ -3526,7 +2848,6 @@ msgstr "%1$s has invited you to join them on %2$s"
 #. TRANS: StatusNet sitename, %3$s is the site URL, %4$s is the personal message from the
 #. TRANS: inviting user, %s%5 a link to the timeline for the inviting user, %s$6 is a link
 #. TRANS: to register with the StatusNet site.
-#: actions/invite.php:271
 #, php-format
 msgid ""
 "%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -3584,182 +2905,177 @@ msgstr ""
 "Sincerely, %2$s\n"
 
 #. TRANS: Client error displayed when trying to join a group while not logged in.
-#: actions/joingroup.php:59
 msgid "You must be logged in to join a group."
 msgstr "You must be logged in to join a group."
 
 #. TRANS: Title for join group page after joining.
-#: actions/joingroup.php:148
 #, fuzzy, php-format
 msgctxt "TITLE"
 msgid "%1$s joined group %2$s"
 msgstr "%1$s joined group %2$s"
 
 #. TRANS: Client error displayed when trying to leave a group while not logged in.
-#: actions/leavegroup.php:59
 msgid "You must be logged in to leave a group."
 msgstr "You must be logged in to leave a group."
 
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
-#: actions/leavegroup.php:103 lib/command.php:398
 msgid "You are not a member of that group."
 msgstr "You are not a member of that group."
 
 #. TRANS: Title for leave group page after leaving.
-#: actions/leavegroup.php:142
 #, fuzzy, php-format
 msgctxt "TITLE"
 msgid "%1$s left group %2$s"
 msgstr "%1$s left group %2$s"
 
 #. TRANS: User admin panel title
-#: actions/licenseadminpanel.php:55
 msgctxt "TITLE"
 msgid "License"
 msgstr ""
 
-#: actions/licenseadminpanel.php:65
+#. TRANS: Form instructions for the site license admin panel.
 msgid "License for this StatusNet site"
 msgstr ""
 
-#: actions/licenseadminpanel.php:134
+#. TRANS: Client error displayed selecting an invalid license in the license admin panel.
 msgid "Invalid license selection."
 msgstr ""
 
-#: actions/licenseadminpanel.php:144
+#. TRANS: Client error displayed when not specifying an owner for the all rights reserved license in the license admin panel.
 msgid ""
 "You must specify the owner of the content when using the All Rights Reserved "
 "license."
 msgstr ""
 
-#: actions/licenseadminpanel.php:151
+#. TRANS: Client error displayed selecting a too long license title in the license admin panel.
 #, fuzzy
 msgid "Invalid license title. Maximum length is 255 characters."
 msgstr "Location is too long (max 255 chars)."
 
-#: actions/licenseadminpanel.php:163
+#. TRANS: Client error displayed specifying an invalid license URL in the license admin panel.
 msgid "Invalid license URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:166
+#. TRANS: Client error displayed specifying an invalid license image URL in the license admin panel.
 msgid "Invalid license image URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:174
+#. TRANS: Client error displayed specifying an invalid license URL in the license admin panel.
 msgid "License URL must be blank or a valid URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:182
+#. TRANS: Client error displayed specifying an invalid license image URL in the license admin panel.
 msgid "License image must be blank or valid URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:232
+#. TRANS: Form legend in the license admin panel.
 msgid "License selection"
 msgstr ""
 
-#: actions/licenseadminpanel.php:238
+#. TRANS: License option in the license admin panel.
 msgid "Private"
 msgstr "Private"
 
-#: actions/licenseadminpanel.php:239
+#. TRANS: License option in the license admin panel.
 msgid "All Rights Reserved"
 msgstr ""
 
-#: actions/licenseadminpanel.php:240
+#. TRANS: License option in the license admin panel.
 msgid "Creative Commons"
 msgstr ""
 
-#: actions/licenseadminpanel.php:245
+#. TRANS: Dropdown field label in the license admin panel.
 msgid "Type"
 msgstr ""
 
-#: actions/licenseadminpanel.php:247
-msgid "Select license"
-msgstr ""
+#. TRANS: Dropdown field instructions in the license admin panel.
+#, fuzzy
+msgid "Select a license."
+msgstr "Select a carrier"
 
-#: actions/licenseadminpanel.php:261
+#. TRANS: Form legend in the license admin panel.
 msgid "License details"
 msgstr ""
 
-#: actions/licenseadminpanel.php:267
+#. TRANS: Field label in the license admin panel.
 msgid "Owner"
 msgstr ""
 
-#: actions/licenseadminpanel.php:268
+#. TRANS: Field title in the license admin panel.
 msgid "Name of the owner of the site's content (if applicable)."
 msgstr ""
 
-#: actions/licenseadminpanel.php:276
+#. TRANS: Field label in the license admin panel.
 msgid "License Title"
 msgstr ""
 
-#: actions/licenseadminpanel.php:277
+#. TRANS: Field title in the license admin panel.
 msgid "The title of the license."
 msgstr ""
 
-#: actions/licenseadminpanel.php:285
+#. TRANS: Field label in the license admin panel.
 msgid "License URL"
 msgstr ""
 
-#: actions/licenseadminpanel.php:286
+#. TRANS: Field title in the license admin panel.
 msgid "URL for more information about the license."
 msgstr ""
 
-#: actions/licenseadminpanel.php:293
+#. TRANS: Field label in the license admin panel.
 msgid "License Image URL"
 msgstr ""
 
-#: actions/licenseadminpanel.php:294
+#. TRANS: Field title in the license admin panel.
 msgid "URL for an image to display with the license."
 msgstr ""
 
-#. TRANS: Submit button title.
-#: actions/licenseadminpanel.php:311 actions/sessionsadminpanel.php:199
-#: actions/siteadminpanel.php:292 actions/snapshotadminpanel.php:245
-#: actions/tagother.php:133 lib/applicationeditform.php:357
-msgid "Save"
-msgstr "Save"
-
-#: actions/licenseadminpanel.php:311
-msgid "Save license settings"
-msgstr ""
+#. TRANS: Button title in the license admin panel.
+#, fuzzy
+msgid "Save license settings."
+msgstr "Save site settings"
 
+#. TRANS: Client error displayed when trying to log in while already logged in.
 #. TRANS: Client error displayed trying to use "one time password login" when already logged in.
-#: actions/login.php:97 actions/otp.php:62 actions/register.php:130
 msgid "Already logged in."
 msgstr "Already logged in."
 
-#: actions/login.php:125
+#. TRANS: Form validation error displayed when trying to log in with incorrect credentials.
 msgid "Incorrect username or password."
 msgstr "Incorrect username or password."
 
+#. TRANS: Server error displayed when during login a server error occurs.
 #. TRANS: Server error displayed when a user object could not be created trying to login using "one time password login".
-#: actions/login.php:131 actions/otp.php:127
 msgid "Error setting user. You are probably not authorized."
 msgstr "Error setting user. You are probably not authorised."
 
-#: actions/login.php:185 actions/login.php:236 lib/action.php:598
+#. TRANS: Page title for login page.
 msgid "Login"
 msgstr "Login"
 
-#: actions/login.php:222
+#. TRANS: Form legend on login page.
 msgid "Login to site"
 msgstr "Login to site"
 
-#: actions/login.php:231 actions/register.php:469
+#. TRANS: Checkbox label label on login page.
 msgid "Remember me"
 msgstr "Remember me"
 
-#: actions/login.php:232 actions/register.php:471
+#. TRANS: Checkbox title on login page.
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "Automatically login in the future; not for shared computers!"
 
-#: actions/login.php:241
+#. TRANS: Button text for log in on login page.
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Login"
+msgstr "Login"
+
+#. TRANS: Link text for link to "reset password" on login page.
 msgid "Lost or forgotten password?"
 msgstr "Lost or forgotten password?"
 
-#: actions/login.php:259
+#. TRANS: Form instructions on login page before being able to change user settings.
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -3767,141 +3083,136 @@ msgstr ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
 
-#: actions/login.php:263
+#. TRANS: Form instructions on login page.
 msgid "Login with your username and password."
 msgstr "Login with your username and password."
 
-#: actions/login.php:266
+#. TRANS: Form instructions on login page. This message contains Markdown links in the form [Link text](Link).
+#. TRANS: %%action.register%% is a link to the registration page.
 #, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
 msgstr ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
 
-#: actions/makeadmin.php:92
+#. TRANS: Client error displayed when trying to make another user admin on the Make Admin page while not an admin.
 msgid "Only an admin can make another user an admin."
 msgstr "Only an admin can make another user an admin."
 
-#: actions/makeadmin.php:96
+#. TRANS: Client error displayed when trying to make another user admin on the Make Admin page who already is admin.
+#. TRANS: %1$s is the user that is already admin, %2$s is the group user is already admin for.
 #, php-format
 msgid "%1$s is already an admin for group \"%2$s\"."
 msgstr "%1$s is already an admin for group \"%2$s\"."
 
-#: actions/makeadmin.php:133
+#. TRANS: Server error displayed when trying to make another user admin on the Make Admin page fails
+#. TRANS: because the group membership record could not be gotten.
+#. TRANS: %1$s is the to be admin user, %2$s is the group user should be admin for.
 #, php-format
 msgid "Can't get membership record for %1$s in group %2$s."
 msgstr "Can't get membership record for %1$s in group %2$s."
 
-#: actions/makeadmin.php:146
+#. TRANS: Server error displayed when trying to make another user admin on the Make Admin page fails
+#. TRANS: because the group adminship record coud not be saved properly.
+#. TRANS: %1$s is the to be admin user, %2$s is the group user is already admin for.
 #, php-format
 msgid "Can't make %1$s an admin for group %2$s."
 msgstr "Can't make %1$s an admin for group %2$s."
 
-#: actions/microsummary.php:69
+#. TRANS: Client error displayed trying to make a micro summary without providing a status.
 msgid "No current status."
 msgstr "No current status."
 
 #. TRANS: This is the title of the form for adding a new application.
-#: actions/newapplication.php:52
 #, fuzzy
 msgid "New application"
 msgstr "New Application"
 
 #. TRANS: Client error displayed trying to add a new application while not logged in.
-#: actions/newapplication.php:64
 msgid "You must be logged in to register an application."
 msgstr "You must be logged in to register an application."
 
 #. TRANS: Form instructions for registering a new application.
-#: actions/newapplication.php:147
 msgid "Use this form to register a new application."
 msgstr "Use this form to register a new application."
 
 #. TRANS: Validation error shown when not providing a source URL in the "New application" form.
-#: actions/newapplication.php:189
 msgid "Source URL is required."
 msgstr "Source URL is required."
 
 #. TRANS: Server error displayed when an application could not be registered in the database through the "New application" form.
-#: actions/newapplication.php:279 actions/newapplication.php:289
 msgid "Could not create application."
 msgstr "Could not create application."
 
 #. TRANS: Title for form to create a group.
-#: actions/newgroup.php:53
 msgid "New group"
 msgstr "New group"
 
 #. TRANS: Client exception thrown when a user tries to create a group while banned.
-#: actions/newgroup.php:73 classes/User_group.php:485
 #, fuzzy
 msgid "You are not allowed to create groups on this site."
 msgstr "You are not allowed to delete this group."
 
 #. TRANS: Form instructions for group create form.
-#: actions/newgroup.php:117
 msgid "Use this form to create a new group."
 msgstr "Use this form to create a new group."
 
-#. TRANS: Group create form validation error.
-#: actions/newgroup.php:200
-#, fuzzy
-msgid "Alias cannot be the same as nickname."
-msgstr "Alias can't be the same as nickname."
-
-#: actions/newmessage.php:71 actions/newmessage.php:234
+#. TRANS: Page title for new direct message page.
+#. TRANS: Page title on page for sending a direct message.
 msgid "New message"
 msgstr "New message"
 
-#. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
-#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:513
-msgid "You can't send a message to this user."
+#. TRANS: Client error displayed trying to send a direct message to a user while sender and
+#. TRANS: receiver are not subscribed to each other.
+#, fuzzy
+msgid "You cannot send a message to this user."
 msgstr "You can't send a message to this user."
 
+#. TRANS: Form validator error displayed trying to send a direct message without content.
+#. TRANS: Client error displayed trying to send a notice without content.
 #. TRANS: Command exception text shown when trying to send a direct message to another user without content.
 #. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
-#: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:490
-#: lib/command.php:593
 msgid "No content!"
 msgstr "No content!"
 
-#: actions/newmessage.php:161
+#. TRANS: Form validation error displayed trying to send a direct message without specifying a recipient.
 msgid "No recipient specified."
 msgstr "No recipient specified."
 
+#. TRANS: Client error displayed trying to send a direct message to self.
 #. TRANS: Error text shown when trying to send a direct message to self.
-#: actions/newmessage.php:167 lib/command.php:517
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 
-#: actions/newmessage.php:184
+#. TRANS: Page title after sending a direct message.
 msgid "Message sent"
 msgstr "Message sent"
 
+#. TRANS: Confirmation text after sending a direct message.
+#. TRANS: %s is the direct message recipient.
 #. TRANS: Message given have sent a direct message to another user.
 #. TRANS: %s is the name of the other user.
-#: actions/newmessage.php:188 lib/command.php:525
 #, php-format
 msgid "Direct message to %s sent."
 msgstr "Direct message to %s sent."
 
-#: actions/newmessage.php:213 actions/newnotice.php:264
+#. TRANS: Page title after an AJAX error occurred on the "send direct message" page.
+#. TRANS: Page title after an AJAX error occurs on the send notice page.
 msgid "Ajax Error"
 msgstr "Ajax Error"
 
-#: actions/newnotice.php:69
+#. TRANS: Page title for sending a new notice.
 msgid "New notice"
 msgstr "New notice"
 
-#: actions/newnotice.php:230
+#. TRANS: Page title after sending a notice.
 msgid "Notice posted"
 msgstr "Notice posted"
 
 #. TRANS: Instructions for Notice search page.
 #. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/noticesearch.php:69
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -3911,20 +3222,17 @@ msgstr ""
 "by spaces; they must be 3 characters or more."
 
 #. TRANS: Title of the page where users can search for notices.
-#: actions/noticesearch.php:80
 msgid "Text search"
 msgstr "Text search"
 
 #. TRANS: Test in RSS notice search.
 #. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearch.php:95
 #, php-format
 msgid "Search results for \"%1$s\" on %2$s"
 msgstr "Search results for \"%1$s\" on %2$s"
 
 #. TRANS: Text for logged in users making a query for notices without results.
 #. TRANS: This message contains a Markdown link.
-#: actions/noticesearch.php:128
 #, php-format
 msgid ""
 "Be the first to [post on this topic](%%%%action.newnotice%%%%?"
@@ -3935,7 +3243,6 @@ msgstr ""
 
 #. TRANS: Text for not logged in users making a query for notices without results.
 #. TRANS: This message contains Markdown links.
-#: actions/noticesearch.php:133
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and be the first to "
@@ -3945,19 +3252,17 @@ msgstr ""
 "[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
 
 #. TRANS: RSS notice search feed title. %s is the query.
-#: actions/noticesearchrss.php:95
 #, php-format
 msgid "Updates with \"%s\""
 msgstr "Updates with \"%s\""
 
 #. TRANS: RSS notice search feed description.
 #. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearchrss.php:99
 #, fuzzy, php-format
 msgid "Updates matching search term \"%1$s\" on %2$s."
 msgstr "Updates matching search term \"%1$s\" on %2$s!"
 
-#: actions/nudge.php:85
+#. TRANS: Client error displayed trying to nudge a user that cannot be nudged.
 #, fuzzy
 msgid ""
 "This user doesn't allow nudges or hasn't confirmed or set their email "
@@ -3966,60 +3271,51 @@ msgstr ""
 "This user does not allow nudges or has not confirmed or set their e-mail "
 "address yet."
 
-#: actions/nudge.php:94
+#. TRANS: Page title after sending a nudge.
 msgid "Nudge sent"
 msgstr "Nudge sent"
 
-#: actions/nudge.php:97
+#. TRANS: Confirmation text after sending a nudge.
 msgid "Nudge sent!"
 msgstr "Nudge sent!"
 
 #. TRANS: Message displayed to an anonymous user trying to view OAuth application list.
-#: actions/oauthappssettings.php:57
 msgid "You must be logged in to list your applications."
 msgstr "You must be logged in to list your applications."
 
 #. TRANS: Page title for OAuth applications
-#: actions/oauthappssettings.php:73
 msgid "OAuth applications"
 msgstr "OAuth applications"
 
 #. TRANS: Page instructions for OAuth applications
-#: actions/oauthappssettings.php:85
 msgid "Applications you have registered"
 msgstr "Applications you have registered"
 
 #. TRANS: Empty list message on page with OAuth applications.
-#: actions/oauthappssettings.php:138
 #, php-format
 msgid "You have not registered any applications yet."
 msgstr "You have not registered any applications yet."
 
 #. TRANS: Title for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:69
 msgid "Connected applications"
 msgstr "Connected applications"
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:80
 msgid "The following connections exist for your account."
 msgstr ""
 
 #. TRANS: Client error when trying to revoke access for an application while not being a user of it.
-#: actions/oauthconnectionssettings.php:165
 msgid "You are not a user of that application."
 msgstr "You are not a user of that application."
 
 #. TRANS: Client error when revoking access has failed for some reason.
 #. TRANS: %s is the application ID revoking access failed for.
-#: actions/oauthconnectionssettings.php:180
 #, fuzzy, php-format
 msgid "Unable to revoke access for application: %s."
 msgstr "Use this form to edit your application."
 
 #. TRANS: Success message after revoking access for an application.
 #. TRANS: %1$s is the application name, %2$s is the first part of the user token.
-#: actions/oauthconnectionssettings.php:199
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -4027,464 +3323,381 @@ msgid ""
 msgstr ""
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:210
 msgid "You have not authorized any applications to use your account."
 msgstr "You have not authorised any applications to use your account."
 
 #. TRANS: Note for developers in the OAuth connection settings form.
 #. TRANS: This message contains a Markdown link. Do not separate "](".
 #. TRANS: %s is the URL to the OAuth settings.
-#: actions/oauthconnectionssettings.php:230
 #, php-format
 msgid ""
 "Are you a developer? [Register an OAuth client application](%s) to use with "
 "this instance of StatusNet."
 msgstr ""
 
-#: actions/oembed.php:64
+#. TRANS: Server error displayed in oEmbed action when path not found.
+#. TRANS: %s is a path.
 #, fuzzy, php-format
 msgid "\"%s\" not found."
 msgstr "API method not found."
 
-#: actions/oembed.php:76
+#. TRANS: Server error displayed in oEmbed action when notice not found.
+#. TRANS: %s is a notice.
 #, fuzzy, php-format
 msgid "Notice %s not found."
 msgstr "API method not found."
 
-#: actions/oembed.php:80 actions/shownotice.php:100
+#. TRANS: Server error displayed in oEmbed action when notice has not profile.
 msgid "Notice has no profile."
 msgstr "Notice has no profile."
 
-#: actions/oembed.php:83 actions/shownotice.php:172
+#. TRANS: oEmbed title. %1$s is the author name, %2$s is the creation date.
 #, php-format
 msgid "%1$s's status on %2$s"
 msgstr "%1$s's status on %2$s"
 
-#: actions/oembed.php:95
+#. TRANS: Server error displayed in oEmbed action when attachment not found.
+#. TRANS: %d is an attachment ID.
 #, fuzzy, php-format
 msgid "Attachment %s not found."
 msgstr "Recipient user not found."
 
-#: actions/oembed.php:136
+#. TRANS: Server error displayed in oEmbed request when a path is not supported.
+#. TRANS: %s is a path.
 #, php-format
 msgid "\"%s\" not supported for oembed requests."
 msgstr ""
 
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
-#: actions/oembed.php:168
 #, php-format
 msgid "Content type %s not supported."
 msgstr "Content type %s not supported."
 
 #. TRANS: Error message displaying attachments. %s is the site's base URL.
-#: actions/oembed.php:172
 #, php-format
 msgid "Only %s URLs over plain HTTP please."
 msgstr ""
 
+#. TRANS: Server error displayed in oEmbed action when request specifies an unsupported data format.
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1207
-#: lib/apiaction.php:1234 lib/apiaction.php:1369
 msgid "Not a supported data format."
 msgstr "Not a supported data format."
 
 #. TRANS: ShortName in the OpenSearch interface when trying to find users.
-#: actions/opensearch.php:64
 msgid "People Search"
 msgstr "People Search"
 
-#: actions/opensearch.php:68
+#. TRANS: ShortName in the OpenSearch interface when trying to find notices.
 msgid "Notice Search"
 msgstr "Notice Search"
 
 #. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
-#: actions/otp.php:70
 msgid "No user ID specified."
 msgstr "No user ID specified."
 
 #. TRANS: Client error displayed trying to use "one time password login" without specifying a login token.
-#: actions/otp.php:86
 msgid "No login token specified."
 msgstr "No login token specified."
 
 #. TRANS: Client error displayed trying to use "one time password login" without requesting a login token.
-#: actions/otp.php:94
 msgid "No login token requested."
 msgstr "No login token requested."
 
 #. TRANS: Client error displayed trying to use "one time password login" while specifying an invalid login token.
-#: actions/otp.php:100
 msgid "Invalid login token specified."
 msgstr "Invalid login token specified."
 
 #. TRANS: Client error displayed trying to use "one time password login" while specifying an expired login token.
-#: actions/otp.php:110
 msgid "Login token expired."
 msgstr "Login token expired."
 
 #. TRANS: Title for outbox for any but the fist page.
 #. TRANS: %1$s is the user nickname, %2$d is the page number.
-#: actions/outbox.php:57
 #, php-format
 msgid "Outbox for %1$s - page %2$d"
 msgstr "Outbox for %1$s - page %2$d"
 
 #. TRANS: Title for first page of outbox.
-#: actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
 msgstr "Outbox for %s"
 
 #. TRANS: Instructions for outbox.
-#: actions/outbox.php:103
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr "This is your outbox, which lists private messages you have sent."
 
-#: actions/passwordsettings.php:58
 msgid "Change password"
 msgstr "Change password"
 
-#: actions/passwordsettings.php:69
 msgid "Change your password."
 msgstr "Change your password."
 
 #. TRANS: Fieldset legend for password reset form.
-#: actions/passwordsettings.php:96 actions/recoverpassword.php:251
 msgid "Password change"
 msgstr "Password change"
 
-#: actions/passwordsettings.php:104
 msgid "Old password"
 msgstr "Old password"
 
 #. TRANS: Field label for password reset form.
-#: actions/passwordsettings.php:108 actions/recoverpassword.php:256
 msgid "New password"
 msgstr "New password"
 
-#: actions/passwordsettings.php:109 actions/register.php:416
 #, fuzzy
 msgid "6 or more characters."
 msgstr "6 or more characters"
 
 #. TRANS: Ttile for field label for password reset form where the password has to be typed again.
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:264
-#: actions/register.php:420
 #, fuzzy
 msgid "Same as password above."
 msgstr "Same as password above"
 
-#: actions/passwordsettings.php:117
 msgid "Change"
 msgstr "Change"
 
-#: actions/passwordsettings.php:153 actions/register.php:223
 msgid "Password must be 6 or more characters."
 msgstr "Password must be 6 or more characters."
 
-#: actions/passwordsettings.php:156 actions/register.php:226
 msgid "Passwords don't match."
 msgstr "Passwords don't match."
 
-#: actions/passwordsettings.php:164
 msgid "Incorrect old password"
 msgstr "Incorrect old password"
 
-#: actions/passwordsettings.php:180
 msgid "Error saving user; invalid."
 msgstr "Error saving user; invalid."
 
 #. TRANS: Reset password form validation error message.
-#: actions/passwordsettings.php:185 actions/recoverpassword.php:418
 #, fuzzy
 msgid "Cannot save new password."
 msgstr "Can't save new password."
 
-#: actions/passwordsettings.php:191
 msgid "Password saved."
 msgstr "Password saved."
 
 #. TRANS: Title for Paths admin panel.
 #. TRANS: Menu item for site administration
-#: actions/pathsadminpanel.php:58 lib/adminpanelaction.php:371
 msgid "Paths"
 msgstr ""
 
 #. TRANS: Form instructions for Path admin panel.
-#: actions/pathsadminpanel.php:69
 msgid "Path and server settings for this StatusNet site"
 msgstr ""
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the directory that could not be read from.
-#: actions/pathsadminpanel.php:155
 #, php-format
 msgid "Theme directory not readable: %s."
 msgstr "Theme directory not readable: %s."
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the avatar directory that could not be written to.
-#: actions/pathsadminpanel.php:163
 #, php-format
 msgid "Avatar directory not writable: %s."
 msgstr "Avatar directory not writable: %s."
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the background directory that could not be written to.
-#: actions/pathsadminpanel.php:171
 #, php-format
 msgid "Background directory not writable: %s."
 msgstr "Background directory not writable: %s."
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the locales directory that could not be read from.
-#: actions/pathsadminpanel.php:181
 #, php-format
 msgid "Locales directory not readable: %s."
 msgstr "Locales directory not readable: %s."
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the SSL server URL that is too long.
-#: actions/pathsadminpanel.php:189
 msgid "Invalid SSL server. The maximum length is 255 characters."
 msgstr ""
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:235 actions/siteadminpanel.php:58
 msgid "Site"
 msgstr "Site"
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:241 actions/pathsadminpanel.php:279
-#: actions/pathsadminpanel.php:370 actions/pathsadminpanel.php:425
 msgid "Server"
 msgstr "Server"
 
-#: actions/pathsadminpanel.php:242
 msgid "Site's server hostname."
 msgstr ""
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:248 actions/pathsadminpanel.php:288
-#: actions/pathsadminpanel.php:379 actions/pathsadminpanel.php:434
 msgid "Path"
 msgstr ""
 
-#: actions/pathsadminpanel.php:249
 #, fuzzy
 msgid "Site path."
 msgstr "Site path"
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:255
 #, fuzzy
 msgid "Locale directory"
 msgstr "Locale Directory"
 
-#: actions/pathsadminpanel.php:256
 msgid "Directory path to locales."
 msgstr ""
 
 #. TRANS: Checkbox label in Paths admin panel.
-#: actions/pathsadminpanel.php:263
 msgid "Fancy URLs"
 msgstr ""
 
-#: actions/pathsadminpanel.php:265
 msgid "Use fancy (more readable and memorable) URLs?"
 msgstr ""
 
-#: actions/pathsadminpanel.php:272
 msgid "Theme"
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:281
 #, fuzzy
 msgid "Server for themes."
 msgstr "Server for themes"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:290
 msgid "Web path to themes."
 msgstr ""
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:297 actions/pathsadminpanel.php:388
-#: actions/pathsadminpanel.php:443 actions/pathsadminpanel.php:495
 msgid "SSL server"
 msgstr "SSL server"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:299
 msgid "SSL server for themes (default: SSL server)."
 msgstr ""
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:306 actions/pathsadminpanel.php:397
-#: actions/pathsadminpanel.php:452
 msgid "SSL path"
 msgstr "SSL path"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:308
 msgid "SSL path to themes (default: /theme/)."
 msgstr ""
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:315 actions/pathsadminpanel.php:406
-#: actions/pathsadminpanel.php:461
 msgid "Directory"
 msgstr "Directory"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:317
 msgid "Directory where themes are located."
 msgstr ""
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:326
 msgid "Avatars"
 msgstr "Avatars"
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:333
 msgid "Avatar server"
 msgstr "Avatar server"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:335
 #, fuzzy
 msgid "Server for avatars."
 msgstr "Server for themes"
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:342
 msgid "Avatar path"
 msgstr "Avatar path"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:344
 #, fuzzy
 msgid "Web path to avatars."
 msgstr "Failed updating avatar."
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:351
 msgid "Avatar directory"
 msgstr "Avatar directory"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:353
 msgid "Directory where avatars are located."
 msgstr ""
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:364
 msgid "Backgrounds"
 msgstr "Backgrounds"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:372
 #, fuzzy
 msgid "Server for backgrounds."
 msgstr "Server for themes"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:381
 msgid "Web path to backgrounds."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:390
 msgid "Server for backgrounds on SSL pages."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:399
 msgid "Web path to backgrounds on SSL pages."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:408
 msgid "Directory where backgrounds are located."
 msgstr ""
 
 #. TRANS: Fieldset legens in Paths admin panel.
-#: actions/pathsadminpanel.php:419
 msgid "Attachments"
 msgstr "Attachments"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:427
 #, fuzzy
 msgid "Server for attachments."
 msgstr "Server for themes"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:436
 #, fuzzy
 msgid "Web path to attachments."
 msgstr "No attachments."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:445
 #, fuzzy
 msgid "Server for attachments on SSL pages."
 msgstr "Server for themes"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:454
 msgid "Web path to attachments on SSL pages."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:463
 msgid "Directory where attachments are located."
 msgstr ""
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:472
 msgid "SSL"
 msgstr "SSL"
 
 #. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
-#: actions/pathsadminpanel.php:477 actions/snapshotadminpanel.php:202
 msgid "Never"
 msgstr "Never"
 
 #. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
-#: actions/pathsadminpanel.php:479
 msgid "Sometimes"
 msgstr "Sometimes"
 
 #. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
-#: actions/pathsadminpanel.php:481
 msgid "Always"
 msgstr ""
 
-#: actions/pathsadminpanel.php:485
 msgid "Use SSL"
 msgstr "Use SSL"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:487
 msgid "When to use SSL."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:497
 msgid "Server to direct SSL requests to."
 msgstr ""
 
 #. TRANS: Button title text to store form data in the Paths admin panel.
-#: actions/pathsadminpanel.php:514
 msgid "Save paths"
 msgstr "Save paths"
 
 #. TRANS: Instructions for the "People search" page.
 #. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/peoplesearch.php:54
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
@@ -4494,57 +3707,46 @@ msgstr ""
 "Separate the terms by spaces; they must be 3 characters or more."
 
 #. TRANS: Title of a page where users can search for other users.
-#: actions/peoplesearch.php:61
 msgid "People search"
 msgstr "People search"
 
-#: actions/peopletag.php:68
 #, php-format
 msgid "Not a valid people tag: %s."
 msgstr "Not a valid people tag: %s."
 
-#: actions/peopletag.php:142
 #, php-format
 msgid "Users self-tagged with %1$s - page %2$d"
 msgstr "Users self-tagged with %1$s - page %2$d"
 
 #. TRANS: Page title for AJAX form return when a disabling a plugin.
-#: actions/plugindisable.php:69
 msgctxt "plugin"
 msgid "Disabled"
 msgstr ""
 
 #. TRANS: Client error displayed trying to perform any request method other than POST.
 #. TRANS: Do not translate POST.
-#: actions/pluginenable.php:78 actions/subscribe.php:77
 msgid "This action only accepts POST requests."
 msgstr ""
 
-#: actions/pluginenable.php:102
 #, fuzzy
 msgid "You cannot administer plugins."
 msgstr "You cannot delete users."
 
-#: actions/pluginenable.php:109
 #, fuzzy
 msgid "No such plugin."
 msgstr "No such page."
 
 #. TRANS: Page title for AJAX form return when enabling a plugin.
-#: actions/pluginenable.php:159
 msgctxt "plugin"
 msgid "Enabled"
 msgstr ""
 
 #. TRANS: Tab and title for plugins admin panel.
 #. TRANS: Menu item for site administration
-#: actions/pluginsadminpanel.php:56 actions/version.php:191
-#: lib/adminpanelaction.php:411
 msgid "Plugins"
 msgstr ""
 
 #. TRANS: Instructions at top of plugin admin page.
-#: actions/pluginsadminpanel.php:68
 msgid ""
 "Additional plugins can be enabled and configured manually. See the <a href="
 "\"http://status.net/wiki/Plugins\">online plugin documentation</a> for more "
@@ -4552,63 +3754,50 @@ msgid ""
 msgstr ""
 
 #. TRANS: Admin form section header
-#: actions/pluginsadminpanel.php:84
 #, fuzzy
 msgid "Default plugins"
 msgstr "Default language"
 
-#: actions/pluginsadminpanel.php:106
 msgid ""
 "All default plugins have been disabled from the site's configuration file."
 msgstr ""
 
-#: actions/postnotice.php:95
 msgid "Invalid notice content."
 msgstr "Invalid notice content."
 
-#: actions/postnotice.php:101
 #, php-format
 msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’."
 msgstr "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’."
 
 #. TRANS: Page title for profile settings.
-#: actions/profilesettings.php:60
 msgid "Profile settings"
 msgstr "Profile settings"
 
 #. TRANS: Usage instructions for profile settings.
-#: actions/profilesettings.php:71
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
 "You can update your personal profile info here so people know more about you."
 
 #. TRANS: Profile settings form legend.
-#: actions/profilesettings.php:99
 msgid "Profile information"
 msgstr "Profile information"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:110 actions/register.php:412
 #, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr "1-64 lowercase letters or numbers, no punctuation or spaces"
 
 #. TRANS: Field label in form for profile settings.
-#: actions/profilesettings.php:114 actions/register.php:434
-#: lib/groupeditform.php:150
 msgid "Full name"
 msgstr "Full name"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:119 actions/register.php:439
-#: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "Homepage"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:122 actions/register.php:441
 #, fuzzy
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr "URL of your homepage, blog, or profile on another site"
@@ -4616,7 +3805,6 @@ msgstr "URL of your homepage, blog, or profile on another site"
 #. TRANS: Tooltip for field label in form for profile settings. Plural
 #. TRANS: is decided by the number of characters available for the
 #. TRANS: biography (%d).
-#: actions/profilesettings.php:130 actions/register.php:450
 #, fuzzy, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4624,41 +3812,31 @@ msgstr[0] "Describe yourself and your interests in %d chars"
 msgstr[1] "Describe yourself and your interests in %d chars"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:136 actions/register.php:455
 msgid "Describe yourself and your interests"
 msgstr "Describe yourself and your interests"
 
 #. TRANS: Text area label in form for profile settings where users can provide.
 #. TRANS: their biography.
-#: actions/profilesettings.php:140 actions/register.php:457
 msgid "Bio"
 msgstr "Bio"
 
 #. TRANS: Field label in form for profile settings.
-#: actions/profilesettings.php:146 actions/register.php:462
-#: lib/groupeditform.php:173
 msgid "Location"
 msgstr "Location"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:149
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Where you are, like \"City, State (or Region), Country\""
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:154
 msgid "Share my current location when posting notices"
 msgstr ""
 
 #. TRANS: Field label in form for profile settings.
-#: actions/profilesettings.php:162 actions/tagother.php:128
-#: actions/tagother.php:188 lib/subscriptionlist.php:104
-#: lib/subscriptionlist.php:106
 msgid "Tags"
 msgstr "Tags"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:165
 #, fuzzy
 msgid ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- "
@@ -4667,28 +3845,23 @@ msgstr ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:170
 msgid "Language"
 msgstr "Language"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:172
 #, fuzzy
 msgid "Preferred language."
 msgstr "Preferred language"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:182
 msgid "Timezone"
 msgstr "Timezone"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:184
 msgid "What timezone are you normally in?"
 msgstr "In which timezone are you?"
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:190
 #, fuzzy
 msgid ""
 "Automatically subscribe to whoever subscribes to me (best for non-humans)."
@@ -4698,7 +3871,6 @@ msgstr ""
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Plural form is used based on the maximum number of allowed
 #. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:259 actions/register.php:214
 #, fuzzy, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4706,85 +3878,69 @@ msgstr[0] "Bio is too long (max %d chars)."
 msgstr[1] "Bio is too long (max %d chars)."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:270 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr "Timezone not selected."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:278
 #, fuzzy
 msgid "Language is too long (maximum 50 characters)."
 msgstr "Language is too long (max 50 chars)."
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:292
 #, fuzzy, php-format
 msgid "Invalid tag: \"%s\"."
 msgstr "Invalid tag: \"%s\""
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:348
 #, fuzzy
 msgid "Could not update user for autosubscribe."
 msgstr "Couldn't update user for autosubscribe."
 
 #. TRANS: Server error thrown when user profile location preference settings could not be updated.
-#: actions/profilesettings.php:406
 #, fuzzy
 msgid "Could not save location prefs."
 msgstr "Couldn't save location prefs."
 
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:428 actions/tagother.php:179
 msgid "Could not save tags."
 msgstr "Could not save tags."
 
 #. TRANS: Confirmation shown when user profile settings are saved.
 #. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:437 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "Settings saved."
 
 #. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
 #. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:484 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "Create an account"
 
-#: actions/public.php:83
 #, php-format
 msgid "Beyond the page limit (%s)."
 msgstr ""
 
-#: actions/public.php:92
 msgid "Could not retrieve public stream."
 msgstr "Could not retrieve public stream."
 
-#: actions/public.php:130
 #, php-format
 msgid "Public timeline, page %d"
 msgstr "Public timeline, page %d"
 
-#: actions/public.php:132 lib/publicgroupnav.php:79
 msgid "Public timeline"
 msgstr "Public timeline"
 
-#: actions/public.php:160
 msgid "Public Stream Feed (RSS 1.0)"
 msgstr "Public Stream Feed (RSS 1.0)"
 
-#: actions/public.php:164
 msgid "Public Stream Feed (RSS 2.0)"
 msgstr "Public Stream Feed (RSS 2.0)"
 
-#: actions/public.php:168
 msgid "Public Stream Feed (Atom)"
 msgstr "Public Stream Feed (Atom)"
 
-#: actions/public.php:188
 #, php-format
 msgid ""
 "This is the public timeline for %%site.name%% but no one has posted anything "
@@ -4793,18 +3949,15 @@ msgstr ""
 "This is the public timeline for %%site.name%% but no one has posted anything "
 "yet."
 
-#: actions/public.php:191
 msgid "Be the first to post!"
 msgstr ""
 
-#: actions/public.php:195
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post!"
 msgstr ""
 "Why not [register an account](%%action.register%%) and be the first to post!"
 
-#: actions/public.php:242
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -4817,7 +3970,6 @@ msgstr ""
 "tool. [Join now](%%action.register%%) to share notices about yourself with "
 "friends, family, and colleagues! ([Read more](%%doc.help%%))"
 
-#: actions/public.php:247
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -4829,19 +3981,16 @@ msgstr ""
 "tool."
 
 #. TRANS: Public RSS feed description. %s is the StatusNet site name.
-#: actions/publicrss.php:106
 #, fuzzy, php-format
 msgid "%s updates from everyone."
 msgstr "%s updates from everyone!"
 
 #. TRANS: Title for public tag cloud.
-#: actions/publictagcloud.php:57
 msgid "Public tag cloud"
 msgstr "Public tag cloud"
 
 #. TRANS: Instructions (more used like an explanation/header).
 #. TRANS: %s is the StatusNet sitename.
-#: actions/publictagcloud.php:65
 #, fuzzy, php-format
 msgid "These are most popular recent tags on %s"
 msgstr "These are most popular recent tags on %s "
@@ -4849,14 +3998,12 @@ msgstr "These are most popular recent tags on %s "
 #. TRANS: This message contains a Markdown URL. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.
-#: actions/publictagcloud.php:74
 #, php-format
 msgid "No one has posted a notice with a [hashtag](%%doc.tags%%) yet."
 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.
-#: actions/publictagcloud.php:79
 msgid "Be the first to post one!"
 msgstr ""
 
@@ -4865,7 +4012,6 @@ msgstr ""
 #. TRANS: This message contains a Markdown URL. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.
-#: actions/publictagcloud.php:87
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post "
@@ -4875,42 +4021,34 @@ msgstr ""
 "one!"
 
 #. TRANS: Client error displayed trying to recover password while already logged in.
-#: actions/recoverpassword.php:37
 msgid "You are already logged in!"
 msgstr "You are already logged in!"
 
 #. TRANS: Client error displayed when password recovery code is not correct.
-#: actions/recoverpassword.php:64
 msgid "No such recovery code."
 msgstr "No such recovery code."
 
 #. TRANS: Client error displayed when no proper password recovery code was submitted.
-#: actions/recoverpassword.php:69
 msgid "Not a recovery code."
 msgstr "Not a recovery code."
 
 #. TRANS: Server error displayed trying to recover password without providing a user.
-#: actions/recoverpassword.php:77
 msgid "Recovery code for unknown user."
 msgstr "Recovery code for unknown user."
 
 #. TRANS: Server error displayed removing a password recovery code from the database.
-#: actions/recoverpassword.php:91
 msgid "Error with confirmation code."
 msgstr "Error with confirmation code."
 
 #. TRANS: Client error displayed trying to recover password with too old a recovery code.
-#: actions/recoverpassword.php:103
 msgid "This confirmation code is too old. Please start again."
 msgstr "This confirmation code is too old. Please start again."
 
 #. TRANS: Server error displayed when updating a user's e-mail address in the database fails while recovering a password.
-#: actions/recoverpassword.php:118
 msgid "Could not update user with confirmed email address."
 msgstr "Could not update user with confirmed e-mail address."
 
 #. TRANS: Page notice for password recovery page.
-#: actions/recoverpassword.php:160
 msgid ""
 "If you have forgotten or lost your password, you can get a new one sent to "
 "the email address you have stored in your account."
@@ -4918,100 +4056,82 @@ msgstr ""
 "If you have forgotten or lost your password, you can get a new one sent to "
 "the e-mail address you have stored in your account."
 
-#: actions/recoverpassword.php:167
 msgid "You have been identified. Enter a new password below."
 msgstr ""
 
 #. TRANS: Fieldset legend for password recovery page.
-#: actions/recoverpassword.php:198
 msgid "Password recovery"
 msgstr "Password recovery"
 
 #. TRANS: Field label on password recovery page.
-#: actions/recoverpassword.php:202
 msgid "Nickname or email address"
 msgstr "Nickname or e-mail address"
 
 #. TRANS: Title for field label on password recovery page.
-#: actions/recoverpassword.php:205
 msgid "Your nickname on this server, or your registered email address."
 msgstr "Your nickname on this server, or your registered e-mail address."
 
 #. TRANS: Field label on password recovery page.
-#: actions/recoverpassword.php:212
 msgid "Recover"
 msgstr "Recover"
 
 #. TRANS: Button text on password recovery page.
-#: actions/recoverpassword.php:214
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Recover"
 msgstr "Recover"
 
 #. TRANS: Title for password recovery page in password reset mode.
-#: actions/recoverpassword.php:223
 msgid "Reset password"
 msgstr "Reset password"
 
 #. TRANS: Title for password recovery page in password recover mode.
-#: actions/recoverpassword.php:225
 msgid "Recover password"
 msgstr "Recover password"
 
 #. TRANS: Title for password recovery page in email sent mode.
 #. TRANS: Subject for password recovery e-mail.
-#: actions/recoverpassword.php:227 actions/recoverpassword.php:366
 msgid "Password recovery requested"
 msgstr "Password recovery requested"
 
 #. TRANS: Title for password recovery page in password saved mode.
-#: actions/recoverpassword.php:229
 #, fuzzy
 msgid "Password saved"
 msgstr "Password saved."
 
 #. TRANS: Title for password recovery page when an unknown action has been specified.
-#: actions/recoverpassword.php:232
 msgid "Unknown action"
 msgstr "Unknown action"
 
 #. TRANS: Title for field label for password reset form.
-#: actions/recoverpassword.php:258
 #, fuzzy
 msgid "6 or more characters, and do not forget it!"
 msgstr "6 or more characters, and don't forget it!"
 
 #. TRANS: Button text for password reset form.
 #. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: actions/recoverpassword.php:268 lib/designform.php:145
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Reset"
 msgstr "Reset"
 
 #. TRANS: Form instructions for password recovery form.
-#: actions/recoverpassword.php:278
 msgid "Enter a nickname or email address."
 msgstr "Enter a nickname or e-mail address."
 
 #. TRANS: Information on password recovery form if no known username or e-mail address was specified.
-#: actions/recoverpassword.php:309
 msgid "No user with that email address or username."
 msgstr "No user with that e-mail address or username."
 
 #. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
-#: actions/recoverpassword.php:327
 msgid "No registered email address for that user."
 msgstr "No registered e-mail address for that user."
 
 #. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
-#: actions/recoverpassword.php:342
 msgid "Error saving address confirmation."
 msgstr "Error saving address confirmation."
 
 #. TRANS: User notification after an e-mail with instructions was sent from the password recovery form.
-#: actions/recoverpassword.php:370
 msgid ""
 "Instructions for recovering your password have been sent to the email "
 "address registered to your account."
@@ -5020,123 +4140,97 @@ msgstr ""
 "address registered to your account."
 
 #. TRANS: Client error displayed when trying to reset as password without providing a user.
-#: actions/recoverpassword.php:391
 msgid "Unexpected password reset."
 msgstr "Unexpected password reset."
 
 #. TRANS: Reset password form validation error message.
-#: actions/recoverpassword.php:400
 #, fuzzy
 msgid "Password must be 6 characters or more."
 msgstr "Password must be 6 chars or more."
 
 #. TRANS: Reset password form validation error message.
-#: actions/recoverpassword.php:405
 msgid "Password and confirmation do not match."
 msgstr "Password and confirmation do not match."
 
 #. TRANS: Server error displayed when something does wrong with the user object during password reset.
-#: actions/recoverpassword.php:426 actions/register.php:241
 msgid "Error setting user."
 msgstr "Error setting user."
 
 #. TRANS: Success message for user after password reset.
-#: actions/recoverpassword.php:434
 msgid "New password successfully saved. You are now logged in."
 msgstr "New password successfully saved. You are now logged in."
 
-#: actions/redirecturl.php:70
 #, fuzzy
 msgid "No id parameter"
 msgstr "No ID argument."
 
-#: actions/redirecturl.php:76
 #, fuzzy, php-format
 msgid "No such file \"%d\""
 msgstr "No such file."
 
-#: actions/register.php:80 actions/register.php:181 actions/register.php:392
 msgid "Sorry, only invited people can register."
 msgstr "Sorry, only invited people can register."
 
-#: actions/register.php:87
 msgid "Sorry, invalid invitation code."
 msgstr "Sorry, invalid invitation code."
 
-#: actions/register.php:106
 msgid "Registration successful"
 msgstr "Registration successful"
 
-#: actions/register.php:108 actions/register.php:490
 msgid "Register"
 msgstr "Register"
 
-#: actions/register.php:128
 msgid "Registration not allowed."
 msgstr "Registration not allowed."
 
-#: actions/register.php:194
 #, fuzzy
 msgid "You cannot register if you don't agree to the license."
 msgstr "You can't register if you don't agree to the licence."
 
-#: actions/register.php:203
 msgid "Email address already exists."
 msgstr "E-mail address already exists."
 
-#: actions/register.php:236 actions/register.php:258
 msgid "Invalid username or password."
 msgstr "Invalid username or password."
 
-#: actions/register.php:333
 msgid ""
 "With this form you can create a new account. You can then post notices and "
 "link up to friends and colleagues."
 msgstr ""
 
-#: actions/register.php:424 actions/register.php:428
-#: actions/siteadminpanel.php:238 lib/settingsnav.php:92
 msgid "Email"
 msgstr "E-mail"
 
-#: actions/register.php:425 actions/register.php:429
 #, fuzzy
 msgid "Used only for updates, announcements, and password recovery."
 msgstr "Used only for updates, announcements, and password recovery"
 
-#: actions/register.php:436
 #, fuzzy
 msgid "Longer name, preferably your \"real\" name."
 msgstr "Longer name, preferably your \"real\" name"
 
-#: actions/register.php:464
 #, fuzzy
 msgid "Where you are, like \"City, State (or Region), Country\"."
 msgstr "Where you are, like \"City, State (or Region), Country\""
 
-#: actions/register.php:503
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
 msgstr ""
 
-#: actions/register.php:513
 #, php-format
 msgid "My text and files are copyright by %1$s."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:517
 msgid "My text and files remain under my own copyright."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:520
 msgid "All rights reserved."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:525
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -5145,7 +4239,6 @@ msgstr ""
 "My text and files are available under %s except this private data: password, "
 "email address, IM address, and phone number."
 
-#: actions/register.php:566
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -5178,7 +4271,6 @@ msgstr ""
 "\n"
 "Thanks for signing up and we hope you enjoy using this service."
 
-#: actions/register.php:590
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5186,7 +4278,6 @@ msgstr ""
 "(You should receive a message by e-mail momentarily, with instructions on "
 "how to confirm your e-mail address.)"
 
-#: actions/remotesubscribe.php:97
 #, php-format
 msgid ""
 "To subscribe, you can [login](%%action.login%%), or [register](%%action."
@@ -5197,110 +4288,85 @@ msgstr ""
 "register%%) a new  account. If you already have an account  on a [compatible "
 "microblogging site](%%doc.openmublog%%),  enter your profile URL below."
 
-#: actions/remotesubscribe.php:111
 msgid "Remote subscribe"
 msgstr "Remote subscribe"
 
-#: actions/remotesubscribe.php:123
 msgid "Subscribe to a remote user"
 msgstr "Subscribe to a remote user"
 
-#: actions/remotesubscribe.php:128
 msgid "User nickname"
 msgstr "User nickname"
 
-#: actions/remotesubscribe.php:129
 #, fuzzy
 msgid "Nickname of the user you want to follow."
 msgstr "Nickname of the user you want to follow"
 
-#: actions/remotesubscribe.php:132
 msgid "Profile URL"
 msgstr "Profile URL"
 
-#: actions/remotesubscribe.php:133
 #, fuzzy
 msgid "URL of your profile on another compatible microblogging service."
 msgstr "URL of your profile on another compatible microblogging service"
 
 #. TRANS: Link text for link that will subscribe to a remote profile.
-#: actions/remotesubscribe.php:136 lib/subscribeform.php:139
-#: lib/userprofile.php:402
 msgid "Subscribe"
 msgstr "Subscribe"
 
-#: actions/remotesubscribe.php:158
 #, fuzzy
 msgid "Invalid profile URL (bad format)."
 msgstr "Invalid profile URL (bad format)"
 
-#: actions/remotesubscribe.php:167
 msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
 msgstr "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
 
-#: actions/remotesubscribe.php:175
 #, fuzzy
 msgid "That is a local profile! Login to subscribe."
 msgstr "That’s a local profile! Login to subscribe."
 
-#: actions/remotesubscribe.php:182
 #, fuzzy
 msgid "Could not get a request token."
 msgstr "Couldn’t get a request token."
 
-#: actions/repeat.php:56
 msgid "Only logged-in users can repeat notices."
 msgstr "Only logged-in users can repeat notices."
 
-#: actions/repeat.php:63 actions/repeat.php:70
 msgid "No notice specified."
 msgstr "No notice specified."
 
-#: actions/repeat.php:75
 #, fuzzy
 msgid "You cannot repeat your own notice."
 msgstr "You can't repeat your own notice."
 
-#: actions/repeat.php:89
 msgid "You already repeated that notice."
 msgstr "You already repeated that notice."
 
-#: actions/repeat.php:112 lib/noticelist.php:697
 msgid "Repeated"
 msgstr "Repeated"
 
-#: actions/repeat.php:117
 msgid "Repeated!"
 msgstr "Repeated!"
 
 #. TRANS: RSS reply feed title. %s is a user nickname.
-#: actions/replies.php:126 actions/repliesrss.php:68
-#: lib/personalgroupnav.php:105
 #, php-format
 msgid "Replies to %s"
 msgstr "Replies to %s"
 
-#: actions/replies.php:128
 #, php-format
 msgid "Replies to %1$s, page %2$d"
 msgstr "Replies to %1$s, page %2$d"
 
-#: actions/replies.php:145
 #, php-format
 msgid "Replies feed for %s (RSS 1.0)"
 msgstr "Replies feed for %s (RSS 1.0)"
 
-#: actions/replies.php:152
 #, php-format
 msgid "Replies feed for %s (RSS 2.0)"
 msgstr "Replies feed for %s (RSS 2.0)"
 
-#: actions/replies.php:159
 #, php-format
 msgid "Replies feed for %s (Atom)"
 msgstr "Replies feed for %s (Atom)"
 
-#: actions/replies.php:199
 #, php-format
 msgid ""
 "This is the timeline showing replies to %1$s but %2$s hasn't received a "
@@ -5309,14 +4375,12 @@ msgstr ""
 "This is the timeline showing replies to %1$s but %2$s has not received a "
 "notice to them yet."
 
-#: actions/replies.php:204
 #, php-format
 msgid ""
 "You can engage other users in a conversation, subscribe to more people or "
 "[join groups](%%action.groups%%)."
 msgstr ""
 
-#: actions/replies.php:206
 #, php-format
 msgid ""
 "You can try to [nudge %1$s](../%2$s) or [post something to them](%%%%action."
@@ -5327,223 +4391,182 @@ msgstr ""
 
 #. TRANS: RSS reply feed description.
 #. TRANS: %1$s is a user nickname, %2$s is the StatusNet site name.
-#: actions/repliesrss.php:74
 #, fuzzy, php-format
 msgid "Replies to %1$s on %2$s."
 msgstr "Replies to %1$s on %2$s!"
 
 #. TRANS: Client exception displayed when trying to restore an account while not logged in.
-#: actions/restoreaccount.php:78
 #, fuzzy
 msgid "Only logged-in users can restore their account."
 msgstr "Only logged-in users can repeat notices."
 
 #. TRANS: Client exception displayed when trying to restore an account without having restore rights.
-#: actions/restoreaccount.php:83
 #, fuzzy
 msgid "You may not restore your account."
 msgstr "You have not registered any applications yet."
 
 #. TRANS: Client exception displayed trying to restore an account while something went wrong uploading a file.
 #. TRANS: Client exception. No file; probably just a non-AJAX submission.
-#: actions/restoreaccount.php:121 actions/restoreaccount.php:146
 #, fuzzy
 msgid "No uploaded file."
 msgstr "Upload file"
 
 #. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
-#: actions/restoreaccount.php:129 lib/mediafile.php:194
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
 msgstr ""
 
 #. TRANS: Client exception.
-#: actions/restoreaccount.php:135 lib/mediafile.php:200
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form."
 msgstr ""
 
 #. TRANS: Client exception.
-#: actions/restoreaccount.php:141 lib/mediafile.php:206
 msgid "The uploaded file was only partially uploaded."
 msgstr ""
 
 #. TRANS: Client exception thrown when a temporary folder is not present to store a file upload.
-#: actions/restoreaccount.php:150 lib/mediafile.php:214
 msgid "Missing a temporary folder."
 msgstr ""
 
 #. TRANS: Client exception thrown when writing to disk is not possible during a file upload operation.
-#: actions/restoreaccount.php:154 lib/mediafile.php:218
 msgid "Failed to write file to disk."
 msgstr ""
 
 #. TRANS: Client exception thrown when a file upload operation has been stopped by an extension.
-#: actions/restoreaccount.php:158 lib/mediafile.php:222
 msgid "File upload stopped by extension."
 msgstr ""
 
 #. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
 #. TRANS: Exception thrown when uploading an image fails for an unknown reason.
 #. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
-#: actions/restoreaccount.php:164 lib/imagefile.php:106 lib/mediafile.php:228
 msgid "System error uploading file."
 msgstr "System error uploading file."
 
 #. TRANS: Client exception thrown when a feed is not an Atom feed.
-#: actions/restoreaccount.php:207
 #, fuzzy
 msgid "Not an Atom feed."
 msgstr "All members"
 
 #. TRANS: Success message when a feed has been restored.
-#: actions/restoreaccount.php:241
 msgid ""
 "Feed has been restored. Your old posts should now appear in search and your "
 "profile page."
 msgstr ""
 
 #. TRANS: Message when a feed restore is in progress.
-#: actions/restoreaccount.php:245
 msgid "Feed will be restored. Please wait a few minutes for results."
 msgstr ""
 
 #. TRANS: Form instructions for feed restore.
-#: actions/restoreaccount.php:342
 msgid ""
 "You can upload a backed-up stream in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format."
 msgstr ""
 
 #. TRANS: Title for submit button to confirm upload of a user backup file for account restore.
-#: actions/restoreaccount.php:373
 #, fuzzy
 msgid "Upload the file"
 msgstr "Upload file"
 
-#: actions/revokerole.php:75
 msgid "You cannot revoke user roles on this site."
 msgstr "You cannot revoke user roles on this site."
 
-#: actions/revokerole.php:82
 msgid "User doesn't have this role."
 msgstr "User doesn't have this role."
 
-#: actions/rsd.php:142 actions/version.php:159
 msgid "StatusNet"
 msgstr "StatusNet"
 
-#: actions/sandbox.php:65 actions/unsandbox.php:65
 msgid "You cannot sandbox users on this site."
 msgstr "You cannot sandbox users on this site."
 
-#: actions/sandbox.php:72
 msgid "User is already sandboxed."
 msgstr "User is already sandboxed."
 
 #. TRANS: Menu item for site administration
-#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
-#: lib/adminpanelaction.php:379
 msgid "Sessions"
 msgstr "Sessions"
 
-#: actions/sessionsadminpanel.php:65
 msgid "Session settings for this StatusNet site"
 msgstr ""
 
-#: actions/sessionsadminpanel.php:175
 msgid "Handle sessions"
 msgstr ""
 
-#: actions/sessionsadminpanel.php:177
 msgid "Whether to handle sessions ourselves."
 msgstr ""
 
-#: actions/sessionsadminpanel.php:181
 msgid "Session debugging"
 msgstr ""
 
-#: actions/sessionsadminpanel.php:183
 msgid "Turn on debugging output for sessions."
 msgstr ""
 
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
+#. TRANS: Submit button title.
+msgid "Save"
+msgstr "Save"
+
 msgid "Save site settings"
 msgstr "Save site settings"
 
-#: actions/showapplication.php:78
 msgid "You must be logged in to view an application."
 msgstr "You must be logged in to view an application."
 
-#: actions/showapplication.php:151
 msgid "Application profile"
 msgstr "Application profile"
 
-#: actions/showapplication.php:179
 #, php-format
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr ""
 
-#: actions/showapplication.php:189
 msgid "Application actions"
 msgstr "Application actions"
 
-#: actions/showapplication.php:212
 msgid "Reset key & secret"
 msgstr ""
 
 #. TRANS: Title of form for deleting a user.
-#: actions/showapplication.php:228 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:64 lib/noticelist.php:678
 msgid "Delete"
 msgstr "Delete"
 
-#: actions/showapplication.php:237
 msgid "Application info"
 msgstr "Application information"
 
-#: actions/showapplication.php:255
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
 msgstr ""
 
-#: actions/showapplication.php:275
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr "Are you sure you want to reset your consumer key and secret?"
 
 #. TRANS: Title for all but the first page of favourite notices of a user.
 #. TRANS: %1$s is the user for whom the favourite notices are displayed, %2$d is the page number.
-#: actions/showfavorites.php:80
 #, php-format
 msgid "%1$s's favorite notices, page %2$d"
 msgstr "%1$s's favorite notices, page %2$d"
 
 #. TRANS: Server error displayed when favourite notices could not be retrieved from the database.
-#: actions/showfavorites.php:134
 msgid "Could not retrieve favorite notices."
 msgstr "Could not retrieve favourite notices."
 
 #. TRANS: Feed link text. %s is a username.
-#: actions/showfavorites.php:172
 #, php-format
 msgid "Feed for favorites of %s (RSS 1.0)"
 msgstr "Feed for favourites of %s (RSS 1.0)"
 
 #. TRANS: Feed link text. %s is a username.
-#: actions/showfavorites.php:180
 #, php-format
 msgid "Feed for favorites of %s (RSS 2.0)"
 msgstr "Feed for favourites of %s (RSS 2.0)"
 
 #. TRANS: Feed link text. %s is a username.
-#: actions/showfavorites.php:188
 #, php-format
 msgid "Feed for favorites of %s (Atom)"
 msgstr "Feed for favorites of %s (Atom)"
 
 #. TRANS: Text displayed instead of favourite notices for the current logged in user that has no favourites.
-#: actions/showfavorites.php:209
 msgid ""
 "You haven't chosen any favorite notices yet. Click the fave button on "
 "notices you like to bookmark them for later or shed a spotlight on them."
@@ -5553,7 +4576,6 @@ msgstr ""
 
 #. TRANS: Text displayed instead of favourite notices for a user that has no favourites while logged in.
 #. TRANS: %s is a username.
-#: actions/showfavorites.php:213
 #, php-format
 msgid ""
 "%s hasn't added any favorite notices yet. Post something interesting they "
@@ -5565,7 +4587,6 @@ msgstr ""
 #. TRANS: Text displayed instead of favourite notices for a user that has no favourites while not logged in.
 #. TRANS: %s is a username, %%%%action.register%%%% is a link to the user registration page.
 #. TRANS: (link text)[link] is a Mark Down link.
-#: actions/showfavorites.php:220
 #, php-format
 msgid ""
 "%s hasn't added any favorite notices yet. Why not [register an account](%%%%"
@@ -5577,64 +4598,53 @@ msgstr ""
 "their favourites."
 
 #. TRANS: Page notice for show favourites page.
-#: actions/showfavorites.php:251
 msgid "This is a way to share what you like."
 msgstr ""
 
 #. TRANS: Page title for first group page. %s is a group name.
-#: actions/showgroup.php:75
 #, php-format
 msgid "%s group"
 msgstr "%s group"
 
 #. TRANS: Page title for any but first group page.
 #. TRANS: %1$s is a group name, $2$s is a page number.
-#: actions/showgroup.php:79
 #, php-format
 msgid "%1$s group, page %2$d"
 msgstr "%1$s group, page %2$d"
 
 #. TRANS: Label for group description or group note (dt). Text hidden by default.
-#: actions/showgroup.php:266
 msgid "Note"
 msgstr "Note"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:277 lib/groupeditform.php:180
 msgid "Aliases"
 msgstr ""
 
 #. TRANS: Group actions header (h2). Text hidden by default.
-#: actions/showgroup.php:294
 msgid "Group actions"
 msgstr "Group actions"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:338
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
 msgstr "Notice feed for %s group (RSS 1.0)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:345
 #, php-format
 msgid "Notice feed for %s group (RSS 2.0)"
 msgstr "Notice feed for %s group (RSS 2.0)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:352
 #, php-format
 msgid "Notice feed for %s group (Atom)"
 msgstr "Notice feed for %s group (Atom)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:358
 #, php-format
 msgid "FOAF for %s group"
 msgstr "FOAF for %s group"
 
 #. TRANS: Header for mini list of group members on a group page (h2).
-#: actions/showgroup.php:395
 msgid "Members"
 msgstr "Members"
 
@@ -5642,31 +4652,24 @@ msgstr "Members"
 #. TRANS: Text for user subscription statistics if the user has no subscriptions.
 #. TRANS: Text for user subscriber statistics if user has no subscribers.
 #. TRANS: Text for user user group membership statistics if user is not a member of any group.
-#: actions/showgroup.php:401 lib/profileaction.php:137
-#: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
-#: lib/subscriptionlist.php:123 lib/tagcloudsection.php:71
 msgid "(None)"
 msgstr "(None)"
 
 #. TRANS: Link to all group members from mini list of group members if group has more than n members.
-#: actions/showgroup.php:410
 msgid "All members"
 msgstr "All members"
 
 #. TRANS: Header for group statistics on a group page (h2).
 #. TRANS: H2 text for user statistics.
-#: actions/showgroup.php:441 lib/profileaction.php:205
 msgid "Statistics"
 msgstr "Statistics"
 
-#: actions/showgroup.php:444
 #, fuzzy
 msgctxt "LABEL"
 msgid "Created"
 msgstr "Created"
 
 #. TRANS: Label for member count in statistics on group page.
-#: actions/showgroup.php:449
 #, fuzzy
 msgctxt "LABEL"
 msgid "Members"
@@ -5676,7 +4679,6 @@ msgstr "Members"
 #. TRANS: **%s** is the group alias, %%%%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).
-#: actions/showgroup.php:464
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5694,7 +4696,6 @@ 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: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
-#: actions/showgroup.php:474
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5708,99 +4709,83 @@ msgstr ""
 "their life and interests. "
 
 #. TRANS: Header for list of group administrators on a group page (h2).
-#: actions/showgroup.php:503
 msgid "Admins"
 msgstr "Admins"
 
 #. TRANS: Client error displayed requesting a single message that does not exist.
-#: actions/showmessage.php:76
 msgid "No such message."
 msgstr "No such message."
 
 #. TRANS: Client error displayed requesting a single direct message the requesting user was not a party in.
-#: actions/showmessage.php:86
 msgid "Only the sender and recipient may read this message."
 msgstr "Only the sender and recipient may read this message."
 
 #. TRANS: Page title for single direct message display when viewing user is the sender.
 #. TRANS: %1$s is the addressed user's nickname, $2$s is a timestamp.
-#: actions/showmessage.php:105
 #, php-format
 msgid "Message to %1$s on %2$s"
 msgstr "Message to %1$s on %2$s"
 
 #. TRANS: Page title for single message display.
 #. TRANS: %1$s is the sending user's nickname, $2$s is a timestamp.
-#: actions/showmessage.php:113
 #, php-format
 msgid "Message from %1$s on %2$s"
 msgstr "Message from %1$s on %2$s"
 
-#: actions/shownotice.php:90
 msgid "Notice deleted."
 msgstr "Notice deleted."
 
 #. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
-#: actions/showstream.php:70
 #, fuzzy, php-format
 msgid "%1$s tagged %2$s"
 msgstr "%1$s, page %2$d"
 
 #. TRANS: Page title showing tagged notices in one user's stream.
 #. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
-#: actions/showstream.php:74
 #, fuzzy, php-format
 msgid "%1$s tagged %2$s, page %3$d"
 msgstr "Notices tagged with %1$s, page %2$d"
 
 #. TRANS: Extended page title showing tagged notices in one user's stream.
 #. TRANS: %1$s is the username, %2$d is the page number.
-#: actions/showstream.php:82
 #, php-format
 msgid "%1$s, page %2$d"
 msgstr "%1$s, page %2$d"
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %1$s is a user nickname, %2$s is a hashtag.
-#: actions/showstream.php:127
 #, php-format
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
 msgstr "Notice feed for %1$s tagged %2$s (RSS 1.0)"
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.
-#: actions/showstream.php:136
 #, php-format
 msgid "Notice feed for %s (RSS 1.0)"
 msgstr "Notice feed for %s (RSS 1.0)"
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.
-#: actions/showstream.php:145
 #, php-format
 msgid "Notice feed for %s (RSS 2.0)"
 msgstr "Notice feed for %s (RSS 2.0)"
 
-#: actions/showstream.php:152
 #, php-format
 msgid "Notice feed for %s (Atom)"
 msgstr "Notice feed for %s (Atom)"
 
 #. TRANS: Title for link to notice feed. FOAF stands for Friend of a Friend.
 #. TRANS: More information at http://www.foaf-project.org. %s is a user nickname.
-#: actions/showstream.php:159
 #, php-format
 msgid "FOAF for %s"
 msgstr "FOAF for %s"
 
 #. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
-#: actions/showstream.php:205
 #, fuzzy, php-format
 msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr "This is the timeline for %1$s but %2$s hasn't posted anything yet."
 
 #. TRANS: Second sentence of empty list message for a stream for the user themselves.
-#: actions/showstream.php:211
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
@@ -5808,7 +4793,6 @@ msgstr ""
 
 #. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:215
 #, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
@@ -5819,7 +4803,6 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:258
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5834,7 +4817,6 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:265
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5846,218 +4828,171 @@ msgstr ""
 "[StatusNet](http://status.net/) tool. "
 
 #. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
-#: actions/showstream.php:322
 #, php-format
 msgid "Repeat of %s"
 msgstr "Repeat of %s"
 
-#: actions/silence.php:65 actions/unsilence.php:65
 msgid "You cannot silence users on this site."
 msgstr "You cannot silence users on this site."
 
-#: actions/silence.php:72
 msgid "User is already silenced."
 msgstr "User is already silenced."
 
-#: actions/siteadminpanel.php:69
 msgid "Basic settings for this StatusNet site"
 msgstr "Basic settings for this StatusNet site"
 
-#: actions/siteadminpanel.php:133
 msgid "Site name must have non-zero length."
 msgstr ""
 
-#: actions/siteadminpanel.php:141
 msgid "You must have a valid contact email address."
 msgstr "You must have a valid contact email address."
 
-#: actions/siteadminpanel.php:159
 #, php-format
 msgid "Unknown language \"%s\"."
 msgstr ""
 
-#: actions/siteadminpanel.php:165
 msgid "Minimum text limit is 0 (unlimited)."
 msgstr "Minimum text limit is 0 (unlimited)."
 
-#: actions/siteadminpanel.php:171
 msgid "Dupe limit must be one or more seconds."
 msgstr ""
 
-#: actions/siteadminpanel.php:221
 msgid "General"
 msgstr ""
 
-#: actions/siteadminpanel.php:224
 msgid "Site name"
 msgstr "Site name"
 
-#: actions/siteadminpanel.php:225
 msgid "The name of your site, like \"Yourcompany Microblog\""
 msgstr ""
 
-#: actions/siteadminpanel.php:229
 msgid "Brought by"
 msgstr ""
 
-#: actions/siteadminpanel.php:230
 msgid "Text used for credits link in footer of each page"
 msgstr ""
 
-#: actions/siteadminpanel.php:234
 msgid "Brought by URL"
 msgstr ""
 
-#: actions/siteadminpanel.php:235
 msgid "URL used for credits link in footer of each page"
 msgstr ""
 
-#: actions/siteadminpanel.php:239
 msgid "Contact email address for your site"
 msgstr "Contact e-mail address for your site"
 
-#: actions/siteadminpanel.php:245
 msgid "Local"
 msgstr "Local"
 
-#: actions/siteadminpanel.php:256
 msgid "Default timezone"
 msgstr "Default timezone"
 
-#: actions/siteadminpanel.php:257
 msgid "Default timezone for the site; usually UTC."
 msgstr ""
 
-#: actions/siteadminpanel.php:262
 msgid "Default language"
 msgstr "Default language"
 
-#: actions/siteadminpanel.php:263
 msgid "Site language when autodetection from browser settings is not available"
 msgstr ""
 
-#: actions/siteadminpanel.php:271
 msgid "Limits"
 msgstr ""
 
-#: actions/siteadminpanel.php:274
 msgid "Text limit"
 msgstr ""
 
-#: actions/siteadminpanel.php:274
 msgid "Maximum number of characters for notices."
 msgstr ""
 
-#: actions/siteadminpanel.php:278
 msgid "Dupe limit"
 msgstr ""
 
-#: actions/siteadminpanel.php:278
 msgid "How long users must wait (in seconds) to post the same thing again."
 msgstr ""
 
 #. TRANS: Page title for site-wide notice tab in admin panel.
-#: actions/sitenoticeadminpanel.php:55
 msgid "Site Notice"
 msgstr "Site Notice"
 
 #. TRANS: Instructions for site-wide notice tab in admin panel.
-#: actions/sitenoticeadminpanel.php:66
 msgid "Edit site-wide message"
 msgstr "Edit site-wide message"
 
 #. TRANS: Server error displayed when saving a site-wide notice was impossible.
-#: actions/sitenoticeadminpanel.php:101
 msgid "Unable to save site notice."
 msgstr "Unable to save site notice."
 
 #. TRANS: Client error displayed when a site-wide notice was longer than allowed.
-#: actions/sitenoticeadminpanel.php:112
 msgid "Maximum length for the site-wide notice is 255 characters."
 msgstr ""
 
 #. TRANS: Label for site-wide notice text field in admin panel.
-#: actions/sitenoticeadminpanel.php:176
 msgid "Site notice text"
 msgstr "Site notice text"
 
 #. TRANS: Tooltip for site-wide notice text field in admin panel.
-#: actions/sitenoticeadminpanel.php:179
 msgid "Site-wide notice text (255 characters maximum; HTML allowed)"
 msgstr ""
 
 #. TRANS: Title for button to save site notice in admin panel.
-#: actions/sitenoticeadminpanel.php:201
 #, fuzzy
 msgid "Save site notice."
 msgstr "Save site notice"
 
 #. TRANS: Title for SMS settings.
-#: actions/smssettings.php:56
 msgid "SMS settings"
 msgstr "SMS settings"
 
 #. TRANS: SMS settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/smssettings.php:70
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr "You can receive SMS messages through e-mail from %%site.name%%."
 
 #. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
-#: actions/smssettings.php:92
 msgid "SMS is not available."
 msgstr "SMS is not available."
 
 #. TRANS: Form legend for SMS settings form.
-#: actions/smssettings.php:106
 msgid "SMS address"
 msgstr "SMS address"
 
 #. TRANS: Form guide in SMS settings form.
-#: actions/smssettings.php:115
 msgid "Current confirmed SMS-enabled phone number."
 msgstr "Current confirmed SMS-enabled phone number."
 
 #. TRANS: Form guide in IM settings form.
-#: actions/smssettings.php:128
 msgid "Awaiting confirmation on this phone number."
 msgstr "Awaiting confirmation on this phone number."
 
 #. TRANS: Field label for SMS address input in SMS settings form.
-#: actions/smssettings.php:137
 msgid "Confirmation code"
 msgstr "Confirmation code"
 
 #. TRANS: Form field instructions in SMS settings form.
-#: actions/smssettings.php:139
 msgid "Enter the code you received on your phone."
 msgstr "Enter the code you received on your phone."
 
 #. TRANS: Button label to confirm SMS confirmation code in SMS settings.
-#: actions/smssettings.php:143
 msgctxt "BUTTON"
 msgid "Confirm"
 msgstr "Confirm"
 
 #. TRANS: Field label for SMS phone number input in SMS settings form.
-#: actions/smssettings.php:148
 msgid "SMS phone number"
 msgstr "SMS phone number"
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
-#: actions/smssettings.php:151
 #, fuzzy
 msgid "Phone number, no punctuation or spaces, with area code."
 msgstr "Phone number, no punctuation or spaces, with area code"
 
 #. TRANS: Form legend for SMS preferences form.
-#: actions/smssettings.php:190
 msgid "SMS preferences"
 msgstr "SMS preferences"
 
 #. TRANS: Checkbox label in SMS preferences form.
-#: actions/smssettings.php:196
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
@@ -6066,32 +5001,26 @@ msgstr ""
 "from my carrier."
 
 #. TRANS: Confirmation message for successful SMS preferences save.
-#: actions/smssettings.php:307
 msgid "SMS preferences saved."
 msgstr "SMS preferences saved."
 
 #. TRANS: Message given saving SMS phone number without having provided one.
-#: actions/smssettings.php:329
 msgid "No phone number."
 msgstr "No phone number."
 
 #. TRANS: Message given saving SMS phone number without having selected a carrier.
-#: actions/smssettings.php:335
 msgid "No carrier selected."
 msgstr "No carrier selected."
 
 #. TRANS: Message given saving SMS phone number that is already set.
-#: actions/smssettings.php:343
 msgid "That is already your phone number."
 msgstr "That is already your phone number."
 
 #. TRANS: Message given saving SMS phone number that is already set for another user.
-#: actions/smssettings.php:347
 msgid "That phone number already belongs to another user."
 msgstr "That phone number already belongs to another user."
 
 #. TRANS: Message given saving valid SMS phone number that is to be confirmed.
-#: actions/smssettings.php:375
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
 "for the code and instructions on how to use it."
@@ -6100,39 +5029,32 @@ msgstr ""
 "for the code and instructions on how to use it."
 
 #. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
-#: actions/smssettings.php:403
 msgid "That is the wrong confirmation number."
 msgstr "That is the wrong confirmation number."
 
 #. TRANS: Message given after successfully canceling SMS phone number confirmation.
-#: actions/smssettings.php:417
 msgid "SMS confirmation cancelled."
 msgstr "SMS confirmation cancelled."
 
 #. TRANS: Message given trying to remove an SMS phone number that is not
 #. TRANS: registered for the active user.
-#: actions/smssettings.php:437
 msgid "That is not your phone number."
 msgstr "That is not your phone number."
 
 #. TRANS: Message given after successfully removing a registered SMS phone number.
-#: actions/smssettings.php:459
 msgid "The SMS phone number was removed."
 msgstr "The SMS phone number was removed."
 
 #. TRANS: Label for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:498
 msgid "Mobile carrier"
 msgstr "Mobile carrier"
 
 #. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:503
 msgid "Select a carrier"
 msgstr "Select a carrier"
 
 #. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
 #. TRANS: %s is an administrative contact's e-mail address.
-#: actions/smssettings.php:512
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -6142,119 +5064,94 @@ msgstr ""
 "email but isn't listed here, send email to let us know at %s."
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
-#: actions/smssettings.php:534
 #, fuzzy
 msgid "No code entered."
 msgstr "No code entered"
 
 #. TRANS: Menu item for site administration
-#: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
-#: lib/adminpanelaction.php:395
 msgid "Snapshots"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:65
 msgid "Manage snapshot configuration"
 msgstr "Manage snapshot configuration"
 
-#: actions/snapshotadminpanel.php:127
 msgid "Invalid snapshot run value."
 msgstr "Invalid snapshot run value."
 
-#: actions/snapshotadminpanel.php:133
 msgid "Snapshot frequency must be a number."
 msgstr ""
 
-#: actions/snapshotadminpanel.php:144
 msgid "Invalid snapshot report URL."
 msgstr "Invalid snapshot report URL."
 
-#: actions/snapshotadminpanel.php:200
 msgid "Randomly during web hit"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:201
 msgid "In a scheduled job"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:206
 msgid "Data snapshots"
 msgstr "Data snapshots"
 
-#: actions/snapshotadminpanel.php:208
 msgid "When to send statistical data to status.net servers"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:217
 msgid "Frequency"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:218
 msgid "Snapshots will be sent once every N web hits"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:226
 msgid "Report URL"
 msgstr "Report URL"
 
-#: actions/snapshotadminpanel.php:227
 msgid "Snapshots will be sent to this URL"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:248
 msgid "Save snapshot settings"
 msgstr "Save snapshot settings"
 
 #. TRANS: Client error displayed trying a change a subscription for a non-subscribed profile.
-#: actions/subedit.php:75
 msgid "You are not subscribed to that profile."
 msgstr "You are not subscribed to that profile."
 
 #. TRANS: Server error displayed when updating a subscription fails with a database error.
 #. TRANS: Exception thrown when a subscription could not be stored on the server.
-#: actions/subedit.php:89 classes/Subscription.php:141
 msgid "Could not save subscription."
 msgstr "Could not save subscription."
 
 #. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
-#: actions/subscribe.php:121
 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
 msgstr "You cannot subscribe to an OMB 0.1 remote profile with this action."
 
 #. TRANS: Page title when subscription succeeded.
-#: actions/subscribe.php:149
 msgid "Subscribed"
 msgstr "Subscribed"
 
 #. TRANS: Header for list of subscribers for a user (first page).
 #. TRANS: %s is the user's nickname.
-#: actions/subscribers.php:51
 #, php-format
 msgid "%s subscribers"
 msgstr "%s subscribers"
 
 #. TRANS: Header for list of subscribers for a user (not first page).
 #. TRANS: %1$s is the user's nickname, $2$d is the page number.
-#: actions/subscribers.php:55
 #, php-format
 msgid "%1$s subscribers, page %2$d"
 msgstr "%1$s subscribers, page %2$d"
 
 #. TRANS: Page notice for page with an overview of all subscribers
 #. TRANS: of the logged in user's own profile.
-#: actions/subscribers.php:68
 msgid "These are the people who listen to your notices."
 msgstr "These are the people who listen to your notices."
 
 #. TRANS: Page notice for page with an overview of all subscribers of a user other
 #. TRANS: than the logged in user. %s is the user nickname.
-#: actions/subscribers.php:74
 #, php-format
 msgid "These are the people who listen to %s's notices."
 msgstr "These are the people who listen to %s's notices."
 
 #. TRANS: Subscriber list text when the logged in user has no subscribers.
-#: actions/subscribers.php:114
 #, fuzzy
 msgid ""
 "You have no subscribers. Try subscribing to people you know and they might "
@@ -6265,7 +5162,6 @@ msgstr ""
 
 #. TRANS: Subscriber list text when looking at the subscribers for a of a user other
 #. TRANS: than the logged in user that has no subscribers. %s is the user nickname.
-#: actions/subscribers.php:118
 #, php-format
 msgid "%s has no subscribers. Want to be the first?"
 msgstr ""
@@ -6275,7 +5171,6 @@ msgstr ""
 #. TRANS: This message contains a Markdown URL. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.
-#: actions/subscribers.php:127
 #, php-format
 msgid ""
 "%s has no subscribers. Why not [register an account](%%%%action.register%%%"
@@ -6286,20 +5181,17 @@ msgstr ""
 
 #. TRANS: Header for subscriptions overview for a user (not first page).
 #. TRANS: %1$s is a user nickname, %2$d is the page number.
-#: actions/subscriptions.php:55
 #, php-format
 msgid "%1$s subscriptions, page %2$d"
 msgstr "%1$s subscriptions, page %2$d"
 
 #. TRANS: Page notice for page with an overview of all subscriptions
 #. TRANS: of the logged in user's own profile.
-#: actions/subscriptions.php:68
 msgid "These are the people whose notices you listen to."
 msgstr "These are the people whose notices you listen to."
 
 #. TRANS: Page notice for page with an overview of all subscriptions of a user other
 #. TRANS: than the logged in user. %s is the user nickname.
-#: actions/subscriptions.php:74
 #, php-format
 msgid "These are the people whose notices %s listens to."
 msgstr "These are the people whose notices %s listens to."
@@ -6308,7 +5200,6 @@ msgstr "These are the people whose notices %s listens to."
 #. 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.
-#: actions/subscriptions.php:133
 #, php-format
 msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "
@@ -6322,69 +5213,55 @@ msgstr ""
 #. TRANS: than the logged in user that has no subscriptions. %s is the user nickname.
 #. TRANS: Subscription list text when looking at the subscriptions for a of a user that has none
 #. TRANS: as an anonymous user. %s is the user nickname.
-#: actions/subscriptions.php:141 actions/subscriptions.php:147
 #, php-format
 msgid "%s is not listening to anyone."
 msgstr "%s is not listening to anyone."
 
 #. TRANS: Atom feed title. %s is a profile nickname.
-#: actions/subscriptions.php:176
 #, fuzzy, php-format
 msgid "Subscription feed for %s (Atom)"
 msgstr "Notice feed for %s (Atom)"
 
 #. TRANS: Checkbox label for enabling Jabber messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:241 lib/settingsnav.php:110
-#, fuzzy
 msgid "IM"
 msgstr "IM"
 
 #. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:256 lib/settingsnav.php:117
 msgid "SMS"
 msgstr "SMS"
 
 #. TRANS: Title for all but the first page of notices with tags.
 #. TRANS: %1$s is the tag, %2$d is the page number.
-#: actions/tag.php:73
 #, php-format
 msgid "Notices tagged with %1$s, page %2$d"
 msgstr "Notices tagged with %1$s, page %2$d"
 
-#: actions/tag.php:91
 #, php-format
 msgid "Notice feed for tag %s (RSS 1.0)"
 msgstr "Notice feed for tag %s (RSS 1.0)"
 
-#: actions/tag.php:97
 #, php-format
 msgid "Notice feed for tag %s (RSS 2.0)"
 msgstr "Notice feed for tag %s (RSS 2.0)"
 
-#: actions/tag.php:103
 #, php-format
 msgid "Notice feed for tag %s (Atom)"
 msgstr "Notice feed for tag %s (Atom)"
 
-#: actions/tagother.php:39
 msgid "No ID argument."
 msgstr "No ID argument."
 
-#: actions/tagother.php:65
 #, php-format
 msgid "Tag %s"
 msgstr "Tag %s"
 
 #. TRANS: H2 for user profile information.
-#: actions/tagother.php:77 lib/userprofile.php:76
 msgid "User profile"
 msgstr "User profile"
 
-#: actions/tagother.php:120
 msgid "Tag user"
 msgstr "Tag user"
 
-#: actions/tagother.php:130
 msgid ""
 "Tags for this user (letters, numbers, -, ., and _), comma- or space- "
 "separated"
@@ -6392,222 +5269,177 @@ msgstr ""
 "Tags for this user (letters, numbers, -, ., and _), comma- or space- "
 "separated"
 
-#: actions/tagother.php:157
 #, php-format
 msgid "Invalid tag: \"%s\""
 msgstr "Invalid tag: \"%s\""
 
-#: actions/tagother.php:172
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 
-#: actions/tagother.php:215
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr "Use this form to add tags to your subscribers or subscriptions."
 
-#: actions/tagrss.php:35
 msgid "No such tag."
 msgstr "No such tag."
 
 #. TRANS: Client error displayed when trying to unblock a non-blocked user.
-#: actions/unblock.php:59
 msgid "You haven't blocked that user."
 msgstr "You haven't blocked that user."
 
-#: actions/unsandbox.php:72
 msgid "User is not sandboxed."
 msgstr "User is not sandboxed."
 
-#: actions/unsilence.php:72
 msgid "User is not silenced."
 msgstr "User is not silenced."
 
-#: actions/unsubscribe.php:77
 msgid "No profile ID in request."
 msgstr "No profile ID in request."
 
-#: actions/unsubscribe.php:98
 msgid "Unsubscribed"
 msgstr "Unsubscribed"
 
-#: actions/updateprofile.php:64
 #, php-format
 msgid ""
 "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
 msgstr ""
 "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
 
-#: actions/urlsettings.php:60
 #, fuzzy
 msgid "URL settings"
 msgstr "IM settings"
 
 #. TRANS: Instructions for tab "Other" in user profile settings.
-#: actions/urlsettings.php:72
 msgid "Manage various other options."
 msgstr "Manage various other options."
 
 #. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
 #. TRANS: user's profile settings. This message has one space at the beginning. Use your
 #. TRANS: language's word separator here if it has one (most likely a single space).
-#: actions/urlsettings.php:115
 msgid " (free service)"
 msgstr ""
 
-#: actions/urlsettings.php:121
 #, fuzzy
 msgid "[none]"
 msgstr "None"
 
-#: actions/urlsettings.php:122
 msgid "[internal]"
 msgstr ""
 
 #. TRANS: Label for dropdown with URL shortener services.
-#: actions/urlsettings.php:130
 msgid "Shorten URLs with"
 msgstr "Shorten URLs with"
 
 #. TRANS: Tooltip for for dropdown with URL shortener services.
-#: actions/urlsettings.php:132
 msgid "Automatic shortening service to use."
 msgstr "Automatic shortening service to use."
 
-#: actions/urlsettings.php:138
 msgid "URL longer than"
 msgstr ""
 
-#: actions/urlsettings.php:141
 msgid "URLs longer than this will be shortened, 0 means always shorten."
 msgstr ""
 
-#: actions/urlsettings.php:145
 msgid "Text longer than"
 msgstr ""
 
-#: actions/urlsettings.php:148
 msgid ""
 "URLs in notices longer than this will be shortened, 0 means always shorten."
 msgstr ""
 
 #. TRANS: Form validation error for form "Other settings" in user profile.
-#: actions/urlsettings.php:180
 #, fuzzy
 msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr "URL shortening service is too long (max 50 chars)."
 
-#: actions/urlsettings.php:187
 msgid "Invalid number for max url length."
 msgstr ""
 
-#: actions/urlsettings.php:193
 #, fuzzy
 msgid "Invalid number for max notice length."
 msgstr "Invalid notice content."
 
-#: actions/urlsettings.php:238
 msgid "Error saving user URL shortening preferences."
 msgstr ""
 
 #. TRANS: User admin panel title
-#: actions/useradminpanel.php:58
 msgctxt "TITLE"
 msgid "User"
 msgstr "User"
 
 #. TRANS: Instruction for user admin panel.
-#: actions/useradminpanel.php:69
 msgid "User settings for this StatusNet site"
 msgstr ""
 
 #. TRANS: Form validation error in user admin panel when a non-numeric character limit was set.
-#: actions/useradminpanel.php:147
 msgid "Invalid bio limit. Must be numeric."
 msgstr ""
 
 #. TRANS: Form validation error in user admin panel when welcome text is too long.
-#: actions/useradminpanel.php:154
 msgid "Invalid welcome text. Maximum length is 255 characters."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to set a non-existing user as default subscription for new
 #. TRANS: users in user admin panel. %1$s is the invalid nickname.
-#: actions/useradminpanel.php:166
 #, php-format
 msgid "Invalid default subscripton: \"%1$s\" is not a user."
 msgstr ""
 
-#: actions/useradminpanel.php:215 lib/action.php:565 lib/settingsnav.php:77
-#: lib/subgroupnav.php:81
 msgid "Profile"
 msgstr "Profile"
 
 #. TRANS: Field label in user admin panel for setting the character limit for the bio field.
-#: actions/useradminpanel.php:220
 msgid "Bio Limit"
 msgstr ""
 
 #. TRANS: Tooltip in user admin panel for setting the character limit for the bio field.
-#: actions/useradminpanel.php:222
 msgid "Maximum length of a profile bio in characters."
 msgstr ""
 
 #. TRANS: Form legend in user admin panel.
-#: actions/useradminpanel.php:231
 msgid "New users"
 msgstr "New users"
 
 #. TRANS: Field label in user admin panel for setting new user welcome text.
-#: actions/useradminpanel.php:236
 msgid "New user welcome"
 msgstr "New user welcome"
 
 #. TRANS: Tooltip in user admin panel for setting new user welcome text.
-#: actions/useradminpanel.php:238
 #, fuzzy
 msgid "Welcome text for new users (maximum 255 characters)."
 msgstr "Welcome text for new users (maximum 255 characters)."
 
 #. TRANS: Field label in user admin panel for setting default subscription for new users.
-#: actions/useradminpanel.php:244
 msgid "Default subscription"
 msgstr "Default subscription"
 
 #. TRANS: Tooltip in user admin panel for setting default subscription for new users.
-#: actions/useradminpanel.php:246
 msgid "Automatically subscribe new users to this user."
 msgstr "Automatically subscribe new users to this user."
 
 #. TRANS: Form legend in user admin panel.
-#: actions/useradminpanel.php:256
 msgid "Invitations"
 msgstr "Invitations"
 
 #. TRANS: Field label for checkbox in user admin panel for allowing users to invite friend using site e-mail.
-#: actions/useradminpanel.php:262
 msgid "Invitations enabled"
 msgstr "Invitations enabled"
 
 #. TRANS: Tooltip for checkbox in user admin panel for allowing users to invite friend using site e-mail.
-#: actions/useradminpanel.php:265
 msgid "Whether to allow users to invite new users."
 msgstr ""
 
 #. TRANS: Title for button to save user settings in user admin panel.
-#: actions/useradminpanel.php:302
 #, fuzzy
 msgid "Save user settings."
 msgstr "Save site settings"
 
 #. TRANS: Page title.
-#: actions/userauthorization.php:109
 msgid "Authorize subscription"
 msgstr "Authorise subscription"
 
 #. TRANS: Page notice on "Auhtorize subscription" page.
-#: actions/userauthorization.php:115
 #, fuzzy
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
@@ -6619,42 +5451,35 @@ msgstr ""
 "click “Reject”."
 
 #. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:200
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Accept"
 msgstr "Accept"
 
 #. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:202
 #, fuzzy
 msgid "Subscribe to this user."
 msgstr "Subscribe to this user"
 
 #. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:204
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Reject"
 msgstr "Reject"
 
 #. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:206
 #, fuzzy
 msgid "Reject this subscription."
 msgstr "Reject this subscription"
 
 #. TRANS: Client error displayed for an empty authorisation request.
-#: actions/userauthorization.php:219
 msgid "No authorization request!"
 msgstr "No authorisation request!"
 
 #. TRANS: Accept message header from Authorise subscription page.
-#: actions/userauthorization.php:242
 msgid "Subscription authorized"
 msgstr "Subscription authorised"
 
-#: actions/userauthorization.php:245
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to authorize the "
@@ -6665,11 +5490,9 @@ msgstr ""
 "subscription. Your subscription token is:"
 
 #. TRANS: Reject message header from Authorise subscription page.
-#: actions/userauthorization.php:256
 msgid "Subscription rejected"
 msgstr "Subscription rejected"
 
-#: actions/userauthorization.php:259
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to fully reject the "
@@ -6681,35 +5504,30 @@ msgstr ""
 
 #. TRANS: Exception thrown when no valid user is found for an authorisation request.
 #. TRANS: %s is a listener URI.
-#: actions/userauthorization.php:296
 #, php-format
 msgid "Listener URI \"%s\" not found here."
 msgstr ""
 
 #. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
 #. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:303
 #, fuzzy, php-format
 msgid "Listenee URI \"%s\" is too long."
 msgstr "Source URL is too long."
 
 #. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
 #. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:311
 #, php-format
 msgid "Listenee URI \"%s\" is a local user."
 msgstr ""
 
 #. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
 #. TRANS: %s is a profile URL.
-#: actions/userauthorization.php:329
 #, php-format
 msgid "Profile URL \"%s\" is for a local user."
 msgstr ""
 
 #. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
 #. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
-#: actions/userauthorization.php:339
 #, fuzzy, php-format
 msgid ""
 "Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
@@ -6719,32 +5537,27 @@ msgstr ""
 
 #. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
 #. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:349
 #, fuzzy, php-format
 msgid "Avatar URL \"%s\" is not valid."
 msgstr "Avatar URL ‘%s’ is not valid."
 
 #. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
 #. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:356
 #, fuzzy, php-format
 msgid "Cannot read avatar URL \"%s\"."
 msgstr "Can’t read avatar URL ‘%s’."
 
 #. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
 #. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:363
 #, fuzzy, php-format
 msgid "Wrong image type for avatar URL \"%s\"."
 msgstr "Wrong image type for avatar URL ‘%s’."
 
 #. TRANS: Page title for profile design page.
-#: actions/userdesignsettings.php:74 lib/designsettings.php:61
 msgid "Profile design"
 msgstr "Profile design"
 
 #. TRANS: Instructions for profile design page.
-#: actions/userdesignsettings.php:84 lib/designsettings.php:72
 msgid ""
 "Customize the way your profile looks with a background image and a colour "
 "palette of your choice."
@@ -6752,44 +5565,35 @@ msgstr ""
 "Customise the way your profile looks with a background image and a colour "
 "palette of your choice."
 
-#: actions/userdesignsettings.php:289
 msgid "Enjoy your hotdog!"
 msgstr ""
 
-#: actions/userdesignsettings.php:325
 #, fuzzy
 msgid "Design settings"
 msgstr "Save site settings"
 
-#: actions/userdesignsettings.php:340
 msgid "View profile designs"
 msgstr "View profile designs"
 
-#: actions/userdesignsettings.php:341
 msgid "Show or hide profile designs."
 msgstr "Show or hide profile designs."
 
-#: actions/userdesignsettings.php:348
 #, fuzzy
 msgid "Background file"
 msgstr "Background"
 
 #. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number.
-#: actions/usergroups.php:66
 #, php-format
 msgid "%1$s groups, page %2$d"
 msgstr "%1$s groups, page %2$d"
 
-#: actions/usergroups.php:132
 msgid "Search for more groups"
 msgstr "Search for more groups"
 
-#: actions/usergroups.php:159
 #, php-format
 msgid "%s is not a member of any group."
 msgstr "%s is not a member of any group."
 
-#: actions/usergroups.php:164
 #, php-format
 msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
 msgstr ""
@@ -6799,34 +5603,27 @@ msgstr ""
 #. TRANS: %1$s is a group name, %2$s is a site name.
 #. TRANS: Message is used as a subtitle in atom user notice feed.
 #. TRANS: %1$s is a user name, %2$s is a site name.
-#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:70
-#: lib/atomusernoticefeed.php:95
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr "Updates from %1$s on %2$s!"
 
-#: actions/version.php:75
 #, php-format
 msgid "StatusNet %s"
 msgstr "StatusNet %s"
 
-#: actions/version.php:155
 #, php-format
 msgid ""
 "This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
 "Inc. and contributors."
 msgstr ""
 
-#: actions/version.php:163
 msgid "Contributors"
 msgstr "Contributors"
 
 #. TRANS: Menu item for site administration
-#: actions/version.php:167 lib/adminpanelaction.php:403
 msgid "License"
 msgstr "License"
 
-#: actions/version.php:170
 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 "
@@ -6838,7 +5635,6 @@ msgstr ""
 "Software Foundation, either version 3 of the Licence, or (at your option) "
 "any later version. "
 
-#: actions/version.php:176
 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 "
@@ -6850,7 +5646,6 @@ msgstr ""
 "FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public Licence "
 "for more details. "
 
-#: actions/version.php:182
 #, php-format
 msgid ""
 "You should have received a copy of the GNU Affero General Public License "
@@ -6860,52 +5655,42 @@ msgstr ""
 "along with this program.  If not, see %s."
 
 #. TRANS: Form input field label for application name.
-#: actions/version.php:197 lib/applicationeditform.php:190
 msgid "Name"
 msgstr "Name"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:885
 msgid "Version"
 msgstr "Version"
 
-#: actions/version.php:199
 msgid "Author(s)"
 msgstr ""
 
 #. TRANS: Form input field label.
-#: actions/version.php:200 lib/applicationeditform.php:208
-#: lib/groupeditform.php:168
 msgid "Description"
 msgstr "Description"
 
 #. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:164
 msgid "Favor"
 msgstr "Favour"
 
 #. TRANS: Ntofication given when a user marks a notice as favorite.
 #. TRANS: %1$s is a user nickname or full name, %2$s is a notice URI.
-#: classes/Fave.php:167
 #, php-format
 msgid "%1$s marked notice %2$s as a favorite."
 msgstr "%1$s marked notice %2$s as a favourite."
 
 #. TRANS: Server exception thrown when a URL cannot be processed.
-#: classes/File.php:162
 #, php-format
 msgid "Cannot process URL '%s'"
 msgstr ""
 
 #. TRANS: Server exception thrown when... Robin thinks something is impossible!
-#: classes/File.php:194
 msgid "Robin thinks something is impossible."
 msgstr ""
 
 #. 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$s is used for plural.
-#: classes/File.php:210
 #, php-format
 msgid ""
 "No file may be larger than %1$d byte and the file you sent was %2$d bytes. "
@@ -6918,7 +5703,6 @@ msgstr[1] ""
 
 #. TRANS: Message given if an upload would exceed user quota.
 #. TRANS: %d (number) is the user quota in bytes and is used for plural.
-#: classes/File.php:223
 #, php-format
 msgid "A file this large would exceed your user quota of %d byte."
 msgid_plural "A file this large would exceed your user quota of %d bytes."
@@ -6927,7 +5711,6 @@ msgstr[1] ""
 
 #. TRANS: Message given id an upload would exceed a user's monthly quota.
 #. TRANS: $d (number) is the monthly user quota in bytes and is used for plural.
-#: classes/File.php:235
 #, php-format
 msgid "A file this large would exceed your monthly quota of %d byte."
 msgid_plural "A file this large would exceed your monthly quota of %d bytes."
@@ -6935,115 +5718,95 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Client exception thrown if a file upload does not have a valid name.
-#: classes/File.php:282 classes/File.php:297
 msgid "Invalid filename."
 msgstr "Invalid filename."
 
 #. TRANS: Exception thrown when joining a group fails.
-#: classes/Group_member.php:51
 msgid "Group join failed."
 msgstr "Group join failed."
 
 #. TRANS: Exception thrown when trying to leave a group the user is not a member of.
-#: classes/Group_member.php:64
 msgid "Not part of group."
 msgstr "Not part of group."
 
 #. TRANS: Exception thrown when trying to leave a group fails.
-#: classes/Group_member.php:72
 msgid "Group leave failed."
 msgstr "Group leave failed."
 
 #. TRANS: Exception thrown providing an invalid profile ID.
 #. TRANS: %s is the invalid profile ID.
-#: classes/Group_member.php:85
 #, php-format
 msgid "Profile ID %s is invalid."
 msgstr ""
 
 #. TRANS: Exception thrown providing an invalid group ID.
 #. TRANS: %s is the invalid group ID.
-#: classes/Group_member.php:98
 #, php-format
 msgid "Group ID %s is invalid."
 msgstr "Group ID %s is invalid."
 
 #. TRANS: Activity title.
-#: classes/Group_member.php:147 lib/joinform.php:114
 msgid "Join"
 msgstr "Join"
 
 #. TRANS: Success message for subscribe to group attempt through OStatus.
 #. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
-#: classes/Group_member.php:151
 #, php-format
 msgid "%1$s has joined group %2$s."
 msgstr ""
 
 #. TRANS: Server exception thrown when updating a local group fails.
-#: classes/Local_group.php:42
 msgid "Could not update local group."
 msgstr "Could not update local group."
 
 #. TRANS: Exception thrown when trying creating a login token failed.
 #. TRANS: %s is the user nickname for which token creation failed.
-#: classes/Login_token.php:78
 #, php-format
 msgid "Could not create login token for %s"
 msgstr "Could not create login token for %s"
 
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
-#: classes/Memcached_DataObject.php:556
 msgid "No database name or DSN found anywhere."
 msgstr ""
 
 #. TRANS: Client exception thrown when a user tries to send a direct message while being banned from sending them.
-#: classes/Message.php:45
 msgid "You are banned from sending direct messages."
 msgstr "You are banned from sending direct messages."
 
 #. TRANS: Message given when a message could not be stored on the server.
-#: classes/Message.php:69
 msgid "Could not insert message."
 msgstr "Could not insert message."
 
 #. TRANS: Message given when a message could not be updated on the server.
-#: classes/Message.php:80
 msgid "Could not update message with new URI."
 msgstr "Could not update message with new URI."
 
 #. TRANS: Server exception thrown when a user profile for a notice cannot be found.
 #. TRANS: %1$d is a profile ID (number), %2$d is a notice ID (number).
-#: classes/Notice.php:98
 #, php-format
 msgid "No such profile (%1$d) for notice (%2$d)."
 msgstr ""
 
 #. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:199
 #, php-format
 msgid "Database error inserting hashtag: %s"
 msgstr "Database error inserting hashtag: %s"
 
 #. TRANS: Client exception thrown if a notice contains too many characters.
-#: classes/Notice.php:279
 msgid "Problem saving notice. Too long."
 msgstr "Problem saving notice. Too long."
 
 #. TRANS: Client exception thrown when trying to save a notice for an unknown user.
-#: classes/Notice.php:284
 msgid "Problem saving notice. Unknown user."
 msgstr "Problem saving notice. Unknown user."
 
 #. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
-#: classes/Notice.php:290
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 
 #. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
-#: classes/Notice.php:297
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
 "few minutes."
@@ -7052,42 +5815,35 @@ msgstr ""
 "few minutes."
 
 #. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:305
 msgid "You are banned from posting notices on this site."
 msgstr "You are banned from posting notices on this site."
 
 #. TRANS: Server exception thrown when a notice cannot be saved.
 #. TRANS: Server exception thrown when a notice cannot be updated.
-#: classes/Notice.php:372 classes/Notice.php:399
 msgid "Problem saving notice."
 msgstr "Problem saving notice."
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:929
 msgid "Bad type provided to saveKnownGroups."
 msgstr ""
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:1028
 msgid "Problem saving group inbox."
 msgstr "Problem saving group inbox."
 
 #. TRANS: Server exception thrown when a reply cannot be saved.
 #. TRANS: %1$d is a notice ID, %2$d is the ID of the mentioned user.
-#: classes/Notice.php:1144
 #, php-format
 msgid "Could not save reply for %1$d, %2$d."
 msgstr "Could not save reply for %1$d, %2$d."
 
 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1663
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
 
 #. TRANS: Full name of a profile or group followed by nickname in parens
-#: classes/Profile.php:172 classes/User_group.php:242
 #, fuzzy, php-format
 msgctxt "FANCYNAME"
 msgid "%1$s (%2$s)"
@@ -7095,264 +5851,209 @@ msgstr "%1$s (%2$s)"
 
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:779
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:788
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
 
 #. TRANS: Exception thrown when a right for a non-existing user profile is checked.
-#: classes/Remote_profile.php:54
 msgid "Missing profile."
 msgstr "Missing profile."
 
 #. TRANS: Exception thrown when a tag cannot be saved.
-#: classes/Status_network.php:338
 msgid "Unable to save tag."
 msgstr "Unable to save tag."
 
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#: classes/Subscription.php:77 lib/oauthstore.php:482
 msgid "You have been banned from subscribing."
 msgstr "You have been banned from subscribing."
 
 #. TRANS: Exception thrown when trying to subscribe while already subscribed.
-#: classes/Subscription.php:82
 msgid "Already subscribed!"
 msgstr "Already subscribed!"
 
 #. TRANS: Exception thrown when trying to subscribe to a user who has blocked the subscribing user.
-#: classes/Subscription.php:87
 msgid "User has blocked you."
 msgstr "User has blocked you."
 
 #. TRANS: Exception thrown when trying to unsibscribe without a subscription.
-#: classes/Subscription.php:176
 msgid "Not subscribed!"
 msgstr "Not subscribed!"
 
 #. TRANS: Exception thrown when trying to unsubscribe a user from themselves.
-#: classes/Subscription.php:183
 msgid "Could not delete self-subscription."
 msgstr "Could not delete self-subscription."
 
 #. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
-#: classes/Subscription.php:211
 msgid "Could not delete subscription OMB token."
 msgstr "Could not delete subscription OMB token."
 
 #. TRANS: Exception thrown when a subscription could not be deleted on the server.
-#: classes/Subscription.php:223
 msgid "Could not delete subscription."
 msgstr "Could not delete subscription."
 
 #. TRANS: Activity tile when subscribing to another person.
-#: classes/Subscription.php:265
 msgid "Follow"
 msgstr ""
 
 #. TRANS: Notification given when one person starts following another.
 #. TRANS: %1$s is the subscriber, %2$s is the subscribed.
-#: classes/Subscription.php:268
 #, php-format
 msgid "%1$s is now following %2$s."
 msgstr "%1$s is now following %2$s."
 
 #. TRANS: Notice given on user registration.
 #. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:390
 #, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr "Welcome to %1$s, @%2$s!"
 
 #. TRANS: Server exception.
-#: classes/User.php:923
 msgid "No single user defined for single-user mode."
 msgstr ""
 
 #. TRANS: Server exception.
-#: classes/User.php:927
 msgid "Single-user mode code called when not enabled."
 msgstr ""
 
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:522
 msgid "Could not create group."
 msgstr "Could not create group."
 
 #. TRANS: Server exception thrown when updating a group URI failed.
-#: classes/User_group.php:532
 msgid "Could not set group URI."
 msgstr "Could not set group URI."
 
 #. TRANS: Server exception thrown when setting group membership failed.
-#: classes/User_group.php:555
 msgid "Could not set group membership."
 msgstr "Could not set group membership."
 
 #. TRANS: Server exception thrown when saving local group information failed.
-#: classes/User_group.php:570
 msgid "Could not save local group info."
 msgstr "Could not save local group info."
 
 #. TRANS: Exception thrown when an account could not be located when it should be moved.
 #. TRANS: %s is the remote site.
-#: lib/accountmover.php:65
 #, fuzzy, php-format
 msgid "Cannot locate account %s."
 msgstr "You cannot delete users."
 
 #. TRANS: Exception thrown when a service document could not be located account move.
 #. TRANS: %s is the remote site.
-#: lib/accountmover.php:106
 #, php-format
 msgid "Cannot find XRD for %s."
 msgstr ""
 
 #. TRANS: Exception thrown when an account could not be located when it should be moved.
 #. TRANS: %s is the remote site.
-#: lib/accountmover.php:131
 #, php-format
 msgid "No AtomPub API service for %s."
 msgstr ""
 
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: lib/action.php:161
 #, php-format
 msgid "%1$s - %2$s"
 msgstr "%1$s - %2$s"
 
 #. TRANS: Page title for a page without a title set.
-#: lib/action.php:177
 msgid "Untitled page"
 msgstr "Untitled page"
 
 #. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.
-#: lib/action.php:325
 msgctxt "TOOLTIP"
 msgid "Show more"
 msgstr ""
 
 #. TRANS: Inline reply form submit button: submits a reply comment.
-#: lib/action.php:328
 #, fuzzy
 msgctxt "BUTTON"
-msgid "Comment"
-msgstr "Content"
+msgid "Reply"
+msgstr "Reply"
 
 #. TRANS: Placeholder text for inline reply form. Clicking in this box will turn it into a mini notice form.
-#: lib/action.php:331
-msgid "Add a comment..."
+msgid "Write a reply..."
 msgstr ""
 
-#: lib/action.php:559 lib/personalgroupnav.php:99
-#, fuzzy
 msgid "Home"
 msgstr "Homepage"
 
-#: lib/action.php:560
 #, fuzzy
 msgid "Friends timeline"
 msgstr "%s timeline"
 
-#: lib/action.php:566
 #, fuzzy
 msgid "Your profile"
 msgstr "Group profile"
 
-#: lib/action.php:570 lib/action.php:593 lib/publicgroupnav.php:78
 msgid "Public"
 msgstr "Public"
 
-#: lib/action.php:571 lib/action.php:594
 #, fuzzy
 msgid "Everyone on this site"
 msgstr "Find people on this site"
 
-#: lib/action.php:575
-#, fuzzy
 msgid "Settings"
 msgstr "SMS settings"
 
-#: lib/action.php:576
 #, fuzzy
 msgid "Change your personal settings"
 msgstr "Change your profile settings"
 
-#: lib/action.php:582
 #, fuzzy
 msgid "Site configuration"
 msgstr "User configuration"
 
-#: lib/action.php:587
-#, fuzzy
 msgid "Logout"
 msgstr "Logout"
 
-#: lib/action.php:588
-#, fuzzy
 msgid "Logout from the site"
 msgstr "Logout from the site"
 
-#: lib/action.php:599
-#, fuzzy
 msgid "Login to the site"
 msgstr "Login to the site"
 
-#: lib/action.php:606
-#, fuzzy
 msgid "Search"
 msgstr "Search"
 
-#: lib/action.php:607
 #, fuzzy
 msgid "Search the site"
 msgstr "Search site"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:864
 msgid "Help"
 msgstr "Help"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:867
 msgid "About"
 msgstr "About"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:870
 msgid "FAQ"
 msgstr "F.A.Q."
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:875
 msgid "TOS"
 msgstr ""
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:879
 msgid "Privacy"
 msgstr "Privacy"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:882
 msgid "Source"
 msgstr "Source"
 
 #. TRANS: Secondary navigation menu option leading to e-mail contact information on the
 #. TRANS: StatusNet site, where to report bugs, ...
-#: lib/action.php:889
 msgid "Contact"
 msgstr "Contact"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:892
 msgid "Badge"
 msgstr "Badge"
 
@@ -7360,7 +6061,6 @@ msgstr "Badge"
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:921
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7370,7 +6070,6 @@ msgstr ""
 "broughtby%%](%%site.broughtbyurl%%)."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:924
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** is a microblogging service."
@@ -7379,7 +6078,6 @@ msgstr "**%%site.name%%** is a microblogging service."
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:931
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7392,106 +6090,88 @@ msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:949
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:956
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:960
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:992
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr "All %1$s content and data are available under the %2$s licence."
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1335
 msgid "After"
 msgstr "After"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1345
 msgid "Before"
 msgstr "Before"
 
 #. TRANS: Client exception thrown when a feed instance is a DOMDocument.
-#: lib/activity.php:125
 msgid "Expecting a root feed element but got a whole XML document."
 msgstr ""
 
 #. TRANS: Client exception thrown when using an unknown verb for the activity importer.
-#: lib/activityimporter.php:81
 #, fuzzy, php-format
 msgid "Unknown verb: \"%s\"."
 msgstr "Unknown file type"
 
 #. TRANS: Client exception thrown when trying to force a subscription for an untrusted user.
-#: lib/activityimporter.php:107
 msgid "Cannot force subscription for untrusted user."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to for a remote user to subscribe.
-#: lib/activityimporter.php:117
 #, fuzzy
 msgid "Cannot force remote user to subscribe."
 msgstr "Specify the name of the user to subscribe to."
 
 #. TRANS: Client exception thrown when trying to subscribe to an unknown profile.
-#: lib/activityimporter.php:132
 #, fuzzy
 msgid "Unknown profile."
 msgstr "Unknown file type"
 
 #. TRANS: Client exception thrown when trying to import an event not related to the importing user.
-#: lib/activityimporter.php:138
 msgid "This activity seems unrelated to our user."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to join a remote group that is not a group.
-#: lib/activityimporter.php:154
 msgid "Remote profile is not a group!"
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to join a group the importing user is already a member of.
-#: lib/activityimporter.php:163
 #, fuzzy
 msgid "User is already a member of this group."
 msgstr "You are already a member of that group."
 
 #. TRANS: Client exception thrown when trying to import a notice by another user.
 #. TRANS: %1$s is the source URI of the notice, %2$s is the URI of the author.
-#: lib/activityimporter.php:201
 #, php-format
 msgid "Already know about notice %1$s and  it has a different author %2$s."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to overwrite the author information for a non-trusted user during import.
-#: lib/activityimporter.php:207
 msgid "Not overwriting author info for non-trusted user."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to import a notice without content.
 #. TRANS: %s is the notice URI.
-#: lib/activityimporter.php:223
 #, fuzzy, php-format
 msgid "No content for notice %s."
 msgstr "Find content of notices"
 
-#: lib/activitymover.php:84
 #, fuzzy, php-format
 msgid "No such user %s."
 msgstr "No such user."
@@ -7502,213 +6182,173 @@ msgstr "No such user."
 #. TRANS: %1$s is a URL, %2$s is the status, %s$s is the fail reason.
 #. TRANS: Exception thrown when post to collection fails with a status that is not handled.
 #. TRANS: %1$s is a URL, %2$s is the status, %s$s is the fail reason.
-#: lib/activitysink.php:163 lib/activitysink.php:167 lib/activitysink.php:172
 #, fuzzy, php-format
 msgctxt "URLSTATUSREASON"
 msgid "%1$s %2$s %3$s"
 msgstr "%1$s - %2$s"
 
 #. TRANS: Client exception thrown when there is no source attribute.
-#: lib/activityutils.php:200
 msgid "Can't handle remote content yet."
 msgstr ""
 
 #. TRANS: Client exception thrown when there embedded XML content is found that cannot be processed yet.
-#: lib/activityutils.php:237
 msgid "Can't handle embedded XML content yet."
 msgstr ""
 
 #. TRANS: Client exception thrown when base64 encoded content is found that cannot be processed yet.
-#: lib/activityutils.php:242
 msgid "Can't handle embedded Base64 content yet."
 msgstr ""
 
 #. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights.
-#: lib/adminpanelaction.php:96
 msgid "You cannot make changes to this site."
 msgstr "You cannot make changes to this site."
 
 #. TRANS: Client error message throw when a certain panel's settings cannot be changed.
-#: lib/adminpanelaction.php:108
 msgid "Changes to that panel are not allowed."
 msgstr "Changes to that panel are not allowed."
 
 #. TRANS: Client error message.
-#: lib/adminpanelaction.php:222
 msgid "showForm() not implemented."
 msgstr "showForm() not implemented."
 
 #. TRANS: Client error message
-#: lib/adminpanelaction.php:250
 msgid "saveSettings() not implemented."
 msgstr "saveSettings() not implemented."
 
 #. TRANS: Client error message thrown if design settings could not be deleted in
 #. TRANS: the admin panel Design.
-#: lib/adminpanelaction.php:274
 msgid "Unable to delete design setting."
 msgstr "Unable to delete design setting."
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:337
 msgid "Basic site configuration"
 msgstr "Basic site configuration"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:339
 msgctxt "MENU"
 msgid "Site"
 msgstr "Site"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:345
 msgid "Design configuration"
 msgstr "Design configuration"
 
 #. TRANS: Menu item for site administration
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/adminpanelaction.php:347 lib/groupnav.php:135
 msgctxt "MENU"
 msgid "Design"
 msgstr "Design"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:353
 msgid "User configuration"
 msgstr "User configuration"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:110
 msgid "User"
 msgstr "User"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:361
 msgid "Access configuration"
 msgstr "Access configuration"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:369
 msgid "Paths configuration"
 msgstr "Paths configuration"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:377
 msgid "Sessions configuration"
 msgstr "Sessions configuration"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:385
 msgid "Edit site notice"
 msgstr "Edit site notice"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:387
 msgid "Site notice"
 msgstr "Site notice"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:393
 msgid "Snapshots configuration"
 msgstr "Snapshots configuration"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:401
 msgid "Set site license"
 msgstr ""
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:409
 #, fuzzy
 msgid "Plugins configuration"
 msgstr "Paths configuration"
 
 #. TRANS: Client error 401.
-#: lib/apiauth.php:111
 msgid "API resource requires read-write access, but you only have read access."
 msgstr ""
 
 #. TRANS: OAuth exception thrown when no application is found for a given consumer key.
-#: lib/apiauth.php:177
 msgid "No application for that consumer key."
 msgstr ""
 
-#: lib/apiauth.php:202 lib/apiauth.php:284
 msgid "Not allowed to use API."
 msgstr ""
 
 #. TRANS: OAuth exception given when an incorrect access token was given for a user.
-#: lib/apiauth.php:225
 msgid "Bad access token."
 msgstr ""
 
 #. TRANS: OAuth exception given when no user was found for a given token (no token was found).
-#: lib/apiauth.php:230
 msgid "No user for that token."
 msgstr ""
 
 #. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel".
 #. TRANS: Client error thrown when authentication fails.
-#: lib/apiauth.php:272 lib/apiauth.php:302
 msgid "Could not authenticate you."
 msgstr ""
 
 #. TRANS: Server error displayed when trying to create an anynymous OAuth consumer.
-#: lib/apioauthstore.php:45
 #, fuzzy
 msgid "Could not create anonymous consumer."
 msgstr "Could not create aliases."
 
 #. TRANS: Server error displayed when trying to create an anynymous OAuth application.
-#: lib/apioauthstore.php:69
 #, fuzzy
 msgid "Could not create anonymous OAuth application."
 msgstr "Could not create application."
 
 #. TRANS: Exception thrown when no token association could be found.
-#: lib/apioauthstore.php:151
 msgid ""
 "Could not find a profile and application associated with the request token."
 msgstr ""
 
 #. TRANS: Exception thrown when no access token can be issued.
-#: lib/apioauthstore.php:209
 #, fuzzy
 msgid "Could not issue access token."
 msgstr "Could not insert message."
 
-#: lib/apioauthstore.php:317
 msgid "Database error inserting OAuth application user."
 msgstr "Database error inserting OAuth application user."
 
-#: lib/apioauthstore.php:345
 #, fuzzy
 msgid "Database error updating OAuth application user."
 msgstr "Database error inserting OAuth application user."
 
 #. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
-#: lib/apioauthstore.php:371
 msgid "Tried to revoke unknown token."
 msgstr ""
 
 #. TRANS: Exception thrown when an attempt is made to remove a revoked token.
-#: lib/apioauthstore.php:376
 msgid "Failed to delete revoked token."
 msgstr ""
 
 #. TRANS: Form input field label for application icon.
-#: lib/applicationeditform.php:177
 msgid "Icon"
 msgstr ""
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:182
 msgid "Icon for this application"
 msgstr "Icon for this application"
 
 #. TRANS: Form input field instructions.
 #. TRANS: %d is the number of available characters for the description.
-#: lib/applicationeditform.php:201
 #, php-format
 msgid "Describe your application in %d character"
 msgid_plural "Describe your application in %d characters"
@@ -7716,206 +6356,167 @@ msgstr[0] "Describe your application in %d character"
 msgstr[1] "Describe your application in %d characters"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:205
 msgid "Describe your application"
 msgstr "Describe your application"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:216
 msgid "URL of the homepage of this application"
 msgstr "URL of the homepage of this application"
 
 #. TRANS: Form input field label.
-#: lib/applicationeditform.php:218
 msgid "Source URL"
 msgstr "Source URL"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:225
 msgid "Organization responsible for this application"
 msgstr "Organisation responsible for this application"
 
 #. TRANS: Form input field label.
-#: lib/applicationeditform.php:227
 msgid "Organization"
 msgstr "Organization"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:234
 msgid "URL for the homepage of the organization"
 msgstr "URL for the homepage of the organisation"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:243
 msgid "URL to redirect to after authentication"
 msgstr ""
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:271
 msgid "Browser"
 msgstr ""
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:288
 msgid "Desktop"
 msgstr ""
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:290
 msgid "Type of application, browser or desktop"
 msgstr ""
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:314
 msgid "Read-only"
 msgstr ""
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:334
 msgid "Read-write"
 msgstr ""
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:336
 msgid "Default access for this application: read-only, or read-write"
 msgstr ""
 
 #. TRANS: Submit button title.
-#: lib/applicationeditform.php:353
 msgid "Cancel"
 msgstr "Cancel"
 
-#: lib/applicationlist.php:247
 msgid " by "
 msgstr ""
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:260
 msgid "read-write"
 msgstr ""
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:262
 msgid "read-only"
 msgstr ""
 
 #. TRANS: Used in application list. %1$s is a modified date, %2$s is access type ("read-write" or "read-only")
-#: lib/applicationlist.php:268
 #, php-format
 msgid "Approved %1$s - \"%2$s\" access."
 msgstr ""
 
 #. TRANS: Access token in the application list.
 #. TRANS: %s are the first 7 characters of the access token.
-#: lib/applicationlist.php:282
 #, php-format
 msgid "Access token starting with: %s"
 msgstr ""
 
 #. TRANS: Button label
-#: lib/applicationlist.php:298
 msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "Revoke"
 
-#: lib/atom10feed.php:113
 msgid "Author element must contain a name element."
 msgstr ""
 
 #. TRANS: Server exception thrown when using the method setActivitySubject() in the class Atom10Feed.
-#: lib/atom10feed.php:160
 #, fuzzy
 msgid "Do not use this method!"
 msgstr "Do not delete this group"
 
 #. TRANS: Title.
-#: lib/attachmentnoticesection.php:67
 msgid "Notices where this attachment appears"
 msgstr ""
 
 #. TRANS: Title.
-#: lib/attachmenttagcloudsection.php:48
 msgid "Tags for this attachment"
 msgstr "Tags for this attachment"
 
 #. TRANS: Exception thrown when a password change fails.
-#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:227
 msgid "Password changing failed."
 msgstr "Password changing failed."
 
 #. TRANS: Exception thrown when a password change attempt fails because it is not allowed.
-#: lib/authenticationplugin.php:238
 msgid "Password changing is not allowed."
 msgstr "Password changing is not allowed."
 
 #. TRANS: Title for the form to block a user.
-#: lib/blockform.php:68
 msgid "Block"
 msgstr "Block"
 
 #. TRANS: Description of the form to block a user.
-#: lib/blockform.php:79
 msgid "Block this user"
 msgstr "Block this user"
 
 #. TRANS: Title for command results.
-#: lib/channel.php:104 lib/channel.php:125
 msgid "Command results"
 msgstr "Command results"
 
 #. TRANS: Title for command results.
-#: lib/channel.php:138
 msgid "AJAX error"
 msgstr "AJAX error"
 
 #. TRANS: E-mail subject when a command has completed.
-#: lib/channel.php:177 lib/mailhandler.php:143
 msgid "Command complete"
 msgstr "Command complete"
 
 #. TRANS: E-mail subject when a command has failed.
-#: lib/channel.php:188
 msgid "Command failed"
 msgstr "Command failed"
 
 #. TRANS: Command exception text shown when a notice ID is requested that does not exist.
-#: lib/command.php:82 lib/command.php:106
 msgid "Notice with that id does not exist."
 msgstr "Notice with that id does not exist."
 
 #. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
 #. TRANS: Error text shown when a last user notice is requested and it does not exist.
-#: lib/command.php:99 lib/command.php:642
 msgid "User has no last notice."
 msgstr "User has no last notice."
 
 #. TRANS: Message given requesting a profile for a non-existing user.
 #. TRANS: %s is the nickname of the user for which the profile could not be found.
-#: lib/command.php:128
 #, php-format
 msgid "Could not find a user with nickname %s."
 msgstr "Could not find a user with nickname %s."
 
 #. TRANS: Message given getting a non-existing user.
 #. TRANS: %s is the nickname of the user that could not be found.
-#: lib/command.php:148
 #, php-format
 msgid "Could not find a local user with nickname %s."
 msgstr ""
 
 #. TRANS: Error text shown when an unimplemented command is given.
-#: lib/command.php:183
 msgid "Sorry, this command is not yet implemented."
 msgstr "Sorry, this command is not yet implemented."
 
 #. TRANS: Command exception text shown when a user tries to nudge themselves.
-#: lib/command.php:229
 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr ""
 
 #. TRANS: Message given having nudged another user.
 #. TRANS: %s is the nickname of the user that was nudged.
-#: lib/command.php:238
 #, php-format
 msgid "Nudge sent to %s."
 msgstr "Nudge sent to %s."
@@ -7924,7 +6525,6 @@ msgstr "Nudge sent to %s."
 #. TRANS: %1$s is the number of other user the user is subscribed to.
 #. TRANS: %2$s is the number of users that are subscribed to the user.
 #. TRANS: %3$s is the number of notices the user has sent.
-#: lib/command.php:268
 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"
@@ -7933,40 +6533,34 @@ msgid ""
 msgstr ""
 
 #. TRANS: Error message text shown when a favorite could not be set because it has already been favorited.
-#: lib/command.php:298
 #, fuzzy
 msgid "Could not create favorite: already favorited."
 msgstr "Could not create favourite."
 
 #. TRANS: Text shown when a notice has been marked as favourite successfully.
-#: lib/command.php:324
 msgid "Notice marked as fave."
 msgstr "Notice marked as fave."
 
 #. TRANS: Message given having added a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:369
 #, php-format
 msgid "%1$s joined group %2$s."
 msgstr ""
 
 #. TRANS: Message given having removed a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:417
 #, php-format
 msgid "%1$s left group %2$s."
 msgstr ""
 
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: lib/command.php:438
 #, fuzzy, php-format
 msgctxt "WHOIS"
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
 
 #. TRANS: Whois output. %s is the full name of the queried user.
-#: lib/command.php:442
 #, php-format
 msgid "Fullname: %s"
 msgstr "Fullname: %s"
@@ -7974,7 +6568,6 @@ msgstr "Fullname: %s"
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a location.
-#: lib/command.php:446 lib/mail.php:275
 #, php-format
 msgid "Location: %s"
 msgstr "Location: %s"
@@ -7982,20 +6575,17 @@ msgstr "Location: %s"
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a homepage.
-#: lib/command.php:450 lib/mail.php:279
 #, php-format
 msgid "Homepage: %s"
 msgstr "Homepage: %s"
 
 #. TRANS: Whois output. %s is the bio information of the queried user.
-#: lib/command.php:454
 #, php-format
 msgid "About: %s"
 msgstr "About: %s"
 
 #. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).
 #. TRANS: %s is a remote profile.
-#: lib/command.php:483
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
@@ -8004,33 +6594,32 @@ msgstr ""
 
 #. TRANS: Message given if content is too long. %1$sd is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:500
 #, fuzzy, php-format
 msgid "Message too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
 msgstr[0] "Message too long - maximum is %1$d characters, you sent %2$d."
 msgstr[1] "Message too long - maximum is %1$d characters, you sent %2$d."
 
+#. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
+msgid "You can't send a message to this user."
+msgstr "You can't send a message to this user."
+
 #. TRANS: Error text shown sending a direct message fails with an unknown reason.
-#: lib/command.php:528
 msgid "Error sending direct message."
 msgstr "Error sending direct message."
 
 #. TRANS: Message given having repeated a notice from another user.
 #. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:565
 #, php-format
 msgid "Notice from %s repeated."
 msgstr "Notice from %s repeated."
 
 #. TRANS: Error text shown when repeating a notice fails with an unknown reason.
-#: lib/command.php:568
 msgid "Error repeating notice."
 msgstr "Error repeating notice."
 
 #. TRANS: Message given if content of a notice for a reply is too long. %1$d is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:603
 #, fuzzy, php-format
 msgid "Notice too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Notice too long - maximum is %1$d characters, you sent %2$d."
@@ -8039,100 +6628,83 @@ msgstr[1] "Notice too long - maximum is %1$d characters, you sent %2$d."
 
 #. TRANS: Text shown having sent a reply to a notice successfully.
 #. TRANS: %s is the nickname of the user of the notice the reply was sent to.
-#: lib/command.php:616
 #, php-format
 msgid "Reply to %s sent."
 msgstr "Reply to %s sent."
 
 #. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
-#: lib/command.php:619
 msgid "Error saving notice."
 msgstr "Error saving notice."
 
 #. TRANS: Error text shown when no username was provided when issuing a subscribe command.
-#: lib/command.php:666
 msgid "Specify the name of the user to subscribe to."
 msgstr "Specify the name of the user to subscribe to."
 
 #. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
-#: lib/command.php:675
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "Can't subscribe to OMB profiles by command."
 
 #. TRANS: Text shown after having subscribed to another user successfully.
 #. TRANS: %s is the name of the user the subscription was requested for.
-#: lib/command.php:683
 #, php-format
 msgid "Subscribed to %s."
 msgstr ""
 
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.
-#: lib/command.php:704 lib/command.php:815
 msgid "Specify the name of the user to unsubscribe from."
 msgstr "Specify the name of the user to unsubscribe from."
 
 #. TRANS: Text shown after having unsubscribed from another user successfully.
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:715
 #, php-format
 msgid "Unsubscribed from %s."
 msgstr ""
 
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
-#: lib/command.php:735 lib/command.php:761
 msgid "Command not yet implemented."
 msgstr "Command not yet implemented."
 
 #. TRANS: Text shown when issuing the command "off" successfully.
-#: lib/command.php:739
 msgid "Notification off."
 msgstr "Notification off."
 
 #. TRANS: Error text shown when the command "off" fails for an unknown reason.
-#: lib/command.php:742
 msgid "Can't turn off notification."
 msgstr "Can't turn off notification."
 
 #. TRANS: Text shown when issuing the command "on" successfully.
-#: lib/command.php:765
 msgid "Notification on."
 msgstr "Notification on."
 
 #. TRANS: Error text shown when the command "on" fails for an unknown reason.
-#: lib/command.php:768
 msgid "Can't turn on notification."
 msgstr "Can't turn on notification."
 
 #. TRANS: Error text shown when issuing the login command while login is disabled.
-#: lib/command.php:782
 msgid "Login command is disabled."
 msgstr ""
 
 #. TRANS: Text shown after issuing the login command successfully.
 #. TRANS: %s is a logon link..
-#: lib/command.php:795
 #, php-format
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
 
 #. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:824
 #, php-format
 msgid "Unsubscribed %s."
 msgstr ""
 
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
-#: lib/command.php:842
 msgid "You are not subscribed to anyone."
 msgstr "You are not subscribed to anyone."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
-#: lib/command.php:847
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "You are subscribed to this person:"
@@ -8140,14 +6712,12 @@ msgstr[1] "You are subscribed to these people:"
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user
 #. TRANS: (followers) without having any subscribers.
-#: lib/command.php:869
 msgid "No one is subscribed to you."
 msgstr "No one is subscribed to you."
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
-#: lib/command.php:874
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "This person is subscribed to you:"
@@ -8155,21 +6725,18 @@ msgstr[1] "These people are subscribed to you:"
 
 #. TRANS: Text shown after requesting groups a user is subscribed to without having
 #. TRANS: any group subscriptions.
-#: lib/command.php:896
 msgid "You are not a member of any groups."
 msgstr "You are not a member of any groups."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
-#: lib/command.php:901
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "You are a member of this group:"
 msgstr[1] "You are a member of these groups:"
 
 #. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-#: lib/command.php:916
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -8250,71 +6817,58 @@ msgstr ""
 "tracking - not yet implemented.\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:36
 #, fuzzy
 msgid "No configuration file found."
 msgstr "No configuration file found. "
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:39
 #, fuzzy
 msgid "I looked for configuration files in the following places:"
 msgstr "Invitation(s) sent to the following people:"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:42
 msgid "You may wish to run the installer to fix this."
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:46
 msgid "Go to the installer."
 msgstr "Go to the installer."
 
-#: lib/dberroraction.php:59
 msgid "Database error"
 msgstr ""
 
 #. TRANS: Description of form for deleting a user.
-#: lib/deleteuserform.php:75
 msgid "Delete this user"
 msgstr "Delete this user"
 
-#: lib/designform.php:114
 #, fuzzy
 msgid "Change design"
 msgstr "Save design"
 
 #. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: lib/designform.php:131
 msgid "Change colours"
 msgstr "Change colours"
 
 #. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: lib/designform.php:138
 msgid "Use defaults"
 msgstr "Use defaults"
 
 #. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: lib/designform.php:140
 msgid "Restore default designs"
 msgstr "Restore default designs"
 
 #. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: lib/designform.php:148
 msgid "Reset back to default"
 msgstr "Reset back to default"
 
 #. TRANS: Label in form on profile design page.
 #. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
-#: lib/designform.php:158
 msgid "Upload file"
 msgstr "Upload file"
 
 #. TRANS: Instructions for form on profile design page.
-#: lib/designform.php:163
 #, fuzzy
 msgid ""
 "You can upload your personal background image. The maximum file size is 2Mb."
@@ -8322,49 +6876,41 @@ msgstr ""
 "You can upload your personal background image. The maximum file size is 2MB."
 
 #. TRANS: Radio button on profile design page that will enable use of the uploaded profile image.
-#: lib/designform.php:194
 #, fuzzy
 msgctxt "RADIO"
 msgid "On"
 msgstr "On"
 
 #. TRANS: Radio button on profile design page that will disable use of the uploaded profile image.
-#: lib/designform.php:211
 #, fuzzy
 msgctxt "RADIO"
 msgid "Off"
 msgstr "Off"
 
 #. TRANS: Title for button on profile design page to save settings.
-#: lib/designform.php:322
 msgid "Save design"
 msgstr "Save design"
 
 #. TRANS: Error message displayed if design settings could not be saved.
 #. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
-#: lib/designsettings.php:216 lib/designsettings.php:238
 msgid "Couldn't update your design."
 msgstr "Couldn't update your design."
 
 #. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
-#: lib/designsettings.php:244
 msgid "Design defaults restored."
 msgstr "Design defaults restored."
 
 #. TRANS: Exception. %s is an ID.
-#: lib/discovery.php:153
 #, fuzzy, php-format
 msgid "Unable to find services for %s."
 msgstr "Use this form to edit your application."
 
 #. TRANS: Form legend for removing the favourite status for a favourite notice.
 #. TRANS: Title for button text for removing the favourite status for a favourite notice.
-#: lib/disfavorform.php:108 lib/disfavorform.php:140
 msgid "Disfavor this notice"
 msgstr "Disfavour this notice"
 
 #. TRANS: Button text for removing the favourite status for a favourite notice.
-#: lib/disfavorform.php:136
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Disfavor favorite"
@@ -8372,104 +6918,82 @@ msgstr "Disfavor favourite"
 
 #. TRANS: Form legend for adding the favourite status to a notice.
 #. TRANS: Title for button text for adding the favourite status to a notice.
-#: lib/favorform.php:108 lib/favorform.php:139
 msgid "Favor this notice"
 msgstr "Favour this notice"
 
 #. TRANS: Button text for adding the favourite status to a notice.
-#: lib/favorform.php:135
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Favor"
 msgstr "Favour"
 
-#: lib/feed.php:84
 msgid "RSS 1.0"
 msgstr ""
 
-#: lib/feed.php:86
 msgid "RSS 2.0"
 msgstr ""
 
-#: lib/feed.php:88
 msgid "Atom"
 msgstr ""
 
-#: lib/feed.php:90
 msgid "FOAF"
 msgstr ""
 
-#: lib/feedimporter.php:75
 #, fuzzy
 msgid "Not an atom feed."
 msgstr "All members"
 
-#: lib/feedimporter.php:82
 msgid "No author in the feed."
 msgstr ""
 
-#: lib/feedimporter.php:89
 msgid "Can't import without a user."
 msgstr ""
 
 #. TRANS: Header for feed links (h2).
-#: lib/feedlist.php:66
 msgid "Feeds"
 msgstr ""
 
-#: lib/galleryaction.php:128
 msgid "All"
 msgstr "All"
 
-#: lib/galleryaction.php:136
 msgid "Select tag to filter"
 msgstr "Select tag to filter"
 
-#: lib/galleryaction.php:137
 msgid "Tag"
 msgstr "Tag"
 
-#: lib/galleryaction.php:138
 msgid "Choose a tag to narrow list"
 msgstr "Choose a tag to narrow list"
 
-#: lib/galleryaction.php:140
 msgid "Go"
 msgstr "Go"
 
-#: lib/grantroleform.php:91
 #, php-format
 msgid "Grant this user the \"%s\" role"
 msgstr ""
 
-#: lib/groupeditform.php:147
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "1-64 lowercase letters or numbers, no punctuation or spaces"
 
-#: lib/groupeditform.php:156
 #, fuzzy
 msgid "URL of the homepage or blog of the group or topic."
 msgstr "URL of the homepage or blog of the group or topic"
 
-#: lib/groupeditform.php:161
 msgid "Describe the group or topic"
 msgstr "Describe the group or topic"
 
-#: lib/groupeditform.php:163
 #, fuzzy, php-format
 msgid "Describe the group or topic in %d character or less"
 msgid_plural "Describe the group or topic in %d characters or less"
 msgstr[0] "Describe the group or topic in %d characters"
 msgstr[1] "Describe the group or topic in %d characters"
 
-#: lib/groupeditform.php:175
 #, fuzzy
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\"."
 msgstr ""
 "Location for the group, if any, like \"City, State (or Region), Country\""
 
-#: lib/groupeditform.php:183
 #, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -8481,70 +7005,60 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Menu item in the group navigation page.
-#: lib/groupnav.php:86
 msgctxt "MENU"
 msgid "Group"
 msgstr ""
 
 #. TRANS: Tooltip for menu item in the group navigation page.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:89
 #, php-format
 msgctxt "TOOLTIP"
 msgid "%s group"
 msgstr ""
 
 #. TRANS: Menu item in the group navigation page.
-#: lib/groupnav.php:95
 msgctxt "MENU"
 msgid "Members"
 msgstr ""
 
 #. TRANS: Tooltip for menu item in the group navigation page.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:98
 #, php-format
 msgctxt "TOOLTIP"
 msgid "%s group members"
 msgstr ""
 
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/groupnav.php:108
 msgctxt "MENU"
 msgid "Blocked"
 msgstr ""
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:111
 #, php-format
 msgctxt "TOOLTIP"
 msgid "%s blocked users"
 msgstr ""
 
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "Admin"
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:120
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Edit %s group properties"
 msgstr ""
 
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/groupnav.php:126
 msgctxt "MENU"
 msgid "Logo"
 msgstr ""
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:129
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Add or edit %s logo"
@@ -8552,69 +7066,57 @@ msgstr ""
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:138
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Add or edit %s design"
 msgstr ""
 
 #. TRANS: Title for groups with the most members section.
-#: lib/groupsbymemberssection.php:71
 msgid "Groups with most members"
 msgstr "Groups with most members"
 
 #. TRANS: Title for groups with the most posts section.
-#: lib/groupsbypostssection.php:71
 msgid "Groups with most posts"
 msgstr "Groups with most posts"
 
 #. TRANS: Title for group tag cloud section.
 #. TRANS: %s is a group name.
-#: lib/grouptagcloudsection.php:57
 #, php-format
 msgid "Tags in %s group's notices"
 msgstr "Tags in %s group's notices"
 
 #. TRANS: Client exception 406
-#: lib/htmloutputter.php:104
 msgid "This page is not available in a media type you accept"
 msgstr "This page is not available in a media type you accept"
 
 #. TRANS: Exception thrown when trying to upload an unsupported image file format.
-#: lib/imagefile.php:73
 msgid "Unsupported image file format."
 msgstr "Unsupported image file format."
 
 #. TRANS: Exception thrown when too large a file is uploaded.
 #. TRANS: %s is the maximum file size, for example "500b", "10kB" or "2MB".
-#: lib/imagefile.php:91
 #, php-format
 msgid "That file is too big. The maximum file size is %s."
 msgstr "That file is too big. The maximum file size is %s."
 
 #. TRANS: Exception thrown when uploading an image and that action could not be completed.
-#: lib/imagefile.php:97
 msgid "Partial upload."
 msgstr "Partial upload."
 
 #. TRANS: Exception thrown when uploading a file as image that is not an image or is a corrupt file.
-#: lib/imagefile.php:115
 msgid "Not an image or corrupt file."
 msgstr "Not an image or corrupt file."
 
 #. TRANS: Exception thrown during resize when image has been registered as present, but is no longer there.
-#: lib/imagefile.php:178
 msgid "Lost our file."
 msgstr "Lost our file."
 
 #. TRANS: Exception thrown when trying to resize an unknown file type.
 #. TRANS: Exception thrown when trying resize an unknown file type.
-#: lib/imagefile.php:216 lib/imagefile.php:257
 msgid "Unknown file type"
 msgstr "Unknown file type"
 
 #. TRANS: Number of megabytes. %d is the number.
-#: lib/imagefile.php:303
 #, php-format
 msgid "%dMB"
 msgid_plural "%dMB"
@@ -8622,7 +7124,6 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Number of kilobytes. %d is the number.
-#: lib/imagefile.php:307
 #, php-format
 msgid "%dkB"
 msgid_plural "%dkB"
@@ -8630,14 +7131,12 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Number of bytes. %d is the number.
-#: lib/imagefile.php:310
 #, php-format
 msgid "%dB"
 msgid_plural "%dB"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/implugin.php:262
 #, php-format
 msgid ""
 "User \"%s\" on %s has said that your %s screenname belongs to them. If "
@@ -8647,51 +7146,42 @@ msgid ""
 "message."
 msgstr ""
 
-#: lib/implugin.php:349
 #, php-format
 msgid "Unknown inbox source %d."
 msgstr ""
 
-#: lib/implugin.php:485
-#, fuzzy, php-format
+#, php-format
 msgid "Message too long - maximum is %1$d characters, you sent %2$d."
 msgstr "Message too long - maximum is %1$d characters, you sent %2$d."
 
-#: lib/leaveform.php:114
 msgid "Leave"
 msgstr "Leave"
 
 #. TRANS: Menu item for logging in to the StatusNet site.
-#: lib/logingroupnav.php:77
 msgctxt "MENU"
 msgid "Login"
 msgstr "Login"
 
 #. TRANS: Title for menu item for logging in to the StatusNet site.
-#: lib/logingroupnav.php:79
 msgid "Login with a username and password"
 msgstr "Login with a username and password"
 
 #. TRANS: Menu item for registering with the StatusNet site.
-#: lib/logingroupnav.php:85
 msgctxt "MENU"
 msgid "Register"
 msgstr "Register"
 
 #. TRANS: Title for menu item for registering with the StatusNet site.
-#: lib/logingroupnav.php:87
 msgid "Sign up for a new account"
 msgstr "Sign up for a new account"
 
 #. TRANS: Subject for address confirmation email.
-#: lib/mail.php:172
 msgid "Email address confirmation"
 msgstr "E-mail address confirmation"
 
 #. TRANS: Body for address confirmation email.
 #. TRANS: %1$s is the addressed user's nickname, %2$s is the StatusNet sitename,
 #. TRANS: %3$s is the URL to confirm at.
-#: lib/mail.php:177
 #, php-format
 msgid ""
 "Hey, %1$s.\n"
@@ -8710,14 +7200,12 @@ msgstr ""
 
 #. TRANS: Subject of new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
-#: lib/mail.php:243
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1$s is now listening to your notices on %2$s."
 
 #. TRANS: This is a paragraph in a new-subscriber e-mail.
 #. TRANS: %s is a URL where the subscriber can be reported as abusive.
-#: lib/mail.php:250
 #, php-format
 msgid ""
 "If you believe this account is being used abusively, you can block them from "
@@ -8729,7 +7217,6 @@ msgstr ""
 #. TRANS: %3$s is the subscriber's profile URL, %4$s is the subscriber's location (or empty)
 #. TRANS: %5$s is the subscriber's homepage URL (or empty), %6%s is the subscriber's bio (or empty)
 #. TRANS: %7$s is a link to the addressed user's e-mail settings.
-#: lib/mail.php:260
 #, fuzzy, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -8756,14 +7243,12 @@ msgstr ""
 
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is biographical information.
-#: lib/mail.php:283
 #, php-format
 msgid "Bio: %s"
 msgstr "Bio: %s"
 
 #. TRANS: Subject of notification mail for new posting email address.
 #. TRANS: %s is the StatusNet sitename.
-#: lib/mail.php:312
 #, php-format
 msgid "New email address for posting to %s"
 msgstr "New e-mail address for posting to %s"
@@ -8771,7 +7256,6 @@ msgstr "New e-mail address for posting to %s"
 #. TRANS: Body of notification mail for new posting email address.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is the e-mail address to send
 #. TRANS: to to post by e-mail, %3$s is a URL to more instructions.
-#: lib/mail.php:318
 #, fuzzy, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -8794,26 +7278,22 @@ msgstr ""
 
 #. TRANS: Subject line for SMS-by-email notification messages.
 #. TRANS: %s is the posting user's nickname.
-#: lib/mail.php:439
 #, php-format
 msgid "%s status"
 msgstr "%s status"
 
 #. TRANS: Subject line for SMS-by-email address confirmation message.
-#: lib/mail.php:465
 msgid "SMS confirmation"
 msgstr "SMS confirmation"
 
 #. TRANS: Main body heading for SMS-by-email address confirmation message.
 #. TRANS: %s is the addressed user's nickname.
-#: lib/mail.php:469
 #, php-format
 msgid "%s: confirm you own this phone number with this code:"
 msgstr "%s: confirm you own this phone number with this code:"
 
 #. TRANS: Subject for 'nudge' notification email.
 #. TRANS: %s is the nudging user.
-#: lib/mail.php:490
 #, fuzzy, php-format
 msgid "You have been nudged by %s"
 msgstr "You've been nudged by %s"
@@ -8821,7 +7301,6 @@ msgstr "You've been nudged by %s"
 #. TRANS: Body for 'nudge' notification email.
 #. TRANS: %1$s is the nuding user's long name, $2$s is the nudging user's nickname,
 #. TRANS: %3$s is a URL to post notices at, %4$s is the StatusNet sitename.
-#: lib/mail.php:497
 #, php-format
 msgid ""
 "%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -8839,7 +7318,6 @@ msgstr ""
 
 #. TRANS: Subject for direct-message notification email.
 #. TRANS: %s is the sending user's nickname.
-#: lib/mail.php:544
 #, php-format
 msgid "New private message from %s"
 msgstr "New private message from %s"
@@ -8848,7 +7326,6 @@ msgstr "New private message from %s"
 #. TRANS: %1$s is the sending user's long name, %2$s is the sending user's nickname,
 #. TRANS: %3$s is the message content, %4$s a URL to the message,
 #. TRANS: %5$s is the StatusNet sitename.
-#: lib/mail.php:552
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -8869,7 +7346,6 @@ msgstr ""
 
 #. TRANS: Subject for favorite notification e-mail.
 #. TRANS: %1$s is the adding user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:604
 #, fuzzy, php-format
 msgid "%1$s (@%2$s) added your notice as a favorite"
 msgstr "%s (@%s) added your notice as a favorite"
@@ -8879,7 +7355,6 @@ msgstr "%s (@%s) added your notice as a favorite"
 #. TRANS: %3$s is a URL to the faved notice, %4$s is the faved notice text,
 #. TRANS: %5$s is a URL to all faves of the adding user, %6$s is the StatusNet sitename,
 #. TRANS: %7$s is the adding user's nickname.
-#: lib/mail.php:611
 #, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -8901,7 +7376,6 @@ msgid ""
 msgstr ""
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:669
 #, php-format
 msgid ""
 "The full conversation can be read here:\n"
@@ -8911,7 +7385,6 @@ msgstr ""
 
 #. TRANS: E-mail subject for notice notification.
 #. TRANS: %1$s is the sending user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:677
 #, fuzzy, php-format
 msgid "%1$s (@%2$s) sent a notice to your attention"
 msgstr "%s (@%s) sent a notice to your attention"
@@ -8922,7 +7395,6 @@ msgstr "%s (@%s) sent a notice to your attention"
 #. TRANS: %5$s is a URL to the full conversion if it exists (otherwise empty),
 #. TRANS: %6$s is a URL to reply to the notice, %7$s is a URL to all @-replied for the addressed user,
 #. TRANS: %8$s is a URL to the addressed user's e-mail settings, %9$s is the sender's nickname.
-#: lib/mail.php:685
 #, php-format
 msgid ""
 "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -8949,63 +7421,51 @@ msgid ""
 "P.S. You can turn off these email notifications here: %8$s\n"
 msgstr ""
 
-#: lib/mailbox.php:87
 msgid "Only the user can read their own mailboxes."
 msgstr "Only the user can read their own mailboxes."
 
-#: lib/mailbox.php:125
 msgid ""
 "You have no private messages. You can send private message to engage other "
 "users in conversation. People can send you messages for your eyes only."
 msgstr ""
 
-#: lib/mailhandler.php:37
 msgid "Could not parse message."
 msgstr "Could not parse message."
 
-#: lib/mailhandler.php:42
 msgid "Not a registered user."
 msgstr "Not a registered user."
 
-#: lib/mailhandler.php:46
 msgid "Sorry, that is not your incoming email address."
 msgstr "Sorry, that is not your incoming e-mail address."
 
-#: lib/mailhandler.php:50
 msgid "Sorry, no incoming email allowed."
 msgstr "Sorry, no incoming e-mail allowed."
 
-#: lib/mailhandler.php:229
 #, php-format
 msgid "Unsupported message type: %s"
 msgstr "Unsupported message type: %s"
 
 #. TRANS: Client exception thrown when a database error was thrown during a file upload operation.
-#: lib/mediafile.php:102 lib/mediafile.php:174
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
 
 #. TRANS: Client exception thrown when a file upload operation would cause a user to exceed a set quota.
-#: lib/mediafile.php:238 lib/mediafile.php:281
 msgid "File exceeds user's quota."
 msgstr ""
 
 #. TRANS: Client exception thrown when a file upload operation fails because the file could
 #. TRANS: not be moved from the temporary folder to the permanent file location.
-#: lib/mediafile.php:258 lib/mediafile.php:300
 msgid "File could not be moved to destination directory."
 msgstr ""
 
 #. TRANS: Client exception thrown when a file upload operation has been stopped because the MIME
 #. TRANS: type of the uploaded file could not be determined.
-#: lib/mediafile.php:265 lib/mediafile.php:306
 msgid "Could not determine file's MIME type."
 msgstr "Could not determine file's MIME type."
 
 #. TRANS: Client exception thrown trying to upload a forbidden MIME type.
 #. TRANS: %1$s is the file type that was denied, %2$s is the application part of
 #. TRANS: the MIME type that was denied.
-#: lib/mediafile.php:396
 #, php-format
 msgid ""
 "\"%1$s\" is not a supported file type on this server. Try using another %2$s "
@@ -9014,502 +7474,391 @@ msgstr ""
 
 #. TRANS: Client exception thrown trying to upload a forbidden MIME type.
 #. TRANS: %s is the file type that was denied.
-#: lib/mediafile.php:401
 #, php-format
 msgid "\"%s\" is not a supported file type on this server."
 msgstr ""
 
-#: lib/messageform.php:120
 msgid "Send a direct notice"
 msgstr "Send a direct notice"
 
 #. TRANS Label entry in drop-down selection box in direct-message inbox/outbox. This is the default entry in the drop-down box, doubling as instructions and a brake against accidental submissions with the first user in the list.
-#: lib/messageform.php:137
 #, fuzzy
 msgid "Select recipient:"
 msgstr "Select a carrier"
 
 #. TRANS Entry in drop-down selection box in direct-message inbox/outbox when no one is available to message.
-#: lib/messageform.php:150
 #, fuzzy
 msgid "No mutual subscribers."
 msgstr "Not subscribed!"
 
-#: lib/messageform.php:153
 msgid "To"
 msgstr "To"
 
-#: lib/messageform.php:184 lib/noticeform.php:236
 msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr "Send"
 
-#: lib/messagelist.php:77
 #, fuzzy
 msgid "Messages"
 msgstr "Message"
 
-#: lib/messagelistitem.php:123 lib/noticelist.php:527
 msgid "from"
 msgstr "from"
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:178
 msgid "Nickname cannot be empty."
 msgstr ""
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:191
 #, php-format
 msgid "Nickname cannot be more than %d character long."
 msgid_plural "Nickname cannot be more than %d characters long."
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/noticeform.php:160
+#. TRANS: Form legend for notice form.
 msgid "Send a notice"
 msgstr "Send a notice"
 
-#: lib/noticeform.php:174
+#. TRANS: Title for notice label. %s is the user's nickname.
 #, php-format
 msgid "What's up, %s?"
 msgstr "What's up, %s?"
 
-#: lib/noticeform.php:193
+#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr ""
 
-#: lib/noticeform.php:197
-msgid "Attach a file"
+#. TRANS: Title for input field to attach a file to a notice.
+msgid "Attach a file."
 msgstr ""
 
-#: lib/noticeform.php:212
+#. TRANS: Field label to add location to a notice.
 msgid "Share my location"
 msgstr "Share my location"
 
-#: lib/noticeform.php:215
+#. TRANS: Text to not share location for a notice in notice form.
 msgid "Do not share my location"
 msgstr "Do not share my location"
 
-#: lib/noticeform.php:216
+#. TRANS: Timeout error text for location retrieval in notice form.
 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
 "try again later"
 msgstr ""
 
 #. TRANS: Used in coordinates as abbreviation of north
-#: lib/noticelist.php:457
 msgid "N"
 msgstr "N"
 
 #. TRANS: Used in coordinates as abbreviation of south
-#: lib/noticelist.php:459
 msgid "S"
 msgstr ""
 
 #. TRANS: Used in coordinates as abbreviation of east
-#: lib/noticelist.php:461
 msgid "E"
 msgstr ""
 
 #. TRANS: Used in coordinates as abbreviation of west
-#: lib/noticelist.php:463
 msgid "W"
 msgstr ""
 
-#: lib/noticelist.php:465
 #, php-format
 msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgstr ""
 
-#: lib/noticelist.php:474
 msgid "at"
 msgstr ""
 
-#: lib/noticelist.php:523
 msgid "web"
 msgstr ""
 
-#: lib/noticelist.php:589
 msgid "in context"
 msgstr "in context"
 
-#: lib/noticelist.php:624
 msgid "Repeated by"
 msgstr "Repeated by"
 
-#: lib/noticelist.php:651
 msgid "Reply to this notice"
 msgstr "Reply to this notice"
 
-#: lib/noticelist.php:652
 msgid "Reply"
 msgstr "Reply"
 
-#: lib/noticelist.php:678
 msgid "Delete this notice"
 msgstr "Delete this notice"
 
-#: lib/noticelist.php:696
 msgid "Notice repeated"
 msgstr "Notice repeated"
 
-#: lib/nudgeform.php:116
 msgid "Nudge this user"
 msgstr "Nudge this user"
 
-#: lib/nudgeform.php:128
 msgid "Nudge"
 msgstr "Nudge"
 
-#: lib/nudgeform.php:128
 msgid "Send a nudge to this user"
 msgstr "Send a nudge to this user"
 
-#: lib/oauthstore.php:294
 msgid "Error inserting new profile."
 msgstr ""
 
-#: lib/oauthstore.php:302
 msgid "Error inserting avatar."
 msgstr ""
 
-#: lib/oauthstore.php:322
 msgid "Error inserting remote profile."
 msgstr ""
 
 #. TRANS: Exception thrown when a notice is denied because it has been sent before.
-#: lib/oauthstore.php:362
 msgid "Duplicate notice."
 msgstr ""
 
-#: lib/oauthstore.php:507
 msgid "Couldn't insert new subscription."
 msgstr "Couldn't insert new subscription."
 
-#: lib/personalgroupnav.php:104
-#, fuzzy
 msgid "Replies"
 msgstr "Replies"
 
-#: lib/personalgroupnav.php:109
-#, fuzzy
 msgid "Favorites"
 msgstr "Favourites"
 
-#: lib/personalgroupnav.php:120
-#, fuzzy
 msgid "Inbox"
 msgstr "Inbox"
 
-#: lib/personalgroupnav.php:121
 msgid "Your incoming messages"
 msgstr "Your incoming messages"
 
-#: lib/personalgroupnav.php:125
-#, fuzzy
 msgid "Outbox"
 msgstr "Outbox"
 
-#: lib/personalgroupnav.php:126
 msgid "Your sent messages"
 msgstr "Your sent messages"
 
 #. TRANS: Title for personal tag cloud section. %s is a user nickname.
-#: lib/personaltagcloudsection.php:56
 #, php-format
 msgid "Tags in %s's notices"
 msgstr "Tags in %s's notices"
 
 #. TRANS: Displayed as version information for a plugin if no version information was found.
-#: lib/plugin.php:126
 msgid "Unknown"
 msgstr "Unknown"
 
 #. TRANS: Plugin admin panel controls
-#: lib/plugindisableform.php:90
 msgctxt "plugin"
 msgid "Disable"
 msgstr ""
 
 #. TRANS: Plugin admin panel controls
-#: lib/pluginenableform.php:112
 msgctxt "plugin"
 msgid "Enable"
 msgstr ""
 
-#: lib/pluginlist.php:196
 msgctxt "plugin-description"
 msgid "(Plugin descriptions unavailable when disabled.)"
 msgstr ""
 
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:88
 msgid "Subscriptions"
 msgstr "Subscriptions"
 
 #. TRANS: Text for user subscription statistics if user has more subscriptions than displayed.
-#: lib/profileaction.php:144
 msgid "All subscriptions"
 msgstr "All subscriptions"
 
 #. TRANS: H2 text for user subscriber statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:96
 msgid "Subscribers"
 msgstr "Subscribers"
 
 #. TRANS: Text for user subscription statistics if user has more subscribers than displayed.
-#: lib/profileaction.php:181
 msgid "All subscribers"
 msgstr "All subscribers"
 
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:213
 msgid "User ID"
 msgstr "User ID"
 
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:219
 msgid "Member since"
 msgstr "Member since"
 
 #. TRANS: Label for user statistics.
 #. TRANS: H2 text for user group membership statistics.
-#: lib/profileaction.php:239 lib/profileaction.php:290
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:104
 msgid "Groups"
 msgstr "Groups"
 
 #. TRANS: Label for user statistics.
 #. TRANS: Average count of posts made per day since account registration.
-#: lib/profileaction.php:253
 msgid "Daily average"
 msgstr ""
 
 #. TRANS: Text for user group membership statistics if user has more subscriptions than displayed.
-#: lib/profileaction.php:305
 msgid "All groups"
 msgstr "All groups"
 
 #. TRANS: Server error displayed when using an unimplemented method.
-#: lib/profileformaction.php:123
 msgid "Unimplemented method."
 msgstr ""
 
-#: lib/publicgroupnav.php:82
 msgid "User groups"
 msgstr "User groups"
 
-#: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
 msgid "Recent tags"
 msgstr "Recent tags"
 
-#: lib/publicgroupnav.php:88
 msgid "Featured"
 msgstr "Featured"
 
-#: lib/publicgroupnav.php:92
 msgid "Popular"
 msgstr "Popular"
 
-#: lib/redirectingaction.php:95
 msgid "No return-to arguments."
 msgstr "No return-to arguments."
 
-#: lib/repeatform.php:107
 msgid "Repeat this notice?"
 msgstr "Repeat this notice?"
 
-#: lib/repeatform.php:132
 msgid "Yes"
 msgstr "Yes"
 
-#: lib/repeatform.php:132
 msgid "Repeat this notice"
 msgstr "Repeat this notice"
 
-#: lib/revokeroleform.php:91
 #, php-format
 msgid "Revoke the \"%s\" role from this user"
 msgstr "Revoke the \"%s\" role from this user"
 
 #. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:1001
 #, fuzzy
 msgid "Page not found."
 msgstr "API method not found."
 
-#: lib/sandboxform.php:67
 msgid "Sandbox"
 msgstr "Sandbox"
 
-#: lib/sandboxform.php:78
 msgid "Sandbox this user"
 msgstr "Sandbox this user"
 
 #. TRANS: Fieldset legend for the search form.
-#: lib/searchaction.php:120
 msgid "Search site"
 msgstr "Search site"
 
 #. TRANS: Used as a field label for the field where one or more keywords
 #. TRANS: for searching can be entered.
-#: lib/searchaction.php:128
 msgid "Keyword(s)"
 msgstr ""
 
 #. TRANS: Button text for searching site.
-#: lib/searchaction.php:130
 msgctxt "BUTTON"
 msgid "Search"
 msgstr ""
 
-#: lib/searchgroupnav.php:80
 msgid "People"
 msgstr "People"
 
-#: lib/searchgroupnav.php:81
 msgid "Find people on this site"
 msgstr "Find people on this site"
 
-#: lib/searchgroupnav.php:83
 msgid "Find content of notices"
 msgstr "Find content of notices"
 
-#: lib/searchgroupnav.php:85
 msgid "Find groups on this site"
 msgstr "Find groups on this site"
 
-#: lib/section.php:89
 msgid "Untitled section"
 msgstr "Untitled section"
 
-#: lib/section.php:106
 msgid "More..."
 msgstr ""
 
-#: lib/settingsnav.php:78
 msgid "Change your profile settings"
 msgstr "Change your profile settings"
 
-#: lib/settingsnav.php:83
 msgid "Upload an avatar"
 msgstr "Upload an avatar"
 
-#: lib/settingsnav.php:88
 msgid "Change your password"
 msgstr "Change your password"
 
-#: lib/settingsnav.php:93
 msgid "Change email handling"
 msgstr "Change e-mail handling"
 
-#: lib/settingsnav.php:98
 msgid "Design your profile"
 msgstr "Design your profile"
 
-#: lib/settingsnav.php:102
 msgid "URL"
 msgstr "URL"
 
-#: lib/settingsnav.php:103
 msgid "URL shorteners"
 msgstr ""
 
-#: lib/settingsnav.php:111
 msgid "Updates by instant messenger (IM)"
 msgstr "Updates by instant messenger (IM)"
 
-#: lib/settingsnav.php:118
 msgid "Updates by SMS"
 msgstr "Updates by SMS"
 
-#: lib/settingsnav.php:123
-#, fuzzy
 msgid "Connections"
 msgstr "Connections"
 
-#: lib/settingsnav.php:124
 msgid "Authorized connected applications"
 msgstr "Authorised connected applications"
 
-#: lib/silenceform.php:67
 msgid "Silence"
 msgstr "Silence"
 
-#: lib/silenceform.php:78
 msgid "Silence this user"
 msgstr "Silence this user"
 
-#: lib/subgroupnav.php:89
 #, php-format
 msgid "People %s subscribes to"
 msgstr "People %s subscribes to"
 
-#: lib/subgroupnav.php:97
 #, php-format
 msgid "People subscribed to %s"
 msgstr "People subscribed to %s"
 
-#: lib/subgroupnav.php:105
 #, php-format
 msgid "Groups %s is a member of"
 msgstr "Groups %s is a member of"
 
-#: lib/subgroupnav.php:111
 msgid "Invite"
 msgstr "Invite"
 
-#: lib/subgroupnav.php:112
 #, php-format
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Invite friends and colleagues to join you on %s"
 
-#: lib/subscribeform.php:115 lib/subscribeform.php:139
 msgid "Subscribe to this user"
 msgstr "Subscribe to this user"
 
-#: lib/subscriberspeopleselftagcloudsection.php:48
-#: lib/subscriptionspeopleselftagcloudsection.php:48
 msgid "People Tagcloud as self-tagged"
 msgstr ""
 
-#: lib/subscriberspeopletagcloudsection.php:48
-#: lib/subscriptionspeopletagcloudsection.php:48
 msgid "People Tagcloud as tagged"
 msgstr ""
 
-#: lib/tagcloudsection.php:56
 msgid "None"
 msgstr "None"
 
 #. TRANS: Server exception displayed if a theme name was invalid.
-#: lib/theme.php:74
 #, fuzzy
 msgid "Invalid theme name."
 msgstr "Invalid filename."
 
-#: lib/themeuploader.php:50
 msgid "This server cannot handle theme uploads without ZIP support."
 msgstr ""
 
-#: lib/themeuploader.php:58 lib/themeuploader.php:61
 msgid "The theme file is missing or the upload failed."
 msgstr ""
 
-#: lib/themeuploader.php:91 lib/themeuploader.php:102
-#: lib/themeuploader.php:279 lib/themeuploader.php:283
-#: lib/themeuploader.php:291 lib/themeuploader.php:298
 msgid "Failed saving theme."
 msgstr "Failed saving theme."
 
-#: lib/themeuploader.php:147
 msgid "Invalid theme: bad directory structure."
 msgstr ""
 
-#: lib/themeuploader.php:166
 #, php-format
 msgid "Uploaded theme is too large; must be less than %d byte uncompressed."
 msgid_plural ""
@@ -9517,152 +7866,122 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/themeuploader.php:179
 msgid "Invalid theme archive: missing file css/display.css"
 msgstr ""
 
-#: lib/themeuploader.php:219
 msgid ""
 "Theme contains invalid file or folder name. Stick with ASCII letters, "
 "digits, underscore, and minus sign."
 msgstr ""
 
-#: lib/themeuploader.php:225
 msgid "Theme contains unsafe file extension names; may be unsafe."
 msgstr ""
 
-#: lib/themeuploader.php:242
 #, php-format
 msgid "Theme contains file of type '.%s', which is not allowed."
 msgstr ""
 
-#: lib/themeuploader.php:260
 msgid "Error opening theme archive."
 msgstr "Error opening theme archive."
 
-#: lib/threadednoticelist.php:270
 #, php-format
-msgid "Show all %d comment"
-msgid_plural "Show all %d comments"
+msgid "Show %d reply"
+msgid_plural "Show all %d replies"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/topposterssection.php:74
 msgid "Top posters"
 msgstr "Top posters"
 
 #. TRANS: Title for the form to unblock a user.
-#: lib/unblockform.php:67
 #, fuzzy
 msgctxt "TITLE"
 msgid "Unblock"
 msgstr "Unblock"
 
-#: lib/unsandboxform.php:69
 msgid "Unsandbox"
 msgstr "Unsandbox"
 
-#: lib/unsandboxform.php:80
 msgid "Unsandbox this user"
 msgstr "Unsandbox this user"
 
-#: lib/unsilenceform.php:67
 msgid "Unsilence"
 msgstr "Unsilence"
 
-#: lib/unsilenceform.php:78
 msgid "Unsilence this user"
 msgstr "Unsilence this user"
 
-#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
 msgid "Unsubscribe from this user"
 msgstr "Unsubscribe from this user"
 
-#: lib/unsubscribeform.php:137
 msgid "Unsubscribe"
 msgstr "Unsubscribe"
 
 #. 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).
-#: lib/usernoprofileexception.php:60
 #, php-format
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "User %1$s (%2$d) has no profile record."
 
-#: lib/userprofile.php:116
 msgid "Edit Avatar"
 msgstr "Edit Avatar"
 
 #. TRANS: H2 for user actions in a profile.
 #. TRANS: H2 for entity actions in a profile.
-#: lib/userprofile.php:216 lib/userprofile.php:232
 msgid "User actions"
 msgstr "User actions"
 
 #. TRANS: Text shown in user profile of not yet compeltely deleted users.
-#: lib/userprofile.php:220
 msgid "User deletion in progress..."
 msgstr ""
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:248
 msgid "Edit profile settings"
 msgstr "Edit profile settings"
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:250
 msgid "Edit"
 msgstr "Edit"
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:274
 msgid "Send a direct message to this user"
 msgstr "Send a direct message to this user"
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:276
 msgid "Message"
 msgstr "Message"
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:318
 msgid "Moderate"
 msgstr "Moderate"
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:357
 msgid "User role"
 msgstr "User role"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:360
 msgctxt "role"
 msgid "Administrator"
 msgstr "Administrator"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:362
 msgctxt "role"
 msgid "Moderator"
 msgstr "Moderator"
 
-#: lib/util.php:321
 #, fuzzy
 msgid "Not allowed to log in."
 msgstr "Not logged in."
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1337
 msgid "a few seconds ago"
 msgstr "a few seconds ago"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1340
 msgid "about a minute ago"
 msgstr "about a minute ago"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1344
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
@@ -9670,12 +7989,10 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1347
 msgid "about an hour ago"
 msgstr "about an hour ago"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1351
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
@@ -9683,12 +8000,10 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1354
 msgid "about a day ago"
 msgstr "about a day ago"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1358
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
@@ -9696,12 +8011,10 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1361
 msgid "about a month ago"
 msgstr "about a month ago"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1365
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
@@ -9709,189 +8022,42 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1368
 msgid "about a year ago"
 msgstr "about a year ago"
 
 #. TRANS: Web color exception thrown when a hexadecimal color code does not validate.
 #. TRANS: %s is the provided (invalid) color code.
-#: lib/webcolor.php:81 lib/webcolor.php:121
 #, fuzzy, php-format
 msgid "%s is not a valid color! Use 3 or 6 hex characters."
 msgstr "%s is not a valid colour! Use 3 or 6 hex characters."
 
 #. TRANS: Exception.
-#: lib/xrd.php:63
 #, fuzzy
 msgid "Invalid XML."
 msgstr "Invalid size."
 
 #. TRANS: Exception.
-#: lib/xrd.php:68
 msgid "Invalid XML, missing XRD root."
 msgstr ""
 
 #. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
-#: scripts/restoreuser.php:62
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
 
-#, fuzzy
-#~ msgid "Could not generate feed for group - %s"
-#~ msgstr "Could not delete group %s."
+#~ msgid "Full name is too long (max 255 chars)."
+#~ msgstr "Full name is too long (max 255 chars)."
+
+#~ msgid "description is too long (max %d chars)."
+#~ msgstr "description is too long (max %d chars)."
+
+#~ msgid "Location is too long (max 255 chars)."
+#~ msgstr "Location is too long (max 255 chars)."
+
+#~ msgid "Too many aliases! Maximum %d."
+#~ msgstr "Too many aliases! Maximum %d."
 
 #, fuzzy
-#~ msgid "Current confirmed Jabber/Google Talk address."
-#~ msgstr "Current confirmed Jabber/GTalk address."
-
-#, fuzzy
-#~ msgid ""
-#~ "Jabber or Google Talk address, like \"UserName@example.org\". First, make "
-#~ "sure to add %s to your buddy list in your IM client or on Google Talk."
-#~ msgstr ""
-#~ "Jabber or GTalk address, like \"UserName@example.org\". First, make sure "
-#~ "to add %s to your buddy list in your IM client or on GTalk."
-
-#, fuzzy
-#~ msgid "Send me notices through Jabber/Google Talk."
-#~ msgstr "Send me notices through Jabber/GTalk."
-
-#, fuzzy
-#~ msgid "Publish a MicroID for my Jabber/Google Talk address."
-#~ msgstr "Publish a MicroID for my Jabber/GTalk address."
-
-#~ msgid "No Jabber ID."
-#~ msgstr "No Jabber ID."
-
-#, fuzzy
-#~ msgid "Not a valid Jabber ID."
-#~ msgstr "Not a valid Jabber ID"
-
-#~ msgid "That is already your Jabber ID."
-#~ msgstr "That is already your Jabber ID."
-
-#~ msgid "That is not your Jabber ID."
-#~ msgstr "That is not your Jabber ID."
-
-#~ msgid "Other settings"
-#~ msgstr "Other settings"
-
-#~ msgid "Tag cloud"
-#~ msgstr "Tag cloud"
-
-#~ msgid "Authorize URL"
-#~ msgstr "Authorise URL"
-
-#~ msgid "Jabber"
-#~ msgstr "Jabber"
-
-#~ msgid "Photo"
-#~ msgstr "Photo"
-
-#~ msgid "Other options"
-#~ msgstr "Other options"
-
-#~ msgid "Other"
-#~ msgstr "Other"
-
-#~ msgid "Primary site navigation"
-#~ msgstr "Primary site navigation"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Personal profile and friends timeline"
-#~ msgstr "Personal profile and friends timeline"
-
-#~ msgctxt "MENU"
-#~ msgid "Personal"
-#~ msgstr "Personal"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Change your email, avatar, password, profile"
-#~ msgstr "Change your email, avatar, password, profile"
-
-#~ msgid "Account"
-#~ msgstr "Account"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Connect to services"
-#~ msgstr "Connect to services"
-
-#~ msgid "Connect"
-#~ msgstr "Connect"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Change site configuration"
-#~ msgstr "Change site configuration"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Invite friends and colleagues to join you on %s"
-#~ msgstr "Invite friends and colleagues to join you on %s"
-
-#~ msgctxt "MENU"
-#~ msgid "Invite"
-#~ msgstr "Invite"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Create an account"
-#~ msgstr "Create an account"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Help me!"
-#~ msgstr "Help me!"
-
-#~ msgctxt "MENU"
-#~ msgid "Help"
-#~ msgstr "Help"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Search for people or text"
-#~ msgstr "Search for people or text"
-
-#~ msgid "Local views"
-#~ msgstr "Local views"
-
-#~ msgid "Page notice"
-#~ msgstr "Page notice"
-
-#~ msgid "Secondary site navigation"
-#~ msgstr "Secondary site navigation"
-
-#~ msgid "StatusNet software license"
-#~ msgstr "StatusNet software licence"
-
-#~ msgid "Site content license"
-#~ msgstr "Site content licence"
-
-#~ msgid "Pagination"
-#~ msgstr "Pagination"
-
-#~ msgid "Author"
-#~ msgstr "Author"
-
-#~ msgid "Provider"
-#~ msgstr "Provider"
-
-#~ msgctxt "MENU"
-#~ msgid "SMS"
-#~ msgstr "SMS"
-
-#~ msgid "Filter tags"
-#~ msgstr "Filter tags"
-
-#~ msgid "Available characters"
-#~ msgstr "Available characters"
-
-#, fuzzy
-#~ msgctxt "MENU"
-#~ msgid "Profile"
-#~ msgstr "Profile"
-
-#~ msgid "Search help"
-#~ msgstr "Search help"
-
-#, fuzzy
-#~ msgid "Message too long. Maximum is %1$d character, you sent %2$d."
-#~ msgid_plural "Message too long. Maximum is %1$d characters, you sent %2$d."
-#~ msgstr[0] "Message too long - maximum is %1$d characters, you sent %2$d."
-#~ msgstr[1] "Message too long - maximum is %1$d characters, you sent %2$d."
+#~ msgctxt "BUTTON"
+#~ msgid "Comment"
+#~ msgstr "Content"
diff --git a/locale/eo/LC_MESSAGES/statusnet.po b/locale/eo/LC_MESSAGES/statusnet.po
index 9042b3116f..b29239e094 100644
--- a/locale/eo/LC_MESSAGES/statusnet.po
+++ b/locale/eo/LC_MESSAGES/statusnet.po
@@ -17,67 +17,57 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:23+0000\n"
-"PO-Revision-Date: 2011-03-03 17:25:54+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:14+0000\n"
 "Language-Team: Esperanto <http://translatewiki.net/wiki/Portal:eo>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: eo\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-02-25 23:49:23+0000\n"
+"X-POT-Import-Date: 2011-03-03 17:59:19+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
-#: actions/accessadminpanel.php:53 lib/adminpanelaction.php:363
 msgid "Access"
 msgstr "Atingo"
 
 #. TRANS: Page notice.
-#: actions/accessadminpanel.php:64
 msgid "Site access settings"
 msgstr "Retejo-atinga agordo"
 
 #. TRANS: Form legend for registration form.
-#: actions/accessadminpanel.php:151
 msgid "Registration"
 msgstr "Registrado"
 
 #. TRANS: Checkbox instructions for admin setting "Private".
-#: actions/accessadminpanel.php:155
 msgid "Prohibit anonymous users (not logged in) from viewing site?"
 msgstr "Ĉu malpermesi al anonimaj uzantoj (ne ensalutintaj) vidi retejon?"
 
 #. TRANS: Checkbox label for prohibiting anonymous users from viewing site.
-#: actions/accessadminpanel.php:157
 msgctxt "LABEL"
 msgid "Private"
 msgstr "Privata"
 
 #. TRANS: Checkbox instructions for admin setting "Invite only".
-#: actions/accessadminpanel.php:164
 msgid "Make registration invitation only."
 msgstr "Permesi registriĝon nur perinvitan."
 
 #. TRANS: Checkbox label for configuring site as invite only.
-#: actions/accessadminpanel.php:166
 msgid "Invite only"
 msgstr "Nur per invito"
 
 #. TRANS: Checkbox instructions for admin setting "Closed" (no new registrations).
-#: actions/accessadminpanel.php:173
 msgid "Disable new registrations."
 msgstr "Malpermesi novan registriĝon."
 
 #. TRANS: Checkbox label for disabling new user registrations.
-#: actions/accessadminpanel.php:175
 msgid "Closed"
 msgstr "Fermita"
 
 #. TRANS: Title for button to save access settings in site admin panel.
-#: actions/accessadminpanel.php:191
 msgid "Save access settings"
 msgstr "Konservu atingan agordon"
 
@@ -85,6 +75,7 @@ msgstr "Konservu atingan agordon"
 #. TRANS: Button text for saving theme settings.
 #. TRANS: Button label to save e-mail preferences.
 #. TRANS: Button label to save IM preferences.
+#. TRANS: Button text in the license admin panel.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
 #. TRANS: Button text for saving site notice in admin panel.
@@ -94,21 +85,12 @@ msgstr "Konservu atingan agordon"
 #. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
 #. TRANS: Button text on profile design page to save settings.
-#: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
-#: actions/emailsettings.php:251 actions/imsettings.php:199
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:198
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:204
-#: actions/subscriptions.php:261 actions/urlsettings.php:152
-#: actions/useradminpanel.php:298 lib/applicationeditform.php:355
-#: lib/designform.php:320 lib/groupeditform.php:201
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Konservu"
 
 #. TRANS: Server error when page not found (404).
 #. TRANS: Server error when page not found (404)
-#: actions/all.php:68 actions/public.php:98 actions/replies.php:93
-#: actions/showfavorites.php:140 actions/tag.php:52
 msgid "No such page."
 msgstr "Ne estas tiu paĝo."
 
@@ -127,6 +109,7 @@ msgstr "Ne estas tiu paĝo."
 #. TRANS: Client error displayed when checking group membership for a non-existing user.
 #. TRANS: Client error displayed when trying to have a non-existing user join a group.
 #. TRANS: Client error displayed when trying to have a non-existing user leave a group.
+#. TRANS: Client error displayed when not providing a user or an invalid user.
 #. TRANS: Client error displayed when updating a status for a non-existing user.
 #. TRANS: Client error displayed when requesting a list of followers for a non-existing user.
 #. TRANS: Client error displayed when requesting most recent favourite notices by a user for a non-existing user.
@@ -139,6 +122,8 @@ msgstr "Ne estas tiu paĝo."
 #. 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.
 #. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
@@ -146,33 +131,10 @@ msgstr "Ne estas tiu paĝo."
 #. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when calling a profile action without specifying a user.
-#: actions/all.php:80 actions/allrss.php:69
-#: actions/apiaccountupdatedeliverydevice.php:110
-#: actions/apiaccountupdateprofile.php:103
-#: actions/apiaccountupdateprofilebackgroundimage.php:118
-#: actions/apiaccountupdateprofileimage.php:104 actions/apiatomservice.php:59
-#: actions/apiblockcreate.php:96 actions/apiblockdestroy.php:94
-#: actions/apidirectmessage.php:75 actions/apidirectmessagenew.php:72
-#: actions/apigroupcreate.php:111 actions/apigroupismember.php:89
-#: actions/apigroupjoin.php:98 actions/apigroupleave.php:98
-#: actions/apigrouplist.php:70 actions/apigroupprofileupdate.php:108
-#: actions/apistatusesupdate.php:230 actions/apisubscriptions.php:85
-#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:173
-#: actions/apitimelinehome.php:78 actions/apitimelinementions.php:77
-#: actions/apitimelineuser.php:79 actions/avatarbynickname.php:79
-#: actions/favoritesrss.php:72 actions/foaf.php:42 actions/foaf.php:61
-#: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116
-#: actions/otp.php:78 actions/remotesubscribe.php:144
-#: actions/remotesubscribe.php:153 actions/replies.php:73
-#: actions/repliesrss.php:38 actions/rsd.php:113 actions/showfavorites.php:106
-#: actions/userbyid.php:75 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/userxrd.php:59 actions/xrds.php:71 lib/command.php:509
-#: lib/galleryaction.php:59 lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Ne ekzistas tiu uzanto."
 
 #. TRANS: Page title. %1$s is user nickname, %2$d is page number
-#: actions/all.php:91
 #, php-format
 msgid "%1$s and friends, page %2$d"
 msgstr "%1$s kaj amikoj, paĝo %2$d"
@@ -181,33 +143,26 @@ msgstr "%1$s kaj amikoj, paĝo %2$d"
 #. TRANS: H1 text for page. %s is a user nickname.
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Timeline title for user and friends. %s is a user nickname.
-#: actions/all.php:94 actions/all.php:191 actions/allrss.php:117
-#: actions/apitimelinefriends.php:207 actions/apitimelinehome.php:113
-#: lib/personalgroupnav.php:100
 #, php-format
 msgid "%s and friends"
 msgstr "%s kaj amikoj"
 
 #. TRANS: %s is user nickname.
-#: actions/all.php:108
 #, php-format
 msgid "Feed for friends of %s (RSS 1.0)"
 msgstr "Fluo por amikoj de %s (RSS 1.0)"
 
 #. TRANS: %s is user nickname.
-#: actions/all.php:117
 #, php-format
 msgid "Feed for friends of %s (RSS 2.0)"
 msgstr "Fluo por amikoj de %s (RSS 2.0)"
 
 #. TRANS: %s is user nickname.
-#: actions/all.php:126
 #, php-format
 msgid "Feed for friends of %s (Atom)"
 msgstr "Fluo por amikoj de %s (Atom)"
 
 #. TRANS: Empty list message. %s is a user nickname.
-#: actions/all.php:139
 #, php-format
 msgid ""
 "This is the timeline for %s and friends but no one has posted anything yet."
@@ -216,7 +171,6 @@ msgstr ""
 
 #. TRANS: Encouragement displayed on logged in user's empty timeline.
 #. TRANS: This message contains Markdown links. Keep "](" together.
-#: actions/all.php:146
 #, php-format
 msgid ""
 "Try subscribing to more people, [join a group](%%action.groups%%) or post "
@@ -227,7 +181,6 @@ msgstr ""
 
 #. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@".
 #. TRANS: This message contains Markdown links. Keep "](" together.
-#: actions/all.php:150
 #, php-format
 msgid ""
 "You can try to [nudge %1$s](../%2$s) from their profile or [post something "
@@ -240,7 +193,6 @@ msgstr ""
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
 #. TRANS: Second sentence of empty message for anonymous users. %s is a user nickname.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:221
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -250,14 +202,11 @@ msgstr ""
 "avizon al li?"
 
 #. TRANS: H1 text for page when viewing a list for self.
-#: actions/all.php:188
 msgid "You and friends"
 msgstr "Vi kaj amikoj"
 
 #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
 #. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name.
-#: actions/allrss.php:122 actions/apitimelinefriends.php:213
-#: actions/apitimelinehome.php:119
 #, php-format
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr "Ĝisdatiĝoj de %1$s kaj amikoj ĉe %2$s!"
@@ -276,55 +225,20 @@ msgstr "Ĝisdatiĝoj de %1$s kaj amikoj ĉe %2$s!"
 #. TRANS: Client error displayed trying to execute an unknown API method checking group membership.
 #. TRANS: Client error displayed trying to execute an unknown API method listing the latest 20 groups.
 #. TRANS: Client error displayed trying to execute an unknown API method showing group membership.
+#. TRANS: Client error displayed when using an unsupported API format.
 #. TRANS: Client error displayed trying to execute an unknown API method showing a group.
 #. TRANS: Client error displayed trying to execute an unknown API method testing API connectivity.
 #. TRANS: Client error displayed trying to execute an unknown API method deleting a status.
 #. TRANS: Client error displayed when trying to handle an unknown API method.
-#: actions/apiaccountratelimitstatus.php:69
-#: actions/apiaccountupdatedeliverydevice.php:92
-#: actions/apiaccountupdateprofile.php:94
-#: actions/apiaccountupdateprofilebackgroundimage.php:92
-#: actions/apiaccountupdateprofilecolors.php:115
-#: actions/apiaccountverifycredentials.php:68 actions/apidirectmessage.php:157
-#: actions/apifavoritecreate.php:98 actions/apifavoritedestroy.php:98
-#: actions/apifriendshipscreate.php:99 actions/apifriendshipsdestroy.php:99
-#: actions/apifriendshipsshow.php:124 actions/apigroupcreate.php:138
-#: actions/apigroupismember.php:115 actions/apigroupjoin.php:151
-#: actions/apigroupleave.php:141 actions/apigrouplist.php:134
-#: actions/apigrouplistall.php:120 actions/apigroupmembership.php:105
-#: actions/apigroupprofileupdate.php:100 actions/apigroupprofileupdate.php:213
-#: actions/apigroupshow.php:114 actions/apihelptest.php:84
-#: actions/apistatusesdestroy.php:101 actions/apistatusesretweets.php:110
-#: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:139
-#: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
-#: actions/apitimelinefavorites.php:182 actions/apitimelinefriends.php:276
-#: actions/apitimelinegroup.php:148 actions/apitimelinehome.php:181
-#: actions/apitimelinementions.php:182 actions/apitimelinepublic.php:247
-#: actions/apitimelineretweetedtome.php:147
-#: actions/apitimelineretweetsofme.php:147 actions/apitimelinetag.php:165
-#: actions/apitimelineuser.php:217 actions/apiusershow.php:100
 msgid "API method not found."
 msgstr "Metodo de API ne troviĝas."
 
 #. 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.
-#: actions/apiaccountupdatedeliverydevice.php:83
-#: actions/apiaccountupdateprofile.php:85
-#: actions/apiaccountupdateprofilebackgroundimage.php:83
-#: actions/apiaccountupdateprofilecolors.php:106
-#: actions/apiaccountupdateprofileimage.php:80 actions/apiblockcreate.php:87
-#: actions/apiblockdestroy.php:85 actions/apidirectmessagenew.php:107
-#: actions/apifavoritecreate.php:88 actions/apifavoritedestroy.php:88
-#: actions/apifriendshipscreate.php:89 actions/apifriendshipsdestroy.php:89
-#: actions/apigroupcreate.php:102 actions/apigroupjoin.php:89
-#: actions/apigroupleave.php:89 actions/apigroupprofileupdate.php:92
-#: actions/apimediaupload.php:66 actions/apistatusesretweet.php:63
-#: actions/apistatusesupdate.php:194
 msgid "This method requires a POST."
 msgstr "Ĉi tiu metodo bezonas POST-on."
 
 #. TRANS: Client error displayed when no valid device parameter is provided for a user's delivery device setting.
-#: actions/apiaccountupdatedeliverydevice.php:103
 msgid ""
 "You must specify a parameter named 'device' with a value of one of: sms, im, "
 "none."
@@ -339,10 +253,6 @@ msgstr ""
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
-#: actions/apiaccountupdatedeliverydevice.php:136
-#: actions/emailsettings.php:353 actions/emailsettings.php:499
-#: actions/profilesettings.php:323 actions/smssettings.php:300
-#: actions/smssettings.php:453 actions/urlsettings.php:211
 msgid "Could not update user."
 msgstr "Malsukcesis ĝisdatigi uzanton"
 
@@ -355,32 +265,17 @@ msgstr "Malsukcesis ĝisdatigi uzanton"
 #. TRANS: Server error displayed when requesting Friends of a Friend feed for a user for which the profile could not be found.
 #. TRANS: Server error displayed when trying to get a user hCard for a user without a profile.
 #. TRANS: Server error displayed when calling a profile action while the specified user does not have a profile.
-#: actions/apiaccountupdateprofile.php:111
-#: actions/apiaccountupdateprofilebackgroundimage.php:199
-#: actions/apiaccountupdateprofilecolors.php:183
-#: actions/apiaccountupdateprofileimage.php:131
-#: actions/apiuserprofileimage.php:88 actions/apiusershow.php:108
-#: actions/avatarbynickname.php:85 actions/foaf.php:69 actions/hcard.php:75
-#: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
-#: lib/profileaction.php:85
 msgid "User has no profile."
 msgstr "La uzanto ne havas profilon."
 
 #. TRANS: Server error displayed if a user profile could not be saved.
 #. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:419
 msgid "Could not save profile."
 msgstr "Malsukcesis konservi la profilon."
 
 #. TRANS: Client error displayed when the number of bytes in a POST request exceeds a limit.
 #. TRANS: %s is the number of bytes of the CONTENT_LENGTH.
 #. TRANS: Form validation error in design settings form. POST should remain untranslated.
-#: actions/apiaccountupdateprofilebackgroundimage.php:108
-#: actions/apiaccountupdateprofileimage.php:95 actions/apimediaupload.php:81
-#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
-#: actions/designadminpanel.php:120 actions/editapplication.php:121
-#: actions/newapplication.php:102 actions/newnotice.php:95
-#: lib/designsettings.php:110
 #, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s byte) due to its "
@@ -400,26 +295,15 @@ msgstr[1] ""
 #. TRANS: Client error displayed when a database error occurs inserting profile colours.
 #. TRANS: Client error displayed when a database error occurs updating profile colours.
 #. TRANS: Form validation error displayed when group design settings could not be saved because of an application issue.
-#: actions/apiaccountupdateprofilebackgroundimage.php:138
-#: actions/apiaccountupdateprofilebackgroundimage.php:149
-#: actions/apiaccountupdateprofilecolors.php:160
-#: actions/apiaccountupdateprofilecolors.php:171
-#: actions/groupdesignsettings.php:285 actions/groupdesignsettings.php:296
-#: actions/userdesignsettings.php:218 actions/userdesignsettings.php:228
-#: actions/userdesignsettings.php:270 actions/userdesignsettings.php:280
 msgid "Unable to save your design settings."
 msgstr "Malsukcesis konservi vian desegnan agordon"
 
 #. TRANS: Error displayed when updating design settings fails.
 #. TRANS: Client error displayed when a database error occurs updating profile colours.
-#: actions/apiaccountupdateprofilebackgroundimage.php:191
-#: actions/apiaccountupdateprofilecolors.php:139
-#: actions/userdesignsettings.php:196
 msgid "Could not update your design."
 msgstr "Malsukcesis ĝisdatigi vian desegnon."
 
 #. TRANS: Title for Atom feed.
-#: actions/apiatomservice.php:85
 #, fuzzy
 msgctxt "ATOM"
 msgid "Main"
@@ -429,9 +313,6 @@ msgstr "Ĉefa"
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Title in atom group notice feed. %s is a group name.
 #. TRANS: Title in atom user notice feed. %s is a user name.
-#: actions/apiatomservice.php:93 actions/grouprss.php:138
-#: actions/userrss.php:94 lib/atomgroupnoticefeed.php:63
-#: lib/atomusernoticefeed.php:88
 #, php-format
 msgid "%s timeline"
 msgstr "Tempstrio de %s"
@@ -441,8 +322,6 @@ msgstr "Tempstrio de %s"
 #. TRANS: %s is a user nickname.
 #. TRANS: Header for subscriptions overview for a user (first page).
 #. TRANS: %s is a user nickname.
-#: actions/apiatomservice.php:104 actions/atompubsubscriptionfeed.php:148
-#: actions/subscriptions.php:51
 #, php-format
 msgid "%s subscriptions"
 msgstr "%s abonatoj"
@@ -450,58 +329,48 @@ msgstr "%s abonatoj"
 #. TRANS: Title for Atom feed with a user's favorite notices. %s is a user nickname.
 #. TRANS: Title for Atom favorites feed.
 #. TRANS: %s is a user nickname.
-#: actions/apiatomservice.php:115 actions/atompubfavoritefeed.php:142
 #, php-format
 msgid "%s favorites"
 msgstr "%s da ŝatolisteroj"
 
 #. TRANS: Title for Atom feed with a user's memberships. %s is a user nickname.
-#: actions/apiatomservice.php:126
 #, php-format
 msgid "%s memberships"
 msgstr "%s grupanoj"
 
 #. TRANS: Client error displayed when users try to block themselves.
-#: actions/apiblockcreate.php:105
 msgid "You cannot block yourself!"
 msgstr "Vi ne povas bloki vin mem!"
 
 #. TRANS: Server error displayed when blocking a user has failed.
-#: actions/apiblockcreate.php:127
 msgid "Block user failed."
 msgstr "Ne sukcesis bloki uzanton."
 
 #. TRANS: Server error displayed when unblocking a user has failed.
-#: actions/apiblockdestroy.php:113
 msgid "Unblock user failed."
 msgstr "Ne sukcesis malbloki uzanton."
 
 #. TRANS: Title. %s is a user nickname.
-#: actions/apidirectmessage.php:88
 #, php-format
 msgid "Direct messages from %s"
 msgstr "Rektaj mesaĝoj de %s"
 
 #. TRANS: Subtitle. %s is a user nickname.
-#: actions/apidirectmessage.php:93
 #, php-format
 msgid "All the direct messages sent from %s"
 msgstr "Ĉiuj rektaj mesaĝoj senditaj de %s"
 
 #. TRANS: Title. %s is a user nickname.
-#: actions/apidirectmessage.php:102
 #, php-format
 msgid "Direct messages to %s"
 msgstr "Rektaj mesaĝoj al %s"
 
 #. TRANS: Subtitle. %s is a user nickname.
-#: actions/apidirectmessage.php:107
 #, php-format
 msgid "All the direct messages sent to %s"
 msgstr "Ĉiuj rektaj mesaĝoj senditaj al %s"
 
 #. TRANS: Client error displayed when no message text was submitted (406).
-#: actions/apidirectmessagenew.php:117
 msgid "No message text!"
 msgstr "Sen mesaĝteksto!"
 
@@ -509,7 +378,6 @@ msgstr "Sen mesaĝteksto!"
 #. TRANS: %d is the maximum number of characters for a message.
 #. TRANS: Form validation error displayed when message content is too long.
 #. TRANS: %d is the maximum number of characters for a message.
-#: actions/apidirectmessagenew.php:127 actions/newmessage.php:152
 #, php-format
 msgid "That's too long. Maximum message size is %d character."
 msgid_plural "That's too long. Maximum message size is %d characters."
@@ -517,18 +385,15 @@ msgstr[0] "Tro longas. Mesaĝa longlimo estas %d signo."
 msgstr[1] "Tro longas. Mesaĝa longlimo estas %d signoj."
 
 #. TRANS: Client error displayed if a recipient user could not be found (403).
-#: actions/apidirectmessagenew.php:139
 msgid "Recipient user not found."
 msgstr "Ricevonta uzanto ne troviĝas."
 
 #. TRANS: Client error displayed trying to direct message another user who's not a friend (403).
-#: actions/apidirectmessagenew.php:144
 #, fuzzy
 msgid "Cannot send direct messages to users who aren't your friend."
 msgstr "Vi ne povas sendi rektan mesaĝon al uzanto kiu ne estas via amiko."
 
 #. TRANS: Client error displayed trying to direct message self (403).
-#: actions/apidirectmessagenew.php:154
 msgid ""
 "Do not send a message to yourself; just say it to yourself quietly instead."
 msgstr "Ne sendu mesaĝon al vi mem! Simple diru al vi mem anstataŭe."
@@ -536,116 +401,96 @@ msgstr "Ne sendu mesaĝon al vi mem! Simple diru al vi mem anstataŭe."
 #. 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.
 #. TRANS: Client error displayed trying to delete a status with an invalid ID.
-#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:108
-#: actions/apistatusesdestroy.php:121
 msgid "No status found with that ID."
 msgstr "Stato kun tiu ID ne trovitas."
 
 #. TRANS: Client error displayed when trying to mark a notice favourite that already is a favourite.
-#: actions/apifavoritecreate.php:120
 msgid "This status is already a favorite."
 msgstr "Ĉi tiu stato jam estas  ŝatata."
 
 #. TRANS: Client error displayed when marking a notice as favourite fails.
 #. TRANS: Server error displayed when trying to mark a notice as favorite fails in the database.
 #. TRANS: Error message text shown when a favorite could not be set.
-#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:306
 msgid "Could not create favorite."
 msgstr "Malsukcesis krei ŝataton."
 
 #. TRANS: Client error displayed when trying to remove a favourite that was not a favourite.
-#: actions/apifavoritedestroy.php:122
 msgid "That status is not a favorite."
 msgstr "La stato ne estas ŝatata."
 
 #. TRANS: Client error displayed when removing a favourite has failed.
 #. TRANS: Server error displayed when removing a favorite from the database fails.
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:90
 msgid "Could not delete favorite."
 msgstr "Malsukcesis forigi ŝataton."
 
 #. TRANS: Client error displayed when trying follow who's profile could not be found.
-#: actions/apifriendshipscreate.php:109
 msgid "Could not follow user: profile not found."
 msgstr "Malsukcesis aboni uzanton: profilo ne troviĝas."
 
 #. TRANS: Client error displayed when trying to follow a user that's already being followed.
 #. TRANS: %s is the nickname of the user that is already being followed.
-#: actions/apifriendshipscreate.php:120
 #, php-format
 msgid "Could not follow user: %s is already on your list."
 msgstr "Ne povas aboni uzanton: %s estas jam en via listo."
 
 #. TRANS: Client error displayed when trying to unfollow a user that cannot be found.
-#: actions/apifriendshipsdestroy.php:109
 msgid "Could not unfollow user: User not found."
 msgstr "Ne povas malaboni uzanton. Uzanto ne troviĝas."
 
 #. TRANS: Client error displayed when trying to unfollow self.
-#: actions/apifriendshipsdestroy.php:121
 msgid "You cannot unfollow yourself."
 msgstr "Vi ne povas malaboni vin mem."
 
 #. TRANS: Client error displayed when supplying invalid parameters to an API call checking if a friendship exists.
-#: actions/apifriendshipsexists.php:88
 msgid "Two valid IDs or nick names must be supplied."
 msgstr "Du validajn IDojn aŭ montronomojn vi devas havigi."
 
 #. TRANS: Client error displayed when a source user could not be determined showing friendship.
-#: actions/apifriendshipsshow.php:131
 msgid "Could not determine source user."
 msgstr " Malsukcesis certigi fontan uzanton."
 
 #. TRANS: Client error displayed when a target user could not be determined showing friendship.
-#: actions/apifriendshipsshow.php:140
 msgid "Could not find target user."
 msgstr "Malsukcesis trovi celan uzanton."
 
 #. TRANS: Client error trying to create a group with a nickname this is already in use.
+#. TRANS: API validation exception thrown when nickname is already used.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:156 actions/apigroupprofileupdate.php:255
-#: actions/editgroup.php:191 actions/newgroup.php:137
-#: actions/profilesettings.php:274 actions/register.php:199
 msgid "Nickname already in use. Try another one."
 msgstr "La uzantnomo jam uziĝis. Provu ion alian."
 
 #. TRANS: Client error in form for group creation.
+#. TRANS: API validation exception thrown when nickname does not validate.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:164 actions/apigroupprofileupdate.php:259
-#: actions/editgroup.php:195 actions/newgroup.php:141
-#: actions/profilesettings.php:244 actions/register.php:201
 msgid "Not a valid nickname."
 msgstr "Ne valida kromnomo."
 
 #. TRANS: Client error in form for group creation.
+#. TRANS: API validation exception thrown when homepage URL does not validate.
 #. TRANS: Validation error shown when providing an invalid homepage URL in the "Edit application" form.
 #. TRANS: Group edit form validation error.
 #. TRANS: Validation error shown when providing an invalid homepage URL in the "New application" form.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:181 actions/apigroupprofileupdate.php:277
-#: actions/editapplication.php:235 actions/editgroup.php:202
-#: actions/newapplication.php:221 actions/newgroup.php:148
-#: actions/profilesettings.php:249 actions/register.php:208
 msgid "Homepage is not a valid URL."
 msgstr "Ĉefpaĝo ne estas valida URL."
 
 #. TRANS: Client error in form for group creation.
+#. TRANS: API validation exception thrown when full name does not validate.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:191 actions/editgroup.php:206
-#: actions/newgroup.php:152 actions/profilesettings.php:253
-#: actions/register.php:211
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "Kompleta nomo tro longas (maksimume 255 signoj)"
 
 #. TRANS: Client error shown when providing too long a description during group creation.
 #. TRANS: %d is the maximum number of allowed characters.
+#. TRANS: API validation exception thrown when description does not validate.
+#. TRANS: %d is the maximum description length and used for plural.
 #. TRANS: Validation error shown when providing too long a description in the "Edit application" form.
 #. TRANS: %d is the maximum number of allowed characters.
 #. TRANS: Group edit form validation error.
@@ -653,9 +498,6 @@ msgstr "Kompleta nomo tro longas (maksimume 255 signoj)"
 #. TRANS: %d is the maximum number of characters for the description.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed characters.
-#: actions/apigroupcreate.php:201 actions/editapplication.php:202
-#: actions/editgroup.php:211 actions/newapplication.php:182
-#: actions/newgroup.php:157
 #, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."
@@ -663,23 +505,21 @@ msgstr[0] "Priskribo estas tro longa (maksimume %d signo)."
 msgstr[1] "Priskribo estas tro longa (maksimume %d signoj)."
 
 #. TRANS: Client error shown when providing too long a location during group creation.
+#. TRANS: API validation exception thrown when location does not validate.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:215 actions/editgroup.php:218
-#: actions/newgroup.php:164 actions/profilesettings.php:266
-#: actions/register.php:220
 msgid "Location is too long (maximum 255 characters)."
 msgstr "Lokonomo tro longas (maksimume 255 signoj)"
 
 #. TRANS: Client error shown when providing too many aliases during group creation.
 #. TRANS: %d is the maximum number of allowed aliases.
+#. TRANS: API validation exception thrown when aliases do not validate.
+#. TRANS: %d is the maximum number of aliases and used for plural.
 #. TRANS: Group edit form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.
-#: actions/apigroupcreate.php:236 actions/editgroup.php:231
-#: actions/newgroup.php:177
 #, php-format
 msgid "Too many aliases! Maximum %d allowed."
 msgid_plural "Too many aliases! Maximum %d allowed."
@@ -688,25 +528,24 @@ msgstr[1] "Tro da alinomoj! Maksimume %d."
 
 #. TRANS: Client error shown when providing an invalid alias during group creation.
 #. TRANS: %s is the invalid alias.
-#: actions/apigroupcreate.php:253
+#. TRANS: API validation exception thrown when aliases does not validate.
+#. TRANS: %s is the invalid alias.
 #, php-format
 msgid "Invalid alias: \"%s\"."
 msgstr "La alinomo estas nevalida: \"%*s\"."
 
 #. TRANS: Client error displayed when trying to use an alias during group creation that is already in use.
 #. TRANS: %s is the alias that is already in use.
+#. TRANS: API validation exception thrown when aliases is already used.
+#. TRANS: %s is the already used alias.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error. %s is the already used alias.
-#: actions/apigroupcreate.php:264 actions/apigroupprofileupdate.php:351
-#: actions/editgroup.php:246 actions/newgroup.php:193
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "La alinomo \"%s\" estas jam okupita. Provu ion alian."
 
 #. TRANS: Client error displayed when trying to use an alias during group creation that is the same as the group's nickname.
 #. TRANS: Group edit form validation error.
-#: actions/apigroupcreate.php:278 actions/apigroupprofileupdate.php:359
-#: actions/editgroup.php:253
 msgid "Alias can't be the same as nickname."
 msgstr "La alinomo devas ne esti sama al la kromnomo."
 
@@ -714,26 +553,21 @@ msgstr "La alinomo devas ne esti sama al la kromnomo."
 #. TRANS: Client error displayed when trying to join a group that does not exist.
 #. TRANS: Client error displayed when trying to leave a group that does not exist.
 #. TRANS: Client error displayed trying to show group membership on a non-existing group.
+#. TRANS: Client error displayed when not providing a group or an invalid group.
 #. TRANS: Client error displayed when trying to show a group that could not be found.
 #. TRANS: Client error displayed requesting most recent notices to a group for a non-existing group.
-#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
-#: actions/apigroupleave.php:104 actions/apigroupmembership.php:71
-#: actions/apigroupprofileupdate.php:113 actions/apigroupshow.php:81
-#: actions/apitimelinegroup.php:89
 msgid "Group not found."
 msgstr "Grupo ne troviĝas."
 
 #. TRANS: Server error displayed when trying to join a group the user is already a member of.
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:345
 msgid "You are already a member of that group."
 msgstr "Vi estas jam grupano."
 
 #. TRANS: Server error displayed when trying to join a group the user is blocked from joining.
 #. 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.
-#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:350
 msgid "You have been blocked from that group by the admin."
 msgstr "La administranto blokis vin de tiu grupo."
 
@@ -741,13 +575,11 @@ msgstr "La administranto blokis vin de tiu grupo."
 #. TRANS: %1$s is the joining user's nickname, $2$s is the group nickname for which the join failed.
 #. TRANS: Message given having failed to add a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:136 actions/joingroup.php:139 lib/command.php:362
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "La uzanto %1$*s ne povas aliĝi al la grupo %2$*s."
 
 #. TRANS: Server error displayed when trying to leave a group the user is not a member of.
-#: actions/apigroupleave.php:115
 msgid "You are not a member of this group."
 msgstr "Vi ne estas grupano."
 
@@ -755,115 +587,78 @@ msgstr "Vi ne estas grupano."
 #. TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
 #. TRANS: Message given having failed to remove a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupleave.php:127 actions/leavegroup.php:133
-#: lib/command.php:410
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
 msgstr "Malsukcesis forigi uzanton %1$s de grupo %2$s."
 
 #. TRANS: Used as title in check for group membership. %s is a user name.
-#: actions/apigrouplist.php:94
 #, php-format
 msgid "%s's groups"
 msgstr "Grupoj de %s"
 
 #. TRANS: Used as subtitle in check for group membership. %1$s is a user name, %2$s is the site name.
-#: actions/apigrouplist.php:104
 #, php-format
 msgid "%1$s groups %2$s is a member of."
 msgstr "Grupoj de %2$s ĉe %1$s."
 
 #. TRANS: Message is used as a title when listing the lastest 20 groups. %s is a site name.
 #. TRANS: Message is used as a page title. %s is a nick name.
-#: actions/apigrouplistall.php:88 actions/usergroups.php:63
 #, php-format
 msgid "%s groups"
 msgstr "Grupoj de %s"
 
 #. TRANS: Message is used as a subtitle when listing the lastest 20 groups. %s is a site name.
-#: actions/apigrouplistall.php:93
 #, php-format
 msgid "groups on %s"
 msgstr "grupoj ĉe %s"
 
+#. TRANS: Client error displayed when trying to edit a group without being an admin.
 #. TRANS: Client error displayed trying to edit a group while not being a group admin.
 #. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
 #. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
-#: actions/apigroupprofileupdate.php:118 actions/editgroup.php:110
-#: actions/editgroup.php:176 actions/groupdesignsettings.php:109
-#: actions/grouplogo.php:111
 msgid "You must be an admin to edit the group."
 msgstr "Vi devas esti administranto por redakti la grupon."
 
+#. TRANS: Server error displayed when group update fails.
 #. TRANS: Server error displayed when editing a group fails.
-#: actions/apigroupprofileupdate.php:171 actions/editgroup.php:274
 msgid "Could not update group."
 msgstr "Malsukcesis ĝisdatigi grupon."
 
+#. TRANS: Server error displayed when adding group aliases fails.
 #. TRANS: Server error displayed when group aliases could not be added.
 #. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/apigroupprofileupdate.php:194 actions/editgroup.php:281
-#: classes/User_group.php:540
 msgid "Could not create aliases."
 msgstr "Malsukcesis krei alinomon."
 
+#. TRANS: API validation exception thrown when nickname does not validate.
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: actions/apigroupprofileupdate.php:249 lib/nickname.php:165
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr ""
 "Kromnomo devas havi nur minuskulajn literojn kaj numerojn sed neniun spacon."
 
-#: actions/apigroupprofileupdate.php:286
-#, fuzzy
-msgid "Full name is too long (max 255 chars)."
-msgstr "Kompleta nomo tro longas (maksimume 255 signoj)"
-
-#: actions/apigroupprofileupdate.php:296
-#, fuzzy, php-format
-msgid "description is too long (max %d chars)."
-msgstr "Priskribo estas tro longa (maksimume %d signo)."
-
-#: actions/apigroupprofileupdate.php:307
-#, fuzzy
-msgid "Location is too long (max 255 chars)."
-msgstr "Lokonomo tro longas (maksimume 255 signoj)"
-
-#: actions/apigroupprofileupdate.php:326
-#, fuzzy, php-format
-msgid "Too many aliases! Maximum %d."
-msgstr "Tro da alinomoj! Maksimume %d."
-
-#. TRANS: Group edit form validation error.
+#. TRANS: API validation exception thrown when alias is the same as nickname.
 #. TRANS: Group create form validation error.
-#. TRANS: %s is the invalid alias.
-#: actions/apigroupprofileupdate.php:342 actions/editgroup.php:241
-#: actions/newgroup.php:188
-#, php-format
-msgid "Invalid alias: \"%s\""
-msgstr "Nevalida alinomo: \"%s\""
+#, fuzzy
+msgid "Alias cannot be the same as nickname."
+msgstr "La alinomo devas ne esti sama al la kromnomo."
 
 #. TRANS: Client error displayed when uploading a media file has failed.
-#: actions/apimediaupload.php:101
 msgid "Upload failed."
 msgstr "Malsukcesis alŝuti"
 
 #. TRANS: Client error given from the OAuth API when the request token or verifier is invalid.
-#: actions/apioauthaccesstoken.php:102
 msgid "Invalid request token or verifier."
 msgstr "Malvalida peto-ĵetono aŭ verigilo."
 
 #. TRANS: Client error given when no oauth_token was passed to the OAuth API.
-#: actions/apioauthauthorize.php:107
 msgid "No oauth_token parameter provided."
 msgstr "Ne oauth_token parametro provizita."
 
 #. TRANS: Client error given when an invalid request token was passed to the OAuth API.
-#: actions/apioauthauthorize.php:115 actions/apioauthauthorize.php:129
 msgid "Invalid request token."
 msgstr "Nevalida peto-ĵetono."
 
 #. TRANS: Client error given when an invalid request token was passed to the OAuth API.
-#: actions/apioauthauthorize.php:121
 msgid "Request token already authorized."
 msgstr ""
 
@@ -873,31 +668,14 @@ msgstr ""
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
 #. TRANS: Client error displayed when the session token is not okay.
-#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:75
-#: actions/emailsettings.php:292 actions/favor.php:75 actions/geocode.php:55
-#: actions/groupblock.php:65 actions/grouplogo.php:321
-#: actions/groupunblock.php:65 actions/imsettings.php:241
-#: actions/invite.php:60 actions/makeadmin.php:66 actions/newmessage.php:135
-#: actions/newnotice.php:105 actions/nudge.php:80
-#: actions/oauthappssettings.php:162 actions/oauthconnectionssettings.php:135
-#: actions/passwordsettings.php:137 actions/pluginenable.php:87
-#: actions/profilesettings.php:218 actions/recoverpassword.php:383
-#: actions/register.php:157 actions/remotesubscribe.php:76
-#: actions/repeat.php:82 actions/smssettings.php:249 actions/subedit.php:40
-#: actions/subscribe.php:87 actions/tagother.php:145
-#: actions/unsubscribe.php:69 actions/urlsettings.php:171
-#: actions/userauthorization.php:53 lib/designsettings.php:122
 msgid "There was a problem with your session token. Try again, please."
 msgstr "Estis problemo pri via seanco. Bonvolu provi refoje."
 
 #. TRANS: Form validation error given when an invalid username and/or password was passed to the OAuth API.
-#: actions/apioauthauthorize.php:168
 msgid "Invalid nickname / password!"
 msgstr "Nevalida kromnomo / pasvorto!"
 
 #. TRANS: Server error displayed when a database action fails.
-#: actions/apioauthauthorize.php:217
 #, fuzzy
 msgid "Database error inserting oauth_token_association."
 msgstr "Datumbaza eraro enigi la uzanton de *OAuth-aplikaĵo."
@@ -914,28 +692,19 @@ msgstr "Datumbaza eraro enigi la uzanton de *OAuth-aplikaĵo."
 #. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
 #. TRANS: Message given submitting a form with an unknown action in SMS settings.
 #. TRANS: Unknown form validation error in design settings form.
-#: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
-#: actions/designadminpanel.php:100 actions/editapplication.php:144
-#: actions/emailsettings.php:311 actions/grouplogo.php:332
-#: actions/imsettings.php:256 actions/newapplication.php:124
-#: actions/oauthconnectionssettings.php:144 actions/recoverpassword.php:46
-#: actions/smssettings.php:270 lib/designsettings.php:133
 msgid "Unexpected form submission."
 msgstr "Neatendita formo-sendo."
 
 #. TRANS: Title for a page where a user can confirm/deny account access by an external application.
-#: actions/apioauthauthorize.php:387
 msgid "An application would like to connect to your account"
 msgstr "Aplikaĵo volas konekti al via konto"
 
 #. TRANS: Fieldset legend.
-#: actions/apioauthauthorize.php:404
 msgid "Allow or deny access"
 msgstr "Permesi aŭ malpermesi atingon"
 
 #. TRANS: User notification of external application requesting account access.
 #. TRANS: %3$s is the access type requested (read-write or read-only), %4$s is the StatusNet sitename.
-#: actions/apioauthauthorize.php:425
 #, fuzzy, php-format
 msgid ""
 "An application would like the ability to <strong>%3$s</strong> your %4$s "
@@ -949,7 +718,6 @@ msgstr ""
 #. TRANS: User notification of external application requesting account access.
 #. TRANS: %1$s is the application name requesting access, %2$s is the organisation behind the application,
 #. TRANS: %3$s is the access type requested, %4$s is the StatusNet sitename.
-#: actions/apioauthauthorize.php:433
 #, php-format
 msgid ""
 "The application <strong>%1$s</strong> by <strong>%2$s</strong> would like "
@@ -961,22 +729,18 @@ msgstr ""
 "via %4$s konto al triaj partioj, kiujn vi fidas."
 
 #. TRANS: Fieldset legend.
-#: actions/apioauthauthorize.php:455
 msgctxt "LEGEND"
 msgid "Account"
 msgstr "Konto"
 
 #. TRANS: Field label on OAuth API authorisation form.
+#. TRANS: Field label on login page.
 #. TRANS: Field label in form for profile settings.
-#: actions/apioauthauthorize.php:459 actions/login.php:225
-#: actions/profilesettings.php:107 actions/register.php:411
-#: actions/userauthorization.php:145 lib/groupeditform.php:145
 msgid "Nickname"
 msgstr "Kromnomo"
 
 #. TRANS: Field label on OAuth API authorisation form.
-#: actions/apioauthauthorize.php:463 actions/login.php:228
-#: actions/register.php:415 lib/settingsnav.php:87
+#. TRANS: Field label on login page.
 msgid "Password"
 msgstr "Pasvorto"
 
@@ -986,44 +750,35 @@ msgstr "Pasvorto"
 #. TRANS: Button label to cancel an IM address confirmation procedure.
 #. TRANS: Button label to cancel a SMS address confirmation procedure.
 #. TRANS: Button label in the "Edit application" form.
-#: actions/apioauthauthorize.php:478 actions/emailsettings.php:125
-#: actions/imsettings.php:136 actions/smssettings.php:132
-#: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Cancel"
 msgstr "Nuligi"
 
 #. TRANS: Button text that when clicked will allow access to an account by an external application.
-#: actions/apioauthauthorize.php:485
 msgctxt "BUTTON"
 msgid "Allow"
 msgstr "Permesi"
 
 #. TRANS: Form instructions.
-#: actions/apioauthauthorize.php:502
 msgid "Authorize access to your account information."
 msgstr "Permesi atingon al viaj kontdatenoj."
 
 #. TRANS: Header for user notification after revoking OAuth access to an application.
-#: actions/apioauthauthorize.php:594
 msgid "Authorization canceled."
 msgstr "Rajtigo nuliĝis."
 
 #. TRANS: User notification after revoking OAuth access to an application.
 #. TRANS: %s is an OAuth token.
-#: actions/apioauthauthorize.php:598
 #, php-format
 msgid "The request token %s has been revoked."
 msgstr "La peto-ĵetono %s estis eksvalidigita."
 
 #. TRANS: Title of the page notifying the user that an anonymous client application was successfully authorized to access the user's account with OAuth.
-#: actions/apioauthauthorize.php:621
 #, fuzzy
 msgid "You have successfully authorized the application"
 msgstr "Vi sukcese rajtigis %s."
 
 #. TRANS: Message notifying the user that an anonymous client application was successfully authorized to access the user's account with OAuth.
-#: actions/apioauthauthorize.php:625
 #, fuzzy
 msgid ""
 "Please return to the application and enter the following security code to "
@@ -1033,14 +788,12 @@ msgstr ""
 
 #. TRANS: Title of the page notifying the user that the client application was successfully authorized to access the user's account with OAuth.
 #. TRANS: %s is the authorised application name.
-#: actions/apioauthauthorize.php:632
 #, fuzzy, php-format
 msgid "You have successfully authorized %s"
 msgstr "Vi sukcese rajtigis %s."
 
 #. TRANS: Message notifying the user that the client application was successfully authorized to access the user's account with OAuth.
 #. TRANS: %s is the authorised application name.
-#: actions/apioauthauthorize.php:639
 #, php-format
 msgid ""
 "Please return to %s and enter the following security code to complete the "
@@ -1050,12 +803,10 @@ msgstr ""
 
 #. TRANS: Client error displayed trying to delete a status not using POST or DELETE.
 #. TRANS: POST and DELETE should not be translated.
-#: actions/apistatusesdestroy.php:111
 msgid "This method requires a POST or DELETE."
 msgstr "Ĉi tiu metodo bezonas POST aǔ DELETE."
 
 #. TRANS: Client error displayed trying to delete a status of another user.
-#: actions/apistatusesdestroy.php:136
 msgid "You may not delete another user's status."
 msgstr "Vi ne povas forigi la staton de alia uzanto."
 
@@ -1063,21 +814,16 @@ msgstr "Vi ne povas forigi la staton de alia uzanto."
 #. TRANS: Client error displayed trying to display redents of a non-exiting notice.
 #. TRANS: Client exception thrown when referencing a non-existing notice.
 #. TRANS: Error message displayed trying to delete a non-existing notice.
-#: actions/apistatusesretweet.php:74 actions/apistatusesretweets.php:70
-#: actions/atompubshowfavorite.php:82 actions/deletenotice.php:61
-#: actions/shownotice.php:92
 msgid "No such notice."
 msgstr "Ne estas tiu avizo."
 
 #. TRANS: Client error displayed trying to repeat an own notice through the API.
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:549
 msgid "Cannot repeat your own notice."
 msgstr "Vi ne povas ripeti vian propran avizon."
 
 #. TRANS: Client error displayed trying to re-repeat a notice through the API.
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:92 lib/command.php:555
 msgid "Already repeated that notice."
 msgstr "La avizo jam ripetiĝis."
 
@@ -1087,59 +833,45 @@ msgstr "La avizo jam ripetiĝis."
 #. TRANS: Client exception thrown when using an unsupported HTTP method.
 #. TRANS: Client error shown when using a non-supported HTTP method.
 #. TRANS: Client exception thrown when using an unsupported HTTP method.
-#: actions/apistatusesshow.php:118 actions/atompubfavoritefeed.php:103
-#: actions/atompubmembershipfeed.php:105 actions/atompubshowfavorite.php:117
-#: actions/atompubshowmembership.php:116
-#: actions/atompubshowsubscription.php:122
-#: actions/atompubsubscriptionfeed.php:109
 #, fuzzy
 msgid "HTTP method not supported."
 msgstr "Metodo de API ne troviĝas."
 
 #. TRANS: Exception thrown requesting an unsupported notice output format.
 #. TRANS: %s is the requested output format.
-#: actions/apistatusesshow.php:144
 #, fuzzy, php-format
 msgid "Unsupported format: %s."
 msgstr "Formato ne subtenata."
 
 #. TRANS: Client error displayed requesting a deleted status.
-#: actions/apistatusesshow.php:155
 msgid "Status deleted."
 msgstr "Stato forigita."
 
 #. TRANS: Client error displayed requesting a status with an invalid ID.
-#: actions/apistatusesshow.php:162
 msgid "No status with that ID found."
 msgstr "Neniu stato kun tiu ID troviĝas."
 
 #. TRANS: Client error displayed when trying to delete a notice not using the Atom format.
-#: actions/apistatusesshow.php:227
 msgid "Can only delete using the Atom format."
 msgstr ""
 
 #. TRANS: Client error displayed when a user has no rights to delete notices of other users.
 #. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
-#: actions/apistatusesshow.php:235 actions/deletenotice.php:78
 #, fuzzy
 msgid "Cannot delete this notice."
 msgstr "Ne povas forigi ĉi tiun avizon."
 
 #. TRANS: Confirmation of notice deletion in API. %d is the ID (number) of the deleted notice.
-#: actions/apistatusesshow.php:249
 #, fuzzy, php-format
 msgid "Deleted notice %d"
 msgstr "Forigi avizon"
 
 #. TRANS: Client error displayed when the parameter "status" is missing.
-#: actions/apistatusesupdate.php:221
 msgid "Client must provide a 'status' parameter with a value."
 msgstr "Kliento devas providi al \"stato\"-parametro valoron."
 
 #. TRANS: Client error displayed when the parameter "status" is missing.
 #. TRANS: %d is the maximum number of character for a notice.
-#: actions/apistatusesupdate.php:244 actions/newnotice.php:161
-#: lib/mailhandler.php:60
 #, fuzzy, php-format
 msgid "That's too long. Maximum notice size is %d character."
 msgid_plural "That's too long. Maximum notice size is %d characters."
@@ -1147,14 +879,12 @@ msgstr[0] "Tro longas. Longlimo por avizo estas %d signoj."
 msgstr[1] "Tro longas. Longlimo por avizo estas %d signoj."
 
 #. TRANS: Client error displayed when replying to a non-existing notice.
-#: actions/apistatusesupdate.php:284
 #, fuzzy
 msgid "Parent notice not found."
 msgstr "Metodo de API ne troviĝas."
 
 #. TRANS: Client error displayed exceeding the maximum notice length.
 #. TRANS: %d is the maximum lenth for a notice.
-#: actions/apistatusesupdate.php:308 actions/newnotice.php:184
 #, fuzzy, php-format
 msgid "Maximum notice size is %d character, including attachment URL."
 msgid_plural "Maximum notice size is %d characters, including attachment URL."
@@ -1165,13 +895,11 @@ msgstr[1] ""
 
 #. TRANS: Client error displayed when requesting profiles of followers in an unsupported format.
 #. TRANS: Client error displayed when requesting IDs of followers in an unsupported format.
-#: actions/apisubscriptions.php:228 actions/apisubscriptions.php:258
 msgid "Unsupported format."
 msgstr "Formato ne subtenata."
 
 #. TRANS: Title for timeline of most recent favourite notices by a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname.
-#: actions/apitimelinefavorites.php:108
 #, php-format
 msgid "%1$s / Favorites from %2$s"
 msgstr "%1$*s / Ŝatato de %2$*s"
@@ -1179,14 +907,12 @@ msgstr "%1$*s / Ŝatato de %2$*s"
 #. TRANS: Subtitle for timeline of most recent favourite notices by a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user's full name,
 #. TRANS: %3$s is a user nickname.
-#: actions/apitimelinefavorites.php:120
 #, fuzzy, php-format
 msgid "%1$s updates favorited by %2$s / %3$s."
 msgstr "%1$*s ĝisdatigoj ŝatataj de %2$*s / %2$*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.
-#: actions/apitimelinementions.php:115
 #, php-format
 msgid "%1$s / Updates mentioning %2$s"
 msgstr "%1$s / Ĝisdatigoj kiuj mencias %2$s"
@@ -1194,49 +920,41 @@ msgstr "%1$s / Ĝisdatigoj kiuj mencias %2$s"
 #. TRANS: Subtitle for timeline of most recent mentions of a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname,
 #. TRANS: %3$s is a user's full name.
-#: actions/apitimelinementions.php:131
 #, php-format
 msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr "%1$s ĝisdatigoj kiuj respondas al ĝisdatigoj de %2$s / %3$s."
 
 #. TRANS: Title for site timeline. %s is the StatusNet sitename.
 #. TRANS: Public RSS feed title. %s is the StatusNet site name.
-#: actions/apitimelinepublic.php:193 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "%s publika tempstrio"
 
 #. TRANS: Subtitle for site timeline. %s is the StatusNet sitename.
-#: actions/apitimelinepublic.php:199
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "%s ĝisdatigoj de ĉiuj!"
 
 #. TRANS: Server error displayed calling unimplemented API method for 'retweeted by me'.
-#: actions/apitimelineretweetedbyme.php:71
 #, fuzzy
 msgid "Unimplemented."
 msgstr "Nerealiĝita metodo"
 
 #. TRANS: Title for Atom feed "repeated to me". %s is the user nickname.
-#: actions/apitimelineretweetedtome.php:96
 #, php-format
 msgid "Repeated to %s"
 msgstr "Ripetita al %s"
 
-#: actions/apitimelineretweetedtome.php:98
 #, fuzzy, php-format
 msgid "%1$s notices that were to repeated to %2$s / %3$s."
 msgstr "%1$s ĝisdatigoj kiuj respondas al ĝisdatigoj de %2$s / %3$s."
 
 #. TRANS: Title of list of repeated notices of the logged in user.
 #. TRANS: %s is the nickname of the logged in user.
-#: actions/apitimelineretweetsofme.php:98
 #, php-format
 msgid "Repeats of %s"
 msgstr "Ripetoj de %s"
 
-#: actions/apitimelineretweetsofme.php:104
 #, fuzzy, php-format
 msgid "%1$s notices that %2$s / %3$s has repeated."
 msgstr "%s (@%s) ŝatis vian avizon"
@@ -1245,79 +963,64 @@ msgstr "%s (@%s) ŝatis vian avizon"
 #. TRANS: %s is the tag.
 #. TRANS: Title for first page of notices with tags.
 #. TRANS: %s is the tag.
-#: actions/apitimelinetag.php:101 actions/tag.php:69
 #, php-format
 msgid "Notices tagged with %s"
 msgstr "Avizoj etikeditaj %s"
 
 #. TRANS: Subtitle for timeline with lastest notices with a given tag.
 #. TRANS: %1$s is the tag, $2$s is the StatusNet sitename.
-#: actions/apitimelinetag.php:105 actions/tagrss.php:65
 #, php-format
 msgid "Updates tagged with %1$s on %2$s!"
 msgstr "Ĝisdatigoj etikeditaj %1$s ĉe %2$s!"
 
 #. TRANS: Client error displayed trying to add a notice to another user's timeline.
-#: actions/apitimelineuser.php:308
 #, fuzzy
 msgid "Only the user can add to their own timeline."
 msgstr "Nur uzanto povas legi sian propran paŝton."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:315
 msgid "Only accept AtomPub for Atom feeds."
 msgstr ""
 
 #. TRANS: Client error displayed attempting to post an empty API notice.
-#: actions/apitimelineuser.php:322
 msgid "Atom post must not be empty."
 msgstr ""
 
 #. TRANS: Client error displayed attempting to post an API that is not well-formed XML.
-#: actions/apitimelineuser.php:328
 msgid "Atom post must be well-formed XML."
 msgstr ""
 
 #. TRANS: Client error displayed when not using an Atom entry.
-#: actions/apitimelineuser.php:334 actions/atompubfavoritefeed.php:228
-#: actions/atompubmembershipfeed.php:230
-#: actions/atompubsubscriptionfeed.php:236
 msgid "Atom post must be an Atom entry."
 msgstr ""
 
 #. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
-#: actions/apitimelineuser.php:345
 msgid "Can only handle POST activities."
 msgstr ""
 
 #. TRANS: Client error displayed when using an unsupported activity object type.
 #. TRANS: %s is the unsupported activity object type.
-#: actions/apitimelineuser.php:356
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
 #. TRANS: %d is the notice ID (number).
-#: actions/apitimelineuser.php:390
 #, fuzzy, php-format
 msgid "No content for notice %d."
 msgstr "Serĉi enhavon ĉe la retejo"
 
 #. TRANS: Client error displayed when using another format than AtomPub.
 #. TRANS: %s is the notice URI.
-#: actions/apitimelineuser.php:419
 #, fuzzy, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "Avizo kun tiu identigaĵo ne ekzistas."
 
 #. TRANS: Server error for unfinished API method showTrends.
-#: actions/apitrends.php:85
 msgid "API method under construction."
 msgstr "API-metodo farata."
 
 #. TRANS: Client error displayed when requesting user information for a non-existing user.
-#: actions/apiuserprofileimage.php:80 actions/apiusershow.php:94
 #, fuzzy
 msgid "User not found."
 msgstr "Metodo de API ne troviĝas."
@@ -1325,102 +1028,84 @@ msgstr "Metodo de API ne troviĝas."
 #. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
 #. TRANS: Client exception.
 #. TRANS: Client error displayed trying to subscribe to a non-existing profile.
-#: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
-#: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
-#: actions/subscribe.php:110
 msgid "No such profile."
 msgstr "Ne ekzistas tia profilo."
 
 #. TRANS: Subtitle for Atom favorites feed.
 #. TRANS: %1$s is a user nickname, %2$s is the StatusNet sitename.
-#: actions/atompubfavoritefeed.php:147
 #, fuzzy, php-format
 msgid "Notices %1$s has favorited on %2$s"
 msgstr "Ĝisdatiĝoj de %1$s kaj amikoj ĉe %2$s!"
 
 #. TRANS: Client exception thrown when trying to set a favorite for another user.
 #. TRANS: Client exception thrown when trying to subscribe another user.
-#: actions/atompubfavoritefeed.php:217 actions/atompubsubscriptionfeed.php:225
 #, fuzzy
 msgid "Cannot add someone else's subscription."
 msgstr "Estas neeble aldoni abonon de aliulo."
 
 #. TRANS: Client exception thrown when trying use an incorrect activity verb for the Atom pub method.
-#: actions/atompubfavoritefeed.php:240
 #, fuzzy
 msgid "Can only handle favorite activities."
 msgstr "Serĉi enhavon ĉe la retejo"
 
 #. TRANS: Client exception thrown when trying favorite an object that is not a notice.
-#: actions/atompubfavoritefeed.php:250 actions/atompubmembershipfeed.php:250
 #, fuzzy
 msgid "Can only fave notices."
 msgstr "Nur avizoj estas ŝatmarkeblaj."
 
 #. TRANS: Client exception thrown when trying favorite a notice without content.
-#: actions/atompubfavoritefeed.php:259
 #, fuzzy
 msgid "Unknown note."
 msgstr "Nekonata"
 
 #. TRANS: Client exception thrown when trying favorite an already favorited notice.
-#: actions/atompubfavoritefeed.php:267
 #, fuzzy
 msgid "Already a favorite."
 msgstr "Jam en la ŝatolisto."
 
 #. TRANS: Title for group membership feed.
 #. TRANS: %s is a username.
-#: actions/atompubmembershipfeed.php:144
 #, fuzzy, php-format
 msgid "%s group memberships"
 msgstr "%s grupanoj"
 
 #. TRANS: Subtitle for group membership feed.
 #. TRANS: %1$s is a username, %2$s is the StatusNet sitename.
-#: actions/atompubmembershipfeed.php:149
 #, fuzzy, php-format
 msgid "Groups %1$s is a member of on %2$s"
 msgstr "Grupoj de %s"
 
 #. TRANS: Client exception thrown when trying subscribe someone else to a group.
-#: actions/atompubmembershipfeed.php:219
 #, fuzzy
 msgid "Cannot add someone else's membership."
 msgstr "Estas neeble aldoni anecon de aliulo."
 
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#: actions/atompubmembershipfeed.php:242
 #, fuzzy
 msgid "Can only handle join activities."
 msgstr "Serĉi enhavon ĉe la retejo"
 
 #. TRANS: Client exception thrown when trying to subscribe to a non-existing group.
-#: actions/atompubmembershipfeed.php:259
 #, fuzzy
 msgid "Unknown group."
 msgstr "Nekonata grupo."
 
 #. TRANS: Client exception thrown when trying to subscribe to an already subscribed group.
-#: actions/atompubmembershipfeed.php:267
 #, fuzzy
 msgid "Already a member."
 msgstr "Ĉiuj grupanoj"
 
 #. TRANS: Client exception thrown when trying to subscribe to group while blocked from that group.
-#: actions/atompubmembershipfeed.php:275
 msgid "Blocked by admin."
 msgstr ""
 
 #. TRANS: Client exception thrown when referencing a non-existing favorite.
-#: actions/atompubshowfavorite.php:90
 #, fuzzy
 msgid "No such favorite."
 msgstr "Ne ekzistas tia ŝatataĵo."
 
 #. TRANS: Client exception thrown when trying to remove a favorite notice of another user.
-#: actions/atompubshowfavorite.php:151
 #, fuzzy
 msgid "Cannot delete someone else's favorite."
 msgstr "Malsukcesis forigi ŝataton."
@@ -1447,93 +1132,68 @@ msgstr "Malsukcesis forigi ŝataton."
 #. TRANS: Client error displayed when trying to join a non-existing group.
 #. TRANS: Client error displayed when trying to leave a non-local group.
 #. TRANS: Client error displayed when trying to leave a non-existing group.
+#. TRANS: Client error displayed when providing an invalid group ID on the Make Admin page.
 #. 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.
 #. TRANS: Command exception text shown when a group is requested that does not exist.
 #. TRANS: Error text shown when trying to leave a group that does not exist.
-#: actions/atompubshowmembership.php:81 actions/blockedfromgroup.php:81
-#: actions/blockedfromgroup.php:89 actions/deletegroup.php:87
-#: actions/deletegroup.php:100 actions/editgroup.php:102
-#: actions/foafgroup.php:46 actions/foafgroup.php:65 actions/foafgroup.php:73
-#: actions/groupblock.php:89 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:101 actions/grouplogo.php:103
-#: actions/groupmembers.php:84 actions/groupmembers.php:92
-#: actions/grouprss.php:97 actions/grouprss.php:105
-#: actions/groupunblock.php:89 actions/joingroup.php:82
-#: actions/joingroup.php:95 actions/leavegroup.php:82
-#: actions/leavegroup.php:95 actions/makeadmin.php:86
-#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:392
 msgid "No such group."
 msgstr "Ne estas tiu grupo."
 
 #. TRANS: Client exception thrown when trying to show membership of a non-subscribed group
-#: actions/atompubshowmembership.php:91
 #, fuzzy
 msgid "Not a member."
 msgstr "Ne estas ano."
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
-#: actions/atompubshowmembership.php:150
 #, fuzzy
 msgid "Cannot delete someone else's membership."
 msgstr "Ne eblas forigi abonon al vi mem."
 
 #. TRANS: Client exception thrown when trying to display a subscription for a non-existing profile ID.
 #. TRANS: %d is the non-existing profile ID number.
-#: actions/atompubshowsubscription.php:72
-#: actions/atompubshowsubscription.php:83
-#: actions/atompubsubscriptionfeed.php:74
 #, fuzzy, php-format
 msgid "No such profile id: %d."
 msgstr "Ne ekzistas profilidentigilo: %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.
-#: actions/atompubshowsubscription.php:94
 #, fuzzy, php-format
 msgid "Profile %1$d not subscribed to profile %2$d."
 msgstr "Vi ne abonis tiun profilon."
 
 #. TRANS: Client exception thrown when trying to delete a subscription of another user.
-#: actions/atompubshowsubscription.php:157
 #, fuzzy
 msgid "Cannot delete someone else's subscription."
 msgstr "Ne eblas forigi abonon de aliulo."
 
 #. TRANS: Subtitle for Atom subscription feed.
 #. TRANS: %1$s is a user nickname, %s$s is the StatusNet sitename.
-#: actions/atompubsubscriptionfeed.php:153
 #, fuzzy, php-format
 msgid "People %1$s has subscribed to on %2$s"
 msgstr "Abonantoj de %s"
 
 #. TRANS: Client error displayed when not using the follow verb.
-#: actions/atompubsubscriptionfeed.php:248
 msgid "Can only handle Follow activities."
 msgstr ""
 
 #. TRANS: Client exception thrown when subscribing to an object that is not a person.
-#: actions/atompubsubscriptionfeed.php:256
 msgid "Can only follow people."
 msgstr ""
 
 #. TRANS: Client exception thrown when subscribing to a non-existing profile.
 #. TRANS: %s is the unknown profile ID.
-#: actions/atompubsubscriptionfeed.php:267
 #, fuzzy, php-format
 msgid "Unknown profile %s."
 msgstr "Nekonata profilo %s."
 
 #. TRANS: Client error displayed trying to subscribe to an already subscribed profile.
 #. TRANS: %s is the profile the user already has a subscription on.
-#: actions/atompubsubscriptionfeed.php:275
 #, fuzzy, php-format
 msgid "Already subscribed to %s."
 msgstr "Jam abonato!"
 
 #. TRANS: Client error displayed trying to get a non-existing attachment.
-#: actions/attachment.php:73
 msgid "No such attachment."
 msgstr "Ne estas tiu aldonaĵo."
 
@@ -1545,31 +1205,23 @@ msgstr "Ne estas tiu aldonaĵo."
 #. TRANS: Client error displayed when trying to view group members without providing a group nickname.
 #. TRANS: Client error displayed when requesting a group RSS feed without providing a group nickname.
 #. TRANS: Client error displayed if no nickname argument was given requesting a group page.
-#: actions/avatarbynickname.php:60 actions/blockedfromgroup.php:73
-#: actions/editgroup.php:85 actions/groupdesignsettings.php:84
-#: actions/grouplogo.php:86 actions/groupmembers.php:76
-#: actions/grouprss.php:89 actions/showgroup.php:116
 msgid "No nickname."
 msgstr "Neniu kromnomo."
 
 #. TRANS: Client error displayed trying to get an avatar without providing an avatar size.
-#: actions/avatarbynickname.php:66
 msgid "No size."
 msgstr " Neniu grando."
 
 #. TRANS: Client error displayed trying to get an avatar providing an invalid avatar size.
-#: actions/avatarbynickname.php:72
 msgid "Invalid size."
 msgstr "Grando nevalida."
 
 #. TRANS: Title for avatar upload page.
-#: actions/avatarsettings.php:66 lib/settingsnav.php:82
 msgid "Avatar"
 msgstr "Vizaĝbildo"
 
 #. TRANS: Instruction for avatar upload page.
 #. TRANS: %s is the maximum file size, for example "500b", "10kB" or "2MB".
-#: actions/avatarsettings.php:78
 #, php-format
 msgid "You can upload your personal avatar. The maximum file size is %s."
 msgstr "Vi povas alŝuti vian personan vizaĝbildon. Dosiero-grandlimo estas %s."
@@ -1578,17 +1230,12 @@ msgstr "Vi povas alŝuti vian personan vizaĝbildon. Dosiero-grandlimo estas %s.
 #. TRANS: Server error displayed coming across a request from a user without a profile.
 #. TRANS: Server error displayed when trying to authorise a remote subscription request
 #. TRANS: while the user has no profile.
-#: actions/avatarsettings.php:108 actions/avatarsettings.php:192
-#: actions/grouplogo.php:184 actions/remotesubscribe.php:190
-#: actions/userauthorization.php:75 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr "Uzanto sen egala profilo."
 
 #. TRANS: Avatar upload page form legend.
 #. TRANS: Avatar upload page crop form legend.
 #. TRANS: Legend for group logo settings fieldset.
-#: actions/avatarsettings.php:122 actions/avatarsettings.php:205
-#: actions/grouplogo.php:261
 msgid "Avatar settings"
 msgstr "Vizaĝbilda agordo"
 
@@ -1596,8 +1243,6 @@ msgstr "Vizaĝbilda agordo"
 #. TRANS: Header on avatar upload crop form for thumbnail of originally uploaded avatar (h2).
 #. TRANS: Uploaded original file in group logo form.
 #. TRANS: Header for originally uploaded file before a crop on the group logo page.
-#: actions/avatarsettings.php:131 actions/avatarsettings.php:214
-#: actions/grouplogo.php:207 actions/grouplogo.php:270
 msgid "Original"
 msgstr "Originala"
 
@@ -1605,14 +1250,11 @@ msgstr "Originala"
 #. TRANS: Header on avatar upload crop form for thumbnail of to be used rendition of uploaded avatar (h2).
 #. TRANS: Header for preview of to be displayed group logo.
 #. TRANS: Header for the cropped group logo on the group logo page.
-#: actions/avatarsettings.php:147 actions/avatarsettings.php:227
-#: actions/grouplogo.php:219 actions/grouplogo.php:283
 msgid "Preview"
 msgstr "Antaŭrigardo"
 
 #. TRANS: Button on avatar upload page to delete current avatar.
 #. TRANS: Button text for user account deletion.
-#: actions/avatarsettings.php:155 actions/deleteaccount.php:319
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Delete"
@@ -1620,70 +1262,58 @@ msgstr "Forigi"
 
 #. TRANS: Button on avatar upload page to upload an avatar.
 #. TRANS: Submit button to confirm upload of a user backup file for account restore.
-#: actions/avatarsettings.php:173 actions/restoreaccount.php:369
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Upload"
 msgstr "Alŝuti"
 
 #. TRANS: Button on avatar upload crop form to confirm a selected crop as avatar.
-#: actions/avatarsettings.php:243
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Crop"
 msgstr "Tranĉi"
 
 #. TRANS: Validation error on avatar upload form when no file was uploaded.
-#: actions/avatarsettings.php:318
 msgid "No file uploaded."
 msgstr "Neniu dosiero alŝutiĝas."
 
 #. TRANS: Avatar upload form instruction after uploading a file.
-#: actions/avatarsettings.php:345
 #, fuzzy
 msgid "Pick a square area of the image to be your avatar."
 msgstr "Elektu kvadratan parton de la bildo kiel via vizaĝbildo"
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
 #. TRANS: Server error displayed trying to crop an uploaded group logo that is no longer present.
-#: actions/avatarsettings.php:360 actions/grouplogo.php:391
 msgid "Lost our file data."
 msgstr "Perdiĝis nia dosiera datumo."
 
 #. TRANS: Success message for having updated a user avatar.
-#: actions/avatarsettings.php:384
 msgid "Avatar updated."
 msgstr "Vizaĝbildo ĝisdatigita."
 
 #. TRANS: Error displayed on the avatar upload page if the avatar could not be updated for an unknown reason.
-#: actions/avatarsettings.php:388
 msgid "Failed updating avatar."
 msgstr "Eraris ĝisdatigi vizaĝbildon."
 
 #. TRANS: Success message for deleting a user avatar.
-#: actions/avatarsettings.php:412
 msgid "Avatar deleted."
 msgstr "Vizaĝbildo forigita."
 
 #. TRANS: Title for backup account page.
 #. TRANS: Option in profile settings to create a backup of the account of the currently logged in user.
-#: actions/backupaccount.php:61 actions/profilesettings.php:468
 msgid "Backup account"
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to backup an account while not logged in.
-#: actions/backupaccount.php:79
 #, fuzzy
 msgid "Only logged-in users can backup their account."
 msgstr "Nur ensalutinto rajtas ripeti avizon."
 
 #. TRANS: Client exception thrown when trying to backup an account without having backup rights.
-#: actions/backupaccount.php:84
 msgid "You may not backup your account."
 msgstr ""
 
 #. TRANS: Information displayed on the backup account page.
-#: actions/backupaccount.php:227
 msgid ""
 "You can backup your account data in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format. This is an experimental feature and provides "
@@ -1693,31 +1323,26 @@ msgid ""
 msgstr ""
 
 #. TRANS: Submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:250
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Backup"
 msgstr "Fono"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:254
 msgid "Backup your account."
 msgstr ""
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
-#: actions/block.php:68
 msgid "You already blocked that user."
 msgstr "Vi jam blokis la uzanton."
 
 #. TRANS: Title for block user page.
 #. TRANS: Legend for block user form.
 #. TRANS: Fieldset legend for block user from group form.
-#: actions/block.php:106 actions/block.php:136 actions/groupblock.php:165
 msgid "Block user"
 msgstr "Bloki uzanton"
 
 #. TRANS: Explanation of consequences when blocking a user on the block user page.
-#: actions/block.php:139
 msgid ""
 "Are you sure you want to block this user? Afterwards, they will be "
 "unsubscribed from you, unable to subscribe to you in the future, and you "
@@ -1732,15 +1357,11 @@ msgstr ""
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:154 actions/deleteapplication.php:157
-#: actions/deletegroup.php:220 actions/deletenotice.php:155
-#: actions/deleteuser.php:154 actions/groupblock.php:187
 msgctxt "BUTTON"
 msgid "No"
 msgstr "Ne"
 
 #. TRANS: Submit button title for 'No' when blocking a user.
-#: actions/block.php:158
 #, fuzzy
 msgid "Do not block this user."
 msgstr "Ne bloki la uzanton"
@@ -1751,50 +1372,40 @@ msgstr "Ne bloki la uzanton"
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:161 actions/deleteapplication.php:164
-#: actions/deletegroup.php:227 actions/deletenotice.php:162
-#: actions/deleteuser.php:161 actions/groupblock.php:194
 msgctxt "BUTTON"
 msgid "Yes"
 msgstr "Jes"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:165
 #, fuzzy
 msgid "Block this user."
 msgstr "Bloki la uzanton"
 
 #. TRANS: Server error displayed when blocking a user fails.
-#: actions/block.php:189
 msgid "Failed to save block information."
 msgstr "Eraris konservi blokado-informon."
 
 #. TRANS: Title for first page with list of users blocked from a group.
 #. TRANS: %s is a group nickname.
-#: actions/blockedfromgroup.php:101
 #, php-format
 msgid "%s blocked profiles"
 msgstr "%s profiloj blokitaj"
 
 #. TRANS: Title for any but the first page with list of users blocked from a group.
 #. TRANS: %1$s is a group nickname, %2$d is a page number.
-#: actions/blockedfromgroup.php:106
 #, php-format
 msgid "%1$s blocked profiles, page %2$d"
 msgstr "%1$s profiloj blokitaj, paĝo %2$d"
 
 #. TRANS: Instructions for list of users blocked from a group.
-#: actions/blockedfromgroup.php:122
 msgid "A list of the users blocked from joining this group."
 msgstr "Listo de uzantoj blokita de aniĝi al ĉi tiun grupo."
 
 #. TRANS: Form legend for unblocking a user from a group.
-#: actions/blockedfromgroup.php:291
 msgid "Unblock user from group"
 msgstr "Malbloki uzanton de grupo"
 
 #. TRANS: Button text for unblocking a user from a group.
-#: actions/blockedfromgroup.php:323
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Unblock"
@@ -1802,130 +1413,104 @@ msgstr "Malbloki"
 
 #. TRANS: Tooltip for button for unblocking a user from a group.
 #. TRANS: Description of the form to unblock a user.
-#: actions/blockedfromgroup.php:327 lib/unblockform.php:78
 msgid "Unblock this user"
 msgstr "Malbloki ĉi tiun uzanton"
 
 #. TRANS: Title for mini-posting window loaded from bookmarklet.
 #. TRANS: %s is the StatusNet site name.
-#: actions/bookmarklet.php:51
 #, php-format
 msgid "Post to %s"
 msgstr "Sendi al %s"
 
 #. TRANS: Client error displayed when not providing a confirmation code in the contact address confirmation action.
-#: actions/confirmaddress.php:74
 msgid "No confirmation code."
 msgstr "Neniu konfirma kodo."
 
 #. TRANS: Client error displayed when providing a non-existing confirmation code in the contact address confirmation action.
-#: actions/confirmaddress.php:80
 msgid "Confirmation code not found."
 msgstr "Konfirma kodo ne trovitas."
 
 #. TRANS: Client error displayed when not providing a confirmation code for another user in the contact address confirmation action.
-#: actions/confirmaddress.php:86
 msgid "That confirmation code is not for you!"
 msgstr "Tiu komfirmnumero ne estas por vi!"
 
 #. TRANS: Server error for an unknown address type, which can be 'email', 'sms', or the name of an IM network (such as 'xmpp' or 'aim')
-#: actions/confirmaddress.php:94
 #, fuzzy, php-format
 msgid "Unrecognized address type %s"
 msgstr "Nerekonata adrestipo %s."
 
 #. TRANS: Client error for an already confirmed email/jabber/sms address.
-#: actions/confirmaddress.php:103 actions/confirmaddress.php:136
 msgid "That address has already been confirmed."
 msgstr "La adreso jam estis konfirmita."
 
-#: actions/confirmaddress.php:121 actions/imsettings.php:444
-#: actions/userdesignsettings.php:306
-#, fuzzy
 msgid "Couldn't update user."
-msgstr "Malsukcesis ĝisdatigi uzanton"
+msgstr "Ne povus ĝisdatigi uzanton."
 
-#: actions/confirmaddress.php:144
 #, fuzzy
 msgid "Couldn't update user im preferences."
 msgstr "Malsukcesis ĝisdatigi uzantan informon."
 
-#: actions/confirmaddress.php:156
 #, fuzzy
 msgid "Couldn't insert user im preferences."
 msgstr "Eraris enmeti novan abonon."
 
 #. TRANS: Server error displayed when an address confirmation code deletion from the
 #. TRANS: database fails in the contact address confirmation action.
-#: actions/confirmaddress.php:169
 #, fuzzy
 msgid "Could not delete address confirmation."
 msgstr "Malsukcesis forigi tujmesaĝila agordo."
 
 #. TRANS: Title for the contact address confirmation action.
-#: actions/confirmaddress.php:185
 msgid "Confirm address"
 msgstr "Konfirmi retadreson"
 
 #. TRANS: Success message for the contact address confirmation action.
 #. TRANS: %s can be 'email', 'jabber', or 'sms'.
-#: actions/confirmaddress.php:200
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "Adreso \"%s\" nun konfirmitas je via konto."
 
 #. TRANS: Title for page with a conversion (multiple notices in context).
-#: actions/conversation.php:96
 msgid "Conversation"
 msgstr "Konversacio"
 
 #. TRANS: Header on conversation page. Hidden by default (h2).
 #. TRANS: Label for user statistics.
-#: actions/conversation.php:149 lib/noticelist.php:87
-#: lib/profileaction.php:246 lib/searchgroupnav.php:82
-#: lib/threadednoticelist.php:66
 msgid "Notices"
 msgstr "Avizoj"
 
 #. TRANS: Client exception displayed trying to delete a user account while not logged in.
-#: actions/deleteaccount.php:71
 #, fuzzy
 msgid "Only logged-in users can delete their account."
 msgstr "Nur ensalutinto rajtas ripeti avizon."
 
 #. TRANS: Client exception displayed trying to delete a user account without have the rights to do that.
-#: actions/deleteaccount.php:77
 #, fuzzy
 msgid "You cannot delete your account."
 msgstr "Vi ne povas forigi uzantojn."
 
 #. TRANS: Confirmation text for user deletion. The user has to type this exactly the same, including punctuation.
-#: actions/deleteaccount.php:160 actions/deleteaccount.php:297
 msgid "I am sure."
 msgstr ""
 
 #. TRANS: Notification for user about the text that must be input to be able to delete a user account.
 #. TRANS: %s is the text that needs to be input.
-#: actions/deleteaccount.php:164
 #, php-format
 msgid "You must write \"%s\" exactly in the box."
 msgstr ""
 
 #. TRANS: Confirmation that a user account has been deleted.
-#: actions/deleteaccount.php:206
 #, fuzzy
 msgid "Account deleted."
 msgstr "Vizaĝbildo forigita."
 
 #. TRANS: Page title for page on which a user account can be deleted.
 #. TRANS: Option in profile settings to delete the account of the currently logged in user.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:476
 #, fuzzy
 msgid "Delete account"
 msgstr "Krei konton"
 
 #. TRANS: Form text for user deletion form.
-#: actions/deleteaccount.php:279
 msgid ""
 "This will <strong>permanently delete</strong> your account data from this "
 "server."
@@ -1933,7 +1518,6 @@ msgstr ""
 
 #. TRANS: Additional form text for user deletion form shown if a user has account backup rights.
 #. TRANS: %s is a URL to the backup page.
-#: actions/deleteaccount.php:285
 #, php-format
 msgid ""
 "You are strongly advised to <a href=\"%s\">back up your data</a> before "
@@ -1942,56 +1526,43 @@ msgstr ""
 
 #. TRANS: Field label for delete account confirmation entry.
 #. TRANS: Field label for password reset form where the password has to be typed again.
-#: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:262 actions/register.php:419
 msgid "Confirm"
 msgstr "Konfirmi"
 
 #. TRANS: Input title for the delete account field.
 #. TRANS: %s is the text that needs to be input.
-#: actions/deleteaccount.php:304
 #, fuzzy, php-format
 msgid "Enter \"%s\" to confirm that you want to delete your account."
 msgstr "Vi ne povas forigi uzantojn."
 
 #. TRANS: Button title for user account deletion.
-#: actions/deleteaccount.php:323
 #, fuzzy
 msgid "Permanently delete your account"
 msgstr "Vi ne povas forigi uzantojn."
 
 #. TRANS: Client error displayed trying to delete an application while not logged in.
-#: actions/deleteapplication.php:62
 msgid "You must be logged in to delete an application."
 msgstr "Ensalutu por forigi la aplikaĵon."
 
 #. TRANS: Client error displayed trying to delete an application that does not exist.
-#: actions/deleteapplication.php:71
 msgid "Application not found."
 msgstr "Aplikaĵo ne trovita."
 
 #. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
-#: actions/deleteapplication.php:79 actions/editapplication.php:78
-#: actions/showapplication.php:90
 msgid "You are not the owner of this application."
 msgstr "Vi ne estas la posedanto de ĉi tiu aplikaĵo."
 
 #. TRANS: Client error text when there is a problem with the session token.
-#: actions/deleteapplication.php:102 actions/editapplication.php:131
-#: actions/newapplication.php:112 actions/showapplication.php:113
-#: lib/action.php:1391
 msgid "There was a problem with your session token."
 msgstr "Problemo okazas pri via seancĵetono."
 
 #. TRANS: Title for delete application page.
 #. TRANS: Fieldset legend on delete application page.
-#: actions/deleteapplication.php:124 actions/deleteapplication.php:149
 msgid "Delete application"
 msgstr "Forigi aplikaĵon"
 
 #. TRANS: Confirmation text on delete application page.
-#: actions/deleteapplication.php:152
 msgid ""
 "Are you sure you want to delete this application? This will clear all data "
 "about the application from the database, including all existing user "
@@ -2001,19 +1572,16 @@ msgstr ""
 "la datumbazo, inkluzive de ĉiu ekzistanta uzanto-konekto."
 
 #. TRANS: Submit button title for 'No' when deleting an application.
-#: actions/deleteapplication.php:161
 #, fuzzy
 msgid "Do not delete this application."
 msgstr "Ne forigu ĉi tiun aplikaĵon."
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
-#: actions/deleteapplication.php:167
 #, fuzzy
 msgid "Delete this application."
 msgstr "Viŝi ĉi tiun aplikon"
 
 #. TRANS: Client error when trying to delete group while not logged in.
-#: actions/deletegroup.php:64
 #, fuzzy
 msgid "You must be logged in to delete a group."
 msgstr "Por povi forigi grupon, oni devas ensaluti."
@@ -2021,40 +1589,33 @@ msgstr "Por povi forigi grupon, oni devas ensaluti."
 #. TRANS: Client error when trying to delete a group without providing a nickname or ID for the group.
 #. TRANS: Client error displayed when trying to join a group without providing a group name or group ID.
 #. TRANS: Client error displayed when trying to leave a group without providing a group name or group ID.
-#: actions/deletegroup.php:94 actions/joingroup.php:89
-#: actions/leavegroup.php:89
 msgid "No nickname or ID."
 msgstr "Ne estas alinomo aŭ ID."
 
 #. TRANS: Client error when trying to delete a group without having the rights to delete it.
-#: actions/deletegroup.php:107
 #, fuzzy
 msgid "You are not allowed to delete this group."
 msgstr "Vi ne estas grupano."
 
 #. TRANS: Server error displayed if a group could not be deleted.
 #. TRANS: %s is the name of the group that could not be deleted.
-#: actions/deletegroup.php:150
 #, fuzzy, php-format
 msgid "Could not delete group %s."
 msgstr "Malsukcesis ĝisdatigi grupon."
 
 #. TRANS: Message given after deleting a group.
 #. TRANS: %s is the deleted group's name.
-#: actions/deletegroup.php:159
 #, fuzzy, php-format
 msgid "Deleted group %s"
 msgstr "%1$s eksaniĝis de grupo %2$s"
 
 #. TRANS: Title of delete group page.
 #. TRANS: Form legend for deleting a group.
-#: actions/deletegroup.php:176 actions/deletegroup.php:202
 #, fuzzy
 msgid "Delete group"
 msgstr "Forigi grupon"
 
 #. TRANS: Warning in form for deleleting a group.
-#: actions/deletegroup.php:206
 #, fuzzy
 msgid ""
 "Are you sure you want to delete this group? This will clear all data about "
@@ -2065,13 +1626,11 @@ msgstr ""
 "datumbazo sen sekurkopio."
 
 #. TRANS: Submit button title for 'No' when deleting a group.
-#: actions/deletegroup.php:224
 #, fuzzy
 msgid "Do not delete this group."
 msgstr "Ne forigi la avizon"
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
-#: actions/deletegroup.php:231
 #, fuzzy
 msgid "Delete this group."
 msgstr "Forigi la uzanton"
@@ -2082,22 +1641,18 @@ msgstr "Forigi la uzanton"
 #. TRANS: Client error displayed trying to block a user from a group while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying to log out when not logged in.
+#. TRANS: Client error displayed when trying to access the "make admin" page while not logged in.
+#. TRANS: Client error displayed trying to create a new direct message while not logged in.
+#. TRANS: Client error displayed trying to send a notice while not logged in.
+#. TRANS: Client error displayed trying to nudge a user without being logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
 #. TRANS: Client error displayed when trying to change user options while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
-#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:70
-#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
-#: actions/nudge.php:63 actions/pluginenable.php:97 actions/subedit.php:33
-#: actions/subscribe.php:98 actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:71 lib/profileformaction.php:63
-#: lib/settingsaction.php:72
 msgid "Not logged in."
 msgstr "Ne konektita."
 
 #. TRANS: Instructions for deleting a notice.
-#: actions/deletenotice.php:110
 msgid ""
 "You are about to permanently delete a notice. Once this is done, it cannot "
 "be undone."
@@ -2106,51 +1661,42 @@ msgstr ""
 
 #. TRANS: Page title when deleting a notice.
 #. TRANS: Fieldset legend for the delete notice form.
-#: actions/deletenotice.php:117 actions/deletenotice.php:148
 msgid "Delete notice"
 msgstr "Forigi avizon"
 
 #. TRANS: Message for the delete notice form.
-#: actions/deletenotice.php:152
 msgid "Are you sure you want to delete this notice?"
 msgstr "Ĉu vi certe volas forigi la avizon?"
 
 #. TRANS: Submit button title for 'No' when deleting a notice.
-#: actions/deletenotice.php:159
 #, fuzzy
 msgid "Do not delete this notice."
 msgstr "Ne forigi la avizon"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:166
 #, fuzzy
 msgid "Delete this notice."
 msgstr "Forigi la avizon"
 
 #. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
-#: actions/deleteuser.php:66
 msgid "You cannot delete users."
 msgstr "Vi ne povas forigi uzantojn."
 
 #. TRANS: Client error displayed when trying to delete a non-local user.
-#: actions/deleteuser.php:74
 msgid "You can only delete local users."
 msgstr "Vi povas forigi nur lokan uzanton."
 
 #. TRANS: Title of delete user page.
-#: actions/deleteuser.php:110
 #, fuzzy
 msgctxt "TITLE"
 msgid "Delete user"
 msgstr "Forigi uzanton"
 
 #. TRANS: Fieldset legend on delete user page.
-#: actions/deleteuser.php:134
 msgid "Delete user"
 msgstr "Forigi uzanton"
 
 #. TRANS: Information text to request if a user is certain that the described action has to be performed.
-#: actions/deleteuser.php:138
 msgid ""
 "Are you sure you want to delete this user? This will clear all data about "
 "the user from the database, without a backup."
@@ -2159,101 +1705,82 @@ msgstr ""
 "datumbazo sen sekurkopio."
 
 #. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/deleteuser.php:158
 #, fuzzy
 msgid "Do not delete this user."
 msgstr "Ne forigi la avizon"
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
-#: actions/deleteuser.php:165
 #, fuzzy
 msgid "Delete this user."
 msgstr "Forigi la uzanton"
 
 #. TRANS: Message used as title for design settings for the site.
-#: actions/designadminpanel.php:60 lib/settingsnav.php:97
 msgid "Design"
 msgstr "Aspekto"
 
 #. TRANS: Instructions for design adminsitration panel.
-#: actions/designadminpanel.php:71
 msgid "Design settings for this StatusNet site"
 msgstr "Desegna agordo por ĉi tiu StatusNet-retejo"
 
 #. TRANS: Client error displayed when a logo URL does is not valid.
-#: actions/designadminpanel.php:327
 msgid "Invalid logo URL."
 msgstr "URL por la emblemo nevalida."
 
 #. TRANS: Client error displayed when an SSL logo URL is invalid.
-#: actions/designadminpanel.php:333
 #, fuzzy
 msgid "Invalid SSL logo URL."
 msgstr "URL por la emblemo nevalida."
 
 #. TRANS: Client error displayed when a theme is submitted through the form that is not in the theme list.
 #. TRANS: %s is the chosen unavailable theme.
-#: actions/designadminpanel.php:339
 #, php-format
 msgid "Theme not available: %s."
 msgstr "Desegno ne havebla: %s."
 
 #. TRANS: Fieldset legend for form to change logo.
-#: actions/designadminpanel.php:437
 msgid "Change logo"
 msgstr "Ŝanĝi emblemon"
 
 #. TRANS: Field label for StatusNet site logo.
-#: actions/designadminpanel.php:444
 msgid "Site logo"
 msgstr "Reteja emblemo"
 
 #. TRANS: Field label for SSL StatusNet site logo.
-#: actions/designadminpanel.php:452
 #, fuzzy
 msgid "SSL logo"
 msgstr "Reteja emblemo"
 
 #. TRANS: Fieldset legend for form change StatusNet site's theme.
-#: actions/designadminpanel.php:467
 msgid "Change theme"
 msgstr "Ŝanĝi desegnon"
 
 #. TRANS: Field label for dropdown to choose site theme.
-#: actions/designadminpanel.php:485
 msgid "Site theme"
 msgstr "Reteja desegno"
 
 #. TRANS: Title for field label for dropdown to choose site theme.
-#: actions/designadminpanel.php:487
 msgid "Theme for the site."
 msgstr "Desegno por la retejo"
 
 #. TRANS: Field label for uploading a cutom theme.
-#: actions/designadminpanel.php:494
 msgid "Custom theme"
 msgstr "Propra desegno"
 
 #. TRANS: Form instructions for uploading a cutom StatusNet theme.
-#: actions/designadminpanel.php:499
 msgid "You can upload a custom StatusNet theme as a .ZIP archive."
 msgstr "Vi povas alŝuti propran StatusNet-desegnon kiel .zip-dosiero"
 
 #. TRANS: Fieldset legend for theme background image.
-#: actions/designadminpanel.php:515
 msgid "Change background image"
 msgstr "Ŝanĝi fonbildon"
 
 #. TRANS: Field label for background image on theme designer page.
 #. TRANS: Field label for background color selector.
 #. TRANS: Label on profile design page for setting a profile page background colour.
-#: actions/designadminpanel.php:525 actions/designadminpanel.php:609
-#: lib/designform.php:238
 msgid "Background"
 msgstr "Fono"
 
 #. TRANS: Form guide for background image upload form on theme designer page.
-#: actions/designadminpanel.php:531
 #, php-format
 msgid ""
 "You can upload a background image for the site. The maximum file size is %1"
@@ -2261,204 +1788,169 @@ msgid ""
 msgstr "Vi povas alŝuti fonbildon por la retejo. Dosiero-grandlimo estas %1$s."
 
 #. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:558
 msgid "On"
 msgstr "En"
 
 #. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:575
 msgid "Off"
 msgstr "For"
 
 #. TRANS: Form guide for turning background image on or off on theme designer page.
 #. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
 #. TRANS: use of the uploaded profile image.
-#: actions/designadminpanel.php:577 lib/designform.php:214
 msgid "Turn background image on or off."
 msgstr "Aktivigi aŭ senaktivigi fonbildon"
 
 #. TRANS: Checkbox label to title background image on theme designer page.
 #. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-#: actions/designadminpanel.php:583 lib/designform.php:220
 msgid "Tile background image"
 msgstr "Ripeti la fonbildon"
 
 #. TRANS: Fieldset legend for theme colors.
-#: actions/designadminpanel.php:598
 #, fuzzy
 msgid "Change colors"
 msgstr "Ŝanĝi kolorojn"
 
 #. TRANS: Field label for content color selector.
 #. TRANS: Label on profile design page for setting a profile page content colour.
-#: actions/designadminpanel.php:623 lib/designform.php:252
 msgid "Content"
 msgstr "Enhavo"
 
 #. TRANS: Field label for sidebar color selector.
 #. TRANS: Label on profile design page for setting a profile page sidebar colour.
-#: actions/designadminpanel.php:637 lib/designform.php:266
 msgid "Sidebar"
 msgstr "Flanka strio"
 
 #. TRANS: Field label for text color selector.
 #. TRANS: Label on profile design page for setting a profile page text colour.
-#: actions/designadminpanel.php:651 lib/designform.php:280
 msgid "Text"
 msgstr "Teksto"
 
 #. TRANS: Field label for link color selector.
 #. TRANS: Label on profile design page for setting a profile page links colour.
-#: actions/designadminpanel.php:665 lib/designform.php:294
 msgid "Links"
 msgstr "Ligiloj"
 
 #. TRANS: Fieldset legend for advanced theme design settings.
-#: actions/designadminpanel.php:691
 msgid "Advanced"
 msgstr "Speciala"
 
 #. TRANS: Field label for custom CSS.
-#: actions/designadminpanel.php:696
 msgid "Custom CSS"
 msgstr "Propra CSS"
 
 #. TRANS: Button text for resetting theme settings.
-#: actions/designadminpanel.php:718
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Use defaults"
 msgstr "Uzu defaŭlton"
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:720
 #, fuzzy
 msgid "Restore default designs."
 msgstr "Restaŭri defaŭltajn desegnojn"
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:728
 #, fuzzy
 msgid "Reset back to default."
 msgstr "Redefaŭltiĝi"
 
 #. TRANS: Title for button for saving theme settings.
-#: actions/designadminpanel.php:736
 #, fuzzy
 msgid "Save design."
 msgstr "Savi desegnon"
 
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
-#: actions/disfavor.php:83
 msgid "This notice is not a favorite!"
 msgstr "Ĉi tiu avizo ne estas preferita"
 
 #. TRANS: Title for page on which favorites can be added.
-#: actions/disfavor.php:98
 msgid "Add to favorites"
 msgstr "Aldoni al ŝatolisto"
 
 #. TRANS: Client exception thrown when requesting a document from the documentation that does not exist.
 #. TRANS: %s is the non-existing document.
-#: actions/doc.php:155
 #, fuzzy, php-format
 msgid "No such document \"%s\"."
 msgstr "Ne estas tia dokumento \"%s\""
 
 #. TRANS: Title for "Edit application" form.
 #. TRANS: Form legend.
-#: actions/editapplication.php:54 lib/applicationeditform.php:129
 msgid "Edit application"
 msgstr "Redakti aplikaĵon"
 
 #. TRANS: Client error displayed trying to edit an application while not logged in.
-#: actions/editapplication.php:66
 msgid "You must be logged in to edit an application."
 msgstr "Ensalutu por redakti la aplikaĵon."
 
 #. TRANS: Client error displayed trying to edit an application that does not exist.
-#: actions/editapplication.php:83 actions/showapplication.php:83
 msgid "No such application."
 msgstr "Ne estas tia aplikaĵo."
 
 #. TRANS: Instructions for "Edit application" form.
-#: actions/editapplication.php:167
 msgid "Use this form to edit your application."
 msgstr "Uzu ĉi tiun formularon por redakti vian aplikaĵon."
 
 #. TRANS: Validation error shown when not providing a name in the "Edit application" form.
 #. TRANS: Validation error shown when not providing a name in the "New application" form.
-#: actions/editapplication.php:184 actions/newapplication.php:164
 msgid "Name is required."
 msgstr "Nomo necesas."
 
 #. 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.
-#: actions/editapplication.php:188 actions/newapplication.php:172
 #, fuzzy
 msgid "Name is too long (maximum 255 characters)."
 msgstr "La nomo estas tro longa (maksimume 255 literoj)"
 
 #. TRANS: Validation error shown when providing a name for an application that already exists in the "Edit application" form.
 #. TRANS: Validation error shown when providing a name for an application that already exists in the "New application" form.
-#: actions/editapplication.php:192 actions/newapplication.php:168
 msgid "Name already in use. Try another one."
 msgstr "La nomo jam uziĝis. Provu ion alian."
 
 #. TRANS: Validation error shown when not providing a description in the "Edit application" form.
 #. TRANS: Validation error shown when not providing a description in the "New application" form.
-#: actions/editapplication.php:196 actions/newapplication.php:176
 msgid "Description is required."
 msgstr "Priskribo necesas."
 
 #. TRANS: Validation error shown when providing too long a source URL in the "Edit application" form.
-#: actions/editapplication.php:209
 msgid "Source URL is too long."
 msgstr "Fonta URL estas tro longa."
 
 #. TRANS: Validation error shown when providing an invalid source URL in the "Edit application" form.
 #. TRANS: Validation error shown when providing an invalid source URL in the "New application" form.
-#: actions/editapplication.php:216 actions/newapplication.php:199
 msgid "Source URL is not valid."
 msgstr "Fonta URL estas nevalida."
 
 #. 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.
-#: actions/editapplication.php:220 actions/newapplication.php:203
 msgid "Organization is required."
 msgstr "Organizo necesas."
 
 #. TRANS: Validation error shown when providing too long an arganisation name in the "Edit application" form.
-#: actions/editapplication.php:224 actions/newapplication.php:207
 #, fuzzy
 msgid "Organization is too long (maximum 255 characters)."
 msgstr "Organizonomo estas tro longa (maksimume 255 literoj)."
 
 #. TRANS: Form validation error show when an organisation name has not been provided in the edit application form.
 #. TRANS: Form validation error show when an organisation name has not been provided in the new application form.
-#: actions/editapplication.php:228 actions/newapplication.php:211
 msgid "Organization homepage is required."
 msgstr "Organiza ĉefpaĝo bezoniĝas."
 
 #. TRANS: Validation error shown when providing too long a callback URL in the "Edit application" form.
 #. TRANS: Validation error shown when providing too long a callback URL in the "New application" form.
-#: actions/editapplication.php:239 actions/newapplication.php:225
 msgid "Callback is too long."
 msgstr "Revokfunkcio estas tro longa."
 
 #. TRANS: Validation error shown when providing an invalid callback URL in the "Edit application" form.
 #. TRANS: Validation error shown when providing an invalid callback URL in the "New application" form.
-#: actions/editapplication.php:247 actions/newapplication.php:235
 msgid "Callback URL is not valid."
 msgstr "Revokfunkcia URL estas nevalida."
 
 #. TRANS: Server error occuring when an application could not be updated from the "Edit application" form.
-#: actions/editapplication.php:284
 msgid "Could not update application."
 msgstr "Malsukcesis ĝisdatigi la aplikaĵon."
 
 #. TRANS: Title for form to edit a group. %s is a group nickname.
-#: actions/editgroup.php:55
 #, php-format
 msgid "Edit %s group"
 msgstr "Redakti %s grupon"
@@ -2466,40 +1958,40 @@ msgstr "Redakti %s grupon"
 #. TRANS: Client error displayed trying to edit a group while not logged in.
 #. TRANS: Client error displayed when trying to create a group while not logged in.
 #. TRANS: Client error displayed trying to create a group while not logged in.
-#: actions/editgroup.php:68 actions/grouplogo.php:69 actions/newgroup.php:65
 msgid "You must be logged in to create a group."
 msgstr "Ensalutu por krei grupon."
 
 #. TRANS: Form instructions for group edit form.
-#: actions/editgroup.php:161
 msgid "Use this form to edit the group."
 msgstr "Uzas ĉi tiun formularon por redakti la grupon."
 
+#. TRANS: Group edit form validation error.
+#. TRANS: Group create form validation error.
+#. TRANS: %s is the invalid alias.
+#, php-format
+msgid "Invalid alias: \"%s\""
+msgstr "Nevalida alinomo: \"%s\""
+
 #. TRANS: Group edit form success message.
-#: actions/editgroup.php:301
 msgid "Options saved."
 msgstr "Elektoj konserviĝis."
 
 #. TRANS: Title for e-mail settings.
-#: actions/emailsettings.php:60
 msgid "Email settings"
 msgstr "Retpoŝta agordo"
 
 #. TRANS: E-mail settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/emailsettings.php:74
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 msgstr "Administri kiel ricevi mesaĝon de  %%site.name%%."
 
 #. TRANS: Form legend for e-mail settings form.
 #. TRANS: Field label for e-mail address input in e-mail settings form.
-#: actions/emailsettings.php:104 actions/emailsettings.php:130
 msgid "Email address"
 msgstr "Retpoŝtadreso"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:110
 msgid "Current confirmed email address."
 msgstr "Nuna konfirmita retpoŝtadreso."
 
@@ -2508,15 +2000,11 @@ msgstr "Nuna konfirmita retpoŝtadreso."
 #. TRANS: Button label to remove a confirmed IM address.
 #. TRANS: Button label to remove a confirmed SMS address.
 #. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
-#: actions/emailsettings.php:113 actions/emailsettings.php:180
-#: actions/imsettings.php:119 actions/smssettings.php:119
-#: actions/smssettings.php:175
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Forigi"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:120
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -2529,44 +2017,36 @@ msgstr ""
 #. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
 #. TRANS: Any other domain may be owned by a legitimate person or
 #. TRANS: organization.
-#: actions/emailsettings.php:137
 msgid "Email address, like \"UserName@example.org\""
 msgstr "Retpoŝtadreso, ekzemple \"ViaNomo@example.org\""
 
 #. TRANS: Button label for adding an e-mail address in e-mail settings form.
 #. TRANS: Button label for adding an IM address in IM settings form.
 #. TRANS: Button label for adding a SMS phone number in SMS settings form.
-#: actions/emailsettings.php:141 actions/imsettings.php:147
-#: actions/smssettings.php:157
 msgctxt "BUTTON"
 msgid "Add"
 msgstr "Aldoni"
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:149 actions/smssettings.php:166
 msgid "Incoming email"
 msgstr "Alveninta poŝto"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:155
 msgid "I want to post notices by email."
 msgstr "Mi volas afiŝi avizon per retpoŝto."
 
 #. TRANS: Form instructions for incoming e-mail form in e-mail settings.
 #. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
-#: actions/emailsettings.php:177 actions/smssettings.php:173
 msgid "Send email to this address to post new notices."
 msgstr "Sendu mesaĝon al la adreso por afiŝi novan avizon."
 
 #. TRANS: Instructions for incoming e-mail address input form, when an address has already been assigned.
 #. TRANS: Instructions for incoming SMS e-mail address input form.
-#: actions/emailsettings.php:186 actions/smssettings.php:181
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr "Krei novan retpoŝtadreson por afiŝado kaj nuligi la antaŭan."
 
 #. TRANS: Instructions for incoming e-mail address input form.
-#: actions/emailsettings.php:190
 msgid ""
 "To send notices via email, we need to create a unique email address for you "
 "on this server:"
@@ -2574,89 +2054,71 @@ msgstr ""
 
 #. TRANS: Button label for adding an e-mail address to send notices from.
 #. TRANS: Button label for adding an SMS e-mail address to send notices from.
-#: actions/emailsettings.php:196 actions/smssettings.php:184
 msgctxt "BUTTON"
 msgid "New"
 msgstr "Nova"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:205
 msgid "Email preferences"
 msgstr "Retpoŝta agordo."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:213
 msgid "Send me notices of new subscriptions through email."
 msgstr "Sendu al mi avizon pri nova abonado per retpoŝto."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:219
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr "Sendu al mi mesaĝon tiam, kiam iu ŝatas mian avizon ."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:226
 msgid "Send me email when someone sends me a private message."
 msgstr "Sendu al mi mesaĝon tiam, kiam iu sendas al mi privatan mesaĝon."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:232
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr "Sendu al mi mesaĝon tiam, kiam iu sendas al mi \"@-respondon\"."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:238
 msgid "Allow friends to nudge me and send me an email."
 msgstr "Permesi al amikoj puŝeti min kaj sendi al mi retpoŝtan mesaĝon."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:244
 msgid "Publish a MicroID for my email address."
 msgstr "Publikigi MikroID por mia retpoŝtadreso."
 
 #. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:362
 msgid "Email preferences saved."
 msgstr "Retpoŝta prefero konserviĝis."
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:381
 msgid "No email address."
 msgstr "Neniu retpoŝta adreso."
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:389
 #, fuzzy
 msgid "Cannot normalize that email address."
 msgstr "Malsukcesis normigi tiun retpoŝtadreson"
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:394 actions/register.php:197
-#: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "Retpoŝta adreso ne valida"
 
 #. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:398
 msgid "That is already your email address."
 msgstr "Tiu jam estas via retpoŝtadreso."
 
 #. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:402
 msgid "That email address already belongs to another user."
 msgstr "Tiu retpoŝtadreso jam apartenas al alia uzanto."
 
 #. TRANS: Server error thrown on database error adding e-mail confirmation code.
 #. TRANS: Server error thrown on database error adding Instant Messaging confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:419 actions/imsettings.php:362
-#: actions/smssettings.php:364
 #, fuzzy
 msgid "Could not insert confirmation code."
 msgstr "Malsukcesis enmeti konfirmkodon."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:426
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
@@ -2667,102 +2129,82 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling Instant Messaging address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:446 actions/imsettings.php:391
-#: actions/smssettings.php:398
 msgid "No pending confirmation to cancel."
 msgstr "Ne estas peto-konfirmo por nuligi."
 
 #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:451
 msgid "That is the wrong email address."
 msgstr "Tiu retpoŝtadreso estas malĝusta."
 
 #. TRANS: Server error thrown on database error canceling e-mail address confirmation.
 #. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
-#: actions/emailsettings.php:460 actions/smssettings.php:412
 #, fuzzy
 msgid "Could not delete email confirmation."
 msgstr "Ne povas forigi retpoŝtan konfirmon."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:465
 msgid "Email confirmation cancelled."
 msgstr "Retpoŝta konfirmo nuligita."
 
 #. TRANS: Message given trying to remove an e-mail address that is not
 #. TRANS: registered for the active user.
-#: actions/emailsettings.php:484
 msgid "That is not your email address."
 msgstr "Tiu ne estas via retpoŝtadreso."
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:505
 msgid "The email address was removed."
 msgstr "La retpoŝtadreso estas forigita."
 
 #. TRANS: Form validation error displayed when trying to remove an incoming e-mail address while no address has been set.
-#: actions/emailsettings.php:519 actions/smssettings.php:554
 msgid "No incoming email address."
 msgstr "Ne estas alvena retpoŝtadreso"
 
 #. 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.
-#: actions/emailsettings.php:531 actions/emailsettings.php:555
-#: actions/smssettings.php:565 actions/smssettings.php:590
 #, fuzzy
 msgid "Could not update user record."
 msgstr "Malsukcesis ĝisdatigi uzantan informon."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
 #. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:535 actions/smssettings.php:569
 msgid "Incoming email address removed."
 msgstr "Alvena retpoŝtadreso forigita."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
 #. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:559 actions/smssettings.php:594
 msgid "New incoming email address added."
 msgstr "Nova alvena retpoŝtadreso aldonita."
 
 #. TRANS: Client error displayed when trying to mark a notice as favorite that already is a favorite.
-#: actions/favor.php:80
 msgid "This notice is already a favorite!"
 msgstr "Ĉi tiu avizo jam estas ŝatata."
 
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
-#: actions/favor.php:95
 #, fuzzy
 msgid "Disfavor favorite."
 msgstr "Malŝati ŝataton."
 
 #. TRANS: Page title for first page of favorited notices.
 #. TRANS: Title for favourited notices section.
-#: actions/favorited.php:65 lib/popularnoticesection.php:62
-#: lib/publicgroupnav.php:93
 msgid "Popular notices"
 msgstr "Popularaj avizoj"
 
 #. TRANS: Page title for all but first page of favorited notices.
 #. TRANS: %d is the page number being displayed.
-#: actions/favorited.php:69
 #, php-format
 msgid "Popular notices, page %d"
 msgstr "Popularaj avizoj, paĝo %d"
 
 #. TRANS: Description on page displaying favorited notices.
-#: actions/favorited.php:81
 msgid "The most popular notices on the site right now."
 msgstr "Nunaj plej popularaj avizoj ĉe ĉi tiu retejo."
 
 #. TRANS: Text displayed instead of a list when a site does not yet have any favourited notices.
-#: actions/favorited.php:149
 msgid "Favorite notices appear on this page but no one has favorited one yet."
 msgstr "Ŝatataj avizoj aperos ĉi-paĝe sed ankoraŭ nenio ŝatiĝas."
 
 #. TRANS: Additional text displayed instead of a list when a site does not yet have any favourited notices for logged in users.
-#: actions/favorited.php:153
 msgid ""
 "Be the first to add a notice to your favorites by clicking the fave button "
 "next to any notice you like."
@@ -2772,7 +2214,6 @@ msgstr ""
 
 #. TRANS: Additional text displayed instead of a list when a site does not yet have any favourited notices for not logged in users.
 #. TRANS: %%action.register%% is a registration link. "[link text](link)" is Mark Down. Do not change the formatting.
-#: actions/favorited.php:158
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to add a "
@@ -2785,181 +2226,146 @@ msgstr ""
 #. TRANS: %s is a user's nickname.
 #. TRANS: Title for first page of favourite notices of a user.
 #. TRANS: %s is the user for whom the favourite notices are displayed.
-#: actions/favoritesrss.php:111 actions/showfavorites.php:76
-#: lib/personalgroupnav.php:110
 #, php-format
 msgid "%s's favorite notices"
 msgstr "Ŝatataj avizoj de %s"
 
 #. TRANS: Desciption of RSS feed with favourite notices of a user.
 #. TRANS: %1$s is a user's nickname, %2$s is the name of the StatusNet site.
-#: actions/favoritesrss.php:117
 #, php-format
 msgid "Updates favored by %1$s on %2$s!"
 msgstr "Ŝatataj ĝisdatiĝoj de %1$s ĉe %2$s!"
 
 #. TRANS: Page title for first page of featured users.
 #. TRANS: Title for featured users section.
-#: actions/featured.php:69 lib/featureduserssection.php:87
-#: lib/publicgroupnav.php:89
 msgid "Featured users"
 msgstr "Elstaraj uzantoj"
 
 #. TRANS: Page title for all but first page of featured users.
 #. TRANS: %d is the page number being displayed.
-#: actions/featured.php:73
 #, php-format
 msgid "Featured users, page %d"
 msgstr "Elstaraj uzantoj, paĝo %d"
 
 #. TRANS: Description on page displaying featured users.
-#: actions/featured.php:102
 #, fuzzy, php-format
 msgid "A selection of some great users on %s."
 msgstr "Elekto de kelke da elstaraj uzantoj ĉe %s"
 
 #. TRANS: Client error displayed when no notice ID was given trying do display a file.
-#: actions/file.php:36
 msgid "No notice ID."
 msgstr "Ne estas avizo-ID"
 
 #. TRANS: Client error displayed when an invalid notice ID was given trying do display a file.
-#: actions/file.php:41
 msgid "No notice."
 msgstr "Ne estas avizo."
 
 #. TRANS: Client error displayed when trying do display a file for a notice without a file attachement.
-#: actions/file.php:46
 msgid "No attachments."
 msgstr "Ne estas aldonaĵo."
 
 #. TRANS: Client error displayed when trying do display a file for a notice with file attachements
 #. TRANS: that could not be found.
-#: actions/file.php:58
 msgid "No uploaded attachments."
 msgstr "Ne estas alŝutita aldonaĵo."
 
 #. TRANS: Client error displayed when subscribing to a remote profile and an unexpected response is received.
-#: actions/finishremotesubscribe.php:69
 msgid "Not expecting this response!"
 msgstr "Neatendita respondo!"
 
 #. TRANS: Client error displayed when subscribing to a remote profile that does not exist.
-#: actions/finishremotesubscribe.php:81
 msgid "User being listened to does not exist."
 msgstr "Vizitata uzanto ne ekzistas."
 
 #. TRANS: Client error displayed when subscribing to a remote profile that is a local profile.
-#: actions/finishremotesubscribe.php:89 actions/remotesubscribe.php:58
 msgid "You can use the local subscription!"
 msgstr "Vi povas aboni loke!"
 
 #. TRANS: Client error displayed when subscribing to a remote profile that is blocked form subscribing to.
-#: actions/finishremotesubscribe.php:102
 msgid "That user has blocked you from subscribing."
 msgstr "Tiu uzanto abonblokis vin."
 
 #. TRANS: Client error displayed when subscribing to a remote profile without providing an authorised token.
-#: actions/finishremotesubscribe.php:114
 msgid "You are not authorized."
 msgstr "Vi ne estas rajtigita."
 
 #. TRANS: Client error displayed when subscribing to a remote profile and conversion of the request token to access token fails.
-#: actions/finishremotesubscribe.php:118
 msgid "Could not convert request token to access token."
 msgstr "Malsukcesis interŝanĝi petĵetonon al atingoĵetono."
 
 #. TRANS: Client error displayed when subscribing to a remote profile fails because of an unsupported version of the OMB protocol.
-#: actions/finishremotesubscribe.php:124
 msgid "Remote service uses unknown version of OMB protocol."
 msgstr "Fora servo uzas nekonatan version de OMB-protokolo."
 
 #. TRANS: Server error displayed when subscribing to a remote profile fails because the remote profile could not be updated.
-#: actions/finishremotesubscribe.php:145 lib/oauthstore.php:317
 msgid "Error updating remote profile."
 msgstr "Eraro je ĝisdatigo de fora profilo."
 
 #. TRANS: Client error displayed when requesting a non-existent file.
-#: actions/getfile.php:77
 msgid "No such file."
 msgstr "Ne ekzistas tia dosiero."
 
 #. TRANS: Client error displayed when requesting a file without having read access to it.
-#: actions/getfile.php:82
 msgid "Cannot read file."
 msgstr "Malsukcesis legi dosieron."
 
 #. TRANS: Client error displayed when trying to assign an invalid role to a user.
-#: actions/grantrole.php:61 actions/revokerole.php:62
 msgid "Invalid role."
 msgstr "Rolo nevalida."
 
 #. TRANS: Client error displayed when trying to assign an reserved role to a user.
-#: actions/grantrole.php:66 actions/revokerole.php:66
 msgid "This role is reserved and cannot be set."
 msgstr "Tiu ĉi rolo estas rezervita, do ne povas esti asignita."
 
 #. TRANS: Client error displayed when trying to assign a role to a user while not being allowed to set roles.
-#: actions/grantrole.php:76
 msgid "You cannot grant user roles on this site."
 msgstr "Vi ne rajtas doni al uzanto rolon ĉe ĉi tiu retejo."
 
 #. TRANS: Client error displayed when trying to assign a role to a user that already has that role.
-#: actions/grantrole.php:84
 msgid "User already has this role."
 msgstr "Uzanto jam havas la rolon."
 
 #. TRANS: Client error displayed trying to block a user from a group while not specifying a to be blocked user profile.
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing a profile.
+#. TRANS: Client error displayed when not providing a profile ID on the Make Admin page.
 #. TRANS: Client error displayed trying a change a subscription without providing a profile.
 #. TRANS: Client error displayed when trying to change user options without specifying a user to work on.
-#: actions/groupblock.php:71 actions/groupunblock.php:71
-#: actions/makeadmin.php:71 actions/subedit.php:49
-#: lib/profileformaction.php:79
 msgid "No profile specified."
 msgstr "Neniu profilo elektita."
 
 #. TRANS: Client error displayed trying to block a user from a group while specifying a non-existing profile.
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing an existing profile.
+#. TRANS: Client error displayed when specifying an invalid profile ID on the Make Admin page.
 #. TRANS: Client error displayed trying a change a subscription for a non-existant profile ID.
 #. TRANS: Client error displayed when trying to change user options without specifying an existing user to work on.
-#: actions/groupblock.php:77 actions/groupunblock.php:77
-#: actions/makeadmin.php:76 actions/subedit.php:57 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:87
 msgid "No profile with that ID."
 msgstr "Ne estas profilo kun tiu ID."
 
 #. TRANS: Client error displayed trying to block a user from a group while not specifying a group to block a profile from.
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing a group.
-#: actions/groupblock.php:83 actions/groupunblock.php:83
-#: actions/makeadmin.php:81
+#. TRANS: Client error displayed when not providing a group ID on the Make Admin page.
 msgid "No group specified."
 msgstr "Neniu grupo elektita."
 
 #. TRANS: Client error displayed trying to block a user from a group while not being an admin user.
-#: actions/groupblock.php:95
 msgid "Only an admin can block group members."
 msgstr "Nur administranto rajtas bloki grupanon."
 
 #. TRANS: Client error displayed trying to block a user from a group while user is already blocked from the given group.
-#: actions/groupblock.php:100
 msgid "User is already blocked from group."
 msgstr "La uzanto jam de grupo blokiĝas."
 
 #. TRANS: Client error displayed trying to block a user from a group while user is not a member of given group.
-#: actions/groupblock.php:106
 msgid "User is not a member of group."
 msgstr "La uzanto ne estas grupano."
 
 #. TRANS: Title for block user from group page.
 #. TRANS: Form legend for form to block user from a group.
-#: actions/groupblock.php:141 actions/groupmembers.php:364
 msgid "Block user from group"
 msgstr "Bloki uzanton de grupo"
 
 #. TRANS: Explanatory text for block user from group form before setting the block.
 #. TRANS: %1$s is that to be blocked user, %2$s is the group the user will be blocked from.
-#: actions/groupblock.php:169
 #, php-format
 msgid ""
 "Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They "
@@ -2970,65 +2376,54 @@ msgstr ""
 "forigita de la grupo, ne povos afiŝi, kaj ne povos aboni la grupon."
 
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
-#: actions/groupblock.php:191
 #, fuzzy
 msgid "Do not block this user from this group."
 msgstr "Ne bloki la uzanton de la grupo"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
-#: actions/groupblock.php:198
 #, fuzzy
 msgid "Block this user from this group."
 msgstr "Bloki la uzanton de la grupo"
 
 #. TRANS: Server error displayed when trying to block a user from a group fails because of an application error.
-#: actions/groupblock.php:215
 msgid "Database error blocking user from group."
 msgstr "Malsukcesis forbari uzanton de la grupo pro datumbaza eraro."
 
 #. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
 #. TRANS: Client error displayed trying to find a user by ID without providing an ID.
-#: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr "Neniu ID."
 
 #. TRANS: Client error displayed trying to change group design settings while not logged in.
-#: actions/groupdesignsettings.php:67
 msgid "You must be logged in to edit a group."
 msgstr "Ensalutu por redakti grupon."
 
 #. TRANS: Title group design settings page.
-#: actions/groupdesignsettings.php:146
 msgid "Group design"
 msgstr "Grupa desegno"
 
 #. TRANS: Instructions for group design settings page.
-#: actions/groupdesignsettings.php:157
 msgid ""
 "Customize the way your group looks with a background image and a colour "
 "palette of your choice."
 msgstr "Agordi kiel aspektu via grupo, per elekto de fonbildo kaj koloraro."
 
 #. TRANS: Form validation error displayed when group design settings could not be updated because of an application issue.
-#: actions/groupdesignsettings.php:262
 #, fuzzy
 msgid "Unable to update your design settings."
 msgstr "Malsukcesis konservi vian desegnan agordon"
 
 #. TRANS: Form text to confirm saved group design settings.
-#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:239
 msgid "Design preferences saved."
 msgstr "Desegna agordo konservita."
 
 #. TRANS: Title for group logo settings page.
 #. TRANS: Group logo form legend.
-#: actions/grouplogo.php:144 actions/grouplogo.php:199
 msgid "Group logo"
 msgstr "Grupa emblemo"
 
 #. TRANS: Instructions for group logo page.
 #. TRANS: %s is the maximum file size for that site.
-#: actions/grouplogo.php:156
 #, php-format
 msgid ""
 "You can upload a logo image for your group. The maximum file size is %s."
@@ -3036,91 +2431,75 @@ msgstr ""
 "Vi povas alŝuti emblemo-bildon por via grupo. Dosiero-grandlimo estas $s."
 
 #. TRANS: Submit button for uploading a group logo.
-#: actions/grouplogo.php:243
 msgid "Upload"
 msgstr "Alŝuti"
 
 #. TRANS: Button text for cropping an uploaded group logo.
-#: actions/grouplogo.php:299
 msgid "Crop"
 msgstr "Tranĉi"
 
 #. TRANS: Form instructions on the group logo page.
-#: actions/grouplogo.php:376
 msgid "Pick a square area of the image to be the logo."
 msgstr "Elektu kvadratan parton de la bildo kiel la emblemo."
 
 #. TRANS: Form success message after updating a group logo.
-#: actions/grouplogo.php:411
 msgid "Logo updated."
 msgstr "Emblemo ĝisdatigita."
 
 #. TRANS: Form failure message after failing to update a group logo.
-#: actions/grouplogo.php:414
 msgid "Failed updating logo."
 msgstr "Malsukcesis ĝisdatigi emblemon."
 
 #. TRANS: Title of the page showing group members.
 #. TRANS: %s is the name of the group.
-#: actions/groupmembers.php:104
 #, php-format
 msgid "%s group members"
 msgstr "%s grupanoj"
 
 #. TRANS: Title of the page showing group members.
 #. TRANS: %1$s is the name of the group, %2$d is the page number of the members list.
-#: actions/groupmembers.php:109
 #, php-format
 msgid "%1$s group members, page %2$d"
 msgstr "Grupanoj de %1$s, paĝo %2$d"
 
 #. TRANS: Page notice for group members page.
-#: actions/groupmembers.php:125
 msgid "A list of the users in this group."
 msgstr "Listo de uzantoj en tiu ĉi grupo"
 
 #. TRANS: Indicator in group members list that this user is a group administrator.
-#: actions/groupmembers.php:190 lib/action.php:581
 msgid "Admin"
 msgstr "Administranto"
 
 #. TRANS: Button text for the form that will block a user from a group.
-#: actions/groupmembers.php:397
 msgctxt "BUTTON"
 msgid "Block"
 msgstr "Bloki"
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:401
 msgctxt "TOOLTIP"
 msgid "Block this user"
 msgstr "Bloki ĉi tiun uzanton"
 
 #. TRANS: Form legend for form to make a user a group admin.
-#: actions/groupmembers.php:488
 msgid "Make user an admin of the group"
 msgstr "Elekti uzanton grupestro."
 
 #. TRANS: Button text for the form that will make a user administrator.
-#: actions/groupmembers.php:521
 msgctxt "BUTTON"
 msgid "Make Admin"
 msgstr "Estrigi"
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:525
 msgctxt "TOOLTIP"
 msgid "Make this user an admin"
 msgstr "Estrigi la uzanton"
 
 #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
-#: actions/grouprss.php:141
 #, php-format
 msgid "Updates from members of %1$s on %2$s!"
 msgstr "Ĝisdatigoj de grupano de %1$s ĉe %2$s!"
 
 #. TRANS: Title for first page of the groups list.
-#: actions/groups.php:62
 #, fuzzy
 msgctxt "TITLE"
 msgid "Groups"
@@ -3128,7 +2507,6 @@ msgstr "Grupoj"
 
 #. TRANS: Title for all but the first page of the groups list.
 #. TRANS: %d is the page number.
-#: actions/groups.php:66
 #, fuzzy, php-format
 msgctxt "TITLE"
 msgid "Groups, page %d"
@@ -3137,7 +2515,6 @@ msgstr "Grupoj, paĝo %d"
 #. TRANS: Page notice of group list. %%%%site.name%%%% is the StatusNet site name,
 #. TRANS: %%%%action.groupsearch%%%% and %%%%action.newgroup%%%% are URLs. Do not change them.
 #. TRANS: This message contains Markdown links in the form [link text](link).
-#: actions/groups.php:95
 #, fuzzy, php-format
 msgid ""
 "%%%%site.name%%%% groups let you find and talk with people of similar "
@@ -3153,12 +2530,10 @@ msgstr ""
 "newgroup%%%%)"
 
 #. TRANS: Link to create a new group on the group list page.
-#: actions/groups.php:113 actions/usergroups.php:126 lib/groupeditform.php:115
 msgid "Create a new group"
 msgstr "Krei novan grupon"
 
 #. TRANS: Instructions for page where groups can be searched. %%site.name%% is the name of the StatusNet site.
-#: actions/groupsearch.php:53
 #, php-format
 msgid ""
 "Search for groups on %%site.name%% by their name, location, or description. "
@@ -3168,21 +2543,17 @@ msgstr ""
 "serĉvortojn per spaco; ili estu almenaŭ 3 literojn longaj."
 
 #. TRANS: Title for page where groups can be searched.
-#: actions/groupsearch.php:60
 msgid "Group search"
 msgstr "Grup-serĉo"
 
 #. TRANS: Text on page where groups can be searched if no results were found for a query.
 #. TRANS: Text for notice search results is the query had no results.
 #. TRANS: Message on the "People search" page where a query has no results.
-#: actions/groupsearch.php:82 actions/noticesearch.php:122
-#: actions/peoplesearch.php:87
 msgid "No results."
 msgstr "Neniu rezulto."
 
 #. TRANS: Additional text on page where groups can be searched if no results were found for a query for a logged in user.
 #. TRANS: This message contains Markdown links in the form [link text](link).
-#: actions/groupsearch.php:87
 #, fuzzy, php-format
 msgid ""
 "If you cannot find the group you're looking for, you can [create it](%%"
@@ -3193,7 +2564,6 @@ msgstr ""
 
 #. TRANS: Additional text on page where groups can be searched if no results were found for a query for a not logged in user.
 #. TRANS: This message contains Markdown links in the form [link text](link).
-#: actions/groupsearch.php:92
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and [create the group](%%"
@@ -3203,30 +2573,25 @@ msgstr ""
 "newgroup%%)!"
 
 #. TRANS: Client error displayed when trying to unblock a user from a group without being an administrator for the group.
-#: actions/groupunblock.php:95
 msgid "Only an admin can unblock group members."
 msgstr "Nur grupestro rajtas malbloki grupanon."
 
 #. TRANS: Client error displayed when trying to unblock a non-blocked user from a group.
-#: actions/groupunblock.php:100
 msgid "User is not blocked from group."
 msgstr "La uzanto ne estas blokita de grupo."
 
 #. TRANS: Server error displayed when unblocking a user from a group fails because of an unknown error.
 #. TRANS: Server error displayed when removing a user block.
-#: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "Eraro ĉe provo malbloki."
 
 #. TRANS: Title for Instant Messaging settings.
-#: actions/imsettings.php:56
 msgid "IM settings"
 msgstr "Tujmesaĝila agordo."
 
 #. 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.
-#: actions/imsettings.php:69
 #, fuzzy, php-format
 msgid ""
 "You can send and receive notices through instant messaging [instant messages]"
@@ -3236,18 +2601,15 @@ msgstr ""
 "%). Jen agordu vian adreson kaj ceteron."
 
 #. TRANS: Message given in the IM settings if IM is not enabled on the site.
-#: actions/imsettings.php:90
 msgid "IM is not available."
 msgstr "Tujmesaĝilo ne estas disponebla."
 
-#: actions/imsettings.php:116
 #, fuzzy, php-format
 msgid "Current confirmed %s address."
 msgstr "Nuna konfirmita retpoŝtadreso."
 
 #. TRANS: Form note in IM settings form.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:128
 #, fuzzy, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your %s account for a message "
@@ -3256,89 +2618,74 @@ msgstr ""
 "Atendante konfirmon por la adreso. Kontrolu vian Jabber/GTalk-konton por "
 "mesaĝo kun pli da gvido. (Ĉu vi aldonis %s al via amikolisto?)"
 
-#: actions/imsettings.php:140
 msgid "IM address"
 msgstr "Tujmesaĝila adreso"
 
-#: actions/imsettings.php:142
 #, php-format
 msgid "%s screenname."
 msgstr ""
 
 #. TRANS: Header for IM preferences form.
-#: actions/imsettings.php:163
 #, fuzzy
 msgid "IM Preferences"
 msgstr "Tujmesaĝilaj preferoj"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:174
 #, fuzzy
 msgid "Send me notices"
 msgstr "Sendi avizon"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:176
 #, fuzzy
 msgid "Post a notice when my status changes."
 msgstr "Afiŝu avizon tiam, kiam mia Jabber/GTalk-stato ŝanĝiĝas."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:178
 #, fuzzy
 msgid "Send me replies from people I'm not subscribed to."
 msgstr ""
 "Sendu al mi per Jabber/GTalk respondojn de personoj, kiujn mi ne abonas."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:181
 #, fuzzy
 msgid "Publish a MicroID"
 msgstr "Publikigi MikroID por mia retpoŝtadreso."
 
 #. TRANS: Server error thrown on database error updating IM preferences.
-#: actions/imsettings.php:291
 #, fuzzy
 msgid "Couldn't update IM preferences."
 msgstr "Malsukcesis ĝisdatigi uzanton"
 
 #. TRANS: Confirmation message for successful IM preferences save.
 #. TRANS: Confirmation message after saving preferences.
-#: actions/imsettings.php:298 actions/urlsettings.php:244
 msgid "Preferences saved."
 msgstr "Prefero konservita."
 
 #. TRANS: Message given saving IM address without having provided one.
-#: actions/imsettings.php:320
 #, fuzzy
 msgid "No screenname."
 msgstr "Neniu kromnomo."
 
-#: actions/imsettings.php:325
 #, fuzzy
 msgid "No transport."
 msgstr "Ne estas avizo."
 
 #. TRANS: Message given saving IM address that cannot be normalised.
-#: actions/imsettings.php:333
 #, fuzzy
 msgid "Cannot normalize that screenname"
 msgstr "Malsukcesis normigi la Jabber-ID"
 
 #. TRANS: Message given saving IM address that not valid.
-#: actions/imsettings.php:340
 #, fuzzy
 msgid "Not a valid screenname"
 msgstr "Ne valida kromnomo."
 
 #. TRANS: Message given saving IM address that is already set for another user.
-#: actions/imsettings.php:344
 #, fuzzy
 msgid "Screenname already belongs to another user."
 msgstr "Jabber-ID jam apartenas al alia uzanto."
 
 #. TRANS: Message given saving valid IM address that is to be confirmed.
-#: actions/imsettings.php:369
 #, fuzzy
 msgid "A confirmation code was sent to the IM address you added."
 msgstr ""
@@ -3346,86 +2693,72 @@ msgstr ""
 "al %s sendi mesaĝojn al vi."
 
 #. TRANS: Message given canceling IM address confirmation for the wrong IM address.
-#: actions/imsettings.php:396
 msgid "That is the wrong IM address."
 msgstr "Tiu tujmesaĝila adreso estas malĝusta."
 
 #. TRANS: Server error thrown on database error canceling IM address confirmation.
-#: actions/imsettings.php:405
 #, fuzzy
 msgid "Couldn't delete confirmation."
 msgstr "Malsukcesis forigi tujmesaĝila agordo."
 
 #. TRANS: Message given after successfully canceling IM address confirmation.
-#: actions/imsettings.php:410
 msgid "IM confirmation cancelled."
 msgstr "Tujmesaĝila konfirmo nuligita."
 
 #. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.
-#: actions/imsettings.php:434
 #, fuzzy
 msgid "That is not your screenname."
 msgstr "Tio ne estas via telefonnumero."
 
 #. TRANS: Server error thrown on database error removing a registered IM address.
-#: actions/imsettings.php:443
 #, fuzzy
 msgid "Couldn't update user im prefs."
 msgstr "Malsukcesis ĝisdatigi uzantan informon."
 
 #. TRANS: Message given after successfully removing a registered Instant Messaging address.
-#: actions/imsettings.php:451
 msgid "The IM address was removed."
 msgstr "La tujmesaĝila adreso estas forigita."
 
 #. TRANS: Title for all but the first page of the inbox page.
 #. TRANS: %1$s is the user's nickname, %2$s is the page number.
-#: actions/inbox.php:59
 #, php-format
 msgid "Inbox for %1$s - page %2$d"
 msgstr "Alvenkesto de %1$s - paĝo %2$d"
 
 #. TRANS: Title for the first page of the inbox page.
 #. TRANS: %s is the user's nickname.
-#: actions/inbox.php:64
 #, php-format
 msgid "Inbox for %s"
 msgstr "Alvenkesto de %s"
 
 #. TRANS: Instructions for user inbox page.
-#: actions/inbox.php:106
 msgid "This is your inbox, which lists your incoming private messages."
 msgstr ""
 "Tio ĉi estas via alvenkesto, kie listiĝas viaj alvenaj privataj mesaĝoj."
 
 #. TRANS: Client error displayed when trying to sent invites while they have been disabled.
-#: actions/invite.php:41
 msgid "Invites have been disabled."
 msgstr "Invito estas malebligita."
 
 #. TRANS: Client error displayed when trying to sent invites while not logged in.
 #. TRANS: %s is the StatusNet site name.
-#: actions/invite.php:45
 #, php-format
 msgid "You must be logged in to invite other users to use %s."
 msgstr "Ensalutu por inviti aliajn uzantojn al %s."
 
 #. TRANS: Form validation message when providing an e-mail address that does not validate.
 #. TRANS: %s is an invalid e-mail address.
-#: actions/invite.php:78
 #, fuzzy, php-format
 msgid "Invalid email address: %s."
 msgstr "Nevalida retpoŝtadreso:  %s"
 
 #. TRANS: Page title when invitations have been sent.
-#: actions/invite.php:117
 #, fuzzy
 msgid "Invitations sent"
 msgstr "Invito(j) senditas"
 
 #. TRANS: Page title when inviting potential users.
-#: actions/invite.php:120
 msgid "Invite new users"
 msgstr "Inviti novajn uzantojn"
 
@@ -3433,7 +2766,6 @@ msgstr "Inviti novajn uzantojn"
 #. TRANS: is already subscribed to one or more users with the given e-mail address(es).
 #. TRANS: Plural form is based on the number of reported already subscribed e-mail addresses.
 #. TRANS: Followed by a bullet list.
-#: actions/invite.php:140
 #, fuzzy
 msgid "You are already subscribed to this user:"
 msgid_plural "You are already subscribed to these users:"
@@ -3442,7 +2774,6 @@ msgstr[1] "Vi jam abonas jenajn uzantojn:"
 
 #. TRANS: Used as list item for already subscribed users (%1$s is nickname, %2$s is e-mail address).
 #. TRANS: Used as list item for already registered people (%1$s is nickname, %2$s is e-mail address).
-#: actions/invite.php:146 actions/invite.php:160
 #, fuzzy, php-format
 msgctxt "INVITE"
 msgid "%1$s (%2$s)"
@@ -3451,7 +2782,6 @@ msgstr "%1$s (%2$s)"
 #. TRANS: Message displayed inviting users to use a StatusNet site while the invited user
 #. TRANS: already uses a this StatusNet site. Plural form is based on the number of
 #. TRANS: reported already present people. Followed by a bullet list.
-#: actions/invite.php:154
 #, fuzzy
 msgid "This person is already a user and you were automatically subscribed:"
 msgid_plural ""
@@ -3462,7 +2792,6 @@ msgstr[1] "Jenaj personoj estas jam uzantoj kaj vin aŭtomate abonigis al ili."
 #. TRANS: Message displayed inviting users to use a StatusNet site. Plural form is
 #. TRANS: based on the number of invitations sent. Followed by a bullet list of
 #. TRANS: e-mail addresses to which invitations were sent.
-#: actions/invite.php:168
 #, fuzzy
 msgid "Invitation sent to the following person:"
 msgid_plural "Invitations sent to the following people:"
@@ -3471,7 +2800,6 @@ msgstr[1] "Invito(j) sendiĝis al jenaj personoj:"
 
 #. TRANS: Generic message displayed after sending out one or more invitations to
 #. TRANS: people to join a StatusNet site.
-#: actions/invite.php:178
 msgid ""
 "You will be notified when your invitees accept the invitation and register "
 "on the site. Thanks for growing the community!"
@@ -3480,35 +2808,30 @@ msgstr ""
 "retejo. Dankon por kreskigi la komunumon!"
 
 #. TRANS: Form instructions.
-#: actions/invite.php:191
 msgid ""
 "Use this form to invite your friends and colleagues to use this service."
 msgstr ""
 "Uzu la formularon por inviti viajn amikojn kaj kolegojn al ĉi tiu servo."
 
 #. TRANS: Field label for a list of e-mail addresses.
-#: actions/invite.php:218
 msgid "Email addresses"
 msgstr "Retpoŝtadresoj"
 
 #. TRANS: Tooltip for field label for a list of e-mail addresses.
-#: actions/invite.php:221
 #, fuzzy
 msgid "Addresses of friends to invite (one per line)."
 msgstr "Adresoj de invitataj amikoj (unu por linio)"
 
 #. TRANS: Field label for a personal message to send to invitees.
-#: actions/invite.php:225
 msgid "Personal message"
 msgstr "Persona mesaĝo"
 
 #. TRANS: Tooltip for field label for a personal message to send to invitees.
-#: actions/invite.php:228
 msgid "Optionally add a personal message to the invitation."
 msgstr "Vi povas aldoni personan mesaĝon al la invito."
 
 #. TRANS: Send button for inviting friends
-#: actions/invite.php:232
+#. TRANS: Button text for sending notice.
 msgctxt "BUTTON"
 msgid "Send"
 msgstr "Sendi"
@@ -3516,7 +2839,6 @@ msgstr "Sendi"
 #. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral
 #. TRANS: singular 3rd-person pronoun in English. %1$s is the inviting user, $2$s is
 #. TRANS: the StatusNet sitename.
-#: actions/invite.php:264
 #, php-format
 msgid "%1$s has invited you to join them on %2$s"
 msgstr "%1$s invitis vin kunaliĝi ĉe %2$s"
@@ -3526,7 +2848,6 @@ msgstr "%1$s invitis vin kunaliĝi ĉe %2$s"
 #. TRANS: StatusNet sitename, %3$s is the site URL, %4$s is the personal message from the
 #. TRANS: inviting user, %s%5 a link to the timeline for the inviting user, %s$6 is a link
 #. TRANS: to register with the StatusNet site.
-#: actions/invite.php:271
 #, php-format
 msgid ""
 "%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -3582,182 +2903,177 @@ msgstr ""
 "via sincere, %2$s\n"
 
 #. TRANS: Client error displayed when trying to join a group while not logged in.
-#: actions/joingroup.php:59
 msgid "You must be logged in to join a group."
 msgstr "Ensalutu por aniĝi al grupo."
 
 #. TRANS: Title for join group page after joining.
-#: actions/joingroup.php:148
 #, fuzzy, php-format
 msgctxt "TITLE"
 msgid "%1$s joined group %2$s"
 msgstr "%1$s aniĝis al grupo %2$s"
 
 #. TRANS: Client error displayed when trying to leave a group while not logged in.
-#: actions/leavegroup.php:59
 msgid "You must be logged in to leave a group."
 msgstr "Ensalutu por eksaniĝi."
 
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
-#: actions/leavegroup.php:103 lib/command.php:398
 msgid "You are not a member of that group."
 msgstr "Vi ne estas grupano."
 
 #. TRANS: Title for leave group page after leaving.
-#: actions/leavegroup.php:142
 #, fuzzy, php-format
 msgctxt "TITLE"
 msgid "%1$s left group %2$s"
 msgstr "%1$s eksaniĝis de grupo %2$s"
 
 #. TRANS: User admin panel title
-#: actions/licenseadminpanel.php:55
 msgctxt "TITLE"
 msgid "License"
 msgstr "Permesilo"
 
-#: actions/licenseadminpanel.php:65
+#. TRANS: Form instructions for the site license admin panel.
 msgid "License for this StatusNet site"
 msgstr ""
 
-#: actions/licenseadminpanel.php:134
+#. TRANS: Client error displayed selecting an invalid license in the license admin panel.
 msgid "Invalid license selection."
 msgstr "Nevalida permesila elekto"
 
-#: actions/licenseadminpanel.php:144
+#. TRANS: Client error displayed when not specifying an owner for the all rights reserved license in the license admin panel.
 msgid ""
 "You must specify the owner of the content when using the All Rights Reserved "
 "license."
 msgstr ""
 
-#: actions/licenseadminpanel.php:151
+#. TRANS: Client error displayed selecting a too long license title in the license admin panel.
 #, fuzzy
 msgid "Invalid license title. Maximum length is 255 characters."
 msgstr "Nevalida permesila titolo. La longlimo estas 255 literoj."
 
-#: actions/licenseadminpanel.php:163
+#. TRANS: Client error displayed specifying an invalid license URL in the license admin panel.
 msgid "Invalid license URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:166
+#. TRANS: Client error displayed specifying an invalid license image URL in the license admin panel.
 msgid "Invalid license image URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:174
+#. TRANS: Client error displayed specifying an invalid license URL in the license admin panel.
 msgid "License URL must be blank or a valid URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:182
+#. TRANS: Client error displayed specifying an invalid license image URL in the license admin panel.
 msgid "License image must be blank or valid URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:232
+#. TRANS: Form legend in the license admin panel.
 msgid "License selection"
 msgstr ""
 
-#: actions/licenseadminpanel.php:238
+#. TRANS: License option in the license admin panel.
 msgid "Private"
 msgstr "Privata"
 
-#: actions/licenseadminpanel.php:239
+#. TRANS: License option in the license admin panel.
 msgid "All Rights Reserved"
 msgstr "Ĉiuj rajtoj rezervitaj."
 
-#: actions/licenseadminpanel.php:240
+#. TRANS: License option in the license admin panel.
 msgid "Creative Commons"
 msgstr "Creative Commons"
 
-#: actions/licenseadminpanel.php:245
+#. TRANS: Dropdown field label in the license admin panel.
 msgid "Type"
 msgstr "Speco"
 
-#: actions/licenseadminpanel.php:247
-msgid "Select license"
-msgstr ""
+#. TRANS: Dropdown field instructions in the license admin panel.
+#, fuzzy
+msgid "Select a license."
+msgstr "Elektu peranton"
 
-#: actions/licenseadminpanel.php:261
+#. TRANS: Form legend in the license admin panel.
 msgid "License details"
 msgstr ""
 
-#: actions/licenseadminpanel.php:267
+#. TRANS: Field label in the license admin panel.
 msgid "Owner"
 msgstr ""
 
-#: actions/licenseadminpanel.php:268
+#. TRANS: Field title in the license admin panel.
 msgid "Name of the owner of the site's content (if applicable)."
 msgstr ""
 
-#: actions/licenseadminpanel.php:276
+#. TRANS: Field label in the license admin panel.
 msgid "License Title"
 msgstr ""
 
-#: actions/licenseadminpanel.php:277
+#. TRANS: Field title in the license admin panel.
 msgid "The title of the license."
 msgstr ""
 
-#: actions/licenseadminpanel.php:285
+#. TRANS: Field label in the license admin panel.
 msgid "License URL"
 msgstr ""
 
-#: actions/licenseadminpanel.php:286
+#. TRANS: Field title in the license admin panel.
 msgid "URL for more information about the license."
 msgstr ""
 
-#: actions/licenseadminpanel.php:293
+#. TRANS: Field label in the license admin panel.
 msgid "License Image URL"
 msgstr ""
 
-#: actions/licenseadminpanel.php:294
+#. TRANS: Field title in the license admin panel.
 msgid "URL for an image to display with the license."
 msgstr ""
 
-#. TRANS: Submit button title.
-#: actions/licenseadminpanel.php:311 actions/sessionsadminpanel.php:199
-#: actions/siteadminpanel.php:292 actions/snapshotadminpanel.php:245
-#: actions/tagother.php:133 lib/applicationeditform.php:357
-msgid "Save"
-msgstr "Konservi"
-
-#: actions/licenseadminpanel.php:311
-msgid "Save license settings"
-msgstr ""
+#. TRANS: Button title in the license admin panel.
+#, fuzzy
+msgid "Save license settings."
+msgstr "Konservi retejan agordon"
 
+#. TRANS: Client error displayed when trying to log in while already logged in.
 #. TRANS: Client error displayed trying to use "one time password login" when already logged in.
-#: actions/login.php:97 actions/otp.php:62 actions/register.php:130
 msgid "Already logged in."
 msgstr "Vi jam ensalutis."
 
-#: actions/login.php:125
+#. TRANS: Form validation error displayed when trying to log in with incorrect credentials.
 msgid "Incorrect username or password."
 msgstr "Malĝusta uzantnomo aŭ pasvorto."
 
+#. TRANS: Server error displayed when during login a server error occurs.
 #. TRANS: Server error displayed when a user object could not be created trying to login using "one time password login".
-#: actions/login.php:131 actions/otp.php:127
 msgid "Error setting user. You are probably not authorized."
 msgstr "Eraras agordi uzanton. Vi verŝajne ne rajtiĝas."
 
-#: actions/login.php:185 actions/login.php:236 lib/action.php:598
+#. TRANS: Page title for login page.
 msgid "Login"
 msgstr "Ensaluti"
 
-#: actions/login.php:222
+#. TRANS: Form legend on login page.
 msgid "Login to site"
 msgstr "Ensaluti al la retejo"
 
-#: actions/login.php:231 actions/register.php:469
+#. TRANS: Checkbox label label on login page.
 msgid "Remember me"
 msgstr "Memoru min"
 
-#: actions/login.php:232 actions/register.php:471
+#. TRANS: Checkbox title on login page.
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "Aŭtomate ensaluti estonte; ne taŭge por komuna komputilo!"
 
-#: actions/login.php:241
+#. TRANS: Button text for log in on login page.
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Login"
+msgstr "Ensaluti"
+
+#. TRANS: Link text for link to "reset password" on login page.
 msgid "Lost or forgotten password?"
 msgstr "Ĉi via pasvorto perdiĝas?"
 
-#: actions/login.php:259
+#. TRANS: Form instructions on login page before being able to change user settings.
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -3765,139 +3081,134 @@ msgstr ""
 "Por sekureca kialo, bonvole re-entajpi vian uzantnomon kaj pasvorton antaŭ "
 "ŝanĝi vian agordon."
 
-#: actions/login.php:263
+#. TRANS: Form instructions on login page.
 msgid "Login with your username and password."
 msgstr "Ensaluti per via uzantnomo kaj pasvorto."
 
-#: actions/login.php:266
+#. TRANS: Form instructions on login page. This message contains Markdown links in the form [Link text](Link).
+#. TRANS: %%action.register%% is a link to the registration page.
 #, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
 msgstr "Ĉu sen uzantnomo? [Kreu](%%action.register%%) novan konton."
 
-#: actions/makeadmin.php:92
+#. TRANS: Client error displayed when trying to make another user admin on the Make Admin page while not an admin.
 msgid "Only an admin can make another user an admin."
 msgstr "Nur administranto rajtas administrantigi uzanton."
 
-#: actions/makeadmin.php:96
+#. TRANS: Client error displayed when trying to make another user admin on the Make Admin page who already is admin.
+#. TRANS: %1$s is the user that is already admin, %2$s is the group user is already admin for.
 #, php-format
 msgid "%1$s is already an admin for group \"%2$s\"."
 msgstr "%1$s estas jam grupestro de \"%2$s\"."
 
-#: actions/makeadmin.php:133
+#. TRANS: Server error displayed when trying to make another user admin on the Make Admin page fails
+#. TRANS: because the group membership record could not be gotten.
+#. TRANS: %1$s is the to be admin user, %2$s is the group user should be admin for.
 #, php-format
 msgid "Can't get membership record for %1$s in group %2$s."
 msgstr "Malsukcesis kolekti ano-historio de %1$s en grupo %2$s."
 
-#: actions/makeadmin.php:146
+#. TRANS: Server error displayed when trying to make another user admin on the Make Admin page fails
+#. TRANS: because the group adminship record coud not be saved properly.
+#. TRANS: %1$s is the to be admin user, %2$s is the group user is already admin for.
 #, php-format
 msgid "Can't make %1$s an admin for group %2$s."
 msgstr "Malsukcesis estrigi  %1$s por grupo %2$s."
 
-#: actions/microsummary.php:69
+#. TRANS: Client error displayed trying to make a micro summary without providing a status.
 msgid "No current status."
 msgstr "Ne estas kuranta stato."
 
 #. TRANS: This is the title of the form for adding a new application.
-#: actions/newapplication.php:52
 #, fuzzy
 msgid "New application"
 msgstr "Nova Apliko"
 
 #. TRANS: Client error displayed trying to add a new application while not logged in.
-#: actions/newapplication.php:64
 msgid "You must be logged in to register an application."
 msgstr "Ensalutu por registri aplikaĵon."
 
 #. TRANS: Form instructions for registering a new application.
-#: actions/newapplication.php:147
 msgid "Use this form to register a new application."
 msgstr "Uzu ĉi tiun formularon por registri novan aplikaĵon."
 
 #. TRANS: Validation error shown when not providing a source URL in the "New application" form.
-#: actions/newapplication.php:189
 msgid "Source URL is required."
 msgstr "Fonta URL bezonata."
 
 #. TRANS: Server error displayed when an application could not be registered in the database through the "New application" form.
-#: actions/newapplication.php:279 actions/newapplication.php:289
 msgid "Could not create application."
 msgstr "Malsukcesis krei aplikaĵon."
 
 #. TRANS: Title for form to create a group.
-#: actions/newgroup.php:53
 msgid "New group"
 msgstr "Nova grupo"
 
 #. TRANS: Client exception thrown when a user tries to create a group while banned.
-#: actions/newgroup.php:73 classes/User_group.php:485
 #, fuzzy
 msgid "You are not allowed to create groups on this site."
 msgstr "Vi ne estas grupano."
 
 #. TRANS: Form instructions for group create form.
-#: actions/newgroup.php:117
 msgid "Use this form to create a new group."
 msgstr "Uzas ĉi tiun formularon por krei novan grupon."
 
-#. TRANS: Group create form validation error.
-#: actions/newgroup.php:200
-#, fuzzy
-msgid "Alias cannot be the same as nickname."
-msgstr "La alinomo devas ne esti sama al la kromnomo."
-
-#: actions/newmessage.php:71 actions/newmessage.php:234
+#. TRANS: Page title for new direct message page.
+#. TRANS: Page title on page for sending a direct message.
 msgid "New message"
 msgstr "Nova mesaĝo"
 
-#. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
-#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:513
-msgid "You can't send a message to this user."
+#. TRANS: Client error displayed trying to send a direct message to a user while sender and
+#. TRANS: receiver are not subscribed to each other.
+#, fuzzy
+msgid "You cannot send a message to this user."
 msgstr "Vi ne povas sendi mesaĝon al la uzanto."
 
+#. TRANS: Form validator error displayed trying to send a direct message without content.
+#. TRANS: Client error displayed trying to send a notice without content.
 #. TRANS: Command exception text shown when trying to send a direct message to another user without content.
 #. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
-#: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:490
-#: lib/command.php:593
 msgid "No content!"
 msgstr "Neniu enhavo!"
 
-#: actions/newmessage.php:161
+#. TRANS: Form validation error displayed trying to send a direct message without specifying a recipient.
 msgid "No recipient specified."
 msgstr "Neniu ricevonto speifiĝas."
 
+#. TRANS: Client error displayed trying to send a direct message to self.
 #. TRANS: Error text shown when trying to send a direct message to self.
-#: actions/newmessage.php:167 lib/command.php:517
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr "Ne sendu mesaĝon al vi mem! Simple suspiru anstataŭ."
 
-#: actions/newmessage.php:184
+#. TRANS: Page title after sending a direct message.
 msgid "Message sent"
 msgstr "Mesaĝo sendita"
 
+#. TRANS: Confirmation text after sending a direct message.
+#. TRANS: %s is the direct message recipient.
 #. TRANS: Message given have sent a direct message to another user.
 #. TRANS: %s is the name of the other user.
-#: actions/newmessage.php:188 lib/command.php:525
 #, php-format
 msgid "Direct message to %s sent."
 msgstr "Rekta mesaĝo al %s sendiĝis."
 
-#: actions/newmessage.php:213 actions/newnotice.php:264
+#. TRANS: Page title after an AJAX error occurred on the "send direct message" page.
+#. TRANS: Page title after an AJAX error occurs on the send notice page.
 msgid "Ajax Error"
 msgstr "Eraro de Ajax"
 
-#: actions/newnotice.php:69
+#. TRANS: Page title for sending a new notice.
 msgid "New notice"
 msgstr "Nova avizo"
 
-#: actions/newnotice.php:230
+#. TRANS: Page title after sending a notice.
 msgid "Notice posted"
 msgstr "Avizo afiŝiĝas"
 
 #. TRANS: Instructions for Notice search page.
 #. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/noticesearch.php:69
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -3907,20 +3218,17 @@ msgstr ""
 "ili estu almenaŭ 3 literojn longaj."
 
 #. TRANS: Title of the page where users can search for notices.
-#: actions/noticesearch.php:80
 msgid "Text search"
 msgstr "Teksta serĉado"
 
 #. TRANS: Test in RSS notice search.
 #. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearch.php:95
 #, php-format
 msgid "Search results for \"%1$s\" on %2$s"
 msgstr "Trovito per \"%1$s\" ĉe %2$s"
 
 #. TRANS: Text for logged in users making a query for notices without results.
 #. TRANS: This message contains a Markdown link.
-#: actions/noticesearch.php:128
 #, php-format
 msgid ""
 "Be the first to [post on this topic](%%%%action.newnotice%%%%?"
@@ -3931,7 +3239,6 @@ msgstr ""
 
 #. TRANS: Text for not logged in users making a query for notices without results.
 #. TRANS: This message contains Markdown links.
-#: actions/noticesearch.php:133
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and be the first to "
@@ -3941,19 +3248,17 @@ msgstr ""
 "la temo](%%%%action.newnotice%%%%?status_textarea=%s)!"
 
 #. TRANS: RSS notice search feed title. %s is the query.
-#: actions/noticesearchrss.php:95
 #, php-format
 msgid "Updates with \"%s\""
 msgstr "Ĝisdatiĝo enhavante \"%s\""
 
 #. TRANS: RSS notice search feed description.
 #. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearchrss.php:99
 #, fuzzy, php-format
 msgid "Updates matching search term \"%1$s\" on %2$s."
 msgstr "Ĝisdatiĝo kongruanta al serĉvorto \"%1$s\" ĉe %2$s!"
 
-#: actions/nudge.php:85
+#. TRANS: Client error displayed trying to nudge a user that cannot be nudged.
 #, fuzzy
 msgid ""
 "This user doesn't allow nudges or hasn't confirmed or set their email "
@@ -3962,60 +3267,51 @@ msgstr ""
 "La uzanto ne permesas puŝeton aŭ ne jam konfirmis aŭ registris "
 "retpoŝtadreson."
 
-#: actions/nudge.php:94
+#. TRANS: Page title after sending a nudge.
 msgid "Nudge sent"
 msgstr "Puŝeto sendiĝis"
 
-#: actions/nudge.php:97
+#. TRANS: Confirmation text after sending a nudge.
 msgid "Nudge sent!"
 msgstr "Puŝeto sendiĝis!"
 
 #. TRANS: Message displayed to an anonymous user trying to view OAuth application list.
-#: actions/oauthappssettings.php:57
 msgid "You must be logged in to list your applications."
 msgstr "Ensalutu por listigi viajn aplikaĵojn."
 
 #. TRANS: Page title for OAuth applications
-#: actions/oauthappssettings.php:73
 msgid "OAuth applications"
 msgstr "OAuth aplikoj"
 
 #. TRANS: Page instructions for OAuth applications
-#: actions/oauthappssettings.php:85
 msgid "Applications you have registered"
 msgstr "Aplikoj kiujn vi enskribis"
 
 #. TRANS: Empty list message on page with OAuth applications.
-#: actions/oauthappssettings.php:138
 #, php-format
 msgid "You have not registered any applications yet."
 msgstr "Vi ankoraŭ neniun aplikaĵon registris."
 
 #. TRANS: Title for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:69
 msgid "Connected applications"
 msgstr "Konektita aplikaĵo"
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:80
 msgid "The following connections exist for your account."
 msgstr ""
 
 #. TRANS: Client error when trying to revoke access for an application while not being a user of it.
-#: actions/oauthconnectionssettings.php:165
 msgid "You are not a user of that application."
 msgstr "Mi ne estas uzanto de tiu aplikaĵo."
 
 #. TRANS: Client error when revoking access has failed for some reason.
 #. TRANS: %s is the application ID revoking access failed for.
-#: actions/oauthconnectionssettings.php:180
 #, fuzzy, php-format
 msgid "Unable to revoke access for application: %s."
 msgstr "Maleble revoki aliradon al aplikaĵo: %s."
 
 #. TRANS: Success message after revoking access for an application.
 #. TRANS: %1$s is the application name, %2$s is the first part of the user token.
-#: actions/oauthconnectionssettings.php:199
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -4023,457 +3319,374 @@ msgid ""
 msgstr ""
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:210
 msgid "You have not authorized any applications to use your account."
 msgstr "Vi ne rajtigis iun ajn aplikaĵon uzi vian konton."
 
 #. TRANS: Note for developers in the OAuth connection settings form.
 #. TRANS: This message contains a Markdown link. Do not separate "](".
 #. TRANS: %s is the URL to the OAuth settings.
-#: actions/oauthconnectionssettings.php:230
 #, php-format
 msgid ""
 "Are you a developer? [Register an OAuth client application](%s) to use with "
 "this instance of StatusNet."
 msgstr ""
 
-#: actions/oembed.php:64
+#. TRANS: Server error displayed in oEmbed action when path not found.
+#. TRANS: %s is a path.
 #, fuzzy, php-format
 msgid "\"%s\" not found."
 msgstr "Metodo de API ne troviĝas."
 
-#: actions/oembed.php:76
+#. TRANS: Server error displayed in oEmbed action when notice not found.
+#. TRANS: %s is a notice.
 #, fuzzy, php-format
 msgid "Notice %s not found."
 msgstr "Metodo de API ne troviĝas."
 
-#: actions/oembed.php:80 actions/shownotice.php:100
+#. TRANS: Server error displayed in oEmbed action when notice has not profile.
 msgid "Notice has no profile."
 msgstr "Avizo sen profilo"
 
-#: actions/oembed.php:83 actions/shownotice.php:172
+#. TRANS: oEmbed title. %1$s is the author name, %2$s is the creation date.
 #, php-format
 msgid "%1$s's status on %2$s"
 msgstr "Stato de %1$s ĉe %2$s"
 
-#: actions/oembed.php:95
+#. TRANS: Server error displayed in oEmbed action when attachment not found.
+#. TRANS: %d is an attachment ID.
 #, fuzzy, php-format
 msgid "Attachment %s not found."
 msgstr "Ricevonta uzanto ne troviĝas."
 
-#: actions/oembed.php:136
+#. TRANS: Server error displayed in oEmbed request when a path is not supported.
+#. TRANS: %s is a path.
 #, php-format
 msgid "\"%s\" not supported for oembed requests."
 msgstr ""
 
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
-#: actions/oembed.php:168
 #, php-format
 msgid "Content type %s not supported."
 msgstr "Enhavtipo %s ne subteniĝas."
 
 #. TRANS: Error message displaying attachments. %s is the site's base URL.
-#: actions/oembed.php:172
 #, php-format
 msgid "Only %s URLs over plain HTTP please."
 msgstr "Bonvolu, nur %s-URL per plata HTTP."
 
+#. TRANS: Server error displayed in oEmbed action when request specifies an unsupported data format.
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1207
-#: lib/apiaction.php:1234 lib/apiaction.php:1369
 msgid "Not a supported data format."
 msgstr "Datumformato ne subteniĝas."
 
 #. TRANS: ShortName in the OpenSearch interface when trying to find users.
-#: actions/opensearch.php:64
 msgid "People Search"
 msgstr "Homserĉo"
 
-#: actions/opensearch.php:68
+#. TRANS: ShortName in the OpenSearch interface when trying to find notices.
 msgid "Notice Search"
 msgstr "Avizoserĉo"
 
 #. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
-#: actions/otp.php:70
 msgid "No user ID specified."
 msgstr "Neniu uzanto-ID specifiĝas."
 
 #. TRANS: Client error displayed trying to use "one time password login" without specifying a login token.
-#: actions/otp.php:86
 msgid "No login token specified."
 msgstr "Neniu ensalutado-ĵetono specifiĝas."
 
 #. TRANS: Client error displayed trying to use "one time password login" without requesting a login token.
-#: actions/otp.php:94
 msgid "No login token requested."
 msgstr "Neniu ensalutad-ĵetono bezoniĝas."
 
 #. TRANS: Client error displayed trying to use "one time password login" while specifying an invalid login token.
-#: actions/otp.php:100
 msgid "Invalid login token specified."
 msgstr "Specifita ensalutado-ĵetono nevalidas."
 
 #. TRANS: Client error displayed trying to use "one time password login" while specifying an expired login token.
-#: actions/otp.php:110
 msgid "Login token expired."
 msgstr "Ensalutado-ĵetono eksvalidiĝas."
 
 #. TRANS: Title for outbox for any but the fist page.
 #. TRANS: %1$s is the user nickname, %2$d is the page number.
-#: actions/outbox.php:57
 #, php-format
 msgid "Outbox for %1$s - page %2$d"
 msgstr "elirkesto de %1$s - paĝo %2$d"
 
 #. TRANS: Title for first page of outbox.
-#: actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
 msgstr "Elirkesto de %s"
 
 #. TRANS: Instructions for outbox.
-#: actions/outbox.php:103
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr ""
 "Tio ĉi estas via elirkesto, kie listiĝas privataj mesaĝoj, kiujn vi sendis."
 
-#: actions/passwordsettings.php:58
 msgid "Change password"
 msgstr "Ŝanĝi pasvorton"
 
-#: actions/passwordsettings.php:69
 msgid "Change your password."
 msgstr "Ŝanĝi vian pasvorton."
 
 #. TRANS: Fieldset legend for password reset form.
-#: actions/passwordsettings.php:96 actions/recoverpassword.php:251
 msgid "Password change"
 msgstr "Pasvorta ŝanĝo"
 
-#: actions/passwordsettings.php:104
 msgid "Old password"
 msgstr "Malnova pasvorto"
 
 #. TRANS: Field label for password reset form.
-#: actions/passwordsettings.php:108 actions/recoverpassword.php:256
 msgid "New password"
 msgstr "Nova pasvorto"
 
-#: actions/passwordsettings.php:109 actions/register.php:416
 #, fuzzy
 msgid "6 or more characters."
 msgstr "6 aŭ pli da literoj"
 
 #. TRANS: Ttile for field label for password reset form where the password has to be typed again.
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:264
-#: actions/register.php:420
 #, fuzzy
 msgid "Same as password above."
 msgstr "Same kiel pasvorto supra"
 
-#: actions/passwordsettings.php:117
 msgid "Change"
 msgstr "Ŝanĝi"
 
-#: actions/passwordsettings.php:153 actions/register.php:223
 msgid "Password must be 6 or more characters."
 msgstr "Pasvorto devas esti 6-litera aŭ pli longa."
 
-#: actions/passwordsettings.php:156 actions/register.php:226
 msgid "Passwords don't match."
 msgstr "La pasvortoj diferencas."
 
-#: actions/passwordsettings.php:164
 msgid "Incorrect old password"
 msgstr "Neĝusta malnova pasvorto"
 
-#: actions/passwordsettings.php:180
 msgid "Error saving user; invalid."
 msgstr "Eraris konservi uzanton: nevalida."
 
 #. TRANS: Reset password form validation error message.
-#: actions/passwordsettings.php:185 actions/recoverpassword.php:418
 #, fuzzy
 msgid "Cannot save new password."
 msgstr "Malsukcesis konservi novan pasvorton."
 
-#: actions/passwordsettings.php:191
 msgid "Password saved."
 msgstr "Pasvorto konservitas."
 
 #. TRANS: Title for Paths admin panel.
 #. TRANS: Menu item for site administration
-#: actions/pathsadminpanel.php:58 lib/adminpanelaction.php:371
 msgid "Paths"
 msgstr "Vojoj"
 
 #. TRANS: Form instructions for Path admin panel.
-#: actions/pathsadminpanel.php:69
 msgid "Path and server settings for this StatusNet site"
 msgstr ""
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the directory that could not be read from.
-#: actions/pathsadminpanel.php:155
 #, php-format
 msgid "Theme directory not readable: %s."
 msgstr "Desegno adresaro ne havebla: %s."
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the avatar directory that could not be written to.
-#: actions/pathsadminpanel.php:163
 #, php-format
 msgid "Avatar directory not writable: %s."
 msgstr "Avatara adresaro ne skribebla: %s."
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the background directory that could not be written to.
-#: actions/pathsadminpanel.php:171
 #, php-format
 msgid "Background directory not writable: %s."
 msgstr "Fona adresaro ne skribebla: %s."
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the locales directory that could not be read from.
-#: actions/pathsadminpanel.php:181
 #, php-format
 msgid "Locales directory not readable: %s."
 msgstr "Lokaĵara adresaro ne havebla: %s."
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the SSL server URL that is too long.
-#: actions/pathsadminpanel.php:189
 msgid "Invalid SSL server. The maximum length is 255 characters."
 msgstr "Nevalida SSL-servilo. La longlimo estas 225 literoj."
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:235 actions/siteadminpanel.php:58
 msgid "Site"
 msgstr "Retejo"
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:241 actions/pathsadminpanel.php:279
-#: actions/pathsadminpanel.php:370 actions/pathsadminpanel.php:425
 msgid "Server"
 msgstr "Servilo"
 
-#: actions/pathsadminpanel.php:242
 msgid "Site's server hostname."
 msgstr "Gastigserva Nomo de la retejo"
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:248 actions/pathsadminpanel.php:288
-#: actions/pathsadminpanel.php:379 actions/pathsadminpanel.php:434
 msgid "Path"
 msgstr "Vojo"
 
-#: actions/pathsadminpanel.php:249
 #, fuzzy
 msgid "Site path."
 msgstr "Reteja vojo"
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:255
 msgid "Locale directory"
 msgstr "Dosierujo de lokaĵaro"
 
-#: actions/pathsadminpanel.php:256
 msgid "Directory path to locales."
 msgstr "Vojo de dosierujo al lokaĵaroj."
 
 #. TRANS: Checkbox label in Paths admin panel.
-#: actions/pathsadminpanel.php:263
 msgid "Fancy URLs"
 msgstr "Tajlora URL"
 
-#: actions/pathsadminpanel.php:265
 msgid "Use fancy (more readable and memorable) URLs?"
 msgstr "Ĉu uzi tajloran (pli facile legebla kaj memorebla) URL?"
 
-#: actions/pathsadminpanel.php:272
 msgid "Theme"
 msgstr "Temo"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:281
 msgid "Server for themes."
 msgstr "Servilo por etosoj."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:290
 msgid "Web path to themes."
 msgstr "Retvojo al etosoj."
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:297 actions/pathsadminpanel.php:388
-#: actions/pathsadminpanel.php:443 actions/pathsadminpanel.php:495
 msgid "SSL server"
 msgstr "\"SSL\"a servilo"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:299
 msgid "SSL server for themes (default: SSL server)."
 msgstr "SSL-servilo por temoj (defaŭlta: SSL-servilo)."
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:306 actions/pathsadminpanel.php:397
-#: actions/pathsadminpanel.php:452
 msgid "SSL path"
 msgstr "SSL-vojo"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:308
 msgid "SSL path to themes (default: /theme/)."
 msgstr "SSL-vojo al etosoj (defaŭlta: /theme/)."
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:315 actions/pathsadminpanel.php:406
-#: actions/pathsadminpanel.php:461
 msgid "Directory"
 msgstr "Dosierujo"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:317
 msgid "Directory where themes are located."
 msgstr "Dosierujo kie etosoj estas."
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:326
 msgid "Avatars"
 msgstr "Avataroj"
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:333
 msgid "Avatar server"
 msgstr "Avatara servilo"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:335
 msgid "Server for avatars."
 msgstr "Servilo por avataroj."
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:342
 msgid "Avatar path"
 msgstr "Avataro-lokigilo"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:344
 msgid "Web path to avatars."
 msgstr "Retvojo al avataroj."
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:351
 msgid "Avatar directory"
 msgstr "Avatara adresaro"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:353
 msgid "Directory where avatars are located."
 msgstr "Dosierujo kie avataroj estas."
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:364
 msgid "Backgrounds"
 msgstr "Fono"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:372
 msgid "Server for backgrounds."
 msgstr "Servilo por fonoj."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:381
 msgid "Web path to backgrounds."
 msgstr "Retvojo al fonoj."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:390
 msgid "Server for backgrounds on SSL pages."
 msgstr "Servilo por fonoj en SSL-paĝoj."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:399
 msgid "Web path to backgrounds on SSL pages."
 msgstr "Retvojo al fonoj en SSL-paĝoj."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:408
 msgid "Directory where backgrounds are located."
 msgstr "Dosierujo kie fonoj estas."
 
 #. TRANS: Fieldset legens in Paths admin panel.
-#: actions/pathsadminpanel.php:419
 msgid "Attachments"
 msgstr "Aldonaĵo"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:427
 msgid "Server for attachments."
 msgstr "Servilo por aldonaĵoj."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:436
 msgid "Web path to attachments."
 msgstr "Retvojo al aldonaĵoj."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:445
 msgid "Server for attachments on SSL pages."
 msgstr "Servilo por aldonaĵoj en SSL-paĝoj."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:454
 msgid "Web path to attachments on SSL pages."
 msgstr "Retvojo al aldonaĵoj en SSL-paĝoj."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:463
 msgid "Directory where attachments are located."
 msgstr "Dosierujo kie aldonaĵoj estas."
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:472
 msgid "SSL"
 msgstr "\"SSL\""
 
 #. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
-#: actions/pathsadminpanel.php:477 actions/snapshotadminpanel.php:202
 msgid "Never"
 msgstr "Neniam"
 
 #. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
-#: actions/pathsadminpanel.php:479
 msgid "Sometimes"
 msgstr "Kelkfoje"
 
 #. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
-#: actions/pathsadminpanel.php:481
 msgid "Always"
 msgstr "Ĉiam"
 
-#: actions/pathsadminpanel.php:485
 msgid "Use SSL"
 msgstr "Uzi \"SSL\""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:487
 msgid "When to use SSL."
 msgstr "Kiam uzi SSL."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:497
 msgid "Server to direct SSL requests to."
 msgstr "Servilo, kien direkti \"SSL\"-petojn"
 
 #. TRANS: Button title text to store form data in the Paths admin panel.
-#: actions/pathsadminpanel.php:514
 msgid "Save paths"
 msgstr "Konservu lokigilon"
 
 #. TRANS: Instructions for the "People search" page.
 #. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/peoplesearch.php:54
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
@@ -4483,57 +3696,46 @@ msgstr ""
 "serĉvortojn per spacoj; ili estu almenaŭ 3 literojn longaj."
 
 #. TRANS: Title of a page where users can search for other users.
-#: actions/peoplesearch.php:61
 msgid "People search"
 msgstr "Persona serĉado"
 
-#: actions/peopletag.php:68
 #, php-format
 msgid "Not a valid people tag: %s."
 msgstr "Ne valida persona markilo: %s."
 
-#: actions/peopletag.php:142
 #, php-format
 msgid "Users self-tagged with %1$s - page %2$d"
 msgstr "Uzantoj sinmarkitaj per %1$s - paĝo %2$d"
 
 #. TRANS: Page title for AJAX form return when a disabling a plugin.
-#: actions/plugindisable.php:69
 msgctxt "plugin"
 msgid "Disabled"
 msgstr ""
 
 #. TRANS: Client error displayed trying to perform any request method other than POST.
 #. TRANS: Do not translate POST.
-#: actions/pluginenable.php:78 actions/subscribe.php:77
 msgid "This action only accepts POST requests."
 msgstr "La ago akceptas nur POST-an peton."
 
-#: actions/pluginenable.php:102
 #, fuzzy
 msgid "You cannot administer plugins."
 msgstr "Vi ne povas forigi uzantojn."
 
-#: actions/pluginenable.php:109
 #, fuzzy
 msgid "No such plugin."
 msgstr "Ne estas tiu paĝo."
 
 #. TRANS: Page title for AJAX form return when enabling a plugin.
-#: actions/pluginenable.php:159
 msgctxt "plugin"
 msgid "Enabled"
 msgstr ""
 
 #. TRANS: Tab and title for plugins admin panel.
 #. TRANS: Menu item for site administration
-#: actions/pluginsadminpanel.php:56 actions/version.php:191
-#: lib/adminpanelaction.php:411
 msgid "Plugins"
 msgstr "Kromprogramo"
 
 #. TRANS: Instructions at top of plugin admin page.
-#: actions/pluginsadminpanel.php:68
 msgid ""
 "Additional plugins can be enabled and configured manually. See the <a href="
 "\"http://status.net/wiki/Plugins\">online plugin documentation</a> for more "
@@ -4541,32 +3743,26 @@ msgid ""
 msgstr ""
 
 #. TRANS: Admin form section header
-#: actions/pluginsadminpanel.php:84
 #, fuzzy
 msgid "Default plugins"
 msgstr "Defaŭlta lingvo"
 
-#: actions/pluginsadminpanel.php:106
 msgid ""
 "All default plugins have been disabled from the site's configuration file."
 msgstr ""
 
-#: actions/postnotice.php:95
 msgid "Invalid notice content."
 msgstr "Nevalida avizo-enhavo"
 
-#: actions/postnotice.php:101
 #, php-format
 msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’."
 msgstr "Aviza permesilo ‘%1$s’ ne konformas al reteja permesilo ‘%2$s’."
 
 #. TRANS: Page title for profile settings.
-#: actions/profilesettings.php:60
 msgid "Profile settings"
 msgstr "Profila agordo"
 
 #. TRANS: Usage instructions for profile settings.
-#: actions/profilesettings.php:71
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
@@ -4574,31 +3770,24 @@ msgstr ""
 "vi."
 
 #. TRANS: Profile settings form legend.
-#: actions/profilesettings.php:99
 msgid "Profile information"
 msgstr "Profila informo"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:110 actions/register.php:412
 #, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr "1-64 minusklaj literoj aŭ ciferoj, neniu interpunkcio aŭ spaco"
 
 #. TRANS: Field label in form for profile settings.
-#: actions/profilesettings.php:114 actions/register.php:434
-#: lib/groupeditform.php:150
 msgid "Full name"
 msgstr "Plena nomo"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:119 actions/register.php:439
-#: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "Hejmpaĝo"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:122 actions/register.php:441
 #, fuzzy
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr "URL de via hejmpaĝo, blogo aŭ profilo ĉe alia retejo"
@@ -4606,7 +3795,6 @@ msgstr "URL de via hejmpaĝo, blogo aŭ profilo ĉe alia retejo"
 #. TRANS: Tooltip for field label in form for profile settings. Plural
 #. TRANS: is decided by the number of characters available for the
 #. TRANS: biography (%d).
-#: actions/profilesettings.php:130 actions/register.php:450
 #, fuzzy, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4614,41 +3802,31 @@ msgstr[0] "Priskribu vin mem kaj viajn ŝatokupojn per ne pli ol %d signoj"
 msgstr[1] "Priskribu vin mem kaj viajn ŝatokupojn per ne pli ol %d signoj"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:136 actions/register.php:455
 msgid "Describe yourself and your interests"
 msgstr "Priskribu vin mem kaj viajn ŝatokupojn"
 
 #. TRANS: Text area label in form for profile settings where users can provide.
 #. TRANS: their biography.
-#: actions/profilesettings.php:140 actions/register.php:457
 msgid "Bio"
 msgstr "Biografio"
 
 #. TRANS: Field label in form for profile settings.
-#: actions/profilesettings.php:146 actions/register.php:462
-#: lib/groupeditform.php:173
 msgid "Location"
 msgstr "Loko"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:149
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Kie vi estas, ekzemple \"Urbo, Ŝtato (aŭ Regiono), Lando\""
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:154
 msgid "Share my current location when posting notices"
 msgstr "Sciigu mian nunan lokon, kiam mi sendas avizon."
 
 #. TRANS: Field label in form for profile settings.
-#: actions/profilesettings.php:162 actions/tagother.php:128
-#: actions/tagother.php:188 lib/subscriptionlist.php:104
-#: lib/subscriptionlist.php:106
 msgid "Tags"
 msgstr "Markiloj"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:165
 #, fuzzy
 msgid ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- "
@@ -4658,28 +3836,23 @@ msgstr ""
 "per komoj aŭ spacoj"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:170
 msgid "Language"
 msgstr "Lingvo"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:172
 #, fuzzy
 msgid "Preferred language."
 msgstr "Preferata lingvo"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:182
 msgid "Timezone"
 msgstr "Horzono"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:184
 msgid "What timezone are you normally in?"
 msgstr "En kiu horzono vi kutime troviĝas?"
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:190
 #, fuzzy
 msgid ""
 "Automatically subscribe to whoever subscribes to me (best for non-humans)."
@@ -4688,7 +3861,6 @@ msgstr "Aŭtomate aboni iun ajn, kiu abonas min (prefereble por ne-homoj)"
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Plural form is used based on the maximum number of allowed
 #. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:259 actions/register.php:214
 #, fuzzy, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4696,85 +3868,69 @@ msgstr[0] "Biografio tro longas (maksimume %d literoj)"
 msgstr[1] "Biografio tro longas (maksimume %d literoj)"
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:270 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr "Horzono ne elektita"
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:278
 #, fuzzy
 msgid "Language is too long (maximum 50 characters)."
 msgstr "Lingvo tro longas (maksimume 50 literoj)"
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:292
 #, fuzzy, php-format
 msgid "Invalid tag: \"%s\"."
 msgstr "Nevalida markilo: \"%s\""
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:348
 #, fuzzy
 msgid "Could not update user for autosubscribe."
 msgstr "Malsukcesis ĝisdatigi uzanton por aŭtomatabonado."
 
 #. TRANS: Server error thrown when user profile location preference settings could not be updated.
-#: actions/profilesettings.php:406
 #, fuzzy
 msgid "Could not save location prefs."
 msgstr "Malsukcesis konservi lokan preferon."
 
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:428 actions/tagother.php:179
 msgid "Could not save tags."
 msgstr "Malsukcesis konservi etikedojn."
 
 #. TRANS: Confirmation shown when user profile settings are saved.
 #. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:437 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "Agordo konservitas."
 
 #. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
 #. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:484 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "Krei konton"
 
-#: actions/public.php:83
 #, php-format
 msgid "Beyond the page limit (%s)."
 msgstr "Trans paĝolimo (%s)."
 
-#: actions/public.php:92
 msgid "Could not retrieve public stream."
 msgstr "Malsukcesis ricevi publikan fluon"
 
-#: actions/public.php:130
 #, php-format
 msgid "Public timeline, page %d"
 msgstr "Publika tempstrio, paĝo %d"
 
-#: actions/public.php:132 lib/publicgroupnav.php:79
 msgid "Public timeline"
 msgstr "Publika tempstrio"
 
-#: actions/public.php:160
 msgid "Public Stream Feed (RSS 1.0)"
 msgstr "Publika fluo (RSS 1.0)"
 
-#: actions/public.php:164
 msgid "Public Stream Feed (RSS 2.0)"
 msgstr "Publika fluo (RSS 2.0)"
 
-#: actions/public.php:168
 msgid "Public Stream Feed (Atom)"
 msgstr "Publika fluo (Atom)"
 
-#: actions/public.php:188
 #, php-format
 msgid ""
 "This is the public timeline for %%site.name%% but no one has posted anything "
@@ -4783,17 +3939,14 @@ msgstr ""
 "Tio ĉi estas la publika tempstrio de %%site.name%%, sed ankoraŭ neniu afiŝis "
 "ion ajn."
 
-#: actions/public.php:191
 msgid "Be the first to post!"
 msgstr "Estu la unua afiŝanto!"
 
-#: actions/public.php:195
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post!"
 msgstr "Kial ne [krei konton](%%action.register%%) kaj esti la unua afiŝanto!"
 
-#: actions/public.php:242
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -4806,7 +3959,6 @@ msgstr ""
 "net/). [Aniĝu](%%action.register%%) por konigi novaĵon pri vi mem al viaj "
 "amikoj, familianoj, kaj kolegoj! ([Pli](%%doc.help%%))"
 
-#: actions/public.php:247
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -4818,19 +3970,16 @@ msgstr ""
 "net/)."
 
 #. TRANS: Public RSS feed description. %s is the StatusNet site name.
-#: actions/publicrss.php:106
 #, fuzzy, php-format
 msgid "%s updates from everyone."
 msgstr "%s ĝisdatigoj de ĉiuj!"
 
 #. TRANS: Title for public tag cloud.
-#: actions/publictagcloud.php:57
 msgid "Public tag cloud"
 msgstr "Publika markil-nubo"
 
 #. TRANS: Instructions (more used like an explanation/header).
 #. TRANS: %s is the StatusNet sitename.
-#: actions/publictagcloud.php:65
 #, fuzzy, php-format
 msgid "These are most popular recent tags on %s"
 msgstr "Jen la plej popularaj entikedoj lastatempaj ĉe %s "
@@ -4838,14 +3987,12 @@ msgstr "Jen la plej popularaj entikedoj lastatempaj ĉe %s "
 #. TRANS: This message contains a Markdown URL. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.
-#: actions/publictagcloud.php:74
 #, php-format
 msgid "No one has posted a notice with a [hashtag](%%doc.tags%%) yet."
 msgstr "Neniu jam afiŝis avizon kun [haketentikedon](%%doc.tags%%)."
 
 #. 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.
-#: actions/publictagcloud.php:79
 msgid "Be the first to post one!"
 msgstr "Estu la unua afiŝanto!"
 
@@ -4854,7 +4001,6 @@ msgstr "Estu la unua afiŝanto!"
 #. TRANS: This message contains a Markdown URL. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.
-#: actions/publictagcloud.php:87
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post "
@@ -4862,42 +4008,34 @@ msgid ""
 msgstr "Kial ne [krei konton](%%action.register%%) kaj esti la unua afiŝanto!"
 
 #. TRANS: Client error displayed trying to recover password while already logged in.
-#: actions/recoverpassword.php:37
 msgid "You are already logged in!"
 msgstr "Vi jam ensalutis."
 
 #. TRANS: Client error displayed when password recovery code is not correct.
-#: actions/recoverpassword.php:64
 msgid "No such recovery code."
 msgstr "Ne estas tia rehava kodo."
 
 #. TRANS: Client error displayed when no proper password recovery code was submitted.
-#: actions/recoverpassword.php:69
 msgid "Not a recovery code."
 msgstr "Ne rehava kodo."
 
 #. TRANS: Server error displayed trying to recover password without providing a user.
-#: actions/recoverpassword.php:77
 msgid "Recovery code for unknown user."
 msgstr "Rehava kodo por nekonata uzanto."
 
 #. TRANS: Server error displayed removing a password recovery code from the database.
-#: actions/recoverpassword.php:91
 msgid "Error with confirmation code."
 msgstr "Eraras pro komfirma kodo."
 
 #. TRANS: Client error displayed trying to recover password with too old a recovery code.
-#: actions/recoverpassword.php:103
 msgid "This confirmation code is too old. Please start again."
 msgstr "Tiu komfirmnumero tro malnovas. Bonvolu rekomenci."
 
 #. TRANS: Server error displayed when updating a user's e-mail address in the database fails while recovering a password.
-#: actions/recoverpassword.php:118
 msgid "Could not update user with confirmed email address."
 msgstr "Malsukcesas ĝisdatigi uzanton per komfirmita retpoŝtadreso."
 
 #. TRANS: Page notice for password recovery page.
-#: actions/recoverpassword.php:160
 msgid ""
 "If you have forgotten or lost your password, you can get a new one sent to "
 "the email address you have stored in your account."
@@ -4905,100 +4043,82 @@ msgstr ""
 "Se vi forgesas aŭ perdas vian pasvorton, ni povas sendi novan pasvorton al "
 "la retpoŝtadreso konservita je via konto."
 
-#: actions/recoverpassword.php:167
 msgid "You have been identified. Enter a new password below."
 msgstr "Vi estis identigita. Enigu sube novan pasvorton."
 
 #. TRANS: Fieldset legend for password recovery page.
-#: actions/recoverpassword.php:198
 msgid "Password recovery"
 msgstr "Pasvorton rehavi."
 
 #. TRANS: Field label on password recovery page.
-#: actions/recoverpassword.php:202
 msgid "Nickname or email address"
 msgstr "Alinomo aŭ retpoŝtadreso."
 
 #. TRANS: Title for field label on password recovery page.
-#: actions/recoverpassword.php:205
 msgid "Your nickname on this server, or your registered email address."
 msgstr "Via alinomo ĉe tiu ĉi servilo, aŭ via registrita retpoŝadreso."
 
 #. TRANS: Field label on password recovery page.
-#: actions/recoverpassword.php:212
 msgid "Recover"
 msgstr "Rehavi"
 
 #. TRANS: Button text on password recovery page.
-#: actions/recoverpassword.php:214
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Recover"
 msgstr "Rehavi"
 
 #. TRANS: Title for password recovery page in password reset mode.
-#: actions/recoverpassword.php:223
 msgid "Reset password"
 msgstr "Refari pasvorton"
 
 #. TRANS: Title for password recovery page in password recover mode.
-#: actions/recoverpassword.php:225
 msgid "Recover password"
 msgstr "Refari pasvorton"
 
 #. TRANS: Title for password recovery page in email sent mode.
 #. TRANS: Subject for password recovery e-mail.
-#: actions/recoverpassword.php:227 actions/recoverpassword.php:366
 msgid "Password recovery requested"
 msgstr "Petiĝas pasvorton rehavado"
 
 #. TRANS: Title for password recovery page in password saved mode.
-#: actions/recoverpassword.php:229
 #, fuzzy
 msgid "Password saved"
 msgstr "Pasvorto konservitas."
 
 #. TRANS: Title for password recovery page when an unknown action has been specified.
-#: actions/recoverpassword.php:232
 msgid "Unknown action"
 msgstr "Nekonata ago"
 
 #. TRANS: Title for field label for password reset form.
-#: actions/recoverpassword.php:258
 #, fuzzy
 msgid "6 or more characters, and do not forget it!"
 msgstr "Almenaŭ 6 signoj, kaj ne forgesu ĝin!"
 
 #. TRANS: Button text for password reset form.
 #. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: actions/recoverpassword.php:268 lib/designform.php:145
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Reset"
 msgstr "Restarigi"
 
 #. TRANS: Form instructions for password recovery form.
-#: actions/recoverpassword.php:278
 msgid "Enter a nickname or email address."
 msgstr "Alinomo aŭ retpoŝtadreso."
 
 #. TRANS: Information on password recovery form if no known username or e-mail address was specified.
-#: actions/recoverpassword.php:309
 msgid "No user with that email address or username."
 msgstr "Ne estas uzanto kun tiu retpoŝtadreso aŭ uzantnomo."
 
 #. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
-#: actions/recoverpassword.php:327
 msgid "No registered email address for that user."
 msgstr "Neniu registrita retpoŝtadreso apartenas al la uzanto."
 
 #. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
-#: actions/recoverpassword.php:342
 msgid "Error saving address confirmation."
 msgstr "Eraras pro komfirma kodo."
 
 #. TRANS: User notification after an e-mail with instructions was sent from the password recovery form.
-#: actions/recoverpassword.php:370
 msgid ""
 "Instructions for recovering your password have been sent to the email "
 "address registered to your account."
@@ -5007,75 +4127,59 @@ msgstr ""
 "via konto."
 
 #. TRANS: Client error displayed when trying to reset as password without providing a user.
-#: actions/recoverpassword.php:391
 msgid "Unexpected password reset."
 msgstr "Neatendita pasvorto-rekomencigo."
 
 #. TRANS: Reset password form validation error message.
-#: actions/recoverpassword.php:400
 #, fuzzy
 msgid "Password must be 6 characters or more."
 msgstr "Pasvorto devas enhavi 6 signojn aŭ pli."
 
 #. TRANS: Reset password form validation error message.
-#: actions/recoverpassword.php:405
 msgid "Password and confirmation do not match."
 msgstr "Pasvorto kaj komfirmo ne kongruas."
 
 #. TRANS: Server error displayed when something does wrong with the user object during password reset.
-#: actions/recoverpassword.php:426 actions/register.php:241
 msgid "Error setting user."
 msgstr "Eraris agordi uzanton."
 
 #. TRANS: Success message for user after password reset.
-#: actions/recoverpassword.php:434
 msgid "New password successfully saved. You are now logged in."
 msgstr "Nova pasvorto sukcese konserviĝas. Vi nun estas ensalutinta."
 
-#: actions/redirecturl.php:70
 #, fuzzy
 msgid "No id parameter"
 msgstr "Neniu ID-argumento"
 
-#: actions/redirecturl.php:76
 #, fuzzy, php-format
 msgid "No such file \"%d\""
 msgstr "Ne ekzistas tia dosiero."
 
-#: actions/register.php:80 actions/register.php:181 actions/register.php:392
 msgid "Sorry, only invited people can register."
 msgstr "Pardonon, nur invito rajtas registri."
 
-#: actions/register.php:87
 msgid "Sorry, invalid invitation code."
 msgstr "Pardonon, nevalida invitkodo."
 
-#: actions/register.php:106
 msgid "Registration successful"
 msgstr "Registriĝo sukcesa"
 
-#: actions/register.php:108 actions/register.php:490
 msgid "Register"
 msgstr "Registri"
 
-#: actions/register.php:128
 msgid "Registration not allowed."
 msgstr "Registriĝo ne permesita."
 
-#: actions/register.php:194
 #, fuzzy
 msgid "You cannot register if you don't agree to the license."
 msgstr "Vi ne povas registriĝi, se vi ne konsentas kun la permesilo."
 
-#: actions/register.php:203
 msgid "Email address already exists."
 msgstr "Retpoŝta adreso jam ekzistas."
 
-#: actions/register.php:236 actions/register.php:258
 msgid "Invalid username or password."
 msgstr "Nevalida uzantnomo aŭ pasvorto."
 
-#: actions/register.php:333
 #, fuzzy
 msgid ""
 "With this form you can create a new account. You can then post notices and "
@@ -5084,50 +4188,40 @@ msgstr ""
 "Per tiu ĉi formularo vi povas krei novan konton. Poste povos vi afiŝi avizon "
 "kaj komuniki kun amikoj kaj kolegoj. "
 
-#: actions/register.php:424 actions/register.php:428
-#: actions/siteadminpanel.php:238 lib/settingsnav.php:92
 msgid "Email"
 msgstr "Retpoŝto"
 
-#: actions/register.php:425 actions/register.php:429
 #, fuzzy
 msgid "Used only for updates, announcements, and password recovery."
 msgstr "Uzu nur por ĝisdatigo, anonco, kaj rehavi pasvorton."
 
-#: actions/register.php:436
 #, fuzzy
 msgid "Longer name, preferably your \"real\" name."
 msgstr "Pli longa nomo, prefere via \"vera\" nomo."
 
-#: actions/register.php:464
 #, fuzzy
 msgid "Where you are, like \"City, State (or Region), Country\"."
 msgstr "Kie vi estas, ekzemple \"Urbo, Ŝtato (aŭ Regiono), Lando\""
 
-#: actions/register.php:503
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
 msgstr ""
 "Mi komprenas ke enhavo kaj datumo de %1$s estas privataj kaj sekretigita."
 
-#: actions/register.php:513
 #, php-format
 msgid "My text and files are copyright by %1$s."
 msgstr "Mia teksto kaj dosiero estas aŭtorrajtigita de %1$s."
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:517
 msgid "My text and files remain under my own copyright."
 msgstr "Mia teksto kaj dosiero restu en mia propra aŭtorrajto."
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:520
 msgid "All rights reserved."
 msgstr "Ĉiuj rajtoj rezervitaj."
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:525
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -5136,7 +4230,6 @@ msgstr ""
 "Mia teksto kaj dosiero estas atingebla per %s  krom jene: pasvorto, "
 "retpoŝtadreso, tujmesaĝilo-adreso, kaj telefonnumero."
 
-#: actions/register.php:566
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -5168,14 +4261,12 @@ msgstr ""
 "\n"
 "Dankon pro registriĝo, kaj ni esperas al vi ĝuon de uzi ĉi servon."
 
-#: actions/register.php:590
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
 msgstr ""
 "(Vi ricevos tuj mesaĝon retpoŝtan, kun gvidon konfirmi vian retpoŝtadreson.)"
 
-#: actions/remotesubscribe.php:97
 #, php-format
 msgid ""
 "To subscribe, you can [login](%%action.login%%), or [register](%%action."
@@ -5186,111 +4277,86 @@ msgstr ""
 "%). Se vi jam havas konton ĉe iu [kongrua mikroblogilo-retejo](%%doc."
 "openmublog%%),  entajpu vian profilan URL jene."
 
-#: actions/remotesubscribe.php:111
 msgid "Remote subscribe"
 msgstr "Defore aboni"
 
-#: actions/remotesubscribe.php:123
 msgid "Subscribe to a remote user"
 msgstr "Aboni foran uzanton"
 
-#: actions/remotesubscribe.php:128
 msgid "User nickname"
 msgstr "Uzanta alinomo"
 
-#: actions/remotesubscribe.php:129
 #, fuzzy
 msgid "Nickname of the user you want to follow."
 msgstr "Alnomo de la uzanto, kiun vi volas aboni."
 
-#: actions/remotesubscribe.php:132
 msgid "Profile URL"
 msgstr "Profila URL"
 
-#: actions/remotesubscribe.php:133
 #, fuzzy
 msgid "URL of your profile on another compatible microblogging service."
 msgstr "URL de via profilo ĉe alia kongrua mikroblogilo-servo"
 
 #. TRANS: Link text for link that will subscribe to a remote profile.
-#: actions/remotesubscribe.php:136 lib/subscribeform.php:139
-#: lib/userprofile.php:402
 msgid "Subscribe"
 msgstr "Aboni"
 
-#: actions/remotesubscribe.php:158
 #, fuzzy
 msgid "Invalid profile URL (bad format)."
 msgstr "Nevalida profila URL (fuŝa formato)"
 
-#: actions/remotesubscribe.php:167
 msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
 msgstr ""
 "Ne valida profila URL (ne estas YADIS-dokumento aŭ difiniĝas nevalida XRDS)."
 
-#: actions/remotesubscribe.php:175
 #, fuzzy
 msgid "That is a local profile! Login to subscribe."
 msgstr "Tio estas loka profilo! Ensalutu por aboni."
 
-#: actions/remotesubscribe.php:182
 #, fuzzy
 msgid "Could not get a request token."
 msgstr "Malsukcesis akiri pet-ĵetonon."
 
-#: actions/repeat.php:56
 msgid "Only logged-in users can repeat notices."
 msgstr "Nur ensalutinto rajtas ripeti avizon."
 
-#: actions/repeat.php:63 actions/repeat.php:70
 msgid "No notice specified."
 msgstr "Neniu profilo specifiĝas."
 
-#: actions/repeat.php:75
 #, fuzzy
 msgid "You cannot repeat your own notice."
 msgstr "Vi ne povas ripeti vian propran avizon."
 
-#: actions/repeat.php:89
 msgid "You already repeated that notice."
 msgstr "La avizo jam ripetiĝis."
 
-#: actions/repeat.php:112 lib/noticelist.php:697
 msgid "Repeated"
 msgstr "Ripetita"
 
-#: actions/repeat.php:117
 msgid "Repeated!"
 msgstr "Ripetita!"
 
 #. TRANS: RSS reply feed title. %s is a user nickname.
-#: actions/replies.php:126 actions/repliesrss.php:68
-#: lib/personalgroupnav.php:105
 #, php-format
 msgid "Replies to %s"
 msgstr "Respondoj al %s"
 
-#: actions/replies.php:128
 #, php-format
 msgid "Replies to %1$s, page %2$d"
 msgstr "Respondoj al %1$s, paĝo %2$d"
 
-#: actions/replies.php:145
 #, php-format
 msgid "Replies feed for %s (RSS 1.0)"
 msgstr "Responda fluo al %s (RSS 1.0)"
 
-#: actions/replies.php:152
 #, php-format
 msgid "Replies feed for %s (RSS 2.0)"
 msgstr "Responda fluo al %s (RSS 2.0)"
 
-#: actions/replies.php:159
 #, php-format
 msgid "Replies feed for %s (Atom)"
 msgstr "Responda fluo al %s (Atom)"
 
-#: actions/replies.php:199
 #, php-format
 msgid ""
 "This is the timeline showing replies to %1$s but %2$s hasn't received a "
@@ -5299,7 +4365,6 @@ msgstr ""
 "Tie ĉi estus tempstrio montranta respondojn al %1$s, sed %2$s ankoraŭ "
 "ricevas neniun avizon."
 
-#: actions/replies.php:204
 #, php-format
 msgid ""
 "You can engage other users in a conversation, subscribe to more people or "
@@ -5308,7 +4373,6 @@ msgstr ""
 "Vi povas komenci interparoladon kun aliaj uzantoj, aboni pli da personoj aŭ "
 "[aniĝi al grupoj](%%action.groups%%)."
 
-#: actions/replies.php:206
 #, php-format
 msgid ""
 "You can try to [nudge %1$s](../%2$s) or [post something to them](%%%%action."
@@ -5319,39 +4383,33 @@ msgstr ""
 
 #. TRANS: RSS reply feed description.
 #. TRANS: %1$s is a user nickname, %2$s is the StatusNet site name.
-#: actions/repliesrss.php:74
 #, fuzzy, php-format
 msgid "Replies to %1$s on %2$s."
 msgstr "Respondoj al %1$s ĉe %2$s!"
 
 #. TRANS: Client exception displayed when trying to restore an account while not logged in.
-#: actions/restoreaccount.php:78
 #, fuzzy
 msgid "Only logged-in users can restore their account."
 msgstr "Nur ensalutinto rajtas ripeti avizon."
 
 #. TRANS: Client exception displayed when trying to restore an account without having restore rights.
-#: actions/restoreaccount.php:83
 #, fuzzy
 msgid "You may not restore your account."
 msgstr "Vi ankoraŭ neniun aplikaĵon registris."
 
 #. TRANS: Client exception displayed trying to restore an account while something went wrong uploading a file.
 #. TRANS: Client exception. No file; probably just a non-AJAX submission.
-#: actions/restoreaccount.php:121 actions/restoreaccount.php:146
 #, fuzzy
 msgid "No uploaded file."
 msgstr "Alŝuti dosieron"
 
 #. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
-#: actions/restoreaccount.php:129 lib/mediafile.php:194
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
 msgstr ""
 "Alŝutata dosiero superas la dosierujon upload_max_filesize (alŝuta "
 "grandlimo) en php.ini."
 
 #. TRANS: Client exception.
-#: actions/restoreaccount.php:135 lib/mediafile.php:200
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form."
@@ -5360,145 +4418,117 @@ msgstr ""
 "difinitan per HTML formo."
 
 #. TRANS: Client exception.
-#: actions/restoreaccount.php:141 lib/mediafile.php:206
 msgid "The uploaded file was only partially uploaded."
 msgstr "Alŝutata dosiero venas nur parte."
 
 #. TRANS: Client exception thrown when a temporary folder is not present to store a file upload.
-#: actions/restoreaccount.php:150 lib/mediafile.php:214
 msgid "Missing a temporary folder."
 msgstr "Mankas labora dosierujo."
 
 #. TRANS: Client exception thrown when writing to disk is not possible during a file upload operation.
-#: actions/restoreaccount.php:154 lib/mediafile.php:218
 msgid "Failed to write file to disk."
 msgstr "Malsukcesis skribi dosieron al disko."
 
 #. TRANS: Client exception thrown when a file upload operation has been stopped by an extension.
-#: actions/restoreaccount.php:158 lib/mediafile.php:222
 msgid "File upload stopped by extension."
 msgstr ""
 
 #. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
 #. TRANS: Exception thrown when uploading an image fails for an unknown reason.
 #. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
-#: actions/restoreaccount.php:164 lib/imagefile.php:106 lib/mediafile.php:228
 msgid "System error uploading file."
 msgstr "Sisteme eraris alŝuti dosieron."
 
 #. TRANS: Client exception thrown when a feed is not an Atom feed.
-#: actions/restoreaccount.php:207
 #, fuzzy
 msgid "Not an Atom feed."
 msgstr "Ĉiuj grupanoj"
 
 #. TRANS: Success message when a feed has been restored.
-#: actions/restoreaccount.php:241
 msgid ""
 "Feed has been restored. Your old posts should now appear in search and your "
 "profile page."
 msgstr ""
 
 #. TRANS: Message when a feed restore is in progress.
-#: actions/restoreaccount.php:245
 msgid "Feed will be restored. Please wait a few minutes for results."
 msgstr ""
 
 #. TRANS: Form instructions for feed restore.
-#: actions/restoreaccount.php:342
 msgid ""
 "You can upload a backed-up stream in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format."
 msgstr ""
 
 #. TRANS: Title for submit button to confirm upload of a user backup file for account restore.
-#: actions/restoreaccount.php:373
 #, fuzzy
 msgid "Upload the file"
 msgstr "Alŝuti dosieron"
 
-#: actions/revokerole.php:75
 msgid "You cannot revoke user roles on this site."
 msgstr "Vi ne rajtas revoki de uzanto rolon ĉe ĉi tiu retejo."
 
-#: actions/revokerole.php:82
 msgid "User doesn't have this role."
 msgstr "La uzanto ne havas la rolon."
 
-#: actions/rsd.php:142 actions/version.php:159
 msgid "StatusNet"
 msgstr "StatusNet"
 
-#: actions/sandbox.php:65 actions/unsandbox.php:65
 msgid "You cannot sandbox users on this site."
 msgstr "Vi ne rajtas provejigi uzantojn ĉe tiu ĉi retejo."
 
-#: actions/sandbox.php:72
 msgid "User is already sandboxed."
 msgstr "La uzanto jam provejiĝis."
 
 #. TRANS: Menu item for site administration
-#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
-#: lib/adminpanelaction.php:379
 msgid "Sessions"
 msgstr "Seancoj"
 
-#: actions/sessionsadminpanel.php:65
 msgid "Session settings for this StatusNet site"
 msgstr ""
 
-#: actions/sessionsadminpanel.php:175
 msgid "Handle sessions"
 msgstr "Trakti seancojn"
 
-#: actions/sessionsadminpanel.php:177
 msgid "Whether to handle sessions ourselves."
 msgstr "Ĉu traktu seancojn ni mem."
 
-#: actions/sessionsadminpanel.php:181
 msgid "Session debugging"
 msgstr "Seanca sencimigado"
 
-#: actions/sessionsadminpanel.php:183
 msgid "Turn on debugging output for sessions."
 msgstr "Ŝalti sencimigadan eligon por seanco."
 
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
+#. TRANS: Submit button title.
+msgid "Save"
+msgstr "Konservi"
+
 msgid "Save site settings"
 msgstr "Konservi retejan agordon"
 
-#: actions/showapplication.php:78
 msgid "You must be logged in to view an application."
 msgstr "Ensalutu por vidi la aplikaĵon."
 
-#: actions/showapplication.php:151
 msgid "Application profile"
 msgstr "Aplikaĵa profilo"
 
-#: actions/showapplication.php:179
 #, php-format
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr "Kreita de %1$s - %2$s defaŭlta aliroj  - %3$d uzantoj"
 
-#: actions/showapplication.php:189
 msgid "Application actions"
 msgstr "Aplikaĵa ago"
 
-#: actions/showapplication.php:212
 msgid "Reset key & secret"
 msgstr "Rekomencigi ŝlosilon & sekreton"
 
 #. TRANS: Title of form for deleting a user.
-#: actions/showapplication.php:228 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:64 lib/noticelist.php:678
 msgid "Delete"
 msgstr "Forigi"
 
-#: actions/showapplication.php:237
 msgid "Application info"
 msgstr "Aplikaĵa informo"
 
-#: actions/showapplication.php:255
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
@@ -5506,42 +4536,35 @@ msgstr ""
 "Rimarku: Ni subtenas HMAC-SHA1-subskribo. Ni ne subtenas platteksta "
 "subskribado-metodon."
 
-#: actions/showapplication.php:275
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr "Ĉu vi certe volas rekomencigi vian konsumantan ŝlosilon kaj sekreton?"
 
 #. TRANS: Title for all but the first page of favourite notices of a user.
 #. TRANS: %1$s is the user for whom the favourite notices are displayed, %2$d is the page number.
-#: actions/showfavorites.php:80
 #, php-format
 msgid "%1$s's favorite notices, page %2$d"
 msgstr "Ŝatataj avizoj de %s, paĝo %2$d"
 
 #. TRANS: Server error displayed when favourite notices could not be retrieved from the database.
-#: actions/showfavorites.php:134
 msgid "Could not retrieve favorite notices."
 msgstr "Malsukcesis ricevi ŝataton."
 
 #. TRANS: Feed link text. %s is a username.
-#: actions/showfavorites.php:172
 #, php-format
 msgid "Feed for favorites of %s (RSS 1.0)"
 msgstr "Fluo pri ŝatato de %s (RSS 1.0)"
 
 #. TRANS: Feed link text. %s is a username.
-#: actions/showfavorites.php:180
 #, php-format
 msgid "Feed for favorites of %s (RSS 2.0)"
 msgstr "Fluo pri ŝatato de %s (RSS 2.0)"
 
 #. TRANS: Feed link text. %s is a username.
-#: actions/showfavorites.php:188
 #, php-format
 msgid "Feed for favorites of %s (Atom)"
 msgstr "Fluo pri ŝatato de %s (Atom)"
 
 #. TRANS: Text displayed instead of favourite notices for the current logged in user that has no favourites.
-#: actions/showfavorites.php:209
 msgid ""
 "You haven't chosen any favorite notices yet. Click the fave button on "
 "notices you like to bookmark them for later or shed a spotlight on them."
@@ -5551,7 +4574,6 @@ msgstr ""
 
 #. TRANS: Text displayed instead of favourite notices for a user that has no favourites while logged in.
 #. TRANS: %s is a username.
-#: actions/showfavorites.php:213
 #, php-format
 msgid ""
 "%s hasn't added any favorite notices yet. Post something interesting they "
@@ -5562,7 +4584,6 @@ msgstr ""
 #. TRANS: Text displayed instead of favourite notices for a user that has no favourites while not logged in.
 #. TRANS: %s is a username, %%%%action.register%%%% is a link to the user registration page.
 #. TRANS: (link text)[link] is a Mark Down link.
-#: actions/showfavorites.php:220
 #, php-format
 msgid ""
 "%s hasn't added any favorite notices yet. Why not [register an account](%%%%"
@@ -5573,64 +4594,53 @@ msgstr ""
 "action.register%%%%) kaj sendi ion, kion ili ŝatos. :)"
 
 #. TRANS: Page notice for show favourites page.
-#: actions/showfavorites.php:251
 msgid "This is a way to share what you like."
 msgstr "Tiel vi povas diskonigi vian ŝataton."
 
 #. TRANS: Page title for first group page. %s is a group name.
-#: actions/showgroup.php:75
 #, php-format
 msgid "%s group"
 msgstr "Grupo %s"
 
 #. TRANS: Page title for any but first group page.
 #. TRANS: %1$s is a group name, $2$s is a page number.
-#: actions/showgroup.php:79
 #, php-format
 msgid "%1$s group, page %2$d"
 msgstr "Grupo %1$s, paĝo %2$d"
 
 #. TRANS: Label for group description or group note (dt). Text hidden by default.
-#: actions/showgroup.php:266
 msgid "Note"
 msgstr "Noto"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:277 lib/groupeditform.php:180
 msgid "Aliases"
 msgstr "Alnomo"
 
 #. TRANS: Group actions header (h2). Text hidden by default.
-#: actions/showgroup.php:294
 msgid "Group actions"
 msgstr "Grupaj agoj"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:338
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
 msgstr "Avizofluo de grupo %s (RSS 1.0)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:345
 #, php-format
 msgid "Notice feed for %s group (RSS 2.0)"
 msgstr "Avizofluo de grupo %s (RSS 2.0)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:352
 #, php-format
 msgid "Notice feed for %s group (Atom)"
 msgstr "Avizofluo de grupo %s (Atom)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:358
 #, php-format
 msgid "FOAF for %s group"
 msgstr "Foramiko de grupo %s"
 
 #. TRANS: Header for mini list of group members on a group page (h2).
-#: actions/showgroup.php:395
 msgid "Members"
 msgstr "Grupanoj"
 
@@ -5638,31 +4648,24 @@ msgstr "Grupanoj"
 #. TRANS: Text for user subscription statistics if the user has no subscriptions.
 #. TRANS: Text for user subscriber statistics if user has no subscribers.
 #. TRANS: Text for user user group membership statistics if user is not a member of any group.
-#: actions/showgroup.php:401 lib/profileaction.php:137
-#: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
-#: lib/subscriptionlist.php:123 lib/tagcloudsection.php:71
 msgid "(None)"
 msgstr "(nenio)"
 
 #. TRANS: Link to all group members from mini list of group members if group has more than n members.
-#: actions/showgroup.php:410
 msgid "All members"
 msgstr "Ĉiuj grupanoj"
 
 #. TRANS: Header for group statistics on a group page (h2).
 #. TRANS: H2 text for user statistics.
-#: actions/showgroup.php:441 lib/profileaction.php:205
 msgid "Statistics"
 msgstr "Statistiko"
 
-#: actions/showgroup.php:444
 #, fuzzy
 msgctxt "LABEL"
 msgid "Created"
 msgstr "Kreita"
 
 #. TRANS: Label for member count in statistics on group page.
-#: actions/showgroup.php:449
 #, fuzzy
 msgctxt "LABEL"
 msgid "Members"
@@ -5672,7 +4675,6 @@ msgstr "Grupanoj"
 #. TRANS: **%s** is the group alias, %%%%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).
-#: actions/showgroup.php:464
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5689,7 +4691,6 @@ 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: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
-#: actions/showgroup.php:474
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5703,99 +4704,83 @@ msgstr ""
 "siaj vivoj kaj ŝatokupoj. "
 
 #. TRANS: Header for list of group administrators on a group page (h2).
-#: actions/showgroup.php:503
 msgid "Admins"
 msgstr "Administrantoj"
 
 #. TRANS: Client error displayed requesting a single message that does not exist.
-#: actions/showmessage.php:76
 msgid "No such message."
 msgstr "Ne estas tiu mesaĝo."
 
 #. TRANS: Client error displayed requesting a single direct message the requesting user was not a party in.
-#: actions/showmessage.php:86
 msgid "Only the sender and recipient may read this message."
 msgstr "Nur la sendinto kaj ricevinto rajtas legi la mesaĝon."
 
 #. TRANS: Page title for single direct message display when viewing user is the sender.
 #. TRANS: %1$s is the addressed user's nickname, $2$s is a timestamp.
-#: actions/showmessage.php:105
 #, php-format
 msgid "Message to %1$s on %2$s"
 msgstr "Mesaĝo al %1$s ĉe %2$s"
 
 #. TRANS: Page title for single message display.
 #. TRANS: %1$s is the sending user's nickname, $2$s is a timestamp.
-#: actions/showmessage.php:113
 #, php-format
 msgid "Message from %1$s on %2$s"
 msgstr "Mesaĝo de %1$s ĉe %2$s"
 
-#: actions/shownotice.php:90
 msgid "Notice deleted."
 msgstr "Avizo viŝiĝas"
 
 #. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
-#: actions/showstream.php:70
 #, fuzzy, php-format
 msgid "%1$s tagged %2$s"
 msgstr "%1$s, paĝo %2$d"
 
 #. TRANS: Page title showing tagged notices in one user's stream.
 #. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
-#: actions/showstream.php:74
 #, fuzzy, php-format
 msgid "%1$s tagged %2$s, page %3$d"
 msgstr "Avizoj etikeditaj per %1$s - paĝo %2$d"
 
 #. TRANS: Extended page title showing tagged notices in one user's stream.
 #. TRANS: %1$s is the username, %2$d is the page number.
-#: actions/showstream.php:82
 #, php-format
 msgid "%1$s, page %2$d"
 msgstr "%1$s, paĝo %2$d"
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %1$s is a user nickname, %2$s is a hashtag.
-#: actions/showstream.php:127
 #, php-format
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
 msgstr "Avizofluo pri %1$s etikedigita %2$s (RSS 1.0)"
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.
-#: actions/showstream.php:136
 #, php-format
 msgid "Notice feed for %s (RSS 1.0)"
 msgstr "Avizofluo pri %1$s (RSS 1.0)"
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.
-#: actions/showstream.php:145
 #, php-format
 msgid "Notice feed for %s (RSS 2.0)"
 msgstr "Avizofluo pri %1$s (RSS 2.0)"
 
-#: actions/showstream.php:152
 #, php-format
 msgid "Notice feed for %s (Atom)"
 msgstr "Avizofluo pri %1$s  (Atom)"
 
 #. TRANS: Title for link to notice feed. FOAF stands for Friend of a Friend.
 #. TRANS: More information at http://www.foaf-project.org. %s is a user nickname.
-#: actions/showstream.php:159
 #, php-format
 msgid "FOAF for %s"
 msgstr "Foramiko de  %s"
 
 #. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
-#: actions/showstream.php:205
 #, fuzzy, php-format
 msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr "Tie ĉi estus tempstrio de %1$s sed %2$s ankoraŭ afiŝis nenion."
 
 #. TRANS: Second sentence of empty list message for a stream for the user themselves.
-#: actions/showstream.php:211
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
@@ -5804,7 +4789,6 @@ msgstr ""
 
 #. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:215
 #, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
@@ -5815,7 +4799,6 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:258
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5830,7 +4813,6 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:265
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5842,221 +4824,174 @@ msgstr ""
 "(http://status.net/). "
 
 #. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
-#: actions/showstream.php:322
 #, php-format
 msgid "Repeat of %s"
 msgstr "Ripeto de %s"
 
-#: actions/silence.php:65 actions/unsilence.php:65
 msgid "You cannot silence users on this site."
 msgstr "Vi ne rajtas silentigi uzanton ĉe ĉi tiu retejo."
 
-#: actions/silence.php:72
 msgid "User is already silenced."
 msgstr "La uzanto jam silentiĝas."
 
-#: actions/siteadminpanel.php:69
 msgid "Basic settings for this StatusNet site"
 msgstr "Baza agordo por ĉi tiu StatusNet-retejo."
 
-#: actions/siteadminpanel.php:133
 msgid "Site name must have non-zero length."
 msgstr "La sita nomo devas pli ol nula longeco"
 
-#: actions/siteadminpanel.php:141
 msgid "You must have a valid contact email address."
 msgstr "Vi devas havi validan kontakteblan retpoŝtadreson"
 
-#: actions/siteadminpanel.php:159
 #, php-format
 msgid "Unknown language \"%s\"."
 msgstr "Nekonata lingvo \"%s\"."
 
-#: actions/siteadminpanel.php:165
 msgid "Minimum text limit is 0 (unlimited)."
 msgstr "Teksto estu almenaŭ 0 literojn (senlime)."
 
-#: actions/siteadminpanel.php:171
 msgid "Dupe limit must be one or more seconds."
 msgstr "Refoja limo estu almenaŭ unu sekundo."
 
-#: actions/siteadminpanel.php:221
 msgid "General"
 msgstr "Ĝenerala"
 
-#: actions/siteadminpanel.php:224
 msgid "Site name"
 msgstr "Nomo de retejo"
 
-#: actions/siteadminpanel.php:225
 msgid "The name of your site, like \"Yourcompany Microblog\""
 msgstr "Nomo de via retejo, ekzemple \"Viafirmo Mikroblogo\""
 
-#: actions/siteadminpanel.php:229
 msgid "Brought by"
 msgstr "Eblige de"
 
-#: actions/siteadminpanel.php:230
 msgid "Text used for credits link in footer of each page"
 msgstr "Teksto por dankado-ligilo je subo por ĉiu paĝo"
 
-#: actions/siteadminpanel.php:234
 msgid "Brought by URL"
 msgstr "Alportita de URL"
 
-#: actions/siteadminpanel.php:235
 msgid "URL used for credits link in footer of each page"
 msgstr "URL por danko-ligilo je subaĵo sur ĉiu paĝo"
 
-#: actions/siteadminpanel.php:239
 msgid "Contact email address for your site"
 msgstr "Kontakta retpoŝtadreso por via retejo"
 
-#: actions/siteadminpanel.php:245
 msgid "Local"
 msgstr "Loka"
 
-#: actions/siteadminpanel.php:256
 msgid "Default timezone"
 msgstr "Defaŭlta horzono"
 
-#: actions/siteadminpanel.php:257
 msgid "Default timezone for the site; usually UTC."
 msgstr "Defaŭlta horzono de la retejo; kutime UTC."
 
-#: actions/siteadminpanel.php:262
 msgid "Default language"
 msgstr "Defaŭlta lingvo"
 
-#: actions/siteadminpanel.php:263
 msgid "Site language when autodetection from browser settings is not available"
 msgstr "Reteja lingvo por kiam lingva prefero ne troviĝas el la foliumilo"
 
-#: actions/siteadminpanel.php:271
 msgid "Limits"
 msgstr "Limoj"
 
-#: actions/siteadminpanel.php:274
 msgid "Text limit"
 msgstr "Teksta longlimo"
 
-#: actions/siteadminpanel.php:274
 msgid "Maximum number of characters for notices."
 msgstr "Longlimo por afiŝoj."
 
-#: actions/siteadminpanel.php:278
 msgid "Dupe limit"
 msgstr "Refoja limo"
 
-#: actions/siteadminpanel.php:278
 msgid "How long users must wait (in seconds) to post the same thing again."
 msgstr ""
 "Kiel longe devas uzantoj atendas (je sekundo) antaŭ afiŝi la saman refejo."
 
 #. TRANS: Page title for site-wide notice tab in admin panel.
-#: actions/sitenoticeadminpanel.php:55
 msgid "Site Notice"
 msgstr "Reteja Anonco"
 
 #. TRANS: Instructions for site-wide notice tab in admin panel.
-#: actions/sitenoticeadminpanel.php:66
 msgid "Edit site-wide message"
 msgstr "Redakti retejan mesaĝon"
 
 #. TRANS: Server error displayed when saving a site-wide notice was impossible.
-#: actions/sitenoticeadminpanel.php:101
 msgid "Unable to save site notice."
 msgstr "Malsukcesis konservi retejan anoncon."
 
 #. TRANS: Client error displayed when a site-wide notice was longer than allowed.
-#: actions/sitenoticeadminpanel.php:112
 #, fuzzy
 msgid "Maximum length for the site-wide notice is 255 characters."
 msgstr "Longlimo por reteja anonco estas 255 literoj."
 
 #. TRANS: Label for site-wide notice text field in admin panel.
-#: actions/sitenoticeadminpanel.php:176
 msgid "Site notice text"
 msgstr "Teksto de reteja anonco."
 
 #. TRANS: Tooltip for site-wide notice text field in admin panel.
-#: actions/sitenoticeadminpanel.php:179
 #, fuzzy
 msgid "Site-wide notice text (255 characters maximum; HTML allowed)"
 msgstr "Teksto de reteja anonco (apenaŭ 255 literoj; HTML eblas)"
 
 #. TRANS: Title for button to save site notice in admin panel.
-#: actions/sitenoticeadminpanel.php:201
 #, fuzzy
 msgid "Save site notice."
 msgstr "Konservi retejan agordon"
 
 #. TRANS: Title for SMS settings.
-#: actions/smssettings.php:56
 msgid "SMS settings"
 msgstr "SMM-a agordo"
 
 #. TRANS: SMS settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/smssettings.php:70
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr "Vi povos ricevi SMM-mesaĝon per retpoŝto de %%site.name%%."
 
 #. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
-#: actions/smssettings.php:92
 msgid "SMS is not available."
 msgstr "SMM ne estas disponebla."
 
 #. TRANS: Form legend for SMS settings form.
-#: actions/smssettings.php:106
 msgid "SMS address"
 msgstr "SMM-a adreso"
 
 #. TRANS: Form guide in SMS settings form.
-#: actions/smssettings.php:115
 msgid "Current confirmed SMS-enabled phone number."
 msgstr "Nuna konfirmita SMM-pova telefonnumero"
 
 #. TRANS: Form guide in IM settings form.
-#: actions/smssettings.php:128
 msgid "Awaiting confirmation on this phone number."
 msgstr "Atendante konfirmon por la telefonnumero."
 
 #. TRANS: Field label for SMS address input in SMS settings form.
-#: actions/smssettings.php:137
 msgid "Confirmation code"
 msgstr "Konfirma kodo."
 
 #. TRANS: Form field instructions in SMS settings form.
-#: actions/smssettings.php:139
 msgid "Enter the code you received on your phone."
 msgstr "Entajpu la kodon, kiu vi ricevis per poŝtelefono."
 
 #. TRANS: Button label to confirm SMS confirmation code in SMS settings.
-#: actions/smssettings.php:143
 msgctxt "BUTTON"
 msgid "Confirm"
 msgstr "Konfirmi"
 
 #. TRANS: Field label for SMS phone number input in SMS settings form.
-#: actions/smssettings.php:148
 msgid "SMS phone number"
 msgstr "SMM-a telefonnumero"
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
-#: actions/smssettings.php:151
 #, fuzzy
 msgid "Phone number, no punctuation or spaces, with area code."
 msgstr "Telefonnumero, sen interpunkcio aŭ spacoj, kun loka kodo"
 
 #. TRANS: Form legend for SMS preferences form.
-#: actions/smssettings.php:190
 msgid "SMS preferences"
 msgstr "SMM-aj preferoj"
 
 #. TRANS: Checkbox label in SMS preferences form.
-#: actions/smssettings.php:196
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
@@ -6065,32 +5000,26 @@ msgstr ""
 "peranto."
 
 #. TRANS: Confirmation message for successful SMS preferences save.
-#: actions/smssettings.php:307
 msgid "SMS preferences saved."
 msgstr "SMM-prefero konserviĝas."
 
 #. TRANS: Message given saving SMS phone number without having provided one.
-#: actions/smssettings.php:329
 msgid "No phone number."
 msgstr "Mankas la telefononumero."
 
 #. TRANS: Message given saving SMS phone number without having selected a carrier.
-#: actions/smssettings.php:335
 msgid "No carrier selected."
 msgstr "Neniu peranto elektiĝas."
 
 #. TRANS: Message given saving SMS phone number that is already set.
-#: actions/smssettings.php:343
 msgid "That is already your phone number."
 msgstr "Tio estas jam via telefonnumero."
 
 #. TRANS: Message given saving SMS phone number that is already set for another user.
-#: actions/smssettings.php:347
 msgid "That phone number already belongs to another user."
 msgstr "Tiu telefonnumero jam apartenas al alia uzanto."
 
 #. TRANS: Message given saving valid SMS phone number that is to be confirmed.
-#: actions/smssettings.php:375
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
 "for the code and instructions on how to use it."
@@ -6099,39 +5028,32 @@ msgstr ""
 "poŝtelefonon pri la kodo kaj gvido pri kiel uzi ĝin."
 
 #. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
-#: actions/smssettings.php:403
 msgid "That is the wrong confirmation number."
 msgstr "Tiu konfirma kodo estas malĝusta."
 
 #. TRANS: Message given after successfully canceling SMS phone number confirmation.
-#: actions/smssettings.php:417
 msgid "SMS confirmation cancelled."
 msgstr "SMM-a konfirmo nuliĝas."
 
 #. TRANS: Message given trying to remove an SMS phone number that is not
 #. TRANS: registered for the active user.
-#: actions/smssettings.php:437
 msgid "That is not your phone number."
 msgstr "Tio ne estas via telefonnumero."
 
 #. TRANS: Message given after successfully removing a registered SMS phone number.
-#: actions/smssettings.php:459
 msgid "The SMS phone number was removed."
 msgstr "La SMM-numreo estas forigita."
 
 #. TRANS: Label for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:498
 msgid "Mobile carrier"
 msgstr "Poŝtelefona peranto"
 
 #. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:503
 msgid "Select a carrier"
 msgstr "Elektu peranton"
 
 #. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
 #. TRANS: %s is an administrative contact's e-mail address.
-#: actions/smssettings.php:512
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -6141,119 +5063,94 @@ msgstr ""
 "per retpoŝto sed ne listiĝas tie ĉi, sendu mesaĝon al ni sciigi, je %s."
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
-#: actions/smssettings.php:534
 #, fuzzy
 msgid "No code entered."
 msgstr "Neniu kodo entajpita"
 
 #. TRANS: Menu item for site administration
-#: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
-#: lib/adminpanelaction.php:395
 msgid "Snapshots"
 msgstr "Momentfotoj"
 
-#: actions/snapshotadminpanel.php:65
 msgid "Manage snapshot configuration"
 msgstr "Administri agordon pri momentfoto"
 
-#: actions/snapshotadminpanel.php:127
 msgid "Invalid snapshot run value."
 msgstr "Momentfota ofteco nevalida."
 
-#: actions/snapshotadminpanel.php:133
 msgid "Snapshot frequency must be a number."
 msgstr "Momentfota ofteco estu nombro."
 
-#: actions/snapshotadminpanel.php:144
 msgid "Invalid snapshot report URL."
 msgstr "Momentfota alraporta URL nevalida."
 
-#: actions/snapshotadminpanel.php:200
 msgid "Randomly during web hit"
 msgstr "Harzarde dum ret-alklako."
 
-#: actions/snapshotadminpanel.php:201
 msgid "In a scheduled job"
 msgstr "Laŭplane"
 
-#: actions/snapshotadminpanel.php:206
 msgid "Data snapshots"
 msgstr "Datumaj momentfotoj"
 
-#: actions/snapshotadminpanel.php:208
 msgid "When to send statistical data to status.net servers"
 msgstr "Kiam sendu statistikan datumon al status.net serviloj"
 
-#: actions/snapshotadminpanel.php:217
 msgid "Frequency"
 msgstr "Ofteco"
 
-#: actions/snapshotadminpanel.php:218
 msgid "Snapshots will be sent once every N web hits"
 msgstr "Momentfotoj sendiĝos post po N alklakoj"
 
-#: actions/snapshotadminpanel.php:226
 msgid "Report URL"
 msgstr "Alraporta URL"
 
-#: actions/snapshotadminpanel.php:227
 msgid "Snapshots will be sent to this URL"
 msgstr "Momentfotoj sendiĝos al ĉi tiu URL"
 
-#: actions/snapshotadminpanel.php:248
 msgid "Save snapshot settings"
 msgstr "Konservi retejan agordon"
 
 #. TRANS: Client error displayed trying a change a subscription for a non-subscribed profile.
-#: actions/subedit.php:75
 msgid "You are not subscribed to that profile."
 msgstr "Vi ne abonis tiun profilon."
 
 #. TRANS: Server error displayed when updating a subscription fails with a database error.
 #. TRANS: Exception thrown when a subscription could not be stored on the server.
-#: actions/subedit.php:89 classes/Subscription.php:141
 msgid "Could not save subscription."
 msgstr "Malsukcesis konservi abonon."
 
 #. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
-#: actions/subscribe.php:121
 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
 msgstr "Vi ne povas aboni foran  OMB 0.1-an profilon per ĉi tiu ago."
 
 #. TRANS: Page title when subscription succeeded.
-#: actions/subscribe.php:149
 msgid "Subscribed"
 msgstr "Abonita"
 
 #. TRANS: Header for list of subscribers for a user (first page).
 #. TRANS: %s is the user's nickname.
-#: actions/subscribers.php:51
 #, php-format
 msgid "%s subscribers"
 msgstr "%s abonantoj"
 
 #. TRANS: Header for list of subscribers for a user (not first page).
 #. TRANS: %1$s is the user's nickname, $2$d is the page number.
-#: actions/subscribers.php:55
 #, php-format
 msgid "%1$s subscribers, page %2$d"
 msgstr "%1$s abonantoj, paĝo %2$d"
 
 #. TRANS: Page notice for page with an overview of all subscribers
 #. TRANS: of the logged in user's own profile.
-#: actions/subscribers.php:68
 msgid "These are the people who listen to your notices."
 msgstr "Jen homoj, kiuj rigardas viajn avizojn."
 
 #. TRANS: Page notice for page with an overview of all subscribers of a user other
 #. TRANS: than the logged in user. %s is the user nickname.
-#: actions/subscribers.php:74
 #, php-format
 msgid "These are the people who listen to %s's notices."
 msgstr "Jen homoj, kiuj rigardas avizojn de %s."
 
 #. TRANS: Subscriber list text when the logged in user has no subscribers.
-#: actions/subscribers.php:114
 #, fuzzy
 msgid ""
 "You have no subscribers. Try subscribing to people you know and they might "
@@ -6262,7 +5159,6 @@ msgstr "Vi ne havas abonanton. Provu aboni konatojn, kaj ili eble reaboni vin"
 
 #. TRANS: Subscriber list text when looking at the subscribers for a of a user other
 #. TRANS: than the logged in user that has no subscribers. %s is the user nickname.
-#: actions/subscribers.php:118
 #, php-format
 msgid "%s has no subscribers. Want to be the first?"
 msgstr "%s ne havas abonantojn. Ĉu vi volas esti la unua?"
@@ -6272,7 +5168,6 @@ msgstr "%s ne havas abonantojn. Ĉu vi volas esti la unua?"
 #. TRANS: This message contains a Markdown URL. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.
-#: actions/subscribers.php:127
 #, php-format
 msgid ""
 "%s has no subscribers. Why not [register an account](%%%%action.register%%%"
@@ -6283,20 +5178,17 @@ msgstr ""
 
 #. TRANS: Header for subscriptions overview for a user (not first page).
 #. TRANS: %1$s is a user nickname, %2$d is the page number.
-#: actions/subscriptions.php:55
 #, php-format
 msgid "%1$s subscriptions, page %2$d"
 msgstr "%1$s abonatoj, paĝo %2$d"
 
 #. TRANS: Page notice for page with an overview of all subscriptions
 #. TRANS: of the logged in user's own profile.
-#: actions/subscriptions.php:68
 msgid "These are the people whose notices you listen to."
 msgstr "Jen homoj, kies avizoj rigardas vi."
 
 #. TRANS: Page notice for page with an overview of all subscriptions of a user other
 #. TRANS: than the logged in user. %s is the user nickname.
-#: actions/subscriptions.php:74
 #, php-format
 msgid "These are the people whose notices %s listens to."
 msgstr "Jen homoj, kies avizoj %s rigardas."
@@ -6305,7 +5197,6 @@ 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.
-#: actions/subscriptions.php:133
 #, php-format
 msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "
@@ -6323,69 +5214,55 @@ msgstr ""
 #. TRANS: than the logged in user that has no subscriptions. %s is the user nickname.
 #. TRANS: Subscription list text when looking at the subscriptions for a of a user that has none
 #. TRANS: as an anonymous user. %s is the user nickname.
-#: actions/subscriptions.php:141 actions/subscriptions.php:147
 #, php-format
 msgid "%s is not listening to anyone."
 msgstr "%s ne abonas iun ajn."
 
 #. TRANS: Atom feed title. %s is a profile nickname.
-#: actions/subscriptions.php:176
 #, fuzzy, php-format
 msgid "Subscription feed for %s (Atom)"
 msgstr "Avizofluo pri %1$s  (Atom)"
 
 #. TRANS: Checkbox label for enabling Jabber messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:241 lib/settingsnav.php:110
-#, fuzzy
 msgid "IM"
 msgstr "Tujmesaĝilo"
 
 #. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:256 lib/settingsnav.php:117
 msgid "SMS"
 msgstr "SMS"
 
 #. TRANS: Title for all but the first page of notices with tags.
 #. TRANS: %1$s is the tag, %2$d is the page number.
-#: actions/tag.php:73
 #, php-format
 msgid "Notices tagged with %1$s, page %2$d"
 msgstr "Avizoj etikeditaj per %1$s - paĝo %2$d"
 
-#: actions/tag.php:91
 #, php-format
 msgid "Notice feed for tag %s (RSS 1.0)"
 msgstr "Avizofluo pri etikedo %s (RSS 1.0)"
 
-#: actions/tag.php:97
 #, php-format
 msgid "Notice feed for tag %s (RSS 2.0)"
 msgstr "Avizofluo pri etikedo %s (RSS 2.0)"
 
-#: actions/tag.php:103
 #, php-format
 msgid "Notice feed for tag %s (Atom)"
 msgstr "Avizofluo pri etikedo %s (Atom)"
 
-#: actions/tagother.php:39
 msgid "No ID argument."
 msgstr "Neniu ID-argumento"
 
-#: actions/tagother.php:65
 #, php-format
 msgid "Tag %s"
 msgstr "Etikedo %s"
 
 #. TRANS: H2 for user profile information.
-#: actions/tagother.php:77 lib/userprofile.php:76
 msgid "User profile"
 msgstr "Uzanta profilo"
 
-#: actions/tagother.php:120
 msgid "Tag user"
 msgstr "Etikedi uzanton"
 
-#: actions/tagother.php:130
 msgid ""
 "Tags for this user (letters, numbers, -, ., and _), comma- or space- "
 "separated"
@@ -6393,222 +5270,177 @@ msgstr ""
 "Etikedoj por ĉi tiuj uzanto (literoj, ciferoj, -, . Kaj _), apartigu per "
 "komo aŭ spaco."
 
-#: actions/tagother.php:157
 #, php-format
 msgid "Invalid tag: \"%s\""
 msgstr "Nevalida markilo: \"%s\""
 
-#: actions/tagother.php:172
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr "Vi rajtas entikedi nur abonanton aŭ abonaton."
 
-#: actions/tagother.php:215
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr "Uzu ĉi tiun formularon por etikedi viajn abonantojn aŭ abonatojn."
 
-#: actions/tagrss.php:35
 msgid "No such tag."
 msgstr "Ne estas tiu etikedo."
 
 #. TRANS: Client error displayed when trying to unblock a non-blocked user.
-#: actions/unblock.php:59
 msgid "You haven't blocked that user."
 msgstr "Vi ne jam blokis la uzanton."
 
-#: actions/unsandbox.php:72
 msgid "User is not sandboxed."
 msgstr "La uzanto ne estas provejigita."
 
-#: actions/unsilence.php:72
 msgid "User is not silenced."
 msgstr "Uzanto ne estas silentigita."
 
-#: actions/unsubscribe.php:77
 msgid "No profile ID in request."
 msgstr "Neniu profila ID petiĝas."
 
-#: actions/unsubscribe.php:98
 msgid "Unsubscribed"
 msgstr "Malabonita"
 
-#: actions/updateprofile.php:64
 #, php-format
 msgid ""
 "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
 msgstr ""
 "Rigardato-flua permesilo \"%1$s\" ne konformas al reteja permesilo \"%2$s\"."
 
-#: actions/urlsettings.php:60
 #, fuzzy
 msgid "URL settings"
 msgstr "Tujmesaĝila agordo."
 
 #. TRANS: Instructions for tab "Other" in user profile settings.
-#: actions/urlsettings.php:72
 msgid "Manage various other options."
 msgstr "Agordi diversajn aliajn elektojn."
 
 #. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
 #. TRANS: user's profile settings. This message has one space at the beginning. Use your
 #. TRANS: language's word separator here if it has one (most likely a single space).
-#: actions/urlsettings.php:115
 msgid " (free service)"
 msgstr " (libera servo)"
 
-#: actions/urlsettings.php:121
 #, fuzzy
 msgid "[none]"
 msgstr "Nenio"
 
-#: actions/urlsettings.php:122
 msgid "[internal]"
 msgstr ""
 
 #. TRANS: Label for dropdown with URL shortener services.
-#: actions/urlsettings.php:130
 msgid "Shorten URLs with"
 msgstr "Mallongigu URLojn per"
 
 #. TRANS: Tooltip for for dropdown with URL shortener services.
-#: actions/urlsettings.php:132
 msgid "Automatic shortening service to use."
 msgstr "Uzota aŭtomata mallongigad-servo."
 
-#: actions/urlsettings.php:138
 msgid "URL longer than"
 msgstr ""
 
-#: actions/urlsettings.php:141
 msgid "URLs longer than this will be shortened, 0 means always shorten."
 msgstr ""
 
-#: actions/urlsettings.php:145
 msgid "Text longer than"
 msgstr ""
 
-#: actions/urlsettings.php:148
 msgid ""
 "URLs in notices longer than this will be shortened, 0 means always shorten."
 msgstr ""
 
 #. TRANS: Form validation error for form "Other settings" in user profile.
-#: actions/urlsettings.php:180
 #, fuzzy
 msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr "URL-mallongigado-servo tro longas (maksimume 50 literojn)."
 
-#: actions/urlsettings.php:187
 msgid "Invalid number for max url length."
 msgstr ""
 
-#: actions/urlsettings.php:193
 #, fuzzy
 msgid "Invalid number for max notice length."
 msgstr "Nevalida avizo-enhavo"
 
-#: actions/urlsettings.php:238
 msgid "Error saving user URL shortening preferences."
 msgstr ""
 
 #. TRANS: User admin panel title
-#: actions/useradminpanel.php:58
 msgctxt "TITLE"
 msgid "User"
 msgstr "Uzanto"
 
 #. TRANS: Instruction for user admin panel.
-#: actions/useradminpanel.php:69
 msgid "User settings for this StatusNet site"
 msgstr ""
 
 #. TRANS: Form validation error in user admin panel when a non-numeric character limit was set.
-#: actions/useradminpanel.php:147
 msgid "Invalid bio limit. Must be numeric."
 msgstr "Nevalida biografia longlimo. Estu cifero."
 
 #. TRANS: Form validation error in user admin panel when welcome text is too long.
-#: actions/useradminpanel.php:154
 #, fuzzy
 msgid "Invalid welcome text. Maximum length is 255 characters."
 msgstr "Nevalida bonvena teksto. La longlimo estas 225 literoj."
 
 #. TRANS: Client error displayed when trying to set a non-existing user as default subscription for new
 #. TRANS: users in user admin panel. %1$s is the invalid nickname.
-#: actions/useradminpanel.php:166
 #, fuzzy, php-format
 msgid "Invalid default subscripton: \"%1$s\" is not a user."
 msgstr "Nevalida defaŭlta abono: '%1$s' ne estas uzanto."
 
-#: actions/useradminpanel.php:215 lib/action.php:565 lib/settingsnav.php:77
-#: lib/subgroupnav.php:81
 msgid "Profile"
 msgstr "Profilo"
 
 #. TRANS: Field label in user admin panel for setting the character limit for the bio field.
-#: actions/useradminpanel.php:220
 msgid "Bio Limit"
 msgstr "Longlimo de biografio"
 
 #. TRANS: Tooltip in user admin panel for setting the character limit for the bio field.
-#: actions/useradminpanel.php:222
 msgid "Maximum length of a profile bio in characters."
 msgstr "Longlimo de profila biografio, je literoj"
 
 #. TRANS: Form legend in user admin panel.
-#: actions/useradminpanel.php:231
 msgid "New users"
 msgstr "Novuloj"
 
 #. TRANS: Field label in user admin panel for setting new user welcome text.
-#: actions/useradminpanel.php:236
 msgid "New user welcome"
 msgstr "Bonveno al novuloj"
 
 #. TRANS: Tooltip in user admin panel for setting new user welcome text.
-#: actions/useradminpanel.php:238
 #, fuzzy
 msgid "Welcome text for new users (maximum 255 characters)."
 msgstr "Bonvena teksto al novaj uzantoj (apenaŭ 255 literoj)."
 
 #. TRANS: Field label in user admin panel for setting default subscription for new users.
-#: actions/useradminpanel.php:244
 msgid "Default subscription"
 msgstr "Defaŭlta abono"
 
 #. TRANS: Tooltip in user admin panel for setting default subscription for new users.
-#: actions/useradminpanel.php:246
 msgid "Automatically subscribe new users to this user."
 msgstr "Aŭtomate aboni novajn uzantojn al ĉi tiu uzanto."
 
 #. TRANS: Form legend in user admin panel.
-#: actions/useradminpanel.php:256
 msgid "Invitations"
 msgstr "Invitoj"
 
 #. TRANS: Field label for checkbox in user admin panel for allowing users to invite friend using site e-mail.
-#: actions/useradminpanel.php:262
 msgid "Invitations enabled"
 msgstr "Invito ebliĝis"
 
 #. TRANS: Tooltip for checkbox in user admin panel for allowing users to invite friend using site e-mail.
-#: actions/useradminpanel.php:265
 msgid "Whether to allow users to invite new users."
 msgstr "Ĉu permesi al uzantoj inviti novan uzantojn."
 
 #. TRANS: Title for button to save user settings in user admin panel.
-#: actions/useradminpanel.php:302
 #, fuzzy
 msgid "Save user settings."
 msgstr "Konservi retejan agordon"
 
 #. TRANS: Page title.
-#: actions/userauthorization.php:109
 msgid "Authorize subscription"
 msgstr "Rajtigi abonon"
 
 #. TRANS: Page notice on "Auhtorize subscription" page.
-#: actions/userauthorization.php:115
 #, fuzzy
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
@@ -6619,42 +5451,35 @@ msgstr ""
 "tiu uzanto. Se ne simple alklaku “Rifuzi\"."
 
 #. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:200
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Accept"
 msgstr "Akcepti"
 
 #. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:202
 #, fuzzy
 msgid "Subscribe to this user."
 msgstr "Aboni la uzanton"
 
 #. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:204
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Reject"
 msgstr "Malakcepti"
 
 #. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:206
 #, fuzzy
 msgid "Reject this subscription."
 msgstr "Rifuzi la abonon"
 
 #. TRANS: Client error displayed for an empty authorisation request.
-#: actions/userauthorization.php:219
 msgid "No authorization request!"
 msgstr "Ne bezonas permesado!"
 
 #. TRANS: Accept message header from Authorise subscription page.
-#: actions/userauthorization.php:242
 msgid "Subscription authorized"
 msgstr "Abono permesiĝis"
 
-#: actions/userauthorization.php:245
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to authorize the "
@@ -6664,11 +5489,9 @@ msgstr ""
 "detaloj pri kiel rajtigi abonon. Via abono-ĵetono jenas:"
 
 #. TRANS: Reject message header from Authorise subscription page.
-#: actions/userauthorization.php:256
 msgid "Subscription rejected"
 msgstr "Abono rifuziĝis"
 
-#: actions/userauthorization.php:259
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to fully reject the "
@@ -6679,35 +5502,30 @@ msgstr ""
 
 #. TRANS: Exception thrown when no valid user is found for an authorisation request.
 #. TRANS: %s is a listener URI.
-#: actions/userauthorization.php:296
 #, fuzzy, php-format
 msgid "Listener URI \"%s\" not found here."
 msgstr "URL de aboninto ‘%s’ ne troviĝas tie ĉi."
 
 #. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
 #. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:303
 #, fuzzy, php-format
 msgid "Listenee URI \"%s\" is too long."
 msgstr "URL de abonito ‘%s’ tro longas."
 
 #. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
 #. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:311
 #, fuzzy, php-format
 msgid "Listenee URI \"%s\" is a local user."
 msgstr "URL de abonito ‘%s’ estas de loka uzanto."
 
 #. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
 #. TRANS: %s is a profile URL.
-#: actions/userauthorization.php:329
 #, fuzzy, php-format
 msgid "Profile URL \"%s\" is for a local user."
 msgstr "Profila URL ‘%s’ estas de loka uzanto."
 
 #. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
 #. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
-#: actions/userauthorization.php:339
 #, fuzzy, php-format
 msgid ""
 "Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
@@ -6717,75 +5535,61 @@ msgstr ""
 
 #. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
 #. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:349
 #, fuzzy, php-format
 msgid "Avatar URL \"%s\" is not valid."
 msgstr "Vizaĝbilda URL ‘%s' ne estas valida."
 
 #. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
 #. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:356
 #, fuzzy, php-format
 msgid "Cannot read avatar URL \"%s\"."
 msgstr "Malsukcesis legi vizaĝbildan URL ‘%s’."
 
 #. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
 #. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:363
 #, fuzzy, php-format
 msgid "Wrong image type for avatar URL \"%s\"."
 msgstr "Malĝusta bildotipo por vizaĝbilda URL ‘%s'."
 
 #. TRANS: Page title for profile design page.
-#: actions/userdesignsettings.php:74 lib/designsettings.php:61
 msgid "Profile design"
 msgstr "Profila desegno"
 
 #. TRANS: Instructions for profile design page.
-#: actions/userdesignsettings.php:84 lib/designsettings.php:72
 msgid ""
 "Customize the way your profile looks with a background image and a colour "
 "palette of your choice."
 msgstr "Agodi kiel aspektu via profilo, per elekto de fonbildo kaj koloraro."
 
-#: actions/userdesignsettings.php:289
 msgid "Enjoy your hotdog!"
 msgstr "Ĝuu vian kolbasobulkon!"
 
-#: actions/userdesignsettings.php:325
 #, fuzzy
 msgid "Design settings"
 msgstr "Konservi retejan agordon"
 
-#: actions/userdesignsettings.php:340
 msgid "View profile designs"
 msgstr "Vidi profilo-desegnon"
 
-#: actions/userdesignsettings.php:341
 msgid "Show or hide profile designs."
 msgstr "Montri aŭ kaŝi profilo-desegnon."
 
-#: actions/userdesignsettings.php:348
 #, fuzzy
 msgid "Background file"
 msgstr "Fono"
 
 #. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number.
-#: actions/usergroups.php:66
 #, php-format
 msgid "%1$s groups, page %2$d"
 msgstr "Grupoj %1$s, paĝo %2$d"
 
-#: actions/usergroups.php:132
 msgid "Search for more groups"
 msgstr "Serĉi pli da grupoj"
 
-#: actions/usergroups.php:159
 #, php-format
 msgid "%s is not a member of any group."
 msgstr "%S ne estas ano de iu ajn grupo."
 
-#: actions/usergroups.php:164
 #, php-format
 msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
 msgstr "Provu [serĉi grupojn](%%*action.*groupsearch%%) kaj aniĝi."
@@ -6795,18 +5599,14 @@ msgstr "Provu [serĉi grupojn](%%*action.*groupsearch%%) kaj aniĝi."
 #. TRANS: %1$s is a group name, %2$s is a site name.
 #. TRANS: Message is used as a subtitle in atom user notice feed.
 #. TRANS: %1$s is a user name, %2$s is a site name.
-#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:70
-#: lib/atomusernoticefeed.php:95
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr "Ĝisdatiĝoj de %1$s ĉe %2$s!"
 
-#: actions/version.php:75
 #, php-format
 msgid "StatusNet %s"
 msgstr "StatusNet %s"
 
-#: actions/version.php:155
 #, php-format
 msgid ""
 "This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
@@ -6815,16 +5615,13 @@ msgstr ""
 "La retejon ebligis %1$s de versio %2$s, aŭtorrajto 2008-2010 StatusNet, Inc. "
 "kaj kontribuintoj."
 
-#: actions/version.php:163
 msgid "Contributors"
 msgstr "Kontribuantoj"
 
 #. TRANS: Menu item for site administration
-#: actions/version.php:167 lib/adminpanelaction.php:403
 msgid "License"
 msgstr "Licenco"
 
-#: actions/version.php:170
 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 "
@@ -6836,7 +5633,6 @@ msgstr ""
 "la Fundamento por Libera-Molvaro. Kaj versio 3 de la Licenco kaj (viaelekte) "
 "ĉiu posta versio taŭgas. "
 
-#: actions/version.php:176
 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 "
@@ -6847,7 +5643,6 @@ msgstr ""
 "GARANTIO; ne eĉ suba garantio de FUNKCIPOVO aŭ TAŬGECO POR IU CERTA CELO. "
 "Legu la GNU Affero Ĝeneralan Publikan Permesilon pro pli da detaloj. "
 
-#: actions/version.php:182
 #, php-format
 msgid ""
 "You should have received a copy of the GNU Affero General Public License "
@@ -6857,52 +5652,42 @@ msgstr ""
 "Nekaze, legu %s."
 
 #. TRANS: Form input field label for application name.
-#: actions/version.php:197 lib/applicationeditform.php:190
 msgid "Name"
 msgstr "Nomo"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:885
 msgid "Version"
 msgstr "Versio"
 
-#: actions/version.php:199
 msgid "Author(s)"
 msgstr "Aŭtoro(j)"
 
 #. TRANS: Form input field label.
-#: actions/version.php:200 lib/applicationeditform.php:208
-#: lib/groupeditform.php:168
 msgid "Description"
 msgstr "Priskribo"
 
 #. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:164
 msgid "Favor"
 msgstr "Ŝati"
 
 #. TRANS: Ntofication given when a user marks a notice as favorite.
 #. TRANS: %1$s is a user nickname or full name, %2$s is a notice URI.
-#: classes/Fave.php:167
 #, fuzzy, php-format
 msgid "%1$s marked notice %2$s as a favorite."
 msgstr "%s (@%s) ŝatis vian avizon"
 
 #. TRANS: Server exception thrown when a URL cannot be processed.
-#: classes/File.php:162
 #, php-format
 msgid "Cannot process URL '%s'"
 msgstr "Malsukcesis trakti URL '%s'"
 
 #. TRANS: Server exception thrown when... Robin thinks something is impossible!
-#: classes/File.php:194
 msgid "Robin thinks something is impossible."
 msgstr "Robin pensas ke io neeblas."
 
 #. 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$s is used for plural.
-#: classes/File.php:210
 #, fuzzy, php-format
 msgid ""
 "No file may be larger than %1$d byte and the file you sent was %2$d bytes. "
@@ -6919,7 +5704,6 @@ msgstr[1] ""
 
 #. TRANS: Message given if an upload would exceed user quota.
 #. TRANS: %d (number) is the user quota in bytes and is used for plural.
-#: classes/File.php:223
 #, fuzzy, php-format
 msgid "A file this large would exceed your user quota of %d byte."
 msgid_plural "A file this large would exceed your user quota of %d bytes."
@@ -6928,7 +5712,6 @@ msgstr[1] "Dosiero tiel granda superos vian uzantan kvoton kun %d bajtoj."
 
 #. TRANS: Message given id an upload would exceed a user's monthly quota.
 #. TRANS: $d (number) is the monthly user quota in bytes and is used for plural.
-#: classes/File.php:235
 #, fuzzy, php-format
 msgid "A file this large would exceed your monthly quota of %d byte."
 msgid_plural "A file this large would exceed your monthly quota of %d bytes."
@@ -6936,115 +5719,95 @@ msgstr[0] "Dosiero tiel granda superos vian monatan kvoton kun %d bajtoj."
 msgstr[1] "Dosiero tiel granda superos vian monatan kvoton kun %d bajtoj."
 
 #. TRANS: Client exception thrown if a file upload does not have a valid name.
-#: classes/File.php:282 classes/File.php:297
 msgid "Invalid filename."
 msgstr "Nevalida dosiernomo."
 
 #. TRANS: Exception thrown when joining a group fails.
-#: classes/Group_member.php:51
 msgid "Group join failed."
 msgstr "Malsukcesis aniĝi al grupon."
 
 #. TRANS: Exception thrown when trying to leave a group the user is not a member of.
-#: classes/Group_member.php:64
 msgid "Not part of group."
 msgstr "Ne grupano."
 
 #. TRANS: Exception thrown when trying to leave a group fails.
-#: classes/Group_member.php:72
 msgid "Group leave failed."
 msgstr "Malsukcesis foriri de grupo."
 
 #. TRANS: Exception thrown providing an invalid profile ID.
 #. TRANS: %s is the invalid profile ID.
-#: classes/Group_member.php:85
 #, php-format
 msgid "Profile ID %s is invalid."
 msgstr ""
 
 #. TRANS: Exception thrown providing an invalid group ID.
 #. TRANS: %s is the invalid group ID.
-#: classes/Group_member.php:98
 #, fuzzy, php-format
 msgid "Group ID %s is invalid."
 msgstr "Eraris konservi uzanton: nevalida."
 
 #. TRANS: Activity title.
-#: classes/Group_member.php:147 lib/joinform.php:114
 msgid "Join"
 msgstr "Aniĝi"
 
 #. TRANS: Success message for subscribe to group attempt through OStatus.
 #. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
-#: classes/Group_member.php:151
 #, php-format
 msgid "%1$s has joined group %2$s."
 msgstr ""
 
 #. TRANS: Server exception thrown when updating a local group fails.
-#: classes/Local_group.php:42
 msgid "Could not update local group."
 msgstr "Malsukcesis ĝisdatigi lokan grupon."
 
 #. TRANS: Exception thrown when trying creating a login token failed.
 #. TRANS: %s is the user nickname for which token creation failed.
-#: classes/Login_token.php:78
 #, php-format
 msgid "Could not create login token for %s"
 msgstr "Malsukcesis krei ensalut-ĵetonon por %s"
 
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
-#: classes/Memcached_DataObject.php:556
 msgid "No database name or DSN found anywhere."
 msgstr "Ne troviĝas datumbaza nomo aŭ DSN ie ajn."
 
 #. TRANS: Client exception thrown when a user tries to send a direct message while being banned from sending them.
-#: classes/Message.php:45
 msgid "You are banned from sending direct messages."
 msgstr "Vi blokiĝis de sendi rektan mesaĝon."
 
 #. TRANS: Message given when a message could not be stored on the server.
-#: classes/Message.php:69
 msgid "Could not insert message."
 msgstr "Malsukcesis enmeti mesaĝon."
 
 #. TRANS: Message given when a message could not be updated on the server.
-#: classes/Message.php:80
 msgid "Could not update message with new URI."
 msgstr "Malsukcesis ĝisdatigi mesaĝon per nova URI"
 
 #. TRANS: Server exception thrown when a user profile for a notice cannot be found.
 #. TRANS: %1$d is a profile ID (number), %2$d is a notice ID (number).
-#: classes/Notice.php:98
 #, php-format
 msgid "No such profile (%1$d) for notice (%2$d)."
 msgstr "Ne estas tia profilo(%1$d) rilate al avizo (%2$d)."
 
 #. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:199
 #, php-format
 msgid "Database error inserting hashtag: %s"
 msgstr "Datumbaze eraris enmeti heketetikedo: %s"
 
 #. TRANS: Client exception thrown if a notice contains too many characters.
-#: classes/Notice.php:279
 msgid "Problem saving notice. Too long."
 msgstr "Malsukcesis konservi avizon. Ĝi tro longas."
 
 #. TRANS: Client exception thrown when trying to save a notice for an unknown user.
-#: classes/Notice.php:284
 msgid "Problem saving notice. Unknown user."
 msgstr "Malsukcesis konservi avizon. Uzanto ne kontata."
 
 #. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
-#: classes/Notice.php:290
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 "Tro da avizoj tro rapide; pace spiru kaj reafiŝu post kelke da minutoj."
 
 #. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
-#: classes/Notice.php:297
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
 "few minutes."
@@ -7052,43 +5815,36 @@ msgstr ""
 "Tro da refojado tro rapide; pace spiru kaj reafiŝu post kelke da minutoj."
 
 #. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:305
 msgid "You are banned from posting notices on this site."
 msgstr "Vi estas blokita de afiŝi ĉe tiu ĉi retejo."
 
 #. TRANS: Server exception thrown when a notice cannot be saved.
 #. TRANS: Server exception thrown when a notice cannot be updated.
-#: classes/Notice.php:372 classes/Notice.php:399
 msgid "Problem saving notice."
 msgstr "Malsukcesis konservi avizon."
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:929
 #, fuzzy
 msgid "Bad type provided to saveKnownGroups."
 msgstr "Fuŝa tipo donita al saveKnownGroups"
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:1028
 msgid "Problem saving group inbox."
 msgstr "Malsukcesis konservi grupan alvenkeston."
 
 #. TRANS: Server exception thrown when a reply cannot be saved.
 #. TRANS: %1$d is a notice ID, %2$d is the ID of the mentioned user.
-#: classes/Notice.php:1144
 #, fuzzy, php-format
 msgid "Could not save reply for %1$d, %2$d."
 msgstr "Malsukcesis lokan grupan informon."
 
 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1663
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
 
 #. TRANS: Full name of a profile or group followed by nickname in parens
-#: classes/Profile.php:172 classes/User_group.php:242
 #, fuzzy, php-format
 msgctxt "FANCYNAME"
 msgid "%1$s (%2$s)"
@@ -7096,264 +5852,214 @@ msgstr "%1$s (%2$s)"
 
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:779
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr "Malsukcesis revoki rolon \"%1$s\" de uzanto #%2$d; ĝi ne ekzistas."
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:788
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr "Malsukcesis revoki rolon \"%1$s\" de uzanto #%2$d; datumbaza eraro."
 
 #. TRANS: Exception thrown when a right for a non-existing user profile is checked.
-#: classes/Remote_profile.php:54
 msgid "Missing profile."
 msgstr "Mankas profilo."
 
 #. TRANS: Exception thrown when a tag cannot be saved.
-#: classes/Status_network.php:338
 msgid "Unable to save tag."
 msgstr "Malsukcesis konservi etikedon."
 
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#: classes/Subscription.php:77 lib/oauthstore.php:482
 msgid "You have been banned from subscribing."
 msgstr "Vi esatas blokita de aboni."
 
 #. TRANS: Exception thrown when trying to subscribe while already subscribed.
-#: classes/Subscription.php:82
 msgid "Already subscribed!"
 msgstr "Jam abonato!"
 
 #. TRANS: Exception thrown when trying to subscribe to a user who has blocked the subscribing user.
-#: classes/Subscription.php:87
 msgid "User has blocked you."
 msgstr "La uzanto blokis vin."
 
 #. TRANS: Exception thrown when trying to unsibscribe without a subscription.
-#: classes/Subscription.php:176
 msgid "Not subscribed!"
 msgstr "Ne abonato!"
 
 #. TRANS: Exception thrown when trying to unsubscribe a user from themselves.
-#: classes/Subscription.php:183
 msgid "Could not delete self-subscription."
 msgstr "Ne eblas forigi abonon al vi mem."
 
 #. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
-#: classes/Subscription.php:211
 msgid "Could not delete subscription OMB token."
 msgstr "Malsukcesis forigi abonan OMB-ĵetonon."
 
 #. TRANS: Exception thrown when a subscription could not be deleted on the server.
-#: classes/Subscription.php:223
 msgid "Could not delete subscription."
 msgstr "Malsukcesis forigi abonon."
 
 #. TRANS: Activity tile when subscribing to another person.
-#: classes/Subscription.php:265
 msgid "Follow"
 msgstr "Sekvi"
 
 #. TRANS: Notification given when one person starts following another.
 #. TRANS: %1$s is the subscriber, %2$s is the subscribed.
-#: classes/Subscription.php:268
 #, fuzzy, php-format
 msgid "%1$s is now following %2$s."
 msgstr "%1$s nun rigardas viajn avizojn ĉe %2$s."
 
 #. TRANS: Notice given on user registration.
 #. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:390
 #, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr "Bonvenon al %1$s, @%2$s!"
 
 #. TRANS: Server exception.
-#: classes/User.php:923
 msgid "No single user defined for single-user mode."
 msgstr "Neniu difinata uzanto por sol-uzanta reĝimo."
 
 #. TRANS: Server exception.
-#: classes/User.php:927
 msgid "Single-user mode code called when not enabled."
 msgstr ""
 
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:522
 msgid "Could not create group."
 msgstr "Malsukcesis krei grupon."
 
 #. TRANS: Server exception thrown when updating a group URI failed.
-#: classes/User_group.php:532
 msgid "Could not set group URI."
 msgstr "Malsukcesis ĝisdatigi grupan URI."
 
 #. TRANS: Server exception thrown when setting group membership failed.
-#: classes/User_group.php:555
 msgid "Could not set group membership."
 msgstr "Malsukcesis ĝisdatigi grupan anecon."
 
 #. TRANS: Server exception thrown when saving local group information failed.
-#: classes/User_group.php:570
 msgid "Could not save local group info."
 msgstr "Malsukcesis lokan grupan informon."
 
 #. TRANS: Exception thrown when an account could not be located when it should be moved.
 #. TRANS: %s is the remote site.
-#: lib/accountmover.php:65
 #, fuzzy, php-format
 msgid "Cannot locate account %s."
 msgstr "Vi ne povas forigi uzantojn."
 
 #. TRANS: Exception thrown when a service document could not be located account move.
 #. TRANS: %s is the remote site.
-#: lib/accountmover.php:106
 #, php-format
 msgid "Cannot find XRD for %s."
 msgstr ""
 
 #. TRANS: Exception thrown when an account could not be located when it should be moved.
 #. TRANS: %s is the remote site.
-#: lib/accountmover.php:131
 #, php-format
 msgid "No AtomPub API service for %s."
 msgstr ""
 
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: lib/action.php:161
 #, php-format
 msgid "%1$s - %2$s"
 msgstr "%1$s - %2$s"
 
 #. TRANS: Page title for a page without a title set.
-#: lib/action.php:177
 msgid "Untitled page"
 msgstr "Sentitola paĝo"
 
 #. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.
-#: lib/action.php:325
 msgctxt "TOOLTIP"
 msgid "Show more"
 msgstr ""
 
 #. TRANS: Inline reply form submit button: submits a reply comment.
-#: lib/action.php:328
 #, fuzzy
 msgctxt "BUTTON"
-msgid "Comment"
-msgstr "Enhavo"
+msgid "Reply"
+msgstr "Respondi"
 
 #. TRANS: Placeholder text for inline reply form. Clicking in this box will turn it into a mini notice form.
-#: lib/action.php:331
-msgid "Add a comment..."
+msgid "Write a reply..."
 msgstr ""
 
-#: lib/action.php:559 lib/personalgroupnav.php:99
 #, fuzzy
 msgid "Home"
 msgstr "Hejmpaĝo"
 
-#: lib/action.php:560
 #, fuzzy
 msgid "Friends timeline"
 msgstr "Tempstrio de %s"
 
-#: lib/action.php:566
 #, fuzzy
 msgid "Your profile"
 msgstr "Grupa profilo"
 
-#: lib/action.php:570 lib/action.php:593 lib/publicgroupnav.php:78
 msgid "Public"
 msgstr "Publika"
 
-#: lib/action.php:571 lib/action.php:594
 #, fuzzy
 msgid "Everyone on this site"
 msgstr "Serĉi homon ĉe la retejo"
 
-#: lib/action.php:575
 #, fuzzy
 msgid "Settings"
 msgstr "SMM-a agordo"
 
-#: lib/action.php:576
 #, fuzzy
 msgid "Change your personal settings"
 msgstr "Ŝanĝi vian profilan agordon."
 
-#: lib/action.php:582
 #, fuzzy
 msgid "Site configuration"
 msgstr "Uzanta agordo"
 
-#: lib/action.php:587
 #, fuzzy
 msgid "Logout"
 msgstr " Elsaluti"
 
-#: lib/action.php:588
 #, fuzzy
 msgid "Logout from the site"
 msgstr "Elsaluti el la retejo"
 
-#: lib/action.php:599
 #, fuzzy
 msgid "Login to the site"
 msgstr "Ensaluti al la retejo"
 
-#: lib/action.php:606
-#, fuzzy
 msgid "Search"
 msgstr "Serĉi"
 
-#: lib/action.php:607
 #, fuzzy
 msgid "Search the site"
 msgstr "Serĉi ĉe retejo"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:864
 msgid "Help"
 msgstr "Helpo"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:867
 msgid "About"
 msgstr "Enkonduko"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:870
 msgid "FAQ"
 msgstr "Oftaj demandoj"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:875
 msgid "TOS"
 msgstr "Serva Kondiĉo"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:879
 msgid "Privacy"
 msgstr "Privateco"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:882
 msgid "Source"
 msgstr "Fontkodo"
 
 #. TRANS: Secondary navigation menu option leading to e-mail contact information on the
 #. TRANS: StatusNet site, where to report bugs, ...
-#: lib/action.php:889
 msgid "Contact"
 msgstr "Kontakto"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:892
 msgid "Badge"
 msgstr "Insigno"
 
@@ -7361,7 +6067,6 @@ msgstr "Insigno"
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:921
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7371,7 +6076,6 @@ msgstr ""
 "site.broughtbyurl%%)."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:924
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** estas mikrobloga servo."
@@ -7380,7 +6084,6 @@ msgstr "**%%site.name%%** estas mikrobloga servo."
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:931
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7393,21 +6096,18 @@ msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:949
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr "Enhavo kaj datumo de %1$s estas privata kaj konfidenca."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:956
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
 "Enhava kaj datuma aŭtorrajto apartenas al %1$s. Ĉiuj rajtoj rezervitaj."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:960
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 "Enhava kaj datuma aŭtorrajto apartenas al kontribuintoj. Ĉiuj rajtoj "
@@ -7415,87 +6115,72 @@ msgstr ""
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:992
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr "Ĉiuj enhavo kaj datumo ĉe %1$s estas havebla sub permesilo %2$s."
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1335
 msgid "After"
 msgstr "Poste"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1345
 msgid "Before"
 msgstr "Antaŭe"
 
 #. TRANS: Client exception thrown when a feed instance is a DOMDocument.
-#: lib/activity.php:125
 msgid "Expecting a root feed element but got a whole XML document."
 msgstr ""
 
 #. TRANS: Client exception thrown when using an unknown verb for the activity importer.
-#: lib/activityimporter.php:81
 #, fuzzy, php-format
 msgid "Unknown verb: \"%s\"."
 msgstr "Nekonata lingvo \"%s\"."
 
 #. TRANS: Client exception thrown when trying to force a subscription for an untrusted user.
-#: lib/activityimporter.php:107
 msgid "Cannot force subscription for untrusted user."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to for a remote user to subscribe.
-#: lib/activityimporter.php:117
 #, fuzzy
 msgid "Cannot force remote user to subscribe."
 msgstr "Specifu nomon de la abonota uzanto."
 
 #. TRANS: Client exception thrown when trying to subscribe to an unknown profile.
-#: lib/activityimporter.php:132
 #, fuzzy
 msgid "Unknown profile."
 msgstr "Nekonata dosiertipo"
 
 #. TRANS: Client exception thrown when trying to import an event not related to the importing user.
-#: lib/activityimporter.php:138
 msgid "This activity seems unrelated to our user."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to join a remote group that is not a group.
-#: lib/activityimporter.php:154
 msgid "Remote profile is not a group!"
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to join a group the importing user is already a member of.
-#: lib/activityimporter.php:163
 #, fuzzy
 msgid "User is already a member of this group."
 msgstr "Vi estas jam grupano."
 
 #. TRANS: Client exception thrown when trying to import a notice by another user.
 #. TRANS: %1$s is the source URI of the notice, %2$s is the URI of the author.
-#: lib/activityimporter.php:201
 #, php-format
 msgid "Already know about notice %1$s and  it has a different author %2$s."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to overwrite the author information for a non-trusted user during import.
-#: lib/activityimporter.php:207
 msgid "Not overwriting author info for non-trusted user."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to import a notice without content.
 #. TRANS: %s is the notice URI.
-#: lib/activityimporter.php:223
 #, fuzzy, php-format
 msgid "No content for notice %s."
 msgstr "Serĉi enhavon ĉe la retejo"
 
-#: lib/activitymover.php:84
 #, fuzzy, php-format
 msgid "No such user %s."
 msgstr "Ne ekzistas tiu uzanto."
@@ -7506,213 +6191,173 @@ msgstr "Ne ekzistas tiu uzanto."
 #. TRANS: %1$s is a URL, %2$s is the status, %s$s is the fail reason.
 #. TRANS: Exception thrown when post to collection fails with a status that is not handled.
 #. TRANS: %1$s is a URL, %2$s is the status, %s$s is the fail reason.
-#: lib/activitysink.php:163 lib/activitysink.php:167 lib/activitysink.php:172
 #, fuzzy, php-format
 msgctxt "URLSTATUSREASON"
 msgid "%1$s %2$s %3$s"
 msgstr "%1$s - %2$s"
 
 #. TRANS: Client exception thrown when there is no source attribute.
-#: lib/activityutils.php:200
 msgid "Can't handle remote content yet."
 msgstr "Ankoraŭ ne eblas trakti foran enhavon."
 
 #. TRANS: Client exception thrown when there embedded XML content is found that cannot be processed yet.
-#: lib/activityutils.php:237
 msgid "Can't handle embedded XML content yet."
 msgstr "Ankoraŭ ne eblas trakti enigitan XML-aĵon."
 
 #. TRANS: Client exception thrown when base64 encoded content is found that cannot be processed yet.
-#: lib/activityutils.php:242
 msgid "Can't handle embedded Base64 content yet."
 msgstr "Ankoraŭ ne eblas trakti enigitan Base64-enhavon."
 
 #. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights.
-#: lib/adminpanelaction.php:96
 msgid "You cannot make changes to this site."
 msgstr "Vi ne rajtas ŝanĝi ĉe tiu ĉi retejo."
 
 #. TRANS: Client error message throw when a certain panel's settings cannot be changed.
-#: lib/adminpanelaction.php:108
 msgid "Changes to that panel are not allowed."
 msgstr "Malpermesas ŝanĝi agordon sur la panelon."
 
 #. TRANS: Client error message.
-#: lib/adminpanelaction.php:222
 msgid "showForm() not implemented."
 msgstr "showForm() ne jam realigita."
 
 #. TRANS: Client error message
-#: lib/adminpanelaction.php:250
 msgid "saveSettings() not implemented."
 msgstr "saveSettings() ne jam realigita."
 
 #. TRANS: Client error message thrown if design settings could not be deleted in
 #. TRANS: the admin panel Design.
-#: lib/adminpanelaction.php:274
 msgid "Unable to delete design setting."
 msgstr "Malsukcesas forigi desegnan agordon."
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:337
 msgid "Basic site configuration"
 msgstr "Baza reteja agordo"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:339
 msgctxt "MENU"
 msgid "Site"
 msgstr "Retejo"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:345
 msgid "Design configuration"
 msgstr "Desegna agordo"
 
 #. TRANS: Menu item for site administration
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/adminpanelaction.php:347 lib/groupnav.php:135
 msgctxt "MENU"
 msgid "Design"
 msgstr "Desegno"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:353
 msgid "User configuration"
 msgstr "Uzanta agordo"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:110
 msgid "User"
 msgstr "Uzanto"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:361
 msgid "Access configuration"
 msgstr "Alira agordo"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:369
 msgid "Paths configuration"
 msgstr "Voja agordo"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:377
 msgid "Sessions configuration"
 msgstr "Seanca agodo"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:385
 msgid "Edit site notice"
 msgstr "Redakti retejan anoncon"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:387
 msgid "Site notice"
 msgstr "Reteja anonco"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:393
 msgid "Snapshots configuration"
 msgstr "Momentfota Agordo"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:401
 msgid "Set site license"
 msgstr ""
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:409
 #, fuzzy
 msgid "Plugins configuration"
 msgstr "Voja agordo"
 
 #. TRANS: Client error 401.
-#: lib/apiauth.php:111
 msgid "API resource requires read-write access, but you only have read access."
 msgstr "API-fonto bezonas leg-skriba aliro, sed vi nur rajtas legi."
 
 #. TRANS: OAuth exception thrown when no application is found for a given consumer key.
-#: lib/apiauth.php:177
 msgid "No application for that consumer key."
 msgstr "Ne estas aplikaĵo kun la kosumanta ŝlosilo."
 
-#: lib/apiauth.php:202 lib/apiauth.php:284
 msgid "Not allowed to use API."
 msgstr ""
 
 #. TRANS: OAuth exception given when an incorrect access token was given for a user.
-#: lib/apiauth.php:225
 msgid "Bad access token."
 msgstr "Fuŝa aliro-ĵetono."
 
 #. TRANS: OAuth exception given when no user was found for a given token (no token was found).
-#: lib/apiauth.php:230
 msgid "No user for that token."
 msgstr "Ne estas uzanto kun tiu ĵetono."
 
 #. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel".
 #. TRANS: Client error thrown when authentication fails.
-#: lib/apiauth.php:272 lib/apiauth.php:302
 msgid "Could not authenticate you."
 msgstr "Malsukcesis aŭtentigi vin."
 
 #. TRANS: Server error displayed when trying to create an anynymous OAuth consumer.
-#: lib/apioauthstore.php:45
 #, fuzzy
 msgid "Could not create anonymous consumer."
 msgstr "Malsukcesis krei alinomon."
 
 #. TRANS: Server error displayed when trying to create an anynymous OAuth application.
-#: lib/apioauthstore.php:69
 #, fuzzy
 msgid "Could not create anonymous OAuth application."
 msgstr "Malsukcesis krei aplikaĵon."
 
 #. TRANS: Exception thrown when no token association could be found.
-#: lib/apioauthstore.php:151
 msgid ""
 "Could not find a profile and application associated with the request token."
 msgstr ""
 
 #. TRANS: Exception thrown when no access token can be issued.
-#: lib/apioauthstore.php:209
 #, fuzzy
 msgid "Could not issue access token."
 msgstr "Malsukcesis enmeti mesaĝon."
 
-#: lib/apioauthstore.php:317
 msgid "Database error inserting OAuth application user."
 msgstr "Datumbaza eraro enigi la uzanton de *OAuth-aplikaĵo."
 
-#: lib/apioauthstore.php:345
 #, fuzzy
 msgid "Database error updating OAuth application user."
 msgstr "Datumbaza eraro enigi la uzanton de *OAuth-aplikaĵo."
 
 #. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
-#: lib/apioauthstore.php:371
 msgid "Tried to revoke unknown token."
 msgstr "Provis revoki nekonatan ĵetonon."
 
 #. TRANS: Exception thrown when an attempt is made to remove a revoked token.
-#: lib/apioauthstore.php:376
 msgid "Failed to delete revoked token."
 msgstr "Malsukcesis forigi revokitan ĵetonon."
 
 #. TRANS: Form input field label for application icon.
-#: lib/applicationeditform.php:177
 msgid "Icon"
 msgstr "Bildsimbolo"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:182
 msgid "Icon for this application"
 msgstr "Emblemo por tiu ĉi aplikaĵo"
 
 #. TRANS: Form input field instructions.
 #. TRANS: %d is the number of available characters for the description.
-#: lib/applicationeditform.php:201
 #, fuzzy, php-format
 msgid "Describe your application in %d character"
 msgid_plural "Describe your application in %d characters"
@@ -7720,209 +6365,170 @@ msgstr[0] "Priskribu vian aplikaĵon per malpli ol %d literoj."
 msgstr[1] "Priskribu vian aplikaĵon per malpli ol %d literoj."
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:205
 msgid "Describe your application"
 msgstr "Priskribu vian aplikaĵon"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:216
 msgid "URL of the homepage of this application"
 msgstr "URL al la hejmpaĝo de tiu ĉi aplikaĵo"
 
 #. TRANS: Form input field label.
-#: lib/applicationeditform.php:218
 msgid "Source URL"
 msgstr "Fonta URL"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:225
 msgid "Organization responsible for this application"
 msgstr "Organizo, kiu prizorgi la aplikaĵon"
 
 #. TRANS: Form input field label.
-#: lib/applicationeditform.php:227
 msgid "Organization"
 msgstr "Organizaĵo"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:234
 msgid "URL for the homepage of the organization"
 msgstr "URL al la hejmpaĝo de la organizo"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:243
 msgid "URL to redirect to after authentication"
 msgstr "URL por alidirekto post aŭtentigado"
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:271
 msgid "Browser"
 msgstr "Foliumilo"
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:288
 msgid "Desktop"
 msgstr "Labortablo"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:290
 msgid "Type of application, browser or desktop"
 msgstr "Tipo de aplikaĵo, foliumilo aŭ labortablo"
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:314
 msgid "Read-only"
 msgstr "Nur-lege"
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:334
 msgid "Read-write"
 msgstr "Leg-skribe"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:336
 msgid "Default access for this application: read-only, or read-write"
 msgstr "Defaŭta aliro por la aplikaĵo: nur-lege aŭ leg-skribe."
 
 #. TRANS: Submit button title.
-#: lib/applicationeditform.php:353
 msgid "Cancel"
 msgstr "Nuligi"
 
-#: lib/applicationlist.php:247
 msgid " by "
 msgstr " De "
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:260
 msgid "read-write"
 msgstr "leg-skribe"
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:262
 msgid "read-only"
 msgstr "nur-lege"
 
 #. TRANS: Used in application list. %1$s is a modified date, %2$s is access type ("read-write" or "read-only")
-#: lib/applicationlist.php:268
 #, php-format
 msgid "Approved %1$s - \"%2$s\" access."
 msgstr "Permesita %1$s - aliro \"%2$s\"."
 
 #. TRANS: Access token in the application list.
 #. TRANS: %s are the first 7 characters of the access token.
-#: lib/applicationlist.php:282
 #, php-format
 msgid "Access token starting with: %s"
 msgstr ""
 
 #. TRANS: Button label
-#: lib/applicationlist.php:298
 msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "Revoki"
 
-#: lib/atom10feed.php:113
 msgid "Author element must contain a name element."
 msgstr ""
 
 #. TRANS: Server exception thrown when using the method setActivitySubject() in the class Atom10Feed.
-#: lib/atom10feed.php:160
 #, fuzzy
 msgid "Do not use this method!"
 msgstr "Ne forigi la avizon"
 
 #. TRANS: Title.
-#: lib/attachmentnoticesection.php:67
 msgid "Notices where this attachment appears"
 msgstr "Avizo, kie ĉi tiu aldonaĵo aperos"
 
 #. TRANS: Title.
-#: lib/attachmenttagcloudsection.php:48
 msgid "Tags for this attachment"
 msgstr "Etikedoj por ĉi tiu aldonaĵo"
 
 #. TRANS: Exception thrown when a password change fails.
-#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:227
 #, fuzzy
 msgid "Password changing failed."
 msgstr "La ŝanĝo de pasvorto maltrafis"
 
 #. TRANS: Exception thrown when a password change attempt fails because it is not allowed.
-#: lib/authenticationplugin.php:238
 #, fuzzy
 msgid "Password changing is not allowed."
 msgstr "Ne estas permesita ŝanĝi la pasvorton"
 
 #. TRANS: Title for the form to block a user.
-#: lib/blockform.php:68
 msgid "Block"
 msgstr "Bloki"
 
 #. TRANS: Description of the form to block a user.
-#: lib/blockform.php:79
 msgid "Block this user"
 msgstr "Bloki la uzanton"
 
 #. TRANS: Title for command results.
-#: lib/channel.php:104 lib/channel.php:125
 msgid "Command results"
 msgstr "Komandaj rezultoj"
 
 #. TRANS: Title for command results.
-#: lib/channel.php:138
 #, fuzzy
 msgid "AJAX error"
 msgstr "Eraro de Ajax"
 
 #. TRANS: E-mail subject when a command has completed.
-#: lib/channel.php:177 lib/mailhandler.php:143
 msgid "Command complete"
 msgstr "Komando kompleta"
 
 #. TRANS: E-mail subject when a command has failed.
-#: lib/channel.php:188
 msgid "Command failed"
 msgstr "Komando maltrafis"
 
 #. TRANS: Command exception text shown when a notice ID is requested that does not exist.
-#: lib/command.php:82 lib/command.php:106
 msgid "Notice with that id does not exist."
 msgstr "Avizo kun tiu identigaĵo ne ekzistas."
 
 #. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
 #. TRANS: Error text shown when a last user notice is requested and it does not exist.
-#: lib/command.php:99 lib/command.php:642
 msgid "User has no last notice."
 msgstr "La uzanto ne havas lastan averton."
 
 #. TRANS: Message given requesting a profile for a non-existing user.
 #. TRANS: %s is the nickname of the user for which the profile could not be found.
-#: lib/command.php:128
 #, php-format
 msgid "Could not find a user with nickname %s."
 msgstr "Ne povas trovi uzanton kun kromnomo %s."
 
 #. TRANS: Message given getting a non-existing user.
 #. TRANS: %s is the nickname of the user that could not be found.
-#: lib/command.php:148
 #, php-format
 msgid "Could not find a local user with nickname %s."
 msgstr "Ne troviĝas loka uzanto kun alnomo %s."
 
 #. TRANS: Error text shown when an unimplemented command is given.
-#: lib/command.php:183
 msgid "Sorry, this command is not yet implemented."
 msgstr "Pardonon, la komando ankoraŭ ne realiĝas."
 
 #. TRANS: Command exception text shown when a user tries to nudge themselves.
-#: lib/command.php:229
 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr "Iom sensencas puŝeti vin mem!"
 
 #. TRANS: Message given having nudged another user.
 #. TRANS: %s is the nickname of the user that was nudged.
-#: lib/command.php:238
 #, php-format
 msgid "Nudge sent to %s."
 msgstr "Puŝeto sendiĝas al %s"
@@ -7931,7 +6537,6 @@ msgstr "Puŝeto sendiĝas al %s"
 #. TRANS: %1$s is the number of other user the user is subscribed to.
 #. TRANS: %2$s is the number of users that are subscribed to the user.
 #. TRANS: %3$s is the number of notices the user has sent.
-#: lib/command.php:268
 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"
@@ -7943,40 +6548,34 @@ msgstr ""
 "Avizoj: %3$s"
 
 #. TRANS: Error message text shown when a favorite could not be set because it has already been favorited.
-#: lib/command.php:298
 #, fuzzy
 msgid "Could not create favorite: already favorited."
 msgstr "Malsukcesis krei ŝataton."
 
 #. TRANS: Text shown when a notice has been marked as favourite successfully.
-#: lib/command.php:324
 msgid "Notice marked as fave."
 msgstr "Avizo ŝatiĝas."
 
 #. TRANS: Message given having added a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:369
 #, php-format
 msgid "%1$s joined group %2$s."
 msgstr "%1$s aniĝis al grupo %2$s."
 
 #. TRANS: Message given having removed a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:417
 #, php-format
 msgid "%1$s left group %2$s."
 msgstr "%1$s foriras de grupo %2$s."
 
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: lib/command.php:438
 #, fuzzy, php-format
 msgctxt "WHOIS"
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
 
 #. TRANS: Whois output. %s is the full name of the queried user.
-#: lib/command.php:442
 #, php-format
 msgid "Fullname: %s"
 msgstr "Plennomo: %s"
@@ -7984,7 +6583,6 @@ msgstr "Plennomo: %s"
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a location.
-#: lib/command.php:446 lib/mail.php:275
 #, php-format
 msgid "Location: %s"
 msgstr "Loko: %s"
@@ -7992,20 +6590,17 @@ msgstr "Loko: %s"
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a homepage.
-#: lib/command.php:450 lib/mail.php:279
 #, php-format
 msgid "Homepage: %s"
 msgstr "Hejmpaĝo: %s"
 
 #. TRANS: Whois output. %s is the bio information of the queried user.
-#: lib/command.php:454
 #, php-format
 msgid "About: %s"
 msgstr "Biografio: %s"
 
 #. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).
 #. TRANS: %s is a remote profile.
-#: lib/command.php:483
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
@@ -8016,33 +6611,32 @@ msgstr ""
 
 #. TRANS: Message given if content is too long. %1$sd is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:500
 #, fuzzy, php-format
 msgid "Message too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
 msgstr[0] "Mesaĝo tro longas - longlimo estas %1$d, via estas %2$d"
 msgstr[1] "Mesaĝo tro longas - longlimo estas %1$d, via estas %2$d"
 
+#. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
+msgid "You can't send a message to this user."
+msgstr "Vi ne povas sendi mesaĝon al la uzanto."
+
 #. TRANS: Error text shown sending a direct message fails with an unknown reason.
-#: lib/command.php:528
 msgid "Error sending direct message."
 msgstr "Eraris sendi rektan mesaĝon."
 
 #. TRANS: Message given having repeated a notice from another user.
 #. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:565
 #, php-format
 msgid "Notice from %s repeated."
 msgstr "Avizo de %s ripetiĝas."
 
 #. TRANS: Error text shown when repeating a notice fails with an unknown reason.
-#: lib/command.php:568
 msgid "Error repeating notice."
 msgstr "Eraris ripeti avizon."
 
 #. TRANS: Message given if content of a notice for a reply is too long. %1$d is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:603
 #, fuzzy, php-format
 msgid "Notice too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Notice too long - maximum is %1$d characters, you sent %2$d."
@@ -8055,100 +6649,83 @@ msgstr[1] ""
 
 #. TRANS: Text shown having sent a reply to a notice successfully.
 #. TRANS: %s is the nickname of the user of the notice the reply was sent to.
-#: lib/command.php:616
 #, php-format
 msgid "Reply to %s sent."
 msgstr "Respondo al %s sendiĝas."
 
 #. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
-#: lib/command.php:619
 msgid "Error saving notice."
 msgstr "Eraris sendi avizon."
 
 #. TRANS: Error text shown when no username was provided when issuing a subscribe command.
-#: lib/command.php:666
 msgid "Specify the name of the user to subscribe to."
 msgstr "Specifu nomon de la abonota uzanto."
 
 #. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
-#: lib/command.php:675
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "Malsukcesis aboni OMB-profilon per komando."
 
 #. TRANS: Text shown after having subscribed to another user successfully.
 #. TRANS: %s is the name of the user the subscription was requested for.
-#: lib/command.php:683
 #, php-format
 msgid "Subscribed to %s."
 msgstr "%s abonita"
 
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.
-#: lib/command.php:704 lib/command.php:815
 msgid "Specify the name of the user to unsubscribe from."
 msgstr "Specifu la nomon de uzanto malabonota."
 
 #. TRANS: Text shown after having unsubscribed from another user successfully.
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:715
 #, php-format
 msgid "Unsubscribed from %s."
 msgstr "%s malabonita."
 
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
-#: lib/command.php:735 lib/command.php:761
 msgid "Command not yet implemented."
 msgstr "Komando ankoraŭ ne realigita."
 
 #. TRANS: Text shown when issuing the command "off" successfully.
-#: lib/command.php:739
 msgid "Notification off."
 msgstr "Sciigo for."
 
 #. TRANS: Error text shown when the command "off" fails for an unknown reason.
-#: lib/command.php:742
 msgid "Can't turn off notification."
 msgstr "Malsukcesis malŝalti sciigon."
 
 #. TRANS: Text shown when issuing the command "on" successfully.
-#: lib/command.php:765
 msgid "Notification on."
 msgstr "Sciigo en."
 
 #. TRANS: Error text shown when the command "on" fails for an unknown reason.
-#: lib/command.php:768
 msgid "Can't turn on notification."
 msgstr "Malsukcesis ŝalti sciigon."
 
 #. TRANS: Error text shown when issuing the login command while login is disabled.
-#: lib/command.php:782
 msgid "Login command is disabled."
 msgstr "Ensaluta komando malebliĝas."
 
 #. TRANS: Text shown after issuing the login command successfully.
 #. TRANS: %s is a logon link..
-#: lib/command.php:795
 #, php-format
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr "Ĉi tiu ligilo estas uzebla nur unufoje kaj valida nur 2 minutojn: %s."
 
 #. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:824
 #, php-format
 msgid "Unsubscribed %s."
 msgstr "%s malaboniĝas."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
-#: lib/command.php:842
 msgid "You are not subscribed to anyone."
 msgstr "Vi ne abonas iun ajn."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
-#: lib/command.php:847
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Vi abonas jenan homon:"
@@ -8156,14 +6733,12 @@ msgstr[1] "Vi abonas jenajn homojn:"
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user
 #. TRANS: (followers) without having any subscribers.
-#: lib/command.php:869
 msgid "No one is subscribed to you."
 msgstr "Neniu abonas vin."
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
-#: lib/command.php:874
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "La homo abonas vin:"
@@ -8171,21 +6746,18 @@ msgstr[1] "La homoj abonas vin:"
 
 #. TRANS: Text shown after requesting groups a user is subscribed to without having
 #. TRANS: any group subscriptions.
-#: lib/command.php:896
 msgid "You are not a member of any groups."
 msgstr "Vi ne estas grupano de iu ajn grupo."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
-#: lib/command.php:901
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "Vi estas grupano de jena grupo:"
 msgstr[1] "Vi estas grupano de jenaj grupoj:"
 
 #. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-#: lib/command.php:916
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -8266,71 +6838,58 @@ msgstr ""
 "tracking — ankoraŭ ne realigita;\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:36
 #, fuzzy
 msgid "No configuration file found."
 msgstr "Ne troviĝas agorda dosiero. "
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:39
 #, fuzzy
 msgid "I looked for configuration files in the following places:"
 msgstr "Mi serĉis agordan dosieron je jenaj lokoj: "
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:42
 msgid "You may wish to run the installer to fix this."
 msgstr "Vi eble volas uzi instalilon por ripari tiun ĉi."
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:46
 msgid "Go to the installer."
 msgstr "Al la instalilo."
 
-#: lib/dberroraction.php:59
 msgid "Database error"
 msgstr "Datumbaza eraro"
 
 #. TRANS: Description of form for deleting a user.
-#: lib/deleteuserform.php:75
 msgid "Delete this user"
 msgstr "Forigi la uzanton"
 
-#: lib/designform.php:114
 #, fuzzy
 msgid "Change design"
 msgstr "Savi desegnon"
 
 #. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: lib/designform.php:131
 msgid "Change colours"
 msgstr "Ŝanĝi kolorojn"
 
 #. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: lib/designform.php:138
 msgid "Use defaults"
 msgstr "Uzu defaŭlton"
 
 #. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: lib/designform.php:140
 msgid "Restore default designs"
 msgstr "Restaŭri defaŭltajn desegnojn"
 
 #. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: lib/designform.php:148
 msgid "Reset back to default"
 msgstr "Redefaŭltiĝi"
 
 #. TRANS: Label in form on profile design page.
 #. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
-#: lib/designform.php:158
 msgid "Upload file"
 msgstr "Alŝuti dosieron"
 
 #. TRANS: Instructions for form on profile design page.
-#: lib/designform.php:163
 #, fuzzy
 msgid ""
 "You can upload your personal background image. The maximum file size is 2Mb."
@@ -8338,49 +6897,41 @@ msgstr ""
 "Vi povas alŝuti vian propran fonbildon. La dosiera grandlimo estas 2MB."
 
 #. TRANS: Radio button on profile design page that will enable use of the uploaded profile image.
-#: lib/designform.php:194
 #, fuzzy
 msgctxt "RADIO"
 msgid "On"
 msgstr "En"
 
 #. TRANS: Radio button on profile design page that will disable use of the uploaded profile image.
-#: lib/designform.php:211
 #, fuzzy
 msgctxt "RADIO"
 msgid "Off"
 msgstr "For"
 
 #. TRANS: Title for button on profile design page to save settings.
-#: lib/designform.php:322
 msgid "Save design"
 msgstr "Savi desegnon"
 
 #. TRANS: Error message displayed if design settings could not be saved.
 #. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
-#: lib/designsettings.php:216 lib/designsettings.php:238
 msgid "Couldn't update your design."
 msgstr "Malsukcesis ĝisdatigi vian desegnon."
 
 #. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
-#: lib/designsettings.php:244
 msgid "Design defaults restored."
 msgstr "Desegnaj defaŭltoj konserviĝas."
 
 #. TRANS: Exception. %s is an ID.
-#: lib/discovery.php:153
 #, fuzzy, php-format
 msgid "Unable to find services for %s."
 msgstr "Maleble revoki aliradon al aplikaĵo: %s."
 
 #. TRANS: Form legend for removing the favourite status for a favourite notice.
 #. TRANS: Title for button text for removing the favourite status for a favourite notice.
-#: lib/disfavorform.php:108 lib/disfavorform.php:140
 msgid "Disfavor this notice"
 msgstr "Neŝati la avizon"
 
 #. TRANS: Button text for removing the favourite status for a favourite notice.
-#: lib/disfavorform.php:136
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Disfavor favorite"
@@ -8388,104 +6939,82 @@ msgstr "Malŝati ŝataton."
 
 #. TRANS: Form legend for adding the favourite status to a notice.
 #. TRANS: Title for button text for adding the favourite status to a notice.
-#: lib/favorform.php:108 lib/favorform.php:139
 msgid "Favor this notice"
 msgstr "Ŝati la avizon"
 
 #. TRANS: Button text for adding the favourite status to a notice.
-#: lib/favorform.php:135
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Favor"
 msgstr "Ŝati"
 
-#: lib/feed.php:84
 msgid "RSS 1.0"
 msgstr "RSS 1.0"
 
-#: lib/feed.php:86
 msgid "RSS 2.0"
 msgstr "RSS 2.0"
 
-#: lib/feed.php:88
 msgid "Atom"
 msgstr "Atom"
 
-#: lib/feed.php:90
 msgid "FOAF"
 msgstr "FOAF"
 
-#: lib/feedimporter.php:75
 #, fuzzy
 msgid "Not an atom feed."
 msgstr "Ĉiuj grupanoj"
 
-#: lib/feedimporter.php:82
 msgid "No author in the feed."
 msgstr ""
 
-#: lib/feedimporter.php:89
 msgid "Can't import without a user."
 msgstr ""
 
 #. TRANS: Header for feed links (h2).
-#: lib/feedlist.php:66
 msgid "Feeds"
 msgstr "Fluoj"
 
-#: lib/galleryaction.php:128
 msgid "All"
 msgstr "Ĉiuj"
 
-#: lib/galleryaction.php:136
 msgid "Select tag to filter"
 msgstr "Eletu etikedon por filtrado"
 
-#: lib/galleryaction.php:137
 msgid "Tag"
 msgstr "Etikedo"
 
-#: lib/galleryaction.php:138
 msgid "Choose a tag to narrow list"
 msgstr ""
 
-#: lib/galleryaction.php:140
 msgid "Go"
 msgstr "Iri"
 
-#: lib/grantroleform.php:91
 #, php-format
 msgid "Grant this user the \"%s\" role"
 msgstr "Donu al la uzanto rolon \"%s\""
 
-#: lib/groupeditform.php:147
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "1-64 minusklaj literoj aŭ ciferoj, neniu interpunkcio aŭ spaco"
 
-#: lib/groupeditform.php:156
 #, fuzzy
 msgid "URL of the homepage or blog of the group or topic."
 msgstr "URL de la hejmpaĝo aŭ blogo de la grupo aŭ temo"
 
-#: lib/groupeditform.php:161
 msgid "Describe the group or topic"
 msgstr "Priskribo de grupo aŭ temo"
 
-#: lib/groupeditform.php:163
 #, fuzzy, php-format
 msgid "Describe the group or topic in %d character or less"
 msgid_plural "Describe the group or topic in %d characters or less"
 msgstr[0] "Priskribo de grupo aŭ temo, apenaŭ je %d literoj"
 msgstr[1] "Priskribo de grupo aŭ temo, apenaŭ je %d literoj"
 
-#: lib/groupeditform.php:175
 #, fuzzy
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\"."
 msgstr ""
 "Loko de la grupo, se iu ajn, ekzemple \"Urbo, Stato (aŭ Regiono), Lando\""
 
-#: lib/groupeditform.php:183
 #, fuzzy, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -8499,70 +7028,60 @@ msgstr[1] ""
 "Kromaj alnomoj por la grupo, apartigita per komo aŭ spaco, apenaŭ %d literoj"
 
 #. TRANS: Menu item in the group navigation page.
-#: lib/groupnav.php:86
 msgctxt "MENU"
 msgid "Group"
 msgstr "Grupo"
 
 #. TRANS: Tooltip for menu item in the group navigation page.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:89
 #, php-format
 msgctxt "TOOLTIP"
 msgid "%s group"
 msgstr "Grupo %s"
 
 #. TRANS: Menu item in the group navigation page.
-#: lib/groupnav.php:95
 msgctxt "MENU"
 msgid "Members"
 msgstr "Grupanoj"
 
 #. TRANS: Tooltip for menu item in the group navigation page.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:98
 #, php-format
 msgctxt "TOOLTIP"
 msgid "%s group members"
 msgstr "Grupanoj de %s"
 
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/groupnav.php:108
 msgctxt "MENU"
 msgid "Blocked"
 msgstr "Blokito"
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:111
 #, php-format
 msgctxt "TOOLTIP"
 msgid "%s blocked users"
 msgstr "Blokito de %s"
 
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "Administri"
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:120
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Edit %s group properties"
 msgstr "Redakti agordon de grupo %s"
 
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/groupnav.php:126
 msgctxt "MENU"
 msgid "Logo"
 msgstr "Emblemo"
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:129
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Add or edit %s logo"
@@ -8570,70 +7089,58 @@ msgstr "Aldoni aŭ redakti emblemon de %s"
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:138
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Add or edit %s design"
 msgstr "Aldoni aŭ redakti desegnon de %s"
 
 #. TRANS: Title for groups with the most members section.
-#: lib/groupsbymemberssection.php:71
 msgid "Groups with most members"
 msgstr "Grupoj kun plej multe da membroj"
 
 #. TRANS: Title for groups with the most posts section.
-#: lib/groupsbypostssection.php:71
 msgid "Groups with most posts"
 msgstr "Grupoj kun plej multe da avizoj"
 
 #. TRANS: Title for group tag cloud section.
 #. TRANS: %s is a group name.
-#: lib/grouptagcloudsection.php:57
 #, php-format
 msgid "Tags in %s group's notices"
 msgstr "Etikedoj en avizoj de grupo %s"
 
 #. TRANS: Client exception 406
-#: lib/htmloutputter.php:104
 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"
 
 #. TRANS: Exception thrown when trying to upload an unsupported image file format.
-#: lib/imagefile.php:73
 #, fuzzy
 msgid "Unsupported image file format."
 msgstr "Formato ne subtenata."
 
 #. TRANS: Exception thrown when too large a file is uploaded.
 #. TRANS: %s is the maximum file size, for example "500b", "10kB" or "2MB".
-#: lib/imagefile.php:91
 #, php-format
 msgid "That file is too big. The maximum file size is %s."
 msgstr "La dosiero tro grandas. Dosiera grandlimo estas %s."
 
 #. TRANS: Exception thrown when uploading an image and that action could not be completed.
-#: lib/imagefile.php:97
 msgid "Partial upload."
 msgstr "Parta alŝuto."
 
 #. TRANS: Exception thrown when uploading a file as image that is not an image or is a corrupt file.
-#: lib/imagefile.php:115
 msgid "Not an image or corrupt file."
 msgstr "Ne bildo aŭ dosiero difektita."
 
 #. TRANS: Exception thrown during resize when image has been registered as present, but is no longer there.
-#: lib/imagefile.php:178
 msgid "Lost our file."
 msgstr "Perdiĝis nian dosieron."
 
 #. TRANS: Exception thrown when trying to resize an unknown file type.
 #. TRANS: Exception thrown when trying resize an unknown file type.
-#: lib/imagefile.php:216 lib/imagefile.php:257
 msgid "Unknown file type"
 msgstr "Nekonata dosiertipo"
 
 #. TRANS: Number of megabytes. %d is the number.
-#: lib/imagefile.php:303
 #, fuzzy, php-format
 msgid "%dMB"
 msgid_plural "%dMB"
@@ -8641,7 +7148,6 @@ msgstr[0] "MB"
 msgstr[1] "MB"
 
 #. TRANS: Number of kilobytes. %d is the number.
-#: lib/imagefile.php:307
 #, fuzzy, php-format
 msgid "%dkB"
 msgid_plural "%dkB"
@@ -8649,14 +7155,12 @@ msgstr[0] "kB"
 msgstr[1] "kB"
 
 #. TRANS: Number of bytes. %d is the number.
-#: lib/imagefile.php:310
 #, php-format
 msgid "%dB"
 msgid_plural "%dB"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/implugin.php:262
 #, php-format
 msgid ""
 "User \"%s\" on %s has said that your %s screenname belongs to them. If "
@@ -8666,51 +7170,42 @@ msgid ""
 "message."
 msgstr ""
 
-#: lib/implugin.php:349
 #, php-format
 msgid "Unknown inbox source %d."
 msgstr "Nekonata alvenkesta fonto %d"
 
-#: lib/implugin.php:485
-#, fuzzy, php-format
+#, php-format
 msgid "Message too long - maximum is %1$d characters, you sent %2$d."
 msgstr "Mesaĝo tro longas - longlimo estas %1$d, via estas %2$d"
 
-#: lib/leaveform.php:114
 msgid "Leave"
 msgstr "Forlasi"
 
 #. TRANS: Menu item for logging in to the StatusNet site.
-#: lib/logingroupnav.php:77
 msgctxt "MENU"
 msgid "Login"
 msgstr "Ensaluti"
 
 #. TRANS: Title for menu item for logging in to the StatusNet site.
-#: lib/logingroupnav.php:79
 msgid "Login with a username and password"
 msgstr "Ensaluti per via uzantnomo kaj pasvorto."
 
 #. TRANS: Menu item for registering with the StatusNet site.
-#: lib/logingroupnav.php:85
 msgctxt "MENU"
 msgid "Register"
 msgstr "Registriĝi"
 
 #. TRANS: Title for menu item for registering with the StatusNet site.
-#: lib/logingroupnav.php:87
 msgid "Sign up for a new account"
 msgstr "Krei novan konton"
 
 #. TRANS: Subject for address confirmation email.
-#: lib/mail.php:172
 msgid "Email address confirmation"
 msgstr "Retpoŝtadresa konfirmo"
 
 #. TRANS: Body for address confirmation email.
 #. TRANS: %1$s is the addressed user's nickname, %2$s is the StatusNet sitename,
 #. TRANS: %3$s is the URL to confirm at.
-#: lib/mail.php:177
 #, fuzzy, php-format
 msgid ""
 "Hey, %1$s.\n"
@@ -8741,14 +7236,12 @@ msgstr ""
 
 #. TRANS: Subject of new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
-#: lib/mail.php:243
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1$s nun rigardas viajn avizojn ĉe %2$s."
 
 #. TRANS: This is a paragraph in a new-subscriber e-mail.
 #. TRANS: %s is a URL where the subscriber can be reported as abusive.
-#: lib/mail.php:250
 #, php-format
 msgid ""
 "If you believe this account is being used abusively, you can block them from "
@@ -8762,7 +7255,6 @@ msgstr ""
 #. TRANS: %3$s is the subscriber's profile URL, %4$s is the subscriber's location (or empty)
 #. TRANS: %5$s is the subscriber's homepage URL (or empty), %6%s is the subscriber's bio (or empty)
 #. TRANS: %7$s is a link to the addressed user's e-mail settings.
-#: lib/mail.php:260
 #, fuzzy, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -8789,14 +7281,12 @@ msgstr ""
 
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is biographical information.
-#: lib/mail.php:283
 #, php-format
 msgid "Bio: %s"
 msgstr "Biografio: %s"
 
 #. TRANS: Subject of notification mail for new posting email address.
 #. TRANS: %s is the StatusNet sitename.
-#: lib/mail.php:312
 #, php-format
 msgid "New email address for posting to %s"
 msgstr "Nova retpoŝta adreso por afiŝi ĉe %s"
@@ -8804,7 +7294,6 @@ msgstr "Nova retpoŝta adreso por afiŝi ĉe %s"
 #. TRANS: Body of notification mail for new posting email address.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is the e-mail address to send
 #. TRANS: to to post by e-mail, %3$s is a URL to more instructions.
-#: lib/mail.php:318
 #, fuzzy, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -8827,26 +7316,22 @@ msgstr ""
 
 #. TRANS: Subject line for SMS-by-email notification messages.
 #. TRANS: %s is the posting user's nickname.
-#: lib/mail.php:439
 #, php-format
 msgid "%s status"
 msgstr "%s stato"
 
 #. TRANS: Subject line for SMS-by-email address confirmation message.
-#: lib/mail.php:465
 msgid "SMS confirmation"
 msgstr "SMS-a konfirmo"
 
 #. TRANS: Main body heading for SMS-by-email address confirmation message.
 #. TRANS: %s is the addressed user's nickname.
-#: lib/mail.php:469
 #, php-format
 msgid "%s: confirm you own this phone number with this code:"
 msgstr "%s: konfirmi ke vi havas la telefonnumeron per tiu ĉi kodo:"
 
 #. TRANS: Subject for 'nudge' notification email.
 #. TRANS: %s is the nudging user.
-#: lib/mail.php:490
 #, fuzzy, php-format
 msgid "You have been nudged by %s"
 msgstr "Vin puŝetis %s"
@@ -8854,7 +7339,6 @@ msgstr "Vin puŝetis %s"
 #. TRANS: Body for 'nudge' notification email.
 #. TRANS: %1$s is the nuding user's long name, $2$s is the nudging user's nickname,
 #. TRANS: %3$s is a URL to post notices at, %4$s is the StatusNet sitename.
-#: lib/mail.php:497
 #, php-format
 msgid ""
 "%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -8883,7 +7367,6 @@ msgstr ""
 
 #. TRANS: Subject for direct-message notification email.
 #. TRANS: %s is the sending user's nickname.
-#: lib/mail.php:544
 #, php-format
 msgid "New private message from %s"
 msgstr "Nova privata mesaĝo de %s"
@@ -8892,7 +7375,6 @@ msgstr "Nova privata mesaĝo de %s"
 #. TRANS: %1$s is the sending user's long name, %2$s is the sending user's nickname,
 #. TRANS: %3$s is the message content, %4$s a URL to the message,
 #. TRANS: %5$s is the StatusNet sitename.
-#: lib/mail.php:552
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -8927,7 +7409,6 @@ msgstr ""
 
 #. TRANS: Subject for favorite notification e-mail.
 #. TRANS: %1$s is the adding user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:604
 #, fuzzy, php-format
 msgid "%1$s (@%2$s) added your notice as a favorite"
 msgstr "%s (@%s) ŝatis vian avizon"
@@ -8937,7 +7418,6 @@ msgstr "%s (@%s) ŝatis vian avizon"
 #. TRANS: %3$s is a URL to the faved notice, %4$s is the faved notice text,
 #. TRANS: %5$s is a URL to all faves of the adding user, %6$s is the StatusNet sitename,
 #. TRANS: %7$s is the adding user's nickname.
-#: lib/mail.php:611
 #, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -8975,7 +7455,6 @@ msgstr ""
 "%6$s\n"
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:669
 #, php-format
 msgid ""
 "The full conversation can be read here:\n"
@@ -8988,7 +7467,6 @@ msgstr ""
 
 #. TRANS: E-mail subject for notice notification.
 #. TRANS: %1$s is the sending user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:677
 #, fuzzy, php-format
 msgid "%1$s (@%2$s) sent a notice to your attention"
 msgstr "%s (@%s) afiŝis avizon al vi"
@@ -8999,7 +7477,6 @@ msgstr "%s (@%s) afiŝis avizon al vi"
 #. TRANS: %5$s is a URL to the full conversion if it exists (otherwise empty),
 #. TRANS: %6$s is a URL to reply to the notice, %7$s is a URL to all @-replied for the addressed user,
 #. TRANS: %8$s is a URL to the addressed user's e-mail settings, %9$s is the sender's nickname.
-#: lib/mail.php:685
 #, php-format
 msgid ""
 "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -9048,11 +7525,9 @@ msgstr ""
 "\n"
 "P.S. Vi rajtas malŝalti tian ĉi retpoŝtan sciigon ĉi tie: %8$s\n"
 
-#: lib/mailbox.php:87
 msgid "Only the user can read their own mailboxes."
 msgstr "Nur uzanto povas legi sian propran paŝton."
 
-#: lib/mailbox.php:125
 msgid ""
 "You have no private messages. You can send private message to engage other "
 "users in conversation. People can send you messages for your eyes only."
@@ -9060,54 +7535,44 @@ msgstr ""
 "Vi ne ricevis privatan mesaĝon. Vi povas sendi privatan mesaĝon al iu kaj "
 "interparoli kun ili. Homo sendas al vi mesaĝon al vi sole."
 
-#: lib/mailhandler.php:37
 #, fuzzy
 msgid "Could not parse message."
 msgstr "Malsukcesis ĝisdatigi uzanton"
 
-#: lib/mailhandler.php:42
 msgid "Not a registered user."
 msgstr "Ne registrita uzanto"
 
-#: lib/mailhandler.php:46
 msgid "Sorry, that is not your incoming email address."
 msgstr "Pardonon, tiu ne estas via alvena retpoŝtadreso."
 
-#: lib/mailhandler.php:50
 msgid "Sorry, no incoming email allowed."
 msgstr "Pardonon, neniu alvena mesaĝo permesiĝas."
 
-#: lib/mailhandler.php:229
 #, php-format
 msgid "Unsupported message type: %s"
 msgstr "Nesubtenata mesaĝo-tipo: %s"
 
 #. TRANS: Client exception thrown when a database error was thrown during a file upload operation.
-#: lib/mediafile.php:102 lib/mediafile.php:174
 msgid "There was a database error while saving your file. Please try again."
 msgstr "Databaze eraris konservi vian dosieron. Bonvole reprovu."
 
 #. TRANS: Client exception thrown when a file upload operation would cause a user to exceed a set quota.
-#: lib/mediafile.php:238 lib/mediafile.php:281
 msgid "File exceeds user's quota."
 msgstr "Dosiera grandeco superas uzantan kvoton."
 
 #. TRANS: Client exception thrown when a file upload operation fails because the file could
 #. TRANS: not be moved from the temporary folder to the permanent file location.
-#: lib/mediafile.php:258 lib/mediafile.php:300
 msgid "File could not be moved to destination directory."
 msgstr "Dosiero ne povas translokiĝi al celata dosierujo."
 
 #. TRANS: Client exception thrown when a file upload operation has been stopped because the MIME
 #. TRANS: type of the uploaded file could not be determined.
-#: lib/mediafile.php:265 lib/mediafile.php:306
 msgid "Could not determine file's MIME type."
 msgstr "Malsukcesis decidi dosieran MIME-tipon."
 
 #. TRANS: Client exception thrown trying to upload a forbidden MIME type.
 #. TRANS: %1$s is the file type that was denied, %2$s is the application part of
 #. TRANS: the MIME type that was denied.
-#: lib/mediafile.php:396
 #, php-format
 msgid ""
 "\"%1$s\" is not a supported file type on this server. Try using another %2$s "
@@ -9118,84 +7583,75 @@ msgstr ""
 
 #. TRANS: Client exception thrown trying to upload a forbidden MIME type.
 #. TRANS: %s is the file type that was denied.
-#: lib/mediafile.php:401
 #, php-format
 msgid "\"%s\" is not a supported file type on this server."
 msgstr "\"%s\" ne estas subtenata tipo ĉe tiu ĉi servilo."
 
-#: lib/messageform.php:120
 msgid "Send a direct notice"
 msgstr "Sendi rektan avizon"
 
 #. TRANS Label entry in drop-down selection box in direct-message inbox/outbox. This is the default entry in the drop-down box, doubling as instructions and a brake against accidental submissions with the first user in the list.
-#: lib/messageform.php:137
 #, fuzzy
 msgid "Select recipient:"
 msgstr "Elektu peranton"
 
 #. TRANS Entry in drop-down selection box in direct-message inbox/outbox when no one is available to message.
-#: lib/messageform.php:150
 #, fuzzy
 msgid "No mutual subscribers."
 msgstr "Ne abonato!"
 
-#: lib/messageform.php:153
 msgid "To"
 msgstr "Al"
 
-#: lib/messageform.php:184 lib/noticeform.php:236
 msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr "Sendi"
 
-#: lib/messagelist.php:77
 #, fuzzy
 msgid "Messages"
 msgstr "Mesaĝo"
 
-#: lib/messagelistitem.php:123 lib/noticelist.php:527
 msgid "from"
 msgstr "de"
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:178
 msgid "Nickname cannot be empty."
 msgstr ""
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:191
 #, php-format
 msgid "Nickname cannot be more than %d character long."
 msgid_plural "Nickname cannot be more than %d characters long."
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/noticeform.php:160
+#. TRANS: Form legend for notice form.
 msgid "Send a notice"
 msgstr "Sendi avizon"
 
-#: lib/noticeform.php:174
+#. TRANS: Title for notice label. %s is the user's nickname.
 #, php-format
 msgid "What's up, %s?"
 msgstr "Kio novas, %s?"
 
-#: lib/noticeform.php:193
+#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr "Aldoni"
 
-#: lib/noticeform.php:197
-msgid "Attach a file"
+#. TRANS: Title for input field to attach a file to a notice.
+#, fuzzy
+msgid "Attach a file."
 msgstr "Aldoni dosieron"
 
-#: lib/noticeform.php:212
+#. TRANS: Field label to add location to a notice.
 msgid "Share my location"
 msgstr "Sciigi mian lokon"
 
-#: lib/noticeform.php:215
+#. TRANS: Text to not share location for a notice in notice form.
 msgid "Do not share my location"
 msgstr "Ne sciigi mian lokon"
 
-#: lib/noticeform.php:216
+#. TRANS: Timeout error text for location retrieval in notice form.
 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
 "try again later"
@@ -9204,419 +7660,318 @@ msgstr ""
 "poste."
 
 #. TRANS: Used in coordinates as abbreviation of north
-#: lib/noticelist.php:457
 msgid "N"
 msgstr "N"
 
 #. TRANS: Used in coordinates as abbreviation of south
-#: lib/noticelist.php:459
 msgid "S"
 msgstr "S"
 
 #. TRANS: Used in coordinates as abbreviation of east
-#: lib/noticelist.php:461
 msgid "E"
 msgstr "E"
 
 #. TRANS: Used in coordinates as abbreviation of west
-#: lib/noticelist.php:463
 msgid "W"
 msgstr "W"
 
-#: lib/noticelist.php:465
 #, php-format
 msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 
-#: lib/noticelist.php:474
 msgid "at"
 msgstr "al"
 
-#: lib/noticelist.php:523
 msgid "web"
 msgstr "TTT"
 
-#: lib/noticelist.php:589
 msgid "in context"
 msgstr "kuntekste"
 
-#: lib/noticelist.php:624
 msgid "Repeated by"
 msgstr "Ripetita de"
 
-#: lib/noticelist.php:651
 msgid "Reply to this notice"
 msgstr "Respondi ĉi tiun avizon"
 
-#: lib/noticelist.php:652
 msgid "Reply"
 msgstr "Respondi"
 
-#: lib/noticelist.php:678
 msgid "Delete this notice"
 msgstr "Forigi la avizon"
 
-#: lib/noticelist.php:696
 msgid "Notice repeated"
 msgstr "Avizo ripetiĝas"
 
-#: lib/nudgeform.php:116
 msgid "Nudge this user"
 msgstr "Puŝeti la uzanton"
 
-#: lib/nudgeform.php:128
 msgid "Nudge"
 msgstr "Puŝeti"
 
-#: lib/nudgeform.php:128
 msgid "Send a nudge to this user"
 msgstr "Sendi puŝeton al la uzanto"
 
-#: lib/oauthstore.php:294
 msgid "Error inserting new profile."
 msgstr "Eraris enmeti novan profilon"
 
-#: lib/oauthstore.php:302
 msgid "Error inserting avatar."
 msgstr "Eraris enmeti novan vizaĝbildon."
 
-#: lib/oauthstore.php:322
 msgid "Error inserting remote profile."
 msgstr "Eraris enmeti foran profilon."
 
 #. TRANS: Exception thrown when a notice is denied because it has been sent before.
-#: lib/oauthstore.php:362
 msgid "Duplicate notice."
 msgstr "Refoja avizo."
 
-#: lib/oauthstore.php:507
 msgid "Couldn't insert new subscription."
 msgstr "Eraris enmeti novan abonon."
 
-#: lib/personalgroupnav.php:104
-#, fuzzy
 msgid "Replies"
 msgstr "Respondoj"
 
-#: lib/personalgroupnav.php:109
-#, fuzzy
 msgid "Favorites"
 msgstr "Ŝatolisto"
 
-#: lib/personalgroupnav.php:120
-#, fuzzy
 msgid "Inbox"
 msgstr "Alvenkesto"
 
-#: lib/personalgroupnav.php:121
 msgid "Your incoming messages"
 msgstr "Viaj alvenaj mesaĝoj"
 
-#: lib/personalgroupnav.php:125
-#, fuzzy
 msgid "Outbox"
 msgstr "Elirkesto"
 
-#: lib/personalgroupnav.php:126
 msgid "Your sent messages"
 msgstr "Viaj senditaj mesaĝoj"
 
 #. TRANS: Title for personal tag cloud section. %s is a user nickname.
-#: lib/personaltagcloudsection.php:56
 #, php-format
 msgid "Tags in %s's notices"
 msgstr "Etikedoj en avizoj de %s"
 
 #. TRANS: Displayed as version information for a plugin if no version information was found.
-#: lib/plugin.php:126
 msgid "Unknown"
 msgstr "Nekonata"
 
 #. TRANS: Plugin admin panel controls
-#: lib/plugindisableform.php:90
 msgctxt "plugin"
 msgid "Disable"
 msgstr ""
 
 #. TRANS: Plugin admin panel controls
-#: lib/pluginenableform.php:112
 msgctxt "plugin"
 msgid "Enable"
 msgstr ""
 
-#: lib/pluginlist.php:196
 msgctxt "plugin-description"
 msgid "(Plugin descriptions unavailable when disabled.)"
 msgstr ""
 
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:88
 msgid "Subscriptions"
 msgstr "Abonatoj"
 
 #. TRANS: Text for user subscription statistics if user has more subscriptions than displayed.
-#: lib/profileaction.php:144
 msgid "All subscriptions"
 msgstr "Ĉiuj abonatoj"
 
 #. TRANS: H2 text for user subscriber statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:96
 msgid "Subscribers"
 msgstr "Abonantoj"
 
 #. TRANS: Text for user subscription statistics if user has more subscribers than displayed.
-#: lib/profileaction.php:181
 msgid "All subscribers"
 msgstr "Ĉiuj abonantoj"
 
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:213
 msgid "User ID"
 msgstr "ID de uzanto"
 
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:219
 msgid "Member since"
 msgstr "Ano ekde"
 
 #. TRANS: Label for user statistics.
 #. TRANS: H2 text for user group membership statistics.
-#: lib/profileaction.php:239 lib/profileaction.php:290
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:104
 msgid "Groups"
 msgstr "Grupoj"
 
 #. TRANS: Label for user statistics.
 #. TRANS: Average count of posts made per day since account registration.
-#: lib/profileaction.php:253
 msgid "Daily average"
 msgstr "Taga meznombro"
 
 #. TRANS: Text for user group membership statistics if user has more subscriptions than displayed.
-#: lib/profileaction.php:305
 msgid "All groups"
 msgstr "Ĉiuj grupoj"
 
 #. TRANS: Server error displayed when using an unimplemented method.
-#: lib/profileformaction.php:123
 msgid "Unimplemented method."
 msgstr "Nerealiĝita metodo"
 
-#: lib/publicgroupnav.php:82
 msgid "User groups"
 msgstr "Uzantaj grupoj"
 
-#: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
 msgid "Recent tags"
 msgstr "Freŝaj etikedoj"
 
-#: lib/publicgroupnav.php:88
 msgid "Featured"
 msgstr "Elstara"
 
-#: lib/publicgroupnav.php:92
 msgid "Popular"
 msgstr "Populara"
 
-#: lib/redirectingaction.php:95
 #, fuzzy
 msgid "No return-to arguments."
 msgstr "Ne estas aldonaĵo."
 
-#: lib/repeatform.php:107
 msgid "Repeat this notice?"
 msgstr "Ĉu ripeti la avizon?"
 
-#: lib/repeatform.php:132
 msgid "Yes"
 msgstr "Jes"
 
-#: lib/repeatform.php:132
 msgid "Repeat this notice"
 msgstr "Ripeti la avizon"
 
-#: lib/revokeroleform.php:91
 #, php-format
 msgid "Revoke the \"%s\" role from this user"
 msgstr "Revoki rolon %s de la uzanto"
 
 #. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:1001
 #, fuzzy
 msgid "Page not found."
 msgstr "Metodo de API ne troviĝas."
 
-#: lib/sandboxform.php:67
 msgid "Sandbox"
 msgstr "Provejo"
 
-#: lib/sandboxform.php:78
 msgid "Sandbox this user"
 msgstr "Provejigi la uzanton"
 
 #. TRANS: Fieldset legend for the search form.
-#: lib/searchaction.php:120
 msgid "Search site"
 msgstr "Serĉi ĉe retejo"
 
 #. TRANS: Used as a field label for the field where one or more keywords
 #. TRANS: for searching can be entered.
-#: lib/searchaction.php:128
 msgid "Keyword(s)"
 msgstr "Serĉvorto(j)"
 
 #. TRANS: Button text for searching site.
-#: lib/searchaction.php:130
 msgctxt "BUTTON"
 msgid "Search"
 msgstr "Serĉi"
 
-#: lib/searchgroupnav.php:80
 msgid "People"
 msgstr "Homon"
 
-#: lib/searchgroupnav.php:81
 msgid "Find people on this site"
 msgstr "Serĉi homon ĉe la retejo"
 
-#: lib/searchgroupnav.php:83
 msgid "Find content of notices"
 msgstr "Serĉi enhavon ĉe la retejo"
 
-#: lib/searchgroupnav.php:85
 msgid "Find groups on this site"
 msgstr "Serĉi grupon ĉe la retejo"
 
-#: lib/section.php:89
 msgid "Untitled section"
 msgstr "Sentitola sekcio"
 
-#: lib/section.php:106
 msgid "More..."
 msgstr "Pli..."
 
-#: lib/settingsnav.php:78
 msgid "Change your profile settings"
 msgstr "Ŝanĝi vian profilan agordon."
 
-#: lib/settingsnav.php:83
 msgid "Upload an avatar"
 msgstr "Alŝuti vizaĝbildon"
 
-#: lib/settingsnav.php:88
 msgid "Change your password"
 msgstr "Ŝanĝi vian pasvorton."
 
-#: lib/settingsnav.php:93
 msgid "Change email handling"
 msgstr "Ŝanĝi retpoŝtan disponadon."
 
-#: lib/settingsnav.php:98
 msgid "Design your profile"
 msgstr "Desegni vian profilon"
 
-#: lib/settingsnav.php:102
 msgid "URL"
 msgstr "URL"
 
-#: lib/settingsnav.php:103
 msgid "URL shorteners"
 msgstr ""
 
-#: lib/settingsnav.php:111
 msgid "Updates by instant messenger (IM)"
 msgstr "Ĝisdatiĝo per tujmesaĝilo."
 
-#: lib/settingsnav.php:118
 msgid "Updates by SMS"
 msgstr "Ĝisdatiĝo per SMM"
 
-#: lib/settingsnav.php:123
-#, fuzzy
 msgid "Connections"
 msgstr "Konektoj"
 
-#: lib/settingsnav.php:124
 msgid "Authorized connected applications"
 msgstr "Konektitaj aplikaĵoj rajtigitaj"
 
-#: lib/silenceform.php:67
 msgid "Silence"
 msgstr "Silento"
 
-#: lib/silenceform.php:78
 msgid "Silence this user"
 msgstr "Silentigi la uzanton"
 
-#: lib/subgroupnav.php:89
 #, php-format
 msgid "People %s subscribes to"
 msgstr "Abonatoj de %s"
 
-#: lib/subgroupnav.php:97
 #, php-format
 msgid "People subscribed to %s"
 msgstr "Abonantoj de %s"
 
-#: lib/subgroupnav.php:105
 #, php-format
 msgid "Groups %s is a member of"
 msgstr "Grupoj de %s"
 
-#: lib/subgroupnav.php:111
 msgid "Invite"
 msgstr "Inviti"
 
-#: lib/subgroupnav.php:112
 #, php-format
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Inviti amikojn kaj kolegojn al %s kun vi"
 
-#: lib/subscribeform.php:115 lib/subscribeform.php:139
 msgid "Subscribe to this user"
 msgstr "Aboni la uzanton"
 
-#: lib/subscriberspeopleselftagcloudsection.php:48
-#: lib/subscriptionspeopleselftagcloudsection.php:48
 msgid "People Tagcloud as self-tagged"
 msgstr ""
 
-#: lib/subscriberspeopletagcloudsection.php:48
-#: lib/subscriptionspeopletagcloudsection.php:48
 msgid "People Tagcloud as tagged"
 msgstr ""
 
-#: lib/tagcloudsection.php:56
 msgid "None"
 msgstr "Nenio"
 
 #. TRANS: Server exception displayed if a theme name was invalid.
-#: lib/theme.php:74
 #, fuzzy
 msgid "Invalid theme name."
 msgstr "Nevalida dosiernomo."
 
-#: lib/themeuploader.php:50
 msgid "This server cannot handle theme uploads without ZIP support."
 msgstr "Ĉi tiu servilo ne povas disponi desegnan alŝuton sen ZIP-a subteno."
 
-#: lib/themeuploader.php:58 lib/themeuploader.php:61
 msgid "The theme file is missing or the upload failed."
 msgstr "La desegna dosiero mankas aŭ malsukcesis alŝuti."
 
-#: lib/themeuploader.php:91 lib/themeuploader.php:102
-#: lib/themeuploader.php:279 lib/themeuploader.php:283
-#: lib/themeuploader.php:291 lib/themeuploader.php:298
 msgid "Failed saving theme."
 msgstr "Malsukcesis konservi desegnon."
 
-#: lib/themeuploader.php:147
 msgid "Invalid theme: bad directory structure."
 msgstr "Nevalida desegno: fuŝa dosieruja sturkturo."
 
-#: lib/themeuploader.php:166
 #, fuzzy, php-format
 msgid "Uploaded theme is too large; must be less than %d byte uncompressed."
 msgid_plural ""
@@ -9626,11 +7981,9 @@ msgstr[0] ""
 msgstr[1] ""
 "Alŝutata desegno tro grandas; ĝi estu apenaŭ %d bitoj sen densigado."
 
-#: lib/themeuploader.php:179
 msgid "Invalid theme archive: missing file css/display.css"
 msgstr "Nevalida desegna arkivo: mankas dosiero css/display.css"
 
-#: lib/themeuploader.php:219
 msgid ""
 "Theme contains invalid file or folder name. Stick with ASCII letters, "
 "digits, underscore, and minus sign."
@@ -9638,142 +7991,114 @@ msgstr ""
 "Desegno enhavas nevalidan dosieran aŭ dosierujan nomon. Uzu nur ASCII-"
 "literaron, ciferojn, substrekon kaj minussignon."
 
-#: lib/themeuploader.php:225
 msgid "Theme contains unsafe file extension names; may be unsafe."
 msgstr "Desegno enhavas malsekuran dosiersufikson; eble malsukuras."
 
-#: lib/themeuploader.php:242
 #, php-format
 msgid "Theme contains file of type '.%s', which is not allowed."
 msgstr "Desegno enhavas dosieron de tipo \".%s\", kiu malpermesiĝas."
 
-#: lib/themeuploader.php:260
 msgid "Error opening theme archive."
 msgstr "Eraris malfermi desegnan arkivon."
 
-#: lib/threadednoticelist.php:270
 #, php-format
-msgid "Show all %d comment"
-msgid_plural "Show all %d comments"
+msgid "Show %d reply"
+msgid_plural "Show all %d replies"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/topposterssection.php:74
 msgid "Top posters"
 msgstr "Pintaj afiŝantoj"
 
 #. TRANS: Title for the form to unblock a user.
-#: lib/unblockform.php:67
 #, fuzzy
 msgctxt "TITLE"
 msgid "Unblock"
 msgstr "Malbloki"
 
-#: lib/unsandboxform.php:69
 msgid "Unsandbox"
 msgstr "Malprovejigi"
 
-#: lib/unsandboxform.php:80
 msgid "Unsandbox this user"
 msgstr "Malprovejigi la uzanton"
 
-#: lib/unsilenceform.php:67
 msgid "Unsilence"
 msgstr "Nesilentigi"
 
-#: lib/unsilenceform.php:78
 msgid "Unsilence this user"
 msgstr "Nesilentigi la uzanton"
 
-#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
 msgid "Unsubscribe from this user"
 msgstr "Malaboni la uzanton"
 
-#: lib/unsubscribeform.php:137
 msgid "Unsubscribe"
 msgstr "Malaboni"
 
 #. 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).
-#: lib/usernoprofileexception.php:60
 #, fuzzy, php-format
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "La uzanto ne havas profilon."
 
-#: lib/userprofile.php:116
 msgid "Edit Avatar"
 msgstr "Redakti vizaĝbildon"
 
 #. TRANS: H2 for user actions in a profile.
 #. TRANS: H2 for entity actions in a profile.
-#: lib/userprofile.php:216 lib/userprofile.php:232
 msgid "User actions"
 msgstr "Nekonata ago"
 
 #. TRANS: Text shown in user profile of not yet compeltely deleted users.
-#: lib/userprofile.php:220
 msgid "User deletion in progress..."
 msgstr "Forigante uzanton..."
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:248
 msgid "Edit profile settings"
 msgstr "Redakti profilan agordon"
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:250
 msgid "Edit"
 msgstr "Redakti"
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:274
 msgid "Send a direct message to this user"
 msgstr "Sendi rektan mesaĝon a ĉi tiu uzanto"
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:276
 msgid "Message"
 msgstr "Mesaĝo"
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:318
 msgid "Moderate"
 msgstr "Moderigi"
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:357
 msgid "User role"
 msgstr "Uzanta rolo"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:360
 msgctxt "role"
 msgid "Administrator"
 msgstr "Administranto"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:362
 msgctxt "role"
 msgid "Moderator"
 msgstr "Moderanto"
 
-#: lib/util.php:321
 #, fuzzy
 msgid "Not allowed to log in."
 msgstr "Ne konektita."
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1337
 msgid "a few seconds ago"
 msgstr "antaŭ kelkaj sekundoj"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1340
 msgid "about a minute ago"
 msgstr "antaŭ ĉirkaŭ unu minuto"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1344
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
@@ -9781,12 +8106,10 @@ msgstr[0] "antaŭ ĉirkaŭ unu minuto"
 msgstr[1] "antaŭ ĉirkaŭ %d minutoj"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1347
 msgid "about an hour ago"
 msgstr "antaŭ ĉirkaŭ unu horo"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1351
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
@@ -9794,12 +8117,10 @@ msgstr[0] "antaŭ ĉirkaŭ unu horo"
 msgstr[1] "antaŭ ĉirkaŭ %d horoj"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1354
 msgid "about a day ago"
 msgstr "antaŭ ĉirkaŭ unu tago"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1358
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
@@ -9807,12 +8128,10 @@ msgstr[0] "antaŭ ĉirkaŭ unu tago"
 msgstr[1] "antaŭ ĉirkaŭ %d tagoj"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1361
 msgid "about a month ago"
 msgstr "Antaŭ ĉrikaŭ unu monato"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1365
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
@@ -9820,205 +8139,42 @@ msgstr[0] "antaŭ ĉirkaŭ unu monato"
 msgstr[1] "antaŭ ĉirkaŭ %d monatoj"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1368
 msgid "about a year ago"
 msgstr "antaŭ ĉirkaŭ unu jaro"
 
 #. TRANS: Web color exception thrown when a hexadecimal color code does not validate.
 #. TRANS: %s is the provided (invalid) color code.
-#: lib/webcolor.php:81 lib/webcolor.php:121
 #, fuzzy, php-format
 msgid "%s is not a valid color! Use 3 or 6 hex characters."
 msgstr "%s ne estas valida koloro! Uzu 3 aŭ 6 deksesumaĵojn."
 
 #. TRANS: Exception.
-#: lib/xrd.php:63
 #, fuzzy
 msgid "Invalid XML."
 msgstr "Grando nevalida."
 
 #. TRANS: Exception.
-#: lib/xrd.php:68
 msgid "Invalid XML, missing XRD root."
 msgstr ""
 
 #. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
-#: scripts/restoreuser.php:62
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
 
-#, fuzzy
-#~ msgid "Could not generate feed for group - %s"
-#~ msgstr "Malsukcesis ĝisdatigi grupon."
+#~ msgid "Full name is too long (max 255 chars)."
+#~ msgstr "Plennomo estas tro longa (maksimume 255 literoj)"
+
+#~ msgid "description is too long (max %d chars)."
+#~ msgstr "Priskribo estas tro longa (maksimume %d signoj)."
+
+#~ msgid "Location is too long (max 255 chars)."
+#~ msgstr "lokonomo estas tro longa (maksimume 255 literoj)"
+
+#~ msgid "Too many aliases! Maximum %d."
+#~ msgstr "Tro da alinomoj! Maksimume %d."
 
 #, fuzzy
-#~ msgid "Current confirmed Jabber/Google Talk address."
-#~ msgstr "Nuna konfirmita Jabber/GTalk-adreso."
-
-#, fuzzy
-#~ msgid ""
-#~ "Jabber or Google Talk address, like \"UserName@example.org\". First, make "
-#~ "sure to add %s to your buddy list in your IM client or on Google Talk."
-#~ msgstr ""
-#~ "Jabber/GTalk-adreso, ekzemple \"UserName@example.org\". Unue, certe "
-#~ "aldonu %s al via amikolisto je via tujmesaĝilo-kliento aŭ je GTalk."
-
-#, fuzzy
-#~ msgid "Send me notices through Jabber/Google Talk."
-#~ msgstr "Sendu al mi avizojn per Jabber/GTalk."
-
-#, fuzzy
-#~ msgid "Publish a MicroID for my Jabber/Google Talk address."
-#~ msgstr "Publikigu MikroID por mia Jabber/GTalk-adreso."
-
-#~ msgid "No Jabber ID."
-#~ msgstr "Mankas Jabber-ID."
-
-#, fuzzy
-#~ msgid "Not a valid Jabber ID."
-#~ msgstr "Tio ne estas valida Jabber-ID"
-
-#~ msgid "That is already your Jabber ID."
-#~ msgstr "Tio estas jam via Jabber-ID."
-
-#~ msgid "That is not your Jabber ID."
-#~ msgstr "Tio ne estas via Jabber-ID."
-
-#~ msgid "Other settings"
-#~ msgstr "Aliaj agordoj"
-
-#~ msgid "Tag cloud"
-#~ msgstr "Entikedo-nubo"
-
-#~ msgid "Consumer key"
-#~ msgstr "Konsumanta ŝlosilo"
-
-#~ msgid "Consumer secret"
-#~ msgstr "Konsumanta sekreto"
-
-#~ msgid "Request token URL"
-#~ msgstr "Pet-ĵetona URL"
-
-#~ msgid "Access token URL"
-#~ msgstr "Alir-ĵetona URL"
-
-#~ msgid "Authorize URL"
-#~ msgstr "Rajtigi URL"
-
-#~ msgid "Jabber"
-#~ msgstr "Jabber"
-
-#~ msgid "Photo"
-#~ msgstr "Foto"
-
-#~ msgid "Other options"
-#~ msgstr "Aliaj"
-
-#~ msgid "Other"
-#~ msgstr "Alia"
-
-#~ msgid "Primary site navigation"
-#~ msgstr "Unua reteja navigado"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Personal profile and friends timeline"
-#~ msgstr "Tempstrio pri vi kaj amikoj"
-
-#~ msgctxt "MENU"
-#~ msgid "Personal"
-#~ msgstr "Persona"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Change your email, avatar, password, profile"
-#~ msgstr "Ŝanĝu la retpoŝtadreson, vizaĝbildon, pasvorton aŭ la profilon"
-
-#~ msgid "Account"
-#~ msgstr "Konto"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Connect to services"
-#~ msgstr "Konekti al servoj"
-
-#~ msgid "Connect"
-#~ msgstr "Konekti"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Change site configuration"
-#~ msgstr "Ŝanĝi agordojn de la retejo"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Invite friends and colleagues to join you on %s"
-#~ msgstr "Inviti amikojn kaj kolegojn al %s kun vi"
-
-#~ msgctxt "MENU"
-#~ msgid "Invite"
-#~ msgstr "Inviti"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Create an account"
-#~ msgstr "Krei konton"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Help me!"
-#~ msgstr "Helpu min!"
-
-#~ msgctxt "MENU"
-#~ msgid "Help"
-#~ msgstr "Helpo"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Search for people or text"
-#~ msgstr "Serĉi homon aŭ tekston"
-
-#~ msgid "Local views"
-#~ msgstr "Loka vido"
-
-#~ msgid "Page notice"
-#~ msgstr "Paĝa anonco"
-
-#~ msgid "Secondary site navigation"
-#~ msgstr "Dua reteja navigado"
-
-#~ msgid "StatusNet software license"
-#~ msgstr "Permesilo de la programaro StatusNet"
-
-#~ msgid "Site content license"
-#~ msgstr "Reteja enhava permesilo"
-
-#~ msgid "Pagination"
-#~ msgstr "Paĝado"
-
-#~ msgid "Author"
-#~ msgstr "Aŭtoro"
-
-#~ msgid "Provider"
-#~ msgstr "Donanto"
-
-#, fuzzy
-#~ msgctxt "MENU"
-#~ msgid "SMS"
-#~ msgstr "SMS"
-
-#~ msgid "Filter tags"
-#~ msgstr "Filtrilo-etikedoj"
-
-#~ msgid "[%s]"
-#~ msgstr "[%s]"
-
-#~ msgid "Available characters"
-#~ msgstr "Haveblaj karakteroj"
-
-#, fuzzy
-#~ msgctxt "MENU"
-#~ msgid "Profile"
-#~ msgstr "Profilo"
-
-#~ msgid "Search help"
-#~ msgstr "Serĉa gvido"
-
-#, fuzzy
-#~ msgid "Message too long. Maximum is %1$d character, you sent %2$d."
-#~ msgid_plural "Message too long. Maximum is %1$d characters, you sent %2$d."
-#~ msgstr[0] "Mesaĝo tro longas - longlimo estas %1$d, via estas %2$d"
-#~ msgstr[1] "Mesaĝo tro longas - longlimo estas %1$d, via estas %2$d"
+#~ msgctxt "BUTTON"
+#~ msgid "Comment"
+#~ msgstr "Enhavo"
diff --git a/locale/es/LC_MESSAGES/statusnet.po b/locale/es/LC_MESSAGES/statusnet.po
index 5efac6b410..a9c0a7d99f 100644
--- a/locale/es/LC_MESSAGES/statusnet.po
+++ b/locale/es/LC_MESSAGES/statusnet.po
@@ -18,67 +18,57 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:23+0000\n"
-"PO-Revision-Date: 2011-03-03 17:25:55+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:15+0000\n"
 "Language-Team: Spanish <http://translatewiki.net/wiki/Portal:es>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-02-25 23:49:23+0000\n"
+"X-POT-Import-Date: 2011-03-03 17:59:19+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
-#: actions/accessadminpanel.php:53 lib/adminpanelaction.php:363
 msgid "Access"
 msgstr "Acceder"
 
 #. TRANS: Page notice.
-#: actions/accessadminpanel.php:64
 msgid "Site access settings"
 msgstr "Configuración de acceso de la web"
 
 #. TRANS: Form legend for registration form.
-#: actions/accessadminpanel.php:151
 msgid "Registration"
 msgstr "Registro"
 
 #. TRANS: Checkbox instructions for admin setting "Private".
-#: actions/accessadminpanel.php:155
 msgid "Prohibit anonymous users (not logged in) from viewing site?"
 msgstr "¿Prohibir a los usuarios anónimos (no conectados) ver el sitio?"
 
 #. TRANS: Checkbox label for prohibiting anonymous users from viewing site.
-#: actions/accessadminpanel.php:157
 msgctxt "LABEL"
 msgid "Private"
 msgstr "Privado"
 
 #. TRANS: Checkbox instructions for admin setting "Invite only".
-#: actions/accessadminpanel.php:164
 msgid "Make registration invitation only."
 msgstr "Haz que el registro sea sólo con invitaciones."
 
 #. TRANS: Checkbox label for configuring site as invite only.
-#: actions/accessadminpanel.php:166
 msgid "Invite only"
 msgstr "Invitar sólo"
 
 #. TRANS: Checkbox instructions for admin setting "Closed" (no new registrations).
-#: actions/accessadminpanel.php:173
 msgid "Disable new registrations."
 msgstr "Inhabilitar nuevos registros."
 
 #. TRANS: Checkbox label for disabling new user registrations.
-#: actions/accessadminpanel.php:175
 msgid "Closed"
 msgstr "Cerrado"
 
 #. TRANS: Title for button to save access settings in site admin panel.
-#: actions/accessadminpanel.php:191
 msgid "Save access settings"
 msgstr "Guardar la configuración de acceso"
 
@@ -86,6 +76,7 @@ msgstr "Guardar la configuración de acceso"
 #. TRANS: Button text for saving theme settings.
 #. TRANS: Button label to save e-mail preferences.
 #. TRANS: Button label to save IM preferences.
+#. TRANS: Button text in the license admin panel.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
 #. TRANS: Button text for saving site notice in admin panel.
@@ -95,21 +86,12 @@ msgstr "Guardar la configuración de acceso"
 #. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
 #. TRANS: Button text on profile design page to save settings.
-#: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
-#: actions/emailsettings.php:251 actions/imsettings.php:199
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:198
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:204
-#: actions/subscriptions.php:261 actions/urlsettings.php:152
-#: actions/useradminpanel.php:298 lib/applicationeditform.php:355
-#: lib/designform.php:320 lib/groupeditform.php:201
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Guardar"
 
 #. TRANS: Server error when page not found (404).
 #. TRANS: Server error when page not found (404)
-#: actions/all.php:68 actions/public.php:98 actions/replies.php:93
-#: actions/showfavorites.php:140 actions/tag.php:52
 msgid "No such page."
 msgstr "No existe tal página."
 
@@ -128,6 +110,7 @@ msgstr "No existe tal página."
 #. TRANS: Client error displayed when checking group membership for a non-existing user.
 #. TRANS: Client error displayed when trying to have a non-existing user join a group.
 #. TRANS: Client error displayed when trying to have a non-existing user leave a group.
+#. TRANS: Client error displayed when not providing a user or an invalid user.
 #. TRANS: Client error displayed when updating a status for a non-existing user.
 #. TRANS: Client error displayed when requesting a list of followers for a non-existing user.
 #. TRANS: Client error displayed when requesting most recent favourite notices by a user for a non-existing user.
@@ -140,6 +123,8 @@ msgstr "No existe tal página."
 #. 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.
 #. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
@@ -147,33 +132,10 @@ msgstr "No existe tal página."
 #. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when calling a profile action without specifying a user.
-#: actions/all.php:80 actions/allrss.php:69
-#: actions/apiaccountupdatedeliverydevice.php:110
-#: actions/apiaccountupdateprofile.php:103
-#: actions/apiaccountupdateprofilebackgroundimage.php:118
-#: actions/apiaccountupdateprofileimage.php:104 actions/apiatomservice.php:59
-#: actions/apiblockcreate.php:96 actions/apiblockdestroy.php:94
-#: actions/apidirectmessage.php:75 actions/apidirectmessagenew.php:72
-#: actions/apigroupcreate.php:111 actions/apigroupismember.php:89
-#: actions/apigroupjoin.php:98 actions/apigroupleave.php:98
-#: actions/apigrouplist.php:70 actions/apigroupprofileupdate.php:108
-#: actions/apistatusesupdate.php:230 actions/apisubscriptions.php:85
-#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:173
-#: actions/apitimelinehome.php:78 actions/apitimelinementions.php:77
-#: actions/apitimelineuser.php:79 actions/avatarbynickname.php:79
-#: actions/favoritesrss.php:72 actions/foaf.php:42 actions/foaf.php:61
-#: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116
-#: actions/otp.php:78 actions/remotesubscribe.php:144
-#: actions/remotesubscribe.php:153 actions/replies.php:73
-#: actions/repliesrss.php:38 actions/rsd.php:113 actions/showfavorites.php:106
-#: actions/userbyid.php:75 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/userxrd.php:59 actions/xrds.php:71 lib/command.php:509
-#: lib/galleryaction.php:59 lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "No existe ese usuario."
 
 #. TRANS: Page title. %1$s is user nickname, %2$d is page number
-#: actions/all.php:91
 #, php-format
 msgid "%1$s and friends, page %2$d"
 msgstr "%1$s y sus amistades, página %2$d"
@@ -182,33 +144,26 @@ msgstr "%1$s y sus amistades, página %2$d"
 #. TRANS: H1 text for page. %s is a user nickname.
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Timeline title for user and friends. %s is a user nickname.
-#: actions/all.php:94 actions/all.php:191 actions/allrss.php:117
-#: actions/apitimelinefriends.php:207 actions/apitimelinehome.php:113
-#: lib/personalgroupnav.php:100
 #, php-format
 msgid "%s and friends"
 msgstr "%s y sus amistades"
 
 #. TRANS: %s is user nickname.
-#: actions/all.php:108
 #, php-format
 msgid "Feed for friends of %s (RSS 1.0)"
 msgstr "Feed de los amigos de %s (RSS 1.0)"
 
 #. TRANS: %s is user nickname.
-#: actions/all.php:117
 #, php-format
 msgid "Feed for friends of %s (RSS 2.0)"
 msgstr "Feed de los amigos de %s (RSS 2.0)"
 
 #. TRANS: %s is user nickname.
-#: actions/all.php:126
 #, php-format
 msgid "Feed for friends of %s (Atom)"
 msgstr "Feed de los amigos de %s (Atom)"
 
 #. TRANS: Empty list message. %s is a user nickname.
-#: actions/all.php:139
 #, php-format
 msgid ""
 "This is the timeline for %s and friends but no one has posted anything yet."
@@ -218,7 +173,6 @@ msgstr ""
 
 #. TRANS: Encouragement displayed on logged in user's empty timeline.
 #. TRANS: This message contains Markdown links. Keep "](" together.
-#: actions/all.php:146
 #, php-format
 msgid ""
 "Try subscribing to more people, [join a group](%%action.groups%%) or post "
@@ -229,7 +183,6 @@ msgstr ""
 
 #. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@".
 #. TRANS: This message contains Markdown links. Keep "](" together.
-#: actions/all.php:150
 #, php-format
 msgid ""
 "You can try to [nudge %1$s](../%2$s) from their profile or [post something "
@@ -242,7 +195,6 @@ msgstr ""
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
 #. TRANS: Second sentence of empty message for anonymous users. %s is a user nickname.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:221
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -252,14 +204,11 @@ msgstr ""
 "a %s o publicar una nota a ellos?"
 
 #. TRANS: H1 text for page when viewing a list for self.
-#: actions/all.php:188
 msgid "You and friends"
 msgstr "Tú y tus amistades"
 
 #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
 #. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name.
-#: actions/allrss.php:122 actions/apitimelinefriends.php:213
-#: actions/apitimelinehome.php:119
 #, php-format
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr "¡Actualizaciones de %1$s y sus amistades en %2$s!"
@@ -278,55 +227,20 @@ msgstr "¡Actualizaciones de %1$s y sus amistades en %2$s!"
 #. TRANS: Client error displayed trying to execute an unknown API method checking group membership.
 #. TRANS: Client error displayed trying to execute an unknown API method listing the latest 20 groups.
 #. TRANS: Client error displayed trying to execute an unknown API method showing group membership.
+#. TRANS: Client error displayed when using an unsupported API format.
 #. TRANS: Client error displayed trying to execute an unknown API method showing a group.
 #. TRANS: Client error displayed trying to execute an unknown API method testing API connectivity.
 #. TRANS: Client error displayed trying to execute an unknown API method deleting a status.
 #. TRANS: Client error displayed when trying to handle an unknown API method.
-#: actions/apiaccountratelimitstatus.php:69
-#: actions/apiaccountupdatedeliverydevice.php:92
-#: actions/apiaccountupdateprofile.php:94
-#: actions/apiaccountupdateprofilebackgroundimage.php:92
-#: actions/apiaccountupdateprofilecolors.php:115
-#: actions/apiaccountverifycredentials.php:68 actions/apidirectmessage.php:157
-#: actions/apifavoritecreate.php:98 actions/apifavoritedestroy.php:98
-#: actions/apifriendshipscreate.php:99 actions/apifriendshipsdestroy.php:99
-#: actions/apifriendshipsshow.php:124 actions/apigroupcreate.php:138
-#: actions/apigroupismember.php:115 actions/apigroupjoin.php:151
-#: actions/apigroupleave.php:141 actions/apigrouplist.php:134
-#: actions/apigrouplistall.php:120 actions/apigroupmembership.php:105
-#: actions/apigroupprofileupdate.php:100 actions/apigroupprofileupdate.php:213
-#: actions/apigroupshow.php:114 actions/apihelptest.php:84
-#: actions/apistatusesdestroy.php:101 actions/apistatusesretweets.php:110
-#: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:139
-#: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
-#: actions/apitimelinefavorites.php:182 actions/apitimelinefriends.php:276
-#: actions/apitimelinegroup.php:148 actions/apitimelinehome.php:181
-#: actions/apitimelinementions.php:182 actions/apitimelinepublic.php:247
-#: actions/apitimelineretweetedtome.php:147
-#: actions/apitimelineretweetsofme.php:147 actions/apitimelinetag.php:165
-#: actions/apitimelineuser.php:217 actions/apiusershow.php:100
 msgid "API method not found."
 msgstr "Método de API no encontrado."
 
 #. 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.
-#: actions/apiaccountupdatedeliverydevice.php:83
-#: actions/apiaccountupdateprofile.php:85
-#: actions/apiaccountupdateprofilebackgroundimage.php:83
-#: actions/apiaccountupdateprofilecolors.php:106
-#: actions/apiaccountupdateprofileimage.php:80 actions/apiblockcreate.php:87
-#: actions/apiblockdestroy.php:85 actions/apidirectmessagenew.php:107
-#: actions/apifavoritecreate.php:88 actions/apifavoritedestroy.php:88
-#: actions/apifriendshipscreate.php:89 actions/apifriendshipsdestroy.php:89
-#: actions/apigroupcreate.php:102 actions/apigroupjoin.php:89
-#: actions/apigroupleave.php:89 actions/apigroupprofileupdate.php:92
-#: actions/apimediaupload.php:66 actions/apistatusesretweet.php:63
-#: actions/apistatusesupdate.php:194
 msgid "This method requires a POST."
 msgstr "Este método requiere un POST."
 
 #. TRANS: Client error displayed when no valid device parameter is provided for a user's delivery device setting.
-#: actions/apiaccountupdatedeliverydevice.php:103
 msgid ""
 "You must specify a parameter named 'device' with a value of one of: sms, im, "
 "none."
@@ -341,10 +255,6 @@ msgstr ""
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
-#: actions/apiaccountupdatedeliverydevice.php:136
-#: actions/emailsettings.php:353 actions/emailsettings.php:499
-#: actions/profilesettings.php:323 actions/smssettings.php:300
-#: actions/smssettings.php:453 actions/urlsettings.php:211
 msgid "Could not update user."
 msgstr "No se pudo actualizar el usuario."
 
@@ -357,32 +267,17 @@ msgstr "No se pudo actualizar el usuario."
 #. TRANS: Server error displayed when requesting Friends of a Friend feed for a user for which the profile could not be found.
 #. TRANS: Server error displayed when trying to get a user hCard for a user without a profile.
 #. TRANS: Server error displayed when calling a profile action while the specified user does not have a profile.
-#: actions/apiaccountupdateprofile.php:111
-#: actions/apiaccountupdateprofilebackgroundimage.php:199
-#: actions/apiaccountupdateprofilecolors.php:183
-#: actions/apiaccountupdateprofileimage.php:131
-#: actions/apiuserprofileimage.php:88 actions/apiusershow.php:108
-#: actions/avatarbynickname.php:85 actions/foaf.php:69 actions/hcard.php:75
-#: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
-#: lib/profileaction.php:85
 msgid "User has no profile."
 msgstr "El usuario no tiene un perfil."
 
 #. TRANS: Server error displayed if a user profile could not be saved.
 #. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:419
 msgid "Could not save profile."
 msgstr "No se pudo guardar el perfil."
 
 #. TRANS: Client error displayed when the number of bytes in a POST request exceeds a limit.
 #. TRANS: %s is the number of bytes of the CONTENT_LENGTH.
 #. TRANS: Form validation error in design settings form. POST should remain untranslated.
-#: actions/apiaccountupdateprofilebackgroundimage.php:108
-#: actions/apiaccountupdateprofileimage.php:95 actions/apimediaupload.php:81
-#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
-#: actions/designadminpanel.php:120 actions/editapplication.php:121
-#: actions/newapplication.php:102 actions/newnotice.php:95
-#: lib/designsettings.php:110
 #, fuzzy, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s byte) due to its "
@@ -402,26 +297,15 @@ msgstr[1] ""
 #. TRANS: Client error displayed when a database error occurs inserting profile colours.
 #. TRANS: Client error displayed when a database error occurs updating profile colours.
 #. TRANS: Form validation error displayed when group design settings could not be saved because of an application issue.
-#: actions/apiaccountupdateprofilebackgroundimage.php:138
-#: actions/apiaccountupdateprofilebackgroundimage.php:149
-#: actions/apiaccountupdateprofilecolors.php:160
-#: actions/apiaccountupdateprofilecolors.php:171
-#: actions/groupdesignsettings.php:285 actions/groupdesignsettings.php:296
-#: actions/userdesignsettings.php:218 actions/userdesignsettings.php:228
-#: actions/userdesignsettings.php:270 actions/userdesignsettings.php:280
 msgid "Unable to save your design settings."
 msgstr "No se pudo grabar tu configuración de diseño."
 
 #. TRANS: Error displayed when updating design settings fails.
 #. TRANS: Client error displayed when a database error occurs updating profile colours.
-#: actions/apiaccountupdateprofilebackgroundimage.php:191
-#: actions/apiaccountupdateprofilecolors.php:139
-#: actions/userdesignsettings.php:196
 msgid "Could not update your design."
 msgstr "No se pudo actualizar tu diseño."
 
 #. TRANS: Title for Atom feed.
-#: actions/apiatomservice.php:85
 msgctxt "ATOM"
 msgid "Main"
 msgstr ""
@@ -430,9 +314,6 @@ msgstr ""
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Title in atom group notice feed. %s is a group name.
 #. TRANS: Title in atom user notice feed. %s is a user name.
-#: actions/apiatomservice.php:93 actions/grouprss.php:138
-#: actions/userrss.php:94 lib/atomgroupnoticefeed.php:63
-#: lib/atomusernoticefeed.php:88
 #, php-format
 msgid "%s timeline"
 msgstr "línea temporal de %s"
@@ -442,8 +323,6 @@ msgstr "línea temporal de %s"
 #. TRANS: %s is a user nickname.
 #. TRANS: Header for subscriptions overview for a user (first page).
 #. TRANS: %s is a user nickname.
-#: actions/apiatomservice.php:104 actions/atompubsubscriptionfeed.php:148
-#: actions/subscriptions.php:51
 #, php-format
 msgid "%s subscriptions"
 msgstr "Suscripciones %s"
@@ -451,58 +330,48 @@ msgstr "Suscripciones %s"
 #. TRANS: Title for Atom feed with a user's favorite notices. %s is a user nickname.
 #. TRANS: Title for Atom favorites feed.
 #. TRANS: %s is a user nickname.
-#: actions/apiatomservice.php:115 actions/atompubfavoritefeed.php:142
 #, fuzzy, php-format
 msgid "%s favorites"
 msgstr "Favoritos"
 
 #. TRANS: Title for Atom feed with a user's memberships. %s is a user nickname.
-#: actions/apiatomservice.php:126
 #, fuzzy, php-format
 msgid "%s memberships"
 msgstr "Miembros del grupo %s"
 
 #. TRANS: Client error displayed when users try to block themselves.
-#: actions/apiblockcreate.php:105
 msgid "You cannot block yourself!"
 msgstr "¡No puedes bloquearte a tí mismo!"
 
 #. TRANS: Server error displayed when blocking a user has failed.
-#: actions/apiblockcreate.php:127
 msgid "Block user failed."
 msgstr "Falló bloquear usuario."
 
 #. TRANS: Server error displayed when unblocking a user has failed.
-#: actions/apiblockdestroy.php:113
 msgid "Unblock user failed."
 msgstr "Falló desbloquear usuario."
 
 #. TRANS: Title. %s is a user nickname.
-#: actions/apidirectmessage.php:88
 #, php-format
 msgid "Direct messages from %s"
 msgstr "Mensajes directos de %s"
 
 #. TRANS: Subtitle. %s is a user nickname.
-#: actions/apidirectmessage.php:93
 #, php-format
 msgid "All the direct messages sent from %s"
 msgstr "Todos los mensajes directos enviados desde %s"
 
 #. TRANS: Title. %s is a user nickname.
-#: actions/apidirectmessage.php:102
 #, php-format
 msgid "Direct messages to %s"
 msgstr "Mensajes directos a %s"
 
 #. TRANS: Subtitle. %s is a user nickname.
-#: actions/apidirectmessage.php:107
 #, php-format
 msgid "All the direct messages sent to %s"
 msgstr "Todos los mensajes directos enviados a %s"
 
 #. TRANS: Client error displayed when no message text was submitted (406).
-#: actions/apidirectmessagenew.php:117
 msgid "No message text!"
 msgstr "¡Sin texto de mensaje!"
 
@@ -510,7 +379,6 @@ msgstr "¡Sin texto de mensaje!"
 #. TRANS: %d is the maximum number of characters for a message.
 #. TRANS: Form validation error displayed when message content is too long.
 #. TRANS: %d is the maximum number of characters for a message.
-#: actions/apidirectmessagenew.php:127 actions/newmessage.php:152
 #, fuzzy, php-format
 msgid "That's too long. Maximum message size is %d character."
 msgid_plural "That's too long. Maximum message size is %d characters."
@@ -518,18 +386,15 @@ msgstr[0] "Demasiado largo. Tamaño máx. de los mensajes es %d caracteres."
 msgstr[1] "Demasiado largo. Tamaño máx. de los mensajes es %d caracteres."
 
 #. TRANS: Client error displayed if a recipient user could not be found (403).
-#: actions/apidirectmessagenew.php:139
 msgid "Recipient user not found."
 msgstr "No se encuentra usuario receptor."
 
 #. TRANS: Client error displayed trying to direct message another user who's not a friend (403).
-#: actions/apidirectmessagenew.php:144
 #, fuzzy
 msgid "Cannot send direct messages to users who aren't your friend."
 msgstr "No se puede enviar mensajes directos a usuarios que no son tu amigo."
 
 #. TRANS: Client error displayed trying to direct message self (403).
-#: actions/apidirectmessagenew.php:154
 #, fuzzy
 msgid ""
 "Do not send a message to yourself; just say it to yourself quietly instead."
@@ -538,118 +403,98 @@ msgstr "No te auto envíes un mensaje; dícetelo a ti mismo."
 #. 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.
 #. TRANS: Client error displayed trying to delete a status with an invalid ID.
-#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:108
-#: actions/apistatusesdestroy.php:121
 msgid "No status found with that ID."
 msgstr "No se encontró estado para ese ID"
 
 #. TRANS: Client error displayed when trying to mark a notice favourite that already is a favourite.
-#: actions/apifavoritecreate.php:120
 msgid "This status is already a favorite."
 msgstr "Este status ya está en favoritos."
 
 #. TRANS: Client error displayed when marking a notice as favourite fails.
 #. TRANS: Server error displayed when trying to mark a notice as favorite fails in the database.
 #. TRANS: Error message text shown when a favorite could not be set.
-#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:306
 msgid "Could not create favorite."
 msgstr "No se pudo crear favorito."
 
 #. TRANS: Client error displayed when trying to remove a favourite that was not a favourite.
-#: actions/apifavoritedestroy.php:122
 msgid "That status is not a favorite."
 msgstr "Este status no es un favorito."
 
 #. TRANS: Client error displayed when removing a favourite has failed.
 #. TRANS: Server error displayed when removing a favorite from the database fails.
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:90
 msgid "Could not delete favorite."
 msgstr "No se pudo borrar favorito."
 
 #. TRANS: Client error displayed when trying follow who's profile could not be found.
-#: actions/apifriendshipscreate.php:109
 msgid "Could not follow user: profile not found."
 msgstr "No se pudo seguir al usuario: Perfil no encontrado."
 
 #. TRANS: Client error displayed when trying to follow a user that's already being followed.
 #. TRANS: %s is the nickname of the user that is already being followed.
-#: actions/apifriendshipscreate.php:120
 #, php-format
 msgid "Could not follow user: %s is already on your list."
 msgstr "No puede seguir al usuario: %s ya esta en su lista."
 
 #. TRANS: Client error displayed when trying to unfollow a user that cannot be found.
-#: actions/apifriendshipsdestroy.php:109
 msgid "Could not unfollow user: User not found."
 msgstr "No se pudo dejar de seguir al usuario. Usuario no encontrado"
 
 #. TRANS: Client error displayed when trying to unfollow self.
-#: actions/apifriendshipsdestroy.php:121
 msgid "You cannot unfollow yourself."
 msgstr "No puedes dejar de seguirte a ti mismo."
 
 #. TRANS: Client error displayed when supplying invalid parameters to an API call checking if a friendship exists.
-#: actions/apifriendshipsexists.php:88
 #, fuzzy
 msgid "Two valid IDs or nick names must be supplied."
 msgstr "Deben proveerse dos IDs válidos o nombres en pantalla."
 
 #. TRANS: Client error displayed when a source user could not be determined showing friendship.
-#: actions/apifriendshipsshow.php:131
 msgid "Could not determine source user."
 msgstr "No se pudo determinar el usuario fuente."
 
 #. TRANS: Client error displayed when a target user could not be determined showing friendship.
-#: actions/apifriendshipsshow.php:140
 msgid "Could not find target user."
 msgstr "No se pudo encontrar ningún usuario de destino."
 
 #. TRANS: Client error trying to create a group with a nickname this is already in use.
+#. TRANS: API validation exception thrown when nickname is already used.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:156 actions/apigroupprofileupdate.php:255
-#: actions/editgroup.php:191 actions/newgroup.php:137
-#: actions/profilesettings.php:274 actions/register.php:199
 msgid "Nickname already in use. Try another one."
 msgstr "El usuario ya existe. Prueba con otro."
 
 #. TRANS: Client error in form for group creation.
+#. TRANS: API validation exception thrown when nickname does not validate.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:164 actions/apigroupprofileupdate.php:259
-#: actions/editgroup.php:195 actions/newgroup.php:141
-#: actions/profilesettings.php:244 actions/register.php:201
 msgid "Not a valid nickname."
 msgstr "Usuario inválido"
 
 #. TRANS: Client error in form for group creation.
+#. TRANS: API validation exception thrown when homepage URL does not validate.
 #. TRANS: Validation error shown when providing an invalid homepage URL in the "Edit application" form.
 #. TRANS: Group edit form validation error.
 #. TRANS: Validation error shown when providing an invalid homepage URL in the "New application" form.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:181 actions/apigroupprofileupdate.php:277
-#: actions/editapplication.php:235 actions/editgroup.php:202
-#: actions/newapplication.php:221 actions/newgroup.php:148
-#: actions/profilesettings.php:249 actions/register.php:208
 msgid "Homepage is not a valid URL."
 msgstr "La página de inicio no es un URL válido."
 
 #. TRANS: Client error in form for group creation.
+#. TRANS: API validation exception thrown when full name does not validate.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:191 actions/editgroup.php:206
-#: actions/newgroup.php:152 actions/profilesettings.php:253
-#: actions/register.php:211
 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "Tu nombre es demasiado largo (max. 255 carac.)"
 
 #. TRANS: Client error shown when providing too long a description during group creation.
 #. TRANS: %d is the maximum number of allowed characters.
+#. TRANS: API validation exception thrown when description does not validate.
+#. TRANS: %d is the maximum description length and used for plural.
 #. TRANS: Validation error shown when providing too long a description in the "Edit application" form.
 #. TRANS: %d is the maximum number of allowed characters.
 #. TRANS: Group edit form validation error.
@@ -657,9 +502,6 @@ msgstr "Tu nombre es demasiado largo (max. 255 carac.)"
 #. TRANS: %d is the maximum number of characters for the description.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed characters.
-#: actions/apigroupcreate.php:201 actions/editapplication.php:202
-#: actions/editgroup.php:211 actions/newapplication.php:182
-#: actions/newgroup.php:157
 #, fuzzy, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."
@@ -667,24 +509,22 @@ msgstr[0] "La descripción es demasiado larga (máx. %d caracteres)."
 msgstr[1] "La descripción es demasiado larga (máx. %d caracteres)."
 
 #. TRANS: Client error shown when providing too long a location during group creation.
+#. TRANS: API validation exception thrown when location does not validate.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:215 actions/editgroup.php:218
-#: actions/newgroup.php:164 actions/profilesettings.php:266
-#: actions/register.php:220
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
 msgstr "La ubicación es demasiado larga (máx. 255 caracteres)."
 
 #. TRANS: Client error shown when providing too many aliases during group creation.
 #. TRANS: %d is the maximum number of allowed aliases.
+#. TRANS: API validation exception thrown when aliases do not validate.
+#. TRANS: %d is the maximum number of aliases and used for plural.
 #. TRANS: Group edit form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.
-#: actions/apigroupcreate.php:236 actions/editgroup.php:231
-#: actions/newgroup.php:177
 #, fuzzy, php-format
 msgid "Too many aliases! Maximum %d allowed."
 msgid_plural "Too many aliases! Maximum %d allowed."
@@ -693,25 +533,24 @@ msgstr[1] "¡Muchos seudónimos! El máximo es %d."
 
 #. TRANS: Client error shown when providing an invalid alias during group creation.
 #. TRANS: %s is the invalid alias.
-#: actions/apigroupcreate.php:253
+#. TRANS: API validation exception thrown when aliases does not validate.
+#. TRANS: %s is the invalid alias.
 #, php-format
 msgid "Invalid alias: \"%s\"."
 msgstr "Alias inválido: \"%s\"."
 
 #. TRANS: Client error displayed when trying to use an alias during group creation that is already in use.
 #. TRANS: %s is the alias that is already in use.
+#. TRANS: API validation exception thrown when aliases is already used.
+#. TRANS: %s is the already used alias.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error. %s is the already used alias.
-#: actions/apigroupcreate.php:264 actions/apigroupprofileupdate.php:351
-#: actions/editgroup.php:246 actions/newgroup.php:193
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "El alias \"%s\" ya está en uso. Intenta usar otro."
 
 #. TRANS: Client error displayed when trying to use an alias during group creation that is the same as the group's nickname.
 #. TRANS: Group edit form validation error.
-#: actions/apigroupcreate.php:278 actions/apigroupprofileupdate.php:359
-#: actions/editgroup.php:253
 msgid "Alias can't be the same as nickname."
 msgstr "El alias no puede ser el mismo que el usuario."
 
@@ -719,26 +558,21 @@ msgstr "El alias no puede ser el mismo que el usuario."
 #. TRANS: Client error displayed when trying to join a group that does not exist.
 #. TRANS: Client error displayed when trying to leave a group that does not exist.
 #. TRANS: Client error displayed trying to show group membership on a non-existing group.
+#. TRANS: Client error displayed when not providing a group or an invalid group.
 #. TRANS: Client error displayed when trying to show a group that could not be found.
 #. TRANS: Client error displayed requesting most recent notices to a group for a non-existing group.
-#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
-#: actions/apigroupleave.php:104 actions/apigroupmembership.php:71
-#: actions/apigroupprofileupdate.php:113 actions/apigroupshow.php:81
-#: actions/apitimelinegroup.php:89
 msgid "Group not found."
 msgstr "Grupo no encontrado."
 
 #. TRANS: Server error displayed when trying to join a group the user is already a member of.
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:345
 msgid "You are already a member of that group."
 msgstr "Ya eres miembro de ese grupo"
 
 #. TRANS: Server error displayed when trying to join a group the user is blocked from joining.
 #. 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.
-#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:350
 msgid "You have been blocked from that group by the admin."
 msgstr "Has sido bloqueado de ese grupo por el administrador."
 
@@ -746,13 +580,11 @@ msgstr "Has sido bloqueado de ese grupo por el administrador."
 #. TRANS: %1$s is the joining user's nickname, $2$s is the group nickname for which the join failed.
 #. TRANS: Message given having failed to add a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:136 actions/joingroup.php:139 lib/command.php:362
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "No se pudo unir el usuario %s al grupo %s"
 
 #. TRANS: Server error displayed when trying to leave a group the user is not a member of.
-#: actions/apigroupleave.php:115
 msgid "You are not a member of this group."
 msgstr "No eres miembro de este grupo."
 
@@ -760,118 +592,81 @@ msgstr "No eres miembro de este grupo."
 #. TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
 #. TRANS: Message given having failed to remove a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupleave.php:127 actions/leavegroup.php:133
-#: lib/command.php:410
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
 msgstr "No se pudo eliminar al usuario %1$s del grupo %2$s."
 
 #. TRANS: Used as title in check for group membership. %s is a user name.
-#: actions/apigrouplist.php:94
 #, php-format
 msgid "%s's groups"
 msgstr "Grupos de %s"
 
 #. TRANS: Used as subtitle in check for group membership. %1$s is a user name, %2$s is the site name.
-#: actions/apigrouplist.php:104
 #, php-format
 msgid "%1$s groups %2$s is a member of."
 msgstr "%1$s grupos %2$s es un miembro de."
 
 #. TRANS: Message is used as a title when listing the lastest 20 groups. %s is a site name.
 #. TRANS: Message is used as a page title. %s is a nick name.
-#: actions/apigrouplistall.php:88 actions/usergroups.php:63
 #, php-format
 msgid "%s groups"
 msgstr "Grupos %s"
 
 #. TRANS: Message is used as a subtitle when listing the lastest 20 groups. %s is a site name.
-#: actions/apigrouplistall.php:93
 #, php-format
 msgid "groups on %s"
 msgstr "Grupos en %s"
 
+#. TRANS: Client error displayed when trying to edit a group without being an admin.
 #. TRANS: Client error displayed trying to edit a group while not being a group admin.
 #. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
 #. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
-#: actions/apigroupprofileupdate.php:118 actions/editgroup.php:110
-#: actions/editgroup.php:176 actions/groupdesignsettings.php:109
-#: actions/grouplogo.php:111
 msgid "You must be an admin to edit the group."
 msgstr "Para editar el grupo debes ser administrador."
 
+#. TRANS: Server error displayed when group update fails.
 #. TRANS: Server error displayed when editing a group fails.
-#: actions/apigroupprofileupdate.php:171 actions/editgroup.php:274
 msgid "Could not update group."
 msgstr "No se pudo actualizar el grupo."
 
+#. TRANS: Server error displayed when adding group aliases fails.
 #. TRANS: Server error displayed when group aliases could not be added.
 #. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/apigroupprofileupdate.php:194 actions/editgroup.php:281
-#: classes/User_group.php:540
 msgid "Could not create aliases."
 msgstr "No fue posible crear alias."
 
+#. TRANS: API validation exception thrown when nickname does not validate.
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: actions/apigroupprofileupdate.php:249 lib/nickname.php:165
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr ""
 "El usuario debe tener solamente letras minúsculas y números y no puede tener "
 "espacios."
 
-#: actions/apigroupprofileupdate.php:286
-#, fuzzy
-msgid "Full name is too long (max 255 chars)."
-msgstr "Tu nombre es demasiado largo (max. 255 carac.)"
-
-#: actions/apigroupprofileupdate.php:296
-#, fuzzy, php-format
-msgid "description is too long (max %d chars)."
-msgstr "La descripción es demasiado larga (máx. %d caracteres)."
-
-#: actions/apigroupprofileupdate.php:307
-#, fuzzy
-msgid "Location is too long (max 255 chars)."
-msgstr "La ubicación es demasiado larga (máx. 255 caracteres)."
-
-#: actions/apigroupprofileupdate.php:326
-#, fuzzy, php-format
-msgid "Too many aliases! Maximum %d."
-msgstr "¡Muchos seudónimos! El máximo es %d."
-
-#. TRANS: Group edit form validation error.
+#. TRANS: API validation exception thrown when alias is the same as nickname.
 #. TRANS: Group create form validation error.
-#. TRANS: %s is the invalid alias.
-#: actions/apigroupprofileupdate.php:342 actions/editgroup.php:241
-#: actions/newgroup.php:188
-#, php-format
-msgid "Invalid alias: \"%s\""
-msgstr "Alias inválido: \"%s\""
+#, fuzzy
+msgid "Alias cannot be the same as nickname."
+msgstr "El alias no puede ser el mismo que el usuario."
 
 #. TRANS: Client error displayed when uploading a media file has failed.
-#: actions/apimediaupload.php:101
 msgid "Upload failed."
 msgstr "Carga falló."
 
 #. TRANS: Client error given from the OAuth API when the request token or verifier is invalid.
-#: actions/apioauthaccesstoken.php:102
 #, fuzzy
 msgid "Invalid request token or verifier."
 msgstr "Token de acceso inválido especificado."
 
 #. TRANS: Client error given when no oauth_token was passed to the OAuth API.
-#: actions/apioauthauthorize.php:107
 msgid "No oauth_token parameter provided."
 msgstr "No se ha provisto de un parámetro oauth_token."
 
 #. TRANS: Client error given when an invalid request token was passed to the OAuth API.
-#: actions/apioauthauthorize.php:115 actions/apioauthauthorize.php:129
 #, fuzzy
 msgid "Invalid request token."
 msgstr "Token inválido."
 
 #. TRANS: Client error given when an invalid request token was passed to the OAuth API.
-#: actions/apioauthauthorize.php:121
 #, fuzzy
 msgid "Request token already authorized."
 msgstr "No estás autorizado."
@@ -882,32 +677,15 @@ msgstr "No estás autorizado."
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
 #. TRANS: Client error displayed when the session token is not okay.
-#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:75
-#: actions/emailsettings.php:292 actions/favor.php:75 actions/geocode.php:55
-#: actions/groupblock.php:65 actions/grouplogo.php:321
-#: actions/groupunblock.php:65 actions/imsettings.php:241
-#: actions/invite.php:60 actions/makeadmin.php:66 actions/newmessage.php:135
-#: actions/newnotice.php:105 actions/nudge.php:80
-#: actions/oauthappssettings.php:162 actions/oauthconnectionssettings.php:135
-#: actions/passwordsettings.php:137 actions/pluginenable.php:87
-#: actions/profilesettings.php:218 actions/recoverpassword.php:383
-#: actions/register.php:157 actions/remotesubscribe.php:76
-#: actions/repeat.php:82 actions/smssettings.php:249 actions/subedit.php:40
-#: actions/subscribe.php:87 actions/tagother.php:145
-#: actions/unsubscribe.php:69 actions/urlsettings.php:171
-#: actions/userauthorization.php:53 lib/designsettings.php:122
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 "Hubo un problema con tu clave de sesión.  Por favor, intenta nuevamente."
 
 #. TRANS: Form validation error given when an invalid username and/or password was passed to the OAuth API.
-#: actions/apioauthauthorize.php:168
 msgid "Invalid nickname / password!"
 msgstr "¡Usuario o contraseña inválidos!"
 
 #. TRANS: Server error displayed when a database action fails.
-#: actions/apioauthauthorize.php:217
 #, fuzzy
 msgid "Database error inserting oauth_token_association."
 msgstr "Error de base de datos al insertar usuario de la aplicación OAuth."
@@ -924,28 +702,19 @@ msgstr "Error de base de datos al insertar usuario de la aplicación OAuth."
 #. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
 #. TRANS: Message given submitting a form with an unknown action in SMS settings.
 #. TRANS: Unknown form validation error in design settings form.
-#: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
-#: actions/designadminpanel.php:100 actions/editapplication.php:144
-#: actions/emailsettings.php:311 actions/grouplogo.php:332
-#: actions/imsettings.php:256 actions/newapplication.php:124
-#: actions/oauthconnectionssettings.php:144 actions/recoverpassword.php:46
-#: actions/smssettings.php:270 lib/designsettings.php:133
 msgid "Unexpected form submission."
 msgstr "Envío de formulario inesperado."
 
 #. TRANS: Title for a page where a user can confirm/deny account access by an external application.
-#: actions/apioauthauthorize.php:387
 msgid "An application would like to connect to your account"
 msgstr "Una aplicación quisiera conectarse a tu cuenta"
 
 #. TRANS: Fieldset legend.
-#: actions/apioauthauthorize.php:404
 msgid "Allow or deny access"
 msgstr "Permitir o denegar el acceso"
 
 #. TRANS: User notification of external application requesting account access.
 #. TRANS: %3$s is the access type requested (read-write or read-only), %4$s is the StatusNet sitename.
-#: actions/apioauthauthorize.php:425
 #, fuzzy, php-format
 msgid ""
 "An application would like the ability to <strong>%3$s</strong> your %4$s "
@@ -959,7 +728,6 @@ msgstr ""
 #. TRANS: User notification of external application requesting account access.
 #. TRANS: %1$s is the application name requesting access, %2$s is the organisation behind the application,
 #. TRANS: %3$s is the access type requested, %4$s is the StatusNet sitename.
-#: actions/apioauthauthorize.php:433
 #, php-format
 msgid ""
 "The application <strong>%1$s</strong> by <strong>%2$s</strong> would like "
@@ -971,22 +739,18 @@ msgstr ""
 "debes dar acceso a tu cuenta %4$s a terceras partes en las que confíes."
 
 #. TRANS: Fieldset legend.
-#: actions/apioauthauthorize.php:455
 msgctxt "LEGEND"
 msgid "Account"
 msgstr "Cuenta"
 
 #. TRANS: Field label on OAuth API authorisation form.
+#. TRANS: Field label on login page.
 #. TRANS: Field label in form for profile settings.
-#: actions/apioauthauthorize.php:459 actions/login.php:225
-#: actions/profilesettings.php:107 actions/register.php:411
-#: actions/userauthorization.php:145 lib/groupeditform.php:145
 msgid "Nickname"
 msgstr "Usuario"
 
 #. TRANS: Field label on OAuth API authorisation form.
-#: actions/apioauthauthorize.php:463 actions/login.php:228
-#: actions/register.php:415 lib/settingsnav.php:87
+#. TRANS: Field label on login page.
 msgid "Password"
 msgstr "Contraseña"
 
@@ -996,47 +760,38 @@ msgstr "Contraseña"
 #. TRANS: Button label to cancel an IM address confirmation procedure.
 #. TRANS: Button label to cancel a SMS address confirmation procedure.
 #. TRANS: Button label in the "Edit application" form.
-#: actions/apioauthauthorize.php:478 actions/emailsettings.php:125
-#: actions/imsettings.php:136 actions/smssettings.php:132
-#: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Cancel"
 msgstr "Cancelar"
 
 #. TRANS: Button text that when clicked will allow access to an account by an external application.
-#: actions/apioauthauthorize.php:485
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Allow"
 msgstr "Permitir"
 
 #. TRANS: Form instructions.
-#: actions/apioauthauthorize.php:502
 #, fuzzy
 msgid "Authorize access to your account information."
 msgstr "Permitir o denegar el acceso a la información de tu cuenta."
 
 #. TRANS: Header for user notification after revoking OAuth access to an application.
-#: actions/apioauthauthorize.php:594
 #, fuzzy
 msgid "Authorization canceled."
 msgstr "Confirmación de mensajería instantánea cancelada."
 
 #. TRANS: User notification after revoking OAuth access to an application.
 #. TRANS: %s is an OAuth token.
-#: actions/apioauthauthorize.php:598
 #, fuzzy, php-format
 msgid "The request token %s has been revoked."
 msgstr "El token de solicitud %2 ha sido denegado y revocado."
 
 #. TRANS: Title of the page notifying the user that an anonymous client application was successfully authorized to access the user's account with OAuth.
-#: actions/apioauthauthorize.php:621
 #, fuzzy
 msgid "You have successfully authorized the application"
 msgstr "No estás autorizado."
 
 #. TRANS: Message notifying the user that an anonymous client application was successfully authorized to access the user's account with OAuth.
-#: actions/apioauthauthorize.php:625
 msgid ""
 "Please return to the application and enter the following security code to "
 "complete the process."
@@ -1044,14 +799,12 @@ msgstr ""
 
 #. TRANS: Title of the page notifying the user that the client application was successfully authorized to access the user's account with OAuth.
 #. TRANS: %s is the authorised application name.
-#: actions/apioauthauthorize.php:632
 #, fuzzy, php-format
 msgid "You have successfully authorized %s"
 msgstr "No estás autorizado."
 
 #. TRANS: Message notifying the user that the client application was successfully authorized to access the user's account with OAuth.
 #. TRANS: %s is the authorised application name.
-#: actions/apioauthauthorize.php:639
 #, php-format
 msgid ""
 "Please return to %s and enter the following security code to complete the "
@@ -1060,12 +813,10 @@ msgstr ""
 
 #. TRANS: Client error displayed trying to delete a status not using POST or DELETE.
 #. TRANS: POST and DELETE should not be translated.
-#: actions/apistatusesdestroy.php:111
 msgid "This method requires a POST or DELETE."
 msgstr "Este método requiere un PUBLICAR O ELIMINAR"
 
 #. TRANS: Client error displayed trying to delete a status of another user.
-#: actions/apistatusesdestroy.php:136
 msgid "You may not delete another user's status."
 msgstr "No puedes borrar el estado de otro usuario."
 
@@ -1073,21 +824,16 @@ msgstr "No puedes borrar el estado de otro usuario."
 #. TRANS: Client error displayed trying to display redents of a non-exiting notice.
 #. TRANS: Client exception thrown when referencing a non-existing notice.
 #. TRANS: Error message displayed trying to delete a non-existing notice.
-#: actions/apistatusesretweet.php:74 actions/apistatusesretweets.php:70
-#: actions/atompubshowfavorite.php:82 actions/deletenotice.php:61
-#: actions/shownotice.php:92
 msgid "No such notice."
 msgstr "No existe ese mensaje."
 
 #. TRANS: Client error displayed trying to repeat an own notice through the API.
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:549
 msgid "Cannot repeat your own notice."
 msgstr "No puedes repetir tus propios mensajes"
 
 #. TRANS: Client error displayed trying to re-repeat a notice through the API.
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:92 lib/command.php:555
 msgid "Already repeated that notice."
 msgstr "Este mensaje ya se ha repetido."
 
@@ -1097,59 +843,45 @@ msgstr "Este mensaje ya se ha repetido."
 #. TRANS: Client exception thrown when using an unsupported HTTP method.
 #. TRANS: Client error shown when using a non-supported HTTP method.
 #. TRANS: Client exception thrown when using an unsupported HTTP method.
-#: actions/apistatusesshow.php:118 actions/atompubfavoritefeed.php:103
-#: actions/atompubmembershipfeed.php:105 actions/atompubshowfavorite.php:117
-#: actions/atompubshowmembership.php:116
-#: actions/atompubshowsubscription.php:122
-#: actions/atompubsubscriptionfeed.php:109
 #, fuzzy
 msgid "HTTP method not supported."
 msgstr "Método de API no encontrado."
 
 #. TRANS: Exception thrown requesting an unsupported notice output format.
 #. TRANS: %s is the requested output format.
-#: actions/apistatusesshow.php:144
 #, fuzzy, php-format
 msgid "Unsupported format: %s."
 msgstr "Formato no soportado."
 
 #. TRANS: Client error displayed requesting a deleted status.
-#: actions/apistatusesshow.php:155
 msgid "Status deleted."
 msgstr "Status borrado."
 
 #. TRANS: Client error displayed requesting a status with an invalid ID.
-#: actions/apistatusesshow.php:162
 msgid "No status with that ID found."
 msgstr "No hay estado para ese ID"
 
 #. TRANS: Client error displayed when trying to delete a notice not using the Atom format.
-#: actions/apistatusesshow.php:227
 msgid "Can only delete using the Atom format."
 msgstr ""
 
 #. TRANS: Client error displayed when a user has no rights to delete notices of other users.
 #. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
-#: actions/apistatusesshow.php:235 actions/deletenotice.php:78
 #, fuzzy
 msgid "Cannot delete this notice."
 msgstr "No se puede eliminar este mensaje."
 
 #. TRANS: Confirmation of notice deletion in API. %d is the ID (number) of the deleted notice.
-#: actions/apistatusesshow.php:249
 #, fuzzy, php-format
 msgid "Deleted notice %d"
 msgstr "Borrar mensaje"
 
 #. TRANS: Client error displayed when the parameter "status" is missing.
-#: actions/apistatusesupdate.php:221
 msgid "Client must provide a 'status' parameter with a value."
 msgstr "El cliente debe proveer un parámetro de 'status' con un valor."
 
 #. TRANS: Client error displayed when the parameter "status" is missing.
 #. TRANS: %d is the maximum number of character for a notice.
-#: actions/apistatusesupdate.php:244 actions/newnotice.php:161
-#: lib/mailhandler.php:60
 #, fuzzy, php-format
 msgid "That's too long. Maximum notice size is %d character."
 msgid_plural "That's too long. Maximum notice size is %d characters."
@@ -1157,14 +889,12 @@ msgstr[0] "El mensaje es muy largo. El tamaño máximo es de %d caracteres."
 msgstr[1] "El mensaje es muy largo. El tamaño máximo es de %d caracteres."
 
 #. TRANS: Client error displayed when replying to a non-existing notice.
-#: actions/apistatusesupdate.php:284
 #, fuzzy
 msgid "Parent notice not found."
 msgstr "Método de API no encontrado."
 
 #. TRANS: Client error displayed exceeding the maximum notice length.
 #. TRANS: %d is the maximum lenth for a notice.
-#: actions/apistatusesupdate.php:308 actions/newnotice.php:184
 #, fuzzy, php-format
 msgid "Maximum notice size is %d character, including attachment URL."
 msgid_plural "Maximum notice size is %d characters, including attachment URL."
@@ -1175,13 +905,11 @@ msgstr[1] ""
 
 #. TRANS: Client error displayed when requesting profiles of followers in an unsupported format.
 #. TRANS: Client error displayed when requesting IDs of followers in an unsupported format.
-#: actions/apisubscriptions.php:228 actions/apisubscriptions.php:258
 msgid "Unsupported format."
 msgstr "Formato no soportado."
 
 #. TRANS: Title for timeline of most recent favourite notices by a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname.
-#: actions/apitimelinefavorites.php:108
 #, php-format
 msgid "%1$s / Favorites from %2$s"
 msgstr "%1$s / Favoritos de %2$s"
@@ -1189,14 +917,12 @@ msgstr "%1$s / Favoritos de %2$s"
 #. TRANS: Subtitle for timeline of most recent favourite notices by a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user's full name,
 #. TRANS: %3$s is a user nickname.
-#: actions/apitimelinefavorites.php:120
 #, fuzzy, php-format
 msgid "%1$s updates favorited by %2$s / %3$s."
 msgstr "%1$s actualizaciones favoritas de %2$s / %2$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.
-#: actions/apitimelinementions.php:115
 #, php-format
 msgid "%1$s / Updates mentioning %2$s"
 msgstr "%1$s / Actualizaciones que mencionan %2$s"
@@ -1204,49 +930,41 @@ msgstr "%1$s / Actualizaciones que mencionan %2$s"
 #. TRANS: Subtitle for timeline of most recent mentions of a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname,
 #. TRANS: %3$s is a user's full name.
-#: actions/apitimelinementions.php:131
 #, php-format
 msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr "actualizaciones de %1$s en respuesta a las de %2$s / %3$s"
 
 #. TRANS: Title for site timeline. %s is the StatusNet sitename.
 #. TRANS: Public RSS feed title. %s is the StatusNet site name.
-#: actions/apitimelinepublic.php:193 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "línea temporal pública de %s"
 
 #. TRANS: Subtitle for site timeline. %s is the StatusNet sitename.
-#: actions/apitimelinepublic.php:199
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "¡Actualizaciones de todos en %s!"
 
 #. TRANS: Server error displayed calling unimplemented API method for 'retweeted by me'.
-#: actions/apitimelineretweetedbyme.php:71
 #, fuzzy
 msgid "Unimplemented."
 msgstr "Método no implementado."
 
 #. TRANS: Title for Atom feed "repeated to me". %s is the user nickname.
-#: actions/apitimelineretweetedtome.php:96
 #, php-format
 msgid "Repeated to %s"
 msgstr "Repetido a %s"
 
-#: actions/apitimelineretweetedtome.php:98
 #, fuzzy, php-format
 msgid "%1$s notices that were to repeated to %2$s / %3$s."
 msgstr "actualizaciones de %1$s en respuesta a las de %2$s / %3$s"
 
 #. TRANS: Title of list of repeated notices of the logged in user.
 #. TRANS: %s is the nickname of the logged in user.
-#: actions/apitimelineretweetsofme.php:98
 #, php-format
 msgid "Repeats of %s"
 msgstr "Repeticiones de %s"
 
-#: actions/apitimelineretweetsofme.php:104
 #, fuzzy, php-format
 msgid "%1$s notices that %2$s / %3$s has repeated."
 msgstr "%s (@%s) agregó tu mensaje a los favoritos"
@@ -1255,176 +973,143 @@ msgstr "%s (@%s) agregó tu mensaje a los favoritos"
 #. TRANS: %s is the tag.
 #. TRANS: Title for first page of notices with tags.
 #. TRANS: %s is the tag.
-#: actions/apitimelinetag.php:101 actions/tag.php:69
 #, php-format
 msgid "Notices tagged with %s"
 msgstr "Mensajes etiquetados con %s"
 
 #. TRANS: Subtitle for timeline with lastest notices with a given tag.
 #. TRANS: %1$s is the tag, $2$s is the StatusNet sitename.
-#: actions/apitimelinetag.php:105 actions/tagrss.php:65
 #, php-format
 msgid "Updates tagged with %1$s on %2$s!"
 msgstr "Actualizaciones etiquetadas con %1$s en %2$s!"
 
 #. TRANS: Client error displayed trying to add a notice to another user's timeline.
-#: actions/apitimelineuser.php:308
 #, fuzzy
 msgid "Only the user can add to their own timeline."
 msgstr "Sólo el usuario puede leer sus bandejas de correo."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:315
 msgid "Only accept AtomPub for Atom feeds."
 msgstr ""
 
 #. TRANS: Client error displayed attempting to post an empty API notice.
-#: actions/apitimelineuser.php:322
 msgid "Atom post must not be empty."
 msgstr ""
 
 #. TRANS: Client error displayed attempting to post an API that is not well-formed XML.
-#: actions/apitimelineuser.php:328
 msgid "Atom post must be well-formed XML."
 msgstr ""
 
 #. TRANS: Client error displayed when not using an Atom entry.
-#: actions/apitimelineuser.php:334 actions/atompubfavoritefeed.php:228
-#: actions/atompubmembershipfeed.php:230
-#: actions/atompubsubscriptionfeed.php:236
 msgid "Atom post must be an Atom entry."
 msgstr "La publicación Atom debe ser una entrada Atom."
 
 #. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
-#: actions/apitimelineuser.php:345
 msgid "Can only handle POST activities."
 msgstr ""
 
 #. TRANS: Client error displayed when using an unsupported activity object type.
 #. TRANS: %s is the unsupported activity object type.
-#: actions/apitimelineuser.php:356
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr "No se puede gestionar actividad del tipo «%s»."
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
 #. TRANS: %d is the notice ID (number).
-#: actions/apitimelineuser.php:390
 #, php-format
 msgid "No content for notice %d."
 msgstr "No hay contenido para el aviso %d."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
 #. TRANS: %s is the notice URI.
-#: actions/apitimelineuser.php:419
 #, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "El aviso con la URI «%s» ya existe."
 
 #. TRANS: Server error for unfinished API method showTrends.
-#: actions/apitrends.php:85
 msgid "API method under construction."
 msgstr "Método API en construcción."
 
 #. TRANS: Client error displayed when requesting user information for a non-existing user.
-#: actions/apiuserprofileimage.php:80 actions/apiusershow.php:94
 msgid "User not found."
 msgstr "Método de API no encontrado."
 
 #. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
 #. TRANS: Client exception.
 #. TRANS: Client error displayed trying to subscribe to a non-existing profile.
-#: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
-#: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
-#: actions/subscribe.php:110
 msgid "No such profile."
 msgstr "No existe tal perfil."
 
 #. TRANS: Subtitle for Atom favorites feed.
 #. TRANS: %1$s is a user nickname, %2$s is the StatusNet sitename.
-#: actions/atompubfavoritefeed.php:147
 #, php-format
 msgid "Notices %1$s has favorited on %2$s"
 msgstr "Avisos que %1$s ha preferido en %2$s"
 
 #. TRANS: Client exception thrown when trying to set a favorite for another user.
 #. TRANS: Client exception thrown when trying to subscribe another user.
-#: actions/atompubfavoritefeed.php:217 actions/atompubsubscriptionfeed.php:225
 msgid "Cannot add someone else's subscription."
 msgstr "No se puede añadir la suscripción de otra persona."
 
 #. TRANS: Client exception thrown when trying use an incorrect activity verb for the Atom pub method.
-#: actions/atompubfavoritefeed.php:240
 msgid "Can only handle favorite activities."
 msgstr "Solo se pueden gestionar las actividades preferidas."
 
 #. TRANS: Client exception thrown when trying favorite an object that is not a notice.
-#: actions/atompubfavoritefeed.php:250 actions/atompubmembershipfeed.php:250
 msgid "Can only fave notices."
 msgstr "Sólo se pueden preferir los avisos."
 
 #. TRANS: Client exception thrown when trying favorite a notice without content.
-#: actions/atompubfavoritefeed.php:259
 msgid "Unknown note."
 msgstr "Nota desconocida."
 
 #. TRANS: Client exception thrown when trying favorite an already favorited notice.
-#: actions/atompubfavoritefeed.php:267
 msgid "Already a favorite."
 msgstr "Ya incluido en favoritos."
 
 #. TRANS: Title for group membership feed.
 #. TRANS: %s is a username.
-#: actions/atompubmembershipfeed.php:144
 #, php-format
 msgid "%s group memberships"
 msgstr "%s miembros en el grupo"
 
 #. TRANS: Subtitle for group membership feed.
 #. TRANS: %1$s is a username, %2$s is the StatusNet sitename.
-#: actions/atompubmembershipfeed.php:149
 #, fuzzy, php-format
 msgid "Groups %1$s is a member of on %2$s"
 msgstr "%s es miembro de los grupos"
 
 #. TRANS: Client exception thrown when trying subscribe someone else to a group.
-#: actions/atompubmembershipfeed.php:219
 #, fuzzy
 msgid "Cannot add someone else's membership."
 msgstr "No se pudo insertar una nueva suscripción."
 
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#: actions/atompubmembershipfeed.php:242
 #, fuzzy
 msgid "Can only handle join activities."
 msgstr "Buscar en el contenido de mensajes"
 
 #. TRANS: Client exception thrown when trying to subscribe to a non-existing group.
-#: actions/atompubmembershipfeed.php:259
 #, fuzzy
 msgid "Unknown group."
 msgstr "Desconocido"
 
 #. TRANS: Client exception thrown when trying to subscribe to an already subscribed group.
-#: actions/atompubmembershipfeed.php:267
 #, fuzzy
 msgid "Already a member."
 msgstr "Todos los miembros"
 
 #. TRANS: Client exception thrown when trying to subscribe to group while blocked from that group.
-#: actions/atompubmembershipfeed.php:275
 msgid "Blocked by admin."
 msgstr ""
 
 #. TRANS: Client exception thrown when referencing a non-existing favorite.
-#: actions/atompubshowfavorite.php:90
 #, fuzzy
 msgid "No such favorite."
 msgstr "No existe tal archivo."
 
 #. TRANS: Client exception thrown when trying to remove a favorite notice of another user.
-#: actions/atompubshowfavorite.php:151
 #, fuzzy
 msgid "Cannot delete someone else's favorite."
 msgstr "No se pudo borrar favorito."
@@ -1451,93 +1136,68 @@ msgstr "No se pudo borrar favorito."
 #. TRANS: Client error displayed when trying to join a non-existing group.
 #. TRANS: Client error displayed when trying to leave a non-local group.
 #. TRANS: Client error displayed when trying to leave a non-existing group.
+#. TRANS: Client error displayed when providing an invalid group ID on the Make Admin page.
 #. 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.
 #. TRANS: Command exception text shown when a group is requested that does not exist.
 #. TRANS: Error text shown when trying to leave a group that does not exist.
-#: actions/atompubshowmembership.php:81 actions/blockedfromgroup.php:81
-#: actions/blockedfromgroup.php:89 actions/deletegroup.php:87
-#: actions/deletegroup.php:100 actions/editgroup.php:102
-#: actions/foafgroup.php:46 actions/foafgroup.php:65 actions/foafgroup.php:73
-#: actions/groupblock.php:89 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:101 actions/grouplogo.php:103
-#: actions/groupmembers.php:84 actions/groupmembers.php:92
-#: actions/grouprss.php:97 actions/grouprss.php:105
-#: actions/groupunblock.php:89 actions/joingroup.php:82
-#: actions/joingroup.php:95 actions/leavegroup.php:82
-#: actions/leavegroup.php:95 actions/makeadmin.php:86
-#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:392
 msgid "No such group."
 msgstr "No existe ese grupo."
 
 #. TRANS: Client exception thrown when trying to show membership of a non-subscribed group
-#: actions/atompubshowmembership.php:91
 #, fuzzy
 msgid "Not a member."
 msgstr "Todos los miembros"
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
-#: actions/atompubshowmembership.php:150
 #, fuzzy
 msgid "Cannot delete someone else's membership."
 msgstr "No se pudo eliminar la auto-suscripción."
 
 #. TRANS: Client exception thrown when trying to display a subscription for a non-existing profile ID.
 #. TRANS: %d is the non-existing profile ID number.
-#: actions/atompubshowsubscription.php:72
-#: actions/atompubshowsubscription.php:83
-#: actions/atompubsubscriptionfeed.php:74
 #, fuzzy, php-format
 msgid "No such profile id: %d."
 msgstr "No existe tal perfil."
 
 #. 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.
-#: actions/atompubshowsubscription.php:94
 #, fuzzy, php-format
 msgid "Profile %1$d not subscribed to profile %2$d."
 msgstr "No te has suscrito a ese perfil."
 
 #. TRANS: Client exception thrown when trying to delete a subscription of another user.
-#: actions/atompubshowsubscription.php:157
 #, fuzzy
 msgid "Cannot delete someone else's subscription."
 msgstr "No se pudo eliminar la auto-suscripción."
 
 #. TRANS: Subtitle for Atom subscription feed.
 #. TRANS: %1$s is a user nickname, %s$s is the StatusNet sitename.
-#: actions/atompubsubscriptionfeed.php:153
 #, fuzzy, php-format
 msgid "People %1$s has subscribed to on %2$s"
 msgstr "Personas suscritas a %s"
 
 #. TRANS: Client error displayed when not using the follow verb.
-#: actions/atompubsubscriptionfeed.php:248
 msgid "Can only handle Follow activities."
 msgstr ""
 
 #. TRANS: Client exception thrown when subscribing to an object that is not a person.
-#: actions/atompubsubscriptionfeed.php:256
 msgid "Can only follow people."
 msgstr ""
 
 #. TRANS: Client exception thrown when subscribing to a non-existing profile.
 #. TRANS: %s is the unknown profile ID.
-#: actions/atompubsubscriptionfeed.php:267
 #, fuzzy, php-format
 msgid "Unknown profile %s."
 msgstr "Tipo de archivo desconocido"
 
 #. TRANS: Client error displayed trying to subscribe to an already subscribed profile.
 #. TRANS: %s is the profile the user already has a subscription on.
-#: actions/atompubsubscriptionfeed.php:275
 #, fuzzy, php-format
 msgid "Already subscribed to %s."
 msgstr "¡Ya te has suscrito!"
 
 #. TRANS: Client error displayed trying to get a non-existing attachment.
-#: actions/attachment.php:73
 msgid "No such attachment."
 msgstr "No existe tal archivo adjunto."
 
@@ -1549,31 +1209,23 @@ msgstr "No existe tal archivo adjunto."
 #. TRANS: Client error displayed when trying to view group members without providing a group nickname.
 #. TRANS: Client error displayed when requesting a group RSS feed without providing a group nickname.
 #. TRANS: Client error displayed if no nickname argument was given requesting a group page.
-#: actions/avatarbynickname.php:60 actions/blockedfromgroup.php:73
-#: actions/editgroup.php:85 actions/groupdesignsettings.php:84
-#: actions/grouplogo.php:86 actions/groupmembers.php:76
-#: actions/grouprss.php:89 actions/showgroup.php:116
 msgid "No nickname."
 msgstr "Ningún nombre de usuario."
 
 #. TRANS: Client error displayed trying to get an avatar without providing an avatar size.
-#: actions/avatarbynickname.php:66
 msgid "No size."
 msgstr "Ningún tamaño."
 
 #. TRANS: Client error displayed trying to get an avatar providing an invalid avatar size.
-#: actions/avatarbynickname.php:72
 msgid "Invalid size."
 msgstr "Tamaño inválido."
 
 #. TRANS: Title for avatar upload page.
-#: actions/avatarsettings.php:66 lib/settingsnav.php:82
 msgid "Avatar"
 msgstr "Imagen"
 
 #. TRANS: Instruction for avatar upload page.
 #. TRANS: %s is the maximum file size, for example "500b", "10kB" or "2MB".
-#: actions/avatarsettings.php:78
 #, php-format
 msgid "You can upload your personal avatar. The maximum file size is %s."
 msgstr "Puedes subir tu imagen personal. El tamaño máximo de archivo es %s."
@@ -1582,17 +1234,12 @@ msgstr "Puedes subir tu imagen personal. El tamaño máximo de archivo es %s."
 #. TRANS: Server error displayed coming across a request from a user without a profile.
 #. TRANS: Server error displayed when trying to authorise a remote subscription request
 #. TRANS: while the user has no profile.
-#: actions/avatarsettings.php:108 actions/avatarsettings.php:192
-#: actions/grouplogo.php:184 actions/remotesubscribe.php:190
-#: actions/userauthorization.php:75 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr "Usuario sin perfil coincidente."
 
 #. TRANS: Avatar upload page form legend.
 #. TRANS: Avatar upload page crop form legend.
 #. TRANS: Legend for group logo settings fieldset.
-#: actions/avatarsettings.php:122 actions/avatarsettings.php:205
-#: actions/grouplogo.php:261
 msgid "Avatar settings"
 msgstr "Configuración de imagen"
 
@@ -1600,8 +1247,6 @@ msgstr "Configuración de imagen"
 #. TRANS: Header on avatar upload crop form for thumbnail of originally uploaded avatar (h2).
 #. TRANS: Uploaded original file in group logo form.
 #. TRANS: Header for originally uploaded file before a crop on the group logo page.
-#: actions/avatarsettings.php:131 actions/avatarsettings.php:214
-#: actions/grouplogo.php:207 actions/grouplogo.php:270
 msgid "Original"
 msgstr "Original"
 
@@ -1609,83 +1254,68 @@ msgstr "Original"
 #. TRANS: Header on avatar upload crop form for thumbnail of to be used rendition of uploaded avatar (h2).
 #. TRANS: Header for preview of to be displayed group logo.
 #. TRANS: Header for the cropped group logo on the group logo page.
-#: actions/avatarsettings.php:147 actions/avatarsettings.php:227
-#: actions/grouplogo.php:219 actions/grouplogo.php:283
 msgid "Preview"
 msgstr "Vista previa"
 
 #. TRANS: Button on avatar upload page to delete current avatar.
 #. TRANS: Button text for user account deletion.
-#: actions/avatarsettings.php:155 actions/deleteaccount.php:319
 msgctxt "BUTTON"
 msgid "Delete"
 msgstr "Borrar"
 
 #. TRANS: Button on avatar upload page to upload an avatar.
 #. TRANS: Submit button to confirm upload of a user backup file for account restore.
-#: actions/avatarsettings.php:173 actions/restoreaccount.php:369
 msgctxt "BUTTON"
 msgid "Upload"
 msgstr "Subir"
 
 #. TRANS: Button on avatar upload crop form to confirm a selected crop as avatar.
-#: actions/avatarsettings.php:243
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Crop"
 msgstr "Cortar"
 
 #. TRANS: Validation error on avatar upload form when no file was uploaded.
-#: actions/avatarsettings.php:318
 msgid "No file uploaded."
 msgstr "Ningún archivo fue subido."
 
 #. TRANS: Avatar upload form instruction after uploading a file.
-#: actions/avatarsettings.php:345
 #, fuzzy
 msgid "Pick a square area of the image to be your avatar."
 msgstr "Elige un área cuadrada para que sea tu imagen"
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
 #. TRANS: Server error displayed trying to crop an uploaded group logo that is no longer present.
-#: actions/avatarsettings.php:360 actions/grouplogo.php:391
 msgid "Lost our file data."
 msgstr "Se perdió nuestros datos de archivo."
 
 #. TRANS: Success message for having updated a user avatar.
-#: actions/avatarsettings.php:384
 msgid "Avatar updated."
 msgstr "Imagen actualizada"
 
 #. TRANS: Error displayed on the avatar upload page if the avatar could not be updated for an unknown reason.
-#: actions/avatarsettings.php:388
 msgid "Failed updating avatar."
 msgstr "Error al actualizar la imagen."
 
 #. TRANS: Success message for deleting a user avatar.
-#: actions/avatarsettings.php:412
 msgid "Avatar deleted."
 msgstr "Imagen borrada."
 
 #. TRANS: Title for backup account page.
 #. TRANS: Option in profile settings to create a backup of the account of the currently logged in user.
-#: actions/backupaccount.php:61 actions/profilesettings.php:468
 msgid "Backup account"
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to backup an account while not logged in.
-#: actions/backupaccount.php:79
 #, fuzzy
 msgid "Only logged-in users can backup their account."
 msgstr "Sólo los usuarios que hayan accedido pueden repetir mensajes."
 
 #. TRANS: Client exception thrown when trying to backup an account without having backup rights.
-#: actions/backupaccount.php:84
 msgid "You may not backup your account."
 msgstr ""
 
 #. TRANS: Information displayed on the backup account page.
-#: actions/backupaccount.php:227
 msgid ""
 "You can backup your account data in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format. This is an experimental feature and provides "
@@ -1695,31 +1325,26 @@ msgid ""
 msgstr ""
 
 #. TRANS: Submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:250
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Backup"
 msgstr "Fondo"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:254
 msgid "Backup your account."
 msgstr ""
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
-#: actions/block.php:68
 msgid "You already blocked that user."
 msgstr "Ya has bloqueado a este usuario."
 
 #. TRANS: Title for block user page.
 #. TRANS: Legend for block user form.
 #. TRANS: Fieldset legend for block user from group form.
-#: actions/block.php:106 actions/block.php:136 actions/groupblock.php:165
 msgid "Block user"
 msgstr "Bloquear usuario."
 
 #. TRANS: Explanation of consequences when blocking a user on the block user page.
-#: actions/block.php:139
 msgid ""
 "Are you sure you want to block this user? Afterwards, they will be "
 "unsubscribed from you, unable to subscribe to you in the future, and you "
@@ -1735,15 +1360,11 @@ msgstr ""
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:154 actions/deleteapplication.php:157
-#: actions/deletegroup.php:220 actions/deletenotice.php:155
-#: actions/deleteuser.php:154 actions/groupblock.php:187
 msgctxt "BUTTON"
 msgid "No"
 msgstr "No"
 
 #. TRANS: Submit button title for 'No' when blocking a user.
-#: actions/block.php:158
 #, fuzzy
 msgid "Do not block this user."
 msgstr "No bloquear a este usuario"
@@ -1754,51 +1375,41 @@ msgstr "No bloquear a este usuario"
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:161 actions/deleteapplication.php:164
-#: actions/deletegroup.php:227 actions/deletenotice.php:162
-#: actions/deleteuser.php:161 actions/groupblock.php:194
 msgctxt "BUTTON"
 msgid "Yes"
 msgstr "Sí"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:165
 #, fuzzy
 msgid "Block this user."
 msgstr "Bloquear este usuario."
 
 #. TRANS: Server error displayed when blocking a user fails.
-#: actions/block.php:189
 msgid "Failed to save block information."
 msgstr "No se guardó información de bloqueo."
 
 #. TRANS: Title for first page with list of users blocked from a group.
 #. TRANS: %s is a group nickname.
-#: actions/blockedfromgroup.php:101
 #, php-format
 msgid "%s blocked profiles"
 msgstr "%s perfiles bloqueados"
 
 #. TRANS: Title for any but the first page with list of users blocked from a group.
 #. TRANS: %1$s is a group nickname, %2$d is a page number.
-#: actions/blockedfromgroup.php:106
 #, php-format
 msgid "%1$s blocked profiles, page %2$d"
 msgstr "%1$s perfiles bloqueados, página %2$d"
 
 #. TRANS: Instructions for list of users blocked from a group.
-#: actions/blockedfromgroup.php:122
 msgid "A list of the users blocked from joining this group."
 msgstr ""
 "Una lista de los usuarios que han sido bloqueados para unirse a este grupo."
 
 #. TRANS: Form legend for unblocking a user from a group.
-#: actions/blockedfromgroup.php:291
 msgid "Unblock user from group"
 msgstr "Desbloquear usuario de grupo"
 
 #. TRANS: Button text for unblocking a user from a group.
-#: actions/blockedfromgroup.php:323
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Unblock"
@@ -1806,128 +1417,102 @@ msgstr "Desbloquear"
 
 #. TRANS: Tooltip for button for unblocking a user from a group.
 #. TRANS: Description of the form to unblock a user.
-#: actions/blockedfromgroup.php:327 lib/unblockform.php:78
 msgid "Unblock this user"
 msgstr "Desbloquear este usuario"
 
 #. TRANS: Title for mini-posting window loaded from bookmarklet.
 #. TRANS: %s is the StatusNet site name.
-#: actions/bookmarklet.php:51
 #, php-format
 msgid "Post to %s"
 msgstr "Postear a %s"
 
 #. TRANS: Client error displayed when not providing a confirmation code in the contact address confirmation action.
-#: actions/confirmaddress.php:74
 msgid "No confirmation code."
 msgstr "Ningún código de confirmación."
 
 #. TRANS: Client error displayed when providing a non-existing confirmation code in the contact address confirmation action.
-#: actions/confirmaddress.php:80
 msgid "Confirmation code not found."
 msgstr "Código de confirmación no encontrado."
 
 #. TRANS: Client error displayed when not providing a confirmation code for another user in the contact address confirmation action.
-#: actions/confirmaddress.php:86
 msgid "That confirmation code is not for you!"
 msgstr "¡Ese código de confirmación no es para ti!"
 
 #. TRANS: Server error for an unknown address type, which can be 'email', 'sms', or the name of an IM network (such as 'xmpp' or 'aim')
-#: actions/confirmaddress.php:94
-#, fuzzy, php-format
+#, php-format
 msgid "Unrecognized address type %s"
 msgstr "Tipo de dirección %s desconocida."
 
 #. TRANS: Client error for an already confirmed email/jabber/sms address.
-#: actions/confirmaddress.php:103 actions/confirmaddress.php:136
 msgid "That address has already been confirmed."
 msgstr "Esa dirección ya fue confirmada."
 
-#: actions/confirmaddress.php:121 actions/imsettings.php:444
-#: actions/userdesignsettings.php:306
-#, fuzzy
 msgid "Couldn't update user."
 msgstr "No se pudo actualizar el usuario."
 
-#: actions/confirmaddress.php:144
 #, fuzzy
 msgid "Couldn't update user im preferences."
 msgstr "No se pudo actualizar información de usuario."
 
-#: actions/confirmaddress.php:156
 #, fuzzy
 msgid "Couldn't insert user im preferences."
 msgstr "No se pudo insertar una nueva suscripción."
 
 #. TRANS: Server error displayed when an address confirmation code deletion from the
 #. TRANS: database fails in the contact address confirmation action.
-#: actions/confirmaddress.php:169
 #, fuzzy
 msgid "Could not delete address confirmation."
 msgstr "No se pudo eliminar la confirmación de mensajería instantánea."
 
 #. TRANS: Title for the contact address confirmation action.
-#: actions/confirmaddress.php:185
 msgid "Confirm address"
 msgstr "Confirmar la dirección"
 
 #. TRANS: Success message for the contact address confirmation action.
 #. TRANS: %s can be 'email', 'jabber', or 'sms'.
-#: actions/confirmaddress.php:200
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "La dirección \"%s\" fue confirmada para tu cuenta."
 
 #. TRANS: Title for page with a conversion (multiple notices in context).
-#: actions/conversation.php:96
 msgid "Conversation"
 msgstr "Conversación"
 
 #. TRANS: Header on conversation page. Hidden by default (h2).
 #. TRANS: Label for user statistics.
-#: actions/conversation.php:149 lib/noticelist.php:87
-#: lib/profileaction.php:246 lib/searchgroupnav.php:82
-#: lib/threadednoticelist.php:66
 msgid "Notices"
 msgstr "Mensajes"
 
 #. TRANS: Client exception displayed trying to delete a user account while not logged in.
-#: actions/deleteaccount.php:71
 #, fuzzy
 msgid "Only logged-in users can delete their account."
 msgstr "Sólo los usuarios que hayan accedido pueden repetir mensajes."
 
 #. TRANS: Client exception displayed trying to delete a user account without have the rights to do that.
-#: actions/deleteaccount.php:77
 #, fuzzy
 msgid "You cannot delete your account."
 msgstr "No puedes borrar usuarios."
 
 #. TRANS: Confirmation text for user deletion. The user has to type this exactly the same, including punctuation.
-#: actions/deleteaccount.php:160 actions/deleteaccount.php:297
 msgid "I am sure."
 msgstr "Estoy seguro."
 
 #. TRANS: Notification for user about the text that must be input to be able to delete a user account.
 #. TRANS: %s is the text that needs to be input.
-#: actions/deleteaccount.php:164
 #, php-format
 msgid "You must write \"%s\" exactly in the box."
 msgstr "Debe escribir «%s» exactamente dentro del cuadro."
 
 #. TRANS: Confirmation that a user account has been deleted.
-#: actions/deleteaccount.php:206
 msgid "Account deleted."
 msgstr "Cuenta eliminada."
 
 #. TRANS: Page title for page on which a user account can be deleted.
 #. TRANS: Option in profile settings to delete the account of the currently logged in user.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:476
 msgid "Delete account"
 msgstr "Eliminar cuenta"
 
 #. TRANS: Form text for user deletion form.
-#: actions/deleteaccount.php:279
 msgid ""
 "This will <strong>permanently delete</strong> your account data from this "
 "server."
@@ -1937,7 +1522,6 @@ msgstr ""
 
 #. TRANS: Additional form text for user deletion form shown if a user has account backup rights.
 #. TRANS: %s is a URL to the backup page.
-#: actions/deleteaccount.php:285
 #, php-format
 msgid ""
 "You are strongly advised to <a href=\"%s\">back up your data</a> before "
@@ -1948,55 +1532,42 @@ msgstr ""
 
 #. TRANS: Field label for delete account confirmation entry.
 #. TRANS: Field label for password reset form where the password has to be typed again.
-#: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:262 actions/register.php:419
 msgid "Confirm"
 msgstr "Confirmar"
 
 #. TRANS: Input title for the delete account field.
 #. TRANS: %s is the text that needs to be input.
-#: actions/deleteaccount.php:304
 #, php-format
 msgid "Enter \"%s\" to confirm that you want to delete your account."
 msgstr "Introduzca «%s» para confirmar que desea eliminar su cuenta."
 
 #. TRANS: Button title for user account deletion.
-#: actions/deleteaccount.php:323
 msgid "Permanently delete your account"
 msgstr "Eliminar permanentemente su cuenta"
 
 #. TRANS: Client error displayed trying to delete an application while not logged in.
-#: actions/deleteapplication.php:62
 msgid "You must be logged in to delete an application."
 msgstr "Debes estar registrado para borrar una aplicación."
 
 #. TRANS: Client error displayed trying to delete an application that does not exist.
-#: actions/deleteapplication.php:71
 msgid "Application not found."
 msgstr "Aplicación no encontrada."
 
 #. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
-#: actions/deleteapplication.php:79 actions/editapplication.php:78
-#: actions/showapplication.php:90
 msgid "You are not the owner of this application."
 msgstr "No eres el propietario de esta aplicación."
 
 #. TRANS: Client error text when there is a problem with the session token.
-#: actions/deleteapplication.php:102 actions/editapplication.php:131
-#: actions/newapplication.php:112 actions/showapplication.php:113
-#: lib/action.php:1391
 msgid "There was a problem with your session token."
 msgstr "Hubo problemas con tu clave de sesión."
 
 #. TRANS: Title for delete application page.
 #. TRANS: Fieldset legend on delete application page.
-#: actions/deleteapplication.php:124 actions/deleteapplication.php:149
 msgid "Delete application"
 msgstr "Eliminar la aplicación"
 
 #. TRANS: Confirmation text on delete application page.
-#: actions/deleteapplication.php:152
 msgid ""
 "Are you sure you want to delete this application? This will clear all data "
 "about the application from the database, including all existing user "
@@ -2007,57 +1578,47 @@ msgstr ""
 "conexiones de usuario existente."
 
 #. TRANS: Submit button title for 'No' when deleting an application.
-#: actions/deleteapplication.php:161
 #, fuzzy
 msgid "Do not delete this application."
 msgstr "No eliminar esta aplicación"
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
-#: actions/deleteapplication.php:167
 #, fuzzy
 msgid "Delete this application."
 msgstr "Borrar esta aplicación"
 
 #. TRANS: Client error when trying to delete group while not logged in.
-#: actions/deletegroup.php:64
 msgid "You must be logged in to delete a group."
 msgstr "Debe estar conectado para eliminar un grupo."
 
 #. TRANS: Client error when trying to delete a group without providing a nickname or ID for the group.
 #. TRANS: Client error displayed when trying to join a group without providing a group name or group ID.
 #. TRANS: Client error displayed when trying to leave a group without providing a group name or group ID.
-#: actions/deletegroup.php:94 actions/joingroup.php:89
-#: actions/leavegroup.php:89
 msgid "No nickname or ID."
 msgstr "Ningún nombre de usuario o ID."
 
 #. TRANS: Client error when trying to delete a group without having the rights to delete it.
-#: actions/deletegroup.php:107
 msgid "You are not allowed to delete this group."
 msgstr "No puede eliminar este grupo."
 
 #. TRANS: Server error displayed if a group could not be deleted.
 #. TRANS: %s is the name of the group that could not be deleted.
-#: actions/deletegroup.php:150
 #, php-format
 msgid "Could not delete group %s."
 msgstr "No se pudo eliminar el grupo %s."
 
 #. TRANS: Message given after deleting a group.
 #. TRANS: %s is the deleted group's name.
-#: actions/deletegroup.php:159
 #, php-format
 msgid "Deleted group %s"
 msgstr "Grupo %s eliminado"
 
 #. TRANS: Title of delete group page.
 #. TRANS: Form legend for deleting a group.
-#: actions/deletegroup.php:176 actions/deletegroup.php:202
 msgid "Delete group"
 msgstr "Borrar grupo"
 
 #. TRANS: Warning in form for deleleting a group.
-#: actions/deletegroup.php:206
 msgid ""
 "Are you sure you want to delete this group? This will clear all data about "
 "the group from the database, without a backup. Public posts to this group "
@@ -2068,13 +1629,11 @@ msgstr ""
 "públicos al grupo todavía aparecerán en las líneas de tiempo individuales."
 
 #. TRANS: Submit button title for 'No' when deleting a group.
-#: actions/deletegroup.php:224
 #, fuzzy
 msgid "Do not delete this group."
 msgstr "No eliminar este grupo"
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
-#: actions/deletegroup.php:231
 #, fuzzy
 msgid "Delete this group."
 msgstr "Borrar este grupo"
@@ -2085,22 +1644,18 @@ msgstr "Borrar este grupo"
 #. TRANS: Client error displayed trying to block a user from a group while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying to log out when not logged in.
+#. TRANS: Client error displayed when trying to access the "make admin" page while not logged in.
+#. TRANS: Client error displayed trying to create a new direct message while not logged in.
+#. TRANS: Client error displayed trying to send a notice while not logged in.
+#. TRANS: Client error displayed trying to nudge a user without being logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
 #. TRANS: Client error displayed when trying to change user options while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
-#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:70
-#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
-#: actions/nudge.php:63 actions/pluginenable.php:97 actions/subedit.php:33
-#: actions/subscribe.php:98 actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:71 lib/profileformaction.php:63
-#: lib/settingsaction.php:72
 msgid "Not logged in."
 msgstr "No conectado."
 
 #. TRANS: Instructions for deleting a notice.
-#: actions/deletenotice.php:110
 msgid ""
 "You are about to permanently delete a notice. Once this is done, it cannot "
 "be undone."
@@ -2110,50 +1665,41 @@ msgstr ""
 
 #. TRANS: Page title when deleting a notice.
 #. TRANS: Fieldset legend for the delete notice form.
-#: actions/deletenotice.php:117 actions/deletenotice.php:148
 msgid "Delete notice"
 msgstr "Borrar mensaje"
 
 #. TRANS: Message for the delete notice form.
-#: actions/deletenotice.php:152
 msgid "Are you sure you want to delete this notice?"
 msgstr "¿Estás seguro de que quieres eliminar este aviso?"
 
 #. TRANS: Submit button title for 'No' when deleting a notice.
-#: actions/deletenotice.php:159
 #, fuzzy
 msgid "Do not delete this notice."
 msgstr "No eliminar este mensaje"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:166
 #, fuzzy
 msgid "Delete this notice."
 msgstr "Borrar este mensaje"
 
 #. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
-#: actions/deleteuser.php:66
 msgid "You cannot delete users."
 msgstr "No puedes borrar usuarios."
 
 #. TRANS: Client error displayed when trying to delete a non-local user.
-#: actions/deleteuser.php:74
 msgid "You can only delete local users."
 msgstr "Sólo puedes eliminar usuarios locales."
 
 #. TRANS: Title of delete user page.
-#: actions/deleteuser.php:110
 msgctxt "TITLE"
 msgid "Delete user"
 msgstr "Eliminar usuario"
 
 #. TRANS: Fieldset legend on delete user page.
-#: actions/deleteuser.php:134
 msgid "Delete user"
 msgstr "Borrar usuario"
 
 #. TRANS: Information text to request if a user is certain that the described action has to be performed.
-#: actions/deleteuser.php:138
 msgid ""
 "Are you sure you want to delete this user? This will clear all data about "
 "the user from the database, without a backup."
@@ -2162,99 +1708,80 @@ msgstr ""
 "todos los datos sobre el usuario, sin dejar una copia de seguridad."
 
 #. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/deleteuser.php:158
 #, fuzzy
 msgid "Do not delete this user."
 msgstr "No eliminar este usuario"
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
-#: actions/deleteuser.php:165
 #, fuzzy
 msgid "Delete this user."
 msgstr "Borrar este usuario"
 
 #. TRANS: Message used as title for design settings for the site.
-#: actions/designadminpanel.php:60 lib/settingsnav.php:97
 msgid "Design"
 msgstr "Diseño"
 
 #. TRANS: Instructions for design adminsitration panel.
-#: actions/designadminpanel.php:71
 msgid "Design settings for this StatusNet site"
 msgstr "Configuración de diseño de este sitio de StatusNet"
 
 #. TRANS: Client error displayed when a logo URL does is not valid.
-#: actions/designadminpanel.php:327
 msgid "Invalid logo URL."
 msgstr "URL de logotipo inválido."
 
 #. TRANS: Client error displayed when an SSL logo URL is invalid.
-#: actions/designadminpanel.php:333
 msgid "Invalid SSL logo URL."
 msgstr "URL no válida de logotipo SSL."
 
 #. TRANS: Client error displayed when a theme is submitted through the form that is not in the theme list.
 #. TRANS: %s is the chosen unavailable theme.
-#: actions/designadminpanel.php:339
 #, php-format
 msgid "Theme not available: %s."
 msgstr "Tema no disponible: %s."
 
 #. TRANS: Fieldset legend for form to change logo.
-#: actions/designadminpanel.php:437
 msgid "Change logo"
 msgstr "Cambiar logo"
 
 #. TRANS: Field label for StatusNet site logo.
-#: actions/designadminpanel.php:444
 msgid "Site logo"
 msgstr "Logo del sitio"
 
 #. TRANS: Field label for SSL StatusNet site logo.
-#: actions/designadminpanel.php:452
 msgid "SSL logo"
 msgstr "Logo SSL"
 
 #. TRANS: Fieldset legend for form change StatusNet site's theme.
-#: actions/designadminpanel.php:467
 msgid "Change theme"
 msgstr "Cambiar el tema"
 
 #. TRANS: Field label for dropdown to choose site theme.
-#: actions/designadminpanel.php:485
 msgid "Site theme"
 msgstr "Tema del sitio"
 
 #. TRANS: Title for field label for dropdown to choose site theme.
-#: actions/designadminpanel.php:487
 msgid "Theme for the site."
 msgstr "Tema para el sitio."
 
 #. TRANS: Field label for uploading a cutom theme.
-#: actions/designadminpanel.php:494
 msgid "Custom theme"
 msgstr "Personalizar tema"
 
 #. TRANS: Form instructions for uploading a cutom StatusNet theme.
-#: actions/designadminpanel.php:499
 msgid "You can upload a custom StatusNet theme as a .ZIP archive."
 msgstr "Puedes subir un tema personalizado StatusNet como un archivo .ZIP."
 
 #. TRANS: Fieldset legend for theme background image.
-#: actions/designadminpanel.php:515
 msgid "Change background image"
 msgstr "Cambiar la imagen de fondo"
 
 #. TRANS: Field label for background image on theme designer page.
 #. TRANS: Field label for background color selector.
 #. TRANS: Label on profile design page for setting a profile page background colour.
-#: actions/designadminpanel.php:525 actions/designadminpanel.php:609
-#: lib/designform.php:238
 msgid "Background"
 msgstr "Fondo"
 
 #. TRANS: Form guide for background image upload form on theme designer page.
-#: actions/designadminpanel.php:531
 #, php-format
 msgid ""
 "You can upload a background image for the site. The maximum file size is %1"
@@ -2264,202 +1791,167 @@ msgstr ""
 "es %1$s."
 
 #. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:558
 msgid "On"
 msgstr "Activar"
 
 #. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:575
 msgid "Off"
 msgstr "Desactivar"
 
 #. TRANS: Form guide for turning background image on or off on theme designer page.
 #. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
 #. TRANS: use of the uploaded profile image.
-#: actions/designadminpanel.php:577 lib/designform.php:214
 msgid "Turn background image on or off."
 msgstr "Activar o desactivar la imagen de fondo."
 
 #. TRANS: Checkbox label to title background image on theme designer page.
 #. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-#: actions/designadminpanel.php:583 lib/designform.php:220
 msgid "Tile background image"
 msgstr "Imagen de fondo en mosaico"
 
 #. TRANS: Fieldset legend for theme colors.
-#: actions/designadminpanel.php:598
 msgid "Change colors"
 msgstr "Cambiar colores"
 
 #. TRANS: Field label for content color selector.
 #. TRANS: Label on profile design page for setting a profile page content colour.
-#: actions/designadminpanel.php:623 lib/designform.php:252
 msgid "Content"
 msgstr "Contenido"
 
 #. TRANS: Field label for sidebar color selector.
 #. TRANS: Label on profile design page for setting a profile page sidebar colour.
-#: actions/designadminpanel.php:637 lib/designform.php:266
 msgid "Sidebar"
 msgstr "Barra lateral"
 
 #. TRANS: Field label for text color selector.
 #. TRANS: Label on profile design page for setting a profile page text colour.
-#: actions/designadminpanel.php:651 lib/designform.php:280
 msgid "Text"
 msgstr "Texto"
 
 #. TRANS: Field label for link color selector.
 #. TRANS: Label on profile design page for setting a profile page links colour.
-#: actions/designadminpanel.php:665 lib/designform.php:294
 msgid "Links"
 msgstr "Vínculos"
 
 #. TRANS: Fieldset legend for advanced theme design settings.
-#: actions/designadminpanel.php:691
 msgid "Advanced"
 msgstr "Avanzado"
 
 #. TRANS: Field label for custom CSS.
-#: actions/designadminpanel.php:696
 msgid "Custom CSS"
 msgstr "Personalizar CSS"
 
 #. TRANS: Button text for resetting theme settings.
-#: actions/designadminpanel.php:718
 msgctxt "BUTTON"
 msgid "Use defaults"
 msgstr "Usar los valores predeterminados"
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:720
 #, fuzzy
 msgid "Restore default designs."
 msgstr "Restaurar los diseños predeterminados"
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:728
 #, fuzzy
 msgid "Reset back to default."
 msgstr "Volver a los valores predeterminados"
 
 #. TRANS: Title for button for saving theme settings.
-#: actions/designadminpanel.php:736
 #, fuzzy
 msgid "Save design."
 msgstr "Guardar el diseño"
 
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
-#: actions/disfavor.php:83
 msgid "This notice is not a favorite!"
 msgstr "Este mensaje no es un favorito!"
 
 #. TRANS: Title for page on which favorites can be added.
-#: actions/disfavor.php:98
 msgid "Add to favorites"
 msgstr "Agregar a favoritos"
 
 #. TRANS: Client exception thrown when requesting a document from the documentation that does not exist.
 #. TRANS: %s is the non-existing document.
-#: actions/doc.php:155
 #, fuzzy, php-format
 msgid "No such document \"%s\"."
 msgstr "No existe tal documento \"%s\""
 
 #. TRANS: Title for "Edit application" form.
 #. TRANS: Form legend.
-#: actions/editapplication.php:54 lib/applicationeditform.php:129
 msgid "Edit application"
 msgstr "Editar aplicación"
 
 #. TRANS: Client error displayed trying to edit an application while not logged in.
-#: actions/editapplication.php:66
 msgid "You must be logged in to edit an application."
 msgstr "Debes haber iniciado sesión para editar una aplicación."
 
 #. TRANS: Client error displayed trying to edit an application that does not exist.
-#: actions/editapplication.php:83 actions/showapplication.php:83
 msgid "No such application."
 msgstr "No existe tal aplicación."
 
 #. TRANS: Instructions for "Edit application" form.
-#: actions/editapplication.php:167
 msgid "Use this form to edit your application."
 msgstr "Utiliza este formulario para editar tu aplicación."
 
 #. TRANS: Validation error shown when not providing a name in the "Edit application" form.
 #. TRANS: Validation error shown when not providing a name in the "New application" form.
-#: actions/editapplication.php:184 actions/newapplication.php:164
 msgid "Name is required."
 msgstr "Se requiere un nombre"
 
 #. 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.
-#: actions/editapplication.php:188 actions/newapplication.php:172
 #, fuzzy
 msgid "Name is too long (maximum 255 characters)."
 msgstr "El nombre es muy largo (máx. 255 carac.)"
 
 #. TRANS: Validation error shown when providing a name for an application that already exists in the "Edit application" form.
 #. TRANS: Validation error shown when providing a name for an application that already exists in the "New application" form.
-#: actions/editapplication.php:192 actions/newapplication.php:168
 msgid "Name already in use. Try another one."
 msgstr "Ese nombre ya está en uso. Prueba con otro."
 
 #. TRANS: Validation error shown when not providing a description in the "Edit application" form.
 #. TRANS: Validation error shown when not providing a description in the "New application" form.
-#: actions/editapplication.php:196 actions/newapplication.php:176
 msgid "Description is required."
 msgstr "Se requiere una descripción"
 
 #. TRANS: Validation error shown when providing too long a source URL in the "Edit application" form.
-#: actions/editapplication.php:209
 msgid "Source URL is too long."
 msgstr "El URL fuente es muy largo."
 
 #. TRANS: Validation error shown when providing an invalid source URL in the "Edit application" form.
 #. TRANS: Validation error shown when providing an invalid source URL in the "New application" form.
-#: actions/editapplication.php:216 actions/newapplication.php:199
 msgid "Source URL is not valid."
 msgstr "El URL fuente es inválido."
 
 #. 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.
-#: actions/editapplication.php:220 actions/newapplication.php:203
 msgid "Organization is required."
 msgstr "Se requiere una organización."
 
 #. TRANS: Validation error shown when providing too long an arganisation name in the "Edit application" form.
-#: actions/editapplication.php:224 actions/newapplication.php:207
 #, fuzzy
 msgid "Organization is too long (maximum 255 characters)."
 msgstr "El texto de organización es muy largo (máx. 255 caracteres)."
 
 #. TRANS: Form validation error show when an organisation name has not been provided in the edit application form.
 #. TRANS: Form validation error show when an organisation name has not been provided in the new application form.
-#: actions/editapplication.php:228 actions/newapplication.php:211
 msgid "Organization homepage is required."
 msgstr "Se requiere una página principal de organización"
 
 #. TRANS: Validation error shown when providing too long a callback URL in the "Edit application" form.
 #. TRANS: Validation error shown when providing too long a callback URL in the "New application" form.
-#: actions/editapplication.php:239 actions/newapplication.php:225
 msgid "Callback is too long."
 msgstr "La devolución de llamada es muy larga."
 
 #. TRANS: Validation error shown when providing an invalid callback URL in the "Edit application" form.
 #. TRANS: Validation error shown when providing an invalid callback URL in the "New application" form.
-#: actions/editapplication.php:247 actions/newapplication.php:235
 msgid "Callback URL is not valid."
 msgstr "El URL de devolución de llamada es inválido."
 
 #. TRANS: Server error occuring when an application could not be updated from the "Edit application" form.
-#: actions/editapplication.php:284
 msgid "Could not update application."
 msgstr "No fue posible actualizar la aplicación."
 
 #. TRANS: Title for form to edit a group. %s is a group nickname.
-#: actions/editgroup.php:55
 #, php-format
 msgid "Edit %s group"
 msgstr "Editar grupo %s"
@@ -2467,40 +1959,40 @@ msgstr "Editar grupo %s"
 #. TRANS: Client error displayed trying to edit a group while not logged in.
 #. TRANS: Client error displayed when trying to create a group while not logged in.
 #. TRANS: Client error displayed trying to create a group while not logged in.
-#: actions/editgroup.php:68 actions/grouplogo.php:69 actions/newgroup.php:65
 msgid "You must be logged in to create a group."
 msgstr "Debes estar conectado para crear un grupo"
 
 #. TRANS: Form instructions for group edit form.
-#: actions/editgroup.php:161
 msgid "Use this form to edit the group."
 msgstr "Usa este formulario para editar el grupo."
 
+#. TRANS: Group edit form validation error.
+#. TRANS: Group create form validation error.
+#. TRANS: %s is the invalid alias.
+#, php-format
+msgid "Invalid alias: \"%s\""
+msgstr "Alias inválido: \"%s\""
+
 #. TRANS: Group edit form success message.
-#: actions/editgroup.php:301
 msgid "Options saved."
 msgstr "Se guardó Opciones."
 
 #. TRANS: Title for e-mail settings.
-#: actions/emailsettings.php:60
 msgid "Email settings"
 msgstr "Configuración del correo electrónico"
 
 #. TRANS: E-mail settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/emailsettings.php:74
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 msgstr "Gestiona la forma en que recibes correo desde %%site.name%%"
 
 #. TRANS: Form legend for e-mail settings form.
 #. TRANS: Field label for e-mail address input in e-mail settings form.
-#: actions/emailsettings.php:104 actions/emailsettings.php:130
 msgid "Email address"
 msgstr "Dirección de correo electrónico"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:110
 msgid "Current confirmed email address."
 msgstr "Actual dirección de correo electrónico confirmada"
 
@@ -2509,15 +2001,11 @@ msgstr "Actual dirección de correo electrónico confirmada"
 #. TRANS: Button label to remove a confirmed IM address.
 #. TRANS: Button label to remove a confirmed SMS address.
 #. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
-#: actions/emailsettings.php:113 actions/emailsettings.php:180
-#: actions/imsettings.php:119 actions/smssettings.php:119
-#: actions/smssettings.php:175
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Eliminar"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:120
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -2530,44 +2018,36 @@ msgstr ""
 #. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
 #. TRANS: Any other domain may be owned by a legitimate person or
 #. TRANS: organization.
-#: actions/emailsettings.php:137
 msgid "Email address, like \"UserName@example.org\""
 msgstr "Correo electrónico, como \"NombredeUsuario@example.org\""
 
 #. TRANS: Button label for adding an e-mail address in e-mail settings form.
 #. TRANS: Button label for adding an IM address in IM settings form.
 #. TRANS: Button label for adding a SMS phone number in SMS settings form.
-#: actions/emailsettings.php:141 actions/imsettings.php:147
-#: actions/smssettings.php:157
 msgctxt "BUTTON"
 msgid "Add"
 msgstr "Añadir"
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:149 actions/smssettings.php:166
 msgid "Incoming email"
 msgstr "Correo entrante"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:155
 msgid "I want to post notices by email."
 msgstr "Quiero publicar mensajes por correo electrónico."
 
 #. TRANS: Form instructions for incoming e-mail form in e-mail settings.
 #. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
-#: actions/emailsettings.php:177 actions/smssettings.php:173
 msgid "Send email to this address to post new notices."
 msgstr "Envie emails a esta dirección para ingresar nuevos avisos"
 
 #. TRANS: Instructions for incoming e-mail address input form, when an address has already been assigned.
 #. TRANS: Instructions for incoming SMS e-mail address input form.
-#: actions/emailsettings.php:186 actions/smssettings.php:181
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr "Hace una nueva dirección de correo para postear; cancela la anterior."
 
 #. TRANS: Instructions for incoming e-mail address input form.
-#: actions/emailsettings.php:190
 msgid ""
 "To send notices via email, we need to create a unique email address for you "
 "on this server:"
@@ -2575,92 +2055,74 @@ msgstr ""
 
 #. TRANS: Button label for adding an e-mail address to send notices from.
 #. TRANS: Button label for adding an SMS e-mail address to send notices from.
-#: actions/emailsettings.php:196 actions/smssettings.php:184
 msgctxt "BUTTON"
 msgid "New"
 msgstr "Nuevo"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:205
 msgid "Email preferences"
 msgstr "Preferencias de correo electrónico"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:213
 msgid "Send me notices of new subscriptions through email."
 msgstr "Enviarme mensajes de nuevas suscripciones por correo electrónico."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:219
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr ""
 "Enviarme un correo electrónico cuando alguien agrega mi aviso a favoritos."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:226
 msgid "Send me email when someone sends me a private message."
 msgstr ""
 "Enviarme un correo electrónico cuando alguien me envía un mensaje privado."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:232
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr ""
 "Enviarme un correo electrónico cuando alguien me envíe una \"@-respuesta\"."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:238
 msgid "Allow friends to nudge me and send me an email."
 msgstr "Permitir que amigos me den un toque y me envien un correo electrónico."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:244
 msgid "Publish a MicroID for my email address."
 msgstr "Publicar un MicroID para mi dirección de correo."
 
 #. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:362
 msgid "Email preferences saved."
 msgstr "Preferencias de correo electrónico guardadas."
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:381
 msgid "No email address."
 msgstr "Sin dirección de correo electrónico"
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:389
 #, fuzzy
 msgid "Cannot normalize that email address."
 msgstr "No se puede normalizar esta dirección de correo electrónico."
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:394 actions/register.php:197
-#: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "Correo electrónico no válido"
 
 #. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:398
 msgid "That is already your email address."
 msgstr "Esa ya es tu dirección de correo electrónico"
 
 #. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:402
 msgid "That email address already belongs to another user."
 msgstr "Esa dirección de correo pertenece a otro usuario."
 
 #. TRANS: Server error thrown on database error adding e-mail confirmation code.
 #. TRANS: Server error thrown on database error adding Instant Messaging confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:419 actions/imsettings.php:362
-#: actions/smssettings.php:364
 #, fuzzy
 msgid "Could not insert confirmation code."
 msgstr "No se pudo insertar el código de confirmación."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:426
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
@@ -2672,104 +2134,84 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling Instant Messaging address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:446 actions/imsettings.php:391
-#: actions/smssettings.php:398
 msgid "No pending confirmation to cancel."
 msgstr "Ninguna confirmación pendiente para cancelar."
 
 #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:451
 msgid "That is the wrong email address."
 msgstr "Esa es la dirección de correo electrónico incorrecta."
 
 #. TRANS: Server error thrown on database error canceling e-mail address confirmation.
 #. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
-#: actions/emailsettings.php:460 actions/smssettings.php:412
 #, fuzzy
 msgid "Could not delete email confirmation."
 msgstr "No se pudo eliminar la confirmación de correo electrónico."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:465
 msgid "Email confirmation cancelled."
 msgstr "Confirmación de correo electrónico cancelada."
 
 #. TRANS: Message given trying to remove an e-mail address that is not
 #. TRANS: registered for the active user.
-#: actions/emailsettings.php:484
 msgid "That is not your email address."
 msgstr "Esa no es tu dirección de correo electrónico"
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:505
 msgid "The email address was removed."
 msgstr "La dirección de correo electrónico ha sido eliminada."
 
 #. TRANS: Form validation error displayed when trying to remove an incoming e-mail address while no address has been set.
-#: actions/emailsettings.php:519 actions/smssettings.php:554
 msgid "No incoming email address."
 msgstr "No hay dirección de correo entrante."
 
 #. 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.
-#: actions/emailsettings.php:531 actions/emailsettings.php:555
-#: actions/smssettings.php:565 actions/smssettings.php:590
 #, fuzzy
 msgid "Could not update user record."
 msgstr "No se pudo actualizar información de usuario."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
 #. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:535 actions/smssettings.php:569
 msgid "Incoming email address removed."
 msgstr "Dirección de correo entrante removida."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
 #. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:559 actions/smssettings.php:594
 msgid "New incoming email address added."
 msgstr "Nueva dirección de correo entrante agregada."
 
 #. TRANS: Client error displayed when trying to mark a notice as favorite that already is a favorite.
-#: actions/favor.php:80
 msgid "This notice is already a favorite!"
 msgstr "¡Este mensaje ya está en favoritos!"
 
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
-#: actions/favor.php:95
 #, fuzzy
 msgid "Disfavor favorite."
 msgstr "Sacar favorito"
 
 #. TRANS: Page title for first page of favorited notices.
 #. TRANS: Title for favourited notices section.
-#: actions/favorited.php:65 lib/popularnoticesection.php:62
-#: lib/publicgroupnav.php:93
 msgid "Popular notices"
 msgstr "Mensajes populares"
 
 #. TRANS: Page title for all but first page of favorited notices.
 #. TRANS: %d is the page number being displayed.
-#: actions/favorited.php:69
 #, php-format
 msgid "Popular notices, page %d"
 msgstr "Mensajes populares, página %d"
 
 #. TRANS: Description on page displaying favorited notices.
-#: actions/favorited.php:81
 msgid "The most popular notices on the site right now."
 msgstr "Los mensajes más populares del sitio en este momento."
 
 #. TRANS: Text displayed instead of a list when a site does not yet have any favourited notices.
-#: actions/favorited.php:149
 msgid "Favorite notices appear on this page but no one has favorited one yet."
 msgstr ""
 "Los mensajes favoritos aparecen en esta página, pero todavía nadie ha "
 "marcado algún mensaje como favorito."
 
 #. TRANS: Additional text displayed instead of a list when a site does not yet have any favourited notices for logged in users.
-#: actions/favorited.php:153
 msgid ""
 "Be the first to add a notice to your favorites by clicking the fave button "
 "next to any notice you like."
@@ -2779,7 +2221,6 @@ msgstr ""
 
 #. TRANS: Additional text displayed instead of a list when a site does not yet have any favourited notices for not logged in users.
 #. TRANS: %%action.register%% is a registration link. "[link text](link)" is Mark Down. Do not change the formatting.
-#: actions/favorited.php:158
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to add a "
@@ -2792,181 +2233,146 @@ msgstr ""
 #. TRANS: %s is a user's nickname.
 #. TRANS: Title for first page of favourite notices of a user.
 #. TRANS: %s is the user for whom the favourite notices are displayed.
-#: actions/favoritesrss.php:111 actions/showfavorites.php:76
-#: lib/personalgroupnav.php:110
 #, php-format
 msgid "%s's favorite notices"
 msgstr "Mensajes favoritos de %s"
 
 #. TRANS: Desciption of RSS feed with favourite notices of a user.
 #. TRANS: %1$s is a user's nickname, %2$s is the name of the StatusNet site.
-#: actions/favoritesrss.php:117
 #, php-format
 msgid "Updates favored by %1$s on %2$s!"
 msgstr "¡Actualizaciones favorecidas por %1$s en %2$s!"
 
 #. TRANS: Page title for first page of featured users.
 #. TRANS: Title for featured users section.
-#: actions/featured.php:69 lib/featureduserssection.php:87
-#: lib/publicgroupnav.php:89
 msgid "Featured users"
 msgstr "Usuarios que figuran"
 
 #. TRANS: Page title for all but first page of featured users.
 #. TRANS: %d is the page number being displayed.
-#: actions/featured.php:73
 #, php-format
 msgid "Featured users, page %d"
 msgstr "Usuarios que figuran, página %d"
 
 #. TRANS: Description on page displaying featured users.
-#: actions/featured.php:102
 #, fuzzy, php-format
 msgid "A selection of some great users on %s."
 msgstr "Una selección de fantásticos usuarios en %s"
 
 #. TRANS: Client error displayed when no notice ID was given trying do display a file.
-#: actions/file.php:36
 msgid "No notice ID."
 msgstr "No hay ID de mensaje."
 
 #. TRANS: Client error displayed when an invalid notice ID was given trying do display a file.
-#: actions/file.php:41
 msgid "No notice."
 msgstr "Sin mensaje."
 
 #. TRANS: Client error displayed when trying do display a file for a notice without a file attachement.
-#: actions/file.php:46
 msgid "No attachments."
 msgstr "Sin archivo adjunto"
 
 #. TRANS: Client error displayed when trying do display a file for a notice with file attachements
 #. TRANS: that could not be found.
-#: actions/file.php:58
 msgid "No uploaded attachments."
 msgstr "No hay archivos adjuntos subidos."
 
 #. TRANS: Client error displayed when subscribing to a remote profile and an unexpected response is received.
-#: actions/finishremotesubscribe.php:69
 msgid "Not expecting this response!"
 msgstr "¡Respuesta inesperada!"
 
 #. TRANS: Client error displayed when subscribing to a remote profile that does not exist.
-#: actions/finishremotesubscribe.php:81
 msgid "User being listened to does not exist."
 msgstr "El usuario al que quieres listar no existe."
 
 #. TRANS: Client error displayed when subscribing to a remote profile that is a local profile.
-#: actions/finishremotesubscribe.php:89 actions/remotesubscribe.php:58
 msgid "You can use the local subscription!"
 msgstr "¡Puedes usar la suscripción local!"
 
 #. TRANS: Client error displayed when subscribing to a remote profile that is blocked form subscribing to.
-#: actions/finishremotesubscribe.php:102
 msgid "That user has blocked you from subscribing."
 msgstr "Ese usuario te ha bloqueado la suscripción."
 
 #. TRANS: Client error displayed when subscribing to a remote profile without providing an authorised token.
-#: actions/finishremotesubscribe.php:114
 msgid "You are not authorized."
 msgstr "No estás autorizado."
 
 #. TRANS: Client error displayed when subscribing to a remote profile and conversion of the request token to access token fails.
-#: actions/finishremotesubscribe.php:118
 msgid "Could not convert request token to access token."
 msgstr "No se pudo convertir el token de solicitud en token de acceso."
 
 #. TRANS: Client error displayed when subscribing to a remote profile fails because of an unsupported version of the OMB protocol.
-#: actions/finishremotesubscribe.php:124
 msgid "Remote service uses unknown version of OMB protocol."
 msgstr "El servicio remoto utiliza una versión desconocida del protocolo OMB."
 
 #. TRANS: Server error displayed when subscribing to a remote profile fails because the remote profile could not be updated.
-#: actions/finishremotesubscribe.php:145 lib/oauthstore.php:317
 msgid "Error updating remote profile."
 msgstr "Error al actualizar el perfil remoto."
 
 #. TRANS: Client error displayed when requesting a non-existent file.
-#: actions/getfile.php:77
 msgid "No such file."
 msgstr "No existe tal archivo."
 
 #. TRANS: Client error displayed when requesting a file without having read access to it.
-#: actions/getfile.php:82
 msgid "Cannot read file."
 msgstr "No se puede leer archivo."
 
 #. TRANS: Client error displayed when trying to assign an invalid role to a user.
-#: actions/grantrole.php:61 actions/revokerole.php:62
 msgid "Invalid role."
 msgstr "Función no válida."
 
 #. TRANS: Client error displayed when trying to assign an reserved role to a user.
-#: actions/grantrole.php:66 actions/revokerole.php:66
 msgid "This role is reserved and cannot be set."
 msgstr "Esta función es reservada y no puede asignarse."
 
 #. TRANS: Client error displayed when trying to assign a role to a user while not being allowed to set roles.
-#: actions/grantrole.php:76
 msgid "You cannot grant user roles on this site."
 msgstr "No puedes conceder funciones de usuario en este sitio."
 
 #. TRANS: Client error displayed when trying to assign a role to a user that already has that role.
-#: actions/grantrole.php:84
 msgid "User already has this role."
 msgstr "El usuario ya tiene esta función."
 
 #. TRANS: Client error displayed trying to block a user from a group while not specifying a to be blocked user profile.
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing a profile.
+#. TRANS: Client error displayed when not providing a profile ID on the Make Admin page.
 #. TRANS: Client error displayed trying a change a subscription without providing a profile.
 #. TRANS: Client error displayed when trying to change user options without specifying a user to work on.
-#: actions/groupblock.php:71 actions/groupunblock.php:71
-#: actions/makeadmin.php:71 actions/subedit.php:49
-#: lib/profileformaction.php:79
 msgid "No profile specified."
 msgstr "No se especificó perfil."
 
 #. TRANS: Client error displayed trying to block a user from a group while specifying a non-existing profile.
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing an existing profile.
+#. TRANS: Client error displayed when specifying an invalid profile ID on the Make Admin page.
 #. TRANS: Client error displayed trying a change a subscription for a non-existant profile ID.
 #. TRANS: Client error displayed when trying to change user options without specifying an existing user to work on.
-#: actions/groupblock.php:77 actions/groupunblock.php:77
-#: actions/makeadmin.php:76 actions/subedit.php:57 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:87
 msgid "No profile with that ID."
 msgstr "No existe perfil con ese ID"
 
 #. TRANS: Client error displayed trying to block a user from a group while not specifying a group to block a profile from.
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing a group.
-#: actions/groupblock.php:83 actions/groupunblock.php:83
-#: actions/makeadmin.php:81
+#. TRANS: Client error displayed when not providing a group ID on the Make Admin page.
 msgid "No group specified."
 msgstr "Grupo no especificado."
 
 #. TRANS: Client error displayed trying to block a user from a group while not being an admin user.
-#: actions/groupblock.php:95
 msgid "Only an admin can block group members."
 msgstr "Sólo un administrador puede bloquear miembros de un grupo."
 
 #. TRANS: Client error displayed trying to block a user from a group while user is already blocked from the given group.
-#: actions/groupblock.php:100
 msgid "User is already blocked from group."
 msgstr "Usuario ya está bloqueado del grupo."
 
 #. TRANS: Client error displayed trying to block a user from a group while user is not a member of given group.
-#: actions/groupblock.php:106
 msgid "User is not a member of group."
 msgstr "Usuario no es miembro del grupo"
 
 #. TRANS: Title for block user from group page.
 #. TRANS: Form legend for form to block user from a group.
-#: actions/groupblock.php:141 actions/groupmembers.php:364
 msgid "Block user from group"
 msgstr "Bloquear usuario de grupo"
 
 #. TRANS: Explanatory text for block user from group form before setting the block.
 #. TRANS: %1$s is that to be blocked user, %2$s is the group the user will be blocked from.
-#: actions/groupblock.php:169
 #, php-format
 msgid ""
 "Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They "
@@ -2978,19 +2384,16 @@ msgstr ""
 "sucesivo."
 
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
-#: actions/groupblock.php:191
 #, fuzzy
 msgid "Do not block this user from this group."
 msgstr "No bloquear este usuario de este grupo"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
-#: actions/groupblock.php:198
 #, fuzzy
 msgid "Block this user from this group."
 msgstr "Bloquear este usuario de este grupo"
 
 #. TRANS: Server error displayed when trying to block a user from a group fails because of an application error.
-#: actions/groupblock.php:215
 msgid "Database error blocking user from group."
 msgstr ""
 "Se ha producido un error en la base de datos al bloquear el usuario del "
@@ -2998,22 +2401,18 @@ msgstr ""
 
 #. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
 #. TRANS: Client error displayed trying to find a user by ID without providing an ID.
-#: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr "Sin ID."
 
 #. TRANS: Client error displayed trying to change group design settings while not logged in.
-#: actions/groupdesignsettings.php:67
 msgid "You must be logged in to edit a group."
 msgstr "Debes estar conectado para editar un grupo."
 
 #. TRANS: Title group design settings page.
-#: actions/groupdesignsettings.php:146
 msgid "Group design"
 msgstr "Diseño de grupo"
 
 #. TRANS: Instructions for group design settings page.
-#: actions/groupdesignsettings.php:157
 msgid ""
 "Customize the way your group looks with a background image and a colour "
 "palette of your choice."
@@ -3022,25 +2421,21 @@ msgstr ""
 "colores que prefieras."
 
 #. TRANS: Form validation error displayed when group design settings could not be updated because of an application issue.
-#: actions/groupdesignsettings.php:262
 #, fuzzy
 msgid "Unable to update your design settings."
 msgstr "No se pudo grabar tu configuración de diseño."
 
 #. TRANS: Form text to confirm saved group design settings.
-#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:239
 msgid "Design preferences saved."
 msgstr "Preferencias de diseño guardadas."
 
 #. TRANS: Title for group logo settings page.
 #. TRANS: Group logo form legend.
-#: actions/grouplogo.php:144 actions/grouplogo.php:199
 msgid "Group logo"
 msgstr "Logo de grupo"
 
 #. TRANS: Instructions for group logo page.
 #. TRANS: %s is the maximum file size for that site.
-#: actions/grouplogo.php:156
 #, php-format
 msgid ""
 "You can upload a logo image for your group. The maximum file size is %s."
@@ -3049,91 +2444,75 @@ msgstr ""
 "debe ser %s."
 
 #. TRANS: Submit button for uploading a group logo.
-#: actions/grouplogo.php:243
 msgid "Upload"
 msgstr "Subir"
 
 #. TRANS: Button text for cropping an uploaded group logo.
-#: actions/grouplogo.php:299
 msgid "Crop"
 msgstr "Cortar"
 
 #. TRANS: Form instructions on the group logo page.
-#: actions/grouplogo.php:376
 msgid "Pick a square area of the image to be the logo."
 msgstr "Elige un área cuadrada de la imagen para que sea tu logo."
 
 #. TRANS: Form success message after updating a group logo.
-#: actions/grouplogo.php:411
 msgid "Logo updated."
 msgstr "Logo actualizado."
 
 #. TRANS: Form failure message after failing to update a group logo.
-#: actions/grouplogo.php:414
 msgid "Failed updating logo."
 msgstr "Error al actualizar el logo."
 
 #. TRANS: Title of the page showing group members.
 #. TRANS: %s is the name of the group.
-#: actions/groupmembers.php:104
 #, php-format
 msgid "%s group members"
 msgstr "Miembros del grupo %s"
 
 #. TRANS: Title of the page showing group members.
 #. TRANS: %1$s is the name of the group, %2$d is the page number of the members list.
-#: actions/groupmembers.php:109
 #, php-format
 msgid "%1$s group members, page %2$d"
 msgstr "%1$s miembros de grupo, página %2$d"
 
 #. TRANS: Page notice for group members page.
-#: actions/groupmembers.php:125
 msgid "A list of the users in this group."
 msgstr "Lista de los usuarios en este grupo."
 
 #. TRANS: Indicator in group members list that this user is a group administrator.
-#: actions/groupmembers.php:190 lib/action.php:581
 msgid "Admin"
 msgstr "Admin"
 
 #. TRANS: Button text for the form that will block a user from a group.
-#: actions/groupmembers.php:397
 msgctxt "BUTTON"
 msgid "Block"
 msgstr "Bloquear"
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:401
 msgctxt "TOOLTIP"
 msgid "Block this user"
 msgstr ""
 
 #. TRANS: Form legend for form to make a user a group admin.
-#: actions/groupmembers.php:488
 msgid "Make user an admin of the group"
 msgstr "Convertir al usuario en administrador del grupo"
 
 #. TRANS: Button text for the form that will make a user administrator.
-#: actions/groupmembers.php:521
 msgctxt "BUTTON"
 msgid "Make Admin"
 msgstr "Convertir en administrador"
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:525
 msgctxt "TOOLTIP"
 msgid "Make this user an admin"
 msgstr "Convertir a este usuario en administrador"
 
 #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
-#: actions/grouprss.php:141
 #, php-format
 msgid "Updates from members of %1$s on %2$s!"
 msgstr "¡Actualizaciones de miembros de %1$s en %2$s!"
 
 #. TRANS: Title for first page of the groups list.
-#: actions/groups.php:62
 #, fuzzy
 msgctxt "TITLE"
 msgid "Groups"
@@ -3141,7 +2520,6 @@ msgstr "Grupos"
 
 #. TRANS: Title for all but the first page of the groups list.
 #. TRANS: %d is the page number.
-#: actions/groups.php:66
 #, fuzzy, php-format
 msgctxt "TITLE"
 msgid "Groups, page %d"
@@ -3150,7 +2528,6 @@ msgstr "Grupos, página %d"
 #. TRANS: Page notice of group list. %%%%site.name%%%% is the StatusNet site name,
 #. TRANS: %%%%action.groupsearch%%%% and %%%%action.newgroup%%%% are URLs. Do not change them.
 #. TRANS: This message contains Markdown links in the form [link text](link).
-#: actions/groups.php:95
 #, fuzzy, php-format
 msgid ""
 "%%%%site.name%%%% groups let you find and talk with people of similar "
@@ -3166,12 +2543,10 @@ msgstr ""
 "groupsearch%%%%) o [crea tú uno!](%%%%action.newgroup%%%%)"
 
 #. TRANS: Link to create a new group on the group list page.
-#: actions/groups.php:113 actions/usergroups.php:126 lib/groupeditform.php:115
 msgid "Create a new group"
 msgstr "Crear un nuevo grupo"
 
 #. TRANS: Instructions for page where groups can be searched. %%site.name%% is the name of the StatusNet site.
-#: actions/groupsearch.php:53
 #, php-format
 msgid ""
 "Search for groups on %%site.name%% by their name, location, or description. "
@@ -3181,21 +2556,17 @@ msgstr ""
 "los términos con espacios. Los términos tienen que ser de 3 o más caracteres."
 
 #. TRANS: Title for page where groups can be searched.
-#: actions/groupsearch.php:60
 msgid "Group search"
 msgstr "Búsqueda en grupos"
 
 #. TRANS: Text on page where groups can be searched if no results were found for a query.
 #. TRANS: Text for notice search results is the query had no results.
 #. TRANS: Message on the "People search" page where a query has no results.
-#: actions/groupsearch.php:82 actions/noticesearch.php:122
-#: actions/peoplesearch.php:87
 msgid "No results."
 msgstr "No se obtuvo resultados."
 
 #. TRANS: Additional text on page where groups can be searched if no results were found for a query for a logged in user.
 #. TRANS: This message contains Markdown links in the form [link text](link).
-#: actions/groupsearch.php:87
 #, fuzzy, php-format
 msgid ""
 "If you cannot find the group you're looking for, you can [create it](%%"
@@ -3206,7 +2577,6 @@ msgstr ""
 
 #. TRANS: Additional text on page where groups can be searched if no results were found for a query for a not logged in user.
 #. TRANS: This message contains Markdown links in the form [link text](link).
-#: actions/groupsearch.php:92
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and [create the group](%%"
@@ -3216,30 +2586,25 @@ msgstr ""
 "action.newgroup%%) tú mismo?"
 
 #. TRANS: Client error displayed when trying to unblock a user from a group without being an administrator for the group.
-#: actions/groupunblock.php:95
 msgid "Only an admin can unblock group members."
 msgstr "Sólo un administrador puede desbloquear miembros de grupos."
 
 #. TRANS: Client error displayed when trying to unblock a non-blocked user from a group.
-#: actions/groupunblock.php:100
 msgid "User is not blocked from group."
 msgstr "El usuario no está bloqueado del grupo."
 
 #. TRANS: Server error displayed when unblocking a user from a group fails because of an unknown error.
 #. TRANS: Server error displayed when removing a user block.
-#: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "Se ha producido un error al eliminar el bloque."
 
 #. TRANS: Title for Instant Messaging settings.
-#: actions/imsettings.php:56
 msgid "IM settings"
 msgstr "Configuración de mensajería instantánea"
 
 #. 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.
-#: actions/imsettings.php:69
 #, fuzzy, php-format
 msgid ""
 "You can send and receive notices through instant messaging [instant messages]"
@@ -3249,18 +2614,15 @@ msgstr ""
 "Jabber/GTalk. Configura tu dirección y opciones abajo."
 
 #. TRANS: Message given in the IM settings if IM is not enabled on the site.
-#: actions/imsettings.php:90
 msgid "IM is not available."
 msgstr "La mensajería instantánea no está disponible."
 
-#: actions/imsettings.php:116
 #, fuzzy, php-format
 msgid "Current confirmed %s address."
 msgstr "Actual dirección de correo electrónico confirmada"
 
 #. TRANS: Form note in IM settings form.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:128
 #, fuzzy, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your %s account for a message "
@@ -3270,89 +2632,74 @@ msgstr ""
 "Jabber/GTalk un mensaje con más instrucciones. (¿Has añadido a %s a tu lista "
 "de amigos?)"
 
-#: actions/imsettings.php:140
 msgid "IM address"
 msgstr "Dirección de mensajería instantánea"
 
-#: actions/imsettings.php:142
 #, php-format
 msgid "%s screenname."
 msgstr ""
 
 #. TRANS: Header for IM preferences form.
-#: actions/imsettings.php:163
 #, fuzzy
 msgid "IM Preferences"
 msgstr "Preferencias de mensajería instantánea"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:174
 #, fuzzy
 msgid "Send me notices"
 msgstr "Enviar un mensaje"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:176
 #, fuzzy
 msgid "Post a notice when my status changes."
 msgstr "Publicar un mensaje cuando el estado de mi Jabber/GTalk cambie."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:178
 #, fuzzy
 msgid "Send me replies from people I'm not subscribed to."
 msgstr ""
 "Enviarme respuestas por medio de Jabber/GTalk de gente a la cual no sigo."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:181
 #, fuzzy
 msgid "Publish a MicroID"
 msgstr "Publicar un MicroID para mi dirección de correo."
 
 #. TRANS: Server error thrown on database error updating IM preferences.
-#: actions/imsettings.php:291
 #, fuzzy
 msgid "Couldn't update IM preferences."
 msgstr "No se pudo actualizar el usuario."
 
 #. TRANS: Confirmation message for successful IM preferences save.
 #. TRANS: Confirmation message after saving preferences.
-#: actions/imsettings.php:298 actions/urlsettings.php:244
 msgid "Preferences saved."
 msgstr "Preferencias guardadas."
 
 #. TRANS: Message given saving IM address without having provided one.
-#: actions/imsettings.php:320
 #, fuzzy
 msgid "No screenname."
 msgstr "Ningún nombre de usuario."
 
-#: actions/imsettings.php:325
 #, fuzzy
 msgid "No transport."
 msgstr "Sin mensaje."
 
 #. TRANS: Message given saving IM address that cannot be normalised.
-#: actions/imsettings.php:333
 #, fuzzy
 msgid "Cannot normalize that screenname"
 msgstr "No se puede normalizar este Jabber ID"
 
 #. TRANS: Message given saving IM address that not valid.
-#: actions/imsettings.php:340
 #, fuzzy
 msgid "Not a valid screenname"
 msgstr "Usuario inválido"
 
 #. TRANS: Message given saving IM address that is already set for another user.
-#: actions/imsettings.php:344
 #, fuzzy
 msgid "Screenname already belongs to another user."
 msgstr "El Jabber ID ya pertenece a otro usuario."
 
 #. TRANS: Message given saving valid IM address that is to be confirmed.
-#: actions/imsettings.php:369
 #, fuzzy
 msgid "A confirmation code was sent to the IM address you added."
 msgstr ""
@@ -3361,86 +2708,72 @@ msgstr ""
 "mensajes."
 
 #. TRANS: Message given canceling IM address confirmation for the wrong IM address.
-#: actions/imsettings.php:396
 msgid "That is the wrong IM address."
 msgstr "Esa dirección de mensajería instantánea es incorrecta."
 
 #. TRANS: Server error thrown on database error canceling IM address confirmation.
-#: actions/imsettings.php:405
 #, fuzzy
 msgid "Couldn't delete confirmation."
 msgstr "No se pudo eliminar la confirmación de mensajería instantánea."
 
 #. TRANS: Message given after successfully canceling IM address confirmation.
-#: actions/imsettings.php:410
 msgid "IM confirmation cancelled."
 msgstr "Confirmación de mensajería instantánea cancelada."
 
 #. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.
-#: actions/imsettings.php:434
 #, fuzzy
 msgid "That is not your screenname."
 msgstr "Ese no es tu número telefónico"
 
 #. TRANS: Server error thrown on database error removing a registered IM address.
-#: actions/imsettings.php:443
 #, fuzzy
 msgid "Couldn't update user im prefs."
 msgstr "No se pudo actualizar información de usuario."
 
 #. TRANS: Message given after successfully removing a registered Instant Messaging address.
-#: actions/imsettings.php:451
 msgid "The IM address was removed."
 msgstr "La dirección de mensajería instantánea ha sido eliminada."
 
 #. TRANS: Title for all but the first page of the inbox page.
 #. TRANS: %1$s is the user's nickname, %2$s is the page number.
-#: actions/inbox.php:59
 #, php-format
 msgid "Inbox for %1$s - page %2$d"
 msgstr "Bandeja de entrada de %1$s - página %2$d"
 
 #. TRANS: Title for the first page of the inbox page.
 #. TRANS: %s is the user's nickname.
-#: actions/inbox.php:64
 #, php-format
 msgid "Inbox for %s"
 msgstr "Bandeja de entrada para %s"
 
 #. TRANS: Instructions for user inbox page.
-#: actions/inbox.php:106
 msgid "This is your inbox, which lists your incoming private messages."
 msgstr ""
 "Ésta es tu bandeja de entrada, incluye lista de mensajes privados entrantes."
 
 #. TRANS: Client error displayed when trying to sent invites while they have been disabled.
-#: actions/invite.php:41
 msgid "Invites have been disabled."
 msgstr "Se han inhabilitado las invitaciones."
 
 #. TRANS: Client error displayed when trying to sent invites while not logged in.
 #. TRANS: %s is the StatusNet site name.
-#: actions/invite.php:45
 #, php-format
 msgid "You must be logged in to invite other users to use %s."
 msgstr "Debes estar conectado para invitar otros usuarios a usar %s."
 
 #. TRANS: Form validation message when providing an e-mail address that does not validate.
 #. TRANS: %s is an invalid e-mail address.
-#: actions/invite.php:78
 #, fuzzy, php-format
 msgid "Invalid email address: %s."
 msgstr "Dirección de correo electrónico inválida: %s"
 
 #. TRANS: Page title when invitations have been sent.
-#: actions/invite.php:117
 #, fuzzy
 msgid "Invitations sent"
 msgstr "Invitacion(es) enviada(s)"
 
 #. TRANS: Page title when inviting potential users.
-#: actions/invite.php:120
 msgid "Invite new users"
 msgstr "Invitar nuevos usuarios:"
 
@@ -3448,7 +2781,6 @@ msgstr "Invitar nuevos usuarios:"
 #. TRANS: is already subscribed to one or more users with the given e-mail address(es).
 #. TRANS: Plural form is based on the number of reported already subscribed e-mail addresses.
 #. TRANS: Followed by a bullet list.
-#: actions/invite.php:140
 #, fuzzy
 msgid "You are already subscribed to this user:"
 msgid_plural "You are already subscribed to these users:"
@@ -3457,7 +2789,6 @@ msgstr[1] "Ya estás suscrito a estos usuarios:"
 
 #. TRANS: Used as list item for already subscribed users (%1$s is nickname, %2$s is e-mail address).
 #. TRANS: Used as list item for already registered people (%1$s is nickname, %2$s is e-mail address).
-#: actions/invite.php:146 actions/invite.php:160
 #, fuzzy, php-format
 msgctxt "INVITE"
 msgid "%1$s (%2$s)"
@@ -3466,7 +2797,6 @@ msgstr "%1$s (%2$s)"
 #. TRANS: Message displayed inviting users to use a StatusNet site while the invited user
 #. TRANS: already uses a this StatusNet site. Plural form is based on the number of
 #. TRANS: reported already present people. Followed by a bullet list.
-#: actions/invite.php:154
 #, fuzzy
 msgid "This person is already a user and you were automatically subscribed:"
 msgid_plural ""
@@ -3479,7 +2809,6 @@ msgstr[1] ""
 #. TRANS: Message displayed inviting users to use a StatusNet site. Plural form is
 #. TRANS: based on the number of invitations sent. Followed by a bullet list of
 #. TRANS: e-mail addresses to which invitations were sent.
-#: actions/invite.php:168
 #, fuzzy
 msgid "Invitation sent to the following person:"
 msgid_plural "Invitations sent to the following people:"
@@ -3488,7 +2817,6 @@ msgstr[1] "Invitacion(es) enviada(s) a las siguientes personas:"
 
 #. TRANS: Generic message displayed after sending out one or more invitations to
 #. TRANS: people to join a StatusNet site.
-#: actions/invite.php:178
 msgid ""
 "You will be notified when your invitees accept the invitation and register "
 "on the site. Thanks for growing the community!"
@@ -3497,35 +2825,30 @@ msgstr ""
 "registren en el sitio. ¡Gracias por extender la comunidad! "
 
 #. TRANS: Form instructions.
-#: actions/invite.php:191
 msgid ""
 "Use this form to invite your friends and colleagues to use this service."
 msgstr ""
 "Usa este formulario para invitar a tus amigos y colegas a usar este servicio."
 
 #. TRANS: Field label for a list of e-mail addresses.
-#: actions/invite.php:218
 msgid "Email addresses"
 msgstr "Direcciones de correo electrónico"
 
 #. TRANS: Tooltip for field label for a list of e-mail addresses.
-#: actions/invite.php:221
 #, fuzzy
 msgid "Addresses of friends to invite (one per line)."
 msgstr "Direcciones de los amigos a invitar (una por línea)"
 
 #. TRANS: Field label for a personal message to send to invitees.
-#: actions/invite.php:225
 msgid "Personal message"
 msgstr "Mensaje Personal"
 
 #. TRANS: Tooltip for field label for a personal message to send to invitees.
-#: actions/invite.php:228
 msgid "Optionally add a personal message to the invitation."
 msgstr "Opcionalmente añada un mensaje personalizado a su invitación."
 
 #. TRANS: Send button for inviting friends
-#: actions/invite.php:232
+#. TRANS: Button text for sending notice.
 msgctxt "BUTTON"
 msgid "Send"
 msgstr "Enviar"
@@ -3533,7 +2856,6 @@ msgstr "Enviar"
 #. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral
 #. TRANS: singular 3rd-person pronoun in English. %1$s is the inviting user, $2$s is
 #. TRANS: the StatusNet sitename.
-#: actions/invite.php:264
 #, php-format
 msgid "%1$s has invited you to join them on %2$s"
 msgstr "%1$s te ha invitado a que te unas con el/ellos en %2$s"
@@ -3543,7 +2865,6 @@ msgstr "%1$s te ha invitado a que te unas con el/ellos en %2$s"
 #. TRANS: StatusNet sitename, %3$s is the site URL, %4$s is the personal message from the
 #. TRANS: inviting user, %s%5 a link to the timeline for the inviting user, %s$6 is a link
 #. TRANS: to register with the StatusNet site.
-#: actions/invite.php:271
 #, php-format
 msgid ""
 "%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -3601,184 +2922,179 @@ msgstr ""
 "Saludos cordiales, %2$s\n"
 
 #. TRANS: Client error displayed when trying to join a group while not logged in.
-#: actions/joingroup.php:59
 msgid "You must be logged in to join a group."
 msgstr "Debes estar conectado para unirte a un grupo."
 
 #. TRANS: Title for join group page after joining.
-#: actions/joingroup.php:148
 #, fuzzy, php-format
 msgctxt "TITLE"
 msgid "%1$s joined group %2$s"
 msgstr "%1$s se ha unido al grupo %2$s"
 
 #. TRANS: Client error displayed when trying to leave a group while not logged in.
-#: actions/leavegroup.php:59
 msgid "You must be logged in to leave a group."
 msgstr "Debes estar conectado para dejar un grupo."
 
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
-#: actions/leavegroup.php:103 lib/command.php:398
 msgid "You are not a member of that group."
 msgstr "No eres miembro de este grupo."
 
 #. TRANS: Title for leave group page after leaving.
-#: actions/leavegroup.php:142
 #, fuzzy, php-format
 msgctxt "TITLE"
 msgid "%1$s left group %2$s"
 msgstr "%1$s ha dejado el grupo %2$s"
 
 #. TRANS: User admin panel title
-#: actions/licenseadminpanel.php:55
 msgctxt "TITLE"
 msgid "License"
 msgstr "Licencia"
 
-#: actions/licenseadminpanel.php:65
+#. TRANS: Form instructions for the site license admin panel.
 msgid "License for this StatusNet site"
 msgstr ""
 
-#: actions/licenseadminpanel.php:134
+#. TRANS: Client error displayed selecting an invalid license in the license admin panel.
 msgid "Invalid license selection."
 msgstr ""
 
-#: actions/licenseadminpanel.php:144
+#. TRANS: Client error displayed when not specifying an owner for the all rights reserved license in the license admin panel.
 msgid ""
 "You must specify the owner of the content when using the All Rights Reserved "
 "license."
 msgstr ""
 
-#: actions/licenseadminpanel.php:151
+#. TRANS: Client error displayed selecting a too long license title in the license admin panel.
 #, fuzzy
 msgid "Invalid license title. Maximum length is 255 characters."
 msgstr "Texto de bienvenida inválido. La longitud máx. es de 255 caracteres."
 
-#: actions/licenseadminpanel.php:163
+#. TRANS: Client error displayed specifying an invalid license URL in the license admin panel.
 msgid "Invalid license URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:166
+#. TRANS: Client error displayed specifying an invalid license image URL in the license admin panel.
 msgid "Invalid license image URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:174
+#. TRANS: Client error displayed specifying an invalid license URL in the license admin panel.
 msgid "License URL must be blank or a valid URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:182
+#. TRANS: Client error displayed specifying an invalid license image URL in the license admin panel.
 msgid "License image must be blank or valid URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:232
+#. TRANS: Form legend in the license admin panel.
 msgid "License selection"
 msgstr ""
 
-#: actions/licenseadminpanel.php:238
+#. TRANS: License option in the license admin panel.
 msgid "Private"
 msgstr "Privado"
 
-#: actions/licenseadminpanel.php:239
+#. TRANS: License option in the license admin panel.
 msgid "All Rights Reserved"
 msgstr ""
 
-#: actions/licenseadminpanel.php:240
+#. TRANS: License option in the license admin panel.
 msgid "Creative Commons"
 msgstr ""
 
-#: actions/licenseadminpanel.php:245
+#. TRANS: Dropdown field label in the license admin panel.
 msgid "Type"
 msgstr ""
 
-#: actions/licenseadminpanel.php:247
-msgid "Select license"
-msgstr ""
+#. TRANS: Dropdown field instructions in the license admin panel.
+#, fuzzy
+msgid "Select a license."
+msgstr "Seleccione un operador móvil"
 
-#: actions/licenseadminpanel.php:261
+#. TRANS: Form legend in the license admin panel.
 msgid "License details"
 msgstr ""
 
-#: actions/licenseadminpanel.php:267
+#. TRANS: Field label in the license admin panel.
 msgid "Owner"
 msgstr ""
 
-#: actions/licenseadminpanel.php:268
+#. TRANS: Field title in the license admin panel.
 msgid "Name of the owner of the site's content (if applicable)."
 msgstr ""
 
-#: actions/licenseadminpanel.php:276
+#. TRANS: Field label in the license admin panel.
 msgid "License Title"
 msgstr ""
 
-#: actions/licenseadminpanel.php:277
+#. TRANS: Field title in the license admin panel.
 msgid "The title of the license."
 msgstr ""
 
-#: actions/licenseadminpanel.php:285
+#. TRANS: Field label in the license admin panel.
 msgid "License URL"
 msgstr ""
 
-#: actions/licenseadminpanel.php:286
+#. TRANS: Field title in the license admin panel.
 msgid "URL for more information about the license."
 msgstr ""
 
-#: actions/licenseadminpanel.php:293
+#. TRANS: Field label in the license admin panel.
 msgid "License Image URL"
 msgstr ""
 
-#: actions/licenseadminpanel.php:294
+#. TRANS: Field title in the license admin panel.
 msgid "URL for an image to display with the license."
 msgstr ""
 
-#. TRANS: Submit button title.
-#: actions/licenseadminpanel.php:311 actions/sessionsadminpanel.php:199
-#: actions/siteadminpanel.php:292 actions/snapshotadminpanel.php:245
-#: actions/tagother.php:133 lib/applicationeditform.php:357
-msgid "Save"
-msgstr "Guardar"
-
-#: actions/licenseadminpanel.php:311
-msgid "Save license settings"
-msgstr ""
+#. TRANS: Button title in the license admin panel.
+#, fuzzy
+msgid "Save license settings."
+msgstr "Guardar la configuración del sitio"
 
+#. TRANS: Client error displayed when trying to log in while already logged in.
 #. TRANS: Client error displayed trying to use "one time password login" when already logged in.
-#: actions/login.php:97 actions/otp.php:62 actions/register.php:130
 msgid "Already logged in."
 msgstr "Ya estás conectado."
 
-#: actions/login.php:125
+#. TRANS: Form validation error displayed when trying to log in with incorrect credentials.
 msgid "Incorrect username or password."
 msgstr "Nombre de usuario o contraseña incorrectos."
 
+#. TRANS: Server error displayed when during login a server error occurs.
 #. TRANS: Server error displayed when a user object could not be created trying to login using "one time password login".
-#: actions/login.php:131 actions/otp.php:127
 msgid "Error setting user. You are probably not authorized."
 msgstr "Error al configurar el usuario. Posiblemente no tengas autorización."
 
-#: actions/login.php:185 actions/login.php:236 lib/action.php:598
+#. TRANS: Page title for login page.
 msgid "Login"
 msgstr "Inicio de sesión"
 
-#: actions/login.php:222
+#. TRANS: Form legend on login page.
 msgid "Login to site"
 msgstr "Ingresar a sitio"
 
-#: actions/login.php:231 actions/register.php:469
+#. TRANS: Checkbox label label on login page.
 msgid "Remember me"
 msgstr "Recordarme"
 
-#: actions/login.php:232 actions/register.php:471
+#. TRANS: Checkbox title on login page.
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 "Iniciar sesión automáticamente en el futuro. ¡No usar en ordenadores "
 "compartidos! "
 
-#: actions/login.php:241
+#. TRANS: Button text for log in on login page.
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Login"
+msgstr "Inicio de sesión"
+
+#. TRANS: Link text for link to "reset password" on login page.
 msgid "Lost or forgotten password?"
 msgstr "¿Contraseña olvidada o perdida?"
 
-#: actions/login.php:259
+#. TRANS: Form instructions on login page before being able to change user settings.
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -3786,11 +3102,12 @@ msgstr ""
 "Por razones de seguridad, por favor vuelve a escribir tu nombre de usuario y "
 "contraseña antes de cambiar tu configuración."
 
-#: actions/login.php:263
+#. TRANS: Form instructions on login page.
 msgid "Login with your username and password."
 msgstr "Ingresar con tu nombre de usuario y contraseña."
 
-#: actions/login.php:266
+#. TRANS: Form instructions on login page. This message contains Markdown links in the form [Link text](Link).
+#. TRANS: %%action.register%% is a link to the registration page.
 #, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -3798,130 +3115,124 @@ msgstr ""
 "Aún no tienes nombre de usuario? [Registrar](%%action.register%%) una nueva "
 "cuenta."
 
-#: actions/makeadmin.php:92
+#. TRANS: Client error displayed when trying to make another user admin on the Make Admin page while not an admin.
 msgid "Only an admin can make another user an admin."
 msgstr ""
 "Sólo los administradores pueden convertir a un usuario en administrador."
 
-#: actions/makeadmin.php:96
+#. TRANS: Client error displayed when trying to make another user admin on the Make Admin page who already is admin.
+#. TRANS: %1$s is the user that is already admin, %2$s is the group user is already admin for.
 #, php-format
 msgid "%1$s is already an admin for group \"%2$s\"."
 msgstr "%1$s ya es un administrador del grupo \"%2$s\"."
 
-#: actions/makeadmin.php:133
+#. TRANS: Server error displayed when trying to make another user admin on the Make Admin page fails
+#. TRANS: because the group membership record could not be gotten.
+#. TRANS: %1$s is the to be admin user, %2$s is the group user should be admin for.
 #, php-format
 msgid "Can't get membership record for %1$s in group %2$s."
 msgstr "No se puede obtener el registro de membresía de %1$s en el grupo %2$s."
 
-#: actions/makeadmin.php:146
+#. TRANS: Server error displayed when trying to make another user admin on the Make Admin page fails
+#. TRANS: because the group adminship record coud not be saved properly.
+#. TRANS: %1$s is the to be admin user, %2$s is the group user is already admin for.
 #, php-format
 msgid "Can't make %1$s an admin for group %2$s."
 msgstr "No es posible convertir a %1$s en administrador del grupo %2$s."
 
-#: actions/microsummary.php:69
+#. TRANS: Client error displayed trying to make a micro summary without providing a status.
 msgid "No current status."
 msgstr "No existe estado actual."
 
 #. TRANS: This is the title of the form for adding a new application.
-#: actions/newapplication.php:52
 #, fuzzy
 msgid "New application"
 msgstr "Nueva aplicación"
 
 #. TRANS: Client error displayed trying to add a new application while not logged in.
-#: actions/newapplication.php:64
 msgid "You must be logged in to register an application."
 msgstr "Debes conectarte para registrar una aplicación."
 
 #. TRANS: Form instructions for registering a new application.
-#: actions/newapplication.php:147
 msgid "Use this form to register a new application."
 msgstr "Utiliza este formulario para registrar una nueva aplicación."
 
 #. TRANS: Validation error shown when not providing a source URL in the "New application" form.
-#: actions/newapplication.php:189
 msgid "Source URL is required."
 msgstr "Se requiere el URL fuente."
 
 #. TRANS: Server error displayed when an application could not be registered in the database through the "New application" form.
-#: actions/newapplication.php:279 actions/newapplication.php:289
 msgid "Could not create application."
 msgstr "No se pudo crear la aplicación."
 
 #. TRANS: Title for form to create a group.
-#: actions/newgroup.php:53
 msgid "New group"
 msgstr "Grupo nuevo "
 
 #. TRANS: Client exception thrown when a user tries to create a group while banned.
-#: actions/newgroup.php:73 classes/User_group.php:485
 #, fuzzy
 msgid "You are not allowed to create groups on this site."
 msgstr "No eres miembro de este grupo."
 
 #. TRANS: Form instructions for group create form.
-#: actions/newgroup.php:117
 msgid "Use this form to create a new group."
 msgstr "Usa este formulario para crear un grupo nuevo."
 
-#. TRANS: Group create form validation error.
-#: actions/newgroup.php:200
-#, fuzzy
-msgid "Alias cannot be the same as nickname."
-msgstr "El alias no puede ser el mismo que el usuario."
-
-#: actions/newmessage.php:71 actions/newmessage.php:234
+#. TRANS: Page title for new direct message page.
+#. TRANS: Page title on page for sending a direct message.
 msgid "New message"
 msgstr "Nuevo Mensaje "
 
-#. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
-#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:513
-msgid "You can't send a message to this user."
+#. TRANS: Client error displayed trying to send a direct message to a user while sender and
+#. TRANS: receiver are not subscribed to each other.
+#, fuzzy
+msgid "You cannot send a message to this user."
 msgstr "No puedes enviar mensaje a este usuario."
 
+#. TRANS: Form validator error displayed trying to send a direct message without content.
+#. TRANS: Client error displayed trying to send a notice without content.
 #. TRANS: Command exception text shown when trying to send a direct message to another user without content.
 #. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
-#: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:490
-#: lib/command.php:593
 msgid "No content!"
 msgstr "¡Ningún contenido!"
 
-#: actions/newmessage.php:161
+#. TRANS: Form validation error displayed trying to send a direct message without specifying a recipient.
 msgid "No recipient specified."
 msgstr "No se especificó receptor."
 
+#. TRANS: Client error displayed trying to send a direct message to self.
 #. TRANS: Error text shown when trying to send a direct message to self.
-#: actions/newmessage.php:167 lib/command.php:517
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr "No te auto envíes un mensaje; dícetelo a ti mismo."
 
-#: actions/newmessage.php:184
+#. TRANS: Page title after sending a direct message.
 msgid "Message sent"
 msgstr "Mensaje enviado"
 
+#. TRANS: Confirmation text after sending a direct message.
+#. TRANS: %s is the direct message recipient.
 #. TRANS: Message given have sent a direct message to another user.
 #. TRANS: %s is the name of the other user.
-#: actions/newmessage.php:188 lib/command.php:525
 #, php-format
 msgid "Direct message to %s sent."
 msgstr "Se ha enviado un mensaje directo a %s."
 
-#: actions/newmessage.php:213 actions/newnotice.php:264
+#. TRANS: Page title after an AJAX error occurred on the "send direct message" page.
+#. TRANS: Page title after an AJAX error occurs on the send notice page.
 msgid "Ajax Error"
 msgstr "Error de Ajax"
 
-#: actions/newnotice.php:69
+#. TRANS: Page title for sending a new notice.
 msgid "New notice"
 msgstr "Nuevo mensaje"
 
-#: actions/newnotice.php:230
+#. TRANS: Page title after sending a notice.
 msgid "Notice posted"
 msgstr "Mensaje publicado"
 
 #. TRANS: Instructions for Notice search page.
 #. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/noticesearch.php:69
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -3931,20 +3242,17 @@ msgstr ""
 "búsqueda con espacios; deben tener una longitud mínima de 3 caracteres."
 
 #. TRANS: Title of the page where users can search for notices.
-#: actions/noticesearch.php:80
 msgid "Text search"
 msgstr "Búsqueda de texto"
 
 #. TRANS: Test in RSS notice search.
 #. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearch.php:95
 #, php-format
 msgid "Search results for \"%1$s\" on %2$s"
 msgstr "Resultados de la búsqueda de \"%1$s\" en %2$s"
 
 #. TRANS: Text for logged in users making a query for notices without results.
 #. TRANS: This message contains a Markdown link.
-#: actions/noticesearch.php:128
 #, php-format
 msgid ""
 "Be the first to [post on this topic](%%%%action.newnotice%%%%?"
@@ -3955,7 +3263,6 @@ msgstr ""
 
 #. TRANS: Text for not logged in users making a query for notices without results.
 #. TRANS: This message contains Markdown links.
-#: actions/noticesearch.php:133
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and be the first to "
@@ -3966,20 +3273,18 @@ msgstr ""
 "%?status_textarea=%s)?"
 
 #. TRANS: RSS notice search feed title. %s is the query.
-#: actions/noticesearchrss.php:95
 #, php-format
 msgid "Updates with \"%s\""
 msgstr "Actualizaciones con \"%s\""
 
 #. TRANS: RSS notice search feed description.
 #. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearchrss.php:99
 #, fuzzy, php-format
 msgid "Updates matching search term \"%1$s\" on %2$s."
 msgstr ""
 "¡Actualizaciones que contienen el término de búsqueda \"%1$s\" en %2$s!"
 
-#: actions/nudge.php:85
+#. TRANS: Client error displayed trying to nudge a user that cannot be nudged.
 #, fuzzy
 msgid ""
 "This user doesn't allow nudges or hasn't confirmed or set their email "
@@ -3988,60 +3293,51 @@ msgstr ""
 "Este usuario no permite que le den toques o todavía no ha confirmado o "
 "configurado su correo electrónico."
 
-#: actions/nudge.php:94
+#. TRANS: Page title after sending a nudge.
 msgid "Nudge sent"
 msgstr "Toque enviado"
 
-#: actions/nudge.php:97
+#. TRANS: Confirmation text after sending a nudge.
 msgid "Nudge sent!"
 msgstr "¡Toque enviado!"
 
 #. TRANS: Message displayed to an anonymous user trying to view OAuth application list.
-#: actions/oauthappssettings.php:57
 msgid "You must be logged in to list your applications."
 msgstr "Debes estar conectado para listar tus aplicaciones."
 
 #. TRANS: Page title for OAuth applications
-#: actions/oauthappssettings.php:73
 msgid "OAuth applications"
 msgstr "Aplicaciones OAuth"
 
 #. TRANS: Page instructions for OAuth applications
-#: actions/oauthappssettings.php:85
 msgid "Applications you have registered"
 msgstr "Aplicaciones que has registrado"
 
 #. TRANS: Empty list message on page with OAuth applications.
-#: actions/oauthappssettings.php:138
 #, php-format
 msgid "You have not registered any applications yet."
 msgstr "Aún no has registrado aplicación alguna."
 
 #. TRANS: Title for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:69
 msgid "Connected applications"
 msgstr "Aplicaciones conectadas"
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:80
 msgid "The following connections exist for your account."
 msgstr ""
 
 #. TRANS: Client error when trying to revoke access for an application while not being a user of it.
-#: actions/oauthconnectionssettings.php:165
 msgid "You are not a user of that application."
 msgstr "No eres un usuario de esa aplicación."
 
 #. TRANS: Client error when revoking access has failed for some reason.
 #. TRANS: %s is the application ID revoking access failed for.
-#: actions/oauthconnectionssettings.php:180
 #, fuzzy, php-format
 msgid "Unable to revoke access for application: %s."
 msgstr "No se puede revocar el acceso para la aplicación: %s."
 
 #. TRANS: Success message after revoking access for an application.
 #. TRANS: %1$s is the application name, %2$s is the first part of the user token.
-#: actions/oauthconnectionssettings.php:199
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -4049,474 +3345,391 @@ msgid ""
 msgstr ""
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:210
 msgid "You have not authorized any applications to use your account."
 msgstr "No has autorizado a ninguna aplicación utilizar tu cuenta."
 
 #. TRANS: Note for developers in the OAuth connection settings form.
 #. TRANS: This message contains a Markdown link. Do not separate "](".
 #. TRANS: %s is the URL to the OAuth settings.
-#: actions/oauthconnectionssettings.php:230
 #, php-format
 msgid ""
 "Are you a developer? [Register an OAuth client application](%s) to use with "
 "this instance of StatusNet."
 msgstr ""
 
-#: actions/oembed.php:64
+#. TRANS: Server error displayed in oEmbed action when path not found.
+#. TRANS: %s is a path.
 #, fuzzy, php-format
 msgid "\"%s\" not found."
 msgstr "Método de API no encontrado."
 
-#: actions/oembed.php:76
+#. TRANS: Server error displayed in oEmbed action when notice not found.
+#. TRANS: %s is a notice.
 #, fuzzy, php-format
 msgid "Notice %s not found."
 msgstr "Método de API no encontrado."
 
-#: actions/oembed.php:80 actions/shownotice.php:100
+#. TRANS: Server error displayed in oEmbed action when notice has not profile.
 msgid "Notice has no profile."
 msgstr "Mensaje sin perfil."
 
-#: actions/oembed.php:83 actions/shownotice.php:172
+#. TRANS: oEmbed title. %1$s is the author name, %2$s is the creation date.
 #, php-format
 msgid "%1$s's status on %2$s"
 msgstr "estado de %1$s en %2$s"
 
-#: actions/oembed.php:95
+#. TRANS: Server error displayed in oEmbed action when attachment not found.
+#. TRANS: %d is an attachment ID.
 #, fuzzy, php-format
 msgid "Attachment %s not found."
 msgstr "No se encuentra usuario receptor."
 
-#: actions/oembed.php:136
+#. TRANS: Server error displayed in oEmbed request when a path is not supported.
+#. TRANS: %s is a path.
 #, php-format
 msgid "\"%s\" not supported for oembed requests."
 msgstr ""
 
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
-#: actions/oembed.php:168
 #, php-format
 msgid "Content type %s not supported."
 msgstr "Tipo de contenido %s no compatible."
 
 #. TRANS: Error message displaying attachments. %s is the site's base URL.
-#: actions/oembed.php:172
 #, php-format
 msgid "Only %s URLs over plain HTTP please."
 msgstr "Solamente %s URL sobre HTTP simples, por favor."
 
+#. TRANS: Server error displayed in oEmbed action when request specifies an unsupported data format.
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1207
-#: lib/apiaction.php:1234 lib/apiaction.php:1369
 msgid "Not a supported data format."
 msgstr "No es un formato de datos compatible."
 
 #. TRANS: ShortName in the OpenSearch interface when trying to find users.
-#: actions/opensearch.php:64
 msgid "People Search"
 msgstr "Búsqueda de gente"
 
-#: actions/opensearch.php:68
+#. TRANS: ShortName in the OpenSearch interface when trying to find notices.
 msgid "Notice Search"
 msgstr "Búsqueda de mensajes"
 
 #. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
-#: actions/otp.php:70
 msgid "No user ID specified."
 msgstr "No se ha especificado ID de usuario."
 
 #. TRANS: Client error displayed trying to use "one time password login" without specifying a login token.
-#: actions/otp.php:86
 msgid "No login token specified."
 msgstr "No se ha especificado un token de acceso."
 
 #. TRANS: Client error displayed trying to use "one time password login" without requesting a login token.
-#: actions/otp.php:94
 msgid "No login token requested."
 msgstr "Token de acceso solicitado."
 
 #. TRANS: Client error displayed trying to use "one time password login" while specifying an invalid login token.
-#: actions/otp.php:100
 msgid "Invalid login token specified."
 msgstr "Token de acceso inválido especificado."
 
 #. TRANS: Client error displayed trying to use "one time password login" while specifying an expired login token.
-#: actions/otp.php:110
 msgid "Login token expired."
 msgstr "Token de acceso caducado."
 
 #. TRANS: Title for outbox for any but the fist page.
 #. TRANS: %1$s is the user nickname, %2$d is the page number.
-#: actions/outbox.php:57
 #, php-format
 msgid "Outbox for %1$s - page %2$d"
 msgstr "Bandeja de salida de %1$s - página %2$d"
 
 #. TRANS: Title for first page of outbox.
-#: actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
 msgstr "Bandeja de salida para %s"
 
 #. TRANS: Instructions for outbox.
-#: actions/outbox.php:103
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr ""
 "Ésta es tu bandeja de salida, incluye la lista de mensajes privados enviados."
 
-#: actions/passwordsettings.php:58
 msgid "Change password"
 msgstr "Cambiar contraseña"
 
-#: actions/passwordsettings.php:69
 msgid "Change your password."
 msgstr "Cambia tu contraseña"
 
 #. TRANS: Fieldset legend for password reset form.
-#: actions/passwordsettings.php:96 actions/recoverpassword.php:251
 msgid "Password change"
 msgstr "Cambio de contraseña"
 
-#: actions/passwordsettings.php:104
 msgid "Old password"
 msgstr "Antigua contraseña"
 
 #. TRANS: Field label for password reset form.
-#: actions/passwordsettings.php:108 actions/recoverpassword.php:256
 msgid "New password"
 msgstr "Nueva contraseña"
 
-#: actions/passwordsettings.php:109 actions/register.php:416
 #, fuzzy
 msgid "6 or more characters."
 msgstr "6 o más caracteres"
 
 #. TRANS: Ttile for field label for password reset form where the password has to be typed again.
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:264
-#: actions/register.php:420
 #, fuzzy
 msgid "Same as password above."
 msgstr "Igual a la contraseña de arriba"
 
-#: actions/passwordsettings.php:117
 msgid "Change"
 msgstr "Cambiar"
 
-#: actions/passwordsettings.php:153 actions/register.php:223
 msgid "Password must be 6 or more characters."
 msgstr "La contraseña debe tener 6 o más caracteres."
 
-#: actions/passwordsettings.php:156 actions/register.php:226
 msgid "Passwords don't match."
 msgstr "Las contraseñas no coinciden"
 
-#: actions/passwordsettings.php:164
 msgid "Incorrect old password"
 msgstr "Contraseña antigua incorrecta."
 
-#: actions/passwordsettings.php:180
 msgid "Error saving user; invalid."
 msgstr "Error al guardar el usuario; inválido."
 
 #. TRANS: Reset password form validation error message.
-#: actions/passwordsettings.php:185 actions/recoverpassword.php:418
 #, fuzzy
 msgid "Cannot save new password."
 msgstr "No se puede guardar la nueva contraseña."
 
-#: actions/passwordsettings.php:191
 msgid "Password saved."
 msgstr "Se guardó la contraseña."
 
 #. TRANS: Title for Paths admin panel.
 #. TRANS: Menu item for site administration
-#: actions/pathsadminpanel.php:58 lib/adminpanelaction.php:371
 msgid "Paths"
 msgstr "Rutas"
 
 #. TRANS: Form instructions for Path admin panel.
-#: actions/pathsadminpanel.php:69
 msgid "Path and server settings for this StatusNet site"
 msgstr ""
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the directory that could not be read from.
-#: actions/pathsadminpanel.php:155
 #, php-format
 msgid "Theme directory not readable: %s."
 msgstr "Directorio de temas ilegible: %s."
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the avatar directory that could not be written to.
-#: actions/pathsadminpanel.php:163
 #, php-format
 msgid "Avatar directory not writable: %s."
 msgstr "Directorio de avatares no escribible: %s."
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the background directory that could not be written to.
-#: actions/pathsadminpanel.php:171
 #, php-format
 msgid "Background directory not writable: %s."
 msgstr "Directorio de fondo no escribible: %s."
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the locales directory that could not be read from.
-#: actions/pathsadminpanel.php:181
 #, php-format
 msgid "Locales directory not readable: %s."
 msgstr "Directorio de configuración regional ilegible: %s."
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the SSL server URL that is too long.
-#: actions/pathsadminpanel.php:189
 msgid "Invalid SSL server. The maximum length is 255 characters."
 msgstr "Servidor SSL no válido. La longitud máxima es de 255 caracteres."
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:235 actions/siteadminpanel.php:58
 msgid "Site"
 msgstr "Sitio"
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:241 actions/pathsadminpanel.php:279
-#: actions/pathsadminpanel.php:370 actions/pathsadminpanel.php:425
 msgid "Server"
 msgstr "Servidor"
 
-#: actions/pathsadminpanel.php:242
 msgid "Site's server hostname."
 msgstr "Nombre del host del servidor del sitio."
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:248 actions/pathsadminpanel.php:288
-#: actions/pathsadminpanel.php:379 actions/pathsadminpanel.php:434
 msgid "Path"
 msgstr "Ruta"
 
-#: actions/pathsadminpanel.php:249
 #, fuzzy
 msgid "Site path."
 msgstr "Ruta del sitio"
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:255
 #, fuzzy
 msgid "Locale directory"
 msgstr "Directorio de temas"
 
-#: actions/pathsadminpanel.php:256
 #, fuzzy
 msgid "Directory path to locales."
 msgstr "Ruta del directorio de las configuraciones locales"
 
 #. TRANS: Checkbox label in Paths admin panel.
-#: actions/pathsadminpanel.php:263
 msgid "Fancy URLs"
 msgstr "URL agradables"
 
-#: actions/pathsadminpanel.php:265
 msgid "Use fancy (more readable and memorable) URLs?"
 msgstr "¿Usar URL amigables (más legibles y memorizables)?"
 
-#: actions/pathsadminpanel.php:272
 msgid "Theme"
 msgstr "Tema"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:281
 #, fuzzy
 msgid "Server for themes."
 msgstr "Tema para el sitio."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:290
 msgid "Web path to themes."
 msgstr ""
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:297 actions/pathsadminpanel.php:388
-#: actions/pathsadminpanel.php:443 actions/pathsadminpanel.php:495
 msgid "SSL server"
 msgstr "Servidor SSL"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:299
 msgid "SSL server for themes (default: SSL server)."
 msgstr ""
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:306 actions/pathsadminpanel.php:397
-#: actions/pathsadminpanel.php:452
 #, fuzzy
 msgid "SSL path"
 msgstr "Ruta del sitio"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:308
 msgid "SSL path to themes (default: /theme/)."
 msgstr ""
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:315 actions/pathsadminpanel.php:406
-#: actions/pathsadminpanel.php:461
 #, fuzzy
 msgid "Directory"
 msgstr "Directorio de temas"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:317
 #, fuzzy
 msgid "Directory where themes are located."
 msgstr "Ruta del directorio de las configuraciones locales"
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:326
 msgid "Avatars"
 msgstr "Imágenes"
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:333
 msgid "Avatar server"
 msgstr "Servidor de la imagen"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:335
 #, fuzzy
 msgid "Server for avatars."
 msgstr "Tema para el sitio."
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:342
 msgid "Avatar path"
 msgstr "Ruta de la imagen"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:344
 #, fuzzy
 msgid "Web path to avatars."
 msgstr "Error al actualizar la imagen."
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:351
 msgid "Avatar directory"
 msgstr "Directorio de la imagen"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:353
 #, fuzzy
 msgid "Directory where avatars are located."
 msgstr "Ruta del directorio de las configuraciones locales"
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:364
 msgid "Backgrounds"
 msgstr "Fondos"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:372
 #, fuzzy
 msgid "Server for backgrounds."
 msgstr "Tema para el sitio."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:381
 msgid "Web path to backgrounds."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:390
 msgid "Server for backgrounds on SSL pages."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:399
 msgid "Web path to backgrounds on SSL pages."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:408
 #, fuzzy
 msgid "Directory where backgrounds are located."
 msgstr "Ruta del directorio de las configuraciones locales"
 
 #. TRANS: Fieldset legens in Paths admin panel.
-#: actions/pathsadminpanel.php:419
 msgid "Attachments"
 msgstr "Adjuntos"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:427
 #, fuzzy
 msgid "Server for attachments."
 msgstr "Tema para el sitio."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:436
 #, fuzzy
 msgid "Web path to attachments."
 msgstr "Sin archivo adjunto"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:445
 #, fuzzy
 msgid "Server for attachments on SSL pages."
 msgstr "Tema para el sitio."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:454
 msgid "Web path to attachments on SSL pages."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:463
 #, fuzzy
 msgid "Directory where attachments are located."
 msgstr "Ruta del directorio de las configuraciones locales"
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:472
 msgid "SSL"
 msgstr "SSL"
 
 #. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
-#: actions/pathsadminpanel.php:477 actions/snapshotadminpanel.php:202
 msgid "Never"
 msgstr "Nunca"
 
 #. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
-#: actions/pathsadminpanel.php:479
 msgid "Sometimes"
 msgstr "A veces"
 
 #. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
-#: actions/pathsadminpanel.php:481
 msgid "Always"
 msgstr "Siempre"
 
-#: actions/pathsadminpanel.php:485
 msgid "Use SSL"
 msgstr "Usar SSL"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:487
 #, fuzzy
 msgid "When to use SSL."
 msgstr "Cuándo utilizar SSL"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:497
 #, fuzzy
 msgid "Server to direct SSL requests to."
 msgstr "Servidor hacia el cual dirigir las solicitudes SSL"
 
 #. TRANS: Button title text to store form data in the Paths admin panel.
-#: actions/pathsadminpanel.php:514
 msgid "Save paths"
 msgstr "Guardar rutas"
 
 #. TRANS: Instructions for the "People search" page.
 #. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/peoplesearch.php:54
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
@@ -4526,57 +3739,46 @@ msgstr ""
 "los términos con espacios; deben tener una longitud mínima de 3 caracteres."
 
 #. TRANS: Title of a page where users can search for other users.
-#: actions/peoplesearch.php:61
 msgid "People search"
 msgstr "Buscador de gente"
 
-#: actions/peopletag.php:68
 #, php-format
 msgid "Not a valid people tag: %s."
 msgstr "No es una etiqueta válida para personas: %s."
 
-#: actions/peopletag.php:142
 #, php-format
 msgid "Users self-tagged with %1$s - page %2$d"
 msgstr "Usuarios auto etiquetados con %1$s - página %2$d"
 
 #. TRANS: Page title for AJAX form return when a disabling a plugin.
-#: actions/plugindisable.php:69
 msgctxt "plugin"
 msgid "Disabled"
 msgstr ""
 
 #. TRANS: Client error displayed trying to perform any request method other than POST.
 #. TRANS: Do not translate POST.
-#: actions/pluginenable.php:78 actions/subscribe.php:77
 msgid "This action only accepts POST requests."
 msgstr "Esta acción sólo acepta solicitudes POST."
 
-#: actions/pluginenable.php:102
 #, fuzzy
 msgid "You cannot administer plugins."
 msgstr "No puedes borrar usuarios."
 
-#: actions/pluginenable.php:109
 #, fuzzy
 msgid "No such plugin."
 msgstr "No existe tal página."
 
 #. TRANS: Page title for AJAX form return when enabling a plugin.
-#: actions/pluginenable.php:159
 msgctxt "plugin"
 msgid "Enabled"
 msgstr ""
 
 #. TRANS: Tab and title for plugins admin panel.
 #. TRANS: Menu item for site administration
-#: actions/pluginsadminpanel.php:56 actions/version.php:191
-#: lib/adminpanelaction.php:411
 msgid "Plugins"
 msgstr "Complementos"
 
 #. TRANS: Instructions at top of plugin admin page.
-#: actions/pluginsadminpanel.php:68
 msgid ""
 "Additional plugins can be enabled and configured manually. See the <a href="
 "\"http://status.net/wiki/Plugins\">online plugin documentation</a> for more "
@@ -4584,21 +3786,17 @@ msgid ""
 msgstr ""
 
 #. TRANS: Admin form section header
-#: actions/pluginsadminpanel.php:84
 #, fuzzy
 msgid "Default plugins"
 msgstr "!Idioma predeterminado"
 
-#: actions/pluginsadminpanel.php:106
 msgid ""
 "All default plugins have been disabled from the site's configuration file."
 msgstr ""
 
-#: actions/postnotice.php:95
 msgid "Invalid notice content."
 msgstr "Contenido de mensaje inválido."
 
-#: actions/postnotice.php:101
 #, php-format
 msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’."
 msgstr ""
@@ -4606,12 +3804,10 @@ msgstr ""
 "$s’."
 
 #. TRANS: Page title for profile settings.
-#: actions/profilesettings.php:60
 msgid "Profile settings"
 msgstr "Configuración del perfil"
 
 #. TRANS: Usage instructions for profile settings.
-#: actions/profilesettings.php:71
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
@@ -4619,32 +3815,25 @@ msgstr ""
 "sepa más sobre ti."
 
 #. TRANS: Profile settings form legend.
-#: actions/profilesettings.php:99
 msgid "Profile information"
 msgstr "Información del perfil"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:110 actions/register.php:412
 #, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr ""
 "1-64 letras en minúscula o números, sin signos de puntuación o espacios"
 
 #. TRANS: Field label in form for profile settings.
-#: actions/profilesettings.php:114 actions/register.php:434
-#: lib/groupeditform.php:150
 msgid "Full name"
 msgstr "Nombre completo"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:119 actions/register.php:439
-#: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "Página de inicio"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:122 actions/register.php:441
 #, fuzzy
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr "El URL de tu página de inicio, blog o perfil en otro sitio"
@@ -4652,7 +3841,6 @@ msgstr "El URL de tu página de inicio, blog o perfil en otro sitio"
 #. TRANS: Tooltip for field label in form for profile settings. Plural
 #. TRANS: is decided by the number of characters available for the
 #. TRANS: biography (%d).
-#: actions/profilesettings.php:130 actions/register.php:450
 #, fuzzy, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4660,41 +3848,31 @@ msgstr[0] "Descríbete y cuéntanos tus intereses en %d caracteres"
 msgstr[1] "Descríbete y cuéntanos tus intereses en %d caracteres"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:136 actions/register.php:455
 msgid "Describe yourself and your interests"
 msgstr "Descríbete y cuéntanos acerca de tus intereses"
 
 #. TRANS: Text area label in form for profile settings where users can provide.
 #. TRANS: their biography.
-#: actions/profilesettings.php:140 actions/register.php:457
 msgid "Bio"
 msgstr "Biografía"
 
 #. TRANS: Field label in form for profile settings.
-#: actions/profilesettings.php:146 actions/register.php:462
-#: lib/groupeditform.php:173
 msgid "Location"
 msgstr "Ubicación"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:149
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Dónde estás, por ejemplo \"Ciudad, Estado (o Región), País\""
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:154
 msgid "Share my current location when posting notices"
 msgstr "Compartir mi ubicación actual al publicar los mensajes"
 
 #. TRANS: Field label in form for profile settings.
-#: actions/profilesettings.php:162 actions/tagother.php:128
-#: actions/tagother.php:188 lib/subscriptionlist.php:104
-#: lib/subscriptionlist.php:106
 msgid "Tags"
 msgstr "Etiquetas"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:165
 #, fuzzy
 msgid ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- "
@@ -4704,28 +3882,23 @@ msgstr ""
 "espacios"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:170
 msgid "Language"
 msgstr "Idioma"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:172
 #, fuzzy
 msgid "Preferred language."
 msgstr "Lenguaje de preferencia"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:182
 msgid "Timezone"
 msgstr "Zona horaria"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:184
 msgid "What timezone are you normally in?"
 msgstr "En que zona horaria se encuentra normalmente?"
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:190
 #, fuzzy
 msgid ""
 "Automatically subscribe to whoever subscribes to me (best for non-humans)."
@@ -4736,7 +3909,6 @@ msgstr ""
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Plural form is used based on the maximum number of allowed
 #. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:259 actions/register.php:214
 #, fuzzy, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4744,85 +3916,69 @@ msgstr[0] "La biografía es muy larga (máx. %d caracteres)."
 msgstr[1] "La biografía es muy larga (máx. %d caracteres)."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:270 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr "Zona horaria no seleccionada"
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:278
 #, fuzzy
 msgid "Language is too long (maximum 50 characters)."
 msgstr "Idioma es muy largo ( max 50 car.)"
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:292
 #, fuzzy, php-format
 msgid "Invalid tag: \"%s\"."
 msgstr "Etiqueta inválida: \"% s\""
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:348
 #, fuzzy
 msgid "Could not update user for autosubscribe."
 msgstr "No se pudo actualizar el usuario para autosuscribirse."
 
 #. TRANS: Server error thrown when user profile location preference settings could not be updated.
-#: actions/profilesettings.php:406
 #, fuzzy
 msgid "Could not save location prefs."
 msgstr "No se han podido guardar las preferencias de ubicación."
 
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:428 actions/tagother.php:179
 msgid "Could not save tags."
 msgstr "No se han podido guardar las etiquetas."
 
 #. TRANS: Confirmation shown when user profile settings are saved.
 #. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:437 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "Se guardó configuración."
 
 #. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
 #. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:484 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "Crear una cuenta"
 
-#: actions/public.php:83
 #, php-format
 msgid "Beyond the page limit (%s)."
 msgstr "Más allá del límite de páginas (%s)."
 
-#: actions/public.php:92
 msgid "Could not retrieve public stream."
 msgstr "No se pudo acceder a corriente pública."
 
-#: actions/public.php:130
 #, php-format
 msgid "Public timeline, page %d"
 msgstr "Línea temporal pública, página %d"
 
-#: actions/public.php:132 lib/publicgroupnav.php:79
 msgid "Public timeline"
 msgstr "Línea temporal pública"
 
-#: actions/public.php:160
 msgid "Public Stream Feed (RSS 1.0)"
 msgstr "Canal público (RSS 1.0)"
 
-#: actions/public.php:164
 msgid "Public Stream Feed (RSS 2.0)"
 msgstr "Canal público (RSS 2.0)"
 
-#: actions/public.php:168
 msgid "Public Stream Feed (Atom)"
 msgstr "Canal público (Atom)"
 
-#: actions/public.php:188
 #, php-format
 msgid ""
 "This is the public timeline for %%site.name%% but no one has posted anything "
@@ -4831,11 +3987,9 @@ msgstr ""
 "Esta es la línea temporal pública de %%site.name%%, pero aún no se ha "
 "publicado nada."
 
-#: actions/public.php:191
 msgid "Be the first to post!"
 msgstr "¡Sé la primera persona en publicar algo!"
 
-#: actions/public.php:195
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post!"
@@ -4843,7 +3997,6 @@ msgstr ""
 "¿Por qué no [registras una cuenta](%%action.register%%) y te conviertes en "
 "la primera persona en publicar?"
 
-#: actions/public.php:242
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -4857,7 +4010,6 @@ msgstr ""
 "para compartir notas acerca de tí con tus amistades, familiares y "
 "compañeros!! ([Más información](%%doc.help%%))"
 
-#: actions/public.php:247
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -4869,19 +4021,16 @@ msgstr ""
 "[StatusNet](http://status.net/) tool."
 
 #. TRANS: Public RSS feed description. %s is the StatusNet site name.
-#: actions/publicrss.php:106
 #, fuzzy, php-format
 msgid "%s updates from everyone."
 msgstr "¡Actualizaciones de todos en %s!"
 
 #. TRANS: Title for public tag cloud.
-#: actions/publictagcloud.php:57
 msgid "Public tag cloud"
 msgstr "Nube de etiquetas pública"
 
 #. TRANS: Instructions (more used like an explanation/header).
 #. TRANS: %s is the StatusNet sitename.
-#: actions/publictagcloud.php:65
 #, fuzzy, php-format
 msgid "These are most popular recent tags on %s"
 msgstr "Estas son las etiquetas recientes más populares en %s "
@@ -4889,7 +4038,6 @@ msgstr "Estas son las etiquetas recientes más populares en %s "
 #. TRANS: This message contains a Markdown URL. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.
-#: actions/publictagcloud.php:74
 #, php-format
 msgid "No one has posted a notice with a [hashtag](%%doc.tags%%) yet."
 msgstr ""
@@ -4897,7 +4045,6 @@ 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.
-#: actions/publictagcloud.php:79
 msgid "Be the first to post one!"
 msgstr "¡Sé la primera persona en publicar!"
 
@@ -4906,7 +4053,6 @@ msgstr "¡Sé la primera persona en publicar!"
 #. TRANS: This message contains a Markdown URL. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.
-#: actions/publictagcloud.php:87
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post "
@@ -4916,44 +4062,36 @@ msgstr ""
 "la primera persona en publicar uno?"
 
 #. TRANS: Client error displayed trying to recover password while already logged in.
-#: actions/recoverpassword.php:37
 msgid "You are already logged in!"
 msgstr "¡Ya te has conectado!"
 
 #. TRANS: Client error displayed when password recovery code is not correct.
-#: actions/recoverpassword.php:64
 msgid "No such recovery code."
 msgstr "No existe ese código de recuperación."
 
 #. TRANS: Client error displayed when no proper password recovery code was submitted.
-#: actions/recoverpassword.php:69
 msgid "Not a recovery code."
 msgstr "No es un código de recuperación."
 
 #. TRANS: Server error displayed trying to recover password without providing a user.
-#: actions/recoverpassword.php:77
 msgid "Recovery code for unknown user."
 msgstr "Código de recuperación para usuario desconocido."
 
 #. TRANS: Server error displayed removing a password recovery code from the database.
-#: actions/recoverpassword.php:91
 msgid "Error with confirmation code."
 msgstr "Error con el código de confirmación."
 
 #. TRANS: Client error displayed trying to recover password with too old a recovery code.
-#: actions/recoverpassword.php:103
 msgid "This confirmation code is too old. Please start again."
 msgstr ""
 "Este código de confirmación es demasiado viejo. Por favor empieza de nuevo."
 
 #. TRANS: Server error displayed when updating a user's e-mail address in the database fails while recovering a password.
-#: actions/recoverpassword.php:118
 msgid "Could not update user with confirmed email address."
 msgstr ""
 "No se pudo actualizar el usuario con la dirección de correo confirmada."
 
 #. TRANS: Page notice for password recovery page.
-#: actions/recoverpassword.php:160
 msgid ""
 "If you have forgotten or lost your password, you can get a new one sent to "
 "the email address you have stored in your account."
@@ -4961,104 +4099,86 @@ msgstr ""
 "Si has olvidado tu contraseña, podemos enviarte una nueva a la dirección de "
 "correo electrónico que has registrado en tu cuenta."
 
-#: actions/recoverpassword.php:167
 msgid "You have been identified. Enter a new password below."
 msgstr ""
 "Se te ha identificado. Por favor, escribe una nueva contraseña a "
 "continuación."
 
 #. TRANS: Fieldset legend for password recovery page.
-#: actions/recoverpassword.php:198
 msgid "Password recovery"
 msgstr "Recuperación de contraseña"
 
 #. TRANS: Field label on password recovery page.
-#: actions/recoverpassword.php:202
 msgid "Nickname or email address"
 msgstr "Nombre de usuario o dirección de correo electrónico"
 
 #. TRANS: Title for field label on password recovery page.
-#: actions/recoverpassword.php:205
 msgid "Your nickname on this server, or your registered email address."
 msgstr ""
 "Tu nombre de usuario en este servidor, o la dirección de correo electrónico "
 "registrada."
 
 #. TRANS: Field label on password recovery page.
-#: actions/recoverpassword.php:212
 msgid "Recover"
 msgstr "Recuperar"
 
 #. TRANS: Button text on password recovery page.
-#: actions/recoverpassword.php:214
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Recover"
 msgstr "Recuperar"
 
 #. TRANS: Title for password recovery page in password reset mode.
-#: actions/recoverpassword.php:223
 msgid "Reset password"
 msgstr "Restablecer contraseña"
 
 #. TRANS: Title for password recovery page in password recover mode.
-#: actions/recoverpassword.php:225
 msgid "Recover password"
 msgstr "Recuperar contraseña"
 
 #. TRANS: Title for password recovery page in email sent mode.
 #. TRANS: Subject for password recovery e-mail.
-#: actions/recoverpassword.php:227 actions/recoverpassword.php:366
 msgid "Password recovery requested"
 msgstr "Recuperación de contraseña solicitada"
 
 #. TRANS: Title for password recovery page in password saved mode.
-#: actions/recoverpassword.php:229
 #, fuzzy
 msgid "Password saved"
 msgstr "Se guardó la contraseña."
 
 #. TRANS: Title for password recovery page when an unknown action has been specified.
-#: actions/recoverpassword.php:232
 msgid "Unknown action"
 msgstr "Acción desconocida"
 
 #. TRANS: Title for field label for password reset form.
-#: actions/recoverpassword.php:258
 #, fuzzy
 msgid "6 or more characters, and do not forget it!"
 msgstr "6 o más caracteres, ¡no te olvides!"
 
 #. TRANS: Button text for password reset form.
 #. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: actions/recoverpassword.php:268 lib/designform.php:145
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Reset"
 msgstr "Restablecer"
 
 #. TRANS: Form instructions for password recovery form.
-#: actions/recoverpassword.php:278
 msgid "Enter a nickname or email address."
 msgstr "Ingresa un nombre de usuario o correo electronico"
 
 #. TRANS: Information on password recovery form if no known username or e-mail address was specified.
-#: actions/recoverpassword.php:309
 msgid "No user with that email address or username."
 msgstr "No hay ningún usuario con esa dirección de correo o nombre de usuario."
 
 #. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
-#: actions/recoverpassword.php:327
 msgid "No registered email address for that user."
 msgstr "Ninguna dirección de correo electrónico registrada por este usuario."
 
 #. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
-#: actions/recoverpassword.php:342
 msgid "Error saving address confirmation."
 msgstr "Error al guardar confirmación de la dirección."
 
 #. TRANS: User notification after an e-mail with instructions was sent from the password recovery form.
-#: actions/recoverpassword.php:370
 msgid ""
 "Instructions for recovering your password have been sent to the email "
 "address registered to your account."
@@ -5067,75 +4187,59 @@ msgstr ""
 "correo registrada."
 
 #. TRANS: Client error displayed when trying to reset as password without providing a user.
-#: actions/recoverpassword.php:391
 msgid "Unexpected password reset."
 msgstr "Restablecimiento de contraseña inesperado."
 
 #. TRANS: Reset password form validation error message.
-#: actions/recoverpassword.php:400
 #, fuzzy
 msgid "Password must be 6 characters or more."
 msgstr "La contraseña debe tener 6 o más caracteres."
 
 #. TRANS: Reset password form validation error message.
-#: actions/recoverpassword.php:405
 msgid "Password and confirmation do not match."
 msgstr "La contraseña y la confirmación no coinciden."
 
 #. TRANS: Server error displayed when something does wrong with the user object during password reset.
-#: actions/recoverpassword.php:426 actions/register.php:241
 msgid "Error setting user."
 msgstr "Error al configurar el usuario."
 
 #. TRANS: Success message for user after password reset.
-#: actions/recoverpassword.php:434
 msgid "New password successfully saved. You are now logged in."
 msgstr "Nueva contraseña guardada correctamente. Has iniciado una sesión."
 
-#: actions/redirecturl.php:70
 #, fuzzy
 msgid "No id parameter"
 msgstr "No existe argumento de ID."
 
-#: actions/redirecturl.php:76
 #, fuzzy, php-format
 msgid "No such file \"%d\""
 msgstr "No existe tal archivo."
 
-#: actions/register.php:80 actions/register.php:181 actions/register.php:392
 msgid "Sorry, only invited people can register."
 msgstr "Disculpa, sólo personas invitadas pueden registrarse."
 
-#: actions/register.php:87
 msgid "Sorry, invalid invitation code."
 msgstr "El código de invitación no es válido."
 
-#: actions/register.php:106
 msgid "Registration successful"
 msgstr "Registro exitoso."
 
-#: actions/register.php:108 actions/register.php:490
 msgid "Register"
 msgstr "Registrarse"
 
-#: actions/register.php:128
 msgid "Registration not allowed."
 msgstr "Registro de usuario no permitido."
 
-#: actions/register.php:194
 #, fuzzy
 msgid "You cannot register if you don't agree to the license."
 msgstr "No puedes registrarte si no estás de acuerdo con la licencia."
 
-#: actions/register.php:203
 msgid "Email address already exists."
 msgstr "La dirección de correo electrónico ya existe."
 
-#: actions/register.php:236 actions/register.php:258
 msgid "Invalid username or password."
 msgstr "Usuario o contraseña inválidos."
 
-#: actions/register.php:333
 #, fuzzy
 msgid ""
 "With this form you can create a new account. You can then post notices and "
@@ -5144,52 +4248,42 @@ msgstr ""
 "Con este formulario puedes crear una nueva cuenta. Después podrás publicar "
 "avisos y enviar vínculos de ellos a tus amigos y colegas. "
 
-#: actions/register.php:424 actions/register.php:428
-#: actions/siteadminpanel.php:238 lib/settingsnav.php:92
 msgid "Email"
 msgstr "Correo electrónico"
 
-#: actions/register.php:425 actions/register.php:429
 #, fuzzy
 msgid "Used only for updates, announcements, and password recovery."
 msgstr ""
 "Se usa sólo para actualizaciones, anuncios y recuperación de contraseñas"
 
-#: actions/register.php:436
 #, fuzzy
 msgid "Longer name, preferably your \"real\" name."
 msgstr "Nombre más largo, preferiblemente tu nombre \"real\""
 
-#: actions/register.php:464
 #, fuzzy
 msgid "Where you are, like \"City, State (or Region), Country\"."
 msgstr "Dónde estás, por ejemplo \"Ciudad, Estado (o Región), País\""
 
-#: actions/register.php:503
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
 msgstr ""
 "Entiendo que el contenido y los datos de %1$s son privados y confidenciales."
 
-#: actions/register.php:513
 #, php-format
 msgid "My text and files are copyright by %1$s."
 msgstr ""
 "Mi texto y archivos est'an protegidos por los derecho de autor de %1$s."
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:517
 msgid "My text and files remain under my own copyright."
 msgstr "Mi texto y archivos permanecen bajo mi propio derecho de autor."
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:520
 msgid "All rights reserved."
 msgstr "Todos los derechos reservados."
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:525
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -5199,7 +4293,6 @@ msgstr ""
 "información privada: contraseña, dirección de correo electrónico, dirección "
 "de mensajería instantánea y número de teléfono."
 
-#: actions/register.php:566
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -5232,7 +4325,6 @@ msgstr ""
 "\n"
 "¡Gracias por apuntarte! Esperamos que disfrutes usando este servicio."
 
-#: actions/register.php:590
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5240,7 +4332,6 @@ msgstr ""
 "(Deberías recibir un mensaje por correo eléctronico en unos momentos, con "
 "instrucciones sobre cómo confirmar tu dirección de correo.)"
 
-#: actions/remotesubscribe.php:97
 #, php-format
 msgid ""
 "To subscribe, you can [login](%%action.login%%), or [register](%%action."
@@ -5252,112 +4343,87 @@ msgstr ""
 "[servicio de microblogueo compatible](%%doc.openmublog%%), escribe el URL de "
 "tu perfil debajo."
 
-#: actions/remotesubscribe.php:111
 msgid "Remote subscribe"
 msgstr "Subscripción remota"
 
-#: actions/remotesubscribe.php:123
 msgid "Subscribe to a remote user"
 msgstr "Suscribirse a un usuario remoto"
 
-#: actions/remotesubscribe.php:128
 msgid "User nickname"
 msgstr "Usuario"
 
-#: actions/remotesubscribe.php:129
 #, fuzzy
 msgid "Nickname of the user you want to follow."
 msgstr "Usuario a quien quieres seguir"
 
-#: actions/remotesubscribe.php:132
 msgid "Profile URL"
 msgstr "URL del perfil"
 
-#: actions/remotesubscribe.php:133
 #, fuzzy
 msgid "URL of your profile on another compatible microblogging service."
 msgstr "El URL de tu perfil en otro servicio de microblogueo compatible"
 
 #. TRANS: Link text for link that will subscribe to a remote profile.
-#: actions/remotesubscribe.php:136 lib/subscribeform.php:139
-#: lib/userprofile.php:402
 msgid "Subscribe"
 msgstr "Suscribirse"
 
-#: actions/remotesubscribe.php:158
 #, fuzzy
 msgid "Invalid profile URL (bad format)."
 msgstr "El URL del perfil es inválido (formato incorrecto)"
 
-#: actions/remotesubscribe.php:167
 msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
 msgstr ""
 "No es un perfil válido URL (no se ha definido un documento YADIS o un XRDS "
 "inválido)."
 
-#: actions/remotesubscribe.php:175
 #, fuzzy
 msgid "That is a local profile! Login to subscribe."
 msgstr "¡Este es un perfil local! Ingresa para suscribirte"
 
-#: actions/remotesubscribe.php:182
 #, fuzzy
 msgid "Could not get a request token."
 msgstr "No se pudo obtener un token de solicitud"
 
-#: actions/repeat.php:56
 msgid "Only logged-in users can repeat notices."
 msgstr "Sólo los usuarios que hayan accedido pueden repetir mensajes."
 
-#: actions/repeat.php:63 actions/repeat.php:70
 msgid "No notice specified."
 msgstr "No se ha especificado un mensaje."
 
-#: actions/repeat.php:75
 #, fuzzy
 msgid "You cannot repeat your own notice."
 msgstr "No puedes repetir tus propios mensajes."
 
-#: actions/repeat.php:89
 msgid "You already repeated that notice."
 msgstr "Ya has repetido este mensaje."
 
-#: actions/repeat.php:112 lib/noticelist.php:697
 msgid "Repeated"
 msgstr "Repetido"
 
-#: actions/repeat.php:117
 msgid "Repeated!"
 msgstr "¡Repetido!"
 
 #. TRANS: RSS reply feed title. %s is a user nickname.
-#: actions/replies.php:126 actions/repliesrss.php:68
-#: lib/personalgroupnav.php:105
 #, php-format
 msgid "Replies to %s"
 msgstr "Respuestas a %s"
 
-#: actions/replies.php:128
 #, php-format
 msgid "Replies to %1$s, page %2$d"
 msgstr "Respuestas a %1$s, página %2$d"
 
-#: actions/replies.php:145
 #, php-format
 msgid "Replies feed for %s (RSS 1.0)"
 msgstr "Canal de respuestas a %s (RSS 1.0)"
 
-#: actions/replies.php:152
 #, php-format
 msgid "Replies feed for %s (RSS 2.0)"
 msgstr "Canal de respuestas a %s (RSS 2.0)"
 
-#: actions/replies.php:159
 #, php-format
 msgid "Replies feed for %s (Atom)"
 msgstr "Feed de avisos de %s"
 
-#: actions/replies.php:199
 #, php-format
 msgid ""
 "This is the timeline showing replies to %1$s but %2$s hasn't received a "
@@ -5366,7 +4432,6 @@ msgstr ""
 "Esta es la línea temporal que muestra las respuestas a a %1$s, pero %2$s aún "
 "no ha recibido ningún aviso."
 
-#: actions/replies.php:204
 #, php-format
 msgid ""
 "You can engage other users in a conversation, subscribe to more people or "
@@ -5375,7 +4440,6 @@ msgstr ""
 "Puedes introducir a otros usuarios en conversaciones, suscribir a más gente "
 "o [unirte a grupos](%%action.groups%%)."
 
-#: actions/replies.php:206
 #, php-format
 msgid ""
 "You can try to [nudge %1$s](../%2$s) or [post something to them](%%%%action."
@@ -5386,38 +4450,32 @@ msgstr ""
 
 #. TRANS: RSS reply feed description.
 #. TRANS: %1$s is a user nickname, %2$s is the StatusNet site name.
-#: actions/repliesrss.php:74
 #, fuzzy, php-format
 msgid "Replies to %1$s on %2$s."
 msgstr "Respuestas a %1$s en %2$s!"
 
 #. TRANS: Client exception displayed when trying to restore an account while not logged in.
-#: actions/restoreaccount.php:78
 #, fuzzy
 msgid "Only logged-in users can restore their account."
 msgstr "Sólo los usuarios que hayan accedido pueden repetir mensajes."
 
 #. TRANS: Client exception displayed when trying to restore an account without having restore rights.
-#: actions/restoreaccount.php:83
 #, fuzzy
 msgid "You may not restore your account."
 msgstr "Aún no has registrado aplicación alguna."
 
 #. TRANS: Client exception displayed trying to restore an account while something went wrong uploading a file.
 #. TRANS: Client exception. No file; probably just a non-AJAX submission.
-#: actions/restoreaccount.php:121 actions/restoreaccount.php:146
 #, fuzzy
 msgid "No uploaded file."
 msgstr "Subir archivo"
 
 #. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
-#: actions/restoreaccount.php:129 lib/mediafile.php:194
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
 msgstr ""
 "El archivo subido sobrepasa la directiva upload_max_filesize en php.ini"
 
 #. TRANS: Client exception.
-#: actions/restoreaccount.php:135 lib/mediafile.php:200
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form."
@@ -5426,145 +4484,117 @@ msgstr ""
 "el formulario HTML."
 
 #. TRANS: Client exception.
-#: actions/restoreaccount.php:141 lib/mediafile.php:206
 msgid "The uploaded file was only partially uploaded."
 msgstr "El archivo subido sólo fue parcialmente subido."
 
 #. TRANS: Client exception thrown when a temporary folder is not present to store a file upload.
-#: actions/restoreaccount.php:150 lib/mediafile.php:214
 msgid "Missing a temporary folder."
 msgstr "Falta una carpeta temporal."
 
 #. TRANS: Client exception thrown when writing to disk is not possible during a file upload operation.
-#: actions/restoreaccount.php:154 lib/mediafile.php:218
 msgid "Failed to write file to disk."
 msgstr "No se pudo escribir el archivo en el disco."
 
 #. TRANS: Client exception thrown when a file upload operation has been stopped by an extension.
-#: actions/restoreaccount.php:158 lib/mediafile.php:222
 msgid "File upload stopped by extension."
 msgstr "La subida de archivos se detuvo por extensión."
 
 #. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
 #. TRANS: Exception thrown when uploading an image fails for an unknown reason.
 #. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
-#: actions/restoreaccount.php:164 lib/imagefile.php:106 lib/mediafile.php:228
 msgid "System error uploading file."
 msgstr "Error del sistema subir el archivo"
 
 #. TRANS: Client exception thrown when a feed is not an Atom feed.
-#: actions/restoreaccount.php:207
 #, fuzzy
 msgid "Not an Atom feed."
 msgstr "Todos los miembros"
 
 #. TRANS: Success message when a feed has been restored.
-#: actions/restoreaccount.php:241
 msgid ""
 "Feed has been restored. Your old posts should now appear in search and your "
 "profile page."
 msgstr ""
 
 #. TRANS: Message when a feed restore is in progress.
-#: actions/restoreaccount.php:245
 msgid "Feed will be restored. Please wait a few minutes for results."
 msgstr ""
 
 #. TRANS: Form instructions for feed restore.
-#: actions/restoreaccount.php:342
 msgid ""
 "You can upload a backed-up stream in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format."
 msgstr ""
 
 #. TRANS: Title for submit button to confirm upload of a user backup file for account restore.
-#: actions/restoreaccount.php:373
 #, fuzzy
 msgid "Upload the file"
 msgstr "Subir archivo"
 
-#: actions/revokerole.php:75
 msgid "You cannot revoke user roles on this site."
 msgstr "No puedes revocar funciones de usuario en este sitio."
 
-#: actions/revokerole.php:82
 msgid "User doesn't have this role."
 msgstr "El usuario no tiene esta función."
 
-#: actions/rsd.php:142 actions/version.php:159
 msgid "StatusNet"
 msgstr "StatusNet"
 
-#: actions/sandbox.php:65 actions/unsandbox.php:65
 msgid "You cannot sandbox users on this site."
 msgstr "No puedes imponer restricciones a los usuarios en este sitio."
 
-#: actions/sandbox.php:72
 msgid "User is already sandboxed."
 msgstr "Al usuario ya se le ha impuesto restricciones."
 
 #. TRANS: Menu item for site administration
-#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
-#: lib/adminpanelaction.php:379
 msgid "Sessions"
 msgstr "Sesiones"
 
-#: actions/sessionsadminpanel.php:65
 msgid "Session settings for this StatusNet site"
 msgstr ""
 
-#: actions/sessionsadminpanel.php:175
 msgid "Handle sessions"
 msgstr "Gestionar sesiones"
 
-#: actions/sessionsadminpanel.php:177
 msgid "Whether to handle sessions ourselves."
 msgstr "Si manejamos las sesiones nosotros mismos."
 
-#: actions/sessionsadminpanel.php:181
 msgid "Session debugging"
 msgstr "Depuración de sesión"
 
-#: actions/sessionsadminpanel.php:183
 msgid "Turn on debugging output for sessions."
 msgstr "Activar la salida de depuración para sesiones."
 
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
+#. TRANS: Submit button title.
+msgid "Save"
+msgstr "Guardar"
+
 msgid "Save site settings"
 msgstr "Guardar la configuración del sitio"
 
-#: actions/showapplication.php:78
 msgid "You must be logged in to view an application."
 msgstr "Tienes que haber iniciado sesión para poder ver aplicaciones."
 
-#: actions/showapplication.php:151
 msgid "Application profile"
 msgstr "Perfil de la aplicación"
 
-#: actions/showapplication.php:179
 #, php-format
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr "Creado por %1$s - acceso predeterminado %2$s - %3$d usuarios"
 
-#: actions/showapplication.php:189
 msgid "Application actions"
 msgstr "Acciones de la aplicación"
 
-#: actions/showapplication.php:212
 msgid "Reset key & secret"
 msgstr "Reiniciar clave y secreto"
 
 #. TRANS: Title of form for deleting a user.
-#: actions/showapplication.php:228 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:64 lib/noticelist.php:678
 msgid "Delete"
 msgstr "Borrar"
 
-#: actions/showapplication.php:237
 msgid "Application info"
 msgstr "Información de la aplicación"
 
-#: actions/showapplication.php:255
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
@@ -5572,42 +4602,35 @@ msgstr ""
 "Nota: Nuestro sistema sólo es compatible con firmas HMAC-SHA1. No son "
 "compatibles las firmas de texto sin formato."
 
-#: actions/showapplication.php:275
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr "¿realmente deseas reiniciar tu clave y secreto de consumidor?"
 
 #. TRANS: Title for all but the first page of favourite notices of a user.
 #. TRANS: %1$s is the user for whom the favourite notices are displayed, %2$d is the page number.
-#: actions/showfavorites.php:80
 #, php-format
 msgid "%1$s's favorite notices, page %2$d"
 msgstr "Mensajes favoritos de %1$s, página %2$d"
 
 #. TRANS: Server error displayed when favourite notices could not be retrieved from the database.
-#: actions/showfavorites.php:134
 msgid "Could not retrieve favorite notices."
 msgstr "No se pudo recibir avisos favoritos."
 
 #. TRANS: Feed link text. %s is a username.
-#: actions/showfavorites.php:172
 #, php-format
 msgid "Feed for favorites of %s (RSS 1.0)"
 msgstr "Canal de las amistades de %s (RSS 1.0)"
 
 #. TRANS: Feed link text. %s is a username.
-#: actions/showfavorites.php:180
 #, php-format
 msgid "Feed for favorites of %s (RSS 2.0)"
 msgstr "Canal de las amistades de %s (RSS 2.0)"
 
 #. TRANS: Feed link text. %s is a username.
-#: actions/showfavorites.php:188
 #, php-format
 msgid "Feed for favorites of %s (Atom)"
 msgstr "Canal de las amistades de %s (Atom)"
 
 #. TRANS: Text displayed instead of favourite notices for the current logged in user that has no favourites.
-#: actions/showfavorites.php:209
 msgid ""
 "You haven't chosen any favorite notices yet. Click the fave button on "
 "notices you like to bookmark them for later or shed a spotlight on them."
@@ -5617,7 +4640,6 @@ msgstr ""
 
 #. TRANS: Text displayed instead of favourite notices for a user that has no favourites while logged in.
 #. TRANS: %s is a username.
-#: actions/showfavorites.php:213
 #, php-format
 msgid ""
 "%s hasn't added any favorite notices yet. Post something interesting they "
@@ -5629,7 +4651,6 @@ msgstr ""
 #. TRANS: Text displayed instead of favourite notices for a user that has no favourites while not logged in.
 #. TRANS: %s is a username, %%%%action.register%%%% is a link to the user registration page.
 #. TRANS: (link text)[link] is a Mark Down link.
-#: actions/showfavorites.php:220
 #, php-format
 msgid ""
 "%s hasn't added any favorite notices yet. Why not [register an account](%%%%"
@@ -5641,64 +4662,53 @@ msgstr ""
 "añadir a sus favoritos :)"
 
 #. TRANS: Page notice for show favourites page.
-#: actions/showfavorites.php:251
 msgid "This is a way to share what you like."
 msgstr "Esta es una manera de compartir lo que te gusta."
 
 #. TRANS: Page title for first group page. %s is a group name.
-#: actions/showgroup.php:75
 #, php-format
 msgid "%s group"
 msgstr "Grupo %s"
 
 #. TRANS: Page title for any but first group page.
 #. TRANS: %1$s is a group name, $2$s is a page number.
-#: actions/showgroup.php:79
 #, php-format
 msgid "%1$s group, page %2$d"
 msgstr "grupo %1$s, página %2$d"
 
 #. TRANS: Label for group description or group note (dt). Text hidden by default.
-#: actions/showgroup.php:266
 msgid "Note"
 msgstr "Nota"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:277 lib/groupeditform.php:180
 msgid "Aliases"
 msgstr "Alias"
 
 #. TRANS: Group actions header (h2). Text hidden by default.
-#: actions/showgroup.php:294
 msgid "Group actions"
 msgstr "Acciones del grupo"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:338
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
 msgstr "Canal de mensajes del grupo %s (RSS 1.0)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:345
 #, php-format
 msgid "Notice feed for %s group (RSS 2.0)"
 msgstr "Canal de mensajes del grupo %s (RSS 2.0)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:352
 #, php-format
 msgid "Notice feed for %s group (Atom)"
 msgstr "Canal de mensajes del grupo %s (Atom)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:358
 #, php-format
 msgid "FOAF for %s group"
 msgstr "Amistades de amistades del grupo %s"
 
 #. TRANS: Header for mini list of group members on a group page (h2).
-#: actions/showgroup.php:395
 msgid "Members"
 msgstr "Miembros"
 
@@ -5706,31 +4716,24 @@ msgstr "Miembros"
 #. TRANS: Text for user subscription statistics if the user has no subscriptions.
 #. TRANS: Text for user subscriber statistics if user has no subscribers.
 #. TRANS: Text for user user group membership statistics if user is not a member of any group.
-#: actions/showgroup.php:401 lib/profileaction.php:137
-#: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
-#: lib/subscriptionlist.php:123 lib/tagcloudsection.php:71
 msgid "(None)"
 msgstr "(Ninguno)"
 
 #. TRANS: Link to all group members from mini list of group members if group has more than n members.
-#: actions/showgroup.php:410
 msgid "All members"
 msgstr "Todos los miembros"
 
 #. TRANS: Header for group statistics on a group page (h2).
 #. TRANS: H2 text for user statistics.
-#: actions/showgroup.php:441 lib/profileaction.php:205
 msgid "Statistics"
 msgstr "Estadísticas"
 
-#: actions/showgroup.php:444
 #, fuzzy
 msgctxt "LABEL"
 msgid "Created"
 msgstr "Creado"
 
 #. TRANS: Label for member count in statistics on group page.
-#: actions/showgroup.php:449
 msgctxt "LABEL"
 msgid "Members"
 msgstr "Miembros"
@@ -5739,7 +4742,6 @@ msgstr "Miembros"
 #. TRANS: **%s** is the group alias, %%%%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).
-#: actions/showgroup.php:464
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5758,7 +4760,6 @@ 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: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
-#: actions/showgroup.php:474
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5772,99 +4773,83 @@ msgstr ""
 "comparten mensajes cortos acerca de su vida e intereses. "
 
 #. TRANS: Header for list of group administrators on a group page (h2).
-#: actions/showgroup.php:503
 msgid "Admins"
 msgstr "Administradores"
 
 #. TRANS: Client error displayed requesting a single message that does not exist.
-#: actions/showmessage.php:76
 msgid "No such message."
 msgstr "No existe el mensaje."
 
 #. TRANS: Client error displayed requesting a single direct message the requesting user was not a party in.
-#: actions/showmessage.php:86
 msgid "Only the sender and recipient may read this message."
 msgstr "Sólo el remitente y el receptor pueden leer este mensaje."
 
 #. TRANS: Page title for single direct message display when viewing user is the sender.
 #. TRANS: %1$s is the addressed user's nickname, $2$s is a timestamp.
-#: actions/showmessage.php:105
 #, php-format
 msgid "Message to %1$s on %2$s"
 msgstr "Mensaje a %1$s en %2$s"
 
 #. TRANS: Page title for single message display.
 #. TRANS: %1$s is the sending user's nickname, $2$s is a timestamp.
-#: actions/showmessage.php:113
 #, php-format
 msgid "Message from %1$s on %2$s"
 msgstr "Mensaje de %1$s en %2$s"
 
-#: actions/shownotice.php:90
 msgid "Notice deleted."
 msgstr "Mensaje borrado"
 
 #. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
-#: actions/showstream.php:70
 #, fuzzy, php-format
 msgid "%1$s tagged %2$s"
 msgstr "%1$s, página %2$s"
 
 #. TRANS: Page title showing tagged notices in one user's stream.
 #. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
-#: actions/showstream.php:74
 #, fuzzy, php-format
 msgid "%1$s tagged %2$s, page %3$d"
 msgstr "Mensajes etiquetados con %1$s, página %2$d"
 
 #. TRANS: Extended page title showing tagged notices in one user's stream.
 #. TRANS: %1$s is the username, %2$d is the page number.
-#: actions/showstream.php:82
 #, php-format
 msgid "%1$s, page %2$d"
 msgstr "%1$s, página %2$d"
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %1$s is a user nickname, %2$s is a hashtag.
-#: actions/showstream.php:127
 #, php-format
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
 msgstr "Canal de avisos de %1$s etiquetados %2$s (RSS 1.0)"
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.
-#: actions/showstream.php:136
 #, php-format
 msgid "Notice feed for %s (RSS 1.0)"
 msgstr "Canal de mensajes para %s (RSS 1.0)"
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.
-#: actions/showstream.php:145
 #, php-format
 msgid "Notice feed for %s (RSS 2.0)"
 msgstr "Canal de mensajes para %s (RSS 2.0)"
 
-#: actions/showstream.php:152
 #, php-format
 msgid "Notice feed for %s (Atom)"
 msgstr "Canal de mensajes para %s (Atom)"
 
 #. TRANS: Title for link to notice feed. FOAF stands for Friend of a Friend.
 #. TRANS: More information at http://www.foaf-project.org. %s is a user nickname.
-#: actions/showstream.php:159
 #, php-format
 msgid "FOAF for %s"
 msgstr "Amistades de amistades de %s"
 
 #. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
-#: actions/showstream.php:205
 #, fuzzy, php-format
 msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr "Esta es la línea temporal de %1$s, pero %2$s aún no ha publicado nada."
 
 #. TRANS: Second sentence of empty list message for a stream for the user themselves.
-#: actions/showstream.php:211
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
@@ -5874,7 +4859,6 @@ msgstr ""
 
 #. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:215
 #, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
@@ -5885,7 +4869,6 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:258
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5901,7 +4884,6 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:265
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5913,135 +4895,104 @@ msgstr ""
 "software libre [StatusNet](http://status.net/). "
 
 #. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
-#: actions/showstream.php:322
 #, php-format
 msgid "Repeat of %s"
 msgstr "Repetición de %s"
 
-#: actions/silence.php:65 actions/unsilence.php:65
 msgid "You cannot silence users on this site."
 msgstr "No puedes silenciar a otros usuarios en este sitio."
 
-#: actions/silence.php:72
 msgid "User is already silenced."
 msgstr "El usuario ya ha sido silenciado."
 
-#: actions/siteadminpanel.php:69
 msgid "Basic settings for this StatusNet site"
 msgstr "Configuración básica de este sitio StatusNet."
 
-#: actions/siteadminpanel.php:133
 msgid "Site name must have non-zero length."
 msgstr "El nombre del sitio debe tener longitud diferente de cero."
 
-#: actions/siteadminpanel.php:141
 msgid "You must have a valid contact email address."
 msgstr "Debes tener una dirección de correo electrónico válida."
 
-#: actions/siteadminpanel.php:159
 #, php-format
 msgid "Unknown language \"%s\"."
 msgstr "Idioma desconocido \"%s\"."
 
-#: actions/siteadminpanel.php:165
 msgid "Minimum text limit is 0 (unlimited)."
 msgstr "El límite mínimo de texto es 0 (sin límite)."
 
-#: actions/siteadminpanel.php:171
 msgid "Dupe limit must be one or more seconds."
 msgstr "El límite de duplicación debe ser de 1 o más segundos."
 
-#: actions/siteadminpanel.php:221
 msgid "General"
 msgstr "General"
 
-#: actions/siteadminpanel.php:224
 msgid "Site name"
 msgstr "Nombre del sitio"
 
-#: actions/siteadminpanel.php:225
 msgid "The name of your site, like \"Yourcompany Microblog\""
 msgstr "El nombre de tu sitio, por ejemplo, \"Microblog tucompañía\""
 
-#: actions/siteadminpanel.php:229
 msgid "Brought by"
 msgstr "Traído por"
 
-#: actions/siteadminpanel.php:230
 msgid "Text used for credits link in footer of each page"
 msgstr "Texto utilizado para los vínculos a créditos en el pie de cada página"
 
-#: actions/siteadminpanel.php:234
 msgid "Brought by URL"
 msgstr "Traído por URL"
 
-#: actions/siteadminpanel.php:235
 msgid "URL used for credits link in footer of each page"
 msgstr "URL utilizado para el vínculo a los créditos en el pie de cada página"
 
-#: actions/siteadminpanel.php:239
 msgid "Contact email address for your site"
 msgstr "Correo electrónico de contacto para tu sitio"
 
-#: actions/siteadminpanel.php:245
 msgid "Local"
 msgstr "Configuraciones regionales"
 
-#: actions/siteadminpanel.php:256
 msgid "Default timezone"
 msgstr "Zona horaria predeterminada"
 
-#: actions/siteadminpanel.php:257
 msgid "Default timezone for the site; usually UTC."
 msgstr "Zona horaria predeterminada del sitio; generalmente UTC."
 
-#: actions/siteadminpanel.php:262
 msgid "Default language"
 msgstr "!Idioma predeterminado"
 
-#: actions/siteadminpanel.php:263
 msgid "Site language when autodetection from browser settings is not available"
 msgstr ""
 "Idioma del sitio cuando la autodetección de la configuración del navegador "
 "no está disponible"
 
-#: actions/siteadminpanel.php:271
 msgid "Limits"
 msgstr "Límites"
 
-#: actions/siteadminpanel.php:274
 msgid "Text limit"
 msgstr "Límite de texto"
 
-#: actions/siteadminpanel.php:274
 msgid "Maximum number of characters for notices."
 msgstr "Cantidad máxima de caracteres para los mensajes."
 
-#: actions/siteadminpanel.php:278
 msgid "Dupe limit"
 msgstr "Límite de duplicados"
 
-#: actions/siteadminpanel.php:278
 msgid "How long users must wait (in seconds) to post the same thing again."
 msgstr "Cuántos segundos es necesario esperar para publicar lo mismo de nuevo."
 
 #. TRANS: Page title for site-wide notice tab in admin panel.
-#: actions/sitenoticeadminpanel.php:55
 msgid "Site Notice"
 msgstr "Aviso del mensaje"
 
 #. TRANS: Instructions for site-wide notice tab in admin panel.
-#: actions/sitenoticeadminpanel.php:66
 msgid "Edit site-wide message"
 msgstr "Editar el mensaje que va a lo ancho del sitio"
 
 #. TRANS: Server error displayed when saving a site-wide notice was impossible.
-#: actions/sitenoticeadminpanel.php:101
 msgid "Unable to save site notice."
 msgstr "No se pudo guarda el aviso del sitio."
 
 #. TRANS: Client error displayed when a site-wide notice was longer than allowed.
-#: actions/sitenoticeadminpanel.php:112
 #, fuzzy
 msgid "Maximum length for the site-wide notice is 255 characters."
 msgstr ""
@@ -6049,12 +5000,10 @@ msgstr ""
 "caracteres."
 
 #. TRANS: Label for site-wide notice text field in admin panel.
-#: actions/sitenoticeadminpanel.php:176
 msgid "Site notice text"
 msgstr "Texto del mensaje del sitio"
 
 #. TRANS: Tooltip for site-wide notice text field in admin panel.
-#: actions/sitenoticeadminpanel.php:179
 #, fuzzy
 msgid "Site-wide notice text (255 characters maximum; HTML allowed)"
 msgstr ""
@@ -6062,78 +5011,64 @@ msgstr ""
 "acepta HTML)"
 
 #. TRANS: Title for button to save site notice in admin panel.
-#: actions/sitenoticeadminpanel.php:201
 #, fuzzy
 msgid "Save site notice."
 msgstr "Guardar el mensaje del sitio"
 
 #. TRANS: Title for SMS settings.
-#: actions/smssettings.php:56
 msgid "SMS settings"
 msgstr "Configuración de SMS"
 
 #. TRANS: SMS settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/smssettings.php:70
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr ""
 "Puedes recibir mensajes SMS por correo electrónico desde %%site.name%%."
 
 #. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
-#: actions/smssettings.php:92
 msgid "SMS is not available."
 msgstr "SMS no está disponible."
 
 #. TRANS: Form legend for SMS settings form.
-#: actions/smssettings.php:106
 msgid "SMS address"
 msgstr "Dirección de SMS"
 
 #. TRANS: Form guide in SMS settings form.
-#: actions/smssettings.php:115
 msgid "Current confirmed SMS-enabled phone number."
 msgstr "Actual número telefónico para SMS confirmado."
 
 #. TRANS: Form guide in IM settings form.
-#: actions/smssettings.php:128
 msgid "Awaiting confirmation on this phone number."
 msgstr "Esperando confirmación de este número de teléfono."
 
 #. TRANS: Field label for SMS address input in SMS settings form.
-#: actions/smssettings.php:137
 msgid "Confirmation code"
 msgstr "Código de confirmación"
 
 #. TRANS: Form field instructions in SMS settings form.
-#: actions/smssettings.php:139
 msgid "Enter the code you received on your phone."
 msgstr "Ingrese el código recibido en su teléfono"
 
 #. TRANS: Button label to confirm SMS confirmation code in SMS settings.
-#: actions/smssettings.php:143
 msgctxt "BUTTON"
 msgid "Confirm"
 msgstr "Confirmar"
 
 #. TRANS: Field label for SMS phone number input in SMS settings form.
-#: actions/smssettings.php:148
 msgid "SMS phone number"
 msgstr "Número de teléfono de SMS"
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
-#: actions/smssettings.php:151
 #, fuzzy
 msgid "Phone number, no punctuation or spaces, with area code."
 msgstr "Número telefónico, sin puntuación ni espacios, incluya código de área"
 
 #. TRANS: Form legend for SMS preferences form.
-#: actions/smssettings.php:190
 msgid "SMS preferences"
 msgstr "Preferencias de SMS"
 
 #. TRANS: Checkbox label in SMS preferences form.
-#: actions/smssettings.php:196
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
@@ -6142,32 +5077,26 @@ msgstr ""
 "por mi operador móvil"
 
 #. TRANS: Confirmation message for successful SMS preferences save.
-#: actions/smssettings.php:307
 msgid "SMS preferences saved."
 msgstr "Preferencias de SMS guardadas."
 
 #. TRANS: Message given saving SMS phone number without having provided one.
-#: actions/smssettings.php:329
 msgid "No phone number."
 msgstr "Sin número telefónico"
 
 #. TRANS: Message given saving SMS phone number without having selected a carrier.
-#: actions/smssettings.php:335
 msgid "No carrier selected."
 msgstr "No se seleccionó un operador móvil."
 
 #. TRANS: Message given saving SMS phone number that is already set.
-#: actions/smssettings.php:343
 msgid "That is already your phone number."
 msgstr "Ese ya es tu número telefónico"
 
 #. TRANS: Message given saving SMS phone number that is already set for another user.
-#: actions/smssettings.php:347
 msgid "That phone number already belongs to another user."
 msgstr "Ese número telefónico ya pertenece a otro usuario"
 
 #. TRANS: Message given saving valid SMS phone number that is to be confirmed.
-#: actions/smssettings.php:375
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
 "for the code and instructions on how to use it."
@@ -6177,39 +5106,32 @@ msgstr ""
 "cómo usarlo."
 
 #. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
-#: actions/smssettings.php:403
 msgid "That is the wrong confirmation number."
 msgstr "Ese no es el número de confirmación"
 
 #. TRANS: Message given after successfully canceling SMS phone number confirmation.
-#: actions/smssettings.php:417
 msgid "SMS confirmation cancelled."
 msgstr "Confirmación de SMS cancelada."
 
 #. TRANS: Message given trying to remove an SMS phone number that is not
 #. TRANS: registered for the active user.
-#: actions/smssettings.php:437
 msgid "That is not your phone number."
 msgstr "Ese no es tu número telefónico"
 
 #. TRANS: Message given after successfully removing a registered SMS phone number.
-#: actions/smssettings.php:459
 msgid "The SMS phone number was removed."
 msgstr "El número de teléfono para SMS ha sido eliminado."
 
 #. TRANS: Label for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:498
 msgid "Mobile carrier"
 msgstr "Operador de telefonía móvil"
 
 #. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:503
 msgid "Select a carrier"
 msgstr "Seleccione un operador móvil"
 
 #. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
 #. TRANS: %s is an administrative contact's e-mail address.
-#: actions/smssettings.php:512
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -6220,119 +5142,94 @@ msgstr ""
 "informarnos al %s."
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
-#: actions/smssettings.php:534
 #, fuzzy
 msgid "No code entered."
 msgstr "No ingresó código"
 
 #. TRANS: Menu item for site administration
-#: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
-#: lib/adminpanelaction.php:395
 msgid "Snapshots"
 msgstr "Capturas"
 
-#: actions/snapshotadminpanel.php:65
 msgid "Manage snapshot configuration"
 msgstr "Administrar la configuración de instantáneas"
 
-#: actions/snapshotadminpanel.php:127
 msgid "Invalid snapshot run value."
 msgstr "Valor de ejecución de instantánea inválido"
 
-#: actions/snapshotadminpanel.php:133
 msgid "Snapshot frequency must be a number."
 msgstr "La frecuencia de captura debe ser un número."
 
-#: actions/snapshotadminpanel.php:144
 msgid "Invalid snapshot report URL."
 msgstr "URL de instantánea de reporte inválido"
 
-#: actions/snapshotadminpanel.php:200
 msgid "Randomly during web hit"
 msgstr "Aleatoriamente durante visita Web"
 
-#: actions/snapshotadminpanel.php:201
 msgid "In a scheduled job"
 msgstr "En un trabajo programado"
 
-#: actions/snapshotadminpanel.php:206
 msgid "Data snapshots"
 msgstr "Capturas de datos"
 
-#: actions/snapshotadminpanel.php:208
 msgid "When to send statistical data to status.net servers"
 msgstr "Cuándo enviar datos estadísticos a los servidores status.net"
 
-#: actions/snapshotadminpanel.php:217
 msgid "Frequency"
 msgstr "Frecuencia"
 
-#: actions/snapshotadminpanel.php:218
 msgid "Snapshots will be sent once every N web hits"
 msgstr "Las instantáneas se enviarán una vez cada N visitas Web"
 
-#: actions/snapshotadminpanel.php:226
 msgid "Report URL"
 msgstr "Reportar URL"
 
-#: actions/snapshotadminpanel.php:227
 msgid "Snapshots will be sent to this URL"
 msgstr "Las capturas se enviarán a este URL"
 
-#: actions/snapshotadminpanel.php:248
 msgid "Save snapshot settings"
 msgstr "Guardar la configuración de instantáneas"
 
 #. TRANS: Client error displayed trying a change a subscription for a non-subscribed profile.
-#: actions/subedit.php:75
 msgid "You are not subscribed to that profile."
 msgstr "No te has suscrito a ese perfil."
 
 #. TRANS: Server error displayed when updating a subscription fails with a database error.
 #. TRANS: Exception thrown when a subscription could not be stored on the server.
-#: actions/subedit.php:89 classes/Subscription.php:141
 msgid "Could not save subscription."
 msgstr "No se ha podido guardar la suscripción."
 
 #. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
-#: actions/subscribe.php:121
 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
 msgstr "No puedes suscribirte a un perfil remoto 0.1 de OMB con esta acción."
 
 #. TRANS: Page title when subscription succeeded.
-#: actions/subscribe.php:149
 msgid "Subscribed"
 msgstr "Suscrito"
 
 #. TRANS: Header for list of subscribers for a user (first page).
 #. TRANS: %s is the user's nickname.
-#: actions/subscribers.php:51
 #, php-format
 msgid "%s subscribers"
 msgstr "%s suscriptores"
 
 #. TRANS: Header for list of subscribers for a user (not first page).
 #. TRANS: %1$s is the user's nickname, $2$d is the page number.
-#: actions/subscribers.php:55
 #, php-format
 msgid "%1$s subscribers, page %2$d"
 msgstr "%1$s suscriptores, página %2$d"
 
 #. TRANS: Page notice for page with an overview of all subscribers
 #. TRANS: of the logged in user's own profile.
-#: actions/subscribers.php:68
 msgid "These are the people who listen to your notices."
 msgstr "Estas son las personas que escuchan tus avisos."
 
 #. TRANS: Page notice for page with an overview of all subscribers of a user other
 #. TRANS: than the logged in user. %s is the user nickname.
-#: actions/subscribers.php:74
 #, php-format
 msgid "These are the people who listen to %s's notices."
 msgstr "Estas son las personas que escuchan los avisos de %s."
 
 #. TRANS: Subscriber list text when the logged in user has no subscribers.
-#: actions/subscribers.php:114
 #, fuzzy
 msgid ""
 "You have no subscribers. Try subscribing to people you know and they might "
@@ -6343,7 +5240,6 @@ msgstr ""
 
 #. TRANS: Subscriber list text when looking at the subscribers for a of a user other
 #. TRANS: than the logged in user that has no subscribers. %s is the user nickname.
-#: actions/subscribers.php:118
 #, php-format
 msgid "%s has no subscribers. Want to be the first?"
 msgstr ""
@@ -6354,7 +5250,6 @@ msgstr ""
 #. TRANS: This message contains a Markdown URL. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.
-#: actions/subscribers.php:127
 #, php-format
 msgid ""
 "%s has no subscribers. Why not [register an account](%%%%action.register%%%"
@@ -6365,20 +5260,17 @@ msgstr ""
 
 #. TRANS: Header for subscriptions overview for a user (not first page).
 #. TRANS: %1$s is a user nickname, %2$d is the page number.
-#: actions/subscriptions.php:55
 #, php-format
 msgid "%1$s subscriptions, page %2$d"
 msgstr "%1$s suscrippciones, página %2$d"
 
 #. TRANS: Page notice for page with an overview of all subscriptions
 #. TRANS: of the logged in user's own profile.
-#: actions/subscriptions.php:68
 msgid "These are the people whose notices you listen to."
 msgstr "Estas son las personas que escuchas sus avisos."
 
 #. TRANS: Page notice for page with an overview of all subscriptions of a user other
 #. TRANS: than the logged in user. %s is the user nickname.
-#: actions/subscriptions.php:74
 #, php-format
 msgid "These are the people whose notices %s listens to."
 msgstr "Estas son las personas que %s escucha sus avisos."
@@ -6387,7 +5279,6 @@ msgstr "Estas son las personas que %s escucha sus avisos."
 #. 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.
-#: actions/subscriptions.php:133
 #, php-format
 msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "
@@ -6406,69 +5297,55 @@ msgstr ""
 #. TRANS: than the logged in user that has no subscriptions. %s is the user nickname.
 #. TRANS: Subscription list text when looking at the subscriptions for a of a user that has none
 #. TRANS: as an anonymous user. %s is the user nickname.
-#: actions/subscriptions.php:141 actions/subscriptions.php:147
 #, php-format
 msgid "%s is not listening to anyone."
 msgstr "%s no está escuchando a nadie."
 
 #. TRANS: Atom feed title. %s is a profile nickname.
-#: actions/subscriptions.php:176
 #, fuzzy, php-format
 msgid "Subscription feed for %s (Atom)"
 msgstr "Canal de mensajes para %s (Atom)"
 
 #. TRANS: Checkbox label for enabling Jabber messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:241 lib/settingsnav.php:110
-#, fuzzy
 msgid "IM"
 msgstr "IM"
 
 #. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:256 lib/settingsnav.php:117
 msgid "SMS"
 msgstr "SMS"
 
 #. TRANS: Title for all but the first page of notices with tags.
 #. TRANS: %1$s is the tag, %2$d is the page number.
-#: actions/tag.php:73
 #, php-format
 msgid "Notices tagged with %1$s, page %2$d"
 msgstr "Mensajes etiquetados con %1$s, página %2$d"
 
-#: actions/tag.php:91
 #, php-format
 msgid "Notice feed for tag %s (RSS 1.0)"
 msgstr "Canal de mensajes con etiqueta %s (RSS 1.0)"
 
-#: actions/tag.php:97
 #, php-format
 msgid "Notice feed for tag %s (RSS 2.0)"
 msgstr "Canal de mensajes con etiqueta %s (RSS 2.0)"
 
-#: actions/tag.php:103
 #, php-format
 msgid "Notice feed for tag %s (Atom)"
 msgstr "Canal de mensajes con etiqueta %s (Atom)"
 
-#: actions/tagother.php:39
 msgid "No ID argument."
 msgstr "No existe argumento de ID."
 
-#: actions/tagother.php:65
 #, php-format
 msgid "Tag %s"
 msgstr "%s etiqueta"
 
 #. TRANS: H2 for user profile information.
-#: actions/tagother.php:77 lib/userprofile.php:76
 msgid "User profile"
 msgstr "Perfil de usuario"
 
-#: actions/tagother.php:120
 msgid "Tag user"
 msgstr "Etiquetar usuario"
 
-#: actions/tagother.php:130
 msgid ""
 "Tags for this user (letters, numbers, -, ., and _), comma- or space- "
 "separated"
@@ -6476,50 +5353,40 @@ msgstr ""
 "Etiquetas para este usuario (letras, números, -, ., y _), separadas por "
 "comas o espacios"
 
-#: actions/tagother.php:157
 #, php-format
 msgid "Invalid tag: \"%s\""
 msgstr "Etiqueta inválida: \"% s\""
 
-#: actions/tagother.php:172
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 "Sólo puedes marcar a las personas a quienes estás suscrito o que están "
 "suscritas a ti."
 
-#: actions/tagother.php:215
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
 "Usa este formulario para agregar etiquetas a tus suscriptores o "
 "suscripciones."
 
-#: actions/tagrss.php:35
 msgid "No such tag."
 msgstr "No existe tal etiqueta."
 
 #. TRANS: Client error displayed when trying to unblock a non-blocked user.
-#: actions/unblock.php:59
 msgid "You haven't blocked that user."
 msgstr "No has bloqueado ese usuario."
 
-#: actions/unsandbox.php:72
 msgid "User is not sandboxed."
 msgstr "Al usuario no se le ha impuesto restricciones."
 
-#: actions/unsilence.php:72
 msgid "User is not silenced."
 msgstr "El usuario no ha sido silenciado."
 
-#: actions/unsubscribe.php:77
 msgid "No profile ID in request."
 msgstr "No hay id de perfil en solicitud."
 
-#: actions/unsubscribe.php:98
 msgid "Unsubscribed"
 msgstr "Desuscrito"
 
-#: actions/updateprofile.php:64
 #, php-format
 msgid ""
 "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
@@ -6527,176 +5394,141 @@ msgstr ""
 "Licencia de flujo del emisor ‘%1$s’ es incompatible con la licencia del "
 "sitio ‘%2$s’."
 
-#: actions/urlsettings.php:60
 #, fuzzy
 msgid "URL settings"
 msgstr "Configuración de mensajería instantánea"
 
 #. TRANS: Instructions for tab "Other" in user profile settings.
-#: actions/urlsettings.php:72
 msgid "Manage various other options."
 msgstr "Manejo de varias opciones adicionales."
 
 #. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
 #. TRANS: user's profile settings. This message has one space at the beginning. Use your
 #. TRANS: language's word separator here if it has one (most likely a single space).
-#: actions/urlsettings.php:115
 msgid " (free service)"
 msgstr " (servicio libre)"
 
-#: actions/urlsettings.php:121
 #, fuzzy
 msgid "[none]"
 msgstr "Ninguno"
 
-#: actions/urlsettings.php:122
 msgid "[internal]"
 msgstr ""
 
 #. TRANS: Label for dropdown with URL shortener services.
-#: actions/urlsettings.php:130
 msgid "Shorten URLs with"
 msgstr "Acortar los URL con"
 
 #. TRANS: Tooltip for for dropdown with URL shortener services.
-#: actions/urlsettings.php:132
 msgid "Automatic shortening service to use."
 msgstr "Servicio de acorte automático a usar."
 
-#: actions/urlsettings.php:138
 msgid "URL longer than"
 msgstr ""
 
-#: actions/urlsettings.php:141
 msgid "URLs longer than this will be shortened, 0 means always shorten."
 msgstr ""
 
-#: actions/urlsettings.php:145
 msgid "Text longer than"
 msgstr ""
 
-#: actions/urlsettings.php:148
 msgid ""
 "URLs in notices longer than this will be shortened, 0 means always shorten."
 msgstr ""
 
 #. TRANS: Form validation error for form "Other settings" in user profile.
-#: actions/urlsettings.php:180
 #, fuzzy
 msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr "El servicio de acortamiento de URL es muy largo (máx. 50 caracteres)."
 
-#: actions/urlsettings.php:187
 msgid "Invalid number for max url length."
 msgstr ""
 
-#: actions/urlsettings.php:193
 #, fuzzy
 msgid "Invalid number for max notice length."
 msgstr "Contenido de mensaje inválido."
 
-#: actions/urlsettings.php:238
 msgid "Error saving user URL shortening preferences."
 msgstr ""
 
 #. TRANS: User admin panel title
-#: actions/useradminpanel.php:58
 msgctxt "TITLE"
 msgid "User"
 msgstr "Usuario"
 
 #. TRANS: Instruction for user admin panel.
-#: actions/useradminpanel.php:69
 msgid "User settings for this StatusNet site"
 msgstr ""
 
 #. TRANS: Form validation error in user admin panel when a non-numeric character limit was set.
-#: actions/useradminpanel.php:147
 msgid "Invalid bio limit. Must be numeric."
 msgstr "Límite para la bio inválido: Debe ser numérico."
 
 #. TRANS: Form validation error in user admin panel when welcome text is too long.
-#: actions/useradminpanel.php:154
 #, fuzzy
 msgid "Invalid welcome text. Maximum length is 255 characters."
 msgstr "Texto de bienvenida inválido. La longitud máx. es de 255 caracteres."
 
 #. TRANS: Client error displayed when trying to set a non-existing user as default subscription for new
 #. TRANS: users in user admin panel. %1$s is the invalid nickname.
-#: actions/useradminpanel.php:166
 #, fuzzy, php-format
 msgid "Invalid default subscripton: \"%1$s\" is not a user."
 msgstr "Suscripción predeterminada inválida : '%1$s' no es un usuario"
 
-#: actions/useradminpanel.php:215 lib/action.php:565 lib/settingsnav.php:77
-#: lib/subgroupnav.php:81
 msgid "Profile"
 msgstr "Perfil"
 
 #. TRANS: Field label in user admin panel for setting the character limit for the bio field.
-#: actions/useradminpanel.php:220
 msgid "Bio Limit"
 msgstr "Límite de la bio"
 
 #. TRANS: Tooltip in user admin panel for setting the character limit for the bio field.
-#: actions/useradminpanel.php:222
 msgid "Maximum length of a profile bio in characters."
 msgstr "Longitud máxima de bio de perfil en caracteres."
 
 #. TRANS: Form legend in user admin panel.
-#: actions/useradminpanel.php:231
 msgid "New users"
 msgstr "Nuevos usuarios"
 
 #. TRANS: Field label in user admin panel for setting new user welcome text.
-#: actions/useradminpanel.php:236
 msgid "New user welcome"
 msgstr "Bienvenida a nuevos usuarios"
 
 #. TRANS: Tooltip in user admin panel for setting new user welcome text.
-#: actions/useradminpanel.php:238
 #, fuzzy
 msgid "Welcome text for new users (maximum 255 characters)."
 msgstr "Texto de bienvenida para nuevos usuarios (máx. 255 caracteres)."
 
 #. TRANS: Field label in user admin panel for setting default subscription for new users.
-#: actions/useradminpanel.php:244
 msgid "Default subscription"
 msgstr "Suscripción predeterminada"
 
 #. TRANS: Tooltip in user admin panel for setting default subscription for new users.
-#: actions/useradminpanel.php:246
 msgid "Automatically subscribe new users to this user."
 msgstr "Suscribir automáticamente nuevos usuarios a este usuario."
 
 #. TRANS: Form legend in user admin panel.
-#: actions/useradminpanel.php:256
 msgid "Invitations"
 msgstr "Invitaciones"
 
 #. TRANS: Field label for checkbox in user admin panel for allowing users to invite friend using site e-mail.
-#: actions/useradminpanel.php:262
 msgid "Invitations enabled"
 msgstr "Invitaciones habilitadas"
 
 #. TRANS: Tooltip for checkbox in user admin panel for allowing users to invite friend using site e-mail.
-#: actions/useradminpanel.php:265
 msgid "Whether to allow users to invite new users."
 msgstr "Si permitir a los usuarios invitar nuevos usuarios."
 
 #. TRANS: Title for button to save user settings in user admin panel.
-#: actions/useradminpanel.php:302
 #, fuzzy
 msgid "Save user settings."
 msgstr "Guardar la configuración del sitio"
 
 #. TRANS: Page title.
-#: actions/userauthorization.php:109
 msgid "Authorize subscription"
 msgstr "Autorizar la suscripción"
 
 #. TRANS: Page notice on "Auhtorize subscription" page.
-#: actions/userauthorization.php:115
 #, fuzzy
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
@@ -6708,42 +5540,35 @@ msgstr ""
 "haz clic en \"Cancelar\"."
 
 #. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:200
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Accept"
 msgstr "Aceptar"
 
 #. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:202
 #, fuzzy
 msgid "Subscribe to this user."
 msgstr "Suscribirse a este usuario"
 
 #. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:204
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Reject"
 msgstr "Rechazar"
 
 #. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:206
 #, fuzzy
 msgid "Reject this subscription."
 msgstr "Rechazar esta suscripción"
 
 #. TRANS: Client error displayed for an empty authorisation request.
-#: actions/userauthorization.php:219
 msgid "No authorization request!"
 msgstr "¡Ninguna petición de autorización!"
 
 #. TRANS: Accept message header from Authorise subscription page.
-#: actions/userauthorization.php:242
 msgid "Subscription authorized"
 msgstr "Suscripción autorizada"
 
-#: actions/userauthorization.php:245
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to authorize the "
@@ -6754,11 +5579,9 @@ msgstr ""
 "cómo autorizar la suscripción. Tu token de suscripción es:"
 
 #. TRANS: Reject message header from Authorise subscription page.
-#: actions/userauthorization.php:256
 msgid "Subscription rejected"
 msgstr "Suscripción rechazada"
 
-#: actions/userauthorization.php:259
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to fully reject the "
@@ -6770,35 +5593,30 @@ msgstr ""
 
 #. TRANS: Exception thrown when no valid user is found for an authorisation request.
 #. TRANS: %s is a listener URI.
-#: actions/userauthorization.php:296
 #, fuzzy, php-format
 msgid "Listener URI \"%s\" not found here."
 msgstr "No se ha encontrado aquí el URI del oyente ‘%s’."
 
 #. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
 #. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:303
 #, fuzzy, php-format
 msgid "Listenee URI \"%s\" is too long."
 msgstr "El URI ‘%s’ del receptor es muy largo."
 
 #. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
 #. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:311
 #, fuzzy, php-format
 msgid "Listenee URI \"%s\" is a local user."
 msgstr "El URI ‘%s’  del receptor es un usuario local."
 
 #. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
 #. TRANS: %s is a profile URL.
-#: actions/userauthorization.php:329
 #, fuzzy, php-format
 msgid "Profile URL \"%s\" is for a local user."
 msgstr "El URL ‘%s’ de perfil es para un usuario local."
 
 #. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
 #. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
-#: actions/userauthorization.php:339
 #, fuzzy, php-format
 msgid ""
 "Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
@@ -6809,32 +5627,27 @@ msgstr ""
 
 #. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
 #. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:349
 #, fuzzy, php-format
 msgid "Avatar URL \"%s\" is not valid."
 msgstr "La URL ‘%s’ de la imagen no es válida."
 
 #. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
 #. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:356
 #, fuzzy, php-format
 msgid "Cannot read avatar URL \"%s\"."
 msgstr "No se puede leer la URL de la imagen ‘%s’."
 
 #. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
 #. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:363
 #, fuzzy, php-format
 msgid "Wrong image type for avatar URL \"%s\"."
 msgstr "Tipo de imagen incorrecto para la URL de imagen ‘%s’."
 
 #. TRANS: Page title for profile design page.
-#: actions/userdesignsettings.php:74 lib/designsettings.php:61
 msgid "Profile design"
 msgstr "Diseño del perfil"
 
 #. TRANS: Instructions for profile design page.
-#: actions/userdesignsettings.php:84 lib/designsettings.php:72
 msgid ""
 "Customize the way your profile looks with a background image and a colour "
 "palette of your choice."
@@ -6842,44 +5655,35 @@ msgstr ""
 "Personaliza la vista de tu perfil con una imagen de fondo y la paelta de "
 "colores que quieras."
 
-#: actions/userdesignsettings.php:289
 msgid "Enjoy your hotdog!"
 msgstr "¡Disfruta de tu perrito caliente!"
 
-#: actions/userdesignsettings.php:325
 #, fuzzy
 msgid "Design settings"
 msgstr "Guardar la configuración del sitio"
 
-#: actions/userdesignsettings.php:340
 msgid "View profile designs"
 msgstr "Ver diseños de perfil"
 
-#: actions/userdesignsettings.php:341
 msgid "Show or hide profile designs."
 msgstr "Ocultar o mostrar diseños de perfil."
 
-#: actions/userdesignsettings.php:348
 #, fuzzy
 msgid "Background file"
 msgstr "Fondo"
 
 #. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number.
-#: actions/usergroups.php:66
 #, php-format
 msgid "%1$s groups, page %2$d"
 msgstr "%1$s grupos, página %2$d"
 
-#: actions/usergroups.php:132
 msgid "Search for more groups"
 msgstr "Buscar más grupos"
 
-#: actions/usergroups.php:159
 #, php-format
 msgid "%s is not a member of any group."
 msgstr "%s no es miembro de ningún grupo."
 
-#: actions/usergroups.php:164
 #, php-format
 msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
 msgstr "Intenta [buscar gupos](%%action.groupsearch%%) y unirte a ellos."
@@ -6889,18 +5693,14 @@ msgstr "Intenta [buscar gupos](%%action.groupsearch%%) y unirte a ellos."
 #. TRANS: %1$s is a group name, %2$s is a site name.
 #. TRANS: Message is used as a subtitle in atom user notice feed.
 #. TRANS: %1$s is a user name, %2$s is a site name.
-#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:70
-#: lib/atomusernoticefeed.php:95
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr "¡Actualizaciones de %1$s en %2$s!"
 
-#: actions/version.php:75
 #, php-format
 msgid "StatusNet %s"
 msgstr "%s StatusNet"
 
-#: actions/version.php:155
 #, php-format
 msgid ""
 "This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
@@ -6909,16 +5709,13 @@ msgstr ""
 "Este sitio ha sido desarrollado con %1$s, versión %2$s, Derechos Reservados "
 "2008-2010 StatusNet, Inc. y sus colaboradores."
 
-#: actions/version.php:163
 msgid "Contributors"
 msgstr "Colaboradores"
 
 #. TRANS: Menu item for site administration
-#: actions/version.php:167 lib/adminpanelaction.php:403
 msgid "License"
 msgstr "Licencia"
 
-#: actions/version.php:170
 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 "
@@ -6930,7 +5727,6 @@ msgstr ""
 "publicado por la Fundación del Software Libre, bien por la versión 3 de la "
 "Licencia, o cualquier versión posterior (la de tu elección). "
 
-#: actions/version.php:176
 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 "
@@ -6942,7 +5738,6 @@ msgstr ""
 "IDONEIDAD PARA UN PROPÓSITO PARTICULAR. Consulte la Licencia Pública General "
 "de Affero AGPL para más detalles. "
 
-#: actions/version.php:182
 #, php-format
 msgid ""
 "You should have received a copy of the GNU Affero General Public License "
@@ -6952,52 +5747,42 @@ msgstr ""
 "con este programa. Si no la recibiste, visita %s."
 
 #. TRANS: Form input field label for application name.
-#: actions/version.php:197 lib/applicationeditform.php:190
 msgid "Name"
 msgstr "Nombre"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:885
 msgid "Version"
 msgstr "Versión"
 
-#: actions/version.php:199
 msgid "Author(s)"
 msgstr "Autor(es)"
 
 #. TRANS: Form input field label.
-#: actions/version.php:200 lib/applicationeditform.php:208
-#: lib/groupeditform.php:168
 msgid "Description"
 msgstr "Descripción"
 
 #. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:164
 msgid "Favor"
 msgstr "Aceptar"
 
 #. TRANS: Ntofication given when a user marks a notice as favorite.
 #. TRANS: %1$s is a user nickname or full name, %2$s is a notice URI.
-#: classes/Fave.php:167
 #, fuzzy, php-format
 msgid "%1$s marked notice %2$s as a favorite."
 msgstr "%s (@%s) agregó tu mensaje a los favoritos"
 
 #. TRANS: Server exception thrown when a URL cannot be processed.
-#: classes/File.php:162
 #, php-format
 msgid "Cannot process URL '%s'"
 msgstr "No se puede procesar URL '%s'"
 
 #. TRANS: Server exception thrown when... Robin thinks something is impossible!
-#: classes/File.php:194
 msgid "Robin thinks something is impossible."
 msgstr " Robin piensa que algo es imposible."
 
 #. 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$s is used for plural.
-#: classes/File.php:210
 #, fuzzy, php-format
 msgid ""
 "No file may be larger than %1$d byte and the file you sent was %2$d bytes. "
@@ -7014,7 +5799,6 @@ msgstr[1] ""
 
 #. TRANS: Message given if an upload would exceed user quota.
 #. TRANS: %d (number) is the user quota in bytes and is used for plural.
-#: classes/File.php:223
 #, fuzzy, php-format
 msgid "A file this large would exceed your user quota of %d byte."
 msgid_plural "A file this large would exceed your user quota of %d bytes."
@@ -7025,7 +5809,6 @@ msgstr[1] ""
 
 #. TRANS: Message given id an upload would exceed a user's monthly quota.
 #. TRANS: $d (number) is the monthly user quota in bytes and is used for plural.
-#: classes/File.php:235
 #, fuzzy, php-format
 msgid "A file this large would exceed your monthly quota of %d byte."
 msgid_plural "A file this large would exceed your monthly quota of %d bytes."
@@ -7035,108 +5818,89 @@ msgstr[1] ""
 "Un archivo tan grande podría sobrepasar tu cuota mensual de %d bytes."
 
 #. TRANS: Client exception thrown if a file upload does not have a valid name.
-#: classes/File.php:282 classes/File.php:297
 msgid "Invalid filename."
 msgstr "Nombre de archivo inválido."
 
 #. TRANS: Exception thrown when joining a group fails.
-#: classes/Group_member.php:51
 msgid "Group join failed."
 msgstr "Ha fallado la acción de unirse el grupo"
 
 #. TRANS: Exception thrown when trying to leave a group the user is not a member of.
-#: classes/Group_member.php:64
 msgid "Not part of group."
 msgstr "No es parte del grupo."
 
 #. TRANS: Exception thrown when trying to leave a group fails.
-#: classes/Group_member.php:72
 msgid "Group leave failed."
 msgstr "Ha fallado la acción de abandonar el grupo"
 
 #. TRANS: Exception thrown providing an invalid profile ID.
 #. TRANS: %s is the invalid profile ID.
-#: classes/Group_member.php:85
 #, php-format
 msgid "Profile ID %s is invalid."
 msgstr ""
 
 #. TRANS: Exception thrown providing an invalid group ID.
 #. TRANS: %s is the invalid group ID.
-#: classes/Group_member.php:98
 #, fuzzy, php-format
 msgid "Group ID %s is invalid."
 msgstr "Error al guardar el usuario; inválido."
 
 #. TRANS: Activity title.
-#: classes/Group_member.php:147 lib/joinform.php:114
 msgid "Join"
 msgstr "Unirse"
 
 #. TRANS: Success message for subscribe to group attempt through OStatus.
 #. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
-#: classes/Group_member.php:151
 #, php-format
 msgid "%1$s has joined group %2$s."
 msgstr ""
 
 #. TRANS: Server exception thrown when updating a local group fails.
-#: classes/Local_group.php:42
 msgid "Could not update local group."
 msgstr "No se pudo actualizar el grupo local."
 
 #. TRANS: Exception thrown when trying creating a login token failed.
 #. TRANS: %s is the user nickname for which token creation failed.
-#: classes/Login_token.php:78
 #, php-format
 msgid "Could not create login token for %s"
 msgstr "No se pudo crear el token de acceso para %s"
 
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
-#: classes/Memcached_DataObject.php:556
 msgid "No database name or DSN found anywhere."
 msgstr "Ningún nombre de base de datos o DSN encontrado."
 
 #. TRANS: Client exception thrown when a user tries to send a direct message while being banned from sending them.
-#: classes/Message.php:45
 msgid "You are banned from sending direct messages."
 msgstr "Se te ha inhabilitado para enviar mensajes directos."
 
 #. TRANS: Message given when a message could not be stored on the server.
-#: classes/Message.php:69
 msgid "Could not insert message."
 msgstr "No se pudo insertar mensaje."
 
 #. TRANS: Message given when a message could not be updated on the server.
-#: classes/Message.php:80
 msgid "Could not update message with new URI."
 msgstr "No se pudo actualizar mensaje con nuevo URI."
 
 #. TRANS: Server exception thrown when a user profile for a notice cannot be found.
 #. TRANS: %1$d is a profile ID (number), %2$d is a notice ID (number).
-#: classes/Notice.php:98
 #, php-format
 msgid "No such profile (%1$d) for notice (%2$d)."
 msgstr "No existe tal perfil (%1$d) para notificar (%2$d)."
 
 #. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:199
 #, php-format
 msgid "Database error inserting hashtag: %s"
 msgstr "Error de la BD al insertar la etiqueta clave: %s"
 
 #. TRANS: Client exception thrown if a notice contains too many characters.
-#: classes/Notice.php:279
 msgid "Problem saving notice. Too long."
 msgstr "Ha habido un problema al guardar el mensaje. Es muy largo."
 
 #. TRANS: Client exception thrown when trying to save a notice for an unknown user.
-#: classes/Notice.php:284
 msgid "Problem saving notice. Unknown user."
 msgstr "Ha habido un problema al guardar el mensaje. Usuario desconocido."
 
 #. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
-#: classes/Notice.php:290
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
@@ -7144,7 +5908,6 @@ msgstr ""
 "minutos."
 
 #. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
-#: classes/Notice.php:297
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
 "few minutes."
@@ -7153,43 +5916,36 @@ msgstr ""
 "pasados unos minutos."
 
 #. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:305
 msgid "You are banned from posting notices on this site."
 msgstr "Tienes prohibido publicar avisos en este sitio."
 
 #. TRANS: Server exception thrown when a notice cannot be saved.
 #. TRANS: Server exception thrown when a notice cannot be updated.
-#: classes/Notice.php:372 classes/Notice.php:399
 msgid "Problem saving notice."
 msgstr "Hubo un problema al guardar el mensaje."
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:929
 #, fuzzy
 msgid "Bad type provided to saveKnownGroups."
 msgstr "Mal tipo proveído a saveKnownGroups"
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:1028
 msgid "Problem saving group inbox."
 msgstr "Hubo un problema al guarda la bandeja de entrada del grupo."
 
 #. TRANS: Server exception thrown when a reply cannot be saved.
 #. TRANS: %1$d is a notice ID, %2$d is the ID of the mentioned user.
-#: classes/Notice.php:1144
 #, fuzzy, php-format
 msgid "Could not save reply for %1$d, %2$d."
 msgstr "No se ha podido guardar la información del grupo local."
 
 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1663
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
 
 #. TRANS: Full name of a profile or group followed by nickname in parens
-#: classes/Profile.php:172 classes/User_group.php:242
 #, fuzzy, php-format
 msgctxt "FANCYNAME"
 msgid "%1$s (%2$s)"
@@ -7197,266 +5953,210 @@ msgstr "%1$s (%2$s)"
 
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:779
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr "No se puede revocar rol \"%1$s\" para usuario #%2$d; no existe."
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:788
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
 "No se puede revocar rol \"%1$s\" para usuario #%2$d; error de base de datos."
 
 #. TRANS: Exception thrown when a right for a non-existing user profile is checked.
-#: classes/Remote_profile.php:54
 msgid "Missing profile."
 msgstr "Perfil ausente."
 
 #. TRANS: Exception thrown when a tag cannot be saved.
-#: classes/Status_network.php:338
 msgid "Unable to save tag."
 msgstr "Incapaz de grabar etiqueta."
 
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#: classes/Subscription.php:77 lib/oauthstore.php:482
 msgid "You have been banned from subscribing."
 msgstr "Se te ha prohibido la suscripción."
 
 #. TRANS: Exception thrown when trying to subscribe while already subscribed.
-#: classes/Subscription.php:82
 msgid "Already subscribed!"
 msgstr "¡Ya te has suscrito!"
 
 #. TRANS: Exception thrown when trying to subscribe to a user who has blocked the subscribing user.
-#: classes/Subscription.php:87
 msgid "User has blocked you."
 msgstr "El usuario te ha bloqueado."
 
 #. TRANS: Exception thrown when trying to unsibscribe without a subscription.
-#: classes/Subscription.php:176
 #, fuzzy
 msgid "Not subscribed!"
 msgstr "¡No estás suscrito!"
 
 #. TRANS: Exception thrown when trying to unsubscribe a user from themselves.
-#: classes/Subscription.php:183
 msgid "Could not delete self-subscription."
 msgstr "No se pudo eliminar la auto-suscripción."
 
 #. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
-#: classes/Subscription.php:211
 msgid "Could not delete subscription OMB token."
 msgstr "No se pudo eliminar la ficha OMB de suscripción."
 
 #. TRANS: Exception thrown when a subscription could not be deleted on the server.
-#: classes/Subscription.php:223
 msgid "Could not delete subscription."
 msgstr "No se pudo eliminar la suscripción."
 
 #. TRANS: Activity tile when subscribing to another person.
-#: classes/Subscription.php:265
 msgid "Follow"
 msgstr ""
 
 #. TRANS: Notification given when one person starts following another.
 #. TRANS: %1$s is the subscriber, %2$s is the subscribed.
-#: classes/Subscription.php:268
 #, fuzzy, php-format
 msgid "%1$s is now following %2$s."
 msgstr "%1$s ahora está escuchando tus avisos en %2$s"
 
 #. TRANS: Notice given on user registration.
 #. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:390
 #, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr "Bienvenido a %1$s, @%2$s!"
 
 #. TRANS: Server exception.
-#: classes/User.php:923
 msgid "No single user defined for single-user mode."
 msgstr "Ningún usuario sólo definido para modo monousuario."
 
 #. TRANS: Server exception.
-#: classes/User.php:927
 msgid "Single-user mode code called when not enabled."
 msgstr ""
 
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:522
 msgid "Could not create group."
 msgstr "No se pudo crear grupo."
 
 #. TRANS: Server exception thrown when updating a group URI failed.
-#: classes/User_group.php:532
 msgid "Could not set group URI."
 msgstr "No se pudo configurar el URI del grupo."
 
 #. TRANS: Server exception thrown when setting group membership failed.
-#: classes/User_group.php:555
 msgid "Could not set group membership."
 msgstr "No se pudo configurar la membresía del grupo."
 
 #. TRANS: Server exception thrown when saving local group information failed.
-#: classes/User_group.php:570
 msgid "Could not save local group info."
 msgstr "No se ha podido guardar la información del grupo local."
 
 #. TRANS: Exception thrown when an account could not be located when it should be moved.
 #. TRANS: %s is the remote site.
-#: lib/accountmover.php:65
 #, fuzzy, php-format
 msgid "Cannot locate account %s."
 msgstr "No puedes borrar usuarios."
 
 #. TRANS: Exception thrown when a service document could not be located account move.
 #. TRANS: %s is the remote site.
-#: lib/accountmover.php:106
 #, php-format
 msgid "Cannot find XRD for %s."
 msgstr ""
 
 #. TRANS: Exception thrown when an account could not be located when it should be moved.
 #. TRANS: %s is the remote site.
-#: lib/accountmover.php:131
 #, php-format
 msgid "No AtomPub API service for %s."
 msgstr ""
 
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: lib/action.php:161
 #, php-format
 msgid "%1$s - %2$s"
 msgstr "%1$s - %2$s"
 
 #. TRANS: Page title for a page without a title set.
-#: lib/action.php:177
 msgid "Untitled page"
 msgstr "Página sin título"
 
 #. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.
-#: lib/action.php:325
 msgctxt "TOOLTIP"
 msgid "Show more"
 msgstr ""
 
 #. TRANS: Inline reply form submit button: submits a reply comment.
-#: lib/action.php:328
 #, fuzzy
 msgctxt "BUTTON"
-msgid "Comment"
-msgstr "Contenido"
+msgid "Reply"
+msgstr "Responder"
 
 #. TRANS: Placeholder text for inline reply form. Clicking in this box will turn it into a mini notice form.
-#: lib/action.php:331
-msgid "Add a comment..."
+msgid "Write a reply..."
 msgstr ""
 
-#: lib/action.php:559 lib/personalgroupnav.php:99
-#, fuzzy
 msgid "Home"
 msgstr "Página de inicio"
 
-#: lib/action.php:560
 #, fuzzy
 msgid "Friends timeline"
 msgstr "línea temporal de %s"
 
-#: lib/action.php:566
-#, fuzzy
 msgid "Your profile"
 msgstr "Perfil del grupo"
 
-#: lib/action.php:570 lib/action.php:593 lib/publicgroupnav.php:78
 msgid "Public"
 msgstr "Público"
 
-#: lib/action.php:571 lib/action.php:594
 #, fuzzy
 msgid "Everyone on this site"
 msgstr "Encontrar gente en este sitio"
 
-#: lib/action.php:575
-#, fuzzy
 msgid "Settings"
 msgstr "Configuración de SMS"
 
-#: lib/action.php:576
 #, fuzzy
 msgid "Change your personal settings"
 msgstr "Cambia tus opciones de perfil"
 
-#: lib/action.php:582
 #, fuzzy
 msgid "Site configuration"
 msgstr "Configuración de usuario"
 
-#: lib/action.php:587
-#, fuzzy
 msgid "Logout"
 msgstr "Cerrar sesión"
 
-#: lib/action.php:588
-#, fuzzy
 msgid "Logout from the site"
 msgstr "Cerrar sesión en el sitio"
 
-#: lib/action.php:599
-#, fuzzy
 msgid "Login to the site"
 msgstr "Iniciar sesión en el sitio"
 
-#: lib/action.php:606
-#, fuzzy
 msgid "Search"
 msgstr "Buscar"
 
-#: lib/action.php:607
 #, fuzzy
 msgid "Search the site"
 msgstr "Buscar sitio"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:864
 msgid "Help"
 msgstr "Ayuda"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:867
 msgid "About"
 msgstr "Acerca de"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:870
 msgid "FAQ"
 msgstr "Preguntas Frecuentes"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:875
 msgid "TOS"
 msgstr "TOS"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:879
 msgid "Privacy"
 msgstr "Privacidad"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:882
 msgid "Source"
 msgstr "Fuente"
 
 #. TRANS: Secondary navigation menu option leading to e-mail contact information on the
 #. TRANS: StatusNet site, where to report bugs, ...
-#: lib/action.php:889
 msgid "Contact"
 msgstr "Ponerse en contacto"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:892
 msgid "Badge"
 msgstr "Insignia"
 
@@ -7464,7 +6164,6 @@ msgstr "Insignia"
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:921
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7474,7 +6173,6 @@ msgstr ""
 "[%%site.broughtby%%**](%%site.broughtbyurl%%)."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:924
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** es un servicio de microblogueo."
@@ -7483,7 +6181,6 @@ msgstr "**%%site.name%%** es un servicio de microblogueo."
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:931
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7496,21 +6193,18 @@ msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:949
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr "El contenido y datos de %1$s son privados y confidenciales."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:956
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
 "Copyright del contenido y los datos de%1$s. Todos los derechos reservados."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:960
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 "Derechos de autor de contenido y datos por los colaboradores. Todos los "
@@ -7518,7 +6212,6 @@ msgstr ""
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:992
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
@@ -7527,82 +6220,68 @@ msgstr ""
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1335
 msgid "After"
 msgstr "Después"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1345
 msgid "Before"
 msgstr "Antes"
 
 #. TRANS: Client exception thrown when a feed instance is a DOMDocument.
-#: lib/activity.php:125
 msgid "Expecting a root feed element but got a whole XML document."
 msgstr ""
 "A espera de un elemento de alimentación de raíz, pero se obtuvo un documento "
 "XML entero."
 
 #. TRANS: Client exception thrown when using an unknown verb for the activity importer.
-#: lib/activityimporter.php:81
 #, fuzzy, php-format
 msgid "Unknown verb: \"%s\"."
 msgstr "Idioma desconocido \"%s\"."
 
 #. TRANS: Client exception thrown when trying to force a subscription for an untrusted user.
-#: lib/activityimporter.php:107
 msgid "Cannot force subscription for untrusted user."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to for a remote user to subscribe.
-#: lib/activityimporter.php:117
 #, fuzzy
 msgid "Cannot force remote user to subscribe."
 msgstr "Especificar el nombre del usuario al cual se quiere suscribir."
 
 #. TRANS: Client exception thrown when trying to subscribe to an unknown profile.
-#: lib/activityimporter.php:132
 #, fuzzy
 msgid "Unknown profile."
 msgstr "Tipo de archivo desconocido"
 
 #. TRANS: Client exception thrown when trying to import an event not related to the importing user.
-#: lib/activityimporter.php:138
 msgid "This activity seems unrelated to our user."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to join a remote group that is not a group.
-#: lib/activityimporter.php:154
 msgid "Remote profile is not a group!"
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to join a group the importing user is already a member of.
-#: lib/activityimporter.php:163
 #, fuzzy
 msgid "User is already a member of this group."
 msgstr "Ya eres miembro de ese grupo"
 
 #. TRANS: Client exception thrown when trying to import a notice by another user.
 #. TRANS: %1$s is the source URI of the notice, %2$s is the URI of the author.
-#: lib/activityimporter.php:201
 #, php-format
 msgid "Already know about notice %1$s and  it has a different author %2$s."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to overwrite the author information for a non-trusted user during import.
-#: lib/activityimporter.php:207
 msgid "Not overwriting author info for non-trusted user."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to import a notice without content.
 #. TRANS: %s is the notice URI.
-#: lib/activityimporter.php:223
 #, fuzzy, php-format
 msgid "No content for notice %s."
 msgstr "Buscar en el contenido de mensajes"
 
-#: lib/activitymover.php:84
 #, fuzzy, php-format
 msgid "No such user %s."
 msgstr "No existe ese usuario."
@@ -7613,215 +6292,175 @@ msgstr "No existe ese usuario."
 #. TRANS: %1$s is a URL, %2$s is the status, %s$s is the fail reason.
 #. TRANS: Exception thrown when post to collection fails with a status that is not handled.
 #. TRANS: %1$s is a URL, %2$s is the status, %s$s is the fail reason.
-#: lib/activitysink.php:163 lib/activitysink.php:167 lib/activitysink.php:172
 #, fuzzy, php-format
 msgctxt "URLSTATUSREASON"
 msgid "%1$s %2$s %3$s"
 msgstr "%1$s - %2$s"
 
 #. TRANS: Client exception thrown when there is no source attribute.
-#: lib/activityutils.php:200
 msgid "Can't handle remote content yet."
 msgstr "Aún no se puede manejar contenido remoto."
 
 #. TRANS: Client exception thrown when there embedded XML content is found that cannot be processed yet.
-#: lib/activityutils.php:237
 msgid "Can't handle embedded XML content yet."
 msgstr "Aún no se puede manejar contenido XML incrustado."
 
 #. TRANS: Client exception thrown when base64 encoded content is found that cannot be processed yet.
-#: lib/activityutils.php:242
 msgid "Can't handle embedded Base64 content yet."
 msgstr "Aún no se puede manejar contenido incrustado Base64."
 
 #. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights.
-#: lib/adminpanelaction.php:96
 msgid "You cannot make changes to this site."
 msgstr "No puedes hacer cambios a este sitio."
 
 #. TRANS: Client error message throw when a certain panel's settings cannot be changed.
-#: lib/adminpanelaction.php:108
 msgid "Changes to that panel are not allowed."
 msgstr "No se permite realizar cambios a ese panel."
 
 #. TRANS: Client error message.
-#: lib/adminpanelaction.php:222
 msgid "showForm() not implemented."
 msgstr "showForm() no implementada."
 
 #. TRANS: Client error message
-#: lib/adminpanelaction.php:250
 msgid "saveSettings() not implemented."
 msgstr "saveSettings() no implementada."
 
 #. TRANS: Client error message thrown if design settings could not be deleted in
 #. TRANS: the admin panel Design.
-#: lib/adminpanelaction.php:274
 msgid "Unable to delete design setting."
 msgstr "No se puede eliminar la configuración de diseño."
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:337
 msgid "Basic site configuration"
 msgstr "Configuración básica del sitio"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:339
 msgctxt "MENU"
 msgid "Site"
 msgstr "Sitio"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:345
 msgid "Design configuration"
 msgstr "Configuración del diseño"
 
 #. TRANS: Menu item for site administration
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/adminpanelaction.php:347 lib/groupnav.php:135
 msgctxt "MENU"
 msgid "Design"
 msgstr "Diseño"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:353
 msgid "User configuration"
 msgstr "Configuración de usuario"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:110
 msgid "User"
 msgstr "Usuario"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:361
 msgid "Access configuration"
 msgstr "Configuración de acceso"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:369
 msgid "Paths configuration"
 msgstr "Configuración de rutas"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:377
 msgid "Sessions configuration"
 msgstr "Configuración de sesiones"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:385
 msgid "Edit site notice"
 msgstr "Editar el mensaje del sitio"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:387
 msgid "Site notice"
 msgstr "Mensaje de sitio"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:393
 msgid "Snapshots configuration"
 msgstr "Configuración de instantáneas"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:401
 msgid "Set site license"
 msgstr ""
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:409
 #, fuzzy
 msgid "Plugins configuration"
 msgstr "Configuración de rutas"
 
 #. TRANS: Client error 401.
-#: lib/apiauth.php:111
 msgid "API resource requires read-write access, but you only have read access."
 msgstr ""
 "API requiere acceso de lectura y escritura, pero sólo tienes acceso de "
 "lectura."
 
 #. TRANS: OAuth exception thrown when no application is found for a given consumer key.
-#: lib/apiauth.php:177
 msgid "No application for that consumer key."
 msgstr "No hay ninguna aplicación para esa clave de consumidor."
 
-#: lib/apiauth.php:202 lib/apiauth.php:284
 msgid "Not allowed to use API."
 msgstr ""
 
 #. TRANS: OAuth exception given when an incorrect access token was given for a user.
-#: lib/apiauth.php:225
 msgid "Bad access token."
 msgstr "Token de acceso erróneo."
 
 #. TRANS: OAuth exception given when no user was found for a given token (no token was found).
-#: lib/apiauth.php:230
 msgid "No user for that token."
 msgstr "No hay ningún usuario para ese token."
 
 #. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel".
 #. TRANS: Client error thrown when authentication fails.
-#: lib/apiauth.php:272 lib/apiauth.php:302
 msgid "Could not authenticate you."
 msgstr "No ha sido posible autenticarte."
 
 #. TRANS: Server error displayed when trying to create an anynymous OAuth consumer.
-#: lib/apioauthstore.php:45
 #, fuzzy
 msgid "Could not create anonymous consumer."
 msgstr "No fue posible crear alias."
 
 #. TRANS: Server error displayed when trying to create an anynymous OAuth application.
-#: lib/apioauthstore.php:69
 #, fuzzy
 msgid "Could not create anonymous OAuth application."
 msgstr "No se pudo crear la aplicación."
 
 #. TRANS: Exception thrown when no token association could be found.
-#: lib/apioauthstore.php:151
 msgid ""
 "Could not find a profile and application associated with the request token."
 msgstr ""
 
 #. TRANS: Exception thrown when no access token can be issued.
-#: lib/apioauthstore.php:209
 #, fuzzy
 msgid "Could not issue access token."
 msgstr "No se pudo insertar mensaje."
 
-#: lib/apioauthstore.php:317
 msgid "Database error inserting OAuth application user."
 msgstr "Error de base de datos al insertar usuario de la aplicación OAuth."
 
-#: lib/apioauthstore.php:345
 #, fuzzy
 msgid "Database error updating OAuth application user."
 msgstr "Error de base de datos al insertar usuario de la aplicación OAuth."
 
 #. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
-#: lib/apioauthstore.php:371
 msgid "Tried to revoke unknown token."
 msgstr "Se intentó revocar un token desconocido."
 
 #. TRANS: Exception thrown when an attempt is made to remove a revoked token.
-#: lib/apioauthstore.php:376
 msgid "Failed to delete revoked token."
 msgstr "No se pudo eliminar el token revocado."
 
 #. TRANS: Form input field label for application icon.
-#: lib/applicationeditform.php:177
 msgid "Icon"
 msgstr "Icono"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:182
 msgid "Icon for this application"
 msgstr "Icono para esta aplicación"
 
 #. TRANS: Form input field instructions.
 #. TRANS: %d is the number of available characters for the description.
-#: lib/applicationeditform.php:201
 #, fuzzy, php-format
 msgid "Describe your application in %d character"
 msgid_plural "Describe your application in %d characters"
@@ -7829,211 +6468,172 @@ msgstr[0] "Describe tu aplicación en %d caracteres"
 msgstr[1] "Describe tu aplicación en %d caracteres"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:205
 msgid "Describe your application"
 msgstr "Describe tu aplicación"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:216
 msgid "URL of the homepage of this application"
 msgstr "URL de la página principal de esta aplicación"
 
 #. TRANS: Form input field label.
-#: lib/applicationeditform.php:218
 msgid "Source URL"
 msgstr "La URL de origen"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:225
 msgid "Organization responsible for this application"
 msgstr "Organización responsable de esta aplicación"
 
 #. TRANS: Form input field label.
-#: lib/applicationeditform.php:227
 msgid "Organization"
 msgstr "Organización"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:234
 msgid "URL for the homepage of the organization"
 msgstr "URL de la página principal de la organización"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:243
 msgid "URL to redirect to after authentication"
 msgstr "URL al que se redirigirá después de la autenticación"
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:271
 msgid "Browser"
 msgstr "Navegador"
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:288
 msgid "Desktop"
 msgstr "Escritorio"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:290
 msgid "Type of application, browser or desktop"
 msgstr "Tipo de aplicación, de navegador o de escritorio"
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:314
 msgid "Read-only"
 msgstr "Solo lectura"
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:334
 msgid "Read-write"
 msgstr "Solo escritura"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:336
 msgid "Default access for this application: read-only, or read-write"
 msgstr ""
 "Acceso predeterminado para esta aplicación: sólo lectura o lectura-escritura"
 
 #. TRANS: Submit button title.
-#: lib/applicationeditform.php:353
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: lib/applicationlist.php:247
 msgid " by "
 msgstr ""
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:260
 msgid "read-write"
 msgstr "lectura y escritura"
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:262
 msgid "read-only"
 msgstr "sólo lectura"
 
 #. TRANS: Used in application list. %1$s is a modified date, %2$s is access type ("read-write" or "read-only")
-#: lib/applicationlist.php:268
 #, php-format
 msgid "Approved %1$s - \"%2$s\" access."
 msgstr "Aprobado el %1$s - acceso \"%2$s\"."
 
 #. TRANS: Access token in the application list.
 #. TRANS: %s are the first 7 characters of the access token.
-#: lib/applicationlist.php:282
 #, php-format
 msgid "Access token starting with: %s"
 msgstr ""
 
 #. TRANS: Button label
-#: lib/applicationlist.php:298
 msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "Revocar"
 
-#: lib/atom10feed.php:113
 msgid "Author element must contain a name element."
 msgstr ""
 
 #. TRANS: Server exception thrown when using the method setActivitySubject() in the class Atom10Feed.
-#: lib/atom10feed.php:160
 #, fuzzy
 msgid "Do not use this method!"
 msgstr "No eliminar este mensaje"
 
 #. TRANS: Title.
-#: lib/attachmentnoticesection.php:67
 msgid "Notices where this attachment appears"
 msgstr "Mensajes donde aparece este adjunto"
 
 #. TRANS: Title.
-#: lib/attachmenttagcloudsection.php:48
 msgid "Tags for this attachment"
 msgstr "Etiquetas de este archivo adjunto"
 
 #. TRANS: Exception thrown when a password change fails.
-#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:227
 #, fuzzy
 msgid "Password changing failed."
 msgstr "El cambio de contraseña ha fallado"
 
 #. TRANS: Exception thrown when a password change attempt fails because it is not allowed.
-#: lib/authenticationplugin.php:238
 #, fuzzy
 msgid "Password changing is not allowed."
 msgstr "No está permitido cambiar la contraseña"
 
 #. TRANS: Title for the form to block a user.
-#: lib/blockform.php:68
 msgid "Block"
 msgstr "Bloquear"
 
 #. TRANS: Description of the form to block a user.
-#: lib/blockform.php:79
 msgid "Block this user"
 msgstr "Bloquear este usuario."
 
 #. TRANS: Title for command results.
-#: lib/channel.php:104 lib/channel.php:125
 msgid "Command results"
 msgstr "Resultados de comando"
 
 #. TRANS: Title for command results.
-#: lib/channel.php:138
 #, fuzzy
 msgid "AJAX error"
 msgstr "Error de Ajax"
 
 #. TRANS: E-mail subject when a command has completed.
-#: lib/channel.php:177 lib/mailhandler.php:143
 msgid "Command complete"
 msgstr "Comando completo"
 
 #. TRANS: E-mail subject when a command has failed.
-#: lib/channel.php:188
 msgid "Command failed"
 msgstr "Comando falló"
 
 #. TRANS: Command exception text shown when a notice ID is requested that does not exist.
-#: lib/command.php:82 lib/command.php:106
 msgid "Notice with that id does not exist."
 msgstr "No existe ningún mensaje con ese ID."
 
 #. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
 #. TRANS: Error text shown when a last user notice is requested and it does not exist.
-#: lib/command.php:99 lib/command.php:642
 msgid "User has no last notice."
 msgstr "El/La usuario/a no tiene ningún último mensaje"
 
 #. TRANS: Message given requesting a profile for a non-existing user.
 #. TRANS: %s is the nickname of the user for which the profile could not be found.
-#: lib/command.php:128
 #, php-format
 msgid "Could not find a user with nickname %s."
 msgstr "No se pudo encontrar el usuario con el nombre de usuario %s."
 
 #. TRANS: Message given getting a non-existing user.
 #. TRANS: %s is the nickname of the user that could not be found.
-#: lib/command.php:148
 #, php-format
 msgid "Could not find a local user with nickname %s."
 msgstr ""
 "No se pudo encontrar a ningún usuario local con el nombre de usuario %s."
 
 #. TRANS: Error text shown when an unimplemented command is given.
-#: lib/command.php:183
 msgid "Sorry, this command is not yet implemented."
 msgstr "Disculpa, todavía no se implementa este comando."
 
 #. TRANS: Command exception text shown when a user tries to nudge themselves.
-#: lib/command.php:229
 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr "¡No tiene sentido darte un toque a ti mismo!"
 
 #. TRANS: Message given having nudged another user.
 #. TRANS: %s is the nickname of the user that was nudged.
-#: lib/command.php:238
 #, php-format
 msgid "Nudge sent to %s."
 msgstr "Toque enviado a %s."
@@ -8042,7 +6642,6 @@ msgstr "Toque enviado a %s."
 #. TRANS: %1$s is the number of other user the user is subscribed to.
 #. TRANS: %2$s is the number of users that are subscribed to the user.
 #. TRANS: %3$s is the number of notices the user has sent.
-#: lib/command.php:268
 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"
@@ -8054,40 +6653,34 @@ msgstr ""
 "Avisos: %3$s"
 
 #. TRANS: Error message text shown when a favorite could not be set because it has already been favorited.
-#: lib/command.php:298
 #, fuzzy
 msgid "Could not create favorite: already favorited."
 msgstr "No se pudo crear favorito."
 
 #. TRANS: Text shown when a notice has been marked as favourite successfully.
-#: lib/command.php:324
 msgid "Notice marked as fave."
 msgstr "Mensaje marcado como favorito."
 
 #. TRANS: Message given having added a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:369
 #, php-format
 msgid "%1$s joined group %2$s."
 msgstr "%1$s se unió al grupo %2$s."
 
 #. TRANS: Message given having removed a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:417
 #, php-format
 msgid "%1$s left group %2$s."
 msgstr "%1$s dejo el grupo %2$s."
 
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: lib/command.php:438
 #, fuzzy, php-format
 msgctxt "WHOIS"
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
 
 #. TRANS: Whois output. %s is the full name of the queried user.
-#: lib/command.php:442
 #, php-format
 msgid "Fullname: %s"
 msgstr "Nombre completo: %s"
@@ -8095,7 +6688,6 @@ msgstr "Nombre completo: %s"
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a location.
-#: lib/command.php:446 lib/mail.php:275
 #, php-format
 msgid "Location: %s"
 msgstr "Lugar: %s"
@@ -8103,20 +6695,17 @@ msgstr "Lugar: %s"
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a homepage.
-#: lib/command.php:450 lib/mail.php:279
 #, php-format
 msgid "Homepage: %s"
 msgstr "Página de inicio: %s"
 
 #. TRANS: Whois output. %s is the bio information of the queried user.
-#: lib/command.php:454
 #, php-format
 msgid "About: %s"
 msgstr "Sobre: %s"
 
 #. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).
 #. TRANS: %s is a remote profile.
-#: lib/command.php:483
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
@@ -8127,33 +6716,32 @@ msgstr ""
 
 #. TRANS: Message given if content is too long. %1$sd is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:500
 #, fuzzy, php-format
 msgid "Message too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
 msgstr[0] "Mensaje muy largo - máximo %1$d caracteres, enviaste %2$d"
 msgstr[1] "Mensaje muy largo - máximo %1$d caracteres, enviaste %2$d"
 
+#. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
+msgid "You can't send a message to this user."
+msgstr "No puedes enviar mensaje a este usuario."
+
 #. TRANS: Error text shown sending a direct message fails with an unknown reason.
-#: lib/command.php:528
 msgid "Error sending direct message."
 msgstr "Error al enviar mensaje directo."
 
 #. TRANS: Message given having repeated a notice from another user.
 #. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:565
 #, php-format
 msgid "Notice from %s repeated."
 msgstr "Se ha repetido el mensaje de %s."
 
 #. TRANS: Error text shown when repeating a notice fails with an unknown reason.
-#: lib/command.php:568
 msgid "Error repeating notice."
 msgstr "Ha habido un error al repetir el mensaje."
 
 #. TRANS: Message given if content of a notice for a reply is too long. %1$d is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:603
 #, fuzzy, php-format
 msgid "Notice too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Notice too long - maximum is %1$d characters, you sent %2$d."
@@ -8164,80 +6752,66 @@ msgstr[1] ""
 
 #. TRANS: Text shown having sent a reply to a notice successfully.
 #. TRANS: %s is the nickname of the user of the notice the reply was sent to.
-#: lib/command.php:616
 #, php-format
 msgid "Reply to %s sent."
 msgstr "Se ha enviado la respuesta a %s."
 
 #. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
-#: lib/command.php:619
 msgid "Error saving notice."
 msgstr "Error al guardar el mensaje."
 
 #. TRANS: Error text shown when no username was provided when issuing a subscribe command.
-#: lib/command.php:666
 msgid "Specify the name of the user to subscribe to."
 msgstr "Especificar el nombre del usuario al cual se quiere suscribir."
 
 #. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
-#: lib/command.php:675
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "No te puedes suscribir a perfiles de OMB por orden."
 
 #. TRANS: Text shown after having subscribed to another user successfully.
 #. TRANS: %s is the name of the user the subscription was requested for.
-#: lib/command.php:683
 #, php-format
 msgid "Subscribed to %s."
 msgstr "Suscrito a %s."
 
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.
-#: lib/command.php:704 lib/command.php:815
 msgid "Specify the name of the user to unsubscribe from."
 msgstr "Especifica el nombre del usuario del cual cancelar la suscripción."
 
 #. TRANS: Text shown after having unsubscribed from another user successfully.
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:715
 #, php-format
 msgid "Unsubscribed from %s."
 msgstr "Cancelada la suscripción a %s."
 
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
-#: lib/command.php:735 lib/command.php:761
 msgid "Command not yet implemented."
 msgstr "Todavía no se implementa comando."
 
 #. TRANS: Text shown when issuing the command "off" successfully.
-#: lib/command.php:739
 msgid "Notification off."
 msgstr "Notificación no activa."
 
 #. TRANS: Error text shown when the command "off" fails for an unknown reason.
-#: lib/command.php:742
 msgid "Can't turn off notification."
 msgstr "No se puede desactivar notificación."
 
 #. TRANS: Text shown when issuing the command "on" successfully.
-#: lib/command.php:765
 msgid "Notification on."
 msgstr "Notificación activada."
 
 #. TRANS: Error text shown when the command "on" fails for an unknown reason.
-#: lib/command.php:768
 msgid "Can't turn on notification."
 msgstr "No se puede activar notificación."
 
 #. TRANS: Error text shown when issuing the login command while login is disabled.
-#: lib/command.php:782
 msgid "Login command is disabled."
 msgstr "El comando de inicio de sesión está inhabilitado."
 
 #. TRANS: Text shown after issuing the login command successfully.
 #. TRANS: %s is a logon link..
-#: lib/command.php:795
 #, php-format
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
@@ -8246,20 +6820,17 @@ msgstr ""
 
 #. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:824
 #, php-format
 msgid "Unsubscribed %s."
 msgstr "Cancelada la suscripción a %s."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
-#: lib/command.php:842
 msgid "You are not subscribed to anyone."
 msgstr "No estás suscrito a nadie."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
-#: lib/command.php:847
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Ya estás suscrito a estos usuarios:"
@@ -8267,14 +6838,12 @@ msgstr[1] "Ya estás suscrito a estos usuarios:"
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user
 #. TRANS: (followers) without having any subscribers.
-#: lib/command.php:869
 msgid "No one is subscribed to you."
 msgstr "Nadie está suscrito a ti."
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
-#: lib/command.php:874
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "No se pudo suscribir otro a ti."
@@ -8282,21 +6851,18 @@ msgstr[1] "No se pudo suscribir otro a ti."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to without having
 #. TRANS: any group subscriptions.
-#: lib/command.php:896
 msgid "You are not a member of any groups."
 msgstr "No eres miembro de ningún grupo"
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
-#: lib/command.php:901
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "Eres miembro de este grupo:"
 msgstr[1] "Eres miembro de estos grupos:"
 
 #. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-#: lib/command.php:916
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -8377,71 +6943,58 @@ msgstr ""
 "tracking - aún sin implementar.\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:36
 #, fuzzy
 msgid "No configuration file found."
 msgstr "Ningún archivo de configuración encontrado. "
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:39
 #, fuzzy
 msgid "I looked for configuration files in the following places:"
 msgstr "He buscado archivos de configuración en los siguientes lugares: "
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:42
 msgid "You may wish to run the installer to fix this."
 msgstr "Quizá desees ejecutar el instalador para solucionar este problema."
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:46
 msgid "Go to the installer."
 msgstr "Ir al instalador."
 
-#: lib/dberroraction.php:59
 msgid "Database error"
 msgstr "Error de la base de datos"
 
 #. TRANS: Description of form for deleting a user.
-#: lib/deleteuserform.php:75
 msgid "Delete this user"
 msgstr "Borrar este usuario"
 
-#: lib/designform.php:114
 #, fuzzy
 msgid "Change design"
 msgstr "Guardar el diseño"
 
 #. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: lib/designform.php:131
 msgid "Change colours"
 msgstr "Cambiar colores"
 
 #. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: lib/designform.php:138
 msgid "Use defaults"
 msgstr "Utilizar los valores predeterminados"
 
 #. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: lib/designform.php:140
 msgid "Restore default designs"
 msgstr "Restaurar los diseños predeterminados"
 
 #. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: lib/designform.php:148
 msgid "Reset back to default"
 msgstr "Volver a los valores predeterminados"
 
 #. TRANS: Label in form on profile design page.
 #. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
-#: lib/designform.php:158
 msgid "Upload file"
 msgstr "Subir archivo"
 
 #. TRANS: Instructions for form on profile design page.
-#: lib/designform.php:163
 #, fuzzy
 msgid ""
 "You can upload your personal background image. The maximum file size is 2Mb."
@@ -8450,49 +7003,41 @@ msgstr ""
 "permitido es 2 MB."
 
 #. TRANS: Radio button on profile design page that will enable use of the uploaded profile image.
-#: lib/designform.php:194
 #, fuzzy
 msgctxt "RADIO"
 msgid "On"
 msgstr "Activar"
 
 #. TRANS: Radio button on profile design page that will disable use of the uploaded profile image.
-#: lib/designform.php:211
 #, fuzzy
 msgctxt "RADIO"
 msgid "Off"
 msgstr "Desactivar"
 
 #. TRANS: Title for button on profile design page to save settings.
-#: lib/designform.php:322
 msgid "Save design"
 msgstr "Guardar el diseño"
 
 #. TRANS: Error message displayed if design settings could not be saved.
 #. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
-#: lib/designsettings.php:216 lib/designsettings.php:238
 msgid "Couldn't update your design."
 msgstr "No fue posible actualizar tu diseño."
 
 #. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
-#: lib/designsettings.php:244
 msgid "Design defaults restored."
 msgstr "Diseño predeterminado restaurado."
 
 #. TRANS: Exception. %s is an ID.
-#: lib/discovery.php:153
 #, fuzzy, php-format
 msgid "Unable to find services for %s."
 msgstr "No se puede revocar el acceso para la aplicación: %s."
 
 #. TRANS: Form legend for removing the favourite status for a favourite notice.
 #. TRANS: Title for button text for removing the favourite status for a favourite notice.
-#: lib/disfavorform.php:108 lib/disfavorform.php:140
 msgid "Disfavor this notice"
 msgstr "Excluir este mensaje de mis favoritos"
 
 #. TRANS: Button text for removing the favourite status for a favourite notice.
-#: lib/disfavorform.php:136
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Disfavor favorite"
@@ -8500,98 +7045,77 @@ msgstr "Sacar favorito"
 
 #. TRANS: Form legend for adding the favourite status to a notice.
 #. TRANS: Title for button text for adding the favourite status to a notice.
-#: lib/favorform.php:108 lib/favorform.php:139
 msgid "Favor this notice"
 msgstr "Incluir este mensaje en tus favoritos"
 
 #. TRANS: Button text for adding the favourite status to a notice.
-#: lib/favorform.php:135
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Favor"
 msgstr "Aceptar"
 
-#: lib/feed.php:84
 msgid "RSS 1.0"
 msgstr "RSS 1.0"
 
-#: lib/feed.php:86
 msgid "RSS 2.0"
 msgstr "RSS 2.0"
 
-#: lib/feed.php:88
 msgid "Atom"
 msgstr "Atom"
 
-#: lib/feed.php:90
 msgid "FOAF"
 msgstr "Amistad de amistad"
 
-#: lib/feedimporter.php:75
 #, fuzzy
 msgid "Not an atom feed."
 msgstr "Todos los miembros"
 
-#: lib/feedimporter.php:82
 msgid "No author in the feed."
 msgstr ""
 
-#: lib/feedimporter.php:89
 msgid "Can't import without a user."
 msgstr ""
 
 #. TRANS: Header for feed links (h2).
-#: lib/feedlist.php:66
 msgid "Feeds"
 msgstr ""
 
-#: lib/galleryaction.php:128
 msgid "All"
 msgstr "Todo"
 
-#: lib/galleryaction.php:136
 msgid "Select tag to filter"
 msgstr "Seleccione una etiqueta a filtrar"
 
-#: lib/galleryaction.php:137
 msgid "Tag"
 msgstr "Etiqueta"
 
-#: lib/galleryaction.php:138
 msgid "Choose a tag to narrow list"
 msgstr "Elegir una etiqueta para reducir la lista"
 
-#: lib/galleryaction.php:140
 msgid "Go"
 msgstr "Ir"
 
-#: lib/grantroleform.php:91
 #, php-format
 msgid "Grant this user the \"%s\" role"
 msgstr "Otorgar al usuario el papel de \"%$\""
 
-#: lib/groupeditform.php:147
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr ""
 "1-64 letras en minúscula o números, sin signos de puntuación o espacios"
 
-#: lib/groupeditform.php:156
 #, fuzzy
 msgid "URL of the homepage or blog of the group or topic."
 msgstr "URL de página de inicio o blog del grupo o tema"
 
-#: lib/groupeditform.php:161
 msgid "Describe the group or topic"
 msgstr "Describir al grupo o tema"
 
-#: lib/groupeditform.php:163
 #, fuzzy, php-format
 msgid "Describe the group or topic in %d character or less"
 msgid_plural "Describe the group or topic in %d characters or less"
 msgstr[0] "Describir al grupo o tema en %d caracteres"
 msgstr[1] "Describir al grupo o tema en %d caracteres"
 
-#: lib/groupeditform.php:175
 #, fuzzy
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\"."
@@ -8599,7 +7123,6 @@ msgstr ""
 "Ubicación del grupo, si existe, por ejemplo \"Ciudad, Estado (o Región), País"
 "\""
 
-#: lib/groupeditform.php:183
 #, fuzzy, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -8613,70 +7136,60 @@ msgstr[1] ""
 "Nombres adicionales para el grupo, separados por comas o espacios. Máximo: %d"
 
 #. TRANS: Menu item in the group navigation page.
-#: lib/groupnav.php:86
 msgctxt "MENU"
 msgid "Group"
 msgstr "Grupo"
 
 #. TRANS: Tooltip for menu item in the group navigation page.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:89
 #, php-format
 msgctxt "TOOLTIP"
 msgid "%s group"
 msgstr "Grupo %s"
 
 #. TRANS: Menu item in the group navigation page.
-#: lib/groupnav.php:95
 msgctxt "MENU"
 msgid "Members"
 msgstr "Miembros"
 
 #. TRANS: Tooltip for menu item in the group navigation page.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:98
 #, php-format
 msgctxt "TOOLTIP"
 msgid "%s group members"
 msgstr "Miembros del grupo %s"
 
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/groupnav.php:108
 msgctxt "MENU"
 msgid "Blocked"
 msgstr "Bloqueado"
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:111
 #, php-format
 msgctxt "TOOLTIP"
 msgid "%s blocked users"
 msgstr "%s usuarios bloqueados"
 
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "Admin"
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:120
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Edit %s group properties"
 msgstr "Editar las propiedades del grupo %s"
 
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/groupnav.php:126
 msgctxt "MENU"
 msgid "Logo"
 msgstr "Logo"
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:129
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Add or edit %s logo"
@@ -8684,69 +7197,57 @@ msgstr "Añadir o modificar el logo %s"
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:138
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Add or edit %s design"
 msgstr "Añadir o modificar el diseño %s"
 
 #. TRANS: Title for groups with the most members section.
-#: lib/groupsbymemberssection.php:71
 msgid "Groups with most members"
 msgstr "Grupos con mayor cantidad de miembros"
 
 #. TRANS: Title for groups with the most posts section.
-#: lib/groupsbypostssection.php:71
 msgid "Groups with most posts"
 msgstr "Grupos con mayor cantidad de publicaciones"
 
 #. TRANS: Title for group tag cloud section.
 #. TRANS: %s is a group name.
-#: lib/grouptagcloudsection.php:57
 #, php-format
 msgid "Tags in %s group's notices"
 msgstr "Etiquetas en mensajes del grupo %s"
 
 #. TRANS: Client exception 406
-#: lib/htmloutputter.php:104
 msgid "This page is not available in a media type you accept"
 msgstr "Esta página no está disponible en el tipo de medio que aceptas."
 
 #. TRANS: Exception thrown when trying to upload an unsupported image file format.
-#: lib/imagefile.php:73
 msgid "Unsupported image file format."
 msgstr "Formato de imagen no soportado."
 
 #. TRANS: Exception thrown when too large a file is uploaded.
 #. TRANS: %s is the maximum file size, for example "500b", "10kB" or "2MB".
-#: lib/imagefile.php:91
 #, php-format
 msgid "That file is too big. The maximum file size is %s."
 msgstr "El archivo es muy grande. El tamaño máximo permitido es %s."
 
 #. TRANS: Exception thrown when uploading an image and that action could not be completed.
-#: lib/imagefile.php:97
 msgid "Partial upload."
 msgstr "Subida parcial"
 
 #. TRANS: Exception thrown when uploading a file as image that is not an image or is a corrupt file.
-#: lib/imagefile.php:115
 msgid "Not an image or corrupt file."
 msgstr "No es una imagen o es un fichero corrupto."
 
 #. TRANS: Exception thrown during resize when image has been registered as present, but is no longer there.
-#: lib/imagefile.php:178
 msgid "Lost our file."
 msgstr "Se perdió nuestro archivo."
 
 #. TRANS: Exception thrown when trying to resize an unknown file type.
 #. TRANS: Exception thrown when trying resize an unknown file type.
-#: lib/imagefile.php:216 lib/imagefile.php:257
 msgid "Unknown file type"
 msgstr "Tipo de archivo desconocido"
 
 #. TRANS: Number of megabytes. %d is the number.
-#: lib/imagefile.php:303
 #, fuzzy, php-format
 msgid "%dMB"
 msgid_plural "%dMB"
@@ -8754,7 +7255,6 @@ msgstr[0] "MB"
 msgstr[1] "MB"
 
 #. TRANS: Number of kilobytes. %d is the number.
-#: lib/imagefile.php:307
 #, fuzzy, php-format
 msgid "%dkB"
 msgid_plural "%dkB"
@@ -8762,14 +7262,12 @@ msgstr[0] "kB"
 msgstr[1] "kB"
 
 #. TRANS: Number of bytes. %d is the number.
-#: lib/imagefile.php:310
 #, php-format
 msgid "%dB"
 msgid_plural "%dB"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/implugin.php:262
 #, php-format
 msgid ""
 "User \"%s\" on %s has said that your %s screenname belongs to them. If "
@@ -8779,51 +7277,42 @@ msgid ""
 "message."
 msgstr ""
 
-#: lib/implugin.php:349
 #, php-format
 msgid "Unknown inbox source %d."
 msgstr "Origen de bandeja de entrada %d desconocido."
 
-#: lib/implugin.php:485
-#, fuzzy, php-format
+#, php-format
 msgid "Message too long - maximum is %1$d characters, you sent %2$d."
 msgstr "Mensaje muy largo - máximo %1$d caracteres, enviaste %2$d"
 
-#: lib/leaveform.php:114
 msgid "Leave"
 msgstr "Abandonar"
 
 #. TRANS: Menu item for logging in to the StatusNet site.
-#: lib/logingroupnav.php:77
 msgctxt "MENU"
 msgid "Login"
 msgstr "Inicio de sesión"
 
 #. TRANS: Title for menu item for logging in to the StatusNet site.
-#: lib/logingroupnav.php:79
 msgid "Login with a username and password"
 msgstr "Ingresar con un nombre de usuario y contraseña."
 
 #. TRANS: Menu item for registering with the StatusNet site.
-#: lib/logingroupnav.php:85
 msgctxt "MENU"
 msgid "Register"
 msgstr "Registrarse"
 
 #. TRANS: Title for menu item for registering with the StatusNet site.
-#: lib/logingroupnav.php:87
 msgid "Sign up for a new account"
 msgstr "Registrarse para una nueva cuenta"
 
 #. TRANS: Subject for address confirmation email.
-#: lib/mail.php:172
 msgid "Email address confirmation"
 msgstr "Confirmación de correo electrónico"
 
 #. TRANS: Body for address confirmation email.
 #. TRANS: %1$s is the addressed user's nickname, %2$s is the StatusNet sitename,
 #. TRANS: %3$s is the URL to confirm at.
-#: lib/mail.php:177
 #, fuzzy, php-format
 msgid ""
 "Hey, %1$s.\n"
@@ -8855,14 +7344,12 @@ msgstr ""
 
 #. TRANS: Subject of new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
-#: lib/mail.php:243
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1$s ahora está escuchando tus avisos en %2$s"
 
 #. TRANS: This is a paragraph in a new-subscriber e-mail.
 #. TRANS: %s is a URL where the subscriber can be reported as abusive.
-#: lib/mail.php:250
 #, php-format
 msgid ""
 "If you believe this account is being used abusively, you can block them from "
@@ -8877,7 +7364,6 @@ msgstr ""
 #. TRANS: %3$s is the subscriber's profile URL, %4$s is the subscriber's location (or empty)
 #. TRANS: %5$s is the subscriber's homepage URL (or empty), %6%s is the subscriber's bio (or empty)
 #. TRANS: %7$s is a link to the addressed user's e-mail settings.
-#: lib/mail.php:260
 #, fuzzy, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -8906,14 +7392,12 @@ msgstr ""
 
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is biographical information.
-#: lib/mail.php:283
 #, php-format
 msgid "Bio: %s"
 msgstr "Bio: %s"
 
 #. TRANS: Subject of notification mail for new posting email address.
 #. TRANS: %s is the StatusNet sitename.
-#: lib/mail.php:312
 #, php-format
 msgid "New email address for posting to %s"
 msgstr "Nueva dirección de correo para postear a %s"
@@ -8921,7 +7405,6 @@ msgstr "Nueva dirección de correo para postear a %s"
 #. TRANS: Body of notification mail for new posting email address.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is the e-mail address to send
 #. TRANS: to to post by e-mail, %3$s is a URL to more instructions.
-#: lib/mail.php:318
 #, fuzzy, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -8944,26 +7427,22 @@ msgstr ""
 
 #. TRANS: Subject line for SMS-by-email notification messages.
 #. TRANS: %s is the posting user's nickname.
-#: lib/mail.php:439
 #, php-format
 msgid "%s status"
 msgstr "estado de %s"
 
 #. TRANS: Subject line for SMS-by-email address confirmation message.
-#: lib/mail.php:465
 msgid "SMS confirmation"
 msgstr "SMS confirmación"
 
 #. TRANS: Main body heading for SMS-by-email address confirmation message.
 #. TRANS: %s is the addressed user's nickname.
-#: lib/mail.php:469
 #, php-format
 msgid "%s: confirm you own this phone number with this code:"
 msgstr "%s: Confirma que este es tu número de teléfono mediante este código:"
 
 #. TRANS: Subject for 'nudge' notification email.
 #. TRANS: %s is the nudging user.
-#: lib/mail.php:490
 #, fuzzy, php-format
 msgid "You have been nudged by %s"
 msgstr "%s te ha dado un toque"
@@ -8971,7 +7450,6 @@ msgstr "%s te ha dado un toque"
 #. TRANS: Body for 'nudge' notification email.
 #. TRANS: %1$s is the nuding user's long name, $2$s is the nudging user's nickname,
 #. TRANS: %3$s is a URL to post notices at, %4$s is the StatusNet sitename.
-#: lib/mail.php:497
 #, php-format
 msgid ""
 "%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -9000,7 +7478,6 @@ msgstr ""
 
 #. TRANS: Subject for direct-message notification email.
 #. TRANS: %s is the sending user's nickname.
-#: lib/mail.php:544
 #, php-format
 msgid "New private message from %s"
 msgstr "Nuevo mensaje privado de %s"
@@ -9009,7 +7486,6 @@ msgstr "Nuevo mensaje privado de %s"
 #. TRANS: %1$s is the sending user's long name, %2$s is the sending user's nickname,
 #. TRANS: %3$s is the message content, %4$s a URL to the message,
 #. TRANS: %5$s is the StatusNet sitename.
-#: lib/mail.php:552
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -9044,7 +7520,6 @@ msgstr ""
 
 #. TRANS: Subject for favorite notification e-mail.
 #. TRANS: %1$s is the adding user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:604
 #, fuzzy, php-format
 msgid "%1$s (@%2$s) added your notice as a favorite"
 msgstr "%s (@%s) agregó tu mensaje a los favoritos"
@@ -9054,7 +7529,6 @@ msgstr "%s (@%s) agregó tu mensaje a los favoritos"
 #. TRANS: %3$s is a URL to the faved notice, %4$s is the faved notice text,
 #. TRANS: %5$s is a URL to all faves of the adding user, %6$s is the StatusNet sitename,
 #. TRANS: %7$s is the adding user's nickname.
-#: lib/mail.php:611
 #, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -9092,7 +7566,6 @@ msgstr ""
 "%6$s\n"
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:669
 #, php-format
 msgid ""
 "The full conversation can be read here:\n"
@@ -9105,7 +7578,6 @@ msgstr ""
 
 #. TRANS: E-mail subject for notice notification.
 #. TRANS: %1$s is the sending user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:677
 #, fuzzy, php-format
 msgid "%1$s (@%2$s) sent a notice to your attention"
 msgstr "%s (@%s) ha enviado un aviso a tu atención"
@@ -9116,7 +7588,6 @@ msgstr "%s (@%s) ha enviado un aviso a tu atención"
 #. TRANS: %5$s is a URL to the full conversion if it exists (otherwise empty),
 #. TRANS: %6$s is a URL to reply to the notice, %7$s is a URL to all @-replied for the addressed user,
 #. TRANS: %8$s is a URL to the addressed user's e-mail settings, %9$s is the sender's nickname.
-#: lib/mail.php:685
 #, php-format
 msgid ""
 "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -9166,11 +7637,9 @@ msgstr ""
 "P.D. Puedes desactivar las notificaciones que recibes en tu correo "
 "electrónico aquí: %8$s\n"
 
-#: lib/mailbox.php:87
 msgid "Only the user can read their own mailboxes."
 msgstr "Sólo el usuario puede leer sus bandejas de correo."
 
-#: lib/mailbox.php:125
 msgid ""
 "You have no private messages. You can send private message to engage other "
 "users in conversation. People can send you messages for your eyes only."
@@ -9179,55 +7648,45 @@ msgstr ""
 "otros usuarios partícipes de la conversación. La gente puede enviarte "
 "mensajes que sólo puedas leer tú."
 
-#: lib/mailhandler.php:37
 msgid "Could not parse message."
 msgstr "No se pudo analizar sintácticamente mensaje."
 
-#: lib/mailhandler.php:42
 msgid "Not a registered user."
 msgstr "No es un usuario registrado"
 
-#: lib/mailhandler.php:46
 msgid "Sorry, that is not your incoming email address."
 msgstr "Lo sentimos, pero este no es su dirección de correo entrante."
 
-#: lib/mailhandler.php:50
 msgid "Sorry, no incoming email allowed."
 msgstr "Lo sentimos, pero no se permite correos entrantes"
 
-#: lib/mailhandler.php:229
 #, php-format
 msgid "Unsupported message type: %s"
 msgstr "Tipo de mensaje no compatible: %s"
 
 #. TRANS: Client exception thrown when a database error was thrown during a file upload operation.
-#: lib/mediafile.php:102 lib/mediafile.php:174
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
 "Hubo un error en la base de datos mientras subías tu archivo. Por favor, "
 "inténtalo de nuevo."
 
 #. TRANS: Client exception thrown when a file upload operation would cause a user to exceed a set quota.
-#: lib/mediafile.php:238 lib/mediafile.php:281
 msgid "File exceeds user's quota."
 msgstr "Archivo sobrepasa la cuota del usuario."
 
 #. TRANS: Client exception thrown when a file upload operation fails because the file could
 #. TRANS: not be moved from the temporary folder to the permanent file location.
-#: lib/mediafile.php:258 lib/mediafile.php:300
 msgid "File could not be moved to destination directory."
 msgstr "El archivo no se pudo mover al directorio de destino."
 
 #. TRANS: Client exception thrown when a file upload operation has been stopped because the MIME
 #. TRANS: type of the uploaded file could not be determined.
-#: lib/mediafile.php:265 lib/mediafile.php:306
 msgid "Could not determine file's MIME type."
 msgstr "No se pudo determinar tipo MIME del archivo"
 
 #. TRANS: Client exception thrown trying to upload a forbidden MIME type.
 #. TRANS: %1$s is the file type that was denied, %2$s is the application part of
 #. TRANS: the MIME type that was denied.
-#: lib/mediafile.php:396
 #, php-format
 msgid ""
 "\"%1$s\" is not a supported file type on this server. Try using another %2$s "
@@ -9238,84 +7697,75 @@ msgstr ""
 
 #. TRANS: Client exception thrown trying to upload a forbidden MIME type.
 #. TRANS: %s is the file type that was denied.
-#: lib/mediafile.php:401
 #, php-format
 msgid "\"%s\" is not a supported file type on this server."
 msgstr "\"%s\" no es un tipo de archivo compatible en este servidor."
 
-#: lib/messageform.php:120
 msgid "Send a direct notice"
 msgstr "Enviar un mensaje directo"
 
 #. TRANS Label entry in drop-down selection box in direct-message inbox/outbox. This is the default entry in the drop-down box, doubling as instructions and a brake against accidental submissions with the first user in the list.
-#: lib/messageform.php:137
 #, fuzzy
 msgid "Select recipient:"
 msgstr "Seleccione un operador móvil"
 
 #. TRANS Entry in drop-down selection box in direct-message inbox/outbox when no one is available to message.
-#: lib/messageform.php:150
 #, fuzzy
 msgid "No mutual subscribers."
 msgstr "¡No estás suscrito!"
 
-#: lib/messageform.php:153
 msgid "To"
 msgstr "Para"
 
-#: lib/messageform.php:184 lib/noticeform.php:236
 msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr "Enviar"
 
-#: lib/messagelist.php:77
 #, fuzzy
 msgid "Messages"
 msgstr "Mensaje"
 
-#: lib/messagelistitem.php:123 lib/noticelist.php:527
 msgid "from"
 msgstr "desde"
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:178
 msgid "Nickname cannot be empty."
 msgstr ""
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:191
 #, php-format
 msgid "Nickname cannot be more than %d character long."
 msgid_plural "Nickname cannot be more than %d characters long."
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/noticeform.php:160
+#. TRANS: Form legend for notice form.
 msgid "Send a notice"
 msgstr "Enviar un mensaje"
 
-#: lib/noticeform.php:174
+#. TRANS: Title for notice label. %s is the user's nickname.
 #, php-format
 msgid "What's up, %s?"
 msgstr "¿Qué tal, %s?"
 
-#: lib/noticeform.php:193
+#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr "Adjuntar"
 
-#: lib/noticeform.php:197
-msgid "Attach a file"
+#. TRANS: Title for input field to attach a file to a notice.
+#, fuzzy
+msgid "Attach a file."
 msgstr "Adjuntar un archivo"
 
-#: lib/noticeform.php:212
+#. TRANS: Field label to add location to a notice.
 msgid "Share my location"
 msgstr "Compartir mi ubicación"
 
-#: lib/noticeform.php:215
+#. TRANS: Text to not share location for a notice in notice form.
 msgid "Do not share my location"
 msgstr "No compartir mi ubicación"
 
-#: lib/noticeform.php:216
+#. TRANS: Timeout error text for location retrieval in notice form.
 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
 "try again later"
@@ -9324,418 +7774,317 @@ msgstr ""
 "favor, inténtalo más tarde."
 
 #. TRANS: Used in coordinates as abbreviation of north
-#: lib/noticelist.php:457
 msgid "N"
 msgstr "N"
 
 #. TRANS: Used in coordinates as abbreviation of south
-#: lib/noticelist.php:459
 msgid "S"
 msgstr "S"
 
 #. TRANS: Used in coordinates as abbreviation of east
-#: lib/noticelist.php:461
 msgid "E"
 msgstr "E"
 
 #. TRANS: Used in coordinates as abbreviation of west
-#: lib/noticelist.php:463
 msgid "W"
 msgstr "W"
 
-#: lib/noticelist.php:465
 #, php-format
 msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 
-#: lib/noticelist.php:474
 msgid "at"
 msgstr "en"
 
-#: lib/noticelist.php:523
 msgid "web"
 msgstr "red"
 
-#: lib/noticelist.php:589
 msgid "in context"
 msgstr "en contexto"
 
-#: lib/noticelist.php:624
 msgid "Repeated by"
 msgstr "Repetido por"
 
-#: lib/noticelist.php:651
 msgid "Reply to this notice"
 msgstr "Responder a este mensaje."
 
-#: lib/noticelist.php:652
 msgid "Reply"
 msgstr "Responder"
 
-#: lib/noticelist.php:678
 msgid "Delete this notice"
 msgstr "Borrar este mensaje"
 
-#: lib/noticelist.php:696
 msgid "Notice repeated"
 msgstr "Mensaje repetido"
 
-#: lib/nudgeform.php:116
 msgid "Nudge this user"
 msgstr "Dar un toque a este usuario"
 
-#: lib/nudgeform.php:128
 msgid "Nudge"
 msgstr "Dar un toque a "
 
-#: lib/nudgeform.php:128
 msgid "Send a nudge to this user"
 msgstr "Dar un toque a este usuario"
 
-#: lib/oauthstore.php:294
 msgid "Error inserting new profile."
 msgstr "Error al insertar un nuevo perfil."
 
-#: lib/oauthstore.php:302
 msgid "Error inserting avatar."
 msgstr "Error al insertar el avatar."
 
-#: lib/oauthstore.php:322
 msgid "Error inserting remote profile."
 msgstr "Error al insertar el perfil remoto."
 
 #. TRANS: Exception thrown when a notice is denied because it has been sent before.
-#: lib/oauthstore.php:362
 msgid "Duplicate notice."
 msgstr "Mensaje duplicado."
 
-#: lib/oauthstore.php:507
 msgid "Couldn't insert new subscription."
 msgstr "No se pudo insertar una nueva suscripción."
 
-#: lib/personalgroupnav.php:104
-#, fuzzy
 msgid "Replies"
 msgstr "Respuestas"
 
-#: lib/personalgroupnav.php:109
-#, fuzzy
 msgid "Favorites"
 msgstr "Favoritos"
 
-#: lib/personalgroupnav.php:120
-#, fuzzy
 msgid "Inbox"
 msgstr "Bandeja de Entrada"
 
-#: lib/personalgroupnav.php:121
 msgid "Your incoming messages"
 msgstr "Mensajes entrantes"
 
-#: lib/personalgroupnav.php:125
-#, fuzzy
 msgid "Outbox"
 msgstr "Bandeja de Salida"
 
-#: lib/personalgroupnav.php:126
 msgid "Your sent messages"
 msgstr "Mensajes enviados"
 
 #. TRANS: Title for personal tag cloud section. %s is a user nickname.
-#: lib/personaltagcloudsection.php:56
 #, php-format
 msgid "Tags in %s's notices"
 msgstr "Etiquetas en mensajes de %s"
 
 #. TRANS: Displayed as version information for a plugin if no version information was found.
-#: lib/plugin.php:126
 msgid "Unknown"
 msgstr "Desconocido"
 
 #. TRANS: Plugin admin panel controls
-#: lib/plugindisableform.php:90
 msgctxt "plugin"
 msgid "Disable"
 msgstr ""
 
 #. TRANS: Plugin admin panel controls
-#: lib/pluginenableform.php:112
 msgctxt "plugin"
 msgid "Enable"
 msgstr ""
 
-#: lib/pluginlist.php:196
 msgctxt "plugin-description"
 msgid "(Plugin descriptions unavailable when disabled.)"
 msgstr ""
 
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:88
 msgid "Subscriptions"
 msgstr "Suscripciones"
 
 #. TRANS: Text for user subscription statistics if user has more subscriptions than displayed.
-#: lib/profileaction.php:144
 msgid "All subscriptions"
 msgstr "Todas las suscripciones"
 
 #. TRANS: H2 text for user subscriber statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:96
 msgid "Subscribers"
 msgstr "Suscriptores"
 
 #. TRANS: Text for user subscription statistics if user has more subscribers than displayed.
-#: lib/profileaction.php:181
 msgid "All subscribers"
 msgstr "Todos los suscriptores"
 
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:213
 msgid "User ID"
 msgstr "ID de usuario"
 
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:219
 msgid "Member since"
 msgstr "Miembro desde"
 
 #. TRANS: Label for user statistics.
 #. TRANS: H2 text for user group membership statistics.
-#: lib/profileaction.php:239 lib/profileaction.php:290
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:104
 msgid "Groups"
 msgstr "Grupos"
 
 #. TRANS: Label for user statistics.
 #. TRANS: Average count of posts made per day since account registration.
-#: lib/profileaction.php:253
 msgid "Daily average"
 msgstr "Promedio diario"
 
 #. TRANS: Text for user group membership statistics if user has more subscriptions than displayed.
-#: lib/profileaction.php:305
 msgid "All groups"
 msgstr "Todos los grupos"
 
 #. TRANS: Server error displayed when using an unimplemented method.
-#: lib/profileformaction.php:123
 msgid "Unimplemented method."
 msgstr "Método no implementado."
 
-#: lib/publicgroupnav.php:82
 msgid "User groups"
 msgstr "Grupos de usuario"
 
-#: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
 msgid "Recent tags"
 msgstr "Etiquetas recientes"
 
-#: lib/publicgroupnav.php:88
 msgid "Featured"
 msgstr "Destacado"
 
-#: lib/publicgroupnav.php:92
 msgid "Popular"
 msgstr "Popular"
 
-#: lib/redirectingaction.php:95
 msgid "No return-to arguments."
 msgstr "No hay respuesta a los argumentos."
 
-#: lib/repeatform.php:107
 msgid "Repeat this notice?"
 msgstr "Repetir este mensaje?"
 
-#: lib/repeatform.php:132
 msgid "Yes"
 msgstr "Sí"
 
-#: lib/repeatform.php:132
 msgid "Repeat this notice"
 msgstr "Repetir este mensaje."
 
-#: lib/revokeroleform.php:91
 #, php-format
 msgid "Revoke the \"%s\" role from this user"
 msgstr "Revocar el rol \"%s\" de este usuario"
 
 #. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:1001
 #, fuzzy
 msgid "Page not found."
 msgstr "Método de API no encontrado."
 
-#: lib/sandboxform.php:67
 msgid "Sandbox"
 msgstr "Restringir"
 
-#: lib/sandboxform.php:78
 msgid "Sandbox this user"
 msgstr "Imponer restricciones a este usuario"
 
 #. TRANS: Fieldset legend for the search form.
-#: lib/searchaction.php:120
 msgid "Search site"
 msgstr "Buscar sitio"
 
 #. TRANS: Used as a field label for the field where one or more keywords
 #. TRANS: for searching can be entered.
-#: lib/searchaction.php:128
 msgid "Keyword(s)"
 msgstr "Palabra(s) clave"
 
 #. TRANS: Button text for searching site.
-#: lib/searchaction.php:130
 msgctxt "BUTTON"
 msgid "Search"
 msgstr "Buscar"
 
-#: lib/searchgroupnav.php:80
 msgid "People"
 msgstr "Gente"
 
-#: lib/searchgroupnav.php:81
 msgid "Find people on this site"
 msgstr "Encontrar gente en este sitio"
 
-#: lib/searchgroupnav.php:83
 msgid "Find content of notices"
 msgstr "Buscar en el contenido de mensajes"
 
-#: lib/searchgroupnav.php:85
 msgid "Find groups on this site"
 msgstr "Encontrar grupos en este sitio"
 
-#: lib/section.php:89
 msgid "Untitled section"
 msgstr "Sección sin título"
 
-#: lib/section.php:106
 msgid "More..."
 msgstr "Más..."
 
-#: lib/settingsnav.php:78
 msgid "Change your profile settings"
 msgstr "Cambia tus opciones de perfil"
 
-#: lib/settingsnav.php:83
 msgid "Upload an avatar"
 msgstr "Subir una imagen."
 
-#: lib/settingsnav.php:88
 msgid "Change your password"
 msgstr "Cambia tu contraseña"
 
-#: lib/settingsnav.php:93
 msgid "Change email handling"
 msgstr "Cambiar el manejo del correo."
 
-#: lib/settingsnav.php:98
 msgid "Design your profile"
 msgstr "Diseñar tu perfil"
 
-#: lib/settingsnav.php:102
 msgid "URL"
 msgstr "URL"
 
-#: lib/settingsnav.php:103
 msgid "URL shorteners"
 msgstr ""
 
-#: lib/settingsnav.php:111
 msgid "Updates by instant messenger (IM)"
 msgstr "Actualizaciones por mensajería instantánea"
 
-#: lib/settingsnav.php:118
 msgid "Updates by SMS"
 msgstr "Actualizaciones por sms"
 
-#: lib/settingsnav.php:123
-#, fuzzy
 msgid "Connections"
 msgstr "Conecciones"
 
-#: lib/settingsnav.php:124
 msgid "Authorized connected applications"
 msgstr "Aplicaciones conectadas autorizadas"
 
-#: lib/silenceform.php:67
 msgid "Silence"
 msgstr "Silenciar"
 
-#: lib/silenceform.php:78
 msgid "Silence this user"
 msgstr "Silenciar a este usuario"
 
-#: lib/subgroupnav.php:89
 #, php-format
 msgid "People %s subscribes to"
 msgstr "Personas a las que %s está suscrito"
 
-#: lib/subgroupnav.php:97
 #, php-format
 msgid "People subscribed to %s"
 msgstr "Personas suscritas a %s"
 
-#: lib/subgroupnav.php:105
 #, php-format
 msgid "Groups %s is a member of"
 msgstr "%s es miembro de los grupos"
 
-#: lib/subgroupnav.php:111
 msgid "Invite"
 msgstr "Invitar"
 
-#: lib/subgroupnav.php:112
 #, php-format
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Invita a amigos y colegas a unirse a %s"
 
-#: lib/subscribeform.php:115 lib/subscribeform.php:139
 msgid "Subscribe to this user"
 msgstr "Suscribirse a este usuario"
 
-#: lib/subscriberspeopleselftagcloudsection.php:48
-#: lib/subscriptionspeopleselftagcloudsection.php:48
 msgid "People Tagcloud as self-tagged"
 msgstr "Nube de etiquetas de personas auto-etiquetadas"
 
-#: lib/subscriberspeopletagcloudsection.php:48
-#: lib/subscriptionspeopletagcloudsection.php:48
 msgid "People Tagcloud as tagged"
 msgstr "Nube de etiquetas de personas etiquetadas"
 
-#: lib/tagcloudsection.php:56
 msgid "None"
 msgstr "Ninguno"
 
 #. TRANS: Server exception displayed if a theme name was invalid.
-#: lib/theme.php:74
 #, fuzzy
 msgid "Invalid theme name."
 msgstr "Nombre de archivo inválido."
 
-#: lib/themeuploader.php:50
 msgid "This server cannot handle theme uploads without ZIP support."
 msgstr "Este servidor no puede manejar cargas de temas sin soporte ZIP."
 
-#: lib/themeuploader.php:58 lib/themeuploader.php:61
 msgid "The theme file is missing or the upload failed."
 msgstr "El archivo de tema está perdido o la carga falló."
 
-#: lib/themeuploader.php:91 lib/themeuploader.php:102
-#: lib/themeuploader.php:279 lib/themeuploader.php:283
-#: lib/themeuploader.php:291 lib/themeuploader.php:298
 msgid "Failed saving theme."
 msgstr "Grabado de tema errado."
 
-#: lib/themeuploader.php:147
 msgid "Invalid theme: bad directory structure."
 msgstr "Tema inválido: mala estructura de directorio."
 
-#: lib/themeuploader.php:166
 #, fuzzy, php-format
 msgid "Uploaded theme is too large; must be less than %d byte uncompressed."
 msgid_plural ""
@@ -9745,11 +8094,9 @@ msgstr[0] ""
 msgstr[1] ""
 "Tema subido es demasiado grande; debe ser menor que %d bytes sin comprimir."
 
-#: lib/themeuploader.php:179
 msgid "Invalid theme archive: missing file css/display.css"
 msgstr "Archivo de tema inválido: archivo perdido css/display.css"
 
-#: lib/themeuploader.php:219
 msgid ""
 "Theme contains invalid file or folder name. Stick with ASCII letters, "
 "digits, underscore, and minus sign."
@@ -9757,144 +8104,116 @@ msgstr ""
 "El tema contiene archivo o nombre de carpeta inválido. Restrínjase a letras "
 "ASCII, dígitos, carácter de subrayado, y signo menos."
 
-#: lib/themeuploader.php:225
 msgid "Theme contains unsafe file extension names; may be unsafe."
 msgstr ""
 "El tema contiene nombres de extensiones de archivo inseguras y puede ser "
 "peligroso."
 
-#: lib/themeuploader.php:242
 #, php-format
 msgid "Theme contains file of type '.%s', which is not allowed."
 msgstr "El tema contiene archivo de tipo '.%s', que no está permitido."
 
-#: lib/themeuploader.php:260
 msgid "Error opening theme archive."
 msgstr "Error al abrir archivo de tema."
 
-#: lib/threadednoticelist.php:270
 #, php-format
-msgid "Show all %d comment"
-msgid_plural "Show all %d comments"
+msgid "Show %d reply"
+msgid_plural "Show all %d replies"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/topposterssection.php:74
 msgid "Top posters"
 msgstr "Principales posteadores"
 
 #. TRANS: Title for the form to unblock a user.
-#: lib/unblockform.php:67
 #, fuzzy
 msgctxt "TITLE"
 msgid "Unblock"
 msgstr "Desbloquear"
 
-#: lib/unsandboxform.php:69
 msgid "Unsandbox"
 msgstr "Eliminar restricciones"
 
-#: lib/unsandboxform.php:80
 msgid "Unsandbox this user"
 msgstr "Eliminar restricciones impuestas a este usuario"
 
-#: lib/unsilenceform.php:67
 msgid "Unsilence"
 msgstr "Dejar de silenciar"
 
-#: lib/unsilenceform.php:78
 msgid "Unsilence this user"
 msgstr "Dejar de silenciar este usuario"
 
-#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
 msgid "Unsubscribe from this user"
 msgstr "Desuscribirse de este usuario"
 
-#: lib/unsubscribeform.php:137
 msgid "Unsubscribe"
 msgstr "Cancelar suscripción"
 
 #. 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).
-#: lib/usernoprofileexception.php:60
 #, fuzzy, php-format
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "El usuario no tiene un perfil."
 
-#: lib/userprofile.php:116
 msgid "Edit Avatar"
 msgstr "Editar imagen"
 
 #. TRANS: H2 for user actions in a profile.
 #. TRANS: H2 for entity actions in a profile.
-#: lib/userprofile.php:216 lib/userprofile.php:232
 msgid "User actions"
 msgstr "Acciones de usuario"
 
 #. TRANS: Text shown in user profile of not yet compeltely deleted users.
-#: lib/userprofile.php:220
 msgid "User deletion in progress..."
 msgstr "Eliminación de usuario en curso..."
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:248
 msgid "Edit profile settings"
 msgstr "Editar configuración del perfil"
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:250
 msgid "Edit"
 msgstr "Editar"
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:274
 msgid "Send a direct message to this user"
 msgstr "Enviar un mensaje directo a este usuario"
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:276
 msgid "Message"
 msgstr "Mensaje"
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:318
 msgid "Moderate"
 msgstr "Moderar"
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:357
 msgid "User role"
 msgstr "Rol de usuario"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:360
 msgctxt "role"
 msgid "Administrator"
 msgstr "Administrador"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:362
 msgctxt "role"
 msgid "Moderator"
 msgstr "Moderador"
 
-#: lib/util.php:321
 #, fuzzy
 msgid "Not allowed to log in."
 msgstr "No conectado."
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1337
 msgid "a few seconds ago"
 msgstr "hace unos segundos"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1340
 msgid "about a minute ago"
 msgstr "hace un minuto"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1344
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
@@ -9902,12 +8221,10 @@ msgstr[0] "hace aproximadamente un minuto"
 msgstr[1] "hace aproximadamente %d minutos"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1347
 msgid "about an hour ago"
 msgstr "hace una hora"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1351
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
@@ -9915,12 +8232,10 @@ msgstr[0] "hace aproximadamente una hora"
 msgstr[1] "hace aproximadamente %d horas"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1354
 msgid "about a day ago"
 msgstr "hace un día"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1358
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
@@ -9928,12 +8243,10 @@ msgstr[0] "hace aproximadamente un día"
 msgstr[1] "hace aproximadamente %d días"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1361
 msgid "about a month ago"
 msgstr "hace un mes"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1365
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
@@ -9941,206 +8254,42 @@ msgstr[0] "hace aproximadamente un mes"
 msgstr[1] "hace aproximadamente %d meses"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1368
 msgid "about a year ago"
 msgstr "hace un año"
 
 #. TRANS: Web color exception thrown when a hexadecimal color code does not validate.
 #. TRANS: %s is the provided (invalid) color code.
-#: lib/webcolor.php:81 lib/webcolor.php:121
 #, fuzzy, php-format
 msgid "%s is not a valid color! Use 3 or 6 hex characters."
 msgstr "%s no es un color válido! Usar 3 o 6 caracteres hexagesimales"
 
 #. TRANS: Exception.
-#: lib/xrd.php:63
 #, fuzzy
 msgid "Invalid XML."
 msgstr "Tamaño inválido."
 
 #. TRANS: Exception.
-#: lib/xrd.php:68
 msgid "Invalid XML, missing XRD root."
 msgstr ""
 
 #. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
-#: scripts/restoreuser.php:62
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
 
-#, fuzzy
-#~ msgid "Could not generate feed for group - %s"
-#~ msgstr "No se pudo actualizar el grupo."
+#~ msgid "Full name is too long (max 255 chars)."
+#~ msgstr "Tu nombre es demasiado largo (max. 255 carac.)"
+
+#~ msgid "description is too long (max %d chars)."
+#~ msgstr "La descripción es muy larga (máx. %d caracteres)."
+
+#~ msgid "Location is too long (max 255 chars)."
+#~ msgstr "La ubicación es demasiado larga (máx. 255 caracteres)."
+
+#~ msgid "Too many aliases! Maximum %d."
+#~ msgstr "¡Muchos seudónimos! El máximo es %d."
 
 #, fuzzy
-#~ msgid "Current confirmed Jabber/Google Talk address."
-#~ msgstr "Dirección actual Jabber/Gtalk confirmada."
-
-#, fuzzy
-#~ msgid ""
-#~ "Jabber or Google Talk address, like \"UserName@example.org\". First, make "
-#~ "sure to add %s to your buddy list in your IM client or on Google Talk."
-#~ msgstr ""
-#~ "Dirección Jabber o GTalk, por ejemplo \"NombreUsuario@example.org\". "
-#~ "Primero, asegúrate de agregar a %s a tu lista de amigos en tu cliente de "
-#~ "mensajería instantánea o en GTalk."
-
-#, fuzzy
-#~ msgid "Send me notices through Jabber/Google Talk."
-#~ msgstr "Enviarme mensajes por Jabber/GTalk"
-
-#, fuzzy
-#~ msgid "Publish a MicroID for my Jabber/Google Talk address."
-#~ msgstr "Publicar un MicroID para mi cuenta Jabber/GTalk."
-
-#~ msgid "No Jabber ID."
-#~ msgstr "Ningún Jabber ID."
-
-#, fuzzy
-#~ msgid "Not a valid Jabber ID."
-#~ msgstr "Jabber ID no válido"
-
-#~ msgid "That is already your Jabber ID."
-#~ msgstr "Ese ya es tu Jabber ID."
-
-#~ msgid "That is not your Jabber ID."
-#~ msgstr "Ese no es tu Jabber ID."
-
-#~ msgid "Other settings"
-#~ msgstr "Otros ajustes"
-
-#~ msgid "Tag cloud"
-#~ msgstr "Nube de etiquetas"
-
-#~ msgid "Consumer key"
-#~ msgstr "Clave del consumidor"
-
-#~ msgid "Consumer secret"
-#~ msgstr "Secreto del consumidor"
-
-#~ msgid "Request token URL"
-#~ msgstr "URL del token de solicitud"
-
-#~ msgid "Access token URL"
-#~ msgstr "URL del token de acceso"
-
-#~ msgid "Authorize URL"
-#~ msgstr "Autorizar URL"
-
-#~ msgid "Jabber"
-#~ msgstr "Jabber"
-
-#~ msgid "Photo"
-#~ msgstr "Foto"
-
-#~ msgid "Other options"
-#~ msgstr "Otras opciones"
-
-#~ msgid "Other"
-#~ msgstr "Otro"
-
-#~ msgid "Primary site navigation"
-#~ msgstr "Navegación de sitio primario"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Personal profile and friends timeline"
-#~ msgstr "Perfil personal y línea temporal de amistades"
-
-#~ msgctxt "MENU"
-#~ msgid "Personal"
-#~ msgstr "Personal"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Change your email, avatar, password, profile"
-#~ msgstr "Cambia tu correo electrónico, imagen, contraseña, perfil"
-
-#~ msgid "Account"
-#~ msgstr "Cuenta"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Connect to services"
-#~ msgstr "Conectar a los servicios"
-
-#~ msgid "Connect"
-#~ msgstr "Conectarse"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Change site configuration"
-#~ msgstr "Cambiar la configuración del sitio"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Invite friends and colleagues to join you on %s"
-#~ msgstr "Invita a amistades y compañeros a unirse a tí en %s"
-
-#~ msgctxt "MENU"
-#~ msgid "Invite"
-#~ msgstr "Invitar"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Create an account"
-#~ msgstr "Crear una cuenta"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Help me!"
-#~ msgstr "¡Ayúdame!"
-
-#~ msgctxt "MENU"
-#~ msgid "Help"
-#~ msgstr "Ayuda"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Search for people or text"
-#~ msgstr "Buscar personas o texto"
-
-#~ msgid "Local views"
-#~ msgstr "Vistas locales"
-
-#~ msgid "Page notice"
-#~ msgstr "Mensaje de página"
-
-#~ msgid "Secondary site navigation"
-#~ msgstr "Navegación de sitio secundario"
-
-#~ msgid "StatusNet software license"
-#~ msgstr "Licencia de software de StatusNet"
-
-#~ msgid "Site content license"
-#~ msgstr "Licencia de contenido del sitio"
-
-#~ msgid "Pagination"
-#~ msgstr "Paginación"
-
-#~ msgid "Author"
-#~ msgstr "Autor"
-
-#~ msgid "Provider"
-#~ msgstr "Proveedor"
-
-#, fuzzy
-#~ msgctxt "MENU"
-#~ msgid "SMS"
-#~ msgstr "SMS"
-
-#~ msgid "Filter tags"
-#~ msgstr "Filtrar etiquetas"
-
-#~ msgid "[%s]"
-#~ msgstr "[%s]"
-
-#~ msgid "Available characters"
-#~ msgstr "Caracteres disponibles"
-
-#, fuzzy
-#~ msgctxt "MENU"
-#~ msgid "Profile"
-#~ msgstr "Perfil"
-
-#~ msgid "Search help"
-#~ msgstr "Buscar ayuda"
-
-#, fuzzy
-#~ msgid "Message too long. Maximum is %1$d character, you sent %2$d."
-#~ msgid_plural "Message too long. Maximum is %1$d characters, you sent %2$d."
-#~ msgstr[0] "Mensaje muy largo - máximo %1$d caracteres, enviaste %2$d"
-#~ msgstr[1] "Mensaje muy largo - máximo %1$d caracteres, enviaste %2$d"
+#~ msgctxt "BUTTON"
+#~ msgid "Comment"
+#~ msgstr "Contenido"
diff --git a/locale/fa/LC_MESSAGES/statusnet.po b/locale/fa/LC_MESSAGES/statusnet.po
index f316c5ce1b..a103a57df9 100644
--- a/locale/fa/LC_MESSAGES/statusnet.po
+++ b/locale/fa/LC_MESSAGES/statusnet.po
@@ -15,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:23+0000\n"
-"PO-Revision-Date: 2011-03-03 17:25:57+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:17+0000\n"
 "Last-Translator: Ahmad Sufi Mahmudi\n"
 "Language-Team: Persian <http://translatewiki.net/wiki/Portal:fa>\n"
 "MIME-Version: 1.0\n"
@@ -25,59 +25,49 @@ msgstr ""
 "X-Language-Code: fa\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
-"X-POT-Import-Date: 2011-02-25 23:49:23+0000\n"
+"X-POT-Import-Date: 2011-03-03 17:59:19+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
-#: actions/accessadminpanel.php:53 lib/adminpanelaction.php:363
 msgid "Access"
 msgstr "دسترسی"
 
 #. TRANS: Page notice.
-#: actions/accessadminpanel.php:64
 msgid "Site access settings"
 msgstr "تنظیمات دسترسی وب‌گاه"
 
 #. TRANS: Form legend for registration form.
-#: actions/accessadminpanel.php:151
 msgid "Registration"
 msgstr "نام‌نویسی"
 
 #. TRANS: Checkbox instructions for admin setting "Private".
-#: actions/accessadminpanel.php:155
 msgid "Prohibit anonymous users (not logged in) from viewing site?"
 msgstr "از دیدن وب‌گاه توسط کاربران ناشناس (وارد نشده) جلوگیری شود؟"
 
 #. TRANS: Checkbox label for prohibiting anonymous users from viewing site.
-#: actions/accessadminpanel.php:157
 msgctxt "LABEL"
 msgid "Private"
 msgstr "خصوصی"
 
 #. TRANS: Checkbox instructions for admin setting "Invite only".
-#: actions/accessadminpanel.php:164
 msgid "Make registration invitation only."
 msgstr "نام‌نویسی تنها با دعوت‌نامه انجام شود."
 
 #. TRANS: Checkbox label for configuring site as invite only.
-#: actions/accessadminpanel.php:166
 msgid "Invite only"
 msgstr "تنها دعوت کردن"
 
 #. TRANS: Checkbox instructions for admin setting "Closed" (no new registrations).
-#: actions/accessadminpanel.php:173
 msgid "Disable new registrations."
 msgstr "غیر فعال کردن نام‌نوبسی تازه"
 
 #. TRANS: Checkbox label for disabling new user registrations.
-#: actions/accessadminpanel.php:175
 msgid "Closed"
 msgstr "بسته‌شده"
 
 #. TRANS: Title for button to save access settings in site admin panel.
-#: actions/accessadminpanel.php:191
 msgid "Save access settings"
 msgstr "ذخیرهٔ تنظیمات دسترسی"
 
@@ -85,6 +75,7 @@ msgstr "ذخیرهٔ تنظیمات دسترسی"
 #. TRANS: Button text for saving theme settings.
 #. TRANS: Button label to save e-mail preferences.
 #. TRANS: Button label to save IM preferences.
+#. TRANS: Button text in the license admin panel.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
 #. TRANS: Button text for saving site notice in admin panel.
@@ -94,21 +85,12 @@ msgstr "ذخیرهٔ تنظیمات دسترسی"
 #. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
 #. TRANS: Button text on profile design page to save settings.
-#: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
-#: actions/emailsettings.php:251 actions/imsettings.php:199
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:198
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:204
-#: actions/subscriptions.php:261 actions/urlsettings.php:152
-#: actions/useradminpanel.php:298 lib/applicationeditform.php:355
-#: lib/designform.php:320 lib/groupeditform.php:201
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "ذخیره"
 
 #. TRANS: Server error when page not found (404).
 #. TRANS: Server error when page not found (404)
-#: actions/all.php:68 actions/public.php:98 actions/replies.php:93
-#: actions/showfavorites.php:140 actions/tag.php:52
 msgid "No such page."
 msgstr "چنین صفحه‌ای وجود ندارد."
 
@@ -127,6 +109,7 @@ msgstr "چنین صفحه‌ای وجود ندارد."
 #. TRANS: Client error displayed when checking group membership for a non-existing user.
 #. TRANS: Client error displayed when trying to have a non-existing user join a group.
 #. TRANS: Client error displayed when trying to have a non-existing user leave a group.
+#. TRANS: Client error displayed when not providing a user or an invalid user.
 #. TRANS: Client error displayed when updating a status for a non-existing user.
 #. TRANS: Client error displayed when requesting a list of followers for a non-existing user.
 #. TRANS: Client error displayed when requesting most recent favourite notices by a user for a non-existing user.
@@ -139,6 +122,8 @@ msgstr "چنین صفحه‌ای وجود ندارد."
 #. 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.
 #. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
@@ -146,33 +131,10 @@ msgstr "چنین صفحه‌ای وجود ندارد."
 #. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when calling a profile action without specifying a user.
-#: actions/all.php:80 actions/allrss.php:69
-#: actions/apiaccountupdatedeliverydevice.php:110
-#: actions/apiaccountupdateprofile.php:103
-#: actions/apiaccountupdateprofilebackgroundimage.php:118
-#: actions/apiaccountupdateprofileimage.php:104 actions/apiatomservice.php:59
-#: actions/apiblockcreate.php:96 actions/apiblockdestroy.php:94
-#: actions/apidirectmessage.php:75 actions/apidirectmessagenew.php:72
-#: actions/apigroupcreate.php:111 actions/apigroupismember.php:89
-#: actions/apigroupjoin.php:98 actions/apigroupleave.php:98
-#: actions/apigrouplist.php:70 actions/apigroupprofileupdate.php:108
-#: actions/apistatusesupdate.php:230 actions/apisubscriptions.php:85
-#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:173
-#: actions/apitimelinehome.php:78 actions/apitimelinementions.php:77
-#: actions/apitimelineuser.php:79 actions/avatarbynickname.php:79
-#: actions/favoritesrss.php:72 actions/foaf.php:42 actions/foaf.php:61
-#: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116
-#: actions/otp.php:78 actions/remotesubscribe.php:144
-#: actions/remotesubscribe.php:153 actions/replies.php:73
-#: actions/repliesrss.php:38 actions/rsd.php:113 actions/showfavorites.php:106
-#: actions/userbyid.php:75 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/userxrd.php:59 actions/xrds.php:71 lib/command.php:509
-#: lib/galleryaction.php:59 lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "چنین کاربری وجود ندارد."
 
 #. TRANS: Page title. %1$s is user nickname, %2$d is page number
-#: actions/all.php:91
 #, php-format
 msgid "%1$s and friends, page %2$d"
 msgstr "%1$s و دوستان، صفحهٔ %2$d"
@@ -181,33 +143,26 @@ msgstr "%1$s و دوستان، صفحهٔ %2$d"
 #. TRANS: H1 text for page. %s is a user nickname.
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Timeline title for user and friends. %s is a user nickname.
-#: actions/all.php:94 actions/all.php:191 actions/allrss.php:117
-#: actions/apitimelinefriends.php:207 actions/apitimelinehome.php:113
-#: lib/personalgroupnav.php:100
 #, php-format
 msgid "%s and friends"
 msgstr "%s و دوستان"
 
 #. TRANS: %s is user nickname.
-#: actions/all.php:108
 #, php-format
 msgid "Feed for friends of %s (RSS 1.0)"
 msgstr "خوراک دوستان %s (RSS 1.0)"
 
 #. TRANS: %s is user nickname.
-#: actions/all.php:117
 #, php-format
 msgid "Feed for friends of %s (RSS 2.0)"
 msgstr "خوراک دوستان %s (RSS 2.0)"
 
 #. TRANS: %s is user nickname.
-#: actions/all.php:126
 #, php-format
 msgid "Feed for friends of %s (Atom)"
 msgstr "خوراک دوستان %s (Atom)"
 
 #. TRANS: Empty list message. %s is a user nickname.
-#: actions/all.php:139
 #, php-format
 msgid ""
 "This is the timeline for %s and friends but no one has posted anything yet."
@@ -215,7 +170,6 @@ msgstr "این خط‌زمانی %s و دوستانش است، اما هیچ‌
 
 #. TRANS: Encouragement displayed on logged in user's empty timeline.
 #. TRANS: This message contains Markdown links. Keep "](" together.
-#: actions/all.php:146
 #, php-format
 msgid ""
 "Try subscribing to more people, [join a group](%%action.groups%%) or post "
@@ -226,7 +180,6 @@ msgstr ""
 
 #. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@".
 #. TRANS: This message contains Markdown links. Keep "](" together.
-#: actions/all.php:150
 #, php-format
 msgid ""
 "You can try to [nudge %1$s](../%2$s) from their profile or [post something "
@@ -239,7 +192,6 @@ msgstr ""
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
 #. TRANS: Second sentence of empty message for anonymous users. %s is a user nickname.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:221
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -249,14 +201,11 @@ msgstr ""
 "باشید که چیزی می‌فرستد!"
 
 #. TRANS: H1 text for page when viewing a list for self.
-#: actions/all.php:188
 msgid "You and friends"
 msgstr "شما و دوستان"
 
 #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
 #. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name.
-#: actions/allrss.php:122 actions/apitimelinefriends.php:213
-#: actions/apitimelinehome.php:119
 #, php-format
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr "به روز رسانی از %1$s و دوستان در %2$s"
@@ -275,55 +224,20 @@ msgstr "به روز رسانی از %1$s و دوستان در %2$s"
 #. TRANS: Client error displayed trying to execute an unknown API method checking group membership.
 #. TRANS: Client error displayed trying to execute an unknown API method listing the latest 20 groups.
 #. TRANS: Client error displayed trying to execute an unknown API method showing group membership.
+#. TRANS: Client error displayed when using an unsupported API format.
 #. TRANS: Client error displayed trying to execute an unknown API method showing a group.
 #. TRANS: Client error displayed trying to execute an unknown API method testing API connectivity.
 #. TRANS: Client error displayed trying to execute an unknown API method deleting a status.
 #. TRANS: Client error displayed when trying to handle an unknown API method.
-#: actions/apiaccountratelimitstatus.php:69
-#: actions/apiaccountupdatedeliverydevice.php:92
-#: actions/apiaccountupdateprofile.php:94
-#: actions/apiaccountupdateprofilebackgroundimage.php:92
-#: actions/apiaccountupdateprofilecolors.php:115
-#: actions/apiaccountverifycredentials.php:68 actions/apidirectmessage.php:157
-#: actions/apifavoritecreate.php:98 actions/apifavoritedestroy.php:98
-#: actions/apifriendshipscreate.php:99 actions/apifriendshipsdestroy.php:99
-#: actions/apifriendshipsshow.php:124 actions/apigroupcreate.php:138
-#: actions/apigroupismember.php:115 actions/apigroupjoin.php:151
-#: actions/apigroupleave.php:141 actions/apigrouplist.php:134
-#: actions/apigrouplistall.php:120 actions/apigroupmembership.php:105
-#: actions/apigroupprofileupdate.php:100 actions/apigroupprofileupdate.php:213
-#: actions/apigroupshow.php:114 actions/apihelptest.php:84
-#: actions/apistatusesdestroy.php:101 actions/apistatusesretweets.php:110
-#: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:139
-#: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
-#: actions/apitimelinefavorites.php:182 actions/apitimelinefriends.php:276
-#: actions/apitimelinegroup.php:148 actions/apitimelinehome.php:181
-#: actions/apitimelinementions.php:182 actions/apitimelinepublic.php:247
-#: actions/apitimelineretweetedtome.php:147
-#: actions/apitimelineretweetsofme.php:147 actions/apitimelinetag.php:165
-#: actions/apitimelineuser.php:217 actions/apiusershow.php:100
 msgid "API method not found."
 msgstr "رابط مورد نظر پیدا نشد."
 
 #. 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.
-#: actions/apiaccountupdatedeliverydevice.php:83
-#: actions/apiaccountupdateprofile.php:85
-#: actions/apiaccountupdateprofilebackgroundimage.php:83
-#: actions/apiaccountupdateprofilecolors.php:106
-#: actions/apiaccountupdateprofileimage.php:80 actions/apiblockcreate.php:87
-#: actions/apiblockdestroy.php:85 actions/apidirectmessagenew.php:107
-#: actions/apifavoritecreate.php:88 actions/apifavoritedestroy.php:88
-#: actions/apifriendshipscreate.php:89 actions/apifriendshipsdestroy.php:89
-#: actions/apigroupcreate.php:102 actions/apigroupjoin.php:89
-#: actions/apigroupleave.php:89 actions/apigroupprofileupdate.php:92
-#: actions/apimediaupload.php:66 actions/apistatusesretweet.php:63
-#: actions/apistatusesupdate.php:194
 msgid "This method requires a POST."
 msgstr "برای استفاده از این روش باید اطلاعات را به صورت پست بفرستید"
 
 #. TRANS: Client error displayed when no valid device parameter is provided for a user's delivery device setting.
-#: actions/apiaccountupdatedeliverydevice.php:103
 msgid ""
 "You must specify a parameter named 'device' with a value of one of: sms, im, "
 "none."
@@ -337,10 +251,6 @@ msgstr ""
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
-#: actions/apiaccountupdatedeliverydevice.php:136
-#: actions/emailsettings.php:353 actions/emailsettings.php:499
-#: actions/profilesettings.php:323 actions/smssettings.php:300
-#: actions/smssettings.php:453 actions/urlsettings.php:211
 msgid "Could not update user."
 msgstr "نمی‌توان کاربر را به‌هنگام‌سازی کرد."
 
@@ -353,32 +263,17 @@ msgstr "نمی‌توان کاربر را به‌هنگام‌سازی کرد."
 #. TRANS: Server error displayed when requesting Friends of a Friend feed for a user for which the profile could not be found.
 #. TRANS: Server error displayed when trying to get a user hCard for a user without a profile.
 #. TRANS: Server error displayed when calling a profile action while the specified user does not have a profile.
-#: actions/apiaccountupdateprofile.php:111
-#: actions/apiaccountupdateprofilebackgroundimage.php:199
-#: actions/apiaccountupdateprofilecolors.php:183
-#: actions/apiaccountupdateprofileimage.php:131
-#: actions/apiuserprofileimage.php:88 actions/apiusershow.php:108
-#: actions/avatarbynickname.php:85 actions/foaf.php:69 actions/hcard.php:75
-#: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
-#: lib/profileaction.php:85
 msgid "User has no profile."
 msgstr "کاربر هیچ نمایه‌ای ندارد."
 
 #. TRANS: Server error displayed if a user profile could not be saved.
 #. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:419
 msgid "Could not save profile."
 msgstr "نمی‌توان نمایه را ذخیره کرد."
 
 #. TRANS: Client error displayed when the number of bytes in a POST request exceeds a limit.
 #. TRANS: %s is the number of bytes of the CONTENT_LENGTH.
 #. TRANS: Form validation error in design settings form. POST should remain untranslated.
-#: actions/apiaccountupdateprofilebackgroundimage.php:108
-#: actions/apiaccountupdateprofileimage.php:95 actions/apimediaupload.php:81
-#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
-#: actions/designadminpanel.php:120 actions/editapplication.php:121
-#: actions/newapplication.php:102 actions/newnotice.php:95
-#: lib/designsettings.php:110
 #, fuzzy, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s byte) due to its "
@@ -394,26 +289,15 @@ msgstr[0] ""
 #. TRANS: Client error displayed when a database error occurs inserting profile colours.
 #. TRANS: Client error displayed when a database error occurs updating profile colours.
 #. TRANS: Form validation error displayed when group design settings could not be saved because of an application issue.
-#: actions/apiaccountupdateprofilebackgroundimage.php:138
-#: actions/apiaccountupdateprofilebackgroundimage.php:149
-#: actions/apiaccountupdateprofilecolors.php:160
-#: actions/apiaccountupdateprofilecolors.php:171
-#: actions/groupdesignsettings.php:285 actions/groupdesignsettings.php:296
-#: actions/userdesignsettings.php:218 actions/userdesignsettings.php:228
-#: actions/userdesignsettings.php:270 actions/userdesignsettings.php:280
 msgid "Unable to save your design settings."
 msgstr "نمی‌توان تنظیمات طرح‌تان را ذخیره کرد."
 
 #. TRANS: Error displayed when updating design settings fails.
 #. TRANS: Client error displayed when a database error occurs updating profile colours.
-#: actions/apiaccountupdateprofilebackgroundimage.php:191
-#: actions/apiaccountupdateprofilecolors.php:139
-#: actions/userdesignsettings.php:196
 msgid "Could not update your design."
 msgstr "نمی‌توان طرح‌تان به‌هنگام‌سازی کرد."
 
 #. TRANS: Title for Atom feed.
-#: actions/apiatomservice.php:85
 #, fuzzy
 msgctxt "ATOM"
 msgid "Main"
@@ -423,9 +307,6 @@ msgstr "اصلی"
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Title in atom group notice feed. %s is a group name.
 #. TRANS: Title in atom user notice feed. %s is a user name.
-#: actions/apiatomservice.php:93 actions/grouprss.php:138
-#: actions/userrss.php:94 lib/atomgroupnoticefeed.php:63
-#: lib/atomusernoticefeed.php:88
 #, php-format
 msgid "%s timeline"
 msgstr "خط‌زمانی %s"
@@ -435,8 +316,6 @@ msgstr "خط‌زمانی %s"
 #. TRANS: %s is a user nickname.
 #. TRANS: Header for subscriptions overview for a user (first page).
 #. TRANS: %s is a user nickname.
-#: actions/apiatomservice.php:104 actions/atompubsubscriptionfeed.php:148
-#: actions/subscriptions.php:51
 #, php-format
 msgid "%s subscriptions"
 msgstr "%s اشتراک"
@@ -444,58 +323,48 @@ msgstr "%s اشتراک"
 #. TRANS: Title for Atom feed with a user's favorite notices. %s is a user nickname.
 #. TRANS: Title for Atom favorites feed.
 #. TRANS: %s is a user nickname.
-#: actions/apiatomservice.php:115 actions/atompubfavoritefeed.php:142
 #, fuzzy, php-format
 msgid "%s favorites"
 msgstr "برگزیده‌ها"
 
 #. TRANS: Title for Atom feed with a user's memberships. %s is a user nickname.
-#: actions/apiatomservice.php:126
 #, fuzzy, php-format
 msgid "%s memberships"
 msgstr "اعضای گروه %s"
 
 #. TRANS: Client error displayed when users try to block themselves.
-#: actions/apiblockcreate.php:105
 msgid "You cannot block yourself!"
 msgstr "شما نمی‌توانید خودتان رو مسدود کنید!"
 
 #. TRANS: Server error displayed when blocking a user has failed.
-#: actions/apiblockcreate.php:127
 msgid "Block user failed."
 msgstr "مسدود کردن کاربر شکست خورد."
 
 #. TRANS: Server error displayed when unblocking a user has failed.
-#: actions/apiblockdestroy.php:113
 msgid "Unblock user failed."
 msgstr "باز کردن کاربر ناموفق بود."
 
 #. TRANS: Title. %s is a user nickname.
-#: actions/apidirectmessage.php:88
 #, php-format
 msgid "Direct messages from %s"
 msgstr "پیام‌های مستقیم از %s"
 
 #. TRANS: Subtitle. %s is a user nickname.
-#: actions/apidirectmessage.php:93
 #, php-format
 msgid "All the direct messages sent from %s"
 msgstr "تمام پیام‌های مستقیم فرستاده‌شده از %s"
 
 #. TRANS: Title. %s is a user nickname.
-#: actions/apidirectmessage.php:102
 #, php-format
 msgid "Direct messages to %s"
 msgstr "پیام‌های مستقیم به %s"
 
 #. TRANS: Subtitle. %s is a user nickname.
-#: actions/apidirectmessage.php:107
 #, php-format
 msgid "All the direct messages sent to %s"
 msgstr "تمام پیام‌های مستقیم فرستاده‌شده به %s"
 
 #. TRANS: Client error displayed when no message text was submitted (406).
-#: actions/apidirectmessagenew.php:117
 msgid "No message text!"
 msgstr "هیچ پیام متنی وجود ندارد!"
 
@@ -503,25 +372,21 @@ msgstr "هیچ پیام متنی وجود ندارد!"
 #. TRANS: %d is the maximum number of characters for a message.
 #. TRANS: Form validation error displayed when message content is too long.
 #. TRANS: %d is the maximum number of characters for a message.
-#: actions/apidirectmessagenew.php:127 actions/newmessage.php:152
 #, fuzzy, php-format
 msgid "That's too long. Maximum message size is %d character."
 msgid_plural "That's too long. Maximum message size is %d characters."
 msgstr[0] "این بسیار طولانی است. بیشینهٔ اندازهٔ پیام %d نویسه است."
 
 #. TRANS: Client error displayed if a recipient user could not be found (403).
-#: actions/apidirectmessagenew.php:139
 msgid "Recipient user not found."
 msgstr "کاربر گیرنده یافت نشد."
 
 #. TRANS: Client error displayed trying to direct message another user who's not a friend (403).
-#: actions/apidirectmessagenew.php:144
 #, fuzzy
 msgid "Cannot send direct messages to users who aren't your friend."
 msgstr "نمی‌توان پیام مستقیم را به کاربرانی که دوست شما نیستند، فرستاد."
 
 #. TRANS: Client error displayed trying to direct message self (403).
-#: actions/apidirectmessagenew.php:154
 #, fuzzy
 msgid ""
 "Do not send a message to yourself; just say it to yourself quietly instead."
@@ -530,118 +395,98 @@ 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.
 #. TRANS: Client error displayed trying to delete a status with an invalid ID.
-#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:108
-#: actions/apistatusesdestroy.php:121
 msgid "No status found with that ID."
 msgstr "هیچ وضعیتی با آن شناسه پیدا نشد."
 
 #. TRANS: Client error displayed when trying to mark a notice favourite that already is a favourite.
-#: actions/apifavoritecreate.php:120
 msgid "This status is already a favorite."
 msgstr "این پیغام را پیش‌تر به برگزیده‌های خود اضافه کرده‌اید"
 
 #. TRANS: Client error displayed when marking a notice as favourite fails.
 #. TRANS: Server error displayed when trying to mark a notice as favorite fails in the database.
 #. TRANS: Error message text shown when a favorite could not be set.
-#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:306
 msgid "Could not create favorite."
 msgstr "نمی‌توان پیام را برگزید."
 
 #. TRANS: Client error displayed when trying to remove a favourite that was not a favourite.
-#: actions/apifavoritedestroy.php:122
 msgid "That status is not a favorite."
 msgstr "این پیام یک پیام برگزیده نیست."
 
 #. TRANS: Client error displayed when removing a favourite has failed.
 #. TRANS: Server error displayed when removing a favorite from the database fails.
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:90
 msgid "Could not delete favorite."
 msgstr "نمی‌توان پیام برگزیده را حذف کرد."
 
 #. TRANS: Client error displayed when trying follow who's profile could not be found.
-#: actions/apifriendshipscreate.php:109
 msgid "Could not follow user: profile not found."
 msgstr "نمی‌توان کاربر را دنبال نکرد: کاربر یافت نشد."
 
 #. TRANS: Client error displayed when trying to follow a user that's already being followed.
 #. TRANS: %s is the nickname of the user that is already being followed.
-#: actions/apifriendshipscreate.php:120
 #, php-format
 msgid "Could not follow user: %s is already on your list."
 msgstr "نمی‌توان کاربر را دنبال کرد: %s  هم‌اکنون در لیست شما است."
 
 #. TRANS: Client error displayed when trying to unfollow a user that cannot be found.
-#: actions/apifriendshipsdestroy.php:109
 msgid "Could not unfollow user: User not found."
 msgstr "نمی‌توان کاربر را دنبال نکرد: کاربر یافت نشد."
 
 #. TRANS: Client error displayed when trying to unfollow self.
-#: actions/apifriendshipsdestroy.php:121
 msgid "You cannot unfollow yourself."
 msgstr "نمی‌توانید خودتان را دنبال کنید."
 
 #. TRANS: Client error displayed when supplying invalid parameters to an API call checking if a friendship exists.
-#: actions/apifriendshipsexists.php:88
 #, fuzzy
 msgid "Two valid IDs or nick names must be supplied."
 msgstr "باید ۲ شناسه‌ی کاربر یا نام ظاهری وارد کنید."
 
 #. TRANS: Client error displayed when a source user could not be determined showing friendship.
-#: actions/apifriendshipsshow.php:131
 msgid "Could not determine source user."
 msgstr "نمی‌توان کاربر منبع را تعیین کرد."
 
 #. TRANS: Client error displayed when a target user could not be determined showing friendship.
-#: actions/apifriendshipsshow.php:140
 msgid "Could not find target user."
 msgstr "نمی‌توان کاربر هدف را پیدا کرد."
 
 #. TRANS: Client error trying to create a group with a nickname this is already in use.
+#. TRANS: API validation exception thrown when nickname is already used.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:156 actions/apigroupprofileupdate.php:255
-#: actions/editgroup.php:191 actions/newgroup.php:137
-#: actions/profilesettings.php:274 actions/register.php:199
 msgid "Nickname already in use. Try another one."
 msgstr "این لقب در حال حاضر ثبت شده است. لطفا یکی دیگر انتخاب کنید."
 
 #. TRANS: Client error in form for group creation.
+#. TRANS: API validation exception thrown when nickname does not validate.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:164 actions/apigroupprofileupdate.php:259
-#: actions/editgroup.php:195 actions/newgroup.php:141
-#: actions/profilesettings.php:244 actions/register.php:201
 msgid "Not a valid nickname."
 msgstr "لقب نا معتبر."
 
 #. TRANS: Client error in form for group creation.
+#. TRANS: API validation exception thrown when homepage URL does not validate.
 #. TRANS: Validation error shown when providing an invalid homepage URL in the "Edit application" form.
 #. TRANS: Group edit form validation error.
 #. TRANS: Validation error shown when providing an invalid homepage URL in the "New application" form.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:181 actions/apigroupprofileupdate.php:277
-#: actions/editapplication.php:235 actions/editgroup.php:202
-#: actions/newapplication.php:221 actions/newgroup.php:148
-#: actions/profilesettings.php:249 actions/register.php:208
 msgid "Homepage is not a valid URL."
 msgstr "صفحهٔ خانگی یک نشانی معتبر نیست."
 
 #. TRANS: Client error in form for group creation.
+#. TRANS: API validation exception thrown when full name does not validate.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:191 actions/editgroup.php:206
-#: actions/newgroup.php:152 actions/profilesettings.php:253
-#: actions/register.php:211
 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "نام کامل خیلی طولانی است (حداکثر ۲۵۵ نویسه)."
 
 #. TRANS: Client error shown when providing too long a description during group creation.
 #. TRANS: %d is the maximum number of allowed characters.
+#. TRANS: API validation exception thrown when description does not validate.
+#. TRANS: %d is the maximum description length and used for plural.
 #. TRANS: Validation error shown when providing too long a description in the "Edit application" form.
 #. TRANS: %d is the maximum number of allowed characters.
 #. TRANS: Group edit form validation error.
@@ -649,33 +494,28 @@ msgstr "نام کامل خیلی طولانی است (حداکثر ۲۵۵ نوی
 #. TRANS: %d is the maximum number of characters for the description.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed characters.
-#: actions/apigroupcreate.php:201 actions/editapplication.php:202
-#: actions/editgroup.php:211 actions/newapplication.php:182
-#: actions/newgroup.php:157
 #, fuzzy, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."
 msgstr[0] "توصیف خیلی طولانی است (حداکثر %d نویسه)"
 
 #. TRANS: Client error shown when providing too long a location during group creation.
+#. TRANS: API validation exception thrown when location does not validate.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:215 actions/editgroup.php:218
-#: actions/newgroup.php:164 actions/profilesettings.php:266
-#: actions/register.php:220
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
 msgstr "نام مکان خیلی طولانی است (حداکثر ۲۵۵ نویسه)"
 
 #. TRANS: Client error shown when providing too many aliases during group creation.
 #. TRANS: %d is the maximum number of allowed aliases.
+#. TRANS: API validation exception thrown when aliases do not validate.
+#. TRANS: %d is the maximum number of aliases and used for plural.
 #. TRANS: Group edit form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.
-#: actions/apigroupcreate.php:236 actions/editgroup.php:231
-#: actions/newgroup.php:177
 #, fuzzy, php-format
 msgid "Too many aliases! Maximum %d allowed."
 msgid_plural "Too many aliases! Maximum %d allowed."
@@ -683,25 +523,24 @@ msgstr[0] "نام‌های مستعار بسیار زیاد هستند! حداک
 
 #. TRANS: Client error shown when providing an invalid alias during group creation.
 #. TRANS: %s is the invalid alias.
-#: actions/apigroupcreate.php:253
+#. TRANS: API validation exception thrown when aliases does not validate.
+#. TRANS: %s is the invalid alias.
 #, php-format
 msgid "Invalid alias: \"%s\"."
 msgstr "نام مستعار نامعتبر است: «%s»."
 
 #. TRANS: Client error displayed when trying to use an alias during group creation that is already in use.
 #. TRANS: %s is the alias that is already in use.
+#. TRANS: API validation exception thrown when aliases is already used.
+#. TRANS: %s is the already used alias.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error. %s is the already used alias.
-#: actions/apigroupcreate.php:264 actions/apigroupprofileupdate.php:351
-#: actions/editgroup.php:246 actions/newgroup.php:193
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "نام‌مستعار «%s» ازپیش گرفته‌شده‌است. یکی دیگر را امتحان کنید."
 
 #. TRANS: Client error displayed when trying to use an alias during group creation that is the same as the group's nickname.
 #. TRANS: Group edit form validation error.
-#: actions/apigroupcreate.php:278 actions/apigroupprofileupdate.php:359
-#: actions/editgroup.php:253
 msgid "Alias can't be the same as nickname."
 msgstr "نام و نام مستعار شما نمی تواند یکی باشد ."
 
@@ -709,26 +548,21 @@ msgstr "نام و نام مستعار شما نمی تواند یکی باشد .
 #. TRANS: Client error displayed when trying to join a group that does not exist.
 #. TRANS: Client error displayed when trying to leave a group that does not exist.
 #. TRANS: Client error displayed trying to show group membership on a non-existing group.
+#. TRANS: Client error displayed when not providing a group or an invalid group.
 #. TRANS: Client error displayed when trying to show a group that could not be found.
 #. TRANS: Client error displayed requesting most recent notices to a group for a non-existing group.
-#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
-#: actions/apigroupleave.php:104 actions/apigroupmembership.php:71
-#: actions/apigroupprofileupdate.php:113 actions/apigroupshow.php:81
-#: actions/apitimelinegroup.php:89
 msgid "Group not found."
 msgstr "گروه یافت نشد."
 
 #. TRANS: Server error displayed when trying to join a group the user is already a member of.
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:345
 msgid "You are already a member of that group."
 msgstr "شما از پیش یک عضو این گروه هستید."
 
 #. TRANS: Server error displayed when trying to join a group the user is blocked from joining.
 #. 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.
-#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:350
 msgid "You have been blocked from that group by the admin."
 msgstr "دسترسی شما به گروه توسط مدیر آن محدود شده است."
 
@@ -736,13 +570,11 @@ msgstr "دسترسی شما به گروه توسط مدیر آن محدود شد
 #. TRANS: %1$s is the joining user's nickname, $2$s is the group nickname for which the join failed.
 #. TRANS: Message given having failed to add a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:136 actions/joingroup.php:139 lib/command.php:362
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "نمی‌توان کاربر %1$s را عضو گروه %2$s کرد."
 
 #. TRANS: Server error displayed when trying to leave a group the user is not a member of.
-#: actions/apigroupleave.php:115
 msgid "You are not a member of this group."
 msgstr "شما یک عضو این گروه نیستید."
 
@@ -750,116 +582,79 @@ msgstr "شما یک عضو این گروه نیستید."
 #. TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
 #. TRANS: Message given having failed to remove a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupleave.php:127 actions/leavegroup.php:133
-#: lib/command.php:410
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
 msgstr "خارج شدن %s از گروه %s نا موفق بود"
 
 #. TRANS: Used as title in check for group membership. %s is a user name.
-#: actions/apigrouplist.php:94
 #, php-format
 msgid "%s's groups"
 msgstr "گروه‌های %s"
 
 #. TRANS: Used as subtitle in check for group membership. %1$s is a user name, %2$s is the site name.
-#: actions/apigrouplist.php:104
 #, fuzzy, php-format
 msgid "%1$s groups %2$s is a member of."
 msgstr "هست عضو %s گروه"
 
 #. TRANS: Message is used as a title when listing the lastest 20 groups. %s is a site name.
 #. TRANS: Message is used as a page title. %s is a nick name.
-#: actions/apigrouplistall.php:88 actions/usergroups.php:63
 #, php-format
 msgid "%s groups"
 msgstr "%s گروه"
 
 #. TRANS: Message is used as a subtitle when listing the lastest 20 groups. %s is a site name.
-#: actions/apigrouplistall.php:93
 #, php-format
 msgid "groups on %s"
 msgstr "گروه‌ها در %s"
 
+#. TRANS: Client error displayed when trying to edit a group without being an admin.
 #. TRANS: Client error displayed trying to edit a group while not being a group admin.
 #. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
 #. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
-#: actions/apigroupprofileupdate.php:118 actions/editgroup.php:110
-#: actions/editgroup.php:176 actions/groupdesignsettings.php:109
-#: actions/grouplogo.php:111
 msgid "You must be an admin to edit the group."
 msgstr "برای ویرایش گروه باید یک مدیر باشید."
 
+#. TRANS: Server error displayed when group update fails.
 #. TRANS: Server error displayed when editing a group fails.
-#: actions/apigroupprofileupdate.php:171 actions/editgroup.php:274
 msgid "Could not update group."
 msgstr "نمی‌توان گروه را به‌هنگام‌سازی کرد."
 
+#. TRANS: Server error displayed when adding group aliases fails.
 #. TRANS: Server error displayed when group aliases could not be added.
 #. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/apigroupprofileupdate.php:194 actions/editgroup.php:281
-#: classes/User_group.php:540
 msgid "Could not create aliases."
 msgstr "نمی‌توان نام‌های مستعار را ساخت."
 
+#. TRANS: API validation exception thrown when nickname does not validate.
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: actions/apigroupprofileupdate.php:249 lib/nickname.php:165
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr "لقب باید شامل حروف کوچک و اعداد و بدون فاصله باشد."
 
-#: actions/apigroupprofileupdate.php:286
-#, fuzzy
-msgid "Full name is too long (max 255 chars)."
-msgstr "نام کامل خیلی طولانی است (حداکثر ۲۵۵ نویسه)."
-
-#: actions/apigroupprofileupdate.php:296
-#, fuzzy, php-format
-msgid "description is too long (max %d chars)."
-msgstr "توصیف خیلی طولانی است (حداکثر %d نویسه)"
-
-#: actions/apigroupprofileupdate.php:307
-#, fuzzy
-msgid "Location is too long (max 255 chars)."
-msgstr "نام مکان خیلی طولانی است (حداکثر ۲۵۵ نویسه)"
-
-#: actions/apigroupprofileupdate.php:326
-#, fuzzy, php-format
-msgid "Too many aliases! Maximum %d."
-msgstr "نام‌های مستعار بسیار زیاد هستند! حداکثر %d."
-
-#. TRANS: Group edit form validation error.
+#. TRANS: API validation exception thrown when alias is the same as nickname.
 #. TRANS: Group create form validation error.
-#. TRANS: %s is the invalid alias.
-#: actions/apigroupprofileupdate.php:342 actions/editgroup.php:241
-#: actions/newgroup.php:188
-#, php-format
-msgid "Invalid alias: \"%s\""
-msgstr "نام‌مستعار غیر مجاز: «%s»"
+#, fuzzy
+msgid "Alias cannot be the same as nickname."
+msgstr "نام و نام مستعار شما نمی تواند یکی باشد ."
 
 #. TRANS: Client error displayed when uploading a media file has failed.
-#: actions/apimediaupload.php:101
 msgid "Upload failed."
 msgstr "بارگذاری شکست خورد."
 
 #. TRANS: Client error given from the OAuth API when the request token or verifier is invalid.
-#: actions/apioauthaccesstoken.php:102
 #, fuzzy
 msgid "Invalid request token or verifier."
 msgstr "رمز ورود مشخص شده نامعتبر است."
 
 #. TRANS: Client error given when no oauth_token was passed to the OAuth API.
-#: actions/apioauthauthorize.php:107
 msgid "No oauth_token parameter provided."
 msgstr "هیچ پارامتر oauth_token آماده نشده است."
 
 #. TRANS: Client error given when an invalid request token was passed to the OAuth API.
-#: actions/apioauthauthorize.php:115 actions/apioauthauthorize.php:129
 #, fuzzy
 msgid "Invalid request token."
 msgstr "رمز نامعتبر است."
 
 #. TRANS: Client error given when an invalid request token was passed to the OAuth API.
-#: actions/apioauthauthorize.php:121
 #, fuzzy
 msgid "Request token already authorized."
 msgstr "شما شناسایی نشده اید."
@@ -870,31 +665,14 @@ msgstr "شما شناسایی نشده اید."
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
 #. TRANS: Client error displayed when the session token is not okay.
-#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:75
-#: actions/emailsettings.php:292 actions/favor.php:75 actions/geocode.php:55
-#: actions/groupblock.php:65 actions/grouplogo.php:321
-#: actions/groupunblock.php:65 actions/imsettings.php:241
-#: actions/invite.php:60 actions/makeadmin.php:66 actions/newmessage.php:135
-#: actions/newnotice.php:105 actions/nudge.php:80
-#: actions/oauthappssettings.php:162 actions/oauthconnectionssettings.php:135
-#: actions/passwordsettings.php:137 actions/pluginenable.php:87
-#: actions/profilesettings.php:218 actions/recoverpassword.php:383
-#: actions/register.php:157 actions/remotesubscribe.php:76
-#: actions/repeat.php:82 actions/smssettings.php:249 actions/subedit.php:40
-#: actions/subscribe.php:87 actions/tagother.php:145
-#: actions/unsubscribe.php:69 actions/urlsettings.php:171
-#: actions/userauthorization.php:53 lib/designsettings.php:122
 msgid "There was a problem with your session token. Try again, please."
 msgstr "مشکلی در دریافت نشست شما وجود دارد. لطفا بعدا سعی کنید."
 
 #. TRANS: Form validation error given when an invalid username and/or password was passed to the OAuth API.
-#: actions/apioauthauthorize.php:168
 msgid "Invalid nickname / password!"
 msgstr "نام کاربری یا گذرواژه نامعتبر است!"
 
 #. TRANS: Server error displayed when a database action fails.
-#: actions/apioauthauthorize.php:217
 #, fuzzy
 msgid "Database error inserting oauth_token_association."
 msgstr "هنگام افزودن کاربر برنامهٔ OAuth در پایگاه داده خطایی رخ داد."
@@ -911,28 +689,19 @@ msgstr "هنگام افزودن کاربر برنامهٔ OAuth در پایگا
 #. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
 #. TRANS: Message given submitting a form with an unknown action in SMS settings.
 #. TRANS: Unknown form validation error in design settings form.
-#: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
-#: actions/designadminpanel.php:100 actions/editapplication.php:144
-#: actions/emailsettings.php:311 actions/grouplogo.php:332
-#: actions/imsettings.php:256 actions/newapplication.php:124
-#: actions/oauthconnectionssettings.php:144 actions/recoverpassword.php:46
-#: actions/smssettings.php:270 lib/designsettings.php:133
 msgid "Unexpected form submission."
 msgstr "ارسال غیر قابل انتظار فرم."
 
 #. TRANS: Title for a page where a user can confirm/deny account access by an external application.
-#: actions/apioauthauthorize.php:387
 msgid "An application would like to connect to your account"
 msgstr "یک برنامه می‌خواهد که به حساب شما وصل شود"
 
 #. TRANS: Fieldset legend.
-#: actions/apioauthauthorize.php:404
 msgid "Allow or deny access"
 msgstr "اجازه‌دادن (به) یا جلوگیری از دسترسی"
 
 #. TRANS: User notification of external application requesting account access.
 #. TRANS: %3$s is the access type requested (read-write or read-only), %4$s is the StatusNet sitename.
-#: actions/apioauthauthorize.php:425
 #, fuzzy, php-format
 msgid ""
 "An application would like the ability to <strong>%3$s</strong> your %4$s "
@@ -947,7 +716,6 @@ msgstr ""
 #. TRANS: User notification of external application requesting account access.
 #. TRANS: %1$s is the application name requesting access, %2$s is the organisation behind the application,
 #. TRANS: %3$s is the access type requested, %4$s is the StatusNet sitename.
-#: actions/apioauthauthorize.php:433
 #, php-format
 msgid ""
 "The application <strong>%1$s</strong> by <strong>%2$s</strong> would like "
@@ -960,23 +728,19 @@ msgstr ""
 "بدهید."
 
 #. TRANS: Fieldset legend.
-#: actions/apioauthauthorize.php:455
 #, fuzzy
 msgctxt "LEGEND"
 msgid "Account"
 msgstr "حساب کاربری"
 
 #. TRANS: Field label on OAuth API authorisation form.
+#. TRANS: Field label on login page.
 #. TRANS: Field label in form for profile settings.
-#: actions/apioauthauthorize.php:459 actions/login.php:225
-#: actions/profilesettings.php:107 actions/register.php:411
-#: actions/userauthorization.php:145 lib/groupeditform.php:145
 msgid "Nickname"
 msgstr "نام کاربری"
 
 #. TRANS: Field label on OAuth API authorisation form.
-#: actions/apioauthauthorize.php:463 actions/login.php:228
-#: actions/register.php:415 lib/settingsnav.php:87
+#. TRANS: Field label on login page.
 msgid "Password"
 msgstr "گذرواژه"
 
@@ -986,47 +750,38 @@ msgstr "گذرواژه"
 #. TRANS: Button label to cancel an IM address confirmation procedure.
 #. TRANS: Button label to cancel a SMS address confirmation procedure.
 #. TRANS: Button label in the "Edit application" form.
-#: actions/apioauthauthorize.php:478 actions/emailsettings.php:125
-#: actions/imsettings.php:136 actions/smssettings.php:132
-#: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Cancel"
 msgstr "انصراف"
 
 #. TRANS: Button text that when clicked will allow access to an account by an external application.
-#: actions/apioauthauthorize.php:485
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Allow"
 msgstr "اجازه دادن"
 
 #. TRANS: Form instructions.
-#: actions/apioauthauthorize.php:502
 #, fuzzy
 msgid "Authorize access to your account information."
 msgstr "به دسترسی به اطلاعات حسابتان اجازه بدهید یا از آن جلوگیری کنید."
 
 #. TRANS: Header for user notification after revoking OAuth access to an application.
-#: actions/apioauthauthorize.php:594
 #, fuzzy
 msgid "Authorization canceled."
 msgstr "تایید پیام‌رسان فوری لغو شد."
 
 #. TRANS: User notification after revoking OAuth access to an application.
 #. TRANS: %s is an OAuth token.
-#: actions/apioauthauthorize.php:598
 #, fuzzy, php-format
 msgid "The request token %s has been revoked."
 msgstr "نشانهٔ درخواست %s پذیرفته نشد و لغو شد."
 
 #. TRANS: Title of the page notifying the user that an anonymous client application was successfully authorized to access the user's account with OAuth.
-#: actions/apioauthauthorize.php:621
 #, fuzzy
 msgid "You have successfully authorized the application"
 msgstr "شما شناسایی نشده اید."
 
 #. TRANS: Message notifying the user that an anonymous client application was successfully authorized to access the user's account with OAuth.
-#: actions/apioauthauthorize.php:625
 msgid ""
 "Please return to the application and enter the following security code to "
 "complete the process."
@@ -1034,14 +789,12 @@ msgstr ""
 
 #. TRANS: Title of the page notifying the user that the client application was successfully authorized to access the user's account with OAuth.
 #. TRANS: %s is the authorised application name.
-#: actions/apioauthauthorize.php:632
 #, fuzzy, php-format
 msgid "You have successfully authorized %s"
 msgstr "شما شناسایی نشده اید."
 
 #. TRANS: Message notifying the user that the client application was successfully authorized to access the user's account with OAuth.
 #. TRANS: %s is the authorised application name.
-#: actions/apioauthauthorize.php:639
 #, php-format
 msgid ""
 "Please return to %s and enter the following security code to complete the "
@@ -1050,12 +803,10 @@ msgstr ""
 
 #. TRANS: Client error displayed trying to delete a status not using POST or DELETE.
 #. TRANS: POST and DELETE should not be translated.
-#: actions/apistatusesdestroy.php:111
 msgid "This method requires a POST or DELETE."
 msgstr "این روش نیازمند POST یا DELETE است."
 
 #. TRANS: Client error displayed trying to delete a status of another user.
-#: actions/apistatusesdestroy.php:136
 msgid "You may not delete another user's status."
 msgstr "شما توانایی حذف وضعیت کاربر دیگری را ندارید."
 
@@ -1063,21 +814,16 @@ msgstr "شما توانایی حذف وضعیت کاربر دیگری را ند
 #. TRANS: Client error displayed trying to display redents of a non-exiting notice.
 #. TRANS: Client exception thrown when referencing a non-existing notice.
 #. TRANS: Error message displayed trying to delete a non-existing notice.
-#: actions/apistatusesretweet.php:74 actions/apistatusesretweets.php:70
-#: actions/atompubshowfavorite.php:82 actions/deletenotice.php:61
-#: actions/shownotice.php:92
 msgid "No such notice."
 msgstr "چنین پیامی وجود ندارد."
 
 #. TRANS: Client error displayed trying to repeat an own notice through the API.
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:549
 msgid "Cannot repeat your own notice."
 msgstr "نمی توانید پیام خود را تکرار کنید."
 
 #. TRANS: Client error displayed trying to re-repeat a notice through the API.
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:92 lib/command.php:555
 msgid "Already repeated that notice."
 msgstr "قبلا آن پیام تکرار شده است."
 
@@ -1087,73 +833,57 @@ msgstr "قبلا آن پیام تکرار شده است."
 #. TRANS: Client exception thrown when using an unsupported HTTP method.
 #. TRANS: Client error shown when using a non-supported HTTP method.
 #. TRANS: Client exception thrown when using an unsupported HTTP method.
-#: actions/apistatusesshow.php:118 actions/atompubfavoritefeed.php:103
-#: actions/atompubmembershipfeed.php:105 actions/atompubshowfavorite.php:117
-#: actions/atompubshowmembership.php:116
-#: actions/atompubshowsubscription.php:122
-#: actions/atompubsubscriptionfeed.php:109
 #, fuzzy
 msgid "HTTP method not supported."
 msgstr "رابط مورد نظر پیدا نشد."
 
 #. TRANS: Exception thrown requesting an unsupported notice output format.
 #. TRANS: %s is the requested output format.
-#: actions/apistatusesshow.php:144
 #, fuzzy, php-format
 msgid "Unsupported format: %s."
 msgstr "قالب پشتیبانی نشده."
 
 #. TRANS: Client error displayed requesting a deleted status.
-#: actions/apistatusesshow.php:155
 msgid "Status deleted."
 msgstr "وضعیت حذف شد."
 
 #. TRANS: Client error displayed requesting a status with an invalid ID.
-#: actions/apistatusesshow.php:162
 msgid "No status with that ID found."
 msgstr "هیچ وضعیتی با آن شناسه یافت نشد."
 
 #. TRANS: Client error displayed when trying to delete a notice not using the Atom format.
-#: actions/apistatusesshow.php:227
 msgid "Can only delete using the Atom format."
 msgstr ""
 
 #. TRANS: Client error displayed when a user has no rights to delete notices of other users.
 #. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
-#: actions/apistatusesshow.php:235 actions/deletenotice.php:78
 #, fuzzy
 msgid "Cannot delete this notice."
 msgstr "نمی‌توان این پیام را پاک کرد."
 
 #. TRANS: Confirmation of notice deletion in API. %d is the ID (number) of the deleted notice.
-#: actions/apistatusesshow.php:249
 #, fuzzy, php-format
 msgid "Deleted notice %d"
 msgstr "پیام را پاک کن"
 
 #. TRANS: Client error displayed when the parameter "status" is missing.
-#: actions/apistatusesupdate.php:221
 msgid "Client must provide a 'status' parameter with a value."
 msgstr ""
 
 #. TRANS: Client error displayed when the parameter "status" is missing.
 #. TRANS: %d is the maximum number of character for a notice.
-#: actions/apistatusesupdate.php:244 actions/newnotice.php:161
-#: lib/mailhandler.php:60
 #, fuzzy, php-format
 msgid "That's too long. Maximum notice size is %d character."
 msgid_plural "That's too long. Maximum notice size is %d characters."
 msgstr[0] "این خیلی طولانی است. بیشینهٔ طول پیام %d نویسه است."
 
 #. TRANS: Client error displayed when replying to a non-existing notice.
-#: actions/apistatusesupdate.php:284
 #, fuzzy
 msgid "Parent notice not found."
 msgstr "رابط مورد نظر پیدا نشد."
 
 #. TRANS: Client error displayed exceeding the maximum notice length.
 #. TRANS: %d is the maximum lenth for a notice.
-#: actions/apistatusesupdate.php:308 actions/newnotice.php:184
 #, fuzzy, php-format
 msgid "Maximum notice size is %d character, including attachment URL."
 msgid_plural "Maximum notice size is %d characters, including attachment URL."
@@ -1161,13 +891,11 @@ msgstr[0] "بیشینهٔ طول پیام %d نویسه که شامل نشانی
 
 #. TRANS: Client error displayed when requesting profiles of followers in an unsupported format.
 #. TRANS: Client error displayed when requesting IDs of followers in an unsupported format.
-#: actions/apisubscriptions.php:228 actions/apisubscriptions.php:258
 msgid "Unsupported format."
 msgstr "قالب پشتیبانی نشده."
 
 #. TRANS: Title for timeline of most recent favourite notices by a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname.
-#: actions/apitimelinefavorites.php:108
 #, php-format
 msgid "%1$s / Favorites from %2$s"
 msgstr "%1$s / برگزیده‌ها از %2$s"
@@ -1175,14 +903,12 @@ msgstr "%1$s / برگزیده‌ها از %2$s"
 #. TRANS: Subtitle for timeline of most recent favourite notices by a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user's full name,
 #. TRANS: %3$s is a user nickname.
-#: actions/apitimelinefavorites.php:120
 #, fuzzy, php-format
 msgid "%1$s updates favorited by %2$s / %3$s."
 msgstr "به‌روزرسانی‌های %1$s که توسط %2$s برگزیده شده اند / %2$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.
-#: actions/apitimelinementions.php:115
 #, php-format
 msgid "%1$s / Updates mentioning %2$s"
 msgstr "%$1s / به روز رسانی های شامل %2$s"
@@ -1190,49 +916,41 @@ msgstr "%$1s / به روز رسانی های شامل %2$s"
 #. TRANS: Subtitle for timeline of most recent mentions of a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname,
 #. TRANS: %3$s is a user's full name.
-#: actions/apitimelinementions.php:131
 #, php-format
 msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr "%1$s به روز رسانی هایی که در پاسخ به $2$s / %3$s"
 
 #. TRANS: Title for site timeline. %s is the StatusNet sitename.
 #. TRANS: Public RSS feed title. %s is the StatusNet site name.
-#: actions/apitimelinepublic.php:193 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "%s خط‌زمانی عمومی"
 
 #. TRANS: Subtitle for site timeline. %s is the StatusNet sitename.
-#: actions/apitimelinepublic.php:199
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "%s به روز رسانی های عموم"
 
 #. TRANS: Server error displayed calling unimplemented API method for 'retweeted by me'.
-#: actions/apitimelineretweetedbyme.php:71
 #, fuzzy
 msgid "Unimplemented."
 msgstr "روش پیاده نشده است."
 
 #. TRANS: Title for Atom feed "repeated to me". %s is the user nickname.
-#: actions/apitimelineretweetedtome.php:96
 #, php-format
 msgid "Repeated to %s"
 msgstr "تکرار شده به %s"
 
-#: actions/apitimelineretweetedtome.php:98
 #, fuzzy, php-format
 msgid "%1$s notices that were to repeated to %2$s / %3$s."
 msgstr "%1$s به روز رسانی هایی که در پاسخ به $2$s / %3$s"
 
 #. TRANS: Title of list of repeated notices of the logged in user.
 #. TRANS: %s is the nickname of the logged in user.
-#: actions/apitimelineretweetsofme.php:98
 #, php-format
 msgid "Repeats of %s"
 msgstr "تکرار %s"
 
-#: actions/apitimelineretweetsofme.php:104
 #, fuzzy, php-format
 msgid "%1$s notices that %2$s / %3$s has repeated."
 msgstr "پیام شما را به برگزیده‌های خود اضافه کرد %s (@%s)"
@@ -1241,79 +959,64 @@ msgstr "پیام شما را به برگزیده‌های خود اضافه کر
 #. TRANS: %s is the tag.
 #. TRANS: Title for first page of notices with tags.
 #. TRANS: %s is the tag.
-#: actions/apitimelinetag.php:101 actions/tag.php:69
 #, php-format
 msgid "Notices tagged with %s"
 msgstr "پیام‌هایی که با %s نشانه گزاری شده اند."
 
 #. TRANS: Subtitle for timeline with lastest notices with a given tag.
 #. TRANS: %1$s is the tag, $2$s is the StatusNet sitename.
-#: actions/apitimelinetag.php:105 actions/tagrss.php:65
 #, php-format
 msgid "Updates tagged with %1$s on %2$s!"
 msgstr "پیام‌های نشانه گزاری شده با %1$s در %2$s"
 
 #. TRANS: Client error displayed trying to add a notice to another user's timeline.
-#: actions/apitimelineuser.php:308
 #, fuzzy
 msgid "Only the user can add to their own timeline."
 msgstr "تنها کاربران می تواند صندوق نامهٔ خودشان را بخوانند."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:315
 msgid "Only accept AtomPub for Atom feeds."
 msgstr ""
 
 #. TRANS: Client error displayed attempting to post an empty API notice.
-#: actions/apitimelineuser.php:322
 msgid "Atom post must not be empty."
 msgstr ""
 
 #. TRANS: Client error displayed attempting to post an API that is not well-formed XML.
-#: actions/apitimelineuser.php:328
 msgid "Atom post must be well-formed XML."
 msgstr ""
 
 #. TRANS: Client error displayed when not using an Atom entry.
-#: actions/apitimelineuser.php:334 actions/atompubfavoritefeed.php:228
-#: actions/atompubmembershipfeed.php:230
-#: actions/atompubsubscriptionfeed.php:236
 msgid "Atom post must be an Atom entry."
 msgstr ""
 
 #. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
-#: actions/apitimelineuser.php:345
 msgid "Can only handle POST activities."
 msgstr ""
 
 #. TRANS: Client error displayed when using an unsupported activity object type.
 #. TRANS: %s is the unsupported activity object type.
-#: actions/apitimelineuser.php:356
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
 #. TRANS: %d is the notice ID (number).
-#: actions/apitimelineuser.php:390
 #, fuzzy, php-format
 msgid "No content for notice %d."
 msgstr "پیدا کردن محتوای پیام‌ها"
 
 #. TRANS: Client error displayed when using another format than AtomPub.
 #. TRANS: %s is the notice URI.
-#: actions/apitimelineuser.php:419
 #, fuzzy, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "پیامی با آن شناسه وجود ندارد."
 
 #. TRANS: Server error for unfinished API method showTrends.
-#: actions/apitrends.php:85
 msgid "API method under construction."
 msgstr "روش API در دست ساخت."
 
 #. TRANS: Client error displayed when requesting user information for a non-existing user.
-#: actions/apiuserprofileimage.php:80 actions/apiusershow.php:94
 #, fuzzy
 msgid "User not found."
 msgstr "رابط مورد نظر پیدا نشد."
@@ -1321,102 +1024,84 @@ msgstr "رابط مورد نظر پیدا نشد."
 #. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
 #. TRANS: Client exception.
 #. TRANS: Client error displayed trying to subscribe to a non-existing profile.
-#: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
-#: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
-#: actions/subscribe.php:110
 msgid "No such profile."
 msgstr "چنین نمایه‌ای وجود ندارد."
 
 #. TRANS: Subtitle for Atom favorites feed.
 #. TRANS: %1$s is a user nickname, %2$s is the StatusNet sitename.
-#: actions/atompubfavoritefeed.php:147
 #, fuzzy, php-format
 msgid "Notices %1$s has favorited on %2$s"
 msgstr "به روز رسانی از %1$s و دوستان در %2$s"
 
 #. TRANS: Client exception thrown when trying to set a favorite for another user.
 #. TRANS: Client exception thrown when trying to subscribe another user.
-#: actions/atompubfavoritefeed.php:217 actions/atompubsubscriptionfeed.php:225
 #, fuzzy
 msgid "Cannot add someone else's subscription."
 msgstr "نمی‌توان اشتراک تازه‌ای افزود."
 
 #. TRANS: Client exception thrown when trying use an incorrect activity verb for the Atom pub method.
-#: actions/atompubfavoritefeed.php:240
 #, fuzzy
 msgid "Can only handle favorite activities."
 msgstr "پیدا کردن محتوای پیام‌ها"
 
 #. TRANS: Client exception thrown when trying favorite an object that is not a notice.
-#: actions/atompubfavoritefeed.php:250 actions/atompubmembershipfeed.php:250
 #, fuzzy
 msgid "Can only fave notices."
 msgstr "پیدا کردن محتوای پیام‌ها"
 
 #. TRANS: Client exception thrown when trying favorite a notice without content.
-#: actions/atompubfavoritefeed.php:259
 #, fuzzy
 msgid "Unknown note."
 msgstr "ناشناخته"
 
 #. TRANS: Client exception thrown when trying favorite an already favorited notice.
-#: actions/atompubfavoritefeed.php:267
 #, fuzzy
 msgid "Already a favorite."
 msgstr "افزودن به برگزیده‌ها"
 
 #. TRANS: Title for group membership feed.
 #. TRANS: %s is a username.
-#: actions/atompubmembershipfeed.php:144
 #, fuzzy, php-format
 msgid "%s group memberships"
 msgstr "اعضای گروه %s"
 
 #. TRANS: Subtitle for group membership feed.
 #. TRANS: %1$s is a username, %2$s is the StatusNet sitename.
-#: actions/atompubmembershipfeed.php:149
 #, fuzzy, php-format
 msgid "Groups %1$s is a member of on %2$s"
 msgstr "هست عضو %s گروه"
 
 #. TRANS: Client exception thrown when trying subscribe someone else to a group.
-#: actions/atompubmembershipfeed.php:219
 #, fuzzy
 msgid "Cannot add someone else's membership."
 msgstr "نمی‌توان اشتراک تازه‌ای افزود."
 
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#: actions/atompubmembershipfeed.php:242
 #, fuzzy
 msgid "Can only handle join activities."
 msgstr "پیدا کردن محتوای پیام‌ها"
 
 #. TRANS: Client exception thrown when trying to subscribe to a non-existing group.
-#: actions/atompubmembershipfeed.php:259
 #, fuzzy
 msgid "Unknown group."
 msgstr "ناشناخته"
 
 #. TRANS: Client exception thrown when trying to subscribe to an already subscribed group.
-#: actions/atompubmembershipfeed.php:267
 #, fuzzy
 msgid "Already a member."
 msgstr "همهٔ اعضا"
 
 #. TRANS: Client exception thrown when trying to subscribe to group while blocked from that group.
-#: actions/atompubmembershipfeed.php:275
 msgid "Blocked by admin."
 msgstr ""
 
 #. TRANS: Client exception thrown when referencing a non-existing favorite.
-#: actions/atompubshowfavorite.php:90
 #, fuzzy
 msgid "No such favorite."
 msgstr "چنین پرونده‌ای وجود ندارد."
 
 #. TRANS: Client exception thrown when trying to remove a favorite notice of another user.
-#: actions/atompubshowfavorite.php:151
 #, fuzzy
 msgid "Cannot delete someone else's favorite."
 msgstr "نمی‌توان پیام برگزیده را حذف کرد."
@@ -1443,93 +1128,68 @@ msgstr "نمی‌توان پیام برگزیده را حذف کرد."
 #. TRANS: Client error displayed when trying to join a non-existing group.
 #. TRANS: Client error displayed when trying to leave a non-local group.
 #. TRANS: Client error displayed when trying to leave a non-existing group.
+#. TRANS: Client error displayed when providing an invalid group ID on the Make Admin page.
 #. 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.
 #. TRANS: Command exception text shown when a group is requested that does not exist.
 #. TRANS: Error text shown when trying to leave a group that does not exist.
-#: actions/atompubshowmembership.php:81 actions/blockedfromgroup.php:81
-#: actions/blockedfromgroup.php:89 actions/deletegroup.php:87
-#: actions/deletegroup.php:100 actions/editgroup.php:102
-#: actions/foafgroup.php:46 actions/foafgroup.php:65 actions/foafgroup.php:73
-#: actions/groupblock.php:89 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:101 actions/grouplogo.php:103
-#: actions/groupmembers.php:84 actions/groupmembers.php:92
-#: actions/grouprss.php:97 actions/grouprss.php:105
-#: actions/groupunblock.php:89 actions/joingroup.php:82
-#: actions/joingroup.php:95 actions/leavegroup.php:82
-#: actions/leavegroup.php:95 actions/makeadmin.php:86
-#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:392
 msgid "No such group."
 msgstr "چنین گروهی وجود ندارد."
 
 #. TRANS: Client exception thrown when trying to show membership of a non-subscribed group
-#: actions/atompubshowmembership.php:91
 #, fuzzy
 msgid "Not a member."
 msgstr "همهٔ اعضا"
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
-#: actions/atompubshowmembership.php:150
 #, fuzzy
 msgid "Cannot delete someone else's membership."
 msgstr "نمی‌توان اشتراک را ذخیره کرد."
 
 #. TRANS: Client exception thrown when trying to display a subscription for a non-existing profile ID.
 #. TRANS: %d is the non-existing profile ID number.
-#: actions/atompubshowsubscription.php:72
-#: actions/atompubshowsubscription.php:83
-#: actions/atompubsubscriptionfeed.php:74
 #, fuzzy, php-format
 msgid "No such profile id: %d."
 msgstr "چنین نمایه‌ای وجود ندارد."
 
 #. 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.
-#: actions/atompubshowsubscription.php:94
 #, fuzzy, php-format
 msgid "Profile %1$d not subscribed to profile %2$d."
 msgstr "شما مشترک آن نمایه نیستید."
 
 #. TRANS: Client exception thrown when trying to delete a subscription of another user.
-#: actions/atompubshowsubscription.php:157
 #, fuzzy
 msgid "Cannot delete someone else's subscription."
 msgstr "نمی‌توان اشتراک را ذخیره کرد."
 
 #. TRANS: Subtitle for Atom subscription feed.
 #. TRANS: %1$s is a user nickname, %s$s is the StatusNet sitename.
-#: actions/atompubsubscriptionfeed.php:153
 #, fuzzy, php-format
 msgid "People %1$s has subscribed to on %2$s"
 msgstr "افراد مشترک %s"
 
 #. TRANS: Client error displayed when not using the follow verb.
-#: actions/atompubsubscriptionfeed.php:248
 msgid "Can only handle Follow activities."
 msgstr ""
 
 #. TRANS: Client exception thrown when subscribing to an object that is not a person.
-#: actions/atompubsubscriptionfeed.php:256
 msgid "Can only follow people."
 msgstr ""
 
 #. TRANS: Client exception thrown when subscribing to a non-existing profile.
 #. TRANS: %s is the unknown profile ID.
-#: actions/atompubsubscriptionfeed.php:267
 #, fuzzy, php-format
 msgid "Unknown profile %s."
 msgstr "نوع فایل پشتیبانی نشده"
 
 #. TRANS: Client error displayed trying to subscribe to an already subscribed profile.
 #. TRANS: %s is the profile the user already has a subscription on.
-#: actions/atompubsubscriptionfeed.php:275
 #, fuzzy, php-format
 msgid "Already subscribed to %s."
 msgstr "قبلا اشتراک انجام شده است!"
 
 #. TRANS: Client error displayed trying to get a non-existing attachment.
-#: actions/attachment.php:73
 msgid "No such attachment."
 msgstr "چنین پیوستی وجود ندارد."
 
@@ -1541,31 +1201,23 @@ msgstr "چنین پیوستی وجود ندارد."
 #. TRANS: Client error displayed when trying to view group members without providing a group nickname.
 #. TRANS: Client error displayed when requesting a group RSS feed without providing a group nickname.
 #. TRANS: Client error displayed if no nickname argument was given requesting a group page.
-#: actions/avatarbynickname.php:60 actions/blockedfromgroup.php:73
-#: actions/editgroup.php:85 actions/groupdesignsettings.php:84
-#: actions/grouplogo.php:86 actions/groupmembers.php:76
-#: actions/grouprss.php:89 actions/showgroup.php:116
 msgid "No nickname."
 msgstr "لقبی وجود ندارد."
 
 #. TRANS: Client error displayed trying to get an avatar without providing an avatar size.
-#: actions/avatarbynickname.php:66
 msgid "No size."
 msgstr "بدون اندازه."
 
 #. TRANS: Client error displayed trying to get an avatar providing an invalid avatar size.
-#: actions/avatarbynickname.php:72
 msgid "Invalid size."
 msgstr "اندازه نادرست است."
 
 #. TRANS: Title for avatar upload page.
-#: actions/avatarsettings.php:66 lib/settingsnav.php:82
 msgid "Avatar"
 msgstr "چهره"
 
 #. TRANS: Instruction for avatar upload page.
 #. TRANS: %s is the maximum file size, for example "500b", "10kB" or "2MB".
-#: actions/avatarsettings.php:78
 #, php-format
 msgid "You can upload your personal avatar. The maximum file size is %s."
 msgstr ""
@@ -1575,17 +1227,12 @@ msgstr ""
 #. TRANS: Server error displayed coming across a request from a user without a profile.
 #. TRANS: Server error displayed when trying to authorise a remote subscription request
 #. TRANS: while the user has no profile.
-#: actions/avatarsettings.php:108 actions/avatarsettings.php:192
-#: actions/grouplogo.php:184 actions/remotesubscribe.php:190
-#: actions/userauthorization.php:75 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr "کاربر نمایهٔ تطبیق ندارد."
 
 #. TRANS: Avatar upload page form legend.
 #. TRANS: Avatar upload page crop form legend.
 #. TRANS: Legend for group logo settings fieldset.
-#: actions/avatarsettings.php:122 actions/avatarsettings.php:205
-#: actions/grouplogo.php:261
 msgid "Avatar settings"
 msgstr "تنظیمات چهره"
 
@@ -1593,8 +1240,6 @@ msgstr "تنظیمات چهره"
 #. TRANS: Header on avatar upload crop form for thumbnail of originally uploaded avatar (h2).
 #. TRANS: Uploaded original file in group logo form.
 #. TRANS: Header for originally uploaded file before a crop on the group logo page.
-#: actions/avatarsettings.php:131 actions/avatarsettings.php:214
-#: actions/grouplogo.php:207 actions/grouplogo.php:270
 msgid "Original"
 msgstr "اصلی"
 
@@ -1602,14 +1247,11 @@ msgstr "اصلی"
 #. TRANS: Header on avatar upload crop form for thumbnail of to be used rendition of uploaded avatar (h2).
 #. TRANS: Header for preview of to be displayed group logo.
 #. TRANS: Header for the cropped group logo on the group logo page.
-#: actions/avatarsettings.php:147 actions/avatarsettings.php:227
-#: actions/grouplogo.php:219 actions/grouplogo.php:283
 msgid "Preview"
 msgstr "پیش‌نمایش"
 
 #. TRANS: Button on avatar upload page to delete current avatar.
 #. TRANS: Button text for user account deletion.
-#: actions/avatarsettings.php:155 actions/deleteaccount.php:319
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Delete"
@@ -1617,26 +1259,22 @@ msgstr "حذف"
 
 #. TRANS: Button on avatar upload page to upload an avatar.
 #. TRANS: Submit button to confirm upload of a user backup file for account restore.
-#: actions/avatarsettings.php:173 actions/restoreaccount.php:369
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Upload"
 msgstr "پایین‌گذاری"
 
 #. TRANS: Button on avatar upload crop form to confirm a selected crop as avatar.
-#: actions/avatarsettings.php:243
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Crop"
 msgstr "برش"
 
 #. TRANS: Validation error on avatar upload form when no file was uploaded.
-#: actions/avatarsettings.php:318
 msgid "No file uploaded."
 msgstr "هیچ پرونده‌ای بارگذاری نشد."
 
 #. TRANS: Avatar upload form instruction after uploading a file.
-#: actions/avatarsettings.php:345
 #, fuzzy
 msgid "Pick a square area of the image to be your avatar."
 msgstr ""
@@ -1644,44 +1282,36 @@ msgstr ""
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
 #. TRANS: Server error displayed trying to crop an uploaded group logo that is no longer present.
-#: actions/avatarsettings.php:360 actions/grouplogo.php:391
 msgid "Lost our file data."
 msgstr "فایل اطلاعات خود را گم کرده ایم."
 
 #. TRANS: Success message for having updated a user avatar.
-#: actions/avatarsettings.php:384
 msgid "Avatar updated."
 msgstr "چهره به روز رسانی شد."
 
 #. TRANS: Error displayed on the avatar upload page if the avatar could not be updated for an unknown reason.
-#: actions/avatarsettings.php:388
 msgid "Failed updating avatar."
 msgstr "به روز رسانی چهره موفقیت آمیر نبود."
 
 #. TRANS: Success message for deleting a user avatar.
-#: actions/avatarsettings.php:412
 msgid "Avatar deleted."
 msgstr "چهره پاک شد."
 
 #. TRANS: Title for backup account page.
 #. TRANS: Option in profile settings to create a backup of the account of the currently logged in user.
-#: actions/backupaccount.php:61 actions/profilesettings.php:468
 msgid "Backup account"
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to backup an account while not logged in.
-#: actions/backupaccount.php:79
 #, fuzzy
 msgid "Only logged-in users can backup their account."
 msgstr "تنها کاربران وارد شده می توانند پیام‌ها را تکرار کنند."
 
 #. TRANS: Client exception thrown when trying to backup an account without having backup rights.
-#: actions/backupaccount.php:84
 msgid "You may not backup your account."
 msgstr ""
 
 #. TRANS: Information displayed on the backup account page.
-#: actions/backupaccount.php:227
 msgid ""
 "You can backup your account data in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format. This is an experimental feature and provides "
@@ -1691,31 +1321,26 @@ msgid ""
 msgstr ""
 
 #. TRANS: Submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:250
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Backup"
 msgstr "پیش‌زمینه"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:254
 msgid "Backup your account."
 msgstr ""
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
-#: actions/block.php:68
 msgid "You already blocked that user."
 msgstr "شما هم اکنون آن کاربر را مسدود کرده اید."
 
 #. TRANS: Title for block user page.
 #. TRANS: Legend for block user form.
 #. TRANS: Fieldset legend for block user from group form.
-#: actions/block.php:106 actions/block.php:136 actions/groupblock.php:165
 msgid "Block user"
 msgstr "مسدود کردن کاربر"
 
 #. TRANS: Explanation of consequences when blocking a user on the block user page.
-#: actions/block.php:139
 msgid ""
 "Are you sure you want to block this user? Afterwards, they will be "
 "unsubscribed from you, unable to subscribe to you in the future, and you "
@@ -1732,15 +1357,11 @@ msgstr ""
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:154 actions/deleteapplication.php:157
-#: actions/deletegroup.php:220 actions/deletenotice.php:155
-#: actions/deleteuser.php:154 actions/groupblock.php:187
 msgctxt "BUTTON"
 msgid "No"
 msgstr "خیر"
 
 #. TRANS: Submit button title for 'No' when blocking a user.
-#: actions/block.php:158
 #, fuzzy
 msgid "Do not block this user."
 msgstr "کاربر را مسدود نکن"
@@ -1751,50 +1372,40 @@ msgstr "کاربر را مسدود نکن"
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:161 actions/deleteapplication.php:164
-#: actions/deletegroup.php:227 actions/deletenotice.php:162
-#: actions/deleteuser.php:161 actions/groupblock.php:194
 msgctxt "BUTTON"
 msgid "Yes"
 msgstr "بله"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:165
 #, fuzzy
 msgid "Block this user."
 msgstr "کاربر را مسدود کن"
 
 #. TRANS: Server error displayed when blocking a user fails.
-#: actions/block.php:189
 msgid "Failed to save block information."
 msgstr "ذخیرهٔ ردیف اطلاعات شکست خورد."
 
 #. TRANS: Title for first page with list of users blocked from a group.
 #. TRANS: %s is a group nickname.
-#: actions/blockedfromgroup.php:101
 #, php-format
 msgid "%s blocked profiles"
 msgstr "%s نمایه‌های مسدود شده"
 
 #. TRANS: Title for any but the first page with list of users blocked from a group.
 #. TRANS: %1$s is a group nickname, %2$d is a page number.
-#: actions/blockedfromgroup.php:106
 #, php-format
 msgid "%1$s blocked profiles, page %2$d"
 msgstr "%1$s نمایه‌های مسدود شده، صفحهٔ %2$d"
 
 #. TRANS: Instructions for list of users blocked from a group.
-#: actions/blockedfromgroup.php:122
 msgid "A list of the users blocked from joining this group."
 msgstr "فهرستی از افراد مسدود شده در پیوستن به این گروه."
 
 #. TRANS: Form legend for unblocking a user from a group.
-#: actions/blockedfromgroup.php:291
 msgid "Unblock user from group"
 msgstr "آزاد کردن کاربر در پیوستن به گروه"
 
 #. TRANS: Button text for unblocking a user from a group.
-#: actions/blockedfromgroup.php:323
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Unblock"
@@ -1802,130 +1413,104 @@ msgstr "آزاد سازی"
 
 #. TRANS: Tooltip for button for unblocking a user from a group.
 #. TRANS: Description of the form to unblock a user.
-#: actions/blockedfromgroup.php:327 lib/unblockform.php:78
 msgid "Unblock this user"
 msgstr "آزاد سازی کاربر"
 
 #. TRANS: Title for mini-posting window loaded from bookmarklet.
 #. TRANS: %s is the StatusNet site name.
-#: actions/bookmarklet.php:51
 #, php-format
 msgid "Post to %s"
 msgstr "فرستادن به %s"
 
 #. TRANS: Client error displayed when not providing a confirmation code in the contact address confirmation action.
-#: actions/confirmaddress.php:74
 msgid "No confirmation code."
 msgstr "بدون کد تصدیق."
 
 #. TRANS: Client error displayed when providing a non-existing confirmation code in the contact address confirmation action.
-#: actions/confirmaddress.php:80
 msgid "Confirmation code not found."
 msgstr "کد تصدیق پیدا نشد."
 
 #. TRANS: Client error displayed when not providing a confirmation code for another user in the contact address confirmation action.
-#: actions/confirmaddress.php:86
 msgid "That confirmation code is not for you!"
 msgstr "آن کد تصدیق برای شما نیست!"
 
 #. TRANS: Server error for an unknown address type, which can be 'email', 'sms', or the name of an IM network (such as 'xmpp' or 'aim')
-#: actions/confirmaddress.php:94
-#, fuzzy, php-format
+#, php-format
 msgid "Unrecognized address type %s"
 msgstr "نوع نشانی نامشخص است %s."
 
 #. TRANS: Client error for an already confirmed email/jabber/sms address.
-#: actions/confirmaddress.php:103 actions/confirmaddress.php:136
 msgid "That address has already been confirmed."
 msgstr "آن نشانی در حال حاضر تصدیق شده است."
 
-#: actions/confirmaddress.php:121 actions/imsettings.php:444
-#: actions/userdesignsettings.php:306
-#, fuzzy
 msgid "Couldn't update user."
 msgstr "نمی‌توان کاربر را به‌هنگام‌سازی کرد."
 
-#: actions/confirmaddress.php:144
 #, fuzzy
 msgid "Couldn't update user im preferences."
 msgstr "نمی‌توان اطلاعات کاربر را به روز کرد."
 
-#: actions/confirmaddress.php:156
 #, fuzzy
 msgid "Couldn't insert user im preferences."
 msgstr "نمی‌توان اشتراک تازه‌ای افزود."
 
 #. TRANS: Server error displayed when an address confirmation code deletion from the
 #. TRANS: database fails in the contact address confirmation action.
-#: actions/confirmaddress.php:169
 #, fuzzy
 msgid "Could not delete address confirmation."
 msgstr "نمی‌توان تایید پیام‌رسان فوری را پاک کرد."
 
 #. TRANS: Title for the contact address confirmation action.
-#: actions/confirmaddress.php:185
 msgid "Confirm address"
 msgstr "تایید نشانی"
 
 #. TRANS: Success message for the contact address confirmation action.
 #. TRANS: %s can be 'email', 'jabber', or 'sms'.
-#: actions/confirmaddress.php:200
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "نشانی «%s« برای شما تصدیق شد."
 
 #. TRANS: Title for page with a conversion (multiple notices in context).
-#: actions/conversation.php:96
 msgid "Conversation"
 msgstr "مکالمه"
 
 #. TRANS: Header on conversation page. Hidden by default (h2).
 #. TRANS: Label for user statistics.
-#: actions/conversation.php:149 lib/noticelist.php:87
-#: lib/profileaction.php:246 lib/searchgroupnav.php:82
-#: lib/threadednoticelist.php:66
 msgid "Notices"
 msgstr "پیام‌ها"
 
 #. TRANS: Client exception displayed trying to delete a user account while not logged in.
-#: actions/deleteaccount.php:71
 #, fuzzy
 msgid "Only logged-in users can delete their account."
 msgstr "تنها کاربران وارد شده می توانند پیام‌ها را تکرار کنند."
 
 #. TRANS: Client exception displayed trying to delete a user account without have the rights to do that.
-#: actions/deleteaccount.php:77
 #, fuzzy
 msgid "You cannot delete your account."
 msgstr "شما نمی‌توانید کاربران را پاک کنید."
 
 #. TRANS: Confirmation text for user deletion. The user has to type this exactly the same, including punctuation.
-#: actions/deleteaccount.php:160 actions/deleteaccount.php:297
 msgid "I am sure."
 msgstr ""
 
 #. TRANS: Notification for user about the text that must be input to be able to delete a user account.
 #. TRANS: %s is the text that needs to be input.
-#: actions/deleteaccount.php:164
 #, php-format
 msgid "You must write \"%s\" exactly in the box."
 msgstr ""
 
 #. TRANS: Confirmation that a user account has been deleted.
-#: actions/deleteaccount.php:206
 #, fuzzy
 msgid "Account deleted."
 msgstr "چهره پاک شد."
 
 #. TRANS: Page title for page on which a user account can be deleted.
 #. TRANS: Option in profile settings to delete the account of the currently logged in user.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:476
 #, fuzzy
 msgid "Delete account"
 msgstr "ساختن یک جساب‌کاربری"
 
 #. TRANS: Form text for user deletion form.
-#: actions/deleteaccount.php:279
 msgid ""
 "This will <strong>permanently delete</strong> your account data from this "
 "server."
@@ -1933,7 +1518,6 @@ msgstr ""
 
 #. TRANS: Additional form text for user deletion form shown if a user has account backup rights.
 #. TRANS: %s is a URL to the backup page.
-#: actions/deleteaccount.php:285
 #, php-format
 msgid ""
 "You are strongly advised to <a href=\"%s\">back up your data</a> before "
@@ -1942,56 +1526,43 @@ msgstr ""
 
 #. TRANS: Field label for delete account confirmation entry.
 #. TRANS: Field label for password reset form where the password has to be typed again.
-#: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:262 actions/register.php:419
 msgid "Confirm"
 msgstr "تایید"
 
 #. TRANS: Input title for the delete account field.
 #. TRANS: %s is the text that needs to be input.
-#: actions/deleteaccount.php:304
 #, fuzzy, php-format
 msgid "Enter \"%s\" to confirm that you want to delete your account."
 msgstr "شما نمی‌توانید کاربران را پاک کنید."
 
 #. TRANS: Button title for user account deletion.
-#: actions/deleteaccount.php:323
 #, fuzzy
 msgid "Permanently delete your account"
 msgstr "شما نمی‌توانید کاربران را پاک کنید."
 
 #. TRANS: Client error displayed trying to delete an application while not logged in.
-#: actions/deleteapplication.php:62
 msgid "You must be logged in to delete an application."
 msgstr "برای پاک‌کردن یک برنامه باید وارد شده باشید."
 
 #. TRANS: Client error displayed trying to delete an application that does not exist.
-#: actions/deleteapplication.php:71
 msgid "Application not found."
 msgstr "برنامه یافت نشد."
 
 #. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
-#: actions/deleteapplication.php:79 actions/editapplication.php:78
-#: actions/showapplication.php:90
 msgid "You are not the owner of this application."
 msgstr "شما مالک این برنامه نیستید."
 
 #. TRANS: Client error text when there is a problem with the session token.
-#: actions/deleteapplication.php:102 actions/editapplication.php:131
-#: actions/newapplication.php:112 actions/showapplication.php:113
-#: lib/action.php:1391
 msgid "There was a problem with your session token."
 msgstr "یک مشکل با رمز نشست شما وجود داشت."
 
 #. TRANS: Title for delete application page.
 #. TRANS: Fieldset legend on delete application page.
-#: actions/deleteapplication.php:124 actions/deleteapplication.php:149
 msgid "Delete application"
 msgstr "حذف برنامه"
 
 #. TRANS: Confirmation text on delete application page.
-#: actions/deleteapplication.php:152
 msgid ""
 "Are you sure you want to delete this application? This will clear all data "
 "about the application from the database, including all existing user "
@@ -2002,19 +1573,16 @@ msgstr ""
 "می‌شود."
 
 #. TRANS: Submit button title for 'No' when deleting an application.
-#: actions/deleteapplication.php:161
 #, fuzzy
 msgid "Do not delete this application."
 msgstr "این برنامه حذف نشود"
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
-#: actions/deleteapplication.php:167
 #, fuzzy
 msgid "Delete this application."
 msgstr "این برنامه حذف شود"
 
 #. TRANS: Client error when trying to delete group while not logged in.
-#: actions/deletegroup.php:64
 #, fuzzy
 msgid "You must be logged in to delete a group."
 msgstr "برای ترک یک گروه، شما باید وارد شده باشید."
@@ -2022,40 +1590,33 @@ msgstr "برای ترک یک گروه، شما باید وارد شده باشی
 #. TRANS: Client error when trying to delete a group without providing a nickname or ID for the group.
 #. TRANS: Client error displayed when trying to join a group without providing a group name or group ID.
 #. TRANS: Client error displayed when trying to leave a group without providing a group name or group ID.
-#: actions/deletegroup.php:94 actions/joingroup.php:89
-#: actions/leavegroup.php:89
 msgid "No nickname or ID."
 msgstr "نام‌مستعار یا شناسه‌ای وجود ندارد."
 
 #. TRANS: Client error when trying to delete a group without having the rights to delete it.
-#: actions/deletegroup.php:107
 #, fuzzy
 msgid "You are not allowed to delete this group."
 msgstr "شما یک عضو این گروه نیستید."
 
 #. TRANS: Server error displayed if a group could not be deleted.
 #. TRANS: %s is the name of the group that could not be deleted.
-#: actions/deletegroup.php:150
 #, fuzzy, php-format
 msgid "Could not delete group %s."
 msgstr "نمی‌توان گروه را به‌هنگام‌سازی کرد."
 
 #. TRANS: Message given after deleting a group.
 #. TRANS: %s is the deleted group's name.
-#: actions/deletegroup.php:159
 #, fuzzy, php-format
 msgid "Deleted group %s"
 msgstr "%1$s گروه %2$s را ترک کرد"
 
 #. TRANS: Title of delete group page.
 #. TRANS: Form legend for deleting a group.
-#: actions/deletegroup.php:176 actions/deletegroup.php:202
 #, fuzzy
 msgid "Delete group"
 msgstr "حذف کاربر"
 
 #. TRANS: Warning in form for deleleting a group.
-#: actions/deletegroup.php:206
 #, fuzzy
 msgid ""
 "Are you sure you want to delete this group? This will clear all data about "
@@ -2066,13 +1627,11 @@ msgstr ""
 "پاک و بدون برگشت خواهند بود."
 
 #. TRANS: Submit button title for 'No' when deleting a group.
-#: actions/deletegroup.php:224
 #, fuzzy
 msgid "Do not delete this group."
 msgstr "این پیام را پاک نکن"
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
-#: actions/deletegroup.php:231
 #, fuzzy
 msgid "Delete this group."
 msgstr "حذف این کاربر"
@@ -2083,22 +1642,18 @@ msgstr "حذف این کاربر"
 #. TRANS: Client error displayed trying to block a user from a group while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying to log out when not logged in.
+#. TRANS: Client error displayed when trying to access the "make admin" page while not logged in.
+#. TRANS: Client error displayed trying to create a new direct message while not logged in.
+#. TRANS: Client error displayed trying to send a notice while not logged in.
+#. TRANS: Client error displayed trying to nudge a user without being logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
 #. TRANS: Client error displayed when trying to change user options while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
-#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:70
-#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
-#: actions/nudge.php:63 actions/pluginenable.php:97 actions/subedit.php:33
-#: actions/subscribe.php:98 actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:71 lib/profileformaction.php:63
-#: lib/settingsaction.php:72
 msgid "Not logged in."
 msgstr "شما به سیستم وارد نشده اید."
 
 #. TRANS: Instructions for deleting a notice.
-#: actions/deletenotice.php:110
 msgid ""
 "You are about to permanently delete a notice. Once this is done, it cannot "
 "be undone."
@@ -2108,51 +1663,42 @@ msgstr ""
 
 #. TRANS: Page title when deleting a notice.
 #. TRANS: Fieldset legend for the delete notice form.
-#: actions/deletenotice.php:117 actions/deletenotice.php:148
 msgid "Delete notice"
 msgstr "پیام را پاک کن"
 
 #. TRANS: Message for the delete notice form.
-#: actions/deletenotice.php:152
 msgid "Are you sure you want to delete this notice?"
 msgstr "آیا اطمینان دارید که می‌خواهید این پیام را پاک کنید؟"
 
 #. TRANS: Submit button title for 'No' when deleting a notice.
-#: actions/deletenotice.php:159
 #, fuzzy
 msgid "Do not delete this notice."
 msgstr "این پیام را پاک نکن"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:166
 #, fuzzy
 msgid "Delete this notice."
 msgstr "این پیام را پاک کن"
 
 #. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
-#: actions/deleteuser.php:66
 msgid "You cannot delete users."
 msgstr "شما نمی‌توانید کاربران را پاک کنید."
 
 #. TRANS: Client error displayed when trying to delete a non-local user.
-#: actions/deleteuser.php:74
 msgid "You can only delete local users."
 msgstr "شما فقط می‌توانید کاربران محلی را پاک کنید."
 
 #. TRANS: Title of delete user page.
-#: actions/deleteuser.php:110
 #, fuzzy
 msgctxt "TITLE"
 msgid "Delete user"
 msgstr "حذف کاربر"
 
 #. TRANS: Fieldset legend on delete user page.
-#: actions/deleteuser.php:134
 msgid "Delete user"
 msgstr "حذف کاربر"
 
 #. TRANS: Information text to request if a user is certain that the described action has to be performed.
-#: actions/deleteuser.php:138
 msgid ""
 "Are you sure you want to delete this user? This will clear all data about "
 "the user from the database, without a backup."
@@ -2161,103 +1707,84 @@ msgstr ""
 "پاک و بدون برگشت خواهند بود."
 
 #. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/deleteuser.php:158
 #, fuzzy
 msgid "Do not delete this user."
 msgstr "این پیام را پاک نکن"
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
-#: actions/deleteuser.php:165
 #, fuzzy
 msgid "Delete this user."
 msgstr "حذف این کاربر"
 
 #. TRANS: Message used as title for design settings for the site.
-#: actions/designadminpanel.php:60 lib/settingsnav.php:97
 msgid "Design"
 msgstr "طرح"
 
 #. TRANS: Instructions for design adminsitration panel.
-#: actions/designadminpanel.php:71
 msgid "Design settings for this StatusNet site"
 msgstr ""
 
 #. TRANS: Client error displayed when a logo URL does is not valid.
-#: actions/designadminpanel.php:327
 msgid "Invalid logo URL."
 msgstr "نشانی اینترنتی نشان نامعتبر است."
 
 #. TRANS: Client error displayed when an SSL logo URL is invalid.
-#: actions/designadminpanel.php:333
 #, fuzzy
 msgid "Invalid SSL logo URL."
 msgstr "نشانی اینترنتی نشان نامعتبر است."
 
 #. TRANS: Client error displayed when a theme is submitted through the form that is not in the theme list.
 #. TRANS: %s is the chosen unavailable theme.
-#: actions/designadminpanel.php:339
 #, php-format
 msgid "Theme not available: %s."
 msgstr "پوسته در دسترس نیست: %s."
 
 #. TRANS: Fieldset legend for form to change logo.
-#: actions/designadminpanel.php:437
 msgid "Change logo"
 msgstr "تغییر نشان"
 
 #. TRANS: Field label for StatusNet site logo.
-#: actions/designadminpanel.php:444
 msgid "Site logo"
 msgstr "نشان وب‌گاه"
 
 #. TRANS: Field label for SSL StatusNet site logo.
-#: actions/designadminpanel.php:452
 #, fuzzy
 msgid "SSL logo"
 msgstr "نشان وب‌گاه"
 
 #. TRANS: Fieldset legend for form change StatusNet site's theme.
-#: actions/designadminpanel.php:467
 msgid "Change theme"
 msgstr "تغییر پوسته"
 
 #. TRANS: Field label for dropdown to choose site theme.
-#: actions/designadminpanel.php:485
 msgid "Site theme"
 msgstr "پوستهٔ وب‌گاه"
 
 #. TRANS: Title for field label for dropdown to choose site theme.
-#: actions/designadminpanel.php:487
 msgid "Theme for the site."
 msgstr "پوسته برای وب‌گاه"
 
 #. TRANS: Field label for uploading a cutom theme.
-#: actions/designadminpanel.php:494
 msgid "Custom theme"
 msgstr "پوستهٔ اختصاصی"
 
 #. TRANS: Form instructions for uploading a cutom StatusNet theme.
-#: actions/designadminpanel.php:499
 msgid "You can upload a custom StatusNet theme as a .ZIP archive."
 msgstr ""
 "شما می‌توانید یک پوستهٔ اختصاصی StatusNet را به‌عنوان یک آرشیو .ZIP بارگذاری "
 "کنید."
 
 #. TRANS: Fieldset legend for theme background image.
-#: actions/designadminpanel.php:515
 msgid "Change background image"
 msgstr "تغییر تصویر پیش‌زمینه"
 
 #. TRANS: Field label for background image on theme designer page.
 #. TRANS: Field label for background color selector.
 #. TRANS: Label on profile design page for setting a profile page background colour.
-#: actions/designadminpanel.php:525 actions/designadminpanel.php:609
-#: lib/designform.php:238
 msgid "Background"
 msgstr "پیش‌زمینه"
 
 #. TRANS: Form guide for background image upload form on theme designer page.
-#: actions/designadminpanel.php:531
 #, php-format
 msgid ""
 "You can upload a background image for the site. The maximum file size is %1"
@@ -2267,206 +1794,171 @@ msgstr ""
 "پرونده %1 $s است."
 
 #. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:558
 msgid "On"
 msgstr "روشن"
 
 #. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:575
 msgid "Off"
 msgstr "خاموش"
 
 #. TRANS: Form guide for turning background image on or off on theme designer page.
 #. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
 #. TRANS: use of the uploaded profile image.
-#: actions/designadminpanel.php:577 lib/designform.php:214
 msgid "Turn background image on or off."
 msgstr "تصویر پیش‌زمینه را فعال یا غیرفعال کنید."
 
 #. TRANS: Checkbox label to title background image on theme designer page.
 #. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-#: actions/designadminpanel.php:583 lib/designform.php:220
 msgid "Tile background image"
 msgstr "تصویر پیش‌زمینهٔ موزاییکی"
 
 #. TRANS: Fieldset legend for theme colors.
-#: actions/designadminpanel.php:598
 #, fuzzy
 msgid "Change colors"
 msgstr "تغییر رنگ‌ها"
 
 #. TRANS: Field label for content color selector.
 #. TRANS: Label on profile design page for setting a profile page content colour.
-#: actions/designadminpanel.php:623 lib/designform.php:252
 msgid "Content"
 msgstr "محتوا"
 
 #. TRANS: Field label for sidebar color selector.
 #. TRANS: Label on profile design page for setting a profile page sidebar colour.
-#: actions/designadminpanel.php:637 lib/designform.php:266
 msgid "Sidebar"
 msgstr "ستون کناری"
 
 #. TRANS: Field label for text color selector.
 #. TRANS: Label on profile design page for setting a profile page text colour.
-#: actions/designadminpanel.php:651 lib/designform.php:280
 msgid "Text"
 msgstr "متن"
 
 #. TRANS: Field label for link color selector.
 #. TRANS: Label on profile design page for setting a profile page links colour.
-#: actions/designadminpanel.php:665 lib/designform.php:294
 msgid "Links"
 msgstr "پیوندها"
 
 #. TRANS: Fieldset legend for advanced theme design settings.
-#: actions/designadminpanel.php:691
 msgid "Advanced"
 msgstr "پیشرفته"
 
 #. TRANS: Field label for custom CSS.
-#: actions/designadminpanel.php:696
 msgid "Custom CSS"
 msgstr "CSS اختصاصی"
 
 #. TRANS: Button text for resetting theme settings.
-#: actions/designadminpanel.php:718
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Use defaults"
 msgstr "استفاده‌کردن از پیش‌فرض‌ها"
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:720
 #, fuzzy
 msgid "Restore default designs."
 msgstr "بازگرداندن طرح‌های پیش‌فرض"
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:728
 #, fuzzy
 msgid "Reset back to default."
 msgstr "برگشت به حالت پیش گزیده"
 
 #. TRANS: Title for button for saving theme settings.
-#: actions/designadminpanel.php:736
 #, fuzzy
 msgid "Save design."
 msgstr "ذخیره‌کردن طرح"
 
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
-#: actions/disfavor.php:83
 msgid "This notice is not a favorite!"
 msgstr "این پیام یک پیام برگزیده نیست!"
 
 #. TRANS: Title for page on which favorites can be added.
-#: actions/disfavor.php:98
 msgid "Add to favorites"
 msgstr "افزودن به برگزیده‌ها"
 
 #. TRANS: Client exception thrown when requesting a document from the documentation that does not exist.
 #. TRANS: %s is the non-existing document.
-#: actions/doc.php:155
 #, fuzzy, php-format
 msgid "No such document \"%s\"."
 msgstr "چنین پیوستی وجود ندارد."
 
 #. TRANS: Title for "Edit application" form.
 #. TRANS: Form legend.
-#: actions/editapplication.php:54 lib/applicationeditform.php:129
 msgid "Edit application"
 msgstr "ویرایش برنامه"
 
 #. TRANS: Client error displayed trying to edit an application while not logged in.
-#: actions/editapplication.php:66
 msgid "You must be logged in to edit an application."
 msgstr "برای ویرایش یک برنامه باید وارد شده باشید."
 
 #. TRANS: Client error displayed trying to edit an application that does not exist.
-#: actions/editapplication.php:83 actions/showapplication.php:83
 msgid "No such application."
 msgstr "چنین برنامه‌ای وجود ندارد."
 
 #. TRANS: Instructions for "Edit application" form.
-#: actions/editapplication.php:167
 msgid "Use this form to edit your application."
 msgstr "از این روش برای ویرایش برنامه‌تان استفاده کنید."
 
 #. TRANS: Validation error shown when not providing a name in the "Edit application" form.
 #. TRANS: Validation error shown when not providing a name in the "New application" form.
-#: actions/editapplication.php:184 actions/newapplication.php:164
 msgid "Name is required."
 msgstr "نام مورد نیاز است."
 
 #. 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.
-#: actions/editapplication.php:188 actions/newapplication.php:172
 #, fuzzy
 msgid "Name is too long (maximum 255 characters)."
 msgstr "نام خیلی طولانی است (حداکثر ۲۵۵ نویسه)."
 
 #. TRANS: Validation error shown when providing a name for an application that already exists in the "Edit application" form.
 #. TRANS: Validation error shown when providing a name for an application that already exists in the "New application" form.
-#: actions/editapplication.php:192 actions/newapplication.php:168
 msgid "Name already in use. Try another one."
 msgstr "این نام در حال حاضر مورد استفاده است. یکی دیگر را بیازمایید."
 
 #. TRANS: Validation error shown when not providing a description in the "Edit application" form.
 #. TRANS: Validation error shown when not providing a description in the "New application" form.
-#: actions/editapplication.php:196 actions/newapplication.php:176
 msgid "Description is required."
 msgstr "توصیف مورد نیاز است."
 
 #. TRANS: Validation error shown when providing too long a source URL in the "Edit application" form.
-#: actions/editapplication.php:209
 msgid "Source URL is too long."
 msgstr "نشانی اینترنتی منبع بسیار بلند است."
 
 #. TRANS: Validation error shown when providing an invalid source URL in the "Edit application" form.
 #. TRANS: Validation error shown when providing an invalid source URL in the "New application" form.
-#: actions/editapplication.php:216 actions/newapplication.php:199
 msgid "Source URL is not valid."
 msgstr "نشانی اینترنتی منبع معتبر نیست."
 
 #. 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.
-#: actions/editapplication.php:220 actions/newapplication.php:203
 msgid "Organization is required."
 msgstr "سازمانی‌دهی مورد نیاز است."
 
 #. TRANS: Validation error shown when providing too long an arganisation name in the "Edit application" form.
-#: actions/editapplication.php:224 actions/newapplication.php:207
 #, fuzzy
 msgid "Organization is too long (maximum 255 characters)."
 msgstr "نام سازمان خیلی طولانی است (حداکثر ۲۵۵ نویسه)."
 
 #. TRANS: Form validation error show when an organisation name has not been provided in the edit application form.
 #. TRANS: Form validation error show when an organisation name has not been provided in the new application form.
-#: actions/editapplication.php:228 actions/newapplication.php:211
 msgid "Organization homepage is required."
 msgstr "صفحهٔ‌خانگی سازمان مورد نیاز است."
 
 #. TRANS: Validation error shown when providing too long a callback URL in the "Edit application" form.
 #. TRANS: Validation error shown when providing too long a callback URL in the "New application" form.
-#: actions/editapplication.php:239 actions/newapplication.php:225
 #, fuzzy
 msgid "Callback is too long."
 msgstr "نشانی اینترنتی منبع بسیار بلند است."
 
 #. TRANS: Validation error shown when providing an invalid callback URL in the "Edit application" form.
 #. TRANS: Validation error shown when providing an invalid callback URL in the "New application" form.
-#: actions/editapplication.php:247 actions/newapplication.php:235
 #, fuzzy
 msgid "Callback URL is not valid."
 msgstr "نشانی اینترنتی منبع معتبر نیست."
 
 #. TRANS: Server error occuring when an application could not be updated from the "Edit application" form.
-#: actions/editapplication.php:284
 msgid "Could not update application."
 msgstr "نمی‌توان برنامه را به‌هنگام‌سازی کرد."
 
 #. TRANS: Title for form to edit a group. %s is a group nickname.
-#: actions/editgroup.php:55
 #, php-format
 msgid "Edit %s group"
 msgstr "ویرایش گروه %s"
@@ -2474,40 +1966,40 @@ msgstr "ویرایش گروه %s"
 #. TRANS: Client error displayed trying to edit a group while not logged in.
 #. TRANS: Client error displayed when trying to create a group while not logged in.
 #. TRANS: Client error displayed trying to create a group while not logged in.
-#: actions/editgroup.php:68 actions/grouplogo.php:69 actions/newgroup.php:65
 msgid "You must be logged in to create a group."
 msgstr "برای ساخت یک گروه، باید وارد شده باشید."
 
 #. TRANS: Form instructions for group edit form.
-#: actions/editgroup.php:161
 msgid "Use this form to edit the group."
 msgstr "از این روش برای ویرایش گروه استفاده کنید."
 
+#. TRANS: Group edit form validation error.
+#. TRANS: Group create form validation error.
+#. TRANS: %s is the invalid alias.
+#, php-format
+msgid "Invalid alias: \"%s\""
+msgstr "نام‌مستعار غیر مجاز: «%s»"
+
 #. TRANS: Group edit form success message.
-#: actions/editgroup.php:301
 msgid "Options saved."
 msgstr "گزینه‌ها ذخیره شدند."
 
 #. TRANS: Title for e-mail settings.
-#: actions/emailsettings.php:60
 msgid "Email settings"
 msgstr "تنظیمات پست الکترونیک"
 
 #. TRANS: E-mail settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/emailsettings.php:74
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 msgstr "چگونگی دریافت نامه از %%site.name%% را اداره کنید."
 
 #. TRANS: Form legend for e-mail settings form.
 #. TRANS: Field label for e-mail address input in e-mail settings form.
-#: actions/emailsettings.php:104 actions/emailsettings.php:130
 msgid "Email address"
 msgstr "نشانی پست الکترونیک"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:110
 msgid "Current confirmed email address."
 msgstr "نشانی پست الکترونیکی تایید شدهٔ کنونی"
 
@@ -2516,15 +2008,11 @@ msgstr "نشانی پست الکترونیکی تایید شدهٔ کنونی"
 #. TRANS: Button label to remove a confirmed IM address.
 #. TRANS: Button label to remove a confirmed SMS address.
 #. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
-#: actions/emailsettings.php:113 actions/emailsettings.php:180
-#: actions/imsettings.php:119 actions/smssettings.php:119
-#: actions/smssettings.php:175
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "حذف"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:120
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -2537,45 +2025,37 @@ msgstr ""
 #. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
 #. TRANS: Any other domain may be owned by a legitimate person or
 #. TRANS: organization.
-#: actions/emailsettings.php:137
 msgid "Email address, like \"UserName@example.org\""
 msgstr "نشانی پست الکترونیکی، مانند «UserName@example.org»"
 
 #. TRANS: Button label for adding an e-mail address in e-mail settings form.
 #. TRANS: Button label for adding an IM address in IM settings form.
 #. TRANS: Button label for adding a SMS phone number in SMS settings form.
-#: actions/emailsettings.php:141 actions/imsettings.php:147
-#: actions/smssettings.php:157
 msgctxt "BUTTON"
 msgid "Add"
 msgstr "افزودن"
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:149 actions/smssettings.php:166
 msgid "Incoming email"
 msgstr "پست الکترونیک ورودی"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:155
 msgid "I want to post notices by email."
 msgstr "می‌خواهم با نامه پیام بفرستم."
 
 #. TRANS: Form instructions for incoming e-mail form in e-mail settings.
 #. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
-#: actions/emailsettings.php:177 actions/smssettings.php:173
 msgid "Send email to this address to post new notices."
 msgstr ""
 "برای فرستادن پیام با استفاده از پست الکترونیک به این نشانی نامه بفرستید."
 
 #. TRANS: Instructions for incoming e-mail address input form, when an address has already been assigned.
 #. TRANS: Instructions for incoming SMS e-mail address input form.
-#: actions/emailsettings.php:186 actions/smssettings.php:181
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr "نشانی جدید برای فرستادن پیام ایجاد کن؛ نشانی قبلی لغو می‌شود."
 
 #. TRANS: Instructions for incoming e-mail address input form.
-#: actions/emailsettings.php:190
 msgid ""
 "To send notices via email, we need to create a unique email address for you "
 "on this server:"
@@ -2583,91 +2063,73 @@ msgstr ""
 
 #. TRANS: Button label for adding an e-mail address to send notices from.
 #. TRANS: Button label for adding an SMS e-mail address to send notices from.
-#: actions/emailsettings.php:196 actions/smssettings.php:184
 msgctxt "BUTTON"
 msgid "New"
 msgstr "تازه"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:205
 msgid "Email preferences"
 msgstr "ترجیحات پست الکترونیکی"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:213
 msgid "Send me notices of new subscriptions through email."
 msgstr "پیام‌های کسانی را که به تازگی دنبال می‌کنم با پست الکترونیک برایم بفرست."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:219
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr ""
 "هرگاه کسی پیام من را به عنوان برگزیده اضافه کرد، به من نامه فرستاده شود."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:226
 msgid "Send me email when someone sends me a private message."
 msgstr "هر وقت کسی برای من پیام خصوصی فرستاد، مرا با پست الکترونیک با خبر کن."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:232
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr "هرگاه کسی به من یک «@-پاسخ» می‌فرستد، به من نامه بفرست."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:238
 msgid "Allow friends to nudge me and send me an email."
 msgstr ""
 "به دوستان اجازه داده شود که به من یادآوری کنند و یک نامه به من بفرستند."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:244
 msgid "Publish a MicroID for my email address."
 msgstr "یک شناسه برای پست الکترونیک  من منتشر کن."
 
 #. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:362
 msgid "Email preferences saved."
 msgstr "ترجیحات پست الکترونیکی ذخیره شد."
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:381
 msgid "No email address."
 msgstr "پست الکترونیک وجود ندارد."
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:389
 #, fuzzy
 msgid "Cannot normalize that email address."
 msgstr "نمی‌توان نشانی را قانونی کرد"
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:394 actions/register.php:197
-#: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "یک نشانی پست الکترونیکی معتبر نیست."
 
 #. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:398
 msgid "That is already your email address."
 msgstr "هم اکنون نشانی شما همین است."
 
 #. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:402
 msgid "That email address already belongs to another user."
 msgstr "این نشانی در حال حاضر متعلق به فرد دیگری است."
 
 #. TRANS: Server error thrown on database error adding e-mail confirmation code.
 #. TRANS: Server error thrown on database error adding Instant Messaging confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:419 actions/imsettings.php:362
-#: actions/smssettings.php:364
 #, fuzzy
 msgid "Could not insert confirmation code."
 msgstr "نمی‌توان کد تایید را اضافه کرد."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:426
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
@@ -2678,104 +2140,84 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling Instant Messaging address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:446 actions/imsettings.php:391
-#: actions/smssettings.php:398
 msgid "No pending confirmation to cancel."
 msgstr "هیچ تاییدی برای فسخ کردن وجود ندارد."
 
 #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:451
 msgid "That is the wrong email address."
 msgstr "این نشانی پست الکترونیکی نادرست است."
 
 #. TRANS: Server error thrown on database error canceling e-mail address confirmation.
 #. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
-#: actions/emailsettings.php:460 actions/smssettings.php:412
 #, fuzzy
 msgid "Could not delete email confirmation."
 msgstr "نمی‌توان تصدیق پست الکترونیک را پاک کرد."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:465
 msgid "Email confirmation cancelled."
 msgstr "تایید پست الکترونیکی لغو شد."
 
 #. TRANS: Message given trying to remove an e-mail address that is not
 #. TRANS: registered for the active user.
-#: actions/emailsettings.php:484
 msgid "That is not your email address."
 msgstr "آن نشانی شما نیست."
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:505
 msgid "The email address was removed."
 msgstr "نشانی پست الکترونیکی پاک شده است."
 
 #. TRANS: Form validation error displayed when trying to remove an incoming e-mail address while no address has been set.
-#: actions/emailsettings.php:519 actions/smssettings.php:554
 msgid "No incoming email address."
 msgstr "هیچ نشانی ورودی وجود ندارد."
 
 #. 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.
-#: actions/emailsettings.php:531 actions/emailsettings.php:555
-#: actions/smssettings.php:565 actions/smssettings.php:590
 #, fuzzy
 msgid "Could not update user record."
 msgstr "نمی‌توان اطلاعات کاربر را به روز کرد."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
 #. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:535 actions/smssettings.php:569
 msgid "Incoming email address removed."
 msgstr "نشانی ورودی پاک شد."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
 #. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:559 actions/smssettings.php:594
 msgid "New incoming email address added."
 msgstr "نشانی ورودی جدید اضافه شد."
 
 #. TRANS: Client error displayed when trying to mark a notice as favorite that already is a favorite.
-#: actions/favor.php:80
 msgid "This notice is already a favorite!"
 msgstr "این پیام ازقبل برگزیده شده است!"
 
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
-#: actions/favor.php:95
 #, fuzzy
 msgid "Disfavor favorite."
 msgstr "خارج‌کردن از برگزیده‌ها"
 
 #. TRANS: Page title for first page of favorited notices.
 #. TRANS: Title for favourited notices section.
-#: actions/favorited.php:65 lib/popularnoticesection.php:62
-#: lib/publicgroupnav.php:93
 msgid "Popular notices"
 msgstr "پیام‌های برگزیده"
 
 #. TRANS: Page title for all but first page of favorited notices.
 #. TRANS: %d is the page number being displayed.
-#: actions/favorited.php:69
 #, php-format
 msgid "Popular notices, page %d"
 msgstr "پیام‌های برگزیده، صفحهٔ %d"
 
 #. TRANS: Description on page displaying favorited notices.
-#: actions/favorited.php:81
 msgid "The most popular notices on the site right now."
 msgstr "محبوب‌ترین پیام‌هایی که اکنون در این وب‌گاه هستند."
 
 #. TRANS: Text displayed instead of a list when a site does not yet have any favourited notices.
-#: actions/favorited.php:149
 msgid "Favorite notices appear on this page but no one has favorited one yet."
 msgstr ""
 "پیام‌های برگزیده در این صفحه نشان داده می‌شوند، ولی هنوز کسی چیزی را برنگزیده "
 "است."
 
 #. TRANS: Additional text displayed instead of a list when a site does not yet have any favourited notices for logged in users.
-#: actions/favorited.php:153
 msgid ""
 "Be the first to add a notice to your favorites by clicking the fave button "
 "next to any notice you like."
@@ -2785,7 +2227,6 @@ msgstr ""
 
 #. TRANS: Additional text displayed instead of a list when a site does not yet have any favourited notices for not logged in users.
 #. TRANS: %%action.register%% is a registration link. "[link text](link)" is Mark Down. Do not change the formatting.
-#: actions/favorited.php:158
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to add a "
@@ -2798,181 +2239,146 @@ msgstr ""
 #. TRANS: %s is a user's nickname.
 #. TRANS: Title for first page of favourite notices of a user.
 #. TRANS: %s is the user for whom the favourite notices are displayed.
-#: actions/favoritesrss.php:111 actions/showfavorites.php:76
-#: lib/personalgroupnav.php:110
 #, php-format
 msgid "%s's favorite notices"
 msgstr "پیام‌های برگزیدهٔ %s"
 
 #. TRANS: Desciption of RSS feed with favourite notices of a user.
 #. TRANS: %1$s is a user's nickname, %2$s is the name of the StatusNet site.
-#: actions/favoritesrss.php:117
 #, php-format
 msgid "Updates favored by %1$s on %2$s!"
 msgstr "پیام‌های دوست داشتنی %s در %s"
 
 #. TRANS: Page title for first page of featured users.
 #. TRANS: Title for featured users section.
-#: actions/featured.php:69 lib/featureduserssection.php:87
-#: lib/publicgroupnav.php:89
 msgid "Featured users"
 msgstr "کاربران ویژه"
 
 #. TRANS: Page title for all but first page of featured users.
 #. TRANS: %d is the page number being displayed.
-#: actions/featured.php:73
 #, php-format
 msgid "Featured users, page %d"
 msgstr "کاربران ویژه، صفحهٔ %d"
 
 #. TRANS: Description on page displaying featured users.
-#: actions/featured.php:102
 #, fuzzy, php-format
 msgid "A selection of some great users on %s."
 msgstr "یک انتخاب از برخی از کاربران مهم در %s"
 
 #. TRANS: Client error displayed when no notice ID was given trying do display a file.
-#: actions/file.php:36
 msgid "No notice ID."
 msgstr "هیچ شناسهٔ پیامی وجود ندارد."
 
 #. TRANS: Client error displayed when an invalid notice ID was given trying do display a file.
-#: actions/file.php:41
 msgid "No notice."
 msgstr "هیچ پیامی وجود ندارد."
 
 #. TRANS: Client error displayed when trying do display a file for a notice without a file attachement.
-#: actions/file.php:46
 msgid "No attachments."
 msgstr "هیچ پیوستی وجود ندارد."
 
 #. TRANS: Client error displayed when trying do display a file for a notice with file attachements
 #. TRANS: that could not be found.
-#: actions/file.php:58
 msgid "No uploaded attachments."
 msgstr "هیچ پیوست بارگذاری شده‌ای وجود ندارد."
 
 #. TRANS: Client error displayed when subscribing to a remote profile and an unexpected response is received.
-#: actions/finishremotesubscribe.php:69
 msgid "Not expecting this response!"
 msgstr "انتظار چنین واکنشی وجود نداشت!"
 
 #. TRANS: Client error displayed when subscribing to a remote profile that does not exist.
-#: actions/finishremotesubscribe.php:81
 msgid "User being listened to does not exist."
 msgstr "کاربری که دنبالش هستید وجود ندارد."
 
 #. TRANS: Client error displayed when subscribing to a remote profile that is a local profile.
-#: actions/finishremotesubscribe.php:89 actions/remotesubscribe.php:58
 msgid "You can use the local subscription!"
 msgstr "شما می‌توانید از دنبال کردن محلی استفاده کنید!"
 
 #. TRANS: Client error displayed when subscribing to a remote profile that is blocked form subscribing to.
-#: actions/finishremotesubscribe.php:102
 msgid "That user has blocked you from subscribing."
 msgstr "این کاربر شما را از دنبال کردن خودش منع کرده است."
 
 #. TRANS: Client error displayed when subscribing to a remote profile without providing an authorised token.
-#: actions/finishremotesubscribe.php:114
 msgid "You are not authorized."
 msgstr "شما شناسایی نشده اید."
 
 #. TRANS: Client error displayed when subscribing to a remote profile and conversion of the request token to access token fails.
-#: actions/finishremotesubscribe.php:118
 msgid "Could not convert request token to access token."
 msgstr "نمی‌توان نشانهٔ درخواست شما را به نشانهٔ دسترسی تبدیل کرد."
 
 #. TRANS: Client error displayed when subscribing to a remote profile fails because of an unsupported version of the OMB protocol.
-#: actions/finishremotesubscribe.php:124
 msgid "Remote service uses unknown version of OMB protocol."
 msgstr "خدمات مورد نظر از نسخهٔ نامفهومی از قرارداد OMB استفاده می‌کند."
 
 #. TRANS: Server error displayed when subscribing to a remote profile fails because the remote profile could not be updated.
-#: actions/finishremotesubscribe.php:145 lib/oauthstore.php:317
 msgid "Error updating remote profile."
 msgstr "خطا هنگام به‌هنگام‌سازی نمایهٔ از راه دور."
 
 #. TRANS: Client error displayed when requesting a non-existent file.
-#: actions/getfile.php:77
 msgid "No such file."
 msgstr "چنین پرونده‌ای وجود ندارد."
 
 #. TRANS: Client error displayed when requesting a file without having read access to it.
-#: actions/getfile.php:82
 msgid "Cannot read file."
 msgstr "نمی‌توان پرونده را خواند."
 
 #. TRANS: Client error displayed when trying to assign an invalid role to a user.
-#: actions/grantrole.php:61 actions/revokerole.php:62
 msgid "Invalid role."
 msgstr "وظیفه نامعتبر است."
 
 #. TRANS: Client error displayed when trying to assign an reserved role to a user.
-#: actions/grantrole.php:66 actions/revokerole.php:66
 msgid "This role is reserved and cannot be set."
 msgstr "این نقش از قبل تعیین شده است و نمی‌تواند کارگذاشته شود."
 
 #. TRANS: Client error displayed when trying to assign a role to a user while not being allowed to set roles.
-#: actions/grantrole.php:76
 msgid "You cannot grant user roles on this site."
 msgstr "شما نمی‌توانید در این وب‌گاه نقش‌های کاربری را اهدا کنید."
 
 #. TRANS: Client error displayed when trying to assign a role to a user that already has that role.
-#: actions/grantrole.php:84
 msgid "User already has this role."
 msgstr "کاربر از قبل این وظیفه را داشته است."
 
 #. TRANS: Client error displayed trying to block a user from a group while not specifying a to be blocked user profile.
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing a profile.
+#. TRANS: Client error displayed when not providing a profile ID on the Make Admin page.
 #. TRANS: Client error displayed trying a change a subscription without providing a profile.
 #. TRANS: Client error displayed when trying to change user options without specifying a user to work on.
-#: actions/groupblock.php:71 actions/groupunblock.php:71
-#: actions/makeadmin.php:71 actions/subedit.php:49
-#: lib/profileformaction.php:79
 msgid "No profile specified."
 msgstr "نمایه‌ای مشخص نشده است."
 
 #. TRANS: Client error displayed trying to block a user from a group while specifying a non-existing profile.
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing an existing profile.
+#. TRANS: Client error displayed when specifying an invalid profile ID on the Make Admin page.
 #. TRANS: Client error displayed trying a change a subscription for a non-existant profile ID.
 #. TRANS: Client error displayed when trying to change user options without specifying an existing user to work on.
-#: actions/groupblock.php:77 actions/groupunblock.php:77
-#: actions/makeadmin.php:76 actions/subedit.php:57 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:87
 msgid "No profile with that ID."
 msgstr "کاربری با چنین شناسه‌ای وجود ندارد."
 
 #. TRANS: Client error displayed trying to block a user from a group while not specifying a group to block a profile from.
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing a group.
-#: actions/groupblock.php:83 actions/groupunblock.php:83
-#: actions/makeadmin.php:81
+#. TRANS: Client error displayed when not providing a group ID on the Make Admin page.
 msgid "No group specified."
 msgstr "گروهی مشخص نشده است."
 
 #. TRANS: Client error displayed trying to block a user from a group while not being an admin user.
-#: actions/groupblock.php:95
 msgid "Only an admin can block group members."
 msgstr "فقط یک مدیر می‌تواند اعضای یک گروه را مسدود کند."
 
 #. TRANS: Client error displayed trying to block a user from a group while user is already blocked from the given group.
-#: actions/groupblock.php:100
 msgid "User is already blocked from group."
 msgstr "هم اکنون دسترسی کاربر به گروه مسدود شده است."
 
 #. TRANS: Client error displayed trying to block a user from a group while user is not a member of given group.
-#: actions/groupblock.php:106
 msgid "User is not a member of group."
 msgstr "کاربر عضو گروه نیست."
 
 #. TRANS: Title for block user from group page.
 #. TRANS: Form legend for form to block user from a group.
-#: actions/groupblock.php:141 actions/groupmembers.php:364
 msgid "Block user from group"
 msgstr "دسترسی کاربر به گروه مسدود شود"
 
 #. TRANS: Explanatory text for block user from group form before setting the block.
 #. TRANS: %1$s is that to be blocked user, %2$s is the group the user will be blocked from.
-#: actions/groupblock.php:169
 #, php-format
 msgid ""
 "Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They "
@@ -2984,156 +2390,129 @@ msgstr ""
 "مشترک گروه شوند."
 
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
-#: actions/groupblock.php:191
 #, fuzzy
 msgid "Do not block this user from this group."
 msgstr "دسترسی کاربر به گروه مسدود نشود"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
-#: actions/groupblock.php:198
 #, fuzzy
 msgid "Block this user from this group."
 msgstr "دسترسی کاربر به گروه مسدود شود"
 
 #. TRANS: Server error displayed when trying to block a user from a group fails because of an application error.
-#: actions/groupblock.php:215
 msgid "Database error blocking user from group."
 msgstr "اشکال پایگاه داده در مسدود کردن کاربر"
 
 #. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
 #. TRANS: Client error displayed trying to find a user by ID without providing an ID.
-#: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr "هیچ ID وجود ندارد."
 
 #. TRANS: Client error displayed trying to change group design settings while not logged in.
-#: actions/groupdesignsettings.php:67
 msgid "You must be logged in to edit a group."
 msgstr "برای ویرایش گروه باید وارد شوید."
 
 #. TRANS: Title group design settings page.
-#: actions/groupdesignsettings.php:146
 msgid "Group design"
 msgstr "ظاهر گروه"
 
 #. TRANS: Instructions for group design settings page.
-#: actions/groupdesignsettings.php:157
 msgid ""
 "Customize the way your group looks with a background image and a colour "
 "palette of your choice."
 msgstr "ظاهر گروه را تغییر دهید تا شما را راضی کند."
 
 #. TRANS: Form validation error displayed when group design settings could not be updated because of an application issue.
-#: actions/groupdesignsettings.php:262
 #, fuzzy
 msgid "Unable to update your design settings."
 msgstr "نمی‌توان تنظیمات طرح‌تان را ذخیره کرد."
 
 #. TRANS: Form text to confirm saved group design settings.
-#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:239
 msgid "Design preferences saved."
 msgstr "ترجیحات طرح ذخیره شد."
 
 #. TRANS: Title for group logo settings page.
 #. TRANS: Group logo form legend.
-#: actions/grouplogo.php:144 actions/grouplogo.php:199
 msgid "Group logo"
 msgstr "نشان گروه"
 
 #. TRANS: Instructions for group logo page.
 #. TRANS: %s is the maximum file size for that site.
-#: actions/grouplogo.php:156
 #, php-format
 msgid ""
 "You can upload a logo image for your group. The maximum file size is %s."
 msgstr "شما می‌توانید یک نشان برای گروه خود با بیشینه حجم %s بفرستید."
 
 #. TRANS: Submit button for uploading a group logo.
-#: actions/grouplogo.php:243
 msgid "Upload"
 msgstr "پایین‌گذاری"
 
 #. TRANS: Button text for cropping an uploaded group logo.
-#: actions/grouplogo.php:299
 msgid "Crop"
 msgstr "برش"
 
 #. TRANS: Form instructions on the group logo page.
-#: actions/grouplogo.php:376
 msgid "Pick a square area of the image to be the logo."
 msgstr "یک ناحیه‌ی مربع از تصویر را انتخاب کنید تا به عنوان نشان انتخاب شود."
 
 #. TRANS: Form success message after updating a group logo.
-#: actions/grouplogo.php:411
 msgid "Logo updated."
 msgstr "نشان به‌هنگام‌سازی شد."
 
 #. TRANS: Form failure message after failing to update a group logo.
-#: actions/grouplogo.php:414
 msgid "Failed updating logo."
 msgstr "به‌هنگام‌سازی نشان شکست خورد."
 
 #. TRANS: Title of the page showing group members.
 #. TRANS: %s is the name of the group.
-#: actions/groupmembers.php:104
 #, php-format
 msgid "%s group members"
 msgstr "اعضای گروه %s"
 
 #. TRANS: Title of the page showing group members.
 #. TRANS: %1$s is the name of the group, %2$d is the page number of the members list.
-#: actions/groupmembers.php:109
 #, php-format
 msgid "%1$s group members, page %2$d"
 msgstr "اعضای گروه %1$s، صفحهٔ %2$d"
 
 #. TRANS: Page notice for group members page.
-#: actions/groupmembers.php:125
 msgid "A list of the users in this group."
 msgstr "یک فهرست از کاربران در این گروه"
 
 #. TRANS: Indicator in group members list that this user is a group administrator.
-#: actions/groupmembers.php:190 lib/action.php:581
 msgid "Admin"
 msgstr "مدیر"
 
 #. TRANS: Button text for the form that will block a user from a group.
-#: actions/groupmembers.php:397
 msgctxt "BUTTON"
 msgid "Block"
 msgstr ""
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:401
 msgctxt "TOOLTIP"
 msgid "Block this user"
 msgstr "بستن کاربر"
 
 #. TRANS: Form legend for form to make a user a group admin.
-#: actions/groupmembers.php:488
 msgid "Make user an admin of the group"
 msgstr "کاربر یک مدیر گروه شود"
 
 #. TRANS: Button text for the form that will make a user administrator.
-#: actions/groupmembers.php:521
 msgctxt "BUTTON"
 msgid "Make Admin"
 msgstr ""
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:525
 msgctxt "TOOLTIP"
 msgid "Make this user an admin"
 msgstr "کاربر را مدیر کن"
 
 #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
-#: actions/grouprss.php:141
 #, php-format
 msgid "Updates from members of %1$s on %2$s!"
 msgstr "به روز رسانی کابران %1$s در %2$s"
 
 #. TRANS: Title for first page of the groups list.
-#: actions/groups.php:62
 #, fuzzy
 msgctxt "TITLE"
 msgid "Groups"
@@ -3141,7 +2520,6 @@ msgstr "گروه‌ها"
 
 #. TRANS: Title for all but the first page of the groups list.
 #. TRANS: %d is the page number.
-#: actions/groups.php:66
 #, fuzzy, php-format
 msgctxt "TITLE"
 msgid "Groups, page %d"
@@ -3150,7 +2528,6 @@ msgstr "گروه‌ها، صفحهٔ %d"
 #. TRANS: Page notice of group list. %%%%site.name%%%% is the StatusNet site name,
 #. TRANS: %%%%action.groupsearch%%%% and %%%%action.newgroup%%%% are URLs. Do not change them.
 #. TRANS: This message contains Markdown links in the form [link text](link).
-#: actions/groups.php:95
 #, fuzzy, php-format
 msgid ""
 "%%%%site.name%%%% groups let you find and talk with people of similar "
@@ -3166,12 +2543,10 @@ msgstr ""
 "را خودتان بسازید](%%%%action.newgroup%%%%)"
 
 #. TRANS: Link to create a new group on the group list page.
-#: actions/groups.php:113 actions/usergroups.php:126 lib/groupeditform.php:115
 msgid "Create a new group"
 msgstr "یک گروه جدید بساز"
 
 #. TRANS: Instructions for page where groups can be searched. %%site.name%% is the name of the StatusNet site.
-#: actions/groupsearch.php:53
 #, php-format
 msgid ""
 "Search for groups on %%site.name%% by their name, location, or description. "
@@ -3181,21 +2556,17 @@ msgstr ""
 "عبارت‌ها را با فاصله جدا کنید؛ آن‌ها باید ۳ نویسه یا بیش‌تر باشند."
 
 #. TRANS: Title for page where groups can be searched.
-#: actions/groupsearch.php:60
 msgid "Group search"
 msgstr "جست‌وجوی گروه"
 
 #. TRANS: Text on page where groups can be searched if no results were found for a query.
 #. TRANS: Text for notice search results is the query had no results.
 #. TRANS: Message on the "People search" page where a query has no results.
-#: actions/groupsearch.php:82 actions/noticesearch.php:122
-#: actions/peoplesearch.php:87
 msgid "No results."
 msgstr "نتیجه‌ای وجود ندارد."
 
 #. TRANS: Additional text on page where groups can be searched if no results were found for a query for a logged in user.
 #. TRANS: This message contains Markdown links in the form [link text](link).
-#: actions/groupsearch.php:87
 #, fuzzy, php-format
 msgid ""
 "If you cannot find the group you're looking for, you can [create it](%%"
@@ -3206,7 +2577,6 @@ msgstr ""
 
 #. TRANS: Additional text on page where groups can be searched if no results were found for a query for a not logged in user.
 #. TRANS: This message contains Markdown links in the form [link text](link).
-#: actions/groupsearch.php:92
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and [create the group](%%"
@@ -3216,30 +2586,25 @@ msgstr ""
 "newgroup%%) نمی‌کنید!"
 
 #. TRANS: Client error displayed when trying to unblock a user from a group without being an administrator for the group.
-#: actions/groupunblock.php:95
 msgid "Only an admin can unblock group members."
 msgstr "تنها یک مدیر توانایی برداشتن منع کاربران گروه را دارد."
 
 #. TRANS: Client error displayed when trying to unblock a non-blocked user from a group.
-#: actions/groupunblock.php:100
 msgid "User is not blocked from group."
 msgstr "کاربر از گروه منع نشده است."
 
 #. TRANS: Server error displayed when unblocking a user from a group fails because of an unknown error.
 #. TRANS: Server error displayed when removing a user block.
-#: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "اشکال در پاکسازی"
 
 #. TRANS: Title for Instant Messaging settings.
-#: actions/imsettings.php:56
 msgid "IM settings"
 msgstr "تنظیمات پیام‌رسان فوری"
 
 #. 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.
-#: actions/imsettings.php:69
 #, fuzzy, php-format
 msgid ""
 "You can send and receive notices through instant messaging [instant messages]"
@@ -3249,18 +2614,15 @@ msgstr ""
 "یا Gtalk ارسال/دریافت کنید. نشانی خود را در این قسمت تنظیم کنید"
 
 #. TRANS: Message given in the IM settings if IM is not enabled on the site.
-#: actions/imsettings.php:90
 msgid "IM is not available."
 msgstr "پیام‌رسان فوری در دسترس نیست."
 
-#: actions/imsettings.php:116
 #, fuzzy, php-format
 msgid "Current confirmed %s address."
 msgstr "نشانی پست الکترونیکی تایید شدهٔ کنونی"
 
 #. TRANS: Form note in IM settings form.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:128
 #, fuzzy, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your %s account for a message "
@@ -3269,88 +2631,73 @@ msgstr ""
 "منتظر تایید این نشانی هستیم. لطفا Jabber/Gtalk خود را برای دریافت توضیحات "
 "بیش‌تر بررسی کنید. (آیا %s را به فهرست خود اضافه کرده اید؟) "
 
-#: actions/imsettings.php:140
 msgid "IM address"
 msgstr "نشانی پیام‌رسان فوری"
 
-#: actions/imsettings.php:142
 #, php-format
 msgid "%s screenname."
 msgstr ""
 
 #. TRANS: Header for IM preferences form.
-#: actions/imsettings.php:163
 #, fuzzy
 msgid "IM Preferences"
 msgstr "ترجیحات پیام‌رسان فوری"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:174
 #, fuzzy
 msgid "Send me notices"
 msgstr "فرستادن یک پیام"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:176
 #, fuzzy
 msgid "Post a notice when my status changes."
 msgstr "هر وقت که وضعیت Jabber/Gtalk من تغییر کرد، یک پیام بفرست."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:178
 #, fuzzy
 msgid "Send me replies from people I'm not subscribed to."
 msgstr "پاسخ کسانی که من آن‌ها را دنبال نمی‌کنم را با Jabber/Gtalk برایم بفرست."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:181
 #, fuzzy
 msgid "Publish a MicroID"
 msgstr "یک شناسه برای پست الکترونیک  من منتشر کن."
 
 #. TRANS: Server error thrown on database error updating IM preferences.
-#: actions/imsettings.php:291
 #, fuzzy
 msgid "Couldn't update IM preferences."
 msgstr "نمی‌توان کاربر را به‌هنگام‌سازی کرد."
 
 #. TRANS: Confirmation message for successful IM preferences save.
 #. TRANS: Confirmation message after saving preferences.
-#: actions/imsettings.php:298 actions/urlsettings.php:244
 msgid "Preferences saved."
 msgstr "تنظیمات ذخیره شد."
 
 #. TRANS: Message given saving IM address without having provided one.
-#: actions/imsettings.php:320
 #, fuzzy
 msgid "No screenname."
 msgstr "لقبی وجود ندارد."
 
-#: actions/imsettings.php:325
 #, fuzzy
 msgid "No transport."
 msgstr "هیچ پیامی وجود ندارد."
 
 #. TRANS: Message given saving IM address that cannot be normalised.
-#: actions/imsettings.php:333
 #, fuzzy
 msgid "Cannot normalize that screenname"
 msgstr "نمی‌توان شناسهٔ Jabber را تایید کرد"
 
 #. TRANS: Message given saving IM address that not valid.
-#: actions/imsettings.php:340
 #, fuzzy
 msgid "Not a valid screenname"
 msgstr "لقب نا معتبر."
 
 #. TRANS: Message given saving IM address that is already set for another user.
-#: actions/imsettings.php:344
 #, fuzzy
 msgid "Screenname already belongs to another user."
 msgstr "شناسهٔ Jabber به یک کاربر دیگر مربوط است."
 
 #. TRANS: Message given saving valid IM address that is to be confirmed.
-#: actions/imsettings.php:369
 #, fuzzy
 msgid "A confirmation code was sent to the IM address you added."
 msgstr ""
@@ -3358,85 +2705,71 @@ msgstr ""
 "برای فرستادن پیام به شما، تایید کنید."
 
 #. TRANS: Message given canceling IM address confirmation for the wrong IM address.
-#: actions/imsettings.php:396
 msgid "That is the wrong IM address."
 msgstr "نشانی پیام رسان اشتباه است."
 
 #. TRANS: Server error thrown on database error canceling IM address confirmation.
-#: actions/imsettings.php:405
 #, fuzzy
 msgid "Couldn't delete confirmation."
 msgstr "نمی‌توان تایید پیام‌رسان فوری را پاک کرد."
 
 #. TRANS: Message given after successfully canceling IM address confirmation.
-#: actions/imsettings.php:410
 msgid "IM confirmation cancelled."
 msgstr "تایید پیام‌رسان فوری لغو شد."
 
 #. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.
-#: actions/imsettings.php:434
 #, fuzzy
 msgid "That is not your screenname."
 msgstr "این شمارهٔ تلفن شما نیست."
 
 #. TRANS: Server error thrown on database error removing a registered IM address.
-#: actions/imsettings.php:443
 #, fuzzy
 msgid "Couldn't update user im prefs."
 msgstr "نمی‌توان اطلاعات کاربر را به روز کرد."
 
 #. TRANS: Message given after successfully removing a registered Instant Messaging address.
-#: actions/imsettings.php:451
 msgid "The IM address was removed."
 msgstr "نشانی پیام‌رسان فوری پاک شده است."
 
 #. TRANS: Title for all but the first page of the inbox page.
 #. TRANS: %1$s is the user's nickname, %2$s is the page number.
-#: actions/inbox.php:59
 #, php-format
 msgid "Inbox for %1$s - page %2$d"
 msgstr "صندوق ورودی %1$s - صفحهٔ %2$d"
 
 #. TRANS: Title for the first page of the inbox page.
 #. TRANS: %s is the user's nickname.
-#: actions/inbox.php:64
 #, php-format
 msgid "Inbox for %s"
 msgstr "صندوق ورودی %s"
 
 #. TRANS: Instructions for user inbox page.
-#: actions/inbox.php:106
 msgid "This is your inbox, which lists your incoming private messages."
 msgstr "این صندوق ورودی‌های شماست که پیام‌های خصوصی شما در آن خواهد بود."
 
 #. TRANS: Client error displayed when trying to sent invites while they have been disabled.
-#: actions/invite.php:41
 msgid "Invites have been disabled."
 msgstr "دعوت‌کردن از کار انداخته شده است."
 
 #. TRANS: Client error displayed when trying to sent invites while not logged in.
 #. TRANS: %s is the StatusNet site name.
-#: actions/invite.php:45
 #, php-format
 msgid "You must be logged in to invite other users to use %s."
 msgstr "شما برای دعوت دیگران به استفاده از %s باید وارد شده باشید."
 
 #. TRANS: Form validation message when providing an e-mail address that does not validate.
 #. TRANS: %s is an invalid e-mail address.
-#: actions/invite.php:78
 #, fuzzy, php-format
 msgid "Invalid email address: %s."
 msgstr "پست‌الکترونیک صحیح نیست: %s"
 
 #. TRANS: Page title when invitations have been sent.
-#: actions/invite.php:117
 #, fuzzy
 msgid "Invitations sent"
 msgstr "دعوت‌نامه(ها) فرستاده‌شد"
 
 #. TRANS: Page title when inviting potential users.
-#: actions/invite.php:120
 msgid "Invite new users"
 msgstr "دعوت کردن کاربران تازه"
 
@@ -3444,7 +2777,6 @@ msgstr "دعوت کردن کاربران تازه"
 #. TRANS: is already subscribed to one or more users with the given e-mail address(es).
 #. TRANS: Plural form is based on the number of reported already subscribed e-mail addresses.
 #. TRANS: Followed by a bullet list.
-#: actions/invite.php:140
 #, fuzzy
 msgid "You are already subscribed to this user:"
 msgid_plural "You are already subscribed to these users:"
@@ -3452,7 +2784,6 @@ msgstr[0] "شما هم‌اکنون مشترک این کاربران هستید:
 
 #. TRANS: Used as list item for already subscribed users (%1$s is nickname, %2$s is e-mail address).
 #. TRANS: Used as list item for already registered people (%1$s is nickname, %2$s is e-mail address).
-#: actions/invite.php:146 actions/invite.php:160
 #, fuzzy, php-format
 msgctxt "INVITE"
 msgid "%1$s (%2$s)"
@@ -3461,7 +2792,6 @@ msgstr "%1$s (%2$s)"
 #. TRANS: Message displayed inviting users to use a StatusNet site while the invited user
 #. TRANS: already uses a this StatusNet site. Plural form is based on the number of
 #. TRANS: reported already present people. Followed by a bullet list.
-#: actions/invite.php:154
 #, fuzzy
 msgid "This person is already a user and you were automatically subscribed:"
 msgid_plural ""
@@ -3471,7 +2801,6 @@ msgstr[0] "این کاربرانی هستند که شما به صورت خودک
 #. TRANS: Message displayed inviting users to use a StatusNet site. Plural form is
 #. TRANS: based on the number of invitations sent. Followed by a bullet list of
 #. TRANS: e-mail addresses to which invitations were sent.
-#: actions/invite.php:168
 #, fuzzy
 msgid "Invitation sent to the following person:"
 msgid_plural "Invitations sent to the following people:"
@@ -3479,7 +2808,6 @@ msgstr[0] "دعوت‌نامه(ها) برای افراد زیر فرستاده 
 
 #. TRANS: Generic message displayed after sending out one or more invitations to
 #. TRANS: people to join a StatusNet site.
-#: actions/invite.php:178
 msgid ""
 "You will be notified when your invitees accept the invitation and register "
 "on the site. Thanks for growing the community!"
@@ -3488,35 +2816,30 @@ msgstr ""
 "برای رشد اجتماع کاربران تشکر می‌کنیم!"
 
 #. TRANS: Form instructions.
-#: actions/invite.php:191
 msgid ""
 "Use this form to invite your friends and colleagues to use this service."
 msgstr ""
 "برای دعوت دوستان و تشویق آن‌ها به استفاده از خدمات از فرم زیر استفاده کنید."
 
 #. TRANS: Field label for a list of e-mail addresses.
-#: actions/invite.php:218
 msgid "Email addresses"
 msgstr "نشانی‌های پست الکترونیکی"
 
 #. TRANS: Tooltip for field label for a list of e-mail addresses.
-#: actions/invite.php:221
 #, fuzzy
 msgid "Addresses of friends to invite (one per line)."
 msgstr "نشانی دوستان (یک نشانی در هر خط("
 
 #. TRANS: Field label for a personal message to send to invitees.
-#: actions/invite.php:225
 msgid "Personal message"
 msgstr "پیام خصوصی"
 
 #. TRANS: Tooltip for field label for a personal message to send to invitees.
-#: actions/invite.php:228
 msgid "Optionally add a personal message to the invitation."
 msgstr "در صورت تمایل می‌توانید یک پیام به همراه دعوت نامه بفرستید."
 
 #. TRANS: Send button for inviting friends
-#: actions/invite.php:232
+#. TRANS: Button text for sending notice.
 msgctxt "BUTTON"
 msgid "Send"
 msgstr "فرستادن"
@@ -3524,7 +2847,6 @@ msgstr "فرستادن"
 #. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral
 #. TRANS: singular 3rd-person pronoun in English. %1$s is the inviting user, $2$s is
 #. TRANS: the StatusNet sitename.
-#: actions/invite.php:264
 #, php-format
 msgid "%1$s has invited you to join them on %2$s"
 msgstr "%1$s شما را دعوت کرده است که در %2$s به آن‌ها بپیوندید."
@@ -3534,7 +2856,6 @@ msgstr "%1$s شما را دعوت کرده است که در %2$s به آن‌ه
 #. TRANS: StatusNet sitename, %3$s is the site URL, %4$s is the personal message from the
 #. TRANS: inviting user, %s%5 a link to the timeline for the inviting user, %s$6 is a link
 #. TRANS: to register with the StatusNet site.
-#: actions/invite.php:271
 #, php-format
 msgid ""
 "%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -3593,182 +2914,177 @@ msgstr ""
 "با تشکر، %2$s\n"
 
 #. TRANS: Client error displayed when trying to join a group while not logged in.
-#: actions/joingroup.php:59
 msgid "You must be logged in to join a group."
 msgstr "برای پیوستن به یک گروه، باید وارد شده باشید."
 
 #. TRANS: Title for join group page after joining.
-#: actions/joingroup.php:148
 #, fuzzy, php-format
 msgctxt "TITLE"
 msgid "%1$s joined group %2$s"
 msgstr "%1$s به گروه %2$s پیوست"
 
 #. TRANS: Client error displayed when trying to leave a group while not logged in.
-#: actions/leavegroup.php:59
 msgid "You must be logged in to leave a group."
 msgstr "برای ترک یک گروه، شما باید وارد شده باشید."
 
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
-#: actions/leavegroup.php:103 lib/command.php:398
 msgid "You are not a member of that group."
 msgstr "شما یک کاربر این گروه نیستید."
 
 #. TRANS: Title for leave group page after leaving.
-#: actions/leavegroup.php:142
 #, fuzzy, php-format
 msgctxt "TITLE"
 msgid "%1$s left group %2$s"
 msgstr "%1$s گروه %2$s را ترک کرد"
 
 #. TRANS: User admin panel title
-#: actions/licenseadminpanel.php:55
 msgctxt "TITLE"
 msgid "License"
 msgstr ""
 
-#: actions/licenseadminpanel.php:65
+#. TRANS: Form instructions for the site license admin panel.
 msgid "License for this StatusNet site"
 msgstr ""
 
-#: actions/licenseadminpanel.php:134
+#. TRANS: Client error displayed selecting an invalid license in the license admin panel.
 msgid "Invalid license selection."
 msgstr ""
 
-#: actions/licenseadminpanel.php:144
+#. TRANS: Client error displayed when not specifying an owner for the all rights reserved license in the license admin panel.
 msgid ""
 "You must specify the owner of the content when using the All Rights Reserved "
 "license."
 msgstr ""
 
-#: actions/licenseadminpanel.php:151
+#. TRANS: Client error displayed selecting a too long license title in the license admin panel.
 #, fuzzy
 msgid "Invalid license title. Maximum length is 255 characters."
 msgstr "متن خوشامدگویی نامعتبر است. بیشینهٔ طول متن ۲۵۵ نویسه است."
 
-#: actions/licenseadminpanel.php:163
+#. TRANS: Client error displayed specifying an invalid license URL in the license admin panel.
 msgid "Invalid license URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:166
+#. TRANS: Client error displayed specifying an invalid license image URL in the license admin panel.
 msgid "Invalid license image URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:174
+#. TRANS: Client error displayed specifying an invalid license URL in the license admin panel.
 msgid "License URL must be blank or a valid URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:182
+#. TRANS: Client error displayed specifying an invalid license image URL in the license admin panel.
 msgid "License image must be blank or valid URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:232
+#. TRANS: Form legend in the license admin panel.
 msgid "License selection"
 msgstr ""
 
-#: actions/licenseadminpanel.php:238
+#. TRANS: License option in the license admin panel.
 msgid "Private"
 msgstr "خصوصی"
 
-#: actions/licenseadminpanel.php:239
+#. TRANS: License option in the license admin panel.
 msgid "All Rights Reserved"
 msgstr ""
 
-#: actions/licenseadminpanel.php:240
+#. TRANS: License option in the license admin panel.
 msgid "Creative Commons"
 msgstr ""
 
-#: actions/licenseadminpanel.php:245
+#. TRANS: Dropdown field label in the license admin panel.
 msgid "Type"
 msgstr ""
 
-#: actions/licenseadminpanel.php:247
-msgid "Select license"
-msgstr ""
+#. TRANS: Dropdown field instructions in the license admin panel.
+#, fuzzy
+msgid "Select a license."
+msgstr "یک اپراتور را انتخاب کنید"
 
-#: actions/licenseadminpanel.php:261
+#. TRANS: Form legend in the license admin panel.
 msgid "License details"
 msgstr ""
 
-#: actions/licenseadminpanel.php:267
+#. TRANS: Field label in the license admin panel.
 msgid "Owner"
 msgstr ""
 
-#: actions/licenseadminpanel.php:268
+#. TRANS: Field title in the license admin panel.
 msgid "Name of the owner of the site's content (if applicable)."
 msgstr ""
 
-#: actions/licenseadminpanel.php:276
+#. TRANS: Field label in the license admin panel.
 msgid "License Title"
 msgstr ""
 
-#: actions/licenseadminpanel.php:277
+#. TRANS: Field title in the license admin panel.
 msgid "The title of the license."
 msgstr ""
 
-#: actions/licenseadminpanel.php:285
+#. TRANS: Field label in the license admin panel.
 msgid "License URL"
 msgstr ""
 
-#: actions/licenseadminpanel.php:286
+#. TRANS: Field title in the license admin panel.
 msgid "URL for more information about the license."
 msgstr ""
 
-#: actions/licenseadminpanel.php:293
+#. TRANS: Field label in the license admin panel.
 msgid "License Image URL"
 msgstr ""
 
-#: actions/licenseadminpanel.php:294
+#. TRANS: Field title in the license admin panel.
 msgid "URL for an image to display with the license."
 msgstr ""
 
-#. TRANS: Submit button title.
-#: actions/licenseadminpanel.php:311 actions/sessionsadminpanel.php:199
-#: actions/siteadminpanel.php:292 actions/snapshotadminpanel.php:245
-#: actions/tagother.php:133 lib/applicationeditform.php:357
-msgid "Save"
-msgstr "ذخیره‌کردن"
-
-#: actions/licenseadminpanel.php:311
-msgid "Save license settings"
-msgstr ""
+#. TRANS: Button title in the license admin panel.
+#, fuzzy
+msgid "Save license settings."
+msgstr "ذخیرهٔ تنظیمات وب‌گاه"
 
+#. TRANS: Client error displayed when trying to log in while already logged in.
 #. TRANS: Client error displayed trying to use "one time password login" when already logged in.
-#: actions/login.php:97 actions/otp.php:62 actions/register.php:130
 msgid "Already logged in."
 msgstr "قبلا وارد شده"
 
-#: actions/login.php:125
+#. TRANS: Form validation error displayed when trying to log in with incorrect credentials.
 msgid "Incorrect username or password."
 msgstr "نام کاربری یا گذرواژه نادرست است."
 
+#. TRANS: Server error displayed when during login a server error occurs.
 #. TRANS: Server error displayed when a user object could not be created trying to login using "one time password login".
-#: actions/login.php:131 actions/otp.php:127
 msgid "Error setting user. You are probably not authorized."
 msgstr "خطا در تنظیم کاربر. شما احتمالا اجازهٔ این کار را ندارید."
 
-#: actions/login.php:185 actions/login.php:236 lib/action.php:598
+#. TRANS: Page title for login page.
 msgid "Login"
 msgstr "ورود"
 
-#: actions/login.php:222
+#. TRANS: Form legend on login page.
 msgid "Login to site"
 msgstr "ورود به وب‌گاه"
 
-#: actions/login.php:231 actions/register.php:469
+#. TRANS: Checkbox label label on login page.
 msgid "Remember me"
 msgstr "مرا به یاد بسپار"
 
-#: actions/login.php:232 actions/register.php:471
+#. TRANS: Checkbox title on login page.
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "وارد شدن خودکار. نه برای کامپیوترهای مشترک!"
 
-#: actions/login.php:241
+#. TRANS: Button text for log in on login page.
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Login"
+msgstr "ورود"
+
+#. TRANS: Link text for link to "reset password" on login page.
 msgid "Lost or forgotten password?"
 msgstr "گذرواژهٔ خود را گم یا فراموش کرده‌اید؟"
 
-#: actions/login.php:259
+#. TRANS: Form instructions on login page before being able to change user settings.
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -3776,140 +3092,135 @@ msgstr ""
 "به دلایل امنیتی، لطفا نام کاربری و گذرواژهٔ خود را قبل از تغییر تنظیمات "
 "دوباره وارد نمایید."
 
-#: actions/login.php:263
+#. TRANS: Form instructions on login page.
 msgid "Login with your username and password."
 msgstr "با نام‌کاربری و گذرواژه‌تان وارد شوید."
 
-#: actions/login.php:266
+#. TRANS: Form instructions on login page. This message contains Markdown links in the form [Link text](Link).
+#. TRANS: %%action.register%% is a link to the registration page.
 #, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
 msgstr ""
 "هنوز یک نام‌کاربری ندارید؟ یک حساب تازه [ثبت کنید](%%action.register%%)."
 
-#: actions/makeadmin.php:92
+#. TRANS: Client error displayed when trying to make another user admin on the Make Admin page while not an admin.
 msgid "Only an admin can make another user an admin."
 msgstr "فقط یک مدیر می‌تواند کاربر دیگری را مدیر کند."
 
-#: actions/makeadmin.php:96
+#. TRANS: Client error displayed when trying to make another user admin on the Make Admin page who already is admin.
+#. TRANS: %1$s is the user that is already admin, %2$s is the group user is already admin for.
 #, php-format
 msgid "%1$s is already an admin for group \"%2$s\"."
 msgstr "%1$s از قبل مدیر گروه «%2$s» است."
 
-#: actions/makeadmin.php:133
+#. TRANS: Server error displayed when trying to make another user admin on the Make Admin page fails
+#. TRANS: because the group membership record could not be gotten.
+#. TRANS: %1$s is the to be admin user, %2$s is the group user should be admin for.
 #, php-format
 msgid "Can't get membership record for %1$s in group %2$s."
 msgstr "نمی‌توان پیشینهٔ عضویت %1$s را در گروه %2$s به‌دست آورد."
 
-#: actions/makeadmin.php:146
+#. TRANS: Server error displayed when trying to make another user admin on the Make Admin page fails
+#. TRANS: because the group adminship record coud not be saved properly.
+#. TRANS: %1$s is the to be admin user, %2$s is the group user is already admin for.
 #, php-format
 msgid "Can't make %1$s an admin for group %2$s."
 msgstr "نمی‌توان %1$s را یکی از مدیران گروه %2$s کرد."
 
-#: actions/microsummary.php:69
+#. TRANS: Client error displayed trying to make a micro summary without providing a status.
 msgid "No current status."
 msgstr "وضعیت فعلی وجود ندارد."
 
 #. TRANS: This is the title of the form for adding a new application.
-#: actions/newapplication.php:52
 #, fuzzy
 msgid "New application"
 msgstr "برنامهٔ تازه"
 
 #. TRANS: Client error displayed trying to add a new application while not logged in.
-#: actions/newapplication.php:64
 msgid "You must be logged in to register an application."
 msgstr "برای ثبت یک برنامه باید وارد شده باشید."
 
 #. TRANS: Form instructions for registering a new application.
-#: actions/newapplication.php:147
 msgid "Use this form to register a new application."
 msgstr "از این شیوه برای ساختن یک برنامهٔ تازه استفاده کنید."
 
 #. TRANS: Validation error shown when not providing a source URL in the "New application" form.
-#: actions/newapplication.php:189
 msgid "Source URL is required."
 msgstr "نشانی اینترنتی منبع مورد نیاز است."
 
 #. TRANS: Server error displayed when an application could not be registered in the database through the "New application" form.
-#: actions/newapplication.php:279 actions/newapplication.php:289
 msgid "Could not create application."
 msgstr "نمی‌توان برنامه را ساخت."
 
 #. TRANS: Title for form to create a group.
-#: actions/newgroup.php:53
 msgid "New group"
 msgstr "گروه جدید"
 
 #. TRANS: Client exception thrown when a user tries to create a group while banned.
-#: actions/newgroup.php:73 classes/User_group.php:485
 #, fuzzy
 msgid "You are not allowed to create groups on this site."
 msgstr "شما یک عضو این گروه نیستید."
 
 #. TRANS: Form instructions for group create form.
-#: actions/newgroup.php:117
 msgid "Use this form to create a new group."
 msgstr "از این فرم برای ساختن یک گروه جدید استفاده کنید"
 
-#. TRANS: Group create form validation error.
-#: actions/newgroup.php:200
-#, fuzzy
-msgid "Alias cannot be the same as nickname."
-msgstr "نام و نام مستعار شما نمی تواند یکی باشد ."
-
-#: actions/newmessage.php:71 actions/newmessage.php:234
+#. TRANS: Page title for new direct message page.
+#. TRANS: Page title on page for sending a direct message.
 msgid "New message"
 msgstr "پیام جدید"
 
-#. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
-#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:513
-msgid "You can't send a message to this user."
+#. TRANS: Client error displayed trying to send a direct message to a user while sender and
+#. TRANS: receiver are not subscribed to each other.
+#, fuzzy
+msgid "You cannot send a message to this user."
 msgstr "شما نمی توانید به این کاربر پیام بفرستید."
 
+#. TRANS: Form validator error displayed trying to send a direct message without content.
+#. TRANS: Client error displayed trying to send a notice without content.
 #. TRANS: Command exception text shown when trying to send a direct message to another user without content.
 #. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
-#: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:490
-#: lib/command.php:593
 msgid "No content!"
 msgstr "محتوایی وحود ندارد!"
 
-#: actions/newmessage.php:161
+#. TRANS: Form validation error displayed trying to send a direct message without specifying a recipient.
 msgid "No recipient specified."
 msgstr "هیچ گیرنده ای مشخص نشده"
 
+#. TRANS: Client error displayed trying to send a direct message to self.
 #. TRANS: Error text shown when trying to send a direct message to self.
-#: actions/newmessage.php:167 lib/command.php:517
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr "یک پیام را به خودتان نفرستید؛ در عوض آن را آهسته برای خود بگویید."
 
-#: actions/newmessage.php:184
+#. TRANS: Page title after sending a direct message.
 msgid "Message sent"
 msgstr "پیام فرستاده‌شد"
 
+#. TRANS: Confirmation text after sending a direct message.
+#. TRANS: %s is the direct message recipient.
 #. TRANS: Message given have sent a direct message to another user.
 #. TRANS: %s is the name of the other user.
-#: actions/newmessage.php:188 lib/command.php:525
 #, php-format
 msgid "Direct message to %s sent."
 msgstr "پیام مستقیم به %s فرستاده شد."
 
-#: actions/newmessage.php:213 actions/newnotice.php:264
+#. TRANS: Page title after an AJAX error occurred on the "send direct message" page.
+#. TRANS: Page title after an AJAX error occurs on the send notice page.
 msgid "Ajax Error"
 msgstr "خطای آژاکس"
 
-#: actions/newnotice.php:69
+#. TRANS: Page title for sending a new notice.
 msgid "New notice"
 msgstr "پیام جدید"
 
-#: actions/newnotice.php:230
+#. TRANS: Page title after sending a notice.
 msgid "Notice posted"
 msgstr "پیام فرستاده‌شد."
 
 #. TRANS: Instructions for Notice search page.
 #. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/noticesearch.php:69
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -3919,20 +3230,17 @@ msgstr ""
 "با فاصله جدا کنید؛ آن‌ها باید ۳ نویسه یا بیش‌تر باشند."
 
 #. TRANS: Title of the page where users can search for notices.
-#: actions/noticesearch.php:80
 msgid "Text search"
 msgstr "جست‌وجوی متن"
 
 #. TRANS: Test in RSS notice search.
 #. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearch.php:95
 #, php-format
 msgid "Search results for \"%1$s\" on %2$s"
 msgstr "پیام از %1$s در %2$s"
 
 #. TRANS: Text for logged in users making a query for notices without results.
 #. TRANS: This message contains a Markdown link.
-#: actions/noticesearch.php:128
 #, php-format
 msgid ""
 "Be the first to [post on this topic](%%%%action.newnotice%%%%?"
@@ -3943,7 +3251,6 @@ msgstr ""
 
 #. TRANS: Text for not logged in users making a query for notices without results.
 #. TRANS: This message contains Markdown links.
-#: actions/noticesearch.php:133
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and be the first to "
@@ -3953,19 +3260,17 @@ msgstr ""
 "(%%%%action.newnotice%%%%?status_textarea=%s) نمی‌فرستید!"
 
 #. TRANS: RSS notice search feed title. %s is the query.
-#: actions/noticesearchrss.php:95
 #, php-format
 msgid "Updates with \"%s\""
 msgstr "پیام‌های با %s"
 
 #. TRANS: RSS notice search feed description.
 #. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearchrss.php:99
 #, fuzzy, php-format
 msgid "Updates matching search term \"%1$s\" on %2$s."
 msgstr "پیام‌هایی که با جست‌و‌جوی عبارت »%1$s« در %s یافت شدند."
 
-#: actions/nudge.php:85
+#. TRANS: Client error displayed trying to nudge a user that cannot be nudged.
 #, fuzzy
 msgid ""
 "This user doesn't allow nudges or hasn't confirmed or set their email "
@@ -3974,60 +3279,51 @@ msgstr ""
 "این کاربر اجازهٔ یادآوری‌کردن را نداده است یا پست‌الکترونیک خود را تایید یا "
 "تعیین نکرده است."
 
-#: actions/nudge.php:94
+#. TRANS: Page title after sending a nudge.
 msgid "Nudge sent"
 msgstr "یادآوری فرستاده‌شد"
 
-#: actions/nudge.php:97
+#. TRANS: Confirmation text after sending a nudge.
 msgid "Nudge sent!"
 msgstr "یادآوری فرستاده‌شد!"
 
 #. TRANS: Message displayed to an anonymous user trying to view OAuth application list.
-#: actions/oauthappssettings.php:57
 msgid "You must be logged in to list your applications."
 msgstr "برای فهرست‌کردن برنامه‌هایتان باید وارد شده باشید."
 
 #. TRANS: Page title for OAuth applications
-#: actions/oauthappssettings.php:73
 msgid "OAuth applications"
 msgstr "برنامه‌های OAuth"
 
 #. TRANS: Page instructions for OAuth applications
-#: actions/oauthappssettings.php:85
 msgid "Applications you have registered"
 msgstr "برنامه‌هایی که ثبت کرده‌اید"
 
 #. TRANS: Empty list message on page with OAuth applications.
-#: actions/oauthappssettings.php:138
 #, php-format
 msgid "You have not registered any applications yet."
 msgstr "شما هنوز هیچ برنامه‌ای را ثبت نکرده‌اید."
 
 #. TRANS: Title for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:69
 msgid "Connected applications"
 msgstr "برنامه‌های وصل‌شده"
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:80
 msgid "The following connections exist for your account."
 msgstr ""
 
 #. TRANS: Client error when trying to revoke access for an application while not being a user of it.
-#: actions/oauthconnectionssettings.php:165
 msgid "You are not a user of that application."
 msgstr "شما یک کاربر این برنامه نیستید."
 
 #. TRANS: Client error when revoking access has failed for some reason.
 #. TRANS: %s is the application ID revoking access failed for.
-#: actions/oauthconnectionssettings.php:180
 #, fuzzy, php-format
 msgid "Unable to revoke access for application: %s."
 msgstr "نمی‌توان دسترسی را برای برنامهٔ %s لغو کرد."
 
 #. TRANS: Success message after revoking access for an application.
 #. TRANS: %1$s is the application name, %2$s is the first part of the user token.
-#: actions/oauthconnectionssettings.php:199
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -4035,475 +3331,392 @@ msgid ""
 msgstr ""
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:210
 msgid "You have not authorized any applications to use your account."
 msgstr "شما به هیچ برنامه‌ای اجازه نداده‌اید که از حساب‌تان استفاده کند."
 
 #. TRANS: Note for developers in the OAuth connection settings form.
 #. TRANS: This message contains a Markdown link. Do not separate "](".
 #. TRANS: %s is the URL to the OAuth settings.
-#: actions/oauthconnectionssettings.php:230
 #, php-format
 msgid ""
 "Are you a developer? [Register an OAuth client application](%s) to use with "
 "this instance of StatusNet."
 msgstr ""
 
-#: actions/oembed.php:64
+#. TRANS: Server error displayed in oEmbed action when path not found.
+#. TRANS: %s is a path.
 #, fuzzy, php-format
 msgid "\"%s\" not found."
 msgstr "رابط مورد نظر پیدا نشد."
 
-#: actions/oembed.php:76
+#. TRANS: Server error displayed in oEmbed action when notice not found.
+#. TRANS: %s is a notice.
 #, fuzzy, php-format
 msgid "Notice %s not found."
 msgstr "رابط مورد نظر پیدا نشد."
 
-#: actions/oembed.php:80 actions/shownotice.php:100
+#. TRANS: Server error displayed in oEmbed action when notice has not profile.
 msgid "Notice has no profile."
 msgstr "این پیام نمایه‌ای ندارد."
 
-#: actions/oembed.php:83 actions/shownotice.php:172
+#. TRANS: oEmbed title. %1$s is the author name, %2$s is the creation date.
 #, php-format
 msgid "%1$s's status on %2$s"
 msgstr "وضعیت %1$s در %2$s"
 
-#: actions/oembed.php:95
+#. TRANS: Server error displayed in oEmbed action when attachment not found.
+#. TRANS: %d is an attachment ID.
 #, fuzzy, php-format
 msgid "Attachment %s not found."
 msgstr "کاربر گیرنده یافت نشد."
 
-#: actions/oembed.php:136
+#. TRANS: Server error displayed in oEmbed request when a path is not supported.
+#. TRANS: %s is a path.
 #, php-format
 msgid "\"%s\" not supported for oembed requests."
 msgstr ""
 
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
-#: actions/oembed.php:168
 #, php-format
 msgid "Content type %s not supported."
 msgstr "نوع محتوای %s پشتیبانی نشده است."
 
 #. TRANS: Error message displaying attachments. %s is the site's base URL.
-#: actions/oembed.php:172
 #, php-format
 msgid "Only %s URLs over plain HTTP please."
 msgstr "لطفا تنها از نشانی‌های اینترنتی %s از راه HTTP ساده استفاده کنید."
 
+#. TRANS: Server error displayed in oEmbed action when request specifies an unsupported data format.
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1207
-#: lib/apiaction.php:1234 lib/apiaction.php:1369
 msgid "Not a supported data format."
 msgstr "یک قالب دادهٔ پشتیبانی‌شده نیست."
 
 #. TRANS: ShortName in the OpenSearch interface when trying to find users.
-#: actions/opensearch.php:64
 msgid "People Search"
 msgstr "جست‌وجوی کاربران"
 
-#: actions/opensearch.php:68
+#. TRANS: ShortName in the OpenSearch interface when trying to find notices.
 msgid "Notice Search"
 msgstr "جست‌وجوی پیام‌ها"
 
 #. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
-#: actions/otp.php:70
 msgid "No user ID specified."
 msgstr "هیچ شناسهٔ کاربری مشخص نشده است."
 
 #. TRANS: Client error displayed trying to use "one time password login" without specifying a login token.
-#: actions/otp.php:86
 msgid "No login token specified."
 msgstr "هیچ رمز ورودی مشخص نشده است."
 
 #. TRANS: Client error displayed trying to use "one time password login" without requesting a login token.
-#: actions/otp.php:94
 msgid "No login token requested."
 msgstr "هیچ رمز ورودی درخواست نشده است."
 
 #. TRANS: Client error displayed trying to use "one time password login" while specifying an invalid login token.
-#: actions/otp.php:100
 msgid "Invalid login token specified."
 msgstr "رمز ورود مشخص شده نامعتبر است."
 
 #. TRANS: Client error displayed trying to use "one time password login" while specifying an expired login token.
-#: actions/otp.php:110
 msgid "Login token expired."
 msgstr "رمز ورود منسوخ شده است."
 
 #. TRANS: Title for outbox for any but the fist page.
 #. TRANS: %1$s is the user nickname, %2$d is the page number.
-#: actions/outbox.php:57
 #, php-format
 msgid "Outbox for %1$s - page %2$d"
 msgstr "صندوق خروجی %1$s - صفحهٔ %2$d"
 
 #. TRANS: Title for first page of outbox.
-#: actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
 msgstr "فرستاده‌های %s"
 
 #. TRANS: Instructions for outbox.
-#: actions/outbox.php:103
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr ""
 "این صندوق خروجی شماست، که پیام‌های خصوصی فرستاده شده به وسیلهٔ شما را فهرست "
 "می‌کند."
 
-#: actions/passwordsettings.php:58
 msgid "Change password"
 msgstr "تغییر گذرواژه"
 
-#: actions/passwordsettings.php:69
 msgid "Change your password."
 msgstr "تغییر گذرواژهٔ شما"
 
 #. TRANS: Fieldset legend for password reset form.
-#: actions/passwordsettings.php:96 actions/recoverpassword.php:251
 msgid "Password change"
 msgstr "تغییر گذرواژه"
 
-#: actions/passwordsettings.php:104
 msgid "Old password"
 msgstr "گذرواژهٔ پیشین"
 
 #. TRANS: Field label for password reset form.
-#: actions/passwordsettings.php:108 actions/recoverpassword.php:256
 msgid "New password"
 msgstr "گذرواژهٔ تازه"
 
-#: actions/passwordsettings.php:109 actions/register.php:416
 #, fuzzy
 msgid "6 or more characters."
 msgstr "۶ نویسه یا بیش‌تر"
 
 #. TRANS: Ttile for field label for password reset form where the password has to be typed again.
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:264
-#: actions/register.php:420
 #, fuzzy
 msgid "Same as password above."
 msgstr "مانند گذرواژهٔ بالا"
 
-#: actions/passwordsettings.php:117
 msgid "Change"
 msgstr "تغییر"
 
-#: actions/passwordsettings.php:153 actions/register.php:223
 msgid "Password must be 6 or more characters."
 msgstr "گذرواژه باید ۶ نویسه یا بیش‌تر باشد."
 
-#: actions/passwordsettings.php:156 actions/register.php:226
 msgid "Passwords don't match."
 msgstr "گذرواژه‌ها مطابقت ندارند."
 
-#: actions/passwordsettings.php:164
 msgid "Incorrect old password"
 msgstr "گذرواژه پیشین اشتباه است"
 
-#: actions/passwordsettings.php:180
 msgid "Error saving user; invalid."
 msgstr "هنگام ذخیرهٔ کاربر خطا رخ داد؛ نامعتبر است."
 
 #. TRANS: Reset password form validation error message.
-#: actions/passwordsettings.php:185 actions/recoverpassword.php:418
 #, fuzzy
 msgid "Cannot save new password."
 msgstr "نمی‌توان گذرواژهٔ جدید را ذخیره کرد."
 
-#: actions/passwordsettings.php:191
 msgid "Password saved."
 msgstr "گذرواژه ذخیره شد."
 
 #. TRANS: Title for Paths admin panel.
 #. TRANS: Menu item for site administration
-#: actions/pathsadminpanel.php:58 lib/adminpanelaction.php:371
 msgid "Paths"
 msgstr "مسیر ها"
 
 #. TRANS: Form instructions for Path admin panel.
-#: actions/pathsadminpanel.php:69
 msgid "Path and server settings for this StatusNet site"
 msgstr ""
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the directory that could not be read from.
-#: actions/pathsadminpanel.php:155
 #, php-format
 msgid "Theme directory not readable: %s."
 msgstr "شاخهٔ پوسته‌ها قابل خواندن نیست: %s."
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the avatar directory that could not be written to.
-#: actions/pathsadminpanel.php:163
 #, php-format
 msgid "Avatar directory not writable: %s."
 msgstr "شاخهٔ تصویر چهره‌ها قابل نوشتن نیست: %s."
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the background directory that could not be written to.
-#: actions/pathsadminpanel.php:171
 #, php-format
 msgid "Background directory not writable: %s."
 msgstr "شاخهٔ پس زمینه‌ها قابل نوشتن نیست: %s."
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the locales directory that could not be read from.
-#: actions/pathsadminpanel.php:181
 #, php-format
 msgid "Locales directory not readable: %s."
 msgstr "پوشهٔ تنظیمات محلی قابل خواندن نیست: %s."
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the SSL server URL that is too long.
-#: actions/pathsadminpanel.php:189
 msgid "Invalid SSL server. The maximum length is 255 characters."
 msgstr "کارگزار SSL نامعتبر است. بیشینهٔ طول نام ۲۵۵ نویسه است."
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:235 actions/siteadminpanel.php:58
 msgid "Site"
 msgstr "وب‌گاه"
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:241 actions/pathsadminpanel.php:279
-#: actions/pathsadminpanel.php:370 actions/pathsadminpanel.php:425
 msgid "Server"
 msgstr "کارگزار"
 
-#: actions/pathsadminpanel.php:242
 msgid "Site's server hostname."
 msgstr "نام میزبان کارگزار وب‌گاه."
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:248 actions/pathsadminpanel.php:288
-#: actions/pathsadminpanel.php:379 actions/pathsadminpanel.php:434
 msgid "Path"
 msgstr "مسیر"
 
-#: actions/pathsadminpanel.php:249
 #, fuzzy
 msgid "Site path."
 msgstr "مسیر وب‌گاه"
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:255
 #, fuzzy
 msgid "Locale directory"
 msgstr "شاخهٔ پوسته"
 
-#: actions/pathsadminpanel.php:256
 #, fuzzy
 msgid "Directory path to locales."
 msgstr "مسیر پوشه برای زبان‌های محلی"
 
 #. TRANS: Checkbox label in Paths admin panel.
-#: actions/pathsadminpanel.php:263
 msgid "Fancy URLs"
 msgstr "نشانی‌های تمیز"
 
-#: actions/pathsadminpanel.php:265
 msgid "Use fancy (more readable and memorable) URLs?"
 msgstr "از نشانی‌های تمیز (خواناتر و ماندگارتر در ذهن) استفاده شود؟"
 
-#: actions/pathsadminpanel.php:272
 msgid "Theme"
 msgstr "پوسته"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:281
 #, fuzzy
 msgid "Server for themes."
 msgstr "پوسته برای وب‌گاه"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:290
 msgid "Web path to themes."
 msgstr ""
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:297 actions/pathsadminpanel.php:388
-#: actions/pathsadminpanel.php:443 actions/pathsadminpanel.php:495
 msgid "SSL server"
 msgstr "کارگزار SSL"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:299
 msgid "SSL server for themes (default: SSL server)."
 msgstr ""
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:306 actions/pathsadminpanel.php:397
-#: actions/pathsadminpanel.php:452
 #, fuzzy
 msgid "SSL path"
 msgstr "مسیر وب‌گاه"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:308
 msgid "SSL path to themes (default: /theme/)."
 msgstr ""
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:315 actions/pathsadminpanel.php:406
-#: actions/pathsadminpanel.php:461
 #, fuzzy
 msgid "Directory"
 msgstr "شاخهٔ پوسته"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:317
 #, fuzzy
 msgid "Directory where themes are located."
 msgstr "مسیر پوشه برای زبان‌های محلی"
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:326
 msgid "Avatars"
 msgstr "چهره‌ها"
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:333
 msgid "Avatar server"
 msgstr "کارگزار چهره‌ها"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:335
 #, fuzzy
 msgid "Server for avatars."
 msgstr "پوسته برای وب‌گاه"
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:342
 msgid "Avatar path"
 msgstr "مسیر نیم‌رخ"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:344
 #, fuzzy
 msgid "Web path to avatars."
 msgstr "به روز رسانی چهره موفقیت آمیر نبود."
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:351
 msgid "Avatar directory"
 msgstr "شاخهٔ نیم‌رخ"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:353
 #, fuzzy
 msgid "Directory where avatars are located."
 msgstr "مسیر پوشه برای زبان‌های محلی"
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:364
 msgid "Backgrounds"
 msgstr "پس زمینه‌ها"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:372
 #, fuzzy
 msgid "Server for backgrounds."
 msgstr "پوسته برای وب‌گاه"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:381
 msgid "Web path to backgrounds."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:390
 msgid "Server for backgrounds on SSL pages."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:399
 msgid "Web path to backgrounds on SSL pages."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:408
 #, fuzzy
 msgid "Directory where backgrounds are located."
 msgstr "مسیر پوشه برای زبان‌های محلی"
 
 #. TRANS: Fieldset legens in Paths admin panel.
-#: actions/pathsadminpanel.php:419
 msgid "Attachments"
 msgstr "ضمائم"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:427
 #, fuzzy
 msgid "Server for attachments."
 msgstr "پوسته برای وب‌گاه"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:436
 #, fuzzy
 msgid "Web path to attachments."
 msgstr "هیچ پیوستی وجود ندارد."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:445
 #, fuzzy
 msgid "Server for attachments on SSL pages."
 msgstr "پوسته برای وب‌گاه"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:454
 msgid "Web path to attachments on SSL pages."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:463
 #, fuzzy
 msgid "Directory where attachments are located."
 msgstr "مسیر پوشه برای زبان‌های محلی"
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:472
 msgid "SSL"
 msgstr "SSL"
 
 #. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
-#: actions/pathsadminpanel.php:477 actions/snapshotadminpanel.php:202
 msgid "Never"
 msgstr "هیچ وقت"
 
 #. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
-#: actions/pathsadminpanel.php:479
 msgid "Sometimes"
 msgstr "گاهی اوقات"
 
 #. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
-#: actions/pathsadminpanel.php:481
 msgid "Always"
 msgstr "برای همیشه"
 
-#: actions/pathsadminpanel.php:485
 msgid "Use SSL"
 msgstr "استفاده از SSL"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:487
 #, fuzzy
 msgid "When to use SSL."
 msgstr "زمان استفاده از SSL"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:497
 #, fuzzy
 msgid "Server to direct SSL requests to."
 msgstr "کارگزار برای هدایت درخواست‌های SSL به"
 
 #. TRANS: Button title text to store form data in the Paths admin panel.
-#: actions/pathsadminpanel.php:514
 msgid "Save paths"
 msgstr "نشانی ذخیره سازی"
 
 #. TRANS: Instructions for the "People search" page.
 #. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/peoplesearch.php:54
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
@@ -4513,57 +3726,46 @@ msgstr ""
 "عبارت‌ها را با فاصله جدا کنید؛ آن‌ها باید ۳ نویسه یا بیش‌تر باشند."
 
 #. TRANS: Title of a page where users can search for other users.
-#: actions/peoplesearch.php:61
 msgid "People search"
 msgstr "جست‌وجوی کاربران"
 
-#: actions/peopletag.php:68
 #, php-format
 msgid "Not a valid people tag: %s."
 msgstr "یک برچسب کاربری معتبر نیست: %s."
 
-#: actions/peopletag.php:142
 #, php-format
 msgid "Users self-tagged with %1$s - page %2$d"
 msgstr "کاربران خود برچسب‌گذاری شده با %1$s - صفحهٔ %2$d"
 
 #. TRANS: Page title for AJAX form return when a disabling a plugin.
-#: actions/plugindisable.php:69
 msgctxt "plugin"
 msgid "Disabled"
 msgstr ""
 
 #. TRANS: Client error displayed trying to perform any request method other than POST.
 #. TRANS: Do not translate POST.
-#: actions/pluginenable.php:78 actions/subscribe.php:77
 msgid "This action only accepts POST requests."
 msgstr "این عمل تنها درخواست‌های POST را می‌پذیرد."
 
-#: actions/pluginenable.php:102
 #, fuzzy
 msgid "You cannot administer plugins."
 msgstr "شما نمی‌توانید کاربران را پاک کنید."
 
-#: actions/pluginenable.php:109
 #, fuzzy
 msgid "No such plugin."
 msgstr "چنین صفحه‌ای وجود ندارد."
 
 #. TRANS: Page title for AJAX form return when enabling a plugin.
-#: actions/pluginenable.php:159
 msgctxt "plugin"
 msgid "Enabled"
 msgstr ""
 
 #. TRANS: Tab and title for plugins admin panel.
 #. TRANS: Menu item for site administration
-#: actions/pluginsadminpanel.php:56 actions/version.php:191
-#: lib/adminpanelaction.php:411
 msgid "Plugins"
 msgstr "افزونه‌ها"
 
 #. TRANS: Instructions at top of plugin admin page.
-#: actions/pluginsadminpanel.php:68
 msgid ""
 "Additional plugins can be enabled and configured manually. See the <a href="
 "\"http://status.net/wiki/Plugins\">online plugin documentation</a> for more "
@@ -4571,32 +3773,26 @@ msgid ""
 msgstr ""
 
 #. TRANS: Admin form section header
-#: actions/pluginsadminpanel.php:84
 #, fuzzy
 msgid "Default plugins"
 msgstr "زبان پیش‌فرض"
 
-#: actions/pluginsadminpanel.php:106
 msgid ""
 "All default plugins have been disabled from the site's configuration file."
 msgstr ""
 
-#: actions/postnotice.php:95
 msgid "Invalid notice content."
 msgstr "محتوای پیام نامعتبر است."
 
-#: actions/postnotice.php:101
 #, php-format
 msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’."
 msgstr "مجوز پیام «%1$s» با مجوز وب‌گاه «%2$s» سازگار نیست."
 
 #. TRANS: Page title for profile settings.
-#: actions/profilesettings.php:60
 msgid "Profile settings"
 msgstr "تنظیمات نمایه"
 
 #. TRANS: Usage instructions for profile settings.
-#: actions/profilesettings.php:71
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
@@ -4604,31 +3800,24 @@ msgstr ""
 "در مورد شما بدانند."
 
 #. TRANS: Profile settings form legend.
-#: actions/profilesettings.php:99
 msgid "Profile information"
 msgstr "اطلاعات نمایه"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:110 actions/register.php:412
 #, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr "۱-۶۴ کاراکتر کوچک یا اعداد، بدون نقطه گذاری یا فاصله"
 
 #. TRANS: Field label in form for profile settings.
-#: actions/profilesettings.php:114 actions/register.php:434
-#: lib/groupeditform.php:150
 msgid "Full name"
 msgstr "نام‌کامل"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:119 actions/register.php:439
-#: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "صفحهٔ خانگی"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:122 actions/register.php:441
 #, fuzzy
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr "نشانی اینترنتی صفحهٔ خانگی، وبلاگ یا نمایه‌تان در یک وب‌گاه دیگر"
@@ -4636,48 +3825,37 @@ msgstr "نشانی اینترنتی صفحهٔ خانگی، وبلاگ یا نم
 #. TRANS: Tooltip for field label in form for profile settings. Plural
 #. TRANS: is decided by the number of characters available for the
 #. TRANS: biography (%d).
-#: actions/profilesettings.php:130 actions/register.php:450
 #, fuzzy, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
 msgstr[0] "خودتان و علاقه‌مندی‌هایتان را در %d نویسه توصیف کنید"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:136 actions/register.php:455
 msgid "Describe yourself and your interests"
 msgstr "خودتان و علاقه‌مندی‌هایتان را توصیف کنید"
 
 #. TRANS: Text area label in form for profile settings where users can provide.
 #. TRANS: their biography.
-#: actions/profilesettings.php:140 actions/register.php:457
 msgid "Bio"
 msgstr "شرح‌حال"
 
 #. TRANS: Field label in form for profile settings.
-#: actions/profilesettings.php:146 actions/register.php:462
-#: lib/groupeditform.php:173
 msgid "Location"
 msgstr "موقعیت"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:149
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "مکانی که شما در آن هستید، مانند «شهر، ایالت (یا استان)، کشور»"
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:154
 msgid "Share my current location when posting notices"
 msgstr "مکان کنونی من هنگام فرستادن پیام‌ها به اشتراک گذاشته شود"
 
 #. TRANS: Field label in form for profile settings.
-#: actions/profilesettings.php:162 actions/tagother.php:128
-#: actions/tagother.php:188 lib/subscriptionlist.php:104
-#: lib/subscriptionlist.php:106
 msgid "Tags"
 msgstr "برچسب‌ها"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:165
 #, fuzzy
 msgid ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- "
@@ -4686,28 +3864,23 @@ msgstr ""
 "برچسب‌ها برای خودتان (حروف، اعداد، -، .، و _) جدا شده با کاما- یا فاصله-"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:170
 msgid "Language"
 msgstr "زبان"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:172
 #, fuzzy
 msgid "Preferred language."
 msgstr "زبان برگزیده"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:182
 msgid "Timezone"
 msgstr "منطقهٔ‌زمانی"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:184
 msgid "What timezone are you normally in?"
 msgstr "شما معمولا در کدام منطقهٔ زمانی هستید؟"
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:190
 #, fuzzy
 msgid ""
 "Automatically subscribe to whoever subscribes to me (best for non-humans)."
@@ -4717,92 +3890,75 @@ msgstr ""
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Plural form is used based on the maximum number of allowed
 #. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:259 actions/register.php:214
 #, fuzzy, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
 msgstr[0] "شرح‌حال خیلی طولانی است (بیشینه %d نویسه)."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:270 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr "منطقهٔ زمانی انتخاب نشده است."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:278
 #, fuzzy
 msgid "Language is too long (maximum 50 characters)."
 msgstr "زبان بسیار طولانی است ( حداکثر ۵۰ نویسه)"
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:292
 #, fuzzy, php-format
 msgid "Invalid tag: \"%s\"."
 msgstr "نشان نادرست »%s«"
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:348
 #, fuzzy
 msgid "Could not update user for autosubscribe."
 msgstr "نمی‌توان کاربر را برای اشتراک خودکار به‌هنگام‌سازی کرد."
 
 #. TRANS: Server error thrown when user profile location preference settings could not be updated.
-#: actions/profilesettings.php:406
 #, fuzzy
 msgid "Could not save location prefs."
 msgstr "نمی‌توان تنظیمات مکانی را تنظیم کرد."
 
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:428 actions/tagother.php:179
 msgid "Could not save tags."
 msgstr "نمی‌توان برچسب‌ها را ذخیره کرد."
 
 #. TRANS: Confirmation shown when user profile settings are saved.
 #. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:437 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "تنظیمات ذخیره شد."
 
 #. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
 #. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:484 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "ساختن یک جساب‌کاربری"
 
-#: actions/public.php:83
 #, php-format
 msgid "Beyond the page limit (%s)."
 msgstr ""
 
-#: actions/public.php:92
 msgid "Could not retrieve public stream."
 msgstr "نمی‌توان جریان عمومی را دریافت کرد."
 
-#: actions/public.php:130
 #, php-format
 msgid "Public timeline, page %d"
 msgstr "خط‌زمانی عمومی، صفحهٔ %d"
 
-#: actions/public.php:132 lib/publicgroupnav.php:79
 msgid "Public timeline"
 msgstr "خط‌زمانی عمومی"
 
-#: actions/public.php:160
 msgid "Public Stream Feed (RSS 1.0)"
 msgstr "خوراک جریان عمومی (RSS 1.0)"
 
-#: actions/public.php:164
 msgid "Public Stream Feed (RSS 2.0)"
 msgstr "خوراک جریان عمومی (RSS 2.0)"
 
-#: actions/public.php:168
 msgid "Public Stream Feed (Atom)"
 msgstr "خوراک جریان عمومی (Atom)"
 
-#: actions/public.php:188
 #, php-format
 msgid ""
 "This is the public timeline for %%site.name%% but no one has posted anything "
@@ -4810,17 +3966,14 @@ msgid ""
 msgstr ""
 "این خط‌زمانی عمومی برای %%site.name%% است، اما هیچ‌کس هنوز چیزی نفرستاده است."
 
-#: actions/public.php:191
 msgid "Be the first to post!"
 msgstr "اولین کسی باشید که پیام می‌فرستد!"
 
-#: actions/public.php:195
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post!"
 msgstr "چرا [ثبت نام](%%action.register%%) نمی‌کنید و اولین پیام را نمی‌فرستید؟"
 
-#: actions/public.php:242
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -4834,7 +3987,6 @@ msgstr ""
 "action.register%%) تا آگاهی‌هایی را دربارهٔ خودتان با دوستان، خانواده و "
 "همکاران‌تان به اشتراک بگذارید! ([بیش‌تر بخوانید](%%doc.help%%))"
 
-#: actions/public.php:247
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -4846,19 +3998,16 @@ msgstr ""
 "پایهٔ نرم‌افزار آزاد [StatusNet](http://status.net/) است."
 
 #. TRANS: Public RSS feed description. %s is the StatusNet site name.
-#: actions/publicrss.php:106
 #, fuzzy, php-format
 msgid "%s updates from everyone."
 msgstr "%s به روز رسانی های عموم"
 
 #. TRANS: Title for public tag cloud.
-#: actions/publictagcloud.php:57
 msgid "Public tag cloud"
 msgstr "ابر برچسب عمومی"
 
 #. TRANS: Instructions (more used like an explanation/header).
 #. TRANS: %s is the StatusNet sitename.
-#: actions/publictagcloud.php:65
 #, fuzzy, php-format
 msgid "These are most popular recent tags on %s"
 msgstr "این‌ها محبوب‌ترین برچسب‌های اخیر روی %s هستند "
@@ -4866,14 +4015,12 @@ msgstr "این‌ها محبوب‌ترین برچسب‌های اخیر روی
 #. TRANS: This message contains a Markdown URL. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.
-#: actions/publictagcloud.php:74
 #, php-format
 msgid "No one has posted a notice with a [hashtag](%%doc.tags%%) yet."
 msgstr "هیچ‌کس هنوز پیامی با یک [برچسب](%%doc.tags%%) نفرستاده است."
 
 #. 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.
-#: actions/publictagcloud.php:79
 msgid "Be the first to post one!"
 msgstr "اولین نفری باشید که چیزی می‌فرستد!"
 
@@ -4882,7 +4029,6 @@ msgstr "اولین نفری باشید که چیزی می‌فرستد!"
 #. TRANS: This message contains a Markdown URL. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.
-#: actions/publictagcloud.php:87
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post "
@@ -4892,42 +4038,34 @@ msgstr ""
 "باشید که چیزی می‌فرستد!"
 
 #. TRANS: Client error displayed trying to recover password while already logged in.
-#: actions/recoverpassword.php:37
 msgid "You are already logged in!"
 msgstr "شما قبلا وارد شدید"
 
 #. TRANS: Client error displayed when password recovery code is not correct.
-#: actions/recoverpassword.php:64
 msgid "No such recovery code."
 msgstr "چنین کد بازیابی شده ای نیست"
 
 #. TRANS: Client error displayed when no proper password recovery code was submitted.
-#: actions/recoverpassword.php:69
 msgid "Not a recovery code."
 msgstr "کد بازیابی شده ای نیست."
 
 #. TRANS: Server error displayed trying to recover password without providing a user.
-#: actions/recoverpassword.php:77
 msgid "Recovery code for unknown user."
 msgstr "بازیابی کد برای کاربر ناشناخته"
 
 #. TRANS: Server error displayed removing a password recovery code from the database.
-#: actions/recoverpassword.php:91
 msgid "Error with confirmation code."
 msgstr "خطا در تایید کد"
 
 #. TRANS: Client error displayed trying to recover password with too old a recovery code.
-#: actions/recoverpassword.php:103
 msgid "This confirmation code is too old. Please start again."
 msgstr "این کد تایید شده بسیار قدیمی است . لطفا دباره شروع کنید ."
 
 #. TRANS: Server error displayed when updating a user's e-mail address in the database fails while recovering a password.
-#: actions/recoverpassword.php:118
 msgid "Could not update user with confirmed email address."
 msgstr "را به روز کرد  user نمیتوان با ایمیلی که تایید شده"
 
 #. TRANS: Page notice for password recovery page.
-#: actions/recoverpassword.php:160
 msgid ""
 "If you have forgotten or lost your password, you can get a new one sent to "
 "the email address you have stored in your account."
@@ -4936,100 +4074,82 @@ msgstr ""
 "که به نشانی پست الکترونیکی‌تان که در حساب‌تان ذخیره کرده‌اید فرستاده شده است، "
 "بگیرید."
 
-#: actions/recoverpassword.php:167
 msgid "You have been identified. Enter a new password below."
 msgstr "هویت شما شناسایی شد. یک گذرواژه تازه را در زیر وارد کنید."
 
 #. TRANS: Fieldset legend for password recovery page.
-#: actions/recoverpassword.php:198
 msgid "Password recovery"
 msgstr "بازیابی گذرواژه"
 
 #. TRANS: Field label on password recovery page.
-#: actions/recoverpassword.php:202
 msgid "Nickname or email address"
 msgstr "نام کاربری یا نشانی پست الکترونیکی"
 
 #. TRANS: Title for field label on password recovery page.
-#: actions/recoverpassword.php:205
 msgid "Your nickname on this server, or your registered email address."
 msgstr "نام کاربری شما بر روی این سرور، یا نشانی پست الکترونیکی ثبت شدهٔ شما."
 
 #. TRANS: Field label on password recovery page.
-#: actions/recoverpassword.php:212
 msgid "Recover"
 msgstr "بازیابی"
 
 #. TRANS: Button text on password recovery page.
-#: actions/recoverpassword.php:214
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Recover"
 msgstr "بازیابی"
 
 #. TRANS: Title for password recovery page in password reset mode.
-#: actions/recoverpassword.php:223
 msgid "Reset password"
 msgstr "بازنشانی گذرواژه"
 
 #. TRANS: Title for password recovery page in password recover mode.
-#: actions/recoverpassword.php:225
 msgid "Recover password"
 msgstr "بازیابی گذرواژه"
 
 #. TRANS: Title for password recovery page in email sent mode.
 #. TRANS: Subject for password recovery e-mail.
-#: actions/recoverpassword.php:227 actions/recoverpassword.php:366
 msgid "Password recovery requested"
 msgstr "بازیابی گذرواژه درخواست شد"
 
 #. TRANS: Title for password recovery page in password saved mode.
-#: actions/recoverpassword.php:229
 #, fuzzy
 msgid "Password saved"
 msgstr "گذرواژه ذخیره شد."
 
 #. TRANS: Title for password recovery page when an unknown action has been specified.
-#: actions/recoverpassword.php:232
 msgid "Unknown action"
 msgstr "عمل نامعلوم"
 
 #. TRANS: Title for field label for password reset form.
-#: actions/recoverpassword.php:258
 #, fuzzy
 msgid "6 or more characters, and do not forget it!"
 msgstr "۶ نویسه یا بیش‌تر، و این را فراموش نکنید!"
 
 #. TRANS: Button text for password reset form.
 #. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: actions/recoverpassword.php:268 lib/designform.php:145
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Reset"
 msgstr "بازنشاندن"
 
 #. TRANS: Form instructions for password recovery form.
-#: actions/recoverpassword.php:278
 msgid "Enter a nickname or email address."
 msgstr "یک نام کاربری یا نشانی پست الکترونیکی وارد کنید."
 
 #. TRANS: Information on password recovery form if no known username or e-mail address was specified.
-#: actions/recoverpassword.php:309
 msgid "No user with that email address or username."
 msgstr "هیچ کاربری با آن نشانی پست الکترونیکی یا نام کاربری وجود ندارد."
 
 #. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
-#: actions/recoverpassword.php:327
 msgid "No registered email address for that user."
 msgstr "برای آن کاربر نشانی پست الکترونیکی ثبت شده وجود ندارد."
 
 #. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
-#: actions/recoverpassword.php:342
 msgid "Error saving address confirmation."
 msgstr "هنگام ذخیرهٔ تایید نشانی خطا رخ داد."
 
 #. TRANS: User notification after an e-mail with instructions was sent from the password recovery form.
-#: actions/recoverpassword.php:370
 msgid ""
 "Instructions for recovering your password have been sent to the email "
 "address registered to your account."
@@ -5038,75 +4158,59 @@ msgstr ""
 "فرستاده شده است."
 
 #. TRANS: Client error displayed when trying to reset as password without providing a user.
-#: actions/recoverpassword.php:391
 msgid "Unexpected password reset."
 msgstr "گذرواژه به طور غیر منتظره ریست شد."
 
 #. TRANS: Reset password form validation error message.
-#: actions/recoverpassword.php:400
 #, fuzzy
 msgid "Password must be 6 characters or more."
 msgstr "گذرواژه باید ۶ نویسه یا بیش‌تر باشد."
 
 #. TRANS: Reset password form validation error message.
-#: actions/recoverpassword.php:405
 msgid "Password and confirmation do not match."
 msgstr "گذرواژه و تاییدیهٔ آن با هم تطابق ندارند."
 
 #. TRANS: Server error displayed when something does wrong with the user object during password reset.
-#: actions/recoverpassword.php:426 actions/register.php:241
 msgid "Error setting user."
 msgstr "هنگام گذاشتن کاربر خطا روی داد."
 
 #. TRANS: Success message for user after password reset.
-#: actions/recoverpassword.php:434
 msgid "New password successfully saved. You are now logged in."
 msgstr "گذرواژه تازه با موفقیت ذخیره شد. شما اکنون وارد شده‌اید."
 
-#: actions/redirecturl.php:70
 #, fuzzy
 msgid "No id parameter"
 msgstr "هیچ پیوستی وجود ندارد."
 
-#: actions/redirecturl.php:76
 #, fuzzy, php-format
 msgid "No such file \"%d\""
 msgstr "چنین پرونده‌ای وجود ندارد."
 
-#: actions/register.php:80 actions/register.php:181 actions/register.php:392
 msgid "Sorry, only invited people can register."
 msgstr "با عرض معذرت، تنها افراد دعوت شده می توانند ثبت نام کنند."
 
-#: actions/register.php:87
 msgid "Sorry, invalid invitation code."
 msgstr "با عرض تاسف، کد دعوت نا معتبر است."
 
-#: actions/register.php:106
 msgid "Registration successful"
 msgstr "ثبت نام با موفقیت انجام شد."
 
-#: actions/register.php:108 actions/register.php:490
 msgid "Register"
 msgstr "ثبت نام"
 
-#: actions/register.php:128
 msgid "Registration not allowed."
 msgstr "اجازهٔ ثبت‌نام داده نشده است."
 
-#: actions/register.php:194
 #, fuzzy
 msgid "You cannot register if you don't agree to the license."
 msgstr "شما نمی توانید ثبت نام کنید اگر با لیسانس( جواز ) موافقت نکنید."
 
-#: actions/register.php:203
 msgid "Email address already exists."
 msgstr "نشانی پست الکترونیکی از قبل وجود دارد."
 
-#: actions/register.php:236 actions/register.php:258
 msgid "Invalid username or password."
 msgstr "نام کاربری یا گذرواژه نا معتبر است."
 
-#: actions/register.php:333
 #, fuzzy
 msgid ""
 "With this form you can create a new account. You can then post notices and "
@@ -5115,49 +4219,39 @@ msgstr ""
 "با این فرم شما می‌توانید یک حساب تازه بسازید. سپس شما می‌توانید پیام بفرستید و "
 "به دوستان و همکارانتان بپیوندید. "
 
-#: actions/register.php:424 actions/register.php:428
-#: actions/siteadminpanel.php:238 lib/settingsnav.php:92
 msgid "Email"
 msgstr "پست الکترونیکی"
 
-#: actions/register.php:425 actions/register.php:429
 #, fuzzy
 msgid "Used only for updates, announcements, and password recovery."
 msgstr "تنها برای به‌هنگام‌سازی‌ها، اعلامیه‌ها و بازیابی گذرواژه به کار می‌رود"
 
-#: actions/register.php:436
 #, fuzzy
 msgid "Longer name, preferably your \"real\" name."
 msgstr "نام بلند تر، به طور بهتر نام واقعیتان"
 
-#: actions/register.php:464
 #, fuzzy
 msgid "Where you are, like \"City, State (or Region), Country\"."
 msgstr "مکانی که شما در آن هستید، مانند «شهر، ایالت (یا استان)، کشور»"
 
-#: actions/register.php:503
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
 msgstr "من متوجه هستم که محتوا و داده‌های %1$s خصوصی و محرمانه هستند."
 
-#: actions/register.php:513
 #, php-format
 msgid "My text and files are copyright by %1$s."
 msgstr "متن و پرونده‌های من دارای حق تکثیر %1$s هستند."
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:517
 msgid "My text and files remain under my own copyright."
 msgstr "متن و پرونده‌های من زیر حق تکثیر خودم می‌مانند."
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:520
 msgid "All rights reserved."
 msgstr "تمام حقوق محفوظ است."
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:525
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -5166,7 +4260,6 @@ msgstr ""
 "نوشته‌ها و پرونده‌های من به جز داده‌های خصوصی گذرواژه، نشانی پست الکترونیک، "
 "نشانی پیام‌رسان فوری و شماره تلفن زیر مجوز %s هستند."
 
-#: actions/register.php:566
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -5200,7 +4293,6 @@ msgstr ""
 "از این‌که نام‌نویسی کرده‌اید، تشکر می‌کنیم و امیدواریم که از استفاده از این "
 "سرویس لذت ببرید."
 
-#: actions/register.php:590
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5208,7 +4300,6 @@ msgstr ""
 "(شما هر لحظه باید یک پیام با پست الکترونیکی با راهنمای چگونگی تایید نشانی "
 "پست الکترونیک‌تان دریافت کنید.)"
 
-#: actions/remotesubscribe.php:97
 #, php-format
 msgid ""
 "To subscribe, you can [login](%%action.login%%), or [register](%%action."
@@ -5219,119 +4310,93 @@ msgstr ""
 "ثبت کنید[(%%action.register%%). اگر شما یک حساب در یک ]وب‌گاه میکروبلاگینگ "
 "سازگار[(%%doc.openmublog%%) دارید، نشانی نمایهٔ خود را در زیر وارد کنید."
 
-#: actions/remotesubscribe.php:111
 msgid "Remote subscribe"
 msgstr "اشتراک از راه دور"
 
-#: actions/remotesubscribe.php:123
 msgid "Subscribe to a remote user"
 msgstr "اشتراک یک کاربر از راه دور"
 
-#: actions/remotesubscribe.php:128
 msgid "User nickname"
 msgstr "نام کاربری کاربر"
 
-#: actions/remotesubscribe.php:129
 #, fuzzy
 msgid "Nickname of the user you want to follow."
 msgstr "نام کاربری، کاربری که می خواهید او را دنبال کنید"
 
-#: actions/remotesubscribe.php:132
 msgid "Profile URL"
 msgstr "نشانی نمایه"
 
-#: actions/remotesubscribe.php:133
 #, fuzzy
 msgid "URL of your profile on another compatible microblogging service."
 msgstr "نشانی اینترنتی نمایهٔ شما در سرویس میکروبلاگینگ سازگار دیگری"
 
 #. TRANS: Link text for link that will subscribe to a remote profile.
-#: actions/remotesubscribe.php:136 lib/subscribeform.php:139
-#: lib/userprofile.php:402
 msgid "Subscribe"
 msgstr "اشتراک"
 
-#: actions/remotesubscribe.php:158
 #, fuzzy
 msgid "Invalid profile URL (bad format)."
 msgstr "نشانی اینترنتی نمایه نامعتبر است (فرمت نامناسب است)"
 
-#: actions/remotesubscribe.php:167
 msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
 msgstr ""
 "این یک نشانی نمایهٔ صحیح نیست (هیچ سند YADIS وجود ندارد و یا XRDS مشخص شده "
 "نامعتبر است)."
 
-#: actions/remotesubscribe.php:175
 #, fuzzy
 msgid "That is a local profile! Login to subscribe."
 msgstr "این یک نمایهٔ محلی است! برای اشتراک وارد شوید."
 
-#: actions/remotesubscribe.php:182
 #, fuzzy
 msgid "Could not get a request token."
 msgstr "نمی‌توان یک نشانهٔ درخواست را به‌دست آورد."
 
-#: actions/repeat.php:56
 msgid "Only logged-in users can repeat notices."
 msgstr "تنها کاربران وارد شده می توانند پیام‌ها را تکرار کنند."
 
-#: actions/repeat.php:63 actions/repeat.php:70
 msgid "No notice specified."
 msgstr "هیچ پیامی مشخص نشده است."
 
-#: actions/repeat.php:75
 #, fuzzy
 msgid "You cannot repeat your own notice."
 msgstr "شما نمی‌توانید پیام خودتان را تکرار کنید."
 
-#: actions/repeat.php:89
 msgid "You already repeated that notice."
 msgstr "شما قبلا آن پیام را تکرار کرده‌اید."
 
-#: actions/repeat.php:112 lib/noticelist.php:697
 msgid "Repeated"
 msgstr "تکرار شده"
 
-#: actions/repeat.php:117
 msgid "Repeated!"
 msgstr "تکرار شد!"
 
 #. TRANS: RSS reply feed title. %s is a user nickname.
-#: actions/replies.php:126 actions/repliesrss.php:68
-#: lib/personalgroupnav.php:105
 #, php-format
 msgid "Replies to %s"
 msgstr "پاسخ‌های به %s"
 
-#: actions/replies.php:128
 #, php-format
 msgid "Replies to %1$s, page %2$d"
 msgstr "پاسخ‌های به %1$s، صفحهٔ %2$d"
 
-#: actions/replies.php:145
 #, php-format
 msgid "Replies feed for %s (RSS 1.0)"
 msgstr "خوراک پاسخ‌ها برای %s (RSS 1.0)"
 
-#: actions/replies.php:152
 #, php-format
 msgid "Replies feed for %s (RSS 2.0)"
 msgstr "خوراک پاسخ‌ها برای %s (RSS 2.0)"
 
-#: actions/replies.php:159
 #, php-format
 msgid "Replies feed for %s (Atom)"
 msgstr "خوراک پاسخ‌ها برای %s (Atom)"
 
-#: actions/replies.php:199
 #, php-format
 msgid ""
 "This is the timeline showing replies to %1$s but %2$s hasn't received a "
 "notice to them yet."
 msgstr "این خط‌زمانی %1$s است، اما %2$s تاکنون چیزی نفرستاده است."
 
-#: actions/replies.php:204
 #, php-format
 msgid ""
 "You can engage other users in a conversation, subscribe to more people or "
@@ -5340,7 +4405,6 @@ msgstr ""
 "شما می‌توانید کاربران دیگر را در یک گفت‌وگو سرگرم کنید، مشترک افراد بیش‌تری "
 "شوید یا [به گروه‌ها بپیوندید](%%action.groups%%)."
 
-#: actions/replies.php:206
 #, php-format
 msgid ""
 "You can try to [nudge %1$s](../%2$s) or [post something to them](%%%%action."
@@ -5351,185 +4415,151 @@ msgstr ""
 
 #. TRANS: RSS reply feed description.
 #. TRANS: %1$s is a user nickname, %2$s is the StatusNet site name.
-#: actions/repliesrss.php:74
 #, fuzzy, php-format
 msgid "Replies to %1$s on %2$s."
 msgstr "پاسخ‌های به %1$s در %2$s!"
 
 #. TRANS: Client exception displayed when trying to restore an account while not logged in.
-#: actions/restoreaccount.php:78
 #, fuzzy
 msgid "Only logged-in users can restore their account."
 msgstr "تنها کاربران وارد شده می توانند پیام‌ها را تکرار کنند."
 
 #. TRANS: Client exception displayed when trying to restore an account without having restore rights.
-#: actions/restoreaccount.php:83
 #, fuzzy
 msgid "You may not restore your account."
 msgstr "شما هنوز هیچ برنامه‌ای را ثبت نکرده‌اید."
 
 #. TRANS: Client exception displayed trying to restore an account while something went wrong uploading a file.
 #. TRANS: Client exception. No file; probably just a non-AJAX submission.
-#: actions/restoreaccount.php:121 actions/restoreaccount.php:146
 #, fuzzy
 msgid "No uploaded file."
 msgstr "بارگذاری پرونده"
 
 #. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
-#: actions/restoreaccount.php:129 lib/mediafile.php:194
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
 msgstr ""
 
 #. TRANS: Client exception.
-#: actions/restoreaccount.php:135 lib/mediafile.php:200
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form."
 msgstr ""
 
 #. TRANS: Client exception.
-#: actions/restoreaccount.php:141 lib/mediafile.php:206
 msgid "The uploaded file was only partially uploaded."
 msgstr "نتها اندکی از فایل بارگذاری‌شده فرستاده شد."
 
 #. TRANS: Client exception thrown when a temporary folder is not present to store a file upload.
-#: actions/restoreaccount.php:150 lib/mediafile.php:214
 msgid "Missing a temporary folder."
 msgstr "گم شدن یک پوشه ی موقتی."
 
 #. TRANS: Client exception thrown when writing to disk is not possible during a file upload operation.
-#: actions/restoreaccount.php:154 lib/mediafile.php:218
 msgid "Failed to write file to disk."
 msgstr "شکست خوردن در نوشتن فایل روی دیسک."
 
 #. TRANS: Client exception thrown when a file upload operation has been stopped by an extension.
-#: actions/restoreaccount.php:158 lib/mediafile.php:222
 msgid "File upload stopped by extension."
 msgstr "بارگذاری پرونده توسط افزونه متوقف شد."
 
 #. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
 #. TRANS: Exception thrown when uploading an image fails for an unknown reason.
 #. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
-#: actions/restoreaccount.php:164 lib/imagefile.php:106 lib/mediafile.php:228
 msgid "System error uploading file."
 msgstr "هنگام بارگذاری پرونده خطای سیستمی رخ داد."
 
 #. TRANS: Client exception thrown when a feed is not an Atom feed.
-#: actions/restoreaccount.php:207
 #, fuzzy
 msgid "Not an Atom feed."
 msgstr "همهٔ اعضا"
 
 #. TRANS: Success message when a feed has been restored.
-#: actions/restoreaccount.php:241
 msgid ""
 "Feed has been restored. Your old posts should now appear in search and your "
 "profile page."
 msgstr ""
 
 #. TRANS: Message when a feed restore is in progress.
-#: actions/restoreaccount.php:245
 msgid "Feed will be restored. Please wait a few minutes for results."
 msgstr ""
 
 #. TRANS: Form instructions for feed restore.
-#: actions/restoreaccount.php:342
 msgid ""
 "You can upload a backed-up stream in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format."
 msgstr ""
 
 #. TRANS: Title for submit button to confirm upload of a user backup file for account restore.
-#: actions/restoreaccount.php:373
 #, fuzzy
 msgid "Upload the file"
 msgstr "بارگذاری پرونده"
 
-#: actions/revokerole.php:75
 msgid "You cannot revoke user roles on this site."
 msgstr "شما نمی‌توانید نقش‌های کاربری را در این وب‌گاه لغو کنید."
 
-#: actions/revokerole.php:82
 msgid "User doesn't have this role."
 msgstr "کاربر این نقش را ندارد."
 
-#: actions/rsd.php:142 actions/version.php:159
 msgid "StatusNet"
 msgstr "StatusNet"
 
-#: actions/sandbox.php:65 actions/unsandbox.php:65
 #, fuzzy
 msgid "You cannot sandbox users on this site."
 msgstr "شما نمی توانید کاربری را در این سایت ساکت کنید."
 
-#: actions/sandbox.php:72
 #, fuzzy
 msgid "User is already sandboxed."
 msgstr "کاربر قبلا ساکت شده است."
 
 #. TRANS: Menu item for site administration
-#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
-#: lib/adminpanelaction.php:379
 msgid "Sessions"
 msgstr "نشست‌ها"
 
-#: actions/sessionsadminpanel.php:65
 msgid "Session settings for this StatusNet site"
 msgstr ""
 
-#: actions/sessionsadminpanel.php:175
 msgid "Handle sessions"
 msgstr "مدیریت نشست‌ها"
 
-#: actions/sessionsadminpanel.php:177
 #, fuzzy
 msgid "Whether to handle sessions ourselves."
 msgstr "چنان‌که به کاربران اجازهٔ دعوت‌کردن کاربران تازه داده شود."
 
-#: actions/sessionsadminpanel.php:181
 msgid "Session debugging"
 msgstr "اشکال‌زدایی نشست"
 
-#: actions/sessionsadminpanel.php:183
 msgid "Turn on debugging output for sessions."
 msgstr "خروجی اشکال‌زدایی برای نشست‌ها روشن شود."
 
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
+#. TRANS: Submit button title.
+msgid "Save"
+msgstr "ذخیره‌کردن"
+
 msgid "Save site settings"
 msgstr "ذخیرهٔ تنظیمات وب‌گاه"
 
-#: actions/showapplication.php:78
 msgid "You must be logged in to view an application."
 msgstr "برای دیدن یک برنامه باید وارد شده باشید."
 
-#: actions/showapplication.php:151
 msgid "Application profile"
 msgstr "نمایهٔ برنامه"
 
-#: actions/showapplication.php:179
 #, php-format
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr "ساخته شده توسط %1$s - دسترسی %2$s به صورت پیش‌فرض - %3$d کاربر"
 
-#: actions/showapplication.php:189
 msgid "Application actions"
 msgstr "اعمال برنامه"
 
-#: actions/showapplication.php:212
 msgid "Reset key & secret"
 msgstr ""
 
 #. TRANS: Title of form for deleting a user.
-#: actions/showapplication.php:228 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:64 lib/noticelist.php:678
 msgid "Delete"
 msgstr "حذف"
 
-#: actions/showapplication.php:237
 msgid "Application info"
 msgstr "اطلاعات برنامه"
 
-#: actions/showapplication.php:255
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
@@ -5537,42 +4567,35 @@ msgstr ""
 "توجه: ما امضاهای HMAC-SHA1 را پشتیبانی می‌کنیم. ما روش امضای plaintext را "
 "پشتیبانی نمی‌کنیم."
 
-#: actions/showapplication.php:275
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr "آیا مطمئن هستید که می‌خواهید کلید و رمز خریدار را دوباره تعیین کنید؟"
 
 #. TRANS: Title for all but the first page of favourite notices of a user.
 #. TRANS: %1$s is the user for whom the favourite notices are displayed, %2$d is the page number.
-#: actions/showfavorites.php:80
 #, php-format
 msgid "%1$s's favorite notices, page %2$d"
 msgstr "پیام‌های برگزیدهٔ %1$s، صفحهٔ %2$d"
 
 #. TRANS: Server error displayed when favourite notices could not be retrieved from the database.
-#: actions/showfavorites.php:134
 msgid "Could not retrieve favorite notices."
 msgstr "نمی‌توان پیام‌های برگزیده را دریافت کرد."
 
 #. TRANS: Feed link text. %s is a username.
-#: actions/showfavorites.php:172
 #, php-format
 msgid "Feed for favorites of %s (RSS 1.0)"
 msgstr "خوراک برای برگزیده‌های %s (RSS 1.0)"
 
 #. TRANS: Feed link text. %s is a username.
-#: actions/showfavorites.php:180
 #, php-format
 msgid "Feed for favorites of %s (RSS 2.0)"
 msgstr "خوراک برای برگزیده‌های %s (RSS 2.0)"
 
 #. TRANS: Feed link text. %s is a username.
-#: actions/showfavorites.php:188
 #, php-format
 msgid "Feed for favorites of %s (Atom)"
 msgstr "خوراک برای برگزیده‌های %s (Atom)"
 
 #. TRANS: Text displayed instead of favourite notices for the current logged in user that has no favourites.
-#: actions/showfavorites.php:209
 msgid ""
 "You haven't chosen any favorite notices yet. Click the fave button on "
 "notices you like to bookmark them for later or shed a spotlight on them."
@@ -5583,7 +4606,6 @@ msgstr ""
 
 #. TRANS: Text displayed instead of favourite notices for a user that has no favourites while logged in.
 #. TRANS: %s is a username.
-#: actions/showfavorites.php:213
 #, php-format
 msgid ""
 "%s hasn't added any favorite notices yet. Post something interesting they "
@@ -5595,7 +4617,6 @@ msgstr ""
 #. TRANS: Text displayed instead of favourite notices for a user that has no favourites while not logged in.
 #. TRANS: %s is a username, %%%%action.register%%%% is a link to the user registration page.
 #. TRANS: (link text)[link] is a Mark Down link.
-#: actions/showfavorites.php:220
 #, php-format
 msgid ""
 "%s hasn't added any favorite notices yet. Why not [register an account](%%%%"
@@ -5606,64 +4627,53 @@ msgstr ""
 "باشید که یک پیام را به برگزیده‌هایش اضافه می‌کند!"
 
 #. TRANS: Page notice for show favourites page.
-#: actions/showfavorites.php:251
 msgid "This is a way to share what you like."
 msgstr "این یک راه است برای به اشتراک گذاشتن آنچه که دوست دارید."
 
 #. TRANS: Page title for first group page. %s is a group name.
-#: actions/showgroup.php:75
 #, php-format
 msgid "%s group"
 msgstr "گروه %s"
 
 #. TRANS: Page title for any but first group page.
 #. TRANS: %1$s is a group name, $2$s is a page number.
-#: actions/showgroup.php:79
 #, php-format
 msgid "%1$s group, page %2$d"
 msgstr "گروه %1$s، صفحهٔ %2$d"
 
 #. TRANS: Label for group description or group note (dt). Text hidden by default.
-#: actions/showgroup.php:266
 msgid "Note"
 msgstr "یادداشت"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:277 lib/groupeditform.php:180
 msgid "Aliases"
 msgstr "نام های مستعار"
 
 #. TRANS: Group actions header (h2). Text hidden by default.
-#: actions/showgroup.php:294
 msgid "Group actions"
 msgstr "اعمال گروه"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:338
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
 msgstr "خوراک پیام برای گروه %s (RSS 1.0)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:345
 #, php-format
 msgid "Notice feed for %s group (RSS 2.0)"
 msgstr "خوراک پیام برای گروه %s (RSS 2.0)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:352
 #, php-format
 msgid "Notice feed for %s group (Atom)"
 msgstr "خوراک پیام برای گروه %s (Atom)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:358
 #, php-format
 msgid "FOAF for %s group"
 msgstr "FOAF برای گروه %s"
 
 #. TRANS: Header for mini list of group members on a group page (h2).
-#: actions/showgroup.php:395
 msgid "Members"
 msgstr "اعضا"
 
@@ -5671,31 +4681,24 @@ msgstr "اعضا"
 #. TRANS: Text for user subscription statistics if the user has no subscriptions.
 #. TRANS: Text for user subscriber statistics if user has no subscribers.
 #. TRANS: Text for user user group membership statistics if user is not a member of any group.
-#: actions/showgroup.php:401 lib/profileaction.php:137
-#: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
-#: lib/subscriptionlist.php:123 lib/tagcloudsection.php:71
 msgid "(None)"
 msgstr "هیچ"
 
 #. TRANS: Link to all group members from mini list of group members if group has more than n members.
-#: actions/showgroup.php:410
 msgid "All members"
 msgstr "همهٔ اعضا"
 
 #. TRANS: Header for group statistics on a group page (h2).
 #. TRANS: H2 text for user statistics.
-#: actions/showgroup.php:441 lib/profileaction.php:205
 msgid "Statistics"
 msgstr "آمار"
 
-#: actions/showgroup.php:444
 #, fuzzy
 msgctxt "LABEL"
 msgid "Created"
 msgstr "ساخته شد"
 
 #. TRANS: Label for member count in statistics on group page.
-#: actions/showgroup.php:449
 #, fuzzy
 msgctxt "LABEL"
 msgid "Members"
@@ -5705,7 +4708,6 @@ msgstr "اعضا"
 #. TRANS: **%s** is the group alias, %%%%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).
-#: actions/showgroup.php:464
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5724,7 +4726,6 @@ 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: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
-#: actions/showgroup.php:474
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5739,99 +4740,83 @@ msgstr ""
 "می‌گذارند. "
 
 #. TRANS: Header for list of group administrators on a group page (h2).
-#: actions/showgroup.php:503
 msgid "Admins"
 msgstr "مدیران"
 
 #. TRANS: Client error displayed requesting a single message that does not exist.
-#: actions/showmessage.php:76
 msgid "No such message."
 msgstr "چنین پیغامی وجود ندارد."
 
 #. TRANS: Client error displayed requesting a single direct message the requesting user was not a party in.
-#: actions/showmessage.php:86
 msgid "Only the sender and recipient may read this message."
 msgstr "تنها فرستنده و گیرنده می‌توانند این پیام را بخوانند."
 
 #. TRANS: Page title for single direct message display when viewing user is the sender.
 #. TRANS: %1$s is the addressed user's nickname, $2$s is a timestamp.
-#: actions/showmessage.php:105
 #, php-format
 msgid "Message to %1$s on %2$s"
 msgstr "پیام به %1$s در %2$s"
 
 #. TRANS: Page title for single message display.
 #. TRANS: %1$s is the sending user's nickname, $2$s is a timestamp.
-#: actions/showmessage.php:113
 #, php-format
 msgid "Message from %1$s on %2$s"
 msgstr "پیام از %1$s در %2$s"
 
-#: actions/shownotice.php:90
 msgid "Notice deleted."
 msgstr "پیام پاک شد."
 
 #. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
-#: actions/showstream.php:70
 #, fuzzy, php-format
 msgid "%1$s tagged %2$s"
 msgstr "%1$s، صفحهٔ %2$d"
 
 #. TRANS: Page title showing tagged notices in one user's stream.
 #. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
-#: actions/showstream.php:74
 #, fuzzy, php-format
 msgid "%1$s tagged %2$s, page %3$d"
 msgstr "پیام‌های برچسب‌دار شده با %1$s، صفحهٔ %2$d"
 
 #. TRANS: Extended page title showing tagged notices in one user's stream.
 #. TRANS: %1$s is the username, %2$d is the page number.
-#: actions/showstream.php:82
 #, php-format
 msgid "%1$s, page %2$d"
 msgstr "%1$s، صفحهٔ %2$d"
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %1$s is a user nickname, %2$s is a hashtag.
-#: actions/showstream.php:127
 #, php-format
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
 msgstr "خوراک پیام‌های %1$s دارای برچسب %2$s (RSS 1.0)"
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.
-#: actions/showstream.php:136
 #, php-format
 msgid "Notice feed for %s (RSS 1.0)"
 msgstr "خوراک پیام‌های %s (RSS 1.0)"
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.
-#: actions/showstream.php:145
 #, php-format
 msgid "Notice feed for %s (RSS 2.0)"
 msgstr "خوراک پیام‌های %s (RSS 2.0)"
 
-#: actions/showstream.php:152
 #, php-format
 msgid "Notice feed for %s (Atom)"
 msgstr "خوراک پیام‌های %s (Atom)"
 
 #. TRANS: Title for link to notice feed. FOAF stands for Friend of a Friend.
 #. TRANS: More information at http://www.foaf-project.org. %s is a user nickname.
-#: actions/showstream.php:159
 #, php-format
 msgid "FOAF for %s"
 msgstr "FOAF برای %s"
 
 #. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
-#: actions/showstream.php:205
 #, fuzzy, php-format
 msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr "این خط‌زمانی %1$s است، اما %2$s تاکنون چیزی نفرستاده است."
 
 #. TRANS: Second sentence of empty list message for a stream for the user themselves.
-#: actions/showstream.php:211
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
@@ -5841,7 +4826,6 @@ msgstr ""
 
 #. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:215
 #, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
@@ -5852,7 +4836,6 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:258
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5868,7 +4851,6 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:265
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5880,223 +4862,176 @@ msgstr ""
 "8C%D9%86%DA%AF) بر پایهٔ نرم‌افزار آزاد [StatusNet](http://status.net/) ،دارد. "
 
 #. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
-#: actions/showstream.php:322
 #, php-format
 msgid "Repeat of %s"
 msgstr "تکرار %s"
 
-#: actions/silence.php:65 actions/unsilence.php:65
 msgid "You cannot silence users on this site."
 msgstr "شما نمی توانید کاربری را در این سایت ساکت کنید."
 
-#: actions/silence.php:72
 msgid "User is already silenced."
 msgstr "کاربر قبلا ساکت شده است."
 
-#: actions/siteadminpanel.php:69
 msgid "Basic settings for this StatusNet site"
 msgstr "تنظیمات پایه برای این وب‌گاه StatusNet"
 
-#: actions/siteadminpanel.php:133
 msgid "Site name must have non-zero length."
 msgstr "نام وب‌گاه باید طولی غیر صفر داشته باشد."
 
-#: actions/siteadminpanel.php:141
 msgid "You must have a valid contact email address."
 msgstr "شما باید یک نشانی پست الکترونیکی معتبر برای ارتباط داشته باشید."
 
-#: actions/siteadminpanel.php:159
 #, php-format
 msgid "Unknown language \"%s\"."
 msgstr "زبان «%s» ناشناس است."
 
-#: actions/siteadminpanel.php:165
 msgid "Minimum text limit is 0 (unlimited)."
 msgstr "کمینهٔ محدودیت متن ۰ است (نامحدود)."
 
-#: actions/siteadminpanel.php:171
 msgid "Dupe limit must be one or more seconds."
 msgstr ""
 
-#: actions/siteadminpanel.php:221
 msgid "General"
 msgstr "عمومی"
 
-#: actions/siteadminpanel.php:224
 msgid "Site name"
 msgstr "نام وب‌گاه"
 
-#: actions/siteadminpanel.php:225
 msgid "The name of your site, like \"Yourcompany Microblog\""
 msgstr "نام وب‌گاه شما، مانند «میکروبلاگ شرکت شما»"
 
-#: actions/siteadminpanel.php:229
 msgid "Brought by"
 msgstr "آورده‌شده به وسیلهٔ"
 
-#: actions/siteadminpanel.php:230
 msgid "Text used for credits link in footer of each page"
 msgstr "متن  استفاده‌شده برای پیوند سازندگان در انتهای هر صفحه"
 
-#: actions/siteadminpanel.php:234
 msgid "Brought by URL"
 msgstr "آورده‌شده با نشانی اینترنتی"
 
-#: actions/siteadminpanel.php:235
 msgid "URL used for credits link in footer of each page"
 msgstr "نشانی اینترنتی استفاده‌شده برای پیوند سازندگان در انتهای هر صفحه"
 
-#: actions/siteadminpanel.php:239
 msgid "Contact email address for your site"
 msgstr "نشانی پست الکترونیکی تماس برای وب‌گاه شما"
 
-#: actions/siteadminpanel.php:245
 msgid "Local"
 msgstr "محلی"
 
-#: actions/siteadminpanel.php:256
 msgid "Default timezone"
 msgstr "منطقهٔ زمانی پیش‌فرض"
 
-#: actions/siteadminpanel.php:257
 msgid "Default timezone for the site; usually UTC."
 msgstr "منظقهٔ زمانی پیش‌فرض برای وب‌گاه؛ معمولا UTC."
 
-#: actions/siteadminpanel.php:262
 msgid "Default language"
 msgstr "زبان پیش‌فرض"
 
-#: actions/siteadminpanel.php:263
 msgid "Site language when autodetection from browser settings is not available"
 msgstr "شناسایی خودکار زبان وب‌گاه از راه تنظیمات مرورگر در دسترس نیست."
 
-#: actions/siteadminpanel.php:271
 msgid "Limits"
 msgstr "محدودیت ها"
 
-#: actions/siteadminpanel.php:274
 msgid "Text limit"
 msgstr "محدودیت متن"
 
-#: actions/siteadminpanel.php:274
 msgid "Maximum number of characters for notices."
 msgstr "بیشینهٔ تعداد نویسه‌ها برای پیام‌ها."
 
-#: actions/siteadminpanel.php:278
 #, fuzzy
 msgid "Dupe limit"
 msgstr "محدودیت متن"
 
-#: actions/siteadminpanel.php:278
 msgid "How long users must wait (in seconds) to post the same thing again."
 msgstr ""
 "چه مدت کاربران باید منتظر بمانند (به ثانیه) تا همان چیز را دوباره بفرستند."
 
 #. TRANS: Page title for site-wide notice tab in admin panel.
-#: actions/sitenoticeadminpanel.php:55
 msgid "Site Notice"
 msgstr "پیام وب‌گاه"
 
 #. TRANS: Instructions for site-wide notice tab in admin panel.
-#: actions/sitenoticeadminpanel.php:66
 msgid "Edit site-wide message"
 msgstr "ویرایش پیام عمومی وب‌گاه"
 
 #. TRANS: Server error displayed when saving a site-wide notice was impossible.
-#: actions/sitenoticeadminpanel.php:101
 msgid "Unable to save site notice."
 msgstr "نمی‌توان پیام وب‌گاه را ذخیره کرد."
 
 #. TRANS: Client error displayed when a site-wide notice was longer than allowed.
-#: actions/sitenoticeadminpanel.php:112
 #, fuzzy
 msgid "Maximum length for the site-wide notice is 255 characters."
 msgstr "بیشینهٔ طول برای پیام عمومی وب‌گاه ۲۵۵ نویسه است."
 
 #. TRANS: Label for site-wide notice text field in admin panel.
-#: actions/sitenoticeadminpanel.php:176
 msgid "Site notice text"
 msgstr "متن پیام وب‌گاه"
 
 #. TRANS: Tooltip for site-wide notice text field in admin panel.
-#: actions/sitenoticeadminpanel.php:179
 #, fuzzy
 msgid "Site-wide notice text (255 characters maximum; HTML allowed)"
 msgstr "متن پیام عمومی وب‌گاه (حداکثر ۲۵۵ نویسه؛ می‌توان از HTML استفاده کرد)"
 
 #. TRANS: Title for button to save site notice in admin panel.
-#: actions/sitenoticeadminpanel.php:201
 #, fuzzy
 msgid "Save site notice."
 msgstr "ذخیرهٔ پیام وب‌گاه"
 
 #. TRANS: Title for SMS settings.
-#: actions/smssettings.php:56
 msgid "SMS settings"
 msgstr "تنظیمات پیامک"
 
 #. TRANS: SMS settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/smssettings.php:70
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr ""
 "شما می‌توانید پیامک‌ها را از راه پست الکترونیک از %%site.name%% دریافت کنید."
 
 #. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
-#: actions/smssettings.php:92
 msgid "SMS is not available."
 msgstr "پیامک در دسترس نیست."
 
 #. TRANS: Form legend for SMS settings form.
-#: actions/smssettings.php:106
 msgid "SMS address"
 msgstr "نشانی پیامک"
 
 #. TRANS: Form guide in SMS settings form.
-#: actions/smssettings.php:115
 msgid "Current confirmed SMS-enabled phone number."
 msgstr "شمارهٔ تلفن با قابلیت فرستادن پیامک که در حال حاضر تایید شده است."
 
 #. TRANS: Form guide in IM settings form.
-#: actions/smssettings.php:128
 msgid "Awaiting confirmation on this phone number."
 msgstr "منتظر تاییدیه برای این شماره تلفن."
 
 #. TRANS: Field label for SMS address input in SMS settings form.
-#: actions/smssettings.php:137
 msgid "Confirmation code"
 msgstr "کد تاییدیه"
 
 #. TRANS: Form field instructions in SMS settings form.
-#: actions/smssettings.php:139
 msgid "Enter the code you received on your phone."
 msgstr "کدی را که در گوشی‌تان دریافت کردید، وارد کنید"
 
 #. TRANS: Button label to confirm SMS confirmation code in SMS settings.
-#: actions/smssettings.php:143
 msgctxt "BUTTON"
 msgid "Confirm"
 msgstr "تایید"
 
 #. TRANS: Field label for SMS phone number input in SMS settings form.
-#: actions/smssettings.php:148
 msgid "SMS phone number"
 msgstr "شمارهٔ تماس پیامک"
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
-#: actions/smssettings.php:151
 #, fuzzy
 msgid "Phone number, no punctuation or spaces, with area code."
 msgstr "شماره تلفن، بدون نشانه گذاری یا فاصله، با کد منطقه"
 
 #. TRANS: Form legend for SMS preferences form.
-#: actions/smssettings.php:190
 msgid "SMS preferences"
 msgstr "ترجیحات پیامک"
 
 #. TRANS: Checkbox label in SMS preferences form.
-#: actions/smssettings.php:196
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
@@ -6105,32 +5040,26 @@ msgstr ""
 "زیادی از طرف اپراتورم بشوم."
 
 #. TRANS: Confirmation message for successful SMS preferences save.
-#: actions/smssettings.php:307
 msgid "SMS preferences saved."
 msgstr "تنظیمات پیامک ذخیره شد."
 
 #. TRANS: Message given saving SMS phone number without having provided one.
-#: actions/smssettings.php:329
 msgid "No phone number."
 msgstr "بدون شماره تلفن."
 
 #. TRANS: Message given saving SMS phone number without having selected a carrier.
-#: actions/smssettings.php:335
 msgid "No carrier selected."
 msgstr "هیچ اپراتوری انتخاب نشده است."
 
 #. TRANS: Message given saving SMS phone number that is already set.
-#: actions/smssettings.php:343
 msgid "That is already your phone number."
 msgstr "آن قبلا شماره تلفن شما بوده است."
 
 #. TRANS: Message given saving SMS phone number that is already set for another user.
-#: actions/smssettings.php:347
 msgid "That phone number already belongs to another user."
 msgstr "أن شماره تلفن پیش از این به کاربر دیگری تعلق داشته است."
 
 #. TRANS: Message given saving valid SMS phone number that is to be confirmed.
-#: actions/smssettings.php:375
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
 "for the code and instructions on how to use it."
@@ -6139,39 +5068,32 @@ msgstr ""
 "کد و راهنمای استفاده از آن بررسی کنید."
 
 #. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
-#: actions/smssettings.php:403
 msgid "That is the wrong confirmation number."
 msgstr "این کد تاییدیه نادرست است."
 
 #. TRANS: Message given after successfully canceling SMS phone number confirmation.
-#: actions/smssettings.php:417
 msgid "SMS confirmation cancelled."
 msgstr "تایید پیامک لغو شد."
 
 #. TRANS: Message given trying to remove an SMS phone number that is not
 #. TRANS: registered for the active user.
-#: actions/smssettings.php:437
 msgid "That is not your phone number."
 msgstr "این شمارهٔ تلفن شما نیست."
 
 #. TRANS: Message given after successfully removing a registered SMS phone number.
-#: actions/smssettings.php:459
 msgid "The SMS phone number was removed."
 msgstr "شماره تماس پیامک پاک شد."
 
 #. TRANS: Label for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:498
 msgid "Mobile carrier"
 msgstr "اپراتور موبایل"
 
 #. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:503
 msgid "Select a carrier"
 msgstr "یک اپراتور را انتخاب کنید"
 
 #. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
 #. TRANS: %s is an administrative contact's e-mail address.
-#: actions/smssettings.php:512
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -6182,120 +5104,95 @@ msgstr ""
 "بفرستید تا ما باخبر شویم."
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
-#: actions/smssettings.php:534
 #, fuzzy
 msgid "No code entered."
 msgstr "کدی وارد نشد"
 
 #. TRANS: Menu item for site administration
-#: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
-#: lib/adminpanelaction.php:395
 msgid "Snapshots"
 msgstr "تصاویر لحظه‌ای"
 
-#: actions/snapshotadminpanel.php:65
 msgid "Manage snapshot configuration"
 msgstr "مدیریت پیکربندی تصویر لحظه‌ای"
 
-#: actions/snapshotadminpanel.php:127
 msgid "Invalid snapshot run value."
 msgstr "مقدار اجرای تصویر لحظه‌ای نامعتبر است."
 
-#: actions/snapshotadminpanel.php:133
 msgid "Snapshot frequency must be a number."
 msgstr "تناوب تصویر لحظه‌ای باید یک عدد باشد."
 
-#: actions/snapshotadminpanel.php:144
 msgid "Invalid snapshot report URL."
 msgstr "نشانی اینترنتی گزارش تصویر لحظه‌ای نامعتبر است."
 
-#: actions/snapshotadminpanel.php:200
 msgid "Randomly during web hit"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:201
 msgid "In a scheduled job"
 msgstr "در یک وظیفهٔ برنامه‌ریزی‌شده"
 
-#: actions/snapshotadminpanel.php:206
 msgid "Data snapshots"
 msgstr "داده‌های تصاویر لحظه‌ای"
 
-#: actions/snapshotadminpanel.php:208
 msgid "When to send statistical data to status.net servers"
 msgstr "زمان فرستادن داده‌های آماری به کارگزارهای status.net"
 
-#: actions/snapshotadminpanel.php:217
 msgid "Frequency"
 msgstr "فرکانس"
 
-#: actions/snapshotadminpanel.php:218
 #, fuzzy
 msgid "Snapshots will be sent once every N web hits"
 msgstr "تصاویر لحظه‌ای به این نشانی اینترنتی فرستاده می‌شوند"
 
-#: actions/snapshotadminpanel.php:226
 msgid "Report URL"
 msgstr "نشانی اینترنتی گزارش"
 
-#: actions/snapshotadminpanel.php:227
 msgid "Snapshots will be sent to this URL"
 msgstr "تصاویر لحظه‌ای به این نشانی اینترنتی فرستاده می‌شوند"
 
-#: actions/snapshotadminpanel.php:248
 msgid "Save snapshot settings"
 msgstr "ذخیرهٔ تنظیمات تصویر لحظه‌ای"
 
 #. TRANS: Client error displayed trying a change a subscription for a non-subscribed profile.
-#: actions/subedit.php:75
 msgid "You are not subscribed to that profile."
 msgstr "شما مشترک آن نمایه نیستید."
 
 #. TRANS: Server error displayed when updating a subscription fails with a database error.
 #. TRANS: Exception thrown when a subscription could not be stored on the server.
-#: actions/subedit.php:89 classes/Subscription.php:141
 msgid "Could not save subscription."
 msgstr "نمی‌توان اشتراک را ذخیره کرد."
 
 #. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
-#: actions/subscribe.php:121
 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
 msgstr "نمی‌توان با این کار مشترک یک نمایهٔ از راه دور OMB 0.1شد."
 
 #. TRANS: Page title when subscription succeeded.
-#: actions/subscribe.php:149
 msgid "Subscribed"
 msgstr "مشترک‌شده"
 
 #. TRANS: Header for list of subscribers for a user (first page).
 #. TRANS: %s is the user's nickname.
-#: actions/subscribers.php:51
 #, php-format
 msgid "%s subscribers"
 msgstr "%s مشترک"
 
 #. TRANS: Header for list of subscribers for a user (not first page).
 #. TRANS: %1$s is the user's nickname, $2$d is the page number.
-#: actions/subscribers.php:55
 #, php-format
 msgid "%1$s subscribers, page %2$d"
 msgstr "مشترک‌های %1$s، صفحهٔ %2$d"
 
 #. TRANS: Page notice for page with an overview of all subscribers
 #. TRANS: of the logged in user's own profile.
-#: actions/subscribers.php:68
 msgid "These are the people who listen to your notices."
 msgstr "این‌ها کسانی هستند که پیام‌های شما را دنبال می‌کنند."
 
 #. TRANS: Page notice for page with an overview of all subscribers of a user other
 #. TRANS: than the logged in user. %s is the user nickname.
-#: actions/subscribers.php:74
 #, php-format
 msgid "These are the people who listen to %s's notices."
 msgstr "این‌ها کسانی هستند که پیام‌های %s را دنبال می‌کنند."
 
 #. TRANS: Subscriber list text when the logged in user has no subscribers.
-#: actions/subscribers.php:114
 #, fuzzy
 msgid ""
 "You have no subscribers. Try subscribing to people you know and they might "
@@ -6306,7 +5203,6 @@ msgstr ""
 
 #. TRANS: Subscriber list text when looking at the subscribers for a of a user other
 #. TRANS: than the logged in user that has no subscribers. %s is the user nickname.
-#: actions/subscribers.php:118
 #, php-format
 msgid "%s has no subscribers. Want to be the first?"
 msgstr "%s هیچ مشترکی ندارد. می‌خواهید اولین مشترک باشید؟"
@@ -6316,7 +5212,6 @@ msgstr "%s هیچ مشترکی ندارد. می‌خواهید اولین مشت
 #. TRANS: This message contains a Markdown URL. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.
-#: actions/subscribers.php:127
 #, php-format
 msgid ""
 "%s has no subscribers. Why not [register an account](%%%%action.register%%%"
@@ -6327,20 +5222,17 @@ msgstr ""
 
 #. TRANS: Header for subscriptions overview for a user (not first page).
 #. TRANS: %1$s is a user nickname, %2$d is the page number.
-#: actions/subscriptions.php:55
 #, php-format
 msgid "%1$s subscriptions, page %2$d"
 msgstr "اشتراک‌های %1$s، صفحهٔ %2$d"
 
 #. TRANS: Page notice for page with an overview of all subscriptions
 #. TRANS: of the logged in user's own profile.
-#: actions/subscriptions.php:68
 msgid "These are the people whose notices you listen to."
 msgstr "این‌ها کسانی هستند که پیام‌هایشان را دنبال می‌کنید."
 
 #. TRANS: Page notice for page with an overview of all subscriptions of a user other
 #. TRANS: than the logged in user. %s is the user nickname.
-#: actions/subscriptions.php:74
 #, php-format
 msgid "These are the people whose notices %s listens to."
 msgstr "این‌ها کسانی هستند که %s پیام‌هایشان را دنبال می‌کند."
@@ -6349,7 +5241,6 @@ 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.
-#: actions/subscriptions.php:133
 #, php-format
 msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "
@@ -6369,294 +5260,235 @@ msgstr ""
 #. TRANS: than the logged in user that has no subscriptions. %s is the user nickname.
 #. TRANS: Subscription list text when looking at the subscriptions for a of a user that has none
 #. TRANS: as an anonymous user. %s is the user nickname.
-#: actions/subscriptions.php:141 actions/subscriptions.php:147
 #, php-format
 msgid "%s is not listening to anyone."
 msgstr "%s هیچ‌کس را دنبال نمی‌کند."
 
 #. TRANS: Atom feed title. %s is a profile nickname.
-#: actions/subscriptions.php:176
 #, fuzzy, php-format
 msgid "Subscription feed for %s (Atom)"
 msgstr "خوراک پیام‌های %s (Atom)"
 
 #. TRANS: Checkbox label for enabling Jabber messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:241 lib/settingsnav.php:110
-#, fuzzy
 msgid "IM"
 msgstr "پیام‌رسان فوری"
 
 #. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:256 lib/settingsnav.php:117
 msgid "SMS"
 msgstr "پیامک"
 
 #. TRANS: Title for all but the first page of notices with tags.
 #. TRANS: %1$s is the tag, %2$d is the page number.
-#: actions/tag.php:73
 #, php-format
 msgid "Notices tagged with %1$s, page %2$d"
 msgstr "پیام‌های برچسب‌دار شده با %1$s، صفحهٔ %2$d"
 
-#: actions/tag.php:91
 #, php-format
 msgid "Notice feed for tag %s (RSS 1.0)"
 msgstr "خوراک پیام برای برچسب %s (RSS 1.0)"
 
-#: actions/tag.php:97
 #, php-format
 msgid "Notice feed for tag %s (RSS 2.0)"
 msgstr "خوراک پیام برای برچسب %s (RSS 2.0)"
 
-#: actions/tag.php:103
 #, php-format
 msgid "Notice feed for tag %s (Atom)"
 msgstr "خوراک پیام برای برچسب %s (Atom)"
 
-#: actions/tagother.php:39
 #, fuzzy
 msgid "No ID argument."
 msgstr "هیچ پیوستی وجود ندارد."
 
-#: actions/tagother.php:65
 #, php-format
 msgid "Tag %s"
 msgstr "برچسب %s"
 
 #. TRANS: H2 for user profile information.
-#: actions/tagother.php:77 lib/userprofile.php:76
 msgid "User profile"
 msgstr "نمایهٔ کاربر"
 
-#: actions/tagother.php:120
 msgid "Tag user"
 msgstr "برچسب‌گذاری کاربر"
 
-#: actions/tagother.php:130
 msgid ""
 "Tags for this user (letters, numbers, -, ., and _), comma- or space- "
 "separated"
 msgstr ""
 "برچسب‌ها برای این کاربر (حروف، اعداد، -، .، و _)، جدا شده با کاما- یا فاصله-"
 
-#: actions/tagother.php:157
 #, php-format
 msgid "Invalid tag: \"%s\""
 msgstr "نشان نادرست »%s«"
 
-#: actions/tagother.php:172
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 "شما تنها می‌توانید افرادی را برچسب‌دار کنید که مشترک آن‌ها هستید یا آن‌ها مشترک "
 "شما هستند."
 
-#: actions/tagother.php:215
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr "از این روش برای افزودن برچسب به مشترک‌ها یا اشتراک‌هایتان استفاده کنید."
 
-#: actions/tagrss.php:35
 msgid "No such tag."
 msgstr "چنین برچسبی وجود ندارد."
 
 #. TRANS: Client error displayed when trying to unblock a non-blocked user.
-#: actions/unblock.php:59
 msgid "You haven't blocked that user."
 msgstr "شما آن کاربر را مسدود نکرده اید."
 
-#: actions/unsandbox.php:72
 #, fuzzy
 msgid "User is not sandboxed."
 msgstr "کاربر ساکت نشده است."
 
-#: actions/unsilence.php:72
 msgid "User is not silenced."
 msgstr "کاربر ساکت نشده است."
 
-#: actions/unsubscribe.php:77
 msgid "No profile ID in request."
 msgstr "هیچ شناسهٔ نمایه‌ای درخواست نشده است."
 
-#: actions/unsubscribe.php:98
 msgid "Unsubscribed"
 msgstr "لغو اشتراک شده"
 
-#: actions/updateprofile.php:64
 #, fuzzy, php-format
 msgid ""
 "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
 msgstr "مجوز پیام «%1$s» با مجوز وب‌گاه «%2$s» سازگار نیست."
 
-#: actions/urlsettings.php:60
 #, fuzzy
 msgid "URL settings"
 msgstr "تنظیمات پیام‌رسان فوری"
 
 #. TRANS: Instructions for tab "Other" in user profile settings.
-#: actions/urlsettings.php:72
 msgid "Manage various other options."
 msgstr "مدیریت انتخاب های مختلف دیگر."
 
 #. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
 #. TRANS: user's profile settings. This message has one space at the beginning. Use your
 #. TRANS: language's word separator here if it has one (most likely a single space).
-#: actions/urlsettings.php:115
 msgid " (free service)"
 msgstr " (سرویس‌ آزاد)"
 
-#: actions/urlsettings.php:121
 #, fuzzy
 msgid "[none]"
 msgstr "هیچ"
 
-#: actions/urlsettings.php:122
 msgid "[internal]"
 msgstr ""
 
 #. TRANS: Label for dropdown with URL shortener services.
-#: actions/urlsettings.php:130
 msgid "Shorten URLs with"
 msgstr "کوتاه‌کردن نشانی‌های اینترنتی با"
 
 #. TRANS: Tooltip for for dropdown with URL shortener services.
-#: actions/urlsettings.php:132
 msgid "Automatic shortening service to use."
 msgstr "کوتاه‌کنندهٔ نشانی مورد استفاده."
 
-#: actions/urlsettings.php:138
 msgid "URL longer than"
 msgstr ""
 
-#: actions/urlsettings.php:141
 msgid "URLs longer than this will be shortened, 0 means always shorten."
 msgstr ""
 
-#: actions/urlsettings.php:145
 msgid "Text longer than"
 msgstr ""
 
-#: actions/urlsettings.php:148
 msgid ""
 "URLs in notices longer than this will be shortened, 0 means always shorten."
 msgstr ""
 
 #. TRANS: Form validation error for form "Other settings" in user profile.
-#: actions/urlsettings.php:180
 #, fuzzy
 msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr "کوتاه کنندهٔ نشانی بسیار طولانی است (بیش‌تر از ۵۰ حرف)."
 
-#: actions/urlsettings.php:187
 msgid "Invalid number for max url length."
 msgstr ""
 
-#: actions/urlsettings.php:193
 #, fuzzy
 msgid "Invalid number for max notice length."
 msgstr "محتوای پیام نامعتبر است."
 
-#: actions/urlsettings.php:238
 msgid "Error saving user URL shortening preferences."
 msgstr ""
 
 #. TRANS: User admin panel title
-#: actions/useradminpanel.php:58
 msgctxt "TITLE"
 msgid "User"
 msgstr "کاربر"
 
 #. TRANS: Instruction for user admin panel.
-#: actions/useradminpanel.php:69
 msgid "User settings for this StatusNet site"
 msgstr ""
 
 #. TRANS: Form validation error in user admin panel when a non-numeric character limit was set.
-#: actions/useradminpanel.php:147
 msgid "Invalid bio limit. Must be numeric."
 msgstr "محدودیت شرح‌حال نادرست است. مقدار محدودیت باید عددی باشد."
 
 #. TRANS: Form validation error in user admin panel when welcome text is too long.
-#: actions/useradminpanel.php:154
 #, fuzzy
 msgid "Invalid welcome text. Maximum length is 255 characters."
 msgstr "متن خوشامدگویی نامعتبر است. بیشینهٔ طول متن ۲۵۵ نویسه است."
 
 #. TRANS: Client error displayed when trying to set a non-existing user as default subscription for new
 #. TRANS: users in user admin panel. %1$s is the invalid nickname.
-#: actions/useradminpanel.php:166
 #, fuzzy, php-format
 msgid "Invalid default subscripton: \"%1$s\" is not a user."
 msgstr "اشتراک پیش‌فرض نامعتبر است: «%1$s» کاربر نیست."
 
-#: actions/useradminpanel.php:215 lib/action.php:565 lib/settingsnav.php:77
-#: lib/subgroupnav.php:81
 msgid "Profile"
 msgstr "نمایه"
 
 #. TRANS: Field label in user admin panel for setting the character limit for the bio field.
-#: actions/useradminpanel.php:220
 msgid "Bio Limit"
 msgstr "محدودیت شرح‌حال"
 
 #. TRANS: Tooltip in user admin panel for setting the character limit for the bio field.
-#: actions/useradminpanel.php:222
 msgid "Maximum length of a profile bio in characters."
 msgstr "بیشینهٔ طول یک شرح‌حال نمایه بر اساس نویسه‌ها."
 
 #. TRANS: Form legend in user admin panel.
-#: actions/useradminpanel.php:231
 msgid "New users"
 msgstr "کاربران تازه"
 
 #. TRANS: Field label in user admin panel for setting new user welcome text.
-#: actions/useradminpanel.php:236
 msgid "New user welcome"
 msgstr "خوشامدگویی کاربر جدید"
 
 #. TRANS: Tooltip in user admin panel for setting new user welcome text.
-#: actions/useradminpanel.php:238
 #, fuzzy
 msgid "Welcome text for new users (maximum 255 characters)."
 msgstr "متن خوشامدگویی برای کاربران جدید (حداکثر ۲۵۵ نویسه)."
 
 #. TRANS: Field label in user admin panel for setting default subscription for new users.
-#: actions/useradminpanel.php:244
 msgid "Default subscription"
 msgstr "اشتراک پیش‌فرض"
 
 #. TRANS: Tooltip in user admin panel for setting default subscription for new users.
-#: actions/useradminpanel.php:246
 msgid "Automatically subscribe new users to this user."
 msgstr "به صورت خودکار کاربران تازه‌وارد را مشترک این کاربر کن."
 
 #. TRANS: Form legend in user admin panel.
-#: actions/useradminpanel.php:256
 msgid "Invitations"
 msgstr "دعوت‌نامه‌ها"
 
 #. TRANS: Field label for checkbox in user admin panel for allowing users to invite friend using site e-mail.
-#: actions/useradminpanel.php:262
 msgid "Invitations enabled"
 msgstr "دعوت نامه ها فعال شدند"
 
 #. TRANS: Tooltip for checkbox in user admin panel for allowing users to invite friend using site e-mail.
-#: actions/useradminpanel.php:265
 msgid "Whether to allow users to invite new users."
 msgstr "چنان‌که به کاربران اجازهٔ دعوت‌کردن کاربران تازه داده شود."
 
 #. TRANS: Title for button to save user settings in user admin panel.
-#: actions/useradminpanel.php:302
 #, fuzzy
 msgid "Save user settings."
 msgstr "ذخیرهٔ تنظیمات وب‌گاه"
 
 #. TRANS: Page title.
-#: actions/userauthorization.php:109
 msgid "Authorize subscription"
 msgstr "تصدیق اشتراک"
 
 #. TRANS: Page notice on "Auhtorize subscription" page.
-#: actions/userauthorization.php:115
 #, fuzzy
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
@@ -6668,42 +5500,35 @@ msgstr ""
 "کردن» کلیک کنید."
 
 #. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:200
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Accept"
 msgstr "پذیرفتن"
 
 #. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:202
 #, fuzzy
 msgid "Subscribe to this user."
 msgstr "مشترک شدن این کاربر"
 
 #. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:204
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Reject"
 msgstr "رد کردن"
 
 #. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:206
 #, fuzzy
 msgid "Reject this subscription."
 msgstr "رد کردن این اشتراک"
 
 #. TRANS: Client error displayed for an empty authorisation request.
-#: actions/userauthorization.php:219
 msgid "No authorization request!"
 msgstr "هیچ درخواست اجازه‌ای وجود ندارد!"
 
 #. TRANS: Accept message header from Authorise subscription page.
-#: actions/userauthorization.php:242
 msgid "Subscription authorized"
 msgstr "اشتراک تصدیق شد"
 
-#: actions/userauthorization.php:245
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to authorize the "
@@ -6711,11 +5536,9 @@ msgid ""
 msgstr ""
 
 #. TRANS: Reject message header from Authorise subscription page.
-#: actions/userauthorization.php:256
 msgid "Subscription rejected"
 msgstr "اشتراک پذیرفته نشد"
 
-#: actions/userauthorization.php:259
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to fully reject the "
@@ -6724,35 +5547,30 @@ msgstr ""
 
 #. TRANS: Exception thrown when no valid user is found for an authorisation request.
 #. TRANS: %s is a listener URI.
-#: actions/userauthorization.php:296
 #, fuzzy, php-format
 msgid "Listener URI \"%s\" not found here."
 msgstr "نشانی تصویر چهره «%s» معتبر نیست."
 
 #. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
 #. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:303
 #, fuzzy, php-format
 msgid "Listenee URI \"%s\" is too long."
 msgstr "نشانی تصویر چهره «%s» معتبر نیست."
 
 #. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
 #. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:311
 #, fuzzy, php-format
 msgid "Listenee URI \"%s\" is a local user."
 msgstr "نشانی اینترنتی نمایهٔ «%s» برای یک کاربر محلی است."
 
 #. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
 #. TRANS: %s is a profile URL.
-#: actions/userauthorization.php:329
 #, fuzzy, php-format
 msgid "Profile URL \"%s\" is for a local user."
 msgstr "نشانی اینترنتی نمایهٔ «%s» برای یک کاربر محلی است."
 
 #. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
 #. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
-#: actions/userauthorization.php:339
 #, fuzzy, php-format
 msgid ""
 "Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
@@ -6761,32 +5579,27 @@ msgstr "مجوز پیام «%1$s» با مجوز وب‌گاه «%2$s» سازگ
 
 #. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
 #. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:349
 #, fuzzy, php-format
 msgid "Avatar URL \"%s\" is not valid."
 msgstr "نشانی تصویر چهره «%s» معتبر نیست."
 
 #. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
 #. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:356
 #, fuzzy, php-format
 msgid "Cannot read avatar URL \"%s\"."
 msgstr "نمی‌توان نشانی اینترنتی چهره را خواند«%s»."
 
 #. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
 #. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:363
 #, fuzzy, php-format
 msgid "Wrong image type for avatar URL \"%s\"."
 msgstr "نوع تصویر برای نشانی اینترنتی چهره نادرست است «%s»."
 
 #. TRANS: Page title for profile design page.
-#: actions/userdesignsettings.php:74 lib/designsettings.php:61
 msgid "Profile design"
 msgstr "طراحی نمایه"
 
 #. TRANS: Instructions for profile design page.
-#: actions/userdesignsettings.php:84 lib/designsettings.php:72
 msgid ""
 "Customize the way your profile looks with a background image and a colour "
 "palette of your choice."
@@ -6794,44 +5607,35 @@ msgstr ""
 "شیوهٔ نمایش نمایهٔ خود را با یک تصویر پیش‌زمینه و یک رنگ از جعبهٔ رنگ‌ها به "
 "انتخاب خودتان سفارشی‌سازی کنید."
 
-#: actions/userdesignsettings.php:289
 msgid "Enjoy your hotdog!"
 msgstr "از هات داگ خود لذت ببرید!"
 
-#: actions/userdesignsettings.php:325
 #, fuzzy
 msgid "Design settings"
 msgstr "ذخیرهٔ تنظیمات وب‌گاه"
 
-#: actions/userdesignsettings.php:340
 msgid "View profile designs"
 msgstr "نمایش طراحی‌های نمایه"
 
-#: actions/userdesignsettings.php:341
 msgid "Show or hide profile designs."
 msgstr "نمایش دادن یا پنهان کردن طراحی‌های نمایه."
 
-#: actions/userdesignsettings.php:348
 #, fuzzy
 msgid "Background file"
 msgstr "پیش‌زمینه"
 
 #. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number.
-#: actions/usergroups.php:66
 #, php-format
 msgid "%1$s groups, page %2$d"
 msgstr "گروه‌های %1$s، صفحهٔ %2$d"
 
-#: actions/usergroups.php:132
 msgid "Search for more groups"
 msgstr "جستجو برای گروه های بیشتر"
 
-#: actions/usergroups.php:159
 #, php-format
 msgid "%s is not a member of any group."
 msgstr "%s عضو هیچ گروهی نیست."
 
-#: actions/usergroups.php:164
 #, php-format
 msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
 msgstr ""
@@ -6842,18 +5646,14 @@ msgstr ""
 #. TRANS: %1$s is a group name, %2$s is a site name.
 #. TRANS: Message is used as a subtitle in atom user notice feed.
 #. TRANS: %1$s is a user name, %2$s is a site name.
-#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:70
-#: lib/atomusernoticefeed.php:95
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr "به روز رسانی‌های %1$s در %2$s"
 
-#: actions/version.php:75
 #, php-format
 msgid "StatusNet %s"
 msgstr "StatusNet %s"
 
-#: actions/version.php:155
 #, php-format
 msgid ""
 "This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
@@ -6862,16 +5662,13 @@ msgstr ""
 "این وب‌گاه برگرفته از قدرت %1$s نسخهٔ %2$s دارای حق تکثیر ۲۰۰۸−۲۰۰۹ StatusNet "
 "Inc. و مشارکت‌کنندگان است."
 
-#: actions/version.php:163
 msgid "Contributors"
 msgstr "مشارکت‌کنندگان"
 
 #. TRANS: Menu item for site administration
-#: actions/version.php:167 lib/adminpanelaction.php:403
 msgid "License"
 msgstr "مجوز"
 
-#: actions/version.php:170
 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 "
@@ -6882,7 +5679,6 @@ msgstr ""
 "تحت شرایط مجوز GNU Affero General Public License نسخهٔ ۳، یا (به انتخاب شما) "
 "هر نسخهٔ بعدی دیگری، که توسط بنیاد نرم‌افزارهای آزاد منتشر شده است، ویرایش کنید"
 
-#: actions/version.php:176
 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 "
@@ -6893,7 +5689,6 @@ msgstr ""
 "حتی بدون ضمانت جزئی دارای کیفیت فروش یا مناسب بودن برای هدفی خاص. برای "
 "جزئیات بیش‌تر مجوز «GNU Affero General Public License» را ببینید. "
 
-#: actions/version.php:182
 #, php-format
 msgid ""
 "You should have received a copy of the GNU Affero General Public License "
@@ -6903,52 +5698,42 @@ msgstr ""
 "برنامه دریافت کرده باشید. اگر چنین نیست، %s را ببینید."
 
 #. TRANS: Form input field label for application name.
-#: actions/version.php:197 lib/applicationeditform.php:190
 msgid "Name"
 msgstr "نام"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:885
 msgid "Version"
 msgstr "نسخه"
 
-#: actions/version.php:199
 msgid "Author(s)"
 msgstr "مؤلف(ها)"
 
 #. TRANS: Form input field label.
-#: actions/version.php:200 lib/applicationeditform.php:208
-#: lib/groupeditform.php:168
 msgid "Description"
 msgstr "توصیف"
 
 #. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:164
 msgid "Favor"
 msgstr "برگزیده‌کردن"
 
 #. TRANS: Ntofication given when a user marks a notice as favorite.
 #. TRANS: %1$s is a user nickname or full name, %2$s is a notice URI.
-#: classes/Fave.php:167
 #, fuzzy, php-format
 msgid "%1$s marked notice %2$s as a favorite."
 msgstr "پیام شما را به برگزیده‌های خود اضافه کرد %s (@%s)"
 
 #. TRANS: Server exception thrown when a URL cannot be processed.
-#: classes/File.php:162
 #, php-format
 msgid "Cannot process URL '%s'"
 msgstr ""
 
 #. TRANS: Server exception thrown when... Robin thinks something is impossible!
-#: classes/File.php:194
 msgid "Robin thinks something is impossible."
 msgstr ""
 
 #. 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$s is used for plural.
-#: classes/File.php:210
 #, fuzzy, php-format
 msgid ""
 "No file may be larger than %1$d byte and the file you sent was %2$d bytes. "
@@ -6962,7 +5747,6 @@ msgstr[0] ""
 
 #. TRANS: Message given if an upload would exceed user quota.
 #. TRANS: %d (number) is the user quota in bytes and is used for plural.
-#: classes/File.php:223
 #, fuzzy, php-format
 msgid "A file this large would exceed your user quota of %d byte."
 msgid_plural "A file this large would exceed your user quota of %d bytes."
@@ -6971,7 +5755,6 @@ msgstr[0] ""
 
 #. TRANS: Message given id an upload would exceed a user's monthly quota.
 #. TRANS: $d (number) is the monthly user quota in bytes and is used for plural.
-#: classes/File.php:235
 #, fuzzy, php-format
 msgid "A file this large would exceed your monthly quota of %d byte."
 msgid_plural "A file this large would exceed your monthly quota of %d bytes."
@@ -6980,109 +5763,90 @@ msgstr[0] ""
 "بگذرد."
 
 #. TRANS: Client exception thrown if a file upload does not have a valid name.
-#: classes/File.php:282 classes/File.php:297
 msgid "Invalid filename."
 msgstr "نام‌پرونده نادرست است."
 
 #. TRANS: Exception thrown when joining a group fails.
-#: classes/Group_member.php:51
 msgid "Group join failed."
 msgstr "پیوستن به گروه شکست خورد."
 
 #. TRANS: Exception thrown when trying to leave a group the user is not a member of.
-#: classes/Group_member.php:64
 msgid "Not part of group."
 msgstr "بخشی از گروه نیست."
 
 #. TRANS: Exception thrown when trying to leave a group fails.
-#: classes/Group_member.php:72
 msgid "Group leave failed."
 msgstr "ترک کردن گروه شکست خورد."
 
 #. TRANS: Exception thrown providing an invalid profile ID.
 #. TRANS: %s is the invalid profile ID.
-#: classes/Group_member.php:85
 #, php-format
 msgid "Profile ID %s is invalid."
 msgstr ""
 
 #. TRANS: Exception thrown providing an invalid group ID.
 #. TRANS: %s is the invalid group ID.
-#: classes/Group_member.php:98
 #, fuzzy, php-format
 msgid "Group ID %s is invalid."
 msgstr "هنگام ذخیرهٔ کاربر خطا رخ داد؛ نامعتبر است."
 
 #. TRANS: Activity title.
-#: classes/Group_member.php:147 lib/joinform.php:114
 msgid "Join"
 msgstr "مشارکت کردن"
 
 #. TRANS: Success message for subscribe to group attempt through OStatus.
 #. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
-#: classes/Group_member.php:151
 #, php-format
 msgid "%1$s has joined group %2$s."
 msgstr ""
 
 #. TRANS: Server exception thrown when updating a local group fails.
-#: classes/Local_group.php:42
 msgid "Could not update local group."
 msgstr "نمی‌توان گروه محلی را به‌هنگام‌سازی کرد."
 
 #. TRANS: Exception thrown when trying creating a login token failed.
 #. TRANS: %s is the user nickname for which token creation failed.
-#: classes/Login_token.php:78
 #, php-format
 msgid "Could not create login token for %s"
 msgstr "نمی‌توان رمز ورود را برای %s ایجاد کرد"
 
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
-#: classes/Memcached_DataObject.php:556
 msgid "No database name or DSN found anywhere."
 msgstr "هیچ پایگاه‌داده یا DSN هیچ‌جا پیدا نشد."
 
 #. TRANS: Client exception thrown when a user tries to send a direct message while being banned from sending them.
-#: classes/Message.php:45
 msgid "You are banned from sending direct messages."
 msgstr "شما از فرستادن پیام مستقیم مردود شده اید."
 
 #. TRANS: Message given when a message could not be stored on the server.
-#: classes/Message.php:69
 msgid "Could not insert message."
 msgstr "پیغام نمی تواند درج گردد"
 
 #. TRANS: Message given when a message could not be updated on the server.
-#: classes/Message.php:80
 #, fuzzy
 msgid "Could not update message with new URI."
 msgstr "نمی‌توان پیام را تجزیه کرد."
 
 #. TRANS: Server exception thrown when a user profile for a notice cannot be found.
 #. TRANS: %1$d is a profile ID (number), %2$d is a notice ID (number).
-#: classes/Notice.php:98
 #, php-format
 msgid "No such profile (%1$d) for notice (%2$d)."
 msgstr "چنین نمایه‌ای (%1$d) برای پیام (%2$d) وجود ندارد."
 
 #. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:199
 #, php-format
 msgid "Database error inserting hashtag: %s"
 msgstr "هنگام افزودن برچسب خطا در پایگاه داده رخ داد: %s"
 
 #. TRANS: Client exception thrown if a notice contains too many characters.
-#: classes/Notice.php:279
 msgid "Problem saving notice. Too long."
 msgstr "مشکل در ذخیره کردن پیام. بسیار طولانی."
 
 #. TRANS: Client exception thrown when trying to save a notice for an unknown user.
-#: classes/Notice.php:284
 msgid "Problem saving notice. Unknown user."
 msgstr "مشکل در ذخیره کردن پیام. کاربر نا شناخته."
 
 #. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
-#: classes/Notice.php:290
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
@@ -7090,7 +5854,6 @@ msgstr ""
 "دوباره بفرستید."
 
 #. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
-#: classes/Notice.php:297
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
 "few minutes."
@@ -7099,42 +5862,35 @@ msgstr ""
 "ارسال کنید."
 
 #. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:305
 msgid "You are banned from posting notices on this site."
 msgstr "شما از فرستادن پیام در این وب‌گاه منع شده‌اید."
 
 #. TRANS: Server exception thrown when a notice cannot be saved.
 #. TRANS: Server exception thrown when a notice cannot be updated.
-#: classes/Notice.php:372 classes/Notice.php:399
 msgid "Problem saving notice."
 msgstr "هنگام ذخیرهٔ پیام مشکلی ایجاد شد."
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:929
 msgid "Bad type provided to saveKnownGroups."
 msgstr ""
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:1028
 msgid "Problem saving group inbox."
 msgstr "هنگام ذخیرهٔ صندوق ورودی گروه مشکلی رخ داد."
 
 #. TRANS: Server exception thrown when a reply cannot be saved.
 #. TRANS: %1$d is a notice ID, %2$d is the ID of the mentioned user.
-#: classes/Notice.php:1144
 #, fuzzy, php-format
 msgid "Could not save reply for %1$d, %2$d."
 msgstr "نمی‌توان اطلاعات گروه محلی را ذخیره کرد."
 
 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1663
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
 
 #. TRANS: Full name of a profile or group followed by nickname in parens
-#: classes/Profile.php:172 classes/User_group.php:242
 #, fuzzy, php-format
 msgctxt "FANCYNAME"
 msgid "%1$s (%2$s)"
@@ -7142,267 +5898,213 @@ msgstr "%1$s (%2$s)"
 
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:779
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr "نمی‌توان نقش «%1$s» را از کاربر  #%2$d گرفت، وجود ندارد."
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:788
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
 "نمی‌توان نقش «%1$s» را از کاربر #%2$d گرفت، خطا در پایگاه داده وجود دارد."
 
 #. TRANS: Exception thrown when a right for a non-existing user profile is checked.
-#: classes/Remote_profile.php:54
 msgid "Missing profile."
 msgstr "نمایه وجود ندارد."
 
 #. TRANS: Exception thrown when a tag cannot be saved.
-#: classes/Status_network.php:338
 #, fuzzy
 msgid "Unable to save tag."
 msgstr "نمی‌توان پیام وب‌گاه را ذخیره کرد."
 
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#: classes/Subscription.php:77 lib/oauthstore.php:482
 msgid "You have been banned from subscribing."
 msgstr "شما از اشتراک منع شده‌اید."
 
 #. TRANS: Exception thrown when trying to subscribe while already subscribed.
-#: classes/Subscription.php:82
 msgid "Already subscribed!"
 msgstr "قبلا اشتراک انجام شده است!"
 
 #. TRANS: Exception thrown when trying to subscribe to a user who has blocked the subscribing user.
-#: classes/Subscription.php:87
 msgid "User has blocked you."
 msgstr "کاربر شما را مسدود کرده است."
 
 #. TRANS: Exception thrown when trying to unsibscribe without a subscription.
-#: classes/Subscription.php:176
 msgid "Not subscribed!"
 msgstr "تایید نشده!"
 
 #. TRANS: Exception thrown when trying to unsubscribe a user from themselves.
-#: classes/Subscription.php:183
 msgid "Could not delete self-subscription."
 msgstr "نمی‌توان اشتراک را ذخیره کرد."
 
 #. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
-#: classes/Subscription.php:211
 msgid "Could not delete subscription OMB token."
 msgstr "نمی‌توان اشتراک را ذخیره کرد."
 
 #. TRANS: Exception thrown when a subscription could not be deleted on the server.
-#: classes/Subscription.php:223
 msgid "Could not delete subscription."
 msgstr "نمی‌توان اشتراک را ذخیره کرد."
 
 #. TRANS: Activity tile when subscribing to another person.
-#: classes/Subscription.php:265
 msgid "Follow"
 msgstr ""
 
 #. TRANS: Notification given when one person starts following another.
 #. TRANS: %1$s is the subscriber, %2$s is the subscribed.
-#: classes/Subscription.php:268
 #, fuzzy, php-format
 msgid "%1$s is now following %2$s."
 msgstr "%1$s اکنون پیام‌های شما را در %2$s دنبال می‌کند."
 
 #. TRANS: Notice given on user registration.
 #. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:390
 #, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr "@%2$s، به %1$s خوش آمدید!"
 
 #. TRANS: Server exception.
-#: classes/User.php:923
 msgid "No single user defined for single-user mode."
 msgstr "هیچ کاربر تنهایی برای حالت تک کاربره مشخص نشده است."
 
 #. TRANS: Server exception.
-#: classes/User.php:927
 msgid "Single-user mode code called when not enabled."
 msgstr ""
 
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:522
 msgid "Could not create group."
 msgstr "نمیتوان گروه را تشکیل داد"
 
 #. TRANS: Server exception thrown when updating a group URI failed.
-#: classes/User_group.php:532
 #, fuzzy
 msgid "Could not set group URI."
 msgstr "نمیتوان گروه را تشکیل داد"
 
 #. TRANS: Server exception thrown when setting group membership failed.
-#: classes/User_group.php:555
 msgid "Could not set group membership."
 msgstr "نمی‌توان عضویت گروه را تعیین کرد."
 
 #. TRANS: Server exception thrown when saving local group information failed.
-#: classes/User_group.php:570
 msgid "Could not save local group info."
 msgstr "نمی‌توان اطلاعات گروه محلی را ذخیره کرد."
 
 #. TRANS: Exception thrown when an account could not be located when it should be moved.
 #. TRANS: %s is the remote site.
-#: lib/accountmover.php:65
 #, fuzzy, php-format
 msgid "Cannot locate account %s."
 msgstr "شما نمی‌توانید کاربران را پاک کنید."
 
 #. TRANS: Exception thrown when a service document could not be located account move.
 #. TRANS: %s is the remote site.
-#: lib/accountmover.php:106
 #, php-format
 msgid "Cannot find XRD for %s."
 msgstr ""
 
 #. TRANS: Exception thrown when an account could not be located when it should be moved.
 #. TRANS: %s is the remote site.
-#: lib/accountmover.php:131
 #, php-format
 msgid "No AtomPub API service for %s."
 msgstr ""
 
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: lib/action.php:161
 #, php-format
 msgid "%1$s - %2$s"
 msgstr "%1$s (%2$s)"
 
 #. TRANS: Page title for a page without a title set.
-#: lib/action.php:177
 msgid "Untitled page"
 msgstr "صفحهٔ بدون عنوان"
 
 #. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.
-#: lib/action.php:325
 msgctxt "TOOLTIP"
 msgid "Show more"
 msgstr ""
 
 #. TRANS: Inline reply form submit button: submits a reply comment.
-#: lib/action.php:328
 #, fuzzy
 msgctxt "BUTTON"
-msgid "Comment"
-msgstr "محتوا"
+msgid "Reply"
+msgstr "پاسخ"
 
 #. TRANS: Placeholder text for inline reply form. Clicking in this box will turn it into a mini notice form.
-#: lib/action.php:331
-msgid "Add a comment..."
+msgid "Write a reply..."
 msgstr ""
 
-#: lib/action.php:559 lib/personalgroupnav.php:99
-#, fuzzy
 msgid "Home"
-msgstr "صفحهٔ خانگی"
+msgstr "خانه"
 
-#: lib/action.php:560
 #, fuzzy
 msgid "Friends timeline"
 msgstr "خط‌زمانی %s"
 
-#: lib/action.php:566
 #, fuzzy
 msgid "Your profile"
 msgstr "نمایهٔ گروه"
 
-#: lib/action.php:570 lib/action.php:593 lib/publicgroupnav.php:78
 msgid "Public"
 msgstr "عمومی"
 
-#: lib/action.php:571 lib/action.php:594
 #, fuzzy
 msgid "Everyone on this site"
 msgstr "پیدا کردن افراد در این وب‌گاه"
 
-#: lib/action.php:575
 #, fuzzy
 msgid "Settings"
 msgstr "تنظیمات پیامک"
 
-#: lib/action.php:576
 #, fuzzy
 msgid "Change your personal settings"
 msgstr "تنظیمات نمایه‌تان را تغییر دهید"
 
-#: lib/action.php:582
 #, fuzzy
 msgid "Site configuration"
 msgstr "پیکربندی کاربر"
 
-#: lib/action.php:587
-#, fuzzy
 msgid "Logout"
 msgstr "خروج"
 
-#: lib/action.php:588
-#, fuzzy
 msgid "Logout from the site"
-msgstr "خارج‌شدن از وب‌گاه"
+msgstr "خارج شدن از سایت ."
 
-#: lib/action.php:599
-#, fuzzy
 msgid "Login to the site"
 msgstr "ورود به وب‌گاه"
 
-#: lib/action.php:606
-#, fuzzy
 msgid "Search"
 msgstr "جست‌وجو"
 
-#: lib/action.php:607
 #, fuzzy
 msgid "Search the site"
 msgstr "جست‌وجوی وب‌گاه"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:864
 msgid "Help"
 msgstr "کمک"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:867
 msgid "About"
 msgstr "دربارهٔ"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:870
 msgid "FAQ"
 msgstr "سوال‌های رایج"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:875
 msgid "TOS"
 msgstr "شرایط سرویس"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:879
 msgid "Privacy"
 msgstr "خصوصی"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:882
 msgid "Source"
 msgstr "منبع"
 
 #. TRANS: Secondary navigation menu option leading to e-mail contact information on the
 #. TRANS: StatusNet site, where to report bugs, ...
-#: lib/action.php:889
 msgid "Contact"
 msgstr "تماس"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:892
 msgid "Badge"
 msgstr "نشان"
 
@@ -7410,7 +6112,6 @@ msgstr "نشان"
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:921
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7420,7 +6121,6 @@ msgstr ""
 "broughtbyurl%%) برای شما راه‌اندازی شده است."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:924
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** یک سرویس میکروبلاگینگ است."
@@ -7429,7 +6129,6 @@ msgstr "**%%site.name%%** یک سرویس میکروبلاگینگ است."
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:931
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7442,107 +6141,89 @@ msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:949
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr "محتویات و داده‌های %1$s خصوصی و محرمانه هستند."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:956
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr "حق تکثیر محتوا و داده‌ها با %1$s است. تمام حقوق محفوظ است."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:960
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr "حق تکثیر محتوا و داده‌ها با مشارکت‌کنندگان است. تمام حقوق محفوظ است."
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:992
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr "تمام محتویات و داده‌های %1$s زیر مجوز %2$s در دسترس هستند."
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1335
 msgid "After"
 msgstr "پس از"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1345
 msgid "Before"
 msgstr "قبل از"
 
 #. TRANS: Client exception thrown when a feed instance is a DOMDocument.
-#: lib/activity.php:125
 msgid "Expecting a root feed element but got a whole XML document."
 msgstr ""
 "در حال انتظار برای یک عامل خوراک ریشه‌ای، اما یک سند XML کامل دریافت شد."
 
 #. TRANS: Client exception thrown when using an unknown verb for the activity importer.
-#: lib/activityimporter.php:81
 #, fuzzy, php-format
 msgid "Unknown verb: \"%s\"."
 msgstr "زبان «%s» ناشناس است."
 
 #. TRANS: Client exception thrown when trying to force a subscription for an untrusted user.
-#: lib/activityimporter.php:107
 msgid "Cannot force subscription for untrusted user."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to for a remote user to subscribe.
-#: lib/activityimporter.php:117
 #, fuzzy
 msgid "Cannot force remote user to subscribe."
 msgstr "نمی‌توان کاربر را برای اشتراک خودکار به‌هنگام‌سازی کرد."
 
 #. TRANS: Client exception thrown when trying to subscribe to an unknown profile.
-#: lib/activityimporter.php:132
 #, fuzzy
 msgid "Unknown profile."
 msgstr "نوع فایل پشتیبانی نشده"
 
 #. TRANS: Client exception thrown when trying to import an event not related to the importing user.
-#: lib/activityimporter.php:138
 msgid "This activity seems unrelated to our user."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to join a remote group that is not a group.
-#: lib/activityimporter.php:154
 msgid "Remote profile is not a group!"
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to join a group the importing user is already a member of.
-#: lib/activityimporter.php:163
 #, fuzzy
 msgid "User is already a member of this group."
 msgstr "شما از پیش یک عضو این گروه هستید."
 
 #. TRANS: Client exception thrown when trying to import a notice by another user.
 #. TRANS: %1$s is the source URI of the notice, %2$s is the URI of the author.
-#: lib/activityimporter.php:201
 #, php-format
 msgid "Already know about notice %1$s and  it has a different author %2$s."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to overwrite the author information for a non-trusted user during import.
-#: lib/activityimporter.php:207
 msgid "Not overwriting author info for non-trusted user."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to import a notice without content.
 #. TRANS: %s is the notice URI.
-#: lib/activityimporter.php:223
 #, fuzzy, php-format
 msgid "No content for notice %s."
 msgstr "پیدا کردن محتوای پیام‌ها"
 
-#: lib/activitymover.php:84
 #, fuzzy, php-format
 msgid "No such user %s."
 msgstr "چنین کاربری وجود ندارد."
@@ -7553,425 +6234,346 @@ msgstr "چنین کاربری وجود ندارد."
 #. TRANS: %1$s is a URL, %2$s is the status, %s$s is the fail reason.
 #. TRANS: Exception thrown when post to collection fails with a status that is not handled.
 #. TRANS: %1$s is a URL, %2$s is the status, %s$s is the fail reason.
-#: lib/activitysink.php:163 lib/activitysink.php:167 lib/activitysink.php:172
 #, fuzzy, php-format
 msgctxt "URLSTATUSREASON"
 msgid "%1$s %2$s %3$s"
 msgstr "%1$s (%2$s)"
 
 #. TRANS: Client exception thrown when there is no source attribute.
-#: lib/activityutils.php:200
 msgid "Can't handle remote content yet."
 msgstr "هنوز نمی‌توان محتویات ازراه‌دور را به‌کار برد."
 
 #. TRANS: Client exception thrown when there embedded XML content is found that cannot be processed yet.
-#: lib/activityutils.php:237
 msgid "Can't handle embedded XML content yet."
 msgstr "هنوز نمی‌توان محتویات XML جاسازی‌شده را به‌کار برد."
 
 #. TRANS: Client exception thrown when base64 encoded content is found that cannot be processed yet.
-#: lib/activityutils.php:242
 msgid "Can't handle embedded Base64 content yet."
 msgstr "هنوز نمی‌توان محتوای جاسازی‌شدهٔ Base64 را به‌کار برد."
 
 #. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights.
-#: lib/adminpanelaction.php:96
 msgid "You cannot make changes to this site."
 msgstr "شما نمی توانید در این وب‌گاه تغییر ایجاد کنید"
 
 #. TRANS: Client error message throw when a certain panel's settings cannot be changed.
-#: lib/adminpanelaction.php:108
 msgid "Changes to that panel are not allowed."
 msgstr "تغییرات در آن قطعه مجاز نیست."
 
 #. TRANS: Client error message.
-#: lib/adminpanelaction.php:222
 msgid "showForm() not implemented."
 msgstr "showForm() پیاده نشده است."
 
 #. TRANS: Client error message
-#: lib/adminpanelaction.php:250
 msgid "saveSettings() not implemented."
 msgstr "saveSettings() پیاده نشده است."
 
 #. TRANS: Client error message thrown if design settings could not be deleted in
 #. TRANS: the admin panel Design.
-#: lib/adminpanelaction.php:274
 msgid "Unable to delete design setting."
 msgstr "نمی توان تنظیمات طراحی شده را پاک کرد ."
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:337
 msgid "Basic site configuration"
 msgstr "پیکربندی اولیه وب‌گاه"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:339
 msgctxt "MENU"
 msgid "Site"
 msgstr "وب‌گاه"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:345
 msgid "Design configuration"
 msgstr "پیکربندی طرح"
 
 #. TRANS: Menu item for site administration
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/adminpanelaction.php:347 lib/groupnav.php:135
 msgctxt "MENU"
 msgid "Design"
 msgstr "طرح"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:353
 msgid "User configuration"
 msgstr "پیکربندی کاربر"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:110
 msgid "User"
 msgstr "کاربر"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:361
 msgid "Access configuration"
 msgstr "پیکربندی دسترسی"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:369
 msgid "Paths configuration"
 msgstr "پیکربندی مسیرها"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:377
 msgid "Sessions configuration"
 msgstr "پیکربندی نشست‌ها"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:385
 msgid "Edit site notice"
 msgstr "ویرایش پیام وب‌گاه"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:387
 msgid "Site notice"
 msgstr "پیام وب‌گاه"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:393
 msgid "Snapshots configuration"
 msgstr "پیکربندی تصاویر لحظه‌ای"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:401
 msgid "Set site license"
 msgstr ""
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:409
 #, fuzzy
 msgid "Plugins configuration"
 msgstr "پیکربندی مسیرها"
 
 #. TRANS: Client error 401.
-#: lib/apiauth.php:111
 msgid "API resource requires read-write access, but you only have read access."
 msgstr ""
 "منبع API به دسترسی خواندن-نوشتن نیاز دارد، اما شما تنها دسترسی خواندن را "
 "دارید."
 
 #. TRANS: OAuth exception thrown when no application is found for a given consumer key.
-#: lib/apiauth.php:177
 msgid "No application for that consumer key."
 msgstr ""
 
-#: lib/apiauth.php:202 lib/apiauth.php:284
 msgid "Not allowed to use API."
 msgstr ""
 
 #. TRANS: OAuth exception given when an incorrect access token was given for a user.
-#: lib/apiauth.php:225
 msgid "Bad access token."
 msgstr ""
 
 #. TRANS: OAuth exception given when no user was found for a given token (no token was found).
-#: lib/apiauth.php:230
 msgid "No user for that token."
 msgstr ""
 
 #. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel".
 #. TRANS: Client error thrown when authentication fails.
-#: lib/apiauth.php:272 lib/apiauth.php:302
 msgid "Could not authenticate you."
 msgstr ""
 
 #. TRANS: Server error displayed when trying to create an anynymous OAuth consumer.
-#: lib/apioauthstore.php:45
 #, fuzzy
 msgid "Could not create anonymous consumer."
 msgstr "نمی‌توان نام‌های مستعار را ساخت."
 
 #. TRANS: Server error displayed when trying to create an anynymous OAuth application.
-#: lib/apioauthstore.php:69
 #, fuzzy
 msgid "Could not create anonymous OAuth application."
 msgstr "نمی‌توان برنامه را ساخت."
 
 #. TRANS: Exception thrown when no token association could be found.
-#: lib/apioauthstore.php:151
 msgid ""
 "Could not find a profile and application associated with the request token."
 msgstr ""
 
 #. TRANS: Exception thrown when no access token can be issued.
-#: lib/apioauthstore.php:209
 #, fuzzy
 msgid "Could not issue access token."
 msgstr "پیغام نمی تواند درج گردد"
 
-#: lib/apioauthstore.php:317
 msgid "Database error inserting OAuth application user."
 msgstr "هنگام افزودن کاربر برنامهٔ OAuth در پایگاه داده خطایی رخ داد."
 
-#: lib/apioauthstore.php:345
 #, fuzzy
 msgid "Database error updating OAuth application user."
 msgstr "هنگام افزودن کاربر برنامهٔ OAuth در پایگاه داده خطایی رخ داد."
 
 #. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
-#: lib/apioauthstore.php:371
 msgid "Tried to revoke unknown token."
 msgstr ""
 
 #. TRANS: Exception thrown when an attempt is made to remove a revoked token.
-#: lib/apioauthstore.php:376
 msgid "Failed to delete revoked token."
 msgstr ""
 
 #. TRANS: Form input field label for application icon.
-#: lib/applicationeditform.php:177
 msgid "Icon"
 msgstr "شمایل"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:182
 msgid "Icon for this application"
 msgstr "شمایل این برنامه"
 
 #. TRANS: Form input field instructions.
 #. TRANS: %d is the number of available characters for the description.
-#: lib/applicationeditform.php:201
 #, fuzzy, php-format
 msgid "Describe your application in %d character"
 msgid_plural "Describe your application in %d characters"
 msgstr[0] "برنامهٔ خود را در %d نویسه توصیف کنید"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:205
 msgid "Describe your application"
 msgstr "برنامهٔ خود را توصیف کنید"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:216
 msgid "URL of the homepage of this application"
 msgstr "نشانی اینترنتی صفحهٔ خانگی این برنامه"
 
 #. TRANS: Form input field label.
-#: lib/applicationeditform.php:218
 msgid "Source URL"
 msgstr "نشانی اینترنتی منبع"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:225
 msgid "Organization responsible for this application"
 msgstr "سازمان مسئول این برنامه"
 
 #. TRANS: Form input field label.
-#: lib/applicationeditform.php:227
 msgid "Organization"
 msgstr "سازمان"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:234
 msgid "URL for the homepage of the organization"
 msgstr "نشانی اینترنتی برای صفحهٔ خانگی سازمان"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:243
 msgid "URL to redirect to after authentication"
 msgstr "نشانی اینترنتی برای دوباره‌هدایت‌کردن بعد از تصدیق"
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:271
 msgid "Browser"
 msgstr "مرورگر"
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:288
 msgid "Desktop"
 msgstr "میزکار"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:290
 msgid "Type of application, browser or desktop"
 msgstr "نوع برنامه، مرورگر یا میزکار"
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:314
 msgid "Read-only"
 msgstr "تنها خواندنی"
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:334
 msgid "Read-write"
 msgstr "خواندن-نوشتن"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:336
 msgid "Default access for this application: read-only, or read-write"
 msgstr "دسترسی پیش‌فرض برای این برنامه: تنها خواندنی یا خواندن-نوشتن"
 
 #. TRANS: Submit button title.
-#: lib/applicationeditform.php:353
 msgid "Cancel"
 msgstr "انصراف"
 
-#: lib/applicationlist.php:247
 msgid " by "
 msgstr ""
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:260
 msgid "read-write"
 msgstr "خواندن-نوشتن"
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:262
 msgid "read-only"
 msgstr "تنها خواندنی"
 
 #. TRANS: Used in application list. %1$s is a modified date, %2$s is access type ("read-write" or "read-only")
-#: lib/applicationlist.php:268
 #, php-format
 msgid "Approved %1$s - \"%2$s\" access."
 msgstr "تایید شده %1$s - با دسترسی «%2$s»"
 
 #. TRANS: Access token in the application list.
 #. TRANS: %s are the first 7 characters of the access token.
-#: lib/applicationlist.php:282
 #, php-format
 msgid "Access token starting with: %s"
 msgstr ""
 
 #. TRANS: Button label
-#: lib/applicationlist.php:298
 msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "لغو کردن"
 
-#: lib/atom10feed.php:113
 msgid "Author element must contain a name element."
 msgstr ""
 
 #. TRANS: Server exception thrown when using the method setActivitySubject() in the class Atom10Feed.
-#: lib/atom10feed.php:160
 #, fuzzy
 msgid "Do not use this method!"
 msgstr "این پیام را پاک نکن"
 
 #. TRANS: Title.
-#: lib/attachmentnoticesection.php:67
 msgid "Notices where this attachment appears"
 msgstr "پیام‌هایی که این پیوست در آن‌جا ظاهر می‌شود"
 
 #. TRANS: Title.
-#: lib/attachmenttagcloudsection.php:48
 msgid "Tags for this attachment"
 msgstr "برچسب‌ها برای این پیوست"
 
 #. TRANS: Exception thrown when a password change fails.
-#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:227
 #, fuzzy
 msgid "Password changing failed."
 msgstr "تغییر گذرواژه شکست خورد"
 
 #. TRANS: Exception thrown when a password change attempt fails because it is not allowed.
-#: lib/authenticationplugin.php:238
 #, fuzzy
 msgid "Password changing is not allowed."
 msgstr "تغییر گذرواژه مجاز نیست"
 
 #. TRANS: Title for the form to block a user.
-#: lib/blockform.php:68
 msgid "Block"
 msgstr "بازداشتن"
 
 #. TRANS: Description of the form to block a user.
-#: lib/blockform.php:79
 msgid "Block this user"
 msgstr "کاربر را مسدود کن"
 
 #. TRANS: Title for command results.
-#: lib/channel.php:104 lib/channel.php:125
 msgid "Command results"
 msgstr "نتیجه دستور"
 
 #. TRANS: Title for command results.
-#: lib/channel.php:138
 #, fuzzy
 msgid "AJAX error"
 msgstr "خطای آژاکس"
 
 #. TRANS: E-mail subject when a command has completed.
-#: lib/channel.php:177 lib/mailhandler.php:143
 msgid "Command complete"
 msgstr "دستور انجام شد"
 
 #. TRANS: E-mail subject when a command has failed.
-#: lib/channel.php:188
 msgid "Command failed"
 msgstr "فرمان شکست خورد"
 
 #. TRANS: Command exception text shown when a notice ID is requested that does not exist.
-#: lib/command.php:82 lib/command.php:106
 msgid "Notice with that id does not exist."
 msgstr "پیامی با آن شناسه وجود ندارد."
 
 #. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
 #. TRANS: Error text shown when a last user notice is requested and it does not exist.
-#: lib/command.php:99 lib/command.php:642
 #, fuzzy
 msgid "User has no last notice."
 msgstr "کاربر آگهی آخر ندارد"
 
 #. TRANS: Message given requesting a profile for a non-existing user.
 #. TRANS: %s is the nickname of the user for which the profile could not be found.
-#: lib/command.php:128
 #, php-format
 msgid "Could not find a user with nickname %s."
 msgstr "نمی‌توان یک کاربر را با نام مستعار %s پیدا کرد."
 
 #. TRANS: Message given getting a non-existing user.
 #. TRANS: %s is the nickname of the user that could not be found.
-#: lib/command.php:148
 #, php-format
 msgid "Could not find a local user with nickname %s."
 msgstr "نمی‌توان یک کاربر را با نام مستعار %s پیدا کرد."
 
 #. TRANS: Error text shown when an unimplemented command is given.
-#: lib/command.php:183
 msgid "Sorry, this command is not yet implemented."
 msgstr "متاسفانه این دستور هنوز پیاده نشده است."
 
 #. TRANS: Command exception text shown when a user tries to nudge themselves.
-#: lib/command.php:229
 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr "خیلی جالب نیست که به خودتان یادآوری کنید!"
 
 #. TRANS: Message given having nudged another user.
 #. TRANS: %s is the nickname of the user that was nudged.
-#: lib/command.php:238
 #, php-format
 msgid "Nudge sent to %s."
 msgstr "یادآوری به %s فرستاده شد."
@@ -7980,7 +6582,6 @@ msgstr "یادآوری به %s فرستاده شد."
 #. TRANS: %1$s is the number of other user the user is subscribed to.
 #. TRANS: %2$s is the number of users that are subscribed to the user.
 #. TRANS: %3$s is the number of notices the user has sent.
-#: lib/command.php:268
 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"
@@ -7992,40 +6593,34 @@ msgstr ""
 "پیام‌ها: %3$s"
 
 #. TRANS: Error message text shown when a favorite could not be set because it has already been favorited.
-#: lib/command.php:298
 #, fuzzy
 msgid "Could not create favorite: already favorited."
 msgstr "نمی‌توان پیام را برگزید."
 
 #. TRANS: Text shown when a notice has been marked as favourite successfully.
-#: lib/command.php:324
 msgid "Notice marked as fave."
 msgstr "پیام به‌عنوان برگزیده مشخص شد."
 
 #. TRANS: Message given having added a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:369
 #, php-format
 msgid "%1$s joined group %2$s."
 msgstr "%1$s به گروه %2$s پیوست."
 
 #. TRANS: Message given having removed a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:417
 #, php-format
 msgid "%1$s left group %2$s."
 msgstr "%1$s گروه %2$s را ترک کرد."
 
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: lib/command.php:438
 #, fuzzy, php-format
 msgctxt "WHOIS"
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
 
 #. TRANS: Whois output. %s is the full name of the queried user.
-#: lib/command.php:442
 #, php-format
 msgid "Fullname: %s"
 msgstr "نام کامل : %s"
@@ -8033,7 +6628,6 @@ msgstr "نام کامل : %s"
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a location.
-#: lib/command.php:446 lib/mail.php:275
 #, php-format
 msgid "Location: %s"
 msgstr "موقعیت : %s"
@@ -8041,20 +6635,17 @@ msgstr "موقعیت : %s"
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a homepage.
-#: lib/command.php:450 lib/mail.php:279
 #, php-format
 msgid "Homepage: %s"
 msgstr "صفحه خانگی : %s"
 
 #. TRANS: Whois output. %s is the bio information of the queried user.
-#: lib/command.php:454
 #, php-format
 msgid "About: %s"
 msgstr "دربارهٔ: %s"
 
 #. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).
 #. TRANS: %s is a remote profile.
-#: lib/command.php:483
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
@@ -8065,7 +6656,6 @@ msgstr ""
 
 #. TRANS: Message given if content is too long. %1$sd is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:500
 #, fuzzy, php-format
 msgid "Message too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
@@ -8073,26 +6663,26 @@ msgstr[0] ""
 "پیام خیلی طولانی است - حداکثر تعداد مجاز %1$d نویسه است که شما %2$d نویسه را "
 "فرستادید."
 
+#. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
+msgid "You can't send a message to this user."
+msgstr "شما نمی توانید به این کاربر پیام بفرستید."
+
 #. TRANS: Error text shown sending a direct message fails with an unknown reason.
-#: lib/command.php:528
 msgid "Error sending direct message."
 msgstr "خطا در فرستادن پیام مستقیم."
 
 #. TRANS: Message given having repeated a notice from another user.
 #. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:565
 #, php-format
 msgid "Notice from %s repeated."
 msgstr "پیام %s تکرار شد."
 
 #. TRANS: Error text shown when repeating a notice fails with an unknown reason.
-#: lib/command.php:568
 msgid "Error repeating notice."
 msgstr "هنگام تکرار پیام خطایی رخ داد."
 
 #. TRANS: Message given if content of a notice for a reply is too long. %1$d is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:603
 #, fuzzy, php-format
 msgid "Notice too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Notice too long - maximum is %1$d characters, you sent %2$d."
@@ -8102,80 +6692,66 @@ msgstr[0] ""
 
 #. TRANS: Text shown having sent a reply to a notice successfully.
 #. TRANS: %s is the nickname of the user of the notice the reply was sent to.
-#: lib/command.php:616
 #, php-format
 msgid "Reply to %s sent."
 msgstr "پاسخ به %s فرستاده شد."
 
 #. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
-#: lib/command.php:619
 msgid "Error saving notice."
 msgstr "هنگام ذخیرهٔ پیام خطا رخ داد."
 
 #. TRANS: Error text shown when no username was provided when issuing a subscribe command.
-#: lib/command.php:666
 msgid "Specify the name of the user to subscribe to."
 msgstr ""
 
 #. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
-#: lib/command.php:675
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "نمی‌توان با دستور مشترک نمایه‌های OMB شد."
 
 #. TRANS: Text shown after having subscribed to another user successfully.
 #. TRANS: %s is the name of the user the subscription was requested for.
-#: lib/command.php:683
 #, php-format
 msgid "Subscribed to %s."
 msgstr ""
 
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.
-#: lib/command.php:704 lib/command.php:815
 msgid "Specify the name of the user to unsubscribe from."
 msgstr ""
 
 #. TRANS: Text shown after having unsubscribed from another user successfully.
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:715
 #, php-format
 msgid "Unsubscribed from %s."
 msgstr "اشتراک از %s لغو شد."
 
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
-#: lib/command.php:735 lib/command.php:761
 msgid "Command not yet implemented."
 msgstr "دستور هنوز پیاده نشده است."
 
 #. TRANS: Text shown when issuing the command "off" successfully.
-#: lib/command.php:739
 msgid "Notification off."
 msgstr "آگاه‌سازی خاموش شد."
 
 #. TRANS: Error text shown when the command "off" fails for an unknown reason.
-#: lib/command.php:742
 msgid "Can't turn off notification."
 msgstr "ناتوان در خاموش کردن آگاه سازی."
 
 #. TRANS: Text shown when issuing the command "on" successfully.
-#: lib/command.php:765
 msgid "Notification on."
 msgstr "آگاه سازی فعال است."
 
 #. TRANS: Error text shown when the command "on" fails for an unknown reason.
-#: lib/command.php:768
 msgid "Can't turn on notification."
 msgstr "ناتوان در روشن کردن آگاه سازی."
 
 #. TRANS: Error text shown when issuing the login command while login is disabled.
-#: lib/command.php:782
 msgid "Login command is disabled."
 msgstr "فرمان ورود غیرفعال شده است."
 
 #. TRANS: Text shown after issuing the login command successfully.
 #. TRANS: %s is a logon link..
-#: lib/command.php:795
 #, php-format
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
@@ -8183,54 +6759,46 @@ msgstr ""
 
 #. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:824
 #, php-format
 msgid "Unsubscribed %s."
 msgstr "%s لغو اشتراک شد."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
-#: lib/command.php:842
 msgid "You are not subscribed to anyone."
 msgstr "شما مشترک هیچ‌کسی نشده‌اید."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
-#: lib/command.php:847
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "شما مشترک این فرد شده‌اید:"
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user
 #. TRANS: (followers) without having any subscribers.
-#: lib/command.php:869
 msgid "No one is subscribed to you."
 msgstr "هیچ‌کس مشترک شما نشده است."
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
-#: lib/command.php:874
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "این فرد مشترک شما شده است:"
 
 #. TRANS: Text shown after requesting groups a user is subscribed to without having
 #. TRANS: any group subscriptions.
-#: lib/command.php:896
 msgid "You are not a member of any groups."
 msgstr "شما در هیچ گروهی عضو نیستید ."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
-#: lib/command.php:901
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "شما یک عضو این گروه هستید:"
 
 #. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-#: lib/command.php:916
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -8311,71 +6879,58 @@ msgstr ""
 "tracking - هنوز پیاده نشده است.\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:36
 #, fuzzy
 msgid "No configuration file found."
 msgstr "بدون کد تصدیق."
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:39
 #, fuzzy
 msgid "I looked for configuration files in the following places:"
 msgstr "من به دنبال پرونده‌های پیکربندی در مکان‌های زیر بودم: "
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:42
 msgid "You may wish to run the installer to fix this."
 msgstr "شما ممکن است بخواهید نصاب را اجرا کنید تا این را تعمیر کند."
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:46
 msgid "Go to the installer."
 msgstr "برو به نصاب."
 
-#: lib/dberroraction.php:59
 msgid "Database error"
 msgstr "خطای پایگاه داده"
 
 #. TRANS: Description of form for deleting a user.
-#: lib/deleteuserform.php:75
 msgid "Delete this user"
 msgstr "حذف این کاربر"
 
-#: lib/designform.php:114
 #, fuzzy
 msgid "Change design"
 msgstr "ذخیره‌کردن طرح"
 
 #. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: lib/designform.php:131
 msgid "Change colours"
 msgstr "تغییر رنگ‌ها"
 
 #. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: lib/designform.php:138
 msgid "Use defaults"
 msgstr "استفاده‌کردن از پیش‌فرض‌ها"
 
 #. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: lib/designform.php:140
 msgid "Restore default designs"
 msgstr "بازگرداندن طرح‌های پیش‌فرض"
 
 #. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: lib/designform.php:148
 msgid "Reset back to default"
 msgstr "برگشت به حالت پیش گزیده"
 
 #. TRANS: Label in form on profile design page.
 #. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
-#: lib/designform.php:158
 msgid "Upload file"
 msgstr "بارگذاری پرونده"
 
 #. TRANS: Instructions for form on profile design page.
-#: lib/designform.php:163
 #, fuzzy
 msgid ""
 "You can upload your personal background image. The maximum file size is 2Mb."
@@ -8384,49 +6939,41 @@ msgstr ""
 "۲ مگابایت است."
 
 #. TRANS: Radio button on profile design page that will enable use of the uploaded profile image.
-#: lib/designform.php:194
 #, fuzzy
 msgctxt "RADIO"
 msgid "On"
 msgstr "روشن"
 
 #. TRANS: Radio button on profile design page that will disable use of the uploaded profile image.
-#: lib/designform.php:211
 #, fuzzy
 msgctxt "RADIO"
 msgid "Off"
 msgstr "خاموش"
 
 #. TRANS: Title for button on profile design page to save settings.
-#: lib/designform.php:322
 msgid "Save design"
 msgstr "ذخیره‌کردن طرح"
 
 #. TRANS: Error message displayed if design settings could not be saved.
 #. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
-#: lib/designsettings.php:216 lib/designsettings.php:238
 msgid "Couldn't update your design."
 msgstr "نمی‌توان ظاهر را به روز کرد."
 
 #. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
-#: lib/designsettings.php:244
 msgid "Design defaults restored."
 msgstr "پیش‌فرض‌های طراحی برگردانده شدند."
 
 #. TRANS: Exception. %s is an ID.
-#: lib/discovery.php:153
 #, fuzzy, php-format
 msgid "Unable to find services for %s."
 msgstr "نمی‌توان دسترسی را برای برنامهٔ %s لغو کرد."
 
 #. TRANS: Form legend for removing the favourite status for a favourite notice.
 #. TRANS: Title for button text for removing the favourite status for a favourite notice.
-#: lib/disfavorform.php:108 lib/disfavorform.php:140
 msgid "Disfavor this notice"
 msgstr "خارج‌کردن این پیام از برگزیده‌ها"
 
 #. TRANS: Button text for removing the favourite status for a favourite notice.
-#: lib/disfavorform.php:136
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Disfavor favorite"
@@ -8434,103 +6981,81 @@ msgstr "خارج‌کردن از برگزیده‌ها"
 
 #. TRANS: Form legend for adding the favourite status to a notice.
 #. TRANS: Title for button text for adding the favourite status to a notice.
-#: lib/favorform.php:108 lib/favorform.php:139
 msgid "Favor this notice"
 msgstr "برگزیده‌کردن این پیام"
 
 #. TRANS: Button text for adding the favourite status to a notice.
-#: lib/favorform.php:135
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Favor"
 msgstr "برگزیده‌کردن"
 
-#: lib/feed.php:84
 msgid "RSS 1.0"
 msgstr ""
 
-#: lib/feed.php:86
 msgid "RSS 2.0"
 msgstr ""
 
-#: lib/feed.php:88
 #, fuzzy
 msgid "Atom"
 msgstr "مؤلف"
 
-#: lib/feed.php:90
 msgid "FOAF"
 msgstr ""
 
-#: lib/feedimporter.php:75
 #, fuzzy
 msgid "Not an atom feed."
 msgstr "همهٔ اعضا"
 
-#: lib/feedimporter.php:82
 msgid "No author in the feed."
 msgstr ""
 
-#: lib/feedimporter.php:89
 msgid "Can't import without a user."
 msgstr ""
 
 #. TRANS: Header for feed links (h2).
-#: lib/feedlist.php:66
 msgid "Feeds"
 msgstr ""
 
-#: lib/galleryaction.php:128
 msgid "All"
 msgstr "همه"
 
-#: lib/galleryaction.php:136
 msgid "Select tag to filter"
 msgstr "برچسب را برای پالودن انتخاب کنید"
 
-#: lib/galleryaction.php:137
 msgid "Tag"
 msgstr "برچسب"
 
-#: lib/galleryaction.php:138
 msgid "Choose a tag to narrow list"
 msgstr "یک برچسب را برای محدود کردن فهرست انتخاب کنید"
 
-#: lib/galleryaction.php:140
 msgid "Go"
 msgstr "برو"
 
-#: lib/grantroleform.php:91
 #, php-format
 msgid "Grant this user the \"%s\" role"
 msgstr ""
 
-#: lib/groupeditform.php:147
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "۱-۶۴ کاراکتر کوچک یا اعداد، بدون نقطه گذاری یا فاصله"
 
-#: lib/groupeditform.php:156
 #, fuzzy
 msgid "URL of the homepage or blog of the group or topic."
 msgstr "نشانی اینترنتی صفحهٔ‌خانگی یا وبلاگ گروه یا موضوع"
 
-#: lib/groupeditform.php:161
 msgid "Describe the group or topic"
 msgstr "گروه یا موضوع را توصیف کنید"
 
-#: lib/groupeditform.php:163
 #, fuzzy, php-format
 msgid "Describe the group or topic in %d character or less"
 msgid_plural "Describe the group or topic in %d characters or less"
 msgstr[0] "گروه یا موضوع را در %d نویسه توصیف کنید"
 
-#: lib/groupeditform.php:175
 #, fuzzy
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\"."
 msgstr "مکان گروه، در صورت وجود داشتن، مانند «شهر، ایالت (یا استان)، کشور»"
 
-#: lib/groupeditform.php:183
 #, fuzzy, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -8542,70 +7067,60 @@ msgstr[0] ""
 "نام‌های مستعار اضافی برای گروه، با کاما- یا فاصله- جدا شود، بیشینه %d"
 
 #. TRANS: Menu item in the group navigation page.
-#: lib/groupnav.php:86
 msgctxt "MENU"
 msgid "Group"
 msgstr ""
 
 #. TRANS: Tooltip for menu item in the group navigation page.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:89
 #, php-format
 msgctxt "TOOLTIP"
 msgid "%s group"
 msgstr ""
 
 #. TRANS: Menu item in the group navigation page.
-#: lib/groupnav.php:95
 msgctxt "MENU"
 msgid "Members"
 msgstr ""
 
 #. TRANS: Tooltip for menu item in the group navigation page.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:98
 #, php-format
 msgctxt "TOOLTIP"
 msgid "%s group members"
 msgstr ""
 
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/groupnav.php:108
 msgctxt "MENU"
 msgid "Blocked"
 msgstr ""
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:111
 #, php-format
 msgctxt "TOOLTIP"
 msgid "%s blocked users"
 msgstr ""
 
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "مدیر"
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:120
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Edit %s group properties"
 msgstr ""
 
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/groupnav.php:126
 msgctxt "MENU"
 msgid "Logo"
 msgstr ""
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:129
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Add or edit %s logo"
@@ -8613,90 +7128,75 @@ msgstr ""
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:138
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Add or edit %s design"
 msgstr ""
 
 #. TRANS: Title for groups with the most members section.
-#: lib/groupsbymemberssection.php:71
 msgid "Groups with most members"
 msgstr "گروه های با اعضاء بیشتر"
 
 #. TRANS: Title for groups with the most posts section.
-#: lib/groupsbypostssection.php:71
 msgid "Groups with most posts"
 msgstr "گروه های با پست های بیشتر"
 
 #. TRANS: Title for group tag cloud section.
 #. TRANS: %s is a group name.
-#: lib/grouptagcloudsection.php:57
 #, php-format
 msgid "Tags in %s group's notices"
 msgstr "برچسب‌ها در پیام‌های گروه %s"
 
 #. TRANS: Client exception 406
-#: lib/htmloutputter.php:104
 msgid "This page is not available in a media type you accept"
 msgstr "این صفحه در نوع رسانه‌ای که پذیرفته‌اید، در دسترس نیست."
 
 #. TRANS: Exception thrown when trying to upload an unsupported image file format.
-#: lib/imagefile.php:73
 msgid "Unsupported image file format."
 msgstr "فرمت(فایل) عکس پشتیبانی نشده."
 
 #. TRANS: Exception thrown when too large a file is uploaded.
 #. TRANS: %s is the maximum file size, for example "500b", "10kB" or "2MB".
-#: lib/imagefile.php:91
 #, php-format
 msgid "That file is too big. The maximum file size is %s."
 msgstr "این پرونده خیلی بزرگ است. بیشینهٔ اندازهٔ پرونده %s است."
 
 #. TRANS: Exception thrown when uploading an image and that action could not be completed.
-#: lib/imagefile.php:97
 #, fuzzy
 msgid "Partial upload."
 msgstr "هیچ پرونده‌ای بارگذاری نشد."
 
 #. TRANS: Exception thrown when uploading a file as image that is not an image or is a corrupt file.
-#: lib/imagefile.php:115
 msgid "Not an image or corrupt file."
 msgstr "تصویر یا فایل خرابی نیست"
 
 #. TRANS: Exception thrown during resize when image has been registered as present, but is no longer there.
-#: lib/imagefile.php:178
 msgid "Lost our file."
 msgstr "فایلمان گم شده"
 
 #. TRANS: Exception thrown when trying to resize an unknown file type.
 #. TRANS: Exception thrown when trying resize an unknown file type.
-#: lib/imagefile.php:216 lib/imagefile.php:257
 msgid "Unknown file type"
 msgstr "نوع فایل پشتیبانی نشده"
 
 #. TRANS: Number of megabytes. %d is the number.
-#: lib/imagefile.php:303
 #, fuzzy, php-format
 msgid "%dMB"
 msgid_plural "%dMB"
 msgstr[0] "مگابایت"
 
 #. TRANS: Number of kilobytes. %d is the number.
-#: lib/imagefile.php:307
 #, fuzzy, php-format
 msgid "%dkB"
 msgid_plural "%dkB"
 msgstr[0] "کیلوبایت"
 
 #. TRANS: Number of bytes. %d is the number.
-#: lib/imagefile.php:310
 #, php-format
 msgid "%dB"
 msgid_plural "%dB"
 msgstr[0] ""
 
-#: lib/implugin.php:262
 #, php-format
 msgid ""
 "User \"%s\" on %s has said that your %s screenname belongs to them. If "
@@ -8706,53 +7206,44 @@ msgid ""
 "message."
 msgstr ""
 
-#: lib/implugin.php:349
 #, php-format
 msgid "Unknown inbox source %d."
 msgstr "منبع صندوق ورودی نامعلوم است %d."
 
-#: lib/implugin.php:485
-#, fuzzy, php-format
+#, php-format
 msgid "Message too long - maximum is %1$d characters, you sent %2$d."
 msgstr ""
 "پیام خیلی طولانی است - حداکثر تعداد مجاز %1$d نویسه است که شما %2$d نویسه را "
 "فرستادید."
 
-#: lib/leaveform.php:114
 msgid "Leave"
 msgstr "ترک کردن"
 
 #. TRANS: Menu item for logging in to the StatusNet site.
-#: lib/logingroupnav.php:77
 msgctxt "MENU"
 msgid "Login"
 msgstr "ورود"
 
 #. TRANS: Title for menu item for logging in to the StatusNet site.
-#: lib/logingroupnav.php:79
 msgid "Login with a username and password"
 msgstr "وارد شدن با یک نام کاربری و گذرواژه"
 
 #. TRANS: Menu item for registering with the StatusNet site.
-#: lib/logingroupnav.php:85
 msgctxt "MENU"
 msgid "Register"
 msgstr "ثبت‌نام"
 
 #. TRANS: Title for menu item for registering with the StatusNet site.
-#: lib/logingroupnav.php:87
 msgid "Sign up for a new account"
 msgstr "عضویت برای حساب کاربری جدید"
 
 #. TRANS: Subject for address confirmation email.
-#: lib/mail.php:172
 msgid "Email address confirmation"
 msgstr "تایید نشانی پست الکترونیکی"
 
 #. TRANS: Body for address confirmation email.
 #. TRANS: %1$s is the addressed user's nickname, %2$s is the StatusNet sitename,
 #. TRANS: %3$s is the URL to confirm at.
-#: lib/mail.php:177
 #, fuzzy, php-format
 msgid ""
 "Hey, %1$s.\n"
@@ -8784,14 +7275,12 @@ msgstr ""
 
 #. TRANS: Subject of new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
-#: lib/mail.php:243
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1$s اکنون پیام‌های شما را در %2$s دنبال می‌کند."
 
 #. TRANS: This is a paragraph in a new-subscriber e-mail.
 #. TRANS: %s is a URL where the subscriber can be reported as abusive.
-#: lib/mail.php:250
 #, php-format
 msgid ""
 "If you believe this account is being used abusively, you can block them from "
@@ -8803,7 +7292,6 @@ msgstr ""
 #. TRANS: %3$s is the subscriber's profile URL, %4$s is the subscriber's location (or empty)
 #. TRANS: %5$s is the subscriber's homepage URL (or empty), %6%s is the subscriber's bio (or empty)
 #. TRANS: %7$s is a link to the addressed user's e-mail settings.
-#: lib/mail.php:260
 #, fuzzy, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -8830,14 +7318,12 @@ msgstr ""
 
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is biographical information.
-#: lib/mail.php:283
 #, php-format
 msgid "Bio: %s"
 msgstr "شرح‌حال: %s"
 
 #. TRANS: Subject of notification mail for new posting email address.
 #. TRANS: %s is the StatusNet sitename.
-#: lib/mail.php:312
 #, php-format
 msgid "New email address for posting to %s"
 msgstr "%s ادرس ایمیل جدید برای"
@@ -8845,7 +7331,6 @@ msgstr "%s ادرس ایمیل جدید برای"
 #. TRANS: Body of notification mail for new posting email address.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is the e-mail address to send
 #. TRANS: to to post by e-mail, %3$s is a URL to more instructions.
-#: lib/mail.php:318
 #, fuzzy, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -8868,26 +7353,22 @@ msgstr ""
 
 #. TRANS: Subject line for SMS-by-email notification messages.
 #. TRANS: %s is the posting user's nickname.
-#: lib/mail.php:439
 #, php-format
 msgid "%s status"
 msgstr "وضعیت %s"
 
 #. TRANS: Subject line for SMS-by-email address confirmation message.
-#: lib/mail.php:465
 msgid "SMS confirmation"
 msgstr "تأیید پیامک"
 
 #. TRANS: Main body heading for SMS-by-email address confirmation message.
 #. TRANS: %s is the addressed user's nickname.
-#: lib/mail.php:469
 #, php-format
 msgid "%s: confirm you own this phone number with this code:"
 msgstr "%s: شماره تلفن خود را با این کد تایید کنید:"
 
 #. TRANS: Subject for 'nudge' notification email.
 #. TRANS: %s is the nudging user.
-#: lib/mail.php:490
 #, fuzzy, php-format
 msgid "You have been nudged by %s"
 msgstr "شما توسط %s یادآوری شدید."
@@ -8895,7 +7376,6 @@ msgstr "شما توسط %s یادآوری شدید."
 #. TRANS: Body for 'nudge' notification email.
 #. TRANS: %1$s is the nuding user's long name, $2$s is the nudging user's nickname,
 #. TRANS: %3$s is a URL to post notices at, %4$s is the StatusNet sitename.
-#: lib/mail.php:497
 #, php-format
 msgid ""
 "%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -8924,7 +7404,6 @@ msgstr ""
 
 #. TRANS: Subject for direct-message notification email.
 #. TRANS: %s is the sending user's nickname.
-#: lib/mail.php:544
 #, php-format
 msgid "New private message from %s"
 msgstr "پیام خصوصی تازه از %s"
@@ -8933,7 +7412,6 @@ msgstr "پیام خصوصی تازه از %s"
 #. TRANS: %1$s is the sending user's long name, %2$s is the sending user's nickname,
 #. TRANS: %3$s is the message content, %4$s a URL to the message,
 #. TRANS: %5$s is the StatusNet sitename.
-#: lib/mail.php:552
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -8968,7 +7446,6 @@ msgstr ""
 
 #. TRANS: Subject for favorite notification e-mail.
 #. TRANS: %1$s is the adding user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:604
 #, fuzzy, php-format
 msgid "%1$s (@%2$s) added your notice as a favorite"
 msgstr "پیام شما را به برگزیده‌های خود اضافه کرد %s (@%s)"
@@ -8978,7 +7455,6 @@ msgstr "پیام شما را به برگزیده‌های خود اضافه کر
 #. TRANS: %3$s is a URL to the faved notice, %4$s is the faved notice text,
 #. TRANS: %5$s is a URL to all faves of the adding user, %6$s is the StatusNet sitename,
 #. TRANS: %7$s is the adding user's nickname.
-#: lib/mail.php:611
 #, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -9020,7 +7496,6 @@ msgstr ""
 "%6$s\n"
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:669
 #, php-format
 msgid ""
 "The full conversation can be read here:\n"
@@ -9033,7 +7508,6 @@ msgstr ""
 
 #. TRANS: E-mail subject for notice notification.
 #. TRANS: %1$s is the sending user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:677
 #, fuzzy, php-format
 msgid "%1$s (@%2$s) sent a notice to your attention"
 msgstr "%s (@%s) به توجه شما یک پیام فرستاد"
@@ -9044,7 +7518,6 @@ msgstr "%s (@%s) به توجه شما یک پیام فرستاد"
 #. TRANS: %5$s is a URL to the full conversion if it exists (otherwise empty),
 #. TRANS: %6$s is a URL to reply to the notice, %7$s is a URL to all @-replied for the addressed user,
 #. TRANS: %8$s is a URL to the addressed user's e-mail settings, %9$s is the sender's nickname.
-#: lib/mail.php:685
 #, php-format
 msgid ""
 "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -9093,64 +7566,52 @@ msgstr ""
 "\n"
 "پ.ن. شما می‌توانید این آگاه‌سازی با نامه را این‌جا خاموش کنید:%8$s\n"
 
-#: lib/mailbox.php:87
 msgid "Only the user can read their own mailboxes."
 msgstr "تنها کاربران می تواند صندوق نامهٔ خودشان را بخوانند."
 
-#: lib/mailbox.php:125
 msgid ""
 "You have no private messages. You can send private message to engage other "
 "users in conversation. People can send you messages for your eyes only."
 msgstr ""
 
-#: lib/mailhandler.php:37
 msgid "Could not parse message."
 msgstr "نمی‌توان پیام را تجزیه کرد."
 
-#: lib/mailhandler.php:42
 msgid "Not a registered user."
 msgstr "یک کاربر ثبت نام شده نیستید"
 
-#: lib/mailhandler.php:46
 msgid "Sorry, that is not your incoming email address."
 msgstr "با عرض پوزش، این پست الکترونیک شما نیست."
 
-#: lib/mailhandler.php:50
 msgid "Sorry, no incoming email allowed."
 msgstr "با عرض پوزش، اجازه‌ی ورودی پست الکترونیک وجود ندارد"
 
-#: lib/mailhandler.php:229
 #, php-format
 msgid "Unsupported message type: %s"
 msgstr "نوع پیام پشتیبانی نشده است: %s"
 
 #. TRANS: Client exception thrown when a database error was thrown during a file upload operation.
-#: lib/mediafile.php:102 lib/mediafile.php:174
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
 "یک خطای پایگاه داده هنگام ذخیره کردن فایل شما رخ داد. لطفا بعدا سعی کنید."
 
 #. TRANS: Client exception thrown when a file upload operation would cause a user to exceed a set quota.
-#: lib/mediafile.php:238 lib/mediafile.php:281
 msgid "File exceeds user's quota."
 msgstr "پرونده از سهمیهٔ کاربر می‌گذرد."
 
 #. TRANS: Client exception thrown when a file upload operation fails because the file could
 #. TRANS: not be moved from the temporary folder to the permanent file location.
-#: lib/mediafile.php:258 lib/mediafile.php:300
 msgid "File could not be moved to destination directory."
 msgstr "فایل نتوانست به دایرکتوری مقصد منتقل شود."
 
 #. TRANS: Client exception thrown when a file upload operation has been stopped because the MIME
 #. TRANS: type of the uploaded file could not be determined.
-#: lib/mediafile.php:265 lib/mediafile.php:306
 msgid "Could not determine file's MIME type."
 msgstr "نمی‌توان فرمت پرونده را تعیین کرد."
 
 #. TRANS: Client exception thrown trying to upload a forbidden MIME type.
 #. TRANS: %1$s is the file type that was denied, %2$s is the application part of
 #. TRANS: the MIME type that was denied.
-#: lib/mediafile.php:396
 #, php-format
 msgid ""
 "\"%1$s\" is not a supported file type on this server. Try using another %2$s "
@@ -9159,83 +7620,74 @@ msgstr ""
 
 #. TRANS: Client exception thrown trying to upload a forbidden MIME type.
 #. TRANS: %s is the file type that was denied.
-#: lib/mediafile.php:401
 #, php-format
 msgid "\"%s\" is not a supported file type on this server."
 msgstr ""
 
-#: lib/messageform.php:120
 msgid "Send a direct notice"
 msgstr "فرستادن یک پیام مستقیم"
 
 #. TRANS Label entry in drop-down selection box in direct-message inbox/outbox. This is the default entry in the drop-down box, doubling as instructions and a brake against accidental submissions with the first user in the list.
-#: lib/messageform.php:137
 #, fuzzy
 msgid "Select recipient:"
 msgstr "یک اپراتور را انتخاب کنید"
 
 #. TRANS Entry in drop-down selection box in direct-message inbox/outbox when no one is available to message.
-#: lib/messageform.php:150
 #, fuzzy
 msgid "No mutual subscribers."
 msgstr "تایید نشده!"
 
-#: lib/messageform.php:153
 msgid "To"
 msgstr "به"
 
-#: lib/messageform.php:184 lib/noticeform.php:236
 msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr "فرستادن"
 
-#: lib/messagelist.php:77
 #, fuzzy
 msgid "Messages"
 msgstr "پیام"
 
-#: lib/messagelistitem.php:123 lib/noticelist.php:527
 msgid "from"
 msgstr "از"
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:178
 msgid "Nickname cannot be empty."
 msgstr ""
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:191
 #, php-format
 msgid "Nickname cannot be more than %d character long."
 msgid_plural "Nickname cannot be more than %d characters long."
 msgstr[0] ""
 
-#: lib/noticeform.php:160
+#. TRANS: Form legend for notice form.
 msgid "Send a notice"
 msgstr "فرستادن یک پیام"
 
-#: lib/noticeform.php:174
+#. TRANS: Title for notice label. %s is the user's nickname.
 #, php-format
 msgid "What's up, %s?"
 msgstr "چه خبر، %s؟"
 
-#: lib/noticeform.php:193
+#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr "پیوست کردن"
 
-#: lib/noticeform.php:197
-msgid "Attach a file"
+#. TRANS: Title for input field to attach a file to a notice.
+#, fuzzy
+msgid "Attach a file."
 msgstr "یک فایل پیوست کنید"
 
-#: lib/noticeform.php:212
+#. TRANS: Field label to add location to a notice.
 msgid "Share my location"
 msgstr "مکان من به اشتراک گذاشته شود"
 
-#: lib/noticeform.php:215
+#. TRANS: Text to not share location for a notice in notice form.
 msgid "Do not share my location"
 msgstr "موقعیت من به اشتراک گذاشته نشود"
 
-#: lib/noticeform.php:216
+#. TRANS: Timeout error text for location retrieval in notice form.
 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
 "try again later"
@@ -9244,815 +7696,517 @@ msgstr ""
 "دوباره تلاش کنید."
 
 #. TRANS: Used in coordinates as abbreviation of north
-#: lib/noticelist.php:457
 #, fuzzy
 msgid "N"
 msgstr "خیر"
 
 #. TRANS: Used in coordinates as abbreviation of south
-#: lib/noticelist.php:459
 msgid "S"
 msgstr ""
 
 #. TRANS: Used in coordinates as abbreviation of east
-#: lib/noticelist.php:461
 msgid "E"
 msgstr ""
 
 #. TRANS: Used in coordinates as abbreviation of west
-#: lib/noticelist.php:463
 msgid "W"
 msgstr ""
 
-#: lib/noticelist.php:465
 #, php-format
 msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgstr ""
 
-#: lib/noticelist.php:474
 msgid "at"
 msgstr "در"
 
-#: lib/noticelist.php:523
 msgid "web"
 msgstr ""
 
-#: lib/noticelist.php:589
 msgid "in context"
 msgstr "در زمینه"
 
-#: lib/noticelist.php:624
 msgid "Repeated by"
 msgstr "تکرار از"
 
-#: lib/noticelist.php:651
 msgid "Reply to this notice"
 msgstr "به این پیام پاسخ دهید"
 
-#: lib/noticelist.php:652
 msgid "Reply"
 msgstr "پاسخ"
 
-#: lib/noticelist.php:678
 msgid "Delete this notice"
 msgstr "این پیام را پاک کن"
 
-#: lib/noticelist.php:696
 msgid "Notice repeated"
 msgstr "پیام تکرار شد"
 
-#: lib/nudgeform.php:116
 msgid "Nudge this user"
 msgstr "یادآوری‌کردن به این کاربر"
 
-#: lib/nudgeform.php:128
 msgid "Nudge"
 msgstr "یادآوری‌کردن"
 
-#: lib/nudgeform.php:128
 msgid "Send a nudge to this user"
 msgstr "یک یادآوری به این کاربر فرستاده شود"
 
-#: lib/oauthstore.php:294
 msgid "Error inserting new profile."
 msgstr ""
 
-#: lib/oauthstore.php:302
 msgid "Error inserting avatar."
 msgstr ""
 
-#: lib/oauthstore.php:322
 msgid "Error inserting remote profile."
 msgstr ""
 
 #. TRANS: Exception thrown when a notice is denied because it has been sent before.
-#: lib/oauthstore.php:362
 msgid "Duplicate notice."
 msgstr ""
 
-#: lib/oauthstore.php:507
 msgid "Couldn't insert new subscription."
 msgstr "نمی‌توان اشتراک تازه‌ای افزود."
 
-#: lib/personalgroupnav.php:104
-#, fuzzy
 msgid "Replies"
 msgstr "پاسخ ها"
 
-#: lib/personalgroupnav.php:109
-#, fuzzy
 msgid "Favorites"
 msgstr "برگزیده‌ها"
 
-#: lib/personalgroupnav.php:120
-#, fuzzy
 msgid "Inbox"
 msgstr "صندوق دریافتی"
 
-#: lib/personalgroupnav.php:121
 msgid "Your incoming messages"
 msgstr "پیام های وارد شونده ی شما"
 
-#: lib/personalgroupnav.php:125
-#, fuzzy
 msgid "Outbox"
 msgstr "صندوق خروجی"
 
-#: lib/personalgroupnav.php:126
 msgid "Your sent messages"
 msgstr "پیام‌های فرستاده شدهٔ شما"
 
 #. TRANS: Title for personal tag cloud section. %s is a user nickname.
-#: lib/personaltagcloudsection.php:56
 #, php-format
 msgid "Tags in %s's notices"
 msgstr "برچسب‌ها در پیام‌های %s"
 
 #. TRANS: Displayed as version information for a plugin if no version information was found.
-#: lib/plugin.php:126
 msgid "Unknown"
 msgstr "ناشناخته"
 
 #. TRANS: Plugin admin panel controls
-#: lib/plugindisableform.php:90
 msgctxt "plugin"
 msgid "Disable"
 msgstr ""
 
 #. TRANS: Plugin admin panel controls
-#: lib/pluginenableform.php:112
 msgctxt "plugin"
 msgid "Enable"
 msgstr ""
 
-#: lib/pluginlist.php:196
 msgctxt "plugin-description"
 msgid "(Plugin descriptions unavailable when disabled.)"
 msgstr ""
 
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:88
 msgid "Subscriptions"
 msgstr "اشتراک‌ها"
 
 #. TRANS: Text for user subscription statistics if user has more subscriptions than displayed.
-#: lib/profileaction.php:144
 msgid "All subscriptions"
 msgstr "تمام اشتراک‌ها"
 
 #. TRANS: H2 text for user subscriber statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:96
 msgid "Subscribers"
 msgstr "مشترک‌ها"
 
 #. TRANS: Text for user subscription statistics if user has more subscribers than displayed.
-#: lib/profileaction.php:181
 msgid "All subscribers"
 msgstr "تمام مشترک‌ها"
 
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:213
 msgid "User ID"
 msgstr "شناسه کاربر"
 
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:219
 msgid "Member since"
 msgstr "عضو شده از"
 
 #. TRANS: Label for user statistics.
 #. TRANS: H2 text for user group membership statistics.
-#: lib/profileaction.php:239 lib/profileaction.php:290
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:104
 msgid "Groups"
 msgstr "گروه‌ها"
 
 #. TRANS: Label for user statistics.
 #. TRANS: Average count of posts made per day since account registration.
-#: lib/profileaction.php:253
 msgid "Daily average"
 msgstr "میانگین روزانه"
 
 #. TRANS: Text for user group membership statistics if user has more subscriptions than displayed.
-#: lib/profileaction.php:305
 msgid "All groups"
 msgstr "تمام گروه‌ها"
 
 #. TRANS: Server error displayed when using an unimplemented method.
-#: lib/profileformaction.php:123
 msgid "Unimplemented method."
 msgstr "روش پیاده نشده است."
 
-#: lib/publicgroupnav.php:82
 msgid "User groups"
 msgstr "گروه‌های کاربر"
 
-#: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
 msgid "Recent tags"
 msgstr "برچسب‌های اخیر"
 
-#: lib/publicgroupnav.php:88
 msgid "Featured"
 msgstr "خصوصیت"
 
-#: lib/publicgroupnav.php:92
 msgid "Popular"
 msgstr "محبوب"
 
-#: lib/redirectingaction.php:95
 #, fuzzy
 msgid "No return-to arguments."
 msgstr "هیچ پیوستی وجود ندارد."
 
-#: lib/repeatform.php:107
 msgid "Repeat this notice?"
 msgstr "این پیام تکرار شود؟"
 
-#: lib/repeatform.php:132
 msgid "Yes"
 msgstr "بله"
 
-#: lib/repeatform.php:132
 msgid "Repeat this notice"
 msgstr "تکرار این پیام"
 
-#: lib/revokeroleform.php:91
 #, php-format
 msgid "Revoke the \"%s\" role from this user"
 msgstr "دسترسی کاربر به گروه مسدود شود"
 
 #. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:1001
 #, fuzzy
 msgid "Page not found."
 msgstr "رابط مورد نظر پیدا نشد."
 
-#: lib/sandboxform.php:67
 #, fuzzy
 msgid "Sandbox"
 msgstr "صندوق دریافتی"
 
-#: lib/sandboxform.php:78
 #, fuzzy
 msgid "Sandbox this user"
 msgstr "آزاد سازی کاربر"
 
 #. TRANS: Fieldset legend for the search form.
-#: lib/searchaction.php:120
 msgid "Search site"
 msgstr "جست‌وجوی وب‌گاه"
 
 #. TRANS: Used as a field label for the field where one or more keywords
 #. TRANS: for searching can be entered.
-#: lib/searchaction.php:128
 msgid "Keyword(s)"
 msgstr "کلمه(های) کلیدی"
 
 #. TRANS: Button text for searching site.
-#: lib/searchaction.php:130
 msgctxt "BUTTON"
 msgid "Search"
 msgstr ""
 
-#: lib/searchgroupnav.php:80
 msgid "People"
 msgstr "افراد"
 
-#: lib/searchgroupnav.php:81
 msgid "Find people on this site"
 msgstr "پیدا کردن افراد در این وب‌گاه"
 
-#: lib/searchgroupnav.php:83
 msgid "Find content of notices"
 msgstr "پیدا کردن محتوای پیام‌ها"
 
-#: lib/searchgroupnav.php:85
 msgid "Find groups on this site"
 msgstr "پیدا کردن گروه‌ها در این وب‌گاه"
 
-#: lib/section.php:89
 msgid "Untitled section"
 msgstr "بخش بی‌نام"
 
-#: lib/section.php:106
 msgid "More..."
 msgstr "بیش‌تر..."
 
-#: lib/settingsnav.php:78
 msgid "Change your profile settings"
 msgstr "تنظیمات نمایه‌تان را تغییر دهید"
 
-#: lib/settingsnav.php:83
 msgid "Upload an avatar"
 msgstr "بارگذاری یک چهره"
 
-#: lib/settingsnav.php:88
 msgid "Change your password"
 msgstr "تغییر گذرواژهٔ شما"
 
-#: lib/settingsnav.php:93
 msgid "Change email handling"
 msgstr "تغیر تنظیمات ایمل ."
 
-#: lib/settingsnav.php:98
 msgid "Design your profile"
 msgstr "نمایهٔ خود را طراحی کنید"
 
-#: lib/settingsnav.php:102
 msgid "URL"
 msgstr "نشانی اینترنتی"
 
-#: lib/settingsnav.php:103
 msgid "URL shorteners"
 msgstr ""
 
-#: lib/settingsnav.php:111
 msgid "Updates by instant messenger (IM)"
 msgstr "به‌هنگام‌سازی‌های انجام‌شده با پیام‌رسان فوری (IM)"
 
-#: lib/settingsnav.php:118
 msgid "Updates by SMS"
 msgstr "به‌روزرسانی با پیامک"
 
-#: lib/settingsnav.php:123
-#, fuzzy
 msgid "Connections"
 msgstr "اتصال‌ها"
 
-#: lib/settingsnav.php:124
 msgid "Authorized connected applications"
 msgstr "برنامه‌های وصل‌شدهٔ مجاز"
 
-#: lib/silenceform.php:67
 msgid "Silence"
 msgstr "ساکت کردن"
 
-#: lib/silenceform.php:78
 msgid "Silence this user"
 msgstr "ساکت کردن این کاربر"
 
-#: lib/subgroupnav.php:89
 #, fuzzy, php-format
 msgid "People %s subscribes to"
 msgstr "افراد مشترک %s"
 
-#: lib/subgroupnav.php:97
 #, php-format
 msgid "People subscribed to %s"
 msgstr "افراد مشترک %s"
 
-#: lib/subgroupnav.php:105
 #, php-format
 msgid "Groups %s is a member of"
 msgstr "هست عضو %s گروه"
 
-#: lib/subgroupnav.php:111
 msgid "Invite"
 msgstr "دعوت‌کردن"
 
-#: lib/subgroupnav.php:112
 #, php-format
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "به شما ملحق شوند  %s دوستان و همکاران را دعوت کنید تا در"
 
-#: lib/subscribeform.php:115 lib/subscribeform.php:139
 msgid "Subscribe to this user"
 msgstr "مشترک شدن این کاربر"
 
-#: lib/subscriberspeopleselftagcloudsection.php:48
-#: lib/subscriptionspeopleselftagcloudsection.php:48
 msgid "People Tagcloud as self-tagged"
 msgstr ""
 
-#: lib/subscriberspeopletagcloudsection.php:48
-#: lib/subscriptionspeopletagcloudsection.php:48
 msgid "People Tagcloud as tagged"
 msgstr ""
 
-#: lib/tagcloudsection.php:56
 msgid "None"
 msgstr "هیچ"
 
 #. TRANS: Server exception displayed if a theme name was invalid.
-#: lib/theme.php:74
 #, fuzzy
 msgid "Invalid theme name."
 msgstr "نام‌پرونده نادرست است."
 
-#: lib/themeuploader.php:50
 msgid "This server cannot handle theme uploads without ZIP support."
 msgstr ""
 
-#: lib/themeuploader.php:58 lib/themeuploader.php:61
 msgid "The theme file is missing or the upload failed."
 msgstr ""
 
-#: lib/themeuploader.php:91 lib/themeuploader.php:102
-#: lib/themeuploader.php:279 lib/themeuploader.php:283
-#: lib/themeuploader.php:291 lib/themeuploader.php:298
 #, fuzzy
 msgid "Failed saving theme."
 msgstr "به روز رسانی چهره موفقیت آمیر نبود."
 
-#: lib/themeuploader.php:147
 msgid "Invalid theme: bad directory structure."
 msgstr ""
 
-#: lib/themeuploader.php:166
 #, php-format
 msgid "Uploaded theme is too large; must be less than %d byte uncompressed."
 msgid_plural ""
 "Uploaded theme is too large; must be less than %d bytes uncompressed."
 msgstr[0] ""
 
-#: lib/themeuploader.php:179
 msgid "Invalid theme archive: missing file css/display.css"
 msgstr ""
 
-#: lib/themeuploader.php:219
 msgid ""
 "Theme contains invalid file or folder name. Stick with ASCII letters, "
 "digits, underscore, and minus sign."
 msgstr ""
 
-#: lib/themeuploader.php:225
 msgid "Theme contains unsafe file extension names; may be unsafe."
 msgstr ""
 
-#: lib/themeuploader.php:242
 #, php-format
 msgid "Theme contains file of type '.%s', which is not allowed."
 msgstr ""
 
-#: lib/themeuploader.php:260
 #, fuzzy
 msgid "Error opening theme archive."
 msgstr "خطا هنگام به‌هنگام‌سازی نمایهٔ از راه دور."
 
-#: lib/threadednoticelist.php:270
 #, php-format
-msgid "Show all %d comment"
-msgid_plural "Show all %d comments"
+msgid "Show %d reply"
+msgid_plural "Show all %d replies"
 msgstr[0] ""
 
-#: lib/topposterssection.php:74
 msgid "Top posters"
 msgstr "اعلان های بالا"
 
 #. TRANS: Title for the form to unblock a user.
-#: lib/unblockform.php:67
 #, fuzzy
 msgctxt "TITLE"
 msgid "Unblock"
 msgstr "آزاد سازی"
 
-#: lib/unsandboxform.php:69
 msgid "Unsandbox"
 msgstr ""
 
-#: lib/unsandboxform.php:80
 #, fuzzy
 msgid "Unsandbox this user"
 msgstr "آزاد سازی کاربر"
 
-#: lib/unsilenceform.php:67
 msgid "Unsilence"
 msgstr "از حالت سکوت درآوردن"
 
-#: lib/unsilenceform.php:78
 msgid "Unsilence this user"
 msgstr "این کاربر از حالت سکوت خارج شود"
 
-#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
 msgid "Unsubscribe from this user"
 msgstr "لغو مشترک‌شدن از این کاربر"
 
-#: lib/unsubscribeform.php:137
 msgid "Unsubscribe"
 msgstr "لغو اشتراک"
 
 #. 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).
-#: lib/usernoprofileexception.php:60
 #, fuzzy, php-format
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "کاربر هیچ نمایه‌ای ندارد."
 
-#: lib/userprofile.php:116
 msgid "Edit Avatar"
 msgstr "ویرایش اواتور"
 
 #. TRANS: H2 for user actions in a profile.
 #. TRANS: H2 for entity actions in a profile.
-#: lib/userprofile.php:216 lib/userprofile.php:232
 msgid "User actions"
 msgstr "اعمال کاربر"
 
 #. TRANS: Text shown in user profile of not yet compeltely deleted users.
-#: lib/userprofile.php:220
 msgid "User deletion in progress..."
 msgstr "پاک‌کردن کاربر در حالت اجرا است..."
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:248
 msgid "Edit profile settings"
 msgstr "ویرایش تنظیمات نمایه"
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:250
 msgid "Edit"
 msgstr "ویرایش"
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:274
 msgid "Send a direct message to this user"
 msgstr "پیام مستقیم به این کاربر بفرستید"
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:276
 msgid "Message"
 msgstr "پیام"
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:318
 msgid "Moderate"
 msgstr "اداره کردن"
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:357
 msgid "User role"
 msgstr "وظیفهٔ کاربر"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:360
 msgctxt "role"
 msgid "Administrator"
 msgstr "رئیس"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:362
 msgctxt "role"
 msgid "Moderator"
 msgstr "مدیر"
 
-#: lib/util.php:321
 #, fuzzy
 msgid "Not allowed to log in."
 msgstr "شما به سیستم وارد نشده اید."
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1337
 msgid "a few seconds ago"
 msgstr "چند ثانیه پیش"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1340
 msgid "about a minute ago"
 msgstr "حدود یک دقیقه پیش"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1344
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
 msgstr[0] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1347
 msgid "about an hour ago"
 msgstr "حدود یک ساعت پیش"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1351
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
 msgstr[0] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1354
 msgid "about a day ago"
 msgstr "حدود یک روز پیش"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1358
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
 msgstr[0] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1361
 msgid "about a month ago"
 msgstr "حدود یک ماه پیش"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1365
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
 msgstr[0] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1368
 msgid "about a year ago"
 msgstr "حدود یک سال پیش"
 
 #. TRANS: Web color exception thrown when a hexadecimal color code does not validate.
 #. TRANS: %s is the provided (invalid) color code.
-#: lib/webcolor.php:81 lib/webcolor.php:121
 #, fuzzy, php-format
 msgid "%s is not a valid color! Use 3 or 6 hex characters."
 msgstr "%s یک رنگ صحیح نیست! از ۳ یا ۶ نویسه مبنای شانزده استفاده کنید"
 
 #. TRANS: Exception.
-#: lib/xrd.php:63
 #, fuzzy
 msgid "Invalid XML."
 msgstr "اندازه نادرست است."
 
 #. TRANS: Exception.
-#: lib/xrd.php:68
 msgid "Invalid XML, missing XRD root."
 msgstr ""
 
 #. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
-#: scripts/restoreuser.php:62
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
 
-#, fuzzy
-#~ msgid "Could not generate feed for group - %s"
-#~ msgstr "نمی‌توان گروه را به‌هنگام‌سازی کرد."
+#~ msgid "Full name is too long (max 255 chars)."
+#~ msgstr "نام کامل خیلی طولانی است (حداکثر ۲۵۵ نویسه)."
+
+#~ msgid "description is too long (max %d chars)."
+#~ msgstr "توصیف خیلی طولانی است (حداکثر %d نویسه)"
+
+#~ msgid "Location is too long (max 255 chars)."
+#~ msgstr "نام مکان خیلی طولانی است (حداکثر ۲۵۵ نویسه)"
+
+#~ msgid "Too many aliases! Maximum %d."
+#~ msgstr "نام‌های مستعار بسیار زیاد هستند! حداکثر %d."
 
 #, fuzzy
-#~ msgid "Current confirmed Jabber/Google Talk address."
-#~ msgstr "نشانی Jabber/GTalk تایید شده کنونی"
-
-#, fuzzy
-#~ msgid ""
-#~ "Jabber or Google Talk address, like \"UserName@example.org\". First, make "
-#~ "sure to add %s to your buddy list in your IM client or on Google Talk."
-#~ msgstr ""
-#~ "نشانی Jabber یا GTalk، مانند «UserName@example.org». ابتدا از اضافه کردن %"
-#~ "s به فهرست دوستان خود در کارگیر پیام‌رسان فوری‌تان یا در GTalk مطمئن شوید."
-
-#, fuzzy
-#~ msgid "Send me notices through Jabber/Google Talk."
-#~ msgstr "پیام‌ها را از راه Jabber/GTalk برای من بفرست."
-
-#, fuzzy
-#~ msgid "Publish a MicroID for my Jabber/Google Talk address."
-#~ msgstr "یک شناسهٔ کوچک برای Jabber/Gtalk من منتشر کن."
-
-#~ msgid "No Jabber ID."
-#~ msgstr "هیچ شناسهٔ Jabber ای وجود ندارد."
-
-#, fuzzy
-#~ msgid "Not a valid Jabber ID."
-#~ msgstr "شناسهٔ Jabber درست نیست"
-
-#~ msgid "That is already your Jabber ID."
-#~ msgstr "این شناسه Jabber کنونی شماست."
-
-#~ msgid "That is not your Jabber ID."
-#~ msgstr "این شناسهٔ Jabber شما نیست."
-
-#~ msgid "Other settings"
-#~ msgstr "تنظیمات دیگر"
-
-#~ msgid "Tag cloud"
-#~ msgstr "ابر برچسب"
-
-#~ msgid "Consumer key"
-#~ msgstr "کلید مصرف‌کننده"
-
-#~ msgid "Consumer secret"
-#~ msgstr "رمز مصرف‌کننده"
-
-#~ msgid "Request token URL"
-#~ msgstr "نشانی اینترنتی شناسهٔ درخواست"
-
-#~ msgid "Access token URL"
-#~ msgstr "نشانی اینترنتی نشانهٔ درخواست"
-
-#~ msgid "Authorize URL"
-#~ msgstr "نشانی اجازه‌دادن"
-
-#~ msgid "Jabber"
-#~ msgstr "Jabber"
-
-#~ msgid "Photo"
-#~ msgstr "تصویر"
-
-#~ msgid "Other options"
-#~ msgstr "انتخابات دیگر"
-
-#~ msgid "Other"
-#~ msgstr "دیگر"
-
-#~ msgid "Primary site navigation"
-#~ msgstr "مسیریابی اصلی وب‌گاه"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Personal profile and friends timeline"
-#~ msgstr "نمایهٔ شخصی و خط‌زمانی دوستان"
-
-#~ msgctxt "MENU"
-#~ msgid "Personal"
-#~ msgstr "شخصی"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Change your email, avatar, password, profile"
-#~ msgstr "پست الکترونیکی، تصویر، گذرواژه یا نمایهٔ خودتان را تغییر دهید"
-
-#~ msgid "Account"
-#~ msgstr "حساب کاربری"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Connect to services"
-#~ msgstr "اتصال به سرویس‌ها"
-
-#~ msgid "Connect"
-#~ msgstr "وصل‌شدن"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Change site configuration"
-#~ msgstr "تغییر پیکربندی وب‌گاه"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Invite friends and colleagues to join you on %s"
-#~ msgstr "دوستان و همکاران‌تان را دعوت کنید تا به شما در %s بپیوندند"
-
-#~ msgctxt "MENU"
-#~ msgid "Invite"
-#~ msgstr "دعوت‌کردن"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Create an account"
-#~ msgstr "ساختن یک جساب‌کاربری"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Help me!"
-#~ msgstr "به من کمک کنید!"
-
-#~ msgctxt "MENU"
-#~ msgid "Help"
-#~ msgstr "کمک"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Search for people or text"
-#~ msgstr "جست‌وجو برای افراد یا متن"
-
-#~ msgid "Local views"
-#~ msgstr "دید محلی"
-
-#~ msgid "Page notice"
-#~ msgstr "پیام صفحه"
-
-#~ msgid "Secondary site navigation"
-#~ msgstr "مسیریابی فرعی وب‌گاه"
-
-#~ msgid "StatusNet software license"
-#~ msgstr "StatusNet مجوز نرم افزار"
-
-#~ msgid "Site content license"
-#~ msgstr "مجوز محتویات وب‌گاه"
-
-#~ msgid "Pagination"
-#~ msgstr "صفحه بندى"
-
-#~ msgid "Author"
-#~ msgstr "مؤلف"
-
-#~ msgid "Provider"
-#~ msgstr "مهیا کننده"
-
-#, fuzzy
-#~ msgctxt "MENU"
-#~ msgid "SMS"
-#~ msgstr "پیامک"
-
-#~ msgid "Filter tags"
-#~ msgstr "پالایهٔ برچسب‌ها"
-
-#~ msgid "Available characters"
-#~ msgstr "کاراکترهای موجود"
-
-#, fuzzy
-#~ msgctxt "MENU"
-#~ msgid "Profile"
-#~ msgstr "نمایه"
-
-#~ msgid "Search help"
-#~ msgstr "راهنمای جستجو"
-
-#, fuzzy
-#~ msgid "Message too long. Maximum is %1$d character, you sent %2$d."
-#~ msgid_plural "Message too long. Maximum is %1$d characters, you sent %2$d."
-#~ msgstr[0] ""
-#~ "پیام خیلی طولانی است - حداکثر تعداد مجاز %1$d نویسه است که شما %2$d نویسه "
-#~ "را فرستادید."
+#~ msgctxt "BUTTON"
+#~ msgid "Comment"
+#~ msgstr "محتوا"
diff --git a/locale/fi/LC_MESSAGES/statusnet.po b/locale/fi/LC_MESSAGES/statusnet.po
index 28cf56ad14..63c5dffdf9 100644
--- a/locale/fi/LC_MESSAGES/statusnet.po
+++ b/locale/fi/LC_MESSAGES/statusnet.po
@@ -15,68 +15,58 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:23+0000\n"
-"PO-Revision-Date: 2011-03-03 17:25:58+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:18+0000\n"
 "Language-Team: Finnish <http://translatewiki.net/wiki/Portal:fi>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fi\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-02-25 23:49:23+0000\n"
+"X-POT-Import-Date: 2011-03-03 17:59:19+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
-#: actions/accessadminpanel.php:53 lib/adminpanelaction.php:363
 msgid "Access"
 msgstr "Käyttöoikeudet"
 
 #. TRANS: Page notice.
-#: actions/accessadminpanel.php:64
 msgid "Site access settings"
 msgstr "Sivuston käyttöoikeusasetukset"
 
 #. TRANS: Form legend for registration form.
-#: actions/accessadminpanel.php:151
 msgid "Registration"
 msgstr "Rekisteröityminen"
 
 #. TRANS: Checkbox instructions for admin setting "Private".
-#: actions/accessadminpanel.php:155
 msgid "Prohibit anonymous users (not logged in) from viewing site?"
 msgstr ""
 "Estetäänkö anonyymejä (sisäänkirjautumattomia) käyttäjiä lukemasta sivustoa?"
 
 #. TRANS: Checkbox label for prohibiting anonymous users from viewing site.
-#: actions/accessadminpanel.php:157
 msgctxt "LABEL"
 msgid "Private"
 msgstr "Yksityinen"
 
 #. TRANS: Checkbox instructions for admin setting "Invite only".
-#: actions/accessadminpanel.php:164
 msgid "Make registration invitation only."
 msgstr "Salli rekisteröityminen vain kutsusta."
 
 #. TRANS: Checkbox label for configuring site as invite only.
-#: actions/accessadminpanel.php:166
 msgid "Invite only"
 msgstr "Vain kutsusta"
 
 #. TRANS: Checkbox instructions for admin setting "Closed" (no new registrations).
-#: actions/accessadminpanel.php:173
 msgid "Disable new registrations."
 msgstr "Estä uusien käyttäjien rekisteröityminen."
 
 #. TRANS: Checkbox label for disabling new user registrations.
-#: actions/accessadminpanel.php:175
 msgid "Closed"
 msgstr "Suljettu"
 
 #. TRANS: Title for button to save access settings in site admin panel.
-#: actions/accessadminpanel.php:191
 msgid "Save access settings"
 msgstr "Tallenna käyttöoikeusasetukset"
 
@@ -84,6 +74,7 @@ msgstr "Tallenna käyttöoikeusasetukset"
 #. TRANS: Button text for saving theme settings.
 #. TRANS: Button label to save e-mail preferences.
 #. TRANS: Button label to save IM preferences.
+#. TRANS: Button text in the license admin panel.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
 #. TRANS: Button text for saving site notice in admin panel.
@@ -93,21 +84,12 @@ msgstr "Tallenna käyttöoikeusasetukset"
 #. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
 #. TRANS: Button text on profile design page to save settings.
-#: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
-#: actions/emailsettings.php:251 actions/imsettings.php:199
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:198
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:204
-#: actions/subscriptions.php:261 actions/urlsettings.php:152
-#: actions/useradminpanel.php:298 lib/applicationeditform.php:355
-#: lib/designform.php:320 lib/groupeditform.php:201
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Tallenna"
 
 #. TRANS: Server error when page not found (404).
 #. TRANS: Server error when page not found (404)
-#: actions/all.php:68 actions/public.php:98 actions/replies.php:93
-#: actions/showfavorites.php:140 actions/tag.php:52
 msgid "No such page."
 msgstr "Sivua ei ole."
 
@@ -126,6 +108,7 @@ msgstr "Sivua ei ole."
 #. TRANS: Client error displayed when checking group membership for a non-existing user.
 #. TRANS: Client error displayed when trying to have a non-existing user join a group.
 #. TRANS: Client error displayed when trying to have a non-existing user leave a group.
+#. TRANS: Client error displayed when not providing a user or an invalid user.
 #. TRANS: Client error displayed when updating a status for a non-existing user.
 #. TRANS: Client error displayed when requesting a list of followers for a non-existing user.
 #. TRANS: Client error displayed when requesting most recent favourite notices by a user for a non-existing user.
@@ -138,6 +121,8 @@ msgstr "Sivua ei ole."
 #. 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.
 #. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
@@ -145,33 +130,10 @@ msgstr "Sivua ei ole."
 #. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when calling a profile action without specifying a user.
-#: actions/all.php:80 actions/allrss.php:69
-#: actions/apiaccountupdatedeliverydevice.php:110
-#: actions/apiaccountupdateprofile.php:103
-#: actions/apiaccountupdateprofilebackgroundimage.php:118
-#: actions/apiaccountupdateprofileimage.php:104 actions/apiatomservice.php:59
-#: actions/apiblockcreate.php:96 actions/apiblockdestroy.php:94
-#: actions/apidirectmessage.php:75 actions/apidirectmessagenew.php:72
-#: actions/apigroupcreate.php:111 actions/apigroupismember.php:89
-#: actions/apigroupjoin.php:98 actions/apigroupleave.php:98
-#: actions/apigrouplist.php:70 actions/apigroupprofileupdate.php:108
-#: actions/apistatusesupdate.php:230 actions/apisubscriptions.php:85
-#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:173
-#: actions/apitimelinehome.php:78 actions/apitimelinementions.php:77
-#: actions/apitimelineuser.php:79 actions/avatarbynickname.php:79
-#: actions/favoritesrss.php:72 actions/foaf.php:42 actions/foaf.php:61
-#: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116
-#: actions/otp.php:78 actions/remotesubscribe.php:144
-#: actions/remotesubscribe.php:153 actions/replies.php:73
-#: actions/repliesrss.php:38 actions/rsd.php:113 actions/showfavorites.php:106
-#: actions/userbyid.php:75 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/userxrd.php:59 actions/xrds.php:71 lib/command.php:509
-#: lib/galleryaction.php:59 lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Käyttäjää ei ole."
 
 #. TRANS: Page title. %1$s is user nickname, %2$d is page number
-#: actions/all.php:91
 #, php-format
 msgid "%1$s and friends, page %2$d"
 msgstr "%1$s ja kaverit, sivu %2$d"
@@ -180,33 +142,26 @@ msgstr "%1$s ja kaverit, sivu %2$d"
 #. TRANS: H1 text for page. %s is a user nickname.
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Timeline title for user and friends. %s is a user nickname.
-#: actions/all.php:94 actions/all.php:191 actions/allrss.php:117
-#: actions/apitimelinefriends.php:207 actions/apitimelinehome.php:113
-#: lib/personalgroupnav.php:100
 #, php-format
 msgid "%s and friends"
 msgstr "%s ja kaverit"
 
 #. TRANS: %s is user nickname.
-#: actions/all.php:108
 #, php-format
 msgid "Feed for friends of %s (RSS 1.0)"
 msgstr "Käyttäjän %s kavereiden syöte (RSS 1.0)"
 
 #. TRANS: %s is user nickname.
-#: actions/all.php:117
 #, php-format
 msgid "Feed for friends of %s (RSS 2.0)"
 msgstr "Käyttäjän %s kavereiden syöte (RSS 2.0)"
 
 #. TRANS: %s is user nickname.
-#: actions/all.php:126
 #, php-format
 msgid "Feed for friends of %s (Atom)"
 msgstr "Käyttäjän %s kavereiden syöte (Atom)"
 
 #. TRANS: Empty list message. %s is a user nickname.
-#: actions/all.php:139
 #, php-format
 msgid ""
 "This is the timeline for %s and friends but no one has posted anything yet."
@@ -216,7 +171,6 @@ msgstr ""
 
 #. TRANS: Encouragement displayed on logged in user's empty timeline.
 #. TRANS: This message contains Markdown links. Keep "](" together.
-#: actions/all.php:146
 #, php-format
 msgid ""
 "Try subscribing to more people, [join a group](%%action.groups%%) or post "
@@ -227,7 +181,6 @@ msgstr ""
 
 #. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@".
 #. TRANS: This message contains Markdown links. Keep "](" together.
-#: actions/all.php:150
 #, fuzzy, php-format
 msgid ""
 "You can try to [nudge %1$s](../%2$s) from their profile or [post something "
@@ -240,7 +193,6 @@ msgstr ""
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
 #. TRANS: Second sentence of empty message for anonymous users. %s is a user nickname.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:221
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -248,14 +200,11 @@ msgid ""
 msgstr ""
 
 #. TRANS: H1 text for page when viewing a list for self.
-#: actions/all.php:188
 msgid "You and friends"
 msgstr "Sinä ja kaverisi"
 
 #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
 #. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name.
-#: actions/allrss.php:122 actions/apitimelinefriends.php:213
-#: actions/apitimelinehome.php:119
 #, php-format
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr "Käyttäjän %1$s ja kavereiden päivitykset palvelussa %2$s!"
@@ -274,55 +223,20 @@ msgstr "Käyttäjän %1$s ja kavereiden päivitykset palvelussa %2$s!"
 #. TRANS: Client error displayed trying to execute an unknown API method checking group membership.
 #. TRANS: Client error displayed trying to execute an unknown API method listing the latest 20 groups.
 #. TRANS: Client error displayed trying to execute an unknown API method showing group membership.
+#. TRANS: Client error displayed when using an unsupported API format.
 #. TRANS: Client error displayed trying to execute an unknown API method showing a group.
 #. TRANS: Client error displayed trying to execute an unknown API method testing API connectivity.
 #. TRANS: Client error displayed trying to execute an unknown API method deleting a status.
 #. TRANS: Client error displayed when trying to handle an unknown API method.
-#: actions/apiaccountratelimitstatus.php:69
-#: actions/apiaccountupdatedeliverydevice.php:92
-#: actions/apiaccountupdateprofile.php:94
-#: actions/apiaccountupdateprofilebackgroundimage.php:92
-#: actions/apiaccountupdateprofilecolors.php:115
-#: actions/apiaccountverifycredentials.php:68 actions/apidirectmessage.php:157
-#: actions/apifavoritecreate.php:98 actions/apifavoritedestroy.php:98
-#: actions/apifriendshipscreate.php:99 actions/apifriendshipsdestroy.php:99
-#: actions/apifriendshipsshow.php:124 actions/apigroupcreate.php:138
-#: actions/apigroupismember.php:115 actions/apigroupjoin.php:151
-#: actions/apigroupleave.php:141 actions/apigrouplist.php:134
-#: actions/apigrouplistall.php:120 actions/apigroupmembership.php:105
-#: actions/apigroupprofileupdate.php:100 actions/apigroupprofileupdate.php:213
-#: actions/apigroupshow.php:114 actions/apihelptest.php:84
-#: actions/apistatusesdestroy.php:101 actions/apistatusesretweets.php:110
-#: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:139
-#: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
-#: actions/apitimelinefavorites.php:182 actions/apitimelinefriends.php:276
-#: actions/apitimelinegroup.php:148 actions/apitimelinehome.php:181
-#: actions/apitimelinementions.php:182 actions/apitimelinepublic.php:247
-#: actions/apitimelineretweetedtome.php:147
-#: actions/apitimelineretweetsofme.php:147 actions/apitimelinetag.php:165
-#: actions/apitimelineuser.php:217 actions/apiusershow.php:100
 msgid "API method not found."
 msgstr "API-metodia ei löytynyt."
 
 #. 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.
-#: actions/apiaccountupdatedeliverydevice.php:83
-#: actions/apiaccountupdateprofile.php:85
-#: actions/apiaccountupdateprofilebackgroundimage.php:83
-#: actions/apiaccountupdateprofilecolors.php:106
-#: actions/apiaccountupdateprofileimage.php:80 actions/apiblockcreate.php:87
-#: actions/apiblockdestroy.php:85 actions/apidirectmessagenew.php:107
-#: actions/apifavoritecreate.php:88 actions/apifavoritedestroy.php:88
-#: actions/apifriendshipscreate.php:89 actions/apifriendshipsdestroy.php:89
-#: actions/apigroupcreate.php:102 actions/apigroupjoin.php:89
-#: actions/apigroupleave.php:89 actions/apigroupprofileupdate.php:92
-#: actions/apimediaupload.php:66 actions/apistatusesretweet.php:63
-#: actions/apistatusesupdate.php:194
 msgid "This method requires a POST."
 msgstr "Tämä metodi edellyttää POST-pyynnön."
 
 #. TRANS: Client error displayed when no valid device parameter is provided for a user's delivery device setting.
-#: actions/apiaccountupdatedeliverydevice.php:103
 msgid ""
 "You must specify a parameter named 'device' with a value of one of: sms, im, "
 "none."
@@ -336,10 +250,6 @@ msgstr ""
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
-#: actions/apiaccountupdatedeliverydevice.php:136
-#: actions/emailsettings.php:353 actions/emailsettings.php:499
-#: actions/profilesettings.php:323 actions/smssettings.php:300
-#: actions/smssettings.php:453 actions/urlsettings.php:211
 msgid "Could not update user."
 msgstr "Käyttäjän päivitys epäonnistui."
 
@@ -352,32 +262,17 @@ msgstr "Käyttäjän päivitys epäonnistui."
 #. TRANS: Server error displayed when requesting Friends of a Friend feed for a user for which the profile could not be found.
 #. TRANS: Server error displayed when trying to get a user hCard for a user without a profile.
 #. TRANS: Server error displayed when calling a profile action while the specified user does not have a profile.
-#: actions/apiaccountupdateprofile.php:111
-#: actions/apiaccountupdateprofilebackgroundimage.php:199
-#: actions/apiaccountupdateprofilecolors.php:183
-#: actions/apiaccountupdateprofileimage.php:131
-#: actions/apiuserprofileimage.php:88 actions/apiusershow.php:108
-#: actions/avatarbynickname.php:85 actions/foaf.php:69 actions/hcard.php:75
-#: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
-#: lib/profileaction.php:85
 msgid "User has no profile."
 msgstr "Käyttäjällä ei ole profiilia."
 
 #. TRANS: Server error displayed if a user profile could not be saved.
 #. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:419
 msgid "Could not save profile."
 msgstr "Profiilin tallennus epäonnistui."
 
 #. TRANS: Client error displayed when the number of bytes in a POST request exceeds a limit.
 #. TRANS: %s is the number of bytes of the CONTENT_LENGTH.
 #. TRANS: Form validation error in design settings form. POST should remain untranslated.
-#: actions/apiaccountupdateprofilebackgroundimage.php:108
-#: actions/apiaccountupdateprofileimage.php:95 actions/apimediaupload.php:81
-#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
-#: actions/designadminpanel.php:120 actions/editapplication.php:121
-#: actions/newapplication.php:102 actions/newnotice.php:95
-#: lib/designsettings.php:110
 #, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s byte) due to its "
@@ -393,26 +288,15 @@ msgstr[1] ""
 #. TRANS: Client error displayed when a database error occurs inserting profile colours.
 #. TRANS: Client error displayed when a database error occurs updating profile colours.
 #. TRANS: Form validation error displayed when group design settings could not be saved because of an application issue.
-#: actions/apiaccountupdateprofilebackgroundimage.php:138
-#: actions/apiaccountupdateprofilebackgroundimage.php:149
-#: actions/apiaccountupdateprofilecolors.php:160
-#: actions/apiaccountupdateprofilecolors.php:171
-#: actions/groupdesignsettings.php:285 actions/groupdesignsettings.php:296
-#: actions/userdesignsettings.php:218 actions/userdesignsettings.php:228
-#: actions/userdesignsettings.php:270 actions/userdesignsettings.php:280
 msgid "Unable to save your design settings."
 msgstr "Ulkoasun tallennus epäonnistui."
 
 #. TRANS: Error displayed when updating design settings fails.
 #. TRANS: Client error displayed when a database error occurs updating profile colours.
-#: actions/apiaccountupdateprofilebackgroundimage.php:191
-#: actions/apiaccountupdateprofilecolors.php:139
-#: actions/userdesignsettings.php:196
 msgid "Could not update your design."
 msgstr "Ulkoasua ei voitu päivittää."
 
 #. TRANS: Title for Atom feed.
-#: actions/apiatomservice.php:85
 msgctxt "ATOM"
 msgid "Main"
 msgstr ""
@@ -421,9 +305,6 @@ msgstr ""
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Title in atom group notice feed. %s is a group name.
 #. TRANS: Title in atom user notice feed. %s is a user name.
-#: actions/apiatomservice.php:93 actions/grouprss.php:138
-#: actions/userrss.php:94 lib/atomgroupnoticefeed.php:63
-#: lib/atomusernoticefeed.php:88
 #, php-format
 msgid "%s timeline"
 msgstr "%s aikajana"
@@ -433,8 +314,6 @@ msgstr "%s aikajana"
 #. TRANS: %s is a user nickname.
 #. TRANS: Header for subscriptions overview for a user (first page).
 #. TRANS: %s is a user nickname.
-#: actions/apiatomservice.php:104 actions/atompubsubscriptionfeed.php:148
-#: actions/subscriptions.php:51
 #, php-format
 msgid "%s subscriptions"
 msgstr "Käyttäjän %s tilaukset"
@@ -442,58 +321,48 @@ msgstr "Käyttäjän %s tilaukset"
 #. TRANS: Title for Atom feed with a user's favorite notices. %s is a user nickname.
 #. TRANS: Title for Atom favorites feed.
 #. TRANS: %s is a user nickname.
-#: actions/apiatomservice.php:115 actions/atompubfavoritefeed.php:142
 #, php-format
 msgid "%s favorites"
 msgstr "Käyttäjän %s suosikit"
 
 #. TRANS: Title for Atom feed with a user's memberships. %s is a user nickname.
-#: actions/apiatomservice.php:126
 #, php-format
 msgid "%s memberships"
 msgstr "Ryhmän %s jäsenet"
 
 #. TRANS: Client error displayed when users try to block themselves.
-#: actions/apiblockcreate.php:105
 msgid "You cannot block yourself!"
 msgstr "Sinä et voi poistaa käyttäjiä."
 
 #. TRANS: Server error displayed when blocking a user has failed.
-#: actions/apiblockcreate.php:127
 msgid "Block user failed."
 msgstr "Käyttäjän esto epäonnistui."
 
 #. TRANS: Server error displayed when unblocking a user has failed.
-#: actions/apiblockdestroy.php:113
 msgid "Unblock user failed."
 msgstr "Käyttäjän eston poisto epäonnistui."
 
 #. TRANS: Title. %s is a user nickname.
-#: actions/apidirectmessage.php:88
 #, php-format
 msgid "Direct messages from %s"
 msgstr "Suorat viestit käyttäjälle %s"
 
 #. TRANS: Subtitle. %s is a user nickname.
-#: actions/apidirectmessage.php:93
 #, php-format
 msgid "All the direct messages sent from %s"
 msgstr "Kaikki suorat viestit käytäjältä %s"
 
 #. TRANS: Title. %s is a user nickname.
-#: actions/apidirectmessage.php:102
 #, php-format
 msgid "Direct messages to %s"
 msgstr "Suorat viestit käyttäjälle %s"
 
 #. TRANS: Subtitle. %s is a user nickname.
-#: actions/apidirectmessage.php:107
 #, php-format
 msgid "All the direct messages sent to %s"
 msgstr "Kaikki suorat viestit käyttäjälle %s"
 
 #. TRANS: Client error displayed when no message text was submitted (406).
-#: actions/apidirectmessagenew.php:117
 msgid "No message text!"
 msgstr "Viestissä ei ole tekstiä!"
 
@@ -501,7 +370,6 @@ msgstr "Viestissä ei ole tekstiä!"
 #. TRANS: %d is the maximum number of characters for a message.
 #. TRANS: Form validation error displayed when message content is too long.
 #. TRANS: %d is the maximum number of characters for a message.
-#: actions/apidirectmessagenew.php:127 actions/newmessage.php:152
 #, fuzzy, php-format
 msgid "That's too long. Maximum message size is %d character."
 msgid_plural "That's too long. Maximum message size is %d characters."
@@ -509,18 +377,15 @@ msgstr[0] "Liian pitkä päivitys. Maksimikoko päivitykselle on %d merkkiä."
 msgstr[1] "Liian pitkä päivitys. Maksimikoko päivitykselle on %d merkkiä."
 
 #. TRANS: Client error displayed if a recipient user could not be found (403).
-#: actions/apidirectmessagenew.php:139
 msgid "Recipient user not found."
 msgstr "Vastaanottajaa ei löytynyt."
 
 #. TRANS: Client error displayed trying to direct message another user who's not a friend (403).
-#: actions/apidirectmessagenew.php:144
 msgid "Cannot send direct messages to users who aren't your friend."
 msgstr ""
 "Et voi lähettää suoraa viestiä käyttäjälle, jonka kanssa et ole vielä kaveri."
 
 #. TRANS: Client error displayed trying to direct message self (403).
-#: actions/apidirectmessagenew.php:154
 msgid ""
 "Do not send a message to yourself; just say it to yourself quietly instead."
 msgstr "Älä lähetä viestiä itsellesi, vaan kuiskaa se vain hiljaa itsellesi."
@@ -528,116 +393,96 @@ msgstr "Älä lähetä viestiä itsellesi, vaan kuiskaa se vain hiljaa itsellesi
 #. 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.
 #. TRANS: Client error displayed trying to delete a status with an invalid ID.
-#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:108
-#: actions/apistatusesdestroy.php:121
 msgid "No status found with that ID."
 msgstr "Käyttäjätunnukselle ei löytynyt statusviestiä."
 
 #. TRANS: Client error displayed when trying to mark a notice favourite that already is a favourite.
-#: actions/apifavoritecreate.php:120
 msgid "This status is already a favorite."
 msgstr "Tämä päivitys on jo suosikki."
 
 #. TRANS: Client error displayed when marking a notice as favourite fails.
 #. TRANS: Server error displayed when trying to mark a notice as favorite fails in the database.
 #. TRANS: Error message text shown when a favorite could not be set.
-#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:306
 msgid "Could not create favorite."
 msgstr "Ei voitu lisätä suosikiksi."
 
 #. TRANS: Client error displayed when trying to remove a favourite that was not a favourite.
-#: actions/apifavoritedestroy.php:122
 msgid "That status is not a favorite."
 msgstr "Tämä päivitys ei ole suosikki."
 
 #. TRANS: Client error displayed when removing a favourite has failed.
 #. TRANS: Server error displayed when removing a favorite from the database fails.
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:90
 msgid "Could not delete favorite."
 msgstr "Ei voitu poistaa suosikkia."
 
 #. TRANS: Client error displayed when trying follow who's profile could not be found.
-#: actions/apifriendshipscreate.php:109
 msgid "Could not follow user: profile not found."
 msgstr "Ei voitu lopettaa tilausta: Käyttäjää ei löytynyt."
 
 #. TRANS: Client error displayed when trying to follow a user that's already being followed.
 #. TRANS: %s is the nickname of the user that is already being followed.
-#: actions/apifriendshipscreate.php:120
 #, php-format
 msgid "Could not follow user: %s is already on your list."
 msgstr "Ei voitu tilata käyttäjää: %s on jo listallasi"
 
 #. TRANS: Client error displayed when trying to unfollow a user that cannot be found.
-#: actions/apifriendshipsdestroy.php:109
 msgid "Could not unfollow user: User not found."
 msgstr "Ei voitu lopettaa tilausta: Käyttäjää ei löytynyt."
 
 #. TRANS: Client error displayed when trying to unfollow self.
-#: actions/apifriendshipsdestroy.php:121
 msgid "You cannot unfollow yourself."
 msgstr "Sinä et voi poistaa käyttäjiä."
 
 #. TRANS: Client error displayed when supplying invalid parameters to an API call checking if a friendship exists.
-#: actions/apifriendshipsexists.php:88
 msgid "Two valid IDs or nick names must be supplied."
 msgstr "Kaksi käyttäjätunnusta tai nimeä täytyy antaa."
 
 #. TRANS: Client error displayed when a source user could not be determined showing friendship.
-#: actions/apifriendshipsshow.php:131
 msgid "Could not determine source user."
 msgstr "Ei voitu päivittää käyttäjää."
 
 #. TRANS: Client error displayed when a target user could not be determined showing friendship.
-#: actions/apifriendshipsshow.php:140
 msgid "Could not find target user."
 msgstr "Ei voitu päivittää käyttäjää."
 
 #. TRANS: Client error trying to create a group with a nickname this is already in use.
+#. TRANS: API validation exception thrown when nickname is already used.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:156 actions/apigroupprofileupdate.php:255
-#: actions/editgroup.php:191 actions/newgroup.php:137
-#: actions/profilesettings.php:274 actions/register.php:199
 msgid "Nickname already in use. Try another one."
 msgstr "Tunnus on jo käytössä. Yritä toista tunnusta."
 
 #. TRANS: Client error in form for group creation.
+#. TRANS: API validation exception thrown when nickname does not validate.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:164 actions/apigroupprofileupdate.php:259
-#: actions/editgroup.php:195 actions/newgroup.php:141
-#: actions/profilesettings.php:244 actions/register.php:201
 msgid "Not a valid nickname."
 msgstr "Tuo ei ole kelvollinen tunnus."
 
 #. TRANS: Client error in form for group creation.
+#. TRANS: API validation exception thrown when homepage URL does not validate.
 #. TRANS: Validation error shown when providing an invalid homepage URL in the "Edit application" form.
 #. TRANS: Group edit form validation error.
 #. TRANS: Validation error shown when providing an invalid homepage URL in the "New application" form.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:181 actions/apigroupprofileupdate.php:277
-#: actions/editapplication.php:235 actions/editgroup.php:202
-#: actions/newapplication.php:221 actions/newgroup.php:148
-#: actions/profilesettings.php:249 actions/register.php:208
 msgid "Homepage is not a valid URL."
 msgstr "Kotisivun verkko-osoite ei ole toimiva."
 
 #. TRANS: Client error in form for group creation.
+#. TRANS: API validation exception thrown when full name does not validate.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:191 actions/editgroup.php:206
-#: actions/newgroup.php:152 actions/profilesettings.php:253
-#: actions/register.php:211
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "Koko nimi on liian pitkä (max 255 merkkiä)."
 
 #. TRANS: Client error shown when providing too long a description during group creation.
 #. TRANS: %d is the maximum number of allowed characters.
+#. TRANS: API validation exception thrown when description does not validate.
+#. TRANS: %d is the maximum description length and used for plural.
 #. TRANS: Validation error shown when providing too long a description in the "Edit application" form.
 #. TRANS: %d is the maximum number of allowed characters.
 #. TRANS: Group edit form validation error.
@@ -645,9 +490,6 @@ msgstr "Koko nimi on liian pitkä (max 255 merkkiä)."
 #. TRANS: %d is the maximum number of characters for the description.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed characters.
-#: actions/apigroupcreate.php:201 actions/editapplication.php:202
-#: actions/editgroup.php:211 actions/newapplication.php:182
-#: actions/newgroup.php:157
 #, fuzzy, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."
@@ -655,23 +497,21 @@ msgstr[0] "kuvaus on liian pitkä (max %d merkkiä)."
 msgstr[1] "kuvaus on liian pitkä (max %d merkkiä)."
 
 #. TRANS: Client error shown when providing too long a location during group creation.
+#. TRANS: API validation exception thrown when location does not validate.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:215 actions/editgroup.php:218
-#: actions/newgroup.php:164 actions/profilesettings.php:266
-#: actions/register.php:220
 msgid "Location is too long (maximum 255 characters)."
 msgstr "Kotipaikka on liian pitkä (enintään 255 merkkiä)."
 
 #. TRANS: Client error shown when providing too many aliases during group creation.
 #. TRANS: %d is the maximum number of allowed aliases.
+#. TRANS: API validation exception thrown when aliases do not validate.
+#. TRANS: %d is the maximum number of aliases and used for plural.
 #. TRANS: Group edit form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.
-#: actions/apigroupcreate.php:236 actions/editgroup.php:231
-#: actions/newgroup.php:177
 #, fuzzy, php-format
 msgid "Too many aliases! Maximum %d allowed."
 msgid_plural "Too many aliases! Maximum %d allowed."
@@ -680,25 +520,24 @@ msgstr[1] "Liikaa aliaksia. Maksimimäärä on %d."
 
 #. TRANS: Client error shown when providing an invalid alias during group creation.
 #. TRANS: %s is the invalid alias.
-#: actions/apigroupcreate.php:253
+#. TRANS: API validation exception thrown when aliases does not validate.
+#. TRANS: %s is the invalid alias.
 #, php-format
 msgid "Invalid alias: \"%s\"."
 msgstr "Virheellinen alias: %s"
 
 #. TRANS: Client error displayed when trying to use an alias during group creation that is already in use.
 #. TRANS: %s is the alias that is already in use.
+#. TRANS: API validation exception thrown when aliases is already used.
+#. TRANS: %s is the already used alias.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error. %s is the already used alias.
-#: actions/apigroupcreate.php:264 actions/apigroupprofileupdate.php:351
-#: actions/editgroup.php:246 actions/newgroup.php:193
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "Alias \"%s\" on jo käytössä. Yritä toista aliasta."
 
 #. TRANS: Client error displayed when trying to use an alias during group creation that is the same as the group's nickname.
 #. TRANS: Group edit form validation error.
-#: actions/apigroupcreate.php:278 actions/apigroupprofileupdate.php:359
-#: actions/editgroup.php:253
 msgid "Alias can't be the same as nickname."
 msgstr "Alias ei voi olla sama kuin ryhmätunnus."
 
@@ -706,26 +545,21 @@ msgstr "Alias ei voi olla sama kuin ryhmätunnus."
 #. TRANS: Client error displayed when trying to join a group that does not exist.
 #. TRANS: Client error displayed when trying to leave a group that does not exist.
 #. TRANS: Client error displayed trying to show group membership on a non-existing group.
+#. TRANS: Client error displayed when not providing a group or an invalid group.
 #. TRANS: Client error displayed when trying to show a group that could not be found.
 #. TRANS: Client error displayed requesting most recent notices to a group for a non-existing group.
-#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
-#: actions/apigroupleave.php:104 actions/apigroupmembership.php:71
-#: actions/apigroupprofileupdate.php:113 actions/apigroupshow.php:81
-#: actions/apitimelinegroup.php:89
 msgid "Group not found."
 msgstr "Ei löytynyt."
 
 #. TRANS: Server error displayed when trying to join a group the user is already a member of.
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:345
 msgid "You are already a member of that group."
 msgstr "Sinä kuulut jo tähän ryhmään."
 
 #. TRANS: Server error displayed when trying to join a group the user is blocked from joining.
 #. 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.
-#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:350
 msgid "You have been blocked from that group by the admin."
 msgstr "Sinut on estetty osallistumasta tähän ryhmään ylläpitäjän toimesta."
 
@@ -733,13 +567,11 @@ msgstr "Sinut on estetty osallistumasta tähän ryhmään ylläpitäjän toimest
 #. TRANS: %1$s is the joining user's nickname, $2$s is the group nickname for which the join failed.
 #. TRANS: Message given having failed to add a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:136 actions/joingroup.php:139 lib/command.php:362
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "Käyttäjä %1$s ei voinut liittyä ryhmään %2$s."
 
 #. TRANS: Server error displayed when trying to leave a group the user is not a member of.
-#: actions/apigroupleave.php:115
 msgid "You are not a member of this group."
 msgstr "Sinä et kuulu tähän ryhmään."
 
@@ -747,117 +579,80 @@ msgstr "Sinä et kuulu tähän ryhmään."
 #. TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
 #. TRANS: Message given having failed to remove a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupleave.php:127 actions/leavegroup.php:133
-#: lib/command.php:410
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
 msgstr "Käyttäjä %s ei voinut liittyä ryhmään %s."
 
 #. TRANS: Used as title in check for group membership. %s is a user name.
-#: actions/apigrouplist.php:94
 #, php-format
 msgid "%s's groups"
 msgstr "Käyttäjän %s ryhmät"
 
 #. TRANS: Used as subtitle in check for group membership. %1$s is a user name, %2$s is the site name.
-#: actions/apigrouplist.php:104
 #, php-format
 msgid "%1$s groups %2$s is a member of."
 msgstr "%1$s ryhmät, joiden jäsen %2$s on."
 
 #. TRANS: Message is used as a title when listing the lastest 20 groups. %s is a site name.
 #. TRANS: Message is used as a page title. %s is a nick name.
-#: actions/apigrouplistall.php:88 actions/usergroups.php:63
 #, php-format
 msgid "%s groups"
 msgstr "Käyttäjän %s ryhmät"
 
 #. TRANS: Message is used as a subtitle when listing the lastest 20 groups. %s is a site name.
-#: actions/apigrouplistall.php:93
 #, php-format
 msgid "groups on %s"
 msgstr "sivun %s ryhmiä"
 
+#. TRANS: Client error displayed when trying to edit a group without being an admin.
 #. TRANS: Client error displayed trying to edit a group while not being a group admin.
 #. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
 #. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
-#: actions/apigroupprofileupdate.php:118 actions/editgroup.php:110
-#: actions/editgroup.php:176 actions/groupdesignsettings.php:109
-#: actions/grouplogo.php:111
 msgid "You must be an admin to edit the group."
 msgstr ""
 "Sinun pitää olla kirjautunut sisään, jotta voit muuttaa ryhmän tietoja."
 
+#. TRANS: Server error displayed when group update fails.
 #. TRANS: Server error displayed when editing a group fails.
-#: actions/apigroupprofileupdate.php:171 actions/editgroup.php:274
 msgid "Could not update group."
 msgstr "Ei voitu päivittää ryhmää."
 
+#. TRANS: Server error displayed when adding group aliases fails.
 #. TRANS: Server error displayed when group aliases could not be added.
 #. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/apigroupprofileupdate.php:194 actions/editgroup.php:281
-#: classes/User_group.php:540
 msgid "Could not create aliases."
 msgstr "Ei voitu lisätä aliasta."
 
+#. TRANS: API validation exception thrown when nickname does not validate.
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: actions/apigroupprofileupdate.php:249 lib/nickname.php:165
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr ""
 "Käyttäjätunnuksessa voi olla ainoastaan pieniä kirjaimia ja numeroita ilman "
 "välilyöntiä."
 
-#: actions/apigroupprofileupdate.php:286
-#, fuzzy
-msgid "Full name is too long (max 255 chars)."
-msgstr "Koko nimi on liian pitkä (max 255 merkkiä)."
-
-#: actions/apigroupprofileupdate.php:296
-#, fuzzy, php-format
-msgid "description is too long (max %d chars)."
-msgstr "kuvaus on liian pitkä (max %d merkkiä)."
-
-#: actions/apigroupprofileupdate.php:307
-#, fuzzy
-msgid "Location is too long (max 255 chars)."
-msgstr "Kotipaikka on liian pitkä (enintään 255 merkkiä)."
-
-#: actions/apigroupprofileupdate.php:326
-#, fuzzy, php-format
-msgid "Too many aliases! Maximum %d."
-msgstr "Liikaa aliaksia. Maksimimäärä on %d."
-
-#. TRANS: Group edit form validation error.
+#. TRANS: API validation exception thrown when alias is the same as nickname.
 #. TRANS: Group create form validation error.
-#. TRANS: %s is the invalid alias.
-#: actions/apigroupprofileupdate.php:342 actions/editgroup.php:241
-#: actions/newgroup.php:188
-#, php-format
-msgid "Invalid alias: \"%s\""
-msgstr "Virheellinen alias: \"%s\""
+#, fuzzy
+msgid "Alias cannot be the same as nickname."
+msgstr "Alias ei voi olla sama kuin ryhmätunnus."
 
 #. TRANS: Client error displayed when uploading a media file has failed.
-#: actions/apimediaupload.php:101
 msgid "Upload failed."
 msgstr "Komento epäonnistui"
 
 #. TRANS: Client error given from the OAuth API when the request token or verifier is invalid.
-#: actions/apioauthaccesstoken.php:102
 msgid "Invalid request token or verifier."
 msgstr "Virheellinen pyyntötunniste tai varmistus."
 
 #. TRANS: Client error given when no oauth_token was passed to the OAuth API.
-#: actions/apioauthauthorize.php:107
 msgid "No oauth_token parameter provided."
 msgstr "oauth_token-parametri puuttuu."
 
 #. TRANS: Client error given when an invalid request token was passed to the OAuth API.
-#: actions/apioauthauthorize.php:115 actions/apioauthauthorize.php:129
 msgid "Invalid request token."
 msgstr "Virheellinen pyyntötunniste."
 
 #. TRANS: Client error given when an invalid request token was passed to the OAuth API.
-#: actions/apioauthauthorize.php:121
 msgid "Request token already authorized."
 msgstr "Pyyntötunniste on jo hyväksytty."
 
@@ -867,33 +662,16 @@ msgstr "Pyyntötunniste on jo hyväksytty."
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
 #. TRANS: Client error displayed when the session token is not okay.
-#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:75
-#: actions/emailsettings.php:292 actions/favor.php:75 actions/geocode.php:55
-#: actions/groupblock.php:65 actions/grouplogo.php:321
-#: actions/groupunblock.php:65 actions/imsettings.php:241
-#: actions/invite.php:60 actions/makeadmin.php:66 actions/newmessage.php:135
-#: actions/newnotice.php:105 actions/nudge.php:80
-#: actions/oauthappssettings.php:162 actions/oauthconnectionssettings.php:135
-#: actions/passwordsettings.php:137 actions/pluginenable.php:87
-#: actions/profilesettings.php:218 actions/recoverpassword.php:383
-#: actions/register.php:157 actions/remotesubscribe.php:76
-#: actions/repeat.php:82 actions/smssettings.php:249 actions/subedit.php:40
-#: actions/subscribe.php:87 actions/tagother.php:145
-#: actions/unsubscribe.php:69 actions/urlsettings.php:171
-#: actions/userauthorization.php:53 lib/designsettings.php:122
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 "Istuntosi avaimen kanssa oli ongelmia. Olisitko ystävällinen ja kokeilisit "
 "uudelleen."
 
 #. TRANS: Form validation error given when an invalid username and/or password was passed to the OAuth API.
-#: actions/apioauthauthorize.php:168
 msgid "Invalid nickname / password!"
 msgstr "Käyttäjätunnus tai salasana ei kelpaa."
 
 #. TRANS: Server error displayed when a database action fails.
-#: actions/apioauthauthorize.php:217
 msgid "Database error inserting oauth_token_association."
 msgstr "Tietokantavirhe lisättäessä oauth_token_association-arvoa."
 
@@ -909,28 +687,19 @@ msgstr "Tietokantavirhe lisättäessä oauth_token_association-arvoa."
 #. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
 #. TRANS: Message given submitting a form with an unknown action in SMS settings.
 #. TRANS: Unknown form validation error in design settings form.
-#: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
-#: actions/designadminpanel.php:100 actions/editapplication.php:144
-#: actions/emailsettings.php:311 actions/grouplogo.php:332
-#: actions/imsettings.php:256 actions/newapplication.php:124
-#: actions/oauthconnectionssettings.php:144 actions/recoverpassword.php:46
-#: actions/smssettings.php:270 lib/designsettings.php:133
 msgid "Unexpected form submission."
 msgstr "Odottamaton lomakkeen lähetys."
 
 #. TRANS: Title for a page where a user can confirm/deny account access by an external application.
-#: actions/apioauthauthorize.php:387
 msgid "An application would like to connect to your account"
 msgstr "Sovellus haluaa muodostaa yhteyden käyttäjätiliisi"
 
 #. TRANS: Fieldset legend.
-#: actions/apioauthauthorize.php:404
 msgid "Allow or deny access"
 msgstr "Salli tai estä käyttö"
 
 #. TRANS: User notification of external application requesting account access.
 #. TRANS: %3$s is the access type requested (read-write or read-only), %4$s is the StatusNet sitename.
-#: actions/apioauthauthorize.php:425
 #, php-format
 msgid ""
 "An application would like the ability to <strong>%3$s</strong> your %4$s "
@@ -944,7 +713,6 @@ msgstr ""
 #. TRANS: User notification of external application requesting account access.
 #. TRANS: %1$s is the application name requesting access, %2$s is the organisation behind the application,
 #. TRANS: %3$s is the access type requested, %4$s is the StatusNet sitename.
-#: actions/apioauthauthorize.php:433
 #, php-format
 msgid ""
 "The application <strong>%1$s</strong> by <strong>%2$s</strong> would like "
@@ -956,22 +724,18 @@ msgstr ""
 "vain sellaisille kolmansille osapuolille, joihin luotat."
 
 #. TRANS: Fieldset legend.
-#: actions/apioauthauthorize.php:455
 msgctxt "LEGEND"
 msgid "Account"
 msgstr "Käyttäjätili"
 
 #. TRANS: Field label on OAuth API authorisation form.
+#. TRANS: Field label on login page.
 #. TRANS: Field label in form for profile settings.
-#: actions/apioauthauthorize.php:459 actions/login.php:225
-#: actions/profilesettings.php:107 actions/register.php:411
-#: actions/userauthorization.php:145 lib/groupeditform.php:145
 msgid "Nickname"
 msgstr "Tunnus"
 
 #. TRANS: Field label on OAuth API authorisation form.
-#: actions/apioauthauthorize.php:463 actions/login.php:228
-#: actions/register.php:415 lib/settingsnav.php:87
+#. TRANS: Field label on login page.
 msgid "Password"
 msgstr "Salasana"
 
@@ -981,43 +745,34 @@ msgstr "Salasana"
 #. TRANS: Button label to cancel an IM address confirmation procedure.
 #. TRANS: Button label to cancel a SMS address confirmation procedure.
 #. TRANS: Button label in the "Edit application" form.
-#: actions/apioauthauthorize.php:478 actions/emailsettings.php:125
-#: actions/imsettings.php:136 actions/smssettings.php:132
-#: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Cancel"
 msgstr "Peruuta"
 
 #. TRANS: Button text that when clicked will allow access to an account by an external application.
-#: actions/apioauthauthorize.php:485
 msgctxt "BUTTON"
 msgid "Allow"
 msgstr "Salli"
 
 #. TRANS: Form instructions.
-#: actions/apioauthauthorize.php:502
 msgid "Authorize access to your account information."
 msgstr "Hyväksy pääsy käyttäjätilisi tietoihin."
 
 #. TRANS: Header for user notification after revoking OAuth access to an application.
-#: actions/apioauthauthorize.php:594
 msgid "Authorization canceled."
 msgstr "Hyväksyminen peruttiin."
 
 #. TRANS: User notification after revoking OAuth access to an application.
 #. TRANS: %s is an OAuth token.
-#: actions/apioauthauthorize.php:598
 #, php-format
 msgid "The request token %s has been revoked."
 msgstr "Pyyntötunniste %s on nyt mitätöity."
 
 #. TRANS: Title of the page notifying the user that an anonymous client application was successfully authorized to access the user's account with OAuth.
-#: actions/apioauthauthorize.php:621
 msgid "You have successfully authorized the application"
 msgstr "Olet valtuuttanut sovelluksen onnistuneesti"
 
 #. TRANS: Message notifying the user that an anonymous client application was successfully authorized to access the user's account with OAuth.
-#: actions/apioauthauthorize.php:625
 msgid ""
 "Please return to the application and enter the following security code to "
 "complete the process."
@@ -1027,14 +782,12 @@ msgstr ""
 
 #. TRANS: Title of the page notifying the user that the client application was successfully authorized to access the user's account with OAuth.
 #. TRANS: %s is the authorised application name.
-#: actions/apioauthauthorize.php:632
 #, php-format
 msgid "You have successfully authorized %s"
 msgstr "Olet hyväksynyt sovelluksen %s onnistuneesti."
 
 #. TRANS: Message notifying the user that the client application was successfully authorized to access the user's account with OAuth.
 #. TRANS: %s is the authorised application name.
-#: actions/apioauthauthorize.php:639
 #, php-format
 msgid ""
 "Please return to %s and enter the following security code to complete the "
@@ -1045,12 +798,10 @@ msgstr ""
 
 #. TRANS: Client error displayed trying to delete a status not using POST or DELETE.
 #. TRANS: POST and DELETE should not be translated.
-#: actions/apistatusesdestroy.php:111
 msgid "This method requires a POST or DELETE."
 msgstr "Tämä metodi edellyttää joko POST tai DELETE sanoman."
 
 #. TRANS: Client error displayed trying to delete a status of another user.
-#: actions/apistatusesdestroy.php:136
 msgid "You may not delete another user's status."
 msgstr "Et voi poistaa toisen käyttäjän päivitystä."
 
@@ -1058,21 +809,16 @@ msgstr "Et voi poistaa toisen käyttäjän päivitystä."
 #. TRANS: Client error displayed trying to display redents of a non-exiting notice.
 #. TRANS: Client exception thrown when referencing a non-existing notice.
 #. TRANS: Error message displayed trying to delete a non-existing notice.
-#: actions/apistatusesretweet.php:74 actions/apistatusesretweets.php:70
-#: actions/atompubshowfavorite.php:82 actions/deletenotice.php:61
-#: actions/shownotice.php:92
 msgid "No such notice."
 msgstr "Päivitystä ei ole."
 
 #. TRANS: Client error displayed trying to repeat an own notice through the API.
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:549
 msgid "Cannot repeat your own notice."
 msgstr "Et voi lähettää uudelleen omaa viestiäsi."
 
 #. TRANS: Client error displayed trying to re-repeat a notice through the API.
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:92 lib/command.php:555
 msgid "Already repeated that notice."
 msgstr "Tätä päivitystä ei voi poistaa."
 
@@ -1082,57 +828,43 @@ msgstr "Tätä päivitystä ei voi poistaa."
 #. TRANS: Client exception thrown when using an unsupported HTTP method.
 #. TRANS: Client error shown when using a non-supported HTTP method.
 #. TRANS: Client exception thrown when using an unsupported HTTP method.
-#: actions/apistatusesshow.php:118 actions/atompubfavoritefeed.php:103
-#: actions/atompubmembershipfeed.php:105 actions/atompubshowfavorite.php:117
-#: actions/atompubshowmembership.php:116
-#: actions/atompubshowsubscription.php:122
-#: actions/atompubsubscriptionfeed.php:109
 msgid "HTTP method not supported."
 msgstr "HTTP-metodia ei tueta."
 
 #. TRANS: Exception thrown requesting an unsupported notice output format.
 #. TRANS: %s is the requested output format.
-#: actions/apistatusesshow.php:144
 #, php-format
 msgid "Unsupported format: %s."
 msgstr "Formaatti %s ei ole tuettu."
 
 #. TRANS: Client error displayed requesting a deleted status.
-#: actions/apistatusesshow.php:155
 msgid "Status deleted."
 msgstr "Päivitys poistettu."
 
 #. TRANS: Client error displayed requesting a status with an invalid ID.
-#: actions/apistatusesshow.php:162
 msgid "No status with that ID found."
 msgstr "Käyttäjätunnukselle ei löytynyt statusviestiä."
 
 #. TRANS: Client error displayed when trying to delete a notice not using the Atom format.
-#: actions/apistatusesshow.php:227
 msgid "Can only delete using the Atom format."
 msgstr ""
 
 #. TRANS: Client error displayed when a user has no rights to delete notices of other users.
 #. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
-#: actions/apistatusesshow.php:235 actions/deletenotice.php:78
 msgid "Cannot delete this notice."
 msgstr "Tätä päivitystä ei voi poistaa."
 
 #. TRANS: Confirmation of notice deletion in API. %d is the ID (number) of the deleted notice.
-#: actions/apistatusesshow.php:249
 #, php-format
 msgid "Deleted notice %d"
 msgstr "Poistettiin päivitys %d"
 
 #. TRANS: Client error displayed when the parameter "status" is missing.
-#: actions/apistatusesupdate.php:221
 msgid "Client must provide a 'status' parameter with a value."
 msgstr "Asiakasohjelman on annettava 'status'-parametri arvoineen."
 
 #. TRANS: Client error displayed when the parameter "status" is missing.
 #. TRANS: %d is the maximum number of character for a notice.
-#: actions/apistatusesupdate.php:244 actions/newnotice.php:161
-#: lib/mailhandler.php:60
 #, fuzzy, php-format
 msgid "That's too long. Maximum notice size is %d character."
 msgid_plural "That's too long. Maximum notice size is %d characters."
@@ -1140,13 +872,11 @@ msgstr[0] "Päivitys on liian pitkä. Maksimipituus on %d merkkiä."
 msgstr[1] "Päivitys on liian pitkä. Maksimipituus on %d merkkiä."
 
 #. TRANS: Client error displayed when replying to a non-existing notice.
-#: actions/apistatusesupdate.php:284
 msgid "Parent notice not found."
 msgstr "Viestiä, johon vastataan, ei löytynyt."
 
 #. TRANS: Client error displayed exceeding the maximum notice length.
 #. TRANS: %d is the maximum lenth for a notice.
-#: actions/apistatusesupdate.php:308 actions/newnotice.php:184
 #, fuzzy, php-format
 msgid "Maximum notice size is %d character, including attachment URL."
 msgid_plural "Maximum notice size is %d characters, including attachment URL."
@@ -1155,13 +885,11 @@ msgstr[1] "Maksimikoko päivitykselle on %d merkkiä, mukaan lukien URL-osoite."
 
 #. TRANS: Client error displayed when requesting profiles of followers in an unsupported format.
 #. TRANS: Client error displayed when requesting IDs of followers in an unsupported format.
-#: actions/apisubscriptions.php:228 actions/apisubscriptions.php:258
 msgid "Unsupported format."
 msgstr "Formaattia ei ole tuettu."
 
 #. TRANS: Title for timeline of most recent favourite notices by a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname.
-#: actions/apitimelinefavorites.php:108
 #, php-format
 msgid "%1$s / Favorites from %2$s"
 msgstr "Käyttäjän %1$s päivitys %2$s"
@@ -1169,14 +897,12 @@ msgstr "Käyttäjän %1$s päivitys %2$s"
 #. TRANS: Subtitle for timeline of most recent favourite notices by a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user's full name,
 #. TRANS: %3$s is a user nickname.
-#: actions/apitimelinefavorites.php:120
 #, fuzzy, php-format
 msgid "%1$s updates favorited by %2$s / %3$s."
 msgstr "Käyttäjän %1$s suosikit palvelussa %2$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.
-#: actions/apitimelinementions.php:115
 #, php-format
 msgid "%1$s / Updates mentioning %2$s"
 msgstr "Käyttäjän %1$s päivitys %2$s"
@@ -1184,7 +910,6 @@ msgstr "Käyttäjän %1$s päivitys %2$s"
 #. TRANS: Subtitle for timeline of most recent mentions of a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname,
 #. TRANS: %3$s is a user's full name.
-#: actions/apitimelinementions.php:131
 #, php-format
 msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr ""
@@ -1192,29 +917,24 @@ msgstr ""
 
 #. TRANS: Title for site timeline. %s is the StatusNet sitename.
 #. TRANS: Public RSS feed title. %s is the StatusNet site name.
-#: actions/apitimelinepublic.php:193 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "%s julkinen aikajana"
 
 #. TRANS: Subtitle for site timeline. %s is the StatusNet sitename.
-#: actions/apitimelinepublic.php:199
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "Sivuston %s päivitykset kaikilta!"
 
 #. TRANS: Server error displayed calling unimplemented API method for 'retweeted by me'.
-#: actions/apitimelineretweetedbyme.php:71
 msgid "Unimplemented."
 msgstr "Toimintoa ei ole vielä toteutettu."
 
 #. TRANS: Title for Atom feed "repeated to me". %s is the user nickname.
-#: actions/apitimelineretweetedtome.php:96
 #, fuzzy, php-format
 msgid "Repeated to %s"
 msgstr "Vastaukset käyttäjälle %s"
 
-#: actions/apitimelineretweetedtome.php:98
 #, fuzzy, php-format
 msgid "%1$s notices that were to repeated to %2$s / %3$s."
 msgstr ""
@@ -1222,12 +942,10 @@ msgstr ""
 
 #. TRANS: Title of list of repeated notices of the logged in user.
 #. TRANS: %s is the nickname of the logged in user.
-#: actions/apitimelineretweetsofme.php:98
 #, fuzzy, php-format
 msgid "Repeats of %s"
 msgstr "Vastaukset käyttäjälle %s"
 
-#: actions/apitimelineretweetsofme.php:104
 #, fuzzy, php-format
 msgid "%1$s notices that %2$s / %3$s has repeated."
 msgstr "Lähetä sähköpostia, jos joku lisää päivitykseni suosikiksi."
@@ -1236,173 +954,140 @@ msgstr "Lähetä sähköpostia, jos joku lisää päivitykseni suosikiksi."
 #. TRANS: %s is the tag.
 #. TRANS: Title for first page of notices with tags.
 #. TRANS: %s is the tag.
-#: actions/apitimelinetag.php:101 actions/tag.php:69
 #, php-format
 msgid "Notices tagged with %s"
 msgstr "Päivitykset joilla on tagi %s"
 
 #. TRANS: Subtitle for timeline with lastest notices with a given tag.
 #. TRANS: %1$s is the tag, $2$s is the StatusNet sitename.
-#: actions/apitimelinetag.php:105 actions/tagrss.php:65
 #, php-format
 msgid "Updates tagged with %1$s on %2$s!"
 msgstr "Käyttäjän %1$s suosikit palvelussa %2$s!"
 
 #. TRANS: Client error displayed trying to add a notice to another user's timeline.
-#: actions/apitimelineuser.php:308
 #, fuzzy
 msgid "Only the user can add to their own timeline."
 msgstr "Vain käyttäjä voi lukea omaa postilaatikkoaan."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:315
 msgid "Only accept AtomPub for Atom feeds."
 msgstr "Atom-syötteistä tuetaan vain AtomPub-muotoa."
 
 #. TRANS: Client error displayed attempting to post an empty API notice.
-#: actions/apitimelineuser.php:322
 msgid "Atom post must not be empty."
 msgstr "Atom-viesti ei saa olla tyhjä."
 
 #. TRANS: Client error displayed attempting to post an API that is not well-formed XML.
-#: actions/apitimelineuser.php:328
 msgid "Atom post must be well-formed XML."
 msgstr "Atom-viestin XML-rakenteen tulee olla hyvin muodostettu."
 
 #. TRANS: Client error displayed when not using an Atom entry.
-#: actions/apitimelineuser.php:334 actions/atompubfavoritefeed.php:228
-#: actions/atompubmembershipfeed.php:230
-#: actions/atompubsubscriptionfeed.php:236
 msgid "Atom post must be an Atom entry."
 msgstr "Atom-viestin tulee olla Atom-kohteen muodossa."
 
 #. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
-#: actions/apitimelineuser.php:345
 msgid "Can only handle POST activities."
 msgstr "Vain POST-toiminnot ovat tuettuja."
 
 #. TRANS: Client error displayed when using an unsupported activity object type.
 #. TRANS: %s is the unsupported activity object type.
-#: actions/apitimelineuser.php:356
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr "Toiminto-objektityyppi \"%s\" ei ole tuettu."
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
 #. TRANS: %d is the notice ID (number).
-#: actions/apitimelineuser.php:390
 #, php-format
 msgid "No content for notice %d."
 msgstr "Päivityksen %d sisältö puuttuu."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
 #. TRANS: %s is the notice URI.
-#: actions/apitimelineuser.php:419
 #, fuzzy, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "Ei profiilia tuolla id:llä."
 
 #. TRANS: Server error for unfinished API method showTrends.
-#: actions/apitrends.php:85
 msgid "API method under construction."
 msgstr "API-metodi on työn alla!"
 
 #. TRANS: Client error displayed when requesting user information for a non-existing user.
-#: actions/apiuserprofileimage.php:80 actions/apiusershow.php:94
 msgid "User not found."
 msgstr "API-metodia ei löytynyt."
 
 #. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
 #. TRANS: Client exception.
 #. TRANS: Client error displayed trying to subscribe to a non-existing profile.
-#: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
-#: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
-#: actions/subscribe.php:110
 msgid "No such profile."
 msgstr "Profiilia ei löydy."
 
 #. TRANS: Subtitle for Atom favorites feed.
 #. TRANS: %1$s is a user nickname, %2$s is the StatusNet sitename.
-#: actions/atompubfavoritefeed.php:147
 #, fuzzy, php-format
 msgid "Notices %1$s has favorited on %2$s"
 msgstr "Käyttäjän %1$s ja kavereiden päivitykset palvelussa %2$s!"
 
 #. TRANS: Client exception thrown when trying to set a favorite for another user.
 #. TRANS: Client exception thrown when trying to subscribe another user.
-#: actions/atompubfavoritefeed.php:217 actions/atompubsubscriptionfeed.php:225
 #, fuzzy
 msgid "Cannot add someone else's subscription."
 msgstr "Ei voitu lisätä uutta tilausta."
 
 #. TRANS: Client exception thrown when trying use an incorrect activity verb for the Atom pub method.
-#: actions/atompubfavoritefeed.php:240
 msgid "Can only handle favorite activities."
 msgstr "Vain suosikiksimerkitsemistoimintoja tuetaan."
 
 #. TRANS: Client exception thrown when trying favorite an object that is not a notice.
-#: actions/atompubfavoritefeed.php:250 actions/atompubmembershipfeed.php:250
 msgid "Can only fave notices."
 msgstr "Vain päivityksiä voi merkitä suosikeiksi."
 
 #. TRANS: Client exception thrown when trying favorite a notice without content.
-#: actions/atompubfavoritefeed.php:259
 msgid "Unknown note."
 msgstr "Tuntematon päivitys."
 
 #. TRANS: Client exception thrown when trying favorite an already favorited notice.
-#: actions/atompubfavoritefeed.php:267
 msgid "Already a favorite."
 msgstr "Tämä päivitys on jo suosikkina."
 
 #. TRANS: Title for group membership feed.
 #. TRANS: %s is a username.
-#: actions/atompubmembershipfeed.php:144
 #, fuzzy, php-format
 msgid "%s group memberships"
 msgstr "Ryhmän %s jäsenet"
 
 #. TRANS: Subtitle for group membership feed.
 #. TRANS: %1$s is a username, %2$s is the StatusNet sitename.
-#: actions/atompubmembershipfeed.php:149
 #, php-format
 msgid "Groups %1$s is a member of on %2$s"
 msgstr "Ryhmät, joiden jäsen %1$s on palvelimella %2$s"
 
 #. TRANS: Client exception thrown when trying subscribe someone else to a group.
-#: actions/atompubmembershipfeed.php:219
 #, fuzzy
 msgid "Cannot add someone else's membership."
 msgstr "Ei voitu lisätä uutta tilausta."
 
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#: actions/atompubmembershipfeed.php:242
 msgid "Can only handle join activities."
 msgstr "Vain liittymistoimintoja tuetaan."
 
 #. TRANS: Client exception thrown when trying to subscribe to a non-existing group.
-#: actions/atompubmembershipfeed.php:259
 msgid "Unknown group."
 msgstr "Tuntematon ryhmä."
 
 #. TRANS: Client exception thrown when trying to subscribe to an already subscribed group.
-#: actions/atompubmembershipfeed.php:267
 msgid "Already a member."
 msgstr "Olet jo ryhmän jäsen."
 
 #. TRANS: Client exception thrown when trying to subscribe to group while blocked from that group.
-#: actions/atompubmembershipfeed.php:275
 msgid "Blocked by admin."
 msgstr "Ylläpitäjä esti toiminnon."
 
 #. TRANS: Client exception thrown when referencing a non-existing favorite.
-#: actions/atompubshowfavorite.php:90
 msgid "No such favorite."
 msgstr "Suosikkia ei ole."
 
 #. TRANS: Client exception thrown when trying to remove a favorite notice of another user.
-#: actions/atompubshowfavorite.php:151
 msgid "Cannot delete someone else's favorite."
 msgstr "Et voi poistaa jonkin toisen käyttäjän suosikkia."
 
@@ -1428,92 +1113,67 @@ msgstr "Et voi poistaa jonkin toisen käyttäjän suosikkia."
 #. TRANS: Client error displayed when trying to join a non-existing group.
 #. TRANS: Client error displayed when trying to leave a non-local group.
 #. TRANS: Client error displayed when trying to leave a non-existing group.
+#. TRANS: Client error displayed when providing an invalid group ID on the Make Admin page.
 #. 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.
 #. TRANS: Command exception text shown when a group is requested that does not exist.
 #. TRANS: Error text shown when trying to leave a group that does not exist.
-#: actions/atompubshowmembership.php:81 actions/blockedfromgroup.php:81
-#: actions/blockedfromgroup.php:89 actions/deletegroup.php:87
-#: actions/deletegroup.php:100 actions/editgroup.php:102
-#: actions/foafgroup.php:46 actions/foafgroup.php:65 actions/foafgroup.php:73
-#: actions/groupblock.php:89 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:101 actions/grouplogo.php:103
-#: actions/groupmembers.php:84 actions/groupmembers.php:92
-#: actions/grouprss.php:97 actions/grouprss.php:105
-#: actions/groupunblock.php:89 actions/joingroup.php:82
-#: actions/joingroup.php:95 actions/leavegroup.php:82
-#: actions/leavegroup.php:95 actions/makeadmin.php:86
-#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:392
 msgid "No such group."
 msgstr "Tuota ryhmää ei ole."
 
 #. TRANS: Client exception thrown when trying to show membership of a non-subscribed group
-#: actions/atompubshowmembership.php:91
 msgid "Not a member."
 msgstr "Et ole jäsen."
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
-#: actions/atompubshowmembership.php:150
 #, fuzzy
 msgid "Cannot delete someone else's membership."
 msgstr "Tilausta ei onnistuttu tallentamaan."
 
 #. TRANS: Client exception thrown when trying to display a subscription for a non-existing profile ID.
 #. TRANS: %d is the non-existing profile ID number.
-#: actions/atompubshowsubscription.php:72
-#: actions/atompubshowsubscription.php:83
-#: actions/atompubsubscriptionfeed.php:74
 #, php-format
 msgid "No such profile id: %d."
 msgstr "Ei profiilia tällä tunnuksella: %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.
-#: actions/atompubshowsubscription.php:94
 #, fuzzy, php-format
 msgid "Profile %1$d not subscribed to profile %2$d."
 msgstr "Et ole tilannut tämän käyttäjän päivityksiä."
 
 #. TRANS: Client exception thrown when trying to delete a subscription of another user.
-#: actions/atompubshowsubscription.php:157
 #, fuzzy
 msgid "Cannot delete someone else's subscription."
 msgstr "Tilausta ei onnistuttu tallentamaan."
 
 #. TRANS: Subtitle for Atom subscription feed.
 #. TRANS: %1$s is a user nickname, %s$s is the StatusNet sitename.
-#: actions/atompubsubscriptionfeed.php:153
 #, fuzzy, php-format
 msgid "People %1$s has subscribed to on %2$s"
 msgstr "Ihmiset jotka ovat käyttäjän %s tilaajia"
 
 #. TRANS: Client error displayed when not using the follow verb.
-#: actions/atompubsubscriptionfeed.php:248
 msgid "Can only handle Follow activities."
 msgstr "Vain seuraustoimintoja tuetaan."
 
 #. TRANS: Client exception thrown when subscribing to an object that is not a person.
-#: actions/atompubsubscriptionfeed.php:256
 msgid "Can only follow people."
 msgstr "Vain henkilöitä voi seurata."
 
 #. TRANS: Client exception thrown when subscribing to a non-existing profile.
 #. TRANS: %s is the unknown profile ID.
-#: actions/atompubsubscriptionfeed.php:267
 #, fuzzy, php-format
 msgid "Unknown profile %s."
 msgstr "Tunnistamaton tiedoston tyyppi"
 
 #. TRANS: Client error displayed trying to subscribe to an already subscribed profile.
 #. TRANS: %s is the profile the user already has a subscription on.
-#: actions/atompubsubscriptionfeed.php:275
 #, fuzzy, php-format
 msgid "Already subscribed to %s."
 msgstr "Ei ole tilattu!."
 
 #. TRANS: Client error displayed trying to get a non-existing attachment.
-#: actions/attachment.php:73
 msgid "No such attachment."
 msgstr "Liitettä ei ole."
 
@@ -1525,31 +1185,23 @@ msgstr "Liitettä ei ole."
 #. TRANS: Client error displayed when trying to view group members without providing a group nickname.
 #. TRANS: Client error displayed when requesting a group RSS feed without providing a group nickname.
 #. TRANS: Client error displayed if no nickname argument was given requesting a group page.
-#: actions/avatarbynickname.php:60 actions/blockedfromgroup.php:73
-#: actions/editgroup.php:85 actions/groupdesignsettings.php:84
-#: actions/grouplogo.php:86 actions/groupmembers.php:76
-#: actions/grouprss.php:89 actions/showgroup.php:116
 msgid "No nickname."
 msgstr "Tunnusta ei ole."
 
 #. TRANS: Client error displayed trying to get an avatar without providing an avatar size.
-#: actions/avatarbynickname.php:66
 msgid "No size."
 msgstr "Kokoa ei ole."
 
 #. TRANS: Client error displayed trying to get an avatar providing an invalid avatar size.
-#: actions/avatarbynickname.php:72
 msgid "Invalid size."
 msgstr "Koko ei kelpaa."
 
 #. TRANS: Title for avatar upload page.
-#: actions/avatarsettings.php:66 lib/settingsnav.php:82
 msgid "Avatar"
 msgstr "Kuva"
 
 #. TRANS: Instruction for avatar upload page.
 #. TRANS: %s is the maximum file size, for example "500b", "10kB" or "2MB".
-#: actions/avatarsettings.php:78
 #, php-format
 msgid "You can upload your personal avatar. The maximum file size is %s."
 msgstr "Voit ladata oman profiilikuvasi. Maksimikoko on %s."
@@ -1558,17 +1210,12 @@ msgstr "Voit ladata oman profiilikuvasi. Maksimikoko on %s."
 #. TRANS: Server error displayed coming across a request from a user without a profile.
 #. TRANS: Server error displayed when trying to authorise a remote subscription request
 #. TRANS: while the user has no profile.
-#: actions/avatarsettings.php:108 actions/avatarsettings.php:192
-#: actions/grouplogo.php:184 actions/remotesubscribe.php:190
-#: actions/userauthorization.php:75 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr "Käyttäjällä ei ole profiilia."
 
 #. TRANS: Avatar upload page form legend.
 #. TRANS: Avatar upload page crop form legend.
 #. TRANS: Legend for group logo settings fieldset.
-#: actions/avatarsettings.php:122 actions/avatarsettings.php:205
-#: actions/grouplogo.php:261
 msgid "Avatar settings"
 msgstr "Profiilikuva-asetukset"
 
@@ -1576,8 +1223,6 @@ msgstr "Profiilikuva-asetukset"
 #. TRANS: Header on avatar upload crop form for thumbnail of originally uploaded avatar (h2).
 #. TRANS: Uploaded original file in group logo form.
 #. TRANS: Header for originally uploaded file before a crop on the group logo page.
-#: actions/avatarsettings.php:131 actions/avatarsettings.php:214
-#: actions/grouplogo.php:207 actions/grouplogo.php:270
 msgid "Original"
 msgstr "Alkuperäinen"
 
@@ -1585,81 +1230,66 @@ msgstr "Alkuperäinen"
 #. TRANS: Header on avatar upload crop form for thumbnail of to be used rendition of uploaded avatar (h2).
 #. TRANS: Header for preview of to be displayed group logo.
 #. TRANS: Header for the cropped group logo on the group logo page.
-#: actions/avatarsettings.php:147 actions/avatarsettings.php:227
-#: actions/grouplogo.php:219 actions/grouplogo.php:283
 msgid "Preview"
 msgstr "Esikatselu"
 
 #. TRANS: Button on avatar upload page to delete current avatar.
 #. TRANS: Button text for user account deletion.
-#: actions/avatarsettings.php:155 actions/deleteaccount.php:319
 msgctxt "BUTTON"
 msgid "Delete"
 msgstr "Poista"
 
 #. TRANS: Button on avatar upload page to upload an avatar.
 #. TRANS: Submit button to confirm upload of a user backup file for account restore.
-#: actions/avatarsettings.php:173 actions/restoreaccount.php:369
 msgctxt "BUTTON"
 msgid "Upload"
 msgstr "Lataa"
 
 #. TRANS: Button on avatar upload crop form to confirm a selected crop as avatar.
-#: actions/avatarsettings.php:243
 msgctxt "BUTTON"
 msgid "Crop"
 msgstr "Rajaa"
 
 #. TRANS: Validation error on avatar upload form when no file was uploaded.
-#: actions/avatarsettings.php:318
 #, fuzzy
 msgid "No file uploaded."
 msgstr "Profiilia ei ole määritelty."
 
 #. TRANS: Avatar upload form instruction after uploading a file.
-#: actions/avatarsettings.php:345
 msgid "Pick a square area of the image to be your avatar."
 msgstr "Valitse neliön muotoinen alue kuvasta profiilikuvaksi."
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
 #. TRANS: Server error displayed trying to crop an uploaded group logo that is no longer present.
-#: actions/avatarsettings.php:360 actions/grouplogo.php:391
 msgid "Lost our file data."
 msgstr "Tiedoston data hävisi."
 
 #. TRANS: Success message for having updated a user avatar.
-#: actions/avatarsettings.php:384
 msgid "Avatar updated."
 msgstr "Kuva päivitetty."
 
 #. TRANS: Error displayed on the avatar upload page if the avatar could not be updated for an unknown reason.
-#: actions/avatarsettings.php:388
 msgid "Failed updating avatar."
 msgstr "Profiilikuvan päivittäminen epäonnistui."
 
 #. TRANS: Success message for deleting a user avatar.
-#: actions/avatarsettings.php:412
 msgid "Avatar deleted."
 msgstr "Kuva poistettu."
 
 #. TRANS: Title for backup account page.
 #. TRANS: Option in profile settings to create a backup of the account of the currently logged in user.
-#: actions/backupaccount.php:61 actions/profilesettings.php:468
 msgid "Backup account"
 msgstr "Tilin varmuuskopiointi"
 
 #. TRANS: Client exception thrown when trying to backup an account while not logged in.
-#: actions/backupaccount.php:79
 msgid "Only logged-in users can backup their account."
 msgstr "Vain kirjautuneet käyttäjät voivat varmuuskopioida tilejään."
 
 #. TRANS: Client exception thrown when trying to backup an account without having backup rights.
-#: actions/backupaccount.php:84
 msgid "You may not backup your account."
 msgstr "Et voi varmuuskopioida käyttäjätiliäsi."
 
 #. TRANS: Information displayed on the backup account page.
-#: actions/backupaccount.php:227
 msgid ""
 "You can backup your account data in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format. This is an experimental feature and provides "
@@ -1674,30 +1304,25 @@ msgstr ""
 "lähetettyjä tiedostoja ja suoraviestejä ei varmuuskopioida."
 
 #. TRANS: Submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:250
 msgctxt "BUTTON"
 msgid "Backup"
 msgstr "Varmuuskopioi"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:254
 msgid "Backup your account."
 msgstr "Varmuuskopioi käyttäjätili"
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
-#: actions/block.php:68
 msgid "You already blocked that user."
 msgstr "!!FUZZZY!!Olet jos tilannut seuraavien käyttäjien päivitykset:"
 
 #. TRANS: Title for block user page.
 #. TRANS: Legend for block user form.
 #. TRANS: Fieldset legend for block user from group form.
-#: actions/block.php:106 actions/block.php:136 actions/groupblock.php:165
 msgid "Block user"
 msgstr "Estä käyttäjä"
 
 #. TRANS: Explanation of consequences when blocking a user on the block user page.
-#: actions/block.php:139
 msgid ""
 "Are you sure you want to block this user? Afterwards, they will be "
 "unsubscribed from you, unable to subscribe to you in the future, and you "
@@ -1713,15 +1338,11 @@ msgstr ""
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:154 actions/deleteapplication.php:157
-#: actions/deletegroup.php:220 actions/deletenotice.php:155
-#: actions/deleteuser.php:154 actions/groupblock.php:187
 msgctxt "BUTTON"
 msgid "No"
 msgstr "Ei"
 
 #. TRANS: Submit button title for 'No' when blocking a user.
-#: actions/block.php:158
 msgid "Do not block this user."
 msgstr "Älä estä tätä käyttäjää."
 
@@ -1731,175 +1352,139 @@ msgstr "Älä estä tätä käyttäjää."
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:161 actions/deleteapplication.php:164
-#: actions/deletegroup.php:227 actions/deletenotice.php:162
-#: actions/deleteuser.php:161 actions/groupblock.php:194
 msgctxt "BUTTON"
 msgid "Yes"
 msgstr "Kyllä"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:165
 msgid "Block this user."
 msgstr "Estä tämä käyttäjä."
 
 #. TRANS: Server error displayed when blocking a user fails.
-#: actions/block.php:189
 msgid "Failed to save block information."
 msgstr "Käyttäjän estotiedon tallennus epäonnistui."
 
 #. TRANS: Title for first page with list of users blocked from a group.
 #. TRANS: %s is a group nickname.
-#: actions/blockedfromgroup.php:101
 #, php-format
 msgid "%s blocked profiles"
 msgstr "Ryhmän %s estetyt profiilit"
 
 #. TRANS: Title for any but the first page with list of users blocked from a group.
 #. TRANS: %1$s is a group nickname, %2$d is a page number.
-#: actions/blockedfromgroup.php:106
 #, php-format
 msgid "%1$s blocked profiles, page %2$d"
 msgstr "Ryhmän %1$s estetyt profiilit, sivu %2$d"
 
 #. TRANS: Instructions for list of users blocked from a group.
-#: actions/blockedfromgroup.php:122
 msgid "A list of the users blocked from joining this group."
 msgstr "Lista käyttäjistä, jotka ovat estetty liittymästä tähän ryhmään."
 
 #. TRANS: Form legend for unblocking a user from a group.
-#: actions/blockedfromgroup.php:291
 msgid "Unblock user from group"
 msgstr "Poista käyttäjän esto ryhmästä"
 
 #. TRANS: Button text for unblocking a user from a group.
-#: actions/blockedfromgroup.php:323
 msgctxt "BUTTON"
 msgid "Unblock"
 msgstr "Poista esto"
 
 #. TRANS: Tooltip for button for unblocking a user from a group.
 #. TRANS: Description of the form to unblock a user.
-#: actions/blockedfromgroup.php:327 lib/unblockform.php:78
 msgid "Unblock this user"
 msgstr "Poista esto tältä käyttäjältä"
 
 #. TRANS: Title for mini-posting window loaded from bookmarklet.
 #. TRANS: %s is the StatusNet site name.
-#: actions/bookmarklet.php:51
 #, php-format
 msgid "Post to %s"
 msgstr "Vastaukset käyttäjälle %s"
 
 #. TRANS: Client error displayed when not providing a confirmation code in the contact address confirmation action.
-#: actions/confirmaddress.php:74
 msgid "No confirmation code."
 msgstr "Varmistuskoodia ei ole annettu."
 
 #. TRANS: Client error displayed when providing a non-existing confirmation code in the contact address confirmation action.
-#: actions/confirmaddress.php:80
 msgid "Confirmation code not found."
 msgstr "Vahvistuskoodia ei löytynyt."
 
 #. TRANS: Client error displayed when not providing a confirmation code for another user in the contact address confirmation action.
-#: actions/confirmaddress.php:86
 msgid "That confirmation code is not for you!"
 msgstr "Tämä vahvistuskoodi ei ole sinun!"
 
 #. TRANS: Server error for an unknown address type, which can be 'email', 'sms', or the name of an IM network (such as 'xmpp' or 'aim')
-#: actions/confirmaddress.php:94
-#, fuzzy, php-format
+#, php-format
 msgid "Unrecognized address type %s"
 msgstr "Tuntematon osoitetyyppi %s "
 
 #. TRANS: Client error for an already confirmed email/jabber/sms address.
-#: actions/confirmaddress.php:103 actions/confirmaddress.php:136
 msgid "That address has already been confirmed."
 msgstr "Tämä osoite on jo vahvistettu."
 
-#: actions/confirmaddress.php:121 actions/imsettings.php:444
-#: actions/userdesignsettings.php:306
-#, fuzzy
 msgid "Couldn't update user."
 msgstr "Käyttäjän päivitys epäonnistui."
 
-#: actions/confirmaddress.php:144
 #, fuzzy
 msgid "Couldn't update user im preferences."
 msgstr "Ei voitu päivittää käyttäjätietoja."
 
-#: actions/confirmaddress.php:156
 #, fuzzy
 msgid "Couldn't insert user im preferences."
 msgstr "Ei voitu lisätä uutta tilausta."
 
 #. TRANS: Server error displayed when an address confirmation code deletion from the
 #. TRANS: database fails in the contact address confirmation action.
-#: actions/confirmaddress.php:169
 msgid "Could not delete address confirmation."
 msgstr "Osoitteen vahvistusta ei voitu poistaa."
 
 #. TRANS: Title for the contact address confirmation action.
-#: actions/confirmaddress.php:185
 msgid "Confirm address"
 msgstr "Tämän hetken vahvistettu sähköpostiosoite."
 
 #. TRANS: Success message for the contact address confirmation action.
 #. TRANS: %s can be 'email', 'jabber', or 'sms'.
-#: actions/confirmaddress.php:200
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "Osoite \"%s\" on vahvistettu sinun käyttäjätunnuksellesi."
 
 #. TRANS: Title for page with a conversion (multiple notices in context).
-#: actions/conversation.php:96
 msgid "Conversation"
 msgstr "Keskustelu"
 
 #. TRANS: Header on conversation page. Hidden by default (h2).
 #. TRANS: Label for user statistics.
-#: actions/conversation.php:149 lib/noticelist.php:87
-#: lib/profileaction.php:246 lib/searchgroupnav.php:82
-#: lib/threadednoticelist.php:66
 msgid "Notices"
 msgstr "Päivitykset"
 
 #. TRANS: Client exception displayed trying to delete a user account while not logged in.
-#: actions/deleteaccount.php:71
 #, fuzzy
 msgid "Only logged-in users can delete their account."
 msgstr "Vain käyttäjä voi lukea omaa postilaatikkoaan."
 
 #. TRANS: Client exception displayed trying to delete a user account without have the rights to do that.
-#: actions/deleteaccount.php:77
 msgid "You cannot delete your account."
 msgstr "Sinä et voi poistaa käyttäjätiliäsi."
 
 #. TRANS: Confirmation text for user deletion. The user has to type this exactly the same, including punctuation.
-#: actions/deleteaccount.php:160 actions/deleteaccount.php:297
 msgid "I am sure."
 msgstr "Olen varma."
 
 #. TRANS: Notification for user about the text that must be input to be able to delete a user account.
 #. TRANS: %s is the text that needs to be input.
-#: actions/deleteaccount.php:164
 #, php-format
 msgid "You must write \"%s\" exactly in the box."
 msgstr "Kirjoita \"%s\" laatikkoon. Tekstien täytyy vastata toisiaan."
 
 #. TRANS: Confirmation that a user account has been deleted.
-#: actions/deleteaccount.php:206
 msgid "Account deleted."
 msgstr "Käyttäjätili poistettu."
 
 #. TRANS: Page title for page on which a user account can be deleted.
 #. TRANS: Option in profile settings to delete the account of the currently logged in user.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:476
 msgid "Delete account"
 msgstr "Poista käyttäjätili"
 
 #. TRANS: Form text for user deletion form.
-#: actions/deleteaccount.php:279
 msgid ""
 "This will <strong>permanently delete</strong> your account data from this "
 "server."
@@ -1909,7 +1494,6 @@ msgstr ""
 
 #. TRANS: Additional form text for user deletion form shown if a user has account backup rights.
 #. TRANS: %s is a URL to the backup page.
-#: actions/deleteaccount.php:285
 #, php-format
 msgid ""
 "You are strongly advised to <a href=\"%s\">back up your data</a> before "
@@ -1920,55 +1504,42 @@ msgstr ""
 
 #. TRANS: Field label for delete account confirmation entry.
 #. TRANS: Field label for password reset form where the password has to be typed again.
-#: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:262 actions/register.php:419
 msgid "Confirm"
 msgstr "Vahvista"
 
 #. TRANS: Input title for the delete account field.
 #. TRANS: %s is the text that needs to be input.
-#: actions/deleteaccount.php:304
 #, php-format
 msgid "Enter \"%s\" to confirm that you want to delete your account."
 msgstr "Anna \"%s\" varmistaaksesi että haluat todella poistaa käyttäjätilisi."
 
 #. TRANS: Button title for user account deletion.
-#: actions/deleteaccount.php:323
 msgid "Permanently delete your account"
 msgstr "Poista käyttäjätilisi lopullisesti"
 
 #. TRANS: Client error displayed trying to delete an application while not logged in.
-#: actions/deleteapplication.php:62
 msgid "You must be logged in to delete an application."
 msgstr "Sinun pitää olla kirjautunut sisään, jotta voit erota ryhmästä."
 
 #. TRANS: Client error displayed trying to delete an application that does not exist.
-#: actions/deleteapplication.php:71
 msgid "Application not found."
 msgstr "Vahvistuskoodia ei löytynyt."
 
 #. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
-#: actions/deleteapplication.php:79 actions/editapplication.php:78
-#: actions/showapplication.php:90
 msgid "You are not the owner of this application."
 msgstr "Et ole tämän sovelluksen omistaja."
 
 #. TRANS: Client error text when there is a problem with the session token.
-#: actions/deleteapplication.php:102 actions/editapplication.php:131
-#: actions/newapplication.php:112 actions/showapplication.php:113
-#: lib/action.php:1391
 msgid "There was a problem with your session token."
 msgstr "Istuntoavaimesi kanssa oli ongelma."
 
 #. TRANS: Title for delete application page.
 #. TRANS: Fieldset legend on delete application page.
-#: actions/deleteapplication.php:124 actions/deleteapplication.php:149
 msgid "Delete application"
 msgstr "Poista sovellus"
 
 #. TRANS: Confirmation text on delete application page.
-#: actions/deleteapplication.php:152
 msgid ""
 "Are you sure you want to delete this application? This will clear all data "
 "about the application from the database, including all existing user "
@@ -1979,56 +1550,46 @@ msgstr ""
 "yhteydet käyttäjätileihin."
 
 #. TRANS: Submit button title for 'No' when deleting an application.
-#: actions/deleteapplication.php:161
 msgid "Do not delete this application."
 msgstr "Älä poista tätä sovellusta."
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
-#: actions/deleteapplication.php:167
 msgid "Delete this application."
 msgstr "Poista tämä sovellus."
 
 #. TRANS: Client error when trying to delete group while not logged in.
-#: actions/deletegroup.php:64
 msgid "You must be logged in to delete a group."
 msgstr "Sinun pitää olla kirjautunut sisään, jotta voit poistaa ryhmän."
 
 #. TRANS: Client error when trying to delete a group without providing a nickname or ID for the group.
 #. TRANS: Client error displayed when trying to join a group without providing a group name or group ID.
 #. TRANS: Client error displayed when trying to leave a group without providing a group name or group ID.
-#: actions/deletegroup.php:94 actions/joingroup.php:89
-#: actions/leavegroup.php:89
 msgid "No nickname or ID."
 msgstr "Tunnusta tai ID:tä ei ole."
 
 #. TRANS: Client error when trying to delete a group without having the rights to delete it.
-#: actions/deletegroup.php:107
 #, fuzzy
 msgid "You are not allowed to delete this group."
 msgstr "Sinä et kuulu tähän ryhmään."
 
 #. TRANS: Server error displayed if a group could not be deleted.
 #. TRANS: %s is the name of the group that could not be deleted.
-#: actions/deletegroup.php:150
 #, fuzzy, php-format
 msgid "Could not delete group %s."
 msgstr "Ei voitu päivittää ryhmää."
 
 #. TRANS: Message given after deleting a group.
 #. TRANS: %s is the deleted group's name.
-#: actions/deletegroup.php:159
 #, php-format
 msgid "Deleted group %s"
 msgstr "Ryhmä %s poistettu"
 
 #. TRANS: Title of delete group page.
 #. TRANS: Form legend for deleting a group.
-#: actions/deletegroup.php:176 actions/deletegroup.php:202
 msgid "Delete group"
 msgstr "Poista ryhmä"
 
 #. TRANS: Warning in form for deleleting a group.
-#: actions/deletegroup.php:206
 msgid ""
 "Are you sure you want to delete this group? This will clear all data about "
 "the group from the database, without a backup. Public posts to this group "
@@ -2039,12 +1600,10 @@ msgstr ""
 "päivitykset näkyvät edelleen käyttäjien omilla aikajanoilla."
 
 #. TRANS: Submit button title for 'No' when deleting a group.
-#: actions/deletegroup.php:224
 msgid "Do not delete this group."
 msgstr "Älä poista tätä ryhmää."
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
-#: actions/deletegroup.php:231
 msgid "Delete this group."
 msgstr "Poista tämä ryhmä."
 
@@ -2054,22 +1613,18 @@ msgstr "Poista tämä ryhmä."
 #. TRANS: Client error displayed trying to block a user from a group while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying to log out when not logged in.
+#. TRANS: Client error displayed when trying to access the "make admin" page while not logged in.
+#. TRANS: Client error displayed trying to create a new direct message while not logged in.
+#. TRANS: Client error displayed trying to send a notice while not logged in.
+#. TRANS: Client error displayed trying to nudge a user without being logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
 #. TRANS: Client error displayed when trying to change user options while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
-#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:70
-#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
-#: actions/nudge.php:63 actions/pluginenable.php:97 actions/subedit.php:33
-#: actions/subscribe.php:98 actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:71 lib/profileformaction.php:63
-#: lib/settingsaction.php:72
 msgid "Not logged in."
 msgstr "Et ole kirjautunut sisään."
 
 #. TRANS: Instructions for deleting a notice.
-#: actions/deletenotice.php:110
 msgid ""
 "You are about to permanently delete a notice. Once this is done, it cannot "
 "be undone."
@@ -2079,48 +1634,39 @@ msgstr ""
 
 #. TRANS: Page title when deleting a notice.
 #. TRANS: Fieldset legend for the delete notice form.
-#: actions/deletenotice.php:117 actions/deletenotice.php:148
 msgid "Delete notice"
 msgstr "Poista päivitys"
 
 #. TRANS: Message for the delete notice form.
-#: actions/deletenotice.php:152
 msgid "Are you sure you want to delete this notice?"
 msgstr "Oletko varma että haluat poistaa tämän päivityksen?"
 
 #. TRANS: Submit button title for 'No' when deleting a notice.
-#: actions/deletenotice.php:159
 msgid "Do not delete this notice."
 msgstr "Älä poista tätä päivitystä."
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:166
 msgid "Delete this notice."
 msgstr "Poista tämä päivitys."
 
 #. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
-#: actions/deleteuser.php:66
 msgid "You cannot delete users."
 msgstr "Sinä et voi poistaa käyttäjiä."
 
 #. TRANS: Client error displayed when trying to delete a non-local user.
-#: actions/deleteuser.php:74
 msgid "You can only delete local users."
 msgstr "Sinä et voi poistaa käyttäjiä."
 
 #. TRANS: Title of delete user page.
-#: actions/deleteuser.php:110
 msgctxt "TITLE"
 msgid "Delete user"
 msgstr "Poista käyttäjä"
 
 #. TRANS: Fieldset legend on delete user page.
-#: actions/deleteuser.php:134
 msgid "Delete user"
 msgstr "Poista käyttäjä"
 
 #. TRANS: Information text to request if a user is certain that the described action has to be performed.
-#: actions/deleteuser.php:138
 msgid ""
 "Are you sure you want to delete this user? This will clear all data about "
 "the user from the database, without a backup."
@@ -2129,101 +1675,82 @@ msgstr ""
 "poistetaan tietokannasta, eikä varmuuskopiota tehdä."
 
 #. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/deleteuser.php:158
 #, fuzzy
 msgid "Do not delete this user."
 msgstr "Älä poista tätä päivitystä"
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
-#: actions/deleteuser.php:165
 msgid "Delete this user."
 msgstr "Poista tämä käyttäjä."
 
 #. TRANS: Message used as title for design settings for the site.
-#: actions/designadminpanel.php:60 lib/settingsnav.php:97
 msgid "Design"
 msgstr "Ulkoasu"
 
 #. TRANS: Instructions for design adminsitration panel.
-#: actions/designadminpanel.php:71
 msgid "Design settings for this StatusNet site"
 msgstr "Ulkoasuasetukset tälle StatusNet-sivustolle"
 
 #. TRANS: Client error displayed when a logo URL does is not valid.
-#: actions/designadminpanel.php:327
 #, fuzzy
 msgid "Invalid logo URL."
 msgstr "Koko ei kelpaa."
 
 #. TRANS: Client error displayed when an SSL logo URL is invalid.
-#: actions/designadminpanel.php:333
 #, fuzzy
 msgid "Invalid SSL logo URL."
 msgstr "Koko ei kelpaa."
 
 #. TRANS: Client error displayed when a theme is submitted through the form that is not in the theme list.
 #. TRANS: %s is the chosen unavailable theme.
-#: actions/designadminpanel.php:339
 #, php-format
 msgid "Theme not available: %s."
 msgstr "Teema ei ole käytettävissä: %s."
 
 #. TRANS: Fieldset legend for form to change logo.
-#: actions/designadminpanel.php:437
 msgid "Change logo"
 msgstr "Vaihda väriä"
 
 #. TRANS: Field label for StatusNet site logo.
-#: actions/designadminpanel.php:444
 msgid "Site logo"
 msgstr "Palvelun ilmoitus"
 
 #. TRANS: Field label for SSL StatusNet site logo.
-#: actions/designadminpanel.php:452
 msgid "SSL logo"
 msgstr "SSL-logo"
 
 #. TRANS: Fieldset legend for form change StatusNet site's theme.
-#: actions/designadminpanel.php:467
 msgid "Change theme"
 msgstr "Teeman vaihto"
 
 #. TRANS: Field label for dropdown to choose site theme.
-#: actions/designadminpanel.php:485
 msgid "Site theme"
 msgstr "Sivuston teema"
 
 #. TRANS: Title for field label for dropdown to choose site theme.
-#: actions/designadminpanel.php:487
 msgid "Theme for the site."
 msgstr "Teema sivustolle."
 
 #. TRANS: Field label for uploading a cutom theme.
-#: actions/designadminpanel.php:494
 #, fuzzy
 msgid "Custom theme"
 msgstr "Palvelun ilmoitus"
 
 #. TRANS: Form instructions for uploading a cutom StatusNet theme.
-#: actions/designadminpanel.php:499
 msgid "You can upload a custom StatusNet theme as a .ZIP archive."
 msgstr "Voit ladata mukautetun StatusNet-teeman .ZIP-pakettina."
 
 #. TRANS: Fieldset legend for theme background image.
-#: actions/designadminpanel.php:515
 msgid "Change background image"
 msgstr "Vaihda tautakuva"
 
 #. TRANS: Field label for background image on theme designer page.
 #. TRANS: Field label for background color selector.
 #. TRANS: Label on profile design page for setting a profile page background colour.
-#: actions/designadminpanel.php:525 actions/designadminpanel.php:609
-#: lib/designform.php:238
 msgid "Background"
 msgstr "Tausta"
 
 #. TRANS: Form guide for background image upload form on theme designer page.
-#: actions/designadminpanel.php:531
 #, php-format
 msgid ""
 "You can upload a background image for the site. The maximum file size is %1"
@@ -2231,199 +1758,164 @@ msgid ""
 msgstr "Voit ladata ryhmälle taustakuvan. Enimmäiskoko on %1$s."
 
 #. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:558
 msgid "On"
 msgstr "On"
 
 #. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:575
 msgid "Off"
 msgstr "Off"
 
 #. TRANS: Form guide for turning background image on or off on theme designer page.
 #. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
 #. TRANS: use of the uploaded profile image.
-#: actions/designadminpanel.php:577 lib/designform.php:214
 msgid "Turn background image on or off."
 msgstr "Kytke taustakuva päälle tai pois päältä."
 
 #. TRANS: Checkbox label to title background image on theme designer page.
 #. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-#: actions/designadminpanel.php:583 lib/designform.php:220
 msgid "Tile background image"
 msgstr "Taustakuvan toisto vierekkäin"
 
 #. TRANS: Fieldset legend for theme colors.
-#: actions/designadminpanel.php:598
 msgid "Change colors"
 msgstr "Vaihda värejä"
 
 #. TRANS: Field label for content color selector.
 #. TRANS: Label on profile design page for setting a profile page content colour.
-#: actions/designadminpanel.php:623 lib/designform.php:252
 msgid "Content"
 msgstr "Sisältö"
 
 #. TRANS: Field label for sidebar color selector.
 #. TRANS: Label on profile design page for setting a profile page sidebar colour.
-#: actions/designadminpanel.php:637 lib/designform.php:266
 msgid "Sidebar"
 msgstr "Sivupalkki"
 
 #. TRANS: Field label for text color selector.
 #. TRANS: Label on profile design page for setting a profile page text colour.
-#: actions/designadminpanel.php:651 lib/designform.php:280
 msgid "Text"
 msgstr "Teksti"
 
 #. TRANS: Field label for link color selector.
 #. TRANS: Label on profile design page for setting a profile page links colour.
-#: actions/designadminpanel.php:665 lib/designform.php:294
 msgid "Links"
 msgstr "Linkit"
 
 #. TRANS: Fieldset legend for advanced theme design settings.
-#: actions/designadminpanel.php:691
 msgid "Advanced"
 msgstr "Lisäasetukset"
 
 #. TRANS: Field label for custom CSS.
-#: actions/designadminpanel.php:696
 msgid "Custom CSS"
 msgstr "Mukautettu CSS"
 
 #. TRANS: Button text for resetting theme settings.
-#: actions/designadminpanel.php:718
 msgctxt "BUTTON"
 msgid "Use defaults"
 msgstr "Käytä oletusasetuksia"
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:720
 msgid "Restore default designs."
 msgstr "Palauta oletusulkonäkö."
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:728
 msgid "Reset back to default."
 msgstr "Palauta oletusulkoasu."
 
 #. TRANS: Title for button for saving theme settings.
-#: actions/designadminpanel.php:736
 msgid "Save design."
 msgstr "Tallenna ulkoasu."
 
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
-#: actions/disfavor.php:83
 msgid "This notice is not a favorite!"
 msgstr "Tämä päivitys ei ole suosikki!"
 
 #. TRANS: Title for page on which favorites can be added.
-#: actions/disfavor.php:98
 msgid "Add to favorites"
 msgstr "Lisää suosikkeihin"
 
 #. TRANS: Client exception thrown when requesting a document from the documentation that does not exist.
 #. TRANS: %s is the non-existing document.
-#: actions/doc.php:155
 #, php-format
 msgid "No such document \"%s\"."
 msgstr "Dokumenttia \"%s\" ei ole."
 
 #. TRANS: Title for "Edit application" form.
 #. TRANS: Form legend.
-#: actions/editapplication.php:54 lib/applicationeditform.php:129
 msgid "Edit application"
 msgstr "Muokkaa sovellusta"
 
 #. TRANS: Client error displayed trying to edit an application while not logged in.
-#: actions/editapplication.php:66
 #, fuzzy
 msgid "You must be logged in to edit an application."
 msgstr ""
 "Sinun pitää olla kirjautunut sisään, jotta voit muuttaa ryhmän tietoja."
 
 #. TRANS: Client error displayed trying to edit an application that does not exist.
-#: actions/editapplication.php:83 actions/showapplication.php:83
 msgid "No such application."
 msgstr "Sovellusta ei ole."
 
 #. TRANS: Instructions for "Edit application" form.
-#: actions/editapplication.php:167
 msgid "Use this form to edit your application."
 msgstr "Käytä tätä lomaketta muokataksesi sovellustasi."
 
 #. TRANS: Validation error shown when not providing a name in the "Edit application" form.
 #. TRANS: Validation error shown when not providing a name in the "New application" form.
-#: actions/editapplication.php:184 actions/newapplication.php:164
 msgid "Name is required."
 msgstr "Nimi on pakollinen."
 
 #. 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.
-#: actions/editapplication.php:188 actions/newapplication.php:172
 msgid "Name is too long (maximum 255 characters)."
 msgstr "Nimi on liian pitkä (enintään 255 merkkiä)."
 
 #. TRANS: Validation error shown when providing a name for an application that already exists in the "Edit application" form.
 #. TRANS: Validation error shown when providing a name for an application that already exists in the "New application" form.
-#: actions/editapplication.php:192 actions/newapplication.php:168
 msgid "Name already in use. Try another one."
 msgstr "Nimi on jo käytössä. Kokeile jotain muuta nimeä."
 
 #. TRANS: Validation error shown when not providing a description in the "Edit application" form.
 #. TRANS: Validation error shown when not providing a description in the "New application" form.
-#: actions/editapplication.php:196 actions/newapplication.php:176
 msgid "Description is required."
 msgstr "Kuvaus on pakollinen."
 
 #. TRANS: Validation error shown when providing too long a source URL in the "Edit application" form.
-#: actions/editapplication.php:209
 msgid "Source URL is too long."
 msgstr "Osoite on liian pitkä."
 
 #. TRANS: Validation error shown when providing an invalid source URL in the "Edit application" form.
 #. TRANS: Validation error shown when providing an invalid source URL in the "New application" form.
-#: actions/editapplication.php:216 actions/newapplication.php:199
 msgid "Source URL is not valid."
 msgstr "Lähde-URL ei ole oikeassa muodossa."
 
 #. 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.
-#: actions/editapplication.php:220 actions/newapplication.php:203
 msgid "Organization is required."
 msgstr "Organisaatio on pakollinen."
 
 #. TRANS: Validation error shown when providing too long an arganisation name in the "Edit application" form.
-#: actions/editapplication.php:224 actions/newapplication.php:207
 msgid "Organization is too long (maximum 255 characters)."
 msgstr "Organisaation nimi on liian pitkä (max 255 merkkiä)."
 
 #. TRANS: Form validation error show when an organisation name has not been provided in the edit application form.
 #. TRANS: Form validation error show when an organisation name has not been provided in the new application form.
-#: actions/editapplication.php:228 actions/newapplication.php:211
 msgid "Organization homepage is required."
 msgstr "Organisaation kotisivu on pakollinen."
 
 #. TRANS: Validation error shown when providing too long a callback URL in the "Edit application" form.
 #. TRANS: Validation error shown when providing too long a callback URL in the "New application" form.
-#: actions/editapplication.php:239 actions/newapplication.php:225
 msgid "Callback is too long."
 msgstr ""
 
 #. TRANS: Validation error shown when providing an invalid callback URL in the "Edit application" form.
 #. TRANS: Validation error shown when providing an invalid callback URL in the "New application" form.
-#: actions/editapplication.php:247 actions/newapplication.php:235
 msgid "Callback URL is not valid."
 msgstr ""
 
 #. TRANS: Server error occuring when an application could not be updated from the "Edit application" form.
-#: actions/editapplication.php:284
 msgid "Could not update application."
 msgstr "Ei voitu päivittää sovellusta."
 
 #. TRANS: Title for form to edit a group. %s is a group nickname.
-#: actions/editgroup.php:55
 #, php-format
 msgid "Edit %s group"
 msgstr "Muokkaa ryhmää %s"
@@ -2431,40 +1923,40 @@ msgstr "Muokkaa ryhmää %s"
 #. TRANS: Client error displayed trying to edit a group while not logged in.
 #. TRANS: Client error displayed when trying to create a group while not logged in.
 #. TRANS: Client error displayed trying to create a group while not logged in.
-#: actions/editgroup.php:68 actions/grouplogo.php:69 actions/newgroup.php:65
 msgid "You must be logged in to create a group."
 msgstr "Sinun pitää olla kirjautunut sisään jotta voit luoda ryhmän."
 
 #. TRANS: Form instructions for group edit form.
-#: actions/editgroup.php:161
 msgid "Use this form to edit the group."
 msgstr "Käytä tätä lomaketta muokataksesi ryhmää."
 
+#. TRANS: Group edit form validation error.
+#. TRANS: Group create form validation error.
+#. TRANS: %s is the invalid alias.
+#, php-format
+msgid "Invalid alias: \"%s\""
+msgstr "Virheellinen alias: \"%s\""
+
 #. TRANS: Group edit form success message.
-#: actions/editgroup.php:301
 msgid "Options saved."
 msgstr "Asetukset tallennettu."
 
 #. TRANS: Title for e-mail settings.
-#: actions/emailsettings.php:60
 msgid "Email settings"
 msgstr "Profiiliasetukset"
 
 #. TRANS: E-mail settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/emailsettings.php:74
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 msgstr "Määritä miten saat sähköpostin palvelusta %%site.name%%."
 
 #. TRANS: Form legend for e-mail settings form.
 #. TRANS: Field label for e-mail address input in e-mail settings form.
-#: actions/emailsettings.php:104 actions/emailsettings.php:130
 msgid "Email address"
 msgstr "Sähköpostiosoite"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:110
 msgid "Current confirmed email address."
 msgstr "Tämän hetken vahvistettu sähköpostiosoite."
 
@@ -2473,15 +1965,11 @@ msgstr "Tämän hetken vahvistettu sähköpostiosoite."
 #. TRANS: Button label to remove a confirmed IM address.
 #. TRANS: Button label to remove a confirmed SMS address.
 #. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
-#: actions/emailsettings.php:113 actions/emailsettings.php:180
-#: actions/imsettings.php:119 actions/smssettings.php:119
-#: actions/smssettings.php:175
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Poista"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:120
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -2495,46 +1983,38 @@ msgstr ""
 #. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
 #. TRANS: Any other domain may be owned by a legitimate person or
 #. TRANS: organization.
-#: actions/emailsettings.php:137
 msgid "Email address, like \"UserName@example.org\""
 msgstr "Sähköpostiosoite, esimerkiksi \"käyttäjätunnus@example.org\""
 
 #. TRANS: Button label for adding an e-mail address in e-mail settings form.
 #. TRANS: Button label for adding an IM address in IM settings form.
 #. TRANS: Button label for adding a SMS phone number in SMS settings form.
-#: actions/emailsettings.php:141 actions/imsettings.php:147
-#: actions/smssettings.php:157
 msgctxt "BUTTON"
 msgid "Add"
 msgstr "Lisää"
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:149 actions/smssettings.php:166
 msgid "Incoming email"
 msgstr "Saapuva sähköposti"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:155
 msgid "I want to post notices by email."
 msgstr "Haluan lähettää päivityksiä sähköpostilla."
 
 #. TRANS: Form instructions for incoming e-mail form in e-mail settings.
 #. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
-#: actions/emailsettings.php:177 actions/smssettings.php:173
 msgid "Send email to this address to post new notices."
 msgstr "Lähetä sähköpostia tähän osoitteeseen tehdäksesi päivityksiä."
 
 #. TRANS: Instructions for incoming e-mail address input form, when an address has already been assigned.
 #. TRANS: Instructions for incoming SMS e-mail address input form.
-#: actions/emailsettings.php:186 actions/smssettings.php:181
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr ""
 "Tee uusi sähköpostiosoite johon lähettää päivityksiä; tämä poistaa vanhan "
 "osoitteen"
 
 #. TRANS: Instructions for incoming e-mail address input form.
-#: actions/emailsettings.php:190
 msgid ""
 "To send notices via email, we need to create a unique email address for you "
 "on this server:"
@@ -2544,89 +2024,71 @@ msgstr ""
 
 #. TRANS: Button label for adding an e-mail address to send notices from.
 #. TRANS: Button label for adding an SMS e-mail address to send notices from.
-#: actions/emailsettings.php:196 actions/smssettings.php:184
 msgctxt "BUTTON"
 msgid "New"
 msgstr "Uusi"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:205
 msgid "Email preferences"
 msgstr "Sähköpostiosoitteet"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:213
 msgid "Send me notices of new subscriptions through email."
 msgstr "Lähetä sähköpostilla tieto uusista tilaajista."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:219
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr "Lähetä sähköpostia, jos joku lisää päivitykseni suosikiksi."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:226
 msgid "Send me email when someone sends me a private message."
 msgstr "Lähetä sähköpostia, jos joku lähettää minulle yksityisviestin."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:232
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr "Lähetä sähköpostia, jos joku lähettää minulle \"@-vastauksen\"."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:238
 msgid "Allow friends to nudge me and send me an email."
 msgstr "Salli kavereiden tönäistä minua ja lähetä sähköpostilla ilmoitus."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:244
 msgid "Publish a MicroID for my email address."
 msgstr "Julkaise MicroID sähköpostiosoitteelleni."
 
 #. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:362
 msgid "Email preferences saved."
 msgstr "Sähköpostiasetukset tallennettu."
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:381
 msgid "No email address."
 msgstr "Sähköpostiosoitetta ei ole."
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:389
 #, fuzzy
 msgid "Cannot normalize that email address."
 msgstr "Ei voida normalisoida sähköpostiosoitetta"
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:394 actions/register.php:197
-#: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "Tuo ei ole kelvollinen sähköpostiosoite."
 
 #. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:398
 msgid "That is already your email address."
 msgstr "Tämä on jo sähköpostiosoitteesi."
 
 #. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:402
 msgid "That email address already belongs to another user."
 msgstr "Tämä sähköpostiosoite kuuluu jo toisella käyttäjällä."
 
 #. TRANS: Server error thrown on database error adding e-mail confirmation code.
 #. TRANS: Server error thrown on database error adding Instant Messaging confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:419 actions/imsettings.php:362
-#: actions/smssettings.php:364
 #, fuzzy
 msgid "Could not insert confirmation code."
 msgstr "Ei voitu asettaa vahvistuskoodia."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:426
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
@@ -2638,99 +2100,79 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling Instant Messaging address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:446 actions/imsettings.php:391
-#: actions/smssettings.php:398
 msgid "No pending confirmation to cancel."
 msgstr "Avoimia vahvistuksia ei ole peruutettavana."
 
 #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:451
 msgid "That is the wrong email address."
 msgstr "Tämä on väärä sähköpostiosoite."
 
 #. TRANS: Server error thrown on database error canceling e-mail address confirmation.
 #. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
-#: actions/emailsettings.php:460 actions/smssettings.php:412
 msgid "Could not delete email confirmation."
 msgstr "Ei voitu poistaa sähköpostivahvistusta."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:465
 msgid "Email confirmation cancelled."
 msgstr "Avoimia vahvistuksia ei ole peruutettavana."
 
 #. TRANS: Message given trying to remove an e-mail address that is not
 #. TRANS: registered for the active user.
-#: actions/emailsettings.php:484
 msgid "That is not your email address."
 msgstr "Tämä ei ole sähköpostiosoitteesi."
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:505
 msgid "The email address was removed."
 msgstr "Saapuvan sähköpostin osoite poistettu."
 
 #. TRANS: Form validation error displayed when trying to remove an incoming e-mail address while no address has been set.
-#: actions/emailsettings.php:519 actions/smssettings.php:554
 msgid "No incoming email address."
 msgstr "Saapuvan sähköpostin osoitetta ei ole."
 
 #. 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.
-#: actions/emailsettings.php:531 actions/emailsettings.php:555
-#: actions/smssettings.php:565 actions/smssettings.php:590
 msgid "Could not update user record."
 msgstr "Ei voitu päivittää käyttäjätietoja."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
 #. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:535 actions/smssettings.php:569
 msgid "Incoming email address removed."
 msgstr "Saapuvan sähköpostin osoite poistettu."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
 #. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:559 actions/smssettings.php:594
 msgid "New incoming email address added."
 msgstr "Uusi saapuvan sähköpostin osoite lisätty."
 
 #. TRANS: Client error displayed when trying to mark a notice as favorite that already is a favorite.
-#: actions/favor.php:80
 msgid "This notice is already a favorite!"
 msgstr "Tämä päivitys on jo suosikki!"
 
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
-#: actions/favor.php:95
 msgid "Disfavor favorite."
 msgstr "Poista suosikeista."
 
 #. TRANS: Page title for first page of favorited notices.
 #. TRANS: Title for favourited notices section.
-#: actions/favorited.php:65 lib/popularnoticesection.php:62
-#: lib/publicgroupnav.php:93
 msgid "Popular notices"
 msgstr "Suosituimmat päivitykset"
 
 #. TRANS: Page title for all but first page of favorited notices.
 #. TRANS: %d is the page number being displayed.
-#: actions/favorited.php:69
 #, php-format
 msgid "Popular notices, page %d"
 msgstr "Suosituimmat päivitykset, sivu %d"
 
 #. TRANS: Description on page displaying favorited notices.
-#: actions/favorited.php:81
 msgid "The most popular notices on the site right now."
 msgstr "Suosituimmat päivitykset sivustolla juuri nyt."
 
 #. TRANS: Text displayed instead of a list when a site does not yet have any favourited notices.
-#: actions/favorited.php:149
 msgid "Favorite notices appear on this page but no one has favorited one yet."
 msgstr ""
 
 #. TRANS: Additional text displayed instead of a list when a site does not yet have any favourited notices for logged in users.
-#: actions/favorited.php:153
 msgid ""
 "Be the first to add a notice to your favorites by clicking the fave button "
 "next to any notice you like."
@@ -2738,7 +2180,6 @@ msgstr ""
 
 #. TRANS: Additional text displayed instead of a list when a site does not yet have any favourited notices for not logged in users.
 #. TRANS: %%action.register%% is a registration link. "[link text](link)" is Mark Down. Do not change the formatting.
-#: actions/favorited.php:158
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to add a "
@@ -2749,182 +2190,147 @@ msgstr ""
 #. TRANS: %s is a user's nickname.
 #. TRANS: Title for first page of favourite notices of a user.
 #. TRANS: %s is the user for whom the favourite notices are displayed.
-#: actions/favoritesrss.php:111 actions/showfavorites.php:76
-#: lib/personalgroupnav.php:110
 #, php-format
 msgid "%s's favorite notices"
 msgstr "Käyttäjän %s suosikkipäivitykset"
 
 #. TRANS: Desciption of RSS feed with favourite notices of a user.
 #. TRANS: %1$s is a user's nickname, %2$s is the name of the StatusNet site.
-#: actions/favoritesrss.php:117
 #, php-format
 msgid "Updates favored by %1$s on %2$s!"
 msgstr "Käyttäjän %1$s suosikit palvelussa %2$s!"
 
 #. TRANS: Page title for first page of featured users.
 #. TRANS: Title for featured users section.
-#: actions/featured.php:69 lib/featureduserssection.php:87
-#: lib/publicgroupnav.php:89
 msgid "Featured users"
 msgstr "Esittelyssä olevat käyttäjät"
 
 #. TRANS: Page title for all but first page of featured users.
 #. TRANS: %d is the page number being displayed.
-#: actions/featured.php:73
 #, php-format
 msgid "Featured users, page %d"
 msgstr "Esittelyssä olevat käyttäjät, sivu %d"
 
 #. TRANS: Description on page displaying featured users.
-#: actions/featured.php:102
 #, fuzzy, php-format
 msgid "A selection of some great users on %s."
 msgstr "Valikoima joitakin loistavia palvelun %s käyttäjiä"
 
 #. TRANS: Client error displayed when no notice ID was given trying do display a file.
-#: actions/file.php:36
 msgid "No notice ID."
 msgstr "Päivitystä ei ole."
 
 #. TRANS: Client error displayed when an invalid notice ID was given trying do display a file.
-#: actions/file.php:41
 msgid "No notice."
 msgstr "Päivitystä ei ole."
 
 #. TRANS: Client error displayed when trying do display a file for a notice without a file attachement.
-#: actions/file.php:46
 msgid "No attachments."
 msgstr "Liitettä ei ole."
 
 #. TRANS: Client error displayed when trying do display a file for a notice with file attachements
 #. TRANS: that could not be found.
-#: actions/file.php:58
 msgid "No uploaded attachments."
 msgstr "Liitettä ei ole."
 
 #. TRANS: Client error displayed when subscribing to a remote profile and an unexpected response is received.
-#: actions/finishremotesubscribe.php:69
 msgid "Not expecting this response!"
 msgstr "Odottamaton vastaus saatu!"
 
 #. TRANS: Client error displayed when subscribing to a remote profile that does not exist.
-#: actions/finishremotesubscribe.php:81
 #, fuzzy
 msgid "User being listened to does not exist."
 msgstr "Käyttäjää jota seurataan ei ole olemassa."
 
 #. TRANS: Client error displayed when subscribing to a remote profile that is a local profile.
-#: actions/finishremotesubscribe.php:89 actions/remotesubscribe.php:58
 msgid "You can use the local subscription!"
 msgstr "Voit käyttää paikallista tilausta!"
 
 #. TRANS: Client error displayed when subscribing to a remote profile that is blocked form subscribing to.
-#: actions/finishremotesubscribe.php:102
 msgid "That user has blocked you from subscribing."
 msgstr "Käyttäjä on estänyt sinua tilaamasta päivityksiä."
 
 #. TRANS: Client error displayed when subscribing to a remote profile without providing an authorised token.
-#: actions/finishremotesubscribe.php:114
 msgid "You are not authorized."
 msgstr "Sinulla ei ole valtuutusta tähän."
 
 #. TRANS: Client error displayed when subscribing to a remote profile and conversion of the request token to access token fails.
-#: actions/finishremotesubscribe.php:118
 msgid "Could not convert request token to access token."
 msgstr "Ei saatu request tokenia."
 
 #. TRANS: Client error displayed when subscribing to a remote profile fails because of an unsupported version of the OMB protocol.
-#: actions/finishremotesubscribe.php:124
 msgid "Remote service uses unknown version of OMB protocol."
 msgstr "Etäpalvelu käyttää tuntematonta OMB-protokollan versiota."
 
 #. TRANS: Server error displayed when subscribing to a remote profile fails because the remote profile could not be updated.
-#: actions/finishremotesubscribe.php:145 lib/oauthstore.php:317
 msgid "Error updating remote profile."
 msgstr "Virhe tapahtui päivitettäessä etäprofiilia."
 
 #. TRANS: Client error displayed when requesting a non-existent file.
-#: actions/getfile.php:77
 msgid "No such file."
 msgstr "Tiedostoa ei ole."
 
 #. TRANS: Client error displayed when requesting a file without having read access to it.
-#: actions/getfile.php:82
 msgid "Cannot read file."
 msgstr "Tiedostoa ei voi lukea."
 
 #. TRANS: Client error displayed when trying to assign an invalid role to a user.
-#: actions/grantrole.php:61 actions/revokerole.php:62
 msgid "Invalid role."
 msgstr "Virheellinen rooli."
 
 #. TRANS: Client error displayed when trying to assign an reserved role to a user.
-#: actions/grantrole.php:66 actions/revokerole.php:66
 msgid "This role is reserved and cannot be set."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to assign a role to a user while not being allowed to set roles.
-#: actions/grantrole.php:76
 msgid "You cannot grant user roles on this site."
 msgstr "Päivityksesi tähän palveluun on estetty."
 
 #. TRANS: Client error displayed when trying to assign a role to a user that already has that role.
-#: actions/grantrole.php:84
 msgid "User already has this role."
 msgstr "Käyttäjällä ei ole profiilia."
 
 #. TRANS: Client error displayed trying to block a user from a group while not specifying a to be blocked user profile.
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing a profile.
+#. TRANS: Client error displayed when not providing a profile ID on the Make Admin page.
 #. TRANS: Client error displayed trying a change a subscription without providing a profile.
 #. TRANS: Client error displayed when trying to change user options without specifying a user to work on.
-#: actions/groupblock.php:71 actions/groupunblock.php:71
-#: actions/makeadmin.php:71 actions/subedit.php:49
-#: lib/profileformaction.php:79
 msgid "No profile specified."
 msgstr "Profiilia ei ole määritelty."
 
 #. TRANS: Client error displayed trying to block a user from a group while specifying a non-existing profile.
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing an existing profile.
+#. TRANS: Client error displayed when specifying an invalid profile ID on the Make Admin page.
 #. TRANS: Client error displayed trying a change a subscription for a non-existant profile ID.
 #. TRANS: Client error displayed when trying to change user options without specifying an existing user to work on.
-#: actions/groupblock.php:77 actions/groupunblock.php:77
-#: actions/makeadmin.php:76 actions/subedit.php:57 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:87
 msgid "No profile with that ID."
 msgstr "Ei profiilia tuolle ID:lle."
 
 #. TRANS: Client error displayed trying to block a user from a group while not specifying a group to block a profile from.
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing a group.
-#: actions/groupblock.php:83 actions/groupunblock.php:83
-#: actions/makeadmin.php:81
+#. TRANS: Client error displayed when not providing a group ID on the Make Admin page.
 msgid "No group specified."
 msgstr "Ryhmää ei ole määritelty."
 
 #. TRANS: Client error displayed trying to block a user from a group while not being an admin user.
-#: actions/groupblock.php:95
 msgid "Only an admin can block group members."
 msgstr "Vain ylläpitäjä voi estää ryhmän jäseniä."
 
 #. TRANS: Client error displayed trying to block a user from a group while user is already blocked from the given group.
-#: actions/groupblock.php:100
 msgid "User is already blocked from group."
 msgstr "Käyttäjää ei ole estetty ryhmästä."
 
 #. TRANS: Client error displayed trying to block a user from a group while user is not a member of given group.
-#: actions/groupblock.php:106
 msgid "User is not a member of group."
 msgstr "Käyttäjä ei kuulu tähän ryhmään."
 
 #. TRANS: Title for block user from group page.
 #. TRANS: Form legend for form to block user from a group.
-#: actions/groupblock.php:141 actions/groupmembers.php:364
 msgid "Block user from group"
 msgstr "Estä käyttäjä ryhmästä"
 
 #. TRANS: Explanatory text for block user from group form before setting the block.
 #. TRANS: %1$s is that to be blocked user, %2$s is the group the user will be blocked from.
-#: actions/groupblock.php:169
 #, php-format
 msgid ""
 "Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They "
@@ -2936,156 +2342,129 @@ msgstr ""
 "liittyä ryhmään."
 
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
-#: actions/groupblock.php:191
 msgid "Do not block this user from this group."
 msgstr "Älä estä tätä käyttäjää tästä ryhmästä."
 
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
-#: actions/groupblock.php:198
 msgid "Block this user from this group."
 msgstr "Estä tätä käyttäjää osallistumassa tähän ryhmään."
 
 #. TRANS: Server error displayed when trying to block a user from a group fails because of an application error.
-#: actions/groupblock.php:215
 msgid "Database error blocking user from group."
 msgstr "Tietokantavirhe estettäessä käyttäjää ryhmästä."
 
 #. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
 #. TRANS: Client error displayed trying to find a user by ID without providing an ID.
-#: actions/groupbyid.php:73 actions/userbyid.php:70
 #, fuzzy
 msgid "No ID."
 msgstr "Ei Jabber ID -osoitetta"
 
 #. TRANS: Client error displayed trying to change group design settings while not logged in.
-#: actions/groupdesignsettings.php:67
 msgid "You must be logged in to edit a group."
 msgstr ""
 "Sinun pitää olla kirjautunut sisään, jotta voit muuttaa ryhmän tietoja."
 
 #. TRANS: Title group design settings page.
-#: actions/groupdesignsettings.php:146
 msgid "Group design"
 msgstr "Ryhmän ulkoasu"
 
 #. TRANS: Instructions for group design settings page.
-#: actions/groupdesignsettings.php:157
 msgid ""
 "Customize the way your group looks with a background image and a colour "
 "palette of your choice."
 msgstr ""
 
 #. TRANS: Form validation error displayed when group design settings could not be updated because of an application issue.
-#: actions/groupdesignsettings.php:262
 #, fuzzy
 msgid "Unable to update your design settings."
 msgstr "Ulkoasun tallennus epäonnistui."
 
 #. TRANS: Form text to confirm saved group design settings.
-#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:239
 msgid "Design preferences saved."
 msgstr "Ulkoasuasetukset tallennettu."
 
 #. TRANS: Title for group logo settings page.
 #. TRANS: Group logo form legend.
-#: actions/grouplogo.php:144 actions/grouplogo.php:199
 msgid "Group logo"
 msgstr "Ryhmän logo"
 
 #. TRANS: Instructions for group logo page.
 #. TRANS: %s is the maximum file size for that site.
-#: actions/grouplogo.php:156
 #, php-format
 msgid ""
 "You can upload a logo image for your group. The maximum file size is %s."
 msgstr "Voit ladata ryhmälle logokuvan. Maksimikoko on %s."
 
 #. TRANS: Submit button for uploading a group logo.
-#: actions/grouplogo.php:243
 msgid "Upload"
 msgstr "Lataa"
 
 #. TRANS: Button text for cropping an uploaded group logo.
-#: actions/grouplogo.php:299
 msgid "Crop"
 msgstr "Rajaa"
 
 #. TRANS: Form instructions on the group logo page.
-#: actions/grouplogo.php:376
 msgid "Pick a square area of the image to be the logo."
 msgstr "Valitse neliön muotoinen alue kuvasta logokuvaksi"
 
 #. TRANS: Form success message after updating a group logo.
-#: actions/grouplogo.php:411
 msgid "Logo updated."
 msgstr "Logo päivitetty."
 
 #. TRANS: Form failure message after failing to update a group logo.
-#: actions/grouplogo.php:414
 msgid "Failed updating logo."
 msgstr "Logon päivittäminen epäonnistui."
 
 #. TRANS: Title of the page showing group members.
 #. TRANS: %s is the name of the group.
-#: actions/groupmembers.php:104
 #, php-format
 msgid "%s group members"
 msgstr "Ryhmän %s jäsenet"
 
 #. TRANS: Title of the page showing group members.
 #. TRANS: %1$s is the name of the group, %2$d is the page number of the members list.
-#: actions/groupmembers.php:109
 #, php-format
 msgid "%1$s group members, page %2$d"
 msgstr "Ryhmän %s jäsenet"
 
 #. TRANS: Page notice for group members page.
-#: actions/groupmembers.php:125
 msgid "A list of the users in this group."
 msgstr "Lista ryhmän käyttäjistä."
 
 #. TRANS: Indicator in group members list that this user is a group administrator.
-#: actions/groupmembers.php:190 lib/action.php:581
 msgid "Admin"
 msgstr "Ylläpito"
 
 #. TRANS: Button text for the form that will block a user from a group.
-#: actions/groupmembers.php:397
 msgctxt "BUTTON"
 msgid "Block"
 msgstr "Estä"
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:401
 msgctxt "TOOLTIP"
 msgid "Block this user"
 msgstr "Estä tämä käyttäjä"
 
 #. TRANS: Form legend for form to make a user a group admin.
-#: actions/groupmembers.php:488
 msgid "Make user an admin of the group"
 msgstr "Tee tästä käyttäjästä ylläpitäjä"
 
 #. TRANS: Button text for the form that will make a user administrator.
-#: actions/groupmembers.php:521
 msgctxt "BUTTON"
 msgid "Make Admin"
 msgstr "Tee ylläpitäjäksi"
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:525
 msgctxt "TOOLTIP"
 msgid "Make this user an admin"
 msgstr "Tee tästä käyttäjästä ylläpitäjä"
 
 #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
-#: actions/grouprss.php:141
 #, php-format
 msgid "Updates from members of %1$s on %2$s!"
 msgstr "Ryhmän  %1$s käyttäjien päivitykset palvelussa %2$s!"
 
 #. TRANS: Title for first page of the groups list.
-#: actions/groups.php:62
 #, fuzzy
 msgctxt "TITLE"
 msgid "Groups"
@@ -3093,7 +2472,6 @@ msgstr "Ryhmät"
 
 #. TRANS: Title for all but the first page of the groups list.
 #. TRANS: %d is the page number.
-#: actions/groups.php:66
 #, fuzzy, php-format
 msgctxt "TITLE"
 msgid "Groups, page %d"
@@ -3102,7 +2480,6 @@ msgstr "Ryhmät, sivu %d"
 #. TRANS: Page notice of group list. %%%%site.name%%%% is the StatusNet site name,
 #. TRANS: %%%%action.groupsearch%%%% and %%%%action.newgroup%%%% are URLs. Do not change them.
 #. TRANS: This message contains Markdown links in the form [link text](link).
-#: actions/groups.php:95
 #, php-format
 msgid ""
 "%%%%site.name%%%% groups let you find and talk with people of similar "
@@ -3113,12 +2490,10 @@ msgid ""
 msgstr ""
 
 #. TRANS: Link to create a new group on the group list page.
-#: actions/groups.php:113 actions/usergroups.php:126 lib/groupeditform.php:115
 msgid "Create a new group"
 msgstr "Luo uusi ryhmä"
 
 #. TRANS: Instructions for page where groups can be searched. %%site.name%% is the name of the StatusNet site.
-#: actions/groupsearch.php:53
 #, fuzzy, php-format
 msgid ""
 "Search for groups on %%site.name%% by their name, location, or description. "
@@ -3129,21 +2504,17 @@ msgstr ""
 "olla 3 tai useamman merkin pituisia."
 
 #. TRANS: Title for page where groups can be searched.
-#: actions/groupsearch.php:60
 msgid "Group search"
 msgstr "Ryhmähaku"
 
 #. TRANS: Text on page where groups can be searched if no results were found for a query.
 #. TRANS: Text for notice search results is the query had no results.
 #. TRANS: Message on the "People search" page where a query has no results.
-#: actions/groupsearch.php:82 actions/noticesearch.php:122
-#: actions/peoplesearch.php:87
 msgid "No results."
 msgstr "Ei tuloksia"
 
 #. TRANS: Additional text on page where groups can be searched if no results were found for a query for a logged in user.
 #. TRANS: This message contains Markdown links in the form [link text](link).
-#: actions/groupsearch.php:87
 #, php-format
 msgid ""
 "If you cannot find the group you're looking for, you can [create it](%%"
@@ -3152,7 +2523,6 @@ msgstr ""
 
 #. TRANS: Additional text on page where groups can be searched if no results were found for a query for a not logged in user.
 #. TRANS: This message contains Markdown links in the form [link text](link).
-#: actions/groupsearch.php:92
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and [create the group](%%"
@@ -3160,30 +2530,25 @@ msgid ""
 msgstr ""
 
 #. TRANS: Client error displayed when trying to unblock a user from a group without being an administrator for the group.
-#: actions/groupunblock.php:95
 msgid "Only an admin can unblock group members."
 msgstr "Vain ylläpitäjä voi poistaa eston ryhmän jäseniltä."
 
 #. TRANS: Client error displayed when trying to unblock a non-blocked user from a group.
-#: actions/groupunblock.php:100
 msgid "User is not blocked from group."
 msgstr "Käyttäjää ei ole estetty ryhmästä."
 
 #. TRANS: Server error displayed when unblocking a user from a group fails because of an unknown error.
 #. TRANS: Server error displayed when removing a user block.
-#: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "Tapahtui virhe, kun estoa poistettiin."
 
 #. TRANS: Title for Instant Messaging settings.
-#: actions/imsettings.php:56
 msgid "IM settings"
 msgstr "Profiilikuva-asetukset"
 
 #. 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.
-#: actions/imsettings.php:69
 #, fuzzy, php-format
 msgid ""
 "You can send and receive notices through instant messaging [instant messages]"
@@ -3193,18 +2558,15 @@ msgstr ""
 "im%%) käyttäen. Alla voit määrittää osoitteesi ja asetuksesi. "
 
 #. TRANS: Message given in the IM settings if IM is not enabled on the site.
-#: actions/imsettings.php:90
 msgid "IM is not available."
 msgstr "Pikaviestin ei ole käytettävissä."
 
-#: actions/imsettings.php:116
 #, fuzzy, php-format
 msgid "Current confirmed %s address."
 msgstr "Tämän hetken vahvistettu sähköpostiosoite."
 
 #. TRANS: Form note in IM settings form.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:128
 #, fuzzy, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your %s account for a message "
@@ -3214,35 +2576,29 @@ msgstr ""
 "käyttäjätililtäsi viesti, jossa on lisäohjeet. (Lisäsitkö %s:n "
 "ystävälistaasi?)"
 
-#: actions/imsettings.php:140
 msgid "IM address"
 msgstr "Sähköpostiosoitteet"
 
-#: actions/imsettings.php:142
 #, php-format
 msgid "%s screenname."
 msgstr ""
 
 #. TRANS: Header for IM preferences form.
-#: actions/imsettings.php:163
 #, fuzzy
 msgid "IM Preferences"
 msgstr "Asetukset tallennettu."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:174
 #, fuzzy
 msgid "Send me notices"
 msgstr "Lähetä päivitys"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:176
 #, fuzzy
 msgid "Post a notice when my status changes."
 msgstr "Lähetä päivitys kun Jabber/GTalk -tilatietoni vaihtuu."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:178
 #, fuzzy
 msgid "Send me replies from people I'm not subscribed to."
 msgstr ""
@@ -3250,54 +2606,45 @@ msgstr ""
 "tilannut. "
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:181
 #, fuzzy
 msgid "Publish a MicroID"
 msgstr "Julkaise MicroID sähköpostiosoitteelleni."
 
 #. TRANS: Server error thrown on database error updating IM preferences.
-#: actions/imsettings.php:291
 #, fuzzy
 msgid "Couldn't update IM preferences."
 msgstr "Käyttäjän päivitys epäonnistui."
 
 #. TRANS: Confirmation message for successful IM preferences save.
 #. TRANS: Confirmation message after saving preferences.
-#: actions/imsettings.php:298 actions/urlsettings.php:244
 msgid "Preferences saved."
 msgstr "Asetukset tallennettu."
 
 #. TRANS: Message given saving IM address without having provided one.
-#: actions/imsettings.php:320
 #, fuzzy
 msgid "No screenname."
 msgstr "Tunnusta ei ole."
 
-#: actions/imsettings.php:325
 #, fuzzy
 msgid "No transport."
 msgstr "Päivitystä ei ole."
 
 #. TRANS: Message given saving IM address that cannot be normalised.
-#: actions/imsettings.php:333
 #, fuzzy
 msgid "Cannot normalize that screenname"
 msgstr "Ei voida normalisoida Jabber ID -tunnusta"
 
 #. TRANS: Message given saving IM address that not valid.
-#: actions/imsettings.php:340
 #, fuzzy
 msgid "Not a valid screenname"
 msgstr "Tuo ei ole kelvollinen tunnus."
 
 #. TRANS: Message given saving IM address that is already set for another user.
-#: actions/imsettings.php:344
 #, fuzzy
 msgid "Screenname already belongs to another user."
 msgstr "Jabber ID kuuluu jo toiselle käyttäjälle."
 
 #. TRANS: Message given saving valid IM address that is to be confirmed.
-#: actions/imsettings.php:369
 #, fuzzy
 msgid "A confirmation code was sent to the IM address you added."
 msgstr ""
@@ -3305,66 +2652,55 @@ msgstr ""
 "antaa osoitteelle %s oikeus lähettää viestejä sinulle."
 
 #. TRANS: Message given canceling IM address confirmation for the wrong IM address.
-#: actions/imsettings.php:396
 msgid "That is the wrong IM address."
 msgstr "Tämä on väärä pikaviestiosoite."
 
 #. TRANS: Server error thrown on database error canceling IM address confirmation.
-#: actions/imsettings.php:405
 #, fuzzy
 msgid "Couldn't delete confirmation."
 msgstr "Ei voitu poistaa sähköpostivahvistusta."
 
 #. TRANS: Message given after successfully canceling IM address confirmation.
-#: actions/imsettings.php:410
 msgid "IM confirmation cancelled."
 msgstr "Varmistuskoodia ei ole annettu."
 
 #. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.
-#: actions/imsettings.php:434
 #, fuzzy
 msgid "That is not your screenname."
 msgstr "Tämä ei ole puhelinnumerosi."
 
 #. TRANS: Server error thrown on database error removing a registered IM address.
-#: actions/imsettings.php:443
 #, fuzzy
 msgid "Couldn't update user im prefs."
 msgstr "Ei voitu päivittää käyttäjätietoja."
 
 #. TRANS: Message given after successfully removing a registered Instant Messaging address.
-#: actions/imsettings.php:451
 msgid "The IM address was removed."
 msgstr "Saapuvan sähköpostin osoite poistettu."
 
 #. TRANS: Title for all but the first page of the inbox page.
 #. TRANS: %1$s is the user's nickname, %2$s is the page number.
-#: actions/inbox.php:59
 #, fuzzy, php-format
 msgid "Inbox for %1$s - page %2$d"
 msgstr "Saapuneet viestit käyttäjälle %s"
 
 #. TRANS: Title for the first page of the inbox page.
 #. TRANS: %s is the user's nickname.
-#: actions/inbox.php:64
 #, php-format
 msgid "Inbox for %s"
 msgstr "Saapuneet viestit käyttäjälle %s"
 
 #. TRANS: Instructions for user inbox page.
-#: actions/inbox.php:106
 msgid "This is your inbox, which lists your incoming private messages."
 msgstr "Tämä on postilaatikkosi, jossa on sinulle saapuneet yksityisviestit."
 
 #. TRANS: Client error displayed when trying to sent invites while they have been disabled.
-#: actions/invite.php:41
 msgid "Invites have been disabled."
 msgstr "Kutsut ovat pois käytöstä."
 
 #. TRANS: Client error displayed when trying to sent invites while not logged in.
 #. TRANS: %s is the StatusNet site name.
-#: actions/invite.php:45
 #, php-format
 msgid "You must be logged in to invite other users to use %s."
 msgstr ""
@@ -3372,19 +2708,16 @@ msgstr ""
 
 #. TRANS: Form validation message when providing an e-mail address that does not validate.
 #. TRANS: %s is an invalid e-mail address.
-#: actions/invite.php:78
 #, fuzzy, php-format
 msgid "Invalid email address: %s."
 msgstr "Sähköpostiosoite %s ei kelpaa"
 
 #. TRANS: Page title when invitations have been sent.
-#: actions/invite.php:117
 #, fuzzy
 msgid "Invitations sent"
 msgstr "Kutsu(t) lähetettiin"
 
 #. TRANS: Page title when inviting potential users.
-#: actions/invite.php:120
 msgid "Invite new users"
 msgstr "Kutsu uusia käyttäjiä"
 
@@ -3392,7 +2725,6 @@ msgstr "Kutsu uusia käyttäjiä"
 #. TRANS: is already subscribed to one or more users with the given e-mail address(es).
 #. TRANS: Plural form is based on the number of reported already subscribed e-mail addresses.
 #. TRANS: Followed by a bullet list.
-#: actions/invite.php:140
 #, fuzzy
 msgid "You are already subscribed to this user:"
 msgid_plural "You are already subscribed to these users:"
@@ -3401,7 +2733,6 @@ msgstr[1] "Olet jo tilannut seuraavien käyttäjien päivitykset:"
 
 #. TRANS: Used as list item for already subscribed users (%1$s is nickname, %2$s is e-mail address).
 #. TRANS: Used as list item for already registered people (%1$s is nickname, %2$s is e-mail address).
-#: actions/invite.php:146 actions/invite.php:160
 #, fuzzy, php-format
 msgctxt "INVITE"
 msgid "%1$s (%2$s)"
@@ -3410,7 +2741,6 @@ msgstr "%1$s (%2$s)"
 #. TRANS: Message displayed inviting users to use a StatusNet site while the invited user
 #. TRANS: already uses a this StatusNet site. Plural form is based on the number of
 #. TRANS: reported already present people. Followed by a bullet list.
-#: actions/invite.php:154
 #, fuzzy
 msgid "This person is already a user and you were automatically subscribed:"
 msgid_plural ""
@@ -3425,7 +2755,6 @@ msgstr[1] ""
 #. TRANS: Message displayed inviting users to use a StatusNet site. Plural form is
 #. TRANS: based on the number of invitations sent. Followed by a bullet list of
 #. TRANS: e-mail addresses to which invitations were sent.
-#: actions/invite.php:168
 #, fuzzy
 msgid "Invitation sent to the following person:"
 msgid_plural "Invitations sent to the following people:"
@@ -3434,7 +2763,6 @@ msgstr[1] "Kutsu(t) lähetettiin seuraaville henkilöille:"
 
 #. TRANS: Generic message displayed after sending out one or more invitations to
 #. TRANS: people to join a StatusNet site.
-#: actions/invite.php:178
 msgid ""
 "You will be notified when your invitees accept the invitation and register "
 "on the site. Thanks for growing the community!"
@@ -3443,7 +2771,6 @@ msgstr ""
 "kutsun ja rekisteröityy palveluun. Kiitoksia yhteisön kasvattamisesta!"
 
 #. TRANS: Form instructions.
-#: actions/invite.php:191
 msgid ""
 "Use this form to invite your friends and colleagues to use this service."
 msgstr ""
@@ -3451,28 +2778,24 @@ msgstr ""
 "tätä palvelua."
 
 #. TRANS: Field label for a list of e-mail addresses.
-#: actions/invite.php:218
 msgid "Email addresses"
 msgstr "Sähköpostiosoitteet"
 
 #. TRANS: Tooltip for field label for a list of e-mail addresses.
-#: actions/invite.php:221
 #, fuzzy
 msgid "Addresses of friends to invite (one per line)."
 msgstr "Kutsuttavien kavereiden osoitteet (yksi per rivi)"
 
 #. TRANS: Field label for a personal message to send to invitees.
-#: actions/invite.php:225
 msgid "Personal message"
 msgstr "Henkilökohtainen viesti"
 
 #. TRANS: Tooltip for field label for a personal message to send to invitees.
-#: actions/invite.php:228
 msgid "Optionally add a personal message to the invitation."
 msgstr "Voit myös lisätä oman viestisi kutsuun"
 
 #. TRANS: Send button for inviting friends
-#: actions/invite.php:232
+#. TRANS: Button text for sending notice.
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Send"
@@ -3481,7 +2804,6 @@ msgstr "Lähetä"
 #. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral
 #. TRANS: singular 3rd-person pronoun in English. %1$s is the inviting user, $2$s is
 #. TRANS: the StatusNet sitename.
-#: actions/invite.php:264
 #, php-format
 msgid "%1$s has invited you to join them on %2$s"
 msgstr "%1$s on kutsunut sinut liittymään palveluun %2$s"
@@ -3491,7 +2813,6 @@ msgstr "%1$s on kutsunut sinut liittymään palveluun %2$s"
 #. TRANS: StatusNet sitename, %3$s is the site URL, %4$s is the personal message from the
 #. TRANS: inviting user, %s%5 a link to the timeline for the inviting user, %s$6 is a link
 #. TRANS: to register with the StatusNet site.
-#: actions/invite.php:271
 #, php-format
 msgid ""
 "%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -3548,186 +2869,181 @@ msgstr ""
 "Terveisin, %2$s\n"
 
 #. TRANS: Client error displayed when trying to join a group while not logged in.
-#: actions/joingroup.php:59
 msgid "You must be logged in to join a group."
 msgstr "Sinun pitää olla kirjautunut sisään, jos haluat liittyä ryhmään."
 
 #. TRANS: Title for join group page after joining.
-#: actions/joingroup.php:148
 #, fuzzy, php-format
 msgctxt "TITLE"
 msgid "%1$s joined group %2$s"
 msgstr "%s liittyi ryhmään %s"
 
 #. TRANS: Client error displayed when trying to leave a group while not logged in.
-#: actions/leavegroup.php:59
 msgid "You must be logged in to leave a group."
 msgstr "Sinun pitää olla kirjautunut sisään, jotta voit erota ryhmästä."
 
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
-#: actions/leavegroup.php:103 lib/command.php:398
 msgid "You are not a member of that group."
 msgstr "Sinä et kuulu tähän ryhmään."
 
 #. TRANS: Title for leave group page after leaving.
-#: actions/leavegroup.php:142
 #, fuzzy, php-format
 msgctxt "TITLE"
 msgid "%1$s left group %2$s"
 msgstr "Käyttäjän %1$s päivitys %2$s"
 
 #. TRANS: User admin panel title
-#: actions/licenseadminpanel.php:55
 msgctxt "TITLE"
 msgid "License"
 msgstr ""
 
-#: actions/licenseadminpanel.php:65
+#. TRANS: Form instructions for the site license admin panel.
 msgid "License for this StatusNet site"
 msgstr ""
 
-#: actions/licenseadminpanel.php:134
+#. TRANS: Client error displayed selecting an invalid license in the license admin panel.
 msgid "Invalid license selection."
 msgstr ""
 
-#: actions/licenseadminpanel.php:144
+#. TRANS: Client error displayed when not specifying an owner for the all rights reserved license in the license admin panel.
 msgid ""
 "You must specify the owner of the content when using the All Rights Reserved "
 "license."
 msgstr ""
 
-#: actions/licenseadminpanel.php:151
+#. TRANS: Client error displayed selecting a too long license title in the license admin panel.
 #, fuzzy
 msgid "Invalid license title. Maximum length is 255 characters."
 msgstr "Kotipaikka on liian pitkä (max 255 merkkiä)."
 
-#: actions/licenseadminpanel.php:163
+#. TRANS: Client error displayed specifying an invalid license URL in the license admin panel.
 msgid "Invalid license URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:166
+#. TRANS: Client error displayed specifying an invalid license image URL in the license admin panel.
 msgid "Invalid license image URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:174
+#. TRANS: Client error displayed specifying an invalid license URL in the license admin panel.
 msgid "License URL must be blank or a valid URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:182
+#. TRANS: Client error displayed specifying an invalid license image URL in the license admin panel.
 msgid "License image must be blank or valid URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:232
+#. TRANS: Form legend in the license admin panel.
 msgid "License selection"
 msgstr ""
 
-#: actions/licenseadminpanel.php:238
+#. TRANS: License option in the license admin panel.
 #, fuzzy
 msgid "Private"
 msgstr "Yksityisyys"
 
-#: actions/licenseadminpanel.php:239
+#. TRANS: License option in the license admin panel.
 msgid "All Rights Reserved"
 msgstr "Kaikki oikeudet pidätetään"
 
-#: actions/licenseadminpanel.php:240
+#. TRANS: License option in the license admin panel.
 msgid "Creative Commons"
 msgstr "Creative Commons"
 
-#: actions/licenseadminpanel.php:245
+#. TRANS: Dropdown field label in the license admin panel.
 msgid "Type"
 msgstr "Tyyppi"
 
-#: actions/licenseadminpanel.php:247
-msgid "Select license"
+#. TRANS: Dropdown field instructions in the license admin panel.
+#, fuzzy
+msgid "Select a license."
 msgstr "Valitse lisenssi"
 
-#: actions/licenseadminpanel.php:261
+#. TRANS: Form legend in the license admin panel.
 msgid "License details"
 msgstr ""
 
-#: actions/licenseadminpanel.php:267
+#. TRANS: Field label in the license admin panel.
 msgid "Owner"
 msgstr ""
 
-#: actions/licenseadminpanel.php:268
+#. TRANS: Field title in the license admin panel.
 msgid "Name of the owner of the site's content (if applicable)."
 msgstr ""
 
-#: actions/licenseadminpanel.php:276
+#. TRANS: Field label in the license admin panel.
 msgid "License Title"
 msgstr ""
 
-#: actions/licenseadminpanel.php:277
+#. TRANS: Field title in the license admin panel.
 msgid "The title of the license."
 msgstr ""
 
-#: actions/licenseadminpanel.php:285
+#. TRANS: Field label in the license admin panel.
 msgid "License URL"
 msgstr ""
 
-#: actions/licenseadminpanel.php:286
+#. TRANS: Field title in the license admin panel.
 msgid "URL for more information about the license."
 msgstr ""
 
-#: actions/licenseadminpanel.php:293
+#. TRANS: Field label in the license admin panel.
 msgid "License Image URL"
 msgstr ""
 
-#: actions/licenseadminpanel.php:294
+#. TRANS: Field title in the license admin panel.
 msgid "URL for an image to display with the license."
 msgstr ""
 
-#. TRANS: Submit button title.
-#: actions/licenseadminpanel.php:311 actions/sessionsadminpanel.php:199
-#: actions/siteadminpanel.php:292 actions/snapshotadminpanel.php:245
-#: actions/tagother.php:133 lib/applicationeditform.php:357
-msgid "Save"
-msgstr "Tallenna"
-
-#: actions/licenseadminpanel.php:311
-msgid "Save license settings"
-msgstr ""
+#. TRANS: Button title in the license admin panel.
+#, fuzzy
+msgid "Save license settings."
+msgstr "Profiilikuva-asetukset"
 
+#. TRANS: Client error displayed when trying to log in while already logged in.
 #. TRANS: Client error displayed trying to use "one time password login" when already logged in.
-#: actions/login.php:97 actions/otp.php:62 actions/register.php:130
 msgid "Already logged in."
 msgstr "Olet jo kirjautunut sisään."
 
-#: actions/login.php:125
+#. TRANS: Form validation error displayed when trying to log in with incorrect credentials.
 msgid "Incorrect username or password."
 msgstr "Väärä käyttäjätunnus tai salasana"
 
+#. TRANS: Server error displayed when during login a server error occurs.
 #. TRANS: Server error displayed when a user object could not be created trying to login using "one time password login".
-#: actions/login.php:131 actions/otp.php:127
 #, fuzzy
 msgid "Error setting user. You are probably not authorized."
 msgstr "Sinulla ei ole valtuutusta tähän."
 
-#: actions/login.php:185 actions/login.php:236 lib/action.php:598
+#. TRANS: Page title for login page.
 msgid "Login"
 msgstr "Kirjaudu sisään"
 
-#: actions/login.php:222
+#. TRANS: Form legend on login page.
 msgid "Login to site"
 msgstr "Kirjaudu sisään"
 
-#: actions/login.php:231 actions/register.php:469
+#. TRANS: Checkbox label label on login page.
 msgid "Remember me"
 msgstr "Muista minut"
 
-#: actions/login.php:232 actions/register.php:471
+#. TRANS: Checkbox title on login page.
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 "Kirjaudu sisään automaattisesti tulevaisuudessa; ei tietokoneille joilla "
 "useampi käyttäjä!"
 
-#: actions/login.php:241
+#. TRANS: Button text for log in on login page.
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Login"
+msgstr "Kirjaudu sisään"
+
+#. TRANS: Link text for link to "reset password" on login page.
 msgid "Lost or forgotten password?"
 msgstr "Oletko hukannut tai unohtanut salasanasi?"
 
-#: actions/login.php:259
+#. TRANS: Form instructions on login page before being able to change user settings.
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -3735,12 +3051,13 @@ msgstr ""
 "Syötä turvallisuussyistä käyttäjätunnuksesi ja salasanasi uudelleen ennen "
 "asetuksiesi muuttamista."
 
-#: actions/login.php:263
+#. TRANS: Form instructions on login page.
 #, fuzzy
 msgid "Login with your username and password."
 msgstr "Kirjaudu sisään käyttäjätunnuksella ja salasanalla"
 
-#: actions/login.php:266
+#. TRANS: Form instructions on login page. This message contains Markdown links in the form [Link text](Link).
+#. TRANS: %%action.register%% is a link to the registration page.
 #, fuzzy, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -3748,132 +3065,126 @@ msgstr ""
 "Eikö sinulla ole vielä käyttäjätunnusta? [Rekisteröi](%%action.register%%) "
 "käyttäjätunnus."
 
-#: actions/makeadmin.php:92
+#. TRANS: Client error displayed when trying to make another user admin on the Make Admin page while not an admin.
 msgid "Only an admin can make another user an admin."
 msgstr "Vain ylläpitäjä voi tehdä toisesta käyttäjästä ylläpitäjän."
 
-#: actions/makeadmin.php:96
+#. TRANS: Client error displayed when trying to make another user admin on the Make Admin page who already is admin.
+#. TRANS: %1$s is the user that is already admin, %2$s is the group user is already admin for.
 #, fuzzy, php-format
 msgid "%1$s is already an admin for group \"%2$s\"."
 msgstr "%s on jo ryhmän \"%s\" ylläpitäjä."
 
-#: actions/makeadmin.php:133
+#. TRANS: Server error displayed when trying to make another user admin on the Make Admin page fails
+#. TRANS: because the group membership record could not be gotten.
+#. TRANS: %1$s is the to be admin user, %2$s is the group user should be admin for.
 #, fuzzy, php-format
 msgid "Can't get membership record for %1$s in group %2$s."
 msgstr "Ei saatu käyttäjän %s jäsenyystietoja ryhmästä %s"
 
-#: actions/makeadmin.php:146
+#. TRANS: Server error displayed when trying to make another user admin on the Make Admin page fails
+#. TRANS: because the group adminship record coud not be saved properly.
+#. TRANS: %1$s is the to be admin user, %2$s is the group user is already admin for.
 #, php-format
 msgid "Can't make %1$s an admin for group %2$s."
 msgstr "Tee tästä käyttäjästä ylläpitäjä"
 
-#: actions/microsummary.php:69
+#. TRANS: Client error displayed trying to make a micro summary without providing a status.
 msgid "No current status."
 msgstr "Ei tuloksia"
 
 #. TRANS: This is the title of the form for adding a new application.
-#: actions/newapplication.php:52
 #, fuzzy
 msgid "New application"
 msgstr "Päivitystä ei ole."
 
 #. TRANS: Client error displayed trying to add a new application while not logged in.
-#: actions/newapplication.php:64
 #, fuzzy
 msgid "You must be logged in to register an application."
 msgstr "Sinun pitää olla kirjautunut sisään jotta voit luoda ryhmän."
 
 #. TRANS: Form instructions for registering a new application.
-#: actions/newapplication.php:147
 #, fuzzy
 msgid "Use this form to register a new application."
 msgstr "Käytä tätä lomaketta luodaksesi ryhmän."
 
 #. TRANS: Validation error shown when not providing a source URL in the "New application" form.
-#: actions/newapplication.php:189
 msgid "Source URL is required."
 msgstr ""
 
 #. TRANS: Server error displayed when an application could not be registered in the database through the "New application" form.
-#: actions/newapplication.php:279 actions/newapplication.php:289
 #, fuzzy
 msgid "Could not create application."
 msgstr "Ei voitu lisätä aliasta."
 
 #. TRANS: Title for form to create a group.
-#: actions/newgroup.php:53
 msgid "New group"
 msgstr "Uusi ryhmä"
 
 #. TRANS: Client exception thrown when a user tries to create a group while banned.
-#: actions/newgroup.php:73 classes/User_group.php:485
 #, fuzzy
 msgid "You are not allowed to create groups on this site."
 msgstr "Sinä et kuulu tähän ryhmään."
 
 #. TRANS: Form instructions for group create form.
-#: actions/newgroup.php:117
 msgid "Use this form to create a new group."
 msgstr "Käytä tätä lomaketta luodaksesi ryhmän."
 
-#. TRANS: Group create form validation error.
-#: actions/newgroup.php:200
-#, fuzzy
-msgid "Alias cannot be the same as nickname."
-msgstr "Alias ei voi olla sama kuin ryhmätunnus."
-
-#: actions/newmessage.php:71 actions/newmessage.php:234
+#. TRANS: Page title for new direct message page.
+#. TRANS: Page title on page for sending a direct message.
 msgid "New message"
 msgstr "Uusi viesti"
 
-#. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
-#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:513
-msgid "You can't send a message to this user."
+#. TRANS: Client error displayed trying to send a direct message to a user while sender and
+#. TRANS: receiver are not subscribed to each other.
+#, fuzzy
+msgid "You cannot send a message to this user."
 msgstr "Et voi lähettää viestiä tälle käyttäjälle."
 
+#. TRANS: Form validator error displayed trying to send a direct message without content.
+#. TRANS: Client error displayed trying to send a notice without content.
 #. TRANS: Command exception text shown when trying to send a direct message to another user without content.
 #. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
-#: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:490
-#: lib/command.php:593
 msgid "No content!"
 msgstr "Ei sisältöä!"
 
-#: actions/newmessage.php:161
+#. TRANS: Form validation error displayed trying to send a direct message without specifying a recipient.
 msgid "No recipient specified."
 msgstr "Vastaanottajaa ei ole määritelty."
 
+#. TRANS: Client error displayed trying to send a direct message to self.
 #. TRANS: Error text shown when trying to send a direct message to self.
-#: actions/newmessage.php:167 lib/command.php:517
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr "Älä lähetä viestiä itsellesi, vaan kuiskaa se vain hiljaa itsellesi."
 
-#: actions/newmessage.php:184
+#. TRANS: Page title after sending a direct message.
 msgid "Message sent"
 msgstr "Viesti lähetetty"
 
+#. TRANS: Confirmation text after sending a direct message.
+#. TRANS: %s is the direct message recipient.
 #. TRANS: Message given have sent a direct message to another user.
 #. TRANS: %s is the name of the other user.
-#: actions/newmessage.php:188 lib/command.php:525
 #, fuzzy, php-format
 msgid "Direct message to %s sent."
 msgstr "Suora viesti käyttäjälle %s lähetetty"
 
-#: actions/newmessage.php:213 actions/newnotice.php:264
+#. TRANS: Page title after an AJAX error occurred on the "send direct message" page.
+#. TRANS: Page title after an AJAX error occurs on the send notice page.
 msgid "Ajax Error"
 msgstr "Ajax-virhe"
 
-#: actions/newnotice.php:69
+#. TRANS: Page title for sending a new notice.
 msgid "New notice"
 msgstr "Uusi päivitys"
 
-#: actions/newnotice.php:230
+#. TRANS: Page title after sending a notice.
 msgid "Notice posted"
 msgstr "Päivitys lähetetty"
 
 #. TRANS: Instructions for Notice search page.
 #. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/noticesearch.php:69
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -3883,20 +3194,17 @@ msgstr ""
 "välilyönnillä; hakutermien pitää olla 3 tai useamman merkin pituisia."
 
 #. TRANS: Title of the page where users can search for notices.
-#: actions/noticesearch.php:80
 msgid "Text search"
 msgstr "Tekstihaku"
 
 #. TRANS: Test in RSS notice search.
 #. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearch.php:95
 #, php-format
 msgid "Search results for \"%1$s\" on %2$s"
 msgstr "Viesti käyttäjältä %1$s, %2$s"
 
 #. TRANS: Text for logged in users making a query for notices without results.
 #. TRANS: This message contains a Markdown link.
-#: actions/noticesearch.php:128
 #, php-format
 msgid ""
 "Be the first to [post on this topic](%%%%action.newnotice%%%%?"
@@ -3907,7 +3215,6 @@ msgstr ""
 
 #. TRANS: Text for not logged in users making a query for notices without results.
 #. TRANS: This message contains Markdown links.
-#: actions/noticesearch.php:133
 #, fuzzy, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and be the first to "
@@ -3917,19 +3224,17 @@ msgstr ""
 "newnotice%%%%?status_textarea=%s)!"
 
 #. TRANS: RSS notice search feed title. %s is the query.
-#: actions/noticesearchrss.php:95
 #, fuzzy, php-format
 msgid "Updates with \"%s\""
 msgstr "Käyttäjän %1$s päivitykset palvelussa %2$s!"
 
 #. TRANS: RSS notice search feed description.
 #. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearchrss.php:99
 #, fuzzy, php-format
 msgid "Updates matching search term \"%1$s\" on %2$s."
 msgstr "Käyttäjän %1$s päivitykset palvelussa %2$s!"
 
-#: actions/nudge.php:85
+#. TRANS: Client error displayed trying to nudge a user that cannot be nudged.
 #, fuzzy
 msgid ""
 "This user doesn't allow nudges or hasn't confirmed or set their email "
@@ -3938,64 +3243,55 @@ msgstr ""
 "Käyttäjä ei ole sallinut tönäisyjä tai ei ole vahvistanut "
 "sähköpostiosoitettaan."
 
-#: actions/nudge.php:94
+#. TRANS: Page title after sending a nudge.
 msgid "Nudge sent"
 msgstr "Tönäisy lähetetty"
 
-#: actions/nudge.php:97
+#. TRANS: Confirmation text after sending a nudge.
 msgid "Nudge sent!"
 msgstr "Tönäisy lähetetty!"
 
 #. TRANS: Message displayed to an anonymous user trying to view OAuth application list.
-#: actions/oauthappssettings.php:57
 #, fuzzy
 msgid "You must be logged in to list your applications."
 msgstr ""
 "Sinun pitää olla kirjautunut sisään, jotta voit muuttaa ryhmän tietoja."
 
 #. TRANS: Page title for OAuth applications
-#: actions/oauthappssettings.php:73
 #, fuzzy
 msgid "OAuth applications"
 msgstr "Muita asetuksia"
 
 #. TRANS: Page instructions for OAuth applications
-#: actions/oauthappssettings.php:85
 msgid "Applications you have registered"
 msgstr ""
 
 #. TRANS: Empty list message on page with OAuth applications.
-#: actions/oauthappssettings.php:138
 #, php-format
 msgid "You have not registered any applications yet."
 msgstr ""
 
 #. TRANS: Title for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:69
 msgid "Connected applications"
 msgstr ""
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:80
 msgid "The following connections exist for your account."
 msgstr ""
 
 #. TRANS: Client error when trying to revoke access for an application while not being a user of it.
-#: actions/oauthconnectionssettings.php:165
 #, fuzzy
 msgid "You are not a user of that application."
 msgstr "Sinä et kuulu tähän ryhmään."
 
 #. TRANS: Client error when revoking access has failed for some reason.
 #. TRANS: %s is the application ID revoking access failed for.
-#: actions/oauthconnectionssettings.php:180
 #, fuzzy, php-format
 msgid "Unable to revoke access for application: %s."
 msgstr "Käytä tätä lomaketta muokataksesi ryhmää."
 
 #. TRANS: Success message after revoking access for an application.
 #. TRANS: %1$s is the application name, %2$s is the first part of the user token.
-#: actions/oauthconnectionssettings.php:199
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -4003,482 +3299,399 @@ msgid ""
 msgstr ""
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:210
 msgid "You have not authorized any applications to use your account."
 msgstr ""
 
 #. TRANS: Note for developers in the OAuth connection settings form.
 #. TRANS: This message contains a Markdown link. Do not separate "](".
 #. TRANS: %s is the URL to the OAuth settings.
-#: actions/oauthconnectionssettings.php:230
 #, php-format
 msgid ""
 "Are you a developer? [Register an OAuth client application](%s) to use with "
 "this instance of StatusNet."
 msgstr ""
 
-#: actions/oembed.php:64
+#. TRANS: Server error displayed in oEmbed action when path not found.
+#. TRANS: %s is a path.
 #, fuzzy, php-format
 msgid "\"%s\" not found."
 msgstr "API-metodia ei löytynyt."
 
-#: actions/oembed.php:76
+#. TRANS: Server error displayed in oEmbed action when notice not found.
+#. TRANS: %s is a notice.
 #, fuzzy, php-format
 msgid "Notice %s not found."
 msgstr "API-metodia ei löytynyt."
 
-#: actions/oembed.php:80 actions/shownotice.php:100
+#. TRANS: Server error displayed in oEmbed action when notice has not profile.
 msgid "Notice has no profile."
 msgstr "Käyttäjällä ei ole profiilia."
 
-#: actions/oembed.php:83 actions/shownotice.php:172
+#. TRANS: oEmbed title. %1$s is the author name, %2$s is the creation date.
 #, php-format
 msgid "%1$s's status on %2$s"
 msgstr "Käyttäjän %1$s päivitys %2$s"
 
-#: actions/oembed.php:95
+#. TRANS: Server error displayed in oEmbed action when attachment not found.
+#. TRANS: %d is an attachment ID.
 #, fuzzy, php-format
 msgid "Attachment %s not found."
 msgstr "Vastaanottajaa ei löytynyt."
 
-#: actions/oembed.php:136
+#. TRANS: Server error displayed in oEmbed request when a path is not supported.
+#. TRANS: %s is a path.
 #, php-format
 msgid "\"%s\" not supported for oembed requests."
 msgstr ""
 
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
-#: actions/oembed.php:168
 #, fuzzy, php-format
 msgid "Content type %s not supported."
 msgstr "Yhdistä"
 
 #. TRANS: Error message displaying attachments. %s is the site's base URL.
-#: actions/oembed.php:172
 #, php-format
 msgid "Only %s URLs over plain HTTP please."
 msgstr ""
 
+#. TRANS: Server error displayed in oEmbed action when request specifies an unsupported data format.
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1207
-#: lib/apiaction.php:1234 lib/apiaction.php:1369
 msgid "Not a supported data format."
 msgstr "Tuo ei ole tuettu tietomuoto."
 
 #. TRANS: ShortName in the OpenSearch interface when trying to find users.
-#: actions/opensearch.php:64
 msgid "People Search"
 msgstr "Etsi ihmisiä"
 
-#: actions/opensearch.php:68
+#. TRANS: ShortName in the OpenSearch interface when trying to find notices.
 msgid "Notice Search"
 msgstr "Etsi Päivityksistä"
 
 #. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
-#: actions/otp.php:70
 #, fuzzy
 msgid "No user ID specified."
 msgstr "Ryhmää ei ole määritelty."
 
 #. TRANS: Client error displayed trying to use "one time password login" without specifying a login token.
-#: actions/otp.php:86
 #, fuzzy
 msgid "No login token specified."
 msgstr "Profiilia ei ole määritelty."
 
 #. TRANS: Client error displayed trying to use "one time password login" without requesting a login token.
-#: actions/otp.php:94
 msgid "No login token requested."
 msgstr "Ei valtuutuspyyntöä!"
 
 #. TRANS: Client error displayed trying to use "one time password login" while specifying an invalid login token.
-#: actions/otp.php:100
 #, fuzzy
 msgid "Invalid login token specified."
 msgstr "Päivityksen sisältö ei kelpaa"
 
 #. TRANS: Client error displayed trying to use "one time password login" while specifying an expired login token.
-#: actions/otp.php:110
 #, fuzzy
 msgid "Login token expired."
 msgstr "Kirjaudu sisään"
 
 #. TRANS: Title for outbox for any but the fist page.
 #. TRANS: %1$s is the user nickname, %2$d is the page number.
-#: actions/outbox.php:57
 #, fuzzy, php-format
 msgid "Outbox for %1$s - page %2$d"
 msgstr "Käyttäjän %s lähetetyt viestit"
 
 #. TRANS: Title for first page of outbox.
-#: actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
 msgstr "Käyttäjän %s lähetetyt viestit"
 
 #. TRANS: Instructions for outbox.
-#: actions/outbox.php:103
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr "Tämä on postilaatikkosi, jossa on lähettämäsi yksityisviestit."
 
-#: actions/passwordsettings.php:58
 msgid "Change password"
 msgstr "Vaihda salasana"
 
-#: actions/passwordsettings.php:69
 msgid "Change your password."
 msgstr "Vaihda salasanasi."
 
 #. TRANS: Fieldset legend for password reset form.
-#: actions/passwordsettings.php:96 actions/recoverpassword.php:251
 msgid "Password change"
 msgstr "Salasanan vaihto"
 
-#: actions/passwordsettings.php:104
 msgid "Old password"
 msgstr "Vanha salasana"
 
 #. TRANS: Field label for password reset form.
-#: actions/passwordsettings.php:108 actions/recoverpassword.php:256
 msgid "New password"
 msgstr "Uusi salasana"
 
-#: actions/passwordsettings.php:109 actions/register.php:416
 #, fuzzy
 msgid "6 or more characters."
 msgstr "6 tai useampia merkkejä"
 
 #. TRANS: Ttile for field label for password reset form where the password has to be typed again.
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:264
-#: actions/register.php:420
 #, fuzzy
 msgid "Same as password above."
 msgstr "Sama kuin ylläoleva salasana"
 
-#: actions/passwordsettings.php:117
 msgid "Change"
 msgstr "Vaihda"
 
-#: actions/passwordsettings.php:153 actions/register.php:223
 msgid "Password must be 6 or more characters."
 msgstr "Salasanassa pitää olla 6 tai useampia merkkejä."
 
-#: actions/passwordsettings.php:156 actions/register.php:226
 msgid "Passwords don't match."
 msgstr "Salasanat eivät täsmää."
 
-#: actions/passwordsettings.php:164
 msgid "Incorrect old password"
 msgstr "Väärä vanha salasana"
 
-#: actions/passwordsettings.php:180
 msgid "Error saving user; invalid."
 msgstr "Virhe tapahtui käyttäjän tallentamisessa; epäkelpo."
 
 #. TRANS: Reset password form validation error message.
-#: actions/passwordsettings.php:185 actions/recoverpassword.php:418
 #, fuzzy
 msgid "Cannot save new password."
 msgstr "Uutta salasanaa ei voida tallentaa."
 
-#: actions/passwordsettings.php:191
 msgid "Password saved."
 msgstr "Salasana tallennettu."
 
 #. TRANS: Title for Paths admin panel.
 #. TRANS: Menu item for site administration
-#: actions/pathsadminpanel.php:58 lib/adminpanelaction.php:371
 msgid "Paths"
 msgstr "Polut"
 
 #. TRANS: Form instructions for Path admin panel.
-#: actions/pathsadminpanel.php:69
 msgid "Path and server settings for this StatusNet site"
 msgstr ""
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the directory that could not be read from.
-#: actions/pathsadminpanel.php:155
 #, fuzzy, php-format
 msgid "Theme directory not readable: %s."
 msgstr "Pikaviestin ei ole käytettävissä."
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the avatar directory that could not be written to.
-#: actions/pathsadminpanel.php:163
 #, fuzzy, php-format
 msgid "Avatar directory not writable: %s."
 msgstr "Pikaviestin ei ole käytettävissä."
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the background directory that could not be written to.
-#: actions/pathsadminpanel.php:171
 #, fuzzy, php-format
 msgid "Background directory not writable: %s."
 msgstr "Taustakuvan hakemisto"
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the locales directory that could not be read from.
-#: actions/pathsadminpanel.php:181
 #, fuzzy, php-format
 msgid "Locales directory not readable: %s."
 msgstr "Pikaviestin ei ole käytettävissä."
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the SSL server URL that is too long.
-#: actions/pathsadminpanel.php:189
 msgid "Invalid SSL server. The maximum length is 255 characters."
 msgstr ""
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:235 actions/siteadminpanel.php:58
 #, fuzzy
 msgid "Site"
 msgstr "Kutsu"
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:241 actions/pathsadminpanel.php:279
-#: actions/pathsadminpanel.php:370 actions/pathsadminpanel.php:425
 #, fuzzy
 msgid "Server"
 msgstr "Palauta"
 
-#: actions/pathsadminpanel.php:242
 msgid "Site's server hostname."
 msgstr ""
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:248 actions/pathsadminpanel.php:288
-#: actions/pathsadminpanel.php:379 actions/pathsadminpanel.php:434
 #, fuzzy
 msgid "Path"
 msgstr "Polut"
 
-#: actions/pathsadminpanel.php:249
 #, fuzzy
 msgid "Site path."
 msgstr "Palvelun ilmoitus"
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:255
 #, fuzzy
 msgid "Locale directory"
 msgstr "Taustakuvan hakemisto"
 
-#: actions/pathsadminpanel.php:256
 msgid "Directory path to locales."
 msgstr ""
 
 #. TRANS: Checkbox label in Paths admin panel.
-#: actions/pathsadminpanel.php:263
 msgid "Fancy URLs"
 msgstr ""
 
-#: actions/pathsadminpanel.php:265
 msgid "Use fancy (more readable and memorable) URLs?"
 msgstr ""
 
-#: actions/pathsadminpanel.php:272
 msgid "Theme"
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:281
 #, fuzzy
 msgid "Server for themes."
 msgstr "Kirjaudu ulos palvelusta"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:290
 msgid "Web path to themes."
 msgstr ""
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:297 actions/pathsadminpanel.php:388
-#: actions/pathsadminpanel.php:443 actions/pathsadminpanel.php:495
 #, fuzzy
 msgid "SSL server"
 msgstr "Palauta"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:299
 msgid "SSL server for themes (default: SSL server)."
 msgstr ""
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:306 actions/pathsadminpanel.php:397
-#: actions/pathsadminpanel.php:452
 #, fuzzy
 msgid "SSL path"
 msgstr "Palvelun ilmoitus"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:308
 msgid "SSL path to themes (default: /theme/)."
 msgstr ""
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:315 actions/pathsadminpanel.php:406
-#: actions/pathsadminpanel.php:461
 #, fuzzy
 msgid "Directory"
 msgstr "Taustakuvan hakemisto"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:317
 msgid "Directory where themes are located."
 msgstr ""
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:326
 #, fuzzy
 msgid "Avatars"
 msgstr "Kuva"
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:333
 #, fuzzy
 msgid "Avatar server"
 msgstr "Profiilikuva-asetukset"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:335
 #, fuzzy
 msgid "Server for avatars."
 msgstr "Kirjaudu ulos palvelusta"
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:342
 #, fuzzy
 msgid "Avatar path"
 msgstr "Kuva päivitetty."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:344
 #, fuzzy
 msgid "Web path to avatars."
 msgstr "Profiilikuvan päivittäminen epäonnistui."
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:351
 msgid "Avatar directory"
 msgstr "Taustakuvan hakemisto"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:353
 msgid "Directory where avatars are located."
 msgstr ""
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:364
 msgid "Backgrounds"
 msgstr "Taustakuvat"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:372
 #, fuzzy
 msgid "Server for backgrounds."
 msgstr "Kirjaudu ulos palvelusta"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:381
 msgid "Web path to backgrounds."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:390
 msgid "Server for backgrounds on SSL pages."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:399
 msgid "Web path to backgrounds on SSL pages."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:408
 msgid "Directory where backgrounds are located."
 msgstr ""
 
 #. TRANS: Fieldset legens in Paths admin panel.
-#: actions/pathsadminpanel.php:419
 msgid "Attachments"
 msgstr "Liitteet"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:427
 #, fuzzy
 msgid "Server for attachments."
 msgstr "Kirjaudu ulos palvelusta"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:436
 #, fuzzy
 msgid "Web path to attachments."
 msgstr "Liitettä ei ole."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:445
 #, fuzzy
 msgid "Server for attachments on SSL pages."
 msgstr "Kirjaudu ulos palvelusta"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:454
 msgid "Web path to attachments on SSL pages."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:463
 msgid "Directory where attachments are located."
 msgstr ""
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:472
 #, fuzzy
 msgid "SSL"
 msgstr "SMS"
 
 #. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
-#: actions/pathsadminpanel.php:477 actions/snapshotadminpanel.php:202
 #, fuzzy
 msgid "Never"
 msgstr "Palauta"
 
 #. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
-#: actions/pathsadminpanel.php:479
 #, fuzzy
 msgid "Sometimes"
 msgstr "Päivitykset"
 
 #. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
-#: actions/pathsadminpanel.php:481
 #, fuzzy
 msgid "Always"
 msgstr "Aliakset"
 
-#: actions/pathsadminpanel.php:485
 msgid "Use SSL"
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:487
 msgid "When to use SSL."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:497
 msgid "Server to direct SSL requests to."
 msgstr ""
 
 #. TRANS: Button title text to store form data in the Paths admin panel.
-#: actions/pathsadminpanel.php:514
 #, fuzzy
 msgid "Save paths"
 msgstr "Palvelun ilmoitus"
 
 #. TRANS: Instructions for the "People search" page.
 #. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/peoplesearch.php:54
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
@@ -4489,57 +3702,46 @@ msgstr ""
 "olla 3 tai useamman merkin pituisia."
 
 #. TRANS: Title of a page where users can search for other users.
-#: actions/peoplesearch.php:61
 msgid "People search"
 msgstr "Etsi ihmisiä"
 
-#: actions/peopletag.php:68
 #, php-format
 msgid "Not a valid people tag: %s."
 msgstr "Tuo ei ole kelvollinen sähköpostiosoite."
 
-#: actions/peopletag.php:142
 #, fuzzy, php-format
 msgid "Users self-tagged with %1$s - page %2$d"
 msgstr "Käyttäjät joilla henkilötagi %s - sivu %d"
 
 #. TRANS: Page title for AJAX form return when a disabling a plugin.
-#: actions/plugindisable.php:69
 msgctxt "plugin"
 msgid "Disabled"
 msgstr ""
 
 #. TRANS: Client error displayed trying to perform any request method other than POST.
 #. TRANS: Do not translate POST.
-#: actions/pluginenable.php:78 actions/subscribe.php:77
 msgid "This action only accepts POST requests."
 msgstr ""
 
-#: actions/pluginenable.php:102
 #, fuzzy
 msgid "You cannot administer plugins."
 msgstr "Sinä et voi poistaa käyttäjiä."
 
-#: actions/pluginenable.php:109
 #, fuzzy
 msgid "No such plugin."
 msgstr "Sivua ei ole."
 
 #. TRANS: Page title for AJAX form return when enabling a plugin.
-#: actions/pluginenable.php:159
 msgctxt "plugin"
 msgid "Enabled"
 msgstr ""
 
 #. TRANS: Tab and title for plugins admin panel.
 #. TRANS: Menu item for site administration
-#: actions/pluginsadminpanel.php:56 actions/version.php:191
-#: lib/adminpanelaction.php:411
 msgid "Plugins"
 msgstr ""
 
 #. TRANS: Instructions at top of plugin admin page.
-#: actions/pluginsadminpanel.php:68
 msgid ""
 "Additional plugins can be enabled and configured manually. See the <a href="
 "\"http://status.net/wiki/Plugins\">online plugin documentation</a> for more "
@@ -4547,32 +3749,26 @@ msgid ""
 msgstr ""
 
 #. TRANS: Admin form section header
-#: actions/pluginsadminpanel.php:84
 #, fuzzy
 msgid "Default plugins"
 msgstr "Ensisijainen kieli"
 
-#: actions/pluginsadminpanel.php:106
 msgid ""
 "All default plugins have been disabled from the site's configuration file."
 msgstr ""
 
-#: actions/postnotice.php:95
 msgid "Invalid notice content."
 msgstr "Koko ei kelpaa."
 
-#: actions/postnotice.php:101
 #, php-format
 msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’."
 msgstr ""
 
 #. TRANS: Page title for profile settings.
-#: actions/profilesettings.php:60
 msgid "Profile settings"
 msgstr "Profiiliasetukset"
 
 #. TRANS: Usage instructions for profile settings.
-#: actions/profilesettings.php:71
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
@@ -4580,12 +3776,10 @@ msgstr ""
 "enemmän."
 
 #. TRANS: Profile settings form legend.
-#: actions/profilesettings.php:99
 msgid "Profile information"
 msgstr "Profiilitieto"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:110 actions/register.php:412
 #, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr ""
@@ -4593,20 +3787,15 @@ msgstr ""
 "välilyöntejä"
 
 #. TRANS: Field label in form for profile settings.
-#: actions/profilesettings.php:114 actions/register.php:434
-#: lib/groupeditform.php:150
 msgid "Full name"
 msgstr "Koko nimi"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:119 actions/register.php:439
-#: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "Kotisivu"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:122 actions/register.php:441
 #, fuzzy
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr "Kotisivusi, blogisi tai toisella sivustolla olevan profiilisi osoite."
@@ -4614,7 +3803,6 @@ msgstr "Kotisivusi, blogisi tai toisella sivustolla olevan profiilisi osoite."
 #. TRANS: Tooltip for field label in form for profile settings. Plural
 #. TRANS: is decided by the number of characters available for the
 #. TRANS: biography (%d).
-#: actions/profilesettings.php:130 actions/register.php:450
 #, fuzzy, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4622,42 +3810,32 @@ msgstr[0] "Kuvaile itseäsi ja kiinnostuksen kohteitasi %d merkillä"
 msgstr[1] "Kuvaile itseäsi ja kiinnostuksen kohteitasi %d merkillä"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:136 actions/register.php:455
 msgid "Describe yourself and your interests"
 msgstr "Kuvaile itseäsi ja kiinnostuksen kohteitasi"
 
 #. TRANS: Text area label in form for profile settings where users can provide.
 #. TRANS: their biography.
-#: actions/profilesettings.php:140 actions/register.php:457
 msgid "Bio"
 msgstr "Tietoja"
 
 #. TRANS: Field label in form for profile settings.
-#: actions/profilesettings.php:146 actions/register.php:462
-#: lib/groupeditform.php:173
 msgid "Location"
 msgstr "Kotipaikka"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:149
 #, fuzzy
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Olinpaikka kuten \"Kaupunki, Maakunta (tai Lääni), Maa\""
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:154
 msgid "Share my current location when posting notices"
 msgstr ""
 
 #. TRANS: Field label in form for profile settings.
-#: actions/profilesettings.php:162 actions/tagother.php:128
-#: actions/tagother.php:188 lib/subscriptionlist.php:104
-#: lib/subscriptionlist.php:106
 msgid "Tags"
 msgstr "Tagit"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:165
 #, fuzzy
 msgid ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- "
@@ -4667,28 +3845,23 @@ msgstr ""
 "ääkköset, numeroita, -, ., ja _), pilkulla tai välilyönnillä erotettuna"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:170
 msgid "Language"
 msgstr "Kieli"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:172
 #, fuzzy
 msgid "Preferred language."
 msgstr "Ensisijainen kieli"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:182
 msgid "Timezone"
 msgstr "Aikavyöhyke"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:184
 msgid "What timezone are you normally in?"
 msgstr "Millä aikavyöhykkeellä olet tavallisesti?"
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:190
 #, fuzzy
 msgid ""
 "Automatically subscribe to whoever subscribes to me (best for non-humans)."
@@ -4699,7 +3872,6 @@ msgstr ""
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Plural form is used based on the maximum number of allowed
 #. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:259 actions/register.php:214
 #, fuzzy, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4707,85 +3879,69 @@ msgstr[0] "kuvaus on liian pitkä (max %d merkkiä)."
 msgstr[1] "kuvaus on liian pitkä (max %d merkkiä)."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:270 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr "Aikavyöhykettä ei ole valittu."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:278
 #, fuzzy
 msgid "Language is too long (maximum 50 characters)."
 msgstr "Kieli on liian pitkä (enintään 50 merkkiä)."
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:292
 #, fuzzy, php-format
 msgid "Invalid tag: \"%s\"."
 msgstr "Virheellinen tagi: \"%s\""
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:348
 #, fuzzy
 msgid "Could not update user for autosubscribe."
 msgstr "Ei voitu asettaa käyttäjälle automaattista tilausta."
 
 #. TRANS: Server error thrown when user profile location preference settings could not be updated.
-#: actions/profilesettings.php:406
 #, fuzzy
 msgid "Could not save location prefs."
 msgstr "Tageja ei voitu tallentaa."
 
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:428 actions/tagother.php:179
 msgid "Could not save tags."
 msgstr "Tagien tallennus epäonnistui."
 
 #. TRANS: Confirmation shown when user profile settings are saved.
 #. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:437 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "Asetukset tallennettu."
 
 #. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
 #. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:484 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "Luo uusi ryhmä"
 
-#: actions/public.php:83
 #, php-format
 msgid "Beyond the page limit (%s)."
 msgstr ""
 
-#: actions/public.php:92
 msgid "Could not retrieve public stream."
 msgstr "Julkista päivitysvirtaa ei saatu."
 
-#: actions/public.php:130
 #, php-format
 msgid "Public timeline, page %d"
 msgstr "Julkinen aikajana, sivu %d"
 
-#: actions/public.php:132 lib/publicgroupnav.php:79
 msgid "Public timeline"
 msgstr "Julkinen aikajana"
 
-#: actions/public.php:160
 msgid "Public Stream Feed (RSS 1.0)"
 msgstr "Julkinen syöte (RSS 1.0)"
 
-#: actions/public.php:164
 msgid "Public Stream Feed (RSS 2.0)"
 msgstr "Julkisen Aikajanan Syöte (RSS 2.0)"
 
-#: actions/public.php:168
 msgid "Public Stream Feed (Atom)"
 msgstr "Julkinen syöte (Atom)"
 
-#: actions/public.php:188
 #, fuzzy, php-format
 msgid ""
 "This is the public timeline for %%site.name%% but no one has posted anything "
@@ -4794,17 +3950,14 @@ msgstr ""
 "Tämä on käyttäjän %s ja kavereiden aikajana, mutta kukaan ei ole lähettyänyt "
 "vielä mitään."
 
-#: actions/public.php:191
 msgid "Be the first to post!"
 msgstr "Ole ensimmäinen joka lähettää päivityksen!"
 
-#: actions/public.php:195
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post!"
 msgstr ""
 
-#: actions/public.php:242
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -4813,7 +3966,6 @@ msgid ""
 "friends, family, and colleagues! ([Read more](%%doc.help%%))"
 msgstr ""
 
-#: actions/public.php:247
 #, fuzzy, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -4824,19 +3976,16 @@ msgstr ""
 "blogging)palvelu "
 
 #. TRANS: Public RSS feed description. %s is the StatusNet site name.
-#: actions/publicrss.php:106
 #, fuzzy, php-format
 msgid "%s updates from everyone."
 msgstr "%s päivitykset kaikilta!"
 
 #. TRANS: Title for public tag cloud.
-#: actions/publictagcloud.php:57
 msgid "Public tag cloud"
 msgstr "Julkinen tagipilvi"
 
 #. TRANS: Instructions (more used like an explanation/header).
 #. TRANS: %s is the StatusNet sitename.
-#: actions/publictagcloud.php:65
 #, fuzzy, php-format
 msgid "These are most popular recent tags on %s"
 msgstr "Nämä ovat suosituimmat viimeaikaiset tagit %s -palvelussa"
@@ -4844,7 +3993,6 @@ msgstr "Nämä ovat suosituimmat viimeaikaiset tagit %s -palvelussa"
 #. TRANS: This message contains a Markdown URL. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.
-#: actions/publictagcloud.php:74
 #, php-format
 msgid "No one has posted a notice with a [hashtag](%%doc.tags%%) yet."
 msgstr ""
@@ -4853,7 +4001,6 @@ 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.
-#: actions/publictagcloud.php:79
 msgid "Be the first to post one!"
 msgstr "Ole ensimmäinen joka lähettää päivityksen!"
 
@@ -4862,7 +4009,6 @@ msgstr "Ole ensimmäinen joka lähettää päivityksen!"
 #. TRANS: This message contains a Markdown URL. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.
-#: actions/publictagcloud.php:87
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post "
@@ -4870,42 +4016,34 @@ msgid ""
 msgstr ""
 
 #. TRANS: Client error displayed trying to recover password while already logged in.
-#: actions/recoverpassword.php:37
 msgid "You are already logged in!"
 msgstr "Olet jo kirjautunut sisään!"
 
 #. TRANS: Client error displayed when password recovery code is not correct.
-#: actions/recoverpassword.php:64
 msgid "No such recovery code."
 msgstr "Palautuskoodia ei ole."
 
 #. TRANS: Client error displayed when no proper password recovery code was submitted.
-#: actions/recoverpassword.php:69
 msgid "Not a recovery code."
 msgstr "Tuo ei ole palautuskoodi."
 
 #. TRANS: Server error displayed trying to recover password without providing a user.
-#: actions/recoverpassword.php:77
 msgid "Recovery code for unknown user."
 msgstr "Tuntemattoman käyttäjän palautuskoodi"
 
 #. TRANS: Server error displayed removing a password recovery code from the database.
-#: actions/recoverpassword.php:91
 msgid "Error with confirmation code."
 msgstr "Virhe vahvistuskoodin kanssa."
 
 #. TRANS: Client error displayed trying to recover password with too old a recovery code.
-#: actions/recoverpassword.php:103
 msgid "This confirmation code is too old. Please start again."
 msgstr "Vahvistuskoodi on liian vanha. Aloita uudelleen."
 
 #. TRANS: Server error displayed when updating a user's e-mail address in the database fails while recovering a password.
-#: actions/recoverpassword.php:118
 msgid "Could not update user with confirmed email address."
 msgstr "Ei voitu päivittää käyttäjälle vahvistettua sähköpostiosoitetta."
 
 #. TRANS: Page notice for password recovery page.
-#: actions/recoverpassword.php:160
 #, fuzzy
 msgid ""
 "If you have forgotten or lost your password, you can get a new one sent to "
@@ -4914,101 +4052,83 @@ msgstr ""
 "Ohjeet salasanan palauttamiseksi on lähetetty sähköpostiisiosoitteeseen, "
 "joka on rekisteröity käyttäjätunnuksellesi."
 
-#: actions/recoverpassword.php:167
 msgid "You have been identified. Enter a new password below."
 msgstr "Sinut on tunnistettu. Syötä uusi salasana alapuolelle."
 
 #. TRANS: Fieldset legend for password recovery page.
-#: actions/recoverpassword.php:198
 msgid "Password recovery"
 msgstr "Salasanan palautus"
 
 #. TRANS: Field label on password recovery page.
-#: actions/recoverpassword.php:202
 msgid "Nickname or email address"
 msgstr "Käyttäjätunnus tai sähköpostiosoite"
 
 #. TRANS: Title for field label on password recovery page.
-#: actions/recoverpassword.php:205
 msgid "Your nickname on this server, or your registered email address."
 msgstr ""
 "Käyttäjätunnuksesi tässä palvelussa tai rekisteröity sähköpostiosoitteesi."
 
 #. TRANS: Field label on password recovery page.
-#: actions/recoverpassword.php:212
 msgid "Recover"
 msgstr "Palauta"
 
 #. TRANS: Button text on password recovery page.
-#: actions/recoverpassword.php:214
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Recover"
 msgstr "Palauta"
 
 #. TRANS: Title for password recovery page in password reset mode.
-#: actions/recoverpassword.php:223
 msgid "Reset password"
 msgstr "Vaihda salasana"
 
 #. TRANS: Title for password recovery page in password recover mode.
-#: actions/recoverpassword.php:225
 msgid "Recover password"
 msgstr "Salasanan palautus"
 
 #. TRANS: Title for password recovery page in email sent mode.
 #. TRANS: Subject for password recovery e-mail.
-#: actions/recoverpassword.php:227 actions/recoverpassword.php:366
 msgid "Password recovery requested"
 msgstr "Salasanan palautuspyyntö lähetetty."
 
 #. TRANS: Title for password recovery page in password saved mode.
-#: actions/recoverpassword.php:229
 #, fuzzy
 msgid "Password saved"
 msgstr "Salasana tallennettu."
 
 #. TRANS: Title for password recovery page when an unknown action has been specified.
-#: actions/recoverpassword.php:232
 msgid "Unknown action"
 msgstr "Tuntematon toiminto"
 
 #. TRANS: Title for field label for password reset form.
-#: actions/recoverpassword.php:258
 #, fuzzy
 msgid "6 or more characters, and do not forget it!"
 msgstr "6 tai useampia merkkejä äläkä unohda mitä kirjoitit!"
 
 #. TRANS: Button text for password reset form.
 #. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: actions/recoverpassword.php:268 lib/designform.php:145
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Reset"
 msgstr "Vaihda"
 
 #. TRANS: Form instructions for password recovery form.
-#: actions/recoverpassword.php:278
 msgid "Enter a nickname or email address."
 msgstr "Syötä käyttäjätunnus tai sähköpostiosoite"
 
 #. TRANS: Information on password recovery form if no known username or e-mail address was specified.
-#: actions/recoverpassword.php:309
 msgid "No user with that email address or username."
 msgstr "Käyttäjää tuolla sähköpostilla tai käyttäjätunnuksella ei ole."
 
 #. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
-#: actions/recoverpassword.php:327
 msgid "No registered email address for that user."
 msgstr "Rekisteröityä sähköpostiosoitetta ei ole tälle käyttäjälle."
 
 #. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
-#: actions/recoverpassword.php:342
 msgid "Error saving address confirmation."
 msgstr "Virhe tapahtui osoitevahvistuksen tallentamisessa"
 
 #. TRANS: User notification after an e-mail with instructions was sent from the password recovery form.
-#: actions/recoverpassword.php:370
 msgid ""
 "Instructions for recovering your password have been sent to the email "
 "address registered to your account."
@@ -5017,126 +4137,100 @@ msgstr ""
 "joka on rekisteröity käyttäjätunnuksellesi."
 
 #. TRANS: Client error displayed when trying to reset as password without providing a user.
-#: actions/recoverpassword.php:391
 msgid "Unexpected password reset."
 msgstr "Odottamaton salasanan uudelleenasetus."
 
 #. TRANS: Reset password form validation error message.
-#: actions/recoverpassword.php:400
 #, fuzzy
 msgid "Password must be 6 characters or more."
 msgstr "Salasanassa pitää olla 6 tai useampia merkkejä."
 
 #. TRANS: Reset password form validation error message.
-#: actions/recoverpassword.php:405
 msgid "Password and confirmation do not match."
 msgstr "Salasana ja salasanan vahvistus eivät täsmää."
 
 #. TRANS: Server error displayed when something does wrong with the user object during password reset.
-#: actions/recoverpassword.php:426 actions/register.php:241
 msgid "Error setting user."
 msgstr "Virhe tapahtui käyttäjän asettamisessa."
 
 #. TRANS: Success message for user after password reset.
-#: actions/recoverpassword.php:434
 msgid "New password successfully saved. You are now logged in."
 msgstr ""
 "Uusi salasana tallennettiin onnistuneesti. Olet nyt kirjautunut sisään."
 
-#: actions/redirecturl.php:70
 #, fuzzy
 msgid "No id parameter"
 msgstr "Ei id parametria."
 
-#: actions/redirecturl.php:76
 #, fuzzy, php-format
 msgid "No such file \"%d\""
 msgstr "Tiedostoa ei ole."
 
-#: actions/register.php:80 actions/register.php:181 actions/register.php:392
 msgid "Sorry, only invited people can register."
 msgstr "Valitettavasti vain kutsutut ihmiset voivat rekisteröityä."
 
-#: actions/register.php:87
 msgid "Sorry, invalid invitation code."
 msgstr "Virheellinen kutsukoodin."
 
-#: actions/register.php:106
 msgid "Registration successful"
 msgstr "Rekisteröityminen onnistui"
 
-#: actions/register.php:108 actions/register.php:490
 msgid "Register"
 msgstr "Rekisteröidy"
 
-#: actions/register.php:128
 msgid "Registration not allowed."
 msgstr "Rekisteröityminen ei ole sallittu."
 
-#: actions/register.php:194
 #, fuzzy
 msgid "You cannot register if you don't agree to the license."
 msgstr "Et voi rekisteröityä, jos et hyväksy lisenssiehtoja."
 
-#: actions/register.php:203
 msgid "Email address already exists."
 msgstr "Sähköpostiosoite on jo käytössä."
 
-#: actions/register.php:236 actions/register.php:258
 msgid "Invalid username or password."
 msgstr "Käyttäjätunnus tai salasana ei kelpaa."
 
-#: actions/register.php:333
 msgid ""
 "With this form you can create a new account. You can then post notices and "
 "link up to friends and colleagues."
 msgstr ""
 
-#: actions/register.php:424 actions/register.php:428
-#: actions/siteadminpanel.php:238 lib/settingsnav.php:92
 msgid "Email"
 msgstr "Sähköposti"
 
-#: actions/register.php:425 actions/register.php:429
 #, fuzzy
 msgid "Used only for updates, announcements, and password recovery."
 msgstr ""
 "Käytetään ainoastaan päivityksien lähettämiseen, ilmoitusasioihin ja "
 "salasanan uudelleen käyttöönottoon."
 
-#: actions/register.php:436
 #, fuzzy
 msgid "Longer name, preferably your \"real\" name."
 msgstr "Pitempi nimi, mieluiten oikea nimesi"
 
-#: actions/register.php:464
 #, fuzzy
 msgid "Where you are, like \"City, State (or Region), Country\"."
 msgstr "Olinpaikka kuten \"Kaupunki, Maakunta (tai Lääni), Maa\""
 
-#: actions/register.php:503
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
 msgstr ""
 
-#: actions/register.php:513
 #, php-format
 msgid "My text and files are copyright by %1$s."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:517
 msgid "My text and files remain under my own copyright."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:520
 msgid "All rights reserved."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:525
 #, fuzzy, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -5145,7 +4239,6 @@ msgstr ""
 "poislukien yksityinen tieto: salasana, sähköpostiosoite, IM-osoite, "
 "puhelinnumero."
 
-#: actions/register.php:566
 #, fuzzy, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -5178,7 +4271,6 @@ msgstr ""
 "\n"
 "Kiitokset rekisteröitymisestäsi ja toivomme että pidät palvelustamme."
 
-#: actions/register.php:590
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5186,7 +4278,6 @@ msgstr ""
 "(Saat pian sähköpostiisi viestin, jonka ohjeita seuraamalla voit vahvistaa "
 "sähköpostiosoitteesi.)"
 
-#: actions/remotesubscribe.php:97
 #, php-format
 msgid ""
 "To subscribe, you can [login](%%action.login%%), or [register](%%action."
@@ -5198,118 +4289,93 @@ msgstr ""
 "jo käyttäjätunnus  jossain [yhteensopivassa mikroblogauspalvelussa](%%doc."
 "openmublog%%),  syötä profiilisi URL-osoite alla olevaan kenttään."
 
-#: actions/remotesubscribe.php:111
 msgid "Remote subscribe"
 msgstr "Etätilaus"
 
-#: actions/remotesubscribe.php:123
 msgid "Subscribe to a remote user"
 msgstr "Tilaa tämä etäkäyttäjä"
 
-#: actions/remotesubscribe.php:128
 msgid "User nickname"
 msgstr "Käyttäjätunnus"
 
-#: actions/remotesubscribe.php:129
 #, fuzzy
 msgid "Nickname of the user you want to follow."
 msgstr "Käyttäjän, jota haluat seurata, käyttäjätunnus"
 
-#: actions/remotesubscribe.php:132
 msgid "Profile URL"
 msgstr "Profiilin URL"
 
-#: actions/remotesubscribe.php:133
 #, fuzzy
 msgid "URL of your profile on another compatible microblogging service."
 msgstr "Profiilisi URL-osoite toisessa yhteensopivassa mikroblogauspalvelussa"
 
 #. TRANS: Link text for link that will subscribe to a remote profile.
-#: actions/remotesubscribe.php:136 lib/subscribeform.php:139
-#: lib/userprofile.php:402
 msgid "Subscribe"
 msgstr "Tilaa"
 
-#: actions/remotesubscribe.php:158
 #, fuzzy
 msgid "Invalid profile URL (bad format)."
 msgstr "Profiilin URL-osoite '%s' ei kelpaa (virheellinen muoto)."
 
-#: actions/remotesubscribe.php:167
 #, fuzzy
 msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
 msgstr ""
 "Tuo ei ole kelvollinen profiilin verkko-osoite (YADIS dokumenttia ei "
 "löytynyt)."
 
-#: actions/remotesubscribe.php:175
 #, fuzzy
 msgid "That is a local profile! Login to subscribe."
 msgstr ""
 "Tämä on paikallinen profiili. Kirjaudu sisään, jotta voit tilata päivitykset."
 
-#: actions/remotesubscribe.php:182
 #, fuzzy
 msgid "Could not get a request token."
 msgstr "Ei saatu request tokenia."
 
-#: actions/repeat.php:56
 #, fuzzy
 msgid "Only logged-in users can repeat notices."
 msgstr "Vain käyttäjä voi lukea omaa postilaatikkoaan."
 
-#: actions/repeat.php:63 actions/repeat.php:70
 #, fuzzy
 msgid "No notice specified."
 msgstr "Profiilia ei ole määritelty."
 
-#: actions/repeat.php:75
 #, fuzzy
 msgid "You cannot repeat your own notice."
 msgstr "Et voi rekisteröityä, jos et hyväksy lisenssiehtoja."
 
-#: actions/repeat.php:89
 msgid "You already repeated that notice."
 msgstr "Sinä kuulut jo tähän ryhmään."
 
-#: actions/repeat.php:112 lib/noticelist.php:697
 #, fuzzy
 msgid "Repeated"
 msgstr "Luotu"
 
-#: actions/repeat.php:117
 #, fuzzy
 msgid "Repeated!"
 msgstr "Luotu"
 
 #. TRANS: RSS reply feed title. %s is a user nickname.
-#: actions/replies.php:126 actions/repliesrss.php:68
-#: lib/personalgroupnav.php:105
 #, php-format
 msgid "Replies to %s"
 msgstr "Vastaukset käyttäjälle %s"
 
-#: actions/replies.php:128
 #, php-format
 msgid "Replies to %1$s, page %2$d"
 msgstr "Vastaukset käyttäjälle %s"
 
-#: actions/replies.php:145
 #, fuzzy, php-format
 msgid "Replies feed for %s (RSS 1.0)"
 msgstr "Päivityksien syöte käyttäjälle %s"
 
-#: actions/replies.php:152
 #, fuzzy, php-format
 msgid "Replies feed for %s (RSS 2.0)"
 msgstr "Päivityksien syöte käyttäjälle %s"
 
-#: actions/replies.php:159
 #, php-format
 msgid "Replies feed for %s (Atom)"
 msgstr "Päivityksien syöte käyttäjälle %s"
 
-#: actions/replies.php:199
 #, php-format
 msgid ""
 "This is the timeline showing replies to %1$s but %2$s hasn't received a "
@@ -5318,14 +4384,12 @@ msgstr ""
 "Tämä on käyttäjän %s ja kavereiden aikajana, mutta kukaan ei ole lähettyänyt "
 "vielä mitään."
 
-#: actions/replies.php:204
 #, php-format
 msgid ""
 "You can engage other users in a conversation, subscribe to more people or "
 "[join groups](%%action.groups%%)."
 msgstr ""
 
-#: actions/replies.php:206
 #, fuzzy, php-format
 msgid ""
 "You can try to [nudge %1$s](../%2$s) or [post something to them](%%%%action."
@@ -5336,231 +4400,190 @@ msgstr ""
 
 #. TRANS: RSS reply feed description.
 #. TRANS: %1$s is a user nickname, %2$s is the StatusNet site name.
-#: actions/repliesrss.php:74
 #, fuzzy, php-format
 msgid "Replies to %1$s on %2$s."
 msgstr "Viesti käyttäjälle %1$s, %2$s"
 
 #. TRANS: Client exception displayed when trying to restore an account while not logged in.
-#: actions/restoreaccount.php:78
 #, fuzzy
 msgid "Only logged-in users can restore their account."
 msgstr "Vain käyttäjä voi lukea omaa postilaatikkoaan."
 
 #. TRANS: Client exception displayed when trying to restore an account without having restore rights.
-#: actions/restoreaccount.php:83
 #, fuzzy
 msgid "You may not restore your account."
 msgstr "Et voi rekisteröityä, jos et hyväksy lisenssiehtoja."
 
 #. TRANS: Client exception displayed trying to restore an account while something went wrong uploading a file.
 #. TRANS: Client exception. No file; probably just a non-AJAX submission.
-#: actions/restoreaccount.php:121 actions/restoreaccount.php:146
 #, fuzzy
 msgid "No uploaded file."
 msgstr "Lataa"
 
 #. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
-#: actions/restoreaccount.php:129 lib/mediafile.php:194
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
 msgstr ""
 
 #. TRANS: Client exception.
-#: actions/restoreaccount.php:135 lib/mediafile.php:200
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form."
 msgstr ""
 
 #. TRANS: Client exception.
-#: actions/restoreaccount.php:141 lib/mediafile.php:206
 msgid "The uploaded file was only partially uploaded."
 msgstr ""
 
 #. TRANS: Client exception thrown when a temporary folder is not present to store a file upload.
-#: actions/restoreaccount.php:150 lib/mediafile.php:214
 msgid "Missing a temporary folder."
 msgstr ""
 
 #. TRANS: Client exception thrown when writing to disk is not possible during a file upload operation.
-#: actions/restoreaccount.php:154 lib/mediafile.php:218
 msgid "Failed to write file to disk."
 msgstr ""
 
 #. TRANS: Client exception thrown when a file upload operation has been stopped by an extension.
-#: actions/restoreaccount.php:158 lib/mediafile.php:222
 msgid "File upload stopped by extension."
 msgstr ""
 
 #. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
 #. TRANS: Exception thrown when uploading an image fails for an unknown reason.
 #. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
-#: actions/restoreaccount.php:164 lib/imagefile.php:106 lib/mediafile.php:228
 msgid "System error uploading file."
 msgstr "Tiedoston lähetyksessä tapahtui järjestelmävirhe."
 
 #. TRANS: Client exception thrown when a feed is not an Atom feed.
-#: actions/restoreaccount.php:207
 #, fuzzy
 msgid "Not an Atom feed."
 msgstr "Kaikki jäsenet"
 
 #. TRANS: Success message when a feed has been restored.
-#: actions/restoreaccount.php:241
 msgid ""
 "Feed has been restored. Your old posts should now appear in search and your "
 "profile page."
 msgstr ""
 
 #. TRANS: Message when a feed restore is in progress.
-#: actions/restoreaccount.php:245
 msgid "Feed will be restored. Please wait a few minutes for results."
 msgstr ""
 
 #. TRANS: Form instructions for feed restore.
-#: actions/restoreaccount.php:342
 msgid ""
 "You can upload a backed-up stream in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format."
 msgstr ""
 
 #. TRANS: Title for submit button to confirm upload of a user backup file for account restore.
-#: actions/restoreaccount.php:373
 #, fuzzy
 msgid "Upload the file"
 msgstr "Lataa"
 
-#: actions/revokerole.php:75
 msgid "You cannot revoke user roles on this site."
 msgstr "Päivityksesi tähän palveluun on estetty."
 
-#: actions/revokerole.php:82
 #, fuzzy
 msgid "User doesn't have this role."
 msgstr "Käyttäjälle ei löydy profiilia"
 
-#: actions/rsd.php:142 actions/version.php:159
 #, fuzzy
 msgid "StatusNet"
 msgstr "Päivitys poistettu."
 
-#: actions/sandbox.php:65 actions/unsandbox.php:65
 #, fuzzy
 msgid "You cannot sandbox users on this site."
 msgstr "Et voi lähettää viestiä tälle käyttäjälle."
 
-#: actions/sandbox.php:72
 #, fuzzy
 msgid "User is already sandboxed."
 msgstr "Käyttäjä on asettanut eston sinulle."
 
 #. TRANS: Menu item for site administration
-#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
-#: lib/adminpanelaction.php:379
 msgid "Sessions"
 msgstr ""
 
-#: actions/sessionsadminpanel.php:65
 msgid "Session settings for this StatusNet site"
 msgstr ""
 
-#: actions/sessionsadminpanel.php:175
 msgid "Handle sessions"
 msgstr ""
 
-#: actions/sessionsadminpanel.php:177
 msgid "Whether to handle sessions ourselves."
 msgstr ""
 
-#: actions/sessionsadminpanel.php:181
 msgid "Session debugging"
 msgstr ""
 
-#: actions/sessionsadminpanel.php:183
 msgid "Turn on debugging output for sessions."
 msgstr ""
 
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
+#. TRANS: Submit button title.
+msgid "Save"
+msgstr "Tallenna"
+
 #, fuzzy
 msgid "Save site settings"
 msgstr "Profiilikuva-asetukset"
 
-#: actions/showapplication.php:78
 #, fuzzy
 msgid "You must be logged in to view an application."
 msgstr "Sinun pitää olla kirjautunut sisään, jotta voit erota ryhmästä."
 
-#: actions/showapplication.php:151
 #, fuzzy
 msgid "Application profile"
 msgstr "Päivitykselle ei ole profiilia"
 
-#: actions/showapplication.php:179
 #, php-format
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr ""
 
-#: actions/showapplication.php:189
 msgid "Application actions"
 msgstr ""
 
-#: actions/showapplication.php:212
 msgid "Reset key & secret"
 msgstr ""
 
 #. TRANS: Title of form for deleting a user.
-#: actions/showapplication.php:228 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:64 lib/noticelist.php:678
 msgid "Delete"
 msgstr "Poista"
 
-#: actions/showapplication.php:237
 msgid "Application info"
 msgstr ""
 
-#: actions/showapplication.php:255
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
 msgstr ""
 
-#: actions/showapplication.php:275
 #, fuzzy
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr "Oletko varma että haluat poistaa tämän päivityksen?"
 
 #. TRANS: Title for all but the first page of favourite notices of a user.
 #. TRANS: %1$s is the user for whom the favourite notices are displayed, %2$d is the page number.
-#: actions/showfavorites.php:80
 #, fuzzy, php-format
 msgid "%1$s's favorite notices, page %2$d"
 msgstr "Käyttäjän %s suosikkipäivitykset"
 
 #. TRANS: Server error displayed when favourite notices could not be retrieved from the database.
-#: actions/showfavorites.php:134
 msgid "Could not retrieve favorite notices."
 msgstr "Ei saatu haettua suosikkipäivityksiä."
 
 #. TRANS: Feed link text. %s is a username.
-#: actions/showfavorites.php:172
 #, php-format
 msgid "Feed for favorites of %s (RSS 1.0)"
 msgstr "Käyttäjän %s kavereiden syöte (RSS 1.0)"
 
 #. TRANS: Feed link text. %s is a username.
-#: actions/showfavorites.php:180
 #, php-format
 msgid "Feed for favorites of %s (RSS 2.0)"
 msgstr "Käyttäjän %s kavereiden syöte (RSS 2.0)"
 
 #. TRANS: Feed link text. %s is a username.
-#: actions/showfavorites.php:188
 #, php-format
 msgid "Feed for favorites of %s (Atom)"
 msgstr "Käyttäjän %s kavereiden syöte (Atom)"
 
 #. TRANS: Text displayed instead of favourite notices for the current logged in user that has no favourites.
-#: actions/showfavorites.php:209
 msgid ""
 "You haven't chosen any favorite notices yet. Click the fave button on "
 "notices you like to bookmark them for later or shed a spotlight on them."
@@ -5568,7 +4591,6 @@ msgstr ""
 
 #. TRANS: Text displayed instead of favourite notices for a user that has no favourites while logged in.
 #. TRANS: %s is a username.
-#: actions/showfavorites.php:213
 #, php-format
 msgid ""
 "%s hasn't added any favorite notices yet. Post something interesting they "
@@ -5578,7 +4600,6 @@ msgstr ""
 #. TRANS: Text displayed instead of favourite notices for a user that has no favourites while not logged in.
 #. TRANS: %s is a username, %%%%action.register%%%% is a link to the user registration page.
 #. TRANS: (link text)[link] is a Mark Down link.
-#: actions/showfavorites.php:220
 #, php-format
 msgid ""
 "%s hasn't added any favorite notices yet. Why not [register an account](%%%%"
@@ -5587,64 +4608,53 @@ msgid ""
 msgstr ""
 
 #. TRANS: Page notice for show favourites page.
-#: actions/showfavorites.php:251
 msgid "This is a way to share what you like."
 msgstr ""
 
 #. TRANS: Page title for first group page. %s is a group name.
-#: actions/showgroup.php:75
 #, php-format
 msgid "%s group"
 msgstr "Ryhmä %s"
 
 #. TRANS: Page title for any but first group page.
 #. TRANS: %1$s is a group name, $2$s is a page number.
-#: actions/showgroup.php:79
 #, php-format
 msgid "%1$s group, page %2$d"
 msgstr "Ryhmät, sivu %d"
 
 #. TRANS: Label for group description or group note (dt). Text hidden by default.
-#: actions/showgroup.php:266
 msgid "Note"
 msgstr "Huomaa"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:277 lib/groupeditform.php:180
 msgid "Aliases"
 msgstr "Aliakset"
 
 #. TRANS: Group actions header (h2). Text hidden by default.
-#: actions/showgroup.php:294
 msgid "Group actions"
 msgstr "Ryhmän toiminnot"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:338
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
 msgstr "Syöte ryhmän %s päivityksille (RSS 1.0)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:345
 #, php-format
 msgid "Notice feed for %s group (RSS 2.0)"
 msgstr "Syöte ryhmän %s päivityksille (RSS 2.0)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:352
 #, php-format
 msgid "Notice feed for %s group (Atom)"
 msgstr "Syöte ryhmän %s päivityksille (Atom)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:358
 #, php-format
 msgid "FOAF for %s group"
 msgstr "Käyttäjän %s lähetetyt viestit"
 
 #. TRANS: Header for mini list of group members on a group page (h2).
-#: actions/showgroup.php:395
 msgid "Members"
 msgstr "Jäsenet"
 
@@ -5652,32 +4662,25 @@ msgstr "Jäsenet"
 #. TRANS: Text for user subscription statistics if the user has no subscriptions.
 #. TRANS: Text for user subscriber statistics if user has no subscribers.
 #. TRANS: Text for user user group membership statistics if user is not a member of any group.
-#: actions/showgroup.php:401 lib/profileaction.php:137
-#: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
-#: lib/subscriptionlist.php:123 lib/tagcloudsection.php:71
 #, fuzzy
 msgid "(None)"
 msgstr "(Tyhjä)"
 
 #. TRANS: Link to all group members from mini list of group members if group has more than n members.
-#: actions/showgroup.php:410
 msgid "All members"
 msgstr "Kaikki jäsenet"
 
 #. TRANS: Header for group statistics on a group page (h2).
 #. TRANS: H2 text for user statistics.
-#: actions/showgroup.php:441 lib/profileaction.php:205
 msgid "Statistics"
 msgstr "Tilastot"
 
-#: actions/showgroup.php:444
 #, fuzzy
 msgctxt "LABEL"
 msgid "Created"
 msgstr "Luotu"
 
 #. TRANS: Label for member count in statistics on group page.
-#: actions/showgroup.php:449
 #, fuzzy
 msgctxt "LABEL"
 msgid "Members"
@@ -5687,7 +4690,6 @@ msgstr "Jäsenet"
 #. TRANS: **%s** is the group alias, %%%%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).
-#: actions/showgroup.php:464
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5700,7 +4702,6 @@ 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: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
-#: actions/showgroup.php:474
 #, fuzzy, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5712,93 +4713,78 @@ msgstr ""
 "(http://en.wikipedia.org/wiki/Micro-blogging)"
 
 #. TRANS: Header for list of group administrators on a group page (h2).
-#: actions/showgroup.php:503
 msgid "Admins"
 msgstr "Ylläpitäjät"
 
 #. TRANS: Client error displayed requesting a single message that does not exist.
-#: actions/showmessage.php:76
 msgid "No such message."
 msgstr "Tuota viestiä ei ole."
 
 #. TRANS: Client error displayed requesting a single direct message the requesting user was not a party in.
-#: actions/showmessage.php:86
 msgid "Only the sender and recipient may read this message."
 msgstr "Vain lähettäjä ja vastaanottaja voivat lukea tämän viestin."
 
 #. TRANS: Page title for single direct message display when viewing user is the sender.
 #. TRANS: %1$s is the addressed user's nickname, $2$s is a timestamp.
-#: actions/showmessage.php:105
 #, php-format
 msgid "Message to %1$s on %2$s"
 msgstr "Viesti käyttäjälle %1$s, %2$s"
 
 #. TRANS: Page title for single message display.
 #. TRANS: %1$s is the sending user's nickname, $2$s is a timestamp.
-#: actions/showmessage.php:113
 #, php-format
 msgid "Message from %1$s on %2$s"
 msgstr "Viesti käyttäjältä %1$s, %2$s"
 
-#: actions/shownotice.php:90
 msgid "Notice deleted."
 msgstr "Päivitys on poistettu."
 
 #. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
-#: actions/showstream.php:70
 #, fuzzy, php-format
 msgid "%1$s tagged %2$s"
 msgstr "Ryhmät, sivu %d"
 
 #. TRANS: Page title showing tagged notices in one user's stream.
 #. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
-#: actions/showstream.php:74
 #, fuzzy, php-format
 msgid "%1$s tagged %2$s, page %3$d"
 msgstr "Päivitykset joilla on tagi %s"
 
 #. TRANS: Extended page title showing tagged notices in one user's stream.
 #. TRANS: %1$s is the username, %2$d is the page number.
-#: actions/showstream.php:82
 #, php-format
 msgid "%1$s, page %2$d"
 msgstr "Ryhmät, sivu %d"
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %1$s is a user nickname, %2$s is a hashtag.
-#: actions/showstream.php:127
 #, php-format
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
 msgstr "Syöte ryhmän %s päivityksille (RSS 1.0)"
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.
-#: actions/showstream.php:136
 #, php-format
 msgid "Notice feed for %s (RSS 1.0)"
 msgstr "Syöte ryhmän %s päivityksille (RSS 1.0)"
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.
-#: actions/showstream.php:145
 #, php-format
 msgid "Notice feed for %s (RSS 2.0)"
 msgstr "Syöte ryhmän %s päivityksille (RSS 2.0)"
 
-#: actions/showstream.php:152
 #, php-format
 msgid "Notice feed for %s (Atom)"
 msgstr "Syöte ryhmän %s päivityksille (Atom)"
 
 #. TRANS: Title for link to notice feed. FOAF stands for Friend of a Friend.
 #. TRANS: More information at http://www.foaf-project.org. %s is a user nickname.
-#: actions/showstream.php:159
 #, fuzzy, php-format
 msgid "FOAF for %s"
 msgstr "Käyttäjän %s lähetetyt viestit"
 
 #. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
-#: actions/showstream.php:205
 #, fuzzy, php-format
 msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr ""
@@ -5806,7 +4792,6 @@ msgstr ""
 "vielä mitään."
 
 #. TRANS: Second sentence of empty list message for a stream for the user themselves.
-#: actions/showstream.php:211
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
@@ -5814,7 +4799,6 @@ msgstr ""
 
 #. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:215
 #, fuzzy, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
@@ -5825,7 +4809,6 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:258
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5836,7 +4819,6 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:265
 #, fuzzy, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5847,231 +4829,184 @@ msgstr ""
 "[mikroblogauspalvelu](http://en.wikipedia.org/wiki/Micro-blogging)"
 
 #. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
-#: actions/showstream.php:322
 #, fuzzy, php-format
 msgid "Repeat of %s"
 msgstr "Vastaukset käyttäjälle %s"
 
-#: actions/silence.php:65 actions/unsilence.php:65
 #, fuzzy
 msgid "You cannot silence users on this site."
 msgstr "Et voi lähettää viestiä tälle käyttäjälle."
 
-#: actions/silence.php:72
 #, fuzzy
 msgid "User is already silenced."
 msgstr "Käyttäjä on asettanut eston sinulle."
 
-#: actions/siteadminpanel.php:69
 #, fuzzy
 msgid "Basic settings for this StatusNet site"
 msgstr "Ulkoasuasetukset tälle StatusNet palvelulle."
 
-#: actions/siteadminpanel.php:133
 msgid "Site name must have non-zero length."
 msgstr ""
 
-#: actions/siteadminpanel.php:141
 msgid "You must have a valid contact email address."
 msgstr "Tuo ei ole kelvollinen sähköpostiosoite."
 
-#: actions/siteadminpanel.php:159
 #, php-format
 msgid "Unknown language \"%s\"."
 msgstr ""
 
-#: actions/siteadminpanel.php:165
 msgid "Minimum text limit is 0 (unlimited)."
 msgstr ""
 
-#: actions/siteadminpanel.php:171
 msgid "Dupe limit must be one or more seconds."
 msgstr ""
 
-#: actions/siteadminpanel.php:221
 msgid "General"
 msgstr ""
 
-#: actions/siteadminpanel.php:224
 #, fuzzy
 msgid "Site name"
 msgstr "Palvelun ilmoitus"
 
-#: actions/siteadminpanel.php:225
 msgid "The name of your site, like \"Yourcompany Microblog\""
 msgstr ""
 
-#: actions/siteadminpanel.php:229
 msgid "Brought by"
 msgstr ""
 
-#: actions/siteadminpanel.php:230
 msgid "Text used for credits link in footer of each page"
 msgstr ""
 
-#: actions/siteadminpanel.php:234
 msgid "Brought by URL"
 msgstr ""
 
-#: actions/siteadminpanel.php:235
 msgid "URL used for credits link in footer of each page"
 msgstr ""
 
-#: actions/siteadminpanel.php:239
 #, fuzzy
 msgid "Contact email address for your site"
 msgstr "Uusi sähköpostiosoite päivityksien lähettämiseen palveluun %s"
 
-#: actions/siteadminpanel.php:245
 #, fuzzy
 msgid "Local"
 msgstr "Paikalliset näkymät"
 
-#: actions/siteadminpanel.php:256
 msgid "Default timezone"
 msgstr ""
 
-#: actions/siteadminpanel.php:257
 msgid "Default timezone for the site; usually UTC."
 msgstr ""
 
-#: actions/siteadminpanel.php:262
 #, fuzzy
 msgid "Default language"
 msgstr "Ensisijainen kieli"
 
-#: actions/siteadminpanel.php:263
 msgid "Site language when autodetection from browser settings is not available"
 msgstr ""
 
-#: actions/siteadminpanel.php:271
 msgid "Limits"
 msgstr ""
 
-#: actions/siteadminpanel.php:274
 msgid "Text limit"
 msgstr ""
 
-#: actions/siteadminpanel.php:274
 msgid "Maximum number of characters for notices."
 msgstr ""
 
-#: actions/siteadminpanel.php:278
 msgid "Dupe limit"
 msgstr ""
 
-#: actions/siteadminpanel.php:278
 msgid "How long users must wait (in seconds) to post the same thing again."
 msgstr ""
 
 #. TRANS: Page title for site-wide notice tab in admin panel.
-#: actions/sitenoticeadminpanel.php:55
 #, fuzzy
 msgid "Site Notice"
 msgstr "Palvelun ilmoitus"
 
 #. TRANS: Instructions for site-wide notice tab in admin panel.
-#: actions/sitenoticeadminpanel.php:66
 #, fuzzy
 msgid "Edit site-wide message"
 msgstr "Uusi viesti"
 
 #. TRANS: Server error displayed when saving a site-wide notice was impossible.
-#: actions/sitenoticeadminpanel.php:101
 #, fuzzy
 msgid "Unable to save site notice."
 msgstr "Twitter-asetuksia ei voitu tallentaa!"
 
 #. TRANS: Client error displayed when a site-wide notice was longer than allowed.
-#: actions/sitenoticeadminpanel.php:112
 msgid "Maximum length for the site-wide notice is 255 characters."
 msgstr ""
 
 #. TRANS: Label for site-wide notice text field in admin panel.
-#: actions/sitenoticeadminpanel.php:176
 #, fuzzy
 msgid "Site notice text"
 msgstr "Palvelun ilmoitus"
 
 #. TRANS: Tooltip for site-wide notice text field in admin panel.
-#: actions/sitenoticeadminpanel.php:179
 msgid "Site-wide notice text (255 characters maximum; HTML allowed)"
 msgstr ""
 
 #. TRANS: Title for button to save site notice in admin panel.
-#: actions/sitenoticeadminpanel.php:201
 #, fuzzy
 msgid "Save site notice."
 msgstr "Palvelun ilmoitus"
 
 #. TRANS: Title for SMS settings.
-#: actions/smssettings.php:56
 msgid "SMS settings"
 msgstr "Profiilikuva-asetukset"
 
 #. TRANS: SMS settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/smssettings.php:70
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr ""
 "Voit saada SMS viestit sähköpostin välityksellä %%site.name%% -palvelusta."
 
 #. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
-#: actions/smssettings.php:92
 msgid "SMS is not available."
 msgstr "SMS ei ole käytettävissä."
 
 #. TRANS: Form legend for SMS settings form.
-#: actions/smssettings.php:106
 msgid "SMS address"
 msgstr "Sähköpostiosoitteet"
 
 #. TRANS: Form guide in SMS settings form.
-#: actions/smssettings.php:115
 msgid "Current confirmed SMS-enabled phone number."
 msgstr "Tämän hetken vahvistettu SMS puhelinnumero."
 
 #. TRANS: Form guide in IM settings form.
-#: actions/smssettings.php:128
 msgid "Awaiting confirmation on this phone number."
 msgstr "Odotetaan vahvistusta tälle puhelinnumerolle."
 
 #. TRANS: Field label for SMS address input in SMS settings form.
-#: actions/smssettings.php:137
 msgid "Confirmation code"
 msgstr "Vahvistuskoodi"
 
 #. TRANS: Form field instructions in SMS settings form.
-#: actions/smssettings.php:139
 msgid "Enter the code you received on your phone."
 msgstr "Syötä koodi jonka sait puhelimeesi."
 
 #. TRANS: Button label to confirm SMS confirmation code in SMS settings.
-#: actions/smssettings.php:143
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Confirm"
 msgstr "Vahvista"
 
 #. TRANS: Field label for SMS phone number input in SMS settings form.
-#: actions/smssettings.php:148
 msgid "SMS phone number"
 msgstr "Puhelinnumeroa ei ole."
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
-#: actions/smssettings.php:151
 #, fuzzy
 msgid "Phone number, no punctuation or spaces, with area code."
 msgstr "Puhelinnumero, ei välimerkkejä tai välilyöntejä, suuntanumerollinen"
 
 #. TRANS: Form legend for SMS preferences form.
-#: actions/smssettings.php:190
 msgid "SMS preferences"
 msgstr "Asetukset tallennettu."
 
 #. TRANS: Checkbox label in SMS preferences form.
-#: actions/smssettings.php:196
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
@@ -6080,33 +5015,27 @@ msgstr ""
 "tästä matkapuhelinoperaattoriltani."
 
 #. TRANS: Confirmation message for successful SMS preferences save.
-#: actions/smssettings.php:307
 #, fuzzy
 msgid "SMS preferences saved."
 msgstr "Asetukset tallennettu."
 
 #. TRANS: Message given saving SMS phone number without having provided one.
-#: actions/smssettings.php:329
 msgid "No phone number."
 msgstr "Puhelinnumeroa ei ole."
 
 #. TRANS: Message given saving SMS phone number without having selected a carrier.
-#: actions/smssettings.php:335
 msgid "No carrier selected."
 msgstr "Operaattoria ei ole valittu."
 
 #. TRANS: Message given saving SMS phone number that is already set.
-#: actions/smssettings.php:343
 msgid "That is already your phone number."
 msgstr "Tämä on jo puhelinnumerosi."
 
 #. TRANS: Message given saving SMS phone number that is already set for another user.
-#: actions/smssettings.php:347
 msgid "That phone number already belongs to another user."
 msgstr "Tämä puhelinnumero kuuluu jo toiselle käyttäjälle."
 
 #. TRANS: Message given saving valid SMS phone number that is to be confirmed.
-#: actions/smssettings.php:375
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
 "for the code and instructions on how to use it."
@@ -6115,40 +5044,33 @@ msgstr ""
 "vahvistuskoodisi ja ohjeet miten sitä käytetään."
 
 #. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
-#: actions/smssettings.php:403
 msgid "That is the wrong confirmation number."
 msgstr "Tämä on väärä vahvistukoodi."
 
 #. TRANS: Message given after successfully canceling SMS phone number confirmation.
-#: actions/smssettings.php:417
 msgid "SMS confirmation cancelled."
 msgstr "SMS vahvistus"
 
 #. TRANS: Message given trying to remove an SMS phone number that is not
 #. TRANS: registered for the active user.
-#: actions/smssettings.php:437
 msgid "That is not your phone number."
 msgstr "Tämä ei ole puhelinnumerosi."
 
 #. TRANS: Message given after successfully removing a registered SMS phone number.
-#: actions/smssettings.php:459
 #, fuzzy
 msgid "The SMS phone number was removed."
 msgstr "SMS puhelinnumero"
 
 #. TRANS: Label for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:498
 msgid "Mobile carrier"
 msgstr "Matkapuhelinoperaattori"
 
 #. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:503
 msgid "Select a carrier"
 msgstr "Valitse operaattori"
 
 #. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
 #. TRANS: %s is an administrative contact's e-mail address.
-#: actions/smssettings.php:512
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -6159,121 +5081,96 @@ msgstr ""
 "sähköpostia meille osoitteeseen %s."
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
-#: actions/smssettings.php:534
 #, fuzzy
 msgid "No code entered."
 msgstr "Koodia ei ole syötetty."
 
 #. TRANS: Menu item for site administration
-#: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
-#: lib/adminpanelaction.php:395
 msgid "Snapshots"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:65
 msgid "Manage snapshot configuration"
 msgstr "Sähköpostiosoitteen vahvistus"
 
-#: actions/snapshotadminpanel.php:127
 msgid "Invalid snapshot run value."
 msgstr ""
 
-#: actions/snapshotadminpanel.php:133
 msgid "Snapshot frequency must be a number."
 msgstr ""
 
-#: actions/snapshotadminpanel.php:144
 msgid "Invalid snapshot report URL."
 msgstr ""
 
-#: actions/snapshotadminpanel.php:200
 msgid "Randomly during web hit"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:201
 msgid "In a scheduled job"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:206
 msgid "Data snapshots"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:208
 msgid "When to send statistical data to status.net servers"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:217
 msgid "Frequency"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:218
 msgid "Snapshots will be sent once every N web hits"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:226
 msgid "Report URL"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:227
 msgid "Snapshots will be sent to this URL"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:248
 #, fuzzy
 msgid "Save snapshot settings"
 msgstr "Profiilikuva-asetukset"
 
 #. TRANS: Client error displayed trying a change a subscription for a non-subscribed profile.
-#: actions/subedit.php:75
 msgid "You are not subscribed to that profile."
 msgstr "Et ole tilannut tämän käyttäjän päivityksiä."
 
 #. TRANS: Server error displayed when updating a subscription fails with a database error.
 #. TRANS: Exception thrown when a subscription could not be stored on the server.
-#: actions/subedit.php:89 classes/Subscription.php:141
 msgid "Could not save subscription."
 msgstr "Tilausta ei onnistuttu tallentamaan."
 
 #. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
-#: actions/subscribe.php:121
 #, fuzzy
 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
 msgstr "Et ole tilannut tämän käyttäjän päivityksiä."
 
 #. TRANS: Page title when subscription succeeded.
-#: actions/subscribe.php:149
 msgid "Subscribed"
 msgstr "Tilattu"
 
 #. TRANS: Header for list of subscribers for a user (first page).
 #. TRANS: %s is the user's nickname.
-#: actions/subscribers.php:51
 #, php-format
 msgid "%s subscribers"
 msgstr "Käyttäjän %s tilaajat"
 
 #. TRANS: Header for list of subscribers for a user (not first page).
 #. TRANS: %1$s is the user's nickname, $2$d is the page number.
-#: actions/subscribers.php:55
 #, php-format
 msgid "%1$s subscribers, page %2$d"
 msgstr "Käyttäjän %s tilaajat"
 
 #. TRANS: Page notice for page with an overview of all subscribers
 #. TRANS: of the logged in user's own profile.
-#: actions/subscribers.php:68
 msgid "These are the people who listen to your notices."
 msgstr "Nämä ihmiset seuraavat sinun päivityksiäsi."
 
 #. TRANS: Page notice for page with an overview of all subscribers of a user other
 #. TRANS: than the logged in user. %s is the user nickname.
-#: actions/subscribers.php:74
 #, php-format
 msgid "These are the people who listen to %s's notices."
 msgstr "Nämä ihmiset seuraavat käyttäjän %s päivityksiä."
 
 #. TRANS: Subscriber list text when the logged in user has no subscribers.
-#: actions/subscribers.php:114
 msgid ""
 "You have no subscribers. Try subscribing to people you know and they might "
 "return the favor."
@@ -6281,7 +5178,6 @@ msgstr ""
 
 #. TRANS: Subscriber list text when looking at the subscribers for a of a user other
 #. TRANS: than the logged in user that has no subscribers. %s is the user nickname.
-#: actions/subscribers.php:118
 #, php-format
 msgid "%s has no subscribers. Want to be the first?"
 msgstr ""
@@ -6291,7 +5187,6 @@ msgstr ""
 #. TRANS: This message contains a Markdown URL. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.
-#: actions/subscribers.php:127
 #, php-format
 msgid ""
 "%s has no subscribers. Why not [register an account](%%%%action.register%%%"
@@ -6300,20 +5195,17 @@ msgstr ""
 
 #. TRANS: Header for subscriptions overview for a user (not first page).
 #. TRANS: %1$s is a user nickname, %2$d is the page number.
-#: actions/subscriptions.php:55
 #, php-format
 msgid "%1$s subscriptions, page %2$d"
 msgstr "Käyttäjän %s tilaukset"
 
 #. TRANS: Page notice for page with an overview of all subscriptions
 #. TRANS: of the logged in user's own profile.
-#: actions/subscriptions.php:68
 msgid "These are the people whose notices you listen to."
 msgstr "Näiden ihmisten päivityksiä sinä seuraat."
 
 #. TRANS: Page notice for page with an overview of all subscriptions of a user other
 #. TRANS: than the logged in user. %s is the user nickname.
-#: actions/subscriptions.php:74
 #, php-format
 msgid "These are the people whose notices %s listens to."
 msgstr "Käyttäjä %s seuraa näiden ihmisten päivityksiä."
@@ -6322,7 +5214,6 @@ msgstr "Käyttäjä %s seuraa näiden ihmisten päivityksiä."
 #. 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.
-#: actions/subscriptions.php:133
 #, php-format
 msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "
@@ -6336,70 +5227,56 @@ msgstr ""
 #. TRANS: than the logged in user that has no subscriptions. %s is the user nickname.
 #. TRANS: Subscription list text when looking at the subscriptions for a of a user that has none
 #. TRANS: as an anonymous user. %s is the user nickname.
-#: actions/subscriptions.php:141 actions/subscriptions.php:147
 #, php-format
 msgid "%s is not listening to anyone."
 msgstr "%s ei seuraa ketään käyttäjää."
 
 #. TRANS: Atom feed title. %s is a profile nickname.
-#: actions/subscriptions.php:176
 #, fuzzy, php-format
 msgid "Subscription feed for %s (Atom)"
 msgstr "Syöte ryhmän %s päivityksille (Atom)"
 
 #. TRANS: Checkbox label for enabling Jabber messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:241 lib/settingsnav.php:110
-#, fuzzy
 msgid "IM"
 msgstr "Pikaviestin"
 
 #. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:256 lib/settingsnav.php:117
 msgid "SMS"
 msgstr "SMS"
 
 #. TRANS: Title for all but the first page of notices with tags.
 #. TRANS: %1$s is the tag, %2$d is the page number.
-#: actions/tag.php:73
 #, php-format
 msgid "Notices tagged with %1$s, page %2$d"
 msgstr "Päivitykset joilla on tagi %s"
 
-#: actions/tag.php:91
 #, php-format
 msgid "Notice feed for tag %s (RSS 1.0)"
 msgstr "Syöte ryhmän %s päivityksille (RSS 1.0)"
 
-#: actions/tag.php:97
 #, php-format
 msgid "Notice feed for tag %s (RSS 2.0)"
 msgstr "Syöte ryhmän %s päivityksille (RSS 2.0)"
 
-#: actions/tag.php:103
 #, php-format
 msgid "Notice feed for tag %s (Atom)"
 msgstr "Syöte ryhmän %s päivityksille (Atom)"
 
-#: actions/tagother.php:39
 #, fuzzy
 msgid "No ID argument."
 msgstr "Ei id parametria."
 
-#: actions/tagother.php:65
 #, php-format
 msgid "Tag %s"
 msgstr "Tagi %s"
 
 #. TRANS: H2 for user profile information.
-#: actions/tagother.php:77 lib/userprofile.php:76
 msgid "User profile"
 msgstr "Käyttäjän profiili"
 
-#: actions/tagother.php:120
 msgid "Tag user"
 msgstr "Tagaa käyttäjä"
 
-#: actions/tagother.php:130
 msgid ""
 "Tags for this user (letters, numbers, -, ., and _), comma- or space- "
 "separated"
@@ -6407,198 +5284,159 @@ msgstr ""
 "Käyttäjän tagit (kirjaimet, numerot, -, ., ja _), pilkulla tai välilyönnillä "
 "erotettuna"
 
-#: actions/tagother.php:157
 #, php-format
 msgid "Invalid tag: \"%s\""
 msgstr "Virheellinen tagi: \"%s\""
 
-#: actions/tagother.php:172
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 "Voit tagata ainoastaan ihmisiä, joita tilaat tai jotka tilaavat sinun "
 "päivityksiäsi."
 
-#: actions/tagother.php:215
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
 "Käytä tätä lomaketta lisätäksesi tageja tilaajillesi ja käyttäjille jotka "
 "tilaavat päivityksiäsi."
 
-#: actions/tagrss.php:35
 msgid "No such tag."
 msgstr "Tuota tagia ei ole."
 
 #. TRANS: Client error displayed when trying to unblock a non-blocked user.
-#: actions/unblock.php:59
 msgid "You haven't blocked that user."
 msgstr "Älä estä tätä käyttäjää"
 
-#: actions/unsandbox.php:72
 #, fuzzy
 msgid "User is not sandboxed."
 msgstr "Käyttäjää ei ole estetty ryhmästä."
 
-#: actions/unsilence.php:72
 #, fuzzy
 msgid "User is not silenced."
 msgstr "Käyttäjällä ei ole profiilia."
 
-#: actions/unsubscribe.php:77
 msgid "No profile ID in request."
 msgstr "Ei profiilia tuolle ID:lle."
 
-#: actions/unsubscribe.php:98
 msgid "Unsubscribed"
 msgstr "Tilaus lopetettu"
 
-#: actions/updateprofile.php:64
 #, php-format
 msgid ""
 "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
 msgstr ""
 
-#: actions/urlsettings.php:60
 #, fuzzy
 msgid "URL settings"
 msgstr "Profiilikuva-asetukset"
 
 #. TRANS: Instructions for tab "Other" in user profile settings.
-#: actions/urlsettings.php:72
 msgid "Manage various other options."
 msgstr "Hallinnoi muita asetuksia."
 
 #. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
 #. TRANS: user's profile settings. This message has one space at the beginning. Use your
 #. TRANS: language's word separator here if it has one (most likely a single space).
-#: actions/urlsettings.php:115
 msgid " (free service)"
 msgstr ""
 
-#: actions/urlsettings.php:121
 #, fuzzy
 msgid "[none]"
 msgstr "Ei mitään"
 
-#: actions/urlsettings.php:122
 msgid "[internal]"
 msgstr ""
 
 #. TRANS: Label for dropdown with URL shortener services.
-#: actions/urlsettings.php:130
 msgid "Shorten URLs with"
 msgstr "Lyhennä URL-osoitteita"
 
 #. TRANS: Tooltip for for dropdown with URL shortener services.
-#: actions/urlsettings.php:132
 msgid "Automatic shortening service to use."
 msgstr "Käytettävä automaattinen lyhennyspalvelu."
 
-#: actions/urlsettings.php:138
 msgid "URL longer than"
 msgstr ""
 
-#: actions/urlsettings.php:141
 msgid "URLs longer than this will be shortened, 0 means always shorten."
 msgstr ""
 
-#: actions/urlsettings.php:145
 msgid "Text longer than"
 msgstr ""
 
-#: actions/urlsettings.php:148
 msgid ""
 "URLs in notices longer than this will be shortened, 0 means always shorten."
 msgstr ""
 
 #. TRANS: Form validation error for form "Other settings" in user profile.
-#: actions/urlsettings.php:180
 #, fuzzy
 msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr "URL-lyhennyspalvelun nimi on liian pitkä (max 50 merkkiä)."
 
-#: actions/urlsettings.php:187
 msgid "Invalid number for max url length."
 msgstr ""
 
-#: actions/urlsettings.php:193
 #, fuzzy
 msgid "Invalid number for max notice length."
 msgstr "Koko ei kelpaa."
 
-#: actions/urlsettings.php:238
 msgid "Error saving user URL shortening preferences."
 msgstr ""
 
 #. TRANS: User admin panel title
-#: actions/useradminpanel.php:58
 #, fuzzy
 msgctxt "TITLE"
 msgid "User"
 msgstr "Käyttäjä"
 
 #. TRANS: Instruction for user admin panel.
-#: actions/useradminpanel.php:69
 msgid "User settings for this StatusNet site"
 msgstr ""
 
 #. TRANS: Form validation error in user admin panel when a non-numeric character limit was set.
-#: actions/useradminpanel.php:147
 msgid "Invalid bio limit. Must be numeric."
 msgstr ""
 
 #. TRANS: Form validation error in user admin panel when welcome text is too long.
-#: actions/useradminpanel.php:154
 msgid "Invalid welcome text. Maximum length is 255 characters."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to set a non-existing user as default subscription for new
 #. TRANS: users in user admin panel. %1$s is the invalid nickname.
-#: actions/useradminpanel.php:166
 #, php-format
 msgid "Invalid default subscripton: \"%1$s\" is not a user."
 msgstr ""
 
-#: actions/useradminpanel.php:215 lib/action.php:565 lib/settingsnav.php:77
-#: lib/subgroupnav.php:81
 msgid "Profile"
 msgstr "Profiili"
 
 #. TRANS: Field label in user admin panel for setting the character limit for the bio field.
-#: actions/useradminpanel.php:220
 msgid "Bio Limit"
 msgstr ""
 
 #. TRANS: Tooltip in user admin panel for setting the character limit for the bio field.
-#: actions/useradminpanel.php:222
 msgid "Maximum length of a profile bio in characters."
 msgstr ""
 
 #. TRANS: Form legend in user admin panel.
-#: actions/useradminpanel.php:231
 #, fuzzy
 msgid "New users"
 msgstr "Kutsu uusia käyttäjiä"
 
 #. TRANS: Field label in user admin panel for setting new user welcome text.
-#: actions/useradminpanel.php:236
 msgid "New user welcome"
 msgstr ""
 
 #. TRANS: Tooltip in user admin panel for setting new user welcome text.
-#: actions/useradminpanel.php:238
 #, fuzzy
 msgid "Welcome text for new users (maximum 255 characters)."
 msgstr "Koko nimi on liian pitkä (max 255 merkkiä)."
 
 #. TRANS: Field label in user admin panel for setting default subscription for new users.
-#: actions/useradminpanel.php:244
 #, fuzzy
 msgid "Default subscription"
 msgstr "Kaikki tilaukset"
 
 #. TRANS: Tooltip in user admin panel for setting default subscription for new users.
-#: actions/useradminpanel.php:246
 #, fuzzy
 msgid "Automatically subscribe new users to this user."
 msgstr ""
@@ -6606,35 +5444,29 @@ msgstr ""
 "ihmiskäyttäjille)"
 
 #. TRANS: Form legend in user admin panel.
-#: actions/useradminpanel.php:256
 #, fuzzy
 msgid "Invitations"
 msgstr "Kutsu(t) lähetettiin"
 
 #. TRANS: Field label for checkbox in user admin panel for allowing users to invite friend using site e-mail.
-#: actions/useradminpanel.php:262
 #, fuzzy
 msgid "Invitations enabled"
 msgstr "Kutsu(t) lähetettiin"
 
 #. TRANS: Tooltip for checkbox in user admin panel for allowing users to invite friend using site e-mail.
-#: actions/useradminpanel.php:265
 msgid "Whether to allow users to invite new users."
 msgstr ""
 
 #. TRANS: Title for button to save user settings in user admin panel.
-#: actions/useradminpanel.php:302
 #, fuzzy
 msgid "Save user settings."
 msgstr "Profiilikuva-asetukset"
 
 #. TRANS: Page title.
-#: actions/userauthorization.php:109
 msgid "Authorize subscription"
 msgstr "Valtuuta tilaus"
 
 #. TRANS: Page notice on "Auhtorize subscription" page.
-#: actions/userauthorization.php:115
 #, fuzzy
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
@@ -6646,42 +5478,35 @@ msgstr ""
 "paina \"Peruuta\"."
 
 #. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:200
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Accept"
 msgstr "Hyväksy"
 
 #. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:202
 #, fuzzy
 msgid "Subscribe to this user."
 msgstr "Tilaa tämä käyttäjä"
 
 #. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:204
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Reject"
 msgstr "Hylkää"
 
 #. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:206
 #, fuzzy
 msgid "Reject this subscription."
 msgstr "Käyttäjän %s tilaukset"
 
 #. TRANS: Client error displayed for an empty authorisation request.
-#: actions/userauthorization.php:219
 msgid "No authorization request!"
 msgstr "Ei valtuutuspyyntöä!"
 
 #. TRANS: Accept message header from Authorise subscription page.
-#: actions/userauthorization.php:242
 msgid "Subscription authorized"
 msgstr "Tilaus sallittu"
 
-#: actions/userauthorization.php:245
 #, fuzzy
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
@@ -6693,11 +5518,9 @@ msgstr ""
 "Tilauskoodisi on:"
 
 #. TRANS: Reject message header from Authorise subscription page.
-#: actions/userauthorization.php:256
 msgid "Subscription rejected"
 msgstr "Tilaus hylätty"
 
-#: actions/userauthorization.php:259
 #, fuzzy
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
@@ -6709,35 +5532,30 @@ msgstr ""
 
 #. TRANS: Exception thrown when no valid user is found for an authorisation request.
 #. TRANS: %s is a listener URI.
-#: actions/userauthorization.php:296
 #, php-format
 msgid "Listener URI \"%s\" not found here."
 msgstr ""
 
 #. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
 #. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:303
 #, php-format
 msgid "Listenee URI \"%s\" is too long."
 msgstr ""
 
 #. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
 #. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:311
 #, php-format
 msgid "Listenee URI \"%s\" is a local user."
 msgstr ""
 
 #. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
 #. TRANS: %s is a profile URL.
-#: actions/userauthorization.php:329
 #, php-format
 msgid "Profile URL \"%s\" is for a local user."
 msgstr ""
 
 #. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
 #. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
-#: actions/userauthorization.php:339
 #, php-format
 msgid ""
 "Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
@@ -6746,76 +5564,62 @@ msgstr ""
 
 #. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
 #. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:349
 #, fuzzy, php-format
 msgid "Avatar URL \"%s\" is not valid."
 msgstr "Kotisivun verkko-osoite ei ole toimiva."
 
 #. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
 #. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:356
 #, fuzzy, php-format
 msgid "Cannot read avatar URL \"%s\"."
 msgstr "Kuvan URL-osoitetta '%s' ei voi avata."
 
 #. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
 #. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:363
 #, fuzzy, php-format
 msgid "Wrong image type for avatar URL \"%s\"."
 msgstr "Kuvan '%s' tyyppi on väärä"
 
 #. TRANS: Page title for profile design page.
-#: actions/userdesignsettings.php:74 lib/designsettings.php:61
 #, fuzzy
 msgid "Profile design"
 msgstr "Profiiliasetukset"
 
 #. TRANS: Instructions for profile design page.
-#: actions/userdesignsettings.php:84 lib/designsettings.php:72
 msgid ""
 "Customize the way your profile looks with a background image and a colour "
 "palette of your choice."
 msgstr ""
 
-#: actions/userdesignsettings.php:289
 msgid "Enjoy your hotdog!"
 msgstr ""
 
-#: actions/userdesignsettings.php:325
 #, fuzzy
 msgid "Design settings"
 msgstr "Profiilikuva-asetukset"
 
-#: actions/userdesignsettings.php:340
 msgid "View profile designs"
 msgstr "Näytä tai piillota profiilin ulkoasu."
 
-#: actions/userdesignsettings.php:341
 msgid "Show or hide profile designs."
 msgstr "Näytä tai piillota profiilin ulkoasu."
 
-#: actions/userdesignsettings.php:348
 #, fuzzy
 msgid "Background file"
 msgstr "Tausta"
 
 #. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number.
-#: actions/usergroups.php:66
 #, php-format
 msgid "%1$s groups, page %2$d"
 msgstr "Ryhmät, sivu %d"
 
-#: actions/usergroups.php:132
 msgid "Search for more groups"
 msgstr "Hae lisää ryhmiä"
 
-#: actions/usergroups.php:159
 #, php-format
 msgid "%s is not a member of any group."
 msgstr "Käyttäjä ei kuulu tähän ryhmään."
 
-#: actions/usergroups.php:164
 #, php-format
 msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
 msgstr ""
@@ -6825,34 +5629,27 @@ msgstr ""
 #. TRANS: %1$s is a group name, %2$s is a site name.
 #. TRANS: Message is used as a subtitle in atom user notice feed.
 #. TRANS: %1$s is a user name, %2$s is a site name.
-#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:70
-#: lib/atomusernoticefeed.php:95
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr "Käyttäjän %1$s päivitykset palvelussa %2$s!"
 
-#: actions/version.php:75
 #, fuzzy, php-format
 msgid "StatusNet %s"
 msgstr "Tilastot"
 
-#: actions/version.php:155
 #, php-format
 msgid ""
 "This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
 "Inc. and contributors."
 msgstr ""
 
-#: actions/version.php:163
 msgid "Contributors"
 msgstr ""
 
 #. TRANS: Menu item for site administration
-#: actions/version.php:167 lib/adminpanelaction.php:403
 msgid "License"
 msgstr "Lisenssi"
 
-#: actions/version.php:170
 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 "
@@ -6860,7 +5657,6 @@ msgid ""
 "any later version. "
 msgstr ""
 
-#: actions/version.php:176
 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 "
@@ -6868,7 +5664,6 @@ msgid ""
 "for more details. "
 msgstr ""
 
-#: actions/version.php:182
 #, php-format
 msgid ""
 "You should have received a copy of the GNU Affero General Public License "
@@ -6876,54 +5671,44 @@ msgid ""
 msgstr ""
 
 #. TRANS: Form input field label for application name.
-#: actions/version.php:197 lib/applicationeditform.php:190
 #, fuzzy
 msgid "Name"
 msgstr "Tunnus"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:885
 #, fuzzy
 msgid "Version"
 msgstr "Omat"
 
-#: actions/version.php:199
 msgid "Author(s)"
 msgstr ""
 
 #. TRANS: Form input field label.
-#: actions/version.php:200 lib/applicationeditform.php:208
-#: lib/groupeditform.php:168
 msgid "Description"
 msgstr "Kuvaus"
 
 #. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:164
 msgid "Favor"
 msgstr "Lisää suosikiksi"
 
 #. TRANS: Ntofication given when a user marks a notice as favorite.
 #. TRANS: %1$s is a user nickname or full name, %2$s is a notice URI.
-#: classes/Fave.php:167
 #, fuzzy, php-format
 msgid "%1$s marked notice %2$s as a favorite."
 msgstr "Lähetä sähköpostia, jos joku lisää päivitykseni suosikiksi."
 
 #. TRANS: Server exception thrown when a URL cannot be processed.
-#: classes/File.php:162
 #, php-format
 msgid "Cannot process URL '%s'"
 msgstr ""
 
 #. TRANS: Server exception thrown when... Robin thinks something is impossible!
-#: classes/File.php:194
 msgid "Robin thinks something is impossible."
 msgstr ""
 
 #. 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$s is used for plural.
-#: classes/File.php:210
 #, php-format
 msgid ""
 "No file may be larger than %1$d byte and the file you sent was %2$d bytes. "
@@ -6936,7 +5721,6 @@ msgstr[1] ""
 
 #. TRANS: Message given if an upload would exceed user quota.
 #. TRANS: %d (number) is the user quota in bytes and is used for plural.
-#: classes/File.php:223
 #, php-format
 msgid "A file this large would exceed your user quota of %d byte."
 msgid_plural "A file this large would exceed your user quota of %d bytes."
@@ -6945,7 +5729,6 @@ msgstr[1] ""
 
 #. TRANS: Message given id an upload would exceed a user's monthly quota.
 #. TRANS: $d (number) is the monthly user quota in bytes and is used for plural.
-#: classes/File.php:235
 #, php-format
 msgid "A file this large would exceed your monthly quota of %d byte."
 msgid_plural "A file this large would exceed your monthly quota of %d bytes."
@@ -6953,115 +5736,96 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Client exception thrown if a file upload does not have a valid name.
-#: classes/File.php:282 classes/File.php:297
 #, fuzzy
 msgid "Invalid filename."
 msgstr "Koko ei kelpaa."
 
 #. TRANS: Exception thrown when joining a group fails.
-#: classes/Group_member.php:51
 #, fuzzy
 msgid "Group join failed."
 msgstr "Ryhmän profiili"
 
 #. TRANS: Exception thrown when trying to leave a group the user is not a member of.
-#: classes/Group_member.php:64
 #, fuzzy
 msgid "Not part of group."
 msgstr "Ei voitu päivittää ryhmää."
 
 #. TRANS: Exception thrown when trying to leave a group fails.
-#: classes/Group_member.php:72
 #, fuzzy
 msgid "Group leave failed."
 msgstr "Ryhmän profiili"
 
 #. TRANS: Exception thrown providing an invalid profile ID.
 #. TRANS: %s is the invalid profile ID.
-#: classes/Group_member.php:85
 #, php-format
 msgid "Profile ID %s is invalid."
 msgstr ""
 
 #. TRANS: Exception thrown providing an invalid group ID.
 #. TRANS: %s is the invalid group ID.
-#: classes/Group_member.php:98
 #, fuzzy, php-format
 msgid "Group ID %s is invalid."
 msgstr "Virhe tapahtui käyttäjän tallentamisessa; epäkelpo."
 
 #. TRANS: Activity title.
-#: classes/Group_member.php:147 lib/joinform.php:114
 msgid "Join"
 msgstr "Liity"
 
 #. TRANS: Success message for subscribe to group attempt through OStatus.
 #. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
-#: classes/Group_member.php:151
 #, php-format
 msgid "%1$s has joined group %2$s."
 msgstr ""
 
 #. TRANS: Server exception thrown when updating a local group fails.
-#: classes/Local_group.php:42
 #, fuzzy
 msgid "Could not update local group."
 msgstr "Ei voitu päivittää ryhmää."
 
 #. TRANS: Exception thrown when trying creating a login token failed.
 #. TRANS: %s is the user nickname for which token creation failed.
-#: classes/Login_token.php:78
 #, fuzzy, php-format
 msgid "Could not create login token for %s"
 msgstr "Ei voitu lisätä aliasta."
 
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
-#: classes/Memcached_DataObject.php:556
 msgid "No database name or DSN found anywhere."
 msgstr ""
 
 #. TRANS: Client exception thrown when a user tries to send a direct message while being banned from sending them.
-#: classes/Message.php:45
 #, fuzzy
 msgid "You are banned from sending direct messages."
 msgstr "Tapahtui virhe suoran viestin lähetyksessä."
 
 #. TRANS: Message given when a message could not be stored on the server.
-#: classes/Message.php:69
 msgid "Could not insert message."
 msgstr "Viestin tallennus ei onnistunut."
 
 #. TRANS: Message given when a message could not be updated on the server.
-#: classes/Message.php:80
 msgid "Could not update message with new URI."
 msgstr "Viestin päivittäminen uudella URI-osoitteella ei onnistunut."
 
 #. TRANS: Server exception thrown when a user profile for a notice cannot be found.
 #. TRANS: %1$d is a profile ID (number), %2$d is a notice ID (number).
-#: classes/Notice.php:98
 #, php-format
 msgid "No such profile (%1$d) for notice (%2$d)."
 msgstr ""
 
 #. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:199
 #, php-format
 msgid "Database error inserting hashtag: %s"
 msgstr "Virhe tapahtui profiilikuvan lisäämisessä"
 
 #. TRANS: Client exception thrown if a notice contains too many characters.
-#: classes/Notice.php:279
 #, fuzzy
 msgid "Problem saving notice. Too long."
 msgstr "Ongelma päivityksen tallentamisessa."
 
 #. TRANS: Client exception thrown when trying to save a notice for an unknown user.
-#: classes/Notice.php:284
 msgid "Problem saving notice. Unknown user."
 msgstr "Virhe tapahtui päivityksen tallennuksessa. Tuntematon käyttäjä."
 
 #. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
-#: classes/Notice.php:290
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
@@ -7069,7 +5833,6 @@ msgstr ""
 "päivityksien lähettämista muutaman minuutin päästä."
 
 #. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
-#: classes/Notice.php:297
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
 "few minutes."
@@ -7078,43 +5841,36 @@ msgstr ""
 "päivityksien lähettämista muutaman minuutin päästä."
 
 #. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:305
 msgid "You are banned from posting notices on this site."
 msgstr "Päivityksesi tähän palveluun on estetty."
 
 #. TRANS: Server exception thrown when a notice cannot be saved.
 #. TRANS: Server exception thrown when a notice cannot be updated.
-#: classes/Notice.php:372 classes/Notice.php:399
 msgid "Problem saving notice."
 msgstr "Ongelma päivityksen tallentamisessa."
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:929
 msgid "Bad type provided to saveKnownGroups."
 msgstr ""
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:1028
 #, fuzzy
 msgid "Problem saving group inbox."
 msgstr "Ongelma päivityksen tallentamisessa."
 
 #. TRANS: Server exception thrown when a reply cannot be saved.
 #. TRANS: %1$d is a notice ID, %2$d is the ID of the mentioned user.
-#: classes/Notice.php:1144
 #, fuzzy, php-format
 msgid "Could not save reply for %1$d, %2$d."
 msgstr "Tilausta ei onnistuttu tallentamaan."
 
 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1663
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
 
 #. TRANS: Full name of a profile or group followed by nickname in parens
-#: classes/Profile.php:172 classes/User_group.php:242
 #, fuzzy, php-format
 msgctxt "FANCYNAME"
 msgid "%1$s (%2$s)"
@@ -7122,269 +5878,213 @@ msgstr "%1$s (%2$s)"
 
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:779
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:788
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
 
 #. TRANS: Exception thrown when a right for a non-existing user profile is checked.
-#: classes/Remote_profile.php:54
 #, fuzzy
 msgid "Missing profile."
 msgstr "Käyttäjällä ei ole profiilia."
 
 #. TRANS: Exception thrown when a tag cannot be saved.
-#: classes/Status_network.php:338
 msgid "Unable to save tag."
 msgstr "Tagien tallennus epäonnistui."
 
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#: classes/Subscription.php:77 lib/oauthstore.php:482
 #, fuzzy
 msgid "You have been banned from subscribing."
 msgstr "Käyttäjä on estänyt sinua tilaamasta päivityksiä."
 
 #. TRANS: Exception thrown when trying to subscribe while already subscribed.
-#: classes/Subscription.php:82
 #, fuzzy
 msgid "Already subscribed!"
 msgstr "Ei ole tilattu!."
 
 #. TRANS: Exception thrown when trying to subscribe to a user who has blocked the subscribing user.
-#: classes/Subscription.php:87
 msgid "User has blocked you."
 msgstr "Käyttäjä on asettanut eston sinulle."
 
 #. TRANS: Exception thrown when trying to unsibscribe without a subscription.
-#: classes/Subscription.php:176
 #, fuzzy
 msgid "Not subscribed!"
 msgstr "Ei ole tilattu!."
 
 #. TRANS: Exception thrown when trying to unsubscribe a user from themselves.
-#: classes/Subscription.php:183
 msgid "Could not delete self-subscription."
 msgstr "Tilausta ei onnistuttu tallentamaan."
 
 #. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
-#: classes/Subscription.php:211
 msgid "Could not delete subscription OMB token."
 msgstr "Tilausta ei onnistuttu tallentamaan."
 
 #. TRANS: Exception thrown when a subscription could not be deleted on the server.
-#: classes/Subscription.php:223
 msgid "Could not delete subscription."
 msgstr "Tilausta ei onnistuttu tallentamaan."
 
 #. TRANS: Activity tile when subscribing to another person.
-#: classes/Subscription.php:265
 msgid "Follow"
 msgstr ""
 
 #. TRANS: Notification given when one person starts following another.
 #. TRANS: %1$s is the subscriber, %2$s is the subscribed.
-#: classes/Subscription.php:268
 #, fuzzy, php-format
 msgid "%1$s is now following %2$s."
 msgstr "%1$s seuraa nyt päivityksiäsi palvelussa %2$s."
 
 #. TRANS: Notice given on user registration.
 #. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:390
 #, fuzzy, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr "Viesti käyttäjälle %1$s, %2$s"
 
 #. TRANS: Server exception.
-#: classes/User.php:923
 msgid "No single user defined for single-user mode."
 msgstr ""
 
 #. TRANS: Server exception.
-#: classes/User.php:927
 msgid "Single-user mode code called when not enabled."
 msgstr ""
 
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:522
 msgid "Could not create group."
 msgstr "Ryhmän luonti ei onnistunut."
 
 #. TRANS: Server exception thrown when updating a group URI failed.
-#: classes/User_group.php:532
 msgid "Could not set group URI."
 msgstr "Ryhmän luonti ei onnistunut."
 
 #. TRANS: Server exception thrown when setting group membership failed.
-#: classes/User_group.php:555
 msgid "Could not set group membership."
 msgstr "Ryhmän jäsenyystietoja ei voitu asettaa."
 
 #. TRANS: Server exception thrown when saving local group information failed.
-#: classes/User_group.php:570
 #, fuzzy
 msgid "Could not save local group info."
 msgstr "Tilausta ei onnistuttu tallentamaan."
 
 #. TRANS: Exception thrown when an account could not be located when it should be moved.
 #. TRANS: %s is the remote site.
-#: lib/accountmover.php:65
 #, fuzzy, php-format
 msgid "Cannot locate account %s."
 msgstr "Sinä et voi poistaa käyttäjiä."
 
 #. TRANS: Exception thrown when a service document could not be located account move.
 #. TRANS: %s is the remote site.
-#: lib/accountmover.php:106
 #, php-format
 msgid "Cannot find XRD for %s."
 msgstr ""
 
 #. TRANS: Exception thrown when an account could not be located when it should be moved.
 #. TRANS: %s is the remote site.
-#: lib/accountmover.php:131
 #, php-format
 msgid "No AtomPub API service for %s."
 msgstr ""
 
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: lib/action.php:161
 #, fuzzy, php-format
 msgid "%1$s - %2$s"
 msgstr "%1$s (%2$s)"
 
 #. TRANS: Page title for a page without a title set.
-#: lib/action.php:177
 msgid "Untitled page"
 msgstr "Nimetön sivu"
 
 #. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.
-#: lib/action.php:325
 msgctxt "TOOLTIP"
 msgid "Show more"
 msgstr ""
 
 #. TRANS: Inline reply form submit button: submits a reply comment.
-#: lib/action.php:328
 #, fuzzy
 msgctxt "BUTTON"
-msgid "Comment"
-msgstr "Sisältö"
+msgid "Reply"
+msgstr "Vastaus"
 
 #. TRANS: Placeholder text for inline reply form. Clicking in this box will turn it into a mini notice form.
-#: lib/action.php:331
-msgid "Add a comment..."
+msgid "Write a reply..."
 msgstr ""
 
-#: lib/action.php:559 lib/personalgroupnav.php:99
-#, fuzzy
 msgid "Home"
 msgstr "Kotisivu"
 
-#: lib/action.php:560
 #, fuzzy
 msgid "Friends timeline"
 msgstr "%s aikajana"
 
-#: lib/action.php:566
-#, fuzzy
 msgid "Your profile"
-msgstr "Ryhmän profiili"
+msgstr "Sinun profiilisi"
 
-#: lib/action.php:570 lib/action.php:593 lib/publicgroupnav.php:78
 msgid "Public"
 msgstr "Julkinen"
 
-#: lib/action.php:571 lib/action.php:594
 #, fuzzy
 msgid "Everyone on this site"
 msgstr "Hae ihmisiä tältä sivustolta"
 
-#: lib/action.php:575
-#, fuzzy
 msgid "Settings"
 msgstr "Profiilikuva-asetukset"
 
-#: lib/action.php:576
 #, fuzzy
 msgid "Change your personal settings"
 msgstr "Vaihda profiiliasetuksesi"
 
-#: lib/action.php:582
 #, fuzzy
 msgid "Site configuration"
 msgstr "SMS vahvistus"
 
-#: lib/action.php:587
-#, fuzzy
 msgid "Logout"
 msgstr "Kirjaudu ulos"
 
-#: lib/action.php:588
-#, fuzzy
 msgid "Logout from the site"
 msgstr "Kirjaudu sisään"
 
-#: lib/action.php:599
-#, fuzzy
 msgid "Login to the site"
 msgstr "Kirjaudu sisään"
 
-#: lib/action.php:606
-#, fuzzy
 msgid "Search"
 msgstr "Haku"
 
-#: lib/action.php:607
 #, fuzzy
 msgid "Search the site"
 msgstr "Haku"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:864
 msgid "Help"
 msgstr "Ohjeet"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:867
 msgid "About"
 msgstr "Tietoa"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:870
 msgid "FAQ"
 msgstr "UKK"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:875
 msgid "TOS"
 msgstr ""
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:879
 msgid "Privacy"
 msgstr "Yksityisyys"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:882
 msgid "Source"
 msgstr "Lähdekoodi"
 
 #. TRANS: Secondary navigation menu option leading to e-mail contact information on the
 #. TRANS: StatusNet site, where to report bugs, ...
-#: lib/action.php:889
 msgid "Contact"
 msgstr "Ota yhteyttä"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:892
 #, fuzzy
 msgid "Badge"
 msgstr "Tönäise"
@@ -7393,7 +6093,6 @@ msgstr "Tönäise"
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:921
 #, fuzzy, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7403,7 +6102,6 @@ msgstr ""
 "site.broughtbyurl%%). "
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:924
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** on mikroblogipalvelu."
@@ -7412,7 +6110,6 @@ msgstr "**%%site.name%%** on mikroblogipalvelu."
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:931
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7425,106 +6122,88 @@ msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:949
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:956
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:960
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:992
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1335
 msgid "After"
 msgstr "Myöhemmin"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1345
 msgid "Before"
 msgstr "Aiemmin"
 
 #. TRANS: Client exception thrown when a feed instance is a DOMDocument.
-#: lib/activity.php:125
 msgid "Expecting a root feed element but got a whole XML document."
 msgstr ""
 
 #. TRANS: Client exception thrown when using an unknown verb for the activity importer.
-#: lib/activityimporter.php:81
 #, fuzzy, php-format
 msgid "Unknown verb: \"%s\"."
 msgstr "Tunnistamaton tiedoston tyyppi"
 
 #. TRANS: Client exception thrown when trying to force a subscription for an untrusted user.
-#: lib/activityimporter.php:107
 msgid "Cannot force subscription for untrusted user."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to for a remote user to subscribe.
-#: lib/activityimporter.php:117
 #, fuzzy
 msgid "Cannot force remote user to subscribe."
 msgstr "Anna käyttäjätunnus, jonka päivitykset haluat tilata"
 
 #. TRANS: Client exception thrown when trying to subscribe to an unknown profile.
-#: lib/activityimporter.php:132
 #, fuzzy
 msgid "Unknown profile."
 msgstr "Tunnistamaton tiedoston tyyppi"
 
 #. TRANS: Client exception thrown when trying to import an event not related to the importing user.
-#: lib/activityimporter.php:138
 msgid "This activity seems unrelated to our user."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to join a remote group that is not a group.
-#: lib/activityimporter.php:154
 msgid "Remote profile is not a group!"
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to join a group the importing user is already a member of.
-#: lib/activityimporter.php:163
 #, fuzzy
 msgid "User is already a member of this group."
 msgstr "Sinä kuulut jo tähän ryhmään."
 
 #. TRANS: Client exception thrown when trying to import a notice by another user.
 #. TRANS: %1$s is the source URI of the notice, %2$s is the URI of the author.
-#: lib/activityimporter.php:201
 #, php-format
 msgid "Already know about notice %1$s and  it has a different author %2$s."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to overwrite the author information for a non-trusted user during import.
-#: lib/activityimporter.php:207
 msgid "Not overwriting author info for non-trusted user."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to import a notice without content.
 #. TRANS: %s is the notice URI.
-#: lib/activityimporter.php:223
 #, fuzzy, php-format
 msgid "No content for notice %s."
 msgstr "Hae päivityksien sisällöstä"
 
-#: lib/activitymover.php:84
 #, fuzzy, php-format
 msgid "No such user %s."
 msgstr "Käyttäjää ei ole."
@@ -7535,229 +6214,189 @@ msgstr "Käyttäjää ei ole."
 #. TRANS: %1$s is a URL, %2$s is the status, %s$s is the fail reason.
 #. TRANS: Exception thrown when post to collection fails with a status that is not handled.
 #. TRANS: %1$s is a URL, %2$s is the status, %s$s is the fail reason.
-#: lib/activitysink.php:163 lib/activitysink.php:167 lib/activitysink.php:172
 #, fuzzy, php-format
 msgctxt "URLSTATUSREASON"
 msgid "%1$s %2$s %3$s"
 msgstr "%1$s (%2$s)"
 
 #. TRANS: Client exception thrown when there is no source attribute.
-#: lib/activityutils.php:200
 msgid "Can't handle remote content yet."
 msgstr ""
 
 #. TRANS: Client exception thrown when there embedded XML content is found that cannot be processed yet.
-#: lib/activityutils.php:237
 msgid "Can't handle embedded XML content yet."
 msgstr ""
 
 #. TRANS: Client exception thrown when base64 encoded content is found that cannot be processed yet.
-#: lib/activityutils.php:242
 msgid "Can't handle embedded Base64 content yet."
 msgstr ""
 
 #. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights.
-#: lib/adminpanelaction.php:96
 #, fuzzy
 msgid "You cannot make changes to this site."
 msgstr "Et voi lähettää viestiä tälle käyttäjälle."
 
 #. TRANS: Client error message throw when a certain panel's settings cannot be changed.
-#: lib/adminpanelaction.php:108
 #, fuzzy
 msgid "Changes to that panel are not allowed."
 msgstr "Rekisteröityminen ei ole sallittu."
 
 #. TRANS: Client error message.
-#: lib/adminpanelaction.php:222
 #, fuzzy
 msgid "showForm() not implemented."
 msgstr "Komentoa ei ole vielä toteutettu."
 
 #. TRANS: Client error message
-#: lib/adminpanelaction.php:250
 #, fuzzy
 msgid "saveSettings() not implemented."
 msgstr "Komentoa ei ole vielä toteutettu."
 
 #. TRANS: Client error message thrown if design settings could not be deleted in
 #. TRANS: the admin panel Design.
-#: lib/adminpanelaction.php:274
 #, fuzzy
 msgid "Unable to delete design setting."
 msgstr "Twitter-asetuksia ei voitu tallentaa!"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:337
 #, fuzzy
 msgid "Basic site configuration"
 msgstr "Sähköpostiosoitteen vahvistus"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:339
 #, fuzzy
 msgctxt "MENU"
 msgid "Site"
 msgstr "Kutsu"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:345
 #, fuzzy
 msgid "Design configuration"
 msgstr "SMS vahvistus"
 
 #. TRANS: Menu item for site administration
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/adminpanelaction.php:347 lib/groupnav.php:135
 #, fuzzy
 msgctxt "MENU"
 msgid "Design"
 msgstr "Ulkoasu"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:353
 #, fuzzy
 msgid "User configuration"
 msgstr "SMS vahvistus"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:110
 msgid "User"
 msgstr "Käyttäjä"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:361
 #, fuzzy
 msgid "Access configuration"
 msgstr "SMS vahvistus"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:369
 #, fuzzy
 msgid "Paths configuration"
 msgstr "SMS vahvistus"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:377
 #, fuzzy
 msgid "Sessions configuration"
 msgstr "SMS vahvistus"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:385
 #, fuzzy
 msgid "Edit site notice"
 msgstr "Palvelun ilmoitus"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:387
 msgid "Site notice"
 msgstr "Palvelun ilmoitus"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:393
 #, fuzzy
 msgid "Snapshots configuration"
 msgstr "SMS vahvistus"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:401
 msgid "Set site license"
 msgstr ""
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:409
 #, fuzzy
 msgid "Plugins configuration"
 msgstr "SMS vahvistus"
 
 #. TRANS: Client error 401.
-#: lib/apiauth.php:111
 msgid "API resource requires read-write access, but you only have read access."
 msgstr ""
 
 #. TRANS: OAuth exception thrown when no application is found for a given consumer key.
-#: lib/apiauth.php:177
 msgid "No application for that consumer key."
 msgstr ""
 
-#: lib/apiauth.php:202 lib/apiauth.php:284
 msgid "Not allowed to use API."
 msgstr ""
 
 #. TRANS: OAuth exception given when an incorrect access token was given for a user.
-#: lib/apiauth.php:225
 msgid "Bad access token."
 msgstr ""
 
 #. TRANS: OAuth exception given when no user was found for a given token (no token was found).
-#: lib/apiauth.php:230
 msgid "No user for that token."
 msgstr ""
 
 #. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel".
 #. TRANS: Client error thrown when authentication fails.
-#: lib/apiauth.php:272 lib/apiauth.php:302
 msgid "Could not authenticate you."
 msgstr ""
 
 #. TRANS: Server error displayed when trying to create an anynymous OAuth consumer.
-#: lib/apioauthstore.php:45
 #, fuzzy
 msgid "Could not create anonymous consumer."
 msgstr "Ei voitu lisätä aliasta."
 
 #. TRANS: Server error displayed when trying to create an anynymous OAuth application.
-#: lib/apioauthstore.php:69
 #, fuzzy
 msgid "Could not create anonymous OAuth application."
 msgstr "Ei voitu lisätä aliasta."
 
 #. TRANS: Exception thrown when no token association could be found.
-#: lib/apioauthstore.php:151
 msgid ""
 "Could not find a profile and application associated with the request token."
 msgstr ""
 
 #. TRANS: Exception thrown when no access token can be issued.
-#: lib/apioauthstore.php:209
 #, fuzzy
 msgid "Could not issue access token."
 msgstr "Viestin tallennus ei onnistunut."
 
-#: lib/apioauthstore.php:317
 #, fuzzy
 msgid "Database error inserting OAuth application user."
 msgstr "Tietokantavirhe tallennettaessa risutagiä: %s"
 
-#: lib/apioauthstore.php:345
 #, fuzzy
 msgid "Database error updating OAuth application user."
 msgstr "Tietokantavirhe tallennettaessa risutagiä: %s"
 
 #. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
-#: lib/apioauthstore.php:371
 msgid "Tried to revoke unknown token."
 msgstr ""
 
 #. TRANS: Exception thrown when an attempt is made to remove a revoked token.
-#: lib/apioauthstore.php:376
 msgid "Failed to delete revoked token."
 msgstr ""
 
 #. TRANS: Form input field label for application icon.
-#: lib/applicationeditform.php:177
 msgid "Icon"
 msgstr ""
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:182
 msgid "Icon for this application"
 msgstr ""
 
 #. TRANS: Form input field instructions.
 #. TRANS: %d is the number of available characters for the description.
-#: lib/applicationeditform.php:201
 #, fuzzy, php-format
 msgid "Describe your application in %d character"
 msgid_plural "Describe your application in %d characters"
@@ -7765,217 +6404,178 @@ msgstr[0] "Kuvaile itseäsi ja kiinnostuksen kohteitasi %d merkillä"
 msgstr[1] "Kuvaile itseäsi ja kiinnostuksen kohteitasi %d merkillä"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:205
 msgid "Describe your application"
 msgstr "Kuvaus"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:216
 #, fuzzy
 msgid "URL of the homepage of this application"
 msgstr "Ryhmän tai aiheen kotisivun tai blogin osoite"
 
 #. TRANS: Form input field label.
-#: lib/applicationeditform.php:218
 #, fuzzy
 msgid "Source URL"
 msgstr "Lähdekoodi"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:225
 msgid "Organization responsible for this application"
 msgstr ""
 
 #. TRANS: Form input field label.
-#: lib/applicationeditform.php:227
 #, fuzzy
 msgid "Organization"
 msgstr "Sivutus"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:234
 #, fuzzy
 msgid "URL for the homepage of the organization"
 msgstr "Ryhmän tai aiheen kotisivun tai blogin osoite"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:243
 msgid "URL to redirect to after authentication"
 msgstr ""
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:271
 msgid "Browser"
 msgstr ""
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:288
 msgid "Desktop"
 msgstr ""
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:290
 msgid "Type of application, browser or desktop"
 msgstr ""
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:314
 msgid "Read-only"
 msgstr ""
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:334
 msgid "Read-write"
 msgstr ""
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:336
 msgid "Default access for this application: read-only, or read-write"
 msgstr ""
 
 #. TRANS: Submit button title.
-#: lib/applicationeditform.php:353
 msgid "Cancel"
 msgstr "Peruuta"
 
-#: lib/applicationlist.php:247
 msgid " by "
 msgstr ""
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:260
 msgid "read-write"
 msgstr ""
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:262
 msgid "read-only"
 msgstr ""
 
 #. TRANS: Used in application list. %1$s is a modified date, %2$s is access type ("read-write" or "read-only")
-#: lib/applicationlist.php:268
 #, php-format
 msgid "Approved %1$s - \"%2$s\" access."
 msgstr ""
 
 #. TRANS: Access token in the application list.
 #. TRANS: %s are the first 7 characters of the access token.
-#: lib/applicationlist.php:282
 #, php-format
 msgid "Access token starting with: %s"
 msgstr ""
 
 #. TRANS: Button label
-#: lib/applicationlist.php:298
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "Poista"
 
-#: lib/atom10feed.php:113
 msgid "Author element must contain a name element."
 msgstr ""
 
 #. TRANS: Server exception thrown when using the method setActivitySubject() in the class Atom10Feed.
-#: lib/atom10feed.php:160
 #, fuzzy
 msgid "Do not use this method!"
 msgstr "Älä poista tätä päivitystä"
 
 #. TRANS: Title.
-#: lib/attachmentnoticesection.php:67
 msgid "Notices where this attachment appears"
 msgstr ""
 
 #. TRANS: Title.
-#: lib/attachmenttagcloudsection.php:48
 #, fuzzy
 msgid "Tags for this attachment"
 msgstr "Liitettä ei ole."
 
 #. TRANS: Exception thrown when a password change fails.
-#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:227
 #, fuzzy
 msgid "Password changing failed."
 msgstr "Salasanan vaihto"
 
 #. TRANS: Exception thrown when a password change attempt fails because it is not allowed.
-#: lib/authenticationplugin.php:238
 #, fuzzy
 msgid "Password changing is not allowed."
 msgstr "Salasanan vaihto"
 
 #. TRANS: Title for the form to block a user.
-#: lib/blockform.php:68
 msgid "Block"
 msgstr "Estä"
 
 #. TRANS: Description of the form to block a user.
-#: lib/blockform.php:79
 msgid "Block this user"
 msgstr "Estä tämä käyttäjä"
 
 #. TRANS: Title for command results.
-#: lib/channel.php:104 lib/channel.php:125
 msgid "Command results"
 msgstr "Komennon tulos"
 
 #. TRANS: Title for command results.
-#: lib/channel.php:138
 #, fuzzy
 msgid "AJAX error"
 msgstr "Ajax-virhe"
 
 #. TRANS: E-mail subject when a command has completed.
-#: lib/channel.php:177 lib/mailhandler.php:143
 msgid "Command complete"
 msgstr "Komento suoritettu"
 
 #. TRANS: E-mail subject when a command has failed.
-#: lib/channel.php:188
 msgid "Command failed"
 msgstr "Komento epäonnistui"
 
 #. TRANS: Command exception text shown when a notice ID is requested that does not exist.
-#: lib/command.php:82 lib/command.php:106
 #, fuzzy
 msgid "Notice with that id does not exist."
 msgstr "Ei profiilia tuolla id:llä."
 
 #. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
 #. TRANS: Error text shown when a last user notice is requested and it does not exist.
-#: lib/command.php:99 lib/command.php:642
 #, fuzzy
 msgid "User has no last notice."
 msgstr "Käyttäjällä ei ole viimeistä päivitystä"
 
 #. TRANS: Message given requesting a profile for a non-existing user.
 #. TRANS: %s is the nickname of the user for which the profile could not be found.
-#: lib/command.php:128
 #, fuzzy, php-format
 msgid "Could not find a user with nickname %s."
 msgstr "Ei voitu päivittää käyttäjälle vahvistettua sähköpostiosoitetta."
 
 #. TRANS: Message given getting a non-existing user.
 #. TRANS: %s is the nickname of the user that could not be found.
-#: lib/command.php:148
 #, php-format
 msgid "Could not find a local user with nickname %s."
 msgstr ""
 
 #. TRANS: Error text shown when an unimplemented command is given.
-#: lib/command.php:183
 msgid "Sorry, this command is not yet implemented."
 msgstr "Valitettavasti tätä komentoa  ei ole vielä toteutettu."
 
 #. TRANS: Command exception text shown when a user tries to nudge themselves.
-#: lib/command.php:229
 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr ""
 
 #. TRANS: Message given having nudged another user.
 #. TRANS: %s is the nickname of the user that was nudged.
-#: lib/command.php:238
 #, fuzzy, php-format
 msgid "Nudge sent to %s."
 msgstr "Tönäisy lähetetty"
@@ -7984,7 +6584,6 @@ msgstr "Tönäisy lähetetty"
 #. TRANS: %1$s is the number of other user the user is subscribed to.
 #. TRANS: %2$s is the number of users that are subscribed to the user.
 #. TRANS: %3$s is the number of notices the user has sent.
-#: lib/command.php:268
 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"
@@ -7993,40 +6592,34 @@ msgid ""
 msgstr ""
 
 #. TRANS: Error message text shown when a favorite could not be set because it has already been favorited.
-#: lib/command.php:298
 #, fuzzy
 msgid "Could not create favorite: already favorited."
 msgstr "Ei voitu lisätä suosikiksi."
 
 #. TRANS: Text shown when a notice has been marked as favourite successfully.
-#: lib/command.php:324
 msgid "Notice marked as fave."
 msgstr "Päivitys on merkitty suosikiksi."
 
 #. TRANS: Message given having added a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:369
 #, php-format
 msgid "%1$s joined group %2$s."
 msgstr ""
 
 #. TRANS: Message given having removed a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:417
 #, php-format
 msgid "%1$s left group %2$s."
 msgstr ""
 
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: lib/command.php:438
 #, fuzzy, php-format
 msgctxt "WHOIS"
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
 
 #. TRANS: Whois output. %s is the full name of the queried user.
-#: lib/command.php:442
 #, php-format
 msgid "Fullname: %s"
 msgstr "Koko nimi: %s"
@@ -8034,7 +6627,6 @@ msgstr "Koko nimi: %s"
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a location.
-#: lib/command.php:446 lib/mail.php:275
 #, php-format
 msgid "Location: %s"
 msgstr "Kotipaikka: %s"
@@ -8042,20 +6634,17 @@ msgstr "Kotipaikka: %s"
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a homepage.
-#: lib/command.php:450 lib/mail.php:279
 #, php-format
 msgid "Homepage: %s"
 msgstr "Kotisivu: %s"
 
 #. TRANS: Whois output. %s is the bio information of the queried user.
-#: lib/command.php:454
 #, php-format
 msgid "About: %s"
 msgstr "Tietoa: %s"
 
 #. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).
 #. TRANS: %s is a remote profile.
-#: lib/command.php:483
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
@@ -8064,33 +6653,32 @@ msgstr ""
 
 #. TRANS: Message given if content is too long. %1$sd is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:500
 #, fuzzy, php-format
 msgid "Message too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
 msgstr[0] "Viesti oli liian pitkä - maksimikoko on 140 merkkiä, lähetit %d"
 msgstr[1] "Viesti oli liian pitkä - maksimikoko on 140 merkkiä, lähetit %d"
 
+#. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
+msgid "You can't send a message to this user."
+msgstr "Et voi lähettää viestiä tälle käyttäjälle."
+
 #. TRANS: Error text shown sending a direct message fails with an unknown reason.
-#: lib/command.php:528
 msgid "Error sending direct message."
 msgstr "Tapahtui virhe suoran viestin lähetyksessä."
 
 #. TRANS: Message given having repeated a notice from another user.
 #. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:565
 #, fuzzy, php-format
 msgid "Notice from %s repeated."
 msgstr "Päivitys lähetetty"
 
 #. TRANS: Error text shown when repeating a notice fails with an unknown reason.
-#: lib/command.php:568
 msgid "Error repeating notice."
 msgstr "Virhe tapahtui käyttäjän asettamisessa."
 
 #. TRANS: Message given if content of a notice for a reply is too long. %1$d is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:603
 #, fuzzy, php-format
 msgid "Notice too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Notice too long - maximum is %1$d characters, you sent %2$d."
@@ -8099,97 +6687,81 @@ msgstr[1] "Viesti oli liian pitkä - maksimikoko on 140 merkkiä, lähetit %d"
 
 #. TRANS: Text shown having sent a reply to a notice successfully.
 #. TRANS: %s is the nickname of the user of the notice the reply was sent to.
-#: lib/command.php:616
 #, fuzzy, php-format
 msgid "Reply to %s sent."
 msgstr "Vastaa tähän päivitykseen"
 
 #. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
-#: lib/command.php:619
 #, fuzzy
 msgid "Error saving notice."
 msgstr "Ongelma päivityksen tallentamisessa."
 
 #. TRANS: Error text shown when no username was provided when issuing a subscribe command.
-#: lib/command.php:666
 #, fuzzy
 msgid "Specify the name of the user to subscribe to."
 msgstr "Anna käyttäjätunnus, jonka päivitykset haluat tilata"
 
 #. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
-#: lib/command.php:675
 #, fuzzy
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "Et ole tilannut tämän käyttäjän päivityksiä."
 
 #. TRANS: Text shown after having subscribed to another user successfully.
 #. TRANS: %s is the name of the user the subscription was requested for.
-#: lib/command.php:683
 #, php-format
 msgid "Subscribed to %s."
 msgstr ""
 
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.
-#: lib/command.php:704 lib/command.php:815
 #, fuzzy
 msgid "Specify the name of the user to unsubscribe from."
 msgstr "Anna käyttäjätunnus, jonka päivityksien tilauksen haluat lopettaa"
 
 #. TRANS: Text shown after having unsubscribed from another user successfully.
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:715
 #, php-format
 msgid "Unsubscribed from %s."
 msgstr ""
 
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
-#: lib/command.php:735 lib/command.php:761
 msgid "Command not yet implemented."
 msgstr "Komentoa ei ole vielä toteutettu."
 
 #. TRANS: Text shown when issuing the command "off" successfully.
-#: lib/command.php:739
 msgid "Notification off."
 msgstr "Ilmoitukset pois päältä."
 
 #. TRANS: Error text shown when the command "off" fails for an unknown reason.
-#: lib/command.php:742
 msgid "Can't turn off notification."
 msgstr "Ilmoituksia ei voi pistää pois päältä."
 
 #. TRANS: Text shown when issuing the command "on" successfully.
-#: lib/command.php:765
 msgid "Notification on."
 msgstr "Ilmoitukset päällä."
 
 #. TRANS: Error text shown when the command "on" fails for an unknown reason.
-#: lib/command.php:768
 msgid "Can't turn on notification."
 msgstr "Ilmoituksia ei voi pistää päälle."
 
 #. TRANS: Error text shown when issuing the login command while login is disabled.
-#: lib/command.php:782
 msgid "Login command is disabled."
 msgstr ""
 
 #. TRANS: Text shown after issuing the login command successfully.
 #. TRANS: %s is a logon link..
-#: lib/command.php:795
 #, php-format
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
 
 #. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:824
 #, php-format
 msgid "Unsubscribed %s."
 msgstr ""
 
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
-#: lib/command.php:842
 #, fuzzy
 msgid "You are not subscribed to anyone."
 msgstr "Et ole tilannut tämän käyttäjän päivityksiä."
@@ -8197,7 +6769,6 @@ msgstr "Et ole tilannut tämän käyttäjän päivityksiä."
 #. TRANS: Text shown after requesting other users a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
-#: lib/command.php:847
 #, fuzzy
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
@@ -8206,7 +6777,6 @@ msgstr[1] "Olet jos tilannut seuraavien käyttäjien päivitykset:"
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user
 #. TRANS: (followers) without having any subscribers.
-#: lib/command.php:869
 #, fuzzy
 msgid "No one is subscribed to you."
 msgstr "Toista ei voitu asettaa tilaamaan sinua."
@@ -8214,7 +6784,6 @@ msgstr "Toista ei voitu asettaa tilaamaan sinua."
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
-#: lib/command.php:874
 #, fuzzy
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
@@ -8223,7 +6792,6 @@ msgstr[1] "Toista ei voitu asettaa tilaamaan sinua."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to without having
 #. TRANS: any group subscriptions.
-#: lib/command.php:896
 #, fuzzy
 msgid "You are not a member of any groups."
 msgstr "Sinä et kuulu tähän ryhmään."
@@ -8231,14 +6799,12 @@ msgstr "Sinä et kuulu tähän ryhmään."
 #. TRANS: Text shown after requesting groups a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
-#: lib/command.php:901
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "Sinä et kuulu tähän ryhmään."
 msgstr[1] "Sinä et kuulu tähän ryhmään."
 
 #. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-#: lib/command.php:916
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -8281,126 +6847,105 @@ msgid ""
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:36
 #, fuzzy
 msgid "No configuration file found."
 msgstr "Varmistuskoodia ei ole annettu."
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:39
 #, fuzzy
 msgid "I looked for configuration files in the following places:"
 msgstr "Kutsu(t) lähetettiin seuraaville henkilöille:"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:42
 msgid "You may wish to run the installer to fix this."
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:46
 #, fuzzy
 msgid "Go to the installer."
 msgstr "Kirjaudu sisään palveluun"
 
-#: lib/dberroraction.php:59
 msgid "Database error"
 msgstr "Tietokantavirhe"
 
 #. TRANS: Description of form for deleting a user.
-#: lib/deleteuserform.php:75
 msgid "Delete this user"
 msgstr "Poista käyttäjä"
 
-#: lib/designform.php:114
 #, fuzzy
 msgid "Change design"
 msgstr "Ryhmän ulkoasu"
 
 #. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: lib/designform.php:131
 msgid "Change colours"
 msgstr "Vaihda väriä"
 
 #. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: lib/designform.php:138
 msgid "Use defaults"
 msgstr "Käytä oletusasetuksia"
 
 #. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: lib/designform.php:140
 #, fuzzy
 msgid "Restore default designs"
 msgstr "Käytä oletusasetuksia"
 
 #. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: lib/designform.php:148
 #, fuzzy
 msgid "Reset back to default"
 msgstr "Käytä oletusasetuksia"
 
 #. TRANS: Label in form on profile design page.
 #. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
-#: lib/designform.php:158
 #, fuzzy
 msgid "Upload file"
 msgstr "Lataa"
 
 #. TRANS: Instructions for form on profile design page.
-#: lib/designform.php:163
 #, fuzzy
 msgid ""
 "You can upload your personal background image. The maximum file size is 2Mb."
 msgstr "Voit ladata oman profiilikuvasi. Maksimikoko on %s."
 
 #. TRANS: Radio button on profile design page that will enable use of the uploaded profile image.
-#: lib/designform.php:194
 #, fuzzy
 msgctxt "RADIO"
 msgid "On"
 msgstr "On"
 
 #. TRANS: Radio button on profile design page that will disable use of the uploaded profile image.
-#: lib/designform.php:211
 #, fuzzy
 msgctxt "RADIO"
 msgid "Off"
 msgstr "Off"
 
 #. TRANS: Title for button on profile design page to save settings.
-#: lib/designform.php:322
 #, fuzzy
 msgid "Save design"
 msgstr "Ryhmän ulkoasu"
 
 #. TRANS: Error message displayed if design settings could not be saved.
 #. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
-#: lib/designsettings.php:216 lib/designsettings.php:238
 msgid "Couldn't update your design."
 msgstr "Ei voitu päivittää sinun sivusi ulkoasua."
 
 #. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
-#: lib/designsettings.php:244
 #, fuzzy
 msgid "Design defaults restored."
 msgstr "Ulkoasuasetukset tallennettu."
 
 #. TRANS: Exception. %s is an ID.
-#: lib/discovery.php:153
 #, fuzzy, php-format
 msgid "Unable to find services for %s."
 msgstr "Käytä tätä lomaketta muokataksesi ryhmää."
 
 #. TRANS: Form legend for removing the favourite status for a favourite notice.
 #. TRANS: Title for button text for removing the favourite status for a favourite notice.
-#: lib/disfavorform.php:108 lib/disfavorform.php:140
 msgid "Disfavor this notice"
 msgstr "Poista tämä päivitys suosikeista"
 
 #. TRANS: Button text for removing the favourite status for a favourite notice.
-#: lib/disfavorform.php:136
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Disfavor favorite"
@@ -8408,101 +6953,80 @@ msgstr "Poista suosikeista"
 
 #. TRANS: Form legend for adding the favourite status to a notice.
 #. TRANS: Title for button text for adding the favourite status to a notice.
-#: lib/favorform.php:108 lib/favorform.php:139
 msgid "Favor this notice"
 msgstr "Merkitse päivitys suosikkeihin"
 
 #. TRANS: Button text for adding the favourite status to a notice.
-#: lib/favorform.php:135
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Favor"
 msgstr "Lisää suosikiksi"
 
-#: lib/feed.php:84
 msgid "RSS 1.0"
 msgstr "RSS 1.0"
 
-#: lib/feed.php:86
 msgid "RSS 2.0"
 msgstr "RSS 2.0"
 
-#: lib/feed.php:88
 msgid "Atom"
 msgstr "Atom"
 
-#: lib/feed.php:90
 msgid "FOAF"
 msgstr "FOAF"
 
-#: lib/feedimporter.php:75
 #, fuzzy
 msgid "Not an atom feed."
 msgstr "Kaikki jäsenet"
 
-#: lib/feedimporter.php:82
 msgid "No author in the feed."
 msgstr ""
 
-#: lib/feedimporter.php:89
 msgid "Can't import without a user."
 msgstr ""
 
 #. TRANS: Header for feed links (h2).
-#: lib/feedlist.php:66
 msgid "Feeds"
 msgstr ""
 
-#: lib/galleryaction.php:128
 msgid "All"
 msgstr "Kaikki"
 
-#: lib/galleryaction.php:136
 #, fuzzy
 msgid "Select tag to filter"
 msgstr "Valitse operaattori"
 
-#: lib/galleryaction.php:137
 msgid "Tag"
 msgstr "Tagi"
 
-#: lib/galleryaction.php:138
 msgid "Choose a tag to narrow list"
 msgstr "Valitse tagi lyhentääksesi listaa"
 
-#: lib/galleryaction.php:140
 msgid "Go"
 msgstr "Mene"
 
-#: lib/grantroleform.php:91
 #, php-format
 msgid "Grant this user the \"%s\" role"
 msgstr ""
 
-#: lib/groupeditform.php:147
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr ""
 "1-64 pientä kirjainta tai numeroa, ei ääkkösiä eikä välimerkkejä tai "
 "välilyöntejä"
 
-#: lib/groupeditform.php:156
 #, fuzzy
 msgid "URL of the homepage or blog of the group or topic."
 msgstr "Ryhmän tai aiheen kotisivun tai blogin osoite"
 
-#: lib/groupeditform.php:161
 #, fuzzy
 msgid "Describe the group or topic"
 msgstr "Kuvaile ryhmää tai aihetta 140 merkillä"
 
-#: lib/groupeditform.php:163
 #, fuzzy, php-format
 msgid "Describe the group or topic in %d character or less"
 msgid_plural "Describe the group or topic in %d characters or less"
 msgstr[0] "Kuvaile itseäsi ja kiinnostuksen kohteitasi %d merkillä"
 msgstr[1] "Kuvaile itseäsi ja kiinnostuksen kohteitasi %d merkillä"
 
-#: lib/groupeditform.php:175
 #, fuzzy
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\"."
@@ -8510,7 +7034,6 @@ msgstr ""
 "Ryhmän paikka, jos sellainen on, kuten \"Kaupunki, Maakunta (tai Lääni), Maa"
 "\""
 
-#: lib/groupeditform.php:183
 #, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -8522,49 +7045,42 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Menu item in the group navigation page.
-#: lib/groupnav.php:86
 msgctxt "MENU"
 msgid "Group"
 msgstr ""
 
 #. TRANS: Tooltip for menu item in the group navigation page.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:89
 #, php-format
 msgctxt "TOOLTIP"
 msgid "%s group"
 msgstr ""
 
 #. TRANS: Menu item in the group navigation page.
-#: lib/groupnav.php:95
 msgctxt "MENU"
 msgid "Members"
 msgstr ""
 
 #. TRANS: Tooltip for menu item in the group navigation page.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:98
 #, php-format
 msgctxt "TOOLTIP"
 msgid "%s group members"
 msgstr ""
 
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/groupnav.php:108
 msgctxt "MENU"
 msgid "Blocked"
 msgstr ""
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:111
 #, php-format
 msgctxt "TOOLTIP"
 msgid "%s blocked users"
 msgstr ""
 
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/groupnav.php:117
 #, fuzzy
 msgctxt "MENU"
 msgid "Admin"
@@ -8572,21 +7088,18 @@ msgstr "Ylläpito"
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:120
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Edit %s group properties"
 msgstr ""
 
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/groupnav.php:126
 msgctxt "MENU"
 msgid "Logo"
 msgstr ""
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:129
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Add or edit %s logo"
@@ -8594,69 +7107,57 @@ msgstr ""
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:138
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Add or edit %s design"
 msgstr ""
 
 #. TRANS: Title for groups with the most members section.
-#: lib/groupsbymemberssection.php:71
 msgid "Groups with most members"
 msgstr "Ryhmät, joissa eniten jäseniä"
 
 #. TRANS: Title for groups with the most posts section.
-#: lib/groupsbypostssection.php:71
 msgid "Groups with most posts"
 msgstr "Ryhmät, joissa eniten päivityksiä"
 
 #. TRANS: Title for group tag cloud section.
 #. TRANS: %s is a group name.
-#: lib/grouptagcloudsection.php:57
 #, php-format
 msgid "Tags in %s group's notices"
 msgstr "Tagit ryhmän %s päivityksissä"
 
 #. TRANS: Client exception 406
-#: lib/htmloutputter.php:104
 msgid "This page is not available in a media type you accept"
 msgstr "Tämä sivu ei ole saatavilla sinulle sopivassa mediatyypissä."
 
 #. TRANS: Exception thrown when trying to upload an unsupported image file format.
-#: lib/imagefile.php:73
 msgid "Unsupported image file format."
 msgstr "Kuvatiedoston formaattia ei ole tuettu."
 
 #. TRANS: Exception thrown when too large a file is uploaded.
 #. TRANS: %s is the maximum file size, for example "500b", "10kB" or "2MB".
-#: lib/imagefile.php:91
 #, fuzzy, php-format
 msgid "That file is too big. The maximum file size is %s."
 msgstr "Voit ladata ryhmälle logon."
 
 #. TRANS: Exception thrown when uploading an image and that action could not be completed.
-#: lib/imagefile.php:97
 msgid "Partial upload."
 msgstr "Osittain ladattu palvelimelle."
 
 #. TRANS: Exception thrown when uploading a file as image that is not an image or is a corrupt file.
-#: lib/imagefile.php:115
 msgid "Not an image or corrupt file."
 msgstr "Tuo ei ole kelvollinen kuva tai tiedosto on rikkoutunut."
 
 #. TRANS: Exception thrown during resize when image has been registered as present, but is no longer there.
-#: lib/imagefile.php:178
 msgid "Lost our file."
 msgstr "Tiedosto hävisi."
 
 #. TRANS: Exception thrown when trying to resize an unknown file type.
 #. TRANS: Exception thrown when trying resize an unknown file type.
-#: lib/imagefile.php:216 lib/imagefile.php:257
 msgid "Unknown file type"
 msgstr "Tunnistamaton tiedoston tyyppi"
 
 #. TRANS: Number of megabytes. %d is the number.
-#: lib/imagefile.php:303
 #, php-format
 msgid "%dMB"
 msgid_plural "%dMB"
@@ -8664,7 +7165,6 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Number of kilobytes. %d is the number.
-#: lib/imagefile.php:307
 #, php-format
 msgid "%dkB"
 msgid_plural "%dkB"
@@ -8672,14 +7172,12 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Number of bytes. %d is the number.
-#: lib/imagefile.php:310
 #, php-format
 msgid "%dB"
 msgid_plural "%dB"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/implugin.php:262
 #, php-format
 msgid ""
 "User \"%s\" on %s has said that your %s screenname belongs to them. If "
@@ -8689,53 +7187,44 @@ msgid ""
 "message."
 msgstr ""
 
-#: lib/implugin.php:349
 #, php-format
 msgid "Unknown inbox source %d."
 msgstr ""
 
-#: lib/implugin.php:485
 #, fuzzy, php-format
 msgid "Message too long - maximum is %1$d characters, you sent %2$d."
 msgstr "Viesti oli liian pitkä - maksimikoko on 140 merkkiä, lähetit %d"
 
-#: lib/leaveform.php:114
 msgid "Leave"
 msgstr "Eroa"
 
 #. TRANS: Menu item for logging in to the StatusNet site.
-#: lib/logingroupnav.php:77
 #, fuzzy
 msgctxt "MENU"
 msgid "Login"
 msgstr "Kirjaudu sisään"
 
 #. TRANS: Title for menu item for logging in to the StatusNet site.
-#: lib/logingroupnav.php:79
 msgid "Login with a username and password"
 msgstr "Kirjaudu sisään käyttäjätunnuksella ja salasanalla"
 
 #. TRANS: Menu item for registering with the StatusNet site.
-#: lib/logingroupnav.php:85
 #, fuzzy
 msgctxt "MENU"
 msgid "Register"
 msgstr "Rekisteröidy"
 
 #. TRANS: Title for menu item for registering with the StatusNet site.
-#: lib/logingroupnav.php:87
 msgid "Sign up for a new account"
 msgstr "Luo uusi käyttäjätili"
 
 #. TRANS: Subject for address confirmation email.
-#: lib/mail.php:172
 msgid "Email address confirmation"
 msgstr "Sähköpostiosoitteen vahvistus"
 
 #. TRANS: Body for address confirmation email.
 #. TRANS: %1$s is the addressed user's nickname, %2$s is the StatusNet sitename,
 #. TRANS: %3$s is the URL to confirm at.
-#: lib/mail.php:177
 #, php-format
 msgid ""
 "Hey, %1$s.\n"
@@ -8754,14 +7243,12 @@ msgstr ""
 
 #. TRANS: Subject of new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
-#: lib/mail.php:243
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1$s seuraa nyt päivityksiäsi palvelussa %2$s."
 
 #. TRANS: This is a paragraph in a new-subscriber e-mail.
 #. TRANS: %s is a URL where the subscriber can be reported as abusive.
-#: lib/mail.php:250
 #, php-format
 msgid ""
 "If you believe this account is being used abusively, you can block them from "
@@ -8773,7 +7260,6 @@ msgstr ""
 #. TRANS: %3$s is the subscriber's profile URL, %4$s is the subscriber's location (or empty)
 #. TRANS: %5$s is the subscriber's homepage URL (or empty), %6%s is the subscriber's bio (or empty)
 #. TRANS: %7$s is a link to the addressed user's e-mail settings.
-#: lib/mail.php:260
 #, fuzzy, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -8800,14 +7286,12 @@ msgstr ""
 
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is biographical information.
-#: lib/mail.php:283
 #, php-format
 msgid "Bio: %s"
 msgstr "Kotipaikka: %s"
 
 #. TRANS: Subject of notification mail for new posting email address.
 #. TRANS: %s is the StatusNet sitename.
-#: lib/mail.php:312
 #, php-format
 msgid "New email address for posting to %s"
 msgstr "Uusi sähköpostiosoite päivityksien lähettämiseen palveluun %s"
@@ -8815,7 +7299,6 @@ msgstr "Uusi sähköpostiosoite päivityksien lähettämiseen palveluun %s"
 #. TRANS: Body of notification mail for new posting email address.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is the e-mail address to send
 #. TRANS: to to post by e-mail, %3$s is a URL to more instructions.
-#: lib/mail.php:318
 #, fuzzy, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -8838,26 +7321,22 @@ msgstr ""
 
 #. TRANS: Subject line for SMS-by-email notification messages.
 #. TRANS: %s is the posting user's nickname.
-#: lib/mail.php:439
 #, php-format
 msgid "%s status"
 msgstr "%s päivitys"
 
 #. TRANS: Subject line for SMS-by-email address confirmation message.
-#: lib/mail.php:465
 msgid "SMS confirmation"
 msgstr "SMS-vahvistus"
 
 #. TRANS: Main body heading for SMS-by-email address confirmation message.
 #. TRANS: %s is the addressed user's nickname.
-#: lib/mail.php:469
 #, fuzzy, php-format
 msgid "%s: confirm you own this phone number with this code:"
 msgstr "Odotetaan vahvistusta tälle puhelinnumerolle."
 
 #. TRANS: Subject for 'nudge' notification email.
 #. TRANS: %s is the nudging user.
-#: lib/mail.php:490
 #, fuzzy, php-format
 msgid "You have been nudged by %s"
 msgstr "%s tönäisi sinua"
@@ -8865,7 +7344,6 @@ msgstr "%s tönäisi sinua"
 #. TRANS: Body for 'nudge' notification email.
 #. TRANS: %1$s is the nuding user's long name, $2$s is the nudging user's nickname,
 #. TRANS: %3$s is a URL to post notices at, %4$s is the StatusNet sitename.
-#: lib/mail.php:497
 #, php-format
 msgid ""
 "%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -8883,7 +7361,6 @@ msgstr ""
 
 #. TRANS: Subject for direct-message notification email.
 #. TRANS: %s is the sending user's nickname.
-#: lib/mail.php:544
 #, php-format
 msgid "New private message from %s"
 msgstr "Uusi yksityisviesti käyttäjältä %s"
@@ -8892,7 +7369,6 @@ msgstr "Uusi yksityisviesti käyttäjältä %s"
 #. TRANS: %1$s is the sending user's long name, %2$s is the sending user's nickname,
 #. TRANS: %3$s is the message content, %4$s a URL to the message,
 #. TRANS: %5$s is the StatusNet sitename.
-#: lib/mail.php:552
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -8913,7 +7389,6 @@ msgstr ""
 
 #. TRANS: Subject for favorite notification e-mail.
 #. TRANS: %1$s is the adding user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:604
 #, fuzzy, php-format
 msgid "%1$s (@%2$s) added your notice as a favorite"
 msgstr "Lähetä sähköpostia, jos joku lisää päivitykseni suosikiksi."
@@ -8923,7 +7398,6 @@ msgstr "Lähetä sähköpostia, jos joku lisää päivitykseni suosikiksi."
 #. TRANS: %3$s is a URL to the faved notice, %4$s is the faved notice text,
 #. TRANS: %5$s is a URL to all faves of the adding user, %6$s is the StatusNet sitename,
 #. TRANS: %7$s is the adding user's nickname.
-#: lib/mail.php:611
 #, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -8945,7 +7419,6 @@ msgid ""
 msgstr ""
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:669
 #, php-format
 msgid ""
 "The full conversation can be read here:\n"
@@ -8955,7 +7428,6 @@ msgstr ""
 
 #. TRANS: E-mail subject for notice notification.
 #. TRANS: %1$s is the sending user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:677
 #, php-format
 msgid "%1$s (@%2$s) sent a notice to your attention"
 msgstr ""
@@ -8966,7 +7438,6 @@ msgstr ""
 #. TRANS: %5$s is a URL to the full conversion if it exists (otherwise empty),
 #. TRANS: %6$s is a URL to reply to the notice, %7$s is a URL to all @-replied for the addressed user,
 #. TRANS: %8$s is a URL to the addressed user's e-mail settings, %9$s is the sender's nickname.
-#: lib/mail.php:685
 #, php-format
 msgid ""
 "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -8993,63 +7464,51 @@ msgid ""
 "P.S. You can turn off these email notifications here: %8$s\n"
 msgstr ""
 
-#: lib/mailbox.php:87
 msgid "Only the user can read their own mailboxes."
 msgstr "Vain käyttäjä voi lukea omaa postilaatikkoaan."
 
-#: lib/mailbox.php:125
 msgid ""
 "You have no private messages. You can send private message to engage other "
 "users in conversation. People can send you messages for your eyes only."
 msgstr ""
 
-#: lib/mailhandler.php:37
 msgid "Could not parse message."
 msgstr "Ei voitu lukea viestiä."
 
-#: lib/mailhandler.php:42
 msgid "Not a registered user."
 msgstr "Tuo ei ole rekisteröitynyt käyttäjä."
 
-#: lib/mailhandler.php:46
 msgid "Sorry, that is not your incoming email address."
 msgstr "Valitettavasti tuo ei ole oikea osoite sähköpostipäivityksille."
 
-#: lib/mailhandler.php:50
 msgid "Sorry, no incoming email allowed."
 msgstr "Valitettavasti päivitysten teko sähköpostilla ei ole sallittua."
 
-#: lib/mailhandler.php:229
 #, fuzzy, php-format
 msgid "Unsupported message type: %s"
 msgstr "Kuvatiedoston formaattia ei ole tuettu."
 
 #. TRANS: Client exception thrown when a database error was thrown during a file upload operation.
-#: lib/mediafile.php:102 lib/mediafile.php:174
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
 
 #. TRANS: Client exception thrown when a file upload operation would cause a user to exceed a set quota.
-#: lib/mediafile.php:238 lib/mediafile.php:281
 msgid "File exceeds user's quota."
 msgstr ""
 
 #. TRANS: Client exception thrown when a file upload operation fails because the file could
 #. TRANS: not be moved from the temporary folder to the permanent file location.
-#: lib/mediafile.php:258 lib/mediafile.php:300
 msgid "File could not be moved to destination directory."
 msgstr ""
 
 #. TRANS: Client exception thrown when a file upload operation has been stopped because the MIME
 #. TRANS: type of the uploaded file could not be determined.
-#: lib/mediafile.php:265 lib/mediafile.php:306
 msgid "Could not determine file's MIME type."
 msgstr "Ei voitu poistaa suosikkia."
 
 #. TRANS: Client exception thrown trying to upload a forbidden MIME type.
 #. TRANS: %1$s is the file type that was denied, %2$s is the application part of
 #. TRANS: the MIME type that was denied.
-#: lib/mediafile.php:396
 #, php-format
 msgid ""
 "\"%1$s\" is not a supported file type on this server. Try using another %2$s "
@@ -9058,521 +7517,411 @@ msgstr ""
 
 #. TRANS: Client exception thrown trying to upload a forbidden MIME type.
 #. TRANS: %s is the file type that was denied.
-#: lib/mediafile.php:401
 #, php-format
 msgid "\"%s\" is not a supported file type on this server."
 msgstr ""
 
-#: lib/messageform.php:120
 msgid "Send a direct notice"
 msgstr "Lähetä suora viesti"
 
 #. TRANS Label entry in drop-down selection box in direct-message inbox/outbox. This is the default entry in the drop-down box, doubling as instructions and a brake against accidental submissions with the first user in the list.
-#: lib/messageform.php:137
 #, fuzzy
 msgid "Select recipient:"
 msgstr "Valitse operaattori"
 
 #. TRANS Entry in drop-down selection box in direct-message inbox/outbox when no one is available to message.
-#: lib/messageform.php:150
 #, fuzzy
 msgid "No mutual subscribers."
 msgstr "Ei ole tilattu!."
 
-#: lib/messageform.php:153
 msgid "To"
 msgstr "Vastaanottaja"
 
-#: lib/messageform.php:184 lib/noticeform.php:236
 msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr "Lähetä"
 
-#: lib/messagelist.php:77
 #, fuzzy
 msgid "Messages"
 msgstr "Viesti"
 
-#: lib/messagelistitem.php:123 lib/noticelist.php:527
 #, fuzzy
 msgid "from"
 msgstr " lähteestä "
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:178
 msgid "Nickname cannot be empty."
 msgstr ""
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:191
 #, php-format
 msgid "Nickname cannot be more than %d character long."
 msgid_plural "Nickname cannot be more than %d characters long."
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/noticeform.php:160
+#. TRANS: Form legend for notice form.
 msgid "Send a notice"
 msgstr "Lähetä päivitys"
 
-#: lib/noticeform.php:174
+#. TRANS: Title for notice label. %s is the user's nickname.
 #, php-format
 msgid "What's up, %s?"
 msgstr "Mitä teet juuri nyt, %s?"
 
-#: lib/noticeform.php:193
+#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr ""
 
-#: lib/noticeform.php:197
-msgid "Attach a file"
+#. TRANS: Title for input field to attach a file to a notice.
+msgid "Attach a file."
 msgstr ""
 
-#: lib/noticeform.php:212
+#. TRANS: Field label to add location to a notice.
 #, fuzzy
 msgid "Share my location"
 msgstr "Tageja ei voitu tallentaa."
 
-#: lib/noticeform.php:215
+#. TRANS: Text to not share location for a notice in notice form.
 #, fuzzy
 msgid "Do not share my location"
 msgstr "Tageja ei voitu tallentaa."
 
-#: lib/noticeform.php:216
+#. TRANS: Timeout error text for location retrieval in notice form.
 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
 "try again later"
 msgstr ""
 
 #. TRANS: Used in coordinates as abbreviation of north
-#: lib/noticelist.php:457
 #, fuzzy
 msgid "N"
 msgstr "Ei"
 
 #. TRANS: Used in coordinates as abbreviation of south
-#: lib/noticelist.php:459
 msgid "S"
 msgstr ""
 
 #. TRANS: Used in coordinates as abbreviation of east
-#: lib/noticelist.php:461
 msgid "E"
 msgstr ""
 
 #. TRANS: Used in coordinates as abbreviation of west
-#: lib/noticelist.php:463
 msgid "W"
 msgstr ""
 
-#: lib/noticelist.php:465
 #, php-format
 msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgstr ""
 
-#: lib/noticelist.php:474
 msgid "at"
 msgstr ""
 
-#: lib/noticelist.php:523
 msgid "web"
 msgstr ""
 
-#: lib/noticelist.php:589
 #, fuzzy
 msgid "in context"
 msgstr "Ei sisältöä!"
 
-#: lib/noticelist.php:624
 #, fuzzy
 msgid "Repeated by"
 msgstr "Luotu"
 
-#: lib/noticelist.php:651
 msgid "Reply to this notice"
 msgstr "Vastaa tähän päivitykseen"
 
-#: lib/noticelist.php:652
 msgid "Reply"
 msgstr "Vastaus"
 
-#: lib/noticelist.php:678
 msgid "Delete this notice"
 msgstr "Poista tämä päivitys"
 
-#: lib/noticelist.php:696
 #, fuzzy
 msgid "Notice repeated"
 msgstr "Päivitys on poistettu."
 
-#: lib/nudgeform.php:116
 msgid "Nudge this user"
 msgstr "Tönäise tätä käyttäjää"
 
-#: lib/nudgeform.php:128
 msgid "Nudge"
 msgstr "Tönäise"
 
-#: lib/nudgeform.php:128
 msgid "Send a nudge to this user"
 msgstr "Lähetä tönäisy tälle käyttäjälle"
 
-#: lib/oauthstore.php:294
 msgid "Error inserting new profile."
 msgstr ""
 
-#: lib/oauthstore.php:302
 msgid "Error inserting avatar."
 msgstr ""
 
-#: lib/oauthstore.php:322
 msgid "Error inserting remote profile."
 msgstr ""
 
 #. TRANS: Exception thrown when a notice is denied because it has been sent before.
-#: lib/oauthstore.php:362
 msgid "Duplicate notice."
 msgstr ""
 
-#: lib/oauthstore.php:507
 msgid "Couldn't insert new subscription."
 msgstr "Ei voitu lisätä uutta tilausta."
 
-#: lib/personalgroupnav.php:104
-#, fuzzy
 msgid "Replies"
 msgstr "Vastaukset"
 
-#: lib/personalgroupnav.php:109
-#, fuzzy
 msgid "Favorites"
 msgstr "Suosikit"
 
-#: lib/personalgroupnav.php:120
-#, fuzzy
 msgid "Inbox"
 msgstr "Saapuneet"
 
-#: lib/personalgroupnav.php:121
 msgid "Your incoming messages"
 msgstr "Sinulle saapuneet viestit"
 
-#: lib/personalgroupnav.php:125
-#, fuzzy
 msgid "Outbox"
 msgstr "Lähetetyt"
 
-#: lib/personalgroupnav.php:126
 msgid "Your sent messages"
 msgstr "Lähettämäsi viestit"
 
 #. TRANS: Title for personal tag cloud section. %s is a user nickname.
-#: lib/personaltagcloudsection.php:56
 #, php-format
 msgid "Tags in %s's notices"
 msgstr "Tagit käyttäjän %s päivityksissä"
 
 #. TRANS: Displayed as version information for a plugin if no version information was found.
-#: lib/plugin.php:126
 #, fuzzy
 msgid "Unknown"
 msgstr "Tuntematon toiminto"
 
 #. TRANS: Plugin admin panel controls
-#: lib/plugindisableform.php:90
 msgctxt "plugin"
 msgid "Disable"
 msgstr ""
 
 #. TRANS: Plugin admin panel controls
-#: lib/pluginenableform.php:112
 msgctxt "plugin"
 msgid "Enable"
 msgstr ""
 
-#: lib/pluginlist.php:196
 msgctxt "plugin-description"
 msgid "(Plugin descriptions unavailable when disabled.)"
 msgstr ""
 
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:88
 msgid "Subscriptions"
 msgstr "Tilaukset"
 
 #. TRANS: Text for user subscription statistics if user has more subscriptions than displayed.
-#: lib/profileaction.php:144
 msgid "All subscriptions"
 msgstr "Kaikki tilaukset"
 
 #. TRANS: H2 text for user subscriber statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:96
 msgid "Subscribers"
 msgstr "Tilaajat"
 
 #. TRANS: Text for user subscription statistics if user has more subscribers than displayed.
-#: lib/profileaction.php:181
 msgid "All subscribers"
 msgstr "Kaikki tilaajat"
 
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:213
 #, fuzzy
 msgid "User ID"
 msgstr "Käyttäjä"
 
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:219
 msgid "Member since"
 msgstr "Käyttäjänä alkaen"
 
 #. TRANS: Label for user statistics.
 #. TRANS: H2 text for user group membership statistics.
-#: lib/profileaction.php:239 lib/profileaction.php:290
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:104
 msgid "Groups"
 msgstr "Ryhmät"
 
 #. TRANS: Label for user statistics.
 #. TRANS: Average count of posts made per day since account registration.
-#: lib/profileaction.php:253
 msgid "Daily average"
 msgstr ""
 
 #. TRANS: Text for user group membership statistics if user has more subscriptions than displayed.
-#: lib/profileaction.php:305
 msgid "All groups"
 msgstr "Kaikki ryhmät"
 
 #. TRANS: Server error displayed when using an unimplemented method.
-#: lib/profileformaction.php:123
 msgid "Unimplemented method."
 msgstr ""
 
-#: lib/publicgroupnav.php:82
 msgid "User groups"
 msgstr "Käyttäjäryhmät"
 
-#: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
 msgid "Recent tags"
 msgstr "Viimeaikaiset tagit"
 
-#: lib/publicgroupnav.php:88
 msgid "Featured"
 msgstr "Esittelyssä"
 
-#: lib/publicgroupnav.php:92
 msgid "Popular"
 msgstr "Suosituimmat"
 
-#: lib/redirectingaction.php:95
 #, fuzzy
 msgid "No return-to arguments."
 msgstr "Ei id parametria."
 
-#: lib/repeatform.php:107
 #, fuzzy
 msgid "Repeat this notice?"
 msgstr "Vastaa tähän päivitykseen"
 
-#: lib/repeatform.php:132
 msgid "Yes"
 msgstr "Kyllä"
 
-#: lib/repeatform.php:132
 #, fuzzy
 msgid "Repeat this notice"
 msgstr "Vastaa tähän päivitykseen"
 
-#: lib/revokeroleform.php:91
 #, fuzzy, php-format
 msgid "Revoke the \"%s\" role from this user"
 msgstr "Estä tätä käyttäjää osallistumassa tähän ryhmään"
 
 #. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:1001
 #, fuzzy
 msgid "Page not found."
 msgstr "API-metodia ei löytynyt."
 
-#: lib/sandboxform.php:67
 #, fuzzy
 msgid "Sandbox"
 msgstr "Saapuneet"
 
-#: lib/sandboxform.php:78
 #, fuzzy
 msgid "Sandbox this user"
 msgstr "Poista esto tältä käyttäjältä"
 
 #. TRANS: Fieldset legend for the search form.
-#: lib/searchaction.php:120
 #, fuzzy
 msgid "Search site"
 msgstr "Haku"
 
 #. TRANS: Used as a field label for the field where one or more keywords
 #. TRANS: for searching can be entered.
-#: lib/searchaction.php:128
 msgid "Keyword(s)"
 msgstr ""
 
 #. TRANS: Button text for searching site.
-#: lib/searchaction.php:130
 msgctxt "BUTTON"
 msgid "Search"
 msgstr ""
 
-#: lib/searchgroupnav.php:80
 msgid "People"
 msgstr "Henkilö"
 
-#: lib/searchgroupnav.php:81
 msgid "Find people on this site"
 msgstr "Hae ihmisiä tältä sivustolta"
 
-#: lib/searchgroupnav.php:83
 msgid "Find content of notices"
 msgstr "Hae päivityksien sisällöstä"
 
-#: lib/searchgroupnav.php:85
 msgid "Find groups on this site"
 msgstr "Etsi ryhmiä tästä palvelusta"
 
-#: lib/section.php:89
 msgid "Untitled section"
 msgstr "Nimetön osa"
 
-#: lib/section.php:106
 msgid "More..."
 msgstr "Lisää..."
 
-#: lib/settingsnav.php:78
 msgid "Change your profile settings"
 msgstr "Vaihda profiiliasetuksesi"
 
-#: lib/settingsnav.php:83
 msgid "Upload an avatar"
 msgstr "Lataa kuva"
 
-#: lib/settingsnav.php:88
 msgid "Change your password"
 msgstr "Vaihda salasanasi"
 
-#: lib/settingsnav.php:93
 msgid "Change email handling"
 msgstr "Muuta sähköpostin käsittelyasetuksia."
 
-#: lib/settingsnav.php:98
 #, fuzzy
 msgid "Design your profile"
 msgstr "Käyttäjän profiili"
 
-#: lib/settingsnav.php:102
 msgid "URL"
 msgstr "URL"
 
-#: lib/settingsnav.php:103
 msgid "URL shorteners"
 msgstr ""
 
-#: lib/settingsnav.php:111
 msgid "Updates by instant messenger (IM)"
 msgstr "Päivitykset pikaviestintä käyttäen (IM)"
 
-#: lib/settingsnav.php:118
 msgid "Updates by SMS"
 msgstr "Päivitykset SMS:llä"
 
-#: lib/settingsnav.php:123
 #, fuzzy
 msgid "Connections"
 msgstr "Yhdistä"
 
-#: lib/settingsnav.php:124
 msgid "Authorized connected applications"
 msgstr ""
 
-#: lib/silenceform.php:67
 #, fuzzy
 msgid "Silence"
 msgstr "Palvelun ilmoitus"
 
-#: lib/silenceform.php:78
 #, fuzzy
 msgid "Silence this user"
 msgstr "Estä tämä käyttäjä"
 
-#: lib/subgroupnav.php:89
 #, php-format
 msgid "People %s subscribes to"
 msgstr "Ihmiset joiden tilaaja %s on"
 
-#: lib/subgroupnav.php:97
 #, php-format
 msgid "People subscribed to %s"
 msgstr "Ihmiset jotka ovat käyttäjän %s tilaajia"
 
-#: lib/subgroupnav.php:105
 #, php-format
 msgid "Groups %s is a member of"
 msgstr "Ryhmät, joiden jäsen %s on"
 
-#: lib/subgroupnav.php:111
 msgid "Invite"
 msgstr "Kutsu"
 
-#: lib/subgroupnav.php:112
 #, php-format
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Kutsu kavereita ja työkavereita liittymään palveluun %s"
 
-#: lib/subscribeform.php:115 lib/subscribeform.php:139
 msgid "Subscribe to this user"
 msgstr "Tilaa tämä käyttäjä"
 
-#: lib/subscriberspeopleselftagcloudsection.php:48
-#: lib/subscriptionspeopleselftagcloudsection.php:48
 msgid "People Tagcloud as self-tagged"
 msgstr ""
 
-#: lib/subscriberspeopletagcloudsection.php:48
-#: lib/subscriptionspeopletagcloudsection.php:48
 msgid "People Tagcloud as tagged"
 msgstr ""
 
-#: lib/tagcloudsection.php:56
 msgid "None"
 msgstr "Ei mitään"
 
 #. TRANS: Server exception displayed if a theme name was invalid.
-#: lib/theme.php:74
 #, fuzzy
 msgid "Invalid theme name."
 msgstr "Koko ei kelpaa."
 
-#: lib/themeuploader.php:50
 msgid "This server cannot handle theme uploads without ZIP support."
 msgstr ""
 
-#: lib/themeuploader.php:58 lib/themeuploader.php:61
 msgid "The theme file is missing or the upload failed."
 msgstr ""
 
-#: lib/themeuploader.php:91 lib/themeuploader.php:102
-#: lib/themeuploader.php:279 lib/themeuploader.php:283
-#: lib/themeuploader.php:291 lib/themeuploader.php:298
 #, fuzzy
 msgid "Failed saving theme."
 msgstr "Profiilikuvan päivittäminen epäonnistui."
 
-#: lib/themeuploader.php:147
 msgid "Invalid theme: bad directory structure."
 msgstr ""
 
-#: lib/themeuploader.php:166
 #, php-format
 msgid "Uploaded theme is too large; must be less than %d byte uncompressed."
 msgid_plural ""
@@ -9580,158 +7929,128 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/themeuploader.php:179
 msgid "Invalid theme archive: missing file css/display.css"
 msgstr ""
 
-#: lib/themeuploader.php:219
 msgid ""
 "Theme contains invalid file or folder name. Stick with ASCII letters, "
 "digits, underscore, and minus sign."
 msgstr ""
 
-#: lib/themeuploader.php:225
 msgid "Theme contains unsafe file extension names; may be unsafe."
 msgstr ""
 
-#: lib/themeuploader.php:242
 #, php-format
 msgid "Theme contains file of type '.%s', which is not allowed."
 msgstr ""
 
-#: lib/themeuploader.php:260
 msgid "Error opening theme archive."
 msgstr "Tapahtui virhe, kun estoa poistettiin."
 
-#: lib/threadednoticelist.php:270
 #, php-format
-msgid "Show all %d comment"
-msgid_plural "Show all %d comments"
+msgid "Show %d reply"
+msgid_plural "Show all %d replies"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/topposterssection.php:74
 msgid "Top posters"
 msgstr "Eniten päivityksiä"
 
 #. TRANS: Title for the form to unblock a user.
-#: lib/unblockform.php:67
 #, fuzzy
 msgctxt "TITLE"
 msgid "Unblock"
 msgstr "Poista esto"
 
-#: lib/unsandboxform.php:69
 msgid "Unsandbox"
 msgstr ""
 
-#: lib/unsandboxform.php:80
 #, fuzzy
 msgid "Unsandbox this user"
 msgstr "Poista esto tältä käyttäjältä"
 
-#: lib/unsilenceform.php:67
 msgid "Unsilence"
 msgstr ""
 
-#: lib/unsilenceform.php:78
 #, fuzzy
 msgid "Unsilence this user"
 msgstr "Poista esto tältä käyttäjältä"
 
-#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
 msgid "Unsubscribe from this user"
 msgstr "Peruuta tämän käyttäjän tilaus"
 
-#: lib/unsubscribeform.php:137
 msgid "Unsubscribe"
 msgstr "Peruuta tilaus"
 
 #. 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).
-#: lib/usernoprofileexception.php:60
 #, fuzzy, php-format
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "Käyttäjällä ei ole profiilia."
 
-#: lib/userprofile.php:116
 #, fuzzy
 msgid "Edit Avatar"
 msgstr "Kuva"
 
 #. TRANS: H2 for user actions in a profile.
 #. TRANS: H2 for entity actions in a profile.
-#: lib/userprofile.php:216 lib/userprofile.php:232
 msgid "User actions"
 msgstr "Käyttäjän toiminnot"
 
 #. TRANS: Text shown in user profile of not yet compeltely deleted users.
-#: lib/userprofile.php:220
 msgid "User deletion in progress..."
 msgstr ""
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:248
 #, fuzzy
 msgid "Edit profile settings"
 msgstr "Profiiliasetukset"
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:250
 msgid "Edit"
 msgstr ""
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:274
 msgid "Send a direct message to this user"
 msgstr "Lähetä suora viesti tälle käyttäjälle"
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:276
 msgid "Message"
 msgstr "Viesti"
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:318
 msgid "Moderate"
 msgstr ""
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:357
 #, fuzzy
 msgid "User role"
 msgstr "Käyttäjän profiili"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:360
 #, fuzzy
 msgctxt "role"
 msgid "Administrator"
 msgstr "Ylläpitäjät"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:362
 msgctxt "role"
 msgid "Moderator"
 msgstr ""
 
-#: lib/util.php:321
 #, fuzzy
 msgid "Not allowed to log in."
 msgstr "Et ole kirjautunut sisään."
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1337
 msgid "a few seconds ago"
 msgstr "muutama sekunti sitten"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1340
 msgid "about a minute ago"
 msgstr "noin minuutti sitten"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1344
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
@@ -9739,12 +8058,10 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1347
 msgid "about an hour ago"
 msgstr "noin tunti sitten"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1351
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
@@ -9752,12 +8069,10 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1354
 msgid "about a day ago"
 msgstr "noin päivä sitten"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1358
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
@@ -9765,12 +8080,10 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1361
 msgid "about a month ago"
 msgstr "noin kuukausi sitten"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1365
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
@@ -9778,196 +8091,42 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1368
 msgid "about a year ago"
 msgstr "noin vuosi sitten"
 
 #. TRANS: Web color exception thrown when a hexadecimal color code does not validate.
 #. TRANS: %s is the provided (invalid) color code.
-#: lib/webcolor.php:81 lib/webcolor.php:121
 #, fuzzy, php-format
 msgid "%s is not a valid color! Use 3 or 6 hex characters."
 msgstr "Kotisivun verkko-osoite ei ole toimiva."
 
 #. TRANS: Exception.
-#: lib/xrd.php:63
 #, fuzzy
 msgid "Invalid XML."
 msgstr "Koko ei kelpaa."
 
 #. TRANS: Exception.
-#: lib/xrd.php:68
 msgid "Invalid XML, missing XRD root."
 msgstr ""
 
 #. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
-#: scripts/restoreuser.php:62
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
 
-#~ msgid "Could not generate feed for group - %s"
-#~ msgstr "Ryhmän %s syötettä ei voitu muodostaa."
+#~ msgid "Full name is too long (max 255 chars)."
+#~ msgstr "Koko nimi on liian pitkä (max 255 merkkiä)."
+
+#~ msgid "description is too long (max %d chars)."
+#~ msgstr "kuvaus on liian pitkä (max %d merkkiä)."
+
+#~ msgid "Location is too long (max 255 chars)."
+#~ msgstr "Kotipaikka on liian pitkä (enintään 255 merkkiä)."
+
+#~ msgid "Too many aliases! Maximum %d."
+#~ msgstr "Liikaa aliaksia. Maksimimäärä on %d."
 
 #, fuzzy
-#~ msgid "Current confirmed Jabber/Google Talk address."
-#~ msgstr "Tämän hetken vahvistettu Jabber/GTalk -osoite."
-
-#, fuzzy
-#~ msgid ""
-#~ "Jabber or Google Talk address, like \"UserName@example.org\". First, make "
-#~ "sure to add %s to your buddy list in your IM client or on Google Talk."
-#~ msgstr ""
-#~ "Jabber ja GTalk -osoite, esimerkiksi \"käyttäjätunnus@example.org\". "
-#~ "Varmista että olet lisännyt %s kaverilistaasi pikaviestiohjelmassasi tai "
-#~ "GTalkissa."
-
-#, fuzzy
-#~ msgid "Send me notices through Jabber/Google Talk."
-#~ msgstr "Lähetä minulle päivityksiä Jabberilla/GTalkilla."
-
-#, fuzzy
-#~ msgid "Publish a MicroID for my Jabber/Google Talk address."
-#~ msgstr "Julkaise MicroID Jabber/GTalk-osoitteelleni."
-
-#~ msgid "No Jabber ID."
-#~ msgstr "Ei Jabber ID -osoitetta"
-
-#, fuzzy
-#~ msgid "Not a valid Jabber ID."
-#~ msgstr "Tuo ei ole kelvollinen Jabber ID."
-
-#~ msgid "That is already your Jabber ID."
-#~ msgstr "Tämä on jo Jabber ID -tunnuksesi."
-
-#~ msgid "That is not your Jabber ID."
-#~ msgstr "Tämä ei ole Jabber ID-tunnuksesi."
-
-#~ msgid "Other settings"
-#~ msgstr "Profiilikuva-asetukset"
-
-#~ msgid "Tag cloud"
-#~ msgstr "Tagipilvi"
-
-#~ msgid "Jabber"
-#~ msgstr "Jabber"
-
-#~ msgid "Photo"
-#~ msgstr "Kuva"
-
-#~ msgid "Other options"
-#~ msgstr "Muita asetuksia"
-
-#~ msgid "Other"
-#~ msgstr "Muut"
-
-#~ msgid "Primary site navigation"
-#~ msgstr "Ensisijainen sivunavigointi"
-
-#, fuzzy
-#~ msgctxt "TOOLTIP"
-#~ msgid "Personal profile and friends timeline"
-#~ msgstr "Henkilökohtainen profiili ja kavereiden aikajana"
-
-#, fuzzy
-#~ msgctxt "MENU"
-#~ msgid "Personal"
-#~ msgstr "Omat"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Change your email, avatar, password, profile"
-#~ msgstr "Vaihda salasanasi"
-
-#~ msgid "Account"
-#~ msgstr "Käyttäjätili"
-
-#, fuzzy
-#~ msgctxt "TOOLTIP"
-#~ msgid "Connect to services"
-#~ msgstr "Ei voitu uudelleenohjata palvelimelle: %s"
-
-#~ msgid "Connect"
-#~ msgstr "Yhdistä"
-
-#, fuzzy
-#~ msgctxt "TOOLTIP"
-#~ msgid "Change site configuration"
-#~ msgstr "Ensisijainen sivunavigointi"
-
-#, fuzzy
-#~ msgctxt "TOOLTIP"
-#~ msgid "Invite friends and colleagues to join you on %s"
-#~ msgstr "Kutsu kavereita ja työkavereita liittymään palveluun %s"
-
-#, fuzzy
-#~ msgctxt "MENU"
-#~ msgid "Invite"
-#~ msgstr "Kutsu"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Create an account"
-#~ msgstr "Luo uusi ryhmä"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Help me!"
-#~ msgstr "Ohjeet"
-
-#~ msgctxt "MENU"
-#~ msgid "Help"
-#~ msgstr "Ohje"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Search for people or text"
-#~ msgstr "Hae lisää ryhmiä"
-
-#~ msgid "Local views"
-#~ msgstr "Paikalliset näkymät"
-
-#~ msgid "Page notice"
-#~ msgstr "Sivuilmoitus"
-
-#~ msgid "Secondary site navigation"
-#~ msgstr "Toissijainen sivunavigointi"
-
-#~ msgid "StatusNet software license"
-#~ msgstr "StatusNet-ohjelmiston lisenssi"
-
-#, fuzzy
-#~ msgid "Site content license"
-#~ msgstr "StatusNet-ohjelmiston lisenssi"
-
-#~ msgid "Pagination"
-#~ msgstr "Sivutus"
-
-#, fuzzy
-#~ msgid "Author"
-#~ msgstr "Atom"
-
-#~ msgid "Provider"
-#~ msgstr "Esikatselu"
-
-#, fuzzy
-#~ msgctxt "MENU"
-#~ msgid "SMS"
-#~ msgstr "SMS"
-
-#~ msgid "Filter tags"
-#~ msgstr "Suodata tagien perusteella"
-
-#~ msgid "Available characters"
-#~ msgstr "Sallitut merkit"
-
-#, fuzzy
-#~ msgctxt "MENU"
-#~ msgid "Profile"
-#~ msgstr "Profiili"
-
-#, fuzzy
-#~ msgid "Search help"
-#~ msgstr "Haku"
-
-#, fuzzy
-#~ msgid "Message too long. Maximum is %1$d character, you sent %2$d."
-#~ msgid_plural "Message too long. Maximum is %1$d characters, you sent %2$d."
-#~ msgstr[0] "Viesti oli liian pitkä - maksimikoko on 140 merkkiä, lähetit %d"
-#~ msgstr[1] "Viesti oli liian pitkä - maksimikoko on 140 merkkiä, lähetit %d"
+#~ msgctxt "BUTTON"
+#~ msgid "Comment"
+#~ msgstr "Sisältö"
diff --git a/locale/fr/LC_MESSAGES/statusnet.po b/locale/fr/LC_MESSAGES/statusnet.po
index ee3668c591..825c092aca 100644
--- a/locale/fr/LC_MESSAGES/statusnet.po
+++ b/locale/fr/LC_MESSAGES/statusnet.po
@@ -21,67 +21,57 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:23+0000\n"
-"PO-Revision-Date: 2011-03-03 17:25:59+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:19+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-POT-Import-Date: 2011-02-25 23:49:23+0000\n"
+"X-POT-Import-Date: 2011-03-03 17:59:19+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
-#: actions/accessadminpanel.php:53 lib/adminpanelaction.php:363
 msgid "Access"
 msgstr "Accès"
 
 #. TRANS: Page notice.
-#: actions/accessadminpanel.php:64
 msgid "Site access settings"
 msgstr "Paramètres d’accès au site"
 
 #. TRANS: Form legend for registration form.
-#: actions/accessadminpanel.php:151
 msgid "Registration"
 msgstr "Inscription"
 
 #. TRANS: Checkbox instructions for admin setting "Private".
-#: actions/accessadminpanel.php:155
 msgid "Prohibit anonymous users (not logged in) from viewing site?"
 msgstr "Interdire aux utilisateurs anonymes (non connectés) de voir le site ?"
 
 #. TRANS: Checkbox label for prohibiting anonymous users from viewing site.
-#: actions/accessadminpanel.php:157
 msgctxt "LABEL"
 msgid "Private"
 msgstr "Privé"
 
 #. TRANS: Checkbox instructions for admin setting "Invite only".
-#: actions/accessadminpanel.php:164
 msgid "Make registration invitation only."
 msgstr "Autoriser l’inscription sur invitation seulement."
 
 #. TRANS: Checkbox label for configuring site as invite only.
-#: actions/accessadminpanel.php:166
 msgid "Invite only"
 msgstr "Sur invitation uniquement"
 
 #. TRANS: Checkbox instructions for admin setting "Closed" (no new registrations).
-#: actions/accessadminpanel.php:173
 msgid "Disable new registrations."
 msgstr "Désactiver les nouvelles inscriptions."
 
 #. TRANS: Checkbox label for disabling new user registrations.
-#: actions/accessadminpanel.php:175
 msgid "Closed"
 msgstr "Fermé"
 
 #. TRANS: Title for button to save access settings in site admin panel.
-#: actions/accessadminpanel.php:191
 msgid "Save access settings"
 msgstr "Sauvegarder les paramètres d’accès"
 
@@ -89,6 +79,7 @@ msgstr "Sauvegarder les paramètres d’accès"
 #. TRANS: Button text for saving theme settings.
 #. TRANS: Button label to save e-mail preferences.
 #. TRANS: Button label to save IM preferences.
+#. TRANS: Button text in the license admin panel.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
 #. TRANS: Button text for saving site notice in admin panel.
@@ -98,21 +89,12 @@ msgstr "Sauvegarder les paramètres d’accès"
 #. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
 #. TRANS: Button text on profile design page to save settings.
-#: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
-#: actions/emailsettings.php:251 actions/imsettings.php:199
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:198
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:204
-#: actions/subscriptions.php:261 actions/urlsettings.php:152
-#: actions/useradminpanel.php:298 lib/applicationeditform.php:355
-#: lib/designform.php:320 lib/groupeditform.php:201
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Enregistrer"
 
 #. TRANS: Server error when page not found (404).
 #. TRANS: Server error when page not found (404)
-#: actions/all.php:68 actions/public.php:98 actions/replies.php:93
-#: actions/showfavorites.php:140 actions/tag.php:52
 msgid "No such page."
 msgstr "Page non trouvée."
 
@@ -131,6 +113,7 @@ msgstr "Page non trouvée."
 #. TRANS: Client error displayed when checking group membership for a non-existing user.
 #. TRANS: Client error displayed when trying to have a non-existing user join a group.
 #. TRANS: Client error displayed when trying to have a non-existing user leave a group.
+#. TRANS: Client error displayed when not providing a user or an invalid user.
 #. TRANS: Client error displayed when updating a status for a non-existing user.
 #. TRANS: Client error displayed when requesting a list of followers for a non-existing user.
 #. TRANS: Client error displayed when requesting most recent favourite notices by a user for a non-existing user.
@@ -143,6 +126,8 @@ msgstr "Page non trouvée."
 #. 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.
 #. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
@@ -150,33 +135,10 @@ msgstr "Page non trouvée."
 #. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when calling a profile action without specifying a user.
-#: actions/all.php:80 actions/allrss.php:69
-#: actions/apiaccountupdatedeliverydevice.php:110
-#: actions/apiaccountupdateprofile.php:103
-#: actions/apiaccountupdateprofilebackgroundimage.php:118
-#: actions/apiaccountupdateprofileimage.php:104 actions/apiatomservice.php:59
-#: actions/apiblockcreate.php:96 actions/apiblockdestroy.php:94
-#: actions/apidirectmessage.php:75 actions/apidirectmessagenew.php:72
-#: actions/apigroupcreate.php:111 actions/apigroupismember.php:89
-#: actions/apigroupjoin.php:98 actions/apigroupleave.php:98
-#: actions/apigrouplist.php:70 actions/apigroupprofileupdate.php:108
-#: actions/apistatusesupdate.php:230 actions/apisubscriptions.php:85
-#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:173
-#: actions/apitimelinehome.php:78 actions/apitimelinementions.php:77
-#: actions/apitimelineuser.php:79 actions/avatarbynickname.php:79
-#: actions/favoritesrss.php:72 actions/foaf.php:42 actions/foaf.php:61
-#: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116
-#: actions/otp.php:78 actions/remotesubscribe.php:144
-#: actions/remotesubscribe.php:153 actions/replies.php:73
-#: actions/repliesrss.php:38 actions/rsd.php:113 actions/showfavorites.php:106
-#: actions/userbyid.php:75 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/userxrd.php:59 actions/xrds.php:71 lib/command.php:509
-#: lib/galleryaction.php:59 lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Utilisateur non trouvé."
 
 #. TRANS: Page title. %1$s is user nickname, %2$d is page number
-#: actions/all.php:91
 #, php-format
 msgid "%1$s and friends, page %2$d"
 msgstr "%1$s et ses amis, page %2$d"
@@ -185,33 +147,26 @@ msgstr "%1$s et ses amis, page %2$d"
 #. TRANS: H1 text for page. %s is a user nickname.
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Timeline title for user and friends. %s is a user nickname.
-#: actions/all.php:94 actions/all.php:191 actions/allrss.php:117
-#: actions/apitimelinefriends.php:207 actions/apitimelinehome.php:113
-#: lib/personalgroupnav.php:100
 #, php-format
 msgid "%s and friends"
 msgstr "%s et ses amis"
 
 #. TRANS: %s is user nickname.
-#: actions/all.php:108
 #, php-format
 msgid "Feed for friends of %s (RSS 1.0)"
 msgstr "Flux pour les amis de %s (RSS 1.0)"
 
 #. TRANS: %s is user nickname.
-#: actions/all.php:117
 #, php-format
 msgid "Feed for friends of %s (RSS 2.0)"
 msgstr "Flux pour les amis de %s (RSS 2.0)"
 
 #. TRANS: %s is user nickname.
-#: actions/all.php:126
 #, php-format
 msgid "Feed for friends of %s (Atom)"
 msgstr "Flux pour les amis de %s (Atom)"
 
 #. TRANS: Empty list message. %s is a user nickname.
-#: actions/all.php:139
 #, php-format
 msgid ""
 "This is the timeline for %s and friends but no one has posted anything yet."
@@ -221,7 +176,6 @@ msgstr ""
 
 #. TRANS: Encouragement displayed on logged in user's empty timeline.
 #. TRANS: This message contains Markdown links. Keep "](" together.
-#: actions/all.php:146
 #, php-format
 msgid ""
 "Try subscribing to more people, [join a group](%%action.groups%%) or post "
@@ -232,7 +186,6 @@ msgstr ""
 
 #. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@".
 #. TRANS: This message contains Markdown links. Keep "](" together.
-#: actions/all.php:150
 #, php-format
 msgid ""
 "You can try to [nudge %1$s](../%2$s) from their profile or [post something "
@@ -246,7 +199,6 @@ msgstr ""
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
 #. TRANS: Second sentence of empty message for anonymous users. %s is a user nickname.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:221
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -256,14 +208,11 @@ msgstr ""
 "un clin d’œil à %s ou poster un avis à son intention."
 
 #. TRANS: H1 text for page when viewing a list for self.
-#: actions/all.php:188
 msgid "You and friends"
 msgstr "Vous et vos amis"
 
 #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
 #. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name.
-#: actions/allrss.php:122 actions/apitimelinefriends.php:213
-#: actions/apitimelinehome.php:119
 #, php-format
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr "Statuts de %1$s et ses amis dans %2$s!"
@@ -282,55 +231,20 @@ msgstr "Statuts de %1$s et ses amis dans %2$s!"
 #. TRANS: Client error displayed trying to execute an unknown API method checking group membership.
 #. TRANS: Client error displayed trying to execute an unknown API method listing the latest 20 groups.
 #. TRANS: Client error displayed trying to execute an unknown API method showing group membership.
+#. TRANS: Client error displayed when using an unsupported API format.
 #. TRANS: Client error displayed trying to execute an unknown API method showing a group.
 #. TRANS: Client error displayed trying to execute an unknown API method testing API connectivity.
 #. TRANS: Client error displayed trying to execute an unknown API method deleting a status.
 #. TRANS: Client error displayed when trying to handle an unknown API method.
-#: actions/apiaccountratelimitstatus.php:69
-#: actions/apiaccountupdatedeliverydevice.php:92
-#: actions/apiaccountupdateprofile.php:94
-#: actions/apiaccountupdateprofilebackgroundimage.php:92
-#: actions/apiaccountupdateprofilecolors.php:115
-#: actions/apiaccountverifycredentials.php:68 actions/apidirectmessage.php:157
-#: actions/apifavoritecreate.php:98 actions/apifavoritedestroy.php:98
-#: actions/apifriendshipscreate.php:99 actions/apifriendshipsdestroy.php:99
-#: actions/apifriendshipsshow.php:124 actions/apigroupcreate.php:138
-#: actions/apigroupismember.php:115 actions/apigroupjoin.php:151
-#: actions/apigroupleave.php:141 actions/apigrouplist.php:134
-#: actions/apigrouplistall.php:120 actions/apigroupmembership.php:105
-#: actions/apigroupprofileupdate.php:100 actions/apigroupprofileupdate.php:213
-#: actions/apigroupshow.php:114 actions/apihelptest.php:84
-#: actions/apistatusesdestroy.php:101 actions/apistatusesretweets.php:110
-#: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:139
-#: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
-#: actions/apitimelinefavorites.php:182 actions/apitimelinefriends.php:276
-#: actions/apitimelinegroup.php:148 actions/apitimelinehome.php:181
-#: actions/apitimelinementions.php:182 actions/apitimelinepublic.php:247
-#: actions/apitimelineretweetedtome.php:147
-#: actions/apitimelineretweetsofme.php:147 actions/apitimelinetag.php:165
-#: actions/apitimelineuser.php:217 actions/apiusershow.php:100
 msgid "API method not found."
 msgstr "Méthode API non trouvée !"
 
 #. 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.
-#: actions/apiaccountupdatedeliverydevice.php:83
-#: actions/apiaccountupdateprofile.php:85
-#: actions/apiaccountupdateprofilebackgroundimage.php:83
-#: actions/apiaccountupdateprofilecolors.php:106
-#: actions/apiaccountupdateprofileimage.php:80 actions/apiblockcreate.php:87
-#: actions/apiblockdestroy.php:85 actions/apidirectmessagenew.php:107
-#: actions/apifavoritecreate.php:88 actions/apifavoritedestroy.php:88
-#: actions/apifriendshipscreate.php:89 actions/apifriendshipsdestroy.php:89
-#: actions/apigroupcreate.php:102 actions/apigroupjoin.php:89
-#: actions/apigroupleave.php:89 actions/apigroupprofileupdate.php:92
-#: actions/apimediaupload.php:66 actions/apistatusesretweet.php:63
-#: actions/apistatusesupdate.php:194
 msgid "This method requires a POST."
 msgstr "Ce processus requiert un POST."
 
 #. TRANS: Client error displayed when no valid device parameter is provided for a user's delivery device setting.
-#: actions/apiaccountupdatedeliverydevice.php:103
 msgid ""
 "You must specify a parameter named 'device' with a value of one of: sms, im, "
 "none."
@@ -345,10 +259,6 @@ msgstr ""
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
-#: actions/apiaccountupdatedeliverydevice.php:136
-#: actions/emailsettings.php:353 actions/emailsettings.php:499
-#: actions/profilesettings.php:323 actions/smssettings.php:300
-#: actions/smssettings.php:453 actions/urlsettings.php:211
 msgid "Could not update user."
 msgstr "Impossible de mettre à jour l’utilisateur."
 
@@ -361,32 +271,17 @@ msgstr "Impossible de mettre à jour l’utilisateur."
 #. TRANS: Server error displayed when requesting Friends of a Friend feed for a user for which the profile could not be found.
 #. TRANS: Server error displayed when trying to get a user hCard for a user without a profile.
 #. TRANS: Server error displayed when calling a profile action while the specified user does not have a profile.
-#: actions/apiaccountupdateprofile.php:111
-#: actions/apiaccountupdateprofilebackgroundimage.php:199
-#: actions/apiaccountupdateprofilecolors.php:183
-#: actions/apiaccountupdateprofileimage.php:131
-#: actions/apiuserprofileimage.php:88 actions/apiusershow.php:108
-#: actions/avatarbynickname.php:85 actions/foaf.php:69 actions/hcard.php:75
-#: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
-#: lib/profileaction.php:85
 msgid "User has no profile."
 msgstr "Aucun profil ne correspond à cet utilisateur."
 
 #. TRANS: Server error displayed if a user profile could not be saved.
 #. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:419
 msgid "Could not save profile."
 msgstr "Impossible d’enregistrer le profil."
 
 #. TRANS: Client error displayed when the number of bytes in a POST request exceeds a limit.
 #. TRANS: %s is the number of bytes of the CONTENT_LENGTH.
 #. TRANS: Form validation error in design settings form. POST should remain untranslated.
-#: actions/apiaccountupdateprofilebackgroundimage.php:108
-#: actions/apiaccountupdateprofileimage.php:95 actions/apimediaupload.php:81
-#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
-#: actions/designadminpanel.php:120 actions/editapplication.php:121
-#: actions/newapplication.php:102 actions/newnotice.php:95
-#: lib/designsettings.php:110
 #, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s byte) due to its "
@@ -406,26 +301,15 @@ msgstr[1] ""
 #. TRANS: Client error displayed when a database error occurs inserting profile colours.
 #. TRANS: Client error displayed when a database error occurs updating profile colours.
 #. TRANS: Form validation error displayed when group design settings could not be saved because of an application issue.
-#: actions/apiaccountupdateprofilebackgroundimage.php:138
-#: actions/apiaccountupdateprofilebackgroundimage.php:149
-#: actions/apiaccountupdateprofilecolors.php:160
-#: actions/apiaccountupdateprofilecolors.php:171
-#: actions/groupdesignsettings.php:285 actions/groupdesignsettings.php:296
-#: actions/userdesignsettings.php:218 actions/userdesignsettings.php:228
-#: actions/userdesignsettings.php:270 actions/userdesignsettings.php:280
 msgid "Unable to save your design settings."
 msgstr "Impossible de sauvegarder les parmètres de la conception."
 
 #. TRANS: Error displayed when updating design settings fails.
 #. TRANS: Client error displayed when a database error occurs updating profile colours.
-#: actions/apiaccountupdateprofilebackgroundimage.php:191
-#: actions/apiaccountupdateprofilecolors.php:139
-#: actions/userdesignsettings.php:196
 msgid "Could not update your design."
 msgstr "Impossible de mettre à jour votre conception."
 
 #. TRANS: Title for Atom feed.
-#: actions/apiatomservice.php:85
 msgctxt "ATOM"
 msgid "Main"
 msgstr "Principal"
@@ -434,9 +318,6 @@ msgstr "Principal"
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Title in atom group notice feed. %s is a group name.
 #. TRANS: Title in atom user notice feed. %s is a user name.
-#: actions/apiatomservice.php:93 actions/grouprss.php:138
-#: actions/userrss.php:94 lib/atomgroupnoticefeed.php:63
-#: lib/atomusernoticefeed.php:88
 #, php-format
 msgid "%s timeline"
 msgstr "Activité de %s"
@@ -446,8 +327,6 @@ msgstr "Activité de %s"
 #. TRANS: %s is a user nickname.
 #. TRANS: Header for subscriptions overview for a user (first page).
 #. TRANS: %s is a user nickname.
-#: actions/apiatomservice.php:104 actions/atompubsubscriptionfeed.php:148
-#: actions/subscriptions.php:51
 #, php-format
 msgid "%s subscriptions"
 msgstr "Abonnements de %s"
@@ -455,58 +334,48 @@ msgstr "Abonnements de %s"
 #. TRANS: Title for Atom feed with a user's favorite notices. %s is a user nickname.
 #. TRANS: Title for Atom favorites feed.
 #. TRANS: %s is a user nickname.
-#: actions/apiatomservice.php:115 actions/atompubfavoritefeed.php:142
 #, php-format
 msgid "%s favorites"
 msgstr "Favoris de %s"
 
 #. TRANS: Title for Atom feed with a user's memberships. %s is a user nickname.
-#: actions/apiatomservice.php:126
 #, fuzzy, php-format
 msgid "%s memberships"
 msgstr "Membres du groupe %s"
 
 #. TRANS: Client error displayed when users try to block themselves.
-#: actions/apiblockcreate.php:105
 msgid "You cannot block yourself!"
 msgstr "Vous ne pouvez pas vous bloquer vous-même !"
 
 #. TRANS: Server error displayed when blocking a user has failed.
-#: actions/apiblockcreate.php:127
 msgid "Block user failed."
 msgstr "Le blocage de l’utilisateur a échoué."
 
 #. TRANS: Server error displayed when unblocking a user has failed.
-#: actions/apiblockdestroy.php:113
 msgid "Unblock user failed."
 msgstr "Le déblocage de l’utilisateur a échoué."
 
 #. TRANS: Title. %s is a user nickname.
-#: actions/apidirectmessage.php:88
 #, php-format
 msgid "Direct messages from %s"
 msgstr "Messages direct depuis %s"
 
 #. TRANS: Subtitle. %s is a user nickname.
-#: actions/apidirectmessage.php:93
 #, php-format
 msgid "All the direct messages sent from %s"
 msgstr "Tous les messages directs envoyés par %s"
 
 #. TRANS: Title. %s is a user nickname.
-#: actions/apidirectmessage.php:102
 #, php-format
 msgid "Direct messages to %s"
 msgstr "Messages directs envoyés à %s"
 
 #. TRANS: Subtitle. %s is a user nickname.
-#: actions/apidirectmessage.php:107
 #, php-format
 msgid "All the direct messages sent to %s"
 msgstr "Tous les messages directs envoyés à %s"
 
 #. TRANS: Client error displayed when no message text was submitted (406).
-#: actions/apidirectmessagenew.php:117
 msgid "No message text!"
 msgstr "Message sans texte !"
 
@@ -514,7 +383,6 @@ msgstr "Message sans texte !"
 #. TRANS: %d is the maximum number of characters for a message.
 #. TRANS: Form validation error displayed when message content is too long.
 #. TRANS: %d is the maximum number of characters for a message.
-#: actions/apidirectmessagenew.php:127 actions/newmessage.php:152
 #, php-format
 msgid "That's too long. Maximum message size is %d character."
 msgid_plural "That's too long. Maximum message size is %d characters."
@@ -522,12 +390,10 @@ msgstr[0] "C’est trop long ! La taille du message est limitée à %d caractèr
 msgstr[1] "C’est trop long ! La taille du message est limitée à %d caractères"
 
 #. TRANS: Client error displayed if a recipient user could not be found (403).
-#: actions/apidirectmessagenew.php:139
 msgid "Recipient user not found."
 msgstr "Destinataire non trouvé."
 
 #. TRANS: Client error displayed trying to direct message another user who's not a friend (403).
-#: actions/apidirectmessagenew.php:144
 #, fuzzy
 msgid "Cannot send direct messages to users who aren't your friend."
 msgstr ""
@@ -535,7 +401,6 @@ msgstr ""
 "comme amis."
 
 #. TRANS: Client error displayed trying to direct message self (403).
-#: actions/apidirectmessagenew.php:154
 msgid ""
 "Do not send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
@@ -545,116 +410,96 @@ 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.
 #. TRANS: Client error displayed trying to delete a status with an invalid ID.
-#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:108
-#: actions/apistatusesdestroy.php:121
 msgid "No status found with that ID."
 msgstr "Aucun statut trouvé avec cet identifiant. "
 
 #. TRANS: Client error displayed when trying to mark a notice favourite that already is a favourite.
-#: actions/apifavoritecreate.php:120
 msgid "This status is already a favorite."
 msgstr "Cet avis est déjà un favori."
 
 #. TRANS: Client error displayed when marking a notice as favourite fails.
 #. TRANS: Server error displayed when trying to mark a notice as favorite fails in the database.
 #. TRANS: Error message text shown when a favorite could not be set.
-#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:306
 msgid "Could not create favorite."
 msgstr "Impossible de créer le favori."
 
 #. TRANS: Client error displayed when trying to remove a favourite that was not a favourite.
-#: actions/apifavoritedestroy.php:122
 msgid "That status is not a favorite."
 msgstr "Cet avis n’est pas un favori."
 
 #. TRANS: Client error displayed when removing a favourite has failed.
 #. TRANS: Server error displayed when removing a favorite from the database fails.
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:90
 msgid "Could not delete favorite."
 msgstr "Impossible de supprimer le favori."
 
 #. TRANS: Client error displayed when trying follow who's profile could not be found.
-#: actions/apifriendshipscreate.php:109
 msgid "Could not follow user: profile not found."
 msgstr "Impossible de suivre l’utilisateur : profil non trouvé."
 
 #. TRANS: Client error displayed when trying to follow a user that's already being followed.
 #. TRANS: %s is the nickname of the user that is already being followed.
-#: actions/apifriendshipscreate.php:120
 #, php-format
 msgid "Could not follow user: %s is already on your list."
 msgstr "Impossible de suivre l’utilisateur : %s est déjà dans votre liste."
 
 #. TRANS: Client error displayed when trying to unfollow a user that cannot be found.
-#: actions/apifriendshipsdestroy.php:109
 msgid "Could not unfollow user: User not found."
 msgstr "Impossible de ne plus suivre l’utilisateur : utilisateur non trouvé."
 
 #. TRANS: Client error displayed when trying to unfollow self.
-#: actions/apifriendshipsdestroy.php:121
 msgid "You cannot unfollow yourself."
 msgstr "Vous ne pouvez pas ne plus vous suivre vous-même."
 
 #. TRANS: Client error displayed when supplying invalid parameters to an API call checking if a friendship exists.
-#: actions/apifriendshipsexists.php:88
 msgid "Two valid IDs or nick names must be supplied."
 msgstr "Vous devez fournir deux identifiants ou pseudonymes valides."
 
 #. TRANS: Client error displayed when a source user could not be determined showing friendship.
-#: actions/apifriendshipsshow.php:131
 msgid "Could not determine source user."
 msgstr "Impossible de déterminer l’utilisateur source."
 
 #. TRANS: Client error displayed when a target user could not be determined showing friendship.
-#: actions/apifriendshipsshow.php:140
 msgid "Could not find target user."
 msgstr "Impossible de trouver l’utilisateur cible."
 
 #. TRANS: Client error trying to create a group with a nickname this is already in use.
+#. TRANS: API validation exception thrown when nickname is already used.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:156 actions/apigroupprofileupdate.php:255
-#: actions/editgroup.php:191 actions/newgroup.php:137
-#: actions/profilesettings.php:274 actions/register.php:199
 msgid "Nickname already in use. Try another one."
 msgstr "Pseudo déjà utilisé. Essayez-en un autre."
 
 #. TRANS: Client error in form for group creation.
+#. TRANS: API validation exception thrown when nickname does not validate.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:164 actions/apigroupprofileupdate.php:259
-#: actions/editgroup.php:195 actions/newgroup.php:141
-#: actions/profilesettings.php:244 actions/register.php:201
 msgid "Not a valid nickname."
 msgstr "Pseudo invalide."
 
 #. TRANS: Client error in form for group creation.
+#. TRANS: API validation exception thrown when homepage URL does not validate.
 #. TRANS: Validation error shown when providing an invalid homepage URL in the "Edit application" form.
 #. TRANS: Group edit form validation error.
 #. TRANS: Validation error shown when providing an invalid homepage URL in the "New application" form.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:181 actions/apigroupprofileupdate.php:277
-#: actions/editapplication.php:235 actions/editgroup.php:202
-#: actions/newapplication.php:221 actions/newgroup.php:148
-#: actions/profilesettings.php:249 actions/register.php:208
 msgid "Homepage is not a valid URL."
 msgstr "L’adresse du site personnel n’est pas un URL valide. "
 
 #. TRANS: Client error in form for group creation.
+#. TRANS: API validation exception thrown when full name does not validate.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:191 actions/editgroup.php:206
-#: actions/newgroup.php:152 actions/profilesettings.php:253
-#: actions/register.php:211
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "Le nom complet est trop long (limité à 255 caractères maximum)."
 
 #. TRANS: Client error shown when providing too long a description during group creation.
 #. TRANS: %d is the maximum number of allowed characters.
+#. TRANS: API validation exception thrown when description does not validate.
+#. TRANS: %d is the maximum description length and used for plural.
 #. TRANS: Validation error shown when providing too long a description in the "Edit application" form.
 #. TRANS: %d is the maximum number of allowed characters.
 #. TRANS: Group edit form validation error.
@@ -662,9 +507,6 @@ msgstr "Le nom complet est trop long (limité à 255 caractères maximum)."
 #. TRANS: %d is the maximum number of characters for the description.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed characters.
-#: actions/apigroupcreate.php:201 actions/editapplication.php:202
-#: actions/editgroup.php:211 actions/newapplication.php:182
-#: actions/newgroup.php:157
 #, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."
@@ -672,23 +514,21 @@ msgstr[0] "La description est trop longue (limitée à %d caractère maximum)."
 msgstr[1] "La description est trop longue (limitée à %d caractères maximum)."
 
 #. TRANS: Client error shown when providing too long a location during group creation.
+#. TRANS: API validation exception thrown when location does not validate.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:215 actions/editgroup.php:218
-#: actions/newgroup.php:164 actions/profilesettings.php:266
-#: actions/register.php:220
 msgid "Location is too long (maximum 255 characters)."
 msgstr "L’emplacement est trop long (limité à 255 caractères maximum)."
 
 #. TRANS: Client error shown when providing too many aliases during group creation.
 #. TRANS: %d is the maximum number of allowed aliases.
+#. TRANS: API validation exception thrown when aliases do not validate.
+#. TRANS: %d is the maximum number of aliases and used for plural.
 #. TRANS: Group edit form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.
-#: actions/apigroupcreate.php:236 actions/editgroup.php:231
-#: actions/newgroup.php:177
 #, php-format
 msgid "Too many aliases! Maximum %d allowed."
 msgid_plural "Too many aliases! Maximum %d allowed."
@@ -697,25 +537,24 @@ msgstr[1] "Trop d’alias ! Un maximum de %d est autorisé."
 
 #. TRANS: Client error shown when providing an invalid alias during group creation.
 #. TRANS: %s is the invalid alias.
-#: actions/apigroupcreate.php:253
+#. TRANS: API validation exception thrown when aliases does not validate.
+#. TRANS: %s is the invalid alias.
 #, php-format
 msgid "Invalid alias: \"%s\"."
 msgstr "Alias invalide : « %s »."
 
 #. TRANS: Client error displayed when trying to use an alias during group creation that is already in use.
 #. TRANS: %s is the alias that is already in use.
+#. TRANS: API validation exception thrown when aliases is already used.
+#. TRANS: %s is the already used alias.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error. %s is the already used alias.
-#: actions/apigroupcreate.php:264 actions/apigroupprofileupdate.php:351
-#: actions/editgroup.php:246 actions/newgroup.php:193
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "Alias « %s » déjà utilisé. Essayez-en un autre."
 
 #. TRANS: Client error displayed when trying to use an alias during group creation that is the same as the group's nickname.
 #. TRANS: Group edit form validation error.
-#: actions/apigroupcreate.php:278 actions/apigroupprofileupdate.php:359
-#: actions/editgroup.php:253
 msgid "Alias can't be the same as nickname."
 msgstr "L’alias ne peut pas être le même que le pseudo."
 
@@ -723,26 +562,21 @@ msgstr "L’alias ne peut pas être le même que le pseudo."
 #. TRANS: Client error displayed when trying to join a group that does not exist.
 #. TRANS: Client error displayed when trying to leave a group that does not exist.
 #. TRANS: Client error displayed trying to show group membership on a non-existing group.
+#. TRANS: Client error displayed when not providing a group or an invalid group.
 #. TRANS: Client error displayed when trying to show a group that could not be found.
 #. TRANS: Client error displayed requesting most recent notices to a group for a non-existing group.
-#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
-#: actions/apigroupleave.php:104 actions/apigroupmembership.php:71
-#: actions/apigroupprofileupdate.php:113 actions/apigroupshow.php:81
-#: actions/apitimelinegroup.php:89
 msgid "Group not found."
 msgstr "Groupe non trouvé."
 
 #. TRANS: Server error displayed when trying to join a group the user is already a member of.
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:345
 msgid "You are already a member of that group."
 msgstr "Vous êtes déjà membre de ce groupe."
 
 #. TRANS: Server error displayed when trying to join a group the user is blocked from joining.
 #. 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.
-#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:350
 msgid "You have been blocked from that group by the admin."
 msgstr "Vous avez été bloqué de ce groupe par l’administrateur."
 
@@ -750,13 +584,11 @@ msgstr "Vous avez été bloqué de ce groupe par l’administrateur."
 #. TRANS: %1$s is the joining user's nickname, $2$s is the group nickname for which the join failed.
 #. TRANS: Message given having failed to add a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:136 actions/joingroup.php:139 lib/command.php:362
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "Impossible d’inscrire l’utilisateur %1$s au groupe %2$s."
 
 #. TRANS: Server error displayed when trying to leave a group the user is not a member of.
-#: actions/apigroupleave.php:115
 msgid "You are not a member of this group."
 msgstr "Vous n’êtes pas membre de ce groupe."
 
@@ -764,116 +596,79 @@ msgstr "Vous n’êtes pas membre de ce groupe."
 #. TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
 #. TRANS: Message given having failed to remove a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupleave.php:127 actions/leavegroup.php:133
-#: lib/command.php:410
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
 msgstr "Impossible de retirer l’utilisateur %1$s du groupe %2$s."
 
 #. TRANS: Used as title in check for group membership. %s is a user name.
-#: actions/apigrouplist.php:94
 #, php-format
 msgid "%s's groups"
 msgstr "Groupes de %s"
 
 #. TRANS: Used as subtitle in check for group membership. %1$s is a user name, %2$s is the site name.
-#: actions/apigrouplist.php:104
 #, php-format
 msgid "%1$s groups %2$s is a member of."
 msgstr "Groupes de %1$s dont %2$s est membre."
 
 #. TRANS: Message is used as a title when listing the lastest 20 groups. %s is a site name.
 #. TRANS: Message is used as a page title. %s is a nick name.
-#: actions/apigrouplistall.php:88 actions/usergroups.php:63
 #, php-format
 msgid "%s groups"
 msgstr "Groupes de %s"
 
 #. TRANS: Message is used as a subtitle when listing the lastest 20 groups. %s is a site name.
-#: actions/apigrouplistall.php:93
 #, php-format
 msgid "groups on %s"
 msgstr "groupes sur %s"
 
+#. TRANS: Client error displayed when trying to edit a group without being an admin.
 #. TRANS: Client error displayed trying to edit a group while not being a group admin.
 #. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
 #. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
-#: actions/apigroupprofileupdate.php:118 actions/editgroup.php:110
-#: actions/editgroup.php:176 actions/groupdesignsettings.php:109
-#: actions/grouplogo.php:111
 msgid "You must be an admin to edit the group."
 msgstr "Vous devez être administrateur pour modifier le groupe."
 
+#. TRANS: Server error displayed when group update fails.
 #. TRANS: Server error displayed when editing a group fails.
-#: actions/apigroupprofileupdate.php:171 actions/editgroup.php:274
 msgid "Could not update group."
 msgstr "Impossible de mettre à jour le groupe."
 
+#. TRANS: Server error displayed when adding group aliases fails.
 #. TRANS: Server error displayed when group aliases could not be added.
 #. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/apigroupprofileupdate.php:194 actions/editgroup.php:281
-#: classes/User_group.php:540
 msgid "Could not create aliases."
 msgstr "Impossible de créer les alias."
 
+#. TRANS: API validation exception thrown when nickname does not validate.
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: actions/apigroupprofileupdate.php:249 lib/nickname.php:165
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr ""
 "Les pseudos ne peuvent contenir que des caractères minuscules et des "
 "chiffres, sans espaces."
 
-#: actions/apigroupprofileupdate.php:286
-#, fuzzy
-msgid "Full name is too long (max 255 chars)."
-msgstr "Le nom complet est trop long (limité à 255 caractères maximum)."
-
-#: actions/apigroupprofileupdate.php:296
-#, fuzzy, php-format
-msgid "description is too long (max %d chars)."
-msgstr "La description est trop longue (limitée à %d caractère maximum)."
-
-#: actions/apigroupprofileupdate.php:307
-#, fuzzy
-msgid "Location is too long (max 255 chars)."
-msgstr "L’emplacement est trop long (limité à 255 caractères maximum)."
-
-#: actions/apigroupprofileupdate.php:326
-#, fuzzy, php-format
-msgid "Too many aliases! Maximum %d."
-msgstr "Trop d’alias ! Un maximum de %d est autorisé."
-
-#. TRANS: Group edit form validation error.
+#. TRANS: API validation exception thrown when alias is the same as nickname.
 #. TRANS: Group create form validation error.
-#. TRANS: %s is the invalid alias.
-#: actions/apigroupprofileupdate.php:342 actions/editgroup.php:241
-#: actions/newgroup.php:188
-#, php-format
-msgid "Invalid alias: \"%s\""
-msgstr "Alias invalide : « %s »"
+#, fuzzy
+msgid "Alias cannot be the same as nickname."
+msgstr "L’alias ne peut pas être le même que le pseudo."
 
 #. TRANS: Client error displayed when uploading a media file has failed.
-#: actions/apimediaupload.php:101
 msgid "Upload failed."
 msgstr "Échec du téléversement."
 
 #. TRANS: Client error given from the OAuth API when the request token or verifier is invalid.
-#: actions/apioauthaccesstoken.php:102
 msgid "Invalid request token or verifier."
 msgstr "Jeton de requête ou de vérification invalide."
 
 #. TRANS: Client error given when no oauth_token was passed to the OAuth API.
-#: actions/apioauthauthorize.php:107
 msgid "No oauth_token parameter provided."
 msgstr "Paramètre oauth_token non fourni."
 
 #. TRANS: Client error given when an invalid request token was passed to the OAuth API.
-#: actions/apioauthauthorize.php:115 actions/apioauthauthorize.php:129
 msgid "Invalid request token."
 msgstr "Jeton de requête incorrect."
 
 #. TRANS: Client error given when an invalid request token was passed to the OAuth API.
-#: actions/apioauthauthorize.php:121
 msgid "Request token already authorized."
 msgstr "Le jeton de requête a déjà été autorisé."
 
@@ -883,33 +678,16 @@ msgstr "Le jeton de requête a déjà été autorisé."
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
 #. TRANS: Client error displayed when the session token is not okay.
-#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:75
-#: actions/emailsettings.php:292 actions/favor.php:75 actions/geocode.php:55
-#: actions/groupblock.php:65 actions/grouplogo.php:321
-#: actions/groupunblock.php:65 actions/imsettings.php:241
-#: actions/invite.php:60 actions/makeadmin.php:66 actions/newmessage.php:135
-#: actions/newnotice.php:105 actions/nudge.php:80
-#: actions/oauthappssettings.php:162 actions/oauthconnectionssettings.php:135
-#: actions/passwordsettings.php:137 actions/pluginenable.php:87
-#: actions/profilesettings.php:218 actions/recoverpassword.php:383
-#: actions/register.php:157 actions/remotesubscribe.php:76
-#: actions/repeat.php:82 actions/smssettings.php:249 actions/subedit.php:40
-#: actions/subscribe.php:87 actions/tagother.php:145
-#: actions/unsubscribe.php:69 actions/urlsettings.php:171
-#: actions/userauthorization.php:53 lib/designsettings.php:122
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 "Un problème est survenu avec votre jeton de session. Veuillez essayer à "
 "nouveau."
 
 #. TRANS: Form validation error given when an invalid username and/or password was passed to the OAuth API.
-#: actions/apioauthauthorize.php:168
 msgid "Invalid nickname / password!"
 msgstr "Pseudo ou mot de passe incorrect !"
 
 #. TRANS: Server error displayed when a database action fails.
-#: actions/apioauthauthorize.php:217
 msgid "Database error inserting oauth_token_association."
 msgstr ""
 "Erreur de base de donnée lors de l’insertion du jeton d’association de "
@@ -927,29 +705,20 @@ msgstr ""
 #. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
 #. TRANS: Message given submitting a form with an unknown action in SMS settings.
 #. TRANS: Unknown form validation error in design settings form.
-#: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
-#: actions/designadminpanel.php:100 actions/editapplication.php:144
-#: actions/emailsettings.php:311 actions/grouplogo.php:332
-#: actions/imsettings.php:256 actions/newapplication.php:124
-#: actions/oauthconnectionssettings.php:144 actions/recoverpassword.php:46
-#: actions/smssettings.php:270 lib/designsettings.php:133
 msgid "Unexpected form submission."
 msgstr "Soumission de formulaire inattendue."
 
 #. TRANS: Title for a page where a user can confirm/deny account access by an external application.
-#: actions/apioauthauthorize.php:387
 msgid "An application would like to connect to your account"
 msgstr ""
 "Une application vous demande l’autorisation de se connecter à votre compte"
 
 #. TRANS: Fieldset legend.
-#: actions/apioauthauthorize.php:404
 msgid "Allow or deny access"
 msgstr "Autoriser ou refuser l’accès"
 
 #. TRANS: User notification of external application requesting account access.
 #. TRANS: %3$s is the access type requested (read-write or read-only), %4$s is the StatusNet sitename.
-#: actions/apioauthauthorize.php:425
 #, php-format
 msgid ""
 "An application would like the ability to <strong>%3$s</strong> your %4$s "
@@ -963,7 +732,6 @@ msgstr ""
 #. TRANS: User notification of external application requesting account access.
 #. TRANS: %1$s is the application name requesting access, %2$s is the organisation behind the application,
 #. TRANS: %3$s is the access type requested, %4$s is the StatusNet sitename.
-#: actions/apioauthauthorize.php:433
 #, php-format
 msgid ""
 "The application <strong>%1$s</strong> by <strong>%2$s</strong> would like "
@@ -976,22 +744,18 @@ msgstr ""
 "confiance."
 
 #. TRANS: Fieldset legend.
-#: actions/apioauthauthorize.php:455
 msgctxt "LEGEND"
 msgid "Account"
 msgstr "Compte"
 
 #. TRANS: Field label on OAuth API authorisation form.
+#. TRANS: Field label on login page.
 #. TRANS: Field label in form for profile settings.
-#: actions/apioauthauthorize.php:459 actions/login.php:225
-#: actions/profilesettings.php:107 actions/register.php:411
-#: actions/userauthorization.php:145 lib/groupeditform.php:145
 msgid "Nickname"
 msgstr "Pseudo"
 
 #. TRANS: Field label on OAuth API authorisation form.
-#: actions/apioauthauthorize.php:463 actions/login.php:228
-#: actions/register.php:415 lib/settingsnav.php:87
+#. TRANS: Field label on login page.
 msgid "Password"
 msgstr "Mot de passe"
 
@@ -1001,43 +765,34 @@ msgstr "Mot de passe"
 #. TRANS: Button label to cancel an IM address confirmation procedure.
 #. TRANS: Button label to cancel a SMS address confirmation procedure.
 #. TRANS: Button label in the "Edit application" form.
-#: actions/apioauthauthorize.php:478 actions/emailsettings.php:125
-#: actions/imsettings.php:136 actions/smssettings.php:132
-#: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Cancel"
 msgstr "Annuler"
 
 #. TRANS: Button text that when clicked will allow access to an account by an external application.
-#: actions/apioauthauthorize.php:485
 msgctxt "BUTTON"
 msgid "Allow"
 msgstr "Autoriser"
 
 #. TRANS: Form instructions.
-#: actions/apioauthauthorize.php:502
 msgid "Authorize access to your account information."
 msgstr "Autoriser l’accès aux informations de votre compte."
 
 #. TRANS: Header for user notification after revoking OAuth access to an application.
-#: actions/apioauthauthorize.php:594
 msgid "Authorization canceled."
 msgstr "Autorisation annulée."
 
 #. TRANS: User notification after revoking OAuth access to an application.
 #. TRANS: %s is an OAuth token.
-#: actions/apioauthauthorize.php:598
 #, php-format
 msgid "The request token %s has been revoked."
 msgstr "Le jeton de requête %s a été révoqué."
 
 #. TRANS: Title of the page notifying the user that an anonymous client application was successfully authorized to access the user's account with OAuth.
-#: actions/apioauthauthorize.php:621
 msgid "You have successfully authorized the application"
 msgstr "Vous avez autorisé avec succès l’application"
 
 #. TRANS: Message notifying the user that an anonymous client application was successfully authorized to access the user's account with OAuth.
-#: actions/apioauthauthorize.php:625
 msgid ""
 "Please return to the application and enter the following security code to "
 "complete the process."
@@ -1047,14 +802,12 @@ msgstr ""
 
 #. TRANS: Title of the page notifying the user that the client application was successfully authorized to access the user's account with OAuth.
 #. TRANS: %s is the authorised application name.
-#: actions/apioauthauthorize.php:632
 #, php-format
 msgid "You have successfully authorized %s"
 msgstr "Vous avez autorisé avec succès l’application « %s »"
 
 #. TRANS: Message notifying the user that the client application was successfully authorized to access the user's account with OAuth.
 #. TRANS: %s is the authorised application name.
-#: actions/apioauthauthorize.php:639
 #, php-format
 msgid ""
 "Please return to %s and enter the following security code to complete the "
@@ -1065,12 +818,10 @@ msgstr ""
 
 #. TRANS: Client error displayed trying to delete a status not using POST or DELETE.
 #. TRANS: POST and DELETE should not be translated.
-#: actions/apistatusesdestroy.php:111
 msgid "This method requires a POST or DELETE."
 msgstr "Ce processus requiert un POST ou un DELETE."
 
 #. TRANS: Client error displayed trying to delete a status of another user.
-#: actions/apistatusesdestroy.php:136
 msgid "You may not delete another user's status."
 msgstr "Vous ne pouvez pas supprimer le statut d’un autre utilisateur."
 
@@ -1078,21 +829,16 @@ msgstr "Vous ne pouvez pas supprimer le statut d’un autre utilisateur."
 #. TRANS: Client error displayed trying to display redents of a non-exiting notice.
 #. TRANS: Client exception thrown when referencing a non-existing notice.
 #. TRANS: Error message displayed trying to delete a non-existing notice.
-#: actions/apistatusesretweet.php:74 actions/apistatusesretweets.php:70
-#: actions/atompubshowfavorite.php:82 actions/deletenotice.php:61
-#: actions/shownotice.php:92
 msgid "No such notice."
 msgstr "Avis non trouvé."
 
 #. TRANS: Client error displayed trying to repeat an own notice through the API.
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:549
 msgid "Cannot repeat your own notice."
 msgstr "Vous ne pouvez pas reprendre votre propre avis."
 
 #. TRANS: Client error displayed trying to re-repeat a notice through the API.
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:92 lib/command.php:555
 msgid "Already repeated that notice."
 msgstr "Vous avez déjà repris cet avis."
 
@@ -1102,57 +848,43 @@ msgstr "Vous avez déjà repris cet avis."
 #. TRANS: Client exception thrown when using an unsupported HTTP method.
 #. TRANS: Client error shown when using a non-supported HTTP method.
 #. TRANS: Client exception thrown when using an unsupported HTTP method.
-#: actions/apistatusesshow.php:118 actions/atompubfavoritefeed.php:103
-#: actions/atompubmembershipfeed.php:105 actions/atompubshowfavorite.php:117
-#: actions/atompubshowmembership.php:116
-#: actions/atompubshowsubscription.php:122
-#: actions/atompubsubscriptionfeed.php:109
 msgid "HTTP method not supported."
 msgstr "Méthode HTTP non trouvée !"
 
 #. TRANS: Exception thrown requesting an unsupported notice output format.
 #. TRANS: %s is the requested output format.
-#: actions/apistatusesshow.php:144
 #, fuzzy, php-format
 msgid "Unsupported format: %s."
 msgstr "Format non supporté : %s"
 
 #. TRANS: Client error displayed requesting a deleted status.
-#: actions/apistatusesshow.php:155
 msgid "Status deleted."
 msgstr "Statut supprimé."
 
 #. TRANS: Client error displayed requesting a status with an invalid ID.
-#: actions/apistatusesshow.php:162
 msgid "No status with that ID found."
 msgstr "Aucun statut trouvé avec cet identifiant."
 
 #. TRANS: Client error displayed when trying to delete a notice not using the Atom format.
-#: actions/apistatusesshow.php:227
 msgid "Can only delete using the Atom format."
 msgstr "Vous ne pouvez supprimer qu’en utilisant le format Atom."
 
 #. TRANS: Client error displayed when a user has no rights to delete notices of other users.
 #. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
-#: actions/apistatusesshow.php:235 actions/deletenotice.php:78
 msgid "Cannot delete this notice."
 msgstr "Impossible de supprimer cet avis."
 
 #. TRANS: Confirmation of notice deletion in API. %d is the ID (number) of the deleted notice.
-#: actions/apistatusesshow.php:249
 #, php-format
 msgid "Deleted notice %d"
 msgstr "A supprimé l’avis %d"
 
 #. TRANS: Client error displayed when the parameter "status" is missing.
-#: actions/apistatusesupdate.php:221
 msgid "Client must provide a 'status' parameter with a value."
 msgstr "Le client doit fournir un paramètre « statut » avec une valeur."
 
 #. TRANS: Client error displayed when the parameter "status" is missing.
 #. TRANS: %d is the maximum number of character for a notice.
-#: actions/apistatusesupdate.php:244 actions/newnotice.php:161
-#: lib/mailhandler.php:60
 #, php-format
 msgid "That's too long. Maximum notice size is %d character."
 msgid_plural "That's too long. Maximum notice size is %d characters."
@@ -1162,13 +894,11 @@ msgstr[1] ""
 "C’est trop long ! La taille maximale de l’avis est limitée à %d caractères."
 
 #. TRANS: Client error displayed when replying to a non-existing notice.
-#: actions/apistatusesupdate.php:284
 msgid "Parent notice not found."
 msgstr "L’avis parent correspondant à cette réponse n’a pas été trouvé."
 
 #. TRANS: Client error displayed exceeding the maximum notice length.
 #. TRANS: %d is the maximum lenth for a notice.
-#: actions/apistatusesupdate.php:308 actions/newnotice.php:184
 #, php-format
 msgid "Maximum notice size is %d character, including attachment URL."
 msgid_plural "Maximum notice size is %d characters, including attachment URL."
@@ -1181,13 +911,11 @@ msgstr[1] ""
 
 #. TRANS: Client error displayed when requesting profiles of followers in an unsupported format.
 #. TRANS: Client error displayed when requesting IDs of followers in an unsupported format.
-#: actions/apisubscriptions.php:228 actions/apisubscriptions.php:258
 msgid "Unsupported format."
 msgstr "Format non supporté."
 
 #. TRANS: Title for timeline of most recent favourite notices by a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname.
-#: actions/apitimelinefavorites.php:108
 #, php-format
 msgid "%1$s / Favorites from %2$s"
 msgstr "%1$s / Favoris de %2$s"
@@ -1195,14 +923,12 @@ msgstr "%1$s / Favoris de %2$s"
 #. TRANS: Subtitle for timeline of most recent favourite notices by a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user's full name,
 #. TRANS: %3$s is a user nickname.
-#: actions/apitimelinefavorites.php:120
 #, php-format
 msgid "%1$s updates favorited by %2$s / %3$s."
 msgstr "%1$s annonces favorites de %2$s, alias %3$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.
-#: actions/apitimelinementions.php:115
 #, php-format
 msgid "%1$s / Updates mentioning %2$s"
 msgstr "%1$s / Mises à jour mentionnant %2$s"
@@ -1210,48 +936,40 @@ msgstr "%1$s / Mises à jour mentionnant %2$s"
 #. TRANS: Subtitle for timeline of most recent mentions of a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname,
 #. TRANS: %3$s is a user's full name.
-#: actions/apitimelinementions.php:131
 #, php-format
 msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr "%1$s statuts en réponses aux statuts de %2$s / %3$s."
 
 #. TRANS: Title for site timeline. %s is the StatusNet sitename.
 #. TRANS: Public RSS feed title. %s is the StatusNet site name.
-#: actions/apitimelinepublic.php:193 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "Activité publique %s"
 
 #. TRANS: Subtitle for site timeline. %s is the StatusNet sitename.
-#: actions/apitimelinepublic.php:199
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "%s statuts de tout le monde !"
 
 #. TRANS: Server error displayed calling unimplemented API method for 'retweeted by me'.
-#: actions/apitimelineretweetedbyme.php:71
 msgid "Unimplemented."
 msgstr "Non implémenté."
 
 #. TRANS: Title for Atom feed "repeated to me". %s is the user nickname.
-#: actions/apitimelineretweetedtome.php:96
 #, php-format
 msgid "Repeated to %s"
 msgstr "Repris pour %s"
 
-#: actions/apitimelineretweetedtome.php:98
 #, fuzzy, php-format
 msgid "%1$s notices that were to repeated to %2$s / %3$s."
 msgstr "%1$s statuts en réponses aux statuts de %2$s / %3$s."
 
 #. TRANS: Title of list of repeated notices of the logged in user.
 #. TRANS: %s is the nickname of the logged in user.
-#: actions/apitimelineretweetsofme.php:98
 #, php-format
 msgid "Repeats of %s"
 msgstr "Reprises de %s"
 
-#: actions/apitimelineretweetsofme.php:104
 #, fuzzy, php-format
 msgid "%1$s notices that %2$s / %3$s has repeated."
 msgstr "%1$s a marqué l’avis %2$s comme favori."
@@ -1260,183 +978,150 @@ msgstr "%1$s a marqué l’avis %2$s comme favori."
 #. TRANS: %s is the tag.
 #. TRANS: Title for first page of notices with tags.
 #. TRANS: %s is the tag.
-#: actions/apitimelinetag.php:101 actions/tag.php:69
 #, php-format
 msgid "Notices tagged with %s"
 msgstr "Avis marqués avec %s"
 
 #. TRANS: Subtitle for timeline with lastest notices with a given tag.
 #. TRANS: %1$s is the tag, $2$s is the StatusNet sitename.
-#: actions/apitimelinetag.php:105 actions/tagrss.php:65
 #, php-format
 msgid "Updates tagged with %1$s on %2$s!"
 msgstr "Mises à jour marquées avec %1$s dans %2$s !"
 
 #. TRANS: Client error displayed trying to add a notice to another user's timeline.
-#: actions/apitimelineuser.php:308
 msgid "Only the user can add to their own timeline."
 msgstr "Seul l’utilisateur peut ajouter des éléments son flux."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:315
 msgid "Only accept AtomPub for Atom feeds."
 msgstr "N’accepte que AtomPub pour les flux atom."
 
 #. TRANS: Client error displayed attempting to post an empty API notice.
-#: actions/apitimelineuser.php:322
 #, fuzzy
 msgid "Atom post must not be empty."
 msgstr "Une publication Atom doit être une entrée « Atom »."
 
 #. TRANS: Client error displayed attempting to post an API that is not well-formed XML.
-#: actions/apitimelineuser.php:328
 #, fuzzy
 msgid "Atom post must be well-formed XML."
 msgstr "Une publication Atom doit être une entrée « Atom »."
 
 #. TRANS: Client error displayed when not using an Atom entry.
-#: actions/apitimelineuser.php:334 actions/atompubfavoritefeed.php:228
-#: actions/atompubmembershipfeed.php:230
-#: actions/atompubsubscriptionfeed.php:236
 msgid "Atom post must be an Atom entry."
 msgstr "Une publication Atom doit être une entrée « Atom »."
 
 #. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
-#: actions/apitimelineuser.php:345
 #, fuzzy
 msgid "Can only handle POST activities."
 msgstr "Ne peut gérer que les activités de publication."
 
 #. TRANS: Client error displayed when using an unsupported activity object type.
 #. TRANS: %s is the unsupported activity object type.
-#: actions/apitimelineuser.php:356
 #, fuzzy, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr "Ne peut gérer l’objet d’activité de type « %s »"
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
 #. TRANS: %d is the notice ID (number).
-#: actions/apitimelineuser.php:390
 #, fuzzy, php-format
 msgid "No content for notice %d."
 msgstr "Chercher dans le contenu des avis"
 
 #. TRANS: Client error displayed when using another format than AtomPub.
 #. TRANS: %s is the notice URI.
-#: actions/apitimelineuser.php:419
 #, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "L’avis d’URI « %s » existe déjà."
 
 #. TRANS: Server error for unfinished API method showTrends.
-#: actions/apitrends.php:85
 msgid "API method under construction."
 msgstr "Méthode API en construction."
 
 #. TRANS: Client error displayed when requesting user information for a non-existing user.
-#: actions/apiuserprofileimage.php:80 actions/apiusershow.php:94
 msgid "User not found."
 msgstr "Page non trouvée."
 
 #. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
 #. TRANS: Client exception.
 #. TRANS: Client error displayed trying to subscribe to a non-existing profile.
-#: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
-#: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
-#: actions/subscribe.php:110
 msgid "No such profile."
 msgstr "Profil non-trouvé."
 
 #. TRANS: Subtitle for Atom favorites feed.
 #. TRANS: %1$s is a user nickname, %2$s is the StatusNet sitename.
-#: actions/atompubfavoritefeed.php:147
 #, fuzzy, php-format
 msgid "Notices %1$s has favorited on %2$s"
 msgstr "Statuts de %1$s et ses amis dans %2$s!"
 
 #. TRANS: Client exception thrown when trying to set a favorite for another user.
 #. TRANS: Client exception thrown when trying to subscribe another user.
-#: actions/atompubfavoritefeed.php:217 actions/atompubsubscriptionfeed.php:225
 #, fuzzy
 msgid "Cannot add someone else's subscription."
 msgstr "Impossible d’insérer un nouvel abonnement."
 
 #. TRANS: Client exception thrown when trying use an incorrect activity verb for the Atom pub method.
-#: actions/atompubfavoritefeed.php:240
 #, fuzzy
 msgid "Can only handle favorite activities."
 msgstr "Ne peut gérer que les activités de publication."
 
 #. TRANS: Client exception thrown when trying favorite an object that is not a notice.
-#: actions/atompubfavoritefeed.php:250 actions/atompubmembershipfeed.php:250
 #, fuzzy
 msgid "Can only fave notices."
 msgstr "Ne peut gérer que les activités de publication."
 
 #. TRANS: Client exception thrown when trying favorite a notice without content.
-#: actions/atompubfavoritefeed.php:259
 #, fuzzy
 msgid "Unknown note."
 msgstr "Inconnu"
 
 #. TRANS: Client exception thrown when trying favorite an already favorited notice.
-#: actions/atompubfavoritefeed.php:267
 #, fuzzy
 msgid "Already a favorite."
 msgstr "Ajouter aux favoris"
 
 #. TRANS: Title for group membership feed.
 #. TRANS: %s is a username.
-#: actions/atompubmembershipfeed.php:144
 #, fuzzy, php-format
 msgid "%s group memberships"
 msgstr "Membres du groupe %s"
 
 #. TRANS: Subtitle for group membership feed.
 #. TRANS: %1$s is a username, %2$s is the StatusNet sitename.
-#: actions/atompubmembershipfeed.php:149
 #, fuzzy, php-format
 msgid "Groups %1$s is a member of on %2$s"
 msgstr "Groupes de %s"
 
 #. TRANS: Client exception thrown when trying subscribe someone else to a group.
-#: actions/atompubmembershipfeed.php:219
 #, fuzzy
 msgid "Cannot add someone else's membership."
 msgstr "Impossible d’insérer un nouvel abonnement."
 
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#: actions/atompubmembershipfeed.php:242
 #, fuzzy
 msgid "Can only handle join activities."
 msgstr "Ne peut gérer que les activités de publication."
 
 #. TRANS: Client exception thrown when trying to subscribe to a non-existing group.
-#: actions/atompubmembershipfeed.php:259
 #, fuzzy
 msgid "Unknown group."
 msgstr "Inconnu"
 
 #. TRANS: Client exception thrown when trying to subscribe to an already subscribed group.
-#: actions/atompubmembershipfeed.php:267
 #, fuzzy
 msgid "Already a member."
 msgstr "Tous les membres"
 
 #. TRANS: Client exception thrown when trying to subscribe to group while blocked from that group.
-#: actions/atompubmembershipfeed.php:275
 msgid "Blocked by admin."
 msgstr ""
 
 #. TRANS: Client exception thrown when referencing a non-existing favorite.
-#: actions/atompubshowfavorite.php:90
 #, fuzzy
 msgid "No such favorite."
 msgstr "Fichier non trouvé."
 
 #. TRANS: Client exception thrown when trying to remove a favorite notice of another user.
-#: actions/atompubshowfavorite.php:151
 #, fuzzy
 msgid "Cannot delete someone else's favorite."
 msgstr "Impossible de supprimer le favori."
@@ -1463,94 +1148,69 @@ msgstr "Impossible de supprimer le favori."
 #. TRANS: Client error displayed when trying to join a non-existing group.
 #. TRANS: Client error displayed when trying to leave a non-local group.
 #. TRANS: Client error displayed when trying to leave a non-existing group.
+#. TRANS: Client error displayed when providing an invalid group ID on the Make Admin page.
 #. 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.
 #. TRANS: Command exception text shown when a group is requested that does not exist.
 #. TRANS: Error text shown when trying to leave a group that does not exist.
-#: actions/atompubshowmembership.php:81 actions/blockedfromgroup.php:81
-#: actions/blockedfromgroup.php:89 actions/deletegroup.php:87
-#: actions/deletegroup.php:100 actions/editgroup.php:102
-#: actions/foafgroup.php:46 actions/foafgroup.php:65 actions/foafgroup.php:73
-#: actions/groupblock.php:89 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:101 actions/grouplogo.php:103
-#: actions/groupmembers.php:84 actions/groupmembers.php:92
-#: actions/grouprss.php:97 actions/grouprss.php:105
-#: actions/groupunblock.php:89 actions/joingroup.php:82
-#: actions/joingroup.php:95 actions/leavegroup.php:82
-#: actions/leavegroup.php:95 actions/makeadmin.php:86
-#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:392
 msgid "No such group."
 msgstr "Aucun groupe trouvé."
 
 #. TRANS: Client exception thrown when trying to show membership of a non-subscribed group
-#: actions/atompubshowmembership.php:91
 #, fuzzy
 msgid "Not a member."
 msgstr "Tous les membres"
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
-#: actions/atompubshowmembership.php:150
 #, fuzzy
 msgid "Cannot delete someone else's membership."
 msgstr "Impossible de supprimer l’abonnement à soi-même."
 
 #. TRANS: Client exception thrown when trying to display a subscription for a non-existing profile ID.
 #. TRANS: %d is the non-existing profile ID number.
-#: actions/atompubshowsubscription.php:72
-#: actions/atompubshowsubscription.php:83
-#: actions/atompubsubscriptionfeed.php:74
 #, fuzzy, php-format
 msgid "No such profile id: %d."
 msgstr "Profil non-trouvé."
 
 #. 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.
-#: actions/atompubshowsubscription.php:94
 #, fuzzy, php-format
 msgid "Profile %1$d not subscribed to profile %2$d."
 msgstr "Vous n’êtes pas abonné(e) à ce profil."
 
 #. TRANS: Client exception thrown when trying to delete a subscription of another user.
-#: actions/atompubshowsubscription.php:157
 #, fuzzy
 msgid "Cannot delete someone else's subscription."
 msgstr "Impossible de supprimer l’abonnement à soi-même."
 
 #. TRANS: Subtitle for Atom subscription feed.
 #. TRANS: %1$s is a user nickname, %s$s is the StatusNet sitename.
-#: actions/atompubsubscriptionfeed.php:153
 #, fuzzy, php-format
 msgid "People %1$s has subscribed to on %2$s"
 msgstr "Abonnés de %s"
 
 #. TRANS: Client error displayed when not using the follow verb.
-#: actions/atompubsubscriptionfeed.php:248
 #, fuzzy
 msgid "Can only handle Follow activities."
 msgstr "Ne peut gérer que les activités de publication."
 
 #. TRANS: Client exception thrown when subscribing to an object that is not a person.
-#: actions/atompubsubscriptionfeed.php:256
 msgid "Can only follow people."
 msgstr ""
 
 #. TRANS: Client exception thrown when subscribing to a non-existing profile.
 #. TRANS: %s is the unknown profile ID.
-#: actions/atompubsubscriptionfeed.php:267
 #, fuzzy, php-format
 msgid "Unknown profile %s."
 msgstr "Type de fichier inconnu"
 
 #. TRANS: Client error displayed trying to subscribe to an already subscribed profile.
 #. TRANS: %s is the profile the user already has a subscription on.
-#: actions/atompubsubscriptionfeed.php:275
 #, fuzzy, php-format
 msgid "Already subscribed to %s."
 msgstr "Déjà abonné !"
 
 #. TRANS: Client error displayed trying to get a non-existing attachment.
-#: actions/attachment.php:73
 msgid "No such attachment."
 msgstr "Pièce jointe non trouvée."
 
@@ -1562,31 +1222,23 @@ msgstr "Pièce jointe non trouvée."
 #. TRANS: Client error displayed when trying to view group members without providing a group nickname.
 #. TRANS: Client error displayed when requesting a group RSS feed without providing a group nickname.
 #. TRANS: Client error displayed if no nickname argument was given requesting a group page.
-#: actions/avatarbynickname.php:60 actions/blockedfromgroup.php:73
-#: actions/editgroup.php:85 actions/groupdesignsettings.php:84
-#: actions/grouplogo.php:86 actions/groupmembers.php:76
-#: actions/grouprss.php:89 actions/showgroup.php:116
 msgid "No nickname."
 msgstr "Aucun pseudo."
 
 #. TRANS: Client error displayed trying to get an avatar without providing an avatar size.
-#: actions/avatarbynickname.php:66
 msgid "No size."
 msgstr "Aucune taille"
 
 #. TRANS: Client error displayed trying to get an avatar providing an invalid avatar size.
-#: actions/avatarbynickname.php:72
 msgid "Invalid size."
 msgstr "Taille incorrecte."
 
 #. TRANS: Title for avatar upload page.
-#: actions/avatarsettings.php:66 lib/settingsnav.php:82
 msgid "Avatar"
 msgstr "Avatar"
 
 #. TRANS: Instruction for avatar upload page.
 #. TRANS: %s is the maximum file size, for example "500b", "10kB" or "2MB".
-#: actions/avatarsettings.php:78
 #, php-format
 msgid "You can upload your personal avatar. The maximum file size is %s."
 msgstr ""
@@ -1597,17 +1249,12 @@ msgstr ""
 #. TRANS: Server error displayed coming across a request from a user without a profile.
 #. TRANS: Server error displayed when trying to authorise a remote subscription request
 #. TRANS: while the user has no profile.
-#: actions/avatarsettings.php:108 actions/avatarsettings.php:192
-#: actions/grouplogo.php:184 actions/remotesubscribe.php:190
-#: actions/userauthorization.php:75 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr "Utilisateur sans profil correspondant."
 
 #. TRANS: Avatar upload page form legend.
 #. TRANS: Avatar upload page crop form legend.
 #. TRANS: Legend for group logo settings fieldset.
-#: actions/avatarsettings.php:122 actions/avatarsettings.php:205
-#: actions/grouplogo.php:261
 msgid "Avatar settings"
 msgstr "Paramètres de l’avatar"
 
@@ -1615,8 +1262,6 @@ msgstr "Paramètres de l’avatar"
 #. TRANS: Header on avatar upload crop form for thumbnail of originally uploaded avatar (h2).
 #. TRANS: Uploaded original file in group logo form.
 #. TRANS: Header for originally uploaded file before a crop on the group logo page.
-#: actions/avatarsettings.php:131 actions/avatarsettings.php:214
-#: actions/grouplogo.php:207 actions/grouplogo.php:270
 msgid "Original"
 msgstr "Image originale"
 
@@ -1624,82 +1269,67 @@ msgstr "Image originale"
 #. TRANS: Header on avatar upload crop form for thumbnail of to be used rendition of uploaded avatar (h2).
 #. TRANS: Header for preview of to be displayed group logo.
 #. TRANS: Header for the cropped group logo on the group logo page.
-#: actions/avatarsettings.php:147 actions/avatarsettings.php:227
-#: actions/grouplogo.php:219 actions/grouplogo.php:283
 msgid "Preview"
 msgstr "Aperçu"
 
 #. TRANS: Button on avatar upload page to delete current avatar.
 #. TRANS: Button text for user account deletion.
-#: actions/avatarsettings.php:155 actions/deleteaccount.php:319
 msgctxt "BUTTON"
 msgid "Delete"
 msgstr "Supprimer"
 
 #. TRANS: Button on avatar upload page to upload an avatar.
 #. TRANS: Submit button to confirm upload of a user backup file for account restore.
-#: actions/avatarsettings.php:173 actions/restoreaccount.php:369
 msgctxt "BUTTON"
 msgid "Upload"
 msgstr "Téléverser"
 
 #. TRANS: Button on avatar upload crop form to confirm a selected crop as avatar.
-#: actions/avatarsettings.php:243
 msgctxt "BUTTON"
 msgid "Crop"
 msgstr "Recadrer"
 
 #. TRANS: Validation error on avatar upload form when no file was uploaded.
-#: actions/avatarsettings.php:318
 msgid "No file uploaded."
 msgstr "Aucun fichier n’a été téléversé."
 
 #. TRANS: Avatar upload form instruction after uploading a file.
-#: actions/avatarsettings.php:345
 #, fuzzy
 msgid "Pick a square area of the image to be your avatar."
 msgstr "Sélectionnez une zone de forme carrée pour définir votre avatar"
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
 #. TRANS: Server error displayed trying to crop an uploaded group logo that is no longer present.
-#: actions/avatarsettings.php:360 actions/grouplogo.php:391
 msgid "Lost our file data."
 msgstr "Données perdues."
 
 #. TRANS: Success message for having updated a user avatar.
-#: actions/avatarsettings.php:384
 msgid "Avatar updated."
 msgstr "Avatar mis à jour."
 
 #. TRANS: Error displayed on the avatar upload page if the avatar could not be updated for an unknown reason.
-#: actions/avatarsettings.php:388
 msgid "Failed updating avatar."
 msgstr "La mise à jour de l’avatar a échoué."
 
 #. TRANS: Success message for deleting a user avatar.
-#: actions/avatarsettings.php:412
 msgid "Avatar deleted."
 msgstr "Avatar supprimé."
 
 #. TRANS: Title for backup account page.
 #. TRANS: Option in profile settings to create a backup of the account of the currently logged in user.
-#: actions/backupaccount.php:61 actions/profilesettings.php:468
 msgid "Backup account"
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to backup an account while not logged in.
-#: actions/backupaccount.php:79
 #, fuzzy
 msgid "Only logged-in users can backup their account."
 msgstr "Seuls  les utilisateurs identifiés peuvent reprendre des avis."
 
 #. TRANS: Client exception thrown when trying to backup an account without having backup rights.
-#: actions/backupaccount.php:84
 msgid "You may not backup your account."
 msgstr ""
 
 #. TRANS: Information displayed on the backup account page.
-#: actions/backupaccount.php:227
 msgid ""
 "You can backup your account data in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format. This is an experimental feature and provides "
@@ -1709,31 +1339,26 @@ msgid ""
 msgstr ""
 
 #. TRANS: Submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:250
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Backup"
 msgstr "Arrière plan"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:254
 msgid "Backup your account."
 msgstr ""
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
-#: actions/block.php:68
 msgid "You already blocked that user."
 msgstr "Vous avez déjà bloqué cet utilisateur."
 
 #. TRANS: Title for block user page.
 #. TRANS: Legend for block user form.
 #. TRANS: Fieldset legend for block user from group form.
-#: actions/block.php:106 actions/block.php:136 actions/groupblock.php:165
 msgid "Block user"
 msgstr "Bloquer cet utilisateur"
 
 #. TRANS: Explanation of consequences when blocking a user on the block user page.
-#: actions/block.php:139
 msgid ""
 "Are you sure you want to block this user? Afterwards, they will be "
 "unsubscribed from you, unable to subscribe to you in the future, and you "
@@ -1749,15 +1374,11 @@ msgstr ""
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:154 actions/deleteapplication.php:157
-#: actions/deletegroup.php:220 actions/deletenotice.php:155
-#: actions/deleteuser.php:154 actions/groupblock.php:187
 msgctxt "BUTTON"
 msgid "No"
 msgstr "Non"
 
 #. TRANS: Submit button title for 'No' when blocking a user.
-#: actions/block.php:158
 #, fuzzy
 msgid "Do not block this user."
 msgstr "Ne pas bloquer cet utilisateur"
@@ -1768,179 +1389,143 @@ msgstr "Ne pas bloquer cet utilisateur"
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:161 actions/deleteapplication.php:164
-#: actions/deletegroup.php:227 actions/deletenotice.php:162
-#: actions/deleteuser.php:161 actions/groupblock.php:194
 msgctxt "BUTTON"
 msgid "Yes"
 msgstr "Oui"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:165
 #, fuzzy
 msgid "Block this user."
 msgstr "Bloquer cet utilisateur"
 
 #. TRANS: Server error displayed when blocking a user fails.
-#: actions/block.php:189
 msgid "Failed to save block information."
 msgstr "Impossible d’enregistrer les informations de blocage."
 
 #. TRANS: Title for first page with list of users blocked from a group.
 #. TRANS: %s is a group nickname.
-#: actions/blockedfromgroup.php:101
 #, php-format
 msgid "%s blocked profiles"
 msgstr "%s profils bloqués"
 
 #. TRANS: Title for any but the first page with list of users blocked from a group.
 #. TRANS: %1$s is a group nickname, %2$d is a page number.
-#: actions/blockedfromgroup.php:106
 #, php-format
 msgid "%1$s blocked profiles, page %2$d"
 msgstr "%1$s profils bloqués, page %2$d"
 
 #. TRANS: Instructions for list of users blocked from a group.
-#: actions/blockedfromgroup.php:122
 msgid "A list of the users blocked from joining this group."
 msgstr "Une liste des utilisateurs dont l’inscription à ce groupe est bloquée."
 
 #. TRANS: Form legend for unblocking a user from a group.
-#: actions/blockedfromgroup.php:291
 msgid "Unblock user from group"
 msgstr "Débloquer l’utilisateur de ce groupe"
 
 #. TRANS: Button text for unblocking a user from a group.
-#: actions/blockedfromgroup.php:323
 msgctxt "BUTTON"
 msgid "Unblock"
 msgstr "Débloquer"
 
 #. TRANS: Tooltip for button for unblocking a user from a group.
 #. TRANS: Description of the form to unblock a user.
-#: actions/blockedfromgroup.php:327 lib/unblockform.php:78
 msgid "Unblock this user"
 msgstr "Débloquer cet utilisateur"
 
 #. TRANS: Title for mini-posting window loaded from bookmarklet.
 #. TRANS: %s is the StatusNet site name.
-#: actions/bookmarklet.php:51
 #, php-format
 msgid "Post to %s"
 msgstr "Poster sur %s"
 
 #. TRANS: Client error displayed when not providing a confirmation code in the contact address confirmation action.
-#: actions/confirmaddress.php:74
 msgid "No confirmation code."
 msgstr "Aucun code de confirmation."
 
 #. TRANS: Client error displayed when providing a non-existing confirmation code in the contact address confirmation action.
-#: actions/confirmaddress.php:80
 msgid "Confirmation code not found."
 msgstr "Code de confirmation non trouvé."
 
 #. TRANS: Client error displayed when not providing a confirmation code for another user in the contact address confirmation action.
-#: actions/confirmaddress.php:86
 msgid "That confirmation code is not for you!"
 msgstr "Ce code de confirmation n’est pas pour vous !"
 
 #. TRANS: Server error for an unknown address type, which can be 'email', 'sms', or the name of an IM network (such as 'xmpp' or 'aim')
-#: actions/confirmaddress.php:94
-#, fuzzy, php-format
+#, php-format
 msgid "Unrecognized address type %s"
-msgstr "Type d’adresse non reconnu : %s."
+msgstr "Type d’adresse non reconnu : %s"
 
 #. TRANS: Client error for an already confirmed email/jabber/sms address.
-#: actions/confirmaddress.php:103 actions/confirmaddress.php:136
 msgid "That address has already been confirmed."
 msgstr "Cette adresse a déjà été confirmée."
 
-#: actions/confirmaddress.php:121 actions/imsettings.php:444
-#: actions/userdesignsettings.php:306
-#, fuzzy
 msgid "Couldn't update user."
 msgstr "Impossible de mettre à jour l’utilisateur."
 
-#: actions/confirmaddress.php:144
 #, fuzzy
 msgid "Couldn't update user im preferences."
 msgstr "Impossible de mettre à jour le dossier de l’utilisateur."
 
-#: actions/confirmaddress.php:156
 #, fuzzy
 msgid "Couldn't insert user im preferences."
 msgstr "Impossible d’insérer un nouvel abonnement."
 
 #. TRANS: Server error displayed when an address confirmation code deletion from the
 #. TRANS: database fails in the contact address confirmation action.
-#: actions/confirmaddress.php:169
 msgid "Could not delete address confirmation."
 msgstr "Impossible de supprimer la confirmation de l’adresse de contact."
 
 #. TRANS: Title for the contact address confirmation action.
-#: actions/confirmaddress.php:185
 msgid "Confirm address"
 msgstr "Confirmer l’adresse"
 
 #. TRANS: Success message for the contact address confirmation action.
 #. TRANS: %s can be 'email', 'jabber', or 'sms'.
-#: actions/confirmaddress.php:200
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "L'adresse \"%s\" a été validée pour votre compte."
 
 #. TRANS: Title for page with a conversion (multiple notices in context).
-#: actions/conversation.php:96
 msgid "Conversation"
 msgstr "Conversation"
 
 #. TRANS: Header on conversation page. Hidden by default (h2).
 #. TRANS: Label for user statistics.
-#: actions/conversation.php:149 lib/noticelist.php:87
-#: lib/profileaction.php:246 lib/searchgroupnav.php:82
-#: lib/threadednoticelist.php:66
 msgid "Notices"
 msgstr "Avis"
 
 #. TRANS: Client exception displayed trying to delete a user account while not logged in.
-#: actions/deleteaccount.php:71
 #, fuzzy
 msgid "Only logged-in users can delete their account."
 msgstr "Seuls  les utilisateurs identifiés peuvent reprendre des avis."
 
 #. TRANS: Client exception displayed trying to delete a user account without have the rights to do that.
-#: actions/deleteaccount.php:77
 #, fuzzy
 msgid "You cannot delete your account."
 msgstr "Vous ne pouvez pas supprimer des utilisateurs."
 
 #. TRANS: Confirmation text for user deletion. The user has to type this exactly the same, including punctuation.
-#: actions/deleteaccount.php:160 actions/deleteaccount.php:297
 msgid "I am sure."
 msgstr ""
 
 #. TRANS: Notification for user about the text that must be input to be able to delete a user account.
 #. TRANS: %s is the text that needs to be input.
-#: actions/deleteaccount.php:164
 #, php-format
 msgid "You must write \"%s\" exactly in the box."
 msgstr ""
 
 #. TRANS: Confirmation that a user account has been deleted.
-#: actions/deleteaccount.php:206
 #, fuzzy
 msgid "Account deleted."
 msgstr "Avatar supprimé."
 
 #. TRANS: Page title for page on which a user account can be deleted.
 #. TRANS: Option in profile settings to delete the account of the currently logged in user.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:476
 #, fuzzy
 msgid "Delete account"
 msgstr "Créer un compte"
 
 #. TRANS: Form text for user deletion form.
-#: actions/deleteaccount.php:279
 msgid ""
 "This will <strong>permanently delete</strong> your account data from this "
 "server."
@@ -1948,7 +1533,6 @@ msgstr ""
 
 #. TRANS: Additional form text for user deletion form shown if a user has account backup rights.
 #. TRANS: %s is a URL to the backup page.
-#: actions/deleteaccount.php:285
 #, php-format
 msgid ""
 "You are strongly advised to <a href=\"%s\">back up your data</a> before "
@@ -1957,56 +1541,43 @@ msgstr ""
 
 #. TRANS: Field label for delete account confirmation entry.
 #. TRANS: Field label for password reset form where the password has to be typed again.
-#: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:262 actions/register.php:419
 msgid "Confirm"
 msgstr "Confirmer"
 
 #. TRANS: Input title for the delete account field.
 #. TRANS: %s is the text that needs to be input.
-#: actions/deleteaccount.php:304
 #, fuzzy, php-format
 msgid "Enter \"%s\" to confirm that you want to delete your account."
 msgstr "Vous ne pouvez pas supprimer des utilisateurs."
 
 #. TRANS: Button title for user account deletion.
-#: actions/deleteaccount.php:323
 #, fuzzy
 msgid "Permanently delete your account"
 msgstr "Vous ne pouvez pas supprimer des utilisateurs."
 
 #. TRANS: Client error displayed trying to delete an application while not logged in.
-#: actions/deleteapplication.php:62
 msgid "You must be logged in to delete an application."
 msgstr "Vous devez être connecté pour supprimer une application."
 
 #. TRANS: Client error displayed trying to delete an application that does not exist.
-#: actions/deleteapplication.php:71
 msgid "Application not found."
 msgstr "Application non trouvée."
 
 #. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
-#: actions/deleteapplication.php:79 actions/editapplication.php:78
-#: actions/showapplication.php:90
 msgid "You are not the owner of this application."
 msgstr "Vous n’êtes pas le propriétaire de cette application."
 
 #. TRANS: Client error text when there is a problem with the session token.
-#: actions/deleteapplication.php:102 actions/editapplication.php:131
-#: actions/newapplication.php:112 actions/showapplication.php:113
-#: lib/action.php:1391
 msgid "There was a problem with your session token."
 msgstr "Un problème est survenu avec votre jeton de session."
 
 #. TRANS: Title for delete application page.
 #. TRANS: Fieldset legend on delete application page.
-#: actions/deleteapplication.php:124 actions/deleteapplication.php:149
 msgid "Delete application"
 msgstr "Supprimer l’application"
 
 #. TRANS: Confirmation text on delete application page.
-#: actions/deleteapplication.php:152
 msgid ""
 "Are you sure you want to delete this application? This will clear all data "
 "about the application from the database, including all existing user "
@@ -2017,57 +1588,47 @@ msgstr ""
 "utilisateur existantes."
 
 #. TRANS: Submit button title for 'No' when deleting an application.
-#: actions/deleteapplication.php:161
 #, fuzzy
 msgid "Do not delete this application."
 msgstr "Ne pas supprimer cette application"
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
-#: actions/deleteapplication.php:167
 #, fuzzy
 msgid "Delete this application."
 msgstr "Supprimer cette application"
 
 #. TRANS: Client error when trying to delete group while not logged in.
-#: actions/deletegroup.php:64
 msgid "You must be logged in to delete a group."
 msgstr "Vous devez ouvrir une session pour supprimer un groupe."
 
 #. TRANS: Client error when trying to delete a group without providing a nickname or ID for the group.
 #. TRANS: Client error displayed when trying to join a group without providing a group name or group ID.
 #. TRANS: Client error displayed when trying to leave a group without providing a group name or group ID.
-#: actions/deletegroup.php:94 actions/joingroup.php:89
-#: actions/leavegroup.php:89
 msgid "No nickname or ID."
 msgstr "Aucun pseudo ou ID."
 
 #. TRANS: Client error when trying to delete a group without having the rights to delete it.
-#: actions/deletegroup.php:107
 msgid "You are not allowed to delete this group."
 msgstr "Vous n’êtes pas autorisé à supprimer ce groupe."
 
 #. TRANS: Server error displayed if a group could not be deleted.
 #. TRANS: %s is the name of the group that could not be deleted.
-#: actions/deletegroup.php:150
 #, php-format
 msgid "Could not delete group %s."
 msgstr "Impossible de supprimer le groupe « %s »."
 
 #. TRANS: Message given after deleting a group.
 #. TRANS: %s is the deleted group's name.
-#: actions/deletegroup.php:159
 #, php-format
 msgid "Deleted group %s"
 msgstr "Groupe « %s » supprimé"
 
 #. TRANS: Title of delete group page.
 #. TRANS: Form legend for deleting a group.
-#: actions/deletegroup.php:176 actions/deletegroup.php:202
 msgid "Delete group"
 msgstr "Supprimer le groupe"
 
 #. TRANS: Warning in form for deleleting a group.
-#: actions/deletegroup.php:206
 msgid ""
 "Are you sure you want to delete this group? This will clear all data about "
 "the group from the database, without a backup. Public posts to this group "
@@ -2079,13 +1640,11 @@ msgstr ""
 "d’actualités individuels."
 
 #. TRANS: Submit button title for 'No' when deleting a group.
-#: actions/deletegroup.php:224
 #, fuzzy
 msgid "Do not delete this group."
 msgstr "Ne pas supprimer ce groupe"
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
-#: actions/deletegroup.php:231
 #, fuzzy
 msgid "Delete this group."
 msgstr "Supprimer ce groupe"
@@ -2096,22 +1655,18 @@ msgstr "Supprimer ce groupe"
 #. TRANS: Client error displayed trying to block a user from a group while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying to log out when not logged in.
+#. TRANS: Client error displayed when trying to access the "make admin" page while not logged in.
+#. TRANS: Client error displayed trying to create a new direct message while not logged in.
+#. TRANS: Client error displayed trying to send a notice while not logged in.
+#. TRANS: Client error displayed trying to nudge a user without being logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
 #. TRANS: Client error displayed when trying to change user options while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
-#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:70
-#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
-#: actions/nudge.php:63 actions/pluginenable.php:97 actions/subedit.php:33
-#: actions/subscribe.php:98 actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:71 lib/profileformaction.php:63
-#: lib/settingsaction.php:72
 msgid "Not logged in."
 msgstr "Non connecté."
 
 #. TRANS: Instructions for deleting a notice.
-#: actions/deletenotice.php:110
 msgid ""
 "You are about to permanently delete a notice. Once this is done, it cannot "
 "be undone."
@@ -2121,51 +1676,42 @@ msgstr ""
 
 #. TRANS: Page title when deleting a notice.
 #. TRANS: Fieldset legend for the delete notice form.
-#: actions/deletenotice.php:117 actions/deletenotice.php:148
 msgid "Delete notice"
 msgstr "Supprimer cet avis"
 
 #. TRANS: Message for the delete notice form.
-#: actions/deletenotice.php:152
 msgid "Are you sure you want to delete this notice?"
 msgstr "Voulez-vous vraiment supprimer cet avis ?"
 
 #. TRANS: Submit button title for 'No' when deleting a notice.
-#: actions/deletenotice.php:159
 #, fuzzy
 msgid "Do not delete this notice."
 msgstr "Ne pas supprimer cet avis"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:166
 #, fuzzy
 msgid "Delete this notice."
 msgstr "Supprimer cet avis"
 
 #. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
-#: actions/deleteuser.php:66
 msgid "You cannot delete users."
 msgstr "Vous ne pouvez pas supprimer des utilisateurs."
 
 #. TRANS: Client error displayed when trying to delete a non-local user.
-#: actions/deleteuser.php:74
 msgid "You can only delete local users."
 msgstr "Vous pouvez seulement supprimer les utilisateurs locaux."
 
 #. TRANS: Title of delete user page.
-#: actions/deleteuser.php:110
 #, fuzzy
 msgctxt "TITLE"
 msgid "Delete user"
 msgstr "Supprimer l’utilisateur"
 
 #. TRANS: Fieldset legend on delete user page.
-#: actions/deleteuser.php:134
 msgid "Delete user"
 msgstr "Supprimer l’utilisateur"
 
 #. TRANS: Information text to request if a user is certain that the described action has to be performed.
-#: actions/deleteuser.php:138
 msgid ""
 "Are you sure you want to delete this user? This will clear all data about "
 "the user from the database, without a backup."
@@ -2174,100 +1720,81 @@ msgstr ""
 "données à son propos de la base de données, sans sauvegarde."
 
 #. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/deleteuser.php:158
 #, fuzzy
 msgid "Do not delete this user."
 msgstr "Ne pas supprimer ce groupe"
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
-#: actions/deleteuser.php:165
 #, fuzzy
 msgid "Delete this user."
 msgstr "Supprimer cet utilisateur"
 
 #. TRANS: Message used as title for design settings for the site.
-#: actions/designadminpanel.php:60 lib/settingsnav.php:97
 msgid "Design"
 msgstr "Conception"
 
 #. TRANS: Instructions for design adminsitration panel.
-#: actions/designadminpanel.php:71
 msgid "Design settings for this StatusNet site"
 msgstr "Paramètres de conception pour ce site StatusNet"
 
 #. TRANS: Client error displayed when a logo URL does is not valid.
-#: actions/designadminpanel.php:327
 msgid "Invalid logo URL."
 msgstr "URL du logo invalide."
 
 #. TRANS: Client error displayed when an SSL logo URL is invalid.
-#: actions/designadminpanel.php:333
 msgid "Invalid SSL logo URL."
 msgstr "Adresse URL du logo SSL invalide."
 
 #. TRANS: Client error displayed when a theme is submitted through the form that is not in the theme list.
 #. TRANS: %s is the chosen unavailable theme.
-#: actions/designadminpanel.php:339
 #, php-format
 msgid "Theme not available: %s."
 msgstr "Le thème n’est pas disponible : %s."
 
 #. TRANS: Fieldset legend for form to change logo.
-#: actions/designadminpanel.php:437
 msgid "Change logo"
 msgstr "Modifier le logo"
 
 #. TRANS: Field label for StatusNet site logo.
-#: actions/designadminpanel.php:444
 msgid "Site logo"
 msgstr "Logo du site"
 
 #. TRANS: Field label for SSL StatusNet site logo.
-#: actions/designadminpanel.php:452
 msgid "SSL logo"
 msgstr "Logo SSL"
 
 #. TRANS: Fieldset legend for form change StatusNet site's theme.
-#: actions/designadminpanel.php:467
 msgid "Change theme"
 msgstr "Modifier le thème"
 
 #. TRANS: Field label for dropdown to choose site theme.
-#: actions/designadminpanel.php:485
 msgid "Site theme"
 msgstr "Thème du site"
 
 #. TRANS: Title for field label for dropdown to choose site theme.
-#: actions/designadminpanel.php:487
 msgid "Theme for the site."
 msgstr "Thème pour le site."
 
 #. TRANS: Field label for uploading a cutom theme.
-#: actions/designadminpanel.php:494
 msgid "Custom theme"
 msgstr "Thème personnalisé"
 
 #. TRANS: Form instructions for uploading a cutom StatusNet theme.
-#: actions/designadminpanel.php:499
 msgid "You can upload a custom StatusNet theme as a .ZIP archive."
 msgstr ""
 "Vous pouvez importer un thème StatusNet personnalisé dans une archive .ZIP."
 
 #. TRANS: Fieldset legend for theme background image.
-#: actions/designadminpanel.php:515
 msgid "Change background image"
 msgstr "Changer l’image d’arrière plan"
 
 #. TRANS: Field label for background image on theme designer page.
 #. TRANS: Field label for background color selector.
 #. TRANS: Label on profile design page for setting a profile page background colour.
-#: actions/designadminpanel.php:525 actions/designadminpanel.php:609
-#: lib/designform.php:238
 msgid "Background"
 msgstr "Arrière plan"
 
 #. TRANS: Form guide for background image upload form on theme designer page.
-#: actions/designadminpanel.php:531
 #, php-format
 msgid ""
 "You can upload a background image for the site. The maximum file size is %1"
@@ -2277,202 +1804,167 @@ msgstr ""
 "maximale du fichier est de %1$s."
 
 #. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:558
 msgid "On"
 msgstr "Activé"
 
 #. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:575
 msgid "Off"
 msgstr "Désactivé"
 
 #. TRANS: Form guide for turning background image on or off on theme designer page.
 #. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
 #. TRANS: use of the uploaded profile image.
-#: actions/designadminpanel.php:577 lib/designform.php:214
 msgid "Turn background image on or off."
 msgstr "Activer ou désactiver l’image d’arrière plan."
 
 #. TRANS: Checkbox label to title background image on theme designer page.
 #. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-#: actions/designadminpanel.php:583 lib/designform.php:220
 msgid "Tile background image"
 msgstr "Répéter l’image d’arrière plan"
 
 #. TRANS: Fieldset legend for theme colors.
-#: actions/designadminpanel.php:598
 #, fuzzy
 msgid "Change colors"
 msgstr "Modifier les couleurs"
 
 #. TRANS: Field label for content color selector.
 #. TRANS: Label on profile design page for setting a profile page content colour.
-#: actions/designadminpanel.php:623 lib/designform.php:252
 msgid "Content"
 msgstr "Contenu"
 
 #. TRANS: Field label for sidebar color selector.
 #. TRANS: Label on profile design page for setting a profile page sidebar colour.
-#: actions/designadminpanel.php:637 lib/designform.php:266
 msgid "Sidebar"
 msgstr "Barre latérale"
 
 #. TRANS: Field label for text color selector.
 #. TRANS: Label on profile design page for setting a profile page text colour.
-#: actions/designadminpanel.php:651 lib/designform.php:280
 msgid "Text"
 msgstr "Texte"
 
 #. TRANS: Field label for link color selector.
 #. TRANS: Label on profile design page for setting a profile page links colour.
-#: actions/designadminpanel.php:665 lib/designform.php:294
 msgid "Links"
 msgstr "Liens"
 
 #. TRANS: Fieldset legend for advanced theme design settings.
-#: actions/designadminpanel.php:691
 msgid "Advanced"
 msgstr "Avancé"
 
 #. TRANS: Field label for custom CSS.
-#: actions/designadminpanel.php:696
 msgid "Custom CSS"
 msgstr "CSS personnalisé"
 
 #. TRANS: Button text for resetting theme settings.
-#: actions/designadminpanel.php:718
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Use defaults"
 msgstr "Utiliser les valeurs par défaut"
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:720
 #, fuzzy
 msgid "Restore default designs."
 msgstr "Restaurer les conceptions par défaut"
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:728
 #, fuzzy
 msgid "Reset back to default."
 msgstr "Revenir aux valeurs par défaut"
 
 #. TRANS: Title for button for saving theme settings.
-#: actions/designadminpanel.php:736
 #, fuzzy
 msgid "Save design."
 msgstr "Sauvegarder la conception"
 
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
-#: actions/disfavor.php:83
 msgid "This notice is not a favorite!"
 msgstr "Cet avis n’est pas un favori !"
 
 #. TRANS: Title for page on which favorites can be added.
-#: actions/disfavor.php:98
 msgid "Add to favorites"
 msgstr "Ajouter aux favoris"
 
 #. TRANS: Client exception thrown when requesting a document from the documentation that does not exist.
 #. TRANS: %s is the non-existing document.
-#: actions/doc.php:155
 #, fuzzy, php-format
 msgid "No such document \"%s\"."
 msgstr "Document « %s » non trouvé."
 
 #. TRANS: Title for "Edit application" form.
 #. TRANS: Form legend.
-#: actions/editapplication.php:54 lib/applicationeditform.php:129
 msgid "Edit application"
 msgstr "Modifier votre application"
 
 #. TRANS: Client error displayed trying to edit an application while not logged in.
-#: actions/editapplication.php:66
 msgid "You must be logged in to edit an application."
 msgstr "Vous devez être connecté pour modifier une application."
 
 #. TRANS: Client error displayed trying to edit an application that does not exist.
-#: actions/editapplication.php:83 actions/showapplication.php:83
 msgid "No such application."
 msgstr "Application non trouvée."
 
 #. TRANS: Instructions for "Edit application" form.
-#: actions/editapplication.php:167
 msgid "Use this form to edit your application."
 msgstr "Utilisez ce formulaire pour modifier votre application."
 
 #. TRANS: Validation error shown when not providing a name in the "Edit application" form.
 #. TRANS: Validation error shown when not providing a name in the "New application" form.
-#: actions/editapplication.php:184 actions/newapplication.php:164
 msgid "Name is required."
 msgstr "Le nom est requis."
 
 #. 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.
-#: actions/editapplication.php:188 actions/newapplication.php:172
 msgid "Name is too long (maximum 255 characters)."
 msgstr "Le nom est trop long (limité à 255 caractères maximum)."
 
 #. TRANS: Validation error shown when providing a name for an application that already exists in the "Edit application" form.
 #. TRANS: Validation error shown when providing a name for an application that already exists in the "New application" form.
-#: actions/editapplication.php:192 actions/newapplication.php:168
 msgid "Name already in use. Try another one."
 msgstr "Ce nom est déjà utilisé. Essayez-en un autre."
 
 #. TRANS: Validation error shown when not providing a description in the "Edit application" form.
 #. TRANS: Validation error shown when not providing a description in the "New application" form.
-#: actions/editapplication.php:196 actions/newapplication.php:176
 msgid "Description is required."
 msgstr "La description est requise."
 
 #. TRANS: Validation error shown when providing too long a source URL in the "Edit application" form.
-#: actions/editapplication.php:209
 msgid "Source URL is too long."
 msgstr "L’URL source est trop longue."
 
 #. TRANS: Validation error shown when providing an invalid source URL in the "Edit application" form.
 #. TRANS: Validation error shown when providing an invalid source URL in the "New application" form.
-#: actions/editapplication.php:216 actions/newapplication.php:199
 msgid "Source URL is not valid."
 msgstr "L’URL source est invalide."
 
 #. 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.
-#: actions/editapplication.php:220 actions/newapplication.php:203
 msgid "Organization is required."
 msgstr "L’organisation est requise."
 
 #. TRANS: Validation error shown when providing too long an arganisation name in the "Edit application" form.
-#: actions/editapplication.php:224 actions/newapplication.php:207
 msgid "Organization is too long (maximum 255 characters)."
 msgstr "L’organisation est trop longue (limitée à 255 caractères maximum)."
 
 #. TRANS: Form validation error show when an organisation name has not been provided in the edit application form.
 #. TRANS: Form validation error show when an organisation name has not been provided in the new application form.
-#: actions/editapplication.php:228 actions/newapplication.php:211
 msgid "Organization homepage is required."
 msgstr "La page d’accueil de l’organisation est requise."
 
 #. TRANS: Validation error shown when providing too long a callback URL in the "Edit application" form.
 #. TRANS: Validation error shown when providing too long a callback URL in the "New application" form.
-#: actions/editapplication.php:239 actions/newapplication.php:225
 msgid "Callback is too long."
 msgstr "Le rappel (Callback) est trop long."
 
 #. TRANS: Validation error shown when providing an invalid callback URL in the "Edit application" form.
 #. TRANS: Validation error shown when providing an invalid callback URL in the "New application" form.
-#: actions/editapplication.php:247 actions/newapplication.php:235
 msgid "Callback URL is not valid."
 msgstr "L’URL de rappel (Callback) est invalide."
 
 #. TRANS: Server error occuring when an application could not be updated from the "Edit application" form.
-#: actions/editapplication.php:284
 msgid "Could not update application."
 msgstr "Impossible de mettre à jour l’application."
 
 #. TRANS: Title for form to edit a group. %s is a group nickname.
-#: actions/editgroup.php:55
 #, php-format
 msgid "Edit %s group"
 msgstr "Modifier le groupe %s"
@@ -2480,40 +1972,40 @@ msgstr "Modifier le groupe %s"
 #. TRANS: Client error displayed trying to edit a group while not logged in.
 #. TRANS: Client error displayed when trying to create a group while not logged in.
 #. TRANS: Client error displayed trying to create a group while not logged in.
-#: actions/editgroup.php:68 actions/grouplogo.php:69 actions/newgroup.php:65
 msgid "You must be logged in to create a group."
 msgstr "Vous devez ouvrir une session pour créer un groupe."
 
 #. TRANS: Form instructions for group edit form.
-#: actions/editgroup.php:161
 msgid "Use this form to edit the group."
 msgstr "Remplissez ce formulaire pour modifier les options du groupe."
 
+#. TRANS: Group edit form validation error.
+#. TRANS: Group create form validation error.
+#. TRANS: %s is the invalid alias.
+#, php-format
+msgid "Invalid alias: \"%s\""
+msgstr "Alias invalide : « %s »"
+
 #. TRANS: Group edit form success message.
-#: actions/editgroup.php:301
 msgid "Options saved."
 msgstr "Vos options ont été enregistrées."
 
 #. TRANS: Title for e-mail settings.
-#: actions/emailsettings.php:60
 msgid "Email settings"
 msgstr "Paramètres du courriel"
 
 #. TRANS: E-mail settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/emailsettings.php:74
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 msgstr "Configurez les courriels que vous souhaitez recevoir de %%site.name%%."
 
 #. TRANS: Form legend for e-mail settings form.
 #. TRANS: Field label for e-mail address input in e-mail settings form.
-#: actions/emailsettings.php:104 actions/emailsettings.php:130
 msgid "Email address"
 msgstr "Adresse électronique"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:110
 msgid "Current confirmed email address."
 msgstr "Adresse courriel actuellement confirmée."
 
@@ -2522,15 +2014,11 @@ msgstr "Adresse courriel actuellement confirmée."
 #. TRANS: Button label to remove a confirmed IM address.
 #. TRANS: Button label to remove a confirmed SMS address.
 #. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
-#: actions/emailsettings.php:113 actions/emailsettings.php:180
-#: actions/imsettings.php:119 actions/smssettings.php:119
-#: actions/smssettings.php:175
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Enlever"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:120
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -2543,44 +2031,36 @@ msgstr ""
 #. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
 #. TRANS: Any other domain may be owned by a legitimate person or
 #. TRANS: organization.
-#: actions/emailsettings.php:137
 msgid "Email address, like \"UserName@example.org\""
 msgstr "Adresse de courriel (ex : nom@example.org)"
 
 #. TRANS: Button label for adding an e-mail address in e-mail settings form.
 #. TRANS: Button label for adding an IM address in IM settings form.
 #. TRANS: Button label for adding a SMS phone number in SMS settings form.
-#: actions/emailsettings.php:141 actions/imsettings.php:147
-#: actions/smssettings.php:157
 msgctxt "BUTTON"
 msgid "Add"
 msgstr "Ajouter"
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:149 actions/smssettings.php:166
 msgid "Incoming email"
 msgstr "Courriel entrant"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:155
 msgid "I want to post notices by email."
 msgstr "Je veux envoyer mes avis par courriel."
 
 #. TRANS: Form instructions for incoming e-mail form in e-mail settings.
 #. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
-#: actions/emailsettings.php:177 actions/smssettings.php:173
 msgid "Send email to this address to post new notices."
 msgstr "Écrivez à cette adresse courriel pour poster de nouveaux avis."
 
 #. TRANS: Instructions for incoming e-mail address input form, when an address has already been assigned.
 #. TRANS: Instructions for incoming SMS e-mail address input form.
-#: actions/emailsettings.php:186 actions/smssettings.php:181
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr "Nouvelle adresse courriel pour poster ; annule l’ancienne."
 
 #. TRANS: Instructions for incoming e-mail address input form.
-#: actions/emailsettings.php:190
 msgid ""
 "To send notices via email, we need to create a unique email address for you "
 "on this server:"
@@ -2588,91 +2068,73 @@ msgstr ""
 
 #. TRANS: Button label for adding an e-mail address to send notices from.
 #. TRANS: Button label for adding an SMS e-mail address to send notices from.
-#: actions/emailsettings.php:196 actions/smssettings.php:184
 msgctxt "BUTTON"
 msgid "New"
 msgstr "Nouveau"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:205
 msgid "Email preferences"
 msgstr "Préférences de courrier électronique"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:213
 msgid "Send me notices of new subscriptions through email."
 msgstr "Avertissez-moi par courriel des nouveaux abonnements."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:219
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr ""
 "Envoyez-moi un courriel quand un utilisateur ajoute un de mes avis à ses "
 "favoris."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:226
 msgid "Send me email when someone sends me a private message."
 msgstr "Envoyez-moi un courriel quand quelqu’un m’envoie un message personnel."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:232
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr "Envoyez-moi un courriel quand quelqu’un m’envoie une réponse « @ »."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:238
 msgid "Allow friends to nudge me and send me an email."
 msgstr "Autoriser mes amis à m’envoyer des courriels et des clins d’œil."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:244
 msgid "Publish a MicroID for my email address."
 msgstr "Publier un MicroID pour mon adresse courriel."
 
 #. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:362
 msgid "Email preferences saved."
 msgstr "Préférences de courrier électronique enregistrées."
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:381
 msgid "No email address."
 msgstr "Aucune adresse électronique."
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:389
 #, fuzzy
 msgid "Cannot normalize that email address."
 msgstr "Impossible d’utiliser cette adresse courriel"
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:394 actions/register.php:197
-#: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "Adresse courriel invalide."
 
 #. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:398
 msgid "That is already your email address."
 msgstr "Vous utilisez déjà cette adresse courriel."
 
 #. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:402
 msgid "That email address already belongs to another user."
 msgstr "Cette adresse courriel appartient déjà à un autre utilisateur."
 
 #. TRANS: Server error thrown on database error adding e-mail confirmation code.
 #. TRANS: Server error thrown on database error adding Instant Messaging confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:419 actions/imsettings.php:362
-#: actions/smssettings.php:364
 #, fuzzy
 msgid "Could not insert confirmation code."
 msgstr "Impossible d’insérer le code de confirmation."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:426
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
@@ -2683,104 +2145,84 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling Instant Messaging address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:446 actions/imsettings.php:391
-#: actions/smssettings.php:398
 msgid "No pending confirmation to cancel."
 msgstr "Aucune confirmation à annuler."
 
 #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:451
 msgid "That is the wrong email address."
 msgstr "Cette adresse de messagerie électronique est erronée."
 
 #. TRANS: Server error thrown on database error canceling e-mail address confirmation.
 #. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
-#: actions/emailsettings.php:460 actions/smssettings.php:412
 #, fuzzy
 msgid "Could not delete email confirmation."
 msgstr "Impossible de supprimer le courriel de confirmation."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:465
 msgid "Email confirmation cancelled."
 msgstr "Confirmation de courrier électronique annulée."
 
 #. TRANS: Message given trying to remove an e-mail address that is not
 #. TRANS: registered for the active user.
-#: actions/emailsettings.php:484
 msgid "That is not your email address."
 msgstr "Ceci n’est pas votre adresse courriel."
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:505
 msgid "The email address was removed."
 msgstr "L’adresse électronique a été supprimée."
 
 #. TRANS: Form validation error displayed when trying to remove an incoming e-mail address while no address has been set.
-#: actions/emailsettings.php:519 actions/smssettings.php:554
 msgid "No incoming email address."
 msgstr "Aucune adresse de courriel entrant."
 
 #. 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.
-#: actions/emailsettings.php:531 actions/emailsettings.php:555
-#: actions/smssettings.php:565 actions/smssettings.php:590
 #, fuzzy
 msgid "Could not update user record."
 msgstr "Impossible de mettre à jour le dossier de l’utilisateur."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
 #. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:535 actions/smssettings.php:569
 msgid "Incoming email address removed."
 msgstr "L’adresse de courriel entrant a été supprimée."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
 #. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:559 actions/smssettings.php:594
 msgid "New incoming email address added."
 msgstr "Nouvelle adresse de courriel entrant ajoutée."
 
 #. TRANS: Client error displayed when trying to mark a notice as favorite that already is a favorite.
-#: actions/favor.php:80
 msgid "This notice is already a favorite!"
 msgstr "Cet avis a déjà été ajouté à vos favoris !"
 
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
-#: actions/favor.php:95
 #, fuzzy
 msgid "Disfavor favorite."
 msgstr "Retirer ce favori"
 
 #. TRANS: Page title for first page of favorited notices.
 #. TRANS: Title for favourited notices section.
-#: actions/favorited.php:65 lib/popularnoticesection.php:62
-#: lib/publicgroupnav.php:93
 msgid "Popular notices"
 msgstr "Avis populaires"
 
 #. TRANS: Page title for all but first page of favorited notices.
 #. TRANS: %d is the page number being displayed.
-#: actions/favorited.php:69
 #, php-format
 msgid "Popular notices, page %d"
 msgstr "Avis populaires - page %d"
 
 #. TRANS: Description on page displaying favorited notices.
-#: actions/favorited.php:81
 msgid "The most popular notices on the site right now."
 msgstr "Les avis les plus populaires sur le site en ce moment."
 
 #. TRANS: Text displayed instead of a list when a site does not yet have any favourited notices.
-#: actions/favorited.php:149
 msgid "Favorite notices appear on this page but no one has favorited one yet."
 msgstr ""
 "Les avis favoris apparaissent sur cette page mais personne n’a mis d’avis en "
 "favori pour le moment."
 
 #. TRANS: Additional text displayed instead of a list when a site does not yet have any favourited notices for logged in users.
-#: actions/favorited.php:153
 msgid ""
 "Be the first to add a notice to your favorites by clicking the fave button "
 "next to any notice you like."
@@ -2790,7 +2232,6 @@ msgstr ""
 
 #. TRANS: Additional text displayed instead of a list when a site does not yet have any favourited notices for not logged in users.
 #. TRANS: %%action.register%% is a registration link. "[link text](link)" is Mark Down. Do not change the formatting.
-#: actions/favorited.php:158
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to add a "
@@ -2803,181 +2244,146 @@ msgstr ""
 #. TRANS: %s is a user's nickname.
 #. TRANS: Title for first page of favourite notices of a user.
 #. TRANS: %s is the user for whom the favourite notices are displayed.
-#: actions/favoritesrss.php:111 actions/showfavorites.php:76
-#: lib/personalgroupnav.php:110
 #, php-format
 msgid "%s's favorite notices"
 msgstr "Avis favoris de %s"
 
 #. TRANS: Desciption of RSS feed with favourite notices of a user.
 #. TRANS: %1$s is a user's nickname, %2$s is the name of the StatusNet site.
-#: actions/favoritesrss.php:117
 #, php-format
 msgid "Updates favored by %1$s on %2$s!"
 msgstr "Mises à jour privilégiées par %1$s sur %2$s !"
 
 #. TRANS: Page title for first page of featured users.
 #. TRANS: Title for featured users section.
-#: actions/featured.php:69 lib/featureduserssection.php:87
-#: lib/publicgroupnav.php:89
 msgid "Featured users"
 msgstr "Utilisateurs en vedette"
 
 #. TRANS: Page title for all but first page of featured users.
 #. TRANS: %d is the page number being displayed.
-#: actions/featured.php:73
 #, php-format
 msgid "Featured users, page %d"
 msgstr "Utilisateurs en vedette - page %d"
 
 #. TRANS: Description on page displaying featured users.
-#: actions/featured.php:102
 #, fuzzy, php-format
 msgid "A selection of some great users on %s."
 msgstr "Une sélection d’utilisateurs à ne pas manquer dans %s"
 
 #. TRANS: Client error displayed when no notice ID was given trying do display a file.
-#: actions/file.php:36
 msgid "No notice ID."
 msgstr "Aucun identifiant d’avis."
 
 #. TRANS: Client error displayed when an invalid notice ID was given trying do display a file.
-#: actions/file.php:41
 msgid "No notice."
 msgstr "Aucun avis."
 
 #. TRANS: Client error displayed when trying do display a file for a notice without a file attachement.
-#: actions/file.php:46
 msgid "No attachments."
 msgstr "Aucune pièce jointe."
 
 #. TRANS: Client error displayed when trying do display a file for a notice with file attachements
 #. TRANS: that could not be found.
-#: actions/file.php:58
 msgid "No uploaded attachments."
 msgstr "Aucune pièce jointe importée."
 
 #. TRANS: Client error displayed when subscribing to a remote profile and an unexpected response is received.
-#: actions/finishremotesubscribe.php:69
 msgid "Not expecting this response!"
 msgstr "Réponse inattendue !"
 
 #. TRANS: Client error displayed when subscribing to a remote profile that does not exist.
-#: actions/finishremotesubscribe.php:81
 msgid "User being listened to does not exist."
 msgstr "L’utilisateur suivi n’existe pas."
 
 #. TRANS: Client error displayed when subscribing to a remote profile that is a local profile.
-#: actions/finishremotesubscribe.php:89 actions/remotesubscribe.php:58
 msgid "You can use the local subscription!"
 msgstr "Vous pouvez utiliser l’abonnement local."
 
 #. TRANS: Client error displayed when subscribing to a remote profile that is blocked form subscribing to.
-#: actions/finishremotesubscribe.php:102
 msgid "That user has blocked you from subscribing."
 msgstr "Cet utilisateur vous a empêché de vous inscrire."
 
 #. TRANS: Client error displayed when subscribing to a remote profile without providing an authorised token.
-#: actions/finishremotesubscribe.php:114
 msgid "You are not authorized."
 msgstr "Vous n’êtes pas autorisé."
 
 #. TRANS: Client error displayed when subscribing to a remote profile and conversion of the request token to access token fails.
-#: actions/finishremotesubscribe.php:118
 msgid "Could not convert request token to access token."
 msgstr "Impossible de convertir le jeton de requête en jeton d’accès."
 
 #. TRANS: Client error displayed when subscribing to a remote profile fails because of an unsupported version of the OMB protocol.
-#: actions/finishremotesubscribe.php:124
 msgid "Remote service uses unknown version of OMB protocol."
 msgstr "Le service distant utilise une version inconnue du protocole OMB."
 
 #. TRANS: Server error displayed when subscribing to a remote profile fails because the remote profile could not be updated.
-#: actions/finishremotesubscribe.php:145 lib/oauthstore.php:317
 msgid "Error updating remote profile."
 msgstr "Erreur lors de la mise à jour du profil distant."
 
 #. TRANS: Client error displayed when requesting a non-existent file.
-#: actions/getfile.php:77
 msgid "No such file."
 msgstr "Fichier non trouvé."
 
 #. TRANS: Client error displayed when requesting a file without having read access to it.
-#: actions/getfile.php:82
 msgid "Cannot read file."
 msgstr "Impossible de lire le fichier"
 
 #. TRANS: Client error displayed when trying to assign an invalid role to a user.
-#: actions/grantrole.php:61 actions/revokerole.php:62
 msgid "Invalid role."
 msgstr "Rôle invalide."
 
 #. TRANS: Client error displayed when trying to assign an reserved role to a user.
-#: actions/grantrole.php:66 actions/revokerole.php:66
 msgid "This role is reserved and cannot be set."
 msgstr "Ce rôle est réservé et ne peut pas être défini."
 
 #. TRANS: Client error displayed when trying to assign a role to a user while not being allowed to set roles.
-#: actions/grantrole.php:76
 msgid "You cannot grant user roles on this site."
 msgstr "Vous ne pouvez pas attribuer des rôles aux utilisateurs sur ce site."
 
 #. TRANS: Client error displayed when trying to assign a role to a user that already has that role.
-#: actions/grantrole.php:84
 msgid "User already has this role."
 msgstr "L’utilisateur a déjà ce rôle."
 
 #. TRANS: Client error displayed trying to block a user from a group while not specifying a to be blocked user profile.
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing a profile.
+#. TRANS: Client error displayed when not providing a profile ID on the Make Admin page.
 #. TRANS: Client error displayed trying a change a subscription without providing a profile.
 #. TRANS: Client error displayed when trying to change user options without specifying a user to work on.
-#: actions/groupblock.php:71 actions/groupunblock.php:71
-#: actions/makeadmin.php:71 actions/subedit.php:49
-#: lib/profileformaction.php:79
 msgid "No profile specified."
 msgstr "Aucun profil n’a été spécifié."
 
 #. TRANS: Client error displayed trying to block a user from a group while specifying a non-existing profile.
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing an existing profile.
+#. TRANS: Client error displayed when specifying an invalid profile ID on the Make Admin page.
 #. TRANS: Client error displayed trying a change a subscription for a non-existant profile ID.
 #. TRANS: Client error displayed when trying to change user options without specifying an existing user to work on.
-#: actions/groupblock.php:77 actions/groupunblock.php:77
-#: actions/makeadmin.php:76 actions/subedit.php:57 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:87
 msgid "No profile with that ID."
 msgstr "Aucun profil ne correspond à cet identifiant."
 
 #. TRANS: Client error displayed trying to block a user from a group while not specifying a group to block a profile from.
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing a group.
-#: actions/groupblock.php:83 actions/groupunblock.php:83
-#: actions/makeadmin.php:81
+#. TRANS: Client error displayed when not providing a group ID on the Make Admin page.
 msgid "No group specified."
 msgstr "Aucun groupe n’a été spécifié."
 
 #. TRANS: Client error displayed trying to block a user from a group while not being an admin user.
-#: actions/groupblock.php:95
 msgid "Only an admin can block group members."
 msgstr "Seul un administrateur peut bloquer des membres du groupe."
 
 #. TRANS: Client error displayed trying to block a user from a group while user is already blocked from the given group.
-#: actions/groupblock.php:100
 msgid "User is already blocked from group."
 msgstr "Cet utilisateur est déjà bloqué pour le groupe."
 
 #. TRANS: Client error displayed trying to block a user from a group while user is not a member of given group.
-#: actions/groupblock.php:106
 msgid "User is not a member of group."
 msgstr "L’utilisateur n’est pas membre du groupe."
 
 #. TRANS: Title for block user from group page.
 #. TRANS: Form legend for form to block user from a group.
-#: actions/groupblock.php:141 actions/groupmembers.php:364
 msgid "Block user from group"
 msgstr "Bloquer cet utilisateur du groupe"
 
 #. TRANS: Explanatory text for block user from group form before setting the block.
 #. TRANS: %1$s is that to be blocked user, %2$s is the group the user will be blocked from.
-#: actions/groupblock.php:169
 #, php-format
 msgid ""
 "Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They "
@@ -2989,41 +2395,34 @@ msgstr ""
 "abonner à l’avenir."
 
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
-#: actions/groupblock.php:191
 #, fuzzy
 msgid "Do not block this user from this group."
 msgstr "Ne pas bloquer cet utilisateur pour ce groupe"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
-#: actions/groupblock.php:198
 #, fuzzy
 msgid "Block this user from this group."
 msgstr "Bloquer cet utilisateur de de groupe"
 
 #. TRANS: Server error displayed when trying to block a user from a group fails because of an application error.
-#: actions/groupblock.php:215
 msgid "Database error blocking user from group."
 msgstr ""
 "Erreur de la base de données lors du blocage de l’utilisateur du groupe."
 
 #. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
 #. TRANS: Client error displayed trying to find a user by ID without providing an ID.
-#: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr "Aucun identifiant."
 
 #. TRANS: Client error displayed trying to change group design settings while not logged in.
-#: actions/groupdesignsettings.php:67
 msgid "You must be logged in to edit a group."
 msgstr "Vous devez ouvrir une session pour modifier un groupe."
 
 #. TRANS: Title group design settings page.
-#: actions/groupdesignsettings.php:146
 msgid "Group design"
 msgstr "Conception du groupe"
 
 #. TRANS: Instructions for group design settings page.
-#: actions/groupdesignsettings.php:157
 msgid ""
 "Customize the way your group looks with a background image and a colour "
 "palette of your choice."
@@ -3032,25 +2431,21 @@ msgstr ""
 "une palette de couleurs de votre choix"
 
 #. TRANS: Form validation error displayed when group design settings could not be updated because of an application issue.
-#: actions/groupdesignsettings.php:262
 #, fuzzy
 msgid "Unable to update your design settings."
 msgstr "Impossible de sauvegarder les parmètres de la conception."
 
 #. TRANS: Form text to confirm saved group design settings.
-#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:239
 msgid "Design preferences saved."
 msgstr "Préférences de conception enregistrées."
 
 #. TRANS: Title for group logo settings page.
 #. TRANS: Group logo form legend.
-#: actions/grouplogo.php:144 actions/grouplogo.php:199
 msgid "Group logo"
 msgstr "Logo du groupe"
 
 #. TRANS: Instructions for group logo page.
 #. TRANS: %s is the maximum file size for that site.
-#: actions/grouplogo.php:156
 #, php-format
 msgid ""
 "You can upload a logo image for your group. The maximum file size is %s."
@@ -3059,91 +2454,75 @@ msgstr ""
 "est de %s."
 
 #. TRANS: Submit button for uploading a group logo.
-#: actions/grouplogo.php:243
 msgid "Upload"
 msgstr "Transfert"
 
 #. TRANS: Button text for cropping an uploaded group logo.
-#: actions/grouplogo.php:299
 msgid "Crop"
 msgstr "Recadrer"
 
 #. TRANS: Form instructions on the group logo page.
-#: actions/grouplogo.php:376
 msgid "Pick a square area of the image to be the logo."
 msgstr "Sélectionnez une zone de forme carrée sur l’image qui sera le logo."
 
 #. TRANS: Form success message after updating a group logo.
-#: actions/grouplogo.php:411
 msgid "Logo updated."
 msgstr "Logo mis à jour."
 
 #. TRANS: Form failure message after failing to update a group logo.
-#: actions/grouplogo.php:414
 msgid "Failed updating logo."
 msgstr "La mise à jour du logo a échoué."
 
 #. TRANS: Title of the page showing group members.
 #. TRANS: %s is the name of the group.
-#: actions/groupmembers.php:104
 #, php-format
 msgid "%s group members"
 msgstr "Membres du groupe %s"
 
 #. TRANS: Title of the page showing group members.
 #. TRANS: %1$s is the name of the group, %2$d is the page number of the members list.
-#: actions/groupmembers.php:109
 #, php-format
 msgid "%1$s group members, page %2$d"
 msgstr "Membres du groupe %1$s - page %2$d"
 
 #. TRANS: Page notice for group members page.
-#: actions/groupmembers.php:125
 msgid "A list of the users in this group."
 msgstr "Liste des utilisateurs inscrits à ce groupe."
 
 #. TRANS: Indicator in group members list that this user is a group administrator.
-#: actions/groupmembers.php:190 lib/action.php:581
 msgid "Admin"
 msgstr "Administrer"
 
 #. TRANS: Button text for the form that will block a user from a group.
-#: actions/groupmembers.php:397
 msgctxt "BUTTON"
 msgid "Block"
 msgstr "Bloquer"
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:401
 msgctxt "TOOLTIP"
 msgid "Block this user"
 msgstr "Bloquer cet utilisateur"
 
 #. TRANS: Form legend for form to make a user a group admin.
-#: actions/groupmembers.php:488
 msgid "Make user an admin of the group"
 msgstr "Faire de cet utilisateur un administrateur du groupe"
 
 #. TRANS: Button text for the form that will make a user administrator.
-#: actions/groupmembers.php:521
 msgctxt "BUTTON"
 msgid "Make Admin"
 msgstr "Rendre administrateur"
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:525
 msgctxt "TOOLTIP"
 msgid "Make this user an admin"
 msgstr "Faire de cet utilisateur un administrateur"
 
 #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
-#: actions/grouprss.php:141
 #, php-format
 msgid "Updates from members of %1$s on %2$s!"
 msgstr "Mises à jour des membres de %1$s dans %2$s !"
 
 #. TRANS: Title for first page of the groups list.
-#: actions/groups.php:62
 #, fuzzy
 msgctxt "TITLE"
 msgid "Groups"
@@ -3151,7 +2530,6 @@ msgstr "Groupes"
 
 #. TRANS: Title for all but the first page of the groups list.
 #. TRANS: %d is the page number.
-#: actions/groups.php:66
 #, fuzzy, php-format
 msgctxt "TITLE"
 msgid "Groups, page %d"
@@ -3160,7 +2538,6 @@ msgstr "Groupes - page %d"
 #. TRANS: Page notice of group list. %%%%site.name%%%% is the StatusNet site name,
 #. TRANS: %%%%action.groupsearch%%%% and %%%%action.newgroup%%%% are URLs. Do not change them.
 #. TRANS: This message contains Markdown links in the form [link text](link).
-#: actions/groups.php:95
 #, fuzzy, php-format
 msgid ""
 "%%%%site.name%%%% groups let you find and talk with people of similar "
@@ -3177,12 +2554,10 @@ msgstr ""
 "[créer le vôtre !](%%%%action.newgroup%%%%)"
 
 #. TRANS: Link to create a new group on the group list page.
-#: actions/groups.php:113 actions/usergroups.php:126 lib/groupeditform.php:115
 msgid "Create a new group"
 msgstr "Créer un nouveau groupe"
 
 #. TRANS: Instructions for page where groups can be searched. %%site.name%% is the name of the StatusNet site.
-#: actions/groupsearch.php:53
 #, php-format
 msgid ""
 "Search for groups on %%site.name%% by their name, location, or description. "
@@ -3193,21 +2568,17 @@ msgstr ""
 "contenir au moins 3 caractères."
 
 #. TRANS: Title for page where groups can be searched.
-#: actions/groupsearch.php:60
 msgid "Group search"
 msgstr "Rechercher des groupes"
 
 #. TRANS: Text on page where groups can be searched if no results were found for a query.
 #. TRANS: Text for notice search results is the query had no results.
 #. TRANS: Message on the "People search" page where a query has no results.
-#: actions/groupsearch.php:82 actions/noticesearch.php:122
-#: actions/peoplesearch.php:87
 msgid "No results."
 msgstr "Aucun résultat."
 
 #. TRANS: Additional text on page where groups can be searched if no results were found for a query for a logged in user.
 #. TRANS: This message contains Markdown links in the form [link text](link).
-#: actions/groupsearch.php:87
 #, fuzzy, php-format
 msgid ""
 "If you cannot find the group you're looking for, you can [create it](%%"
@@ -3218,7 +2589,6 @@ msgstr ""
 
 #. TRANS: Additional text on page where groups can be searched if no results were found for a query for a not logged in user.
 #. TRANS: This message contains Markdown links in the form [link text](link).
-#: actions/groupsearch.php:92
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and [create the group](%%"
@@ -3228,30 +2598,25 @@ msgstr ""
 "%action.newgroup%%) vous-même !"
 
 #. TRANS: Client error displayed when trying to unblock a user from a group without being an administrator for the group.
-#: actions/groupunblock.php:95
 msgid "Only an admin can unblock group members."
 msgstr "Seul un administrateur peut débloquer les membres du groupes."
 
 #. TRANS: Client error displayed when trying to unblock a non-blocked user from a group.
-#: actions/groupunblock.php:100
 msgid "User is not blocked from group."
 msgstr "Cet utilisateur n’est pas bloqué du groupe."
 
 #. TRANS: Server error displayed when unblocking a user from a group fails because of an unknown error.
 #. TRANS: Server error displayed when removing a user block.
-#: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "Erreur lors de l’annulation du blocage."
 
 #. TRANS: Title for Instant Messaging settings.
-#: actions/imsettings.php:56
 msgid "IM settings"
 msgstr "Paramètres de messagerie instantanée"
 
 #. 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.
-#: actions/imsettings.php:69
 #, fuzzy, php-format
 msgid ""
 "You can send and receive notices through instant messaging [instant messages]"
@@ -3262,18 +2627,15 @@ msgstr ""
 "dessous."
 
 #. TRANS: Message given in the IM settings if IM is not enabled on the site.
-#: actions/imsettings.php:90
 msgid "IM is not available."
 msgstr "La messagerie instantanée n’est pas disponible."
 
-#: actions/imsettings.php:116
 #, fuzzy, php-format
 msgid "Current confirmed %s address."
 msgstr "Adresse courriel actuellement confirmée."
 
 #. TRANS: Form note in IM settings form.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:128
 #, fuzzy, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your %s account for a message "
@@ -3283,36 +2645,30 @@ msgstr ""
 "Jabber/GTalk pour recevoir de nouvelles instructions. (Avez-vous ajouté %s à "
 "votre liste de contacts ?)"
 
-#: actions/imsettings.php:140
 msgid "IM address"
 msgstr "Adresse de messagerie instantanée"
 
-#: actions/imsettings.php:142
 #, php-format
 msgid "%s screenname."
 msgstr ""
 
 #. TRANS: Header for IM preferences form.
-#: actions/imsettings.php:163
 #, fuzzy
 msgid "IM Preferences"
 msgstr "Préférences de messagerie instantanée"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:174
 #, fuzzy
 msgid "Send me notices"
 msgstr "Envoyer un avis"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:176
 #, fuzzy
 msgid "Post a notice when my status changes."
 msgstr ""
 "Poster un avis chaque fois que mon statut est modifié dans Jabber/GTalk"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:178
 #, fuzzy
 msgid "Send me replies from people I'm not subscribed to."
 msgstr ""
@@ -3320,54 +2676,45 @@ msgstr ""
 "suis pas abonné."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:181
 #, fuzzy
 msgid "Publish a MicroID"
 msgstr "Publier un MicroID pour mon adresse courriel."
 
 #. TRANS: Server error thrown on database error updating IM preferences.
-#: actions/imsettings.php:291
 #, fuzzy
 msgid "Couldn't update IM preferences."
 msgstr "Impossible de mettre à jour l’utilisateur."
 
 #. TRANS: Confirmation message for successful IM preferences save.
 #. TRANS: Confirmation message after saving preferences.
-#: actions/imsettings.php:298 actions/urlsettings.php:244
 msgid "Preferences saved."
 msgstr "Préférences enregistrées"
 
 #. TRANS: Message given saving IM address without having provided one.
-#: actions/imsettings.php:320
 #, fuzzy
 msgid "No screenname."
 msgstr "Aucun pseudo."
 
-#: actions/imsettings.php:325
 #, fuzzy
 msgid "No transport."
 msgstr "Aucun avis."
 
 #. TRANS: Message given saving IM address that cannot be normalised.
-#: actions/imsettings.php:333
 #, fuzzy
 msgid "Cannot normalize that screenname"
 msgstr "Impossible d’utiliser cet identifiant Jabber"
 
 #. TRANS: Message given saving IM address that not valid.
-#: actions/imsettings.php:340
 #, fuzzy
 msgid "Not a valid screenname"
 msgstr "Pseudo invalide."
 
 #. TRANS: Message given saving IM address that is already set for another user.
-#: actions/imsettings.php:344
 #, fuzzy
 msgid "Screenname already belongs to another user."
 msgstr "Identifiant Jabber déjà utilisé par un autre utilisateur."
 
 #. TRANS: Message given saving valid IM address that is to be confirmed.
-#: actions/imsettings.php:369
 #, fuzzy
 msgid "A confirmation code was sent to the IM address you added."
 msgstr ""
@@ -3375,68 +2722,57 @@ msgstr ""
 "instantanée. Vous devez approuver %s pour recevoir des messages."
 
 #. TRANS: Message given canceling IM address confirmation for the wrong IM address.
-#: actions/imsettings.php:396
 msgid "That is the wrong IM address."
 msgstr "Cette adresse de messagerie instantanée est erronée."
 
 #. TRANS: Server error thrown on database error canceling IM address confirmation.
-#: actions/imsettings.php:405
 #, fuzzy
 msgid "Couldn't delete confirmation."
 msgstr "Impossible de supprimer la confirmation de messagerie instantanée."
 
 #. TRANS: Message given after successfully canceling IM address confirmation.
-#: actions/imsettings.php:410
 msgid "IM confirmation cancelled."
 msgstr "Confirmation de messagerie instantanée annulée."
 
 #. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.
-#: actions/imsettings.php:434
 #, fuzzy
 msgid "That is not your screenname."
 msgstr "Ceci n’est pas votre numéro de téléphone."
 
 #. TRANS: Server error thrown on database error removing a registered IM address.
-#: actions/imsettings.php:443
 #, fuzzy
 msgid "Couldn't update user im prefs."
 msgstr "Impossible de mettre à jour le dossier de l’utilisateur."
 
 #. TRANS: Message given after successfully removing a registered Instant Messaging address.
-#: actions/imsettings.php:451
 msgid "The IM address was removed."
 msgstr "L’adresse de messagerie instantanée a été supprimée."
 
 #. TRANS: Title for all but the first page of the inbox page.
 #. TRANS: %1$s is the user's nickname, %2$s is the page number.
-#: actions/inbox.php:59
 #, php-format
 msgid "Inbox for %1$s - page %2$d"
 msgstr "Boîte de réception de %1$s - page %2$d"
 
 #. TRANS: Title for the first page of the inbox page.
 #. TRANS: %s is the user's nickname.
-#: actions/inbox.php:64
 #, php-format
 msgid "Inbox for %s"
 msgstr "Boîte de réception de %s"
 
 #. TRANS: Instructions for user inbox page.
-#: actions/inbox.php:106
 msgid "This is your inbox, which lists your incoming private messages."
 msgstr ""
 "Cette boîte de réception regroupe les messages personnels qui vous sont "
 "envoyés."
 
 #. TRANS: Client error displayed when trying to sent invites while they have been disabled.
-#: actions/invite.php:41
 msgid "Invites have been disabled."
 msgstr "Les invitations ont été désactivées."
 
 #. TRANS: Client error displayed when trying to sent invites while not logged in.
 #. TRANS: %s is the StatusNet site name.
-#: actions/invite.php:45
 #, php-format
 msgid "You must be logged in to invite other users to use %s."
 msgstr ""
@@ -3444,18 +2780,15 @@ msgstr ""
 
 #. TRANS: Form validation message when providing an e-mail address that does not validate.
 #. TRANS: %s is an invalid e-mail address.
-#: actions/invite.php:78
 #, php-format
 msgid "Invalid email address: %s."
 msgstr "Adresse courriel invalide : %s."
 
 #. TRANS: Page title when invitations have been sent.
-#: actions/invite.php:117
 msgid "Invitations sent"
 msgstr "Invitations envoyées"
 
 #. TRANS: Page title when inviting potential users.
-#: actions/invite.php:120
 msgid "Invite new users"
 msgstr "Inviter de nouveaux utilisateurs"
 
@@ -3463,7 +2796,6 @@ msgstr "Inviter de nouveaux utilisateurs"
 #. TRANS: is already subscribed to one or more users with the given e-mail address(es).
 #. TRANS: Plural form is based on the number of reported already subscribed e-mail addresses.
 #. TRANS: Followed by a bullet list.
-#: actions/invite.php:140
 msgid "You are already subscribed to this user:"
 msgid_plural "You are already subscribed to these users:"
 msgstr[0] "Vous êtes déjà abonné à cet utilisateur :"
@@ -3471,7 +2803,6 @@ msgstr[1] "Vous êtes déjà abonné à ces utilisateurs :"
 
 #. TRANS: Used as list item for already subscribed users (%1$s is nickname, %2$s is e-mail address).
 #. TRANS: Used as list item for already registered people (%1$s is nickname, %2$s is e-mail address).
-#: actions/invite.php:146 actions/invite.php:160
 #, php-format
 msgctxt "INVITE"
 msgid "%1$s (%2$s)"
@@ -3480,7 +2811,6 @@ msgstr "%1$s (%2$s)"
 #. TRANS: Message displayed inviting users to use a StatusNet site while the invited user
 #. TRANS: already uses a this StatusNet site. Plural form is based on the number of
 #. TRANS: reported already present people. Followed by a bullet list.
-#: actions/invite.php:154
 msgid "This person is already a user and you were automatically subscribed:"
 msgid_plural ""
 "These people are already users and you were automatically subscribed to them:"
@@ -3494,7 +2824,6 @@ msgstr[1] ""
 #. TRANS: Message displayed inviting users to use a StatusNet site. Plural form is
 #. TRANS: based on the number of invitations sent. Followed by a bullet list of
 #. TRANS: e-mail addresses to which invitations were sent.
-#: actions/invite.php:168
 msgid "Invitation sent to the following person:"
 msgid_plural "Invitations sent to the following people:"
 msgstr[0] "Invitation envoyée à la personne suivante :"
@@ -3502,7 +2831,6 @@ msgstr[1] "Invitations envoyées aux personnes suivantes :"
 
 #. TRANS: Generic message displayed after sending out one or more invitations to
 #. TRANS: people to join a StatusNet site.
-#: actions/invite.php:178
 msgid ""
 "You will be notified when your invitees accept the invitation and register "
 "on the site. Thanks for growing the community!"
@@ -3512,7 +2840,6 @@ msgstr ""
 "communauté !"
 
 #. TRANS: Form instructions.
-#: actions/invite.php:191
 msgid ""
 "Use this form to invite your friends and colleagues to use this service."
 msgstr ""
@@ -3520,28 +2847,24 @@ msgstr ""
 "service."
 
 #. TRANS: Field label for a list of e-mail addresses.
-#: actions/invite.php:218
 msgid "Email addresses"
 msgstr "Adresses courriel"
 
 #. TRANS: Tooltip for field label for a list of e-mail addresses.
-#: actions/invite.php:221
 #, fuzzy
 msgid "Addresses of friends to invite (one per line)."
 msgstr "Adresses d’amis à inviter (un par ligne)"
 
 #. TRANS: Field label for a personal message to send to invitees.
-#: actions/invite.php:225
 msgid "Personal message"
 msgstr "Message personnel"
 
 #. TRANS: Tooltip for field label for a personal message to send to invitees.
-#: actions/invite.php:228
 msgid "Optionally add a personal message to the invitation."
 msgstr "Ajouter un message personnel à l’invitation (optionnel)."
 
 #. TRANS: Send button for inviting friends
-#: actions/invite.php:232
+#. TRANS: Button text for sending notice.
 msgctxt "BUTTON"
 msgid "Send"
 msgstr "Envoyer"
@@ -3549,7 +2872,6 @@ msgstr "Envoyer"
 #. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral
 #. TRANS: singular 3rd-person pronoun in English. %1$s is the inviting user, $2$s is
 #. TRANS: the StatusNet sitename.
-#: actions/invite.php:264
 #, php-format
 msgid "%1$s has invited you to join them on %2$s"
 msgstr "%1$s vous invite à vous inscrire sur %2$s"
@@ -3559,7 +2881,6 @@ msgstr "%1$s vous invite à vous inscrire sur %2$s"
 #. TRANS: StatusNet sitename, %3$s is the site URL, %4$s is the personal message from the
 #. TRANS: inviting user, %s%5 a link to the timeline for the inviting user, %s$6 is a link
 #. TRANS: to register with the StatusNet site.
-#: actions/invite.php:271
 #, php-format
 msgid ""
 "%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -3619,50 +2940,44 @@ msgstr ""
 "Cordialement, %2$s\n"
 
 #. TRANS: Client error displayed when trying to join a group while not logged in.
-#: actions/joingroup.php:59
 msgid "You must be logged in to join a group."
 msgstr "Vous devez ouvrir une session pour rejoindre un groupe."
 
 #. TRANS: Title for join group page after joining.
-#: actions/joingroup.php:148
 #, fuzzy, php-format
 msgctxt "TITLE"
 msgid "%1$s joined group %2$s"
 msgstr "%1$s a rejoint le groupe %2$s"
 
 #. TRANS: Client error displayed when trying to leave a group while not logged in.
-#: actions/leavegroup.php:59
 msgid "You must be logged in to leave a group."
 msgstr "Vous devez ouvrir une session pour quitter un groupe."
 
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
-#: actions/leavegroup.php:103 lib/command.php:398
 msgid "You are not a member of that group."
 msgstr "Vous n’êtes pas membre de ce groupe."
 
 #. TRANS: Title for leave group page after leaving.
-#: actions/leavegroup.php:142
 #, fuzzy, php-format
 msgctxt "TITLE"
 msgid "%1$s left group %2$s"
 msgstr "%1$s a quitté le groupe %2$s"
 
 #. TRANS: User admin panel title
-#: actions/licenseadminpanel.php:55
 msgctxt "TITLE"
 msgid "License"
 msgstr "Licence"
 
-#: actions/licenseadminpanel.php:65
+#. TRANS: Form instructions for the site license admin panel.
 msgid "License for this StatusNet site"
 msgstr "Licence de ce site StatusNet"
 
-#: actions/licenseadminpanel.php:134
+#. TRANS: Client error displayed selecting an invalid license in the license admin panel.
 msgid "Invalid license selection."
 msgstr "Sélection de licence invalide."
 
-#: actions/licenseadminpanel.php:144
+#. TRANS: Client error displayed when not specifying an owner for the all rights reserved license in the license admin panel.
 msgid ""
 "You must specify the owner of the content when using the All Rights Reserved "
 "license."
@@ -3670,136 +2985,137 @@ msgstr ""
 "Vous devez spécifier le propriétaire du contenu lorsque vous utilisez la "
 "licence « Tous droits réservés »."
 
-#: actions/licenseadminpanel.php:151
+#. TRANS: Client error displayed selecting a too long license title in the license admin panel.
 msgid "Invalid license title. Maximum length is 255 characters."
 msgstr "Titre de licence invalide. La taille maximale est de 255 caractères."
 
-#: actions/licenseadminpanel.php:163
+#. TRANS: Client error displayed specifying an invalid license URL in the license admin panel.
 msgid "Invalid license URL."
 msgstr "URL de licence invalide."
 
-#: actions/licenseadminpanel.php:166
+#. TRANS: Client error displayed specifying an invalid license image URL in the license admin panel.
 msgid "Invalid license image URL."
 msgstr "URL d’image de licence invalide."
 
-#: actions/licenseadminpanel.php:174
+#. TRANS: Client error displayed specifying an invalid license URL in the license admin panel.
 msgid "License URL must be blank or a valid URL."
 msgstr "L’URL de la licence doit être vide ou valide."
 
-#: actions/licenseadminpanel.php:182
+#. TRANS: Client error displayed specifying an invalid license image URL in the license admin panel.
 msgid "License image must be blank or valid URL."
 msgstr "L’URL de l’image de la la licence doit être vide ou valide."
 
-#: actions/licenseadminpanel.php:232
+#. TRANS: Form legend in the license admin panel.
 msgid "License selection"
 msgstr "Sélection d’une licence"
 
-#: actions/licenseadminpanel.php:238
+#. TRANS: License option in the license admin panel.
 msgid "Private"
 msgstr "Privé"
 
-#: actions/licenseadminpanel.php:239
+#. TRANS: License option in the license admin panel.
 msgid "All Rights Reserved"
 msgstr "Tous droits réservés"
 
-#: actions/licenseadminpanel.php:240
+#. TRANS: License option in the license admin panel.
 msgid "Creative Commons"
 msgstr "Creative Commons"
 
-#: actions/licenseadminpanel.php:245
+#. TRANS: Dropdown field label in the license admin panel.
 msgid "Type"
 msgstr "Type"
 
-#: actions/licenseadminpanel.php:247
-msgid "Select license"
+#. TRANS: Dropdown field instructions in the license admin panel.
+#, fuzzy
+msgid "Select a license."
 msgstr "Sélectionner une licence"
 
-#: actions/licenseadminpanel.php:261
+#. TRANS: Form legend in the license admin panel.
 msgid "License details"
 msgstr "Détails de la licence"
 
-#: actions/licenseadminpanel.php:267
+#. TRANS: Field label in the license admin panel.
 msgid "Owner"
 msgstr "Propriétaire"
 
-#: actions/licenseadminpanel.php:268
+#. TRANS: Field title in the license admin panel.
 msgid "Name of the owner of the site's content (if applicable)."
 msgstr "Nom du propriétaire du contenu du site (si applicable)."
 
-#: actions/licenseadminpanel.php:276
+#. TRANS: Field label in the license admin panel.
 msgid "License Title"
 msgstr "Titre de la licence"
 
-#: actions/licenseadminpanel.php:277
+#. TRANS: Field title in the license admin panel.
 msgid "The title of the license."
 msgstr "Le titre de la licence."
 
-#: actions/licenseadminpanel.php:285
+#. TRANS: Field label in the license admin panel.
 msgid "License URL"
 msgstr "URL de la licence"
 
-#: actions/licenseadminpanel.php:286
+#. TRANS: Field title in the license admin panel.
 msgid "URL for more information about the license."
 msgstr "URL où obtenir plus d'informations sur la licence."
 
-#: actions/licenseadminpanel.php:293
+#. TRANS: Field label in the license admin panel.
 msgid "License Image URL"
 msgstr "URL de l’image de la licence"
 
-#: actions/licenseadminpanel.php:294
+#. TRANS: Field title in the license admin panel.
 msgid "URL for an image to display with the license."
 msgstr "URL d’une image à afficher avec la licence."
 
-#. TRANS: Submit button title.
-#: actions/licenseadminpanel.php:311 actions/sessionsadminpanel.php:199
-#: actions/siteadminpanel.php:292 actions/snapshotadminpanel.php:245
-#: actions/tagother.php:133 lib/applicationeditform.php:357
-msgid "Save"
-msgstr "Enregistrer"
-
-#: actions/licenseadminpanel.php:311
-msgid "Save license settings"
+#. TRANS: Button title in the license admin panel.
+#, fuzzy
+msgid "Save license settings."
 msgstr "Enregistrer les paramètres de licence"
 
+#. TRANS: Client error displayed when trying to log in while already logged in.
 #. TRANS: Client error displayed trying to use "one time password login" when already logged in.
-#: actions/login.php:97 actions/otp.php:62 actions/register.php:130
 msgid "Already logged in."
 msgstr "Déjà connecté."
 
-#: actions/login.php:125
+#. TRANS: Form validation error displayed when trying to log in with incorrect credentials.
 msgid "Incorrect username or password."
 msgstr "Identifiant ou mot de passe incorrect."
 
+#. TRANS: Server error displayed when during login a server error occurs.
 #. TRANS: Server error displayed when a user object could not be created trying to login using "one time password login".
-#: actions/login.php:131 actions/otp.php:127
 msgid "Error setting user. You are probably not authorized."
 msgstr ""
 "Erreur lors de la mise en place de l’utilisateur. Vous n’y êtes probablement "
 "pas autorisé."
 
-#: actions/login.php:185 actions/login.php:236 lib/action.php:598
+#. TRANS: Page title for login page.
 msgid "Login"
 msgstr "Ouvrir une session"
 
-#: actions/login.php:222
+#. TRANS: Form legend on login page.
 msgid "Login to site"
 msgstr "Ouverture de session"
 
-#: actions/login.php:231 actions/register.php:469
+#. TRANS: Checkbox label label on login page.
 msgid "Remember me"
 msgstr "Se souvenir de moi"
 
-#: actions/login.php:232 actions/register.php:471
+#. TRANS: Checkbox title on login page.
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 "Ouvrir automatiquement ma session à l’avenir (déconseillé pour les "
 "ordinateurs publics ou partagés)"
 
-#: actions/login.php:241
+#. TRANS: Button text for log in on login page.
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Login"
+msgstr "Ouvrir une session"
+
+#. TRANS: Link text for link to "reset password" on login page.
 msgid "Lost or forgotten password?"
 msgstr "Mot de passe perdu ?"
 
-#: actions/login.php:259
+#. TRANS: Form instructions on login page before being able to change user settings.
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -3807,11 +3123,12 @@ msgstr ""
 "Pour des raisons de sécurité, veuillez entrer à nouveau votre identifiant et "
 "votre mot de passe afin d’enregistrer vos préférences."
 
-#: actions/login.php:263
+#. TRANS: Form instructions on login page.
 msgid "Login with your username and password."
 msgstr "Ouvrez une session avec un identifiant et un mot de passe."
 
-#: actions/login.php:266
+#. TRANS: Form instructions on login page. This message contains Markdown links in the form [Link text](Link).
+#. TRANS: %%action.register%% is a link to the registration page.
 #, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -3819,132 +3136,126 @@ msgstr ""
 "Vous n’avez pas encore d’identifiant ? [Créez-vous](%%action.register%%) un "
 "nouveau compte."
 
-#: actions/makeadmin.php:92
+#. TRANS: Client error displayed when trying to make another user admin on the Make Admin page while not an admin.
 msgid "Only an admin can make another user an admin."
 msgstr ""
 "Seul un administrateur peut faire d’un autre utilisateur un administrateur."
 
-#: actions/makeadmin.php:96
+#. TRANS: Client error displayed when trying to make another user admin on the Make Admin page who already is admin.
+#. TRANS: %1$s is the user that is already admin, %2$s is the group user is already admin for.
 #, php-format
 msgid "%1$s is already an admin for group \"%2$s\"."
 msgstr "%1$s est déjà administrateur du groupe « %2$s »."
 
-#: actions/makeadmin.php:133
+#. TRANS: Server error displayed when trying to make another user admin on the Make Admin page fails
+#. TRANS: because the group membership record could not be gotten.
+#. TRANS: %1$s is the to be admin user, %2$s is the group user should be admin for.
 #, php-format
 msgid "Can't get membership record for %1$s in group %2$s."
 msgstr ""
 "Impossible d’obtenir les enregistrements d’appartenance pour %1$s dans le "
 "groupe %2$s."
 
-#: actions/makeadmin.php:146
+#. TRANS: Server error displayed when trying to make another user admin on the Make Admin page fails
+#. TRANS: because the group adminship record coud not be saved properly.
+#. TRANS: %1$s is the to be admin user, %2$s is the group user is already admin for.
 #, php-format
 msgid "Can't make %1$s an admin for group %2$s."
 msgstr "Impossible de rendre %1$s administrateur du groupe %2$s."
 
-#: actions/microsummary.php:69
+#. TRANS: Client error displayed trying to make a micro summary without providing a status.
 msgid "No current status."
 msgstr "Aucun statut actuel."
 
 #. TRANS: This is the title of the form for adding a new application.
-#: actions/newapplication.php:52
 msgid "New application"
 msgstr "Nouvelle application"
 
 #. TRANS: Client error displayed trying to add a new application while not logged in.
-#: actions/newapplication.php:64
 msgid "You must be logged in to register an application."
 msgstr "Vous devez être connecté pour enregistrer une application."
 
 #. TRANS: Form instructions for registering a new application.
-#: actions/newapplication.php:147
 msgid "Use this form to register a new application."
 msgstr "Utilisez ce formulaire pour inscrire une nouvelle application."
 
 #. TRANS: Validation error shown when not providing a source URL in the "New application" form.
-#: actions/newapplication.php:189
 msgid "Source URL is required."
 msgstr "L’URL source est requise."
 
 #. TRANS: Server error displayed when an application could not be registered in the database through the "New application" form.
-#: actions/newapplication.php:279 actions/newapplication.php:289
 msgid "Could not create application."
 msgstr "Impossible de créer l’application."
 
 #. TRANS: Title for form to create a group.
-#: actions/newgroup.php:53
 msgid "New group"
 msgstr "Nouveau groupe"
 
 #. TRANS: Client exception thrown when a user tries to create a group while banned.
-#: actions/newgroup.php:73 classes/User_group.php:485
 #, fuzzy
 msgid "You are not allowed to create groups on this site."
 msgstr "Vous n’êtes pas autorisé à supprimer ce groupe."
 
 #. TRANS: Form instructions for group create form.
-#: actions/newgroup.php:117
 msgid "Use this form to create a new group."
 msgstr "Remplissez les champs ci-dessous pour créer un nouveau groupe :"
 
-#. TRANS: Group create form validation error.
-#: actions/newgroup.php:200
-#, fuzzy
-msgid "Alias cannot be the same as nickname."
-msgstr "L’alias ne peut pas être le même que le pseudo."
-
-#: actions/newmessage.php:71 actions/newmessage.php:234
+#. TRANS: Page title for new direct message page.
+#. TRANS: Page title on page for sending a direct message.
 msgid "New message"
 msgstr "Nouveau message"
 
-#. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
-#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:513
-msgid "You can't send a message to this user."
+#. TRANS: Client error displayed trying to send a direct message to a user while sender and
+#. TRANS: receiver are not subscribed to each other.
+#, fuzzy
+msgid "You cannot send a message to this user."
 msgstr "Vous ne pouvez pas envoyer de messages à cet utilisateur."
 
+#. TRANS: Form validator error displayed trying to send a direct message without content.
+#. TRANS: Client error displayed trying to send a notice without content.
 #. TRANS: Command exception text shown when trying to send a direct message to another user without content.
 #. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
-#: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:490
-#: lib/command.php:593
 msgid "No content!"
 msgstr "Aucun contenu !"
 
-#: actions/newmessage.php:161
+#. TRANS: Form validation error displayed trying to send a direct message without specifying a recipient.
 msgid "No recipient specified."
 msgstr "Aucun destinataire n’a été spécifié."
 
+#. TRANS: Client error displayed trying to send a direct message to self.
 #. TRANS: Error text shown when trying to send a direct message to self.
-#: actions/newmessage.php:167 lib/command.php:517
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
 "N’envoyez pas de message à vous-même ; dites-le plutôt dans votre tête..."
 
-#: actions/newmessage.php:184
+#. TRANS: Page title after sending a direct message.
 msgid "Message sent"
 msgstr "Message envoyé"
 
+#. TRANS: Confirmation text after sending a direct message.
+#. TRANS: %s is the direct message recipient.
 #. TRANS: Message given have sent a direct message to another user.
 #. TRANS: %s is the name of the other user.
-#: actions/newmessage.php:188 lib/command.php:525
 #, php-format
 msgid "Direct message to %s sent."
 msgstr "Message direct envoyé à %s."
 
-#: actions/newmessage.php:213 actions/newnotice.php:264
+#. TRANS: Page title after an AJAX error occurred on the "send direct message" page.
+#. TRANS: Page title after an AJAX error occurs on the send notice page.
 msgid "Ajax Error"
 msgstr "Erreur Ajax"
 
-#: actions/newnotice.php:69
+#. TRANS: Page title for sending a new notice.
 msgid "New notice"
 msgstr "Nouvel avis"
 
-#: actions/newnotice.php:230
+#. TRANS: Page title after sending a notice.
 msgid "Notice posted"
 msgstr "Avis publié"
 
 #. TRANS: Instructions for Notice search page.
 #. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/noticesearch.php:69
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -3954,20 +3265,17 @@ msgstr ""
 "recherche par des espaces. Ils doivent contenir au moins 3 caractères."
 
 #. TRANS: Title of the page where users can search for notices.
-#: actions/noticesearch.php:80
 msgid "Text search"
 msgstr "Recherche de texte"
 
 #. TRANS: Test in RSS notice search.
 #. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearch.php:95
 #, php-format
 msgid "Search results for \"%1$s\" on %2$s"
 msgstr "Résultats de la recherche pour « %1$s » sur %2$s"
 
 #. TRANS: Text for logged in users making a query for notices without results.
 #. TRANS: This message contains a Markdown link.
-#: actions/noticesearch.php:128
 #, php-format
 msgid ""
 "Be the first to [post on this topic](%%%%action.newnotice%%%%?"
@@ -3978,7 +3286,6 @@ msgstr ""
 
 #. TRANS: Text for not logged in users making a query for notices without results.
 #. TRANS: This message contains Markdown links.
-#: actions/noticesearch.php:133
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and be the first to "
@@ -3989,19 +3296,17 @@ msgstr ""
 "s) !"
 
 #. TRANS: RSS notice search feed title. %s is the query.
-#: actions/noticesearchrss.php:95
 #, php-format
 msgid "Updates with \"%s\""
 msgstr "Mises à jour avec « %s »"
 
 #. TRANS: RSS notice search feed description.
 #. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearchrss.php:99
 #, fuzzy, php-format
 msgid "Updates matching search term \"%1$s\" on %2$s."
 msgstr "mises à jour correspondant au(x) terme(s) « %1$s » sur %2$s !"
 
-#: actions/nudge.php:85
+#. TRANS: Client error displayed trying to nudge a user that cannot be nudged.
 msgid ""
 "This user doesn't allow nudges or hasn't confirmed or set their email "
 "address yet."
@@ -4009,61 +3314,52 @@ msgstr ""
 "Cet utilisateur n’accepte pas les clins d’œil ou n’a pas encore validé son "
 "adresse électronique."
 
-#: actions/nudge.php:94
+#. TRANS: Page title after sending a nudge.
 msgid "Nudge sent"
 msgstr "Clin d’œil envoyé"
 
-#: actions/nudge.php:97
+#. TRANS: Confirmation text after sending a nudge.
 msgid "Nudge sent!"
 msgstr "Clin d’œil envoyé !"
 
 #. TRANS: Message displayed to an anonymous user trying to view OAuth application list.
-#: actions/oauthappssettings.php:57
 msgid "You must be logged in to list your applications."
 msgstr "Vous devez être connecté pour lister vos applications."
 
 #. TRANS: Page title for OAuth applications
-#: actions/oauthappssettings.php:73
 msgid "OAuth applications"
 msgstr "Applications OAuth"
 
 #. TRANS: Page instructions for OAuth applications
-#: actions/oauthappssettings.php:85
 msgid "Applications you have registered"
 msgstr "Applications que vous avez enregistré"
 
 #. TRANS: Empty list message on page with OAuth applications.
-#: actions/oauthappssettings.php:138
 #, php-format
 msgid "You have not registered any applications yet."
 msgstr "Vous n’avez encore enregistré aucune application."
 
 #. TRANS: Title for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:69
 msgid "Connected applications"
 msgstr "Applications connectées."
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:80
 msgid "The following connections exist for your account."
 msgstr ""
 "Vous avez autorisé les applications suivantes à se connecter à votre compte."
 
 #. TRANS: Client error when trying to revoke access for an application while not being a user of it.
-#: actions/oauthconnectionssettings.php:165
 msgid "You are not a user of that application."
 msgstr "Vous n’êtes pas un utilisateur de cette application."
 
 #. TRANS: Client error when revoking access has failed for some reason.
 #. TRANS: %s is the application ID revoking access failed for.
-#: actions/oauthconnectionssettings.php:180
 #, php-format
 msgid "Unable to revoke access for application: %s."
 msgstr "Impossible de révoquer l’accès par l’application : %s."
 
 #. TRANS: Success message after revoking access for an application.
 #. TRANS: %1$s is the application name, %2$s is the first part of the user token.
-#: actions/oauthconnectionssettings.php:199
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -4073,14 +3369,12 @@ msgstr ""
 "jeton personnel d’accès commençant par %2$s."
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:210
 msgid "You have not authorized any applications to use your account."
 msgstr "Vous n’avez autorisé aucune application à utiliser votre compte."
 
 #. TRANS: Note for developers in the OAuth connection settings form.
 #. TRANS: This message contains a Markdown link. Do not separate "](".
 #. TRANS: %s is the URL to the OAuth settings.
-#: actions/oauthconnectionssettings.php:230
 #, php-format
 msgid ""
 "Are you a developer? [Register an OAuth client application](%s) to use with "
@@ -4089,442 +3383,361 @@ msgstr ""
 "Êtes-vous un développeur ? [Inscrivez une application cliente OAuth](%s) à "
 "utiliser avec cette instance de StatusNet."
 
-#: actions/oembed.php:64
+#. TRANS: Server error displayed in oEmbed action when path not found.
+#. TRANS: %s is a path.
 #, fuzzy, php-format
 msgid "\"%s\" not found."
 msgstr "Page non trouvée."
 
-#: actions/oembed.php:76
+#. TRANS: Server error displayed in oEmbed action when notice not found.
+#. TRANS: %s is a notice.
 #, fuzzy, php-format
 msgid "Notice %s not found."
 msgstr "L’avis parent correspondant à cette réponse n’a pas été trouvé."
 
-#: actions/oembed.php:80 actions/shownotice.php:100
+#. TRANS: Server error displayed in oEmbed action when notice has not profile.
 msgid "Notice has no profile."
 msgstr "L’avis n’a pas de profil."
 
-#: actions/oembed.php:83 actions/shownotice.php:172
+#. TRANS: oEmbed title. %1$s is the author name, %2$s is the creation date.
 #, php-format
 msgid "%1$s's status on %2$s"
 msgstr "Statut de %1$s sur %2$s"
 
-#: actions/oembed.php:95
+#. TRANS: Server error displayed in oEmbed action when attachment not found.
+#. TRANS: %d is an attachment ID.
 #, fuzzy, php-format
 msgid "Attachment %s not found."
 msgstr "Destinataire non trouvé."
 
-#: actions/oembed.php:136
+#. TRANS: Server error displayed in oEmbed request when a path is not supported.
+#. TRANS: %s is a path.
 #, php-format
 msgid "\"%s\" not supported for oembed requests."
 msgstr ""
 
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
-#: actions/oembed.php:168
 #, php-format
 msgid "Content type %s not supported."
 msgstr "Type de contenu %s non supporté."
 
 #. TRANS: Error message displaying attachments. %s is the site's base URL.
-#: actions/oembed.php:172
 #, php-format
 msgid "Only %s URLs over plain HTTP please."
 msgstr "Veuillez n'utiliser que des URL HTTP complètes en %s."
 
+#. TRANS: Server error displayed in oEmbed action when request specifies an unsupported data format.
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1207
-#: lib/apiaction.php:1234 lib/apiaction.php:1369
 msgid "Not a supported data format."
 msgstr "Format de données non supporté."
 
 #. TRANS: ShortName in the OpenSearch interface when trying to find users.
-#: actions/opensearch.php:64
 msgid "People Search"
 msgstr "Recherche de personnes"
 
-#: actions/opensearch.php:68
+#. TRANS: ShortName in the OpenSearch interface when trying to find notices.
 msgid "Notice Search"
 msgstr "Recherche d’avis"
 
 #. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
-#: actions/otp.php:70
 msgid "No user ID specified."
 msgstr "Aucun identifiant d’utilisateur n’a été spécifié."
 
 #. TRANS: Client error displayed trying to use "one time password login" without specifying a login token.
-#: actions/otp.php:86
 msgid "No login token specified."
 msgstr "Aucun jeton d’identification n’a été spécifié."
 
 #. TRANS: Client error displayed trying to use "one time password login" without requesting a login token.
-#: actions/otp.php:94
 msgid "No login token requested."
 msgstr "Aucun jeton d’identification n’a été demandé."
 
 #. TRANS: Client error displayed trying to use "one time password login" while specifying an invalid login token.
-#: actions/otp.php:100
 msgid "Invalid login token specified."
 msgstr "Jeton d’identification invalide."
 
 #. TRANS: Client error displayed trying to use "one time password login" while specifying an expired login token.
-#: actions/otp.php:110
 msgid "Login token expired."
 msgstr "Jeton d’identification périmé."
 
 #. TRANS: Title for outbox for any but the fist page.
 #. TRANS: %1$s is the user nickname, %2$d is the page number.
-#: actions/outbox.php:57
 #, php-format
 msgid "Outbox for %1$s - page %2$d"
 msgstr "Boîte d’envoi de %1$s - page %2$d"
 
 #. TRANS: Title for first page of outbox.
-#: actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
 msgstr "Boîte d’envoi de %s"
 
 #. TRANS: Instructions for outbox.
-#: actions/outbox.php:103
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr ""
 "Cette boîte d’envoi regroupe les messages personnels que vous avez envoyés."
 
-#: actions/passwordsettings.php:58
 msgid "Change password"
 msgstr "Changer de mot de passe"
 
-#: actions/passwordsettings.php:69
 msgid "Change your password."
 msgstr "Modifier votre mot de passe."
 
 #. TRANS: Fieldset legend for password reset form.
-#: actions/passwordsettings.php:96 actions/recoverpassword.php:251
 msgid "Password change"
 msgstr "Modification du mot de passe"
 
-#: actions/passwordsettings.php:104
 msgid "Old password"
 msgstr "Ancien mot de passe"
 
 #. TRANS: Field label for password reset form.
-#: actions/passwordsettings.php:108 actions/recoverpassword.php:256
 msgid "New password"
 msgstr "Nouveau mot de passe"
 
-#: actions/passwordsettings.php:109 actions/register.php:416
 #, fuzzy
 msgid "6 or more characters."
 msgstr "6 caractères ou plus"
 
 #. TRANS: Ttile for field label for password reset form where the password has to be typed again.
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:264
-#: actions/register.php:420
 #, fuzzy
 msgid "Same as password above."
 msgstr "Identique au mot de passe ci-dessus"
 
-#: actions/passwordsettings.php:117
 msgid "Change"
 msgstr "Modifier"
 
-#: actions/passwordsettings.php:153 actions/register.php:223
 msgid "Password must be 6 or more characters."
 msgstr "Votre mot de passe doit contenir au moins 6 caractères."
 
-#: actions/passwordsettings.php:156 actions/register.php:226
 msgid "Passwords don't match."
 msgstr "Les mots de passe ne correspondent pas."
 
-#: actions/passwordsettings.php:164
 msgid "Incorrect old password"
 msgstr "Ancien mot de passe incorrect"
 
-#: actions/passwordsettings.php:180
 msgid "Error saving user; invalid."
 msgstr "Erreur lors de l’enregistrement de l’utilisateur ; invalide."
 
 #. TRANS: Reset password form validation error message.
-#: actions/passwordsettings.php:185 actions/recoverpassword.php:418
 #, fuzzy
 msgid "Cannot save new password."
 msgstr "Impossible de sauvegarder le nouveau mot de passe."
 
-#: actions/passwordsettings.php:191
 msgid "Password saved."
 msgstr "Mot de passe enregistré."
 
 #. TRANS: Title for Paths admin panel.
 #. TRANS: Menu item for site administration
-#: actions/pathsadminpanel.php:58 lib/adminpanelaction.php:371
 msgid "Paths"
 msgstr "Chemins"
 
 #. TRANS: Form instructions for Path admin panel.
-#: actions/pathsadminpanel.php:69
 msgid "Path and server settings for this StatusNet site"
 msgstr "Paramètres de chemin et serveur pour ce site StatusNet"
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the directory that could not be read from.
-#: actions/pathsadminpanel.php:155
 #, php-format
 msgid "Theme directory not readable: %s."
 msgstr "Dossier des thème non lisible : %s."
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the avatar directory that could not be written to.
-#: actions/pathsadminpanel.php:163
 #, php-format
 msgid "Avatar directory not writable: %s."
 msgstr "Dossier des avatars non inscriptible : %s."
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the background directory that could not be written to.
-#: actions/pathsadminpanel.php:171
 #, php-format
 msgid "Background directory not writable: %s."
 msgstr "Dossier des arrière plans non inscriptible : %s."
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the locales directory that could not be read from.
-#: actions/pathsadminpanel.php:181
 #, php-format
 msgid "Locales directory not readable: %s."
 msgstr "Dossier des paramètres régionaux non lisible : %s."
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the SSL server URL that is too long.
-#: actions/pathsadminpanel.php:189
 msgid "Invalid SSL server. The maximum length is 255 characters."
 msgstr "Serveur SSL invalide. La longueur maximale est de 255 caractères."
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:235 actions/siteadminpanel.php:58
 msgid "Site"
 msgstr "Site"
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:241 actions/pathsadminpanel.php:279
-#: actions/pathsadminpanel.php:370 actions/pathsadminpanel.php:425
 msgid "Server"
 msgstr "Serveur"
 
-#: actions/pathsadminpanel.php:242
 msgid "Site's server hostname."
 msgstr "Nom d’hôte du serveur du site."
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:248 actions/pathsadminpanel.php:288
-#: actions/pathsadminpanel.php:379 actions/pathsadminpanel.php:434
 msgid "Path"
 msgstr "Chemin"
 
-#: actions/pathsadminpanel.php:249
 msgid "Site path."
 msgstr "Chemin du site."
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:255
 msgid "Locale directory"
 msgstr "Dossier des données de localisation"
 
-#: actions/pathsadminpanel.php:256
 msgid "Directory path to locales."
 msgstr "Chemin du dossier vers les paramètres régionaux."
 
 #. TRANS: Checkbox label in Paths admin panel.
-#: actions/pathsadminpanel.php:263
 msgid "Fancy URLs"
 msgstr "Jolies URL"
 
-#: actions/pathsadminpanel.php:265
 msgid "Use fancy (more readable and memorable) URLs?"
 msgstr "Utiliser des jolies URL (plus lisibles et faciles à mémoriser) ?"
 
-#: actions/pathsadminpanel.php:272
 msgid "Theme"
 msgstr "Thème"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:281
 msgid "Server for themes."
 msgstr "Serveur pour les thèmes."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:290
 msgid "Web path to themes."
 msgstr "Chemin d'accès Internet aux thèmes."
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:297 actions/pathsadminpanel.php:388
-#: actions/pathsadminpanel.php:443 actions/pathsadminpanel.php:495
 msgid "SSL server"
 msgstr "Serveur SSL"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:299
 msgid "SSL server for themes (default: SSL server)."
 msgstr "Serveur SSL pour les thèmes (par défaut : serveur SSL)."
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:306 actions/pathsadminpanel.php:397
-#: actions/pathsadminpanel.php:452
 msgid "SSL path"
 msgstr "Chemin d’accès SSL"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:308
 msgid "SSL path to themes (default: /theme/)."
 msgstr "Chemin d’accès SSL aux thèmes (par défaut : /theme/)."
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:315 actions/pathsadminpanel.php:406
-#: actions/pathsadminpanel.php:461
 msgid "Directory"
 msgstr "Répertoire"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:317
 msgid "Directory where themes are located."
 msgstr "Chemin du répertoire où les thèmes sont stockés."
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:326
 msgid "Avatars"
 msgstr "Avatars"
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:333
 msgid "Avatar server"
 msgstr "Serveur d’avatar"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:335
 msgid "Server for avatars."
 msgstr "Serveur pour les avatars."
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:342
 msgid "Avatar path"
 msgstr "Chemin des avatars"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:344
 msgid "Web path to avatars."
 msgstr "Chemin d’accès Internet vers les avatars."
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:351
 msgid "Avatar directory"
 msgstr "Dossier des avatars"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:353
 msgid "Directory where avatars are located."
 msgstr "Le répertoire où les avatars sont stockés."
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:364
 msgid "Backgrounds"
 msgstr "Arrière plans"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:372
 msgid "Server for backgrounds."
 msgstr "Serveur pour les fonds d’écran."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:381
 msgid "Web path to backgrounds."
 msgstr "Chemin d’accès Internet vers les fonds d’écran."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:390
 msgid "Server for backgrounds on SSL pages."
 msgstr "Serveur pour les fonds d’écran sur les pages SSL."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:399
 msgid "Web path to backgrounds on SSL pages."
 msgstr "Chemin d’accès Internet vers les fonds d’écran sur les pages SSL."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:408
 msgid "Directory where backgrounds are located."
 msgstr "Le répertoire où les fonds d’écran sont stockés."
 
 #. TRANS: Fieldset legens in Paths admin panel.
-#: actions/pathsadminpanel.php:419
 msgid "Attachments"
 msgstr "Pièces jointes"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:427
 msgid "Server for attachments."
 msgstr "Serveur pour les pièces jointes."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:436
 msgid "Web path to attachments."
 msgstr "Chemin d’accès Internet vers les pièces jointes."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:445
 msgid "Server for attachments on SSL pages."
 msgstr "Serveur pour les pièces jointes sur les pages SSL."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:454
 msgid "Web path to attachments on SSL pages."
 msgstr "Chemin d’accès Internet vers les pièces jointes sur les pages SSL."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:463
 msgid "Directory where attachments are located."
 msgstr "Le répertoire où les pièces jointes sont stockées."
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:472
 msgid "SSL"
 msgstr "SSL"
 
 #. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
-#: actions/pathsadminpanel.php:477 actions/snapshotadminpanel.php:202
 msgid "Never"
 msgstr "Jamais"
 
 #. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
-#: actions/pathsadminpanel.php:479
 msgid "Sometimes"
 msgstr "Quelquefois"
 
 #. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
-#: actions/pathsadminpanel.php:481
 msgid "Always"
 msgstr "Toujours"
 
-#: actions/pathsadminpanel.php:485
 msgid "Use SSL"
 msgstr "Utiliser SSL"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:487
 msgid "When to use SSL."
 msgstr "Quand utiliser SSL."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:497
 msgid "Server to direct SSL requests to."
 msgstr "Serveur vers lequel diriger les requêtes SSL."
 
 #. TRANS: Button title text to store form data in the Paths admin panel.
-#: actions/pathsadminpanel.php:514
 msgid "Save paths"
 msgstr "Enregistrer les chemins."
 
 #. TRANS: Instructions for the "People search" page.
 #. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/peoplesearch.php:54
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
@@ -4535,57 +3748,46 @@ msgstr ""
 "doivent contenir au moins 3 caractères."
 
 #. TRANS: Title of a page where users can search for other users.
-#: actions/peoplesearch.php:61
 msgid "People search"
 msgstr "Recherche de personnes"
 
-#: actions/peopletag.php:68
 #, php-format
 msgid "Not a valid people tag: %s."
 msgstr "Cette marque est invalide : %s."
 
-#: actions/peopletag.php:142
 #, php-format
 msgid "Users self-tagged with %1$s - page %2$d"
 msgstr "Utilisateurs marqués par eux-mêmes avec %1$s - page %2$d"
 
 #. TRANS: Page title for AJAX form return when a disabling a plugin.
-#: actions/plugindisable.php:69
 msgctxt "plugin"
 msgid "Disabled"
 msgstr ""
 
 #. TRANS: Client error displayed trying to perform any request method other than POST.
 #. TRANS: Do not translate POST.
-#: actions/pluginenable.php:78 actions/subscribe.php:77
 msgid "This action only accepts POST requests."
 msgstr "Cette action n'accepte que les requêtes de type POST."
 
-#: actions/pluginenable.php:102
 #, fuzzy
 msgid "You cannot administer plugins."
 msgstr "Vous ne pouvez pas supprimer des utilisateurs."
 
-#: actions/pluginenable.php:109
 #, fuzzy
 msgid "No such plugin."
 msgstr "Page non trouvée."
 
 #. TRANS: Page title for AJAX form return when enabling a plugin.
-#: actions/pluginenable.php:159
 msgctxt "plugin"
 msgid "Enabled"
 msgstr ""
 
 #. TRANS: Tab and title for plugins admin panel.
 #. TRANS: Menu item for site administration
-#: actions/pluginsadminpanel.php:56 actions/version.php:191
-#: lib/adminpanelaction.php:411
 msgid "Plugins"
 msgstr "Extensions"
 
 #. TRANS: Instructions at top of plugin admin page.
-#: actions/pluginsadminpanel.php:68
 msgid ""
 "Additional plugins can be enabled and configured manually. See the <a href="
 "\"http://status.net/wiki/Plugins\">online plugin documentation</a> for more "
@@ -4593,21 +3795,17 @@ msgid ""
 msgstr ""
 
 #. TRANS: Admin form section header
-#: actions/pluginsadminpanel.php:84
 #, fuzzy
 msgid "Default plugins"
 msgstr "Langue par défaut"
 
-#: actions/pluginsadminpanel.php:106
 msgid ""
 "All default plugins have been disabled from the site's configuration file."
 msgstr ""
 
-#: actions/postnotice.php:95
 msgid "Invalid notice content."
 msgstr "Contenu de l’avis invalide."
 
-#: actions/postnotice.php:101
 #, php-format
 msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’."
 msgstr ""
@@ -4615,12 +3813,10 @@ msgstr ""
 "$s »."
 
 #. TRANS: Page title for profile settings.
-#: actions/profilesettings.php:60
 msgid "Profile settings"
 msgstr "Paramètres du profil"
 
 #. TRANS: Usage instructions for profile settings.
-#: actions/profilesettings.php:71
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
@@ -4628,30 +3824,23 @@ msgstr ""
 "sache plus à votre sujet."
 
 #. TRANS: Profile settings form legend.
-#: actions/profilesettings.php:99
 msgid "Profile information"
 msgstr "Information de profil"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:110 actions/register.php:412
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr "1 à 64 lettres minuscules ou chiffres, sans ponctuation ni espaces."
 
 #. TRANS: Field label in form for profile settings.
-#: actions/profilesettings.php:114 actions/register.php:434
-#: lib/groupeditform.php:150
 msgid "Full name"
 msgstr "Nom complet"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:119 actions/register.php:439
-#: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "Site personnel"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:122 actions/register.php:441
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr ""
 "Adresse URL de votre page personnelle, blogue ou profil sur un autre site."
@@ -4659,7 +3848,6 @@ msgstr ""
 #. TRANS: Tooltip for field label in form for profile settings. Plural
 #. TRANS: is decided by the number of characters available for the
 #. TRANS: biography (%d).
-#: actions/profilesettings.php:130 actions/register.php:450
 #, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4667,41 +3855,31 @@ msgstr[0] "Décrivez-vous avec vos intérêts en %d caractère"
 msgstr[1] "Décrivez-vous avec vos intérêts en %d caractères"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:136 actions/register.php:455
 msgid "Describe yourself and your interests"
 msgstr "Décrivez vous et vos interêts"
 
 #. TRANS: Text area label in form for profile settings where users can provide.
 #. TRANS: their biography.
-#: actions/profilesettings.php:140 actions/register.php:457
 msgid "Bio"
 msgstr "Bio"
 
 #. TRANS: Field label in form for profile settings.
-#: actions/profilesettings.php:146 actions/register.php:462
-#: lib/groupeditform.php:173
 msgid "Location"
 msgstr "Emplacement"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:149
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Indiquez votre emplacement, ex.: « Ville, État (ou région), Pays »"
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:154
 msgid "Share my current location when posting notices"
 msgstr "Partager ma localisation lorsque je poste des avis"
 
 #. TRANS: Field label in form for profile settings.
-#: actions/profilesettings.php:162 actions/tagother.php:128
-#: actions/tagother.php:188 lib/subscriptionlist.php:104
-#: lib/subscriptionlist.php:106
 msgid "Tags"
 msgstr "Balises"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:165
 #, fuzzy
 msgid ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- "
@@ -4711,28 +3889,23 @@ msgstr ""
 "virgules ou des espaces"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:170
 msgid "Language"
 msgstr "Langue"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:172
 #, fuzzy
 msgid "Preferred language."
 msgstr "Langue préférée"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:182
 msgid "Timezone"
 msgstr "Fuseau horaire"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:184
 msgid "What timezone are you normally in?"
 msgstr "Quel est votre fuseau horaire habituel ?"
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:190
 #, fuzzy
 msgid ""
 "Automatically subscribe to whoever subscribes to me (best for non-humans)."
@@ -4743,7 +3916,6 @@ msgstr ""
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Plural form is used based on the maximum number of allowed
 #. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:259 actions/register.php:214
 #, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4751,84 +3923,68 @@ msgstr[0] "La biographie est trop longue (limitée à %d caractère maximum)."
 msgstr[1] "La biographie est trop longue (limitée à %d caractères maximum)."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:270 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr "Aucun fuseau horaire n’a été choisi."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:278
 msgid "Language is too long (maximum 50 characters)."
 msgstr "La langue est trop longue (limitée à 50 caractères maximum)."
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:292
 #, fuzzy, php-format
 msgid "Invalid tag: \"%s\"."
 msgstr "Marque invalide : « %s »"
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:348
 #, fuzzy
 msgid "Could not update user for autosubscribe."
 msgstr "Impossible de mettre à jour l’auto-abonnement."
 
 #. TRANS: Server error thrown when user profile location preference settings could not be updated.
-#: actions/profilesettings.php:406
 #, fuzzy
 msgid "Could not save location prefs."
 msgstr "Impossible d’enregistrer les préférences de localisation."
 
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:428 actions/tagother.php:179
 msgid "Could not save tags."
 msgstr "Impossible d’enregistrer les marques."
 
 #. TRANS: Confirmation shown when user profile settings are saved.
 #. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:437 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "Préférences enregistrées."
 
 #. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
 #. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:484 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "Créer un compte"
 
-#: actions/public.php:83
 #, php-format
 msgid "Beyond the page limit (%s)."
 msgstr "Au-delà de la limite de page (%s)."
 
-#: actions/public.php:92
 msgid "Could not retrieve public stream."
 msgstr "Impossible de récupérer le flux public."
 
-#: actions/public.php:130
 #, php-format
 msgid "Public timeline, page %d"
 msgstr "Flux public - page %d"
 
-#: actions/public.php:132 lib/publicgroupnav.php:79
 msgid "Public timeline"
 msgstr "Flux public"
 
-#: actions/public.php:160
 msgid "Public Stream Feed (RSS 1.0)"
 msgstr "Fil du flux public (RSS 1.0)"
 
-#: actions/public.php:164
 msgid "Public Stream Feed (RSS 2.0)"
 msgstr "Fil du flux public (RSS 2.0)"
 
-#: actions/public.php:168
 msgid "Public Stream Feed (Atom)"
 msgstr "Fil du flux public (Atom)"
 
-#: actions/public.php:188
 #, php-format
 msgid ""
 "This is the public timeline for %%site.name%% but no one has posted anything "
@@ -4837,11 +3993,9 @@ msgstr ""
 "Ceci est la chronologie publique de %%site.name%% mais personne n’a encore "
 "rien posté."
 
-#: actions/public.php:191
 msgid "Be the first to post!"
 msgstr "Soyez le premier à poster !"
 
-#: actions/public.php:195
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post!"
@@ -4849,7 +4003,6 @@ msgstr ""
 "Pourquoi ne pas [créer un compte](%%action.register%%) et être le premier à "
 "poster !"
 
-#: actions/public.php:242
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -4863,7 +4016,6 @@ msgstr ""
 "vous avec vos amis, famille et collègues ! ([Plus d’informations](%%doc.help%"
 "%))"
 
-#: actions/public.php:247
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -4874,19 +4026,16 @@ msgstr ""
 "wiki/Microblog) basé sur le logiciel libre [StatusNet](http://status.net/)."
 
 #. TRANS: Public RSS feed description. %s is the StatusNet site name.
-#: actions/publicrss.php:106
 #, fuzzy, php-format
 msgid "%s updates from everyone."
 msgstr "%s statuts de tout le monde !"
 
 #. TRANS: Title for public tag cloud.
-#: actions/publictagcloud.php:57
 msgid "Public tag cloud"
 msgstr "Nuage de marques public"
 
 #. TRANS: Instructions (more used like an explanation/header).
 #. TRANS: %s is the StatusNet sitename.
-#: actions/publictagcloud.php:65
 #, php-format
 msgid "These are most popular recent tags on %s"
 msgstr "Ces étiquettes récentes sont les plus populaires sur %s"
@@ -4894,7 +4043,6 @@ msgstr "Ces étiquettes récentes sont les plus populaires sur %s"
 #. TRANS: This message contains a Markdown URL. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.
-#: actions/publictagcloud.php:74
 #, php-format
 msgid "No one has posted a notice with a [hashtag](%%doc.tags%%) yet."
 msgstr ""
@@ -4902,7 +4050,6 @@ 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.
-#: actions/publictagcloud.php:79
 msgid "Be the first to post one!"
 msgstr "Soyez le premier à en poster une !"
 
@@ -4911,7 +4058,6 @@ msgstr "Soyez le premier à en poster une !"
 #. TRANS: This message contains a Markdown URL. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.
-#: actions/publictagcloud.php:87
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post "
@@ -4921,43 +4067,35 @@ msgstr ""
 "en poster un !"
 
 #. TRANS: Client error displayed trying to recover password while already logged in.
-#: actions/recoverpassword.php:37
 msgid "You are already logged in!"
 msgstr "Votre session est déjà ouverte !"
 
 #. TRANS: Client error displayed when password recovery code is not correct.
-#: actions/recoverpassword.php:64
 msgid "No such recovery code."
 msgstr "Code de récupération non trouvé."
 
 #. TRANS: Client error displayed when no proper password recovery code was submitted.
-#: actions/recoverpassword.php:69
 msgid "Not a recovery code."
 msgstr "Ceci n’est pas un code de récupération."
 
 #. TRANS: Server error displayed trying to recover password without providing a user.
-#: actions/recoverpassword.php:77
 msgid "Recovery code for unknown user."
 msgstr "Code de récupération d’un utilisateur inconnu."
 
 #. TRANS: Server error displayed removing a password recovery code from the database.
-#: actions/recoverpassword.php:91
 msgid "Error with confirmation code."
 msgstr "Erreur dans le code de confirmation."
 
 #. TRANS: Client error displayed trying to recover password with too old a recovery code.
-#: actions/recoverpassword.php:103
 msgid "This confirmation code is too old. Please start again."
 msgstr "Ce code de validation est périmé. Veuillez recommencer."
 
 #. TRANS: Server error displayed when updating a user's e-mail address in the database fails while recovering a password.
-#: actions/recoverpassword.php:118
 msgid "Could not update user with confirmed email address."
 msgstr ""
 "Impossible de mettre l’utilisateur à jour avec l’adresse courriel confirmée."
 
 #. TRANS: Page notice for password recovery page.
-#: actions/recoverpassword.php:160
 msgid ""
 "If you have forgotten or lost your password, you can get a new one sent to "
 "the email address you have stored in your account."
@@ -4966,100 +4104,82 @@ msgstr ""
 "nouveau qui sera envoyé à votre adresse de courriel définie dans votre "
 "compte."
 
-#: actions/recoverpassword.php:167
 msgid "You have been identified. Enter a new password below."
 msgstr "Vous avez été identifié. Entrez un nouveau mot de passe ci-dessous."
 
 #. TRANS: Fieldset legend for password recovery page.
-#: actions/recoverpassword.php:198
 msgid "Password recovery"
 msgstr "Récupération de mot de passe"
 
 #. TRANS: Field label on password recovery page.
-#: actions/recoverpassword.php:202
 msgid "Nickname or email address"
 msgstr "Pseudo ou adresse de courriel"
 
 #. TRANS: Title for field label on password recovery page.
-#: actions/recoverpassword.php:205
 msgid "Your nickname on this server, or your registered email address."
 msgstr ""
 "Votre pseudo sur ce serveur, ou l’adresse courriel que vous avez enregistrée."
 
 #. TRANS: Field label on password recovery page.
-#: actions/recoverpassword.php:212
 msgid "Recover"
 msgstr "Récupérer"
 
 #. TRANS: Button text on password recovery page.
-#: actions/recoverpassword.php:214
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Recover"
 msgstr "Récupérer"
 
 #. TRANS: Title for password recovery page in password reset mode.
-#: actions/recoverpassword.php:223
 msgid "Reset password"
 msgstr "Réinitialiser le mot de passe"
 
 #. TRANS: Title for password recovery page in password recover mode.
-#: actions/recoverpassword.php:225
 msgid "Recover password"
 msgstr "Récupérer le mot de passe"
 
 #. TRANS: Title for password recovery page in email sent mode.
 #. TRANS: Subject for password recovery e-mail.
-#: actions/recoverpassword.php:227 actions/recoverpassword.php:366
 msgid "Password recovery requested"
 msgstr "Récupération de mot de passe demandée"
 
 #. TRANS: Title for password recovery page in password saved mode.
-#: actions/recoverpassword.php:229
 #, fuzzy
 msgid "Password saved"
 msgstr "Mot de passe enregistré."
 
 #. TRANS: Title for password recovery page when an unknown action has been specified.
-#: actions/recoverpassword.php:232
 msgid "Unknown action"
 msgstr "Action inconnue"
 
 #. TRANS: Title for field label for password reset form.
-#: actions/recoverpassword.php:258
 #, fuzzy
 msgid "6 or more characters, and do not forget it!"
 msgstr "6 caractères ou plus, et ne l’oubliez pas !"
 
 #. TRANS: Button text for password reset form.
 #. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: actions/recoverpassword.php:268 lib/designform.php:145
 msgctxt "BUTTON"
 msgid "Reset"
 msgstr "Réinitialiser"
 
 #. TRANS: Form instructions for password recovery form.
-#: actions/recoverpassword.php:278
 msgid "Enter a nickname or email address."
 msgstr "Entrez un pseudo ou une adresse courriel."
 
 #. TRANS: Information on password recovery form if no known username or e-mail address was specified.
-#: actions/recoverpassword.php:309
 msgid "No user with that email address or username."
 msgstr "Aucun utilisateur trouvé avec ce courriel ou ce nom."
 
 #. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
-#: actions/recoverpassword.php:327
 msgid "No registered email address for that user."
 msgstr "Aucune adresse courriel enregistrée pour cet utilisateur."
 
 #. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
-#: actions/recoverpassword.php:342
 msgid "Error saving address confirmation."
 msgstr "Erreur lors de l’enregistrement de la confirmation du courriel."
 
 #. TRANS: User notification after an e-mail with instructions was sent from the password recovery form.
-#: actions/recoverpassword.php:370
 msgid ""
 "Instructions for recovering your password have been sent to the email "
 "address registered to your account."
@@ -5068,75 +4188,59 @@ msgstr ""
 "l’adresse courriel indiquée dans votre compte."
 
 #. TRANS: Client error displayed when trying to reset as password without providing a user.
-#: actions/recoverpassword.php:391
 msgid "Unexpected password reset."
 msgstr "Réinitialisation inattendue du mot de passe."
 
 #. TRANS: Reset password form validation error message.
-#: actions/recoverpassword.php:400
 msgid "Password must be 6 characters or more."
 msgstr "Le mot de passe doit contenir au moins 6 caractères."
 
 #. TRANS: Reset password form validation error message.
-#: actions/recoverpassword.php:405
 msgid "Password and confirmation do not match."
 msgstr "Le mot de passe et sa confirmation ne correspondent pas."
 
 #. TRANS: Server error displayed when something does wrong with the user object during password reset.
-#: actions/recoverpassword.php:426 actions/register.php:241
 msgid "Error setting user."
 msgstr "Erreur lors de la configuration de l’utilisateur."
 
 #. TRANS: Success message for user after password reset.
-#: actions/recoverpassword.php:434
 msgid "New password successfully saved. You are now logged in."
 msgstr ""
 "Nouveau mot de passe créé avec succès. Votre session est maintenant ouverte."
 
-#: actions/redirecturl.php:70
 #, fuzzy
 msgid "No id parameter"
 msgstr "Aucun argument d’identifiant."
 
-#: actions/redirecturl.php:76
 #, fuzzy, php-format
 msgid "No such file \"%d\""
 msgstr "Fichier non trouvé."
 
-#: actions/register.php:80 actions/register.php:181 actions/register.php:392
 msgid "Sorry, only invited people can register."
 msgstr "Désolé ! Seules les personnes invitées peuvent s’inscrire."
 
-#: actions/register.php:87
 msgid "Sorry, invalid invitation code."
 msgstr "Désolé, code d’invitation invalide."
 
-#: actions/register.php:106
 msgid "Registration successful"
 msgstr "Compte créé avec succès"
 
-#: actions/register.php:108 actions/register.php:490
 msgid "Register"
 msgstr "Créer un compte"
 
-#: actions/register.php:128
 msgid "Registration not allowed."
 msgstr "Inscription non autorisée."
 
-#: actions/register.php:194
 #, fuzzy
 msgid "You cannot register if you don't agree to the license."
 msgstr "Vous ne pouvez pas vous inscrire si vous n’acceptez pas la licence."
 
-#: actions/register.php:203
 msgid "Email address already exists."
 msgstr "Cette adresse courriel est déjà utilisée."
 
-#: actions/register.php:236 actions/register.php:258
 msgid "Invalid username or password."
 msgstr "Identifiant ou mot de passe incorrect."
 
-#: actions/register.php:333
 #, fuzzy
 msgid ""
 "With this form you can create a new account. You can then post notices and "
@@ -5145,29 +4249,23 @@ msgstr ""
 "Avec ce formulaire vous pouvez créer un nouveau compte. Vous pourrez ensuite "
 "poster des avis and et vous relier à des amis et collègues. "
 
-#: actions/register.php:424 actions/register.php:428
-#: actions/siteadminpanel.php:238 lib/settingsnav.php:92
 msgid "Email"
 msgstr "Courriel"
 
-#: actions/register.php:425 actions/register.php:429
 #, fuzzy
 msgid "Used only for updates, announcements, and password recovery."
 msgstr ""
 "Utilisé uniquement pour les mises à jour, les notifications, et la "
 "récupération de mot de passe"
 
-#: actions/register.php:436
 #, fuzzy
 msgid "Longer name, preferably your \"real\" name."
 msgstr "Nom plus long, votre \"vrai\" nom de préférence"
 
-#: actions/register.php:464
 #, fuzzy
 msgid "Where you are, like \"City, State (or Region), Country\"."
 msgstr "Indiquez votre emplacement, ex.: « Ville, État (ou région), Pays »"
 
-#: actions/register.php:503
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
@@ -5175,23 +4273,19 @@ msgstr ""
 "Je comprends que le contenu et les données de %1$s sont privés et "
 "confidentiels."
 
-#: actions/register.php:513
 #, php-format
 msgid "My text and files are copyright by %1$s."
 msgstr "Mon texte et les fichiers sont protégés par copyright par %1$s."
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:517
 msgid "My text and files remain under my own copyright."
 msgstr "Mon texte et les fichiers restent sous mon propre droit d'auteur."
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:520
 msgid "All rights reserved."
 msgstr "Tous droits réservés."
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:525
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -5201,7 +4295,6 @@ msgstr ""
 "données personnelles : mot de passe, adresse électronique, adresse de "
 "messagerie instantanée, numéro de téléphone."
 
-#: actions/register.php:566
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -5235,7 +4328,6 @@ msgstr ""
 "Merci pour votre inscription ! Nous vous souhaitons d’apprécier notre "
 "service."
 
-#: actions/register.php:590
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5243,7 +4335,6 @@ msgstr ""
 "(Vous recevrez bientôt un courriel contenant les instructions pour confirmer "
 "votre adresse.)"
 
-#: actions/remotesubscribe.php:97
 #, php-format
 msgid ""
 "To subscribe, you can [login](%%action.login%%), or [register](%%action."
@@ -5255,111 +4346,86 @@ msgstr ""
 "sur un [site de micro-blogging compatible](%%doc.openmublog%%), entrez l’URL "
 "de votre profil ci-dessous."
 
-#: actions/remotesubscribe.php:111
 msgid "Remote subscribe"
 msgstr "Abonnement à distance"
 
-#: actions/remotesubscribe.php:123
 msgid "Subscribe to a remote user"
 msgstr "S’abonner à un utilisateur distant"
 
-#: actions/remotesubscribe.php:128
 msgid "User nickname"
 msgstr "Pseudo de l’utilisateur"
 
-#: actions/remotesubscribe.php:129
 #, fuzzy
 msgid "Nickname of the user you want to follow."
 msgstr "Pseudo de l’utilisateur que vous voulez suivre"
 
-#: actions/remotesubscribe.php:132
 msgid "Profile URL"
 msgstr "URL du profil"
 
-#: actions/remotesubscribe.php:133
 #, fuzzy
 msgid "URL of your profile on another compatible microblogging service."
 msgstr "URL de votre profil sur un autre service de micro-blogging compatible"
 
 #. TRANS: Link text for link that will subscribe to a remote profile.
-#: actions/remotesubscribe.php:136 lib/subscribeform.php:139
-#: lib/userprofile.php:402
 msgid "Subscribe"
 msgstr "S’abonner"
 
-#: actions/remotesubscribe.php:158
 #, fuzzy
 msgid "Invalid profile URL (bad format)."
 msgstr "URL du profil invalide (mauvais format)"
 
-#: actions/remotesubscribe.php:167
 msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
 msgstr ""
 "URL de profil invalide (aucun document YADIS ou définition XRDS invalide)."
 
-#: actions/remotesubscribe.php:175
 #, fuzzy
 msgid "That is a local profile! Login to subscribe."
 msgstr "Ce profil est local ! Connectez-vous pour vous abonner."
 
-#: actions/remotesubscribe.php:182
 #, fuzzy
 msgid "Could not get a request token."
 msgstr "Impossible d’obtenir un jeton de requête."
 
-#: actions/repeat.php:56
 msgid "Only logged-in users can repeat notices."
 msgstr "Seuls  les utilisateurs identifiés peuvent reprendre des avis."
 
-#: actions/repeat.php:63 actions/repeat.php:70
 msgid "No notice specified."
 msgstr "Aucun avis n’a été spécifié."
 
-#: actions/repeat.php:75
 #, fuzzy
 msgid "You cannot repeat your own notice."
 msgstr "Vous ne pouvez pas reprendre votre propre avis."
 
-#: actions/repeat.php:89
 msgid "You already repeated that notice."
 msgstr "Vous avez déjà repris cet avis."
 
-#: actions/repeat.php:112 lib/noticelist.php:697
 msgid "Repeated"
 msgstr "Repris"
 
-#: actions/repeat.php:117
 msgid "Repeated!"
 msgstr "Repris !"
 
 #. TRANS: RSS reply feed title. %s is a user nickname.
-#: actions/replies.php:126 actions/repliesrss.php:68
-#: lib/personalgroupnav.php:105
 #, php-format
 msgid "Replies to %s"
 msgstr "Réponses à %s"
 
-#: actions/replies.php:128
 #, php-format
 msgid "Replies to %1$s, page %2$d"
 msgstr "Réponses à %1$s, page %2$d"
 
-#: actions/replies.php:145
 #, php-format
 msgid "Replies feed for %s (RSS 1.0)"
 msgstr "Flux des réponses pour %s (RSS 1.0)"
 
-#: actions/replies.php:152
 #, php-format
 msgid "Replies feed for %s (RSS 2.0)"
 msgstr "Flux des réponses pour %s (RSS 2.0)"
 
-#: actions/replies.php:159
 #, php-format
 msgid "Replies feed for %s (Atom)"
 msgstr "Flux des réponses pour %s (Atom)"
 
-#: actions/replies.php:199
 #, php-format
 msgid ""
 "This is the timeline showing replies to %1$s but %2$s hasn't received a "
@@ -5368,7 +4434,6 @@ msgstr ""
 "Ceci est la chronologie des réponses à %1$s mais %2$s n’a encore reçu aucun "
 "avis à son intention."
 
-#: actions/replies.php:204
 #, php-format
 msgid ""
 "You can engage other users in a conversation, subscribe to more people or "
@@ -5378,7 +4443,6 @@ msgstr ""
 "abonner à plus de personnes ou vous [inscrire à des groupes](%%action.groups%"
 "%)."
 
-#: actions/replies.php:206
 #, php-format
 msgid ""
 "You can try to [nudge %1$s](../%2$s) or [post something to them](%%%%action."
@@ -5390,37 +4454,31 @@ msgstr ""
 
 #. TRANS: RSS reply feed description.
 #. TRANS: %1$s is a user nickname, %2$s is the StatusNet site name.
-#: actions/repliesrss.php:74
 #, fuzzy, php-format
 msgid "Replies to %1$s on %2$s."
 msgstr "Réponses à %1$s sur %2$s !"
 
 #. TRANS: Client exception displayed when trying to restore an account while not logged in.
-#: actions/restoreaccount.php:78
 #, fuzzy
 msgid "Only logged-in users can restore their account."
 msgstr "Seuls  les utilisateurs identifiés peuvent reprendre des avis."
 
 #. TRANS: Client exception displayed when trying to restore an account without having restore rights.
-#: actions/restoreaccount.php:83
 #, fuzzy
 msgid "You may not restore your account."
 msgstr "Vous n’avez encore enregistré aucune application."
 
 #. TRANS: Client exception displayed trying to restore an account while something went wrong uploading a file.
 #. TRANS: Client exception. No file; probably just a non-AJAX submission.
-#: actions/restoreaccount.php:121 actions/restoreaccount.php:146
 #, fuzzy
 msgid "No uploaded file."
 msgstr "Importer un fichier"
 
 #. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
-#: actions/restoreaccount.php:129 lib/mediafile.php:194
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
 msgstr "Le fichier importé dépasse le réglage upload_max_filesize de php.ini."
 
 #. TRANS: Client exception.
-#: actions/restoreaccount.php:135 lib/mediafile.php:200
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form."
@@ -5429,146 +4487,118 @@ msgstr ""
 "le formulaire HTML."
 
 #. TRANS: Client exception.
-#: actions/restoreaccount.php:141 lib/mediafile.php:206
 msgid "The uploaded file was only partially uploaded."
 msgstr "Le fichier n’a été que partiellement importé."
 
 #. TRANS: Client exception thrown when a temporary folder is not present to store a file upload.
-#: actions/restoreaccount.php:150 lib/mediafile.php:214
 msgid "Missing a temporary folder."
 msgstr "Un dossier temporaire est manquant."
 
 #. TRANS: Client exception thrown when writing to disk is not possible during a file upload operation.
-#: actions/restoreaccount.php:154 lib/mediafile.php:218
 msgid "Failed to write file to disk."
 msgstr "Impossible d’écrire sur le disque."
 
 #. TRANS: Client exception thrown when a file upload operation has been stopped by an extension.
-#: actions/restoreaccount.php:158 lib/mediafile.php:222
 msgid "File upload stopped by extension."
 msgstr "Import de fichier stoppé par une extension."
 
 #. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
 #. TRANS: Exception thrown when uploading an image fails for an unknown reason.
 #. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
-#: actions/restoreaccount.php:164 lib/imagefile.php:106 lib/mediafile.php:228
 msgid "System error uploading file."
 msgstr "Erreur système lors du transfert du fichier."
 
 #. TRANS: Client exception thrown when a feed is not an Atom feed.
-#: actions/restoreaccount.php:207
 #, fuzzy
 msgid "Not an Atom feed."
 msgstr "Tous les membres"
 
 #. TRANS: Success message when a feed has been restored.
-#: actions/restoreaccount.php:241
 msgid ""
 "Feed has been restored. Your old posts should now appear in search and your "
 "profile page."
 msgstr ""
 
 #. TRANS: Message when a feed restore is in progress.
-#: actions/restoreaccount.php:245
 msgid "Feed will be restored. Please wait a few minutes for results."
 msgstr ""
 
 #. TRANS: Form instructions for feed restore.
-#: actions/restoreaccount.php:342
 msgid ""
 "You can upload a backed-up stream in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format."
 msgstr ""
 
 #. TRANS: Title for submit button to confirm upload of a user backup file for account restore.
-#: actions/restoreaccount.php:373
 #, fuzzy
 msgid "Upload the file"
 msgstr "Importer un fichier"
 
-#: actions/revokerole.php:75
 msgid "You cannot revoke user roles on this site."
 msgstr "Vous ne pouvez pas révoquer les rôles des utilisateurs sur ce site."
 
-#: actions/revokerole.php:82
 msgid "User doesn't have this role."
 msgstr "L'utilisateur ne possède pas ce rôle."
 
-#: actions/rsd.php:142 actions/version.php:159
 msgid "StatusNet"
 msgstr "StatusNet"
 
-#: actions/sandbox.php:65 actions/unsandbox.php:65
 msgid "You cannot sandbox users on this site."
 msgstr ""
 "Vous ne pouvez pas mettre des utilisateur dans le bac à sable sur ce site."
 
-#: actions/sandbox.php:72
 msgid "User is already sandboxed."
 msgstr "L’utilisateur est déjà dans le bac à sable."
 
 #. TRANS: Menu item for site administration
-#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
-#: lib/adminpanelaction.php:379
 msgid "Sessions"
 msgstr "Sessions"
 
-#: actions/sessionsadminpanel.php:65
 msgid "Session settings for this StatusNet site"
 msgstr "Paramètres de session pour ce site StatusNet"
 
-#: actions/sessionsadminpanel.php:175
 msgid "Handle sessions"
 msgstr "Gérer les sessions"
 
-#: actions/sessionsadminpanel.php:177
 msgid "Whether to handle sessions ourselves."
 msgstr "S’il faut gérer les sessions nous-même."
 
-#: actions/sessionsadminpanel.php:181
 msgid "Session debugging"
 msgstr "Déboguage de session"
 
-#: actions/sessionsadminpanel.php:183
 msgid "Turn on debugging output for sessions."
 msgstr "Activer la sortie de déboguage pour les sessions."
 
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
+#. TRANS: Submit button title.
+msgid "Save"
+msgstr "Enregistrer"
+
 msgid "Save site settings"
 msgstr "Sauvegarder les paramètres du site"
 
-#: actions/showapplication.php:78
 msgid "You must be logged in to view an application."
 msgstr "Vous devez être connecté pour voir une application."
 
-#: actions/showapplication.php:151
 msgid "Application profile"
 msgstr "Profil de l’application"
 
-#: actions/showapplication.php:179
 #, php-format
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr "Créé par %1$s - accès %2$s par défaut - %3$d utilisateurs"
 
-#: actions/showapplication.php:189
 msgid "Application actions"
 msgstr "Actions de l’application"
 
-#: actions/showapplication.php:212
 msgid "Reset key & secret"
 msgstr "Réinitialiser la clé et le secret"
 
 #. TRANS: Title of form for deleting a user.
-#: actions/showapplication.php:228 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:64 lib/noticelist.php:678
 msgid "Delete"
 msgstr "Supprimer"
 
-#: actions/showapplication.php:237
 msgid "Application info"
 msgstr "Informations sur l’application"
 
-#: actions/showapplication.php:255
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
@@ -5576,42 +4606,35 @@ msgstr ""
 "Note : Nous utilisons les signatures HMAC-SHA1. Nous n’utilisons pas la "
 "méthode de signature en texte clair."
 
-#: actions/showapplication.php:275
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr "Voulez-vous vraiment réinitialiser votre clé consommateur et secrète ?"
 
 #. TRANS: Title for all but the first page of favourite notices of a user.
 #. TRANS: %1$s is the user for whom the favourite notices are displayed, %2$d is the page number.
-#: actions/showfavorites.php:80
 #, php-format
 msgid "%1$s's favorite notices, page %2$d"
 msgstr "Avis favoris de %1$s, page %2$d"
 
 #. TRANS: Server error displayed when favourite notices could not be retrieved from the database.
-#: actions/showfavorites.php:134
 msgid "Could not retrieve favorite notices."
 msgstr "Impossible d’afficher les favoris."
 
 #. TRANS: Feed link text. %s is a username.
-#: actions/showfavorites.php:172
 #, php-format
 msgid "Feed for favorites of %s (RSS 1.0)"
 msgstr "Flux pour les amis de %s (RSS 1.0)"
 
 #. TRANS: Feed link text. %s is a username.
-#: actions/showfavorites.php:180
 #, php-format
 msgid "Feed for favorites of %s (RSS 2.0)"
 msgstr "Flux pour les amis de %s (RSS 2.0)"
 
 #. TRANS: Feed link text. %s is a username.
-#: actions/showfavorites.php:188
 #, php-format
 msgid "Feed for favorites of %s (Atom)"
 msgstr "Flux pour les amis de %s (Atom)"
 
 #. TRANS: Text displayed instead of favourite notices for the current logged in user that has no favourites.
-#: actions/showfavorites.php:209
 msgid ""
 "You haven't chosen any favorite notices yet. Click the fave button on "
 "notices you like to bookmark them for later or shed a spotlight on them."
@@ -5622,7 +4645,6 @@ msgstr ""
 
 #. TRANS: Text displayed instead of favourite notices for a user that has no favourites while logged in.
 #. TRANS: %s is a username.
-#: actions/showfavorites.php:213
 #, php-format
 msgid ""
 "%s hasn't added any favorite notices yet. Post something interesting they "
@@ -5634,7 +4656,6 @@ msgstr ""
 #. TRANS: Text displayed instead of favourite notices for a user that has no favourites while not logged in.
 #. TRANS: %s is a username, %%%%action.register%%%% is a link to the user registration page.
 #. TRANS: (link text)[link] is a Mark Down link.
-#: actions/showfavorites.php:220
 #, php-format
 msgid ""
 "%s hasn't added any favorite notices yet. Why not [register an account](%%%%"
@@ -5646,64 +4667,53 @@ msgstr ""
 "d’intéressant, qu’il pourrait ajouter à ses favoris :)"
 
 #. TRANS: Page notice for show favourites page.
-#: actions/showfavorites.php:251
 msgid "This is a way to share what you like."
 msgstr "C’est un moyen de partager ce que vous aimez."
 
 #. TRANS: Page title for first group page. %s is a group name.
-#: actions/showgroup.php:75
 #, php-format
 msgid "%s group"
 msgstr "Groupe %s"
 
 #. TRANS: Page title for any but first group page.
 #. TRANS: %1$s is a group name, $2$s is a page number.
-#: actions/showgroup.php:79
 #, php-format
 msgid "%1$s group, page %2$d"
 msgstr "Groupe %1$s, page %2$d"
 
 #. TRANS: Label for group description or group note (dt). Text hidden by default.
-#: actions/showgroup.php:266
 msgid "Note"
 msgstr "Note"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:277 lib/groupeditform.php:180
 msgid "Aliases"
 msgstr "Alias"
 
 #. TRANS: Group actions header (h2). Text hidden by default.
-#: actions/showgroup.php:294
 msgid "Group actions"
 msgstr "Actions du groupe"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:338
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
 msgstr "Fil des avis du groupe %s (RSS 1.0)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:345
 #, php-format
 msgid "Notice feed for %s group (RSS 2.0)"
 msgstr "Fil des avis du groupe %s (RSS 2.0)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:352
 #, php-format
 msgid "Notice feed for %s group (Atom)"
 msgstr "Fil des avis du groupe %s (Atom)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:358
 #, php-format
 msgid "FOAF for %s group"
 msgstr "ami d’un ami pour le groupe %s"
 
 #. TRANS: Header for mini list of group members on a group page (h2).
-#: actions/showgroup.php:395
 msgid "Members"
 msgstr "Membres"
 
@@ -5711,30 +4721,23 @@ msgstr "Membres"
 #. TRANS: Text for user subscription statistics if the user has no subscriptions.
 #. TRANS: Text for user subscriber statistics if user has no subscribers.
 #. TRANS: Text for user user group membership statistics if user is not a member of any group.
-#: actions/showgroup.php:401 lib/profileaction.php:137
-#: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
-#: lib/subscriptionlist.php:123 lib/tagcloudsection.php:71
 msgid "(None)"
 msgstr "(aucun)"
 
 #. TRANS: Link to all group members from mini list of group members if group has more than n members.
-#: actions/showgroup.php:410
 msgid "All members"
 msgstr "Tous les membres"
 
 #. TRANS: Header for group statistics on a group page (h2).
 #. TRANS: H2 text for user statistics.
-#: actions/showgroup.php:441 lib/profileaction.php:205
 msgid "Statistics"
 msgstr "Statistiques"
 
-#: actions/showgroup.php:444
 msgctxt "LABEL"
 msgid "Created"
 msgstr "Créé"
 
 #. TRANS: Label for member count in statistics on group page.
-#: actions/showgroup.php:449
 msgctxt "LABEL"
 msgid "Members"
 msgstr "Membres"
@@ -5743,7 +4746,6 @@ msgstr "Membres"
 #. TRANS: **%s** is the group alias, %%%%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).
-#: actions/showgroup.php:464
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5762,7 +4764,6 @@ 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: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
-#: actions/showgroup.php:474
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5776,17 +4777,14 @@ msgstr ""
 "messages courts à propos de leur vie et leurs intérêts. "
 
 #. TRANS: Header for list of group administrators on a group page (h2).
-#: actions/showgroup.php:503
 msgid "Admins"
 msgstr "Administrateurs"
 
 #. TRANS: Client error displayed requesting a single message that does not exist.
-#: actions/showmessage.php:76
 msgid "No such message."
 msgstr "Message introuvable."
 
 #. TRANS: Client error displayed requesting a single direct message the requesting user was not a party in.
-#: actions/showmessage.php:86
 msgid "Only the sender and recipient may read this message."
 msgstr ""
 "Ce message personnel ne peut être lu que par son expéditeur et son "
@@ -5794,84 +4792,71 @@ msgstr ""
 
 #. TRANS: Page title for single direct message display when viewing user is the sender.
 #. TRANS: %1$s is the addressed user's nickname, $2$s is a timestamp.
-#: actions/showmessage.php:105
 #, php-format
 msgid "Message to %1$s on %2$s"
 msgstr "Message adressé à %1$s le %2$s"
 
 #. TRANS: Page title for single message display.
 #. TRANS: %1$s is the sending user's nickname, $2$s is a timestamp.
-#: actions/showmessage.php:113
 #, php-format
 msgid "Message from %1$s on %2$s"
 msgstr "Message reçu de %1$s le %2$s"
 
-#: actions/shownotice.php:90
 msgid "Notice deleted."
 msgstr "Avis supprimé."
 
 #. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
-#: actions/showstream.php:70
 #, php-format
 msgid "%1$s tagged %2$s"
 msgstr "%1$s a marqué « %2$s »"
 
 #. TRANS: Page title showing tagged notices in one user's stream.
 #. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
-#: actions/showstream.php:74
 #, php-format
 msgid "%1$s tagged %2$s, page %3$d"
 msgstr "%1$s a marqué « %2$s » la page %3$d"
 
 #. TRANS: Extended page title showing tagged notices in one user's stream.
 #. TRANS: %1$s is the username, %2$d is the page number.
-#: actions/showstream.php:82
 #, php-format
 msgid "%1$s, page %2$d"
 msgstr "%1$s, page %2$d"
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %1$s is a user nickname, %2$s is a hashtag.
-#: actions/showstream.php:127
 #, php-format
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
 msgstr "Fil des avis pour %1$s marqués %2$s (RSS 1.0)"
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.
-#: actions/showstream.php:136
 #, php-format
 msgid "Notice feed for %s (RSS 1.0)"
 msgstr "Flux des avis de %s (RSS 1.0)"
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.
-#: actions/showstream.php:145
 #, php-format
 msgid "Notice feed for %s (RSS 2.0)"
 msgstr "Flux des avis de %s (RSS 2.0)"
 
-#: actions/showstream.php:152
 #, php-format
 msgid "Notice feed for %s (Atom)"
 msgstr "Flux des avis de %s (Atom)"
 
 #. TRANS: Title for link to notice feed. FOAF stands for Friend of a Friend.
 #. TRANS: More information at http://www.foaf-project.org. %s is a user nickname.
-#: actions/showstream.php:159
 #, php-format
 msgid "FOAF for %s"
 msgstr "ami d’un ami pour %s"
 
 #. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
-#: actions/showstream.php:205
 #, php-format
 msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr ""
 "Ceci est la chronologie de %1$s mais %1$s n’a rien publié pour le moment."
 
 #. TRANS: Second sentence of empty list message for a stream for the user themselves.
-#: actions/showstream.php:211
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
@@ -5881,7 +4866,6 @@ msgstr ""
 
 #. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:215
 #, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
@@ -5892,7 +4876,6 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:258
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5908,7 +4891,6 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:265
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5920,168 +4902,132 @@ msgstr ""
 "status.net/). "
 
 #. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
-#: actions/showstream.php:322
 #, php-format
 msgid "Repeat of %s"
 msgstr "Reprises de %s"
 
-#: actions/silence.php:65 actions/unsilence.php:65
 msgid "You cannot silence users on this site."
 msgstr "Vous ne pouvez pas réduire des utilisateurs au silence sur ce site."
 
-#: actions/silence.php:72
 msgid "User is already silenced."
 msgstr "Cet utilisateur est déjà réduit au silence."
 
-#: actions/siteadminpanel.php:69
 msgid "Basic settings for this StatusNet site"
 msgstr "Paramètres basiques pour ce site StatusNet"
 
-#: actions/siteadminpanel.php:133
 msgid "Site name must have non-zero length."
 msgstr "Le nom du site ne peut pas être vide."
 
-#: actions/siteadminpanel.php:141
 msgid "You must have a valid contact email address."
 msgstr "Vous devez avoir une adresse électronique de contact valide."
 
-#: actions/siteadminpanel.php:159
 #, php-format
 msgid "Unknown language \"%s\"."
 msgstr "Langue « %s » inconnue."
 
-#: actions/siteadminpanel.php:165
 msgid "Minimum text limit is 0 (unlimited)."
 msgstr "La limite minimale de texte est de 0 caractères (illimité)."
 
-#: actions/siteadminpanel.php:171
 msgid "Dupe limit must be one or more seconds."
 msgstr "La limite de doublon doit être d’une seconde ou plus."
 
-#: actions/siteadminpanel.php:221
 msgid "General"
 msgstr "Général"
 
-#: actions/siteadminpanel.php:224
 msgid "Site name"
 msgstr "Nom du site"
 
-#: actions/siteadminpanel.php:225
 msgid "The name of your site, like \"Yourcompany Microblog\""
 msgstr "Le nom de votre site, comme « Microblog de votre compagnie »"
 
-#: actions/siteadminpanel.php:229
 msgid "Brought by"
 msgstr "Apporté par"
 
-#: actions/siteadminpanel.php:230
 msgid "Text used for credits link in footer of each page"
 msgstr "Texte utilisé pour le lien de crédits au bas de chaque page"
 
-#: actions/siteadminpanel.php:234
 msgid "Brought by URL"
 msgstr "Apporté par URL"
 
-#: actions/siteadminpanel.php:235
 msgid "URL used for credits link in footer of each page"
 msgstr "URL utilisée pour le lien de crédits au bas de chaque page"
 
-#: actions/siteadminpanel.php:239
 msgid "Contact email address for your site"
 msgstr "Adresse de courriel de contact de votre site"
 
-#: actions/siteadminpanel.php:245
 msgid "Local"
 msgstr "Local"
 
-#: actions/siteadminpanel.php:256
 msgid "Default timezone"
 msgstr "Zone horaire par défaut"
 
-#: actions/siteadminpanel.php:257
 msgid "Default timezone for the site; usually UTC."
 msgstr "Zone horaire par défaut pour ce site ; généralement UTC."
 
-#: actions/siteadminpanel.php:262
 msgid "Default language"
 msgstr "Langue par défaut"
 
-#: actions/siteadminpanel.php:263
 msgid "Site language when autodetection from browser settings is not available"
 msgstr ""
 "Langue du site lorsque la détection automatique des paramètres du navigateur "
 "n'est pas disponible"
 
-#: actions/siteadminpanel.php:271
 msgid "Limits"
 msgstr "Limites"
 
-#: actions/siteadminpanel.php:274
 msgid "Text limit"
 msgstr "Limite de texte"
 
-#: actions/siteadminpanel.php:274
 msgid "Maximum number of characters for notices."
 msgstr "Nombre maximal de caractères pour les avis."
 
-#: actions/siteadminpanel.php:278
 msgid "Dupe limit"
 msgstr "Limite de doublons"
 
-#: actions/siteadminpanel.php:278
 msgid "How long users must wait (in seconds) to post the same thing again."
 msgstr ""
 "Combien de temps (en secondes) les utilisateurs doivent attendre pour poster "
 "la même chose de nouveau."
 
 #. TRANS: Page title for site-wide notice tab in admin panel.
-#: actions/sitenoticeadminpanel.php:55
 msgid "Site Notice"
 msgstr "Avis du site"
 
 #. TRANS: Instructions for site-wide notice tab in admin panel.
-#: actions/sitenoticeadminpanel.php:66
 msgid "Edit site-wide message"
 msgstr "Modifier un message portant sur tout le site"
 
 #. TRANS: Server error displayed when saving a site-wide notice was impossible.
-#: actions/sitenoticeadminpanel.php:101
 msgid "Unable to save site notice."
 msgstr "Impossible d'enregistrer l'avis du site."
 
 #. TRANS: Client error displayed when a site-wide notice was longer than allowed.
-#: actions/sitenoticeadminpanel.php:112
 msgid "Maximum length for the site-wide notice is 255 characters."
 msgstr ""
 "La longueur maximale pour l’avis publié sur l’ensemble du site est de 255 "
 "caractères."
 
 #. TRANS: Label for site-wide notice text field in admin panel.
-#: actions/sitenoticeadminpanel.php:176
 msgid "Site notice text"
 msgstr "Texte de l'avis du site"
 
 #. TRANS: Tooltip for site-wide notice text field in admin panel.
-#: actions/sitenoticeadminpanel.php:179
 msgid "Site-wide notice text (255 characters maximum; HTML allowed)"
 msgstr ""
 "Texte de l’avis publié sur l’ensemble du site (maximum 255 caractères ; HTML "
 "autorisé)"
 
 #. TRANS: Title for button to save site notice in admin panel.
-#: actions/sitenoticeadminpanel.php:201
 #, fuzzy
 msgid "Save site notice."
 msgstr "Enregistrer l'avis du site"
 
 #. TRANS: Title for SMS settings.
-#: actions/smssettings.php:56
 msgid "SMS settings"
 msgstr "Paramètres SMS"
 
 #. TRANS: SMS settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/smssettings.php:70
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr ""
@@ -6089,60 +5035,49 @@ msgstr ""
 "name%%."
 
 #. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
-#: actions/smssettings.php:92
 msgid "SMS is not available."
 msgstr "Les SMS ne sont pas disponibles."
 
 #. TRANS: Form legend for SMS settings form.
-#: actions/smssettings.php:106
 msgid "SMS address"
 msgstr "Adresse SMS"
 
 #. TRANS: Form guide in SMS settings form.
-#: actions/smssettings.php:115
 msgid "Current confirmed SMS-enabled phone number."
 msgstr "Numéro de téléphone actuellement confirmé pour recevoir les SMS."
 
 #. TRANS: Form guide in IM settings form.
-#: actions/smssettings.php:128
 msgid "Awaiting confirmation on this phone number."
 msgstr "Numéro de téléphone en attente de confirmation."
 
 #. TRANS: Field label for SMS address input in SMS settings form.
-#: actions/smssettings.php:137
 msgid "Confirmation code"
 msgstr "Code de confirmation"
 
 #. TRANS: Form field instructions in SMS settings form.
-#: actions/smssettings.php:139
 msgid "Enter the code you received on your phone."
 msgstr "Entrez le code que vous avez reçu sur votre téléphone."
 
 #. TRANS: Button label to confirm SMS confirmation code in SMS settings.
-#: actions/smssettings.php:143
 msgctxt "BUTTON"
 msgid "Confirm"
 msgstr "Confirmer"
 
 #. TRANS: Field label for SMS phone number input in SMS settings form.
-#: actions/smssettings.php:148
 msgid "SMS phone number"
 msgstr "Numéro de téléphone pour les SMS"
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
-#: actions/smssettings.php:151
 #, fuzzy
 msgid "Phone number, no punctuation or spaces, with area code."
 msgstr ""
 "Numéro de téléphone, sans ponctuation ni espaces, incluant le code régional"
 
 #. TRANS: Form legend for SMS preferences form.
-#: actions/smssettings.php:190
 msgid "SMS preferences"
 msgstr "Préférences pour les SMS"
 
 #. TRANS: Checkbox label in SMS preferences form.
-#: actions/smssettings.php:196
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
@@ -6151,32 +5086,26 @@ msgstr ""
 "facture de téléphonie mobile."
 
 #. TRANS: Confirmation message for successful SMS preferences save.
-#: actions/smssettings.php:307
 msgid "SMS preferences saved."
 msgstr "Préférences pour les SMS enregistrées."
 
 #. TRANS: Message given saving SMS phone number without having provided one.
-#: actions/smssettings.php:329
 msgid "No phone number."
 msgstr "Aucun numéro de téléphone."
 
 #. TRANS: Message given saving SMS phone number without having selected a carrier.
-#: actions/smssettings.php:335
 msgid "No carrier selected."
 msgstr "Aucun fournisseur sélectionné."
 
 #. TRANS: Message given saving SMS phone number that is already set.
-#: actions/smssettings.php:343
 msgid "That is already your phone number."
 msgstr "Vous utilisez déjà ce numéro de téléphone."
 
 #. TRANS: Message given saving SMS phone number that is already set for another user.
-#: actions/smssettings.php:347
 msgid "That phone number already belongs to another user."
 msgstr "Ce numéro de téléphone est déjà utilisé."
 
 #. TRANS: Message given saving valid SMS phone number that is to be confirmed.
-#: actions/smssettings.php:375
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
 "for the code and instructions on how to use it."
@@ -6186,39 +5115,32 @@ msgstr ""
 "pour son utilisation."
 
 #. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
-#: actions/smssettings.php:403
 msgid "That is the wrong confirmation number."
 msgstr "Ce code de confirmation est incorrect."
 
 #. TRANS: Message given after successfully canceling SMS phone number confirmation.
-#: actions/smssettings.php:417
 msgid "SMS confirmation cancelled."
 msgstr "Confirmation de SMS annulée."
 
 #. TRANS: Message given trying to remove an SMS phone number that is not
 #. TRANS: registered for the active user.
-#: actions/smssettings.php:437
 msgid "That is not your phone number."
 msgstr "Ceci n’est pas votre numéro de téléphone."
 
 #. TRANS: Message given after successfully removing a registered SMS phone number.
-#: actions/smssettings.php:459
 msgid "The SMS phone number was removed."
 msgstr "Le numéro de téléphone pour les SMS a été retiré."
 
 #. TRANS: Label for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:498
 msgid "Mobile carrier"
 msgstr "Fournisseur de téléphonie mobile"
 
 #. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:503
 msgid "Select a carrier"
 msgstr "Sélectionnez un fournisseur de téléphone mobile"
 
 #. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
 #. TRANS: %s is an administrative contact's e-mail address.
-#: actions/smssettings.php:512
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -6229,121 +5151,96 @@ msgstr ""
 "écrivez-nous à %s."
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
-#: actions/smssettings.php:534
 #, fuzzy
 msgid "No code entered."
 msgstr "Aucun code entré"
 
 #. TRANS: Menu item for site administration
-#: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
-#: lib/adminpanelaction.php:395
 msgid "Snapshots"
 msgstr "Instantanés"
 
-#: actions/snapshotadminpanel.php:65
 msgid "Manage snapshot configuration"
 msgstr "Gérer la configuration des instantanés"
 
-#: actions/snapshotadminpanel.php:127
 msgid "Invalid snapshot run value."
 msgstr "Valeur de lancement d’instantanés invalide."
 
-#: actions/snapshotadminpanel.php:133
 msgid "Snapshot frequency must be a number."
 msgstr "La fréquence des instantanés doit être un nombre."
 
-#: actions/snapshotadminpanel.php:144
 msgid "Invalid snapshot report URL."
 msgstr "URL de rapport d’instantanés invalide."
 
-#: actions/snapshotadminpanel.php:200
 msgid "Randomly during web hit"
 msgstr "Au hasard lors des requêtes web"
 
-#: actions/snapshotadminpanel.php:201
 msgid "In a scheduled job"
 msgstr "Dans une tâche programée"
 
-#: actions/snapshotadminpanel.php:206
 msgid "Data snapshots"
 msgstr "Instantanés de données"
 
-#: actions/snapshotadminpanel.php:208
 msgid "When to send statistical data to status.net servers"
 msgstr "Quand envoyer des données statistiques aux serveurs status.net"
 
-#: actions/snapshotadminpanel.php:217
 msgid "Frequency"
 msgstr "Fréquence"
 
-#: actions/snapshotadminpanel.php:218
 msgid "Snapshots will be sent once every N web hits"
 msgstr "Les instantanés seront envoyés une fois tous les N requêtes"
 
-#: actions/snapshotadminpanel.php:226
 msgid "Report URL"
 msgstr "URL de rapport"
 
-#: actions/snapshotadminpanel.php:227
 msgid "Snapshots will be sent to this URL"
 msgstr "Les instantanés seront envoyés à cette URL"
 
-#: actions/snapshotadminpanel.php:248
 msgid "Save snapshot settings"
 msgstr "Sauvegarder les paramètres des instantanés"
 
 #. TRANS: Client error displayed trying a change a subscription for a non-subscribed profile.
-#: actions/subedit.php:75
 msgid "You are not subscribed to that profile."
 msgstr "Vous n’êtes pas abonné(e) à ce profil."
 
 #. TRANS: Server error displayed when updating a subscription fails with a database error.
 #. TRANS: Exception thrown when a subscription could not be stored on the server.
-#: actions/subedit.php:89 classes/Subscription.php:141
 msgid "Could not save subscription."
 msgstr "Impossible d’enregistrer l’abonnement."
 
 #. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
-#: actions/subscribe.php:121
 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
 msgstr ""
 "Vous ne pouvez pas vous abonner  à un profil OMB 0.1 distant par cette "
 "action."
 
 #. TRANS: Page title when subscription succeeded.
-#: actions/subscribe.php:149
 msgid "Subscribed"
 msgstr "Abonné"
 
 #. TRANS: Header for list of subscribers for a user (first page).
 #. TRANS: %s is the user's nickname.
-#: actions/subscribers.php:51
 #, php-format
 msgid "%s subscribers"
 msgstr "Abonnés à %s"
 
 #. TRANS: Header for list of subscribers for a user (not first page).
 #. TRANS: %1$s is the user's nickname, $2$d is the page number.
-#: actions/subscribers.php:55
 #, php-format
 msgid "%1$s subscribers, page %2$d"
 msgstr "Abonnés à %1$s - page %2$d"
 
 #. TRANS: Page notice for page with an overview of all subscribers
 #. TRANS: of the logged in user's own profile.
-#: actions/subscribers.php:68
 msgid "These are the people who listen to your notices."
 msgstr "Ces personnes suivent vos avis."
 
 #. TRANS: Page notice for page with an overview of all subscribers of a user other
 #. TRANS: than the logged in user. %s is the user nickname.
-#: actions/subscribers.php:74
 #, php-format
 msgid "These are the people who listen to %s's notices."
 msgstr "Ces personnes suivent les avis de %s."
 
 #. TRANS: Subscriber list text when the logged in user has no subscribers.
-#: actions/subscribers.php:114
 msgid ""
 "You have no subscribers. Try subscribing to people you know and they might "
 "return the favor."
@@ -6353,7 +5250,6 @@ msgstr ""
 
 #. TRANS: Subscriber list text when looking at the subscribers for a of a user other
 #. TRANS: than the logged in user that has no subscribers. %s is the user nickname.
-#: actions/subscribers.php:118
 #, php-format
 msgid "%s has no subscribers. Want to be the first?"
 msgstr "%s n’a pas d’abonnés. Voulez-vous être le premier ?"
@@ -6363,7 +5259,6 @@ msgstr "%s n’a pas d’abonnés. Voulez-vous être le premier ?"
 #. TRANS: This message contains a Markdown URL. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.
-#: actions/subscribers.php:127
 #, php-format
 msgid ""
 "%s has no subscribers. Why not [register an account](%%%%action.register%%%"
@@ -6374,20 +5269,17 @@ msgstr ""
 
 #. TRANS: Header for subscriptions overview for a user (not first page).
 #. TRANS: %1$s is a user nickname, %2$d is the page number.
-#: actions/subscriptions.php:55
 #, php-format
 msgid "%1$s subscriptions, page %2$d"
 msgstr "Abonnements de %1$s - page %2$d"
 
 #. TRANS: Page notice for page with an overview of all subscriptions
 #. TRANS: of the logged in user's own profile.
-#: actions/subscriptions.php:68
 msgid "These are the people whose notices you listen to."
 msgstr "Vous suivez les avis de ces personnes."
 
 #. TRANS: Page notice for page with an overview of all subscriptions of a user other
 #. TRANS: than the logged in user. %s is the user nickname.
-#: actions/subscriptions.php:74
 #, php-format
 msgid "These are the people whose notices %s listens to."
 msgstr "Les avis de ces personnes sont suivis par %s."
@@ -6396,7 +5288,6 @@ msgstr "Les avis de ces personnes sont suivis par %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.
-#: actions/subscriptions.php:133
 #, php-format
 msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "
@@ -6416,69 +5307,55 @@ msgstr ""
 #. TRANS: than the logged in user that has no subscriptions. %s is the user nickname.
 #. TRANS: Subscription list text when looking at the subscriptions for a of a user that has none
 #. TRANS: as an anonymous user. %s is the user nickname.
-#: actions/subscriptions.php:141 actions/subscriptions.php:147
 #, php-format
 msgid "%s is not listening to anyone."
 msgstr "%s ne suit actuellement personne."
 
 #. TRANS: Atom feed title. %s is a profile nickname.
-#: actions/subscriptions.php:176
 #, fuzzy, php-format
 msgid "Subscription feed for %s (Atom)"
 msgstr "Flux des avis de %s (Atom)"
 
 #. TRANS: Checkbox label for enabling Jabber messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:241 lib/settingsnav.php:110
-#, fuzzy
 msgid "IM"
 msgstr "IM"
 
 #. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:256 lib/settingsnav.php:117
 msgid "SMS"
 msgstr "SMS"
 
 #. TRANS: Title for all but the first page of notices with tags.
 #. TRANS: %1$s is the tag, %2$d is the page number.
-#: actions/tag.php:73
 #, php-format
 msgid "Notices tagged with %1$s, page %2$d"
 msgstr "Avis marqués avec %1$s, page %2$d"
 
-#: actions/tag.php:91
 #, php-format
 msgid "Notice feed for tag %s (RSS 1.0)"
 msgstr "Flux des avis pour la marque %s (RSS 1.0)"
 
-#: actions/tag.php:97
 #, php-format
 msgid "Notice feed for tag %s (RSS 2.0)"
 msgstr "Flux des avis pour la marque %s (RSS 2.0)"
 
-#: actions/tag.php:103
 #, php-format
 msgid "Notice feed for tag %s (Atom)"
 msgstr "Flux des avis pour la marque %s (Atom)"
 
-#: actions/tagother.php:39
 msgid "No ID argument."
 msgstr "Aucun argument d’identifiant."
 
-#: actions/tagother.php:65
 #, php-format
 msgid "Tag %s"
 msgstr "Marque %s"
 
 #. TRANS: H2 for user profile information.
-#: actions/tagother.php:77 lib/userprofile.php:76
 msgid "User profile"
 msgstr "Profil de l’utilisateur"
 
-#: actions/tagother.php:120
 msgid "Tag user"
 msgstr "Marquer l’utilisateur"
 
-#: actions/tagother.php:130
 msgid ""
 "Tags for this user (letters, numbers, -, ., and _), comma- or space- "
 "separated"
@@ -6486,49 +5363,39 @@ msgstr ""
 "Marques pour cet utilisateur (lettres, chiffres, -, ., et _), séparées par "
 "des virgules ou des espaces"
 
-#: actions/tagother.php:157
 #, php-format
 msgid "Invalid tag: \"%s\""
 msgstr "Marque invalide : « %s »"
 
-#: actions/tagother.php:172
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 "Vous pouvez seulement marquer les personnes auxquelles vous êtes abonné(e) "
 "ou qui sont abonnées à vous."
 
-#: actions/tagother.php:215
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
 "Remplissez les champs suivants pour marquer vos abonnés ou vos abonnements."
 
-#: actions/tagrss.php:35
 msgid "No such tag."
 msgstr "Cette marque n’existe pas."
 
 #. TRANS: Client error displayed when trying to unblock a non-blocked user.
-#: actions/unblock.php:59
 msgid "You haven't blocked that user."
 msgstr "Vous n’avez pas bloqué cet utilisateur."
 
-#: actions/unsandbox.php:72
 msgid "User is not sandboxed."
 msgstr "L’utilisateur ne se trouve pas dans le bac à sable."
 
-#: actions/unsilence.php:72
 msgid "User is not silenced."
 msgstr "L’utilisateur n’est pas réduit au silence."
 
-#: actions/unsubscribe.php:77
 msgid "No profile ID in request."
 msgstr "Aucun identifiant de profil dans la requête."
 
-#: actions/unsubscribe.php:98
 msgid "Unsubscribed"
 msgstr "Désabonné"
 
-#: actions/updateprofile.php:64
 #, php-format
 msgid ""
 "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
@@ -6536,175 +5403,140 @@ msgstr ""
 "La licence du flux auquel vous êtes abonné(e), « %1$s », n’est pas compatible "
 "avec la licence du site « %2$s »."
 
-#: actions/urlsettings.php:60
 #, fuzzy
 msgid "URL settings"
 msgstr "Paramètres de messagerie instantanée"
 
 #. TRANS: Instructions for tab "Other" in user profile settings.
-#: actions/urlsettings.php:72
 msgid "Manage various other options."
 msgstr "Autres options à configurer"
 
 #. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
 #. TRANS: user's profile settings. This message has one space at the beginning. Use your
 #. TRANS: language's word separator here if it has one (most likely a single space).
-#: actions/urlsettings.php:115
 msgid " (free service)"
 msgstr " (service libre)"
 
-#: actions/urlsettings.php:121
 #, fuzzy
 msgid "[none]"
 msgstr "Aucun"
 
-#: actions/urlsettings.php:122
 msgid "[internal]"
 msgstr ""
 
 #. TRANS: Label for dropdown with URL shortener services.
-#: actions/urlsettings.php:130
 msgid "Shorten URLs with"
 msgstr "Raccourcir les URL avec"
 
 #. TRANS: Tooltip for for dropdown with URL shortener services.
-#: actions/urlsettings.php:132
 msgid "Automatic shortening service to use."
 msgstr "Sélectionnez un service de réduction d’URL."
 
-#: actions/urlsettings.php:138
 msgid "URL longer than"
 msgstr ""
 
-#: actions/urlsettings.php:141
 msgid "URLs longer than this will be shortened, 0 means always shorten."
 msgstr ""
 
-#: actions/urlsettings.php:145
 msgid "Text longer than"
 msgstr ""
 
-#: actions/urlsettings.php:148
 msgid ""
 "URLs in notices longer than this will be shortened, 0 means always shorten."
 msgstr ""
 
 #. TRANS: Form validation error for form "Other settings" in user profile.
-#: actions/urlsettings.php:180
 msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr "Le service de réduction d’URL est trop long (50 caractères maximum)."
 
-#: actions/urlsettings.php:187
 msgid "Invalid number for max url length."
 msgstr ""
 
-#: actions/urlsettings.php:193
 #, fuzzy
 msgid "Invalid number for max notice length."
 msgstr "Contenu de l’avis invalide."
 
-#: actions/urlsettings.php:238
 msgid "Error saving user URL shortening preferences."
 msgstr ""
 
 #. TRANS: User admin panel title
-#: actions/useradminpanel.php:58
 msgctxt "TITLE"
 msgid "User"
 msgstr "Utilisateur"
 
 #. TRANS: Instruction for user admin panel.
-#: actions/useradminpanel.php:69
 msgid "User settings for this StatusNet site"
 msgstr "Paramètres des utilisateurs pour ce site StatusNet"
 
 #. TRANS: Form validation error in user admin panel when a non-numeric character limit was set.
-#: actions/useradminpanel.php:147
 msgid "Invalid bio limit. Must be numeric."
 msgstr "Limite de bio invalide : doit être numérique."
 
 #. TRANS: Form validation error in user admin panel when welcome text is too long.
-#: actions/useradminpanel.php:154
 msgid "Invalid welcome text. Maximum length is 255 characters."
 msgstr "Texte de bienvenue invalide. La taille maximale est de 255 caractères."
 
 #. TRANS: Client error displayed when trying to set a non-existing user as default subscription for new
 #. TRANS: users in user admin panel. %1$s is the invalid nickname.
-#: actions/useradminpanel.php:166
 #, fuzzy, php-format
 msgid "Invalid default subscripton: \"%1$s\" is not a user."
 msgstr "Abonnement par défaut invalide : « %1$s » n’est pas un utilisateur."
 
-#: actions/useradminpanel.php:215 lib/action.php:565 lib/settingsnav.php:77
-#: lib/subgroupnav.php:81
 msgid "Profile"
 msgstr "Profil"
 
 #. TRANS: Field label in user admin panel for setting the character limit for the bio field.
-#: actions/useradminpanel.php:220
 msgid "Bio Limit"
 msgstr "Limite de bio"
 
 #. TRANS: Tooltip in user admin panel for setting the character limit for the bio field.
-#: actions/useradminpanel.php:222
 msgid "Maximum length of a profile bio in characters."
 msgstr "Longueur maximale de la bio d’un profil en caractères."
 
 #. TRANS: Form legend in user admin panel.
-#: actions/useradminpanel.php:231
 msgid "New users"
 msgstr "Nouveaux utilisateurs"
 
 #. TRANS: Field label in user admin panel for setting new user welcome text.
-#: actions/useradminpanel.php:236
 msgid "New user welcome"
 msgstr "Accueil des nouveaux utilisateurs"
 
 #. TRANS: Tooltip in user admin panel for setting new user welcome text.
-#: actions/useradminpanel.php:238
 msgid "Welcome text for new users (maximum 255 characters)."
 msgstr ""
 "Texte de bienvenue pour les nouveaux utilisateurs (maximum 255 caractères)."
 
 #. TRANS: Field label in user admin panel for setting default subscription for new users.
-#: actions/useradminpanel.php:244
 msgid "Default subscription"
 msgstr "Abonnements par défaut"
 
 #. TRANS: Tooltip in user admin panel for setting default subscription for new users.
-#: actions/useradminpanel.php:246
 msgid "Automatically subscribe new users to this user."
 msgstr "Abonner automatiquement les nouveaux utilisateurs à cet utilisateur."
 
 #. TRANS: Form legend in user admin panel.
-#: actions/useradminpanel.php:256
 msgid "Invitations"
 msgstr "Invitations"
 
 #. TRANS: Field label for checkbox in user admin panel for allowing users to invite friend using site e-mail.
-#: actions/useradminpanel.php:262
 msgid "Invitations enabled"
 msgstr "Invitations activées"
 
 #. TRANS: Tooltip for checkbox in user admin panel for allowing users to invite friend using site e-mail.
-#: actions/useradminpanel.php:265
 msgid "Whether to allow users to invite new users."
 msgstr ""
 "S’il faut autoriser les utilisateurs à inviter de nouveaux utilisateurs."
 
 #. TRANS: Title for button to save user settings in user admin panel.
-#: actions/useradminpanel.php:302
 #, fuzzy
 msgid "Save user settings."
 msgstr "Sauvegarder les paramètres utilisateur"
 
 #. TRANS: Page title.
-#: actions/userauthorization.php:109
 msgid "Authorize subscription"
 msgstr "Autoriser l’abonnement"
 
 #. TRANS: Page notice on "Auhtorize subscription" page.
-#: actions/userauthorization.php:115
 #, fuzzy
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
@@ -6716,42 +5548,35 @@ msgstr ""
 "abonner aux avis de quelqu’un, cliquez « Rejeter »."
 
 #. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:200
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Accept"
 msgstr "Accepter"
 
 #. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:202
 #, fuzzy
 msgid "Subscribe to this user."
 msgstr "S’abonner à cet utilisateur"
 
 #. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:204
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Reject"
 msgstr "Refuser"
 
 #. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:206
 #, fuzzy
 msgid "Reject this subscription."
 msgstr "Rejeter cet abonnement"
 
 #. TRANS: Client error displayed for an empty authorisation request.
-#: actions/userauthorization.php:219
 msgid "No authorization request!"
 msgstr "Pas de requête d’autorisation !"
 
 #. TRANS: Accept message header from Authorise subscription page.
-#: actions/userauthorization.php:242
 msgid "Subscription authorized"
 msgstr "Abonnement autorisé"
 
-#: actions/userauthorization.php:245
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to authorize the "
@@ -6762,11 +5587,9 @@ msgstr ""
 "l’autorisation de l’abonnement. Votre jeton d’abonnement est :"
 
 #. TRANS: Reject message header from Authorise subscription page.
-#: actions/userauthorization.php:256
 msgid "Subscription rejected"
 msgstr "Abonnement refusé"
 
-#: actions/userauthorization.php:259
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to fully reject the "
@@ -6778,21 +5601,18 @@ msgstr ""
 
 #. TRANS: Exception thrown when no valid user is found for an authorisation request.
 #. TRANS: %s is a listener URI.
-#: actions/userauthorization.php:296
 #, fuzzy, php-format
 msgid "Listener URI \"%s\" not found here."
 msgstr "L’URI de l’auditeur ‘%s’ n’a pas été trouvée ici."
 
 #. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
 #. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:303
 #, fuzzy, php-format
 msgid "Listenee URI \"%s\" is too long."
 msgstr "L’URI à laquelle vous vous êtes abonné(e) ‘%s’ est trop longue."
 
 #. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
 #. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:311
 #, fuzzy, php-format
 msgid "Listenee URI \"%s\" is a local user."
 msgstr ""
@@ -6800,14 +5620,12 @@ msgstr ""
 
 #. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
 #. TRANS: %s is a profile URL.
-#: actions/userauthorization.php:329
 #, fuzzy, php-format
 msgid "Profile URL \"%s\" is for a local user."
 msgstr "L’URL du profil ‘%s’ est pour un utilisateur local."
 
 #. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
 #. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
-#: actions/userauthorization.php:339
 #, fuzzy, php-format
 msgid ""
 "Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
@@ -6818,32 +5636,27 @@ msgstr ""
 
 #. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
 #. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:349
 #, fuzzy, php-format
 msgid "Avatar URL \"%s\" is not valid."
 msgstr "L’URL de l’avatar ‘%s’ n’est pas valide."
 
 #. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
 #. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:356
 #, fuzzy, php-format
 msgid "Cannot read avatar URL \"%s\"."
 msgstr "Impossible de lire l’URL de l’avatar « %s »."
 
 #. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
 #. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:363
 #, fuzzy, php-format
 msgid "Wrong image type for avatar URL \"%s\"."
 msgstr "Format d’image invalide pour l’URL de l’avatar « %s »."
 
 #. TRANS: Page title for profile design page.
-#: actions/userdesignsettings.php:74 lib/designsettings.php:61
 msgid "Profile design"
 msgstr "Conception de profil"
 
 #. TRANS: Instructions for profile design page.
-#: actions/userdesignsettings.php:84 lib/designsettings.php:72
 msgid ""
 "Customize the way your profile looks with a background image and a colour "
 "palette of your choice."
@@ -6851,44 +5664,35 @@ msgstr ""
 "Personnalisez l’apparence de votre profil avec une image d’arrière plan et "
 "une palette de couleurs de votre choix."
 
-#: actions/userdesignsettings.php:289
 msgid "Enjoy your hotdog!"
 msgstr "Bon appétit !"
 
-#: actions/userdesignsettings.php:325
 #, fuzzy
 msgid "Design settings"
 msgstr "Sauvegarder les paramètres du site"
 
-#: actions/userdesignsettings.php:340
 msgid "View profile designs"
 msgstr "Afficher les conceptions de profils"
 
-#: actions/userdesignsettings.php:341
 msgid "Show or hide profile designs."
 msgstr "Afficher ou masquer les paramètres de conception."
 
-#: actions/userdesignsettings.php:348
 #, fuzzy
 msgid "Background file"
 msgstr "Arrière plan"
 
 #. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number.
-#: actions/usergroups.php:66
 #, php-format
 msgid "%1$s groups, page %2$d"
 msgstr "Groupes %1$s, page %2$d"
 
-#: actions/usergroups.php:132
 msgid "Search for more groups"
 msgstr "Rechercher pour plus de groupes"
 
-#: actions/usergroups.php:159
 #, php-format
 msgid "%s is not a member of any group."
 msgstr "%s n’est pas membre d’un groupe."
 
-#: actions/usergroups.php:164
 #, php-format
 msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
 msgstr ""
@@ -6900,18 +5704,14 @@ msgstr ""
 #. TRANS: %1$s is a group name, %2$s is a site name.
 #. TRANS: Message is used as a subtitle in atom user notice feed.
 #. TRANS: %1$s is a user name, %2$s is a site name.
-#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:70
-#: lib/atomusernoticefeed.php:95
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr "Statuts de %1$s dans %2$s!"
 
-#: actions/version.php:75
 #, php-format
 msgid "StatusNet %s"
 msgstr "StatusNet %s"
 
-#: actions/version.php:155
 #, php-format
 msgid ""
 "This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
@@ -6920,16 +5720,13 @@ msgstr ""
 "Ce site est propulsé par %1$s, version %2$s, Copyright 2008-2010 StatusNet, "
 "Inc. et ses contributeurs."
 
-#: actions/version.php:163
 msgid "Contributors"
 msgstr "Contributeurs"
 
 #. TRANS: Menu item for site administration
-#: actions/version.php:167 lib/adminpanelaction.php:403
 msgid "License"
 msgstr "Licence"
 
-#: actions/version.php:170
 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 "
@@ -6941,7 +5738,6 @@ msgstr ""
 "GNU Affero telle qu’elle a été publiée par la Free Software Foundation, dans "
 "sa version 3 ou (comme vous le souhaitez) toute version plus récente. "
 
-#: actions/version.php:176
 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 "
@@ -6953,7 +5749,6 @@ msgstr ""
 "D’ADAPTATION À UN BUT PARTICULIER. Pour plus de détails, voir la Licence "
 "Publique Générale GNU Affero."
 
-#: actions/version.php:182
 #, php-format
 msgid ""
 "You should have received a copy of the GNU Affero General Public License "
@@ -6963,52 +5758,42 @@ msgstr ""
 "avec ce programme. Si ce n’est pas le cas, consultez %s."
 
 #. TRANS: Form input field label for application name.
-#: actions/version.php:197 lib/applicationeditform.php:190
 msgid "Name"
 msgstr "Nom"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:885
 msgid "Version"
 msgstr "Version"
 
-#: actions/version.php:199
 msgid "Author(s)"
 msgstr "Auteur(s)"
 
 #. TRANS: Form input field label.
-#: actions/version.php:200 lib/applicationeditform.php:208
-#: lib/groupeditform.php:168
 msgid "Description"
 msgstr "Description"
 
 #. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:164
 msgid "Favor"
 msgstr "Ajouter à mes favoris"
 
 #. TRANS: Ntofication given when a user marks a notice as favorite.
 #. TRANS: %1$s is a user nickname or full name, %2$s is a notice URI.
-#: classes/Fave.php:167
 #, php-format
 msgid "%1$s marked notice %2$s as a favorite."
 msgstr "%1$s a marqué l’avis %2$s comme favori."
 
 #. TRANS: Server exception thrown when a URL cannot be processed.
-#: classes/File.php:162
 #, php-format
 msgid "Cannot process URL '%s'"
 msgstr "Impossible de traiter l’URL « %s »"
 
 #. TRANS: Server exception thrown when... Robin thinks something is impossible!
-#: classes/File.php:194
 msgid "Robin thinks something is impossible."
 msgstr "Robin pense que quelque chose est impossible."
 
 #. 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$s is used for plural.
-#: classes/File.php:210
 #, php-format
 msgid ""
 "No file may be larger than %1$d byte and the file you sent was %2$d bytes. "
@@ -7027,7 +5812,6 @@ msgstr[1] ""
 
 #. TRANS: Message given if an upload would exceed user quota.
 #. TRANS: %d (number) is the user quota in bytes and is used for plural.
-#: classes/File.php:223
 #, php-format
 msgid "A file this large would exceed your user quota of %d byte."
 msgid_plural "A file this large would exceed your user quota of %d bytes."
@@ -7038,7 +5822,6 @@ msgstr[1] ""
 
 #. TRANS: Message given id an upload would exceed a user's monthly quota.
 #. TRANS: $d (number) is the monthly user quota in bytes and is used for plural.
-#: classes/File.php:235
 #, php-format
 msgid "A file this large would exceed your monthly quota of %d byte."
 msgid_plural "A file this large would exceed your monthly quota of %d bytes."
@@ -7046,108 +5829,89 @@ msgstr[0] "Un fichier aussi gros dépasserait votre quota mensuel de %d octet."
 msgstr[1] "Un fichier aussi gros dépasserait votre quota mensuel de %d octets."
 
 #. TRANS: Client exception thrown if a file upload does not have a valid name.
-#: classes/File.php:282 classes/File.php:297
 msgid "Invalid filename."
 msgstr "Nom de fichier non valide."
 
 #. TRANS: Exception thrown when joining a group fails.
-#: classes/Group_member.php:51
 msgid "Group join failed."
 msgstr "L’inscription au groupe a échoué."
 
 #. TRANS: Exception thrown when trying to leave a group the user is not a member of.
-#: classes/Group_member.php:64
 msgid "Not part of group."
 msgstr "N’appartient pas au groupe."
 
 #. TRANS: Exception thrown when trying to leave a group fails.
-#: classes/Group_member.php:72
 msgid "Group leave failed."
 msgstr "La désinscription du groupe a échoué."
 
 #. TRANS: Exception thrown providing an invalid profile ID.
 #. TRANS: %s is the invalid profile ID.
-#: classes/Group_member.php:85
 #, php-format
 msgid "Profile ID %s is invalid."
 msgstr "L’identifiant de profil « %s » est invalide."
 
 #. TRANS: Exception thrown providing an invalid group ID.
 #. TRANS: %s is the invalid group ID.
-#: classes/Group_member.php:98
 #, php-format
 msgid "Group ID %s is invalid."
 msgstr "L’identifiant de groupe %s est invalide."
 
 #. TRANS: Activity title.
-#: classes/Group_member.php:147 lib/joinform.php:114
 msgid "Join"
 msgstr "Rejoindre"
 
 #. TRANS: Success message for subscribe to group attempt through OStatus.
 #. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
-#: classes/Group_member.php:151
 #, php-format
 msgid "%1$s has joined group %2$s."
 msgstr "%1$s a rejoint le groupe %2$s."
 
 #. TRANS: Server exception thrown when updating a local group fails.
-#: classes/Local_group.php:42
 msgid "Could not update local group."
 msgstr "Impossible de mettre à jour le groupe local."
 
 #. TRANS: Exception thrown when trying creating a login token failed.
 #. TRANS: %s is the user nickname for which token creation failed.
-#: classes/Login_token.php:78
 #, php-format
 msgid "Could not create login token for %s"
 msgstr "Impossible de créer le jeton d’identification pour %s"
 
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
-#: classes/Memcached_DataObject.php:556
 msgid "No database name or DSN found anywhere."
 msgstr "Aucun nom de base de données ou DSN trouvé nulle part."
 
 #. TRANS: Client exception thrown when a user tries to send a direct message while being banned from sending them.
-#: classes/Message.php:45
 msgid "You are banned from sending direct messages."
 msgstr "Il vous est interdit d’envoyer des messages directs."
 
 #. TRANS: Message given when a message could not be stored on the server.
-#: classes/Message.php:69
 msgid "Could not insert message."
 msgstr "Impossible d’insérer le message."
 
 #. TRANS: Message given when a message could not be updated on the server.
-#: classes/Message.php:80
 msgid "Could not update message with new URI."
 msgstr "Impossible de mettre à jour le message avec un nouvel URI."
 
 #. TRANS: Server exception thrown when a user profile for a notice cannot be found.
 #. TRANS: %1$d is a profile ID (number), %2$d is a notice ID (number).
-#: classes/Notice.php:98
 #, php-format
 msgid "No such profile (%1$d) for notice (%2$d)."
 msgstr "Impossible de trouver le profil (%1$d) pour l’avis (%2$d)."
 
 #. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:199
 #, php-format
 msgid "Database error inserting hashtag: %s"
 msgstr "Erreur de base de donnée en insérant la marque (hashtag) : %s"
 
 #. TRANS: Client exception thrown if a notice contains too many characters.
-#: classes/Notice.php:279
 msgid "Problem saving notice. Too long."
 msgstr "Problème lors de l’enregistrement de l’avis ; trop long."
 
 #. TRANS: Client exception thrown when trying to save a notice for an unknown user.
-#: classes/Notice.php:284
 msgid "Problem saving notice. Unknown user."
 msgstr "Erreur lors de l’enregistrement de l’avis. Utilisateur inconnu."
 
 #. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
-#: classes/Notice.php:290
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
@@ -7155,7 +5919,6 @@ msgstr ""
 "minutes."
 
 #. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
-#: classes/Notice.php:297
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
 "few minutes."
@@ -7164,42 +5927,35 @@ msgstr ""
 "dans quelques minutes."
 
 #. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:305
 msgid "You are banned from posting notices on this site."
 msgstr "Il vous est interdit de poster des avis sur ce site."
 
 #. TRANS: Server exception thrown when a notice cannot be saved.
 #. TRANS: Server exception thrown when a notice cannot be updated.
-#: classes/Notice.php:372 classes/Notice.php:399
 msgid "Problem saving notice."
 msgstr "Problème lors de l’enregistrement de l’avis."
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:929
 msgid "Bad type provided to saveKnownGroups."
 msgstr "Le type renseigné pour la méthode saveKnownGroups() est incorrect."
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:1028
 msgid "Problem saving group inbox."
 msgstr "Problème lors de l’enregistrement de la boîte de réception du groupe."
 
 #. TRANS: Server exception thrown when a reply cannot be saved.
 #. TRANS: %1$d is a notice ID, %2$d is the ID of the mentioned user.
-#: classes/Notice.php:1144
 #, php-format
 msgid "Could not save reply for %1$d, %2$d."
 msgstr "Impossible d’enregistrer la réponse à %1$d, %2$d."
 
 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1663
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
 
 #. TRANS: Full name of a profile or group followed by nickname in parens
-#: classes/Profile.php:172 classes/User_group.php:242
 #, php-format
 msgctxt "FANCYNAME"
 msgid "%1$s (%2$s)"
@@ -7207,7 +5963,6 @@ msgstr "%1$s (%2$s)"
 
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:779
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
@@ -7216,7 +5971,6 @@ msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:788
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -7224,251 +5978,197 @@ msgstr ""
 "dans la base de données."
 
 #. TRANS: Exception thrown when a right for a non-existing user profile is checked.
-#: classes/Remote_profile.php:54
 msgid "Missing profile."
 msgstr "Profil manquant."
 
 #. TRANS: Exception thrown when a tag cannot be saved.
-#: classes/Status_network.php:338
 msgid "Unable to save tag."
 msgstr "Impossible d’enregistrer l’étiquette."
 
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#: classes/Subscription.php:77 lib/oauthstore.php:482
 msgid "You have been banned from subscribing."
 msgstr "Il vous a été interdit de vous abonner."
 
 #. TRANS: Exception thrown when trying to subscribe while already subscribed.
-#: classes/Subscription.php:82
 msgid "Already subscribed!"
 msgstr "Déjà abonné !"
 
 #. TRANS: Exception thrown when trying to subscribe to a user who has blocked the subscribing user.
-#: classes/Subscription.php:87
 msgid "User has blocked you."
 msgstr "Cet utilisateur vous a bloqué."
 
 #. TRANS: Exception thrown when trying to unsibscribe without a subscription.
-#: classes/Subscription.php:176
 msgid "Not subscribed!"
 msgstr "Pas abonné !"
 
 #. TRANS: Exception thrown when trying to unsubscribe a user from themselves.
-#: classes/Subscription.php:183
 msgid "Could not delete self-subscription."
 msgstr "Impossible de supprimer l’abonnement à soi-même."
 
 #. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
-#: classes/Subscription.php:211
 msgid "Could not delete subscription OMB token."
 msgstr "Impossible de supprimer le jeton OMB de l'abonnement."
 
 #. TRANS: Exception thrown when a subscription could not be deleted on the server.
-#: classes/Subscription.php:223
 msgid "Could not delete subscription."
 msgstr "Impossible de supprimer l’abonnement"
 
 #. TRANS: Activity tile when subscribing to another person.
-#: classes/Subscription.php:265
 msgid "Follow"
 msgstr "Suivre"
 
 #. TRANS: Notification given when one person starts following another.
 #. TRANS: %1$s is the subscriber, %2$s is the subscribed.
-#: classes/Subscription.php:268
 #, php-format
 msgid "%1$s is now following %2$s."
 msgstr "%1$s suit à présent %2$s."
 
 #. TRANS: Notice given on user registration.
 #. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:390
 #, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr "Bienvenue à %1$s, @%2$s !"
 
 #. TRANS: Server exception.
-#: classes/User.php:923
 msgid "No single user defined for single-user mode."
 msgstr "Aucun utilisateur unique défini pour le mode mono-utilisateur."
 
 #. TRANS: Server exception.
-#: classes/User.php:927
 msgid "Single-user mode code called when not enabled."
 msgstr "Code en mode mono-utilisateur appelé quand ce n’est pas autorisé."
 
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:522
 msgid "Could not create group."
 msgstr "Impossible de créer le groupe."
 
 #. TRANS: Server exception thrown when updating a group URI failed.
-#: classes/User_group.php:532
 msgid "Could not set group URI."
 msgstr "Impossible de définir l'URI du groupe."
 
 #. TRANS: Server exception thrown when setting group membership failed.
-#: classes/User_group.php:555
 msgid "Could not set group membership."
 msgstr "Impossible d’établir l’inscription au groupe."
 
 #. TRANS: Server exception thrown when saving local group information failed.
-#: classes/User_group.php:570
 msgid "Could not save local group info."
 msgstr "Impossible d’enregistrer les informations du groupe local."
 
 #. TRANS: Exception thrown when an account could not be located when it should be moved.
 #. TRANS: %s is the remote site.
-#: lib/accountmover.php:65
 #, fuzzy, php-format
 msgid "Cannot locate account %s."
 msgstr "Vous ne pouvez pas supprimer des utilisateurs."
 
 #. TRANS: Exception thrown when a service document could not be located account move.
 #. TRANS: %s is the remote site.
-#: lib/accountmover.php:106
 #, php-format
 msgid "Cannot find XRD for %s."
 msgstr ""
 
 #. TRANS: Exception thrown when an account could not be located when it should be moved.
 #. TRANS: %s is the remote site.
-#: lib/accountmover.php:131
 #, php-format
 msgid "No AtomPub API service for %s."
 msgstr ""
 
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: lib/action.php:161
 #, php-format
 msgid "%1$s - %2$s"
 msgstr "%1$s - %2$s"
 
 #. TRANS: Page title for a page without a title set.
-#: lib/action.php:177
 msgid "Untitled page"
 msgstr "Page sans nom"
 
 #. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.
-#: lib/action.php:325
 msgctxt "TOOLTIP"
 msgid "Show more"
 msgstr "Voir davantage"
 
 #. TRANS: Inline reply form submit button: submits a reply comment.
-#: lib/action.php:328
 #, fuzzy
 msgctxt "BUTTON"
-msgid "Comment"
-msgstr "Contenu"
+msgid "Reply"
+msgstr "Répondre"
 
 #. TRANS: Placeholder text for inline reply form. Clicking in this box will turn it into a mini notice form.
-#: lib/action.php:331
-msgid "Add a comment..."
+msgid "Write a reply..."
 msgstr ""
 
-#: lib/action.php:559 lib/personalgroupnav.php:99
-#, fuzzy
 msgid "Home"
 msgstr "Site personnel"
 
-#: lib/action.php:560
 #, fuzzy
 msgid "Friends timeline"
 msgstr "Activité de %s"
 
-#: lib/action.php:566
-#, fuzzy
 msgid "Your profile"
-msgstr "Profil du groupe"
+msgstr "Votre profil"
 
-#: lib/action.php:570 lib/action.php:593 lib/publicgroupnav.php:78
 msgid "Public"
 msgstr "Public"
 
-#: lib/action.php:571 lib/action.php:594
 #, fuzzy
 msgid "Everyone on this site"
 msgstr "Chercher des personnes sur ce site"
 
-#: lib/action.php:575
-#, fuzzy
 msgid "Settings"
 msgstr "Paramètres SMS"
 
-#: lib/action.php:576
 #, fuzzy
 msgid "Change your personal settings"
 msgstr "Modifier vos paramètres de profil"
 
-#: lib/action.php:582
 #, fuzzy
 msgid "Site configuration"
 msgstr "Configuration utilisateur"
 
-#: lib/action.php:587
-#, fuzzy
 msgid "Logout"
 msgstr "Déconnexion"
 
-#: lib/action.php:588
-#, fuzzy
 msgid "Logout from the site"
 msgstr "Fermer la session"
 
-#: lib/action.php:599
-#, fuzzy
 msgid "Login to the site"
 msgstr "Ouvrir une session"
 
-#: lib/action.php:606
-#, fuzzy
 msgid "Search"
 msgstr "Rechercher"
 
-#: lib/action.php:607
 #, fuzzy
 msgid "Search the site"
 msgstr "Rechercher sur le site"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:864
 msgid "Help"
 msgstr "Aide"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:867
 msgid "About"
 msgstr "À propos"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:870
 msgid "FAQ"
 msgstr "FAQ"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:875
 msgid "TOS"
 msgstr "CGU"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:879
 msgid "Privacy"
 msgstr "Confidentialité"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:882
 msgid "Source"
 msgstr "Source"
 
 #. TRANS: Secondary navigation menu option leading to e-mail contact information on the
 #. TRANS: StatusNet site, where to report bugs, ...
-#: lib/action.php:889
 msgid "Contact"
 msgstr "Contact"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:892
 msgid "Badge"
 msgstr "Insigne"
 
@@ -7476,7 +6176,6 @@ msgstr "Insigne"
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:921
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7486,7 +6185,6 @@ msgstr ""
 "%site.broughtby%%](%%site.broughtbyurl%%)."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:924
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** est un service de micro-blogging."
@@ -7495,7 +6193,6 @@ msgstr "**%%site.name%%** est un service de micro-blogging."
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:931
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7508,14 +6205,12 @@ msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:949
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr "Le contenu et les données de %1$s sont privés et confidentiels."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:956
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
@@ -7523,7 +6218,6 @@ msgstr ""
 "réservés."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:960
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 "Le contenu et les données sont sous le droit d’auteur du contributeur. Tous "
@@ -7531,7 +6225,6 @@ msgstr ""
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:992
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
@@ -7539,80 +6232,66 @@ msgstr ""
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1335
 msgid "After"
 msgstr "Après"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1345
 msgid "Before"
 msgstr "Avant"
 
 #. TRANS: Client exception thrown when a feed instance is a DOMDocument.
-#: lib/activity.php:125
 msgid "Expecting a root feed element but got a whole XML document."
 msgstr "Attendait un élément racine mais a reçu tout un document XML."
 
 #. TRANS: Client exception thrown when using an unknown verb for the activity importer.
-#: lib/activityimporter.php:81
 #, fuzzy, php-format
 msgid "Unknown verb: \"%s\"."
 msgstr "Langue « %s » inconnue."
 
 #. TRANS: Client exception thrown when trying to force a subscription for an untrusted user.
-#: lib/activityimporter.php:107
 msgid "Cannot force subscription for untrusted user."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to for a remote user to subscribe.
-#: lib/activityimporter.php:117
 #, fuzzy
 msgid "Cannot force remote user to subscribe."
 msgstr "Indiquez le nom de l’utilisateur auquel vous souhaitez vous abonner."
 
 #. TRANS: Client exception thrown when trying to subscribe to an unknown profile.
-#: lib/activityimporter.php:132
 #, fuzzy
 msgid "Unknown profile."
 msgstr "Type de fichier inconnu"
 
 #. TRANS: Client exception thrown when trying to import an event not related to the importing user.
-#: lib/activityimporter.php:138
 msgid "This activity seems unrelated to our user."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to join a remote group that is not a group.
-#: lib/activityimporter.php:154
 msgid "Remote profile is not a group!"
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to join a group the importing user is already a member of.
-#: lib/activityimporter.php:163
 #, fuzzy
 msgid "User is already a member of this group."
 msgstr "Vous êtes déjà membre de ce groupe."
 
 #. TRANS: Client exception thrown when trying to import a notice by another user.
 #. TRANS: %1$s is the source URI of the notice, %2$s is the URI of the author.
-#: lib/activityimporter.php:201
 #, php-format
 msgid "Already know about notice %1$s and  it has a different author %2$s."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to overwrite the author information for a non-trusted user during import.
-#: lib/activityimporter.php:207
 msgid "Not overwriting author info for non-trusted user."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to import a notice without content.
 #. TRANS: %s is the notice URI.
-#: lib/activityimporter.php:223
 #, fuzzy, php-format
 msgid "No content for notice %s."
 msgstr "Chercher dans le contenu des avis"
 
-#: lib/activitymover.php:84
 #, fuzzy, php-format
 msgid "No such user %s."
 msgstr "Utilisateur non trouvé."
@@ -7623,171 +6302,139 @@ msgstr "Utilisateur non trouvé."
 #. TRANS: %1$s is a URL, %2$s is the status, %s$s is the fail reason.
 #. TRANS: Exception thrown when post to collection fails with a status that is not handled.
 #. TRANS: %1$s is a URL, %2$s is the status, %s$s is the fail reason.
-#: lib/activitysink.php:163 lib/activitysink.php:167 lib/activitysink.php:172
 #, fuzzy, php-format
 msgctxt "URLSTATUSREASON"
 msgid "%1$s %2$s %3$s"
 msgstr "%1$s - %2$s"
 
 #. TRANS: Client exception thrown when there is no source attribute.
-#: lib/activityutils.php:200
 msgid "Can't handle remote content yet."
 msgstr "Impossible de gérer le contenu distant pour le moment."
 
 #. TRANS: Client exception thrown when there embedded XML content is found that cannot be processed yet.
-#: lib/activityutils.php:237
 msgid "Can't handle embedded XML content yet."
 msgstr "Impossible de gérer le contenu XML embarqué pour le moment."
 
 #. TRANS: Client exception thrown when base64 encoded content is found that cannot be processed yet.
-#: lib/activityutils.php:242
 msgid "Can't handle embedded Base64 content yet."
 msgstr "Impossible de gérer le contenu en Base64 embarqué pour le moment."
 
 #. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights.
-#: lib/adminpanelaction.php:96
 msgid "You cannot make changes to this site."
 msgstr "Vous ne pouvez pas faire de modifications sur ce site."
 
 #. TRANS: Client error message throw when a certain panel's settings cannot be changed.
-#: lib/adminpanelaction.php:108
 msgid "Changes to that panel are not allowed."
 msgstr "La modification de ce panneau n’est pas autorisée."
 
 #. TRANS: Client error message.
-#: lib/adminpanelaction.php:222
 msgid "showForm() not implemented."
 msgstr "showForm() n’a pas été implémentée."
 
 #. TRANS: Client error message
-#: lib/adminpanelaction.php:250
 msgid "saveSettings() not implemented."
 msgstr "saveSettings() n’a pas été implémentée."
 
 #. TRANS: Client error message thrown if design settings could not be deleted in
 #. TRANS: the admin panel Design.
-#: lib/adminpanelaction.php:274
 msgid "Unable to delete design setting."
 msgstr "Impossible de supprimer les paramètres de conception."
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:337
 msgid "Basic site configuration"
 msgstr "Configuration basique du site"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:339
 msgctxt "MENU"
 msgid "Site"
 msgstr "Site"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:345
 msgid "Design configuration"
 msgstr "Configuration de la conception"
 
 #. TRANS: Menu item for site administration
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/adminpanelaction.php:347 lib/groupnav.php:135
 msgctxt "MENU"
 msgid "Design"
 msgstr "Conception"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:353
 msgid "User configuration"
 msgstr "Configuration utilisateur"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:110
 msgid "User"
 msgstr "Utilisateur"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:361
 msgid "Access configuration"
 msgstr "Configuration d’accès"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:369
 msgid "Paths configuration"
 msgstr "Configuration des chemins"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:377
 msgid "Sessions configuration"
 msgstr "Configuration des sessions"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:385
 msgid "Edit site notice"
 msgstr "Modifier l'avis du site"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:387
 msgid "Site notice"
 msgstr "Notice du site"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:393
 msgid "Snapshots configuration"
 msgstr "Configuration des instantanés"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:401
 msgid "Set site license"
 msgstr "Définir la licence du site"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:409
 #, fuzzy
 msgid "Plugins configuration"
 msgstr "Configuration des chemins"
 
 #. TRANS: Client error 401.
-#: lib/apiauth.php:111
 msgid "API resource requires read-write access, but you only have read access."
 msgstr ""
 "La ressource de l’API a besoin de l’accès en lecture et en écriture, mais "
 "vous n’y avez accès qu’en lecture."
 
 #. TRANS: OAuth exception thrown when no application is found for a given consumer key.
-#: lib/apiauth.php:177
 msgid "No application for that consumer key."
 msgstr "Aucune demande trouvée pour cette clé de consommateur."
 
-#: lib/apiauth.php:202 lib/apiauth.php:284
 msgid "Not allowed to use API."
 msgstr ""
 
 #. TRANS: OAuth exception given when an incorrect access token was given for a user.
-#: lib/apiauth.php:225
 msgid "Bad access token."
 msgstr "Jeton d’accès erroné."
 
 #. TRANS: OAuth exception given when no user was found for a given token (no token was found).
-#: lib/apiauth.php:230
 msgid "No user for that token."
 msgstr "Aucun utilisateur associé à ce jeton."
 
 #. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel".
 #. TRANS: Client error thrown when authentication fails.
-#: lib/apiauth.php:272 lib/apiauth.php:302
 msgid "Could not authenticate you."
 msgstr "Impossible de vous authentifier."
 
 #. TRANS: Server error displayed when trying to create an anynymous OAuth consumer.
-#: lib/apioauthstore.php:45
 msgid "Could not create anonymous consumer."
 msgstr "Impossible de créer un consommateur anonyme."
 
 #. TRANS: Server error displayed when trying to create an anynymous OAuth application.
-#: lib/apioauthstore.php:69
 msgid "Could not create anonymous OAuth application."
 msgstr "Impossible de créer l’application OAuth anonyme."
 
 #. TRANS: Exception thrown when no token association could be found.
-#: lib/apioauthstore.php:151
 msgid ""
 "Could not find a profile and application associated with the request token."
 msgstr ""
@@ -7795,44 +6442,36 @@ msgstr ""
 "requête."
 
 #. TRANS: Exception thrown when no access token can be issued.
-#: lib/apioauthstore.php:209
 msgid "Could not issue access token."
 msgstr "Impossible d’émettre le jeton d’accès."
 
-#: lib/apioauthstore.php:317
 msgid "Database error inserting OAuth application user."
 msgstr ""
 "Erreur de base de donnée en insérant l’utilisateur de l’application OAuth"
 
-#: lib/apioauthstore.php:345
 #, fuzzy
 msgid "Database error updating OAuth application user."
 msgstr ""
 "Erreur de base de donnée en insérant l’utilisateur de l’application OAuth"
 
 #. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
-#: lib/apioauthstore.php:371
 msgid "Tried to revoke unknown token."
 msgstr "Révocation essayée d’un jeton inconnu."
 
 #. TRANS: Exception thrown when an attempt is made to remove a revoked token.
-#: lib/apioauthstore.php:376
 msgid "Failed to delete revoked token."
 msgstr "Impossible de supprimer un jeton révoqué."
 
 #. TRANS: Form input field label for application icon.
-#: lib/applicationeditform.php:177
 msgid "Icon"
 msgstr "Icône"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:182
 msgid "Icon for this application"
 msgstr "Icône pour cette application"
 
 #. TRANS: Form input field instructions.
 #. TRANS: %d is the number of available characters for the description.
-#: lib/applicationeditform.php:201
 #, php-format
 msgid "Describe your application in %d character"
 msgid_plural "Describe your application in %d characters"
@@ -7840,209 +6479,170 @@ msgstr[0] "Décrivez votre application en %d caractère"
 msgstr[1] "Décrivez votre application en %d caractères"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:205
 msgid "Describe your application"
 msgstr "Décrivez votre application"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:216
 msgid "URL of the homepage of this application"
 msgstr "URL de la page d’accueil de cette application"
 
 #. TRANS: Form input field label.
-#: lib/applicationeditform.php:218
 msgid "Source URL"
 msgstr "URL source"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:225
 msgid "Organization responsible for this application"
 msgstr "Organisation responsable de cette application"
 
 #. TRANS: Form input field label.
-#: lib/applicationeditform.php:227
 msgid "Organization"
 msgstr "Organisation"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:234
 msgid "URL for the homepage of the organization"
 msgstr "URL de la page d’accueil de l’organisation"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:243
 msgid "URL to redirect to after authentication"
 msgstr "URL vers laquelle rediriger après l’authentification"
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:271
 msgid "Browser"
 msgstr "Navigateur"
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:288
 msgid "Desktop"
 msgstr "Bureau"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:290
 msgid "Type of application, browser or desktop"
 msgstr "Type d’application, navigateur ou bureau"
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:314
 msgid "Read-only"
 msgstr "Lecture seule"
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:334
 msgid "Read-write"
 msgstr "Lecture-écriture"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:336
 msgid "Default access for this application: read-only, or read-write"
 msgstr ""
 "Accès par défaut pour cette application : en lecture seule ou en lecture-"
 "écriture"
 
 #. TRANS: Submit button title.
-#: lib/applicationeditform.php:353
 msgid "Cancel"
 msgstr "Annuler"
 
-#: lib/applicationlist.php:247
 msgid " by "
 msgstr " par "
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:260
 msgid "read-write"
 msgstr "lecture-écriture"
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:262
 msgid "read-only"
 msgstr "lecture seule"
 
 #. TRANS: Used in application list. %1$s is a modified date, %2$s is access type ("read-write" or "read-only")
-#: lib/applicationlist.php:268
 #, php-format
 msgid "Approved %1$s - \"%2$s\" access."
 msgstr "Accès « %2$s » approuvé le %1$s."
 
 #. TRANS: Access token in the application list.
 #. TRANS: %s are the first 7 characters of the access token.
-#: lib/applicationlist.php:282
 #, php-format
 msgid "Access token starting with: %s"
 msgstr "Jeton d’accès qui commence par : %s"
 
 #. TRANS: Button label
-#: lib/applicationlist.php:298
 msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "Révoquer"
 
-#: lib/atom10feed.php:113
 #, fuzzy
 msgid "Author element must contain a name element."
 msgstr "l’élément « author » doit contenir un élément « name »."
 
 #. TRANS: Server exception thrown when using the method setActivitySubject() in the class Atom10Feed.
-#: lib/atom10feed.php:160
 #, fuzzy
 msgid "Do not use this method!"
 msgstr "Ne pas supprimer ce groupe"
 
 #. TRANS: Title.
-#: lib/attachmentnoticesection.php:67
 msgid "Notices where this attachment appears"
 msgstr "Avis sur lesquels cette pièce jointe apparaît."
 
 #. TRANS: Title.
-#: lib/attachmenttagcloudsection.php:48
 msgid "Tags for this attachment"
 msgstr "Marques de cette pièce jointe"
 
 #. TRANS: Exception thrown when a password change fails.
-#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:227
 msgid "Password changing failed."
 msgstr "La modification du mot de passe a échoué."
 
 #. TRANS: Exception thrown when a password change attempt fails because it is not allowed.
-#: lib/authenticationplugin.php:238
 msgid "Password changing is not allowed."
 msgstr "La modification du mot de passe n’est pas autorisée."
 
 #. TRANS: Title for the form to block a user.
-#: lib/blockform.php:68
 msgid "Block"
 msgstr "Bloquer"
 
 #. TRANS: Description of the form to block a user.
-#: lib/blockform.php:79
 msgid "Block this user"
 msgstr "Bloquer cet utilisateur"
 
 #. TRANS: Title for command results.
-#: lib/channel.php:104 lib/channel.php:125
 msgid "Command results"
 msgstr "Résultats de la commande"
 
 #. TRANS: Title for command results.
-#: lib/channel.php:138
 msgid "AJAX error"
 msgstr "Erreur AJAX"
 
 #. TRANS: E-mail subject when a command has completed.
-#: lib/channel.php:177 lib/mailhandler.php:143
 msgid "Command complete"
 msgstr "Commande complétée"
 
 #. TRANS: E-mail subject when a command has failed.
-#: lib/channel.php:188
 msgid "Command failed"
 msgstr "Échec de la commande"
 
 #. TRANS: Command exception text shown when a notice ID is requested that does not exist.
-#: lib/command.php:82 lib/command.php:106
 msgid "Notice with that id does not exist."
 msgstr "Aucun avis avec cet identifiant n’existe."
 
 #. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
 #. TRANS: Error text shown when a last user notice is requested and it does not exist.
-#: lib/command.php:99 lib/command.php:642
 msgid "User has no last notice."
 msgstr "Aucun avis récent pour cet utilisateur."
 
 #. TRANS: Message given requesting a profile for a non-existing user.
 #. TRANS: %s is the nickname of the user for which the profile could not be found.
-#: lib/command.php:128
 #, php-format
 msgid "Could not find a user with nickname %s."
 msgstr "Impossible de trouver un utilisateur avec le pseudo %s."
 
 #. TRANS: Message given getting a non-existing user.
 #. TRANS: %s is the nickname of the user that could not be found.
-#: lib/command.php:148
 #, php-format
 msgid "Could not find a local user with nickname %s."
 msgstr "Impossible de trouver un utilisateur local portant le pseudo %s."
 
 #. TRANS: Error text shown when an unimplemented command is given.
-#: lib/command.php:183
 msgid "Sorry, this command is not yet implemented."
 msgstr "Désolé, cette commande n’a pas encore été implémentée."
 
 #. TRANS: Command exception text shown when a user tries to nudge themselves.
-#: lib/command.php:229
 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr "Ça n’a pas de sens de se faire un clin d’œil à soi-même !"
 
 #. TRANS: Message given having nudged another user.
 #. TRANS: %s is the nickname of the user that was nudged.
-#: lib/command.php:238
 #, php-format
 msgid "Nudge sent to %s."
 msgstr "Clin d’œil envoyé à %s."
@@ -8051,7 +6651,6 @@ msgstr "Clin d’œil envoyé à %s."
 #. TRANS: %1$s is the number of other user the user is subscribed to.
 #. TRANS: %2$s is the number of users that are subscribed to the user.
 #. TRANS: %3$s is the number of notices the user has sent.
-#: lib/command.php:268
 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"
@@ -8063,40 +6662,34 @@ msgstr ""
 "Messages : %3$s"
 
 #. TRANS: Error message text shown when a favorite could not be set because it has already been favorited.
-#: lib/command.php:298
 #, fuzzy
 msgid "Could not create favorite: already favorited."
 msgstr "Impossible de créer le favori."
 
 #. TRANS: Text shown when a notice has been marked as favourite successfully.
-#: lib/command.php:324
 msgid "Notice marked as fave."
 msgstr "Avis ajouté aux favoris."
 
 #. TRANS: Message given having added a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:369
 #, php-format
 msgid "%1$s joined group %2$s."
 msgstr "%1$s a rejoint le groupe %2$s."
 
 #. TRANS: Message given having removed a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:417
 #, php-format
 msgid "%1$s left group %2$s."
 msgstr "%1$s a quitté le groupe %2$s."
 
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: lib/command.php:438
 #, php-format
 msgctxt "WHOIS"
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
 
 #. TRANS: Whois output. %s is the full name of the queried user.
-#: lib/command.php:442
 #, php-format
 msgid "Fullname: %s"
 msgstr "Nom complet : %s"
@@ -8104,7 +6697,6 @@ msgstr "Nom complet : %s"
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a location.
-#: lib/command.php:446 lib/mail.php:275
 #, php-format
 msgid "Location: %s"
 msgstr "Emplacement : %s"
@@ -8112,20 +6704,17 @@ msgstr "Emplacement : %s"
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a homepage.
-#: lib/command.php:450 lib/mail.php:279
 #, php-format
 msgid "Homepage: %s"
 msgstr "Site Web : %s"
 
 #. TRANS: Whois output. %s is the bio information of the queried user.
-#: lib/command.php:454
 #, php-format
 msgid "About: %s"
 msgstr "À propos : %s"
 
 #. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).
 #. TRANS: %s is a remote profile.
-#: lib/command.php:483
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
@@ -8136,7 +6725,6 @@ msgstr ""
 
 #. TRANS: Message given if content is too long. %1$sd is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:500
 #, php-format
 msgid "Message too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
@@ -8147,26 +6735,26 @@ msgstr[1] ""
 "Message trop long ! La taille maximale est de %1$d caractères ; vous en avez "
 "entré %2$d."
 
+#. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
+msgid "You can't send a message to this user."
+msgstr "Vous ne pouvez pas envoyer de messages à cet utilisateur."
+
 #. TRANS: Error text shown sending a direct message fails with an unknown reason.
-#: lib/command.php:528
 msgid "Error sending direct message."
 msgstr "Une erreur est survenue pendant l’envoi de votre message."
 
 #. TRANS: Message given having repeated a notice from another user.
 #. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:565
 #, php-format
 msgid "Notice from %s repeated."
 msgstr "Avis de %s repris."
 
 #. TRANS: Error text shown when repeating a notice fails with an unknown reason.
-#: lib/command.php:568
 msgid "Error repeating notice."
 msgstr "Erreur lors de la reprise de l’avis."
 
 #. TRANS: Message given if content of a notice for a reply is too long. %1$d is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:603
 #, php-format
 msgid "Notice too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Notice too long - maximum is %1$d characters, you sent %2$d."
@@ -8179,81 +6767,67 @@ msgstr[1] ""
 
 #. TRANS: Text shown having sent a reply to a notice successfully.
 #. TRANS: %s is the nickname of the user of the notice the reply was sent to.
-#: lib/command.php:616
 #, php-format
 msgid "Reply to %s sent."
 msgstr "Réponse à %s envoyée."
 
 #. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
-#: lib/command.php:619
 msgid "Error saving notice."
 msgstr "Problème lors de l’enregistrement de l’avis."
 
 #. TRANS: Error text shown when no username was provided when issuing a subscribe command.
-#: lib/command.php:666
 msgid "Specify the name of the user to subscribe to."
 msgstr "Indiquez le nom de l’utilisateur auquel vous souhaitez vous abonner."
 
 #. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
-#: lib/command.php:675
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "Impossible de s'inscrire aux profils OMB par cette commande."
 
 #. TRANS: Text shown after having subscribed to another user successfully.
 #. TRANS: %s is the name of the user the subscription was requested for.
-#: lib/command.php:683
 #, php-format
 msgid "Subscribed to %s."
 msgstr "Abonné à %s."
 
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.
-#: lib/command.php:704 lib/command.php:815
 msgid "Specify the name of the user to unsubscribe from."
 msgstr ""
 "Indiquez le nom de l’utilisateur duquel vous souhaitez vous désabonner."
 
 #. TRANS: Text shown after having unsubscribed from another user successfully.
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:715
 #, php-format
 msgid "Unsubscribed from %s."
 msgstr "Désabonné de %s."
 
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
-#: lib/command.php:735 lib/command.php:761
 msgid "Command not yet implemented."
 msgstr "Cette commande n’a pas encore été implémentée."
 
 #. TRANS: Text shown when issuing the command "off" successfully.
-#: lib/command.php:739
 msgid "Notification off."
 msgstr "Avertissements désactivés."
 
 #. TRANS: Error text shown when the command "off" fails for an unknown reason.
-#: lib/command.php:742
 msgid "Can't turn off notification."
 msgstr "Impossible de désactiver les avertissements."
 
 #. TRANS: Text shown when issuing the command "on" successfully.
-#: lib/command.php:765
 msgid "Notification on."
 msgstr "Avertissements activés."
 
 #. TRANS: Error text shown when the command "on" fails for an unknown reason.
-#: lib/command.php:768
 msgid "Can't turn on notification."
 msgstr "Impossible d’activer les avertissements."
 
 #. TRANS: Error text shown when issuing the login command while login is disabled.
-#: lib/command.php:782
 msgid "Login command is disabled."
 msgstr "La commande d’ouverture de session est désactivée."
 
 #. TRANS: Text shown after issuing the login command successfully.
 #. TRANS: %s is a logon link..
-#: lib/command.php:795
 #, php-format
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
@@ -8262,20 +6836,17 @@ msgstr ""
 
 #. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:824
 #, php-format
 msgid "Unsubscribed %s."
 msgstr "Désabonné de %s."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
-#: lib/command.php:842
 msgid "You are not subscribed to anyone."
 msgstr "Vous n’êtes abonné(e) à personne."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
-#: lib/command.php:847
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Vous êtes abonné à cette personne :"
@@ -8283,14 +6854,12 @@ msgstr[1] "Vous êtes abonné à ces personnes :"
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user
 #. TRANS: (followers) without having any subscribers.
-#: lib/command.php:869
 msgid "No one is subscribed to you."
 msgstr "Personne ne s’est abonné à vous."
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
-#: lib/command.php:874
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Cette personne est abonnée à vous :"
@@ -8298,21 +6867,18 @@ msgstr[1] "Ces personnes sont abonnées à vous :"
 
 #. TRANS: Text shown after requesting groups a user is subscribed to without having
 #. TRANS: any group subscriptions.
-#: lib/command.php:896
 msgid "You are not a member of any groups."
 msgstr "Vous n’êtes membre d’aucun groupe."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
-#: lib/command.php:901
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "Vous êtes membre de ce groupe :"
 msgstr[1] "Vous êtes membre de ces groupes :"
 
 #. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-#: lib/command.php:916
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -8394,119 +6960,97 @@ msgstr ""
 "tracking - pas encore implémenté.\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:36
 msgid "No configuration file found."
 msgstr "Aucun fichier de configuration n’a été trouvé."
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:39
 msgid "I looked for configuration files in the following places:"
 msgstr ""
 "Les fichiers de configuration ont été cherchés aux emplacements suivants :"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:42
 msgid "You may wish to run the installer to fix this."
 msgstr "Vous pouvez essayer de lancer l’installeur pour régler ce problème."
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:46
 msgid "Go to the installer."
 msgstr "Aller au programme d’installation"
 
-#: lib/dberroraction.php:59
 msgid "Database error"
 msgstr "Erreur de la base de données"
 
 #. TRANS: Description of form for deleting a user.
-#: lib/deleteuserform.php:75
 msgid "Delete this user"
 msgstr "Supprimer cet utilisateur"
 
-#: lib/designform.php:114
 #, fuzzy
 msgid "Change design"
 msgstr "Sauvegarder la conception"
 
 #. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: lib/designform.php:131
 msgid "Change colours"
 msgstr "Modifier les couleurs"
 
 #. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: lib/designform.php:138
 msgid "Use defaults"
 msgstr "Utiliser les valeurs par défaut"
 
 #. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: lib/designform.php:140
 msgid "Restore default designs"
 msgstr "Restaurer les conceptions par défaut"
 
 #. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: lib/designform.php:148
 msgid "Reset back to default"
 msgstr "Revenir aux valeurs par défaut"
 
 #. TRANS: Label in form on profile design page.
 #. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
-#: lib/designform.php:158
 msgid "Upload file"
 msgstr "Importer un fichier"
 
 #. TRANS: Instructions for form on profile design page.
-#: lib/designform.php:163
-#, fuzzy
 msgid ""
 "You can upload your personal background image. The maximum file size is 2Mb."
 msgstr ""
-"Vous pouvez importer votre image d’arrière plan personnelle. La taille "
+"Vous pouvez importer une image d’arrière plan personnelle. La taille "
 "maximale du fichier est de 2 Mo."
 
 #. TRANS: Radio button on profile design page that will enable use of the uploaded profile image.
-#: lib/designform.php:194
 msgctxt "RADIO"
 msgid "On"
 msgstr "Activé"
 
 #. TRANS: Radio button on profile design page that will disable use of the uploaded profile image.
-#: lib/designform.php:211
 msgctxt "RADIO"
 msgid "Off"
 msgstr "Désactivé"
 
 #. TRANS: Title for button on profile design page to save settings.
-#: lib/designform.php:322
 msgid "Save design"
 msgstr "Sauvegarder la conception"
 
 #. TRANS: Error message displayed if design settings could not be saved.
 #. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
-#: lib/designsettings.php:216 lib/designsettings.php:238
 msgid "Couldn't update your design."
 msgstr "Impossible de mettre à jour votre conception."
 
 #. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
-#: lib/designsettings.php:244
 msgid "Design defaults restored."
 msgstr "Les paramètre par défaut de la conception ont été restaurés."
 
 #. TRANS: Exception. %s is an ID.
-#: lib/discovery.php:153
 #, fuzzy, php-format
 msgid "Unable to find services for %s."
 msgstr "Impossible de révoquer l’accès par l’application : %s."
 
 #. TRANS: Form legend for removing the favourite status for a favourite notice.
 #. TRANS: Title for button text for removing the favourite status for a favourite notice.
-#: lib/disfavorform.php:108 lib/disfavorform.php:140
 msgid "Disfavor this notice"
 msgstr "Retirer des favoris"
 
 #. TRANS: Button text for removing the favourite status for a favourite notice.
-#: lib/disfavorform.php:136
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Disfavor favorite"
@@ -8514,103 +7058,81 @@ msgstr "Retirer ce favori"
 
 #. TRANS: Form legend for adding the favourite status to a notice.
 #. TRANS: Title for button text for adding the favourite status to a notice.
-#: lib/favorform.php:108 lib/favorform.php:139
 msgid "Favor this notice"
 msgstr "Ajouter aux favoris"
 
 #. TRANS: Button text for adding the favourite status to a notice.
-#: lib/favorform.php:135
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Favor"
 msgstr "Ajouter à mes favoris"
 
-#: lib/feed.php:84
 msgid "RSS 1.0"
 msgstr "RSS 1.0"
 
-#: lib/feed.php:86
 msgid "RSS 2.0"
 msgstr "RSS 2.0"
 
-#: lib/feed.php:88
 msgid "Atom"
 msgstr "Atom"
 
-#: lib/feed.php:90
 msgid "FOAF"
 msgstr "Ami d’un ami"
 
-#: lib/feedimporter.php:75
 #, fuzzy
 msgid "Not an atom feed."
 msgstr "Tous les membres"
 
-#: lib/feedimporter.php:82
 msgid "No author in the feed."
 msgstr ""
 
-#: lib/feedimporter.php:89
 msgid "Can't import without a user."
 msgstr ""
 
 #. TRANS: Header for feed links (h2).
-#: lib/feedlist.php:66
 msgid "Feeds"
 msgstr "Flux d’informations"
 
-#: lib/galleryaction.php:128
 msgid "All"
 msgstr "Tous"
 
-#: lib/galleryaction.php:136
 msgid "Select tag to filter"
 msgstr "Sélectionner une marque à filtrer"
 
-#: lib/galleryaction.php:137
 msgid "Tag"
 msgstr "Marque"
 
-#: lib/galleryaction.php:138
 msgid "Choose a tag to narrow list"
 msgstr "Choissez une marque pour réduire la liste"
 
-#: lib/galleryaction.php:140
 msgid "Go"
 msgstr "Aller"
 
-#: lib/grantroleform.php:91
 #, php-format
 msgid "Grant this user the \"%s\" role"
 msgstr "Accorder le rôle « %s » à cet utilisateur"
 
-#: lib/groupeditform.php:147
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "1 à 64 lettres minuscules ou chiffres, sans ponctuation ni espaces."
 
-#: lib/groupeditform.php:156
 msgid "URL of the homepage or blog of the group or topic."
 msgstr "Adresse URL du site web ou blogue pour le groupe ou sujet."
 
-#: lib/groupeditform.php:161
 msgid "Describe the group or topic"
 msgstr "Description du groupe ou du sujet"
 
-#: lib/groupeditform.php:163
 #, php-format
 msgid "Describe the group or topic in %d character or less"
 msgid_plural "Describe the group or topic in %d characters or less"
 msgstr[0] "Description du groupe ou du sujet, en %d caractère ou moins"
 msgstr[1] "Description du groupe ou du sujet, en %d caractères ou moins"
 
-#: lib/groupeditform.php:175
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\"."
 msgstr ""
 "Emplacement du groupe, s’il y a lieu, de la forme « Ville, État (ou région), "
 "pays »"
 
-#: lib/groupeditform.php:183
 #, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -8626,70 +7148,60 @@ msgstr[1] ""
 "espaces. Un maximum de %d synonymes est autorisé."
 
 #. TRANS: Menu item in the group navigation page.
-#: lib/groupnav.php:86
 msgctxt "MENU"
 msgid "Group"
 msgstr "Groupe"
 
 #. TRANS: Tooltip for menu item in the group navigation page.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:89
 #, php-format
 msgctxt "TOOLTIP"
 msgid "%s group"
 msgstr "Groupe « %s »"
 
 #. TRANS: Menu item in the group navigation page.
-#: lib/groupnav.php:95
 msgctxt "MENU"
 msgid "Members"
 msgstr "Membres"
 
 #. TRANS: Tooltip for menu item in the group navigation page.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:98
 #, php-format
 msgctxt "TOOLTIP"
 msgid "%s group members"
 msgstr "Membres du groupe « %s »"
 
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/groupnav.php:108
 msgctxt "MENU"
 msgid "Blocked"
 msgstr "Bloqué"
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:111
 #, php-format
 msgctxt "TOOLTIP"
 msgid "%s blocked users"
 msgstr "Utilisateurs bloqués du groupe « %s »"
 
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "Administrer"
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:120
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Edit %s group properties"
 msgstr "Modifier les propriétés du groupe « %s »"
 
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/groupnav.php:126
 msgctxt "MENU"
 msgid "Logo"
 msgstr "Logo"
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:129
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Add or edit %s logo"
@@ -8697,70 +7209,58 @@ msgstr "Ajouter ou modifier le logo du groupe « %s »"
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:138
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Add or edit %s design"
 msgstr "Ajouter ou modifier l’apparence du groupe « %s »"
 
 #. TRANS: Title for groups with the most members section.
-#: lib/groupsbymemberssection.php:71
 msgid "Groups with most members"
 msgstr "Groupes avec le plus de membres"
 
 #. TRANS: Title for groups with the most posts section.
-#: lib/groupsbypostssection.php:71
 msgid "Groups with most posts"
 msgstr "Groupes avec le plus d’éléments publiés"
 
 #. TRANS: Title for group tag cloud section.
 #. TRANS: %s is a group name.
-#: lib/grouptagcloudsection.php:57
 #, php-format
 msgid "Tags in %s group's notices"
 msgstr "Marques dans les avis du groupe %s"
 
 #. TRANS: Client exception 406
-#: lib/htmloutputter.php:104
 msgid "This page is not available in a media type you accept"
 msgstr ""
 "Cette page n’est pas disponible dans un des formats que vous avez autorisés."
 
 #. TRANS: Exception thrown when trying to upload an unsupported image file format.
-#: lib/imagefile.php:73
 msgid "Unsupported image file format."
 msgstr "Format de fichier d’image non supporté."
 
 #. TRANS: Exception thrown when too large a file is uploaded.
 #. TRANS: %s is the maximum file size, for example "500b", "10kB" or "2MB".
-#: lib/imagefile.php:91
 #, php-format
 msgid "That file is too big. The maximum file size is %s."
 msgstr "Ce fichier est trop grand. La taille maximale est %s."
 
 #. TRANS: Exception thrown when uploading an image and that action could not be completed.
-#: lib/imagefile.php:97
 msgid "Partial upload."
 msgstr "Transfert partiel."
 
 #. TRANS: Exception thrown when uploading a file as image that is not an image or is a corrupt file.
-#: lib/imagefile.php:115
 msgid "Not an image or corrupt file."
 msgstr "Ceci n’est pas une image, ou c’est un fichier corrompu."
 
 #. TRANS: Exception thrown during resize when image has been registered as present, but is no longer there.
-#: lib/imagefile.php:178
 msgid "Lost our file."
 msgstr "Fichier perdu."
 
 #. TRANS: Exception thrown when trying to resize an unknown file type.
 #. TRANS: Exception thrown when trying resize an unknown file type.
-#: lib/imagefile.php:216 lib/imagefile.php:257
 msgid "Unknown file type"
 msgstr "Type de fichier inconnu"
 
 #. TRANS: Number of megabytes. %d is the number.
-#: lib/imagefile.php:303
 #, php-format
 msgid "%dMB"
 msgid_plural "%dMB"
@@ -8768,7 +7268,6 @@ msgstr[0] "%d&nbsp;Mo"
 msgstr[1] "%d&nbsp;Mo"
 
 #. TRANS: Number of kilobytes. %d is the number.
-#: lib/imagefile.php:307
 #, php-format
 msgid "%dkB"
 msgid_plural "%dkB"
@@ -8776,14 +7275,12 @@ msgstr[0] "%d&nbsp;Ko"
 msgstr[1] "%d&nbsp;Ko"
 
 #. TRANS: Number of bytes. %d is the number.
-#: lib/imagefile.php:310
 #, php-format
 msgid "%dB"
 msgid_plural "%dB"
 msgstr[0] "%d&nbsp;o"
 msgstr[1] "%d&nbsp;o"
 
-#: lib/implugin.php:262
 #, php-format
 msgid ""
 "User \"%s\" on %s has said that your %s screenname belongs to them. If "
@@ -8793,53 +7290,44 @@ msgid ""
 "message."
 msgstr ""
 
-#: lib/implugin.php:349
 #, php-format
 msgid "Unknown inbox source %d."
 msgstr "Source %d inconnue pour la boîte de réception."
 
-#: lib/implugin.php:485
-#, fuzzy, php-format
+#, php-format
 msgid "Message too long - maximum is %1$d characters, you sent %2$d."
 msgstr ""
-"Message trop long ! La taille maximale est de %1$d caractère ; vous en avez "
+"Message trop long ! La taille maximale est de %1$d caractères ; vous en avez "
 "entré %2$d."
 
-#: lib/leaveform.php:114
 msgid "Leave"
 msgstr "Quitter"
 
 #. TRANS: Menu item for logging in to the StatusNet site.
-#: lib/logingroupnav.php:77
 msgctxt "MENU"
 msgid "Login"
 msgstr "Connexion"
 
 #. TRANS: Title for menu item for logging in to the StatusNet site.
-#: lib/logingroupnav.php:79
 msgid "Login with a username and password"
 msgstr "Ouvrez une session avec un identifiant et un mot de passe"
 
 #. TRANS: Menu item for registering with the StatusNet site.
-#: lib/logingroupnav.php:85
 msgctxt "MENU"
 msgid "Register"
 msgstr "S’inscrire"
 
 #. TRANS: Title for menu item for registering with the StatusNet site.
-#: lib/logingroupnav.php:87
 msgid "Sign up for a new account"
 msgstr "Créer un nouveau compte"
 
 #. TRANS: Subject for address confirmation email.
-#: lib/mail.php:172
 msgid "Email address confirmation"
 msgstr "Confirmation de l’adresse courriel"
 
 #. TRANS: Body for address confirmation email.
 #. TRANS: %1$s is the addressed user's nickname, %2$s is the StatusNet sitename,
 #. TRANS: %3$s is the URL to confirm at.
-#: lib/mail.php:177
 #, php-format
 msgid ""
 "Hey, %1$s.\n"
@@ -8871,14 +7359,12 @@ msgstr ""
 
 #. TRANS: Subject of new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
-#: lib/mail.php:243
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1$s suit maintenant vos avis sur %2$s."
 
 #. TRANS: This is a paragraph in a new-subscriber e-mail.
 #. TRANS: %s is a URL where the subscriber can be reported as abusive.
-#: lib/mail.php:250
 #, php-format
 msgid ""
 "If you believe this account is being used abusively, you can block them from "
@@ -8893,7 +7379,6 @@ msgstr ""
 #. TRANS: %3$s is the subscriber's profile URL, %4$s is the subscriber's location (or empty)
 #. TRANS: %5$s is the subscriber's homepage URL (or empty), %6%s is the subscriber's bio (or empty)
 #. TRANS: %7$s is a link to the addressed user's e-mail settings.
-#: lib/mail.php:260
 #, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -8921,14 +7406,12 @@ msgstr ""
 
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is biographical information.
-#: lib/mail.php:283
 #, php-format
 msgid "Bio: %s"
 msgstr "Bio : %s"
 
 #. TRANS: Subject of notification mail for new posting email address.
 #. TRANS: %s is the StatusNet sitename.
-#: lib/mail.php:312
 #, php-format
 msgid "New email address for posting to %s"
 msgstr "Nouvelle adresse courriel pour poster dans %s"
@@ -8936,7 +7419,6 @@ msgstr "Nouvelle adresse courriel pour poster dans %s"
 #. TRANS: Body of notification mail for new posting email address.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is the e-mail address to send
 #. TRANS: to to post by e-mail, %3$s is a URL to more instructions.
-#: lib/mail.php:318
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -8959,19 +7441,16 @@ msgstr ""
 
 #. TRANS: Subject line for SMS-by-email notification messages.
 #. TRANS: %s is the posting user's nickname.
-#: lib/mail.php:439
 #, php-format
 msgid "%s status"
 msgstr "Statut de %s"
 
 #. TRANS: Subject line for SMS-by-email address confirmation message.
-#: lib/mail.php:465
 msgid "SMS confirmation"
 msgstr "Confirmation SMS"
 
 #. TRANS: Main body heading for SMS-by-email address confirmation message.
 #. TRANS: %s is the addressed user's nickname.
-#: lib/mail.php:469
 #, php-format
 msgid "%s: confirm you own this phone number with this code:"
 msgstr ""
@@ -8979,7 +7458,6 @@ msgstr ""
 
 #. TRANS: Subject for 'nudge' notification email.
 #. TRANS: %s is the nudging user.
-#: lib/mail.php:490
 #, fuzzy, php-format
 msgid "You have been nudged by %s"
 msgstr "Vous avez reçu un clin d’œil de %s"
@@ -8987,7 +7465,6 @@ msgstr "Vous avez reçu un clin d’œil de %s"
 #. TRANS: Body for 'nudge' notification email.
 #. TRANS: %1$s is the nuding user's long name, $2$s is the nudging user's nickname,
 #. TRANS: %3$s is a URL to post notices at, %4$s is the StatusNet sitename.
-#: lib/mail.php:497
 #, php-format
 msgid ""
 "%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -9016,7 +7493,6 @@ msgstr ""
 
 #. TRANS: Subject for direct-message notification email.
 #. TRANS: %s is the sending user's nickname.
-#: lib/mail.php:544
 #, php-format
 msgid "New private message from %s"
 msgstr "Nouveau message personnel de %s"
@@ -9025,7 +7501,6 @@ msgstr "Nouveau message personnel de %s"
 #. TRANS: %1$s is the sending user's long name, %2$s is the sending user's nickname,
 #. TRANS: %3$s is the message content, %4$s a URL to the message,
 #. TRANS: %5$s is the StatusNet sitename.
-#: lib/mail.php:552
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -9060,7 +7535,6 @@ msgstr ""
 
 #. TRANS: Subject for favorite notification e-mail.
 #. TRANS: %1$s is the adding user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:604
 #, php-format
 msgid "%1$s (@%2$s) added your notice as a favorite"
 msgstr "%1$s (@%2$s) a ajouté votre avis à ses favoris"
@@ -9070,7 +7544,6 @@ msgstr "%1$s (@%2$s) a ajouté votre avis à ses favoris"
 #. TRANS: %3$s is a URL to the faved notice, %4$s is the faved notice text,
 #. TRANS: %5$s is a URL to all faves of the adding user, %6$s is the StatusNet sitename,
 #. TRANS: %7$s is the adding user's nickname.
-#: lib/mail.php:611
 #, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -9109,7 +7582,6 @@ msgstr ""
 "%6$s\n"
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:669
 #, php-format
 msgid ""
 "The full conversation can be read here:\n"
@@ -9122,7 +7594,6 @@ msgstr ""
 
 #. TRANS: E-mail subject for notice notification.
 #. TRANS: %1$s is the sending user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:677
 #, php-format
 msgid "%1$s (@%2$s) sent a notice to your attention"
 msgstr "%1$s (@%2$s) a envoyé un avis à votre attention"
@@ -9133,7 +7604,6 @@ msgstr "%1$s (@%2$s) a envoyé un avis à votre attention"
 #. TRANS: %5$s is a URL to the full conversion if it exists (otherwise empty),
 #. TRANS: %6$s is a URL to reply to the notice, %7$s is a URL to all @-replied for the addressed user,
 #. TRANS: %8$s is a URL to the addressed user's e-mail settings, %9$s is the sender's nickname.
-#: lib/mail.php:685
 #, php-format
 msgid ""
 "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -9183,11 +7653,9 @@ msgstr ""
 "\n"
 "P.S. Vous pouvez désactiver ces notifications électroniques ici : %8$s\n"
 
-#: lib/mailbox.php:87
 msgid "Only the user can read their own mailboxes."
 msgstr "L’accès à cette boîte de réception est réservé à son utilisateur."
 
-#: lib/mailbox.php:125
 msgid ""
 "You have no private messages. You can send private message to engage other "
 "users in conversation. People can send you messages for your eyes only."
@@ -9196,55 +7664,45 @@ msgstr ""
 "pour démarrer des conversations avec d’autres utilisateurs. Ceux-ci peuvent "
 "vous envoyer des messages destinés à vous seul(e)."
 
-#: lib/mailhandler.php:37
 msgid "Could not parse message."
 msgstr "Impossible de déchiffrer ce message."
 
-#: lib/mailhandler.php:42
 msgid "Not a registered user."
 msgstr "Ceci n’est pas un utilisateur inscrit."
 
-#: lib/mailhandler.php:46
 msgid "Sorry, that is not your incoming email address."
 msgstr "Désolé, ceci n’est pas votre adresse de courriel entrant."
 
-#: lib/mailhandler.php:50
 msgid "Sorry, no incoming email allowed."
 msgstr "Désolé, la réception de courriels n’est pas permise."
 
-#: lib/mailhandler.php:229
 #, php-format
 msgid "Unsupported message type: %s"
 msgstr "Type de message non supporté : %s"
 
 #. TRANS: Client exception thrown when a database error was thrown during a file upload operation.
-#: lib/mediafile.php:102 lib/mediafile.php:174
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
 "Une erreur de base de données s’est produite pendant la sauvegarde de votre "
 "fichier. Veuillez réessayer."
 
 #. TRANS: Client exception thrown when a file upload operation would cause a user to exceed a set quota.
-#: lib/mediafile.php:238 lib/mediafile.php:281
 msgid "File exceeds user's quota."
 msgstr "Le fichier dépasse le quota de l’utilisateur."
 
 #. TRANS: Client exception thrown when a file upload operation fails because the file could
 #. TRANS: not be moved from the temporary folder to the permanent file location.
-#: lib/mediafile.php:258 lib/mediafile.php:300
 msgid "File could not be moved to destination directory."
 msgstr "Le fichier n’a pas pu être déplacé dans le dossier de destination."
 
 #. TRANS: Client exception thrown when a file upload operation has been stopped because the MIME
 #. TRANS: type of the uploaded file could not be determined.
-#: lib/mediafile.php:265 lib/mediafile.php:306
 msgid "Could not determine file's MIME type."
 msgstr "Impossible de déterminer le type MIME du fichier."
 
 #. TRANS: Client exception thrown trying to upload a forbidden MIME type.
 #. TRANS: %1$s is the file type that was denied, %2$s is the application part of
 #. TRANS: the MIME type that was denied.
-#: lib/mediafile.php:396
 #, php-format
 msgid ""
 "\"%1$s\" is not a supported file type on this server. Try using another %2$s "
@@ -9255,82 +7713,73 @@ msgstr ""
 
 #. TRANS: Client exception thrown trying to upload a forbidden MIME type.
 #. TRANS: %s is the file type that was denied.
-#: lib/mediafile.php:401
 #, php-format
 msgid "\"%s\" is not a supported file type on this server."
 msgstr "« %s » n’est pas un type de fichier supporté sur ce serveur."
 
-#: lib/messageform.php:120
 msgid "Send a direct notice"
 msgstr "Envoyer un message direct"
 
 #. TRANS Label entry in drop-down selection box in direct-message inbox/outbox. This is the default entry in the drop-down box, doubling as instructions and a brake against accidental submissions with the first user in the list.
-#: lib/messageform.php:137
 msgid "Select recipient:"
 msgstr "Sélectionner le destinataire :"
 
 #. TRANS Entry in drop-down selection box in direct-message inbox/outbox when no one is available to message.
-#: lib/messageform.php:150
 msgid "No mutual subscribers."
 msgstr "Aucun abonné réciproque."
 
-#: lib/messageform.php:153
 msgid "To"
 msgstr "À"
 
-#: lib/messageform.php:184 lib/noticeform.php:236
 msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr "Envoyer"
 
-#: lib/messagelist.php:77
 #, fuzzy
 msgid "Messages"
 msgstr "Message"
 
-#: lib/messagelistitem.php:123 lib/noticelist.php:527
 msgid "from"
 msgstr "de"
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:178
 msgid "Nickname cannot be empty."
 msgstr "Le pseudonyme ne peut pas être vide."
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:191
 #, php-format
 msgid "Nickname cannot be more than %d character long."
 msgid_plural "Nickname cannot be more than %d characters long."
 msgstr[0] "Le pseudonyme ne peut pas contenir plus de %d caractère."
 msgstr[1] "Le pseudonyme ne peut pas contenir plus de %d caractères."
 
-#: lib/noticeform.php:160
+#. TRANS: Form legend for notice form.
 msgid "Send a notice"
 msgstr "Envoyer un avis"
 
-#: lib/noticeform.php:174
+#. TRANS: Title for notice label. %s is the user's nickname.
 #, php-format
 msgid "What's up, %s?"
 msgstr "Quoi de neuf, %s ?"
 
-#: lib/noticeform.php:193
+#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr "Attacher"
 
-#: lib/noticeform.php:197
-msgid "Attach a file"
+#. TRANS: Title for input field to attach a file to a notice.
+#, fuzzy
+msgid "Attach a file."
 msgstr "Joindre un fichier"
 
-#: lib/noticeform.php:212
+#. TRANS: Field label to add location to a notice.
 msgid "Share my location"
 msgstr "Partager ma localisation."
 
-#: lib/noticeform.php:215
+#. TRANS: Text to not share location for a notice in notice form.
 msgid "Do not share my location"
 msgstr "Ne pas partager ma localisation"
 
-#: lib/noticeform.php:216
+#. TRANS: Timeout error text for location retrieval in notice form.
 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
 "try again later"
@@ -9339,418 +7788,317 @@ msgstr ""
 "Veuillez réessayer plus tard."
 
 #. TRANS: Used in coordinates as abbreviation of north
-#: lib/noticelist.php:457
 msgid "N"
 msgstr "N"
 
 #. TRANS: Used in coordinates as abbreviation of south
-#: lib/noticelist.php:459
 msgid "S"
 msgstr "S"
 
 #. TRANS: Used in coordinates as abbreviation of east
-#: lib/noticelist.php:461
 msgid "E"
 msgstr "E"
 
 #. TRANS: Used in coordinates as abbreviation of west
-#: lib/noticelist.php:463
 msgid "W"
 msgstr "O"
 
-#: lib/noticelist.php:465
 #, php-format
 msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgstr "%1$u° %2$u' %3$u\" %4$s %5$u° %6$u' %7$u\" %8$s"
 
-#: lib/noticelist.php:474
 msgid "at"
 msgstr "chez"
 
-#: lib/noticelist.php:523
 msgid "web"
 msgstr "web"
 
-#: lib/noticelist.php:589
 msgid "in context"
 msgstr "dans le contexte"
 
-#: lib/noticelist.php:624
 msgid "Repeated by"
 msgstr "Repris par"
 
-#: lib/noticelist.php:651
 msgid "Reply to this notice"
 msgstr "Répondre à cet avis"
 
-#: lib/noticelist.php:652
 msgid "Reply"
 msgstr "Répondre"
 
-#: lib/noticelist.php:678
 msgid "Delete this notice"
 msgstr "Supprimer cet avis"
 
-#: lib/noticelist.php:696
 msgid "Notice repeated"
 msgstr "Avis repris"
 
-#: lib/nudgeform.php:116
 msgid "Nudge this user"
 msgstr "Envoyer un clin d’œil à cet utilisateur"
 
-#: lib/nudgeform.php:128
 msgid "Nudge"
 msgstr "Clin d’œil"
 
-#: lib/nudgeform.php:128
 msgid "Send a nudge to this user"
 msgstr "Envoyer un clin d’œil à cet utilisateur"
 
-#: lib/oauthstore.php:294
 msgid "Error inserting new profile."
 msgstr "Erreur lors de l’insertion du nouveau profil."
 
-#: lib/oauthstore.php:302
 msgid "Error inserting avatar."
 msgstr "Erreur lors de l’insertion de l’avatar."
 
-#: lib/oauthstore.php:322
 msgid "Error inserting remote profile."
 msgstr "Erreur lors de l’insertion du profil distant."
 
 #. TRANS: Exception thrown when a notice is denied because it has been sent before.
-#: lib/oauthstore.php:362
 msgid "Duplicate notice."
 msgstr "Avis en doublon."
 
-#: lib/oauthstore.php:507
 msgid "Couldn't insert new subscription."
 msgstr "Impossible d’insérer un nouvel abonnement."
 
-#: lib/personalgroupnav.php:104
-#, fuzzy
 msgid "Replies"
 msgstr "Réponses"
 
-#: lib/personalgroupnav.php:109
-#, fuzzy
 msgid "Favorites"
 msgstr "Favoris"
 
-#: lib/personalgroupnav.php:120
-#, fuzzy
 msgid "Inbox"
 msgstr "Boîte de réception"
 
-#: lib/personalgroupnav.php:121
 msgid "Your incoming messages"
 msgstr "Vos messages reçus"
 
-#: lib/personalgroupnav.php:125
-#, fuzzy
 msgid "Outbox"
 msgstr "Boîte d’envoi"
 
-#: lib/personalgroupnav.php:126
 msgid "Your sent messages"
 msgstr "Vos messages envoyés"
 
 #. TRANS: Title for personal tag cloud section. %s is a user nickname.
-#: lib/personaltagcloudsection.php:56
 #, php-format
 msgid "Tags in %s's notices"
 msgstr "Marques dans les avis de %s"
 
 #. TRANS: Displayed as version information for a plugin if no version information was found.
-#: lib/plugin.php:126
 msgid "Unknown"
 msgstr "Inconnu"
 
 #. TRANS: Plugin admin panel controls
-#: lib/plugindisableform.php:90
 msgctxt "plugin"
 msgid "Disable"
 msgstr ""
 
 #. TRANS: Plugin admin panel controls
-#: lib/pluginenableform.php:112
 msgctxt "plugin"
 msgid "Enable"
 msgstr ""
 
-#: lib/pluginlist.php:196
 msgctxt "plugin-description"
 msgid "(Plugin descriptions unavailable when disabled.)"
 msgstr ""
 
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:88
 msgid "Subscriptions"
 msgstr "Abonnements"
 
 #. TRANS: Text for user subscription statistics if user has more subscriptions than displayed.
-#: lib/profileaction.php:144
 msgid "All subscriptions"
 msgstr "Tous les abonnements"
 
 #. TRANS: H2 text for user subscriber statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:96
 msgid "Subscribers"
 msgstr "Abonnés"
 
 #. TRANS: Text for user subscription statistics if user has more subscribers than displayed.
-#: lib/profileaction.php:181
 msgid "All subscribers"
 msgstr "Tous les abonnés"
 
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:213
 msgid "User ID"
 msgstr "ID de l’utilisateur"
 
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:219
 msgid "Member since"
 msgstr "Membre depuis"
 
 #. TRANS: Label for user statistics.
 #. TRANS: H2 text for user group membership statistics.
-#: lib/profileaction.php:239 lib/profileaction.php:290
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:104
 msgid "Groups"
 msgstr "Groupes"
 
 #. TRANS: Label for user statistics.
 #. TRANS: Average count of posts made per day since account registration.
-#: lib/profileaction.php:253
 msgid "Daily average"
 msgstr "Moyenne journalière"
 
 #. TRANS: Text for user group membership statistics if user has more subscriptions than displayed.
-#: lib/profileaction.php:305
 msgid "All groups"
 msgstr "Tous les groupes"
 
 #. TRANS: Server error displayed when using an unimplemented method.
-#: lib/profileformaction.php:123
 msgid "Unimplemented method."
 msgstr "Méthode non implémentée."
 
-#: lib/publicgroupnav.php:82
 msgid "User groups"
 msgstr "Groupes d’utilisateurs"
 
-#: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
 msgid "Recent tags"
 msgstr "Marques récentes"
 
-#: lib/publicgroupnav.php:88
 msgid "Featured"
 msgstr "En vedette"
 
-#: lib/publicgroupnav.php:92
 msgid "Popular"
 msgstr "Populaires"
 
-#: lib/redirectingaction.php:95
 msgid "No return-to arguments."
 msgstr "Aucun argument de retour."
 
-#: lib/repeatform.php:107
 msgid "Repeat this notice?"
 msgstr "Reprendre cet avis ?"
 
-#: lib/repeatform.php:132
 msgid "Yes"
 msgstr "Oui"
 
-#: lib/repeatform.php:132
 msgid "Repeat this notice"
 msgstr "Reprendre cet avis"
 
-#: lib/revokeroleform.php:91
 #, php-format
 msgid "Revoke the \"%s\" role from this user"
 msgstr "Révoquer le rôle « %s » de cet utilisateur"
 
 #. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:1001
 msgid "Page not found."
 msgstr "Page non trouvée."
 
-#: lib/sandboxform.php:67
 msgid "Sandbox"
 msgstr "Bac à sable"
 
-#: lib/sandboxform.php:78
 msgid "Sandbox this user"
 msgstr "Mettre cet utilisateur dans un bac à sable"
 
 #. TRANS: Fieldset legend for the search form.
-#: lib/searchaction.php:120
 msgid "Search site"
 msgstr "Rechercher sur le site"
 
 #. TRANS: Used as a field label for the field where one or more keywords
 #. TRANS: for searching can be entered.
-#: lib/searchaction.php:128
 msgid "Keyword(s)"
 msgstr "Mot(s) clef(s)"
 
 #. TRANS: Button text for searching site.
-#: lib/searchaction.php:130
 msgctxt "BUTTON"
 msgid "Search"
 msgstr "Rechercher"
 
-#: lib/searchgroupnav.php:80
 msgid "People"
 msgstr "Personnes"
 
-#: lib/searchgroupnav.php:81
 msgid "Find people on this site"
 msgstr "Chercher des personnes sur ce site"
 
-#: lib/searchgroupnav.php:83
 msgid "Find content of notices"
 msgstr "Chercher dans le contenu des avis"
 
-#: lib/searchgroupnav.php:85
 msgid "Find groups on this site"
 msgstr "Rechercher des groupes sur ce site"
 
-#: lib/section.php:89
 msgid "Untitled section"
 msgstr "Section sans titre"
 
-#: lib/section.php:106
 msgid "More..."
 msgstr "Plus..."
 
-#: lib/settingsnav.php:78
 msgid "Change your profile settings"
 msgstr "Modifier vos paramètres de profil"
 
-#: lib/settingsnav.php:83
 msgid "Upload an avatar"
 msgstr "Ajouter un avatar"
 
-#: lib/settingsnav.php:88
 msgid "Change your password"
 msgstr "Modifier votre mot de passe"
 
-#: lib/settingsnav.php:93
 msgid "Change email handling"
 msgstr "Modifier le traitement des courriels"
 
-#: lib/settingsnav.php:98
 msgid "Design your profile"
 msgstr "Concevez votre profil"
 
-#: lib/settingsnav.php:102
 msgid "URL"
 msgstr "URL"
 
-#: lib/settingsnav.php:103
 msgid "URL shorteners"
 msgstr ""
 
-#: lib/settingsnav.php:111
 msgid "Updates by instant messenger (IM)"
 msgstr "Suivi des avis par messagerie instantanée"
 
-#: lib/settingsnav.php:118
 msgid "Updates by SMS"
 msgstr "Suivi des avis par SMS"
 
-#: lib/settingsnav.php:123
-#, fuzzy
 msgid "Connections"
 msgstr "Connexions"
 
-#: lib/settingsnav.php:124
 msgid "Authorized connected applications"
 msgstr "Applications autorisées connectées"
 
-#: lib/silenceform.php:67
 msgid "Silence"
 msgstr "Silence"
 
-#: lib/silenceform.php:78
 msgid "Silence this user"
 msgstr "Réduire cet utilisateur au silence"
 
-#: lib/subgroupnav.php:89
 #, php-format
 msgid "People %s subscribes to"
 msgstr "Abonnements de %s"
 
-#: lib/subgroupnav.php:97
 #, php-format
 msgid "People subscribed to %s"
 msgstr "Abonnés de %s"
 
-#: lib/subgroupnav.php:105
 #, php-format
 msgid "Groups %s is a member of"
 msgstr "Groupes de %s"
 
-#: lib/subgroupnav.php:111
 msgid "Invite"
 msgstr "Inviter"
 
-#: lib/subgroupnav.php:112
 #, php-format
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Inviter des amis et collègues à vous rejoindre dans %s"
 
-#: lib/subscribeform.php:115 lib/subscribeform.php:139
 msgid "Subscribe to this user"
 msgstr "S’abonner à cet utilisateur"
 
-#: lib/subscriberspeopleselftagcloudsection.php:48
-#: lib/subscriptionspeopleselftagcloudsection.php:48
 msgid "People Tagcloud as self-tagged"
 msgstr "Nuage de marques pour une personne (ajoutées par eux-même)"
 
-#: lib/subscriberspeopletagcloudsection.php:48
-#: lib/subscriptionspeopletagcloudsection.php:48
 msgid "People Tagcloud as tagged"
 msgstr "Nuage de marques pour une personne"
 
-#: lib/tagcloudsection.php:56
 msgid "None"
 msgstr "Aucun"
 
 #. TRANS: Server exception displayed if a theme name was invalid.
-#: lib/theme.php:74
 msgid "Invalid theme name."
 msgstr "Nom de thème invalide."
 
-#: lib/themeuploader.php:50
 msgid "This server cannot handle theme uploads without ZIP support."
 msgstr ""
 "Le serveur ne peut pas gérer l’import de thèmes sans le support du format "
 "ZIP."
 
-#: lib/themeuploader.php:58 lib/themeuploader.php:61
 msgid "The theme file is missing or the upload failed."
 msgstr "Le fichier de thème est manquant ou le téléversement a échoué."
 
-#: lib/themeuploader.php:91 lib/themeuploader.php:102
-#: lib/themeuploader.php:279 lib/themeuploader.php:283
-#: lib/themeuploader.php:291 lib/themeuploader.php:298
 msgid "Failed saving theme."
 msgstr "L’enregistrement du thème a échoué."
 
-#: lib/themeuploader.php:147
 msgid "Invalid theme: bad directory structure."
 msgstr "Thème invalide : mauvaise arborescence."
 
-#: lib/themeuploader.php:166
 #, php-format
 msgid "Uploaded theme is too large; must be less than %d byte uncompressed."
 msgid_plural ""
@@ -9762,11 +8110,9 @@ msgstr[1] ""
 "Le thème téléversé est trop volumineux ; il doit occuper moins de %d octets "
 "une fois décompressé."
 
-#: lib/themeuploader.php:179
 msgid "Invalid theme archive: missing file css/display.css"
 msgstr "Archive de thème invalide : fichier css/display.css manquant"
 
-#: lib/themeuploader.php:219
 msgid ""
 "Theme contains invalid file or folder name. Stick with ASCII letters, "
 "digits, underscore, and minus sign."
@@ -9774,143 +8120,115 @@ msgstr ""
 "Le thème contient un nom de fichier ou de dossier invalide. Limitez-vous aux "
 "lettres ASCII et aux chiffres, caractère de soulignement et signe moins."
 
-#: lib/themeuploader.php:225
 msgid "Theme contains unsafe file extension names; may be unsafe."
 msgstr ""
 "Ce thème contient un nom d'extension de ficher dangereux; peut être "
 "dangereux."
 
-#: lib/themeuploader.php:242
 #, php-format
 msgid "Theme contains file of type '.%s', which is not allowed."
 msgstr "Le thème contient un fichier de type « .%s », qui n'est pas autorisé."
 
-#: lib/themeuploader.php:260
 msgid "Error opening theme archive."
 msgstr "Erreur lors de l’ouverture de l’archive du thème."
 
-#: lib/threadednoticelist.php:270
-#, php-format
-msgid "Show all %d comment"
-msgid_plural "Show all %d comments"
-msgstr[0] ""
-msgstr[1] ""
+#, fuzzy, php-format
+msgid "Show %d reply"
+msgid_plural "Show all %d replies"
+msgstr[0] "Voir davantage"
+msgstr[1] "Voir davantage"
 
-#: lib/topposterssection.php:74
 msgid "Top posters"
 msgstr "Utilisateurs les plus actifs"
 
 #. TRANS: Title for the form to unblock a user.
-#: lib/unblockform.php:67
 msgctxt "TITLE"
 msgid "Unblock"
 msgstr "Débloquer"
 
-#: lib/unsandboxform.php:69
 msgid "Unsandbox"
 msgstr "Sortir du bac à sable"
 
-#: lib/unsandboxform.php:80
 msgid "Unsandbox this user"
 msgstr "Sortir cet utilisateur du bac à sable"
 
-#: lib/unsilenceform.php:67
 msgid "Unsilence"
 msgstr "Sortir du silence"
 
-#: lib/unsilenceform.php:78
 msgid "Unsilence this user"
 msgstr "Sortir cet utilisateur du silence"
 
-#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
 msgid "Unsubscribe from this user"
 msgstr "Ne plus suivre cet utilisateur"
 
-#: lib/unsubscribeform.php:137
 msgid "Unsubscribe"
 msgstr "Désabonnement"
 
 #. 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).
-#: lib/usernoprofileexception.php:60
 #, php-format
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "L’utilisateur %1$s (%2$d) n’a pas de profil."
 
-#: lib/userprofile.php:116
 msgid "Edit Avatar"
 msgstr "Modifier l’avatar"
 
 #. TRANS: H2 for user actions in a profile.
 #. TRANS: H2 for entity actions in a profile.
-#: lib/userprofile.php:216 lib/userprofile.php:232
 msgid "User actions"
 msgstr "Actions de l’utilisateur"
 
 #. TRANS: Text shown in user profile of not yet compeltely deleted users.
-#: lib/userprofile.php:220
 msgid "User deletion in progress..."
 msgstr "Suppression de l'utilisateur en cours..."
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:248
 msgid "Edit profile settings"
 msgstr "Modifier les paramètres du profil"
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:250
 msgid "Edit"
 msgstr "Modifier"
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:274
 msgid "Send a direct message to this user"
 msgstr "Envoyer un message à cet utilisateur"
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:276
 msgid "Message"
 msgstr "Message"
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:318
 msgid "Moderate"
 msgstr "Modérer"
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:357
 msgid "User role"
 msgstr "Rôle de l'utilisateur"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:360
 msgctxt "role"
 msgid "Administrator"
 msgstr "Administrateur"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:362
 msgctxt "role"
 msgid "Moderator"
 msgstr "Modérateur"
 
-#: lib/util.php:321
 #, fuzzy
 msgid "Not allowed to log in."
 msgstr "Non connecté."
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1337
 msgid "a few seconds ago"
 msgstr "il y a quelques secondes"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1340
 msgid "about a minute ago"
 msgstr "il y a 1 minute"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1344
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
@@ -9918,12 +8236,10 @@ msgstr[0] "il y a environ une minute"
 msgstr[1] "il y a environ %d minutes"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1347
 msgid "about an hour ago"
 msgstr "il y a 1 heure"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1351
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
@@ -9931,12 +8247,10 @@ msgstr[0] "il y a environ une heure"
 msgstr[1] "il y a environ %d heures"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1354
 msgid "about a day ago"
 msgstr "il y a 1 jour"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1358
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
@@ -9944,12 +8258,10 @@ msgstr[0] "il y a environ un jour"
 msgstr[1] "il y a environ %d jours"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1361
 msgid "about a month ago"
 msgstr "il y a 1 mois"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1365
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
@@ -9957,211 +8269,42 @@ msgstr[0] "il y a environ un mois"
 msgstr[1] "il y a environ %d mois"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1368
 msgid "about a year ago"
 msgstr "il y a environ 1 an"
 
 #. TRANS: Web color exception thrown when a hexadecimal color code does not validate.
 #. TRANS: %s is the provided (invalid) color code.
-#: lib/webcolor.php:81 lib/webcolor.php:121
 #, php-format
 msgid "%s is not a valid color! Use 3 or 6 hex characters."
 msgstr ""
 "%s n’est pas une couleur valide ! Utilisez 3 ou 6 caractères hexadécimaux."
 
 #. TRANS: Exception.
-#: lib/xrd.php:63
 msgid "Invalid XML."
 msgstr "XML invalide."
 
 #. TRANS: Exception.
-#: lib/xrd.php:68
 msgid "Invalid XML, missing XRD root."
 msgstr "XML invalide, racine XRD manquante."
 
 #. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
-#: scripts/restoreuser.php:62
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr "Obtention de la sauvegarde depuis le fichier « %s »."
 
-#~ msgid "Could not generate feed for group - %s"
-#~ msgstr "Impossible de générer le flux pour le groupe — %s"
+#~ msgid "Full name is too long (max 255 chars)."
+#~ msgstr "Le nom complet est trop long (limité à 255 caractères maximum)."
+
+#~ msgid "description is too long (max %d chars)."
+#~ msgstr "la description est trop longue (%d caractères maximum)."
+
+#~ msgid "Location is too long (max 255 chars)."
+#~ msgstr "L’emplacement est trop long (limité à 255 caractères maximum)."
+
+#~ msgid "Too many aliases! Maximum %d."
+#~ msgstr "Trop d’alias ! Maximum %d."
 
 #, fuzzy
-#~ msgid "Current confirmed Jabber/Google Talk address."
-#~ msgstr "Adresse Jabber/GTalk actuellement confirmée."
-
-#, fuzzy
-#~ msgid ""
-#~ "Jabber or Google Talk address, like \"UserName@example.org\". First, make "
-#~ "sure to add %s to your buddy list in your IM client or on Google Talk."
-#~ msgstr ""
-#~ "Adresse Jabber ou GTalk (ex : nom@exemple.org). Assurez-vous d’ajouter %s "
-#~ "à votre liste d’amis dans votre logiciel de messagerie instantanée ou "
-#~ "dans GTalk."
-
-#, fuzzy
-#~ msgid "Send me notices through Jabber/Google Talk."
-#~ msgstr "Envoyez-moi les avis par Jabber/GTalk."
-
-#, fuzzy
-#~ msgid "Publish a MicroID for my Jabber/Google Talk address."
-#~ msgstr "Publier un MicroID pour mon adresse Jabber/GTalk."
-
-#~ msgid "No Jabber ID."
-#~ msgstr "Aucun identifiant Jabber"
-
-#, fuzzy
-#~ msgid "Not a valid Jabber ID."
-#~ msgstr "Identifiant Jabber invalide."
-
-#~ msgid "That is already your Jabber ID."
-#~ msgstr "Vous utilisez déjà cet idenfiant Jabber."
-
-#~ msgid "That is not your Jabber ID."
-#~ msgstr "Ceci n’est pas votre identifiant Jabber."
-
-#~ msgid "Other settings"
-#~ msgstr "Autres paramètres"
-
-#~ msgid "Tag cloud"
-#~ msgstr "Nuage de marques"
-
-#~ msgid "Consumer key"
-#~ msgstr "Clé de l’utilisateur"
-
-#~ msgid "Consumer secret"
-#~ msgstr "Secret de l’utilisateur"
-
-#~ msgid "Request token URL"
-#~ msgstr "URL du jeton de requête"
-
-#~ msgid "Access token URL"
-#~ msgstr "URL du jeton d’accès"
-
-#~ msgid "Authorize URL"
-#~ msgstr "Autoriser l’URL"
-
-#~ msgid "Jabber"
-#~ msgstr "Jabber"
-
-#~ msgid "Photo"
-#~ msgstr "Photo"
-
-#~ msgid "Other options"
-#~ msgstr "Autres options"
-
-#~ msgid "Other"
-#~ msgstr "Autres"
-
-#~ msgid "Primary site navigation"
-#~ msgstr "Navigation primaire du site"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Personal profile and friends timeline"
-#~ msgstr "Profil personnel et flux des amis"
-
-#~ msgctxt "MENU"
-#~ msgid "Personal"
-#~ msgstr "Personnel"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Change your email, avatar, password, profile"
-#~ msgstr "Modifier votre adresse électronique, avatar, mot de passe, profil"
-
-#~ msgid "Account"
-#~ msgstr "Compte"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Connect to services"
-#~ msgstr "Se connecter aux services"
-
-#~ msgid "Connect"
-#~ msgstr "Connexion"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Change site configuration"
-#~ msgstr "Modifier la configuration du site"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Invite friends and colleagues to join you on %s"
-#~ msgstr "Inviter des amis et collègues à vous rejoindre sur %s"
-
-#~ msgctxt "MENU"
-#~ msgid "Invite"
-#~ msgstr "Inviter"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Create an account"
-#~ msgstr "Créer un compte"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Help me!"
-#~ msgstr "À l’aide !"
-
-#~ msgctxt "MENU"
-#~ msgid "Help"
-#~ msgstr "Aide"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Search for people or text"
-#~ msgstr "Rechercher des personnes ou du texte"
-
-#~ msgid "Local views"
-#~ msgstr "Vues locales"
-
-#~ msgid "Page notice"
-#~ msgstr "Avis de la page"
-
-#~ msgid "Secondary site navigation"
-#~ msgstr "Navigation secondaire du site"
-
-#~ msgid "StatusNet software license"
-#~ msgstr "Licence du logiciel StatusNet"
-
-#~ msgid "Site content license"
-#~ msgstr "Licence du contenu du site"
-
-#~ msgid "Pagination"
-#~ msgstr "Pagination"
-
-#~ msgid "Author"
-#~ msgstr "Auteur"
-
-#~ msgid "Provider"
-#~ msgstr "Fournisseur"
-
-#~ msgctxt "MENU"
-#~ msgid "SMS"
-#~ msgstr "SMS"
-
-#~ msgid "Filter tags"
-#~ msgstr "Filtrer les marques"
-
-#~ msgid "[%s]"
-#~ msgstr "[%s]"
-
-#~ msgid "Available characters"
-#~ msgstr "Caractères restants"
-
-#, fuzzy
-#~ msgctxt "MENU"
-#~ msgid "Profile"
-#~ msgstr "Profil"
-
-#~ msgid "Search help"
-#~ msgstr "Aide sur la recherche"
-
-#~ msgid "Unknown user. Go to %s to add your address to your account"
-#~ msgstr ""
-#~ "Utilisateur inconnu. Aller à %s pour ajouter votre adresse à votre compte."
-
-#~ msgid "Message too long. Maximum is %1$d character, you sent %2$d."
-#~ msgid_plural "Message too long. Maximum is %1$d characters, you sent %2$d."
-#~ msgstr[0] ""
-#~ "Message trop long ! La taille maximale est de %1$d caractère ; vous en "
-#~ "avez envoyé %2$d."
-#~ msgstr[1] ""
-#~ "Message trop long ! La taille maximale est de %1$d caractères ; vous en "
-#~ "avez envoyé %2$d."
+#~ msgctxt "BUTTON"
+#~ msgid "Comment"
+#~ msgstr "Contenu"
diff --git a/locale/fur/LC_MESSAGES/statusnet.po b/locale/fur/LC_MESSAGES/statusnet.po
index 83e8336715..feef13b8d9 100644
--- a/locale/fur/LC_MESSAGES/statusnet.po
+++ b/locale/fur/LC_MESSAGES/statusnet.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:23+0000\n"
-"PO-Revision-Date: 2011-03-03 17:26:01+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:20+0000\n"
 "Language-Team: Friulian <http://translatewiki.net/wiki/Portal:fur>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-25 23:49:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:59:19+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fur\n"
 "X-Message-Group: #out-statusnet-core\n"
@@ -23,53 +23,43 @@ msgstr ""
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
-#: actions/accessadminpanel.php:53 lib/adminpanelaction.php:363
 msgid "Access"
 msgstr "Acès"
 
 #. TRANS: Page notice.
-#: actions/accessadminpanel.php:64
 msgid "Site access settings"
 msgstr ""
 
 #. TRANS: Form legend for registration form.
-#: actions/accessadminpanel.php:151
 msgid "Registration"
 msgstr "Regjistrazion"
 
 #. TRANS: Checkbox instructions for admin setting "Private".
-#: actions/accessadminpanel.php:155
 msgid "Prohibit anonymous users (not logged in) from viewing site?"
 msgstr ""
 
 #. TRANS: Checkbox label for prohibiting anonymous users from viewing site.
-#: actions/accessadminpanel.php:157
 msgctxt "LABEL"
 msgid "Private"
 msgstr "Privât"
 
 #. TRANS: Checkbox instructions for admin setting "Invite only".
-#: actions/accessadminpanel.php:164
 msgid "Make registration invitation only."
 msgstr ""
 
 #. TRANS: Checkbox label for configuring site as invite only.
-#: actions/accessadminpanel.php:166
 msgid "Invite only"
 msgstr ""
 
 #. TRANS: Checkbox instructions for admin setting "Closed" (no new registrations).
-#: actions/accessadminpanel.php:173
 msgid "Disable new registrations."
 msgstr ""
 
 #. TRANS: Checkbox label for disabling new user registrations.
-#: actions/accessadminpanel.php:175
 msgid "Closed"
 msgstr "Sierât"
 
 #. TRANS: Title for button to save access settings in site admin panel.
-#: actions/accessadminpanel.php:191
 msgid "Save access settings"
 msgstr ""
 
@@ -77,6 +67,7 @@ msgstr ""
 #. TRANS: Button text for saving theme settings.
 #. TRANS: Button label to save e-mail preferences.
 #. TRANS: Button label to save IM preferences.
+#. TRANS: Button text in the license admin panel.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
 #. TRANS: Button text for saving site notice in admin panel.
@@ -86,21 +77,12 @@ msgstr ""
 #. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
 #. TRANS: Button text on profile design page to save settings.
-#: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
-#: actions/emailsettings.php:251 actions/imsettings.php:199
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:198
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:204
-#: actions/subscriptions.php:261 actions/urlsettings.php:152
-#: actions/useradminpanel.php:298 lib/applicationeditform.php:355
-#: lib/designform.php:320 lib/groupeditform.php:201
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Salve"
 
 #. TRANS: Server error when page not found (404).
 #. TRANS: Server error when page not found (404)
-#: actions/all.php:68 actions/public.php:98 actions/replies.php:93
-#: actions/showfavorites.php:140 actions/tag.php:52
 msgid "No such page."
 msgstr "La pagjine no esist."
 
@@ -119,6 +101,7 @@ msgstr "La pagjine no esist."
 #. TRANS: Client error displayed when checking group membership for a non-existing user.
 #. TRANS: Client error displayed when trying to have a non-existing user join a group.
 #. TRANS: Client error displayed when trying to have a non-existing user leave a group.
+#. TRANS: Client error displayed when not providing a user or an invalid user.
 #. TRANS: Client error displayed when updating a status for a non-existing user.
 #. TRANS: Client error displayed when requesting a list of followers for a non-existing user.
 #. TRANS: Client error displayed when requesting most recent favourite notices by a user for a non-existing user.
@@ -131,6 +114,8 @@ msgstr "La pagjine no esist."
 #. 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.
 #. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
@@ -138,33 +123,10 @@ msgstr "La pagjine no esist."
 #. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when calling a profile action without specifying a user.
-#: actions/all.php:80 actions/allrss.php:69
-#: actions/apiaccountupdatedeliverydevice.php:110
-#: actions/apiaccountupdateprofile.php:103
-#: actions/apiaccountupdateprofilebackgroundimage.php:118
-#: actions/apiaccountupdateprofileimage.php:104 actions/apiatomservice.php:59
-#: actions/apiblockcreate.php:96 actions/apiblockdestroy.php:94
-#: actions/apidirectmessage.php:75 actions/apidirectmessagenew.php:72
-#: actions/apigroupcreate.php:111 actions/apigroupismember.php:89
-#: actions/apigroupjoin.php:98 actions/apigroupleave.php:98
-#: actions/apigrouplist.php:70 actions/apigroupprofileupdate.php:108
-#: actions/apistatusesupdate.php:230 actions/apisubscriptions.php:85
-#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:173
-#: actions/apitimelinehome.php:78 actions/apitimelinementions.php:77
-#: actions/apitimelineuser.php:79 actions/avatarbynickname.php:79
-#: actions/favoritesrss.php:72 actions/foaf.php:42 actions/foaf.php:61
-#: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116
-#: actions/otp.php:78 actions/remotesubscribe.php:144
-#: actions/remotesubscribe.php:153 actions/replies.php:73
-#: actions/repliesrss.php:38 actions/rsd.php:113 actions/showfavorites.php:106
-#: actions/userbyid.php:75 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/userxrd.php:59 actions/xrds.php:71 lib/command.php:509
-#: lib/galleryaction.php:59 lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Utent no cjatât."
 
 #. TRANS: Page title. %1$s is user nickname, %2$d is page number
-#: actions/all.php:91
 #, php-format
 msgid "%1$s and friends, page %2$d"
 msgstr "%1$s e ams, page %2$d"
@@ -173,33 +135,26 @@ msgstr "%1$s e ams, page %2$d"
 #. TRANS: H1 text for page. %s is a user nickname.
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Timeline title for user and friends. %s is a user nickname.
-#: actions/all.php:94 actions/all.php:191 actions/allrss.php:117
-#: actions/apitimelinefriends.php:207 actions/apitimelinehome.php:113
-#: lib/personalgroupnav.php:100
 #, php-format
 msgid "%s and friends"
 msgstr "%s e amîs"
 
 #. TRANS: %s is user nickname.
-#: actions/all.php:108
 #, php-format
 msgid "Feed for friends of %s (RSS 1.0)"
 msgstr "Canâl dai amîs di %s (RSS 1.0)"
 
 #. TRANS: %s is user nickname.
-#: actions/all.php:117
 #, php-format
 msgid "Feed for friends of %s (RSS 2.0)"
 msgstr "Canâl dai amîs di %s (RSS 2.0)"
 
 #. TRANS: %s is user nickname.
-#: actions/all.php:126
 #, php-format
 msgid "Feed for friends of %s (Atom)"
 msgstr "Canâl dai amîs di %s (Atom)"
 
 #. TRANS: Empty list message. %s is a user nickname.
-#: actions/all.php:139
 #, php-format
 msgid ""
 "This is the timeline for %s and friends but no one has posted anything yet."
@@ -207,7 +162,6 @@ msgstr ""
 
 #. TRANS: Encouragement displayed on logged in user's empty timeline.
 #. TRANS: This message contains Markdown links. Keep "](" together.
-#: actions/all.php:146
 #, php-format
 msgid ""
 "Try subscribing to more people, [join a group](%%action.groups%%) or post "
@@ -218,7 +172,6 @@ msgstr ""
 
 #. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@".
 #. TRANS: This message contains Markdown links. Keep "](" together.
-#: actions/all.php:150
 #, php-format
 msgid ""
 "You can try to [nudge %1$s](../%2$s) from their profile or [post something "
@@ -229,7 +182,6 @@ msgstr ""
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
 #. TRANS: Second sentence of empty message for anonymous users. %s is a user nickname.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:221
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -237,14 +189,11 @@ msgid ""
 msgstr ""
 
 #. TRANS: H1 text for page when viewing a list for self.
-#: actions/all.php:188
 msgid "You and friends"
 msgstr "Tu e i tiei amîs"
 
 #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
 #. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name.
-#: actions/allrss.php:122 actions/apitimelinefriends.php:213
-#: actions/apitimelinehome.php:119
 #, php-format
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr "Inzornaments di %1$s e dai siei amîs su %2$s!"
@@ -263,55 +212,20 @@ msgstr "Inzornaments di %1$s e dai siei amîs su %2$s!"
 #. TRANS: Client error displayed trying to execute an unknown API method checking group membership.
 #. TRANS: Client error displayed trying to execute an unknown API method listing the latest 20 groups.
 #. TRANS: Client error displayed trying to execute an unknown API method showing group membership.
+#. TRANS: Client error displayed when using an unsupported API format.
 #. TRANS: Client error displayed trying to execute an unknown API method showing a group.
 #. TRANS: Client error displayed trying to execute an unknown API method testing API connectivity.
 #. TRANS: Client error displayed trying to execute an unknown API method deleting a status.
 #. TRANS: Client error displayed when trying to handle an unknown API method.
-#: actions/apiaccountratelimitstatus.php:69
-#: actions/apiaccountupdatedeliverydevice.php:92
-#: actions/apiaccountupdateprofile.php:94
-#: actions/apiaccountupdateprofilebackgroundimage.php:92
-#: actions/apiaccountupdateprofilecolors.php:115
-#: actions/apiaccountverifycredentials.php:68 actions/apidirectmessage.php:157
-#: actions/apifavoritecreate.php:98 actions/apifavoritedestroy.php:98
-#: actions/apifriendshipscreate.php:99 actions/apifriendshipsdestroy.php:99
-#: actions/apifriendshipsshow.php:124 actions/apigroupcreate.php:138
-#: actions/apigroupismember.php:115 actions/apigroupjoin.php:151
-#: actions/apigroupleave.php:141 actions/apigrouplist.php:134
-#: actions/apigrouplistall.php:120 actions/apigroupmembership.php:105
-#: actions/apigroupprofileupdate.php:100 actions/apigroupprofileupdate.php:213
-#: actions/apigroupshow.php:114 actions/apihelptest.php:84
-#: actions/apistatusesdestroy.php:101 actions/apistatusesretweets.php:110
-#: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:139
-#: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
-#: actions/apitimelinefavorites.php:182 actions/apitimelinefriends.php:276
-#: actions/apitimelinegroup.php:148 actions/apitimelinehome.php:181
-#: actions/apitimelinementions.php:182 actions/apitimelinepublic.php:247
-#: actions/apitimelineretweetedtome.php:147
-#: actions/apitimelineretweetsofme.php:147 actions/apitimelinetag.php:165
-#: actions/apitimelineuser.php:217 actions/apiusershow.php:100
 msgid "API method not found."
 msgstr ""
 
 #. 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.
-#: actions/apiaccountupdatedeliverydevice.php:83
-#: actions/apiaccountupdateprofile.php:85
-#: actions/apiaccountupdateprofilebackgroundimage.php:83
-#: actions/apiaccountupdateprofilecolors.php:106
-#: actions/apiaccountupdateprofileimage.php:80 actions/apiblockcreate.php:87
-#: actions/apiblockdestroy.php:85 actions/apidirectmessagenew.php:107
-#: actions/apifavoritecreate.php:88 actions/apifavoritedestroy.php:88
-#: actions/apifriendshipscreate.php:89 actions/apifriendshipsdestroy.php:89
-#: actions/apigroupcreate.php:102 actions/apigroupjoin.php:89
-#: actions/apigroupleave.php:89 actions/apigroupprofileupdate.php:92
-#: actions/apimediaupload.php:66 actions/apistatusesretweet.php:63
-#: actions/apistatusesupdate.php:194
 msgid "This method requires a POST."
 msgstr ""
 
 #. TRANS: Client error displayed when no valid device parameter is provided for a user's delivery device setting.
-#: actions/apiaccountupdatedeliverydevice.php:103
 msgid ""
 "You must specify a parameter named 'device' with a value of one of: sms, im, "
 "none."
@@ -324,10 +238,6 @@ msgstr ""
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
-#: actions/apiaccountupdatedeliverydevice.php:136
-#: actions/emailsettings.php:353 actions/emailsettings.php:499
-#: actions/profilesettings.php:323 actions/smssettings.php:300
-#: actions/smssettings.php:453 actions/urlsettings.php:211
 msgid "Could not update user."
 msgstr ""
 
@@ -340,32 +250,17 @@ msgstr ""
 #. TRANS: Server error displayed when requesting Friends of a Friend feed for a user for which the profile could not be found.
 #. TRANS: Server error displayed when trying to get a user hCard for a user without a profile.
 #. TRANS: Server error displayed when calling a profile action while the specified user does not have a profile.
-#: actions/apiaccountupdateprofile.php:111
-#: actions/apiaccountupdateprofilebackgroundimage.php:199
-#: actions/apiaccountupdateprofilecolors.php:183
-#: actions/apiaccountupdateprofileimage.php:131
-#: actions/apiuserprofileimage.php:88 actions/apiusershow.php:108
-#: actions/avatarbynickname.php:85 actions/foaf.php:69 actions/hcard.php:75
-#: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
-#: lib/profileaction.php:85
 msgid "User has no profile."
 msgstr "L'utent nol à un profîl."
 
 #. TRANS: Server error displayed if a user profile could not be saved.
 #. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:419
 msgid "Could not save profile."
 msgstr ""
 
 #. TRANS: Client error displayed when the number of bytes in a POST request exceeds a limit.
 #. TRANS: %s is the number of bytes of the CONTENT_LENGTH.
 #. TRANS: Form validation error in design settings form. POST should remain untranslated.
-#: actions/apiaccountupdateprofilebackgroundimage.php:108
-#: actions/apiaccountupdateprofileimage.php:95 actions/apimediaupload.php:81
-#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
-#: actions/designadminpanel.php:120 actions/editapplication.php:121
-#: actions/newapplication.php:102 actions/newnotice.php:95
-#: lib/designsettings.php:110
 #, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s byte) due to its "
@@ -381,26 +276,15 @@ msgstr[1] ""
 #. TRANS: Client error displayed when a database error occurs inserting profile colours.
 #. TRANS: Client error displayed when a database error occurs updating profile colours.
 #. TRANS: Form validation error displayed when group design settings could not be saved because of an application issue.
-#: actions/apiaccountupdateprofilebackgroundimage.php:138
-#: actions/apiaccountupdateprofilebackgroundimage.php:149
-#: actions/apiaccountupdateprofilecolors.php:160
-#: actions/apiaccountupdateprofilecolors.php:171
-#: actions/groupdesignsettings.php:285 actions/groupdesignsettings.php:296
-#: actions/userdesignsettings.php:218 actions/userdesignsettings.php:228
-#: actions/userdesignsettings.php:270 actions/userdesignsettings.php:280
 msgid "Unable to save your design settings."
 msgstr ""
 
 #. TRANS: Error displayed when updating design settings fails.
 #. TRANS: Client error displayed when a database error occurs updating profile colours.
-#: actions/apiaccountupdateprofilebackgroundimage.php:191
-#: actions/apiaccountupdateprofilecolors.php:139
-#: actions/userdesignsettings.php:196
 msgid "Could not update your design."
 msgstr ""
 
 #. TRANS: Title for Atom feed.
-#: actions/apiatomservice.php:85
 msgctxt "ATOM"
 msgid "Main"
 msgstr "Principâl"
@@ -409,9 +293,6 @@ msgstr "Principâl"
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Title in atom group notice feed. %s is a group name.
 #. TRANS: Title in atom user notice feed. %s is a user name.
-#: actions/apiatomservice.php:93 actions/grouprss.php:138
-#: actions/userrss.php:94 lib/atomgroupnoticefeed.php:63
-#: lib/atomusernoticefeed.php:88
 #, php-format
 msgid "%s timeline"
 msgstr "Ativitât di %s"
@@ -421,8 +302,6 @@ msgstr "Ativitât di %s"
 #. TRANS: %s is a user nickname.
 #. TRANS: Header for subscriptions overview for a user (first page).
 #. TRANS: %s is a user nickname.
-#: actions/apiatomservice.php:104 actions/atompubsubscriptionfeed.php:148
-#: actions/subscriptions.php:51
 #, php-format
 msgid "%s subscriptions"
 msgstr "Sotscrizions di %s"
@@ -430,58 +309,48 @@ msgstr "Sotscrizions di %s"
 #. TRANS: Title for Atom feed with a user's favorite notices. %s is a user nickname.
 #. TRANS: Title for Atom favorites feed.
 #. TRANS: %s is a user nickname.
-#: actions/apiatomservice.php:115 actions/atompubfavoritefeed.php:142
 #, php-format
 msgid "%s favorites"
 msgstr "Preferîts di %s"
 
 #. TRANS: Title for Atom feed with a user's memberships. %s is a user nickname.
-#: actions/apiatomservice.php:126
 #, php-format
 msgid "%s memberships"
 msgstr "Grups di %s"
 
 #. TRANS: Client error displayed when users try to block themselves.
-#: actions/apiblockcreate.php:105
 msgid "You cannot block yourself!"
 msgstr ""
 
 #. TRANS: Server error displayed when blocking a user has failed.
-#: actions/apiblockcreate.php:127
 msgid "Block user failed."
 msgstr ""
 
 #. TRANS: Server error displayed when unblocking a user has failed.
-#: actions/apiblockdestroy.php:113
 msgid "Unblock user failed."
 msgstr ""
 
 #. TRANS: Title. %s is a user nickname.
-#: actions/apidirectmessage.php:88
 #, php-format
 msgid "Direct messages from %s"
 msgstr "Messaçs direts di %s"
 
 #. TRANS: Subtitle. %s is a user nickname.
-#: actions/apidirectmessage.php:93
 #, php-format
 msgid "All the direct messages sent from %s"
 msgstr "Ducj i messaçs direts inviâts di %s"
 
 #. TRANS: Title. %s is a user nickname.
-#: actions/apidirectmessage.php:102
 #, php-format
 msgid "Direct messages to %s"
 msgstr "Messaçs direts par %s"
 
 #. TRANS: Subtitle. %s is a user nickname.
-#: actions/apidirectmessage.php:107
 #, php-format
 msgid "All the direct messages sent to %s"
 msgstr "Ducj i messaçs direts inviâts a %s"
 
 #. TRANS: Client error displayed when no message text was submitted (406).
-#: actions/apidirectmessagenew.php:117
 msgid "No message text!"
 msgstr "Nissun test tal messaç!"
 
@@ -489,7 +358,6 @@ msgstr "Nissun test tal messaç!"
 #. TRANS: %d is the maximum number of characters for a message.
 #. TRANS: Form validation error displayed when message content is too long.
 #. TRANS: %d is the maximum number of characters for a message.
-#: actions/apidirectmessagenew.php:127 actions/newmessage.php:152
 #, php-format
 msgid "That's too long. Maximum message size is %d character."
 msgid_plural "That's too long. Maximum message size is %d characters."
@@ -499,17 +367,14 @@ msgstr[1] ""
 "Test masse lunc. La lungjece massime pai messaçs e je di %d caratars."
 
 #. TRANS: Client error displayed if a recipient user could not be found (403).
-#: actions/apidirectmessagenew.php:139
 msgid "Recipient user not found."
 msgstr ""
 
 #. TRANS: Client error displayed trying to direct message another user who's not a friend (403).
-#: actions/apidirectmessagenew.php:144
 msgid "Cannot send direct messages to users who aren't your friend."
 msgstr ""
 
 #. TRANS: Client error displayed trying to direct message self (403).
-#: actions/apidirectmessagenew.php:154
 msgid ""
 "Do not send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
@@ -517,116 +382,96 @@ 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.
 #. TRANS: Client error displayed trying to delete a status with an invalid ID.
-#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:108
-#: actions/apistatusesdestroy.php:121
 msgid "No status found with that ID."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to mark a notice favourite that already is a favourite.
-#: actions/apifavoritecreate.php:120
 msgid "This status is already a favorite."
 msgstr ""
 
 #. TRANS: Client error displayed when marking a notice as favourite fails.
 #. TRANS: Server error displayed when trying to mark a notice as favorite fails in the database.
 #. TRANS: Error message text shown when a favorite could not be set.
-#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:306
 msgid "Could not create favorite."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to remove a favourite that was not a favourite.
-#: actions/apifavoritedestroy.php:122
 msgid "That status is not a favorite."
 msgstr ""
 
 #. TRANS: Client error displayed when removing a favourite has failed.
 #. TRANS: Server error displayed when removing a favorite from the database fails.
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:90
 msgid "Could not delete favorite."
 msgstr ""
 
 #. TRANS: Client error displayed when trying follow who's profile could not be found.
-#: actions/apifriendshipscreate.php:109
 msgid "Could not follow user: profile not found."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to follow a user that's already being followed.
 #. TRANS: %s is the nickname of the user that is already being followed.
-#: actions/apifriendshipscreate.php:120
 #, php-format
 msgid "Could not follow user: %s is already on your list."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to unfollow a user that cannot be found.
-#: actions/apifriendshipsdestroy.php:109
 msgid "Could not unfollow user: User not found."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to unfollow self.
-#: actions/apifriendshipsdestroy.php:121
 msgid "You cannot unfollow yourself."
 msgstr ""
 
 #. TRANS: Client error displayed when supplying invalid parameters to an API call checking if a friendship exists.
-#: actions/apifriendshipsexists.php:88
 msgid "Two valid IDs or nick names must be supplied."
 msgstr ""
 
 #. TRANS: Client error displayed when a source user could not be determined showing friendship.
-#: actions/apifriendshipsshow.php:131
 msgid "Could not determine source user."
 msgstr ""
 
 #. TRANS: Client error displayed when a target user could not be determined showing friendship.
-#: actions/apifriendshipsshow.php:140
 msgid "Could not find target user."
 msgstr ""
 
 #. TRANS: Client error trying to create a group with a nickname this is already in use.
+#. TRANS: API validation exception thrown when nickname is already used.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:156 actions/apigroupprofileupdate.php:255
-#: actions/editgroup.php:191 actions/newgroup.php:137
-#: actions/profilesettings.php:274 actions/register.php:199
 msgid "Nickname already in use. Try another one."
 msgstr "Il sorenon al è za doprât. Provent un altri."
 
 #. TRANS: Client error in form for group creation.
+#. TRANS: API validation exception thrown when nickname does not validate.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:164 actions/apigroupprofileupdate.php:259
-#: actions/editgroup.php:195 actions/newgroup.php:141
-#: actions/profilesettings.php:244 actions/register.php:201
 msgid "Not a valid nickname."
 msgstr "Nol è un sorenon valit."
 
 #. TRANS: Client error in form for group creation.
+#. TRANS: API validation exception thrown when homepage URL does not validate.
 #. TRANS: Validation error shown when providing an invalid homepage URL in the "Edit application" form.
 #. TRANS: Group edit form validation error.
 #. TRANS: Validation error shown when providing an invalid homepage URL in the "New application" form.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:181 actions/apigroupprofileupdate.php:277
-#: actions/editapplication.php:235 actions/editgroup.php:202
-#: actions/newapplication.php:221 actions/newgroup.php:148
-#: actions/profilesettings.php:249 actions/register.php:208
 msgid "Homepage is not a valid URL."
 msgstr "La pagjine web no je une direzion valide."
 
 #. TRANS: Client error in form for group creation.
+#. TRANS: API validation exception thrown when full name does not validate.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:191 actions/editgroup.php:206
-#: actions/newgroup.php:152 actions/profilesettings.php:253
-#: actions/register.php:211
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "Il non complet al è masse lunc (max 255 caratars)."
 
 #. TRANS: Client error shown when providing too long a description during group creation.
 #. TRANS: %d is the maximum number of allowed characters.
+#. TRANS: API validation exception thrown when description does not validate.
+#. TRANS: %d is the maximum description length and used for plural.
 #. TRANS: Validation error shown when providing too long a description in the "Edit application" form.
 #. TRANS: %d is the maximum number of allowed characters.
 #. TRANS: Group edit form validation error.
@@ -634,9 +479,6 @@ msgstr "Il non complet al è masse lunc (max 255 caratars)."
 #. TRANS: %d is the maximum number of characters for the description.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed characters.
-#: actions/apigroupcreate.php:201 actions/editapplication.php:202
-#: actions/editgroup.php:211 actions/newapplication.php:182
-#: actions/newgroup.php:157
 #, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."
@@ -644,23 +486,21 @@ msgstr[0] "La descrizion e je masse lungje (massim %d caratar)."
 msgstr[1] "La descrizion e je masse lungje (massim %d caratars)."
 
 #. TRANS: Client error shown when providing too long a location during group creation.
+#. TRANS: API validation exception thrown when location does not validate.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:215 actions/editgroup.php:218
-#: actions/newgroup.php:164 actions/profilesettings.php:266
-#: actions/register.php:220
 msgid "Location is too long (maximum 255 characters)."
 msgstr "Il lûc al è masse lunc (max 255 caratars)."
 
 #. TRANS: Client error shown when providing too many aliases during group creation.
 #. TRANS: %d is the maximum number of allowed aliases.
+#. TRANS: API validation exception thrown when aliases do not validate.
+#. TRANS: %d is the maximum number of aliases and used for plural.
 #. TRANS: Group edit form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.
-#: actions/apigroupcreate.php:236 actions/editgroup.php:231
-#: actions/newgroup.php:177
 #, php-format
 msgid "Too many aliases! Maximum %d allowed."
 msgid_plural "Too many aliases! Maximum %d allowed."
@@ -669,25 +509,24 @@ msgstr[1] ""
 
 #. TRANS: Client error shown when providing an invalid alias during group creation.
 #. TRANS: %s is the invalid alias.
-#: actions/apigroupcreate.php:253
+#. TRANS: API validation exception thrown when aliases does not validate.
+#. TRANS: %s is the invalid alias.
 #, php-format
 msgid "Invalid alias: \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to use an alias during group creation that is already in use.
 #. TRANS: %s is the alias that is already in use.
+#. TRANS: API validation exception thrown when aliases is already used.
+#. TRANS: %s is the already used alias.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error. %s is the already used alias.
-#: actions/apigroupcreate.php:264 actions/apigroupprofileupdate.php:351
-#: actions/editgroup.php:246 actions/newgroup.php:193
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to use an alias during group creation that is the same as the group's nickname.
 #. TRANS: Group edit form validation error.
-#: actions/apigroupcreate.php:278 actions/apigroupprofileupdate.php:359
-#: actions/editgroup.php:253
 msgid "Alias can't be the same as nickname."
 msgstr ""
 
@@ -695,26 +534,21 @@ msgstr ""
 #. TRANS: Client error displayed when trying to join a group that does not exist.
 #. TRANS: Client error displayed when trying to leave a group that does not exist.
 #. TRANS: Client error displayed trying to show group membership on a non-existing group.
+#. TRANS: Client error displayed when not providing a group or an invalid group.
 #. TRANS: Client error displayed when trying to show a group that could not be found.
 #. TRANS: Client error displayed requesting most recent notices to a group for a non-existing group.
-#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
-#: actions/apigroupleave.php:104 actions/apigroupmembership.php:71
-#: actions/apigroupprofileupdate.php:113 actions/apigroupshow.php:81
-#: actions/apitimelinegroup.php:89
 msgid "Group not found."
 msgstr "Grup no cjatât."
 
 #. TRANS: Server error displayed when trying to join a group the user is already a member of.
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:345
 msgid "You are already a member of that group."
 msgstr "Tu fasis za part di chest grup."
 
 #. TRANS: Server error displayed when trying to join a group the user is blocked from joining.
 #. 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.
-#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:350
 msgid "You have been blocked from that group by the admin."
 msgstr ""
 
@@ -722,13 +556,11 @@ msgstr ""
 #. TRANS: %1$s is the joining user's nickname, $2$s is the group nickname for which the join failed.
 #. TRANS: Message given having failed to add a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:136 actions/joingroup.php:139 lib/command.php:362
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "No si à podût zontâ l'utent %1$s al grup %2$s."
 
 #. TRANS: Server error displayed when trying to leave a group the user is not a member of.
-#: actions/apigroupleave.php:115
 msgid "You are not a member of this group."
 msgstr "No tu fasis part di chest grup."
 
@@ -736,114 +568,76 @@ msgstr "No tu fasis part di chest grup."
 #. TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
 #. TRANS: Message given having failed to remove a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupleave.php:127 actions/leavegroup.php:133
-#: lib/command.php:410
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
 msgstr ""
 
 #. TRANS: Used as title in check for group membership. %s is a user name.
-#: actions/apigrouplist.php:94
 #, php-format
 msgid "%s's groups"
 msgstr "Grups di %s"
 
 #. TRANS: Used as subtitle in check for group membership. %1$s is a user name, %2$s is the site name.
-#: actions/apigrouplist.php:104
 #, php-format
 msgid "%1$s groups %2$s is a member of."
 msgstr ""
 
 #. TRANS: Message is used as a title when listing the lastest 20 groups. %s is a site name.
 #. TRANS: Message is used as a page title. %s is a nick name.
-#: actions/apigrouplistall.php:88 actions/usergroups.php:63
 #, php-format
 msgid "%s groups"
 msgstr "Grups di %s"
 
 #. TRANS: Message is used as a subtitle when listing the lastest 20 groups. %s is a site name.
-#: actions/apigrouplistall.php:93
 #, php-format
 msgid "groups on %s"
 msgstr "grups su %s"
 
+#. TRANS: Client error displayed when trying to edit a group without being an admin.
 #. TRANS: Client error displayed trying to edit a group while not being a group admin.
 #. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
 #. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
-#: actions/apigroupprofileupdate.php:118 actions/editgroup.php:110
-#: actions/editgroup.php:176 actions/groupdesignsettings.php:109
-#: actions/grouplogo.php:111
 msgid "You must be an admin to edit the group."
 msgstr ""
 
+#. TRANS: Server error displayed when group update fails.
 #. TRANS: Server error displayed when editing a group fails.
-#: actions/apigroupprofileupdate.php:171 actions/editgroup.php:274
 msgid "Could not update group."
 msgstr ""
 
+#. TRANS: Server error displayed when adding group aliases fails.
 #. TRANS: Server error displayed when group aliases could not be added.
 #. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/apigroupprofileupdate.php:194 actions/editgroup.php:281
-#: classes/User_group.php:540
 msgid "Could not create aliases."
 msgstr ""
 
+#. TRANS: API validation exception thrown when nickname does not validate.
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: actions/apigroupprofileupdate.php:249 lib/nickname.php:165
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr ""
 
-#: actions/apigroupprofileupdate.php:286
-#, fuzzy
-msgid "Full name is too long (max 255 chars)."
-msgstr "Il non complet al è masse lunc (max 255 caratars)."
-
-#: actions/apigroupprofileupdate.php:296
-#, fuzzy, php-format
-msgid "description is too long (max %d chars)."
-msgstr "La descrizion e je masse lungje (massim %d caratar)."
-
-#: actions/apigroupprofileupdate.php:307
-#, fuzzy
-msgid "Location is too long (max 255 chars)."
-msgstr "Il lûc al è masse lunc (max 255 caratars)."
-
-#: actions/apigroupprofileupdate.php:326
-#, php-format
-msgid "Too many aliases! Maximum %d."
-msgstr ""
-
-#. TRANS: Group edit form validation error.
+#. TRANS: API validation exception thrown when alias is the same as nickname.
 #. TRANS: Group create form validation error.
-#. TRANS: %s is the invalid alias.
-#: actions/apigroupprofileupdate.php:342 actions/editgroup.php:241
-#: actions/newgroup.php:188
-#, php-format
-msgid "Invalid alias: \"%s\""
+msgid "Alias cannot be the same as nickname."
 msgstr ""
 
 #. TRANS: Client error displayed when uploading a media file has failed.
-#: actions/apimediaupload.php:101
 msgid "Upload failed."
 msgstr "Cjamade falide."
 
 #. TRANS: Client error given from the OAuth API when the request token or verifier is invalid.
-#: actions/apioauthaccesstoken.php:102
 msgid "Invalid request token or verifier."
 msgstr ""
 
 #. TRANS: Client error given when no oauth_token was passed to the OAuth API.
-#: actions/apioauthauthorize.php:107
 msgid "No oauth_token parameter provided."
 msgstr ""
 
 #. TRANS: Client error given when an invalid request token was passed to the OAuth API.
-#: actions/apioauthauthorize.php:115 actions/apioauthauthorize.php:129
 msgid "Invalid request token."
 msgstr ""
 
 #. TRANS: Client error given when an invalid request token was passed to the OAuth API.
-#: actions/apioauthauthorize.php:121
 msgid "Request token already authorized."
 msgstr ""
 
@@ -853,31 +647,14 @@ msgstr ""
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
 #. TRANS: Client error displayed when the session token is not okay.
-#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:75
-#: actions/emailsettings.php:292 actions/favor.php:75 actions/geocode.php:55
-#: actions/groupblock.php:65 actions/grouplogo.php:321
-#: actions/groupunblock.php:65 actions/imsettings.php:241
-#: actions/invite.php:60 actions/makeadmin.php:66 actions/newmessage.php:135
-#: actions/newnotice.php:105 actions/nudge.php:80
-#: actions/oauthappssettings.php:162 actions/oauthconnectionssettings.php:135
-#: actions/passwordsettings.php:137 actions/pluginenable.php:87
-#: actions/profilesettings.php:218 actions/recoverpassword.php:383
-#: actions/register.php:157 actions/remotesubscribe.php:76
-#: actions/repeat.php:82 actions/smssettings.php:249 actions/subedit.php:40
-#: actions/subscribe.php:87 actions/tagother.php:145
-#: actions/unsubscribe.php:69 actions/urlsettings.php:171
-#: actions/userauthorization.php:53 lib/designsettings.php:122
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 
 #. TRANS: Form validation error given when an invalid username and/or password was passed to the OAuth API.
-#: actions/apioauthauthorize.php:168
 msgid "Invalid nickname / password!"
 msgstr "Il sorenon o la password no son valits."
 
 #. TRANS: Server error displayed when a database action fails.
-#: actions/apioauthauthorize.php:217
 msgid "Database error inserting oauth_token_association."
 msgstr ""
 
@@ -893,28 +670,19 @@ msgstr ""
 #. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
 #. TRANS: Message given submitting a form with an unknown action in SMS settings.
 #. TRANS: Unknown form validation error in design settings form.
-#: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
-#: actions/designadminpanel.php:100 actions/editapplication.php:144
-#: actions/emailsettings.php:311 actions/grouplogo.php:332
-#: actions/imsettings.php:256 actions/newapplication.php:124
-#: actions/oauthconnectionssettings.php:144 actions/recoverpassword.php:46
-#: actions/smssettings.php:270 lib/designsettings.php:133
 msgid "Unexpected form submission."
 msgstr ""
 
 #. TRANS: Title for a page where a user can confirm/deny account access by an external application.
-#: actions/apioauthauthorize.php:387
 msgid "An application would like to connect to your account"
 msgstr ""
 
 #. TRANS: Fieldset legend.
-#: actions/apioauthauthorize.php:404
 msgid "Allow or deny access"
 msgstr ""
 
 #. TRANS: User notification of external application requesting account access.
 #. TRANS: %3$s is the access type requested (read-write or read-only), %4$s is the StatusNet sitename.
-#: actions/apioauthauthorize.php:425
 #, php-format
 msgid ""
 "An application would like the ability to <strong>%3$s</strong> your %4$s "
@@ -925,7 +693,6 @@ msgstr ""
 #. TRANS: User notification of external application requesting account access.
 #. TRANS: %1$s is the application name requesting access, %2$s is the organisation behind the application,
 #. TRANS: %3$s is the access type requested, %4$s is the StatusNet sitename.
-#: actions/apioauthauthorize.php:433
 #, php-format
 msgid ""
 "The application <strong>%1$s</strong> by <strong>%2$s</strong> would like "
@@ -934,22 +701,18 @@ msgid ""
 msgstr ""
 
 #. TRANS: Fieldset legend.
-#: actions/apioauthauthorize.php:455
 msgctxt "LEGEND"
 msgid "Account"
 msgstr "Identitât"
 
 #. TRANS: Field label on OAuth API authorisation form.
+#. TRANS: Field label on login page.
 #. TRANS: Field label in form for profile settings.
-#: actions/apioauthauthorize.php:459 actions/login.php:225
-#: actions/profilesettings.php:107 actions/register.php:411
-#: actions/userauthorization.php:145 lib/groupeditform.php:145
 msgid "Nickname"
 msgstr "Sorenon"
 
 #. TRANS: Field label on OAuth API authorisation form.
-#: actions/apioauthauthorize.php:463 actions/login.php:228
-#: actions/register.php:415 lib/settingsnav.php:87
+#. TRANS: Field label on login page.
 msgid "Password"
 msgstr "Password"
 
@@ -959,43 +722,34 @@ msgstr "Password"
 #. TRANS: Button label to cancel an IM address confirmation procedure.
 #. TRANS: Button label to cancel a SMS address confirmation procedure.
 #. TRANS: Button label in the "Edit application" form.
-#: actions/apioauthauthorize.php:478 actions/emailsettings.php:125
-#: actions/imsettings.php:136 actions/smssettings.php:132
-#: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Cancel"
 msgstr "Scancele"
 
 #. TRANS: Button text that when clicked will allow access to an account by an external application.
-#: actions/apioauthauthorize.php:485
 msgctxt "BUTTON"
 msgid "Allow"
 msgstr "Permet"
 
 #. TRANS: Form instructions.
-#: actions/apioauthauthorize.php:502
 msgid "Authorize access to your account information."
 msgstr ""
 
 #. TRANS: Header for user notification after revoking OAuth access to an application.
-#: actions/apioauthauthorize.php:594
 msgid "Authorization canceled."
 msgstr ""
 
 #. TRANS: User notification after revoking OAuth access to an application.
 #. TRANS: %s is an OAuth token.
-#: actions/apioauthauthorize.php:598
 #, php-format
 msgid "The request token %s has been revoked."
 msgstr ""
 
 #. TRANS: Title of the page notifying the user that an anonymous client application was successfully authorized to access the user's account with OAuth.
-#: actions/apioauthauthorize.php:621
 msgid "You have successfully authorized the application"
 msgstr ""
 
 #. TRANS: Message notifying the user that an anonymous client application was successfully authorized to access the user's account with OAuth.
-#: actions/apioauthauthorize.php:625
 msgid ""
 "Please return to the application and enter the following security code to "
 "complete the process."
@@ -1003,14 +757,12 @@ msgstr ""
 
 #. TRANS: Title of the page notifying the user that the client application was successfully authorized to access the user's account with OAuth.
 #. TRANS: %s is the authorised application name.
-#: actions/apioauthauthorize.php:632
 #, php-format
 msgid "You have successfully authorized %s"
 msgstr ""
 
 #. TRANS: Message notifying the user that the client application was successfully authorized to access the user's account with OAuth.
 #. TRANS: %s is the authorised application name.
-#: actions/apioauthauthorize.php:639
 #, php-format
 msgid ""
 "Please return to %s and enter the following security code to complete the "
@@ -1019,12 +771,10 @@ msgstr ""
 
 #. TRANS: Client error displayed trying to delete a status not using POST or DELETE.
 #. TRANS: POST and DELETE should not be translated.
-#: actions/apistatusesdestroy.php:111
 msgid "This method requires a POST or DELETE."
 msgstr ""
 
 #. TRANS: Client error displayed trying to delete a status of another user.
-#: actions/apistatusesdestroy.php:136
 msgid "You may not delete another user's status."
 msgstr ""
 
@@ -1032,21 +782,16 @@ msgstr ""
 #. TRANS: Client error displayed trying to display redents of a non-exiting notice.
 #. TRANS: Client exception thrown when referencing a non-existing notice.
 #. TRANS: Error message displayed trying to delete a non-existing notice.
-#: actions/apistatusesretweet.php:74 actions/apistatusesretweets.php:70
-#: actions/atompubshowfavorite.php:82 actions/deletenotice.php:61
-#: actions/shownotice.php:92
 msgid "No such notice."
 msgstr "L'avîs nol esist."
 
 #. TRANS: Client error displayed trying to repeat an own notice through the API.
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:549
 msgid "Cannot repeat your own notice."
 msgstr ""
 
 #. TRANS: Client error displayed trying to re-repeat a notice through the API.
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:92 lib/command.php:555
 msgid "Already repeated that notice."
 msgstr ""
 
@@ -1056,57 +801,43 @@ msgstr ""
 #. TRANS: Client exception thrown when using an unsupported HTTP method.
 #. TRANS: Client error shown when using a non-supported HTTP method.
 #. TRANS: Client exception thrown when using an unsupported HTTP method.
-#: actions/apistatusesshow.php:118 actions/atompubfavoritefeed.php:103
-#: actions/atompubmembershipfeed.php:105 actions/atompubshowfavorite.php:117
-#: actions/atompubshowmembership.php:116
-#: actions/atompubshowsubscription.php:122
-#: actions/atompubsubscriptionfeed.php:109
 msgid "HTTP method not supported."
 msgstr ""
 
 #. TRANS: Exception thrown requesting an unsupported notice output format.
 #. TRANS: %s is the requested output format.
-#: actions/apistatusesshow.php:144
 #, php-format
 msgid "Unsupported format: %s."
 msgstr ""
 
 #. TRANS: Client error displayed requesting a deleted status.
-#: actions/apistatusesshow.php:155
 msgid "Status deleted."
 msgstr "Stât eliminât."
 
 #. TRANS: Client error displayed requesting a status with an invalid ID.
-#: actions/apistatusesshow.php:162
 msgid "No status with that ID found."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to delete a notice not using the Atom format.
-#: actions/apistatusesshow.php:227
 msgid "Can only delete using the Atom format."
 msgstr ""
 
 #. TRANS: Client error displayed when a user has no rights to delete notices of other users.
 #. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
-#: actions/apistatusesshow.php:235 actions/deletenotice.php:78
 msgid "Cannot delete this notice."
 msgstr "No si pues eliminâ chest avîs."
 
 #. TRANS: Confirmation of notice deletion in API. %d is the ID (number) of the deleted notice.
-#: actions/apistatusesshow.php:249
 #, php-format
 msgid "Deleted notice %d"
 msgstr "L'avîs %d al è stât eliminât."
 
 #. TRANS: Client error displayed when the parameter "status" is missing.
-#: actions/apistatusesupdate.php:221
 msgid "Client must provide a 'status' parameter with a value."
 msgstr ""
 
 #. TRANS: Client error displayed when the parameter "status" is missing.
 #. TRANS: %d is the maximum number of character for a notice.
-#: actions/apistatusesupdate.php:244 actions/newnotice.php:161
-#: lib/mailhandler.php:60
 #, php-format
 msgid "That's too long. Maximum notice size is %d character."
 msgid_plural "That's too long. Maximum notice size is %d characters."
@@ -1114,13 +845,11 @@ msgstr[0] "Test masse lunc. La lungjece massime pai avîs e je di %d caratar."
 msgstr[1] "Test masse lunc. La lungjece massime pai avîs e je di %d caratars."
 
 #. TRANS: Client error displayed when replying to a non-existing notice.
-#: actions/apistatusesupdate.php:284
 msgid "Parent notice not found."
 msgstr ""
 
 #. TRANS: Client error displayed exceeding the maximum notice length.
 #. TRANS: %d is the maximum lenth for a notice.
-#: actions/apistatusesupdate.php:308 actions/newnotice.php:184
 #, php-format
 msgid "Maximum notice size is %d character, including attachment URL."
 msgid_plural "Maximum notice size is %d characters, including attachment URL."
@@ -1131,13 +860,11 @@ msgstr[1] ""
 
 #. TRANS: Client error displayed when requesting profiles of followers in an unsupported format.
 #. TRANS: Client error displayed when requesting IDs of followers in an unsupported format.
-#: actions/apisubscriptions.php:228 actions/apisubscriptions.php:258
 msgid "Unsupported format."
 msgstr ""
 
 #. TRANS: Title for timeline of most recent favourite notices by a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname.
-#: actions/apitimelinefavorites.php:108
 #, php-format
 msgid "%1$s / Favorites from %2$s"
 msgstr "%1$s / Preferîts di %2$s"
@@ -1145,14 +872,12 @@ msgstr "%1$s / Preferîts di %2$s"
 #. TRANS: Subtitle for timeline of most recent favourite notices by a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user's full name,
 #. TRANS: %3$s is a user nickname.
-#: actions/apitimelinefavorites.php:120
 #, php-format
 msgid "%1$s updates favorited by %2$s / %3$s."
 msgstr "%1$s inzornaments preferîts di %2$s / %3$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.
-#: actions/apitimelinementions.php:115
 #, php-format
 msgid "%1$s / Updates mentioning %2$s"
 msgstr "%1$s / Inzornaments che a tabain di %2$s"
@@ -1160,48 +885,40 @@ msgstr "%1$s / Inzornaments che a tabain di %2$s"
 #. TRANS: Subtitle for timeline of most recent mentions of a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname,
 #. TRANS: %3$s is a user's full name.
-#: actions/apitimelinementions.php:131
 #, php-format
 msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr "Inzornaments di %1$s che a rispuindin a inzornaments di %2$s / %3$s."
 
 #. TRANS: Title for site timeline. %s is the StatusNet sitename.
 #. TRANS: Public RSS feed title. %s is the StatusNet site name.
-#: actions/apitimelinepublic.php:193 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "Ativitât publiche di %s"
 
 #. TRANS: Subtitle for site timeline. %s is the StatusNet sitename.
-#: actions/apitimelinepublic.php:199
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "Inzornaments di %s di ducj cuancj!"
 
 #. TRANS: Server error displayed calling unimplemented API method for 'retweeted by me'.
-#: actions/apitimelineretweetedbyme.php:71
 msgid "Unimplemented."
 msgstr ""
 
 #. TRANS: Title for Atom feed "repeated to me". %s is the user nickname.
-#: actions/apitimelineretweetedtome.php:96
 #, php-format
 msgid "Repeated to %s"
 msgstr "Ripetût a %s"
 
-#: actions/apitimelineretweetedtome.php:98
 #, fuzzy, php-format
 msgid "%1$s notices that were to repeated to %2$s / %3$s."
 msgstr "Inzornaments di %1$s che a rispuindin a inzornaments di %2$s / %3$s."
 
 #. TRANS: Title of list of repeated notices of the logged in user.
 #. TRANS: %s is the nickname of the logged in user.
-#: actions/apitimelineretweetsofme.php:98
 #, php-format
 msgid "Repeats of %s"
 msgstr "Ripetizions di %s"
 
-#: actions/apitimelineretweetsofme.php:104
 #, fuzzy, php-format
 msgid "%1$s notices that %2$s / %3$s has repeated."
 msgstr "%1$s al à segnât l'avîs %2$s come preferît."
@@ -1210,170 +927,137 @@ msgstr "%1$s al à segnât l'avîs %2$s come preferît."
 #. TRANS: %s is the tag.
 #. TRANS: Title for first page of notices with tags.
 #. TRANS: %s is the tag.
-#: actions/apitimelinetag.php:101 actions/tag.php:69
 #, php-format
 msgid "Notices tagged with %s"
 msgstr "Avîs etichetâts cun %s"
 
 #. TRANS: Subtitle for timeline with lastest notices with a given tag.
 #. TRANS: %1$s is the tag, $2$s is the StatusNet sitename.
-#: actions/apitimelinetag.php:105 actions/tagrss.php:65
 #, php-format
 msgid "Updates tagged with %1$s on %2$s!"
 msgstr "Inzornaments etichetâts cun %1$s su %2$s!"
 
 #. TRANS: Client error displayed trying to add a notice to another user's timeline.
-#: actions/apitimelineuser.php:308
 msgid "Only the user can add to their own timeline."
 msgstr ""
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:315
 msgid "Only accept AtomPub for Atom feeds."
 msgstr ""
 
 #. TRANS: Client error displayed attempting to post an empty API notice.
-#: actions/apitimelineuser.php:322
 msgid "Atom post must not be empty."
 msgstr ""
 
 #. TRANS: Client error displayed attempting to post an API that is not well-formed XML.
-#: actions/apitimelineuser.php:328
 msgid "Atom post must be well-formed XML."
 msgstr ""
 
 #. TRANS: Client error displayed when not using an Atom entry.
-#: actions/apitimelineuser.php:334 actions/atompubfavoritefeed.php:228
-#: actions/atompubmembershipfeed.php:230
-#: actions/atompubsubscriptionfeed.php:236
 msgid "Atom post must be an Atom entry."
 msgstr ""
 
 #. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
-#: actions/apitimelineuser.php:345
 msgid "Can only handle POST activities."
 msgstr ""
 
 #. TRANS: Client error displayed when using an unsupported activity object type.
 #. TRANS: %s is the unsupported activity object type.
-#: actions/apitimelineuser.php:356
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
 #. TRANS: %d is the notice ID (number).
-#: actions/apitimelineuser.php:390
 #, php-format
 msgid "No content for notice %d."
 msgstr ""
 
 #. TRANS: Client error displayed when using another format than AtomPub.
 #. TRANS: %s is the notice URI.
-#: actions/apitimelineuser.php:419
 #, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr ""
 
 #. TRANS: Server error for unfinished API method showTrends.
-#: actions/apitrends.php:85
 msgid "API method under construction."
 msgstr ""
 
 #. TRANS: Client error displayed when requesting user information for a non-existing user.
-#: actions/apiuserprofileimage.php:80 actions/apiusershow.php:94
 msgid "User not found."
 msgstr "L'utent nol è stât cjatât."
 
 #. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
 #. TRANS: Client exception.
 #. TRANS: Client error displayed trying to subscribe to a non-existing profile.
-#: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
-#: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
-#: actions/subscribe.php:110
 msgid "No such profile."
 msgstr "Il profîl nol esist."
 
 #. TRANS: Subtitle for Atom favorites feed.
 #. TRANS: %1$s is a user nickname, %2$s is the StatusNet sitename.
-#: actions/atompubfavoritefeed.php:147
 #, php-format
 msgid "Notices %1$s has favorited on %2$s"
 msgstr "Avîs che %1$s al metût tai preferîts su %2$s"
 
 #. TRANS: Client exception thrown when trying to set a favorite for another user.
 #. TRANS: Client exception thrown when trying to subscribe another user.
-#: actions/atompubfavoritefeed.php:217 actions/atompubsubscriptionfeed.php:225
 msgid "Cannot add someone else's subscription."
 msgstr "No si pues zontâ sotscrizions a cualchidun altri."
 
 #. TRANS: Client exception thrown when trying use an incorrect activity verb for the Atom pub method.
-#: actions/atompubfavoritefeed.php:240
 msgid "Can only handle favorite activities."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying favorite an object that is not a notice.
-#: actions/atompubfavoritefeed.php:250 actions/atompubmembershipfeed.php:250
 msgid "Can only fave notices."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying favorite a notice without content.
-#: actions/atompubfavoritefeed.php:259
 msgid "Unknown note."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying favorite an already favorited notice.
-#: actions/atompubfavoritefeed.php:267
 msgid "Already a favorite."
 msgstr ""
 
 #. TRANS: Title for group membership feed.
 #. TRANS: %s is a username.
-#: actions/atompubmembershipfeed.php:144
 #, php-format
 msgid "%s group memberships"
 msgstr "Apartignincis ai grups di %s"
 
 #. TRANS: Subtitle for group membership feed.
 #. TRANS: %1$s is a username, %2$s is the StatusNet sitename.
-#: actions/atompubmembershipfeed.php:149
 #, php-format
 msgid "Groups %1$s is a member of on %2$s"
 msgstr "Grups dal utent %1$s su %2$s"
 
 #. TRANS: Client exception thrown when trying subscribe someone else to a group.
-#: actions/atompubmembershipfeed.php:219
 msgid "Cannot add someone else's membership."
 msgstr "No si pues zontâ une apartignince a cualchidun altri."
 
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#: actions/atompubmembershipfeed.php:242
 msgid "Can only handle join activities."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to subscribe to a non-existing group.
-#: actions/atompubmembershipfeed.php:259
 msgid "Unknown group."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to subscribe to an already subscribed group.
-#: actions/atompubmembershipfeed.php:267
 msgid "Already a member."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to subscribe to group while blocked from that group.
-#: actions/atompubmembershipfeed.php:275
 msgid "Blocked by admin."
 msgstr ""
 
 #. TRANS: Client exception thrown when referencing a non-existing favorite.
-#: actions/atompubshowfavorite.php:90
 msgid "No such favorite."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to remove a favorite notice of another user.
-#: actions/atompubshowfavorite.php:151
 msgid "Cannot delete someone else's favorite."
 msgstr ""
 
@@ -1399,90 +1083,65 @@ msgstr ""
 #. TRANS: Client error displayed when trying to join a non-existing group.
 #. TRANS: Client error displayed when trying to leave a non-local group.
 #. TRANS: Client error displayed when trying to leave a non-existing group.
+#. TRANS: Client error displayed when providing an invalid group ID on the Make Admin page.
 #. 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.
 #. TRANS: Command exception text shown when a group is requested that does not exist.
 #. TRANS: Error text shown when trying to leave a group that does not exist.
-#: actions/atompubshowmembership.php:81 actions/blockedfromgroup.php:81
-#: actions/blockedfromgroup.php:89 actions/deletegroup.php:87
-#: actions/deletegroup.php:100 actions/editgroup.php:102
-#: actions/foafgroup.php:46 actions/foafgroup.php:65 actions/foafgroup.php:73
-#: actions/groupblock.php:89 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:101 actions/grouplogo.php:103
-#: actions/groupmembers.php:84 actions/groupmembers.php:92
-#: actions/grouprss.php:97 actions/grouprss.php:105
-#: actions/groupunblock.php:89 actions/joingroup.php:82
-#: actions/joingroup.php:95 actions/leavegroup.php:82
-#: actions/leavegroup.php:95 actions/makeadmin.php:86
-#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:392
 msgid "No such group."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to show membership of a non-subscribed group
-#: actions/atompubshowmembership.php:91
 msgid "Not a member."
 msgstr ""
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
-#: actions/atompubshowmembership.php:150
 msgid "Cannot delete someone else's membership."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to display a subscription for a non-existing profile ID.
 #. TRANS: %d is the non-existing profile ID number.
-#: actions/atompubshowsubscription.php:72
-#: actions/atompubshowsubscription.php:83
-#: actions/atompubsubscriptionfeed.php:74
 #, php-format
 msgid "No such profile id: %d."
 msgstr ""
 
 #. 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.
-#: actions/atompubshowsubscription.php:94
 #, php-format
 msgid "Profile %1$d not subscribed to profile %2$d."
 msgstr "Il profîl %1$d nol è sotscrit al profîl %2$d."
 
 #. TRANS: Client exception thrown when trying to delete a subscription of another user.
-#: actions/atompubshowsubscription.php:157
 msgid "Cannot delete someone else's subscription."
 msgstr ""
 
 #. TRANS: Subtitle for Atom subscription feed.
 #. TRANS: %1$s is a user nickname, %s$s is the StatusNet sitename.
-#: actions/atompubsubscriptionfeed.php:153
 #, php-format
 msgid "People %1$s has subscribed to on %2$s"
 msgstr "Sotscrizions di %1$s su %2$s"
 
 #. TRANS: Client error displayed when not using the follow verb.
-#: actions/atompubsubscriptionfeed.php:248
 msgid "Can only handle Follow activities."
 msgstr ""
 
 #. TRANS: Client exception thrown when subscribing to an object that is not a person.
-#: actions/atompubsubscriptionfeed.php:256
 msgid "Can only follow people."
 msgstr ""
 
 #. TRANS: Client exception thrown when subscribing to a non-existing profile.
 #. TRANS: %s is the unknown profile ID.
-#: actions/atompubsubscriptionfeed.php:267
 #, php-format
 msgid "Unknown profile %s."
 msgstr ""
 
 #. TRANS: Client error displayed trying to subscribe to an already subscribed profile.
 #. TRANS: %s is the profile the user already has a subscription on.
-#: actions/atompubsubscriptionfeed.php:275
 #, php-format
 msgid "Already subscribed to %s."
 msgstr "Tu sês za sotscrit a %s."
 
 #. TRANS: Client error displayed trying to get a non-existing attachment.
-#: actions/attachment.php:73
 msgid "No such attachment."
 msgstr ""
 
@@ -1494,31 +1153,23 @@ msgstr ""
 #. TRANS: Client error displayed when trying to view group members without providing a group nickname.
 #. TRANS: Client error displayed when requesting a group RSS feed without providing a group nickname.
 #. TRANS: Client error displayed if no nickname argument was given requesting a group page.
-#: actions/avatarbynickname.php:60 actions/blockedfromgroup.php:73
-#: actions/editgroup.php:85 actions/groupdesignsettings.php:84
-#: actions/grouplogo.php:86 actions/groupmembers.php:76
-#: actions/grouprss.php:89 actions/showgroup.php:116
 msgid "No nickname."
 msgstr ""
 
 #. TRANS: Client error displayed trying to get an avatar without providing an avatar size.
-#: actions/avatarbynickname.php:66
 msgid "No size."
 msgstr "Nissune dimension."
 
 #. TRANS: Client error displayed trying to get an avatar providing an invalid avatar size.
-#: actions/avatarbynickname.php:72
 msgid "Invalid size."
 msgstr "La dimension no je valide."
 
 #. TRANS: Title for avatar upload page.
-#: actions/avatarsettings.php:66 lib/settingsnav.php:82
 msgid "Avatar"
 msgstr "Avatar"
 
 #. TRANS: Instruction for avatar upload page.
 #. TRANS: %s is the maximum file size, for example "500b", "10kB" or "2MB".
-#: actions/avatarsettings.php:78
 #, php-format
 msgid "You can upload your personal avatar. The maximum file size is %s."
 msgstr ""
@@ -1528,17 +1179,12 @@ msgstr ""
 #. TRANS: Server error displayed coming across a request from a user without a profile.
 #. TRANS: Server error displayed when trying to authorise a remote subscription request
 #. TRANS: while the user has no profile.
-#: actions/avatarsettings.php:108 actions/avatarsettings.php:192
-#: actions/grouplogo.php:184 actions/remotesubscribe.php:190
-#: actions/userauthorization.php:75 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr ""
 
 #. TRANS: Avatar upload page form legend.
 #. TRANS: Avatar upload page crop form legend.
 #. TRANS: Legend for group logo settings fieldset.
-#: actions/avatarsettings.php:122 actions/avatarsettings.php:205
-#: actions/grouplogo.php:261
 msgid "Avatar settings"
 msgstr "Impuestazions dal avatar"
 
@@ -1546,8 +1192,6 @@ msgstr "Impuestazions dal avatar"
 #. TRANS: Header on avatar upload crop form for thumbnail of originally uploaded avatar (h2).
 #. TRANS: Uploaded original file in group logo form.
 #. TRANS: Header for originally uploaded file before a crop on the group logo page.
-#: actions/avatarsettings.php:131 actions/avatarsettings.php:214
-#: actions/grouplogo.php:207 actions/grouplogo.php:270
 msgid "Original"
 msgstr "Origjinâl"
 
@@ -1555,80 +1199,65 @@ msgstr "Origjinâl"
 #. TRANS: Header on avatar upload crop form for thumbnail of to be used rendition of uploaded avatar (h2).
 #. TRANS: Header for preview of to be displayed group logo.
 #. TRANS: Header for the cropped group logo on the group logo page.
-#: actions/avatarsettings.php:147 actions/avatarsettings.php:227
-#: actions/grouplogo.php:219 actions/grouplogo.php:283
 msgid "Preview"
 msgstr "Anteprime"
 
 #. TRANS: Button on avatar upload page to delete current avatar.
 #. TRANS: Button text for user account deletion.
-#: actions/avatarsettings.php:155 actions/deleteaccount.php:319
 msgctxt "BUTTON"
 msgid "Delete"
 msgstr "Elimine"
 
 #. TRANS: Button on avatar upload page to upload an avatar.
 #. TRANS: Submit button to confirm upload of a user backup file for account restore.
-#: actions/avatarsettings.php:173 actions/restoreaccount.php:369
 msgctxt "BUTTON"
 msgid "Upload"
 msgstr "Cjame"
 
 #. TRANS: Button on avatar upload crop form to confirm a selected crop as avatar.
-#: actions/avatarsettings.php:243
 msgctxt "BUTTON"
 msgid "Crop"
 msgstr "Taie"
 
 #. TRANS: Validation error on avatar upload form when no file was uploaded.
-#: actions/avatarsettings.php:318
 msgid "No file uploaded."
 msgstr "No si à cjamât nissun file."
 
 #. TRANS: Avatar upload form instruction after uploading a file.
-#: actions/avatarsettings.php:345
 msgid "Pick a square area of the image to be your avatar."
 msgstr "Cjape une aree retangolâr de figure par doprâle come avatar."
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
 #. TRANS: Server error displayed trying to crop an uploaded group logo that is no longer present.
-#: actions/avatarsettings.php:360 actions/grouplogo.php:391
 msgid "Lost our file data."
 msgstr "I dâts dal file a son lâts pierdûts."
 
 #. TRANS: Success message for having updated a user avatar.
-#: actions/avatarsettings.php:384
 msgid "Avatar updated."
 msgstr "Avatar inzornât."
 
 #. TRANS: Error displayed on the avatar upload page if the avatar could not be updated for an unknown reason.
-#: actions/avatarsettings.php:388
 msgid "Failed updating avatar."
 msgstr "Erôr tal inzornament dal avatar."
 
 #. TRANS: Success message for deleting a user avatar.
-#: actions/avatarsettings.php:412
 msgid "Avatar deleted."
 msgstr "Avatar eliminât."
 
 #. TRANS: Title for backup account page.
 #. TRANS: Option in profile settings to create a backup of the account of the currently logged in user.
-#: actions/backupaccount.php:61 actions/profilesettings.php:468
 msgid "Backup account"
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to backup an account while not logged in.
-#: actions/backupaccount.php:79
 msgid "Only logged-in users can backup their account."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to backup an account without having backup rights.
-#: actions/backupaccount.php:84
 msgid "You may not backup your account."
 msgstr ""
 
 #. TRANS: Information displayed on the backup account page.
-#: actions/backupaccount.php:227
 msgid ""
 "You can backup your account data in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format. This is an experimental feature and provides "
@@ -1638,30 +1267,25 @@ msgid ""
 msgstr ""
 
 #. TRANS: Submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:250
 msgctxt "BUTTON"
 msgid "Backup"
 msgstr ""
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:254
 msgid "Backup your account."
 msgstr ""
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
-#: actions/block.php:68
 msgid "You already blocked that user."
 msgstr "Tu âs za blocât chest utent."
 
 #. TRANS: Title for block user page.
 #. TRANS: Legend for block user form.
 #. TRANS: Fieldset legend for block user from group form.
-#: actions/block.php:106 actions/block.php:136 actions/groupblock.php:165
 msgid "Block user"
 msgstr "Bloche utent"
 
 #. TRANS: Explanation of consequences when blocking a user on the block user page.
-#: actions/block.php:139
 msgid ""
 "Are you sure you want to block this user? Afterwards, they will be "
 "unsubscribed from you, unable to subscribe to you in the future, and you "
@@ -1674,15 +1298,11 @@ msgstr ""
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:154 actions/deleteapplication.php:157
-#: actions/deletegroup.php:220 actions/deletenotice.php:155
-#: actions/deleteuser.php:154 actions/groupblock.php:187
 msgctxt "BUTTON"
 msgid "No"
 msgstr "No"
 
 #. TRANS: Submit button title for 'No' when blocking a user.
-#: actions/block.php:158
 msgid "Do not block this user."
 msgstr "No stâ blocâ chest utent"
 
@@ -1692,171 +1312,136 @@ msgstr "No stâ blocâ chest utent"
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:161 actions/deleteapplication.php:164
-#: actions/deletegroup.php:227 actions/deletenotice.php:162
-#: actions/deleteuser.php:161 actions/groupblock.php:194
 msgctxt "BUTTON"
 msgid "Yes"
 msgstr "Sì"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:165
 msgid "Block this user."
 msgstr "Bloche chest utent"
 
 #. TRANS: Server error displayed when blocking a user fails.
-#: actions/block.php:189
 msgid "Failed to save block information."
 msgstr ""
 
 #. TRANS: Title for first page with list of users blocked from a group.
 #. TRANS: %s is a group nickname.
-#: actions/blockedfromgroup.php:101
 #, php-format
 msgid "%s blocked profiles"
 msgstr "Profîi blocâts di %s"
 
 #. TRANS: Title for any but the first page with list of users blocked from a group.
 #. TRANS: %1$s is a group nickname, %2$d is a page number.
-#: actions/blockedfromgroup.php:106
 #, php-format
 msgid "%1$s blocked profiles, page %2$d"
 msgstr ""
 
 #. TRANS: Instructions for list of users blocked from a group.
-#: actions/blockedfromgroup.php:122
 msgid "A list of the users blocked from joining this group."
 msgstr "Une liste dai utents che a son blocâts e no puedin unîsi al grup."
 
 #. TRANS: Form legend for unblocking a user from a group.
-#: actions/blockedfromgroup.php:291
 msgid "Unblock user from group"
 msgstr ""
 
 #. TRANS: Button text for unblocking a user from a group.
-#: actions/blockedfromgroup.php:323
 msgctxt "BUTTON"
 msgid "Unblock"
 msgstr "Disbloche"
 
 #. TRANS: Tooltip for button for unblocking a user from a group.
 #. TRANS: Description of the form to unblock a user.
-#: actions/blockedfromgroup.php:327 lib/unblockform.php:78
 msgid "Unblock this user"
 msgstr "Disbloche chest utent"
 
 #. TRANS: Title for mini-posting window loaded from bookmarklet.
 #. TRANS: %s is the StatusNet site name.
-#: actions/bookmarklet.php:51
 #, php-format
 msgid "Post to %s"
 msgstr "Publiche su %s"
 
 #. TRANS: Client error displayed when not providing a confirmation code in the contact address confirmation action.
-#: actions/confirmaddress.php:74
 msgid "No confirmation code."
 msgstr ""
 
 #. TRANS: Client error displayed when providing a non-existing confirmation code in the contact address confirmation action.
-#: actions/confirmaddress.php:80
 msgid "Confirmation code not found."
 msgstr ""
 
 #. TRANS: Client error displayed when not providing a confirmation code for another user in the contact address confirmation action.
-#: actions/confirmaddress.php:86
 msgid "That confirmation code is not for you!"
 msgstr ""
 
 #. TRANS: Server error for an unknown address type, which can be 'email', 'sms', or the name of an IM network (such as 'xmpp' or 'aim')
-#: actions/confirmaddress.php:94
 #, php-format
 msgid "Unrecognized address type %s"
 msgstr ""
 
 #. TRANS: Client error for an already confirmed email/jabber/sms address.
-#: actions/confirmaddress.php:103 actions/confirmaddress.php:136
 msgid "That address has already been confirmed."
 msgstr ""
 
-#: actions/confirmaddress.php:121 actions/imsettings.php:444
-#: actions/userdesignsettings.php:306
 msgid "Couldn't update user."
 msgstr ""
 
-#: actions/confirmaddress.php:144
 msgid "Couldn't update user im preferences."
 msgstr ""
 
-#: actions/confirmaddress.php:156
 msgid "Couldn't insert user im preferences."
 msgstr ""
 
 #. TRANS: Server error displayed when an address confirmation code deletion from the
 #. TRANS: database fails in the contact address confirmation action.
-#: actions/confirmaddress.php:169
 msgid "Could not delete address confirmation."
 msgstr ""
 
 #. TRANS: Title for the contact address confirmation action.
-#: actions/confirmaddress.php:185
 msgid "Confirm address"
 msgstr "Conferme la direzion"
 
 #. TRANS: Success message for the contact address confirmation action.
 #. TRANS: %s can be 'email', 'jabber', or 'sms'.
-#: actions/confirmaddress.php:200
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "La direzion \"%s\" e je stade confermade pe tô identitât."
 
 #. TRANS: Title for page with a conversion (multiple notices in context).
-#: actions/conversation.php:96
 msgid "Conversation"
 msgstr "Tabaiade"
 
 #. TRANS: Header on conversation page. Hidden by default (h2).
 #. TRANS: Label for user statistics.
-#: actions/conversation.php:149 lib/noticelist.php:87
-#: lib/profileaction.php:246 lib/searchgroupnav.php:82
-#: lib/threadednoticelist.php:66
 msgid "Notices"
 msgstr "Avîs"
 
 #. TRANS: Client exception displayed trying to delete a user account while not logged in.
-#: actions/deleteaccount.php:71
 msgid "Only logged-in users can delete their account."
 msgstr ""
 
 #. TRANS: Client exception displayed trying to delete a user account without have the rights to do that.
-#: actions/deleteaccount.php:77
 msgid "You cannot delete your account."
 msgstr ""
 
 #. TRANS: Confirmation text for user deletion. The user has to type this exactly the same, including punctuation.
-#: actions/deleteaccount.php:160 actions/deleteaccount.php:297
 msgid "I am sure."
 msgstr "O soi sigûr."
 
 #. TRANS: Notification for user about the text that must be input to be able to delete a user account.
 #. TRANS: %s is the text that needs to be input.
-#: actions/deleteaccount.php:164
 #, php-format
 msgid "You must write \"%s\" exactly in the box."
 msgstr ""
 
 #. TRANS: Confirmation that a user account has been deleted.
-#: actions/deleteaccount.php:206
 msgid "Account deleted."
 msgstr "La identitât e je stade eliminade."
 
 #. TRANS: Page title for page on which a user account can be deleted.
 #. TRANS: Option in profile settings to delete the account of the currently logged in user.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:476
 msgid "Delete account"
 msgstr "Elimine la identitât"
 
 #. TRANS: Form text for user deletion form.
-#: actions/deleteaccount.php:279
 msgid ""
 "This will <strong>permanently delete</strong> your account data from this "
 "server."
@@ -1864,7 +1449,6 @@ msgstr ""
 
 #. TRANS: Additional form text for user deletion form shown if a user has account backup rights.
 #. TRANS: %s is a URL to the backup page.
-#: actions/deleteaccount.php:285
 #, php-format
 msgid ""
 "You are strongly advised to <a href=\"%s\">back up your data</a> before "
@@ -1873,55 +1457,42 @@ msgstr ""
 
 #. TRANS: Field label for delete account confirmation entry.
 #. TRANS: Field label for password reset form where the password has to be typed again.
-#: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:262 actions/register.php:419
 msgid "Confirm"
 msgstr "Conferme"
 
 #. TRANS: Input title for the delete account field.
 #. TRANS: %s is the text that needs to be input.
-#: actions/deleteaccount.php:304
 #, php-format
 msgid "Enter \"%s\" to confirm that you want to delete your account."
 msgstr ""
 
 #. TRANS: Button title for user account deletion.
-#: actions/deleteaccount.php:323
 msgid "Permanently delete your account"
 msgstr "Elimine par simpri la tô identitât"
 
 #. TRANS: Client error displayed trying to delete an application while not logged in.
-#: actions/deleteapplication.php:62
 msgid "You must be logged in to delete an application."
 msgstr ""
 
 #. TRANS: Client error displayed trying to delete an application that does not exist.
-#: actions/deleteapplication.php:71
 msgid "Application not found."
 msgstr ""
 
 #. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
-#: actions/deleteapplication.php:79 actions/editapplication.php:78
-#: actions/showapplication.php:90
 msgid "You are not the owner of this application."
 msgstr ""
 
 #. TRANS: Client error text when there is a problem with the session token.
-#: actions/deleteapplication.php:102 actions/editapplication.php:131
-#: actions/newapplication.php:112 actions/showapplication.php:113
-#: lib/action.php:1391
 msgid "There was a problem with your session token."
 msgstr ""
 
 #. TRANS: Title for delete application page.
 #. TRANS: Fieldset legend on delete application page.
-#: actions/deleteapplication.php:124 actions/deleteapplication.php:149
 msgid "Delete application"
 msgstr "Elimine la aplicazion"
 
 #. TRANS: Confirmation text on delete application page.
-#: actions/deleteapplication.php:152
 msgid ""
 "Are you sure you want to delete this application? This will clear all data "
 "about the application from the database, including all existing user "
@@ -1929,55 +1500,45 @@ msgid ""
 msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting an application.
-#: actions/deleteapplication.php:161
 msgid "Do not delete this application."
 msgstr ""
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
-#: actions/deleteapplication.php:167
 msgid "Delete this application."
 msgstr "Elimine cheste aplicazion"
 
 #. TRANS: Client error when trying to delete group while not logged in.
-#: actions/deletegroup.php:64
 msgid "You must be logged in to delete a group."
 msgstr ""
 
 #. TRANS: Client error when trying to delete a group without providing a nickname or ID for the group.
 #. TRANS: Client error displayed when trying to join a group without providing a group name or group ID.
 #. TRANS: Client error displayed when trying to leave a group without providing a group name or group ID.
-#: actions/deletegroup.php:94 actions/joingroup.php:89
-#: actions/leavegroup.php:89
 msgid "No nickname or ID."
 msgstr ""
 
 #. TRANS: Client error when trying to delete a group without having the rights to delete it.
-#: actions/deletegroup.php:107
 msgid "You are not allowed to delete this group."
 msgstr ""
 
 #. TRANS: Server error displayed if a group could not be deleted.
 #. TRANS: %s is the name of the group that could not be deleted.
-#: actions/deletegroup.php:150
 #, php-format
 msgid "Could not delete group %s."
 msgstr ""
 
 #. TRANS: Message given after deleting a group.
 #. TRANS: %s is the deleted group's name.
-#: actions/deletegroup.php:159
 #, php-format
 msgid "Deleted group %s"
 msgstr "Il grup %s al è stât eliminât"
 
 #. TRANS: Title of delete group page.
 #. TRANS: Form legend for deleting a group.
-#: actions/deletegroup.php:176 actions/deletegroup.php:202
 msgid "Delete group"
 msgstr "Elimine il grup"
 
 #. TRANS: Warning in form for deleleting a group.
-#: actions/deletegroup.php:206
 msgid ""
 "Are you sure you want to delete this group? This will clear all data about "
 "the group from the database, without a backup. Public posts to this group "
@@ -1985,12 +1546,10 @@ msgid ""
 msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting a group.
-#: actions/deletegroup.php:224
 msgid "Do not delete this group."
 msgstr ""
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
-#: actions/deletegroup.php:231
 msgid "Delete this group."
 msgstr "Elimine chest grup."
 
@@ -2000,22 +1559,18 @@ msgstr "Elimine chest grup."
 #. TRANS: Client error displayed trying to block a user from a group while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying to log out when not logged in.
+#. TRANS: Client error displayed when trying to access the "make admin" page while not logged in.
+#. TRANS: Client error displayed trying to create a new direct message while not logged in.
+#. TRANS: Client error displayed trying to send a notice while not logged in.
+#. TRANS: Client error displayed trying to nudge a user without being logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
 #. TRANS: Client error displayed when trying to change user options while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
-#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:70
-#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
-#: actions/nudge.php:63 actions/pluginenable.php:97 actions/subedit.php:33
-#: actions/subscribe.php:98 actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:71 lib/profileformaction.php:63
-#: lib/settingsaction.php:72
 msgid "Not logged in."
 msgstr "No tu sês jentrât."
 
 #. TRANS: Instructions for deleting a notice.
-#: actions/deletenotice.php:110
 msgid ""
 "You are about to permanently delete a notice. Once this is done, it cannot "
 "be undone."
@@ -2025,145 +1580,117 @@ msgstr ""
 
 #. TRANS: Page title when deleting a notice.
 #. TRANS: Fieldset legend for the delete notice form.
-#: actions/deletenotice.php:117 actions/deletenotice.php:148
 msgid "Delete notice"
 msgstr "Elimine l'avîs"
 
 #. TRANS: Message for the delete notice form.
-#: actions/deletenotice.php:152
 msgid "Are you sure you want to delete this notice?"
 msgstr "Sêstu sigûr di volê eliminâ chest avîs?"
 
 #. TRANS: Submit button title for 'No' when deleting a notice.
-#: actions/deletenotice.php:159
 msgid "Do not delete this notice."
 msgstr "No stâ eliminâ chest avîs"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:166
 msgid "Delete this notice."
 msgstr "Elimine chest avîs"
 
 #. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
-#: actions/deleteuser.php:66
 msgid "You cannot delete users."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to delete a non-local user.
-#: actions/deleteuser.php:74
 msgid "You can only delete local users."
 msgstr ""
 
 #. TRANS: Title of delete user page.
-#: actions/deleteuser.php:110
 msgctxt "TITLE"
 msgid "Delete user"
 msgstr "Elimine utent"
 
 #. TRANS: Fieldset legend on delete user page.
-#: actions/deleteuser.php:134
 msgid "Delete user"
 msgstr "Elimine utent"
 
 #. TRANS: Information text to request if a user is certain that the described action has to be performed.
-#: actions/deleteuser.php:138
 msgid ""
 "Are you sure you want to delete this user? This will clear all data about "
 "the user from the database, without a backup."
 msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/deleteuser.php:158
 msgid "Do not delete this user."
 msgstr "No stâ eliminâ chest utent"
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
-#: actions/deleteuser.php:165
 msgid "Delete this user."
 msgstr "Elimine chest utent"
 
 #. TRANS: Message used as title for design settings for the site.
-#: actions/designadminpanel.php:60 lib/settingsnav.php:97
 msgid "Design"
 msgstr ""
 
 #. TRANS: Instructions for design adminsitration panel.
-#: actions/designadminpanel.php:71
 msgid "Design settings for this StatusNet site"
 msgstr ""
 
 #. TRANS: Client error displayed when a logo URL does is not valid.
-#: actions/designadminpanel.php:327
 msgid "Invalid logo URL."
 msgstr ""
 
 #. TRANS: Client error displayed when an SSL logo URL is invalid.
-#: actions/designadminpanel.php:333
 msgid "Invalid SSL logo URL."
 msgstr ""
 
 #. TRANS: Client error displayed when a theme is submitted through the form that is not in the theme list.
 #. TRANS: %s is the chosen unavailable theme.
-#: actions/designadminpanel.php:339
 #, php-format
 msgid "Theme not available: %s."
 msgstr ""
 
 #. TRANS: Fieldset legend for form to change logo.
-#: actions/designadminpanel.php:437
 msgid "Change logo"
 msgstr ""
 
 #. TRANS: Field label for StatusNet site logo.
-#: actions/designadminpanel.php:444
 msgid "Site logo"
 msgstr ""
 
 #. TRANS: Field label for SSL StatusNet site logo.
-#: actions/designadminpanel.php:452
 msgid "SSL logo"
 msgstr ""
 
 #. TRANS: Fieldset legend for form change StatusNet site's theme.
-#: actions/designadminpanel.php:467
 msgid "Change theme"
 msgstr "Cambie il teme"
 
 #. TRANS: Field label for dropdown to choose site theme.
-#: actions/designadminpanel.php:485
 msgid "Site theme"
 msgstr ""
 
 #. TRANS: Title for field label for dropdown to choose site theme.
-#: actions/designadminpanel.php:487
 msgid "Theme for the site."
 msgstr ""
 
 #. TRANS: Field label for uploading a cutom theme.
-#: actions/designadminpanel.php:494
 msgid "Custom theme"
 msgstr ""
 
 #. TRANS: Form instructions for uploading a cutom StatusNet theme.
-#: actions/designadminpanel.php:499
 msgid "You can upload a custom StatusNet theme as a .ZIP archive."
 msgstr ""
 
 #. TRANS: Fieldset legend for theme background image.
-#: actions/designadminpanel.php:515
 msgid "Change background image"
 msgstr ""
 
 #. TRANS: Field label for background image on theme designer page.
 #. TRANS: Field label for background color selector.
 #. TRANS: Label on profile design page for setting a profile page background colour.
-#: actions/designadminpanel.php:525 actions/designadminpanel.php:609
-#: lib/designform.php:238
 msgid "Background"
 msgstr ""
 
 #. TRANS: Form guide for background image upload form on theme designer page.
-#: actions/designadminpanel.php:531
 #, php-format
 msgid ""
 "You can upload a background image for the site. The maximum file size is %1"
@@ -2171,197 +1698,162 @@ msgid ""
 msgstr ""
 
 #. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:558
 msgid "On"
 msgstr "Ativade"
 
 #. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:575
 msgid "Off"
 msgstr "Disativade"
 
 #. TRANS: Form guide for turning background image on or off on theme designer page.
 #. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
 #. TRANS: use of the uploaded profile image.
-#: actions/designadminpanel.php:577 lib/designform.php:214
 msgid "Turn background image on or off."
 msgstr ""
 
 #. TRANS: Checkbox label to title background image on theme designer page.
 #. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-#: actions/designadminpanel.php:583 lib/designform.php:220
 msgid "Tile background image"
 msgstr ""
 
 #. TRANS: Fieldset legend for theme colors.
-#: actions/designadminpanel.php:598
 msgid "Change colors"
 msgstr "Cambie i colôrs"
 
 #. TRANS: Field label for content color selector.
 #. TRANS: Label on profile design page for setting a profile page content colour.
-#: actions/designadminpanel.php:623 lib/designform.php:252
 msgid "Content"
 msgstr "Contignût"
 
 #. TRANS: Field label for sidebar color selector.
 #. TRANS: Label on profile design page for setting a profile page sidebar colour.
-#: actions/designadminpanel.php:637 lib/designform.php:266
 msgid "Sidebar"
 msgstr "Bare in bande"
 
 #. TRANS: Field label for text color selector.
 #. TRANS: Label on profile design page for setting a profile page text colour.
-#: actions/designadminpanel.php:651 lib/designform.php:280
 msgid "Text"
 msgstr "Test"
 
 #. TRANS: Field label for link color selector.
 #. TRANS: Label on profile design page for setting a profile page links colour.
-#: actions/designadminpanel.php:665 lib/designform.php:294
 msgid "Links"
 msgstr "Leams"
 
 #. TRANS: Fieldset legend for advanced theme design settings.
-#: actions/designadminpanel.php:691
 msgid "Advanced"
 msgstr "Avançadis"
 
 #. TRANS: Field label for custom CSS.
-#: actions/designadminpanel.php:696
 msgid "Custom CSS"
 msgstr "CSS personalizât"
 
 #. TRANS: Button text for resetting theme settings.
-#: actions/designadminpanel.php:718
 msgctxt "BUTTON"
 msgid "Use defaults"
 msgstr "Dopre i parametris predeterminâts"
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:720
 msgid "Restore default designs."
 msgstr ""
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:728
 msgid "Reset back to default."
 msgstr ""
 
 #. TRANS: Title for button for saving theme settings.
-#: actions/designadminpanel.php:736
 msgid "Save design."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
-#: actions/disfavor.php:83
 msgid "This notice is not a favorite!"
 msgstr ""
 
 #. TRANS: Title for page on which favorites can be added.
-#: actions/disfavor.php:98
 msgid "Add to favorites"
 msgstr "Zonte ai preferîts"
 
 #. TRANS: Client exception thrown when requesting a document from the documentation that does not exist.
 #. TRANS: %s is the non-existing document.
-#: actions/doc.php:155
 #, php-format
 msgid "No such document \"%s\"."
 msgstr ""
 
 #. TRANS: Title for "Edit application" form.
 #. TRANS: Form legend.
-#: actions/editapplication.php:54 lib/applicationeditform.php:129
 msgid "Edit application"
 msgstr ""
 
 #. TRANS: Client error displayed trying to edit an application while not logged in.
-#: actions/editapplication.php:66
 msgid "You must be logged in to edit an application."
 msgstr ""
 
 #. TRANS: Client error displayed trying to edit an application that does not exist.
-#: actions/editapplication.php:83 actions/showapplication.php:83
 msgid "No such application."
 msgstr ""
 
 #. TRANS: Instructions for "Edit application" form.
-#: actions/editapplication.php:167
 msgid "Use this form to edit your application."
 msgstr ""
 
 #. TRANS: Validation error shown when not providing a name in the "Edit application" form.
 #. TRANS: Validation error shown when not providing a name in the "New application" form.
-#: actions/editapplication.php:184 actions/newapplication.php:164
 msgid "Name is required."
 msgstr "E covente un non."
 
 #. 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.
-#: actions/editapplication.php:188 actions/newapplication.php:172
 msgid "Name is too long (maximum 255 characters)."
 msgstr "Il non al è masse lunc (max 255 caratars)."
 
 #. TRANS: Validation error shown when providing a name for an application that already exists in the "Edit application" form.
 #. TRANS: Validation error shown when providing a name for an application that already exists in the "New application" form.
-#: actions/editapplication.php:192 actions/newapplication.php:168
 msgid "Name already in use. Try another one."
 msgstr "Il non al è za doprât. Provent un altri."
 
 #. TRANS: Validation error shown when not providing a description in the "Edit application" form.
 #. TRANS: Validation error shown when not providing a description in the "New application" form.
-#: actions/editapplication.php:196 actions/newapplication.php:176
 msgid "Description is required."
 msgstr "E covente une descrizion."
 
 #. TRANS: Validation error shown when providing too long a source URL in the "Edit application" form.
-#: actions/editapplication.php:209
 msgid "Source URL is too long."
 msgstr "La URL sorzint e je masse lungje."
 
 #. TRANS: Validation error shown when providing an invalid source URL in the "Edit application" form.
 #. TRANS: Validation error shown when providing an invalid source URL in the "New application" form.
-#: actions/editapplication.php:216 actions/newapplication.php:199
 msgid "Source URL is not valid."
 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.
-#: actions/editapplication.php:220 actions/newapplication.php:203
 msgid "Organization is required."
 msgstr ""
 
 #. TRANS: Validation error shown when providing too long an arganisation name in the "Edit application" form.
-#: actions/editapplication.php:224 actions/newapplication.php:207
 msgid "Organization is too long (maximum 255 characters)."
 msgstr "La organizazion e je masse lungje (max 255 caratars)."
 
 #. TRANS: Form validation error show when an organisation name has not been provided in the edit application form.
 #. TRANS: Form validation error show when an organisation name has not been provided in the new application form.
-#: actions/editapplication.php:228 actions/newapplication.php:211
 msgid "Organization homepage is required."
 msgstr ""
 
 #. TRANS: Validation error shown when providing too long a callback URL in the "Edit application" form.
 #. TRANS: Validation error shown when providing too long a callback URL in the "New application" form.
-#: actions/editapplication.php:239 actions/newapplication.php:225
 msgid "Callback is too long."
 msgstr ""
 
 #. TRANS: Validation error shown when providing an invalid callback URL in the "Edit application" form.
 #. TRANS: Validation error shown when providing an invalid callback URL in the "New application" form.
-#: actions/editapplication.php:247 actions/newapplication.php:235
 msgid "Callback URL is not valid."
 msgstr ""
 
 #. TRANS: Server error occuring when an application could not be updated from the "Edit application" form.
-#: actions/editapplication.php:284
 msgid "Could not update application."
 msgstr ""
 
 #. TRANS: Title for form to edit a group. %s is a group nickname.
-#: actions/editgroup.php:55
 #, php-format
 msgid "Edit %s group"
 msgstr "Cambie il grup %s"
@@ -2369,40 +1861,40 @@ msgstr "Cambie il grup %s"
 #. TRANS: Client error displayed trying to edit a group while not logged in.
 #. TRANS: Client error displayed when trying to create a group while not logged in.
 #. TRANS: Client error displayed trying to create a group while not logged in.
-#: actions/editgroup.php:68 actions/grouplogo.php:69 actions/newgroup.php:65
 msgid "You must be logged in to create a group."
 msgstr ""
 
 #. TRANS: Form instructions for group edit form.
-#: actions/editgroup.php:161
 msgid "Use this form to edit the group."
 msgstr ""
 
+#. TRANS: Group edit form validation error.
+#. TRANS: Group create form validation error.
+#. TRANS: %s is the invalid alias.
+#, php-format
+msgid "Invalid alias: \"%s\""
+msgstr ""
+
 #. TRANS: Group edit form success message.
-#: actions/editgroup.php:301
 msgid "Options saved."
 msgstr "Opzions salvadis."
 
 #. TRANS: Title for e-mail settings.
-#: actions/emailsettings.php:60
 msgid "Email settings"
 msgstr "Impuestazions pe pueste eletroniche"
 
 #. TRANS: E-mail settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/emailsettings.php:74
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 msgstr "Gjestìs cemût che tu ricevis la pueste di %%site.name%%."
 
 #. TRANS: Form legend for e-mail settings form.
 #. TRANS: Field label for e-mail address input in e-mail settings form.
-#: actions/emailsettings.php:104 actions/emailsettings.php:130
 msgid "Email address"
 msgstr "Direzion di pueste eletroniche"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:110
 msgid "Current confirmed email address."
 msgstr "Atuâl direzion di pueste confermade."
 
@@ -2411,15 +1903,11 @@ msgstr "Atuâl direzion di pueste confermade."
 #. TRANS: Button label to remove a confirmed IM address.
 #. TRANS: Button label to remove a confirmed SMS address.
 #. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
-#: actions/emailsettings.php:113 actions/emailsettings.php:180
-#: actions/imsettings.php:119 actions/smssettings.php:119
-#: actions/smssettings.php:175
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Gjave"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:120
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -2432,44 +1920,36 @@ msgstr ""
 #. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
 #. TRANS: Any other domain may be owned by a legitimate person or
 #. TRANS: organization.
-#: actions/emailsettings.php:137
 msgid "Email address, like \"UserName@example.org\""
 msgstr "Direzion di pueste eletroniche, come \"nonutent@example.org\""
 
 #. TRANS: Button label for adding an e-mail address in e-mail settings form.
 #. TRANS: Button label for adding an IM address in IM settings form.
 #. TRANS: Button label for adding a SMS phone number in SMS settings form.
-#: actions/emailsettings.php:141 actions/imsettings.php:147
-#: actions/smssettings.php:157
 msgctxt "BUTTON"
 msgid "Add"
 msgstr "Zonte"
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:149 actions/smssettings.php:166
 msgid "Incoming email"
 msgstr "Pueste in jentrade"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:155
 msgid "I want to post notices by email."
 msgstr "O vuei publicâ avîs par pueste eletroniche."
 
 #. TRANS: Form instructions for incoming e-mail form in e-mail settings.
 #. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
-#: actions/emailsettings.php:177 actions/smssettings.php:173
 msgid "Send email to this address to post new notices."
 msgstr ""
 
 #. TRANS: Instructions for incoming e-mail address input form, when an address has already been assigned.
 #. TRANS: Instructions for incoming SMS e-mail address input form.
-#: actions/emailsettings.php:186 actions/smssettings.php:181
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr ""
 
 #. TRANS: Instructions for incoming e-mail address input form.
-#: actions/emailsettings.php:190
 msgid ""
 "To send notices via email, we need to create a unique email address for you "
 "on this server:"
@@ -2477,87 +1957,69 @@ msgstr ""
 
 #. TRANS: Button label for adding an e-mail address to send notices from.
 #. TRANS: Button label for adding an SMS e-mail address to send notices from.
-#: actions/emailsettings.php:196 actions/smssettings.php:184
 msgctxt "BUTTON"
 msgid "New"
 msgstr "Gnûf"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:205
 msgid "Email preferences"
 msgstr "Preferencis de pueste eletroniche"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:213
 msgid "Send me notices of new subscriptions through email."
 msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:219
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:226
 msgid "Send me email when someone sends me a private message."
 msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:232
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:238
 msgid "Allow friends to nudge me and send me an email."
 msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:244
 msgid "Publish a MicroID for my email address."
 msgstr ""
 
 #. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:362
 msgid "Email preferences saved."
 msgstr ""
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:381
 msgid "No email address."
 msgstr "Nissune direzion di pueste eletroniche."
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:389
 msgid "Cannot normalize that email address."
 msgstr ""
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:394 actions/register.php:197
-#: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "La direzion di pueste eletroniche no je valide."
 
 #. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:398
 msgid "That is already your email address."
 msgstr ""
 
 #. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:402
 msgid "That email address already belongs to another user."
 msgstr ""
 
 #. TRANS: Server error thrown on database error adding e-mail confirmation code.
 #. TRANS: Server error thrown on database error adding Instant Messaging confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:419 actions/imsettings.php:362
-#: actions/smssettings.php:364
 msgid "Could not insert confirmation code."
 msgstr ""
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:426
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
@@ -2566,99 +2028,79 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling Instant Messaging address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:446 actions/imsettings.php:391
-#: actions/smssettings.php:398
 msgid "No pending confirmation to cancel."
 msgstr ""
 
 #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:451
 msgid "That is the wrong email address."
 msgstr ""
 
 #. TRANS: Server error thrown on database error canceling e-mail address confirmation.
 #. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
-#: actions/emailsettings.php:460 actions/smssettings.php:412
 msgid "Could not delete email confirmation."
 msgstr ""
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:465
 msgid "Email confirmation cancelled."
 msgstr ""
 
 #. TRANS: Message given trying to remove an e-mail address that is not
 #. TRANS: registered for the active user.
-#: actions/emailsettings.php:484
 msgid "That is not your email address."
 msgstr ""
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:505
 msgid "The email address was removed."
 msgstr ""
 
 #. TRANS: Form validation error displayed when trying to remove an incoming e-mail address while no address has been set.
-#: actions/emailsettings.php:519 actions/smssettings.php:554
 msgid "No incoming email address."
 msgstr ""
 
 #. 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.
-#: actions/emailsettings.php:531 actions/emailsettings.php:555
-#: actions/smssettings.php:565 actions/smssettings.php:590
 msgid "Could not update user record."
 msgstr ""
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
 #. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:535 actions/smssettings.php:569
 msgid "Incoming email address removed."
 msgstr ""
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
 #. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:559 actions/smssettings.php:594
 msgid "New incoming email address added."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to mark a notice as favorite that already is a favorite.
-#: actions/favor.php:80
 msgid "This notice is already a favorite!"
 msgstr ""
 
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
-#: actions/favor.php:95
 msgid "Disfavor favorite."
 msgstr ""
 
 #. TRANS: Page title for first page of favorited notices.
 #. TRANS: Title for favourited notices section.
-#: actions/favorited.php:65 lib/popularnoticesection.php:62
-#: lib/publicgroupnav.php:93
 msgid "Popular notices"
 msgstr "Avîs popolârs"
 
 #. TRANS: Page title for all but first page of favorited notices.
 #. TRANS: %d is the page number being displayed.
-#: actions/favorited.php:69
 #, php-format
 msgid "Popular notices, page %d"
 msgstr "Avîs popolârs, pagjine %d"
 
 #. TRANS: Description on page displaying favorited notices.
-#: actions/favorited.php:81
 msgid "The most popular notices on the site right now."
 msgstr "I avîs plui popolârs in chest moment sul sît."
 
 #. TRANS: Text displayed instead of a list when a site does not yet have any favourited notices.
-#: actions/favorited.php:149
 msgid "Favorite notices appear on this page but no one has favorited one yet."
 msgstr ""
 
 #. TRANS: Additional text displayed instead of a list when a site does not yet have any favourited notices for logged in users.
-#: actions/favorited.php:153
 msgid ""
 "Be the first to add a notice to your favorites by clicking the fave button "
 "next to any notice you like."
@@ -2666,7 +2108,6 @@ msgstr ""
 
 #. TRANS: Additional text displayed instead of a list when a site does not yet have any favourited notices for not logged in users.
 #. TRANS: %%action.register%% is a registration link. "[link text](link)" is Mark Down. Do not change the formatting.
-#: actions/favorited.php:158
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to add a "
@@ -2677,181 +2118,146 @@ msgstr ""
 #. TRANS: %s is a user's nickname.
 #. TRANS: Title for first page of favourite notices of a user.
 #. TRANS: %s is the user for whom the favourite notices are displayed.
-#: actions/favoritesrss.php:111 actions/showfavorites.php:76
-#: lib/personalgroupnav.php:110
 #, php-format
 msgid "%s's favorite notices"
 msgstr "Avîs preferîts di %s"
 
 #. TRANS: Desciption of RSS feed with favourite notices of a user.
 #. TRANS: %1$s is a user's nickname, %2$s is the name of the StatusNet site.
-#: actions/favoritesrss.php:117
 #, php-format
 msgid "Updates favored by %1$s on %2$s!"
 msgstr "Inzornaments preferîts di %1$s su %2$s!"
 
 #. TRANS: Page title for first page of featured users.
 #. TRANS: Title for featured users section.
-#: actions/featured.php:69 lib/featureduserssection.php:87
-#: lib/publicgroupnav.php:89
 msgid "Featured users"
 msgstr "Utents in evidence"
 
 #. TRANS: Page title for all but first page of featured users.
 #. TRANS: %d is the page number being displayed.
-#: actions/featured.php:73
 #, php-format
 msgid "Featured users, page %d"
 msgstr "Utents in evidence, pagjine %d"
 
 #. TRANS: Description on page displaying featured users.
-#: actions/featured.php:102
 #, php-format
 msgid "A selection of some great users on %s."
 msgstr "Une selezion dai miôrs utents su %s."
 
 #. TRANS: Client error displayed when no notice ID was given trying do display a file.
-#: actions/file.php:36
 msgid "No notice ID."
 msgstr ""
 
 #. TRANS: Client error displayed when an invalid notice ID was given trying do display a file.
-#: actions/file.php:41
 msgid "No notice."
 msgstr ""
 
 #. TRANS: Client error displayed when trying do display a file for a notice without a file attachement.
-#: actions/file.php:46
 msgid "No attachments."
 msgstr ""
 
 #. TRANS: Client error displayed when trying do display a file for a notice with file attachements
 #. TRANS: that could not be found.
-#: actions/file.php:58
 msgid "No uploaded attachments."
 msgstr ""
 
 #. TRANS: Client error displayed when subscribing to a remote profile and an unexpected response is received.
-#: actions/finishremotesubscribe.php:69
 msgid "Not expecting this response!"
 msgstr ""
 
 #. TRANS: Client error displayed when subscribing to a remote profile that does not exist.
-#: actions/finishremotesubscribe.php:81
 msgid "User being listened to does not exist."
 msgstr ""
 
 #. TRANS: Client error displayed when subscribing to a remote profile that is a local profile.
-#: actions/finishremotesubscribe.php:89 actions/remotesubscribe.php:58
 msgid "You can use the local subscription!"
 msgstr ""
 
 #. TRANS: Client error displayed when subscribing to a remote profile that is blocked form subscribing to.
-#: actions/finishremotesubscribe.php:102
 msgid "That user has blocked you from subscribing."
 msgstr "Chest utent ti à blocât e no tu puedis sotscrivilu."
 
 #. TRANS: Client error displayed when subscribing to a remote profile without providing an authorised token.
-#: actions/finishremotesubscribe.php:114
 msgid "You are not authorized."
 msgstr ""
 
 #. TRANS: Client error displayed when subscribing to a remote profile and conversion of the request token to access token fails.
-#: actions/finishremotesubscribe.php:118
 msgid "Could not convert request token to access token."
 msgstr ""
 
 #. TRANS: Client error displayed when subscribing to a remote profile fails because of an unsupported version of the OMB protocol.
-#: actions/finishremotesubscribe.php:124
 msgid "Remote service uses unknown version of OMB protocol."
 msgstr ""
 
 #. TRANS: Server error displayed when subscribing to a remote profile fails because the remote profile could not be updated.
-#: actions/finishremotesubscribe.php:145 lib/oauthstore.php:317
 msgid "Error updating remote profile."
 msgstr ""
 
 #. TRANS: Client error displayed when requesting a non-existent file.
-#: actions/getfile.php:77
 msgid "No such file."
 msgstr "Il file nol esist."
 
 #. TRANS: Client error displayed when requesting a file without having read access to it.
-#: actions/getfile.php:82
 msgid "Cannot read file."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to assign an invalid role to a user.
-#: actions/grantrole.php:61 actions/revokerole.php:62
 msgid "Invalid role."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to assign an reserved role to a user.
-#: actions/grantrole.php:66 actions/revokerole.php:66
 msgid "This role is reserved and cannot be set."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to assign a role to a user while not being allowed to set roles.
-#: actions/grantrole.php:76
 msgid "You cannot grant user roles on this site."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to assign a role to a user that already has that role.
-#: actions/grantrole.php:84
 msgid "User already has this role."
 msgstr ""
 
 #. TRANS: Client error displayed trying to block a user from a group while not specifying a to be blocked user profile.
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing a profile.
+#. TRANS: Client error displayed when not providing a profile ID on the Make Admin page.
 #. TRANS: Client error displayed trying a change a subscription without providing a profile.
 #. TRANS: Client error displayed when trying to change user options without specifying a user to work on.
-#: actions/groupblock.php:71 actions/groupunblock.php:71
-#: actions/makeadmin.php:71 actions/subedit.php:49
-#: lib/profileformaction.php:79
 msgid "No profile specified."
 msgstr ""
 
 #. TRANS: Client error displayed trying to block a user from a group while specifying a non-existing profile.
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing an existing profile.
+#. TRANS: Client error displayed when specifying an invalid profile ID on the Make Admin page.
 #. TRANS: Client error displayed trying a change a subscription for a non-existant profile ID.
 #. TRANS: Client error displayed when trying to change user options without specifying an existing user to work on.
-#: actions/groupblock.php:77 actions/groupunblock.php:77
-#: actions/makeadmin.php:76 actions/subedit.php:57 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:87
 msgid "No profile with that ID."
 msgstr ""
 
 #. TRANS: Client error displayed trying to block a user from a group while not specifying a group to block a profile from.
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing a group.
-#: actions/groupblock.php:83 actions/groupunblock.php:83
-#: actions/makeadmin.php:81
+#. TRANS: Client error displayed when not providing a group ID on the Make Admin page.
 msgid "No group specified."
 msgstr ""
 
 #. TRANS: Client error displayed trying to block a user from a group while not being an admin user.
-#: actions/groupblock.php:95
 msgid "Only an admin can block group members."
 msgstr ""
 
 #. TRANS: Client error displayed trying to block a user from a group while user is already blocked from the given group.
-#: actions/groupblock.php:100
 msgid "User is already blocked from group."
 msgstr ""
 
 #. TRANS: Client error displayed trying to block a user from a group while user is not a member of given group.
-#: actions/groupblock.php:106
 msgid "User is not a member of group."
 msgstr ""
 
 #. TRANS: Title for block user from group page.
 #. TRANS: Form legend for form to block user from a group.
-#: actions/groupblock.php:141 actions/groupmembers.php:364
 msgid "Block user from group"
 msgstr ""
 
 #. TRANS: Explanatory text for block user from group form before setting the block.
 #. TRANS: %1$s is that to be blocked user, %2$s is the group the user will be blocked from.
-#: actions/groupblock.php:169
 #, php-format
 msgid ""
 "Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They "
@@ -2860,160 +2266,132 @@ msgid ""
 msgstr ""
 
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
-#: actions/groupblock.php:191
 msgid "Do not block this user from this group."
 msgstr ""
 
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
-#: actions/groupblock.php:198
 msgid "Block this user from this group."
 msgstr ""
 
 #. TRANS: Server error displayed when trying to block a user from a group fails because of an application error.
-#: actions/groupblock.php:215
 msgid "Database error blocking user from group."
 msgstr ""
 
 #. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
 #. TRANS: Client error displayed trying to find a user by ID without providing an ID.
-#: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr ""
 
 #. TRANS: Client error displayed trying to change group design settings while not logged in.
-#: actions/groupdesignsettings.php:67
 msgid "You must be logged in to edit a group."
 msgstr ""
 
 #. TRANS: Title group design settings page.
-#: actions/groupdesignsettings.php:146
 msgid "Group design"
 msgstr ""
 
 #. TRANS: Instructions for group design settings page.
-#: actions/groupdesignsettings.php:157
 msgid ""
 "Customize the way your group looks with a background image and a colour "
 "palette of your choice."
 msgstr ""
 
 #. TRANS: Form validation error displayed when group design settings could not be updated because of an application issue.
-#: actions/groupdesignsettings.php:262
 msgid "Unable to update your design settings."
 msgstr ""
 
 #. TRANS: Form text to confirm saved group design settings.
-#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:239
 msgid "Design preferences saved."
 msgstr ""
 
 #. TRANS: Title for group logo settings page.
 #. TRANS: Group logo form legend.
-#: actions/grouplogo.php:144 actions/grouplogo.php:199
 msgid "Group logo"
 msgstr ""
 
 #. TRANS: Instructions for group logo page.
 #. TRANS: %s is the maximum file size for that site.
-#: actions/grouplogo.php:156
 #, php-format
 msgid ""
 "You can upload a logo image for your group. The maximum file size is %s."
 msgstr ""
 
 #. TRANS: Submit button for uploading a group logo.
-#: actions/grouplogo.php:243
 msgid "Upload"
 msgstr "Cjame"
 
 #. TRANS: Button text for cropping an uploaded group logo.
-#: actions/grouplogo.php:299
 msgid "Crop"
 msgstr "Taie"
 
 #. TRANS: Form instructions on the group logo page.
-#: actions/grouplogo.php:376
 msgid "Pick a square area of the image to be the logo."
 msgstr ""
 
 #. TRANS: Form success message after updating a group logo.
-#: actions/grouplogo.php:411
 msgid "Logo updated."
 msgstr ""
 
 #. TRANS: Form failure message after failing to update a group logo.
-#: actions/grouplogo.php:414
 msgid "Failed updating logo."
 msgstr ""
 
 #. TRANS: Title of the page showing group members.
 #. TRANS: %s is the name of the group.
-#: actions/groupmembers.php:104
 #, php-format
 msgid "%s group members"
 msgstr "Membris dal grup %s"
 
 #. TRANS: Title of the page showing group members.
 #. TRANS: %1$s is the name of the group, %2$d is the page number of the members list.
-#: actions/groupmembers.php:109
 #, php-format
 msgid "%1$s group members, page %2$d"
 msgstr "Membris dal grup %1$s, pagjine %2$d"
 
 #. TRANS: Page notice for group members page.
-#: actions/groupmembers.php:125
 msgid "A list of the users in this group."
 msgstr "Une liste dai utents in chest grup."
 
 #. TRANS: Indicator in group members list that this user is a group administrator.
-#: actions/groupmembers.php:190 lib/action.php:581
 msgid "Admin"
 msgstr "Aministradôr"
 
 #. TRANS: Button text for the form that will block a user from a group.
-#: actions/groupmembers.php:397
 msgctxt "BUTTON"
 msgid "Block"
 msgstr "Bloche"
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:401
 msgctxt "TOOLTIP"
 msgid "Block this user"
 msgstr "Bloche chest utent"
 
 #. TRANS: Form legend for form to make a user a group admin.
-#: actions/groupmembers.php:488
 msgid "Make user an admin of the group"
 msgstr ""
 
 #. TRANS: Button text for the form that will make a user administrator.
-#: actions/groupmembers.php:521
 msgctxt "BUTTON"
 msgid "Make Admin"
 msgstr ""
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:525
 msgctxt "TOOLTIP"
 msgid "Make this user an admin"
 msgstr ""
 
 #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
-#: actions/grouprss.php:141
 #, php-format
 msgid "Updates from members of %1$s on %2$s!"
 msgstr "Inzornaments dai membris di %1$s su %2$s!"
 
 #. TRANS: Title for first page of the groups list.
-#: actions/groups.php:62
 msgctxt "TITLE"
 msgid "Groups"
 msgstr "Grups"
 
 #. TRANS: Title for all but the first page of the groups list.
 #. TRANS: %d is the page number.
-#: actions/groups.php:66
 #, php-format
 msgctxt "TITLE"
 msgid "Groups, page %d"
@@ -3022,7 +2400,6 @@ msgstr "Grups, pagjine %d"
 #. TRANS: Page notice of group list. %%%%site.name%%%% is the StatusNet site name,
 #. TRANS: %%%%action.groupsearch%%%% and %%%%action.newgroup%%%% are URLs. Do not change them.
 #. TRANS: This message contains Markdown links in the form [link text](link).
-#: actions/groups.php:95
 #, php-format
 msgid ""
 "%%%%site.name%%%% groups let you find and talk with people of similar "
@@ -3038,12 +2415,10 @@ msgstr ""
 "[scomence il to](%%%%action.newgroup%%%%)!"
 
 #. TRANS: Link to create a new group on the group list page.
-#: actions/groups.php:113 actions/usergroups.php:126 lib/groupeditform.php:115
 msgid "Create a new group"
 msgstr "Cree un gnûf grup"
 
 #. TRANS: Instructions for page where groups can be searched. %%site.name%% is the name of the StatusNet site.
-#: actions/groupsearch.php:53
 #, php-format
 msgid ""
 "Search for groups on %%site.name%% by their name, location, or description. "
@@ -3053,21 +2428,17 @@ msgstr ""
 "spazis; ogni tiermin al à di sei lunc almancul trê caratars."
 
 #. TRANS: Title for page where groups can be searched.
-#: actions/groupsearch.php:60
 msgid "Group search"
 msgstr "Ricercje di grups"
 
 #. TRANS: Text on page where groups can be searched if no results were found for a query.
 #. TRANS: Text for notice search results is the query had no results.
 #. TRANS: Message on the "People search" page where a query has no results.
-#: actions/groupsearch.php:82 actions/noticesearch.php:122
-#: actions/peoplesearch.php:87
 msgid "No results."
 msgstr "Nissun risultât."
 
 #. TRANS: Additional text on page where groups can be searched if no results were found for a query for a logged in user.
 #. TRANS: This message contains Markdown links in the form [link text](link).
-#: actions/groupsearch.php:87
 #, php-format
 msgid ""
 "If you cannot find the group you're looking for, you can [create it](%%"
@@ -3078,7 +2449,6 @@ msgstr ""
 
 #. TRANS: Additional text on page where groups can be searched if no results were found for a query for a not logged in user.
 #. TRANS: This message contains Markdown links in the form [link text](link).
-#: actions/groupsearch.php:92
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and [create the group](%%"
@@ -3086,30 +2456,25 @@ msgid ""
 msgstr ""
 
 #. TRANS: Client error displayed when trying to unblock a user from a group without being an administrator for the group.
-#: actions/groupunblock.php:95
 msgid "Only an admin can unblock group members."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to unblock a non-blocked user from a group.
-#: actions/groupunblock.php:100
 msgid "User is not blocked from group."
 msgstr ""
 
 #. TRANS: Server error displayed when unblocking a user from a group fails because of an unknown error.
 #. TRANS: Server error displayed when removing a user block.
-#: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr ""
 
 #. TRANS: Title for Instant Messaging settings.
-#: actions/imsettings.php:56
 msgid "IM settings"
 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.
-#: actions/imsettings.php:69
 #, php-format
 msgid ""
 "You can send and receive notices through instant messaging [instant messages]"
@@ -3117,18 +2482,15 @@ msgid ""
 msgstr ""
 
 #. TRANS: Message given in the IM settings if IM is not enabled on the site.
-#: actions/imsettings.php:90
 msgid "IM is not available."
 msgstr ""
 
-#: actions/imsettings.php:116
 #, fuzzy, php-format
 msgid "Current confirmed %s address."
 msgstr "Atuâl direzion di pueste confermade."
 
 #. TRANS: Form note in IM settings form.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:128
 #, fuzzy, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your %s account for a message "
@@ -3137,165 +2499,136 @@ msgstr ""
 "In spiete de conferme par cheste direzion. Controle la tô pueste in jentrade "
 "(e la cartele dal spam!) par un messaç cun altris istruzions."
 
-#: actions/imsettings.php:140
 msgid "IM address"
 msgstr "Direzion pai messaçs istantanis"
 
-#: actions/imsettings.php:142
 #, php-format
 msgid "%s screenname."
 msgstr ""
 
 #. TRANS: Header for IM preferences form.
-#: actions/imsettings.php:163
 #, fuzzy
 msgid "IM Preferences"
 msgstr "Preferencis IM"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:174
 #, fuzzy
 msgid "Send me notices"
 msgstr "Mande un avîs"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:176
 msgid "Post a notice when my status changes."
 msgstr ""
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:178
 msgid "Send me replies from people I'm not subscribed to."
 msgstr ""
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:181
 #, fuzzy
 msgid "Publish a MicroID"
 msgstr "Nûl public des etichetis"
 
 #. TRANS: Server error thrown on database error updating IM preferences.
-#: actions/imsettings.php:291
 #, fuzzy
 msgid "Couldn't update IM preferences."
 msgstr "Preferencis IM"
 
 #. TRANS: Confirmation message for successful IM preferences save.
 #. TRANS: Confirmation message after saving preferences.
-#: actions/imsettings.php:298 actions/urlsettings.php:244
 msgid "Preferences saved."
 msgstr "Preferencis salvadis."
 
 #. TRANS: Message given saving IM address without having provided one.
-#: actions/imsettings.php:320
 msgid "No screenname."
 msgstr ""
 
-#: actions/imsettings.php:325
 msgid "No transport."
 msgstr ""
 
 #. TRANS: Message given saving IM address that cannot be normalised.
-#: actions/imsettings.php:333
 msgid "Cannot normalize that screenname"
 msgstr ""
 
 #. TRANS: Message given saving IM address that not valid.
-#: actions/imsettings.php:340
 #, fuzzy
 msgid "Not a valid screenname"
 msgstr "Nol è un sorenon valit."
 
 #. TRANS: Message given saving IM address that is already set for another user.
-#: actions/imsettings.php:344
 #, fuzzy
 msgid "Screenname already belongs to another user."
 msgstr "Il sorenon al è za doprât. Provent un altri."
 
 #. TRANS: Message given saving valid IM address that is to be confirmed.
-#: actions/imsettings.php:369
 msgid "A confirmation code was sent to the IM address you added."
 msgstr ""
 
 #. TRANS: Message given canceling IM address confirmation for the wrong IM address.
-#: actions/imsettings.php:396
 msgid "That is the wrong IM address."
 msgstr ""
 
 #. TRANS: Server error thrown on database error canceling IM address confirmation.
-#: actions/imsettings.php:405
 #, fuzzy
 msgid "Couldn't delete confirmation."
 msgstr "Cambie la configurazion dal sît"
 
 #. TRANS: Message given after successfully canceling IM address confirmation.
-#: actions/imsettings.php:410
 msgid "IM confirmation cancelled."
 msgstr ""
 
 #. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.
-#: actions/imsettings.php:434
 msgid "That is not your screenname."
 msgstr ""
 
 #. TRANS: Server error thrown on database error removing a registered IM address.
-#: actions/imsettings.php:443
 msgid "Couldn't update user im prefs."
 msgstr ""
 
 #. TRANS: Message given after successfully removing a registered Instant Messaging address.
-#: actions/imsettings.php:451
 msgid "The IM address was removed."
 msgstr ""
 
 #. TRANS: Title for all but the first page of the inbox page.
 #. TRANS: %1$s is the user's nickname, %2$s is the page number.
-#: actions/inbox.php:59
 #, php-format
 msgid "Inbox for %1$s - page %2$d"
 msgstr "Pueste in jentrade par %1$s - pagjine %2$d"
 
 #. TRANS: Title for the first page of the inbox page.
 #. TRANS: %s is the user's nickname.
-#: actions/inbox.php:64
 #, php-format
 msgid "Inbox for %s"
 msgstr "Pueste in jentrade par %s"
 
 #. TRANS: Instructions for user inbox page.
-#: actions/inbox.php:106
 msgid "This is your inbox, which lists your incoming private messages."
 msgstr ""
 "Cheste e je la tô casele di pueste, dulà che tu tu cjatis i messaçs privâts "
 "che tu âs ricevût."
 
 #. TRANS: Client error displayed when trying to sent invites while they have been disabled.
-#: actions/invite.php:41
 msgid "Invites have been disabled."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to sent invites while not logged in.
 #. TRANS: %s is the StatusNet site name.
-#: actions/invite.php:45
 #, php-format
 msgid "You must be logged in to invite other users to use %s."
 msgstr ""
 
 #. TRANS: Form validation message when providing an e-mail address that does not validate.
 #. TRANS: %s is an invalid e-mail address.
-#: actions/invite.php:78
 #, php-format
 msgid "Invalid email address: %s."
 msgstr "La direzion di pueste eletroniche no je valide: %s"
 
 #. TRANS: Page title when invitations have been sent.
-#: actions/invite.php:117
 msgid "Invitations sent"
 msgstr "Invîts mandâts"
 
 #. TRANS: Page title when inviting potential users.
-#: actions/invite.php:120
 msgid "Invite new users"
 msgstr "Invide gnûfs utents"
 
@@ -3303,7 +2636,6 @@ msgstr "Invide gnûfs utents"
 #. TRANS: is already subscribed to one or more users with the given e-mail address(es).
 #. TRANS: Plural form is based on the number of reported already subscribed e-mail addresses.
 #. TRANS: Followed by a bullet list.
-#: actions/invite.php:140
 msgid "You are already subscribed to this user:"
 msgid_plural "You are already subscribed to these users:"
 msgstr[0] ""
@@ -3311,7 +2643,6 @@ msgstr[1] ""
 
 #. TRANS: Used as list item for already subscribed users (%1$s is nickname, %2$s is e-mail address).
 #. TRANS: Used as list item for already registered people (%1$s is nickname, %2$s is e-mail address).
-#: actions/invite.php:146 actions/invite.php:160
 #, php-format
 msgctxt "INVITE"
 msgid "%1$s (%2$s)"
@@ -3320,7 +2651,6 @@ msgstr "%1$s (%2$s)"
 #. TRANS: Message displayed inviting users to use a StatusNet site while the invited user
 #. TRANS: already uses a this StatusNet site. Plural form is based on the number of
 #. TRANS: reported already present people. Followed by a bullet list.
-#: actions/invite.php:154
 msgid "This person is already a user and you were automatically subscribed:"
 msgid_plural ""
 "These people are already users and you were automatically subscribed to them:"
@@ -3330,7 +2660,6 @@ msgstr[1] ""
 #. TRANS: Message displayed inviting users to use a StatusNet site. Plural form is
 #. TRANS: based on the number of invitations sent. Followed by a bullet list of
 #. TRANS: e-mail addresses to which invitations were sent.
-#: actions/invite.php:168
 msgid "Invitation sent to the following person:"
 msgid_plural "Invitations sent to the following people:"
 msgstr[0] ""
@@ -3338,40 +2667,34 @@ msgstr[1] ""
 
 #. TRANS: Generic message displayed after sending out one or more invitations to
 #. TRANS: people to join a StatusNet site.
-#: actions/invite.php:178
 msgid ""
 "You will be notified when your invitees accept the invitation and register "
 "on the site. Thanks for growing the community!"
 msgstr ""
 
 #. TRANS: Form instructions.
-#: actions/invite.php:191
 msgid ""
 "Use this form to invite your friends and colleagues to use this service."
 msgstr ""
 
 #. TRANS: Field label for a list of e-mail addresses.
-#: actions/invite.php:218
 msgid "Email addresses"
 msgstr "Direzions di pueste eletroniche"
 
 #. TRANS: Tooltip for field label for a list of e-mail addresses.
-#: actions/invite.php:221
 msgid "Addresses of friends to invite (one per line)."
 msgstr ""
 
 #. TRANS: Field label for a personal message to send to invitees.
-#: actions/invite.php:225
 msgid "Personal message"
 msgstr "Messaç personâl"
 
 #. TRANS: Tooltip for field label for a personal message to send to invitees.
-#: actions/invite.php:228
 msgid "Optionally add a personal message to the invitation."
 msgstr "Se tu vuelis, tu puedis zontâ un messaç personâl tal invît."
 
 #. TRANS: Send button for inviting friends
-#: actions/invite.php:232
+#. TRANS: Button text for sending notice.
 msgctxt "BUTTON"
 msgid "Send"
 msgstr "Mande"
@@ -3379,7 +2702,6 @@ msgstr "Mande"
 #. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral
 #. TRANS: singular 3rd-person pronoun in English. %1$s is the inviting user, $2$s is
 #. TRANS: the StatusNet sitename.
-#: actions/invite.php:264
 #, php-format
 msgid "%1$s has invited you to join them on %2$s"
 msgstr ""
@@ -3389,7 +2711,6 @@ msgstr ""
 #. TRANS: StatusNet sitename, %3$s is the site URL, %4$s is the personal message from the
 #. TRANS: inviting user, %s%5 a link to the timeline for the inviting user, %s$6 is a link
 #. TRANS: to register with the StatusNet site.
-#: actions/invite.php:271
 #, php-format
 msgid ""
 "%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -3421,182 +2742,177 @@ msgid ""
 msgstr ""
 
 #. TRANS: Client error displayed when trying to join a group while not logged in.
-#: actions/joingroup.php:59
 msgid "You must be logged in to join a group."
 msgstr ""
 
 #. TRANS: Title for join group page after joining.
-#: actions/joingroup.php:148
 #, php-format
 msgctxt "TITLE"
 msgid "%1$s joined group %2$s"
 msgstr "%1$s si à unît al grup %2$s"
 
 #. TRANS: Client error displayed when trying to leave a group while not logged in.
-#: actions/leavegroup.php:59
 msgid "You must be logged in to leave a group."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
-#: actions/leavegroup.php:103 lib/command.php:398
 msgid "You are not a member of that group."
 msgstr "No tu fasis part di chest grup."
 
 #. TRANS: Title for leave group page after leaving.
-#: actions/leavegroup.php:142
 #, php-format
 msgctxt "TITLE"
 msgid "%1$s left group %2$s"
 msgstr "%1$s al à lassât il grup %2$s"
 
 #. TRANS: User admin panel title
-#: actions/licenseadminpanel.php:55
 msgctxt "TITLE"
 msgid "License"
 msgstr "Licence"
 
-#: actions/licenseadminpanel.php:65
+#. TRANS: Form instructions for the site license admin panel.
 msgid "License for this StatusNet site"
 msgstr ""
 
-#: actions/licenseadminpanel.php:134
+#. TRANS: Client error displayed selecting an invalid license in the license admin panel.
 msgid "Invalid license selection."
 msgstr ""
 
-#: actions/licenseadminpanel.php:144
+#. TRANS: Client error displayed when not specifying an owner for the all rights reserved license in the license admin panel.
 msgid ""
 "You must specify the owner of the content when using the All Rights Reserved "
 "license."
 msgstr ""
 
-#: actions/licenseadminpanel.php:151
+#. TRANS: Client error displayed selecting a too long license title in the license admin panel.
 msgid "Invalid license title. Maximum length is 255 characters."
 msgstr ""
 
-#: actions/licenseadminpanel.php:163
+#. TRANS: Client error displayed specifying an invalid license URL in the license admin panel.
 msgid "Invalid license URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:166
+#. TRANS: Client error displayed specifying an invalid license image URL in the license admin panel.
 msgid "Invalid license image URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:174
+#. TRANS: Client error displayed specifying an invalid license URL in the license admin panel.
 msgid "License URL must be blank or a valid URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:182
+#. TRANS: Client error displayed specifying an invalid license image URL in the license admin panel.
 msgid "License image must be blank or valid URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:232
+#. TRANS: Form legend in the license admin panel.
 msgid "License selection"
 msgstr "Sielte de licence"
 
-#: actions/licenseadminpanel.php:238
+#. TRANS: License option in the license admin panel.
 msgid "Private"
 msgstr "Privât"
 
-#: actions/licenseadminpanel.php:239
+#. TRANS: License option in the license admin panel.
 msgid "All Rights Reserved"
 msgstr "Ducj i dirits riservâts"
 
-#: actions/licenseadminpanel.php:240
+#. TRANS: License option in the license admin panel.
 msgid "Creative Commons"
 msgstr "Creative Commons"
 
-#: actions/licenseadminpanel.php:245
+#. TRANS: Dropdown field label in the license admin panel.
 msgid "Type"
 msgstr "Gjenar"
 
-#: actions/licenseadminpanel.php:247
-msgid "Select license"
+#. TRANS: Dropdown field instructions in the license admin panel.
+#, fuzzy
+msgid "Select a license."
 msgstr "Sielç la licence"
 
-#: actions/licenseadminpanel.php:261
+#. TRANS: Form legend in the license admin panel.
 msgid "License details"
 msgstr "Detais de licence"
 
-#: actions/licenseadminpanel.php:267
+#. TRANS: Field label in the license admin panel.
 msgid "Owner"
 msgstr ""
 
-#: actions/licenseadminpanel.php:268
+#. TRANS: Field title in the license admin panel.
 msgid "Name of the owner of the site's content (if applicable)."
 msgstr ""
 
-#: actions/licenseadminpanel.php:276
+#. TRANS: Field label in the license admin panel.
 msgid "License Title"
 msgstr "Titul de licence"
 
-#: actions/licenseadminpanel.php:277
+#. TRANS: Field title in the license admin panel.
 msgid "The title of the license."
 msgstr "Il titul de licence."
 
-#: actions/licenseadminpanel.php:285
+#. TRANS: Field label in the license admin panel.
 msgid "License URL"
 msgstr "URL de licence"
 
-#: actions/licenseadminpanel.php:286
+#. TRANS: Field title in the license admin panel.
 msgid "URL for more information about the license."
 msgstr ""
 
-#: actions/licenseadminpanel.php:293
+#. TRANS: Field label in the license admin panel.
 msgid "License Image URL"
 msgstr ""
 
-#: actions/licenseadminpanel.php:294
+#. TRANS: Field title in the license admin panel.
 msgid "URL for an image to display with the license."
 msgstr ""
 
-#. TRANS: Submit button title.
-#: actions/licenseadminpanel.php:311 actions/sessionsadminpanel.php:199
-#: actions/siteadminpanel.php:292 actions/snapshotadminpanel.php:245
-#: actions/tagother.php:133 lib/applicationeditform.php:357
-msgid "Save"
-msgstr "Salve"
-
-#: actions/licenseadminpanel.php:311
-msgid "Save license settings"
-msgstr ""
+#. TRANS: Button title in the license admin panel.
+#, fuzzy
+msgid "Save license settings."
+msgstr "Salve lis impuestazions dal utent"
 
+#. TRANS: Client error displayed when trying to log in while already logged in.
 #. TRANS: Client error displayed trying to use "one time password login" when already logged in.
-#: actions/login.php:97 actions/otp.php:62 actions/register.php:130
 msgid "Already logged in."
 msgstr "Tu sês za jentrât."
 
-#: actions/login.php:125
+#. TRANS: Form validation error displayed when trying to log in with incorrect credentials.
 msgid "Incorrect username or password."
 msgstr "Il non utent o la password no son juscj."
 
+#. TRANS: Server error displayed when during login a server error occurs.
 #. TRANS: Server error displayed when a user object could not be created trying to login using "one time password login".
-#: actions/login.php:131 actions/otp.php:127
 msgid "Error setting user. You are probably not authorized."
 msgstr ""
 
-#: actions/login.php:185 actions/login.php:236 lib/action.php:598
+#. TRANS: Page title for login page.
 msgid "Login"
 msgstr "Jentre"
 
-#: actions/login.php:222
+#. TRANS: Form legend on login page.
 msgid "Login to site"
 msgstr "Jentre tal sît"
 
-#: actions/login.php:231 actions/register.php:469
+#. TRANS: Checkbox label label on login page.
 msgid "Remember me"
 msgstr "Visiti di me"
 
-#: actions/login.php:232 actions/register.php:471
+#. TRANS: Checkbox title on login page.
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 "Jentre in automatic tal futûr; no stâ doprâlu par ordenadôrs condividûts!"
 
-#: actions/login.php:241
+#. TRANS: Button text for log in on login page.
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Login"
+msgstr "Jentre"
+
+#. TRANS: Link text for link to "reset password" on login page.
 msgid "Lost or forgotten password?"
 msgstr "Password pierdude o dismenteade?"
 
-#: actions/login.php:259
+#. TRANS: Form instructions on login page before being able to change user settings.
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -3604,11 +2920,12 @@ msgstr ""
 "Par motîfs di sigurece, torne par plasê a inserî non utent e password prime "
 "di cambiâ lis tôs impuestazions."
 
-#: actions/login.php:263
+#. TRANS: Form instructions on login page.
 msgid "Login with your username and password."
 msgstr "Jentre cul to non utent e password"
 
-#: actions/login.php:266
+#. TRANS: Form instructions on login page. This message contains Markdown links in the form [Link text](Link).
+#. TRANS: %%action.register%% is a link to the registration page.
 #, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -3616,126 +2933,121 @@ msgstr ""
 "No tu âs ancjemò un non utent? [Regjistre](%%action.register%%) une gnove "
 "identitât."
 
-#: actions/makeadmin.php:92
+#. TRANS: Client error displayed when trying to make another user admin on the Make Admin page while not an admin.
 msgid "Only an admin can make another user an admin."
 msgstr ""
 
-#: actions/makeadmin.php:96
+#. TRANS: Client error displayed when trying to make another user admin on the Make Admin page who already is admin.
+#. TRANS: %1$s is the user that is already admin, %2$s is the group user is already admin for.
 #, php-format
 msgid "%1$s is already an admin for group \"%2$s\"."
 msgstr ""
 
-#: actions/makeadmin.php:133
+#. TRANS: Server error displayed when trying to make another user admin on the Make Admin page fails
+#. TRANS: because the group membership record could not be gotten.
+#. TRANS: %1$s is the to be admin user, %2$s is the group user should be admin for.
 #, php-format
 msgid "Can't get membership record for %1$s in group %2$s."
 msgstr ""
 
-#: actions/makeadmin.php:146
+#. TRANS: Server error displayed when trying to make another user admin on the Make Admin page fails
+#. TRANS: because the group adminship record coud not be saved properly.
+#. TRANS: %1$s is the to be admin user, %2$s is the group user is already admin for.
 #, php-format
 msgid "Can't make %1$s an admin for group %2$s."
 msgstr ""
 
-#: actions/microsummary.php:69
+#. TRANS: Client error displayed trying to make a micro summary without providing a status.
 msgid "No current status."
 msgstr ""
 
 #. TRANS: This is the title of the form for adding a new application.
-#: actions/newapplication.php:52
 msgid "New application"
 msgstr ""
 
 #. TRANS: Client error displayed trying to add a new application while not logged in.
-#: actions/newapplication.php:64
 msgid "You must be logged in to register an application."
 msgstr ""
 
 #. TRANS: Form instructions for registering a new application.
-#: actions/newapplication.php:147
 msgid "Use this form to register a new application."
 msgstr ""
 
 #. TRANS: Validation error shown when not providing a source URL in the "New application" form.
-#: actions/newapplication.php:189
 msgid "Source URL is required."
 msgstr ""
 
 #. TRANS: Server error displayed when an application could not be registered in the database through the "New application" form.
-#: actions/newapplication.php:279 actions/newapplication.php:289
 msgid "Could not create application."
 msgstr ""
 
 #. TRANS: Title for form to create a group.
-#: actions/newgroup.php:53
 msgid "New group"
 msgstr "Gnûf grup"
 
 #. TRANS: Client exception thrown when a user tries to create a group while banned.
-#: actions/newgroup.php:73 classes/User_group.php:485
 msgid "You are not allowed to create groups on this site."
 msgstr ""
 
 #. TRANS: Form instructions for group create form.
-#: actions/newgroup.php:117
 msgid "Use this form to create a new group."
 msgstr ""
 
-#. TRANS: Group create form validation error.
-#: actions/newgroup.php:200
-msgid "Alias cannot be the same as nickname."
-msgstr ""
-
-#: actions/newmessage.php:71 actions/newmessage.php:234
+#. TRANS: Page title for new direct message page.
+#. TRANS: Page title on page for sending a direct message.
 msgid "New message"
 msgstr "Gnûf messaç"
 
-#. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
-#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:513
-msgid "You can't send a message to this user."
-msgstr ""
+#. TRANS: Client error displayed trying to send a direct message to a user while sender and
+#. TRANS: receiver are not subscribed to each other.
+#, fuzzy
+msgid "You cannot send a message to this user."
+msgstr "Mande un messaç diret a chest utent"
 
+#. TRANS: Form validator error displayed trying to send a direct message without content.
+#. TRANS: Client error displayed trying to send a notice without content.
 #. TRANS: Command exception text shown when trying to send a direct message to another user without content.
 #. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
-#: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:490
-#: lib/command.php:593
 msgid "No content!"
 msgstr ""
 
-#: actions/newmessage.php:161
+#. TRANS: Form validation error displayed trying to send a direct message without specifying a recipient.
 msgid "No recipient specified."
 msgstr ""
 
+#. TRANS: Client error displayed trying to send a direct message to self.
 #. TRANS: Error text shown when trying to send a direct message to self.
-#: actions/newmessage.php:167 lib/command.php:517
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
 
-#: actions/newmessage.php:184
+#. TRANS: Page title after sending a direct message.
 msgid "Message sent"
 msgstr "Messaç mandât"
 
+#. TRANS: Confirmation text after sending a direct message.
+#. TRANS: %s is the direct message recipient.
 #. TRANS: Message given have sent a direct message to another user.
 #. TRANS: %s is the name of the other user.
-#: actions/newmessage.php:188 lib/command.php:525
 #, php-format
 msgid "Direct message to %s sent."
 msgstr "Il messaç diret par %s al stât mandât."
 
-#: actions/newmessage.php:213 actions/newnotice.php:264
+#. TRANS: Page title after an AJAX error occurred on the "send direct message" page.
+#. TRANS: Page title after an AJAX error occurs on the send notice page.
 msgid "Ajax Error"
 msgstr ""
 
-#: actions/newnotice.php:69
+#. TRANS: Page title for sending a new notice.
 msgid "New notice"
 msgstr "Gnûf avîs"
 
-#: actions/newnotice.php:230
+#. TRANS: Page title after sending a notice.
 msgid "Notice posted"
 msgstr "L'avîs al è stât publicât"
 
 #. TRANS: Instructions for Notice search page.
 #. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/noticesearch.php:69
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -3745,20 +3057,17 @@ msgstr ""
 "tiermin al à di sei lunc almancul trê caratars."
 
 #. TRANS: Title of the page where users can search for notices.
-#: actions/noticesearch.php:80
 msgid "Text search"
 msgstr "Ricercje testuâl"
 
 #. TRANS: Test in RSS notice search.
 #. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearch.php:95
 #, php-format
 msgid "Search results for \"%1$s\" on %2$s"
 msgstr "Risultâts de ricercje di \"%1$s\" su %2$s"
 
 #. TRANS: Text for logged in users making a query for notices without results.
 #. TRANS: This message contains a Markdown link.
-#: actions/noticesearch.php:128
 #, php-format
 msgid ""
 "Be the first to [post on this topic](%%%%action.newnotice%%%%?"
@@ -3767,7 +3076,6 @@ msgstr ""
 
 #. TRANS: Text for not logged in users making a query for notices without results.
 #. TRANS: This message contains Markdown links.
-#: actions/noticesearch.php:133
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and be the first to "
@@ -3775,78 +3083,67 @@ msgid ""
 msgstr ""
 
 #. TRANS: RSS notice search feed title. %s is the query.
-#: actions/noticesearchrss.php:95
 #, php-format
 msgid "Updates with \"%s\""
 msgstr "Inzornaments cun \"%s\""
 
 #. TRANS: RSS notice search feed description.
 #. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearchrss.php:99
 #, fuzzy, php-format
 msgid "Updates matching search term \"%1$s\" on %2$s."
 msgstr "Inzornaments etichetâts cun %1$s su %2$s!"
 
-#: actions/nudge.php:85
+#. TRANS: Client error displayed trying to nudge a user that cannot be nudged.
 msgid ""
 "This user doesn't allow nudges or hasn't confirmed or set their email "
 "address yet."
 msgstr ""
 
-#: actions/nudge.php:94
+#. TRANS: Page title after sending a nudge.
 msgid "Nudge sent"
 msgstr ""
 
-#: actions/nudge.php:97
+#. TRANS: Confirmation text after sending a nudge.
 msgid "Nudge sent!"
 msgstr ""
 
 #. TRANS: Message displayed to an anonymous user trying to view OAuth application list.
-#: actions/oauthappssettings.php:57
 msgid "You must be logged in to list your applications."
 msgstr ""
 
 #. TRANS: Page title for OAuth applications
-#: actions/oauthappssettings.php:73
 msgid "OAuth applications"
 msgstr ""
 
 #. TRANS: Page instructions for OAuth applications
-#: actions/oauthappssettings.php:85
 msgid "Applications you have registered"
 msgstr ""
 
 #. TRANS: Empty list message on page with OAuth applications.
-#: actions/oauthappssettings.php:138
 #, php-format
 msgid "You have not registered any applications yet."
 msgstr ""
 
 #. TRANS: Title for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:69
 msgid "Connected applications"
 msgstr ""
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:80
 msgid "The following connections exist for your account."
 msgstr ""
 
 #. TRANS: Client error when trying to revoke access for an application while not being a user of it.
-#: actions/oauthconnectionssettings.php:165
 msgid "You are not a user of that application."
 msgstr ""
 
 #. TRANS: Client error when revoking access has failed for some reason.
 #. TRANS: %s is the application ID revoking access failed for.
-#: actions/oauthconnectionssettings.php:180
 #, php-format
 msgid "Unable to revoke access for application: %s."
 msgstr ""
 
 #. TRANS: Success message after revoking access for an application.
 #. TRANS: %1$s is the application name, %2$s is the first part of the user token.
-#: actions/oauthconnectionssettings.php:199
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -3854,454 +3151,371 @@ msgid ""
 msgstr ""
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:210
 msgid "You have not authorized any applications to use your account."
 msgstr ""
 
 #. TRANS: Note for developers in the OAuth connection settings form.
 #. TRANS: This message contains a Markdown link. Do not separate "](".
 #. TRANS: %s is the URL to the OAuth settings.
-#: actions/oauthconnectionssettings.php:230
 #, php-format
 msgid ""
 "Are you a developer? [Register an OAuth client application](%s) to use with "
 "this instance of StatusNet."
 msgstr ""
 
-#: actions/oembed.php:64
+#. TRANS: Server error displayed in oEmbed action when path not found.
+#. TRANS: %s is a path.
 #, php-format
 msgid "\"%s\" not found."
 msgstr ""
 
-#: actions/oembed.php:76
+#. TRANS: Server error displayed in oEmbed action when notice not found.
+#. TRANS: %s is a notice.
 #, php-format
 msgid "Notice %s not found."
 msgstr ""
 
-#: actions/oembed.php:80 actions/shownotice.php:100
+#. TRANS: Server error displayed in oEmbed action when notice has not profile.
 msgid "Notice has no profile."
 msgstr ""
 
-#: actions/oembed.php:83 actions/shownotice.php:172
+#. TRANS: oEmbed title. %1$s is the author name, %2$s is the creation date.
 #, php-format
 msgid "%1$s's status on %2$s"
 msgstr "Stât di %1$s su %2$s"
 
-#: actions/oembed.php:95
+#. TRANS: Server error displayed in oEmbed action when attachment not found.
+#. TRANS: %d is an attachment ID.
 #, php-format
 msgid "Attachment %s not found."
 msgstr ""
 
-#: actions/oembed.php:136
+#. TRANS: Server error displayed in oEmbed request when a path is not supported.
+#. TRANS: %s is a path.
 #, php-format
 msgid "\"%s\" not supported for oembed requests."
 msgstr ""
 
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
-#: actions/oembed.php:168
 #, php-format
 msgid "Content type %s not supported."
 msgstr ""
 
 #. TRANS: Error message displaying attachments. %s is the site's base URL.
-#: actions/oembed.php:172
 #, php-format
 msgid "Only %s URLs over plain HTTP please."
 msgstr ""
 
+#. TRANS: Server error displayed in oEmbed action when request specifies an unsupported data format.
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1207
-#: lib/apiaction.php:1234 lib/apiaction.php:1369
 msgid "Not a supported data format."
 msgstr ""
 
 #. TRANS: ShortName in the OpenSearch interface when trying to find users.
-#: actions/opensearch.php:64
 msgid "People Search"
 msgstr "Cîr personis"
 
-#: actions/opensearch.php:68
+#. TRANS: ShortName in the OpenSearch interface when trying to find notices.
 msgid "Notice Search"
 msgstr ""
 
 #. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
-#: actions/otp.php:70
 msgid "No user ID specified."
 msgstr ""
 
 #. TRANS: Client error displayed trying to use "one time password login" without specifying a login token.
-#: actions/otp.php:86
 msgid "No login token specified."
 msgstr ""
 
 #. TRANS: Client error displayed trying to use "one time password login" without requesting a login token.
-#: actions/otp.php:94
 msgid "No login token requested."
 msgstr ""
 
 #. TRANS: Client error displayed trying to use "one time password login" while specifying an invalid login token.
-#: actions/otp.php:100
 msgid "Invalid login token specified."
 msgstr ""
 
 #. TRANS: Client error displayed trying to use "one time password login" while specifying an expired login token.
-#: actions/otp.php:110
 msgid "Login token expired."
 msgstr ""
 
 #. TRANS: Title for outbox for any but the fist page.
 #. TRANS: %1$s is the user nickname, %2$d is the page number.
-#: actions/outbox.php:57
 #, php-format
 msgid "Outbox for %1$s - page %2$d"
 msgstr "Pueste in jessude par %1$s - pagjine %2$d"
 
 #. TRANS: Title for first page of outbox.
-#: actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
 msgstr "Pueste in jessude par %s"
 
 #. TRANS: Instructions for outbox.
-#: actions/outbox.php:103
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr ""
 "Cheste e je la tô pueste in jessude, dulà che tu cjatis i messaçs privâts "
 "che tu âs mandât."
 
-#: actions/passwordsettings.php:58
 msgid "Change password"
 msgstr "Cambie la password"
 
-#: actions/passwordsettings.php:69
 msgid "Change your password."
 msgstr "Cambie la tô password"
 
 #. TRANS: Fieldset legend for password reset form.
-#: actions/passwordsettings.php:96 actions/recoverpassword.php:251
 msgid "Password change"
 msgstr "Cambiament di password"
 
-#: actions/passwordsettings.php:104
 msgid "Old password"
 msgstr "Vecje password"
 
 #. TRANS: Field label for password reset form.
-#: actions/passwordsettings.php:108 actions/recoverpassword.php:256
 msgid "New password"
 msgstr "Gnove password"
 
-#: actions/passwordsettings.php:109 actions/register.php:416
 msgid "6 or more characters."
 msgstr "6 o plui caratars."
 
 #. TRANS: Ttile for field label for password reset form where the password has to be typed again.
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:264
-#: actions/register.php:420
 msgid "Same as password above."
 msgstr "Compagn che la password parsore"
 
-#: actions/passwordsettings.php:117
 msgid "Change"
 msgstr "Cambie"
 
-#: actions/passwordsettings.php:153 actions/register.php:223
 msgid "Password must be 6 or more characters."
 msgstr "La password e à di sei di sîs o plui caratars."
 
-#: actions/passwordsettings.php:156 actions/register.php:226
 msgid "Passwords don't match."
 msgstr "Lis passwords no corispuindin."
 
-#: actions/passwordsettings.php:164
 msgid "Incorrect old password"
 msgstr "La vecje password e je sbaliade"
 
-#: actions/passwordsettings.php:180
 msgid "Error saving user; invalid."
 msgstr ""
 
 #. TRANS: Reset password form validation error message.
-#: actions/passwordsettings.php:185 actions/recoverpassword.php:418
 msgid "Cannot save new password."
 msgstr ""
 
-#: actions/passwordsettings.php:191
 msgid "Password saved."
 msgstr "Password salvade"
 
 #. TRANS: Title for Paths admin panel.
 #. TRANS: Menu item for site administration
-#: actions/pathsadminpanel.php:58 lib/adminpanelaction.php:371
 msgid "Paths"
 msgstr ""
 
 #. TRANS: Form instructions for Path admin panel.
-#: actions/pathsadminpanel.php:69
 msgid "Path and server settings for this StatusNet site"
 msgstr ""
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the directory that could not be read from.
-#: actions/pathsadminpanel.php:155
 #, php-format
 msgid "Theme directory not readable: %s."
 msgstr ""
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the avatar directory that could not be written to.
-#: actions/pathsadminpanel.php:163
 #, php-format
 msgid "Avatar directory not writable: %s."
 msgstr ""
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the background directory that could not be written to.
-#: actions/pathsadminpanel.php:171
 #, php-format
 msgid "Background directory not writable: %s."
 msgstr ""
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the locales directory that could not be read from.
-#: actions/pathsadminpanel.php:181
 #, php-format
 msgid "Locales directory not readable: %s."
 msgstr ""
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the SSL server URL that is too long.
-#: actions/pathsadminpanel.php:189
 msgid "Invalid SSL server. The maximum length is 255 characters."
 msgstr ""
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:235 actions/siteadminpanel.php:58
 msgid "Site"
 msgstr "Sît"
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:241 actions/pathsadminpanel.php:279
-#: actions/pathsadminpanel.php:370 actions/pathsadminpanel.php:425
 msgid "Server"
 msgstr "Servidôr"
 
-#: actions/pathsadminpanel.php:242
 msgid "Site's server hostname."
 msgstr ""
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:248 actions/pathsadminpanel.php:288
-#: actions/pathsadminpanel.php:379 actions/pathsadminpanel.php:434
 msgid "Path"
 msgstr ""
 
-#: actions/pathsadminpanel.php:249
 msgid "Site path."
 msgstr ""
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:255
 msgid "Locale directory"
 msgstr ""
 
-#: actions/pathsadminpanel.php:256
 msgid "Directory path to locales."
 msgstr ""
 
 #. TRANS: Checkbox label in Paths admin panel.
-#: actions/pathsadminpanel.php:263
 msgid "Fancy URLs"
 msgstr ""
 
-#: actions/pathsadminpanel.php:265
 msgid "Use fancy (more readable and memorable) URLs?"
 msgstr ""
 
-#: actions/pathsadminpanel.php:272
 msgid "Theme"
 msgstr "Teme"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:281
 msgid "Server for themes."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:290
 msgid "Web path to themes."
 msgstr ""
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:297 actions/pathsadminpanel.php:388
-#: actions/pathsadminpanel.php:443 actions/pathsadminpanel.php:495
 msgid "SSL server"
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:299
 msgid "SSL server for themes (default: SSL server)."
 msgstr ""
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:306 actions/pathsadminpanel.php:397
-#: actions/pathsadminpanel.php:452
 msgid "SSL path"
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:308
 msgid "SSL path to themes (default: /theme/)."
 msgstr ""
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:315 actions/pathsadminpanel.php:406
-#: actions/pathsadminpanel.php:461
 msgid "Directory"
 msgstr "Cartele"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:317
 msgid "Directory where themes are located."
 msgstr ""
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:326
 msgid "Avatars"
 msgstr "Avatars"
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:333
 msgid "Avatar server"
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:335
 msgid "Server for avatars."
 msgstr ""
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:342
 msgid "Avatar path"
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:344
 msgid "Web path to avatars."
 msgstr ""
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:351
 msgid "Avatar directory"
 msgstr "Cartele pai avatars"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:353
 msgid "Directory where avatars are located."
 msgstr ""
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:364
 msgid "Backgrounds"
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:372
 msgid "Server for backgrounds."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:381
 msgid "Web path to backgrounds."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:390
 msgid "Server for backgrounds on SSL pages."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:399
 msgid "Web path to backgrounds on SSL pages."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:408
 msgid "Directory where backgrounds are located."
 msgstr ""
 
 #. TRANS: Fieldset legens in Paths admin panel.
-#: actions/pathsadminpanel.php:419
 msgid "Attachments"
 msgstr "Alegâts"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:427
 msgid "Server for attachments."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:436
 msgid "Web path to attachments."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:445
 msgid "Server for attachments on SSL pages."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:454
 msgid "Web path to attachments on SSL pages."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:463
 msgid "Directory where attachments are located."
 msgstr ""
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:472
 msgid "SSL"
 msgstr "SSL"
 
 #. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
-#: actions/pathsadminpanel.php:477 actions/snapshotadminpanel.php:202
 msgid "Never"
 msgstr "Mai"
 
 #. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
-#: actions/pathsadminpanel.php:479
 msgid "Sometimes"
 msgstr "Cualchi volte"
 
 #. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
-#: actions/pathsadminpanel.php:481
 msgid "Always"
 msgstr "Simpri"
 
-#: actions/pathsadminpanel.php:485
 msgid "Use SSL"
 msgstr "Dopre SSL"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:487
 msgid "When to use SSL."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:497
 msgid "Server to direct SSL requests to."
 msgstr ""
 
 #. TRANS: Button title text to store form data in the Paths admin panel.
-#: actions/pathsadminpanel.php:514
 msgid "Save paths"
 msgstr ""
 
 #. TRANS: Instructions for the "People search" page.
 #. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/peoplesearch.php:54
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
@@ -4311,56 +3525,45 @@ msgstr ""
 "spazis; ogni tiermin al à di sei lunc almancul trê caratars."
 
 #. TRANS: Title of a page where users can search for other users.
-#: actions/peoplesearch.php:61
 msgid "People search"
 msgstr "Cîr personis"
 
-#: actions/peopletag.php:68
 #, php-format
 msgid "Not a valid people tag: %s."
 msgstr ""
 
-#: actions/peopletag.php:142
 #, php-format
 msgid "Users self-tagged with %1$s - page %2$d"
 msgstr ""
 
 #. TRANS: Page title for AJAX form return when a disabling a plugin.
-#: actions/plugindisable.php:69
 msgctxt "plugin"
 msgid "Disabled"
 msgstr ""
 
 #. TRANS: Client error displayed trying to perform any request method other than POST.
 #. TRANS: Do not translate POST.
-#: actions/pluginenable.php:78 actions/subscribe.php:77
 msgid "This action only accepts POST requests."
 msgstr ""
 
-#: actions/pluginenable.php:102
 msgid "You cannot administer plugins."
 msgstr ""
 
-#: actions/pluginenable.php:109
 #, fuzzy
 msgid "No such plugin."
 msgstr "La pagjine no esist."
 
 #. TRANS: Page title for AJAX form return when enabling a plugin.
-#: actions/pluginenable.php:159
 msgctxt "plugin"
 msgid "Enabled"
 msgstr ""
 
 #. TRANS: Tab and title for plugins admin panel.
 #. TRANS: Menu item for site administration
-#: actions/pluginsadminpanel.php:56 actions/version.php:191
-#: lib/adminpanelaction.php:411
 msgid "Plugins"
 msgstr ""
 
 #. TRANS: Instructions at top of plugin admin page.
-#: actions/pluginsadminpanel.php:68
 msgid ""
 "Additional plugins can be enabled and configured manually. See the <a href="
 "\"http://status.net/wiki/Plugins\">online plugin documentation</a> for more "
@@ -4368,32 +3571,26 @@ msgid ""
 msgstr ""
 
 #. TRANS: Admin form section header
-#: actions/pluginsadminpanel.php:84
 #, fuzzy
 msgid "Default plugins"
 msgstr "Lenghe predeterminade"
 
-#: actions/pluginsadminpanel.php:106
 msgid ""
 "All default plugins have been disabled from the site's configuration file."
 msgstr ""
 
-#: actions/postnotice.php:95
 msgid "Invalid notice content."
 msgstr ""
 
-#: actions/postnotice.php:101
 #, php-format
 msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’."
 msgstr ""
 
 #. TRANS: Page title for profile settings.
-#: actions/profilesettings.php:60
 msgid "Profile settings"
 msgstr "Impuestazions dal profîl"
 
 #. TRANS: Usage instructions for profile settings.
-#: actions/profilesettings.php:71
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
@@ -4401,37 +3598,29 @@ msgstr ""
 "cognossiti miôr."
 
 #. TRANS: Profile settings form legend.
-#: actions/profilesettings.php:99
 msgid "Profile information"
 msgstr "Informazions sul profîl"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:110 actions/register.php:412
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr ""
 
 #. TRANS: Field label in form for profile settings.
-#: actions/profilesettings.php:114 actions/register.php:434
-#: lib/groupeditform.php:150
 msgid "Full name"
 msgstr "Non complet"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:119 actions/register.php:439
-#: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "Pagjine web"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:122 actions/register.php:441
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr "URL de tô pagjine web, blog o profîl suntun altri sît."
 
 #. TRANS: Tooltip for field label in form for profile settings. Plural
 #. TRANS: is decided by the number of characters available for the
 #. TRANS: biography (%d).
-#: actions/profilesettings.php:130 actions/register.php:450
 #, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4439,68 +3628,53 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:136 actions/register.php:455
 msgid "Describe yourself and your interests"
 msgstr "Descrîf te e i tiei interès"
 
 #. TRANS: Text area label in form for profile settings where users can provide.
 #. TRANS: their biography.
-#: actions/profilesettings.php:140 actions/register.php:457
 msgid "Bio"
 msgstr "Biografie"
 
 #. TRANS: Field label in form for profile settings.
-#: actions/profilesettings.php:146 actions/register.php:462
-#: lib/groupeditform.php:173
 msgid "Location"
 msgstr "Lûc"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:149
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Dulà che tu sês, par esempli \"Citât, Provincie, Stât\""
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:154
 msgid "Share my current location when posting notices"
 msgstr "Condivît il lûc dulà che mi cjati cuant che o publichi avîs"
 
 #. TRANS: Field label in form for profile settings.
-#: actions/profilesettings.php:162 actions/tagother.php:128
-#: actions/tagother.php:188 lib/subscriptionlist.php:104
-#: lib/subscriptionlist.php:106
 msgid "Tags"
 msgstr "Etichetis"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:165
 msgid ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- "
 "separated."
 msgstr ""
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:170
 msgid "Language"
 msgstr "Lenghe"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:172
 msgid "Preferred language."
 msgstr "Lenghe preferide"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:182
 msgid "Timezone"
 msgstr "Fûs orari"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:184
 msgid "What timezone are you normally in?"
 msgstr "In ce fûs orari ti cjatistu par solit?"
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:190
 msgid ""
 "Automatically subscribe to whoever subscribes to me (best for non-humans)."
 msgstr ""
@@ -4508,7 +3682,6 @@ msgstr ""
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Plural form is used based on the maximum number of allowed
 #. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:259 actions/register.php:214
 #, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4516,98 +3689,79 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:270 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr "No tu âs sielt il fûs orari."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:278
 msgid "Language is too long (maximum 50 characters)."
 msgstr "La lenghe e je masse lungje (max 50 caratars)."
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:292
 #, php-format
 msgid "Invalid tag: \"%s\"."
 msgstr ""
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:348
 msgid "Could not update user for autosubscribe."
 msgstr ""
 
 #. TRANS: Server error thrown when user profile location preference settings could not be updated.
-#: actions/profilesettings.php:406
 msgid "Could not save location prefs."
 msgstr ""
 
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:428 actions/tagother.php:179
 msgid "Could not save tags."
 msgstr ""
 
 #. TRANS: Confirmation shown when user profile settings are saved.
 #. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:437 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "Impuestazions salvadis."
 
 #. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
 #. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:484 actions/restoreaccount.php:60
 msgid "Restore account"
 msgstr ""
 
-#: actions/public.php:83
 #, php-format
 msgid "Beyond the page limit (%s)."
 msgstr ""
 
-#: actions/public.php:92
 msgid "Could not retrieve public stream."
 msgstr ""
 
-#: actions/public.php:130
 #, php-format
 msgid "Public timeline, page %d"
 msgstr "Ativitât publiche, pagjine %d"
 
-#: actions/public.php:132 lib/publicgroupnav.php:79
 msgid "Public timeline"
 msgstr "Ativitât publiche"
 
-#: actions/public.php:160
 msgid "Public Stream Feed (RSS 1.0)"
 msgstr "Canâl de ativitât publiche (RSS 1.0)"
 
-#: actions/public.php:164
 msgid "Public Stream Feed (RSS 2.0)"
 msgstr "Canâl de ativitât publiche (RSS 2.0)"
 
-#: actions/public.php:168
 msgid "Public Stream Feed (Atom)"
 msgstr "Canâl de ativitât publiche (Atom)"
 
-#: actions/public.php:188
 #, php-format
 msgid ""
 "This is the public timeline for %%site.name%% but no one has posted anything "
 "yet."
 msgstr ""
 
-#: actions/public.php:191
 msgid "Be the first to post!"
 msgstr ""
 
-#: actions/public.php:195
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post!"
 msgstr ""
 
-#: actions/public.php:242
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -4620,7 +3774,6 @@ msgstr ""
 "net/). [Unissiti cumò](%%action.register%%) par condividi chel che tu fasis "
 "cun amîs, famee e companie! ([Altris informazions](%%doc.help%%))"
 
-#: actions/public.php:247
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -4632,19 +3785,16 @@ msgstr ""
 "net/)."
 
 #. TRANS: Public RSS feed description. %s is the StatusNet site name.
-#: actions/publicrss.php:106
 #, fuzzy, php-format
 msgid "%s updates from everyone."
 msgstr "Inzornaments di %s di ducj cuancj!"
 
 #. TRANS: Title for public tag cloud.
-#: actions/publictagcloud.php:57
 msgid "Public tag cloud"
 msgstr "Nûl public des etichetis"
 
 #. TRANS: Instructions (more used like an explanation/header).
 #. TRANS: %s is the StatusNet sitename.
-#: actions/publictagcloud.php:65
 #, php-format
 msgid "These are most popular recent tags on %s"
 msgstr "Chestis a son lis etichetis recentis plui popolârs su %s"
@@ -4652,14 +3802,12 @@ msgstr "Chestis a son lis etichetis recentis plui popolârs su %s"
 #. TRANS: This message contains a Markdown URL. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.
-#: actions/publictagcloud.php:74
 #, php-format
 msgid "No one has posted a notice with a [hashtag](%%doc.tags%%) yet."
 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.
-#: actions/publictagcloud.php:79
 msgid "Be the first to post one!"
 msgstr ""
 
@@ -4668,7 +3816,6 @@ msgstr ""
 #. TRANS: This message contains a Markdown URL. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.
-#: actions/publictagcloud.php:87
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post "
@@ -4676,261 +3823,208 @@ msgid ""
 msgstr ""
 
 #. TRANS: Client error displayed trying to recover password while already logged in.
-#: actions/recoverpassword.php:37
 msgid "You are already logged in!"
 msgstr "Tu sês za jentrât!"
 
 #. TRANS: Client error displayed when password recovery code is not correct.
-#: actions/recoverpassword.php:64
 msgid "No such recovery code."
 msgstr ""
 
 #. TRANS: Client error displayed when no proper password recovery code was submitted.
-#: actions/recoverpassword.php:69
 msgid "Not a recovery code."
 msgstr ""
 
 #. TRANS: Server error displayed trying to recover password without providing a user.
-#: actions/recoverpassword.php:77
 msgid "Recovery code for unknown user."
 msgstr ""
 
 #. TRANS: Server error displayed removing a password recovery code from the database.
-#: actions/recoverpassword.php:91
 msgid "Error with confirmation code."
 msgstr ""
 
 #. TRANS: Client error displayed trying to recover password with too old a recovery code.
-#: actions/recoverpassword.php:103
 msgid "This confirmation code is too old. Please start again."
 msgstr ""
 
 #. TRANS: Server error displayed when updating a user's e-mail address in the database fails while recovering a password.
-#: actions/recoverpassword.php:118
 msgid "Could not update user with confirmed email address."
 msgstr ""
 
 #. TRANS: Page notice for password recovery page.
-#: actions/recoverpassword.php:160
 msgid ""
 "If you have forgotten or lost your password, you can get a new one sent to "
 "the email address you have stored in your account."
 msgstr ""
 
-#: actions/recoverpassword.php:167
 msgid "You have been identified. Enter a new password below."
 msgstr ""
 
 #. TRANS: Fieldset legend for password recovery page.
-#: actions/recoverpassword.php:198
 msgid "Password recovery"
 msgstr ""
 
 #. TRANS: Field label on password recovery page.
-#: actions/recoverpassword.php:202
 msgid "Nickname or email address"
 msgstr "Sorenon o direzion di pueste"
 
 #. TRANS: Title for field label on password recovery page.
-#: actions/recoverpassword.php:205
 msgid "Your nickname on this server, or your registered email address."
 msgstr ""
 
 #. TRANS: Field label on password recovery page.
-#: actions/recoverpassword.php:212
 msgid "Recover"
 msgstr ""
 
 #. TRANS: Button text on password recovery page.
-#: actions/recoverpassword.php:214
 msgctxt "BUTTON"
 msgid "Recover"
 msgstr ""
 
 #. TRANS: Title for password recovery page in password reset mode.
-#: actions/recoverpassword.php:223
 msgid "Reset password"
 msgstr ""
 
 #. TRANS: Title for password recovery page in password recover mode.
-#: actions/recoverpassword.php:225
 msgid "Recover password"
 msgstr ""
 
 #. TRANS: Title for password recovery page in email sent mode.
 #. TRANS: Subject for password recovery e-mail.
-#: actions/recoverpassword.php:227 actions/recoverpassword.php:366
 msgid "Password recovery requested"
 msgstr ""
 
 #. TRANS: Title for password recovery page in password saved mode.
-#: actions/recoverpassword.php:229
 msgid "Password saved"
 msgstr "Password salvade"
 
 #. TRANS: Title for password recovery page when an unknown action has been specified.
-#: actions/recoverpassword.php:232
 msgid "Unknown action"
 msgstr ""
 
 #. TRANS: Title for field label for password reset form.
-#: actions/recoverpassword.php:258
 msgid "6 or more characters, and do not forget it!"
 msgstr ""
 
 #. TRANS: Button text for password reset form.
 #. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: actions/recoverpassword.php:268 lib/designform.php:145
 msgctxt "BUTTON"
 msgid "Reset"
 msgstr ""
 
 #. TRANS: Form instructions for password recovery form.
-#: actions/recoverpassword.php:278
 msgid "Enter a nickname or email address."
 msgstr ""
 
 #. TRANS: Information on password recovery form if no known username or e-mail address was specified.
-#: actions/recoverpassword.php:309
 msgid "No user with that email address or username."
 msgstr ""
 
 #. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
-#: actions/recoverpassword.php:327
 msgid "No registered email address for that user."
 msgstr ""
 
 #. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
-#: actions/recoverpassword.php:342
 msgid "Error saving address confirmation."
 msgstr ""
 
 #. TRANS: User notification after an e-mail with instructions was sent from the password recovery form.
-#: actions/recoverpassword.php:370
 msgid ""
 "Instructions for recovering your password have been sent to the email "
 "address registered to your account."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to reset as password without providing a user.
-#: actions/recoverpassword.php:391
 msgid "Unexpected password reset."
 msgstr ""
 
 #. TRANS: Reset password form validation error message.
-#: actions/recoverpassword.php:400
 msgid "Password must be 6 characters or more."
 msgstr "La password e à di jessi di sîs o plui caratars."
 
 #. TRANS: Reset password form validation error message.
-#: actions/recoverpassword.php:405
 msgid "Password and confirmation do not match."
 msgstr "La password e la conferme no corispuindin."
 
 #. TRANS: Server error displayed when something does wrong with the user object during password reset.
-#: actions/recoverpassword.php:426 actions/register.php:241
 msgid "Error setting user."
 msgstr ""
 
 #. TRANS: Success message for user after password reset.
-#: actions/recoverpassword.php:434
 msgid "New password successfully saved. You are now logged in."
 msgstr "La gnove password e je stade salvade cun sucès. Cumò tu sês jentrât."
 
-#: actions/redirecturl.php:70
 msgid "No id parameter"
 msgstr ""
 
-#: actions/redirecturl.php:76
 #, fuzzy, php-format
 msgid "No such file \"%d\""
 msgstr "Il file nol esist."
 
-#: actions/register.php:80 actions/register.php:181 actions/register.php:392
 msgid "Sorry, only invited people can register."
 msgstr ""
 
-#: actions/register.php:87
 msgid "Sorry, invalid invitation code."
 msgstr ""
 
-#: actions/register.php:106
 msgid "Registration successful"
 msgstr "Regjistrât cun sucès"
 
-#: actions/register.php:108 actions/register.php:490
 msgid "Register"
 msgstr "Regjistriti"
 
-#: actions/register.php:128
 msgid "Registration not allowed."
 msgstr ""
 
-#: actions/register.php:194
 msgid "You cannot register if you don't agree to the license."
 msgstr ""
 
-#: actions/register.php:203
 msgid "Email address already exists."
 msgstr ""
 
-#: actions/register.php:236 actions/register.php:258
 msgid "Invalid username or password."
 msgstr "Il non utent o la password no son valits."
 
-#: actions/register.php:333
 msgid ""
 "With this form you can create a new account. You can then post notices and "
 "link up to friends and colleagues."
 msgstr ""
 
-#: actions/register.php:424 actions/register.php:428
-#: actions/siteadminpanel.php:238 lib/settingsnav.php:92
 msgid "Email"
 msgstr "Pueste eletroniche"
 
-#: actions/register.php:425 actions/register.php:429
 msgid "Used only for updates, announcements, and password recovery."
 msgstr ""
 
-#: actions/register.php:436
 msgid "Longer name, preferably your \"real\" name."
 msgstr ""
 
-#: actions/register.php:464
 msgid "Where you are, like \"City, State (or Region), Country\"."
 msgstr "Dulà che tu sês, par esempli \"Citât, Provincie, Stât\"."
 
-#: actions/register.php:503
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
 msgstr ""
 
-#: actions/register.php:513
 #, php-format
 msgid "My text and files are copyright by %1$s."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:517
 msgid "My text and files remain under my own copyright."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:520
 msgid "All rights reserved."
 msgstr "Ducj i dirits riservâts"
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:525
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
 "email address, IM address, and phone number."
 msgstr ""
 
-#: actions/register.php:566
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -4963,7 +4057,6 @@ msgstr ""
 "Graziis par jessiti regjistrât e o sperìn che tu gjoldarâs a doprâ chest "
 "servizi."
 
-#: actions/register.php:590
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -4971,7 +4064,6 @@ msgstr ""
 "(Tu varessis di ricevi a moments un messaç di pueste cun istruzions par "
 "confermâ la tô direzion di pueste eletroniche.)"
 
-#: actions/remotesubscribe.php:97
 #, php-format
 msgid ""
 "To subscribe, you can [login](%%action.login%%), or [register](%%action."
@@ -4979,118 +4071,91 @@ msgid ""
 "microblogging site](%%doc.openmublog%%),  enter your profile URL below."
 msgstr ""
 
-#: actions/remotesubscribe.php:111
 msgid "Remote subscribe"
 msgstr ""
 
-#: actions/remotesubscribe.php:123
 msgid "Subscribe to a remote user"
 msgstr ""
 
-#: actions/remotesubscribe.php:128
 msgid "User nickname"
 msgstr "Sorenon dal utent"
 
-#: actions/remotesubscribe.php:129
 msgid "Nickname of the user you want to follow."
 msgstr "Sorenon dal utent che tu vuelis seguî."
 
-#: actions/remotesubscribe.php:132
 msgid "Profile URL"
 msgstr "URL dal profîl"
 
-#: actions/remotesubscribe.php:133
 msgid "URL of your profile on another compatible microblogging service."
 msgstr ""
 
 #. TRANS: Link text for link that will subscribe to a remote profile.
-#: actions/remotesubscribe.php:136 lib/subscribeform.php:139
-#: lib/userprofile.php:402
 msgid "Subscribe"
 msgstr "Sotscrivimi"
 
-#: actions/remotesubscribe.php:158
 msgid "Invalid profile URL (bad format)."
 msgstr ""
 
-#: actions/remotesubscribe.php:167
 msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
 msgstr ""
 
-#: actions/remotesubscribe.php:175
 msgid "That is a local profile! Login to subscribe."
 msgstr ""
 
-#: actions/remotesubscribe.php:182
 msgid "Could not get a request token."
 msgstr ""
 
-#: actions/repeat.php:56
 msgid "Only logged-in users can repeat notices."
 msgstr ""
 
-#: actions/repeat.php:63 actions/repeat.php:70
 msgid "No notice specified."
 msgstr ""
 
-#: actions/repeat.php:75
 msgid "You cannot repeat your own notice."
 msgstr ""
 
-#: actions/repeat.php:89
 msgid "You already repeated that notice."
 msgstr ""
 
-#: actions/repeat.php:112 lib/noticelist.php:697
 msgid "Repeated"
 msgstr "Ripetût"
 
-#: actions/repeat.php:117
 msgid "Repeated!"
 msgstr "Ripetût!"
 
 #. TRANS: RSS reply feed title. %s is a user nickname.
-#: actions/replies.php:126 actions/repliesrss.php:68
-#: lib/personalgroupnav.php:105
 #, php-format
 msgid "Replies to %s"
 msgstr "Rispuestis a %s"
 
-#: actions/replies.php:128
 #, php-format
 msgid "Replies to %1$s, page %2$d"
 msgstr "Rispuestis a %1$s, pagjine %2$d"
 
-#: actions/replies.php:145
 #, php-format
 msgid "Replies feed for %s (RSS 1.0)"
 msgstr "Canâl des rispuestis di %s (RSS 1.0)"
 
-#: actions/replies.php:152
 #, php-format
 msgid "Replies feed for %s (RSS 2.0)"
 msgstr "Canâl des rispuestis di %s (RSS 2.0)"
 
-#: actions/replies.php:159
 #, php-format
 msgid "Replies feed for %s (Atom)"
 msgstr "Canâl des rispuestis di %s (Atom)"
 
-#: actions/replies.php:199
 #, php-format
 msgid ""
 "This is the timeline showing replies to %1$s but %2$s hasn't received a "
 "notice to them yet."
 msgstr ""
 
-#: actions/replies.php:204
 #, php-format
 msgid ""
 "You can engage other users in a conversation, subscribe to more people or "
 "[join groups](%%action.groups%%)."
 msgstr ""
 
-#: actions/replies.php:206
 #, php-format
 msgid ""
 "You can try to [nudge %1$s](../%2$s) or [post something to them](%%%%action."
@@ -5099,218 +4164,177 @@ msgstr ""
 
 #. TRANS: RSS reply feed description.
 #. TRANS: %1$s is a user nickname, %2$s is the StatusNet site name.
-#: actions/repliesrss.php:74
 #, fuzzy, php-format
 msgid "Replies to %1$s on %2$s."
 msgstr "Rispuestis a %1$s su %2$s!"
 
 #. TRANS: Client exception displayed when trying to restore an account while not logged in.
-#: actions/restoreaccount.php:78
 msgid "Only logged-in users can restore their account."
 msgstr ""
 
 #. TRANS: Client exception displayed when trying to restore an account without having restore rights.
-#: actions/restoreaccount.php:83
 msgid "You may not restore your account."
 msgstr ""
 
 #. TRANS: Client exception displayed trying to restore an account while something went wrong uploading a file.
 #. TRANS: Client exception. No file; probably just a non-AJAX submission.
-#: actions/restoreaccount.php:121 actions/restoreaccount.php:146
 msgid "No uploaded file."
 msgstr ""
 
 #. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
-#: actions/restoreaccount.php:129 lib/mediafile.php:194
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
 msgstr ""
 
 #. TRANS: Client exception.
-#: actions/restoreaccount.php:135 lib/mediafile.php:200
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form."
 msgstr ""
 
 #. TRANS: Client exception.
-#: actions/restoreaccount.php:141 lib/mediafile.php:206
 msgid "The uploaded file was only partially uploaded."
 msgstr ""
 
 #. TRANS: Client exception thrown when a temporary folder is not present to store a file upload.
-#: actions/restoreaccount.php:150 lib/mediafile.php:214
 msgid "Missing a temporary folder."
 msgstr ""
 
 #. TRANS: Client exception thrown when writing to disk is not possible during a file upload operation.
-#: actions/restoreaccount.php:154 lib/mediafile.php:218
 msgid "Failed to write file to disk."
 msgstr ""
 
 #. TRANS: Client exception thrown when a file upload operation has been stopped by an extension.
-#: actions/restoreaccount.php:158 lib/mediafile.php:222
 msgid "File upload stopped by extension."
 msgstr ""
 
 #. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
 #. TRANS: Exception thrown when uploading an image fails for an unknown reason.
 #. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
-#: actions/restoreaccount.php:164 lib/imagefile.php:106 lib/mediafile.php:228
 msgid "System error uploading file."
 msgstr ""
 
 #. TRANS: Client exception thrown when a feed is not an Atom feed.
-#: actions/restoreaccount.php:207
 msgid "Not an Atom feed."
 msgstr ""
 
 #. TRANS: Success message when a feed has been restored.
-#: actions/restoreaccount.php:241
 msgid ""
 "Feed has been restored. Your old posts should now appear in search and your "
 "profile page."
 msgstr ""
 
 #. TRANS: Message when a feed restore is in progress.
-#: actions/restoreaccount.php:245
 msgid "Feed will be restored. Please wait a few minutes for results."
 msgstr ""
 
 #. TRANS: Form instructions for feed restore.
-#: actions/restoreaccount.php:342
 msgid ""
 "You can upload a backed-up stream in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format."
 msgstr ""
 
 #. TRANS: Title for submit button to confirm upload of a user backup file for account restore.
-#: actions/restoreaccount.php:373
 msgid "Upload the file"
 msgstr "Cjame il file"
 
-#: actions/revokerole.php:75
 msgid "You cannot revoke user roles on this site."
 msgstr ""
 
-#: actions/revokerole.php:82
 msgid "User doesn't have this role."
 msgstr ""
 
-#: actions/rsd.php:142 actions/version.php:159
 msgid "StatusNet"
 msgstr "StatusNet"
 
-#: actions/sandbox.php:65 actions/unsandbox.php:65
 msgid "You cannot sandbox users on this site."
 msgstr ""
 
-#: actions/sandbox.php:72
 msgid "User is already sandboxed."
 msgstr ""
 
 #. TRANS: Menu item for site administration
-#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
-#: lib/adminpanelaction.php:379
 msgid "Sessions"
 msgstr "Sessions"
 
-#: actions/sessionsadminpanel.php:65
 msgid "Session settings for this StatusNet site"
 msgstr ""
 
-#: actions/sessionsadminpanel.php:175
 msgid "Handle sessions"
 msgstr ""
 
-#: actions/sessionsadminpanel.php:177
 msgid "Whether to handle sessions ourselves."
 msgstr ""
 
-#: actions/sessionsadminpanel.php:181
 msgid "Session debugging"
 msgstr ""
 
-#: actions/sessionsadminpanel.php:183
 msgid "Turn on debugging output for sessions."
 msgstr ""
 
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
+#. TRANS: Submit button title.
+msgid "Save"
+msgstr "Salve"
+
 msgid "Save site settings"
 msgstr "Salve lis impuestazions dal sît"
 
-#: actions/showapplication.php:78
 msgid "You must be logged in to view an application."
 msgstr ""
 
-#: actions/showapplication.php:151
 msgid "Application profile"
 msgstr ""
 
-#: actions/showapplication.php:179
 #, php-format
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr ""
 
-#: actions/showapplication.php:189
 msgid "Application actions"
 msgstr ""
 
-#: actions/showapplication.php:212
 msgid "Reset key & secret"
 msgstr ""
 
 #. TRANS: Title of form for deleting a user.
-#: actions/showapplication.php:228 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:64 lib/noticelist.php:678
 msgid "Delete"
 msgstr "Elimine"
 
-#: actions/showapplication.php:237
 msgid "Application info"
 msgstr ""
 
-#: actions/showapplication.php:255
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
 msgstr ""
 
-#: actions/showapplication.php:275
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr ""
 
 #. TRANS: Title for all but the first page of favourite notices of a user.
 #. TRANS: %1$s is the user for whom the favourite notices are displayed, %2$d is the page number.
-#: actions/showfavorites.php:80
 #, php-format
 msgid "%1$s's favorite notices, page %2$d"
 msgstr "Avîs preferîts di %1$s, pagjine %2$d"
 
 #. TRANS: Server error displayed when favourite notices could not be retrieved from the database.
-#: actions/showfavorites.php:134
 msgid "Could not retrieve favorite notices."
 msgstr ""
 
 #. TRANS: Feed link text. %s is a username.
-#: actions/showfavorites.php:172
 #, php-format
 msgid "Feed for favorites of %s (RSS 1.0)"
 msgstr "Canâl pai preferîts di %s (RSS 1.0)"
 
 #. TRANS: Feed link text. %s is a username.
-#: actions/showfavorites.php:180
 #, php-format
 msgid "Feed for favorites of %s (RSS 2.0)"
 msgstr "Canâl pai preferîts di %s (RSS 2.0)"
 
 #. TRANS: Feed link text. %s is a username.
-#: actions/showfavorites.php:188
 #, php-format
 msgid "Feed for favorites of %s (Atom)"
 msgstr "Canâl pai preferîts di %s (Atom)"
 
 #. TRANS: Text displayed instead of favourite notices for the current logged in user that has no favourites.
-#: actions/showfavorites.php:209
 msgid ""
 "You haven't chosen any favorite notices yet. Click the fave button on "
 "notices you like to bookmark them for later or shed a spotlight on them."
@@ -5318,7 +4342,6 @@ msgstr ""
 
 #. TRANS: Text displayed instead of favourite notices for a user that has no favourites while logged in.
 #. TRANS: %s is a username.
-#: actions/showfavorites.php:213
 #, php-format
 msgid ""
 "%s hasn't added any favorite notices yet. Post something interesting they "
@@ -5328,7 +4351,6 @@ msgstr ""
 #. TRANS: Text displayed instead of favourite notices for a user that has no favourites while not logged in.
 #. TRANS: %s is a username, %%%%action.register%%%% is a link to the user registration page.
 #. TRANS: (link text)[link] is a Mark Down link.
-#: actions/showfavorites.php:220
 #, php-format
 msgid ""
 "%s hasn't added any favorite notices yet. Why not [register an account](%%%%"
@@ -5337,64 +4359,53 @@ msgid ""
 msgstr ""
 
 #. TRANS: Page notice for show favourites page.
-#: actions/showfavorites.php:251
 msgid "This is a way to share what you like."
 msgstr ""
 
 #. TRANS: Page title for first group page. %s is a group name.
-#: actions/showgroup.php:75
 #, php-format
 msgid "%s group"
 msgstr "Grup %s"
 
 #. TRANS: Page title for any but first group page.
 #. TRANS: %1$s is a group name, $2$s is a page number.
-#: actions/showgroup.php:79
 #, php-format
 msgid "%1$s group, page %2$d"
 msgstr "Grup %1$s, pagjine %2$d"
 
 #. TRANS: Label for group description or group note (dt). Text hidden by default.
-#: actions/showgroup.php:266
 msgid "Note"
 msgstr "Note"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:277 lib/groupeditform.php:180
 msgid "Aliases"
 msgstr ""
 
 #. TRANS: Group actions header (h2). Text hidden by default.
-#: actions/showgroup.php:294
 msgid "Group actions"
 msgstr "Azions dal grup"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:338
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
 msgstr "Canâl dai avîs pal grup %s (RSS 1.0)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:345
 #, php-format
 msgid "Notice feed for %s group (RSS 2.0)"
 msgstr "Canâl dai avîs pal grup %s (RSS 2.0)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:352
 #, php-format
 msgid "Notice feed for %s group (Atom)"
 msgstr "Canâl dai avîs pal grup %s (Atom)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:358
 #, php-format
 msgid "FOAF for %s group"
 msgstr "FOAF pal grup %s"
 
 #. TRANS: Header for mini list of group members on a group page (h2).
-#: actions/showgroup.php:395
 msgid "Members"
 msgstr "Membris"
 
@@ -5402,30 +4413,23 @@ msgstr "Membris"
 #. TRANS: Text for user subscription statistics if the user has no subscriptions.
 #. TRANS: Text for user subscriber statistics if user has no subscribers.
 #. TRANS: Text for user user group membership statistics if user is not a member of any group.
-#: actions/showgroup.php:401 lib/profileaction.php:137
-#: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
-#: lib/subscriptionlist.php:123 lib/tagcloudsection.php:71
 msgid "(None)"
 msgstr "(Nissun)"
 
 #. TRANS: Link to all group members from mini list of group members if group has more than n members.
-#: actions/showgroup.php:410
 msgid "All members"
 msgstr "Ducj i membris"
 
 #. TRANS: Header for group statistics on a group page (h2).
 #. TRANS: H2 text for user statistics.
-#: actions/showgroup.php:441 lib/profileaction.php:205
 msgid "Statistics"
 msgstr "Statistichis"
 
-#: actions/showgroup.php:444
 msgctxt "LABEL"
 msgid "Created"
 msgstr "Creât"
 
 #. TRANS: Label for member count in statistics on group page.
-#: actions/showgroup.php:449
 msgctxt "LABEL"
 msgid "Members"
 msgstr "Membris"
@@ -5434,7 +4438,6 @@ msgstr "Membris"
 #. TRANS: **%s** is the group alias, %%%%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).
-#: actions/showgroup.php:464
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5453,7 +4456,6 @@ 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: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
-#: actions/showgroup.php:474
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5467,99 +4469,83 @@ msgstr ""
 "su la vite e i lôr interès. "
 
 #. TRANS: Header for list of group administrators on a group page (h2).
-#: actions/showgroup.php:503
 msgid "Admins"
 msgstr "Aministradôrs"
 
 #. TRANS: Client error displayed requesting a single message that does not exist.
-#: actions/showmessage.php:76
 msgid "No such message."
 msgstr ""
 
 #. TRANS: Client error displayed requesting a single direct message the requesting user was not a party in.
-#: actions/showmessage.php:86
 msgid "Only the sender and recipient may read this message."
 msgstr ""
 
 #. TRANS: Page title for single direct message display when viewing user is the sender.
 #. TRANS: %1$s is the addressed user's nickname, $2$s is a timestamp.
-#: actions/showmessage.php:105
 #, php-format
 msgid "Message to %1$s on %2$s"
 msgstr "Messaç par %1$s su %2$s"
 
 #. TRANS: Page title for single message display.
 #. TRANS: %1$s is the sending user's nickname, $2$s is a timestamp.
-#: actions/showmessage.php:113
 #, php-format
 msgid "Message from %1$s on %2$s"
 msgstr "Messaç di %1$s su %2$s"
 
-#: actions/shownotice.php:90
 msgid "Notice deleted."
 msgstr "L'avîs al è stât eliminât."
 
 #. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
-#: actions/showstream.php:70
 #, php-format
 msgid "%1$s tagged %2$s"
 msgstr "%1$s cun etichete %2$s"
 
 #. TRANS: Page title showing tagged notices in one user's stream.
 #. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
-#: actions/showstream.php:74
 #, php-format
 msgid "%1$s tagged %2$s, page %3$d"
 msgstr "%1$s cun etichete %2$s, pagjine %3$d"
 
 #. TRANS: Extended page title showing tagged notices in one user's stream.
 #. TRANS: %1$s is the username, %2$d is the page number.
-#: actions/showstream.php:82
 #, php-format
 msgid "%1$s, page %2$d"
 msgstr "%1$s, pagjine %2$d"
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %1$s is a user nickname, %2$s is a hashtag.
-#: actions/showstream.php:127
 #, php-format
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
 msgstr "Canâl dai avîs par %1$s cun etichete %2$s (RSS 1.0)"
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.
-#: actions/showstream.php:136
 #, php-format
 msgid "Notice feed for %s (RSS 1.0)"
 msgstr "Canâl dai avîs par %s (RSS 1.0)"
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.
-#: actions/showstream.php:145
 #, php-format
 msgid "Notice feed for %s (RSS 2.0)"
 msgstr "Canâl dai avîs par %s (RSS 2.0)"
 
-#: actions/showstream.php:152
 #, php-format
 msgid "Notice feed for %s (Atom)"
 msgstr "Canâl dai avîs par %s (Atom)"
 
 #. TRANS: Title for link to notice feed. FOAF stands for Friend of a Friend.
 #. TRANS: More information at http://www.foaf-project.org. %s is a user nickname.
-#: actions/showstream.php:159
 #, php-format
 msgid "FOAF for %s"
 msgstr "FOAF di %s"
 
 #. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
-#: actions/showstream.php:205
 #, php-format
 msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr ""
 
 #. TRANS: Second sentence of empty list message for a stream for the user themselves.
-#: actions/showstream.php:211
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
@@ -5569,7 +4555,6 @@ msgstr ""
 
 #. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:215
 #, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
@@ -5578,7 +4563,6 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:258
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5593,7 +4577,6 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:265
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5605,287 +4588,227 @@ msgstr ""
 "[StatusNet](http://status.net/)."
 
 #. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
-#: actions/showstream.php:322
 #, php-format
 msgid "Repeat of %s"
 msgstr "Ripetizion di %s"
 
-#: actions/silence.php:65 actions/unsilence.php:65
 msgid "You cannot silence users on this site."
 msgstr ""
 
-#: actions/silence.php:72
 msgid "User is already silenced."
 msgstr ""
 
-#: actions/siteadminpanel.php:69
 msgid "Basic settings for this StatusNet site"
 msgstr ""
 
-#: actions/siteadminpanel.php:133
 msgid "Site name must have non-zero length."
 msgstr ""
 
-#: actions/siteadminpanel.php:141
 msgid "You must have a valid contact email address."
 msgstr ""
 
-#: actions/siteadminpanel.php:159
 #, php-format
 msgid "Unknown language \"%s\"."
 msgstr ""
 
-#: actions/siteadminpanel.php:165
 msgid "Minimum text limit is 0 (unlimited)."
 msgstr ""
 
-#: actions/siteadminpanel.php:171
 msgid "Dupe limit must be one or more seconds."
 msgstr ""
 
-#: actions/siteadminpanel.php:221
 msgid "General"
 msgstr "Gjenerâl"
 
-#: actions/siteadminpanel.php:224
 msgid "Site name"
 msgstr "Non dal sît"
 
-#: actions/siteadminpanel.php:225
 msgid "The name of your site, like \"Yourcompany Microblog\""
 msgstr ""
 
-#: actions/siteadminpanel.php:229
 msgid "Brought by"
 msgstr ""
 
-#: actions/siteadminpanel.php:230
 msgid "Text used for credits link in footer of each page"
 msgstr ""
 
-#: actions/siteadminpanel.php:234
 msgid "Brought by URL"
 msgstr ""
 
-#: actions/siteadminpanel.php:235
 msgid "URL used for credits link in footer of each page"
 msgstr ""
 
-#: actions/siteadminpanel.php:239
 msgid "Contact email address for your site"
 msgstr ""
 
-#: actions/siteadminpanel.php:245
 msgid "Local"
 msgstr "Locâl"
 
-#: actions/siteadminpanel.php:256
 msgid "Default timezone"
 msgstr "Fûs orari predeterminât"
 
-#: actions/siteadminpanel.php:257
 msgid "Default timezone for the site; usually UTC."
 msgstr ""
 
-#: actions/siteadminpanel.php:262
 msgid "Default language"
 msgstr "Lenghe predeterminade"
 
-#: actions/siteadminpanel.php:263
 msgid "Site language when autodetection from browser settings is not available"
 msgstr ""
 
-#: actions/siteadminpanel.php:271
 msgid "Limits"
 msgstr "Limits"
 
-#: actions/siteadminpanel.php:274
 msgid "Text limit"
 msgstr "Limits dal test"
 
-#: actions/siteadminpanel.php:274
 msgid "Maximum number of characters for notices."
 msgstr ""
 
-#: actions/siteadminpanel.php:278
 msgid "Dupe limit"
 msgstr ""
 
-#: actions/siteadminpanel.php:278
 msgid "How long users must wait (in seconds) to post the same thing again."
 msgstr ""
 
 #. TRANS: Page title for site-wide notice tab in admin panel.
-#: actions/sitenoticeadminpanel.php:55
 msgid "Site Notice"
 msgstr ""
 
 #. TRANS: Instructions for site-wide notice tab in admin panel.
-#: actions/sitenoticeadminpanel.php:66
 msgid "Edit site-wide message"
 msgstr ""
 
 #. TRANS: Server error displayed when saving a site-wide notice was impossible.
-#: actions/sitenoticeadminpanel.php:101
 msgid "Unable to save site notice."
 msgstr ""
 
 #. TRANS: Client error displayed when a site-wide notice was longer than allowed.
-#: actions/sitenoticeadminpanel.php:112
 msgid "Maximum length for the site-wide notice is 255 characters."
 msgstr ""
 
 #. TRANS: Label for site-wide notice text field in admin panel.
-#: actions/sitenoticeadminpanel.php:176
 msgid "Site notice text"
 msgstr ""
 
 #. TRANS: Tooltip for site-wide notice text field in admin panel.
-#: actions/sitenoticeadminpanel.php:179
 msgid "Site-wide notice text (255 characters maximum; HTML allowed)"
 msgstr ""
 
 #. TRANS: Title for button to save site notice in admin panel.
-#: actions/sitenoticeadminpanel.php:201
 msgid "Save site notice."
 msgstr ""
 
 #. TRANS: Title for SMS settings.
-#: actions/smssettings.php:56
 msgid "SMS settings"
 msgstr ""
 
 #. TRANS: SMS settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/smssettings.php:70
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr ""
 
 #. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
-#: actions/smssettings.php:92
 msgid "SMS is not available."
 msgstr ""
 
 #. TRANS: Form legend for SMS settings form.
-#: actions/smssettings.php:106
 msgid "SMS address"
 msgstr ""
 
 #. TRANS: Form guide in SMS settings form.
-#: actions/smssettings.php:115
 msgid "Current confirmed SMS-enabled phone number."
 msgstr ""
 
 #. TRANS: Form guide in IM settings form.
-#: actions/smssettings.php:128
 msgid "Awaiting confirmation on this phone number."
 msgstr ""
 
 #. TRANS: Field label for SMS address input in SMS settings form.
-#: actions/smssettings.php:137
 msgid "Confirmation code"
 msgstr "Codiç di conferme"
 
 #. TRANS: Form field instructions in SMS settings form.
-#: actions/smssettings.php:139
 msgid "Enter the code you received on your phone."
 msgstr ""
 
 #. TRANS: Button label to confirm SMS confirmation code in SMS settings.
-#: actions/smssettings.php:143
 msgctxt "BUTTON"
 msgid "Confirm"
 msgstr "Conferme"
 
 #. TRANS: Field label for SMS phone number input in SMS settings form.
-#: actions/smssettings.php:148
 msgid "SMS phone number"
 msgstr ""
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
-#: actions/smssettings.php:151
 msgid "Phone number, no punctuation or spaces, with area code."
 msgstr ""
 
 #. TRANS: Form legend for SMS preferences form.
-#: actions/smssettings.php:190
 msgid "SMS preferences"
 msgstr ""
 
 #. TRANS: Checkbox label in SMS preferences form.
-#: actions/smssettings.php:196
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
 msgstr ""
 
 #. TRANS: Confirmation message for successful SMS preferences save.
-#: actions/smssettings.php:307
 msgid "SMS preferences saved."
 msgstr ""
 
 #. TRANS: Message given saving SMS phone number without having provided one.
-#: actions/smssettings.php:329
 msgid "No phone number."
 msgstr ""
 
 #. TRANS: Message given saving SMS phone number without having selected a carrier.
-#: actions/smssettings.php:335
 msgid "No carrier selected."
 msgstr ""
 
 #. TRANS: Message given saving SMS phone number that is already set.
-#: actions/smssettings.php:343
 msgid "That is already your phone number."
 msgstr ""
 
 #. TRANS: Message given saving SMS phone number that is already set for another user.
-#: actions/smssettings.php:347
 msgid "That phone number already belongs to another user."
 msgstr ""
 
 #. TRANS: Message given saving valid SMS phone number that is to be confirmed.
-#: actions/smssettings.php:375
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
 "for the code and instructions on how to use it."
 msgstr ""
 
 #. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
-#: actions/smssettings.php:403
 msgid "That is the wrong confirmation number."
 msgstr ""
 
 #. TRANS: Message given after successfully canceling SMS phone number confirmation.
-#: actions/smssettings.php:417
 msgid "SMS confirmation cancelled."
 msgstr ""
 
 #. TRANS: Message given trying to remove an SMS phone number that is not
 #. TRANS: registered for the active user.
-#: actions/smssettings.php:437
 msgid "That is not your phone number."
 msgstr ""
 
 #. TRANS: Message given after successfully removing a registered SMS phone number.
-#: actions/smssettings.php:459
 msgid "The SMS phone number was removed."
 msgstr ""
 
 #. TRANS: Label for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:498
 msgid "Mobile carrier"
 msgstr ""
 
 #. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:503
 msgid "Select a carrier"
 msgstr ""
 
 #. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
 #. TRANS: %s is an administrative contact's e-mail address.
-#: actions/smssettings.php:512
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -5893,118 +4816,93 @@ msgid ""
 msgstr ""
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
-#: actions/smssettings.php:534
 msgid "No code entered."
 msgstr ""
 
 #. TRANS: Menu item for site administration
-#: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
-#: lib/adminpanelaction.php:395
 msgid "Snapshots"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:65
 msgid "Manage snapshot configuration"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:127
 msgid "Invalid snapshot run value."
 msgstr ""
 
-#: actions/snapshotadminpanel.php:133
 msgid "Snapshot frequency must be a number."
 msgstr ""
 
-#: actions/snapshotadminpanel.php:144
 msgid "Invalid snapshot report URL."
 msgstr ""
 
-#: actions/snapshotadminpanel.php:200
 msgid "Randomly during web hit"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:201
 msgid "In a scheduled job"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:206
 msgid "Data snapshots"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:208
 msgid "When to send statistical data to status.net servers"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:217
 msgid "Frequency"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:218
 msgid "Snapshots will be sent once every N web hits"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:226
 msgid "Report URL"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:227
 msgid "Snapshots will be sent to this URL"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:248
 msgid "Save snapshot settings"
 msgstr ""
 
 #. TRANS: Client error displayed trying a change a subscription for a non-subscribed profile.
-#: actions/subedit.php:75
 msgid "You are not subscribed to that profile."
 msgstr "No tu sês sotscrit a chest profîl."
 
 #. TRANS: Server error displayed when updating a subscription fails with a database error.
 #. TRANS: Exception thrown when a subscription could not be stored on the server.
-#: actions/subedit.php:89 classes/Subscription.php:141
 msgid "Could not save subscription."
 msgstr ""
 
 #. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
-#: actions/subscribe.php:121
 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
 msgstr ""
 
 #. TRANS: Page title when subscription succeeded.
-#: actions/subscribe.php:149
 msgid "Subscribed"
 msgstr "Sotscrit"
 
 #. TRANS: Header for list of subscribers for a user (first page).
 #. TRANS: %s is the user's nickname.
-#: actions/subscribers.php:51
 #, php-format
 msgid "%s subscribers"
 msgstr "Sotscritôrs par %s"
 
 #. TRANS: Header for list of subscribers for a user (not first page).
 #. TRANS: %1$s is the user's nickname, $2$d is the page number.
-#: actions/subscribers.php:55
 #, php-format
 msgid "%1$s subscribers, page %2$d"
 msgstr "Sotscritôrs par %1$s, pagjine %2$d"
 
 #. TRANS: Page notice for page with an overview of all subscribers
 #. TRANS: of the logged in user's own profile.
-#: actions/subscribers.php:68
 msgid "These are the people who listen to your notices."
 msgstr "Chestis a son lis personis a che a scoltin i tiei avîs."
 
 #. TRANS: Page notice for page with an overview of all subscribers of a user other
 #. TRANS: than the logged in user. %s is the user nickname.
-#: actions/subscribers.php:74
 #, php-format
 msgid "These are the people who listen to %s's notices."
 msgstr "Chestis a son lis personis che a scoltin i avîs di %s."
 
 #. TRANS: Subscriber list text when the logged in user has no subscribers.
-#: actions/subscribers.php:114
 msgid ""
 "You have no subscribers. Try subscribing to people you know and they might "
 "return the favor."
@@ -6014,7 +4912,6 @@ msgstr ""
 
 #. TRANS: Subscriber list text when looking at the subscribers for a of a user other
 #. TRANS: than the logged in user that has no subscribers. %s is the user nickname.
-#: actions/subscribers.php:118
 #, php-format
 msgid "%s has no subscribers. Want to be the first?"
 msgstr "%s nol à nissun sotscritôr. Vuelistu jessi il prin?"
@@ -6024,7 +4921,6 @@ msgstr "%s nol à nissun sotscritôr. Vuelistu jessi il prin?"
 #. TRANS: This message contains a Markdown URL. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.
-#: actions/subscribers.php:127
 #, php-format
 msgid ""
 "%s has no subscribers. Why not [register an account](%%%%action.register%%%"
@@ -6033,20 +4929,17 @@ msgstr ""
 
 #. TRANS: Header for subscriptions overview for a user (not first page).
 #. TRANS: %1$s is a user nickname, %2$d is the page number.
-#: actions/subscriptions.php:55
 #, php-format
 msgid "%1$s subscriptions, page %2$d"
 msgstr "Sotscrizions di %1$s, pagjine %2$d"
 
 #. TRANS: Page notice for page with an overview of all subscriptions
 #. TRANS: of the logged in user's own profile.
-#: actions/subscriptions.php:68
 msgid "These are the people whose notices you listen to."
 msgstr ""
 
 #. TRANS: Page notice for page with an overview of all subscriptions of a user other
 #. TRANS: than the logged in user. %s is the user nickname.
-#: actions/subscriptions.php:74
 #, php-format
 msgid "These are the people whose notices %s listens to."
 msgstr ""
@@ -6055,7 +4948,6 @@ msgstr ""
 #. 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.
-#: actions/subscriptions.php:133
 #, php-format
 msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "
@@ -6069,283 +4961,225 @@ msgstr ""
 #. TRANS: than the logged in user that has no subscriptions. %s is the user nickname.
 #. TRANS: Subscription list text when looking at the subscriptions for a of a user that has none
 #. TRANS: as an anonymous user. %s is the user nickname.
-#: actions/subscriptions.php:141 actions/subscriptions.php:147
 #, php-format
 msgid "%s is not listening to anyone."
 msgstr "%s nol è daûr a scoltâ nissun."
 
 #. TRANS: Atom feed title. %s is a profile nickname.
-#: actions/subscriptions.php:176
 #, php-format
 msgid "Subscription feed for %s (Atom)"
 msgstr "Canâl des sotscrizions di %s (Atom)"
 
 #. TRANS: Checkbox label for enabling Jabber messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:241 lib/settingsnav.php:110
 #, fuzzy
 msgid "IM"
 msgstr "IM"
 
 #. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:256 lib/settingsnav.php:117
 msgid "SMS"
 msgstr "SMS"
 
 #. TRANS: Title for all but the first page of notices with tags.
 #. TRANS: %1$s is the tag, %2$d is the page number.
-#: actions/tag.php:73
 #, php-format
 msgid "Notices tagged with %1$s, page %2$d"
 msgstr "Avîs etichetâts cun %1$s, pagjine %2$d"
 
-#: actions/tag.php:91
 #, php-format
 msgid "Notice feed for tag %s (RSS 1.0)"
 msgstr "Canâl dai avîs pe etichete %s (RSS 1.0)"
 
-#: actions/tag.php:97
 #, php-format
 msgid "Notice feed for tag %s (RSS 2.0)"
 msgstr "Canâl dai avîs pe etichete %s (RSS 2.0)"
 
-#: actions/tag.php:103
 #, php-format
 msgid "Notice feed for tag %s (Atom)"
 msgstr "Canâl dai avîs pe etichete %s (Atom)"
 
-#: actions/tagother.php:39
 msgid "No ID argument."
 msgstr ""
 
-#: actions/tagother.php:65
 #, php-format
 msgid "Tag %s"
 msgstr "Etichete %s"
 
 #. TRANS: H2 for user profile information.
-#: actions/tagother.php:77 lib/userprofile.php:76
 msgid "User profile"
 msgstr "Profîl dal utent"
 
-#: actions/tagother.php:120
 msgid "Tag user"
 msgstr "Etichete utent"
 
-#: actions/tagother.php:130
 msgid ""
 "Tags for this user (letters, numbers, -, ., and _), comma- or space- "
 "separated"
 msgstr ""
 
-#: actions/tagother.php:157
 #, php-format
 msgid "Invalid tag: \"%s\""
 msgstr "La etichete no je valide: \"%s\""
 
-#: actions/tagother.php:172
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 
-#: actions/tagother.php:215
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
 
-#: actions/tagrss.php:35
 msgid "No such tag."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to unblock a non-blocked user.
-#: actions/unblock.php:59
 msgid "You haven't blocked that user."
 msgstr ""
 
-#: actions/unsandbox.php:72
 msgid "User is not sandboxed."
 msgstr ""
 
-#: actions/unsilence.php:72
 msgid "User is not silenced."
 msgstr ""
 
-#: actions/unsubscribe.php:77
 msgid "No profile ID in request."
 msgstr ""
 
-#: actions/unsubscribe.php:98
 msgid "Unsubscribed"
 msgstr "No tu sês sotscrit"
 
-#: actions/updateprofile.php:64
 #, php-format
 msgid ""
 "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
 msgstr ""
 
-#: actions/urlsettings.php:60
 #, fuzzy
 msgid "URL settings"
 msgstr "Impuestazions IM"
 
 #. TRANS: Instructions for tab "Other" in user profile settings.
-#: actions/urlsettings.php:72
 msgid "Manage various other options."
 msgstr ""
 
 #. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
 #. TRANS: user's profile settings. This message has one space at the beginning. Use your
 #. TRANS: language's word separator here if it has one (most likely a single space).
-#: actions/urlsettings.php:115
 msgid " (free service)"
 msgstr ""
 
-#: actions/urlsettings.php:121
 msgid "[none]"
 msgstr ""
 
-#: actions/urlsettings.php:122
 msgid "[internal]"
 msgstr ""
 
 #. TRANS: Label for dropdown with URL shortener services.
-#: actions/urlsettings.php:130
 msgid "Shorten URLs with"
 msgstr "Scurte lis URL cun"
 
 #. TRANS: Tooltip for for dropdown with URL shortener services.
-#: actions/urlsettings.php:132
 msgid "Automatic shortening service to use."
 msgstr "Servizi di scurte automatic di doprâ."
 
-#: actions/urlsettings.php:138
 msgid "URL longer than"
 msgstr ""
 
-#: actions/urlsettings.php:141
 msgid "URLs longer than this will be shortened, 0 means always shorten."
 msgstr ""
 
-#: actions/urlsettings.php:145
 msgid "Text longer than"
 msgstr ""
 
-#: actions/urlsettings.php:148
 msgid ""
 "URLs in notices longer than this will be shortened, 0 means always shorten."
 msgstr ""
 
 #. TRANS: Form validation error for form "Other settings" in user profile.
-#: actions/urlsettings.php:180
 msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr ""
 
-#: actions/urlsettings.php:187
 msgid "Invalid number for max url length."
 msgstr ""
 
-#: actions/urlsettings.php:193
 msgid "Invalid number for max notice length."
 msgstr ""
 
-#: actions/urlsettings.php:238
 msgid "Error saving user URL shortening preferences."
 msgstr ""
 
 #. TRANS: User admin panel title
-#: actions/useradminpanel.php:58
 msgctxt "TITLE"
 msgid "User"
 msgstr "Utent"
 
 #. TRANS: Instruction for user admin panel.
-#: actions/useradminpanel.php:69
 msgid "User settings for this StatusNet site"
 msgstr ""
 
 #. TRANS: Form validation error in user admin panel when a non-numeric character limit was set.
-#: actions/useradminpanel.php:147
 msgid "Invalid bio limit. Must be numeric."
 msgstr ""
 
 #. TRANS: Form validation error in user admin panel when welcome text is too long.
-#: actions/useradminpanel.php:154
 msgid "Invalid welcome text. Maximum length is 255 characters."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to set a non-existing user as default subscription for new
 #. TRANS: users in user admin panel. %1$s is the invalid nickname.
-#: actions/useradminpanel.php:166
 #, php-format
 msgid "Invalid default subscripton: \"%1$s\" is not a user."
 msgstr ""
 
-#: actions/useradminpanel.php:215 lib/action.php:565 lib/settingsnav.php:77
-#: lib/subgroupnav.php:81
 msgid "Profile"
 msgstr "Profîl"
 
 #. TRANS: Field label in user admin panel for setting the character limit for the bio field.
-#: actions/useradminpanel.php:220
 msgid "Bio Limit"
 msgstr "Limit de biografie"
 
 #. TRANS: Tooltip in user admin panel for setting the character limit for the bio field.
-#: actions/useradminpanel.php:222
 msgid "Maximum length of a profile bio in characters."
 msgstr ""
 
 #. TRANS: Form legend in user admin panel.
-#: actions/useradminpanel.php:231
 msgid "New users"
 msgstr "Gnûfs utents"
 
 #. TRANS: Field label in user admin panel for setting new user welcome text.
-#: actions/useradminpanel.php:236
 msgid "New user welcome"
 msgstr ""
 
 #. TRANS: Tooltip in user admin panel for setting new user welcome text.
-#: actions/useradminpanel.php:238
 msgid "Welcome text for new users (maximum 255 characters)."
 msgstr ""
 
 #. TRANS: Field label in user admin panel for setting default subscription for new users.
-#: actions/useradminpanel.php:244
 msgid "Default subscription"
 msgstr "Sotscrizion predeterminade"
 
 #. TRANS: Tooltip in user admin panel for setting default subscription for new users.
-#: actions/useradminpanel.php:246
 msgid "Automatically subscribe new users to this user."
 msgstr ""
 
 #. TRANS: Form legend in user admin panel.
-#: actions/useradminpanel.php:256
 msgid "Invitations"
 msgstr "Invîts"
 
 #. TRANS: Field label for checkbox in user admin panel for allowing users to invite friend using site e-mail.
-#: actions/useradminpanel.php:262
 msgid "Invitations enabled"
 msgstr ""
 
 #. TRANS: Tooltip for checkbox in user admin panel for allowing users to invite friend using site e-mail.
-#: actions/useradminpanel.php:265
 msgid "Whether to allow users to invite new users."
 msgstr ""
 
 #. TRANS: Title for button to save user settings in user admin panel.
-#: actions/useradminpanel.php:302
 msgid "Save user settings."
 msgstr "Salve lis impuestazions dal utent"
 
 #. TRANS: Page title.
-#: actions/userauthorization.php:109
 msgid "Authorize subscription"
 msgstr "Autorize la sotscrizion"
 
 #. TRANS: Page notice on "Auhtorize subscription" page.
-#: actions/userauthorization.php:115
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
 "user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
@@ -6353,38 +5187,31 @@ msgid ""
 msgstr ""
 
 #. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:200
 msgctxt "BUTTON"
 msgid "Accept"
 msgstr "Acete"
 
 #. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:202
 msgid "Subscribe to this user."
 msgstr "Sotscrivimi a chest utent."
 
 #. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:204
 msgctxt "BUTTON"
 msgid "Reject"
 msgstr "Refude"
 
 #. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:206
 msgid "Reject this subscription."
 msgstr "Refude la sotscrizion"
 
 #. TRANS: Client error displayed for an empty authorisation request.
-#: actions/userauthorization.php:219
 msgid "No authorization request!"
 msgstr ""
 
 #. TRANS: Accept message header from Authorise subscription page.
-#: actions/userauthorization.php:242
 msgid "Subscription authorized"
 msgstr "Sotscrizion autorizade"
 
-#: actions/userauthorization.php:245
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to authorize the "
@@ -6392,11 +5219,9 @@ msgid ""
 msgstr ""
 
 #. TRANS: Reject message header from Authorise subscription page.
-#: actions/userauthorization.php:256
 msgid "Subscription rejected"
 msgstr "Sotscrizion refudade"
 
-#: actions/userauthorization.php:259
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to fully reject the "
@@ -6405,35 +5230,30 @@ msgstr ""
 
 #. TRANS: Exception thrown when no valid user is found for an authorisation request.
 #. TRANS: %s is a listener URI.
-#: actions/userauthorization.php:296
 #, php-format
 msgid "Listener URI \"%s\" not found here."
 msgstr ""
 
 #. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
 #. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:303
 #, php-format
 msgid "Listenee URI \"%s\" is too long."
 msgstr ""
 
 #. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
 #. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:311
 #, php-format
 msgid "Listenee URI \"%s\" is a local user."
 msgstr ""
 
 #. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
 #. TRANS: %s is a profile URL.
-#: actions/userauthorization.php:329
 #, php-format
 msgid "Profile URL \"%s\" is for a local user."
 msgstr ""
 
 #. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
 #. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
-#: actions/userauthorization.php:339
 #, php-format
 msgid ""
 "Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
@@ -6442,74 +5262,60 @@ msgstr ""
 
 #. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
 #. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:349
 #, php-format
 msgid "Avatar URL \"%s\" is not valid."
 msgstr ""
 
 #. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
 #. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:356
 #, php-format
 msgid "Cannot read avatar URL \"%s\"."
 msgstr ""
 
 #. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
 #. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:363
 #, php-format
 msgid "Wrong image type for avatar URL \"%s\"."
 msgstr ""
 
 #. TRANS: Page title for profile design page.
-#: actions/userdesignsettings.php:74 lib/designsettings.php:61
 msgid "Profile design"
 msgstr ""
 
 #. TRANS: Instructions for profile design page.
-#: actions/userdesignsettings.php:84 lib/designsettings.php:72
 msgid ""
 "Customize the way your profile looks with a background image and a colour "
 "palette of your choice."
 msgstr ""
 
-#: actions/userdesignsettings.php:289
 msgid "Enjoy your hotdog!"
 msgstr ""
 
-#: actions/userdesignsettings.php:325
 #, fuzzy
 msgid "Design settings"
 msgstr "Salve lis impuestazions dal sît"
 
-#: actions/userdesignsettings.php:340
 msgid "View profile designs"
 msgstr ""
 
-#: actions/userdesignsettings.php:341
 msgid "Show or hide profile designs."
 msgstr ""
 
-#: actions/userdesignsettings.php:348
 msgid "Background file"
 msgstr ""
 
 #. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number.
-#: actions/usergroups.php:66
 #, php-format
 msgid "%1$s groups, page %2$d"
 msgstr "Grups di %1$s, pagjine %2$d"
 
-#: actions/usergroups.php:132
 msgid "Search for more groups"
 msgstr "Cîr altris grups"
 
-#: actions/usergroups.php:159
 #, php-format
 msgid "%s is not a member of any group."
 msgstr "%s nol fâs part di nissun grup."
 
-#: actions/usergroups.php:164
 #, php-format
 msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
 msgstr "Prove a [cirî grups](%%action.groupsearch%%) e unîti a lôr."
@@ -6519,18 +5325,14 @@ msgstr "Prove a [cirî grups](%%action.groupsearch%%) e unîti a lôr."
 #. TRANS: %1$s is a group name, %2$s is a site name.
 #. TRANS: Message is used as a subtitle in atom user notice feed.
 #. TRANS: %1$s is a user name, %2$s is a site name.
-#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:70
-#: lib/atomusernoticefeed.php:95
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr "Inzornaments di %1$s su %2$s!"
 
-#: actions/version.php:75
 #, php-format
 msgid "StatusNet %s"
 msgstr "StatusNet %s"
 
-#: actions/version.php:155
 #, php-format
 msgid ""
 "This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
@@ -6539,16 +5341,13 @@ msgstr ""
 "Chest sît al funzione graziis a %1$s version %2$s, Copyright 2008-2010 "
 "StatusNet, Inc. e i colaboradôrs."
 
-#: actions/version.php:163
 msgid "Contributors"
 msgstr "Colaboradôrs"
 
 #. TRANS: Menu item for site administration
-#: actions/version.php:167 lib/adminpanelaction.php:403
 msgid "License"
 msgstr "Licence"
 
-#: actions/version.php:170
 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 "
@@ -6556,7 +5355,6 @@ msgid ""
 "any later version. "
 msgstr ""
 
-#: actions/version.php:176
 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 "
@@ -6564,7 +5362,6 @@ msgid ""
 "for more details. "
 msgstr ""
 
-#: actions/version.php:182
 #, php-format
 msgid ""
 "You should have received a copy of the GNU Affero General Public License "
@@ -6574,52 +5371,42 @@ msgstr ""
 "insieme cun chest program. Se nol è cussì, cjale %s."
 
 #. TRANS: Form input field label for application name.
-#: actions/version.php:197 lib/applicationeditform.php:190
 msgid "Name"
 msgstr "Non"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:885
 msgid "Version"
 msgstr "Version"
 
-#: actions/version.php:199
 msgid "Author(s)"
 msgstr "Autôr(s)"
 
 #. TRANS: Form input field label.
-#: actions/version.php:200 lib/applicationeditform.php:208
-#: lib/groupeditform.php:168
 msgid "Description"
 msgstr "Descrizion"
 
 #. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:164
 msgid "Favor"
 msgstr "Preferìs"
 
 #. TRANS: Ntofication given when a user marks a notice as favorite.
 #. TRANS: %1$s is a user nickname or full name, %2$s is a notice URI.
-#: classes/Fave.php:167
 #, php-format
 msgid "%1$s marked notice %2$s as a favorite."
 msgstr "%1$s al à segnât l'avîs %2$s come preferît."
 
 #. TRANS: Server exception thrown when a URL cannot be processed.
-#: classes/File.php:162
 #, php-format
 msgid "Cannot process URL '%s'"
 msgstr ""
 
 #. TRANS: Server exception thrown when... Robin thinks something is impossible!
-#: classes/File.php:194
 msgid "Robin thinks something is impossible."
 msgstr ""
 
 #. 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$s is used for plural.
-#: classes/File.php:210
 #, php-format
 msgid ""
 "No file may be larger than %1$d byte and the file you sent was %2$d bytes. "
@@ -6632,7 +5419,6 @@ msgstr[1] ""
 
 #. TRANS: Message given if an upload would exceed user quota.
 #. TRANS: %d (number) is the user quota in bytes and is used for plural.
-#: classes/File.php:223
 #, php-format
 msgid "A file this large would exceed your user quota of %d byte."
 msgid_plural "A file this large would exceed your user quota of %d bytes."
@@ -6641,7 +5427,6 @@ msgstr[1] ""
 
 #. TRANS: Message given id an upload would exceed a user's monthly quota.
 #. TRANS: $d (number) is the monthly user quota in bytes and is used for plural.
-#: classes/File.php:235
 #, php-format
 msgid "A file this large would exceed your monthly quota of %d byte."
 msgid_plural "A file this large would exceed your monthly quota of %d bytes."
@@ -6649,156 +5434,129 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Client exception thrown if a file upload does not have a valid name.
-#: classes/File.php:282 classes/File.php:297
 msgid "Invalid filename."
 msgstr ""
 
 #. TRANS: Exception thrown when joining a group fails.
-#: classes/Group_member.php:51
 msgid "Group join failed."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to leave a group the user is not a member of.
-#: classes/Group_member.php:64
 msgid "Not part of group."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to leave a group fails.
-#: classes/Group_member.php:72
 msgid "Group leave failed."
 msgstr ""
 
 #. TRANS: Exception thrown providing an invalid profile ID.
 #. TRANS: %s is the invalid profile ID.
-#: classes/Group_member.php:85
 #, php-format
 msgid "Profile ID %s is invalid."
 msgstr ""
 
 #. TRANS: Exception thrown providing an invalid group ID.
 #. TRANS: %s is the invalid group ID.
-#: classes/Group_member.php:98
 #, php-format
 msgid "Group ID %s is invalid."
 msgstr ""
 
 #. TRANS: Activity title.
-#: classes/Group_member.php:147 lib/joinform.php:114
 msgid "Join"
 msgstr "Iscrizion"
 
 #. TRANS: Success message for subscribe to group attempt through OStatus.
 #. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
-#: classes/Group_member.php:151
 #, php-format
 msgid "%1$s has joined group %2$s."
 msgstr "%1$s si à unît al grup %2$s."
 
 #. TRANS: Server exception thrown when updating a local group fails.
-#: classes/Local_group.php:42
 msgid "Could not update local group."
 msgstr ""
 
 #. TRANS: Exception thrown when trying creating a login token failed.
 #. TRANS: %s is the user nickname for which token creation failed.
-#: classes/Login_token.php:78
 #, php-format
 msgid "Could not create login token for %s"
 msgstr ""
 
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
-#: classes/Memcached_DataObject.php:556
 msgid "No database name or DSN found anywhere."
 msgstr ""
 
 #. TRANS: Client exception thrown when a user tries to send a direct message while being banned from sending them.
-#: classes/Message.php:45
 msgid "You are banned from sending direct messages."
 msgstr ""
 
 #. TRANS: Message given when a message could not be stored on the server.
-#: classes/Message.php:69
 msgid "Could not insert message."
 msgstr ""
 
 #. TRANS: Message given when a message could not be updated on the server.
-#: classes/Message.php:80
 msgid "Could not update message with new URI."
 msgstr ""
 
 #. TRANS: Server exception thrown when a user profile for a notice cannot be found.
 #. TRANS: %1$d is a profile ID (number), %2$d is a notice ID (number).
-#: classes/Notice.php:98
 #, php-format
 msgid "No such profile (%1$d) for notice (%2$d)."
 msgstr ""
 
 #. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:199
 #, php-format
 msgid "Database error inserting hashtag: %s"
 msgstr ""
 
 #. TRANS: Client exception thrown if a notice contains too many characters.
-#: classes/Notice.php:279
 msgid "Problem saving notice. Too long."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to save a notice for an unknown user.
-#: classes/Notice.php:284
 msgid "Problem saving notice. Unknown user."
 msgstr ""
 
 #. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
-#: classes/Notice.php:290
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 
 #. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
-#: classes/Notice.php:297
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
 "few minutes."
 msgstr ""
 
 #. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:305
 msgid "You are banned from posting notices on this site."
 msgstr ""
 
 #. TRANS: Server exception thrown when a notice cannot be saved.
 #. TRANS: Server exception thrown when a notice cannot be updated.
-#: classes/Notice.php:372 classes/Notice.php:399
 msgid "Problem saving notice."
 msgstr ""
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:929
 msgid "Bad type provided to saveKnownGroups."
 msgstr ""
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:1028
 msgid "Problem saving group inbox."
 msgstr ""
 
 #. TRANS: Server exception thrown when a reply cannot be saved.
 #. TRANS: %1$d is a notice ID, %2$d is the ID of the mentioned user.
-#: classes/Notice.php:1144
 #, php-format
 msgid "Could not save reply for %1$d, %2$d."
 msgstr ""
 
 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1663
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
 
 #. TRANS: Full name of a profile or group followed by nickname in parens
-#: classes/Profile.php:172 classes/User_group.php:242
 #, php-format
 msgctxt "FANCYNAME"
 msgid "%1$s (%2$s)"
@@ -6806,264 +5564,215 @@ msgstr "%1$s (%2$s)"
 
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:779
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:788
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
 
 #. TRANS: Exception thrown when a right for a non-existing user profile is checked.
-#: classes/Remote_profile.php:54
 msgid "Missing profile."
 msgstr ""
 
 #. TRANS: Exception thrown when a tag cannot be saved.
-#: classes/Status_network.php:338
 msgid "Unable to save tag."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#: classes/Subscription.php:77 lib/oauthstore.php:482
 msgid "You have been banned from subscribing."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to subscribe while already subscribed.
-#: classes/Subscription.php:82
 msgid "Already subscribed!"
 msgstr ""
 
 #. TRANS: Exception thrown when trying to subscribe to a user who has blocked the subscribing user.
-#: classes/Subscription.php:87
 msgid "User has blocked you."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to unsibscribe without a subscription.
-#: classes/Subscription.php:176
 msgid "Not subscribed!"
 msgstr ""
 
 #. TRANS: Exception thrown when trying to unsubscribe a user from themselves.
-#: classes/Subscription.php:183
 msgid "Could not delete self-subscription."
 msgstr ""
 
 #. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
-#: classes/Subscription.php:211
 msgid "Could not delete subscription OMB token."
 msgstr ""
 
 #. TRANS: Exception thrown when a subscription could not be deleted on the server.
-#: classes/Subscription.php:223
 msgid "Could not delete subscription."
 msgstr ""
 
 #. TRANS: Activity tile when subscribing to another person.
-#: classes/Subscription.php:265
 msgid "Follow"
 msgstr "Seguìs"
 
 #. TRANS: Notification given when one person starts following another.
 #. TRANS: %1$s is the subscriber, %2$s is the subscribed.
-#: classes/Subscription.php:268
 #, php-format
 msgid "%1$s is now following %2$s."
 msgstr "%1$s al seguìs cumò %2$s."
 
 #. TRANS: Notice given on user registration.
 #. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:390
 #, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr "Benvignût su %1$s, @%2$s!"
 
 #. TRANS: Server exception.
-#: classes/User.php:923
 msgid "No single user defined for single-user mode."
 msgstr ""
 
 #. TRANS: Server exception.
-#: classes/User.php:927
 msgid "Single-user mode code called when not enabled."
 msgstr ""
 
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:522
 msgid "Could not create group."
 msgstr ""
 
 #. TRANS: Server exception thrown when updating a group URI failed.
-#: classes/User_group.php:532
 msgid "Could not set group URI."
 msgstr ""
 
 #. TRANS: Server exception thrown when setting group membership failed.
-#: classes/User_group.php:555
 msgid "Could not set group membership."
 msgstr ""
 
 #. TRANS: Server exception thrown when saving local group information failed.
-#: classes/User_group.php:570
 msgid "Could not save local group info."
 msgstr ""
 
 #. TRANS: Exception thrown when an account could not be located when it should be moved.
 #. TRANS: %s is the remote site.
-#: lib/accountmover.php:65
 #, php-format
 msgid "Cannot locate account %s."
 msgstr ""
 
 #. TRANS: Exception thrown when a service document could not be located account move.
 #. TRANS: %s is the remote site.
-#: lib/accountmover.php:106
 #, php-format
 msgid "Cannot find XRD for %s."
 msgstr ""
 
 #. TRANS: Exception thrown when an account could not be located when it should be moved.
 #. TRANS: %s is the remote site.
-#: lib/accountmover.php:131
 #, php-format
 msgid "No AtomPub API service for %s."
 msgstr ""
 
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: lib/action.php:161
 #, php-format
 msgid "%1$s - %2$s"
 msgstr "%1$s - %2$s"
 
 #. TRANS: Page title for a page without a title set.
-#: lib/action.php:177
 msgid "Untitled page"
 msgstr "Pagjine cence titul"
 
 #. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.
-#: lib/action.php:325
 msgctxt "TOOLTIP"
 msgid "Show more"
 msgstr "Mostre di plui"
 
 #. TRANS: Inline reply form submit button: submits a reply comment.
-#: lib/action.php:328
 #, fuzzy
 msgctxt "BUTTON"
-msgid "Comment"
-msgstr "Contignût"
+msgid "Reply"
+msgstr "Rispuint"
 
 #. TRANS: Placeholder text for inline reply form. Clicking in this box will turn it into a mini notice form.
-#: lib/action.php:331
-msgid "Add a comment..."
+msgid "Write a reply..."
 msgstr ""
 
-#: lib/action.php:559 lib/personalgroupnav.php:99
 #, fuzzy
 msgid "Home"
 msgstr "Pagjine web"
 
-#: lib/action.php:560
 #, fuzzy
 msgid "Friends timeline"
 msgstr "Ativitât di %s"
 
-#: lib/action.php:566
 #, fuzzy
 msgid "Your profile"
 msgstr "Profîl dal grup"
 
-#: lib/action.php:570 lib/action.php:593 lib/publicgroupnav.php:78
 msgid "Public"
 msgstr "Public"
 
-#: lib/action.php:571 lib/action.php:594
 #, fuzzy
 msgid "Everyone on this site"
 msgstr "Cjate int in chest sît"
 
-#: lib/action.php:575
 #, fuzzy
 msgid "Settings"
 msgstr "Impuestazions IM"
 
-#: lib/action.php:576
 #, fuzzy
 msgid "Change your personal settings"
 msgstr "Cambie lis impuestazions dal to profîl"
 
-#: lib/action.php:582
 #, fuzzy
 msgid "Site configuration"
 msgstr "Cambie la configurazion dal sît"
 
-#: lib/action.php:587
 #, fuzzy
 msgid "Logout"
 msgstr "Jes"
 
-#: lib/action.php:588
 #, fuzzy
 msgid "Logout from the site"
 msgstr "Jes dal sît"
 
-#: lib/action.php:599
 #, fuzzy
 msgid "Login to the site"
 msgstr "Jentre tal sît"
 
-#: lib/action.php:606
 #, fuzzy
 msgid "Search"
 msgstr "Cîr"
 
-#: lib/action.php:607
 #, fuzzy
 msgid "Search the site"
 msgstr "Cîr tal sît"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:864
 msgid "Help"
 msgstr "Jutori"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:867
 msgid "About"
 msgstr "Informazions"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:870
 msgid "FAQ"
 msgstr ""
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:875
 msgid "TOS"
 msgstr ""
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:879
 msgid "Privacy"
 msgstr ""
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:882
 msgid "Source"
 msgstr "Sorzint"
 
 #. TRANS: Secondary navigation menu option leading to e-mail contact information on the
 #. TRANS: StatusNet site, where to report bugs, ...
-#: lib/action.php:889
 msgid "Contact"
 msgstr "Contats"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:892
 msgid "Badge"
 msgstr ""
 
@@ -7071,7 +5780,6 @@ msgstr ""
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:921
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7081,7 +5789,6 @@ msgstr ""
 "broughtby%%](%%site.broughtbyurl%%)."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:924
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** al è un servizi di microblogging."
@@ -7090,7 +5797,6 @@ msgstr "**%%site.name%%** al è un servizi di microblogging."
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:931
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7103,21 +5809,18 @@ msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:949
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr "I contignûts e i dâts di %1$s a son privâts e confidenziâi."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:956
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
 "I contignûts e i dâts a son copyright di %1$s. Ducj i dirits riservâts."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:960
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 "I contignûts e i dâts a son copyright dai colaboradôrs Ducj i dirits "
@@ -7125,7 +5828,6 @@ msgstr ""
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:992
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
@@ -7133,77 +5835,63 @@ msgstr ""
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1335
 msgid "After"
 msgstr "Sucessîfs"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1345
 msgid "Before"
 msgstr "Precedents"
 
 #. TRANS: Client exception thrown when a feed instance is a DOMDocument.
-#: lib/activity.php:125
 msgid "Expecting a root feed element but got a whole XML document."
 msgstr ""
 
 #. TRANS: Client exception thrown when using an unknown verb for the activity importer.
-#: lib/activityimporter.php:81
 #, php-format
 msgid "Unknown verb: \"%s\"."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to force a subscription for an untrusted user.
-#: lib/activityimporter.php:107
 msgid "Cannot force subscription for untrusted user."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to for a remote user to subscribe.
-#: lib/activityimporter.php:117
 msgid "Cannot force remote user to subscribe."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to subscribe to an unknown profile.
-#: lib/activityimporter.php:132
 msgid "Unknown profile."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to import an event not related to the importing user.
-#: lib/activityimporter.php:138
 msgid "This activity seems unrelated to our user."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to join a remote group that is not a group.
-#: lib/activityimporter.php:154
 msgid "Remote profile is not a group!"
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to join a group the importing user is already a member of.
-#: lib/activityimporter.php:163
 msgid "User is already a member of this group."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to import a notice by another user.
 #. TRANS: %1$s is the source URI of the notice, %2$s is the URI of the author.
-#: lib/activityimporter.php:201
 #, php-format
 msgid "Already know about notice %1$s and  it has a different author %2$s."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to overwrite the author information for a non-trusted user during import.
-#: lib/activityimporter.php:207
 msgid "Not overwriting author info for non-trusted user."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to import a notice without content.
 #. TRANS: %s is the notice URI.
-#: lib/activityimporter.php:223
 #, php-format
 msgid "No content for notice %s."
 msgstr ""
 
-#: lib/activitymover.php:84
 #, php-format
 msgid "No such user %s."
 msgstr "L'utent %s nol è stât cjatât."
@@ -7214,209 +5902,169 @@ msgstr "L'utent %s nol è stât cjatât."
 #. TRANS: %1$s is a URL, %2$s is the status, %s$s is the fail reason.
 #. TRANS: Exception thrown when post to collection fails with a status that is not handled.
 #. TRANS: %1$s is a URL, %2$s is the status, %s$s is the fail reason.
-#: lib/activitysink.php:163 lib/activitysink.php:167 lib/activitysink.php:172
 #, php-format
 msgctxt "URLSTATUSREASON"
 msgid "%1$s %2$s %3$s"
 msgstr "%1$s %2$s %3$s"
 
 #. TRANS: Client exception thrown when there is no source attribute.
-#: lib/activityutils.php:200
 msgid "Can't handle remote content yet."
 msgstr ""
 
 #. TRANS: Client exception thrown when there embedded XML content is found that cannot be processed yet.
-#: lib/activityutils.php:237
 msgid "Can't handle embedded XML content yet."
 msgstr ""
 
 #. TRANS: Client exception thrown when base64 encoded content is found that cannot be processed yet.
-#: lib/activityutils.php:242
 msgid "Can't handle embedded Base64 content yet."
 msgstr ""
 
 #. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights.
-#: lib/adminpanelaction.php:96
 msgid "You cannot make changes to this site."
 msgstr ""
 
 #. TRANS: Client error message throw when a certain panel's settings cannot be changed.
-#: lib/adminpanelaction.php:108
 msgid "Changes to that panel are not allowed."
 msgstr ""
 
 #. TRANS: Client error message.
-#: lib/adminpanelaction.php:222
 msgid "showForm() not implemented."
 msgstr ""
 
 #. TRANS: Client error message
-#: lib/adminpanelaction.php:250
 msgid "saveSettings() not implemented."
 msgstr ""
 
 #. TRANS: Client error message thrown if design settings could not be deleted in
 #. TRANS: the admin panel Design.
-#: lib/adminpanelaction.php:274
 msgid "Unable to delete design setting."
 msgstr ""
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:337
 msgid "Basic site configuration"
 msgstr ""
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:339
 msgctxt "MENU"
 msgid "Site"
 msgstr "Sît"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:345
 msgid "Design configuration"
 msgstr ""
 
 #. TRANS: Menu item for site administration
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/adminpanelaction.php:347 lib/groupnav.php:135
 msgctxt "MENU"
 msgid "Design"
 msgstr ""
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:353
 msgid "User configuration"
 msgstr ""
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:110
 msgid "User"
 msgstr "Utent"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:361
 msgid "Access configuration"
 msgstr ""
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:369
 msgid "Paths configuration"
 msgstr ""
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:377
 msgid "Sessions configuration"
 msgstr ""
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:385
 msgid "Edit site notice"
 msgstr ""
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:387
 msgid "Site notice"
 msgstr ""
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:393
 msgid "Snapshots configuration"
 msgstr ""
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:401
 msgid "Set site license"
 msgstr ""
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:409
 #, fuzzy
 msgid "Plugins configuration"
 msgstr "Cambie la configurazion dal sît"
 
 #. TRANS: Client error 401.
-#: lib/apiauth.php:111
 msgid "API resource requires read-write access, but you only have read access."
 msgstr ""
 
 #. TRANS: OAuth exception thrown when no application is found for a given consumer key.
-#: lib/apiauth.php:177
 msgid "No application for that consumer key."
 msgstr ""
 
-#: lib/apiauth.php:202 lib/apiauth.php:284
 msgid "Not allowed to use API."
 msgstr ""
 
 #. TRANS: OAuth exception given when an incorrect access token was given for a user.
-#: lib/apiauth.php:225
 msgid "Bad access token."
 msgstr ""
 
 #. TRANS: OAuth exception given when no user was found for a given token (no token was found).
-#: lib/apiauth.php:230
 msgid "No user for that token."
 msgstr ""
 
 #. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel".
 #. TRANS: Client error thrown when authentication fails.
-#: lib/apiauth.php:272 lib/apiauth.php:302
 msgid "Could not authenticate you."
 msgstr ""
 
 #. TRANS: Server error displayed when trying to create an anynymous OAuth consumer.
-#: lib/apioauthstore.php:45
 msgid "Could not create anonymous consumer."
 msgstr ""
 
 #. TRANS: Server error displayed when trying to create an anynymous OAuth application.
-#: lib/apioauthstore.php:69
 msgid "Could not create anonymous OAuth application."
 msgstr ""
 
 #. TRANS: Exception thrown when no token association could be found.
-#: lib/apioauthstore.php:151
 msgid ""
 "Could not find a profile and application associated with the request token."
 msgstr ""
 
 #. TRANS: Exception thrown when no access token can be issued.
-#: lib/apioauthstore.php:209
 msgid "Could not issue access token."
 msgstr ""
 
-#: lib/apioauthstore.php:317
 msgid "Database error inserting OAuth application user."
 msgstr ""
 
-#: lib/apioauthstore.php:345
 msgid "Database error updating OAuth application user."
 msgstr ""
 
 #. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
-#: lib/apioauthstore.php:371
 msgid "Tried to revoke unknown token."
 msgstr ""
 
 #. TRANS: Exception thrown when an attempt is made to remove a revoked token.
-#: lib/apioauthstore.php:376
 msgid "Failed to delete revoked token."
 msgstr ""
 
 #. TRANS: Form input field label for application icon.
-#: lib/applicationeditform.php:177
 msgid "Icon"
 msgstr "Icone"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:182
 msgid "Icon for this application"
 msgstr ""
 
 #. TRANS: Form input field instructions.
 #. TRANS: %d is the number of available characters for the description.
-#: lib/applicationeditform.php:201
 #, php-format
 msgid "Describe your application in %d character"
 msgid_plural "Describe your application in %d characters"
@@ -7424,205 +6072,166 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:205
 msgid "Describe your application"
 msgstr ""
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:216
 msgid "URL of the homepage of this application"
 msgstr ""
 
 #. TRANS: Form input field label.
-#: lib/applicationeditform.php:218
 msgid "Source URL"
 msgstr ""
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:225
 msgid "Organization responsible for this application"
 msgstr ""
 
 #. TRANS: Form input field label.
-#: lib/applicationeditform.php:227
 msgid "Organization"
 msgstr "Organizazion"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:234
 msgid "URL for the homepage of the organization"
 msgstr ""
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:243
 msgid "URL to redirect to after authentication"
 msgstr ""
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:271
 msgid "Browser"
 msgstr ""
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:288
 msgid "Desktop"
 msgstr ""
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:290
 msgid "Type of application, browser or desktop"
 msgstr ""
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:314
 msgid "Read-only"
 msgstr ""
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:334
 msgid "Read-write"
 msgstr ""
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:336
 msgid "Default access for this application: read-only, or read-write"
 msgstr ""
 
 #. TRANS: Submit button title.
-#: lib/applicationeditform.php:353
 msgid "Cancel"
 msgstr "Scancele"
 
-#: lib/applicationlist.php:247
 msgid " by "
 msgstr " di "
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:260
 msgid "read-write"
 msgstr ""
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:262
 msgid "read-only"
 msgstr ""
 
 #. TRANS: Used in application list. %1$s is a modified date, %2$s is access type ("read-write" or "read-only")
-#: lib/applicationlist.php:268
 #, php-format
 msgid "Approved %1$s - \"%2$s\" access."
 msgstr ""
 
 #. TRANS: Access token in the application list.
 #. TRANS: %s are the first 7 characters of the access token.
-#: lib/applicationlist.php:282
 #, php-format
 msgid "Access token starting with: %s"
 msgstr ""
 
 #. TRANS: Button label
-#: lib/applicationlist.php:298
 msgctxt "BUTTON"
 msgid "Revoke"
 msgstr ""
 
-#: lib/atom10feed.php:113
 msgid "Author element must contain a name element."
 msgstr ""
 
 #. TRANS: Server exception thrown when using the method setActivitySubject() in the class Atom10Feed.
-#: lib/atom10feed.php:160
 msgid "Do not use this method!"
 msgstr ""
 
 #. TRANS: Title.
-#: lib/attachmentnoticesection.php:67
 msgid "Notices where this attachment appears"
 msgstr ""
 
 #. TRANS: Title.
-#: lib/attachmenttagcloudsection.php:48
 msgid "Tags for this attachment"
 msgstr ""
 
 #. TRANS: Exception thrown when a password change fails.
-#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:227
 msgid "Password changing failed."
 msgstr ""
 
 #. TRANS: Exception thrown when a password change attempt fails because it is not allowed.
-#: lib/authenticationplugin.php:238
 msgid "Password changing is not allowed."
 msgstr ""
 
 #. TRANS: Title for the form to block a user.
-#: lib/blockform.php:68
 msgid "Block"
 msgstr "Bloche"
 
 #. TRANS: Description of the form to block a user.
-#: lib/blockform.php:79
 msgid "Block this user"
 msgstr "Bloche chest utent"
 
 #. TRANS: Title for command results.
-#: lib/channel.php:104 lib/channel.php:125
 msgid "Command results"
 msgstr ""
 
 #. TRANS: Title for command results.
-#: lib/channel.php:138
 msgid "AJAX error"
 msgstr ""
 
 #. TRANS: E-mail subject when a command has completed.
-#: lib/channel.php:177 lib/mailhandler.php:143
 msgid "Command complete"
 msgstr ""
 
 #. TRANS: E-mail subject when a command has failed.
-#: lib/channel.php:188
 msgid "Command failed"
 msgstr ""
 
 #. TRANS: Command exception text shown when a notice ID is requested that does not exist.
-#: lib/command.php:82 lib/command.php:106
 msgid "Notice with that id does not exist."
 msgstr ""
 
 #. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
 #. TRANS: Error text shown when a last user notice is requested and it does not exist.
-#: lib/command.php:99 lib/command.php:642
 msgid "User has no last notice."
 msgstr ""
 
 #. TRANS: Message given requesting a profile for a non-existing user.
 #. TRANS: %s is the nickname of the user for which the profile could not be found.
-#: lib/command.php:128
 #, php-format
 msgid "Could not find a user with nickname %s."
 msgstr ""
 
 #. TRANS: Message given getting a non-existing user.
 #. TRANS: %s is the nickname of the user that could not be found.
-#: lib/command.php:148
 #, php-format
 msgid "Could not find a local user with nickname %s."
 msgstr ""
 
 #. TRANS: Error text shown when an unimplemented command is given.
-#: lib/command.php:183
 msgid "Sorry, this command is not yet implemented."
 msgstr ""
 
 #. TRANS: Command exception text shown when a user tries to nudge themselves.
-#: lib/command.php:229
 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr ""
 
 #. TRANS: Message given having nudged another user.
 #. TRANS: %s is the nickname of the user that was nudged.
-#: lib/command.php:238
 #, php-format
 msgid "Nudge sent to %s."
 msgstr ""
@@ -7631,7 +6240,6 @@ msgstr ""
 #. TRANS: %1$s is the number of other user the user is subscribed to.
 #. TRANS: %2$s is the number of users that are subscribed to the user.
 #. TRANS: %3$s is the number of notices the user has sent.
-#: lib/command.php:268
 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"
@@ -7643,39 +6251,33 @@ msgstr ""
 "Avîs: %3$s"
 
 #. TRANS: Error message text shown when a favorite could not be set because it has already been favorited.
-#: lib/command.php:298
 msgid "Could not create favorite: already favorited."
 msgstr ""
 
 #. TRANS: Text shown when a notice has been marked as favourite successfully.
-#: lib/command.php:324
 msgid "Notice marked as fave."
 msgstr ""
 
 #. TRANS: Message given having added a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:369
 #, php-format
 msgid "%1$s joined group %2$s."
 msgstr "%1$s si à unît al grup %2$s."
 
 #. TRANS: Message given having removed a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:417
 #, php-format
 msgid "%1$s left group %2$s."
 msgstr "%1$s al à lassât il grup %2$s."
 
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: lib/command.php:438
 #, php-format
 msgctxt "WHOIS"
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
 
 #. TRANS: Whois output. %s is the full name of the queried user.
-#: lib/command.php:442
 #, php-format
 msgid "Fullname: %s"
 msgstr "Non complet: %s"
@@ -7683,7 +6285,6 @@ msgstr "Non complet: %s"
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a location.
-#: lib/command.php:446 lib/mail.php:275
 #, php-format
 msgid "Location: %s"
 msgstr "Lûc: %s"
@@ -7691,20 +6292,17 @@ msgstr "Lûc: %s"
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a homepage.
-#: lib/command.php:450 lib/mail.php:279
 #, php-format
 msgid "Homepage: %s"
 msgstr "Pagjine web: %s"
 
 #. TRANS: Whois output. %s is the bio information of the queried user.
-#: lib/command.php:454
 #, php-format
 msgid "About: %s"
 msgstr "Informazions: %s"
 
 #. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).
 #. TRANS: %s is a remote profile.
-#: lib/command.php:483
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
@@ -7713,7 +6311,6 @@ msgstr ""
 
 #. TRANS: Message given if content is too long. %1$sd is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:500
 #, php-format
 msgid "Message too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
@@ -7724,26 +6321,26 @@ msgstr[1] ""
 "Il messaç al è masse lunc. Il massim a son %1$d caratars, tu tu'nd âs "
 "mandâts %2$d."
 
+#. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
+msgid "You can't send a message to this user."
+msgstr ""
+
 #. TRANS: Error text shown sending a direct message fails with an unknown reason.
-#: lib/command.php:528
 msgid "Error sending direct message."
 msgstr ""
 
 #. TRANS: Message given having repeated a notice from another user.
 #. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:565
 #, php-format
 msgid "Notice from %s repeated."
 msgstr "L'avîs di %s al è stât ripetût."
 
 #. TRANS: Error text shown when repeating a notice fails with an unknown reason.
-#: lib/command.php:568
 msgid "Error repeating notice."
 msgstr ""
 
 #. TRANS: Message given if content of a notice for a reply is too long. %1$d is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:603
 #, php-format
 msgid "Notice too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Notice too long - maximum is %1$d characters, you sent %2$d."
@@ -7756,100 +6353,83 @@ msgstr[1] ""
 
 #. TRANS: Text shown having sent a reply to a notice successfully.
 #. TRANS: %s is the nickname of the user of the notice the reply was sent to.
-#: lib/command.php:616
 #, php-format
 msgid "Reply to %s sent."
 msgstr "Rispueste a %s mandade."
 
 #. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
-#: lib/command.php:619
 msgid "Error saving notice."
 msgstr ""
 
 #. TRANS: Error text shown when no username was provided when issuing a subscribe command.
-#: lib/command.php:666
 msgid "Specify the name of the user to subscribe to."
 msgstr ""
 
 #. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
-#: lib/command.php:675
 msgid "Can't subscribe to OMB profiles by command."
 msgstr ""
 
 #. TRANS: Text shown after having subscribed to another user successfully.
 #. TRANS: %s is the name of the user the subscription was requested for.
-#: lib/command.php:683
 #, php-format
 msgid "Subscribed to %s."
 msgstr "Sotscrit a %s."
 
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.
-#: lib/command.php:704 lib/command.php:815
 msgid "Specify the name of the user to unsubscribe from."
 msgstr "Inserìs il non dal utent che no tu vuelis plui sotscrivilu."
 
 #. TRANS: Text shown after having unsubscribed from another user successfully.
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:715
 #, php-format
 msgid "Unsubscribed from %s."
 msgstr "No tu sês plui sotscrit a %s."
 
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
-#: lib/command.php:735 lib/command.php:761
 msgid "Command not yet implemented."
 msgstr ""
 
 #. TRANS: Text shown when issuing the command "off" successfully.
-#: lib/command.php:739
 msgid "Notification off."
 msgstr ""
 
 #. TRANS: Error text shown when the command "off" fails for an unknown reason.
-#: lib/command.php:742
 msgid "Can't turn off notification."
 msgstr ""
 
 #. TRANS: Text shown when issuing the command "on" successfully.
-#: lib/command.php:765
 msgid "Notification on."
 msgstr ""
 
 #. TRANS: Error text shown when the command "on" fails for an unknown reason.
-#: lib/command.php:768
 msgid "Can't turn on notification."
 msgstr ""
 
 #. TRANS: Error text shown when issuing the login command while login is disabled.
-#: lib/command.php:782
 msgid "Login command is disabled."
 msgstr ""
 
 #. TRANS: Text shown after issuing the login command successfully.
 #. TRANS: %s is a logon link..
-#: lib/command.php:795
 #, php-format
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
 
 #. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:824
 #, php-format
 msgid "Unsubscribed %s."
 msgstr ""
 
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
-#: lib/command.php:842
 msgid "You are not subscribed to anyone."
 msgstr "No tu sês sotscrit a nissun."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
-#: lib/command.php:847
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Tu sês sotscrit a cheste persone:"
@@ -7857,14 +6437,12 @@ msgstr[1] "Tu sês sotscrit a chestis personis:"
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user
 #. TRANS: (followers) without having any subscribers.
-#: lib/command.php:869
 msgid "No one is subscribed to you."
 msgstr "No tu âs nissun sotscritôr."
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
-#: lib/command.php:874
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Chest al è il tô sotscritôr:"
@@ -7872,21 +6450,18 @@ msgstr[1] "Chescj a son i tiei sotscritôrs:"
 
 #. TRANS: Text shown after requesting groups a user is subscribed to without having
 #. TRANS: any group subscriptions.
-#: lib/command.php:896
 msgid "You are not a member of any groups."
 msgstr "No tu sês part di nissun grup."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
-#: lib/command.php:901
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "Tu sês un membri di chest grup:"
 msgstr[1] "Tu sês un membri di chescj grups:"
 
 #. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-#: lib/command.php:916
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -7929,69 +6504,56 @@ msgid ""
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:36
 msgid "No configuration file found."
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:39
 msgid "I looked for configuration files in the following places:"
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:42
 msgid "You may wish to run the installer to fix this."
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:46
 msgid "Go to the installer."
 msgstr ""
 
-#: lib/dberroraction.php:59
 msgid "Database error"
 msgstr "Erôr de base di dâts"
 
 #. TRANS: Description of form for deleting a user.
-#: lib/deleteuserform.php:75
 msgid "Delete this user"
 msgstr "Elimine chest utent"
 
-#: lib/designform.php:114
 #, fuzzy
 msgid "Change design"
 msgstr "Cambie il teme"
 
 #. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: lib/designform.php:131
 msgid "Change colours"
 msgstr "Cambie i colôrs"
 
 #. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: lib/designform.php:138
 msgid "Use defaults"
 msgstr ""
 
 #. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: lib/designform.php:140
 msgid "Restore default designs"
 msgstr ""
 
 #. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: lib/designform.php:148
 msgid "Reset back to default"
 msgstr ""
 
 #. TRANS: Label in form on profile design page.
 #. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
-#: lib/designform.php:158
 msgid "Upload file"
 msgstr "Cjame sù un file"
 
 #. TRANS: Instructions for form on profile design page.
-#: lib/designform.php:163
 #, fuzzy
 msgid ""
 "You can upload your personal background image. The maximum file size is 2Mb."
@@ -7999,146 +6561,116 @@ msgstr ""
 "Tu puedis cjamâ un avatar personâl. La dimension massime dal file e je di %s."
 
 #. TRANS: Radio button on profile design page that will enable use of the uploaded profile image.
-#: lib/designform.php:194
 msgctxt "RADIO"
 msgid "On"
 msgstr "Ativade"
 
 #. TRANS: Radio button on profile design page that will disable use of the uploaded profile image.
-#: lib/designform.php:211
 msgctxt "RADIO"
 msgid "Off"
 msgstr "Disativade"
 
 #. TRANS: Title for button on profile design page to save settings.
-#: lib/designform.php:322
 msgid "Save design"
 msgstr ""
 
 #. TRANS: Error message displayed if design settings could not be saved.
 #. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
-#: lib/designsettings.php:216 lib/designsettings.php:238
 msgid "Couldn't update your design."
 msgstr ""
 
 #. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
-#: lib/designsettings.php:244
 msgid "Design defaults restored."
 msgstr ""
 
 #. TRANS: Exception. %s is an ID.
-#: lib/discovery.php:153
 #, php-format
 msgid "Unable to find services for %s."
 msgstr ""
 
 #. TRANS: Form legend for removing the favourite status for a favourite notice.
 #. TRANS: Title for button text for removing the favourite status for a favourite notice.
-#: lib/disfavorform.php:108 lib/disfavorform.php:140
 msgid "Disfavor this notice"
 msgstr "Gjave dai preferîts chest avîs"
 
 #. TRANS: Button text for removing the favourite status for a favourite notice.
-#: lib/disfavorform.php:136
 msgctxt "BUTTON"
 msgid "Disfavor favorite"
 msgstr "Gjave dai preferîts"
 
 #. TRANS: Form legend for adding the favourite status to a notice.
 #. TRANS: Title for button text for adding the favourite status to a notice.
-#: lib/favorform.php:108 lib/favorform.php:139
 msgid "Favor this notice"
 msgstr "Preferìs chest avîs"
 
 #. TRANS: Button text for adding the favourite status to a notice.
-#: lib/favorform.php:135
 msgctxt "BUTTON"
 msgid "Favor"
 msgstr "Preferìs"
 
-#: lib/feed.php:84
 msgid "RSS 1.0"
 msgstr "RSS 1.0"
 
-#: lib/feed.php:86
 msgid "RSS 2.0"
 msgstr "RSS 2.0"
 
-#: lib/feed.php:88
 msgid "Atom"
 msgstr "Atom"
 
-#: lib/feed.php:90
 msgid "FOAF"
 msgstr "FOAF"
 
-#: lib/feedimporter.php:75
 msgid "Not an atom feed."
 msgstr ""
 
-#: lib/feedimporter.php:82
 msgid "No author in the feed."
 msgstr ""
 
-#: lib/feedimporter.php:89
 msgid "Can't import without a user."
 msgstr ""
 
 #. TRANS: Header for feed links (h2).
-#: lib/feedlist.php:66
 msgid "Feeds"
 msgstr "Canâi"
 
-#: lib/galleryaction.php:128
 msgid "All"
 msgstr "Ducj"
 
-#: lib/galleryaction.php:136
 msgid "Select tag to filter"
 msgstr "Sielç la etichete di filtrâ"
 
-#: lib/galleryaction.php:137
 msgid "Tag"
 msgstr "Etichete"
 
-#: lib/galleryaction.php:138
 msgid "Choose a tag to narrow list"
 msgstr "Sielç une etichete par scurtâ la liste"
 
-#: lib/galleryaction.php:140
 msgid "Go"
 msgstr "Va"
 
-#: lib/grantroleform.php:91
 #, php-format
 msgid "Grant this user the \"%s\" role"
 msgstr ""
 
-#: lib/groupeditform.php:147
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr ""
 
-#: lib/groupeditform.php:156
 msgid "URL of the homepage or blog of the group or topic."
 msgstr "URL de pagjine web o blog dal grup o dal argoment."
 
-#: lib/groupeditform.php:161
 msgid "Describe the group or topic"
 msgstr "Descrîf il grup o l'argoment"
 
-#: lib/groupeditform.php:163
 #, php-format
 msgid "Describe the group or topic in %d character or less"
 msgid_plural "Describe the group or topic in %d characters or less"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/groupeditform.php:175
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\"."
 msgstr "Lûc dal grup, se al esist, come \"Citât, Regjon, Stât\"."
 
-#: lib/groupeditform.php:183
 #, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -8150,70 +6682,60 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Menu item in the group navigation page.
-#: lib/groupnav.php:86
 msgctxt "MENU"
 msgid "Group"
 msgstr "Grup"
 
 #. TRANS: Tooltip for menu item in the group navigation page.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:89
 #, php-format
 msgctxt "TOOLTIP"
 msgid "%s group"
 msgstr "Grup %s"
 
 #. TRANS: Menu item in the group navigation page.
-#: lib/groupnav.php:95
 msgctxt "MENU"
 msgid "Members"
 msgstr "Membris"
 
 #. TRANS: Tooltip for menu item in the group navigation page.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:98
 #, php-format
 msgctxt "TOOLTIP"
 msgid "%s group members"
 msgstr "Membris dal grup %s"
 
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/groupnav.php:108
 msgctxt "MENU"
 msgid "Blocked"
 msgstr "Blocâts"
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:111
 #, php-format
 msgctxt "TOOLTIP"
 msgid "%s blocked users"
 msgstr "Utents blocâts in %s"
 
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "Aministradôr"
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:120
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Edit %s group properties"
 msgstr "Cambie lis propietâts dal grup %s"
 
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/groupnav.php:126
 msgctxt "MENU"
 msgid "Logo"
 msgstr ""
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:129
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Add or edit %s logo"
@@ -8221,69 +6743,57 @@ msgstr ""
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:138
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Add or edit %s design"
 msgstr ""
 
 #. TRANS: Title for groups with the most members section.
-#: lib/groupsbymemberssection.php:71
 msgid "Groups with most members"
 msgstr "Grups cun plui membris"
 
 #. TRANS: Title for groups with the most posts section.
-#: lib/groupsbypostssection.php:71
 msgid "Groups with most posts"
 msgstr "Grups cun plui messaçs"
 
 #. TRANS: Title for group tag cloud section.
 #. TRANS: %s is a group name.
-#: lib/grouptagcloudsection.php:57
 #, php-format
 msgid "Tags in %s group's notices"
 msgstr "Etichetis dai avîs dal grup %s"
 
 #. TRANS: Client exception 406
-#: lib/htmloutputter.php:104
 msgid "This page is not available in a media type you accept"
 msgstr ""
 
 #. TRANS: Exception thrown when trying to upload an unsupported image file format.
-#: lib/imagefile.php:73
 msgid "Unsupported image file format."
 msgstr ""
 
 #. TRANS: Exception thrown when too large a file is uploaded.
 #. TRANS: %s is the maximum file size, for example "500b", "10kB" or "2MB".
-#: lib/imagefile.php:91
 #, php-format
 msgid "That file is too big. The maximum file size is %s."
 msgstr ""
 
 #. TRANS: Exception thrown when uploading an image and that action could not be completed.
-#: lib/imagefile.php:97
 msgid "Partial upload."
 msgstr ""
 
 #. TRANS: Exception thrown when uploading a file as image that is not an image or is a corrupt file.
-#: lib/imagefile.php:115
 msgid "Not an image or corrupt file."
 msgstr ""
 
 #. TRANS: Exception thrown during resize when image has been registered as present, but is no longer there.
-#: lib/imagefile.php:178
 msgid "Lost our file."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to resize an unknown file type.
 #. TRANS: Exception thrown when trying resize an unknown file type.
-#: lib/imagefile.php:216 lib/imagefile.php:257
 msgid "Unknown file type"
 msgstr ""
 
 #. TRANS: Number of megabytes. %d is the number.
-#: lib/imagefile.php:303
 #, php-format
 msgid "%dMB"
 msgid_plural "%dMB"
@@ -8291,7 +6801,6 @@ msgstr[0] "%dMB"
 msgstr[1] "%dMB"
 
 #. TRANS: Number of kilobytes. %d is the number.
-#: lib/imagefile.php:307
 #, php-format
 msgid "%dkB"
 msgid_plural "%dkB"
@@ -8299,14 +6808,12 @@ msgstr[0] "%dkB"
 msgstr[1] "%dkB"
 
 #. TRANS: Number of bytes. %d is the number.
-#: lib/imagefile.php:310
 #, php-format
 msgid "%dB"
 msgid_plural "%dB"
 msgstr[0] "%dB"
 msgstr[1] "%dB"
 
-#: lib/implugin.php:262
 #, php-format
 msgid ""
 "User \"%s\" on %s has said that your %s screenname belongs to them. If "
@@ -8316,53 +6823,44 @@ msgid ""
 "message."
 msgstr ""
 
-#: lib/implugin.php:349
 #, php-format
 msgid "Unknown inbox source %d."
 msgstr ""
 
-#: lib/implugin.php:485
 #, fuzzy, php-format
 msgid "Message too long - maximum is %1$d characters, you sent %2$d."
 msgstr ""
 "Il messaç al è masse lunc. Il massim al è %1$d caratar, tu tu'nd âs mandâts %"
 "2$d."
 
-#: lib/leaveform.php:114
 msgid "Leave"
 msgstr "Lasse"
 
 #. TRANS: Menu item for logging in to the StatusNet site.
-#: lib/logingroupnav.php:77
 msgctxt "MENU"
 msgid "Login"
 msgstr "Jentre"
 
 #. TRANS: Title for menu item for logging in to the StatusNet site.
-#: lib/logingroupnav.php:79
 msgid "Login with a username and password"
 msgstr "Jentre cun non utent e password"
 
 #. TRANS: Menu item for registering with the StatusNet site.
-#: lib/logingroupnav.php:85
 msgctxt "MENU"
 msgid "Register"
 msgstr "Regjistriti"
 
 #. TRANS: Title for menu item for registering with the StatusNet site.
-#: lib/logingroupnav.php:87
 msgid "Sign up for a new account"
 msgstr "Regjistre une gnove identitât"
 
 #. TRANS: Subject for address confirmation email.
-#: lib/mail.php:172
 msgid "Email address confirmation"
 msgstr "Conferme de direzion di pueste eletroniche"
 
 #. TRANS: Body for address confirmation email.
 #. TRANS: %1$s is the addressed user's nickname, %2$s is the StatusNet sitename,
 #. TRANS: %3$s is the URL to confirm at.
-#: lib/mail.php:177
 #, php-format
 msgid ""
 "Hey, %1$s.\n"
@@ -8381,14 +6879,12 @@ msgstr ""
 
 #. TRANS: Subject of new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
-#: lib/mail.php:243
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr ""
 
 #. TRANS: This is a paragraph in a new-subscriber e-mail.
 #. TRANS: %s is a URL where the subscriber can be reported as abusive.
-#: lib/mail.php:250
 #, php-format
 msgid ""
 "If you believe this account is being used abusively, you can block them from "
@@ -8400,7 +6896,6 @@ msgstr ""
 #. TRANS: %3$s is the subscriber's profile URL, %4$s is the subscriber's location (or empty)
 #. TRANS: %5$s is the subscriber's homepage URL (or empty), %6%s is the subscriber's bio (or empty)
 #. TRANS: %7$s is a link to the addressed user's e-mail settings.
-#: lib/mail.php:260
 #, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -8417,14 +6912,12 @@ msgstr ""
 
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is biographical information.
-#: lib/mail.php:283
 #, php-format
 msgid "Bio: %s"
 msgstr "Biografie: %s"
 
 #. TRANS: Subject of notification mail for new posting email address.
 #. TRANS: %s is the StatusNet sitename.
-#: lib/mail.php:312
 #, php-format
 msgid "New email address for posting to %s"
 msgstr ""
@@ -8432,7 +6925,6 @@ msgstr ""
 #. TRANS: Body of notification mail for new posting email address.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is the e-mail address to send
 #. TRANS: to to post by e-mail, %3$s is a URL to more instructions.
-#: lib/mail.php:318
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -8447,26 +6939,22 @@ msgstr ""
 
 #. TRANS: Subject line for SMS-by-email notification messages.
 #. TRANS: %s is the posting user's nickname.
-#: lib/mail.php:439
 #, php-format
 msgid "%s status"
 msgstr "stât di %s"
 
 #. TRANS: Subject line for SMS-by-email address confirmation message.
-#: lib/mail.php:465
 msgid "SMS confirmation"
 msgstr ""
 
 #. TRANS: Main body heading for SMS-by-email address confirmation message.
 #. TRANS: %s is the addressed user's nickname.
-#: lib/mail.php:469
 #, php-format
 msgid "%s: confirm you own this phone number with this code:"
 msgstr ""
 
 #. TRANS: Subject for 'nudge' notification email.
 #. TRANS: %s is the nudging user.
-#: lib/mail.php:490
 #, php-format
 msgid "You have been nudged by %s"
 msgstr ""
@@ -8474,7 +6962,6 @@ msgstr ""
 #. TRANS: Body for 'nudge' notification email.
 #. TRANS: %1$s is the nuding user's long name, $2$s is the nudging user's nickname,
 #. TRANS: %3$s is a URL to post notices at, %4$s is the StatusNet sitename.
-#: lib/mail.php:497
 #, php-format
 msgid ""
 "%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -8492,7 +6979,6 @@ msgstr ""
 
 #. TRANS: Subject for direct-message notification email.
 #. TRANS: %s is the sending user's nickname.
-#: lib/mail.php:544
 #, php-format
 msgid "New private message from %s"
 msgstr "Gnûf messaç privât di %s"
@@ -8501,7 +6987,6 @@ msgstr "Gnûf messaç privât di %s"
 #. TRANS: %1$s is the sending user's long name, %2$s is the sending user's nickname,
 #. TRANS: %3$s is the message content, %4$s a URL to the message,
 #. TRANS: %5$s is the StatusNet sitename.
-#: lib/mail.php:552
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -8522,7 +7007,6 @@ msgstr ""
 
 #. TRANS: Subject for favorite notification e-mail.
 #. TRANS: %1$s is the adding user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:604
 #, php-format
 msgid "%1$s (@%2$s) added your notice as a favorite"
 msgstr ""
@@ -8532,7 +7016,6 @@ msgstr ""
 #. TRANS: %3$s is a URL to the faved notice, %4$s is the faved notice text,
 #. TRANS: %5$s is a URL to all faves of the adding user, %6$s is the StatusNet sitename,
 #. TRANS: %7$s is the adding user's nickname.
-#: lib/mail.php:611
 #, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -8554,7 +7037,6 @@ msgid ""
 msgstr ""
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:669
 #, php-format
 msgid ""
 "The full conversation can be read here:\n"
@@ -8564,7 +7046,6 @@ msgstr ""
 
 #. TRANS: E-mail subject for notice notification.
 #. TRANS: %1$s is the sending user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:677
 #, php-format
 msgid "%1$s (@%2$s) sent a notice to your attention"
 msgstr ""
@@ -8575,7 +7056,6 @@ msgstr ""
 #. TRANS: %5$s is a URL to the full conversion if it exists (otherwise empty),
 #. TRANS: %6$s is a URL to reply to the notice, %7$s is a URL to all @-replied for the addressed user,
 #. TRANS: %8$s is a URL to the addressed user's e-mail settings, %9$s is the sender's nickname.
-#: lib/mail.php:685
 #, php-format
 msgid ""
 "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -8602,63 +7082,51 @@ msgid ""
 "P.S. You can turn off these email notifications here: %8$s\n"
 msgstr ""
 
-#: lib/mailbox.php:87
 msgid "Only the user can read their own mailboxes."
 msgstr ""
 
-#: lib/mailbox.php:125
 msgid ""
 "You have no private messages. You can send private message to engage other "
 "users in conversation. People can send you messages for your eyes only."
 msgstr ""
 
-#: lib/mailhandler.php:37
 msgid "Could not parse message."
 msgstr ""
 
-#: lib/mailhandler.php:42
 msgid "Not a registered user."
 msgstr ""
 
-#: lib/mailhandler.php:46
 msgid "Sorry, that is not your incoming email address."
 msgstr ""
 
-#: lib/mailhandler.php:50
 msgid "Sorry, no incoming email allowed."
 msgstr ""
 
-#: lib/mailhandler.php:229
 #, php-format
 msgid "Unsupported message type: %s"
 msgstr ""
 
 #. TRANS: Client exception thrown when a database error was thrown during a file upload operation.
-#: lib/mediafile.php:102 lib/mediafile.php:174
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
 
 #. TRANS: Client exception thrown when a file upload operation would cause a user to exceed a set quota.
-#: lib/mediafile.php:238 lib/mediafile.php:281
 msgid "File exceeds user's quota."
 msgstr ""
 
 #. TRANS: Client exception thrown when a file upload operation fails because the file could
 #. TRANS: not be moved from the temporary folder to the permanent file location.
-#: lib/mediafile.php:258 lib/mediafile.php:300
 msgid "File could not be moved to destination directory."
 msgstr ""
 
 #. TRANS: Client exception thrown when a file upload operation has been stopped because the MIME
 #. TRANS: type of the uploaded file could not be determined.
-#: lib/mediafile.php:265 lib/mediafile.php:306
 msgid "Could not determine file's MIME type."
 msgstr ""
 
 #. TRANS: Client exception thrown trying to upload a forbidden MIME type.
 #. TRANS: %1$s is the file type that was denied, %2$s is the application part of
 #. TRANS: the MIME type that was denied.
-#: lib/mediafile.php:396
 #, php-format
 msgid ""
 "\"%1$s\" is not a supported file type on this server. Try using another %2$s "
@@ -8667,496 +7135,391 @@ msgstr ""
 
 #. TRANS: Client exception thrown trying to upload a forbidden MIME type.
 #. TRANS: %s is the file type that was denied.
-#: lib/mediafile.php:401
 #, php-format
 msgid "\"%s\" is not a supported file type on this server."
 msgstr ""
 
-#: lib/messageform.php:120
 msgid "Send a direct notice"
 msgstr ""
 
 #. TRANS Label entry in drop-down selection box in direct-message inbox/outbox. This is the default entry in the drop-down box, doubling as instructions and a brake against accidental submissions with the first user in the list.
-#: lib/messageform.php:137
 msgid "Select recipient:"
 msgstr ""
 
 #. TRANS Entry in drop-down selection box in direct-message inbox/outbox when no one is available to message.
-#: lib/messageform.php:150
 msgid "No mutual subscribers."
 msgstr ""
 
-#: lib/messageform.php:153
 msgid "To"
 msgstr "A"
 
-#: lib/messageform.php:184 lib/noticeform.php:236
 msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr "Mande"
 
-#: lib/messagelist.php:77
 msgid "Messages"
 msgstr "Messaçs"
 
-#: lib/messagelistitem.php:123 lib/noticelist.php:527
 msgid "from"
 msgstr "di"
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:178
 msgid "Nickname cannot be empty."
 msgstr ""
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:191
 #, php-format
 msgid "Nickname cannot be more than %d character long."
 msgid_plural "Nickname cannot be more than %d characters long."
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/noticeform.php:160
+#. TRANS: Form legend for notice form.
 msgid "Send a notice"
 msgstr "Mande un avîs"
 
-#: lib/noticeform.php:174
+#. TRANS: Title for notice label. %s is the user's nickname.
 #, php-format
 msgid "What's up, %s?"
 msgstr "Ce sucedial, %s?"
 
-#: lib/noticeform.php:193
+#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr "Aleghe"
 
-#: lib/noticeform.php:197
-msgid "Attach a file"
+#. TRANS: Title for input field to attach a file to a notice.
+#, fuzzy
+msgid "Attach a file."
 msgstr "Aleghe un file"
 
-#: lib/noticeform.php:212
+#. TRANS: Field label to add location to a notice.
 msgid "Share my location"
 msgstr "Condivît il lûc dulà che mi cjati"
 
-#: lib/noticeform.php:215
+#. TRANS: Text to not share location for a notice in notice form.
 msgid "Do not share my location"
 msgstr "No stâ condividi il lûc dulà che mi cjati"
 
-#: lib/noticeform.php:216
+#. TRANS: Timeout error text for location retrieval in notice form.
 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
 "try again later"
 msgstr ""
 
 #. TRANS: Used in coordinates as abbreviation of north
-#: lib/noticelist.php:457
 msgid "N"
 msgstr "N"
 
 #. TRANS: Used in coordinates as abbreviation of south
-#: lib/noticelist.php:459
 msgid "S"
 msgstr "S"
 
 #. TRANS: Used in coordinates as abbreviation of east
-#: lib/noticelist.php:461
 msgid "E"
 msgstr "E"
 
 #. TRANS: Used in coordinates as abbreviation of west
-#: lib/noticelist.php:463
 msgid "W"
 msgstr "O"
 
-#: lib/noticelist.php:465
 #, php-format
 msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgstr ""
 
-#: lib/noticelist.php:474
 msgid "at"
 msgstr "lì di"
 
-#: lib/noticelist.php:523
 msgid "web"
 msgstr "web"
 
-#: lib/noticelist.php:589
 msgid "in context"
 msgstr ""
 
-#: lib/noticelist.php:624
 msgid "Repeated by"
 msgstr "Ripetût di"
 
-#: lib/noticelist.php:651
 msgid "Reply to this notice"
 msgstr "Rispuint a chest avîs"
 
-#: lib/noticelist.php:652
 msgid "Reply"
 msgstr "Rispuint"
 
-#: lib/noticelist.php:678
 msgid "Delete this notice"
 msgstr "Elimine chest avîs"
 
-#: lib/noticelist.php:696
 msgid "Notice repeated"
 msgstr "Avîs ripetût"
 
-#: lib/nudgeform.php:116
 msgid "Nudge this user"
 msgstr ""
 
-#: lib/nudgeform.php:128
 msgid "Nudge"
 msgstr ""
 
-#: lib/nudgeform.php:128
 msgid "Send a nudge to this user"
 msgstr ""
 
-#: lib/oauthstore.php:294
 msgid "Error inserting new profile."
 msgstr ""
 
-#: lib/oauthstore.php:302
 msgid "Error inserting avatar."
 msgstr ""
 
-#: lib/oauthstore.php:322
 msgid "Error inserting remote profile."
 msgstr ""
 
 #. TRANS: Exception thrown when a notice is denied because it has been sent before.
-#: lib/oauthstore.php:362
 msgid "Duplicate notice."
 msgstr ""
 
-#: lib/oauthstore.php:507
 msgid "Couldn't insert new subscription."
 msgstr ""
 
-#: lib/personalgroupnav.php:104
 #, fuzzy
 msgid "Replies"
 msgstr "Rispuestis"
 
-#: lib/personalgroupnav.php:109
 #, fuzzy
 msgid "Favorites"
 msgstr "Preferîts"
 
-#: lib/personalgroupnav.php:120
 msgid "Inbox"
 msgstr ""
 
-#: lib/personalgroupnav.php:121
 msgid "Your incoming messages"
 msgstr ""
 
-#: lib/personalgroupnav.php:125
 #, fuzzy
 msgid "Outbox"
 msgstr "Pueste in jessude par %s"
 
-#: lib/personalgroupnav.php:126
 msgid "Your sent messages"
 msgstr ""
 
 #. TRANS: Title for personal tag cloud section. %s is a user nickname.
-#: lib/personaltagcloudsection.php:56
 #, php-format
 msgid "Tags in %s's notices"
 msgstr "Etichetis dai avîs di %s"
 
 #. TRANS: Displayed as version information for a plugin if no version information was found.
-#: lib/plugin.php:126
 msgid "Unknown"
 msgstr ""
 
 #. TRANS: Plugin admin panel controls
-#: lib/plugindisableform.php:90
 msgctxt "plugin"
 msgid "Disable"
 msgstr ""
 
 #. TRANS: Plugin admin panel controls
-#: lib/pluginenableform.php:112
 msgctxt "plugin"
 msgid "Enable"
 msgstr ""
 
-#: lib/pluginlist.php:196
 msgctxt "plugin-description"
 msgid "(Plugin descriptions unavailable when disabled.)"
 msgstr ""
 
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:88
 msgid "Subscriptions"
 msgstr "Sotscrizions"
 
 #. TRANS: Text for user subscription statistics if user has more subscriptions than displayed.
-#: lib/profileaction.php:144
 msgid "All subscriptions"
 msgstr "Dutis lis sotscrizions"
 
 #. TRANS: H2 text for user subscriber statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:96
 msgid "Subscribers"
 msgstr "Sotscritôrs"
 
 #. TRANS: Text for user subscription statistics if user has more subscribers than displayed.
-#: lib/profileaction.php:181
 msgid "All subscribers"
 msgstr "Ducj i sotscritôrs"
 
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:213
 msgid "User ID"
 msgstr "ID utent"
 
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:219
 msgid "Member since"
 msgstr "Membri dai"
 
 #. TRANS: Label for user statistics.
 #. TRANS: H2 text for user group membership statistics.
-#: lib/profileaction.php:239 lib/profileaction.php:290
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:104
 msgid "Groups"
 msgstr "Grups"
 
 #. TRANS: Label for user statistics.
 #. TRANS: Average count of posts made per day since account registration.
-#: lib/profileaction.php:253
 msgid "Daily average"
 msgstr "Medie zornaliere"
 
 #. TRANS: Text for user group membership statistics if user has more subscriptions than displayed.
-#: lib/profileaction.php:305
 msgid "All groups"
 msgstr "Ducj i grups"
 
 #. TRANS: Server error displayed when using an unimplemented method.
-#: lib/profileformaction.php:123
 msgid "Unimplemented method."
 msgstr ""
 
-#: lib/publicgroupnav.php:82
 msgid "User groups"
 msgstr "Grups di utents"
 
-#: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
 msgid "Recent tags"
 msgstr "Etichetis recentis"
 
-#: lib/publicgroupnav.php:88
 msgid "Featured"
 msgstr "In vitrine"
 
-#: lib/publicgroupnav.php:92
 msgid "Popular"
 msgstr "Popolâr"
 
-#: lib/redirectingaction.php:95
 msgid "No return-to arguments."
 msgstr ""
 
-#: lib/repeatform.php:107
 msgid "Repeat this notice?"
 msgstr "Vuelistu ripeti chest avîs?"
 
-#: lib/repeatform.php:132
 msgid "Yes"
 msgstr "Sì"
 
-#: lib/repeatform.php:132
 msgid "Repeat this notice"
 msgstr "Ripet chest avîs"
 
-#: lib/revokeroleform.php:91
 #, php-format
 msgid "Revoke the \"%s\" role from this user"
 msgstr ""
 
 #. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:1001
 msgid "Page not found."
 msgstr ""
 
-#: lib/sandboxform.php:67
 msgid "Sandbox"
 msgstr ""
 
-#: lib/sandboxform.php:78
 msgid "Sandbox this user"
 msgstr ""
 
 #. TRANS: Fieldset legend for the search form.
-#: lib/searchaction.php:120
 msgid "Search site"
 msgstr "Cîr tal sît"
 
 #. TRANS: Used as a field label for the field where one or more keywords
 #. TRANS: for searching can be entered.
-#: lib/searchaction.php:128
 msgid "Keyword(s)"
 msgstr ""
 
 #. TRANS: Button text for searching site.
-#: lib/searchaction.php:130
 msgctxt "BUTTON"
 msgid "Search"
 msgstr "Cîr"
 
-#: lib/searchgroupnav.php:80
 msgid "People"
 msgstr "Int"
 
-#: lib/searchgroupnav.php:81
 msgid "Find people on this site"
 msgstr "Cjate int in chest sît"
 
-#: lib/searchgroupnav.php:83
 msgid "Find content of notices"
 msgstr ""
 
-#: lib/searchgroupnav.php:85
 msgid "Find groups on this site"
 msgstr ""
 
-#: lib/section.php:89
 msgid "Untitled section"
 msgstr ""
 
-#: lib/section.php:106
 msgid "More..."
 msgstr "Plui..."
 
-#: lib/settingsnav.php:78
 msgid "Change your profile settings"
 msgstr "Cambie lis impuestazions dal to profîl"
 
-#: lib/settingsnav.php:83
 msgid "Upload an avatar"
 msgstr "Cjame un avatar"
 
-#: lib/settingsnav.php:88
 msgid "Change your password"
 msgstr "Cambie la tô password"
 
-#: lib/settingsnav.php:93
 msgid "Change email handling"
 msgstr "Cambie la gjestion de pueste eletroniche"
 
-#: lib/settingsnav.php:98
 msgid "Design your profile"
 msgstr ""
 
-#: lib/settingsnav.php:102
 msgid "URL"
 msgstr "URL"
 
-#: lib/settingsnav.php:103
 msgid "URL shorteners"
 msgstr ""
 
-#: lib/settingsnav.php:111
 msgid "Updates by instant messenger (IM)"
 msgstr "Inzornaments par mieç di messaçs istantaniis (IM)"
 
-#: lib/settingsnav.php:118
 msgid "Updates by SMS"
 msgstr "Inzornaments par mieç di SMS"
 
-#: lib/settingsnav.php:123
 #, fuzzy
 msgid "Connections"
 msgstr "Tabaiade"
 
-#: lib/settingsnav.php:124
 msgid "Authorized connected applications"
 msgstr ""
 
-#: lib/silenceform.php:67
 msgid "Silence"
 msgstr ""
 
-#: lib/silenceform.php:78
 msgid "Silence this user"
 msgstr ""
 
-#: lib/subgroupnav.php:89
 #, php-format
 msgid "People %s subscribes to"
 msgstr ""
 
-#: lib/subgroupnav.php:97
 #, php-format
 msgid "People subscribed to %s"
 msgstr ""
 
-#: lib/subgroupnav.php:105
 #, php-format
 msgid "Groups %s is a member of"
 msgstr "%s al fâs part di chescj grups"
 
-#: lib/subgroupnav.php:111
 msgid "Invite"
 msgstr "Invide"
 
-#: lib/subgroupnav.php:112
 #, php-format
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Invide amîs e compagns di lavôr a partecipâ a %s"
 
-#: lib/subscribeform.php:115 lib/subscribeform.php:139
 msgid "Subscribe to this user"
 msgstr "Sotscrivimi a chest utent"
 
-#: lib/subscriberspeopleselftagcloudsection.php:48
-#: lib/subscriptionspeopleselftagcloudsection.php:48
 msgid "People Tagcloud as self-tagged"
 msgstr ""
 
-#: lib/subscriberspeopletagcloudsection.php:48
-#: lib/subscriptionspeopletagcloudsection.php:48
 msgid "People Tagcloud as tagged"
 msgstr ""
 
-#: lib/tagcloudsection.php:56
 msgid "None"
 msgstr ""
 
 #. TRANS: Server exception displayed if a theme name was invalid.
-#: lib/theme.php:74
 msgid "Invalid theme name."
 msgstr ""
 
-#: lib/themeuploader.php:50
 msgid "This server cannot handle theme uploads without ZIP support."
 msgstr ""
 
-#: lib/themeuploader.php:58 lib/themeuploader.php:61
 msgid "The theme file is missing or the upload failed."
 msgstr ""
 
-#: lib/themeuploader.php:91 lib/themeuploader.php:102
-#: lib/themeuploader.php:279 lib/themeuploader.php:283
-#: lib/themeuploader.php:291 lib/themeuploader.php:298
 msgid "Failed saving theme."
 msgstr ""
 
-#: lib/themeuploader.php:147
 msgid "Invalid theme: bad directory structure."
 msgstr ""
 
-#: lib/themeuploader.php:166
 #, php-format
 msgid "Uploaded theme is too large; must be less than %d byte uncompressed."
 msgid_plural ""
@@ -9164,151 +7527,121 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/themeuploader.php:179
 msgid "Invalid theme archive: missing file css/display.css"
 msgstr ""
 
-#: lib/themeuploader.php:219
 msgid ""
 "Theme contains invalid file or folder name. Stick with ASCII letters, "
 "digits, underscore, and minus sign."
 msgstr ""
 
-#: lib/themeuploader.php:225
 msgid "Theme contains unsafe file extension names; may be unsafe."
 msgstr ""
 
-#: lib/themeuploader.php:242
 #, php-format
 msgid "Theme contains file of type '.%s', which is not allowed."
 msgstr ""
 
-#: lib/themeuploader.php:260
 msgid "Error opening theme archive."
 msgstr ""
 
-#: lib/threadednoticelist.php:270
-#, php-format
-msgid "Show all %d comment"
-msgid_plural "Show all %d comments"
-msgstr[0] ""
-msgstr[1] ""
+#, fuzzy, php-format
+msgid "Show %d reply"
+msgid_plural "Show all %d replies"
+msgstr[0] "Mostre di plui"
+msgstr[1] "Mostre di plui"
 
-#: lib/topposterssection.php:74
 msgid "Top posters"
 msgstr "Cui che al publiche di plui"
 
 #. TRANS: Title for the form to unblock a user.
-#: lib/unblockform.php:67
 msgctxt "TITLE"
 msgid "Unblock"
 msgstr ""
 
-#: lib/unsandboxform.php:69
 msgid "Unsandbox"
 msgstr ""
 
-#: lib/unsandboxform.php:80
 msgid "Unsandbox this user"
 msgstr ""
 
-#: lib/unsilenceform.php:67
 msgid "Unsilence"
 msgstr ""
 
-#: lib/unsilenceform.php:78
 msgid "Unsilence this user"
 msgstr ""
 
-#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
 msgid "Unsubscribe from this user"
 msgstr ""
 
-#: lib/unsubscribeform.php:137
 msgid "Unsubscribe"
 msgstr ""
 
 #. 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).
-#: lib/usernoprofileexception.php:60
 #, php-format
 msgid "User %1$s (%2$d) has no profile record."
 msgstr ""
 
-#: lib/userprofile.php:116
 msgid "Edit Avatar"
 msgstr "Modifiche l'avatar"
 
 #. TRANS: H2 for user actions in a profile.
 #. TRANS: H2 for entity actions in a profile.
-#: lib/userprofile.php:216 lib/userprofile.php:232
 msgid "User actions"
 msgstr "Azions dal utent"
 
 #. TRANS: Text shown in user profile of not yet compeltely deleted users.
-#: lib/userprofile.php:220
 msgid "User deletion in progress..."
 msgstr ""
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:248
 msgid "Edit profile settings"
 msgstr "Cambie lis impuestazions dal profîl"
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:250
 msgid "Edit"
 msgstr "Cambie"
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:274
 msgid "Send a direct message to this user"
 msgstr "Mande un messaç diret a chest utent"
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:276
 msgid "Message"
 msgstr "Messaç"
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:318
 msgid "Moderate"
 msgstr ""
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:357
 msgid "User role"
 msgstr "Rûl dal utent"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:360
 msgctxt "role"
 msgid "Administrator"
 msgstr "Aministradôr"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:362
 msgctxt "role"
 msgid "Moderator"
 msgstr "Moderatôr"
 
-#: lib/util.php:321
 #, fuzzy
 msgid "Not allowed to log in."
 msgstr "No tu sês jentrât."
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1337
 msgid "a few seconds ago"
 msgstr "cualchi secont indaûr"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1340
 msgid "about a minute ago"
 msgstr "cirche un minût indaûr"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1344
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
@@ -9316,12 +7649,10 @@ msgstr[0] "cirche un minût indaûr"
 msgstr[1] "cirche %d minûts indaûr"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1347
 msgid "about an hour ago"
 msgstr "cirche une ore indaûr"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1351
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
@@ -9329,12 +7660,10 @@ msgstr[0] "cirche une ore indaûr"
 msgstr[1] "cirche %d oris indaûr"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1354
 msgid "about a day ago"
 msgstr "cirche une zornade indaûr"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1358
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
@@ -9342,12 +7671,10 @@ msgstr[0] "cirche une zornade indaûr"
 msgstr[1] "cirche %d zornadis indaûr"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1361
 msgid "about a month ago"
 msgstr "cirche un mês indaûr"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1365
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
@@ -9355,127 +7682,41 @@ msgstr[0] "cirche un mês indaûr"
 msgstr[1] "cirche %d mês indaûr"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1368
 msgid "about a year ago"
 msgstr "cirche un an indaûr"
 
 #. TRANS: Web color exception thrown when a hexadecimal color code does not validate.
 #. TRANS: %s is the provided (invalid) color code.
-#: lib/webcolor.php:81 lib/webcolor.php:121
 #, php-format
 msgid "%s is not a valid color! Use 3 or 6 hex characters."
 msgstr ""
 
 #. TRANS: Exception.
-#: lib/xrd.php:63
 msgid "Invalid XML."
 msgstr ""
 
 #. TRANS: Exception.
-#: lib/xrd.php:68
 msgid "Invalid XML, missing XRD root."
 msgstr ""
 
 #. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
-#: scripts/restoreuser.php:62
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
 
-#~ msgid "Other settings"
-#~ msgstr "Altris impuestazions"
+#, fuzzy
+#~ msgid "Full name is too long (max 255 chars)."
+#~ msgstr "Il non complet al è masse lunc (max 255 caratars)."
 
-#~ msgid "Tag cloud"
-#~ msgstr "Nûl di etichetis"
+#, fuzzy
+#~ msgid "description is too long (max %d chars)."
+#~ msgstr "La descrizion e je masse lungje (massim %d caratar)."
 
-#~ msgid "Jabber"
-#~ msgstr "Jabber"
+#, fuzzy
+#~ msgid "Location is too long (max 255 chars)."
+#~ msgstr "Il lûc al è masse lunc (max 255 caratars)."
 
-#~ msgid "Photo"
-#~ msgstr "Foto"
-
-#~ msgid "Other options"
-#~ msgstr "Altris opzions"
-
-#~ msgid "Other"
-#~ msgstr "Altris"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Personal profile and friends timeline"
-#~ msgstr "Profîl personâl e ativitât dai amîs"
-
-#~ msgctxt "MENU"
-#~ msgid "Personal"
-#~ msgstr "Personâl"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Change your email, avatar, password, profile"
-#~ msgstr "Cambie la direzion di pueste, l'avatar, la password o il profîl"
-
-#~ msgid "Account"
-#~ msgstr "Identitât"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Invite friends and colleagues to join you on %s"
-#~ msgstr "Invide amîs e compagns di lavôr a partecipâ a %s"
-
-#~ msgctxt "MENU"
-#~ msgid "Invite"
-#~ msgstr "Invide"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Create an account"
-#~ msgstr "Cree une identitât"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Help me!"
-#~ msgstr "Judimi!"
-
-#~ msgctxt "MENU"
-#~ msgid "Help"
-#~ msgstr "Jutori"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Search for people or text"
-#~ msgstr "Cîr int o test"
-
-#~ msgid "Local views"
-#~ msgstr "Viodudis locâls"
-
-#~ msgid "StatusNet software license"
-#~ msgstr "Licence dal software StatusNet"
-
-#~ msgid "Site content license"
-#~ msgstr "Licence dal contignût dal sît"
-
-#~ msgid "Pagination"
-#~ msgstr "Paginazion"
-
-#~ msgid "Author"
-#~ msgstr "Autôr"
-
-#~ msgctxt "MENU"
-#~ msgid "SMS"
-#~ msgstr "SMS"
-
-#~ msgid "Filter tags"
-#~ msgstr "Filtre lis etichetis"
-
-#~ msgid "[%s]"
-#~ msgstr "[%s]"
-
-#~ msgctxt "MENU"
-#~ msgid "Profile"
-#~ msgstr "Profîl"
-
-#~ msgid "Search help"
-#~ msgstr "Jutori pe ricercje"
-
-#~ msgid "Message too long. Maximum is %1$d character, you sent %2$d."
-#~ msgid_plural "Message too long. Maximum is %1$d characters, you sent %2$d."
-#~ msgstr[0] ""
-#~ "Il messaç al masse lunc. Il massim al è %1$d caratar, tu tu'nd âs mandâts "
-#~ "%2$d."
-#~ msgstr[1] ""
-#~ "Il messaç al masse lunc. Il massim a son %1$d caratars, tu tu'nd âs "
-#~ "mandâts %2$d."
+#, fuzzy
+#~ msgctxt "BUTTON"
+#~ msgid "Comment"
+#~ msgstr "Contignût"
diff --git a/locale/gl/LC_MESSAGES/statusnet.po b/locale/gl/LC_MESSAGES/statusnet.po
index a81de11034..0f2762b236 100644
--- a/locale/gl/LC_MESSAGES/statusnet.po
+++ b/locale/gl/LC_MESSAGES/statusnet.po
@@ -12,67 +12,57 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:23+0000\n"
-"PO-Revision-Date: 2011-03-03 17:26:02+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:21+0000\n"
 "Language-Team: Galician <http://translatewiki.net/wiki/Portal:gl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: gl\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-02-25 23:49:23+0000\n"
+"X-POT-Import-Date: 2011-03-03 17:59:19+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
-#: actions/accessadminpanel.php:53 lib/adminpanelaction.php:363
 msgid "Access"
 msgstr "Acceso"
 
 #. TRANS: Page notice.
-#: actions/accessadminpanel.php:64
 msgid "Site access settings"
 msgstr "Configuración do acceso ao sitio"
 
 #. TRANS: Form legend for registration form.
-#: actions/accessadminpanel.php:151
 msgid "Registration"
 msgstr "Rexistro"
 
 #. TRANS: Checkbox instructions for admin setting "Private".
-#: actions/accessadminpanel.php:155
 msgid "Prohibit anonymous users (not logged in) from viewing site?"
 msgstr "Prohibir que os usuarios anónimos (sen sesión iniciada) vexan o sitio?"
 
 #. TRANS: Checkbox label for prohibiting anonymous users from viewing site.
-#: actions/accessadminpanel.php:157
 msgctxt "LABEL"
 msgid "Private"
 msgstr "Privado"
 
 #. TRANS: Checkbox instructions for admin setting "Invite only".
-#: actions/accessadminpanel.php:164
 msgid "Make registration invitation only."
 msgstr "Que o rexistro só se poida facer previa invitación."
 
 #. TRANS: Checkbox label for configuring site as invite only.
-#: actions/accessadminpanel.php:166
 msgid "Invite only"
 msgstr "Só por invitación"
 
 #. TRANS: Checkbox instructions for admin setting "Closed" (no new registrations).
-#: actions/accessadminpanel.php:173
 msgid "Disable new registrations."
 msgstr "Desactivar os novos rexistros."
 
 #. TRANS: Checkbox label for disabling new user registrations.
-#: actions/accessadminpanel.php:175
 msgid "Closed"
 msgstr "Pechado"
 
 #. TRANS: Title for button to save access settings in site admin panel.
-#: actions/accessadminpanel.php:191
 msgid "Save access settings"
 msgstr "Gardar a configuración de acceso"
 
@@ -80,6 +70,7 @@ msgstr "Gardar a configuración de acceso"
 #. TRANS: Button text for saving theme settings.
 #. TRANS: Button label to save e-mail preferences.
 #. TRANS: Button label to save IM preferences.
+#. TRANS: Button text in the license admin panel.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
 #. TRANS: Button text for saving site notice in admin panel.
@@ -89,21 +80,12 @@ msgstr "Gardar a configuración de acceso"
 #. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
 #. TRANS: Button text on profile design page to save settings.
-#: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
-#: actions/emailsettings.php:251 actions/imsettings.php:199
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:198
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:204
-#: actions/subscriptions.php:261 actions/urlsettings.php:152
-#: actions/useradminpanel.php:298 lib/applicationeditform.php:355
-#: lib/designform.php:320 lib/groupeditform.php:201
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Gardar"
 
 #. TRANS: Server error when page not found (404).
 #. TRANS: Server error when page not found (404)
-#: actions/all.php:68 actions/public.php:98 actions/replies.php:93
-#: actions/showfavorites.php:140 actions/tag.php:52
 msgid "No such page."
 msgstr "Esa páxina non existe."
 
@@ -122,6 +104,7 @@ msgstr "Esa páxina non existe."
 #. TRANS: Client error displayed when checking group membership for a non-existing user.
 #. TRANS: Client error displayed when trying to have a non-existing user join a group.
 #. TRANS: Client error displayed when trying to have a non-existing user leave a group.
+#. TRANS: Client error displayed when not providing a user or an invalid user.
 #. TRANS: Client error displayed when updating a status for a non-existing user.
 #. TRANS: Client error displayed when requesting a list of followers for a non-existing user.
 #. TRANS: Client error displayed when requesting most recent favourite notices by a user for a non-existing user.
@@ -134,6 +117,8 @@ msgstr "Esa páxina non existe."
 #. 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.
 #. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
@@ -141,33 +126,10 @@ msgstr "Esa páxina non existe."
 #. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when calling a profile action without specifying a user.
-#: actions/all.php:80 actions/allrss.php:69
-#: actions/apiaccountupdatedeliverydevice.php:110
-#: actions/apiaccountupdateprofile.php:103
-#: actions/apiaccountupdateprofilebackgroundimage.php:118
-#: actions/apiaccountupdateprofileimage.php:104 actions/apiatomservice.php:59
-#: actions/apiblockcreate.php:96 actions/apiblockdestroy.php:94
-#: actions/apidirectmessage.php:75 actions/apidirectmessagenew.php:72
-#: actions/apigroupcreate.php:111 actions/apigroupismember.php:89
-#: actions/apigroupjoin.php:98 actions/apigroupleave.php:98
-#: actions/apigrouplist.php:70 actions/apigroupprofileupdate.php:108
-#: actions/apistatusesupdate.php:230 actions/apisubscriptions.php:85
-#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:173
-#: actions/apitimelinehome.php:78 actions/apitimelinementions.php:77
-#: actions/apitimelineuser.php:79 actions/avatarbynickname.php:79
-#: actions/favoritesrss.php:72 actions/foaf.php:42 actions/foaf.php:61
-#: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116
-#: actions/otp.php:78 actions/remotesubscribe.php:144
-#: actions/remotesubscribe.php:153 actions/replies.php:73
-#: actions/repliesrss.php:38 actions/rsd.php:113 actions/showfavorites.php:106
-#: actions/userbyid.php:75 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/userxrd.php:59 actions/xrds.php:71 lib/command.php:509
-#: lib/galleryaction.php:59 lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Non existe tal usuario."
 
 #. TRANS: Page title. %1$s is user nickname, %2$d is page number
-#: actions/all.php:91
 #, php-format
 msgid "%1$s and friends, page %2$d"
 msgstr "%1$s e amigos, páxina %2$d"
@@ -176,33 +138,26 @@ msgstr "%1$s e amigos, páxina %2$d"
 #. TRANS: H1 text for page. %s is a user nickname.
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Timeline title for user and friends. %s is a user nickname.
-#: actions/all.php:94 actions/all.php:191 actions/allrss.php:117
-#: actions/apitimelinefriends.php:207 actions/apitimelinehome.php:113
-#: lib/personalgroupnav.php:100
 #, php-format
 msgid "%s and friends"
 msgstr "%s e amigos"
 
 #. TRANS: %s is user nickname.
-#: actions/all.php:108
 #, php-format
 msgid "Feed for friends of %s (RSS 1.0)"
 msgstr "Fonte de novas dos amigos de %s (RSS 1.0)"
 
 #. TRANS: %s is user nickname.
-#: actions/all.php:117
 #, php-format
 msgid "Feed for friends of %s (RSS 2.0)"
 msgstr "Fonte de novas dos amigos de %s (RSS 2.0)"
 
 #. TRANS: %s is user nickname.
-#: actions/all.php:126
 #, php-format
 msgid "Feed for friends of %s (Atom)"
 msgstr "Fonte de novas dos amigos de %s (Atom)"
 
 #. TRANS: Empty list message. %s is a user nickname.
-#: actions/all.php:139
 #, php-format
 msgid ""
 "This is the timeline for %s and friends but no one has posted anything yet."
@@ -211,7 +166,6 @@ msgstr ""
 
 #. TRANS: Encouragement displayed on logged in user's empty timeline.
 #. TRANS: This message contains Markdown links. Keep "](" together.
-#: actions/all.php:146
 #, php-format
 msgid ""
 "Try subscribing to more people, [join a group](%%action.groups%%) or post "
@@ -222,7 +176,6 @@ msgstr ""
 
 #. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@".
 #. TRANS: This message contains Markdown links. Keep "](" together.
-#: actions/all.php:150
 #, php-format
 msgid ""
 "You can try to [nudge %1$s](../%2$s) from their profile or [post something "
@@ -236,7 +189,6 @@ msgstr ""
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
 #. TRANS: Second sentence of empty message for anonymous users. %s is a user nickname.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:221
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -246,14 +198,11 @@ msgstr ""
 "un aceno a %s ou publicar unha nota dirixida a el ou ela?"
 
 #. TRANS: H1 text for page when viewing a list for self.
-#: actions/all.php:188
 msgid "You and friends"
 msgstr "Vostede e mailos seus amigos"
 
 #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
 #. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name.
-#: actions/allrss.php:122 actions/apitimelinefriends.php:213
-#: actions/apitimelinehome.php:119
 #, php-format
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr "Actualizacións de %1$s e amigos en %2$s!"
@@ -272,55 +221,20 @@ msgstr "Actualizacións de %1$s e amigos en %2$s!"
 #. TRANS: Client error displayed trying to execute an unknown API method checking group membership.
 #. TRANS: Client error displayed trying to execute an unknown API method listing the latest 20 groups.
 #. TRANS: Client error displayed trying to execute an unknown API method showing group membership.
+#. TRANS: Client error displayed when using an unsupported API format.
 #. TRANS: Client error displayed trying to execute an unknown API method showing a group.
 #. TRANS: Client error displayed trying to execute an unknown API method testing API connectivity.
 #. TRANS: Client error displayed trying to execute an unknown API method deleting a status.
 #. TRANS: Client error displayed when trying to handle an unknown API method.
-#: actions/apiaccountratelimitstatus.php:69
-#: actions/apiaccountupdatedeliverydevice.php:92
-#: actions/apiaccountupdateprofile.php:94
-#: actions/apiaccountupdateprofilebackgroundimage.php:92
-#: actions/apiaccountupdateprofilecolors.php:115
-#: actions/apiaccountverifycredentials.php:68 actions/apidirectmessage.php:157
-#: actions/apifavoritecreate.php:98 actions/apifavoritedestroy.php:98
-#: actions/apifriendshipscreate.php:99 actions/apifriendshipsdestroy.php:99
-#: actions/apifriendshipsshow.php:124 actions/apigroupcreate.php:138
-#: actions/apigroupismember.php:115 actions/apigroupjoin.php:151
-#: actions/apigroupleave.php:141 actions/apigrouplist.php:134
-#: actions/apigrouplistall.php:120 actions/apigroupmembership.php:105
-#: actions/apigroupprofileupdate.php:100 actions/apigroupprofileupdate.php:213
-#: actions/apigroupshow.php:114 actions/apihelptest.php:84
-#: actions/apistatusesdestroy.php:101 actions/apistatusesretweets.php:110
-#: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:139
-#: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
-#: actions/apitimelinefavorites.php:182 actions/apitimelinefriends.php:276
-#: actions/apitimelinegroup.php:148 actions/apitimelinehome.php:181
-#: actions/apitimelinementions.php:182 actions/apitimelinepublic.php:247
-#: actions/apitimelineretweetedtome.php:147
-#: actions/apitimelineretweetsofme.php:147 actions/apitimelinetag.php:165
-#: actions/apitimelineuser.php:217 actions/apiusershow.php:100
 msgid "API method not found."
 msgstr "Non se atopou o método da 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.
-#: actions/apiaccountupdatedeliverydevice.php:83
-#: actions/apiaccountupdateprofile.php:85
-#: actions/apiaccountupdateprofilebackgroundimage.php:83
-#: actions/apiaccountupdateprofilecolors.php:106
-#: actions/apiaccountupdateprofileimage.php:80 actions/apiblockcreate.php:87
-#: actions/apiblockdestroy.php:85 actions/apidirectmessagenew.php:107
-#: actions/apifavoritecreate.php:88 actions/apifavoritedestroy.php:88
-#: actions/apifriendshipscreate.php:89 actions/apifriendshipsdestroy.php:89
-#: actions/apigroupcreate.php:102 actions/apigroupjoin.php:89
-#: actions/apigroupleave.php:89 actions/apigroupprofileupdate.php:92
-#: actions/apimediaupload.php:66 actions/apistatusesretweet.php:63
-#: actions/apistatusesupdate.php:194
 msgid "This method requires a POST."
 msgstr "Este método require un POST."
 
 #. TRANS: Client error displayed when no valid device parameter is provided for a user's delivery device setting.
-#: actions/apiaccountupdatedeliverydevice.php:103
 msgid ""
 "You must specify a parameter named 'device' with a value of one of: sms, im, "
 "none."
@@ -335,10 +249,6 @@ msgstr ""
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
-#: actions/apiaccountupdatedeliverydevice.php:136
-#: actions/emailsettings.php:353 actions/emailsettings.php:499
-#: actions/profilesettings.php:323 actions/smssettings.php:300
-#: actions/smssettings.php:453 actions/urlsettings.php:211
 msgid "Could not update user."
 msgstr "Non se puido actualizar o usuario."
 
@@ -351,32 +261,17 @@ msgstr "Non se puido actualizar o usuario."
 #. TRANS: Server error displayed when requesting Friends of a Friend feed for a user for which the profile could not be found.
 #. TRANS: Server error displayed when trying to get a user hCard for a user without a profile.
 #. TRANS: Server error displayed when calling a profile action while the specified user does not have a profile.
-#: actions/apiaccountupdateprofile.php:111
-#: actions/apiaccountupdateprofilebackgroundimage.php:199
-#: actions/apiaccountupdateprofilecolors.php:183
-#: actions/apiaccountupdateprofileimage.php:131
-#: actions/apiuserprofileimage.php:88 actions/apiusershow.php:108
-#: actions/avatarbynickname.php:85 actions/foaf.php:69 actions/hcard.php:75
-#: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
-#: lib/profileaction.php:85
 msgid "User has no profile."
 msgstr "O usuario non ten perfil."
 
 #. TRANS: Server error displayed if a user profile could not be saved.
 #. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:419
 msgid "Could not save profile."
 msgstr "Non se puido gardar o perfil."
 
 #. TRANS: Client error displayed when the number of bytes in a POST request exceeds a limit.
 #. TRANS: %s is the number of bytes of the CONTENT_LENGTH.
 #. TRANS: Form validation error in design settings form. POST should remain untranslated.
-#: actions/apiaccountupdateprofilebackgroundimage.php:108
-#: actions/apiaccountupdateprofileimage.php:95 actions/apimediaupload.php:81
-#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
-#: actions/designadminpanel.php:120 actions/editapplication.php:121
-#: actions/newapplication.php:102 actions/newnotice.php:95
-#: lib/designsettings.php:110
 #, fuzzy, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s byte) due to its "
@@ -396,26 +291,15 @@ msgstr[1] ""
 #. TRANS: Client error displayed when a database error occurs inserting profile colours.
 #. TRANS: Client error displayed when a database error occurs updating profile colours.
 #. TRANS: Form validation error displayed when group design settings could not be saved because of an application issue.
-#: actions/apiaccountupdateprofilebackgroundimage.php:138
-#: actions/apiaccountupdateprofilebackgroundimage.php:149
-#: actions/apiaccountupdateprofilecolors.php:160
-#: actions/apiaccountupdateprofilecolors.php:171
-#: actions/groupdesignsettings.php:285 actions/groupdesignsettings.php:296
-#: actions/userdesignsettings.php:218 actions/userdesignsettings.php:228
-#: actions/userdesignsettings.php:270 actions/userdesignsettings.php:280
 msgid "Unable to save your design settings."
 msgstr "Non se puido gardar a súa configuración de deseño."
 
 #. TRANS: Error displayed when updating design settings fails.
 #. TRANS: Client error displayed when a database error occurs updating profile colours.
-#: actions/apiaccountupdateprofilebackgroundimage.php:191
-#: actions/apiaccountupdateprofilecolors.php:139
-#: actions/userdesignsettings.php:196
 msgid "Could not update your design."
 msgstr "Non se puido actualizar o seu deseño."
 
 #. TRANS: Title for Atom feed.
-#: actions/apiatomservice.php:85
 msgctxt "ATOM"
 msgid "Main"
 msgstr ""
@@ -424,9 +308,6 @@ msgstr ""
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Title in atom group notice feed. %s is a group name.
 #. TRANS: Title in atom user notice feed. %s is a user name.
-#: actions/apiatomservice.php:93 actions/grouprss.php:138
-#: actions/userrss.php:94 lib/atomgroupnoticefeed.php:63
-#: lib/atomusernoticefeed.php:88
 #, php-format
 msgid "%s timeline"
 msgstr "Liña do tempo de %s"
@@ -436,8 +317,6 @@ msgstr "Liña do tempo de %s"
 #. TRANS: %s is a user nickname.
 #. TRANS: Header for subscriptions overview for a user (first page).
 #. TRANS: %s is a user nickname.
-#: actions/apiatomservice.php:104 actions/atompubsubscriptionfeed.php:148
-#: actions/subscriptions.php:51
 #, php-format
 msgid "%s subscriptions"
 msgstr "%s subscricións"
@@ -445,58 +324,48 @@ msgstr "%s subscricións"
 #. TRANS: Title for Atom feed with a user's favorite notices. %s is a user nickname.
 #. TRANS: Title for Atom favorites feed.
 #. TRANS: %s is a user nickname.
-#: actions/apiatomservice.php:115 actions/atompubfavoritefeed.php:142
 #, fuzzy, php-format
 msgid "%s favorites"
 msgstr "Favoritas"
 
 #. TRANS: Title for Atom feed with a user's memberships. %s is a user nickname.
-#: actions/apiatomservice.php:126
 #, fuzzy, php-format
 msgid "%s memberships"
 msgstr "Membros do grupo %s"
 
 #. TRANS: Client error displayed when users try to block themselves.
-#: actions/apiblockcreate.php:105
 msgid "You cannot block yourself!"
 msgstr "Non pode bloquearse a si mesmo!"
 
 #. TRANS: Server error displayed when blocking a user has failed.
-#: actions/apiblockcreate.php:127
 msgid "Block user failed."
 msgstr "Non se puido bloquear o usuario."
 
 #. TRANS: Server error displayed when unblocking a user has failed.
-#: actions/apiblockdestroy.php:113
 msgid "Unblock user failed."
 msgstr "Non se puido desbloquear o usuario."
 
 #. TRANS: Title. %s is a user nickname.
-#: actions/apidirectmessage.php:88
 #, php-format
 msgid "Direct messages from %s"
 msgstr "Mensaxes directas de %s"
 
 #. TRANS: Subtitle. %s is a user nickname.
-#: actions/apidirectmessage.php:93
 #, php-format
 msgid "All the direct messages sent from %s"
 msgstr "Todas as mensaxes directas enviadas por %s"
 
 #. TRANS: Title. %s is a user nickname.
-#: actions/apidirectmessage.php:102
 #, php-format
 msgid "Direct messages to %s"
 msgstr "Mensaxes directas a %s"
 
 #. TRANS: Subtitle. %s is a user nickname.
-#: actions/apidirectmessage.php:107
 #, php-format
 msgid "All the direct messages sent to %s"
 msgstr "Todas as mensaxes directas enviadas a %s"
 
 #. TRANS: Client error displayed when no message text was submitted (406).
-#: actions/apidirectmessagenew.php:117
 msgid "No message text!"
 msgstr "A mensaxe non ten texto!"
 
@@ -504,7 +373,6 @@ msgstr "A mensaxe non ten texto!"
 #. TRANS: %d is the maximum number of characters for a message.
 #. TRANS: Form validation error displayed when message content is too long.
 #. TRANS: %d is the maximum number of characters for a message.
-#: actions/apidirectmessagenew.php:127 actions/newmessage.php:152
 #, fuzzy, php-format
 msgid "That's too long. Maximum message size is %d character."
 msgid_plural "That's too long. Maximum message size is %d characters."
@@ -514,19 +382,16 @@ msgstr[1] ""
 "Iso é longo de máis. A lonxitude máxima das mensaxes é de %d caracteres."
 
 #. TRANS: Client error displayed if a recipient user could not be found (403).
-#: actions/apidirectmessagenew.php:139
 msgid "Recipient user not found."
 msgstr "Non se atopou o destinatario."
 
 #. TRANS: Client error displayed trying to direct message another user who's not a friend (403).
-#: actions/apidirectmessagenew.php:144
 #, fuzzy
 msgid "Cannot send direct messages to users who aren't your friend."
 msgstr ""
 "Non pode enviar mensaxes directas a usuarios que non sexan amigos seus."
 
 #. TRANS: Client error displayed trying to direct message self (403).
-#: actions/apidirectmessagenew.php:154
 #, fuzzy
 msgid ""
 "Do not send a message to yourself; just say it to yourself quietly instead."
@@ -535,118 +400,98 @@ msgstr "Non se envíe unha mensaxe, limítese a pensar nela."
 #. 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.
 #. TRANS: Client error displayed trying to delete a status with an invalid ID.
-#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:108
-#: actions/apistatusesdestroy.php:121
 msgid "No status found with that ID."
 msgstr "Non se atopou ningún estado con esa ID."
 
 #. TRANS: Client error displayed when trying to mark a notice favourite that already is a favourite.
-#: actions/apifavoritecreate.php:120
 msgid "This status is already a favorite."
 msgstr "Este estado xa é dos favoritos."
 
 #. TRANS: Client error displayed when marking a notice as favourite fails.
 #. TRANS: Server error displayed when trying to mark a notice as favorite fails in the database.
 #. TRANS: Error message text shown when a favorite could not be set.
-#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:306
 msgid "Could not create favorite."
 msgstr "Non se puido crear o favorito."
 
 #. TRANS: Client error displayed when trying to remove a favourite that was not a favourite.
-#: actions/apifavoritedestroy.php:122
 msgid "That status is not a favorite."
 msgstr "Ese estado non é un dos favoritos."
 
 #. TRANS: Client error displayed when removing a favourite has failed.
 #. TRANS: Server error displayed when removing a favorite from the database fails.
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:90
 msgid "Could not delete favorite."
 msgstr "Non se puido eliminar o favorito."
 
 #. TRANS: Client error displayed when trying follow who's profile could not be found.
-#: actions/apifriendshipscreate.php:109
 msgid "Could not follow user: profile not found."
 msgstr "Non se puido seguir o usuario: non se atopou."
 
 #. TRANS: Client error displayed when trying to follow a user that's already being followed.
 #. TRANS: %s is the nickname of the user that is already being followed.
-#: actions/apifriendshipscreate.php:120
 #, php-format
 msgid "Could not follow user: %s is already on your list."
 msgstr "Non se puido seguir o usuario: %s xa está na súa lista."
 
 #. TRANS: Client error displayed when trying to unfollow a user that cannot be found.
-#: actions/apifriendshipsdestroy.php:109
 msgid "Could not unfollow user: User not found."
 msgstr "Non se puido deixar de seguir o usuario: non se atopou."
 
 #. TRANS: Client error displayed when trying to unfollow self.
-#: actions/apifriendshipsdestroy.php:121
 msgid "You cannot unfollow yourself."
 msgstr "Non pode deixar de seguirse a si mesmo."
 
 #. TRANS: Client error displayed when supplying invalid parameters to an API call checking if a friendship exists.
-#: actions/apifriendshipsexists.php:88
 #, fuzzy
 msgid "Two valid IDs or nick names must be supplied."
 msgstr "Deben fornecerse dúas identificacións ou nomes de usuario."
 
 #. TRANS: Client error displayed when a source user could not be determined showing friendship.
-#: actions/apifriendshipsshow.php:131
 msgid "Could not determine source user."
 msgstr "Non se puido determinar o usuario de orixe."
 
 #. TRANS: Client error displayed when a target user could not be determined showing friendship.
-#: actions/apifriendshipsshow.php:140
 msgid "Could not find target user."
 msgstr "Non se puido atopar o usuario de destino."
 
 #. TRANS: Client error trying to create a group with a nickname this is already in use.
+#. TRANS: API validation exception thrown when nickname is already used.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:156 actions/apigroupprofileupdate.php:255
-#: actions/editgroup.php:191 actions/newgroup.php:137
-#: actions/profilesettings.php:274 actions/register.php:199
 msgid "Nickname already in use. Try another one."
 msgstr "Ese alcume xa está en uso. Probe con outro."
 
 #. TRANS: Client error in form for group creation.
+#. TRANS: API validation exception thrown when nickname does not validate.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:164 actions/apigroupprofileupdate.php:259
-#: actions/editgroup.php:195 actions/newgroup.php:141
-#: actions/profilesettings.php:244 actions/register.php:201
 msgid "Not a valid nickname."
 msgstr "O formato do alcume non é correcto."
 
 #. TRANS: Client error in form for group creation.
+#. TRANS: API validation exception thrown when homepage URL does not validate.
 #. TRANS: Validation error shown when providing an invalid homepage URL in the "Edit application" form.
 #. TRANS: Group edit form validation error.
 #. TRANS: Validation error shown when providing an invalid homepage URL in the "New application" form.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:181 actions/apigroupprofileupdate.php:277
-#: actions/editapplication.php:235 actions/editgroup.php:202
-#: actions/newapplication.php:221 actions/newgroup.php:148
-#: actions/profilesettings.php:249 actions/register.php:208
 msgid "Homepage is not a valid URL."
 msgstr "O URL da páxina persoal non é correcto."
 
 #. TRANS: Client error in form for group creation.
+#. TRANS: API validation exception thrown when full name does not validate.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:191 actions/editgroup.php:206
-#: actions/newgroup.php:152 actions/profilesettings.php:253
-#: actions/register.php:211
 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "O nome completo é longo de máis (o máximo son 255 caracteres)."
 
 #. TRANS: Client error shown when providing too long a description during group creation.
 #. TRANS: %d is the maximum number of allowed characters.
+#. TRANS: API validation exception thrown when description does not validate.
+#. TRANS: %d is the maximum description length and used for plural.
 #. TRANS: Validation error shown when providing too long a description in the "Edit application" form.
 #. TRANS: %d is the maximum number of allowed characters.
 #. TRANS: Group edit form validation error.
@@ -654,9 +499,6 @@ msgstr "O nome completo é longo de máis (o máximo son 255 caracteres)."
 #. TRANS: %d is the maximum number of characters for the description.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed characters.
-#: actions/apigroupcreate.php:201 actions/editapplication.php:202
-#: actions/editgroup.php:211 actions/newapplication.php:182
-#: actions/newgroup.php:157
 #, fuzzy, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."
@@ -664,24 +506,22 @@ msgstr[0] "A descrición é longa de máis (o máximo son %d caracteres)."
 msgstr[1] "A descrición é longa de máis (o máximo son %d caracteres)."
 
 #. TRANS: Client error shown when providing too long a location during group creation.
+#. TRANS: API validation exception thrown when location does not validate.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:215 actions/editgroup.php:218
-#: actions/newgroup.php:164 actions/profilesettings.php:266
-#: actions/register.php:220
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
 msgstr "A localidade é longa de máis (o máximo son 255 caracteres)."
 
 #. TRANS: Client error shown when providing too many aliases during group creation.
 #. TRANS: %d is the maximum number of allowed aliases.
+#. TRANS: API validation exception thrown when aliases do not validate.
+#. TRANS: %d is the maximum number of aliases and used for plural.
 #. TRANS: Group edit form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.
-#: actions/apigroupcreate.php:236 actions/editgroup.php:231
-#: actions/newgroup.php:177
 #, fuzzy, php-format
 msgid "Too many aliases! Maximum %d allowed."
 msgid_plural "Too many aliases! Maximum %d allowed."
@@ -690,25 +530,24 @@ msgstr[1] "Demasiados pseudónimos! O número máximo é %d."
 
 #. TRANS: Client error shown when providing an invalid alias during group creation.
 #. TRANS: %s is the invalid alias.
-#: actions/apigroupcreate.php:253
+#. TRANS: API validation exception thrown when aliases does not validate.
+#. TRANS: %s is the invalid alias.
 #, php-format
 msgid "Invalid alias: \"%s\"."
 msgstr "Pseudónimo incorrecto: \"%s\"."
 
 #. TRANS: Client error displayed when trying to use an alias during group creation that is already in use.
 #. TRANS: %s is the alias that is already in use.
+#. TRANS: API validation exception thrown when aliases is already used.
+#. TRANS: %s is the already used alias.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error. %s is the already used alias.
-#: actions/apigroupcreate.php:264 actions/apigroupprofileupdate.php:351
-#: actions/editgroup.php:246 actions/newgroup.php:193
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "O pseudónimo \"%s\" xa se está a usar. Proba con outro."
 
 #. TRANS: Client error displayed when trying to use an alias during group creation that is the same as the group's nickname.
 #. TRANS: Group edit form validation error.
-#: actions/apigroupcreate.php:278 actions/apigroupprofileupdate.php:359
-#: actions/editgroup.php:253
 msgid "Alias can't be the same as nickname."
 msgstr "O pseudónimo non pode coincidir co alcume."
 
@@ -716,26 +555,21 @@ msgstr "O pseudónimo non pode coincidir co alcume."
 #. TRANS: Client error displayed when trying to join a group that does not exist.
 #. TRANS: Client error displayed when trying to leave a group that does not exist.
 #. TRANS: Client error displayed trying to show group membership on a non-existing group.
+#. TRANS: Client error displayed when not providing a group or an invalid group.
 #. TRANS: Client error displayed when trying to show a group that could not be found.
 #. TRANS: Client error displayed requesting most recent notices to a group for a non-existing group.
-#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
-#: actions/apigroupleave.php:104 actions/apigroupmembership.php:71
-#: actions/apigroupprofileupdate.php:113 actions/apigroupshow.php:81
-#: actions/apitimelinegroup.php:89
 msgid "Group not found."
 msgstr "Non se atopou o grupo."
 
 #. TRANS: Server error displayed when trying to join a group the user is already a member of.
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:345
 msgid "You are already a member of that group."
 msgstr "Xa forma parte dese grupo."
 
 #. TRANS: Server error displayed when trying to join a group the user is blocked from joining.
 #. 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.
-#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:350
 msgid "You have been blocked from that group by the admin."
 msgstr "O administrador bloqueouno nese grupo."
 
@@ -743,13 +577,11 @@ msgstr "O administrador bloqueouno nese grupo."
 #. TRANS: %1$s is the joining user's nickname, $2$s is the group nickname for which the join failed.
 #. TRANS: Message given having failed to add a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:136 actions/joingroup.php:139 lib/command.php:362
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "O usuario %1$s non se puido engadir ao grupo %2$s."
 
 #. TRANS: Server error displayed when trying to leave a group the user is not a member of.
-#: actions/apigroupleave.php:115
 msgid "You are not a member of this group."
 msgstr "Vostede non pertence a este grupo."
 
@@ -757,117 +589,80 @@ msgstr "Vostede non pertence a este grupo."
 #. TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
 #. TRANS: Message given having failed to remove a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupleave.php:127 actions/leavegroup.php:133
-#: lib/command.php:410
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
 msgstr "O usuario %1$s non se puido eliminar do grupo %2$s."
 
 #. TRANS: Used as title in check for group membership. %s is a user name.
-#: actions/apigrouplist.php:94
 #, php-format
 msgid "%s's groups"
 msgstr "Os grupos de %s"
 
 #. TRANS: Used as subtitle in check for group membership. %1$s is a user name, %2$s is the site name.
-#: actions/apigrouplist.php:104
 #, php-format
 msgid "%1$s groups %2$s is a member of."
 msgstr "Grupos de %1$s aos que pertence %2$s."
 
 #. TRANS: Message is used as a title when listing the lastest 20 groups. %s is a site name.
 #. TRANS: Message is used as a page title. %s is a nick name.
-#: actions/apigrouplistall.php:88 actions/usergroups.php:63
 #, php-format
 msgid "%s groups"
 msgstr "grupos %s"
 
 #. TRANS: Message is used as a subtitle when listing the lastest 20 groups. %s is a site name.
-#: actions/apigrouplistall.php:93
 #, php-format
 msgid "groups on %s"
 msgstr "grupos en %s"
 
+#. TRANS: Client error displayed when trying to edit a group without being an admin.
 #. TRANS: Client error displayed trying to edit a group while not being a group admin.
 #. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
 #. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
-#: actions/apigroupprofileupdate.php:118 actions/editgroup.php:110
-#: actions/editgroup.php:176 actions/groupdesignsettings.php:109
-#: actions/grouplogo.php:111
 msgid "You must be an admin to edit the group."
 msgstr "Ten que ser administrador para editar o grupo."
 
+#. TRANS: Server error displayed when group update fails.
 #. TRANS: Server error displayed when editing a group fails.
-#: actions/apigroupprofileupdate.php:171 actions/editgroup.php:274
 msgid "Could not update group."
 msgstr "Non se puido actualizar o grupo."
 
+#. TRANS: Server error displayed when adding group aliases fails.
 #. TRANS: Server error displayed when group aliases could not be added.
 #. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/apigroupprofileupdate.php:194 actions/editgroup.php:281
-#: classes/User_group.php:540
 msgid "Could not create aliases."
 msgstr "Non se puideron crear os pseudónimos."
 
+#. TRANS: API validation exception thrown when nickname does not validate.
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: actions/apigroupprofileupdate.php:249 lib/nickname.php:165
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr ""
 "O alcume debe ter só letras en minúscula e números, e non pode ter espazos "
 "en branco."
 
-#: actions/apigroupprofileupdate.php:286
-#, fuzzy
-msgid "Full name is too long (max 255 chars)."
-msgstr "O nome completo é longo de máis (o máximo son 255 caracteres)."
-
-#: actions/apigroupprofileupdate.php:296
-#, fuzzy, php-format
-msgid "description is too long (max %d chars)."
-msgstr "A descrición é longa de máis (o máximo son %d caracteres)."
-
-#: actions/apigroupprofileupdate.php:307
-#, fuzzy
-msgid "Location is too long (max 255 chars)."
-msgstr "A localidade é longa de máis (o máximo son 255 caracteres)."
-
-#: actions/apigroupprofileupdate.php:326
-#, fuzzy, php-format
-msgid "Too many aliases! Maximum %d."
-msgstr "Demasiados pseudónimos! O número máximo é %d."
-
-#. TRANS: Group edit form validation error.
+#. TRANS: API validation exception thrown when alias is the same as nickname.
 #. TRANS: Group create form validation error.
-#. TRANS: %s is the invalid alias.
-#: actions/apigroupprofileupdate.php:342 actions/editgroup.php:241
-#: actions/newgroup.php:188
-#, php-format
-msgid "Invalid alias: \"%s\""
-msgstr "Pseudónimo inválido: \"%s\""
+#, fuzzy
+msgid "Alias cannot be the same as nickname."
+msgstr "O pseudónimo non pode coincidir co alcume."
 
 #. TRANS: Client error displayed when uploading a media file has failed.
-#: actions/apimediaupload.php:101
 msgid "Upload failed."
 msgstr "Houbo un erro durante a carga."
 
 #. TRANS: Client error given from the OAuth API when the request token or verifier is invalid.
-#: actions/apioauthaccesstoken.php:102
 #, fuzzy
 msgid "Invalid request token or verifier."
 msgstr "O pase especificado é incorrecto."
 
 #. TRANS: Client error given when no oauth_token was passed to the OAuth API.
-#: actions/apioauthauthorize.php:107
 msgid "No oauth_token parameter provided."
 msgstr "Non se forneceu o parámetro oauth_token."
 
 #. TRANS: Client error given when an invalid request token was passed to the OAuth API.
-#: actions/apioauthauthorize.php:115 actions/apioauthauthorize.php:129
 msgid "Invalid request token."
 msgstr "Pase de solicitude incorrecto."
 
 #. TRANS: Client error given when an invalid request token was passed to the OAuth API.
-#: actions/apioauthauthorize.php:121
 #, fuzzy
 msgid "Request token already authorized."
 msgstr "Non está autorizado."
@@ -878,31 +673,14 @@ msgstr "Non está autorizado."
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
 #. TRANS: Client error displayed when the session token is not okay.
-#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:75
-#: actions/emailsettings.php:292 actions/favor.php:75 actions/geocode.php:55
-#: actions/groupblock.php:65 actions/grouplogo.php:321
-#: actions/groupunblock.php:65 actions/imsettings.php:241
-#: actions/invite.php:60 actions/makeadmin.php:66 actions/newmessage.php:135
-#: actions/newnotice.php:105 actions/nudge.php:80
-#: actions/oauthappssettings.php:162 actions/oauthconnectionssettings.php:135
-#: actions/passwordsettings.php:137 actions/pluginenable.php:87
-#: actions/profilesettings.php:218 actions/recoverpassword.php:383
-#: actions/register.php:157 actions/remotesubscribe.php:76
-#: actions/repeat.php:82 actions/smssettings.php:249 actions/subedit.php:40
-#: actions/subscribe.php:87 actions/tagother.php:145
-#: actions/unsubscribe.php:69 actions/urlsettings.php:171
-#: actions/userauthorization.php:53 lib/designsettings.php:122
 msgid "There was a problem with your session token. Try again, please."
 msgstr "Houbo un erro co seu pase. Inténteo de novo."
 
 #. TRANS: Form validation error given when an invalid username and/or password was passed to the OAuth API.
-#: actions/apioauthauthorize.php:168
 msgid "Invalid nickname / password!"
 msgstr "O alcume ou o contrasinal son incorrectos!"
 
 #. TRANS: Server error displayed when a database action fails.
-#: actions/apioauthauthorize.php:217
 #, fuzzy
 msgid "Database error inserting oauth_token_association."
 msgstr ""
@@ -921,28 +699,19 @@ msgstr ""
 #. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
 #. TRANS: Message given submitting a form with an unknown action in SMS settings.
 #. TRANS: Unknown form validation error in design settings form.
-#: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
-#: actions/designadminpanel.php:100 actions/editapplication.php:144
-#: actions/emailsettings.php:311 actions/grouplogo.php:332
-#: actions/imsettings.php:256 actions/newapplication.php:124
-#: actions/oauthconnectionssettings.php:144 actions/recoverpassword.php:46
-#: actions/smssettings.php:270 lib/designsettings.php:133
 msgid "Unexpected form submission."
 msgstr "Envío de formulario inesperado."
 
 #. TRANS: Title for a page where a user can confirm/deny account access by an external application.
-#: actions/apioauthauthorize.php:387
 msgid "An application would like to connect to your account"
 msgstr "Unha aplicación quere conectarse á súa conta"
 
 #. TRANS: Fieldset legend.
-#: actions/apioauthauthorize.php:404
 msgid "Allow or deny access"
 msgstr "Permitir ou denegar o acceso"
 
 #. TRANS: User notification of external application requesting account access.
 #. TRANS: %3$s is the access type requested (read-write or read-only), %4$s is the StatusNet sitename.
-#: actions/apioauthauthorize.php:425
 #, fuzzy, php-format
 msgid ""
 "An application would like the ability to <strong>%3$s</strong> your %4$s "
@@ -956,7 +725,6 @@ msgstr ""
 #. TRANS: User notification of external application requesting account access.
 #. TRANS: %1$s is the application name requesting access, %2$s is the organisation behind the application,
 #. TRANS: %3$s is the access type requested, %4$s is the StatusNet sitename.
-#: actions/apioauthauthorize.php:433
 #, php-format
 msgid ""
 "The application <strong>%1$s</strong> by <strong>%2$s</strong> would like "
@@ -968,22 +736,18 @@ msgstr ""
 "acceso á súa conta %4$s a xente de confianza."
 
 #. TRANS: Fieldset legend.
-#: actions/apioauthauthorize.php:455
 msgctxt "LEGEND"
 msgid "Account"
 msgstr "Conta"
 
 #. TRANS: Field label on OAuth API authorisation form.
+#. TRANS: Field label on login page.
 #. TRANS: Field label in form for profile settings.
-#: actions/apioauthauthorize.php:459 actions/login.php:225
-#: actions/profilesettings.php:107 actions/register.php:411
-#: actions/userauthorization.php:145 lib/groupeditform.php:145
 msgid "Nickname"
 msgstr "Alcume"
 
 #. TRANS: Field label on OAuth API authorisation form.
-#: actions/apioauthauthorize.php:463 actions/login.php:228
-#: actions/register.php:415 lib/settingsnav.php:87
+#. TRANS: Field label on login page.
 msgid "Password"
 msgstr "Contrasinal"
 
@@ -993,44 +757,35 @@ msgstr "Contrasinal"
 #. TRANS: Button label to cancel an IM address confirmation procedure.
 #. TRANS: Button label to cancel a SMS address confirmation procedure.
 #. TRANS: Button label in the "Edit application" form.
-#: actions/apioauthauthorize.php:478 actions/emailsettings.php:125
-#: actions/imsettings.php:136 actions/smssettings.php:132
-#: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Cancel"
 msgstr "Cancelar"
 
 #. TRANS: Button text that when clicked will allow access to an account by an external application.
-#: actions/apioauthauthorize.php:485
 msgctxt "BUTTON"
 msgid "Allow"
 msgstr "Permitir"
 
 #. TRANS: Form instructions.
-#: actions/apioauthauthorize.php:502
 msgid "Authorize access to your account information."
 msgstr "Autorizar o acceso á información da súa conta."
 
 #. TRANS: Header for user notification after revoking OAuth access to an application.
-#: actions/apioauthauthorize.php:594
 msgid "Authorization canceled."
 msgstr "Autorización cancelada."
 
 #. TRANS: User notification after revoking OAuth access to an application.
 #. TRANS: %s is an OAuth token.
-#: actions/apioauthauthorize.php:598
 #, php-format
 msgid "The request token %s has been revoked."
 msgstr "Denegouse o pase da solicitude %s."
 
 #. TRANS: Title of the page notifying the user that an anonymous client application was successfully authorized to access the user's account with OAuth.
-#: actions/apioauthauthorize.php:621
 #, fuzzy
 msgid "You have successfully authorized the application"
 msgstr "Non está autorizado."
 
 #. TRANS: Message notifying the user that an anonymous client application was successfully authorized to access the user's account with OAuth.
-#: actions/apioauthauthorize.php:625
 msgid ""
 "Please return to the application and enter the following security code to "
 "complete the process."
@@ -1038,14 +793,12 @@ msgstr ""
 
 #. TRANS: Title of the page notifying the user that the client application was successfully authorized to access the user's account with OAuth.
 #. TRANS: %s is the authorised application name.
-#: actions/apioauthauthorize.php:632
 #, fuzzy, php-format
 msgid "You have successfully authorized %s"
 msgstr "Non está autorizado."
 
 #. TRANS: Message notifying the user that the client application was successfully authorized to access the user's account with OAuth.
 #. TRANS: %s is the authorised application name.
-#: actions/apioauthauthorize.php:639
 #, php-format
 msgid ""
 "Please return to %s and enter the following security code to complete the "
@@ -1054,12 +807,10 @@ msgstr ""
 
 #. TRANS: Client error displayed trying to delete a status not using POST or DELETE.
 #. TRANS: POST and DELETE should not be translated.
-#: actions/apistatusesdestroy.php:111
 msgid "This method requires a POST or DELETE."
 msgstr "Este método require un POST ou un DELETE."
 
 #. TRANS: Client error displayed trying to delete a status of another user.
-#: actions/apistatusesdestroy.php:136
 msgid "You may not delete another user's status."
 msgstr "Non pode borrar o estado doutro usuario."
 
@@ -1067,21 +818,16 @@ msgstr "Non pode borrar o estado doutro usuario."
 #. TRANS: Client error displayed trying to display redents of a non-exiting notice.
 #. TRANS: Client exception thrown when referencing a non-existing notice.
 #. TRANS: Error message displayed trying to delete a non-existing notice.
-#: actions/apistatusesretweet.php:74 actions/apistatusesretweets.php:70
-#: actions/atompubshowfavorite.php:82 actions/deletenotice.php:61
-#: actions/shownotice.php:92
 msgid "No such notice."
 msgstr "Non existe tal nota."
 
 #. TRANS: Client error displayed trying to repeat an own notice through the API.
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:549
 msgid "Cannot repeat your own notice."
 msgstr "Non pode repetir a súa propia nota."
 
 #. TRANS: Client error displayed trying to re-repeat a notice through the API.
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:92 lib/command.php:555
 msgid "Already repeated that notice."
 msgstr "Xa repetiu esa nota."
 
@@ -1091,59 +837,45 @@ msgstr "Xa repetiu esa nota."
 #. TRANS: Client exception thrown when using an unsupported HTTP method.
 #. TRANS: Client error shown when using a non-supported HTTP method.
 #. TRANS: Client exception thrown when using an unsupported HTTP method.
-#: actions/apistatusesshow.php:118 actions/atompubfavoritefeed.php:103
-#: actions/atompubmembershipfeed.php:105 actions/atompubshowfavorite.php:117
-#: actions/atompubshowmembership.php:116
-#: actions/atompubshowsubscription.php:122
-#: actions/atompubsubscriptionfeed.php:109
 #, fuzzy
 msgid "HTTP method not supported."
 msgstr "Non se atopou o método da API."
 
 #. TRANS: Exception thrown requesting an unsupported notice output format.
 #. TRANS: %s is the requested output format.
-#: actions/apistatusesshow.php:144
 #, fuzzy, php-format
 msgid "Unsupported format: %s."
 msgstr "Formato non soportado."
 
 #. TRANS: Client error displayed requesting a deleted status.
-#: actions/apistatusesshow.php:155
 msgid "Status deleted."
 msgstr "Borrouse o estado."
 
 #. TRANS: Client error displayed requesting a status with an invalid ID.
-#: actions/apistatusesshow.php:162
 msgid "No status with that ID found."
 msgstr "Non se atopou ningún estado con esa ID."
 
 #. TRANS: Client error displayed when trying to delete a notice not using the Atom format.
-#: actions/apistatusesshow.php:227
 msgid "Can only delete using the Atom format."
 msgstr ""
 
 #. TRANS: Client error displayed when a user has no rights to delete notices of other users.
 #. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
-#: actions/apistatusesshow.php:235 actions/deletenotice.php:78
 #, fuzzy
 msgid "Cannot delete this notice."
 msgstr "Non se pode borrar esta nota."
 
 #. TRANS: Confirmation of notice deletion in API. %d is the ID (number) of the deleted notice.
-#: actions/apistatusesshow.php:249
 #, fuzzy, php-format
 msgid "Deleted notice %d"
 msgstr "Borrar a nota"
 
 #. TRANS: Client error displayed when the parameter "status" is missing.
-#: actions/apistatusesupdate.php:221
 msgid "Client must provide a 'status' parameter with a value."
 msgstr "O cliente debe proporcionar un parámetro de \"estado\" cun valor."
 
 #. TRANS: Client error displayed when the parameter "status" is missing.
 #. TRANS: %d is the maximum number of character for a notice.
-#: actions/apistatusesupdate.php:244 actions/newnotice.php:161
-#: lib/mailhandler.php:60
 #, fuzzy, php-format
 msgid "That's too long. Maximum notice size is %d character."
 msgid_plural "That's too long. Maximum notice size is %d characters."
@@ -1151,14 +883,12 @@ msgstr[0] "Iso é longo de máis. A nota non pode exceder os %d caracteres."
 msgstr[1] "Iso é longo de máis. A nota non pode exceder os %d caracteres."
 
 #. TRANS: Client error displayed when replying to a non-existing notice.
-#: actions/apistatusesupdate.php:284
 #, fuzzy
 msgid "Parent notice not found."
 msgstr "Non se atopou o método da API."
 
 #. TRANS: Client error displayed exceeding the maximum notice length.
 #. TRANS: %d is the maximum lenth for a notice.
-#: actions/apistatusesupdate.php:308 actions/newnotice.php:184
 #, fuzzy, php-format
 msgid "Maximum notice size is %d character, including attachment URL."
 msgid_plural "Maximum notice size is %d characters, including attachment URL."
@@ -1171,13 +901,11 @@ msgstr[1] ""
 
 #. TRANS: Client error displayed when requesting profiles of followers in an unsupported format.
 #. TRANS: Client error displayed when requesting IDs of followers in an unsupported format.
-#: actions/apisubscriptions.php:228 actions/apisubscriptions.php:258
 msgid "Unsupported format."
 msgstr "Formato non soportado."
 
 #. TRANS: Title for timeline of most recent favourite notices by a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname.
-#: actions/apitimelinefavorites.php:108
 #, php-format
 msgid "%1$s / Favorites from %2$s"
 msgstr "%1$s / Favoritos de %2$s"
@@ -1185,14 +913,12 @@ msgstr "%1$s / Favoritos de %2$s"
 #. TRANS: Subtitle for timeline of most recent favourite notices by a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user's full name,
 #. TRANS: %3$s is a user nickname.
-#: actions/apitimelinefavorites.php:120
 #, fuzzy, php-format
 msgid "%1$s updates favorited by %2$s / %3$s."
 msgstr "%1$s actualizacións marcadas como favoritas por %2$s / %2$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.
-#: actions/apitimelinementions.php:115
 #, php-format
 msgid "%1$s / Updates mentioning %2$s"
 msgstr "%1$s / Actualizacións que mencionan %2$s"
@@ -1200,49 +926,41 @@ msgstr "%1$s / Actualizacións que mencionan %2$s"
 #. TRANS: Subtitle for timeline of most recent mentions of a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname,
 #. TRANS: %3$s is a user's full name.
-#: actions/apitimelinementions.php:131
 #, php-format
 msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr "%1$s actualizacións que responden a actualizacións de %2$s / %3$s."
 
 #. TRANS: Title for site timeline. %s is the StatusNet sitename.
 #. TRANS: Public RSS feed title. %s is the StatusNet site name.
-#: actions/apitimelinepublic.php:193 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "Liña do tempo pública de %s"
 
 #. TRANS: Subtitle for site timeline. %s is the StatusNet sitename.
-#: actions/apitimelinepublic.php:199
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "%s actualizacións de todos!"
 
 #. TRANS: Server error displayed calling unimplemented API method for 'retweeted by me'.
-#: actions/apitimelineretweetedbyme.php:71
 #, fuzzy
 msgid "Unimplemented."
 msgstr "Aínda non se implantou o método."
 
 #. TRANS: Title for Atom feed "repeated to me". %s is the user nickname.
-#: actions/apitimelineretweetedtome.php:96
 #, php-format
 msgid "Repeated to %s"
 msgstr "Repetiu a %s"
 
-#: actions/apitimelineretweetedtome.php:98
 #, fuzzy, php-format
 msgid "%1$s notices that were to repeated to %2$s / %3$s."
 msgstr "%1$s actualizacións que responden a actualizacións de %2$s / %3$s."
 
 #. TRANS: Title of list of repeated notices of the logged in user.
 #. TRANS: %s is the nickname of the logged in user.
-#: actions/apitimelineretweetsofme.php:98
 #, php-format
 msgid "Repeats of %s"
 msgstr "Repeticións de %s"
 
-#: actions/apitimelineretweetsofme.php:104
 #, fuzzy, php-format
 msgid "%1$s notices that %2$s / %3$s has repeated."
 msgstr "%1$s marcou a nota %2$s como favorita"
@@ -1251,79 +969,64 @@ msgstr "%1$s marcou a nota %2$s como favorita"
 #. TRANS: %s is the tag.
 #. TRANS: Title for first page of notices with tags.
 #. TRANS: %s is the tag.
-#: actions/apitimelinetag.php:101 actions/tag.php:69
 #, php-format
 msgid "Notices tagged with %s"
 msgstr "Notas etiquetadas con %s"
 
 #. TRANS: Subtitle for timeline with lastest notices with a given tag.
 #. TRANS: %1$s is the tag, $2$s is the StatusNet sitename.
-#: actions/apitimelinetag.php:105 actions/tagrss.php:65
 #, php-format
 msgid "Updates tagged with %1$s on %2$s!"
 msgstr "Actualizacións etiquetadas con %1$s en %2$s!"
 
 #. TRANS: Client error displayed trying to add a notice to another user's timeline.
-#: actions/apitimelineuser.php:308
 #, fuzzy
 msgid "Only the user can add to their own timeline."
 msgstr "Só o usuario pode ler as súas caixas de entrada."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:315
 msgid "Only accept AtomPub for Atom feeds."
 msgstr ""
 
 #. TRANS: Client error displayed attempting to post an empty API notice.
-#: actions/apitimelineuser.php:322
 msgid "Atom post must not be empty."
 msgstr ""
 
 #. TRANS: Client error displayed attempting to post an API that is not well-formed XML.
-#: actions/apitimelineuser.php:328
 msgid "Atom post must be well-formed XML."
 msgstr ""
 
 #. TRANS: Client error displayed when not using an Atom entry.
-#: actions/apitimelineuser.php:334 actions/atompubfavoritefeed.php:228
-#: actions/atompubmembershipfeed.php:230
-#: actions/atompubsubscriptionfeed.php:236
 msgid "Atom post must be an Atom entry."
 msgstr ""
 
 #. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
-#: actions/apitimelineuser.php:345
 msgid "Can only handle POST activities."
 msgstr ""
 
 #. TRANS: Client error displayed when using an unsupported activity object type.
 #. TRANS: %s is the unsupported activity object type.
-#: actions/apitimelineuser.php:356
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
 #. TRANS: %d is the notice ID (number).
-#: actions/apitimelineuser.php:390
 #, fuzzy, php-format
 msgid "No content for notice %d."
 msgstr "Buscar nos contidos das notas"
 
 #. TRANS: Client error displayed when using another format than AtomPub.
 #. TRANS: %s is the notice URI.
-#: actions/apitimelineuser.php:419
 #, fuzzy, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "Non hai ningunha nota con esa id."
 
 #. TRANS: Server error for unfinished API method showTrends.
-#: actions/apitrends.php:85
 msgid "API method under construction."
 msgstr "Método API en desenvolvemento."
 
 #. TRANS: Client error displayed when requesting user information for a non-existing user.
-#: actions/apiuserprofileimage.php:80 actions/apiusershow.php:94
 #, fuzzy
 msgid "User not found."
 msgstr "Non se atopou o método da API."
@@ -1331,102 +1034,84 @@ msgstr "Non se atopou o método da API."
 #. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
 #. TRANS: Client exception.
 #. TRANS: Client error displayed trying to subscribe to a non-existing profile.
-#: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
-#: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
-#: actions/subscribe.php:110
 msgid "No such profile."
 msgstr "Non existe ese perfil."
 
 #. TRANS: Subtitle for Atom favorites feed.
 #. TRANS: %1$s is a user nickname, %2$s is the StatusNet sitename.
-#: actions/atompubfavoritefeed.php:147
 #, fuzzy, php-format
 msgid "Notices %1$s has favorited on %2$s"
 msgstr "Actualizacións de %1$s e amigos en %2$s!"
 
 #. TRANS: Client exception thrown when trying to set a favorite for another user.
 #. TRANS: Client exception thrown when trying to subscribe another user.
-#: actions/atompubfavoritefeed.php:217 actions/atompubsubscriptionfeed.php:225
 #, fuzzy
 msgid "Cannot add someone else's subscription."
 msgstr "Non se puido inserir unha subscrición nova."
 
 #. TRANS: Client exception thrown when trying use an incorrect activity verb for the Atom pub method.
-#: actions/atompubfavoritefeed.php:240
 #, fuzzy
 msgid "Can only handle favorite activities."
 msgstr "Buscar nos contidos das notas"
 
 #. TRANS: Client exception thrown when trying favorite an object that is not a notice.
-#: actions/atompubfavoritefeed.php:250 actions/atompubmembershipfeed.php:250
 #, fuzzy
 msgid "Can only fave notices."
 msgstr "Buscar nos contidos das notas"
 
 #. TRANS: Client exception thrown when trying favorite a notice without content.
-#: actions/atompubfavoritefeed.php:259
 #, fuzzy
 msgid "Unknown note."
 msgstr "Descoñecida"
 
 #. TRANS: Client exception thrown when trying favorite an already favorited notice.
-#: actions/atompubfavoritefeed.php:267
 #, fuzzy
 msgid "Already a favorite."
 msgstr "Engadir aos favoritos"
 
 #. TRANS: Title for group membership feed.
 #. TRANS: %s is a username.
-#: actions/atompubmembershipfeed.php:144
 #, fuzzy, php-format
 msgid "%s group memberships"
 msgstr "Membros do grupo %s"
 
 #. TRANS: Subtitle for group membership feed.
 #. TRANS: %1$s is a username, %2$s is the StatusNet sitename.
-#: actions/atompubmembershipfeed.php:149
 #, fuzzy, php-format
 msgid "Groups %1$s is a member of on %2$s"
 msgstr "Grupos aos que pertence %s"
 
 #. TRANS: Client exception thrown when trying subscribe someone else to a group.
-#: actions/atompubmembershipfeed.php:219
 #, fuzzy
 msgid "Cannot add someone else's membership."
 msgstr "Non se puido inserir unha subscrición nova."
 
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#: actions/atompubmembershipfeed.php:242
 #, fuzzy
 msgid "Can only handle join activities."
 msgstr "Buscar nos contidos das notas"
 
 #. TRANS: Client exception thrown when trying to subscribe to a non-existing group.
-#: actions/atompubmembershipfeed.php:259
 #, fuzzy
 msgid "Unknown group."
 msgstr "Descoñecida"
 
 #. TRANS: Client exception thrown when trying to subscribe to an already subscribed group.
-#: actions/atompubmembershipfeed.php:267
 #, fuzzy
 msgid "Already a member."
 msgstr "Todos os membros"
 
 #. TRANS: Client exception thrown when trying to subscribe to group while blocked from that group.
-#: actions/atompubmembershipfeed.php:275
 msgid "Blocked by admin."
 msgstr ""
 
 #. TRANS: Client exception thrown when referencing a non-existing favorite.
-#: actions/atompubshowfavorite.php:90
 #, fuzzy
 msgid "No such favorite."
 msgstr "Non existe tal ficheiro."
 
 #. TRANS: Client exception thrown when trying to remove a favorite notice of another user.
-#: actions/atompubshowfavorite.php:151
 #, fuzzy
 msgid "Cannot delete someone else's favorite."
 msgstr "Non se puido eliminar o favorito."
@@ -1453,93 +1138,68 @@ msgstr "Non se puido eliminar o favorito."
 #. TRANS: Client error displayed when trying to join a non-existing group.
 #. TRANS: Client error displayed when trying to leave a non-local group.
 #. TRANS: Client error displayed when trying to leave a non-existing group.
+#. TRANS: Client error displayed when providing an invalid group ID on the Make Admin page.
 #. 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.
 #. TRANS: Command exception text shown when a group is requested that does not exist.
 #. TRANS: Error text shown when trying to leave a group that does not exist.
-#: actions/atompubshowmembership.php:81 actions/blockedfromgroup.php:81
-#: actions/blockedfromgroup.php:89 actions/deletegroup.php:87
-#: actions/deletegroup.php:100 actions/editgroup.php:102
-#: actions/foafgroup.php:46 actions/foafgroup.php:65 actions/foafgroup.php:73
-#: actions/groupblock.php:89 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:101 actions/grouplogo.php:103
-#: actions/groupmembers.php:84 actions/groupmembers.php:92
-#: actions/grouprss.php:97 actions/grouprss.php:105
-#: actions/groupunblock.php:89 actions/joingroup.php:82
-#: actions/joingroup.php:95 actions/leavegroup.php:82
-#: actions/leavegroup.php:95 actions/makeadmin.php:86
-#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:392
 msgid "No such group."
 msgstr "Non existe tal grupo."
 
 #. TRANS: Client exception thrown when trying to show membership of a non-subscribed group
-#: actions/atompubshowmembership.php:91
 #, fuzzy
 msgid "Not a member."
 msgstr "Todos os membros"
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
-#: actions/atompubshowmembership.php:150
 #, fuzzy
 msgid "Cannot delete someone else's membership."
 msgstr "Non se puido borrar a subscrición a si mesmo."
 
 #. TRANS: Client exception thrown when trying to display a subscription for a non-existing profile ID.
 #. TRANS: %d is the non-existing profile ID number.
-#: actions/atompubshowsubscription.php:72
-#: actions/atompubshowsubscription.php:83
-#: actions/atompubsubscriptionfeed.php:74
 #, fuzzy, php-format
 msgid "No such profile id: %d."
 msgstr "Non existe ese perfil."
 
 #. 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.
-#: actions/atompubshowsubscription.php:94
 #, fuzzy, php-format
 msgid "Profile %1$d not subscribed to profile %2$d."
 msgstr "Non está subscrito a ese perfil."
 
 #. TRANS: Client exception thrown when trying to delete a subscription of another user.
-#: actions/atompubshowsubscription.php:157
 #, fuzzy
 msgid "Cannot delete someone else's subscription."
 msgstr "Non se puido borrar a subscrición a si mesmo."
 
 #. TRANS: Subtitle for Atom subscription feed.
 #. TRANS: %1$s is a user nickname, %s$s is the StatusNet sitename.
-#: actions/atompubsubscriptionfeed.php:153
 #, fuzzy, php-format
 msgid "People %1$s has subscribed to on %2$s"
 msgstr "Persoas subscritas a %s"
 
 #. TRANS: Client error displayed when not using the follow verb.
-#: actions/atompubsubscriptionfeed.php:248
 msgid "Can only handle Follow activities."
 msgstr ""
 
 #. TRANS: Client exception thrown when subscribing to an object that is not a person.
-#: actions/atompubsubscriptionfeed.php:256
 msgid "Can only follow people."
 msgstr ""
 
 #. TRANS: Client exception thrown when subscribing to a non-existing profile.
 #. TRANS: %s is the unknown profile ID.
-#: actions/atompubsubscriptionfeed.php:267
 #, fuzzy, php-format
 msgid "Unknown profile %s."
 msgstr "Non se coñece o tipo de ficheiro"
 
 #. TRANS: Client error displayed trying to subscribe to an already subscribed profile.
 #. TRANS: %s is the profile the user already has a subscription on.
-#: actions/atompubsubscriptionfeed.php:275
 #, fuzzy, php-format
 msgid "Already subscribed to %s."
 msgstr "Xa está subscrito!"
 
 #. TRANS: Client error displayed trying to get a non-existing attachment.
-#: actions/attachment.php:73
 msgid "No such attachment."
 msgstr "Non existe tal dato adxunto."
 
@@ -1551,31 +1211,23 @@ msgstr "Non existe tal dato adxunto."
 #. TRANS: Client error displayed when trying to view group members without providing a group nickname.
 #. TRANS: Client error displayed when requesting a group RSS feed without providing a group nickname.
 #. TRANS: Client error displayed if no nickname argument was given requesting a group page.
-#: actions/avatarbynickname.php:60 actions/blockedfromgroup.php:73
-#: actions/editgroup.php:85 actions/groupdesignsettings.php:84
-#: actions/grouplogo.php:86 actions/groupmembers.php:76
-#: actions/grouprss.php:89 actions/showgroup.php:116
 msgid "No nickname."
 msgstr "Sen alcume."
 
 #. TRANS: Client error displayed trying to get an avatar without providing an avatar size.
-#: actions/avatarbynickname.php:66
 msgid "No size."
 msgstr "Sen tamaño."
 
 #. TRANS: Client error displayed trying to get an avatar providing an invalid avatar size.
-#: actions/avatarbynickname.php:72
 msgid "Invalid size."
 msgstr "Tamaño non válido."
 
 #. TRANS: Title for avatar upload page.
-#: actions/avatarsettings.php:66 lib/settingsnav.php:82
 msgid "Avatar"
 msgstr "Avatar"
 
 #. TRANS: Instruction for avatar upload page.
 #. TRANS: %s is the maximum file size, for example "500b", "10kB" or "2MB".
-#: actions/avatarsettings.php:78
 #, php-format
 msgid "You can upload your personal avatar. The maximum file size is %s."
 msgstr ""
@@ -1586,17 +1238,12 @@ msgstr ""
 #. TRANS: Server error displayed coming across a request from a user without a profile.
 #. TRANS: Server error displayed when trying to authorise a remote subscription request
 #. TRANS: while the user has no profile.
-#: actions/avatarsettings.php:108 actions/avatarsettings.php:192
-#: actions/grouplogo.php:184 actions/remotesubscribe.php:190
-#: actions/userauthorization.php:75 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr "O usuario non ten perfil."
 
 #. TRANS: Avatar upload page form legend.
 #. TRANS: Avatar upload page crop form legend.
 #. TRANS: Legend for group logo settings fieldset.
-#: actions/avatarsettings.php:122 actions/avatarsettings.php:205
-#: actions/grouplogo.php:261
 msgid "Avatar settings"
 msgstr "Configuración do avatar"
 
@@ -1604,8 +1251,6 @@ msgstr "Configuración do avatar"
 #. TRANS: Header on avatar upload crop form for thumbnail of originally uploaded avatar (h2).
 #. TRANS: Uploaded original file in group logo form.
 #. TRANS: Header for originally uploaded file before a crop on the group logo page.
-#: actions/avatarsettings.php:131 actions/avatarsettings.php:214
-#: actions/grouplogo.php:207 actions/grouplogo.php:270
 msgid "Original"
 msgstr "Orixinal"
 
@@ -1613,82 +1258,67 @@ msgstr "Orixinal"
 #. TRANS: Header on avatar upload crop form for thumbnail of to be used rendition of uploaded avatar (h2).
 #. TRANS: Header for preview of to be displayed group logo.
 #. TRANS: Header for the cropped group logo on the group logo page.
-#: actions/avatarsettings.php:147 actions/avatarsettings.php:227
-#: actions/grouplogo.php:219 actions/grouplogo.php:283
 msgid "Preview"
 msgstr "Vista previa"
 
 #. TRANS: Button on avatar upload page to delete current avatar.
 #. TRANS: Button text for user account deletion.
-#: actions/avatarsettings.php:155 actions/deleteaccount.php:319
 msgctxt "BUTTON"
 msgid "Delete"
 msgstr "Borrar"
 
 #. TRANS: Button on avatar upload page to upload an avatar.
 #. TRANS: Submit button to confirm upload of a user backup file for account restore.
-#: actions/avatarsettings.php:173 actions/restoreaccount.php:369
 msgctxt "BUTTON"
 msgid "Upload"
 msgstr "Cargar"
 
 #. TRANS: Button on avatar upload crop form to confirm a selected crop as avatar.
-#: actions/avatarsettings.php:243
 msgctxt "BUTTON"
 msgid "Crop"
 msgstr "Recortar"
 
 #. TRANS: Validation error on avatar upload form when no file was uploaded.
-#: actions/avatarsettings.php:318
 msgid "No file uploaded."
 msgstr "Non se subiu ficheiro ningún."
 
 #. TRANS: Avatar upload form instruction after uploading a file.
-#: actions/avatarsettings.php:345
 #, fuzzy
 msgid "Pick a square area of the image to be your avatar."
 msgstr "Escolla unha zona cadrada da imaxe para usala como avatar"
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
 #. TRANS: Server error displayed trying to crop an uploaded group logo that is no longer present.
-#: actions/avatarsettings.php:360 actions/grouplogo.php:391
 msgid "Lost our file data."
 msgstr "Perdéronse os datos do ficheiro."
 
 #. TRANS: Success message for having updated a user avatar.
-#: actions/avatarsettings.php:384
 msgid "Avatar updated."
 msgstr "Actualizouse o avatar."
 
 #. TRANS: Error displayed on the avatar upload page if the avatar could not be updated for an unknown reason.
-#: actions/avatarsettings.php:388
 msgid "Failed updating avatar."
 msgstr "Non se puido actualizar o avatar."
 
 #. TRANS: Success message for deleting a user avatar.
-#: actions/avatarsettings.php:412
 msgid "Avatar deleted."
 msgstr "Borrouse o avatar."
 
 #. TRANS: Title for backup account page.
 #. TRANS: Option in profile settings to create a backup of the account of the currently logged in user.
-#: actions/backupaccount.php:61 actions/profilesettings.php:468
 msgid "Backup account"
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to backup an account while not logged in.
-#: actions/backupaccount.php:79
 #, fuzzy
 msgid "Only logged-in users can backup their account."
 msgstr "Só os usuarios identificados poden repetir notas."
 
 #. TRANS: Client exception thrown when trying to backup an account without having backup rights.
-#: actions/backupaccount.php:84
 msgid "You may not backup your account."
 msgstr ""
 
 #. TRANS: Information displayed on the backup account page.
-#: actions/backupaccount.php:227
 msgid ""
 "You can backup your account data in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format. This is an experimental feature and provides "
@@ -1698,31 +1328,26 @@ msgid ""
 msgstr ""
 
 #. TRANS: Submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:250
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Backup"
 msgstr "Fondo"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:254
 msgid "Backup your account."
 msgstr ""
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
-#: actions/block.php:68
 msgid "You already blocked that user."
 msgstr "Xa bloqueou ese usuario."
 
 #. TRANS: Title for block user page.
 #. TRANS: Legend for block user form.
 #. TRANS: Fieldset legend for block user from group form.
-#: actions/block.php:106 actions/block.php:136 actions/groupblock.php:165
 msgid "Block user"
 msgstr "Bloquear o usuario"
 
 #. TRANS: Explanation of consequences when blocking a user on the block user page.
-#: actions/block.php:139
 msgid ""
 "Are you sure you want to block this user? Afterwards, they will be "
 "unsubscribed from you, unable to subscribe to you in the future, and you "
@@ -1738,15 +1363,11 @@ msgstr ""
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:154 actions/deleteapplication.php:157
-#: actions/deletegroup.php:220 actions/deletenotice.php:155
-#: actions/deleteuser.php:154 actions/groupblock.php:187
 msgctxt "BUTTON"
 msgid "No"
 msgstr "Non"
 
 #. TRANS: Submit button title for 'No' when blocking a user.
-#: actions/block.php:158
 #, fuzzy
 msgid "Do not block this user."
 msgstr "Non bloquear este usuario"
@@ -1757,180 +1378,144 @@ msgstr "Non bloquear este usuario"
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:161 actions/deleteapplication.php:164
-#: actions/deletegroup.php:227 actions/deletenotice.php:162
-#: actions/deleteuser.php:161 actions/groupblock.php:194
 msgctxt "BUTTON"
 msgid "Yes"
 msgstr "Si"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:165
 #, fuzzy
 msgid "Block this user."
 msgstr "Bloquear este usuario"
 
 #. TRANS: Server error displayed when blocking a user fails.
-#: actions/block.php:189
 msgid "Failed to save block information."
 msgstr "Non se puido gardar a información do bloqueo."
 
 #. TRANS: Title for first page with list of users blocked from a group.
 #. TRANS: %s is a group nickname.
-#: actions/blockedfromgroup.php:101
 #, php-format
 msgid "%s blocked profiles"
 msgstr "%s perfís bloqueados"
 
 #. TRANS: Title for any but the first page with list of users blocked from a group.
 #. TRANS: %1$s is a group nickname, %2$d is a page number.
-#: actions/blockedfromgroup.php:106
 #, php-format
 msgid "%1$s blocked profiles, page %2$d"
 msgstr "%1$s perfís bloqueados, páxina %2$d"
 
 #. TRANS: Instructions for list of users blocked from a group.
-#: actions/blockedfromgroup.php:122
 msgid "A list of the users blocked from joining this group."
 msgstr "Unha lista de usuarios bloqueados fronte á unión a este grupo."
 
 #. TRANS: Form legend for unblocking a user from a group.
-#: actions/blockedfromgroup.php:291
 msgid "Unblock user from group"
 msgstr "Desbloquear o usuario do grupo"
 
 #. TRANS: Button text for unblocking a user from a group.
-#: actions/blockedfromgroup.php:323
 msgctxt "BUTTON"
 msgid "Unblock"
 msgstr "Desbloquear"
 
 #. TRANS: Tooltip for button for unblocking a user from a group.
 #. TRANS: Description of the form to unblock a user.
-#: actions/blockedfromgroup.php:327 lib/unblockform.php:78
 msgid "Unblock this user"
 msgstr "Desbloquear este usuario"
 
 #. TRANS: Title for mini-posting window loaded from bookmarklet.
 #. TRANS: %s is the StatusNet site name.
-#: actions/bookmarklet.php:51
 #, php-format
 msgid "Post to %s"
 msgstr "Publicar en %s"
 
 #. TRANS: Client error displayed when not providing a confirmation code in the contact address confirmation action.
-#: actions/confirmaddress.php:74
 msgid "No confirmation code."
 msgstr "Sen código de confirmación."
 
 #. TRANS: Client error displayed when providing a non-existing confirmation code in the contact address confirmation action.
-#: actions/confirmaddress.php:80
 msgid "Confirmation code not found."
 msgstr "Non se atopou o código de confirmación."
 
 #. TRANS: Client error displayed when not providing a confirmation code for another user in the contact address confirmation action.
-#: actions/confirmaddress.php:86
 msgid "That confirmation code is not for you!"
 msgstr "Ese código de confirmación non é para vostede!"
 
 #. TRANS: Server error for an unknown address type, which can be 'email', 'sms', or the name of an IM network (such as 'xmpp' or 'aim')
-#: actions/confirmaddress.php:94
-#, fuzzy, php-format
+#, php-format
 msgid "Unrecognized address type %s"
-msgstr "Non se recoñeceu o tipo de enderezo %s."
+msgstr "Non se recoñeceu o tipo de enderezo %s"
 
 #. TRANS: Client error for an already confirmed email/jabber/sms address.
-#: actions/confirmaddress.php:103 actions/confirmaddress.php:136
 msgid "That address has already been confirmed."
 msgstr "Ese enderezo xa se confirmou."
 
-#: actions/confirmaddress.php:121 actions/imsettings.php:444
-#: actions/userdesignsettings.php:306
-#, fuzzy
 msgid "Couldn't update user."
 msgstr "Non se puido actualizar o usuario."
 
-#: actions/confirmaddress.php:144
 #, fuzzy
 msgid "Couldn't update user im preferences."
 msgstr "Non se puido actualizar o rexistro do usuario."
 
-#: actions/confirmaddress.php:156
 #, fuzzy
 msgid "Couldn't insert user im preferences."
 msgstr "Non se puido inserir unha subscrición nova."
 
 #. TRANS: Server error displayed when an address confirmation code deletion from the
 #. TRANS: database fails in the contact address confirmation action.
-#: actions/confirmaddress.php:169
 #, fuzzy
 msgid "Could not delete address confirmation."
 msgstr "Non se puido borrar a confirmación por mensaxería instantánea."
 
 #. TRANS: Title for the contact address confirmation action.
-#: actions/confirmaddress.php:185
 msgid "Confirm address"
 msgstr "Confirmar o enderezo"
 
 #. TRANS: Success message for the contact address confirmation action.
 #. TRANS: %s can be 'email', 'jabber', or 'sms'.
-#: actions/confirmaddress.php:200
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "Confirmouse o enderezo \"%s\" para a súa conta."
 
 #. TRANS: Title for page with a conversion (multiple notices in context).
-#: actions/conversation.php:96
 msgid "Conversation"
 msgstr "Conversa"
 
 #. TRANS: Header on conversation page. Hidden by default (h2).
 #. TRANS: Label for user statistics.
-#: actions/conversation.php:149 lib/noticelist.php:87
-#: lib/profileaction.php:246 lib/searchgroupnav.php:82
-#: lib/threadednoticelist.php:66
 msgid "Notices"
 msgstr "Notas"
 
 #. TRANS: Client exception displayed trying to delete a user account while not logged in.
-#: actions/deleteaccount.php:71
 #, fuzzy
 msgid "Only logged-in users can delete their account."
 msgstr "Só os usuarios identificados poden repetir notas."
 
 #. TRANS: Client exception displayed trying to delete a user account without have the rights to do that.
-#: actions/deleteaccount.php:77
 #, fuzzy
 msgid "You cannot delete your account."
 msgstr "Non pode borrar usuarios."
 
 #. TRANS: Confirmation text for user deletion. The user has to type this exactly the same, including punctuation.
-#: actions/deleteaccount.php:160 actions/deleteaccount.php:297
 msgid "I am sure."
 msgstr ""
 
 #. TRANS: Notification for user about the text that must be input to be able to delete a user account.
 #. TRANS: %s is the text that needs to be input.
-#: actions/deleteaccount.php:164
 #, php-format
 msgid "You must write \"%s\" exactly in the box."
 msgstr ""
 
 #. TRANS: Confirmation that a user account has been deleted.
-#: actions/deleteaccount.php:206
 #, fuzzy
 msgid "Account deleted."
 msgstr "Borrouse o avatar."
 
 #. TRANS: Page title for page on which a user account can be deleted.
 #. TRANS: Option in profile settings to delete the account of the currently logged in user.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:476
 #, fuzzy
 msgid "Delete account"
 msgstr "Crear unha conta"
 
 #. TRANS: Form text for user deletion form.
-#: actions/deleteaccount.php:279
 msgid ""
 "This will <strong>permanently delete</strong> your account data from this "
 "server."
@@ -1938,7 +1523,6 @@ msgstr ""
 
 #. TRANS: Additional form text for user deletion form shown if a user has account backup rights.
 #. TRANS: %s is a URL to the backup page.
-#: actions/deleteaccount.php:285
 #, php-format
 msgid ""
 "You are strongly advised to <a href=\"%s\">back up your data</a> before "
@@ -1947,56 +1531,43 @@ msgstr ""
 
 #. TRANS: Field label for delete account confirmation entry.
 #. TRANS: Field label for password reset form where the password has to be typed again.
-#: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:262 actions/register.php:419
 msgid "Confirm"
 msgstr "Confirmar"
 
 #. TRANS: Input title for the delete account field.
 #. TRANS: %s is the text that needs to be input.
-#: actions/deleteaccount.php:304
 #, fuzzy, php-format
 msgid "Enter \"%s\" to confirm that you want to delete your account."
 msgstr "Non pode borrar usuarios."
 
 #. TRANS: Button title for user account deletion.
-#: actions/deleteaccount.php:323
 #, fuzzy
 msgid "Permanently delete your account"
 msgstr "Non pode borrar usuarios."
 
 #. TRANS: Client error displayed trying to delete an application while not logged in.
-#: actions/deleteapplication.php:62
 msgid "You must be logged in to delete an application."
 msgstr "Ten que iniciar sesión para borrar unha aplicación."
 
 #. TRANS: Client error displayed trying to delete an application that does not exist.
-#: actions/deleteapplication.php:71
 msgid "Application not found."
 msgstr "Non se atopou a aplicación."
 
 #. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
-#: actions/deleteapplication.php:79 actions/editapplication.php:78
-#: actions/showapplication.php:90
 msgid "You are not the owner of this application."
 msgstr "Non é o dono desa aplicación."
 
 #. TRANS: Client error text when there is a problem with the session token.
-#: actions/deleteapplication.php:102 actions/editapplication.php:131
-#: actions/newapplication.php:112 actions/showapplication.php:113
-#: lib/action.php:1391
 msgid "There was a problem with your session token."
 msgstr "Houbo un problema co seu pase."
 
 #. TRANS: Title for delete application page.
 #. TRANS: Fieldset legend on delete application page.
-#: actions/deleteapplication.php:124 actions/deleteapplication.php:149
 msgid "Delete application"
 msgstr "Borrar a aplicación"
 
 #. TRANS: Confirmation text on delete application page.
-#: actions/deleteapplication.php:152
 msgid ""
 "Are you sure you want to delete this application? This will clear all data "
 "about the application from the database, including all existing user "
@@ -2007,19 +1578,16 @@ msgstr ""
 "usuario existentes."
 
 #. TRANS: Submit button title for 'No' when deleting an application.
-#: actions/deleteapplication.php:161
 #, fuzzy
 msgid "Do not delete this application."
 msgstr "Non borrar a aplicación"
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
-#: actions/deleteapplication.php:167
 #, fuzzy
 msgid "Delete this application."
 msgstr "Borrar a aplicación"
 
 #. TRANS: Client error when trying to delete group while not logged in.
-#: actions/deletegroup.php:64
 #, fuzzy
 msgid "You must be logged in to delete a group."
 msgstr "Ten que identificarse para deixar un grupo."
@@ -2027,39 +1595,32 @@ msgstr "Ten que identificarse para deixar un grupo."
 #. TRANS: Client error when trying to delete a group without providing a nickname or ID for the group.
 #. TRANS: Client error displayed when trying to join a group without providing a group name or group ID.
 #. TRANS: Client error displayed when trying to leave a group without providing a group name or group ID.
-#: actions/deletegroup.php:94 actions/joingroup.php:89
-#: actions/leavegroup.php:89
 msgid "No nickname or ID."
 msgstr "Nin alcume nin ID."
 
 #. TRANS: Client error when trying to delete a group without having the rights to delete it.
-#: actions/deletegroup.php:107
 #, fuzzy
 msgid "You are not allowed to delete this group."
 msgstr "Vostede non pertence a este grupo."
 
 #. TRANS: Server error displayed if a group could not be deleted.
 #. TRANS: %s is the name of the group that could not be deleted.
-#: actions/deletegroup.php:150
 #, fuzzy, php-format
 msgid "Could not delete group %s."
 msgstr "Non se puido actualizar o grupo."
 
 #. TRANS: Message given after deleting a group.
 #. TRANS: %s is the deleted group's name.
-#: actions/deletegroup.php:159
 #, fuzzy, php-format
 msgid "Deleted group %s"
 msgstr "%1$s deixou o grupo %2$s"
 
 #. TRANS: Title of delete group page.
 #. TRANS: Form legend for deleting a group.
-#: actions/deletegroup.php:176 actions/deletegroup.php:202
 msgid "Delete group"
 msgstr "Borrar un grupo"
 
 #. TRANS: Warning in form for deleleting a group.
-#: actions/deletegroup.php:206
 #, fuzzy
 msgid ""
 "Are you sure you want to delete this group? This will clear all data about "
@@ -2070,13 +1631,11 @@ msgstr ""
 "usuario da base de datos, sen posibilidade de recuperalos."
 
 #. TRANS: Submit button title for 'No' when deleting a group.
-#: actions/deletegroup.php:224
 #, fuzzy
 msgid "Do not delete this group."
 msgstr "Non borrar esta nota"
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
-#: actions/deletegroup.php:231
 #, fuzzy
 msgid "Delete this group."
 msgstr "Borrar o usuario"
@@ -2087,22 +1646,18 @@ msgstr "Borrar o usuario"
 #. TRANS: Client error displayed trying to block a user from a group while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying to log out when not logged in.
+#. TRANS: Client error displayed when trying to access the "make admin" page while not logged in.
+#. TRANS: Client error displayed trying to create a new direct message while not logged in.
+#. TRANS: Client error displayed trying to send a notice while not logged in.
+#. TRANS: Client error displayed trying to nudge a user without being logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
 #. TRANS: Client error displayed when trying to change user options while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
-#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:70
-#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
-#: actions/nudge.php:63 actions/pluginenable.php:97 actions/subedit.php:33
-#: actions/subscribe.php:98 actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:71 lib/profileformaction.php:63
-#: lib/settingsaction.php:72
 msgid "Not logged in."
 msgstr "Non iniciou sesión."
 
 #. TRANS: Instructions for deleting a notice.
-#: actions/deletenotice.php:110
 msgid ""
 "You are about to permanently delete a notice. Once this is done, it cannot "
 "be undone."
@@ -2112,51 +1667,42 @@ msgstr ""
 
 #. TRANS: Page title when deleting a notice.
 #. TRANS: Fieldset legend for the delete notice form.
-#: actions/deletenotice.php:117 actions/deletenotice.php:148
 msgid "Delete notice"
 msgstr "Borrar a nota"
 
 #. TRANS: Message for the delete notice form.
-#: actions/deletenotice.php:152
 msgid "Are you sure you want to delete this notice?"
 msgstr "Está seguro de querer borrar esta nota?"
 
 #. TRANS: Submit button title for 'No' when deleting a notice.
-#: actions/deletenotice.php:159
 #, fuzzy
 msgid "Do not delete this notice."
 msgstr "Non borrar esta nota"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:166
 #, fuzzy
 msgid "Delete this notice."
 msgstr "Borrar esta nota"
 
 #. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
-#: actions/deleteuser.php:66
 msgid "You cannot delete users."
 msgstr "Non pode borrar usuarios."
 
 #. TRANS: Client error displayed when trying to delete a non-local user.
-#: actions/deleteuser.php:74
 msgid "You can only delete local users."
 msgstr "Só pode borrar usuarios locais."
 
 #. TRANS: Title of delete user page.
-#: actions/deleteuser.php:110
 #, fuzzy
 msgctxt "TITLE"
 msgid "Delete user"
 msgstr "Borrar o usuario"
 
 #. TRANS: Fieldset legend on delete user page.
-#: actions/deleteuser.php:134
 msgid "Delete user"
 msgstr "Borrar o usuario"
 
 #. TRANS: Information text to request if a user is certain that the described action has to be performed.
-#: actions/deleteuser.php:138
 msgid ""
 "Are you sure you want to delete this user? This will clear all data about "
 "the user from the database, without a backup."
@@ -2165,102 +1711,83 @@ msgstr ""
 "usuario da base de datos, sen posibilidade de recuperalos."
 
 #. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/deleteuser.php:158
 #, fuzzy
 msgid "Do not delete this user."
 msgstr "Non borrar esta nota"
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
-#: actions/deleteuser.php:165
 #, fuzzy
 msgid "Delete this user."
 msgstr "Borrar o usuario"
 
 #. TRANS: Message used as title for design settings for the site.
-#: actions/designadminpanel.php:60 lib/settingsnav.php:97
 msgid "Design"
 msgstr "Deseño"
 
 #. TRANS: Instructions for design adminsitration panel.
-#: actions/designadminpanel.php:71
 msgid "Design settings for this StatusNet site"
 msgstr "Configuración de deseño para este sitio StatusNet"
 
 #. TRANS: Client error displayed when a logo URL does is not valid.
-#: actions/designadminpanel.php:327
 msgid "Invalid logo URL."
 msgstr "URL do logo incorrecto."
 
 #. TRANS: Client error displayed when an SSL logo URL is invalid.
-#: actions/designadminpanel.php:333
 #, fuzzy
 msgid "Invalid SSL logo URL."
 msgstr "URL do logo incorrecto."
 
 #. TRANS: Client error displayed when a theme is submitted through the form that is not in the theme list.
 #. TRANS: %s is the chosen unavailable theme.
-#: actions/designadminpanel.php:339
 #, php-format
 msgid "Theme not available: %s."
 msgstr "O tema visual non está dispoñible: %s."
 
 #. TRANS: Fieldset legend for form to change logo.
-#: actions/designadminpanel.php:437
 msgid "Change logo"
 msgstr "Cambiar o logo"
 
 #. TRANS: Field label for StatusNet site logo.
-#: actions/designadminpanel.php:444
 msgid "Site logo"
 msgstr "Logo do sitio"
 
 #. TRANS: Field label for SSL StatusNet site logo.
-#: actions/designadminpanel.php:452
 #, fuzzy
 msgid "SSL logo"
 msgstr "Logo do sitio"
 
 #. TRANS: Fieldset legend for form change StatusNet site's theme.
-#: actions/designadminpanel.php:467
 msgid "Change theme"
 msgstr "Cambiar o tema visual"
 
 #. TRANS: Field label for dropdown to choose site theme.
-#: actions/designadminpanel.php:485
 msgid "Site theme"
 msgstr "Tema visual do sitio"
 
 #. TRANS: Title for field label for dropdown to choose site theme.
-#: actions/designadminpanel.php:487
 msgid "Theme for the site."
 msgstr "Tema visual para o sitio."
 
 #. TRANS: Field label for uploading a cutom theme.
-#: actions/designadminpanel.php:494
 msgid "Custom theme"
 msgstr "Tema visual personalizado"
 
 #. TRANS: Form instructions for uploading a cutom StatusNet theme.
-#: actions/designadminpanel.php:499
 msgid "You can upload a custom StatusNet theme as a .ZIP archive."
 msgstr ""
 "Pode cargar como arquivo .ZIP un tema visual personalizado para StatusNet"
 
 #. TRANS: Fieldset legend for theme background image.
-#: actions/designadminpanel.php:515
 msgid "Change background image"
 msgstr "Cambiar a imaxe de fondo"
 
 #. TRANS: Field label for background image on theme designer page.
 #. TRANS: Field label for background color selector.
 #. TRANS: Label on profile design page for setting a profile page background colour.
-#: actions/designadminpanel.php:525 actions/designadminpanel.php:609
-#: lib/designform.php:238
 msgid "Background"
 msgstr "Fondo"
 
 #. TRANS: Form guide for background image upload form on theme designer page.
-#: actions/designadminpanel.php:531
 #, php-format
 msgid ""
 "You can upload a background image for the site. The maximum file size is %1"
@@ -2270,204 +1797,169 @@ msgstr ""
 "ficheiro é de %1$s."
 
 #. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:558
 msgid "On"
 msgstr "Activado"
 
 #. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:575
 msgid "Off"
 msgstr "Desactivado"
 
 #. TRANS: Form guide for turning background image on or off on theme designer page.
 #. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
 #. TRANS: use of the uploaded profile image.
-#: actions/designadminpanel.php:577 lib/designform.php:214
 msgid "Turn background image on or off."
 msgstr "Activar ou desactivar a imaxe de fondo."
 
 #. TRANS: Checkbox label to title background image on theme designer page.
 #. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-#: actions/designadminpanel.php:583 lib/designform.php:220
 msgid "Tile background image"
 msgstr "Imaxe de fondo en mosaico"
 
 #. TRANS: Fieldset legend for theme colors.
-#: actions/designadminpanel.php:598
 #, fuzzy
 msgid "Change colors"
 msgstr "Cambiar as cores"
 
 #. TRANS: Field label for content color selector.
 #. TRANS: Label on profile design page for setting a profile page content colour.
-#: actions/designadminpanel.php:623 lib/designform.php:252
 msgid "Content"
 msgstr "Contido"
 
 #. TRANS: Field label for sidebar color selector.
 #. TRANS: Label on profile design page for setting a profile page sidebar colour.
-#: actions/designadminpanel.php:637 lib/designform.php:266
 msgid "Sidebar"
 msgstr "Barra lateral"
 
 #. TRANS: Field label for text color selector.
 #. TRANS: Label on profile design page for setting a profile page text colour.
-#: actions/designadminpanel.php:651 lib/designform.php:280
 msgid "Text"
 msgstr "Texto"
 
 #. TRANS: Field label for link color selector.
 #. TRANS: Label on profile design page for setting a profile page links colour.
-#: actions/designadminpanel.php:665 lib/designform.php:294
 msgid "Links"
 msgstr "Ligazóns"
 
 #. TRANS: Fieldset legend for advanced theme design settings.
-#: actions/designadminpanel.php:691
 msgid "Advanced"
 msgstr "Avanzado"
 
 #. TRANS: Field label for custom CSS.
-#: actions/designadminpanel.php:696
 msgid "Custom CSS"
 msgstr "CSS personalizado"
 
 #. TRANS: Button text for resetting theme settings.
-#: actions/designadminpanel.php:718
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Use defaults"
 msgstr "Utilizar os valores por defecto"
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:720
 #, fuzzy
 msgid "Restore default designs."
 msgstr "Restaurar o deseño por defecto"
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:728
 #, fuzzy
 msgid "Reset back to default."
 msgstr "Volver ao deseño por defecto"
 
 #. TRANS: Title for button for saving theme settings.
-#: actions/designadminpanel.php:736
 #, fuzzy
 msgid "Save design."
 msgstr "Gardar o deseño"
 
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
-#: actions/disfavor.php:83
 msgid "This notice is not a favorite!"
 msgstr "Esta nota non é unha das favoritas!"
 
 #. TRANS: Title for page on which favorites can be added.
-#: actions/disfavor.php:98
 msgid "Add to favorites"
 msgstr "Engadir aos favoritos"
 
 #. TRANS: Client exception thrown when requesting a document from the documentation that does not exist.
 #. TRANS: %s is the non-existing document.
-#: actions/doc.php:155
 #, fuzzy, php-format
 msgid "No such document \"%s\"."
 msgstr "Non hai ningún documento \"%s\""
 
 #. TRANS: Title for "Edit application" form.
 #. TRANS: Form legend.
-#: actions/editapplication.php:54 lib/applicationeditform.php:129
 msgid "Edit application"
 msgstr "Modificar a aplicación"
 
 #. TRANS: Client error displayed trying to edit an application while not logged in.
-#: actions/editapplication.php:66
 msgid "You must be logged in to edit an application."
 msgstr "Ten que iniciar sesión para editar unha aplicación."
 
 #. TRANS: Client error displayed trying to edit an application that does not exist.
-#: actions/editapplication.php:83 actions/showapplication.php:83
 msgid "No such application."
 msgstr "Non existe esa aplicación."
 
 #. TRANS: Instructions for "Edit application" form.
-#: actions/editapplication.php:167
 msgid "Use this form to edit your application."
 msgstr "Utilice este formulario para editar a súa aplicación."
 
 #. TRANS: Validation error shown when not providing a name in the "Edit application" form.
 #. TRANS: Validation error shown when not providing a name in the "New application" form.
-#: actions/editapplication.php:184 actions/newapplication.php:164
 msgid "Name is required."
 msgstr "Fai falla un nome."
 
 #. 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.
-#: actions/editapplication.php:188 actions/newapplication.php:172
 #, fuzzy
 msgid "Name is too long (maximum 255 characters)."
 msgstr "O nome é longo de máis (o límite é de 255 caracteres)."
 
 #. TRANS: Validation error shown when providing a name for an application that already exists in the "Edit application" form.
 #. TRANS: Validation error shown when providing a name for an application that already exists in the "New application" form.
-#: actions/editapplication.php:192 actions/newapplication.php:168
 msgid "Name already in use. Try another one."
 msgstr "O nome xa está en uso. Probe con outro."
 
 #. TRANS: Validation error shown when not providing a description in the "Edit application" form.
 #. TRANS: Validation error shown when not providing a description in the "New application" form.
-#: actions/editapplication.php:196 actions/newapplication.php:176
 msgid "Description is required."
 msgstr "Fai falla unha descrición."
 
 #. TRANS: Validation error shown when providing too long a source URL in the "Edit application" form.
-#: actions/editapplication.php:209
 msgid "Source URL is too long."
 msgstr "O URL de orixe é longo de máis."
 
 #. TRANS: Validation error shown when providing an invalid source URL in the "Edit application" form.
 #. TRANS: Validation error shown when providing an invalid source URL in the "New application" form.
-#: actions/editapplication.php:216 actions/newapplication.php:199
 msgid "Source URL is not valid."
 msgstr "O URL de orixe é incorrecto."
 
 #. 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.
-#: actions/editapplication.php:220 actions/newapplication.php:203
 msgid "Organization is required."
 msgstr "Fai falla unha organización."
 
 #. TRANS: Validation error shown when providing too long an arganisation name in the "Edit application" form.
-#: actions/editapplication.php:224 actions/newapplication.php:207
 #, fuzzy
 msgid "Organization is too long (maximum 255 characters)."
 msgstr "A organización é longa de máis (o límite é de 255 caracteres)."
 
 #. TRANS: Form validation error show when an organisation name has not been provided in the edit application form.
 #. TRANS: Form validation error show when an organisation name has not been provided in the new application form.
-#: actions/editapplication.php:228 actions/newapplication.php:211
 msgid "Organization homepage is required."
 msgstr "Fai falla unha páxina web da organización."
 
 #. TRANS: Validation error shown when providing too long a callback URL in the "Edit application" form.
 #. TRANS: Validation error shown when providing too long a callback URL in the "New application" form.
-#: actions/editapplication.php:239 actions/newapplication.php:225
 msgid "Callback is too long."
 msgstr "O retorno de chamada é longo de máis."
 
 #. TRANS: Validation error shown when providing an invalid callback URL in the "Edit application" form.
 #. TRANS: Validation error shown when providing an invalid callback URL in the "New application" form.
-#: actions/editapplication.php:247 actions/newapplication.php:235
 msgid "Callback URL is not valid."
 msgstr "O URL do retorno de chamada é incorrecto."
 
 #. TRANS: Server error occuring when an application could not be updated from the "Edit application" form.
-#: actions/editapplication.php:284
 msgid "Could not update application."
 msgstr "Non se puido actualizar a aplicación."
 
 #. TRANS: Title for form to edit a group. %s is a group nickname.
-#: actions/editgroup.php:55
 #, php-format
 msgid "Edit %s group"
 msgstr "Editar o grupo %s"
@@ -2475,40 +1967,40 @@ msgstr "Editar o grupo %s"
 #. TRANS: Client error displayed trying to edit a group while not logged in.
 #. TRANS: Client error displayed when trying to create a group while not logged in.
 #. TRANS: Client error displayed trying to create a group while not logged in.
-#: actions/editgroup.php:68 actions/grouplogo.php:69 actions/newgroup.php:65
 msgid "You must be logged in to create a group."
 msgstr "Ten que iniciar sesión para crear un grupo."
 
 #. TRANS: Form instructions for group edit form.
-#: actions/editgroup.php:161
 msgid "Use this form to edit the group."
 msgstr "Utilice este formulario para editar o grupo."
 
+#. TRANS: Group edit form validation error.
+#. TRANS: Group create form validation error.
+#. TRANS: %s is the invalid alias.
+#, php-format
+msgid "Invalid alias: \"%s\""
+msgstr "Pseudónimo inválido: \"%s\""
+
 #. TRANS: Group edit form success message.
-#: actions/editgroup.php:301
 msgid "Options saved."
 msgstr "Gardáronse as preferencias."
 
 #. TRANS: Title for e-mail settings.
-#: actions/emailsettings.php:60
 msgid "Email settings"
 msgstr "Configuración do correo electrónico"
 
 #. TRANS: E-mail settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/emailsettings.php:74
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 msgstr "Xestiona a forma en que recibes correo electrónico de %%site.name%%."
 
 #. TRANS: Form legend for e-mail settings form.
 #. TRANS: Field label for e-mail address input in e-mail settings form.
-#: actions/emailsettings.php:104 actions/emailsettings.php:130
 msgid "Email address"
 msgstr "Enderezo de correo electrónico"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:110
 msgid "Current confirmed email address."
 msgstr "Enderezo de correo electrónico confirmado actualmente."
 
@@ -2517,15 +2009,11 @@ msgstr "Enderezo de correo electrónico confirmado actualmente."
 #. TRANS: Button label to remove a confirmed IM address.
 #. TRANS: Button label to remove a confirmed SMS address.
 #. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
-#: actions/emailsettings.php:113 actions/emailsettings.php:180
-#: actions/imsettings.php:119 actions/smssettings.php:119
-#: actions/smssettings.php:175
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Borrar"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:120
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -2538,47 +2026,39 @@ msgstr ""
 #. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
 #. TRANS: Any other domain may be owned by a legitimate person or
 #. TRANS: organization.
-#: actions/emailsettings.php:137
 msgid "Email address, like \"UserName@example.org\""
 msgstr "Enderezo de correo electrónico, coma \"nomedeusuario@example.org\""
 
 #. TRANS: Button label for adding an e-mail address in e-mail settings form.
 #. TRANS: Button label for adding an IM address in IM settings form.
 #. TRANS: Button label for adding a SMS phone number in SMS settings form.
-#: actions/emailsettings.php:141 actions/imsettings.php:147
-#: actions/smssettings.php:157
 msgctxt "BUTTON"
 msgid "Add"
 msgstr "Engadir"
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:149 actions/smssettings.php:166
 msgid "Incoming email"
 msgstr "Correo entrante"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:155
 msgid "I want to post notices by email."
 msgstr "Quero publicar notas por correo electrónico."
 
 #. TRANS: Form instructions for incoming e-mail form in e-mail settings.
 #. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
-#: actions/emailsettings.php:177 actions/smssettings.php:173
 msgid "Send email to this address to post new notices."
 msgstr ""
 "Enviar un correo electrónico a este enderezo para publicar novas notas."
 
 #. TRANS: Instructions for incoming e-mail address input form, when an address has already been assigned.
 #. TRANS: Instructions for incoming SMS e-mail address input form.
-#: actions/emailsettings.php:186 actions/smssettings.php:181
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr ""
 "Establece un novo enderezo de correo electrónico no que publicar, e cancela "
 "o vello."
 
 #. TRANS: Instructions for incoming e-mail address input form.
-#: actions/emailsettings.php:190
 msgid ""
 "To send notices via email, we need to create a unique email address for you "
 "on this server:"
@@ -2586,93 +2066,75 @@ msgstr ""
 
 #. TRANS: Button label for adding an e-mail address to send notices from.
 #. TRANS: Button label for adding an SMS e-mail address to send notices from.
-#: actions/emailsettings.php:196 actions/smssettings.php:184
 msgctxt "BUTTON"
 msgid "New"
 msgstr "Novo"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:205
 msgid "Email preferences"
 msgstr "Preferencias de correo electrónico"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:213
 msgid "Send me notices of new subscriptions through email."
 msgstr "Enviarme notas acerca de novas subscricións por correo electrónico."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:219
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr ""
 "Enviádeme un correo electrónico cando alguén marque como favorito algunha "
 "das miñas notas."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:226
 msgid "Send me email when someone sends me a private message."
 msgstr ""
 "Enviádeme un correo electrónico cando alguén me envíe unha mensaxe privada."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:232
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr "Enviádeme un correo electrónico cando alguén me envíe unha resposta."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:238
 msgid "Allow friends to nudge me and send me an email."
 msgstr ""
 "Permitirlles aos meus amigos facerme acenos e enviarme correos electrónicos."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:244
 msgid "Publish a MicroID for my email address."
 msgstr "Publicar unha MicroID para o meu enderezo de correo electrónico."
 
 #. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:362
 msgid "Email preferences saved."
 msgstr "Gardáronse as preferencias de correo electrónico."
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:381
 msgid "No email address."
 msgstr "Non hai enderezo de correo electrónico."
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:389
 #, fuzzy
 msgid "Cannot normalize that email address."
 msgstr "Non se pode normalizar ese enderezo de correo electrónico"
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:394 actions/register.php:197
-#: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "O enderezo de correo electrónico é incorrecto."
 
 #. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:398
 msgid "That is already your email address."
 msgstr "Ese enderezo de correo electrónico é o que ten agora."
 
 #. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:402
 msgid "That email address already belongs to another user."
 msgstr "Ese enderezo de correo electrónico xa pertence a outro usuario."
 
 #. TRANS: Server error thrown on database error adding e-mail confirmation code.
 #. TRANS: Server error thrown on database error adding Instant Messaging confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:419 actions/imsettings.php:362
-#: actions/smssettings.php:364
 #, fuzzy
 msgid "Could not insert confirmation code."
 msgstr "Non se puido inserir o código de confirmación."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:426
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
@@ -2684,102 +2146,82 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling Instant Messaging address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:446 actions/imsettings.php:391
-#: actions/smssettings.php:398
 msgid "No pending confirmation to cancel."
 msgstr "Non hai ningunha confirmación pendente que cancelar."
 
 #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:451
 msgid "That is the wrong email address."
 msgstr "Ese enderezo de correo electrónico é incorrecto."
 
 #. TRANS: Server error thrown on database error canceling e-mail address confirmation.
 #. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
-#: actions/emailsettings.php:460 actions/smssettings.php:412
 #, fuzzy
 msgid "Could not delete email confirmation."
 msgstr "Non se puido borrar a confirmación por correo electrónico."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:465
 msgid "Email confirmation cancelled."
 msgstr "Cancelouse a confirmación por correo electrónico."
 
 #. TRANS: Message given trying to remove an e-mail address that is not
 #. TRANS: registered for the active user.
-#: actions/emailsettings.php:484
 msgid "That is not your email address."
 msgstr "Ese non é o seu enderezo de correo electrónico."
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:505
 msgid "The email address was removed."
 msgstr "Borrouse o enderezo de correo electrónico."
 
 #. TRANS: Form validation error displayed when trying to remove an incoming e-mail address while no address has been set.
-#: actions/emailsettings.php:519 actions/smssettings.php:554
 msgid "No incoming email address."
 msgstr "Non hai ningún enderezo ao que enviar."
 
 #. 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.
-#: actions/emailsettings.php:531 actions/emailsettings.php:555
-#: actions/smssettings.php:565 actions/smssettings.php:590
 #, fuzzy
 msgid "Could not update user record."
 msgstr "Non se puido actualizar o rexistro do usuario."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
 #. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:535 actions/smssettings.php:569
 msgid "Incoming email address removed."
 msgstr "Borrouse o enderezo de correo electrónico entrante."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
 #. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:559 actions/smssettings.php:594
 msgid "New incoming email address added."
 msgstr "Engadiuse un novo enderezo de correo electrónico entrante."
 
 #. TRANS: Client error displayed when trying to mark a notice as favorite that already is a favorite.
-#: actions/favor.php:80
 msgid "This notice is already a favorite!"
 msgstr "A nota xa é unha das súas favoritas!"
 
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
-#: actions/favor.php:95
 #, fuzzy
 msgid "Disfavor favorite."
 msgstr "Desmarcar como favorita"
 
 #. TRANS: Page title for first page of favorited notices.
 #. TRANS: Title for favourited notices section.
-#: actions/favorited.php:65 lib/popularnoticesection.php:62
-#: lib/publicgroupnav.php:93
 msgid "Popular notices"
 msgstr "Notas populares"
 
 #. TRANS: Page title for all but first page of favorited notices.
 #. TRANS: %d is the page number being displayed.
-#: actions/favorited.php:69
 #, php-format
 msgid "Popular notices, page %d"
 msgstr "Notas populares, páxina %d"
 
 #. TRANS: Description on page displaying favorited notices.
-#: actions/favorited.php:81
 msgid "The most popular notices on the site right now."
 msgstr "As notas máis populares do sitio nestes intres."
 
 #. TRANS: Text displayed instead of a list when a site does not yet have any favourited notices.
-#: actions/favorited.php:149
 msgid "Favorite notices appear on this page but no one has favorited one yet."
 msgstr "As notas favoritas aparecen nesta páxina, pero aínda non hai ningunha."
 
 #. TRANS: Additional text displayed instead of a list when a site does not yet have any favourited notices for logged in users.
-#: actions/favorited.php:153
 msgid ""
 "Be the first to add a notice to your favorites by clicking the fave button "
 "next to any notice you like."
@@ -2789,7 +2231,6 @@ msgstr ""
 
 #. TRANS: Additional text displayed instead of a list when a site does not yet have any favourited notices for not logged in users.
 #. TRANS: %%action.register%% is a registration link. "[link text](link)" is Mark Down. Do not change the formatting.
-#: actions/favorited.php:158
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to add a "
@@ -2802,181 +2243,146 @@ msgstr ""
 #. TRANS: %s is a user's nickname.
 #. TRANS: Title for first page of favourite notices of a user.
 #. TRANS: %s is the user for whom the favourite notices are displayed.
-#: actions/favoritesrss.php:111 actions/showfavorites.php:76
-#: lib/personalgroupnav.php:110
 #, php-format
 msgid "%s's favorite notices"
 msgstr "Notas favoritas de %s"
 
 #. TRANS: Desciption of RSS feed with favourite notices of a user.
 #. TRANS: %1$s is a user's nickname, %2$s is the name of the StatusNet site.
-#: actions/favoritesrss.php:117
 #, php-format
 msgid "Updates favored by %1$s on %2$s!"
 msgstr "Actualizacións favoritas de %1$s en %2$s!"
 
 #. TRANS: Page title for first page of featured users.
 #. TRANS: Title for featured users section.
-#: actions/featured.php:69 lib/featureduserssection.php:87
-#: lib/publicgroupnav.php:89
 msgid "Featured users"
 msgstr "Usuarios do momento"
 
 #. TRANS: Page title for all but first page of featured users.
 #. TRANS: %d is the page number being displayed.
-#: actions/featured.php:73
 #, php-format
 msgid "Featured users, page %d"
 msgstr "Usuarios do momento, páxina %d"
 
 #. TRANS: Description on page displaying featured users.
-#: actions/featured.php:102
 #, fuzzy, php-format
 msgid "A selection of some great users on %s."
 msgstr "Unha selección dalgúns bos usuarios en %s"
 
 #. TRANS: Client error displayed when no notice ID was given trying do display a file.
-#: actions/file.php:36
 msgid "No notice ID."
 msgstr "A nota non ten ningunha ID."
 
 #. TRANS: Client error displayed when an invalid notice ID was given trying do display a file.
-#: actions/file.php:41
 msgid "No notice."
 msgstr "Non hai ningunha nota."
 
 #. TRANS: Client error displayed when trying do display a file for a notice without a file attachement.
-#: actions/file.php:46
 msgid "No attachments."
 msgstr "Non hai ningún dato adxunto."
 
 #. TRANS: Client error displayed when trying do display a file for a notice with file attachements
 #. TRANS: that could not be found.
-#: actions/file.php:58
 msgid "No uploaded attachments."
 msgstr "Non se cargou ningún dato adxunto."
 
 #. TRANS: Client error displayed when subscribing to a remote profile and an unexpected response is received.
-#: actions/finishremotesubscribe.php:69
 msgid "Not expecting this response!"
 msgstr "Non se esperaba esta resposta!"
 
 #. TRANS: Client error displayed when subscribing to a remote profile that does not exist.
-#: actions/finishremotesubscribe.php:81
 msgid "User being listened to does not exist."
 msgstr "Non existe o usuario ao que está seguindo."
 
 #. TRANS: Client error displayed when subscribing to a remote profile that is a local profile.
-#: actions/finishremotesubscribe.php:89 actions/remotesubscribe.php:58
 msgid "You can use the local subscription!"
 msgstr "Pode usar a subscrición local!"
 
 #. TRANS: Client error displayed when subscribing to a remote profile that is blocked form subscribing to.
-#: actions/finishremotesubscribe.php:102
 msgid "That user has blocked you from subscribing."
 msgstr "Ese usuario bloqueouno fronte á subscrición a el."
 
 #. TRANS: Client error displayed when subscribing to a remote profile without providing an authorised token.
-#: actions/finishremotesubscribe.php:114
 msgid "You are not authorized."
 msgstr "Non está autorizado."
 
 #. TRANS: Client error displayed when subscribing to a remote profile and conversion of the request token to access token fails.
-#: actions/finishremotesubscribe.php:118
 msgid "Could not convert request token to access token."
 msgstr "Non se puido converter a ficha da solicitude nun pase."
 
 #. TRANS: Client error displayed when subscribing to a remote profile fails because of an unsupported version of the OMB protocol.
-#: actions/finishremotesubscribe.php:124
 msgid "Remote service uses unknown version of OMB protocol."
 msgstr "O servizo remoto utiliza unha versión descoñecida do protocolo OMB."
 
 #. TRANS: Server error displayed when subscribing to a remote profile fails because the remote profile could not be updated.
-#: actions/finishremotesubscribe.php:145 lib/oauthstore.php:317
 msgid "Error updating remote profile."
 msgstr "Houbo un erro ao actualizar o perfil remoto."
 
 #. TRANS: Client error displayed when requesting a non-existent file.
-#: actions/getfile.php:77
 msgid "No such file."
 msgstr "Non existe tal ficheiro."
 
 #. TRANS: Client error displayed when requesting a file without having read access to it.
-#: actions/getfile.php:82
 msgid "Cannot read file."
 msgstr "Non se pode ler o ficheiro."
 
 #. TRANS: Client error displayed when trying to assign an invalid role to a user.
-#: actions/grantrole.php:61 actions/revokerole.php:62
 msgid "Invalid role."
 msgstr "Rol incorrecto."
 
 #. TRANS: Client error displayed when trying to assign an reserved role to a user.
-#: actions/grantrole.php:66 actions/revokerole.php:66
 msgid "This role is reserved and cannot be set."
 msgstr "Non se pode establecer este rol, está reservado."
 
 #. TRANS: Client error displayed when trying to assign a role to a user while not being allowed to set roles.
-#: actions/grantrole.php:76
 msgid "You cannot grant user roles on this site."
 msgstr "Non pode concederlles roles aos usuarios neste sitio."
 
 #. TRANS: Client error displayed when trying to assign a role to a user that already has that role.
-#: actions/grantrole.php:84
 msgid "User already has this role."
 msgstr "O usuario xa ten este rol."
 
 #. TRANS: Client error displayed trying to block a user from a group while not specifying a to be blocked user profile.
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing a profile.
+#. TRANS: Client error displayed when not providing a profile ID on the Make Admin page.
 #. TRANS: Client error displayed trying a change a subscription without providing a profile.
 #. TRANS: Client error displayed when trying to change user options without specifying a user to work on.
-#: actions/groupblock.php:71 actions/groupunblock.php:71
-#: actions/makeadmin.php:71 actions/subedit.php:49
-#: lib/profileformaction.php:79
 msgid "No profile specified."
 msgstr "Non se especificou ningún perfil."
 
 #. TRANS: Client error displayed trying to block a user from a group while specifying a non-existing profile.
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing an existing profile.
+#. TRANS: Client error displayed when specifying an invalid profile ID on the Make Admin page.
 #. TRANS: Client error displayed trying a change a subscription for a non-existant profile ID.
 #. TRANS: Client error displayed when trying to change user options without specifying an existing user to work on.
-#: actions/groupblock.php:77 actions/groupunblock.php:77
-#: actions/makeadmin.php:76 actions/subedit.php:57 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:87
 msgid "No profile with that ID."
 msgstr "Ningún perfil ten esa ID."
 
 #. TRANS: Client error displayed trying to block a user from a group while not specifying a group to block a profile from.
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing a group.
-#: actions/groupblock.php:83 actions/groupunblock.php:83
-#: actions/makeadmin.php:81
+#. TRANS: Client error displayed when not providing a group ID on the Make Admin page.
 msgid "No group specified."
 msgstr "Non se especificou ningún grupo."
 
 #. TRANS: Client error displayed trying to block a user from a group while not being an admin user.
-#: actions/groupblock.php:95
 msgid "Only an admin can block group members."
 msgstr "Só os administradores poden excluír a membros do grupo."
 
 #. TRANS: Client error displayed trying to block a user from a group while user is already blocked from the given group.
-#: actions/groupblock.php:100
 msgid "User is already blocked from group."
 msgstr "O usuario xa está excluído do grupo."
 
 #. TRANS: Client error displayed trying to block a user from a group while user is not a member of given group.
-#: actions/groupblock.php:106
 msgid "User is not a member of group."
 msgstr "O usuario non pertence ao grupo."
 
 #. TRANS: Title for block user from group page.
 #. TRANS: Form legend for form to block user from a group.
-#: actions/groupblock.php:141 actions/groupmembers.php:364
 msgid "Block user from group"
 msgstr "Excluír do grupo ao usuario"
 
 #. TRANS: Explanatory text for block user from group form before setting the block.
 #. TRANS: %1$s is that to be blocked user, %2$s is the group the user will be blocked from.
-#: actions/groupblock.php:169
 #, php-format
 msgid ""
 "Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They "
@@ -2988,40 +2394,33 @@ msgstr ""
 "el no futuro."
 
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
-#: actions/groupblock.php:191
 #, fuzzy
 msgid "Do not block this user from this group."
 msgstr "Non excluír deste grupo a este usuario"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
-#: actions/groupblock.php:198
 #, fuzzy
 msgid "Block this user from this group."
 msgstr "Excluír deste grupo a este usuario"
 
 #. TRANS: Server error displayed when trying to block a user from a group fails because of an application error.
-#: actions/groupblock.php:215
 msgid "Database error blocking user from group."
 msgstr "Houbo un erro na base de datos ao excluír do grupo ao usuario."
 
 #. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
 #. TRANS: Client error displayed trying to find a user by ID without providing an ID.
-#: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr "Sen ID."
 
 #. TRANS: Client error displayed trying to change group design settings while not logged in.
-#: actions/groupdesignsettings.php:67
 msgid "You must be logged in to edit a group."
 msgstr "Ten que estar identificado para editar un grupo."
 
 #. TRANS: Title group design settings page.
-#: actions/groupdesignsettings.php:146
 msgid "Group design"
 msgstr "Deseño do grupo"
 
 #. TRANS: Instructions for group design settings page.
-#: actions/groupdesignsettings.php:157
 msgid ""
 "Customize the way your group looks with a background image and a colour "
 "palette of your choice."
@@ -3030,25 +2429,21 @@ msgstr ""
 "da súa escolla."
 
 #. TRANS: Form validation error displayed when group design settings could not be updated because of an application issue.
-#: actions/groupdesignsettings.php:262
 #, fuzzy
 msgid "Unable to update your design settings."
 msgstr "Non se puido gardar a súa configuración de deseño."
 
 #. TRANS: Form text to confirm saved group design settings.
-#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:239
 msgid "Design preferences saved."
 msgstr "Gardáronse as preferencias de deseño."
 
 #. TRANS: Title for group logo settings page.
 #. TRANS: Group logo form legend.
-#: actions/grouplogo.php:144 actions/grouplogo.php:199
 msgid "Group logo"
 msgstr "Logo do grupo"
 
 #. TRANS: Instructions for group logo page.
 #. TRANS: %s is the maximum file size for that site.
-#: actions/grouplogo.php:156
 #, php-format
 msgid ""
 "You can upload a logo image for your group. The maximum file size is %s."
@@ -3057,91 +2452,75 @@ msgstr ""
 "s."
 
 #. TRANS: Submit button for uploading a group logo.
-#: actions/grouplogo.php:243
 msgid "Upload"
 msgstr "Cargar"
 
 #. TRANS: Button text for cropping an uploaded group logo.
-#: actions/grouplogo.php:299
 msgid "Crop"
 msgstr "Recortar"
 
 #. TRANS: Form instructions on the group logo page.
-#: actions/grouplogo.php:376
 msgid "Pick a square area of the image to be the logo."
 msgstr "Escolla unha zona cadrada da imaxe para usala como logo."
 
 #. TRANS: Form success message after updating a group logo.
-#: actions/grouplogo.php:411
 msgid "Logo updated."
 msgstr "Actualizouse o logo."
 
 #. TRANS: Form failure message after failing to update a group logo.
-#: actions/grouplogo.php:414
 msgid "Failed updating logo."
 msgstr "Non se puido actualizar o logo."
 
 #. TRANS: Title of the page showing group members.
 #. TRANS: %s is the name of the group.
-#: actions/groupmembers.php:104
 #, php-format
 msgid "%s group members"
 msgstr "Membros do grupo %s"
 
 #. TRANS: Title of the page showing group members.
 #. TRANS: %1$s is the name of the group, %2$d is the page number of the members list.
-#: actions/groupmembers.php:109
 #, php-format
 msgid "%1$s group members, page %2$d"
 msgstr "Membros do grupo %1$s, páxina %2$d"
 
 #. TRANS: Page notice for group members page.
-#: actions/groupmembers.php:125
 msgid "A list of the users in this group."
 msgstr "Unha lista dos usuarios pertencentes a este grupo."
 
 #. TRANS: Indicator in group members list that this user is a group administrator.
-#: actions/groupmembers.php:190 lib/action.php:581
 msgid "Admin"
 msgstr "Administrador"
 
 #. TRANS: Button text for the form that will block a user from a group.
-#: actions/groupmembers.php:397
 msgctxt "BUTTON"
 msgid "Block"
 msgstr "Bloquear"
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:401
 msgctxt "TOOLTIP"
 msgid "Block this user"
 msgstr "Bloquear este usuario"
 
 #. TRANS: Form legend for form to make a user a group admin.
-#: actions/groupmembers.php:488
 msgid "Make user an admin of the group"
 msgstr "Converter ao usuario en administrador do grupo"
 
 #. TRANS: Button text for the form that will make a user administrator.
-#: actions/groupmembers.php:521
 msgctxt "BUTTON"
 msgid "Make Admin"
 msgstr "Converter en administrador"
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:525
 msgctxt "TOOLTIP"
 msgid "Make this user an admin"
 msgstr "Converter a este usuario en administrador"
 
 #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
-#: actions/grouprss.php:141
 #, php-format
 msgid "Updates from members of %1$s on %2$s!"
 msgstr "Actualizacións de membros de %1$s en %2$s!"
 
 #. TRANS: Title for first page of the groups list.
-#: actions/groups.php:62
 #, fuzzy
 msgctxt "TITLE"
 msgid "Groups"
@@ -3149,7 +2528,6 @@ msgstr "Grupos"
 
 #. TRANS: Title for all but the first page of the groups list.
 #. TRANS: %d is the page number.
-#: actions/groups.php:66
 #, fuzzy, php-format
 msgctxt "TITLE"
 msgid "Groups, page %d"
@@ -3158,7 +2536,6 @@ msgstr "Grupos, páxina %d"
 #. TRANS: Page notice of group list. %%%%site.name%%%% is the StatusNet site name,
 #. TRANS: %%%%action.groupsearch%%%% and %%%%action.newgroup%%%% are URLs. Do not change them.
 #. TRANS: This message contains Markdown links in the form [link text](link).
-#: actions/groups.php:95
 #, fuzzy, php-format
 msgid ""
 "%%%%site.name%%%% groups let you find and talk with people of similar "
@@ -3174,12 +2551,10 @@ msgstr ""
 "[crear un pola súa conta!](%%%%action.newgroup%%%%)"
 
 #. TRANS: Link to create a new group on the group list page.
-#: actions/groups.php:113 actions/usergroups.php:126 lib/groupeditform.php:115
 msgid "Create a new group"
 msgstr "Crear un grupo novo"
 
 #. TRANS: Instructions for page where groups can be searched. %%site.name%% is the name of the StatusNet site.
-#: actions/groupsearch.php:53
 #, php-format
 msgid ""
 "Search for groups on %%site.name%% by their name, location, or description. "
@@ -3190,21 +2565,17 @@ msgstr ""
 "máis caracteres."
 
 #. TRANS: Title for page where groups can be searched.
-#: actions/groupsearch.php:60
 msgid "Group search"
 msgstr "Busca de grupos"
 
 #. TRANS: Text on page where groups can be searched if no results were found for a query.
 #. TRANS: Text for notice search results is the query had no results.
 #. TRANS: Message on the "People search" page where a query has no results.
-#: actions/groupsearch.php:82 actions/noticesearch.php:122
-#: actions/peoplesearch.php:87
 msgid "No results."
 msgstr "Non houbo resultados."
 
 #. TRANS: Additional text on page where groups can be searched if no results were found for a query for a logged in user.
 #. TRANS: This message contains Markdown links in the form [link text](link).
-#: actions/groupsearch.php:87
 #, fuzzy, php-format
 msgid ""
 "If you cannot find the group you're looking for, you can [create it](%%"
@@ -3213,7 +2584,6 @@ msgstr "Se non atopa o grupo que busca, pode [crealo](%%action.newgroup%%)."
 
 #. TRANS: Additional text on page where groups can be searched if no results were found for a query for a not logged in user.
 #. TRANS: This message contains Markdown links in the form [link text](link).
-#: actions/groupsearch.php:92
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and [create the group](%%"
@@ -3223,30 +2593,25 @@ msgstr ""
 "action.newgroup%%)?"
 
 #. TRANS: Client error displayed when trying to unblock a user from a group without being an administrator for the group.
-#: actions/groupunblock.php:95
 msgid "Only an admin can unblock group members."
 msgstr "Só os administradores poden readmitir a membros do grupo."
 
 #. TRANS: Client error displayed when trying to unblock a non-blocked user from a group.
-#: actions/groupunblock.php:100
 msgid "User is not blocked from group."
 msgstr "O usuario non está excluído do grupo."
 
 #. TRANS: Server error displayed when unblocking a user from a group fails because of an unknown error.
 #. TRANS: Server error displayed when removing a user block.
-#: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "Houbo un erro ao facer efectiva a readmisión."
 
 #. TRANS: Title for Instant Messaging settings.
-#: actions/imsettings.php:56
 msgid "IM settings"
 msgstr "Configuración da mensaxería instantánea"
 
 #. 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.
-#: actions/imsettings.php:69
 #, fuzzy, php-format
 msgid ""
 "You can send and receive notices through instant messaging [instant messages]"
@@ -3256,18 +2621,15 @@ msgstr ""
 "Jabber/GTalk. Configure a continuación o seu enderezo e preferencias."
 
 #. TRANS: Message given in the IM settings if IM is not enabled on the site.
-#: actions/imsettings.php:90
 msgid "IM is not available."
 msgstr "A mensaxería instantánea non está dispoñible."
 
-#: actions/imsettings.php:116
 #, fuzzy, php-format
 msgid "Current confirmed %s address."
 msgstr "Enderezo de correo electrónico confirmado actualmente."
 
 #. TRANS: Form note in IM settings form.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:128
 #, fuzzy, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your %s account for a message "
@@ -3277,35 +2639,29 @@ msgstr ""
 "GTalk unha mensaxe con máis instrucións. (Engadiu a %s á súa lista de "
 "amigos?)"
 
-#: actions/imsettings.php:140
 msgid "IM address"
 msgstr "Enderezo de mensaxería instantánea"
 
-#: actions/imsettings.php:142
 #, php-format
 msgid "%s screenname."
 msgstr ""
 
 #. TRANS: Header for IM preferences form.
-#: actions/imsettings.php:163
 #, fuzzy
 msgid "IM Preferences"
 msgstr "Preferencias de mensaxería instantánea"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:174
 #, fuzzy
 msgid "Send me notices"
 msgstr "Enviar unha nota"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:176
 #, fuzzy
 msgid "Post a notice when my status changes."
 msgstr "Publicar unha nota cando cambie o meu estado en Jabber ou GTalk."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:178
 #, fuzzy
 msgid "Send me replies from people I'm not subscribed to."
 msgstr ""
@@ -3313,54 +2669,45 @@ msgstr ""
 "subscrita."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:181
 #, fuzzy
 msgid "Publish a MicroID"
 msgstr "Publicar unha MicroID para o meu enderezo de correo electrónico."
 
 #. TRANS: Server error thrown on database error updating IM preferences.
-#: actions/imsettings.php:291
 #, fuzzy
 msgid "Couldn't update IM preferences."
 msgstr "Non se puido actualizar o usuario."
 
 #. TRANS: Confirmation message for successful IM preferences save.
 #. TRANS: Confirmation message after saving preferences.
-#: actions/imsettings.php:298 actions/urlsettings.php:244
 msgid "Preferences saved."
 msgstr "Gardáronse as preferencias."
 
 #. TRANS: Message given saving IM address without having provided one.
-#: actions/imsettings.php:320
 #, fuzzy
 msgid "No screenname."
 msgstr "Sen alcume."
 
-#: actions/imsettings.php:325
 #, fuzzy
 msgid "No transport."
 msgstr "Non hai ningunha nota."
 
 #. TRANS: Message given saving IM address that cannot be normalised.
-#: actions/imsettings.php:333
 #, fuzzy
 msgid "Cannot normalize that screenname"
 msgstr "Non se pode normalizar esa ID de Jabber"
 
 #. TRANS: Message given saving IM address that not valid.
-#: actions/imsettings.php:340
 #, fuzzy
 msgid "Not a valid screenname"
 msgstr "O formato do alcume non é correcto."
 
 #. TRANS: Message given saving IM address that is already set for another user.
-#: actions/imsettings.php:344
 #, fuzzy
 msgid "Screenname already belongs to another user."
 msgstr "Esa ID de Jabber xa corresponde a un usuario."
 
 #. TRANS: Message given saving valid IM address that is to be confirmed.
-#: actions/imsettings.php:369
 #, fuzzy
 msgid "A confirmation code was sent to the IM address you added."
 msgstr ""
@@ -3368,86 +2715,72 @@ msgstr ""
 "engadiu. Ten que aprobar que %s lle envíe mensaxes."
 
 #. TRANS: Message given canceling IM address confirmation for the wrong IM address.
-#: actions/imsettings.php:396
 msgid "That is the wrong IM address."
 msgstr "Ese enderezo de mensaxería instantánea é incorrecto."
 
 #. TRANS: Server error thrown on database error canceling IM address confirmation.
-#: actions/imsettings.php:405
 #, fuzzy
 msgid "Couldn't delete confirmation."
 msgstr "Non se puido borrar a confirmación por mensaxería instantánea."
 
 #. TRANS: Message given after successfully canceling IM address confirmation.
-#: actions/imsettings.php:410
 msgid "IM confirmation cancelled."
 msgstr "Cancelouse a confirmación por mensaxería instantánea."
 
 #. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.
-#: actions/imsettings.php:434
 #, fuzzy
 msgid "That is not your screenname."
 msgstr "Ese número de teléfono non é seu."
 
 #. TRANS: Server error thrown on database error removing a registered IM address.
-#: actions/imsettings.php:443
 #, fuzzy
 msgid "Couldn't update user im prefs."
 msgstr "Non se puido actualizar o rexistro do usuario."
 
 #. TRANS: Message given after successfully removing a registered Instant Messaging address.
-#: actions/imsettings.php:451
 msgid "The IM address was removed."
 msgstr "Borrouse o enderezo de mensaxería instantánea."
 
 #. TRANS: Title for all but the first page of the inbox page.
 #. TRANS: %1$s is the user's nickname, %2$s is the page number.
-#: actions/inbox.php:59
 #, php-format
 msgid "Inbox for %1$s - page %2$d"
 msgstr "Caixa de entrada de %1$s - páxina %2$d"
 
 #. TRANS: Title for the first page of the inbox page.
 #. TRANS: %s is the user's nickname.
-#: actions/inbox.php:64
 #, php-format
 msgid "Inbox for %s"
 msgstr "Caixa de entrada de %s"
 
 #. TRANS: Instructions for user inbox page.
-#: actions/inbox.php:106
 msgid "This is your inbox, which lists your incoming private messages."
 msgstr ""
 "Esta é a súa caixa de correo, onde se listan as mensaxes privadas recibidas."
 
 #. TRANS: Client error displayed when trying to sent invites while they have been disabled.
-#: actions/invite.php:41
 msgid "Invites have been disabled."
 msgstr "As invitacións están desactivadas."
 
 #. TRANS: Client error displayed when trying to sent invites while not logged in.
 #. TRANS: %s is the StatusNet site name.
-#: actions/invite.php:45
 #, php-format
 msgid "You must be logged in to invite other users to use %s."
 msgstr "Ten que identificarse para invitar a outros a usar %s."
 
 #. TRANS: Form validation message when providing an e-mail address that does not validate.
 #. TRANS: %s is an invalid e-mail address.
-#: actions/invite.php:78
 #, fuzzy, php-format
 msgid "Invalid email address: %s."
 msgstr "Enderezo de correo electrónico incorrecto: %s"
 
 #. TRANS: Page title when invitations have been sent.
-#: actions/invite.php:117
 #, fuzzy
 msgid "Invitations sent"
 msgstr "Enviáronse as invitacións"
 
 #. TRANS: Page title when inviting potential users.
-#: actions/invite.php:120
 msgid "Invite new users"
 msgstr "Invitar a novos usuarios"
 
@@ -3455,7 +2788,6 @@ msgstr "Invitar a novos usuarios"
 #. TRANS: is already subscribed to one or more users with the given e-mail address(es).
 #. TRANS: Plural form is based on the number of reported already subscribed e-mail addresses.
 #. TRANS: Followed by a bullet list.
-#: actions/invite.php:140
 #, fuzzy
 msgid "You are already subscribed to this user:"
 msgid_plural "You are already subscribed to these users:"
@@ -3464,7 +2796,6 @@ msgstr[1] "Xa está subscrito aos seguintes usuarios:"
 
 #. TRANS: Used as list item for already subscribed users (%1$s is nickname, %2$s is e-mail address).
 #. TRANS: Used as list item for already registered people (%1$s is nickname, %2$s is e-mail address).
-#: actions/invite.php:146 actions/invite.php:160
 #, php-format
 msgctxt "INVITE"
 msgid "%1$s (%2$s)"
@@ -3473,7 +2804,6 @@ msgstr "%1$s (%2$s)"
 #. TRANS: Message displayed inviting users to use a StatusNet site while the invited user
 #. TRANS: already uses a this StatusNet site. Plural form is based on the number of
 #. TRANS: reported already present people. Followed by a bullet list.
-#: actions/invite.php:154
 #, fuzzy
 msgid "This person is already a user and you were automatically subscribed:"
 msgid_plural ""
@@ -3486,7 +2816,6 @@ msgstr[1] ""
 #. TRANS: Message displayed inviting users to use a StatusNet site. Plural form is
 #. TRANS: based on the number of invitations sent. Followed by a bullet list of
 #. TRANS: e-mail addresses to which invitations were sent.
-#: actions/invite.php:168
 #, fuzzy
 msgid "Invitation sent to the following person:"
 msgid_plural "Invitations sent to the following people:"
@@ -3495,7 +2824,6 @@ msgstr[1] "Enviáronse invitacións ás seguintes persoas:"
 
 #. TRANS: Generic message displayed after sending out one or more invitations to
 #. TRANS: people to join a StatusNet site.
-#: actions/invite.php:178
 msgid ""
 "You will be notified when your invitees accept the invitation and register "
 "on the site. Thanks for growing the community!"
@@ -3504,7 +2832,6 @@ msgstr ""
 "no sitio. Grazas por ampliar a comunidade!"
 
 #. TRANS: Form instructions.
-#: actions/invite.php:191
 msgid ""
 "Use this form to invite your friends and colleagues to use this service."
 msgstr ""
@@ -3512,28 +2839,24 @@ msgstr ""
 "utilizar este servizo."
 
 #. TRANS: Field label for a list of e-mail addresses.
-#: actions/invite.php:218
 msgid "Email addresses"
 msgstr "Enderezos de correo electrónico"
 
 #. TRANS: Tooltip for field label for a list of e-mail addresses.
-#: actions/invite.php:221
 #, fuzzy
 msgid "Addresses of friends to invite (one per line)."
 msgstr "Enderezos de amigos aos que invitar (un por liña)"
 
 #. TRANS: Field label for a personal message to send to invitees.
-#: actions/invite.php:225
 msgid "Personal message"
 msgstr "Mensaxe persoal"
 
 #. TRANS: Tooltip for field label for a personal message to send to invitees.
-#: actions/invite.php:228
 msgid "Optionally add a personal message to the invitation."
 msgstr "Engadir opcionalmente unha mensaxe persoal á invitación."
 
 #. TRANS: Send button for inviting friends
-#: actions/invite.php:232
+#. TRANS: Button text for sending notice.
 msgctxt "BUTTON"
 msgid "Send"
 msgstr "Enviar"
@@ -3541,7 +2864,6 @@ msgstr "Enviar"
 #. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral
 #. TRANS: singular 3rd-person pronoun in English. %1$s is the inviting user, $2$s is
 #. TRANS: the StatusNet sitename.
-#: actions/invite.php:264
 #, php-format
 msgid "%1$s has invited you to join them on %2$s"
 msgstr "%1$s convidouno a unirse a el en %2$s"
@@ -3551,7 +2873,6 @@ msgstr "%1$s convidouno a unirse a el en %2$s"
 #. TRANS: StatusNet sitename, %3$s is the site URL, %4$s is the personal message from the
 #. TRANS: inviting user, %s%5 a link to the timeline for the inviting user, %s$6 is a link
 #. TRANS: to register with the StatusNet site.
-#: actions/invite.php:271
 #, php-format
 msgid ""
 "%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -3608,50 +2929,44 @@ msgstr ""
 "Cordialmente, %2$s\n"
 
 #. TRANS: Client error displayed when trying to join a group while not logged in.
-#: actions/joingroup.php:59
 msgid "You must be logged in to join a group."
 msgstr "Ten que identificarse para unirse a un grupo."
 
 #. TRANS: Title for join group page after joining.
-#: actions/joingroup.php:148
 #, fuzzy, php-format
 msgctxt "TITLE"
 msgid "%1$s joined group %2$s"
 msgstr "%1$s uniuse ao grupo %2$s"
 
 #. TRANS: Client error displayed when trying to leave a group while not logged in.
-#: actions/leavegroup.php:59
 msgid "You must be logged in to leave a group."
 msgstr "Ten que identificarse para deixar un grupo."
 
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
-#: actions/leavegroup.php:103 lib/command.php:398
 msgid "You are not a member of that group."
 msgstr "Non pertence a ese grupo."
 
 #. TRANS: Title for leave group page after leaving.
-#: actions/leavegroup.php:142
 #, fuzzy, php-format
 msgctxt "TITLE"
 msgid "%1$s left group %2$s"
 msgstr "%1$s deixou o grupo %2$s"
 
 #. TRANS: User admin panel title
-#: actions/licenseadminpanel.php:55
 msgctxt "TITLE"
 msgid "License"
 msgstr "Licenza"
 
-#: actions/licenseadminpanel.php:65
+#. TRANS: Form instructions for the site license admin panel.
 msgid "License for this StatusNet site"
 msgstr "Licenza deste sitio StatusNet"
 
-#: actions/licenseadminpanel.php:134
+#. TRANS: Client error displayed selecting an invalid license in the license admin panel.
 msgid "Invalid license selection."
 msgstr "A selección de licenza non é válida."
 
-#: actions/licenseadminpanel.php:144
+#. TRANS: Client error displayed when not specifying an owner for the all rights reserved license in the license admin panel.
 msgid ""
 "You must specify the owner of the content when using the All Rights Reserved "
 "license."
@@ -3659,137 +2974,138 @@ msgstr ""
 "Cómpre especificar o propietario dos contidos ao empregar a licenza \"Todos "
 "os dereitos reservados\"."
 
-#: actions/licenseadminpanel.php:151
+#. TRANS: Client error displayed selecting a too long license title in the license admin panel.
 #, fuzzy
 msgid "Invalid license title. Maximum length is 255 characters."
 msgstr "Título de licenza incorrecto. A extensión máxima é de 255 caracteres."
 
-#: actions/licenseadminpanel.php:163
+#. TRANS: Client error displayed specifying an invalid license URL in the license admin panel.
 msgid "Invalid license URL."
 msgstr "Enderezo URL de licenza incorrecto."
 
-#: actions/licenseadminpanel.php:166
+#. TRANS: Client error displayed specifying an invalid license image URL in the license admin panel.
 msgid "Invalid license image URL."
 msgstr "Enderezo URL de imaxe de licenza incorrecto."
 
-#: actions/licenseadminpanel.php:174
+#. TRANS: Client error displayed specifying an invalid license URL in the license admin panel.
 msgid "License URL must be blank or a valid URL."
 msgstr "O enderezo URL da licenza debe quedar baleiro ou ser válido."
 
-#: actions/licenseadminpanel.php:182
+#. TRANS: Client error displayed specifying an invalid license image URL in the license admin panel.
 msgid "License image must be blank or valid URL."
 msgstr "O enderezo URL da imaxe da licenza debe quedar baleiro ou ser válido."
 
-#: actions/licenseadminpanel.php:232
+#. TRANS: Form legend in the license admin panel.
 msgid "License selection"
 msgstr "Selección da licenza"
 
-#: actions/licenseadminpanel.php:238
+#. TRANS: License option in the license admin panel.
 msgid "Private"
 msgstr "Privado"
 
-#: actions/licenseadminpanel.php:239
+#. TRANS: License option in the license admin panel.
 msgid "All Rights Reserved"
 msgstr "Todos os dereitos reservados"
 
-#: actions/licenseadminpanel.php:240
+#. TRANS: License option in the license admin panel.
 msgid "Creative Commons"
 msgstr "Creative Commons"
 
-#: actions/licenseadminpanel.php:245
+#. TRANS: Dropdown field label in the license admin panel.
 msgid "Type"
 msgstr "Tipo"
 
-#: actions/licenseadminpanel.php:247
-msgid "Select license"
+#. TRANS: Dropdown field instructions in the license admin panel.
+#, fuzzy
+msgid "Select a license."
 msgstr "Seleccionar unha licenza"
 
-#: actions/licenseadminpanel.php:261
+#. TRANS: Form legend in the license admin panel.
 msgid "License details"
 msgstr "Detalles da licenza"
 
-#: actions/licenseadminpanel.php:267
+#. TRANS: Field label in the license admin panel.
 msgid "Owner"
 msgstr "Propietario"
 
-#: actions/licenseadminpanel.php:268
+#. TRANS: Field title in the license admin panel.
 msgid "Name of the owner of the site's content (if applicable)."
 msgstr "Nome do propietario dos contidos deste sitio (se procede)."
 
-#: actions/licenseadminpanel.php:276
+#. TRANS: Field label in the license admin panel.
 msgid "License Title"
 msgstr "Título da licenza"
 
-#: actions/licenseadminpanel.php:277
+#. TRANS: Field title in the license admin panel.
 msgid "The title of the license."
 msgstr "O título da licenza."
 
-#: actions/licenseadminpanel.php:285
+#. TRANS: Field label in the license admin panel.
 msgid "License URL"
 msgstr "URL da licenza"
 
-#: actions/licenseadminpanel.php:286
+#. TRANS: Field title in the license admin panel.
 msgid "URL for more information about the license."
 msgstr "URL para obter máis información sobre a licenza."
 
-#: actions/licenseadminpanel.php:293
+#. TRANS: Field label in the license admin panel.
 msgid "License Image URL"
 msgstr "URL da imaxe da licenza"
 
-#: actions/licenseadminpanel.php:294
+#. TRANS: Field title in the license admin panel.
 msgid "URL for an image to display with the license."
 msgstr "URL dunha imaxe a mostrar coa licenza."
 
-#. TRANS: Submit button title.
-#: actions/licenseadminpanel.php:311 actions/sessionsadminpanel.php:199
-#: actions/siteadminpanel.php:292 actions/snapshotadminpanel.php:245
-#: actions/tagother.php:133 lib/applicationeditform.php:357
-msgid "Save"
-msgstr "Gardar"
-
-#: actions/licenseadminpanel.php:311
-msgid "Save license settings"
+#. TRANS: Button title in the license admin panel.
+#, fuzzy
+msgid "Save license settings."
 msgstr "Gardar a configuración de licenza"
 
+#. TRANS: Client error displayed when trying to log in while already logged in.
 #. TRANS: Client error displayed trying to use "one time password login" when already logged in.
-#: actions/login.php:97 actions/otp.php:62 actions/register.php:130
 msgid "Already logged in."
 msgstr "Xa se identificou."
 
-#: actions/login.php:125
+#. TRANS: Form validation error displayed when trying to log in with incorrect credentials.
 msgid "Incorrect username or password."
 msgstr "Nome de usuario ou contrasinal incorrectos."
 
+#. TRANS: Server error displayed when during login a server error occurs.
 #. TRANS: Server error displayed when a user object could not be created trying to login using "one time password login".
-#: actions/login.php:131 actions/otp.php:127
 msgid "Error setting user. You are probably not authorized."
 msgstr ""
 "Houbo un erro ao configurar o usuario. Probablemente non estea autorizado "
 "para facelo."
 
-#: actions/login.php:185 actions/login.php:236 lib/action.php:598
+#. TRANS: Page title for login page.
 msgid "Login"
 msgstr "Identificarse"
 
-#: actions/login.php:222
+#. TRANS: Form legend on login page.
 msgid "Login to site"
 msgstr "Identificarse no sitio"
 
-#: actions/login.php:231 actions/register.php:469
+#. TRANS: Checkbox label label on login page.
 msgid "Remember me"
 msgstr "Lembrádeme"
 
-#: actions/login.php:232 actions/register.php:471
+#. TRANS: Checkbox title on login page.
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 "Identificarse automaticamente no futuro. Non se aconsella en computadoras "
 "compartidas!"
 
-#: actions/login.php:241
+#. TRANS: Button text for log in on login page.
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Login"
+msgstr "Identificarse"
+
+#. TRANS: Link text for link to "reset password" on login page.
 msgid "Lost or forgotten password?"
 msgstr "Esqueceu ou perdeu o contrasinal?"
 
-#: actions/login.php:259
+#. TRANS: Form instructions on login page before being able to change user settings.
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -3797,11 +3113,12 @@ msgstr ""
 "Por razóns de seguridade, volva introducir o seu nome de usuario e "
 "contrasinal antes de cambiar a súa configuración."
 
-#: actions/login.php:263
+#. TRANS: Form instructions on login page.
 msgid "Login with your username and password."
 msgstr "Identifíquese co seu nome de usuario e contrasinal."
 
-#: actions/login.php:266
+#. TRANS: Form instructions on login page. This message contains Markdown links in the form [Link text](Link).
+#. TRANS: %%action.register%% is a link to the registration page.
 #, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -3809,130 +3126,124 @@ msgstr ""
 "Aínda non ten un nome de usuario? [Rexistre](%%action.register%%) unha conta "
 "nova."
 
-#: actions/makeadmin.php:92
+#. TRANS: Client error displayed when trying to make another user admin on the Make Admin page while not an admin.
 msgid "Only an admin can make another user an admin."
 msgstr ""
 "Só os administradores poden converter a outros usuarios en administradores."
 
-#: actions/makeadmin.php:96
+#. TRANS: Client error displayed when trying to make another user admin on the Make Admin page who already is admin.
+#. TRANS: %1$s is the user that is already admin, %2$s is the group user is already admin for.
 #, php-format
 msgid "%1$s is already an admin for group \"%2$s\"."
 msgstr "%1$s xa é administrador do grupo \"%2$s\"."
 
-#: actions/makeadmin.php:133
+#. TRANS: Server error displayed when trying to make another user admin on the Make Admin page fails
+#. TRANS: because the group membership record could not be gotten.
+#. TRANS: %1$s is the to be admin user, %2$s is the group user should be admin for.
 #, php-format
 msgid "Can't get membership record for %1$s in group %2$s."
 msgstr "Non se puido obter o rexistro de pertenza de %1$s ao grupo %2$s."
 
-#: actions/makeadmin.php:146
+#. TRANS: Server error displayed when trying to make another user admin on the Make Admin page fails
+#. TRANS: because the group adminship record coud not be saved properly.
+#. TRANS: %1$s is the to be admin user, %2$s is the group user is already admin for.
 #, php-format
 msgid "Can't make %1$s an admin for group %2$s."
 msgstr "Non se pode converter a %1$s en administrador do grupo %2$s."
 
-#: actions/microsummary.php:69
+#. TRANS: Client error displayed trying to make a micro summary without providing a status.
 msgid "No current status."
 msgstr "Sen estado actual."
 
 #. TRANS: This is the title of the form for adding a new application.
-#: actions/newapplication.php:52
 #, fuzzy
 msgid "New application"
 msgstr "Aplicación nova"
 
 #. TRANS: Client error displayed trying to add a new application while not logged in.
-#: actions/newapplication.php:64
 msgid "You must be logged in to register an application."
 msgstr "Ten que identificarse para rexistrar unha aplicación."
 
 #. TRANS: Form instructions for registering a new application.
-#: actions/newapplication.php:147
 msgid "Use this form to register a new application."
 msgstr "Utilice o seguinte formulario para rexistrar unha aplicación nova."
 
 #. TRANS: Validation error shown when not providing a source URL in the "New application" form.
-#: actions/newapplication.php:189
 msgid "Source URL is required."
 msgstr "Necesítase o URL de orixe."
 
 #. TRANS: Server error displayed when an application could not be registered in the database through the "New application" form.
-#: actions/newapplication.php:279 actions/newapplication.php:289
 msgid "Could not create application."
 msgstr "Non se puido crear a aplicación."
 
 #. TRANS: Title for form to create a group.
-#: actions/newgroup.php:53
 msgid "New group"
 msgstr "Novo grupo"
 
 #. TRANS: Client exception thrown when a user tries to create a group while banned.
-#: actions/newgroup.php:73 classes/User_group.php:485
 #, fuzzy
 msgid "You are not allowed to create groups on this site."
 msgstr "Vostede non pertence a este grupo."
 
 #. TRANS: Form instructions for group create form.
-#: actions/newgroup.php:117
 msgid "Use this form to create a new group."
 msgstr "Utilice o seguinte formulario para crear un novo grupo."
 
-#. TRANS: Group create form validation error.
-#: actions/newgroup.php:200
-#, fuzzy
-msgid "Alias cannot be the same as nickname."
-msgstr "O pseudónimo non pode coincidir co alcume."
-
-#: actions/newmessage.php:71 actions/newmessage.php:234
+#. TRANS: Page title for new direct message page.
+#. TRANS: Page title on page for sending a direct message.
 msgid "New message"
 msgstr "Mensaxe nova"
 
-#. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
-#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:513
-msgid "You can't send a message to this user."
+#. TRANS: Client error displayed trying to send a direct message to a user while sender and
+#. TRANS: receiver are not subscribed to each other.
+#, fuzzy
+msgid "You cannot send a message to this user."
 msgstr "Non pode enviarlle unha mensaxe a este usuario."
 
+#. TRANS: Form validator error displayed trying to send a direct message without content.
+#. TRANS: Client error displayed trying to send a notice without content.
 #. TRANS: Command exception text shown when trying to send a direct message to another user without content.
 #. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
-#: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:490
-#: lib/command.php:593
 msgid "No content!"
 msgstr "Non hai contido ningún!"
 
-#: actions/newmessage.php:161
+#. TRANS: Form validation error displayed trying to send a direct message without specifying a recipient.
 msgid "No recipient specified."
 msgstr "Non se especificou ningún destinatario."
 
+#. TRANS: Client error displayed trying to send a direct message to self.
 #. TRANS: Error text shown when trying to send a direct message to self.
-#: actions/newmessage.php:167 lib/command.php:517
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr "Non se envíe unha mensaxe, limítese a pensar nela."
 
-#: actions/newmessage.php:184
+#. TRANS: Page title after sending a direct message.
 msgid "Message sent"
 msgstr "Enviouse a mensaxe"
 
+#. TRANS: Confirmation text after sending a direct message.
+#. TRANS: %s is the direct message recipient.
 #. TRANS: Message given have sent a direct message to another user.
 #. TRANS: %s is the name of the other user.
-#: actions/newmessage.php:188 lib/command.php:525
 #, php-format
 msgid "Direct message to %s sent."
 msgstr "Enviouse a mensaxe directa a %s."
 
-#: actions/newmessage.php:213 actions/newnotice.php:264
+#. TRANS: Page title after an AJAX error occurred on the "send direct message" page.
+#. TRANS: Page title after an AJAX error occurs on the send notice page.
 msgid "Ajax Error"
 msgstr "Houbo un erro de AJAX"
 
-#: actions/newnotice.php:69
+#. TRANS: Page title for sending a new notice.
 msgid "New notice"
 msgstr "Nova nota"
 
-#: actions/newnotice.php:230
+#. TRANS: Page title after sending a notice.
 msgid "Notice posted"
 msgstr "Publicouse a nota"
 
 #. TRANS: Instructions for Notice search page.
 #. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/noticesearch.php:69
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -3942,20 +3253,17 @@ msgstr ""
 "con espazos en branco. Teñen que ter tres ou máis caracteres."
 
 #. TRANS: Title of the page where users can search for notices.
-#: actions/noticesearch.php:80
 msgid "Text search"
 msgstr "Busca de texto"
 
 #. TRANS: Test in RSS notice search.
 #. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearch.php:95
 #, php-format
 msgid "Search results for \"%1$s\" on %2$s"
 msgstr "Resultados da busca de \"%1$s\" en %2$s"
 
 #. TRANS: Text for logged in users making a query for notices without results.
 #. TRANS: This message contains a Markdown link.
-#: actions/noticesearch.php:128
 #, php-format
 msgid ""
 "Be the first to [post on this topic](%%%%action.newnotice%%%%?"
@@ -3966,7 +3274,6 @@ msgstr ""
 
 #. TRANS: Text for not logged in users making a query for notices without results.
 #. TRANS: This message contains Markdown links.
-#: actions/noticesearch.php:133
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and be the first to "
@@ -3976,19 +3283,17 @@ msgstr ""
 "en [publicar sobre este tema](%%%%action.newnotice%%%%?status_textarea=%s)?"
 
 #. TRANS: RSS notice search feed title. %s is the query.
-#: actions/noticesearchrss.php:95
 #, php-format
 msgid "Updates with \"%s\""
 msgstr "Actualizacións con \"%s\""
 
 #. TRANS: RSS notice search feed description.
 #. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearchrss.php:99
 #, fuzzy, php-format
 msgid "Updates matching search term \"%1$s\" on %2$s."
 msgstr "Actualizacións que conteñen o termo \"%1$s\" en %2$s!"
 
-#: actions/nudge.php:85
+#. TRANS: Client error displayed trying to nudge a user that cannot be nudged.
 #, fuzzy
 msgid ""
 "This user doesn't allow nudges or hasn't confirmed or set their email "
@@ -3997,61 +3302,52 @@ msgstr ""
 "Este usuario non permite acenos ou aínda non confirmou ou configurou o seu "
 "enderezo de correo electrónico."
 
-#: actions/nudge.php:94
+#. TRANS: Page title after sending a nudge.
 msgid "Nudge sent"
 msgstr "Enviouse o aceno"
 
-#: actions/nudge.php:97
+#. TRANS: Confirmation text after sending a nudge.
 msgid "Nudge sent!"
 msgstr "Enviouse o aceno!"
 
 #. TRANS: Message displayed to an anonymous user trying to view OAuth application list.
-#: actions/oauthappssettings.php:57
 msgid "You must be logged in to list your applications."
 msgstr "Ten que identificarse para listar as súas aplicacións."
 
 #. TRANS: Page title for OAuth applications
-#: actions/oauthappssettings.php:73
 msgid "OAuth applications"
 msgstr "Aplicacións de OAuth"
 
 #. TRANS: Page instructions for OAuth applications
-#: actions/oauthappssettings.php:85
 msgid "Applications you have registered"
 msgstr "Aplicacións que rexistrou"
 
 #. TRANS: Empty list message on page with OAuth applications.
-#: actions/oauthappssettings.php:138
 #, php-format
 msgid "You have not registered any applications yet."
 msgstr "Aínda non rexistrou ningunha aplicación."
 
 #. TRANS: Title for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:69
 msgid "Connected applications"
 msgstr "Aplicacións conectadas"
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:80
 #, fuzzy
 msgid "The following connections exist for your account."
 msgstr "Permitiulle o acceso á súa conta ás seguintes aplicacións."
 
 #. TRANS: Client error when trying to revoke access for an application while not being a user of it.
-#: actions/oauthconnectionssettings.php:165
 msgid "You are not a user of that application."
 msgstr "Non é usuario desa aplicación."
 
 #. TRANS: Client error when revoking access has failed for some reason.
 #. TRANS: %s is the application ID revoking access failed for.
-#: actions/oauthconnectionssettings.php:180
 #, fuzzy, php-format
 msgid "Unable to revoke access for application: %s."
 msgstr "Non se puido revogar o acceso da aplicación: %s."
 
 #. TRANS: Success message after revoking access for an application.
 #. TRANS: %1$s is the application name, %2$s is the first part of the user token.
-#: actions/oauthconnectionssettings.php:199
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -4059,469 +3355,386 @@ msgid ""
 msgstr ""
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:210
 msgid "You have not authorized any applications to use your account."
 msgstr "Non autorizou o acceso á súa conta para ningunha aplicación."
 
 #. TRANS: Note for developers in the OAuth connection settings form.
 #. TRANS: This message contains a Markdown link. Do not separate "](".
 #. TRANS: %s is the URL to the OAuth settings.
-#: actions/oauthconnectionssettings.php:230
 #, php-format
 msgid ""
 "Are you a developer? [Register an OAuth client application](%s) to use with "
 "this instance of StatusNet."
 msgstr ""
 
-#: actions/oembed.php:64
+#. TRANS: Server error displayed in oEmbed action when path not found.
+#. TRANS: %s is a path.
 #, fuzzy, php-format
 msgid "\"%s\" not found."
 msgstr "Non se atopou o método da API."
 
-#: actions/oembed.php:76
+#. TRANS: Server error displayed in oEmbed action when notice not found.
+#. TRANS: %s is a notice.
 #, fuzzy, php-format
 msgid "Notice %s not found."
 msgstr "Non se atopou o método da API."
 
-#: actions/oembed.php:80 actions/shownotice.php:100
+#. TRANS: Server error displayed in oEmbed action when notice has not profile.
 msgid "Notice has no profile."
 msgstr "Non hai perfil para a nota."
 
-#: actions/oembed.php:83 actions/shownotice.php:172
+#. TRANS: oEmbed title. %1$s is the author name, %2$s is the creation date.
 #, php-format
 msgid "%1$s's status on %2$s"
 msgstr "Estado de %1$s en %2$s"
 
-#: actions/oembed.php:95
+#. TRANS: Server error displayed in oEmbed action when attachment not found.
+#. TRANS: %d is an attachment ID.
 #, fuzzy, php-format
 msgid "Attachment %s not found."
 msgstr "Non se atopou o destinatario."
 
-#: actions/oembed.php:136
+#. TRANS: Server error displayed in oEmbed request when a path is not supported.
+#. TRANS: %s is a path.
 #, php-format
 msgid "\"%s\" not supported for oembed requests."
 msgstr ""
 
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
-#: actions/oembed.php:168
 #, php-format
 msgid "Content type %s not supported."
 msgstr "Non se soporta o tipo de contido %s."
 
 #. TRANS: Error message displaying attachments. %s is the site's base URL.
-#: actions/oembed.php:172
 #, php-format
 msgid "Only %s URLs over plain HTTP please."
 msgstr "Só %s enderezos URL sobre HTTP simple."
 
+#. TRANS: Server error displayed in oEmbed action when request specifies an unsupported data format.
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1207
-#: lib/apiaction.php:1234 lib/apiaction.php:1369
 msgid "Not a supported data format."
 msgstr "Non se soporta ese formato de datos."
 
 #. TRANS: ShortName in the OpenSearch interface when trying to find users.
-#: actions/opensearch.php:64
 msgid "People Search"
 msgstr "Busca de xente"
 
-#: actions/opensearch.php:68
+#. TRANS: ShortName in the OpenSearch interface when trying to find notices.
 msgid "Notice Search"
 msgstr "Busca de notas"
 
 #. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
-#: actions/otp.php:70
 msgid "No user ID specified."
 msgstr "Non se especificou ningunha ID de usuario."
 
 #. TRANS: Client error displayed trying to use "one time password login" without specifying a login token.
-#: actions/otp.php:86
 msgid "No login token specified."
 msgstr "Non se especificou ningún pase."
 
 #. TRANS: Client error displayed trying to use "one time password login" without requesting a login token.
-#: actions/otp.php:94
 msgid "No login token requested."
 msgstr "Non se solicitou ningún pase."
 
 #. TRANS: Client error displayed trying to use "one time password login" while specifying an invalid login token.
-#: actions/otp.php:100
 msgid "Invalid login token specified."
 msgstr "O pase especificado é incorrecto."
 
 #. TRANS: Client error displayed trying to use "one time password login" while specifying an expired login token.
-#: actions/otp.php:110
 msgid "Login token expired."
 msgstr "O pase caducou."
 
 #. TRANS: Title for outbox for any but the fist page.
 #. TRANS: %1$s is the user nickname, %2$d is the page number.
-#: actions/outbox.php:57
 #, php-format
 msgid "Outbox for %1$s - page %2$d"
 msgstr "Caixa de saída de %1$s - páxina %2$d"
 
 #. TRANS: Title for first page of outbox.
-#: actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
 msgstr "Caixa de saída de %s"
 
 #. TRANS: Instructions for outbox.
-#: actions/outbox.php:103
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr ""
 "Esta é a súa caixa de saída. Nela lístanse as mensaxes privadas que enviou."
 
-#: actions/passwordsettings.php:58
 msgid "Change password"
 msgstr "Cambiar o contrasinal"
 
-#: actions/passwordsettings.php:69
 msgid "Change your password."
 msgstr "Cambiar o seu contrasinal."
 
 #. TRANS: Fieldset legend for password reset form.
-#: actions/passwordsettings.php:96 actions/recoverpassword.php:251
 msgid "Password change"
 msgstr "Cambio de contrasinal"
 
-#: actions/passwordsettings.php:104
 msgid "Old password"
 msgstr "Contrasinal anterior"
 
 #. TRANS: Field label for password reset form.
-#: actions/passwordsettings.php:108 actions/recoverpassword.php:256
 msgid "New password"
 msgstr "Novo contrasinal"
 
-#: actions/passwordsettings.php:109 actions/register.php:416
 #, fuzzy
 msgid "6 or more characters."
 msgstr "Seis ou máis caracteres"
 
 #. TRANS: Ttile for field label for password reset form where the password has to be typed again.
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:264
-#: actions/register.php:420
 #, fuzzy
 msgid "Same as password above."
 msgstr "Igual ao contrasinal anterior"
 
-#: actions/passwordsettings.php:117
 msgid "Change"
 msgstr "Cambiar"
 
-#: actions/passwordsettings.php:153 actions/register.php:223
 msgid "Password must be 6 or more characters."
 msgstr "O contrasinal debe conter seis ou máis caracteres."
 
-#: actions/passwordsettings.php:156 actions/register.php:226
 msgid "Passwords don't match."
 msgstr "Os contrasinais non coinciden."
 
-#: actions/passwordsettings.php:164
 msgid "Incorrect old password"
 msgstr "O contrasinal anterior non é correcto"
 
-#: actions/passwordsettings.php:180
 msgid "Error saving user; invalid."
 msgstr "Houbo un erro ao gardar o usuario. Incorrecto."
 
 #. TRANS: Reset password form validation error message.
-#: actions/passwordsettings.php:185 actions/recoverpassword.php:418
 #, fuzzy
 msgid "Cannot save new password."
 msgstr "Non se puido gardar o novo contrasinal."
 
-#: actions/passwordsettings.php:191
 msgid "Password saved."
 msgstr "Gardouse o contrasinal."
 
 #. TRANS: Title for Paths admin panel.
 #. TRANS: Menu item for site administration
-#: actions/pathsadminpanel.php:58 lib/adminpanelaction.php:371
 msgid "Paths"
 msgstr "Rutas"
 
 #. TRANS: Form instructions for Path admin panel.
-#: actions/pathsadminpanel.php:69
 msgid "Path and server settings for this StatusNet site"
 msgstr "Configuración do servidor e das rutas para este sitio StatusNet"
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the directory that could not be read from.
-#: actions/pathsadminpanel.php:155
 #, php-format
 msgid "Theme directory not readable: %s."
 msgstr "Non se pode ler o directorio de temas visuais: %s."
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the avatar directory that could not be written to.
-#: actions/pathsadminpanel.php:163
 #, php-format
 msgid "Avatar directory not writable: %s."
 msgstr "Non se pode escribir no directorio de avatares: %s."
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the background directory that could not be written to.
-#: actions/pathsadminpanel.php:171
 #, php-format
 msgid "Background directory not writable: %s."
 msgstr "Non se pode escribir no directorio de fondos: %s."
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the locales directory that could not be read from.
-#: actions/pathsadminpanel.php:181
 #, php-format
 msgid "Locales directory not readable: %s."
 msgstr "Non se pode ler o directorio de traducións: %s."
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the SSL server URL that is too long.
-#: actions/pathsadminpanel.php:189
 msgid "Invalid SSL server. The maximum length is 255 characters."
 msgstr "Servidor SSL incorrecto. O tamaño máximo é de 255 caracteres."
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:235 actions/siteadminpanel.php:58
 msgid "Site"
 msgstr "Sitio"
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:241 actions/pathsadminpanel.php:279
-#: actions/pathsadminpanel.php:370 actions/pathsadminpanel.php:425
 msgid "Server"
 msgstr "Servidor"
 
-#: actions/pathsadminpanel.php:242
 msgid "Site's server hostname."
 msgstr "Nome do servidor do sitio."
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:248 actions/pathsadminpanel.php:288
-#: actions/pathsadminpanel.php:379 actions/pathsadminpanel.php:434
 msgid "Path"
 msgstr "Ruta"
 
-#: actions/pathsadminpanel.php:249
 msgid "Site path."
 msgstr "Ruta do sitio."
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:255
 msgid "Locale directory"
 msgstr "Directorio das traducións"
 
-#: actions/pathsadminpanel.php:256
 msgid "Directory path to locales."
 msgstr "Ruta do directorio das traducións."
 
 #. TRANS: Checkbox label in Paths admin panel.
-#: actions/pathsadminpanel.php:263
 msgid "Fancy URLs"
 msgstr "Enderezos URL elegantes"
 
-#: actions/pathsadminpanel.php:265
 msgid "Use fancy (more readable and memorable) URLs?"
 msgstr "Quere utilizar os enderezos URL elegantes (mellores de ler e lembrar)?"
 
-#: actions/pathsadminpanel.php:272
 msgid "Theme"
 msgstr "Tema visual"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:281
 msgid "Server for themes."
 msgstr "Servidor para os temas visuais."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:290
 msgid "Web path to themes."
 msgstr ""
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:297 actions/pathsadminpanel.php:388
-#: actions/pathsadminpanel.php:443 actions/pathsadminpanel.php:495
 msgid "SSL server"
 msgstr "Servidor SSL"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:299
 msgid "SSL server for themes (default: SSL server)."
 msgstr ""
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:306 actions/pathsadminpanel.php:397
-#: actions/pathsadminpanel.php:452
 msgid "SSL path"
 msgstr "Ruta de acceso SSL"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:308
 msgid "SSL path to themes (default: /theme/)."
 msgstr ""
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:315 actions/pathsadminpanel.php:406
-#: actions/pathsadminpanel.php:461
 #, fuzzy
 msgid "Directory"
 msgstr "Directorio de temas visuais"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:317
 #, fuzzy
 msgid "Directory where themes are located."
 msgstr "Ruta do directorio das traducións"
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:326
 msgid "Avatars"
 msgstr "Avatares"
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:333
 msgid "Avatar server"
 msgstr "Servidor de avatares"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:335
 #, fuzzy
 msgid "Server for avatars."
 msgstr "Tema visual para o sitio."
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:342
 msgid "Avatar path"
 msgstr "Ruta do avatar"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:344
 #, fuzzy
 msgid "Web path to avatars."
 msgstr "Non se puido actualizar o avatar."
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:351
 msgid "Avatar directory"
 msgstr "Directorio de avatares"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:353
 #, fuzzy
 msgid "Directory where avatars are located."
 msgstr "Ruta do directorio das traducións"
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:364
 msgid "Backgrounds"
 msgstr "Fondos"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:372
 #, fuzzy
 msgid "Server for backgrounds."
 msgstr "Tema visual para o sitio."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:381
 msgid "Web path to backgrounds."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:390
 msgid "Server for backgrounds on SSL pages."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:399
 msgid "Web path to backgrounds on SSL pages."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:408
 #, fuzzy
 msgid "Directory where backgrounds are located."
 msgstr "Ruta do directorio das traducións"
 
 #. TRANS: Fieldset legens in Paths admin panel.
-#: actions/pathsadminpanel.php:419
 msgid "Attachments"
 msgstr "Ficheiros anexos"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:427
 #, fuzzy
 msgid "Server for attachments."
 msgstr "Tema visual para o sitio."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:436
 #, fuzzy
 msgid "Web path to attachments."
 msgstr "Non hai ningún dato adxunto."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:445
 #, fuzzy
 msgid "Server for attachments on SSL pages."
 msgstr "Tema visual para o sitio."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:454
 msgid "Web path to attachments on SSL pages."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:463
 #, fuzzy
 msgid "Directory where attachments are located."
 msgstr "Ruta do directorio das traducións"
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:472
 msgid "SSL"
 msgstr "SSL"
 
 #. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
-#: actions/pathsadminpanel.php:477 actions/snapshotadminpanel.php:202
 msgid "Never"
 msgstr "Nunca"
 
 #. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
-#: actions/pathsadminpanel.php:479
 msgid "Sometimes"
 msgstr "Ás veces"
 
 #. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
-#: actions/pathsadminpanel.php:481
 msgid "Always"
 msgstr "Sempre"
 
-#: actions/pathsadminpanel.php:485
 msgid "Use SSL"
 msgstr "Utilizar SSL"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:487
 #, fuzzy
 msgid "When to use SSL."
 msgstr "Cando utilizar SSL"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:497
 #, fuzzy
 msgid "Server to direct SSL requests to."
 msgstr "Servidor ao que dirixir as solicitudes SSL"
 
 #. TRANS: Button title text to store form data in the Paths admin panel.
-#: actions/pathsadminpanel.php:514
 msgid "Save paths"
 msgstr "Gardar as rutas"
 
 #. TRANS: Instructions for the "People search" page.
 #. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/peoplesearch.php:54
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
@@ -4531,57 +3744,46 @@ msgstr ""
 "con espazos en branco. Teñen que ter tres ou máis caracteres."
 
 #. TRANS: Title of a page where users can search for other users.
-#: actions/peoplesearch.php:61
 msgid "People search"
 msgstr "Busca de xente"
 
-#: actions/peopletag.php:68
 #, php-format
 msgid "Not a valid people tag: %s."
 msgstr "A etiqueta de persoa non é correcta: %s."
 
-#: actions/peopletag.php:142
 #, php-format
 msgid "Users self-tagged with %1$s - page %2$d"
 msgstr "Usuarios etiquetados por si mesmos con %1$s - páxina %2$d"
 
 #. TRANS: Page title for AJAX form return when a disabling a plugin.
-#: actions/plugindisable.php:69
 msgctxt "plugin"
 msgid "Disabled"
 msgstr ""
 
 #. TRANS: Client error displayed trying to perform any request method other than POST.
 #. TRANS: Do not translate POST.
-#: actions/pluginenable.php:78 actions/subscribe.php:77
 msgid "This action only accepts POST requests."
 msgstr "Esta acción só permite solicitudes POST."
 
-#: actions/pluginenable.php:102
 #, fuzzy
 msgid "You cannot administer plugins."
 msgstr "Non pode borrar usuarios."
 
-#: actions/pluginenable.php:109
 #, fuzzy
 msgid "No such plugin."
 msgstr "Esa páxina non existe."
 
 #. TRANS: Page title for AJAX form return when enabling a plugin.
-#: actions/pluginenable.php:159
 msgctxt "plugin"
 msgid "Enabled"
 msgstr ""
 
 #. TRANS: Tab and title for plugins admin panel.
 #. TRANS: Menu item for site administration
-#: actions/pluginsadminpanel.php:56 actions/version.php:191
-#: lib/adminpanelaction.php:411
 msgid "Plugins"
 msgstr "Complementos"
 
 #. TRANS: Instructions at top of plugin admin page.
-#: actions/pluginsadminpanel.php:68
 msgid ""
 "Additional plugins can be enabled and configured manually. See the <a href="
 "\"http://status.net/wiki/Plugins\">online plugin documentation</a> for more "
@@ -4589,33 +3791,27 @@ msgid ""
 msgstr ""
 
 #. TRANS: Admin form section header
-#: actions/pluginsadminpanel.php:84
 #, fuzzy
 msgid "Default plugins"
 msgstr "Lingua por defecto"
 
-#: actions/pluginsadminpanel.php:106
 msgid ""
 "All default plugins have been disabled from the site's configuration file."
 msgstr ""
 
-#: actions/postnotice.php:95
 msgid "Invalid notice content."
 msgstr "O contido da nota é incorrecto."
 
-#: actions/postnotice.php:101
 #, php-format
 msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’."
 msgstr ""
 "A licenza \"%1$s\" da nota non é compatible coa licenza \"%2$s\" do sitio."
 
 #. TRANS: Page title for profile settings.
-#: actions/profilesettings.php:60
 msgid "Profile settings"
 msgstr "Configuración do perfil"
 
 #. TRANS: Usage instructions for profile settings.
-#: actions/profilesettings.php:71
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
@@ -4623,12 +3819,10 @@ msgstr ""
 "coñeza mellor."
 
 #. TRANS: Profile settings form legend.
-#: actions/profilesettings.php:99
 msgid "Profile information"
 msgstr "Información do perfil"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:110 actions/register.php:412
 #, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr ""
@@ -4636,20 +3830,15 @@ msgstr ""
 "espazos, tiles ou eñes"
 
 #. TRANS: Field label in form for profile settings.
-#: actions/profilesettings.php:114 actions/register.php:434
-#: lib/groupeditform.php:150
 msgid "Full name"
 msgstr "Nome completo"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:119 actions/register.php:439
-#: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "Páxina persoal"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:122 actions/register.php:441
 #, fuzzy
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr "URL da súa páxina persoal, blogue ou perfil noutro sitio"
@@ -4657,7 +3846,6 @@ msgstr "URL da súa páxina persoal, blogue ou perfil noutro sitio"
 #. TRANS: Tooltip for field label in form for profile settings. Plural
 #. TRANS: is decided by the number of characters available for the
 #. TRANS: biography (%d).
-#: actions/profilesettings.php:130 actions/register.php:450
 #, fuzzy, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4665,41 +3853,31 @@ msgstr[0] "Descríbase a vostede e mailos seus intereses en %d caracteres"
 msgstr[1] "Descríbase a vostede e mailos seus intereses en %d caracteres"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:136 actions/register.php:455
 msgid "Describe yourself and your interests"
 msgstr "Descríbase a vostede e mailos seus intereses"
 
 #. TRANS: Text area label in form for profile settings where users can provide.
 #. TRANS: their biography.
-#: actions/profilesettings.php:140 actions/register.php:457
 msgid "Bio"
 msgstr "Biografía"
 
 #. TRANS: Field label in form for profile settings.
-#: actions/profilesettings.php:146 actions/register.php:462
-#: lib/groupeditform.php:173
 msgid "Location"
 msgstr "Lugar"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:149
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Onde está a vivir, coma “localidade, provincia (ou comunidade), país”"
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:154
 msgid "Share my current location when posting notices"
 msgstr "Compartir o lugar onde vivo ao publicar notas"
 
 #. TRANS: Field label in form for profile settings.
-#: actions/profilesettings.php:162 actions/tagother.php:128
-#: actions/tagother.php:188 lib/subscriptionlist.php:104
-#: lib/subscriptionlist.php:106
 msgid "Tags"
 msgstr "Etiquetas"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:165
 #, fuzzy
 msgid ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- "
@@ -4709,28 +3887,23 @@ msgstr ""
 "guións baixos), separados por comas ou espazos"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:170
 msgid "Language"
 msgstr "Lingua"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:172
 #, fuzzy
 msgid "Preferred language."
 msgstr "Lingua escollida"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:182
 msgid "Timezone"
 msgstr "Fuso horario"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:184
 msgid "What timezone are you normally in?"
 msgstr "En que fuso horario adoita estar?"
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:190
 #, fuzzy
 msgid ""
 "Automatically subscribe to whoever subscribes to me (best for non-humans)."
@@ -4741,7 +3914,6 @@ msgstr ""
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Plural form is used based on the maximum number of allowed
 #. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:259 actions/register.php:214
 #, fuzzy, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4749,85 +3921,69 @@ msgstr[0] "A biografía é longa de máis (o límite son %d caracteres)."
 msgstr[1] "A biografía é longa de máis (o límite son %d caracteres)."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:270 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr "Non se escolleu ningún fuso horario."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:278
 #, fuzzy
 msgid "Language is too long (maximum 50 characters)."
 msgstr "A lingua é longa de máis (o límite é de 50 caracteres)."
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:292
 #, fuzzy, php-format
 msgid "Invalid tag: \"%s\"."
 msgstr "Etiqueta incorrecta: \"%s\""
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:348
 #, fuzzy
 msgid "Could not update user for autosubscribe."
 msgstr "Non se puido actualizar o usuario para subscribirse automaticamente."
 
 #. TRANS: Server error thrown when user profile location preference settings could not be updated.
-#: actions/profilesettings.php:406
 #, fuzzy
 msgid "Could not save location prefs."
 msgstr "Non se puideron gardar as preferencias de lugar."
 
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:428 actions/tagother.php:179
 msgid "Could not save tags."
 msgstr "Non se puideron gardar as etiquetas."
 
 #. TRANS: Confirmation shown when user profile settings are saved.
 #. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:437 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "Gardouse a configuración."
 
 #. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
 #. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:484 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "Crear unha conta"
 
-#: actions/public.php:83
 #, php-format
 msgid "Beyond the page limit (%s)."
 msgstr "Alén do límite da páxina (%s)."
 
-#: actions/public.php:92
 msgid "Could not retrieve public stream."
 msgstr "Non se puido obter o fluxo público."
 
-#: actions/public.php:130
 #, php-format
 msgid "Public timeline, page %d"
 msgstr "Liña do tempo pública, páxina %d"
 
-#: actions/public.php:132 lib/publicgroupnav.php:79
 msgid "Public timeline"
 msgstr "Liña do tempo pública"
 
-#: actions/public.php:160
 msgid "Public Stream Feed (RSS 1.0)"
 msgstr "Fonte de novas no fluxo público (RSS 1.0)"
 
-#: actions/public.php:164
 msgid "Public Stream Feed (RSS 2.0)"
 msgstr "Fonte de novas no fluxo público (RSS 2.0)"
 
-#: actions/public.php:168
 msgid "Public Stream Feed (Atom)"
 msgstr "Fonte de novas no fluxo público (Atom)"
 
-#: actions/public.php:188
 #, php-format
 msgid ""
 "This is the public timeline for %%site.name%% but no one has posted anything "
@@ -4836,11 +3992,9 @@ msgstr ""
 "Esta é a liña do tempo pública para %%site.name%% pero ninguén publicou nada "
 "aínda."
 
-#: actions/public.php:191
 msgid "Be the first to post!"
 msgstr "Sexa o primeiro en publicar!"
 
-#: actions/public.php:195
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post!"
@@ -4848,7 +4002,6 @@ msgstr ""
 "Por que non [rexistrar unha conta](%%action.register%%) e ser o primeiro en "
 "publicar?"
 
-#: actions/public.php:242
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -4862,7 +4015,6 @@ msgstr ""
 "register%%) para compartir notas persoais cos amigos, a familia e os "
 "compañeiros! ([Máis información](%%doc.help%%))"
 
-#: actions/public.php:247
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -4874,19 +4026,16 @@ msgstr ""
 "software libre [StatusNet](http://status.net/)."
 
 #. TRANS: Public RSS feed description. %s is the StatusNet site name.
-#: actions/publicrss.php:106
 #, fuzzy, php-format
 msgid "%s updates from everyone."
 msgstr "%s actualizacións de todos!"
 
 #. TRANS: Title for public tag cloud.
-#: actions/publictagcloud.php:57
 msgid "Public tag cloud"
 msgstr "Nube de etiquetas públicas"
 
 #. TRANS: Instructions (more used like an explanation/header).
 #. TRANS: %s is the StatusNet sitename.
-#: actions/publictagcloud.php:65
 #, fuzzy, php-format
 msgid "These are most popular recent tags on %s"
 msgstr "Estas son as etiquetas máis populares en %s "
@@ -4894,14 +4043,12 @@ msgstr "Estas son as etiquetas máis populares en %s "
 #. TRANS: This message contains a Markdown URL. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.
-#: actions/publictagcloud.php:74
 #, php-format
 msgid "No one has posted a notice with a [hashtag](%%doc.tags%%) yet."
 msgstr "Ninguén publicou aínda ningunha nota cunha [etiqueta](%%doc.tags%%)."
 
 #. 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.
-#: actions/publictagcloud.php:79
 msgid "Be the first to post one!"
 msgstr "Sexa o primeiro en publicar unha!"
 
@@ -4910,7 +4057,6 @@ msgstr "Sexa o primeiro en publicar unha!"
 #. TRANS: This message contains a Markdown URL. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.
-#: actions/publictagcloud.php:87
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post "
@@ -4920,44 +4066,36 @@ msgstr ""
 "publicar unha?"
 
 #. TRANS: Client error displayed trying to recover password while already logged in.
-#: actions/recoverpassword.php:37
 msgid "You are already logged in!"
 msgstr "Xa está identificado!"
 
 #. TRANS: Client error displayed when password recovery code is not correct.
-#: actions/recoverpassword.php:64
 msgid "No such recovery code."
 msgstr "Ese código de recuperación non existe."
 
 #. TRANS: Client error displayed when no proper password recovery code was submitted.
-#: actions/recoverpassword.php:69
 msgid "Not a recovery code."
 msgstr "Iso non é un código de recuperación."
 
 #. TRANS: Server error displayed trying to recover password without providing a user.
-#: actions/recoverpassword.php:77
 msgid "Recovery code for unknown user."
 msgstr "Código de recuperación para un usuario descoñecido."
 
 #. TRANS: Server error displayed removing a password recovery code from the database.
-#: actions/recoverpassword.php:91
 msgid "Error with confirmation code."
 msgstr "Houbo un erro co código de confirmación."
 
 #. TRANS: Client error displayed trying to recover password with too old a recovery code.
-#: actions/recoverpassword.php:103
 msgid "This confirmation code is too old. Please start again."
 msgstr "Este código de confirmación é vello de máis. Volva empezar."
 
 #. TRANS: Server error displayed when updating a user's e-mail address in the database fails while recovering a password.
-#: actions/recoverpassword.php:118
 msgid "Could not update user with confirmed email address."
 msgstr ""
 "Non se puido actualizar o usuario co enderezo de correo electrónico "
 "confirmado."
 
 #. TRANS: Page notice for password recovery page.
-#: actions/recoverpassword.php:160
 msgid ""
 "If you have forgotten or lost your password, you can get a new one sent to "
 "the email address you have stored in your account."
@@ -4965,104 +4103,86 @@ msgstr ""
 "Se esqueceu ou perdeu o seu contrasinal, pode solicitar que se lle envíe un "
 "novo ao enderezo de correo electrónico da conta."
 
-#: actions/recoverpassword.php:167
 msgid "You have been identified. Enter a new password below."
 msgstr "Acaba de identificarse. Introduza un contrasinal novo a continuación."
 
 #. TRANS: Fieldset legend for password recovery page.
-#: actions/recoverpassword.php:198
 msgid "Password recovery"
 msgstr "Recuperación do contrasinal"
 
 #. TRANS: Field label on password recovery page.
-#: actions/recoverpassword.php:202
 msgid "Nickname or email address"
 msgstr "Alcume ou enderezo de correo electrónico"
 
 #. TRANS: Title for field label on password recovery page.
-#: actions/recoverpassword.php:205
 msgid "Your nickname on this server, or your registered email address."
 msgstr ""
 "O seu alcume neste servidor, ou o enderezo de correo electrónico co que se "
 "rexistrou."
 
 #. TRANS: Field label on password recovery page.
-#: actions/recoverpassword.php:212
 msgid "Recover"
 msgstr "Recuperar"
 
 #. TRANS: Button text on password recovery page.
-#: actions/recoverpassword.php:214
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Recover"
 msgstr "Recuperar"
 
 #. TRANS: Title for password recovery page in password reset mode.
-#: actions/recoverpassword.php:223
 msgid "Reset password"
 msgstr "Restablecer o contrasinal"
 
 #. TRANS: Title for password recovery page in password recover mode.
-#: actions/recoverpassword.php:225
 msgid "Recover password"
 msgstr "Recuperar o contrasinal"
 
 #. TRANS: Title for password recovery page in email sent mode.
 #. TRANS: Subject for password recovery e-mail.
-#: actions/recoverpassword.php:227 actions/recoverpassword.php:366
 msgid "Password recovery requested"
 msgstr "Solicitouse a recuperación do contrasinal"
 
 #. TRANS: Title for password recovery page in password saved mode.
-#: actions/recoverpassword.php:229
 #, fuzzy
 msgid "Password saved"
 msgstr "Gardouse o contrasinal."
 
 #. TRANS: Title for password recovery page when an unknown action has been specified.
-#: actions/recoverpassword.php:232
 msgid "Unknown action"
 msgstr "Non se coñece esa acción"
 
 #. TRANS: Title for field label for password reset form.
-#: actions/recoverpassword.php:258
 #, fuzzy
 msgid "6 or more characters, and do not forget it!"
 msgstr "Seis ou máis caracteres, e non o esqueza!"
 
 #. TRANS: Button text for password reset form.
 #. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: actions/recoverpassword.php:268 lib/designform.php:145
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Reset"
 msgstr "Restablecer"
 
 #. TRANS: Form instructions for password recovery form.
-#: actions/recoverpassword.php:278
 msgid "Enter a nickname or email address."
 msgstr "Introduza un alcume ou enderezo de correo electrónico."
 
 #. TRANS: Information on password recovery form if no known username or e-mail address was specified.
-#: actions/recoverpassword.php:309
 msgid "No user with that email address or username."
 msgstr ""
 "Non hai ningún usuario con ese enderezo de correo electrónico ou alcume."
 
 #. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
-#: actions/recoverpassword.php:327
 msgid "No registered email address for that user."
 msgstr ""
 "Non se rexistrou ningún enderezo de correo electrónico para ese usuario."
 
 #. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
-#: actions/recoverpassword.php:342
 msgid "Error saving address confirmation."
 msgstr "Houbo un erro ao gardar a confirmación do enderezo."
 
 #. TRANS: User notification after an e-mail with instructions was sent from the password recovery form.
-#: actions/recoverpassword.php:370
 msgid ""
 "Instructions for recovering your password have been sent to the email "
 "address registered to your account."
@@ -5071,75 +4191,59 @@ msgstr ""
 "correo electrónico rexistrado para a súa conta."
 
 #. TRANS: Client error displayed when trying to reset as password without providing a user.
-#: actions/recoverpassword.php:391
 msgid "Unexpected password reset."
 msgstr "Restablecemento de contrasinal inesperado."
 
 #. TRANS: Reset password form validation error message.
-#: actions/recoverpassword.php:400
 #, fuzzy
 msgid "Password must be 6 characters or more."
 msgstr "O contrasinal debe ter seis ou máis caracteres."
 
 #. TRANS: Reset password form validation error message.
-#: actions/recoverpassword.php:405
 msgid "Password and confirmation do not match."
 msgstr "O contrasinal e a confirmación non coinciden."
 
 #. TRANS: Server error displayed when something does wrong with the user object during password reset.
-#: actions/recoverpassword.php:426 actions/register.php:241
 msgid "Error setting user."
 msgstr "Houbo un erro ao configurar o usuario."
 
 #. TRANS: Success message for user after password reset.
-#: actions/recoverpassword.php:434
 msgid "New password successfully saved. You are now logged in."
 msgstr "O novo contrasinal gardouse correctamente. Agora está identificado."
 
-#: actions/redirecturl.php:70
 #, fuzzy
 msgid "No id parameter"
 msgstr "Sen argumento ID."
 
-#: actions/redirecturl.php:76
 #, fuzzy, php-format
 msgid "No such file \"%d\""
 msgstr "Non existe tal ficheiro."
 
-#: actions/register.php:80 actions/register.php:181 actions/register.php:392
 msgid "Sorry, only invited people can register."
 msgstr "Só se pode rexistrar mediante invitación."
 
-#: actions/register.php:87
 msgid "Sorry, invalid invitation code."
 msgstr "O código da invitación é incorrecto."
 
-#: actions/register.php:106
 msgid "Registration successful"
 msgstr "Rexistrouse correctamente"
 
-#: actions/register.php:108 actions/register.php:490
 msgid "Register"
 msgstr "Rexistrarse"
 
-#: actions/register.php:128
 msgid "Registration not allowed."
 msgstr "Non se permite o rexistro."
 
-#: actions/register.php:194
 #, fuzzy
 msgid "You cannot register if you don't agree to the license."
 msgstr "Non pode rexistrarse se non acepta a licenza."
 
-#: actions/register.php:203
 msgid "Email address already exists."
 msgstr "O enderezo de correo electrónico xa existe."
 
-#: actions/register.php:236 actions/register.php:258
 msgid "Invalid username or password."
 msgstr "O nome de usuario ou contrasinal non son correctos."
 
-#: actions/register.php:333
 #, fuzzy
 msgid ""
 "With this form you can create a new account. You can then post notices and "
@@ -5148,53 +4252,43 @@ msgstr ""
 "Con este formulario pode crear unha conta nova. Entón poderá publicar notas "
 "e porse en contacto con amigos e compañeiros. "
 
-#: actions/register.php:424 actions/register.php:428
-#: actions/siteadminpanel.php:238 lib/settingsnav.php:92
 msgid "Email"
 msgstr "Correo electrónico"
 
-#: actions/register.php:425 actions/register.php:429
 #, fuzzy
 msgid "Used only for updates, announcements, and password recovery."
 msgstr ""
 "Só se utiliza para actualizacións, anuncios e recuperación de contrasinais"
 
-#: actions/register.php:436
 #, fuzzy
 msgid "Longer name, preferably your \"real\" name."
 msgstr "Nome longo, preferiblemente o seu nome \"real\""
 
-#: actions/register.php:464
 #, fuzzy
 msgid "Where you are, like \"City, State (or Region), Country\"."
 msgstr "Onde está a vivir, coma “localidade, provincia (ou comunidade), país”"
 
-#: actions/register.php:503
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
 msgstr "Entendo que o contido e os datos de %1$s son privados e confidenciais."
 
-#: actions/register.php:513
 #, php-format
 msgid "My text and files are copyright by %1$s."
 msgstr ""
 "Os meus textos e ficheiros están protexidos polos dereitos de autor de %1$s."
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:517
 msgid "My text and files remain under my own copyright."
 msgstr ""
 "Os meus textos e ficheiros están protexidos polos meus propios dereitos de "
 "autor."
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:520
 msgid "All rights reserved."
 msgstr "Todos os dereitos reservados."
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:525
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -5204,7 +4298,6 @@ msgstr ""
 "datos privados: contrasinais, enderezos de correo electrónico e mensaxería "
 "instantánea e números de teléfono."
 
-#: actions/register.php:566
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -5236,7 +4329,6 @@ msgstr ""
 "\n"
 "Grazas por rexistrarse. Esperamos que goce deste servizo."
 
-#: actions/register.php:590
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5244,7 +4336,6 @@ msgstr ""
 "(Debería recibir unha mensaxe por correo electrónico nuns intres, con "
 "instrucións para a confirmación do seu enderezo de correo electrónico.)"
 
-#: actions/remotesubscribe.php:97
 #, php-format
 msgid ""
 "To subscribe, you can [login](%%action.login%%), or [register](%%action."
@@ -5256,113 +4347,88 @@ msgstr ""
 "mensaxes de blogue curtas compatible](%%doc.openmublog%%), introduza a "
 "continuación o URL do seu perfil."
 
-#: actions/remotesubscribe.php:111
 msgid "Remote subscribe"
 msgstr "Subscribirse remotamente"
 
-#: actions/remotesubscribe.php:123
 msgid "Subscribe to a remote user"
 msgstr "Subscribirse a un usuario remoto"
 
-#: actions/remotesubscribe.php:128
 msgid "User nickname"
 msgstr "Alcume do usuario"
 
-#: actions/remotesubscribe.php:129
 #, fuzzy
 msgid "Nickname of the user you want to follow."
 msgstr "Alcume do usuario ao que quere seguir"
 
-#: actions/remotesubscribe.php:132
 msgid "Profile URL"
 msgstr "URL do perfil"
 
-#: actions/remotesubscribe.php:133
 #, fuzzy
 msgid "URL of your profile on another compatible microblogging service."
 msgstr ""
 "URL do seu perfil noutro servizo de mensaxes de blogue curtas compatible"
 
 #. TRANS: Link text for link that will subscribe to a remote profile.
-#: actions/remotesubscribe.php:136 lib/subscribeform.php:139
-#: lib/userprofile.php:402
 msgid "Subscribe"
 msgstr "Subscribirse"
 
-#: actions/remotesubscribe.php:158
 #, fuzzy
 msgid "Invalid profile URL (bad format)."
 msgstr "O enderezo URL do perfil é incorrecto (formato erróneo)"
 
-#: actions/remotesubscribe.php:167
 msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
 msgstr ""
 "Non é un URL de perfil correcto (non hai un documento YADIS ou definiuse un "
 "XRDS incorrecto)."
 
-#: actions/remotesubscribe.php:175
 #, fuzzy
 msgid "That is a local profile! Login to subscribe."
 msgstr "Ese é un perfil local! Identifíquese para subscribirse."
 
-#: actions/remotesubscribe.php:182
 #, fuzzy
 msgid "Could not get a request token."
 msgstr "Non se puido obter o pase solicitado."
 
-#: actions/repeat.php:56
 msgid "Only logged-in users can repeat notices."
 msgstr "Só os usuarios identificados poden repetir notas."
 
-#: actions/repeat.php:63 actions/repeat.php:70
 msgid "No notice specified."
 msgstr "Non se especificou nota ningunha."
 
-#: actions/repeat.php:75
 #, fuzzy
 msgid "You cannot repeat your own notice."
 msgstr "Non pode repetir a súa propia nota."
 
-#: actions/repeat.php:89
 msgid "You already repeated that notice."
 msgstr "Xa repetiu esa nota."
 
-#: actions/repeat.php:112 lib/noticelist.php:697
 msgid "Repeated"
 msgstr "Repetida"
 
-#: actions/repeat.php:117
 msgid "Repeated!"
 msgstr "Repetida!"
 
 #. TRANS: RSS reply feed title. %s is a user nickname.
-#: actions/replies.php:126 actions/repliesrss.php:68
-#: lib/personalgroupnav.php:105
 #, php-format
 msgid "Replies to %s"
 msgstr "Respostas a %s"
 
-#: actions/replies.php:128
 #, php-format
 msgid "Replies to %1$s, page %2$d"
 msgstr "Respostas a %1$s, páxina %2$d"
 
-#: actions/replies.php:145
 #, php-format
 msgid "Replies feed for %s (RSS 1.0)"
 msgstr "Fonte de novas coas respostas a %s (RSS 1.0)"
 
-#: actions/replies.php:152
 #, php-format
 msgid "Replies feed for %s (RSS 2.0)"
 msgstr "Fonte de novas coas respostas a %s (RSS 2.0)"
 
-#: actions/replies.php:159
 #, php-format
 msgid "Replies feed for %s (Atom)"
 msgstr "Fonte de novas coas respostas a %s (Atom)"
 
-#: actions/replies.php:199
 #, php-format
 msgid ""
 "This is the timeline showing replies to %1$s but %2$s hasn't received a "
@@ -5371,7 +4437,6 @@ msgstr ""
 "Esta é a liña do tempo coas respostas a %1$s, pero a %2$s aínda non lle "
 "mandaron ningunha nota."
 
-#: actions/replies.php:204
 #, php-format
 msgid ""
 "You can engage other users in a conversation, subscribe to more people or "
@@ -5380,7 +4445,6 @@ msgstr ""
 "Pode conversar con outros usuarios, subscribirse a máis xente ou [unirse a "
 "grupos](%%action.groups%%)."
 
-#: actions/replies.php:206
 #, php-format
 msgid ""
 "You can try to [nudge %1$s](../%2$s) or [post something to them](%%%%action."
@@ -5391,37 +4455,31 @@ msgstr ""
 
 #. TRANS: RSS reply feed description.
 #. TRANS: %1$s is a user nickname, %2$s is the StatusNet site name.
-#: actions/repliesrss.php:74
 #, fuzzy, php-format
 msgid "Replies to %1$s on %2$s."
 msgstr "Respostas a %1$s en %2$s!"
 
 #. TRANS: Client exception displayed when trying to restore an account while not logged in.
-#: actions/restoreaccount.php:78
 #, fuzzy
 msgid "Only logged-in users can restore their account."
 msgstr "Só os usuarios identificados poden repetir notas."
 
 #. TRANS: Client exception displayed when trying to restore an account without having restore rights.
-#: actions/restoreaccount.php:83
 #, fuzzy
 msgid "You may not restore your account."
 msgstr "Aínda non rexistrou ningunha aplicación."
 
 #. TRANS: Client exception displayed trying to restore an account while something went wrong uploading a file.
 #. TRANS: Client exception. No file; probably just a non-AJAX submission.
-#: actions/restoreaccount.php:121 actions/restoreaccount.php:146
 #, fuzzy
 msgid "No uploaded file."
 msgstr "Cargar un ficheiro"
 
 #. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
-#: actions/restoreaccount.php:129 lib/mediafile.php:194
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
 msgstr "O ficheiro subido supera a directiva upload_max_filesize no php.ini."
 
 #. TRANS: Client exception.
-#: actions/restoreaccount.php:135 lib/mediafile.php:200
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form."
@@ -5430,145 +4488,117 @@ msgstr ""
 "formulario HTML."
 
 #. TRANS: Client exception.
-#: actions/restoreaccount.php:141 lib/mediafile.php:206
 msgid "The uploaded file was only partially uploaded."
 msgstr "O ficheiro só se subiu parcialmente."
 
 #. TRANS: Client exception thrown when a temporary folder is not present to store a file upload.
-#: actions/restoreaccount.php:150 lib/mediafile.php:214
 msgid "Missing a temporary folder."
 msgstr "Falta un cartafol temporal."
 
 #. TRANS: Client exception thrown when writing to disk is not possible during a file upload operation.
-#: actions/restoreaccount.php:154 lib/mediafile.php:218
 msgid "Failed to write file to disk."
 msgstr "Non se puido escribir o ficheiro no disco."
 
 #. TRANS: Client exception thrown when a file upload operation has been stopped by an extension.
-#: actions/restoreaccount.php:158 lib/mediafile.php:222
 msgid "File upload stopped by extension."
 msgstr "Interrompeuse a carga do ficheiro por mor da extensión."
 
 #. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
 #. TRANS: Exception thrown when uploading an image fails for an unknown reason.
 #. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
-#: actions/restoreaccount.php:164 lib/imagefile.php:106 lib/mediafile.php:228
 msgid "System error uploading file."
 msgstr "Houbo un erro no sistema ao cargar o ficheiro."
 
 #. TRANS: Client exception thrown when a feed is not an Atom feed.
-#: actions/restoreaccount.php:207
 #, fuzzy
 msgid "Not an Atom feed."
 msgstr "Todos os membros"
 
 #. TRANS: Success message when a feed has been restored.
-#: actions/restoreaccount.php:241
 msgid ""
 "Feed has been restored. Your old posts should now appear in search and your "
 "profile page."
 msgstr ""
 
 #. TRANS: Message when a feed restore is in progress.
-#: actions/restoreaccount.php:245
 msgid "Feed will be restored. Please wait a few minutes for results."
 msgstr ""
 
 #. TRANS: Form instructions for feed restore.
-#: actions/restoreaccount.php:342
 msgid ""
 "You can upload a backed-up stream in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format."
 msgstr ""
 
 #. TRANS: Title for submit button to confirm upload of a user backup file for account restore.
-#: actions/restoreaccount.php:373
 #, fuzzy
 msgid "Upload the file"
 msgstr "Cargar un ficheiro"
 
-#: actions/revokerole.php:75
 msgid "You cannot revoke user roles on this site."
 msgstr "Non pode revogar os roles dos usuarios neste sitio."
 
-#: actions/revokerole.php:82
 msgid "User doesn't have this role."
 msgstr "O usuario non ten este rol."
 
-#: actions/rsd.php:142 actions/version.php:159
 msgid "StatusNet"
 msgstr "StatusNet"
 
-#: actions/sandbox.php:65 actions/unsandbox.php:65
 msgid "You cannot sandbox users on this site."
 msgstr "Non pode illar usuarios neste sitio."
 
-#: actions/sandbox.php:72
 msgid "User is already sandboxed."
 msgstr "O usuario xa está illado."
 
 #. TRANS: Menu item for site administration
-#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
-#: lib/adminpanelaction.php:379
 msgid "Sessions"
 msgstr "Sesións"
 
-#: actions/sessionsadminpanel.php:65
 msgid "Session settings for this StatusNet site"
 msgstr "Configuración de sesión para este sitio StatusNet"
 
-#: actions/sessionsadminpanel.php:175
 msgid "Handle sessions"
 msgstr "Manexar as sesións"
 
-#: actions/sessionsadminpanel.php:177
 msgid "Whether to handle sessions ourselves."
 msgstr "Manexar ou non as sesións nós mesmos."
 
-#: actions/sessionsadminpanel.php:181
 msgid "Session debugging"
 msgstr "Depuración da sesión"
 
-#: actions/sessionsadminpanel.php:183
 msgid "Turn on debugging output for sessions."
 msgstr "Activar a saída de depuración para as sesións."
 
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
+#. TRANS: Submit button title.
+msgid "Save"
+msgstr "Gardar"
+
 msgid "Save site settings"
 msgstr "Gardar a configuración do sitio"
 
-#: actions/showapplication.php:78
 msgid "You must be logged in to view an application."
 msgstr "Debe estar identificado para ver unha aplicación."
 
-#: actions/showapplication.php:151
 msgid "Application profile"
 msgstr "Perfil da aplicación"
 
-#: actions/showapplication.php:179
 #, php-format
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr "Creado por %1$s - acceso %2$s por defecto - %3$d usuarios"
 
-#: actions/showapplication.php:189
 msgid "Application actions"
 msgstr "Accións da aplicación"
 
-#: actions/showapplication.php:212
 msgid "Reset key & secret"
 msgstr "Restablecer o contrasinal ou a pregunta secreta"
 
 #. TRANS: Title of form for deleting a user.
-#: actions/showapplication.php:228 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:64 lib/noticelist.php:678
 msgid "Delete"
 msgstr "Borrar"
 
-#: actions/showapplication.php:237
 msgid "Application info"
 msgstr "Información da aplicación"
 
-#: actions/showapplication.php:255
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
@@ -5576,7 +4606,6 @@ msgstr ""
 "Nota: sopórtanse as sinaturas HMAC-SHA1. Non se soporta o método de asinado "
 "con texto sinxelo."
 
-#: actions/showapplication.php:275
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr ""
 "Seguro que quere restablecer a súa clave e maila súa pregunta secreta de "
@@ -5584,36 +4613,30 @@ msgstr ""
 
 #. TRANS: Title for all but the first page of favourite notices of a user.
 #. TRANS: %1$s is the user for whom the favourite notices are displayed, %2$d is the page number.
-#: actions/showfavorites.php:80
 #, php-format
 msgid "%1$s's favorite notices, page %2$d"
 msgstr "Notas favoritas de %1$s, páxina %2$d"
 
 #. TRANS: Server error displayed when favourite notices could not be retrieved from the database.
-#: actions/showfavorites.php:134
 msgid "Could not retrieve favorite notices."
 msgstr "Non se puideron obter as notas favoritas."
 
 #. TRANS: Feed link text. %s is a username.
-#: actions/showfavorites.php:172
 #, php-format
 msgid "Feed for favorites of %s (RSS 1.0)"
 msgstr "Fonte de novas dos favoritos de %s (RSS 1.0)"
 
 #. TRANS: Feed link text. %s is a username.
-#: actions/showfavorites.php:180
 #, php-format
 msgid "Feed for favorites of %s (RSS 2.0)"
 msgstr "Fonte de novas dos favoritos de %s (RSS 2.0)"
 
 #. TRANS: Feed link text. %s is a username.
-#: actions/showfavorites.php:188
 #, php-format
 msgid "Feed for favorites of %s (Atom)"
 msgstr "Fonte de novas dos favoritos de %s (Atom)"
 
 #. TRANS: Text displayed instead of favourite notices for the current logged in user that has no favourites.
-#: actions/showfavorites.php:209
 msgid ""
 "You haven't chosen any favorite notices yet. Click the fave button on "
 "notices you like to bookmark them for later or shed a spotlight on them."
@@ -5623,7 +4646,6 @@ msgstr ""
 
 #. TRANS: Text displayed instead of favourite notices for a user that has no favourites while logged in.
 #. TRANS: %s is a username.
-#: actions/showfavorites.php:213
 #, php-format
 msgid ""
 "%s hasn't added any favorite notices yet. Post something interesting they "
@@ -5635,7 +4657,6 @@ msgstr ""
 #. TRANS: Text displayed instead of favourite notices for a user that has no favourites while not logged in.
 #. TRANS: %s is a username, %%%%action.register%%%% is a link to the user registration page.
 #. TRANS: (link text)[link] is a Mark Down link.
-#: actions/showfavorites.php:220
 #, php-format
 msgid ""
 "%s hasn't added any favorite notices yet. Why not [register an account](%%%%"
@@ -5647,64 +4668,53 @@ msgstr ""
 "querer engadir aos seus favoritos? :)"
 
 #. TRANS: Page notice for show favourites page.
-#: actions/showfavorites.php:251
 msgid "This is a way to share what you like."
 msgstr "Isto é un modo de compartir o que lle gusta."
 
 #. TRANS: Page title for first group page. %s is a group name.
-#: actions/showgroup.php:75
 #, php-format
 msgid "%s group"
 msgstr "Grupo %s"
 
 #. TRANS: Page title for any but first group page.
 #. TRANS: %1$s is a group name, $2$s is a page number.
-#: actions/showgroup.php:79
 #, php-format
 msgid "%1$s group, page %2$d"
 msgstr "Grupo %1$s, páxina %2$d"
 
 #. TRANS: Label for group description or group note (dt). Text hidden by default.
-#: actions/showgroup.php:266
 msgid "Note"
 msgstr "Nota"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:277 lib/groupeditform.php:180
 msgid "Aliases"
 msgstr "Pseudónimos"
 
 #. TRANS: Group actions header (h2). Text hidden by default.
-#: actions/showgroup.php:294
 msgid "Group actions"
 msgstr "Accións do grupo"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:338
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
 msgstr "Fonte de novas das notas do grupo %s (RSS 1.0)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:345
 #, php-format
 msgid "Notice feed for %s group (RSS 2.0)"
 msgstr "Fonte de novas das notas do grupo %s (RSS 2.0)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:352
 #, php-format
 msgid "Notice feed for %s group (Atom)"
 msgstr "Fonte de novas das notas do grupo %s (Atom)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:358
 #, php-format
 msgid "FOAF for %s group"
 msgstr "Amigo dun amigo para o grupo %s"
 
 #. TRANS: Header for mini list of group members on a group page (h2).
-#: actions/showgroup.php:395
 msgid "Members"
 msgstr "Membros"
 
@@ -5712,31 +4722,24 @@ msgstr "Membros"
 #. TRANS: Text for user subscription statistics if the user has no subscriptions.
 #. TRANS: Text for user subscriber statistics if user has no subscribers.
 #. TRANS: Text for user user group membership statistics if user is not a member of any group.
-#: actions/showgroup.php:401 lib/profileaction.php:137
-#: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
-#: lib/subscriptionlist.php:123 lib/tagcloudsection.php:71
 msgid "(None)"
 msgstr "(Ningún)"
 
 #. TRANS: Link to all group members from mini list of group members if group has more than n members.
-#: actions/showgroup.php:410
 msgid "All members"
 msgstr "Todos os membros"
 
 #. TRANS: Header for group statistics on a group page (h2).
 #. TRANS: H2 text for user statistics.
-#: actions/showgroup.php:441 lib/profileaction.php:205
 msgid "Statistics"
 msgstr "Estatísticas"
 
-#: actions/showgroup.php:444
 #, fuzzy
 msgctxt "LABEL"
 msgid "Created"
 msgstr "Creado"
 
 #. TRANS: Label for member count in statistics on group page.
-#: actions/showgroup.php:449
 #, fuzzy
 msgctxt "LABEL"
 msgid "Members"
@@ -5746,7 +4749,6 @@ msgstr "Membros"
 #. TRANS: **%s** is the group alias, %%%%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).
-#: actions/showgroup.php:464
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5765,7 +4767,6 @@ 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: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
-#: actions/showgroup.php:474
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5779,99 +4780,83 @@ msgstr ""
 "seus membros comparten mensaxes curtas sobre as súas vidas e intereses. "
 
 #. TRANS: Header for list of group administrators on a group page (h2).
-#: actions/showgroup.php:503
 msgid "Admins"
 msgstr "Administradores"
 
 #. TRANS: Client error displayed requesting a single message that does not exist.
-#: actions/showmessage.php:76
 msgid "No such message."
 msgstr "Non se atopou esa mensaxe."
 
 #. TRANS: Client error displayed requesting a single direct message the requesting user was not a party in.
-#: actions/showmessage.php:86
 msgid "Only the sender and recipient may read this message."
 msgstr "Esta mensaxe só a poden ler o destinatario e mais o remitente."
 
 #. TRANS: Page title for single direct message display when viewing user is the sender.
 #. TRANS: %1$s is the addressed user's nickname, $2$s is a timestamp.
-#: actions/showmessage.php:105
 #, php-format
 msgid "Message to %1$s on %2$s"
 msgstr "Mensaxe a %1$s en %2$s"
 
 #. TRANS: Page title for single message display.
 #. TRANS: %1$s is the sending user's nickname, $2$s is a timestamp.
-#: actions/showmessage.php:113
 #, php-format
 msgid "Message from %1$s on %2$s"
 msgstr "Mensaxe de %1$s en %2$s"
 
-#: actions/shownotice.php:90
 msgid "Notice deleted."
 msgstr "Borrouse a nota."
 
 #. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
-#: actions/showstream.php:70
 #, fuzzy, php-format
 msgid "%1$s tagged %2$s"
 msgstr "%1$s, páxina %2$d"
 
 #. TRANS: Page title showing tagged notices in one user's stream.
 #. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
-#: actions/showstream.php:74
 #, fuzzy, php-format
 msgid "%1$s tagged %2$s, page %3$d"
 msgstr "Notas etiquetadas con %1$s, páxina %2$d"
 
 #. TRANS: Extended page title showing tagged notices in one user's stream.
 #. TRANS: %1$s is the username, %2$d is the page number.
-#: actions/showstream.php:82
 #, php-format
 msgid "%1$s, page %2$d"
 msgstr "%1$s, páxina %2$d"
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %1$s is a user nickname, %2$s is a hashtag.
-#: actions/showstream.php:127
 #, php-format
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
 msgstr "Fonte de novas das notas para %1$s etiquetadas con %2$s (RSS 1.0)"
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.
-#: actions/showstream.php:136
 #, php-format
 msgid "Notice feed for %s (RSS 1.0)"
 msgstr "Fonte de novas das notas para %s (RSS 1.0)"
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.
-#: actions/showstream.php:145
 #, php-format
 msgid "Notice feed for %s (RSS 2.0)"
 msgstr "Fonte de novas das notas para %s (RSS 2.0)"
 
-#: actions/showstream.php:152
 #, php-format
 msgid "Notice feed for %s (Atom)"
 msgstr "Fonte de novas das notas para %s (Atom)"
 
 #. TRANS: Title for link to notice feed. FOAF stands for Friend of a Friend.
 #. TRANS: More information at http://www.foaf-project.org. %s is a user nickname.
-#: actions/showstream.php:159
 #, php-format
 msgid "FOAF for %s"
 msgstr "Amigo dun amigo para %s"
 
 #. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
-#: actions/showstream.php:205
 #, fuzzy, php-format
 msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr "Esta é a liña do tempo para %1$s pero %2$s aínda non publicou nada."
 
 #. TRANS: Second sentence of empty list message for a stream for the user themselves.
-#: actions/showstream.php:211
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
@@ -5881,7 +4866,6 @@ msgstr ""
 
 #. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:215
 #, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
@@ -5892,7 +4876,6 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:258
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5908,7 +4891,6 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:265
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5920,216 +4902,171 @@ msgstr ""
 "baseado na ferramenta de software libre [StatusNet](http://status.net/). "
 
 #. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
-#: actions/showstream.php:322
 #, php-format
 msgid "Repeat of %s"
 msgstr "Repeticións de %s"
 
-#: actions/silence.php:65 actions/unsilence.php:65
 msgid "You cannot silence users on this site."
 msgstr "Non pode silenciar usuarios neste sitio."
 
-#: actions/silence.php:72
 msgid "User is already silenced."
 msgstr "O usuario xa está silenciado."
 
-#: actions/siteadminpanel.php:69
 msgid "Basic settings for this StatusNet site"
 msgstr "Configuración básica para este sitio StatusNet"
 
-#: actions/siteadminpanel.php:133
 msgid "Site name must have non-zero length."
 msgstr "O nome do sitio non pode quedar baleiro."
 
-#: actions/siteadminpanel.php:141
 msgid "You must have a valid contact email address."
 msgstr "Ten que ter un enderezo de correo electrónico de contacto correcto."
 
-#: actions/siteadminpanel.php:159
 #, php-format
 msgid "Unknown language \"%s\"."
 msgstr "Non se coñece a lingua \"%s\"."
 
-#: actions/siteadminpanel.php:165
 msgid "Minimum text limit is 0 (unlimited)."
 msgstr "O límite mínimo de texto é 0 (ilimitado)."
 
-#: actions/siteadminpanel.php:171
 msgid "Dupe limit must be one or more seconds."
 msgstr "O tempo límite de repetición debe ser de 1 ou máis segundos."
 
-#: actions/siteadminpanel.php:221
 msgid "General"
 msgstr "Xeral"
 
-#: actions/siteadminpanel.php:224
 msgid "Site name"
 msgstr "Nome do sitio"
 
-#: actions/siteadminpanel.php:225
 msgid "The name of your site, like \"Yourcompany Microblog\""
 msgstr ""
 "O nome do seu sitio, como por exemplo \"O sitio de mensaxes de blogue curtas "
 "da miña empresa\""
 
-#: actions/siteadminpanel.php:229
 msgid "Brought by"
 msgstr "Publicado por"
 
-#: actions/siteadminpanel.php:230
 msgid "Text used for credits link in footer of each page"
 msgstr "Texto utilizado para a ligazón aos créditos ao pé de cada páxina"
 
-#: actions/siteadminpanel.php:234
 msgid "Brought by URL"
 msgstr "URL do publicador"
 
-#: actions/siteadminpanel.php:235
 msgid "URL used for credits link in footer of each page"
 msgstr "URL utilizado para a ligazón aos créditos ao pé de cada páxina"
 
-#: actions/siteadminpanel.php:239
 msgid "Contact email address for your site"
 msgstr "Enderezo de correo electrónico de contacto para o seu sitio"
 
-#: actions/siteadminpanel.php:245
 msgid "Local"
 msgstr "Local"
 
-#: actions/siteadminpanel.php:256
 msgid "Default timezone"
 msgstr "Fuso horario por defecto"
 
-#: actions/siteadminpanel.php:257
 msgid "Default timezone for the site; usually UTC."
 msgstr "Fuso horario por defecto para este sitio. Adoita poñerse o UTC."
 
-#: actions/siteadminpanel.php:262
 msgid "Default language"
 msgstr "Lingua por defecto"
 
-#: actions/siteadminpanel.php:263
 msgid "Site language when autodetection from browser settings is not available"
 msgstr ""
 "Lingua do sitio para cando a detección automática a partir do navegador non "
 "sexa posible"
 
-#: actions/siteadminpanel.php:271
 msgid "Limits"
 msgstr "Límites"
 
-#: actions/siteadminpanel.php:274
 msgid "Text limit"
 msgstr "Límite de texto"
 
-#: actions/siteadminpanel.php:274
 msgid "Maximum number of characters for notices."
 msgstr "Número máximo de caracteres para as notas."
 
-#: actions/siteadminpanel.php:278
 msgid "Dupe limit"
 msgstr "Tempo límite de repetición"
 
-#: actions/siteadminpanel.php:278
 msgid "How long users must wait (in seconds) to post the same thing again."
 msgstr ""
 "Tempo (en segundos) que teñen que agardar os usuarios para publicar unha "
 "nota de novo."
 
 #. TRANS: Page title for site-wide notice tab in admin panel.
-#: actions/sitenoticeadminpanel.php:55
 msgid "Site Notice"
 msgstr "Nota do sitio"
 
 #. TRANS: Instructions for site-wide notice tab in admin panel.
-#: actions/sitenoticeadminpanel.php:66
 msgid "Edit site-wide message"
 msgstr "Editar a mensaxe global do sitio"
 
 #. TRANS: Server error displayed when saving a site-wide notice was impossible.
-#: actions/sitenoticeadminpanel.php:101
 msgid "Unable to save site notice."
 msgstr "Non se puido gardar a nota do sitio."
 
 #. TRANS: Client error displayed when a site-wide notice was longer than allowed.
-#: actions/sitenoticeadminpanel.php:112
 #, fuzzy
 msgid "Maximum length for the site-wide notice is 255 characters."
 msgstr "O tamaño máximo da nota global do sitio é de 255 caracteres."
 
 #. TRANS: Label for site-wide notice text field in admin panel.
-#: actions/sitenoticeadminpanel.php:176
 msgid "Site notice text"
 msgstr "Texto da nota do sitio"
 
 #. TRANS: Tooltip for site-wide notice text field in admin panel.
-#: actions/sitenoticeadminpanel.php:179
 #, fuzzy
 msgid "Site-wide notice text (255 characters maximum; HTML allowed)"
 msgstr ""
 "Texto da nota global do sitio (255 caracteres como máximo, pode conter HTML)"
 
 #. TRANS: Title for button to save site notice in admin panel.
-#: actions/sitenoticeadminpanel.php:201
 #, fuzzy
 msgid "Save site notice."
 msgstr "Gardar a nota do sitio"
 
 #. TRANS: Title for SMS settings.
-#: actions/smssettings.php:56
 msgid "SMS settings"
 msgstr "Configuración dos SMS"
 
 #. TRANS: SMS settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/smssettings.php:70
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr "Pode recibir mensaxes SMS de %%site.name%% por correo electrónico."
 
 #. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
-#: actions/smssettings.php:92
 msgid "SMS is not available."
 msgstr "Os SMS non están dispoñibles."
 
 #. TRANS: Form legend for SMS settings form.
-#: actions/smssettings.php:106
 msgid "SMS address"
 msgstr "Enderezo dos SMS"
 
 #. TRANS: Form guide in SMS settings form.
-#: actions/smssettings.php:115
 msgid "Current confirmed SMS-enabled phone number."
 msgstr "Número de teléfono cos SMS activados confirmado actualmente."
 
 #. TRANS: Form guide in IM settings form.
-#: actions/smssettings.php:128
 msgid "Awaiting confirmation on this phone number."
 msgstr "Agardando pola confirmación do número de teléfono."
 
 #. TRANS: Field label for SMS address input in SMS settings form.
-#: actions/smssettings.php:137
 msgid "Confirmation code"
 msgstr "Código de confirmación"
 
 #. TRANS: Form field instructions in SMS settings form.
-#: actions/smssettings.php:139
 msgid "Enter the code you received on your phone."
 msgstr "Introduza o código que recibiu no teléfono."
 
 #. TRANS: Button label to confirm SMS confirmation code in SMS settings.
-#: actions/smssettings.php:143
 msgctxt "BUTTON"
 msgid "Confirm"
 msgstr "Confirmar"
 
 #. TRANS: Field label for SMS phone number input in SMS settings form.
-#: actions/smssettings.php:148
 msgid "SMS phone number"
 msgstr "Número de teléfono para os SMS"
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
-#: actions/smssettings.php:151
 #, fuzzy
 msgid "Phone number, no punctuation or spaces, with area code."
 msgstr ""
@@ -6137,12 +5074,10 @@ msgstr ""
 "código da zona"
 
 #. TRANS: Form legend for SMS preferences form.
-#: actions/smssettings.php:190
 msgid "SMS preferences"
 msgstr "Preferencias dos SMS"
 
 #. TRANS: Checkbox label in SMS preferences form.
-#: actions/smssettings.php:196
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
@@ -6151,32 +5086,26 @@ msgstr ""
 "exorbitantes na factura da miña compañía."
 
 #. TRANS: Confirmation message for successful SMS preferences save.
-#: actions/smssettings.php:307
 msgid "SMS preferences saved."
 msgstr "Gardáronse as preferencias dos SMS."
 
 #. TRANS: Message given saving SMS phone number without having provided one.
-#: actions/smssettings.php:329
 msgid "No phone number."
 msgstr "Non hai ningún número de teléfono."
 
 #. TRANS: Message given saving SMS phone number without having selected a carrier.
-#: actions/smssettings.php:335
 msgid "No carrier selected."
 msgstr "Non se escolleu unha compañía."
 
 #. TRANS: Message given saving SMS phone number that is already set.
-#: actions/smssettings.php:343
 msgid "That is already your phone number."
 msgstr "Ese xa é o seu número de teléfono."
 
 #. TRANS: Message given saving SMS phone number that is already set for another user.
-#: actions/smssettings.php:347
 msgid "That phone number already belongs to another user."
 msgstr "Ese número de teléfono xa pertence a outro usuario."
 
 #. TRANS: Message given saving valid SMS phone number that is to be confirmed.
-#: actions/smssettings.php:375
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
 "for the code and instructions on how to use it."
@@ -6185,39 +5114,32 @@ msgstr ""
 "Comprobe no seu teléfono o código e as instrucións para utilizalo."
 
 #. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
-#: actions/smssettings.php:403
 msgid "That is the wrong confirmation number."
 msgstr "Ese número de confirmación é incorrecto."
 
 #. TRANS: Message given after successfully canceling SMS phone number confirmation.
-#: actions/smssettings.php:417
 msgid "SMS confirmation cancelled."
 msgstr "Cancelouse a confirmación para os SMS."
 
 #. TRANS: Message given trying to remove an SMS phone number that is not
 #. TRANS: registered for the active user.
-#: actions/smssettings.php:437
 msgid "That is not your phone number."
 msgstr "Ese número de teléfono non é seu."
 
 #. TRANS: Message given after successfully removing a registered SMS phone number.
-#: actions/smssettings.php:459
 msgid "The SMS phone number was removed."
 msgstr "Borrouse o número de teléfono para os SMS."
 
 #. TRANS: Label for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:498
 msgid "Mobile carrier"
 msgstr "Compañía"
 
 #. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:503
 msgid "Select a carrier"
 msgstr "Escolla unha compañía"
 
 #. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
 #. TRANS: %s is an administrative contact's e-mail address.
-#: actions/smssettings.php:512
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -6228,119 +5150,94 @@ msgstr ""
 "nesta lista, envíenos un correo electrónico para notificárnolo a %s."
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
-#: actions/smssettings.php:534
 #, fuzzy
 msgid "No code entered."
 msgstr "Non se introduciu ningún código"
 
 #. TRANS: Menu item for site administration
-#: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
-#: lib/adminpanelaction.php:395
 msgid "Snapshots"
 msgstr "Instantáneas"
 
-#: actions/snapshotadminpanel.php:65
 msgid "Manage snapshot configuration"
 msgstr "Xestione a configuración das instantáneas"
 
-#: actions/snapshotadminpanel.php:127
 msgid "Invalid snapshot run value."
 msgstr "Valor de execución da instantánea incorrecto."
 
-#: actions/snapshotadminpanel.php:133
 msgid "Snapshot frequency must be a number."
 msgstr "A frecuencia das instantáneas debe ser un número."
 
-#: actions/snapshotadminpanel.php:144
 msgid "Invalid snapshot report URL."
 msgstr "URL de envío das instantáneas incorrecto."
 
-#: actions/snapshotadminpanel.php:200
 msgid "Randomly during web hit"
 msgstr "Ao chou durante o acceso á rede"
 
-#: actions/snapshotadminpanel.php:201
 msgid "In a scheduled job"
 msgstr "Nun proceso programado"
 
-#: actions/snapshotadminpanel.php:206
 msgid "Data snapshots"
 msgstr "Instantáneas de datos"
 
-#: actions/snapshotadminpanel.php:208
 msgid "When to send statistical data to status.net servers"
 msgstr "Cando enviar información estatística aos servidores status.net"
 
-#: actions/snapshotadminpanel.php:217
 msgid "Frequency"
 msgstr "Frecuencia"
 
-#: actions/snapshotadminpanel.php:218
 msgid "Snapshots will be sent once every N web hits"
 msgstr "As instantáneas enviaranse unha vez cada N accesos á rede"
 
-#: actions/snapshotadminpanel.php:226
 msgid "Report URL"
 msgstr "URL de envío"
 
-#: actions/snapshotadminpanel.php:227
 msgid "Snapshots will be sent to this URL"
 msgstr "As instantáneas enviaranse a este URL"
 
-#: actions/snapshotadminpanel.php:248
 msgid "Save snapshot settings"
 msgstr "Gardar a configuración das instantáneas"
 
 #. TRANS: Client error displayed trying a change a subscription for a non-subscribed profile.
-#: actions/subedit.php:75
 msgid "You are not subscribed to that profile."
 msgstr "Non está subscrito a ese perfil."
 
 #. TRANS: Server error displayed when updating a subscription fails with a database error.
 #. TRANS: Exception thrown when a subscription could not be stored on the server.
-#: actions/subedit.php:89 classes/Subscription.php:141
 msgid "Could not save subscription."
 msgstr "Non se puido gardar a subscrición."
 
 #. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
-#: actions/subscribe.php:121
 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
 msgstr "Non se pode subscribir a un perfil remoto OMB 0.1 con esta acción."
 
 #. TRANS: Page title when subscription succeeded.
-#: actions/subscribe.php:149
 msgid "Subscribed"
 msgstr "Subscrito"
 
 #. TRANS: Header for list of subscribers for a user (first page).
 #. TRANS: %s is the user's nickname.
-#: actions/subscribers.php:51
 #, php-format
 msgid "%s subscribers"
 msgstr "%s subscritores"
 
 #. TRANS: Header for list of subscribers for a user (not first page).
 #. TRANS: %1$s is the user's nickname, $2$d is the page number.
-#: actions/subscribers.php:55
 #, php-format
 msgid "%1$s subscribers, page %2$d"
 msgstr "%1$s subscritores, páxina %2$d"
 
 #. TRANS: Page notice for page with an overview of all subscribers
 #. TRANS: of the logged in user's own profile.
-#: actions/subscribers.php:68
 msgid "These are the people who listen to your notices."
 msgstr "Estas son as persoas que seguen as súas notas."
 
 #. TRANS: Page notice for page with an overview of all subscribers of a user other
 #. TRANS: than the logged in user. %s is the user nickname.
-#: actions/subscribers.php:74
 #, php-format
 msgid "These are the people who listen to %s's notices."
 msgstr "Estas son as persoas que están seguindo as notas de %s."
 
 #. TRANS: Subscriber list text when the logged in user has no subscribers.
-#: actions/subscribers.php:114
 #, fuzzy
 msgid ""
 "You have no subscribers. Try subscribing to people you know and they might "
@@ -6351,7 +5248,6 @@ msgstr ""
 
 #. TRANS: Subscriber list text when looking at the subscribers for a of a user other
 #. TRANS: than the logged in user that has no subscribers. %s is the user nickname.
-#: actions/subscribers.php:118
 #, php-format
 msgid "%s has no subscribers. Want to be the first?"
 msgstr "%s non ten subscritores. Quere ser o primeiro?"
@@ -6361,7 +5257,6 @@ msgstr "%s non ten subscritores. Quere ser o primeiro?"
 #. TRANS: This message contains a Markdown URL. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.
-#: actions/subscribers.php:127
 #, php-format
 msgid ""
 "%s has no subscribers. Why not [register an account](%%%%action.register%%%"
@@ -6372,20 +5267,17 @@ msgstr ""
 
 #. TRANS: Header for subscriptions overview for a user (not first page).
 #. TRANS: %1$s is a user nickname, %2$d is the page number.
-#: actions/subscriptions.php:55
 #, php-format
 msgid "%1$s subscriptions, page %2$d"
 msgstr "%1$s subscricións, páxina %2$d"
 
 #. TRANS: Page notice for page with an overview of all subscriptions
 #. TRANS: of the logged in user's own profile.
-#: actions/subscriptions.php:68
 msgid "These are the people whose notices you listen to."
 msgstr "Estas son as persoas cuxas notas segue."
 
 #. TRANS: Page notice for page with an overview of all subscriptions of a user other
 #. TRANS: than the logged in user. %s is the user nickname.
-#: actions/subscriptions.php:74
 #, php-format
 msgid "These are the people whose notices %s listens to."
 msgstr "Estas son as persoas cuxas notas segue %s."
@@ -6394,7 +5286,6 @@ msgstr "Estas son as persoas cuxas notas segue %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.
-#: actions/subscriptions.php:133
 #, php-format
 msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "
@@ -6413,69 +5304,55 @@ msgstr ""
 #. TRANS: than the logged in user that has no subscriptions. %s is the user nickname.
 #. TRANS: Subscription list text when looking at the subscriptions for a of a user that has none
 #. TRANS: as an anonymous user. %s is the user nickname.
-#: actions/subscriptions.php:141 actions/subscriptions.php:147
 #, php-format
 msgid "%s is not listening to anyone."
 msgstr "%s non está seguindo a ninguén."
 
 #. TRANS: Atom feed title. %s is a profile nickname.
-#: actions/subscriptions.php:176
 #, fuzzy, php-format
 msgid "Subscription feed for %s (Atom)"
 msgstr "Fonte de novas das notas para %s (Atom)"
 
 #. TRANS: Checkbox label for enabling Jabber messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:241 lib/settingsnav.php:110
-#, fuzzy
 msgid "IM"
 msgstr "MI"
 
 #. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:256 lib/settingsnav.php:117
 msgid "SMS"
 msgstr "SMS"
 
 #. TRANS: Title for all but the first page of notices with tags.
 #. TRANS: %1$s is the tag, %2$d is the page number.
-#: actions/tag.php:73
 #, php-format
 msgid "Notices tagged with %1$s, page %2$d"
 msgstr "Notas etiquetadas con %1$s, páxina %2$d"
 
-#: actions/tag.php:91
 #, php-format
 msgid "Notice feed for tag %s (RSS 1.0)"
 msgstr "Fonte de novas das notas para a etiqueta %s (RSS 1.0)"
 
-#: actions/tag.php:97
 #, php-format
 msgid "Notice feed for tag %s (RSS 2.0)"
 msgstr "Fonte de novas das notas para a etiqueta %s (RSS 2.0)"
 
-#: actions/tag.php:103
 #, php-format
 msgid "Notice feed for tag %s (Atom)"
 msgstr "Fonte de novas das notas para a etiqueta %s (Atom)"
 
-#: actions/tagother.php:39
 msgid "No ID argument."
 msgstr "Sen argumento ID."
 
-#: actions/tagother.php:65
 #, php-format
 msgid "Tag %s"
 msgstr "Etiqueta %s"
 
 #. TRANS: H2 for user profile information.
-#: actions/tagother.php:77 lib/userprofile.php:76
 msgid "User profile"
 msgstr "Perfil do usuario"
 
-#: actions/tagother.php:120
 msgid "Tag user"
 msgstr "Etiquetar ao usuario"
 
-#: actions/tagother.php:130
 msgid ""
 "Tags for this user (letters, numbers, -, ., and _), comma- or space- "
 "separated"
@@ -6483,50 +5360,40 @@ msgstr ""
 "Etiquetas para este usuario (letras, números, -, ., e _), separadas por "
 "comas ou espazos en branco"
 
-#: actions/tagother.php:157
 #, php-format
 msgid "Invalid tag: \"%s\""
 msgstr "Etiqueta incorrecta: \"%s\""
 
-#: actions/tagother.php:172
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 "Só pode etiquetar a xente á que estea subscrito ou que estean subscritos a "
 "vostede."
 
-#: actions/tagother.php:215
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
 "Utilice este formulario para engadir etiquetas aos seus subscritores ou "
 "subscricións."
 
-#: actions/tagrss.php:35
 msgid "No such tag."
 msgstr "Esa etiqueta non existe."
 
 #. TRANS: Client error displayed when trying to unblock a non-blocked user.
-#: actions/unblock.php:59
 msgid "You haven't blocked that user."
 msgstr "Non bloqueou a ese usuario."
 
-#: actions/unsandbox.php:72
 msgid "User is not sandboxed."
 msgstr "O usuario non está illado."
 
-#: actions/unsilence.php:72
 msgid "User is not silenced."
 msgstr "O usuario non está silenciado."
 
-#: actions/unsubscribe.php:77
 msgid "No profile ID in request."
 msgstr "Á solicitude fáltalle o ID do perfil."
 
-#: actions/unsubscribe.php:98
 msgid "Unsubscribed"
 msgstr "Cancelouse a subscrición"
 
-#: actions/updateprofile.php:64
 #, php-format
 msgid ""
 "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
@@ -6534,178 +5401,143 @@ msgstr ""
 "A licenza \"%1$s\" das transmisións da persoa seguida non é compatible coa "
 "licenza deste sitio: \"%2$s\"."
 
-#: actions/urlsettings.php:60
 #, fuzzy
 msgid "URL settings"
 msgstr "Configuración da mensaxería instantánea"
 
 #. TRANS: Instructions for tab "Other" in user profile settings.
-#: actions/urlsettings.php:72
 msgid "Manage various other options."
 msgstr "Configure outras tantas opcións."
 
 #. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
 #. TRANS: user's profile settings. This message has one space at the beginning. Use your
 #. TRANS: language's word separator here if it has one (most likely a single space).
-#: actions/urlsettings.php:115
 msgid " (free service)"
 msgstr " (servizo libre)"
 
-#: actions/urlsettings.php:121
 #, fuzzy
 msgid "[none]"
 msgstr "Ningún"
 
-#: actions/urlsettings.php:122
 msgid "[internal]"
 msgstr ""
 
 #. TRANS: Label for dropdown with URL shortener services.
-#: actions/urlsettings.php:130
 msgid "Shorten URLs with"
 msgstr "Abreviar os enderezos URL con"
 
 #. TRANS: Tooltip for for dropdown with URL shortener services.
-#: actions/urlsettings.php:132
 msgid "Automatic shortening service to use."
 msgstr "Servizo de abreviación automática a usar."
 
-#: actions/urlsettings.php:138
 msgid "URL longer than"
 msgstr ""
 
-#: actions/urlsettings.php:141
 msgid "URLs longer than this will be shortened, 0 means always shorten."
 msgstr ""
 
-#: actions/urlsettings.php:145
 msgid "Text longer than"
 msgstr ""
 
-#: actions/urlsettings.php:148
 msgid ""
 "URLs in notices longer than this will be shortened, 0 means always shorten."
 msgstr ""
 
 #. TRANS: Form validation error for form "Other settings" in user profile.
-#: actions/urlsettings.php:180
 #, fuzzy
 msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr ""
 "O servizo de abreviación de enderezos URL é longo de máis (o límite está en "
 "50 caracteres)."
 
-#: actions/urlsettings.php:187
 msgid "Invalid number for max url length."
 msgstr ""
 
-#: actions/urlsettings.php:193
 #, fuzzy
 msgid "Invalid number for max notice length."
 msgstr "O contido da nota é incorrecto."
 
-#: actions/urlsettings.php:238
 msgid "Error saving user URL shortening preferences."
 msgstr ""
 
 #. TRANS: User admin panel title
-#: actions/useradminpanel.php:58
 msgctxt "TITLE"
 msgid "User"
 msgstr "Usuario"
 
 #. TRANS: Instruction for user admin panel.
-#: actions/useradminpanel.php:69
 msgid "User settings for this StatusNet site"
 msgstr "Configuración de usuario para este sitio StatusNet"
 
 #. TRANS: Form validation error in user admin panel when a non-numeric character limit was set.
-#: actions/useradminpanel.php:147
 msgid "Invalid bio limit. Must be numeric."
 msgstr "Límite da biografía incorrecto. Debe ser numérico."
 
 #. TRANS: Form validation error in user admin panel when welcome text is too long.
-#: actions/useradminpanel.php:154
 #, fuzzy
 msgid "Invalid welcome text. Maximum length is 255 characters."
 msgstr "Texto de benvida incorrecto. A extensión máxima é de 255 caracteres."
 
 #. TRANS: Client error displayed when trying to set a non-existing user as default subscription for new
 #. TRANS: users in user admin panel. %1$s is the invalid nickname.
-#: actions/useradminpanel.php:166
 #, fuzzy, php-format
 msgid "Invalid default subscripton: \"%1$s\" is not a user."
 msgstr "Subscrición por defecto incorrecta. \"%1$s\" non é un usuario."
 
-#: actions/useradminpanel.php:215 lib/action.php:565 lib/settingsnav.php:77
-#: lib/subgroupnav.php:81
 msgid "Profile"
 msgstr "Perfil"
 
 #. TRANS: Field label in user admin panel for setting the character limit for the bio field.
-#: actions/useradminpanel.php:220
 msgid "Bio Limit"
 msgstr "Límite da biografía"
 
 #. TRANS: Tooltip in user admin panel for setting the character limit for the bio field.
-#: actions/useradminpanel.php:222
 msgid "Maximum length of a profile bio in characters."
 msgstr "Extensión máxima da biografía dun perfil en caracteres."
 
 #. TRANS: Form legend in user admin panel.
-#: actions/useradminpanel.php:231
 msgid "New users"
 msgstr "Novos usuarios"
 
 #. TRANS: Field label in user admin panel for setting new user welcome text.
-#: actions/useradminpanel.php:236
 msgid "New user welcome"
 msgstr "Nova benvida para os usuarios"
 
 #. TRANS: Tooltip in user admin panel for setting new user welcome text.
-#: actions/useradminpanel.php:238
 #, fuzzy
 msgid "Welcome text for new users (maximum 255 characters)."
 msgstr "Texto de benvida para os novos usuarios (255 caracteres como máximo)."
 
 #. TRANS: Field label in user admin panel for setting default subscription for new users.
-#: actions/useradminpanel.php:244
 msgid "Default subscription"
 msgstr "Subscrición por defecto"
 
 #. TRANS: Tooltip in user admin panel for setting default subscription for new users.
-#: actions/useradminpanel.php:246
 msgid "Automatically subscribe new users to this user."
 msgstr "Subscribir automaticamente aos novos usuarios a este usuario."
 
 #. TRANS: Form legend in user admin panel.
-#: actions/useradminpanel.php:256
 msgid "Invitations"
 msgstr "Invitacións"
 
 #. TRANS: Field label for checkbox in user admin panel for allowing users to invite friend using site e-mail.
-#: actions/useradminpanel.php:262
 msgid "Invitations enabled"
 msgstr "Activáronse as invitacións"
 
 #. TRANS: Tooltip for checkbox in user admin panel for allowing users to invite friend using site e-mail.
-#: actions/useradminpanel.php:265
 msgid "Whether to allow users to invite new users."
 msgstr "Permitir ou non que os usuarios poidan invitar a novos usuarios."
 
 #. TRANS: Title for button to save user settings in user admin panel.
-#: actions/useradminpanel.php:302
 #, fuzzy
 msgid "Save user settings."
 msgstr "Gardar a configuración do usuario"
 
 #. TRANS: Page title.
-#: actions/userauthorization.php:109
 msgid "Authorize subscription"
 msgstr "Autorizar a subscrición"
 
 #. TRANS: Page notice on "Auhtorize subscription" page.
-#: actions/userauthorization.php:115
 #, fuzzy
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
@@ -6717,42 +5549,35 @@ msgstr ""
 "\"Rexeitar\"."
 
 #. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:200
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Accept"
 msgstr "Aceptar"
 
 #. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:202
 #, fuzzy
 msgid "Subscribe to this user."
 msgstr "Subscribirse a este usuario"
 
 #. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:204
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Reject"
 msgstr "Rexeitar"
 
 #. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:206
 #, fuzzy
 msgid "Reject this subscription."
 msgstr "Rexeitar esta subscrición"
 
 #. TRANS: Client error displayed for an empty authorisation request.
-#: actions/userauthorization.php:219
 msgid "No authorization request!"
 msgstr "Non se solicitou a autorización!"
 
 #. TRANS: Accept message header from Authorise subscription page.
-#: actions/userauthorization.php:242
 msgid "Subscription authorized"
 msgstr "Autorizouse a subscrición"
 
-#: actions/userauthorization.php:245
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to authorize the "
@@ -6763,11 +5588,9 @@ msgstr ""
 "O pase da súa subscrición é:"
 
 #. TRANS: Reject message header from Authorise subscription page.
-#: actions/userauthorization.php:256
 msgid "Subscription rejected"
 msgstr "Rexeitouse a subscrición"
 
-#: actions/userauthorization.php:259
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to fully reject the "
@@ -6779,35 +5602,30 @@ msgstr ""
 
 #. TRANS: Exception thrown when no valid user is found for an authorisation request.
 #. TRANS: %s is a listener URI.
-#: actions/userauthorization.php:296
 #, fuzzy, php-format
 msgid "Listener URI \"%s\" not found here."
 msgstr "Non se atopou o URI do seguidor, \"%s\", aquí."
 
 #. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
 #. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:303
 #, fuzzy, php-format
 msgid "Listenee URI \"%s\" is too long."
 msgstr "O URI do seguidor, \"%s\", é longo de máis."
 
 #. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
 #. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:311
 #, fuzzy, php-format
 msgid "Listenee URI \"%s\" is a local user."
 msgstr "O URI do seguidor, \"%s\", é dun usuario local."
 
 #. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
 #. TRANS: %s is a profile URL.
-#: actions/userauthorization.php:329
 #, fuzzy, php-format
 msgid "Profile URL \"%s\" is for a local user."
 msgstr "O URL do perfil, \"%s\", pertence a un usuario local."
 
 #. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
 #. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
-#: actions/userauthorization.php:339
 #, fuzzy, php-format
 msgid ""
 "Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
@@ -6818,32 +5636,27 @@ msgstr ""
 
 #. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
 #. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:349
 #, fuzzy, php-format
 msgid "Avatar URL \"%s\" is not valid."
 msgstr "O URL do avatar, \"%s\", é incorrecto."
 
 #. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
 #. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:356
 #, fuzzy, php-format
 msgid "Cannot read avatar URL \"%s\"."
 msgstr "Non se puido ler o URL do avatar, \"%s\"."
 
 #. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
 #. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:363
 #, fuzzy, php-format
 msgid "Wrong image type for avatar URL \"%s\"."
 msgstr "O tipo de imaxe do URL do avatar, \"%s\", é incorrecto."
 
 #. TRANS: Page title for profile design page.
-#: actions/userdesignsettings.php:74 lib/designsettings.php:61
 msgid "Profile design"
 msgstr "Deseño do perfil"
 
 #. TRANS: Instructions for profile design page.
-#: actions/userdesignsettings.php:84 lib/designsettings.php:72
 msgid ""
 "Customize the way your profile looks with a background image and a colour "
 "palette of your choice."
@@ -6851,44 +5664,35 @@ msgstr ""
 "Personalice a aparencia do seu perfil cunha imaxe de fondo e unha paleta de "
 "cores escollida por vostede."
 
-#: actions/userdesignsettings.php:289
 msgid "Enjoy your hotdog!"
 msgstr "Bo proveito!"
 
-#: actions/userdesignsettings.php:325
 #, fuzzy
 msgid "Design settings"
 msgstr "Gardar a configuración do sitio"
 
-#: actions/userdesignsettings.php:340
 msgid "View profile designs"
 msgstr "Deseños visuais do perfil"
 
-#: actions/userdesignsettings.php:341
 msgid "Show or hide profile designs."
 msgstr "Amosar ou agochar os deseños do perfil."
 
-#: actions/userdesignsettings.php:348
 #, fuzzy
 msgid "Background file"
 msgstr "Fondo"
 
 #. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number.
-#: actions/usergroups.php:66
 #, php-format
 msgid "%1$s groups, page %2$d"
 msgstr "%1$s grupos, páxina %2$d"
 
-#: actions/usergroups.php:132
 msgid "Search for more groups"
 msgstr "Buscar máis grupos"
 
-#: actions/usergroups.php:159
 #, php-format
 msgid "%s is not a member of any group."
 msgstr "%s non pertence a ningún grupo."
 
-#: actions/usergroups.php:164
 #, php-format
 msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
 msgstr "Probe a [buscar grupos](%%action.groupsearch%%) e unirse a eles."
@@ -6898,18 +5702,14 @@ msgstr "Probe a [buscar grupos](%%action.groupsearch%%) e unirse a eles."
 #. TRANS: %1$s is a group name, %2$s is a site name.
 #. TRANS: Message is used as a subtitle in atom user notice feed.
 #. TRANS: %1$s is a user name, %2$s is a site name.
-#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:70
-#: lib/atomusernoticefeed.php:95
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr "Actualizacións de %1$s en %2$s!"
 
-#: actions/version.php:75
 #, php-format
 msgid "StatusNet %s"
 msgstr "%s de StatusNet"
 
-#: actions/version.php:155
 #, php-format
 msgid ""
 "This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
@@ -6918,16 +5718,13 @@ msgstr ""
 "Este sitio foi desenvolvido sobre a versión %2$s de %1$s, propiedade de "
 "StatusNet, Inc. e colaboradores, 2008-2010."
 
-#: actions/version.php:163
 msgid "Contributors"
 msgstr "Colaboradores"
 
 #. TRANS: Menu item for site administration
-#: actions/version.php:167 lib/adminpanelaction.php:403
 msgid "License"
 msgstr "Licenza"
 
-#: actions/version.php:170
 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 "
@@ -6939,7 +5736,6 @@ msgstr ""
 "Software Foundation, versión 3 ou calquera versión posterior (a elección do "
 "usuario) da licenza. "
 
-#: actions/version.php:176
 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 "
@@ -6951,7 +5747,6 @@ msgstr ""
 "ou IDONEIDADE PARA UN PROPÓSITO PARTICULAR. Lea a Licenza Pública Xeral "
 "Affero de GNU para máis información. "
 
-#: actions/version.php:182
 #, php-format
 msgid ""
 "You should have received a copy of the GNU Affero General Public License "
@@ -6961,52 +5756,42 @@ msgstr ""
 "programa. En caso contrario, vexa %s."
 
 #. TRANS: Form input field label for application name.
-#: actions/version.php:197 lib/applicationeditform.php:190
 msgid "Name"
 msgstr "Nome"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:885
 msgid "Version"
 msgstr "Versión"
 
-#: actions/version.php:199
 msgid "Author(s)"
 msgstr "Autores"
 
 #. TRANS: Form input field label.
-#: actions/version.php:200 lib/applicationeditform.php:208
-#: lib/groupeditform.php:168
 msgid "Description"
 msgstr "Descrición"
 
 #. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:164
 msgid "Favor"
 msgstr "Marcar como favorito"
 
 #. TRANS: Ntofication given when a user marks a notice as favorite.
 #. TRANS: %1$s is a user nickname or full name, %2$s is a notice URI.
-#: classes/Fave.php:167
 #, php-format
 msgid "%1$s marked notice %2$s as a favorite."
 msgstr "%1$s marcou a nota %2$s como favorita"
 
 #. TRANS: Server exception thrown when a URL cannot be processed.
-#: classes/File.php:162
 #, php-format
 msgid "Cannot process URL '%s'"
 msgstr "Non se pode procesar o URL \"%s\""
 
 #. TRANS: Server exception thrown when... Robin thinks something is impossible!
-#: classes/File.php:194
 msgid "Robin thinks something is impossible."
 msgstr "Robin pensa que algo é imposible."
 
 #. 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$s is used for plural.
-#: classes/File.php:210
 #, fuzzy, php-format
 msgid ""
 "No file may be larger than %1$d byte and the file you sent was %2$d bytes. "
@@ -7023,7 +5808,6 @@ msgstr[1] ""
 
 #. TRANS: Message given if an upload would exceed user quota.
 #. TRANS: %d (number) is the user quota in bytes and is used for plural.
-#: classes/File.php:223
 #, fuzzy, php-format
 msgid "A file this large would exceed your user quota of %d byte."
 msgid_plural "A file this large would exceed your user quota of %d bytes."
@@ -7034,7 +5818,6 @@ msgstr[1] ""
 
 #. TRANS: Message given id an upload would exceed a user's monthly quota.
 #. TRANS: $d (number) is the monthly user quota in bytes and is used for plural.
-#: classes/File.php:235
 #, fuzzy, php-format
 msgid "A file this large would exceed your monthly quota of %d byte."
 msgid_plural "A file this large would exceed your monthly quota of %d bytes."
@@ -7042,108 +5825,89 @@ msgstr[0] "Un ficheiro deste tamaño excedería a súa cota mensual de %d bytes.
 msgstr[1] "Un ficheiro deste tamaño excedería a súa cota mensual de %d bytes."
 
 #. TRANS: Client exception thrown if a file upload does not have a valid name.
-#: classes/File.php:282 classes/File.php:297
 msgid "Invalid filename."
 msgstr "Nome de ficheiro incorrecto."
 
 #. TRANS: Exception thrown when joining a group fails.
-#: classes/Group_member.php:51
 msgid "Group join failed."
 msgstr "Non se puido unir ao grupo."
 
 #. TRANS: Exception thrown when trying to leave a group the user is not a member of.
-#: classes/Group_member.php:64
 msgid "Not part of group."
 msgstr "Non forma parte do grupo."
 
 #. TRANS: Exception thrown when trying to leave a group fails.
-#: classes/Group_member.php:72
 msgid "Group leave failed."
 msgstr "Non se puido deixar o grupo."
 
 #. TRANS: Exception thrown providing an invalid profile ID.
 #. TRANS: %s is the invalid profile ID.
-#: classes/Group_member.php:85
 #, php-format
 msgid "Profile ID %s is invalid."
 msgstr "A identificación do perfil, %s, é incorrecta."
 
 #. TRANS: Exception thrown providing an invalid group ID.
 #. TRANS: %s is the invalid group ID.
-#: classes/Group_member.php:98
 #, fuzzy, php-format
 msgid "Group ID %s is invalid."
 msgstr "Houbo un erro ao gardar o usuario. Incorrecto."
 
 #. TRANS: Activity title.
-#: classes/Group_member.php:147 lib/joinform.php:114
 msgid "Join"
 msgstr "Unirse"
 
 #. TRANS: Success message for subscribe to group attempt through OStatus.
 #. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
-#: classes/Group_member.php:151
 #, php-format
 msgid "%1$s has joined group %2$s."
 msgstr "%1$s uniuse ao grupo %2$s."
 
 #. TRANS: Server exception thrown when updating a local group fails.
-#: classes/Local_group.php:42
 msgid "Could not update local group."
 msgstr "Non se puido actualizar o grupo local."
 
 #. TRANS: Exception thrown when trying creating a login token failed.
 #. TRANS: %s is the user nickname for which token creation failed.
-#: classes/Login_token.php:78
 #, php-format
 msgid "Could not create login token for %s"
 msgstr "Non se puido crear un pase de sesión para %s"
 
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
-#: classes/Memcached_DataObject.php:556
 msgid "No database name or DSN found anywhere."
 msgstr "Non se atopou por ningures o nome da base de datos ou DSN."
 
 #. TRANS: Client exception thrown when a user tries to send a direct message while being banned from sending them.
-#: classes/Message.php:45
 msgid "You are banned from sending direct messages."
 msgstr "Prohibíuselle enviar mensaxes directas de momento."
 
 #. TRANS: Message given when a message could not be stored on the server.
-#: classes/Message.php:69
 msgid "Could not insert message."
 msgstr "Non se puido inserir a mensaxe."
 
 #. TRANS: Message given when a message could not be updated on the server.
-#: classes/Message.php:80
 msgid "Could not update message with new URI."
 msgstr "Non se puido actualizar a mensaxe co novo URI."
 
 #. TRANS: Server exception thrown when a user profile for a notice cannot be found.
 #. TRANS: %1$d is a profile ID (number), %2$d is a notice ID (number).
-#: classes/Notice.php:98
 #, php-format
 msgid "No such profile (%1$d) for notice (%2$d)."
 msgstr "Non existe tal perfil (%1$d) para a nota (%2$d)."
 
 #. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:199
 #, php-format
 msgid "Database error inserting hashtag: %s"
 msgstr "Houbo un erro na base de datos ao intentar inserir a etiqueta: %s"
 
 #. TRANS: Client exception thrown if a notice contains too many characters.
-#: classes/Notice.php:279
 msgid "Problem saving notice. Too long."
 msgstr "Houbo un problema ao gardar a nota. É longa de máis."
 
 #. TRANS: Client exception thrown when trying to save a notice for an unknown user.
-#: classes/Notice.php:284
 msgid "Problem saving notice. Unknown user."
 msgstr "Houbo un problema ao gardar a nota. Descoñécese o usuario."
 
 #. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
-#: classes/Notice.php:290
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
@@ -7151,7 +5915,6 @@ msgstr ""
 "publicar nuns minutos."
 
 #. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
-#: classes/Notice.php:297
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
 "few minutes."
@@ -7160,43 +5923,36 @@ msgstr ""
 "publicar nuns minutos."
 
 #. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:305
 msgid "You are banned from posting notices on this site."
 msgstr "Prohibíuselle publicar notas neste sitio de momento."
 
 #. TRANS: Server exception thrown when a notice cannot be saved.
 #. TRANS: Server exception thrown when a notice cannot be updated.
-#: classes/Notice.php:372 classes/Notice.php:399
 msgid "Problem saving notice."
 msgstr "Houbo un problema ao gardar a nota."
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:929
 #, fuzzy
 msgid "Bad type provided to saveKnownGroups."
 msgstr "O tipo dado para saveKnownGroups era incorrecto"
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:1028
 msgid "Problem saving group inbox."
 msgstr "Houbo un problema ao gardar a caixa de entrada do grupo."
 
 #. TRANS: Server exception thrown when a reply cannot be saved.
 #. TRANS: %1$d is a notice ID, %2$d is the ID of the mentioned user.
-#: classes/Notice.php:1144
 #, php-format
 msgid "Could not save reply for %1$d, %2$d."
 msgstr "Non se puido gardar a resposta a %1$d, %2$d."
 
 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1663
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
 
 #. TRANS: Full name of a profile or group followed by nickname in parens
-#: classes/Profile.php:172 classes/User_group.php:242
 #, fuzzy, php-format
 msgctxt "FANCYNAME"
 msgid "%1$s (%2$s)"
@@ -7204,7 +5960,6 @@ msgstr "%1$s (%2$s)"
 
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:779
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
@@ -7212,258 +5967,209 @@ msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:788
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
 "Non se pode revogar o rol \"%1$s\" do usuario #%2$d: erro na base de datos."
 
 #. TRANS: Exception thrown when a right for a non-existing user profile is checked.
-#: classes/Remote_profile.php:54
 msgid "Missing profile."
 msgstr "Falta o perfil de usuario."
 
 #. TRANS: Exception thrown when a tag cannot be saved.
-#: classes/Status_network.php:338
 msgid "Unable to save tag."
 msgstr "Non se puido gardar a nota do sitio."
 
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#: classes/Subscription.php:77 lib/oauthstore.php:482
 msgid "You have been banned from subscribing."
 msgstr "Prohibíuselle realizar subscricións de momento."
 
 #. TRANS: Exception thrown when trying to subscribe while already subscribed.
-#: classes/Subscription.php:82
 msgid "Already subscribed!"
 msgstr "Xa está subscrito!"
 
 #. TRANS: Exception thrown when trying to subscribe to a user who has blocked the subscribing user.
-#: classes/Subscription.php:87
 msgid "User has blocked you."
 msgstr "O usuario bloqueouno."
 
 #. TRANS: Exception thrown when trying to unsibscribe without a subscription.
-#: classes/Subscription.php:176
 msgid "Not subscribed!"
 msgstr "Non está subscrito!"
 
 #. TRANS: Exception thrown when trying to unsubscribe a user from themselves.
-#: classes/Subscription.php:183
 msgid "Could not delete self-subscription."
 msgstr "Non se puido borrar a subscrición a si mesmo."
 
 #. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
-#: classes/Subscription.php:211
 msgid "Could not delete subscription OMB token."
 msgstr "Non se puido borrar o pase de subscrición OMB."
 
 #. TRANS: Exception thrown when a subscription could not be deleted on the server.
-#: classes/Subscription.php:223
 msgid "Could not delete subscription."
 msgstr "Non se puido borrar a subscrición."
 
 #. TRANS: Activity tile when subscribing to another person.
-#: classes/Subscription.php:265
 msgid "Follow"
 msgstr "Seguir"
 
 #. TRANS: Notification given when one person starts following another.
 #. TRANS: %1$s is the subscriber, %2$s is the subscribed.
-#: classes/Subscription.php:268
 #, php-format
 msgid "%1$s is now following %2$s."
 msgstr "%1$s xa segue a %2$s."
 
 #. TRANS: Notice given on user registration.
 #. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:390
 #, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr "Benvido a %1$s, @%2$s!"
 
 #. TRANS: Server exception.
-#: classes/User.php:923
 msgid "No single user defined for single-user mode."
 msgstr "Non se estableceu ningún usuario único para o modo de usuario único."
 
 #. TRANS: Server exception.
-#: classes/User.php:927
 msgid "Single-user mode code called when not enabled."
 msgstr ""
 
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:522
 msgid "Could not create group."
 msgstr "Non se puido crear o grupo."
 
 #. TRANS: Server exception thrown when updating a group URI failed.
-#: classes/User_group.php:532
 msgid "Could not set group URI."
 msgstr "Non se puido establecer o URI do grupo."
 
 #. TRANS: Server exception thrown when setting group membership failed.
-#: classes/User_group.php:555
 msgid "Could not set group membership."
 msgstr "Non se puido establecer a pertenza ao grupo."
 
 #. TRANS: Server exception thrown when saving local group information failed.
-#: classes/User_group.php:570
 msgid "Could not save local group info."
 msgstr "Non se puido gardar a información do grupo local."
 
 #. TRANS: Exception thrown when an account could not be located when it should be moved.
 #. TRANS: %s is the remote site.
-#: lib/accountmover.php:65
 #, fuzzy, php-format
 msgid "Cannot locate account %s."
 msgstr "Non pode borrar usuarios."
 
 #. TRANS: Exception thrown when a service document could not be located account move.
 #. TRANS: %s is the remote site.
-#: lib/accountmover.php:106
 #, php-format
 msgid "Cannot find XRD for %s."
 msgstr ""
 
 #. TRANS: Exception thrown when an account could not be located when it should be moved.
 #. TRANS: %s is the remote site.
-#: lib/accountmover.php:131
 #, php-format
 msgid "No AtomPub API service for %s."
 msgstr ""
 
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: lib/action.php:161
 #, php-format
 msgid "%1$s - %2$s"
 msgstr "%1$s - %2$s"
 
 #. TRANS: Page title for a page without a title set.
-#: lib/action.php:177
 msgid "Untitled page"
 msgstr "Páxina sen título"
 
 #. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.
-#: lib/action.php:325
 msgctxt "TOOLTIP"
 msgid "Show more"
 msgstr "Mostrar máis"
 
 #. TRANS: Inline reply form submit button: submits a reply comment.
-#: lib/action.php:328
 #, fuzzy
 msgctxt "BUTTON"
-msgid "Comment"
-msgstr "Contido"
+msgid "Reply"
+msgstr "Responder"
 
 #. TRANS: Placeholder text for inline reply form. Clicking in this box will turn it into a mini notice form.
-#: lib/action.php:331
-msgid "Add a comment..."
+msgid "Write a reply..."
 msgstr ""
 
-#: lib/action.php:559 lib/personalgroupnav.php:99
 #, fuzzy
 msgid "Home"
 msgstr "Páxina persoal"
 
-#: lib/action.php:560
 #, fuzzy
 msgid "Friends timeline"
 msgstr "Liña do tempo de %s"
 
-#: lib/action.php:566
 #, fuzzy
 msgid "Your profile"
 msgstr "Perfil do grupo"
 
-#: lib/action.php:570 lib/action.php:593 lib/publicgroupnav.php:78
 msgid "Public"
 msgstr "Públicas"
 
-#: lib/action.php:571 lib/action.php:594
 #, fuzzy
 msgid "Everyone on this site"
 msgstr "Atopar xente neste sitio"
 
-#: lib/action.php:575
 #, fuzzy
 msgid "Settings"
 msgstr "Configuración dos SMS"
 
-#: lib/action.php:576
 #, fuzzy
 msgid "Change your personal settings"
 msgstr "Cambie a configuración do seu perfil"
 
-#: lib/action.php:582
 #, fuzzy
 msgid "Site configuration"
 msgstr "Configuración do usuario"
 
-#: lib/action.php:587
 #, fuzzy
 msgid "Logout"
 msgstr "Saír"
 
-#: lib/action.php:588
 #, fuzzy
 msgid "Logout from the site"
 msgstr "Saír ao anonimato"
 
-#: lib/action.php:599
 #, fuzzy
 msgid "Login to the site"
 msgstr "Identificarse no sitio"
 
-#: lib/action.php:606
-#, fuzzy
 msgid "Search"
 msgstr "Buscar"
 
-#: lib/action.php:607
 #, fuzzy
 msgid "Search the site"
 msgstr "Buscar no sitio"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:864
 msgid "Help"
 msgstr "Axuda"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:867
 msgid "About"
 msgstr "Acerca de"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:870
 msgid "FAQ"
 msgstr "Preguntas máis frecuentes"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:875
 msgid "TOS"
 msgstr "Condicións do servicio"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:879
 msgid "Privacy"
 msgstr "Protección de datos"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:882
 msgid "Source"
 msgstr "Código fonte"
 
 #. TRANS: Secondary navigation menu option leading to e-mail contact information on the
 #. TRANS: StatusNet site, where to report bugs, ...
-#: lib/action.php:889
 msgid "Contact"
 msgstr "Contacto"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:892
 msgid "Badge"
 msgstr "Insignia"
 
@@ -7471,7 +6177,6 @@ msgstr "Insignia"
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:921
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7481,7 +6186,6 @@ msgstr ""
 "site.broughtby%%](%%site.broughtbyurl%%)."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:924
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** é un servizo de mensaxes de blogue curtas."
@@ -7490,7 +6194,6 @@ msgstr "**%%site.name%%** é un servizo de mensaxes de blogue curtas."
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:931
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7503,14 +6206,12 @@ msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:949
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr "O contido e os datos de %1$s son privados e confidenciais."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:956
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
@@ -7518,7 +6219,6 @@ msgstr ""
 "todos os dereitos."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:960
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 "Os contidos e datos son propiedade intelectual dos colaboradores. Quedan "
@@ -7526,7 +6226,6 @@ msgstr ""
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:992
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
@@ -7534,81 +6233,67 @@ msgstr ""
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1335
 msgid "After"
 msgstr "Posteriores"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1345
 msgid "Before"
 msgstr "Anteriores"
 
 #. TRANS: Client exception thrown when a feed instance is a DOMDocument.
-#: lib/activity.php:125
 msgid "Expecting a root feed element but got a whole XML document."
 msgstr ""
 "Esperábase unha fonte de novas raíz pero recibiuse un documento XML completo."
 
 #. TRANS: Client exception thrown when using an unknown verb for the activity importer.
-#: lib/activityimporter.php:81
 #, fuzzy, php-format
 msgid "Unknown verb: \"%s\"."
 msgstr "Non se coñece a lingua \"%s\"."
 
 #. TRANS: Client exception thrown when trying to force a subscription for an untrusted user.
-#: lib/activityimporter.php:107
 msgid "Cannot force subscription for untrusted user."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to for a remote user to subscribe.
-#: lib/activityimporter.php:117
 #, fuzzy
 msgid "Cannot force remote user to subscribe."
 msgstr "Introduza o nome do usuario ao que quere subscribirse."
 
 #. TRANS: Client exception thrown when trying to subscribe to an unknown profile.
-#: lib/activityimporter.php:132
 #, fuzzy
 msgid "Unknown profile."
 msgstr "Non se coñece o tipo de ficheiro"
 
 #. TRANS: Client exception thrown when trying to import an event not related to the importing user.
-#: lib/activityimporter.php:138
 msgid "This activity seems unrelated to our user."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to join a remote group that is not a group.
-#: lib/activityimporter.php:154
 msgid "Remote profile is not a group!"
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to join a group the importing user is already a member of.
-#: lib/activityimporter.php:163
 #, fuzzy
 msgid "User is already a member of this group."
 msgstr "Xa forma parte dese grupo."
 
 #. TRANS: Client exception thrown when trying to import a notice by another user.
 #. TRANS: %1$s is the source URI of the notice, %2$s is the URI of the author.
-#: lib/activityimporter.php:201
 #, php-format
 msgid "Already know about notice %1$s and  it has a different author %2$s."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to overwrite the author information for a non-trusted user during import.
-#: lib/activityimporter.php:207
 msgid "Not overwriting author info for non-trusted user."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to import a notice without content.
 #. TRANS: %s is the notice URI.
-#: lib/activityimporter.php:223
 #, fuzzy, php-format
 msgid "No content for notice %s."
 msgstr "Buscar nos contidos das notas"
 
-#: lib/activitymover.php:84
 #, fuzzy, php-format
 msgid "No such user %s."
 msgstr "Non existe tal usuario."
@@ -7619,190 +6304,155 @@ msgstr "Non existe tal usuario."
 #. TRANS: %1$s is a URL, %2$s is the status, %s$s is the fail reason.
 #. TRANS: Exception thrown when post to collection fails with a status that is not handled.
 #. TRANS: %1$s is a URL, %2$s is the status, %s$s is the fail reason.
-#: lib/activitysink.php:163 lib/activitysink.php:167 lib/activitysink.php:172
 #, fuzzy, php-format
 msgctxt "URLSTATUSREASON"
 msgid "%1$s %2$s %3$s"
 msgstr "%1$s - %2$s"
 
 #. TRANS: Client exception thrown when there is no source attribute.
-#: lib/activityutils.php:200
 msgid "Can't handle remote content yet."
 msgstr "Aínda non é posible manexar contidos remotos."
 
 #. TRANS: Client exception thrown when there embedded XML content is found that cannot be processed yet.
-#: lib/activityutils.php:237
 msgid "Can't handle embedded XML content yet."
 msgstr "Aínda non se poden manexar contidos XML integrados."
 
 #. TRANS: Client exception thrown when base64 encoded content is found that cannot be processed yet.
-#: lib/activityutils.php:242
 msgid "Can't handle embedded Base64 content yet."
 msgstr "Aínda non se poden manexar contidos Base64."
 
 #. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights.
-#: lib/adminpanelaction.php:96
 msgid "You cannot make changes to this site."
 msgstr "Non pode realizar cambios neste sitio."
 
 #. TRANS: Client error message throw when a certain panel's settings cannot be changed.
-#: lib/adminpanelaction.php:108
 msgid "Changes to that panel are not allowed."
 msgstr "Non se permite realizar cambios nese panel."
 
 #. TRANS: Client error message.
-#: lib/adminpanelaction.php:222
 msgid "showForm() not implemented."
 msgstr "showForm() non está integrado."
 
 #. TRANS: Client error message
-#: lib/adminpanelaction.php:250
 msgid "saveSettings() not implemented."
 msgstr "saveSettings() non está integrado."
 
 #. TRANS: Client error message thrown if design settings could not be deleted in
 #. TRANS: the admin panel Design.
-#: lib/adminpanelaction.php:274
 msgid "Unable to delete design setting."
 msgstr "Non se puido borrar a configuración do deseño."
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:337
 msgid "Basic site configuration"
 msgstr "Configuración básica do sitio"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:339
 msgctxt "MENU"
 msgid "Site"
 msgstr "Sitio"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:345
 msgid "Design configuration"
 msgstr "Configuración do deseño"
 
 #. TRANS: Menu item for site administration
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/adminpanelaction.php:347 lib/groupnav.php:135
 msgctxt "MENU"
 msgid "Design"
 msgstr "Deseño"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:353
 msgid "User configuration"
 msgstr "Configuración do usuario"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:110
 msgid "User"
 msgstr "Usuario"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:361
 msgid "Access configuration"
 msgstr "Configuración de acceso"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:369
 msgid "Paths configuration"
 msgstr "Configuración das rutas"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:377
 msgid "Sessions configuration"
 msgstr "Configuración das sesións"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:385
 msgid "Edit site notice"
 msgstr "Modificar a nota do sitio"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:387
 msgid "Site notice"
 msgstr "Nota do sitio"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:393
 msgid "Snapshots configuration"
 msgstr "Configuración das instantáneas"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:401
 msgid "Set site license"
 msgstr "Definir a licenza do sitio"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:409
 #, fuzzy
 msgid "Plugins configuration"
 msgstr "Configuración das rutas"
 
 #. TRANS: Client error 401.
-#: lib/apiauth.php:111
 msgid "API resource requires read-write access, but you only have read access."
 msgstr ""
 "O recurso API precisa permisos de lectura e escritura, pero só dispón de "
 "permisos de lectura."
 
 #. TRANS: OAuth exception thrown when no application is found for a given consumer key.
-#: lib/apiauth.php:177
 msgid "No application for that consumer key."
 msgstr "Non hai ningunha aplicación para esa clave."
 
-#: lib/apiauth.php:202 lib/apiauth.php:284
 msgid "Not allowed to use API."
 msgstr ""
 
 #. TRANS: OAuth exception given when an incorrect access token was given for a user.
-#: lib/apiauth.php:225
 msgid "Bad access token."
 msgstr "Pase de acceso incorrecto."
 
 #. TRANS: OAuth exception given when no user was found for a given token (no token was found).
-#: lib/apiauth.php:230
 msgid "No user for that token."
 msgstr "Non hai ningún usuario para ese pase."
 
 #. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel".
 #. TRANS: Client error thrown when authentication fails.
-#: lib/apiauth.php:272 lib/apiauth.php:302
 msgid "Could not authenticate you."
 msgstr "Non puidemos autenticalo."
 
 #. TRANS: Server error displayed when trying to create an anynymous OAuth consumer.
-#: lib/apioauthstore.php:45
 #, fuzzy
 msgid "Could not create anonymous consumer."
 msgstr "Non se puideron crear os pseudónimos."
 
 #. TRANS: Server error displayed when trying to create an anynymous OAuth application.
-#: lib/apioauthstore.php:69
 #, fuzzy
 msgid "Could not create anonymous OAuth application."
 msgstr "Non se puido crear a aplicación."
 
 #. TRANS: Exception thrown when no token association could be found.
-#: lib/apioauthstore.php:151
 msgid ""
 "Could not find a profile and application associated with the request token."
 msgstr ""
 
 #. TRANS: Exception thrown when no access token can be issued.
-#: lib/apioauthstore.php:209
 #, fuzzy
 msgid "Could not issue access token."
 msgstr "Non se puido inserir a mensaxe."
 
-#: lib/apioauthstore.php:317
 msgid "Database error inserting OAuth application user."
 msgstr ""
 "Houbo un erro na base de datos ao intentar inserir o usuario da aplicación "
 "OAuth."
 
-#: lib/apioauthstore.php:345
 #, fuzzy
 msgid "Database error updating OAuth application user."
 msgstr ""
@@ -7810,28 +6460,23 @@ msgstr ""
 "OAuth."
 
 #. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
-#: lib/apioauthstore.php:371
 msgid "Tried to revoke unknown token."
 msgstr "Intentouse revogar un pase descoñecido."
 
 #. TRANS: Exception thrown when an attempt is made to remove a revoked token.
-#: lib/apioauthstore.php:376
 msgid "Failed to delete revoked token."
 msgstr "Erro ao borrar o pase revogado."
 
 #. TRANS: Form input field label for application icon.
-#: lib/applicationeditform.php:177
 msgid "Icon"
 msgstr "Icona"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:182
 msgid "Icon for this application"
 msgstr "Icona para esta aplicación"
 
 #. TRANS: Form input field instructions.
 #. TRANS: %d is the number of available characters for the description.
-#: lib/applicationeditform.php:201
 #, fuzzy, php-format
 msgid "Describe your application in %d character"
 msgid_plural "Describe your application in %d characters"
@@ -7839,211 +6484,172 @@ msgstr[0] "Describa a súa aplicación en %d caracteres"
 msgstr[1] "Describa a súa aplicación en %d caracteres"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:205
 msgid "Describe your application"
 msgstr "Describa a súa aplicación"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:216
 msgid "URL of the homepage of this application"
 msgstr "URL do sitio web desta aplicación"
 
 #. TRANS: Form input field label.
-#: lib/applicationeditform.php:218
 msgid "Source URL"
 msgstr "URL de orixe"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:225
 msgid "Organization responsible for this application"
 msgstr "Organización responsable desta aplicación"
 
 #. TRANS: Form input field label.
-#: lib/applicationeditform.php:227
 msgid "Organization"
 msgstr "Organización"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:234
 msgid "URL for the homepage of the organization"
 msgstr "URL do sitio web da organización"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:243
 msgid "URL to redirect to after authentication"
 msgstr "URL ao que ir tras a autenticación"
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:271
 msgid "Browser"
 msgstr "Navegador"
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:288
 msgid "Desktop"
 msgstr "Escritorio"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:290
 msgid "Type of application, browser or desktop"
 msgstr "Tipo de aplicación, de navegador ou de escritorio"
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:314
 msgid "Read-only"
 msgstr "Lectura"
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:334
 msgid "Read-write"
 msgstr "Lectura e escritura"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:336
 msgid "Default access for this application: read-only, or read-write"
 msgstr ""
 "Permisos por defecto para esta aplicación: lectura ou lectura e escritura"
 
 #. TRANS: Submit button title.
-#: lib/applicationeditform.php:353
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: lib/applicationlist.php:247
 msgid " by "
 msgstr ""
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:260
 msgid "read-write"
 msgstr "lectura e escritura"
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:262
 msgid "read-only"
 msgstr "lectura"
 
 #. TRANS: Used in application list. %1$s is a modified date, %2$s is access type ("read-write" or "read-only")
-#: lib/applicationlist.php:268
 #, php-format
 msgid "Approved %1$s - \"%2$s\" access."
 msgstr "Aprobado o %1$s - permisos de \"%2$s\"."
 
 #. TRANS: Access token in the application list.
 #. TRANS: %s are the first 7 characters of the access token.
-#: lib/applicationlist.php:282
 #, php-format
 msgid "Access token starting with: %s"
 msgstr ""
 
 #. TRANS: Button label
-#: lib/applicationlist.php:298
 msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "Revogar"
 
-#: lib/atom10feed.php:113
 #, fuzzy
 msgid "Author element must contain a name element."
 msgstr "o elemento \"autor\" debe conter un nome."
 
 #. TRANS: Server exception thrown when using the method setActivitySubject() in the class Atom10Feed.
-#: lib/atom10feed.php:160
 #, fuzzy
 msgid "Do not use this method!"
 msgstr "Non borrar esta nota"
 
 #. TRANS: Title.
-#: lib/attachmentnoticesection.php:67
 msgid "Notices where this attachment appears"
 msgstr "Notas nas que se anexou este ficheiro"
 
 #. TRANS: Title.
-#: lib/attachmenttagcloudsection.php:48
 msgid "Tags for this attachment"
 msgstr "Etiquetas para este ficheiro"
 
 #. TRANS: Exception thrown when a password change fails.
-#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:227
 #, fuzzy
 msgid "Password changing failed."
 msgstr "Non se puido cambiar o contrasinal"
 
 #. TRANS: Exception thrown when a password change attempt fails because it is not allowed.
-#: lib/authenticationplugin.php:238
 #, fuzzy
 msgid "Password changing is not allowed."
 msgstr "Non se permite cambiar o contrasinal"
 
 #. TRANS: Title for the form to block a user.
-#: lib/blockform.php:68
 msgid "Block"
 msgstr "Excluír"
 
 #. TRANS: Description of the form to block a user.
-#: lib/blockform.php:79
 msgid "Block this user"
 msgstr "Bloquear este usuario"
 
 #. TRANS: Title for command results.
-#: lib/channel.php:104 lib/channel.php:125
 msgid "Command results"
 msgstr "Resultados da orde"
 
 #. TRANS: Title for command results.
-#: lib/channel.php:138
 #, fuzzy
 msgid "AJAX error"
 msgstr "Houbo un erro de AJAX"
 
 #. TRANS: E-mail subject when a command has completed.
-#: lib/channel.php:177 lib/mailhandler.php:143
 msgid "Command complete"
 msgstr "Completouse a orde"
 
 #. TRANS: E-mail subject when a command has failed.
-#: lib/channel.php:188
 msgid "Command failed"
 msgstr "A orde fallou"
 
 #. TRANS: Command exception text shown when a notice ID is requested that does not exist.
-#: lib/command.php:82 lib/command.php:106
 msgid "Notice with that id does not exist."
 msgstr "Non hai ningunha nota con esa id."
 
 #. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
 #. TRANS: Error text shown when a last user notice is requested and it does not exist.
-#: lib/command.php:99 lib/command.php:642
 msgid "User has no last notice."
 msgstr "O usuario non ten ningunha última nota."
 
 #. TRANS: Message given requesting a profile for a non-existing user.
 #. TRANS: %s is the nickname of the user for which the profile could not be found.
-#: lib/command.php:128
 #, php-format
 msgid "Could not find a user with nickname %s."
 msgstr "Non se deu atopado ningún usuario co alcume %s."
 
 #. TRANS: Message given getting a non-existing user.
 #. TRANS: %s is the nickname of the user that could not be found.
-#: lib/command.php:148
 #, php-format
 msgid "Could not find a local user with nickname %s."
 msgstr "Non se deu atopado ningún usuario local co alcume %s."
 
 #. TRANS: Error text shown when an unimplemented command is given.
-#: lib/command.php:183
 msgid "Sorry, this command is not yet implemented."
 msgstr "Esta orde aínda non está integrada."
 
 #. TRANS: Command exception text shown when a user tries to nudge themselves.
-#: lib/command.php:229
 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr "Non ten sentido ningún facerse un aceno a un mesmo!"
 
 #. TRANS: Message given having nudged another user.
 #. TRANS: %s is the nickname of the user that was nudged.
-#: lib/command.php:238
 #, php-format
 msgid "Nudge sent to %s."
 msgstr "Fíxoselle un aceno a %s."
@@ -8052,7 +6658,6 @@ msgstr "Fíxoselle un aceno a %s."
 #. TRANS: %1$s is the number of other user the user is subscribed to.
 #. TRANS: %2$s is the number of users that are subscribed to the user.
 #. TRANS: %3$s is the number of notices the user has sent.
-#: lib/command.php:268
 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"
@@ -8064,40 +6669,34 @@ msgstr ""
 "Notas: %3$s"
 
 #. TRANS: Error message text shown when a favorite could not be set because it has already been favorited.
-#: lib/command.php:298
 #, fuzzy
 msgid "Could not create favorite: already favorited."
 msgstr "Non se puido crear o favorito."
 
 #. TRANS: Text shown when a notice has been marked as favourite successfully.
-#: lib/command.php:324
 msgid "Notice marked as fave."
 msgstr "Marcouse a nota como  favorita."
 
 #. TRANS: Message given having added a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:369
 #, php-format
 msgid "%1$s joined group %2$s."
 msgstr "%1$s uniuse ao grupo %2$s."
 
 #. TRANS: Message given having removed a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:417
 #, php-format
 msgid "%1$s left group %2$s."
 msgstr "%1$s deixou o grupo %2$s."
 
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: lib/command.php:438
 #, fuzzy, php-format
 msgctxt "WHOIS"
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
 
 #. TRANS: Whois output. %s is the full name of the queried user.
-#: lib/command.php:442
 #, php-format
 msgid "Fullname: %s"
 msgstr "Nome completo: %s"
@@ -8105,7 +6704,6 @@ msgstr "Nome completo: %s"
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a location.
-#: lib/command.php:446 lib/mail.php:275
 #, php-format
 msgid "Location: %s"
 msgstr "Localidade: %s"
@@ -8113,20 +6711,17 @@ msgstr "Localidade: %s"
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a homepage.
-#: lib/command.php:450 lib/mail.php:279
 #, php-format
 msgid "Homepage: %s"
 msgstr "Sitio web: %s"
 
 #. TRANS: Whois output. %s is the bio information of the queried user.
-#: lib/command.php:454
 #, php-format
 msgid "About: %s"
 msgstr "Acerca de: %s"
 
 #. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).
 #. TRANS: %s is a remote profile.
-#: lib/command.php:483
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
@@ -8137,7 +6732,6 @@ msgstr ""
 
 #. TRANS: Message given if content is too long. %1$sd is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:500
 #, fuzzy, php-format
 msgid "Message too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
@@ -8146,26 +6740,26 @@ msgstr[0] ""
 msgstr[1] ""
 "A mensaxe é longa de máis, o límite de caracteres é de %1$d, e enviou %2$d."
 
+#. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
+msgid "You can't send a message to this user."
+msgstr "Non pode enviarlle unha mensaxe a este usuario."
+
 #. TRANS: Error text shown sending a direct message fails with an unknown reason.
-#: lib/command.php:528
 msgid "Error sending direct message."
 msgstr "Houbo un erro ao enviar a mensaxe directa."
 
 #. TRANS: Message given having repeated a notice from another user.
 #. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:565
 #, php-format
 msgid "Notice from %s repeated."
 msgstr "Repetiuse a nota de %s."
 
 #. TRANS: Error text shown when repeating a notice fails with an unknown reason.
-#: lib/command.php:568
 msgid "Error repeating notice."
 msgstr "Houbo un erro ao repetir a nota."
 
 #. TRANS: Message given if content of a notice for a reply is too long. %1$d is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:603
 #, fuzzy, php-format
 msgid "Notice too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Notice too long - maximum is %1$d characters, you sent %2$d."
@@ -8176,80 +6770,66 @@ msgstr[1] ""
 
 #. TRANS: Text shown having sent a reply to a notice successfully.
 #. TRANS: %s is the nickname of the user of the notice the reply was sent to.
-#: lib/command.php:616
 #, php-format
 msgid "Reply to %s sent."
 msgstr "Enviouse a resposta a %s."
 
 #. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
-#: lib/command.php:619
 msgid "Error saving notice."
 msgstr "Houbo un erro ao gardar a nota."
 
 #. TRANS: Error text shown when no username was provided when issuing a subscribe command.
-#: lib/command.php:666
 msgid "Specify the name of the user to subscribe to."
 msgstr "Introduza o nome do usuario ao que quere subscribirse."
 
 #. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
-#: lib/command.php:675
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "Non se pode subscribir aos perfís OMB cunha orde."
 
 #. TRANS: Text shown after having subscribed to another user successfully.
 #. TRANS: %s is the name of the user the subscription was requested for.
-#: lib/command.php:683
 #, php-format
 msgid "Subscribed to %s."
 msgstr "Subscribiuse a %s."
 
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.
-#: lib/command.php:704 lib/command.php:815
 msgid "Specify the name of the user to unsubscribe from."
 msgstr "Introduza o nome do usuario ao que quer deixar de estar subscrito."
 
 #. TRANS: Text shown after having unsubscribed from another user successfully.
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:715
 #, php-format
 msgid "Unsubscribed from %s."
 msgstr "Cancelou a subscrición a %s."
 
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
-#: lib/command.php:735 lib/command.php:761
 msgid "Command not yet implemented."
 msgstr "Aínda non se integrou esa orde."
 
 #. TRANS: Text shown when issuing the command "off" successfully.
-#: lib/command.php:739
 msgid "Notification off."
 msgstr "Desactivar a notificación."
 
 #. TRANS: Error text shown when the command "off" fails for an unknown reason.
-#: lib/command.php:742
 msgid "Can't turn off notification."
 msgstr "Non se pode desactivar a notificación."
 
 #. TRANS: Text shown when issuing the command "on" successfully.
-#: lib/command.php:765
 msgid "Notification on."
 msgstr "Activar a notificación."
 
 #. TRANS: Error text shown when the command "on" fails for an unknown reason.
-#: lib/command.php:768
 msgid "Can't turn on notification."
 msgstr "Non se pode activar a notificación."
 
 #. TRANS: Error text shown when issuing the login command while login is disabled.
-#: lib/command.php:782
 msgid "Login command is disabled."
 msgstr "A orde de identificación está desactivada."
 
 #. TRANS: Text shown after issuing the login command successfully.
 #. TRANS: %s is a logon link..
-#: lib/command.php:795
 #, php-format
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
@@ -8258,20 +6838,17 @@ msgstr ""
 
 #. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:824
 #, php-format
 msgid "Unsubscribed %s."
 msgstr "Cancelou a subscrición a %s."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
-#: lib/command.php:842
 msgid "You are not subscribed to anyone."
 msgstr "Non está subscrito a ninguén."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
-#: lib/command.php:847
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Vostede está subscrito a esta persoa:"
@@ -8279,14 +6856,12 @@ msgstr[1] "Vostede está subscrito a estas persoas:"
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user
 #. TRANS: (followers) without having any subscribers.
-#: lib/command.php:869
 msgid "No one is subscribed to you."
 msgstr "Non hai ninguén subscrito a vostede."
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
-#: lib/command.php:874
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Esta persoa está subscrita a vostede:"
@@ -8294,21 +6869,18 @@ msgstr[1] "Estas persoas están subscritas a vostede:"
 
 #. TRANS: Text shown after requesting groups a user is subscribed to without having
 #. TRANS: any group subscriptions.
-#: lib/command.php:896
 msgid "You are not a member of any groups."
 msgstr "Non forma parte de ningún grupo."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
-#: lib/command.php:901
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "Vostede pertence a este grupo:"
 msgstr[1] "Vostede pertence a estes grupos:"
 
 #. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-#: lib/command.php:916
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -8389,71 +6961,58 @@ msgstr ""
 "tracking - aínda non se integrou\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:36
 #, fuzzy
 msgid "No configuration file found."
 msgstr "Non se atopou ningún ficheiro de configuración. "
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:39
 #, fuzzy
 msgid "I looked for configuration files in the following places:"
 msgstr "Buscáronse ficheiros de configuración nos seguintes lugares: "
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:42
 msgid "You may wish to run the installer to fix this."
 msgstr "Pode que queira executar o instalador para arranxalo."
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:46
 msgid "Go to the installer."
 msgstr "Ir ao instalador."
 
-#: lib/dberroraction.php:59
 msgid "Database error"
 msgstr "Houbo un erro na base de datos"
 
 #. TRANS: Description of form for deleting a user.
-#: lib/deleteuserform.php:75
 msgid "Delete this user"
 msgstr "Borrar o usuario"
 
-#: lib/designform.php:114
 #, fuzzy
 msgid "Change design"
 msgstr "Gardar o deseño"
 
 #. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: lib/designform.php:131
 msgid "Change colours"
 msgstr "Cambiar as cores"
 
 #. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: lib/designform.php:138
 msgid "Use defaults"
 msgstr "Utilizar os valores por defecto"
 
 #. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: lib/designform.php:140
 msgid "Restore default designs"
 msgstr "Restaurar o deseño por defecto"
 
 #. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: lib/designform.php:148
 msgid "Reset back to default"
 msgstr "Volver ao deseño por defecto"
 
 #. TRANS: Label in form on profile design page.
 #. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
-#: lib/designform.php:158
 msgid "Upload file"
 msgstr "Cargar un ficheiro"
 
 #. TRANS: Instructions for form on profile design page.
-#: lib/designform.php:163
 #, fuzzy
 msgid ""
 "You can upload your personal background image. The maximum file size is 2Mb."
@@ -8462,49 +7021,41 @@ msgstr ""
 "2MB."
 
 #. TRANS: Radio button on profile design page that will enable use of the uploaded profile image.
-#: lib/designform.php:194
 #, fuzzy
 msgctxt "RADIO"
 msgid "On"
 msgstr "Activado"
 
 #. TRANS: Radio button on profile design page that will disable use of the uploaded profile image.
-#: lib/designform.php:211
 #, fuzzy
 msgctxt "RADIO"
 msgid "Off"
 msgstr "Desactivado"
 
 #. TRANS: Title for button on profile design page to save settings.
-#: lib/designform.php:322
 msgid "Save design"
 msgstr "Gardar o deseño"
 
 #. TRANS: Error message displayed if design settings could not be saved.
 #. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
-#: lib/designsettings.php:216 lib/designsettings.php:238
 msgid "Couldn't update your design."
 msgstr "Non se puido actualizar o seu deseño."
 
 #. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
-#: lib/designsettings.php:244
 msgid "Design defaults restored."
 msgstr "Restableceuse o deseño por defecto."
 
 #. TRANS: Exception. %s is an ID.
-#: lib/discovery.php:153
 #, fuzzy, php-format
 msgid "Unable to find services for %s."
 msgstr "Non se puido revogar o acceso da aplicación: %s."
 
 #. TRANS: Form legend for removing the favourite status for a favourite notice.
 #. TRANS: Title for button text for removing the favourite status for a favourite notice.
-#: lib/disfavorform.php:108 lib/disfavorform.php:140
 msgid "Disfavor this notice"
 msgstr "Desmarcar esta nota como favorita"
 
 #. TRANS: Button text for removing the favourite status for a favourite notice.
-#: lib/disfavorform.php:136
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Disfavor favorite"
@@ -8512,99 +7063,78 @@ msgstr "Desmarcar como favorita"
 
 #. TRANS: Form legend for adding the favourite status to a notice.
 #. TRANS: Title for button text for adding the favourite status to a notice.
-#: lib/favorform.php:108 lib/favorform.php:139
 msgid "Favor this notice"
 msgstr "Marcar esta nota como favorita"
 
 #. TRANS: Button text for adding the favourite status to a notice.
-#: lib/favorform.php:135
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Favor"
 msgstr "Marcar como favorito"
 
-#: lib/feed.php:84
 msgid "RSS 1.0"
 msgstr "RSS 1.0"
 
-#: lib/feed.php:86
 msgid "RSS 2.0"
 msgstr "RSS 2.0"
 
-#: lib/feed.php:88
 msgid "Atom"
 msgstr "Atom"
 
-#: lib/feed.php:90
 msgid "FOAF"
 msgstr "Amigo dun amigo"
 
-#: lib/feedimporter.php:75
 #, fuzzy
 msgid "Not an atom feed."
 msgstr "Todos os membros"
 
-#: lib/feedimporter.php:82
 msgid "No author in the feed."
 msgstr ""
 
-#: lib/feedimporter.php:89
 msgid "Can't import without a user."
 msgstr ""
 
 #. TRANS: Header for feed links (h2).
-#: lib/feedlist.php:66
 msgid "Feeds"
 msgstr "Fontes de novas"
 
-#: lib/galleryaction.php:128
 msgid "All"
 msgstr "Todas"
 
-#: lib/galleryaction.php:136
 msgid "Select tag to filter"
 msgstr "Escolla unha etiqueta a filtrar"
 
-#: lib/galleryaction.php:137
 msgid "Tag"
 msgstr "Etiqueta"
 
-#: lib/galleryaction.php:138
 msgid "Choose a tag to narrow list"
 msgstr "Escolla unha etiqueta para reducir a lista"
 
-#: lib/galleryaction.php:140
 msgid "Go"
 msgstr "Continuar"
 
-#: lib/grantroleform.php:91
 #, php-format
 msgid "Grant this user the \"%s\" role"
 msgstr "Outorgarlle a este usuario o rol \"%s\""
 
-#: lib/groupeditform.php:147
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr ""
 "Entre 1 e 64 letras minúsculas ou números, sen signos de puntuación, "
 "espazos, tiles ou eñes"
 
-#: lib/groupeditform.php:156
 #, fuzzy
 msgid "URL of the homepage or blog of the group or topic."
 msgstr "URL do sitio web persoal ou blogue do grupo ou tema"
 
-#: lib/groupeditform.php:161
 msgid "Describe the group or topic"
 msgstr "Describa o grupo ou o tema"
 
-#: lib/groupeditform.php:163
 #, fuzzy, php-format
 msgid "Describe the group or topic in %d character or less"
 msgid_plural "Describe the group or topic in %d characters or less"
 msgstr[0] "Describa o grupo ou o tema en %d caracteres"
 msgstr[1] "Describa o grupo ou o tema en %d caracteres"
 
-#: lib/groupeditform.php:175
 #, fuzzy
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\"."
@@ -8612,7 +7142,6 @@ msgstr ""
 "Localidade do grupo, se a ten, como por exemplo \"Cidade, Provincia, "
 "Comunidade, País\""
 
-#: lib/groupeditform.php:183
 #, fuzzy, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -8628,70 +7157,60 @@ msgstr[1] ""
 "máximo"
 
 #. TRANS: Menu item in the group navigation page.
-#: lib/groupnav.php:86
 msgctxt "MENU"
 msgid "Group"
 msgstr "Grupo"
 
 #. TRANS: Tooltip for menu item in the group navigation page.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:89
 #, php-format
 msgctxt "TOOLTIP"
 msgid "%s group"
 msgstr "Grupo %s"
 
 #. TRANS: Menu item in the group navigation page.
-#: lib/groupnav.php:95
 msgctxt "MENU"
 msgid "Members"
 msgstr "Membros"
 
 #. TRANS: Tooltip for menu item in the group navigation page.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:98
 #, php-format
 msgctxt "TOOLTIP"
 msgid "%s group members"
 msgstr "Membros do grupo %s"
 
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/groupnav.php:108
 msgctxt "MENU"
 msgid "Blocked"
 msgstr "Bloqueado"
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:111
 #, php-format
 msgctxt "TOOLTIP"
 msgid "%s blocked users"
 msgstr "Usuarios bloqueados en %s"
 
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "Administrador"
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:120
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Edit %s group properties"
 msgstr "Modificar as propiedades do grupo %s"
 
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/groupnav.php:126
 msgctxt "MENU"
 msgid "Logo"
 msgstr "Logotipo"
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:129
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Add or edit %s logo"
@@ -8699,69 +7218,57 @@ msgstr "Engadir ou modificar o logotipo de %s"
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:138
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Add or edit %s design"
 msgstr "Engadir ou modificar o deseño de %s"
 
 #. TRANS: Title for groups with the most members section.
-#: lib/groupsbymemberssection.php:71
 msgid "Groups with most members"
 msgstr "Grupos con máis membros"
 
 #. TRANS: Title for groups with the most posts section.
-#: lib/groupsbypostssection.php:71
 msgid "Groups with most posts"
 msgstr "Grupos con máis notas"
 
 #. TRANS: Title for group tag cloud section.
 #. TRANS: %s is a group name.
-#: lib/grouptagcloudsection.php:57
 #, php-format
 msgid "Tags in %s group's notices"
 msgstr "Etiquetas nas notas do grupo %s"
 
 #. TRANS: Client exception 406
-#: lib/htmloutputter.php:104
 msgid "This page is not available in a media type you accept"
 msgstr "Esta páxina non está dispoñible nun formato axeitado para vostede"
 
 #. TRANS: Exception thrown when trying to upload an unsupported image file format.
-#: lib/imagefile.php:73
 msgid "Unsupported image file format."
 msgstr "Non se soporta o formato da imaxe."
 
 #. TRANS: Exception thrown when too large a file is uploaded.
 #. TRANS: %s is the maximum file size, for example "500b", "10kB" or "2MB".
-#: lib/imagefile.php:91
 #, php-format
 msgid "That file is too big. The maximum file size is %s."
 msgstr "Ese ficheiro é grande de máis. O tamaño máximo por ficheiro son %s."
 
 #. TRANS: Exception thrown when uploading an image and that action could not be completed.
-#: lib/imagefile.php:97
 msgid "Partial upload."
 msgstr "Carga parcial."
 
 #. TRANS: Exception thrown when uploading a file as image that is not an image or is a corrupt file.
-#: lib/imagefile.php:115
 msgid "Not an image or corrupt file."
 msgstr "O ficheiro está mal ou non é unha imaxe."
 
 #. TRANS: Exception thrown during resize when image has been registered as present, but is no longer there.
-#: lib/imagefile.php:178
 msgid "Lost our file."
 msgstr "Perdeuse o noso ficheiro."
 
 #. TRANS: Exception thrown when trying to resize an unknown file type.
 #. TRANS: Exception thrown when trying resize an unknown file type.
-#: lib/imagefile.php:216 lib/imagefile.php:257
 msgid "Unknown file type"
 msgstr "Non se coñece o tipo de ficheiro"
 
 #. TRANS: Number of megabytes. %d is the number.
-#: lib/imagefile.php:303
 #, fuzzy, php-format
 msgid "%dMB"
 msgid_plural "%dMB"
@@ -8769,7 +7276,6 @@ msgstr[0] "MB"
 msgstr[1] "MB"
 
 #. TRANS: Number of kilobytes. %d is the number.
-#: lib/imagefile.php:307
 #, fuzzy, php-format
 msgid "%dkB"
 msgid_plural "%dkB"
@@ -8777,14 +7283,12 @@ msgstr[0] "kB"
 msgstr[1] "kB"
 
 #. TRANS: Number of bytes. %d is the number.
-#: lib/imagefile.php:310
 #, php-format
 msgid "%dB"
 msgid_plural "%dB"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/implugin.php:262
 #, php-format
 msgid ""
 "User \"%s\" on %s has said that your %s screenname belongs to them. If "
@@ -8794,52 +7298,43 @@ msgid ""
 "message."
 msgstr ""
 
-#: lib/implugin.php:349
 #, php-format
 msgid "Unknown inbox source %d."
 msgstr "Non se coñece a fonte %d da caixa de entrada."
 
-#: lib/implugin.php:485
-#, fuzzy, php-format
+#, php-format
 msgid "Message too long - maximum is %1$d characters, you sent %2$d."
 msgstr ""
 "A mensaxe é longa de máis, o límite de caracteres é de %1$d, e enviou %2$d."
 
-#: lib/leaveform.php:114
 msgid "Leave"
 msgstr "Deixar"
 
 #. TRANS: Menu item for logging in to the StatusNet site.
-#: lib/logingroupnav.php:77
 msgctxt "MENU"
 msgid "Login"
 msgstr "Identificarse"
 
 #. TRANS: Title for menu item for logging in to the StatusNet site.
-#: lib/logingroupnav.php:79
 msgid "Login with a username and password"
 msgstr "Identificarse cun nome de usuario e contrasinal"
 
 #. TRANS: Menu item for registering with the StatusNet site.
-#: lib/logingroupnav.php:85
 msgctxt "MENU"
 msgid "Register"
 msgstr "Rexistrarse"
 
 #. TRANS: Title for menu item for registering with the StatusNet site.
-#: lib/logingroupnav.php:87
 msgid "Sign up for a new account"
 msgstr "Rexistrar unha conta nova"
 
 #. TRANS: Subject for address confirmation email.
-#: lib/mail.php:172
 msgid "Email address confirmation"
 msgstr "Confirmación do enderezo de correo electrónico"
 
 #. TRANS: Body for address confirmation email.
 #. TRANS: %1$s is the addressed user's nickname, %2$s is the StatusNet sitename,
 #. TRANS: %3$s is the URL to confirm at.
-#: lib/mail.php:177
 #, fuzzy, php-format
 msgid ""
 "Hey, %1$s.\n"
@@ -8870,14 +7365,12 @@ msgstr ""
 
 #. TRANS: Subject of new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
-#: lib/mail.php:243
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "Agora %1$s segue as súas notas en %2$s."
 
 #. TRANS: This is a paragraph in a new-subscriber e-mail.
 #. TRANS: %s is a URL where the subscriber can be reported as abusive.
-#: lib/mail.php:250
 #, php-format
 msgid ""
 "If you believe this account is being used abusively, you can block them from "
@@ -8891,7 +7384,6 @@ msgstr ""
 #. TRANS: %3$s is the subscriber's profile URL, %4$s is the subscriber's location (or empty)
 #. TRANS: %5$s is the subscriber's homepage URL (or empty), %6%s is the subscriber's bio (or empty)
 #. TRANS: %7$s is a link to the addressed user's e-mail settings.
-#: lib/mail.php:260
 #, fuzzy, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -8919,14 +7411,12 @@ msgstr ""
 
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is biographical information.
-#: lib/mail.php:283
 #, php-format
 msgid "Bio: %s"
 msgstr "Biografía: %s"
 
 #. TRANS: Subject of notification mail for new posting email address.
 #. TRANS: %s is the StatusNet sitename.
-#: lib/mail.php:312
 #, php-format
 msgid "New email address for posting to %s"
 msgstr "Novo enderezo de correo electrónico para publicar en %s"
@@ -8934,7 +7424,6 @@ msgstr "Novo enderezo de correo electrónico para publicar en %s"
 #. TRANS: Body of notification mail for new posting email address.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is the e-mail address to send
 #. TRANS: to to post by e-mail, %3$s is a URL to more instructions.
-#: lib/mail.php:318
 #, fuzzy, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -8957,19 +7446,16 @@ msgstr ""
 
 #. TRANS: Subject line for SMS-by-email notification messages.
 #. TRANS: %s is the posting user's nickname.
-#: lib/mail.php:439
 #, php-format
 msgid "%s status"
 msgstr "Estado de %s"
 
 #. TRANS: Subject line for SMS-by-email address confirmation message.
-#: lib/mail.php:465
 msgid "SMS confirmation"
 msgstr "Confirmación dos SMS"
 
 #. TRANS: Main body heading for SMS-by-email address confirmation message.
 #. TRANS: %s is the addressed user's nickname.
-#: lib/mail.php:469
 #, php-format
 msgid "%s: confirm you own this phone number with this code:"
 msgstr ""
@@ -8977,7 +7463,6 @@ msgstr ""
 
 #. TRANS: Subject for 'nudge' notification email.
 #. TRANS: %s is the nudging user.
-#: lib/mail.php:490
 #, fuzzy, php-format
 msgid "You have been nudged by %s"
 msgstr "%s fíxolle un aceno"
@@ -8985,7 +7470,6 @@ msgstr "%s fíxolle un aceno"
 #. TRANS: Body for 'nudge' notification email.
 #. TRANS: %1$s is the nuding user's long name, $2$s is the nudging user's nickname,
 #. TRANS: %3$s is a URL to post notices at, %4$s is the StatusNet sitename.
-#: lib/mail.php:497
 #, php-format
 msgid ""
 "%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -9014,7 +7498,6 @@ msgstr ""
 
 #. TRANS: Subject for direct-message notification email.
 #. TRANS: %s is the sending user's nickname.
-#: lib/mail.php:544
 #, php-format
 msgid "New private message from %s"
 msgstr "Nova mensaxe privada de %s"
@@ -9023,7 +7506,6 @@ msgstr "Nova mensaxe privada de %s"
 #. TRANS: %1$s is the sending user's long name, %2$s is the sending user's nickname,
 #. TRANS: %3$s is the message content, %4$s a URL to the message,
 #. TRANS: %5$s is the StatusNet sitename.
-#: lib/mail.php:552
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -9058,7 +7540,6 @@ msgstr ""
 
 #. TRANS: Subject for favorite notification e-mail.
 #. TRANS: %1$s is the adding user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:604
 #, fuzzy, php-format
 msgid "%1$s (@%2$s) added your notice as a favorite"
 msgstr "%s (@%s) marcou a súa nota como favorita"
@@ -9068,7 +7549,6 @@ msgstr "%s (@%s) marcou a súa nota como favorita"
 #. TRANS: %3$s is a URL to the faved notice, %4$s is the faved notice text,
 #. TRANS: %5$s is a URL to all faves of the adding user, %6$s is the StatusNet sitename,
 #. TRANS: %7$s is the adding user's nickname.
-#: lib/mail.php:611
 #, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -9107,7 +7587,6 @@ msgstr ""
 "%6$s\n"
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:669
 #, php-format
 msgid ""
 "The full conversation can be read here:\n"
@@ -9120,7 +7599,6 @@ msgstr ""
 
 #. TRANS: E-mail subject for notice notification.
 #. TRANS: %1$s is the sending user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:677
 #, fuzzy, php-format
 msgid "%1$s (@%2$s) sent a notice to your attention"
 msgstr "%s (@%s) enviou unha nota á súa atención"
@@ -9131,7 +7609,6 @@ msgstr "%s (@%s) enviou unha nota á súa atención"
 #. TRANS: %5$s is a URL to the full conversion if it exists (otherwise empty),
 #. TRANS: %6$s is a URL to reply to the notice, %7$s is a URL to all @-replied for the addressed user,
 #. TRANS: %8$s is a URL to the addressed user's e-mail settings, %9$s is the sender's nickname.
-#: lib/mail.php:685
 #, php-format
 msgid ""
 "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -9181,11 +7658,9 @@ msgstr ""
 "\n"
 "P.S.: pode desactivar estas notificacións por correo electrónico en %8$s\n"
 
-#: lib/mailbox.php:87
 msgid "Only the user can read their own mailboxes."
 msgstr "Só o usuario pode ler as súas caixas de entrada."
 
-#: lib/mailbox.php:125
 msgid ""
 "You have no private messages. You can send private message to engage other "
 "users in conversation. People can send you messages for your eyes only."
@@ -9193,54 +7668,44 @@ msgstr ""
 "Non ten mensaxes privadas. Pode enviar mensaxes privadas para conversar con "
 "outros usuarios. A xente pode enviarlle mensaxes para que só as lea vostede."
 
-#: lib/mailhandler.php:37
 msgid "Could not parse message."
 msgstr "Non se puido analizar a mensaxe."
 
-#: lib/mailhandler.php:42
 msgid "Not a registered user."
 msgstr "Non está rexistrado."
 
-#: lib/mailhandler.php:46
 msgid "Sorry, that is not your incoming email address."
 msgstr "Ese non é o seu enderezo de correo electrónico para recibir correos."
 
-#: lib/mailhandler.php:50
 msgid "Sorry, no incoming email allowed."
 msgstr "Non se permite recibir correo electrónico."
 
-#: lib/mailhandler.php:229
 #, php-format
 msgid "Unsupported message type: %s"
 msgstr "Non se soporta o tipo de mensaxe: %s"
 
 #. TRANS: Client exception thrown when a database error was thrown during a file upload operation.
-#: lib/mediafile.php:102 lib/mediafile.php:174
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
 "Houbo un erro na base de datos ao gardar o seu ficheiro. Volva intentalo."
 
 #. TRANS: Client exception thrown when a file upload operation would cause a user to exceed a set quota.
-#: lib/mediafile.php:238 lib/mediafile.php:281
 msgid "File exceeds user's quota."
 msgstr "O ficheiro supera a cota do usuario."
 
 #. TRANS: Client exception thrown when a file upload operation fails because the file could
 #. TRANS: not be moved from the temporary folder to the permanent file location.
-#: lib/mediafile.php:258 lib/mediafile.php:300
 msgid "File could not be moved to destination directory."
 msgstr "Non se puido mover o ficheiro ao directorio de destino."
 
 #. TRANS: Client exception thrown when a file upload operation has been stopped because the MIME
 #. TRANS: type of the uploaded file could not be determined.
-#: lib/mediafile.php:265 lib/mediafile.php:306
 msgid "Could not determine file's MIME type."
 msgstr "Non se puido determinar o tipo MIME do ficheiro."
 
 #. TRANS: Client exception thrown trying to upload a forbidden MIME type.
 #. TRANS: %1$s is the file type that was denied, %2$s is the application part of
 #. TRANS: the MIME type that was denied.
-#: lib/mediafile.php:396
 #, php-format
 msgid ""
 "\"%1$s\" is not a supported file type on this server. Try using another %2$s "
@@ -9251,84 +7716,75 @@ msgstr ""
 
 #. TRANS: Client exception thrown trying to upload a forbidden MIME type.
 #. TRANS: %s is the file type that was denied.
-#: lib/mediafile.php:401
 #, php-format
 msgid "\"%s\" is not a supported file type on this server."
 msgstr "Neste servidor non se soporta o tipo de ficheiro \"%s\"."
 
-#: lib/messageform.php:120
 msgid "Send a direct notice"
 msgstr "Enviar unha nota directa"
 
 #. TRANS Label entry in drop-down selection box in direct-message inbox/outbox. This is the default entry in the drop-down box, doubling as instructions and a brake against accidental submissions with the first user in the list.
-#: lib/messageform.php:137
 #, fuzzy
 msgid "Select recipient:"
 msgstr "Seleccionar unha licenza"
 
 #. TRANS Entry in drop-down selection box in direct-message inbox/outbox when no one is available to message.
-#: lib/messageform.php:150
 #, fuzzy
 msgid "No mutual subscribers."
 msgstr "Non está subscrito!"
 
-#: lib/messageform.php:153
 msgid "To"
 msgstr "A"
 
-#: lib/messageform.php:184 lib/noticeform.php:236
 msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr "Enviar"
 
-#: lib/messagelist.php:77
 #, fuzzy
 msgid "Messages"
 msgstr "Mensaxe"
 
-#: lib/messagelistitem.php:123 lib/noticelist.php:527
 msgid "from"
 msgstr "de"
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:178
 msgid "Nickname cannot be empty."
 msgstr ""
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:191
 #, php-format
 msgid "Nickname cannot be more than %d character long."
 msgid_plural "Nickname cannot be more than %d characters long."
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/noticeform.php:160
+#. TRANS: Form legend for notice form.
 msgid "Send a notice"
 msgstr "Enviar unha nota"
 
-#: lib/noticeform.php:174
+#. TRANS: Title for notice label. %s is the user's nickname.
 #, php-format
 msgid "What's up, %s?"
 msgstr "Que hai de novo, %s?"
 
-#: lib/noticeform.php:193
+#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr "Anexar"
 
-#: lib/noticeform.php:197
-msgid "Attach a file"
+#. TRANS: Title for input field to attach a file to a notice.
+#, fuzzy
+msgid "Attach a file."
 msgstr "Anexar un ficheiro"
 
-#: lib/noticeform.php:212
+#. TRANS: Field label to add location to a notice.
 msgid "Share my location"
 msgstr "Publicar a miña localidade"
 
-#: lib/noticeform.php:215
+#. TRANS: Text to not share location for a notice in notice form.
 msgid "Do not share my location"
 msgstr "Non publicar a miña localidade"
 
-#: lib/noticeform.php:216
+#. TRANS: Timeout error text for location retrieval in notice form.
 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
 "try again later"
@@ -9337,420 +7793,319 @@ msgstr ""
 "intentar máis tarde"
 
 #. TRANS: Used in coordinates as abbreviation of north
-#: lib/noticelist.php:457
 msgid "N"
 msgstr "N"
 
 #. TRANS: Used in coordinates as abbreviation of south
-#: lib/noticelist.php:459
 msgid "S"
 msgstr "S"
 
 #. TRANS: Used in coordinates as abbreviation of east
-#: lib/noticelist.php:461
 msgid "E"
 msgstr "L"
 
 #. TRANS: Used in coordinates as abbreviation of west
-#: lib/noticelist.php:463
 msgid "W"
 msgstr "O"
 
-#: lib/noticelist.php:465
 #, php-format
 msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 
-#: lib/noticelist.php:474
 msgid "at"
 msgstr "en"
 
-#: lib/noticelist.php:523
 msgid "web"
 msgstr "web"
 
-#: lib/noticelist.php:589
 msgid "in context"
 msgstr "no contexto"
 
-#: lib/noticelist.php:624
 msgid "Repeated by"
 msgstr "Repetida por"
 
-#: lib/noticelist.php:651
 msgid "Reply to this notice"
 msgstr "Responder a esta nota"
 
-#: lib/noticelist.php:652
 msgid "Reply"
 msgstr "Responder"
 
-#: lib/noticelist.php:678
 msgid "Delete this notice"
 msgstr "Borrar esta nota"
 
-#: lib/noticelist.php:696
 msgid "Notice repeated"
 msgstr "Repetiuse a nota"
 
-#: lib/nudgeform.php:116
 msgid "Nudge this user"
 msgstr "Facerlle un aceno a este usuario"
 
-#: lib/nudgeform.php:128
 msgid "Nudge"
 msgstr "Facer un aceno"
 
-#: lib/nudgeform.php:128
 msgid "Send a nudge to this user"
 msgstr "Facerlle un aceno a este usuario"
 
-#: lib/oauthstore.php:294
 msgid "Error inserting new profile."
 msgstr "Houbo un erro ao inserir o novo perfil."
 
-#: lib/oauthstore.php:302
 msgid "Error inserting avatar."
 msgstr "Houbo un erro ao inserir o avatar."
 
-#: lib/oauthstore.php:322
 msgid "Error inserting remote profile."
 msgstr "Houbo un erro ao inserir o perfil remoto."
 
 #. TRANS: Exception thrown when a notice is denied because it has been sent before.
-#: lib/oauthstore.php:362
 msgid "Duplicate notice."
 msgstr "Nota duplicada."
 
-#: lib/oauthstore.php:507
 msgid "Couldn't insert new subscription."
 msgstr "Non se puido inserir unha subscrición nova."
 
-#: lib/personalgroupnav.php:104
-#, fuzzy
 msgid "Replies"
 msgstr "Respostas"
 
-#: lib/personalgroupnav.php:109
-#, fuzzy
 msgid "Favorites"
 msgstr "Favoritas"
 
-#: lib/personalgroupnav.php:120
-#, fuzzy
 msgid "Inbox"
 msgstr "Caixa de entrada"
 
-#: lib/personalgroupnav.php:121
 msgid "Your incoming messages"
 msgstr "As mensaxes recibidas"
 
-#: lib/personalgroupnav.php:125
-#, fuzzy
 msgid "Outbox"
 msgstr "Caixa de saída"
 
-#: lib/personalgroupnav.php:126
 msgid "Your sent messages"
 msgstr "As mensaxes enviadas"
 
 #. TRANS: Title for personal tag cloud section. %s is a user nickname.
-#: lib/personaltagcloudsection.php:56
 #, php-format
 msgid "Tags in %s's notices"
 msgstr "Etiquetas nas notas de %s"
 
 #. TRANS: Displayed as version information for a plugin if no version information was found.
-#: lib/plugin.php:126
 msgid "Unknown"
 msgstr "Descoñecida"
 
 #. TRANS: Plugin admin panel controls
-#: lib/plugindisableform.php:90
 msgctxt "plugin"
 msgid "Disable"
 msgstr ""
 
 #. TRANS: Plugin admin panel controls
-#: lib/pluginenableform.php:112
 msgctxt "plugin"
 msgid "Enable"
 msgstr ""
 
-#: lib/pluginlist.php:196
 msgctxt "plugin-description"
 msgid "(Plugin descriptions unavailable when disabled.)"
 msgstr ""
 
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:88
 msgid "Subscriptions"
 msgstr "Subscricións"
 
 #. TRANS: Text for user subscription statistics if user has more subscriptions than displayed.
-#: lib/profileaction.php:144
 msgid "All subscriptions"
 msgstr "Todas as subscricións"
 
 #. TRANS: H2 text for user subscriber statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:96
 msgid "Subscribers"
 msgstr "Subscritores"
 
 #. TRANS: Text for user subscription statistics if user has more subscribers than displayed.
-#: lib/profileaction.php:181
 msgid "All subscribers"
 msgstr "Todos os subscritores"
 
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:213
 msgid "User ID"
 msgstr "ID do usuario"
 
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:219
 msgid "Member since"
 msgstr "Membro dende"
 
 #. TRANS: Label for user statistics.
 #. TRANS: H2 text for user group membership statistics.
-#: lib/profileaction.php:239 lib/profileaction.php:290
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:104
 msgid "Groups"
 msgstr "Grupos"
 
 #. TRANS: Label for user statistics.
 #. TRANS: Average count of posts made per day since account registration.
-#: lib/profileaction.php:253
 msgid "Daily average"
 msgstr "Media diaria"
 
 #. TRANS: Text for user group membership statistics if user has more subscriptions than displayed.
-#: lib/profileaction.php:305
 msgid "All groups"
 msgstr "Todos os grupos"
 
 #. TRANS: Server error displayed when using an unimplemented method.
-#: lib/profileformaction.php:123
 msgid "Unimplemented method."
 msgstr "Aínda non se implantou o método."
 
-#: lib/publicgroupnav.php:82
 msgid "User groups"
 msgstr "Grupos do usuario"
 
-#: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
 msgid "Recent tags"
 msgstr "Últimas etiquetas"
 
-#: lib/publicgroupnav.php:88
 msgid "Featured"
 msgstr "Salientadas"
 
-#: lib/publicgroupnav.php:92
 msgid "Popular"
 msgstr "Populares"
 
-#: lib/redirectingaction.php:95
 msgid "No return-to arguments."
 msgstr "Sen argumentos \"return-to\"."
 
-#: lib/repeatform.php:107
 msgid "Repeat this notice?"
 msgstr "Quere repetir esta nota?"
 
-#: lib/repeatform.php:132
 msgid "Yes"
 msgstr "Si"
 
-#: lib/repeatform.php:132
 msgid "Repeat this notice"
 msgstr "Repetir esta nota"
 
-#: lib/revokeroleform.php:91
 #, php-format
 msgid "Revoke the \"%s\" role from this user"
 msgstr "Revogarlle o rol \"%s\" a este usuario"
 
 #. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:1001
 #, fuzzy
 msgid "Page not found."
 msgstr "Non se atopou o método da API."
 
-#: lib/sandboxform.php:67
 msgid "Sandbox"
 msgstr "Illar"
 
-#: lib/sandboxform.php:78
 msgid "Sandbox this user"
 msgstr "Illar a este usuario"
 
 #. TRANS: Fieldset legend for the search form.
-#: lib/searchaction.php:120
 msgid "Search site"
 msgstr "Buscar no sitio"
 
 #. TRANS: Used as a field label for the field where one or more keywords
 #. TRANS: for searching can be entered.
-#: lib/searchaction.php:128
 msgid "Keyword(s)"
 msgstr "Termos de busca"
 
 #. TRANS: Button text for searching site.
-#: lib/searchaction.php:130
 msgctxt "BUTTON"
 msgid "Search"
 msgstr "Procurar"
 
-#: lib/searchgroupnav.php:80
 msgid "People"
 msgstr "Xente"
 
-#: lib/searchgroupnav.php:81
 msgid "Find people on this site"
 msgstr "Atopar xente neste sitio"
 
-#: lib/searchgroupnav.php:83
 msgid "Find content of notices"
 msgstr "Buscar nos contidos das notas"
 
-#: lib/searchgroupnav.php:85
 msgid "Find groups on this site"
 msgstr "Buscar grupos neste sitio"
 
-#: lib/section.php:89
 msgid "Untitled section"
 msgstr "Sección sen título"
 
-#: lib/section.php:106
 msgid "More..."
 msgstr "Máis..."
 
-#: lib/settingsnav.php:78
 msgid "Change your profile settings"
 msgstr "Cambie a configuración do seu perfil"
 
-#: lib/settingsnav.php:83
 msgid "Upload an avatar"
 msgstr "Cargue un avatar"
 
-#: lib/settingsnav.php:88
 msgid "Change your password"
 msgstr "Cambie o seu contrasinal"
 
-#: lib/settingsnav.php:93
 msgid "Change email handling"
 msgstr "Cambie a xestión do correo electrónico"
 
-#: lib/settingsnav.php:98
 msgid "Design your profile"
 msgstr "Deseñe o seu perfil"
 
-#: lib/settingsnav.php:102
 msgid "URL"
 msgstr "URL"
 
-#: lib/settingsnav.php:103
 msgid "URL shorteners"
 msgstr ""
 
-#: lib/settingsnav.php:111
 msgid "Updates by instant messenger (IM)"
 msgstr "Actualizacións por mensaxería instantánea (MI)"
 
-#: lib/settingsnav.php:118
 msgid "Updates by SMS"
 msgstr "Actualizacións por SMS"
 
-#: lib/settingsnav.php:123
-#, fuzzy
 msgid "Connections"
 msgstr "Conexións"
 
-#: lib/settingsnav.php:124
 msgid "Authorized connected applications"
 msgstr "Aplicacións conectadas autorizadas"
 
-#: lib/silenceform.php:67
 msgid "Silence"
 msgstr "Silenciar"
 
-#: lib/silenceform.php:78
 msgid "Silence this user"
 msgstr "Silenciar a este usuario"
 
-#: lib/subgroupnav.php:89
 #, php-format
 msgid "People %s subscribes to"
 msgstr "Persoas ás que está subscrito %s"
 
-#: lib/subgroupnav.php:97
 #, php-format
 msgid "People subscribed to %s"
 msgstr "Persoas subscritas a %s"
 
-#: lib/subgroupnav.php:105
 #, php-format
 msgid "Groups %s is a member of"
 msgstr "Grupos aos que pertence %s"
 
-#: lib/subgroupnav.php:111
 msgid "Invite"
 msgstr "Convidar"
 
-#: lib/subgroupnav.php:112
 #, php-format
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Convide a amigos e compañeiros a unírselle en %s"
 
-#: lib/subscribeform.php:115 lib/subscribeform.php:139
 msgid "Subscribe to this user"
 msgstr "Subscribirse a este usuario"
 
-#: lib/subscriberspeopleselftagcloudsection.php:48
-#: lib/subscriptionspeopleselftagcloudsection.php:48
 msgid "People Tagcloud as self-tagged"
 msgstr "Nube de etiquetas que as persoas se puxeron a si mesmas"
 
-#: lib/subscriberspeopletagcloudsection.php:48
-#: lib/subscriptionspeopletagcloudsection.php:48
 msgid "People Tagcloud as tagged"
 msgstr "Nube de etiquetas que lle puxo a outras persoas"
 
-#: lib/tagcloudsection.php:56
 msgid "None"
 msgstr "Ningún"
 
 #. TRANS: Server exception displayed if a theme name was invalid.
-#: lib/theme.php:74
 #, fuzzy
 msgid "Invalid theme name."
 msgstr "Nome de ficheiro incorrecto."
 
-#: lib/themeuploader.php:50
 msgid "This server cannot handle theme uploads without ZIP support."
 msgstr ""
 "O servidor non pode xestionar as cargas de temas visuais sen soporte para o "
 "formato ZIP."
 
-#: lib/themeuploader.php:58 lib/themeuploader.php:61
 msgid "The theme file is missing or the upload failed."
 msgstr "O ficheiro do tema visual non existe ou a subida fallou."
 
-#: lib/themeuploader.php:91 lib/themeuploader.php:102
-#: lib/themeuploader.php:279 lib/themeuploader.php:283
-#: lib/themeuploader.php:291 lib/themeuploader.php:298
 msgid "Failed saving theme."
 msgstr "Non se puido gardar o tema visual."
 
-#: lib/themeuploader.php:147
 msgid "Invalid theme: bad directory structure."
 msgstr "Tema visual inválido: a estrutura do directorio é incorrecta"
 
-#: lib/themeuploader.php:166
 #, fuzzy, php-format
 msgid "Uploaded theme is too large; must be less than %d byte uncompressed."
 msgid_plural ""
@@ -9762,11 +8117,9 @@ msgstr[1] ""
 "O tema visual cargado é grande de máis; o tamaño descomprimido non pode "
 "superar os %d bytes."
 
-#: lib/themeuploader.php:179
 msgid "Invalid theme archive: missing file css/display.css"
 msgstr "Arquivo de tema visual inválido: falta o ficheiro css/display.css"
 
-#: lib/themeuploader.php:219
 msgid ""
 "Theme contains invalid file or folder name. Stick with ASCII letters, "
 "digits, underscore, and minus sign."
@@ -9774,142 +8127,114 @@ msgstr ""
 "O tema visual contén un ficheiro inválido ou nome de cartafol incorrecto. "
 "Limíteo a letras ASCII, díxitos, barras baixas e signos menos."
 
-#: lib/themeuploader.php:225
 msgid "Theme contains unsafe file extension names; may be unsafe."
 msgstr "O tema visual contén nomes de extensión inseguros."
 
-#: lib/themeuploader.php:242
 #, php-format
 msgid "Theme contains file of type '.%s', which is not allowed."
 msgstr "O tema visual contén o tipo de ficheiro \".%s\". Non está permitido."
 
-#: lib/themeuploader.php:260
 msgid "Error opening theme archive."
 msgstr "Houbo un erro ao abrir o arquivo do tema visual."
 
-#: lib/threadednoticelist.php:270
-#, php-format
-msgid "Show all %d comment"
-msgid_plural "Show all %d comments"
-msgstr[0] ""
-msgstr[1] ""
+#, fuzzy, php-format
+msgid "Show %d reply"
+msgid_plural "Show all %d replies"
+msgstr[0] "Mostrar máis"
+msgstr[1] "Mostrar máis"
 
-#: lib/topposterssection.php:74
 msgid "Top posters"
 msgstr "Os que máis publican"
 
 #. TRANS: Title for the form to unblock a user.
-#: lib/unblockform.php:67
 #, fuzzy
 msgctxt "TITLE"
 msgid "Unblock"
 msgstr "Desbloquear"
 
-#: lib/unsandboxform.php:69
 msgid "Unsandbox"
 msgstr "Deixar de illar"
 
-#: lib/unsandboxform.php:80
 msgid "Unsandbox this user"
 msgstr "Deixar de illar a este usuario"
 
-#: lib/unsilenceform.php:67
 msgid "Unsilence"
 msgstr "Dar voz"
 
-#: lib/unsilenceform.php:78
 msgid "Unsilence this user"
 msgstr "Darlle voz a este usuario"
 
-#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
 msgid "Unsubscribe from this user"
 msgstr "Cancelar a subscrición a este usuario"
 
-#: lib/unsubscribeform.php:137
 msgid "Unsubscribe"
 msgstr "Cancelar a subscrición"
 
 #. 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).
-#: lib/usernoprofileexception.php:60
 #, php-format
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "O usuario %1$s (%2$d) non ten perfil."
 
-#: lib/userprofile.php:116
 msgid "Edit Avatar"
 msgstr "Modificar o avatar"
 
 #. TRANS: H2 for user actions in a profile.
 #. TRANS: H2 for entity actions in a profile.
-#: lib/userprofile.php:216 lib/userprofile.php:232
 msgid "User actions"
 msgstr "Accións do usuario"
 
 #. TRANS: Text shown in user profile of not yet compeltely deleted users.
-#: lib/userprofile.php:220
 msgid "User deletion in progress..."
 msgstr "Procedendo a borrar o usuario..."
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:248
 msgid "Edit profile settings"
 msgstr "Modificar a configuración do perfil"
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:250
 msgid "Edit"
 msgstr "Modificar"
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:274
 msgid "Send a direct message to this user"
 msgstr "Enviarlle unha mensaxe directa a este usuario"
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:276
 msgid "Message"
 msgstr "Mensaxe"
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:318
 msgid "Moderate"
 msgstr "Moderar"
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:357
 msgid "User role"
 msgstr "Rol do usuario"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:360
 msgctxt "role"
 msgid "Administrator"
 msgstr "Administrador"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:362
 msgctxt "role"
 msgid "Moderator"
 msgstr "Moderador"
 
-#: lib/util.php:321
 #, fuzzy
 msgid "Not allowed to log in."
 msgstr "Non iniciou sesión."
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1337
 msgid "a few seconds ago"
 msgstr "hai uns segundos"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1340
 msgid "about a minute ago"
 msgstr "hai como un minuto"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1344
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
@@ -9917,12 +8242,10 @@ msgstr[0] "hai un minuto"
 msgstr[1] "hai %d minutos"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1347
 msgid "about an hour ago"
 msgstr "hai como unha hora"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1351
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
@@ -9930,12 +8253,10 @@ msgstr[0] "hai unha hora"
 msgstr[1] "hai %d horas"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1354
 msgid "about a day ago"
 msgstr "hai como un día"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1358
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
@@ -9943,12 +8264,10 @@ msgstr[0] "hai un día"
 msgstr[1] "hai %d días"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1361
 msgid "about a month ago"
 msgstr "hai como un mes"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1365
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
@@ -9956,210 +8275,42 @@ msgstr[0] "hai un mes"
 msgstr[1] "hai %d meses"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1368
 msgid "about a year ago"
 msgstr "hai como un ano"
 
 #. TRANS: Web color exception thrown when a hexadecimal color code does not validate.
 #. TRANS: %s is the provided (invalid) color code.
-#: lib/webcolor.php:81 lib/webcolor.php:121
 #, fuzzy, php-format
 msgid "%s is not a valid color! Use 3 or 6 hex characters."
 msgstr "%s non é unha cor correcta! Use 3 ou 6 caracteres hexadecimais."
 
 #. TRANS: Exception.
-#: lib/xrd.php:63
 #, fuzzy
 msgid "Invalid XML."
 msgstr "Tamaño non válido."
 
 #. TRANS: Exception.
-#: lib/xrd.php:68
 msgid "Invalid XML, missing XRD root."
 msgstr ""
 
 #. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
-#: scripts/restoreuser.php:62
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
 
-#, fuzzy
-#~ msgid "Could not generate feed for group - %s"
-#~ msgstr "Non se puido actualizar o grupo."
+#~ msgid "Full name is too long (max 255 chars)."
+#~ msgstr "O nome completo é longo de máis (o máximo son 255 caracteres)."
+
+#~ msgid "description is too long (max %d chars)."
+#~ msgstr "a descrición é longa de máis (o límite é de %d caracteres)."
+
+#~ msgid "Location is too long (max 255 chars)."
+#~ msgstr "A localidade é longa de máis (o máximo son 255 caracteres)."
+
+#~ msgid "Too many aliases! Maximum %d."
+#~ msgstr "Demasiados pseudónimos! O número máximo é %d."
 
 #, fuzzy
-#~ msgid "Current confirmed Jabber/Google Talk address."
-#~ msgstr "Enderezo de Jabber/GTalk confirmado actualmente."
-
-#, fuzzy
-#~ msgid ""
-#~ "Jabber or Google Talk address, like \"UserName@example.org\". First, make "
-#~ "sure to add %s to your buddy list in your IM client or on Google Talk."
-#~ msgstr ""
-#~ "Enderezo de Jabber ou GTalk, coma \"nomedeusuario@example.org\". "
-#~ "Asegúrese primeiro de engadir a %s á súa lista de amigos no seu cliente "
-#~ "de mensaxería instantánea ou en GTalk."
-
-#, fuzzy
-#~ msgid "Send me notices through Jabber/Google Talk."
-#~ msgstr "Enviádeme as notas mediante Jabber ou GTalk."
-
-#, fuzzy
-#~ msgid "Publish a MicroID for my Jabber/Google Talk address."
-#~ msgstr "Publicar unha MicroID para o meu enderezo de Jabber ou GTalk."
-
-#~ msgid "No Jabber ID."
-#~ msgstr "Non existe ningunha ID de Jabber."
-
-#, fuzzy
-#~ msgid "Not a valid Jabber ID."
-#~ msgstr "A ID de Jabber non é correcta"
-
-#~ msgid "That is already your Jabber ID."
-#~ msgstr "Esa xa é a súa ID de Jabber."
-
-#~ msgid "That is not your Jabber ID."
-#~ msgstr "Esa ID de Jabber non é súa."
-
-#~ msgid "Other settings"
-#~ msgstr "Outras opcións"
-
-#~ msgid "Tag cloud"
-#~ msgstr "Nube de etiquetas"
-
-#~ msgid "Consumer key"
-#~ msgstr "Clave do consumidor"
-
-#~ msgid "Consumer secret"
-#~ msgstr "Pregunta secreta do consumidor"
-
-#~ msgid "Request token URL"
-#~ msgstr "Solicitar un URL de pase"
-
-#~ msgid "Access token URL"
-#~ msgstr "Acceder ao URL do pase"
-
-#~ msgid "Authorize URL"
-#~ msgstr "Autorizar o URL"
-
-#~ msgid "Jabber"
-#~ msgstr "Jabber"
-
-#~ msgid "Photo"
-#~ msgstr "Fotografía"
-
-#~ msgid "Other options"
-#~ msgstr "Outras opcións"
-
-#~ msgid "Other"
-#~ msgstr "Outros"
-
-#~ msgid "Primary site navigation"
-#~ msgstr "Navegación principal do sitio"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Personal profile and friends timeline"
-#~ msgstr "Liña do tempo do perfil persoal e os amigos"
-
-#~ msgctxt "MENU"
-#~ msgid "Personal"
-#~ msgstr "Persoal"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Change your email, avatar, password, profile"
-#~ msgstr "Cambie o seu correo electrónico, avatar, contrasinal ou perfil"
-
-#~ msgid "Account"
-#~ msgstr "Conta"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Connect to services"
-#~ msgstr "Conectarse aos servizos"
-
-#~ msgid "Connect"
-#~ msgstr "Conectarse"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Change site configuration"
-#~ msgstr "Cambiar a configuración do sitio"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Invite friends and colleagues to join you on %s"
-#~ msgstr "Convide a amigos e compañeiros a unírselle en %s"
-
-#~ msgctxt "MENU"
-#~ msgid "Invite"
-#~ msgstr "Convidar"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Create an account"
-#~ msgstr "Crear unha conta"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Help me!"
-#~ msgstr "Axuda!"
-
-#~ msgctxt "MENU"
-#~ msgid "Help"
-#~ msgstr "Axuda"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Search for people or text"
-#~ msgstr "Buscar persoas ou palabras"
-
-#~ msgid "Local views"
-#~ msgstr "Vistas locais"
-
-#~ msgid "Page notice"
-#~ msgstr "Nota da páxina"
-
-#~ msgid "Secondary site navigation"
-#~ msgstr "Navegación secundaria do sitio"
-
-#~ msgid "StatusNet software license"
-#~ msgstr "Licenza do software StatusNet"
-
-#~ msgid "Site content license"
-#~ msgstr "Licenza dos contidos do sitio"
-
-#~ msgid "Pagination"
-#~ msgstr "Paxinación"
-
-#~ msgid "Author"
-#~ msgstr "Autor"
-
-#~ msgid "Provider"
-#~ msgstr "Provedor"
-
-#, fuzzy
-#~ msgctxt "MENU"
-#~ msgid "SMS"
-#~ msgstr "SMS"
-
-#~ msgid "Filter tags"
-#~ msgstr "Filtrar as etiquetas"
-
-#~ msgid "[%s]"
-#~ msgstr "[%s]"
-
-#~ msgid "Available characters"
-#~ msgstr "Caracteres dispoñibles"
-
-#, fuzzy
-#~ msgctxt "MENU"
-#~ msgid "Profile"
-#~ msgstr "Perfil"
-
-#~ msgid "Search help"
-#~ msgstr "Buscar na axuda"
-
-#, fuzzy
-#~ msgid "Message too long. Maximum is %1$d character, you sent %2$d."
-#~ msgid_plural "Message too long. Maximum is %1$d characters, you sent %2$d."
-#~ msgstr[0] ""
-#~ "A mensaxe é longa de máis, o límite de caracteres é de %1$d, e enviou %2"
-#~ "$d."
-#~ msgstr[1] ""
-#~ "A mensaxe é longa de máis, o límite de caracteres é de %1$d, e enviou %2"
-#~ "$d."
+#~ msgctxt "BUTTON"
+#~ msgid "Comment"
+#~ msgstr "Contido"
diff --git a/locale/hsb/LC_MESSAGES/statusnet.po b/locale/hsb/LC_MESSAGES/statusnet.po
index a997da4039..da7a95e7ed 100644
--- a/locale/hsb/LC_MESSAGES/statusnet.po
+++ b/locale/hsb/LC_MESSAGES/statusnet.po
@@ -11,68 +11,58 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:23+0000\n"
-"PO-Revision-Date: 2011-03-03 17:26:04+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:22+0000\n"
 "Language-Team: Upper Sorbian <http://translatewiki.net/wiki/Portal:hsb>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: hsb\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : (n%100==3 || "
 "n%100==4) ? 2 : 3)\n"
-"X-POT-Import-Date: 2011-02-25 23:49:23+0000\n"
+"X-POT-Import-Date: 2011-03-03 17:59:19+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
-#: actions/accessadminpanel.php:53 lib/adminpanelaction.php:363
 msgid "Access"
 msgstr "Přistup"
 
 #. TRANS: Page notice.
-#: actions/accessadminpanel.php:64
 msgid "Site access settings"
 msgstr "Nastajenja za sydłowy přistup"
 
 #. TRANS: Form legend for registration form.
-#: actions/accessadminpanel.php:151
 msgid "Registration"
 msgstr "Registrowanje"
 
 #. TRANS: Checkbox instructions for admin setting "Private".
-#: actions/accessadminpanel.php:155
 msgid "Prohibit anonymous users (not logged in) from viewing site?"
 msgstr "Anonymnym wužiwarjam (njepřizjewjenym) wobhladowanje sydła zakazć?"
 
 #. TRANS: Checkbox label for prohibiting anonymous users from viewing site.
-#: actions/accessadminpanel.php:157
 msgctxt "LABEL"
 msgid "Private"
 msgstr "Priwatny"
 
 #. TRANS: Checkbox instructions for admin setting "Invite only".
-#: actions/accessadminpanel.php:164
 msgid "Make registration invitation only."
 msgstr "Registrowanje jenož po přeprošenju móžno."
 
 #. TRANS: Checkbox label for configuring site as invite only.
-#: actions/accessadminpanel.php:166
 msgid "Invite only"
 msgstr "Jenož přeprosyć"
 
 #. TRANS: Checkbox instructions for admin setting "Closed" (no new registrations).
-#: actions/accessadminpanel.php:173
 msgid "Disable new registrations."
 msgstr "Nowe registrowanja znjemóžnić."
 
 #. TRANS: Checkbox label for disabling new user registrations.
-#: actions/accessadminpanel.php:175
 msgid "Closed"
 msgstr "Začinjeny"
 
 #. TRANS: Title for button to save access settings in site admin panel.
-#: actions/accessadminpanel.php:191
 msgid "Save access settings"
 msgstr "Přistupne nastajenja składować"
 
@@ -80,6 +70,7 @@ msgstr "Přistupne nastajenja składować"
 #. TRANS: Button text for saving theme settings.
 #. TRANS: Button label to save e-mail preferences.
 #. TRANS: Button label to save IM preferences.
+#. TRANS: Button text in the license admin panel.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
 #. TRANS: Button text for saving site notice in admin panel.
@@ -89,21 +80,12 @@ msgstr "Přistupne nastajenja składować"
 #. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
 #. TRANS: Button text on profile design page to save settings.
-#: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
-#: actions/emailsettings.php:251 actions/imsettings.php:199
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:198
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:204
-#: actions/subscriptions.php:261 actions/urlsettings.php:152
-#: actions/useradminpanel.php:298 lib/applicationeditform.php:355
-#: lib/designform.php:320 lib/groupeditform.php:201
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Składować"
 
 #. TRANS: Server error when page not found (404).
 #. TRANS: Server error when page not found (404)
-#: actions/all.php:68 actions/public.php:98 actions/replies.php:93
-#: actions/showfavorites.php:140 actions/tag.php:52
 msgid "No such page."
 msgstr "Strona njeeksistuje."
 
@@ -122,6 +104,7 @@ msgstr "Strona njeeksistuje."
 #. TRANS: Client error displayed when checking group membership for a non-existing user.
 #. TRANS: Client error displayed when trying to have a non-existing user join a group.
 #. TRANS: Client error displayed when trying to have a non-existing user leave a group.
+#. TRANS: Client error displayed when not providing a user or an invalid user.
 #. TRANS: Client error displayed when updating a status for a non-existing user.
 #. TRANS: Client error displayed when requesting a list of followers for a non-existing user.
 #. TRANS: Client error displayed when requesting most recent favourite notices by a user for a non-existing user.
@@ -134,6 +117,8 @@ msgstr "Strona njeeksistuje."
 #. 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.
 #. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
@@ -141,33 +126,10 @@ msgstr "Strona njeeksistuje."
 #. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when calling a profile action without specifying a user.
-#: actions/all.php:80 actions/allrss.php:69
-#: actions/apiaccountupdatedeliverydevice.php:110
-#: actions/apiaccountupdateprofile.php:103
-#: actions/apiaccountupdateprofilebackgroundimage.php:118
-#: actions/apiaccountupdateprofileimage.php:104 actions/apiatomservice.php:59
-#: actions/apiblockcreate.php:96 actions/apiblockdestroy.php:94
-#: actions/apidirectmessage.php:75 actions/apidirectmessagenew.php:72
-#: actions/apigroupcreate.php:111 actions/apigroupismember.php:89
-#: actions/apigroupjoin.php:98 actions/apigroupleave.php:98
-#: actions/apigrouplist.php:70 actions/apigroupprofileupdate.php:108
-#: actions/apistatusesupdate.php:230 actions/apisubscriptions.php:85
-#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:173
-#: actions/apitimelinehome.php:78 actions/apitimelinementions.php:77
-#: actions/apitimelineuser.php:79 actions/avatarbynickname.php:79
-#: actions/favoritesrss.php:72 actions/foaf.php:42 actions/foaf.php:61
-#: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116
-#: actions/otp.php:78 actions/remotesubscribe.php:144
-#: actions/remotesubscribe.php:153 actions/replies.php:73
-#: actions/repliesrss.php:38 actions/rsd.php:113 actions/showfavorites.php:106
-#: actions/userbyid.php:75 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/userxrd.php:59 actions/xrds.php:71 lib/command.php:509
-#: lib/galleryaction.php:59 lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Wužiwar njeeksistuje"
 
 #. TRANS: Page title. %1$s is user nickname, %2$d is page number
-#: actions/all.php:91
 #, php-format
 msgid "%1$s and friends, page %2$d"
 msgstr "%1$s a přećeljo, strona %2$d"
@@ -176,33 +138,26 @@ msgstr "%1$s a přećeljo, strona %2$d"
 #. TRANS: H1 text for page. %s is a user nickname.
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Timeline title for user and friends. %s is a user nickname.
-#: actions/all.php:94 actions/all.php:191 actions/allrss.php:117
-#: actions/apitimelinefriends.php:207 actions/apitimelinehome.php:113
-#: lib/personalgroupnav.php:100
 #, php-format
 msgid "%s and friends"
 msgstr "%s a přećeljo"
 
 #. TRANS: %s is user nickname.
-#: actions/all.php:108
 #, php-format
 msgid "Feed for friends of %s (RSS 1.0)"
 msgstr "Kanal za přećelow wužiwarja %s (RSS 1.0)"
 
 #. TRANS: %s is user nickname.
-#: actions/all.php:117
 #, php-format
 msgid "Feed for friends of %s (RSS 2.0)"
 msgstr "Kanal za přećelow wužiwarja %s (RSS 2.0)"
 
 #. TRANS: %s is user nickname.
-#: actions/all.php:126
 #, php-format
 msgid "Feed for friends of %s (Atom)"
 msgstr "Kanal za přećelow wužiwarja %s (Atom)"
 
 #. TRANS: Empty list message. %s is a user nickname.
-#: actions/all.php:139
 #, php-format
 msgid ""
 "This is the timeline for %s and friends but no one has posted anything yet."
@@ -210,7 +165,6 @@ msgstr ""
 
 #. TRANS: Encouragement displayed on logged in user's empty timeline.
 #. TRANS: This message contains Markdown links. Keep "](" together.
-#: actions/all.php:146
 #, php-format
 msgid ""
 "Try subscribing to more people, [join a group](%%action.groups%%) or post "
@@ -219,7 +173,6 @@ msgstr ""
 
 #. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@".
 #. TRANS: This message contains Markdown links. Keep "](" together.
-#: actions/all.php:150
 #, php-format
 msgid ""
 "You can try to [nudge %1$s](../%2$s) from their profile or [post something "
@@ -230,7 +183,6 @@ msgstr ""
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
 #. TRANS: Second sentence of empty message for anonymous users. %s is a user nickname.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:221
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -238,14 +190,11 @@ msgid ""
 msgstr ""
 
 #. TRANS: H1 text for page when viewing a list for self.
-#: actions/all.php:188
 msgid "You and friends"
 msgstr "Ty a přećeljo"
 
 #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
 #. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name.
-#: actions/allrss.php:122 actions/apitimelinefriends.php:213
-#: actions/apitimelinehome.php:119
 #, php-format
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr "Aktualizacije wot %1$s a přećelow na %2$s!"
@@ -264,55 +213,20 @@ msgstr "Aktualizacije wot %1$s a přećelow na %2$s!"
 #. TRANS: Client error displayed trying to execute an unknown API method checking group membership.
 #. TRANS: Client error displayed trying to execute an unknown API method listing the latest 20 groups.
 #. TRANS: Client error displayed trying to execute an unknown API method showing group membership.
+#. TRANS: Client error displayed when using an unsupported API format.
 #. TRANS: Client error displayed trying to execute an unknown API method showing a group.
 #. TRANS: Client error displayed trying to execute an unknown API method testing API connectivity.
 #. TRANS: Client error displayed trying to execute an unknown API method deleting a status.
 #. TRANS: Client error displayed when trying to handle an unknown API method.
-#: actions/apiaccountratelimitstatus.php:69
-#: actions/apiaccountupdatedeliverydevice.php:92
-#: actions/apiaccountupdateprofile.php:94
-#: actions/apiaccountupdateprofilebackgroundimage.php:92
-#: actions/apiaccountupdateprofilecolors.php:115
-#: actions/apiaccountverifycredentials.php:68 actions/apidirectmessage.php:157
-#: actions/apifavoritecreate.php:98 actions/apifavoritedestroy.php:98
-#: actions/apifriendshipscreate.php:99 actions/apifriendshipsdestroy.php:99
-#: actions/apifriendshipsshow.php:124 actions/apigroupcreate.php:138
-#: actions/apigroupismember.php:115 actions/apigroupjoin.php:151
-#: actions/apigroupleave.php:141 actions/apigrouplist.php:134
-#: actions/apigrouplistall.php:120 actions/apigroupmembership.php:105
-#: actions/apigroupprofileupdate.php:100 actions/apigroupprofileupdate.php:213
-#: actions/apigroupshow.php:114 actions/apihelptest.php:84
-#: actions/apistatusesdestroy.php:101 actions/apistatusesretweets.php:110
-#: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:139
-#: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
-#: actions/apitimelinefavorites.php:182 actions/apitimelinefriends.php:276
-#: actions/apitimelinegroup.php:148 actions/apitimelinehome.php:181
-#: actions/apitimelinementions.php:182 actions/apitimelinepublic.php:247
-#: actions/apitimelineretweetedtome.php:147
-#: actions/apitimelineretweetsofme.php:147 actions/apitimelinetag.php:165
-#: actions/apitimelineuser.php:217 actions/apiusershow.php:100
 msgid "API method not found."
 msgstr "API-metoda njenamakana."
 
 #. 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.
-#: actions/apiaccountupdatedeliverydevice.php:83
-#: actions/apiaccountupdateprofile.php:85
-#: actions/apiaccountupdateprofilebackgroundimage.php:83
-#: actions/apiaccountupdateprofilecolors.php:106
-#: actions/apiaccountupdateprofileimage.php:80 actions/apiblockcreate.php:87
-#: actions/apiblockdestroy.php:85 actions/apidirectmessagenew.php:107
-#: actions/apifavoritecreate.php:88 actions/apifavoritedestroy.php:88
-#: actions/apifriendshipscreate.php:89 actions/apifriendshipsdestroy.php:89
-#: actions/apigroupcreate.php:102 actions/apigroupjoin.php:89
-#: actions/apigroupleave.php:89 actions/apigroupprofileupdate.php:92
-#: actions/apimediaupload.php:66 actions/apistatusesretweet.php:63
-#: actions/apistatusesupdate.php:194
 msgid "This method requires a POST."
 msgstr "Tuta metoda wužaduje sej POST."
 
 #. TRANS: Client error displayed when no valid device parameter is provided for a user's delivery device setting.
-#: actions/apiaccountupdatedeliverydevice.php:103
 msgid ""
 "You must specify a parameter named 'device' with a value of one of: sms, im, "
 "none."
@@ -327,10 +241,6 @@ msgstr ""
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
-#: actions/apiaccountupdatedeliverydevice.php:136
-#: actions/emailsettings.php:353 actions/emailsettings.php:499
-#: actions/profilesettings.php:323 actions/smssettings.php:300
-#: actions/smssettings.php:453 actions/urlsettings.php:211
 msgid "Could not update user."
 msgstr "Wužiwar njeje so dał aktualizować."
 
@@ -343,32 +253,17 @@ msgstr "Wužiwar njeje so dał aktualizować."
 #. TRANS: Server error displayed when requesting Friends of a Friend feed for a user for which the profile could not be found.
 #. TRANS: Server error displayed when trying to get a user hCard for a user without a profile.
 #. TRANS: Server error displayed when calling a profile action while the specified user does not have a profile.
-#: actions/apiaccountupdateprofile.php:111
-#: actions/apiaccountupdateprofilebackgroundimage.php:199
-#: actions/apiaccountupdateprofilecolors.php:183
-#: actions/apiaccountupdateprofileimage.php:131
-#: actions/apiuserprofileimage.php:88 actions/apiusershow.php:108
-#: actions/avatarbynickname.php:85 actions/foaf.php:69 actions/hcard.php:75
-#: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
-#: lib/profileaction.php:85
 msgid "User has no profile."
 msgstr "Wužiwar nima profil."
 
 #. TRANS: Server error displayed if a user profile could not be saved.
 #. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:419
 msgid "Could not save profile."
 msgstr "Profil njeje so składować dał."
 
 #. TRANS: Client error displayed when the number of bytes in a POST request exceeds a limit.
 #. TRANS: %s is the number of bytes of the CONTENT_LENGTH.
 #. TRANS: Form validation error in design settings form. POST should remain untranslated.
-#: actions/apiaccountupdateprofilebackgroundimage.php:108
-#: actions/apiaccountupdateprofileimage.php:95 actions/apimediaupload.php:81
-#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
-#: actions/designadminpanel.php:120 actions/editapplication.php:121
-#: actions/newapplication.php:102 actions/newnotice.php:95
-#: lib/designsettings.php:110
 #, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s byte) due to its "
@@ -386,26 +281,15 @@ msgstr[3] ""
 #. TRANS: Client error displayed when a database error occurs inserting profile colours.
 #. TRANS: Client error displayed when a database error occurs updating profile colours.
 #. TRANS: Form validation error displayed when group design settings could not be saved because of an application issue.
-#: actions/apiaccountupdateprofilebackgroundimage.php:138
-#: actions/apiaccountupdateprofilebackgroundimage.php:149
-#: actions/apiaccountupdateprofilecolors.php:160
-#: actions/apiaccountupdateprofilecolors.php:171
-#: actions/groupdesignsettings.php:285 actions/groupdesignsettings.php:296
-#: actions/userdesignsettings.php:218 actions/userdesignsettings.php:228
-#: actions/userdesignsettings.php:270 actions/userdesignsettings.php:280
 msgid "Unable to save your design settings."
 msgstr "Njeje móžno, designowe nastajenja składować."
 
 #. TRANS: Error displayed when updating design settings fails.
 #. TRANS: Client error displayed when a database error occurs updating profile colours.
-#: actions/apiaccountupdateprofilebackgroundimage.php:191
-#: actions/apiaccountupdateprofilecolors.php:139
-#: actions/userdesignsettings.php:196
 msgid "Could not update your design."
 msgstr "Design njeda so aktualizować."
 
 #. TRANS: Title for Atom feed.
-#: actions/apiatomservice.php:85
 msgctxt "ATOM"
 msgid "Main"
 msgstr "Hłowny"
@@ -414,9 +298,6 @@ msgstr "Hłowny"
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Title in atom group notice feed. %s is a group name.
 #. TRANS: Title in atom user notice feed. %s is a user name.
-#: actions/apiatomservice.php:93 actions/grouprss.php:138
-#: actions/userrss.php:94 lib/atomgroupnoticefeed.php:63
-#: lib/atomusernoticefeed.php:88
 #, php-format
 msgid "%s timeline"
 msgstr ""
@@ -426,8 +307,6 @@ msgstr ""
 #. TRANS: %s is a user nickname.
 #. TRANS: Header for subscriptions overview for a user (first page).
 #. TRANS: %s is a user nickname.
-#: actions/apiatomservice.php:104 actions/atompubsubscriptionfeed.php:148
-#: actions/subscriptions.php:51
 #, php-format
 msgid "%s subscriptions"
 msgstr "%s abonementow"
@@ -435,58 +314,48 @@ msgstr "%s abonementow"
 #. TRANS: Title for Atom feed with a user's favorite notices. %s is a user nickname.
 #. TRANS: Title for Atom favorites feed.
 #. TRANS: %s is a user nickname.
-#: actions/apiatomservice.php:115 actions/atompubfavoritefeed.php:142
 #, php-format
 msgid "%s favorites"
 msgstr "%s faworitow"
 
 #. TRANS: Title for Atom feed with a user's memberships. %s is a user nickname.
-#: actions/apiatomservice.php:126
 #, php-format
 msgid "%s memberships"
 msgstr "%s čłonstwow"
 
 #. TRANS: Client error displayed when users try to block themselves.
-#: actions/apiblockcreate.php:105
 msgid "You cannot block yourself!"
 msgstr "Njemóžeš so samoho blokować."
 
 #. TRANS: Server error displayed when blocking a user has failed.
-#: actions/apiblockcreate.php:127
 msgid "Block user failed."
 msgstr "Blokowanje wužiwarja je so njeporadźiło."
 
 #. TRANS: Server error displayed when unblocking a user has failed.
-#: actions/apiblockdestroy.php:113
 msgid "Unblock user failed."
 msgstr "Wotblokowanje wužiwarja je so njeporadźiło."
 
 #. TRANS: Title. %s is a user nickname.
-#: actions/apidirectmessage.php:88
 #, php-format
 msgid "Direct messages from %s"
 msgstr "Direktne powěsće z %s"
 
 #. TRANS: Subtitle. %s is a user nickname.
-#: actions/apidirectmessage.php:93
 #, php-format
 msgid "All the direct messages sent from %s"
 msgstr "Wšě z %s pósłane direktne powěsće"
 
 #. TRANS: Title. %s is a user nickname.
-#: actions/apidirectmessage.php:102
 #, php-format
 msgid "Direct messages to %s"
 msgstr "Direktne powěsće do %s"
 
 #. TRANS: Subtitle. %s is a user nickname.
-#: actions/apidirectmessage.php:107
 #, php-format
 msgid "All the direct messages sent to %s"
 msgstr "Wšě do %s pósłane direktne powěsće"
 
 #. TRANS: Client error displayed when no message text was submitted (406).
-#: actions/apidirectmessagenew.php:117
 msgid "No message text!"
 msgstr "Žadyn powěsćowy tekst!"
 
@@ -494,7 +363,6 @@ msgstr "Žadyn powěsćowy tekst!"
 #. TRANS: %d is the maximum number of characters for a message.
 #. TRANS: Form validation error displayed when message content is too long.
 #. TRANS: %d is the maximum number of characters for a message.
-#: actions/apidirectmessagenew.php:127 actions/newmessage.php:152
 #, php-format
 msgid "That's too long. Maximum message size is %d character."
 msgid_plural "That's too long. Maximum message size is %d characters."
@@ -504,19 +372,16 @@ msgstr[2] "To je předołho. Maksimalna powěsćowa wulkosć je %d znamješka."
 msgstr[3] "To je předołho. Maksimalna powěsćowa wulkosć je %d znamješkow."
 
 #. TRANS: Client error displayed if a recipient user could not be found (403).
-#: actions/apidirectmessagenew.php:139
 msgid "Recipient user not found."
 msgstr "Přijimowar njenamakany."
 
 #. TRANS: Client error displayed trying to direct message another user who's not a friend (403).
-#: actions/apidirectmessagenew.php:144
 msgid "Cannot send direct messages to users who aren't your friend."
 msgstr ""
 "Njeje móžno, direktne powěsće wužiwarjam pósłać, kotřiž twoji přećeljo "
 "njejsu."
 
 #. TRANS: Client error displayed trying to direct message self (403).
-#: actions/apidirectmessagenew.php:154
 msgid ""
 "Do not send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
@@ -524,116 +389,96 @@ 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.
 #. TRANS: Client error displayed trying to delete a status with an invalid ID.
-#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:108
-#: actions/apistatusesdestroy.php:121
 msgid "No status found with that ID."
 msgstr "Status z tym ID njenamakany."
 
 #. TRANS: Client error displayed when trying to mark a notice favourite that already is a favourite.
-#: actions/apifavoritecreate.php:120
 msgid "This status is already a favorite."
 msgstr "Tutón status je hižo faworit."
 
 #. TRANS: Client error displayed when marking a notice as favourite fails.
 #. TRANS: Server error displayed when trying to mark a notice as favorite fails in the database.
 #. TRANS: Error message text shown when a favorite could not be set.
-#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:306
 msgid "Could not create favorite."
 msgstr "Faworit njeda so wutworić."
 
 #. TRANS: Client error displayed when trying to remove a favourite that was not a favourite.
-#: actions/apifavoritedestroy.php:122
 msgid "That status is not a favorite."
 msgstr "Tón status faworit njeje."
 
 #. TRANS: Client error displayed when removing a favourite has failed.
 #. TRANS: Server error displayed when removing a favorite from the database fails.
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:90
 msgid "Could not delete favorite."
 msgstr "Faworit njeda so zhašeć."
 
 #. TRANS: Client error displayed when trying follow who's profile could not be found.
-#: actions/apifriendshipscreate.php:109
 msgid "Could not follow user: profile not found."
 msgstr "Njebě móžno wužiwarja słědować: profil njenamakany."
 
 #. TRANS: Client error displayed when trying to follow a user that's already being followed.
 #. TRANS: %s is the nickname of the user that is already being followed.
-#: actions/apifriendshipscreate.php:120
 #, php-format
 msgid "Could not follow user: %s is already on your list."
 msgstr "Njebě móžno wužiwarja słědować: %s je hižo na twojej lisćinje."
 
 #. TRANS: Client error displayed when trying to unfollow a user that cannot be found.
-#: actions/apifriendshipsdestroy.php:109
 msgid "Could not unfollow user: User not found."
 msgstr "Njebě móžno slědowanje wužiwarja kónčić: wužiwar njenamakany."
 
 #. TRANS: Client error displayed when trying to unfollow self.
-#: actions/apifriendshipsdestroy.php:121
 msgid "You cannot unfollow yourself."
 msgstr "Njemóžeš slědowanje swójskich aktiwitow blokować."
 
 #. TRANS: Client error displayed when supplying invalid parameters to an API call checking if a friendship exists.
-#: actions/apifriendshipsexists.php:88
 msgid "Two valid IDs or nick names must be supplied."
 msgstr "Dyrbitej so dwaj płaćiwej wužiwarskej ID abo wpřimjenje podać."
 
 #. TRANS: Client error displayed when a source user could not be determined showing friendship.
-#: actions/apifriendshipsshow.php:131
 msgid "Could not determine source user."
 msgstr "Žórłowy wužiwar njeda so postajić."
 
 #. TRANS: Client error displayed when a target user could not be determined showing friendship.
-#: actions/apifriendshipsshow.php:140
 msgid "Could not find target user."
 msgstr "Cilowy wužiwar njeda so namakać."
 
 #. TRANS: Client error trying to create a group with a nickname this is already in use.
+#. TRANS: API validation exception thrown when nickname is already used.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:156 actions/apigroupprofileupdate.php:255
-#: actions/editgroup.php:191 actions/newgroup.php:137
-#: actions/profilesettings.php:274 actions/register.php:199
 msgid "Nickname already in use. Try another one."
 msgstr "Přimjeno so hižo wužiwa. Spytaj druhe."
 
 #. TRANS: Client error in form for group creation.
+#. TRANS: API validation exception thrown when nickname does not validate.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:164 actions/apigroupprofileupdate.php:259
-#: actions/editgroup.php:195 actions/newgroup.php:141
-#: actions/profilesettings.php:244 actions/register.php:201
 msgid "Not a valid nickname."
 msgstr "Žane płaćiwe přimjeno."
 
 #. TRANS: Client error in form for group creation.
+#. TRANS: API validation exception thrown when homepage URL does not validate.
 #. TRANS: Validation error shown when providing an invalid homepage URL in the "Edit application" form.
 #. TRANS: Group edit form validation error.
 #. TRANS: Validation error shown when providing an invalid homepage URL in the "New application" form.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:181 actions/apigroupprofileupdate.php:277
-#: actions/editapplication.php:235 actions/editgroup.php:202
-#: actions/newapplication.php:221 actions/newgroup.php:148
-#: actions/profilesettings.php:249 actions/register.php:208
 msgid "Homepage is not a valid URL."
 msgstr "Startowa strona njeje płaćiwy URL."
 
 #. TRANS: Client error in form for group creation.
+#. TRANS: API validation exception thrown when full name does not validate.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:191 actions/editgroup.php:206
-#: actions/newgroup.php:152 actions/profilesettings.php:253
-#: actions/register.php:211
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "Dospołne mjeno je předołho (maks. 255 znamješkow)."
 
 #. TRANS: Client error shown when providing too long a description during group creation.
 #. TRANS: %d is the maximum number of allowed characters.
+#. TRANS: API validation exception thrown when description does not validate.
+#. TRANS: %d is the maximum description length and used for plural.
 #. TRANS: Validation error shown when providing too long a description in the "Edit application" form.
 #. TRANS: %d is the maximum number of allowed characters.
 #. TRANS: Group edit form validation error.
@@ -641,9 +486,6 @@ msgstr "Dospołne mjeno je předołho (maks. 255 znamješkow)."
 #. TRANS: %d is the maximum number of characters for the description.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed characters.
-#: actions/apigroupcreate.php:201 actions/editapplication.php:202
-#: actions/editgroup.php:211 actions/newapplication.php:182
-#: actions/newgroup.php:157
 #, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."
@@ -653,23 +495,21 @@ msgstr[2] "Wopisanje je předołho (maks. %d znamješka)."
 msgstr[3] "Wopisanje je předołho (maks. %d znamješkow)."
 
 #. TRANS: Client error shown when providing too long a location during group creation.
+#. TRANS: API validation exception thrown when location does not validate.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:215 actions/editgroup.php:218
-#: actions/newgroup.php:164 actions/profilesettings.php:266
-#: actions/register.php:220
 msgid "Location is too long (maximum 255 characters)."
 msgstr "Městno je předołho (maks. 255 znamješkow)."
 
 #. TRANS: Client error shown when providing too many aliases during group creation.
 #. TRANS: %d is the maximum number of allowed aliases.
+#. TRANS: API validation exception thrown when aliases do not validate.
+#. TRANS: %d is the maximum number of aliases and used for plural.
 #. TRANS: Group edit form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.
-#: actions/apigroupcreate.php:236 actions/editgroup.php:231
-#: actions/newgroup.php:177
 #, php-format
 msgid "Too many aliases! Maximum %d allowed."
 msgid_plural "Too many aliases! Maximum %d allowed."
@@ -680,25 +520,24 @@ msgstr[3] "Přewjele aliasow! Maks. %d dowolenych."
 
 #. TRANS: Client error shown when providing an invalid alias during group creation.
 #. TRANS: %s is the invalid alias.
-#: actions/apigroupcreate.php:253
+#. TRANS: API validation exception thrown when aliases does not validate.
+#. TRANS: %s is the invalid alias.
 #, php-format
 msgid "Invalid alias: \"%s\"."
 msgstr "Njepłaćiwy alias: \"%s\"."
 
 #. TRANS: Client error displayed when trying to use an alias during group creation that is already in use.
 #. TRANS: %s is the alias that is already in use.
+#. TRANS: API validation exception thrown when aliases is already used.
+#. TRANS: %s is the already used alias.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error. %s is the already used alias.
-#: actions/apigroupcreate.php:264 actions/apigroupprofileupdate.php:351
-#: actions/editgroup.php:246 actions/newgroup.php:193
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "Alias \"%s\" so hižo wužiwa. Spytaj druhi."
 
 #. TRANS: Client error displayed when trying to use an alias during group creation that is the same as the group's nickname.
 #. TRANS: Group edit form validation error.
-#: actions/apigroupcreate.php:278 actions/apigroupprofileupdate.php:359
-#: actions/editgroup.php:253
 msgid "Alias can't be the same as nickname."
 msgstr "Alias njemóže samsny kaž přimjeno być."
 
@@ -706,26 +545,21 @@ msgstr "Alias njemóže samsny kaž přimjeno być."
 #. TRANS: Client error displayed when trying to join a group that does not exist.
 #. TRANS: Client error displayed when trying to leave a group that does not exist.
 #. TRANS: Client error displayed trying to show group membership on a non-existing group.
+#. TRANS: Client error displayed when not providing a group or an invalid group.
 #. TRANS: Client error displayed when trying to show a group that could not be found.
 #. TRANS: Client error displayed requesting most recent notices to a group for a non-existing group.
-#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
-#: actions/apigroupleave.php:104 actions/apigroupmembership.php:71
-#: actions/apigroupprofileupdate.php:113 actions/apigroupshow.php:81
-#: actions/apitimelinegroup.php:89
 msgid "Group not found."
 msgstr "Skupina njenamakana."
 
 #. TRANS: Server error displayed when trying to join a group the user is already a member of.
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:345
 msgid "You are already a member of that group."
 msgstr "Sy hižo čłon teje skupiny."
 
 #. TRANS: Server error displayed when trying to join a group the user is blocked from joining.
 #. 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.
-#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:350
 msgid "You have been blocked from that group by the admin."
 msgstr "Administratora tuteje skupiny je će zablokował."
 
@@ -733,13 +567,11 @@ msgstr "Administratora tuteje skupiny je će zablokował."
 #. TRANS: %1$s is the joining user's nickname, $2$s is the group nickname for which the join failed.
 #. TRANS: Message given having failed to add a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:136 actions/joingroup.php:139 lib/command.php:362
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "Njebě móžno wužiwarja %1$s skupinje %2%s přidać."
 
 #. TRANS: Server error displayed when trying to leave a group the user is not a member of.
-#: actions/apigroupleave.php:115
 msgid "You are not a member of this group."
 msgstr "Njejsy čłon tuteje skupiny."
 
@@ -747,115 +579,77 @@ msgstr "Njejsy čłon tuteje skupiny."
 #. TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
 #. TRANS: Message given having failed to remove a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupleave.php:127 actions/leavegroup.php:133
-#: lib/command.php:410
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
 msgstr "Njebě móžno wužiwarja %1$s ze skupiny %2$s wotstronić."
 
 #. TRANS: Used as title in check for group membership. %s is a user name.
-#: actions/apigrouplist.php:94
 #, php-format
 msgid "%s's groups"
 msgstr "Skupiny wužiwarja %s"
 
 #. TRANS: Used as subtitle in check for group membership. %1$s is a user name, %2$s is the site name.
-#: actions/apigrouplist.php:104
 #, php-format
 msgid "%1$s groups %2$s is a member of."
 msgstr "Skupiny na %1$s, w kotrychž wužiwar %2$s je čłon."
 
 #. TRANS: Message is used as a title when listing the lastest 20 groups. %s is a site name.
 #. TRANS: Message is used as a page title. %s is a nick name.
-#: actions/apigrouplistall.php:88 actions/usergroups.php:63
 #, php-format
 msgid "%s groups"
 msgstr "%s skupinow"
 
 #. TRANS: Message is used as a subtitle when listing the lastest 20 groups. %s is a site name.
-#: actions/apigrouplistall.php:93
 #, php-format
 msgid "groups on %s"
 msgstr "skupiny na %s"
 
+#. TRANS: Client error displayed when trying to edit a group without being an admin.
 #. TRANS: Client error displayed trying to edit a group while not being a group admin.
 #. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
 #. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
-#: actions/apigroupprofileupdate.php:118 actions/editgroup.php:110
-#: actions/editgroup.php:176 actions/groupdesignsettings.php:109
-#: actions/grouplogo.php:111
 msgid "You must be an admin to edit the group."
 msgstr "Dyrbiš administrator być, zo by skupinu wobdźěłał."
 
+#. TRANS: Server error displayed when group update fails.
 #. TRANS: Server error displayed when editing a group fails.
-#: actions/apigroupprofileupdate.php:171 actions/editgroup.php:274
 msgid "Could not update group."
 msgstr "Skupina njeje so dała aktualizować."
 
+#. TRANS: Server error displayed when adding group aliases fails.
 #. TRANS: Server error displayed when group aliases could not be added.
 #. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/apigroupprofileupdate.php:194 actions/editgroup.php:281
-#: classes/User_group.php:540
 msgid "Could not create aliases."
 msgstr "Aliasy njejsu so dali wutworić."
 
+#. TRANS: API validation exception thrown when nickname does not validate.
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: actions/apigroupprofileupdate.php:249 lib/nickname.php:165
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr ""
 "Přimjeno smě jenož małe pismiki a cyfry wobsahować. Mjezery njejsu dowolene."
 
-#: actions/apigroupprofileupdate.php:286
-#, fuzzy
-msgid "Full name is too long (max 255 chars)."
-msgstr "Dospołne mjeno je předołho (maks. 255 znamješkow)."
-
-#: actions/apigroupprofileupdate.php:296
-#, fuzzy, php-format
-msgid "description is too long (max %d chars)."
-msgstr "Wopisanje je předołho (maks. %d znamješko)."
-
-#: actions/apigroupprofileupdate.php:307
-#, fuzzy
-msgid "Location is too long (max 255 chars)."
-msgstr "Městno je předołho (maks. 255 znamješkow)."
-
-#: actions/apigroupprofileupdate.php:326
-#, fuzzy, php-format
-msgid "Too many aliases! Maximum %d."
-msgstr "Přewjele aliasow! Maks. %d dowoleny."
-
-#. TRANS: Group edit form validation error.
+#. TRANS: API validation exception thrown when alias is the same as nickname.
 #. TRANS: Group create form validation error.
-#. TRANS: %s is the invalid alias.
-#: actions/apigroupprofileupdate.php:342 actions/editgroup.php:241
-#: actions/newgroup.php:188
-#, php-format
-msgid "Invalid alias: \"%s\""
-msgstr "Njepłaćiwy alias: \"%s\""
+msgid "Alias cannot be the same as nickname."
+msgstr "Alias njemóže samsne kaž přimjeno być."
 
 #. TRANS: Client error displayed when uploading a media file has failed.
-#: actions/apimediaupload.php:101
 msgid "Upload failed."
 msgstr "Nahraće je so njeporadźiło."
 
 #. TRANS: Client error given from the OAuth API when the request token or verifier is invalid.
-#: actions/apioauthaccesstoken.php:102
 msgid "Invalid request token or verifier."
 msgstr "Njepłaćiwe přizjewjenske znamješka."
 
 #. TRANS: Client error given when no oauth_token was passed to the OAuth API.
-#: actions/apioauthauthorize.php:107
 msgid "No oauth_token parameter provided."
 msgstr ""
 
 #. TRANS: Client error given when an invalid request token was passed to the OAuth API.
-#: actions/apioauthauthorize.php:115 actions/apioauthauthorize.php:129
 msgid "Invalid request token."
 msgstr "Njepłaćiwy token."
 
 #. TRANS: Client error given when an invalid request token was passed to the OAuth API.
-#: actions/apioauthauthorize.php:121
 msgid "Request token already authorized."
 msgstr "Naprašowanski token hižo awtorizowany."
 
@@ -865,31 +659,14 @@ msgstr "Naprašowanski token hižo awtorizowany."
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
 #. TRANS: Client error displayed when the session token is not okay.
-#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:75
-#: actions/emailsettings.php:292 actions/favor.php:75 actions/geocode.php:55
-#: actions/groupblock.php:65 actions/grouplogo.php:321
-#: actions/groupunblock.php:65 actions/imsettings.php:241
-#: actions/invite.php:60 actions/makeadmin.php:66 actions/newmessage.php:135
-#: actions/newnotice.php:105 actions/nudge.php:80
-#: actions/oauthappssettings.php:162 actions/oauthconnectionssettings.php:135
-#: actions/passwordsettings.php:137 actions/pluginenable.php:87
-#: actions/profilesettings.php:218 actions/recoverpassword.php:383
-#: actions/register.php:157 actions/remotesubscribe.php:76
-#: actions/repeat.php:82 actions/smssettings.php:249 actions/subedit.php:40
-#: actions/subscribe.php:87 actions/tagother.php:145
-#: actions/unsubscribe.php:69 actions/urlsettings.php:171
-#: actions/userauthorization.php:53 lib/designsettings.php:122
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 
 #. TRANS: Form validation error given when an invalid username and/or password was passed to the OAuth API.
-#: actions/apioauthauthorize.php:168
 msgid "Invalid nickname / password!"
 msgstr "Njepłaćiwe přimjeno abo hesło!"
 
 #. TRANS: Server error displayed when a database action fails.
-#: actions/apioauthauthorize.php:217
 msgid "Database error inserting oauth_token_association."
 msgstr "Zmylk datoweje banki při zasunjenju oauth_token_association."
 
@@ -905,28 +682,19 @@ msgstr "Zmylk datoweje banki při zasunjenju oauth_token_association."
 #. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
 #. TRANS: Message given submitting a form with an unknown action in SMS settings.
 #. TRANS: Unknown form validation error in design settings form.
-#: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
-#: actions/designadminpanel.php:100 actions/editapplication.php:144
-#: actions/emailsettings.php:311 actions/grouplogo.php:332
-#: actions/imsettings.php:256 actions/newapplication.php:124
-#: actions/oauthconnectionssettings.php:144 actions/recoverpassword.php:46
-#: actions/smssettings.php:270 lib/designsettings.php:133
 msgid "Unexpected form submission."
 msgstr "Njewočakowane wotpósłanje formulara."
 
 #. TRANS: Title for a page where a user can confirm/deny account access by an external application.
-#: actions/apioauthauthorize.php:387
 msgid "An application would like to connect to your account"
 msgstr "Aplikacija chce so z twojom kontom zwjazać"
 
 #. TRANS: Fieldset legend.
-#: actions/apioauthauthorize.php:404
 msgid "Allow or deny access"
 msgstr "Přistup dowolić abo wotpokazać"
 
 #. TRANS: User notification of external application requesting account access.
 #. TRANS: %3$s is the access type requested (read-write or read-only), %4$s is the StatusNet sitename.
-#: actions/apioauthauthorize.php:425
 #, php-format
 msgid ""
 "An application would like the ability to <strong>%3$s</strong> your %4$s "
@@ -937,7 +705,6 @@ msgstr ""
 #. TRANS: User notification of external application requesting account access.
 #. TRANS: %1$s is the application name requesting access, %2$s is the organisation behind the application,
 #. TRANS: %3$s is the access type requested, %4$s is the StatusNet sitename.
-#: actions/apioauthauthorize.php:433
 #, php-format
 msgid ""
 "The application <strong>%1$s</strong> by <strong>%2$s</strong> would like "
@@ -946,22 +713,18 @@ msgid ""
 msgstr ""
 
 #. TRANS: Fieldset legend.
-#: actions/apioauthauthorize.php:455
 msgctxt "LEGEND"
 msgid "Account"
 msgstr "Konto"
 
 #. TRANS: Field label on OAuth API authorisation form.
+#. TRANS: Field label on login page.
 #. TRANS: Field label in form for profile settings.
-#: actions/apioauthauthorize.php:459 actions/login.php:225
-#: actions/profilesettings.php:107 actions/register.php:411
-#: actions/userauthorization.php:145 lib/groupeditform.php:145
 msgid "Nickname"
 msgstr "Přimjeno"
 
 #. TRANS: Field label on OAuth API authorisation form.
-#: actions/apioauthauthorize.php:463 actions/login.php:228
-#: actions/register.php:415 lib/settingsnav.php:87
+#. TRANS: Field label on login page.
 msgid "Password"
 msgstr "Hesło"
 
@@ -971,43 +734,34 @@ msgstr "Hesło"
 #. TRANS: Button label to cancel an IM address confirmation procedure.
 #. TRANS: Button label to cancel a SMS address confirmation procedure.
 #. TRANS: Button label in the "Edit application" form.
-#: actions/apioauthauthorize.php:478 actions/emailsettings.php:125
-#: actions/imsettings.php:136 actions/smssettings.php:132
-#: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Cancel"
 msgstr "Přetorhnyć"
 
 #. TRANS: Button text that when clicked will allow access to an account by an external application.
-#: actions/apioauthauthorize.php:485
 msgctxt "BUTTON"
 msgid "Allow"
 msgstr "Dowolić"
 
 #. TRANS: Form instructions.
-#: actions/apioauthauthorize.php:502
 msgid "Authorize access to your account information."
 msgstr "Přistup ke kontowym informacijam awtorizować."
 
 #. TRANS: Header for user notification after revoking OAuth access to an application.
-#: actions/apioauthauthorize.php:594
 msgid "Authorization canceled."
 msgstr "Awtorizacija přetorhnjena."
 
 #. TRANS: User notification after revoking OAuth access to an application.
 #. TRANS: %s is an OAuth token.
-#: actions/apioauthauthorize.php:598
 #, php-format
 msgid "The request token %s has been revoked."
 msgstr ""
 
 #. TRANS: Title of the page notifying the user that an anonymous client application was successfully authorized to access the user's account with OAuth.
-#: actions/apioauthauthorize.php:621
 msgid "You have successfully authorized the application"
 msgstr "Sy aplikaciju wuspěšnje awtorizował"
 
 #. TRANS: Message notifying the user that an anonymous client application was successfully authorized to access the user's account with OAuth.
-#: actions/apioauthauthorize.php:625
 msgid ""
 "Please return to the application and enter the following security code to "
 "complete the process."
@@ -1015,14 +769,12 @@ msgstr ""
 
 #. TRANS: Title of the page notifying the user that the client application was successfully authorized to access the user's account with OAuth.
 #. TRANS: %s is the authorised application name.
-#: actions/apioauthauthorize.php:632
 #, php-format
 msgid "You have successfully authorized %s"
 msgstr "Sy %s wuspěšnje awtorizował"
 
 #. TRANS: Message notifying the user that the client application was successfully authorized to access the user's account with OAuth.
 #. TRANS: %s is the authorised application name.
-#: actions/apioauthauthorize.php:639
 #, php-format
 msgid ""
 "Please return to %s and enter the following security code to complete the "
@@ -1031,12 +783,10 @@ msgstr ""
 
 #. TRANS: Client error displayed trying to delete a status not using POST or DELETE.
 #. TRANS: POST and DELETE should not be translated.
-#: actions/apistatusesdestroy.php:111
 msgid "This method requires a POST or DELETE."
 msgstr "Tuta metoda wužaduje sej POST abo DELETE."
 
 #. TRANS: Client error displayed trying to delete a status of another user.
-#: actions/apistatusesdestroy.php:136
 msgid "You may not delete another user's status."
 msgstr "Njemóžeš status druheho wužiwarja zničić."
 
@@ -1044,21 +794,16 @@ msgstr "Njemóžeš status druheho wužiwarja zničić."
 #. TRANS: Client error displayed trying to display redents of a non-exiting notice.
 #. TRANS: Client exception thrown when referencing a non-existing notice.
 #. TRANS: Error message displayed trying to delete a non-existing notice.
-#: actions/apistatusesretweet.php:74 actions/apistatusesretweets.php:70
-#: actions/atompubshowfavorite.php:82 actions/deletenotice.php:61
-#: actions/shownotice.php:92
 msgid "No such notice."
 msgstr "Zdźělenka njeeksistuje."
 
 #. TRANS: Client error displayed trying to repeat an own notice through the API.
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:549
 msgid "Cannot repeat your own notice."
 msgstr "Njemóžno twoju zdźělenku wospjetować."
 
 #. TRANS: Client error displayed trying to re-repeat a notice through the API.
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:92 lib/command.php:555
 msgid "Already repeated that notice."
 msgstr "Tuta zdźělenka bu hižo wospjetowana."
 
@@ -1068,57 +813,43 @@ msgstr "Tuta zdźělenka bu hižo wospjetowana."
 #. TRANS: Client exception thrown when using an unsupported HTTP method.
 #. TRANS: Client error shown when using a non-supported HTTP method.
 #. TRANS: Client exception thrown when using an unsupported HTTP method.
-#: actions/apistatusesshow.php:118 actions/atompubfavoritefeed.php:103
-#: actions/atompubmembershipfeed.php:105 actions/atompubshowfavorite.php:117
-#: actions/atompubshowmembership.php:116
-#: actions/atompubshowsubscription.php:122
-#: actions/atompubsubscriptionfeed.php:109
 msgid "HTTP method not supported."
 msgstr "HTTP-metoda so njepodpěruje."
 
 #. TRANS: Exception thrown requesting an unsupported notice output format.
 #. TRANS: %s is the requested output format.
-#: actions/apistatusesshow.php:144
 #, php-format
 msgid "Unsupported format: %s."
 msgstr "Njepodpěrany format: %s."
 
 #. TRANS: Client error displayed requesting a deleted status.
-#: actions/apistatusesshow.php:155
 msgid "Status deleted."
 msgstr "Status zničeny."
 
 #. TRANS: Client error displayed requesting a status with an invalid ID.
-#: actions/apistatusesshow.php:162
 msgid "No status with that ID found."
 msgstr "Žadyn status z tym ID namakany."
 
 #. TRANS: Client error displayed when trying to delete a notice not using the Atom format.
-#: actions/apistatusesshow.php:227
 msgid "Can only delete using the Atom format."
 msgstr "Zhašenje je jenož z Atomowym formatom móžno."
 
 #. TRANS: Client error displayed when a user has no rights to delete notices of other users.
 #. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
-#: actions/apistatusesshow.php:235 actions/deletenotice.php:78
 msgid "Cannot delete this notice."
 msgstr "Tuta zdźělenka njeda so zhašeć."
 
 #. TRANS: Confirmation of notice deletion in API. %d is the ID (number) of the deleted notice.
-#: actions/apistatusesshow.php:249
 #, php-format
 msgid "Deleted notice %d"
 msgstr "Zhašana zdźělenka %d"
 
 #. TRANS: Client error displayed when the parameter "status" is missing.
-#: actions/apistatusesupdate.php:221
 msgid "Client must provide a 'status' parameter with a value."
 msgstr "Klient dyrbi parameter 'status' z hódnotu podać."
 
 #. TRANS: Client error displayed when the parameter "status" is missing.
 #. TRANS: %d is the maximum number of character for a notice.
-#: actions/apistatusesupdate.php:244 actions/newnotice.php:161
-#: lib/mailhandler.php:60
 #, php-format
 msgid "That's too long. Maximum notice size is %d character."
 msgid_plural "That's too long. Maximum notice size is %d characters."
@@ -1128,13 +859,11 @@ msgstr[2] "To je předołho. Maksimalna wulkosć zdźělenki je %d znamješka."
 msgstr[3] "To je předołho. Maksimalna wulkosć zdźělenki je %d znamješkow."
 
 #. TRANS: Client error displayed when replying to a non-existing notice.
-#: actions/apistatusesupdate.php:284
 msgid "Parent notice not found."
 msgstr "Wotpowědna zdźělenka njenamakana."
 
 #. TRANS: Client error displayed exceeding the maximum notice length.
 #. TRANS: %d is the maximum lenth for a notice.
-#: actions/apistatusesupdate.php:308 actions/newnotice.php:184
 #, php-format
 msgid "Maximum notice size is %d character, including attachment URL."
 msgid_plural "Maximum notice size is %d characters, including attachment URL."
@@ -1145,13 +874,11 @@ msgstr[3] ""
 
 #. TRANS: Client error displayed when requesting profiles of followers in an unsupported format.
 #. TRANS: Client error displayed when requesting IDs of followers in an unsupported format.
-#: actions/apisubscriptions.php:228 actions/apisubscriptions.php:258
 msgid "Unsupported format."
 msgstr "Njepodpěrany format."
 
 #. TRANS: Title for timeline of most recent favourite notices by a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname.
-#: actions/apitimelinefavorites.php:108
 #, php-format
 msgid "%1$s / Favorites from %2$s"
 msgstr "%1$s / Fawority z %2$s"
@@ -1159,14 +886,12 @@ msgstr "%1$s / Fawority z %2$s"
 #. TRANS: Subtitle for timeline of most recent favourite notices by a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user's full name,
 #. TRANS: %3$s is a user nickname.
-#: actions/apitimelinefavorites.php:120
 #, php-format
 msgid "%1$s updates favorited by %2$s / %3$s."
 msgstr "Aktualizacije z %1$s  wot %2$s / %3$s faworizowane"
 
 #. TRANS: Title for timeline of most recent mentions of a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname.
-#: actions/apitimelinementions.php:115
 #, php-format
 msgid "%1$s / Updates mentioning %2$s"
 msgstr ""
@@ -1174,48 +899,40 @@ msgstr ""
 #. TRANS: Subtitle for timeline of most recent mentions of a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname,
 #. TRANS: %3$s is a user's full name.
-#: actions/apitimelinementions.php:131
 #, php-format
 msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr ""
 
 #. TRANS: Title for site timeline. %s is the StatusNet sitename.
 #. TRANS: Public RSS feed title. %s is the StatusNet site name.
-#: actions/apitimelinepublic.php:193 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr ""
 
 #. TRANS: Subtitle for site timeline. %s is the StatusNet sitename.
-#: actions/apitimelinepublic.php:199
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "%s aktualizacijow wote wšěch!"
 
 #. TRANS: Server error displayed calling unimplemented API method for 'retweeted by me'.
-#: actions/apitimelineretweetedbyme.php:71
 msgid "Unimplemented."
 msgstr "Njeimplementowana metoda."
 
 #. TRANS: Title for Atom feed "repeated to me". %s is the user nickname.
-#: actions/apitimelineretweetedtome.php:96
 #, php-format
 msgid "Repeated to %s"
 msgstr "Do %s wospjetowany"
 
-#: actions/apitimelineretweetedtome.php:98
 #, fuzzy, php-format
 msgid "%1$s notices that were to repeated to %2$s / %3$s."
 msgstr "Aktualizacije z %1$s  wot %2$s / %3$s faworizowane"
 
 #. TRANS: Title of list of repeated notices of the logged in user.
 #. TRANS: %s is the nickname of the logged in user.
-#: actions/apitimelineretweetsofme.php:98
 #, php-format
 msgid "Repeats of %s"
 msgstr "Wospjetowanja wot %s"
 
-#: actions/apitimelineretweetsofme.php:104
 #, fuzzy, php-format
 msgid "%1$s notices that %2$s / %3$s has repeated."
 msgstr "%1$s je zdźělenku %2$s jako faworit markěrował."
@@ -1224,170 +941,137 @@ msgstr "%1$s je zdźělenku %2$s jako faworit markěrował."
 #. TRANS: %s is the tag.
 #. TRANS: Title for first page of notices with tags.
 #. TRANS: %s is the tag.
-#: actions/apitimelinetag.php:101 actions/tag.php:69
 #, php-format
 msgid "Notices tagged with %s"
 msgstr "Zdźělenki woznamjenjene z %s"
 
 #. TRANS: Subtitle for timeline with lastest notices with a given tag.
 #. TRANS: %1$s is the tag, $2$s is the StatusNet sitename.
-#: actions/apitimelinetag.php:105 actions/tagrss.php:65
 #, php-format
 msgid "Updates tagged with %1$s on %2$s!"
 msgstr "Aktualizacije z %1$s na %2$s markěrowane!"
 
 #. TRANS: Client error displayed trying to add a notice to another user's timeline.
-#: actions/apitimelineuser.php:308
 msgid "Only the user can add to their own timeline."
 msgstr "Jenož wužiwar móže swojsku časowu lajstu přidać."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:315
 msgid "Only accept AtomPub for Atom feeds."
 msgstr "Jenož AtomPub za Atom-kanale akceptować."
 
 #. TRANS: Client error displayed attempting to post an empty API notice.
-#: actions/apitimelineuser.php:322
 msgid "Atom post must not be empty."
 msgstr "Póst z Atoma njesmě prózdny być."
 
 #. TRANS: Client error displayed attempting to post an API that is not well-formed XML.
-#: actions/apitimelineuser.php:328
 msgid "Atom post must be well-formed XML."
 msgstr "Póst za Atom dyrbi derje sformowany XML być."
 
 #. TRANS: Client error displayed when not using an Atom entry.
-#: actions/apitimelineuser.php:334 actions/atompubfavoritefeed.php:228
-#: actions/atompubmembershipfeed.php:230
-#: actions/atompubsubscriptionfeed.php:236
 msgid "Atom post must be an Atom entry."
 msgstr "Póst za Atom dyrbi  zapisk z Atoma być."
 
 #. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
-#: actions/apitimelineuser.php:345
 msgid "Can only handle POST activities."
 msgstr ""
 
 #. TRANS: Client error displayed when using an unsupported activity object type.
 #. TRANS: %s is the unsupported activity object type.
-#: actions/apitimelineuser.php:356
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
 #. TRANS: %d is the notice ID (number).
-#: actions/apitimelineuser.php:390
 #, php-format
 msgid "No content for notice %d."
 msgstr "Žadyn wobsah za zdźělenku %d."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
 #. TRANS: %s is the notice URI.
-#: actions/apitimelineuser.php:419
 #, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "Zdźělenka z URI \"%s\" hižo eksistuje."
 
 #. TRANS: Server error for unfinished API method showTrends.
-#: actions/apitrends.php:85
 msgid "API method under construction."
 msgstr "API-metoda njeskónčena."
 
 #. TRANS: Client error displayed when requesting user information for a non-existing user.
-#: actions/apiuserprofileimage.php:80 actions/apiusershow.php:94
 msgid "User not found."
 msgstr "Wužiwar njenamakany."
 
 #. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
 #. TRANS: Client exception.
 #. TRANS: Client error displayed trying to subscribe to a non-existing profile.
-#: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
-#: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
-#: actions/subscribe.php:110
 msgid "No such profile."
 msgstr "Profil njeeksistuje."
 
 #. TRANS: Subtitle for Atom favorites feed.
 #. TRANS: %1$s is a user nickname, %2$s is the StatusNet sitename.
-#: actions/atompubfavoritefeed.php:147
 #, php-format
 msgid "Notices %1$s has favorited on %2$s"
 msgstr "Faworizowane zdźělenki wot %1$s na %2$s"
 
 #. TRANS: Client exception thrown when trying to set a favorite for another user.
 #. TRANS: Client exception thrown when trying to subscribe another user.
-#: actions/atompubfavoritefeed.php:217 actions/atompubsubscriptionfeed.php:225
 msgid "Cannot add someone else's subscription."
 msgstr "Abonement druheho njeda so zhašeć"
 
 #. TRANS: Client exception thrown when trying use an incorrect activity verb for the Atom pub method.
-#: actions/atompubfavoritefeed.php:240
 msgid "Can only handle favorite activities."
 msgstr "Jenož faworitowe aktiwity hodźa so wobdźěłać."
 
 #. TRANS: Client exception thrown when trying favorite an object that is not a notice.
-#: actions/atompubfavoritefeed.php:250 actions/atompubmembershipfeed.php:250
 msgid "Can only fave notices."
 msgstr "Jenož zdźělenki dadźa so jako fawority składować."
 
 #. TRANS: Client exception thrown when trying favorite a notice without content.
-#: actions/atompubfavoritefeed.php:259
 msgid "Unknown note."
 msgstr "Njeznata notica."
 
 #. TRANS: Client exception thrown when trying favorite an already favorited notice.
-#: actions/atompubfavoritefeed.php:267
 msgid "Already a favorite."
 msgstr "Je hižo faworit."
 
 #. TRANS: Title for group membership feed.
 #. TRANS: %s is a username.
-#: actions/atompubmembershipfeed.php:144
 #, php-format
 msgid "%s group memberships"
 msgstr "%s skupisnkich čłonstwow"
 
 #. TRANS: Subtitle for group membership feed.
 #. TRANS: %1$s is a username, %2$s is the StatusNet sitename.
-#: actions/atompubmembershipfeed.php:149
 #, php-format
 msgid "Groups %1$s is a member of on %2$s"
 msgstr "Skupiny, w kotrychž %1$s je čłon na %2$s"
 
 #. TRANS: Client exception thrown when trying subscribe someone else to a group.
-#: actions/atompubmembershipfeed.php:219
 msgid "Cannot add someone else's membership."
 msgstr "Čłonstwo druheho njeda so přidać."
 
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#: actions/atompubmembershipfeed.php:242
 msgid "Can only handle join activities."
 msgstr "Jenož aktiwity zastupjenja hodźa so wobdźěłać."
 
 #. TRANS: Client exception thrown when trying to subscribe to a non-existing group.
-#: actions/atompubmembershipfeed.php:259
 msgid "Unknown group."
 msgstr "Njeznata skupina"
 
 #. TRANS: Client exception thrown when trying to subscribe to an already subscribed group.
-#: actions/atompubmembershipfeed.php:267
 msgid "Already a member."
 msgstr "Je hižo čłon."
 
 #. TRANS: Client exception thrown when trying to subscribe to group while blocked from that group.
-#: actions/atompubmembershipfeed.php:275
 msgid "Blocked by admin."
 msgstr "Wot administratora zablokowany."
 
 #. TRANS: Client exception thrown when referencing a non-existing favorite.
-#: actions/atompubshowfavorite.php:90
 msgid "No such favorite."
 msgstr "Faworit njeeksistuje."
 
 #. TRANS: Client exception thrown when trying to remove a favorite notice of another user.
-#: actions/atompubshowfavorite.php:151
 msgid "Cannot delete someone else's favorite."
 msgstr "Faworit druheho njeda so zhašeć."
 
@@ -1413,90 +1097,65 @@ msgstr "Faworit druheho njeda so zhašeć."
 #. TRANS: Client error displayed when trying to join a non-existing group.
 #. TRANS: Client error displayed when trying to leave a non-local group.
 #. TRANS: Client error displayed when trying to leave a non-existing group.
+#. TRANS: Client error displayed when providing an invalid group ID on the Make Admin page.
 #. 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.
 #. TRANS: Command exception text shown when a group is requested that does not exist.
 #. TRANS: Error text shown when trying to leave a group that does not exist.
-#: actions/atompubshowmembership.php:81 actions/blockedfromgroup.php:81
-#: actions/blockedfromgroup.php:89 actions/deletegroup.php:87
-#: actions/deletegroup.php:100 actions/editgroup.php:102
-#: actions/foafgroup.php:46 actions/foafgroup.php:65 actions/foafgroup.php:73
-#: actions/groupblock.php:89 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:101 actions/grouplogo.php:103
-#: actions/groupmembers.php:84 actions/groupmembers.php:92
-#: actions/grouprss.php:97 actions/grouprss.php:105
-#: actions/groupunblock.php:89 actions/joingroup.php:82
-#: actions/joingroup.php:95 actions/leavegroup.php:82
-#: actions/leavegroup.php:95 actions/makeadmin.php:86
-#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:392
 msgid "No such group."
 msgstr "Skupina njeeksistuje."
 
 #. TRANS: Client exception thrown when trying to show membership of a non-subscribed group
-#: actions/atompubshowmembership.php:91
 msgid "Not a member."
 msgstr "Njeje čłon."
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
-#: actions/atompubshowmembership.php:150
 msgid "Cannot delete someone else's membership."
 msgstr "Čłonstwo druheho njeda so zhašeć."
 
 #. TRANS: Client exception thrown when trying to display a subscription for a non-existing profile ID.
 #. TRANS: %d is the non-existing profile ID number.
-#: actions/atompubshowsubscription.php:72
-#: actions/atompubshowsubscription.php:83
-#: actions/atompubsubscriptionfeed.php:74
 #, php-format
 msgid "No such profile id: %d."
 msgstr "Profilowy ID njeeksistuje: %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.
-#: actions/atompubshowsubscription.php:94
 #, php-format
 msgid "Profile %1$d not subscribed to profile %2$d."
 msgstr "Profil  %1$d njeje profil %2$d abonował."
 
 #. TRANS: Client exception thrown when trying to delete a subscription of another user.
-#: actions/atompubshowsubscription.php:157
 msgid "Cannot delete someone else's subscription."
 msgstr "Abonement druheho njeda so zhašeć."
 
 #. TRANS: Subtitle for Atom subscription feed.
 #. TRANS: %1$s is a user nickname, %s$s is the StatusNet sitename.
-#: actions/atompubsubscriptionfeed.php:153
 #, php-format
 msgid "People %1$s has subscribed to on %2$s"
 msgstr "Ludźi, kotryž %1$s je na %2$s abonował"
 
 #. TRANS: Client error displayed when not using the follow verb.
-#: actions/atompubsubscriptionfeed.php:248
 msgid "Can only handle Follow activities."
 msgstr ""
 
 #. TRANS: Client exception thrown when subscribing to an object that is not a person.
-#: actions/atompubsubscriptionfeed.php:256
 msgid "Can only follow people."
 msgstr "Móžeš jenož wosobam slědować."
 
 #. TRANS: Client exception thrown when subscribing to a non-existing profile.
 #. TRANS: %s is the unknown profile ID.
-#: actions/atompubsubscriptionfeed.php:267
 #, php-format
 msgid "Unknown profile %s."
 msgstr "Njeznaty profil %s."
 
 #. TRANS: Client error displayed trying to subscribe to an already subscribed profile.
 #. TRANS: %s is the profile the user already has a subscription on.
-#: actions/atompubsubscriptionfeed.php:275
 #, php-format
 msgid "Already subscribed to %s."
 msgstr "%s hižo abonowany."
 
 #. TRANS: Client error displayed trying to get a non-existing attachment.
-#: actions/attachment.php:73
 msgid "No such attachment."
 msgstr "Přiwěšk njeeksistuje."
 
@@ -1508,31 +1167,23 @@ msgstr "Přiwěšk njeeksistuje."
 #. TRANS: Client error displayed when trying to view group members without providing a group nickname.
 #. TRANS: Client error displayed when requesting a group RSS feed without providing a group nickname.
 #. TRANS: Client error displayed if no nickname argument was given requesting a group page.
-#: actions/avatarbynickname.php:60 actions/blockedfromgroup.php:73
-#: actions/editgroup.php:85 actions/groupdesignsettings.php:84
-#: actions/grouplogo.php:86 actions/groupmembers.php:76
-#: actions/grouprss.php:89 actions/showgroup.php:116
 msgid "No nickname."
 msgstr "Žane přimjeno."
 
 #. TRANS: Client error displayed trying to get an avatar without providing an avatar size.
-#: actions/avatarbynickname.php:66
 msgid "No size."
 msgstr "Žana wulkosć."
 
 #. TRANS: Client error displayed trying to get an avatar providing an invalid avatar size.
-#: actions/avatarbynickname.php:72
 msgid "Invalid size."
 msgstr "Njepłaćiwa wulkosć."
 
 #. TRANS: Title for avatar upload page.
-#: actions/avatarsettings.php:66 lib/settingsnav.php:82
 msgid "Avatar"
 msgstr "Awatar"
 
 #. TRANS: Instruction for avatar upload page.
 #. TRANS: %s is the maximum file size, for example "500b", "10kB" or "2MB".
-#: actions/avatarsettings.php:78
 #, php-format
 msgid "You can upload your personal avatar. The maximum file size is %s."
 msgstr ""
@@ -1542,17 +1193,12 @@ msgstr ""
 #. TRANS: Server error displayed coming across a request from a user without a profile.
 #. TRANS: Server error displayed when trying to authorise a remote subscription request
 #. TRANS: while the user has no profile.
-#: actions/avatarsettings.php:108 actions/avatarsettings.php:192
-#: actions/grouplogo.php:184 actions/remotesubscribe.php:190
-#: actions/userauthorization.php:75 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr "Wužiwar bjez hodźaceho so profila."
 
 #. TRANS: Avatar upload page form legend.
 #. TRANS: Avatar upload page crop form legend.
 #. TRANS: Legend for group logo settings fieldset.
-#: actions/avatarsettings.php:122 actions/avatarsettings.php:205
-#: actions/grouplogo.php:261
 msgid "Avatar settings"
 msgstr "Nastajenja awatara"
 
@@ -1560,8 +1206,6 @@ msgstr "Nastajenja awatara"
 #. TRANS: Header on avatar upload crop form for thumbnail of originally uploaded avatar (h2).
 #. TRANS: Uploaded original file in group logo form.
 #. TRANS: Header for originally uploaded file before a crop on the group logo page.
-#: actions/avatarsettings.php:131 actions/avatarsettings.php:214
-#: actions/grouplogo.php:207 actions/grouplogo.php:270
 msgid "Original"
 msgstr "Original"
 
@@ -1569,80 +1213,65 @@ msgstr "Original"
 #. TRANS: Header on avatar upload crop form for thumbnail of to be used rendition of uploaded avatar (h2).
 #. TRANS: Header for preview of to be displayed group logo.
 #. TRANS: Header for the cropped group logo on the group logo page.
-#: actions/avatarsettings.php:147 actions/avatarsettings.php:227
-#: actions/grouplogo.php:219 actions/grouplogo.php:283
 msgid "Preview"
 msgstr "Přehlad"
 
 #. TRANS: Button on avatar upload page to delete current avatar.
 #. TRANS: Button text for user account deletion.
-#: actions/avatarsettings.php:155 actions/deleteaccount.php:319
 msgctxt "BUTTON"
 msgid "Delete"
 msgstr "Zhašeć"
 
 #. TRANS: Button on avatar upload page to upload an avatar.
 #. TRANS: Submit button to confirm upload of a user backup file for account restore.
-#: actions/avatarsettings.php:173 actions/restoreaccount.php:369
 msgctxt "BUTTON"
 msgid "Upload"
 msgstr "Nahrać"
 
 #. TRANS: Button on avatar upload crop form to confirm a selected crop as avatar.
-#: actions/avatarsettings.php:243
 msgctxt "BUTTON"
 msgid "Crop"
 msgstr "Přirězać"
 
 #. TRANS: Validation error on avatar upload form when no file was uploaded.
-#: actions/avatarsettings.php:318
 msgid "No file uploaded."
 msgstr "Žana dataja nahrata."
 
 #. TRANS: Avatar upload form instruction after uploading a file.
-#: actions/avatarsettings.php:345
 msgid "Pick a square area of the image to be your avatar."
 msgstr ""
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
 #. TRANS: Server error displayed trying to crop an uploaded group logo that is no longer present.
-#: actions/avatarsettings.php:360 actions/grouplogo.php:391
 msgid "Lost our file data."
 msgstr "Naše datajowe daty su so zhubili."
 
 #. TRANS: Success message for having updated a user avatar.
-#: actions/avatarsettings.php:384
 msgid "Avatar updated."
 msgstr "Awatar zaktualizowany."
 
 #. TRANS: Error displayed on the avatar upload page if the avatar could not be updated for an unknown reason.
-#: actions/avatarsettings.php:388
 msgid "Failed updating avatar."
 msgstr "Aktualizowanje awatara je so njeporadźiło."
 
 #. TRANS: Success message for deleting a user avatar.
-#: actions/avatarsettings.php:412
 msgid "Avatar deleted."
 msgstr "Awatar zničeny."
 
 #. TRANS: Title for backup account page.
 #. TRANS: Option in profile settings to create a backup of the account of the currently logged in user.
-#: actions/backupaccount.php:61 actions/profilesettings.php:468
 msgid "Backup account"
 msgstr "Konto zawěsćić"
 
 #. TRANS: Client exception thrown when trying to backup an account while not logged in.
-#: actions/backupaccount.php:79
 msgid "Only logged-in users can backup their account."
 msgstr "Jenož přizjewjeni wužiwarjo móža swoje konto zawěsćić."
 
 #. TRANS: Client exception thrown when trying to backup an account without having backup rights.
-#: actions/backupaccount.php:84
 msgid "You may not backup your account."
 msgstr "Njesměš swoje konto zawěsćić."
 
 #. TRANS: Information displayed on the backup account page.
-#: actions/backupaccount.php:227
 msgid ""
 "You can backup your account data in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format. This is an experimental feature and provides "
@@ -1652,30 +1281,25 @@ msgid ""
 msgstr ""
 
 #. TRANS: Submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:250
 msgctxt "BUTTON"
 msgid "Backup"
 msgstr "Zawěsćenje"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:254
 msgid "Backup your account."
 msgstr "Twoje konto zawěsćić."
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
-#: actions/block.php:68
 msgid "You already blocked that user."
 msgstr "Sy tutoho wužiwarja hižo zablokował."
 
 #. TRANS: Title for block user page.
 #. TRANS: Legend for block user form.
 #. TRANS: Fieldset legend for block user from group form.
-#: actions/block.php:106 actions/block.php:136 actions/groupblock.php:165
 msgid "Block user"
 msgstr "Wužiwarja blokować"
 
 #. TRANS: Explanation of consequences when blocking a user on the block user page.
-#: actions/block.php:139
 msgid ""
 "Are you sure you want to block this user? Afterwards, they will be "
 "unsubscribed from you, unable to subscribe to you in the future, and you "
@@ -1688,15 +1312,11 @@ msgstr ""
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:154 actions/deleteapplication.php:157
-#: actions/deletegroup.php:220 actions/deletenotice.php:155
-#: actions/deleteuser.php:154 actions/groupblock.php:187
 msgctxt "BUTTON"
 msgid "No"
 msgstr "Ně"
 
 #. TRANS: Submit button title for 'No' when blocking a user.
-#: actions/block.php:158
 msgid "Do not block this user."
 msgstr "Tutoho wužiwarja njeblokować."
 
@@ -1706,174 +1326,138 @@ msgstr "Tutoho wužiwarja njeblokować."
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:161 actions/deleteapplication.php:164
-#: actions/deletegroup.php:227 actions/deletenotice.php:162
-#: actions/deleteuser.php:161 actions/groupblock.php:194
 msgctxt "BUTTON"
 msgid "Yes"
 msgstr "Haj"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:165
 msgid "Block this user."
 msgstr "Tutoho wužiwarja blokować."
 
 #. TRANS: Server error displayed when blocking a user fails.
-#: actions/block.php:189
 msgid "Failed to save block information."
 msgstr "Njebě móžno blokěrowanske informacije składować."
 
 #. TRANS: Title for first page with list of users blocked from a group.
 #. TRANS: %s is a group nickname.
-#: actions/blockedfromgroup.php:101
 #, php-format
 msgid "%s blocked profiles"
 msgstr "%s je profile zablokował"
 
 #. TRANS: Title for any but the first page with list of users blocked from a group.
 #. TRANS: %1$s is a group nickname, %2$d is a page number.
-#: actions/blockedfromgroup.php:106
 #, php-format
 msgid "%1$s blocked profiles, page %2$d"
 msgstr "%1$s zablokowa profile, stronu %2$d"
 
 #. TRANS: Instructions for list of users blocked from a group.
-#: actions/blockedfromgroup.php:122
 msgid "A list of the users blocked from joining this group."
 msgstr "Lisćina wužiwarjow, kotřiž buchu za tutu skupinu zablokowani."
 
 #. TRANS: Form legend for unblocking a user from a group.
-#: actions/blockedfromgroup.php:291
 msgid "Unblock user from group"
 msgstr "Wužiwarja za skupinu wotblokować"
 
 #. TRANS: Button text for unblocking a user from a group.
-#: actions/blockedfromgroup.php:323
 msgctxt "BUTTON"
 msgid "Unblock"
 msgstr "Wotblokować"
 
 #. TRANS: Tooltip for button for unblocking a user from a group.
 #. TRANS: Description of the form to unblock a user.
-#: actions/blockedfromgroup.php:327 lib/unblockform.php:78
 msgid "Unblock this user"
 msgstr "Tutoho wužiwarja wotblokować"
 
 #. TRANS: Title for mini-posting window loaded from bookmarklet.
 #. TRANS: %s is the StatusNet site name.
-#: actions/bookmarklet.php:51
 #, php-format
 msgid "Post to %s"
 msgstr "Na %s pósłać"
 
 #. TRANS: Client error displayed when not providing a confirmation code in the contact address confirmation action.
-#: actions/confirmaddress.php:74
 msgid "No confirmation code."
 msgstr "Žadyn wobkrućenski kod."
 
 #. TRANS: Client error displayed when providing a non-existing confirmation code in the contact address confirmation action.
-#: actions/confirmaddress.php:80
 msgid "Confirmation code not found."
 msgstr "Wobkrućenski kod njenamakany."
 
 #. TRANS: Client error displayed when not providing a confirmation code for another user in the contact address confirmation action.
-#: actions/confirmaddress.php:86
 msgid "That confirmation code is not for you!"
 msgstr "Tutón wobkrućenski kod njeje za tebje!"
 
 #. TRANS: Server error for an unknown address type, which can be 'email', 'sms', or the name of an IM network (such as 'xmpp' or 'aim')
-#: actions/confirmaddress.php:94
-#, fuzzy, php-format
+#, php-format
 msgid "Unrecognized address type %s"
-msgstr "Njespóznaty adresowy typ %s."
+msgstr "Njespóznany adresowy typ %s"
 
 #. TRANS: Client error for an already confirmed email/jabber/sms address.
-#: actions/confirmaddress.php:103 actions/confirmaddress.php:136
 msgid "That address has already been confirmed."
 msgstr "Tuta adresa bu hižo wobkrućena."
 
-#: actions/confirmaddress.php:121 actions/imsettings.php:444
-#: actions/userdesignsettings.php:306
-#, fuzzy
 msgid "Couldn't update user."
-msgstr "Wužiwar njeje so dał aktualizować."
+msgstr "Wužiwar njeda aktualizować."
 
-#: actions/confirmaddress.php:144
 #, fuzzy
 msgid "Couldn't update user im preferences."
 msgstr "Datowa sadźba wužiwarja njeda so aktualizować."
 
-#: actions/confirmaddress.php:156
 #, fuzzy
 msgid "Couldn't insert user im preferences."
 msgstr "Nowy abonement njeda so zasunyć."
 
 #. TRANS: Server error displayed when an address confirmation code deletion from the
 #. TRANS: database fails in the contact address confirmation action.
-#: actions/confirmaddress.php:169
 msgid "Could not delete address confirmation."
 msgstr "Adresowe wobkrućenje njeda so zhašeć."
 
 #. TRANS: Title for the contact address confirmation action.
-#: actions/confirmaddress.php:185
 msgid "Confirm address"
 msgstr "Adresu wobkrućić"
 
 #. TRANS: Success message for the contact address confirmation action.
 #. TRANS: %s can be 'email', 'jabber', or 'sms'.
-#: actions/confirmaddress.php:200
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "Adresa \"%s\" bu za twoje konto wobkrućena."
 
 #. TRANS: Title for page with a conversion (multiple notices in context).
-#: actions/conversation.php:96
 msgid "Conversation"
 msgstr "Konwersacija"
 
 #. TRANS: Header on conversation page. Hidden by default (h2).
 #. TRANS: Label for user statistics.
-#: actions/conversation.php:149 lib/noticelist.php:87
-#: lib/profileaction.php:246 lib/searchgroupnav.php:82
-#: lib/threadednoticelist.php:66
 msgid "Notices"
 msgstr "Zdźělenki"
 
 #. TRANS: Client exception displayed trying to delete a user account while not logged in.
-#: actions/deleteaccount.php:71
 msgid "Only logged-in users can delete their account."
 msgstr "Jenož přizjewjeni wužiwarjo móža swoje konto zhašeć."
 
 #. TRANS: Client exception displayed trying to delete a user account without have the rights to do that.
-#: actions/deleteaccount.php:77
 msgid "You cannot delete your account."
 msgstr "Njemóžeš swoje konto zhašeć."
 
 #. TRANS: Confirmation text for user deletion. The user has to type this exactly the same, including punctuation.
-#: actions/deleteaccount.php:160 actions/deleteaccount.php:297
 msgid "I am sure."
 msgstr "Sym sej wěsty."
 
 #. TRANS: Notification for user about the text that must be input to be able to delete a user account.
 #. TRANS: %s is the text that needs to be input.
-#: actions/deleteaccount.php:164
 #, php-format
 msgid "You must write \"%s\" exactly in the box."
 msgstr "Dyrbiš \"%s\" eksaktnje do pola zapisać."
 
 #. TRANS: Confirmation that a user account has been deleted.
-#: actions/deleteaccount.php:206
 msgid "Account deleted."
 msgstr "Konto zhašene."
 
 #. TRANS: Page title for page on which a user account can be deleted.
 #. TRANS: Option in profile settings to delete the account of the currently logged in user.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:476
 msgid "Delete account"
 msgstr "Konto zhašeć"
 
 #. TRANS: Form text for user deletion form.
-#: actions/deleteaccount.php:279
 msgid ""
 "This will <strong>permanently delete</strong> your account data from this "
 "server."
@@ -1883,7 +1467,6 @@ msgstr ""
 
 #. TRANS: Additional form text for user deletion form shown if a user has account backup rights.
 #. TRANS: %s is a URL to the backup page.
-#: actions/deleteaccount.php:285
 #, php-format
 msgid ""
 "You are strongly advised to <a href=\"%s\">back up your data</a> before "
@@ -1892,55 +1475,42 @@ msgstr ""
 
 #. TRANS: Field label for delete account confirmation entry.
 #. TRANS: Field label for password reset form where the password has to be typed again.
-#: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:262 actions/register.php:419
 msgid "Confirm"
 msgstr "Wobkrućić"
 
 #. TRANS: Input title for the delete account field.
 #. TRANS: %s is the text that needs to be input.
-#: actions/deleteaccount.php:304
 #, php-format
 msgid "Enter \"%s\" to confirm that you want to delete your account."
 msgstr "Zapodaj \"%s\", zo by wobkrućił, zo chceš swoje konto zhašeć."
 
 #. TRANS: Button title for user account deletion.
-#: actions/deleteaccount.php:323
 msgid "Permanently delete your account"
 msgstr "Twoje konto na přeco zhašeć"
 
 #. TRANS: Client error displayed trying to delete an application while not logged in.
-#: actions/deleteapplication.php:62
 msgid "You must be logged in to delete an application."
 msgstr "Dyrbiš přizjewjeny być, zo by aplikaciju zničił."
 
 #. TRANS: Client error displayed trying to delete an application that does not exist.
-#: actions/deleteapplication.php:71
 msgid "Application not found."
 msgstr "Aplikaciska njenamakana."
 
 #. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
-#: actions/deleteapplication.php:79 actions/editapplication.php:78
-#: actions/showapplication.php:90
 msgid "You are not the owner of this application."
 msgstr "Njejsy wobsedźer tuteje aplikacije."
 
 #. TRANS: Client error text when there is a problem with the session token.
-#: actions/deleteapplication.php:102 actions/editapplication.php:131
-#: actions/newapplication.php:112 actions/showapplication.php:113
-#: lib/action.php:1391
 msgid "There was a problem with your session token."
 msgstr ""
 
 #. TRANS: Title for delete application page.
 #. TRANS: Fieldset legend on delete application page.
-#: actions/deleteapplication.php:124 actions/deleteapplication.php:149
 msgid "Delete application"
 msgstr "Aplikaciju zničić"
 
 #. TRANS: Confirmation text on delete application page.
-#: actions/deleteapplication.php:152
 msgid ""
 "Are you sure you want to delete this application? This will clear all data "
 "about the application from the database, including all existing user "
@@ -1948,55 +1518,45 @@ msgid ""
 msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting an application.
-#: actions/deleteapplication.php:161
 msgid "Do not delete this application."
 msgstr "Tutu aplikaciju njezhašeć."
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
-#: actions/deleteapplication.php:167
 msgid "Delete this application."
 msgstr "Tutu aplikaciju zhašeć."
 
 #. TRANS: Client error when trying to delete group while not logged in.
-#: actions/deletegroup.php:64
 msgid "You must be logged in to delete a group."
 msgstr "Dyrbiš přizjewjeny być, zo by skupinu zhašał."
 
 #. TRANS: Client error when trying to delete a group without providing a nickname or ID for the group.
 #. TRANS: Client error displayed when trying to join a group without providing a group name or group ID.
 #. TRANS: Client error displayed when trying to leave a group without providing a group name or group ID.
-#: actions/deletegroup.php:94 actions/joingroup.php:89
-#: actions/leavegroup.php:89
 msgid "No nickname or ID."
 msgstr "Žane přimjeno abo žadyn ID."
 
 #. TRANS: Client error when trying to delete a group without having the rights to delete it.
-#: actions/deletegroup.php:107
 msgid "You are not allowed to delete this group."
 msgstr "Njesměš tutu skupinu zhašeć."
 
 #. TRANS: Server error displayed if a group could not be deleted.
 #. TRANS: %s is the name of the group that could not be deleted.
-#: actions/deletegroup.php:150
 #, php-format
 msgid "Could not delete group %s."
 msgstr "Skupina %s njeda so aktualizować."
 
 #. TRANS: Message given after deleting a group.
 #. TRANS: %s is the deleted group's name.
-#: actions/deletegroup.php:159
 #, php-format
 msgid "Deleted group %s"
 msgstr "Skupina %s zhašana"
 
 #. TRANS: Title of delete group page.
 #. TRANS: Form legend for deleting a group.
-#: actions/deletegroup.php:176 actions/deletegroup.php:202
 msgid "Delete group"
 msgstr "Skupinu zhašeć"
 
 #. TRANS: Warning in form for deleleting a group.
-#: actions/deletegroup.php:206
 msgid ""
 "Are you sure you want to delete this group? This will clear all data about "
 "the group from the database, without a backup. Public posts to this group "
@@ -2004,12 +1564,10 @@ msgid ""
 msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting a group.
-#: actions/deletegroup.php:224
 msgid "Do not delete this group."
 msgstr "Tutu skupinu njezhašeć."
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
-#: actions/deletegroup.php:231
 msgid "Delete this group."
 msgstr "Tutu skupinu zhašeć."
 
@@ -2019,22 +1577,18 @@ msgstr "Tutu skupinu zhašeć."
 #. TRANS: Client error displayed trying to block a user from a group while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying to log out when not logged in.
+#. TRANS: Client error displayed when trying to access the "make admin" page while not logged in.
+#. TRANS: Client error displayed trying to create a new direct message while not logged in.
+#. TRANS: Client error displayed trying to send a notice while not logged in.
+#. TRANS: Client error displayed trying to nudge a user without being logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
 #. TRANS: Client error displayed when trying to change user options while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
-#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:70
-#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
-#: actions/nudge.php:63 actions/pluginenable.php:97 actions/subedit.php:33
-#: actions/subscribe.php:98 actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:71 lib/profileformaction.php:63
-#: lib/settingsaction.php:72
 msgid "Not logged in."
 msgstr "Njepřizjewjeny."
 
 #. TRANS: Instructions for deleting a notice.
-#: actions/deletenotice.php:110
 msgid ""
 "You are about to permanently delete a notice. Once this is done, it cannot "
 "be undone."
@@ -2043,145 +1597,117 @@ msgstr ""
 
 #. TRANS: Page title when deleting a notice.
 #. TRANS: Fieldset legend for the delete notice form.
-#: actions/deletenotice.php:117 actions/deletenotice.php:148
 msgid "Delete notice"
 msgstr "Zdźělenku wušmórnyć"
 
 #. TRANS: Message for the delete notice form.
-#: actions/deletenotice.php:152
 msgid "Are you sure you want to delete this notice?"
 msgstr "Chceš woprawdźe tutu zdźělenku wušmórnyć?"
 
 #. TRANS: Submit button title for 'No' when deleting a notice.
-#: actions/deletenotice.php:159
 msgid "Do not delete this notice."
 msgstr "Tutu zdźělenku njezhašeć."
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:166
 msgid "Delete this notice."
 msgstr "Tutu zdźělenku zhašeć."
 
 #. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
-#: actions/deleteuser.php:66
 msgid "You cannot delete users."
 msgstr "Njemóžeš wužiwarjow wušmórnyć."
 
 #. TRANS: Client error displayed when trying to delete a non-local user.
-#: actions/deleteuser.php:74
 msgid "You can only delete local users."
 msgstr "Móžeš jenož lokalnych wužiwarjow wušmórnyć."
 
 #. TRANS: Title of delete user page.
-#: actions/deleteuser.php:110
 msgctxt "TITLE"
 msgid "Delete user"
 msgstr "Wužiwarja zhašeć"
 
 #. TRANS: Fieldset legend on delete user page.
-#: actions/deleteuser.php:134
 msgid "Delete user"
 msgstr "Wužiwarja wušmórnyć"
 
 #. TRANS: Information text to request if a user is certain that the described action has to be performed.
-#: actions/deleteuser.php:138
 msgid ""
 "Are you sure you want to delete this user? This will clear all data about "
 "the user from the database, without a backup."
 msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/deleteuser.php:158
 msgid "Do not delete this user."
 msgstr "Tutoho wužiwarja njezhašeć."
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
-#: actions/deleteuser.php:165
 msgid "Delete this user."
 msgstr "Tutoho wužiwarja zhašeć"
 
 #. TRANS: Message used as title for design settings for the site.
-#: actions/designadminpanel.php:60 lib/settingsnav.php:97
 msgid "Design"
 msgstr "Design"
 
 #. TRANS: Instructions for design adminsitration panel.
-#: actions/designadminpanel.php:71
 msgid "Design settings for this StatusNet site"
 msgstr "Designowe nastajenja za tute sydło StatusNet"
 
 #. TRANS: Client error displayed when a logo URL does is not valid.
-#: actions/designadminpanel.php:327
 msgid "Invalid logo URL."
 msgstr "Njepłaćiwy logowy URL."
 
 #. TRANS: Client error displayed when an SSL logo URL is invalid.
-#: actions/designadminpanel.php:333
 msgid "Invalid SSL logo URL."
 msgstr "Njepłaćiwy SSL-URL loga."
 
 #. TRANS: Client error displayed when a theme is submitted through the form that is not in the theme list.
 #. TRANS: %s is the chosen unavailable theme.
-#: actions/designadminpanel.php:339
 #, php-format
 msgid "Theme not available: %s."
 msgstr "Šat njesteji k dispoziciji: %s."
 
 #. TRANS: Fieldset legend for form to change logo.
-#: actions/designadminpanel.php:437
 msgid "Change logo"
 msgstr "Logo změnić"
 
 #. TRANS: Field label for StatusNet site logo.
-#: actions/designadminpanel.php:444
 msgid "Site logo"
 msgstr "Logo sydła"
 
 #. TRANS: Field label for SSL StatusNet site logo.
-#: actions/designadminpanel.php:452
 msgid "SSL logo"
 msgstr "SSL-logo"
 
 #. TRANS: Fieldset legend for form change StatusNet site's theme.
-#: actions/designadminpanel.php:467
 msgid "Change theme"
 msgstr "Šat změnić"
 
 #. TRANS: Field label for dropdown to choose site theme.
-#: actions/designadminpanel.php:485
 msgid "Site theme"
 msgstr "Šat sydła"
 
 #. TRANS: Title for field label for dropdown to choose site theme.
-#: actions/designadminpanel.php:487
 msgid "Theme for the site."
 msgstr "Šat za sydło."
 
 #. TRANS: Field label for uploading a cutom theme.
-#: actions/designadminpanel.php:494
 msgid "Custom theme"
 msgstr "Swójski šat"
 
 #. TRANS: Form instructions for uploading a cutom StatusNet theme.
-#: actions/designadminpanel.php:499
 msgid "You can upload a custom StatusNet theme as a .ZIP archive."
 msgstr "Móžeš swójski šat StatusNet jako .ZIP-archiw nahrać."
 
 #. TRANS: Fieldset legend for theme background image.
-#: actions/designadminpanel.php:515
 msgid "Change background image"
 msgstr "Pozadkowy wobraz změnić"
 
 #. TRANS: Field label for background image on theme designer page.
 #. TRANS: Field label for background color selector.
 #. TRANS: Label on profile design page for setting a profile page background colour.
-#: actions/designadminpanel.php:525 actions/designadminpanel.php:609
-#: lib/designform.php:238
 msgid "Background"
 msgstr "Pozadk"
 
 #. TRANS: Form guide for background image upload form on theme designer page.
-#: actions/designadminpanel.php:531
 #, php-format
 msgid ""
 "You can upload a background image for the site. The maximum file size is %1"
@@ -2190,197 +1716,162 @@ msgstr ""
 "Móžeš pozadkowy wobraz za sydło nahrać. Maksimalna datajowa wulkosć je %1$s."
 
 #. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:558
 msgid "On"
 msgstr "Zapinjeny"
 
 #. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:575
 msgid "Off"
 msgstr "Wupinjeny"
 
 #. TRANS: Form guide for turning background image on or off on theme designer page.
 #. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
 #. TRANS: use of the uploaded profile image.
-#: actions/designadminpanel.php:577 lib/designform.php:214
 msgid "Turn background image on or off."
 msgstr "Pozadkowy wobraz zmóžnić abo znjemóžnić."
 
 #. TRANS: Checkbox label to title background image on theme designer page.
 #. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-#: actions/designadminpanel.php:583 lib/designform.php:220
 msgid "Tile background image"
 msgstr "Pozadkowy wobraz kachlicować"
 
 #. TRANS: Fieldset legend for theme colors.
-#: actions/designadminpanel.php:598
 msgid "Change colors"
 msgstr "Barby změnić"
 
 #. TRANS: Field label for content color selector.
 #. TRANS: Label on profile design page for setting a profile page content colour.
-#: actions/designadminpanel.php:623 lib/designform.php:252
 msgid "Content"
 msgstr "Wobsah"
 
 #. TRANS: Field label for sidebar color selector.
 #. TRANS: Label on profile design page for setting a profile page sidebar colour.
-#: actions/designadminpanel.php:637 lib/designform.php:266
 msgid "Sidebar"
 msgstr "Bóčnica"
 
 #. TRANS: Field label for text color selector.
 #. TRANS: Label on profile design page for setting a profile page text colour.
-#: actions/designadminpanel.php:651 lib/designform.php:280
 msgid "Text"
 msgstr "Tekst"
 
 #. TRANS: Field label for link color selector.
 #. TRANS: Label on profile design page for setting a profile page links colour.
-#: actions/designadminpanel.php:665 lib/designform.php:294
 msgid "Links"
 msgstr "Wotkazy"
 
 #. TRANS: Fieldset legend for advanced theme design settings.
-#: actions/designadminpanel.php:691
 msgid "Advanced"
 msgstr "Rozšěrjeny"
 
 #. TRANS: Field label for custom CSS.
-#: actions/designadminpanel.php:696
 msgid "Custom CSS"
 msgstr "Swójski CSS"
 
 #. TRANS: Button text for resetting theme settings.
-#: actions/designadminpanel.php:718
 msgctxt "BUTTON"
 msgid "Use defaults"
 msgstr "Standardne hódnoty wužiwać"
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:720
 msgid "Restore default designs."
 msgstr "Standardne designy wobnowić."
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:728
 msgid "Reset back to default."
 msgstr "Na standard wróćo stajić."
 
 #. TRANS: Title for button for saving theme settings.
-#: actions/designadminpanel.php:736
 msgid "Save design."
 msgstr "Design składować."
 
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
-#: actions/disfavor.php:83
 msgid "This notice is not a favorite!"
 msgstr "Tuta zdźělenka faworit njeje!"
 
 #. TRANS: Title for page on which favorites can be added.
-#: actions/disfavor.php:98
 msgid "Add to favorites"
 msgstr "K faworitam přidać"
 
 #. TRANS: Client exception thrown when requesting a document from the documentation that does not exist.
 #. TRANS: %s is the non-existing document.
-#: actions/doc.php:155
 #, php-format
 msgid "No such document \"%s\"."
 msgstr "Dokument \"%s\" njeeksistuje."
 
 #. TRANS: Title for "Edit application" form.
 #. TRANS: Form legend.
-#: actions/editapplication.php:54 lib/applicationeditform.php:129
 msgid "Edit application"
 msgstr "Aplikaciju wobdźěłać"
 
 #. TRANS: Client error displayed trying to edit an application while not logged in.
-#: actions/editapplication.php:66
 msgid "You must be logged in to edit an application."
 msgstr "Dyrbiš přizjewjeny być, zo by skupinu wobdźěłał."
 
 #. TRANS: Client error displayed trying to edit an application that does not exist.
-#: actions/editapplication.php:83 actions/showapplication.php:83
 msgid "No such application."
 msgstr "Aplikacija njeeksistuje."
 
 #. TRANS: Instructions for "Edit application" form.
-#: actions/editapplication.php:167
 msgid "Use this form to edit your application."
 msgstr "Wužij tutón formular, zo by aplikaciju wobdźěłał."
 
 #. TRANS: Validation error shown when not providing a name in the "Edit application" form.
 #. TRANS: Validation error shown when not providing a name in the "New application" form.
-#: actions/editapplication.php:184 actions/newapplication.php:164
 msgid "Name is required."
 msgstr "Mjeno je trěbne."
 
 #. 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.
-#: actions/editapplication.php:188 actions/newapplication.php:172
 msgid "Name is too long (maximum 255 characters)."
 msgstr "Mjeno je předołho (maks. 255 znamješkow)."
 
 #. TRANS: Validation error shown when providing a name for an application that already exists in the "Edit application" form.
 #. TRANS: Validation error shown when providing a name for an application that already exists in the "New application" form.
-#: actions/editapplication.php:192 actions/newapplication.php:168
 msgid "Name already in use. Try another one."
 msgstr "Mjeno so hižo wužiwa. Spytaj druhe."
 
 #. TRANS: Validation error shown when not providing a description in the "Edit application" form.
 #. TRANS: Validation error shown when not providing a description in the "New application" form.
-#: actions/editapplication.php:196 actions/newapplication.php:176
 msgid "Description is required."
 msgstr "Wopisanje je trěbne."
 
 #. TRANS: Validation error shown when providing too long a source URL in the "Edit application" form.
-#: actions/editapplication.php:209
 msgid "Source URL is too long."
 msgstr "Žórłowy URL je předołhi."
 
 #. TRANS: Validation error shown when providing an invalid source URL in the "Edit application" form.
 #. TRANS: Validation error shown when providing an invalid source URL in the "New application" form.
-#: actions/editapplication.php:216 actions/newapplication.php:199
 msgid "Source URL is not valid."
 msgstr "URL žórła płaćiwy njeje."
 
 #. 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.
-#: actions/editapplication.php:220 actions/newapplication.php:203
 msgid "Organization is required."
 msgstr "Organizacija je trěbna."
 
 #. TRANS: Validation error shown when providing too long an arganisation name in the "Edit application" form.
-#: actions/editapplication.php:224 actions/newapplication.php:207
 msgid "Organization is too long (maximum 255 characters)."
 msgstr "Mjeno organizacije je předołho (maks. 255 znamješkow)."
 
 #. TRANS: Form validation error show when an organisation name has not been provided in the edit application form.
 #. TRANS: Form validation error show when an organisation name has not been provided in the new application form.
-#: actions/editapplication.php:228 actions/newapplication.php:211
 msgid "Organization homepage is required."
 msgstr "Startowa strona organizacije je trěbna."
 
 #. TRANS: Validation error shown when providing too long a callback URL in the "Edit application" form.
 #. TRANS: Validation error shown when providing too long a callback URL in the "New application" form.
-#: actions/editapplication.php:239 actions/newapplication.php:225
 msgid "Callback is too long."
 msgstr "Wróćowołanski URL je předołhi."
 
 #. TRANS: Validation error shown when providing an invalid callback URL in the "Edit application" form.
 #. TRANS: Validation error shown when providing an invalid callback URL in the "New application" form.
-#: actions/editapplication.php:247 actions/newapplication.php:235
 msgid "Callback URL is not valid."
 msgstr "Wróćowołanski URL płaćiwy njeje."
 
 #. TRANS: Server error occuring when an application could not be updated from the "Edit application" form.
-#: actions/editapplication.php:284
 msgid "Could not update application."
 msgstr "Aplikacija njeda so aktualizować."
 
 #. TRANS: Title for form to edit a group. %s is a group nickname.
-#: actions/editgroup.php:55
 #, php-format
 msgid "Edit %s group"
 msgstr "Skupinu %s wobdźěłać"
@@ -2388,40 +1879,40 @@ msgstr "Skupinu %s wobdźěłać"
 #. TRANS: Client error displayed trying to edit a group while not logged in.
 #. TRANS: Client error displayed when trying to create a group while not logged in.
 #. TRANS: Client error displayed trying to create a group while not logged in.
-#: actions/editgroup.php:68 actions/grouplogo.php:69 actions/newgroup.php:65
 msgid "You must be logged in to create a group."
 msgstr "Dyrbiš přizjewjeny być, zo by skupinu wutworił."
 
 #. TRANS: Form instructions for group edit form.
-#: actions/editgroup.php:161
 msgid "Use this form to edit the group."
 msgstr "Wuž tutón formular, zo by skupinu wobdźěłał."
 
+#. TRANS: Group edit form validation error.
+#. TRANS: Group create form validation error.
+#. TRANS: %s is the invalid alias.
+#, php-format
+msgid "Invalid alias: \"%s\""
+msgstr "Njepłaćiwy alias: \"%s\""
+
 #. TRANS: Group edit form success message.
-#: actions/editgroup.php:301
 msgid "Options saved."
 msgstr "Opcije składowane."
 
 #. TRANS: Title for e-mail settings.
-#: actions/emailsettings.php:60
 msgid "Email settings"
 msgstr "E-mejlowe nastajenja"
 
 #. TRANS: E-mail settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/emailsettings.php:74
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 msgstr ""
 
 #. TRANS: Form legend for e-mail settings form.
 #. TRANS: Field label for e-mail address input in e-mail settings form.
-#: actions/emailsettings.php:104 actions/emailsettings.php:130
 msgid "Email address"
 msgstr "E-mejlowa adresa"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:110
 msgid "Current confirmed email address."
 msgstr "Aktualna wobkrućena e-mejlowa adresa."
 
@@ -2430,15 +1921,11 @@ msgstr "Aktualna wobkrućena e-mejlowa adresa."
 #. TRANS: Button label to remove a confirmed IM address.
 #. TRANS: Button label to remove a confirmed SMS address.
 #. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
-#: actions/emailsettings.php:113 actions/emailsettings.php:180
-#: actions/imsettings.php:119 actions/smssettings.php:119
-#: actions/smssettings.php:175
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Wotstronić"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:120
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -2449,44 +1936,36 @@ msgstr ""
 #. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
 #. TRANS: Any other domain may be owned by a legitimate person or
 #. TRANS: organization.
-#: actions/emailsettings.php:137
 msgid "Email address, like \"UserName@example.org\""
 msgstr "E-mejlowa adresa, kaž na př. \"WužiwarskeMjeno@example.org\""
 
 #. TRANS: Button label for adding an e-mail address in e-mail settings form.
 #. TRANS: Button label for adding an IM address in IM settings form.
 #. TRANS: Button label for adding a SMS phone number in SMS settings form.
-#: actions/emailsettings.php:141 actions/imsettings.php:147
-#: actions/smssettings.php:157
 msgctxt "BUTTON"
 msgid "Add"
 msgstr "Přidać"
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:149 actions/smssettings.php:166
 msgid "Incoming email"
 msgstr "Dochadźaca e-mejl"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:155
 msgid "I want to post notices by email."
 msgstr "Chcu zdźělenki přez e-mejl pósłać."
 
 #. TRANS: Form instructions for incoming e-mail form in e-mail settings.
 #. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
-#: actions/emailsettings.php:177 actions/smssettings.php:173
 msgid "Send email to this address to post new notices."
 msgstr "Pósćel e-mejl na tutu adresu, zo by nowe zdźělenki pósłał."
 
 #. TRANS: Instructions for incoming e-mail address input form, when an address has already been assigned.
 #. TRANS: Instructions for incoming SMS e-mail address input form.
-#: actions/emailsettings.php:186 actions/smssettings.php:181
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr ""
 
 #. TRANS: Instructions for incoming e-mail address input form.
-#: actions/emailsettings.php:190
 msgid ""
 "To send notices via email, we need to create a unique email address for you "
 "on this server:"
@@ -2494,87 +1973,69 @@ msgstr ""
 
 #. TRANS: Button label for adding an e-mail address to send notices from.
 #. TRANS: Button label for adding an SMS e-mail address to send notices from.
-#: actions/emailsettings.php:196 actions/smssettings.php:184
 msgctxt "BUTTON"
 msgid "New"
 msgstr "Nowy"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:205
 msgid "Email preferences"
 msgstr "E-mejlowe nastajenja"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:213
 msgid "Send me notices of new subscriptions through email."
 msgstr "Pósćel mi zdźělenki wo nowych abonementach přez e-mejl."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:219
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr "E-mejl pósłać, hdyž něchtó moju powěsć jako faworit přidawa."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:226
 msgid "Send me email when someone sends me a private message."
 msgstr "E-mejl pósłać, hdyž něchtó priwatnu powěsć sćele."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:232
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr "E-mejl pósłać, hdyž něchtó mi \"@-reply\" sćele."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:238
 msgid "Allow friends to nudge me and send me an email."
 msgstr "Přećelam dowolić mje storkać a mi e-mejl pósłać."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:244
 msgid "Publish a MicroID for my email address."
 msgstr "MicroID za moju e-mejlowu adresu publikować"
 
 #. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:362
 msgid "Email preferences saved."
 msgstr "E-mejlowe nastajenja składowane."
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:381
 msgid "No email address."
 msgstr "Žana e-mejlowa adresa."
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:389
 msgid "Cannot normalize that email address."
 msgstr "Tuta e-mejlowa adresa njehodźi so normalizować."
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:394 actions/register.php:197
-#: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "Njepłaćiwa e-mejlowa adresa."
 
 #. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:398
 msgid "That is already your email address."
 msgstr "To je hižo twoja e-mejlowa adresa."
 
 #. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:402
 msgid "That email address already belongs to another user."
 msgstr "Ta e-mejlowa adresa hižo słuša k druhemu wužiwarjej."
 
 #. TRANS: Server error thrown on database error adding e-mail confirmation code.
 #. TRANS: Server error thrown on database error adding Instant Messaging confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:419 actions/imsettings.php:362
-#: actions/smssettings.php:364
 msgid "Could not insert confirmation code."
 msgstr "Wobkrućenski kod njehodźi so zasunyć."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:426
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
@@ -2583,99 +2044,79 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling Instant Messaging address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:446 actions/imsettings.php:391
-#: actions/smssettings.php:398
 msgid "No pending confirmation to cancel."
 msgstr "Njeje žane njesćinjene wobkrućenje, kotrež da so přetorhnyć,"
 
 #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:451
 msgid "That is the wrong email address."
 msgstr "To je wopačna e-mejlowa adresa."
 
 #. TRANS: Server error thrown on database error canceling e-mail address confirmation.
 #. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
-#: actions/emailsettings.php:460 actions/smssettings.php:412
 msgid "Could not delete email confirmation."
 msgstr "E-mejlowe wobkrućenje njeda so zhašeć."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:465
 msgid "Email confirmation cancelled."
 msgstr "E-mejlowe wobkrućenje přetorhnjene."
 
 #. TRANS: Message given trying to remove an e-mail address that is not
 #. TRANS: registered for the active user.
-#: actions/emailsettings.php:484
 msgid "That is not your email address."
 msgstr "To njeje twoja e-mejlowa adresa."
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:505
 msgid "The email address was removed."
 msgstr "E-mejlowa adresa bu wotstronjena."
 
 #. TRANS: Form validation error displayed when trying to remove an incoming e-mail address while no address has been set.
-#: actions/emailsettings.php:519 actions/smssettings.php:554
 msgid "No incoming email address."
 msgstr "Žana adresa za dochadźace e-mejle."
 
 #. 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.
-#: actions/emailsettings.php:531 actions/emailsettings.php:555
-#: actions/smssettings.php:565 actions/smssettings.php:590
 msgid "Could not update user record."
 msgstr "Datowa sadźba wužiwarja njeda so aktualizować."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
 #. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:535 actions/smssettings.php:569
 msgid "Incoming email address removed."
 msgstr "Adresa za dochadźaće e-mejle wotstronjena."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
 #. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:559 actions/smssettings.php:594
 msgid "New incoming email address added."
 msgstr "Nowa adresa za dochadźace e-mejle přidata."
 
 #. TRANS: Client error displayed when trying to mark a notice as favorite that already is a favorite.
-#: actions/favor.php:80
 msgid "This notice is already a favorite!"
 msgstr "Tuta zdźělenka je hižo faworit!"
 
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
-#: actions/favor.php:95
 msgid "Disfavor favorite."
 msgstr "Z faworitow wotstronić."
 
 #. TRANS: Page title for first page of favorited notices.
 #. TRANS: Title for favourited notices section.
-#: actions/favorited.php:65 lib/popularnoticesection.php:62
-#: lib/publicgroupnav.php:93
 msgid "Popular notices"
 msgstr "Woblubowane zdźělenki"
 
 #. TRANS: Page title for all but first page of favorited notices.
 #. TRANS: %d is the page number being displayed.
-#: actions/favorited.php:69
 #, php-format
 msgid "Popular notices, page %d"
 msgstr "Woblubowane zdźělenki, strona %d"
 
 #. TRANS: Description on page displaying favorited notices.
-#: actions/favorited.php:81
 msgid "The most popular notices on the site right now."
 msgstr ""
 
 #. TRANS: Text displayed instead of a list when a site does not yet have any favourited notices.
-#: actions/favorited.php:149
 msgid "Favorite notices appear on this page but no one has favorited one yet."
 msgstr ""
 
 #. TRANS: Additional text displayed instead of a list when a site does not yet have any favourited notices for logged in users.
-#: actions/favorited.php:153
 msgid ""
 "Be the first to add a notice to your favorites by clicking the fave button "
 "next to any notice you like."
@@ -2683,7 +2124,6 @@ msgstr ""
 
 #. TRANS: Additional text displayed instead of a list when a site does not yet have any favourited notices for not logged in users.
 #. TRANS: %%action.register%% is a registration link. "[link text](link)" is Mark Down. Do not change the formatting.
-#: actions/favorited.php:158
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to add a "
@@ -2694,181 +2134,146 @@ msgstr ""
 #. TRANS: %s is a user's nickname.
 #. TRANS: Title for first page of favourite notices of a user.
 #. TRANS: %s is the user for whom the favourite notices are displayed.
-#: actions/favoritesrss.php:111 actions/showfavorites.php:76
-#: lib/personalgroupnav.php:110
 #, php-format
 msgid "%s's favorite notices"
 msgstr "Fawority wužiwarja %s"
 
 #. TRANS: Desciption of RSS feed with favourite notices of a user.
 #. TRANS: %1$s is a user's nickname, %2$s is the name of the StatusNet site.
-#: actions/favoritesrss.php:117
 #, php-format
 msgid "Updates favored by %1$s on %2$s!"
 msgstr "Aktualizacije preferowane wot %1$s na %2$s!"
 
 #. TRANS: Page title for first page of featured users.
 #. TRANS: Title for featured users section.
-#: actions/featured.php:69 lib/featureduserssection.php:87
-#: lib/publicgroupnav.php:89
 msgid "Featured users"
 msgstr "Nazhonići wužiwarjo"
 
 #. TRANS: Page title for all but first page of featured users.
 #. TRANS: %d is the page number being displayed.
-#: actions/featured.php:73
 #, php-format
 msgid "Featured users, page %d"
 msgstr "Nazhonići wužiwarjo, strona %d"
 
 #. TRANS: Description on page displaying featured users.
-#: actions/featured.php:102
 #, php-format
 msgid "A selection of some great users on %s."
 msgstr "Wuběr wulkotnych wužiwarjow na %s."
 
 #. TRANS: Client error displayed when no notice ID was given trying do display a file.
-#: actions/file.php:36
 msgid "No notice ID."
 msgstr "Žadyn ID zdźělenki."
 
 #. TRANS: Client error displayed when an invalid notice ID was given trying do display a file.
-#: actions/file.php:41
 msgid "No notice."
 msgstr "Žana zdźělenka."
 
 #. TRANS: Client error displayed when trying do display a file for a notice without a file attachement.
-#: actions/file.php:46
 msgid "No attachments."
 msgstr "Žane přiwěški."
 
 #. TRANS: Client error displayed when trying do display a file for a notice with file attachements
 #. TRANS: that could not be found.
-#: actions/file.php:58
 msgid "No uploaded attachments."
 msgstr "Žane nahrate přiwěški."
 
 #. TRANS: Client error displayed when subscribing to a remote profile and an unexpected response is received.
-#: actions/finishremotesubscribe.php:69
 msgid "Not expecting this response!"
 msgstr "Njewočakowana wotmołwa!"
 
 #. TRANS: Client error displayed when subscribing to a remote profile that does not exist.
-#: actions/finishremotesubscribe.php:81
 msgid "User being listened to does not exist."
 msgstr ""
 
 #. TRANS: Client error displayed when subscribing to a remote profile that is a local profile.
-#: actions/finishremotesubscribe.php:89 actions/remotesubscribe.php:58
 msgid "You can use the local subscription!"
 msgstr "Móžeš lokalny abonement wužiwać!"
 
 #. TRANS: Client error displayed when subscribing to a remote profile that is blocked form subscribing to.
-#: actions/finishremotesubscribe.php:102
 msgid "That user has blocked you from subscribing."
 msgstr "Tutón wužiwar ći abonowanje njedowoli."
 
 #. TRANS: Client error displayed when subscribing to a remote profile without providing an authorised token.
-#: actions/finishremotesubscribe.php:114
 msgid "You are not authorized."
 msgstr "Njejsy awtorizowany."
 
 #. TRANS: Client error displayed when subscribing to a remote profile and conversion of the request token to access token fails.
-#: actions/finishremotesubscribe.php:118
 msgid "Could not convert request token to access token."
 msgstr ""
 
 #. TRANS: Client error displayed when subscribing to a remote profile fails because of an unsupported version of the OMB protocol.
-#: actions/finishremotesubscribe.php:124
 msgid "Remote service uses unknown version of OMB protocol."
 msgstr ""
 
 #. TRANS: Server error displayed when subscribing to a remote profile fails because the remote profile could not be updated.
-#: actions/finishremotesubscribe.php:145 lib/oauthstore.php:317
 msgid "Error updating remote profile."
 msgstr "Zmylk při aktualizaciji zdaleneho profila."
 
 #. TRANS: Client error displayed when requesting a non-existent file.
-#: actions/getfile.php:77
 msgid "No such file."
 msgstr "Dataja njeeksistuje."
 
 #. TRANS: Client error displayed when requesting a file without having read access to it.
-#: actions/getfile.php:82
 msgid "Cannot read file."
 msgstr "Dataja njeda so čitać."
 
 #. TRANS: Client error displayed when trying to assign an invalid role to a user.
-#: actions/grantrole.php:61 actions/revokerole.php:62
 msgid "Invalid role."
 msgstr "Njepłaćiwa róla."
 
 #. TRANS: Client error displayed when trying to assign an reserved role to a user.
-#: actions/grantrole.php:66 actions/revokerole.php:66
 msgid "This role is reserved and cannot be set."
 msgstr "Tuta róla je wuměnjena a njeda so stajić."
 
 #. TRANS: Client error displayed when trying to assign a role to a user while not being allowed to set roles.
-#: actions/grantrole.php:76
 msgid "You cannot grant user roles on this site."
 msgstr "Njemóžeš wužiwarske róle na tutym sydle garantować."
 
 #. TRANS: Client error displayed when trying to assign a role to a user that already has that role.
-#: actions/grantrole.php:84
 msgid "User already has this role."
 msgstr "Wužiwar hižo ma tutu rólu."
 
 #. TRANS: Client error displayed trying to block a user from a group while not specifying a to be blocked user profile.
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing a profile.
+#. TRANS: Client error displayed when not providing a profile ID on the Make Admin page.
 #. TRANS: Client error displayed trying a change a subscription without providing a profile.
 #. TRANS: Client error displayed when trying to change user options without specifying a user to work on.
-#: actions/groupblock.php:71 actions/groupunblock.php:71
-#: actions/makeadmin.php:71 actions/subedit.php:49
-#: lib/profileformaction.php:79
 msgid "No profile specified."
 msgstr "Žadyn profil podaty."
 
 #. TRANS: Client error displayed trying to block a user from a group while specifying a non-existing profile.
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing an existing profile.
+#. TRANS: Client error displayed when specifying an invalid profile ID on the Make Admin page.
 #. TRANS: Client error displayed trying a change a subscription for a non-existant profile ID.
 #. TRANS: Client error displayed when trying to change user options without specifying an existing user to work on.
-#: actions/groupblock.php:77 actions/groupunblock.php:77
-#: actions/makeadmin.php:76 actions/subedit.php:57 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:87
 msgid "No profile with that ID."
 msgstr "Žadyn profil z tym ID."
 
 #. TRANS: Client error displayed trying to block a user from a group while not specifying a group to block a profile from.
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing a group.
-#: actions/groupblock.php:83 actions/groupunblock.php:83
-#: actions/makeadmin.php:81
+#. TRANS: Client error displayed when not providing a group ID on the Make Admin page.
 msgid "No group specified."
 msgstr "Žana skupina podata."
 
 #. TRANS: Client error displayed trying to block a user from a group while not being an admin user.
-#: actions/groupblock.php:95
 msgid "Only an admin can block group members."
 msgstr "Jenož administrator móže skupinskich čłonow blokować."
 
 #. TRANS: Client error displayed trying to block a user from a group while user is already blocked from the given group.
-#: actions/groupblock.php:100
 msgid "User is already blocked from group."
 msgstr "Wužiwar je hižo za skupinu zablokowany."
 
 #. TRANS: Client error displayed trying to block a user from a group while user is not a member of given group.
-#: actions/groupblock.php:106
 msgid "User is not a member of group."
 msgstr "Wužiwar njeje čłon skupiny."
 
 #. TRANS: Title for block user from group page.
 #. TRANS: Form legend for form to block user from a group.
-#: actions/groupblock.php:141 actions/groupmembers.php:364
 msgid "Block user from group"
 msgstr "Wužiwarja za skupinu blokować"
 
 #. TRANS: Explanatory text for block user from group form before setting the block.
 #. TRANS: %1$s is that to be blocked user, %2$s is the group the user will be blocked from.
-#: actions/groupblock.php:169
 #, php-format
 msgid ""
 "Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They "
@@ -2877,62 +2282,51 @@ msgid ""
 msgstr ""
 
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
-#: actions/groupblock.php:191
 msgid "Do not block this user from this group."
 msgstr "Tutoho wužiwarja za tutu skupinu njeblokować."
 
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
-#: actions/groupblock.php:198
 msgid "Block this user from this group."
 msgstr "Tutoho wužiwarja za tutu skupinu blokować."
 
 #. TRANS: Server error displayed when trying to block a user from a group fails because of an application error.
-#: actions/groupblock.php:215
 msgid "Database error blocking user from group."
 msgstr "Zmylk datoweje banki blokuje wužiwarja za skupinu."
 
 #. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
 #. TRANS: Client error displayed trying to find a user by ID without providing an ID.
-#: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr "Žadyn ID."
 
 #. TRANS: Client error displayed trying to change group design settings while not logged in.
-#: actions/groupdesignsettings.php:67
 msgid "You must be logged in to edit a group."
 msgstr "Dyrbiš přizjewjeny być, zo by skupinu wobdźěłał."
 
 #. TRANS: Title group design settings page.
-#: actions/groupdesignsettings.php:146
 msgid "Group design"
 msgstr "Skupinski design"
 
 #. TRANS: Instructions for group design settings page.
-#: actions/groupdesignsettings.php:157
 msgid ""
 "Customize the way your group looks with a background image and a colour "
 "palette of your choice."
 msgstr ""
 
 #. TRANS: Form validation error displayed when group design settings could not be updated because of an application issue.
-#: actions/groupdesignsettings.php:262
 msgid "Unable to update your design settings."
 msgstr "Njeje móžno, twoje designowe nastajenja aktualizować."
 
 #. TRANS: Form text to confirm saved group design settings.
-#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:239
 msgid "Design preferences saved."
 msgstr "Designowe nastajenja składowane."
 
 #. TRANS: Title for group logo settings page.
 #. TRANS: Group logo form legend.
-#: actions/grouplogo.php:144 actions/grouplogo.php:199
 msgid "Group logo"
 msgstr "Skupinske logo"
 
 #. TRANS: Instructions for group logo page.
 #. TRANS: %s is the maximum file size for that site.
-#: actions/grouplogo.php:156
 #, php-format
 msgid ""
 "You can upload a logo image for your group. The maximum file size is %s."
@@ -2941,98 +2335,81 @@ msgstr ""
 "s."
 
 #. TRANS: Submit button for uploading a group logo.
-#: actions/grouplogo.php:243
 msgid "Upload"
 msgstr "Nahrać"
 
 #. TRANS: Button text for cropping an uploaded group logo.
-#: actions/grouplogo.php:299
 msgid "Crop"
 msgstr "Přirězać"
 
 #. TRANS: Form instructions on the group logo page.
-#: actions/grouplogo.php:376
 msgid "Pick a square area of the image to be the logo."
 msgstr ""
 
 #. TRANS: Form success message after updating a group logo.
-#: actions/grouplogo.php:411
 msgid "Logo updated."
 msgstr "Logo zaktualizowane."
 
 #. TRANS: Form failure message after failing to update a group logo.
-#: actions/grouplogo.php:414
 msgid "Failed updating logo."
 msgstr "Aktualizowanje loga je so njeporadźiło."
 
 #. TRANS: Title of the page showing group members.
 #. TRANS: %s is the name of the group.
-#: actions/groupmembers.php:104
 #, php-format
 msgid "%s group members"
 msgstr "%s skupinskich čłonow"
 
 #. TRANS: Title of the page showing group members.
 #. TRANS: %1$s is the name of the group, %2$d is the page number of the members list.
-#: actions/groupmembers.php:109
 #, php-format
 msgid "%1$s group members, page %2$d"
 msgstr "%1$s skupinskich čłonow, strona %2$d"
 
 #. TRANS: Page notice for group members page.
-#: actions/groupmembers.php:125
 msgid "A list of the users in this group."
 msgstr "Lisćina wužiwarjow w tutej skupinje."
 
 #. TRANS: Indicator in group members list that this user is a group administrator.
-#: actions/groupmembers.php:190 lib/action.php:581
 msgid "Admin"
 msgstr "Administrator"
 
 #. TRANS: Button text for the form that will block a user from a group.
-#: actions/groupmembers.php:397
 msgctxt "BUTTON"
 msgid "Block"
 msgstr "Blokować"
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:401
 msgctxt "TOOLTIP"
 msgid "Block this user"
 msgstr "Tutoho wužiwarja blokować"
 
 #. TRANS: Form legend for form to make a user a group admin.
-#: actions/groupmembers.php:488
 msgid "Make user an admin of the group"
 msgstr "Wužiwarja k administratorej skupiny činić"
 
 #. TRANS: Button text for the form that will make a user administrator.
-#: actions/groupmembers.php:521
 msgctxt "BUTTON"
 msgid "Make Admin"
 msgstr "K administratorej činić"
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:525
 msgctxt "TOOLTIP"
 msgid "Make this user an admin"
 msgstr "Tutoho wužiwarja k administratorej činić"
 
 #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
-#: actions/grouprss.php:141
 #, php-format
 msgid "Updates from members of %1$s on %2$s!"
 msgstr "Aktualizacije wot  %1$s na %2$s!"
 
 #. TRANS: Title for first page of the groups list.
-#: actions/groups.php:62
 msgctxt "TITLE"
 msgid "Groups"
 msgstr "Skupiny"
 
 #. TRANS: Title for all but the first page of the groups list.
 #. TRANS: %d is the page number.
-#: actions/groups.php:66
 #, php-format
 msgctxt "TITLE"
 msgid "Groups, page %d"
@@ -3041,7 +2418,6 @@ msgstr "Skupiny, strona %d"
 #. TRANS: Page notice of group list. %%%%site.name%%%% is the StatusNet site name,
 #. TRANS: %%%%action.groupsearch%%%% and %%%%action.newgroup%%%% are URLs. Do not change them.
 #. TRANS: This message contains Markdown links in the form [link text](link).
-#: actions/groups.php:95
 #, php-format
 msgid ""
 "%%%%site.name%%%% groups let you find and talk with people of similar "
@@ -3052,12 +2428,10 @@ msgid ""
 msgstr ""
 
 #. TRANS: Link to create a new group on the group list page.
-#: actions/groups.php:113 actions/usergroups.php:126 lib/groupeditform.php:115
 msgid "Create a new group"
 msgstr "Nowu skupinu wutworić"
 
 #. TRANS: Instructions for page where groups can be searched. %%site.name%% is the name of the StatusNet site.
-#: actions/groupsearch.php:53
 #, php-format
 msgid ""
 "Search for groups on %%site.name%% by their name, location, or description. "
@@ -3065,21 +2439,17 @@ msgid ""
 msgstr ""
 
 #. TRANS: Title for page where groups can be searched.
-#: actions/groupsearch.php:60
 msgid "Group search"
 msgstr "Skupinske pytanje"
 
 #. TRANS: Text on page where groups can be searched if no results were found for a query.
 #. TRANS: Text for notice search results is the query had no results.
 #. TRANS: Message on the "People search" page where a query has no results.
-#: actions/groupsearch.php:82 actions/noticesearch.php:122
-#: actions/peoplesearch.php:87
 msgid "No results."
 msgstr "Žane wuslědki."
 
 #. TRANS: Additional text on page where groups can be searched if no results were found for a query for a logged in user.
 #. TRANS: This message contains Markdown links in the form [link text](link).
-#: actions/groupsearch.php:87
 #, php-format
 msgid ""
 "If you cannot find the group you're looking for, you can [create it](%%"
@@ -3090,7 +2460,6 @@ msgstr ""
 
 #. TRANS: Additional text on page where groups can be searched if no results were found for a query for a not logged in user.
 #. TRANS: This message contains Markdown links in the form [link text](link).
-#: actions/groupsearch.php:92
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and [create the group](%%"
@@ -3098,30 +2467,25 @@ msgid ""
 msgstr ""
 
 #. TRANS: Client error displayed when trying to unblock a user from a group without being an administrator for the group.
-#: actions/groupunblock.php:95
 msgid "Only an admin can unblock group members."
 msgstr "Jenož administrator móže skupinskich čłonow wotblokować."
 
 #. TRANS: Client error displayed when trying to unblock a non-blocked user from a group.
-#: actions/groupunblock.php:100
 msgid "User is not blocked from group."
 msgstr "Wužiwar njeje zablokowany za skupinu."
 
 #. TRANS: Server error displayed when unblocking a user from a group fails because of an unknown error.
 #. TRANS: Server error displayed when removing a user block.
-#: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "Zmylk při wotstronjenju blokowanja."
 
 #. TRANS: Title for Instant Messaging settings.
-#: actions/imsettings.php:56
 msgid "IM settings"
 msgstr "IM-nastajenja"
 
 #. 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.
-#: actions/imsettings.php:69
 #, php-format
 msgid ""
 "You can send and receive notices through instant messaging [instant messages]"
@@ -3129,53 +2493,44 @@ msgid ""
 msgstr ""
 
 #. TRANS: Message given in the IM settings if IM is not enabled on the site.
-#: actions/imsettings.php:90
 msgid "IM is not available."
 msgstr "IM k dispoziciji njesteji."
 
-#: actions/imsettings.php:116
 #, fuzzy, php-format
 msgid "Current confirmed %s address."
 msgstr "Aktualna wobkrućena e-mejlowa adresa."
 
 #. TRANS: Form note in IM settings form.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:128
 #, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your %s account for a message "
 "with further instructions. (Did you add %s to your buddy list?)"
 msgstr ""
 
-#: actions/imsettings.php:140
 msgid "IM address"
 msgstr "IM-adresa"
 
-#: actions/imsettings.php:142
 #, php-format
 msgid "%s screenname."
 msgstr ""
 
 #. TRANS: Header for IM preferences form.
-#: actions/imsettings.php:163
 #, fuzzy
 msgid "IM Preferences"
 msgstr "IM-nastajenja"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:174
 #, fuzzy
 msgid "Send me notices"
 msgstr "Zdźělenku pósłać"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:176
 #, fuzzy
 msgid "Post a notice when my status changes."
 msgstr "Powěsć pósłac, hdyž so mój status Jabber/Google Talk změni."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:178
 #, fuzzy
 msgid "Send me replies from people I'm not subscribed to."
 msgstr ""
@@ -3183,120 +2538,100 @@ msgstr ""
 "abonował."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:181
 #, fuzzy
 msgid "Publish a MicroID"
 msgstr "MicroID za moju e-mejlowu adresu publikować"
 
 #. TRANS: Server error thrown on database error updating IM preferences.
-#: actions/imsettings.php:291
 #, fuzzy
 msgid "Couldn't update IM preferences."
 msgstr "Wužiwar njeje so dał aktualizować."
 
 #. TRANS: Confirmation message for successful IM preferences save.
 #. TRANS: Confirmation message after saving preferences.
-#: actions/imsettings.php:298 actions/urlsettings.php:244
 msgid "Preferences saved."
 msgstr "Nastajenja składowane."
 
 #. TRANS: Message given saving IM address without having provided one.
-#: actions/imsettings.php:320
 #, fuzzy
 msgid "No screenname."
 msgstr "Žane přimjeno."
 
-#: actions/imsettings.php:325
 #, fuzzy
 msgid "No transport."
 msgstr "Žana zdźělenka."
 
 #. TRANS: Message given saving IM address that cannot be normalised.
-#: actions/imsettings.php:333
 #, fuzzy
 msgid "Cannot normalize that screenname"
 msgstr "Tutón Jabber-ID njehodźi so normalizować"
 
 #. TRANS: Message given saving IM address that not valid.
-#: actions/imsettings.php:340
 #, fuzzy
 msgid "Not a valid screenname"
 msgstr "Žane płaćiwe přimjeno."
 
 #. TRANS: Message given saving IM address that is already set for another user.
-#: actions/imsettings.php:344
 #, fuzzy
 msgid "Screenname already belongs to another user."
 msgstr "Jabber-ID hižo druhemu wužiwarjej słuša."
 
 #. TRANS: Message given saving valid IM address that is to be confirmed.
-#: actions/imsettings.php:369
 #, fuzzy
 msgid "A confirmation code was sent to the IM address you added."
 msgstr "Tutón wobkrućenski kod njeje za tebje!"
 
 #. TRANS: Message given canceling IM address confirmation for the wrong IM address.
-#: actions/imsettings.php:396
 msgid "That is the wrong IM address."
 msgstr "to je wopačna IM-adresa."
 
 #. TRANS: Server error thrown on database error canceling IM address confirmation.
-#: actions/imsettings.php:405
 #, fuzzy
 msgid "Couldn't delete confirmation."
 msgstr "IM-wobkrućenje njeda so zhašeć."
 
 #. TRANS: Message given after successfully canceling IM address confirmation.
-#: actions/imsettings.php:410
 msgid "IM confirmation cancelled."
 msgstr "IM-wobkrućenje přetorhnjene."
 
 #. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.
-#: actions/imsettings.php:434
 #, fuzzy
 msgid "That is not your screenname."
 msgstr "To twoje telefonowe čisło njeje."
 
 #. TRANS: Server error thrown on database error removing a registered IM address.
-#: actions/imsettings.php:443
 #, fuzzy
 msgid "Couldn't update user im prefs."
 msgstr "Datowa sadźba wužiwarja njeda so aktualizować."
 
 #. TRANS: Message given after successfully removing a registered Instant Messaging address.
-#: actions/imsettings.php:451
 msgid "The IM address was removed."
 msgstr "IM-adresa bu wotstronjena."
 
 #. TRANS: Title for all but the first page of the inbox page.
 #. TRANS: %1$s is the user's nickname, %2$s is the page number.
-#: actions/inbox.php:59
 #, php-format
 msgid "Inbox for %1$s - page %2$d"
 msgstr "Dochadny póst za %1$s - strona %2$d"
 
 #. TRANS: Title for the first page of the inbox page.
 #. TRANS: %s is the user's nickname.
-#: actions/inbox.php:64
 #, php-format
 msgid "Inbox for %s"
 msgstr "Dochadny póst za %s"
 
 #. TRANS: Instructions for user inbox page.
-#: actions/inbox.php:106
 msgid "This is your inbox, which lists your incoming private messages."
 msgstr ""
 "To je twój dochadny póst, kotryž twoje priwatne dochadne powěsće nalistuje."
 
 #. TRANS: Client error displayed when trying to sent invites while they have been disabled.
-#: actions/invite.php:41
 msgid "Invites have been disabled."
 msgstr "Přeprošenja buchu znjemóžnjene."
 
 #. TRANS: Client error displayed when trying to sent invites while not logged in.
 #. TRANS: %s is the StatusNet site name.
-#: actions/invite.php:45
 #, php-format
 msgid "You must be logged in to invite other users to use %s."
 msgstr ""
@@ -3305,18 +2640,15 @@ msgstr ""
 
 #. TRANS: Form validation message when providing an e-mail address that does not validate.
 #. TRANS: %s is an invalid e-mail address.
-#: actions/invite.php:78
 #, php-format
 msgid "Invalid email address: %s."
 msgstr "Njepłaćiwa e-mejlowa adresa: %s"
 
 #. TRANS: Page title when invitations have been sent.
-#: actions/invite.php:117
 msgid "Invitations sent"
 msgstr "Přeprošenja pósłane"
 
 #. TRANS: Page title when inviting potential users.
-#: actions/invite.php:120
 msgid "Invite new users"
 msgstr "Nowych wužiwarjow přeprosyć"
 
@@ -3324,7 +2656,6 @@ msgstr "Nowych wužiwarjow přeprosyć"
 #. TRANS: is already subscribed to one or more users with the given e-mail address(es).
 #. TRANS: Plural form is based on the number of reported already subscribed e-mail addresses.
 #. TRANS: Followed by a bullet list.
-#: actions/invite.php:140
 msgid "You are already subscribed to this user:"
 msgid_plural "You are already subscribed to these users:"
 msgstr[0] "Sy tutoho wužiwarja hižo abonował:"
@@ -3334,7 +2665,6 @@ msgstr[3] "Sy tutych wužiwarjow hižo abonował:"
 
 #. TRANS: Used as list item for already subscribed users (%1$s is nickname, %2$s is e-mail address).
 #. TRANS: Used as list item for already registered people (%1$s is nickname, %2$s is e-mail address).
-#: actions/invite.php:146 actions/invite.php:160
 #, php-format
 msgctxt "INVITE"
 msgid "%1$s (%2$s)"
@@ -3343,7 +2673,6 @@ msgstr "%1$s (%2$s)"
 #. TRANS: Message displayed inviting users to use a StatusNet site while the invited user
 #. TRANS: already uses a this StatusNet site. Plural form is based on the number of
 #. TRANS: reported already present people. Followed by a bullet list.
-#: actions/invite.php:154
 msgid "This person is already a user and you were automatically subscribed:"
 msgid_plural ""
 "These people are already users and you were automatically subscribed to them:"
@@ -3356,7 +2685,6 @@ msgstr[3] "Tući ludźo su hižo wužiwarjo a ty sy jich awtomatisce abonował:"
 #. TRANS: Message displayed inviting users to use a StatusNet site. Plural form is
 #. TRANS: based on the number of invitations sent. Followed by a bullet list of
 #. TRANS: e-mail addresses to which invitations were sent.
-#: actions/invite.php:168
 msgid "Invitation sent to the following person:"
 msgid_plural "Invitations sent to the following people:"
 msgstr[0] "Přeprošenje, kotrež bu na slědowacu wosobu pósłane:"
@@ -3366,14 +2694,12 @@ msgstr[3] "Přeprošenja, kotrež buchu na slědowacych ludźi pósłane:"
 
 #. TRANS: Generic message displayed after sending out one or more invitations to
 #. TRANS: people to join a StatusNet site.
-#: actions/invite.php:178
 msgid ""
 "You will be notified when your invitees accept the invitation and register "
 "on the site. Thanks for growing the community!"
 msgstr ""
 
 #. TRANS: Form instructions.
-#: actions/invite.php:191
 msgid ""
 "Use this form to invite your friends and colleagues to use this service."
 msgstr ""
@@ -3381,27 +2707,23 @@ msgstr ""
 "tutu słužbu wužiwali."
 
 #. TRANS: Field label for a list of e-mail addresses.
-#: actions/invite.php:218
 msgid "Email addresses"
 msgstr "E-mejlowe adresy"
 
 #. TRANS: Tooltip for field label for a list of e-mail addresses.
-#: actions/invite.php:221
 msgid "Addresses of friends to invite (one per line)."
 msgstr "Adresy přećelow, kotřiž maja so přeprosyć (jedna na linku)"
 
 #. TRANS: Field label for a personal message to send to invitees.
-#: actions/invite.php:225
 msgid "Personal message"
 msgstr "Wosobinska powěsć"
 
 #. TRANS: Tooltip for field label for a personal message to send to invitees.
-#: actions/invite.php:228
 msgid "Optionally add a personal message to the invitation."
 msgstr "Wosobinsku powěsć po dobrozdaću přeprošenju přidać."
 
 #. TRANS: Send button for inviting friends
-#: actions/invite.php:232
+#. TRANS: Button text for sending notice.
 msgctxt "BUTTON"
 msgid "Send"
 msgstr "Pósłać"
@@ -3409,7 +2731,6 @@ msgstr "Pósłać"
 #. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral
 #. TRANS: singular 3rd-person pronoun in English. %1$s is the inviting user, $2$s is
 #. TRANS: the StatusNet sitename.
-#: actions/invite.php:264
 #, php-format
 msgid "%1$s has invited you to join them on %2$s"
 msgstr "%1$s je će přeprosył, na %2$s sobu činić"
@@ -3419,7 +2740,6 @@ msgstr "%1$s je će přeprosył, na %2$s sobu činić"
 #. TRANS: StatusNet sitename, %3$s is the site URL, %4$s is the personal message from the
 #. TRANS: inviting user, %s%5 a link to the timeline for the inviting user, %s$6 is a link
 #. TRANS: to register with the StatusNet site.
-#: actions/invite.php:271
 #, php-format
 msgid ""
 "%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -3451,181 +2771,176 @@ msgid ""
 msgstr ""
 
 #. TRANS: Client error displayed when trying to join a group while not logged in.
-#: actions/joingroup.php:59
 msgid "You must be logged in to join a group."
 msgstr "Dyrbiš přizjewjeny być, zo by do skupiny zastupił."
 
 #. TRANS: Title for join group page after joining.
-#: actions/joingroup.php:148
 #, php-format
 msgctxt "TITLE"
 msgid "%1$s joined group %2$s"
 msgstr "%1$s je do skupiny %2$s zastupił"
 
 #. TRANS: Client error displayed when trying to leave a group while not logged in.
-#: actions/leavegroup.php:59
 msgid "You must be logged in to leave a group."
 msgstr "Dyrbiš přizjewjeny być, zo by skupinu wopušćił."
 
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
-#: actions/leavegroup.php:103 lib/command.php:398
 msgid "You are not a member of that group."
 msgstr "Njejsy čłon teje skupiny."
 
 #. TRANS: Title for leave group page after leaving.
-#: actions/leavegroup.php:142
 #, php-format
 msgctxt "TITLE"
 msgid "%1$s left group %2$s"
 msgstr "%1$s je skupinu %2$s wopušćił"
 
 #. TRANS: User admin panel title
-#: actions/licenseadminpanel.php:55
 msgctxt "TITLE"
 msgid "License"
 msgstr "Licenca"
 
-#: actions/licenseadminpanel.php:65
+#. TRANS: Form instructions for the site license admin panel.
 msgid "License for this StatusNet site"
 msgstr "Licenca za tute sydło StatusNet"
 
-#: actions/licenseadminpanel.php:134
+#. TRANS: Client error displayed selecting an invalid license in the license admin panel.
 msgid "Invalid license selection."
 msgstr "Njepłaćiwy wuběr licency."
 
-#: actions/licenseadminpanel.php:144
+#. TRANS: Client error displayed when not specifying an owner for the all rights reserved license in the license admin panel.
 msgid ""
 "You must specify the owner of the content when using the All Rights Reserved "
 "license."
 msgstr ""
 
-#: actions/licenseadminpanel.php:151
+#. TRANS: Client error displayed selecting a too long license title in the license admin panel.
 msgid "Invalid license title. Maximum length is 255 characters."
 msgstr "Njepłaćiwy titul licency. Maksimalna dołhosć je 255 znamješkow."
 
-#: actions/licenseadminpanel.php:163
+#. TRANS: Client error displayed specifying an invalid license URL in the license admin panel.
 msgid "Invalid license URL."
 msgstr "Njepłaćiwy URL licency."
 
-#: actions/licenseadminpanel.php:166
+#. TRANS: Client error displayed specifying an invalid license image URL in the license admin panel.
 msgid "Invalid license image URL."
 msgstr "Njepłaćiwy URL wobraza licency."
 
-#: actions/licenseadminpanel.php:174
+#. TRANS: Client error displayed specifying an invalid license URL in the license admin panel.
 msgid "License URL must be blank or a valid URL."
 msgstr "Licencowy URL dyrbi prózdny abo płaćiwy URL być."
 
-#: actions/licenseadminpanel.php:182
+#. TRANS: Client error displayed specifying an invalid license image URL in the license admin panel.
 msgid "License image must be blank or valid URL."
 msgstr "Licencowy wobraz dyrbi prózdny abo płaćiwy URL być."
 
-#: actions/licenseadminpanel.php:232
+#. TRANS: Form legend in the license admin panel.
 msgid "License selection"
 msgstr "Wuběr licency"
 
-#: actions/licenseadminpanel.php:238
+#. TRANS: License option in the license admin panel.
 msgid "Private"
 msgstr "Priwatny"
 
-#: actions/licenseadminpanel.php:239
+#. TRANS: License option in the license admin panel.
 msgid "All Rights Reserved"
 msgstr "Wšě prawa wuměnjene."
 
-#: actions/licenseadminpanel.php:240
+#. TRANS: License option in the license admin panel.
 msgid "Creative Commons"
 msgstr "Cresative Commons"
 
-#: actions/licenseadminpanel.php:245
+#. TRANS: Dropdown field label in the license admin panel.
 msgid "Type"
 msgstr "Typ"
 
-#: actions/licenseadminpanel.php:247
-msgid "Select license"
+#. TRANS: Dropdown field instructions in the license admin panel.
+#, fuzzy
+msgid "Select a license."
 msgstr "Licencu wubrać"
 
-#: actions/licenseadminpanel.php:261
+#. TRANS: Form legend in the license admin panel.
 msgid "License details"
 msgstr "Podrobnosće licency"
 
-#: actions/licenseadminpanel.php:267
+#. TRANS: Field label in the license admin panel.
 msgid "Owner"
 msgstr "Wobsedźer"
 
-#: actions/licenseadminpanel.php:268
+#. TRANS: Field title in the license admin panel.
 msgid "Name of the owner of the site's content (if applicable)."
 msgstr "Mjeno wobsedźerja wobsaha tutoho sydła (jeli trěbne)"
 
-#: actions/licenseadminpanel.php:276
+#. TRANS: Field label in the license admin panel.
 msgid "License Title"
 msgstr "Titul licency"
 
-#: actions/licenseadminpanel.php:277
+#. TRANS: Field title in the license admin panel.
 msgid "The title of the license."
 msgstr "Titul licency."
 
-#: actions/licenseadminpanel.php:285
+#. TRANS: Field label in the license admin panel.
 msgid "License URL"
 msgstr "URL licency"
 
-#: actions/licenseadminpanel.php:286
+#. TRANS: Field title in the license admin panel.
 msgid "URL for more information about the license."
 msgstr "URL za dalše informacije wo licency."
 
-#: actions/licenseadminpanel.php:293
+#. TRANS: Field label in the license admin panel.
 msgid "License Image URL"
 msgstr "URL wobraza licency"
 
-#: actions/licenseadminpanel.php:294
+#. TRANS: Field title in the license admin panel.
 msgid "URL for an image to display with the license."
 msgstr "URL za wobraz, kotryž ma so z licencu zwobraznić."
 
-#. TRANS: Submit button title.
-#: actions/licenseadminpanel.php:311 actions/sessionsadminpanel.php:199
-#: actions/siteadminpanel.php:292 actions/snapshotadminpanel.php:245
-#: actions/tagother.php:133 lib/applicationeditform.php:357
-msgid "Save"
-msgstr "Składować"
-
-#: actions/licenseadminpanel.php:311
-msgid "Save license settings"
+#. TRANS: Button title in the license admin panel.
+#, fuzzy
+msgid "Save license settings."
 msgstr "Licencne nastajenja składować"
 
+#. TRANS: Client error displayed when trying to log in while already logged in.
 #. TRANS: Client error displayed trying to use "one time password login" when already logged in.
-#: actions/login.php:97 actions/otp.php:62 actions/register.php:130
 msgid "Already logged in."
 msgstr "Hižo přizjewjeny."
 
-#: actions/login.php:125
+#. TRANS: Form validation error displayed when trying to log in with incorrect credentials.
 msgid "Incorrect username or password."
 msgstr "Wopačne wužiwarske mjeno abo hesło."
 
+#. TRANS: Server error displayed when during login a server error occurs.
 #. TRANS: Server error displayed when a user object could not be created trying to login using "one time password login".
-#: actions/login.php:131 actions/otp.php:127
 msgid "Error setting user. You are probably not authorized."
 msgstr "Zmylk při nastajenju wužiwarja. Snano njejsy awtorizowany."
 
-#: actions/login.php:185 actions/login.php:236 lib/action.php:598
+#. TRANS: Page title for login page.
 msgid "Login"
 msgstr "Přizjewić"
 
-#: actions/login.php:222
+#. TRANS: Form legend on login page.
 msgid "Login to site"
 msgstr "Při sydle přizjewić"
 
-#: actions/login.php:231 actions/register.php:469
+#. TRANS: Checkbox label label on login page.
 msgid "Remember me"
 msgstr "Składować"
 
-#: actions/login.php:232 actions/register.php:471
+#. TRANS: Checkbox title on login page.
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 
-#: actions/login.php:241
+#. TRANS: Button text for log in on login page.
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Login"
+msgstr "Přizjewić"
+
+#. TRANS: Link text for link to "reset password" on login page.
 msgid "Lost or forgotten password?"
 msgstr "Hesło zhubjene abo zabyte?"
 
-#: actions/login.php:259
+#. TRANS: Form instructions on login page before being able to change user settings.
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -3633,137 +2948,133 @@ msgstr ""
 "Prošu zapodaj z přičinow wěstoty swoje wužiwarske mjeno znowa, prjedy hač "
 "změniš swoje nastajenja."
 
-#: actions/login.php:263
+#. TRANS: Form instructions on login page.
 msgid "Login with your username and password."
 msgstr "Přizjewjenje z twojim wužiwarskim mjenom a hesłom."
 
-#: actions/login.php:266
+#. TRANS: Form instructions on login page. This message contains Markdown links in the form [Link text](Link).
+#. TRANS: %%action.register%% is a link to the registration page.
 #, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
 msgstr ""
 "Hišće nimaš wužiwarske mjeno? [Zregistruj (%%action.register%%) nowe konto."
 
-#: actions/makeadmin.php:92
+#. TRANS: Client error displayed when trying to make another user admin on the Make Admin page while not an admin.
 msgid "Only an admin can make another user an admin."
 msgstr "Jenož administrator móže druheho wužiwarja k administratorej činić."
 
-#: actions/makeadmin.php:96
+#. TRANS: Client error displayed when trying to make another user admin on the Make Admin page who already is admin.
+#. TRANS: %1$s is the user that is already admin, %2$s is the group user is already admin for.
 #, php-format
 msgid "%1$s is already an admin for group \"%2$s\"."
 msgstr "%1$s je hižo administrator za skupinu \"%2$s\"."
 
-#: actions/makeadmin.php:133
+#. TRANS: Server error displayed when trying to make another user admin on the Make Admin page fails
+#. TRANS: because the group membership record could not be gotten.
+#. TRANS: %1$s is the to be admin user, %2$s is the group user should be admin for.
 #, php-format
 msgid "Can't get membership record for %1$s in group %2$s."
 msgstr "Přistup na datowu sadźbu čłona %1$s w skupinje %2$s móžno njeje."
 
-#: actions/makeadmin.php:146
+#. TRANS: Server error displayed when trying to make another user admin on the Make Admin page fails
+#. TRANS: because the group adminship record coud not be saved properly.
+#. TRANS: %1$s is the to be admin user, %2$s is the group user is already admin for.
 #, php-format
 msgid "Can't make %1$s an admin for group %2$s."
 msgstr "Njeje móžno %1$s k administratorej w skupinje %2$s činić."
 
-#: actions/microsummary.php:69
+#. TRANS: Client error displayed trying to make a micro summary without providing a status.
 msgid "No current status."
 msgstr "Žadyn aktualny status."
 
 #. TRANS: This is the title of the form for adding a new application.
-#: actions/newapplication.php:52
 msgid "New application"
 msgstr "Nowa aplikacija"
 
 #. TRANS: Client error displayed trying to add a new application while not logged in.
-#: actions/newapplication.php:64
 msgid "You must be logged in to register an application."
 msgstr "Dyrbiš přizjewjeny być, zo by aplikaciju registrował."
 
 #. TRANS: Form instructions for registering a new application.
-#: actions/newapplication.php:147
 msgid "Use this form to register a new application."
 msgstr "Wužij tutón formular, zo by nowu aplikaciju registrował."
 
 #. TRANS: Validation error shown when not providing a source URL in the "New application" form.
-#: actions/newapplication.php:189
 msgid "Source URL is required."
 msgstr "Žórłowy URL je trěbny."
 
 #. TRANS: Server error displayed when an application could not be registered in the database through the "New application" form.
-#: actions/newapplication.php:279 actions/newapplication.php:289
 msgid "Could not create application."
 msgstr "Aplikacija njeda so wutworić."
 
 #. TRANS: Title for form to create a group.
-#: actions/newgroup.php:53
 msgid "New group"
 msgstr "Nowa skupina"
 
 #. TRANS: Client exception thrown when a user tries to create a group while banned.
-#: actions/newgroup.php:73 classes/User_group.php:485
 msgid "You are not allowed to create groups on this site."
 msgstr "Njesměš skupiny na tutym sydle zhašeć."
 
 #. TRANS: Form instructions for group create form.
-#: actions/newgroup.php:117
 msgid "Use this form to create a new group."
 msgstr "Wužij tutón formular, zo by nowu skupinu wutworił."
 
-#. TRANS: Group create form validation error.
-#: actions/newgroup.php:200
-msgid "Alias cannot be the same as nickname."
-msgstr "Alias njemóže samsne kaž přimjeno być."
-
-#: actions/newmessage.php:71 actions/newmessage.php:234
+#. TRANS: Page title for new direct message page.
+#. TRANS: Page title on page for sending a direct message.
 msgid "New message"
 msgstr "Nowa powěsć"
 
-#. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
-#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:513
-msgid "You can't send a message to this user."
+#. TRANS: Client error displayed trying to send a direct message to a user while sender and
+#. TRANS: receiver are not subscribed to each other.
+#, fuzzy
+msgid "You cannot send a message to this user."
 msgstr "Njemóžeš tutomu wužiwarju powěsć pósłać."
 
+#. TRANS: Form validator error displayed trying to send a direct message without content.
+#. TRANS: Client error displayed trying to send a notice without content.
 #. TRANS: Command exception text shown when trying to send a direct message to another user without content.
 #. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
-#: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:490
-#: lib/command.php:593
 msgid "No content!"
 msgstr "Žadyn wobsah!"
 
-#: actions/newmessage.php:161
+#. TRANS: Form validation error displayed trying to send a direct message without specifying a recipient.
 msgid "No recipient specified."
 msgstr "Žadyn přijimowar podaty."
 
+#. TRANS: Client error displayed trying to send a direct message to self.
 #. TRANS: Error text shown when trying to send a direct message to self.
-#: actions/newmessage.php:167 lib/command.php:517
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
 
-#: actions/newmessage.php:184
+#. TRANS: Page title after sending a direct message.
 msgid "Message sent"
 msgstr "Powěsć pósłana"
 
+#. TRANS: Confirmation text after sending a direct message.
+#. TRANS: %s is the direct message recipient.
 #. TRANS: Message given have sent a direct message to another user.
 #. TRANS: %s is the name of the other user.
-#: actions/newmessage.php:188 lib/command.php:525
 #, php-format
 msgid "Direct message to %s sent."
 msgstr "Direktna powěsć do %s pósłana."
 
-#: actions/newmessage.php:213 actions/newnotice.php:264
+#. TRANS: Page title after an AJAX error occurred on the "send direct message" page.
+#. TRANS: Page title after an AJAX error occurs on the send notice page.
 msgid "Ajax Error"
 msgstr "Zmylk Ajax"
 
-#: actions/newnotice.php:69
+#. TRANS: Page title for sending a new notice.
 msgid "New notice"
 msgstr "Nowa zdźělenka"
 
-#: actions/newnotice.php:230
+#. TRANS: Page title after sending a notice.
 msgid "Notice posted"
 msgstr "Zdźělenka wotpósłana"
 
 #. TRANS: Instructions for Notice search page.
 #. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/noticesearch.php:69
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -3771,20 +3082,17 @@ msgid ""
 msgstr ""
 
 #. TRANS: Title of the page where users can search for notices.
-#: actions/noticesearch.php:80
 msgid "Text search"
 msgstr "Tekstowe pytanje"
 
 #. TRANS: Test in RSS notice search.
 #. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearch.php:95
 #, php-format
 msgid "Search results for \"%1$s\" on %2$s"
 msgstr "Pytanske wuslědki za \"%1$s\" na %2$s"
 
 #. TRANS: Text for logged in users making a query for notices without results.
 #. TRANS: This message contains a Markdown link.
-#: actions/noticesearch.php:128
 #, php-format
 msgid ""
 "Be the first to [post on this topic](%%%%action.newnotice%%%%?"
@@ -3793,7 +3101,6 @@ msgstr ""
 
 #. TRANS: Text for not logged in users making a query for notices without results.
 #. TRANS: This message contains Markdown links.
-#: actions/noticesearch.php:133
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and be the first to "
@@ -3801,79 +3108,68 @@ msgid ""
 msgstr ""
 
 #. TRANS: RSS notice search feed title. %s is the query.
-#: actions/noticesearchrss.php:95
 #, php-format
 msgid "Updates with \"%s\""
 msgstr "Aktualizacije z \"%s\""
 
 #. TRANS: RSS notice search feed description.
 #. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearchrss.php:99
 #, php-format
 msgid "Updates matching search term \"%1$s\" on %2$s."
 msgstr ""
 "Aktualizacije, kotrež pytanskemu zapřijeću \"%1$s\" na \"%2$s\" wotpowěduja."
 
-#: actions/nudge.php:85
+#. TRANS: Client error displayed trying to nudge a user that cannot be nudged.
 msgid ""
 "This user doesn't allow nudges or hasn't confirmed or set their email "
 "address yet."
 msgstr ""
 
-#: actions/nudge.php:94
+#. TRANS: Page title after sending a nudge.
 msgid "Nudge sent"
 msgstr "Stork wotpósłany"
 
-#: actions/nudge.php:97
+#. TRANS: Confirmation text after sending a nudge.
 msgid "Nudge sent!"
 msgstr "Stork wotpósłany!"
 
 #. TRANS: Message displayed to an anonymous user trying to view OAuth application list.
-#: actions/oauthappssettings.php:57
 msgid "You must be logged in to list your applications."
 msgstr "Dyrbiš přizjewjeny być, zo by swoje aplikacije nalistował."
 
 #. TRANS: Page title for OAuth applications
-#: actions/oauthappssettings.php:73
 msgid "OAuth applications"
 msgstr "Aplikacije OAuth"
 
 #. TRANS: Page instructions for OAuth applications
-#: actions/oauthappssettings.php:85
 msgid "Applications you have registered"
 msgstr "Aplikacije, za kotrež sy zregistrował"
 
 #. TRANS: Empty list message on page with OAuth applications.
-#: actions/oauthappssettings.php:138
 #, php-format
 msgid "You have not registered any applications yet."
 msgstr "Hišće njejsy aplikacije zregistrował."
 
 #. TRANS: Title for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:69
 msgid "Connected applications"
 msgstr "Zwjazane aplikacije"
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:80
 msgid "The following connections exist for your account."
 msgstr "Slědowace zwiski za twoje konto eksistuja."
 
 #. TRANS: Client error when trying to revoke access for an application while not being a user of it.
-#: actions/oauthconnectionssettings.php:165
 msgid "You are not a user of that application."
 msgstr "Njejsy wužiwar tuteje aplikacije."
 
 #. TRANS: Client error when revoking access has failed for some reason.
 #. TRANS: %s is the application ID revoking access failed for.
-#: actions/oauthconnectionssettings.php:180
 #, php-format
 msgid "Unable to revoke access for application: %s."
 msgstr "Njemóžno přistup za aplikaciju cofnyć: %s-"
 
 #. TRANS: Success message after revoking access for an application.
 #. TRANS: %1$s is the application name, %2$s is the first part of the user token.
-#: actions/oauthconnectionssettings.php:199
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -3881,454 +3177,371 @@ msgid ""
 msgstr ""
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:210
 msgid "You have not authorized any applications to use your account."
 msgstr "Njejsy aplikacije za wužiwanje wašeho konta awtorizował."
 
 #. TRANS: Note for developers in the OAuth connection settings form.
 #. TRANS: This message contains a Markdown link. Do not separate "](".
 #. TRANS: %s is the URL to the OAuth settings.
-#: actions/oauthconnectionssettings.php:230
 #, php-format
 msgid ""
 "Are you a developer? [Register an OAuth client application](%s) to use with "
 "this instance of StatusNet."
 msgstr ""
 
-#: actions/oembed.php:64
+#. TRANS: Server error displayed in oEmbed action when path not found.
+#. TRANS: %s is a path.
 #, php-format
 msgid "\"%s\" not found."
 msgstr "\"%s\" njenamakany."
 
-#: actions/oembed.php:76
+#. TRANS: Server error displayed in oEmbed action when notice not found.
+#. TRANS: %s is a notice.
 #, php-format
 msgid "Notice %s not found."
 msgstr "Zdźělenka %s njenamakana."
 
-#: actions/oembed.php:80 actions/shownotice.php:100
+#. TRANS: Server error displayed in oEmbed action when notice has not profile.
 msgid "Notice has no profile."
 msgstr "Zdźělenka nima profil."
 
-#: actions/oembed.php:83 actions/shownotice.php:172
+#. TRANS: oEmbed title. %1$s is the author name, %2$s is the creation date.
 #, php-format
 msgid "%1$s's status on %2$s"
 msgstr "Status %1$s na %2$s"
 
-#: actions/oembed.php:95
+#. TRANS: Server error displayed in oEmbed action when attachment not found.
+#. TRANS: %d is an attachment ID.
 #, php-format
 msgid "Attachment %s not found."
 msgstr "Přiwěšk %s njenamakany."
 
-#: actions/oembed.php:136
+#. TRANS: Server error displayed in oEmbed request when a path is not supported.
+#. TRANS: %s is a path.
 #, php-format
 msgid "\"%s\" not supported for oembed requests."
 msgstr ""
 
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
-#: actions/oembed.php:168
 #, php-format
 msgid "Content type %s not supported."
 msgstr "Wobsahowy typ %s so njepodpěruje."
 
 #. TRANS: Error message displaying attachments. %s is the site's base URL.
-#: actions/oembed.php:172
 #, php-format
 msgid "Only %s URLs over plain HTTP please."
 msgstr ""
 
+#. TRANS: Server error displayed in oEmbed action when request specifies an unsupported data format.
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1207
-#: lib/apiaction.php:1234 lib/apiaction.php:1369
 msgid "Not a supported data format."
 msgstr "Njeje podpěrany datowy format."
 
 #. TRANS: ShortName in the OpenSearch interface when trying to find users.
-#: actions/opensearch.php:64
 msgid "People Search"
 msgstr "Ludźi pytać"
 
-#: actions/opensearch.php:68
+#. TRANS: ShortName in the OpenSearch interface when trying to find notices.
 msgid "Notice Search"
 msgstr "Zdźělenku pytać"
 
 #. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
-#: actions/otp.php:70
 msgid "No user ID specified."
 msgstr "Žadyn wužiwarski ID podaty."
 
 #. TRANS: Client error displayed trying to use "one time password login" without specifying a login token.
-#: actions/otp.php:86
 msgid "No login token specified."
 msgstr "Žane přizjewjenske znamješko podate."
 
 #. TRANS: Client error displayed trying to use "one time password login" without requesting a login token.
-#: actions/otp.php:94
 msgid "No login token requested."
 msgstr "Žadyn přizjewjenski token trěbny."
 
 #. TRANS: Client error displayed trying to use "one time password login" while specifying an invalid login token.
-#: actions/otp.php:100
 msgid "Invalid login token specified."
 msgstr "Njepłaćiwe přizjewjenske znamješko podate."
 
 #. TRANS: Client error displayed trying to use "one time password login" while specifying an expired login token.
-#: actions/otp.php:110
 msgid "Login token expired."
 msgstr "Přizjewjenske znamješko spadnjene."
 
 #. TRANS: Title for outbox for any but the fist page.
 #. TRANS: %1$s is the user nickname, %2$d is the page number.
-#: actions/outbox.php:57
 #, php-format
 msgid "Outbox for %1$s - page %2$d"
 msgstr "Wuchadny póst za %1$s - strona %2$d"
 
 #. TRANS: Title for first page of outbox.
-#: actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
 msgstr "Wuchadny póst za %s"
 
 #. TRANS: Instructions for outbox.
-#: actions/outbox.php:103
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr ""
 "To je twój wuchadny póst, kotryž twoje priwatne powěsće nalistuje, kotrež sy "
 "pósłał."
 
-#: actions/passwordsettings.php:58
 msgid "Change password"
 msgstr "Hesło změnić"
 
-#: actions/passwordsettings.php:69
 msgid "Change your password."
 msgstr "Změń swoje hesło."
 
 #. TRANS: Fieldset legend for password reset form.
-#: actions/passwordsettings.php:96 actions/recoverpassword.php:251
 msgid "Password change"
 msgstr "Hesło změnjene"
 
-#: actions/passwordsettings.php:104
 msgid "Old password"
 msgstr "Stare hesło"
 
 #. TRANS: Field label for password reset form.
-#: actions/passwordsettings.php:108 actions/recoverpassword.php:256
 msgid "New password"
 msgstr "Nowe hesło"
 
-#: actions/passwordsettings.php:109 actions/register.php:416
 msgid "6 or more characters."
 msgstr "6 abo wjace znamješkow."
 
 #. TRANS: Ttile for field label for password reset form where the password has to be typed again.
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:264
-#: actions/register.php:420
 msgid "Same as password above."
 msgstr "Samsne hesło kaž horjeka."
 
-#: actions/passwordsettings.php:117
 msgid "Change"
 msgstr "Změnić"
 
-#: actions/passwordsettings.php:153 actions/register.php:223
 msgid "Password must be 6 or more characters."
 msgstr "Hesło dyrbi 6 abo wjace znamješkow měć."
 
-#: actions/passwordsettings.php:156 actions/register.php:226
 msgid "Passwords don't match."
 msgstr "Hesle so njekryjetej."
 
-#: actions/passwordsettings.php:164
 msgid "Incorrect old password"
 msgstr "Wopačne stare hesło"
 
-#: actions/passwordsettings.php:180
 msgid "Error saving user; invalid."
 msgstr "Zmylk při składowanju wužiwarja; njepłaćiwy."
 
 #. TRANS: Reset password form validation error message.
-#: actions/passwordsettings.php:185 actions/recoverpassword.php:418
 msgid "Cannot save new password."
 msgstr "Nowe hesło njeda so składować."
 
-#: actions/passwordsettings.php:191
 msgid "Password saved."
 msgstr "Hesło składowane."
 
 #. TRANS: Title for Paths admin panel.
 #. TRANS: Menu item for site administration
-#: actions/pathsadminpanel.php:58 lib/adminpanelaction.php:371
 msgid "Paths"
 msgstr "Šćežki"
 
 #. TRANS: Form instructions for Path admin panel.
-#: actions/pathsadminpanel.php:69
 msgid "Path and server settings for this StatusNet site"
 msgstr "Šćežka a serwerowe nastajenja za tute sydło StatusNet"
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the directory that could not be read from.
-#: actions/pathsadminpanel.php:155
 #, php-format
 msgid "Theme directory not readable: %s."
 msgstr "Šatowy zapis njeda so čitać: %s"
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the avatar directory that could not be written to.
-#: actions/pathsadminpanel.php:163
 #, php-format
 msgid "Avatar directory not writable: %s."
 msgstr "Do awataroweho zapisa njeda so pisać: %s."
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the background directory that could not be written to.
-#: actions/pathsadminpanel.php:171
 #, php-format
 msgid "Background directory not writable: %s."
 msgstr "Do pozadkoweho zapisa njeda so pisać: %s."
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the locales directory that could not be read from.
-#: actions/pathsadminpanel.php:181
 #, php-format
 msgid "Locales directory not readable: %s."
 msgstr "Zapis lokalow njeda so čitać: %s"
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the SSL server URL that is too long.
-#: actions/pathsadminpanel.php:189
 msgid "Invalid SSL server. The maximum length is 255 characters."
 msgstr "Njepłaćiwy SSL-serwer. Maksimalna dołhosć je 255 znamješkow."
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:235 actions/siteadminpanel.php:58
 msgid "Site"
 msgstr "Sydło"
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:241 actions/pathsadminpanel.php:279
-#: actions/pathsadminpanel.php:370 actions/pathsadminpanel.php:425
 msgid "Server"
 msgstr "Serwer"
 
-#: actions/pathsadminpanel.php:242
 msgid "Site's server hostname."
 msgstr "Serwerowe mjeno sydła"
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:248 actions/pathsadminpanel.php:288
-#: actions/pathsadminpanel.php:379 actions/pathsadminpanel.php:434
 msgid "Path"
 msgstr "Šćežka"
 
-#: actions/pathsadminpanel.php:249
 msgid "Site path."
 msgstr "Sydłowa šćežka."
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:255
 msgid "Locale directory"
 msgstr "Zapis lokalow"
 
-#: actions/pathsadminpanel.php:256
 msgid "Directory path to locales."
 msgstr "Zapisowa šćežka k lokalam."
 
 #. TRANS: Checkbox label in Paths admin panel.
-#: actions/pathsadminpanel.php:263
 msgid "Fancy URLs"
 msgstr "Šikwane URL"
 
-#: actions/pathsadminpanel.php:265
 msgid "Use fancy (more readable and memorable) URLs?"
 msgstr ""
 
-#: actions/pathsadminpanel.php:272
 msgid "Theme"
 msgstr "Šat"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:281
 msgid "Server for themes."
 msgstr "Serwer za šaty."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:290
 msgid "Web path to themes."
 msgstr "Webšćežka k šatam."
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:297 actions/pathsadminpanel.php:388
-#: actions/pathsadminpanel.php:443 actions/pathsadminpanel.php:495
 msgid "SSL server"
 msgstr "SSL-serwer"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:299
 msgid "SSL server for themes (default: SSL server)."
 msgstr "SSL-serwer za šaty (standard: SSL-serwer)."
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:306 actions/pathsadminpanel.php:397
-#: actions/pathsadminpanel.php:452
 msgid "SSL path"
 msgstr "SSL-šćežka"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:308
 msgid "SSL path to themes (default: /theme/)."
 msgstr "SSL-šćežka k šatam (standard: /theme/)."
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:315 actions/pathsadminpanel.php:406
-#: actions/pathsadminpanel.php:461
 msgid "Directory"
 msgstr "Zapis"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:317
 msgid "Directory where themes are located."
 msgstr "Zapis, hdźež šaty su."
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:326
 msgid "Avatars"
 msgstr "Awatary"
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:333
 msgid "Avatar server"
 msgstr "Awatarowy serwer"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:335
 msgid "Server for avatars."
 msgstr "Serwer za awatary."
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:342
 msgid "Avatar path"
 msgstr "Awatarowa šćežka"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:344
 msgid "Web path to avatars."
 msgstr "Webšćežka k awataram."
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:351
 msgid "Avatar directory"
 msgstr "Awatarowy zapis"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:353
 msgid "Directory where avatars are located."
 msgstr "Zapis, hdźež awatary su."
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:364
 msgid "Backgrounds"
 msgstr "Pozadki"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:372
 msgid "Server for backgrounds."
 msgstr "Serwer za pozadki."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:381
 msgid "Web path to backgrounds."
 msgstr "Webšćežka k pozadkam."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:390
 msgid "Server for backgrounds on SSL pages."
 msgstr "Serwer za pozadki na SSL-stronach."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:399
 msgid "Web path to backgrounds on SSL pages."
 msgstr "Webšćežka k pozadkam na SSL-stronach."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:408
 msgid "Directory where backgrounds are located."
 msgstr "Zapis, hdźež pozadki su."
 
 #. TRANS: Fieldset legens in Paths admin panel.
-#: actions/pathsadminpanel.php:419
 msgid "Attachments"
 msgstr "Přiwěški"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:427
 msgid "Server for attachments."
 msgstr "Serwer za přiwěški."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:436
 msgid "Web path to attachments."
 msgstr "Webšćežka k přiwěškam."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:445
 msgid "Server for attachments on SSL pages."
 msgstr "Serwer za přiwěški  na SSL-stronach."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:454
 msgid "Web path to attachments on SSL pages."
 msgstr "Serwer za přiwěški  na SSL-stronach."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:463
 msgid "Directory where attachments are located."
 msgstr "Zapis, hdźež přiwěški su."
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:472
 msgid "SSL"
 msgstr "SSL"
 
 #. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
-#: actions/pathsadminpanel.php:477 actions/snapshotadminpanel.php:202
 msgid "Never"
 msgstr "Ženje"
 
 #. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
-#: actions/pathsadminpanel.php:479
 msgid "Sometimes"
 msgstr "Druhdy"
 
 #. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
-#: actions/pathsadminpanel.php:481
 msgid "Always"
 msgstr "Přeco"
 
-#: actions/pathsadminpanel.php:485
 msgid "Use SSL"
 msgstr "SSL wužiwać"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:487
 msgid "When to use SSL."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:497
 msgid "Server to direct SSL requests to."
 msgstr ""
 
 #. TRANS: Button title text to store form data in the Paths admin panel.
-#: actions/pathsadminpanel.php:514
 msgid "Save paths"
 msgstr "Šćežki składować"
 
 #. TRANS: Instructions for the "People search" page.
 #. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/peoplesearch.php:54
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
@@ -4336,57 +3549,46 @@ msgid ""
 msgstr ""
 
 #. TRANS: Title of a page where users can search for other users.
-#: actions/peoplesearch.php:61
 msgid "People search"
 msgstr "Za ludźimi pytać"
 
-#: actions/peopletag.php:68
 #, php-format
 msgid "Not a valid people tag: %s."
 msgstr "Njepłaćiwa wosobowa taflička: %s."
 
-#: actions/peopletag.php:142
 #, php-format
 msgid "Users self-tagged with %1$s - page %2$d"
 msgstr ""
 
 #. TRANS: Page title for AJAX form return when a disabling a plugin.
-#: actions/plugindisable.php:69
 msgctxt "plugin"
 msgid "Disabled"
 msgstr ""
 
 #. TRANS: Client error displayed trying to perform any request method other than POST.
 #. TRANS: Do not translate POST.
-#: actions/pluginenable.php:78 actions/subscribe.php:77
 msgid "This action only accepts POST requests."
 msgstr ""
 
-#: actions/pluginenable.php:102
 #, fuzzy
 msgid "You cannot administer plugins."
 msgstr "Njemóžeš wužiwarjow wušmórnyć."
 
-#: actions/pluginenable.php:109
 #, fuzzy
 msgid "No such plugin."
 msgstr "Strona njeeksistuje."
 
 #. TRANS: Page title for AJAX form return when enabling a plugin.
-#: actions/pluginenable.php:159
 msgctxt "plugin"
 msgid "Enabled"
 msgstr ""
 
 #. TRANS: Tab and title for plugins admin panel.
 #. TRANS: Menu item for site administration
-#: actions/pluginsadminpanel.php:56 actions/version.php:191
-#: lib/adminpanelaction.php:411
 msgid "Plugins"
 msgstr "Tykače"
 
 #. TRANS: Instructions at top of plugin admin page.
-#: actions/pluginsadminpanel.php:68
 msgid ""
 "Additional plugins can be enabled and configured manually. See the <a href="
 "\"http://status.net/wiki/Plugins\">online plugin documentation</a> for more "
@@ -4394,32 +3596,26 @@ msgid ""
 msgstr ""
 
 #. TRANS: Admin form section header
-#: actions/pluginsadminpanel.php:84
 #, fuzzy
 msgid "Default plugins"
 msgstr "Standardna rěč"
 
-#: actions/pluginsadminpanel.php:106
 msgid ""
 "All default plugins have been disabled from the site's configuration file."
 msgstr ""
 
-#: actions/postnotice.php:95
 msgid "Invalid notice content."
 msgstr "Njepłaćiwy wobsah zdźělenki."
 
-#: actions/postnotice.php:101
 #, php-format
 msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’."
 msgstr ""
 
 #. TRANS: Page title for profile settings.
-#: actions/profilesettings.php:60
 msgid "Profile settings"
 msgstr "Profilowe nastajenja"
 
 #. TRANS: Usage instructions for profile settings.
-#: actions/profilesettings.php:71
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
@@ -4427,39 +3623,31 @@ msgstr ""
 "wjace wo tebi zhonili."
 
 #. TRANS: Profile settings form legend.
-#: actions/profilesettings.php:99
 msgid "Profile information"
 msgstr "Profilowe informacije"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:110 actions/register.php:412
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr ""
 "1-64 małopisanych pismikow abo ličbow, žane interpunkciske znamješka abo "
 "mjezery."
 
 #. TRANS: Field label in form for profile settings.
-#: actions/profilesettings.php:114 actions/register.php:434
-#: lib/groupeditform.php:150
 msgid "Full name"
 msgstr "Dospołne mjeno"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:119 actions/register.php:439
-#: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "Startowa strona"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:122 actions/register.php:441
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr "URL twojeje startoweje strony, bloga abo profila na druhim sydle."
 
 #. TRANS: Tooltip for field label in form for profile settings. Plural
 #. TRANS: is decided by the number of characters available for the
 #. TRANS: biography (%d).
-#: actions/profilesettings.php:130 actions/register.php:450
 #, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4469,68 +3657,53 @@ msgstr[2] "Wopisaj sebje a swoje zajimy z %d znamješkami"
 msgstr[3] "Wopisaj sebje a swoje zajimy z %d znamješkami"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:136 actions/register.php:455
 msgid "Describe yourself and your interests"
 msgstr "Wopisaj sebje a swoje zajimy"
 
 #. TRANS: Text area label in form for profile settings where users can provide.
 #. TRANS: their biography.
-#: actions/profilesettings.php:140 actions/register.php:457
 msgid "Bio"
 msgstr "Biografija"
 
 #. TRANS: Field label in form for profile settings.
-#: actions/profilesettings.php:146 actions/register.php:462
-#: lib/groupeditform.php:173
 msgid "Location"
 msgstr "Městno"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:149
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Hdźež sy, na př. \"město, zwjazkowy kraj (abo region) , kraj\""
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:154
 msgid "Share my current location when posting notices"
 msgstr ""
 
 #. TRANS: Field label in form for profile settings.
-#: actions/profilesettings.php:162 actions/tagother.php:128
-#: actions/tagother.php:188 lib/subscriptionlist.php:104
-#: lib/subscriptionlist.php:106
 msgid "Tags"
 msgstr ""
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:165
 msgid ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- "
 "separated."
 msgstr ""
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:170
 msgid "Language"
 msgstr "Rěč"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:172
 msgid "Preferred language."
 msgstr "Preferowana rěč."
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:182
 msgid "Timezone"
 msgstr "Časowe pasmo"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:184
 msgid "What timezone are you normally in?"
 msgstr "W kotrym časowym pasmje sy zwjetša?"
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:190
 msgid ""
 "Automatically subscribe to whoever subscribes to me (best for non-humans)."
 msgstr ""
@@ -4539,7 +3712,6 @@ msgstr ""
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Plural form is used based on the maximum number of allowed
 #. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:259 actions/register.php:214
 #, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4549,98 +3721,79 @@ msgstr[2] "Biografija je předołha (maks. %d znamješka)."
 msgstr[3] "Biografija je předołha (maks. %d znamješkow)."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:270 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr "Časowe pasmo njeje wubrane."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:278
 msgid "Language is too long (maximum 50 characters)."
 msgstr "Mjeno rěče je předołhe (maks. 50 znamješkow)."
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:292
 #, php-format
 msgid "Invalid tag: \"%s\"."
 msgstr "Njepłaćiwa taflička: \"%s\"."
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:348
 msgid "Could not update user for autosubscribe."
 msgstr "Wužiwar njeda so za awtomatiske abonowanje aktualizować."
 
 #. TRANS: Server error thrown when user profile location preference settings could not be updated.
-#: actions/profilesettings.php:406
 msgid "Could not save location prefs."
 msgstr "Nastajenja městna njedachu so składować."
 
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:428 actions/tagother.php:179
 msgid "Could not save tags."
 msgstr "Taflički njedadźa so składować."
 
 #. TRANS: Confirmation shown when user profile settings are saved.
 #. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:437 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "Nastajenja składowane."
 
 #. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
 #. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:484 actions/restoreaccount.php:60
 msgid "Restore account"
 msgstr "Konto wobnowić"
 
-#: actions/public.php:83
 #, php-format
 msgid "Beyond the page limit (%s)."
 msgstr "Limit stronow (%s) překročeny."
 
-#: actions/public.php:92
 msgid "Could not retrieve public stream."
 msgstr "Zjawny prud njeda so wotwołać."
 
-#: actions/public.php:130
 #, php-format
 msgid "Public timeline, page %d"
 msgstr "Zjawna časowa lajsta, strona %d"
 
-#: actions/public.php:132 lib/publicgroupnav.php:79
 msgid "Public timeline"
 msgstr ""
 
-#: actions/public.php:160
 msgid "Public Stream Feed (RSS 1.0)"
 msgstr "Kanal zjawneho pruda (RSS 1.0)"
 
-#: actions/public.php:164
 msgid "Public Stream Feed (RSS 2.0)"
 msgstr "Kanal zjawneho pruda (RSS 2.0)"
 
-#: actions/public.php:168
 msgid "Public Stream Feed (Atom)"
 msgstr "Kanal zjawneho pruda (Atom)"
 
-#: actions/public.php:188
 #, php-format
 msgid ""
 "This is the public timeline for %%site.name%% but no one has posted anything "
 "yet."
 msgstr ""
 
-#: actions/public.php:191
 msgid "Be the first to post!"
 msgstr "Budź prěni, kiž něšto pisa!"
 
-#: actions/public.php:195
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post!"
 msgstr ""
 
-#: actions/public.php:242
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -4649,7 +3802,6 @@ msgid ""
 "friends, family, and colleagues! ([Read more](%%doc.help%%))"
 msgstr ""
 
-#: actions/public.php:247
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -4658,19 +3810,16 @@ msgid ""
 msgstr ""
 
 #. TRANS: Public RSS feed description. %s is the StatusNet site name.
-#: actions/publicrss.php:106
 #, php-format
 msgid "%s updates from everyone."
 msgstr "%s aktualizacijow wote wšěch."
 
 #. TRANS: Title for public tag cloud.
-#: actions/publictagcloud.php:57
 msgid "Public tag cloud"
 msgstr ""
 
 #. TRANS: Instructions (more used like an explanation/header).
 #. TRANS: %s is the StatusNet sitename.
-#: actions/publictagcloud.php:65
 #, php-format
 msgid "These are most popular recent tags on %s"
 msgstr ""
@@ -4678,14 +3827,12 @@ msgstr ""
 #. TRANS: This message contains a Markdown URL. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.
-#: actions/publictagcloud.php:74
 #, php-format
 msgid "No one has posted a notice with a [hashtag](%%doc.tags%%) yet."
 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.
-#: actions/publictagcloud.php:79
 msgid "Be the first to post one!"
 msgstr "Budź prěni, kiž tajki pisa!"
 
@@ -4694,7 +3841,6 @@ msgstr "Budź prěni, kiž tajki pisa!"
 #. TRANS: This message contains a Markdown URL. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.
-#: actions/publictagcloud.php:87
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post "
@@ -4702,264 +3848,211 @@ msgid ""
 msgstr ""
 
 #. TRANS: Client error displayed trying to recover password while already logged in.
-#: actions/recoverpassword.php:37
 msgid "You are already logged in!"
 msgstr "Sy hižo přizjewjeny!"
 
 #. TRANS: Client error displayed when password recovery code is not correct.
-#: actions/recoverpassword.php:64
 msgid "No such recovery code."
 msgstr "Njeznaty wobnowjenski kod."
 
 #. TRANS: Client error displayed when no proper password recovery code was submitted.
-#: actions/recoverpassword.php:69
 msgid "Not a recovery code."
 msgstr "Žadyn wobnowjenski kod."
 
 #. TRANS: Server error displayed trying to recover password without providing a user.
-#: actions/recoverpassword.php:77
 msgid "Recovery code for unknown user."
 msgstr ""
 
 #. TRANS: Server error displayed removing a password recovery code from the database.
-#: actions/recoverpassword.php:91
 msgid "Error with confirmation code."
 msgstr "Zmylk z wobkrućenskim kodom."
 
 #. TRANS: Client error displayed trying to recover password with too old a recovery code.
-#: actions/recoverpassword.php:103
 msgid "This confirmation code is too old. Please start again."
 msgstr "Tutón wobkrućenski kod je přestary. Prošu započń hišće raz."
 
 #. TRANS: Server error displayed when updating a user's e-mail address in the database fails while recovering a password.
-#: actions/recoverpassword.php:118
 msgid "Could not update user with confirmed email address."
 msgstr "Wužiwar njeda so z wobkrućenej e-mejlowej adresu aktualizować."
 
 #. TRANS: Page notice for password recovery page.
-#: actions/recoverpassword.php:160
 msgid ""
 "If you have forgotten or lost your password, you can get a new one sent to "
 "the email address you have stored in your account."
 msgstr ""
 
-#: actions/recoverpassword.php:167
 msgid "You have been identified. Enter a new password below."
 msgstr "Sy so identifikował. Zapodaj deleka nowe hesło."
 
 #. TRANS: Fieldset legend for password recovery page.
-#: actions/recoverpassword.php:198
 msgid "Password recovery"
 msgstr "Wobnowjenje hesła"
 
 #. TRANS: Field label on password recovery page.
-#: actions/recoverpassword.php:202
 msgid "Nickname or email address"
 msgstr "Přimjeno abo e-mejlowa adresa"
 
 #. TRANS: Title for field label on password recovery page.
-#: actions/recoverpassword.php:205
 msgid "Your nickname on this server, or your registered email address."
 msgstr ""
 "Twoje přimjeno na tutym serwerje abo twoje zregistrowana e-mejlowa adresa."
 
 #. TRANS: Field label on password recovery page.
-#: actions/recoverpassword.php:212
 msgid "Recover"
 msgstr "Wobnowić"
 
 #. TRANS: Button text on password recovery page.
-#: actions/recoverpassword.php:214
 msgctxt "BUTTON"
 msgid "Recover"
 msgstr "Wobnowić"
 
 #. TRANS: Title for password recovery page in password reset mode.
-#: actions/recoverpassword.php:223
 msgid "Reset password"
 msgstr "Hesło wróćo stajić"
 
 #. TRANS: Title for password recovery page in password recover mode.
-#: actions/recoverpassword.php:225
 msgid "Recover password"
 msgstr "Hesło wobnowić"
 
 #. TRANS: Title for password recovery page in email sent mode.
 #. TRANS: Subject for password recovery e-mail.
-#: actions/recoverpassword.php:227 actions/recoverpassword.php:366
 msgid "Password recovery requested"
 msgstr "Wobnowjenje hesła požadane"
 
 #. TRANS: Title for password recovery page in password saved mode.
-#: actions/recoverpassword.php:229
 msgid "Password saved"
 msgstr "Hesło składowane"
 
 #. TRANS: Title for password recovery page when an unknown action has been specified.
-#: actions/recoverpassword.php:232
 msgid "Unknown action"
 msgstr "Njeznata akcija"
 
 #. TRANS: Title for field label for password reset form.
-#: actions/recoverpassword.php:258
 msgid "6 or more characters, and do not forget it!"
 msgstr "6 abo wjace znamješkow, a njezabudź jo!"
 
 #. TRANS: Button text for password reset form.
 #. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: actions/recoverpassword.php:268 lib/designform.php:145
 msgctxt "BUTTON"
 msgid "Reset"
 msgstr "Wróćo stajić"
 
 #. TRANS: Form instructions for password recovery form.
-#: actions/recoverpassword.php:278
 msgid "Enter a nickname or email address."
 msgstr "Zapodaj přimjeno abo e-mejlowu adresu."
 
 #. TRANS: Information on password recovery form if no known username or e-mail address was specified.
-#: actions/recoverpassword.php:309
 msgid "No user with that email address or username."
 msgstr ""
 "Wužiwar z tej e-mejlowej adresu abo tym wužiwarskim mjenom njeeksistuje."
 
 #. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
-#: actions/recoverpassword.php:327
 msgid "No registered email address for that user."
 msgstr "Wužiwar nima žanu zregistrowanu e-mejlowu adresu."
 
 #. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
-#: actions/recoverpassword.php:342
 msgid "Error saving address confirmation."
 msgstr "Zmylk při składowanju adresoweho wobkrućenja."
 
 #. TRANS: User notification after an e-mail with instructions was sent from the password recovery form.
-#: actions/recoverpassword.php:370
 msgid ""
 "Instructions for recovering your password have been sent to the email "
 "address registered to your account."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to reset as password without providing a user.
-#: actions/recoverpassword.php:391
 msgid "Unexpected password reset."
 msgstr "Njewočakowane hesło wróćo stajene."
 
 #. TRANS: Reset password form validation error message.
-#: actions/recoverpassword.php:400
 msgid "Password must be 6 characters or more."
 msgstr "Hesło dyrbi 6 znamješkow abo wjace měć."
 
 #. TRANS: Reset password form validation error message.
-#: actions/recoverpassword.php:405
 msgid "Password and confirmation do not match."
 msgstr "Hesło a jeho wobkrućenje so njekryjetej."
 
 #. TRANS: Server error displayed when something does wrong with the user object during password reset.
-#: actions/recoverpassword.php:426 actions/register.php:241
 msgid "Error setting user."
 msgstr "Zmylk při nastajenju wužiwarja."
 
 #. TRANS: Success message for user after password reset.
-#: actions/recoverpassword.php:434
 msgid "New password successfully saved. You are now logged in."
 msgstr "Nowe hesło bu wuspěšnje składowane. Sy nětko přizjewjeny."
 
-#: actions/redirecturl.php:70
 #, fuzzy
 msgid "No id parameter"
 msgstr "Žadyn argument ID."
 
-#: actions/redirecturl.php:76
 #, fuzzy, php-format
 msgid "No such file \"%d\""
 msgstr "Dataja njeeksistuje."
 
-#: actions/register.php:80 actions/register.php:181 actions/register.php:392
 msgid "Sorry, only invited people can register."
 msgstr "Wodaj, jenož přeprošeni ludźo móžeja so registrować."
 
-#: actions/register.php:87
 msgid "Sorry, invalid invitation code."
 msgstr "Wodaj, njepłaćiwy přeprošenski kod."
 
-#: actions/register.php:106
 msgid "Registration successful"
 msgstr "Registrowanje wuspěšne"
 
-#: actions/register.php:108 actions/register.php:490
 msgid "Register"
 msgstr "Registrować"
 
-#: actions/register.php:128
 msgid "Registration not allowed."
 msgstr "Registracija njedowolena."
 
-#: actions/register.php:194
 msgid "You cannot register if you don't agree to the license."
 msgstr "Njemóžeš so registrować, jeli njepřizwoleš do licency."
 
-#: actions/register.php:203
 msgid "Email address already exists."
 msgstr "E-mejlowa adresa hižo eksistuje."
 
-#: actions/register.php:236 actions/register.php:258
 msgid "Invalid username or password."
 msgstr "Njepłaćiwe wužiwarske mjeno abo hesło."
 
-#: actions/register.php:333
 msgid ""
 "With this form you can create a new account. You can then post notices and "
 "link up to friends and colleagues."
 msgstr ""
 
-#: actions/register.php:424 actions/register.php:428
-#: actions/siteadminpanel.php:238 lib/settingsnav.php:92
 msgid "Email"
 msgstr "E-mejl"
 
-#: actions/register.php:425 actions/register.php:429
 msgid "Used only for updates, announcements, and password recovery."
 msgstr ""
 
-#: actions/register.php:436
 msgid "Longer name, preferably your \"real\" name."
 msgstr "Dlěše mjeno, wosebje twoje \"woprawdźite\" mjeno."
 
-#: actions/register.php:464
 msgid "Where you are, like \"City, State (or Region), Country\"."
 msgstr "Hdźež sy, na př. \"město, zwjazkowy kraj (abo region) , kraj\"."
 
-#: actions/register.php:503
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
 msgstr "Rozumju, zo wobsah a daty wot %1$s su priwatne a dowěrliwe."
 
-#: actions/register.php:513
 #, php-format
 msgid "My text and files are copyright by %1$s."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:517
 msgid "My text and files remain under my own copyright."
 msgstr "Mój tekst a moje dataje wostawaja pod mojim swójskim awtorskim prawom."
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:520
 msgid "All rights reserved."
 msgstr "Wšě prawa wuměnjenjene."
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:525
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
 "email address, IM address, and phone number."
 msgstr ""
 
-#: actions/register.php:566
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -4978,13 +4071,11 @@ msgid ""
 "Thanks for signing up and we hope you enjoy using this service."
 msgstr ""
 
-#: actions/register.php:590
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
 msgstr ""
 
-#: actions/remotesubscribe.php:97
 #, php-format
 msgid ""
 "To subscribe, you can [login](%%action.login%%), or [register](%%action."
@@ -4992,119 +4083,92 @@ msgid ""
 "microblogging site](%%doc.openmublog%%),  enter your profile URL below."
 msgstr ""
 
-#: actions/remotesubscribe.php:111
 msgid "Remote subscribe"
 msgstr "Zdaleny abonement"
 
-#: actions/remotesubscribe.php:123
 msgid "Subscribe to a remote user"
 msgstr "Zdaleneho wužiwarja abonować"
 
-#: actions/remotesubscribe.php:128
 msgid "User nickname"
 msgstr "Wužiwarske přimjeno"
 
-#: actions/remotesubscribe.php:129
 msgid "Nickname of the user you want to follow."
 msgstr "Přimjeno wužiwarja, kotremuž chceš slědować."
 
-#: actions/remotesubscribe.php:132
 msgid "Profile URL"
 msgstr "URL profila"
 
-#: actions/remotesubscribe.php:133
 msgid "URL of your profile on another compatible microblogging service."
 msgstr ""
 "URL twojeho profila při druhej kompatibelnej mikroblogowanskej słužbje."
 
 #. TRANS: Link text for link that will subscribe to a remote profile.
-#: actions/remotesubscribe.php:136 lib/subscribeform.php:139
-#: lib/userprofile.php:402
 msgid "Subscribe"
 msgstr "Abonować"
 
-#: actions/remotesubscribe.php:158
 msgid "Invalid profile URL (bad format)."
 msgstr "Njepłaćiwy profilowy URL (wopačny format)."
 
-#: actions/remotesubscribe.php:167
 msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
 msgstr ""
 
-#: actions/remotesubscribe.php:175
 msgid "That is a local profile! Login to subscribe."
 msgstr "To je lokalny profil! Přizjew so, zo by abonował."
 
-#: actions/remotesubscribe.php:182
 msgid "Could not get a request token."
 msgstr "Přistupny token njeda so wobstarać."
 
-#: actions/repeat.php:56
 msgid "Only logged-in users can repeat notices."
 msgstr "Jeno6 přizjewjeni wužiwarjo móža zdźělenki wospjetować."
 
-#: actions/repeat.php:63 actions/repeat.php:70
 msgid "No notice specified."
 msgstr "Žana zdźělenka podata."
 
-#: actions/repeat.php:75
 msgid "You cannot repeat your own notice."
 msgstr "Njemóžeš swójsku zdźělenku wospjetować."
 
-#: actions/repeat.php:89
 msgid "You already repeated that notice."
 msgstr "Sy tutu zdźělenku hižo wospjetował."
 
-#: actions/repeat.php:112 lib/noticelist.php:697
 msgid "Repeated"
 msgstr "Wospjetowany"
 
-#: actions/repeat.php:117
 msgid "Repeated!"
 msgstr "Wospjetowany!"
 
 #. TRANS: RSS reply feed title. %s is a user nickname.
-#: actions/replies.php:126 actions/repliesrss.php:68
-#: lib/personalgroupnav.php:105
 #, php-format
 msgid "Replies to %s"
 msgstr "Wotmołwy na %s"
 
-#: actions/replies.php:128
 #, php-format
 msgid "Replies to %1$s, page %2$d"
 msgstr "Wotmołwy na %1$s, strona %2$d"
 
-#: actions/replies.php:145
 #, php-format
 msgid "Replies feed for %s (RSS 1.0)"
 msgstr "Kanal wotmołwow za %s (RSS 1.0)"
 
-#: actions/replies.php:152
 #, php-format
 msgid "Replies feed for %s (RSS 2.0)"
 msgstr "Kanal wotmołwow za %s (RSS 2.0)"
 
-#: actions/replies.php:159
 #, php-format
 msgid "Replies feed for %s (Atom)"
 msgstr "Kanal wotmołwow za %s (Atom)"
 
-#: actions/replies.php:199
 #, php-format
 msgid ""
 "This is the timeline showing replies to %1$s but %2$s hasn't received a "
 "notice to them yet."
 msgstr ""
 
-#: actions/replies.php:204
 #, php-format
 msgid ""
 "You can engage other users in a conversation, subscribe to more people or "
 "[join groups](%%action.groups%%)."
 msgstr ""
 
-#: actions/replies.php:206
 #, php-format
 msgid ""
 "You can try to [nudge %1$s](../%2$s) or [post something to them](%%%%action."
@@ -5113,218 +4177,177 @@ msgstr ""
 
 #. TRANS: RSS reply feed description.
 #. TRANS: %1$s is a user nickname, %2$s is the StatusNet site name.
-#: actions/repliesrss.php:74
 #, php-format
 msgid "Replies to %1$s on %2$s."
 msgstr "Wotmołwy na %1$s na %2$s."
 
 #. TRANS: Client exception displayed when trying to restore an account while not logged in.
-#: actions/restoreaccount.php:78
 msgid "Only logged-in users can restore their account."
 msgstr "Jenož přizjewjeni wužiwarjo móža swoje konto wobnowić."
 
 #. TRANS: Client exception displayed when trying to restore an account without having restore rights.
-#: actions/restoreaccount.php:83
 msgid "You may not restore your account."
 msgstr "NJemóžeš swoje konto wobnowić."
 
 #. TRANS: Client exception displayed trying to restore an account while something went wrong uploading a file.
 #. TRANS: Client exception. No file; probably just a non-AJAX submission.
-#: actions/restoreaccount.php:121 actions/restoreaccount.php:146
 msgid "No uploaded file."
 msgstr "Žana nahrata dataja."
 
 #. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
-#: actions/restoreaccount.php:129 lib/mediafile.php:194
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
 msgstr ""
 
 #. TRANS: Client exception.
-#: actions/restoreaccount.php:135 lib/mediafile.php:200
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form."
 msgstr ""
 
 #. TRANS: Client exception.
-#: actions/restoreaccount.php:141 lib/mediafile.php:206
 msgid "The uploaded file was only partially uploaded."
 msgstr "Nahrata dataja bu jenož zdźěla nahrata."
 
 #. TRANS: Client exception thrown when a temporary folder is not present to store a file upload.
-#: actions/restoreaccount.php:150 lib/mediafile.php:214
 msgid "Missing a temporary folder."
 msgstr "Temporerny rjadowka faluje."
 
 #. TRANS: Client exception thrown when writing to disk is not possible during a file upload operation.
-#: actions/restoreaccount.php:154 lib/mediafile.php:218
 msgid "Failed to write file to disk."
 msgstr "Dataju njeda so na tačel pisać."
 
 #. TRANS: Client exception thrown when a file upload operation has been stopped by an extension.
-#: actions/restoreaccount.php:158 lib/mediafile.php:222
 msgid "File upload stopped by extension."
 msgstr "Datajowe nahraće přez rozšěrjenje zastajene."
 
 #. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
 #. TRANS: Exception thrown when uploading an image fails for an unknown reason.
 #. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
-#: actions/restoreaccount.php:164 lib/imagefile.php:106 lib/mediafile.php:228
 msgid "System error uploading file."
 msgstr "Systemowy zmylk při nahrawanju dataje."
 
 #. TRANS: Client exception thrown when a feed is not an Atom feed.
-#: actions/restoreaccount.php:207
 msgid "Not an Atom feed."
 msgstr "To Atomowy kanal njeje."
 
 #. TRANS: Success message when a feed has been restored.
-#: actions/restoreaccount.php:241
 msgid ""
 "Feed has been restored. Your old posts should now appear in search and your "
 "profile page."
 msgstr ""
 
 #. TRANS: Message when a feed restore is in progress.
-#: actions/restoreaccount.php:245
 msgid "Feed will be restored. Please wait a few minutes for results."
 msgstr "Kanal so wobnowi. Prošu počakaj něšto mjeńšin za wuslědki."
 
 #. TRANS: Form instructions for feed restore.
-#: actions/restoreaccount.php:342
 msgid ""
 "You can upload a backed-up stream in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format."
 msgstr ""
 
 #. TRANS: Title for submit button to confirm upload of a user backup file for account restore.
-#: actions/restoreaccount.php:373
 msgid "Upload the file"
 msgstr "Dataju nahrać"
 
-#: actions/revokerole.php:75
 msgid "You cannot revoke user roles on this site."
 msgstr "Njemóžeš wužiwarske róle na tutym sydle wotwołać."
 
-#: actions/revokerole.php:82
 msgid "User doesn't have this role."
 msgstr "Wužiwar nima tutu rólu."
 
-#: actions/rsd.php:142 actions/version.php:159
 msgid "StatusNet"
 msgstr "StatusNet"
 
-#: actions/sandbox.php:65 actions/unsandbox.php:65
 msgid "You cannot sandbox users on this site."
 msgstr "Njemóžeš wužiwarjow na tutym sydle do pěskoweho kašćika słać."
 
-#: actions/sandbox.php:72
 msgid "User is already sandboxed."
 msgstr "Wužiwar je hižo w pěskowym kašćiku."
 
 #. TRANS: Menu item for site administration
-#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
-#: lib/adminpanelaction.php:379
 msgid "Sessions"
 msgstr "Posedźenja"
 
-#: actions/sessionsadminpanel.php:65
 msgid "Session settings for this StatusNet site"
 msgstr "Nastajenja posedźenja za tute sydło StatusNet."
 
-#: actions/sessionsadminpanel.php:175
 msgid "Handle sessions"
 msgstr "Z posedźenjemi wobchadźeć"
 
-#: actions/sessionsadminpanel.php:177
 msgid "Whether to handle sessions ourselves."
 msgstr ""
 
-#: actions/sessionsadminpanel.php:181
 msgid "Session debugging"
 msgstr ""
 
-#: actions/sessionsadminpanel.php:183
 msgid "Turn on debugging output for sessions."
 msgstr ""
 
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
+#. TRANS: Submit button title.
+msgid "Save"
+msgstr "Składować"
+
 msgid "Save site settings"
 msgstr "Sydłowe nastajenja składować"
 
-#: actions/showapplication.php:78
 msgid "You must be logged in to view an application."
 msgstr "Dyrbiš přizjewjeny być, zo by sej aplikaciju wobhladał."
 
-#: actions/showapplication.php:151
 msgid "Application profile"
 msgstr "Aplikaciski profil"
 
-#: actions/showapplication.php:179
 #, php-format
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr ""
 
-#: actions/showapplication.php:189
 msgid "Application actions"
 msgstr "Aplikaciske akcije"
 
-#: actions/showapplication.php:212
 msgid "Reset key & secret"
 msgstr ""
 
 #. TRANS: Title of form for deleting a user.
-#: actions/showapplication.php:228 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:64 lib/noticelist.php:678
 msgid "Delete"
 msgstr "Zničić"
 
-#: actions/showapplication.php:237
 msgid "Application info"
 msgstr "Aplikaciske informacije"
 
-#: actions/showapplication.php:255
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
 msgstr ""
 
-#: actions/showapplication.php:275
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr "Chceš woprawdźe swój přetrjebowarski kluč a potajny kod wróćo stajić?"
 
 #. TRANS: Title for all but the first page of favourite notices of a user.
 #. TRANS: %1$s is the user for whom the favourite notices are displayed, %2$d is the page number.
-#: actions/showfavorites.php:80
 #, php-format
 msgid "%1$s's favorite notices, page %2$d"
 msgstr "Preferowane zdźělenki wot %1$s, strona %2$d"
 
 #. TRANS: Server error displayed when favourite notices could not be retrieved from the database.
-#: actions/showfavorites.php:134
 msgid "Could not retrieve favorite notices."
 msgstr "Preferowane zdźělenki njedadźa so wobstarać."
 
 #. TRANS: Feed link text. %s is a username.
-#: actions/showfavorites.php:172
 #, php-format
 msgid "Feed for favorites of %s (RSS 1.0)"
 msgstr "Kanal za fawority wužiwarja %s (RSS 1.0)"
 
 #. TRANS: Feed link text. %s is a username.
-#: actions/showfavorites.php:180
 #, php-format
 msgid "Feed for favorites of %s (RSS 2.0)"
 msgstr "Kanal za fawority wužiwarja %s (RSS 2.0)"
 
 #. TRANS: Feed link text. %s is a username.
-#: actions/showfavorites.php:188
 #, php-format
 msgid "Feed for favorites of %s (Atom)"
 msgstr "Kanal za fawority wužiwarja %s (Atom)"
 
 #. TRANS: Text displayed instead of favourite notices for the current logged in user that has no favourites.
-#: actions/showfavorites.php:209
 msgid ""
 "You haven't chosen any favorite notices yet. Click the fave button on "
 "notices you like to bookmark them for later or shed a spotlight on them."
@@ -5332,7 +4355,6 @@ msgstr ""
 
 #. TRANS: Text displayed instead of favourite notices for a user that has no favourites while logged in.
 #. TRANS: %s is a username.
-#: actions/showfavorites.php:213
 #, php-format
 msgid ""
 "%s hasn't added any favorite notices yet. Post something interesting they "
@@ -5342,7 +4364,6 @@ msgstr ""
 #. TRANS: Text displayed instead of favourite notices for a user that has no favourites while not logged in.
 #. TRANS: %s is a username, %%%%action.register%%%% is a link to the user registration page.
 #. TRANS: (link text)[link] is a Mark Down link.
-#: actions/showfavorites.php:220
 #, php-format
 msgid ""
 "%s hasn't added any favorite notices yet. Why not [register an account](%%%%"
@@ -5351,64 +4372,53 @@ msgid ""
 msgstr ""
 
 #. TRANS: Page notice for show favourites page.
-#: actions/showfavorites.php:251
 msgid "This is a way to share what you like."
 msgstr ""
 
 #. TRANS: Page title for first group page. %s is a group name.
-#: actions/showgroup.php:75
 #, php-format
 msgid "%s group"
 msgstr "skupina %s"
 
 #. TRANS: Page title for any but first group page.
 #. TRANS: %1$s is a group name, $2$s is a page number.
-#: actions/showgroup.php:79
 #, php-format
 msgid "%1$s group, page %2$d"
 msgstr "%1$s skupina, strona %2$d"
 
 #. TRANS: Label for group description or group note (dt). Text hidden by default.
-#: actions/showgroup.php:266
 msgid "Note"
 msgstr "Přispomnjenka"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:277 lib/groupeditform.php:180
 msgid "Aliases"
 msgstr "Aliasy"
 
 #. TRANS: Group actions header (h2). Text hidden by default.
-#: actions/showgroup.php:294
 msgid "Group actions"
 msgstr "Skupinske akcije"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:338
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
 msgstr "Zdźělenski kanal za skupinu %s (RSS 1.0)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:345
 #, php-format
 msgid "Notice feed for %s group (RSS 2.0)"
 msgstr "Zdźělenski kanal za skupinu %s (RSS 2.0)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:352
 #, php-format
 msgid "Notice feed for %s group (Atom)"
 msgstr "Zdźělenski kanal za skupinu %s (Atom)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:358
 #, php-format
 msgid "FOAF for %s group"
 msgstr "FOAF za skupinu %s"
 
 #. TRANS: Header for mini list of group members on a group page (h2).
-#: actions/showgroup.php:395
 msgid "Members"
 msgstr "Čłonojo"
 
@@ -5416,30 +4426,23 @@ msgstr "Čłonojo"
 #. TRANS: Text for user subscription statistics if the user has no subscriptions.
 #. TRANS: Text for user subscriber statistics if user has no subscribers.
 #. TRANS: Text for user user group membership statistics if user is not a member of any group.
-#: actions/showgroup.php:401 lib/profileaction.php:137
-#: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
-#: lib/subscriptionlist.php:123 lib/tagcloudsection.php:71
 msgid "(None)"
 msgstr "(Žadyn)"
 
 #. TRANS: Link to all group members from mini list of group members if group has more than n members.
-#: actions/showgroup.php:410
 msgid "All members"
 msgstr "Wšitcy čłonojo"
 
 #. TRANS: Header for group statistics on a group page (h2).
 #. TRANS: H2 text for user statistics.
-#: actions/showgroup.php:441 lib/profileaction.php:205
 msgid "Statistics"
 msgstr "Statistika"
 
-#: actions/showgroup.php:444
 msgctxt "LABEL"
 msgid "Created"
 msgstr "Wutworjeny"
 
 #. TRANS: Label for member count in statistics on group page.
-#: actions/showgroup.php:449
 msgctxt "LABEL"
 msgid "Members"
 msgstr "Čłonojo"
@@ -5448,7 +4451,6 @@ msgstr "Čłonojo"
 #. TRANS: **%s** is the group alias, %%%%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).
-#: actions/showgroup.php:464
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5461,7 +4463,6 @@ 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: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
-#: actions/showgroup.php:474
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5471,99 +4472,83 @@ msgid ""
 msgstr ""
 
 #. TRANS: Header for list of group administrators on a group page (h2).
-#: actions/showgroup.php:503
 msgid "Admins"
 msgstr "Administratorojo"
 
 #. TRANS: Client error displayed requesting a single message that does not exist.
-#: actions/showmessage.php:76
 msgid "No such message."
 msgstr "Powěsć njeeksistuje."
 
 #. TRANS: Client error displayed requesting a single direct message the requesting user was not a party in.
-#: actions/showmessage.php:86
 msgid "Only the sender and recipient may read this message."
 msgstr "Jenož wotpósłar a přijimowar móžetaj tutu powěsć čitać."
 
 #. TRANS: Page title for single direct message display when viewing user is the sender.
 #. TRANS: %1$s is the addressed user's nickname, $2$s is a timestamp.
-#: actions/showmessage.php:105
 #, php-format
 msgid "Message to %1$s on %2$s"
 msgstr "Powěsć do %1$s na %2$s"
 
 #. TRANS: Page title for single message display.
 #. TRANS: %1$s is the sending user's nickname, $2$s is a timestamp.
-#: actions/showmessage.php:113
 #, php-format
 msgid "Message from %1$s on %2$s"
 msgstr "Powěsć wot %1$s na %2$s"
 
-#: actions/shownotice.php:90
 msgid "Notice deleted."
 msgstr "Zdźělenka zničena."
 
 #. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
-#: actions/showstream.php:70
 #, php-format
 msgid "%1$s tagged %2$s"
 msgstr "%1$s z %2$s woznamjenjeny"
 
 #. TRANS: Page title showing tagged notices in one user's stream.
 #. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
-#: actions/showstream.php:74
 #, php-format
 msgid "%1$s tagged %2$s, page %3$d"
 msgstr "%1$s z %2$s markěrowany, strona %3$d"
 
 #. TRANS: Extended page title showing tagged notices in one user's stream.
 #. TRANS: %1$s is the username, %2$d is the page number.
-#: actions/showstream.php:82
 #, php-format
 msgid "%1$s, page %2$d"
 msgstr "%1$s, strona %2$d"
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %1$s is a user nickname, %2$s is a hashtag.
-#: actions/showstream.php:127
 #, php-format
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
 msgstr "Powěsćowy kanal za %1$s je %2$s (RSS 1.0) markěrował"
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.
-#: actions/showstream.php:136
 #, php-format
 msgid "Notice feed for %s (RSS 1.0)"
 msgstr "Zdźělenski kanal za %s (RSS 1.0)"
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.
-#: actions/showstream.php:145
 #, php-format
 msgid "Notice feed for %s (RSS 2.0)"
 msgstr "Zdźělenski kanal za %s (RSS 2.0)"
 
-#: actions/showstream.php:152
 #, php-format
 msgid "Notice feed for %s (Atom)"
 msgstr "Zdźělenski kanal za %s (Atom)"
 
 #. TRANS: Title for link to notice feed. FOAF stands for Friend of a Friend.
 #. TRANS: More information at http://www.foaf-project.org. %s is a user nickname.
-#: actions/showstream.php:159
 #, php-format
 msgid "FOAF for %s"
 msgstr "FOAF za %s"
 
 #. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
-#: actions/showstream.php:205
 #, php-format
 msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr ""
 
 #. TRANS: Second sentence of empty list message for a stream for the user themselves.
-#: actions/showstream.php:211
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
@@ -5571,7 +4556,6 @@ msgstr ""
 
 #. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:215
 #, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
@@ -5580,7 +4564,6 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:258
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5591,7 +4574,6 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:265
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5600,289 +4582,229 @@ msgid ""
 msgstr ""
 
 #. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
-#: actions/showstream.php:322
 #, php-format
 msgid "Repeat of %s"
 msgstr "Wospjetowanje wot %s"
 
-#: actions/silence.php:65 actions/unsilence.php:65
 msgid "You cannot silence users on this site."
 msgstr "Njemóžeš wužiwarjam na tutym sydle hubu zatykać."
 
-#: actions/silence.php:72
 msgid "User is already silenced."
 msgstr "Wužiwarjej je hižo huba zatykana."
 
-#: actions/siteadminpanel.php:69
 msgid "Basic settings for this StatusNet site"
 msgstr "Zakładne nastajenja za tute sydło StatusNet."
 
-#: actions/siteadminpanel.php:133
 msgid "Site name must have non-zero length."
 msgstr "Sydłowe mjeno njesmě prózdne być."
 
-#: actions/siteadminpanel.php:141
 msgid "You must have a valid contact email address."
 msgstr "Dyrbiš płaćiwu kontaktowu e-mejlowu adresu měć."
 
-#: actions/siteadminpanel.php:159
 #, php-format
 msgid "Unknown language \"%s\"."
 msgstr "Njeznata rěč \"%s\"."
 
-#: actions/siteadminpanel.php:165
 msgid "Minimum text limit is 0 (unlimited)."
 msgstr "Minimalna tekstowa dołhosć je 0 (njewobmjezowany)."
 
-#: actions/siteadminpanel.php:171
 msgid "Dupe limit must be one or more seconds."
 msgstr ""
 
-#: actions/siteadminpanel.php:221
 msgid "General"
 msgstr "Powšitkowny"
 
-#: actions/siteadminpanel.php:224
 msgid "Site name"
 msgstr "Sydłowe mjeno"
 
-#: actions/siteadminpanel.php:225
 msgid "The name of your site, like \"Yourcompany Microblog\""
 msgstr "Mjeno twojeho sydła, kaž \"TwojePředewzaće Microblog\""
 
-#: actions/siteadminpanel.php:229
 msgid "Brought by"
 msgstr ""
 
-#: actions/siteadminpanel.php:230
 msgid "Text used for credits link in footer of each page"
 msgstr ""
 
-#: actions/siteadminpanel.php:234
 msgid "Brought by URL"
 msgstr ""
 
-#: actions/siteadminpanel.php:235
 msgid "URL used for credits link in footer of each page"
 msgstr ""
 
-#: actions/siteadminpanel.php:239
 msgid "Contact email address for your site"
 msgstr "Kontaktowa e-mejlowa adresa za twoje sydło"
 
-#: actions/siteadminpanel.php:245
 msgid "Local"
 msgstr "Lokalny"
 
-#: actions/siteadminpanel.php:256
 msgid "Default timezone"
 msgstr "Standardne časowe pasmo"
 
-#: actions/siteadminpanel.php:257
 msgid "Default timezone for the site; usually UTC."
 msgstr "Standardne časowe pasmo za sydło; zwjetša UTC."
 
-#: actions/siteadminpanel.php:262
 msgid "Default language"
 msgstr "Standardna rěč"
 
-#: actions/siteadminpanel.php:263
 msgid "Site language when autodetection from browser settings is not available"
 msgstr ""
 "Rěč sydła, jeli awtomatiske spóznawanje po nastajenjach wobhladowaka k "
 "dispoziciji njesteji"
 
-#: actions/siteadminpanel.php:271
 msgid "Limits"
 msgstr "Limity"
 
-#: actions/siteadminpanel.php:274
 msgid "Text limit"
 msgstr "Tekstowy limit"
 
-#: actions/siteadminpanel.php:274
 msgid "Maximum number of characters for notices."
 msgstr "Maksimalna ličba znamješkow za zdźělenki."
 
-#: actions/siteadminpanel.php:278
 msgid "Dupe limit"
 msgstr "Limit duplikatow"
 
-#: actions/siteadminpanel.php:278
 msgid "How long users must wait (in seconds) to post the same thing again."
 msgstr ""
 
 #. TRANS: Page title for site-wide notice tab in admin panel.
-#: actions/sitenoticeadminpanel.php:55
 msgid "Site Notice"
 msgstr "Sydłowa zdźělenka"
 
 #. TRANS: Instructions for site-wide notice tab in admin panel.
-#: actions/sitenoticeadminpanel.php:66
 msgid "Edit site-wide message"
 msgstr "Sydłodaloku powěsć wobdźěłać"
 
 #. TRANS: Server error displayed when saving a site-wide notice was impossible.
-#: actions/sitenoticeadminpanel.php:101
 msgid "Unable to save site notice."
 msgstr "Njeje móžno, sydłowu zdźělenku składować."
 
 #. TRANS: Client error displayed when a site-wide notice was longer than allowed.
-#: actions/sitenoticeadminpanel.php:112
 msgid "Maximum length for the site-wide notice is 255 characters."
 msgstr ""
 
 #. TRANS: Label for site-wide notice text field in admin panel.
-#: actions/sitenoticeadminpanel.php:176
 msgid "Site notice text"
 msgstr "Tekst sydłoweje zdźělenki"
 
 #. TRANS: Tooltip for site-wide notice text field in admin panel.
-#: actions/sitenoticeadminpanel.php:179
 msgid "Site-wide notice text (255 characters maximum; HTML allowed)"
 msgstr ""
 
 #. TRANS: Title for button to save site notice in admin panel.
-#: actions/sitenoticeadminpanel.php:201
 msgid "Save site notice."
 msgstr "Sydłowu zdźělenku składować."
 
 #. TRANS: Title for SMS settings.
-#: actions/smssettings.php:56
 msgid "SMS settings"
 msgstr "SMS-nastajenja"
 
 #. TRANS: SMS settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/smssettings.php:70
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr ""
 
 #. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
-#: actions/smssettings.php:92
 msgid "SMS is not available."
 msgstr "SMS k dispoziciji njesteji."
 
 #. TRANS: Form legend for SMS settings form.
-#: actions/smssettings.php:106
 msgid "SMS address"
 msgstr "SMS-adresa"
 
 #. TRANS: Form guide in SMS settings form.
-#: actions/smssettings.php:115
 msgid "Current confirmed SMS-enabled phone number."
 msgstr "Aktualne wobkrućene telefonowe čisło z SMS-funkciju."
 
 #. TRANS: Form guide in IM settings form.
-#: actions/smssettings.php:128
 msgid "Awaiting confirmation on this phone number."
 msgstr "Wobkrućenje za tute telefonowe čisło so wočakuje."
 
 #. TRANS: Field label for SMS address input in SMS settings form.
-#: actions/smssettings.php:137
 msgid "Confirmation code"
 msgstr "Wobkrućenski kod"
 
 #. TRANS: Form field instructions in SMS settings form.
-#: actions/smssettings.php:139
 msgid "Enter the code you received on your phone."
 msgstr "Zapodaj kod, kotryž sy přez telefon dóstał."
 
 #. TRANS: Button label to confirm SMS confirmation code in SMS settings.
-#: actions/smssettings.php:143
 msgctxt "BUTTON"
 msgid "Confirm"
 msgstr "Wobkrućić"
 
 #. TRANS: Field label for SMS phone number input in SMS settings form.
-#: actions/smssettings.php:148
 msgid "SMS phone number"
 msgstr "SMS telefonowe čisło"
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
-#: actions/smssettings.php:151
 msgid "Phone number, no punctuation or spaces, with area code."
 msgstr "Telefonowe čisło, bjez interpunkcije abo mjezerow, z předwolenjom."
 
 #. TRANS: Form legend for SMS preferences form.
-#: actions/smssettings.php:190
 msgid "SMS preferences"
 msgstr "SMS-nastajenja"
 
 #. TRANS: Checkbox label in SMS preferences form.
-#: actions/smssettings.php:196
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
 msgstr ""
 
 #. TRANS: Confirmation message for successful SMS preferences save.
-#: actions/smssettings.php:307
 msgid "SMS preferences saved."
 msgstr "SMS-nastajenja składowane."
 
 #. TRANS: Message given saving SMS phone number without having provided one.
-#: actions/smssettings.php:329
 msgid "No phone number."
 msgstr "Žane telefonowe čisło."
 
 #. TRANS: Message given saving SMS phone number without having selected a carrier.
-#: actions/smssettings.php:335
 msgid "No carrier selected."
 msgstr "Žadyn poskićowar wubrany."
 
 #. TRANS: Message given saving SMS phone number that is already set.
-#: actions/smssettings.php:343
 msgid "That is already your phone number."
 msgstr "To je hižo twoje telefonowe čisło."
 
 #. TRANS: Message given saving SMS phone number that is already set for another user.
-#: actions/smssettings.php:347
 msgid "That phone number already belongs to another user."
 msgstr "Te telefonowe čisło hižo druhemu wužiwarjej słuša."
 
 #. TRANS: Message given saving valid SMS phone number that is to be confirmed.
-#: actions/smssettings.php:375
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
 "for the code and instructions on how to use it."
 msgstr ""
 
 #. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
-#: actions/smssettings.php:403
 msgid "That is the wrong confirmation number."
 msgstr "To je wopačne wobkrućenske čisło."
 
 #. TRANS: Message given after successfully canceling SMS phone number confirmation.
-#: actions/smssettings.php:417
 msgid "SMS confirmation cancelled."
 msgstr "SMS-wobkrućenje přetorhnjene."
 
 #. TRANS: Message given trying to remove an SMS phone number that is not
 #. TRANS: registered for the active user.
-#: actions/smssettings.php:437
 msgid "That is not your phone number."
 msgstr "To twoje telefonowe čisło njeje."
 
 #. TRANS: Message given after successfully removing a registered SMS phone number.
-#: actions/smssettings.php:459
 msgid "The SMS phone number was removed."
 msgstr "Telefonowe čisło za SMS bu wotstronjene."
 
 #. TRANS: Label for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:498
 msgid "Mobile carrier"
 msgstr ""
 
 #. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:503
 msgid "Select a carrier"
 msgstr ""
 
 #. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
 #. TRANS: %s is an administrative contact's e-mail address.
-#: actions/smssettings.php:512
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -5890,118 +4812,93 @@ msgid ""
 msgstr ""
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
-#: actions/smssettings.php:534
 msgid "No code entered."
 msgstr "Žadyn kod zapodaty."
 
 #. TRANS: Menu item for site administration
-#: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
-#: lib/adminpanelaction.php:395
 msgid "Snapshots"
 msgstr "Njejapke fota"
 
-#: actions/snapshotadminpanel.php:65
 msgid "Manage snapshot configuration"
 msgstr "Konfiguraciju wobrazowkoweho fota zrjadować"
 
-#: actions/snapshotadminpanel.php:127
 msgid "Invalid snapshot run value."
 msgstr "Njepłaćiwa hódnota za wuwjedźenje njejapkeho fota."
 
-#: actions/snapshotadminpanel.php:133
 msgid "Snapshot frequency must be a number."
 msgstr "Frekwenca njejapkich fotkow dyrbi ličba być."
 
-#: actions/snapshotadminpanel.php:144
 msgid "Invalid snapshot report URL."
 msgstr "Njepłaćiwy URL rozprawy njejapkeho fota."
 
-#: actions/snapshotadminpanel.php:200
 msgid "Randomly during web hit"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:201
 msgid "In a scheduled job"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:206
 msgid "Data snapshots"
 msgstr "Njejapke fota datow"
 
-#: actions/snapshotadminpanel.php:208
 msgid "When to send statistical data to status.net servers"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:217
 msgid "Frequency"
 msgstr "Frekwenca"
 
-#: actions/snapshotadminpanel.php:218
 msgid "Snapshots will be sent once every N web hits"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:226
 msgid "Report URL"
 msgstr "URL rozprawy"
 
-#: actions/snapshotadminpanel.php:227
 msgid "Snapshots will be sent to this URL"
 msgstr "Njejapke fotki budu so do tutoho URL słać."
 
-#: actions/snapshotadminpanel.php:248
 msgid "Save snapshot settings"
 msgstr "Nastajenja wobrazowkoweho fota składować"
 
 #. TRANS: Client error displayed trying a change a subscription for a non-subscribed profile.
-#: actions/subedit.php:75
 msgid "You are not subscribed to that profile."
 msgstr "Njejsy tón profil abonował."
 
 #. TRANS: Server error displayed when updating a subscription fails with a database error.
 #. TRANS: Exception thrown when a subscription could not be stored on the server.
-#: actions/subedit.php:89 classes/Subscription.php:141
 msgid "Could not save subscription."
 msgstr "Abonement njeda so składować."
 
 #. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
-#: actions/subscribe.php:121
 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
 msgstr "Njemóžeš zdaleny profil OMB 0.1 z tutej akciju abonować."
 
 #. TRANS: Page title when subscription succeeded.
-#: actions/subscribe.php:149
 msgid "Subscribed"
 msgstr "Abonowany"
 
 #. TRANS: Header for list of subscribers for a user (first page).
 #. TRANS: %s is the user's nickname.
-#: actions/subscribers.php:51
 #, php-format
 msgid "%s subscribers"
 msgstr "%s abonentow"
 
 #. TRANS: Header for list of subscribers for a user (not first page).
 #. TRANS: %1$s is the user's nickname, $2$d is the page number.
-#: actions/subscribers.php:55
 #, php-format
 msgid "%1$s subscribers, page %2$d"
 msgstr "%1$s abonentow, strona %2$d"
 
 #. TRANS: Page notice for page with an overview of all subscribers
 #. TRANS: of the logged in user's own profile.
-#: actions/subscribers.php:68
 msgid "These are the people who listen to your notices."
 msgstr ""
 
 #. TRANS: Page notice for page with an overview of all subscribers of a user other
 #. TRANS: than the logged in user. %s is the user nickname.
-#: actions/subscribers.php:74
 #, php-format
 msgid "These are the people who listen to %s's notices."
 msgstr ""
 
 #. TRANS: Subscriber list text when the logged in user has no subscribers.
-#: actions/subscribers.php:114
 msgid ""
 "You have no subscribers. Try subscribing to people you know and they might "
 "return the favor."
@@ -6009,7 +4906,6 @@ msgstr ""
 
 #. TRANS: Subscriber list text when looking at the subscribers for a of a user other
 #. TRANS: than the logged in user that has no subscribers. %s is the user nickname.
-#: actions/subscribers.php:118
 #, php-format
 msgid "%s has no subscribers. Want to be the first?"
 msgstr "%s abonentow nima. Chceš prěni być?"
@@ -6019,7 +4915,6 @@ msgstr "%s abonentow nima. Chceš prěni być?"
 #. TRANS: This message contains a Markdown URL. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.
-#: actions/subscribers.php:127
 #, php-format
 msgid ""
 "%s has no subscribers. Why not [register an account](%%%%action.register%%%"
@@ -6030,20 +4925,17 @@ msgstr ""
 
 #. TRANS: Header for subscriptions overview for a user (not first page).
 #. TRANS: %1$s is a user nickname, %2$d is the page number.
-#: actions/subscriptions.php:55
 #, php-format
 msgid "%1$s subscriptions, page %2$d"
 msgstr "%1$s abonementow, strona %2$d"
 
 #. TRANS: Page notice for page with an overview of all subscriptions
 #. TRANS: of the logged in user's own profile.
-#: actions/subscriptions.php:68
 msgid "These are the people whose notices you listen to."
 msgstr ""
 
 #. TRANS: Page notice for page with an overview of all subscriptions of a user other
 #. TRANS: than the logged in user. %s is the user nickname.
-#: actions/subscriptions.php:74
 #, php-format
 msgid "These are the people whose notices %s listens to."
 msgstr ""
@@ -6052,7 +4944,6 @@ msgstr ""
 #. 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.
-#: actions/subscriptions.php:133
 #, php-format
 msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "
@@ -6066,286 +4957,227 @@ msgstr ""
 #. TRANS: than the logged in user that has no subscriptions. %s is the user nickname.
 #. TRANS: Subscription list text when looking at the subscriptions for a of a user that has none
 #. TRANS: as an anonymous user. %s is the user nickname.
-#: actions/subscriptions.php:141 actions/subscriptions.php:147
 #, php-format
 msgid "%s is not listening to anyone."
 msgstr "%s na nikoho njesłucha."
 
 #. TRANS: Atom feed title. %s is a profile nickname.
-#: actions/subscriptions.php:176
 #, php-format
 msgid "Subscription feed for %s (Atom)"
 msgstr "Abonowanski kanal za %s (Atom)"
 
 #. TRANS: Checkbox label for enabling Jabber messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:241 lib/settingsnav.php:110
-#, fuzzy
 msgid "IM"
 msgstr "IM"
 
 #. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:256 lib/settingsnav.php:117
 msgid "SMS"
 msgstr "SMS"
 
 #. TRANS: Title for all but the first page of notices with tags.
 #. TRANS: %1$s is the tag, %2$d is the page number.
-#: actions/tag.php:73
 #, php-format
 msgid "Notices tagged with %1$s, page %2$d"
 msgstr "Zdźělenki su z %1$s woznamjenjene, strona %2$d"
 
-#: actions/tag.php:91
 #, php-format
 msgid "Notice feed for tag %s (RSS 1.0)"
 msgstr "Zdźělenski kanal za tafličku %s (RSS 1.0)"
 
-#: actions/tag.php:97
 #, php-format
 msgid "Notice feed for tag %s (RSS 2.0)"
 msgstr "Zdźělenski kanal za tafličku %s (RSS 2.0)"
 
-#: actions/tag.php:103
 #, php-format
 msgid "Notice feed for tag %s (Atom)"
 msgstr "Zdźělenski kanal za tafličku %s (Atom)"
 
-#: actions/tagother.php:39
 msgid "No ID argument."
 msgstr "Žadyn argument ID."
 
-#: actions/tagother.php:65
 #, php-format
 msgid "Tag %s"
 msgstr ""
 
 #. TRANS: H2 for user profile information.
-#: actions/tagother.php:77 lib/userprofile.php:76
 msgid "User profile"
 msgstr "Wužiwarski profil"
 
-#: actions/tagother.php:120
 msgid "Tag user"
 msgstr ""
 
-#: actions/tagother.php:130
 msgid ""
 "Tags for this user (letters, numbers, -, ., and _), comma- or space- "
 "separated"
 msgstr ""
 
-#: actions/tagother.php:157
 #, php-format
 msgid "Invalid tag: \"%s\""
 msgstr "Njepłaćiwa taflička: \"%s\""
 
-#: actions/tagother.php:172
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 
-#: actions/tagother.php:215
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
 "wužij tutón formular, zo by swojim abonentam abo abonementam taflički přidał."
 
-#: actions/tagrss.php:35
 msgid "No such tag."
 msgstr "Taflička njeeksistuje."
 
 #. TRANS: Client error displayed when trying to unblock a non-blocked user.
-#: actions/unblock.php:59
 msgid "You haven't blocked that user."
 msgstr "Njejsy toho wužiwarja zablokował."
 
-#: actions/unsandbox.php:72
 msgid "User is not sandboxed."
 msgstr "Wužiwar njeje w pěskowym kašćiku."
 
-#: actions/unsilence.php:72
 msgid "User is not silenced."
 msgstr "Wužiwarjej huba zatykana njeje."
 
-#: actions/unsubscribe.php:77
 msgid "No profile ID in request."
 msgstr "Žadyn profilowy ID w naprašowanju."
 
-#: actions/unsubscribe.php:98
 msgid "Unsubscribed"
 msgstr "Wotskazany"
 
-#: actions/updateprofile.php:64
 #, php-format
 msgid ""
 "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
 msgstr ""
 
-#: actions/urlsettings.php:60
 #, fuzzy
 msgid "URL settings"
 msgstr "IM-nastajenja"
 
 #. TRANS: Instructions for tab "Other" in user profile settings.
-#: actions/urlsettings.php:72
 msgid "Manage various other options."
 msgstr "Wšelake druhe opcije zrjadować."
 
 #. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
 #. TRANS: user's profile settings. This message has one space at the beginning. Use your
 #. TRANS: language's word separator here if it has one (most likely a single space).
-#: actions/urlsettings.php:115
 msgid " (free service)"
 msgstr " (swobodna słužba)"
 
-#: actions/urlsettings.php:121
 #, fuzzy
 msgid "[none]"
 msgstr "Žadyn"
 
-#: actions/urlsettings.php:122
 msgid "[internal]"
 msgstr ""
 
 #. TRANS: Label for dropdown with URL shortener services.
-#: actions/urlsettings.php:130
 msgid "Shorten URLs with"
 msgstr "URL skrótšić z"
 
 #. TRANS: Tooltip for for dropdown with URL shortener services.
-#: actions/urlsettings.php:132
 msgid "Automatic shortening service to use."
 msgstr ""
 
-#: actions/urlsettings.php:138
 msgid "URL longer than"
 msgstr ""
 
-#: actions/urlsettings.php:141
 msgid "URLs longer than this will be shortened, 0 means always shorten."
 msgstr ""
 
-#: actions/urlsettings.php:145
 msgid "Text longer than"
 msgstr ""
 
-#: actions/urlsettings.php:148
 msgid ""
 "URLs in notices longer than this will be shortened, 0 means always shorten."
 msgstr ""
 
 #. TRANS: Form validation error for form "Other settings" in user profile.
-#: actions/urlsettings.php:180
 msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr "Krótšenska słužba za URL je předołha (maks. 50 znamješkow)."
 
-#: actions/urlsettings.php:187
 msgid "Invalid number for max url length."
 msgstr ""
 
-#: actions/urlsettings.php:193
 #, fuzzy
 msgid "Invalid number for max notice length."
 msgstr "Njepłaćiwy wobsah zdźělenki."
 
-#: actions/urlsettings.php:238
 msgid "Error saving user URL shortening preferences."
 msgstr ""
 
 #. TRANS: User admin panel title
-#: actions/useradminpanel.php:58
 msgctxt "TITLE"
 msgid "User"
 msgstr "Wužiwar"
 
 #. TRANS: Instruction for user admin panel.
-#: actions/useradminpanel.php:69
 msgid "User settings for this StatusNet site"
 msgstr "Wužiwarske nastajenja za sydło StatusNet"
 
 #. TRANS: Form validation error in user admin panel when a non-numeric character limit was set.
-#: actions/useradminpanel.php:147
 msgid "Invalid bio limit. Must be numeric."
 msgstr ""
 
 #. TRANS: Form validation error in user admin panel when welcome text is too long.
-#: actions/useradminpanel.php:154
 msgid "Invalid welcome text. Maximum length is 255 characters."
 msgstr "Njepłaćiwy powitanski tekst. Maksimalna dołhosć je 255 znamješkow."
 
 #. TRANS: Client error displayed when trying to set a non-existing user as default subscription for new
 #. TRANS: users in user admin panel. %1$s is the invalid nickname.
-#: actions/useradminpanel.php:166
 #, php-format
 msgid "Invalid default subscripton: \"%1$s\" is not a user."
 msgstr "Njepłaćiwy standardny abonement: \"%1$s\" wužiwar njeje."
 
-#: actions/useradminpanel.php:215 lib/action.php:565 lib/settingsnav.php:77
-#: lib/subgroupnav.php:81
 msgid "Profile"
 msgstr "Profil"
 
 #. TRANS: Field label in user admin panel for setting the character limit for the bio field.
-#: actions/useradminpanel.php:220
 msgid "Bio Limit"
 msgstr "Limit biografije"
 
 #. TRANS: Tooltip in user admin panel for setting the character limit for the bio field.
-#: actions/useradminpanel.php:222
 msgid "Maximum length of a profile bio in characters."
 msgstr ""
 
 #. TRANS: Form legend in user admin panel.
-#: actions/useradminpanel.php:231
 msgid "New users"
 msgstr "Nowi wužiwarjo"
 
 #. TRANS: Field label in user admin panel for setting new user welcome text.
-#: actions/useradminpanel.php:236
 msgid "New user welcome"
 msgstr "Powitanje noweho wužiwarja"
 
 #. TRANS: Tooltip in user admin panel for setting new user welcome text.
-#: actions/useradminpanel.php:238
 msgid "Welcome text for new users (maximum 255 characters)."
 msgstr "Powitanski tekst za nowych wužiwarjow (maks. 255 znamješkow)."
 
 #. TRANS: Field label in user admin panel for setting default subscription for new users.
-#: actions/useradminpanel.php:244
 msgid "Default subscription"
 msgstr "Standardny abonement"
 
 #. TRANS: Tooltip in user admin panel for setting default subscription for new users.
-#: actions/useradminpanel.php:246
 msgid "Automatically subscribe new users to this user."
 msgstr "Nowych wužiwarjow za tutoho wužiwarja abonować."
 
 #. TRANS: Form legend in user admin panel.
-#: actions/useradminpanel.php:256
 msgid "Invitations"
 msgstr "Přeprošenja"
 
 #. TRANS: Field label for checkbox in user admin panel for allowing users to invite friend using site e-mail.
-#: actions/useradminpanel.php:262
 msgid "Invitations enabled"
 msgstr "Přeprošenja zmóžnjene"
 
 #. TRANS: Tooltip for checkbox in user admin panel for allowing users to invite friend using site e-mail.
-#: actions/useradminpanel.php:265
 msgid "Whether to allow users to invite new users."
 msgstr ""
 
 #. TRANS: Title for button to save user settings in user admin panel.
-#: actions/useradminpanel.php:302
 msgid "Save user settings."
 msgstr "Wužiwarske nastajenja składować."
 
 #. TRANS: Page title.
-#: actions/userauthorization.php:109
 msgid "Authorize subscription"
 msgstr "Abonement awtorizować"
 
 #. TRANS: Page notice on "Auhtorize subscription" page.
-#: actions/userauthorization.php:115
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
 "user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
@@ -6353,38 +5185,31 @@ msgid ""
 msgstr ""
 
 #. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:200
 msgctxt "BUTTON"
 msgid "Accept"
 msgstr "Akceptować"
 
 #. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:202
 msgid "Subscribe to this user."
 msgstr "Tutoho wužiwarja abonować."
 
 #. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:204
 msgctxt "BUTTON"
 msgid "Reject"
 msgstr "Wotpokazać"
 
 #. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:206
 msgid "Reject this subscription."
 msgstr "Tutón abonement wotpokazać."
 
 #. TRANS: Client error displayed for an empty authorisation request.
-#: actions/userauthorization.php:219
 msgid "No authorization request!"
 msgstr "Žane awtorizaciske naprašowanje!"
 
 #. TRANS: Accept message header from Authorise subscription page.
-#: actions/userauthorization.php:242
 msgid "Subscription authorized"
 msgstr "Abonement awtorizowany"
 
-#: actions/userauthorization.php:245
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to authorize the "
@@ -6392,11 +5217,9 @@ msgid ""
 msgstr ""
 
 #. TRANS: Reject message header from Authorise subscription page.
-#: actions/userauthorization.php:256
 msgid "Subscription rejected"
 msgstr "Abonement wotpokazany"
 
-#: actions/userauthorization.php:259
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to fully reject the "
@@ -6405,35 +5228,30 @@ msgstr ""
 
 #. TRANS: Exception thrown when no valid user is found for an authorisation request.
 #. TRANS: %s is a listener URI.
-#: actions/userauthorization.php:296
 #, php-format
 msgid "Listener URI \"%s\" not found here."
 msgstr "URI posłucharja \"%s\" njebu tu namakany."
 
 #. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
 #. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:303
 #, php-format
 msgid "Listenee URI \"%s\" is too long."
 msgstr "URI posłucharki \"%s\" je předołhi."
 
 #. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
 #. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:311
 #, php-format
 msgid "Listenee URI \"%s\" is a local user."
 msgstr "URI posłucharki \"%s\" je lokalny wužiwar.."
 
 #. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
 #. TRANS: %s is a profile URL.
-#: actions/userauthorization.php:329
 #, php-format
 msgid "Profile URL \"%s\" is for a local user."
 msgstr "Profilowy URL \"%s\" je za lokalneho wužiwarja."
 
 #. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
 #. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
-#: actions/userauthorization.php:339
 #, php-format
 msgid ""
 "Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
@@ -6442,75 +5260,61 @@ msgstr ""
 
 #. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
 #. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:349
 #, php-format
 msgid "Avatar URL \"%s\" is not valid."
 msgstr "URL awatara \"%s\" njeje płaćiwy."
 
 #. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
 #. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:356
 #, php-format
 msgid "Cannot read avatar URL \"%s\"."
 msgstr "Awatarowy URL \"%s\" njeda so čitać."
 
 #. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
 #. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:363
 #, php-format
 msgid "Wrong image type for avatar URL \"%s\"."
 msgstr "Wopačny wobrazowy typ za awatarowy URL \"%s\"."
 
 #. TRANS: Page title for profile design page.
-#: actions/userdesignsettings.php:74 lib/designsettings.php:61
 msgid "Profile design"
 msgstr "Profilowy design"
 
 #. TRANS: Instructions for profile design page.
-#: actions/userdesignsettings.php:84 lib/designsettings.php:72
 msgid ""
 "Customize the way your profile looks with a background image and a colour "
 "palette of your choice."
 msgstr ""
 
-#: actions/userdesignsettings.php:289
 msgid "Enjoy your hotdog!"
 msgstr "Wjele wjesela!"
 
-#: actions/userdesignsettings.php:325
 #, fuzzy
 msgid "Design settings"
 msgstr "Sydłowe nastajenja składować"
 
-#: actions/userdesignsettings.php:340
 msgid "View profile designs"
 msgstr "Profilowe designy sej wobhladać"
 
-#: actions/userdesignsettings.php:341
 msgid "Show or hide profile designs."
 msgstr "Profilowe designy pokazać abo schować."
 
-#: actions/userdesignsettings.php:348
 #, fuzzy
 msgid "Background file"
 msgstr "Pozadk"
 
 #. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number.
-#: actions/usergroups.php:66
 #, php-format
 msgid "%1$s groups, page %2$d"
 msgstr "%1$s skupinow, strona %2$d"
 
-#: actions/usergroups.php:132
 msgid "Search for more groups"
 msgstr "Dalše skupiny pytać"
 
-#: actions/usergroups.php:159
 #, php-format
 msgid "%s is not a member of any group."
 msgstr "%s čłon w žanej skupinje njeje."
 
-#: actions/usergroups.php:164
 #, php-format
 msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
 msgstr ""
@@ -6520,34 +5324,27 @@ msgstr ""
 #. TRANS: %1$s is a group name, %2$s is a site name.
 #. TRANS: Message is used as a subtitle in atom user notice feed.
 #. TRANS: %1$s is a user name, %2$s is a site name.
-#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:70
-#: lib/atomusernoticefeed.php:95
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr "Aktualizacije wot %1$s na %2$s!"
 
-#: actions/version.php:75
 #, php-format
 msgid "StatusNet %s"
 msgstr "StatusNet %s"
 
-#: actions/version.php:155
 #, php-format
 msgid ""
 "This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
 "Inc. and contributors."
 msgstr ""
 
-#: actions/version.php:163
 msgid "Contributors"
 msgstr "Sobuskutkowarjo"
 
 #. TRANS: Menu item for site administration
-#: actions/version.php:167 lib/adminpanelaction.php:403
 msgid "License"
 msgstr "Licenca"
 
-#: actions/version.php:170
 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 "
@@ -6555,7 +5352,6 @@ msgid ""
 "any later version. "
 msgstr ""
 
-#: actions/version.php:176
 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 "
@@ -6563,7 +5359,6 @@ msgid ""
 "for more details. "
 msgstr ""
 
-#: actions/version.php:182
 #, php-format
 msgid ""
 "You should have received a copy of the GNU Affero General Public License "
@@ -6571,52 +5366,42 @@ msgid ""
 msgstr ""
 
 #. TRANS: Form input field label for application name.
-#: actions/version.php:197 lib/applicationeditform.php:190
 msgid "Name"
 msgstr "Mjeno"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:885
 msgid "Version"
 msgstr "Wersija"
 
-#: actions/version.php:199
 msgid "Author(s)"
 msgstr "Awtorojo"
 
 #. TRANS: Form input field label.
-#: actions/version.php:200 lib/applicationeditform.php:208
-#: lib/groupeditform.php:168
 msgid "Description"
 msgstr "Wopisanje"
 
 #. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:164
 msgid "Favor"
 msgstr "Faworit"
 
 #. TRANS: Ntofication given when a user marks a notice as favorite.
 #. TRANS: %1$s is a user nickname or full name, %2$s is a notice URI.
-#: classes/Fave.php:167
 #, php-format
 msgid "%1$s marked notice %2$s as a favorite."
 msgstr "%1$s je zdźělenku %2$s jako faworit markěrował."
 
 #. TRANS: Server exception thrown when a URL cannot be processed.
-#: classes/File.php:162
 #, php-format
 msgid "Cannot process URL '%s'"
 msgstr "URL '%s' njeda so předźěłać"
 
 #. TRANS: Server exception thrown when... Robin thinks something is impossible!
-#: classes/File.php:194
 msgid "Robin thinks something is impossible."
 msgstr "Robin měni, zo něšto je njemóžno."
 
 #. 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$s is used for plural.
-#: classes/File.php:210
 #, php-format
 msgid ""
 "No file may be larger than %1$d byte and the file you sent was %2$d bytes. "
@@ -6631,7 +5416,6 @@ msgstr[3] ""
 
 #. TRANS: Message given if an upload would exceed user quota.
 #. TRANS: %d (number) is the user quota in bytes and is used for plural.
-#: classes/File.php:223
 #, php-format
 msgid "A file this large would exceed your user quota of %d byte."
 msgid_plural "A file this large would exceed your user quota of %d bytes."
@@ -6642,7 +5426,6 @@ msgstr[3] ""
 
 #. TRANS: Message given id an upload would exceed a user's monthly quota.
 #. TRANS: $d (number) is the monthly user quota in bytes and is used for plural.
-#: classes/File.php:235
 #, php-format
 msgid "A file this large would exceed your monthly quota of %d byte."
 msgid_plural "A file this large would exceed your monthly quota of %d bytes."
@@ -6652,156 +5435,129 @@ msgstr[2] ""
 msgstr[3] ""
 
 #. TRANS: Client exception thrown if a file upload does not have a valid name.
-#: classes/File.php:282 classes/File.php:297
 msgid "Invalid filename."
 msgstr "Njepłaćiwe datajowe mjeno."
 
 #. TRANS: Exception thrown when joining a group fails.
-#: classes/Group_member.php:51
 msgid "Group join failed."
 msgstr "Přizamknjenje k skupinje je so njeporadźiło."
 
 #. TRANS: Exception thrown when trying to leave a group the user is not a member of.
-#: classes/Group_member.php:64
 msgid "Not part of group."
 msgstr "Njeje dźěl skupiny."
 
 #. TRANS: Exception thrown when trying to leave a group fails.
-#: classes/Group_member.php:72
 msgid "Group leave failed."
 msgstr "Wopušćenje skupiny je so njeporadźiło."
 
 #. TRANS: Exception thrown providing an invalid profile ID.
 #. TRANS: %s is the invalid profile ID.
-#: classes/Group_member.php:85
 #, php-format
 msgid "Profile ID %s is invalid."
 msgstr "Profilowy ID %s je njepłaćiwy."
 
 #. TRANS: Exception thrown providing an invalid group ID.
 #. TRANS: %s is the invalid group ID.
-#: classes/Group_member.php:98
 #, php-format
 msgid "Group ID %s is invalid."
 msgstr "Skupinski ID %s je njepłaćiwy."
 
 #. TRANS: Activity title.
-#: classes/Group_member.php:147 lib/joinform.php:114
 msgid "Join"
 msgstr "Zastupić"
 
 #. TRANS: Success message for subscribe to group attempt through OStatus.
 #. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
-#: classes/Group_member.php:151
 #, php-format
 msgid "%1$s has joined group %2$s."
 msgstr "%1$s je do skupiny %2$s zastupił."
 
 #. TRANS: Server exception thrown when updating a local group fails.
-#: classes/Local_group.php:42
 msgid "Could not update local group."
 msgstr "Lokalna skupina njeda so aktualizować."
 
 #. TRANS: Exception thrown when trying creating a login token failed.
 #. TRANS: %s is the user nickname for which token creation failed.
-#: classes/Login_token.php:78
 #, php-format
 msgid "Could not create login token for %s"
 msgstr "Njeje móžno było, přizjewjenske znamješko za %s wutworić"
 
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
-#: classes/Memcached_DataObject.php:556
 msgid "No database name or DSN found anywhere."
 msgstr "Žane mjeno datoweje banki namakane abo žadyn DSN namakany."
 
 #. TRANS: Client exception thrown when a user tries to send a direct message while being banned from sending them.
-#: classes/Message.php:45
 msgid "You are banned from sending direct messages."
 msgstr "Słanje direktnych powěsćow je ći zakazane."
 
 #. TRANS: Message given when a message could not be stored on the server.
-#: classes/Message.php:69
 msgid "Could not insert message."
 msgstr "Powěsć njeda so zasunyć."
 
 #. TRANS: Message given when a message could not be updated on the server.
-#: classes/Message.php:80
 msgid "Could not update message with new URI."
 msgstr "Powěsć z nowym URI njeda so aktualizować."
 
 #. TRANS: Server exception thrown when a user profile for a notice cannot be found.
 #. TRANS: %1$d is a profile ID (number), %2$d is a notice ID (number).
-#: classes/Notice.php:98
 #, php-format
 msgid "No such profile (%1$d) for notice (%2$d)."
 msgstr "Žadyn profil (%1$d) za zdźělenku (%2$d)."
 
 #. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:199
 #, php-format
 msgid "Database error inserting hashtag: %s"
 msgstr "Zmylk datoweje banki při zasunjenju hašeje taflički: %s"
 
 #. TRANS: Client exception thrown if a notice contains too many characters.
-#: classes/Notice.php:279
 msgid "Problem saving notice. Too long."
 msgstr "Zmylk při składowanju powěsće. Wona je předołha."
 
 #. TRANS: Client exception thrown when trying to save a notice for an unknown user.
-#: classes/Notice.php:284
 msgid "Problem saving notice. Unknown user."
 msgstr "Zmylk při składowanju powěsće. Njeznaty wužiwar."
 
 #. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
-#: classes/Notice.php:290
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 
 #. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
-#: classes/Notice.php:297
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
 "few minutes."
 msgstr ""
 
 #. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:305
 msgid "You are banned from posting notices on this site."
 msgstr "Słanje zdźělenkow na tutym sydle je ći zakazane."
 
 #. TRANS: Server exception thrown when a notice cannot be saved.
 #. TRANS: Server exception thrown when a notice cannot be updated.
-#: classes/Notice.php:372 classes/Notice.php:399
 msgid "Problem saving notice."
 msgstr "Zmylk při składowanju powěsće."
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:929
 msgid "Bad type provided to saveKnownGroups."
 msgstr ""
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:1028
 msgid "Problem saving group inbox."
 msgstr ""
 
 #. TRANS: Server exception thrown when a reply cannot be saved.
 #. TRANS: %1$d is a notice ID, %2$d is the ID of the mentioned user.
-#: classes/Notice.php:1144
 #, php-format
 msgid "Could not save reply for %1$d, %2$d."
 msgstr "Wotmołwa za %1$d, %2$d njeda so składować."
 
 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1663
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
 
 #. TRANS: Full name of a profile or group followed by nickname in parens
-#: classes/Profile.php:172 classes/User_group.php:242
 #, php-format
 msgctxt "FANCYNAME"
 msgid "%1$s (%2$s)"
@@ -6809,263 +5565,213 @@ msgstr "%1$s (%2$s)"
 
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:779
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:788
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
 
 #. TRANS: Exception thrown when a right for a non-existing user profile is checked.
-#: classes/Remote_profile.php:54
 msgid "Missing profile."
 msgstr "Falowacy profil."
 
 #. TRANS: Exception thrown when a tag cannot be saved.
-#: classes/Status_network.php:338
 msgid "Unable to save tag."
 msgstr "Njeje móžno, tafličku składować."
 
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#: classes/Subscription.php:77 lib/oauthstore.php:482
 msgid "You have been banned from subscribing."
 msgstr "Abonowanje je ći zakazane."
 
 #. TRANS: Exception thrown when trying to subscribe while already subscribed.
-#: classes/Subscription.php:82
 msgid "Already subscribed!"
 msgstr "Hižo abonowany!"
 
 #. TRANS: Exception thrown when trying to subscribe to a user who has blocked the subscribing user.
-#: classes/Subscription.php:87
 msgid "User has blocked you."
 msgstr "Wužiwar je će zablokował."
 
 #. TRANS: Exception thrown when trying to unsibscribe without a subscription.
-#: classes/Subscription.php:176
 msgid "Not subscribed!"
 msgstr "Njeje abonowany!"
 
 #. TRANS: Exception thrown when trying to unsubscribe a user from themselves.
-#: classes/Subscription.php:183
 msgid "Could not delete self-subscription."
 msgstr "Sebjeabonement njeda so zhašeć."
 
 #. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
-#: classes/Subscription.php:211
 msgid "Could not delete subscription OMB token."
 msgstr "Znamjo OMB-abonementa njeda so zhašeć."
 
 #. TRANS: Exception thrown when a subscription could not be deleted on the server.
-#: classes/Subscription.php:223
 msgid "Could not delete subscription."
 msgstr "Abonoment njeda so zhašeć ."
 
 #. TRANS: Activity tile when subscribing to another person.
-#: classes/Subscription.php:265
 msgid "Follow"
 msgstr "Slědować"
 
 #. TRANS: Notification given when one person starts following another.
 #. TRANS: %1$s is the subscriber, %2$s is the subscribed.
-#: classes/Subscription.php:268
 #, php-format
 msgid "%1$s is now following %2$s."
 msgstr "%1$s nětko %2$s slěduje."
 
 #. TRANS: Notice given on user registration.
 #. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:390
 #, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr "Witaj do %1$s, @%2$s!"
 
 #. TRANS: Server exception.
-#: classes/User.php:923
 msgid "No single user defined for single-user mode."
 msgstr "Žadyn jednotliwy wužiwar za modus jednotliweho wužiwarja definowany."
 
 #. TRANS: Server exception.
-#: classes/User.php:927
 msgid "Single-user mode code called when not enabled."
 msgstr ""
 
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:522
 msgid "Could not create group."
 msgstr "Skupina njeda so wutowrić."
 
 #. TRANS: Server exception thrown when updating a group URI failed.
-#: classes/User_group.php:532
 msgid "Could not set group URI."
 msgstr "URI skupiny njeda so nastajić."
 
 #. TRANS: Server exception thrown when setting group membership failed.
-#: classes/User_group.php:555
 msgid "Could not set group membership."
 msgstr "Skupinske čłonstwo njeda so stajić."
 
 #. TRANS: Server exception thrown when saving local group information failed.
-#: classes/User_group.php:570
 msgid "Could not save local group info."
 msgstr "Informacije wo lokalnej skupinje njedachu so składować."
 
 #. TRANS: Exception thrown when an account could not be located when it should be moved.
 #. TRANS: %s is the remote site.
-#: lib/accountmover.php:65
 #, php-format
 msgid "Cannot locate account %s."
 msgstr "Konto %s njeda so zhašeć."
 
 #. TRANS: Exception thrown when a service document could not be located account move.
 #. TRANS: %s is the remote site.
-#: lib/accountmover.php:106
 #, php-format
 msgid "Cannot find XRD for %s."
 msgstr "XRD za %s njeda so namakać."
 
 #. TRANS: Exception thrown when an account could not be located when it should be moved.
 #. TRANS: %s is the remote site.
-#: lib/accountmover.php:131
 #, php-format
 msgid "No AtomPub API service for %s."
 msgstr "Žana słužba AtomPub API za %s."
 
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: lib/action.php:161
 #, php-format
 msgid "%1$s - %2$s"
 msgstr "%1$s - %2$s"
 
 #. TRANS: Page title for a page without a title set.
-#: lib/action.php:177
 msgid "Untitled page"
 msgstr "Strona bjez titula"
 
 #. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.
-#: lib/action.php:325
 msgctxt "TOOLTIP"
 msgid "Show more"
 msgstr "Wjace pokazać"
 
 #. TRANS: Inline reply form submit button: submits a reply comment.
-#: lib/action.php:328
 #, fuzzy
 msgctxt "BUTTON"
-msgid "Comment"
-msgstr "Wobsah"
+msgid "Reply"
+msgstr "Wotmołwić"
 
 #. TRANS: Placeholder text for inline reply form. Clicking in this box will turn it into a mini notice form.
-#: lib/action.php:331
-msgid "Add a comment..."
+msgid "Write a reply..."
 msgstr ""
 
-#: lib/action.php:559 lib/personalgroupnav.php:99
 #, fuzzy
 msgid "Home"
 msgstr "Startowa strona"
 
-#: lib/action.php:560
 msgid "Friends timeline"
 msgstr ""
 
-#: lib/action.php:566
 #, fuzzy
 msgid "Your profile"
 msgstr "Skupinski profil"
 
-#: lib/action.php:570 lib/action.php:593 lib/publicgroupnav.php:78
 msgid "Public"
 msgstr "Zjawny"
 
-#: lib/action.php:571 lib/action.php:594
 #, fuzzy
 msgid "Everyone on this site"
 msgstr "Ludźi na tutym sydle pytać"
 
-#: lib/action.php:575
 #, fuzzy
 msgid "Settings"
 msgstr "SMS-nastajenja"
 
-#: lib/action.php:576
 #, fuzzy
 msgid "Change your personal settings"
 msgstr "Twoje profilowe nastajenja změnić"
 
-#: lib/action.php:582
 #, fuzzy
 msgid "Site configuration"
 msgstr "Wužiwarska konfiguracija"
 
-#: lib/action.php:587
 #, fuzzy
 msgid "Logout"
 msgstr "Wotzjewić"
 
-#: lib/action.php:588
 #, fuzzy
 msgid "Logout from the site"
 msgstr "Ze sydła wotzjewić"
 
-#: lib/action.php:599
 #, fuzzy
 msgid "Login to the site"
 msgstr "Při sydle přizjewić"
 
-#: lib/action.php:606
-#, fuzzy
 msgid "Search"
 msgstr "Pytać"
 
-#: lib/action.php:607
 #, fuzzy
 msgid "Search the site"
 msgstr "Pytanske sydło"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:864
 msgid "Help"
 msgstr "Pomoc"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:867
 msgid "About"
 msgstr "Wo"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:870
 msgid "FAQ"
 msgstr "Huste prašenja"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:875
 msgid "TOS"
 msgstr "Wužiwarske wuměnjenja"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:879
 msgid "Privacy"
 msgstr "Priwatnosć"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:882
 msgid "Source"
 msgstr "Žórło"
 
 #. TRANS: Secondary navigation menu option leading to e-mail contact information on the
 #. TRANS: StatusNet site, where to report bugs, ...
-#: lib/action.php:889
 msgid "Contact"
 msgstr "Kontakt"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:892
 msgid "Badge"
 msgstr "Plaketa"
 
@@ -7073,7 +5779,6 @@ msgstr "Plaketa"
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:921
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7081,7 +5786,6 @@ msgid ""
 msgstr ""
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:924
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** je mikroblogowanska słužba."
@@ -7090,7 +5794,6 @@ msgstr "**%%site.name%%** je mikroblogowanska słužba."
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:931
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7100,103 +5803,85 @@ msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:949
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr "Wobsah a daty wot %1$s su priwatne a dowěrliwe."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:956
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:960
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:992
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr "Wobsah a daty wot %1$s su pod licencu %2$s."
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1335
 msgid "After"
 msgstr "Po"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1345
 msgid "Before"
 msgstr "Před"
 
 #. TRANS: Client exception thrown when a feed instance is a DOMDocument.
-#: lib/activity.php:125
 msgid "Expecting a root feed element but got a whole XML document."
 msgstr ""
 
 #. TRANS: Client exception thrown when using an unknown verb for the activity importer.
-#: lib/activityimporter.php:81
 #, php-format
 msgid "Unknown verb: \"%s\"."
 msgstr "Njeznaty werb: \"%s\"."
 
 #. TRANS: Client exception thrown when trying to force a subscription for an untrusted user.
-#: lib/activityimporter.php:107
 msgid "Cannot force subscription for untrusted user."
 msgstr "Abonement za dowěry njehódneho wužiwarja njeda so wunuzować"
 
 #. TRANS: Client exception thrown when trying to for a remote user to subscribe.
-#: lib/activityimporter.php:117
 msgid "Cannot force remote user to subscribe."
 msgstr "Zdaleny wužiwar njehodźi so nuzować něšto abonować."
 
 #. TRANS: Client exception thrown when trying to subscribe to an unknown profile.
-#: lib/activityimporter.php:132
 msgid "Unknown profile."
 msgstr "Njeznaty profil."
 
 #. TRANS: Client exception thrown when trying to import an event not related to the importing user.
-#: lib/activityimporter.php:138
 msgid "This activity seems unrelated to our user."
 msgstr "Zda so, zo tuta aktiwita z našim wužiwarjom njezwisuje."
 
 #. TRANS: Client exception thrown when trying to join a remote group that is not a group.
-#: lib/activityimporter.php:154
 msgid "Remote profile is not a group!"
 msgstr "Zdaleny profil skupina njeje!"
 
 #. TRANS: Client exception thrown when trying to join a group the importing user is already a member of.
-#: lib/activityimporter.php:163
 msgid "User is already a member of this group."
 msgstr "Wužiwar je hižo čłon tuteje skupiny."
 
 #. TRANS: Client exception thrown when trying to import a notice by another user.
 #. TRANS: %1$s is the source URI of the notice, %2$s is the URI of the author.
-#: lib/activityimporter.php:201
 #, php-format
 msgid "Already know about notice %1$s and  it has a different author %2$s."
 msgstr "Zdźělenka %1$s je hižo znata a ma druheho awtora %2$s."
 
 #. TRANS: Client exception thrown when trying to overwrite the author information for a non-trusted user during import.
-#: lib/activityimporter.php:207
 msgid "Not overwriting author info for non-trusted user."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to import a notice without content.
 #. TRANS: %s is the notice URI.
-#: lib/activityimporter.php:223
 #, php-format
 msgid "No content for notice %s."
 msgstr "!Žadyn wobsah za powěsć %s."
 
-#: lib/activitymover.php:84
 #, php-format
 msgid "No such user %s."
 msgstr "Wužiwar %s njeeksistuje."
@@ -7207,209 +5892,169 @@ msgstr "Wužiwar %s njeeksistuje."
 #. TRANS: %1$s is a URL, %2$s is the status, %s$s is the fail reason.
 #. TRANS: Exception thrown when post to collection fails with a status that is not handled.
 #. TRANS: %1$s is a URL, %2$s is the status, %s$s is the fail reason.
-#: lib/activitysink.php:163 lib/activitysink.php:167 lib/activitysink.php:172
 #, php-format
 msgctxt "URLSTATUSREASON"
 msgid "%1$s %2$s %3$s"
 msgstr "%1$s  %2$s %3$s"
 
 #. TRANS: Client exception thrown when there is no source attribute.
-#: lib/activityutils.php:200
 msgid "Can't handle remote content yet."
 msgstr ""
 
 #. TRANS: Client exception thrown when there embedded XML content is found that cannot be processed yet.
-#: lib/activityutils.php:237
 msgid "Can't handle embedded XML content yet."
 msgstr ""
 
 #. TRANS: Client exception thrown when base64 encoded content is found that cannot be processed yet.
-#: lib/activityutils.php:242
 msgid "Can't handle embedded Base64 content yet."
 msgstr ""
 
 #. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights.
-#: lib/adminpanelaction.php:96
 msgid "You cannot make changes to this site."
 msgstr "Njemóžeš tute sydło změnić."
 
 #. TRANS: Client error message throw when a certain panel's settings cannot be changed.
-#: lib/adminpanelaction.php:108
 msgid "Changes to that panel are not allowed."
 msgstr "Změny na tutym woknje njejsu dowolene."
 
 #. TRANS: Client error message.
-#: lib/adminpanelaction.php:222
 msgid "showForm() not implemented."
 msgstr "showForm() njeimplementowany."
 
 #. TRANS: Client error message
-#: lib/adminpanelaction.php:250
 msgid "saveSettings() not implemented."
 msgstr "saveSettings() njeimplementowany."
 
 #. TRANS: Client error message thrown if design settings could not be deleted in
 #. TRANS: the admin panel Design.
-#: lib/adminpanelaction.php:274
 msgid "Unable to delete design setting."
 msgstr "Njeje móžno, designowe nastajenje zhašeć."
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:337
 msgid "Basic site configuration"
 msgstr "Zakładna sydłowa konfiguracija"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:339
 msgctxt "MENU"
 msgid "Site"
 msgstr "Sydło"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:345
 msgid "Design configuration"
 msgstr "Designowa konfiguracija"
 
 #. TRANS: Menu item for site administration
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/adminpanelaction.php:347 lib/groupnav.php:135
 msgctxt "MENU"
 msgid "Design"
 msgstr "Design"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:353
 msgid "User configuration"
 msgstr "Wužiwarska konfiguracija"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:110
 msgid "User"
 msgstr "Wužiwar"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:361
 msgid "Access configuration"
 msgstr "Přistupna konfiguracija"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:369
 msgid "Paths configuration"
 msgstr "Konfiguracija šćežkow"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:377
 msgid "Sessions configuration"
 msgstr "Konfiguracija posedźenjow"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:385
 msgid "Edit site notice"
 msgstr "Sydłowu zdźělenku wobdźěłać"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:387
 msgid "Site notice"
 msgstr "Sydłowa zdźělenka"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:393
 msgid "Snapshots configuration"
 msgstr "Konfiguracija wobrazowkowych fotow"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:401
 msgid "Set site license"
 msgstr "Licencu sydła nastajić"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:409
 #, fuzzy
 msgid "Plugins configuration"
 msgstr "Konfiguracija šćežkow"
 
 #. TRANS: Client error 401.
-#: lib/apiauth.php:111
 msgid "API resource requires read-write access, but you only have read access."
 msgstr ""
 
 #. TRANS: OAuth exception thrown when no application is found for a given consumer key.
-#: lib/apiauth.php:177
 msgid "No application for that consumer key."
 msgstr "Žana aplikacija za tón kluč přetrjebowarja."
 
-#: lib/apiauth.php:202 lib/apiauth.php:284
 msgid "Not allowed to use API."
 msgstr ""
 
 #. TRANS: OAuth exception given when an incorrect access token was given for a user.
-#: lib/apiauth.php:225
 msgid "Bad access token."
 msgstr ""
 
 #. TRANS: OAuth exception given when no user was found for a given token (no token was found).
-#: lib/apiauth.php:230
 msgid "No user for that token."
 msgstr ""
 
 #. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel".
 #. TRANS: Client error thrown when authentication fails.
-#: lib/apiauth.php:272 lib/apiauth.php:302
 msgid "Could not authenticate you."
 msgstr "Njebě móžno će awtentifikować."
 
 #. TRANS: Server error displayed when trying to create an anynymous OAuth consumer.
-#: lib/apioauthstore.php:45
 msgid "Could not create anonymous consumer."
 msgstr "Anonymny přetrjebowar njeda so wutworić."
 
 #. TRANS: Server error displayed when trying to create an anynymous OAuth application.
-#: lib/apioauthstore.php:69
 msgid "Could not create anonymous OAuth application."
 msgstr "Anonymna OAuth-aplikacija njeda so wutworić."
 
 #. TRANS: Exception thrown when no token association could be found.
-#: lib/apioauthstore.php:151
 msgid ""
 "Could not find a profile and application associated with the request token."
 msgstr ""
 
 #. TRANS: Exception thrown when no access token can be issued.
-#: lib/apioauthstore.php:209
 msgid "Could not issue access token."
 msgstr "Přistupny token njeda so wudać."
 
-#: lib/apioauthstore.php:317
 msgid "Database error inserting OAuth application user."
 msgstr "Zmylk datoweje banki při zasunjenju wužiwarja OAuth-aplikacije."
 
-#: lib/apioauthstore.php:345
 msgid "Database error updating OAuth application user."
 msgstr "Zmylk datoweje banki při aktualizowanju wužiwarja OAuth-aplikacije."
 
 #. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
-#: lib/apioauthstore.php:371
 msgid "Tried to revoke unknown token."
 msgstr ""
 
 #. TRANS: Exception thrown when an attempt is made to remove a revoked token.
-#: lib/apioauthstore.php:376
 msgid "Failed to delete revoked token."
 msgstr ""
 
 #. TRANS: Form input field label for application icon.
-#: lib/applicationeditform.php:177
 msgid "Icon"
 msgstr "Symbol"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:182
 msgid "Icon for this application"
 msgstr "Symbol za tutu aplikaciju"
 
 #. TRANS: Form input field instructions.
 #. TRANS: %d is the number of available characters for the description.
-#: lib/applicationeditform.php:201
 #, php-format
 msgid "Describe your application in %d character"
 msgid_plural "Describe your application in %d characters"
@@ -7419,205 +6064,166 @@ msgstr[2] "Wopisaj swoju aplikaciju z %d znamješkami"
 msgstr[3] "Wopisaj swoju aplikaciju z %d znamješkami"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:205
 msgid "Describe your application"
 msgstr "Wopisaj swoju aplikaciju"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:216
 msgid "URL of the homepage of this application"
 msgstr "URL startoweje strony tuteje aplikacije"
 
 #. TRANS: Form input field label.
-#: lib/applicationeditform.php:218
 msgid "Source URL"
 msgstr "URL žórła"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:225
 msgid "Organization responsible for this application"
 msgstr "Organizacija, kotraž je za tutu aplikaciju zamołwita"
 
 #. TRANS: Form input field label.
-#: lib/applicationeditform.php:227
 msgid "Organization"
 msgstr "Organizacija"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:234
 msgid "URL for the homepage of the organization"
 msgstr "URL za startowu stronu organizacije"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:243
 msgid "URL to redirect to after authentication"
 msgstr ""
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:271
 msgid "Browser"
 msgstr "Wobhladowak"
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:288
 msgid "Desktop"
 msgstr "Desktop"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:290
 msgid "Type of application, browser or desktop"
 msgstr "Typ aplikacije, wobhladowaka abo dźěłanskeho powjercha"
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:314
 msgid "Read-only"
 msgstr "Jenož čitajomny"
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:334
 msgid "Read-write"
 msgstr "Popisujomny"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:336
 msgid "Default access for this application: read-only, or read-write"
 msgstr ""
 
 #. TRANS: Submit button title.
-#: lib/applicationeditform.php:353
 msgid "Cancel"
 msgstr "Přetorhnyć"
 
-#: lib/applicationlist.php:247
 msgid " by "
 msgstr "wot "
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:260
 msgid "read-write"
 msgstr "popisujomny"
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:262
 msgid "read-only"
 msgstr "jenož čitajomny"
 
 #. TRANS: Used in application list. %1$s is a modified date, %2$s is access type ("read-write" or "read-only")
-#: lib/applicationlist.php:268
 #, php-format
 msgid "Approved %1$s - \"%2$s\" access."
 msgstr "%1$s schwalene - přistup \"%2$s\""
 
 #. TRANS: Access token in the application list.
 #. TRANS: %s are the first 7 characters of the access token.
-#: lib/applicationlist.php:282
 #, php-format
 msgid "Access token starting with: %s"
 msgstr ""
 
 #. TRANS: Button label
-#: lib/applicationlist.php:298
 msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "Wotwołać"
 
-#: lib/atom10feed.php:113
 msgid "Author element must contain a name element."
 msgstr "Element \"author\" dyrbi element \"name\" wobsahować."
 
 #. TRANS: Server exception thrown when using the method setActivitySubject() in the class Atom10Feed.
-#: lib/atom10feed.php:160
 msgid "Do not use this method!"
 msgstr "Njewužij tutu metodu!"
 
 #. TRANS: Title.
-#: lib/attachmentnoticesection.php:67
 msgid "Notices where this attachment appears"
 msgstr "Zdźělenki, hdźež so tutón přiwěšk jewi"
 
 #. TRANS: Title.
-#: lib/attachmenttagcloudsection.php:48
 msgid "Tags for this attachment"
 msgstr "Taflički za tutón přiwěšk"
 
 #. TRANS: Exception thrown when a password change fails.
-#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:227
 msgid "Password changing failed."
 msgstr "Změnjenje hesła je so njeporadźiło."
 
 #. TRANS: Exception thrown when a password change attempt fails because it is not allowed.
-#: lib/authenticationplugin.php:238
 msgid "Password changing is not allowed."
 msgstr "Změnjenje hesła njeje dowolene."
 
 #. TRANS: Title for the form to block a user.
-#: lib/blockform.php:68
 msgid "Block"
 msgstr "Blokować"
 
 #. TRANS: Description of the form to block a user.
-#: lib/blockform.php:79
 msgid "Block this user"
 msgstr "Tutoho wužiwarja blokować"
 
 #. TRANS: Title for command results.
-#: lib/channel.php:104 lib/channel.php:125
 msgid "Command results"
 msgstr "Přikazowe wuslědki"
 
 #. TRANS: Title for command results.
-#: lib/channel.php:138
 msgid "AJAX error"
 msgstr "Zmylk Ajax"
 
 #. TRANS: E-mail subject when a command has completed.
-#: lib/channel.php:177 lib/mailhandler.php:143
 msgid "Command complete"
 msgstr "Přikaz wuwjedźeny"
 
 #. TRANS: E-mail subject when a command has failed.
-#: lib/channel.php:188
 msgid "Command failed"
 msgstr "Přikaz je so njeporadźił"
 
 #. TRANS: Command exception text shown when a notice ID is requested that does not exist.
-#: lib/command.php:82 lib/command.php:106
 msgid "Notice with that id does not exist."
 msgstr "Zdźělenka z tym ID njeeksistuje."
 
 #. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
 #. TRANS: Error text shown when a last user notice is requested and it does not exist.
-#: lib/command.php:99 lib/command.php:642
 msgid "User has no last notice."
 msgstr "Wužiwar nima poslednju powěsć."
 
 #. TRANS: Message given requesting a profile for a non-existing user.
 #. TRANS: %s is the nickname of the user for which the profile could not be found.
-#: lib/command.php:128
 #, php-format
 msgid "Could not find a user with nickname %s."
 msgstr "Wužiwar z přimjenom %s njeda so namakać."
 
 #. TRANS: Message given getting a non-existing user.
 #. TRANS: %s is the nickname of the user that could not be found.
-#: lib/command.php:148
 #, php-format
 msgid "Could not find a local user with nickname %s."
 msgstr "Lokalny wužiwar z přimjenom %s njeda so namakać."
 
 #. TRANS: Error text shown when an unimplemented command is given.
-#: lib/command.php:183
 msgid "Sorry, this command is not yet implemented."
 msgstr "Tutón přikaz hišće njeje implementowany."
 
 #. TRANS: Command exception text shown when a user tries to nudge themselves.
-#: lib/command.php:229
 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr ""
 
 #. TRANS: Message given having nudged another user.
 #. TRANS: %s is the nickname of the user that was nudged.
-#: lib/command.php:238
 #, php-format
 msgid "Nudge sent to %s."
 msgstr "Stork do %s pósłany."
@@ -7626,7 +6232,6 @@ msgstr "Stork do %s pósłany."
 #. TRANS: %1$s is the number of other user the user is subscribed to.
 #. TRANS: %2$s is the number of users that are subscribed to the user.
 #. TRANS: %3$s is the number of notices the user has sent.
-#: lib/command.php:268
 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"
@@ -7638,40 +6243,34 @@ msgstr ""
 "Zdźělenki: %3$s"
 
 #. TRANS: Error message text shown when a favorite could not be set because it has already been favorited.
-#: lib/command.php:298
 #, fuzzy
 msgid "Could not create favorite: already favorited."
 msgstr "Faworit njeda so wutworić."
 
 #. TRANS: Text shown when a notice has been marked as favourite successfully.
-#: lib/command.php:324
 msgid "Notice marked as fave."
 msgstr "Zdźělenka je jako faworit markěrowana."
 
 #. TRANS: Message given having added a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:369
 #, php-format
 msgid "%1$s joined group %2$s."
 msgstr "%1$s je do skupiny %2$s zastupił."
 
 #. TRANS: Message given having removed a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:417
 #, php-format
 msgid "%1$s left group %2$s."
 msgstr "%1$s je skupinu %2$s wopušćił."
 
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: lib/command.php:438
 #, php-format
 msgctxt "WHOIS"
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
 
 #. TRANS: Whois output. %s is the full name of the queried user.
-#: lib/command.php:442
 #, php-format
 msgid "Fullname: %s"
 msgstr "Dospołne mjeno: %s"
@@ -7679,7 +6278,6 @@ msgstr "Dospołne mjeno: %s"
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a location.
-#: lib/command.php:446 lib/mail.php:275
 #, php-format
 msgid "Location: %s"
 msgstr "Městno: %s"
@@ -7687,20 +6285,17 @@ msgstr "Městno: %s"
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a homepage.
-#: lib/command.php:450 lib/mail.php:279
 #, php-format
 msgid "Homepage: %s"
 msgstr "Startowa strona: %s"
 
 #. TRANS: Whois output. %s is the bio information of the queried user.
-#: lib/command.php:454
 #, php-format
 msgid "About: %s"
 msgstr "Wo: %s"
 
 #. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).
 #. TRANS: %s is a remote profile.
-#: lib/command.php:483
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
@@ -7709,7 +6304,6 @@ msgstr ""
 
 #. TRANS: Message given if content is too long. %1$sd is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:500
 #, php-format
 msgid "Message too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
@@ -7723,26 +6317,26 @@ msgstr[3] ""
 "Powěsć je předołho - maksimalna dołhosć je %1$d znamješkow, ty sy %2$d "
 "pósłał."
 
+#. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
+msgid "You can't send a message to this user."
+msgstr "Njemóžeš tutomu wužiwarju powěsć pósłać."
+
 #. TRANS: Error text shown sending a direct message fails with an unknown reason.
-#: lib/command.php:528
 msgid "Error sending direct message."
 msgstr "Zmylk při słanju direktneje powěsće,"
 
 #. TRANS: Message given having repeated a notice from another user.
 #. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:565
 #, php-format
 msgid "Notice from %s repeated."
 msgstr "Powěsć wot %s wospjetowana."
 
 #. TRANS: Error text shown when repeating a notice fails with an unknown reason.
-#: lib/command.php:568
 msgid "Error repeating notice."
 msgstr "Zmylk při wospjetowanju zdźělenki"
 
 #. TRANS: Message given if content of a notice for a reply is too long. %1$d is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:603
 #, php-format
 msgid "Notice too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Notice too long - maximum is %1$d characters, you sent %2$d."
@@ -7761,80 +6355,66 @@ msgstr[3] ""
 
 #. TRANS: Text shown having sent a reply to a notice successfully.
 #. TRANS: %s is the nickname of the user of the notice the reply was sent to.
-#: lib/command.php:616
 #, php-format
 msgid "Reply to %s sent."
 msgstr "Wotmołwa na %s pósłana."
 
 #. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
-#: lib/command.php:619
 msgid "Error saving notice."
 msgstr "Zmylk při składowanju powěsće"
 
 #. TRANS: Error text shown when no username was provided when issuing a subscribe command.
-#: lib/command.php:666
 msgid "Specify the name of the user to subscribe to."
 msgstr "Podaj mjeno wužiwarja, kotrehož chceš abonować"
 
 #. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
-#: lib/command.php:675
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "OMB-profile njedadźa so přez přikaz abonować."
 
 #. TRANS: Text shown after having subscribed to another user successfully.
 #. TRANS: %s is the name of the user the subscription was requested for.
-#: lib/command.php:683
 #, php-format
 msgid "Subscribed to %s."
 msgstr "%s abonowany."
 
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.
-#: lib/command.php:704 lib/command.php:815
 msgid "Specify the name of the user to unsubscribe from."
 msgstr "Podaj mjeno wužiwarja, kotrehož chceš wotskazać."
 
 #. TRANS: Text shown after having unsubscribed from another user successfully.
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:715
 #, php-format
 msgid "Unsubscribed from %s."
 msgstr "%s wotskazany."
 
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
-#: lib/command.php:735 lib/command.php:761
 msgid "Command not yet implemented."
 msgstr "Přikaz hišće njeimplementowany."
 
 #. TRANS: Text shown when issuing the command "off" successfully.
-#: lib/command.php:739
 msgid "Notification off."
 msgstr "Zdźělenje znjemóžnjene."
 
 #. TRANS: Error text shown when the command "off" fails for an unknown reason.
-#: lib/command.php:742
 msgid "Can't turn off notification."
 msgstr "Zdźělenje njeda so znjemóžnić."
 
 #. TRANS: Text shown when issuing the command "on" successfully.
-#: lib/command.php:765
 msgid "Notification on."
 msgstr "Zdźělenje zmóžnjene."
 
 #. TRANS: Error text shown when the command "on" fails for an unknown reason.
-#: lib/command.php:768
 msgid "Can't turn on notification."
 msgstr "Zdźělenje njeda so zmóžnić."
 
 #. TRANS: Error text shown when issuing the login command while login is disabled.
-#: lib/command.php:782
 msgid "Login command is disabled."
 msgstr "Přizjewjenski přikaz je znjemóžnjeny."
 
 #. TRANS: Text shown after issuing the login command successfully.
 #. TRANS: %s is a logon link..
-#: lib/command.php:795
 #, php-format
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
@@ -7842,20 +6422,17 @@ msgstr ""
 
 #. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:824
 #, php-format
 msgid "Unsubscribed %s."
 msgstr "%s wotskazany."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
-#: lib/command.php:842
 msgid "You are not subscribed to anyone."
 msgstr "Njejsy nikoho abonował."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
-#: lib/command.php:847
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Sy tutu wosobu abonował:"
@@ -7865,14 +6442,12 @@ msgstr[3] "Sy tute wosoby abonował:"
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user
 #. TRANS: (followers) without having any subscribers.
-#: lib/command.php:869
 msgid "No one is subscribed to you."
 msgstr "Nichtó njeje će abonował."
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
-#: lib/command.php:874
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Tuta wosoba je će abonowała:"
@@ -7882,14 +6457,12 @@ msgstr[3] "Tute wosoby su će abonowali:"
 
 #. TRANS: Text shown after requesting groups a user is subscribed to without having
 #. TRANS: any group subscriptions.
-#: lib/command.php:896
 msgid "You are not a member of any groups."
 msgstr "Njejsy čłon w žanej skupinje."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
-#: lib/command.php:901
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "Sy čłon tuteje skupiny:"
@@ -7898,7 +6471,6 @@ msgstr[2] "Sy čłon tutych skupinow:"
 msgstr[3] "Sy čłon tutych skupinow:"
 
 #. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-#: lib/command.php:916
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -7941,69 +6513,56 @@ msgid ""
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:36
 msgid "No configuration file found."
 msgstr "Žana konfiguraciska dataja namakana."
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:39
 msgid "I looked for configuration files in the following places:"
 msgstr "Sym na slědowacych městnach konfiguraciske dataje pytał:"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:42
 msgid "You may wish to run the installer to fix this."
 msgstr "Móže być, zo chceš instalaciski program startować, zo by to porjedźił."
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:46
 msgid "Go to the installer."
 msgstr "K instalaciji"
 
-#: lib/dberroraction.php:59
 msgid "Database error"
 msgstr "Zmylk w datowej bance"
 
 #. TRANS: Description of form for deleting a user.
-#: lib/deleteuserform.php:75
 msgid "Delete this user"
 msgstr "Tutoho wužiwarja wušmórnyć"
 
-#: lib/designform.php:114
 #, fuzzy
 msgid "Change design"
 msgstr "Design składować"
 
 #. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: lib/designform.php:131
 msgid "Change colours"
 msgstr "Barby změnić"
 
 #. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: lib/designform.php:138
 msgid "Use defaults"
 msgstr "Standardne hódnoty wužiwać"
 
 #. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: lib/designform.php:140
 msgid "Restore default designs"
 msgstr "Standardne designy wobnowić"
 
 #. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: lib/designform.php:148
 msgid "Reset back to default"
 msgstr "Na standard wróćo stajić"
 
 #. TRANS: Label in form on profile design page.
 #. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
-#: lib/designform.php:158
 msgid "Upload file"
 msgstr "Dataju nahrać"
 
 #. TRANS: Instructions for form on profile design page.
-#: lib/designform.php:163
 #, fuzzy
 msgid ""
 "You can upload your personal background image. The maximum file size is 2Mb."
@@ -8012,136 +6571,108 @@ msgstr ""
 "je 2 MB."
 
 #. TRANS: Radio button on profile design page that will enable use of the uploaded profile image.
-#: lib/designform.php:194
 msgctxt "RADIO"
 msgid "On"
 msgstr "Zapinjeny"
 
 #. TRANS: Radio button on profile design page that will disable use of the uploaded profile image.
-#: lib/designform.php:211
 msgctxt "RADIO"
 msgid "Off"
 msgstr "Wupinjeny"
 
 #. TRANS: Title for button on profile design page to save settings.
-#: lib/designform.php:322
 msgid "Save design"
 msgstr "Design składować"
 
 #. TRANS: Error message displayed if design settings could not be saved.
 #. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
-#: lib/designsettings.php:216 lib/designsettings.php:238
 msgid "Couldn't update your design."
 msgstr "Twój design njeda so aktualizować."
 
 #. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
-#: lib/designsettings.php:244
 msgid "Design defaults restored."
 msgstr "Designowe standardne nastajenja wobnowjene."
 
 #. TRANS: Exception. %s is an ID.
-#: lib/discovery.php:153
 #, php-format
 msgid "Unable to find services for %s."
 msgstr "Njemóžno słužby za %s namakać."
 
 #. TRANS: Form legend for removing the favourite status for a favourite notice.
 #. TRANS: Title for button text for removing the favourite status for a favourite notice.
-#: lib/disfavorform.php:108 lib/disfavorform.php:140
 msgid "Disfavor this notice"
 msgstr "Tutu zdźělenku z faworitow wotstronić"
 
 #. TRANS: Button text for removing the favourite status for a favourite notice.
-#: lib/disfavorform.php:136
 msgctxt "BUTTON"
 msgid "Disfavor favorite"
 msgstr "Z faworitow wotstronić"
 
 #. TRANS: Form legend for adding the favourite status to a notice.
 #. TRANS: Title for button text for adding the favourite status to a notice.
-#: lib/favorform.php:108 lib/favorform.php:139
 msgid "Favor this notice"
 msgstr "Tutu zdźělenku faworitam přidać"
 
 #. TRANS: Button text for adding the favourite status to a notice.
-#: lib/favorform.php:135
 msgctxt "BUTTON"
 msgid "Favor"
 msgstr "Faworit"
 
-#: lib/feed.php:84
 msgid "RSS 1.0"
 msgstr "RSS 1.0"
 
-#: lib/feed.php:86
 msgid "RSS 2.0"
 msgstr "RSS 2.0"
 
-#: lib/feed.php:88
 msgid "Atom"
 msgstr "Atom"
 
-#: lib/feed.php:90
 msgid "FOAF"
 msgstr "FOAF"
 
-#: lib/feedimporter.php:75
 msgid "Not an atom feed."
 msgstr "To Atomowy kanal njeje."
 
-#: lib/feedimporter.php:82
 msgid "No author in the feed."
 msgstr "Žadyn awtor w kanalu njeje."
 
-#: lib/feedimporter.php:89
 msgid "Can't import without a user."
 msgstr "Import bjez wužiwarja njemóžno."
 
 #. TRANS: Header for feed links (h2).
-#: lib/feedlist.php:66
 msgid "Feeds"
 msgstr "Kanale"
 
-#: lib/galleryaction.php:128
 msgid "All"
 msgstr "Wšě"
 
-#: lib/galleryaction.php:136
 msgid "Select tag to filter"
 msgstr ""
 
-#: lib/galleryaction.php:137
 msgid "Tag"
 msgstr ""
 
-#: lib/galleryaction.php:138
 msgid "Choose a tag to narrow list"
 msgstr ""
 
-#: lib/galleryaction.php:140
 msgid "Go"
 msgstr "Start"
 
-#: lib/grantroleform.php:91
 #, php-format
 msgid "Grant this user the \"%s\" role"
 msgstr "Tutomu wužiwarjej rólu \"%s\" dać"
 
-#: lib/groupeditform.php:147
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr ""
 "1-64 małopisanych pismikow abo ličbow, žane interpunkciske znamješka abo "
 "mjezery."
 
-#: lib/groupeditform.php:156
 msgid "URL of the homepage or blog of the group or topic."
 msgstr "URL startoweje strony abo bloga skupiny abo temy."
 
-#: lib/groupeditform.php:161
 msgid "Describe the group or topic"
 msgstr "Skupinu abo temu wopisać"
 
-#: lib/groupeditform.php:163
 #, php-format
 msgid "Describe the group or topic in %d character or less"
 msgid_plural "Describe the group or topic in %d characters or less"
@@ -8150,14 +6681,12 @@ msgstr[1] "Skupinu abo temu w %d znamješkomaj wopisać"
 msgstr[2] "Skupinu abo temu w %d znamješkach wopisać"
 msgstr[3] "Skupinu abo temu w %d znamješkach wopisać"
 
-#: lib/groupeditform.php:175
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\"."
 msgstr ""
 "Městno za skupinu, jeli eksistuje, na př. \"město, zwjazkowy kraj (abo "
 "region), kraj\"."
 
-#: lib/groupeditform.php:183
 #, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -8171,70 +6700,60 @@ msgstr[2] ""
 msgstr[3] ""
 
 #. TRANS: Menu item in the group navigation page.
-#: lib/groupnav.php:86
 msgctxt "MENU"
 msgid "Group"
 msgstr "Skupina"
 
 #. TRANS: Tooltip for menu item in the group navigation page.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:89
 #, php-format
 msgctxt "TOOLTIP"
 msgid "%s group"
 msgstr "Skupina %s"
 
 #. TRANS: Menu item in the group navigation page.
-#: lib/groupnav.php:95
 msgctxt "MENU"
 msgid "Members"
 msgstr "Čłonojo"
 
 #. TRANS: Tooltip for menu item in the group navigation page.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:98
 #, php-format
 msgctxt "TOOLTIP"
 msgid "%s group members"
 msgstr "Čłonojo skupiny %s"
 
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/groupnav.php:108
 msgctxt "MENU"
 msgid "Blocked"
 msgstr "Zablokowany"
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:111
 #, php-format
 msgctxt "TOOLTIP"
 msgid "%s blocked users"
 msgstr "Zablokowani wužiwarjo skupiny %s"
 
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "Administrator"
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:120
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Edit %s group properties"
 msgstr "Kajkosće skupiny %s wobdźěłać"
 
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/groupnav.php:126
 msgctxt "MENU"
 msgid "Logo"
 msgstr "Logo"
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:129
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Add or edit %s logo"
@@ -8242,71 +6761,59 @@ msgstr "Logo skupiny %s přidać abo wobdźěłać"
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:138
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Add or edit %s design"
 msgstr "Design skupiny %s přidać abo wobdźěłać"
 
 #. TRANS: Title for groups with the most members section.
-#: lib/groupsbymemberssection.php:71
 msgid "Groups with most members"
 msgstr "Skupiny z najwjace čłonami"
 
 #. TRANS: Title for groups with the most posts section.
-#: lib/groupsbypostssection.php:71
 msgid "Groups with most posts"
 msgstr "Skupiny z njawjace powěsćemi"
 
 #. TRANS: Title for group tag cloud section.
 #. TRANS: %s is a group name.
-#: lib/grouptagcloudsection.php:57
 #, php-format
 msgid "Tags in %s group's notices"
 msgstr "Taflički w zdźělenkach skupiny %s"
 
 #. TRANS: Client exception 406
-#: lib/htmloutputter.php:104
 msgid "This page is not available in a media type you accept"
 msgstr ""
 "Tuta strona we wot  tebje akceptowanym medijowym typje k dispoziciji "
 "njesteji."
 
 #. TRANS: Exception thrown when trying to upload an unsupported image file format.
-#: lib/imagefile.php:73
 msgid "Unsupported image file format."
 msgstr "Njepodpěrowany wobrazowy format."
 
 #. TRANS: Exception thrown when too large a file is uploaded.
 #. TRANS: %s is the maximum file size, for example "500b", "10kB" or "2MB".
-#: lib/imagefile.php:91
 #, php-format
 msgid "That file is too big. The maximum file size is %s."
 msgstr "Tuta dataja je přewulka. Maksimalna datajowa wulkosć je %s."
 
 #. TRANS: Exception thrown when uploading an image and that action could not be completed.
-#: lib/imagefile.php:97
 msgid "Partial upload."
 msgstr "Dźělne nahraće."
 
 #. TRANS: Exception thrown when uploading a file as image that is not an image or is a corrupt file.
-#: lib/imagefile.php:115
 msgid "Not an image or corrupt file."
 msgstr "Žady wobraz abo žana wobškodźena dataja."
 
 #. TRANS: Exception thrown during resize when image has been registered as present, but is no longer there.
-#: lib/imagefile.php:178
 msgid "Lost our file."
 msgstr "Naša dataja je so zhubiła."
 
 #. TRANS: Exception thrown when trying to resize an unknown file type.
 #. TRANS: Exception thrown when trying resize an unknown file type.
-#: lib/imagefile.php:216 lib/imagefile.php:257
 msgid "Unknown file type"
 msgstr "Njeznaty datajowy typ"
 
 #. TRANS: Number of megabytes. %d is the number.
-#: lib/imagefile.php:303
 #, php-format
 msgid "%dMB"
 msgid_plural "%dMB"
@@ -8316,7 +6823,6 @@ msgstr[2] "%d MB"
 msgstr[3] "%d MB"
 
 #. TRANS: Number of kilobytes. %d is the number.
-#: lib/imagefile.php:307
 #, php-format
 msgid "%dkB"
 msgid_plural "%dkB"
@@ -8326,7 +6832,6 @@ msgstr[2] "%d KB"
 msgstr[3] "%d KB"
 
 #. TRANS: Number of bytes. %d is the number.
-#: lib/imagefile.php:310
 #, php-format
 msgid "%dB"
 msgid_plural "%dB"
@@ -8335,7 +6840,6 @@ msgstr[1] "%d B"
 msgstr[2] "%d B"
 msgstr[3] "%d B"
 
-#: lib/implugin.php:262
 #, php-format
 msgid ""
 "User \"%s\" on %s has said that your %s screenname belongs to them. If "
@@ -8345,52 +6849,44 @@ msgid ""
 "message."
 msgstr ""
 
-#: lib/implugin.php:349
 #, php-format
 msgid "Unknown inbox source %d."
 msgstr "Njeznate žórło postoweho kašćika %d."
 
-#: lib/implugin.php:485
-#, fuzzy, php-format
+#, php-format
 msgid "Message too long - maximum is %1$d characters, you sent %2$d."
 msgstr ""
-"Powěsć je předołho - maksimalna dołhosć je %1$d znamješko, ty sy %2$d pósłał."
+"Powěsć je předołho - maksimalna wulkosć je %1$d znamješkow, ty sy %2$d "
+"pósłał."
 
-#: lib/leaveform.php:114
 msgid "Leave"
 msgstr "Wopušćić"
 
 #. TRANS: Menu item for logging in to the StatusNet site.
-#: lib/logingroupnav.php:77
 msgctxt "MENU"
 msgid "Login"
 msgstr "Přizjewjenje"
 
 #. TRANS: Title for menu item for logging in to the StatusNet site.
-#: lib/logingroupnav.php:79
 msgid "Login with a username and password"
 msgstr "Přizjewjenje z wužiwarskim mjenom a hesłom"
 
 #. TRANS: Menu item for registering with the StatusNet site.
-#: lib/logingroupnav.php:85
 msgctxt "MENU"
 msgid "Register"
 msgstr "Registrować"
 
 #. TRANS: Title for menu item for registering with the StatusNet site.
-#: lib/logingroupnav.php:87
 msgid "Sign up for a new account"
 msgstr "Nowe konto registrować"
 
 #. TRANS: Subject for address confirmation email.
-#: lib/mail.php:172
 msgid "Email address confirmation"
 msgstr "Wobkrućenje e-mejloweje adresy"
 
 #. TRANS: Body for address confirmation email.
 #. TRANS: %1$s is the addressed user's nickname, %2$s is the StatusNet sitename,
 #. TRANS: %3$s is the URL to confirm at.
-#: lib/mail.php:177
 #, php-format
 msgid ""
 "Hey, %1$s.\n"
@@ -8409,14 +6905,12 @@ msgstr ""
 
 #. TRANS: Subject of new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
-#: lib/mail.php:243
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1$s slěduje twoje zdźělenki na %2$s."
 
 #. TRANS: This is a paragraph in a new-subscriber e-mail.
 #. TRANS: %s is a URL where the subscriber can be reported as abusive.
-#: lib/mail.php:250
 #, php-format
 msgid ""
 "If you believe this account is being used abusively, you can block them from "
@@ -8428,7 +6922,6 @@ msgstr ""
 #. TRANS: %3$s is the subscriber's profile URL, %4$s is the subscriber's location (or empty)
 #. TRANS: %5$s is the subscriber's homepage URL (or empty), %6%s is the subscriber's bio (or empty)
 #. TRANS: %7$s is a link to the addressed user's e-mail settings.
-#: lib/mail.php:260
 #, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -8445,14 +6938,12 @@ msgstr ""
 
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is biographical information.
-#: lib/mail.php:283
 #, php-format
 msgid "Bio: %s"
 msgstr "Biografija: %s"
 
 #. TRANS: Subject of notification mail for new posting email address.
 #. TRANS: %s is the StatusNet sitename.
-#: lib/mail.php:312
 #, php-format
 msgid "New email address for posting to %s"
 msgstr "Nowa e-mejlowa adresa za słanje do %s"
@@ -8460,7 +6951,6 @@ msgstr "Nowa e-mejlowa adresa za słanje do %s"
 #. TRANS: Body of notification mail for new posting email address.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is the e-mail address to send
 #. TRANS: to to post by e-mail, %3$s is a URL to more instructions.
-#: lib/mail.php:318
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -8475,26 +6965,22 @@ msgstr ""
 
 #. TRANS: Subject line for SMS-by-email notification messages.
 #. TRANS: %s is the posting user's nickname.
-#: lib/mail.php:439
 #, php-format
 msgid "%s status"
 msgstr "Status wužiwarja %s"
 
 #. TRANS: Subject line for SMS-by-email address confirmation message.
-#: lib/mail.php:465
 msgid "SMS confirmation"
 msgstr "SMS-wobkrućenje"
 
 #. TRANS: Main body heading for SMS-by-email address confirmation message.
 #. TRANS: %s is the addressed user's nickname.
-#: lib/mail.php:469
 #, php-format
 msgid "%s: confirm you own this phone number with this code:"
 msgstr "%s: wobkruć, zo tute telefonowe čisło ze slědowacym kodom tebi słuša:"
 
 #. TRANS: Subject for 'nudge' notification email.
 #. TRANS: %s is the nudging user.
-#: lib/mail.php:490
 #, php-format
 msgid "You have been nudged by %s"
 msgstr "%s je će storčił"
@@ -8502,7 +6988,6 @@ msgstr "%s je će storčił"
 #. TRANS: Body for 'nudge' notification email.
 #. TRANS: %1$s is the nuding user's long name, $2$s is the nudging user's nickname,
 #. TRANS: %3$s is a URL to post notices at, %4$s is the StatusNet sitename.
-#: lib/mail.php:497
 #, php-format
 msgid ""
 "%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -8520,7 +7005,6 @@ msgstr ""
 
 #. TRANS: Subject for direct-message notification email.
 #. TRANS: %s is the sending user's nickname.
-#: lib/mail.php:544
 #, php-format
 msgid "New private message from %s"
 msgstr "Nowa priwatna powěsć wot %s"
@@ -8529,7 +7013,6 @@ msgstr "Nowa priwatna powěsć wot %s"
 #. TRANS: %1$s is the sending user's long name, %2$s is the sending user's nickname,
 #. TRANS: %3$s is the message content, %4$s a URL to the message,
 #. TRANS: %5$s is the StatusNet sitename.
-#: lib/mail.php:552
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -8550,7 +7033,6 @@ msgstr ""
 
 #. TRANS: Subject for favorite notification e-mail.
 #. TRANS: %1$s is the adding user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:604
 #, php-format
 msgid "%1$s (@%2$s) added your notice as a favorite"
 msgstr "%1$s (@%2$s) je twoju zdźělenku jako faworit přidał"
@@ -8560,7 +7042,6 @@ msgstr "%1$s (@%2$s) je twoju zdźělenku jako faworit přidał"
 #. TRANS: %3$s is a URL to the faved notice, %4$s is the faved notice text,
 #. TRANS: %5$s is a URL to all faves of the adding user, %6$s is the StatusNet sitename,
 #. TRANS: %7$s is the adding user's nickname.
-#: lib/mail.php:611
 #, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -8582,7 +7063,6 @@ msgid ""
 msgstr ""
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:669
 #, php-format
 msgid ""
 "The full conversation can be read here:\n"
@@ -8595,7 +7075,6 @@ msgstr ""
 
 #. TRANS: E-mail subject for notice notification.
 #. TRANS: %1$s is the sending user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:677
 #, php-format
 msgid "%1$s (@%2$s) sent a notice to your attention"
 msgstr "%1$s (@%2$s) je zdźělenku k twojej kedźbnosći pósłał"
@@ -8606,7 +7085,6 @@ msgstr "%1$s (@%2$s) je zdźělenku k twojej kedźbnosći pósłał"
 #. TRANS: %5$s is a URL to the full conversion if it exists (otherwise empty),
 #. TRANS: %6$s is a URL to reply to the notice, %7$s is a URL to all @-replied for the addressed user,
 #. TRANS: %8$s is a URL to the addressed user's e-mail settings, %9$s is the sender's nickname.
-#: lib/mail.php:685
 #, php-format
 msgid ""
 "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -8633,11 +7111,9 @@ msgid ""
 "P.S. You can turn off these email notifications here: %8$s\n"
 msgstr ""
 
-#: lib/mailbox.php:87
 msgid "Only the user can read their own mailboxes."
 msgstr "Jenož wužiwar móže swoje póstowe kašćiki čitać."
 
-#: lib/mailbox.php:125
 msgid ""
 "You have no private messages. You can send private message to engage other "
 "users in conversation. People can send you messages for your eyes only."
@@ -8646,55 +7122,45 @@ msgstr ""
 "wužiwarjow do konwersacije zaplesć. Ludźo móža ći powěsće pósłać, kotrež "
 "jenož ty móžeš widźeć."
 
-#: lib/mailhandler.php:37
 msgid "Could not parse message."
 msgstr "Powěsć njeda so analyzować."
 
-#: lib/mailhandler.php:42
 msgid "Not a registered user."
 msgstr "Žadyn zregistrowany wužiwar."
 
-#: lib/mailhandler.php:46
 msgid "Sorry, that is not your incoming email address."
 msgstr "Wodaj, to twoja adresa za dochadźace e-mejle njeje."
 
-#: lib/mailhandler.php:50
 msgid "Sorry, no incoming email allowed."
 msgstr "Wodaj, dochadźaće e-mejle njejsu dowolene."
 
-#: lib/mailhandler.php:229
 #, php-format
 msgid "Unsupported message type: %s"
 msgstr "Njepodpěrany powěsćowy typ: %s"
 
 #. TRANS: Client exception thrown when a database error was thrown during a file upload operation.
-#: lib/mediafile.php:102 lib/mediafile.php:174
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
 "Při składowanju twojeje dataje je zmylk w datowej bance wustupił. Prošu "
 "spytaj hišće raz."
 
 #. TRANS: Client exception thrown when a file upload operation would cause a user to exceed a set quota.
-#: lib/mediafile.php:238 lib/mediafile.php:281
 msgid "File exceeds user's quota."
 msgstr "Dataja překročuje wužiwarski limit."
 
 #. TRANS: Client exception thrown when a file upload operation fails because the file could
 #. TRANS: not be moved from the temporary folder to the permanent file location.
-#: lib/mediafile.php:258 lib/mediafile.php:300
 msgid "File could not be moved to destination directory."
 msgstr "Dataja njeda so do ciloweho zapisa přesunyć."
 
 #. TRANS: Client exception thrown when a file upload operation has been stopped because the MIME
 #. TRANS: type of the uploaded file could not be determined.
-#: lib/mediafile.php:265 lib/mediafile.php:306
 msgid "Could not determine file's MIME type."
 msgstr "MIME-typ dataje njeda so zwěsćić."
 
 #. TRANS: Client exception thrown trying to upload a forbidden MIME type.
 #. TRANS: %1$s is the file type that was denied, %2$s is the application part of
 #. TRANS: the MIME type that was denied.
-#: lib/mediafile.php:396
 #, php-format
 msgid ""
 "\"%1$s\" is not a supported file type on this server. Try using another %2$s "
@@ -8705,49 +7171,39 @@ msgstr ""
 
 #. TRANS: Client exception thrown trying to upload a forbidden MIME type.
 #. TRANS: %s is the file type that was denied.
-#: lib/mediafile.php:401
 #, php-format
 msgid "\"%s\" is not a supported file type on this server."
 msgstr "\"%s\" njeje podpěrany datajowy typ na tutym serwerje."
 
-#: lib/messageform.php:120
 msgid "Send a direct notice"
 msgstr "Direktnu zdźělenku pósłać"
 
 #. TRANS Label entry in drop-down selection box in direct-message inbox/outbox. This is the default entry in the drop-down box, doubling as instructions and a brake against accidental submissions with the first user in the list.
-#: lib/messageform.php:137
 msgid "Select recipient:"
 msgstr "Přijimowarja wubrać:"
 
 #. TRANS Entry in drop-down selection box in direct-message inbox/outbox when no one is available to message.
-#: lib/messageform.php:150
 msgid "No mutual subscribers."
 msgstr "Žani wzajomni abonenća."
 
-#: lib/messageform.php:153
 msgid "To"
 msgstr "Komu"
 
-#: lib/messageform.php:184 lib/noticeform.php:236
 msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr "Pósłać"
 
-#: lib/messagelist.php:77
 msgid "Messages"
 msgstr "Powěsće"
 
-#: lib/messagelistitem.php:123 lib/noticelist.php:527
 msgid "from"
 msgstr "wot"
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:178
 msgid "Nickname cannot be empty."
 msgstr "Přimjeno njemóže prózdne być."
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:191
 #, php-format
 msgid "Nickname cannot be more than %d character long."
 msgid_plural "Nickname cannot be more than %d characters long."
@@ -8756,448 +7212,348 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: lib/noticeform.php:160
+#. TRANS: Form legend for notice form.
 msgid "Send a notice"
 msgstr "Zdźělenku pósłać"
 
-#: lib/noticeform.php:174
+#. TRANS: Title for notice label. %s is the user's nickname.
 #, php-format
 msgid "What's up, %s?"
 msgstr "Što je, %s?"
 
-#: lib/noticeform.php:193
+#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr "Připowěsnyć"
 
-#: lib/noticeform.php:197
-msgid "Attach a file"
+#. TRANS: Title for input field to attach a file to a notice.
+#, fuzzy
+msgid "Attach a file."
 msgstr "Dataju připowěsnyć"
 
-#: lib/noticeform.php:212
+#. TRANS: Field label to add location to a notice.
 msgid "Share my location"
 msgstr "Městno dźělić"
 
-#: lib/noticeform.php:215
+#. TRANS: Text to not share location for a notice in notice form.
 msgid "Do not share my location"
 msgstr "Njedźěl moje městno"
 
-#: lib/noticeform.php:216
+#. TRANS: Timeout error text for location retrieval in notice form.
 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
 "try again later"
 msgstr ""
 
 #. TRANS: Used in coordinates as abbreviation of north
-#: lib/noticelist.php:457
 msgid "N"
 msgstr "S"
 
 #. TRANS: Used in coordinates as abbreviation of south
-#: lib/noticelist.php:459
 msgid "S"
 msgstr "J"
 
 #. TRANS: Used in coordinates as abbreviation of east
-#: lib/noticelist.php:461
 msgid "E"
 msgstr "W"
 
 #. TRANS: Used in coordinates as abbreviation of west
-#: lib/noticelist.php:463
 msgid "W"
 msgstr "Z"
 
-#: lib/noticelist.php:465
 #, php-format
 msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 
-#: lib/noticelist.php:474
 msgid "at"
 msgstr "w"
 
-#: lib/noticelist.php:523
 msgid "web"
 msgstr "Web"
 
-#: lib/noticelist.php:589
 msgid "in context"
 msgstr "w konteksće"
 
-#: lib/noticelist.php:624
 msgid "Repeated by"
 msgstr "Wospjetowany wot"
 
-#: lib/noticelist.php:651
 msgid "Reply to this notice"
 msgstr "Na tutu zdźělenku wotmołwić"
 
-#: lib/noticelist.php:652
 msgid "Reply"
 msgstr "Wotmołwić"
 
-#: lib/noticelist.php:678
 msgid "Delete this notice"
 msgstr "Tutu zdźělenku wušmórnyć"
 
-#: lib/noticelist.php:696
 msgid "Notice repeated"
 msgstr "Zdźělenka wospjetowana"
 
-#: lib/nudgeform.php:116
 msgid "Nudge this user"
 msgstr "Tutoho wužiwarja storčić"
 
-#: lib/nudgeform.php:128
 msgid "Nudge"
 msgstr "Stork"
 
-#: lib/nudgeform.php:128
 msgid "Send a nudge to this user"
 msgstr "Tutomu wužiwarjej stork pósłać"
 
-#: lib/oauthstore.php:294
 msgid "Error inserting new profile."
 msgstr "Zmylk při zasunjenju noweho profila."
 
-#: lib/oauthstore.php:302
 msgid "Error inserting avatar."
 msgstr "Zmylk při zasunjenju awatara."
 
-#: lib/oauthstore.php:322
 msgid "Error inserting remote profile."
 msgstr "Zmylk při zasunjenju zdaleneho profila."
 
 #. TRANS: Exception thrown when a notice is denied because it has been sent before.
-#: lib/oauthstore.php:362
 msgid "Duplicate notice."
 msgstr "Dwójna zdźělenka."
 
-#: lib/oauthstore.php:507
 msgid "Couldn't insert new subscription."
 msgstr "Nowy abonement njeda so zasunyć."
 
-#: lib/personalgroupnav.php:104
-#, fuzzy
 msgid "Replies"
 msgstr "Wotmołwy"
 
-#: lib/personalgroupnav.php:109
-#, fuzzy
 msgid "Favorites"
 msgstr "Fawority"
 
-#: lib/personalgroupnav.php:120
-#, fuzzy
 msgid "Inbox"
 msgstr "Dochadny póst"
 
-#: lib/personalgroupnav.php:121
 msgid "Your incoming messages"
 msgstr "Twoje dochadźace powěsće"
 
-#: lib/personalgroupnav.php:125
-#, fuzzy
 msgid "Outbox"
 msgstr "Wuchadny póst"
 
-#: lib/personalgroupnav.php:126
 msgid "Your sent messages"
 msgstr "Twoje pósłane powěsće"
 
 #. TRANS: Title for personal tag cloud section. %s is a user nickname.
-#: lib/personaltagcloudsection.php:56
 #, php-format
 msgid "Tags in %s's notices"
 msgstr "Taflički w zdźělenkach wot %s"
 
 #. TRANS: Displayed as version information for a plugin if no version information was found.
-#: lib/plugin.php:126
 msgid "Unknown"
 msgstr "Njeznaty"
 
 #. TRANS: Plugin admin panel controls
-#: lib/plugindisableform.php:90
 msgctxt "plugin"
 msgid "Disable"
 msgstr ""
 
 #. TRANS: Plugin admin panel controls
-#: lib/pluginenableform.php:112
 msgctxt "plugin"
 msgid "Enable"
 msgstr ""
 
-#: lib/pluginlist.php:196
 msgctxt "plugin-description"
 msgid "(Plugin descriptions unavailable when disabled.)"
 msgstr ""
 
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:88
 msgid "Subscriptions"
 msgstr "Abonementy"
 
 #. TRANS: Text for user subscription statistics if user has more subscriptions than displayed.
-#: lib/profileaction.php:144
 msgid "All subscriptions"
 msgstr "Wšě abonementy"
 
 #. TRANS: H2 text for user subscriber statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:96
 msgid "Subscribers"
 msgstr "Abonenća"
 
 #. TRANS: Text for user subscription statistics if user has more subscribers than displayed.
-#: lib/profileaction.php:181
 msgid "All subscribers"
 msgstr "Wšitcy abonenća"
 
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:213
 msgid "User ID"
 msgstr "Wužiwarski ID"
 
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:219
 msgid "Member since"
 msgstr "Čłon wot"
 
 #. TRANS: Label for user statistics.
 #. TRANS: H2 text for user group membership statistics.
-#: lib/profileaction.php:239 lib/profileaction.php:290
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:104
 msgid "Groups"
 msgstr "Skupiny"
 
 #. TRANS: Label for user statistics.
 #. TRANS: Average count of posts made per day since account registration.
-#: lib/profileaction.php:253
 msgid "Daily average"
 msgstr "Dnjowy přerězk"
 
 #. TRANS: Text for user group membership statistics if user has more subscriptions than displayed.
-#: lib/profileaction.php:305
 msgid "All groups"
 msgstr "Wšě skupiny"
 
 #. TRANS: Server error displayed when using an unimplemented method.
-#: lib/profileformaction.php:123
 msgid "Unimplemented method."
 msgstr "Njeimplementowana metoda."
 
-#: lib/publicgroupnav.php:82
 msgid "User groups"
 msgstr "Wužiwarske skupiny"
 
-#: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
 msgid "Recent tags"
 msgstr ""
 
-#: lib/publicgroupnav.php:88
 msgid "Featured"
 msgstr "Wuběrne"
 
-#: lib/publicgroupnav.php:92
 msgid "Popular"
 msgstr "Woblubowany"
 
-#: lib/redirectingaction.php:95
 msgid "No return-to arguments."
 msgstr "Žane wróćenske argumenty."
 
-#: lib/repeatform.php:107
 msgid "Repeat this notice?"
 msgstr "Tutu zdźělenku wospjetować?"
 
-#: lib/repeatform.php:132
 msgid "Yes"
 msgstr "Haj"
 
-#: lib/repeatform.php:132
 msgid "Repeat this notice"
 msgstr "Tutu zdźělenku wospjetować"
 
-#: lib/revokeroleform.php:91
 #, php-format
 msgid "Revoke the \"%s\" role from this user"
 msgstr "Rólu \"%s\" tutoho wužiwarja wotwołać"
 
 #. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:1001
 msgid "Page not found."
 msgstr "Strona njenamakana."
 
-#: lib/sandboxform.php:67
 msgid "Sandbox"
 msgstr "Pěskowy kašćik"
 
-#: lib/sandboxform.php:78
 msgid "Sandbox this user"
 msgstr "Tutoho wužiwarja do pěskoweho kašćika pósłać"
 
 #. TRANS: Fieldset legend for the search form.
-#: lib/searchaction.php:120
 msgid "Search site"
 msgstr "Pytanske sydło"
 
 #. TRANS: Used as a field label for the field where one or more keywords
 #. TRANS: for searching can be entered.
-#: lib/searchaction.php:128
 msgid "Keyword(s)"
 msgstr "Klučowe hesła"
 
 #. TRANS: Button text for searching site.
-#: lib/searchaction.php:130
 msgctxt "BUTTON"
 msgid "Search"
 msgstr "Pytać"
 
-#: lib/searchgroupnav.php:80
 msgid "People"
 msgstr "Ludźo"
 
-#: lib/searchgroupnav.php:81
 msgid "Find people on this site"
 msgstr "Ludźi na tutym sydle pytać"
 
-#: lib/searchgroupnav.php:83
 msgid "Find content of notices"
 msgstr "Wobsah zdźělenkow přepytać"
 
-#: lib/searchgroupnav.php:85
 msgid "Find groups on this site"
 msgstr "Skupiny na tutym sydle pytać"
 
-#: lib/section.php:89
 msgid "Untitled section"
 msgstr "Wotrězk bjez titula"
 
-#: lib/section.php:106
 msgid "More..."
 msgstr "Wjace..."
 
-#: lib/settingsnav.php:78
 msgid "Change your profile settings"
 msgstr "Twoje profilowe nastajenja změnić"
 
-#: lib/settingsnav.php:83
 msgid "Upload an avatar"
 msgstr "Awatar nahrać"
 
-#: lib/settingsnav.php:88
 msgid "Change your password"
 msgstr "Twoje hesło změnić"
 
-#: lib/settingsnav.php:93
 msgid "Change email handling"
 msgstr ""
 
-#: lib/settingsnav.php:98
 msgid "Design your profile"
 msgstr "Twój profil wuhotować"
 
-#: lib/settingsnav.php:102
 msgid "URL"
 msgstr "URL"
 
-#: lib/settingsnav.php:103
 msgid "URL shorteners"
 msgstr ""
 
-#: lib/settingsnav.php:111
 msgid "Updates by instant messenger (IM)"
 msgstr "Aktualizacije přez Instant Messenger (IM)"
 
-#: lib/settingsnav.php:118
 msgid "Updates by SMS"
 msgstr "Aktualizacije přez SMS"
 
-#: lib/settingsnav.php:123
-#, fuzzy
 msgid "Connections"
 msgstr "Zwiski"
 
-#: lib/settingsnav.php:124
 msgid "Authorized connected applications"
 msgstr "Awtorizowane zwjazane aplikacije"
 
-#: lib/silenceform.php:67
 msgid "Silence"
 msgstr "Hubu zatykać"
 
-#: lib/silenceform.php:78
 msgid "Silence this user"
 msgstr "Tutomu wužiwarjej hubu zatykać"
 
-#: lib/subgroupnav.php:89
 #, php-format
 msgid "People %s subscribes to"
 msgstr "Ludźo, kotrychž %s abonuje"
 
-#: lib/subgroupnav.php:97
 #, php-format
 msgid "People subscribed to %s"
 msgstr "Ludźo, kotřiž su %s abonowali"
 
-#: lib/subgroupnav.php:105
 #, php-format
 msgid "Groups %s is a member of"
 msgstr "Skupiny, w kotrychž %s je čłon"
 
-#: lib/subgroupnav.php:111
 msgid "Invite"
 msgstr "Přeprosyć"
 
-#: lib/subgroupnav.php:112
 #, php-format
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Přećelow a kolegow přeprosyć, so tebi na %s  přidružić"
 
-#: lib/subscribeform.php:115 lib/subscribeform.php:139
 msgid "Subscribe to this user"
 msgstr "Tutoho wužiwarja abonować"
 
-#: lib/subscriberspeopleselftagcloudsection.php:48
-#: lib/subscriptionspeopleselftagcloudsection.php:48
 msgid "People Tagcloud as self-tagged"
 msgstr ""
 
-#: lib/subscriberspeopletagcloudsection.php:48
-#: lib/subscriptionspeopletagcloudsection.php:48
 msgid "People Tagcloud as tagged"
 msgstr ""
 
-#: lib/tagcloudsection.php:56
 msgid "None"
 msgstr "Žadyn"
 
 #. TRANS: Server exception displayed if a theme name was invalid.
-#: lib/theme.php:74
 msgid "Invalid theme name."
 msgstr "Njepłaćiwe šatowe mjeno."
 
-#: lib/themeuploader.php:50
 msgid "This server cannot handle theme uploads without ZIP support."
 msgstr ""
 
-#: lib/themeuploader.php:58 lib/themeuploader.php:61
 msgid "The theme file is missing or the upload failed."
 msgstr "Šatowa dataja faluje abo nahraće je so njeporadźiło."
 
-#: lib/themeuploader.php:91 lib/themeuploader.php:102
-#: lib/themeuploader.php:279 lib/themeuploader.php:283
-#: lib/themeuploader.php:291 lib/themeuploader.php:298
 msgid "Failed saving theme."
 msgstr "Składowanje šata je so njeporadźiło."
 
-#: lib/themeuploader.php:147
 msgid "Invalid theme: bad directory structure."
 msgstr "Njepłaćiwy šat: špatna rjadowakowa struktura."
 
-#: lib/themeuploader.php:166
 #, php-format
 msgid "Uploaded theme is too large; must be less than %d byte uncompressed."
 msgid_plural ""
@@ -9207,152 +7563,122 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: lib/themeuploader.php:179
 msgid "Invalid theme archive: missing file css/display.css"
 msgstr "Njepłaćiwy šatowy archiw: falowaca css-dataja/display.css"
 
-#: lib/themeuploader.php:219
 msgid ""
 "Theme contains invalid file or folder name. Stick with ASCII letters, "
 "digits, underscore, and minus sign."
 msgstr ""
 
-#: lib/themeuploader.php:225
 msgid "Theme contains unsafe file extension names; may be unsafe."
 msgstr "Šat wobsahuje njewěste datajowe sufiksy; to móhło njewěste być."
 
-#: lib/themeuploader.php:242
 #, php-format
 msgid "Theme contains file of type '.%s', which is not allowed."
 msgstr "Šat wobsahuje dataju typa '.%s', kotryž njeje dowoleny."
 
-#: lib/themeuploader.php:260
 msgid "Error opening theme archive."
 msgstr "Zmylk při wočinjenju šatoweho archiwa."
 
-#: lib/threadednoticelist.php:270
-#, php-format
-msgid "Show all %d comment"
-msgid_plural "Show all %d comments"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+#, fuzzy, php-format
+msgid "Show %d reply"
+msgid_plural "Show all %d replies"
+msgstr[0] "Wjace pokazać"
+msgstr[1] "Wjace pokazać"
+msgstr[2] "Wjace pokazać"
+msgstr[3] "Wjace pokazać"
 
-#: lib/topposterssection.php:74
 msgid "Top posters"
 msgstr ""
 
 #. TRANS: Title for the form to unblock a user.
-#: lib/unblockform.php:67
 msgctxt "TITLE"
 msgid "Unblock"
 msgstr "Wotblokować"
 
-#: lib/unsandboxform.php:69
 msgid "Unsandbox"
 msgstr ""
 
-#: lib/unsandboxform.php:80
 msgid "Unsandbox this user"
 msgstr "Tutoho wužiwarja z pěskoweho kašćika pušćić"
 
-#: lib/unsilenceform.php:67
 msgid "Unsilence"
 msgstr ""
 
-#: lib/unsilenceform.php:78
 msgid "Unsilence this user"
 msgstr "Tutoho wužiwarja wotprancować"
 
-#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
 msgid "Unsubscribe from this user"
 msgstr "Tutoho wužiwarja wotskazać"
 
-#: lib/unsubscribeform.php:137
 msgid "Unsubscribe"
 msgstr "Wotskazać"
 
 #. 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).
-#: lib/usernoprofileexception.php:60
 #, php-format
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "Wužiwar %1$s (%2$d) nima profilowu datowu sadźbu."
 
-#: lib/userprofile.php:116
 msgid "Edit Avatar"
 msgstr "Awatar wobdźěłać"
 
 #. TRANS: H2 for user actions in a profile.
 #. TRANS: H2 for entity actions in a profile.
-#: lib/userprofile.php:216 lib/userprofile.php:232
 msgid "User actions"
 msgstr "Wužiwarske akcije"
 
 #. TRANS: Text shown in user profile of not yet compeltely deleted users.
-#: lib/userprofile.php:220
 msgid "User deletion in progress..."
 msgstr "Wužiwar so haša..."
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:248
 msgid "Edit profile settings"
 msgstr "Profilowe nastajenja wobdźěłać"
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:250
 msgid "Edit"
 msgstr "Wobdźěłać"
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:274
 msgid "Send a direct message to this user"
 msgstr "Tutomu wužiwarja direktnu powěsć pósłać"
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:276
 msgid "Message"
 msgstr "Powěsć"
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:318
 msgid "Moderate"
 msgstr "Moderěrować"
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:357
 msgid "User role"
 msgstr "Wužiwarska róla"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:360
 msgctxt "role"
 msgid "Administrator"
 msgstr "Administrator"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:362
 msgctxt "role"
 msgid "Moderator"
 msgstr "Moderator"
 
-#: lib/util.php:321
 msgid "Not allowed to log in."
 msgstr "Přizjewjenje njedowolene."
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1337
 msgid "a few seconds ago"
 msgstr "před něšto sekundami"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1340
 msgid "about a minute ago"
 msgstr "před něhdźe jednej mjeńšinu"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1344
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
@@ -9362,12 +7688,10 @@ msgstr[2] "před něhdźe %d mjeńšinami"
 msgstr[3] "před něhdźe %d mjeńšinami"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1347
 msgid "about an hour ago"
 msgstr "před něhdźe jednej hodźinu"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1351
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
@@ -9377,12 +7701,10 @@ msgstr[2] "před něhdźe %d hodźinami"
 msgstr[3] "před něhdźe %d hodźinami"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1354
 msgid "about a day ago"
 msgstr "před něhdźe jednym dnjom"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1358
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
@@ -9392,12 +7714,10 @@ msgstr[2] "před něhdźe %d dnjemi"
 msgstr[3] "před něhdźe %d dnjemi"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1361
 msgid "about a month ago"
 msgstr "před něhdźe jednym měsacom"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1365
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
@@ -9407,13 +7727,11 @@ msgstr[2] "před něhdźe %d měsacami"
 msgstr[3] "před něhdźe %d měacami"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1368
 msgid "about a year ago"
 msgstr "před něhdźe jednym lětom"
 
 #. TRANS: Web color exception thrown when a hexadecimal color code does not validate.
 #. TRANS: %s is the provided (invalid) color code.
-#: lib/webcolor.php:81 lib/webcolor.php:121
 #, php-format
 msgid "%s is not a valid color! Use 3 or 6 hex characters."
 msgstr ""
@@ -9421,177 +7739,31 @@ msgstr ""
 "heksadecimalnych znamješkow."
 
 #. TRANS: Exception.
-#: lib/xrd.php:63
 msgid "Invalid XML."
 msgstr "Njepłaćiwy XML."
 
 #. TRANS: Exception.
-#: lib/xrd.php:68
 msgid "Invalid XML, missing XRD root."
 msgstr "Njepłaćiwy XML, korjeń XRD faluje."
 
 #. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
-#: scripts/restoreuser.php:62
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr "Wobstaruje so zawěsćenje z dataje \"%s\"-"
 
-#~ msgid "Could not generate feed for group - %s"
-#~ msgstr "Njebě móžno kanal za skupinu wutworić - %s"
+#~ msgid "Full name is too long (max 255 chars)."
+#~ msgstr "Dospołne mjeno je předołho (maks. 255 znamješkow)."
 
-#~ msgid "Current confirmed Jabber/Google Talk address."
-#~ msgstr "Aktualna wobkrućena adresa Jabber/Google Talk."
+#~ msgid "description is too long (max %d chars)."
+#~ msgstr "wopisanje je předołho (maks. %d znamješkow)."
 
-#~ msgid "Send me notices through Jabber/Google Talk."
-#~ msgstr "Pósćel mi zdźělenki přez Jabber/Google Talk."
+#~ msgid "Location is too long (max 255 chars)."
+#~ msgstr "Městno je předołho (maks. 255 znamješkow)."
 
-#~ msgid "Publish a MicroID for my Jabber/Google Talk address."
-#~ msgstr "MicroID za moju adresu Jabber/Google Talk publikować."
+#~ msgid "Too many aliases! Maximum %d."
+#~ msgstr "Přewjele aliasow! Maksimum: %d."
 
-#~ msgid "No Jabber ID."
-#~ msgstr "Žadyn ID Jabber."
-
-#~ msgid "Not a valid Jabber ID."
-#~ msgstr "Njepłaćiwy Jabber-ID."
-
-#~ msgid "That is already your Jabber ID."
-#~ msgstr "To je hižo twój ID Jabber."
-
-#~ msgid "That is not your Jabber ID."
-#~ msgstr "To njeje twój ID Jabber."
-
-#~ msgid "Other settings"
-#~ msgstr "Druhe nastajenja"
-
-#~ msgid "Tag cloud"
-#~ msgstr "Mróčel tafličkow"
-
-#~ msgid "Consumer key"
-#~ msgstr "Kluč přetrjebowarja"
-
-#~ msgid "Consumer secret"
-#~ msgstr "Potajnstwo přetrjebowarja"
-
-#~ msgid "Authorize URL"
-#~ msgstr "URL awtorizować"
-
-#~ msgid "Jabber"
-#~ msgstr "Jabber"
-
-#~ msgid "Photo"
-#~ msgstr "Foto"
-
-#~ msgid "Other options"
-#~ msgstr "Druhe opcije"
-
-#~ msgid "Other"
-#~ msgstr "Druhe"
-
-#~ msgid "Primary site navigation"
-#~ msgstr "Primarna sydłowa nawigacija"
-
-#~ msgctxt "MENU"
-#~ msgid "Personal"
-#~ msgstr "Wosobinski"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Change your email, avatar, password, profile"
-#~ msgstr "Wašu e-mejl, waš awatar, waše hesło, waš profil změnić"
-
-#~ msgid "Account"
-#~ msgstr "Konto"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Connect to services"
-#~ msgstr "Ze słužbami zwjazać"
-
-#~ msgid "Connect"
-#~ msgstr "Zwjazać"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Change site configuration"
-#~ msgstr "Sydłowu konfiguraciju změnić"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Invite friends and colleagues to join you on %s"
-#~ msgstr "Přećelow a kolegow přeprosyć, so tebi na %s  přidružić"
-
-#~ msgctxt "MENU"
-#~ msgid "Invite"
-#~ msgstr "Přeprosyć"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Create an account"
-#~ msgstr "Konto załožić"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Help me!"
-#~ msgstr "Pomhaj!"
-
-#~ msgctxt "MENU"
-#~ msgid "Help"
-#~ msgstr "Pomoc"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Search for people or text"
-#~ msgstr "Za ludźimi abo tekstom pytać"
-
-#~ msgid "Local views"
-#~ msgstr "Lokalne napohlady"
-
-#~ msgid "Page notice"
-#~ msgstr "Zdźělenka strony"
-
-#~ msgid "Secondary site navigation"
-#~ msgstr "Sekundarna sydłowa nawigacija"
-
-#~ msgid "StatusNet software license"
-#~ msgstr "Softwarowa licenca StatusNet"
-
-#~ msgid "Site content license"
-#~ msgstr "Licenca sydłoweho wobsaha"
-
-#~ msgid "Pagination"
-#~ msgstr "Paginowanje"
-
-#~ msgid "Author"
-#~ msgstr "Awtor"
-
-#~ msgid "Provider"
-#~ msgstr "Poskićowar"
-
-#~ msgctxt "MENU"
-#~ msgid "SMS"
-#~ msgstr "SMS"
-
-#~ msgid "[%s]"
-#~ msgstr "[%s]"
-
-#~ msgid "Available characters"
-#~ msgstr "K dispoziciji stejace znamješka"
-
-#~ msgctxt "MENU"
-#~ msgid "Profile"
-#~ msgstr "Profil"
-
-#~ msgid "Search help"
-#~ msgstr "Pytanska pomoc"
-
-#~ msgid "Unknown user. Go to %s to add your address to your account"
-#~ msgstr ""
-#~ "Njeznaty wužiwar. Dźi k %s, zo by swoju adresu swojemu kontu přidał."
-
-#~ msgid "Message too long. Maximum is %1$d character, you sent %2$d."
-#~ msgid_plural "Message too long. Maximum is %1$d characters, you sent %2$d."
-#~ msgstr[0] ""
-#~ "Powěsć je předołho. Maksimalna dołhosć je %1$d znamješko, ty sy %2$d "
-#~ "pósłał."
-#~ msgstr[1] ""
-#~ "Powěsć je předołho. Maksimalna dołhosć je %1$d znamješce, ty sy %2$d "
-#~ "pósłał."
-#~ msgstr[2] ""
-#~ "Powěsć je předołho. Maksimalna dołhosć je %1$d znamješka, ty sy %2$d "
-#~ "pósłał."
-#~ msgstr[3] ""
-#~ "Powěsć je předołho. Maksimalna dołhosć je %1$d znamješkow, ty sy %2$d "
-#~ "pósłał."
+#, fuzzy
+#~ msgctxt "BUTTON"
+#~ msgid "Comment"
+#~ msgstr "Wobsah"
diff --git a/locale/hu/LC_MESSAGES/statusnet.po b/locale/hu/LC_MESSAGES/statusnet.po
index edbdd47c13..c52526e5b3 100644
--- a/locale/hu/LC_MESSAGES/statusnet.po
+++ b/locale/hu/LC_MESSAGES/statusnet.po
@@ -12,13 +12,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:23+0000\n"
-"PO-Revision-Date: 2011-03-03 17:26:05+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:23+0000\n"
 "Language-Team: Hungarian <http://translatewiki.net/wiki/Portal:hu>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-25 23:49:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:59:19+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: hu\n"
 "X-Message-Group: #out-statusnet-core\n"
@@ -26,55 +26,45 @@ msgstr ""
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
-#: actions/accessadminpanel.php:53 lib/adminpanelaction.php:363
 msgid "Access"
 msgstr "Hozzáférés"
 
 #. TRANS: Page notice.
-#: actions/accessadminpanel.php:64
 msgid "Site access settings"
 msgstr "A webhely hozzáférhetőségének beállítása"
 
 #. TRANS: Form legend for registration form.
-#: actions/accessadminpanel.php:151
 msgid "Registration"
 msgstr "Regisztráció"
 
 #. TRANS: Checkbox instructions for admin setting "Private".
-#: actions/accessadminpanel.php:155
 msgid "Prohibit anonymous users (not logged in) from viewing site?"
 msgstr ""
 "Tiltsuk, hogy az anonim (be nem jelentkezett) felhasználók megnézhessék a "
 "webhelyet?"
 
 #. TRANS: Checkbox label for prohibiting anonymous users from viewing site.
-#: actions/accessadminpanel.php:157
 msgctxt "LABEL"
 msgid "Private"
 msgstr "Privát"
 
 #. TRANS: Checkbox instructions for admin setting "Invite only".
-#: actions/accessadminpanel.php:164
 msgid "Make registration invitation only."
 msgstr "Legyen a regisztráció meghíváshoz kötött."
 
 #. TRANS: Checkbox label for configuring site as invite only.
-#: actions/accessadminpanel.php:166
 msgid "Invite only"
 msgstr "Csak meghívással"
 
 #. TRANS: Checkbox instructions for admin setting "Closed" (no new registrations).
-#: actions/accessadminpanel.php:173
 msgid "Disable new registrations."
 msgstr "Új regisztrációk tiltása."
 
 #. TRANS: Checkbox label for disabling new user registrations.
-#: actions/accessadminpanel.php:175
 msgid "Closed"
 msgstr "Zárva"
 
 #. TRANS: Title for button to save access settings in site admin panel.
-#: actions/accessadminpanel.php:191
 msgid "Save access settings"
 msgstr "Hozzáférések beállításainak mentése"
 
@@ -82,6 +72,7 @@ msgstr "Hozzáférések beállításainak mentése"
 #. TRANS: Button text for saving theme settings.
 #. TRANS: Button label to save e-mail preferences.
 #. TRANS: Button label to save IM preferences.
+#. TRANS: Button text in the license admin panel.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
 #. TRANS: Button text for saving site notice in admin panel.
@@ -91,21 +82,12 @@ msgstr "Hozzáférések beállításainak mentése"
 #. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
 #. TRANS: Button text on profile design page to save settings.
-#: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
-#: actions/emailsettings.php:251 actions/imsettings.php:199
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:198
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:204
-#: actions/subscriptions.php:261 actions/urlsettings.php:152
-#: actions/useradminpanel.php:298 lib/applicationeditform.php:355
-#: lib/designform.php:320 lib/groupeditform.php:201
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Mentés"
 
 #. TRANS: Server error when page not found (404).
 #. TRANS: Server error when page not found (404)
-#: actions/all.php:68 actions/public.php:98 actions/replies.php:93
-#: actions/showfavorites.php:140 actions/tag.php:52
 msgid "No such page."
 msgstr "Nincs ilyen lap."
 
@@ -124,6 +106,7 @@ msgstr "Nincs ilyen lap."
 #. TRANS: Client error displayed when checking group membership for a non-existing user.
 #. TRANS: Client error displayed when trying to have a non-existing user join a group.
 #. TRANS: Client error displayed when trying to have a non-existing user leave a group.
+#. TRANS: Client error displayed when not providing a user or an invalid user.
 #. TRANS: Client error displayed when updating a status for a non-existing user.
 #. TRANS: Client error displayed when requesting a list of followers for a non-existing user.
 #. TRANS: Client error displayed when requesting most recent favourite notices by a user for a non-existing user.
@@ -136,6 +119,8 @@ msgstr "Nincs ilyen lap."
 #. 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.
 #. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
@@ -143,33 +128,10 @@ msgstr "Nincs ilyen lap."
 #. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when calling a profile action without specifying a user.
-#: actions/all.php:80 actions/allrss.php:69
-#: actions/apiaccountupdatedeliverydevice.php:110
-#: actions/apiaccountupdateprofile.php:103
-#: actions/apiaccountupdateprofilebackgroundimage.php:118
-#: actions/apiaccountupdateprofileimage.php:104 actions/apiatomservice.php:59
-#: actions/apiblockcreate.php:96 actions/apiblockdestroy.php:94
-#: actions/apidirectmessage.php:75 actions/apidirectmessagenew.php:72
-#: actions/apigroupcreate.php:111 actions/apigroupismember.php:89
-#: actions/apigroupjoin.php:98 actions/apigroupleave.php:98
-#: actions/apigrouplist.php:70 actions/apigroupprofileupdate.php:108
-#: actions/apistatusesupdate.php:230 actions/apisubscriptions.php:85
-#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:173
-#: actions/apitimelinehome.php:78 actions/apitimelinementions.php:77
-#: actions/apitimelineuser.php:79 actions/avatarbynickname.php:79
-#: actions/favoritesrss.php:72 actions/foaf.php:42 actions/foaf.php:61
-#: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116
-#: actions/otp.php:78 actions/remotesubscribe.php:144
-#: actions/remotesubscribe.php:153 actions/replies.php:73
-#: actions/repliesrss.php:38 actions/rsd.php:113 actions/showfavorites.php:106
-#: actions/userbyid.php:75 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/userxrd.php:59 actions/xrds.php:71 lib/command.php:509
-#: lib/galleryaction.php:59 lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Nincs ilyen felhasználó."
 
 #. TRANS: Page title. %1$s is user nickname, %2$d is page number
-#: actions/all.php:91
 #, php-format
 msgid "%1$s and friends, page %2$d"
 msgstr "%1$s és barátai, %2$d oldal"
@@ -178,33 +140,26 @@ msgstr "%1$s és barátai, %2$d oldal"
 #. TRANS: H1 text for page. %s is a user nickname.
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Timeline title for user and friends. %s is a user nickname.
-#: actions/all.php:94 actions/all.php:191 actions/allrss.php:117
-#: actions/apitimelinefriends.php:207 actions/apitimelinehome.php:113
-#: lib/personalgroupnav.php:100
 #, php-format
 msgid "%s and friends"
 msgstr "%s és barátai"
 
 #. TRANS: %s is user nickname.
-#: actions/all.php:108
 #, php-format
 msgid "Feed for friends of %s (RSS 1.0)"
 msgstr "%s barátainak hírcsatornája (RSS 1.0)"
 
 #. TRANS: %s is user nickname.
-#: actions/all.php:117
 #, php-format
 msgid "Feed for friends of %s (RSS 2.0)"
 msgstr "%s barátainak hírcsatornája (RSS 2.0)"
 
 #. TRANS: %s is user nickname.
-#: actions/all.php:126
 #, php-format
 msgid "Feed for friends of %s (Atom)"
 msgstr "%s barátainak hírcsatornája (Atom)"
 
 #. TRANS: Empty list message. %s is a user nickname.
-#: actions/all.php:139
 #, php-format
 msgid ""
 "This is the timeline for %s and friends but no one has posted anything yet."
@@ -214,7 +169,6 @@ msgstr ""
 
 #. TRANS: Encouragement displayed on logged in user's empty timeline.
 #. TRANS: This message contains Markdown links. Keep "](" together.
-#: actions/all.php:146
 #, php-format
 msgid ""
 "Try subscribing to more people, [join a group](%%action.groups%%) or post "
@@ -225,7 +179,6 @@ msgstr ""
 
 #. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@".
 #. TRANS: This message contains Markdown links. Keep "](" together.
-#: actions/all.php:150
 #, php-format
 msgid ""
 "You can try to [nudge %1$s](../%2$s) from their profile or [post something "
@@ -236,7 +189,6 @@ msgstr ""
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
 #. TRANS: Second sentence of empty message for anonymous users. %s is a user nickname.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:221
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -244,14 +196,11 @@ msgid ""
 msgstr ""
 
 #. TRANS: H1 text for page when viewing a list for self.
-#: actions/all.php:188
 msgid "You and friends"
 msgstr "Te és a barátaid"
 
 #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
 #. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name.
-#: actions/allrss.php:122 actions/apitimelinefriends.php:213
-#: actions/apitimelinehome.php:119
 #, php-format
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr "Frissítések %1$s felhasználótól, és barátok a következő oldalon: %2$s!"
@@ -270,55 +219,20 @@ msgstr "Frissítések %1$s felhasználótól, és barátok a következő oldalon
 #. TRANS: Client error displayed trying to execute an unknown API method checking group membership.
 #. TRANS: Client error displayed trying to execute an unknown API method listing the latest 20 groups.
 #. TRANS: Client error displayed trying to execute an unknown API method showing group membership.
+#. TRANS: Client error displayed when using an unsupported API format.
 #. TRANS: Client error displayed trying to execute an unknown API method showing a group.
 #. TRANS: Client error displayed trying to execute an unknown API method testing API connectivity.
 #. TRANS: Client error displayed trying to execute an unknown API method deleting a status.
 #. TRANS: Client error displayed when trying to handle an unknown API method.
-#: actions/apiaccountratelimitstatus.php:69
-#: actions/apiaccountupdatedeliverydevice.php:92
-#: actions/apiaccountupdateprofile.php:94
-#: actions/apiaccountupdateprofilebackgroundimage.php:92
-#: actions/apiaccountupdateprofilecolors.php:115
-#: actions/apiaccountverifycredentials.php:68 actions/apidirectmessage.php:157
-#: actions/apifavoritecreate.php:98 actions/apifavoritedestroy.php:98
-#: actions/apifriendshipscreate.php:99 actions/apifriendshipsdestroy.php:99
-#: actions/apifriendshipsshow.php:124 actions/apigroupcreate.php:138
-#: actions/apigroupismember.php:115 actions/apigroupjoin.php:151
-#: actions/apigroupleave.php:141 actions/apigrouplist.php:134
-#: actions/apigrouplistall.php:120 actions/apigroupmembership.php:105
-#: actions/apigroupprofileupdate.php:100 actions/apigroupprofileupdate.php:213
-#: actions/apigroupshow.php:114 actions/apihelptest.php:84
-#: actions/apistatusesdestroy.php:101 actions/apistatusesretweets.php:110
-#: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:139
-#: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
-#: actions/apitimelinefavorites.php:182 actions/apitimelinefriends.php:276
-#: actions/apitimelinegroup.php:148 actions/apitimelinehome.php:181
-#: actions/apitimelinementions.php:182 actions/apitimelinepublic.php:247
-#: actions/apitimelineretweetedtome.php:147
-#: actions/apitimelineretweetsofme.php:147 actions/apitimelinetag.php:165
-#: actions/apitimelineuser.php:217 actions/apiusershow.php:100
 msgid "API method not found."
 msgstr "Az API-metódus nem található."
 
 #. 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.
-#: actions/apiaccountupdatedeliverydevice.php:83
-#: actions/apiaccountupdateprofile.php:85
-#: actions/apiaccountupdateprofilebackgroundimage.php:83
-#: actions/apiaccountupdateprofilecolors.php:106
-#: actions/apiaccountupdateprofileimage.php:80 actions/apiblockcreate.php:87
-#: actions/apiblockdestroy.php:85 actions/apidirectmessagenew.php:107
-#: actions/apifavoritecreate.php:88 actions/apifavoritedestroy.php:88
-#: actions/apifriendshipscreate.php:89 actions/apifriendshipsdestroy.php:89
-#: actions/apigroupcreate.php:102 actions/apigroupjoin.php:89
-#: actions/apigroupleave.php:89 actions/apigroupprofileupdate.php:92
-#: actions/apimediaupload.php:66 actions/apistatusesretweet.php:63
-#: actions/apistatusesupdate.php:194
 msgid "This method requires a POST."
 msgstr "Ez a metódus POST-ot igényel."
 
 #. TRANS: Client error displayed when no valid device parameter is provided for a user's delivery device setting.
-#: actions/apiaccountupdatedeliverydevice.php:103
 msgid ""
 "You must specify a parameter named 'device' with a value of one of: sms, im, "
 "none."
@@ -331,10 +245,6 @@ msgstr ""
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
-#: actions/apiaccountupdatedeliverydevice.php:136
-#: actions/emailsettings.php:353 actions/emailsettings.php:499
-#: actions/profilesettings.php:323 actions/smssettings.php:300
-#: actions/smssettings.php:453 actions/urlsettings.php:211
 msgid "Could not update user."
 msgstr "Nem sikerült frissíteni a felhasználót."
 
@@ -347,32 +257,17 @@ msgstr "Nem sikerült frissíteni a felhasználót."
 #. TRANS: Server error displayed when requesting Friends of a Friend feed for a user for which the profile could not be found.
 #. TRANS: Server error displayed when trying to get a user hCard for a user without a profile.
 #. TRANS: Server error displayed when calling a profile action while the specified user does not have a profile.
-#: actions/apiaccountupdateprofile.php:111
-#: actions/apiaccountupdateprofilebackgroundimage.php:199
-#: actions/apiaccountupdateprofilecolors.php:183
-#: actions/apiaccountupdateprofileimage.php:131
-#: actions/apiuserprofileimage.php:88 actions/apiusershow.php:108
-#: actions/avatarbynickname.php:85 actions/foaf.php:69 actions/hcard.php:75
-#: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
-#: lib/profileaction.php:85
 msgid "User has no profile."
 msgstr "A felhasználónak nincs profilja."
 
 #. TRANS: Server error displayed if a user profile could not be saved.
 #. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:419
 msgid "Could not save profile."
 msgstr "Nem sikerült menteni a profilt."
 
 #. TRANS: Client error displayed when the number of bytes in a POST request exceeds a limit.
 #. TRANS: %s is the number of bytes of the CONTENT_LENGTH.
 #. TRANS: Form validation error in design settings form. POST should remain untranslated.
-#: actions/apiaccountupdateprofilebackgroundimage.php:108
-#: actions/apiaccountupdateprofileimage.php:95 actions/apimediaupload.php:81
-#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
-#: actions/designadminpanel.php:120 actions/editapplication.php:121
-#: actions/newapplication.php:102 actions/newnotice.php:95
-#: lib/designsettings.php:110
 #, fuzzy, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s byte) due to its "
@@ -392,26 +287,15 @@ msgstr[1] ""
 #. TRANS: Client error displayed when a database error occurs inserting profile colours.
 #. TRANS: Client error displayed when a database error occurs updating profile colours.
 #. TRANS: Form validation error displayed when group design settings could not be saved because of an application issue.
-#: actions/apiaccountupdateprofilebackgroundimage.php:138
-#: actions/apiaccountupdateprofilebackgroundimage.php:149
-#: actions/apiaccountupdateprofilecolors.php:160
-#: actions/apiaccountupdateprofilecolors.php:171
-#: actions/groupdesignsettings.php:285 actions/groupdesignsettings.php:296
-#: actions/userdesignsettings.php:218 actions/userdesignsettings.php:228
-#: actions/userdesignsettings.php:270 actions/userdesignsettings.php:280
 msgid "Unable to save your design settings."
 msgstr "Nem sikerült elmenteni a megjelenítési beállításaid."
 
 #. TRANS: Error displayed when updating design settings fails.
 #. TRANS: Client error displayed when a database error occurs updating profile colours.
-#: actions/apiaccountupdateprofilebackgroundimage.php:191
-#: actions/apiaccountupdateprofilecolors.php:139
-#: actions/userdesignsettings.php:196
 msgid "Could not update your design."
 msgstr "Nem sikerült frissíteni a megjelenítést."
 
 #. TRANS: Title for Atom feed.
-#: actions/apiatomservice.php:85
 msgctxt "ATOM"
 msgid "Main"
 msgstr ""
@@ -420,9 +304,6 @@ msgstr ""
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Title in atom group notice feed. %s is a group name.
 #. TRANS: Title in atom user notice feed. %s is a user name.
-#: actions/apiatomservice.php:93 actions/grouprss.php:138
-#: actions/userrss.php:94 lib/atomgroupnoticefeed.php:63
-#: lib/atomusernoticefeed.php:88
 #, php-format
 msgid "%s timeline"
 msgstr "%s története"
@@ -432,8 +313,6 @@ msgstr "%s története"
 #. TRANS: %s is a user nickname.
 #. TRANS: Header for subscriptions overview for a user (first page).
 #. TRANS: %s is a user nickname.
-#: actions/apiatomservice.php:104 actions/atompubsubscriptionfeed.php:148
-#: actions/subscriptions.php:51
 #, php-format
 msgid "%s subscriptions"
 msgstr ""
@@ -441,58 +320,48 @@ msgstr ""
 #. TRANS: Title for Atom feed with a user's favorite notices. %s is a user nickname.
 #. TRANS: Title for Atom favorites feed.
 #. TRANS: %s is a user nickname.
-#: actions/apiatomservice.php:115 actions/atompubfavoritefeed.php:142
 #, fuzzy, php-format
 msgid "%s favorites"
 msgstr "Kedvencek"
 
 #. TRANS: Title for Atom feed with a user's memberships. %s is a user nickname.
-#: actions/apiatomservice.php:126
 #, fuzzy, php-format
 msgid "%s memberships"
 msgstr "%s csoport tagjai"
 
 #. TRANS: Client error displayed when users try to block themselves.
-#: actions/apiblockcreate.php:105
 msgid "You cannot block yourself!"
 msgstr "Nem blokkolhatod saját magad!"
 
 #. TRANS: Server error displayed when blocking a user has failed.
-#: actions/apiblockcreate.php:127
 msgid "Block user failed."
 msgstr "Nem sikerült a felhasználó blokkolása."
 
 #. TRANS: Server error displayed when unblocking a user has failed.
-#: actions/apiblockdestroy.php:113
 msgid "Unblock user failed."
 msgstr "Nem sikerült a felhasználó blokkjának feloldása."
 
 #. TRANS: Title. %s is a user nickname.
-#: actions/apidirectmessage.php:88
 #, php-format
 msgid "Direct messages from %s"
 msgstr "Közvetlen üzenetek tőle: %s"
 
 #. TRANS: Subtitle. %s is a user nickname.
-#: actions/apidirectmessage.php:93
 #, php-format
 msgid "All the direct messages sent from %s"
 msgstr "%s által küldött összes közvetlen üzenetek"
 
 #. TRANS: Title. %s is a user nickname.
-#: actions/apidirectmessage.php:102
 #, php-format
 msgid "Direct messages to %s"
 msgstr "Közvetlen üzenetek neki: %s"
 
 #. TRANS: Subtitle. %s is a user nickname.
-#: actions/apidirectmessage.php:107
 #, php-format
 msgid "All the direct messages sent to %s"
 msgstr "%s részére küldött összes közvetlen üzenet"
 
 #. TRANS: Client error displayed when no message text was submitted (406).
-#: actions/apidirectmessagenew.php:117
 msgid "No message text!"
 msgstr "Az üzenetnek nincs szövege!"
 
@@ -500,7 +369,6 @@ msgstr "Az üzenetnek nincs szövege!"
 #. TRANS: %d is the maximum number of characters for a message.
 #. TRANS: Form validation error displayed when message content is too long.
 #. TRANS: %d is the maximum number of characters for a message.
-#: actions/apidirectmessagenew.php:127 actions/newmessage.php:152
 #, fuzzy, php-format
 msgid "That's too long. Maximum message size is %d character."
 msgid_plural "That's too long. Maximum message size is %d characters."
@@ -508,19 +376,16 @@ msgstr[0] "Ez túl hosszú. Az üzenet mérete legfeljebb %d karakter lehet."
 msgstr[1] "Ez túl hosszú. Az üzenet mérete legfeljebb %d karakter lehet."
 
 #. TRANS: Client error displayed if a recipient user could not be found (403).
-#: actions/apidirectmessagenew.php:139
 msgid "Recipient user not found."
 msgstr "A címzett felhasználó nem található."
 
 #. TRANS: Client error displayed trying to direct message another user who's not a friend (403).
-#: actions/apidirectmessagenew.php:144
 #, fuzzy
 msgid "Cannot send direct messages to users who aren't your friend."
 msgstr ""
 "Nem küldhetsz közvetlen üzenetet olyan felhasználóknak, akik nem a barátaid."
 
 #. TRANS: Client error displayed trying to direct message self (403).
-#: actions/apidirectmessagenew.php:154
 #, fuzzy
 msgid ""
 "Do not send a message to yourself; just say it to yourself quietly instead."
@@ -529,117 +394,97 @@ msgstr "Ne küldj üzenetet magadnak, helyette mondd el halkan."
 #. 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.
 #. TRANS: Client error displayed trying to delete a status with an invalid ID.
-#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:108
-#: actions/apistatusesdestroy.php:121
 msgid "No status found with that ID."
 msgstr "Nincs ilyen azonosítójú állapot."
 
 #. TRANS: Client error displayed when trying to mark a notice favourite that already is a favourite.
-#: actions/apifavoritecreate.php:120
 msgid "This status is already a favorite."
 msgstr "Ez az állapotjelentés már a kedvenceid között van."
 
 #. TRANS: Client error displayed when marking a notice as favourite fails.
 #. TRANS: Server error displayed when trying to mark a notice as favorite fails in the database.
 #. TRANS: Error message text shown when a favorite could not be set.
-#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:306
 msgid "Could not create favorite."
 msgstr "Nem sikerült létrehozni a kedvencet."
 
 #. TRANS: Client error displayed when trying to remove a favourite that was not a favourite.
-#: actions/apifavoritedestroy.php:122
 msgid "That status is not a favorite."
 msgstr "Az az állapotjelentés nincs a kedvenceid között."
 
 #. TRANS: Client error displayed when removing a favourite has failed.
 #. TRANS: Server error displayed when removing a favorite from the database fails.
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:90
 msgid "Could not delete favorite."
 msgstr "Nem sikerült törölni a kedvencet."
 
 #. TRANS: Client error displayed when trying follow who's profile could not be found.
-#: actions/apifriendshipscreate.php:109
 msgid "Could not follow user: profile not found."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to follow a user that's already being followed.
 #. TRANS: %s is the nickname of the user that is already being followed.
-#: actions/apifriendshipscreate.php:120
 #, php-format
 msgid "Could not follow user: %s is already on your list."
 msgstr "Nem lehet követni a felhasználót: %s már a listádon van."
 
 #. TRANS: Client error displayed when trying to unfollow a user that cannot be found.
-#: actions/apifriendshipsdestroy.php:109
 msgid "Could not unfollow user: User not found."
 msgstr "Nem tudunk leválni a felhasználóról: nincs ilyen felhasználó."
 
 #. TRANS: Client error displayed when trying to unfollow self.
-#: actions/apifriendshipsdestroy.php:121
 msgid "You cannot unfollow yourself."
 msgstr "Nem tudod nem figyelemmel követni magadat."
 
 #. TRANS: Client error displayed when supplying invalid parameters to an API call checking if a friendship exists.
-#: actions/apifriendshipsexists.php:88
 msgid "Two valid IDs or nick names must be supplied."
 msgstr ""
 
 #. TRANS: Client error displayed when a source user could not be determined showing friendship.
-#: actions/apifriendshipsshow.php:131
 msgid "Could not determine source user."
 msgstr "Nem sikerült megállapítani a forrás felhasználót."
 
 #. TRANS: Client error displayed when a target user could not be determined showing friendship.
-#: actions/apifriendshipsshow.php:140
 msgid "Could not find target user."
 msgstr "A cél felhasználó nem található."
 
 #. TRANS: Client error trying to create a group with a nickname this is already in use.
+#. TRANS: API validation exception thrown when nickname is already used.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:156 actions/apigroupprofileupdate.php:255
-#: actions/editgroup.php:191 actions/newgroup.php:137
-#: actions/profilesettings.php:274 actions/register.php:199
 msgid "Nickname already in use. Try another one."
 msgstr "A becenév már foglalt. Próbálj meg egy másikat."
 
 #. TRANS: Client error in form for group creation.
+#. TRANS: API validation exception thrown when nickname does not validate.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:164 actions/apigroupprofileupdate.php:259
-#: actions/editgroup.php:195 actions/newgroup.php:141
-#: actions/profilesettings.php:244 actions/register.php:201
 msgid "Not a valid nickname."
 msgstr "Nem érvényes becenév."
 
 #. TRANS: Client error in form for group creation.
+#. TRANS: API validation exception thrown when homepage URL does not validate.
 #. TRANS: Validation error shown when providing an invalid homepage URL in the "Edit application" form.
 #. TRANS: Group edit form validation error.
 #. TRANS: Validation error shown when providing an invalid homepage URL in the "New application" form.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:181 actions/apigroupprofileupdate.php:277
-#: actions/editapplication.php:235 actions/editgroup.php:202
-#: actions/newapplication.php:221 actions/newgroup.php:148
-#: actions/profilesettings.php:249 actions/register.php:208
 msgid "Homepage is not a valid URL."
 msgstr "A honlap érvénytelen URL-cím."
 
 #. TRANS: Client error in form for group creation.
+#. TRANS: API validation exception thrown when full name does not validate.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:191 actions/editgroup.php:206
-#: actions/newgroup.php:152 actions/profilesettings.php:253
-#: actions/register.php:211
 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "A teljes név túl hosszú (legfeljebb 255 karakter lehet)."
 
 #. TRANS: Client error shown when providing too long a description during group creation.
 #. TRANS: %d is the maximum number of allowed characters.
+#. TRANS: API validation exception thrown when description does not validate.
+#. TRANS: %d is the maximum description length and used for plural.
 #. TRANS: Validation error shown when providing too long a description in the "Edit application" form.
 #. TRANS: %d is the maximum number of allowed characters.
 #. TRANS: Group edit form validation error.
@@ -647,9 +492,6 @@ msgstr "A teljes név túl hosszú (legfeljebb 255 karakter lehet)."
 #. TRANS: %d is the maximum number of characters for the description.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed characters.
-#: actions/apigroupcreate.php:201 actions/editapplication.php:202
-#: actions/editgroup.php:211 actions/newapplication.php:182
-#: actions/newgroup.php:157
 #, fuzzy, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."
@@ -657,24 +499,22 @@ msgstr[0] "A leírás túl hosszú (legfeljebb %d karakter lehet)."
 msgstr[1] "A leírás túl hosszú (legfeljebb %d karakter lehet)."
 
 #. TRANS: Client error shown when providing too long a location during group creation.
+#. TRANS: API validation exception thrown when location does not validate.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:215 actions/editgroup.php:218
-#: actions/newgroup.php:164 actions/profilesettings.php:266
-#: actions/register.php:220
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
 msgstr "A hely túl hosszú (legfeljebb 255 karakter lehet)."
 
 #. TRANS: Client error shown when providing too many aliases during group creation.
 #. TRANS: %d is the maximum number of allowed aliases.
+#. TRANS: API validation exception thrown when aliases do not validate.
+#. TRANS: %d is the maximum number of aliases and used for plural.
 #. TRANS: Group edit form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.
-#: actions/apigroupcreate.php:236 actions/editgroup.php:231
-#: actions/newgroup.php:177
 #, fuzzy, php-format
 msgid "Too many aliases! Maximum %d allowed."
 msgid_plural "Too many aliases! Maximum %d allowed."
@@ -683,25 +523,24 @@ msgstr[1] "Túl sok álnév! Legfeljebb %d lehet."
 
 #. TRANS: Client error shown when providing an invalid alias during group creation.
 #. TRANS: %s is the invalid alias.
-#: actions/apigroupcreate.php:253
+#. TRANS: API validation exception thrown when aliases does not validate.
+#. TRANS: %s is the invalid alias.
 #, php-format
 msgid "Invalid alias: \"%s\"."
 msgstr "Érvénytelen álnév: „%s”."
 
 #. TRANS: Client error displayed when trying to use an alias during group creation that is already in use.
 #. TRANS: %s is the alias that is already in use.
+#. TRANS: API validation exception thrown when aliases is already used.
+#. TRANS: %s is the already used alias.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error. %s is the already used alias.
-#: actions/apigroupcreate.php:264 actions/apigroupprofileupdate.php:351
-#: actions/editgroup.php:246 actions/newgroup.php:193
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "A(z) „%s” álnév már használatban van. Próbálj meg egy másikat."
 
 #. TRANS: Client error displayed when trying to use an alias during group creation that is the same as the group's nickname.
 #. TRANS: Group edit form validation error.
-#: actions/apigroupcreate.php:278 actions/apigroupprofileupdate.php:359
-#: actions/editgroup.php:253
 msgid "Alias can't be the same as nickname."
 msgstr "Az álnév nem egyezhet meg a becenévvel."
 
@@ -709,26 +548,21 @@ msgstr "Az álnév nem egyezhet meg a becenévvel."
 #. TRANS: Client error displayed when trying to join a group that does not exist.
 #. TRANS: Client error displayed when trying to leave a group that does not exist.
 #. TRANS: Client error displayed trying to show group membership on a non-existing group.
+#. TRANS: Client error displayed when not providing a group or an invalid group.
 #. TRANS: Client error displayed when trying to show a group that could not be found.
 #. TRANS: Client error displayed requesting most recent notices to a group for a non-existing group.
-#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
-#: actions/apigroupleave.php:104 actions/apigroupmembership.php:71
-#: actions/apigroupprofileupdate.php:113 actions/apigroupshow.php:81
-#: actions/apitimelinegroup.php:89
 msgid "Group not found."
 msgstr "A csoport nem található."
 
 #. TRANS: Server error displayed when trying to join a group the user is already a member of.
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:345
 msgid "You are already a member of that group."
 msgstr "Már tagja vagy ennek a csoportnak."
 
 #. TRANS: Server error displayed when trying to join a group the user is blocked from joining.
 #. 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.
-#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:350
 msgid "You have been blocked from that group by the admin."
 msgstr "Az adminisztrátor blokkolt ebből a csoportból."
 
@@ -736,13 +570,11 @@ msgstr "Az adminisztrátor blokkolt ebből a csoportból."
 #. TRANS: %1$s is the joining user's nickname, $2$s is the group nickname for which the join failed.
 #. TRANS: Message given having failed to add a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:136 actions/joingroup.php:139 lib/command.php:362
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "Nem sikerült %1$s felhasználót hozzáadni a %2$s csoporthoz."
 
 #. TRANS: Server error displayed when trying to leave a group the user is not a member of.
-#: actions/apigroupleave.php:115
 msgid "You are not a member of this group."
 msgstr "Nem vagy tagja ennek a csoportnak."
 
@@ -750,115 +582,78 @@ msgstr "Nem vagy tagja ennek a csoportnak."
 #. TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
 #. TRANS: Message given having failed to remove a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupleave.php:127 actions/leavegroup.php:133
-#: lib/command.php:410
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
 msgstr "Nem sikerült %1$s felhasználót eltávolítani a %2$s csoportból."
 
 #. TRANS: Used as title in check for group membership. %s is a user name.
-#: actions/apigrouplist.php:94
 #, php-format
 msgid "%s's groups"
 msgstr "%s csoportjai"
 
 #. TRANS: Used as subtitle in check for group membership. %1$s is a user name, %2$s is the site name.
-#: actions/apigrouplist.php:104
 #, php-format
 msgid "%1$s groups %2$s is a member of."
 msgstr ""
 
 #. TRANS: Message is used as a title when listing the lastest 20 groups. %s is a site name.
 #. TRANS: Message is used as a page title. %s is a nick name.
-#: actions/apigrouplistall.php:88 actions/usergroups.php:63
 #, php-format
 msgid "%s groups"
 msgstr "%s csoportok"
 
 #. TRANS: Message is used as a subtitle when listing the lastest 20 groups. %s is a site name.
-#: actions/apigrouplistall.php:93
 #, php-format
 msgid "groups on %s"
 msgstr "%s csoportok"
 
+#. TRANS: Client error displayed when trying to edit a group without being an admin.
 #. TRANS: Client error displayed trying to edit a group while not being a group admin.
 #. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
 #. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
-#: actions/apigroupprofileupdate.php:118 actions/editgroup.php:110
-#: actions/editgroup.php:176 actions/groupdesignsettings.php:109
-#: actions/grouplogo.php:111
 msgid "You must be an admin to edit the group."
 msgstr ""
 
+#. TRANS: Server error displayed when group update fails.
 #. TRANS: Server error displayed when editing a group fails.
-#: actions/apigroupprofileupdate.php:171 actions/editgroup.php:274
 msgid "Could not update group."
 msgstr "Nem sikerült a csoport frissítése."
 
+#. TRANS: Server error displayed when adding group aliases fails.
 #. TRANS: Server error displayed when group aliases could not be added.
 #. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/apigroupprofileupdate.php:194 actions/editgroup.php:281
-#: classes/User_group.php:540
 msgid "Could not create aliases."
 msgstr "Nem sikerült létrehozni az álneveket."
 
+#. TRANS: API validation exception thrown when nickname does not validate.
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: actions/apigroupprofileupdate.php:249 lib/nickname.php:165
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr "A becenév csak kisbetűket és számokat tartalmazhat, szóközök nélkül."
 
-#: actions/apigroupprofileupdate.php:286
-#, fuzzy
-msgid "Full name is too long (max 255 chars)."
-msgstr "A teljes név túl hosszú (legfeljebb 255 karakter lehet)."
-
-#: actions/apigroupprofileupdate.php:296
-#, fuzzy, php-format
-msgid "description is too long (max %d chars)."
-msgstr "A leírás túl hosszú (legfeljebb %d karakter lehet)."
-
-#: actions/apigroupprofileupdate.php:307
-#, fuzzy
-msgid "Location is too long (max 255 chars)."
-msgstr "A hely túl hosszú (legfeljebb 255 karakter lehet)."
-
-#: actions/apigroupprofileupdate.php:326
-#, fuzzy, php-format
-msgid "Too many aliases! Maximum %d."
-msgstr "Túl sok álnév! Legfeljebb %d lehet."
-
-#. TRANS: Group edit form validation error.
+#. TRANS: API validation exception thrown when alias is the same as nickname.
 #. TRANS: Group create form validation error.
-#. TRANS: %s is the invalid alias.
-#: actions/apigroupprofileupdate.php:342 actions/editgroup.php:241
-#: actions/newgroup.php:188
-#, php-format
-msgid "Invalid alias: \"%s\""
-msgstr "Érvénytelen álnév: „%s”"
+#, fuzzy
+msgid "Alias cannot be the same as nickname."
+msgstr "Az álnév nem egyezhet meg a becenévvel."
 
 #. TRANS: Client error displayed when uploading a media file has failed.
-#: actions/apimediaupload.php:101
 msgid "Upload failed."
 msgstr ""
 
 #. TRANS: Client error given from the OAuth API when the request token or verifier is invalid.
-#: actions/apioauthaccesstoken.php:102
 msgid "Invalid request token or verifier."
 msgstr ""
 
 #. TRANS: Client error given when no oauth_token was passed to the OAuth API.
-#: actions/apioauthauthorize.php:107
 msgid "No oauth_token parameter provided."
 msgstr ""
 
 #. TRANS: Client error given when an invalid request token was passed to the OAuth API.
-#: actions/apioauthauthorize.php:115 actions/apioauthauthorize.php:129
 #, fuzzy
 msgid "Invalid request token."
 msgstr "Érvénytelen token."
 
 #. TRANS: Client error given when an invalid request token was passed to the OAuth API.
-#: actions/apioauthauthorize.php:121
 #, fuzzy
 msgid "Request token already authorized."
 msgstr "Nincs jogosultságod."
@@ -869,31 +664,14 @@ msgstr "Nincs jogosultságod."
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
 #. TRANS: Client error displayed when the session token is not okay.
-#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:75
-#: actions/emailsettings.php:292 actions/favor.php:75 actions/geocode.php:55
-#: actions/groupblock.php:65 actions/grouplogo.php:321
-#: actions/groupunblock.php:65 actions/imsettings.php:241
-#: actions/invite.php:60 actions/makeadmin.php:66 actions/newmessage.php:135
-#: actions/newnotice.php:105 actions/nudge.php:80
-#: actions/oauthappssettings.php:162 actions/oauthconnectionssettings.php:135
-#: actions/passwordsettings.php:137 actions/pluginenable.php:87
-#: actions/profilesettings.php:218 actions/recoverpassword.php:383
-#: actions/register.php:157 actions/remotesubscribe.php:76
-#: actions/repeat.php:82 actions/smssettings.php:249 actions/subedit.php:40
-#: actions/subscribe.php:87 actions/tagother.php:145
-#: actions/unsubscribe.php:69 actions/urlsettings.php:171
-#: actions/userauthorization.php:53 lib/designsettings.php:122
 msgid "There was a problem with your session token. Try again, please."
 msgstr "Probléma volt a munkameneted tokenjével. Kérlek, próbáld újra."
 
 #. TRANS: Form validation error given when an invalid username and/or password was passed to the OAuth API.
-#: actions/apioauthauthorize.php:168
 msgid "Invalid nickname / password!"
 msgstr "Érvénytelen becenév / jelszó!"
 
 #. TRANS: Server error displayed when a database action fails.
-#: actions/apioauthauthorize.php:217
 msgid "Database error inserting oauth_token_association."
 msgstr ""
 
@@ -909,28 +687,19 @@ msgstr ""
 #. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
 #. TRANS: Message given submitting a form with an unknown action in SMS settings.
 #. TRANS: Unknown form validation error in design settings form.
-#: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
-#: actions/designadminpanel.php:100 actions/editapplication.php:144
-#: actions/emailsettings.php:311 actions/grouplogo.php:332
-#: actions/imsettings.php:256 actions/newapplication.php:124
-#: actions/oauthconnectionssettings.php:144 actions/recoverpassword.php:46
-#: actions/smssettings.php:270 lib/designsettings.php:133
 msgid "Unexpected form submission."
 msgstr "Váratlan űrlapbeküldés."
 
 #. TRANS: Title for a page where a user can confirm/deny account access by an external application.
-#: actions/apioauthauthorize.php:387
 msgid "An application would like to connect to your account"
 msgstr "Egy alkalmazás szeretne csatlakozni a kontódhoz"
 
 #. TRANS: Fieldset legend.
-#: actions/apioauthauthorize.php:404
 msgid "Allow or deny access"
 msgstr "Elérés engedélyezése vagy tiltása"
 
 #. TRANS: User notification of external application requesting account access.
 #. TRANS: %3$s is the access type requested (read-write or read-only), %4$s is the StatusNet sitename.
-#: actions/apioauthauthorize.php:425
 #, php-format
 msgid ""
 "An application would like the ability to <strong>%3$s</strong> your %4$s "
@@ -941,7 +710,6 @@ msgstr ""
 #. TRANS: User notification of external application requesting account access.
 #. TRANS: %1$s is the application name requesting access, %2$s is the organisation behind the application,
 #. TRANS: %3$s is the access type requested, %4$s is the StatusNet sitename.
-#: actions/apioauthauthorize.php:433
 #, php-format
 msgid ""
 "The application <strong>%1$s</strong> by <strong>%2$s</strong> would like "
@@ -950,23 +718,19 @@ msgid ""
 msgstr ""
 
 #. TRANS: Fieldset legend.
-#: actions/apioauthauthorize.php:455
 #, fuzzy
 msgctxt "LEGEND"
 msgid "Account"
 msgstr "Kontó"
 
 #. TRANS: Field label on OAuth API authorisation form.
+#. TRANS: Field label on login page.
 #. TRANS: Field label in form for profile settings.
-#: actions/apioauthauthorize.php:459 actions/login.php:225
-#: actions/profilesettings.php:107 actions/register.php:411
-#: actions/userauthorization.php:145 lib/groupeditform.php:145
 msgid "Nickname"
 msgstr "Becenév"
 
 #. TRANS: Field label on OAuth API authorisation form.
-#: actions/apioauthauthorize.php:463 actions/login.php:228
-#: actions/register.php:415 lib/settingsnav.php:87
+#. TRANS: Field label on login page.
 msgid "Password"
 msgstr "Jelszó"
 
@@ -976,46 +740,37 @@ msgstr "Jelszó"
 #. TRANS: Button label to cancel an IM address confirmation procedure.
 #. TRANS: Button label to cancel a SMS address confirmation procedure.
 #. TRANS: Button label in the "Edit application" form.
-#: actions/apioauthauthorize.php:478 actions/emailsettings.php:125
-#: actions/imsettings.php:136 actions/smssettings.php:132
-#: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Cancel"
 msgstr "Mégse"
 
 #. TRANS: Button text that when clicked will allow access to an account by an external application.
-#: actions/apioauthauthorize.php:485
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Allow"
 msgstr "Engedjük"
 
 #. TRANS: Form instructions.
-#: actions/apioauthauthorize.php:502
 #, fuzzy
 msgid "Authorize access to your account information."
 msgstr "Engedélyezheted vagy megtilthatod a kontód megtekintését."
 
 #. TRANS: Header for user notification after revoking OAuth access to an application.
-#: actions/apioauthauthorize.php:594
 msgid "Authorization canceled."
 msgstr ""
 
 #. TRANS: User notification after revoking OAuth access to an application.
 #. TRANS: %s is an OAuth token.
-#: actions/apioauthauthorize.php:598
 #, php-format
 msgid "The request token %s has been revoked."
 msgstr ""
 
 #. TRANS: Title of the page notifying the user that an anonymous client application was successfully authorized to access the user's account with OAuth.
-#: actions/apioauthauthorize.php:621
 #, fuzzy
 msgid "You have successfully authorized the application"
 msgstr "Nincs jogosultságod."
 
 #. TRANS: Message notifying the user that an anonymous client application was successfully authorized to access the user's account with OAuth.
-#: actions/apioauthauthorize.php:625
 msgid ""
 "Please return to the application and enter the following security code to "
 "complete the process."
@@ -1023,14 +778,12 @@ msgstr ""
 
 #. TRANS: Title of the page notifying the user that the client application was successfully authorized to access the user's account with OAuth.
 #. TRANS: %s is the authorised application name.
-#: actions/apioauthauthorize.php:632
 #, fuzzy, php-format
 msgid "You have successfully authorized %s"
 msgstr "Nincs jogosultságod."
 
 #. TRANS: Message notifying the user that the client application was successfully authorized to access the user's account with OAuth.
 #. TRANS: %s is the authorised application name.
-#: actions/apioauthauthorize.php:639
 #, php-format
 msgid ""
 "Please return to %s and enter the following security code to complete the "
@@ -1039,12 +792,10 @@ msgstr ""
 
 #. TRANS: Client error displayed trying to delete a status not using POST or DELETE.
 #. TRANS: POST and DELETE should not be translated.
-#: actions/apistatusesdestroy.php:111
 msgid "This method requires a POST or DELETE."
 msgstr ""
 
 #. TRANS: Client error displayed trying to delete a status of another user.
-#: actions/apistatusesdestroy.php:136
 msgid "You may not delete another user's status."
 msgstr "Nem törölheted más felhasználók állapotait."
 
@@ -1052,21 +803,16 @@ msgstr "Nem törölheted más felhasználók állapotait."
 #. TRANS: Client error displayed trying to display redents of a non-exiting notice.
 #. TRANS: Client exception thrown when referencing a non-existing notice.
 #. TRANS: Error message displayed trying to delete a non-existing notice.
-#: actions/apistatusesretweet.php:74 actions/apistatusesretweets.php:70
-#: actions/atompubshowfavorite.php:82 actions/deletenotice.php:61
-#: actions/shownotice.php:92
 msgid "No such notice."
 msgstr "Nincs ilyen hír."
 
 #. TRANS: Client error displayed trying to repeat an own notice through the API.
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:549
 msgid "Cannot repeat your own notice."
 msgstr "Nem ismételheted meg a saját híredet."
 
 #. TRANS: Client error displayed trying to re-repeat a notice through the API.
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:92 lib/command.php:555
 msgid "Already repeated that notice."
 msgstr "Már megismételted azt a hírt."
 
@@ -1076,59 +822,45 @@ msgstr "Már megismételted azt a hírt."
 #. TRANS: Client exception thrown when using an unsupported HTTP method.
 #. TRANS: Client error shown when using a non-supported HTTP method.
 #. TRANS: Client exception thrown when using an unsupported HTTP method.
-#: actions/apistatusesshow.php:118 actions/atompubfavoritefeed.php:103
-#: actions/atompubmembershipfeed.php:105 actions/atompubshowfavorite.php:117
-#: actions/atompubshowmembership.php:116
-#: actions/atompubshowsubscription.php:122
-#: actions/atompubsubscriptionfeed.php:109
 #, fuzzy
 msgid "HTTP method not supported."
 msgstr "Az API-metódus nem található."
 
 #. TRANS: Exception thrown requesting an unsupported notice output format.
 #. TRANS: %s is the requested output format.
-#: actions/apistatusesshow.php:144
 #, fuzzy, php-format
 msgid "Unsupported format: %s."
 msgstr "Nem támogatott formátum."
 
 #. TRANS: Client error displayed requesting a deleted status.
-#: actions/apistatusesshow.php:155
 msgid "Status deleted."
 msgstr "Állapot törölve."
 
 #. TRANS: Client error displayed requesting a status with an invalid ID.
-#: actions/apistatusesshow.php:162
 msgid "No status with that ID found."
 msgstr "Nem található ilyen azonosítójú állapot."
 
 #. TRANS: Client error displayed when trying to delete a notice not using the Atom format.
-#: actions/apistatusesshow.php:227
 msgid "Can only delete using the Atom format."
 msgstr ""
 
 #. TRANS: Client error displayed when a user has no rights to delete notices of other users.
 #. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
-#: actions/apistatusesshow.php:235 actions/deletenotice.php:78
 #, fuzzy
 msgid "Cannot delete this notice."
 msgstr "Ne töröljük ezt a hírt"
 
 #. TRANS: Confirmation of notice deletion in API. %d is the ID (number) of the deleted notice.
-#: actions/apistatusesshow.php:249
 #, fuzzy, php-format
 msgid "Deleted notice %d"
 msgstr "Hír törlése"
 
 #. TRANS: Client error displayed when the parameter "status" is missing.
-#: actions/apistatusesupdate.php:221
 msgid "Client must provide a 'status' parameter with a value."
 msgstr ""
 
 #. TRANS: Client error displayed when the parameter "status" is missing.
 #. TRANS: %d is the maximum number of character for a notice.
-#: actions/apistatusesupdate.php:244 actions/newnotice.php:161
-#: lib/mailhandler.php:60
 #, fuzzy, php-format
 msgid "That's too long. Maximum notice size is %d character."
 msgid_plural "That's too long. Maximum notice size is %d characters."
@@ -1136,14 +868,12 @@ msgstr[0] "Az túl hosszú. Egy hír legfeljebb %d karakterből állhat."
 msgstr[1] "Az túl hosszú. Egy hír legfeljebb %d karakterből állhat."
 
 #. TRANS: Client error displayed when replying to a non-existing notice.
-#: actions/apistatusesupdate.php:284
 #, fuzzy
 msgid "Parent notice not found."
 msgstr "Az API-metódus nem található."
 
 #. TRANS: Client error displayed exceeding the maximum notice length.
 #. TRANS: %d is the maximum lenth for a notice.
-#: actions/apistatusesupdate.php:308 actions/newnotice.php:184
 #, fuzzy, php-format
 msgid "Maximum notice size is %d character, including attachment URL."
 msgid_plural "Maximum notice size is %d characters, including attachment URL."
@@ -1154,13 +884,11 @@ msgstr[1] ""
 
 #. TRANS: Client error displayed when requesting profiles of followers in an unsupported format.
 #. TRANS: Client error displayed when requesting IDs of followers in an unsupported format.
-#: actions/apisubscriptions.php:228 actions/apisubscriptions.php:258
 msgid "Unsupported format."
 msgstr "Nem támogatott formátum."
 
 #. TRANS: Title for timeline of most recent favourite notices by a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname.
-#: actions/apitimelinefavorites.php:108
 #, php-format
 msgid "%1$s / Favorites from %2$s"
 msgstr "%1$s / %2$s kedvencei"
@@ -1168,14 +896,12 @@ msgstr "%1$s / %2$s kedvencei"
 #. TRANS: Subtitle for timeline of most recent favourite notices by a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user's full name,
 #. TRANS: %3$s is a user nickname.
-#: actions/apitimelinefavorites.php:120
 #, php-format
 msgid "%1$s updates favorited by %2$s / %3$s."
 msgstr ""
 
 #. TRANS: Title for timeline of most recent mentions of a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname.
-#: actions/apitimelinementions.php:115
 #, php-format
 msgid "%1$s / Updates mentioning %2$s"
 msgstr ""
@@ -1183,48 +909,40 @@ msgstr ""
 #. TRANS: Subtitle for timeline of most recent mentions of a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname,
 #. TRANS: %3$s is a user's full name.
-#: actions/apitimelinementions.php:131
 #, php-format
 msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr ""
 
 #. TRANS: Title for site timeline. %s is the StatusNet sitename.
 #. TRANS: Public RSS feed title. %s is the StatusNet site name.
-#: actions/apitimelinepublic.php:193 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "%s közösségi története"
 
 #. TRANS: Subtitle for site timeline. %s is the StatusNet sitename.
-#: actions/apitimelinepublic.php:199
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "%s-frissítések mindenki számára!"
 
 #. TRANS: Server error displayed calling unimplemented API method for 'retweeted by me'.
-#: actions/apitimelineretweetedbyme.php:71
 msgid "Unimplemented."
 msgstr ""
 
 #. TRANS: Title for Atom feed "repeated to me". %s is the user nickname.
-#: actions/apitimelineretweetedtome.php:96
 #, php-format
 msgid "Repeated to %s"
 msgstr ""
 
-#: actions/apitimelineretweetedtome.php:98
 #, php-format
 msgid "%1$s notices that were to repeated to %2$s / %3$s."
 msgstr ""
 
 #. TRANS: Title of list of repeated notices of the logged in user.
 #. TRANS: %s is the nickname of the logged in user.
-#: actions/apitimelineretweetsofme.php:98
 #, php-format
 msgid "Repeats of %s"
 msgstr ""
 
-#: actions/apitimelineretweetsofme.php:104
 #, fuzzy, php-format
 msgid "%1$s notices that %2$s / %3$s has repeated."
 msgstr "%s (@%s) az általad küldött hírt hozzáadta a kedvenceihez"
@@ -1233,79 +951,64 @@ msgstr "%s (@%s) az általad küldött hírt hozzáadta a kedvenceihez"
 #. TRANS: %s is the tag.
 #. TRANS: Title for first page of notices with tags.
 #. TRANS: %s is the tag.
-#: actions/apitimelinetag.php:101 actions/tag.php:69
 #, php-format
 msgid "Notices tagged with %s"
 msgstr "Hírek %s címkével"
 
 #. TRANS: Subtitle for timeline with lastest notices with a given tag.
 #. TRANS: %1$s is the tag, $2$s is the StatusNet sitename.
-#: actions/apitimelinetag.php:105 actions/tagrss.php:65
 #, php-format
 msgid "Updates tagged with %1$s on %2$s!"
 msgstr ""
 
 #. TRANS: Client error displayed trying to add a notice to another user's timeline.
-#: actions/apitimelineuser.php:308
 #, fuzzy
 msgid "Only the user can add to their own timeline."
 msgstr "Csak a felhasználó láthatja a saját postaládáját."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:315
 msgid "Only accept AtomPub for Atom feeds."
 msgstr ""
 
 #. TRANS: Client error displayed attempting to post an empty API notice.
-#: actions/apitimelineuser.php:322
 msgid "Atom post must not be empty."
 msgstr ""
 
 #. TRANS: Client error displayed attempting to post an API that is not well-formed XML.
-#: actions/apitimelineuser.php:328
 msgid "Atom post must be well-formed XML."
 msgstr ""
 
 #. TRANS: Client error displayed when not using an Atom entry.
-#: actions/apitimelineuser.php:334 actions/atompubfavoritefeed.php:228
-#: actions/atompubmembershipfeed.php:230
-#: actions/atompubsubscriptionfeed.php:236
 msgid "Atom post must be an Atom entry."
 msgstr ""
 
 #. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
-#: actions/apitimelineuser.php:345
 msgid "Can only handle POST activities."
 msgstr ""
 
 #. TRANS: Client error displayed when using an unsupported activity object type.
 #. TRANS: %s is the unsupported activity object type.
-#: actions/apitimelineuser.php:356
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
 #. TRANS: %d is the notice ID (number).
-#: actions/apitimelineuser.php:390
 #, fuzzy, php-format
 msgid "No content for notice %d."
 msgstr "Keressünk a hírek tartalmában"
 
 #. TRANS: Client error displayed when using another format than AtomPub.
 #. TRANS: %s is the notice URI.
-#: actions/apitimelineuser.php:419
 #, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr ""
 
 #. TRANS: Server error for unfinished API method showTrends.
-#: actions/apitrends.php:85
 msgid "API method under construction."
 msgstr "Az API-metódus fejlesztés alatt áll."
 
 #. TRANS: Client error displayed when requesting user information for a non-existing user.
-#: actions/apiuserprofileimage.php:80 actions/apiusershow.php:94
 #, fuzzy
 msgid "User not found."
 msgstr "Az API-metódus nem található."
@@ -1313,102 +1016,84 @@ msgstr "Az API-metódus nem található."
 #. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
 #. TRANS: Client exception.
 #. TRANS: Client error displayed trying to subscribe to a non-existing profile.
-#: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
-#: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
-#: actions/subscribe.php:110
 msgid "No such profile."
 msgstr "Nincs ilyen profil."
 
 #. TRANS: Subtitle for Atom favorites feed.
 #. TRANS: %1$s is a user nickname, %2$s is the StatusNet sitename.
-#: actions/atompubfavoritefeed.php:147
 #, fuzzy, php-format
 msgid "Notices %1$s has favorited on %2$s"
 msgstr "Frissítések %1$s felhasználótól, és barátok a következő oldalon: %2$s!"
 
 #. TRANS: Client exception thrown when trying to set a favorite for another user.
 #. TRANS: Client exception thrown when trying to subscribe another user.
-#: actions/atompubfavoritefeed.php:217 actions/atompubsubscriptionfeed.php:225
 #, fuzzy
 msgid "Cannot add someone else's subscription."
 msgstr "Nem sikerült törölni a kedvencet."
 
 #. TRANS: Client exception thrown when trying use an incorrect activity verb for the Atom pub method.
-#: actions/atompubfavoritefeed.php:240
 #, fuzzy
 msgid "Can only handle favorite activities."
 msgstr "Keressünk a hírek tartalmában"
 
 #. TRANS: Client exception thrown when trying favorite an object that is not a notice.
-#: actions/atompubfavoritefeed.php:250 actions/atompubmembershipfeed.php:250
 #, fuzzy
 msgid "Can only fave notices."
 msgstr "Keressünk a hírek tartalmában"
 
 #. TRANS: Client exception thrown when trying favorite a notice without content.
-#: actions/atompubfavoritefeed.php:259
 #, fuzzy
 msgid "Unknown note."
 msgstr "Ismeretlen művelet"
 
 #. TRANS: Client exception thrown when trying favorite an already favorited notice.
-#: actions/atompubfavoritefeed.php:267
 #, fuzzy
 msgid "Already a favorite."
 msgstr "Hozzáadás a kedvencekhez"
 
 #. TRANS: Title for group membership feed.
 #. TRANS: %s is a username.
-#: actions/atompubmembershipfeed.php:144
 #, fuzzy, php-format
 msgid "%s group memberships"
 msgstr "%s csoport tagjai"
 
 #. TRANS: Subtitle for group membership feed.
 #. TRANS: %1$s is a username, %2$s is the StatusNet sitename.
-#: actions/atompubmembershipfeed.php:149
 #, php-format
 msgid "Groups %1$s is a member of on %2$s"
 msgstr ""
 
 #. TRANS: Client exception thrown when trying subscribe someone else to a group.
-#: actions/atompubmembershipfeed.php:219
 #, fuzzy
 msgid "Cannot add someone else's membership."
 msgstr "Nem sikerült törölni a kedvencet."
 
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#: actions/atompubmembershipfeed.php:242
 #, fuzzy
 msgid "Can only handle join activities."
 msgstr "Keressünk a hírek tartalmában"
 
 #. TRANS: Client exception thrown when trying to subscribe to a non-existing group.
-#: actions/atompubmembershipfeed.php:259
 #, fuzzy
 msgid "Unknown group."
 msgstr "Ismeretlen művelet"
 
 #. TRANS: Client exception thrown when trying to subscribe to an already subscribed group.
-#: actions/atompubmembershipfeed.php:267
 #, fuzzy
 msgid "Already a member."
 msgstr "Összes tag"
 
 #. TRANS: Client exception thrown when trying to subscribe to group while blocked from that group.
-#: actions/atompubmembershipfeed.php:275
 msgid "Blocked by admin."
 msgstr ""
 
 #. TRANS: Client exception thrown when referencing a non-existing favorite.
-#: actions/atompubshowfavorite.php:90
 #, fuzzy
 msgid "No such favorite."
 msgstr "Nincs ilyen fájl."
 
 #. TRANS: Client exception thrown when trying to remove a favorite notice of another user.
-#: actions/atompubshowfavorite.php:151
 #, fuzzy
 msgid "Cannot delete someone else's favorite."
 msgstr "Nem sikerült törölni a kedvencet."
@@ -1435,93 +1120,68 @@ msgstr "Nem sikerült törölni a kedvencet."
 #. TRANS: Client error displayed when trying to join a non-existing group.
 #. TRANS: Client error displayed when trying to leave a non-local group.
 #. TRANS: Client error displayed when trying to leave a non-existing group.
+#. TRANS: Client error displayed when providing an invalid group ID on the Make Admin page.
 #. 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.
 #. TRANS: Command exception text shown when a group is requested that does not exist.
 #. TRANS: Error text shown when trying to leave a group that does not exist.
-#: actions/atompubshowmembership.php:81 actions/blockedfromgroup.php:81
-#: actions/blockedfromgroup.php:89 actions/deletegroup.php:87
-#: actions/deletegroup.php:100 actions/editgroup.php:102
-#: actions/foafgroup.php:46 actions/foafgroup.php:65 actions/foafgroup.php:73
-#: actions/groupblock.php:89 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:101 actions/grouplogo.php:103
-#: actions/groupmembers.php:84 actions/groupmembers.php:92
-#: actions/grouprss.php:97 actions/grouprss.php:105
-#: actions/groupunblock.php:89 actions/joingroup.php:82
-#: actions/joingroup.php:95 actions/leavegroup.php:82
-#: actions/leavegroup.php:95 actions/makeadmin.php:86
-#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:392
 msgid "No such group."
 msgstr "Nincs ilyen csoport."
 
 #. TRANS: Client exception thrown when trying to show membership of a non-subscribed group
-#: actions/atompubshowmembership.php:91
 #, fuzzy
 msgid "Not a member."
 msgstr "Összes tag"
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
-#: actions/atompubshowmembership.php:150
 #, fuzzy
 msgid "Cannot delete someone else's membership."
 msgstr "Nem sikerült törölni a kedvencet."
 
 #. TRANS: Client exception thrown when trying to display a subscription for a non-existing profile ID.
 #. TRANS: %d is the non-existing profile ID number.
-#: actions/atompubshowsubscription.php:72
-#: actions/atompubshowsubscription.php:83
-#: actions/atompubsubscriptionfeed.php:74
 #, fuzzy, php-format
 msgid "No such profile id: %d."
 msgstr "Nincs ilyen profil."
 
 #. 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.
-#: actions/atompubshowsubscription.php:94
 #, fuzzy, php-format
 msgid "Profile %1$d not subscribed to profile %2$d."
 msgstr "Senkinek sem iratkoztál fel a híreire."
 
 #. TRANS: Client exception thrown when trying to delete a subscription of another user.
-#: actions/atompubshowsubscription.php:157
 #, fuzzy
 msgid "Cannot delete someone else's subscription."
 msgstr "Nem sikerült törölni a kedvencet."
 
 #. TRANS: Subtitle for Atom subscription feed.
 #. TRANS: %1$s is a user nickname, %s$s is the StatusNet sitename.
-#: actions/atompubsubscriptionfeed.php:153
 #, fuzzy, php-format
 msgid "People %1$s has subscribed to on %2$s"
 msgstr "Senkinek sem iratkoztál fel a híreire."
 
 #. TRANS: Client error displayed when not using the follow verb.
-#: actions/atompubsubscriptionfeed.php:248
 msgid "Can only handle Follow activities."
 msgstr ""
 
 #. TRANS: Client exception thrown when subscribing to an object that is not a person.
-#: actions/atompubsubscriptionfeed.php:256
 msgid "Can only follow people."
 msgstr ""
 
 #. TRANS: Client exception thrown when subscribing to a non-existing profile.
 #. TRANS: %s is the unknown profile ID.
-#: actions/atompubsubscriptionfeed.php:267
 #, fuzzy, php-format
 msgid "Unknown profile %s."
 msgstr "Ismeretlen fájltípus"
 
 #. TRANS: Client error displayed trying to subscribe to an already subscribed profile.
 #. TRANS: %s is the profile the user already has a subscription on.
-#: actions/atompubsubscriptionfeed.php:275
 #, fuzzy, php-format
 msgid "Already subscribed to %s."
 msgstr "Már feliratkoztál!"
 
 #. TRANS: Client error displayed trying to get a non-existing attachment.
-#: actions/attachment.php:73
 msgid "No such attachment."
 msgstr "Nincs ilyen csatolmány."
 
@@ -1533,31 +1193,23 @@ msgstr "Nincs ilyen csatolmány."
 #. TRANS: Client error displayed when trying to view group members without providing a group nickname.
 #. TRANS: Client error displayed when requesting a group RSS feed without providing a group nickname.
 #. TRANS: Client error displayed if no nickname argument was given requesting a group page.
-#: actions/avatarbynickname.php:60 actions/blockedfromgroup.php:73
-#: actions/editgroup.php:85 actions/groupdesignsettings.php:84
-#: actions/grouplogo.php:86 actions/groupmembers.php:76
-#: actions/grouprss.php:89 actions/showgroup.php:116
 msgid "No nickname."
 msgstr "Nincs becenév."
 
 #. TRANS: Client error displayed trying to get an avatar without providing an avatar size.
-#: actions/avatarbynickname.php:66
 msgid "No size."
 msgstr "Nincs méret."
 
 #. TRANS: Client error displayed trying to get an avatar providing an invalid avatar size.
-#: actions/avatarbynickname.php:72
 msgid "Invalid size."
 msgstr "Érvénytelen méret."
 
 #. TRANS: Title for avatar upload page.
-#: actions/avatarsettings.php:66 lib/settingsnav.php:82
 msgid "Avatar"
 msgstr "Avatar"
 
 #. TRANS: Instruction for avatar upload page.
 #. TRANS: %s is the maximum file size, for example "500b", "10kB" or "2MB".
-#: actions/avatarsettings.php:78
 #, php-format
 msgid "You can upload your personal avatar. The maximum file size is %s."
 msgstr "Feltöltheted a személyes avatarodat. A fájl maximális mérete %s lehet."
@@ -1566,17 +1218,12 @@ msgstr "Feltöltheted a személyes avatarodat. A fájl maximális mérete %s leh
 #. TRANS: Server error displayed coming across a request from a user without a profile.
 #. TRANS: Server error displayed when trying to authorise a remote subscription request
 #. TRANS: while the user has no profile.
-#: actions/avatarsettings.php:108 actions/avatarsettings.php:192
-#: actions/grouplogo.php:184 actions/remotesubscribe.php:190
-#: actions/userauthorization.php:75 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr ""
 
 #. TRANS: Avatar upload page form legend.
 #. TRANS: Avatar upload page crop form legend.
 #. TRANS: Legend for group logo settings fieldset.
-#: actions/avatarsettings.php:122 actions/avatarsettings.php:205
-#: actions/grouplogo.php:261
 msgid "Avatar settings"
 msgstr "Avatarbeállítások"
 
@@ -1584,8 +1231,6 @@ msgstr "Avatarbeállítások"
 #. TRANS: Header on avatar upload crop form for thumbnail of originally uploaded avatar (h2).
 #. TRANS: Uploaded original file in group logo form.
 #. TRANS: Header for originally uploaded file before a crop on the group logo page.
-#: actions/avatarsettings.php:131 actions/avatarsettings.php:214
-#: actions/grouplogo.php:207 actions/grouplogo.php:270
 msgid "Original"
 msgstr "Eredeti"
 
@@ -1593,14 +1238,11 @@ msgstr "Eredeti"
 #. TRANS: Header on avatar upload crop form for thumbnail of to be used rendition of uploaded avatar (h2).
 #. TRANS: Header for preview of to be displayed group logo.
 #. TRANS: Header for the cropped group logo on the group logo page.
-#: actions/avatarsettings.php:147 actions/avatarsettings.php:227
-#: actions/grouplogo.php:219 actions/grouplogo.php:283
 msgid "Preview"
 msgstr "Előnézet"
 
 #. TRANS: Button on avatar upload page to delete current avatar.
 #. TRANS: Button text for user account deletion.
-#: actions/avatarsettings.php:155 actions/deleteaccount.php:319
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Delete"
@@ -1608,70 +1250,58 @@ msgstr "Törlés"
 
 #. TRANS: Button on avatar upload page to upload an avatar.
 #. TRANS: Submit button to confirm upload of a user backup file for account restore.
-#: actions/avatarsettings.php:173 actions/restoreaccount.php:369
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Upload"
 msgstr "Feltöltés"
 
 #. TRANS: Button on avatar upload crop form to confirm a selected crop as avatar.
-#: actions/avatarsettings.php:243
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Crop"
 msgstr "Levágás"
 
 #. TRANS: Validation error on avatar upload form when no file was uploaded.
-#: actions/avatarsettings.php:318
 msgid "No file uploaded."
 msgstr "Nincs feltöltve fájl."
 
 #. TRANS: Avatar upload form instruction after uploading a file.
-#: actions/avatarsettings.php:345
 #, fuzzy
 msgid "Pick a square area of the image to be your avatar."
 msgstr "Válassz ki egy négyzet alakú területet a képből, ami az avatarod lesz"
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
 #. TRANS: Server error displayed trying to crop an uploaded group logo that is no longer present.
-#: actions/avatarsettings.php:360 actions/grouplogo.php:391
 msgid "Lost our file data."
 msgstr "Elvesztettük az adatainkat."
 
 #. TRANS: Success message for having updated a user avatar.
-#: actions/avatarsettings.php:384
 msgid "Avatar updated."
 msgstr "Avatar frissítve."
 
 #. TRANS: Error displayed on the avatar upload page if the avatar could not be updated for an unknown reason.
-#: actions/avatarsettings.php:388
 msgid "Failed updating avatar."
 msgstr "Nem sikerült felölteni az avatart."
 
 #. TRANS: Success message for deleting a user avatar.
-#: actions/avatarsettings.php:412
 msgid "Avatar deleted."
 msgstr "Avatar törölve."
 
 #. TRANS: Title for backup account page.
 #. TRANS: Option in profile settings to create a backup of the account of the currently logged in user.
-#: actions/backupaccount.php:61 actions/profilesettings.php:468
 msgid "Backup account"
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to backup an account while not logged in.
-#: actions/backupaccount.php:79
 #, fuzzy
 msgid "Only logged-in users can backup their account."
 msgstr "Csak a felhasználó láthatja a saját postaládáját."
 
 #. TRANS: Client exception thrown when trying to backup an account without having backup rights.
-#: actions/backupaccount.php:84
 msgid "You may not backup your account."
 msgstr ""
 
 #. TRANS: Information displayed on the backup account page.
-#: actions/backupaccount.php:227
 msgid ""
 "You can backup your account data in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format. This is an experimental feature and provides "
@@ -1681,31 +1311,26 @@ msgid ""
 msgstr ""
 
 #. TRANS: Submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:250
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Backup"
 msgstr "Háttér"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:254
 msgid "Backup your account."
 msgstr ""
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
-#: actions/block.php:68
 msgid "You already blocked that user."
 msgstr "Már blokkoltad azt a felhasználót."
 
 #. TRANS: Title for block user page.
 #. TRANS: Legend for block user form.
 #. TRANS: Fieldset legend for block user from group form.
-#: actions/block.php:106 actions/block.php:136 actions/groupblock.php:165
 msgid "Block user"
 msgstr "Felhasználó blokkolása"
 
 #. TRANS: Explanation of consequences when blocking a user on the block user page.
-#: actions/block.php:139
 msgid ""
 "Are you sure you want to block this user? Afterwards, they will be "
 "unsubscribed from you, unable to subscribe to you in the future, and you "
@@ -1718,15 +1343,11 @@ msgstr ""
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:154 actions/deleteapplication.php:157
-#: actions/deletegroup.php:220 actions/deletenotice.php:155
-#: actions/deleteuser.php:154 actions/groupblock.php:187
 msgctxt "BUTTON"
 msgid "No"
 msgstr "Nem"
 
 #. TRANS: Submit button title for 'No' when blocking a user.
-#: actions/block.php:158
 #, fuzzy
 msgid "Do not block this user."
 msgstr "Ne blokkoljuk ezt a felhasználót"
@@ -1737,50 +1358,40 @@ msgstr "Ne blokkoljuk ezt a felhasználót"
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:161 actions/deleteapplication.php:164
-#: actions/deletegroup.php:227 actions/deletenotice.php:162
-#: actions/deleteuser.php:161 actions/groupblock.php:194
 msgctxt "BUTTON"
 msgid "Yes"
 msgstr "Igen"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:165
 #, fuzzy
 msgid "Block this user."
 msgstr "Felhasználó blokkolása"
 
 #. TRANS: Server error displayed when blocking a user fails.
-#: actions/block.php:189
 msgid "Failed to save block information."
 msgstr "Nem sikerült elmenteni a blokkolási információkat."
 
 #. TRANS: Title for first page with list of users blocked from a group.
 #. TRANS: %s is a group nickname.
-#: actions/blockedfromgroup.php:101
 #, php-format
 msgid "%s blocked profiles"
 msgstr ""
 
 #. TRANS: Title for any but the first page with list of users blocked from a group.
 #. TRANS: %1$s is a group nickname, %2$d is a page number.
-#: actions/blockedfromgroup.php:106
 #, php-format
 msgid "%1$s blocked profiles, page %2$d"
 msgstr ""
 
 #. TRANS: Instructions for list of users blocked from a group.
-#: actions/blockedfromgroup.php:122
 msgid "A list of the users blocked from joining this group."
 msgstr "A csoportból blokkolt felhasználók listája"
 
 #. TRANS: Form legend for unblocking a user from a group.
-#: actions/blockedfromgroup.php:291
 msgid "Unblock user from group"
 msgstr "Oldjuk fel a felhasználó blokkolását a csoportban"
 
 #. TRANS: Button text for unblocking a user from a group.
-#: actions/blockedfromgroup.php:323
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Unblock"
@@ -1788,130 +1399,104 @@ msgstr "Blokk feloldása"
 
 #. TRANS: Tooltip for button for unblocking a user from a group.
 #. TRANS: Description of the form to unblock a user.
-#: actions/blockedfromgroup.php:327 lib/unblockform.php:78
 msgid "Unblock this user"
 msgstr "Ezen felhasználó blokkjának feloldása"
 
 #. TRANS: Title for mini-posting window loaded from bookmarklet.
 #. TRANS: %s is the StatusNet site name.
-#: actions/bookmarklet.php:51
 #, php-format
 msgid "Post to %s"
 msgstr "Küldés ide: %s"
 
 #. TRANS: Client error displayed when not providing a confirmation code in the contact address confirmation action.
-#: actions/confirmaddress.php:74
 msgid "No confirmation code."
 msgstr "Nincs megerősítő kód."
 
 #. TRANS: Client error displayed when providing a non-existing confirmation code in the contact address confirmation action.
-#: actions/confirmaddress.php:80
 msgid "Confirmation code not found."
 msgstr "A megerősítő kód nem található."
 
 #. TRANS: Client error displayed when not providing a confirmation code for another user in the contact address confirmation action.
-#: actions/confirmaddress.php:86
 msgid "That confirmation code is not for you!"
 msgstr "Ez a megerősítő kód nem hozzád tartozik!"
 
 #. TRANS: Server error for an unknown address type, which can be 'email', 'sms', or the name of an IM network (such as 'xmpp' or 'aim')
-#: actions/confirmaddress.php:94
-#, fuzzy, php-format
+#, php-format
 msgid "Unrecognized address type %s"
-msgstr "Nem támogatott üzenet-típus: %s"
+msgstr "Ismeretlen címtípus: %s"
 
 #. TRANS: Client error for an already confirmed email/jabber/sms address.
-#: actions/confirmaddress.php:103 actions/confirmaddress.php:136
 msgid "That address has already been confirmed."
 msgstr "Ez a cím már meg van erősítve."
 
-#: actions/confirmaddress.php:121 actions/imsettings.php:444
-#: actions/userdesignsettings.php:306
-#, fuzzy
 msgid "Couldn't update user."
 msgstr "Nem sikerült frissíteni a felhasználót."
 
-#: actions/confirmaddress.php:144
 #, fuzzy
 msgid "Couldn't update user im preferences."
 msgstr "Nem sikerült frissíteni a felhasználó rekordját."
 
-#: actions/confirmaddress.php:156
 #, fuzzy
 msgid "Couldn't insert user im preferences."
 msgstr "Nem sikerült a helyszín beállításait elmenteni."
 
 #. TRANS: Server error displayed when an address confirmation code deletion from the
 #. TRANS: database fails in the contact address confirmation action.
-#: actions/confirmaddress.php:169
 #, fuzzy
 msgid "Could not delete address confirmation."
 msgstr "Nem sikerült törölni az e-mail cím megerősítését."
 
 #. TRANS: Title for the contact address confirmation action.
-#: actions/confirmaddress.php:185
 msgid "Confirm address"
 msgstr "Cím ellenőrzése"
 
 #. TRANS: Success message for the contact address confirmation action.
 #. TRANS: %s can be 'email', 'jabber', or 'sms'.
-#: actions/confirmaddress.php:200
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "A(z) „%s” cím meg van erősítve a fiókodhoz."
 
 #. TRANS: Title for page with a conversion (multiple notices in context).
-#: actions/conversation.php:96
 msgid "Conversation"
 msgstr "Beszélgetés"
 
 #. TRANS: Header on conversation page. Hidden by default (h2).
 #. TRANS: Label for user statistics.
-#: actions/conversation.php:149 lib/noticelist.php:87
-#: lib/profileaction.php:246 lib/searchgroupnav.php:82
-#: lib/threadednoticelist.php:66
 msgid "Notices"
 msgstr "Hírek"
 
 #. TRANS: Client exception displayed trying to delete a user account while not logged in.
-#: actions/deleteaccount.php:71
 #, fuzzy
 msgid "Only logged-in users can delete their account."
 msgstr "Csak a felhasználó láthatja a saját postaládáját."
 
 #. TRANS: Client exception displayed trying to delete a user account without have the rights to do that.
-#: actions/deleteaccount.php:77
 #, fuzzy
 msgid "You cannot delete your account."
 msgstr "Nem törölhetsz felhasználókat."
 
 #. TRANS: Confirmation text for user deletion. The user has to type this exactly the same, including punctuation.
-#: actions/deleteaccount.php:160 actions/deleteaccount.php:297
 msgid "I am sure."
 msgstr ""
 
 #. TRANS: Notification for user about the text that must be input to be able to delete a user account.
 #. TRANS: %s is the text that needs to be input.
-#: actions/deleteaccount.php:164
 #, php-format
 msgid "You must write \"%s\" exactly in the box."
 msgstr ""
 
 #. TRANS: Confirmation that a user account has been deleted.
-#: actions/deleteaccount.php:206
 #, fuzzy
 msgid "Account deleted."
 msgstr "Avatar törölve."
 
 #. TRANS: Page title for page on which a user account can be deleted.
 #. TRANS: Option in profile settings to delete the account of the currently logged in user.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:476
 #, fuzzy
 msgid "Delete account"
 msgstr "Felhasználó törlése"
 
 #. TRANS: Form text for user deletion form.
-#: actions/deleteaccount.php:279
 msgid ""
 "This will <strong>permanently delete</strong> your account data from this "
 "server."
@@ -1919,7 +1504,6 @@ msgstr ""
 
 #. TRANS: Additional form text for user deletion form shown if a user has account backup rights.
 #. TRANS: %s is a URL to the backup page.
-#: actions/deleteaccount.php:285
 #, php-format
 msgid ""
 "You are strongly advised to <a href=\"%s\">back up your data</a> before "
@@ -1928,56 +1512,43 @@ msgstr ""
 
 #. TRANS: Field label for delete account confirmation entry.
 #. TRANS: Field label for password reset form where the password has to be typed again.
-#: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:262 actions/register.php:419
 msgid "Confirm"
 msgstr "Megerősítés"
 
 #. TRANS: Input title for the delete account field.
 #. TRANS: %s is the text that needs to be input.
-#: actions/deleteaccount.php:304
 #, fuzzy, php-format
 msgid "Enter \"%s\" to confirm that you want to delete your account."
 msgstr "Nem törölhetsz felhasználókat."
 
 #. TRANS: Button title for user account deletion.
-#: actions/deleteaccount.php:323
 #, fuzzy
 msgid "Permanently delete your account"
 msgstr "Nem törölhetsz felhasználókat."
 
 #. TRANS: Client error displayed trying to delete an application while not logged in.
-#: actions/deleteapplication.php:62
 msgid "You must be logged in to delete an application."
 msgstr ""
 
 #. TRANS: Client error displayed trying to delete an application that does not exist.
-#: actions/deleteapplication.php:71
 msgid "Application not found."
 msgstr ""
 
 #. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
-#: actions/deleteapplication.php:79 actions/editapplication.php:78
-#: actions/showapplication.php:90
 msgid "You are not the owner of this application."
 msgstr ""
 
 #. TRANS: Client error text when there is a problem with the session token.
-#: actions/deleteapplication.php:102 actions/editapplication.php:131
-#: actions/newapplication.php:112 actions/showapplication.php:113
-#: lib/action.php:1391
 msgid "There was a problem with your session token."
 msgstr ""
 
 #. TRANS: Title for delete application page.
 #. TRANS: Fieldset legend on delete application page.
-#: actions/deleteapplication.php:124 actions/deleteapplication.php:149
 msgid "Delete application"
 msgstr "Alkalmazás törlése"
 
 #. TRANS: Confirmation text on delete application page.
-#: actions/deleteapplication.php:152
 msgid ""
 "Are you sure you want to delete this application? This will clear all data "
 "about the application from the database, including all existing user "
@@ -1985,19 +1556,16 @@ msgid ""
 msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting an application.
-#: actions/deleteapplication.php:161
 #, fuzzy
 msgid "Do not delete this application."
 msgstr "Ne töröljük ezt a hírt"
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
-#: actions/deleteapplication.php:167
 #, fuzzy
 msgid "Delete this application."
 msgstr "Alkalmazás törlése"
 
 #. TRANS: Client error when trying to delete group while not logged in.
-#: actions/deletegroup.php:64
 #, fuzzy
 msgid "You must be logged in to delete a group."
 msgstr "Be kell jelentkezned hogy elhagyhass egy csoportot."
@@ -2005,40 +1573,33 @@ msgstr "Be kell jelentkezned hogy elhagyhass egy csoportot."
 #. TRANS: Client error when trying to delete a group without providing a nickname or ID for the group.
 #. TRANS: Client error displayed when trying to join a group without providing a group name or group ID.
 #. TRANS: Client error displayed when trying to leave a group without providing a group name or group ID.
-#: actions/deletegroup.php:94 actions/joingroup.php:89
-#: actions/leavegroup.php:89
 msgid "No nickname or ID."
 msgstr "Nincs nicknév vagy azonosító."
 
 #. TRANS: Client error when trying to delete a group without having the rights to delete it.
-#: actions/deletegroup.php:107
 #, fuzzy
 msgid "You are not allowed to delete this group."
 msgstr "Nem vagy tagja ennek a csoportnak."
 
 #. TRANS: Server error displayed if a group could not be deleted.
 #. TRANS: %s is the name of the group that could not be deleted.
-#: actions/deletegroup.php:150
 #, fuzzy, php-format
 msgid "Could not delete group %s."
 msgstr "Nem sikerült a csoport frissítése."
 
 #. TRANS: Message given after deleting a group.
 #. TRANS: %s is the deleted group's name.
-#: actions/deletegroup.php:159
 #, fuzzy, php-format
 msgid "Deleted group %s"
 msgstr "%1$s csatlakozott a(z) %2$s csoporthoz"
 
 #. TRANS: Title of delete group page.
 #. TRANS: Form legend for deleting a group.
-#: actions/deletegroup.php:176 actions/deletegroup.php:202
 #, fuzzy
 msgid "Delete group"
 msgstr "Felhasználó törlése"
 
 #. TRANS: Warning in form for deleleting a group.
-#: actions/deletegroup.php:206
 #, fuzzy
 msgid ""
 "Are you sure you want to delete this group? This will clear all data about "
@@ -2049,13 +1610,11 @@ msgstr ""
 "adatot törlünk az adatbázisból, biztonsági mentés nélkül."
 
 #. TRANS: Submit button title for 'No' when deleting a group.
-#: actions/deletegroup.php:224
 #, fuzzy
 msgid "Do not delete this group."
 msgstr "Ne töröljük ezt a hírt"
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
-#: actions/deletegroup.php:231
 #, fuzzy
 msgid "Delete this group."
 msgstr "Töröljük ezt a felhasználót"
@@ -2066,22 +1625,18 @@ msgstr "Töröljük ezt a felhasználót"
 #. TRANS: Client error displayed trying to block a user from a group while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying to log out when not logged in.
+#. TRANS: Client error displayed when trying to access the "make admin" page while not logged in.
+#. TRANS: Client error displayed trying to create a new direct message while not logged in.
+#. TRANS: Client error displayed trying to send a notice while not logged in.
+#. TRANS: Client error displayed trying to nudge a user without being logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
 #. TRANS: Client error displayed when trying to change user options while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
-#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:70
-#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
-#: actions/nudge.php:63 actions/pluginenable.php:97 actions/subedit.php:33
-#: actions/subscribe.php:98 actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:71 lib/profileformaction.php:63
-#: lib/settingsaction.php:72
 msgid "Not logged in."
 msgstr "Nem vagy bejelentkezve."
 
 #. TRANS: Instructions for deleting a notice.
-#: actions/deletenotice.php:110
 msgid ""
 "You are about to permanently delete a notice. Once this is done, it cannot "
 "be undone."
@@ -2089,51 +1644,42 @@ msgstr ""
 
 #. TRANS: Page title when deleting a notice.
 #. TRANS: Fieldset legend for the delete notice form.
-#: actions/deletenotice.php:117 actions/deletenotice.php:148
 msgid "Delete notice"
 msgstr "Hír törlése"
 
 #. TRANS: Message for the delete notice form.
-#: actions/deletenotice.php:152
 msgid "Are you sure you want to delete this notice?"
 msgstr "Biztosan törölni szeretnéd ezt a hírt?"
 
 #. TRANS: Submit button title for 'No' when deleting a notice.
-#: actions/deletenotice.php:159
 #, fuzzy
 msgid "Do not delete this notice."
 msgstr "Ne töröljük ezt a hírt"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:166
 #, fuzzy
 msgid "Delete this notice."
 msgstr "Töröljük ezt a hírt"
 
 #. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
-#: actions/deleteuser.php:66
 msgid "You cannot delete users."
 msgstr "Nem törölhetsz felhasználókat."
 
 #. TRANS: Client error displayed when trying to delete a non-local user.
-#: actions/deleteuser.php:74
 msgid "You can only delete local users."
 msgstr "Csak helyi felhasználókat tudsz törölni."
 
 #. TRANS: Title of delete user page.
-#: actions/deleteuser.php:110
 #, fuzzy
 msgctxt "TITLE"
 msgid "Delete user"
 msgstr "Felhasználó törlése"
 
 #. TRANS: Fieldset legend on delete user page.
-#: actions/deleteuser.php:134
 msgid "Delete user"
 msgstr "Felhasználó törlése"
 
 #. TRANS: Information text to request if a user is certain that the described action has to be performed.
-#: actions/deleteuser.php:138
 msgid ""
 "Are you sure you want to delete this user? This will clear all data about "
 "the user from the database, without a backup."
@@ -2142,101 +1688,82 @@ msgstr ""
 "adatot törlünk az adatbázisból, biztonsági mentés nélkül."
 
 #. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/deleteuser.php:158
 #, fuzzy
 msgid "Do not delete this user."
 msgstr "Ne töröljük ezt a hírt"
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
-#: actions/deleteuser.php:165
 #, fuzzy
 msgid "Delete this user."
 msgstr "Töröljük ezt a felhasználót"
 
 #. TRANS: Message used as title for design settings for the site.
-#: actions/designadminpanel.php:60 lib/settingsnav.php:97
 msgid "Design"
 msgstr "Megjelenés"
 
 #. TRANS: Instructions for design adminsitration panel.
-#: actions/designadminpanel.php:71
 msgid "Design settings for this StatusNet site"
 msgstr ""
 
 #. TRANS: Client error displayed when a logo URL does is not valid.
-#: actions/designadminpanel.php:327
 msgid "Invalid logo URL."
 msgstr "Érvénytelen logó URL."
 
 #. TRANS: Client error displayed when an SSL logo URL is invalid.
-#: actions/designadminpanel.php:333
 #, fuzzy
 msgid "Invalid SSL logo URL."
 msgstr "Érvénytelen logó URL."
 
 #. TRANS: Client error displayed when a theme is submitted through the form that is not in the theme list.
 #. TRANS: %s is the chosen unavailable theme.
-#: actions/designadminpanel.php:339
 #, php-format
 msgid "Theme not available: %s."
 msgstr ""
 
 #. TRANS: Fieldset legend for form to change logo.
-#: actions/designadminpanel.php:437
 msgid "Change logo"
 msgstr "Logó megváltoztatása"
 
 #. TRANS: Field label for StatusNet site logo.
-#: actions/designadminpanel.php:444
 msgid "Site logo"
 msgstr "Oldal logója"
 
 #. TRANS: Field label for SSL StatusNet site logo.
-#: actions/designadminpanel.php:452
 #, fuzzy
 msgid "SSL logo"
 msgstr "Oldal logója"
 
 #. TRANS: Fieldset legend for form change StatusNet site's theme.
-#: actions/designadminpanel.php:467
 msgid "Change theme"
 msgstr "Téma megváltoztatása"
 
 #. TRANS: Field label for dropdown to choose site theme.
-#: actions/designadminpanel.php:485
 msgid "Site theme"
 msgstr "Webhely-téma"
 
 #. TRANS: Title for field label for dropdown to choose site theme.
-#: actions/designadminpanel.php:487
 msgid "Theme for the site."
 msgstr "A webhely témája."
 
 #. TRANS: Field label for uploading a cutom theme.
-#: actions/designadminpanel.php:494
 msgid "Custom theme"
 msgstr ""
 
 #. TRANS: Form instructions for uploading a cutom StatusNet theme.
-#: actions/designadminpanel.php:499
 msgid "You can upload a custom StatusNet theme as a .ZIP archive."
 msgstr ""
 
 #. TRANS: Fieldset legend for theme background image.
-#: actions/designadminpanel.php:515
 msgid "Change background image"
 msgstr "Háttérkép megváltoztatása"
 
 #. TRANS: Field label for background image on theme designer page.
 #. TRANS: Field label for background color selector.
 #. TRANS: Label on profile design page for setting a profile page background colour.
-#: actions/designadminpanel.php:525 actions/designadminpanel.php:609
-#: lib/designform.php:238
 msgid "Background"
 msgstr "Háttér"
 
 #. TRANS: Form guide for background image upload form on theme designer page.
-#: actions/designadminpanel.php:531
 #, php-format
 msgid ""
 "You can upload a background image for the site. The maximum file size is %1"
@@ -2244,204 +1771,169 @@ msgid ""
 msgstr ""
 
 #. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:558
 msgid "On"
 msgstr "Be"
 
 #. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:575
 msgid "Off"
 msgstr "Ki"
 
 #. TRANS: Form guide for turning background image on or off on theme designer page.
 #. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
 #. TRANS: use of the uploaded profile image.
-#: actions/designadminpanel.php:577 lib/designform.php:214
 msgid "Turn background image on or off."
 msgstr "Háttérkép be- vagy kikapcsolása."
 
 #. TRANS: Checkbox label to title background image on theme designer page.
 #. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-#: actions/designadminpanel.php:583 lib/designform.php:220
 msgid "Tile background image"
 msgstr "Háttérkép csempézése"
 
 #. TRANS: Fieldset legend for theme colors.
-#: actions/designadminpanel.php:598
 #, fuzzy
 msgid "Change colors"
 msgstr "Színek megváltoztatása"
 
 #. TRANS: Field label for content color selector.
 #. TRANS: Label on profile design page for setting a profile page content colour.
-#: actions/designadminpanel.php:623 lib/designform.php:252
 msgid "Content"
 msgstr "Tartalom"
 
 #. TRANS: Field label for sidebar color selector.
 #. TRANS: Label on profile design page for setting a profile page sidebar colour.
-#: actions/designadminpanel.php:637 lib/designform.php:266
 msgid "Sidebar"
 msgstr "Oldalsáv"
 
 #. TRANS: Field label for text color selector.
 #. TRANS: Label on profile design page for setting a profile page text colour.
-#: actions/designadminpanel.php:651 lib/designform.php:280
 msgid "Text"
 msgstr "Szöveg"
 
 #. TRANS: Field label for link color selector.
 #. TRANS: Label on profile design page for setting a profile page links colour.
-#: actions/designadminpanel.php:665 lib/designform.php:294
 msgid "Links"
 msgstr "Hivatkozások"
 
 #. TRANS: Fieldset legend for advanced theme design settings.
-#: actions/designadminpanel.php:691
 msgid "Advanced"
 msgstr ""
 
 #. TRANS: Field label for custom CSS.
-#: actions/designadminpanel.php:696
 msgid "Custom CSS"
 msgstr ""
 
 #. TRANS: Button text for resetting theme settings.
-#: actions/designadminpanel.php:718
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Use defaults"
 msgstr "Alapértelmezések használata"
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:720
 #, fuzzy
 msgid "Restore default designs."
 msgstr "Alapértelmezések használata"
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:728
 #, fuzzy
 msgid "Reset back to default."
 msgstr "Visszaállítás az alapértelmezettre"
 
 #. TRANS: Title for button for saving theme settings.
-#: actions/designadminpanel.php:736
 #, fuzzy
 msgid "Save design."
 msgstr "Design mentése"
 
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
-#: actions/disfavor.php:83
 msgid "This notice is not a favorite!"
 msgstr "Ez a hír nincs a kedvenceid között!"
 
 #. TRANS: Title for page on which favorites can be added.
-#: actions/disfavor.php:98
 msgid "Add to favorites"
 msgstr "Hozzáadás a kedvencekhez"
 
 #. TRANS: Client exception thrown when requesting a document from the documentation that does not exist.
 #. TRANS: %s is the non-existing document.
-#: actions/doc.php:155
 #, fuzzy, php-format
 msgid "No such document \"%s\"."
 msgstr "Nincs ilyen dokumentum: „%s”"
 
 #. TRANS: Title for "Edit application" form.
 #. TRANS: Form legend.
-#: actions/editapplication.php:54 lib/applicationeditform.php:129
 msgid "Edit application"
 msgstr ""
 
 #. TRANS: Client error displayed trying to edit an application while not logged in.
-#: actions/editapplication.php:66
 msgid "You must be logged in to edit an application."
 msgstr ""
 
 #. TRANS: Client error displayed trying to edit an application that does not exist.
-#: actions/editapplication.php:83 actions/showapplication.php:83
 msgid "No such application."
 msgstr "Nincs ilyen alkalmazás."
 
 #. TRANS: Instructions for "Edit application" form.
-#: actions/editapplication.php:167
 msgid "Use this form to edit your application."
 msgstr ""
 
 #. TRANS: Validation error shown when not providing a name in the "Edit application" form.
 #. TRANS: Validation error shown when not providing a name in the "New application" form.
-#: actions/editapplication.php:184 actions/newapplication.php:164
 msgid "Name is required."
 msgstr "A név szükséges."
 
 #. TRANS: Validation error shown when providing too long a name in the "Edit application" form.
 #. TRANS: Validation error shown when providing too long a name in the "New application" form.
-#: actions/editapplication.php:188 actions/newapplication.php:172
 #, fuzzy
 msgid "Name is too long (maximum 255 characters)."
 msgstr "A név túl hosszú (max 255 karakter lehet)."
 
 #. TRANS: Validation error shown when providing a name for an application that already exists in the "Edit application" form.
 #. TRANS: Validation error shown when providing a name for an application that already exists in the "New application" form.
-#: actions/editapplication.php:192 actions/newapplication.php:168
 msgid "Name already in use. Try another one."
 msgstr "A név már foglalt. Próbálj egy másikat."
 
 #. TRANS: Validation error shown when not providing a description in the "Edit application" form.
 #. TRANS: Validation error shown when not providing a description in the "New application" form.
-#: actions/editapplication.php:196 actions/newapplication.php:176
 msgid "Description is required."
 msgstr "A leírás megadása kötelező."
 
 #. TRANS: Validation error shown when providing too long a source URL in the "Edit application" form.
-#: actions/editapplication.php:209
 msgid "Source URL is too long."
 msgstr "A forrás URL túl hosszú."
 
 #. TRANS: Validation error shown when providing an invalid source URL in the "Edit application" form.
 #. TRANS: Validation error shown when providing an invalid source URL in the "New application" form.
-#: actions/editapplication.php:216 actions/newapplication.php:199
 msgid "Source URL is not valid."
 msgstr "A forrás URL nem érvényes."
 
 #. 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.
-#: actions/editapplication.php:220 actions/newapplication.php:203
 msgid "Organization is required."
 msgstr "A szervezet szükséges."
 
 #. TRANS: Validation error shown when providing too long an arganisation name in the "Edit application" form.
-#: actions/editapplication.php:224 actions/newapplication.php:207
 #, fuzzy
 msgid "Organization is too long (maximum 255 characters)."
 msgstr "A szervezet túl hosszú (255 karakter lehet)."
 
 #. TRANS: Form validation error show when an organisation name has not been provided in the edit application form.
 #. TRANS: Form validation error show when an organisation name has not been provided in the new application form.
-#: actions/editapplication.php:228 actions/newapplication.php:211
 msgid "Organization homepage is required."
 msgstr "Szükséges a szervezet honlapja."
 
 #. TRANS: Validation error shown when providing too long a callback URL in the "Edit application" form.
 #. TRANS: Validation error shown when providing too long a callback URL in the "New application" form.
-#: actions/editapplication.php:239 actions/newapplication.php:225
 msgid "Callback is too long."
 msgstr ""
 
 #. TRANS: Validation error shown when providing an invalid callback URL in the "Edit application" form.
 #. TRANS: Validation error shown when providing an invalid callback URL in the "New application" form.
-#: actions/editapplication.php:247 actions/newapplication.php:235
 msgid "Callback URL is not valid."
 msgstr ""
 
 #. TRANS: Server error occuring when an application could not be updated from the "Edit application" form.
-#: actions/editapplication.php:284
 msgid "Could not update application."
 msgstr ""
 
 #. TRANS: Title for form to edit a group. %s is a group nickname.
-#: actions/editgroup.php:55
 #, php-format
 msgid "Edit %s group"
 msgstr "%s csoport szerkesztése"
@@ -2449,40 +1941,40 @@ msgstr "%s csoport szerkesztése"
 #. TRANS: Client error displayed trying to edit a group while not logged in.
 #. TRANS: Client error displayed when trying to create a group while not logged in.
 #. TRANS: Client error displayed trying to create a group while not logged in.
-#: actions/editgroup.php:68 actions/grouplogo.php:69 actions/newgroup.php:65
 msgid "You must be logged in to create a group."
 msgstr "Csoport létrehozásához be kell jelentkezned."
 
 #. TRANS: Form instructions for group edit form.
-#: actions/editgroup.php:161
 msgid "Use this form to edit the group."
 msgstr "Ezen űrlap segítségével szerkesztheted a csoportot."
 
+#. TRANS: Group edit form validation error.
+#. TRANS: Group create form validation error.
+#. TRANS: %s is the invalid alias.
+#, php-format
+msgid "Invalid alias: \"%s\""
+msgstr "Érvénytelen álnév: „%s”"
+
 #. TRANS: Group edit form success message.
-#: actions/editgroup.php:301
 msgid "Options saved."
 msgstr "Beállítások elmentve."
 
 #. TRANS: Title for e-mail settings.
-#: actions/emailsettings.php:60
 msgid "Email settings"
 msgstr "Email beállítások"
 
 #. TRANS: E-mail settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/emailsettings.php:74
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 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.
-#: actions/emailsettings.php:104 actions/emailsettings.php:130
 msgid "Email address"
 msgstr "Email-cím"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:110
 msgid "Current confirmed email address."
 msgstr "A jelenleg megerősített e-mail cím."
 
@@ -2491,15 +1983,11 @@ msgstr "A jelenleg megerősített e-mail cím."
 #. TRANS: Button label to remove a confirmed IM address.
 #. TRANS: Button label to remove a confirmed SMS address.
 #. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
-#: actions/emailsettings.php:113 actions/emailsettings.php:180
-#: actions/imsettings.php:119 actions/smssettings.php:119
-#: actions/smssettings.php:175
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Eltávolítás"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:120
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -2513,44 +2001,36 @@ msgstr ""
 #. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
 #. TRANS: Any other domain may be owned by a legitimate person or
 #. TRANS: organization.
-#: actions/emailsettings.php:137
 msgid "Email address, like \"UserName@example.org\""
 msgstr "E-mail cím, például „FelhasználóNév@example.org”"
 
 #. TRANS: Button label for adding an e-mail address in e-mail settings form.
 #. TRANS: Button label for adding an IM address in IM settings form.
 #. TRANS: Button label for adding a SMS phone number in SMS settings form.
-#: actions/emailsettings.php:141 actions/imsettings.php:147
-#: actions/smssettings.php:157
 msgctxt "BUTTON"
 msgid "Add"
 msgstr "Hozzáadás"
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:149 actions/smssettings.php:166
 msgid "Incoming email"
 msgstr "Bejövő email"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:155
 msgid "I want to post notices by email."
 msgstr "Szeretnék email segítségével közzétenni."
 
 #. TRANS: Form instructions for incoming e-mail form in e-mail settings.
 #. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
-#: actions/emailsettings.php:177 actions/smssettings.php:173
 msgid "Send email to this address to post new notices."
 msgstr "Erre a címre küldj emailt új hír közzétételéhez."
 
 #. TRANS: Instructions for incoming e-mail address input form, when an address has already been assigned.
 #. TRANS: Instructions for incoming SMS e-mail address input form.
-#: actions/emailsettings.php:186 actions/smssettings.php:181
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr ""
 
 #. TRANS: Instructions for incoming e-mail address input form.
-#: actions/emailsettings.php:190
 msgid ""
 "To send notices via email, we need to create a unique email address for you "
 "on this server:"
@@ -2558,91 +2038,73 @@ msgstr ""
 
 #. TRANS: Button label for adding an e-mail address to send notices from.
 #. TRANS: Button label for adding an SMS e-mail address to send notices from.
-#: actions/emailsettings.php:196 actions/smssettings.php:184
 msgctxt "BUTTON"
 msgid "New"
 msgstr "Új"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:205
 msgid "Email preferences"
 msgstr "E-mail beállítások"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:213
 msgid "Send me notices of new subscriptions through email."
 msgstr "Kapjak email-t, ha valaki feliratkozott a híreimre."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:219
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr ""
 "Kapjak emailt róla, ha valaki kedvenceként jelöl meg egy általam küldött "
 "hírt."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:226
 msgid "Send me email when someone sends me a private message."
 msgstr "Kapjak emailt róla, ha valaki privát üzenetet küld nekem."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:232
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr "Kapjak emailt róla, ha valaki \"@-választ\" küld nekem."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:238
 msgid "Allow friends to nudge me and send me an email."
 msgstr "Megengedem a barátaimnak, hogy megbökjenek és emailt küldjenek nekem."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:244
 msgid "Publish a MicroID for my email address."
 msgstr "MicroID közzététele az e-mail címemhez."
 
 #. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:362
 msgid "Email preferences saved."
 msgstr "E-mail beállítások elmentve."
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:381
 msgid "No email address."
 msgstr "Nincs e-mail cím."
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:389
 #, fuzzy
 msgid "Cannot normalize that email address."
 msgstr "Nem sikerült normalizálni az e-mail címet"
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:394 actions/register.php:197
-#: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "Érvénytelen email cím."
 
 #. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:398
 msgid "That is already your email address."
 msgstr "Jelenleg is ez az e-mail címed."
 
 #. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:402
 msgid "That email address already belongs to another user."
 msgstr "Ez az e-mail cím egy másik felhasználóhoz tartozik."
 
 #. TRANS: Server error thrown on database error adding e-mail confirmation code.
 #. TRANS: Server error thrown on database error adding Instant Messaging confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:419 actions/imsettings.php:362
-#: actions/smssettings.php:364
 #, fuzzy
 msgid "Could not insert confirmation code."
 msgstr "Nem sikerült beilleszteni a megerősítő kódot."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:426
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
@@ -2654,104 +2116,84 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling Instant Messaging address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:446 actions/imsettings.php:391
-#: actions/smssettings.php:398
 msgid "No pending confirmation to cancel."
 msgstr "Nincs várakozó megerősítés, amit vissza lehetne vonni."
 
 #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:451
 msgid "That is the wrong email address."
 msgstr ""
 
 #. TRANS: Server error thrown on database error canceling e-mail address confirmation.
 #. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
-#: actions/emailsettings.php:460 actions/smssettings.php:412
 #, fuzzy
 msgid "Could not delete email confirmation."
 msgstr "Nem sikerült törölni az e-mail cím megerősítését."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:465
 msgid "Email confirmation cancelled."
 msgstr ""
 
 #. TRANS: Message given trying to remove an e-mail address that is not
 #. TRANS: registered for the active user.
-#: actions/emailsettings.php:484
 msgid "That is not your email address."
 msgstr "Ez nem a te e-mail címed."
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:505
 msgid "The email address was removed."
 msgstr ""
 
 #. TRANS: Form validation error displayed when trying to remove an incoming e-mail address while no address has been set.
-#: actions/emailsettings.php:519 actions/smssettings.php:554
 msgid "No incoming email address."
 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.
-#: actions/emailsettings.php:531 actions/emailsettings.php:555
-#: actions/smssettings.php:565 actions/smssettings.php:590
 #, fuzzy
 msgid "Could not update user record."
 msgstr "Nem sikerült frissíteni a felhasználó rekordját."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
 #. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:535 actions/smssettings.php:569
 msgid "Incoming email address removed."
 msgstr "A bejövő email címet eltávolítottuk."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
 #. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:559 actions/smssettings.php:594
 msgid "New incoming email address added."
 msgstr "Új bejövő e-mail cím hozzáadva."
 
 #. TRANS: Client error displayed when trying to mark a notice as favorite that already is a favorite.
-#: actions/favor.php:80
 msgid "This notice is already a favorite!"
 msgstr "Ez a hír már a kedvenceid között van!"
 
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
-#: actions/favor.php:95
 #, fuzzy
 msgid "Disfavor favorite."
 msgstr "Kedvenc eltávolítása"
 
 #. TRANS: Page title for first page of favorited notices.
 #. TRANS: Title for favourited notices section.
-#: actions/favorited.php:65 lib/popularnoticesection.php:62
-#: lib/publicgroupnav.php:93
 msgid "Popular notices"
 msgstr "Népszerű hírek"
 
 #. TRANS: Page title for all but first page of favorited notices.
 #. TRANS: %d is the page number being displayed.
-#: actions/favorited.php:69
 #, php-format
 msgid "Popular notices, page %d"
 msgstr "Népszerű hírek, %d oldal"
 
 #. TRANS: Description on page displaying favorited notices.
-#: actions/favorited.php:81
 msgid "The most popular notices on the site right now."
 msgstr "Most épp a webhely legnépszerűbb hírei"
 
 #. TRANS: Text displayed instead of a list when a site does not yet have any favourited notices.
-#: actions/favorited.php:149
 msgid "Favorite notices appear on this page but no one has favorited one yet."
 msgstr ""
 "Ezen az oldalon kedvencnek jelölt hírek jelennek meg, de még egyet sem tett "
 "senki a kedvencévé."
 
 #. TRANS: Additional text displayed instead of a list when a site does not yet have any favourited notices for logged in users.
-#: actions/favorited.php:153
 msgid ""
 "Be the first to add a notice to your favorites by clicking the fave button "
 "next to any notice you like."
@@ -2759,7 +2201,6 @@ msgstr ""
 
 #. TRANS: Additional text displayed instead of a list when a site does not yet have any favourited notices for not logged in users.
 #. TRANS: %%action.register%% is a registration link. "[link text](link)" is Mark Down. Do not change the formatting.
-#: actions/favorited.php:158
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to add a "
@@ -2770,181 +2211,146 @@ msgstr ""
 #. TRANS: %s is a user's nickname.
 #. TRANS: Title for first page of favourite notices of a user.
 #. TRANS: %s is the user for whom the favourite notices are displayed.
-#: actions/favoritesrss.php:111 actions/showfavorites.php:76
-#: lib/personalgroupnav.php:110
 #, php-format
 msgid "%s's favorite notices"
 msgstr "%s kedvenc hírei"
 
 #. TRANS: Desciption of RSS feed with favourite notices of a user.
 #. TRANS: %1$s is a user's nickname, %2$s is the name of the StatusNet site.
-#: actions/favoritesrss.php:117
 #, php-format
 msgid "Updates favored by %1$s on %2$s!"
 msgstr ""
 
 #. TRANS: Page title for first page of featured users.
 #. TRANS: Title for featured users section.
-#: actions/featured.php:69 lib/featureduserssection.php:87
-#: lib/publicgroupnav.php:89
 msgid "Featured users"
 msgstr "Kiemelt felhasználók"
 
 #. TRANS: Page title for all but first page of featured users.
 #. TRANS: %d is the page number being displayed.
-#: actions/featured.php:73
 #, php-format
 msgid "Featured users, page %d"
 msgstr "Kiemelt felhasználók, %d. oldal"
 
 #. TRANS: Description on page displaying featured users.
-#: actions/featured.php:102
 #, php-format
 msgid "A selection of some great users on %s."
 msgstr ""
 
 #. TRANS: Client error displayed when no notice ID was given trying do display a file.
-#: actions/file.php:36
 msgid "No notice ID."
 msgstr "Nincs hír-ID."
 
 #. TRANS: Client error displayed when an invalid notice ID was given trying do display a file.
-#: actions/file.php:41
 msgid "No notice."
 msgstr "Nincs hír."
 
 #. TRANS: Client error displayed when trying do display a file for a notice without a file attachement.
-#: actions/file.php:46
 msgid "No attachments."
 msgstr "Nincs melléklet."
 
 #. TRANS: Client error displayed when trying do display a file for a notice with file attachements
 #. TRANS: that could not be found.
-#: actions/file.php:58
 msgid "No uploaded attachments."
 msgstr "Nincs feltöltött melléklet."
 
 #. TRANS: Client error displayed when subscribing to a remote profile and an unexpected response is received.
-#: actions/finishremotesubscribe.php:69
 msgid "Not expecting this response!"
 msgstr "Nem várt válasz!"
 
 #. TRANS: Client error displayed when subscribing to a remote profile that does not exist.
-#: actions/finishremotesubscribe.php:81
 msgid "User being listened to does not exist."
 msgstr "A felhasználó akire figyelsz nem létezik."
 
 #. TRANS: Client error displayed when subscribing to a remote profile that is a local profile.
-#: actions/finishremotesubscribe.php:89 actions/remotesubscribe.php:58
 msgid "You can use the local subscription!"
 msgstr "Figyelemmel követheted helyben!"
 
 #. TRANS: Client error displayed when subscribing to a remote profile that is blocked form subscribing to.
-#: actions/finishremotesubscribe.php:102
 msgid "That user has blocked you from subscribing."
 msgstr "Az a felhasználó blokkolta hogy figyelemmel kövesd."
 
 #. TRANS: Client error displayed when subscribing to a remote profile without providing an authorised token.
-#: actions/finishremotesubscribe.php:114
 msgid "You are not authorized."
 msgstr "Nincs jogosultságod."
 
 #. TRANS: Client error displayed when subscribing to a remote profile and conversion of the request token to access token fails.
-#: actions/finishremotesubscribe.php:118
 msgid "Could not convert request token to access token."
 msgstr ""
 
 #. TRANS: Client error displayed when subscribing to a remote profile fails because of an unsupported version of the OMB protocol.
-#: actions/finishremotesubscribe.php:124
 msgid "Remote service uses unknown version of OMB protocol."
 msgstr ""
 
 #. TRANS: Server error displayed when subscribing to a remote profile fails because the remote profile could not be updated.
-#: actions/finishremotesubscribe.php:145 lib/oauthstore.php:317
 msgid "Error updating remote profile."
 msgstr "Nem sikerült frissíteni a távoli profilt."
 
 #. TRANS: Client error displayed when requesting a non-existent file.
-#: actions/getfile.php:77
 msgid "No such file."
 msgstr "Nincs ilyen fájl."
 
 #. TRANS: Client error displayed when requesting a file without having read access to it.
-#: actions/getfile.php:82
 msgid "Cannot read file."
 msgstr "A fájl nem olvasható."
 
 #. TRANS: Client error displayed when trying to assign an invalid role to a user.
-#: actions/grantrole.php:61 actions/revokerole.php:62
 msgid "Invalid role."
 msgstr "Érvénytelen szerep."
 
 #. TRANS: Client error displayed when trying to assign an reserved role to a user.
-#: actions/grantrole.php:66 actions/revokerole.php:66
 msgid "This role is reserved and cannot be set."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to assign a role to a user while not being allowed to set roles.
-#: actions/grantrole.php:76
 msgid "You cannot grant user roles on this site."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to assign a role to a user that already has that role.
-#: actions/grantrole.php:84
 msgid "User already has this role."
 msgstr "A felhasználónak már van ilyen szerepe."
 
 #. TRANS: Client error displayed trying to block a user from a group while not specifying a to be blocked user profile.
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing a profile.
+#. TRANS: Client error displayed when not providing a profile ID on the Make Admin page.
 #. TRANS: Client error displayed trying a change a subscription without providing a profile.
 #. TRANS: Client error displayed when trying to change user options without specifying a user to work on.
-#: actions/groupblock.php:71 actions/groupunblock.php:71
-#: actions/makeadmin.php:71 actions/subedit.php:49
-#: lib/profileformaction.php:79
 msgid "No profile specified."
 msgstr "Nincs profil megadva."
 
 #. TRANS: Client error displayed trying to block a user from a group while specifying a non-existing profile.
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing an existing profile.
+#. TRANS: Client error displayed when specifying an invalid profile ID on the Make Admin page.
 #. TRANS: Client error displayed trying a change a subscription for a non-existant profile ID.
 #. TRANS: Client error displayed when trying to change user options without specifying an existing user to work on.
-#: actions/groupblock.php:77 actions/groupunblock.php:77
-#: actions/makeadmin.php:76 actions/subedit.php:57 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:87
 msgid "No profile with that ID."
 msgstr "Nincs ilyen azonosítóval rendelkező profil."
 
 #. TRANS: Client error displayed trying to block a user from a group while not specifying a group to block a profile from.
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing a group.
-#: actions/groupblock.php:83 actions/groupunblock.php:83
-#: actions/makeadmin.php:81
+#. TRANS: Client error displayed when not providing a group ID on the Make Admin page.
 msgid "No group specified."
 msgstr "Nincs csoport megadva."
 
 #. TRANS: Client error displayed trying to block a user from a group while not being an admin user.
-#: actions/groupblock.php:95
 msgid "Only an admin can block group members."
 msgstr "Csak az adminisztrátor blokkolhat csoporttagokat."
 
 #. TRANS: Client error displayed trying to block a user from a group while user is already blocked from the given group.
-#: actions/groupblock.php:100
 msgid "User is already blocked from group."
 msgstr "Ez a felhasználó már blokkolva van a csoportból."
 
 #. TRANS: Client error displayed trying to block a user from a group while user is not a member of given group.
-#: actions/groupblock.php:106
 msgid "User is not a member of group."
 msgstr "Ez a felhasználó nem a csoport tagja."
 
 #. TRANS: Title for block user from group page.
 #. TRANS: Form legend for form to block user from a group.
-#: actions/groupblock.php:141 actions/groupmembers.php:364
 msgid "Block user from group"
 msgstr "Felhasználó blokkolása a csoportból"
 
 #. TRANS: Explanatory text for block user from group form before setting the block.
 #. TRANS: %1$s is that to be blocked user, %2$s is the group the user will be blocked from.
-#: actions/groupblock.php:169
 #, php-format
 msgid ""
 "Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They "
@@ -2956,157 +2362,130 @@ msgstr ""
 "híreket, és nem tudják majd figyelemmel követni a csoportot a jövőben."
 
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
-#: actions/groupblock.php:191
 #, fuzzy
 msgid "Do not block this user from this group."
 msgstr "Ne blokkoljuk ezt a felhasználót ebből a csoportból"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
-#: actions/groupblock.php:198
 #, fuzzy
 msgid "Block this user from this group."
 msgstr "Felhasználó blokkolása a csoportból"
 
 #. TRANS: Server error displayed when trying to block a user from a group fails because of an application error.
-#: actions/groupblock.php:215
 msgid "Database error blocking user from group."
 msgstr ""
 "Adatbázishiba történt a felhasználó csoportból történő blokkolása során."
 
 #. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
 #. TRANS: Client error displayed trying to find a user by ID without providing an ID.
-#: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr "Nincs ID."
 
 #. TRANS: Client error displayed trying to change group design settings while not logged in.
-#: actions/groupdesignsettings.php:67
 msgid "You must be logged in to edit a group."
 msgstr "Csoport szerkesztéséhez be kell jelentkezned."
 
 #. TRANS: Title group design settings page.
-#: actions/groupdesignsettings.php:146
 msgid "Group design"
 msgstr "A csoport megjelenése"
 
 #. TRANS: Instructions for group design settings page.
-#: actions/groupdesignsettings.php:157
 msgid ""
 "Customize the way your group looks with a background image and a colour "
 "palette of your choice."
 msgstr ""
 
 #. TRANS: Form validation error displayed when group design settings could not be updated because of an application issue.
-#: actions/groupdesignsettings.php:262
 #, fuzzy
 msgid "Unable to update your design settings."
 msgstr "Nem sikerült elmenteni a megjelenítési beállításaid."
 
 #. TRANS: Form text to confirm saved group design settings.
-#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:239
 msgid "Design preferences saved."
 msgstr "Design beállítások elmentve."
 
 #. TRANS: Title for group logo settings page.
 #. TRANS: Group logo form legend.
-#: actions/grouplogo.php:144 actions/grouplogo.php:199
 msgid "Group logo"
 msgstr "Csoport logója"
 
 #. TRANS: Instructions for group logo page.
 #. TRANS: %s is the maximum file size for that site.
-#: actions/grouplogo.php:156
 #, php-format
 msgid ""
 "You can upload a logo image for your group. The maximum file size is %s."
 msgstr ""
 
 #. TRANS: Submit button for uploading a group logo.
-#: actions/grouplogo.php:243
 msgid "Upload"
 msgstr "Feltöltés"
 
 #. TRANS: Button text for cropping an uploaded group logo.
-#: actions/grouplogo.php:299
 msgid "Crop"
 msgstr "Levágás"
 
 #. TRANS: Form instructions on the group logo page.
-#: actions/grouplogo.php:376
 msgid "Pick a square area of the image to be the logo."
 msgstr ""
 
 #. TRANS: Form success message after updating a group logo.
-#: actions/grouplogo.php:411
 msgid "Logo updated."
 msgstr "Logó frissítve."
 
 #. TRANS: Form failure message after failing to update a group logo.
-#: actions/grouplogo.php:414
 msgid "Failed updating logo."
 msgstr "Nem sikerült a logó feltöltése."
 
 #. TRANS: Title of the page showing group members.
 #. TRANS: %s is the name of the group.
-#: actions/groupmembers.php:104
 #, php-format
 msgid "%s group members"
 msgstr "%s csoport tagjai"
 
 #. TRANS: Title of the page showing group members.
 #. TRANS: %1$s is the name of the group, %2$d is the page number of the members list.
-#: actions/groupmembers.php:109
 #, php-format
 msgid "%1$s group members, page %2$d"
 msgstr ""
 
 #. TRANS: Page notice for group members page.
-#: actions/groupmembers.php:125
 msgid "A list of the users in this group."
 msgstr "A csoportban lévő felhasználók listája."
 
 #. TRANS: Indicator in group members list that this user is a group administrator.
-#: actions/groupmembers.php:190 lib/action.php:581
 msgid "Admin"
 msgstr "Adminisztrátor"
 
 #. TRANS: Button text for the form that will block a user from a group.
-#: actions/groupmembers.php:397
 msgctxt "BUTTON"
 msgid "Block"
 msgstr ""
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:401
 msgctxt "TOOLTIP"
 msgid "Block this user"
 msgstr ""
 
 #. TRANS: Form legend for form to make a user a group admin.
-#: actions/groupmembers.php:488
 msgid "Make user an admin of the group"
 msgstr "A felhasználó legyen a csoport kezelője"
 
 #. TRANS: Button text for the form that will make a user administrator.
-#: actions/groupmembers.php:521
 msgctxt "BUTTON"
 msgid "Make Admin"
 msgstr ""
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:525
 msgctxt "TOOLTIP"
 msgid "Make this user an admin"
 msgstr ""
 
 #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
-#: actions/grouprss.php:141
 #, php-format
 msgid "Updates from members of %1$s on %2$s!"
 msgstr ""
 
 #. TRANS: Title for first page of the groups list.
-#: actions/groups.php:62
 #, fuzzy
 msgctxt "TITLE"
 msgid "Groups"
@@ -3114,7 +2493,6 @@ msgstr "Csoportok"
 
 #. TRANS: Title for all but the first page of the groups list.
 #. TRANS: %d is the page number.
-#: actions/groups.php:66
 #, fuzzy, php-format
 msgctxt "TITLE"
 msgid "Groups, page %d"
@@ -3123,7 +2501,6 @@ msgstr "Csoportok, %d. oldal"
 #. TRANS: Page notice of group list. %%%%site.name%%%% is the StatusNet site name,
 #. TRANS: %%%%action.groupsearch%%%% and %%%%action.newgroup%%%% are URLs. Do not change them.
 #. TRANS: This message contains Markdown links in the form [link text](link).
-#: actions/groups.php:95
 #, php-format
 msgid ""
 "%%%%site.name%%%% groups let you find and talk with people of similar "
@@ -3134,12 +2511,10 @@ msgid ""
 msgstr ""
 
 #. TRANS: Link to create a new group on the group list page.
-#: actions/groups.php:113 actions/usergroups.php:126 lib/groupeditform.php:115
 msgid "Create a new group"
 msgstr "Új csoport létrehozása"
 
 #. TRANS: Instructions for page where groups can be searched. %%site.name%% is the name of the StatusNet site.
-#: actions/groupsearch.php:53
 #, php-format
 msgid ""
 "Search for groups on %%site.name%% by their name, location, or description. "
@@ -3150,21 +2525,17 @@ msgstr ""
 "karaktert adj meg."
 
 #. TRANS: Title for page where groups can be searched.
-#: actions/groupsearch.php:60
 msgid "Group search"
 msgstr "Csoport-keresés"
 
 #. TRANS: Text on page where groups can be searched if no results were found for a query.
 #. TRANS: Text for notice search results is the query had no results.
 #. TRANS: Message on the "People search" page where a query has no results.
-#: actions/groupsearch.php:82 actions/noticesearch.php:122
-#: actions/peoplesearch.php:87
 msgid "No results."
 msgstr "Nincs találat."
 
 #. TRANS: Additional text on page where groups can be searched if no results were found for a query for a logged in user.
 #. TRANS: This message contains Markdown links in the form [link text](link).
-#: actions/groupsearch.php:87
 #, fuzzy, php-format
 msgid ""
 "If you cannot find the group you're looking for, you can [create it](%%"
@@ -3175,7 +2546,6 @@ msgstr ""
 
 #. TRANS: Additional text on page where groups can be searched if no results were found for a query for a not logged in user.
 #. TRANS: This message contains Markdown links in the form [link text](link).
-#: actions/groupsearch.php:92
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and [create the group](%%"
@@ -3183,30 +2553,25 @@ msgid ""
 msgstr ""
 
 #. TRANS: Client error displayed when trying to unblock a user from a group without being an administrator for the group.
-#: actions/groupunblock.php:95
 msgid "Only an admin can unblock group members."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to unblock a non-blocked user from a group.
-#: actions/groupunblock.php:100
 msgid "User is not blocked from group."
 msgstr "A felhasználó nincs blokkolva a csoportból."
 
 #. TRANS: Server error displayed when unblocking a user from a group fails because of an unknown error.
 #. TRANS: Server error displayed when removing a user block.
-#: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "Hiba a blokkolás feloldása közben."
 
 #. TRANS: Title for Instant Messaging settings.
-#: actions/imsettings.php:56
 msgid "IM settings"
 msgstr "IM beállítások"
 
 #. 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.
-#: actions/imsettings.php:69
 #, php-format
 msgid ""
 "You can send and receive notices through instant messaging [instant messages]"
@@ -3214,18 +2579,15 @@ msgid ""
 msgstr ""
 
 #. TRANS: Message given in the IM settings if IM is not enabled on the site.
-#: actions/imsettings.php:90
 msgid "IM is not available."
 msgstr "IM nem elérhető."
 
-#: actions/imsettings.php:116
 #, fuzzy, php-format
 msgid "Current confirmed %s address."
 msgstr "A jelenleg megerősített e-mail cím."
 
 #. TRANS: Form note in IM settings form.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:128
 #, fuzzy, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your %s account for a message "
@@ -3235,170 +2597,141 @@ msgstr ""
 "spameket!), hogy megkaptad-e az üzenetet, ami a további teendőket "
 "tartalmazza."
 
-#: actions/imsettings.php:140
 msgid "IM address"
 msgstr "IM-cím"
 
-#: actions/imsettings.php:142
 #, php-format
 msgid "%s screenname."
 msgstr ""
 
 #. TRANS: Header for IM preferences form.
-#: actions/imsettings.php:163
 #, fuzzy
 msgid "IM Preferences"
 msgstr "Azonnali üzenetküldő beállításai"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:174
 #, fuzzy
 msgid "Send me notices"
 msgstr "Küldjünk egy hírt"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:176
 msgid "Post a notice when my status changes."
 msgstr ""
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:178
 msgid "Send me replies from people I'm not subscribed to."
 msgstr ""
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:181
 #, fuzzy
 msgid "Publish a MicroID"
 msgstr "MicroID közzététele az e-mail címemhez."
 
 #. TRANS: Server error thrown on database error updating IM preferences.
-#: actions/imsettings.php:291
 #, fuzzy
 msgid "Couldn't update IM preferences."
 msgstr "Nem sikerült frissíteni a felhasználót."
 
 #. TRANS: Confirmation message for successful IM preferences save.
 #. TRANS: Confirmation message after saving preferences.
-#: actions/imsettings.php:298 actions/urlsettings.php:244
 msgid "Preferences saved."
 msgstr "Beállítások elmentve."
 
 #. TRANS: Message given saving IM address without having provided one.
-#: actions/imsettings.php:320
 #, fuzzy
 msgid "No screenname."
 msgstr "Nincs becenév."
 
-#: actions/imsettings.php:325
 #, fuzzy
 msgid "No transport."
 msgstr "Nincs hír."
 
 #. TRANS: Message given saving IM address that cannot be normalised.
-#: actions/imsettings.php:333
 #, fuzzy
 msgid "Cannot normalize that screenname"
 msgstr "Nem lehet normalizálni a Jabber azonosítót"
 
 #. TRANS: Message given saving IM address that not valid.
-#: actions/imsettings.php:340
 #, fuzzy
 msgid "Not a valid screenname"
 msgstr "Nem érvényes becenév."
 
 #. TRANS: Message given saving IM address that is already set for another user.
-#: actions/imsettings.php:344
 #, fuzzy
 msgid "Screenname already belongs to another user."
 msgstr "Ez a Jabber-azonosító már egy másik felhasználóhoz tartozik."
 
 #. TRANS: Message given saving valid IM address that is to be confirmed.
-#: actions/imsettings.php:369
 #, fuzzy
 msgid "A confirmation code was sent to the IM address you added."
 msgstr "Ez a megerősítő kód nem hozzád tartozik!"
 
 #. TRANS: Message given canceling IM address confirmation for the wrong IM address.
-#: actions/imsettings.php:396
 msgid "That is the wrong IM address."
 msgstr "Ez a hibás IM-cím."
 
 #. TRANS: Server error thrown on database error canceling IM address confirmation.
-#: actions/imsettings.php:405
 #, fuzzy
 msgid "Couldn't delete confirmation."
 msgstr "Nem sikerült törölni az e-mail cím megerősítését."
 
 #. TRANS: Message given after successfully canceling IM address confirmation.
-#: actions/imsettings.php:410
 msgid "IM confirmation cancelled."
 msgstr ""
 
 #. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.
-#: actions/imsettings.php:434
 #, fuzzy
 msgid "That is not your screenname."
 msgstr "Ez nem a te Jabber-azonosítód."
 
 #. TRANS: Server error thrown on database error removing a registered IM address.
-#: actions/imsettings.php:443
 #, fuzzy
 msgid "Couldn't update user im prefs."
 msgstr "Nem sikerült frissíteni a felhasználó rekordját."
 
 #. TRANS: Message given after successfully removing a registered Instant Messaging address.
-#: actions/imsettings.php:451
 msgid "The IM address was removed."
 msgstr ""
 
 #. TRANS: Title for all but the first page of the inbox page.
 #. TRANS: %1$s is the user's nickname, %2$s is the page number.
-#: actions/inbox.php:59
 #, php-format
 msgid "Inbox for %1$s - page %2$d"
 msgstr ""
 
 #. TRANS: Title for the first page of the inbox page.
 #. TRANS: %s is the user's nickname.
-#: actions/inbox.php:64
 #, php-format
 msgid "Inbox for %s"
 msgstr "%s bejövő postafiókja"
 
 #. TRANS: Instructions for user inbox page.
-#: actions/inbox.php:106
 msgid "This is your inbox, which lists your incoming private messages."
 msgstr "Ez a postaládád, ahol láthatod a neked küldött privát üzeneteket."
 
 #. TRANS: Client error displayed when trying to sent invites while they have been disabled.
-#: actions/invite.php:41
 msgid "Invites have been disabled."
 msgstr "A meghívások tiltva vannak."
 
 #. TRANS: Client error displayed when trying to sent invites while not logged in.
 #. TRANS: %s is the StatusNet site name.
-#: actions/invite.php:45
 #, php-format
 msgid "You must be logged in to invite other users to use %s."
 msgstr ""
 
 #. TRANS: Form validation message when providing an e-mail address that does not validate.
 #. TRANS: %s is an invalid e-mail address.
-#: actions/invite.php:78
 #, fuzzy, php-format
 msgid "Invalid email address: %s."
 msgstr "Érvénytelen e-mail cím: %s"
 
 #. TRANS: Page title when invitations have been sent.
-#: actions/invite.php:117
 #, fuzzy
 msgid "Invitations sent"
 msgstr "Meghívó(k) elküldve"
 
 #. TRANS: Page title when inviting potential users.
-#: actions/invite.php:120
 msgid "Invite new users"
 msgstr "Új felhasználó meghívása"
 
@@ -3406,7 +2739,6 @@ msgstr "Új felhasználó meghívása"
 #. TRANS: is already subscribed to one or more users with the given e-mail address(es).
 #. TRANS: Plural form is based on the number of reported already subscribed e-mail addresses.
 #. TRANS: Followed by a bullet list.
-#: actions/invite.php:140
 #, fuzzy
 msgid "You are already subscribed to this user:"
 msgid_plural "You are already subscribed to these users:"
@@ -3415,7 +2747,6 @@ msgstr[1] "Ezen felhasználók híreire már feliratkoztál:"
 
 #. TRANS: Used as list item for already subscribed users (%1$s is nickname, %2$s is e-mail address).
 #. TRANS: Used as list item for already registered people (%1$s is nickname, %2$s is e-mail address).
-#: actions/invite.php:146 actions/invite.php:160
 #, fuzzy, php-format
 msgctxt "INVITE"
 msgid "%1$s (%2$s)"
@@ -3424,7 +2755,6 @@ msgstr "%1$s - %2$s"
 #. TRANS: Message displayed inviting users to use a StatusNet site while the invited user
 #. TRANS: already uses a this StatusNet site. Plural form is based on the number of
 #. TRANS: reported already present people. Followed by a bullet list.
-#: actions/invite.php:154
 #, fuzzy
 msgid "This person is already a user and you were automatically subscribed:"
 msgid_plural ""
@@ -3437,7 +2767,6 @@ msgstr[1] ""
 #. TRANS: Message displayed inviting users to use a StatusNet site. Plural form is
 #. TRANS: based on the number of invitations sent. Followed by a bullet list of
 #. TRANS: e-mail addresses to which invitations were sent.
-#: actions/invite.php:168
 #, fuzzy
 msgid "Invitation sent to the following person:"
 msgid_plural "Invitations sent to the following people:"
@@ -3446,14 +2775,12 @@ msgstr[1] "Meghívók elküldve a következő embereknek:"
 
 #. TRANS: Generic message displayed after sending out one or more invitations to
 #. TRANS: people to join a StatusNet site.
-#: actions/invite.php:178
 msgid ""
 "You will be notified when your invitees accept the invitation and register "
 "on the site. Thanks for growing the community!"
 msgstr ""
 
 #. TRANS: Form instructions.
-#: actions/invite.php:191
 msgid ""
 "Use this form to invite your friends and colleagues to use this service."
 msgstr ""
@@ -3461,28 +2788,24 @@ msgstr ""
 "szolgáltatásra."
 
 #. TRANS: Field label for a list of e-mail addresses.
-#: actions/invite.php:218
 msgid "Email addresses"
 msgstr "E-mail címek"
 
 #. TRANS: Tooltip for field label for a list of e-mail addresses.
-#: actions/invite.php:221
 #, fuzzy
 msgid "Addresses of friends to invite (one per line)."
 msgstr "A meghívandó barátaid címei (soronként egy)"
 
 #. TRANS: Field label for a personal message to send to invitees.
-#: actions/invite.php:225
 msgid "Personal message"
 msgstr "Személyes üzenet"
 
 #. TRANS: Tooltip for field label for a personal message to send to invitees.
-#: actions/invite.php:228
 msgid "Optionally add a personal message to the invitation."
 msgstr "Megadhatsz egy személyes üzenetet a meghívóhoz."
 
 #. TRANS: Send button for inviting friends
-#: actions/invite.php:232
+#. TRANS: Button text for sending notice.
 msgctxt "BUTTON"
 msgid "Send"
 msgstr "Küldés"
@@ -3490,7 +2813,6 @@ msgstr "Küldés"
 #. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral
 #. TRANS: singular 3rd-person pronoun in English. %1$s is the inviting user, $2$s is
 #. TRANS: the StatusNet sitename.
-#: actions/invite.php:264
 #, php-format
 msgid "%1$s has invited you to join them on %2$s"
 msgstr ""
@@ -3500,7 +2822,6 @@ msgstr ""
 #. TRANS: StatusNet sitename, %3$s is the site URL, %4$s is the personal message from the
 #. TRANS: inviting user, %s%5 a link to the timeline for the inviting user, %s$6 is a link
 #. TRANS: to register with the StatusNet site.
-#: actions/invite.php:271
 #, php-format
 msgid ""
 "%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -3532,322 +2853,312 @@ msgid ""
 msgstr ""
 
 #. TRANS: Client error displayed when trying to join a group while not logged in.
-#: actions/joingroup.php:59
 msgid "You must be logged in to join a group."
 msgstr "Be kell jelentkezned, ha csatlakozni szeretnél a csoporthoz."
 
 #. TRANS: Title for join group page after joining.
-#: actions/joingroup.php:148
 #, fuzzy, php-format
 msgctxt "TITLE"
 msgid "%1$s joined group %2$s"
 msgstr "%1$s csatlakozott a(z) %2$s csoporthoz"
 
 #. TRANS: Client error displayed when trying to leave a group while not logged in.
-#: actions/leavegroup.php:59
 msgid "You must be logged in to leave a group."
 msgstr "Be kell jelentkezned hogy elhagyhass egy csoportot."
 
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
-#: actions/leavegroup.php:103 lib/command.php:398
 msgid "You are not a member of that group."
 msgstr "Nem vagy tagja annak a csoportnak."
 
 #. TRANS: Title for leave group page after leaving.
-#: actions/leavegroup.php:142
 #, fuzzy, php-format
 msgctxt "TITLE"
 msgid "%1$s left group %2$s"
 msgstr "%1$s csatlakozott a(z) %2$s csoporthoz"
 
 #. TRANS: User admin panel title
-#: actions/licenseadminpanel.php:55
 msgctxt "TITLE"
 msgid "License"
 msgstr ""
 
-#: actions/licenseadminpanel.php:65
+#. TRANS: Form instructions for the site license admin panel.
 msgid "License for this StatusNet site"
 msgstr ""
 
-#: actions/licenseadminpanel.php:134
+#. TRANS: Client error displayed selecting an invalid license in the license admin panel.
 msgid "Invalid license selection."
 msgstr ""
 
-#: actions/licenseadminpanel.php:144
+#. TRANS: Client error displayed when not specifying an owner for the all rights reserved license in the license admin panel.
 msgid ""
 "You must specify the owner of the content when using the All Rights Reserved "
 "license."
 msgstr ""
 
-#: actions/licenseadminpanel.php:151
+#. TRANS: Client error displayed selecting a too long license title in the license admin panel.
 #, fuzzy
 msgid "Invalid license title. Maximum length is 255 characters."
 msgstr "Érvénytelen SSL szerver. A maximális hossz 255 karakter."
 
-#: actions/licenseadminpanel.php:163
+#. TRANS: Client error displayed specifying an invalid license URL in the license admin panel.
 msgid "Invalid license URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:166
+#. TRANS: Client error displayed specifying an invalid license image URL in the license admin panel.
 msgid "Invalid license image URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:174
+#. TRANS: Client error displayed specifying an invalid license URL in the license admin panel.
 msgid "License URL must be blank or a valid URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:182
+#. TRANS: Client error displayed specifying an invalid license image URL in the license admin panel.
 msgid "License image must be blank or valid URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:232
+#. TRANS: Form legend in the license admin panel.
 msgid "License selection"
 msgstr ""
 
-#: actions/licenseadminpanel.php:238
+#. TRANS: License option in the license admin panel.
 msgid "Private"
 msgstr "Privát"
 
-#: actions/licenseadminpanel.php:239
+#. TRANS: License option in the license admin panel.
 msgid "All Rights Reserved"
 msgstr ""
 
-#: actions/licenseadminpanel.php:240
+#. TRANS: License option in the license admin panel.
 msgid "Creative Commons"
 msgstr ""
 
-#: actions/licenseadminpanel.php:245
+#. TRANS: Dropdown field label in the license admin panel.
 msgid "Type"
 msgstr ""
 
-#: actions/licenseadminpanel.php:247
-msgid "Select license"
-msgstr ""
+#. TRANS: Dropdown field instructions in the license admin panel.
+#, fuzzy
+msgid "Select a license."
+msgstr "Válassz egy szolgáltatót"
 
-#: actions/licenseadminpanel.php:261
+#. TRANS: Form legend in the license admin panel.
 msgid "License details"
 msgstr ""
 
-#: actions/licenseadminpanel.php:267
+#. TRANS: Field label in the license admin panel.
 msgid "Owner"
 msgstr ""
 
-#: actions/licenseadminpanel.php:268
+#. TRANS: Field title in the license admin panel.
 msgid "Name of the owner of the site's content (if applicable)."
 msgstr ""
 
-#: actions/licenseadminpanel.php:276
+#. TRANS: Field label in the license admin panel.
 msgid "License Title"
 msgstr ""
 
-#: actions/licenseadminpanel.php:277
+#. TRANS: Field title in the license admin panel.
 msgid "The title of the license."
 msgstr ""
 
-#: actions/licenseadminpanel.php:285
+#. TRANS: Field label in the license admin panel.
 msgid "License URL"
 msgstr ""
 
-#: actions/licenseadminpanel.php:286
+#. TRANS: Field title in the license admin panel.
 msgid "URL for more information about the license."
 msgstr ""
 
-#: actions/licenseadminpanel.php:293
+#. TRANS: Field label in the license admin panel.
 msgid "License Image URL"
 msgstr ""
 
-#: actions/licenseadminpanel.php:294
+#. TRANS: Field title in the license admin panel.
 msgid "URL for an image to display with the license."
 msgstr ""
 
-#. TRANS: Submit button title.
-#: actions/licenseadminpanel.php:311 actions/sessionsadminpanel.php:199
-#: actions/siteadminpanel.php:292 actions/snapshotadminpanel.php:245
-#: actions/tagother.php:133 lib/applicationeditform.php:357
-msgid "Save"
-msgstr "Mentés"
-
-#: actions/licenseadminpanel.php:311
-msgid "Save license settings"
-msgstr ""
+#. TRANS: Button title in the license admin panel.
+#, fuzzy
+msgid "Save license settings."
+msgstr "Mentsük el a webhely beállításait"
 
+#. TRANS: Client error displayed when trying to log in while already logged in.
 #. TRANS: Client error displayed trying to use "one time password login" when already logged in.
-#: actions/login.php:97 actions/otp.php:62 actions/register.php:130
 msgid "Already logged in."
 msgstr "Már be vagy jelentkezve."
 
-#: actions/login.php:125
+#. TRANS: Form validation error displayed when trying to log in with incorrect credentials.
 msgid "Incorrect username or password."
 msgstr "Rossz felhasználónév vagy jelszó."
 
+#. TRANS: Server error displayed when during login a server error occurs.
 #. TRANS: Server error displayed when a user object could not be created trying to login using "one time password login".
-#: actions/login.php:131 actions/otp.php:127
 msgid "Error setting user. You are probably not authorized."
 msgstr ""
 
-#: actions/login.php:185 actions/login.php:236 lib/action.php:598
+#. TRANS: Page title for login page.
 msgid "Login"
 msgstr "Bejelentkezés"
 
-#: actions/login.php:222
+#. TRANS: Form legend on login page.
 msgid "Login to site"
 msgstr "Bejelentkezés az oldalra"
 
-#: actions/login.php:231 actions/register.php:469
+#. TRANS: Checkbox label label on login page.
 msgid "Remember me"
 msgstr "Emlékezz rám"
 
-#: actions/login.php:232 actions/register.php:471
+#. TRANS: Checkbox title on login page.
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 "A jövőben legyen automatikus a bejelentkezés; csak ha egyedül használod a "
 "számítógépet!"
 
-#: actions/login.php:241
+#. TRANS: Button text for log in on login page.
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Login"
+msgstr "Bejelentkezés"
+
+#. TRANS: Link text for link to "reset password" on login page.
 msgid "Lost or forgotten password?"
 msgstr "Elvesztetted vagy elfelejtetted a jelszavad?"
 
-#: actions/login.php:259
+#. TRANS: Form instructions on login page before being able to change user settings.
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
 msgstr ""
 
-#: actions/login.php:263
+#. TRANS: Form instructions on login page.
 msgid "Login with your username and password."
 msgstr ""
 
-#: actions/login.php:266
+#. TRANS: Form instructions on login page. This message contains Markdown links in the form [Link text](Link).
+#. TRANS: %%action.register%% is a link to the registration page.
 #, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
 msgstr ""
 
-#: actions/makeadmin.php:92
+#. TRANS: Client error displayed when trying to make another user admin on the Make Admin page while not an admin.
 msgid "Only an admin can make another user an admin."
 msgstr "Csak kezelő tehet egy másik felhasználót kezelővé."
 
-#: actions/makeadmin.php:96
+#. TRANS: Client error displayed when trying to make another user admin on the Make Admin page who already is admin.
+#. TRANS: %1$s is the user that is already admin, %2$s is the group user is already admin for.
 #, php-format
 msgid "%1$s is already an admin for group \"%2$s\"."
 msgstr "%1$s már kezelője a \"%2$s\" csoportnak."
 
-#: actions/makeadmin.php:133
+#. TRANS: Server error displayed when trying to make another user admin on the Make Admin page fails
+#. TRANS: because the group membership record could not be gotten.
+#. TRANS: %1$s is the to be admin user, %2$s is the group user should be admin for.
 #, php-format
 msgid "Can't get membership record for %1$s in group %2$s."
 msgstr ""
 
-#: actions/makeadmin.php:146
+#. TRANS: Server error displayed when trying to make another user admin on the Make Admin page fails
+#. TRANS: because the group adminship record coud not be saved properly.
+#. TRANS: %1$s is the to be admin user, %2$s is the group user is already admin for.
 #, php-format
 msgid "Can't make %1$s an admin for group %2$s."
 msgstr "Nem sikerült %1$s-t a %2$s csoport kezelőjévé tenni."
 
-#: actions/microsummary.php:69
+#. TRANS: Client error displayed trying to make a micro summary without providing a status.
 msgid "No current status."
 msgstr "Nincs aktuális állapot."
 
 #. TRANS: This is the title of the form for adding a new application.
-#: actions/newapplication.php:52
 #, fuzzy
 msgid "New application"
 msgstr "Új alkalmazás"
 
 #. TRANS: Client error displayed trying to add a new application while not logged in.
-#: actions/newapplication.php:64
 msgid "You must be logged in to register an application."
 msgstr ""
 
 #. TRANS: Form instructions for registering a new application.
-#: actions/newapplication.php:147
 msgid "Use this form to register a new application."
 msgstr ""
 
 #. TRANS: Validation error shown when not providing a source URL in the "New application" form.
-#: actions/newapplication.php:189
 msgid "Source URL is required."
 msgstr "Meg kell adnod forrás URL-t."
 
 #. TRANS: Server error displayed when an application could not be registered in the database through the "New application" form.
-#: actions/newapplication.php:279 actions/newapplication.php:289
 msgid "Could not create application."
 msgstr "Nem sikerült létrehozni az alkalmazást."
 
 #. TRANS: Title for form to create a group.
-#: actions/newgroup.php:53
 msgid "New group"
 msgstr "Új csoport"
 
 #. TRANS: Client exception thrown when a user tries to create a group while banned.
-#: actions/newgroup.php:73 classes/User_group.php:485
 #, fuzzy
 msgid "You are not allowed to create groups on this site."
 msgstr "Nem vagy tagja ennek a csoportnak."
 
 #. TRANS: Form instructions for group create form.
-#: actions/newgroup.php:117
 msgid "Use this form to create a new group."
 msgstr "Ezen az űrlapon tudsz új csoportot létrehozni."
 
-#. TRANS: Group create form validation error.
-#: actions/newgroup.php:200
-#, fuzzy
-msgid "Alias cannot be the same as nickname."
-msgstr "Az álnév nem egyezhet meg a becenévvel."
-
-#: actions/newmessage.php:71 actions/newmessage.php:234
+#. TRANS: Page title for new direct message page.
+#. TRANS: Page title on page for sending a direct message.
 msgid "New message"
 msgstr "Új üzenet"
 
-#. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
-#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:513
-msgid "You can't send a message to this user."
+#. TRANS: Client error displayed trying to send a direct message to a user while sender and
+#. TRANS: receiver are not subscribed to each other.
+#, fuzzy
+msgid "You cannot send a message to this user."
 msgstr "Ennek a felhasználónak nem küldhetsz üzenetet."
 
+#. TRANS: Form validator error displayed trying to send a direct message without content.
+#. TRANS: Client error displayed trying to send a notice without content.
 #. TRANS: Command exception text shown when trying to send a direct message to another user without content.
 #. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
-#: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:490
-#: lib/command.php:593
 msgid "No content!"
 msgstr "Nincs tartalom!"
 
-#: actions/newmessage.php:161
+#. TRANS: Form validation error displayed trying to send a direct message without specifying a recipient.
 msgid "No recipient specified."
 msgstr "Nincs címzett megadva."
 
+#. TRANS: Client error displayed trying to send a direct message to self.
 #. TRANS: Error text shown when trying to send a direct message to self.
-#: actions/newmessage.php:167 lib/command.php:517
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr "Ne küldj üzenetet magadnak, helyette mondd el halkan."
 
-#: actions/newmessage.php:184
+#. TRANS: Page title after sending a direct message.
 msgid "Message sent"
 msgstr "Üzenet elküldve"
 
+#. TRANS: Confirmation text after sending a direct message.
+#. TRANS: %s is the direct message recipient.
 #. TRANS: Message given have sent a direct message to another user.
 #. TRANS: %s is the name of the other user.
-#: actions/newmessage.php:188 lib/command.php:525
 #, php-format
 msgid "Direct message to %s sent."
 msgstr "Közvetlen üzenet ment %s részére."
 
-#: actions/newmessage.php:213 actions/newnotice.php:264
+#. TRANS: Page title after an AJAX error occurred on the "send direct message" page.
+#. TRANS: Page title after an AJAX error occurs on the send notice page.
 msgid "Ajax Error"
 msgstr "Ajax-hiba"
 
-#: actions/newnotice.php:69
+#. TRANS: Page title for sending a new notice.
 msgid "New notice"
 msgstr "Új hír"
 
-#: actions/newnotice.php:230
+#. TRANS: Page title after sending a notice.
 msgid "Notice posted"
 msgstr "Hír elküldve"
 
 #. TRANS: Instructions for Notice search page.
 #. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/noticesearch.php:69
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -3855,20 +3166,17 @@ msgid ""
 msgstr ""
 
 #. TRANS: Title of the page where users can search for notices.
-#: actions/noticesearch.php:80
 msgid "Text search"
 msgstr "Szöveg keresése"
 
 #. TRANS: Test in RSS notice search.
 #. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearch.php:95
 #, php-format
 msgid "Search results for \"%1$s\" on %2$s"
 msgstr ""
 
 #. TRANS: Text for logged in users making a query for notices without results.
 #. TRANS: This message contains a Markdown link.
-#: actions/noticesearch.php:128
 #, php-format
 msgid ""
 "Be the first to [post on this topic](%%%%action.newnotice%%%%?"
@@ -3877,7 +3185,6 @@ msgstr ""
 
 #. TRANS: Text for not logged in users making a query for notices without results.
 #. TRANS: This message contains Markdown links.
-#: actions/noticesearch.php:133
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and be the first to "
@@ -3885,78 +3192,67 @@ msgid ""
 msgstr ""
 
 #. TRANS: RSS notice search feed title. %s is the query.
-#: actions/noticesearchrss.php:95
 #, php-format
 msgid "Updates with \"%s\""
 msgstr ""
 
 #. TRANS: RSS notice search feed description.
 #. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearchrss.php:99
 #, php-format
 msgid "Updates matching search term \"%1$s\" on %2$s."
 msgstr ""
 
-#: actions/nudge.php:85
+#. TRANS: Client error displayed trying to nudge a user that cannot be nudged.
 msgid ""
 "This user doesn't allow nudges or hasn't confirmed or set their email "
 "address yet."
 msgstr ""
 
-#: actions/nudge.php:94
+#. TRANS: Page title after sending a nudge.
 msgid "Nudge sent"
 msgstr "Megböktük"
 
-#: actions/nudge.php:97
+#. TRANS: Confirmation text after sending a nudge.
 msgid "Nudge sent!"
 msgstr "Megböktük!"
 
 #. TRANS: Message displayed to an anonymous user trying to view OAuth application list.
-#: actions/oauthappssettings.php:57
 msgid "You must be logged in to list your applications."
 msgstr ""
 
 #. TRANS: Page title for OAuth applications
-#: actions/oauthappssettings.php:73
 msgid "OAuth applications"
 msgstr ""
 
 #. TRANS: Page instructions for OAuth applications
-#: actions/oauthappssettings.php:85
 msgid "Applications you have registered"
 msgstr ""
 
 #. TRANS: Empty list message on page with OAuth applications.
-#: actions/oauthappssettings.php:138
 #, php-format
 msgid "You have not registered any applications yet."
 msgstr ""
 
 #. TRANS: Title for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:69
 msgid "Connected applications"
 msgstr ""
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:80
 msgid "The following connections exist for your account."
 msgstr ""
 
 #. TRANS: Client error when trying to revoke access for an application while not being a user of it.
-#: actions/oauthconnectionssettings.php:165
 msgid "You are not a user of that application."
 msgstr ""
 
 #. TRANS: Client error when revoking access has failed for some reason.
 #. TRANS: %s is the application ID revoking access failed for.
-#: actions/oauthconnectionssettings.php:180
 #, php-format
 msgid "Unable to revoke access for application: %s."
 msgstr ""
 
 #. TRANS: Success message after revoking access for an application.
 #. TRANS: %1$s is the application name, %2$s is the first part of the user token.
-#: actions/oauthconnectionssettings.php:199
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -3964,472 +3260,389 @@ msgid ""
 msgstr ""
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:210
 msgid "You have not authorized any applications to use your account."
 msgstr ""
 
 #. TRANS: Note for developers in the OAuth connection settings form.
 #. TRANS: This message contains a Markdown link. Do not separate "](".
 #. TRANS: %s is the URL to the OAuth settings.
-#: actions/oauthconnectionssettings.php:230
 #, php-format
 msgid ""
 "Are you a developer? [Register an OAuth client application](%s) to use with "
 "this instance of StatusNet."
 msgstr ""
 
-#: actions/oembed.php:64
+#. TRANS: Server error displayed in oEmbed action when path not found.
+#. TRANS: %s is a path.
 #, fuzzy, php-format
 msgid "\"%s\" not found."
 msgstr "Az API-metódus nem található."
 
-#: actions/oembed.php:76
+#. TRANS: Server error displayed in oEmbed action when notice not found.
+#. TRANS: %s is a notice.
 #, fuzzy, php-format
 msgid "Notice %s not found."
 msgstr "Az API-metódus nem található."
 
-#: actions/oembed.php:80 actions/shownotice.php:100
+#. TRANS: Server error displayed in oEmbed action when notice has not profile.
 msgid "Notice has no profile."
 msgstr ""
 
-#: actions/oembed.php:83 actions/shownotice.php:172
+#. TRANS: oEmbed title. %1$s is the author name, %2$s is the creation date.
 #, php-format
 msgid "%1$s's status on %2$s"
 msgstr ""
 
-#: actions/oembed.php:95
+#. TRANS: Server error displayed in oEmbed action when attachment not found.
+#. TRANS: %d is an attachment ID.
 #, fuzzy, php-format
 msgid "Attachment %s not found."
 msgstr "A címzett felhasználó nem található."
 
-#: actions/oembed.php:136
+#. TRANS: Server error displayed in oEmbed request when a path is not supported.
+#. TRANS: %s is a path.
 #, php-format
 msgid "\"%s\" not supported for oembed requests."
 msgstr ""
 
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
-#: actions/oembed.php:168
 #, php-format
 msgid "Content type %s not supported."
 msgstr ""
 
 #. TRANS: Error message displaying attachments. %s is the site's base URL.
-#: actions/oembed.php:172
 #, php-format
 msgid "Only %s URLs over plain HTTP please."
 msgstr ""
 
+#. TRANS: Server error displayed in oEmbed action when request specifies an unsupported data format.
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1207
-#: lib/apiaction.php:1234 lib/apiaction.php:1369
 msgid "Not a supported data format."
 msgstr "Nem támogatott adatformátum."
 
 #. TRANS: ShortName in the OpenSearch interface when trying to find users.
-#: actions/opensearch.php:64
 msgid "People Search"
 msgstr "Emberek keresése"
 
-#: actions/opensearch.php:68
+#. TRANS: ShortName in the OpenSearch interface when trying to find notices.
 msgid "Notice Search"
 msgstr "Hírek keresése"
 
 #. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
-#: actions/otp.php:70
 msgid "No user ID specified."
 msgstr ""
 
 #. TRANS: Client error displayed trying to use "one time password login" without specifying a login token.
-#: actions/otp.php:86
 msgid "No login token specified."
 msgstr ""
 
 #. TRANS: Client error displayed trying to use "one time password login" without requesting a login token.
-#: actions/otp.php:94
 msgid "No login token requested."
 msgstr ""
 
 #. TRANS: Client error displayed trying to use "one time password login" while specifying an invalid login token.
-#: actions/otp.php:100
 msgid "Invalid login token specified."
 msgstr ""
 
 #. TRANS: Client error displayed trying to use "one time password login" while specifying an expired login token.
-#: actions/otp.php:110
 msgid "Login token expired."
 msgstr ""
 
 #. TRANS: Title for outbox for any but the fist page.
 #. TRANS: %1$s is the user nickname, %2$d is the page number.
-#: actions/outbox.php:57
 #, php-format
 msgid "Outbox for %1$s - page %2$d"
 msgstr "%1$s kimenő postafiókja - %2$d. oldal"
 
 #. TRANS: Title for first page of outbox.
-#: actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
 msgstr "%s kimenő postafiókja"
 
 #. TRANS: Instructions for outbox.
-#: actions/outbox.php:103
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr "Ez az elküldött privát üzeneteid postafiókja."
 
-#: actions/passwordsettings.php:58
 msgid "Change password"
 msgstr "Jelszó megváltoztatása"
 
-#: actions/passwordsettings.php:69
 msgid "Change your password."
 msgstr "Változtasd meg a jelszavadat."
 
 #. TRANS: Fieldset legend for password reset form.
-#: actions/passwordsettings.php:96 actions/recoverpassword.php:251
 msgid "Password change"
 msgstr "Jelszó megváltoztatása"
 
-#: actions/passwordsettings.php:104
 msgid "Old password"
 msgstr "Régi jelszó"
 
 #. TRANS: Field label for password reset form.
-#: actions/passwordsettings.php:108 actions/recoverpassword.php:256
 msgid "New password"
 msgstr "Új jelszó"
 
-#: actions/passwordsettings.php:109 actions/register.php:416
 #, fuzzy
 msgid "6 or more characters."
 msgstr "6 vagy több karakter"
 
 #. TRANS: Ttile for field label for password reset form where the password has to be typed again.
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:264
-#: actions/register.php:420
 #, fuzzy
 msgid "Same as password above."
 msgstr "Ugyanaz mint a fenti jelszó"
 
-#: actions/passwordsettings.php:117
 msgid "Change"
 msgstr "Változtassunk"
 
-#: actions/passwordsettings.php:153 actions/register.php:223
 msgid "Password must be 6 or more characters."
 msgstr "A jelszónak legalább 6 karakterből kell állnia."
 
-#: actions/passwordsettings.php:156 actions/register.php:226
 msgid "Passwords don't match."
 msgstr "A jelszavak nem egyeznek."
 
-#: actions/passwordsettings.php:164
 msgid "Incorrect old password"
 msgstr "Érvénytelen a régi jelszó"
 
-#: actions/passwordsettings.php:180
 msgid "Error saving user; invalid."
 msgstr "Hiba a felhasználó mentésekor; érvénytelen."
 
 #. TRANS: Reset password form validation error message.
-#: actions/passwordsettings.php:185 actions/recoverpassword.php:418
 #, fuzzy
 msgid "Cannot save new password."
 msgstr "Az új jelszót nem sikerült elmenteni."
 
-#: actions/passwordsettings.php:191
 msgid "Password saved."
 msgstr "Jelszó elmentve."
 
 #. TRANS: Title for Paths admin panel.
 #. TRANS: Menu item for site administration
-#: actions/pathsadminpanel.php:58 lib/adminpanelaction.php:371
 msgid "Paths"
 msgstr "Útvonalak"
 
 #. TRANS: Form instructions for Path admin panel.
-#: actions/pathsadminpanel.php:69
 msgid "Path and server settings for this StatusNet site"
 msgstr ""
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the directory that could not be read from.
-#: actions/pathsadminpanel.php:155
 #, php-format
 msgid "Theme directory not readable: %s."
 msgstr ""
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the avatar directory that could not be written to.
-#: actions/pathsadminpanel.php:163
 #, php-format
 msgid "Avatar directory not writable: %s."
 msgstr ""
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the background directory that could not be written to.
-#: actions/pathsadminpanel.php:171
 #, php-format
 msgid "Background directory not writable: %s."
 msgstr ""
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the locales directory that could not be read from.
-#: actions/pathsadminpanel.php:181
 #, php-format
 msgid "Locales directory not readable: %s."
 msgstr ""
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the SSL server URL that is too long.
-#: actions/pathsadminpanel.php:189
 msgid "Invalid SSL server. The maximum length is 255 characters."
 msgstr "Érvénytelen SSL szerver. A maximális hossz 255 karakter."
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:235 actions/siteadminpanel.php:58
 msgid "Site"
 msgstr "Webhely"
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:241 actions/pathsadminpanel.php:279
-#: actions/pathsadminpanel.php:370 actions/pathsadminpanel.php:425
 msgid "Server"
 msgstr "Szerver"
 
-#: actions/pathsadminpanel.php:242
 msgid "Site's server hostname."
 msgstr "A webhely kiszolgálójának neve."
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:248 actions/pathsadminpanel.php:288
-#: actions/pathsadminpanel.php:379 actions/pathsadminpanel.php:434
 msgid "Path"
 msgstr "Útvonal"
 
-#: actions/pathsadminpanel.php:249
 #, fuzzy
 msgid "Site path."
 msgstr "Webhely útvonala"
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:255
 #, fuzzy
 msgid "Locale directory"
 msgstr "Avatar-könyvtár"
 
-#: actions/pathsadminpanel.php:256
 #, fuzzy
 msgid "Directory path to locales."
 msgstr "A nyelvi fájlok elérési útvonala"
 
 #. TRANS: Checkbox label in Paths admin panel.
-#: actions/pathsadminpanel.php:263
 msgid "Fancy URLs"
 msgstr ""
 
-#: actions/pathsadminpanel.php:265
 msgid "Use fancy (more readable and memorable) URLs?"
 msgstr ""
 
-#: actions/pathsadminpanel.php:272
 msgid "Theme"
 msgstr "Téma"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:281
 #, fuzzy
 msgid "Server for themes."
 msgstr "A webhely témája."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:290
 msgid "Web path to themes."
 msgstr ""
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:297 actions/pathsadminpanel.php:388
-#: actions/pathsadminpanel.php:443 actions/pathsadminpanel.php:495
 msgid "SSL server"
 msgstr "SSL-kiszolgáló"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:299
 msgid "SSL server for themes (default: SSL server)."
 msgstr ""
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:306 actions/pathsadminpanel.php:397
-#: actions/pathsadminpanel.php:452
 #, fuzzy
 msgid "SSL path"
 msgstr "Webhely útvonala"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:308
 msgid "SSL path to themes (default: /theme/)."
 msgstr ""
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:315 actions/pathsadminpanel.php:406
-#: actions/pathsadminpanel.php:461
 #, fuzzy
 msgid "Directory"
 msgstr "Avatar-könyvtár"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:317
 #, fuzzy
 msgid "Directory where themes are located."
 msgstr "A nyelvi fájlok elérési útvonala"
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:326
 msgid "Avatars"
 msgstr "Avatarok"
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:333
 msgid "Avatar server"
 msgstr "Avatar-kiszolgáló"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:335
 #, fuzzy
 msgid "Server for avatars."
 msgstr "A webhely témája."
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:342
 msgid "Avatar path"
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:344
 #, fuzzy
 msgid "Web path to avatars."
 msgstr "Nem sikerült felölteni az avatart."
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:351
 msgid "Avatar directory"
 msgstr "Avatar-könyvtár"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:353
 #, fuzzy
 msgid "Directory where avatars are located."
 msgstr "A nyelvi fájlok elérési útvonala"
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:364
 msgid "Backgrounds"
 msgstr "Hátterek"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:372
 #, fuzzy
 msgid "Server for backgrounds."
 msgstr "A webhely témája."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:381
 msgid "Web path to backgrounds."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:390
 msgid "Server for backgrounds on SSL pages."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:399
 msgid "Web path to backgrounds on SSL pages."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:408
 #, fuzzy
 msgid "Directory where backgrounds are located."
 msgstr "A nyelvi fájlok elérési útvonala"
 
 #. TRANS: Fieldset legens in Paths admin panel.
-#: actions/pathsadminpanel.php:419
 msgid "Attachments"
 msgstr "Csatolmányok"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:427
 #, fuzzy
 msgid "Server for attachments."
 msgstr "A webhely témája."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:436
 #, fuzzy
 msgid "Web path to attachments."
 msgstr "Nincs melléklet."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:445
 #, fuzzy
 msgid "Server for attachments on SSL pages."
 msgstr "A webhely témája."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:454
 msgid "Web path to attachments on SSL pages."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:463
 #, fuzzy
 msgid "Directory where attachments are located."
 msgstr "A nyelvi fájlok elérési útvonala"
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:472
 msgid "SSL"
 msgstr "SSL"
 
 #. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
-#: actions/pathsadminpanel.php:477 actions/snapshotadminpanel.php:202
 msgid "Never"
 msgstr "Soha"
 
 #. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
-#: actions/pathsadminpanel.php:479
 msgid "Sometimes"
 msgstr "Időnként"
 
 #. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
-#: actions/pathsadminpanel.php:481
 msgid "Always"
 msgstr "Mindig"
 
-#: actions/pathsadminpanel.php:485
 msgid "Use SSL"
 msgstr "SSL használata"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:487
 #, fuzzy
 msgid "When to use SSL."
 msgstr "Mikor használjunk SSL-t"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:497
 msgid "Server to direct SSL requests to."
 msgstr ""
 
 #. TRANS: Button title text to store form data in the Paths admin panel.
-#: actions/pathsadminpanel.php:514
 msgid "Save paths"
 msgstr "Elérési útvonalak mentése"
 
 #. TRANS: Instructions for the "People search" page.
 #. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/peoplesearch.php:54
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
@@ -4440,57 +3653,46 @@ msgstr ""
 "3 betűből kell állniuk."
 
 #. TRANS: Title of a page where users can search for other users.
-#: actions/peoplesearch.php:61
 msgid "People search"
 msgstr "Emberkereső"
 
-#: actions/peopletag.php:68
 #, php-format
 msgid "Not a valid people tag: %s."
 msgstr ""
 
-#: actions/peopletag.php:142
 #, php-format
 msgid "Users self-tagged with %1$s - page %2$d"
 msgstr ""
 
 #. TRANS: Page title for AJAX form return when a disabling a plugin.
-#: actions/plugindisable.php:69
 msgctxt "plugin"
 msgid "Disabled"
 msgstr ""
 
 #. TRANS: Client error displayed trying to perform any request method other than POST.
 #. TRANS: Do not translate POST.
-#: actions/pluginenable.php:78 actions/subscribe.php:77
 msgid "This action only accepts POST requests."
 msgstr ""
 
-#: actions/pluginenable.php:102
 #, fuzzy
 msgid "You cannot administer plugins."
 msgstr "Nem törölhetsz felhasználókat."
 
-#: actions/pluginenable.php:109
 #, fuzzy
 msgid "No such plugin."
 msgstr "Nincs ilyen lap."
 
 #. TRANS: Page title for AJAX form return when enabling a plugin.
-#: actions/pluginenable.php:159
 msgctxt "plugin"
 msgid "Enabled"
 msgstr ""
 
 #. TRANS: Tab and title for plugins admin panel.
 #. TRANS: Menu item for site administration
-#: actions/pluginsadminpanel.php:56 actions/version.php:191
-#: lib/adminpanelaction.php:411
 msgid "Plugins"
 msgstr ""
 
 #. TRANS: Instructions at top of plugin admin page.
-#: actions/pluginsadminpanel.php:68
 msgid ""
 "Additional plugins can be enabled and configured manually. See the <a href="
 "\"http://status.net/wiki/Plugins\">online plugin documentation</a> for more "
@@ -4498,32 +3700,26 @@ msgid ""
 msgstr ""
 
 #. TRANS: Admin form section header
-#: actions/pluginsadminpanel.php:84
 #, fuzzy
 msgid "Default plugins"
 msgstr "Alapértelmezett nyelv"
 
-#: actions/pluginsadminpanel.php:106
 msgid ""
 "All default plugins have been disabled from the site's configuration file."
 msgstr ""
 
-#: actions/postnotice.php:95
 msgid "Invalid notice content."
 msgstr "Érvénytelen megjegyzéstartalom."
 
-#: actions/postnotice.php:101
 #, php-format
 msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’."
 msgstr "A hír licence ‘%1$s’ nem kompatibilis a webhely licencével ‘%2$s’."
 
 #. TRANS: Page title for profile settings.
-#: actions/profilesettings.php:60
 msgid "Profile settings"
 msgstr "Profilbeállítások"
 
 #. TRANS: Usage instructions for profile settings.
-#: actions/profilesettings.php:71
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
@@ -4531,31 +3727,24 @@ msgstr ""
 "többet tudhassanak rólad."
 
 #. TRANS: Profile settings form legend.
-#: actions/profilesettings.php:99
 msgid "Profile information"
 msgstr "Személyes profil"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:110 actions/register.php:412
 #, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr "1-64 kisbetű vagy számjegy, nem lehet benne írásjel vagy szóköz"
 
 #. TRANS: Field label in form for profile settings.
-#: actions/profilesettings.php:114 actions/register.php:434
-#: lib/groupeditform.php:150
 msgid "Full name"
 msgstr "Teljes név"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:119 actions/register.php:439
-#: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "Honlap"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:122 actions/register.php:441
 #, fuzzy
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr ""
@@ -4565,7 +3754,6 @@ msgstr ""
 #. TRANS: Tooltip for field label in form for profile settings. Plural
 #. TRANS: is decided by the number of characters available for the
 #. TRANS: biography (%d).
-#: actions/profilesettings.php:130 actions/register.php:450
 #, fuzzy, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4573,41 +3761,31 @@ msgstr[0] "Jellemezd önmagad és az érdeklődési köröd %d karakterben"
 msgstr[1] "Jellemezd önmagad és az érdeklődési köröd %d karakterben"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:136 actions/register.php:455
 msgid "Describe yourself and your interests"
 msgstr "Jellemezd önmagad és az érdeklődési köröd"
 
 #. TRANS: Text area label in form for profile settings where users can provide.
 #. TRANS: their biography.
-#: actions/profilesettings.php:140 actions/register.php:457
 msgid "Bio"
 msgstr "Életrajz"
 
 #. TRANS: Field label in form for profile settings.
-#: actions/profilesettings.php:146 actions/register.php:462
-#: lib/groupeditform.php:173
 msgid "Location"
 msgstr "Helyszín"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:149
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Merre vagy, mint pl. \"Város, Megye, Ország\""
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:154
 msgid "Share my current location when posting notices"
 msgstr "Tegyük közzé az aktuális tartózkodási helyem amikor híreket küldök"
 
 #. TRANS: Field label in form for profile settings.
-#: actions/profilesettings.php:162 actions/tagother.php:128
-#: actions/tagother.php:188 lib/subscriptionlist.php:104
-#: lib/subscriptionlist.php:106
 msgid "Tags"
 msgstr "Címkék"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:165
 #, fuzzy
 msgid ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- "
@@ -4617,28 +3795,23 @@ msgstr ""
 "elválasztva"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:170
 msgid "Language"
 msgstr "Nyelv"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:172
 #, fuzzy
 msgid "Preferred language."
 msgstr "Előnyben részesített nyelv"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:182
 msgid "Timezone"
 msgstr "Időzóna"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:184
 msgid "What timezone are you normally in?"
 msgstr "Általában melyik időzónában vagy?"
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:190
 #, fuzzy
 msgid ""
 "Automatically subscribe to whoever subscribes to me (best for non-humans)."
@@ -4649,7 +3822,6 @@ msgstr ""
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Plural form is used based on the maximum number of allowed
 #. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:259 actions/register.php:214
 #, fuzzy, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4657,101 +3829,82 @@ msgstr[0] "Az bemutatkozás túl hosszú (max %d karakter)."
 msgstr[1] "Az bemutatkozás túl hosszú (max %d karakter)."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:270 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr "Nem választottál időzónát."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:278
 #, fuzzy
 msgid "Language is too long (maximum 50 characters)."
 msgstr "A nyelv túl hosszú (legfeljebb 50 karakter lehet)."
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:292
 #, fuzzy, php-format
 msgid "Invalid tag: \"%s\"."
 msgstr "Érvénytelen címke: \"%s\""
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:348
 #, fuzzy
 msgid "Could not update user for autosubscribe."
 msgstr "Nem sikerült a felhasználónak automatikus feliratkozást beállítani."
 
 #. TRANS: Server error thrown when user profile location preference settings could not be updated.
-#: actions/profilesettings.php:406
 #, fuzzy
 msgid "Could not save location prefs."
 msgstr "Nem sikerült a helyszín beállításait elmenteni."
 
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:428 actions/tagother.php:179
 msgid "Could not save tags."
 msgstr ""
 
 #. TRANS: Confirmation shown when user profile settings are saved.
 #. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:437 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "A beállításokat elmentettük."
 
 #. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
 #. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:484 actions/restoreaccount.php:60
 msgid "Restore account"
 msgstr ""
 
-#: actions/public.php:83
 #, php-format
 msgid "Beyond the page limit (%s)."
 msgstr ""
 
-#: actions/public.php:92
 msgid "Could not retrieve public stream."
 msgstr ""
 
-#: actions/public.php:130
 #, php-format
 msgid "Public timeline, page %d"
 msgstr "Közösségi történet, %d. oldal"
 
-#: actions/public.php:132 lib/publicgroupnav.php:79
 msgid "Public timeline"
 msgstr "Közösségi történet"
 
-#: actions/public.php:160
 msgid "Public Stream Feed (RSS 1.0)"
 msgstr ""
 
-#: actions/public.php:164
 msgid "Public Stream Feed (RSS 2.0)"
 msgstr ""
 
-#: actions/public.php:168
 msgid "Public Stream Feed (Atom)"
 msgstr ""
 
-#: actions/public.php:188
 #, php-format
 msgid ""
 "This is the public timeline for %%site.name%% but no one has posted anything "
 "yet."
 msgstr "Ez itt %%site.name%% közösségi története, de még senki nem írt semmit."
 
-#: actions/public.php:191
 msgid "Be the first to post!"
 msgstr "Légy az első aki ír!"
 
-#: actions/public.php:195
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post!"
 msgstr "Ha [regisztrálnál](%%action.register%%), te írhatnád az első hírt!"
 
-#: actions/public.php:242
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -4765,7 +3918,6 @@ msgstr ""
 "[Csatlakozz](%%action.register%%), és küldj híreket magadról a barátaidnak, "
 "a családodnak, a munkatársaidnak! ([Tudj meg többet](%%doc.help%%))"
 
-#: actions/public.php:247
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -4774,19 +3926,16 @@ msgid ""
 msgstr ""
 
 #. TRANS: Public RSS feed description. %s is the StatusNet site name.
-#: actions/publicrss.php:106
 #, fuzzy, php-format
 msgid "%s updates from everyone."
 msgstr "%s-frissítések mindenki számára!"
 
 #. TRANS: Title for public tag cloud.
-#: actions/publictagcloud.php:57
 msgid "Public tag cloud"
 msgstr "Nyilvános címkefelhő"
 
 #. TRANS: Instructions (more used like an explanation/header).
 #. TRANS: %s is the StatusNet sitename.
-#: actions/publictagcloud.php:65
 #, fuzzy, php-format
 msgid "These are most popular recent tags on %s"
 msgstr "%s legnépszerűbb címkéi mostanában "
@@ -4794,14 +3943,12 @@ msgstr "%s legnépszerűbb címkéi mostanában "
 #. TRANS: This message contains a Markdown URL. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.
-#: actions/publictagcloud.php:74
 #, php-format
 msgid "No one has posted a notice with a [hashtag](%%doc.tags%%) yet."
 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.
-#: actions/publictagcloud.php:79
 msgid "Be the first to post one!"
 msgstr "Küld be te az első hírt!"
 
@@ -4810,7 +3957,6 @@ msgstr "Küld be te az első hírt!"
 #. TRANS: This message contains a Markdown URL. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.
-#: actions/publictagcloud.php:87
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post "
@@ -4818,272 +3964,219 @@ msgid ""
 msgstr ""
 
 #. TRANS: Client error displayed trying to recover password while already logged in.
-#: actions/recoverpassword.php:37
 msgid "You are already logged in!"
 msgstr "Már be vagy jelentkezve!"
 
 #. TRANS: Client error displayed when password recovery code is not correct.
-#: actions/recoverpassword.php:64
 msgid "No such recovery code."
 msgstr "Nincs ilyen visszaállítási kód."
 
 #. TRANS: Client error displayed when no proper password recovery code was submitted.
-#: actions/recoverpassword.php:69
 msgid "Not a recovery code."
 msgstr "Nem visszaállítási kód."
 
 #. TRANS: Server error displayed trying to recover password without providing a user.
-#: actions/recoverpassword.php:77
 msgid "Recovery code for unknown user."
 msgstr ""
 
 #. TRANS: Server error displayed removing a password recovery code from the database.
-#: actions/recoverpassword.php:91
 msgid "Error with confirmation code."
 msgstr ""
 
 #. TRANS: Client error displayed trying to recover password with too old a recovery code.
-#: actions/recoverpassword.php:103
 msgid "This confirmation code is too old. Please start again."
 msgstr ""
 
 #. TRANS: Server error displayed when updating a user's e-mail address in the database fails while recovering a password.
-#: actions/recoverpassword.php:118
 msgid "Could not update user with confirmed email address."
 msgstr "Nem sikerült a felhasználó frissítése a megerősített e-mail címmel."
 
 #. TRANS: Page notice for password recovery page.
-#: actions/recoverpassword.php:160
 msgid ""
 "If you have forgotten or lost your password, you can get a new one sent to "
 "the email address you have stored in your account."
 msgstr ""
 
-#: actions/recoverpassword.php:167
 msgid "You have been identified. Enter a new password below."
 msgstr ""
 
 #. TRANS: Fieldset legend for password recovery page.
-#: actions/recoverpassword.php:198
 msgid "Password recovery"
 msgstr "Jelszó visszaállítása"
 
 #. TRANS: Field label on password recovery page.
-#: actions/recoverpassword.php:202
 msgid "Nickname or email address"
 msgstr "Becenév vagy email cím"
 
 #. TRANS: Title for field label on password recovery page.
-#: actions/recoverpassword.php:205
 msgid "Your nickname on this server, or your registered email address."
 msgstr ""
 
 #. TRANS: Field label on password recovery page.
-#: actions/recoverpassword.php:212
 msgid "Recover"
 msgstr "Alaphelyzetbe állítás"
 
 #. TRANS: Button text on password recovery page.
-#: actions/recoverpassword.php:214
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Recover"
 msgstr "Alaphelyzetbe állítás"
 
 #. TRANS: Title for password recovery page in password reset mode.
-#: actions/recoverpassword.php:223
 msgid "Reset password"
 msgstr "Jelszó alaphelyzetbe állítása"
 
 #. TRANS: Title for password recovery page in password recover mode.
-#: actions/recoverpassword.php:225
 msgid "Recover password"
 msgstr "Elfelejtett jelszó"
 
 #. TRANS: Title for password recovery page in email sent mode.
 #. TRANS: Subject for password recovery e-mail.
-#: actions/recoverpassword.php:227 actions/recoverpassword.php:366
 msgid "Password recovery requested"
 msgstr "Jelszó visszaállítás kérvényezve"
 
 #. TRANS: Title for password recovery page in password saved mode.
-#: actions/recoverpassword.php:229
 #, fuzzy
 msgid "Password saved"
 msgstr "Jelszó elmentve."
 
 #. TRANS: Title for password recovery page when an unknown action has been specified.
-#: actions/recoverpassword.php:232
 msgid "Unknown action"
 msgstr "Ismeretlen művelet"
 
 #. TRANS: Title for field label for password reset form.
-#: actions/recoverpassword.php:258
 #, fuzzy
 msgid "6 or more characters, and do not forget it!"
 msgstr "6 vagy több karakter, és ne felejtsd el!"
 
 #. TRANS: Button text for password reset form.
 #. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: actions/recoverpassword.php:268 lib/designform.php:145
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Reset"
 msgstr "Alaphelyzet"
 
 #. TRANS: Form instructions for password recovery form.
-#: actions/recoverpassword.php:278
 msgid "Enter a nickname or email address."
 msgstr "Adj meg egy nicknevet vagy email címet."
 
 #. TRANS: Information on password recovery form if no known username or e-mail address was specified.
-#: actions/recoverpassword.php:309
 msgid "No user with that email address or username."
 msgstr ""
 
 #. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
-#: actions/recoverpassword.php:327
 msgid "No registered email address for that user."
 msgstr ""
 
 #. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
-#: actions/recoverpassword.php:342
 msgid "Error saving address confirmation."
 msgstr ""
 
 #. TRANS: User notification after an e-mail with instructions was sent from the password recovery form.
-#: actions/recoverpassword.php:370
 msgid ""
 "Instructions for recovering your password have been sent to the email "
 "address registered to your account."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to reset as password without providing a user.
-#: actions/recoverpassword.php:391
 msgid "Unexpected password reset."
 msgstr ""
 
 #. TRANS: Reset password form validation error message.
-#: actions/recoverpassword.php:400
 #, fuzzy
 msgid "Password must be 6 characters or more."
 msgstr "A jelszónak legalább 6 karakterből kell állnia."
 
 #. TRANS: Reset password form validation error message.
-#: actions/recoverpassword.php:405
 msgid "Password and confirmation do not match."
 msgstr "A jelszó és a megerősítése nem egyeznek meg."
 
 #. TRANS: Server error displayed when something does wrong with the user object during password reset.
-#: actions/recoverpassword.php:426 actions/register.php:241
 msgid "Error setting user."
 msgstr "Hiba a felhasználó beállításakor."
 
 #. TRANS: Success message for user after password reset.
-#: actions/recoverpassword.php:434
 msgid "New password successfully saved. You are now logged in."
 msgstr ""
 
-#: actions/redirecturl.php:70
 msgid "No id parameter"
 msgstr ""
 
-#: actions/redirecturl.php:76
 #, fuzzy, php-format
 msgid "No such file \"%d\""
 msgstr "Nincs ilyen fájl."
 
-#: actions/register.php:80 actions/register.php:181 actions/register.php:392
 msgid "Sorry, only invited people can register."
 msgstr "Elnézést, de csak meghívóval lehet regisztrálni."
 
-#: actions/register.php:87
 msgid "Sorry, invalid invitation code."
 msgstr ""
 
-#: actions/register.php:106
 msgid "Registration successful"
 msgstr "A regisztráció sikeres"
 
-#: actions/register.php:108 actions/register.php:490
 msgid "Register"
 msgstr "Regisztráció"
 
-#: actions/register.php:128
 msgid "Registration not allowed."
 msgstr "A regisztráció nem megengedett."
 
-#: actions/register.php:194
 #, fuzzy
 msgid "You cannot register if you don't agree to the license."
 msgstr "Nem tudsz regisztrálni ha nem fogadod el a licencet."
 
-#: actions/register.php:203
 msgid "Email address already exists."
 msgstr "Az e-mail cím már létezik."
 
-#: actions/register.php:236 actions/register.php:258
 msgid "Invalid username or password."
 msgstr "Érvénytelen felhasználónév vagy jelszó."
 
-#: actions/register.php:333
 msgid ""
 "With this form you can create a new account. You can then post notices and "
 "link up to friends and colleagues."
 msgstr ""
 
-#: actions/register.php:424 actions/register.php:428
-#: actions/siteadminpanel.php:238 lib/settingsnav.php:92
 msgid "Email"
 msgstr "E-mail"
 
-#: actions/register.php:425 actions/register.php:429
 #, fuzzy
 msgid "Used only for updates, announcements, and password recovery."
 msgstr ""
 "Csak frissítéskor, fontos közlemények esetén és jelszóproblémák orvoslására "
 "használjuk"
 
-#: actions/register.php:436
 #, fuzzy
 msgid "Longer name, preferably your \"real\" name."
 msgstr "Hosszabb név, célszerűen a \"valódi\" neved"
 
-#: actions/register.php:464
 #, fuzzy
 msgid "Where you are, like \"City, State (or Region), Country\"."
 msgstr "Merre vagy, mint pl. \"Város, Megye, Ország\""
 
-#: actions/register.php:503
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
 msgstr ""
 
-#: actions/register.php:513
 #, php-format
 msgid "My text and files are copyright by %1$s."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:517
 msgid "My text and files remain under my own copyright."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:520
 msgid "All rights reserved."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:525
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
 "email address, IM address, and phone number."
 msgstr ""
 
-#: actions/register.php:566
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -5102,7 +4195,6 @@ msgid ""
 "Thanks for signing up and we hope you enjoy using this service."
 msgstr ""
 
-#: actions/register.php:590
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5110,7 +4202,6 @@ msgstr ""
 "(Hamarosan kapnod kell egy e-mailt az e-mail címed megerősítésére vonatkozó "
 "utasításokkal.)"
 
-#: actions/remotesubscribe.php:97
 #, php-format
 msgid ""
 "To subscribe, you can [login](%%action.login%%), or [register](%%action."
@@ -5118,121 +4209,94 @@ msgid ""
 "microblogging site](%%doc.openmublog%%),  enter your profile URL below."
 msgstr ""
 
-#: actions/remotesubscribe.php:111
 msgid "Remote subscribe"
 msgstr "Távoli feliratkozás"
 
-#: actions/remotesubscribe.php:123
 msgid "Subscribe to a remote user"
 msgstr ""
 
-#: actions/remotesubscribe.php:128
 msgid "User nickname"
 msgstr "Felhasználó beceneve"
 
-#: actions/remotesubscribe.php:129
 msgid "Nickname of the user you want to follow."
 msgstr ""
 
-#: actions/remotesubscribe.php:132
 msgid "Profile URL"
 msgstr "Profil URL"
 
-#: actions/remotesubscribe.php:133
 msgid "URL of your profile on another compatible microblogging service."
 msgstr ""
 
 #. TRANS: Link text for link that will subscribe to a remote profile.
-#: actions/remotesubscribe.php:136 lib/subscribeform.php:139
-#: lib/userprofile.php:402
 msgid "Subscribe"
 msgstr "Kövessük"
 
-#: actions/remotesubscribe.php:158
 msgid "Invalid profile URL (bad format)."
 msgstr ""
 
-#: actions/remotesubscribe.php:167
 msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
 msgstr ""
 
-#: actions/remotesubscribe.php:175
 #, fuzzy
 msgid "That is a local profile! Login to subscribe."
 msgstr "Az a felhasználó blokkolta hogy figyelemmel kövesd."
 
-#: actions/remotesubscribe.php:182
 #, fuzzy
 msgid "Could not get a request token."
 msgstr "Nem sikerült az üzenetet feldolgozni."
 
-#: actions/repeat.php:56
 msgid "Only logged-in users can repeat notices."
 msgstr ""
 
-#: actions/repeat.php:63 actions/repeat.php:70
 msgid "No notice specified."
 msgstr "Nincs hír megjelölve."
 
-#: actions/repeat.php:75
 #, fuzzy
 msgid "You cannot repeat your own notice."
 msgstr "Nem ismételheted meg a saját híredet."
 
-#: actions/repeat.php:89
 msgid "You already repeated that notice."
 msgstr ""
 
-#: actions/repeat.php:112 lib/noticelist.php:697
 msgid "Repeated"
 msgstr ""
 
-#: actions/repeat.php:117
 msgid "Repeated!"
 msgstr ""
 
 #. TRANS: RSS reply feed title. %s is a user nickname.
-#: actions/replies.php:126 actions/repliesrss.php:68
-#: lib/personalgroupnav.php:105
 #, php-format
 msgid "Replies to %s"
 msgstr ""
 
-#: actions/replies.php:128
 #, php-format
 msgid "Replies to %1$s, page %2$d"
 msgstr ""
 
-#: actions/replies.php:145
 #, php-format
 msgid "Replies feed for %s (RSS 1.0)"
 msgstr ""
 
-#: actions/replies.php:152
 #, php-format
 msgid "Replies feed for %s (RSS 2.0)"
 msgstr ""
 
-#: actions/replies.php:159
 #, php-format
 msgid "Replies feed for %s (Atom)"
 msgstr ""
 
-#: actions/replies.php:199
 #, php-format
 msgid ""
 "This is the timeline showing replies to %1$s but %2$s hasn't received a "
 "notice to them yet."
 msgstr ""
 
-#: actions/replies.php:204
 #, php-format
 msgid ""
 "You can engage other users in a conversation, subscribe to more people or "
 "[join groups](%%action.groups%%)."
 msgstr ""
 
-#: actions/replies.php:206
 #, php-format
 msgid ""
 "You can try to [nudge %1$s](../%2$s) or [post something to them](%%%%action."
@@ -5241,223 +4305,182 @@ msgstr ""
 
 #. TRANS: RSS reply feed description.
 #. TRANS: %1$s is a user nickname, %2$s is the StatusNet site name.
-#: actions/repliesrss.php:74
 #, php-format
 msgid "Replies to %1$s on %2$s."
 msgstr ""
 
 #. TRANS: Client exception displayed when trying to restore an account while not logged in.
-#: actions/restoreaccount.php:78
 #, fuzzy
 msgid "Only logged-in users can restore their account."
 msgstr "Csak a felhasználó láthatja a saját postaládáját."
 
 #. TRANS: Client exception displayed when trying to restore an account without having restore rights.
-#: actions/restoreaccount.php:83
 #, fuzzy
 msgid "You may not restore your account."
 msgstr "Nem törölheted más felhasználók állapotait."
 
 #. TRANS: Client exception displayed trying to restore an account while something went wrong uploading a file.
 #. TRANS: Client exception. No file; probably just a non-AJAX submission.
-#: actions/restoreaccount.php:121 actions/restoreaccount.php:146
 #, fuzzy
 msgid "No uploaded file."
 msgstr "Fájl feltöltése"
 
 #. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
-#: actions/restoreaccount.php:129 lib/mediafile.php:194
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
 msgstr ""
 
 #. TRANS: Client exception.
-#: actions/restoreaccount.php:135 lib/mediafile.php:200
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form."
 msgstr ""
 
 #. TRANS: Client exception.
-#: actions/restoreaccount.php:141 lib/mediafile.php:206
 msgid "The uploaded file was only partially uploaded."
 msgstr "A feltöltött fájl csak részben van feltöltve."
 
 #. TRANS: Client exception thrown when a temporary folder is not present to store a file upload.
-#: actions/restoreaccount.php:150 lib/mediafile.php:214
 msgid "Missing a temporary folder."
 msgstr "Hiányzik egy ideiglenes mappa."
 
 #. TRANS: Client exception thrown when writing to disk is not possible during a file upload operation.
-#: actions/restoreaccount.php:154 lib/mediafile.php:218
 msgid "Failed to write file to disk."
 msgstr "Nem sikerült a fájlt lemezre írni."
 
 #. TRANS: Client exception thrown when a file upload operation has been stopped by an extension.
-#: actions/restoreaccount.php:158 lib/mediafile.php:222
 msgid "File upload stopped by extension."
 msgstr "A fájl feltöltése megszakadt a kiterjedése/kiterjesztése miatt."
 
 #. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
 #. TRANS: Exception thrown when uploading an image fails for an unknown reason.
 #. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
-#: actions/restoreaccount.php:164 lib/imagefile.php:106 lib/mediafile.php:228
 msgid "System error uploading file."
 msgstr ""
 
 #. TRANS: Client exception thrown when a feed is not an Atom feed.
-#: actions/restoreaccount.php:207
 #, fuzzy
 msgid "Not an Atom feed."
 msgstr "Összes tag"
 
 #. TRANS: Success message when a feed has been restored.
-#: actions/restoreaccount.php:241
 msgid ""
 "Feed has been restored. Your old posts should now appear in search and your "
 "profile page."
 msgstr ""
 
 #. TRANS: Message when a feed restore is in progress.
-#: actions/restoreaccount.php:245
 msgid "Feed will be restored. Please wait a few minutes for results."
 msgstr ""
 
 #. TRANS: Form instructions for feed restore.
-#: actions/restoreaccount.php:342
 msgid ""
 "You can upload a backed-up stream in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format."
 msgstr ""
 
 #. TRANS: Title for submit button to confirm upload of a user backup file for account restore.
-#: actions/restoreaccount.php:373
 #, fuzzy
 msgid "Upload the file"
 msgstr "Fájl feltöltése"
 
-#: actions/revokerole.php:75
 msgid "You cannot revoke user roles on this site."
 msgstr ""
 
-#: actions/revokerole.php:82
 msgid "User doesn't have this role."
 msgstr ""
 
-#: actions/rsd.php:142 actions/version.php:159
 msgid "StatusNet"
 msgstr "StatusNet"
 
-#: actions/sandbox.php:65 actions/unsandbox.php:65
 msgid "You cannot sandbox users on this site."
 msgstr ""
 
-#: actions/sandbox.php:72
 msgid "User is already sandboxed."
 msgstr ""
 
 #. TRANS: Menu item for site administration
-#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
-#: lib/adminpanelaction.php:379
 msgid "Sessions"
 msgstr "Munkamenetek"
 
-#: actions/sessionsadminpanel.php:65
 msgid "Session settings for this StatusNet site"
 msgstr ""
 
-#: actions/sessionsadminpanel.php:175
 msgid "Handle sessions"
 msgstr "Kezeljük a munkameneteket"
 
-#: actions/sessionsadminpanel.php:177
 msgid "Whether to handle sessions ourselves."
 msgstr "Mi magunk kezeljük-e a munkameneteket."
 
-#: actions/sessionsadminpanel.php:181
 msgid "Session debugging"
 msgstr ""
 
-#: actions/sessionsadminpanel.php:183
 msgid "Turn on debugging output for sessions."
 msgstr ""
 
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
+#. TRANS: Submit button title.
+msgid "Save"
+msgstr "Mentés"
+
 msgid "Save site settings"
 msgstr "Mentsük el a webhely beállításait"
 
-#: actions/showapplication.php:78
 msgid "You must be logged in to view an application."
 msgstr ""
 
-#: actions/showapplication.php:151
 msgid "Application profile"
 msgstr ""
 
-#: actions/showapplication.php:179
 #, php-format
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr ""
 
-#: actions/showapplication.php:189
 msgid "Application actions"
 msgstr ""
 
-#: actions/showapplication.php:212
 msgid "Reset key & secret"
 msgstr ""
 
 #. TRANS: Title of form for deleting a user.
-#: actions/showapplication.php:228 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:64 lib/noticelist.php:678
 msgid "Delete"
 msgstr "Törlés"
 
-#: actions/showapplication.php:237
 msgid "Application info"
 msgstr ""
 
-#: actions/showapplication.php:255
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
 msgstr ""
 
-#: actions/showapplication.php:275
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr ""
 
 #. TRANS: Title for all but the first page of favourite notices of a user.
 #. TRANS: %1$s is the user for whom the favourite notices are displayed, %2$d is the page number.
-#: actions/showfavorites.php:80
 #, php-format
 msgid "%1$s's favorite notices, page %2$d"
 msgstr ""
 
 #. TRANS: Server error displayed when favourite notices could not be retrieved from the database.
-#: actions/showfavorites.php:134
 msgid "Could not retrieve favorite notices."
 msgstr "Nem sikerült a kedvenc híreket lekérni."
 
 #. TRANS: Feed link text. %s is a username.
-#: actions/showfavorites.php:172
 #, php-format
 msgid "Feed for favorites of %s (RSS 1.0)"
 msgstr "%s kedvenceinek RSS 1.0 hírcsatornája"
 
 #. TRANS: Feed link text. %s is a username.
-#: actions/showfavorites.php:180
 #, php-format
 msgid "Feed for favorites of %s (RSS 2.0)"
 msgstr "%s kedvenceinek RSS 2.0 hírcsatornája"
 
 #. TRANS: Feed link text. %s is a username.
-#: actions/showfavorites.php:188
 #, php-format
 msgid "Feed for favorites of %s (Atom)"
 msgstr "%s kedvenceinek Atom hírcsatornája"
 
 #. TRANS: Text displayed instead of favourite notices for the current logged in user that has no favourites.
-#: actions/showfavorites.php:209
 msgid ""
 "You haven't chosen any favorite notices yet. Click the fave button on "
 "notices you like to bookmark them for later or shed a spotlight on them."
@@ -5465,7 +4488,6 @@ msgstr ""
 
 #. TRANS: Text displayed instead of favourite notices for a user that has no favourites while logged in.
 #. TRANS: %s is a username.
-#: actions/showfavorites.php:213
 #, php-format
 msgid ""
 "%s hasn't added any favorite notices yet. Post something interesting they "
@@ -5475,7 +4497,6 @@ msgstr ""
 #. TRANS: Text displayed instead of favourite notices for a user that has no favourites while not logged in.
 #. TRANS: %s is a username, %%%%action.register%%%% is a link to the user registration page.
 #. TRANS: (link text)[link] is a Mark Down link.
-#: actions/showfavorites.php:220
 #, php-format
 msgid ""
 "%s hasn't added any favorite notices yet. Why not [register an account](%%%%"
@@ -5484,64 +4505,53 @@ msgid ""
 msgstr ""
 
 #. TRANS: Page notice for show favourites page.
-#: actions/showfavorites.php:251
 msgid "This is a way to share what you like."
 msgstr "Ez az egyik módja annak, hogy megoszd amit kedvelsz."
 
 #. TRANS: Page title for first group page. %s is a group name.
-#: actions/showgroup.php:75
 #, php-format
 msgid "%s group"
 msgstr "%s csoport"
 
 #. TRANS: Page title for any but first group page.
 #. TRANS: %1$s is a group name, $2$s is a page number.
-#: actions/showgroup.php:79
 #, php-format
 msgid "%1$s group, page %2$d"
 msgstr "%1$s csoport, %2$d. oldal"
 
 #. TRANS: Label for group description or group note (dt). Text hidden by default.
-#: actions/showgroup.php:266
 msgid "Note"
 msgstr "Megjegyzés"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:277 lib/groupeditform.php:180
 msgid "Aliases"
 msgstr "Álnevek"
 
 #. TRANS: Group actions header (h2). Text hidden by default.
-#: actions/showgroup.php:294
 msgid "Group actions"
 msgstr "Csoport-tevékenységek"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:338
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
 msgstr "%s csoport RSS 1.0 hírcsatornája"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:345
 #, php-format
 msgid "Notice feed for %s group (RSS 2.0)"
 msgstr "%s csoport RSS 2.0 hírcsatornája"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:352
 #, php-format
 msgid "Notice feed for %s group (Atom)"
 msgstr "%s csoport Atom hírcsatornája"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:358
 #, php-format
 msgid "FOAF for %s group"
 msgstr "FOAF a %s csoportnak"
 
 #. TRANS: Header for mini list of group members on a group page (h2).
-#: actions/showgroup.php:395
 msgid "Members"
 msgstr "Tagok"
 
@@ -5549,31 +4559,24 @@ msgstr "Tagok"
 #. TRANS: Text for user subscription statistics if the user has no subscriptions.
 #. TRANS: Text for user subscriber statistics if user has no subscribers.
 #. TRANS: Text for user user group membership statistics if user is not a member of any group.
-#: actions/showgroup.php:401 lib/profileaction.php:137
-#: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
-#: lib/subscriptionlist.php:123 lib/tagcloudsection.php:71
 msgid "(None)"
 msgstr "(nincs)"
 
 #. TRANS: Link to all group members from mini list of group members if group has more than n members.
-#: actions/showgroup.php:410
 msgid "All members"
 msgstr "Összes tag"
 
 #. TRANS: Header for group statistics on a group page (h2).
 #. TRANS: H2 text for user statistics.
-#: actions/showgroup.php:441 lib/profileaction.php:205
 msgid "Statistics"
 msgstr "Statisztika"
 
-#: actions/showgroup.php:444
 #, fuzzy
 msgctxt "LABEL"
 msgid "Created"
 msgstr "Létrehoztuk"
 
 #. TRANS: Label for member count in statistics on group page.
-#: actions/showgroup.php:449
 #, fuzzy
 msgctxt "LABEL"
 msgid "Members"
@@ -5583,7 +4586,6 @@ msgstr "Tagok"
 #. TRANS: **%s** is the group alias, %%%%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).
-#: actions/showgroup.php:464
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5602,7 +4604,6 @@ 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: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
-#: actions/showgroup.php:474
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5612,99 +4613,83 @@ msgid ""
 msgstr ""
 
 #. TRANS: Header for list of group administrators on a group page (h2).
-#: actions/showgroup.php:503
 msgid "Admins"
 msgstr "Adminisztrátorok"
 
 #. TRANS: Client error displayed requesting a single message that does not exist.
-#: actions/showmessage.php:76
 msgid "No such message."
 msgstr "Nincs ilyen üzenet."
 
 #. TRANS: Client error displayed requesting a single direct message the requesting user was not a party in.
-#: actions/showmessage.php:86
 msgid "Only the sender and recipient may read this message."
 msgstr "Csak a küldő és a címzett olvashatja ezt az üzenetet."
 
 #. TRANS: Page title for single direct message display when viewing user is the sender.
 #. TRANS: %1$s is the addressed user's nickname, $2$s is a timestamp.
-#: actions/showmessage.php:105
 #, php-format
 msgid "Message to %1$s on %2$s"
 msgstr ""
 
 #. TRANS: Page title for single message display.
 #. TRANS: %1$s is the sending user's nickname, $2$s is a timestamp.
-#: actions/showmessage.php:113
 #, php-format
 msgid "Message from %1$s on %2$s"
 msgstr ""
 
-#: actions/shownotice.php:90
 msgid "Notice deleted."
 msgstr "A hírt töröltük."
 
 #. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
-#: actions/showstream.php:70
 #, fuzzy, php-format
 msgid "%1$s tagged %2$s"
 msgstr "  %s megcímkézve"
 
 #. TRANS: Page title showing tagged notices in one user's stream.
 #. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
-#: actions/showstream.php:74
 #, fuzzy, php-format
 msgid "%1$s tagged %2$s, page %3$d"
 msgstr "%1$s és barátai, %2$d oldal"
 
 #. TRANS: Extended page title showing tagged notices in one user's stream.
 #. TRANS: %1$s is the username, %2$d is the page number.
-#: actions/showstream.php:82
 #, php-format
 msgid "%1$s, page %2$d"
 msgstr ""
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %1$s is a user nickname, %2$s is a hashtag.
-#: actions/showstream.php:127
 #, php-format
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
 msgstr "RSS 1.0 csatorna %1$s %2$s címkéjű híreiből"
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.
-#: actions/showstream.php:136
 #, php-format
 msgid "Notice feed for %s (RSS 1.0)"
 msgstr "%s RSS 1.0 hírcsatornája"
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.
-#: actions/showstream.php:145
 #, php-format
 msgid "Notice feed for %s (RSS 2.0)"
 msgstr "%s RSS 2.0 hírcsatornája"
 
-#: actions/showstream.php:152
 #, php-format
 msgid "Notice feed for %s (Atom)"
 msgstr "%s Atom hírcsatornája"
 
 #. TRANS: Title for link to notice feed. FOAF stands for Friend of a Friend.
 #. TRANS: More information at http://www.foaf-project.org. %s is a user nickname.
-#: actions/showstream.php:159
 #, php-format
 msgid "FOAF for %s"
 msgstr ""
 
 #. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
-#: actions/showstream.php:205
 #, fuzzy, php-format
 msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr "Ez %1$s története, de %2$s még nem tett közzé hírt."
 
 #. TRANS: Second sentence of empty list message for a stream for the user themselves.
-#: actions/showstream.php:211
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
@@ -5712,7 +4697,6 @@ msgstr ""
 
 #. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:215
 #, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
@@ -5721,7 +4705,6 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:258
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5737,7 +4720,6 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:265
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5749,289 +4731,229 @@ msgstr ""
 "status.net/) szoftverre épült. "
 
 #. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
-#: actions/showstream.php:322
 #, php-format
 msgid "Repeat of %s"
 msgstr "%s ismétlése"
 
-#: actions/silence.php:65 actions/unsilence.php:65
 msgid "You cannot silence users on this site."
 msgstr "Ezen a webhelyen nem hallgattathatod el a felhasználókat."
 
-#: actions/silence.php:72
 msgid "User is already silenced."
 msgstr "A felhasználó már el van hallgattatva."
 
-#: actions/siteadminpanel.php:69
 msgid "Basic settings for this StatusNet site"
 msgstr ""
 
-#: actions/siteadminpanel.php:133
 msgid "Site name must have non-zero length."
 msgstr "A webhely nevének legalább egy karakter hosszúnak kell lennie."
 
-#: actions/siteadminpanel.php:141
 msgid "You must have a valid contact email address."
 msgstr "Valódi kapcsolattartó email címet kell megadnod."
 
-#: actions/siteadminpanel.php:159
 #, php-format
 msgid "Unknown language \"%s\"."
 msgstr "Ismeretlen nyelv: \"%s\"."
 
-#: actions/siteadminpanel.php:165
 msgid "Minimum text limit is 0 (unlimited)."
 msgstr ""
 
-#: actions/siteadminpanel.php:171
 msgid "Dupe limit must be one or more seconds."
 msgstr ""
 
-#: actions/siteadminpanel.php:221
 msgid "General"
 msgstr "Általános"
 
-#: actions/siteadminpanel.php:224
 msgid "Site name"
 msgstr "A webhely neve"
 
-#: actions/siteadminpanel.php:225
 msgid "The name of your site, like \"Yourcompany Microblog\""
 msgstr ""
 
-#: actions/siteadminpanel.php:229
 msgid "Brought by"
 msgstr ""
 
-#: actions/siteadminpanel.php:230
 msgid "Text used for credits link in footer of each page"
 msgstr ""
 
-#: actions/siteadminpanel.php:234
 msgid "Brought by URL"
 msgstr ""
 
-#: actions/siteadminpanel.php:235
 msgid "URL used for credits link in footer of each page"
 msgstr ""
 
-#: actions/siteadminpanel.php:239
 msgid "Contact email address for your site"
 msgstr "A webhelyhez tartozó kapcsolattartó email cím"
 
-#: actions/siteadminpanel.php:245
 msgid "Local"
 msgstr "Helyi"
 
-#: actions/siteadminpanel.php:256
 msgid "Default timezone"
 msgstr "Alapértelmezett időzóna"
 
-#: actions/siteadminpanel.php:257
 msgid "Default timezone for the site; usually UTC."
 msgstr "A webhely alapértelmezett időzónája; többnyire GMT+1."
 
-#: actions/siteadminpanel.php:262
 msgid "Default language"
 msgstr "Alapértelmezett nyelv"
 
-#: actions/siteadminpanel.php:263
 msgid "Site language when autodetection from browser settings is not available"
 msgstr ""
 
-#: actions/siteadminpanel.php:271
 msgid "Limits"
 msgstr "Korlátok"
 
-#: actions/siteadminpanel.php:274
 msgid "Text limit"
 msgstr "Szöveg hosszának korlátja"
 
-#: actions/siteadminpanel.php:274
 msgid "Maximum number of characters for notices."
 msgstr "A hírek maximális karakterszáma."
 
-#: actions/siteadminpanel.php:278
 msgid "Dupe limit"
 msgstr "Duplázások korlátja"
 
-#: actions/siteadminpanel.php:278
 msgid "How long users must wait (in seconds) to post the same thing again."
 msgstr ""
 
 #. TRANS: Page title for site-wide notice tab in admin panel.
-#: actions/sitenoticeadminpanel.php:55
 msgid "Site Notice"
 msgstr ""
 
 #. TRANS: Instructions for site-wide notice tab in admin panel.
-#: actions/sitenoticeadminpanel.php:66
 msgid "Edit site-wide message"
 msgstr ""
 
 #. TRANS: Server error displayed when saving a site-wide notice was impossible.
-#: actions/sitenoticeadminpanel.php:101
 msgid "Unable to save site notice."
 msgstr ""
 
 #. TRANS: Client error displayed when a site-wide notice was longer than allowed.
-#: actions/sitenoticeadminpanel.php:112
 msgid "Maximum length for the site-wide notice is 255 characters."
 msgstr ""
 
 #. TRANS: Label for site-wide notice text field in admin panel.
-#: actions/sitenoticeadminpanel.php:176
 msgid "Site notice text"
 msgstr ""
 
 #. TRANS: Tooltip for site-wide notice text field in admin panel.
-#: actions/sitenoticeadminpanel.php:179
 msgid "Site-wide notice text (255 characters maximum; HTML allowed)"
 msgstr ""
 
 #. TRANS: Title for button to save site notice in admin panel.
-#: actions/sitenoticeadminpanel.php:201
 #, fuzzy
 msgid "Save site notice."
 msgstr "A webhely híre"
 
 #. TRANS: Title for SMS settings.
-#: actions/smssettings.php:56
 msgid "SMS settings"
 msgstr "SMS beállítások"
 
 #. TRANS: SMS settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/smssettings.php:70
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr ""
 
 #. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
-#: actions/smssettings.php:92
 msgid "SMS is not available."
 msgstr "Az SMS nem elérhető."
 
 #. TRANS: Form legend for SMS settings form.
-#: actions/smssettings.php:106
 msgid "SMS address"
 msgstr ""
 
 #. TRANS: Form guide in SMS settings form.
-#: actions/smssettings.php:115
 msgid "Current confirmed SMS-enabled phone number."
 msgstr ""
 
 #. TRANS: Form guide in IM settings form.
-#: actions/smssettings.php:128
 msgid "Awaiting confirmation on this phone number."
 msgstr "Ez a telefonszám ellenőrzésre vár."
 
 #. TRANS: Field label for SMS address input in SMS settings form.
-#: actions/smssettings.php:137
 msgid "Confirmation code"
 msgstr ""
 
 #. TRANS: Form field instructions in SMS settings form.
-#: actions/smssettings.php:139
 msgid "Enter the code you received on your phone."
 msgstr "Add meg a kódot amit a telefonodra kaptál."
 
 #. TRANS: Button label to confirm SMS confirmation code in SMS settings.
-#: actions/smssettings.php:143
 msgctxt "BUTTON"
 msgid "Confirm"
 msgstr "Megerősítés"
 
 #. TRANS: Field label for SMS phone number input in SMS settings form.
-#: actions/smssettings.php:148
 msgid "SMS phone number"
 msgstr "SMS telefonszám"
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
-#: actions/smssettings.php:151
 #, fuzzy
 msgid "Phone number, no punctuation or spaces, with area code."
 msgstr "1-64 kisbetű vagy számjegy, nem lehet benne írásjel vagy szóköz"
 
 #. TRANS: Form legend for SMS preferences form.
-#: actions/smssettings.php:190
 msgid "SMS preferences"
 msgstr ""
 
 #. TRANS: Checkbox label in SMS preferences form.
-#: actions/smssettings.php:196
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
 msgstr ""
 
 #. TRANS: Confirmation message for successful SMS preferences save.
-#: actions/smssettings.php:307
 msgid "SMS preferences saved."
 msgstr ""
 
 #. TRANS: Message given saving SMS phone number without having provided one.
-#: actions/smssettings.php:329
 msgid "No phone number."
 msgstr "Nincs telefonszám."
 
 #. TRANS: Message given saving SMS phone number without having selected a carrier.
-#: actions/smssettings.php:335
 msgid "No carrier selected."
 msgstr ""
 
 #. TRANS: Message given saving SMS phone number that is already set.
-#: actions/smssettings.php:343
 msgid "That is already your phone number."
 msgstr ""
 
 #. TRANS: Message given saving SMS phone number that is already set for another user.
-#: actions/smssettings.php:347
 msgid "That phone number already belongs to another user."
 msgstr ""
 
 #. TRANS: Message given saving valid SMS phone number that is to be confirmed.
-#: actions/smssettings.php:375
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
 "for the code and instructions on how to use it."
 msgstr ""
 
 #. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
-#: actions/smssettings.php:403
 msgid "That is the wrong confirmation number."
 msgstr ""
 
 #. TRANS: Message given after successfully canceling SMS phone number confirmation.
-#: actions/smssettings.php:417
 msgid "SMS confirmation cancelled."
 msgstr ""
 
 #. TRANS: Message given trying to remove an SMS phone number that is not
 #. TRANS: registered for the active user.
-#: actions/smssettings.php:437
 msgid "That is not your phone number."
 msgstr ""
 
 #. TRANS: Message given after successfully removing a registered SMS phone number.
-#: actions/smssettings.php:459
 msgid "The SMS phone number was removed."
 msgstr ""
 
 #. TRANS: Label for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:498
 msgid "Mobile carrier"
 msgstr "Mobilszolgáltató"
 
 #. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:503
 msgid "Select a carrier"
 msgstr "Válassz egy szolgáltatót"
 
 #. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
 #. TRANS: %s is an administrative contact's e-mail address.
-#: actions/smssettings.php:512
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -6039,119 +4961,94 @@ msgid ""
 msgstr ""
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
-#: actions/smssettings.php:534
 #, fuzzy
 msgid "No code entered."
 msgstr "Nincs kód megadva"
 
 #. TRANS: Menu item for site administration
-#: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
-#: lib/adminpanelaction.php:395
 msgid "Snapshots"
 msgstr "Pillanatképek"
 
-#: actions/snapshotadminpanel.php:65
 msgid "Manage snapshot configuration"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:127
 msgid "Invalid snapshot run value."
 msgstr ""
 
-#: actions/snapshotadminpanel.php:133
 msgid "Snapshot frequency must be a number."
 msgstr ""
 
-#: actions/snapshotadminpanel.php:144
 msgid "Invalid snapshot report URL."
 msgstr ""
 
-#: actions/snapshotadminpanel.php:200
 msgid "Randomly during web hit"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:201
 msgid "In a scheduled job"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:206
 msgid "Data snapshots"
 msgstr "Adat pillanatképek"
 
-#: actions/snapshotadminpanel.php:208
 msgid "When to send statistical data to status.net servers"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:217
 msgid "Frequency"
 msgstr "Gyakoriság"
 
-#: actions/snapshotadminpanel.php:218
 msgid "Snapshots will be sent once every N web hits"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:226
 msgid "Report URL"
 msgstr "URL jelentése"
 
-#: actions/snapshotadminpanel.php:227
 msgid "Snapshots will be sent to this URL"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:248
 msgid "Save snapshot settings"
 msgstr ""
 
 #. TRANS: Client error displayed trying a change a subscription for a non-subscribed profile.
-#: actions/subedit.php:75
 msgid "You are not subscribed to that profile."
 msgstr ""
 
 #. TRANS: Server error displayed when updating a subscription fails with a database error.
 #. TRANS: Exception thrown when a subscription could not be stored on the server.
-#: actions/subedit.php:89 classes/Subscription.php:141
 msgid "Could not save subscription."
 msgstr ""
 
 #. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
-#: actions/subscribe.php:121
 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
 msgstr ""
 
 #. TRANS: Page title when subscription succeeded.
-#: actions/subscribe.php:149
 msgid "Subscribed"
 msgstr "Feliratkozott"
 
 #. TRANS: Header for list of subscribers for a user (first page).
 #. TRANS: %s is the user's nickname.
-#: actions/subscribers.php:51
 #, php-format
 msgid "%s subscribers"
 msgstr ""
 
 #. TRANS: Header for list of subscribers for a user (not first page).
 #. TRANS: %1$s is the user's nickname, $2$d is the page number.
-#: actions/subscribers.php:55
 #, php-format
 msgid "%1$s subscribers, page %2$d"
 msgstr ""
 
 #. TRANS: Page notice for page with an overview of all subscribers
 #. TRANS: of the logged in user's own profile.
-#: actions/subscribers.php:68
 msgid "These are the people who listen to your notices."
 msgstr ""
 
 #. TRANS: Page notice for page with an overview of all subscribers of a user other
 #. TRANS: than the logged in user. %s is the user nickname.
-#: actions/subscribers.php:74
 #, php-format
 msgid "These are the people who listen to %s's notices."
 msgstr "Ezek azok az emberek, akik odafigyelnek %s híreire."
 
 #. TRANS: Subscriber list text when the logged in user has no subscribers.
-#: actions/subscribers.php:114
 msgid ""
 "You have no subscribers. Try subscribing to people you know and they might "
 "return the favor."
@@ -6159,7 +5056,6 @@ msgstr ""
 
 #. TRANS: Subscriber list text when looking at the subscribers for a of a user other
 #. TRANS: than the logged in user that has no subscribers. %s is the user nickname.
-#: actions/subscribers.php:118
 #, php-format
 msgid "%s has no subscribers. Want to be the first?"
 msgstr ""
@@ -6169,7 +5065,6 @@ msgstr ""
 #. TRANS: This message contains a Markdown URL. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.
-#: actions/subscribers.php:127
 #, php-format
 msgid ""
 "%s has no subscribers. Why not [register an account](%%%%action.register%%%"
@@ -6178,20 +5073,17 @@ msgstr ""
 
 #. TRANS: Header for subscriptions overview for a user (not first page).
 #. TRANS: %1$s is a user nickname, %2$d is the page number.
-#: actions/subscriptions.php:55
 #, php-format
 msgid "%1$s subscriptions, page %2$d"
 msgstr ""
 
 #. TRANS: Page notice for page with an overview of all subscriptions
 #. TRANS: of the logged in user's own profile.
-#: actions/subscriptions.php:68
 msgid "These are the people whose notices you listen to."
 msgstr "Ezek azok az emberek, akiknek a híreire odafigyelsz."
 
 #. TRANS: Page notice for page with an overview of all subscriptions of a user other
 #. TRANS: than the logged in user. %s is the user nickname.
-#: actions/subscriptions.php:74
 #, php-format
 msgid "These are the people whose notices %s listens to."
 msgstr ""
@@ -6200,7 +5092,6 @@ msgstr ""
 #. 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.
-#: actions/subscriptions.php:133
 #, php-format
 msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "
@@ -6214,287 +5105,229 @@ msgstr ""
 #. TRANS: than the logged in user that has no subscriptions. %s is the user nickname.
 #. TRANS: Subscription list text when looking at the subscriptions for a of a user that has none
 #. TRANS: as an anonymous user. %s is the user nickname.
-#: actions/subscriptions.php:141 actions/subscriptions.php:147
 #, php-format
 msgid "%s is not listening to anyone."
 msgstr "%s nem követ figyelemmel senkit."
 
 #. TRANS: Atom feed title. %s is a profile nickname.
-#: actions/subscriptions.php:176
 #, fuzzy, php-format
 msgid "Subscription feed for %s (Atom)"
 msgstr "%s Atom hírcsatornája"
 
 #. TRANS: Checkbox label for enabling Jabber messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:241 lib/settingsnav.php:110
 msgid "IM"
 msgstr ""
 
 #. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:256 lib/settingsnav.php:117
 msgid "SMS"
 msgstr "SMS"
 
 #. TRANS: Title for all but the first page of notices with tags.
 #. TRANS: %1$s is the tag, %2$d is the page number.
-#: actions/tag.php:73
 #, php-format
 msgid "Notices tagged with %1$s, page %2$d"
 msgstr ""
 
-#: actions/tag.php:91
 #, php-format
 msgid "Notice feed for tag %s (RSS 1.0)"
 msgstr "%s címke RSS 1.0 hírcsatornája"
 
-#: actions/tag.php:97
 #, php-format
 msgid "Notice feed for tag %s (RSS 2.0)"
 msgstr "%s címke RSS 2.0 hírcsatornája"
 
-#: actions/tag.php:103
 #, php-format
 msgid "Notice feed for tag %s (Atom)"
 msgstr "%s címke Atom hírcsatornája"
 
-#: actions/tagother.php:39
 msgid "No ID argument."
 msgstr ""
 
-#: actions/tagother.php:65
 #, php-format
 msgid "Tag %s"
 msgstr ""
 
 #. TRANS: H2 for user profile information.
-#: actions/tagother.php:77 lib/userprofile.php:76
 msgid "User profile"
 msgstr "Felhasználói profil"
 
-#: actions/tagother.php:120
 msgid "Tag user"
 msgstr ""
 
-#: actions/tagother.php:130
 msgid ""
 "Tags for this user (letters, numbers, -, ., and _), comma- or space- "
 "separated"
 msgstr ""
 
-#: actions/tagother.php:157
 #, php-format
 msgid "Invalid tag: \"%s\""
 msgstr "Érvénytelen címke: \"%s\""
 
-#: actions/tagother.php:172
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 
-#: actions/tagother.php:215
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
 
-#: actions/tagrss.php:35
 msgid "No such tag."
 msgstr "Nincs ilyen címke."
 
 #. TRANS: Client error displayed when trying to unblock a non-blocked user.
-#: actions/unblock.php:59
 msgid "You haven't blocked that user."
 msgstr ""
 
-#: actions/unsandbox.php:72
 msgid "User is not sandboxed."
 msgstr ""
 
-#: actions/unsilence.php:72
 msgid "User is not silenced."
 msgstr ""
 
-#: actions/unsubscribe.php:77
 msgid "No profile ID in request."
 msgstr ""
 
-#: actions/unsubscribe.php:98
 msgid "Unsubscribed"
 msgstr ""
 
-#: actions/updateprofile.php:64
 #, php-format
 msgid ""
 "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
 msgstr ""
 
-#: actions/urlsettings.php:60
 #, fuzzy
 msgid "URL settings"
 msgstr "IM beállítások"
 
 #. TRANS: Instructions for tab "Other" in user profile settings.
-#: actions/urlsettings.php:72
 msgid "Manage various other options."
 msgstr "Számos egyéb beállítás kezelése."
 
 #. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
 #. TRANS: user's profile settings. This message has one space at the beginning. Use your
 #. TRANS: language's word separator here if it has one (most likely a single space).
-#: actions/urlsettings.php:115
 msgid " (free service)"
 msgstr " (ingyenes szolgáltatás)"
 
-#: actions/urlsettings.php:121
 msgid "[none]"
 msgstr ""
 
-#: actions/urlsettings.php:122
 msgid "[internal]"
 msgstr ""
 
 #. TRANS: Label for dropdown with URL shortener services.
-#: actions/urlsettings.php:130
 msgid "Shorten URLs with"
 msgstr ""
 
 #. TRANS: Tooltip for for dropdown with URL shortener services.
-#: actions/urlsettings.php:132
 msgid "Automatic shortening service to use."
 msgstr ""
 
-#: actions/urlsettings.php:138
 msgid "URL longer than"
 msgstr ""
 
-#: actions/urlsettings.php:141
 msgid "URLs longer than this will be shortened, 0 means always shorten."
 msgstr ""
 
-#: actions/urlsettings.php:145
 msgid "Text longer than"
 msgstr ""
 
-#: actions/urlsettings.php:148
 msgid ""
 "URLs in notices longer than this will be shortened, 0 means always shorten."
 msgstr ""
 
 #. TRANS: Form validation error for form "Other settings" in user profile.
-#: actions/urlsettings.php:180
 #, fuzzy
 msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr "A nyelv túl hosszú (legfeljebb 50 karakter lehet)."
 
-#: actions/urlsettings.php:187
 msgid "Invalid number for max url length."
 msgstr ""
 
-#: actions/urlsettings.php:193
 #, fuzzy
 msgid "Invalid number for max notice length."
 msgstr "Érvénytelen megjegyzéstartalom."
 
-#: actions/urlsettings.php:238
 msgid "Error saving user URL shortening preferences."
 msgstr ""
 
 #. TRANS: User admin panel title
-#: actions/useradminpanel.php:58
 msgctxt "TITLE"
 msgid "User"
 msgstr ""
 
 #. TRANS: Instruction for user admin panel.
-#: actions/useradminpanel.php:69
 msgid "User settings for this StatusNet site"
 msgstr ""
 
 #. TRANS: Form validation error in user admin panel when a non-numeric character limit was set.
-#: actions/useradminpanel.php:147
 msgid "Invalid bio limit. Must be numeric."
 msgstr ""
 
 #. TRANS: Form validation error in user admin panel when welcome text is too long.
-#: actions/useradminpanel.php:154
 #, fuzzy
 msgid "Invalid welcome text. Maximum length is 255 characters."
 msgstr "Érvénytelen SSL szerver. A maximális hossz 255 karakter."
 
 #. TRANS: Client error displayed when trying to set a non-existing user as default subscription for new
 #. TRANS: users in user admin panel. %1$s is the invalid nickname.
-#: actions/useradminpanel.php:166
 #, php-format
 msgid "Invalid default subscripton: \"%1$s\" is not a user."
 msgstr ""
 
-#: actions/useradminpanel.php:215 lib/action.php:565 lib/settingsnav.php:77
-#: lib/subgroupnav.php:81
 msgid "Profile"
 msgstr "Profil"
 
 #. TRANS: Field label in user admin panel for setting the character limit for the bio field.
-#: actions/useradminpanel.php:220
 msgid "Bio Limit"
 msgstr "Bemutatkozás méretkorlátja"
 
 #. TRANS: Tooltip in user admin panel for setting the character limit for the bio field.
-#: actions/useradminpanel.php:222
 msgid "Maximum length of a profile bio in characters."
 msgstr ""
 
 #. TRANS: Form legend in user admin panel.
-#: actions/useradminpanel.php:231
 msgid "New users"
 msgstr "Új felhasználók"
 
 #. TRANS: Field label in user admin panel for setting new user welcome text.
-#: actions/useradminpanel.php:236
 msgid "New user welcome"
 msgstr ""
 
 #. TRANS: Tooltip in user admin panel for setting new user welcome text.
-#: actions/useradminpanel.php:238
 #, fuzzy
 msgid "Welcome text for new users (maximum 255 characters)."
 msgstr "A teljes név túl hosszú (legfeljebb 255 karakter lehet)."
 
 #. TRANS: Field label in user admin panel for setting default subscription for new users.
-#: actions/useradminpanel.php:244
 msgid "Default subscription"
 msgstr ""
 
 #. TRANS: Tooltip in user admin panel for setting default subscription for new users.
-#: actions/useradminpanel.php:246
 msgid "Automatically subscribe new users to this user."
 msgstr ""
 
 #. TRANS: Form legend in user admin panel.
-#: actions/useradminpanel.php:256
 msgid "Invitations"
 msgstr "Meghívások"
 
 #. TRANS: Field label for checkbox in user admin panel for allowing users to invite friend using site e-mail.
-#: actions/useradminpanel.php:262
 msgid "Invitations enabled"
 msgstr "A meghívások engedélyezve vannak"
 
 #. TRANS: Tooltip for checkbox in user admin panel for allowing users to invite friend using site e-mail.
-#: actions/useradminpanel.php:265
 msgid "Whether to allow users to invite new users."
 msgstr ""
 
 #. TRANS: Title for button to save user settings in user admin panel.
-#: actions/useradminpanel.php:302
 #, fuzzy
 msgid "Save user settings."
 msgstr "Mentsük el a webhely beállításait"
 
 #. TRANS: Page title.
-#: actions/userauthorization.php:109
 msgid "Authorize subscription"
 msgstr "Feliratkozás engedélyezése"
 
 #. TRANS: Page notice on "Auhtorize subscription" page.
-#: actions/userauthorization.php:115
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
 "user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
@@ -6502,42 +5335,35 @@ msgid ""
 msgstr ""
 
 #. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:200
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Accept"
 msgstr "Elfogadás"
 
 #. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:202
 #, fuzzy
 msgid "Subscribe to this user."
 msgstr "Ezen felhasználók híreire már feliratkoztál:"
 
 #. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:204
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Reject"
 msgstr "Visszautasítás"
 
 #. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:206
 #, fuzzy
 msgid "Reject this subscription."
 msgstr "Feliratkozás engedélyezése"
 
 #. TRANS: Client error displayed for an empty authorisation request.
-#: actions/userauthorization.php:219
 msgid "No authorization request!"
 msgstr ""
 
 #. TRANS: Accept message header from Authorise subscription page.
-#: actions/userauthorization.php:242
 msgid "Subscription authorized"
 msgstr ""
 
-#: actions/userauthorization.php:245
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to authorize the "
@@ -6545,11 +5371,9 @@ msgid ""
 msgstr ""
 
 #. TRANS: Reject message header from Authorise subscription page.
-#: actions/userauthorization.php:256
 msgid "Subscription rejected"
 msgstr ""
 
-#: actions/userauthorization.php:259
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to fully reject the "
@@ -6558,35 +5382,30 @@ msgstr ""
 
 #. TRANS: Exception thrown when no valid user is found for an authorisation request.
 #. TRANS: %s is a listener URI.
-#: actions/userauthorization.php:296
 #, php-format
 msgid "Listener URI \"%s\" not found here."
 msgstr ""
 
 #. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
 #. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:303
 #, fuzzy, php-format
 msgid "Listenee URI \"%s\" is too long."
 msgstr "A forrás URL túl hosszú."
 
 #. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
 #. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:311
 #, php-format
 msgid "Listenee URI \"%s\" is a local user."
 msgstr ""
 
 #. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
 #. TRANS: %s is a profile URL.
-#: actions/userauthorization.php:329
 #, php-format
 msgid "Profile URL \"%s\" is for a local user."
 msgstr ""
 
 #. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
 #. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
-#: actions/userauthorization.php:339
 #, fuzzy, php-format
 msgid ""
 "Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
@@ -6595,75 +5414,61 @@ msgstr "A hír licence ‘%1$s’ nem kompatibilis a webhely licencével ‘%2$s
 
 #. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
 #. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:349
 #, fuzzy, php-format
 msgid "Avatar URL \"%s\" is not valid."
 msgstr "A forrás URL nem érvényes."
 
 #. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
 #. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:356
 #, php-format
 msgid "Cannot read avatar URL \"%s\"."
 msgstr ""
 
 #. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
 #. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:363
 #, php-format
 msgid "Wrong image type for avatar URL \"%s\"."
 msgstr ""
 
 #. TRANS: Page title for profile design page.
-#: actions/userdesignsettings.php:74 lib/designsettings.php:61
 msgid "Profile design"
 msgstr ""
 
 #. TRANS: Instructions for profile design page.
-#: actions/userdesignsettings.php:84 lib/designsettings.php:72
 msgid ""
 "Customize the way your profile looks with a background image and a colour "
 "palette of your choice."
 msgstr ""
 
-#: actions/userdesignsettings.php:289
 msgid "Enjoy your hotdog!"
 msgstr ""
 
-#: actions/userdesignsettings.php:325
 #, fuzzy
 msgid "Design settings"
 msgstr "Mentsük el a webhely beállításait"
 
-#: actions/userdesignsettings.php:340
 msgid "View profile designs"
 msgstr ""
 
-#: actions/userdesignsettings.php:341
 msgid "Show or hide profile designs."
 msgstr ""
 
-#: actions/userdesignsettings.php:348
 #, fuzzy
 msgid "Background file"
 msgstr "Háttér"
 
 #. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number.
-#: actions/usergroups.php:66
 #, php-format
 msgid "%1$s groups, page %2$d"
 msgstr ""
 
-#: actions/usergroups.php:132
 msgid "Search for more groups"
 msgstr ""
 
-#: actions/usergroups.php:159
 #, php-format
 msgid "%s is not a member of any group."
 msgstr ""
 
-#: actions/usergroups.php:164
 #, php-format
 msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
 msgstr ""
@@ -6673,34 +5478,27 @@ msgstr ""
 #. TRANS: %1$s is a group name, %2$s is a site name.
 #. TRANS: Message is used as a subtitle in atom user notice feed.
 #. TRANS: %1$s is a user name, %2$s is a site name.
-#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:70
-#: lib/atomusernoticefeed.php:95
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr ""
 
-#: actions/version.php:75
 #, php-format
 msgid "StatusNet %s"
 msgstr ""
 
-#: actions/version.php:155
 #, php-format
 msgid ""
 "This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
 "Inc. and contributors."
 msgstr ""
 
-#: actions/version.php:163
 msgid "Contributors"
 msgstr "Közreműködők"
 
 #. TRANS: Menu item for site administration
-#: actions/version.php:167 lib/adminpanelaction.php:403
 msgid "License"
 msgstr "Licenc"
 
-#: actions/version.php:170
 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 "
@@ -6708,7 +5506,6 @@ msgid ""
 "any later version. "
 msgstr ""
 
-#: actions/version.php:176
 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 "
@@ -6716,7 +5513,6 @@ msgid ""
 "for more details. "
 msgstr ""
 
-#: actions/version.php:182
 #, php-format
 msgid ""
 "You should have received a copy of the GNU Affero General Public License "
@@ -6724,52 +5520,42 @@ msgid ""
 msgstr ""
 
 #. TRANS: Form input field label for application name.
-#: actions/version.php:197 lib/applicationeditform.php:190
 msgid "Name"
 msgstr "Név"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:885
 msgid "Version"
 msgstr ""
 
-#: actions/version.php:199
 msgid "Author(s)"
 msgstr "Szerző(k)"
 
 #. TRANS: Form input field label.
-#: actions/version.php:200 lib/applicationeditform.php:208
-#: lib/groupeditform.php:168
 msgid "Description"
 msgstr "Leírás"
 
 #. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:164
 msgid "Favor"
 msgstr "Kedvelem"
 
 #. TRANS: Ntofication given when a user marks a notice as favorite.
 #. TRANS: %1$s is a user nickname or full name, %2$s is a notice URI.
-#: classes/Fave.php:167
 #, fuzzy, php-format
 msgid "%1$s marked notice %2$s as a favorite."
 msgstr "%s (@%s) az általad küldött hírt hozzáadta a kedvenceihez"
 
 #. TRANS: Server exception thrown when a URL cannot be processed.
-#: classes/File.php:162
 #, php-format
 msgid "Cannot process URL '%s'"
 msgstr ""
 
 #. TRANS: Server exception thrown when... Robin thinks something is impossible!
-#: classes/File.php:194
 msgid "Robin thinks something is impossible."
 msgstr ""
 
 #. 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$s is used for plural.
-#: classes/File.php:210
 #, php-format
 msgid ""
 "No file may be larger than %1$d byte and the file you sent was %2$d bytes. "
@@ -6782,7 +5568,6 @@ msgstr[1] ""
 
 #. TRANS: Message given if an upload would exceed user quota.
 #. TRANS: %d (number) is the user quota in bytes and is used for plural.
-#: classes/File.php:223
 #, php-format
 msgid "A file this large would exceed your user quota of %d byte."
 msgid_plural "A file this large would exceed your user quota of %d bytes."
@@ -6791,7 +5576,6 @@ msgstr[1] ""
 
 #. TRANS: Message given id an upload would exceed a user's monthly quota.
 #. TRANS: $d (number) is the monthly user quota in bytes and is used for plural.
-#: classes/File.php:235
 #, php-format
 msgid "A file this large would exceed your monthly quota of %d byte."
 msgid_plural "A file this large would exceed your monthly quota of %d bytes."
@@ -6799,156 +5583,129 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Client exception thrown if a file upload does not have a valid name.
-#: classes/File.php:282 classes/File.php:297
 msgid "Invalid filename."
 msgstr ""
 
 #. TRANS: Exception thrown when joining a group fails.
-#: classes/Group_member.php:51
 msgid "Group join failed."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to leave a group the user is not a member of.
-#: classes/Group_member.php:64
 msgid "Not part of group."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to leave a group fails.
-#: classes/Group_member.php:72
 msgid "Group leave failed."
 msgstr ""
 
 #. TRANS: Exception thrown providing an invalid profile ID.
 #. TRANS: %s is the invalid profile ID.
-#: classes/Group_member.php:85
 #, php-format
 msgid "Profile ID %s is invalid."
 msgstr ""
 
 #. TRANS: Exception thrown providing an invalid group ID.
 #. TRANS: %s is the invalid group ID.
-#: classes/Group_member.php:98
 #, fuzzy, php-format
 msgid "Group ID %s is invalid."
 msgstr "Hiba a felhasználó mentésekor; érvénytelen."
 
 #. TRANS: Activity title.
-#: classes/Group_member.php:147 lib/joinform.php:114
 msgid "Join"
 msgstr "Csatlakozzunk"
 
 #. TRANS: Success message for subscribe to group attempt through OStatus.
 #. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
-#: classes/Group_member.php:151
 #, php-format
 msgid "%1$s has joined group %2$s."
 msgstr ""
 
 #. TRANS: Server exception thrown when updating a local group fails.
-#: classes/Local_group.php:42
 msgid "Could not update local group."
 msgstr ""
 
 #. TRANS: Exception thrown when trying creating a login token failed.
 #. TRANS: %s is the user nickname for which token creation failed.
-#: classes/Login_token.php:78
 #, php-format
 msgid "Could not create login token for %s"
 msgstr ""
 
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
-#: classes/Memcached_DataObject.php:556
 msgid "No database name or DSN found anywhere."
 msgstr ""
 
 #. TRANS: Client exception thrown when a user tries to send a direct message while being banned from sending them.
-#: classes/Message.php:45
 msgid "You are banned from sending direct messages."
 msgstr ""
 
 #. TRANS: Message given when a message could not be stored on the server.
-#: classes/Message.php:69
 msgid "Could not insert message."
 msgstr ""
 
 #. TRANS: Message given when a message could not be updated on the server.
-#: classes/Message.php:80
 msgid "Could not update message with new URI."
 msgstr ""
 
 #. TRANS: Server exception thrown when a user profile for a notice cannot be found.
 #. TRANS: %1$d is a profile ID (number), %2$d is a notice ID (number).
-#: classes/Notice.php:98
 #, php-format
 msgid "No such profile (%1$d) for notice (%2$d)."
 msgstr ""
 
 #. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:199
 #, php-format
 msgid "Database error inserting hashtag: %s"
 msgstr ""
 
 #. TRANS: Client exception thrown if a notice contains too many characters.
-#: classes/Notice.php:279
 msgid "Problem saving notice. Too long."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to save a notice for an unknown user.
-#: classes/Notice.php:284
 msgid "Problem saving notice. Unknown user."
 msgstr ""
 
 #. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
-#: classes/Notice.php:290
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 
 #. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
-#: classes/Notice.php:297
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
 "few minutes."
 msgstr ""
 
 #. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:305
 msgid "You are banned from posting notices on this site."
 msgstr ""
 
 #. TRANS: Server exception thrown when a notice cannot be saved.
 #. TRANS: Server exception thrown when a notice cannot be updated.
-#: classes/Notice.php:372 classes/Notice.php:399
 msgid "Problem saving notice."
 msgstr "Probléma merült fel a hír mentése közben."
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:929
 msgid "Bad type provided to saveKnownGroups."
 msgstr ""
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:1028
 msgid "Problem saving group inbox."
 msgstr ""
 
 #. TRANS: Server exception thrown when a reply cannot be saved.
 #. TRANS: %1$d is a notice ID, %2$d is the ID of the mentioned user.
-#: classes/Notice.php:1144
 #, fuzzy, php-format
 msgid "Could not save reply for %1$d, %2$d."
 msgstr "Nem sikerült menteni a profilt."
 
 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1663
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr ""
 
 #. TRANS: Full name of a profile or group followed by nickname in parens
-#: classes/Profile.php:172 classes/User_group.php:242
 #, fuzzy, php-format
 msgctxt "FANCYNAME"
 msgid "%1$s (%2$s)"
@@ -6956,264 +5713,210 @@ msgstr "%1$s - %2$s"
 
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:779
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:788
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
 
 #. TRANS: Exception thrown when a right for a non-existing user profile is checked.
-#: classes/Remote_profile.php:54
 msgid "Missing profile."
 msgstr ""
 
 #. TRANS: Exception thrown when a tag cannot be saved.
-#: classes/Status_network.php:338
 msgid "Unable to save tag."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#: classes/Subscription.php:77 lib/oauthstore.php:482
 msgid "You have been banned from subscribing."
 msgstr "Eltiltottak a feliratkozástól."
 
 #. TRANS: Exception thrown when trying to subscribe while already subscribed.
-#: classes/Subscription.php:82
 msgid "Already subscribed!"
 msgstr "Már feliratkoztál!"
 
 #. TRANS: Exception thrown when trying to subscribe to a user who has blocked the subscribing user.
-#: classes/Subscription.php:87
 msgid "User has blocked you."
 msgstr "A felhasználó blokkolt."
 
 #. TRANS: Exception thrown when trying to unsibscribe without a subscription.
-#: classes/Subscription.php:176
 msgid "Not subscribed!"
 msgstr "Nem követed figyelemmel!"
 
 #. TRANS: Exception thrown when trying to unsubscribe a user from themselves.
-#: classes/Subscription.php:183
 msgid "Could not delete self-subscription."
 msgstr ""
 
 #. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
-#: classes/Subscription.php:211
 msgid "Could not delete subscription OMB token."
 msgstr ""
 
 #. TRANS: Exception thrown when a subscription could not be deleted on the server.
-#: classes/Subscription.php:223
 msgid "Could not delete subscription."
 msgstr ""
 
 #. TRANS: Activity tile when subscribing to another person.
-#: classes/Subscription.php:265
 msgid "Follow"
 msgstr ""
 
 #. TRANS: Notification given when one person starts following another.
 #. TRANS: %1$s is the subscriber, %2$s is the subscribed.
-#: classes/Subscription.php:268
 #, fuzzy, php-format
 msgid "%1$s is now following %2$s."
 msgstr "%1$s feliratkozott a híreidre a %2$s webhelyen."
 
 #. TRANS: Notice given on user registration.
 #. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:390
 #, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr ""
 
 #. TRANS: Server exception.
-#: classes/User.php:923
 msgid "No single user defined for single-user mode."
 msgstr ""
 
 #. TRANS: Server exception.
-#: classes/User.php:927
 msgid "Single-user mode code called when not enabled."
 msgstr ""
 
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:522
 msgid "Could not create group."
 msgstr "Nem sikerült létrehozni a csoportot."
 
 #. TRANS: Server exception thrown when updating a group URI failed.
-#: classes/User_group.php:532
 msgid "Could not set group URI."
 msgstr ""
 
 #. TRANS: Server exception thrown when setting group membership failed.
-#: classes/User_group.php:555
 msgid "Could not set group membership."
 msgstr "Nem sikerült beállítani a csoporttagságot."
 
 #. TRANS: Server exception thrown when saving local group information failed.
-#: classes/User_group.php:570
 msgid "Could not save local group info."
 msgstr ""
 
 #. TRANS: Exception thrown when an account could not be located when it should be moved.
 #. TRANS: %s is the remote site.
-#: lib/accountmover.php:65
 #, fuzzy, php-format
 msgid "Cannot locate account %s."
 msgstr "Nem törölhetsz felhasználókat."
 
 #. TRANS: Exception thrown when a service document could not be located account move.
 #. TRANS: %s is the remote site.
-#: lib/accountmover.php:106
 #, php-format
 msgid "Cannot find XRD for %s."
 msgstr ""
 
 #. TRANS: Exception thrown when an account could not be located when it should be moved.
 #. TRANS: %s is the remote site.
-#: lib/accountmover.php:131
 #, php-format
 msgid "No AtomPub API service for %s."
 msgstr ""
 
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: lib/action.php:161
 #, php-format
 msgid "%1$s - %2$s"
 msgstr "%1$s - %2$s"
 
 #. TRANS: Page title for a page without a title set.
-#: lib/action.php:177
 msgid "Untitled page"
 msgstr "Név nélküli oldal"
 
 #. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.
-#: lib/action.php:325
 msgctxt "TOOLTIP"
 msgid "Show more"
 msgstr ""
 
 #. TRANS: Inline reply form submit button: submits a reply comment.
-#: lib/action.php:328
 #, fuzzy
 msgctxt "BUTTON"
-msgid "Comment"
-msgstr "Tartalom"
+msgid "Reply"
+msgstr "Válasz"
 
 #. TRANS: Placeholder text for inline reply form. Clicking in this box will turn it into a mini notice form.
-#: lib/action.php:331
-msgid "Add a comment..."
+msgid "Write a reply..."
 msgstr ""
 
-#: lib/action.php:559 lib/personalgroupnav.php:99
-#, fuzzy
 msgid "Home"
-msgstr "Honlap"
+msgstr "Otthon"
 
-#: lib/action.php:560
 #, fuzzy
 msgid "Friends timeline"
 msgstr "%s története"
 
-#: lib/action.php:566
 #, fuzzy
 msgid "Your profile"
 msgstr "Csoportprofil"
 
-#: lib/action.php:570 lib/action.php:593 lib/publicgroupnav.php:78
 msgid "Public"
 msgstr ""
 
-#: lib/action.php:571 lib/action.php:594
 #, fuzzy
 msgid "Everyone on this site"
 msgstr "Emberek keresése az oldalon"
 
-#: lib/action.php:575
 #, fuzzy
 msgid "Settings"
 msgstr "SMS beállítások"
 
-#: lib/action.php:576
 #, fuzzy
 msgid "Change your personal settings"
 msgstr "Változtasd meg a jelszavad"
 
-#: lib/action.php:582
 #, fuzzy
 msgid "Site configuration"
 msgstr "A felhasználók beállításai"
 
-#: lib/action.php:587
-#, fuzzy
 msgid "Logout"
-msgstr "Logó frissítve."
+msgstr "Kijelentkezés"
 
-#: lib/action.php:588
-#, fuzzy
 msgid "Logout from the site"
-msgstr "A webhely témája."
+msgstr "Kijelentkezés a webhelyről"
 
-#: lib/action.php:599
-#, fuzzy
 msgid "Login to the site"
-msgstr "Bejelentkezés az oldalra"
+msgstr "Bejelentkezés a webhelyre"
 
-#: lib/action.php:606
-#, fuzzy
 msgid "Search"
-msgstr "Emberek keresése"
+msgstr "Keresés"
 
-#: lib/action.php:607
 #, fuzzy
 msgid "Search the site"
 msgstr "A webhely témája."
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:864
 msgid "Help"
 msgstr "Súgó"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:867
 msgid "About"
 msgstr "Névjegy"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:870
 msgid "FAQ"
 msgstr "GyIK"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:875
 msgid "TOS"
 msgstr "Felhasználási feltételek"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:879
 msgid "Privacy"
 msgstr ""
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:882
 msgid "Source"
 msgstr "Forrás"
 
 #. TRANS: Secondary navigation menu option leading to e-mail contact information on the
 #. TRANS: StatusNet site, where to report bugs, ...
-#: lib/action.php:889
 msgid "Contact"
 msgstr "Kapcsolat"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:892
 msgid "Badge"
 msgstr ""
 
@@ -7221,7 +5924,6 @@ msgstr ""
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:921
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7229,7 +5931,6 @@ msgid ""
 msgstr ""
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:924
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr ""
@@ -7238,7 +5939,6 @@ msgstr ""
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:931
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7248,106 +5948,88 @@ msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:949
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:956
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:960
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:992
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1335
 msgid "After"
 msgstr "Utána"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1345
 msgid "Before"
 msgstr "Előtte"
 
 #. TRANS: Client exception thrown when a feed instance is a DOMDocument.
-#: lib/activity.php:125
 msgid "Expecting a root feed element but got a whole XML document."
 msgstr ""
 
 #. TRANS: Client exception thrown when using an unknown verb for the activity importer.
-#: lib/activityimporter.php:81
 #, fuzzy, php-format
 msgid "Unknown verb: \"%s\"."
 msgstr "Ismeretlen nyelv: \"%s\"."
 
 #. TRANS: Client exception thrown when trying to force a subscription for an untrusted user.
-#: lib/activityimporter.php:107
 msgid "Cannot force subscription for untrusted user."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to for a remote user to subscribe.
-#: lib/activityimporter.php:117
 #, fuzzy
 msgid "Cannot force remote user to subscribe."
 msgstr "Nem sikerült a felhasználónak automatikus feliratkozást beállítani."
 
 #. TRANS: Client exception thrown when trying to subscribe to an unknown profile.
-#: lib/activityimporter.php:132
 #, fuzzy
 msgid "Unknown profile."
 msgstr "Ismeretlen fájltípus"
 
 #. TRANS: Client exception thrown when trying to import an event not related to the importing user.
-#: lib/activityimporter.php:138
 msgid "This activity seems unrelated to our user."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to join a remote group that is not a group.
-#: lib/activityimporter.php:154
 msgid "Remote profile is not a group!"
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to join a group the importing user is already a member of.
-#: lib/activityimporter.php:163
 #, fuzzy
 msgid "User is already a member of this group."
 msgstr "Már tagja vagy ennek a csoportnak."
 
 #. TRANS: Client exception thrown when trying to import a notice by another user.
 #. TRANS: %1$s is the source URI of the notice, %2$s is the URI of the author.
-#: lib/activityimporter.php:201
 #, php-format
 msgid "Already know about notice %1$s and  it has a different author %2$s."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to overwrite the author information for a non-trusted user during import.
-#: lib/activityimporter.php:207
 msgid "Not overwriting author info for non-trusted user."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to import a notice without content.
 #. TRANS: %s is the notice URI.
-#: lib/activityimporter.php:223
 #, fuzzy, php-format
 msgid "No content for notice %s."
 msgstr "Keressünk a hírek tartalmában"
 
-#: lib/activitymover.php:84
 #, fuzzy, php-format
 msgid "No such user %s."
 msgstr "Nincs ilyen felhasználó."
@@ -7358,212 +6040,172 @@ msgstr "Nincs ilyen felhasználó."
 #. TRANS: %1$s is a URL, %2$s is the status, %s$s is the fail reason.
 #. TRANS: Exception thrown when post to collection fails with a status that is not handled.
 #. TRANS: %1$s is a URL, %2$s is the status, %s$s is the fail reason.
-#: lib/activitysink.php:163 lib/activitysink.php:167 lib/activitysink.php:172
 #, fuzzy, php-format
 msgctxt "URLSTATUSREASON"
 msgid "%1$s %2$s %3$s"
 msgstr "%1$s - %2$s"
 
 #. TRANS: Client exception thrown when there is no source attribute.
-#: lib/activityutils.php:200
 msgid "Can't handle remote content yet."
 msgstr ""
 
 #. TRANS: Client exception thrown when there embedded XML content is found that cannot be processed yet.
-#: lib/activityutils.php:237
 msgid "Can't handle embedded XML content yet."
 msgstr ""
 
 #. TRANS: Client exception thrown when base64 encoded content is found that cannot be processed yet.
-#: lib/activityutils.php:242
 msgid "Can't handle embedded Base64 content yet."
 msgstr ""
 
 #. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights.
-#: lib/adminpanelaction.php:96
 msgid "You cannot make changes to this site."
 msgstr "Nem tudsz változtatni ezen a webhelyen."
 
 #. TRANS: Client error message throw when a certain panel's settings cannot be changed.
-#: lib/adminpanelaction.php:108
 msgid "Changes to that panel are not allowed."
 msgstr "Azon a panelen nem szabad változtatni."
 
 #. TRANS: Client error message.
-#: lib/adminpanelaction.php:222
 msgid "showForm() not implemented."
 msgstr ""
 
 #. TRANS: Client error message
-#: lib/adminpanelaction.php:250
 msgid "saveSettings() not implemented."
 msgstr ""
 
 #. TRANS: Client error message thrown if design settings could not be deleted in
 #. TRANS: the admin panel Design.
-#: lib/adminpanelaction.php:274
 msgid "Unable to delete design setting."
 msgstr "Nem sikerült törölni a megjelenés beállításait."
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:337
 msgid "Basic site configuration"
 msgstr "A webhely elemi beállításai"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:339
 msgctxt "MENU"
 msgid "Site"
 msgstr ""
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:345
 msgid "Design configuration"
 msgstr "A megjelenés beállításai"
 
 #. TRANS: Menu item for site administration
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/adminpanelaction.php:347 lib/groupnav.php:135
 msgctxt "MENU"
 msgid "Design"
 msgstr ""
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:353
 msgid "User configuration"
 msgstr "A felhasználók beállításai"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:110
 msgid "User"
 msgstr "Felhasználó"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:361
 msgid "Access configuration"
 msgstr "A jogosultságok beállításai"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:369
 msgid "Paths configuration"
 msgstr "Az útvonalak beállításai"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:377
 msgid "Sessions configuration"
 msgstr "Munkamenetek beállításai"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:385
 msgid "Edit site notice"
 msgstr ""
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:387
 msgid "Site notice"
 msgstr "A webhely híre"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:393
 msgid "Snapshots configuration"
 msgstr ""
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:401
 msgid "Set site license"
 msgstr ""
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:409
 #, fuzzy
 msgid "Plugins configuration"
 msgstr "Az útvonalak beállításai"
 
 #. TRANS: Client error 401.
-#: lib/apiauth.php:111
 msgid "API resource requires read-write access, but you only have read access."
 msgstr ""
 
 #. TRANS: OAuth exception thrown when no application is found for a given consumer key.
-#: lib/apiauth.php:177
 msgid "No application for that consumer key."
 msgstr ""
 
-#: lib/apiauth.php:202 lib/apiauth.php:284
 msgid "Not allowed to use API."
 msgstr ""
 
 #. TRANS: OAuth exception given when an incorrect access token was given for a user.
-#: lib/apiauth.php:225
 msgid "Bad access token."
 msgstr ""
 
 #. TRANS: OAuth exception given when no user was found for a given token (no token was found).
-#: lib/apiauth.php:230
 msgid "No user for that token."
 msgstr ""
 
 #. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel".
 #. TRANS: Client error thrown when authentication fails.
-#: lib/apiauth.php:272 lib/apiauth.php:302
 msgid "Could not authenticate you."
 msgstr ""
 
 #. TRANS: Server error displayed when trying to create an anynymous OAuth consumer.
-#: lib/apioauthstore.php:45
 #, fuzzy
 msgid "Could not create anonymous consumer."
 msgstr "Nem sikerült létrehozni az álneveket."
 
 #. TRANS: Server error displayed when trying to create an anynymous OAuth application.
-#: lib/apioauthstore.php:69
 #, fuzzy
 msgid "Could not create anonymous OAuth application."
 msgstr "Nem sikerült létrehozni az alkalmazást."
 
 #. TRANS: Exception thrown when no token association could be found.
-#: lib/apioauthstore.php:151
 msgid ""
 "Could not find a profile and application associated with the request token."
 msgstr ""
 
 #. TRANS: Exception thrown when no access token can be issued.
-#: lib/apioauthstore.php:209
 #, fuzzy
 msgid "Could not issue access token."
 msgstr "Nem sikerült az üzenetet feldolgozni."
 
-#: lib/apioauthstore.php:317
 msgid "Database error inserting OAuth application user."
 msgstr ""
 
-#: lib/apioauthstore.php:345
 msgid "Database error updating OAuth application user."
 msgstr ""
 
 #. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
-#: lib/apioauthstore.php:371
 msgid "Tried to revoke unknown token."
 msgstr ""
 
 #. TRANS: Exception thrown when an attempt is made to remove a revoked token.
-#: lib/apioauthstore.php:376
 msgid "Failed to delete revoked token."
 msgstr ""
 
 #. TRANS: Form input field label for application icon.
-#: lib/applicationeditform.php:177
 msgid "Icon"
 msgstr "Ikon"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:182
 msgid "Icon for this application"
 msgstr ""
 
 #. TRANS: Form input field instructions.
 #. TRANS: %d is the number of available characters for the description.
-#: lib/applicationeditform.php:201
 #, fuzzy, php-format
 msgid "Describe your application in %d character"
 msgid_plural "Describe your application in %d characters"
@@ -7571,209 +6213,170 @@ msgstr[0] "Jellemezd a csoportot vagy a témát %d karakterben"
 msgstr[1] "Jellemezd a csoportot vagy a témát %d karakterben"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:205
 msgid "Describe your application"
 msgstr ""
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:216
 msgid "URL of the homepage of this application"
 msgstr ""
 
 #. TRANS: Form input field label.
-#: lib/applicationeditform.php:218
 msgid "Source URL"
 msgstr ""
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:225
 msgid "Organization responsible for this application"
 msgstr ""
 
 #. TRANS: Form input field label.
-#: lib/applicationeditform.php:227
 msgid "Organization"
 msgstr "Szervezet"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:234
 msgid "URL for the homepage of the organization"
 msgstr "A szervezet honlapjának URL-je"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:243
 msgid "URL to redirect to after authentication"
 msgstr "Hitelesítés után átirányítás erre az URL-re"
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:271
 msgid "Browser"
 msgstr "Böngésző"
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:288
 msgid "Desktop"
 msgstr "Asztal"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:290
 msgid "Type of application, browser or desktop"
 msgstr ""
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:314
 msgid "Read-only"
 msgstr "Csak olvasható"
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:334
 msgid "Read-write"
 msgstr "Írható-olvasható"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:336
 msgid "Default access for this application: read-only, or read-write"
 msgstr ""
 
 #. TRANS: Submit button title.
-#: lib/applicationeditform.php:353
 msgid "Cancel"
 msgstr "Mégse"
 
-#: lib/applicationlist.php:247
 msgid " by "
 msgstr ""
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:260
 msgid "read-write"
 msgstr ""
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:262
 msgid "read-only"
 msgstr ""
 
 #. TRANS: Used in application list. %1$s is a modified date, %2$s is access type ("read-write" or "read-only")
-#: lib/applicationlist.php:268
 #, php-format
 msgid "Approved %1$s - \"%2$s\" access."
 msgstr ""
 
 #. TRANS: Access token in the application list.
 #. TRANS: %s are the first 7 characters of the access token.
-#: lib/applicationlist.php:282
 #, php-format
 msgid "Access token starting with: %s"
 msgstr ""
 
 #. TRANS: Button label
-#: lib/applicationlist.php:298
 msgctxt "BUTTON"
 msgid "Revoke"
 msgstr ""
 
-#: lib/atom10feed.php:113
 msgid "Author element must contain a name element."
 msgstr ""
 
 #. TRANS: Server exception thrown when using the method setActivitySubject() in the class Atom10Feed.
-#: lib/atom10feed.php:160
 #, fuzzy
 msgid "Do not use this method!"
 msgstr "Ne töröljük ezt a hírt"
 
 #. TRANS: Title.
-#: lib/attachmentnoticesection.php:67
 msgid "Notices where this attachment appears"
 msgstr "Hírek, ahol ez a melléklet megjelenik"
 
 #. TRANS: Title.
-#: lib/attachmenttagcloudsection.php:48
 msgid "Tags for this attachment"
 msgstr "Címkék ehhez a melléklethez"
 
 #. TRANS: Exception thrown when a password change fails.
-#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:227
 #, fuzzy
 msgid "Password changing failed."
 msgstr "A jelszó megváltoztatása sikertelen"
 
 #. TRANS: Exception thrown when a password change attempt fails because it is not allowed.
-#: lib/authenticationplugin.php:238
 #, fuzzy
 msgid "Password changing is not allowed."
 msgstr "A jelszó megváltoztatása nem engedélyezett"
 
 #. TRANS: Title for the form to block a user.
-#: lib/blockform.php:68
 msgid "Block"
 msgstr "Blokkolás"
 
 #. TRANS: Description of the form to block a user.
-#: lib/blockform.php:79
 msgid "Block this user"
 msgstr "Felhasználó blokkolása"
 
 #. TRANS: Title for command results.
-#: lib/channel.php:104 lib/channel.php:125
 msgid "Command results"
 msgstr ""
 
 #. TRANS: Title for command results.
-#: lib/channel.php:138
 #, fuzzy
 msgid "AJAX error"
 msgstr "Ajax-hiba"
 
 #. TRANS: E-mail subject when a command has completed.
-#: lib/channel.php:177 lib/mailhandler.php:143
 msgid "Command complete"
 msgstr ""
 
 #. TRANS: E-mail subject when a command has failed.
-#: lib/channel.php:188
 msgid "Command failed"
 msgstr ""
 
 #. TRANS: Command exception text shown when a notice ID is requested that does not exist.
-#: lib/command.php:82 lib/command.php:106
 msgid "Notice with that id does not exist."
 msgstr ""
 
 #. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
 #. TRANS: Error text shown when a last user notice is requested and it does not exist.
-#: lib/command.php:99 lib/command.php:642
 msgid "User has no last notice."
 msgstr ""
 
 #. TRANS: Message given requesting a profile for a non-existing user.
 #. TRANS: %s is the nickname of the user for which the profile could not be found.
-#: lib/command.php:128
 #, php-format
 msgid "Could not find a user with nickname %s."
 msgstr ""
 
 #. TRANS: Message given getting a non-existing user.
 #. TRANS: %s is the nickname of the user that could not be found.
-#: lib/command.php:148
 #, php-format
 msgid "Could not find a local user with nickname %s."
 msgstr ""
 
 #. TRANS: Error text shown when an unimplemented command is given.
-#: lib/command.php:183
 msgid "Sorry, this command is not yet implemented."
 msgstr ""
 
 #. TRANS: Command exception text shown when a user tries to nudge themselves.
-#: lib/command.php:229
 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr ""
 
 #. TRANS: Message given having nudged another user.
 #. TRANS: %s is the nickname of the user that was nudged.
-#: lib/command.php:238
 #, php-format
 msgid "Nudge sent to %s."
 msgstr ""
@@ -7782,7 +6385,6 @@ msgstr ""
 #. TRANS: %1$s is the number of other user the user is subscribed to.
 #. TRANS: %2$s is the number of users that are subscribed to the user.
 #. TRANS: %3$s is the number of notices the user has sent.
-#: lib/command.php:268
 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"
@@ -7794,40 +6396,34 @@ msgstr ""
 "Hírek: %3$s"
 
 #. TRANS: Error message text shown when a favorite could not be set because it has already been favorited.
-#: lib/command.php:298
 #, fuzzy
 msgid "Could not create favorite: already favorited."
 msgstr "Nem sikerült létrehozni a kedvencet."
 
 #. TRANS: Text shown when a notice has been marked as favourite successfully.
-#: lib/command.php:324
 msgid "Notice marked as fave."
 msgstr "A hír kedveltként van megjelölve."
 
 #. TRANS: Message given having added a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:369
 #, php-format
 msgid "%1$s joined group %2$s."
 msgstr ""
 
 #. TRANS: Message given having removed a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:417
 #, php-format
 msgid "%1$s left group %2$s."
 msgstr ""
 
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: lib/command.php:438
 #, fuzzy, php-format
 msgctxt "WHOIS"
 msgid "%1$s (%2$s)"
 msgstr "%1$s - %2$s"
 
 #. TRANS: Whois output. %s is the full name of the queried user.
-#: lib/command.php:442
 #, php-format
 msgid "Fullname: %s"
 msgstr "Teljes név: %s"
@@ -7835,7 +6431,6 @@ msgstr "Teljes név: %s"
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a location.
-#: lib/command.php:446 lib/mail.php:275
 #, php-format
 msgid "Location: %s"
 msgstr "Helyszín: %s"
@@ -7843,20 +6438,17 @@ msgstr "Helyszín: %s"
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a homepage.
-#: lib/command.php:450 lib/mail.php:279
 #, php-format
 msgid "Homepage: %s"
 msgstr "Honlap: %s"
 
 #. TRANS: Whois output. %s is the bio information of the queried user.
-#: lib/command.php:454
 #, php-format
 msgid "About: %s"
 msgstr ""
 
 #. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).
 #. TRANS: %s is a remote profile.
-#: lib/command.php:483
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
@@ -7865,33 +6457,32 @@ msgstr ""
 
 #. TRANS: Message given if content is too long. %1$sd is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:500
 #, fuzzy, php-format
 msgid "Message too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
 msgstr[0] "Az túl hosszú. Egy hír legfeljebb %d karakterből állhat."
 msgstr[1] "Az túl hosszú. Egy hír legfeljebb %d karakterből állhat."
 
+#. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
+msgid "You can't send a message to this user."
+msgstr "Ennek a felhasználónak nem küldhetsz üzenetet."
+
 #. TRANS: Error text shown sending a direct message fails with an unknown reason.
-#: lib/command.php:528
 msgid "Error sending direct message."
 msgstr "Hiba a közvetlen üzenet küldése közben."
 
 #. TRANS: Message given having repeated a notice from another user.
 #. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:565
 #, php-format
 msgid "Notice from %s repeated."
 msgstr ""
 
 #. TRANS: Error text shown when repeating a notice fails with an unknown reason.
-#: lib/command.php:568
 msgid "Error repeating notice."
 msgstr "Hiba a hír ismétlésekor."
 
 #. TRANS: Message given if content of a notice for a reply is too long. %1$d is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:603
 #, fuzzy, php-format
 msgid "Notice too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Notice too long - maximum is %1$d characters, you sent %2$d."
@@ -7900,100 +6491,83 @@ msgstr[1] "Az túl hosszú. Egy hír legfeljebb %d karakterből állhat."
 
 #. TRANS: Text shown having sent a reply to a notice successfully.
 #. TRANS: %s is the nickname of the user of the notice the reply was sent to.
-#: lib/command.php:616
 #, php-format
 msgid "Reply to %s sent."
 msgstr ""
 
 #. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
-#: lib/command.php:619
 msgid "Error saving notice."
 msgstr "Hiba a hír elmentésekor."
 
 #. TRANS: Error text shown when no username was provided when issuing a subscribe command.
-#: lib/command.php:666
 msgid "Specify the name of the user to subscribe to."
 msgstr ""
 
 #. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
-#: lib/command.php:675
 msgid "Can't subscribe to OMB profiles by command."
 msgstr ""
 
 #. TRANS: Text shown after having subscribed to another user successfully.
 #. TRANS: %s is the name of the user the subscription was requested for.
-#: lib/command.php:683
 #, php-format
 msgid "Subscribed to %s."
 msgstr ""
 
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.
-#: lib/command.php:704 lib/command.php:815
 msgid "Specify the name of the user to unsubscribe from."
 msgstr ""
 
 #. TRANS: Text shown after having unsubscribed from another user successfully.
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:715
 #, php-format
 msgid "Unsubscribed from %s."
 msgstr ""
 
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
-#: lib/command.php:735 lib/command.php:761
 msgid "Command not yet implemented."
 msgstr ""
 
 #. TRANS: Text shown when issuing the command "off" successfully.
-#: lib/command.php:739
 msgid "Notification off."
 msgstr "Ne legyenek értesítések."
 
 #. TRANS: Error text shown when the command "off" fails for an unknown reason.
-#: lib/command.php:742
 msgid "Can't turn off notification."
 msgstr ""
 
 #. TRANS: Text shown when issuing the command "on" successfully.
-#: lib/command.php:765
 msgid "Notification on."
 msgstr "Legyenek értesítések."
 
 #. TRANS: Error text shown when the command "on" fails for an unknown reason.
-#: lib/command.php:768
 msgid "Can't turn on notification."
 msgstr ""
 
 #. TRANS: Error text shown when issuing the login command while login is disabled.
-#: lib/command.php:782
 msgid "Login command is disabled."
 msgstr ""
 
 #. TRANS: Text shown after issuing the login command successfully.
 #. TRANS: %s is a logon link..
-#: lib/command.php:795
 #, php-format
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
 
 #. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:824
 #, php-format
 msgid "Unsubscribed %s."
 msgstr ""
 
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
-#: lib/command.php:842
 msgid "You are not subscribed to anyone."
 msgstr "Senkinek sem iratkoztál fel a híreire."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
-#: lib/command.php:847
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Ezen személy híreire iratkoztál fel:"
@@ -8001,14 +6575,12 @@ msgstr[1] "Ezen emberek híreire iratkoztál fel:"
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user
 #. TRANS: (followers) without having any subscribers.
-#: lib/command.php:869
 msgid "No one is subscribed to you."
 msgstr "Senki sem követ figyelemmel."
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
-#: lib/command.php:874
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Ez a személy iratkozott fel a híreidre:"
@@ -8016,21 +6588,18 @@ msgstr[1] "Ezek az emberek iratkoztak fel a híreidre:"
 
 #. TRANS: Text shown after requesting groups a user is subscribed to without having
 #. TRANS: any group subscriptions.
-#: lib/command.php:896
 msgid "You are not a member of any groups."
 msgstr "Nem vagy tagja semmilyen csoportnak."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
-#: lib/command.php:901
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "Ennek a csoportnak vagy tagja:"
 msgstr[1] "Ezeknek a csoportoknak vagy tagja:"
 
 #. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-#: lib/command.php:916
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -8073,120 +6642,99 @@ msgid ""
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:36
 #, fuzzy
 msgid "No configuration file found."
 msgstr "Nem találtunk konfigurációs fájlt. "
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:39
 #, fuzzy
 msgid "I looked for configuration files in the following places:"
 msgstr "A következő helyeken kerestem konfigurációs fájlokat: "
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:42
 msgid "You may wish to run the installer to fix this."
 msgstr "A telepítő futtatása kijavíthatja ezt."
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:46
 msgid "Go to the installer."
 msgstr "Menj a telepítőhöz."
 
-#: lib/dberroraction.php:59
 msgid "Database error"
 msgstr "Adatbázishiba"
 
 #. TRANS: Description of form for deleting a user.
-#: lib/deleteuserform.php:75
 msgid "Delete this user"
 msgstr "Töröljük ezt a felhasználót"
 
-#: lib/designform.php:114
 #, fuzzy
 msgid "Change design"
 msgstr "Design mentése"
 
 #. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: lib/designform.php:131
 msgid "Change colours"
 msgstr "Színek megváltoztatása"
 
 #. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: lib/designform.php:138
 msgid "Use defaults"
 msgstr "Alapértelmezések használata"
 
 #. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: lib/designform.php:140
 msgid "Restore default designs"
 msgstr ""
 
 #. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: lib/designform.php:148
 msgid "Reset back to default"
 msgstr "Visszaállítás az alapértelmezettre"
 
 #. TRANS: Label in form on profile design page.
 #. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
-#: lib/designform.php:158
 msgid "Upload file"
 msgstr "Fájl feltöltése"
 
 #. TRANS: Instructions for form on profile design page.
-#: lib/designform.php:163
 #, fuzzy
 msgid ""
 "You can upload your personal background image. The maximum file size is 2Mb."
 msgstr "Feltöltheted a személyes avatarodat. A fájl maximális mérete %s lehet."
 
 #. TRANS: Radio button on profile design page that will enable use of the uploaded profile image.
-#: lib/designform.php:194
 #, fuzzy
 msgctxt "RADIO"
 msgid "On"
 msgstr "Be"
 
 #. TRANS: Radio button on profile design page that will disable use of the uploaded profile image.
-#: lib/designform.php:211
 #, fuzzy
 msgctxt "RADIO"
 msgid "Off"
 msgstr "Ki"
 
 #. TRANS: Title for button on profile design page to save settings.
-#: lib/designform.php:322
 msgid "Save design"
 msgstr "Design mentése"
 
 #. TRANS: Error message displayed if design settings could not be saved.
 #. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
-#: lib/designsettings.php:216 lib/designsettings.php:238
 msgid "Couldn't update your design."
 msgstr "Nem sikerült frissíteni a designt."
 
 #. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
-#: lib/designsettings.php:244
 msgid "Design defaults restored."
 msgstr ""
 
 #. TRANS: Exception. %s is an ID.
-#: lib/discovery.php:153
 #, php-format
 msgid "Unable to find services for %s."
 msgstr ""
 
 #. TRANS: Form legend for removing the favourite status for a favourite notice.
 #. TRANS: Title for button text for removing the favourite status for a favourite notice.
-#: lib/disfavorform.php:108 lib/disfavorform.php:140
 msgid "Disfavor this notice"
 msgstr "Nem kedvelem ezt a hírt"
 
 #. TRANS: Button text for removing the favourite status for a favourite notice.
-#: lib/disfavorform.php:136
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Disfavor favorite"
@@ -8194,97 +6742,76 @@ msgstr "Kedvenc eltávolítása"
 
 #. TRANS: Form legend for adding the favourite status to a notice.
 #. TRANS: Title for button text for adding the favourite status to a notice.
-#: lib/favorform.php:108 lib/favorform.php:139
 msgid "Favor this notice"
 msgstr "Kedvelem ezt a hírt"
 
 #. TRANS: Button text for adding the favourite status to a notice.
-#: lib/favorform.php:135
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Favor"
 msgstr "Kedvelem"
 
-#: lib/feed.php:84
 msgid "RSS 1.0"
 msgstr ""
 
-#: lib/feed.php:86
 msgid "RSS 2.0"
 msgstr "RSS 2.0"
 
-#: lib/feed.php:88
 msgid "Atom"
 msgstr "Atom"
 
-#: lib/feed.php:90
 msgid "FOAF"
 msgstr ""
 
-#: lib/feedimporter.php:75
 #, fuzzy
 msgid "Not an atom feed."
 msgstr "Összes tag"
 
-#: lib/feedimporter.php:82
 msgid "No author in the feed."
 msgstr ""
 
-#: lib/feedimporter.php:89
 msgid "Can't import without a user."
 msgstr ""
 
 #. TRANS: Header for feed links (h2).
-#: lib/feedlist.php:66
 msgid "Feeds"
 msgstr ""
 
-#: lib/galleryaction.php:128
 msgid "All"
 msgstr "Összes"
 
-#: lib/galleryaction.php:136
 msgid "Select tag to filter"
 msgstr "Válassz egy címkét amire szűrjünk"
 
-#: lib/galleryaction.php:137
 msgid "Tag"
 msgstr "Címke"
 
-#: lib/galleryaction.php:138
 msgid "Choose a tag to narrow list"
 msgstr "Válassz egy címkét hogy szűkítsük a listát"
 
-#: lib/galleryaction.php:140
 msgid "Go"
 msgstr "Menjünk"
 
-#: lib/grantroleform.php:91
 #, php-format
 msgid "Grant this user the \"%s\" role"
 msgstr ""
 
-#: lib/groupeditform.php:147
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "1-64 kisbetű vagy számjegy, nem lehet benne írásjel vagy szóköz"
 
-#: lib/groupeditform.php:156
 #, fuzzy
 msgid "URL of the homepage or blog of the group or topic."
 msgstr "A csoporthoz vagy témához tartozó honlap illetve blog URL-je"
 
-#: lib/groupeditform.php:161
 msgid "Describe the group or topic"
 msgstr "Jellemezd a csoportot vagy a témát"
 
-#: lib/groupeditform.php:163
 #, fuzzy, php-format
 msgid "Describe the group or topic in %d character or less"
 msgid_plural "Describe the group or topic in %d characters or less"
 msgstr[0] "Jellemezd a csoportot vagy a témát %d karakterben"
 msgstr[1] "Jellemezd a csoportot vagy a témát %d karakterben"
 
-#: lib/groupeditform.php:175
 #, fuzzy
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\"."
@@ -8292,7 +6819,6 @@ msgstr ""
 "A csoport földrajzi elhelyezkedése, ha van ilyen, pl. \"Város, Megye, Ország"
 "\""
 
-#: lib/groupeditform.php:183
 #, fuzzy, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -8308,70 +6834,60 @@ msgstr[1] ""
 "legfeljebb %d"
 
 #. TRANS: Menu item in the group navigation page.
-#: lib/groupnav.php:86
 msgctxt "MENU"
 msgid "Group"
 msgstr ""
 
 #. TRANS: Tooltip for menu item in the group navigation page.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:89
 #, php-format
 msgctxt "TOOLTIP"
 msgid "%s group"
 msgstr ""
 
 #. TRANS: Menu item in the group navigation page.
-#: lib/groupnav.php:95
 msgctxt "MENU"
 msgid "Members"
 msgstr ""
 
 #. TRANS: Tooltip for menu item in the group navigation page.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:98
 #, php-format
 msgctxt "TOOLTIP"
 msgid "%s group members"
 msgstr ""
 
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/groupnav.php:108
 msgctxt "MENU"
 msgid "Blocked"
 msgstr ""
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:111
 #, php-format
 msgctxt "TOOLTIP"
 msgid "%s blocked users"
 msgstr ""
 
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr ""
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:120
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Edit %s group properties"
 msgstr ""
 
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/groupnav.php:126
 msgctxt "MENU"
 msgid "Logo"
 msgstr ""
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:129
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Add or edit %s logo"
@@ -8379,69 +6895,57 @@ msgstr ""
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:138
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Add or edit %s design"
 msgstr ""
 
 #. TRANS: Title for groups with the most members section.
-#: lib/groupsbymemberssection.php:71
 msgid "Groups with most members"
 msgstr "A legtöbb tagból álló csoportok"
 
 #. TRANS: Title for groups with the most posts section.
-#: lib/groupsbypostssection.php:71
 msgid "Groups with most posts"
 msgstr "A legtöbb hírt küldött csoportok"
 
 #. TRANS: Title for group tag cloud section.
 #. TRANS: %s is a group name.
-#: lib/grouptagcloudsection.php:57
 #, php-format
 msgid "Tags in %s group's notices"
 msgstr "Címkék a(z) %s csoport híreiben"
 
 #. TRANS: Client exception 406
-#: lib/htmloutputter.php:104
 msgid "This page is not available in a media type you accept"
 msgstr ""
 
 #. TRANS: Exception thrown when trying to upload an unsupported image file format.
-#: lib/imagefile.php:73
 msgid "Unsupported image file format."
 msgstr "Nem támogatott képformátum."
 
 #. TRANS: Exception thrown when too large a file is uploaded.
 #. TRANS: %s is the maximum file size, for example "500b", "10kB" or "2MB".
-#: lib/imagefile.php:91
 #, php-format
 msgid "That file is too big. The maximum file size is %s."
 msgstr "Az a fájl túl nagy. A maximális fájlméret %s."
 
 #. TRANS: Exception thrown when uploading an image and that action could not be completed.
-#: lib/imagefile.php:97
 msgid "Partial upload."
 msgstr "Részleges feltöltés."
 
 #. TRANS: Exception thrown when uploading a file as image that is not an image or is a corrupt file.
-#: lib/imagefile.php:115
 msgid "Not an image or corrupt file."
 msgstr ""
 
 #. TRANS: Exception thrown during resize when image has been registered as present, but is no longer there.
-#: lib/imagefile.php:178
 msgid "Lost our file."
 msgstr "Elvesztettük a fájlt."
 
 #. TRANS: Exception thrown when trying to resize an unknown file type.
 #. TRANS: Exception thrown when trying resize an unknown file type.
-#: lib/imagefile.php:216 lib/imagefile.php:257
 msgid "Unknown file type"
 msgstr "Ismeretlen fájltípus"
 
 #. TRANS: Number of megabytes. %d is the number.
-#: lib/imagefile.php:303
 #, fuzzy, php-format
 msgid "%dMB"
 msgid_plural "%dMB"
@@ -8449,7 +6953,6 @@ msgstr[0] "MB"
 msgstr[1] "MB"
 
 #. TRANS: Number of kilobytes. %d is the number.
-#: lib/imagefile.php:307
 #, fuzzy, php-format
 msgid "%dkB"
 msgid_plural "%dkB"
@@ -8457,14 +6960,12 @@ msgstr[0] "kB"
 msgstr[1] "kB"
 
 #. TRANS: Number of bytes. %d is the number.
-#: lib/imagefile.php:310
 #, php-format
 msgid "%dB"
 msgid_plural "%dB"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/implugin.php:262
 #, php-format
 msgid ""
 "User \"%s\" on %s has said that your %s screenname belongs to them. If "
@@ -8474,51 +6975,42 @@ msgid ""
 "message."
 msgstr ""
 
-#: lib/implugin.php:349
 #, php-format
 msgid "Unknown inbox source %d."
 msgstr ""
 
-#: lib/implugin.php:485
 #, fuzzy, php-format
 msgid "Message too long - maximum is %1$d characters, you sent %2$d."
 msgstr "Az túl hosszú. Egy hír legfeljebb %d karakterből állhat."
 
-#: lib/leaveform.php:114
 msgid "Leave"
 msgstr "Távozzunk"
 
 #. TRANS: Menu item for logging in to the StatusNet site.
-#: lib/logingroupnav.php:77
 msgctxt "MENU"
 msgid "Login"
 msgstr ""
 
 #. TRANS: Title for menu item for logging in to the StatusNet site.
-#: lib/logingroupnav.php:79
 msgid "Login with a username and password"
 msgstr "Bejelentkezés felhasználónévvel és jelszóval"
 
 #. TRANS: Menu item for registering with the StatusNet site.
-#: lib/logingroupnav.php:85
 msgctxt "MENU"
 msgid "Register"
 msgstr ""
 
 #. TRANS: Title for menu item for registering with the StatusNet site.
-#: lib/logingroupnav.php:87
 msgid "Sign up for a new account"
 msgstr "Új kontó igénylése"
 
 #. TRANS: Subject for address confirmation email.
-#: lib/mail.php:172
 msgid "Email address confirmation"
 msgstr "E-mail cím megerősítése"
 
 #. TRANS: Body for address confirmation email.
 #. TRANS: %1$s is the addressed user's nickname, %2$s is the StatusNet sitename,
 #. TRANS: %3$s is the URL to confirm at.
-#: lib/mail.php:177
 #, fuzzy, php-format
 msgid ""
 "Hey, %1$s.\n"
@@ -8550,14 +7042,12 @@ msgstr ""
 
 #. TRANS: Subject of new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
-#: lib/mail.php:243
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1$s feliratkozott a híreidre a %2$s webhelyen."
 
 #. TRANS: This is a paragraph in a new-subscriber e-mail.
 #. TRANS: %s is a URL where the subscriber can be reported as abusive.
-#: lib/mail.php:250
 #, php-format
 msgid ""
 "If you believe this account is being used abusively, you can block them from "
@@ -8569,7 +7059,6 @@ msgstr ""
 #. TRANS: %3$s is the subscriber's profile URL, %4$s is the subscriber's location (or empty)
 #. TRANS: %5$s is the subscriber's homepage URL (or empty), %6%s is the subscriber's bio (or empty)
 #. TRANS: %7$s is a link to the addressed user's e-mail settings.
-#: lib/mail.php:260
 #, fuzzy, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -8597,14 +7086,12 @@ msgstr ""
 
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is biographical information.
-#: lib/mail.php:283
 #, php-format
 msgid "Bio: %s"
 msgstr "Bemutatkozás: %s"
 
 #. TRANS: Subject of notification mail for new posting email address.
 #. TRANS: %s is the StatusNet sitename.
-#: lib/mail.php:312
 #, php-format
 msgid "New email address for posting to %s"
 msgstr ""
@@ -8612,7 +7099,6 @@ msgstr ""
 #. TRANS: Body of notification mail for new posting email address.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is the e-mail address to send
 #. TRANS: to to post by e-mail, %3$s is a URL to more instructions.
-#: lib/mail.php:318
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -8627,26 +7113,22 @@ msgstr ""
 
 #. TRANS: Subject line for SMS-by-email notification messages.
 #. TRANS: %s is the posting user's nickname.
-#: lib/mail.php:439
 #, php-format
 msgid "%s status"
 msgstr "%s állapota"
 
 #. TRANS: Subject line for SMS-by-email address confirmation message.
-#: lib/mail.php:465
 msgid "SMS confirmation"
 msgstr "SMS megerősítés"
 
 #. TRANS: Main body heading for SMS-by-email address confirmation message.
 #. TRANS: %s is the addressed user's nickname.
-#: lib/mail.php:469
 #, php-format
 msgid "%s: confirm you own this phone number with this code:"
 msgstr ""
 
 #. TRANS: Subject for 'nudge' notification email.
 #. TRANS: %s is the nudging user.
-#: lib/mail.php:490
 #, fuzzy, php-format
 msgid "You have been nudged by %s"
 msgstr "%s megbökött téged."
@@ -8654,7 +7136,6 @@ msgstr "%s megbökött téged."
 #. TRANS: Body for 'nudge' notification email.
 #. TRANS: %1$s is the nuding user's long name, $2$s is the nudging user's nickname,
 #. TRANS: %3$s is a URL to post notices at, %4$s is the StatusNet sitename.
-#: lib/mail.php:497
 #, php-format
 msgid ""
 "%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -8683,7 +7164,6 @@ msgstr ""
 
 #. TRANS: Subject for direct-message notification email.
 #. TRANS: %s is the sending user's nickname.
-#: lib/mail.php:544
 #, php-format
 msgid "New private message from %s"
 msgstr "Új privát üzenetet küldött neked %s"
@@ -8692,7 +7172,6 @@ msgstr "Új privát üzenetet küldött neked %s"
 #. TRANS: %1$s is the sending user's long name, %2$s is the sending user's nickname,
 #. TRANS: %3$s is the message content, %4$s a URL to the message,
 #. TRANS: %5$s is the StatusNet sitename.
-#: lib/mail.php:552
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -8727,7 +7206,6 @@ msgstr ""
 
 #. TRANS: Subject for favorite notification e-mail.
 #. TRANS: %1$s is the adding user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:604
 #, fuzzy, php-format
 msgid "%1$s (@%2$s) added your notice as a favorite"
 msgstr "%s (@%s) az általad küldött hírt hozzáadta a kedvenceihez"
@@ -8737,7 +7215,6 @@ msgstr "%s (@%s) az általad küldött hírt hozzáadta a kedvenceihez"
 #. TRANS: %3$s is a URL to the faved notice, %4$s is the faved notice text,
 #. TRANS: %5$s is a URL to all faves of the adding user, %6$s is the StatusNet sitename,
 #. TRANS: %7$s is the adding user's nickname.
-#: lib/mail.php:611
 #, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -8775,7 +7252,6 @@ msgstr ""
 "%6$s\n"
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:669
 #, php-format
 msgid ""
 "The full conversation can be read here:\n"
@@ -8785,7 +7261,6 @@ msgstr ""
 
 #. TRANS: E-mail subject for notice notification.
 #. TRANS: %1$s is the sending user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:677
 #, fuzzy, php-format
 msgid "%1$s (@%2$s) sent a notice to your attention"
 msgstr "%s (@%s) figyelmedbe ajánlott egy hírt"
@@ -8796,7 +7271,6 @@ msgstr "%s (@%s) figyelmedbe ajánlott egy hírt"
 #. TRANS: %5$s is a URL to the full conversion if it exists (otherwise empty),
 #. TRANS: %6$s is a URL to reply to the notice, %7$s is a URL to all @-replied for the addressed user,
 #. TRANS: %8$s is a URL to the addressed user's e-mail settings, %9$s is the sender's nickname.
-#: lib/mail.php:685
 #, php-format
 msgid ""
 "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -8823,11 +7297,9 @@ msgid ""
 "P.S. You can turn off these email notifications here: %8$s\n"
 msgstr ""
 
-#: lib/mailbox.php:87
 msgid "Only the user can read their own mailboxes."
 msgstr "Csak a felhasználó láthatja a saját postaládáját."
 
-#: lib/mailbox.php:125
 msgid ""
 "You have no private messages. You can send private message to engage other "
 "users in conversation. People can send you messages for your eyes only."
@@ -8836,53 +7308,43 @@ msgstr ""
 "keveredj más felhasználókkal. Olyan üzenetet küldhetnek neked emberek, amit "
 "csak te láthatsz."
 
-#: lib/mailhandler.php:37
 msgid "Could not parse message."
 msgstr "Nem sikerült az üzenetet feldolgozni."
 
-#: lib/mailhandler.php:42
 msgid "Not a registered user."
 msgstr "Nem egy regisztrált felhasználó."
 
-#: lib/mailhandler.php:46
 msgid "Sorry, that is not your incoming email address."
 msgstr "Sajnos az nem a te bejövő email-címed."
 
-#: lib/mailhandler.php:50
 msgid "Sorry, no incoming email allowed."
 msgstr "Sajnos a bejövő email nincs engedélyezve."
 
-#: lib/mailhandler.php:229
 #, php-format
 msgid "Unsupported message type: %s"
 msgstr "Nem támogatott üzenet-típus: %s"
 
 #. TRANS: Client exception thrown when a database error was thrown during a file upload operation.
-#: lib/mediafile.php:102 lib/mediafile.php:174
 msgid "There was a database error while saving your file. Please try again."
 msgstr "Adatbázis-hiba történt a fájlod elmentése közben. Kérlek próbáld újra."
 
 #. TRANS: Client exception thrown when a file upload operation would cause a user to exceed a set quota.
-#: lib/mediafile.php:238 lib/mediafile.php:281
 msgid "File exceeds user's quota."
 msgstr "A fájl mérete meghaladja a felhasználónak megengedettet."
 
 #. TRANS: Client exception thrown when a file upload operation fails because the file could
 #. TRANS: not be moved from the temporary folder to the permanent file location.
-#: lib/mediafile.php:258 lib/mediafile.php:300
 msgid "File could not be moved to destination directory."
 msgstr "Nem sikerült a fájlt áthelyezni a célkönyvtárba."
 
 #. TRANS: Client exception thrown when a file upload operation has been stopped because the MIME
 #. TRANS: type of the uploaded file could not be determined.
-#: lib/mediafile.php:265 lib/mediafile.php:306
 msgid "Could not determine file's MIME type."
 msgstr "Nem sikerült a fájl MIME-típusát megállapítani."
 
 #. TRANS: Client exception thrown trying to upload a forbidden MIME type.
 #. TRANS: %1$s is the file type that was denied, %2$s is the application part of
 #. TRANS: the MIME type that was denied.
-#: lib/mediafile.php:396
 #, php-format
 msgid ""
 "\"%1$s\" is not a supported file type on this server. Try using another %2$s "
@@ -8891,502 +7353,394 @@ msgstr ""
 
 #. TRANS: Client exception thrown trying to upload a forbidden MIME type.
 #. TRANS: %s is the file type that was denied.
-#: lib/mediafile.php:401
 #, php-format
 msgid "\"%s\" is not a supported file type on this server."
 msgstr ""
 
-#: lib/messageform.php:120
 msgid "Send a direct notice"
 msgstr "Küldjünk egy üzenetet közvetlenül"
 
 #. TRANS Label entry in drop-down selection box in direct-message inbox/outbox. This is the default entry in the drop-down box, doubling as instructions and a brake against accidental submissions with the first user in the list.
-#: lib/messageform.php:137
 #, fuzzy
 msgid "Select recipient:"
 msgstr "Válassz egy szolgáltatót"
 
 #. TRANS Entry in drop-down selection box in direct-message inbox/outbox when no one is available to message.
-#: lib/messageform.php:150
 #, fuzzy
 msgid "No mutual subscribers."
 msgstr "Nem követed figyelemmel!"
 
-#: lib/messageform.php:153
 msgid "To"
 msgstr "Címzett"
 
-#: lib/messageform.php:184 lib/noticeform.php:236
 msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr ""
 
-#: lib/messagelist.php:77
 #, fuzzy
 msgid "Messages"
 msgstr "Üzenet"
 
-#: lib/messagelistitem.php:123 lib/noticelist.php:527
 msgid "from"
 msgstr "írta"
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:178
 msgid "Nickname cannot be empty."
 msgstr ""
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:191
 #, php-format
 msgid "Nickname cannot be more than %d character long."
 msgid_plural "Nickname cannot be more than %d characters long."
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/noticeform.php:160
+#. TRANS: Form legend for notice form.
 msgid "Send a notice"
 msgstr "Küldjünk egy hírt"
 
-#: lib/noticeform.php:174
+#. TRANS: Title for notice label. %s is the user's nickname.
 #, php-format
 msgid "What's up, %s?"
 msgstr "Mi hír, %s?"
 
-#: lib/noticeform.php:193
+#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr "Csatolás"
 
-#: lib/noticeform.php:197
-msgid "Attach a file"
+#. TRANS: Title for input field to attach a file to a notice.
+#, fuzzy
+msgid "Attach a file."
 msgstr "Csatoljunk egy állományt"
 
-#: lib/noticeform.php:212
+#. TRANS: Field label to add location to a notice.
 msgid "Share my location"
 msgstr "Tegyük közzé a hollétemet"
 
-#: lib/noticeform.php:215
+#. TRANS: Text to not share location for a notice in notice form.
 msgid "Do not share my location"
 msgstr "Ne tegyük közzé a hollétemet"
 
-#: lib/noticeform.php:216
+#. TRANS: Timeout error text for location retrieval in notice form.
 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
 "try again later"
 msgstr ""
 
 #. TRANS: Used in coordinates as abbreviation of north
-#: lib/noticelist.php:457
 msgid "N"
 msgstr "É"
 
 #. TRANS: Used in coordinates as abbreviation of south
-#: lib/noticelist.php:459
 msgid "S"
 msgstr "D"
 
 #. TRANS: Used in coordinates as abbreviation of east
-#: lib/noticelist.php:461
 msgid "E"
 msgstr "K"
 
 #. TRANS: Used in coordinates as abbreviation of west
-#: lib/noticelist.php:463
 msgid "W"
 msgstr "Ny"
 
-#: lib/noticelist.php:465
 #, php-format
 msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgstr ""
 
-#: lib/noticelist.php:474
 msgid "at"
 msgstr ""
 
-#: lib/noticelist.php:523
 msgid "web"
 msgstr ""
 
-#: lib/noticelist.php:589
 msgid "in context"
 msgstr "előzmény"
 
-#: lib/noticelist.php:624
 msgid "Repeated by"
 msgstr "Megismételte:"
 
-#: lib/noticelist.php:651
 msgid "Reply to this notice"
 msgstr "Válaszoljunk erre a hírre"
 
-#: lib/noticelist.php:652
 msgid "Reply"
 msgstr "Válasz"
 
-#: lib/noticelist.php:678
 msgid "Delete this notice"
 msgstr "Töröljük ezt a hírt"
 
-#: lib/noticelist.php:696
 msgid "Notice repeated"
 msgstr "A hírt megismételtük"
 
-#: lib/nudgeform.php:116
 msgid "Nudge this user"
 msgstr "Bökjük meg ezt a felhasználót"
 
-#: lib/nudgeform.php:128
 msgid "Nudge"
 msgstr "Megbök"
 
-#: lib/nudgeform.php:128
 msgid "Send a nudge to this user"
 msgstr "Bökjük meg ezt a felhasználót"
 
-#: lib/oauthstore.php:294
 msgid "Error inserting new profile."
 msgstr ""
 
-#: lib/oauthstore.php:302
 msgid "Error inserting avatar."
 msgstr ""
 
-#: lib/oauthstore.php:322
 msgid "Error inserting remote profile."
 msgstr ""
 
 #. TRANS: Exception thrown when a notice is denied because it has been sent before.
-#: lib/oauthstore.php:362
 msgid "Duplicate notice."
 msgstr ""
 
-#: lib/oauthstore.php:507
 msgid "Couldn't insert new subscription."
 msgstr ""
 
-#: lib/personalgroupnav.php:104
-#, fuzzy
 msgid "Replies"
 msgstr "Válaszok"
 
-#: lib/personalgroupnav.php:109
-#, fuzzy
 msgid "Favorites"
 msgstr "Kedvencek"
 
-#: lib/personalgroupnav.php:120
 #, fuzzy
 msgid "Inbox"
 msgstr "Homokozó"
 
-#: lib/personalgroupnav.php:121
 msgid "Your incoming messages"
 msgstr "A bejövő üzeneteid"
 
-#: lib/personalgroupnav.php:125
 #, fuzzy
 msgid "Outbox"
 msgstr "%s kimenő postafiókja"
 
-#: lib/personalgroupnav.php:126
 msgid "Your sent messages"
 msgstr "A küldött üzeneteid"
 
 #. TRANS: Title for personal tag cloud section. %s is a user nickname.
-#: lib/personaltagcloudsection.php:56
 #, php-format
 msgid "Tags in %s's notices"
 msgstr "Címkék %s híreiben"
 
 #. TRANS: Displayed as version information for a plugin if no version information was found.
-#: lib/plugin.php:126
 msgid "Unknown"
 msgstr ""
 
 #. TRANS: Plugin admin panel controls
-#: lib/plugindisableform.php:90
 msgctxt "plugin"
 msgid "Disable"
 msgstr ""
 
 #. TRANS: Plugin admin panel controls
-#: lib/pluginenableform.php:112
 msgctxt "plugin"
 msgid "Enable"
 msgstr ""
 
-#: lib/pluginlist.php:196
 msgctxt "plugin-description"
 msgid "(Plugin descriptions unavailable when disabled.)"
 msgstr ""
 
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:88
 msgid "Subscriptions"
 msgstr "Feliratkozások"
 
 #. TRANS: Text for user subscription statistics if user has more subscriptions than displayed.
-#: lib/profileaction.php:144
 msgid "All subscriptions"
 msgstr "Összes feliratkozás"
 
 #. TRANS: H2 text for user subscriber statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:96
 msgid "Subscribers"
 msgstr "Feliratkozók"
 
 #. TRANS: Text for user subscription statistics if user has more subscribers than displayed.
-#: lib/profileaction.php:181
 msgid "All subscribers"
 msgstr "Minden feliratkozott"
 
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:213
 msgid "User ID"
 msgstr "Felhasználói azonosító"
 
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:219
 msgid "Member since"
 msgstr "Tagság kezdete:"
 
 #. TRANS: Label for user statistics.
 #. TRANS: H2 text for user group membership statistics.
-#: lib/profileaction.php:239 lib/profileaction.php:290
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:104
 msgid "Groups"
 msgstr "Csoportok"
 
 #. TRANS: Label for user statistics.
 #. TRANS: Average count of posts made per day since account registration.
-#: lib/profileaction.php:253
 msgid "Daily average"
 msgstr ""
 
 #. TRANS: Text for user group membership statistics if user has more subscriptions than displayed.
-#: lib/profileaction.php:305
 msgid "All groups"
 msgstr "Összes csoport"
 
 #. TRANS: Server error displayed when using an unimplemented method.
-#: lib/profileformaction.php:123
 msgid "Unimplemented method."
 msgstr ""
 
-#: lib/publicgroupnav.php:82
 msgid "User groups"
 msgstr "A felhasználó csoportjai"
 
-#: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
 msgid "Recent tags"
 msgstr ""
 
-#: lib/publicgroupnav.php:88
 msgid "Featured"
 msgstr ""
 
-#: lib/publicgroupnav.php:92
 msgid "Popular"
 msgstr "Népszerű"
 
-#: lib/redirectingaction.php:95
 msgid "No return-to arguments."
 msgstr ""
 
-#: lib/repeatform.php:107
 msgid "Repeat this notice?"
 msgstr "Megismételjük ezt a hírt?"
 
-#: lib/repeatform.php:132
 msgid "Yes"
 msgstr "Igen"
 
-#: lib/repeatform.php:132
 msgid "Repeat this notice"
 msgstr "Ismételjük meg ezt a hírt"
 
-#: lib/revokeroleform.php:91
 #, php-format
 msgid "Revoke the \"%s\" role from this user"
 msgstr ""
 
 #. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:1001
 #, fuzzy
 msgid "Page not found."
 msgstr "Az API-metódus nem található."
 
-#: lib/sandboxform.php:67
 msgid "Sandbox"
 msgstr "Homokozó"
 
-#: lib/sandboxform.php:78
 msgid "Sandbox this user"
 msgstr ""
 
 #. TRANS: Fieldset legend for the search form.
-#: lib/searchaction.php:120
 msgid "Search site"
 msgstr ""
 
 #. TRANS: Used as a field label for the field where one or more keywords
 #. TRANS: for searching can be entered.
-#: lib/searchaction.php:128
 msgid "Keyword(s)"
 msgstr ""
 
 #. TRANS: Button text for searching site.
-#: lib/searchaction.php:130
 msgctxt "BUTTON"
 msgid "Search"
 msgstr ""
 
-#: lib/searchgroupnav.php:80
 msgid "People"
 msgstr ""
 
-#: lib/searchgroupnav.php:81
 msgid "Find people on this site"
 msgstr "Emberek keresése az oldalon"
 
-#: lib/searchgroupnav.php:83
 msgid "Find content of notices"
 msgstr "Keressünk a hírek tartalmában"
 
-#: lib/searchgroupnav.php:85
 msgid "Find groups on this site"
 msgstr "Csoportok keresése az oldalon"
 
-#: lib/section.php:89
 msgid "Untitled section"
 msgstr "Névtelen szakasz"
 
-#: lib/section.php:106
 msgid "More..."
 msgstr "Tovább…"
 
-#: lib/settingsnav.php:78
 msgid "Change your profile settings"
 msgstr ""
 
-#: lib/settingsnav.php:83
 msgid "Upload an avatar"
 msgstr "Avatar feltöltése"
 
-#: lib/settingsnav.php:88
 msgid "Change your password"
 msgstr "Változtasd meg a jelszavad"
 
-#: lib/settingsnav.php:93
 msgid "Change email handling"
 msgstr "Email kezelés megváltoztatása"
 
-#: lib/settingsnav.php:98
 msgid "Design your profile"
 msgstr ""
 
-#: lib/settingsnav.php:102
 msgid "URL"
 msgstr "URL-cím"
 
-#: lib/settingsnav.php:103
 msgid "URL shorteners"
 msgstr ""
 
-#: lib/settingsnav.php:111
 msgid "Updates by instant messenger (IM)"
 msgstr ""
 
-#: lib/settingsnav.php:118
 msgid "Updates by SMS"
 msgstr ""
 
-#: lib/settingsnav.php:123
-#, fuzzy
 msgid "Connections"
 msgstr "Kapcsolatok"
 
-#: lib/settingsnav.php:124
 msgid "Authorized connected applications"
 msgstr ""
 
-#: lib/silenceform.php:67
 msgid "Silence"
 msgstr ""
 
-#: lib/silenceform.php:78
 msgid "Silence this user"
 msgstr ""
 
-#: lib/subgroupnav.php:89
 #, php-format
 msgid "People %s subscribes to"
 msgstr ""
 
-#: lib/subgroupnav.php:97
 #, php-format
 msgid "People subscribed to %s"
 msgstr ""
 
-#: lib/subgroupnav.php:105
 #, php-format
 msgid "Groups %s is a member of"
 msgstr ""
 
-#: lib/subgroupnav.php:111
 msgid "Invite"
 msgstr "Meghívás"
 
-#: lib/subgroupnav.php:112
 #, php-format
 msgid "Invite friends and colleagues to join you on %s"
 msgstr ""
 
-#: lib/subscribeform.php:115 lib/subscribeform.php:139
 msgid "Subscribe to this user"
 msgstr ""
 
-#: lib/subscriberspeopleselftagcloudsection.php:48
-#: lib/subscriptionspeopleselftagcloudsection.php:48
 msgid "People Tagcloud as self-tagged"
 msgstr ""
 
-#: lib/subscriberspeopletagcloudsection.php:48
-#: lib/subscriptionspeopletagcloudsection.php:48
 msgid "People Tagcloud as tagged"
 msgstr ""
 
-#: lib/tagcloudsection.php:56
 msgid "None"
 msgstr ""
 
 #. TRANS: Server exception displayed if a theme name was invalid.
-#: lib/theme.php:74
 #, fuzzy
 msgid "Invalid theme name."
 msgstr "Érvénytelen megjegyzéstartalom."
 
-#: lib/themeuploader.php:50
 msgid "This server cannot handle theme uploads without ZIP support."
 msgstr ""
 
-#: lib/themeuploader.php:58 lib/themeuploader.php:61
 msgid "The theme file is missing or the upload failed."
 msgstr ""
 
-#: lib/themeuploader.php:91 lib/themeuploader.php:102
-#: lib/themeuploader.php:279 lib/themeuploader.php:283
-#: lib/themeuploader.php:291 lib/themeuploader.php:298
 msgid "Failed saving theme."
 msgstr ""
 
-#: lib/themeuploader.php:147
 msgid "Invalid theme: bad directory structure."
 msgstr ""
 
-#: lib/themeuploader.php:166
 #, php-format
 msgid "Uploaded theme is too large; must be less than %d byte uncompressed."
 msgid_plural ""
@@ -9394,152 +7748,122 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/themeuploader.php:179
 msgid "Invalid theme archive: missing file css/display.css"
 msgstr ""
 
-#: lib/themeuploader.php:219
 msgid ""
 "Theme contains invalid file or folder name. Stick with ASCII letters, "
 "digits, underscore, and minus sign."
 msgstr ""
 
-#: lib/themeuploader.php:225
 msgid "Theme contains unsafe file extension names; may be unsafe."
 msgstr ""
 
-#: lib/themeuploader.php:242
 #, php-format
 msgid "Theme contains file of type '.%s', which is not allowed."
 msgstr ""
 
-#: lib/themeuploader.php:260
 msgid "Error opening theme archive."
 msgstr ""
 
-#: lib/threadednoticelist.php:270
 #, php-format
-msgid "Show all %d comment"
-msgid_plural "Show all %d comments"
+msgid "Show %d reply"
+msgid_plural "Show all %d replies"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/topposterssection.php:74
 msgid "Top posters"
 msgstr ""
 
 #. TRANS: Title for the form to unblock a user.
-#: lib/unblockform.php:67
 #, fuzzy
 msgctxt "TITLE"
 msgid "Unblock"
 msgstr "Blokk feloldása"
 
-#: lib/unsandboxform.php:69
 msgid "Unsandbox"
 msgstr ""
 
-#: lib/unsandboxform.php:80
 msgid "Unsandbox this user"
 msgstr ""
 
-#: lib/unsilenceform.php:67
 msgid "Unsilence"
 msgstr ""
 
-#: lib/unsilenceform.php:78
 msgid "Unsilence this user"
 msgstr ""
 
-#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
 msgid "Unsubscribe from this user"
 msgstr ""
 
-#: lib/unsubscribeform.php:137
 msgid "Unsubscribe"
 msgstr ""
 
 #. 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).
-#: lib/usernoprofileexception.php:60
 #, fuzzy, php-format
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "A felhasználónak nincs profilja."
 
-#: lib/userprofile.php:116
 msgid "Edit Avatar"
 msgstr ""
 
 #. TRANS: H2 for user actions in a profile.
 #. TRANS: H2 for entity actions in a profile.
-#: lib/userprofile.php:216 lib/userprofile.php:232
 msgid "User actions"
 msgstr "Felhasználói műveletek"
 
 #. TRANS: Text shown in user profile of not yet compeltely deleted users.
-#: lib/userprofile.php:220
 msgid "User deletion in progress..."
 msgstr ""
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:248
 msgid "Edit profile settings"
 msgstr ""
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:250
 msgid "Edit"
 msgstr "Szerkesztés"
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:274
 msgid "Send a direct message to this user"
 msgstr ""
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:276
 msgid "Message"
 msgstr "Üzenet"
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:318
 msgid "Moderate"
 msgstr "Moderálás"
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:357
 msgid "User role"
 msgstr "Felhasználói szerepkör"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:360
 msgctxt "role"
 msgid "Administrator"
 msgstr "Adminisztrátor"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:362
 msgctxt "role"
 msgid "Moderator"
 msgstr "Moderátor"
 
-#: lib/util.php:321
 #, fuzzy
 msgid "Not allowed to log in."
 msgstr "Nem vagy bejelentkezve."
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1337
 msgid "a few seconds ago"
 msgstr "pár másodperce"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1340
 msgid "about a minute ago"
 msgstr "körülbelül egy perce"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1344
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
@@ -9547,12 +7871,10 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1347
 msgid "about an hour ago"
 msgstr "körülbelül egy órája"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1351
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
@@ -9560,12 +7882,10 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1354
 msgid "about a day ago"
 msgstr "körülbelül egy napja"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1358
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
@@ -9573,12 +7893,10 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1361
 msgid "about a month ago"
 msgstr "körülbelül egy hónapja"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1365
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
@@ -9586,119 +7904,42 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1368
 msgid "about a year ago"
 msgstr "körülbelül egy éve"
 
 #. TRANS: Web color exception thrown when a hexadecimal color code does not validate.
 #. TRANS: %s is the provided (invalid) color code.
-#: lib/webcolor.php:81 lib/webcolor.php:121
 #, php-format
 msgid "%s is not a valid color! Use 3 or 6 hex characters."
 msgstr ""
 
 #. TRANS: Exception.
-#: lib/xrd.php:63
 #, fuzzy
 msgid "Invalid XML."
 msgstr "Érvénytelen méret."
 
 #. TRANS: Exception.
-#: lib/xrd.php:68
 msgid "Invalid XML, missing XRD root."
 msgstr ""
 
 #. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
-#: scripts/restoreuser.php:62
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
 
-#, fuzzy
-#~ msgid "Could not generate feed for group - %s"
-#~ msgstr "Nem sikerült a csoport frissítése."
+#~ msgid "Full name is too long (max 255 chars)."
+#~ msgstr "A teljes név túl hosszú (legfeljebb 255 karakter lehet)."
+
+#~ msgid "description is too long (max %d chars)."
+#~ msgstr "a leírás túl hosszú (legfeljebb %d karakter)."
+
+#~ msgid "Location is too long (max 255 chars)."
+#~ msgstr "A hely túl hosszú (legfeljebb 255 karakter lehet)."
+
+#~ msgid "Too many aliases! Maximum %d."
+#~ msgstr "Túl sok álnév! Legfeljebb %d lehet."
 
 #, fuzzy
-#~ msgid "Current confirmed Jabber/Google Talk address."
-#~ msgstr "A jelenleg megerősített e-mail cím."
-
-#, fuzzy
-#~ msgid "Publish a MicroID for my Jabber/Google Talk address."
-#~ msgstr "MicroID közzététele az e-mail címemhez."
-
-#~ msgid "No Jabber ID."
-#~ msgstr "Nincs Jabber-azonosító."
-
-#, fuzzy
-#~ msgid "Not a valid Jabber ID."
-#~ msgstr "Érvénytelen Jabber-azonosító"
-
-#~ msgid "That is already your Jabber ID."
-#~ msgstr "Jelenleg is ez a Jabber-azonosítód."
-
-#~ msgid "Other settings"
-#~ msgstr "Egyéb beállítások"
-
-#~ msgid "Tag cloud"
-#~ msgstr "Címkefelhő"
-
-#~ msgid "Jabber"
-#~ msgstr "Jabber"
-
-#~ msgid "Photo"
-#~ msgstr "Fénykép"
-
-#~ msgid "Other options"
-#~ msgstr "További opciók"
-
-#~ msgid "Other"
-#~ msgstr "Más egyéb"
-
-#~ msgid "Primary site navigation"
-#~ msgstr "Elsődleges navigáció"
-
-#~ msgid "Account"
-#~ msgstr "Kontó"
-
-#~ msgid "Connect"
-#~ msgstr "Kapcsolódás"
-
-#~ msgid "Secondary site navigation"
-#~ msgstr "Másodlagos navigáció"
-
-#~ msgid "StatusNet software license"
-#~ msgstr "A StatusNet szoftver licence"
-
-#~ msgid "Site content license"
-#~ msgstr "A webhely tartalmára vonatkozó licenc"
-
-#~ msgid "Author"
-#~ msgstr "Szerző"
-
-#~ msgid "Provider"
-#~ msgstr "Szolgáltató"
-
-#, fuzzy
-#~ msgctxt "MENU"
-#~ msgid "SMS"
-#~ msgstr "SMS"
-
-#~ msgid "Filter tags"
-#~ msgstr "Szűrjük a címkéket"
-
-#~ msgid "[%s]"
-#~ msgstr "[%s]"
-
-#~ msgid "Available characters"
-#~ msgstr "Használható karakterek"
-
-#, fuzzy
-#~ msgctxt "MENU"
-#~ msgid "Profile"
-#~ msgstr "Profil"
-
-#, fuzzy
-#~ msgid "Message too long. Maximum is %1$d character, you sent %2$d."
-#~ msgid_plural "Message too long. Maximum is %1$d characters, you sent %2$d."
-#~ msgstr[0] "Az túl hosszú. Egy hír legfeljebb %d karakterből állhat."
-#~ msgstr[1] "Az túl hosszú. Egy hír legfeljebb %d karakterből állhat."
+#~ msgctxt "BUTTON"
+#~ msgid "Comment"
+#~ msgstr "Tartalom"
diff --git a/locale/ia/LC_MESSAGES/statusnet.po b/locale/ia/LC_MESSAGES/statusnet.po
index 2bc46254d4..41dc0c2520 100644
--- a/locale/ia/LC_MESSAGES/statusnet.po
+++ b/locale/ia/LC_MESSAGES/statusnet.po
@@ -9,67 +9,57 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:23+0000\n"
-"PO-Revision-Date: 2011-03-03 17:26:06+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:24+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-02-25 23:49:23+0000\n"
+"X-POT-Import-Date: 2011-03-03 17:59:19+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
-#: actions/accessadminpanel.php:53 lib/adminpanelaction.php:363
 msgid "Access"
 msgstr "Accesso"
 
 #. TRANS: Page notice.
-#: actions/accessadminpanel.php:64
 msgid "Site access settings"
 msgstr "Configurationes de accesso al sito"
 
 #. TRANS: Form legend for registration form.
-#: actions/accessadminpanel.php:151
 msgid "Registration"
 msgstr "Registration"
 
 #. TRANS: Checkbox instructions for admin setting "Private".
-#: actions/accessadminpanel.php:155
 msgid "Prohibit anonymous users (not logged in) from viewing site?"
 msgstr "Prohibir al usatores anonyme (sin session aperte) de vider le sito?"
 
 #. TRANS: Checkbox label for prohibiting anonymous users from viewing site.
-#: actions/accessadminpanel.php:157
 msgctxt "LABEL"
 msgid "Private"
 msgstr "Private"
 
 #. TRANS: Checkbox instructions for admin setting "Invite only".
-#: actions/accessadminpanel.php:164
 msgid "Make registration invitation only."
 msgstr "Permitter le registration solmente al invitatos."
 
 #. TRANS: Checkbox label for configuring site as invite only.
-#: actions/accessadminpanel.php:166
 msgid "Invite only"
 msgstr "Solmente per invitation"
 
 #. TRANS: Checkbox instructions for admin setting "Closed" (no new registrations).
-#: actions/accessadminpanel.php:173
 msgid "Disable new registrations."
 msgstr "Disactivar le creation de nove contos."
 
 #. TRANS: Checkbox label for disabling new user registrations.
-#: actions/accessadminpanel.php:175
 msgid "Closed"
 msgstr "Claudite"
 
 #. TRANS: Title for button to save access settings in site admin panel.
-#: actions/accessadminpanel.php:191
 msgid "Save access settings"
 msgstr "Salveguardar configurationes de accesso"
 
@@ -77,6 +67,7 @@ msgstr "Salveguardar configurationes de accesso"
 #. TRANS: Button text for saving theme settings.
 #. TRANS: Button label to save e-mail preferences.
 #. TRANS: Button label to save IM preferences.
+#. TRANS: Button text in the license admin panel.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
 #. TRANS: Button text for saving site notice in admin panel.
@@ -86,21 +77,12 @@ msgstr "Salveguardar configurationes de accesso"
 #. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
 #. TRANS: Button text on profile design page to save settings.
-#: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
-#: actions/emailsettings.php:251 actions/imsettings.php:199
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:198
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:204
-#: actions/subscriptions.php:261 actions/urlsettings.php:152
-#: actions/useradminpanel.php:298 lib/applicationeditform.php:355
-#: lib/designform.php:320 lib/groupeditform.php:201
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Salveguardar"
 
 #. TRANS: Server error when page not found (404).
 #. TRANS: Server error when page not found (404)
-#: actions/all.php:68 actions/public.php:98 actions/replies.php:93
-#: actions/showfavorites.php:140 actions/tag.php:52
 msgid "No such page."
 msgstr "Pagina non existe."
 
@@ -119,6 +101,7 @@ msgstr "Pagina non existe."
 #. TRANS: Client error displayed when checking group membership for a non-existing user.
 #. TRANS: Client error displayed when trying to have a non-existing user join a group.
 #. TRANS: Client error displayed when trying to have a non-existing user leave a group.
+#. TRANS: Client error displayed when not providing a user or an invalid user.
 #. TRANS: Client error displayed when updating a status for a non-existing user.
 #. TRANS: Client error displayed when requesting a list of followers for a non-existing user.
 #. TRANS: Client error displayed when requesting most recent favourite notices by a user for a non-existing user.
@@ -131,6 +114,8 @@ msgstr "Pagina non existe."
 #. 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.
 #. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
@@ -138,33 +123,10 @@ msgstr "Pagina non existe."
 #. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when calling a profile action without specifying a user.
-#: actions/all.php:80 actions/allrss.php:69
-#: actions/apiaccountupdatedeliverydevice.php:110
-#: actions/apiaccountupdateprofile.php:103
-#: actions/apiaccountupdateprofilebackgroundimage.php:118
-#: actions/apiaccountupdateprofileimage.php:104 actions/apiatomservice.php:59
-#: actions/apiblockcreate.php:96 actions/apiblockdestroy.php:94
-#: actions/apidirectmessage.php:75 actions/apidirectmessagenew.php:72
-#: actions/apigroupcreate.php:111 actions/apigroupismember.php:89
-#: actions/apigroupjoin.php:98 actions/apigroupleave.php:98
-#: actions/apigrouplist.php:70 actions/apigroupprofileupdate.php:108
-#: actions/apistatusesupdate.php:230 actions/apisubscriptions.php:85
-#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:173
-#: actions/apitimelinehome.php:78 actions/apitimelinementions.php:77
-#: actions/apitimelineuser.php:79 actions/avatarbynickname.php:79
-#: actions/favoritesrss.php:72 actions/foaf.php:42 actions/foaf.php:61
-#: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116
-#: actions/otp.php:78 actions/remotesubscribe.php:144
-#: actions/remotesubscribe.php:153 actions/replies.php:73
-#: actions/repliesrss.php:38 actions/rsd.php:113 actions/showfavorites.php:106
-#: actions/userbyid.php:75 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/userxrd.php:59 actions/xrds.php:71 lib/command.php:509
-#: lib/galleryaction.php:59 lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Iste usator non existe."
 
 #. TRANS: Page title. %1$s is user nickname, %2$d is page number
-#: actions/all.php:91
 #, php-format
 msgid "%1$s and friends, page %2$d"
 msgstr "%1$s e amicos, pagina %2$d"
@@ -173,33 +135,26 @@ msgstr "%1$s e amicos, pagina %2$d"
 #. TRANS: H1 text for page. %s is a user nickname.
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Timeline title for user and friends. %s is a user nickname.
-#: actions/all.php:94 actions/all.php:191 actions/allrss.php:117
-#: actions/apitimelinefriends.php:207 actions/apitimelinehome.php:113
-#: lib/personalgroupnav.php:100
 #, php-format
 msgid "%s and friends"
 msgstr "%s e amicos"
 
 #. TRANS: %s is user nickname.
-#: actions/all.php:108
 #, php-format
 msgid "Feed for friends of %s (RSS 1.0)"
 msgstr "Syndication pro le amicos de %s (RSS 1.0)"
 
 #. TRANS: %s is user nickname.
-#: actions/all.php:117
 #, php-format
 msgid "Feed for friends of %s (RSS 2.0)"
 msgstr "Syndication pro le amicos de %s (RSS 2.0)"
 
 #. TRANS: %s is user nickname.
-#: actions/all.php:126
 #, php-format
 msgid "Feed for friends of %s (Atom)"
 msgstr "Syndication pro le amicos de %s (Atom)"
 
 #. TRANS: Empty list message. %s is a user nickname.
-#: actions/all.php:139
 #, php-format
 msgid ""
 "This is the timeline for %s and friends but no one has posted anything yet."
@@ -209,7 +164,6 @@ msgstr ""
 
 #. TRANS: Encouragement displayed on logged in user's empty timeline.
 #. TRANS: This message contains Markdown links. Keep "](" together.
-#: actions/all.php:146
 #, php-format
 msgid ""
 "Try subscribing to more people, [join a group](%%action.groups%%) or post "
@@ -220,7 +174,6 @@ msgstr ""
 
 #. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@".
 #. TRANS: This message contains Markdown links. Keep "](" together.
-#: actions/all.php:150
 #, php-format
 msgid ""
 "You can try to [nudge %1$s](../%2$s) from their profile or [post something "
@@ -233,7 +186,6 @@ msgstr ""
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
 #. TRANS: Second sentence of empty message for anonymous users. %s is a user nickname.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:221
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -243,14 +195,11 @@ msgstr ""
 "pulsata a %s o publicar un message a su attention."
 
 #. TRANS: H1 text for page when viewing a list for self.
-#: actions/all.php:188
 msgid "You and friends"
 msgstr "Tu e amicos"
 
 #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
 #. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name.
-#: actions/allrss.php:122 actions/apitimelinefriends.php:213
-#: actions/apitimelinehome.php:119
 #, php-format
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr "Actualisationes de %1$s e su amicos in %2$s!"
@@ -269,55 +218,20 @@ msgstr "Actualisationes de %1$s e su amicos in %2$s!"
 #. TRANS: Client error displayed trying to execute an unknown API method checking group membership.
 #. TRANS: Client error displayed trying to execute an unknown API method listing the latest 20 groups.
 #. TRANS: Client error displayed trying to execute an unknown API method showing group membership.
+#. TRANS: Client error displayed when using an unsupported API format.
 #. TRANS: Client error displayed trying to execute an unknown API method showing a group.
 #. TRANS: Client error displayed trying to execute an unknown API method testing API connectivity.
 #. TRANS: Client error displayed trying to execute an unknown API method deleting a status.
 #. TRANS: Client error displayed when trying to handle an unknown API method.
-#: actions/apiaccountratelimitstatus.php:69
-#: actions/apiaccountupdatedeliverydevice.php:92
-#: actions/apiaccountupdateprofile.php:94
-#: actions/apiaccountupdateprofilebackgroundimage.php:92
-#: actions/apiaccountupdateprofilecolors.php:115
-#: actions/apiaccountverifycredentials.php:68 actions/apidirectmessage.php:157
-#: actions/apifavoritecreate.php:98 actions/apifavoritedestroy.php:98
-#: actions/apifriendshipscreate.php:99 actions/apifriendshipsdestroy.php:99
-#: actions/apifriendshipsshow.php:124 actions/apigroupcreate.php:138
-#: actions/apigroupismember.php:115 actions/apigroupjoin.php:151
-#: actions/apigroupleave.php:141 actions/apigrouplist.php:134
-#: actions/apigrouplistall.php:120 actions/apigroupmembership.php:105
-#: actions/apigroupprofileupdate.php:100 actions/apigroupprofileupdate.php:213
-#: actions/apigroupshow.php:114 actions/apihelptest.php:84
-#: actions/apistatusesdestroy.php:101 actions/apistatusesretweets.php:110
-#: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:139
-#: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
-#: actions/apitimelinefavorites.php:182 actions/apitimelinefriends.php:276
-#: actions/apitimelinegroup.php:148 actions/apitimelinehome.php:181
-#: actions/apitimelinementions.php:182 actions/apitimelinepublic.php:247
-#: actions/apitimelineretweetedtome.php:147
-#: actions/apitimelineretweetsofme.php:147 actions/apitimelinetag.php:165
-#: actions/apitimelineuser.php:217 actions/apiusershow.php:100
 msgid "API method not found."
 msgstr "Methodo API non trovate."
 
 #. 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.
-#: actions/apiaccountupdatedeliverydevice.php:83
-#: actions/apiaccountupdateprofile.php:85
-#: actions/apiaccountupdateprofilebackgroundimage.php:83
-#: actions/apiaccountupdateprofilecolors.php:106
-#: actions/apiaccountupdateprofileimage.php:80 actions/apiblockcreate.php:87
-#: actions/apiblockdestroy.php:85 actions/apidirectmessagenew.php:107
-#: actions/apifavoritecreate.php:88 actions/apifavoritedestroy.php:88
-#: actions/apifriendshipscreate.php:89 actions/apifriendshipsdestroy.php:89
-#: actions/apigroupcreate.php:102 actions/apigroupjoin.php:89
-#: actions/apigroupleave.php:89 actions/apigroupprofileupdate.php:92
-#: actions/apimediaupload.php:66 actions/apistatusesretweet.php:63
-#: actions/apistatusesupdate.php:194
 msgid "This method requires a POST."
 msgstr "Iste methodo require un POST."
 
 #. TRANS: Client error displayed when no valid device parameter is provided for a user's delivery device setting.
-#: actions/apiaccountupdatedeliverydevice.php:103
 msgid ""
 "You must specify a parameter named 'device' with a value of one of: sms, im, "
 "none."
@@ -332,10 +246,6 @@ msgstr ""
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
-#: actions/apiaccountupdatedeliverydevice.php:136
-#: actions/emailsettings.php:353 actions/emailsettings.php:499
-#: actions/profilesettings.php:323 actions/smssettings.php:300
-#: actions/smssettings.php:453 actions/urlsettings.php:211
 msgid "Could not update user."
 msgstr "Non poteva actualisar le usator."
 
@@ -348,32 +258,17 @@ msgstr "Non poteva actualisar le usator."
 #. TRANS: Server error displayed when requesting Friends of a Friend feed for a user for which the profile could not be found.
 #. TRANS: Server error displayed when trying to get a user hCard for a user without a profile.
 #. TRANS: Server error displayed when calling a profile action while the specified user does not have a profile.
-#: actions/apiaccountupdateprofile.php:111
-#: actions/apiaccountupdateprofilebackgroundimage.php:199
-#: actions/apiaccountupdateprofilecolors.php:183
-#: actions/apiaccountupdateprofileimage.php:131
-#: actions/apiuserprofileimage.php:88 actions/apiusershow.php:108
-#: actions/avatarbynickname.php:85 actions/foaf.php:69 actions/hcard.php:75
-#: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
-#: lib/profileaction.php:85
 msgid "User has no profile."
 msgstr "Le usator non ha un profilo."
 
 #. TRANS: Server error displayed if a user profile could not be saved.
 #. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:419
 msgid "Could not save profile."
 msgstr "Non poteva salveguardar le profilo."
 
 #. TRANS: Client error displayed when the number of bytes in a POST request exceeds a limit.
 #. TRANS: %s is the number of bytes of the CONTENT_LENGTH.
 #. TRANS: Form validation error in design settings form. POST should remain untranslated.
-#: actions/apiaccountupdateprofilebackgroundimage.php:108
-#: actions/apiaccountupdateprofileimage.php:95 actions/apimediaupload.php:81
-#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
-#: actions/designadminpanel.php:120 actions/editapplication.php:121
-#: actions/newapplication.php:102 actions/newnotice.php:95
-#: lib/designsettings.php:110
 #, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s byte) due to its "
@@ -393,26 +288,15 @@ msgstr[1] ""
 #. TRANS: Client error displayed when a database error occurs inserting profile colours.
 #. TRANS: Client error displayed when a database error occurs updating profile colours.
 #. TRANS: Form validation error displayed when group design settings could not be saved because of an application issue.
-#: actions/apiaccountupdateprofilebackgroundimage.php:138
-#: actions/apiaccountupdateprofilebackgroundimage.php:149
-#: actions/apiaccountupdateprofilecolors.php:160
-#: actions/apiaccountupdateprofilecolors.php:171
-#: actions/groupdesignsettings.php:285 actions/groupdesignsettings.php:296
-#: actions/userdesignsettings.php:218 actions/userdesignsettings.php:228
-#: actions/userdesignsettings.php:270 actions/userdesignsettings.php:280
 msgid "Unable to save your design settings."
 msgstr "Impossibile salveguardar le configurationes del apparentia."
 
 #. TRANS: Error displayed when updating design settings fails.
 #. TRANS: Client error displayed when a database error occurs updating profile colours.
-#: actions/apiaccountupdateprofilebackgroundimage.php:191
-#: actions/apiaccountupdateprofilecolors.php:139
-#: actions/userdesignsettings.php:196
 msgid "Could not update your design."
 msgstr "Non poteva actualisar le apparentia."
 
 #. TRANS: Title for Atom feed.
-#: actions/apiatomservice.php:85
 msgctxt "ATOM"
 msgid "Main"
 msgstr "Principal"
@@ -421,9 +305,6 @@ msgstr "Principal"
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Title in atom group notice feed. %s is a group name.
 #. TRANS: Title in atom user notice feed. %s is a user name.
-#: actions/apiatomservice.php:93 actions/grouprss.php:138
-#: actions/userrss.php:94 lib/atomgroupnoticefeed.php:63
-#: lib/atomusernoticefeed.php:88
 #, php-format
 msgid "%s timeline"
 msgstr "Chronologia de %s"
@@ -433,8 +314,6 @@ msgstr "Chronologia de %s"
 #. TRANS: %s is a user nickname.
 #. TRANS: Header for subscriptions overview for a user (first page).
 #. TRANS: %s is a user nickname.
-#: actions/apiatomservice.php:104 actions/atompubsubscriptionfeed.php:148
-#: actions/subscriptions.php:51
 #, php-format
 msgid "%s subscriptions"
 msgstr "Subscriptiones de %s"
@@ -442,58 +321,48 @@ msgstr "Subscriptiones de %s"
 #. TRANS: Title for Atom feed with a user's favorite notices. %s is a user nickname.
 #. TRANS: Title for Atom favorites feed.
 #. TRANS: %s is a user nickname.
-#: actions/apiatomservice.php:115 actions/atompubfavoritefeed.php:142
 #, php-format
 msgid "%s favorites"
 msgstr "%s favorites"
 
 #. TRANS: Title for Atom feed with a user's memberships. %s is a user nickname.
-#: actions/apiatomservice.php:126
 #, php-format
 msgid "%s memberships"
 msgstr "%s membratos"
 
 #. TRANS: Client error displayed when users try to block themselves.
-#: actions/apiblockcreate.php:105
 msgid "You cannot block yourself!"
 msgstr "Tu non pote blocar te mesme!"
 
 #. TRANS: Server error displayed when blocking a user has failed.
-#: actions/apiblockcreate.php:127
 msgid "Block user failed."
 msgstr "Le blocada del usator ha fallite."
 
 #. TRANS: Server error displayed when unblocking a user has failed.
-#: actions/apiblockdestroy.php:113
 msgid "Unblock user failed."
 msgstr "Le disblocada del usator ha fallite."
 
 #. TRANS: Title. %s is a user nickname.
-#: actions/apidirectmessage.php:88
 #, php-format
 msgid "Direct messages from %s"
 msgstr "Messages directe de %s"
 
 #. TRANS: Subtitle. %s is a user nickname.
-#: actions/apidirectmessage.php:93
 #, php-format
 msgid "All the direct messages sent from %s"
 msgstr "Tote le messages directe inviate de %s"
 
 #. TRANS: Title. %s is a user nickname.
-#: actions/apidirectmessage.php:102
 #, php-format
 msgid "Direct messages to %s"
 msgstr "Messages directe a %s"
 
 #. TRANS: Subtitle. %s is a user nickname.
-#: actions/apidirectmessage.php:107
 #, php-format
 msgid "All the direct messages sent to %s"
 msgstr "Tote le messages directe inviate a %s"
 
 #. TRANS: Client error displayed when no message text was submitted (406).
-#: actions/apidirectmessagenew.php:117
 msgid "No message text!"
 msgstr "Message sin texto!"
 
@@ -501,7 +370,6 @@ msgstr "Message sin texto!"
 #. TRANS: %d is the maximum number of characters for a message.
 #. TRANS: Form validation error displayed when message content is too long.
 #. TRANS: %d is the maximum number of characters for a message.
-#: actions/apidirectmessagenew.php:127 actions/newmessage.php:152
 #, php-format
 msgid "That's too long. Maximum message size is %d character."
 msgid_plural "That's too long. Maximum message size is %d characters."
@@ -511,17 +379,14 @@ msgstr[1] ""
 "Isto es troppo longe. Le dimension maxime de messages es %d characteres."
 
 #. TRANS: Client error displayed if a recipient user could not be found (403).
-#: actions/apidirectmessagenew.php:139
 msgid "Recipient user not found."
 msgstr "Usator destinatario non trovate."
 
 #. TRANS: Client error displayed trying to direct message another user who's not a friend (403).
-#: actions/apidirectmessagenew.php:144
 msgid "Cannot send direct messages to users who aren't your friend."
 msgstr "Non pote inviar messages directe a usatores que non es tu amicos."
 
 #. TRANS: Client error displayed trying to direct message self (403).
-#: actions/apidirectmessagenew.php:154
 msgid ""
 "Do not send a message to yourself; just say it to yourself quietly instead."
 msgstr "Non invia un message a te mesme; il suffice susurrar lo discretemente."
@@ -529,116 +394,96 @@ msgstr "Non invia un message a te mesme; il suffice susurrar lo discretemente."
 #. 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.
 #. TRANS: Client error displayed trying to delete a status with an invalid ID.
-#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:108
-#: actions/apistatusesdestroy.php:121
 msgid "No status found with that ID."
 msgstr "Nulle stato trovate con iste ID."
 
 #. TRANS: Client error displayed when trying to mark a notice favourite that already is a favourite.
-#: actions/apifavoritecreate.php:120
 msgid "This status is already a favorite."
 msgstr "Iste stato es ja favorite."
 
 #. TRANS: Client error displayed when marking a notice as favourite fails.
 #. TRANS: Server error displayed when trying to mark a notice as favorite fails in the database.
 #. TRANS: Error message text shown when a favorite could not be set.
-#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:306
 msgid "Could not create favorite."
 msgstr "Non poteva crear le favorite."
 
 #. TRANS: Client error displayed when trying to remove a favourite that was not a favourite.
-#: actions/apifavoritedestroy.php:122
 msgid "That status is not a favorite."
 msgstr "Iste stato non es favorite."
 
 #. TRANS: Client error displayed when removing a favourite has failed.
 #. TRANS: Server error displayed when removing a favorite from the database fails.
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:90
 msgid "Could not delete favorite."
 msgstr "Non poteva deler le favorite."
 
 #. TRANS: Client error displayed when trying follow who's profile could not be found.
-#: actions/apifriendshipscreate.php:109
 msgid "Could not follow user: profile not found."
 msgstr "Non poteva sequer le usator: profilo non trovate."
 
 #. TRANS: Client error displayed when trying to follow a user that's already being followed.
 #. TRANS: %s is the nickname of the user that is already being followed.
-#: actions/apifriendshipscreate.php:120
 #, php-format
 msgid "Could not follow user: %s is already on your list."
 msgstr "Non poteva sequer le usator: %s es ja in tu lista."
 
 #. TRANS: Client error displayed when trying to unfollow a user that cannot be found.
-#: actions/apifriendshipsdestroy.php:109
 msgid "Could not unfollow user: User not found."
 msgstr "Non poteva cessar de sequer le usator: Usator non trovate."
 
 #. TRANS: Client error displayed when trying to unfollow self.
-#: actions/apifriendshipsdestroy.php:121
 msgid "You cannot unfollow yourself."
 msgstr "Tu non pote cessar de sequer te mesme."
 
 #. TRANS: Client error displayed when supplying invalid parameters to an API call checking if a friendship exists.
-#: actions/apifriendshipsexists.php:88
 msgid "Two valid IDs or nick names must be supplied."
 msgstr "Duo IDs o pseudonymos valide debe esser fornite."
 
 #. TRANS: Client error displayed when a source user could not be determined showing friendship.
-#: actions/apifriendshipsshow.php:131
 msgid "Could not determine source user."
 msgstr "Non poteva determinar le usator de origine."
 
 #. TRANS: Client error displayed when a target user could not be determined showing friendship.
-#: actions/apifriendshipsshow.php:140
 msgid "Could not find target user."
 msgstr "Non poteva trovar le usator de destination."
 
 #. TRANS: Client error trying to create a group with a nickname this is already in use.
+#. TRANS: API validation exception thrown when nickname is already used.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:156 actions/apigroupprofileupdate.php:255
-#: actions/editgroup.php:191 actions/newgroup.php:137
-#: actions/profilesettings.php:274 actions/register.php:199
 msgid "Nickname already in use. Try another one."
 msgstr "Pseudonymo ja in uso. Proba un altere."
 
 #. TRANS: Client error in form for group creation.
+#. TRANS: API validation exception thrown when nickname does not validate.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:164 actions/apigroupprofileupdate.php:259
-#: actions/editgroup.php:195 actions/newgroup.php:141
-#: actions/profilesettings.php:244 actions/register.php:201
 msgid "Not a valid nickname."
 msgstr "Non un pseudonymo valide."
 
 #. TRANS: Client error in form for group creation.
+#. TRANS: API validation exception thrown when homepage URL does not validate.
 #. TRANS: Validation error shown when providing an invalid homepage URL in the "Edit application" form.
 #. TRANS: Group edit form validation error.
 #. TRANS: Validation error shown when providing an invalid homepage URL in the "New application" form.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:181 actions/apigroupprofileupdate.php:277
-#: actions/editapplication.php:235 actions/editgroup.php:202
-#: actions/newapplication.php:221 actions/newgroup.php:148
-#: actions/profilesettings.php:249 actions/register.php:208
 msgid "Homepage is not a valid URL."
 msgstr "Le pagina personal non es un URL valide."
 
 #. TRANS: Client error in form for group creation.
+#. TRANS: API validation exception thrown when full name does not validate.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:191 actions/editgroup.php:206
-#: actions/newgroup.php:152 actions/profilesettings.php:253
-#: actions/register.php:211
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "Le nomine complete es troppo longe (maximo 255 characteres)."
 
 #. TRANS: Client error shown when providing too long a description during group creation.
 #. TRANS: %d is the maximum number of allowed characters.
+#. TRANS: API validation exception thrown when description does not validate.
+#. TRANS: %d is the maximum description length and used for plural.
 #. TRANS: Validation error shown when providing too long a description in the "Edit application" form.
 #. TRANS: %d is the maximum number of allowed characters.
 #. TRANS: Group edit form validation error.
@@ -646,9 +491,6 @@ msgstr "Le nomine complete es troppo longe (maximo 255 characteres)."
 #. TRANS: %d is the maximum number of characters for the description.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed characters.
-#: actions/apigroupcreate.php:201 actions/editapplication.php:202
-#: actions/editgroup.php:211 actions/newapplication.php:182
-#: actions/newgroup.php:157
 #, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."
@@ -656,23 +498,21 @@ msgstr[0] "Description es troppo longe (maximo %d characteres)."
 msgstr[1] "Description es troppo longe (maximo %d characteres)."
 
 #. TRANS: Client error shown when providing too long a location during group creation.
+#. TRANS: API validation exception thrown when location does not validate.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:215 actions/editgroup.php:218
-#: actions/newgroup.php:164 actions/profilesettings.php:266
-#: actions/register.php:220
 msgid "Location is too long (maximum 255 characters)."
 msgstr "Loco es troppo longe (maximo 255 characteres)."
 
 #. TRANS: Client error shown when providing too many aliases during group creation.
 #. TRANS: %d is the maximum number of allowed aliases.
+#. TRANS: API validation exception thrown when aliases do not validate.
+#. TRANS: %d is the maximum number of aliases and used for plural.
 #. TRANS: Group edit form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.
-#: actions/apigroupcreate.php:236 actions/editgroup.php:231
-#: actions/newgroup.php:177
 #, php-format
 msgid "Too many aliases! Maximum %d allowed."
 msgid_plural "Too many aliases! Maximum %d allowed."
@@ -681,25 +521,24 @@ msgstr[1] "Troppo de aliases! Maximo permittite: %d."
 
 #. TRANS: Client error shown when providing an invalid alias during group creation.
 #. TRANS: %s is the invalid alias.
-#: actions/apigroupcreate.php:253
+#. TRANS: API validation exception thrown when aliases does not validate.
+#. TRANS: %s is the invalid alias.
 #, php-format
 msgid "Invalid alias: \"%s\"."
 msgstr "Alias invalide: \"%s\"."
 
 #. TRANS: Client error displayed when trying to use an alias during group creation that is already in use.
 #. TRANS: %s is the alias that is already in use.
+#. TRANS: API validation exception thrown when aliases is already used.
+#. TRANS: %s is the already used alias.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error. %s is the already used alias.
-#: actions/apigroupcreate.php:264 actions/apigroupprofileupdate.php:351
-#: actions/editgroup.php:246 actions/newgroup.php:193
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "Le alias \"%s\" es ja in uso. Proba un altere."
 
 #. TRANS: Client error displayed when trying to use an alias during group creation that is the same as the group's nickname.
 #. TRANS: Group edit form validation error.
-#: actions/apigroupcreate.php:278 actions/apigroupprofileupdate.php:359
-#: actions/editgroup.php:253
 msgid "Alias can't be the same as nickname."
 msgstr "Le alias non pote esser identic al pseudonymo."
 
@@ -707,26 +546,21 @@ msgstr "Le alias non pote esser identic al pseudonymo."
 #. TRANS: Client error displayed when trying to join a group that does not exist.
 #. TRANS: Client error displayed when trying to leave a group that does not exist.
 #. TRANS: Client error displayed trying to show group membership on a non-existing group.
+#. TRANS: Client error displayed when not providing a group or an invalid group.
 #. TRANS: Client error displayed when trying to show a group that could not be found.
 #. TRANS: Client error displayed requesting most recent notices to a group for a non-existing group.
-#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
-#: actions/apigroupleave.php:104 actions/apigroupmembership.php:71
-#: actions/apigroupprofileupdate.php:113 actions/apigroupshow.php:81
-#: actions/apitimelinegroup.php:89
 msgid "Group not found."
 msgstr "Gruppo non trovate."
 
 #. TRANS: Server error displayed when trying to join a group the user is already a member of.
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:345
 msgid "You are already a member of that group."
 msgstr "Tu es ja membro de iste gruppo."
 
 #. TRANS: Server error displayed when trying to join a group the user is blocked from joining.
 #. 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.
-#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:350
 msgid "You have been blocked from that group by the admin."
 msgstr "Le administrator te ha blocate de iste gruppo."
 
@@ -734,13 +568,11 @@ msgstr "Le administrator te ha blocate de iste gruppo."
 #. TRANS: %1$s is the joining user's nickname, $2$s is the group nickname for which the join failed.
 #. TRANS: Message given having failed to add a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:136 actions/joingroup.php:139 lib/command.php:362
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "Non poteva inscriber le usator %1$s in le gruppo %2$s."
 
 #. TRANS: Server error displayed when trying to leave a group the user is not a member of.
-#: actions/apigroupleave.php:115
 msgid "You are not a member of this group."
 msgstr "Tu non es membro de iste gruppo."
 
@@ -748,114 +580,76 @@ msgstr "Tu non es membro de iste gruppo."
 #. TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
 #. TRANS: Message given having failed to remove a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupleave.php:127 actions/leavegroup.php:133
-#: lib/command.php:410
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
 msgstr "Non poteva remover le usator %1$s del gruppo %2$s."
 
 #. TRANS: Used as title in check for group membership. %s is a user name.
-#: actions/apigrouplist.php:94
 #, php-format
 msgid "%s's groups"
 msgstr "Gruppos de %s"
 
 #. TRANS: Used as subtitle in check for group membership. %1$s is a user name, %2$s is the site name.
-#: actions/apigrouplist.php:104
 #, php-format
 msgid "%1$s groups %2$s is a member of."
 msgstr "Gruppos de %1$s del quales %2$s es membro."
 
 #. TRANS: Message is used as a title when listing the lastest 20 groups. %s is a site name.
 #. TRANS: Message is used as a page title. %s is a nick name.
-#: actions/apigrouplistall.php:88 actions/usergroups.php:63
 #, php-format
 msgid "%s groups"
 msgstr "Gruppos de %s"
 
 #. TRANS: Message is used as a subtitle when listing the lastest 20 groups. %s is a site name.
-#: actions/apigrouplistall.php:93
 #, php-format
 msgid "groups on %s"
 msgstr "gruppos in %s"
 
+#. TRANS: Client error displayed when trying to edit a group without being an admin.
 #. TRANS: Client error displayed trying to edit a group while not being a group admin.
 #. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
 #. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
-#: actions/apigroupprofileupdate.php:118 actions/editgroup.php:110
-#: actions/editgroup.php:176 actions/groupdesignsettings.php:109
-#: actions/grouplogo.php:111
 msgid "You must be an admin to edit the group."
 msgstr "Tu debe esser administrator pro modificar le gruppo."
 
+#. TRANS: Server error displayed when group update fails.
 #. TRANS: Server error displayed when editing a group fails.
-#: actions/apigroupprofileupdate.php:171 actions/editgroup.php:274
 msgid "Could not update group."
 msgstr "Non poteva actualisar gruppo."
 
+#. TRANS: Server error displayed when adding group aliases fails.
 #. TRANS: Server error displayed when group aliases could not be added.
 #. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/apigroupprofileupdate.php:194 actions/editgroup.php:281
-#: classes/User_group.php:540
 msgid "Could not create aliases."
 msgstr "Non poteva crear aliases."
 
+#. TRANS: API validation exception thrown when nickname does not validate.
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: actions/apigroupprofileupdate.php:249 lib/nickname.php:165
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr "Le pseudonymo pote solmente haber minusculas e numeros, sin spatios."
 
-#: actions/apigroupprofileupdate.php:286
-#, fuzzy
-msgid "Full name is too long (max 255 chars)."
-msgstr "Le nomine complete es troppo longe (maximo 255 characteres)."
-
-#: actions/apigroupprofileupdate.php:296
-#, fuzzy, php-format
-msgid "description is too long (max %d chars)."
-msgstr "Description es troppo longe (maximo %d characteres)."
-
-#: actions/apigroupprofileupdate.php:307
-#, fuzzy
-msgid "Location is too long (max 255 chars)."
-msgstr "Loco es troppo longe (maximo 255 characteres)."
-
-#: actions/apigroupprofileupdate.php:326
-#, fuzzy, php-format
-msgid "Too many aliases! Maximum %d."
-msgstr "Troppo de aliases! Solmente un es permittite."
-
-#. TRANS: Group edit form validation error.
+#. TRANS: API validation exception thrown when alias is the same as nickname.
 #. TRANS: Group create form validation error.
-#. TRANS: %s is the invalid alias.
-#: actions/apigroupprofileupdate.php:342 actions/editgroup.php:241
-#: actions/newgroup.php:188
-#, php-format
-msgid "Invalid alias: \"%s\""
-msgstr "Alias invalide: \"%s\""
+msgid "Alias cannot be the same as nickname."
+msgstr "Le alias non pote esser identic al pseudonymo."
 
 #. TRANS: Client error displayed when uploading a media file has failed.
-#: actions/apimediaupload.php:101
 msgid "Upload failed."
 msgstr "Le incargamento ha fallite."
 
 #. TRANS: Client error given from the OAuth API when the request token or verifier is invalid.
-#: actions/apioauthaccesstoken.php:102
 msgid "Invalid request token or verifier."
 msgstr "Indicio de requesta o verificator invalide."
 
 #. TRANS: Client error given when no oauth_token was passed to the OAuth API.
-#: actions/apioauthauthorize.php:107
 msgid "No oauth_token parameter provided."
 msgstr "Nulle parametro oauth_token fornite."
 
 #. TRANS: Client error given when an invalid request token was passed to the OAuth API.
-#: actions/apioauthauthorize.php:115 actions/apioauthauthorize.php:129
 msgid "Invalid request token."
 msgstr "Indicio de requesta invalide."
 
 #. TRANS: Client error given when an invalid request token was passed to the OAuth API.
-#: actions/apioauthauthorize.php:121
 msgid "Request token already authorized."
 msgstr "Indicio de requesta jam autorisate."
 
@@ -865,31 +659,14 @@ msgstr "Indicio de requesta jam autorisate."
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
 #. TRANS: Client error displayed when the session token is not okay.
-#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:75
-#: actions/emailsettings.php:292 actions/favor.php:75 actions/geocode.php:55
-#: actions/groupblock.php:65 actions/grouplogo.php:321
-#: actions/groupunblock.php:65 actions/imsettings.php:241
-#: actions/invite.php:60 actions/makeadmin.php:66 actions/newmessage.php:135
-#: actions/newnotice.php:105 actions/nudge.php:80
-#: actions/oauthappssettings.php:162 actions/oauthconnectionssettings.php:135
-#: actions/passwordsettings.php:137 actions/pluginenable.php:87
-#: actions/profilesettings.php:218 actions/recoverpassword.php:383
-#: actions/register.php:157 actions/remotesubscribe.php:76
-#: actions/repeat.php:82 actions/smssettings.php:249 actions/subedit.php:40
-#: actions/subscribe.php:87 actions/tagother.php:145
-#: actions/unsubscribe.php:69 actions/urlsettings.php:171
-#: actions/userauthorization.php:53 lib/designsettings.php:122
 msgid "There was a problem with your session token. Try again, please."
 msgstr "Occurreva un problema con le indicio de tu session. Per favor reproba."
 
 #. TRANS: Form validation error given when an invalid username and/or password was passed to the OAuth API.
-#: actions/apioauthauthorize.php:168
 msgid "Invalid nickname / password!"
 msgstr "Nomine de usator o contrasigno invalide!"
 
 #. TRANS: Server error displayed when a database action fails.
-#: actions/apioauthauthorize.php:217
 msgid "Database error inserting oauth_token_association."
 msgstr ""
 "Error del base de datos durante le insertion de oauth_token_association."
@@ -906,28 +683,19 @@ msgstr ""
 #. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
 #. TRANS: Message given submitting a form with an unknown action in SMS settings.
 #. TRANS: Unknown form validation error in design settings form.
-#: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
-#: actions/designadminpanel.php:100 actions/editapplication.php:144
-#: actions/emailsettings.php:311 actions/grouplogo.php:332
-#: actions/imsettings.php:256 actions/newapplication.php:124
-#: actions/oauthconnectionssettings.php:144 actions/recoverpassword.php:46
-#: actions/smssettings.php:270 lib/designsettings.php:133
 msgid "Unexpected form submission."
 msgstr "Submission de formulario inexpectate."
 
 #. TRANS: Title for a page where a user can confirm/deny account access by an external application.
-#: actions/apioauthauthorize.php:387
 msgid "An application would like to connect to your account"
 msgstr "Un application vole connecter se a tu conto"
 
 #. TRANS: Fieldset legend.
-#: actions/apioauthauthorize.php:404
 msgid "Allow or deny access"
 msgstr "Permitter o refusar accesso"
 
 #. TRANS: User notification of external application requesting account access.
 #. TRANS: %3$s is the access type requested (read-write or read-only), %4$s is the StatusNet sitename.
-#: actions/apioauthauthorize.php:425
 #, php-format
 msgid ""
 "An application would like the ability to <strong>%3$s</strong> your %4$s "
@@ -941,7 +709,6 @@ msgstr ""
 #. TRANS: User notification of external application requesting account access.
 #. TRANS: %1$s is the application name requesting access, %2$s is the organisation behind the application,
 #. TRANS: %3$s is the access type requested, %4$s is the StatusNet sitename.
-#: actions/apioauthauthorize.php:433
 #, php-format
 msgid ""
 "The application <strong>%1$s</strong> by <strong>%2$s</strong> would like "
@@ -953,22 +720,18 @@ msgstr ""
 "accesso a tu conto de %4$s a tertie personas in le quales tu ha confidentia."
 
 #. TRANS: Fieldset legend.
-#: actions/apioauthauthorize.php:455
 msgctxt "LEGEND"
 msgid "Account"
 msgstr "Conto"
 
 #. TRANS: Field label on OAuth API authorisation form.
+#. TRANS: Field label on login page.
 #. TRANS: Field label in form for profile settings.
-#: actions/apioauthauthorize.php:459 actions/login.php:225
-#: actions/profilesettings.php:107 actions/register.php:411
-#: actions/userauthorization.php:145 lib/groupeditform.php:145
 msgid "Nickname"
 msgstr "Pseudonymo"
 
 #. TRANS: Field label on OAuth API authorisation form.
-#: actions/apioauthauthorize.php:463 actions/login.php:228
-#: actions/register.php:415 lib/settingsnav.php:87
+#. TRANS: Field label on login page.
 msgid "Password"
 msgstr "Contrasigno"
 
@@ -978,43 +741,34 @@ msgstr "Contrasigno"
 #. TRANS: Button label to cancel an IM address confirmation procedure.
 #. TRANS: Button label to cancel a SMS address confirmation procedure.
 #. TRANS: Button label in the "Edit application" form.
-#: actions/apioauthauthorize.php:478 actions/emailsettings.php:125
-#: actions/imsettings.php:136 actions/smssettings.php:132
-#: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Cancel"
 msgstr "Cancellar"
 
 #. TRANS: Button text that when clicked will allow access to an account by an external application.
-#: actions/apioauthauthorize.php:485
 msgctxt "BUTTON"
 msgid "Allow"
 msgstr "Permitter"
 
 #. TRANS: Form instructions.
-#: actions/apioauthauthorize.php:502
 msgid "Authorize access to your account information."
 msgstr "Autorisar le accesso al informationes de tu conto."
 
 #. TRANS: Header for user notification after revoking OAuth access to an application.
-#: actions/apioauthauthorize.php:594
 msgid "Authorization canceled."
 msgstr "Autorisation cancellate."
 
 #. TRANS: User notification after revoking OAuth access to an application.
 #. TRANS: %s is an OAuth token.
-#: actions/apioauthauthorize.php:598
 #, php-format
 msgid "The request token %s has been revoked."
 msgstr "Le indicio de requesta %s ha essite revocate."
 
 #. TRANS: Title of the page notifying the user that an anonymous client application was successfully authorized to access the user's account with OAuth.
-#: actions/apioauthauthorize.php:621
 msgid "You have successfully authorized the application"
 msgstr "Application autorisate con successo"
 
 #. TRANS: Message notifying the user that an anonymous client application was successfully authorized to access the user's account with OAuth.
-#: actions/apioauthauthorize.php:625
 msgid ""
 "Please return to the application and enter the following security code to "
 "complete the process."
@@ -1024,14 +778,12 @@ msgstr ""
 
 #. TRANS: Title of the page notifying the user that the client application was successfully authorized to access the user's account with OAuth.
 #. TRANS: %s is the authorised application name.
-#: actions/apioauthauthorize.php:632
 #, php-format
 msgid "You have successfully authorized %s"
 msgstr "Autorisation de %s succedite"
 
 #. TRANS: Message notifying the user that the client application was successfully authorized to access the user's account with OAuth.
 #. TRANS: %s is the authorised application name.
-#: actions/apioauthauthorize.php:639
 #, php-format
 msgid ""
 "Please return to %s and enter the following security code to complete the "
@@ -1042,12 +794,10 @@ msgstr ""
 
 #. TRANS: Client error displayed trying to delete a status not using POST or DELETE.
 #. TRANS: POST and DELETE should not be translated.
-#: actions/apistatusesdestroy.php:111
 msgid "This method requires a POST or DELETE."
 msgstr "Iste methodo require un commando POST o DELETE."
 
 #. TRANS: Client error displayed trying to delete a status of another user.
-#: actions/apistatusesdestroy.php:136
 msgid "You may not delete another user's status."
 msgstr "Tu non pote deler le stato de un altere usator."
 
@@ -1055,21 +805,16 @@ msgstr "Tu non pote deler le stato de un altere usator."
 #. TRANS: Client error displayed trying to display redents of a non-exiting notice.
 #. TRANS: Client exception thrown when referencing a non-existing notice.
 #. TRANS: Error message displayed trying to delete a non-existing notice.
-#: actions/apistatusesretweet.php:74 actions/apistatusesretweets.php:70
-#: actions/atompubshowfavorite.php:82 actions/deletenotice.php:61
-#: actions/shownotice.php:92
 msgid "No such notice."
 msgstr "Nota non trovate."
 
 #. TRANS: Client error displayed trying to repeat an own notice through the API.
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:549
 msgid "Cannot repeat your own notice."
 msgstr "Non pote repeter tu proprie nota."
 
 #. TRANS: Client error displayed trying to re-repeat a notice through the API.
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:92 lib/command.php:555
 msgid "Already repeated that notice."
 msgstr "Iste nota ha ja essite repetite."
 
@@ -1079,57 +824,43 @@ msgstr "Iste nota ha ja essite repetite."
 #. TRANS: Client exception thrown when using an unsupported HTTP method.
 #. TRANS: Client error shown when using a non-supported HTTP method.
 #. TRANS: Client exception thrown when using an unsupported HTTP method.
-#: actions/apistatusesshow.php:118 actions/atompubfavoritefeed.php:103
-#: actions/atompubmembershipfeed.php:105 actions/atompubshowfavorite.php:117
-#: actions/atompubshowmembership.php:116
-#: actions/atompubshowsubscription.php:122
-#: actions/atompubsubscriptionfeed.php:109
 msgid "HTTP method not supported."
 msgstr "Methodo HTTP non supportate."
 
 #. TRANS: Exception thrown requesting an unsupported notice output format.
 #. TRANS: %s is the requested output format.
-#: actions/apistatusesshow.php:144
 #, php-format
 msgid "Unsupported format: %s."
 msgstr "Formato non supportate: %s."
 
 #. TRANS: Client error displayed requesting a deleted status.
-#: actions/apistatusesshow.php:155
 msgid "Status deleted."
 msgstr "Stato delite."
 
 #. TRANS: Client error displayed requesting a status with an invalid ID.
-#: actions/apistatusesshow.php:162
 msgid "No status with that ID found."
 msgstr "Nulle stato trovate con iste ID."
 
 #. TRANS: Client error displayed when trying to delete a notice not using the Atom format.
-#: actions/apistatusesshow.php:227
 msgid "Can only delete using the Atom format."
 msgstr "Le deletion es solmente possibile con le formato Atom."
 
 #. TRANS: Client error displayed when a user has no rights to delete notices of other users.
 #. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
-#: actions/apistatusesshow.php:235 actions/deletenotice.php:78
 msgid "Cannot delete this notice."
 msgstr "Non pote deler iste nota."
 
 #. TRANS: Confirmation of notice deletion in API. %d is the ID (number) of the deleted notice.
-#: actions/apistatusesshow.php:249
 #, php-format
 msgid "Deleted notice %d"
 msgstr "Nota %d delite"
 
 #. TRANS: Client error displayed when the parameter "status" is missing.
-#: actions/apistatusesupdate.php:221
 msgid "Client must provide a 'status' parameter with a value."
 msgstr "Le cliente debe fornir un parametro 'status' con un valor."
 
 #. TRANS: Client error displayed when the parameter "status" is missing.
 #. TRANS: %d is the maximum number of character for a notice.
-#: actions/apistatusesupdate.php:244 actions/newnotice.php:161
-#: lib/mailhandler.php:60
 #, php-format
 msgid "That's too long. Maximum notice size is %d character."
 msgid_plural "That's too long. Maximum notice size is %d characters."
@@ -1139,13 +870,11 @@ msgstr[1] ""
 "Isto es troppo longe. Le longitude maximal de notas es %d characteres."
 
 #. TRANS: Client error displayed when replying to a non-existing notice.
-#: actions/apistatusesupdate.php:284
 msgid "Parent notice not found."
 msgstr "Nota genitor non trovate."
 
 #. TRANS: Client error displayed exceeding the maximum notice length.
 #. TRANS: %d is the maximum lenth for a notice.
-#: actions/apistatusesupdate.php:308 actions/newnotice.php:184
 #, php-format
 msgid "Maximum notice size is %d character, including attachment URL."
 msgid_plural "Maximum notice size is %d characters, including attachment URL."
@@ -1156,13 +885,11 @@ msgstr[1] ""
 
 #. TRANS: Client error displayed when requesting profiles of followers in an unsupported format.
 #. TRANS: Client error displayed when requesting IDs of followers in an unsupported format.
-#: actions/apisubscriptions.php:228 actions/apisubscriptions.php:258
 msgid "Unsupported format."
 msgstr "Formato non supportate."
 
 #. TRANS: Title for timeline of most recent favourite notices by a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname.
-#: actions/apitimelinefavorites.php:108
 #, php-format
 msgid "%1$s / Favorites from %2$s"
 msgstr "%1$s / Favorites de %2$s"
@@ -1170,14 +897,12 @@ msgstr "%1$s / Favorites de %2$s"
 #. TRANS: Subtitle for timeline of most recent favourite notices by a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user's full name,
 #. TRANS: %3$s is a user nickname.
-#: actions/apitimelinefavorites.php:120
 #, php-format
 msgid "%1$s updates favorited by %2$s / %3$s."
 msgstr "%1$s actualisationes favoritisate per %2$s / %3$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.
-#: actions/apitimelinementions.php:115
 #, php-format
 msgid "%1$s / Updates mentioning %2$s"
 msgstr "%1$s / Actualisationes que mentiona %2$s"
@@ -1185,7 +910,6 @@ msgstr "%1$s / Actualisationes que mentiona %2$s"
 #. TRANS: Subtitle for timeline of most recent mentions of a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname,
 #. TRANS: %3$s is a user's full name.
-#: actions/apitimelinementions.php:131
 #, php-format
 msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr ""
@@ -1193,214 +917,173 @@ msgstr ""
 
 #. TRANS: Title for site timeline. %s is the StatusNet sitename.
 #. TRANS: Public RSS feed title. %s is the StatusNet site name.
-#: actions/apitimelinepublic.php:193 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "Chronologia public de %s"
 
 #. TRANS: Subtitle for site timeline. %s is the StatusNet sitename.
-#: actions/apitimelinepublic.php:199
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "Actualisationes de totes in %s!"
 
 #. TRANS: Server error displayed calling unimplemented API method for 'retweeted by me'.
-#: actions/apitimelineretweetedbyme.php:71
 msgid "Unimplemented."
 msgstr "Non implementate."
 
 #. TRANS: Title for Atom feed "repeated to me". %s is the user nickname.
-#: actions/apitimelineretweetedtome.php:96
 #, php-format
 msgid "Repeated to %s"
 msgstr "Repetite a %s"
 
-#: actions/apitimelineretweetedtome.php:98
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s notices that were to repeated to %2$s / %3$s."
-msgstr ""
-"Actualisationes de %1$s que responde al actualisationes de %2$s / %3$s."
+msgstr "Notas de %1$s que esseva repetite a %2$s / %3$s."
 
 #. TRANS: Title of list of repeated notices of the logged in user.
 #. TRANS: %s is the nickname of the logged in user.
-#: actions/apitimelineretweetsofme.php:98
 #, php-format
 msgid "Repeats of %s"
 msgstr "Repetitiones de %s"
 
-#: actions/apitimelineretweetsofme.php:104
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s notices that %2$s / %3$s has repeated."
-msgstr "%1$s marcava le nota %2$s como favorite."
+msgstr "Notas de %1$s que %2$s / %3$s ha repetite."
 
 #. TRANS: Title for timeline with lastest notices with a given tag.
 #. TRANS: %s is the tag.
 #. TRANS: Title for first page of notices with tags.
 #. TRANS: %s is the tag.
-#: actions/apitimelinetag.php:101 actions/tag.php:69
 #, php-format
 msgid "Notices tagged with %s"
 msgstr "Notas con etiquetta %s"
 
 #. TRANS: Subtitle for timeline with lastest notices with a given tag.
 #. TRANS: %1$s is the tag, $2$s is the StatusNet sitename.
-#: actions/apitimelinetag.php:105 actions/tagrss.php:65
 #, php-format
 msgid "Updates tagged with %1$s on %2$s!"
 msgstr "Actualisationes con etiquetta %1$s in %2$s!"
 
 #. TRANS: Client error displayed trying to add a notice to another user's timeline.
-#: actions/apitimelineuser.php:308
 msgid "Only the user can add to their own timeline."
 msgstr "Solmente le usator pote adder cosas a su proprie chronologia."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:315
 msgid "Only accept AtomPub for Atom feeds."
 msgstr "Solmente acceptar AtomPub pro syndicationes Atom."
 
 #. TRANS: Client error displayed attempting to post an empty API notice.
-#: actions/apitimelineuser.php:322
 msgid "Atom post must not be empty."
 msgstr "Le message Atom non pote esser vacue."
 
 #. TRANS: Client error displayed attempting to post an API that is not well-formed XML.
-#: actions/apitimelineuser.php:328
 msgid "Atom post must be well-formed XML."
 msgstr "Le message Atom debe esser in XML ben formate."
 
 #. TRANS: Client error displayed when not using an Atom entry.
-#: actions/apitimelineuser.php:334 actions/atompubfavoritefeed.php:228
-#: actions/atompubmembershipfeed.php:230
-#: actions/atompubsubscriptionfeed.php:236
 msgid "Atom post must be an Atom entry."
 msgstr "Message Atom debe esser un entrata Atom."
 
 #. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
-#: actions/apitimelineuser.php:345
 msgid "Can only handle POST activities."
 msgstr "Solmente le activitates POST es possibile."
 
 #. TRANS: Client error displayed when using an unsupported activity object type.
 #. TRANS: %s is the unsupported activity object type.
-#: actions/apitimelineuser.php:356
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr "Impossibile manear le typo de objecto de activitate \"%s\"."
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
 #. TRANS: %d is the notice ID (number).
-#: actions/apitimelineuser.php:390
 #, php-format
 msgid "No content for notice %d."
 msgstr "Nulle contento pro nota %d."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
 #. TRANS: %s is the notice URI.
-#: actions/apitimelineuser.php:419
 #, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "Un nota con le URI \"%s\" jam existe."
 
 #. TRANS: Server error for unfinished API method showTrends.
-#: actions/apitrends.php:85
 msgid "API method under construction."
 msgstr "Methodo API in construction."
 
 #. TRANS: Client error displayed when requesting user information for a non-existing user.
-#: actions/apiuserprofileimage.php:80 actions/apiusershow.php:94
 msgid "User not found."
 msgstr "Usator non trovate."
 
 #. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
 #. TRANS: Client exception.
 #. TRANS: Client error displayed trying to subscribe to a non-existing profile.
-#: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
-#: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
-#: actions/subscribe.php:110
 msgid "No such profile."
 msgstr "Profilo non existe."
 
 #. TRANS: Subtitle for Atom favorites feed.
 #. TRANS: %1$s is a user nickname, %2$s is the StatusNet sitename.
-#: actions/atompubfavoritefeed.php:147
 #, php-format
 msgid "Notices %1$s has favorited on %2$s"
 msgstr "Notas que %1$s ha favorite in %2$s"
 
 #. TRANS: Client exception thrown when trying to set a favorite for another user.
 #. TRANS: Client exception thrown when trying to subscribe another user.
-#: actions/atompubfavoritefeed.php:217 actions/atompubsubscriptionfeed.php:225
 msgid "Cannot add someone else's subscription."
 msgstr "Non es possibile adder le subscription de un altere persona."
 
 #. TRANS: Client exception thrown when trying use an incorrect activity verb for the Atom pub method.
-#: actions/atompubfavoritefeed.php:240
 msgid "Can only handle favorite activities."
 msgstr "Solmente le activitates favorite es possibile."
 
 #. TRANS: Client exception thrown when trying favorite an object that is not a notice.
-#: actions/atompubfavoritefeed.php:250 actions/atompubmembershipfeed.php:250
 msgid "Can only fave notices."
 msgstr "Solmente notas pote esser addite al favorites."
 
 #. TRANS: Client exception thrown when trying favorite a notice without content.
-#: actions/atompubfavoritefeed.php:259
 msgid "Unknown note."
 msgstr "Nota incognite."
 
 #. TRANS: Client exception thrown when trying favorite an already favorited notice.
-#: actions/atompubfavoritefeed.php:267
 msgid "Already a favorite."
 msgstr "Es ja favorite."
 
 #. TRANS: Title for group membership feed.
 #. TRANS: %s is a username.
-#: actions/atompubmembershipfeed.php:144
 #, php-format
 msgid "%s group memberships"
 msgstr "Membratos del gruppo %s"
 
 #. TRANS: Subtitle for group membership feed.
 #. TRANS: %1$s is a username, %2$s is the StatusNet sitename.
-#: actions/atompubmembershipfeed.php:149
 #, php-format
 msgid "Groups %1$s is a member of on %2$s"
 msgstr "Gruppos del quales %1$s es membro in %2$s"
 
 #. TRANS: Client exception thrown when trying subscribe someone else to a group.
-#: actions/atompubmembershipfeed.php:219
 msgid "Cannot add someone else's membership."
 msgstr "Non es possibile adder le membrato de un altere persona."
 
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#: actions/atompubmembershipfeed.php:242
 msgid "Can only handle join activities."
 msgstr "Solmente le activitates de adhesion es possibile."
 
 #. TRANS: Client exception thrown when trying to subscribe to a non-existing group.
-#: actions/atompubmembershipfeed.php:259
 msgid "Unknown group."
 msgstr "Gruppo incognite."
 
 #. TRANS: Client exception thrown when trying to subscribe to an already subscribed group.
-#: actions/atompubmembershipfeed.php:267
 msgid "Already a member."
 msgstr "Ja membro."
 
 #. TRANS: Client exception thrown when trying to subscribe to group while blocked from that group.
-#: actions/atompubmembershipfeed.php:275
 msgid "Blocked by admin."
 msgstr "Blocate per un administrator."
 
 #. TRANS: Client exception thrown when referencing a non-existing favorite.
-#: actions/atompubshowfavorite.php:90
 msgid "No such favorite."
 msgstr "Iste favorite non existe."
 
 #. TRANS: Client exception thrown when trying to remove a favorite notice of another user.
-#: actions/atompubshowfavorite.php:151
 msgid "Cannot delete someone else's favorite."
 msgstr "Non pote deler le favorite de un altere persona."
 
@@ -1426,90 +1109,65 @@ msgstr "Non pote deler le favorite de un altere persona."
 #. TRANS: Client error displayed when trying to join a non-existing group.
 #. TRANS: Client error displayed when trying to leave a non-local group.
 #. TRANS: Client error displayed when trying to leave a non-existing group.
+#. TRANS: Client error displayed when providing an invalid group ID on the Make Admin page.
 #. 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.
 #. TRANS: Command exception text shown when a group is requested that does not exist.
 #. TRANS: Error text shown when trying to leave a group that does not exist.
-#: actions/atompubshowmembership.php:81 actions/blockedfromgroup.php:81
-#: actions/blockedfromgroup.php:89 actions/deletegroup.php:87
-#: actions/deletegroup.php:100 actions/editgroup.php:102
-#: actions/foafgroup.php:46 actions/foafgroup.php:65 actions/foafgroup.php:73
-#: actions/groupblock.php:89 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:101 actions/grouplogo.php:103
-#: actions/groupmembers.php:84 actions/groupmembers.php:92
-#: actions/grouprss.php:97 actions/grouprss.php:105
-#: actions/groupunblock.php:89 actions/joingroup.php:82
-#: actions/joingroup.php:95 actions/leavegroup.php:82
-#: actions/leavegroup.php:95 actions/makeadmin.php:86
-#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:392
 msgid "No such group."
 msgstr "Gruppo non existe."
 
 #. TRANS: Client exception thrown when trying to show membership of a non-subscribed group
-#: actions/atompubshowmembership.php:91
 msgid "Not a member."
 msgstr "Non es membro."
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
-#: actions/atompubshowmembership.php:150
 msgid "Cannot delete someone else's membership."
 msgstr "Non pote deler le membrato de un altere persona."
 
 #. TRANS: Client exception thrown when trying to display a subscription for a non-existing profile ID.
 #. TRANS: %d is the non-existing profile ID number.
-#: actions/atompubshowsubscription.php:72
-#: actions/atompubshowsubscription.php:83
-#: actions/atompubsubscriptionfeed.php:74
 #, php-format
 msgid "No such profile id: %d."
 msgstr "Iste ID de profilo non existe: %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.
-#: actions/atompubshowsubscription.php:94
 #, php-format
 msgid "Profile %1$d not subscribed to profile %2$d."
 msgstr "Le profilo %1$d non es subscribite al profilo %2$d."
 
 #. TRANS: Client exception thrown when trying to delete a subscription of another user.
-#: actions/atompubshowsubscription.php:157
 msgid "Cannot delete someone else's subscription."
 msgstr "Non pote deler le subscription de un altere persona."
 
 #. TRANS: Subtitle for Atom subscription feed.
 #. TRANS: %1$s is a user nickname, %s$s is the StatusNet sitename.
-#: actions/atompubsubscriptionfeed.php:153
 #, php-format
 msgid "People %1$s has subscribed to on %2$s"
 msgstr "Personas a qui %1$s ha subscribite in %2$s"
 
 #. TRANS: Client error displayed when not using the follow verb.
-#: actions/atompubsubscriptionfeed.php:248
 msgid "Can only handle Follow activities."
 msgstr "Solmente le activitates \"Follow\" es possibile."
 
 #. TRANS: Client exception thrown when subscribing to an object that is not a person.
-#: actions/atompubsubscriptionfeed.php:256
 msgid "Can only follow people."
 msgstr "Pote solmente sequer personas."
 
 #. TRANS: Client exception thrown when subscribing to a non-existing profile.
 #. TRANS: %s is the unknown profile ID.
-#: actions/atompubsubscriptionfeed.php:267
 #, php-format
 msgid "Unknown profile %s."
 msgstr "Profilo %s incognite."
 
 #. TRANS: Client error displayed trying to subscribe to an already subscribed profile.
 #. TRANS: %s is the profile the user already has a subscription on.
-#: actions/atompubsubscriptionfeed.php:275
 #, php-format
 msgid "Already subscribed to %s."
 msgstr "Ja subscribite a %s."
 
 #. TRANS: Client error displayed trying to get a non-existing attachment.
-#: actions/attachment.php:73
 msgid "No such attachment."
 msgstr "Annexo non existe."
 
@@ -1521,31 +1179,23 @@ msgstr "Annexo non existe."
 #. TRANS: Client error displayed when trying to view group members without providing a group nickname.
 #. TRANS: Client error displayed when requesting a group RSS feed without providing a group nickname.
 #. TRANS: Client error displayed if no nickname argument was given requesting a group page.
-#: actions/avatarbynickname.php:60 actions/blockedfromgroup.php:73
-#: actions/editgroup.php:85 actions/groupdesignsettings.php:84
-#: actions/grouplogo.php:86 actions/groupmembers.php:76
-#: actions/grouprss.php:89 actions/showgroup.php:116
 msgid "No nickname."
 msgstr "Nulle pseudonymo."
 
 #. TRANS: Client error displayed trying to get an avatar without providing an avatar size.
-#: actions/avatarbynickname.php:66
 msgid "No size."
 msgstr "Nulle dimension."
 
 #. TRANS: Client error displayed trying to get an avatar providing an invalid avatar size.
-#: actions/avatarbynickname.php:72
 msgid "Invalid size."
 msgstr "Dimension invalide."
 
 #. TRANS: Title for avatar upload page.
-#: actions/avatarsettings.php:66 lib/settingsnav.php:82
 msgid "Avatar"
 msgstr "Avatar"
 
 #. TRANS: Instruction for avatar upload page.
 #. TRANS: %s is the maximum file size, for example "500b", "10kB" or "2MB".
-#: actions/avatarsettings.php:78
 #, php-format
 msgid "You can upload your personal avatar. The maximum file size is %s."
 msgstr ""
@@ -1555,17 +1205,12 @@ msgstr ""
 #. TRANS: Server error displayed coming across a request from a user without a profile.
 #. TRANS: Server error displayed when trying to authorise a remote subscription request
 #. TRANS: while the user has no profile.
-#: actions/avatarsettings.php:108 actions/avatarsettings.php:192
-#: actions/grouplogo.php:184 actions/remotesubscribe.php:190
-#: actions/userauthorization.php:75 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr "Usator sin profilo correspondente"
 
 #. TRANS: Avatar upload page form legend.
 #. TRANS: Avatar upload page crop form legend.
 #. TRANS: Legend for group logo settings fieldset.
-#: actions/avatarsettings.php:122 actions/avatarsettings.php:205
-#: actions/grouplogo.php:261
 msgid "Avatar settings"
 msgstr "Configuration del avatar"
 
@@ -1573,8 +1218,6 @@ msgstr "Configuration del avatar"
 #. TRANS: Header on avatar upload crop form for thumbnail of originally uploaded avatar (h2).
 #. TRANS: Uploaded original file in group logo form.
 #. TRANS: Header for originally uploaded file before a crop on the group logo page.
-#: actions/avatarsettings.php:131 actions/avatarsettings.php:214
-#: actions/grouplogo.php:207 actions/grouplogo.php:270
 msgid "Original"
 msgstr "Original"
 
@@ -1582,81 +1225,66 @@ msgstr "Original"
 #. TRANS: Header on avatar upload crop form for thumbnail of to be used rendition of uploaded avatar (h2).
 #. TRANS: Header for preview of to be displayed group logo.
 #. TRANS: Header for the cropped group logo on the group logo page.
-#: actions/avatarsettings.php:147 actions/avatarsettings.php:227
-#: actions/grouplogo.php:219 actions/grouplogo.php:283
 msgid "Preview"
 msgstr "Previsualisation"
 
 #. TRANS: Button on avatar upload page to delete current avatar.
 #. TRANS: Button text for user account deletion.
-#: actions/avatarsettings.php:155 actions/deleteaccount.php:319
 msgctxt "BUTTON"
 msgid "Delete"
 msgstr "Deler"
 
 #. TRANS: Button on avatar upload page to upload an avatar.
 #. TRANS: Submit button to confirm upload of a user backup file for account restore.
-#: actions/avatarsettings.php:173 actions/restoreaccount.php:369
 msgctxt "BUTTON"
 msgid "Upload"
 msgstr "Incargar"
 
 #. TRANS: Button on avatar upload crop form to confirm a selected crop as avatar.
-#: actions/avatarsettings.php:243
 msgctxt "BUTTON"
 msgid "Crop"
 msgstr "Taliar"
 
 #. TRANS: Validation error on avatar upload form when no file was uploaded.
-#: actions/avatarsettings.php:318
 msgid "No file uploaded."
 msgstr "Nulle file incargate."
 
 #. TRANS: Avatar upload form instruction after uploading a file.
-#: actions/avatarsettings.php:345
 msgid "Pick a square area of the image to be your avatar."
 msgstr "Selige un area quadrate del imagine pro facer lo tu avatar."
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
 #. TRANS: Server error displayed trying to crop an uploaded group logo that is no longer present.
-#: actions/avatarsettings.php:360 actions/grouplogo.php:391
 msgid "Lost our file data."
 msgstr "Datos del file perdite."
 
 #. TRANS: Success message for having updated a user avatar.
-#: actions/avatarsettings.php:384
 msgid "Avatar updated."
 msgstr "Avatar actualisate."
 
 #. TRANS: Error displayed on the avatar upload page if the avatar could not be updated for an unknown reason.
-#: actions/avatarsettings.php:388
 msgid "Failed updating avatar."
 msgstr "Actualisation del avatar fallite."
 
 #. TRANS: Success message for deleting a user avatar.
-#: actions/avatarsettings.php:412
 msgid "Avatar deleted."
 msgstr "Avatar delite."
 
 #. TRANS: Title for backup account page.
 #. TRANS: Option in profile settings to create a backup of the account of the currently logged in user.
-#: actions/backupaccount.php:61 actions/profilesettings.php:468
 msgid "Backup account"
 msgstr "Facer un copia de reserva del conto"
 
 #. TRANS: Client exception thrown when trying to backup an account while not logged in.
-#: actions/backupaccount.php:79
 msgid "Only logged-in users can backup their account."
 msgstr ""
 "Solmente usatores authenticate pote facer un copia de reserva de lor conto."
 
 #. TRANS: Client exception thrown when trying to backup an account without having backup rights.
-#: actions/backupaccount.php:84
 msgid "You may not backup your account."
 msgstr "Tu non pote facer un copia de reserva de tu conto."
 
 #. TRANS: Information displayed on the backup account page.
-#: actions/backupaccount.php:227
 msgid ""
 "You can backup your account data in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format. This is an experimental feature and provides "
@@ -1671,30 +1299,25 @@ msgstr ""
 "addition, le files incargate e le messages directe non es copiate."
 
 #. TRANS: Submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:250
 msgctxt "BUTTON"
 msgid "Backup"
 msgstr "Copia de reserva"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:254
 msgid "Backup your account."
 msgstr "Facer un copia de reserva de tu conto."
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
-#: actions/block.php:68
 msgid "You already blocked that user."
 msgstr "Tu ha ja blocate iste usator."
 
 #. TRANS: Title for block user page.
 #. TRANS: Legend for block user form.
 #. TRANS: Fieldset legend for block user from group form.
-#: actions/block.php:106 actions/block.php:136 actions/groupblock.php:165
 msgid "Block user"
 msgstr "Blocar usator"
 
 #. TRANS: Explanation of consequences when blocking a user on the block user page.
-#: actions/block.php:139
 msgid ""
 "Are you sure you want to block this user? Afterwards, they will be "
 "unsubscribed from you, unable to subscribe to you in the future, and you "
@@ -1710,15 +1333,11 @@ msgstr ""
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:154 actions/deleteapplication.php:157
-#: actions/deletegroup.php:220 actions/deletenotice.php:155
-#: actions/deleteuser.php:154 actions/groupblock.php:187
 msgctxt "BUTTON"
 msgid "No"
 msgstr "No"
 
 #. TRANS: Submit button title for 'No' when blocking a user.
-#: actions/block.php:158
 msgid "Do not block this user."
 msgstr "Non blocar iste usator."
 
@@ -1728,174 +1347,136 @@ msgstr "Non blocar iste usator."
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:161 actions/deleteapplication.php:164
-#: actions/deletegroup.php:227 actions/deletenotice.php:162
-#: actions/deleteuser.php:161 actions/groupblock.php:194
 msgctxt "BUTTON"
 msgid "Yes"
 msgstr "Si"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:165
 msgid "Block this user."
 msgstr "Blocar iste usator."
 
 #. TRANS: Server error displayed when blocking a user fails.
-#: actions/block.php:189
 msgid "Failed to save block information."
 msgstr "Falleva de salveguardar le information del blocada."
 
 #. TRANS: Title for first page with list of users blocked from a group.
 #. TRANS: %s is a group nickname.
-#: actions/blockedfromgroup.php:101
 #, php-format
 msgid "%s blocked profiles"
 msgstr "%s profilos blocate"
 
 #. TRANS: Title for any but the first page with list of users blocked from a group.
 #. TRANS: %1$s is a group nickname, %2$d is a page number.
-#: actions/blockedfromgroup.php:106
 #, php-format
 msgid "%1$s blocked profiles, page %2$d"
 msgstr "%1$s profilos blocate, pagina %2$d"
 
 #. TRANS: Instructions for list of users blocked from a group.
-#: actions/blockedfromgroup.php:122
 msgid "A list of the users blocked from joining this group."
 msgstr "Un lista del usatores excludite del membrato de iste gruppo."
 
 #. TRANS: Form legend for unblocking a user from a group.
-#: actions/blockedfromgroup.php:291
 msgid "Unblock user from group"
 msgstr "Disblocar le usator del gruppo"
 
 #. TRANS: Button text for unblocking a user from a group.
-#: actions/blockedfromgroup.php:323
 msgctxt "BUTTON"
 msgid "Unblock"
 msgstr "Disblocar"
 
 #. TRANS: Tooltip for button for unblocking a user from a group.
 #. TRANS: Description of the form to unblock a user.
-#: actions/blockedfromgroup.php:327 lib/unblockform.php:78
 msgid "Unblock this user"
 msgstr "Disblocar iste usator"
 
 #. TRANS: Title for mini-posting window loaded from bookmarklet.
 #. TRANS: %s is the StatusNet site name.
-#: actions/bookmarklet.php:51
 #, php-format
 msgid "Post to %s"
 msgstr "Publicar in %s"
 
 #. TRANS: Client error displayed when not providing a confirmation code in the contact address confirmation action.
-#: actions/confirmaddress.php:74
 msgid "No confirmation code."
 msgstr "Nulle codice de confirmation."
 
 #. TRANS: Client error displayed when providing a non-existing confirmation code in the contact address confirmation action.
-#: actions/confirmaddress.php:80
 msgid "Confirmation code not found."
 msgstr "Codice de confirmation non trovate."
 
 #. TRANS: Client error displayed when not providing a confirmation code for another user in the contact address confirmation action.
-#: actions/confirmaddress.php:86
 msgid "That confirmation code is not for you!"
 msgstr "Iste codice de confirmation non es pro te!"
 
 #. TRANS: Server error for an unknown address type, which can be 'email', 'sms', or the name of an IM network (such as 'xmpp' or 'aim')
-#: actions/confirmaddress.php:94
-#, fuzzy, php-format
+#, php-format
 msgid "Unrecognized address type %s"
-msgstr "Le typo de adresse %s non es recognoscite."
+msgstr "Typo de adresse %s non recognoscite"
 
 #. TRANS: Client error for an already confirmed email/jabber/sms address.
-#: actions/confirmaddress.php:103 actions/confirmaddress.php:136
 msgid "That address has already been confirmed."
 msgstr "Iste adresse ha ja essite confirmate."
 
-#: actions/confirmaddress.php:121 actions/imsettings.php:444
-#: actions/userdesignsettings.php:306
-#, fuzzy
 msgid "Couldn't update user."
-msgstr "Non poteva actualisar le usator."
+msgstr "Non poteva actualisar usator."
 
-#: actions/confirmaddress.php:144
-#, fuzzy
 msgid "Couldn't update user im preferences."
-msgstr "Non poteva actualisar le datos del usator."
+msgstr "Non poteva actualisar le preferentias de MI del usator."
 
-#: actions/confirmaddress.php:156
-#, fuzzy
 msgid "Couldn't insert user im preferences."
-msgstr "Non poteva inserer nove subscription."
+msgstr "Non poteva inserer le preferentias de MI del usator."
 
 #. TRANS: Server error displayed when an address confirmation code deletion from the
 #. TRANS: database fails in the contact address confirmation action.
-#: actions/confirmaddress.php:169
 msgid "Could not delete address confirmation."
 msgstr "Non poteva deler le confirmation de adresse."
 
 #. TRANS: Title for the contact address confirmation action.
-#: actions/confirmaddress.php:185
 msgid "Confirm address"
 msgstr "Confirmar adresse"
 
 #. TRANS: Success message for the contact address confirmation action.
 #. TRANS: %s can be 'email', 'jabber', or 'sms'.
-#: actions/confirmaddress.php:200
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "Le adresse \"%s\" ha essite confirmate pro tu conto."
 
 #. TRANS: Title for page with a conversion (multiple notices in context).
-#: actions/conversation.php:96
 msgid "Conversation"
 msgstr "Conversation"
 
 #. TRANS: Header on conversation page. Hidden by default (h2).
 #. TRANS: Label for user statistics.
-#: actions/conversation.php:149 lib/noticelist.php:87
-#: lib/profileaction.php:246 lib/searchgroupnav.php:82
-#: lib/threadednoticelist.php:66
 msgid "Notices"
 msgstr "Notas"
 
 #. TRANS: Client exception displayed trying to delete a user account while not logged in.
-#: actions/deleteaccount.php:71
 msgid "Only logged-in users can delete their account."
 msgstr "Solmente usatores authenticate pote deler lor conto."
 
 #. TRANS: Client exception displayed trying to delete a user account without have the rights to do that.
-#: actions/deleteaccount.php:77
 msgid "You cannot delete your account."
 msgstr "Tu non pote deler tu conto."
 
 #. TRANS: Confirmation text for user deletion. The user has to type this exactly the same, including punctuation.
-#: actions/deleteaccount.php:160 actions/deleteaccount.php:297
 msgid "I am sure."
 msgstr "Io es secur."
 
 #. TRANS: Notification for user about the text that must be input to be able to delete a user account.
 #. TRANS: %s is the text that needs to be input.
-#: actions/deleteaccount.php:164
 #, php-format
 msgid "You must write \"%s\" exactly in the box."
 msgstr "Tu debe scriber \"%s\" exactemente in le quadro."
 
 #. TRANS: Confirmation that a user account has been deleted.
-#: actions/deleteaccount.php:206
 msgid "Account deleted."
 msgstr "Conto delite."
 
 #. TRANS: Page title for page on which a user account can be deleted.
 #. TRANS: Option in profile settings to delete the account of the currently logged in user.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:476
 msgid "Delete account"
 msgstr "Deler conto"
 
 #. TRANS: Form text for user deletion form.
-#: actions/deleteaccount.php:279
 msgid ""
 "This will <strong>permanently delete</strong> your account data from this "
 "server."
@@ -1905,7 +1486,6 @@ msgstr ""
 
 #. TRANS: Additional form text for user deletion form shown if a user has account backup rights.
 #. TRANS: %s is a URL to the backup page.
-#: actions/deleteaccount.php:285
 #, php-format
 msgid ""
 "You are strongly advised to <a href=\"%s\">back up your data</a> before "
@@ -1916,55 +1496,42 @@ msgstr ""
 
 #. TRANS: Field label for delete account confirmation entry.
 #. TRANS: Field label for password reset form where the password has to be typed again.
-#: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:262 actions/register.php:419
 msgid "Confirm"
 msgstr "Confirmar"
 
 #. TRANS: Input title for the delete account field.
 #. TRANS: %s is the text that needs to be input.
-#: actions/deleteaccount.php:304
 #, php-format
 msgid "Enter \"%s\" to confirm that you want to delete your account."
 msgstr "Entra \"%s\" pro confirmar que tu vole deler tu conto."
 
 #. TRANS: Button title for user account deletion.
-#: actions/deleteaccount.php:323
 msgid "Permanently delete your account"
 msgstr "Deler permanentemente tu conto"
 
 #. TRANS: Client error displayed trying to delete an application while not logged in.
-#: actions/deleteapplication.php:62
 msgid "You must be logged in to delete an application."
 msgstr "Tu debe aperir un session pro deler un application."
 
 #. TRANS: Client error displayed trying to delete an application that does not exist.
-#: actions/deleteapplication.php:71
 msgid "Application not found."
 msgstr "Application non trovate."
 
 #. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
-#: actions/deleteapplication.php:79 actions/editapplication.php:78
-#: actions/showapplication.php:90
 msgid "You are not the owner of this application."
 msgstr "Tu non es le proprietario de iste application."
 
 #. TRANS: Client error text when there is a problem with the session token.
-#: actions/deleteapplication.php:102 actions/editapplication.php:131
-#: actions/newapplication.php:112 actions/showapplication.php:113
-#: lib/action.php:1391
 msgid "There was a problem with your session token."
 msgstr "Il habeva un problema con tu indicio de session."
 
 #. TRANS: Title for delete application page.
 #. TRANS: Fieldset legend on delete application page.
-#: actions/deleteapplication.php:124 actions/deleteapplication.php:149
 msgid "Delete application"
 msgstr "Deler application"
 
 #. TRANS: Confirmation text on delete application page.
-#: actions/deleteapplication.php:152
 msgid ""
 "Are you sure you want to delete this application? This will clear all data "
 "about the application from the database, including all existing user "
@@ -1975,55 +1542,45 @@ msgstr ""
 "de usator."
 
 #. TRANS: Submit button title for 'No' when deleting an application.
-#: actions/deleteapplication.php:161
 msgid "Do not delete this application."
 msgstr "Non deler iste application."
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
-#: actions/deleteapplication.php:167
 msgid "Delete this application."
 msgstr "Deler iste application."
 
 #. TRANS: Client error when trying to delete group while not logged in.
-#: actions/deletegroup.php:64
 msgid "You must be logged in to delete a group."
 msgstr "Tu debe aperir un session pro deler un gruppo."
 
 #. TRANS: Client error when trying to delete a group without providing a nickname or ID for the group.
 #. TRANS: Client error displayed when trying to join a group without providing a group name or group ID.
 #. TRANS: Client error displayed when trying to leave a group without providing a group name or group ID.
-#: actions/deletegroup.php:94 actions/joingroup.php:89
-#: actions/leavegroup.php:89
 msgid "No nickname or ID."
 msgstr "Nulle pseudonymo o ID."
 
 #. TRANS: Client error when trying to delete a group without having the rights to delete it.
-#: actions/deletegroup.php:107
 msgid "You are not allowed to delete this group."
 msgstr "Tu non ha le permission de deler iste gruppo."
 
 #. TRANS: Server error displayed if a group could not be deleted.
 #. TRANS: %s is the name of the group that could not be deleted.
-#: actions/deletegroup.php:150
 #, php-format
 msgid "Could not delete group %s."
 msgstr "Non poteva deler le gruppo %s."
 
 #. TRANS: Message given after deleting a group.
 #. TRANS: %s is the deleted group's name.
-#: actions/deletegroup.php:159
 #, php-format
 msgid "Deleted group %s"
 msgstr "Deleva gruppo %s"
 
 #. TRANS: Title of delete group page.
 #. TRANS: Form legend for deleting a group.
-#: actions/deletegroup.php:176 actions/deletegroup.php:202
 msgid "Delete group"
 msgstr "Deler gruppo"
 
 #. TRANS: Warning in form for deleleting a group.
-#: actions/deletegroup.php:206
 msgid ""
 "Are you sure you want to delete this group? This will clear all data about "
 "the group from the database, without a backup. Public posts to this group "
@@ -2034,12 +1591,10 @@ msgstr ""
 "gruppo restara totevia in le chronologias individual."
 
 #. TRANS: Submit button title for 'No' when deleting a group.
-#: actions/deletegroup.php:224
 msgid "Do not delete this group."
 msgstr "Non deler iste gruppo."
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
-#: actions/deletegroup.php:231
 msgid "Delete this group."
 msgstr "Deler iste gruppo."
 
@@ -2049,22 +1604,18 @@ msgstr "Deler iste gruppo."
 #. TRANS: Client error displayed trying to block a user from a group while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying to log out when not logged in.
+#. TRANS: Client error displayed when trying to access the "make admin" page while not logged in.
+#. TRANS: Client error displayed trying to create a new direct message while not logged in.
+#. TRANS: Client error displayed trying to send a notice while not logged in.
+#. TRANS: Client error displayed trying to nudge a user without being logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
 #. TRANS: Client error displayed when trying to change user options while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
-#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:70
-#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
-#: actions/nudge.php:63 actions/pluginenable.php:97 actions/subedit.php:33
-#: actions/subscribe.php:98 actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:71 lib/profileformaction.php:63
-#: lib/settingsaction.php:72
 msgid "Not logged in."
 msgstr "Tu non ha aperite un session."
 
 #. TRANS: Instructions for deleting a notice.
-#: actions/deletenotice.php:110
 msgid ""
 "You are about to permanently delete a notice. Once this is done, it cannot "
 "be undone."
@@ -2074,48 +1625,39 @@ msgstr ""
 
 #. TRANS: Page title when deleting a notice.
 #. TRANS: Fieldset legend for the delete notice form.
-#: actions/deletenotice.php:117 actions/deletenotice.php:148
 msgid "Delete notice"
 msgstr "Deler nota"
 
 #. TRANS: Message for the delete notice form.
-#: actions/deletenotice.php:152
 msgid "Are you sure you want to delete this notice?"
 msgstr "Es tu secur de voler deler iste nota?"
 
 #. TRANS: Submit button title for 'No' when deleting a notice.
-#: actions/deletenotice.php:159
 msgid "Do not delete this notice."
 msgstr "Non deler iste nota."
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:166
 msgid "Delete this notice."
 msgstr "Deler iste nota."
 
 #. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
-#: actions/deleteuser.php:66
 msgid "You cannot delete users."
 msgstr "Tu non pote deler usatores."
 
 #. TRANS: Client error displayed when trying to delete a non-local user.
-#: actions/deleteuser.php:74
 msgid "You can only delete local users."
 msgstr "Tu pote solmente deler usatores local."
 
 #. TRANS: Title of delete user page.
-#: actions/deleteuser.php:110
 msgctxt "TITLE"
 msgid "Delete user"
 msgstr "Deler usator"
 
 #. TRANS: Fieldset legend on delete user page.
-#: actions/deleteuser.php:134
 msgid "Delete user"
 msgstr "Deler usator"
 
 #. TRANS: Information text to request if a user is certain that the described action has to be performed.
-#: actions/deleteuser.php:138
 msgid ""
 "Are you sure you want to delete this user? This will clear all data about "
 "the user from the database, without a backup."
@@ -2124,99 +1666,80 @@ msgstr ""
 "usator del base de datos, sin copia de reserva."
 
 #. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/deleteuser.php:158
 msgid "Do not delete this user."
 msgstr "Non deler iste usator."
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
-#: actions/deleteuser.php:165
 msgid "Delete this user."
 msgstr "Deler iste usator."
 
 #. TRANS: Message used as title for design settings for the site.
-#: actions/designadminpanel.php:60 lib/settingsnav.php:97
 msgid "Design"
 msgstr "Apparentia"
 
 #. TRANS: Instructions for design adminsitration panel.
-#: actions/designadminpanel.php:71
 msgid "Design settings for this StatusNet site"
 msgstr "Configuration del apparentia de iste sito StatusNet"
 
 #. TRANS: Client error displayed when a logo URL does is not valid.
-#: actions/designadminpanel.php:327
 msgid "Invalid logo URL."
 msgstr "URL de logotypo invalide."
 
 #. TRANS: Client error displayed when an SSL logo URL is invalid.
-#: actions/designadminpanel.php:333
 msgid "Invalid SSL logo URL."
 msgstr "URL de logotypo SSL invalide."
 
 #. TRANS: Client error displayed when a theme is submitted through the form that is not in the theme list.
 #. TRANS: %s is the chosen unavailable theme.
-#: actions/designadminpanel.php:339
 #, php-format
 msgid "Theme not available: %s."
 msgstr "Thema non disponibile: %s."
 
 #. TRANS: Fieldset legend for form to change logo.
-#: actions/designadminpanel.php:437
 msgid "Change logo"
 msgstr "Cambiar logotypo"
 
 #. TRANS: Field label for StatusNet site logo.
-#: actions/designadminpanel.php:444
 msgid "Site logo"
 msgstr "Logotypo del sito"
 
 #. TRANS: Field label for SSL StatusNet site logo.
-#: actions/designadminpanel.php:452
 msgid "SSL logo"
 msgstr "Logotypo SSL"
 
 #. TRANS: Fieldset legend for form change StatusNet site's theme.
-#: actions/designadminpanel.php:467
 msgid "Change theme"
 msgstr "Cambiar thema"
 
 #. TRANS: Field label for dropdown to choose site theme.
-#: actions/designadminpanel.php:485
 msgid "Site theme"
 msgstr "Thema del sito"
 
 #. TRANS: Title for field label for dropdown to choose site theme.
-#: actions/designadminpanel.php:487
 msgid "Theme for the site."
 msgstr "Le thema de apparentia pro le sito."
 
 #. TRANS: Field label for uploading a cutom theme.
-#: actions/designadminpanel.php:494
 msgid "Custom theme"
 msgstr "Apparentia personalisate"
 
 #. TRANS: Form instructions for uploading a cutom StatusNet theme.
-#: actions/designadminpanel.php:499
 msgid "You can upload a custom StatusNet theme as a .ZIP archive."
 msgstr ""
 "Es possibile incargar un apparentia personalisate de StatusNet in un "
 "archivo .ZIP."
 
 #. TRANS: Fieldset legend for theme background image.
-#: actions/designadminpanel.php:515
 msgid "Change background image"
 msgstr "Cambiar imagine de fundo"
 
 #. TRANS: Field label for background image on theme designer page.
 #. TRANS: Field label for background color selector.
 #. TRANS: Label on profile design page for setting a profile page background colour.
-#: actions/designadminpanel.php:525 actions/designadminpanel.php:609
-#: lib/designform.php:238
 msgid "Background"
 msgstr "Fundo"
 
 #. TRANS: Form guide for background image upload form on theme designer page.
-#: actions/designadminpanel.php:531
 #, php-format
 msgid ""
 "You can upload a background image for the site. The maximum file size is %1"
@@ -2226,197 +1749,162 @@ msgstr ""
 "file es %1$s."
 
 #. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:558
 msgid "On"
 msgstr "Active"
 
 #. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:575
 msgid "Off"
 msgstr "Non active"
 
 #. TRANS: Form guide for turning background image on or off on theme designer page.
 #. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
 #. TRANS: use of the uploaded profile image.
-#: actions/designadminpanel.php:577 lib/designform.php:214
 msgid "Turn background image on or off."
 msgstr "Activar o disactivar le imagine de fundo."
 
 #. TRANS: Checkbox label to title background image on theme designer page.
 #. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-#: actions/designadminpanel.php:583 lib/designform.php:220
 msgid "Tile background image"
 msgstr "Tegular le imagine de fundo"
 
 #. TRANS: Fieldset legend for theme colors.
-#: actions/designadminpanel.php:598
 msgid "Change colors"
 msgstr "Cambiar colores"
 
 #. TRANS: Field label for content color selector.
 #. TRANS: Label on profile design page for setting a profile page content colour.
-#: actions/designadminpanel.php:623 lib/designform.php:252
 msgid "Content"
 msgstr "Contento"
 
 #. TRANS: Field label for sidebar color selector.
 #. TRANS: Label on profile design page for setting a profile page sidebar colour.
-#: actions/designadminpanel.php:637 lib/designform.php:266
 msgid "Sidebar"
 msgstr "Barra lateral"
 
 #. TRANS: Field label for text color selector.
 #. TRANS: Label on profile design page for setting a profile page text colour.
-#: actions/designadminpanel.php:651 lib/designform.php:280
 msgid "Text"
 msgstr "Texto"
 
 #. TRANS: Field label for link color selector.
 #. TRANS: Label on profile design page for setting a profile page links colour.
-#: actions/designadminpanel.php:665 lib/designform.php:294
 msgid "Links"
 msgstr "Ligamines"
 
 #. TRANS: Fieldset legend for advanced theme design settings.
-#: actions/designadminpanel.php:691
 msgid "Advanced"
 msgstr "Avantiate"
 
 #. TRANS: Field label for custom CSS.
-#: actions/designadminpanel.php:696
 msgid "Custom CSS"
 msgstr "CSS personalisate"
 
 #. TRANS: Button text for resetting theme settings.
-#: actions/designadminpanel.php:718
 msgctxt "BUTTON"
 msgid "Use defaults"
 msgstr "Usar predefinitiones"
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:720
 msgid "Restore default designs."
 msgstr "Restaurar apparentias predefinite."
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:728
 msgid "Reset back to default."
 msgstr "Revenir al predefinitiones."
 
 #. TRANS: Title for button for saving theme settings.
-#: actions/designadminpanel.php:736
 msgid "Save design."
 msgstr "Salveguardar apparentia."
 
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
-#: actions/disfavor.php:83
 msgid "This notice is not a favorite!"
 msgstr "Iste nota non es favorite!"
 
 #. TRANS: Title for page on which favorites can be added.
-#: actions/disfavor.php:98
 msgid "Add to favorites"
 msgstr "Adder al favorites"
 
 #. TRANS: Client exception thrown when requesting a document from the documentation that does not exist.
 #. TRANS: %s is the non-existing document.
-#: actions/doc.php:155
 #, php-format
 msgid "No such document \"%s\"."
 msgstr "Le documento \"%s\" non existe."
 
 #. TRANS: Title for "Edit application" form.
 #. TRANS: Form legend.
-#: actions/editapplication.php:54 lib/applicationeditform.php:129
 msgid "Edit application"
 msgstr "Modificar application"
 
 #. TRANS: Client error displayed trying to edit an application while not logged in.
-#: actions/editapplication.php:66
 msgid "You must be logged in to edit an application."
 msgstr "Tu debe aperir un session pro modificar un application."
 
 #. TRANS: Client error displayed trying to edit an application that does not exist.
-#: actions/editapplication.php:83 actions/showapplication.php:83
 msgid "No such application."
 msgstr "Application non trovate."
 
 #. TRANS: Instructions for "Edit application" form.
-#: actions/editapplication.php:167
 msgid "Use this form to edit your application."
 msgstr "Usa iste formulario pro modificar le application."
 
 #. TRANS: Validation error shown when not providing a name in the "Edit application" form.
 #. TRANS: Validation error shown when not providing a name in the "New application" form.
-#: actions/editapplication.php:184 actions/newapplication.php:164
 msgid "Name is required."
 msgstr "Le nomine es requirite."
 
 #. 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.
-#: actions/editapplication.php:188 actions/newapplication.php:172
 msgid "Name is too long (maximum 255 characters)."
 msgstr "Le nomine es troppo longe (maximo 255 characteres)."
 
 #. TRANS: Validation error shown when providing a name for an application that already exists in the "Edit application" form.
 #. TRANS: Validation error shown when providing a name for an application that already exists in the "New application" form.
-#: actions/editapplication.php:192 actions/newapplication.php:168
 msgid "Name already in use. Try another one."
 msgstr "Nomine ja in uso. Proba un altere."
 
 #. TRANS: Validation error shown when not providing a description in the "Edit application" form.
 #. TRANS: Validation error shown when not providing a description in the "New application" form.
-#: actions/editapplication.php:196 actions/newapplication.php:176
 msgid "Description is required."
 msgstr "Le description es requirite."
 
 #. TRANS: Validation error shown when providing too long a source URL in the "Edit application" form.
-#: actions/editapplication.php:209
 msgid "Source URL is too long."
 msgstr "Le URL de origine es troppo longe."
 
 #. TRANS: Validation error shown when providing an invalid source URL in the "Edit application" form.
 #. TRANS: Validation error shown when providing an invalid source URL in the "New application" form.
-#: actions/editapplication.php:216 actions/newapplication.php:199
 msgid "Source URL is not valid."
 msgstr "Le URL de origine non es 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.
-#: actions/editapplication.php:220 actions/newapplication.php:203
 msgid "Organization is required."
 msgstr "Le organisation es requirite."
 
 #. TRANS: Validation error shown when providing too long an arganisation name in the "Edit application" form.
-#: actions/editapplication.php:224 actions/newapplication.php:207
 msgid "Organization is too long (maximum 255 characters)."
 msgstr "Le organisation es troppo longe (maximo 255 characteres)."
 
 #. TRANS: Form validation error show when an organisation name has not been provided in the edit application form.
 #. TRANS: Form validation error show when an organisation name has not been provided in the new application form.
-#: actions/editapplication.php:228 actions/newapplication.php:211
 msgid "Organization homepage is required."
 msgstr "Le sito web del organisation es requirite."
 
 #. TRANS: Validation error shown when providing too long a callback URL in the "Edit application" form.
 #. TRANS: Validation error shown when providing too long a callback URL in the "New application" form.
-#: actions/editapplication.php:239 actions/newapplication.php:225
 msgid "Callback is too long."
 msgstr "Le appello de retorno es troppo longe."
 
 #. TRANS: Validation error shown when providing an invalid callback URL in the "Edit application" form.
 #. TRANS: Validation error shown when providing an invalid callback URL in the "New application" form.
-#: actions/editapplication.php:247 actions/newapplication.php:235
 msgid "Callback URL is not valid."
 msgstr "Le URL de retorno non es valide."
 
 #. TRANS: Server error occuring when an application could not be updated from the "Edit application" form.
-#: actions/editapplication.php:284
 msgid "Could not update application."
 msgstr "Non poteva actualisar application."
 
 #. TRANS: Title for form to edit a group. %s is a group nickname.
-#: actions/editgroup.php:55
 #, php-format
 msgid "Edit %s group"
 msgstr "Modificar gruppo %s"
@@ -2424,40 +1912,40 @@ msgstr "Modificar gruppo %s"
 #. TRANS: Client error displayed trying to edit a group while not logged in.
 #. TRANS: Client error displayed when trying to create a group while not logged in.
 #. TRANS: Client error displayed trying to create a group while not logged in.
-#: actions/editgroup.php:68 actions/grouplogo.php:69 actions/newgroup.php:65
 msgid "You must be logged in to create a group."
 msgstr "Tu debe aperir un session pro crear un gruppo."
 
 #. TRANS: Form instructions for group edit form.
-#: actions/editgroup.php:161
 msgid "Use this form to edit the group."
 msgstr "Usa iste formulario pro modificar le gruppo."
 
+#. TRANS: Group edit form validation error.
+#. TRANS: Group create form validation error.
+#. TRANS: %s is the invalid alias.
+#, php-format
+msgid "Invalid alias: \"%s\""
+msgstr "Alias invalide: \"%s\""
+
 #. TRANS: Group edit form success message.
-#: actions/editgroup.php:301
 msgid "Options saved."
 msgstr "Optiones salveguardate."
 
 #. TRANS: Title for e-mail settings.
-#: actions/emailsettings.php:60
 msgid "Email settings"
 msgstr "Configuration de e-mail"
 
 #. TRANS: E-mail settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/emailsettings.php:74
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 msgstr "Configurar como reciper e-mail de %%site.name%%."
 
 #. TRANS: Form legend for e-mail settings form.
 #. TRANS: Field label for e-mail address input in e-mail settings form.
-#: actions/emailsettings.php:104 actions/emailsettings.php:130
 msgid "Email address"
 msgstr "Adresse de e-mail"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:110
 msgid "Current confirmed email address."
 msgstr "Adresse de e-mail actualmente confirmate."
 
@@ -2466,15 +1954,11 @@ msgstr "Adresse de e-mail actualmente confirmate."
 #. TRANS: Button label to remove a confirmed IM address.
 #. TRANS: Button label to remove a confirmed SMS address.
 #. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
-#: actions/emailsettings.php:113 actions/emailsettings.php:180
-#: actions/imsettings.php:119 actions/smssettings.php:119
-#: actions/smssettings.php:175
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Remover"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:120
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -2487,45 +1971,37 @@ msgstr ""
 #. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
 #. TRANS: Any other domain may be owned by a legitimate person or
 #. TRANS: organization.
-#: actions/emailsettings.php:137
 msgid "Email address, like \"UserName@example.org\""
 msgstr "Le adresse de e-mail, como \"nomine@example.org\""
 
 #. TRANS: Button label for adding an e-mail address in e-mail settings form.
 #. TRANS: Button label for adding an IM address in IM settings form.
 #. TRANS: Button label for adding a SMS phone number in SMS settings form.
-#: actions/emailsettings.php:141 actions/imsettings.php:147
-#: actions/smssettings.php:157
 msgctxt "BUTTON"
 msgid "Add"
 msgstr "Adder"
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:149 actions/smssettings.php:166
 msgid "Incoming email"
 msgstr "E-mail entrante"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:155
 msgid "I want to post notices by email."
 msgstr "Io vole publicar notas per e-mail."
 
 #. TRANS: Form instructions for incoming e-mail form in e-mail settings.
 #. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
-#: actions/emailsettings.php:177 actions/smssettings.php:173
 msgid "Send email to this address to post new notices."
 msgstr "Invia e-mail a iste adresse pro publicar nove notas."
 
 #. TRANS: Instructions for incoming e-mail address input form, when an address has already been assigned.
 #. TRANS: Instructions for incoming SMS e-mail address input form.
-#: actions/emailsettings.php:186 actions/smssettings.php:181
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr ""
 "Face un nove adresse de e-mail per le qual publicar; cancella le vetule."
 
 #. TRANS: Instructions for incoming e-mail address input form.
-#: actions/emailsettings.php:190
 msgid ""
 "To send notices via email, we need to create a unique email address for you "
 "on this server:"
@@ -2535,87 +2011,69 @@ msgstr ""
 
 #. TRANS: Button label for adding an e-mail address to send notices from.
 #. TRANS: Button label for adding an SMS e-mail address to send notices from.
-#: actions/emailsettings.php:196 actions/smssettings.php:184
 msgctxt "BUTTON"
 msgid "New"
 msgstr "Nove"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:205
 msgid "Email preferences"
 msgstr "Preferentias de e-mail"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:213
 msgid "Send me notices of new subscriptions through email."
 msgstr "Inviar me notificationes de nove subscriptiones per e-mail."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:219
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr "Inviar me e-mail quando alcuno adde mi nota al favorites."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:226
 msgid "Send me email when someone sends me a private message."
 msgstr "Inviar me e-mail quando alcuno me invia un message private."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:232
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr "Inviar me e-mail quando alcuno me invia un \"responsa @\"."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:238
 msgid "Allow friends to nudge me and send me an email."
 msgstr "Permitte que amicos me pulsa e me invia e-mail."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:244
 msgid "Publish a MicroID for my email address."
 msgstr "Publicar un MicroID pro mi adresse de e-mail."
 
 #. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:362
 msgid "Email preferences saved."
 msgstr "Preferentias de e-mail salveguardate."
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:381
 msgid "No email address."
 msgstr "Nulle adresse de e-mail."
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:389
 msgid "Cannot normalize that email address."
 msgstr "Non pote normalisar iste adresse de e-mail."
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:394 actions/register.php:197
-#: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "Adresse de e-mail invalide."
 
 #. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:398
 msgid "That is already your email address."
 msgstr "Isto es ja tu adresse de e-mail."
 
 #. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:402
 msgid "That email address already belongs to another user."
 msgstr "Iste adresse de e-mail pertine ja a un altere usator."
 
 #. TRANS: Server error thrown on database error adding e-mail confirmation code.
 #. TRANS: Server error thrown on database error adding Instant Messaging confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:419 actions/imsettings.php:362
-#: actions/smssettings.php:364
 msgid "Could not insert confirmation code."
 msgstr "Non poteva inserer le codice de confirmation."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:426
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
@@ -2627,100 +2085,80 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling Instant Messaging address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:446 actions/imsettings.php:391
-#: actions/smssettings.php:398
 msgid "No pending confirmation to cancel."
 msgstr "Nulle confirmation pendente a cancellar."
 
 #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:451
 msgid "That is the wrong email address."
 msgstr "Iste adresse de e-mail es erronee."
 
 #. TRANS: Server error thrown on database error canceling e-mail address confirmation.
 #. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
-#: actions/emailsettings.php:460 actions/smssettings.php:412
 msgid "Could not delete email confirmation."
 msgstr "Non poteva deler confirmation de e-mail."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:465
 msgid "Email confirmation cancelled."
 msgstr "Confirmation de e-mail cancellate."
 
 #. TRANS: Message given trying to remove an e-mail address that is not
 #. TRANS: registered for the active user.
-#: actions/emailsettings.php:484
 msgid "That is not your email address."
 msgstr "Isto non es tu adresse de e-mail."
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:505
 msgid "The email address was removed."
 msgstr "Le adresse de e-mail ha essite removite."
 
 #. TRANS: Form validation error displayed when trying to remove an incoming e-mail address while no address has been set.
-#: actions/emailsettings.php:519 actions/smssettings.php:554
 msgid "No incoming email address."
 msgstr "Nulle adresse de e-mail entrante."
 
 #. 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.
-#: actions/emailsettings.php:531 actions/emailsettings.php:555
-#: actions/smssettings.php:565 actions/smssettings.php:590
 msgid "Could not update user record."
 msgstr "Non poteva actualisar le datos del usator."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
 #. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:535 actions/smssettings.php:569
 msgid "Incoming email address removed."
 msgstr "Adresse de e-mail entrante removite."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
 #. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:559 actions/smssettings.php:594
 msgid "New incoming email address added."
 msgstr "Nove adresse de e-mail entrante addite."
 
 #. TRANS: Client error displayed when trying to mark a notice as favorite that already is a favorite.
-#: actions/favor.php:80
 msgid "This notice is already a favorite!"
 msgstr "Iste nota es ja favorite!"
 
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
-#: actions/favor.php:95
 msgid "Disfavor favorite."
 msgstr "Disfavorir favorite."
 
 #. TRANS: Page title for first page of favorited notices.
 #. TRANS: Title for favourited notices section.
-#: actions/favorited.php:65 lib/popularnoticesection.php:62
-#: lib/publicgroupnav.php:93
 msgid "Popular notices"
 msgstr "Notas popular"
 
 #. TRANS: Page title for all but first page of favorited notices.
 #. TRANS: %d is the page number being displayed.
-#: actions/favorited.php:69
 #, php-format
 msgid "Popular notices, page %d"
 msgstr "Notas popular, pagina %d"
 
 #. TRANS: Description on page displaying favorited notices.
-#: actions/favorited.php:81
 msgid "The most popular notices on the site right now."
 msgstr "Le notas le plus popular del sito in iste momento."
 
 #. TRANS: Text displayed instead of a list when a site does not yet have any favourited notices.
-#: actions/favorited.php:149
 msgid "Favorite notices appear on this page but no one has favorited one yet."
 msgstr ""
 "Le notas favorite appare in iste pagina, ma necuno ha ancora favoritisate un."
 
 #. TRANS: Additional text displayed instead of a list when a site does not yet have any favourited notices for logged in users.
-#: actions/favorited.php:153
 msgid ""
 "Be the first to add a notice to your favorites by clicking the fave button "
 "next to any notice you like."
@@ -2730,7 +2168,6 @@ msgstr ""
 
 #. TRANS: Additional text displayed instead of a list when a site does not yet have any favourited notices for not logged in users.
 #. TRANS: %%action.register%% is a registration link. "[link text](link)" is Mark Down. Do not change the formatting.
-#: actions/favorited.php:158
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to add a "
@@ -2743,181 +2180,146 @@ msgstr ""
 #. TRANS: %s is a user's nickname.
 #. TRANS: Title for first page of favourite notices of a user.
 #. TRANS: %s is the user for whom the favourite notices are displayed.
-#: actions/favoritesrss.php:111 actions/showfavorites.php:76
-#: lib/personalgroupnav.php:110
 #, php-format
 msgid "%s's favorite notices"
 msgstr "Notas favorite de %s"
 
 #. TRANS: Desciption of RSS feed with favourite notices of a user.
 #. TRANS: %1$s is a user's nickname, %2$s is the name of the StatusNet site.
-#: actions/favoritesrss.php:117
 #, php-format
 msgid "Updates favored by %1$s on %2$s!"
 msgstr "Actualisationes favorite per %1$s in %2$s!"
 
 #. TRANS: Page title for first page of featured users.
 #. TRANS: Title for featured users section.
-#: actions/featured.php:69 lib/featureduserssection.php:87
-#: lib/publicgroupnav.php:89
 msgid "Featured users"
 msgstr "Usatores in evidentia"
 
 #. TRANS: Page title for all but first page of featured users.
 #. TRANS: %d is the page number being displayed.
-#: actions/featured.php:73
 #, php-format
 msgid "Featured users, page %d"
 msgstr "Usatores in evidentia, pagina %d"
 
 #. TRANS: Description on page displaying featured users.
-#: actions/featured.php:102
 #, php-format
 msgid "A selection of some great users on %s."
 msgstr "Un selection de usatores eminente in %s."
 
 #. TRANS: Client error displayed when no notice ID was given trying do display a file.
-#: actions/file.php:36
 msgid "No notice ID."
 msgstr "Nulle ID de nota."
 
 #. TRANS: Client error displayed when an invalid notice ID was given trying do display a file.
-#: actions/file.php:41
 msgid "No notice."
 msgstr "Nulle nota."
 
 #. TRANS: Client error displayed when trying do display a file for a notice without a file attachement.
-#: actions/file.php:46
 msgid "No attachments."
 msgstr "Nulle annexo."
 
 #. TRANS: Client error displayed when trying do display a file for a notice with file attachements
 #. TRANS: that could not be found.
-#: actions/file.php:58
 msgid "No uploaded attachments."
 msgstr "Nulle annexo incargate."
 
 #. TRANS: Client error displayed when subscribing to a remote profile and an unexpected response is received.
-#: actions/finishremotesubscribe.php:69
 msgid "Not expecting this response!"
 msgstr "Non expectava iste responsa!"
 
 #. TRANS: Client error displayed when subscribing to a remote profile that does not exist.
-#: actions/finishremotesubscribe.php:81
 msgid "User being listened to does not exist."
 msgstr "Le usator sequite non existe."
 
 #. TRANS: Client error displayed when subscribing to a remote profile that is a local profile.
-#: actions/finishremotesubscribe.php:89 actions/remotesubscribe.php:58
 msgid "You can use the local subscription!"
 msgstr "Tu pote usar le subscription local!"
 
 #. TRANS: Client error displayed when subscribing to a remote profile that is blocked form subscribing to.
-#: actions/finishremotesubscribe.php:102
 msgid "That user has blocked you from subscribing."
 msgstr "Iste usator te ha blocate de subscriber."
 
 #. TRANS: Client error displayed when subscribing to a remote profile without providing an authorised token.
-#: actions/finishremotesubscribe.php:114
 msgid "You are not authorized."
 msgstr "Tu non es autorisate."
 
 #. TRANS: Client error displayed when subscribing to a remote profile and conversion of the request token to access token fails.
-#: actions/finishremotesubscribe.php:118
 msgid "Could not convert request token to access token."
 msgstr "Non poteva converter le indicio de requesta in un indicio de accesso."
 
 #. TRANS: Client error displayed when subscribing to a remote profile fails because of an unsupported version of the OMB protocol.
-#: actions/finishremotesubscribe.php:124
 msgid "Remote service uses unknown version of OMB protocol."
 msgstr "Le servicio remote usa un version incognite del protocollo OMB."
 
 #. TRANS: Server error displayed when subscribing to a remote profile fails because the remote profile could not be updated.
-#: actions/finishremotesubscribe.php:145 lib/oauthstore.php:317
 msgid "Error updating remote profile."
 msgstr "Error durante le actualisation del profilo remote."
 
 #. TRANS: Client error displayed when requesting a non-existent file.
-#: actions/getfile.php:77
 msgid "No such file."
 msgstr "File non existe."
 
 #. TRANS: Client error displayed when requesting a file without having read access to it.
-#: actions/getfile.php:82
 msgid "Cannot read file."
 msgstr "Non pote leger file."
 
 #. TRANS: Client error displayed when trying to assign an invalid role to a user.
-#: actions/grantrole.php:61 actions/revokerole.php:62
 msgid "Invalid role."
 msgstr "Rolo invalide."
 
 #. TRANS: Client error displayed when trying to assign an reserved role to a user.
-#: actions/grantrole.php:66 actions/revokerole.php:66
 msgid "This role is reserved and cannot be set."
 msgstr "Iste rolo es reservate e non pote esser apponite."
 
 #. TRANS: Client error displayed when trying to assign a role to a user while not being allowed to set roles.
-#: actions/grantrole.php:76
 msgid "You cannot grant user roles on this site."
 msgstr "Tu non pote conceder rolos a usatores in iste sito."
 
 #. TRANS: Client error displayed when trying to assign a role to a user that already has that role.
-#: actions/grantrole.php:84
 msgid "User already has this role."
 msgstr "Le usator ha ja iste rolo."
 
 #. TRANS: Client error displayed trying to block a user from a group while not specifying a to be blocked user profile.
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing a profile.
+#. TRANS: Client error displayed when not providing a profile ID on the Make Admin page.
 #. TRANS: Client error displayed trying a change a subscription without providing a profile.
 #. TRANS: Client error displayed when trying to change user options without specifying a user to work on.
-#: actions/groupblock.php:71 actions/groupunblock.php:71
-#: actions/makeadmin.php:71 actions/subedit.php:49
-#: lib/profileformaction.php:79
 msgid "No profile specified."
 msgstr "Nulle profilo specificate."
 
 #. TRANS: Client error displayed trying to block a user from a group while specifying a non-existing profile.
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing an existing profile.
+#. TRANS: Client error displayed when specifying an invalid profile ID on the Make Admin page.
 #. TRANS: Client error displayed trying a change a subscription for a non-existant profile ID.
 #. TRANS: Client error displayed when trying to change user options without specifying an existing user to work on.
-#: actions/groupblock.php:77 actions/groupunblock.php:77
-#: actions/makeadmin.php:76 actions/subedit.php:57 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:87
 msgid "No profile with that ID."
 msgstr "Non existe un profilo con iste ID."
 
 #. TRANS: Client error displayed trying to block a user from a group while not specifying a group to block a profile from.
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing a group.
-#: actions/groupblock.php:83 actions/groupunblock.php:83
-#: actions/makeadmin.php:81
+#. TRANS: Client error displayed when not providing a group ID on the Make Admin page.
 msgid "No group specified."
 msgstr "Nulle gruppo specificate."
 
 #. TRANS: Client error displayed trying to block a user from a group while not being an admin user.
-#: actions/groupblock.php:95
 msgid "Only an admin can block group members."
 msgstr "Solmente un administrator pote blocar membros de un gruppo."
 
 #. TRANS: Client error displayed trying to block a user from a group while user is already blocked from the given group.
-#: actions/groupblock.php:100
 msgid "User is already blocked from group."
 msgstr "Le usator es ja blocate del gruppo."
 
 #. TRANS: Client error displayed trying to block a user from a group while user is not a member of given group.
-#: actions/groupblock.php:106
 msgid "User is not a member of group."
 msgstr "Le usator non es membro del gruppo."
 
 #. TRANS: Title for block user from group page.
 #. TRANS: Form legend for form to block user from a group.
-#: actions/groupblock.php:141 actions/groupmembers.php:364
 msgid "Block user from group"
 msgstr "Blocar usator del gruppo"
 
 #. TRANS: Explanatory text for block user from group form before setting the block.
 #. TRANS: %1$s is that to be blocked user, %2$s is the group the user will be blocked from.
-#: actions/groupblock.php:169
 #, php-format
 msgid ""
 "Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They "
@@ -2929,38 +2331,31 @@ msgstr ""
 "subscriber se al gruppo in le futuro."
 
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
-#: actions/groupblock.php:191
 msgid "Do not block this user from this group."
 msgstr "Non blocar iste usator de iste gruppo."
 
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
-#: actions/groupblock.php:198
 msgid "Block this user from this group."
 msgstr "Blocar iste usator de iste gruppo."
 
 #. TRANS: Server error displayed when trying to block a user from a group fails because of an application error.
-#: actions/groupblock.php:215
 msgid "Database error blocking user from group."
 msgstr "Error del base de datos al blocar le usator del gruppo."
 
 #. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
 #. TRANS: Client error displayed trying to find a user by ID without providing an ID.
-#: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr "Nulle ID."
 
 #. TRANS: Client error displayed trying to change group design settings while not logged in.
-#: actions/groupdesignsettings.php:67
 msgid "You must be logged in to edit a group."
 msgstr "Tu debe aperir un session pro modificar un gruppo."
 
 #. TRANS: Title group design settings page.
-#: actions/groupdesignsettings.php:146
 msgid "Group design"
 msgstr "Apparentia del gruppo"
 
 #. TRANS: Instructions for group design settings page.
-#: actions/groupdesignsettings.php:157
 msgid ""
 "Customize the way your group looks with a background image and a colour "
 "palette of your choice."
@@ -2969,24 +2364,20 @@ msgstr ""
 "de colores de tu preferentia."
 
 #. TRANS: Form validation error displayed when group design settings could not be updated because of an application issue.
-#: actions/groupdesignsettings.php:262
 msgid "Unable to update your design settings."
 msgstr "Impossibile actualisar le configurationes del apparentia."
 
 #. TRANS: Form text to confirm saved group design settings.
-#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:239
 msgid "Design preferences saved."
 msgstr "Preferentias de apparentia salveguardate."
 
 #. TRANS: Title for group logo settings page.
 #. TRANS: Group logo form legend.
-#: actions/grouplogo.php:144 actions/grouplogo.php:199
 msgid "Group logo"
 msgstr "Logotypo del gruppo"
 
 #. TRANS: Instructions for group logo page.
 #. TRANS: %s is the maximum file size for that site.
-#: actions/grouplogo.php:156
 #, php-format
 msgid ""
 "You can upload a logo image for your group. The maximum file size is %s."
@@ -2995,98 +2386,81 @@ msgstr ""
 "maximal del file es %s."
 
 #. TRANS: Submit button for uploading a group logo.
-#: actions/grouplogo.php:243
 msgid "Upload"
 msgstr "Incargar"
 
 #. TRANS: Button text for cropping an uploaded group logo.
-#: actions/grouplogo.php:299
 msgid "Crop"
 msgstr "Taliar"
 
 #. TRANS: Form instructions on the group logo page.
-#: actions/grouplogo.php:376
 msgid "Pick a square area of the image to be the logo."
 msgstr "Selige un area quadrate del imagine que devenira le logotypo."
 
 #. TRANS: Form success message after updating a group logo.
-#: actions/grouplogo.php:411
 msgid "Logo updated."
 msgstr "Logotypo actualisate."
 
 #. TRANS: Form failure message after failing to update a group logo.
-#: actions/grouplogo.php:414
 msgid "Failed updating logo."
 msgstr "Falleva de actualisar le logotypo."
 
 #. TRANS: Title of the page showing group members.
 #. TRANS: %s is the name of the group.
-#: actions/groupmembers.php:104
 #, php-format
 msgid "%s group members"
 msgstr "Membros del gruppo %s"
 
 #. TRANS: Title of the page showing group members.
 #. TRANS: %1$s is the name of the group, %2$d is the page number of the members list.
-#: actions/groupmembers.php:109
 #, php-format
 msgid "%1$s group members, page %2$d"
 msgstr "Membros del gruppo %1$s, pagina %2$d"
 
 #. TRANS: Page notice for group members page.
-#: actions/groupmembers.php:125
 msgid "A list of the users in this group."
 msgstr "Un lista de usatores in iste gruppo."
 
 #. TRANS: Indicator in group members list that this user is a group administrator.
-#: actions/groupmembers.php:190 lib/action.php:581
 msgid "Admin"
 msgstr "Administrator"
 
 #. TRANS: Button text for the form that will block a user from a group.
-#: actions/groupmembers.php:397
 msgctxt "BUTTON"
 msgid "Block"
 msgstr "Blocar"
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:401
 msgctxt "TOOLTIP"
 msgid "Block this user"
 msgstr "Blocar iste usator"
 
 #. TRANS: Form legend for form to make a user a group admin.
-#: actions/groupmembers.php:488
 msgid "Make user an admin of the group"
 msgstr "Facer le usator administrator del gruppo"
 
 #. TRANS: Button text for the form that will make a user administrator.
-#: actions/groupmembers.php:521
 msgctxt "BUTTON"
 msgid "Make Admin"
 msgstr "Facer admin"
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:525
 msgctxt "TOOLTIP"
 msgid "Make this user an admin"
 msgstr "Facer iste usator un administrator"
 
 #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
-#: actions/grouprss.php:141
 #, php-format
 msgid "Updates from members of %1$s on %2$s!"
 msgstr "Actualisationes de membros de %1$s in %2$s!"
 
 #. TRANS: Title for first page of the groups list.
-#: actions/groups.php:62
 msgctxt "TITLE"
 msgid "Groups"
 msgstr "Gruppos"
 
 #. TRANS: Title for all but the first page of the groups list.
 #. TRANS: %d is the page number.
-#: actions/groups.php:66
 #, php-format
 msgctxt "TITLE"
 msgid "Groups, page %d"
@@ -3095,7 +2469,6 @@ msgstr "Gruppos, pagina %d"
 #. TRANS: Page notice of group list. %%%%site.name%%%% is the StatusNet site name,
 #. TRANS: %%%%action.groupsearch%%%% and %%%%action.newgroup%%%% are URLs. Do not change them.
 #. TRANS: This message contains Markdown links in the form [link text](link).
-#: actions/groups.php:95
 #, php-format
 msgid ""
 "%%%%site.name%%%% groups let you find and talk with people of similar "
@@ -3111,12 +2484,10 @@ msgstr ""
 "%) o [crear le tue](%%%%action.newgroup%%%%)!"
 
 #. TRANS: Link to create a new group on the group list page.
-#: actions/groups.php:113 actions/usergroups.php:126 lib/groupeditform.php:115
 msgid "Create a new group"
 msgstr "Crear un nove gruppo"
 
 #. TRANS: Instructions for page where groups can be searched. %%site.name%% is the name of the StatusNet site.
-#: actions/groupsearch.php:53
 #, php-format
 msgid ""
 "Search for groups on %%site.name%% by their name, location, or description. "
@@ -3126,21 +2497,17 @@ msgstr ""
 "terminos con spatios; illos debe haber al minus 3 characteres."
 
 #. TRANS: Title for page where groups can be searched.
-#: actions/groupsearch.php:60
 msgid "Group search"
 msgstr "Recerca de gruppos"
 
 #. TRANS: Text on page where groups can be searched if no results were found for a query.
 #. TRANS: Text for notice search results is the query had no results.
 #. TRANS: Message on the "People search" page where a query has no results.
-#: actions/groupsearch.php:82 actions/noticesearch.php:122
-#: actions/peoplesearch.php:87
 msgid "No results."
 msgstr "Nulle resultato."
 
 #. TRANS: Additional text on page where groups can be searched if no results were found for a query for a logged in user.
 #. TRANS: This message contains Markdown links in the form [link text](link).
-#: actions/groupsearch.php:87
 #, php-format
 msgid ""
 "If you cannot find the group you're looking for, you can [create it](%%"
@@ -3151,7 +2518,6 @@ msgstr ""
 
 #. TRANS: Additional text on page where groups can be searched if no results were found for a query for a not logged in user.
 #. TRANS: This message contains Markdown links in the form [link text](link).
-#: actions/groupsearch.php:92
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and [create the group](%%"
@@ -3161,230 +2527,176 @@ msgstr ""
 "action.newgroup%%) tu mesme?"
 
 #. TRANS: Client error displayed when trying to unblock a user from a group without being an administrator for the group.
-#: actions/groupunblock.php:95
 msgid "Only an admin can unblock group members."
 msgstr "Solmente un administrator pote disblocar membros de un gruppo."
 
 #. TRANS: Client error displayed when trying to unblock a non-blocked user from a group.
-#: actions/groupunblock.php:100
 msgid "User is not blocked from group."
 msgstr "Le usator non es blocate del gruppo."
 
 #. TRANS: Server error displayed when unblocking a user from a group fails because of an unknown error.
 #. TRANS: Server error displayed when removing a user block.
-#: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "Error de remover le blocada."
 
 #. TRANS: Title for Instant Messaging settings.
-#: actions/imsettings.php:56
 msgid "IM settings"
 msgstr "Configuration de messageria instantanee"
 
 #. 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.
-#: actions/imsettings.php:69
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "You can send and receive notices through instant messaging [instant messages]"
 "(%%doc.im%%). Configure your addresses and settings below."
 msgstr ""
-"Tu pote inviar e reciper notas per [messages instantanee](%%doc.im%%) de "
-"Jabber/Google Talk. Configura tu adresse e parametros hic infra."
+"Tu pote inviar e reciper notas per [messageria instantanee](%%doc.im%%). "
+"Configura tu adresse e parametros hic infra."
 
 #. TRANS: Message given in the IM settings if IM is not enabled on the site.
-#: actions/imsettings.php:90
 msgid "IM is not available."
 msgstr "Messageria instantanee non disponibile."
 
-#: actions/imsettings.php:116
-#, fuzzy, php-format
+#, php-format
 msgid "Current confirmed %s address."
-msgstr "Adresse de e-mail actualmente confirmate."
+msgstr "Adresse de %s actualmente confirmate."
 
 #. TRANS: Form note in IM settings form.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:128
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your %s account for a message "
 "with further instructions. (Did you add %s to your buddy list?)"
 msgstr ""
-"Iste adresse attende confirmation. Lege in tu conto Jabber/Google Talk un "
-"message con ulterior instructiones. (Ha tu addite %s a tu lista de amicos?)"
+"Attende confirmation de iste adresse. Verifica tu conto de %s pro un message "
+"con ulterior instructiones. (Ha tu addite %s a tu lista de amicos?)"
 
-#: actions/imsettings.php:140
 msgid "IM address"
 msgstr "Adresse de messageria instantanee"
 
-#: actions/imsettings.php:142
 #, php-format
 msgid "%s screenname."
-msgstr ""
+msgstr "Pseudonymo de %s."
 
 #. TRANS: Header for IM preferences form.
-#: actions/imsettings.php:163
-#, fuzzy
 msgid "IM Preferences"
-msgstr "Preferentias de messageria instantanee"
+msgstr "Preferentias de MI"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:174
-#, fuzzy
 msgid "Send me notices"
-msgstr "Inviar un nota"
+msgstr "Inviar me notas"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:176
-#, fuzzy
 msgid "Post a notice when my status changes."
-msgstr "Publicar un nota quando mi stato de Jabber/Google Talk cambia."
+msgstr "Publicar un nota quando mi stato cambia."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:178
-#, fuzzy
 msgid "Send me replies from people I'm not subscribed to."
-msgstr ""
-"Inviar me responsas per Jabber/Google Talk de personas al quales io non es "
-"subscribite."
+msgstr "Inviar me responsas de personas a qui io non es subscribite."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:181
-#, fuzzy
 msgid "Publish a MicroID"
-msgstr "Publicar un MicroID pro mi adresse de e-mail."
+msgstr "Publicar un MicroID"
 
 #. TRANS: Server error thrown on database error updating IM preferences.
-#: actions/imsettings.php:291
-#, fuzzy
 msgid "Couldn't update IM preferences."
-msgstr "Non poteva actualisar le usator."
+msgstr "Non poteva actualisar le preferentias de MI."
 
 #. TRANS: Confirmation message for successful IM preferences save.
 #. TRANS: Confirmation message after saving preferences.
-#: actions/imsettings.php:298 actions/urlsettings.php:244
 msgid "Preferences saved."
 msgstr "Preferentias confirmate."
 
 #. TRANS: Message given saving IM address without having provided one.
-#: actions/imsettings.php:320
-#, fuzzy
 msgid "No screenname."
 msgstr "Nulle pseudonymo."
 
-#: actions/imsettings.php:325
-#, fuzzy
 msgid "No transport."
-msgstr "Nulle nota."
+msgstr "Nulle transporto."
 
 #. TRANS: Message given saving IM address that cannot be normalised.
-#: actions/imsettings.php:333
-#, fuzzy
 msgid "Cannot normalize that screenname"
-msgstr "Impossibile normalisar iste ID de Jabber."
+msgstr "Non pote normalisar iste pseudonymo"
 
 #. TRANS: Message given saving IM address that not valid.
-#: actions/imsettings.php:340
-#, fuzzy
 msgid "Not a valid screenname"
-msgstr "Non un pseudonymo valide."
+msgstr "Non un pseudonymo valide"
 
 #. TRANS: Message given saving IM address that is already set for another user.
-#: actions/imsettings.php:344
-#, fuzzy
 msgid "Screenname already belongs to another user."
-msgstr "Le ID de Jabber pertine ja a un altere usator."
+msgstr "Le pseudonymo pertine ja a un altere usator."
 
 #. TRANS: Message given saving valid IM address that is to be confirmed.
-#: actions/imsettings.php:369
-#, fuzzy
 msgid "A confirmation code was sent to the IM address you added."
 msgstr ""
 "Un codice de confirmation ha essite inviate al adresse de messageria "
-"instantanee specificate. Tu debe approbar que %s invia messages a te."
+"instantanee que tu addeva."
 
 #. TRANS: Message given canceling IM address confirmation for the wrong IM address.
-#: actions/imsettings.php:396
 msgid "That is the wrong IM address."
 msgstr "Iste adresse de messageria instantanee es erronee."
 
 #. TRANS: Server error thrown on database error canceling IM address confirmation.
-#: actions/imsettings.php:405
-#, fuzzy
 msgid "Couldn't delete confirmation."
-msgstr "Non poteva deler confirmation de messageria instantanee."
+msgstr "Non poteva deler le confirmation."
 
 #. TRANS: Message given after successfully canceling IM address confirmation.
-#: actions/imsettings.php:410
 msgid "IM confirmation cancelled."
 msgstr "Confirmation de messageria instantanee cancellate."
 
 #. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.
-#: actions/imsettings.php:434
-#, fuzzy
 msgid "That is not your screenname."
-msgstr "Isto non es tu numero de telephono."
+msgstr "Isto non es tu pseudonymo."
 
 #. TRANS: Server error thrown on database error removing a registered IM address.
-#: actions/imsettings.php:443
-#, fuzzy
 msgid "Couldn't update user im prefs."
-msgstr "Non poteva actualisar le datos del usator."
+msgstr "Non poteva actualisar le preferentias de MI del usator."
 
 #. TRANS: Message given after successfully removing a registered Instant Messaging address.
-#: actions/imsettings.php:451
 msgid "The IM address was removed."
 msgstr "Le adresse de messageria instantanee ha essite removite."
 
 #. TRANS: Title for all but the first page of the inbox page.
 #. TRANS: %1$s is the user's nickname, %2$s is the page number.
-#: actions/inbox.php:59
 #, php-format
 msgid "Inbox for %1$s - page %2$d"
 msgstr "Cassa de entrata de %1$s - pagina %2$d"
 
 #. TRANS: Title for the first page of the inbox page.
 #. TRANS: %s is the user's nickname.
-#: actions/inbox.php:64
 #, php-format
 msgid "Inbox for %s"
 msgstr "Cassa de entrata de %s"
 
 #. TRANS: Instructions for user inbox page.
-#: actions/inbox.php:106
 msgid "This is your inbox, which lists your incoming private messages."
 msgstr ""
 "Isto es tu cassa de entrata, que lista le messages private que tu ha "
 "recipite."
 
 #. TRANS: Client error displayed when trying to sent invites while they have been disabled.
-#: actions/invite.php:41
 msgid "Invites have been disabled."
 msgstr "Le invitationes ha essite disactivate."
 
 #. TRANS: Client error displayed when trying to sent invites while not logged in.
 #. TRANS: %s is the StatusNet site name.
-#: actions/invite.php:45
 #, php-format
 msgid "You must be logged in to invite other users to use %s."
 msgstr "Tu debe aperir un session pro invitar altere usatores a usar %s."
 
 #. TRANS: Form validation message when providing an e-mail address that does not validate.
 #. TRANS: %s is an invalid e-mail address.
-#: actions/invite.php:78
 #, php-format
 msgid "Invalid email address: %s."
 msgstr "Adresse de e-mail invalide: %s."
 
 #. TRANS: Page title when invitations have been sent.
-#: actions/invite.php:117
 msgid "Invitations sent"
 msgstr "Invitationes inviate"
 
 #. TRANS: Page title when inviting potential users.
-#: actions/invite.php:120
 msgid "Invite new users"
 msgstr "Invitar nove usatores"
 
@@ -3392,7 +2704,6 @@ msgstr "Invitar nove usatores"
 #. TRANS: is already subscribed to one or more users with the given e-mail address(es).
 #. TRANS: Plural form is based on the number of reported already subscribed e-mail addresses.
 #. TRANS: Followed by a bullet list.
-#: actions/invite.php:140
 msgid "You are already subscribed to this user:"
 msgid_plural "You are already subscribed to these users:"
 msgstr[0] "Tu es ja subscribite a iste usator:"
@@ -3400,7 +2711,6 @@ msgstr[1] "Tu es ja subscribite a iste usatores:"
 
 #. TRANS: Used as list item for already subscribed users (%1$s is nickname, %2$s is e-mail address).
 #. TRANS: Used as list item for already registered people (%1$s is nickname, %2$s is e-mail address).
-#: actions/invite.php:146 actions/invite.php:160
 #, php-format
 msgctxt "INVITE"
 msgid "%1$s (%2$s)"
@@ -3409,7 +2719,6 @@ msgstr "%1$s (%2$s)"
 #. TRANS: Message displayed inviting users to use a StatusNet site while the invited user
 #. TRANS: already uses a this StatusNet site. Plural form is based on the number of
 #. TRANS: reported already present people. Followed by a bullet list.
-#: actions/invite.php:154
 msgid "This person is already a user and you were automatically subscribed:"
 msgid_plural ""
 "These people are already users and you were automatically subscribed to them:"
@@ -3422,7 +2731,6 @@ msgstr[1] ""
 #. TRANS: Message displayed inviting users to use a StatusNet site. Plural form is
 #. TRANS: based on the number of invitations sent. Followed by a bullet list of
 #. TRANS: e-mail addresses to which invitations were sent.
-#: actions/invite.php:168
 msgid "Invitation sent to the following person:"
 msgid_plural "Invitations sent to the following people:"
 msgstr[0] "Invitation inviate al sequente persona:"
@@ -3430,7 +2738,6 @@ msgstr[1] "Invitationes inviate al sequente personas:"
 
 #. TRANS: Generic message displayed after sending out one or more invitations to
 #. TRANS: people to join a StatusNet site.
-#: actions/invite.php:178
 msgid ""
 "You will be notified when your invitees accept the invitation and register "
 "on the site. Thanks for growing the community!"
@@ -3439,34 +2746,29 @@ msgstr ""
 "registra in le sito. Gratias pro facer crescer le communitate!"
 
 #. TRANS: Form instructions.
-#: actions/invite.php:191
 msgid ""
 "Use this form to invite your friends and colleagues to use this service."
 msgstr ""
 "Usa iste formulario pro invitar tu amicos e collegas a usar iste servicio."
 
 #. TRANS: Field label for a list of e-mail addresses.
-#: actions/invite.php:218
 msgid "Email addresses"
 msgstr "Adresses de e-mail"
 
 #. TRANS: Tooltip for field label for a list of e-mail addresses.
-#: actions/invite.php:221
 msgid "Addresses of friends to invite (one per line)."
 msgstr "Adresses de amicos a invitar (un per linea)."
 
 #. TRANS: Field label for a personal message to send to invitees.
-#: actions/invite.php:225
 msgid "Personal message"
 msgstr "Message personal"
 
 #. TRANS: Tooltip for field label for a personal message to send to invitees.
-#: actions/invite.php:228
 msgid "Optionally add a personal message to the invitation."
 msgstr "Si tu vole, adde un message personal al invitation."
 
 #. TRANS: Send button for inviting friends
-#: actions/invite.php:232
+#. TRANS: Button text for sending notice.
 msgctxt "BUTTON"
 msgid "Send"
 msgstr "Inviar"
@@ -3474,7 +2776,6 @@ msgstr "Inviar"
 #. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral
 #. TRANS: singular 3rd-person pronoun in English. %1$s is the inviting user, $2$s is
 #. TRANS: the StatusNet sitename.
-#: actions/invite.php:264
 #, php-format
 msgid "%1$s has invited you to join them on %2$s"
 msgstr "%1$s te ha invitate a accompaniar le/la in %2$s"
@@ -3484,7 +2785,6 @@ msgstr "%1$s te ha invitate a accompaniar le/la in %2$s"
 #. TRANS: StatusNet sitename, %3$s is the site URL, %4$s is the personal message from the
 #. TRANS: inviting user, %s%5 a link to the timeline for the inviting user, %s$6 is a link
 #. TRANS: to register with the StatusNet site.
-#: actions/invite.php:271
 #, php-format
 msgid ""
 "%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -3542,50 +2842,44 @@ msgstr ""
 "Sincermente, %2$s\n"
 
 #. TRANS: Client error displayed when trying to join a group while not logged in.
-#: actions/joingroup.php:59
 msgid "You must be logged in to join a group."
 msgstr "Tu debe aperir un session pro facer te membro de un gruppo."
 
 #. TRANS: Title for join group page after joining.
-#: actions/joingroup.php:148
 #, php-format
 msgctxt "TITLE"
 msgid "%1$s joined group %2$s"
 msgstr "%1$s se jungeva al gruppo %2$s"
 
 #. TRANS: Client error displayed when trying to leave a group while not logged in.
-#: actions/leavegroup.php:59
 msgid "You must be logged in to leave a group."
 msgstr "Tu debe aperir un session pro quitar un gruppo."
 
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
-#: actions/leavegroup.php:103 lib/command.php:398
 msgid "You are not a member of that group."
 msgstr "Tu non es membro de iste gruppo."
 
 #. TRANS: Title for leave group page after leaving.
-#: actions/leavegroup.php:142
 #, php-format
 msgctxt "TITLE"
 msgid "%1$s left group %2$s"
 msgstr "%1$s quitava le gruppo %2$s"
 
 #. TRANS: User admin panel title
-#: actions/licenseadminpanel.php:55
 msgctxt "TITLE"
 msgid "License"
 msgstr "Licentia"
 
-#: actions/licenseadminpanel.php:65
+#. TRANS: Form instructions for the site license admin panel.
 msgid "License for this StatusNet site"
 msgstr "Licentia pro iste sito StatusNet"
 
-#: actions/licenseadminpanel.php:134
+#. TRANS: Client error displayed selecting an invalid license in the license admin panel.
 msgid "Invalid license selection."
 msgstr "Selection de licentia invalide."
 
-#: actions/licenseadminpanel.php:144
+#. TRANS: Client error displayed when not specifying an owner for the all rights reserved license in the license admin panel.
 msgid ""
 "You must specify the owner of the content when using the All Rights Reserved "
 "license."
@@ -3593,135 +2887,136 @@ msgstr ""
 "Tu debe specificar le proprietario del contento si tu usa le licentia \"Tote "
 "derectos reservate\"."
 
-#: actions/licenseadminpanel.php:151
+#. TRANS: Client error displayed selecting a too long license title in the license admin panel.
 msgid "Invalid license title. Maximum length is 255 characters."
 msgstr "Titulo de licentia invalide. Longitude maximal es 255 characteres."
 
-#: actions/licenseadminpanel.php:163
+#. TRANS: Client error displayed specifying an invalid license URL in the license admin panel.
 msgid "Invalid license URL."
 msgstr "URL de licentia invalide."
 
-#: actions/licenseadminpanel.php:166
+#. TRANS: Client error displayed specifying an invalid license image URL in the license admin panel.
 msgid "Invalid license image URL."
 msgstr "URL de imagine de licentia invalide."
 
-#: actions/licenseadminpanel.php:174
+#. TRANS: Client error displayed specifying an invalid license URL in the license admin panel.
 msgid "License URL must be blank or a valid URL."
 msgstr "Le URL de licentia debe esser vacue o un URL valide."
 
-#: actions/licenseadminpanel.php:182
+#. TRANS: Client error displayed specifying an invalid license image URL in the license admin panel.
 msgid "License image must be blank or valid URL."
 msgstr "Le imagine de licentia debe esser vacue o un URL valide."
 
-#: actions/licenseadminpanel.php:232
+#. TRANS: Form legend in the license admin panel.
 msgid "License selection"
 msgstr "Selection de licentia"
 
-#: actions/licenseadminpanel.php:238
+#. TRANS: License option in the license admin panel.
 msgid "Private"
 msgstr "Private"
 
-#: actions/licenseadminpanel.php:239
+#. TRANS: License option in the license admin panel.
 msgid "All Rights Reserved"
 msgstr "Tote le derectos reservate"
 
-#: actions/licenseadminpanel.php:240
+#. TRANS: License option in the license admin panel.
 msgid "Creative Commons"
 msgstr "Creative Commons"
 
-#: actions/licenseadminpanel.php:245
+#. TRANS: Dropdown field label in the license admin panel.
 msgid "Type"
 msgstr "Typo"
 
-#: actions/licenseadminpanel.php:247
-msgid "Select license"
+#. TRANS: Dropdown field instructions in the license admin panel.
+#, fuzzy
+msgid "Select a license."
 msgstr "Selige licentia"
 
-#: actions/licenseadminpanel.php:261
+#. TRANS: Form legend in the license admin panel.
 msgid "License details"
 msgstr "Detalios de licentia"
 
-#: actions/licenseadminpanel.php:267
+#. TRANS: Field label in the license admin panel.
 msgid "Owner"
 msgstr "Proprietario"
 
-#: actions/licenseadminpanel.php:268
+#. TRANS: Field title in the license admin panel.
 msgid "Name of the owner of the site's content (if applicable)."
 msgstr "Nomine del proprietario del contento del sito (si applicabile)."
 
-#: actions/licenseadminpanel.php:276
+#. TRANS: Field label in the license admin panel.
 msgid "License Title"
 msgstr "Titulo de licentia"
 
-#: actions/licenseadminpanel.php:277
+#. TRANS: Field title in the license admin panel.
 msgid "The title of the license."
 msgstr "Le titulo del licentia."
 
-#: actions/licenseadminpanel.php:285
+#. TRANS: Field label in the license admin panel.
 msgid "License URL"
 msgstr "URL del licentia"
 
-#: actions/licenseadminpanel.php:286
+#. TRANS: Field title in the license admin panel.
 msgid "URL for more information about the license."
 msgstr "URL pro ulterior informationes super le licentia."
 
-#: actions/licenseadminpanel.php:293
+#. TRANS: Field label in the license admin panel.
 msgid "License Image URL"
 msgstr "URL del imagine del licentia"
 
-#: actions/licenseadminpanel.php:294
+#. TRANS: Field title in the license admin panel.
 msgid "URL for an image to display with the license."
 msgstr "Le URL de un imagine a monstrar con le licentia."
 
-#. TRANS: Submit button title.
-#: actions/licenseadminpanel.php:311 actions/sessionsadminpanel.php:199
-#: actions/siteadminpanel.php:292 actions/snapshotadminpanel.php:245
-#: actions/tagother.php:133 lib/applicationeditform.php:357
-msgid "Save"
-msgstr "Salveguardar"
-
-#: actions/licenseadminpanel.php:311
-msgid "Save license settings"
+#. TRANS: Button title in the license admin panel.
+#, fuzzy
+msgid "Save license settings."
 msgstr "Salveguardar configurationes de licentia"
 
+#. TRANS: Client error displayed when trying to log in while already logged in.
 #. TRANS: Client error displayed trying to use "one time password login" when already logged in.
-#: actions/login.php:97 actions/otp.php:62 actions/register.php:130
 msgid "Already logged in."
 msgstr "Tu es jam authenticate."
 
-#: actions/login.php:125
+#. TRANS: Form validation error displayed when trying to log in with incorrect credentials.
 msgid "Incorrect username or password."
 msgstr "Nomine de usator o contrasigno incorrecte."
 
+#. TRANS: Server error displayed when during login a server error occurs.
 #. TRANS: Server error displayed when a user object could not be created trying to login using "one time password login".
-#: actions/login.php:131 actions/otp.php:127
 msgid "Error setting user. You are probably not authorized."
 msgstr ""
 "Error de acceder al conto de usator. Tu probabilemente non es autorisate."
 
-#: actions/login.php:185 actions/login.php:236 lib/action.php:598
+#. TRANS: Page title for login page.
 msgid "Login"
 msgstr "Aperir session"
 
-#: actions/login.php:222
+#. TRANS: Form legend on login page.
 msgid "Login to site"
 msgstr "Authenticar te a iste sito"
 
-#: actions/login.php:231 actions/register.php:469
+#. TRANS: Checkbox label label on login page.
 msgid "Remember me"
 msgstr "Memorar me"
 
-#: actions/login.php:232 actions/register.php:471
+#. TRANS: Checkbox title on login page.
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 "Aperir session automaticamente in le futuro; non pro computatores usate in "
 "commun!"
 
-#: actions/login.php:241
+#. TRANS: Button text for log in on login page.
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Login"
+msgstr "Aperir session"
+
+#. TRANS: Link text for link to "reset password" on login page.
 msgid "Lost or forgotten password?"
 msgstr "Contrasigno perdite o oblidate?"
 
-#: actions/login.php:259
+#. TRANS: Form instructions on login page before being able to change user settings.
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -3729,137 +3024,133 @@ msgstr ""
 "Pro motivos de securitate, per favor re-entra tu nomine de usator e "
 "contrasigno ante de cambiar tu configurationes."
 
-#: actions/login.php:263
+#. TRANS: Form instructions on login page.
 msgid "Login with your username and password."
 msgstr "Aperi un session con tu nomine de usator e contrasigno."
 
-#: actions/login.php:266
+#. TRANS: Form instructions on login page. This message contains Markdown links in the form [Link text](Link).
+#. TRANS: %%action.register%% is a link to the registration page.
 #, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
 msgstr ""
 "Non ha ancora un nomine de usator? [Crea](%%action.register%%) un nove conto."
 
-#: actions/makeadmin.php:92
+#. TRANS: Client error displayed when trying to make another user admin on the Make Admin page while not an admin.
 msgid "Only an admin can make another user an admin."
 msgstr "Solmente un administrator pote facer un altere usator administrator."
 
-#: actions/makeadmin.php:96
+#. TRANS: Client error displayed when trying to make another user admin on the Make Admin page who already is admin.
+#. TRANS: %1$s is the user that is already admin, %2$s is the group user is already admin for.
 #, php-format
 msgid "%1$s is already an admin for group \"%2$s\"."
 msgstr "%1$s es ja administrator del gruppo \"%2$s\"."
 
-#: actions/makeadmin.php:133
+#. TRANS: Server error displayed when trying to make another user admin on the Make Admin page fails
+#. TRANS: because the group membership record could not be gotten.
+#. TRANS: %1$s is the to be admin user, %2$s is the group user should be admin for.
 #, php-format
 msgid "Can't get membership record for %1$s in group %2$s."
 msgstr "Non pote obtener le datos del membrato de %1$s in le gruppo %2$s."
 
-#: actions/makeadmin.php:146
+#. TRANS: Server error displayed when trying to make another user admin on the Make Admin page fails
+#. TRANS: because the group adminship record coud not be saved properly.
+#. TRANS: %1$s is the to be admin user, %2$s is the group user is already admin for.
 #, php-format
 msgid "Can't make %1$s an admin for group %2$s."
 msgstr "Non pote facer %1$s administrator del gruppo %2$s."
 
-#: actions/microsummary.php:69
+#. TRANS: Client error displayed trying to make a micro summary without providing a status.
 msgid "No current status."
 msgstr "Nulle stato actual."
 
 #. TRANS: This is the title of the form for adding a new application.
-#: actions/newapplication.php:52
 msgid "New application"
 msgstr "Nove application"
 
 #. TRANS: Client error displayed trying to add a new application while not logged in.
-#: actions/newapplication.php:64
 msgid "You must be logged in to register an application."
 msgstr "Tu debe aperir un session pro registrar un application."
 
 #. TRANS: Form instructions for registering a new application.
-#: actions/newapplication.php:147
 msgid "Use this form to register a new application."
 msgstr "Usa iste formulario pro registrar un nove application."
 
 #. TRANS: Validation error shown when not providing a source URL in the "New application" form.
-#: actions/newapplication.php:189
 msgid "Source URL is required."
 msgstr "Le URL de origine es requirite."
 
 #. TRANS: Server error displayed when an application could not be registered in the database through the "New application" form.
-#: actions/newapplication.php:279 actions/newapplication.php:289
 msgid "Could not create application."
 msgstr "Non poteva crear application."
 
 #. TRANS: Title for form to create a group.
-#: actions/newgroup.php:53
 msgid "New group"
 msgstr "Nove gruppo"
 
 #. TRANS: Client exception thrown when a user tries to create a group while banned.
-#: actions/newgroup.php:73 classes/User_group.php:485
 msgid "You are not allowed to create groups on this site."
 msgstr "Tu non ha le permission de crear gruppos in iste sito."
 
 #. TRANS: Form instructions for group create form.
-#: actions/newgroup.php:117
 msgid "Use this form to create a new group."
 msgstr "Usa iste formulario pro crear un nove gruppo."
 
-#. TRANS: Group create form validation error.
-#: actions/newgroup.php:200
-msgid "Alias cannot be the same as nickname."
-msgstr "Le alias non pote esser identic al pseudonymo."
-
-#: actions/newmessage.php:71 actions/newmessage.php:234
+#. TRANS: Page title for new direct message page.
+#. TRANS: Page title on page for sending a direct message.
 msgid "New message"
 msgstr "Nove message"
 
-#. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
-#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:513
-msgid "You can't send a message to this user."
+#. TRANS: Client error displayed trying to send a direct message to a user while sender and
+#. TRANS: receiver are not subscribed to each other.
+#, fuzzy
+msgid "You cannot send a message to this user."
 msgstr "Tu non pote inviar un message a iste usator."
 
+#. TRANS: Form validator error displayed trying to send a direct message without content.
+#. TRANS: Client error displayed trying to send a notice without content.
 #. TRANS: Command exception text shown when trying to send a direct message to another user without content.
 #. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
-#: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:490
-#: lib/command.php:593
 msgid "No content!"
 msgstr "Nulle contento!"
 
-#: actions/newmessage.php:161
+#. TRANS: Form validation error displayed trying to send a direct message without specifying a recipient.
 msgid "No recipient specified."
 msgstr "Nulle destinatario specificate."
 
+#. TRANS: Client error displayed trying to send a direct message to self.
 #. TRANS: Error text shown when trying to send a direct message to self.
-#: actions/newmessage.php:167 lib/command.php:517
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr "Non invia un message a te mesme; il suffice susurrar lo discretemente."
 
-#: actions/newmessage.php:184
+#. TRANS: Page title after sending a direct message.
 msgid "Message sent"
 msgstr "Message inviate"
 
+#. TRANS: Confirmation text after sending a direct message.
+#. TRANS: %s is the direct message recipient.
 #. TRANS: Message given have sent a direct message to another user.
 #. TRANS: %s is the name of the other user.
-#: actions/newmessage.php:188 lib/command.php:525
 #, php-format
 msgid "Direct message to %s sent."
 msgstr "Message directe a %s inviate."
 
-#: actions/newmessage.php:213 actions/newnotice.php:264
+#. TRANS: Page title after an AJAX error occurred on the "send direct message" page.
+#. TRANS: Page title after an AJAX error occurs on the send notice page.
 msgid "Ajax Error"
 msgstr "Error de Ajax"
 
-#: actions/newnotice.php:69
+#. TRANS: Page title for sending a new notice.
 msgid "New notice"
 msgstr "Nove nota"
 
-#: actions/newnotice.php:230
+#. TRANS: Page title after sending a notice.
 msgid "Notice posted"
 msgstr "Nota publicate"
 
 #. TRANS: Instructions for Notice search page.
 #. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/noticesearch.php:69
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -3869,20 +3160,17 @@ msgstr ""
 "spatios; illos debe haber al minus 3 characteres."
 
 #. TRANS: Title of the page where users can search for notices.
-#: actions/noticesearch.php:80
 msgid "Text search"
 msgstr "Recerca de texto"
 
 #. TRANS: Test in RSS notice search.
 #. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearch.php:95
 #, php-format
 msgid "Search results for \"%1$s\" on %2$s"
 msgstr "Resultatos del recerca de \"%1$s\" in %2$s"
 
 #. TRANS: Text for logged in users making a query for notices without results.
 #. TRANS: This message contains a Markdown link.
-#: actions/noticesearch.php:128
 #, php-format
 msgid ""
 "Be the first to [post on this topic](%%%%action.newnotice%%%%?"
@@ -3893,7 +3181,6 @@ msgstr ""
 
 #. TRANS: Text for not logged in users making a query for notices without results.
 #. TRANS: This message contains Markdown links.
-#: actions/noticesearch.php:133
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and be the first to "
@@ -3904,19 +3191,17 @@ msgstr ""
 "status_textarea=%s)?"
 
 #. TRANS: RSS notice search feed title. %s is the query.
-#: actions/noticesearchrss.php:95
 #, php-format
 msgid "Updates with \"%s\""
 msgstr "Actualisationes con \"%s\""
 
 #. TRANS: RSS notice search feed description.
 #. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearchrss.php:99
 #, php-format
 msgid "Updates matching search term \"%1$s\" on %2$s."
 msgstr "Actualisationes correspondente al termino de recerca \"%1$s\" in %2$s."
 
-#: actions/nudge.php:85
+#. TRANS: Client error displayed trying to nudge a user that cannot be nudged.
 msgid ""
 "This user doesn't allow nudges or hasn't confirmed or set their email "
 "address yet."
@@ -3924,60 +3209,51 @@ msgstr ""
 "Iste usator non accepta pulsatas o non ha ancora confirmate o fornite su "
 "adresse de e-mail."
 
-#: actions/nudge.php:94
+#. TRANS: Page title after sending a nudge.
 msgid "Nudge sent"
 msgstr "Pulsata inviate"
 
-#: actions/nudge.php:97
+#. TRANS: Confirmation text after sending a nudge.
 msgid "Nudge sent!"
 msgstr "Pulsata inviate!"
 
 #. TRANS: Message displayed to an anonymous user trying to view OAuth application list.
-#: actions/oauthappssettings.php:57
 msgid "You must be logged in to list your applications."
 msgstr "Tu debe aperir un session pro listar tu applicationes."
 
 #. TRANS: Page title for OAuth applications
-#: actions/oauthappssettings.php:73
 msgid "OAuth applications"
 msgstr "Applicationes OAuth"
 
 #. TRANS: Page instructions for OAuth applications
-#: actions/oauthappssettings.php:85
 msgid "Applications you have registered"
 msgstr "Applicationes que tu ha registrate"
 
 #. TRANS: Empty list message on page with OAuth applications.
-#: actions/oauthappssettings.php:138
 #, php-format
 msgid "You have not registered any applications yet."
 msgstr "Tu non ha ancora registrate alcun application."
 
 #. TRANS: Title for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:69
 msgid "Connected applications"
 msgstr "Applicationes connectite"
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:80
 msgid "The following connections exist for your account."
 msgstr "Le sequente connexiones existe pro tu conto."
 
 #. TRANS: Client error when trying to revoke access for an application while not being a user of it.
-#: actions/oauthconnectionssettings.php:165
 msgid "You are not a user of that application."
 msgstr "Tu non es usator de iste application."
 
 #. TRANS: Client error when revoking access has failed for some reason.
 #. TRANS: %s is the application ID revoking access failed for.
-#: actions/oauthconnectionssettings.php:180
 #, php-format
 msgid "Unable to revoke access for application: %s."
 msgstr "Impossibile revocar le accesso del application: %s."
 
 #. TRANS: Success message after revoking access for an application.
 #. TRANS: %1$s is the application name, %2$s is the first part of the user token.
-#: actions/oauthconnectionssettings.php:199
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -3987,14 +3263,12 @@ msgstr ""
 "comenciante con %2$s."
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:210
 msgid "You have not authorized any applications to use your account."
 msgstr "Tu non ha autorisate alcun application a usar tu conto."
 
 #. TRANS: Note for developers in the OAuth connection settings form.
 #. TRANS: This message contains a Markdown link. Do not separate "](".
 #. TRANS: %s is the URL to the OAuth settings.
-#: actions/oauthconnectionssettings.php:230
 #, php-format
 msgid ""
 "Are you a developer? [Register an OAuth client application](%s) to use with "
@@ -4003,439 +3277,358 @@ msgstr ""
 "Es tu un programmator? [Registra un application cliente OAuth](%s) a usar "
 "con iste installation de StatusNet."
 
-#: actions/oembed.php:64
+#. TRANS: Server error displayed in oEmbed action when path not found.
+#. TRANS: %s is a path.
 #, php-format
 msgid "\"%s\" not found."
 msgstr "\"%s\" non trovate."
 
-#: actions/oembed.php:76
+#. TRANS: Server error displayed in oEmbed action when notice not found.
+#. TRANS: %s is a notice.
 #, php-format
 msgid "Notice %s not found."
 msgstr "Nota %s non trovate."
 
-#: actions/oembed.php:80 actions/shownotice.php:100
+#. TRANS: Server error displayed in oEmbed action when notice has not profile.
 msgid "Notice has no profile."
 msgstr "Le nota ha nulle profilo."
 
-#: actions/oembed.php:83 actions/shownotice.php:172
+#. TRANS: oEmbed title. %1$s is the author name, %2$s is the creation date.
 #, php-format
 msgid "%1$s's status on %2$s"
 msgstr "Le stato de %1$s in %2$s"
 
-#: actions/oembed.php:95
+#. TRANS: Server error displayed in oEmbed action when attachment not found.
+#. TRANS: %d is an attachment ID.
 #, php-format
 msgid "Attachment %s not found."
 msgstr "Annexo %s non trovate."
 
-#: actions/oembed.php:136
+#. TRANS: Server error displayed in oEmbed request when a path is not supported.
+#. TRANS: %s is a path.
 #, php-format
 msgid "\"%s\" not supported for oembed requests."
 msgstr "\"%s\" non es supportate pro le requestas \"oembed\"."
 
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
-#: actions/oembed.php:168
 #, php-format
 msgid "Content type %s not supported."
 msgstr "Le typo de contento %s non es supportate."
 
 #. TRANS: Error message displaying attachments. %s is the site's base URL.
-#: actions/oembed.php:172
 #, php-format
 msgid "Only %s URLs over plain HTTP please."
 msgstr "Solmente le URLs %s es permittite super HTTP simple."
 
+#. TRANS: Server error displayed in oEmbed action when request specifies an unsupported data format.
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1207
-#: lib/apiaction.php:1234 lib/apiaction.php:1369
 msgid "Not a supported data format."
 msgstr "Formato de datos non supportate."
 
 #. TRANS: ShortName in the OpenSearch interface when trying to find users.
-#: actions/opensearch.php:64
 msgid "People Search"
 msgstr "Recerca de personas"
 
-#: actions/opensearch.php:68
+#. TRANS: ShortName in the OpenSearch interface when trying to find notices.
 msgid "Notice Search"
 msgstr "Rercerca de notas"
 
 #. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
-#: actions/otp.php:70
 msgid "No user ID specified."
 msgstr "Nulle identificator de usator specificate."
 
 #. TRANS: Client error displayed trying to use "one time password login" without specifying a login token.
-#: actions/otp.php:86
 msgid "No login token specified."
 msgstr "Nulle indicio de identification specificate."
 
 #. TRANS: Client error displayed trying to use "one time password login" without requesting a login token.
-#: actions/otp.php:94
 msgid "No login token requested."
 msgstr "Nulle indicio de identification requestate."
 
 #. TRANS: Client error displayed trying to use "one time password login" while specifying an invalid login token.
-#: actions/otp.php:100
 msgid "Invalid login token specified."
 msgstr "Indicio de identification invalide specificate."
 
 #. TRANS: Client error displayed trying to use "one time password login" while specifying an expired login token.
-#: actions/otp.php:110
 msgid "Login token expired."
 msgstr "Le indicio de identification ha expirate."
 
 #. TRANS: Title for outbox for any but the fist page.
 #. TRANS: %1$s is the user nickname, %2$d is the page number.
-#: actions/outbox.php:57
 #, php-format
 msgid "Outbox for %1$s - page %2$d"
 msgstr "Cassa de exito de %1$s - pagina %2$d"
 
 #. TRANS: Title for first page of outbox.
-#: actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
 msgstr "Cassa de exito pro %s"
 
 #. TRANS: Instructions for outbox.
-#: actions/outbox.php:103
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr ""
 "Isto es tu cassa de exito, que lista le messages private que tu ha inviate."
 
-#: actions/passwordsettings.php:58
 msgid "Change password"
 msgstr "Cambiar contrasigno"
 
-#: actions/passwordsettings.php:69
 msgid "Change your password."
 msgstr "Cambiar tu contrasigno."
 
 #. TRANS: Fieldset legend for password reset form.
-#: actions/passwordsettings.php:96 actions/recoverpassword.php:251
 msgid "Password change"
 msgstr "Cambio del contrasigno"
 
-#: actions/passwordsettings.php:104
 msgid "Old password"
 msgstr "Ancian contrasigno"
 
 #. TRANS: Field label for password reset form.
-#: actions/passwordsettings.php:108 actions/recoverpassword.php:256
 msgid "New password"
 msgstr "Nove contrasigno"
 
-#: actions/passwordsettings.php:109 actions/register.php:416
 msgid "6 or more characters."
 msgstr "6 o plus characteres."
 
 #. TRANS: Ttile for field label for password reset form where the password has to be typed again.
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:264
-#: actions/register.php:420
 msgid "Same as password above."
 msgstr "Identic al contrasigno hic supra."
 
-#: actions/passwordsettings.php:117
 msgid "Change"
 msgstr "Cambiar"
 
-#: actions/passwordsettings.php:153 actions/register.php:223
 msgid "Password must be 6 or more characters."
 msgstr "Le contrasigno debe haber al minus 6 characteres."
 
-#: actions/passwordsettings.php:156 actions/register.php:226
 msgid "Passwords don't match."
 msgstr "Le contrasignos non corresponde."
 
-#: actions/passwordsettings.php:164
 msgid "Incorrect old password"
 msgstr "Ancian contrasigno incorrecte"
 
-#: actions/passwordsettings.php:180
 msgid "Error saving user; invalid."
 msgstr "Error de salveguardar le usator; invalide."
 
 #. TRANS: Reset password form validation error message.
-#: actions/passwordsettings.php:185 actions/recoverpassword.php:418
 msgid "Cannot save new password."
 msgstr "Non pote salveguardar le nove contrasigno."
 
-#: actions/passwordsettings.php:191
 msgid "Password saved."
 msgstr "Contrasigno salveguardate."
 
 #. TRANS: Title for Paths admin panel.
 #. TRANS: Menu item for site administration
-#: actions/pathsadminpanel.php:58 lib/adminpanelaction.php:371
 msgid "Paths"
 msgstr "Camminos"
 
 #. TRANS: Form instructions for Path admin panel.
-#: actions/pathsadminpanel.php:69
 msgid "Path and server settings for this StatusNet site"
 msgstr "Configuration de cammino e servitor pro iste sito StatusNet"
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the directory that could not be read from.
-#: actions/pathsadminpanel.php:155
 #, php-format
 msgid "Theme directory not readable: %s."
 msgstr "Directorio de thema non legibile: %s."
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the avatar directory that could not be written to.
-#: actions/pathsadminpanel.php:163
 #, php-format
 msgid "Avatar directory not writable: %s."
 msgstr "Directorio de avatar non scriptibile: %s."
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the background directory that could not be written to.
-#: actions/pathsadminpanel.php:171
 #, php-format
 msgid "Background directory not writable: %s."
 msgstr "Directorio de fundo non scriptibile: %s."
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the locales directory that could not be read from.
-#: actions/pathsadminpanel.php:181
 #, php-format
 msgid "Locales directory not readable: %s."
 msgstr "Directorio de localitates non scriptibile: %s."
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the SSL server URL that is too long.
-#: actions/pathsadminpanel.php:189
 msgid "Invalid SSL server. The maximum length is 255 characters."
 msgstr "Servitor SSL invalide. Le longitude maximal es 255 characteres."
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:235 actions/siteadminpanel.php:58
 msgid "Site"
 msgstr "Sito"
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:241 actions/pathsadminpanel.php:279
-#: actions/pathsadminpanel.php:370 actions/pathsadminpanel.php:425
 msgid "Server"
 msgstr "Servitor"
 
-#: actions/pathsadminpanel.php:242
 msgid "Site's server hostname."
 msgstr "Nomine de host del servitor del sito."
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:248 actions/pathsadminpanel.php:288
-#: actions/pathsadminpanel.php:379 actions/pathsadminpanel.php:434
 msgid "Path"
 msgstr "Cammino"
 
-#: actions/pathsadminpanel.php:249
 msgid "Site path."
 msgstr "Cammino del sito."
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:255
 msgid "Locale directory"
 msgstr "Directorio de localisation"
 
-#: actions/pathsadminpanel.php:256
 msgid "Directory path to locales."
 msgstr "Cammino al directorio de localisation."
 
 #. TRANS: Checkbox label in Paths admin panel.
-#: actions/pathsadminpanel.php:263
 msgid "Fancy URLs"
 msgstr "URLs de luxo"
 
-#: actions/pathsadminpanel.php:265
 msgid "Use fancy (more readable and memorable) URLs?"
 msgstr "Usar URLs de luxo (plus legibile e memorabile)?"
 
-#: actions/pathsadminpanel.php:272
 msgid "Theme"
 msgstr "Thema"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:281
 msgid "Server for themes."
 msgstr "Servitor pro apparentias."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:290
 msgid "Web path to themes."
 msgstr "Cammino web verso apparentias."
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:297 actions/pathsadminpanel.php:388
-#: actions/pathsadminpanel.php:443 actions/pathsadminpanel.php:495
 msgid "SSL server"
 msgstr "Servitor SSL"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:299
 msgid "SSL server for themes (default: SSL server)."
 msgstr "Servitor SSL pro apparentias (predefinition: servitor SSL)."
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:306 actions/pathsadminpanel.php:397
-#: actions/pathsadminpanel.php:452
 msgid "SSL path"
 msgstr "Cammino SSL"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:308
 msgid "SSL path to themes (default: /theme/)."
 msgstr "Cammino SSL verso apparentias (predefinition: /theme/)."
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:315 actions/pathsadminpanel.php:406
-#: actions/pathsadminpanel.php:461
 msgid "Directory"
 msgstr "Directorio"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:317
 msgid "Directory where themes are located."
 msgstr "Cammino a ubi se trova le apparentias."
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:326
 msgid "Avatars"
 msgstr "Avatares"
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:333
 msgid "Avatar server"
 msgstr "Servitor de avatares"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:335
 msgid "Server for avatars."
 msgstr "Servitor pro avatares."
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:342
 msgid "Avatar path"
 msgstr "Cammino al avatares"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:344
 msgid "Web path to avatars."
 msgstr "Cammino web verso avatares."
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:351
 msgid "Avatar directory"
 msgstr "Directorio del avatares"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:353
 msgid "Directory where avatars are located."
 msgstr "Cammino a ubi se trova le avatares."
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:364
 msgid "Backgrounds"
 msgstr "Fundos"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:372
 msgid "Server for backgrounds."
 msgstr "Servitor pro fundos de schermo."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:381
 msgid "Web path to backgrounds."
 msgstr "Cammino web verso fundos de schermo."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:390
 msgid "Server for backgrounds on SSL pages."
 msgstr "Servitor pro fundos de schermo in paginas SSL."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:399
 msgid "Web path to backgrounds on SSL pages."
 msgstr "Cammino web verso fundos de schermo in paginas SSL."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:408
 msgid "Directory where backgrounds are located."
 msgstr "Cammino a ubi se trova le fundos de schermo."
 
 #. TRANS: Fieldset legens in Paths admin panel.
-#: actions/pathsadminpanel.php:419
 msgid "Attachments"
 msgstr "Annexos"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:427
 msgid "Server for attachments."
 msgstr "Servitor pro annexos."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:436
 msgid "Web path to attachments."
 msgstr "Cammino web verso annexos."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:445
 msgid "Server for attachments on SSL pages."
 msgstr "Servitor pro annexos in paginas SSL."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:454
 msgid "Web path to attachments on SSL pages."
 msgstr "Cammino web verso annexos in paginas SSL."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:463
 msgid "Directory where attachments are located."
 msgstr "Cammino a ubi se trova le annexos."
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:472
 msgid "SSL"
 msgstr "SSL"
 
 #. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
-#: actions/pathsadminpanel.php:477 actions/snapshotadminpanel.php:202
 msgid "Never"
 msgstr "Nunquam"
 
 #. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
-#: actions/pathsadminpanel.php:479
 msgid "Sometimes"
 msgstr "Alcun vices"
 
 #. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
-#: actions/pathsadminpanel.php:481
 msgid "Always"
 msgstr "Sempre"
 
-#: actions/pathsadminpanel.php:485
 msgid "Use SSL"
 msgstr "Usar SSL"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:487
 msgid "When to use SSL."
 msgstr "Quando usar SSL."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:497
 msgid "Server to direct SSL requests to."
 msgstr "Servitor verso le qual diriger le requestas SSL."
 
 #. TRANS: Button title text to store form data in the Paths admin panel.
-#: actions/pathsadminpanel.php:514
 msgid "Save paths"
 msgstr "Salveguardar camminos"
 
 #. TRANS: Instructions for the "People search" page.
 #. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/peoplesearch.php:54
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
@@ -4445,79 +3638,66 @@ msgstr ""
 "terminos per spatios; illos debe haber 3 characteres o plus."
 
 #. TRANS: Title of a page where users can search for other users.
-#: actions/peoplesearch.php:61
 msgid "People search"
 msgstr "Recerca de personas"
 
-#: actions/peopletag.php:68
 #, php-format
 msgid "Not a valid people tag: %s."
 msgstr "Etiquetta de personas invalide: %s."
 
-#: actions/peopletag.php:142
 #, php-format
 msgid "Users self-tagged with %1$s - page %2$d"
 msgstr "Usatores auto-etiquettate con %1$s - pagina %2$d"
 
 #. TRANS: Page title for AJAX form return when a disabling a plugin.
-#: actions/plugindisable.php:69
 msgctxt "plugin"
 msgid "Disabled"
-msgstr ""
+msgstr "Disactivate"
 
 #. TRANS: Client error displayed trying to perform any request method other than POST.
 #. TRANS: Do not translate POST.
-#: actions/pluginenable.php:78 actions/subscribe.php:77
 msgid "This action only accepts POST requests."
 msgstr "Iste action accepta solmente le requestas de typo POST."
 
-#: actions/pluginenable.php:102
-#, fuzzy
 msgid "You cannot administer plugins."
-msgstr "Tu non pote deler usatores."
+msgstr "Tu non pote administrar plug-ins."
 
-#: actions/pluginenable.php:109
-#, fuzzy
 msgid "No such plugin."
-msgstr "Pagina non existe."
+msgstr "Plug-in non existe."
 
 #. TRANS: Page title for AJAX form return when enabling a plugin.
-#: actions/pluginenable.php:159
 msgctxt "plugin"
 msgid "Enabled"
-msgstr ""
+msgstr "Activate"
 
 #. TRANS: Tab and title for plugins admin panel.
 #. TRANS: Menu item for site administration
-#: actions/pluginsadminpanel.php:56 actions/version.php:191
-#: lib/adminpanelaction.php:411
 msgid "Plugins"
 msgstr "Plug-ins"
 
 #. TRANS: Instructions at top of plugin admin page.
-#: actions/pluginsadminpanel.php:68
 msgid ""
 "Additional plugins can be enabled and configured manually. See the <a href="
 "\"http://status.net/wiki/Plugins\">online plugin documentation</a> for more "
 "details."
 msgstr ""
+"Additional plug-ins pote esser activate e configurate manualmente. Vide le "
+"<a href=\"http://status.net/wiki/Plugins\">documentation in linea del plug-"
+"ins</a> pro plus detalios."
 
 #. TRANS: Admin form section header
-#: actions/pluginsadminpanel.php:84
-#, fuzzy
 msgid "Default plugins"
-msgstr "Lingua predefinite"
+msgstr "Plug-ins predefinite"
 
-#: actions/pluginsadminpanel.php:106
 msgid ""
 "All default plugins have been disabled from the site's configuration file."
 msgstr ""
+"Tote le plug-ins predefinite ha essite disactivate in le file de "
+"configuration del sito."
 
-#: actions/postnotice.php:95
 msgid "Invalid notice content."
 msgstr "Le contento del nota es invalide."
 
-#: actions/postnotice.php:101
 #, php-format
 msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’."
 msgstr ""
@@ -4525,12 +3705,10 @@ msgstr ""
 "$s’."
 
 #. TRANS: Page title for profile settings.
-#: actions/profilesettings.php:60
 msgid "Profile settings"
 msgstr "Configurationes del profilo"
 
 #. TRANS: Usage instructions for profile settings.
-#: actions/profilesettings.php:71
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
@@ -4538,37 +3716,29 @@ msgstr ""
 "gente pote facer plus de te."
 
 #. TRANS: Profile settings form legend.
-#: actions/profilesettings.php:99
 msgid "Profile information"
 msgstr "Informationes del profilo"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:110 actions/register.php:412
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr "1-64 minusculas o numeros, sin punctuation o spatios."
 
 #. TRANS: Field label in form for profile settings.
-#: actions/profilesettings.php:114 actions/register.php:434
-#: lib/groupeditform.php:150
 msgid "Full name"
 msgstr "Nomine complete"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:119 actions/register.php:439
-#: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "Pagina personal"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:122 actions/register.php:441
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr "URL de tu pagina personal, blog o profilo in un altere sito."
 
 #. TRANS: Tooltip for field label in form for profile settings. Plural
 #. TRANS: is decided by the number of characters available for the
 #. TRANS: biography (%d).
-#: actions/profilesettings.php:130 actions/register.php:450
 #, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4576,41 +3746,31 @@ msgstr[0] "Describe te e tu interesses in %d character"
 msgstr[1] "Describe te e tu interesses in %d characteres"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:136 actions/register.php:455
 msgid "Describe yourself and your interests"
 msgstr "Describe te e tu interesses"
 
 #. TRANS: Text area label in form for profile settings where users can provide.
 #. TRANS: their biography.
-#: actions/profilesettings.php:140 actions/register.php:457
 msgid "Bio"
 msgstr "Bio"
 
 #. TRANS: Field label in form for profile settings.
-#: actions/profilesettings.php:146 actions/register.php:462
-#: lib/groupeditform.php:173
 msgid "Location"
 msgstr "Loco"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:149
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Ubi tu es, como \"Citate, Stato (o Region), Pais\""
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:154
 msgid "Share my current location when posting notices"
 msgstr "Divulgar mi loco actual quando io publica notas"
 
 #. TRANS: Field label in form for profile settings.
-#: actions/profilesettings.php:162 actions/tagother.php:128
-#: actions/tagother.php:188 lib/subscriptionlist.php:104
-#: lib/subscriptionlist.php:106
 msgid "Tags"
 msgstr "Etiquettas"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:165
 msgid ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- "
 "separated."
@@ -4619,27 +3779,22 @@ msgstr ""
 "spatios."
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:170
 msgid "Language"
 msgstr "Lingua"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:172
 msgid "Preferred language."
 msgstr "Lingua preferite."
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:182
 msgid "Timezone"
 msgstr "Fuso horari"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:184
 msgid "What timezone are you normally in?"
 msgstr "In que fuso horari es tu normalmente?"
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:190
 msgid ""
 "Automatically subscribe to whoever subscribes to me (best for non-humans)."
 msgstr ""
@@ -4649,7 +3804,6 @@ msgstr ""
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Plural form is used based on the maximum number of allowed
 #. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:259 actions/register.php:214
 #, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4657,81 +3811,65 @@ msgstr[0] "Bio es troppo longe (maximo %d character)."
 msgstr[1] "Bio es troppo longe (maximo %d characteres)."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:270 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr "Fuso horari non seligite."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:278
 msgid "Language is too long (maximum 50 characters)."
 msgstr "Lingua es troppo longe (maximo 50 characteres)."
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:292
 #, php-format
 msgid "Invalid tag: \"%s\"."
 msgstr "Etiquetta invalide: \"%s\"."
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:348
 msgid "Could not update user for autosubscribe."
 msgstr "Non poteva actualisar le usator pro autosubscription."
 
 #. TRANS: Server error thrown when user profile location preference settings could not be updated.
-#: actions/profilesettings.php:406
 msgid "Could not save location prefs."
 msgstr "Non poteva salveguardar le preferentias de loco."
 
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:428 actions/tagother.php:179
 msgid "Could not save tags."
 msgstr "Non poteva salveguardar etiquettas."
 
 #. TRANS: Confirmation shown when user profile settings are saved.
 #. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:437 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "Preferentias confirmate."
 
 #. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
 #. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:484 actions/restoreaccount.php:60
 msgid "Restore account"
 msgstr "Restaurar conto"
 
-#: actions/public.php:83
 #, php-format
 msgid "Beyond the page limit (%s)."
 msgstr "Ultra le limite de pagina (%s)."
 
-#: actions/public.php:92
 msgid "Could not retrieve public stream."
 msgstr "Non poteva recuperar le fluxo public."
 
-#: actions/public.php:130
 #, php-format
 msgid "Public timeline, page %d"
 msgstr "Chronologia public, pagina %d"
 
-#: actions/public.php:132 lib/publicgroupnav.php:79
 msgid "Public timeline"
 msgstr "Chronologia public"
 
-#: actions/public.php:160
 msgid "Public Stream Feed (RSS 1.0)"
 msgstr "Syndication del fluxo public (RSS 1.0)"
 
-#: actions/public.php:164
 msgid "Public Stream Feed (RSS 2.0)"
 msgstr "Syndication del fluxo public (RSS 2.0)"
 
-#: actions/public.php:168
 msgid "Public Stream Feed (Atom)"
 msgstr "Syndication del fluxo public (Atom)"
 
-#: actions/public.php:188
 #, php-format
 msgid ""
 "This is the public timeline for %%site.name%% but no one has posted anything "
@@ -4740,11 +3878,9 @@ msgstr ""
 "Isto es le chronologia public pro %%site.name%%, ma nulle persona ha ancora "
 "scribite alique."
 
-#: actions/public.php:191
 msgid "Be the first to post!"
 msgstr "Sia le prime a publicar!"
 
-#: actions/public.php:195
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post!"
@@ -4752,7 +3888,6 @@ msgstr ""
 "Proque non [registrar un conto](%%action.register%%) e devenir le prime a "
 "publicar?"
 
-#: actions/public.php:242
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -4765,7 +3900,6 @@ msgstr ""
 "[Inscribe te ora](%%action.register%%) pro condivider notas super te con "
 "amicos, familia e collegas! ([Leger plus](%%doc.help%%))"
 
-#: actions/public.php:247
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -4776,19 +3910,16 @@ msgstr ""
 "wiki/Microblog) a base del software libere [StatusNet](http://status.net/)."
 
 #. TRANS: Public RSS feed description. %s is the StatusNet site name.
-#: actions/publicrss.php:106
 #, php-format
 msgid "%s updates from everyone."
 msgstr "Actualisationes de totes in %s."
 
 #. TRANS: Title for public tag cloud.
-#: actions/publictagcloud.php:57
 msgid "Public tag cloud"
 msgstr "Etiquettario public"
 
 #. TRANS: Instructions (more used like an explanation/header).
 #. TRANS: %s is the StatusNet sitename.
-#: actions/publictagcloud.php:65
 #, php-format
 msgid "These are most popular recent tags on %s"
 msgstr "Istes es le etiquettas recente le plus popular in %s"
@@ -4796,7 +3927,6 @@ msgstr "Istes es le etiquettas recente le plus popular in %s"
 #. TRANS: This message contains a Markdown URL. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.
-#: actions/publictagcloud.php:74
 #, php-format
 msgid "No one has posted a notice with a [hashtag](%%doc.tags%%) yet."
 msgstr ""
@@ -4804,7 +3934,6 @@ 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.
-#: actions/publictagcloud.php:79
 msgid "Be the first to post one!"
 msgstr "Sia le prime a publicar un!"
 
@@ -4813,7 +3942,6 @@ msgstr "Sia le prime a publicar un!"
 #. TRANS: This message contains a Markdown URL. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.
-#: actions/publictagcloud.php:87
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post "
@@ -4823,42 +3951,34 @@ msgstr ""
 "publicar un?"
 
 #. TRANS: Client error displayed trying to recover password while already logged in.
-#: actions/recoverpassword.php:37
 msgid "You are already logged in!"
 msgstr "Tu es jam authenticate!"
 
 #. TRANS: Client error displayed when password recovery code is not correct.
-#: actions/recoverpassword.php:64
 msgid "No such recovery code."
 msgstr "Iste codice de recuperation non existe."
 
 #. TRANS: Client error displayed when no proper password recovery code was submitted.
-#: actions/recoverpassword.php:69
 msgid "Not a recovery code."
 msgstr "Non es un codice de recuperation."
 
 #. TRANS: Server error displayed trying to recover password without providing a user.
-#: actions/recoverpassword.php:77
 msgid "Recovery code for unknown user."
 msgstr "Codice de recuperation pro un usator incognite."
 
 #. TRANS: Server error displayed removing a password recovery code from the database.
-#: actions/recoverpassword.php:91
 msgid "Error with confirmation code."
 msgstr "Error con le codice de confirmation."
 
 #. TRANS: Client error displayed trying to recover password with too old a recovery code.
-#: actions/recoverpassword.php:103
 msgid "This confirmation code is too old. Please start again."
 msgstr "Iste codice de confirmation ha expirate. Per favor recomencia."
 
 #. TRANS: Server error displayed when updating a user's e-mail address in the database fails while recovering a password.
-#: actions/recoverpassword.php:118
 msgid "Could not update user with confirmed email address."
 msgstr "Non poteva actualisar le usator con le adresse de e-mail confirmate."
 
 #. TRANS: Page notice for password recovery page.
-#: actions/recoverpassword.php:160
 msgid ""
 "If you have forgotten or lost your password, you can get a new one sent to "
 "the email address you have stored in your account."
@@ -4866,96 +3986,78 @@ msgstr ""
 "Si tu ha oblidate o perdite tu contrasigno, tu pote facer inviar un nove al "
 "adresse de e-mail specificate in tu conto."
 
-#: actions/recoverpassword.php:167
 msgid "You have been identified. Enter a new password below."
 msgstr "Tu ha essite identificate. Entra un nove contrasigno hic infra."
 
 #. TRANS: Fieldset legend for password recovery page.
-#: actions/recoverpassword.php:198
 msgid "Password recovery"
 msgstr "Recuperation de contrasigno"
 
 #. TRANS: Field label on password recovery page.
-#: actions/recoverpassword.php:202
 msgid "Nickname or email address"
 msgstr "Pseudonymo o adresse de e-mail"
 
 #. TRANS: Title for field label on password recovery page.
-#: actions/recoverpassword.php:205
 msgid "Your nickname on this server, or your registered email address."
 msgstr "Tu pseudonymo in iste servitor, o tu adresse de e-mail registrate."
 
 #. TRANS: Field label on password recovery page.
-#: actions/recoverpassword.php:212
 msgid "Recover"
 msgstr "Recuperar"
 
 #. TRANS: Button text on password recovery page.
-#: actions/recoverpassword.php:214
 msgctxt "BUTTON"
 msgid "Recover"
 msgstr "Recuperar"
 
 #. TRANS: Title for password recovery page in password reset mode.
-#: actions/recoverpassword.php:223
 msgid "Reset password"
 msgstr "Reinitialisar contrasigno"
 
 #. TRANS: Title for password recovery page in password recover mode.
-#: actions/recoverpassword.php:225
 msgid "Recover password"
 msgstr "Recuperar contrasigno"
 
 #. TRANS: Title for password recovery page in email sent mode.
 #. TRANS: Subject for password recovery e-mail.
-#: actions/recoverpassword.php:227 actions/recoverpassword.php:366
 msgid "Password recovery requested"
 msgstr "Recuperation de contrasigno requestate"
 
 #. TRANS: Title for password recovery page in password saved mode.
-#: actions/recoverpassword.php:229
 msgid "Password saved"
 msgstr "Contrasigno salveguardate"
 
 #. TRANS: Title for password recovery page when an unknown action has been specified.
-#: actions/recoverpassword.php:232
 msgid "Unknown action"
 msgstr "Action incognite"
 
 #. TRANS: Title for field label for password reset form.
-#: actions/recoverpassword.php:258
 msgid "6 or more characters, and do not forget it!"
 msgstr "6 o plus characteres, e non oblida lo!"
 
 #. TRANS: Button text for password reset form.
 #. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: actions/recoverpassword.php:268 lib/designform.php:145
 msgctxt "BUTTON"
 msgid "Reset"
 msgstr "Reinitialisar"
 
 #. TRANS: Form instructions for password recovery form.
-#: actions/recoverpassword.php:278
 msgid "Enter a nickname or email address."
 msgstr "Entra un pseudonymo o adresse de e-mail."
 
 #. TRANS: Information on password recovery form if no known username or e-mail address was specified.
-#: actions/recoverpassword.php:309
 msgid "No user with that email address or username."
 msgstr "Nulle usator existe con iste adresse de e-mail o nomine de usator."
 
 #. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
-#: actions/recoverpassword.php:327
 msgid "No registered email address for that user."
 msgstr "Nulle adresse de e-mail registrate pro iste usator."
 
 #. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
-#: actions/recoverpassword.php:342
 msgid "Error saving address confirmation."
 msgstr "Error al salveguardar le confirmation del adresse."
 
 #. TRANS: User notification after an e-mail with instructions was sent from the password recovery form.
-#: actions/recoverpassword.php:370
 msgid ""
 "Instructions for recovering your password have been sent to the email "
 "address registered to your account."
@@ -4964,73 +4066,56 @@ msgstr ""
 "mail registrate in tu conto."
 
 #. TRANS: Client error displayed when trying to reset as password without providing a user.
-#: actions/recoverpassword.php:391
 msgid "Unexpected password reset."
 msgstr "Reinitialisation inexpectate del contrasigno."
 
 #. TRANS: Reset password form validation error message.
-#: actions/recoverpassword.php:400
 msgid "Password must be 6 characters or more."
 msgstr "Le contrasigno debe haber 6 characteres o plus."
 
 #. TRANS: Reset password form validation error message.
-#: actions/recoverpassword.php:405
 msgid "Password and confirmation do not match."
 msgstr "Contrasigno e confirmation non corresponde."
 
 #. TRANS: Server error displayed when something does wrong with the user object during password reset.
-#: actions/recoverpassword.php:426 actions/register.php:241
 msgid "Error setting user."
 msgstr "Error durante le configuration del usator."
 
 #. TRANS: Success message for user after password reset.
-#: actions/recoverpassword.php:434
 msgid "New password successfully saved. You are now logged in."
 msgstr "Nove contrasigno salveguardate con successo. Tu session es ora aperte."
 
-#: actions/redirecturl.php:70
-#, fuzzy
 msgid "No id parameter"
-msgstr "Nulle parametro de ID."
+msgstr "Nulle parametro de ID"
 
-#: actions/redirecturl.php:76
-#, fuzzy, php-format
+#, php-format
 msgid "No such file \"%d\""
-msgstr "File non existe."
+msgstr "File \"%d\" non existe"
 
-#: actions/register.php:80 actions/register.php:181 actions/register.php:392
 msgid "Sorry, only invited people can register."
 msgstr "Pardono, solmente le personas invitate pote registrar se."
 
-#: actions/register.php:87
 msgid "Sorry, invalid invitation code."
 msgstr "Pardono, le codice de invitation es invalide."
 
-#: actions/register.php:106
 msgid "Registration successful"
 msgstr "Registration succedite"
 
-#: actions/register.php:108 actions/register.php:490
 msgid "Register"
 msgstr "Crear conto"
 
-#: actions/register.php:128
 msgid "Registration not allowed."
 msgstr "Creation de conto non permittite."
 
-#: actions/register.php:194
 msgid "You cannot register if you don't agree to the license."
 msgstr "Tu non pote crear un conto si tu non accepta le licentia."
 
-#: actions/register.php:203
 msgid "Email address already exists."
 msgstr "Le adresse de e-mail existe ja."
 
-#: actions/register.php:236 actions/register.php:258
 msgid "Invalid username or password."
 msgstr "Nomine de usator o contrasigno invalide."
 
-#: actions/register.php:333
 msgid ""
 "With this form you can create a new account. You can then post notices and "
 "link up to friends and colleagues."
@@ -5038,49 +4123,39 @@ msgstr ""
 "Con iste formulario tu pote crear un nove conto. Postea, tu pote publicar "
 "notas e mitter te in contacto con amicos e collegas."
 
-#: actions/register.php:424 actions/register.php:428
-#: actions/siteadminpanel.php:238 lib/settingsnav.php:92
 msgid "Email"
 msgstr "E-mail"
 
-#: actions/register.php:425 actions/register.php:429
 msgid "Used only for updates, announcements, and password recovery."
 msgstr ""
 "Usate solmente pro actualisationes, notificationes e recuperation de "
 "contrasigno."
 
-#: actions/register.php:436
 msgid "Longer name, preferably your \"real\" name."
 msgstr "Nomine plus longe, preferibilemente tu nomine \"real\"."
 
-#: actions/register.php:464
 msgid "Where you are, like \"City, State (or Region), Country\"."
 msgstr "Ubi tu es, como \"Citate, Stato (o Region), Pais\"."
 
-#: actions/register.php:503
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
 msgstr ""
 "io comprende que le contento e datos de %1$s es private e confidential."
 
-#: actions/register.php:513
 #, php-format
 msgid "My text and files are copyright by %1$s."
 msgstr "Le derecto de autor pro mi texto e files es in possession de %1$s."
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:517
 msgid "My text and files remain under my own copyright."
 msgstr "Le derecto de autor pro mi texto e files resta in mi possession."
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:520
 msgid "All rights reserved."
 msgstr "Tote le derectos reservate."
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:525
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -5090,7 +4165,6 @@ msgstr ""
 "contrasigno, adresse de e-mail, adresse de messageria instantanee, numero de "
 "telephono."
 
-#: actions/register.php:566
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -5122,7 +4196,6 @@ msgstr ""
 "\n"
 "Gratias pro inscriber te, e nos spera que iste servicio te place."
 
-#: actions/register.php:590
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5130,7 +4203,6 @@ msgstr ""
 "(Tu recipera tosto un message de e-mail con instructiones pro confirmar tu "
 "adresse de e-mail.)"
 
-#: actions/remotesubscribe.php:97
 #, php-format
 msgid ""
 "To subscribe, you can [login](%%action.login%%), or [register](%%action."
@@ -5142,106 +4214,81 @@ msgstr ""
 "[sito de microblogging compatibile](%%doc.openmublog%%), entra hic infra le "
 "URL de tu profilo."
 
-#: actions/remotesubscribe.php:111
 msgid "Remote subscribe"
 msgstr "Subscription remote"
 
-#: actions/remotesubscribe.php:123
 msgid "Subscribe to a remote user"
 msgstr "Subscriber te a un usator remote"
 
-#: actions/remotesubscribe.php:128
 msgid "User nickname"
 msgstr "Pseudonymo del usator"
 
-#: actions/remotesubscribe.php:129
 msgid "Nickname of the user you want to follow."
 msgstr "Le pseudonymo del usator que tu vole sequer."
 
-#: actions/remotesubscribe.php:132
 msgid "Profile URL"
 msgstr "URL del profilo"
 
-#: actions/remotesubscribe.php:133
 msgid "URL of your profile on another compatible microblogging service."
 msgstr "URL de tu profilo in un altere servicio de microblogging compatibile."
 
 #. TRANS: Link text for link that will subscribe to a remote profile.
-#: actions/remotesubscribe.php:136 lib/subscribeform.php:139
-#: lib/userprofile.php:402
 msgid "Subscribe"
 msgstr "Subscriber"
 
-#: actions/remotesubscribe.php:158
 msgid "Invalid profile URL (bad format)."
 msgstr "URL de profilo invalide (mal formato)."
 
-#: actions/remotesubscribe.php:167
 msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
 msgstr ""
 "URL de profilo invalide (non es un documento YADIS o esseva definite un XRDS "
 "invalide)."
 
-#: actions/remotesubscribe.php:175
 msgid "That is a local profile! Login to subscribe."
 msgstr "Isto es un profilo local! Aperi session pro subscriber."
 
-#: actions/remotesubscribe.php:182
 msgid "Could not get a request token."
 msgstr "Non poteva obtener un indicio de requesta."
 
-#: actions/repeat.php:56
 msgid "Only logged-in users can repeat notices."
 msgstr "Solmente usatores authenticate pote repeter notas."
 
-#: actions/repeat.php:63 actions/repeat.php:70
 msgid "No notice specified."
 msgstr "Nulle nota specificate."
 
-#: actions/repeat.php:75
 msgid "You cannot repeat your own notice."
 msgstr "Tu non pote repeter tu proprie nota."
 
-#: actions/repeat.php:89
 msgid "You already repeated that notice."
 msgstr "Tu ha ja repetite iste nota."
 
-#: actions/repeat.php:112 lib/noticelist.php:697
 msgid "Repeated"
 msgstr "Repetite"
 
-#: actions/repeat.php:117
 msgid "Repeated!"
 msgstr "Repetite!"
 
 #. TRANS: RSS reply feed title. %s is a user nickname.
-#: actions/replies.php:126 actions/repliesrss.php:68
-#: lib/personalgroupnav.php:105
 #, php-format
 msgid "Replies to %s"
 msgstr "Responsas a %s"
 
-#: actions/replies.php:128
 #, php-format
 msgid "Replies to %1$s, page %2$d"
 msgstr "Responsas a %1$s, pagina %2$d"
 
-#: actions/replies.php:145
 #, php-format
 msgid "Replies feed for %s (RSS 1.0)"
 msgstr "Syndication de responsas pro %s (RSS 1.0)"
 
-#: actions/replies.php:152
 #, php-format
 msgid "Replies feed for %s (RSS 2.0)"
 msgstr "Syndication de responsas pro %s (RSS 2.0)"
 
-#: actions/replies.php:159
 #, php-format
 msgid "Replies feed for %s (Atom)"
 msgstr "Syndication de responsas pro %s (Atom)"
 
-#: actions/replies.php:199
 #, php-format
 msgid ""
 "This is the timeline showing replies to %1$s but %2$s hasn't received a "
@@ -5250,7 +4297,6 @@ msgstr ""
 "Isto es le chronologia de responsas a %1$s, ma %2$s non ha ancora recipite "
 "un nota a su attention."
 
-#: actions/replies.php:204
 #, php-format
 msgid ""
 "You can engage other users in a conversation, subscribe to more people or "
@@ -5259,7 +4305,6 @@ msgstr ""
 "Tu pote facer conversation con altere usatores, subscriber te a plus "
 "personas o [devenir membro de gruppos](%%action.groups%%)."
 
-#: actions/replies.php:206
 #, php-format
 msgid ""
 "You can try to [nudge %1$s](../%2$s) or [post something to them](%%%%action."
@@ -5270,34 +4315,28 @@ msgstr ""
 
 #. TRANS: RSS reply feed description.
 #. TRANS: %1$s is a user nickname, %2$s is the StatusNet site name.
-#: actions/repliesrss.php:74
 #, php-format
 msgid "Replies to %1$s on %2$s."
 msgstr "Responsas a %1$s in %2$s."
 
 #. TRANS: Client exception displayed when trying to restore an account while not logged in.
-#: actions/restoreaccount.php:78
 msgid "Only logged-in users can restore their account."
 msgstr "Solmente usatores authenticate pote restaurar lor conto."
 
 #. TRANS: Client exception displayed when trying to restore an account without having restore rights.
-#: actions/restoreaccount.php:83
 msgid "You may not restore your account."
 msgstr "Tu non pote restaurar tu conto."
 
 #. TRANS: Client exception displayed trying to restore an account while something went wrong uploading a file.
 #. TRANS: Client exception. No file; probably just a non-AJAX submission.
-#: actions/restoreaccount.php:121 actions/restoreaccount.php:146
 msgid "No uploaded file."
 msgstr "Nulle file incargate."
 
 #. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
-#: actions/restoreaccount.php:129 lib/mediafile.php:194
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
 msgstr "Le file incargate excede le directiva upload_max_filesize in php.ini."
 
 #. TRANS: Client exception.
-#: actions/restoreaccount.php:135 lib/mediafile.php:200
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form."
@@ -5306,39 +4345,32 @@ msgstr ""
 "formulario HTML."
 
 #. TRANS: Client exception.
-#: actions/restoreaccount.php:141 lib/mediafile.php:206
 msgid "The uploaded file was only partially uploaded."
 msgstr "Le file incargate ha solmente essite incargate partialmente."
 
 #. TRANS: Client exception thrown when a temporary folder is not present to store a file upload.
-#: actions/restoreaccount.php:150 lib/mediafile.php:214
 msgid "Missing a temporary folder."
 msgstr "Manca un dossier temporari."
 
 #. TRANS: Client exception thrown when writing to disk is not possible during a file upload operation.
-#: actions/restoreaccount.php:154 lib/mediafile.php:218
 msgid "Failed to write file to disk."
 msgstr "Falleva de scriber le file in disco."
 
 #. TRANS: Client exception thrown when a file upload operation has been stopped by an extension.
-#: actions/restoreaccount.php:158 lib/mediafile.php:222
 msgid "File upload stopped by extension."
 msgstr "Incargamento de file stoppate per un extension."
 
 #. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
 #. TRANS: Exception thrown when uploading an image fails for an unknown reason.
 #. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
-#: actions/restoreaccount.php:164 lib/imagefile.php:106 lib/mediafile.php:228
 msgid "System error uploading file."
 msgstr "Error de systema durante le incargamento del file."
 
 #. TRANS: Client exception thrown when a feed is not an Atom feed.
-#: actions/restoreaccount.php:207
 msgid "Not an Atom feed."
 msgstr "Non es un syndication Atom."
 
 #. TRANS: Success message when a feed has been restored.
-#: actions/restoreaccount.php:241
 msgid ""
 "Feed has been restored. Your old posts should now appear in search and your "
 "profile page."
@@ -5347,12 +4379,10 @@ msgstr ""
 "le recerca e in tu pagina de profilo."
 
 #. TRANS: Message when a feed restore is in progress.
-#: actions/restoreaccount.php:245
 msgid "Feed will be restored. Please wait a few minutes for results."
 msgstr "Le syndication essera restaurate. Per favor attende qualque minutas."
 
 #. TRANS: Form instructions for feed restore.
-#: actions/restoreaccount.php:342
 msgid ""
 "You can upload a backed-up stream in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format."
@@ -5361,92 +4391,73 @@ msgstr ""
 "activitystrea.ms/\">Activity Streams</a>."
 
 #. TRANS: Title for submit button to confirm upload of a user backup file for account restore.
-#: actions/restoreaccount.php:373
 msgid "Upload the file"
 msgstr "Incargar le file"
 
-#: actions/revokerole.php:75
 msgid "You cannot revoke user roles on this site."
 msgstr "Tu non pote revocar rolos de usatores in iste sito."
 
-#: actions/revokerole.php:82
 msgid "User doesn't have this role."
 msgstr "Le usator non ha iste rolo."
 
-#: actions/rsd.php:142 actions/version.php:159
 msgid "StatusNet"
 msgstr "StatusNet"
 
-#: actions/sandbox.php:65 actions/unsandbox.php:65
 msgid "You cannot sandbox users on this site."
 msgstr "Tu non pote mitter usatores in le cassa de sablo in iste sito."
 
-#: actions/sandbox.php:72
 msgid "User is already sandboxed."
 msgstr "Usator es ja in cassa de sablo."
 
 #. TRANS: Menu item for site administration
-#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
-#: lib/adminpanelaction.php:379
 msgid "Sessions"
 msgstr "Sessiones"
 
-#: actions/sessionsadminpanel.php:65
 msgid "Session settings for this StatusNet site"
 msgstr "Parametros de session pro iste sito StatusNet"
 
-#: actions/sessionsadminpanel.php:175
 msgid "Handle sessions"
 msgstr "Gerer sessiones"
 
-#: actions/sessionsadminpanel.php:177
 msgid "Whether to handle sessions ourselves."
 msgstr "Si nos debe gerer le sessiones nos mesme."
 
-#: actions/sessionsadminpanel.php:181
 msgid "Session debugging"
 msgstr "Cercar defectos de session"
 
-#: actions/sessionsadminpanel.php:183
 msgid "Turn on debugging output for sessions."
 msgstr "Producer informationes technic pro cercar defectos in sessiones."
 
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
+#. TRANS: Submit button title.
+msgid "Save"
+msgstr "Salveguardar"
+
 msgid "Save site settings"
 msgstr "Salveguardar configurationes del sito"
 
-#: actions/showapplication.php:78
 msgid "You must be logged in to view an application."
 msgstr "Tu debe aperir un session pro vider un application."
 
-#: actions/showapplication.php:151
 msgid "Application profile"
 msgstr "Profilo del application"
 
-#: actions/showapplication.php:179
 #, php-format
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr "Create per %1$s - accesso %2$s per predefinition - %3$d usatores"
 
-#: actions/showapplication.php:189
 msgid "Application actions"
 msgstr "Actiones de application"
 
-#: actions/showapplication.php:212
 msgid "Reset key & secret"
 msgstr "Reinitialisar clave e secreto"
 
 #. TRANS: Title of form for deleting a user.
-#: actions/showapplication.php:228 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:64 lib/noticelist.php:678
 msgid "Delete"
 msgstr "Deler"
 
-#: actions/showapplication.php:237
 msgid "Application info"
 msgstr "Info del application"
 
-#: actions/showapplication.php:255
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
@@ -5454,42 +4465,35 @@ msgstr ""
 "Nota: Nos supporta le signaturas HMAC-SHA1. Nos non accepta signaturas in "
 "texto simple."
 
-#: actions/showapplication.php:275
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr "Es tu secur de voler reinitialisar tu clave e secreto de consumitor?"
 
 #. TRANS: Title for all but the first page of favourite notices of a user.
 #. TRANS: %1$s is the user for whom the favourite notices are displayed, %2$d is the page number.
-#: actions/showfavorites.php:80
 #, php-format
 msgid "%1$s's favorite notices, page %2$d"
 msgstr "Notas favorite de %1$s, pagina %2$d"
 
 #. TRANS: Server error displayed when favourite notices could not be retrieved from the database.
-#: actions/showfavorites.php:134
 msgid "Could not retrieve favorite notices."
 msgstr "Non poteva recuperar notas favorite."
 
 #. TRANS: Feed link text. %s is a username.
-#: actions/showfavorites.php:172
 #, php-format
 msgid "Feed for favorites of %s (RSS 1.0)"
 msgstr "Syndication del favorites de %s (RSS 1.0)"
 
 #. TRANS: Feed link text. %s is a username.
-#: actions/showfavorites.php:180
 #, php-format
 msgid "Feed for favorites of %s (RSS 2.0)"
 msgstr "Syndication del favorites de %s (RSS 2.0)"
 
 #. TRANS: Feed link text. %s is a username.
-#: actions/showfavorites.php:188
 #, php-format
 msgid "Feed for favorites of %s (Atom)"
 msgstr "Syndication del favorites de %s (Atom)"
 
 #. TRANS: Text displayed instead of favourite notices for the current logged in user that has no favourites.
-#: actions/showfavorites.php:209
 msgid ""
 "You haven't chosen any favorite notices yet. Click the fave button on "
 "notices you like to bookmark them for later or shed a spotlight on them."
@@ -5500,7 +4504,6 @@ msgstr ""
 
 #. TRANS: Text displayed instead of favourite notices for a user that has no favourites while logged in.
 #. TRANS: %s is a username.
-#: actions/showfavorites.php:213
 #, php-format
 msgid ""
 "%s hasn't added any favorite notices yet. Post something interesting they "
@@ -5512,7 +4515,6 @@ msgstr ""
 #. TRANS: Text displayed instead of favourite notices for a user that has no favourites while not logged in.
 #. TRANS: %s is a username, %%%%action.register%%%% is a link to the user registration page.
 #. TRANS: (link text)[link] is a Mark Down link.
-#: actions/showfavorites.php:220
 #, php-format
 msgid ""
 "%s hasn't added any favorite notices yet. Why not [register an account](%%%%"
@@ -5524,64 +4526,53 @@ msgstr ""
 "a su favorites :)"
 
 #. TRANS: Page notice for show favourites page.
-#: actions/showfavorites.php:251
 msgid "This is a way to share what you like."
 msgstr "Isto es un modo de condivider lo que te place."
 
 #. TRANS: Page title for first group page. %s is a group name.
-#: actions/showgroup.php:75
 #, php-format
 msgid "%s group"
 msgstr "Gruppo %s"
 
 #. TRANS: Page title for any but first group page.
 #. TRANS: %1$s is a group name, $2$s is a page number.
-#: actions/showgroup.php:79
 #, php-format
 msgid "%1$s group, page %2$d"
 msgstr "Gruppo %1$s, pagina %2$d"
 
 #. TRANS: Label for group description or group note (dt). Text hidden by default.
-#: actions/showgroup.php:266
 msgid "Note"
 msgstr "Nota"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:277 lib/groupeditform.php:180
 msgid "Aliases"
 msgstr "Aliases"
 
 #. TRANS: Group actions header (h2). Text hidden by default.
-#: actions/showgroup.php:294
 msgid "Group actions"
 msgstr "Actiones del gruppo"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:338
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
 msgstr "Syndication de notas pro le gruppo %s (RSS 1.0)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:345
 #, php-format
 msgid "Notice feed for %s group (RSS 2.0)"
 msgstr "Syndication de notas pro le gruppo %s (RSS 2.0)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:352
 #, php-format
 msgid "Notice feed for %s group (Atom)"
 msgstr "Syndication de notas pro le gruppo %s (Atom)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:358
 #, php-format
 msgid "FOAF for %s group"
 msgstr "Amico de un amico pro le gruppo %s"
 
 #. TRANS: Header for mini list of group members on a group page (h2).
-#: actions/showgroup.php:395
 msgid "Members"
 msgstr "Membros"
 
@@ -5589,30 +4580,23 @@ msgstr "Membros"
 #. TRANS: Text for user subscription statistics if the user has no subscriptions.
 #. TRANS: Text for user subscriber statistics if user has no subscribers.
 #. TRANS: Text for user user group membership statistics if user is not a member of any group.
-#: actions/showgroup.php:401 lib/profileaction.php:137
-#: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
-#: lib/subscriptionlist.php:123 lib/tagcloudsection.php:71
 msgid "(None)"
 msgstr "(Nulle)"
 
 #. TRANS: Link to all group members from mini list of group members if group has more than n members.
-#: actions/showgroup.php:410
 msgid "All members"
 msgstr "Tote le membros"
 
 #. TRANS: Header for group statistics on a group page (h2).
 #. TRANS: H2 text for user statistics.
-#: actions/showgroup.php:441 lib/profileaction.php:205
 msgid "Statistics"
 msgstr "Statisticas"
 
-#: actions/showgroup.php:444
 msgctxt "LABEL"
 msgid "Created"
 msgstr "Create"
 
 #. TRANS: Label for member count in statistics on group page.
-#: actions/showgroup.php:449
 msgctxt "LABEL"
 msgid "Members"
 msgstr "Membros"
@@ -5621,7 +4605,6 @@ msgstr "Membros"
 #. TRANS: **%s** is the group alias, %%%%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).
-#: actions/showgroup.php:464
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5639,7 +4622,6 @@ 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: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
-#: actions/showgroup.php:474
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5653,100 +4635,84 @@ msgstr ""
 "lor vita e interesses. "
 
 #. TRANS: Header for list of group administrators on a group page (h2).
-#: actions/showgroup.php:503
 msgid "Admins"
 msgstr "Administratores"
 
 #. TRANS: Client error displayed requesting a single message that does not exist.
-#: actions/showmessage.php:76
 msgid "No such message."
 msgstr "Message non existe."
 
 #. TRANS: Client error displayed requesting a single direct message the requesting user was not a party in.
-#: actions/showmessage.php:86
 msgid "Only the sender and recipient may read this message."
 msgstr "Solmente le expeditor e destinatario pote leger iste message."
 
 #. TRANS: Page title for single direct message display when viewing user is the sender.
 #. TRANS: %1$s is the addressed user's nickname, $2$s is a timestamp.
-#: actions/showmessage.php:105
 #, php-format
 msgid "Message to %1$s on %2$s"
 msgstr "Message a %1$s in %2$s"
 
 #. TRANS: Page title for single message display.
 #. TRANS: %1$s is the sending user's nickname, $2$s is a timestamp.
-#: actions/showmessage.php:113
 #, php-format
 msgid "Message from %1$s on %2$s"
 msgstr "Message de %1$s in %2$s"
 
-#: actions/shownotice.php:90
 msgid "Notice deleted."
 msgstr "Nota delite."
 
 #. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
-#: actions/showstream.php:70
 #, php-format
 msgid "%1$s tagged %2$s"
 msgstr "%1$s etiquettate con %2$s"
 
 #. TRANS: Page title showing tagged notices in one user's stream.
 #. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
-#: actions/showstream.php:74
 #, php-format
 msgid "%1$s tagged %2$s, page %3$d"
 msgstr "%1$s etiquettate con %2$s, pagina %3$d"
 
 #. TRANS: Extended page title showing tagged notices in one user's stream.
 #. TRANS: %1$s is the username, %2$d is the page number.
-#: actions/showstream.php:82
 #, php-format
 msgid "%1$s, page %2$d"
 msgstr "%1$s, pagina %2$d"
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %1$s is a user nickname, %2$s is a hashtag.
-#: actions/showstream.php:127
 #, php-format
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
 msgstr "Syndication de notas pro %1$s con etiquetta %2$s (RSS 1.0)"
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.
-#: actions/showstream.php:136
 #, php-format
 msgid "Notice feed for %s (RSS 1.0)"
 msgstr "Syndication de notas pro %s (RSS 1.0)"
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.
-#: actions/showstream.php:145
 #, php-format
 msgid "Notice feed for %s (RSS 2.0)"
 msgstr "Syndication de notas pro %s (RSS 2.0)"
 
-#: actions/showstream.php:152
 #, php-format
 msgid "Notice feed for %s (Atom)"
 msgstr "Syndication de notas pro %s (Atom)"
 
 #. TRANS: Title for link to notice feed. FOAF stands for Friend of a Friend.
 #. TRANS: More information at http://www.foaf-project.org. %s is a user nickname.
-#: actions/showstream.php:159
 #, php-format
 msgid "FOAF for %s"
 msgstr "Amico de un amico pro %s"
 
 #. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
-#: actions/showstream.php:205
 #, php-format
 msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr ""
 "Isto es le chronologia pro %1$s, ma %1$s non ha ancora publicate alique."
 
 #. TRANS: Second sentence of empty list message for a stream for the user themselves.
-#: actions/showstream.php:211
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
@@ -5756,7 +4722,6 @@ msgstr ""
 
 #. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:215
 #, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
@@ -5767,7 +4732,6 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:258
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5783,7 +4747,6 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:265
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5795,221 +4758,174 @@ msgstr ""
 "[StatusNet](http://status.net/). "
 
 #. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
-#: actions/showstream.php:322
 #, php-format
 msgid "Repeat of %s"
 msgstr "Repetition de %s"
 
-#: actions/silence.php:65 actions/unsilence.php:65
 msgid "You cannot silence users on this site."
 msgstr "Tu non pote silentiar usatores in iste sito."
 
-#: actions/silence.php:72
 msgid "User is already silenced."
 msgstr "Usator es ja silentiate."
 
-#: actions/siteadminpanel.php:69
 msgid "Basic settings for this StatusNet site"
 msgstr "Configurationes de base pro iste sito StatusNet"
 
-#: actions/siteadminpanel.php:133
 msgid "Site name must have non-zero length."
 msgstr "Le longitude del nomine del sito debe esser plus que zero."
 
-#: actions/siteadminpanel.php:141
 msgid "You must have a valid contact email address."
 msgstr "Tu debe haber un valide adresse de e-mail pro contacto."
 
-#: actions/siteadminpanel.php:159
 #, php-format
 msgid "Unknown language \"%s\"."
 msgstr "Lingua \"%s\" incognite."
 
-#: actions/siteadminpanel.php:165
 msgid "Minimum text limit is 0 (unlimited)."
 msgstr "Le limite minimal del texto es 0 (illimitate)."
 
-#: actions/siteadminpanel.php:171
 msgid "Dupe limit must be one or more seconds."
 msgstr "Le limite de duplicatos debe esser un o plus secundas."
 
-#: actions/siteadminpanel.php:221
 msgid "General"
 msgstr "General"
 
-#: actions/siteadminpanel.php:224
 msgid "Site name"
 msgstr "Nomine del sito"
 
-#: actions/siteadminpanel.php:225
 msgid "The name of your site, like \"Yourcompany Microblog\""
 msgstr "Le nomine de tu sito, como \"Le microblog de TuCompania\""
 
-#: actions/siteadminpanel.php:229
 msgid "Brought by"
 msgstr "Realisate per"
 
-#: actions/siteadminpanel.php:230
 msgid "Text used for credits link in footer of each page"
 msgstr "Le texto usate pro le ligamine al creditos in le pede de cata pagina"
 
-#: actions/siteadminpanel.php:234
 msgid "Brought by URL"
 msgstr "URL pro \"Realisate per\""
 
-#: actions/siteadminpanel.php:235
 msgid "URL used for credits link in footer of each page"
 msgstr "URL usate pro le ligamine al creditos in le pede de cata pagina"
 
-#: actions/siteadminpanel.php:239
 msgid "Contact email address for your site"
 msgstr "Le adresse de e-mail de contacto pro tu sito"
 
-#: actions/siteadminpanel.php:245
 msgid "Local"
 msgstr "Local"
 
-#: actions/siteadminpanel.php:256
 msgid "Default timezone"
 msgstr "Fuso horari predefinite"
 
-#: actions/siteadminpanel.php:257
 msgid "Default timezone for the site; usually UTC."
 msgstr "Fuso horari predefinite pro le sito; normalmente UTC."
 
-#: actions/siteadminpanel.php:262
 msgid "Default language"
 msgstr "Lingua predefinite"
 
-#: actions/siteadminpanel.php:263
 msgid "Site language when autodetection from browser settings is not available"
 msgstr ""
 "Le lingua del sito quando le detection automatic ex le configuration del "
 "navigator non es disponibile"
 
-#: actions/siteadminpanel.php:271
 msgid "Limits"
 msgstr "Limites"
 
-#: actions/siteadminpanel.php:274
 msgid "Text limit"
 msgstr "Limite de texto"
 
-#: actions/siteadminpanel.php:274
 msgid "Maximum number of characters for notices."
 msgstr "Numero maxime de characteres pro notas."
 
-#: actions/siteadminpanel.php:278
 msgid "Dupe limit"
 msgstr "Limite de duplicatos"
 
-#: actions/siteadminpanel.php:278
 msgid "How long users must wait (in seconds) to post the same thing again."
 msgstr ""
 "Quante tempore (in secundas) le usatores debe attender ante de poter "
 "publicar le mesme cosa de novo."
 
 #. TRANS: Page title for site-wide notice tab in admin panel.
-#: actions/sitenoticeadminpanel.php:55
 msgid "Site Notice"
 msgstr "Aviso del sito"
 
 #. TRANS: Instructions for site-wide notice tab in admin panel.
-#: actions/sitenoticeadminpanel.php:66
 msgid "Edit site-wide message"
 msgstr "Modificar message a tote le sito"
 
 #. TRANS: Server error displayed when saving a site-wide notice was impossible.
-#: actions/sitenoticeadminpanel.php:101
 msgid "Unable to save site notice."
 msgstr "Impossibile salveguardar le aviso del sito."
 
 #. TRANS: Client error displayed when a site-wide notice was longer than allowed.
-#: actions/sitenoticeadminpanel.php:112
 msgid "Maximum length for the site-wide notice is 255 characters."
 msgstr "Le longitude maxime del aviso a tote le sito es 255 characteres."
 
 #. TRANS: Label for site-wide notice text field in admin panel.
-#: actions/sitenoticeadminpanel.php:176
 msgid "Site notice text"
 msgstr "Texto del aviso del sito"
 
 #. TRANS: Tooltip for site-wide notice text field in admin panel.
-#: actions/sitenoticeadminpanel.php:179
 msgid "Site-wide notice text (255 characters maximum; HTML allowed)"
 msgstr ""
 "Le texto del aviso a tote le sito (maximo 255 characteres; HTML permittite)"
 
 #. TRANS: Title for button to save site notice in admin panel.
-#: actions/sitenoticeadminpanel.php:201
 msgid "Save site notice."
 msgstr "Salveguardar aviso del sito."
 
 #. TRANS: Title for SMS settings.
-#: actions/smssettings.php:56
 msgid "SMS settings"
 msgstr "Parametros de SMS"
 
 #. TRANS: SMS settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/smssettings.php:70
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr "Tu pote reciper messages SMS per e-mail ab %%site.name%%."
 
 #. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
-#: actions/smssettings.php:92
 msgid "SMS is not available."
 msgstr "SMS non es disponibile."
 
 #. TRANS: Form legend for SMS settings form.
-#: actions/smssettings.php:106
 msgid "SMS address"
 msgstr "Adresse SMS"
 
 #. TRANS: Form guide in SMS settings form.
-#: actions/smssettings.php:115
 msgid "Current confirmed SMS-enabled phone number."
 msgstr "Numero de telephono actual e confirmate con servicio SMS."
 
 #. TRANS: Form guide in IM settings form.
-#: actions/smssettings.php:128
 msgid "Awaiting confirmation on this phone number."
 msgstr "Iste numero de telephono attende confirmation."
 
 #. TRANS: Field label for SMS address input in SMS settings form.
-#: actions/smssettings.php:137
 msgid "Confirmation code"
 msgstr "Codice de confirmation"
 
 #. TRANS: Form field instructions in SMS settings form.
-#: actions/smssettings.php:139
 msgid "Enter the code you received on your phone."
 msgstr "Entra le codice que tu ha recipite in tu telephono."
 
 #. TRANS: Button label to confirm SMS confirmation code in SMS settings.
-#: actions/smssettings.php:143
 msgctxt "BUTTON"
 msgid "Confirm"
 msgstr "Confirmar"
 
 #. TRANS: Field label for SMS phone number input in SMS settings form.
-#: actions/smssettings.php:148
 msgid "SMS phone number"
 msgstr "Numero de telephono pro SMS"
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
-#: actions/smssettings.php:151
 msgid "Phone number, no punctuation or spaces, with area code."
 msgstr "Numero de telephono, sin punctuation o spatios, con indicativo."
 
 #. TRANS: Form legend for SMS preferences form.
-#: actions/smssettings.php:190
 msgid "SMS preferences"
 msgstr "Preferentias de SMS"
 
 #. TRANS: Checkbox label in SMS preferences form.
-#: actions/smssettings.php:196
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
@@ -6018,32 +4934,26 @@ msgstr ""
 "de mi operator."
 
 #. TRANS: Confirmation message for successful SMS preferences save.
-#: actions/smssettings.php:307
 msgid "SMS preferences saved."
 msgstr "Preferentias de SMS confirmate."
 
 #. TRANS: Message given saving SMS phone number without having provided one.
-#: actions/smssettings.php:329
 msgid "No phone number."
 msgstr "Nulle numero de telephono."
 
 #. TRANS: Message given saving SMS phone number without having selected a carrier.
-#: actions/smssettings.php:335
 msgid "No carrier selected."
 msgstr "Nulle operator seligite."
 
 #. TRANS: Message given saving SMS phone number that is already set.
-#: actions/smssettings.php:343
 msgid "That is already your phone number."
 msgstr "Isto es ja tu numero de telephono."
 
 #. TRANS: Message given saving SMS phone number that is already set for another user.
-#: actions/smssettings.php:347
 msgid "That phone number already belongs to another user."
 msgstr "Iste numero de telephono pertine ja a un altere usator."
 
 #. TRANS: Message given saving valid SMS phone number that is to be confirmed.
-#: actions/smssettings.php:375
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
 "for the code and instructions on how to use it."
@@ -6052,39 +4962,32 @@ msgstr ""
 "addite. Vide in tu telephono le codice e le instructiones super como usar lo."
 
 #. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
-#: actions/smssettings.php:403
 msgid "That is the wrong confirmation number."
 msgstr "Iste codice de confirmation es incorrecte."
 
 #. TRANS: Message given after successfully canceling SMS phone number confirmation.
-#: actions/smssettings.php:417
 msgid "SMS confirmation cancelled."
 msgstr "Confirmation de SMS cancellate."
 
 #. TRANS: Message given trying to remove an SMS phone number that is not
 #. TRANS: registered for the active user.
-#: actions/smssettings.php:437
 msgid "That is not your phone number."
 msgstr "Isto non es tu numero de telephono."
 
 #. TRANS: Message given after successfully removing a registered SMS phone number.
-#: actions/smssettings.php:459
 msgid "The SMS phone number was removed."
 msgstr "Le numero de telephono pro SMS ha essite removite."
 
 #. TRANS: Label for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:498
 msgid "Mobile carrier"
 msgstr "Operator de telephonia mobile"
 
 #. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:503
 msgid "Select a carrier"
 msgstr "Selige un operator"
 
 #. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
 #. TRANS: %s is an administrative contact's e-mail address.
-#: actions/smssettings.php:512
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -6095,118 +4998,93 @@ msgstr ""
 "nos a %s."
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
-#: actions/smssettings.php:534
 msgid "No code entered."
 msgstr "Nulle codice entrate."
 
 #. TRANS: Menu item for site administration
-#: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
-#: lib/adminpanelaction.php:395
 msgid "Snapshots"
 msgstr "Instantaneos"
 
-#: actions/snapshotadminpanel.php:65
 msgid "Manage snapshot configuration"
 msgstr "Gerer configuration de instantaneos"
 
-#: actions/snapshotadminpanel.php:127
 msgid "Invalid snapshot run value."
 msgstr "Valor de execution de instantaneo invalide."
 
-#: actions/snapshotadminpanel.php:133
 msgid "Snapshot frequency must be a number."
 msgstr "Le frequentia de instantaneos debe esser un numero."
 
-#: actions/snapshotadminpanel.php:144
 msgid "Invalid snapshot report URL."
 msgstr "Le URL pro reportar instantaneos es invalide."
 
-#: actions/snapshotadminpanel.php:200
 msgid "Randomly during web hit"
 msgstr "Aleatorimente durante un accesso web"
 
-#: actions/snapshotadminpanel.php:201
 msgid "In a scheduled job"
 msgstr "In un processo planificate"
 
-#: actions/snapshotadminpanel.php:206
 msgid "Data snapshots"
 msgstr "Instantaneos de datos"
 
-#: actions/snapshotadminpanel.php:208
 msgid "When to send statistical data to status.net servers"
 msgstr "Quando inviar datos statistic al servitores de status.net"
 
-#: actions/snapshotadminpanel.php:217
 msgid "Frequency"
 msgstr "Frequentia"
 
-#: actions/snapshotadminpanel.php:218
 msgid "Snapshots will be sent once every N web hits"
 msgstr "Un instantaneo essera inviate a cata N accessos web"
 
-#: actions/snapshotadminpanel.php:226
 msgid "Report URL"
 msgstr "URL pro reporto"
 
-#: actions/snapshotadminpanel.php:227
 msgid "Snapshots will be sent to this URL"
 msgstr "Le instantaneos essera inviate a iste URL"
 
-#: actions/snapshotadminpanel.php:248
 msgid "Save snapshot settings"
 msgstr "Salveguardar configuration de instantaneos"
 
 #. TRANS: Client error displayed trying a change a subscription for a non-subscribed profile.
-#: actions/subedit.php:75
 msgid "You are not subscribed to that profile."
 msgstr "Tu non es subscribite a iste profilo."
 
 #. TRANS: Server error displayed when updating a subscription fails with a database error.
 #. TRANS: Exception thrown when a subscription could not be stored on the server.
-#: actions/subedit.php:89 classes/Subscription.php:141
 msgid "Could not save subscription."
 msgstr "Non poteva salveguardar le subscription."
 
 #. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
-#: actions/subscribe.php:121
 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
 msgstr "Tu non pote subscriber te a un profilo remote OMB 0.1 con iste action."
 
 #. TRANS: Page title when subscription succeeded.
-#: actions/subscribe.php:149
 msgid "Subscribed"
 msgstr "Subscribite"
 
 #. TRANS: Header for list of subscribers for a user (first page).
 #. TRANS: %s is the user's nickname.
-#: actions/subscribers.php:51
 #, php-format
 msgid "%s subscribers"
 msgstr "Subscriptores a %s"
 
 #. TRANS: Header for list of subscribers for a user (not first page).
 #. TRANS: %1$s is the user's nickname, $2$d is the page number.
-#: actions/subscribers.php:55
 #, php-format
 msgid "%1$s subscribers, page %2$d"
 msgstr "Subscriptores a %1$s, pagina %2$d"
 
 #. TRANS: Page notice for page with an overview of all subscribers
 #. TRANS: of the logged in user's own profile.
-#: actions/subscribers.php:68
 msgid "These are the people who listen to your notices."
 msgstr "Iste personas seque tu notas."
 
 #. TRANS: Page notice for page with an overview of all subscribers of a user other
 #. TRANS: than the logged in user. %s is the user nickname.
-#: actions/subscribers.php:74
 #, php-format
 msgid "These are the people who listen to %s's notices."
 msgstr "Iste personas seque le notas de %s."
 
 #. TRANS: Subscriber list text when the logged in user has no subscribers.
-#: actions/subscribers.php:114
 msgid ""
 "You have no subscribers. Try subscribing to people you know and they might "
 "return the favor."
@@ -6216,7 +5094,6 @@ msgstr ""
 
 #. TRANS: Subscriber list text when looking at the subscribers for a of a user other
 #. TRANS: than the logged in user that has no subscribers. %s is the user nickname.
-#: actions/subscribers.php:118
 #, php-format
 msgid "%s has no subscribers. Want to be the first?"
 msgstr "%s non ha subscriptores. Vole esser le prime?"
@@ -6226,7 +5103,6 @@ msgstr "%s non ha subscriptores. Vole esser le prime?"
 #. TRANS: This message contains a Markdown URL. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.
-#: actions/subscribers.php:127
 #, php-format
 msgid ""
 "%s has no subscribers. Why not [register an account](%%%%action.register%%%"
@@ -6237,20 +5113,17 @@ msgstr ""
 
 #. TRANS: Header for subscriptions overview for a user (not first page).
 #. TRANS: %1$s is a user nickname, %2$d is the page number.
-#: actions/subscriptions.php:55
 #, php-format
 msgid "%1$s subscriptions, page %2$d"
 msgstr "Subscriptiones de %1$s, pagina %2$d"
 
 #. TRANS: Page notice for page with an overview of all subscriptions
 #. TRANS: of the logged in user's own profile.
-#: actions/subscriptions.php:68
 msgid "These are the people whose notices you listen to."
 msgstr "Tu seque le notas de iste personas."
 
 #. TRANS: Page notice for page with an overview of all subscriptions of a user other
 #. TRANS: than the logged in user. %s is the user nickname.
-#: actions/subscriptions.php:74
 #, php-format
 msgid "These are the people whose notices %s listens to."
 msgstr "%s seque le notas de iste personas."
@@ -6259,7 +5132,6 @@ msgstr "%s seque le notas de iste personas."
 #. 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.
-#: actions/subscriptions.php:133
 #, php-format
 msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "
@@ -6279,69 +5151,55 @@ msgstr ""
 #. TRANS: than the logged in user that has no subscriptions. %s is the user nickname.
 #. TRANS: Subscription list text when looking at the subscriptions for a of a user that has none
 #. TRANS: as an anonymous user. %s is the user nickname.
-#: actions/subscriptions.php:141 actions/subscriptions.php:147
 #, php-format
 msgid "%s is not listening to anyone."
 msgstr "%s non seque alcuno."
 
 #. TRANS: Atom feed title. %s is a profile nickname.
-#: actions/subscriptions.php:176
 #, php-format
 msgid "Subscription feed for %s (Atom)"
 msgstr "Syndication de subscription pro %s (Atom)"
 
 #. TRANS: Checkbox label for enabling Jabber messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:241 lib/settingsnav.php:110
-#, fuzzy
 msgid "IM"
 msgstr "MI"
 
 #. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:256 lib/settingsnav.php:117
 msgid "SMS"
 msgstr "SMS"
 
 #. TRANS: Title for all but the first page of notices with tags.
 #. TRANS: %1$s is the tag, %2$d is the page number.
-#: actions/tag.php:73
 #, php-format
 msgid "Notices tagged with %1$s, page %2$d"
 msgstr "Notas etiquettate con %1$s, pagina %2$d"
 
-#: actions/tag.php:91
 #, php-format
 msgid "Notice feed for tag %s (RSS 1.0)"
 msgstr "Syndication de notas pro le etiquetta %s (RSS 1.0)"
 
-#: actions/tag.php:97
 #, php-format
 msgid "Notice feed for tag %s (RSS 2.0)"
 msgstr "Syndication de notas pro le etiquetta %s (RSS 2.0)"
 
-#: actions/tag.php:103
 #, php-format
 msgid "Notice feed for tag %s (Atom)"
 msgstr "Syndication de notas pro le etiquetta %s (Atom)"
 
-#: actions/tagother.php:39
 msgid "No ID argument."
 msgstr "Nulle parametro de ID."
 
-#: actions/tagother.php:65
 #, php-format
 msgid "Tag %s"
 msgstr "Etiquetta %s"
 
 #. TRANS: H2 for user profile information.
-#: actions/tagother.php:77 lib/userprofile.php:76
 msgid "User profile"
 msgstr "Profilo del usator"
 
-#: actions/tagother.php:120
 msgid "Tag user"
 msgstr "Etiquettar usator"
 
-#: actions/tagother.php:130
 msgid ""
 "Tags for this user (letters, numbers, -, ., and _), comma- or space- "
 "separated"
@@ -6349,49 +5207,39 @@ msgstr ""
 "Etiquettas pro iste usator (litteras, numeros, -, . e _), separate per "
 "commas o spatios"
 
-#: actions/tagother.php:157
 #, php-format
 msgid "Invalid tag: \"%s\""
 msgstr "Etiquetta invalide: \"%s\""
 
-#: actions/tagother.php:172
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 "Tu pote solmente etiquettar personas a qui tu es subscribite o qui es "
 "subscribite a te."
 
-#: actions/tagother.php:215
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
 "Usa iste formulario pro adder etiquettas a tu subscriptores o subscriptiones."
 
-#: actions/tagrss.php:35
 msgid "No such tag."
 msgstr "Etiquetta non existe."
 
 #. TRANS: Client error displayed when trying to unblock a non-blocked user.
-#: actions/unblock.php:59
 msgid "You haven't blocked that user."
 msgstr "Tu non ha blocate iste usator."
 
-#: actions/unsandbox.php:72
 msgid "User is not sandboxed."
 msgstr "Le usator non es in le cassa de sablo."
 
-#: actions/unsilence.php:72
 msgid "User is not silenced."
 msgstr "Le usator non es silentiate."
 
-#: actions/unsubscribe.php:77
 msgid "No profile ID in request."
 msgstr "Nulle ID de profilo in requesta."
 
-#: actions/unsubscribe.php:98
 msgid "Unsubscribed"
 msgstr "Subscription cancellate"
 
-#: actions/updateprofile.php:64
 #, php-format
 msgid ""
 "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
@@ -6399,173 +5247,140 @@ msgstr ""
 "Le licentia del fluxo que tu ascolta, ‘%1$s’, non es compatibile con le "
 "licentia del sito ‘%2$s’."
 
-#: actions/urlsettings.php:60
-#, fuzzy
 msgid "URL settings"
-msgstr "Configuration de messageria instantanee"
+msgstr "Configuration de URL"
 
 #. TRANS: Instructions for tab "Other" in user profile settings.
-#: actions/urlsettings.php:72
 msgid "Manage various other options."
 msgstr "Gestion de varie altere optiones."
 
 #. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
 #. TRANS: user's profile settings. This message has one space at the beginning. Use your
 #. TRANS: language's word separator here if it has one (most likely a single space).
-#: actions/urlsettings.php:115
 msgid " (free service)"
 msgstr " (servicio libere)"
 
-#: actions/urlsettings.php:121
-#, fuzzy
 msgid "[none]"
-msgstr "Nulle"
+msgstr "[nulle]"
 
-#: actions/urlsettings.php:122
 msgid "[internal]"
-msgstr ""
+msgstr "[interne]"
 
 #. TRANS: Label for dropdown with URL shortener services.
-#: actions/urlsettings.php:130
 msgid "Shorten URLs with"
 msgstr "Accurtar URLs con"
 
 #. TRANS: Tooltip for for dropdown with URL shortener services.
-#: actions/urlsettings.php:132
 msgid "Automatic shortening service to use."
 msgstr "Le servicio de accurtamento automatic a usar."
 
-#: actions/urlsettings.php:138
 msgid "URL longer than"
-msgstr ""
+msgstr "URL plus longe que"
 
-#: actions/urlsettings.php:141
 msgid "URLs longer than this will be shortened, 0 means always shorten."
 msgstr ""
+"Le URLs plus longe que isto essera abbreviate. 0 significa abbreviar sempre."
 
-#: actions/urlsettings.php:145
 msgid "Text longer than"
-msgstr ""
+msgstr "Texto plus longe que"
 
-#: actions/urlsettings.php:148
 msgid ""
 "URLs in notices longer than this will be shortened, 0 means always shorten."
 msgstr ""
+"Le URLs in notas plus longe que isto essera abbreviate. 0 significa "
+"abbreviar sempre."
 
 #. TRANS: Form validation error for form "Other settings" in user profile.
-#: actions/urlsettings.php:180
 msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr ""
 "Le servicio de accurtamento de URL es troppo longe (maximo 50 characteres)."
 
-#: actions/urlsettings.php:187
 msgid "Invalid number for max url length."
-msgstr ""
+msgstr "Numero invalide pro longitude maxime de URL."
 
-#: actions/urlsettings.php:193
-#, fuzzy
 msgid "Invalid number for max notice length."
-msgstr "Le contento del nota es invalide."
+msgstr "Numero invalide pro longitude maxime de nota."
 
-#: actions/urlsettings.php:238
 msgid "Error saving user URL shortening preferences."
 msgstr ""
+"Error durante le salveguarda del preferentias de usator pro le abbreviation "
+"de URL."
 
 #. TRANS: User admin panel title
-#: actions/useradminpanel.php:58
 msgctxt "TITLE"
 msgid "User"
 msgstr "Usator"
 
 #. TRANS: Instruction for user admin panel.
-#: actions/useradminpanel.php:69
 msgid "User settings for this StatusNet site"
 msgstr "Configurationes de usator pro iste sito de StatusNet"
 
 #. TRANS: Form validation error in user admin panel when a non-numeric character limit was set.
-#: actions/useradminpanel.php:147
 msgid "Invalid bio limit. Must be numeric."
 msgstr "Limite de biographia invalide. Debe esser un numero."
 
 #. TRANS: Form validation error in user admin panel when welcome text is too long.
-#: actions/useradminpanel.php:154
 msgid "Invalid welcome text. Maximum length is 255 characters."
 msgstr "Texto de benvenita invalide. Longitude maxime es 255 characteres."
 
 #. TRANS: Client error displayed when trying to set a non-existing user as default subscription for new
 #. TRANS: users in user admin panel. %1$s is the invalid nickname.
-#: actions/useradminpanel.php:166
 #, php-format
 msgid "Invalid default subscripton: \"%1$s\" is not a user."
 msgstr "Subscription predefinite invalide: \"%1$s\" non es usator."
 
-#: actions/useradminpanel.php:215 lib/action.php:565 lib/settingsnav.php:77
-#: lib/subgroupnav.php:81
 msgid "Profile"
 msgstr "Profilo"
 
 #. TRANS: Field label in user admin panel for setting the character limit for the bio field.
-#: actions/useradminpanel.php:220
 msgid "Bio Limit"
 msgstr "Limite de biographia"
 
 #. TRANS: Tooltip in user admin panel for setting the character limit for the bio field.
-#: actions/useradminpanel.php:222
 msgid "Maximum length of a profile bio in characters."
 msgstr "Le longitude maximal del biographia de un profilo in characteres."
 
 #. TRANS: Form legend in user admin panel.
-#: actions/useradminpanel.php:231
 msgid "New users"
 msgstr "Nove usatores"
 
 #. TRANS: Field label in user admin panel for setting new user welcome text.
-#: actions/useradminpanel.php:236
 msgid "New user welcome"
 msgstr "Message de benvenita a nove usatores"
 
 #. TRANS: Tooltip in user admin panel for setting new user welcome text.
-#: actions/useradminpanel.php:238
 msgid "Welcome text for new users (maximum 255 characters)."
 msgstr "Texto de benvenita pro nove usatores (maximo 255 characteres)."
 
 #. TRANS: Field label in user admin panel for setting default subscription for new users.
-#: actions/useradminpanel.php:244
 msgid "Default subscription"
 msgstr "Subscription predefinite"
 
 #. TRANS: Tooltip in user admin panel for setting default subscription for new users.
-#: actions/useradminpanel.php:246
 msgid "Automatically subscribe new users to this user."
 msgstr "Subscriber automaticamente le nove usatores a iste usator."
 
 #. TRANS: Form legend in user admin panel.
-#: actions/useradminpanel.php:256
 msgid "Invitations"
 msgstr "Invitationes"
 
 #. TRANS: Field label for checkbox in user admin panel for allowing users to invite friend using site e-mail.
-#: actions/useradminpanel.php:262
 msgid "Invitations enabled"
 msgstr "Invitationes activate"
 
 #. TRANS: Tooltip for checkbox in user admin panel for allowing users to invite friend using site e-mail.
-#: actions/useradminpanel.php:265
 msgid "Whether to allow users to invite new users."
 msgstr "Si le usatores pote invitar nove usatores."
 
 #. TRANS: Title for button to save user settings in user admin panel.
-#: actions/useradminpanel.php:302
 msgid "Save user settings."
 msgstr "Salveguardar configurationes de usator."
 
 #. TRANS: Page title.
-#: actions/userauthorization.php:109
 msgid "Authorize subscription"
 msgstr "Autorisar subscription"
 
 #. TRANS: Page notice on "Auhtorize subscription" page.
-#: actions/userauthorization.php:115
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
 "user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
@@ -6576,38 +5391,31 @@ msgstr ""
 "de alcuno, clicca \"Rejectar\"."
 
 #. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:200
 msgctxt "BUTTON"
 msgid "Accept"
 msgstr "Acceptar"
 
 #. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:202
 msgid "Subscribe to this user."
 msgstr "Subscriber a iste usator."
 
 #. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:204
 msgctxt "BUTTON"
 msgid "Reject"
 msgstr "Rejectar"
 
 #. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:206
 msgid "Reject this subscription."
 msgstr "Rejectar iste subscription."
 
 #. TRANS: Client error displayed for an empty authorisation request.
-#: actions/userauthorization.php:219
 msgid "No authorization request!"
 msgstr "Nulle requesta de autorisation!"
 
 #. TRANS: Accept message header from Authorise subscription page.
-#: actions/userauthorization.php:242
 msgid "Subscription authorized"
 msgstr "Subscription autorisate"
 
-#: actions/userauthorization.php:245
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to authorize the "
@@ -6618,11 +5426,9 @@ msgstr ""
 "subscription. Tu indicio de subscription es:"
 
 #. TRANS: Reject message header from Authorise subscription page.
-#: actions/userauthorization.php:256
 msgid "Subscription rejected"
 msgstr "Subscription rejectate"
 
-#: actions/userauthorization.php:259
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to fully reject the "
@@ -6634,35 +5440,30 @@ msgstr ""
 
 #. TRANS: Exception thrown when no valid user is found for an authorisation request.
 #. TRANS: %s is a listener URI.
-#: actions/userauthorization.php:296
 #, php-format
 msgid "Listener URI \"%s\" not found here."
 msgstr "URI de ascoltator \"%s\" non trovate hic."
 
 #. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
 #. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:303
 #, php-format
 msgid "Listenee URI \"%s\" is too long."
 msgstr "URI de ascoltato \"%s\" es troppo longe."
 
 #. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
 #. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:311
 #, php-format
 msgid "Listenee URI \"%s\" is a local user."
 msgstr "URI de ascoltato \"%s\" es un usator local."
 
 #. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
 #. TRANS: %s is a profile URL.
-#: actions/userauthorization.php:329
 #, php-format
 msgid "Profile URL \"%s\" is for a local user."
 msgstr "URL de profilo \"%s\" es de un usator local."
 
 #. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
 #. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
-#: actions/userauthorization.php:339
 #, php-format
 msgid ""
 "Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
@@ -6673,32 +5474,27 @@ msgstr ""
 
 #. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
 #. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:349
 #, php-format
 msgid "Avatar URL \"%s\" is not valid."
 msgstr "URL de avatar \"%s\" non es valide."
 
 #. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
 #. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:356
 #, php-format
 msgid "Cannot read avatar URL \"%s\"."
 msgstr "Non pote leger URL de avatar \"%s\"."
 
 #. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
 #. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:363
 #, php-format
 msgid "Wrong image type for avatar URL \"%s\"."
 msgstr "Typo de imagine incorrecte pro URL de avatar \"%s\"."
 
 #. TRANS: Page title for profile design page.
-#: actions/userdesignsettings.php:74 lib/designsettings.php:61
 msgid "Profile design"
 msgstr "Apparentia del profilo"
 
 #. TRANS: Instructions for profile design page.
-#: actions/userdesignsettings.php:84 lib/designsettings.php:72
 msgid ""
 "Customize the way your profile looks with a background image and a colour "
 "palette of your choice."
@@ -6706,44 +5502,33 @@ msgstr ""
 "Personalisa le apparentia de tu profilo con un imagine de fundo e un paletta "
 "de colores de tu preferentia."
 
-#: actions/userdesignsettings.php:289
 msgid "Enjoy your hotdog!"
 msgstr "Bon appetito!"
 
-#: actions/userdesignsettings.php:325
-#, fuzzy
 msgid "Design settings"
-msgstr "Salveguardar configurationes del sito"
+msgstr "Configuration del apparentia"
 
-#: actions/userdesignsettings.php:340
 msgid "View profile designs"
 msgstr "Vider apparentias de profilo"
 
-#: actions/userdesignsettings.php:341
 msgid "Show or hide profile designs."
 msgstr "Monstrar o celar apparentias de profilo."
 
-#: actions/userdesignsettings.php:348
-#, fuzzy
 msgid "Background file"
-msgstr "Fundo"
+msgstr "File de fundo"
 
 #. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number.
-#: actions/usergroups.php:66
 #, php-format
 msgid "%1$s groups, page %2$d"
 msgstr "Gruppos %1$s, pagina %2$d"
 
-#: actions/usergroups.php:132
 msgid "Search for more groups"
 msgstr "Cercar altere gruppos"
 
-#: actions/usergroups.php:159
 #, php-format
 msgid "%s is not a member of any group."
 msgstr "%s non es membro de alcun gruppo."
 
-#: actions/usergroups.php:164
 #, php-format
 msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
 msgstr ""
@@ -6754,18 +5539,14 @@ msgstr ""
 #. TRANS: %1$s is a group name, %2$s is a site name.
 #. TRANS: Message is used as a subtitle in atom user notice feed.
 #. TRANS: %1$s is a user name, %2$s is a site name.
-#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:70
-#: lib/atomusernoticefeed.php:95
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr "Actualisationes de %1$s in %2$s!"
 
-#: actions/version.php:75
 #, php-format
 msgid "StatusNet %s"
 msgstr "StatusNet %s"
 
-#: actions/version.php:155
 #, php-format
 msgid ""
 "This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
@@ -6774,16 +5555,13 @@ msgstr ""
 "Iste sito es realisate per %1$s version %2$s, copyright 2008-2010 StatusNet, "
 "Inc. e contributores."
 
-#: actions/version.php:163
 msgid "Contributors"
 msgstr "Contributores"
 
 #. TRANS: Menu item for site administration
-#: actions/version.php:167 lib/adminpanelaction.php:403
 msgid "License"
 msgstr "Licentia"
 
-#: actions/version.php:170
 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 "
@@ -6795,7 +5573,6 @@ msgstr ""
 "Free Software Foundation, o version 3 de iste licentia, o (a vostre "
 "election) omne version plus recente. "
 
-#: actions/version.php:176
 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 "
@@ -6807,7 +5584,6 @@ msgstr ""
 "USABILITATE PRO UN PARTICULAR SCOPO. Vide le GNU Affero General Public "
 "License pro ulterior detalios. "
 
-#: actions/version.php:182
 #, php-format
 msgid ""
 "You should have received a copy of the GNU Affero General Public License "
@@ -6817,52 +5593,42 @@ msgstr ""
 "insimul con iste programma. Si non, vide %s."
 
 #. TRANS: Form input field label for application name.
-#: actions/version.php:197 lib/applicationeditform.php:190
 msgid "Name"
 msgstr "Nomine"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:885
 msgid "Version"
 msgstr "Version"
 
-#: actions/version.php:199
 msgid "Author(s)"
 msgstr "Autor(es)"
 
 #. TRANS: Form input field label.
-#: actions/version.php:200 lib/applicationeditform.php:208
-#: lib/groupeditform.php:168
 msgid "Description"
 msgstr "Description"
 
 #. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:164
 msgid "Favor"
 msgstr "Favorir"
 
 #. TRANS: Ntofication given when a user marks a notice as favorite.
 #. TRANS: %1$s is a user nickname or full name, %2$s is a notice URI.
-#: classes/Fave.php:167
 #, php-format
 msgid "%1$s marked notice %2$s as a favorite."
 msgstr "%1$s marcava le nota %2$s como favorite."
 
 #. TRANS: Server exception thrown when a URL cannot be processed.
-#: classes/File.php:162
 #, php-format
 msgid "Cannot process URL '%s'"
 msgstr "Impossibile processar le URL '%s'"
 
 #. TRANS: Server exception thrown when... Robin thinks something is impossible!
-#: classes/File.php:194
 msgid "Robin thinks something is impossible."
 msgstr "Robin pensa que alique es impossibile."
 
 #. 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$s is used for plural.
-#: classes/File.php:210
 #, php-format
 msgid ""
 "No file may be larger than %1$d byte and the file you sent was %2$d bytes. "
@@ -6879,7 +5645,6 @@ msgstr[1] ""
 
 #. TRANS: Message given if an upload would exceed user quota.
 #. TRANS: %d (number) is the user quota in bytes and is used for plural.
-#: classes/File.php:223
 #, php-format
 msgid "A file this large would exceed your user quota of %d byte."
 msgid_plural "A file this large would exceed your user quota of %d bytes."
@@ -6888,7 +5653,6 @@ msgstr[1] "Un file de iste dimension excederea tu quota de usator de %d bytes."
 
 #. TRANS: Message given id an upload would exceed a user's monthly quota.
 #. TRANS: $d (number) is the monthly user quota in bytes and is used for plural.
-#: classes/File.php:235
 #, php-format
 msgid "A file this large would exceed your monthly quota of %d byte."
 msgid_plural "A file this large would exceed your monthly quota of %d bytes."
@@ -6896,108 +5660,89 @@ msgstr[0] "Un file de iste dimension excederea tu quota mensual de %d byte."
 msgstr[1] "Un file de iste dimension excederea tu quota mensual de %d bytes."
 
 #. TRANS: Client exception thrown if a file upload does not have a valid name.
-#: classes/File.php:282 classes/File.php:297
 msgid "Invalid filename."
 msgstr "Nomine de file invalide."
 
 #. TRANS: Exception thrown when joining a group fails.
-#: classes/Group_member.php:51
 msgid "Group join failed."
 msgstr "Le inscription al gruppo ha fallite."
 
 #. TRANS: Exception thrown when trying to leave a group the user is not a member of.
-#: classes/Group_member.php:64
 msgid "Not part of group."
 msgstr "Non es membro del gruppo."
 
 #. TRANS: Exception thrown when trying to leave a group fails.
-#: classes/Group_member.php:72
 msgid "Group leave failed."
 msgstr "Le cancellation del membrato del gruppo ha fallite."
 
 #. TRANS: Exception thrown providing an invalid profile ID.
 #. TRANS: %s is the invalid profile ID.
-#: classes/Group_member.php:85
 #, php-format
 msgid "Profile ID %s is invalid."
 msgstr "Le ID de profilo %s es invalide."
 
 #. TRANS: Exception thrown providing an invalid group ID.
 #. TRANS: %s is the invalid group ID.
-#: classes/Group_member.php:98
 #, php-format
 msgid "Group ID %s is invalid."
 msgstr "Le ID de gruppo %s es invalide."
 
 #. TRANS: Activity title.
-#: classes/Group_member.php:147 lib/joinform.php:114
 msgid "Join"
 msgstr "Inscriber"
 
 #. TRANS: Success message for subscribe to group attempt through OStatus.
 #. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
-#: classes/Group_member.php:151
 #, php-format
 msgid "%1$s has joined group %2$s."
 msgstr "%1$s se ha jungite al gruppo %2$s."
 
 #. TRANS: Server exception thrown when updating a local group fails.
-#: classes/Local_group.php:42
 msgid "Could not update local group."
 msgstr "Non poteva actualisar gruppo local."
 
 #. TRANS: Exception thrown when trying creating a login token failed.
 #. TRANS: %s is the user nickname for which token creation failed.
-#: classes/Login_token.php:78
 #, php-format
 msgid "Could not create login token for %s"
 msgstr "Non poteva crear indicio de identification pro %s"
 
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
-#: classes/Memcached_DataObject.php:556
 msgid "No database name or DSN found anywhere."
 msgstr "Nulle nomine de base de datos o DSN trovate."
 
 #. TRANS: Client exception thrown when a user tries to send a direct message while being banned from sending them.
-#: classes/Message.php:45
 msgid "You are banned from sending direct messages."
 msgstr "Il te es prohibite inviar messages directe."
 
 #. TRANS: Message given when a message could not be stored on the server.
-#: classes/Message.php:69
 msgid "Could not insert message."
 msgstr "Non poteva inserer message."
 
 #. TRANS: Message given when a message could not be updated on the server.
-#: classes/Message.php:80
 msgid "Could not update message with new URI."
 msgstr "Non poteva actualisar message con nove URI."
 
 #. TRANS: Server exception thrown when a user profile for a notice cannot be found.
 #. TRANS: %1$d is a profile ID (number), %2$d is a notice ID (number).
-#: classes/Notice.php:98
 #, php-format
 msgid "No such profile (%1$d) for notice (%2$d)."
 msgstr "Nulle profilo (%1$d) trovate pro le nota (%2$d)."
 
 #. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:199
 #, php-format
 msgid "Database error inserting hashtag: %s"
 msgstr "Error in base de datos durante insertion del marca (hashtag): %s"
 
 #. TRANS: Client exception thrown if a notice contains too many characters.
-#: classes/Notice.php:279
 msgid "Problem saving notice. Too long."
 msgstr "Problema salveguardar nota. Troppo longe."
 
 #. TRANS: Client exception thrown when trying to save a notice for an unknown user.
-#: classes/Notice.php:284
 msgid "Problem saving notice. Unknown user."
 msgstr "Problema salveguardar nota. Usator incognite."
 
 #. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
-#: classes/Notice.php:290
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
@@ -7005,7 +5750,6 @@ msgstr ""
 "alcun minutas."
 
 #. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
-#: classes/Notice.php:297
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
 "few minutes."
@@ -7014,42 +5758,35 @@ msgstr ""
 "novo post alcun minutas."
 
 #. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:305
 msgid "You are banned from posting notices on this site."
 msgstr "Il te es prohibite publicar notas in iste sito."
 
 #. TRANS: Server exception thrown when a notice cannot be saved.
 #. TRANS: Server exception thrown when a notice cannot be updated.
-#: classes/Notice.php:372 classes/Notice.php:399
 msgid "Problem saving notice."
 msgstr "Problema salveguardar nota."
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:929
 msgid "Bad type provided to saveKnownGroups."
 msgstr "Mal typo fornite a saveKnownGroups."
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:1028
 msgid "Problem saving group inbox."
 msgstr "Problema salveguardar le cassa de entrata del gruppo."
 
 #. TRANS: Server exception thrown when a reply cannot be saved.
 #. TRANS: %1$d is a notice ID, %2$d is the ID of the mentioned user.
-#: classes/Notice.php:1144
 #, php-format
 msgid "Could not save reply for %1$d, %2$d."
 msgstr "Non poteva salveguardar le responsa pro %1$d, %2$d."
 
 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1663
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
 
 #. TRANS: Full name of a profile or group followed by nickname in parens
-#: classes/Profile.php:172 classes/User_group.php:242
 #, php-format
 msgctxt "FANCYNAME"
 msgid "%1$s (%2$s)"
@@ -7057,14 +5794,12 @@ msgstr "%1$s (%2$s)"
 
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:779
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr "Non pote revocar le rolo \"%1$s\" del usator #%2$d; non existe."
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:788
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -7072,251 +5807,192 @@ msgstr ""
 "datos."
 
 #. TRANS: Exception thrown when a right for a non-existing user profile is checked.
-#: classes/Remote_profile.php:54
 msgid "Missing profile."
 msgstr "Profilo mancante."
 
 #. TRANS: Exception thrown when a tag cannot be saved.
-#: classes/Status_network.php:338
 msgid "Unable to save tag."
 msgstr "Impossibile salveguardar le etiquetta."
 
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#: classes/Subscription.php:77 lib/oauthstore.php:482
 msgid "You have been banned from subscribing."
 msgstr "Tu ha essite blocate del subscription."
 
 #. TRANS: Exception thrown when trying to subscribe while already subscribed.
-#: classes/Subscription.php:82
 msgid "Already subscribed!"
 msgstr "Ja subscribite!"
 
 #. TRANS: Exception thrown when trying to subscribe to a user who has blocked the subscribing user.
-#: classes/Subscription.php:87
 msgid "User has blocked you."
 msgstr "Le usator te ha blocate."
 
 #. TRANS: Exception thrown when trying to unsibscribe without a subscription.
-#: classes/Subscription.php:176
 msgid "Not subscribed!"
 msgstr "Non subscribite!"
 
 #. TRANS: Exception thrown when trying to unsubscribe a user from themselves.
-#: classes/Subscription.php:183
 msgid "Could not delete self-subscription."
 msgstr "Non poteva deler auto-subscription."
 
 #. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
-#: classes/Subscription.php:211
 msgid "Could not delete subscription OMB token."
 msgstr "Non poteva deler le indicio OMB del subscription."
 
 #. TRANS: Exception thrown when a subscription could not be deleted on the server.
-#: classes/Subscription.php:223
 msgid "Could not delete subscription."
 msgstr "Non poteva deler subscription."
 
 #. TRANS: Activity tile when subscribing to another person.
-#: classes/Subscription.php:265
 msgid "Follow"
 msgstr "Sequer"
 
 #. TRANS: Notification given when one person starts following another.
 #. TRANS: %1$s is the subscriber, %2$s is the subscribed.
-#: classes/Subscription.php:268
 #, php-format
 msgid "%1$s is now following %2$s."
 msgstr "%1$s seque ora %2$s."
 
 #. TRANS: Notice given on user registration.
 #. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:390
 #, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr "Benvenite a %1$s, @%2$s!"
 
 #. TRANS: Server exception.
-#: classes/User.php:923
 msgid "No single user defined for single-user mode."
 msgstr "Nulle signule usator definite pro le modo de singule usator."
 
 #. TRANS: Server exception.
-#: classes/User.php:927
 msgid "Single-user mode code called when not enabled."
 msgstr "Codice in modo de usator singule appellate sin esser activate."
 
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:522
 msgid "Could not create group."
 msgstr "Non poteva crear gruppo."
 
 #. TRANS: Server exception thrown when updating a group URI failed.
-#: classes/User_group.php:532
 msgid "Could not set group URI."
 msgstr "Non poteva definir le URL del gruppo."
 
 #. TRANS: Server exception thrown when setting group membership failed.
-#: classes/User_group.php:555
 msgid "Could not set group membership."
 msgstr "Non poteva configurar le membrato del gruppo."
 
 #. TRANS: Server exception thrown when saving local group information failed.
-#: classes/User_group.php:570
 msgid "Could not save local group info."
 msgstr "Non poteva salveguardar le informationes del gruppo local."
 
 #. TRANS: Exception thrown when an account could not be located when it should be moved.
 #. TRANS: %s is the remote site.
-#: lib/accountmover.php:65
 #, php-format
 msgid "Cannot locate account %s."
 msgstr "Non pote localisar le conto %s."
 
 #. TRANS: Exception thrown when a service document could not be located account move.
 #. TRANS: %s is the remote site.
-#: lib/accountmover.php:106
 #, php-format
 msgid "Cannot find XRD for %s."
 msgstr "Non pote trovar XRD pro %s."
 
 #. TRANS: Exception thrown when an account could not be located when it should be moved.
 #. TRANS: %s is the remote site.
-#: lib/accountmover.php:131
 #, php-format
 msgid "No AtomPub API service for %s."
 msgstr "Il non ha un servicio API AtomPub pro %s."
 
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: lib/action.php:161
 #, php-format
 msgid "%1$s - %2$s"
 msgstr "%1$s - %2$s"
 
 #. TRANS: Page title for a page without a title set.
-#: lib/action.php:177
 msgid "Untitled page"
 msgstr "Pagina sin titulo"
 
 #. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.
-#: lib/action.php:325
 msgctxt "TOOLTIP"
 msgid "Show more"
 msgstr "Monstrar plus"
 
 #. TRANS: Inline reply form submit button: submits a reply comment.
-#: lib/action.php:328
 #, fuzzy
 msgctxt "BUTTON"
-msgid "Comment"
-msgstr "Contento"
+msgid "Reply"
+msgstr "Responder"
 
 #. TRANS: Placeholder text for inline reply form. Clicking in this box will turn it into a mini notice form.
-#: lib/action.php:331
-msgid "Add a comment..."
+msgid "Write a reply..."
 msgstr ""
 
-#: lib/action.php:559 lib/personalgroupnav.php:99
-#, fuzzy
 msgid "Home"
-msgstr "Pagina personal"
+msgstr "Initio"
 
-#: lib/action.php:560
-#, fuzzy
 msgid "Friends timeline"
-msgstr "Chronologia de %s"
+msgstr "Chronologia de amicos"
 
-#: lib/action.php:566
-#, fuzzy
 msgid "Your profile"
-msgstr "Profilo del gruppo"
+msgstr "Tu profilo"
 
-#: lib/action.php:570 lib/action.php:593 lib/publicgroupnav.php:78
 msgid "Public"
 msgstr "Public"
 
-#: lib/action.php:571 lib/action.php:594
-#, fuzzy
 msgid "Everyone on this site"
-msgstr "Cercar personas in iste sito"
+msgstr "Omnes in iste sito"
 
-#: lib/action.php:575
-#, fuzzy
 msgid "Settings"
-msgstr "Parametros de SMS"
+msgstr "Configurationes"
 
-#: lib/action.php:576
-#, fuzzy
 msgid "Change your personal settings"
-msgstr "Cambiar le optiones de tu profilo"
+msgstr "Cambiar tu optiones personal"
 
-#: lib/action.php:582
-#, fuzzy
 msgid "Site configuration"
-msgstr "Configuration del usator"
+msgstr "Configuration del sito"
 
-#: lib/action.php:587
-#, fuzzy
 msgid "Logout"
 msgstr "Clauder session"
 
-#: lib/action.php:588
-#, fuzzy
 msgid "Logout from the site"
 msgstr "Terminar le session del sito"
 
-#: lib/action.php:599
-#, fuzzy
 msgid "Login to the site"
 msgstr "Authenticar te a iste sito"
 
-#: lib/action.php:606
-#, fuzzy
 msgid "Search"
 msgstr "Cercar"
 
-#: lib/action.php:607
-#, fuzzy
 msgid "Search the site"
-msgstr "Cercar in sito"
+msgstr "Cercar in le sito"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:864
 msgid "Help"
 msgstr "Adjuta"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:867
 msgid "About"
 msgstr "A proposito"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:870
 msgid "FAQ"
 msgstr "FAQ"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:875
 msgid "TOS"
 msgstr "CdS"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:879
 msgid "Privacy"
 msgstr "Confidentialitate"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:882
 msgid "Source"
 msgstr "Fonte"
 
 #. TRANS: Secondary navigation menu option leading to e-mail contact information on the
 #. TRANS: StatusNet site, where to report bugs, ...
-#: lib/action.php:889
 msgid "Contact"
 msgstr "Contacto"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:892
 msgid "Badge"
 msgstr "Insignia"
 
@@ -7324,7 +6000,6 @@ msgstr "Insignia"
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:921
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7334,7 +6009,6 @@ msgstr ""
 "%](%%site.broughtbyurl%%)."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:924
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** es un servicio de microblog."
@@ -7343,7 +6017,6 @@ msgstr "**%%site.name%%** es un servicio de microblog."
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:931
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7356,95 +6029,79 @@ msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:949
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr "Le contento e datos de %1$s es private e confidential."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:956
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr "Contento e datos sub copyright de %1$s. Tote le derectos reservate."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:960
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 "Contento e datos sub copyright del contributores. Tote le derectos reservate."
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:992
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr "Tote le contento e datos de %1$s es disponibile sub le licentia %2$s."
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1335
 msgid "After"
 msgstr "Post"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1345
 msgid "Before"
 msgstr "Ante"
 
 #. TRANS: Client exception thrown when a feed instance is a DOMDocument.
-#: lib/activity.php:125
 msgid "Expecting a root feed element but got a whole XML document."
 msgstr ""
 "Expectava le elemento-radice de un syndication, ma recipeva un documento XML "
 "integre."
 
 #. TRANS: Client exception thrown when using an unknown verb for the activity importer.
-#: lib/activityimporter.php:81
 #, php-format
 msgid "Unknown verb: \"%s\"."
 msgstr "Verbo incognite: \"%s\"."
 
 #. TRANS: Client exception thrown when trying to force a subscription for an untrusted user.
-#: lib/activityimporter.php:107
 msgid "Cannot force subscription for untrusted user."
 msgstr "Non pote fortiar un subscription pro un usator non de confidentia."
 
 #. TRANS: Client exception thrown when trying to for a remote user to subscribe.
-#: lib/activityimporter.php:117
 msgid "Cannot force remote user to subscribe."
 msgstr "Non pote fortiar un usator remote a cancellar le subscription."
 
 #. TRANS: Client exception thrown when trying to subscribe to an unknown profile.
-#: lib/activityimporter.php:132
 msgid "Unknown profile."
 msgstr "Profilo incognite."
 
 #. TRANS: Client exception thrown when trying to import an event not related to the importing user.
-#: lib/activityimporter.php:138
 msgid "This activity seems unrelated to our user."
 msgstr "Iste activitate pare inconnexe a nostre usator."
 
 #. TRANS: Client exception thrown when trying to join a remote group that is not a group.
-#: lib/activityimporter.php:154
 msgid "Remote profile is not a group!"
 msgstr "Le profilo remote non es un gruppo!"
 
 #. TRANS: Client exception thrown when trying to join a group the importing user is already a member of.
-#: lib/activityimporter.php:163
 msgid "User is already a member of this group."
 msgstr "Le usator es ja membro de iste gruppo."
 
 #. TRANS: Client exception thrown when trying to import a notice by another user.
 #. TRANS: %1$s is the source URI of the notice, %2$s is the URI of the author.
-#: lib/activityimporter.php:201
 #, php-format
 msgid "Already know about notice %1$s and  it has a different author %2$s."
 msgstr "Le nota %1$s es ja cognoscite e ha un altere autor %2$s."
 
 #. TRANS: Client exception thrown when trying to overwrite the author information for a non-trusted user during import.
-#: lib/activityimporter.php:207
 msgid "Not overwriting author info for non-trusted user."
 msgstr ""
 "Non es superscribite le information de autor pro un usator non de "
@@ -7452,12 +6109,10 @@ msgstr ""
 
 #. TRANS: Client exception thrown when trying to import a notice without content.
 #. TRANS: %s is the notice URI.
-#: lib/activityimporter.php:223
 #, php-format
 msgid "No content for notice %s."
 msgstr "Nulle contento pro nota %s."
 
-#: lib/activitymover.php:84
 #, php-format
 msgid "No such user %s."
 msgstr "Le usator %s non existe."
@@ -7468,171 +6123,138 @@ msgstr "Le usator %s non existe."
 #. TRANS: %1$s is a URL, %2$s is the status, %s$s is the fail reason.
 #. TRANS: Exception thrown when post to collection fails with a status that is not handled.
 #. TRANS: %1$s is a URL, %2$s is the status, %s$s is the fail reason.
-#: lib/activitysink.php:163 lib/activitysink.php:167 lib/activitysink.php:172
 #, php-format
 msgctxt "URLSTATUSREASON"
 msgid "%1$s %2$s %3$s"
 msgstr "%1$s %2$s %3$s"
 
 #. TRANS: Client exception thrown when there is no source attribute.
-#: lib/activityutils.php:200
 msgid "Can't handle remote content yet."
 msgstr "Non pote ancora tractar contento remote."
 
 #. TRANS: Client exception thrown when there embedded XML content is found that cannot be processed yet.
-#: lib/activityutils.php:237
 msgid "Can't handle embedded XML content yet."
 msgstr "Non pote ancora tractar contento XML incastrate."
 
 #. TRANS: Client exception thrown when base64 encoded content is found that cannot be processed yet.
-#: lib/activityutils.php:242
 msgid "Can't handle embedded Base64 content yet."
 msgstr "Non pote ancora tractar contento Base64 incastrate."
 
 #. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights.
-#: lib/adminpanelaction.php:96
 msgid "You cannot make changes to this site."
 msgstr "Tu non pote facer modificationes in iste sito."
 
 #. TRANS: Client error message throw when a certain panel's settings cannot be changed.
-#: lib/adminpanelaction.php:108
 msgid "Changes to that panel are not allowed."
 msgstr "Le modification de iste pannello non es permittite."
 
 #. TRANS: Client error message.
-#: lib/adminpanelaction.php:222
 msgid "showForm() not implemented."
 msgstr "showForm() non implementate."
 
 #. TRANS: Client error message
-#: lib/adminpanelaction.php:250
 msgid "saveSettings() not implemented."
 msgstr "saveSettings() non implementate."
 
 #. TRANS: Client error message thrown if design settings could not be deleted in
 #. TRANS: the admin panel Design.
-#: lib/adminpanelaction.php:274
 msgid "Unable to delete design setting."
 msgstr "Impossibile deler configuration de apparentia."
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:337
 msgid "Basic site configuration"
 msgstr "Configuration basic del sito"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:339
 msgctxt "MENU"
 msgid "Site"
 msgstr "Sito"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:345
 msgid "Design configuration"
 msgstr "Configuration del apparentia"
 
 #. TRANS: Menu item for site administration
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/adminpanelaction.php:347 lib/groupnav.php:135
 msgctxt "MENU"
 msgid "Design"
 msgstr "Apparentia"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:353
 msgid "User configuration"
 msgstr "Configuration del usator"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:110
 msgid "User"
 msgstr "Usator"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:361
 msgid "Access configuration"
 msgstr "Configuration del accesso"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:369
 msgid "Paths configuration"
 msgstr "Configuration del camminos"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:377
 msgid "Sessions configuration"
 msgstr "Configuration del sessiones"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:385
 msgid "Edit site notice"
 msgstr "Modificar aviso del sito"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:387
 msgid "Site notice"
 msgstr "Aviso del sito"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:393
 msgid "Snapshots configuration"
 msgstr "Configuration del instantaneos"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:401
 msgid "Set site license"
 msgstr "Definir licentia del sito"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:409
-#, fuzzy
 msgid "Plugins configuration"
-msgstr "Configuration del camminos"
+msgstr "Configuration del plug-ins"
 
 #. TRANS: Client error 401.
-#: lib/apiauth.php:111
 msgid "API resource requires read-write access, but you only have read access."
 msgstr ""
 "Le ressource de API require accesso pro lectura e scriptura, ma tu ha "
 "solmente accesso pro lectura."
 
 #. TRANS: OAuth exception thrown when no application is found for a given consumer key.
-#: lib/apiauth.php:177
 msgid "No application for that consumer key."
 msgstr "Nulle application pro iste clave de consumitor."
 
-#: lib/apiauth.php:202 lib/apiauth.php:284
 msgid "Not allowed to use API."
 msgstr "Uso del API non permittite."
 
 #. TRANS: OAuth exception given when an incorrect access token was given for a user.
-#: lib/apiauth.php:225
 msgid "Bad access token."
 msgstr "Mal indicio de accesso."
 
 #. TRANS: OAuth exception given when no user was found for a given token (no token was found).
-#: lib/apiauth.php:230
 msgid "No user for that token."
 msgstr "Nulle usator pro iste indicio."
 
 #. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel".
 #. TRANS: Client error thrown when authentication fails.
-#: lib/apiauth.php:272 lib/apiauth.php:302
 msgid "Could not authenticate you."
 msgstr "Non poteva authenticar te."
 
 #. TRANS: Server error displayed when trying to create an anynymous OAuth consumer.
-#: lib/apioauthstore.php:45
 msgid "Could not create anonymous consumer."
 msgstr "Non poteva crear consumitor anonyme."
 
 #. TRANS: Server error displayed when trying to create an anynymous OAuth application.
-#: lib/apioauthstore.php:69
 msgid "Could not create anonymous OAuth application."
 msgstr "Non poteva crear application OAuth anonyme."
 
 #. TRANS: Exception thrown when no token association could be found.
-#: lib/apioauthstore.php:151
 msgid ""
 "Could not find a profile and application associated with the request token."
 msgstr ""
@@ -7640,45 +6262,37 @@ msgstr ""
 "requesta."
 
 #. TRANS: Exception thrown when no access token can be issued.
-#: lib/apioauthstore.php:209
 msgid "Could not issue access token."
 msgstr "Non poteva emitter le indicio de accesso."
 
-#: lib/apioauthstore.php:317
 msgid "Database error inserting OAuth application user."
 msgstr ""
 "Error del base de datos durante le insertion del usator del application "
 "OAuth."
 
-#: lib/apioauthstore.php:345
 msgid "Database error updating OAuth application user."
 msgstr ""
 "Error del base de datos durante le actualisation del usator del application "
 "OAuth."
 
 #. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
-#: lib/apioauthstore.php:371
 msgid "Tried to revoke unknown token."
 msgstr "Tentava revocar un indicio non cognoscite."
 
 #. TRANS: Exception thrown when an attempt is made to remove a revoked token.
-#: lib/apioauthstore.php:376
 msgid "Failed to delete revoked token."
 msgstr "Falleva de deler le indicio revocate."
 
 #. TRANS: Form input field label for application icon.
-#: lib/applicationeditform.php:177
 msgid "Icon"
 msgstr "Icone"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:182
 msgid "Icon for this application"
 msgstr "Icone pro iste application"
 
 #. TRANS: Form input field instructions.
 #. TRANS: %d is the number of available characters for the description.
-#: lib/applicationeditform.php:201
 #, php-format
 msgid "Describe your application in %d character"
 msgid_plural "Describe your application in %d characters"
@@ -7686,207 +6300,168 @@ msgstr[0] "Describe tu application in %d character"
 msgstr[1] "Describe tu application in %d characteres"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:205
 msgid "Describe your application"
 msgstr "Describe tu application"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:216
 msgid "URL of the homepage of this application"
 msgstr "URL del pagina initial de iste application"
 
 #. TRANS: Form input field label.
-#: lib/applicationeditform.php:218
 msgid "Source URL"
 msgstr "URL de origine"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:225
 msgid "Organization responsible for this application"
 msgstr "Organisation responsabile de iste application"
 
 #. TRANS: Form input field label.
-#: lib/applicationeditform.php:227
 msgid "Organization"
 msgstr "Organisation"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:234
 msgid "URL for the homepage of the organization"
 msgstr "URL del pagina initial del organisation"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:243
 msgid "URL to redirect to after authentication"
 msgstr "URL verso le qual rediriger post authentication"
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:271
 msgid "Browser"
 msgstr "Navigator"
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:288
 msgid "Desktop"
 msgstr "Scriptorio"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:290
 msgid "Type of application, browser or desktop"
 msgstr "Typo de application, navigator o scriptorio"
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:314
 msgid "Read-only"
 msgstr "Lectura solmente"
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:334
 msgid "Read-write"
 msgstr "Lectura e scriptura"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:336
 msgid "Default access for this application: read-only, or read-write"
 msgstr ""
 "Accesso predefinite pro iste application: lectura solmente, o lectura e "
 "scriptura"
 
 #. TRANS: Submit button title.
-#: lib/applicationeditform.php:353
 msgid "Cancel"
 msgstr "Cancellar"
 
-#: lib/applicationlist.php:247
 msgid " by "
 msgstr " per "
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:260
 msgid "read-write"
 msgstr "lectura-scriptura"
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:262
 msgid "read-only"
 msgstr "lectura solmente"
 
 #. TRANS: Used in application list. %1$s is a modified date, %2$s is access type ("read-write" or "read-only")
-#: lib/applicationlist.php:268
 #, php-format
 msgid "Approved %1$s - \"%2$s\" access."
 msgstr "Accesso \"%2$s\" approbate le %1$s."
 
 #. TRANS: Access token in the application list.
 #. TRANS: %s are the first 7 characters of the access token.
-#: lib/applicationlist.php:282
 #, php-format
 msgid "Access token starting with: %s"
 msgstr "Indicio de accesso comenciante con: %s"
 
 #. TRANS: Button label
-#: lib/applicationlist.php:298
 msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "Revocar"
 
-#: lib/atom10feed.php:113
 msgid "Author element must contain a name element."
 msgstr "Le elemento \"author\" debe continer un elemento \"name\"."
 
 #. TRANS: Server exception thrown when using the method setActivitySubject() in the class Atom10Feed.
-#: lib/atom10feed.php:160
 msgid "Do not use this method!"
 msgstr "Non usa iste methodo!"
 
 #. TRANS: Title.
-#: lib/attachmentnoticesection.php:67
 msgid "Notices where this attachment appears"
 msgstr "Notas ubi iste annexo appare"
 
 #. TRANS: Title.
-#: lib/attachmenttagcloudsection.php:48
 msgid "Tags for this attachment"
 msgstr "Etiquettas pro iste annexo"
 
 #. TRANS: Exception thrown when a password change fails.
-#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:227
 msgid "Password changing failed."
 msgstr "Cambio del contrasigno fallite."
 
 #. TRANS: Exception thrown when a password change attempt fails because it is not allowed.
-#: lib/authenticationplugin.php:238
 msgid "Password changing is not allowed."
 msgstr "Cambio del contrasigno non permittite."
 
 #. TRANS: Title for the form to block a user.
-#: lib/blockform.php:68
 msgid "Block"
 msgstr "Blocar"
 
 #. TRANS: Description of the form to block a user.
-#: lib/blockform.php:79
 msgid "Block this user"
 msgstr "Blocar iste usator"
 
 #. TRANS: Title for command results.
-#: lib/channel.php:104 lib/channel.php:125
 msgid "Command results"
 msgstr "Resultatos del commando"
 
 #. TRANS: Title for command results.
-#: lib/channel.php:138
 msgid "AJAX error"
 msgstr "Error de AJAX"
 
 #. TRANS: E-mail subject when a command has completed.
-#: lib/channel.php:177 lib/mailhandler.php:143
 msgid "Command complete"
 msgstr "Commando complete"
 
 #. TRANS: E-mail subject when a command has failed.
-#: lib/channel.php:188
 msgid "Command failed"
 msgstr "Commando fallite"
 
 #. TRANS: Command exception text shown when a notice ID is requested that does not exist.
-#: lib/command.php:82 lib/command.php:106
 msgid "Notice with that id does not exist."
 msgstr "Non existe un nota con iste ID."
 
 #. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
 #. TRANS: Error text shown when a last user notice is requested and it does not exist.
-#: lib/command.php:99 lib/command.php:642
 msgid "User has no last notice."
 msgstr "Le usator non ha un ultime nota."
 
 #. TRANS: Message given requesting a profile for a non-existing user.
 #. TRANS: %s is the nickname of the user for which the profile could not be found.
-#: lib/command.php:128
 #, php-format
 msgid "Could not find a user with nickname %s."
 msgstr "Non poteva trovar un usator con pseudonymo %s."
 
 #. TRANS: Message given getting a non-existing user.
 #. TRANS: %s is the nickname of the user that could not be found.
-#: lib/command.php:148
 #, php-format
 msgid "Could not find a local user with nickname %s."
 msgstr "Non poteva trovar un usator local con pseudonymo %s."
 
 #. TRANS: Error text shown when an unimplemented command is given.
-#: lib/command.php:183
 msgid "Sorry, this command is not yet implemented."
 msgstr "Pardono, iste commando non es ancora implementate."
 
 #. TRANS: Command exception text shown when a user tries to nudge themselves.
-#: lib/command.php:229
 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr "Non ha multe senso pulsar te mesme!"
 
 #. TRANS: Message given having nudged another user.
 #. TRANS: %s is the nickname of the user that was nudged.
-#: lib/command.php:238
 #, php-format
 msgid "Nudge sent to %s."
 msgstr "Pulsata inviate a %s."
@@ -7895,7 +6470,6 @@ msgstr "Pulsata inviate a %s."
 #. TRANS: %1$s is the number of other user the user is subscribed to.
 #. TRANS: %2$s is the number of users that are subscribed to the user.
 #. TRANS: %3$s is the number of notices the user has sent.
-#: lib/command.php:268
 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"
@@ -7907,40 +6481,33 @@ msgstr ""
 "Notas: %3$s"
 
 #. TRANS: Error message text shown when a favorite could not be set because it has already been favorited.
-#: lib/command.php:298
-#, fuzzy
 msgid "Could not create favorite: already favorited."
-msgstr "Non poteva crear le favorite."
+msgstr "Non poteva crear le favorite: ja es favorite."
 
 #. TRANS: Text shown when a notice has been marked as favourite successfully.
-#: lib/command.php:324
 msgid "Notice marked as fave."
 msgstr "Nota marcate como favorite."
 
 #. TRANS: Message given having added a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:369
 #, php-format
 msgid "%1$s joined group %2$s."
 msgstr "%1$s se jungeva al gruppo %2$s."
 
 #. TRANS: Message given having removed a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:417
 #, php-format
 msgid "%1$s left group %2$s."
 msgstr "%1$s quitava le gruppo %2$s."
 
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: lib/command.php:438
 #, php-format
 msgctxt "WHOIS"
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
 
 #. TRANS: Whois output. %s is the full name of the queried user.
-#: lib/command.php:442
 #, php-format
 msgid "Fullname: %s"
 msgstr "Nomine complete: %s"
@@ -7948,7 +6515,6 @@ msgstr "Nomine complete: %s"
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a location.
-#: lib/command.php:446 lib/mail.php:275
 #, php-format
 msgid "Location: %s"
 msgstr "Loco: %s"
@@ -7956,20 +6522,17 @@ msgstr "Loco: %s"
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a homepage.
-#: lib/command.php:450 lib/mail.php:279
 #, php-format
 msgid "Homepage: %s"
 msgstr "Pagina personal: %s"
 
 #. TRANS: Whois output. %s is the bio information of the queried user.
-#: lib/command.php:454
 #, php-format
 msgid "About: %s"
 msgstr "A proposito: %s"
 
 #. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).
 #. TRANS: %s is a remote profile.
-#: lib/command.php:483
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
@@ -7980,33 +6543,32 @@ msgstr ""
 
 #. TRANS: Message given if content is too long. %1$sd is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:500
 #, php-format
 msgid "Message too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
 msgstr[0] "Message troppo longe - maximo es %1$d character, tu inviava %2$d."
 msgstr[1] "Message troppo longe - maximo es %1$d characteres, tu inviava %2$d."
 
+#. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
+msgid "You can't send a message to this user."
+msgstr "Tu non pote inviar un message a iste usator."
+
 #. TRANS: Error text shown sending a direct message fails with an unknown reason.
-#: lib/command.php:528
 msgid "Error sending direct message."
 msgstr "Error durante le invio del message directe."
 
 #. TRANS: Message given having repeated a notice from another user.
 #. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:565
 #, php-format
 msgid "Notice from %s repeated."
 msgstr "Nota de %s repetite."
 
 #. TRANS: Error text shown when repeating a notice fails with an unknown reason.
-#: lib/command.php:568
 msgid "Error repeating notice."
 msgstr "Error durante le repetition del nota."
 
 #. TRANS: Message given if content of a notice for a reply is too long. %1$d is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:603
 #, php-format
 msgid "Notice too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Notice too long - maximum is %1$d characters, you sent %2$d."
@@ -8015,80 +6577,66 @@ msgstr[1] "Nota troppo longe - maximo es %1$d characteres, tu inviava %2$d."
 
 #. TRANS: Text shown having sent a reply to a notice successfully.
 #. TRANS: %s is the nickname of the user of the notice the reply was sent to.
-#: lib/command.php:616
 #, php-format
 msgid "Reply to %s sent."
 msgstr "Responsa a %s inviate."
 
 #. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
-#: lib/command.php:619
 msgid "Error saving notice."
 msgstr "Errur durante le salveguarda del nota."
 
 #. TRANS: Error text shown when no username was provided when issuing a subscribe command.
-#: lib/command.php:666
 msgid "Specify the name of the user to subscribe to."
 msgstr "Specifica le nomine del usator al qual subscriber te."
 
 #. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
-#: lib/command.php:675
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "Impossibile subscriber se a profilos OMB per medio de un commando."
 
 #. TRANS: Text shown after having subscribed to another user successfully.
 #. TRANS: %s is the name of the user the subscription was requested for.
-#: lib/command.php:683
 #, php-format
 msgid "Subscribed to %s."
 msgstr "Subscribite a %s."
 
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.
-#: lib/command.php:704 lib/command.php:815
 msgid "Specify the name of the user to unsubscribe from."
 msgstr "Specifica le nomine del usator al qual cancellar le subscription."
 
 #. TRANS: Text shown after having unsubscribed from another user successfully.
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:715
 #, php-format
 msgid "Unsubscribed from %s."
 msgstr "Subscription a %s cancellate."
 
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
-#: lib/command.php:735 lib/command.php:761
 msgid "Command not yet implemented."
 msgstr "Commando non ancora implementate."
 
 #. TRANS: Text shown when issuing the command "off" successfully.
-#: lib/command.php:739
 msgid "Notification off."
 msgstr "Notification disactivate."
 
 #. TRANS: Error text shown when the command "off" fails for an unknown reason.
-#: lib/command.php:742
 msgid "Can't turn off notification."
 msgstr "Non pote disactivar notification."
 
 #. TRANS: Text shown when issuing the command "on" successfully.
-#: lib/command.php:765
 msgid "Notification on."
 msgstr "Notification activate."
 
 #. TRANS: Error text shown when the command "on" fails for an unknown reason.
-#: lib/command.php:768
 msgid "Can't turn on notification."
 msgstr "Non pote activar notification."
 
 #. TRANS: Error text shown when issuing the login command while login is disabled.
-#: lib/command.php:782
 msgid "Login command is disabled."
 msgstr "Le commando de apertura de session es disactivate."
 
 #. TRANS: Text shown after issuing the login command successfully.
 #. TRANS: %s is a logon link..
-#: lib/command.php:795
 #, php-format
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
@@ -8097,20 +6645,17 @@ msgstr ""
 
 #. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:824
 #, php-format
 msgid "Unsubscribed %s."
 msgstr "Subscription de %s cancellate."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
-#: lib/command.php:842
 msgid "You are not subscribed to anyone."
 msgstr "Tu non es subscribite a alcuno."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
-#: lib/command.php:847
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Tu es subscribite a iste persona:"
@@ -8118,14 +6663,12 @@ msgstr[1] "Tu es subscribite a iste personas:"
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user
 #. TRANS: (followers) without having any subscribers.
-#: lib/command.php:869
 msgid "No one is subscribed to you."
 msgstr "Necuno es subscribite a te."
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
-#: lib/command.php:874
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Iste persona es subscribite a te:"
@@ -8133,21 +6676,18 @@ msgstr[1] "Iste personas es subscribite a te:"
 
 #. TRANS: Text shown after requesting groups a user is subscribed to without having
 #. TRANS: any group subscriptions.
-#: lib/command.php:896
 msgid "You are not a member of any groups."
 msgstr "Tu non es membro de alcun gruppo."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
-#: lib/command.php:901
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "Tu es membro de iste gruppo:"
 msgstr[1] "Tu es membro de iste gruppos:"
 
 #. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-#: lib/command.php:916
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -8228,218 +6768,173 @@ msgstr ""
 "tracking - non ancora implementate.\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:36
 msgid "No configuration file found."
 msgstr "Nulle file de configuration trovate."
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:39
 msgid "I looked for configuration files in the following places:"
 msgstr "Io cercava files de configuration in le sequente locos:"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:42
 msgid "You may wish to run the installer to fix this."
 msgstr "Considera executar le installator pro reparar isto."
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:46
 msgid "Go to the installer."
 msgstr "Ir al installator."
 
-#: lib/dberroraction.php:59
 msgid "Database error"
 msgstr "Error de base de datos"
 
 #. TRANS: Description of form for deleting a user.
-#: lib/deleteuserform.php:75
 msgid "Delete this user"
 msgstr "Deler iste usator"
 
-#: lib/designform.php:114
-#, fuzzy
 msgid "Change design"
-msgstr "Salveguardar apparentia"
+msgstr "Cambiar de apparentia"
 
 #. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: lib/designform.php:131
 msgid "Change colours"
 msgstr "Cambiar colores"
 
 #. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: lib/designform.php:138
 msgid "Use defaults"
 msgstr "Usar predefinitiones"
 
 #. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: lib/designform.php:140
 msgid "Restore default designs"
 msgstr "Restaurar apparentias predefinite"
 
 #. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: lib/designform.php:148
 msgid "Reset back to default"
 msgstr "Revenir al predefinitiones"
 
 #. TRANS: Label in form on profile design page.
 #. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
-#: lib/designform.php:158
 msgid "Upload file"
 msgstr "Incargar file"
 
 #. TRANS: Instructions for form on profile design page.
-#: lib/designform.php:163
-#, fuzzy
 msgid ""
 "You can upload your personal background image. The maximum file size is 2Mb."
 msgstr ""
-"Tu pote actualisar tu imagine de fundo personal. Le dimension maximal del "
-"file es 2MB."
+"Tu pote incargar tu imagine de fundo personal. Le dimension maximal del file "
+"es 2MB."
 
 #. TRANS: Radio button on profile design page that will enable use of the uploaded profile image.
-#: lib/designform.php:194
 msgctxt "RADIO"
 msgid "On"
 msgstr "Active"
 
 #. TRANS: Radio button on profile design page that will disable use of the uploaded profile image.
-#: lib/designform.php:211
 msgctxt "RADIO"
 msgid "Off"
 msgstr "Non active"
 
 #. TRANS: Title for button on profile design page to save settings.
-#: lib/designform.php:322
 msgid "Save design"
 msgstr "Salveguardar apparentia"
 
 #. TRANS: Error message displayed if design settings could not be saved.
 #. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
-#: lib/designsettings.php:216 lib/designsettings.php:238
 msgid "Couldn't update your design."
 msgstr "Non poteva actualisar tu apparentia."
 
 #. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
-#: lib/designsettings.php:244
 msgid "Design defaults restored."
 msgstr "Apparentia predefinite restaurate."
 
 #. TRANS: Exception. %s is an ID.
-#: lib/discovery.php:153
 #, php-format
 msgid "Unable to find services for %s."
 msgstr "Incapace de trovar servicios pro %s."
 
 #. TRANS: Form legend for removing the favourite status for a favourite notice.
 #. TRANS: Title for button text for removing the favourite status for a favourite notice.
-#: lib/disfavorform.php:108 lib/disfavorform.php:140
 msgid "Disfavor this notice"
 msgstr "Disfavorir iste nota"
 
 #. TRANS: Button text for removing the favourite status for a favourite notice.
-#: lib/disfavorform.php:136
 msgctxt "BUTTON"
 msgid "Disfavor favorite"
 msgstr "Disfavorir favorite"
 
 #. TRANS: Form legend for adding the favourite status to a notice.
 #. TRANS: Title for button text for adding the favourite status to a notice.
-#: lib/favorform.php:108 lib/favorform.php:139
 msgid "Favor this notice"
 msgstr "Favorir iste nota"
 
 #. TRANS: Button text for adding the favourite status to a notice.
-#: lib/favorform.php:135
 msgctxt "BUTTON"
 msgid "Favor"
 msgstr "Favorir"
 
-#: lib/feed.php:84
 msgid "RSS 1.0"
 msgstr "RSS 1.0"
 
-#: lib/feed.php:86
 msgid "RSS 2.0"
 msgstr "RSS 2.0"
 
-#: lib/feed.php:88
 msgid "Atom"
 msgstr "Atom"
 
-#: lib/feed.php:90
 msgid "FOAF"
 msgstr "Amico de un amico"
 
-#: lib/feedimporter.php:75
 msgid "Not an atom feed."
 msgstr "Non es un syndication Atom."
 
-#: lib/feedimporter.php:82
 msgid "No author in the feed."
 msgstr "Il non ha un autor in le syndication."
 
-#: lib/feedimporter.php:89
 msgid "Can't import without a user."
 msgstr "Non pote importar sin usator."
 
 #. TRANS: Header for feed links (h2).
-#: lib/feedlist.php:66
 msgid "Feeds"
 msgstr "Syndicationes"
 
-#: lib/galleryaction.php:128
 msgid "All"
 msgstr "Totes"
 
-#: lib/galleryaction.php:136
 msgid "Select tag to filter"
 msgstr "Selige etiquetta a filtrar"
 
-#: lib/galleryaction.php:137
 msgid "Tag"
 msgstr "Etiquetta"
 
-#: lib/galleryaction.php:138
 msgid "Choose a tag to narrow list"
 msgstr "Selige etiquetta pro reducer lista"
 
-#: lib/galleryaction.php:140
 msgid "Go"
 msgstr "Ir"
 
-#: lib/grantroleform.php:91
 #, php-format
 msgid "Grant this user the \"%s\" role"
 msgstr "Conceder le rolo \"%s\" a iste usator"
 
-#: lib/groupeditform.php:147
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "1-64 minusculas o numeros, sin punctuation o spatios"
 
-#: lib/groupeditform.php:156
 msgid "URL of the homepage or blog of the group or topic."
 msgstr "URL del pagina initial o blog del gruppo o topico."
 
-#: lib/groupeditform.php:161
 msgid "Describe the group or topic"
 msgstr "Describe le gruppo o topico"
 
-#: lib/groupeditform.php:163
 #, php-format
 msgid "Describe the group or topic in %d character or less"
 msgid_plural "Describe the group or topic in %d characters or less"
 msgstr[0] "Describe le gruppo o topico in %d character o minus"
 msgstr[1] "Describe le gruppo o topico in %d characteres o minus"
 
-#: lib/groupeditform.php:175
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\"."
 msgstr ""
 "Loco del gruppo, si existe, como \"Citate, Provincia (o Region), Pais\"."
 
-#: lib/groupeditform.php:183
 #, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -8454,70 +6949,60 @@ msgstr[1] ""
 "maximo de %d aliases es permittite."
 
 #. TRANS: Menu item in the group navigation page.
-#: lib/groupnav.php:86
 msgctxt "MENU"
 msgid "Group"
 msgstr "Gruppo"
 
 #. TRANS: Tooltip for menu item in the group navigation page.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:89
 #, php-format
 msgctxt "TOOLTIP"
 msgid "%s group"
 msgstr "Gruppo %s"
 
 #. TRANS: Menu item in the group navigation page.
-#: lib/groupnav.php:95
 msgctxt "MENU"
 msgid "Members"
 msgstr "Membros"
 
 #. TRANS: Tooltip for menu item in the group navigation page.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:98
 #, php-format
 msgctxt "TOOLTIP"
 msgid "%s group members"
 msgstr "Membros del gruppo %s"
 
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/groupnav.php:108
 msgctxt "MENU"
 msgid "Blocked"
 msgstr "Blocate"
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:111
 #, php-format
 msgctxt "TOOLTIP"
 msgid "%s blocked users"
 msgstr "%s usatores blocate"
 
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "Admin"
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:120
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Edit %s group properties"
 msgstr "Modificar proprietates del gruppo %s"
 
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/groupnav.php:126
 msgctxt "MENU"
 msgid "Logo"
 msgstr "Logotypo"
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:129
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Add or edit %s logo"
@@ -8525,69 +7010,57 @@ msgstr "Adder o modificar logotypo de %s"
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:138
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Add or edit %s design"
 msgstr "Adder o modificar apparentia de %s"
 
 #. TRANS: Title for groups with the most members section.
-#: lib/groupsbymemberssection.php:71
 msgid "Groups with most members"
 msgstr "Gruppos con le plus membros"
 
 #. TRANS: Title for groups with the most posts section.
-#: lib/groupsbypostssection.php:71
 msgid "Groups with most posts"
 msgstr "Gruppos con le plus messages"
 
 #. TRANS: Title for group tag cloud section.
 #. TRANS: %s is a group name.
-#: lib/grouptagcloudsection.php:57
 #, php-format
 msgid "Tags in %s group's notices"
 msgstr "Etiquettas in le notas del gruppo %s"
 
 #. TRANS: Client exception 406
-#: lib/htmloutputter.php:104
 msgid "This page is not available in a media type you accept"
 msgstr "Iste pagina non es disponibile in un formato que tu accepta"
 
 #. TRANS: Exception thrown when trying to upload an unsupported image file format.
-#: lib/imagefile.php:73
 msgid "Unsupported image file format."
 msgstr "Formato de file de imagine non supportate."
 
 #. TRANS: Exception thrown when too large a file is uploaded.
 #. TRANS: %s is the maximum file size, for example "500b", "10kB" or "2MB".
-#: lib/imagefile.php:91
 #, php-format
 msgid "That file is too big. The maximum file size is %s."
 msgstr "Iste file es troppo grande. Le dimension maximal es %s."
 
 #. TRANS: Exception thrown when uploading an image and that action could not be completed.
-#: lib/imagefile.php:97
 msgid "Partial upload."
 msgstr "Incargamento partial."
 
 #. TRANS: Exception thrown when uploading a file as image that is not an image or is a corrupt file.
-#: lib/imagefile.php:115
 msgid "Not an image or corrupt file."
 msgstr "Le file non es un imagine o es defectuose."
 
 #. TRANS: Exception thrown during resize when image has been registered as present, but is no longer there.
-#: lib/imagefile.php:178
 msgid "Lost our file."
 msgstr "File perdite."
 
 #. TRANS: Exception thrown when trying to resize an unknown file type.
 #. TRANS: Exception thrown when trying resize an unknown file type.
-#: lib/imagefile.php:216 lib/imagefile.php:257
 msgid "Unknown file type"
 msgstr "Typo de file incognite"
 
 #. TRANS: Number of megabytes. %d is the number.
-#: lib/imagefile.php:303
 #, php-format
 msgid "%dMB"
 msgid_plural "%dMB"
@@ -8595,7 +7068,6 @@ msgstr[0] "%dMB"
 msgstr[1] "%dMB"
 
 #. TRANS: Number of kilobytes. %d is the number.
-#: lib/imagefile.php:307
 #, php-format
 msgid "%dkB"
 msgid_plural "%dkB"
@@ -8603,14 +7075,12 @@ msgstr[0] "%dKB"
 msgstr[1] "%dKB"
 
 #. TRANS: Number of bytes. %d is the number.
-#: lib/imagefile.php:310
 #, php-format
 msgid "%dB"
 msgid_plural "%dB"
 msgstr[0] "%dB"
 msgstr[1] "%dB"
 
-#: lib/implugin.php:262
 #, php-format
 msgid ""
 "User \"%s\" on %s has said that your %s screenname belongs to them. If "
@@ -8619,52 +7089,48 @@ msgid ""
 "user isn't you, or if you didn't request this confirmation, just ignore this "
 "message."
 msgstr ""
+"Le usator \"%s\" de %s ha dicite que tu pseudonymo %s pertine a ille/illa. "
+"Si isto es correcte, tu pote confirmar lo con un clic super iste URL: %s . "
+"(Si tu non pote cliccar super illo, copia-e-colla lo in le barra de adresse "
+"de tu navigator del web.) Si iste usator non es tu, o si tu non requestava "
+"iste confirmation, simplemente ignora iste message."
 
-#: lib/implugin.php:349
 #, php-format
 msgid "Unknown inbox source %d."
 msgstr "Fonte de cassa de entrata \"%s\" incognite"
 
-#: lib/implugin.php:485
-#, fuzzy, php-format
+#, php-format
 msgid "Message too long - maximum is %1$d characters, you sent %2$d."
-msgstr "Message troppo longe - maximo es %1$d character, tu inviava %2$d."
+msgstr "Message troppo longe - maximo es %1$d characteres, tu inviava %2$d."
 
-#: lib/leaveform.php:114
 msgid "Leave"
 msgstr "Quitar"
 
 #. TRANS: Menu item for logging in to the StatusNet site.
-#: lib/logingroupnav.php:77
 msgctxt "MENU"
 msgid "Login"
 msgstr "Aperir session"
 
 #. TRANS: Title for menu item for logging in to the StatusNet site.
-#: lib/logingroupnav.php:79
 msgid "Login with a username and password"
 msgstr "Aperir session con nomine de usator e contrasigno"
 
 #. TRANS: Menu item for registering with the StatusNet site.
-#: lib/logingroupnav.php:85
 msgctxt "MENU"
 msgid "Register"
 msgstr "Crear conto"
 
 #. TRANS: Title for menu item for registering with the StatusNet site.
-#: lib/logingroupnav.php:87
 msgid "Sign up for a new account"
 msgstr "Crear un nove conto"
 
 #. TRANS: Subject for address confirmation email.
-#: lib/mail.php:172
 msgid "Email address confirmation"
 msgstr "Confirmation del adresse de e-mail"
 
 #. TRANS: Body for address confirmation email.
 #. TRANS: %1$s is the addressed user's nickname, %2$s is the StatusNet sitename,
 #. TRANS: %3$s is the URL to confirm at.
-#: lib/mail.php:177
 #, php-format
 msgid ""
 "Hey, %1$s.\n"
@@ -8695,14 +7161,12 @@ msgstr ""
 
 #. TRANS: Subject of new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
-#: lib/mail.php:243
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1$s seque ora tu notas in %2$s."
 
 #. TRANS: This is a paragraph in a new-subscriber e-mail.
 #. TRANS: %s is a URL where the subscriber can be reported as abusive.
-#: lib/mail.php:250
 #, php-format
 msgid ""
 "If you believe this account is being used abusively, you can block them from "
@@ -8717,7 +7181,6 @@ msgstr ""
 #. TRANS: %3$s is the subscriber's profile URL, %4$s is the subscriber's location (or empty)
 #. TRANS: %5$s is the subscriber's homepage URL (or empty), %6%s is the subscriber's bio (or empty)
 #. TRANS: %7$s is a link to the addressed user's e-mail settings.
-#: lib/mail.php:260
 #, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -8744,14 +7207,12 @@ msgstr ""
 
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is biographical information.
-#: lib/mail.php:283
 #, php-format
 msgid "Bio: %s"
 msgstr "Bio: %s"
 
 #. TRANS: Subject of notification mail for new posting email address.
 #. TRANS: %s is the StatusNet sitename.
-#: lib/mail.php:312
 #, php-format
 msgid "New email address for posting to %s"
 msgstr "Nove adresse de e-mail pro publicar in %s"
@@ -8759,7 +7220,6 @@ msgstr "Nove adresse de e-mail pro publicar in %s"
 #. TRANS: Body of notification mail for new posting email address.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is the e-mail address to send
 #. TRANS: to to post by e-mail, %3$s is a URL to more instructions.
-#: lib/mail.php:318
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -8782,26 +7242,22 @@ msgstr ""
 
 #. TRANS: Subject line for SMS-by-email notification messages.
 #. TRANS: %s is the posting user's nickname.
-#: lib/mail.php:439
 #, php-format
 msgid "%s status"
 msgstr "Stato de %s"
 
 #. TRANS: Subject line for SMS-by-email address confirmation message.
-#: lib/mail.php:465
 msgid "SMS confirmation"
 msgstr "Confirmation SMS"
 
 #. TRANS: Main body heading for SMS-by-email address confirmation message.
 #. TRANS: %s is the addressed user's nickname.
-#: lib/mail.php:469
 #, php-format
 msgid "%s: confirm you own this phone number with this code:"
 msgstr "%s: confirma que tu possede iste numero de telephono con iste codice:"
 
 #. TRANS: Subject for 'nudge' notification email.
 #. TRANS: %s is the nudging user.
-#: lib/mail.php:490
 #, php-format
 msgid "You have been nudged by %s"
 msgstr "%s te ha pulsate"
@@ -8809,7 +7265,6 @@ msgstr "%s te ha pulsate"
 #. TRANS: Body for 'nudge' notification email.
 #. TRANS: %1$s is the nuding user's long name, $2$s is the nudging user's nickname,
 #. TRANS: %3$s is a URL to post notices at, %4$s is the StatusNet sitename.
-#: lib/mail.php:497
 #, php-format
 msgid ""
 "%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -8838,7 +7293,6 @@ msgstr ""
 
 #. TRANS: Subject for direct-message notification email.
 #. TRANS: %s is the sending user's nickname.
-#: lib/mail.php:544
 #, php-format
 msgid "New private message from %s"
 msgstr "Nove message private de %s"
@@ -8847,7 +7301,6 @@ msgstr "Nove message private de %s"
 #. TRANS: %1$s is the sending user's long name, %2$s is the sending user's nickname,
 #. TRANS: %3$s is the message content, %4$s a URL to the message,
 #. TRANS: %5$s is the StatusNet sitename.
-#: lib/mail.php:552
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -8882,7 +7335,6 @@ msgstr ""
 
 #. TRANS: Subject for favorite notification e-mail.
 #. TRANS: %1$s is the adding user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:604
 #, php-format
 msgid "%1$s (@%2$s) added your notice as a favorite"
 msgstr "%1$s (@%2$s) ha addite tu nota como favorite"
@@ -8892,7 +7344,6 @@ msgstr "%1$s (@%2$s) ha addite tu nota como favorite"
 #. TRANS: %3$s is a URL to the faved notice, %4$s is the faved notice text,
 #. TRANS: %5$s is a URL to all faves of the adding user, %6$s is the StatusNet sitename,
 #. TRANS: %7$s is the adding user's nickname.
-#: lib/mail.php:611
 #, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -8931,7 +7382,6 @@ msgstr ""
 "%6$s\n"
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:669
 #, php-format
 msgid ""
 "The full conversation can be read here:\n"
@@ -8944,7 +7394,6 @@ msgstr ""
 
 #. TRANS: E-mail subject for notice notification.
 #. TRANS: %1$s is the sending user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:677
 #, php-format
 msgid "%1$s (@%2$s) sent a notice to your attention"
 msgstr "%1$s (@%2$s) ha inviate un nota a tu attention"
@@ -8955,7 +7404,6 @@ msgstr "%1$s (@%2$s) ha inviate un nota a tu attention"
 #. TRANS: %5$s is a URL to the full conversion if it exists (otherwise empty),
 #. TRANS: %6$s is a URL to reply to the notice, %7$s is a URL to all @-replied for the addressed user,
 #. TRANS: %8$s is a URL to the addressed user's e-mail settings, %9$s is the sender's nickname.
-#: lib/mail.php:685
 #, php-format
 msgid ""
 "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -9004,11 +7452,9 @@ msgstr ""
 "\n"
 "P.S. Tu pote disactivar iste notificationes electronic hic: %8$s\n"
 
-#: lib/mailbox.php:87
 msgid "Only the user can read their own mailboxes."
 msgstr "Solmente le usator pote leger su proprie cassas postal."
 
-#: lib/mailbox.php:125
 msgid ""
 "You have no private messages. You can send private message to engage other "
 "users in conversation. People can send you messages for your eyes only."
@@ -9017,55 +7463,45 @@ msgstr ""
 "altere usatores in conversation. Altere personas pote inviar te messages que "
 "solmente tu pote leger."
 
-#: lib/mailhandler.php:37
 msgid "Could not parse message."
 msgstr "Non comprendeva le syntaxe del message."
 
-#: lib/mailhandler.php:42
 msgid "Not a registered user."
 msgstr "Non un usator registrate."
 
-#: lib/mailhandler.php:46
 msgid "Sorry, that is not your incoming email address."
 msgstr "Pardono, isto non es tu adresse de e-mail entrante."
 
-#: lib/mailhandler.php:50
 msgid "Sorry, no incoming email allowed."
 msgstr "Pardono, le reception de e-mail non es permittite."
 
-#: lib/mailhandler.php:229
 #, php-format
 msgid "Unsupported message type: %s"
 msgstr "Typo de message non supportate: %s"
 
 #. TRANS: Client exception thrown when a database error was thrown during a file upload operation.
-#: lib/mediafile.php:102 lib/mediafile.php:174
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
 "Un error de base de datos occurreva durante le salveguarda de tu file. Per "
 "favor reproba."
 
 #. TRANS: Client exception thrown when a file upload operation would cause a user to exceed a set quota.
-#: lib/mediafile.php:238 lib/mediafile.php:281
 msgid "File exceeds user's quota."
 msgstr "File excede quota del usator."
 
 #. TRANS: Client exception thrown when a file upload operation fails because the file could
 #. TRANS: not be moved from the temporary folder to the permanent file location.
-#: lib/mediafile.php:258 lib/mediafile.php:300
 msgid "File could not be moved to destination directory."
 msgstr "File non poteva esser displaciate in le directorio de destination."
 
 #. TRANS: Client exception thrown when a file upload operation has been stopped because the MIME
 #. TRANS: type of the uploaded file could not be determined.
-#: lib/mediafile.php:265 lib/mediafile.php:306
 msgid "Could not determine file's MIME type."
 msgstr "Non poteva determinar le typo MIME del file."
 
 #. TRANS: Client exception thrown trying to upload a forbidden MIME type.
 #. TRANS: %1$s is the file type that was denied, %2$s is the application part of
 #. TRANS: the MIME type that was denied.
-#: lib/mediafile.php:396
 #, php-format
 msgid ""
 "\"%1$s\" is not a supported file type on this server. Try using another %2$s "
@@ -9076,81 +7512,72 @@ msgstr ""
 
 #. TRANS: Client exception thrown trying to upload a forbidden MIME type.
 #. TRANS: %s is the file type that was denied.
-#: lib/mediafile.php:401
 #, php-format
 msgid "\"%s\" is not a supported file type on this server."
 msgstr "\"%s\" non es un typo de file supportate in iste servitor."
 
-#: lib/messageform.php:120
 msgid "Send a direct notice"
 msgstr "Inviar un nota directe"
 
 #. TRANS Label entry in drop-down selection box in direct-message inbox/outbox. This is the default entry in the drop-down box, doubling as instructions and a brake against accidental submissions with the first user in the list.
-#: lib/messageform.php:137
 msgid "Select recipient:"
 msgstr "Selige destinatario:"
 
 #. TRANS Entry in drop-down selection box in direct-message inbox/outbox when no one is available to message.
-#: lib/messageform.php:150
 msgid "No mutual subscribers."
 msgstr "Nulle subscriptores mutual."
 
-#: lib/messageform.php:153
 msgid "To"
 msgstr "A"
 
-#: lib/messageform.php:184 lib/noticeform.php:236
 msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr "Inviar"
 
-#: lib/messagelist.php:77
 msgid "Messages"
 msgstr "Messages"
 
-#: lib/messagelistitem.php:123 lib/noticelist.php:527
 msgid "from"
 msgstr "via"
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:178
 msgid "Nickname cannot be empty."
 msgstr "Le pseudonymo non pote esser vacue."
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:191
 #, php-format
 msgid "Nickname cannot be more than %d character long."
 msgid_plural "Nickname cannot be more than %d characters long."
 msgstr[0] "Le pseudonymo non pote haber plus de %d character."
 msgstr[1] "Le pseudonymo non pote haber plus de %d characteres."
 
-#: lib/noticeform.php:160
+#. TRANS: Form legend for notice form.
 msgid "Send a notice"
 msgstr "Inviar un nota"
 
-#: lib/noticeform.php:174
+#. TRANS: Title for notice label. %s is the user's nickname.
 #, php-format
 msgid "What's up, %s?"
 msgstr "Como sta, %s?"
 
-#: lib/noticeform.php:193
+#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr "Annexar"
 
-#: lib/noticeform.php:197
-msgid "Attach a file"
+#. TRANS: Title for input field to attach a file to a notice.
+#, fuzzy
+msgid "Attach a file."
 msgstr "Annexar un file"
 
-#: lib/noticeform.php:212
+#. TRANS: Field label to add location to a notice.
 msgid "Share my location"
 msgstr "Divulgar mi loco"
 
-#: lib/noticeform.php:215
+#. TRANS: Text to not share location for a notice in notice form.
 msgid "Do not share my location"
 msgstr "Non divulgar mi loco"
 
-#: lib/noticeform.php:216
+#. TRANS: Timeout error text for location retrieval in notice form.
 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
 "try again later"
@@ -9159,418 +7586,317 @@ msgstr ""
 "previste. Per favor reproba plus tarde."
 
 #. TRANS: Used in coordinates as abbreviation of north
-#: lib/noticelist.php:457
 msgid "N"
 msgstr "N"
 
 #. TRANS: Used in coordinates as abbreviation of south
-#: lib/noticelist.php:459
 msgid "S"
 msgstr "S"
 
 #. TRANS: Used in coordinates as abbreviation of east
-#: lib/noticelist.php:461
 msgid "E"
 msgstr "E"
 
 #. TRANS: Used in coordinates as abbreviation of west
-#: lib/noticelist.php:463
 msgid "W"
 msgstr "W"
 
-#: lib/noticelist.php:465
 #, php-format
 msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 
-#: lib/noticelist.php:474
 msgid "at"
 msgstr "in"
 
-#: lib/noticelist.php:523
 msgid "web"
 msgstr "web"
 
-#: lib/noticelist.php:589
 msgid "in context"
 msgstr "in contexto"
 
-#: lib/noticelist.php:624
 msgid "Repeated by"
 msgstr "Repetite per"
 
-#: lib/noticelist.php:651
 msgid "Reply to this notice"
 msgstr "Responder a iste nota"
 
-#: lib/noticelist.php:652
 msgid "Reply"
 msgstr "Responder"
 
-#: lib/noticelist.php:678
 msgid "Delete this notice"
 msgstr "Deler iste nota"
 
-#: lib/noticelist.php:696
 msgid "Notice repeated"
 msgstr "Nota repetite"
 
-#: lib/nudgeform.php:116
 msgid "Nudge this user"
 msgstr "Pulsar iste usator"
 
-#: lib/nudgeform.php:128
 msgid "Nudge"
 msgstr "Pulsar"
 
-#: lib/nudgeform.php:128
 msgid "Send a nudge to this user"
 msgstr "Inviar un pulsata a iste usator"
 
-#: lib/oauthstore.php:294
 msgid "Error inserting new profile."
 msgstr "Error durante le insertion del nove profilo."
 
-#: lib/oauthstore.php:302
 msgid "Error inserting avatar."
 msgstr "Error durante le insertion del avatar."
 
-#: lib/oauthstore.php:322
 msgid "Error inserting remote profile."
 msgstr "Error durante le insertion del profilo remote."
 
 #. TRANS: Exception thrown when a notice is denied because it has been sent before.
-#: lib/oauthstore.php:362
 msgid "Duplicate notice."
 msgstr "Nota duplicate."
 
-#: lib/oauthstore.php:507
 msgid "Couldn't insert new subscription."
 msgstr "Non poteva inserer nove subscription."
 
-#: lib/personalgroupnav.php:104
-#, fuzzy
 msgid "Replies"
 msgstr "Responsas"
 
-#: lib/personalgroupnav.php:109
-#, fuzzy
 msgid "Favorites"
 msgstr "Favorites"
 
-#: lib/personalgroupnav.php:120
-#, fuzzy
 msgid "Inbox"
 msgstr "Cassa de entrata"
 
-#: lib/personalgroupnav.php:121
 msgid "Your incoming messages"
 msgstr "Tu messages recipite"
 
-#: lib/personalgroupnav.php:125
-#, fuzzy
 msgid "Outbox"
 msgstr "Cassa de exito"
 
-#: lib/personalgroupnav.php:126
 msgid "Your sent messages"
 msgstr "Tu messages inviate"
 
 #. TRANS: Title for personal tag cloud section. %s is a user nickname.
-#: lib/personaltagcloudsection.php:56
 #, php-format
 msgid "Tags in %s's notices"
 msgstr "Etiquettas in le notas de %s"
 
 #. TRANS: Displayed as version information for a plugin if no version information was found.
-#: lib/plugin.php:126
 msgid "Unknown"
 msgstr "Incognite"
 
 #. TRANS: Plugin admin panel controls
-#: lib/plugindisableform.php:90
 msgctxt "plugin"
 msgid "Disable"
-msgstr ""
+msgstr "Disactivar"
 
 #. TRANS: Plugin admin panel controls
-#: lib/pluginenableform.php:112
 msgctxt "plugin"
 msgid "Enable"
-msgstr ""
+msgstr "Activar"
 
-#: lib/pluginlist.php:196
 msgctxt "plugin-description"
 msgid "(Plugin descriptions unavailable when disabled.)"
-msgstr ""
+msgstr "(Le descriptiones de plug-ins non es disponibile si disactivate.)"
 
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:88
 msgid "Subscriptions"
 msgstr "Subscriptiones"
 
 #. TRANS: Text for user subscription statistics if user has more subscriptions than displayed.
-#: lib/profileaction.php:144
 msgid "All subscriptions"
 msgstr "Tote le subscriptiones"
 
 #. TRANS: H2 text for user subscriber statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:96
 msgid "Subscribers"
 msgstr "Subscriptores"
 
 #. TRANS: Text for user subscription statistics if user has more subscribers than displayed.
-#: lib/profileaction.php:181
 msgid "All subscribers"
 msgstr "Tote le subscriptores"
 
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:213
 msgid "User ID"
 msgstr "ID del usator"
 
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:219
 msgid "Member since"
 msgstr "Membro depost"
 
 #. TRANS: Label for user statistics.
 #. TRANS: H2 text for user group membership statistics.
-#: lib/profileaction.php:239 lib/profileaction.php:290
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:104
 msgid "Groups"
 msgstr "Gruppos"
 
 #. TRANS: Label for user statistics.
 #. TRANS: Average count of posts made per day since account registration.
-#: lib/profileaction.php:253
 msgid "Daily average"
 msgstr "Media de cata die"
 
 #. TRANS: Text for user group membership statistics if user has more subscriptions than displayed.
-#: lib/profileaction.php:305
 msgid "All groups"
 msgstr "Tote le gruppos"
 
 #. TRANS: Server error displayed when using an unimplemented method.
-#: lib/profileformaction.php:123
 msgid "Unimplemented method."
 msgstr "Methodo non implementate."
 
-#: lib/publicgroupnav.php:82
 msgid "User groups"
 msgstr "Gruppos de usatores"
 
-#: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
 msgid "Recent tags"
 msgstr "Etiquettas recente"
 
-#: lib/publicgroupnav.php:88
 msgid "Featured"
 msgstr "In evidentia"
 
-#: lib/publicgroupnav.php:92
 msgid "Popular"
 msgstr "Popular"
 
-#: lib/redirectingaction.php:95
 msgid "No return-to arguments."
 msgstr "Nulle parametro return-to."
 
-#: lib/repeatform.php:107
 msgid "Repeat this notice?"
 msgstr "Repeter iste nota?"
 
-#: lib/repeatform.php:132
 msgid "Yes"
 msgstr "Si"
 
-#: lib/repeatform.php:132
 msgid "Repeat this notice"
 msgstr "Repeter iste nota"
 
-#: lib/revokeroleform.php:91
 #, php-format
 msgid "Revoke the \"%s\" role from this user"
 msgstr "Revocar le rolo \"%s\" de iste usator"
 
 #. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:1001
 msgid "Page not found."
 msgstr "Pagina non trovate."
 
-#: lib/sandboxform.php:67
 msgid "Sandbox"
 msgstr "Cassa de sablo"
 
-#: lib/sandboxform.php:78
 msgid "Sandbox this user"
 msgstr "Mitter iste usator in le cassa de sablo"
 
 #. TRANS: Fieldset legend for the search form.
-#: lib/searchaction.php:120
 msgid "Search site"
 msgstr "Cercar in sito"
 
 #. TRANS: Used as a field label for the field where one or more keywords
 #. TRANS: for searching can be entered.
-#: lib/searchaction.php:128
 msgid "Keyword(s)"
 msgstr "Parola(s)-clave"
 
 #. TRANS: Button text for searching site.
-#: lib/searchaction.php:130
 msgctxt "BUTTON"
 msgid "Search"
 msgstr "Cercar"
 
-#: lib/searchgroupnav.php:80
 msgid "People"
 msgstr "Personas"
 
-#: lib/searchgroupnav.php:81
 msgid "Find people on this site"
 msgstr "Cercar personas in iste sito"
 
-#: lib/searchgroupnav.php:83
 msgid "Find content of notices"
 msgstr "Cercar in contento de notas"
 
-#: lib/searchgroupnav.php:85
 msgid "Find groups on this site"
 msgstr "Cercar gruppos in iste sito"
 
-#: lib/section.php:89
 msgid "Untitled section"
 msgstr "Section sin titulo"
 
-#: lib/section.php:106
 msgid "More..."
 msgstr "Plus…"
 
-#: lib/settingsnav.php:78
 msgid "Change your profile settings"
 msgstr "Cambiar le optiones de tu profilo"
 
-#: lib/settingsnav.php:83
 msgid "Upload an avatar"
 msgstr "Incargar un avatar"
 
-#: lib/settingsnav.php:88
 msgid "Change your password"
 msgstr "Cambiar tu contrasigno"
 
-#: lib/settingsnav.php:93
 msgid "Change email handling"
 msgstr "Modificar le tractamento de e-mail"
 
-#: lib/settingsnav.php:98
 msgid "Design your profile"
 msgstr "Designar tu profilo"
 
-#: lib/settingsnav.php:102
 msgid "URL"
 msgstr "URL"
 
-#: lib/settingsnav.php:103
 msgid "URL shorteners"
-msgstr ""
+msgstr "Abbreviatores de URL"
 
-#: lib/settingsnav.php:111
 msgid "Updates by instant messenger (IM)"
 msgstr "Actualisationes per messageria instantanee (MI)"
 
-#: lib/settingsnav.php:118
 msgid "Updates by SMS"
 msgstr "Actualisationes per SMS"
 
-#: lib/settingsnav.php:123
-#, fuzzy
 msgid "Connections"
 msgstr "Connexiones"
 
-#: lib/settingsnav.php:124
 msgid "Authorized connected applications"
 msgstr "Applicationes autorisate connectite"
 
-#: lib/silenceform.php:67
 msgid "Silence"
 msgstr "Silentiar"
 
-#: lib/silenceform.php:78
 msgid "Silence this user"
 msgstr "Silentiar iste usator"
 
-#: lib/subgroupnav.php:89
 #, php-format
 msgid "People %s subscribes to"
 msgstr "Personas que %s seque"
 
-#: lib/subgroupnav.php:97
 #, php-format
 msgid "People subscribed to %s"
 msgstr "Personas qui seque %s"
 
-#: lib/subgroupnav.php:105
 #, php-format
 msgid "Groups %s is a member of"
 msgstr "Gruppos del quales %s es membro"
 
-#: lib/subgroupnav.php:111
 msgid "Invite"
 msgstr "Invitar"
 
-#: lib/subgroupnav.php:112
 #, php-format
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Invitar amicos e collegas a accompaniar te in %s"
 
-#: lib/subscribeform.php:115 lib/subscribeform.php:139
 msgid "Subscribe to this user"
 msgstr "Subscriber a iste usator"
 
-#: lib/subscriberspeopleselftagcloudsection.php:48
-#: lib/subscriptionspeopleselftagcloudsection.php:48
 msgid "People Tagcloud as self-tagged"
 msgstr "Etiquettario de personas como auto-etiquettate"
 
-#: lib/subscriberspeopletagcloudsection.php:48
-#: lib/subscriptionspeopletagcloudsection.php:48
 msgid "People Tagcloud as tagged"
 msgstr "Etiquettario de personas como etiquettate"
 
-#: lib/tagcloudsection.php:56
 msgid "None"
 msgstr "Nulle"
 
 #. TRANS: Server exception displayed if a theme name was invalid.
-#: lib/theme.php:74
 msgid "Invalid theme name."
 msgstr "Nomine de apparentia invalide."
 
-#: lib/themeuploader.php:50
 msgid "This server cannot handle theme uploads without ZIP support."
 msgstr ""
 "Iste servitor non pote manear le incargamento de apparentias sin supporto de "
 "ZIP."
 
-#: lib/themeuploader.php:58 lib/themeuploader.php:61
 msgid "The theme file is missing or the upload failed."
 msgstr "Le file del apparentia manca o le incargamento ha fallite."
 
-#: lib/themeuploader.php:91 lib/themeuploader.php:102
-#: lib/themeuploader.php:279 lib/themeuploader.php:283
-#: lib/themeuploader.php:291 lib/themeuploader.php:298
 msgid "Failed saving theme."
 msgstr "Salveguarda del apparentia fallite."
 
-#: lib/themeuploader.php:147
 msgid "Invalid theme: bad directory structure."
 msgstr "Apparentia invalide: mal structura de directorios."
 
-#: lib/themeuploader.php:166
 #, php-format
 msgid "Uploaded theme is too large; must be less than %d byte uncompressed."
 msgid_plural ""
@@ -9582,11 +7908,9 @@ msgstr[1] ""
 "Le apparentia incargate es troppo voluminose; debe occupar minus de %d bytes "
 "in forma non comprimite."
 
-#: lib/themeuploader.php:179
 msgid "Invalid theme archive: missing file css/display.css"
 msgstr "Archivo de apparentia invalide: manca le file css/display.css"
 
-#: lib/themeuploader.php:219
 msgid ""
 "Theme contains invalid file or folder name. Stick with ASCII letters, "
 "digits, underscore, and minus sign."
@@ -9594,142 +7918,114 @@ msgstr ""
 "Le apparentia contine un nomine de file o dossier invalide. Limita te a "
 "litteras ASCII, digitos, sublineamento, e signo minus."
 
-#: lib/themeuploader.php:225
 msgid "Theme contains unsafe file extension names; may be unsafe."
 msgstr ""
 "Le thema contine nomines de extension de file insecur; pote esser insecur."
 
-#: lib/themeuploader.php:242
 #, php-format
 msgid "Theme contains file of type '.%s', which is not allowed."
 msgstr ""
 "Le apparentia contine un file del typo '.%s', le qual non es permittite."
 
-#: lib/themeuploader.php:260
 msgid "Error opening theme archive."
 msgstr "Error durante le apertura del archivo del apparentia."
 
-#: lib/threadednoticelist.php:270
-#, php-format
-msgid "Show all %d comment"
-msgid_plural "Show all %d comments"
-msgstr[0] ""
-msgstr[1] ""
+#, fuzzy, php-format
+msgid "Show %d reply"
+msgid_plural "Show all %d replies"
+msgstr[0] "Monstrar plus"
+msgstr[1] "Monstrar plus"
 
-#: lib/topposterssection.php:74
 msgid "Top posters"
 msgstr "Qui scribe le plus"
 
 #. TRANS: Title for the form to unblock a user.
-#: lib/unblockform.php:67
 msgctxt "TITLE"
 msgid "Unblock"
 msgstr "Disblocar"
 
-#: lib/unsandboxform.php:69
 msgid "Unsandbox"
 msgstr "Retirar del cassa de sablo"
 
-#: lib/unsandboxform.php:80
 msgid "Unsandbox this user"
 msgstr "Retirar iste usator del cassa de sablo"
 
-#: lib/unsilenceform.php:67
 msgid "Unsilence"
 msgstr "Dissilentiar"
 
-#: lib/unsilenceform.php:78
 msgid "Unsilence this user"
 msgstr "Non plus silentiar iste usator"
 
-#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
 msgid "Unsubscribe from this user"
 msgstr "Cancellar subscription a iste usator"
 
-#: lib/unsubscribeform.php:137
 msgid "Unsubscribe"
 msgstr "Cancellar subscription"
 
 #. 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).
-#: lib/usernoprofileexception.php:60
 #, php-format
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "Le usator %1$s (%2$d) non ha un registro de profilo."
 
-#: lib/userprofile.php:116
 msgid "Edit Avatar"
 msgstr "Modificar avatar"
 
 #. TRANS: H2 for user actions in a profile.
 #. TRANS: H2 for entity actions in a profile.
-#: lib/userprofile.php:216 lib/userprofile.php:232
 msgid "User actions"
 msgstr "Actiones de usator"
 
 #. TRANS: Text shown in user profile of not yet compeltely deleted users.
-#: lib/userprofile.php:220
 msgid "User deletion in progress..."
 msgstr "Deletion del usator in curso…"
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:248
 msgid "Edit profile settings"
 msgstr "Modificar configuration de profilo"
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:250
 msgid "Edit"
 msgstr "Modificar"
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:274
 msgid "Send a direct message to this user"
 msgstr "Inviar un message directe a iste usator"
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:276
 msgid "Message"
 msgstr "Message"
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:318
 msgid "Moderate"
 msgstr "Moderar"
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:357
 msgid "User role"
 msgstr "Rolo de usator"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:360
 msgctxt "role"
 msgid "Administrator"
 msgstr "Administrator"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:362
 msgctxt "role"
 msgid "Moderator"
 msgstr "Moderator"
 
-#: lib/util.php:321
 msgid "Not allowed to log in."
 msgstr "Apertura de session non permittite."
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1337
 msgid "a few seconds ago"
 msgstr "alcun secundas retro"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1340
 msgid "about a minute ago"
 msgstr "circa un minuta retro"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1344
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
@@ -9737,12 +8033,10 @@ msgstr[0] "circa un minuta retro"
 msgstr[1] "circa %d minutas retro"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1347
 msgid "about an hour ago"
 msgstr "circa un hora retro"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1351
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
@@ -9750,12 +8044,10 @@ msgstr[0] "circa un hora retro"
 msgstr[1] "circa %d horas retro"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1354
 msgid "about a day ago"
 msgstr "circa un die retro"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1358
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
@@ -9763,12 +8055,10 @@ msgstr[0] "circa un die retro"
 msgstr[1] "circa %d dies retro"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1361
 msgid "about a month ago"
 msgstr "circa un mense retro"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1365
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
@@ -9776,200 +8066,48 @@ msgstr[0] "circa un mense retro"
 msgstr[1] "circa %d menses retro"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1368
 msgid "about a year ago"
 msgstr "circa un anno retro"
 
 #. TRANS: Web color exception thrown when a hexadecimal color code does not validate.
 #. TRANS: %s is the provided (invalid) color code.
-#: lib/webcolor.php:81 lib/webcolor.php:121
 #, php-format
 msgid "%s is not a valid color! Use 3 or 6 hex characters."
 msgstr "%s non es un color valide! Usa 3 o 6 characteres hexadecimal."
 
 #. TRANS: Exception.
-#: lib/xrd.php:63
 msgid "Invalid XML."
 msgstr "XML invalide."
 
 #. TRANS: Exception.
-#: lib/xrd.php:68
 msgid "Invalid XML, missing XRD root."
 msgstr "XML invalide, radice XRD mancante."
 
 #. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
-#: scripts/restoreuser.php:62
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr "Obtene copia de reserva ex file '%s'."
 
-#~ msgid "Could not generate feed for group - %s"
-#~ msgstr "Non poteva generar un syndication pro le gruppo %s."
+#~ msgid "Full name is too long (max 255 chars)."
+#~ msgstr "Le nomine complete es troppo longe (max. 255 characteres)."
 
-#~ msgid "Current confirmed Jabber/Google Talk address."
-#~ msgstr "Adresse Jabber/Google Talk actualmente confirmate."
+#~ msgid "description is too long (max %d chars)."
+#~ msgstr "description es troppo longe (max %d chars)."
 
-#~ msgid ""
-#~ "Jabber or Google Talk address, like \"UserName@example.org\". First, make "
-#~ "sure to add %s to your buddy list in your IM client or on Google Talk."
-#~ msgstr ""
-#~ "Un adresse Jabber o Google Talk, como \"nomine@example.org\". Primo, "
-#~ "assecura te de adder %s a tu lista de amicos in tu cliente de messageria "
-#~ "instantanee o in Google Talk."
+#~ msgid "Location is too long (max 255 chars)."
+#~ msgstr "Loco es troppo longe (max. 255 characteres)."
 
-#~ msgid "Send me notices through Jabber/Google Talk."
-#~ msgstr "Inviar me notas per Jabber/Google Talk."
+#~ msgid "Too many aliases! Maximum %d."
+#~ msgstr "Troppo de aliases! Maximo: %d."
 
-#~ msgid "Publish a MicroID for my Jabber/Google Talk address."
-#~ msgstr "Publicar un MicroID pro mi adresse Jabber/Google Talk."
+#~ msgctxt "BUTTON"
+#~ msgid "Comment"
+#~ msgstr "Commento"
 
-#~ msgid "No Jabber ID."
-#~ msgstr "Nulle ID de Jabber."
+#~ msgid "Add a comment..."
+#~ msgstr "Adder un commento..."
 
-#~ msgid "Not a valid Jabber ID."
-#~ msgstr "ID de Jabber non valide."
-
-#~ msgid "That is already your Jabber ID."
-#~ msgstr "Isto es ja tu ID de Jabber."
-
-#~ msgid "That is not your Jabber ID."
-#~ msgstr "Isto non es tu ID de Jabber."
-
-#~ msgid "Other settings"
-#~ msgstr "Altere configurationes"
-
-#~ msgid "Tag cloud"
-#~ msgstr "Etiquettario"
-
-#~ msgid "Consumer key"
-#~ msgstr "Clave de consumitor"
-
-#~ msgid "Consumer secret"
-#~ msgstr "Secreto de consumitor"
-
-#~ msgid "Request token URL"
-#~ msgstr "URL del indicio de requesta"
-
-#~ msgid "Access token URL"
-#~ msgstr "URL del indicio de accesso"
-
-#~ msgid "Authorize URL"
-#~ msgstr "URL de autorisation"
-
-#~ msgid "Jabber"
-#~ msgstr "Jabber"
-
-#~ msgid "Photo"
-#~ msgstr "Photo"
-
-#~ msgid "Other options"
-#~ msgstr "Altere optiones"
-
-#~ msgid "Other"
-#~ msgstr "Altere"
-
-#~ msgid "Primary site navigation"
-#~ msgstr "Navigation primari del sito"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Personal profile and friends timeline"
-#~ msgstr "Profilo personal e chronologia de amicos"
-
-#~ msgctxt "MENU"
-#~ msgid "Personal"
-#~ msgstr "Personal"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Change your email, avatar, password, profile"
-#~ msgstr "Cambiar tu e-mail, avatar, contrasigno, profilo"
-
-#~ msgid "Account"
-#~ msgstr "Conto"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Connect to services"
-#~ msgstr "Connecter a servicios"
-
-#~ msgid "Connect"
-#~ msgstr "Connecter"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Change site configuration"
-#~ msgstr "Modificar le configuration del sito"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Invite friends and colleagues to join you on %s"
-#~ msgstr "Invitar amicos e collegas a accompaniar te in %s"
-
-#~ msgctxt "MENU"
-#~ msgid "Invite"
-#~ msgstr "Invitar"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Create an account"
-#~ msgstr "Crear un conto"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Help me!"
-#~ msgstr "Adjuta me!"
-
-#~ msgctxt "MENU"
-#~ msgid "Help"
-#~ msgstr "Adjuta"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Search for people or text"
-#~ msgstr "Cercar personas o texto"
-
-#~ msgid "Local views"
-#~ msgstr "Vistas local"
-
-#~ msgid "Page notice"
-#~ msgstr "Aviso de pagina"
-
-#~ msgid "Secondary site navigation"
-#~ msgstr "Navigation secundari del sito"
-
-#~ msgid "StatusNet software license"
-#~ msgstr "Licentia del software StatusNet"
-
-#~ msgid "Site content license"
-#~ msgstr "Licentia del contento del sito"
-
-#~ msgid "Pagination"
-#~ msgstr "Pagination"
-
-#~ msgid "Author"
-#~ msgstr "Autor"
-
-#~ msgid "Provider"
-#~ msgstr "Providitor"
-
-#~ msgctxt "MENU"
-#~ msgid "SMS"
-#~ msgstr "SMS"
-
-#~ msgid "Filter tags"
-#~ msgstr "Filtrar etiquettas"
-
-#~ msgid "[%s]"
-#~ msgstr "[%s]"
-
-#~ msgid "Available characters"
-#~ msgstr "Characteres disponibile"
-
-#~ msgctxt "MENU"
-#~ msgid "Profile"
-#~ msgstr "Profilo"
-
-#~ msgid "Search help"
-#~ msgstr "Adjuta super le recerca"
-
-#~ msgid "Unknown user. Go to %s to add your address to your account"
-#~ msgstr "Usator incognite. Vade a %s pro adder tu adresse a tu conto."
-
-#~ msgid "Message too long. Maximum is %1$d character, you sent %2$d."
-#~ msgid_plural "Message too long. Maximum is %1$d characters, you sent %2$d."
-#~ msgstr[0] "Message troppo longe. Maximo es %1$d character, tu inviava %2$d."
-#~ msgstr[1] ""
-#~ "Message troppo longe. Maximo es %1$d characteres, tu inviava %2$d."
+#~ msgid "Show all %d comment"
+#~ msgid_plural "Show all %d comments"
+#~ msgstr[0] "Monstrar %d commento"
+#~ msgstr[1] "Monstrar tote le %d commentos"
diff --git a/locale/it/LC_MESSAGES/statusnet.po b/locale/it/LC_MESSAGES/statusnet.po
index 92e7821d6a..efc7abd4ee 100644
--- a/locale/it/LC_MESSAGES/statusnet.po
+++ b/locale/it/LC_MESSAGES/statusnet.po
@@ -11,69 +11,59 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:23+0000\n"
-"PO-Revision-Date: 2011-03-03 17:26:08+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:25+0000\n"
 "Language-Team: Italian <http://translatewiki.net/wiki/Portal:it>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: it\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-02-25 23:49:23+0000\n"
+"X-POT-Import-Date: 2011-03-03 17:59:19+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
-#: actions/accessadminpanel.php:53 lib/adminpanelaction.php:363
 msgid "Access"
 msgstr "Accesso"
 
 #. TRANS: Page notice.
-#: actions/accessadminpanel.php:64
 msgid "Site access settings"
 msgstr "Impostazioni di accesso al sito"
 
 #. TRANS: Form legend for registration form.
-#: actions/accessadminpanel.php:151
 msgid "Registration"
 msgstr "Registrazione"
 
 #. TRANS: Checkbox instructions for admin setting "Private".
-#: actions/accessadminpanel.php:155
 msgid "Prohibit anonymous users (not logged in) from viewing site?"
 msgstr ""
 "Proibire agli utenti anonimi (che non hanno effettuato l'accesso) di vedere "
 "il sito?"
 
 #. TRANS: Checkbox label for prohibiting anonymous users from viewing site.
-#: actions/accessadminpanel.php:157
 msgctxt "LABEL"
 msgid "Private"
 msgstr "Privato"
 
 #. TRANS: Checkbox instructions for admin setting "Invite only".
-#: actions/accessadminpanel.php:164
 msgid "Make registration invitation only."
 msgstr "Rende la registrazione solo su invito"
 
 #. TRANS: Checkbox label for configuring site as invite only.
-#: actions/accessadminpanel.php:166
 msgid "Invite only"
 msgstr "Solo invito"
 
 #. TRANS: Checkbox instructions for admin setting "Closed" (no new registrations).
-#: actions/accessadminpanel.php:173
 msgid "Disable new registrations."
 msgstr "Disabilita la creazione di nuovi account"
 
 #. TRANS: Checkbox label for disabling new user registrations.
-#: actions/accessadminpanel.php:175
 msgid "Closed"
 msgstr "Chiuso"
 
 #. TRANS: Title for button to save access settings in site admin panel.
-#: actions/accessadminpanel.php:191
 msgid "Save access settings"
 msgstr "Salva impostazioni di accesso"
 
@@ -81,6 +71,7 @@ msgstr "Salva impostazioni di accesso"
 #. TRANS: Button text for saving theme settings.
 #. TRANS: Button label to save e-mail preferences.
 #. TRANS: Button label to save IM preferences.
+#. TRANS: Button text in the license admin panel.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
 #. TRANS: Button text for saving site notice in admin panel.
@@ -90,21 +81,12 @@ msgstr "Salva impostazioni di accesso"
 #. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
 #. TRANS: Button text on profile design page to save settings.
-#: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
-#: actions/emailsettings.php:251 actions/imsettings.php:199
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:198
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:204
-#: actions/subscriptions.php:261 actions/urlsettings.php:152
-#: actions/useradminpanel.php:298 lib/applicationeditform.php:355
-#: lib/designform.php:320 lib/groupeditform.php:201
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Salva"
 
 #. TRANS: Server error when page not found (404).
 #. TRANS: Server error when page not found (404)
-#: actions/all.php:68 actions/public.php:98 actions/replies.php:93
-#: actions/showfavorites.php:140 actions/tag.php:52
 msgid "No such page."
 msgstr "Pagina inesistente."
 
@@ -123,6 +105,7 @@ msgstr "Pagina inesistente."
 #. TRANS: Client error displayed when checking group membership for a non-existing user.
 #. TRANS: Client error displayed when trying to have a non-existing user join a group.
 #. TRANS: Client error displayed when trying to have a non-existing user leave a group.
+#. TRANS: Client error displayed when not providing a user or an invalid user.
 #. TRANS: Client error displayed when updating a status for a non-existing user.
 #. TRANS: Client error displayed when requesting a list of followers for a non-existing user.
 #. TRANS: Client error displayed when requesting most recent favourite notices by a user for a non-existing user.
@@ -135,6 +118,8 @@ msgstr "Pagina inesistente."
 #. 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.
 #. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
@@ -142,33 +127,10 @@ msgstr "Pagina inesistente."
 #. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when calling a profile action without specifying a user.
-#: actions/all.php:80 actions/allrss.php:69
-#: actions/apiaccountupdatedeliverydevice.php:110
-#: actions/apiaccountupdateprofile.php:103
-#: actions/apiaccountupdateprofilebackgroundimage.php:118
-#: actions/apiaccountupdateprofileimage.php:104 actions/apiatomservice.php:59
-#: actions/apiblockcreate.php:96 actions/apiblockdestroy.php:94
-#: actions/apidirectmessage.php:75 actions/apidirectmessagenew.php:72
-#: actions/apigroupcreate.php:111 actions/apigroupismember.php:89
-#: actions/apigroupjoin.php:98 actions/apigroupleave.php:98
-#: actions/apigrouplist.php:70 actions/apigroupprofileupdate.php:108
-#: actions/apistatusesupdate.php:230 actions/apisubscriptions.php:85
-#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:173
-#: actions/apitimelinehome.php:78 actions/apitimelinementions.php:77
-#: actions/apitimelineuser.php:79 actions/avatarbynickname.php:79
-#: actions/favoritesrss.php:72 actions/foaf.php:42 actions/foaf.php:61
-#: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116
-#: actions/otp.php:78 actions/remotesubscribe.php:144
-#: actions/remotesubscribe.php:153 actions/replies.php:73
-#: actions/repliesrss.php:38 actions/rsd.php:113 actions/showfavorites.php:106
-#: actions/userbyid.php:75 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/userxrd.php:59 actions/xrds.php:71 lib/command.php:509
-#: lib/galleryaction.php:59 lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Utente inesistente."
 
 #. TRANS: Page title. %1$s is user nickname, %2$d is page number
-#: actions/all.php:91
 #, php-format
 msgid "%1$s and friends, page %2$d"
 msgstr "%1$s e amici, pagina %2$d"
@@ -177,33 +139,26 @@ msgstr "%1$s e amici, pagina %2$d"
 #. TRANS: H1 text for page. %s is a user nickname.
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Timeline title for user and friends. %s is a user nickname.
-#: actions/all.php:94 actions/all.php:191 actions/allrss.php:117
-#: actions/apitimelinefriends.php:207 actions/apitimelinehome.php:113
-#: lib/personalgroupnav.php:100
 #, php-format
 msgid "%s and friends"
 msgstr "%s e amici"
 
 #. TRANS: %s is user nickname.
-#: actions/all.php:108
 #, php-format
 msgid "Feed for friends of %s (RSS 1.0)"
 msgstr "Feed degli amici di %s (RSS 1.0)"
 
 #. TRANS: %s is user nickname.
-#: actions/all.php:117
 #, php-format
 msgid "Feed for friends of %s (RSS 2.0)"
 msgstr "Feed degli amici di %s (RSS 2.0)"
 
 #. TRANS: %s is user nickname.
-#: actions/all.php:126
 #, php-format
 msgid "Feed for friends of %s (Atom)"
 msgstr "Feed degli amici di %s (Atom)"
 
 #. TRANS: Empty list message. %s is a user nickname.
-#: actions/all.php:139
 #, php-format
 msgid ""
 "This is the timeline for %s and friends but no one has posted anything yet."
@@ -213,7 +168,6 @@ msgstr ""
 
 #. TRANS: Encouragement displayed on logged in user's empty timeline.
 #. TRANS: This message contains Markdown links. Keep "](" together.
-#: actions/all.php:146
 #, php-format
 msgid ""
 "Try subscribing to more people, [join a group](%%action.groups%%) or post "
@@ -224,7 +178,6 @@ msgstr ""
 
 #. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@".
 #. TRANS: This message contains Markdown links. Keep "](" together.
-#: actions/all.php:150
 #, php-format
 msgid ""
 "You can try to [nudge %1$s](../%2$s) from their profile or [post something "
@@ -237,7 +190,6 @@ msgstr ""
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
 #. TRANS: Second sentence of empty message for anonymous users. %s is a user nickname.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:221
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -245,14 +197,11 @@ msgid ""
 msgstr "Perché non [crei un accout](%%action.register%%) e ne scrivi uno tu!"
 
 #. TRANS: H1 text for page when viewing a list for self.
-#: actions/all.php:188
 msgid "You and friends"
 msgstr "Tu e i tuoi amici"
 
 #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
 #. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name.
-#: actions/allrss.php:122 actions/apitimelinefriends.php:213
-#: actions/apitimelinehome.php:119
 #, php-format
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr "Messaggi da %1$s e amici su %2$s!"
@@ -271,55 +220,20 @@ msgstr "Messaggi da %1$s e amici su %2$s!"
 #. TRANS: Client error displayed trying to execute an unknown API method checking group membership.
 #. TRANS: Client error displayed trying to execute an unknown API method listing the latest 20 groups.
 #. TRANS: Client error displayed trying to execute an unknown API method showing group membership.
+#. TRANS: Client error displayed when using an unsupported API format.
 #. TRANS: Client error displayed trying to execute an unknown API method showing a group.
 #. TRANS: Client error displayed trying to execute an unknown API method testing API connectivity.
 #. TRANS: Client error displayed trying to execute an unknown API method deleting a status.
 #. TRANS: Client error displayed when trying to handle an unknown API method.
-#: actions/apiaccountratelimitstatus.php:69
-#: actions/apiaccountupdatedeliverydevice.php:92
-#: actions/apiaccountupdateprofile.php:94
-#: actions/apiaccountupdateprofilebackgroundimage.php:92
-#: actions/apiaccountupdateprofilecolors.php:115
-#: actions/apiaccountverifycredentials.php:68 actions/apidirectmessage.php:157
-#: actions/apifavoritecreate.php:98 actions/apifavoritedestroy.php:98
-#: actions/apifriendshipscreate.php:99 actions/apifriendshipsdestroy.php:99
-#: actions/apifriendshipsshow.php:124 actions/apigroupcreate.php:138
-#: actions/apigroupismember.php:115 actions/apigroupjoin.php:151
-#: actions/apigroupleave.php:141 actions/apigrouplist.php:134
-#: actions/apigrouplistall.php:120 actions/apigroupmembership.php:105
-#: actions/apigroupprofileupdate.php:100 actions/apigroupprofileupdate.php:213
-#: actions/apigroupshow.php:114 actions/apihelptest.php:84
-#: actions/apistatusesdestroy.php:101 actions/apistatusesretweets.php:110
-#: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:139
-#: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
-#: actions/apitimelinefavorites.php:182 actions/apitimelinefriends.php:276
-#: actions/apitimelinegroup.php:148 actions/apitimelinehome.php:181
-#: actions/apitimelinementions.php:182 actions/apitimelinepublic.php:247
-#: actions/apitimelineretweetedtome.php:147
-#: actions/apitimelineretweetsofme.php:147 actions/apitimelinetag.php:165
-#: actions/apitimelineuser.php:217 actions/apiusershow.php:100
 msgid "API method not found."
 msgstr "Metodo delle API non trovato."
 
 #. 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.
-#: actions/apiaccountupdatedeliverydevice.php:83
-#: actions/apiaccountupdateprofile.php:85
-#: actions/apiaccountupdateprofilebackgroundimage.php:83
-#: actions/apiaccountupdateprofilecolors.php:106
-#: actions/apiaccountupdateprofileimage.php:80 actions/apiblockcreate.php:87
-#: actions/apiblockdestroy.php:85 actions/apidirectmessagenew.php:107
-#: actions/apifavoritecreate.php:88 actions/apifavoritedestroy.php:88
-#: actions/apifriendshipscreate.php:89 actions/apifriendshipsdestroy.php:89
-#: actions/apigroupcreate.php:102 actions/apigroupjoin.php:89
-#: actions/apigroupleave.php:89 actions/apigroupprofileupdate.php:92
-#: actions/apimediaupload.php:66 actions/apistatusesretweet.php:63
-#: actions/apistatusesupdate.php:194
 msgid "This method requires a POST."
 msgstr "Questo metodo richiede POST."
 
 #. TRANS: Client error displayed when no valid device parameter is provided for a user's delivery device setting.
-#: actions/apiaccountupdatedeliverydevice.php:103
 msgid ""
 "You must specify a parameter named 'device' with a value of one of: sms, im, "
 "none."
@@ -334,10 +248,6 @@ msgstr ""
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
-#: actions/apiaccountupdatedeliverydevice.php:136
-#: actions/emailsettings.php:353 actions/emailsettings.php:499
-#: actions/profilesettings.php:323 actions/smssettings.php:300
-#: actions/smssettings.php:453 actions/urlsettings.php:211
 msgid "Could not update user."
 msgstr "Impossibile aggiornare l'utente."
 
@@ -350,32 +260,17 @@ msgstr "Impossibile aggiornare l'utente."
 #. TRANS: Server error displayed when requesting Friends of a Friend feed for a user for which the profile could not be found.
 #. TRANS: Server error displayed when trying to get a user hCard for a user without a profile.
 #. TRANS: Server error displayed when calling a profile action while the specified user does not have a profile.
-#: actions/apiaccountupdateprofile.php:111
-#: actions/apiaccountupdateprofilebackgroundimage.php:199
-#: actions/apiaccountupdateprofilecolors.php:183
-#: actions/apiaccountupdateprofileimage.php:131
-#: actions/apiuserprofileimage.php:88 actions/apiusershow.php:108
-#: actions/avatarbynickname.php:85 actions/foaf.php:69 actions/hcard.php:75
-#: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
-#: lib/profileaction.php:85
 msgid "User has no profile."
 msgstr "L'utente non ha un profilo."
 
 #. TRANS: Server error displayed if a user profile could not be saved.
 #. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:419
 msgid "Could not save profile."
 msgstr "Impossibile salvare il profilo."
 
 #. TRANS: Client error displayed when the number of bytes in a POST request exceeds a limit.
 #. TRANS: %s is the number of bytes of the CONTENT_LENGTH.
 #. TRANS: Form validation error in design settings form. POST should remain untranslated.
-#: actions/apiaccountupdateprofilebackgroundimage.php:108
-#: actions/apiaccountupdateprofileimage.php:95 actions/apimediaupload.php:81
-#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
-#: actions/designadminpanel.php:120 actions/editapplication.php:121
-#: actions/newapplication.php:102 actions/newnotice.php:95
-#: lib/designsettings.php:110
 #, fuzzy, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s byte) due to its "
@@ -395,26 +290,15 @@ msgstr[1] ""
 #. TRANS: Client error displayed when a database error occurs inserting profile colours.
 #. TRANS: Client error displayed when a database error occurs updating profile colours.
 #. TRANS: Form validation error displayed when group design settings could not be saved because of an application issue.
-#: actions/apiaccountupdateprofilebackgroundimage.php:138
-#: actions/apiaccountupdateprofilebackgroundimage.php:149
-#: actions/apiaccountupdateprofilecolors.php:160
-#: actions/apiaccountupdateprofilecolors.php:171
-#: actions/groupdesignsettings.php:285 actions/groupdesignsettings.php:296
-#: actions/userdesignsettings.php:218 actions/userdesignsettings.php:228
-#: actions/userdesignsettings.php:270 actions/userdesignsettings.php:280
 msgid "Unable to save your design settings."
 msgstr "Impossibile salvare la impostazioni dell'aspetto."
 
 #. TRANS: Error displayed when updating design settings fails.
 #. TRANS: Client error displayed when a database error occurs updating profile colours.
-#: actions/apiaccountupdateprofilebackgroundimage.php:191
-#: actions/apiaccountupdateprofilecolors.php:139
-#: actions/userdesignsettings.php:196
 msgid "Could not update your design."
 msgstr "Impossibile aggiornare l'aspetto."
 
 #. TRANS: Title for Atom feed.
-#: actions/apiatomservice.php:85
 msgctxt "ATOM"
 msgid "Main"
 msgstr ""
@@ -423,9 +307,6 @@ msgstr ""
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Title in atom group notice feed. %s is a group name.
 #. TRANS: Title in atom user notice feed. %s is a user name.
-#: actions/apiatomservice.php:93 actions/grouprss.php:138
-#: actions/userrss.php:94 lib/atomgroupnoticefeed.php:63
-#: lib/atomusernoticefeed.php:88
 #, php-format
 msgid "%s timeline"
 msgstr "Attività di %s"
@@ -435,8 +316,6 @@ msgstr "Attività di %s"
 #. TRANS: %s is a user nickname.
 #. TRANS: Header for subscriptions overview for a user (first page).
 #. TRANS: %s is a user nickname.
-#: actions/apiatomservice.php:104 actions/atompubsubscriptionfeed.php:148
-#: actions/subscriptions.php:51
 #, php-format
 msgid "%s subscriptions"
 msgstr "Abbonamenti di %s"
@@ -444,58 +323,48 @@ msgstr "Abbonamenti di %s"
 #. TRANS: Title for Atom feed with a user's favorite notices. %s is a user nickname.
 #. TRANS: Title for Atom favorites feed.
 #. TRANS: %s is a user nickname.
-#: actions/apiatomservice.php:115 actions/atompubfavoritefeed.php:142
 #, fuzzy, php-format
 msgid "%s favorites"
 msgstr "Preferiti"
 
 #. TRANS: Title for Atom feed with a user's memberships. %s is a user nickname.
-#: actions/apiatomservice.php:126
 #, fuzzy, php-format
 msgid "%s memberships"
 msgstr "Membri del gruppo %s"
 
 #. TRANS: Client error displayed when users try to block themselves.
-#: actions/apiblockcreate.php:105
 msgid "You cannot block yourself!"
 msgstr "Non puoi bloccarti!"
 
 #. TRANS: Server error displayed when blocking a user has failed.
-#: actions/apiblockcreate.php:127
 msgid "Block user failed."
 msgstr "Blocco dell'utente non riuscito."
 
 #. TRANS: Server error displayed when unblocking a user has failed.
-#: actions/apiblockdestroy.php:113
 msgid "Unblock user failed."
 msgstr "Sblocco dell'utente non riuscito."
 
 #. TRANS: Title. %s is a user nickname.
-#: actions/apidirectmessage.php:88
 #, php-format
 msgid "Direct messages from %s"
 msgstr "Messaggi diretti da %s"
 
 #. TRANS: Subtitle. %s is a user nickname.
-#: actions/apidirectmessage.php:93
 #, php-format
 msgid "All the direct messages sent from %s"
 msgstr "Tutti i messaggi diretti inviati da %s"
 
 #. TRANS: Title. %s is a user nickname.
-#: actions/apidirectmessage.php:102
 #, php-format
 msgid "Direct messages to %s"
 msgstr "Messaggi diretti a %s"
 
 #. TRANS: Subtitle. %s is a user nickname.
-#: actions/apidirectmessage.php:107
 #, php-format
 msgid "All the direct messages sent to %s"
 msgstr "Tutti i messaggi diretti inviati a %s"
 
 #. TRANS: Client error displayed when no message text was submitted (406).
-#: actions/apidirectmessagenew.php:117
 msgid "No message text!"
 msgstr "Nessun testo nel messaggio!"
 
@@ -503,7 +372,6 @@ msgstr "Nessun testo nel messaggio!"
 #. TRANS: %d is the maximum number of characters for a message.
 #. TRANS: Form validation error displayed when message content is too long.
 #. TRANS: %d is the maximum number of characters for a message.
-#: actions/apidirectmessagenew.php:127 actions/newmessage.php:152
 #, fuzzy, php-format
 msgid "That's too long. Maximum message size is %d character."
 msgid_plural "That's too long. Maximum message size is %d characters."
@@ -513,18 +381,15 @@ msgstr[1] ""
 "Troppo lungo. La dimensione massima di un messaggio è di %d caratteri."
 
 #. TRANS: Client error displayed if a recipient user could not be found (403).
-#: actions/apidirectmessagenew.php:139
 msgid "Recipient user not found."
 msgstr "Destinatario non trovato."
 
 #. TRANS: Client error displayed trying to direct message another user who's not a friend (403).
-#: actions/apidirectmessagenew.php:144
 #, fuzzy
 msgid "Cannot send direct messages to users who aren't your friend."
 msgstr "Non puoi inviare messaggi diretti a utenti che non sono tuoi amici."
 
 #. TRANS: Client error displayed trying to direct message self (403).
-#: actions/apidirectmessagenew.php:154
 #, fuzzy
 msgid ""
 "Do not send a message to yourself; just say it to yourself quietly instead."
@@ -533,118 +398,98 @@ msgstr "Non inviarti un messaggio, piuttosto ripetilo a voce dolcemente."
 #. 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.
 #. TRANS: Client error displayed trying to delete a status with an invalid ID.
-#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:108
-#: actions/apistatusesdestroy.php:121
 msgid "No status found with that ID."
 msgstr "Nessuno messaggio trovato con quel ID."
 
 #. TRANS: Client error displayed when trying to mark a notice favourite that already is a favourite.
-#: actions/apifavoritecreate.php:120
 msgid "This status is already a favorite."
 msgstr "Questo messaggio è già un preferito."
 
 #. TRANS: Client error displayed when marking a notice as favourite fails.
 #. TRANS: Server error displayed when trying to mark a notice as favorite fails in the database.
 #. TRANS: Error message text shown when a favorite could not be set.
-#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:306
 msgid "Could not create favorite."
 msgstr "Impossibile creare un preferito."
 
 #. TRANS: Client error displayed when trying to remove a favourite that was not a favourite.
-#: actions/apifavoritedestroy.php:122
 msgid "That status is not a favorite."
 msgstr "Questo messaggio non è un preferito."
 
 #. TRANS: Client error displayed when removing a favourite has failed.
 #. TRANS: Server error displayed when removing a favorite from the database fails.
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:90
 msgid "Could not delete favorite."
 msgstr "Impossibile eliminare un preferito."
 
 #. TRANS: Client error displayed when trying follow who's profile could not be found.
-#: actions/apifriendshipscreate.php:109
 msgid "Could not follow user: profile not found."
 msgstr "Impossibile non seguire l'utente: utente non trovato."
 
 #. TRANS: Client error displayed when trying to follow a user that's already being followed.
 #. TRANS: %s is the nickname of the user that is already being followed.
-#: actions/apifriendshipscreate.php:120
 #, php-format
 msgid "Could not follow user: %s is already on your list."
 msgstr "Impossibile seguire l'utente: %s è già nel tuo elenco."
 
 #. TRANS: Client error displayed when trying to unfollow a user that cannot be found.
-#: actions/apifriendshipsdestroy.php:109
 msgid "Could not unfollow user: User not found."
 msgstr "Impossibile non seguire l'utente: utente non trovato."
 
 #. TRANS: Client error displayed when trying to unfollow self.
-#: actions/apifriendshipsdestroy.php:121
 msgid "You cannot unfollow yourself."
 msgstr "Non puoi non seguirti."
 
 #. TRANS: Client error displayed when supplying invalid parameters to an API call checking if a friendship exists.
-#: actions/apifriendshipsexists.php:88
 #, fuzzy
 msgid "Two valid IDs or nick names must be supplied."
 msgstr "Devono essere forniti due ID o screen_names."
 
 #. TRANS: Client error displayed when a source user could not be determined showing friendship.
-#: actions/apifriendshipsshow.php:131
 msgid "Could not determine source user."
 msgstr "Impossibile determinare l'utente sorgente."
 
 #. TRANS: Client error displayed when a target user could not be determined showing friendship.
-#: actions/apifriendshipsshow.php:140
 msgid "Could not find target user."
 msgstr "Impossibile trovare l'utente destinazione."
 
 #. TRANS: Client error trying to create a group with a nickname this is already in use.
+#. TRANS: API validation exception thrown when nickname is already used.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:156 actions/apigroupprofileupdate.php:255
-#: actions/editgroup.php:191 actions/newgroup.php:137
-#: actions/profilesettings.php:274 actions/register.php:199
 msgid "Nickname already in use. Try another one."
 msgstr "Soprannome già in uso. Prova con un altro."
 
 #. TRANS: Client error in form for group creation.
+#. TRANS: API validation exception thrown when nickname does not validate.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:164 actions/apigroupprofileupdate.php:259
-#: actions/editgroup.php:195 actions/newgroup.php:141
-#: actions/profilesettings.php:244 actions/register.php:201
 msgid "Not a valid nickname."
 msgstr "Non è un soprannome valido."
 
 #. TRANS: Client error in form for group creation.
+#. TRANS: API validation exception thrown when homepage URL does not validate.
 #. TRANS: Validation error shown when providing an invalid homepage URL in the "Edit application" form.
 #. TRANS: Group edit form validation error.
 #. TRANS: Validation error shown when providing an invalid homepage URL in the "New application" form.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:181 actions/apigroupprofileupdate.php:277
-#: actions/editapplication.php:235 actions/editgroup.php:202
-#: actions/newapplication.php:221 actions/newgroup.php:148
-#: actions/profilesettings.php:249 actions/register.php:208
 msgid "Homepage is not a valid URL."
 msgstr "L'indirizzo della pagina web non è valido."
 
 #. TRANS: Client error in form for group creation.
+#. TRANS: API validation exception thrown when full name does not validate.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:191 actions/editgroup.php:206
-#: actions/newgroup.php:152 actions/profilesettings.php:253
-#: actions/register.php:211
 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "Nome troppo lungo (max 255 caratteri)."
 
 #. TRANS: Client error shown when providing too long a description during group creation.
 #. TRANS: %d is the maximum number of allowed characters.
+#. TRANS: API validation exception thrown when description does not validate.
+#. TRANS: %d is the maximum description length and used for plural.
 #. TRANS: Validation error shown when providing too long a description in the "Edit application" form.
 #. TRANS: %d is the maximum number of allowed characters.
 #. TRANS: Group edit form validation error.
@@ -652,9 +497,6 @@ msgstr "Nome troppo lungo (max 255 caratteri)."
 #. TRANS: %d is the maximum number of characters for the description.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed characters.
-#: actions/apigroupcreate.php:201 actions/editapplication.php:202
-#: actions/editgroup.php:211 actions/newapplication.php:182
-#: actions/newgroup.php:157
 #, fuzzy, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."
@@ -662,24 +504,22 @@ msgstr[0] "La descrizione è troppo lunga (max %d caratteri)."
 msgstr[1] "La descrizione è troppo lunga (max %d caratteri)."
 
 #. TRANS: Client error shown when providing too long a location during group creation.
+#. TRANS: API validation exception thrown when location does not validate.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:215 actions/editgroup.php:218
-#: actions/newgroup.php:164 actions/profilesettings.php:266
-#: actions/register.php:220
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
 msgstr "Ubicazione troppo lunga (max 255 caratteri)."
 
 #. TRANS: Client error shown when providing too many aliases during group creation.
 #. TRANS: %d is the maximum number of allowed aliases.
+#. TRANS: API validation exception thrown when aliases do not validate.
+#. TRANS: %d is the maximum number of aliases and used for plural.
 #. TRANS: Group edit form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.
-#: actions/apigroupcreate.php:236 actions/editgroup.php:231
-#: actions/newgroup.php:177
 #, fuzzy, php-format
 msgid "Too many aliases! Maximum %d allowed."
 msgid_plural "Too many aliases! Maximum %d allowed."
@@ -688,25 +528,24 @@ msgstr[1] "Troppi alias! Massimo %d."
 
 #. TRANS: Client error shown when providing an invalid alias during group creation.
 #. TRANS: %s is the invalid alias.
-#: actions/apigroupcreate.php:253
+#. TRANS: API validation exception thrown when aliases does not validate.
+#. TRANS: %s is the invalid alias.
 #, php-format
 msgid "Invalid alias: \"%s\"."
 msgstr "Alias non valido: \"%s\"."
 
 #. TRANS: Client error displayed when trying to use an alias during group creation that is already in use.
 #. TRANS: %s is the alias that is already in use.
+#. TRANS: API validation exception thrown when aliases is already used.
+#. TRANS: %s is the already used alias.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error. %s is the already used alias.
-#: actions/apigroupcreate.php:264 actions/apigroupprofileupdate.php:351
-#: actions/editgroup.php:246 actions/newgroup.php:193
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "L'alias \"%s\" è già in uso. Prova con un altro."
 
 #. TRANS: Client error displayed when trying to use an alias during group creation that is the same as the group's nickname.
 #. TRANS: Group edit form validation error.
-#: actions/apigroupcreate.php:278 actions/apigroupprofileupdate.php:359
-#: actions/editgroup.php:253
 msgid "Alias can't be the same as nickname."
 msgstr "L'alias non può essere lo stesso del soprannome."
 
@@ -714,26 +553,21 @@ msgstr "L'alias non può essere lo stesso del soprannome."
 #. TRANS: Client error displayed when trying to join a group that does not exist.
 #. TRANS: Client error displayed when trying to leave a group that does not exist.
 #. TRANS: Client error displayed trying to show group membership on a non-existing group.
+#. TRANS: Client error displayed when not providing a group or an invalid group.
 #. TRANS: Client error displayed when trying to show a group that could not be found.
 #. TRANS: Client error displayed requesting most recent notices to a group for a non-existing group.
-#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
-#: actions/apigroupleave.php:104 actions/apigroupmembership.php:71
-#: actions/apigroupprofileupdate.php:113 actions/apigroupshow.php:81
-#: actions/apitimelinegroup.php:89
 msgid "Group not found."
 msgstr "Gruppo non trovato."
 
 #. TRANS: Server error displayed when trying to join a group the user is already a member of.
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:345
 msgid "You are already a member of that group."
 msgstr "Fai già parte di quel gruppo."
 
 #. TRANS: Server error displayed when trying to join a group the user is blocked from joining.
 #. 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.
-#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:350
 msgid "You have been blocked from that group by the admin."
 msgstr "L'amministratore ti ha bloccato l'accesso a quel gruppo."
 
@@ -741,13 +575,11 @@ msgstr "L'amministratore ti ha bloccato l'accesso a quel gruppo."
 #. TRANS: %1$s is the joining user's nickname, $2$s is the group nickname for which the join failed.
 #. TRANS: Message given having failed to add a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:136 actions/joingroup.php:139 lib/command.php:362
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "Impossibile iscrivere l'utente %1$s al gruppo %2$s."
 
 #. TRANS: Server error displayed when trying to leave a group the user is not a member of.
-#: actions/apigroupleave.php:115
 msgid "You are not a member of this group."
 msgstr "Non fai parte di questo gruppo."
 
@@ -755,118 +587,81 @@ msgstr "Non fai parte di questo gruppo."
 #. TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
 #. TRANS: Message given having failed to remove a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupleave.php:127 actions/leavegroup.php:133
-#: lib/command.php:410
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
 msgstr "Impossibile rimuovere l'utente %1$s dal gruppo %2$s."
 
 #. TRANS: Used as title in check for group membership. %s is a user name.
-#: actions/apigrouplist.php:94
 #, php-format
 msgid "%s's groups"
 msgstr "Gruppi di %s"
 
 #. TRANS: Used as subtitle in check for group membership. %1$s is a user name, %2$s is the site name.
-#: actions/apigrouplist.php:104
 #, php-format
 msgid "%1$s groups %2$s is a member of."
 msgstr "Gruppi del sito %1$s a cui %2$s è iscritto."
 
 #. TRANS: Message is used as a title when listing the lastest 20 groups. %s is a site name.
 #. TRANS: Message is used as a page title. %s is a nick name.
-#: actions/apigrouplistall.php:88 actions/usergroups.php:63
 #, php-format
 msgid "%s groups"
 msgstr "Gruppi di %s"
 
 #. TRANS: Message is used as a subtitle when listing the lastest 20 groups. %s is a site name.
-#: actions/apigrouplistall.php:93
 #, php-format
 msgid "groups on %s"
 msgstr "Gruppi su %s"
 
+#. TRANS: Client error displayed when trying to edit a group without being an admin.
 #. TRANS: Client error displayed trying to edit a group while not being a group admin.
 #. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
 #. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
-#: actions/apigroupprofileupdate.php:118 actions/editgroup.php:110
-#: actions/editgroup.php:176 actions/groupdesignsettings.php:109
-#: actions/grouplogo.php:111
 msgid "You must be an admin to edit the group."
 msgstr "Devi essere amministratore per modificare il gruppo."
 
+#. TRANS: Server error displayed when group update fails.
 #. TRANS: Server error displayed when editing a group fails.
-#: actions/apigroupprofileupdate.php:171 actions/editgroup.php:274
 msgid "Could not update group."
 msgstr "Impossibile aggiornare il gruppo."
 
+#. TRANS: Server error displayed when adding group aliases fails.
 #. TRANS: Server error displayed when group aliases could not be added.
 #. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/apigroupprofileupdate.php:194 actions/editgroup.php:281
-#: classes/User_group.php:540
 msgid "Could not create aliases."
 msgstr "Impossibile creare gli alias."
 
+#. TRANS: API validation exception thrown when nickname does not validate.
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: actions/apigroupprofileupdate.php:249 lib/nickname.php:165
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr ""
 "Il soprannome deve essere composto solo da lettere minuscole e numeri, senza "
 "spazi."
 
-#: actions/apigroupprofileupdate.php:286
-#, fuzzy
-msgid "Full name is too long (max 255 chars)."
-msgstr "Nome troppo lungo (max 255 caratteri)."
-
-#: actions/apigroupprofileupdate.php:296
-#, fuzzy, php-format
-msgid "description is too long (max %d chars)."
-msgstr "La descrizione è troppo lunga (max %d caratteri)."
-
-#: actions/apigroupprofileupdate.php:307
-#, fuzzy
-msgid "Location is too long (max 255 chars)."
-msgstr "Ubicazione troppo lunga (max 255 caratteri)."
-
-#: actions/apigroupprofileupdate.php:326
-#, fuzzy, php-format
-msgid "Too many aliases! Maximum %d."
-msgstr "Troppi alias! Massimo %d."
-
-#. TRANS: Group edit form validation error.
+#. TRANS: API validation exception thrown when alias is the same as nickname.
 #. TRANS: Group create form validation error.
-#. TRANS: %s is the invalid alias.
-#: actions/apigroupprofileupdate.php:342 actions/editgroup.php:241
-#: actions/newgroup.php:188
-#, php-format
-msgid "Invalid alias: \"%s\""
-msgstr "Alias non valido: \"%s\""
+#, fuzzy
+msgid "Alias cannot be the same as nickname."
+msgstr "L'alias non può essere lo stesso del soprannome."
 
 #. TRANS: Client error displayed when uploading a media file has failed.
-#: actions/apimediaupload.php:101
 msgid "Upload failed."
 msgstr "Caricamento non riuscito."
 
 #. TRANS: Client error given from the OAuth API when the request token or verifier is invalid.
-#: actions/apioauthaccesstoken.php:102
 #, fuzzy
 msgid "Invalid request token or verifier."
 msgstr "Token di accesso specificato non valido."
 
 #. TRANS: Client error given when no oauth_token was passed to the OAuth API.
-#: actions/apioauthauthorize.php:107
 msgid "No oauth_token parameter provided."
 msgstr "Nessun parametro oauth_token fornito."
 
 #. TRANS: Client error given when an invalid request token was passed to the OAuth API.
-#: actions/apioauthauthorize.php:115 actions/apioauthauthorize.php:129
 #, fuzzy
 msgid "Invalid request token."
 msgstr "Token non valido."
 
 #. TRANS: Client error given when an invalid request token was passed to the OAuth API.
-#: actions/apioauthauthorize.php:121
 #, fuzzy
 msgid "Request token already authorized."
 msgstr "Autorizzazione non presente."
@@ -877,32 +672,15 @@ msgstr "Autorizzazione non presente."
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
 #. TRANS: Client error displayed when the session token is not okay.
-#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:75
-#: actions/emailsettings.php:292 actions/favor.php:75 actions/geocode.php:55
-#: actions/groupblock.php:65 actions/grouplogo.php:321
-#: actions/groupunblock.php:65 actions/imsettings.php:241
-#: actions/invite.php:60 actions/makeadmin.php:66 actions/newmessage.php:135
-#: actions/newnotice.php:105 actions/nudge.php:80
-#: actions/oauthappssettings.php:162 actions/oauthconnectionssettings.php:135
-#: actions/passwordsettings.php:137 actions/pluginenable.php:87
-#: actions/profilesettings.php:218 actions/recoverpassword.php:383
-#: actions/register.php:157 actions/remotesubscribe.php:76
-#: actions/repeat.php:82 actions/smssettings.php:249 actions/subedit.php:40
-#: actions/subscribe.php:87 actions/tagother.php:145
-#: actions/unsubscribe.php:69 actions/urlsettings.php:171
-#: actions/userauthorization.php:53 lib/designsettings.php:122
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 "Si è verificato un problema con il tuo token di sessione. Prova di nuovo."
 
 #. TRANS: Form validation error given when an invalid username and/or password was passed to the OAuth API.
-#: actions/apioauthauthorize.php:168
 msgid "Invalid nickname / password!"
 msgstr "Nome utente o password non valido."
 
 #. TRANS: Server error displayed when a database action fails.
-#: actions/apioauthauthorize.php:217
 #, fuzzy
 msgid "Database error inserting oauth_token_association."
 msgstr "Errore nel database nell'inserire l'applicazione utente OAuth."
@@ -919,28 +697,19 @@ msgstr "Errore nel database nell'inserire l'applicazione utente OAuth."
 #. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
 #. TRANS: Message given submitting a form with an unknown action in SMS settings.
 #. TRANS: Unknown form validation error in design settings form.
-#: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
-#: actions/designadminpanel.php:100 actions/editapplication.php:144
-#: actions/emailsettings.php:311 actions/grouplogo.php:332
-#: actions/imsettings.php:256 actions/newapplication.php:124
-#: actions/oauthconnectionssettings.php:144 actions/recoverpassword.php:46
-#: actions/smssettings.php:270 lib/designsettings.php:133
 msgid "Unexpected form submission."
 msgstr "Invio del modulo inaspettato."
 
 #. TRANS: Title for a page where a user can confirm/deny account access by an external application.
-#: actions/apioauthauthorize.php:387
 msgid "An application would like to connect to your account"
 msgstr "Un'applicazione vorrebbe collegarsi al tuo account"
 
 #. TRANS: Fieldset legend.
-#: actions/apioauthauthorize.php:404
 msgid "Allow or deny access"
 msgstr "Consenti o nega l'accesso"
 
 #. TRANS: User notification of external application requesting account access.
 #. TRANS: %3$s is the access type requested (read-write or read-only), %4$s is the StatusNet sitename.
-#: actions/apioauthauthorize.php:425
 #, fuzzy, php-format
 msgid ""
 "An application would like the ability to <strong>%3$s</strong> your %4$s "
@@ -954,7 +723,6 @@ msgstr ""
 #. TRANS: User notification of external application requesting account access.
 #. TRANS: %1$s is the application name requesting access, %2$s is the organisation behind the application,
 #. TRANS: %3$s is the access type requested, %4$s is the StatusNet sitename.
-#: actions/apioauthauthorize.php:433
 #, php-format
 msgid ""
 "The application <strong>%1$s</strong> by <strong>%2$s</strong> would like "
@@ -966,23 +734,19 @@ msgstr ""
 "accesso al proprio account %4$s solo ad applicazioni di cui ci si può fidare."
 
 #. TRANS: Fieldset legend.
-#: actions/apioauthauthorize.php:455
 #, fuzzy
 msgctxt "LEGEND"
 msgid "Account"
 msgstr "Account"
 
 #. TRANS: Field label on OAuth API authorisation form.
+#. TRANS: Field label on login page.
 #. TRANS: Field label in form for profile settings.
-#: actions/apioauthauthorize.php:459 actions/login.php:225
-#: actions/profilesettings.php:107 actions/register.php:411
-#: actions/userauthorization.php:145 lib/groupeditform.php:145
 msgid "Nickname"
 msgstr "Soprannome"
 
 #. TRANS: Field label on OAuth API authorisation form.
-#: actions/apioauthauthorize.php:463 actions/login.php:228
-#: actions/register.php:415 lib/settingsnav.php:87
+#. TRANS: Field label on login page.
 msgid "Password"
 msgstr "Password"
 
@@ -992,47 +756,38 @@ msgstr "Password"
 #. TRANS: Button label to cancel an IM address confirmation procedure.
 #. TRANS: Button label to cancel a SMS address confirmation procedure.
 #. TRANS: Button label in the "Edit application" form.
-#: actions/apioauthauthorize.php:478 actions/emailsettings.php:125
-#: actions/imsettings.php:136 actions/smssettings.php:132
-#: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Cancel"
 msgstr "Annulla"
 
 #. TRANS: Button text that when clicked will allow access to an account by an external application.
-#: actions/apioauthauthorize.php:485
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Allow"
 msgstr "Consenti"
 
 #. TRANS: Form instructions.
-#: actions/apioauthauthorize.php:502
 #, fuzzy
 msgid "Authorize access to your account information."
 msgstr "Consenti o nega l'accesso alle informazioni del tuo account."
 
 #. TRANS: Header for user notification after revoking OAuth access to an application.
-#: actions/apioauthauthorize.php:594
 #, fuzzy
 msgid "Authorization canceled."
 msgstr "Conferma della messaggistica annullata."
 
 #. TRANS: User notification after revoking OAuth access to an application.
 #. TRANS: %s is an OAuth token.
-#: actions/apioauthauthorize.php:598
 #, fuzzy, php-format
 msgid "The request token %s has been revoked."
 msgstr "Il token di richiesta %s è stato rifiutato o revocato."
 
 #. TRANS: Title of the page notifying the user that an anonymous client application was successfully authorized to access the user's account with OAuth.
-#: actions/apioauthauthorize.php:621
 #, fuzzy
 msgid "You have successfully authorized the application"
 msgstr "Autorizzazione non presente."
 
 #. TRANS: Message notifying the user that an anonymous client application was successfully authorized to access the user's account with OAuth.
-#: actions/apioauthauthorize.php:625
 msgid ""
 "Please return to the application and enter the following security code to "
 "complete the process."
@@ -1040,14 +795,12 @@ msgstr ""
 
 #. TRANS: Title of the page notifying the user that the client application was successfully authorized to access the user's account with OAuth.
 #. TRANS: %s is the authorised application name.
-#: actions/apioauthauthorize.php:632
 #, fuzzy, php-format
 msgid "You have successfully authorized %s"
 msgstr "Autorizzazione non presente."
 
 #. TRANS: Message notifying the user that the client application was successfully authorized to access the user's account with OAuth.
 #. TRANS: %s is the authorised application name.
-#: actions/apioauthauthorize.php:639
 #, php-format
 msgid ""
 "Please return to %s and enter the following security code to complete the "
@@ -1056,12 +809,10 @@ msgstr ""
 
 #. TRANS: Client error displayed trying to delete a status not using POST or DELETE.
 #. TRANS: POST and DELETE should not be translated.
-#: actions/apistatusesdestroy.php:111
 msgid "This method requires a POST or DELETE."
 msgstr "Questo metodo richiede POST o DELETE."
 
 #. TRANS: Client error displayed trying to delete a status of another user.
-#: actions/apistatusesdestroy.php:136
 msgid "You may not delete another user's status."
 msgstr "Non puoi eliminare il messaggio di un altro utente."
 
@@ -1069,21 +820,16 @@ msgstr "Non puoi eliminare il messaggio di un altro utente."
 #. TRANS: Client error displayed trying to display redents of a non-exiting notice.
 #. TRANS: Client exception thrown when referencing a non-existing notice.
 #. TRANS: Error message displayed trying to delete a non-existing notice.
-#: actions/apistatusesretweet.php:74 actions/apistatusesretweets.php:70
-#: actions/atompubshowfavorite.php:82 actions/deletenotice.php:61
-#: actions/shownotice.php:92
 msgid "No such notice."
 msgstr "Nessun messaggio."
 
 #. TRANS: Client error displayed trying to repeat an own notice through the API.
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:549
 msgid "Cannot repeat your own notice."
 msgstr "Non puoi ripetere un tuo messaggio."
 
 #. TRANS: Client error displayed trying to re-repeat a notice through the API.
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:92 lib/command.php:555
 msgid "Already repeated that notice."
 msgstr "Hai già ripetuto quel messaggio."
 
@@ -1093,59 +839,45 @@ msgstr "Hai già ripetuto quel messaggio."
 #. TRANS: Client exception thrown when using an unsupported HTTP method.
 #. TRANS: Client error shown when using a non-supported HTTP method.
 #. TRANS: Client exception thrown when using an unsupported HTTP method.
-#: actions/apistatusesshow.php:118 actions/atompubfavoritefeed.php:103
-#: actions/atompubmembershipfeed.php:105 actions/atompubshowfavorite.php:117
-#: actions/atompubshowmembership.php:116
-#: actions/atompubshowsubscription.php:122
-#: actions/atompubsubscriptionfeed.php:109
 #, fuzzy
 msgid "HTTP method not supported."
 msgstr "Metodo delle API non trovato."
 
 #. TRANS: Exception thrown requesting an unsupported notice output format.
 #. TRANS: %s is the requested output format.
-#: actions/apistatusesshow.php:144
 #, fuzzy, php-format
 msgid "Unsupported format: %s."
 msgstr "Formato non supportato."
 
 #. TRANS: Client error displayed requesting a deleted status.
-#: actions/apistatusesshow.php:155
 msgid "Status deleted."
 msgstr "Messaggio eliminato."
 
 #. TRANS: Client error displayed requesting a status with an invalid ID.
-#: actions/apistatusesshow.php:162
 msgid "No status with that ID found."
 msgstr "Nessuno stato trovato con quel ID."
 
 #. TRANS: Client error displayed when trying to delete a notice not using the Atom format.
-#: actions/apistatusesshow.php:227
 msgid "Can only delete using the Atom format."
 msgstr ""
 
 #. TRANS: Client error displayed when a user has no rights to delete notices of other users.
 #. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
-#: actions/apistatusesshow.php:235 actions/deletenotice.php:78
 #, fuzzy
 msgid "Cannot delete this notice."
 msgstr "Impossibile eliminare questo messaggio."
 
 #. TRANS: Confirmation of notice deletion in API. %d is the ID (number) of the deleted notice.
-#: actions/apistatusesshow.php:249
 #, fuzzy, php-format
 msgid "Deleted notice %d"
 msgstr "Elimina messaggio"
 
 #. TRANS: Client error displayed when the parameter "status" is missing.
-#: actions/apistatusesupdate.php:221
 msgid "Client must provide a 'status' parameter with a value."
 msgstr "Il client deve fornire un parametro \"status\" con un valore."
 
 #. TRANS: Client error displayed when the parameter "status" is missing.
 #. TRANS: %d is the maximum number of character for a notice.
-#: actions/apistatusesupdate.php:244 actions/newnotice.php:161
-#: lib/mailhandler.php:60
 #, fuzzy, php-format
 msgid "That's too long. Maximum notice size is %d character."
 msgid_plural "That's too long. Maximum notice size is %d characters."
@@ -1153,14 +885,12 @@ msgstr[0] "Troppo lungo. Lunghezza massima %d caratteri."
 msgstr[1] "Troppo lungo. Lunghezza massima %d caratteri."
 
 #. TRANS: Client error displayed when replying to a non-existing notice.
-#: actions/apistatusesupdate.php:284
 #, fuzzy
 msgid "Parent notice not found."
 msgstr "Metodo delle API non trovato."
 
 #. TRANS: Client error displayed exceeding the maximum notice length.
 #. TRANS: %d is the maximum lenth for a notice.
-#: actions/apistatusesupdate.php:308 actions/newnotice.php:184
 #, fuzzy, php-format
 msgid "Maximum notice size is %d character, including attachment URL."
 msgid_plural "Maximum notice size is %d characters, including attachment URL."
@@ -1171,13 +901,11 @@ msgstr[1] ""
 
 #. TRANS: Client error displayed when requesting profiles of followers in an unsupported format.
 #. TRANS: Client error displayed when requesting IDs of followers in an unsupported format.
-#: actions/apisubscriptions.php:228 actions/apisubscriptions.php:258
 msgid "Unsupported format."
 msgstr "Formato non supportato."
 
 #. TRANS: Title for timeline of most recent favourite notices by a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname.
-#: actions/apitimelinefavorites.php:108
 #, php-format
 msgid "%1$s / Favorites from %2$s"
 msgstr "%1$s / Preferiti da %2$s"
@@ -1185,14 +913,12 @@ msgstr "%1$s / Preferiti da %2$s"
 #. TRANS: Subtitle for timeline of most recent favourite notices by a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user's full name,
 #. TRANS: %3$s is a user nickname.
-#: actions/apitimelinefavorites.php:120
 #, fuzzy, php-format
 msgid "%1$s updates favorited by %2$s / %3$s."
 msgstr "%1$s aggiornamenti preferiti da %2$s / %3$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.
-#: actions/apitimelinementions.php:115
 #, php-format
 msgid "%1$s / Updates mentioning %2$s"
 msgstr "%1$s / Messaggi che citano %2$s"
@@ -1200,49 +926,41 @@ msgstr "%1$s / Messaggi che citano %2$s"
 #. TRANS: Subtitle for timeline of most recent mentions of a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname,
 #. TRANS: %3$s is a user's full name.
-#: actions/apitimelinementions.php:131
 #, php-format
 msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr "%1$s messaggi in risposta a quelli da %2$s / %3$s"
 
 #. TRANS: Title for site timeline. %s is the StatusNet sitename.
 #. TRANS: Public RSS feed title. %s is the StatusNet site name.
-#: actions/apitimelinepublic.php:193 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "Attività pubblica di %s"
 
 #. TRANS: Subtitle for site timeline. %s is the StatusNet sitename.
-#: actions/apitimelinepublic.php:199
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "Aggiornamenti di %s da tutti!"
 
 #. TRANS: Server error displayed calling unimplemented API method for 'retweeted by me'.
-#: actions/apitimelineretweetedbyme.php:71
 #, fuzzy
 msgid "Unimplemented."
 msgstr "Metodo non implementato"
 
 #. TRANS: Title for Atom feed "repeated to me". %s is the user nickname.
-#: actions/apitimelineretweetedtome.php:96
 #, php-format
 msgid "Repeated to %s"
 msgstr "Ripetuto a %s"
 
-#: actions/apitimelineretweetedtome.php:98
 #, fuzzy, php-format
 msgid "%1$s notices that were to repeated to %2$s / %3$s."
 msgstr "%1$s messaggi in risposta a quelli da %2$s / %3$s"
 
 #. TRANS: Title of list of repeated notices of the logged in user.
 #. TRANS: %s is the nickname of the logged in user.
-#: actions/apitimelineretweetsofme.php:98
 #, php-format
 msgid "Repeats of %s"
 msgstr "Ripetizioni di %s"
 
-#: actions/apitimelineretweetsofme.php:104
 #, fuzzy, php-format
 msgid "%1$s notices that %2$s / %3$s has repeated."
 msgstr "%s (@%s) ha aggiunto il tuo messaggio tra i suoi preferiti"
@@ -1251,181 +969,148 @@ msgstr "%s (@%s) ha aggiunto il tuo messaggio tra i suoi preferiti"
 #. TRANS: %s is the tag.
 #. TRANS: Title for first page of notices with tags.
 #. TRANS: %s is the tag.
-#: actions/apitimelinetag.php:101 actions/tag.php:69
 #, php-format
 msgid "Notices tagged with %s"
 msgstr "Messaggi etichettati con %s"
 
 #. TRANS: Subtitle for timeline with lastest notices with a given tag.
 #. TRANS: %1$s is the tag, $2$s is the StatusNet sitename.
-#: actions/apitimelinetag.php:105 actions/tagrss.php:65
 #, php-format
 msgid "Updates tagged with %1$s on %2$s!"
 msgstr "Messaggi etichettati con %1$s su %2$s!"
 
 #. TRANS: Client error displayed trying to add a notice to another user's timeline.
-#: actions/apitimelineuser.php:308
 #, fuzzy
 msgid "Only the user can add to their own timeline."
 msgstr "Solo l'utente può leggere la propria casella di posta."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:315
 msgid "Only accept AtomPub for Atom feeds."
 msgstr ""
 
 #. TRANS: Client error displayed attempting to post an empty API notice.
-#: actions/apitimelineuser.php:322
 msgid "Atom post must not be empty."
 msgstr ""
 
 #. TRANS: Client error displayed attempting to post an API that is not well-formed XML.
-#: actions/apitimelineuser.php:328
 msgid "Atom post must be well-formed XML."
 msgstr ""
 
 #. TRANS: Client error displayed when not using an Atom entry.
-#: actions/apitimelineuser.php:334 actions/atompubfavoritefeed.php:228
-#: actions/atompubmembershipfeed.php:230
-#: actions/atompubsubscriptionfeed.php:236
 msgid "Atom post must be an Atom entry."
 msgstr ""
 
 #. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
-#: actions/apitimelineuser.php:345
 msgid "Can only handle POST activities."
 msgstr ""
 
 #. TRANS: Client error displayed when using an unsupported activity object type.
 #. TRANS: %s is the unsupported activity object type.
-#: actions/apitimelineuser.php:356
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
 #. TRANS: %d is the notice ID (number).
-#: actions/apitimelineuser.php:390
 #, fuzzy, php-format
 msgid "No content for notice %d."
 msgstr "Trova contenuto dei messaggi"
 
 #. TRANS: Client error displayed when using another format than AtomPub.
 #. TRANS: %s is the notice URI.
-#: actions/apitimelineuser.php:419
 #, fuzzy, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "Un messaggio con quel ID non esiste."
 
 #. TRANS: Server error for unfinished API method showTrends.
-#: actions/apitrends.php:85
 msgid "API method under construction."
 msgstr "Metodo delle API in lavorazione."
 
 #. TRANS: Client error displayed when requesting user information for a non-existing user.
-#: actions/apiuserprofileimage.php:80 actions/apiusershow.php:94
 msgid "User not found."
 msgstr "Metodo delle API non trovato."
 
 #. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
 #. TRANS: Client exception.
 #. TRANS: Client error displayed trying to subscribe to a non-existing profile.
-#: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
-#: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
-#: actions/subscribe.php:110
 msgid "No such profile."
 msgstr "Nessun profilo."
 
 #. TRANS: Subtitle for Atom favorites feed.
 #. TRANS: %1$s is a user nickname, %2$s is the StatusNet sitename.
-#: actions/atompubfavoritefeed.php:147
 #, fuzzy, php-format
 msgid "Notices %1$s has favorited on %2$s"
 msgstr "Messaggi da %1$s e amici su %2$s!"
 
 #. TRANS: Client exception thrown when trying to set a favorite for another user.
 #. TRANS: Client exception thrown when trying to subscribe another user.
-#: actions/atompubfavoritefeed.php:217 actions/atompubsubscriptionfeed.php:225
 #, fuzzy
 msgid "Cannot add someone else's subscription."
 msgstr "Impossibile inserire un nuovo abbonamento."
 
 #. TRANS: Client exception thrown when trying use an incorrect activity verb for the Atom pub method.
-#: actions/atompubfavoritefeed.php:240
 #, fuzzy
 msgid "Can only handle favorite activities."
 msgstr "Trova contenuto dei messaggi"
 
 #. TRANS: Client exception thrown when trying favorite an object that is not a notice.
-#: actions/atompubfavoritefeed.php:250 actions/atompubmembershipfeed.php:250
 #, fuzzy
 msgid "Can only fave notices."
 msgstr "Trova contenuto dei messaggi"
 
 #. TRANS: Client exception thrown when trying favorite a notice without content.
-#: actions/atompubfavoritefeed.php:259
 #, fuzzy
 msgid "Unknown note."
 msgstr "Sconosciuto"
 
 #. TRANS: Client exception thrown when trying favorite an already favorited notice.
-#: actions/atompubfavoritefeed.php:267
 #, fuzzy
 msgid "Already a favorite."
 msgstr "Aggiungi ai preferiti"
 
 #. TRANS: Title for group membership feed.
 #. TRANS: %s is a username.
-#: actions/atompubmembershipfeed.php:144
 #, fuzzy, php-format
 msgid "%s group memberships"
 msgstr "Membri del gruppo %s"
 
 #. TRANS: Subtitle for group membership feed.
 #. TRANS: %1$s is a username, %2$s is the StatusNet sitename.
-#: actions/atompubmembershipfeed.php:149
 #, fuzzy, php-format
 msgid "Groups %1$s is a member of on %2$s"
 msgstr "Gruppi di cui %s fa parte"
 
 #. TRANS: Client exception thrown when trying subscribe someone else to a group.
-#: actions/atompubmembershipfeed.php:219
 #, fuzzy
 msgid "Cannot add someone else's membership."
 msgstr "Impossibile inserire un nuovo abbonamento."
 
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#: actions/atompubmembershipfeed.php:242
 #, fuzzy
 msgid "Can only handle join activities."
 msgstr "Trova contenuto dei messaggi"
 
 #. TRANS: Client exception thrown when trying to subscribe to a non-existing group.
-#: actions/atompubmembershipfeed.php:259
 #, fuzzy
 msgid "Unknown group."
 msgstr "Sconosciuto"
 
 #. TRANS: Client exception thrown when trying to subscribe to an already subscribed group.
-#: actions/atompubmembershipfeed.php:267
 #, fuzzy
 msgid "Already a member."
 msgstr "Tutti i membri"
 
 #. TRANS: Client exception thrown when trying to subscribe to group while blocked from that group.
-#: actions/atompubmembershipfeed.php:275
 msgid "Blocked by admin."
 msgstr ""
 
 #. TRANS: Client exception thrown when referencing a non-existing favorite.
-#: actions/atompubshowfavorite.php:90
 #, fuzzy
 msgid "No such favorite."
 msgstr "Nessun file."
 
 #. TRANS: Client exception thrown when trying to remove a favorite notice of another user.
-#: actions/atompubshowfavorite.php:151
 #, fuzzy
 msgid "Cannot delete someone else's favorite."
 msgstr "Impossibile eliminare un preferito."
@@ -1452,93 +1137,68 @@ msgstr "Impossibile eliminare un preferito."
 #. TRANS: Client error displayed when trying to join a non-existing group.
 #. TRANS: Client error displayed when trying to leave a non-local group.
 #. TRANS: Client error displayed when trying to leave a non-existing group.
+#. TRANS: Client error displayed when providing an invalid group ID on the Make Admin page.
 #. 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.
 #. TRANS: Command exception text shown when a group is requested that does not exist.
 #. TRANS: Error text shown when trying to leave a group that does not exist.
-#: actions/atompubshowmembership.php:81 actions/blockedfromgroup.php:81
-#: actions/blockedfromgroup.php:89 actions/deletegroup.php:87
-#: actions/deletegroup.php:100 actions/editgroup.php:102
-#: actions/foafgroup.php:46 actions/foafgroup.php:65 actions/foafgroup.php:73
-#: actions/groupblock.php:89 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:101 actions/grouplogo.php:103
-#: actions/groupmembers.php:84 actions/groupmembers.php:92
-#: actions/grouprss.php:97 actions/grouprss.php:105
-#: actions/groupunblock.php:89 actions/joingroup.php:82
-#: actions/joingroup.php:95 actions/leavegroup.php:82
-#: actions/leavegroup.php:95 actions/makeadmin.php:86
-#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:392
 msgid "No such group."
 msgstr "Nessuna gruppo."
 
 #. TRANS: Client exception thrown when trying to show membership of a non-subscribed group
-#: actions/atompubshowmembership.php:91
 #, fuzzy
 msgid "Not a member."
 msgstr "Tutti i membri"
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
-#: actions/atompubshowmembership.php:150
 #, fuzzy
 msgid "Cannot delete someone else's membership."
 msgstr "Impossibile salvare l'abbonamento."
 
 #. TRANS: Client exception thrown when trying to display a subscription for a non-existing profile ID.
 #. TRANS: %d is the non-existing profile ID number.
-#: actions/atompubshowsubscription.php:72
-#: actions/atompubshowsubscription.php:83
-#: actions/atompubsubscriptionfeed.php:74
 #, fuzzy, php-format
 msgid "No such profile id: %d."
 msgstr "Nessun profilo."
 
 #. 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.
-#: actions/atompubshowsubscription.php:94
 #, fuzzy, php-format
 msgid "Profile %1$d not subscribed to profile %2$d."
 msgstr "Non hai una abbonamento a quel profilo."
 
 #. TRANS: Client exception thrown when trying to delete a subscription of another user.
-#: actions/atompubshowsubscription.php:157
 #, fuzzy
 msgid "Cannot delete someone else's subscription."
 msgstr "Impossibile salvare l'abbonamento."
 
 #. TRANS: Subtitle for Atom subscription feed.
 #. TRANS: %1$s is a user nickname, %s$s is the StatusNet sitename.
-#: actions/atompubsubscriptionfeed.php:153
 #, fuzzy, php-format
 msgid "People %1$s has subscribed to on %2$s"
 msgstr "Persone abbonate a %s"
 
 #. TRANS: Client error displayed when not using the follow verb.
-#: actions/atompubsubscriptionfeed.php:248
 msgid "Can only handle Follow activities."
 msgstr ""
 
 #. TRANS: Client exception thrown when subscribing to an object that is not a person.
-#: actions/atompubsubscriptionfeed.php:256
 msgid "Can only follow people."
 msgstr ""
 
 #. TRANS: Client exception thrown when subscribing to a non-existing profile.
 #. TRANS: %s is the unknown profile ID.
-#: actions/atompubsubscriptionfeed.php:267
 #, fuzzy, php-format
 msgid "Unknown profile %s."
 msgstr "Tipo di file sconosciuto"
 
 #. TRANS: Client error displayed trying to subscribe to an already subscribed profile.
 #. TRANS: %s is the profile the user already has a subscription on.
-#: actions/atompubsubscriptionfeed.php:275
 #, fuzzy, php-format
 msgid "Already subscribed to %s."
 msgstr "Hai già l'abbonamento!"
 
 #. TRANS: Client error displayed trying to get a non-existing attachment.
-#: actions/attachment.php:73
 msgid "No such attachment."
 msgstr "Nessun allegato."
 
@@ -1550,31 +1210,23 @@ msgstr "Nessun allegato."
 #. TRANS: Client error displayed when trying to view group members without providing a group nickname.
 #. TRANS: Client error displayed when requesting a group RSS feed without providing a group nickname.
 #. TRANS: Client error displayed if no nickname argument was given requesting a group page.
-#: actions/avatarbynickname.php:60 actions/blockedfromgroup.php:73
-#: actions/editgroup.php:85 actions/groupdesignsettings.php:84
-#: actions/grouplogo.php:86 actions/groupmembers.php:76
-#: actions/grouprss.php:89 actions/showgroup.php:116
 msgid "No nickname."
 msgstr "Nessun soprannome."
 
 #. TRANS: Client error displayed trying to get an avatar without providing an avatar size.
-#: actions/avatarbynickname.php:66
 msgid "No size."
 msgstr "Nessuna dimensione."
 
 #. TRANS: Client error displayed trying to get an avatar providing an invalid avatar size.
-#: actions/avatarbynickname.php:72
 msgid "Invalid size."
 msgstr "Dimensione non valida."
 
 #. TRANS: Title for avatar upload page.
-#: actions/avatarsettings.php:66 lib/settingsnav.php:82
 msgid "Avatar"
 msgstr "Immagine"
 
 #. TRANS: Instruction for avatar upload page.
 #. TRANS: %s is the maximum file size, for example "500b", "10kB" or "2MB".
-#: actions/avatarsettings.php:78
 #, php-format
 msgid "You can upload your personal avatar. The maximum file size is %s."
 msgstr ""
@@ -1584,17 +1236,12 @@ msgstr ""
 #. TRANS: Server error displayed coming across a request from a user without a profile.
 #. TRANS: Server error displayed when trying to authorise a remote subscription request
 #. TRANS: while the user has no profile.
-#: actions/avatarsettings.php:108 actions/avatarsettings.php:192
-#: actions/grouplogo.php:184 actions/remotesubscribe.php:190
-#: actions/userauthorization.php:75 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr "Utente senza profilo corrispondente."
 
 #. TRANS: Avatar upload page form legend.
 #. TRANS: Avatar upload page crop form legend.
 #. TRANS: Legend for group logo settings fieldset.
-#: actions/avatarsettings.php:122 actions/avatarsettings.php:205
-#: actions/grouplogo.php:261
 msgid "Avatar settings"
 msgstr "Impostazioni immagine"
 
@@ -1602,8 +1249,6 @@ msgstr "Impostazioni immagine"
 #. TRANS: Header on avatar upload crop form for thumbnail of originally uploaded avatar (h2).
 #. TRANS: Uploaded original file in group logo form.
 #. TRANS: Header for originally uploaded file before a crop on the group logo page.
-#: actions/avatarsettings.php:131 actions/avatarsettings.php:214
-#: actions/grouplogo.php:207 actions/grouplogo.php:270
 msgid "Original"
 msgstr "Originale"
 
@@ -1611,14 +1256,11 @@ msgstr "Originale"
 #. TRANS: Header on avatar upload crop form for thumbnail of to be used rendition of uploaded avatar (h2).
 #. TRANS: Header for preview of to be displayed group logo.
 #. TRANS: Header for the cropped group logo on the group logo page.
-#: actions/avatarsettings.php:147 actions/avatarsettings.php:227
-#: actions/grouplogo.php:219 actions/grouplogo.php:283
 msgid "Preview"
 msgstr "Anteprima"
 
 #. TRANS: Button on avatar upload page to delete current avatar.
 #. TRANS: Button text for user account deletion.
-#: actions/avatarsettings.php:155 actions/deleteaccount.php:319
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Delete"
@@ -1626,70 +1268,58 @@ msgstr "Elimina"
 
 #. TRANS: Button on avatar upload page to upload an avatar.
 #. TRANS: Submit button to confirm upload of a user backup file for account restore.
-#: actions/avatarsettings.php:173 actions/restoreaccount.php:369
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Upload"
 msgstr "Carica"
 
 #. TRANS: Button on avatar upload crop form to confirm a selected crop as avatar.
-#: actions/avatarsettings.php:243
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Crop"
 msgstr "Ritaglia"
 
 #. TRANS: Validation error on avatar upload form when no file was uploaded.
-#: actions/avatarsettings.php:318
 msgid "No file uploaded."
 msgstr "Nessun file caricato."
 
 #. TRANS: Avatar upload form instruction after uploading a file.
-#: actions/avatarsettings.php:345
 #, fuzzy
 msgid "Pick a square area of the image to be your avatar."
 msgstr "Scegli un'area quadrata per la tua immagine personale"
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
 #. TRANS: Server error displayed trying to crop an uploaded group logo that is no longer present.
-#: actions/avatarsettings.php:360 actions/grouplogo.php:391
 msgid "Lost our file data."
 msgstr "Perso il nostro file di dati."
 
 #. TRANS: Success message for having updated a user avatar.
-#: actions/avatarsettings.php:384
 msgid "Avatar updated."
 msgstr "Immagine aggiornata."
 
 #. TRANS: Error displayed on the avatar upload page if the avatar could not be updated for an unknown reason.
-#: actions/avatarsettings.php:388
 msgid "Failed updating avatar."
 msgstr "Aggiornamento dell'immagine non riuscito."
 
 #. TRANS: Success message for deleting a user avatar.
-#: actions/avatarsettings.php:412
 msgid "Avatar deleted."
 msgstr "Immagine eliminata."
 
 #. TRANS: Title for backup account page.
 #. TRANS: Option in profile settings to create a backup of the account of the currently logged in user.
-#: actions/backupaccount.php:61 actions/profilesettings.php:468
 msgid "Backup account"
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to backup an account while not logged in.
-#: actions/backupaccount.php:79
 #, fuzzy
 msgid "Only logged-in users can backup their account."
 msgstr "Solo gli utenti collegati possono ripetere i messaggi."
 
 #. TRANS: Client exception thrown when trying to backup an account without having backup rights.
-#: actions/backupaccount.php:84
 msgid "You may not backup your account."
 msgstr ""
 
 #. TRANS: Information displayed on the backup account page.
-#: actions/backupaccount.php:227
 msgid ""
 "You can backup your account data in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format. This is an experimental feature and provides "
@@ -1699,31 +1329,26 @@ msgid ""
 msgstr ""
 
 #. TRANS: Submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:250
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Backup"
 msgstr "Sfondo"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:254
 msgid "Backup your account."
 msgstr ""
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
-#: actions/block.php:68
 msgid "You already blocked that user."
 msgstr "Hai già bloccato quell'utente."
 
 #. TRANS: Title for block user page.
 #. TRANS: Legend for block user form.
 #. TRANS: Fieldset legend for block user from group form.
-#: actions/block.php:106 actions/block.php:136 actions/groupblock.php:165
 msgid "Block user"
 msgstr "Blocca utente"
 
 #. TRANS: Explanation of consequences when blocking a user on the block user page.
-#: actions/block.php:139
 msgid ""
 "Are you sure you want to block this user? Afterwards, they will be "
 "unsubscribed from you, unable to subscribe to you in the future, and you "
@@ -1739,15 +1364,11 @@ msgstr ""
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:154 actions/deleteapplication.php:157
-#: actions/deletegroup.php:220 actions/deletenotice.php:155
-#: actions/deleteuser.php:154 actions/groupblock.php:187
 msgctxt "BUTTON"
 msgid "No"
 msgstr "No"
 
 #. TRANS: Submit button title for 'No' when blocking a user.
-#: actions/block.php:158
 #, fuzzy
 msgid "Do not block this user."
 msgstr "Non bloccare questo utente"
@@ -1758,50 +1379,40 @@ msgstr "Non bloccare questo utente"
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:161 actions/deleteapplication.php:164
-#: actions/deletegroup.php:227 actions/deletenotice.php:162
-#: actions/deleteuser.php:161 actions/groupblock.php:194
 msgctxt "BUTTON"
 msgid "Yes"
 msgstr "Sì"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:165
 #, fuzzy
 msgid "Block this user."
 msgstr "Blocca questo utente"
 
 #. TRANS: Server error displayed when blocking a user fails.
-#: actions/block.php:189
 msgid "Failed to save block information."
 msgstr "Salvataggio delle informazioni per il blocco non riuscito."
 
 #. TRANS: Title for first page with list of users blocked from a group.
 #. TRANS: %s is a group nickname.
-#: actions/blockedfromgroup.php:101
 #, php-format
 msgid "%s blocked profiles"
 msgstr "Profili bloccati di %s"
 
 #. TRANS: Title for any but the first page with list of users blocked from a group.
 #. TRANS: %1$s is a group nickname, %2$d is a page number.
-#: actions/blockedfromgroup.php:106
 #, php-format
 msgid "%1$s blocked profiles, page %2$d"
 msgstr "Profili bloccati di %1$s, pagina %2$d"
 
 #. TRANS: Instructions for list of users blocked from a group.
-#: actions/blockedfromgroup.php:122
 msgid "A list of the users blocked from joining this group."
 msgstr "Un elenco degli utenti a cui è bloccato l'accesso a questo gruppo."
 
 #. TRANS: Form legend for unblocking a user from a group.
-#: actions/blockedfromgroup.php:291
 msgid "Unblock user from group"
 msgstr "Sblocca l'utente dal gruppo"
 
 #. TRANS: Button text for unblocking a user from a group.
-#: actions/blockedfromgroup.php:323
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Unblock"
@@ -1809,130 +1420,104 @@ msgstr "Sblocca"
 
 #. TRANS: Tooltip for button for unblocking a user from a group.
 #. TRANS: Description of the form to unblock a user.
-#: actions/blockedfromgroup.php:327 lib/unblockform.php:78
 msgid "Unblock this user"
 msgstr "Sblocca questo utente"
 
 #. TRANS: Title for mini-posting window loaded from bookmarklet.
 #. TRANS: %s is the StatusNet site name.
-#: actions/bookmarklet.php:51
 #, php-format
 msgid "Post to %s"
 msgstr "Invia a %s"
 
 #. TRANS: Client error displayed when not providing a confirmation code in the contact address confirmation action.
-#: actions/confirmaddress.php:74
 msgid "No confirmation code."
 msgstr "Nessun codice di conferma."
 
 #. TRANS: Client error displayed when providing a non-existing confirmation code in the contact address confirmation action.
-#: actions/confirmaddress.php:80
 msgid "Confirmation code not found."
 msgstr "Codice di conferma non trovato."
 
 #. TRANS: Client error displayed when not providing a confirmation code for another user in the contact address confirmation action.
-#: actions/confirmaddress.php:86
 msgid "That confirmation code is not for you!"
 msgstr "Quel codice di conferma non è per te!"
 
 #. TRANS: Server error for an unknown address type, which can be 'email', 'sms', or the name of an IM network (such as 'xmpp' or 'aim')
-#: actions/confirmaddress.php:94
-#, fuzzy, php-format
+#, php-format
 msgid "Unrecognized address type %s"
-msgstr "Tipo di indirizzo %s non riconosciuto."
+msgstr "Tipo di indirizzo %s non riconosciuto"
 
 #. TRANS: Client error for an already confirmed email/jabber/sms address.
-#: actions/confirmaddress.php:103 actions/confirmaddress.php:136
 msgid "That address has already been confirmed."
 msgstr "Quell'indirizzo è già stato confermato."
 
-#: actions/confirmaddress.php:121 actions/imsettings.php:444
-#: actions/userdesignsettings.php:306
-#, fuzzy
 msgid "Couldn't update user."
 msgstr "Impossibile aggiornare l'utente."
 
-#: actions/confirmaddress.php:144
 #, fuzzy
 msgid "Couldn't update user im preferences."
 msgstr "Impossibile aggiornare il record dell'utente."
 
-#: actions/confirmaddress.php:156
 #, fuzzy
 msgid "Couldn't insert user im preferences."
 msgstr "Impossibile inserire un nuovo abbonamento."
 
 #. TRANS: Server error displayed when an address confirmation code deletion from the
 #. TRANS: database fails in the contact address confirmation action.
-#: actions/confirmaddress.php:169
 #, fuzzy
 msgid "Could not delete address confirmation."
 msgstr "Impossibile eliminare la conferma della messaggistica."
 
 #. TRANS: Title for the contact address confirmation action.
-#: actions/confirmaddress.php:185
 msgid "Confirm address"
 msgstr "Conferma indirizzo"
 
 #. TRANS: Success message for the contact address confirmation action.
 #. TRANS: %s can be 'email', 'jabber', or 'sms'.
-#: actions/confirmaddress.php:200
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "L'indirizzo \"%s\" è stato confermato per il tuo account."
 
 #. TRANS: Title for page with a conversion (multiple notices in context).
-#: actions/conversation.php:96
 msgid "Conversation"
 msgstr "Conversazione"
 
 #. TRANS: Header on conversation page. Hidden by default (h2).
 #. TRANS: Label for user statistics.
-#: actions/conversation.php:149 lib/noticelist.php:87
-#: lib/profileaction.php:246 lib/searchgroupnav.php:82
-#: lib/threadednoticelist.php:66
 msgid "Notices"
 msgstr "Messaggi"
 
 #. TRANS: Client exception displayed trying to delete a user account while not logged in.
-#: actions/deleteaccount.php:71
 #, fuzzy
 msgid "Only logged-in users can delete their account."
 msgstr "Solo gli utenti collegati possono ripetere i messaggi."
 
 #. TRANS: Client exception displayed trying to delete a user account without have the rights to do that.
-#: actions/deleteaccount.php:77
 #, fuzzy
 msgid "You cannot delete your account."
 msgstr "Non puoi eliminare utenti."
 
 #. TRANS: Confirmation text for user deletion. The user has to type this exactly the same, including punctuation.
-#: actions/deleteaccount.php:160 actions/deleteaccount.php:297
 msgid "I am sure."
 msgstr ""
 
 #. TRANS: Notification for user about the text that must be input to be able to delete a user account.
 #. TRANS: %s is the text that needs to be input.
-#: actions/deleteaccount.php:164
 #, php-format
 msgid "You must write \"%s\" exactly in the box."
 msgstr ""
 
 #. TRANS: Confirmation that a user account has been deleted.
-#: actions/deleteaccount.php:206
 #, fuzzy
 msgid "Account deleted."
 msgstr "Immagine eliminata."
 
 #. TRANS: Page title for page on which a user account can be deleted.
 #. TRANS: Option in profile settings to delete the account of the currently logged in user.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:476
 #, fuzzy
 msgid "Delete account"
 msgstr "Crea un account"
 
 #. TRANS: Form text for user deletion form.
-#: actions/deleteaccount.php:279
 msgid ""
 "This will <strong>permanently delete</strong> your account data from this "
 "server."
@@ -1940,7 +1525,6 @@ msgstr ""
 
 #. TRANS: Additional form text for user deletion form shown if a user has account backup rights.
 #. TRANS: %s is a URL to the backup page.
-#: actions/deleteaccount.php:285
 #, php-format
 msgid ""
 "You are strongly advised to <a href=\"%s\">back up your data</a> before "
@@ -1949,56 +1533,43 @@ msgstr ""
 
 #. TRANS: Field label for delete account confirmation entry.
 #. TRANS: Field label for password reset form where the password has to be typed again.
-#: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:262 actions/register.php:419
 msgid "Confirm"
 msgstr "Conferma"
 
 #. TRANS: Input title for the delete account field.
 #. TRANS: %s is the text that needs to be input.
-#: actions/deleteaccount.php:304
 #, fuzzy, php-format
 msgid "Enter \"%s\" to confirm that you want to delete your account."
 msgstr "Non puoi eliminare utenti."
 
 #. TRANS: Button title for user account deletion.
-#: actions/deleteaccount.php:323
 #, fuzzy
 msgid "Permanently delete your account"
 msgstr "Non puoi eliminare utenti."
 
 #. TRANS: Client error displayed trying to delete an application while not logged in.
-#: actions/deleteapplication.php:62
 msgid "You must be logged in to delete an application."
 msgstr "Devi eseguire l'accesso per eliminare un'applicazione."
 
 #. TRANS: Client error displayed trying to delete an application that does not exist.
-#: actions/deleteapplication.php:71
 msgid "Application not found."
 msgstr "Applicazione non trovata."
 
 #. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
-#: actions/deleteapplication.php:79 actions/editapplication.php:78
-#: actions/showapplication.php:90
 msgid "You are not the owner of this application."
 msgstr "Questa applicazione non è di tua proprietà."
 
 #. TRANS: Client error text when there is a problem with the session token.
-#: actions/deleteapplication.php:102 actions/editapplication.php:131
-#: actions/newapplication.php:112 actions/showapplication.php:113
-#: lib/action.php:1391
 msgid "There was a problem with your session token."
 msgstr "Si è verificato un problema con il tuo token di sessione."
 
 #. TRANS: Title for delete application page.
 #. TRANS: Fieldset legend on delete application page.
-#: actions/deleteapplication.php:124 actions/deleteapplication.php:149
 msgid "Delete application"
 msgstr "Elimina applicazione"
 
 #. TRANS: Confirmation text on delete application page.
-#: actions/deleteapplication.php:152
 msgid ""
 "Are you sure you want to delete this application? This will clear all data "
 "about the application from the database, including all existing user "
@@ -2008,19 +1579,16 @@ msgstr ""
 "riguardo all'applicazione dal database, comprese tutte le connessioni utente."
 
 #. TRANS: Submit button title for 'No' when deleting an application.
-#: actions/deleteapplication.php:161
 #, fuzzy
 msgid "Do not delete this application."
 msgstr "Non eliminare l'applicazione"
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
-#: actions/deleteapplication.php:167
 #, fuzzy
 msgid "Delete this application."
 msgstr "Elimina l'applicazione"
 
 #. TRANS: Client error when trying to delete group while not logged in.
-#: actions/deletegroup.php:64
 #, fuzzy
 msgid "You must be logged in to delete a group."
 msgstr "Devi eseguire l'accesso per lasciare un gruppo."
@@ -2028,40 +1596,33 @@ msgstr "Devi eseguire l'accesso per lasciare un gruppo."
 #. TRANS: Client error when trying to delete a group without providing a nickname or ID for the group.
 #. TRANS: Client error displayed when trying to join a group without providing a group name or group ID.
 #. TRANS: Client error displayed when trying to leave a group without providing a group name or group ID.
-#: actions/deletegroup.php:94 actions/joingroup.php:89
-#: actions/leavegroup.php:89
 msgid "No nickname or ID."
 msgstr "Nessun soprannome o ID."
 
 #. TRANS: Client error when trying to delete a group without having the rights to delete it.
-#: actions/deletegroup.php:107
 #, fuzzy
 msgid "You are not allowed to delete this group."
 msgstr "Non fai parte di questo gruppo."
 
 #. TRANS: Server error displayed if a group could not be deleted.
 #. TRANS: %s is the name of the group that could not be deleted.
-#: actions/deletegroup.php:150
 #, fuzzy, php-format
 msgid "Could not delete group %s."
 msgstr "Impossibile aggiornare il gruppo."
 
 #. TRANS: Message given after deleting a group.
 #. TRANS: %s is the deleted group's name.
-#: actions/deletegroup.php:159
 #, fuzzy, php-format
 msgid "Deleted group %s"
 msgstr "%1$s ha lasciato il gruppo %2$s"
 
 #. TRANS: Title of delete group page.
 #. TRANS: Form legend for deleting a group.
-#: actions/deletegroup.php:176 actions/deletegroup.php:202
 #, fuzzy
 msgid "Delete group"
 msgstr "Elimina utente"
 
 #. TRANS: Warning in form for deleleting a group.
-#: actions/deletegroup.php:206
 #, fuzzy
 msgid ""
 "Are you sure you want to delete this group? This will clear all data about "
@@ -2072,13 +1633,11 @@ msgstr ""
 "dell'utente dal database, senza una copia di sicurezza."
 
 #. TRANS: Submit button title for 'No' when deleting a group.
-#: actions/deletegroup.php:224
 #, fuzzy
 msgid "Do not delete this group."
 msgstr "Non eliminare il messaggio"
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
-#: actions/deletegroup.php:231
 #, fuzzy
 msgid "Delete this group."
 msgstr "Elimina questo utente"
@@ -2089,22 +1648,18 @@ msgstr "Elimina questo utente"
 #. TRANS: Client error displayed trying to block a user from a group while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying to log out when not logged in.
+#. TRANS: Client error displayed when trying to access the "make admin" page while not logged in.
+#. TRANS: Client error displayed trying to create a new direct message while not logged in.
+#. TRANS: Client error displayed trying to send a notice while not logged in.
+#. TRANS: Client error displayed trying to nudge a user without being logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
 #. TRANS: Client error displayed when trying to change user options while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
-#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:70
-#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
-#: actions/nudge.php:63 actions/pluginenable.php:97 actions/subedit.php:33
-#: actions/subscribe.php:98 actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:71 lib/profileformaction.php:63
-#: lib/settingsaction.php:72
 msgid "Not logged in."
 msgstr "Accesso non effettuato."
 
 #. TRANS: Instructions for deleting a notice.
-#: actions/deletenotice.php:110
 msgid ""
 "You are about to permanently delete a notice. Once this is done, it cannot "
 "be undone."
@@ -2114,51 +1669,42 @@ msgstr ""
 
 #. TRANS: Page title when deleting a notice.
 #. TRANS: Fieldset legend for the delete notice form.
-#: actions/deletenotice.php:117 actions/deletenotice.php:148
 msgid "Delete notice"
 msgstr "Elimina messaggio"
 
 #. TRANS: Message for the delete notice form.
-#: actions/deletenotice.php:152
 msgid "Are you sure you want to delete this notice?"
 msgstr "Vuoi eliminare questo messaggio?"
 
 #. TRANS: Submit button title for 'No' when deleting a notice.
-#: actions/deletenotice.php:159
 #, fuzzy
 msgid "Do not delete this notice."
 msgstr "Non eliminare il messaggio"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:166
 #, fuzzy
 msgid "Delete this notice."
 msgstr "Elimina questo messaggio"
 
 #. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
-#: actions/deleteuser.php:66
 msgid "You cannot delete users."
 msgstr "Non puoi eliminare utenti."
 
 #. TRANS: Client error displayed when trying to delete a non-local user.
-#: actions/deleteuser.php:74
 msgid "You can only delete local users."
 msgstr "Puoi eliminare solo gli utenti locali."
 
 #. TRANS: Title of delete user page.
-#: actions/deleteuser.php:110
 #, fuzzy
 msgctxt "TITLE"
 msgid "Delete user"
 msgstr "Elimina utente"
 
 #. TRANS: Fieldset legend on delete user page.
-#: actions/deleteuser.php:134
 msgid "Delete user"
 msgstr "Elimina utente"
 
 #. TRANS: Information text to request if a user is certain that the described action has to be performed.
-#: actions/deleteuser.php:138
 msgid ""
 "Are you sure you want to delete this user? This will clear all data about "
 "the user from the database, without a backup."
@@ -2167,101 +1713,82 @@ msgstr ""
 "dell'utente dal database, senza una copia di sicurezza."
 
 #. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/deleteuser.php:158
 #, fuzzy
 msgid "Do not delete this user."
 msgstr "Non eliminare il messaggio"
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
-#: actions/deleteuser.php:165
 #, fuzzy
 msgid "Delete this user."
 msgstr "Elimina questo utente"
 
 #. TRANS: Message used as title for design settings for the site.
-#: actions/designadminpanel.php:60 lib/settingsnav.php:97
 msgid "Design"
 msgstr "Aspetto"
 
 #. TRANS: Instructions for design adminsitration panel.
-#: actions/designadminpanel.php:71
 msgid "Design settings for this StatusNet site"
 msgstr "Impostazioni dell'aspetto per questo sito StatusNet"
 
 #. TRANS: Client error displayed when a logo URL does is not valid.
-#: actions/designadminpanel.php:327
 msgid "Invalid logo URL."
 msgstr "URL del logo non valido."
 
 #. TRANS: Client error displayed when an SSL logo URL is invalid.
-#: actions/designadminpanel.php:333
 #, fuzzy
 msgid "Invalid SSL logo URL."
 msgstr "URL del logo non valido."
 
 #. TRANS: Client error displayed when a theme is submitted through the form that is not in the theme list.
 #. TRANS: %s is the chosen unavailable theme.
-#: actions/designadminpanel.php:339
 #, php-format
 msgid "Theme not available: %s."
 msgstr "Tema non disponibile: %s."
 
 #. TRANS: Fieldset legend for form to change logo.
-#: actions/designadminpanel.php:437
 msgid "Change logo"
 msgstr "Modifica logo"
 
 #. TRANS: Field label for StatusNet site logo.
-#: actions/designadminpanel.php:444
 msgid "Site logo"
 msgstr "Logo del sito"
 
 #. TRANS: Field label for SSL StatusNet site logo.
-#: actions/designadminpanel.php:452
 #, fuzzy
 msgid "SSL logo"
 msgstr "Logo del sito"
 
 #. TRANS: Fieldset legend for form change StatusNet site's theme.
-#: actions/designadminpanel.php:467
 msgid "Change theme"
 msgstr "Modifica tema"
 
 #. TRANS: Field label for dropdown to choose site theme.
-#: actions/designadminpanel.php:485
 msgid "Site theme"
 msgstr "Tema del sito"
 
 #. TRANS: Title for field label for dropdown to choose site theme.
-#: actions/designadminpanel.php:487
 msgid "Theme for the site."
 msgstr "Tema per questo sito."
 
 #. TRANS: Field label for uploading a cutom theme.
-#: actions/designadminpanel.php:494
 msgid "Custom theme"
 msgstr "Tema personalizzato"
 
 #. TRANS: Form instructions for uploading a cutom StatusNet theme.
-#: actions/designadminpanel.php:499
 msgid "You can upload a custom StatusNet theme as a .ZIP archive."
 msgstr "Puoi caricare un tema per StatusNet personalizzato come un file ZIP."
 
 #. TRANS: Fieldset legend for theme background image.
-#: actions/designadminpanel.php:515
 msgid "Change background image"
 msgstr "Modifica l'immagine di sfondo"
 
 #. TRANS: Field label for background image on theme designer page.
 #. TRANS: Field label for background color selector.
 #. TRANS: Label on profile design page for setting a profile page background colour.
-#: actions/designadminpanel.php:525 actions/designadminpanel.php:609
-#: lib/designform.php:238
 msgid "Background"
 msgstr "Sfondo"
 
 #. TRANS: Form guide for background image upload form on theme designer page.
-#: actions/designadminpanel.php:531
 #, php-format
 msgid ""
 "You can upload a background image for the site. The maximum file size is %1"
@@ -2271,204 +1798,169 @@ msgstr ""
 "file è di %1$s."
 
 #. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:558
 msgid "On"
 msgstr "On"
 
 #. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:575
 msgid "Off"
 msgstr "Off"
 
 #. TRANS: Form guide for turning background image on or off on theme designer page.
 #. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
 #. TRANS: use of the uploaded profile image.
-#: actions/designadminpanel.php:577 lib/designform.php:214
 msgid "Turn background image on or off."
 msgstr "Abilita o disabilita l'immagine di sfondo."
 
 #. TRANS: Checkbox label to title background image on theme designer page.
 #. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-#: actions/designadminpanel.php:583 lib/designform.php:220
 msgid "Tile background image"
 msgstr "Affianca l'immagine di sfondo"
 
 #. TRANS: Fieldset legend for theme colors.
-#: actions/designadminpanel.php:598
 #, fuzzy
 msgid "Change colors"
 msgstr "Modifica colori"
 
 #. TRANS: Field label for content color selector.
 #. TRANS: Label on profile design page for setting a profile page content colour.
-#: actions/designadminpanel.php:623 lib/designform.php:252
 msgid "Content"
 msgstr "Contenuto"
 
 #. TRANS: Field label for sidebar color selector.
 #. TRANS: Label on profile design page for setting a profile page sidebar colour.
-#: actions/designadminpanel.php:637 lib/designform.php:266
 msgid "Sidebar"
 msgstr "Barra laterale"
 
 #. TRANS: Field label for text color selector.
 #. TRANS: Label on profile design page for setting a profile page text colour.
-#: actions/designadminpanel.php:651 lib/designform.php:280
 msgid "Text"
 msgstr "Testo"
 
 #. TRANS: Field label for link color selector.
 #. TRANS: Label on profile design page for setting a profile page links colour.
-#: actions/designadminpanel.php:665 lib/designform.php:294
 msgid "Links"
 msgstr "Collegamenti"
 
 #. TRANS: Fieldset legend for advanced theme design settings.
-#: actions/designadminpanel.php:691
 msgid "Advanced"
 msgstr "Avanzate"
 
 #. TRANS: Field label for custom CSS.
-#: actions/designadminpanel.php:696
 msgid "Custom CSS"
 msgstr "CSS personalizzato"
 
 #. TRANS: Button text for resetting theme settings.
-#: actions/designadminpanel.php:718
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Use defaults"
 msgstr "Usa predefiniti"
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:720
 #, fuzzy
 msgid "Restore default designs."
 msgstr "Ripristina i valori predefiniti"
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:728
 #, fuzzy
 msgid "Reset back to default."
 msgstr "Reimposta i valori predefiniti"
 
 #. TRANS: Title for button for saving theme settings.
-#: actions/designadminpanel.php:736
 #, fuzzy
 msgid "Save design."
 msgstr "Salva aspetto"
 
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
-#: actions/disfavor.php:83
 msgid "This notice is not a favorite!"
 msgstr "Questo messaggio non è un preferito!"
 
 #. TRANS: Title for page on which favorites can be added.
-#: actions/disfavor.php:98
 msgid "Add to favorites"
 msgstr "Aggiungi ai preferiti"
 
 #. TRANS: Client exception thrown when requesting a document from the documentation that does not exist.
 #. TRANS: %s is the non-existing document.
-#: actions/doc.php:155
 #, fuzzy, php-format
 msgid "No such document \"%s\"."
 msgstr "Nessun documento \"%s\""
 
 #. TRANS: Title for "Edit application" form.
 #. TRANS: Form legend.
-#: actions/editapplication.php:54 lib/applicationeditform.php:129
 msgid "Edit application"
 msgstr "Modifica applicazione"
 
 #. TRANS: Client error displayed trying to edit an application while not logged in.
-#: actions/editapplication.php:66
 msgid "You must be logged in to edit an application."
 msgstr "Devi eseguire l'accesso per modificare un'applicazione."
 
 #. TRANS: Client error displayed trying to edit an application that does not exist.
-#: actions/editapplication.php:83 actions/showapplication.php:83
 msgid "No such application."
 msgstr "Nessuna applicazione."
 
 #. TRANS: Instructions for "Edit application" form.
-#: actions/editapplication.php:167
 msgid "Use this form to edit your application."
 msgstr "Usa questo modulo per modificare la tua applicazione."
 
 #. TRANS: Validation error shown when not providing a name in the "Edit application" form.
 #. TRANS: Validation error shown when not providing a name in the "New application" form.
-#: actions/editapplication.php:184 actions/newapplication.php:164
 msgid "Name is required."
 msgstr "Il nome è richiesto."
 
 #. 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.
-#: actions/editapplication.php:188 actions/newapplication.php:172
 #, fuzzy
 msgid "Name is too long (maximum 255 characters)."
 msgstr "Il nome è troppo lungo (max 255 caratteri)."
 
 #. TRANS: Validation error shown when providing a name for an application that already exists in the "Edit application" form.
 #. TRANS: Validation error shown when providing a name for an application that already exists in the "New application" form.
-#: actions/editapplication.php:192 actions/newapplication.php:168
 msgid "Name already in use. Try another one."
 msgstr "Nome già in uso. Prova con un altro."
 
 #. TRANS: Validation error shown when not providing a description in the "Edit application" form.
 #. TRANS: Validation error shown when not providing a description in the "New application" form.
-#: actions/editapplication.php:196 actions/newapplication.php:176
 msgid "Description is required."
 msgstr "La descrizione è richiesta."
 
 #. TRANS: Validation error shown when providing too long a source URL in the "Edit application" form.
-#: actions/editapplication.php:209
 msgid "Source URL is too long."
 msgstr "L'URL sorgente è troppo lungo."
 
 #. TRANS: Validation error shown when providing an invalid source URL in the "Edit application" form.
 #. TRANS: Validation error shown when providing an invalid source URL in the "New application" form.
-#: actions/editapplication.php:216 actions/newapplication.php:199
 msgid "Source URL is not valid."
 msgstr "L'URL sorgente non è valido."
 
 #. 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.
-#: actions/editapplication.php:220 actions/newapplication.php:203
 msgid "Organization is required."
 msgstr "L'organizzazione è richiesta."
 
 #. TRANS: Validation error shown when providing too long an arganisation name in the "Edit application" form.
-#: actions/editapplication.php:224 actions/newapplication.php:207
 #, fuzzy
 msgid "Organization is too long (maximum 255 characters)."
 msgstr "L'organizzazione è troppo lunga (max 255 caratteri)."
 
 #. TRANS: Form validation error show when an organisation name has not been provided in the edit application form.
 #. TRANS: Form validation error show when an organisation name has not been provided in the new application form.
-#: actions/editapplication.php:228 actions/newapplication.php:211
 msgid "Organization homepage is required."
 msgstr "Il sito web dell'organizzazione è richiesto."
 
 #. TRANS: Validation error shown when providing too long a callback URL in the "Edit application" form.
 #. TRANS: Validation error shown when providing too long a callback URL in the "New application" form.
-#: actions/editapplication.php:239 actions/newapplication.php:225
 msgid "Callback is too long."
 msgstr "Il callback è troppo lungo."
 
 #. TRANS: Validation error shown when providing an invalid callback URL in the "Edit application" form.
 #. TRANS: Validation error shown when providing an invalid callback URL in the "New application" form.
-#: actions/editapplication.php:247 actions/newapplication.php:235
 msgid "Callback URL is not valid."
 msgstr "L'URL di callback non è valido."
 
 #. TRANS: Server error occuring when an application could not be updated from the "Edit application" form.
-#: actions/editapplication.php:284
 msgid "Could not update application."
 msgstr "Impossibile aggiornare l'applicazione."
 
 #. TRANS: Title for form to edit a group. %s is a group nickname.
-#: actions/editgroup.php:55
 #, php-format
 msgid "Edit %s group"
 msgstr "Modifica il gruppo %s"
@@ -2476,40 +1968,40 @@ msgstr "Modifica il gruppo %s"
 #. TRANS: Client error displayed trying to edit a group while not logged in.
 #. TRANS: Client error displayed when trying to create a group while not logged in.
 #. TRANS: Client error displayed trying to create a group while not logged in.
-#: actions/editgroup.php:68 actions/grouplogo.php:69 actions/newgroup.php:65
 msgid "You must be logged in to create a group."
 msgstr "Devi eseguire l'accesso per creare un gruppo."
 
 #. TRANS: Form instructions for group edit form.
-#: actions/editgroup.php:161
 msgid "Use this form to edit the group."
 msgstr "Usa questo modulo per modificare il gruppo."
 
+#. TRANS: Group edit form validation error.
+#. TRANS: Group create form validation error.
+#. TRANS: %s is the invalid alias.
+#, php-format
+msgid "Invalid alias: \"%s\""
+msgstr "Alias non valido: \"%s\""
+
 #. TRANS: Group edit form success message.
-#: actions/editgroup.php:301
 msgid "Options saved."
 msgstr "Opzioni salvate."
 
 #. TRANS: Title for e-mail settings.
-#: actions/emailsettings.php:60
 msgid "Email settings"
 msgstr "Impostazioni email"
 
 #. TRANS: E-mail settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/emailsettings.php:74
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 msgstr "Gestisci la ricezione delle email da %%site.name%%."
 
 #. TRANS: Form legend for e-mail settings form.
 #. TRANS: Field label for e-mail address input in e-mail settings form.
-#: actions/emailsettings.php:104 actions/emailsettings.php:130
 msgid "Email address"
 msgstr "Indirizzo email"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:110
 msgid "Current confirmed email address."
 msgstr "Indirizzo email attualmente confermato."
 
@@ -2518,15 +2010,11 @@ msgstr "Indirizzo email attualmente confermato."
 #. TRANS: Button label to remove a confirmed IM address.
 #. TRANS: Button label to remove a confirmed SMS address.
 #. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
-#: actions/emailsettings.php:113 actions/emailsettings.php:180
-#: actions/imsettings.php:119 actions/smssettings.php:119
-#: actions/smssettings.php:175
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Rimuovi"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:120
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -2540,46 +2028,38 @@ msgstr ""
 #. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
 #. TRANS: Any other domain may be owned by a legitimate person or
 #. TRANS: organization.
-#: actions/emailsettings.php:137
 msgid "Email address, like \"UserName@example.org\""
 msgstr "Indirizzo email, del tipo \"nomeutente@example.org\""
 
 #. TRANS: Button label for adding an e-mail address in e-mail settings form.
 #. TRANS: Button label for adding an IM address in IM settings form.
 #. TRANS: Button label for adding a SMS phone number in SMS settings form.
-#: actions/emailsettings.php:141 actions/imsettings.php:147
-#: actions/smssettings.php:157
 msgctxt "BUTTON"
 msgid "Add"
 msgstr "Aggiungi"
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:149 actions/smssettings.php:166
 msgid "Incoming email"
 msgstr "Email di ricezione"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:155
 msgid "I want to post notices by email."
 msgstr "Voglio inviare i messaggi via email"
 
 #. TRANS: Form instructions for incoming e-mail form in e-mail settings.
 #. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
-#: actions/emailsettings.php:177 actions/smssettings.php:173
 msgid "Send email to this address to post new notices."
 msgstr "Invia le email a questo indirizzo per scrivere nuovi messaggi."
 
 #. TRANS: Instructions for incoming e-mail address input form, when an address has already been assigned.
 #. TRANS: Instructions for incoming SMS e-mail address input form.
-#: actions/emailsettings.php:186 actions/smssettings.php:181
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr ""
 "Crea un nuovo indirizzo email a cui inviare i messaggi e rimuovi quello "
 "vecchio."
 
 #. TRANS: Instructions for incoming e-mail address input form.
-#: actions/emailsettings.php:190
 msgid ""
 "To send notices via email, we need to create a unique email address for you "
 "on this server:"
@@ -2587,90 +2067,72 @@ msgstr ""
 
 #. TRANS: Button label for adding an e-mail address to send notices from.
 #. TRANS: Button label for adding an SMS e-mail address to send notices from.
-#: actions/emailsettings.php:196 actions/smssettings.php:184
 msgctxt "BUTTON"
 msgid "New"
 msgstr "Nuovo"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:205
 msgid "Email preferences"
 msgstr "Preferenze dell'email"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:213
 msgid "Send me notices of new subscriptions through email."
 msgstr "Inviami avvisi di nuovi abbonamenti via email"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:219
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr ""
 "Inviami un'email quando qualcuno aggiunge un mio messaggio ai preferiti"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:226
 msgid "Send me email when someone sends me a private message."
 msgstr "Inviami un'email quando qualcuno mi invia un messaggio privato"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:232
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr "Inviami un'email quando qualcuno mi invia una \"@-risposta\""
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:238
 msgid "Allow friends to nudge me and send me an email."
 msgstr "Consenti ai miei amici di richiamarmi e inviami un'email"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:244
 msgid "Publish a MicroID for my email address."
 msgstr "Pubblica un MicroID per il mio indirizzo email"
 
 #. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:362
 msgid "Email preferences saved."
 msgstr "Preferenze dell'email salvate."
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:381
 msgid "No email address."
 msgstr "Nessun indirizzo email."
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:389
 #, fuzzy
 msgid "Cannot normalize that email address."
 msgstr "Impossibile normalizzare quell'indirizzo email"
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:394 actions/register.php:197
-#: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "Non è un indirizzo email valido."
 
 #. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:398
 msgid "That is already your email address."
 msgstr "Quello è già il tuo indirizzo email."
 
 #. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:402
 msgid "That email address already belongs to another user."
 msgstr "Quell'indirizzo email appartiene già a un altro utente."
 
 #. TRANS: Server error thrown on database error adding e-mail confirmation code.
 #. TRANS: Server error thrown on database error adding Instant Messaging confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:419 actions/imsettings.php:362
-#: actions/smssettings.php:364
 #, fuzzy
 msgid "Could not insert confirmation code."
 msgstr "Impossibile inserire il codice di conferma."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:426
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
@@ -2682,104 +2144,84 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling Instant Messaging address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:446 actions/imsettings.php:391
-#: actions/smssettings.php:398
 msgid "No pending confirmation to cancel."
 msgstr "Nessuna conferma da annullare."
 
 #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:451
 msgid "That is the wrong email address."
 msgstr "Quello è l'indirizzo email sbagliato."
 
 #. TRANS: Server error thrown on database error canceling e-mail address confirmation.
 #. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
-#: actions/emailsettings.php:460 actions/smssettings.php:412
 #, fuzzy
 msgid "Could not delete email confirmation."
 msgstr "Impossibile eliminare l'email di conferma."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:465
 msgid "Email confirmation cancelled."
 msgstr "Conferma dell'email annullata."
 
 #. TRANS: Message given trying to remove an e-mail address that is not
 #. TRANS: registered for the active user.
-#: actions/emailsettings.php:484
 msgid "That is not your email address."
 msgstr "Quello non è il tuo indirizzo email."
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:505
 msgid "The email address was removed."
 msgstr "L'indirizzo email è stato rimosso."
 
 #. TRANS: Form validation error displayed when trying to remove an incoming e-mail address while no address has been set.
-#: actions/emailsettings.php:519 actions/smssettings.php:554
 msgid "No incoming email address."
 msgstr "Nessun indirizzo email di ricezione."
 
 #. 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.
-#: actions/emailsettings.php:531 actions/emailsettings.php:555
-#: actions/smssettings.php:565 actions/smssettings.php:590
 #, fuzzy
 msgid "Could not update user record."
 msgstr "Impossibile aggiornare il record dell'utente."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
 #. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:535 actions/smssettings.php:569
 msgid "Incoming email address removed."
 msgstr "Indirizzo email di ricezione rimosso."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
 #. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:559 actions/smssettings.php:594
 msgid "New incoming email address added."
 msgstr "Nuovo indirizzo email di ricezione aggiunto."
 
 #. TRANS: Client error displayed when trying to mark a notice as favorite that already is a favorite.
-#: actions/favor.php:80
 msgid "This notice is already a favorite!"
 msgstr "Questo messaggio è già un preferito!"
 
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
-#: actions/favor.php:95
 #, fuzzy
 msgid "Disfavor favorite."
 msgstr "Rimuovi preferito"
 
 #. TRANS: Page title for first page of favorited notices.
 #. TRANS: Title for favourited notices section.
-#: actions/favorited.php:65 lib/popularnoticesection.php:62
-#: lib/publicgroupnav.php:93
 msgid "Popular notices"
 msgstr "Messaggi famosi"
 
 #. TRANS: Page title for all but first page of favorited notices.
 #. TRANS: %d is the page number being displayed.
-#: actions/favorited.php:69
 #, php-format
 msgid "Popular notices, page %d"
 msgstr "Messaggi famosi, pagina %d"
 
 #. TRANS: Description on page displaying favorited notices.
-#: actions/favorited.php:81
 msgid "The most popular notices on the site right now."
 msgstr "Ecco i messaggi più famosi all'interno del sito."
 
 #. TRANS: Text displayed instead of a list when a site does not yet have any favourited notices.
-#: actions/favorited.php:149
 msgid "Favorite notices appear on this page but no one has favorited one yet."
 msgstr ""
 "I messaggi preferiti vengono visualizzati in questa pagina, ma non ne è "
 "stato ancora impostato alcuno."
 
 #. TRANS: Additional text displayed instead of a list when a site does not yet have any favourited notices for logged in users.
-#: actions/favorited.php:153
 msgid ""
 "Be the first to add a notice to your favorites by clicking the fave button "
 "next to any notice you like."
@@ -2789,7 +2231,6 @@ msgstr ""
 
 #. TRANS: Additional text displayed instead of a list when a site does not yet have any favourited notices for not logged in users.
 #. TRANS: %%action.register%% is a registration link. "[link text](link)" is Mark Down. Do not change the formatting.
-#: actions/favorited.php:158
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to add a "
@@ -2802,181 +2243,146 @@ msgstr ""
 #. TRANS: %s is a user's nickname.
 #. TRANS: Title for first page of favourite notices of a user.
 #. TRANS: %s is the user for whom the favourite notices are displayed.
-#: actions/favoritesrss.php:111 actions/showfavorites.php:76
-#: lib/personalgroupnav.php:110
 #, php-format
 msgid "%s's favorite notices"
 msgstr "Messaggi preferiti di %s"
 
 #. TRANS: Desciption of RSS feed with favourite notices of a user.
 #. TRANS: %1$s is a user's nickname, %2$s is the name of the StatusNet site.
-#: actions/favoritesrss.php:117
 #, php-format
 msgid "Updates favored by %1$s on %2$s!"
 msgstr "Messaggi preferiti da %1$s su %2$s!"
 
 #. TRANS: Page title for first page of featured users.
 #. TRANS: Title for featured users section.
-#: actions/featured.php:69 lib/featureduserssection.php:87
-#: lib/publicgroupnav.php:89
 msgid "Featured users"
 msgstr "Utenti in evidenza"
 
 #. TRANS: Page title for all but first page of featured users.
 #. TRANS: %d is the page number being displayed.
-#: actions/featured.php:73
 #, php-format
 msgid "Featured users, page %d"
 msgstr "Utenti in evidenza, pagina %d"
 
 #. TRANS: Description on page displaying featured users.
-#: actions/featured.php:102
 #, fuzzy, php-format
 msgid "A selection of some great users on %s."
 msgstr "Una selezione di alcuni dei migliori utenti su %s"
 
 #. TRANS: Client error displayed when no notice ID was given trying do display a file.
-#: actions/file.php:36
 msgid "No notice ID."
 msgstr "Nessun ID di messaggio."
 
 #. TRANS: Client error displayed when an invalid notice ID was given trying do display a file.
-#: actions/file.php:41
 msgid "No notice."
 msgstr "Nessun messaggio."
 
 #. TRANS: Client error displayed when trying do display a file for a notice without a file attachement.
-#: actions/file.php:46
 msgid "No attachments."
 msgstr "Nessun allegato."
 
 #. TRANS: Client error displayed when trying do display a file for a notice with file attachements
 #. TRANS: that could not be found.
-#: actions/file.php:58
 msgid "No uploaded attachments."
 msgstr "Nessun allegato caricato."
 
 #. TRANS: Client error displayed when subscribing to a remote profile and an unexpected response is received.
-#: actions/finishremotesubscribe.php:69
 msgid "Not expecting this response!"
 msgstr "Risposta non attesa!"
 
 #. TRANS: Client error displayed when subscribing to a remote profile that does not exist.
-#: actions/finishremotesubscribe.php:81
 msgid "User being listened to does not exist."
 msgstr "L'utente che intendi seguire non esiste."
 
 #. TRANS: Client error displayed when subscribing to a remote profile that is a local profile.
-#: actions/finishremotesubscribe.php:89 actions/remotesubscribe.php:58
 msgid "You can use the local subscription!"
 msgstr "Puoi usare l'abbonamento locale!"
 
 #. TRANS: Client error displayed when subscribing to a remote profile that is blocked form subscribing to.
-#: actions/finishremotesubscribe.php:102
 msgid "That user has blocked you from subscribing."
 msgstr "Quell'utente ti ha bloccato dall'abbonarti."
 
 #. TRANS: Client error displayed when subscribing to a remote profile without providing an authorised token.
-#: actions/finishremotesubscribe.php:114
 msgid "You are not authorized."
 msgstr "Autorizzazione non presente."
 
 #. TRANS: Client error displayed when subscribing to a remote profile and conversion of the request token to access token fails.
-#: actions/finishremotesubscribe.php:118
 msgid "Could not convert request token to access token."
 msgstr "Impossibile convertire il token di richiesta in uno di accesso."
 
 #. TRANS: Client error displayed when subscribing to a remote profile fails because of an unsupported version of the OMB protocol.
-#: actions/finishremotesubscribe.php:124
 msgid "Remote service uses unknown version of OMB protocol."
 msgstr "Il servizio remoto usa una versione del protocollo OMB sconosciuta."
 
 #. TRANS: Server error displayed when subscribing to a remote profile fails because the remote profile could not be updated.
-#: actions/finishremotesubscribe.php:145 lib/oauthstore.php:317
 msgid "Error updating remote profile."
 msgstr "Errore nell'aggiornare il profilo remoto."
 
 #. TRANS: Client error displayed when requesting a non-existent file.
-#: actions/getfile.php:77
 msgid "No such file."
 msgstr "Nessun file."
 
 #. TRANS: Client error displayed when requesting a file without having read access to it.
-#: actions/getfile.php:82
 msgid "Cannot read file."
 msgstr "Impossibile leggere il file."
 
 #. TRANS: Client error displayed when trying to assign an invalid role to a user.
-#: actions/grantrole.php:61 actions/revokerole.php:62
 msgid "Invalid role."
 msgstr "Ruolo non valido."
 
 #. TRANS: Client error displayed when trying to assign an reserved role to a user.
-#: actions/grantrole.php:66 actions/revokerole.php:66
 msgid "This role is reserved and cannot be set."
 msgstr "Questo ruolo è riservato e non può essere impostato."
 
 #. TRANS: Client error displayed when trying to assign a role to a user while not being allowed to set roles.
-#: actions/grantrole.php:76
 msgid "You cannot grant user roles on this site."
 msgstr "Non puoi concedere i ruoli agli utenti su questo sito."
 
 #. TRANS: Client error displayed when trying to assign a role to a user that already has that role.
-#: actions/grantrole.php:84
 msgid "User already has this role."
 msgstr "L'utente ricopre già questo ruolo."
 
 #. TRANS: Client error displayed trying to block a user from a group while not specifying a to be blocked user profile.
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing a profile.
+#. TRANS: Client error displayed when not providing a profile ID on the Make Admin page.
 #. TRANS: Client error displayed trying a change a subscription without providing a profile.
 #. TRANS: Client error displayed when trying to change user options without specifying a user to work on.
-#: actions/groupblock.php:71 actions/groupunblock.php:71
-#: actions/makeadmin.php:71 actions/subedit.php:49
-#: lib/profileformaction.php:79
 msgid "No profile specified."
 msgstr "Nessun profilo specificato."
 
 #. TRANS: Client error displayed trying to block a user from a group while specifying a non-existing profile.
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing an existing profile.
+#. TRANS: Client error displayed when specifying an invalid profile ID on the Make Admin page.
 #. TRANS: Client error displayed trying a change a subscription for a non-existant profile ID.
 #. TRANS: Client error displayed when trying to change user options without specifying an existing user to work on.
-#: actions/groupblock.php:77 actions/groupunblock.php:77
-#: actions/makeadmin.php:76 actions/subedit.php:57 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:87
 msgid "No profile with that ID."
 msgstr "Nessun profilo con quel ID."
 
 #. TRANS: Client error displayed trying to block a user from a group while not specifying a group to block a profile from.
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing a group.
-#: actions/groupblock.php:83 actions/groupunblock.php:83
-#: actions/makeadmin.php:81
+#. TRANS: Client error displayed when not providing a group ID on the Make Admin page.
 msgid "No group specified."
 msgstr "Nessun gruppo specificato."
 
 #. TRANS: Client error displayed trying to block a user from a group while not being an admin user.
-#: actions/groupblock.php:95
 msgid "Only an admin can block group members."
 msgstr "Solo un amministratore può bloccare i membri del gruppo."
 
 #. TRANS: Client error displayed trying to block a user from a group while user is already blocked from the given group.
-#: actions/groupblock.php:100
 msgid "User is already blocked from group."
 msgstr "L'utente è già bloccato dal gruppo."
 
 #. TRANS: Client error displayed trying to block a user from a group while user is not a member of given group.
-#: actions/groupblock.php:106
 msgid "User is not a member of group."
 msgstr "L'utente non fa parte del gruppo."
 
 #. TRANS: Title for block user from group page.
 #. TRANS: Form legend for form to block user from a group.
-#: actions/groupblock.php:141 actions/groupmembers.php:364
 msgid "Block user from group"
 msgstr "Blocca l'utente dal gruppo"
 
 #. TRANS: Explanatory text for block user from group form before setting the block.
 #. TRANS: %1$s is that to be blocked user, %2$s is the group the user will be blocked from.
-#: actions/groupblock.php:169
 #, php-format
 msgid ""
 "Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They "
@@ -2988,40 +2394,33 @@ msgstr ""
 "gruppo."
 
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
-#: actions/groupblock.php:191
 #, fuzzy
 msgid "Do not block this user from this group."
 msgstr "Non bloccare l'utente da questo gruppo"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
-#: actions/groupblock.php:198
 #, fuzzy
 msgid "Block this user from this group."
 msgstr "Blocca l'utente da questo gruppo"
 
 #. TRANS: Server error displayed when trying to block a user from a group fails because of an application error.
-#: actions/groupblock.php:215
 msgid "Database error blocking user from group."
 msgstr "Errore del database nel bloccare l'utente dal gruppo."
 
 #. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
 #. TRANS: Client error displayed trying to find a user by ID without providing an ID.
-#: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr "Nessun ID."
 
 #. TRANS: Client error displayed trying to change group design settings while not logged in.
-#: actions/groupdesignsettings.php:67
 msgid "You must be logged in to edit a group."
 msgstr "Devi eseguire l'accesso per modificare un gruppo."
 
 #. TRANS: Title group design settings page.
-#: actions/groupdesignsettings.php:146
 msgid "Group design"
 msgstr "Aspetto del gruppo"
 
 #. TRANS: Instructions for group design settings page.
-#: actions/groupdesignsettings.php:157
 msgid ""
 "Customize the way your group looks with a background image and a colour "
 "palette of your choice."
@@ -3030,25 +2429,21 @@ msgstr ""
 "personalizzati."
 
 #. TRANS: Form validation error displayed when group design settings could not be updated because of an application issue.
-#: actions/groupdesignsettings.php:262
 #, fuzzy
 msgid "Unable to update your design settings."
 msgstr "Impossibile salvare la impostazioni dell'aspetto."
 
 #. TRANS: Form text to confirm saved group design settings.
-#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:239
 msgid "Design preferences saved."
 msgstr "Preferenze dell'aspetto salvate."
 
 #. TRANS: Title for group logo settings page.
 #. TRANS: Group logo form legend.
-#: actions/grouplogo.php:144 actions/grouplogo.php:199
 msgid "Group logo"
 msgstr "Logo del gruppo"
 
 #. TRANS: Instructions for group logo page.
 #. TRANS: %s is the maximum file size for that site.
-#: actions/grouplogo.php:156
 #, php-format
 msgid ""
 "You can upload a logo image for your group. The maximum file size is %s."
@@ -3057,91 +2452,75 @@ msgstr ""
 "del file è di %s."
 
 #. TRANS: Submit button for uploading a group logo.
-#: actions/grouplogo.php:243
 msgid "Upload"
 msgstr "Carica"
 
 #. TRANS: Button text for cropping an uploaded group logo.
-#: actions/grouplogo.php:299
 msgid "Crop"
 msgstr "Ritaglia"
 
 #. TRANS: Form instructions on the group logo page.
-#: actions/grouplogo.php:376
 msgid "Pick a square area of the image to be the logo."
 msgstr "Scegli un'area quadrata dell'immagine per il logo."
 
 #. TRANS: Form success message after updating a group logo.
-#: actions/grouplogo.php:411
 msgid "Logo updated."
 msgstr "Logo aggiornato."
 
 #. TRANS: Form failure message after failing to update a group logo.
-#: actions/grouplogo.php:414
 msgid "Failed updating logo."
 msgstr "Aggiornamento del logo non riuscito."
 
 #. TRANS: Title of the page showing group members.
 #. TRANS: %s is the name of the group.
-#: actions/groupmembers.php:104
 #, php-format
 msgid "%s group members"
 msgstr "Membri del gruppo %s"
 
 #. TRANS: Title of the page showing group members.
 #. TRANS: %1$s is the name of the group, %2$d is the page number of the members list.
-#: actions/groupmembers.php:109
 #, php-format
 msgid "%1$s group members, page %2$d"
 msgstr "Membri del gruppo %1$s, pagina %2$d"
 
 #. TRANS: Page notice for group members page.
-#: actions/groupmembers.php:125
 msgid "A list of the users in this group."
 msgstr "Un elenco degli utenti in questo gruppo."
 
 #. TRANS: Indicator in group members list that this user is a group administrator.
-#: actions/groupmembers.php:190 lib/action.php:581
 msgid "Admin"
 msgstr "Amministra"
 
 #. TRANS: Button text for the form that will block a user from a group.
-#: actions/groupmembers.php:397
 msgctxt "BUTTON"
 msgid "Block"
 msgstr "Blocca"
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:401
 msgctxt "TOOLTIP"
 msgid "Block this user"
 msgstr "Blocca questo utente"
 
 #. TRANS: Form legend for form to make a user a group admin.
-#: actions/groupmembers.php:488
 msgid "Make user an admin of the group"
 msgstr "Rende l'utente amministratore del gruppo"
 
 #. TRANS: Button text for the form that will make a user administrator.
-#: actions/groupmembers.php:521
 msgctxt "BUTTON"
 msgid "Make Admin"
 msgstr "Rendi amministratore"
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:525
 msgctxt "TOOLTIP"
 msgid "Make this user an admin"
 msgstr "Fa diventare questo utente un amministratore"
 
 #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
-#: actions/grouprss.php:141
 #, php-format
 msgid "Updates from members of %1$s on %2$s!"
 msgstr "Messaggi dai membri di %1$s su %2$s!"
 
 #. TRANS: Title for first page of the groups list.
-#: actions/groups.php:62
 #, fuzzy
 msgctxt "TITLE"
 msgid "Groups"
@@ -3149,7 +2528,6 @@ msgstr "Gruppi"
 
 #. TRANS: Title for all but the first page of the groups list.
 #. TRANS: %d is the page number.
-#: actions/groups.php:66
 #, fuzzy, php-format
 msgctxt "TITLE"
 msgid "Groups, page %d"
@@ -3158,7 +2536,6 @@ msgstr "Gruppi, pagina %d"
 #. TRANS: Page notice of group list. %%%%site.name%%%% is the StatusNet site name,
 #. TRANS: %%%%action.groupsearch%%%% and %%%%action.newgroup%%%% are URLs. Do not change them.
 #. TRANS: This message contains Markdown links in the form [link text](link).
-#: actions/groups.php:95
 #, fuzzy, php-format
 msgid ""
 "%%%%site.name%%%% groups let you find and talk with people of similar "
@@ -3174,12 +2551,10 @@ msgstr ""
 "action.groupsearch%%%%) o [crea il tuo!](%%%%action.newgroup%%%%)"
 
 #. TRANS: Link to create a new group on the group list page.
-#: actions/groups.php:113 actions/usergroups.php:126 lib/groupeditform.php:115
 msgid "Create a new group"
 msgstr "Crea un nuovo gruppo"
 
 #. TRANS: Instructions for page where groups can be searched. %%site.name%% is the name of the StatusNet site.
-#: actions/groupsearch.php:53
 #, php-format
 msgid ""
 "Search for groups on %%site.name%% by their name, location, or description. "
@@ -3189,21 +2564,17 @@ msgstr ""
 "Separa i termini di ricerca con degli spazi; lunghezza minima 3 caratteri."
 
 #. TRANS: Title for page where groups can be searched.
-#: actions/groupsearch.php:60
 msgid "Group search"
 msgstr "Cerca gruppi"
 
 #. TRANS: Text on page where groups can be searched if no results were found for a query.
 #. TRANS: Text for notice search results is the query had no results.
 #. TRANS: Message on the "People search" page where a query has no results.
-#: actions/groupsearch.php:82 actions/noticesearch.php:122
-#: actions/peoplesearch.php:87
 msgid "No results."
 msgstr "Nessun risultato."
 
 #. TRANS: Additional text on page where groups can be searched if no results were found for a query for a logged in user.
 #. TRANS: This message contains Markdown links in the form [link text](link).
-#: actions/groupsearch.php:87
 #, fuzzy, php-format
 msgid ""
 "If you cannot find the group you're looking for, you can [create it](%%"
@@ -3214,7 +2585,6 @@ msgstr ""
 
 #. TRANS: Additional text on page where groups can be searched if no results were found for a query for a not logged in user.
 #. TRANS: This message contains Markdown links in the form [link text](link).
-#: actions/groupsearch.php:92
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and [create the group](%%"
@@ -3224,30 +2594,25 @@ msgstr ""
 "action.newgroup%%)!"
 
 #. TRANS: Client error displayed when trying to unblock a user from a group without being an administrator for the group.
-#: actions/groupunblock.php:95
 msgid "Only an admin can unblock group members."
 msgstr "Solo gli amministratori possono sbloccare i membri del gruppo."
 
 #. TRANS: Client error displayed when trying to unblock a non-blocked user from a group.
-#: actions/groupunblock.php:100
 msgid "User is not blocked from group."
 msgstr "L'utente non è bloccato dal gruppo."
 
 #. TRANS: Server error displayed when unblocking a user from a group fails because of an unknown error.
 #. TRANS: Server error displayed when removing a user block.
-#: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "Errore nel rimuovere il blocco."
 
 #. TRANS: Title for Instant Messaging settings.
-#: actions/imsettings.php:56
 msgid "IM settings"
 msgstr "Impostazioni messaggistica istantanea"
 
 #. 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.
-#: actions/imsettings.php:69
 #, fuzzy, php-format
 msgid ""
 "You can send and receive notices through instant messaging [instant messages]"
@@ -3258,18 +2623,15 @@ msgstr ""
 "impostazioni qui di seguito."
 
 #. TRANS: Message given in the IM settings if IM is not enabled on the site.
-#: actions/imsettings.php:90
 msgid "IM is not available."
 msgstr "Messaggistica istantanea non disponibile."
 
-#: actions/imsettings.php:116
 #, fuzzy, php-format
 msgid "Current confirmed %s address."
 msgstr "Indirizzo email attualmente confermato."
 
 #. TRANS: Form note in IM settings form.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:128
 #, fuzzy, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your %s account for a message "
@@ -3279,88 +2641,73 @@ msgstr ""
 "GTalk per un messaggio con ulteriori istruzioni. Hai aggiunto %s al tuo "
 "elenco contatti?"
 
-#: actions/imsettings.php:140
 msgid "IM address"
 msgstr "Indirizzo di messaggistica istantanea"
 
-#: actions/imsettings.php:142
 #, php-format
 msgid "%s screenname."
 msgstr ""
 
 #. TRANS: Header for IM preferences form.
-#: actions/imsettings.php:163
 #, fuzzy
 msgid "IM Preferences"
 msgstr "Preferenze messaggistica"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:174
 #, fuzzy
 msgid "Send me notices"
 msgstr "Invia un messaggio"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:176
 #, fuzzy
 msgid "Post a notice when my status changes."
 msgstr "Pubblica un messaggio quando il mio stato Jabber/GTalk cambia"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:178
 #, fuzzy
 msgid "Send me replies from people I'm not subscribed to."
 msgstr "Inviami le risposte delle persone a cui sono abbonato via Jabber/GTalk"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:181
 #, fuzzy
 msgid "Publish a MicroID"
 msgstr "Pubblica un MicroID per il mio indirizzo email"
 
 #. TRANS: Server error thrown on database error updating IM preferences.
-#: actions/imsettings.php:291
 #, fuzzy
 msgid "Couldn't update IM preferences."
 msgstr "Impossibile aggiornare l'utente."
 
 #. TRANS: Confirmation message for successful IM preferences save.
 #. TRANS: Confirmation message after saving preferences.
-#: actions/imsettings.php:298 actions/urlsettings.php:244
 msgid "Preferences saved."
 msgstr "Preferenze salvate."
 
 #. TRANS: Message given saving IM address without having provided one.
-#: actions/imsettings.php:320
 #, fuzzy
 msgid "No screenname."
 msgstr "Nessun soprannome."
 
-#: actions/imsettings.php:325
 #, fuzzy
 msgid "No transport."
 msgstr "Nessun messaggio."
 
 #. TRANS: Message given saving IM address that cannot be normalised.
-#: actions/imsettings.php:333
 #, fuzzy
 msgid "Cannot normalize that screenname"
 msgstr "Impossibile normalizzare quell'ID Jabber"
 
 #. TRANS: Message given saving IM address that not valid.
-#: actions/imsettings.php:340
 #, fuzzy
 msgid "Not a valid screenname"
 msgstr "Non è un soprannome valido."
 
 #. TRANS: Message given saving IM address that is already set for another user.
-#: actions/imsettings.php:344
 #, fuzzy
 msgid "Screenname already belongs to another user."
 msgstr "ID Jabber già assegnato a un altro utente."
 
 #. TRANS: Message given saving valid IM address that is to be confirmed.
-#: actions/imsettings.php:369
 #, fuzzy
 msgid "A confirmation code was sent to the IM address you added."
 msgstr ""
@@ -3368,87 +2715,73 @@ msgstr ""
 "istantanea che hai aggiunto. Devi approvare %s affinché ti invii messaggi."
 
 #. TRANS: Message given canceling IM address confirmation for the wrong IM address.
-#: actions/imsettings.php:396
 msgid "That is the wrong IM address."
 msgstr "Quello è l'indirizzo di messaggistica sbagliato."
 
 #. TRANS: Server error thrown on database error canceling IM address confirmation.
-#: actions/imsettings.php:405
 #, fuzzy
 msgid "Couldn't delete confirmation."
 msgstr "Impossibile eliminare la conferma della messaggistica."
 
 #. TRANS: Message given after successfully canceling IM address confirmation.
-#: actions/imsettings.php:410
 msgid "IM confirmation cancelled."
 msgstr "Conferma della messaggistica annullata."
 
 #. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.
-#: actions/imsettings.php:434
 #, fuzzy
 msgid "That is not your screenname."
 msgstr "Quello non è il tuo numero di telefono."
 
 #. TRANS: Server error thrown on database error removing a registered IM address.
-#: actions/imsettings.php:443
 #, fuzzy
 msgid "Couldn't update user im prefs."
 msgstr "Impossibile aggiornare il record dell'utente."
 
 #. TRANS: Message given after successfully removing a registered Instant Messaging address.
-#: actions/imsettings.php:451
 msgid "The IM address was removed."
 msgstr "L'indirizzo di messaggistica è stato rimosso."
 
 #. TRANS: Title for all but the first page of the inbox page.
 #. TRANS: %1$s is the user's nickname, %2$s is the page number.
-#: actions/inbox.php:59
 #, php-format
 msgid "Inbox for %1$s - page %2$d"
 msgstr "Casella posta in arrivo di %1$s - pagina %2$d"
 
 #. TRANS: Title for the first page of the inbox page.
 #. TRANS: %s is the user's nickname.
-#: actions/inbox.php:64
 #, php-format
 msgid "Inbox for %s"
 msgstr "Casella posta in arrivo di %s"
 
 #. TRANS: Instructions for user inbox page.
-#: actions/inbox.php:106
 msgid "This is your inbox, which lists your incoming private messages."
 msgstr ""
 "Questa è la casella della tua posta in arrivo, contiene i messaggi privati "
 "ricevuti."
 
 #. TRANS: Client error displayed when trying to sent invites while they have been disabled.
-#: actions/invite.php:41
 msgid "Invites have been disabled."
 msgstr "Gli inviti sono stati disabilitati."
 
 #. TRANS: Client error displayed when trying to sent invites while not logged in.
 #. TRANS: %s is the StatusNet site name.
-#: actions/invite.php:45
 #, php-format
 msgid "You must be logged in to invite other users to use %s."
 msgstr "Devi eseguire l'accesso per invitare altri utenti a usare %s."
 
 #. TRANS: Form validation message when providing an e-mail address that does not validate.
 #. TRANS: %s is an invalid e-mail address.
-#: actions/invite.php:78
 #, fuzzy, php-format
 msgid "Invalid email address: %s."
 msgstr "Indirizzo email non valido: %s"
 
 #. TRANS: Page title when invitations have been sent.
-#: actions/invite.php:117
 #, fuzzy
 msgid "Invitations sent"
 msgstr "Inviti inviati"
 
 #. TRANS: Page title when inviting potential users.
-#: actions/invite.php:120
 msgid "Invite new users"
 msgstr "Invita nuovi utenti"
 
@@ -3456,7 +2789,6 @@ msgstr "Invita nuovi utenti"
 #. TRANS: is already subscribed to one or more users with the given e-mail address(es).
 #. TRANS: Plural form is based on the number of reported already subscribed e-mail addresses.
 #. TRANS: Followed by a bullet list.
-#: actions/invite.php:140
 #, fuzzy
 msgid "You are already subscribed to this user:"
 msgid_plural "You are already subscribed to these users:"
@@ -3465,7 +2797,6 @@ msgstr[1] "Hai già un abbonamento a questi utenti:"
 
 #. TRANS: Used as list item for already subscribed users (%1$s is nickname, %2$s is e-mail address).
 #. TRANS: Used as list item for already registered people (%1$s is nickname, %2$s is e-mail address).
-#: actions/invite.php:146 actions/invite.php:160
 #, fuzzy, php-format
 msgctxt "INVITE"
 msgid "%1$s (%2$s)"
@@ -3474,7 +2805,6 @@ msgstr "%1$s (%2$s)"
 #. TRANS: Message displayed inviting users to use a StatusNet site while the invited user
 #. TRANS: already uses a this StatusNet site. Plural form is based on the number of
 #. TRANS: reported already present people. Followed by a bullet list.
-#: actions/invite.php:154
 #, fuzzy
 msgid "This person is already a user and you were automatically subscribed:"
 msgid_plural ""
@@ -3487,7 +2817,6 @@ msgstr[1] ""
 #. TRANS: Message displayed inviting users to use a StatusNet site. Plural form is
 #. TRANS: based on the number of invitations sent. Followed by a bullet list of
 #. TRANS: e-mail addresses to which invitations were sent.
-#: actions/invite.php:168
 #, fuzzy
 msgid "Invitation sent to the following person:"
 msgid_plural "Invitations sent to the following people:"
@@ -3496,7 +2825,6 @@ msgstr[1] "Inviti inviati alle seguenti persone:"
 
 #. TRANS: Generic message displayed after sending out one or more invitations to
 #. TRANS: people to join a StatusNet site.
-#: actions/invite.php:178
 msgid ""
 "You will be notified when your invitees accept the invitation and register "
 "on the site. Thanks for growing the community!"
@@ -3505,7 +2833,6 @@ msgstr ""
 "registreranno sul sito. Grazie per l'aiuto ad accrescere la comunità!"
 
 #. TRANS: Form instructions.
-#: actions/invite.php:191
 msgid ""
 "Use this form to invite your friends and colleagues to use this service."
 msgstr ""
@@ -3513,28 +2840,24 @@ msgstr ""
 "servizio."
 
 #. TRANS: Field label for a list of e-mail addresses.
-#: actions/invite.php:218
 msgid "Email addresses"
 msgstr "Indirizzi email"
 
 #. TRANS: Tooltip for field label for a list of e-mail addresses.
-#: actions/invite.php:221
 #, fuzzy
 msgid "Addresses of friends to invite (one per line)."
 msgstr "Indirizzi email di amici da invitare (uno per riga)"
 
 #. TRANS: Field label for a personal message to send to invitees.
-#: actions/invite.php:225
 msgid "Personal message"
 msgstr "Messaggio personale"
 
 #. TRANS: Tooltip for field label for a personal message to send to invitees.
-#: actions/invite.php:228
 msgid "Optionally add a personal message to the invitation."
 msgstr "Puoi aggiungere un messaggio personale agli inviti."
 
 #. TRANS: Send button for inviting friends
-#: actions/invite.php:232
+#. TRANS: Button text for sending notice.
 msgctxt "BUTTON"
 msgid "Send"
 msgstr "Invia"
@@ -3542,7 +2865,6 @@ msgstr "Invia"
 #. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral
 #. TRANS: singular 3rd-person pronoun in English. %1$s is the inviting user, $2$s is
 #. TRANS: the StatusNet sitename.
-#: actions/invite.php:264
 #, php-format
 msgid "%1$s has invited you to join them on %2$s"
 msgstr "Hai ricevuto un invito per seguire %1$s su %2$s"
@@ -3552,7 +2874,6 @@ msgstr "Hai ricevuto un invito per seguire %1$s su %2$s"
 #. TRANS: StatusNet sitename, %3$s is the site URL, %4$s is the personal message from the
 #. TRANS: inviting user, %s%5 a link to the timeline for the inviting user, %s$6 is a link
 #. TRANS: to register with the StatusNet site.
-#: actions/invite.php:271
 #, php-format
 msgid ""
 "%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -3610,50 +2931,44 @@ msgstr ""
 "Cordiali saluti, %2$s\n"
 
 #. TRANS: Client error displayed when trying to join a group while not logged in.
-#: actions/joingroup.php:59
 msgid "You must be logged in to join a group."
 msgstr "Devi eseguire l'accesso per iscriverti a un gruppo."
 
 #. TRANS: Title for join group page after joining.
-#: actions/joingroup.php:148
 #, fuzzy, php-format
 msgctxt "TITLE"
 msgid "%1$s joined group %2$s"
 msgstr "%1$s fa ora parte del gruppo %2$s"
 
 #. TRANS: Client error displayed when trying to leave a group while not logged in.
-#: actions/leavegroup.php:59
 msgid "You must be logged in to leave a group."
 msgstr "Devi eseguire l'accesso per lasciare un gruppo."
 
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
-#: actions/leavegroup.php:103 lib/command.php:398
 msgid "You are not a member of that group."
 msgstr "Non fai parte di quel gruppo."
 
 #. TRANS: Title for leave group page after leaving.
-#: actions/leavegroup.php:142
 #, fuzzy, php-format
 msgctxt "TITLE"
 msgid "%1$s left group %2$s"
 msgstr "%1$s ha lasciato il gruppo %2$s"
 
 #. TRANS: User admin panel title
-#: actions/licenseadminpanel.php:55
 msgctxt "TITLE"
 msgid "License"
 msgstr "Licenza"
 
-#: actions/licenseadminpanel.php:65
+#. TRANS: Form instructions for the site license admin panel.
 msgid "License for this StatusNet site"
 msgstr "La licenza per questo sito StatusNet"
 
-#: actions/licenseadminpanel.php:134
+#. TRANS: Client error displayed selecting an invalid license in the license admin panel.
 msgid "Invalid license selection."
 msgstr "Selezione della licenza non valida."
 
-#: actions/licenseadminpanel.php:144
+#. TRANS: Client error displayed when not specifying an owner for the all rights reserved license in the license admin panel.
 msgid ""
 "You must specify the owner of the content when using the All Rights Reserved "
 "license."
@@ -3661,133 +2976,134 @@ msgstr ""
 "È necessario specificare il proprietario dei contenuti quando viene usata la "
 "licenza \"Tutti i diritti riservati\"."
 
-#: actions/licenseadminpanel.php:151
+#. TRANS: Client error displayed selecting a too long license title in the license admin panel.
 #, fuzzy
 msgid "Invalid license title. Maximum length is 255 characters."
 msgstr "Titolo della licenza non valido. Lunghezza massima 255 caratteri."
 
-#: actions/licenseadminpanel.php:163
+#. TRANS: Client error displayed specifying an invalid license URL in the license admin panel.
 msgid "Invalid license URL."
 msgstr "Indirizzo della licenza non valido."
 
-#: actions/licenseadminpanel.php:166
+#. TRANS: Client error displayed specifying an invalid license image URL in the license admin panel.
 msgid "Invalid license image URL."
 msgstr "Indirizzo immagine della licenza non valido."
 
-#: actions/licenseadminpanel.php:174
+#. TRANS: Client error displayed specifying an invalid license URL in the license admin panel.
 msgid "License URL must be blank or a valid URL."
 msgstr "L'indirizzo della licenza deve essere vuoto o un URL valido."
 
-#: actions/licenseadminpanel.php:182
+#. TRANS: Client error displayed specifying an invalid license image URL in the license admin panel.
 msgid "License image must be blank or valid URL."
 msgstr "L'immagine della licenza deve essere vuota o un URL valido."
 
-#: actions/licenseadminpanel.php:232
+#. TRANS: Form legend in the license admin panel.
 msgid "License selection"
 msgstr "Selezione licenza"
 
-#: actions/licenseadminpanel.php:238
+#. TRANS: License option in the license admin panel.
 msgid "Private"
 msgstr "Privato"
 
-#: actions/licenseadminpanel.php:239
+#. TRANS: License option in the license admin panel.
 msgid "All Rights Reserved"
 msgstr "Tutti i diritti riservati"
 
-#: actions/licenseadminpanel.php:240
+#. TRANS: License option in the license admin panel.
 msgid "Creative Commons"
 msgstr "Creative Commons"
 
-#: actions/licenseadminpanel.php:245
+#. TRANS: Dropdown field label in the license admin panel.
 msgid "Type"
 msgstr "Tipo"
 
-#: actions/licenseadminpanel.php:247
-msgid "Select license"
+#. TRANS: Dropdown field instructions in the license admin panel.
+#, fuzzy
+msgid "Select a license."
 msgstr "Seleziona licenza"
 
-#: actions/licenseadminpanel.php:261
+#. TRANS: Form legend in the license admin panel.
 msgid "License details"
 msgstr "Dettagli licenza"
 
-#: actions/licenseadminpanel.php:267
+#. TRANS: Field label in the license admin panel.
 msgid "Owner"
 msgstr "Proprietario"
 
-#: actions/licenseadminpanel.php:268
+#. TRANS: Field title in the license admin panel.
 msgid "Name of the owner of the site's content (if applicable)."
 msgstr "Nome del proprietario dei contenuti del sito (se applicabile)."
 
-#: actions/licenseadminpanel.php:276
+#. TRANS: Field label in the license admin panel.
 msgid "License Title"
 msgstr "Titolo licenza"
 
-#: actions/licenseadminpanel.php:277
+#. TRANS: Field title in the license admin panel.
 msgid "The title of the license."
 msgstr "Il titolo della licenza."
 
-#: actions/licenseadminpanel.php:285
+#. TRANS: Field label in the license admin panel.
 msgid "License URL"
 msgstr "Indirizzo licenza"
 
-#: actions/licenseadminpanel.php:286
+#. TRANS: Field title in the license admin panel.
 msgid "URL for more information about the license."
 msgstr "Indirizzo per informazioni aggiuntive riguardo la licenza."
 
-#: actions/licenseadminpanel.php:293
+#. TRANS: Field label in the license admin panel.
 msgid "License Image URL"
 msgstr "Indirizzo immagine licenza"
 
-#: actions/licenseadminpanel.php:294
+#. TRANS: Field title in the license admin panel.
 msgid "URL for an image to display with the license."
 msgstr "Indirizzo di un'immagine da visualizzare con la licenza."
 
-#. TRANS: Submit button title.
-#: actions/licenseadminpanel.php:311 actions/sessionsadminpanel.php:199
-#: actions/siteadminpanel.php:292 actions/snapshotadminpanel.php:245
-#: actions/tagother.php:133 lib/applicationeditform.php:357
-msgid "Save"
-msgstr "Salva"
-
-#: actions/licenseadminpanel.php:311
-msgid "Save license settings"
+#. TRANS: Button title in the license admin panel.
+#, fuzzy
+msgid "Save license settings."
 msgstr "Salva impostazioni licenza"
 
+#. TRANS: Client error displayed when trying to log in while already logged in.
 #. TRANS: Client error displayed trying to use "one time password login" when already logged in.
-#: actions/login.php:97 actions/otp.php:62 actions/register.php:130
 msgid "Already logged in."
 msgstr "Accesso già effettuato."
 
-#: actions/login.php:125
+#. TRANS: Form validation error displayed when trying to log in with incorrect credentials.
 msgid "Incorrect username or password."
 msgstr "Nome utente o password non corretto."
 
+#. TRANS: Server error displayed when during login a server error occurs.
 #. TRANS: Server error displayed when a user object could not be created trying to login using "one time password login".
-#: actions/login.php:131 actions/otp.php:127
 msgid "Error setting user. You are probably not authorized."
 msgstr "Errore nell'impostare l'utente. Forse non hai l'autorizzazione."
 
-#: actions/login.php:185 actions/login.php:236 lib/action.php:598
+#. TRANS: Page title for login page.
 msgid "Login"
 msgstr "Accedi"
 
-#: actions/login.php:222
+#. TRANS: Form legend on login page.
 msgid "Login to site"
 msgstr "Accedi al sito"
 
-#: actions/login.php:231 actions/register.php:469
+#. TRANS: Checkbox label label on login page.
 msgid "Remember me"
 msgstr "Ricordami"
 
-#: actions/login.php:232 actions/register.php:471
+#. TRANS: Checkbox title on login page.
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "Accedi automaticamente in futuro; non per computer condivisi!"
 
-#: actions/login.php:241
+#. TRANS: Button text for log in on login page.
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Login"
+msgstr "Accedi"
+
+#. TRANS: Link text for link to "reset password" on login page.
 msgid "Lost or forgotten password?"
 msgstr "Password persa o dimenticata?"
 
-#: actions/login.php:259
+#. TRANS: Form instructions on login page before being able to change user settings.
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -3795,141 +3111,136 @@ msgstr ""
 "Per motivi di sicurezza, è necessario che tu inserisca il tuo nome utente e "
 "la tua password prima di modificare le impostazioni."
 
-#: actions/login.php:263
+#. TRANS: Form instructions on login page.
 msgid "Login with your username and password."
 msgstr "Accedi con nome utente e password."
 
-#: actions/login.php:266
+#. TRANS: Form instructions on login page. This message contains Markdown links in the form [Link text](Link).
+#. TRANS: %%action.register%% is a link to the registration page.
 #, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
 msgstr ""
 "Non hai ancora un nome utente? [Crea](%%action.register%%) un nuovo account."
 
-#: actions/makeadmin.php:92
+#. TRANS: Client error displayed when trying to make another user admin on the Make Admin page while not an admin.
 msgid "Only an admin can make another user an admin."
 msgstr ""
 "Solo gli amministratori possono rendere un altro utente amministratori."
 
-#: actions/makeadmin.php:96
+#. TRANS: Client error displayed when trying to make another user admin on the Make Admin page who already is admin.
+#. TRANS: %1$s is the user that is already admin, %2$s is the group user is already admin for.
 #, php-format
 msgid "%1$s is already an admin for group \"%2$s\"."
 msgstr "%1$s è già amministratore del gruppo \"%2$s\"."
 
-#: actions/makeadmin.php:133
+#. TRANS: Server error displayed when trying to make another user admin on the Make Admin page fails
+#. TRANS: because the group membership record could not be gotten.
+#. TRANS: %1$s is the to be admin user, %2$s is the group user should be admin for.
 #, php-format
 msgid "Can't get membership record for %1$s in group %2$s."
 msgstr "Impossibile recuperare la membership per %1$s nel gruppo %2$s"
 
-#: actions/makeadmin.php:146
+#. TRANS: Server error displayed when trying to make another user admin on the Make Admin page fails
+#. TRANS: because the group adminship record coud not be saved properly.
+#. TRANS: %1$s is the to be admin user, %2$s is the group user is already admin for.
 #, php-format
 msgid "Can't make %1$s an admin for group %2$s."
 msgstr "Impossibile rendere %1$s un amministratore del gruppo %2$s"
 
-#: actions/microsummary.php:69
+#. TRANS: Client error displayed trying to make a micro summary without providing a status.
 msgid "No current status."
 msgstr "Nessun messaggio corrente."
 
 #. TRANS: This is the title of the form for adding a new application.
-#: actions/newapplication.php:52
 #, fuzzy
 msgid "New application"
 msgstr "Nuova applicazione"
 
 #. TRANS: Client error displayed trying to add a new application while not logged in.
-#: actions/newapplication.php:64
 msgid "You must be logged in to register an application."
 msgstr "Devi eseguire l'accesso per registrare un'applicazione."
 
 #. TRANS: Form instructions for registering a new application.
-#: actions/newapplication.php:147
 msgid "Use this form to register a new application."
 msgstr "Usa questo modulo per registrare un'applicazione."
 
 #. TRANS: Validation error shown when not providing a source URL in the "New application" form.
-#: actions/newapplication.php:189
 msgid "Source URL is required."
 msgstr "L'URL sorgente è richiesto."
 
 #. TRANS: Server error displayed when an application could not be registered in the database through the "New application" form.
-#: actions/newapplication.php:279 actions/newapplication.php:289
 msgid "Could not create application."
 msgstr "Impossibile creare l'applicazione."
 
 #. TRANS: Title for form to create a group.
-#: actions/newgroup.php:53
 msgid "New group"
 msgstr "Nuovo gruppo"
 
 #. TRANS: Client exception thrown when a user tries to create a group while banned.
-#: actions/newgroup.php:73 classes/User_group.php:485
 #, fuzzy
 msgid "You are not allowed to create groups on this site."
 msgstr "Non fai parte di questo gruppo."
 
 #. TRANS: Form instructions for group create form.
-#: actions/newgroup.php:117
 msgid "Use this form to create a new group."
 msgstr "Usa questo modulo per creare un nuovo gruppo."
 
-#. TRANS: Group create form validation error.
-#: actions/newgroup.php:200
-#, fuzzy
-msgid "Alias cannot be the same as nickname."
-msgstr "L'alias non può essere lo stesso del soprannome."
-
-#: actions/newmessage.php:71 actions/newmessage.php:234
+#. TRANS: Page title for new direct message page.
+#. TRANS: Page title on page for sending a direct message.
 msgid "New message"
 msgstr "Nuovo messaggio"
 
-#. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
-#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:513
-msgid "You can't send a message to this user."
+#. TRANS: Client error displayed trying to send a direct message to a user while sender and
+#. TRANS: receiver are not subscribed to each other.
+#, fuzzy
+msgid "You cannot send a message to this user."
 msgstr "Non puoi inviare un messaggio a questo utente."
 
+#. TRANS: Form validator error displayed trying to send a direct message without content.
+#. TRANS: Client error displayed trying to send a notice without content.
 #. TRANS: Command exception text shown when trying to send a direct message to another user without content.
 #. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
-#: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:490
-#: lib/command.php:593
 msgid "No content!"
 msgstr "Nessun contenuto!"
 
-#: actions/newmessage.php:161
+#. TRANS: Form validation error displayed trying to send a direct message without specifying a recipient.
 msgid "No recipient specified."
 msgstr "Nessun destinatario specificato."
 
+#. TRANS: Client error displayed trying to send a direct message to self.
 #. TRANS: Error text shown when trying to send a direct message to self.
-#: actions/newmessage.php:167 lib/command.php:517
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr "Non inviarti un messaggio, piuttosto ripetilo a voce dolcemente."
 
-#: actions/newmessage.php:184
+#. TRANS: Page title after sending a direct message.
 msgid "Message sent"
 msgstr "Messaggio inviato"
 
+#. TRANS: Confirmation text after sending a direct message.
+#. TRANS: %s is the direct message recipient.
 #. TRANS: Message given have sent a direct message to another user.
 #. TRANS: %s is the name of the other user.
-#: actions/newmessage.php:188 lib/command.php:525
 #, php-format
 msgid "Direct message to %s sent."
 msgstr "Messaggio diretto a %s inviato."
 
-#: actions/newmessage.php:213 actions/newnotice.php:264
+#. TRANS: Page title after an AJAX error occurred on the "send direct message" page.
+#. TRANS: Page title after an AJAX error occurs on the send notice page.
 msgid "Ajax Error"
 msgstr "Errore di Ajax"
 
-#: actions/newnotice.php:69
+#. TRANS: Page title for sending a new notice.
 msgid "New notice"
 msgstr "Nuovo messaggio"
 
-#: actions/newnotice.php:230
+#. TRANS: Page title after sending a notice.
 msgid "Notice posted"
 msgstr "Messaggio inviato"
 
 #. TRANS: Instructions for Notice search page.
 #. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/noticesearch.php:69
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -3939,20 +3250,17 @@ msgstr ""
 "di ricerca con degli spazi; lunghezza minima 3 caratteri."
 
 #. TRANS: Title of the page where users can search for notices.
-#: actions/noticesearch.php:80
 msgid "Text search"
 msgstr "Cerca testo"
 
 #. TRANS: Test in RSS notice search.
 #. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearch.php:95
 #, php-format
 msgid "Search results for \"%1$s\" on %2$s"
 msgstr "Risultati della ricerca per \"%1$s\" su %2$s"
 
 #. TRANS: Text for logged in users making a query for notices without results.
 #. TRANS: This message contains a Markdown link.
-#: actions/noticesearch.php:128
 #, php-format
 msgid ""
 "Be the first to [post on this topic](%%%%action.newnotice%%%%?"
@@ -3963,7 +3271,6 @@ msgstr ""
 
 #. TRANS: Text for not logged in users making a query for notices without results.
 #. TRANS: This message contains Markdown links.
-#: actions/noticesearch.php:133
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and be the first to "
@@ -3973,19 +3280,17 @@ msgstr ""
 "(%%%%action.newnotice%%%%?status_textarea=%s) su questo argomento!"
 
 #. TRANS: RSS notice search feed title. %s is the query.
-#: actions/noticesearchrss.php:95
 #, php-format
 msgid "Updates with \"%s\""
 msgstr "Messaggi con \"%s\""
 
 #. TRANS: RSS notice search feed description.
 #. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearchrss.php:99
 #, fuzzy, php-format
 msgid "Updates matching search term \"%1$s\" on %2$s."
 msgstr "Messaggi che corrispondono al termine \"%1$s\" su %2$s!"
 
-#: actions/nudge.php:85
+#. TRANS: Client error displayed trying to nudge a user that cannot be nudged.
 #, fuzzy
 msgid ""
 "This user doesn't allow nudges or hasn't confirmed or set their email "
@@ -3994,61 +3299,52 @@ msgstr ""
 "Questo utente non consente i richiami oppure non ha confermato o impostato "
 "ancora il suo indirizzo email."
 
-#: actions/nudge.php:94
+#. TRANS: Page title after sending a nudge.
 msgid "Nudge sent"
 msgstr "Richiamo inviato"
 
-#: actions/nudge.php:97
+#. TRANS: Confirmation text after sending a nudge.
 msgid "Nudge sent!"
 msgstr "Richiamo inviato!"
 
 #. TRANS: Message displayed to an anonymous user trying to view OAuth application list.
-#: actions/oauthappssettings.php:57
 msgid "You must be logged in to list your applications."
 msgstr "Devi eseguire l'accesso per poter elencare le tue applicazioni."
 
 #. TRANS: Page title for OAuth applications
-#: actions/oauthappssettings.php:73
 msgid "OAuth applications"
 msgstr "Applicazioni OAuth"
 
 #. TRANS: Page instructions for OAuth applications
-#: actions/oauthappssettings.php:85
 msgid "Applications you have registered"
 msgstr "Applicazioni che hai registrato"
 
 #. TRANS: Empty list message on page with OAuth applications.
-#: actions/oauthappssettings.php:138
 #, php-format
 msgid "You have not registered any applications yet."
 msgstr "Non hai ancora registrato alcuna applicazione."
 
 #. TRANS: Title for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:69
 msgid "Connected applications"
 msgstr "Applicazioni collegate"
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:80
 #, fuzzy
 msgid "The following connections exist for your account."
 msgstr "Hai consentito alle seguenti applicazioni di accedere al tuo account."
 
 #. TRANS: Client error when trying to revoke access for an application while not being a user of it.
-#: actions/oauthconnectionssettings.php:165
 msgid "You are not a user of that application."
 msgstr "Non sei un utente di quella applicazione."
 
 #. TRANS: Client error when revoking access has failed for some reason.
 #. TRANS: %s is the application ID revoking access failed for.
-#: actions/oauthconnectionssettings.php:180
 #, fuzzy, php-format
 msgid "Unable to revoke access for application: %s."
 msgstr "Impossibile revocare l'accesso per l'applicazione: %s."
 
 #. TRANS: Success message after revoking access for an application.
 #. TRANS: %1$s is the application name, %2$s is the first part of the user token.
-#: actions/oauthconnectionssettings.php:199
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -4056,475 +3352,392 @@ msgid ""
 msgstr ""
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:210
 msgid "You have not authorized any applications to use your account."
 msgstr "Non hai autorizzato alcuna applicazione all'uso del tuo account."
 
 #. TRANS: Note for developers in the OAuth connection settings form.
 #. TRANS: This message contains a Markdown link. Do not separate "](".
 #. TRANS: %s is the URL to the OAuth settings.
-#: actions/oauthconnectionssettings.php:230
 #, php-format
 msgid ""
 "Are you a developer? [Register an OAuth client application](%s) to use with "
 "this instance of StatusNet."
 msgstr ""
 
-#: actions/oembed.php:64
+#. TRANS: Server error displayed in oEmbed action when path not found.
+#. TRANS: %s is a path.
 #, fuzzy, php-format
 msgid "\"%s\" not found."
 msgstr "Metodo delle API non trovato."
 
-#: actions/oembed.php:76
+#. TRANS: Server error displayed in oEmbed action when notice not found.
+#. TRANS: %s is a notice.
 #, fuzzy, php-format
 msgid "Notice %s not found."
 msgstr "Metodo delle API non trovato."
 
-#: actions/oembed.php:80 actions/shownotice.php:100
+#. TRANS: Server error displayed in oEmbed action when notice has not profile.
 msgid "Notice has no profile."
 msgstr "Il messaggio non ha un profilo."
 
-#: actions/oembed.php:83 actions/shownotice.php:172
+#. TRANS: oEmbed title. %1$s is the author name, %2$s is the creation date.
 #, php-format
 msgid "%1$s's status on %2$s"
 msgstr "Stato di %1$s su %2$s"
 
-#: actions/oembed.php:95
+#. TRANS: Server error displayed in oEmbed action when attachment not found.
+#. TRANS: %d is an attachment ID.
 #, fuzzy, php-format
 msgid "Attachment %s not found."
 msgstr "Destinatario non trovato."
 
-#: actions/oembed.php:136
+#. TRANS: Server error displayed in oEmbed request when a path is not supported.
+#. TRANS: %s is a path.
 #, php-format
 msgid "\"%s\" not supported for oembed requests."
 msgstr ""
 
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
-#: actions/oembed.php:168
 #, php-format
 msgid "Content type %s not supported."
 msgstr "Tipo di contenuto %s non supportato."
 
 #. TRANS: Error message displaying attachments. %s is the site's base URL.
-#: actions/oembed.php:172
 #, php-format
 msgid "Only %s URLs over plain HTTP please."
 msgstr "Solo URL %s attraverso HTTP semplice."
 
+#. TRANS: Server error displayed in oEmbed action when request specifies an unsupported data format.
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1207
-#: lib/apiaction.php:1234 lib/apiaction.php:1369
 msgid "Not a supported data format."
 msgstr "Non è un formato di dati supportato."
 
 #. TRANS: ShortName in the OpenSearch interface when trying to find users.
-#: actions/opensearch.php:64
 msgid "People Search"
 msgstr "Cerca persone"
 
-#: actions/opensearch.php:68
+#. TRANS: ShortName in the OpenSearch interface when trying to find notices.
 msgid "Notice Search"
 msgstr "Cerca messaggi"
 
 #. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
-#: actions/otp.php:70
 msgid "No user ID specified."
 msgstr "Nessun ID utente specificato."
 
 #. TRANS: Client error displayed trying to use "one time password login" without specifying a login token.
-#: actions/otp.php:86
 msgid "No login token specified."
 msgstr "Nessun token di accesso specificato."
 
 #. TRANS: Client error displayed trying to use "one time password login" without requesting a login token.
-#: actions/otp.php:94
 msgid "No login token requested."
 msgstr "Nessun token di accesso richiesto."
 
 #. TRANS: Client error displayed trying to use "one time password login" while specifying an invalid login token.
-#: actions/otp.php:100
 msgid "Invalid login token specified."
 msgstr "Token di accesso specificato non valido."
 
 #. TRANS: Client error displayed trying to use "one time password login" while specifying an expired login token.
-#: actions/otp.php:110
 msgid "Login token expired."
 msgstr "Token di accesso scaduto."
 
 #. TRANS: Title for outbox for any but the fist page.
 #. TRANS: %1$s is the user nickname, %2$d is the page number.
-#: actions/outbox.php:57
 #, php-format
 msgid "Outbox for %1$s - page %2$d"
 msgstr "Casella posta inviata di %s - pagina %2$d"
 
 #. TRANS: Title for first page of outbox.
-#: actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
 msgstr "Casella posta inviata di %s"
 
 #. TRANS: Instructions for outbox.
-#: actions/outbox.php:103
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr ""
 "Questa è la casella della tua posta inviata, contiene i messaggi privati che "
 "hai inviato."
 
-#: actions/passwordsettings.php:58
 msgid "Change password"
 msgstr "Modifica password"
 
-#: actions/passwordsettings.php:69
 msgid "Change your password."
 msgstr "Modifica la tua password."
 
 #. TRANS: Fieldset legend for password reset form.
-#: actions/passwordsettings.php:96 actions/recoverpassword.php:251
 msgid "Password change"
 msgstr "Modifica password"
 
-#: actions/passwordsettings.php:104
 msgid "Old password"
 msgstr "Vecchia password"
 
 #. TRANS: Field label for password reset form.
-#: actions/passwordsettings.php:108 actions/recoverpassword.php:256
 msgid "New password"
 msgstr "Nuova password"
 
-#: actions/passwordsettings.php:109 actions/register.php:416
 #, fuzzy
 msgid "6 or more characters."
 msgstr "6 o più caratteri"
 
 #. TRANS: Ttile for field label for password reset form where the password has to be typed again.
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:264
-#: actions/register.php:420
 #, fuzzy
 msgid "Same as password above."
 msgstr "Stessa password di sopra"
 
-#: actions/passwordsettings.php:117
 msgid "Change"
 msgstr "Modifica"
 
-#: actions/passwordsettings.php:153 actions/register.php:223
 msgid "Password must be 6 or more characters."
 msgstr "La password deve essere di 6 o più caratteri."
 
-#: actions/passwordsettings.php:156 actions/register.php:226
 msgid "Passwords don't match."
 msgstr "Le password non corrispondono."
 
-#: actions/passwordsettings.php:164
 msgid "Incorrect old password"
 msgstr "Vecchia password non corretta"
 
-#: actions/passwordsettings.php:180
 msgid "Error saving user; invalid."
 msgstr "Errore nel salvare l'utente; non valido."
 
 #. TRANS: Reset password form validation error message.
-#: actions/passwordsettings.php:185 actions/recoverpassword.php:418
 #, fuzzy
 msgid "Cannot save new password."
 msgstr "Impossibile salvare la nuova password."
 
-#: actions/passwordsettings.php:191
 msgid "Password saved."
 msgstr "Password salvata."
 
 #. TRANS: Title for Paths admin panel.
 #. TRANS: Menu item for site administration
-#: actions/pathsadminpanel.php:58 lib/adminpanelaction.php:371
 msgid "Paths"
 msgstr "Percorsi"
 
 #. TRANS: Form instructions for Path admin panel.
-#: actions/pathsadminpanel.php:69
 msgid "Path and server settings for this StatusNet site"
 msgstr "Percorso e impostazioni del server per questo sito StatusNet"
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the directory that could not be read from.
-#: actions/pathsadminpanel.php:155
 #, php-format
 msgid "Theme directory not readable: %s."
 msgstr "Directory del tema non leggibile: %s."
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the avatar directory that could not be written to.
-#: actions/pathsadminpanel.php:163
 #, php-format
 msgid "Avatar directory not writable: %s."
 msgstr "Directory delle immagini degli utenti non scrivibile: %s."
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the background directory that could not be written to.
-#: actions/pathsadminpanel.php:171
 #, php-format
 msgid "Background directory not writable: %s."
 msgstr "Directory degli sfondi non scrivibile: %s."
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the locales directory that could not be read from.
-#: actions/pathsadminpanel.php:181
 #, php-format
 msgid "Locales directory not readable: %s."
 msgstr "Directory delle localizzazioni non leggibile: %s."
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the SSL server URL that is too long.
-#: actions/pathsadminpanel.php:189
 msgid "Invalid SSL server. The maximum length is 255 characters."
 msgstr "Server SSL non valido. La lunghezza massima è di 255 caratteri."
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:235 actions/siteadminpanel.php:58
 msgid "Site"
 msgstr "Sito"
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:241 actions/pathsadminpanel.php:279
-#: actions/pathsadminpanel.php:370 actions/pathsadminpanel.php:425
 msgid "Server"
 msgstr "Server"
 
-#: actions/pathsadminpanel.php:242
 msgid "Site's server hostname."
 msgstr "Nome host del server"
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:248 actions/pathsadminpanel.php:288
-#: actions/pathsadminpanel.php:379 actions/pathsadminpanel.php:434
 msgid "Path"
 msgstr "Percorso"
 
-#: actions/pathsadminpanel.php:249
 #, fuzzy
 msgid "Site path."
 msgstr "Percorso del sito"
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:255
 #, fuzzy
 msgid "Locale directory"
 msgstr "Directory del tema"
 
-#: actions/pathsadminpanel.php:256
 #, fuzzy
 msgid "Directory path to locales."
 msgstr "Percorso della directory alle localizzazioni"
 
 #. TRANS: Checkbox label in Paths admin panel.
-#: actions/pathsadminpanel.php:263
 msgid "Fancy URLs"
 msgstr "URL semplici"
 
-#: actions/pathsadminpanel.php:265
 msgid "Use fancy (more readable and memorable) URLs?"
 msgstr "Usare gli URL semplici (più leggibili e facili da ricordare)?"
 
-#: actions/pathsadminpanel.php:272
 msgid "Theme"
 msgstr "Tema"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:281
 #, fuzzy
 msgid "Server for themes."
 msgstr "Tema per questo sito."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:290
 msgid "Web path to themes."
 msgstr ""
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:297 actions/pathsadminpanel.php:388
-#: actions/pathsadminpanel.php:443 actions/pathsadminpanel.php:495
 msgid "SSL server"
 msgstr "Server SSL"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:299
 msgid "SSL server for themes (default: SSL server)."
 msgstr ""
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:306 actions/pathsadminpanel.php:397
-#: actions/pathsadminpanel.php:452
 #, fuzzy
 msgid "SSL path"
 msgstr "Percorso del sito"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:308
 msgid "SSL path to themes (default: /theme/)."
 msgstr ""
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:315 actions/pathsadminpanel.php:406
-#: actions/pathsadminpanel.php:461
 #, fuzzy
 msgid "Directory"
 msgstr "Directory del tema"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:317
 #, fuzzy
 msgid "Directory where themes are located."
 msgstr "Percorso della directory alle localizzazioni"
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:326
 msgid "Avatars"
 msgstr "Immagini"
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:333
 msgid "Avatar server"
 msgstr "Server dell'immagine"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:335
 #, fuzzy
 msgid "Server for avatars."
 msgstr "Tema per questo sito."
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:342
 msgid "Avatar path"
 msgstr "Percorso dell'immagine"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:344
 #, fuzzy
 msgid "Web path to avatars."
 msgstr "Aggiornamento dell'immagine non riuscito."
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:351
 msgid "Avatar directory"
 msgstr "Directory dell'immagine"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:353
 #, fuzzy
 msgid "Directory where avatars are located."
 msgstr "Percorso della directory alle localizzazioni"
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:364
 msgid "Backgrounds"
 msgstr "Sfondi"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:372
 #, fuzzy
 msgid "Server for backgrounds."
 msgstr "Tema per questo sito."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:381
 msgid "Web path to backgrounds."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:390
 msgid "Server for backgrounds on SSL pages."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:399
 msgid "Web path to backgrounds on SSL pages."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:408
 #, fuzzy
 msgid "Directory where backgrounds are located."
 msgstr "Percorso della directory alle localizzazioni"
 
 #. TRANS: Fieldset legens in Paths admin panel.
-#: actions/pathsadminpanel.php:419
 msgid "Attachments"
 msgstr "Allegati"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:427
 #, fuzzy
 msgid "Server for attachments."
 msgstr "Tema per questo sito."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:436
 #, fuzzy
 msgid "Web path to attachments."
 msgstr "Nessun allegato."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:445
 #, fuzzy
 msgid "Server for attachments on SSL pages."
 msgstr "Tema per questo sito."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:454
 msgid "Web path to attachments on SSL pages."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:463
 #, fuzzy
 msgid "Directory where attachments are located."
 msgstr "Percorso della directory alle localizzazioni"
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:472
 msgid "SSL"
 msgstr "SSL"
 
 #. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
-#: actions/pathsadminpanel.php:477 actions/snapshotadminpanel.php:202
 msgid "Never"
 msgstr "Mai"
 
 #. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
-#: actions/pathsadminpanel.php:479
 msgid "Sometimes"
 msgstr "Qualche volta"
 
 #. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
-#: actions/pathsadminpanel.php:481
 msgid "Always"
 msgstr "Sempre"
 
-#: actions/pathsadminpanel.php:485
 msgid "Use SSL"
 msgstr "Usa SSL"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:487
 #, fuzzy
 msgid "When to use SSL."
 msgstr "Quando usare SSL"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:497
 #, fuzzy
 msgid "Server to direct SSL requests to."
 msgstr "Server a cui dirigere le richieste SSL"
 
 #. TRANS: Button title text to store form data in the Paths admin panel.
-#: actions/pathsadminpanel.php:514
 msgid "Save paths"
 msgstr "Salva percorsi"
 
 #. TRANS: Instructions for the "People search" page.
 #. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/peoplesearch.php:54
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
@@ -4534,57 +3747,46 @@ msgstr ""
 "Separa i termini di ricerca con degli spazi; lunghezza minima 3 caratteri."
 
 #. TRANS: Title of a page where users can search for other users.
-#: actions/peoplesearch.php:61
 msgid "People search"
 msgstr "Cerca persone"
 
-#: actions/peopletag.php:68
 #, php-format
 msgid "Not a valid people tag: %s."
 msgstr "Non è un'etichetta valida di persona: %s."
 
-#: actions/peopletag.php:142
 #, php-format
 msgid "Users self-tagged with %1$s - page %2$d"
 msgstr "Utenti auto-etichettati con %1$s - pagina %2$d"
 
 #. TRANS: Page title for AJAX form return when a disabling a plugin.
-#: actions/plugindisable.php:69
 msgctxt "plugin"
 msgid "Disabled"
 msgstr ""
 
 #. TRANS: Client error displayed trying to perform any request method other than POST.
 #. TRANS: Do not translate POST.
-#: actions/pluginenable.php:78 actions/subscribe.php:77
 msgid "This action only accepts POST requests."
 msgstr "Quest'azione accetta solo richieste POST."
 
-#: actions/pluginenable.php:102
 #, fuzzy
 msgid "You cannot administer plugins."
 msgstr "Non puoi eliminare utenti."
 
-#: actions/pluginenable.php:109
 #, fuzzy
 msgid "No such plugin."
 msgstr "Pagina inesistente."
 
 #. TRANS: Page title for AJAX form return when enabling a plugin.
-#: actions/pluginenable.php:159
 msgctxt "plugin"
 msgid "Enabled"
 msgstr ""
 
 #. TRANS: Tab and title for plugins admin panel.
 #. TRANS: Menu item for site administration
-#: actions/pluginsadminpanel.php:56 actions/version.php:191
-#: lib/adminpanelaction.php:411
 msgid "Plugins"
 msgstr "Plugin"
 
 #. TRANS: Instructions at top of plugin admin page.
-#: actions/pluginsadminpanel.php:68
 msgid ""
 "Additional plugins can be enabled and configured manually. See the <a href="
 "\"http://status.net/wiki/Plugins\">online plugin documentation</a> for more "
@@ -4592,21 +3794,17 @@ msgid ""
 msgstr ""
 
 #. TRANS: Admin form section header
-#: actions/pluginsadminpanel.php:84
 #, fuzzy
 msgid "Default plugins"
 msgstr "Lingua predefinita"
 
-#: actions/pluginsadminpanel.php:106
 msgid ""
 "All default plugins have been disabled from the site's configuration file."
 msgstr ""
 
-#: actions/postnotice.php:95
 msgid "Invalid notice content."
 msgstr "Contenuto del messaggio non valido."
 
-#: actions/postnotice.php:101
 #, php-format
 msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’."
 msgstr ""
@@ -4614,12 +3812,10 @@ msgstr ""
 "\"%2$s\"."
 
 #. TRANS: Page title for profile settings.
-#: actions/profilesettings.php:60
 msgid "Profile settings"
 msgstr "Impostazioni del profilo"
 
 #. TRANS: Usage instructions for profile settings.
-#: actions/profilesettings.php:71
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
@@ -4627,32 +3823,25 @@ msgstr ""
 "altri potranno conoscere qualcosa in più su di te."
 
 #. TRANS: Profile settings form legend.
-#: actions/profilesettings.php:99
 msgid "Profile information"
 msgstr "Informazioni sul profilo"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:110 actions/register.php:412
 #, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr ""
 "1-64 lettere minuscole o numeri, senza spazi o simboli di punteggiatura"
 
 #. TRANS: Field label in form for profile settings.
-#: actions/profilesettings.php:114 actions/register.php:434
-#: lib/groupeditform.php:150
 msgid "Full name"
 msgstr "Nome"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:119 actions/register.php:439
-#: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "Pagina web"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:122 actions/register.php:441
 #, fuzzy
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr "URL della tua pagina web, blog o profilo su un altro sito"
@@ -4660,7 +3849,6 @@ msgstr "URL della tua pagina web, blog o profilo su un altro sito"
 #. TRANS: Tooltip for field label in form for profile settings. Plural
 #. TRANS: is decided by the number of characters available for the
 #. TRANS: biography (%d).
-#: actions/profilesettings.php:130 actions/register.php:450
 #, fuzzy, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4668,41 +3856,31 @@ msgstr[0] "Descriviti assieme ai tuoi interessi in %d caratteri"
 msgstr[1] "Descriviti assieme ai tuoi interessi in %d caratteri"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:136 actions/register.php:455
 msgid "Describe yourself and your interests"
 msgstr "Descrivi te e i tuoi interessi"
 
 #. TRANS: Text area label in form for profile settings where users can provide.
 #. TRANS: their biography.
-#: actions/profilesettings.php:140 actions/register.php:457
 msgid "Bio"
 msgstr "Biografia"
 
 #. TRANS: Field label in form for profile settings.
-#: actions/profilesettings.php:146 actions/register.php:462
-#: lib/groupeditform.php:173
 msgid "Location"
 msgstr "Ubicazione"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:149
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Dove ti trovi, tipo \"città, regione, stato\""
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:154
 msgid "Share my current location when posting notices"
 msgstr "Condividi la mia posizione attuale quando invio messaggi"
 
 #. TRANS: Field label in form for profile settings.
-#: actions/profilesettings.php:162 actions/tagother.php:128
-#: actions/tagother.php:188 lib/subscriptionlist.php:104
-#: lib/subscriptionlist.php:106
 msgid "Tags"
 msgstr "Etichette"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:165
 #, fuzzy
 msgid ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- "
@@ -4711,28 +3889,23 @@ msgstr ""
 "Le tue etichette (lettere, numeri, -, . e _), separate da virgole o spazi"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:170
 msgid "Language"
 msgstr "Lingua"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:172
 #, fuzzy
 msgid "Preferred language."
 msgstr "Lingua preferita"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:182
 msgid "Timezone"
 msgstr "Fuso orario"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:184
 msgid "What timezone are you normally in?"
 msgstr "In che fuso orario risiedi solitamente?"
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:190
 #, fuzzy
 msgid ""
 "Automatically subscribe to whoever subscribes to me (best for non-humans)."
@@ -4743,7 +3916,6 @@ msgstr ""
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Plural form is used based on the maximum number of allowed
 #. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:259 actions/register.php:214
 #, fuzzy, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4751,85 +3923,69 @@ msgstr[0] "La biografia è troppo lunga (max %d caratteri)."
 msgstr[1] "La biografia è troppo lunga (max %d caratteri)."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:270 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr "Fuso orario non selezionato"
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:278
 #, fuzzy
 msgid "Language is too long (maximum 50 characters)."
 msgstr "La lingua è troppo lunga (max 50 caratteri)."
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:292
 #, fuzzy, php-format
 msgid "Invalid tag: \"%s\"."
 msgstr "Etichetta non valida: \"%s\""
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:348
 #, fuzzy
 msgid "Could not update user for autosubscribe."
 msgstr "Impossibile aggiornare l'utente per auto-abbonarsi."
 
 #. TRANS: Server error thrown when user profile location preference settings could not be updated.
-#: actions/profilesettings.php:406
 #, fuzzy
 msgid "Could not save location prefs."
 msgstr "Impossibile salvare le preferenze della posizione."
 
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:428 actions/tagother.php:179
 msgid "Could not save tags."
 msgstr "Impossibile salvare le etichette."
 
 #. TRANS: Confirmation shown when user profile settings are saved.
 #. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:437 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "Impostazioni salvate."
 
 #. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
 #. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:484 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "Crea un account"
 
-#: actions/public.php:83
 #, php-format
 msgid "Beyond the page limit (%s)."
 msgstr "Oltre il limite della pagina (%s)."
 
-#: actions/public.php:92
 msgid "Could not retrieve public stream."
 msgstr "Impossibile recuperare l'attività pubblica."
 
-#: actions/public.php:130
 #, php-format
 msgid "Public timeline, page %d"
 msgstr "Attività pubblica, pagina %d"
 
-#: actions/public.php:132 lib/publicgroupnav.php:79
 msgid "Public timeline"
 msgstr "Attività pubblica"
 
-#: actions/public.php:160
 msgid "Public Stream Feed (RSS 1.0)"
 msgstr "Feed dell'attività pubblica (RSS 1.0)"
 
-#: actions/public.php:164
 msgid "Public Stream Feed (RSS 2.0)"
 msgstr "Feed dell'attività pubblica (RSS 2.0)"
 
-#: actions/public.php:168
 msgid "Public Stream Feed (Atom)"
 msgstr "Feed dell'attività pubblica (Atom)"
 
-#: actions/public.php:188
 #, php-format
 msgid ""
 "This is the public timeline for %%site.name%% but no one has posted anything "
@@ -4838,18 +3994,15 @@ msgstr ""
 "Questa è l'attività pubblica di %%site.name%%, ma nessuno ha ancora scritto "
 "qualche cosa."
 
-#: actions/public.php:191
 msgid "Be the first to post!"
 msgstr "Fallo tu!"
 
-#: actions/public.php:195
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post!"
 msgstr ""
 "Perché non [crei un account](%%action.register%%) e scrivi qualche cosa!"
 
-#: actions/public.php:242
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -4862,7 +4015,6 @@ msgstr ""
 "net/). [Registrati](%%action.register%%) per condividere messaggi con i tuoi "
 "amici, i tuoi familiari e colleghi! ([Maggiori informazioni](%%doc.help%%))"
 
-#: actions/public.php:247
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -4874,19 +4026,16 @@ msgstr ""
 "net/)."
 
 #. TRANS: Public RSS feed description. %s is the StatusNet site name.
-#: actions/publicrss.php:106
 #, fuzzy, php-format
 msgid "%s updates from everyone."
 msgstr "Aggiornamenti di %s da tutti!"
 
 #. TRANS: Title for public tag cloud.
-#: actions/publictagcloud.php:57
 msgid "Public tag cloud"
 msgstr "Insieme delle etichette"
 
 #. TRANS: Instructions (more used like an explanation/header).
 #. TRANS: %s is the StatusNet sitename.
-#: actions/publictagcloud.php:65
 #, fuzzy, php-format
 msgid "These are most popular recent tags on %s"
 msgstr "Queste sono le etichette più usate e recenti su %s "
@@ -4894,14 +4043,12 @@ msgstr "Queste sono le etichette più usate e recenti su %s "
 #. TRANS: This message contains a Markdown URL. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.
-#: actions/publictagcloud.php:74
 #, php-format
 msgid "No one has posted a notice with a [hashtag](%%doc.tags%%) yet."
 msgstr "Nessuno ha ancora scritto un messaggio con un [hashtag](%%doc.tags%%)."
 
 #. 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.
-#: actions/publictagcloud.php:79
 msgid "Be the first to post one!"
 msgstr "Scrivilo tu!"
 
@@ -4910,7 +4057,6 @@ msgstr "Scrivilo tu!"
 #. TRANS: This message contains a Markdown URL. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.
-#: actions/publictagcloud.php:87
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post "
@@ -4918,42 +4064,34 @@ msgid ""
 msgstr "Perché non [crei un accout](%%action.register%%) e ne scrivi uno tu!"
 
 #. TRANS: Client error displayed trying to recover password while already logged in.
-#: actions/recoverpassword.php:37
 msgid "You are already logged in!"
 msgstr "Hai già effettuato l'accesso!"
 
 #. TRANS: Client error displayed when password recovery code is not correct.
-#: actions/recoverpassword.php:64
 msgid "No such recovery code."
 msgstr "Nessun codice di ripristino."
 
 #. TRANS: Client error displayed when no proper password recovery code was submitted.
-#: actions/recoverpassword.php:69
 msgid "Not a recovery code."
 msgstr "Non è un codice di ripristino."
 
 #. TRANS: Server error displayed trying to recover password without providing a user.
-#: actions/recoverpassword.php:77
 msgid "Recovery code for unknown user."
 msgstr "Codice di recupero per utente sconosciuto."
 
 #. TRANS: Server error displayed removing a password recovery code from the database.
-#: actions/recoverpassword.php:91
 msgid "Error with confirmation code."
 msgstr "Errore con il codice di conferma."
 
 #. TRANS: Client error displayed trying to recover password with too old a recovery code.
-#: actions/recoverpassword.php:103
 msgid "This confirmation code is too old. Please start again."
 msgstr "Questo codice di conferma è scaduto. Ricomincia da capo."
 
 #. TRANS: Server error displayed when updating a user's e-mail address in the database fails while recovering a password.
-#: actions/recoverpassword.php:118
 msgid "Could not update user with confirmed email address."
 msgstr "Impossibile aggiornare l'utente con l'indirizzo email confermato."
 
 #. TRANS: Page notice for password recovery page.
-#: actions/recoverpassword.php:160
 msgid ""
 "If you have forgotten or lost your password, you can get a new one sent to "
 "the email address you have stored in your account."
@@ -4961,101 +4099,83 @@ msgstr ""
 "Se hai dimenticato o perso la tua password, puoi fartene inviare una nuova "
 "all'indirizzo email che hai inserito nel tuo account."
 
-#: actions/recoverpassword.php:167
 msgid "You have been identified. Enter a new password below."
 msgstr "Identificazione avvenuta. Inserisci la nuova password."
 
 #. TRANS: Fieldset legend for password recovery page.
-#: actions/recoverpassword.php:198
 msgid "Password recovery"
 msgstr "Recupero password"
 
 #. TRANS: Field label on password recovery page.
-#: actions/recoverpassword.php:202
 msgid "Nickname or email address"
 msgstr "Soprannome o indirizzo email"
 
 #. TRANS: Title for field label on password recovery page.
-#: actions/recoverpassword.php:205
 msgid "Your nickname on this server, or your registered email address."
 msgstr ""
 "Il tuo soprannome su questo server o il tuo indirizzo email registrato."
 
 #. TRANS: Field label on password recovery page.
-#: actions/recoverpassword.php:212
 msgid "Recover"
 msgstr "Recupera"
 
 #. TRANS: Button text on password recovery page.
-#: actions/recoverpassword.php:214
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Recover"
 msgstr "Recupera"
 
 #. TRANS: Title for password recovery page in password reset mode.
-#: actions/recoverpassword.php:223
 msgid "Reset password"
 msgstr "Reimposta la password"
 
 #. TRANS: Title for password recovery page in password recover mode.
-#: actions/recoverpassword.php:225
 msgid "Recover password"
 msgstr "Recupera la password"
 
 #. TRANS: Title for password recovery page in email sent mode.
 #. TRANS: Subject for password recovery e-mail.
-#: actions/recoverpassword.php:227 actions/recoverpassword.php:366
 msgid "Password recovery requested"
 msgstr "Richiesta password di ripristino"
 
 #. TRANS: Title for password recovery page in password saved mode.
-#: actions/recoverpassword.php:229
 #, fuzzy
 msgid "Password saved"
 msgstr "Password salvata."
 
 #. TRANS: Title for password recovery page when an unknown action has been specified.
-#: actions/recoverpassword.php:232
 msgid "Unknown action"
 msgstr "Azione sconosciuta"
 
 #. TRANS: Title for field label for password reset form.
-#: actions/recoverpassword.php:258
 #, fuzzy
 msgid "6 or more characters, and do not forget it!"
 msgstr "6 o più caratteri, e non dimenticarla!"
 
 #. TRANS: Button text for password reset form.
 #. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: actions/recoverpassword.php:268 lib/designform.php:145
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Reset"
 msgstr "Reimposta"
 
 #. TRANS: Form instructions for password recovery form.
-#: actions/recoverpassword.php:278
 msgid "Enter a nickname or email address."
 msgstr "Inserisci un soprannome o un indirizzo email."
 
 #. TRANS: Information on password recovery form if no known username or e-mail address was specified.
-#: actions/recoverpassword.php:309
 msgid "No user with that email address or username."
 msgstr "Nessun utente con quell'email o nome utente."
 
 #. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
-#: actions/recoverpassword.php:327
 msgid "No registered email address for that user."
 msgstr "Nessun indirizzo email registrato per quell'utente."
 
 #. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
-#: actions/recoverpassword.php:342
 msgid "Error saving address confirmation."
 msgstr "Errore nel salvare la conferma dell'indirizzo."
 
 #. TRANS: User notification after an e-mail with instructions was sent from the password recovery form.
-#: actions/recoverpassword.php:370
 msgid ""
 "Instructions for recovering your password have been sent to the email "
 "address registered to your account."
@@ -5064,75 +4184,59 @@ msgstr ""
 "all'indirizzo email registrato nel tuo account."
 
 #. TRANS: Client error displayed when trying to reset as password without providing a user.
-#: actions/recoverpassword.php:391
 msgid "Unexpected password reset."
 msgstr "Ripristino della password inaspettato."
 
 #. TRANS: Reset password form validation error message.
-#: actions/recoverpassword.php:400
 #, fuzzy
 msgid "Password must be 6 characters or more."
 msgstr "La password deve essere lunga almeno 6 caratteri."
 
 #. TRANS: Reset password form validation error message.
-#: actions/recoverpassword.php:405
 msgid "Password and confirmation do not match."
 msgstr "La password e la conferma non corrispondono."
 
 #. TRANS: Server error displayed when something does wrong with the user object during password reset.
-#: actions/recoverpassword.php:426 actions/register.php:241
 msgid "Error setting user."
 msgstr "Errore nell'impostare l'utente."
 
 #. TRANS: Success message for user after password reset.
-#: actions/recoverpassword.php:434
 msgid "New password successfully saved. You are now logged in."
 msgstr "Nuova password salvata con successo. Hai effettuato l'accesso."
 
-#: actions/redirecturl.php:70
 #, fuzzy
 msgid "No id parameter"
 msgstr "Nessun argomento ID."
 
-#: actions/redirecturl.php:76
 #, fuzzy, php-format
 msgid "No such file \"%d\""
 msgstr "Nessun file."
 
-#: actions/register.php:80 actions/register.php:181 actions/register.php:392
 msgid "Sorry, only invited people can register."
 msgstr "Solo le persone invitate possono registrarsi."
 
-#: actions/register.php:87
 msgid "Sorry, invalid invitation code."
 msgstr "Codice di invito non valido."
 
-#: actions/register.php:106
 msgid "Registration successful"
 msgstr "Registrazione riuscita"
 
-#: actions/register.php:108 actions/register.php:490
 msgid "Register"
 msgstr "Registrati"
 
-#: actions/register.php:128
 msgid "Registration not allowed."
 msgstr "Registrazione non consentita."
 
-#: actions/register.php:194
 #, fuzzy
 msgid "You cannot register if you don't agree to the license."
 msgstr "Non puoi registrarti se non accetti la licenza."
 
-#: actions/register.php:203
 msgid "Email address already exists."
 msgstr "Indirizzo email già esistente."
 
-#: actions/register.php:236 actions/register.php:258
 msgid "Invalid username or password."
 msgstr "Nome utente o password non valido."
 
-#: actions/register.php:333
 #, fuzzy
 msgid ""
 "With this form you can create a new account. You can then post notices and "
@@ -5142,50 +4246,40 @@ msgstr ""
 "successivamente inviare messaggi e metterti in contatto con i tuoi amici e "
 "colleghi. "
 
-#: actions/register.php:424 actions/register.php:428
-#: actions/siteadminpanel.php:238 lib/settingsnav.php:92
 msgid "Email"
 msgstr "Email"
 
-#: actions/register.php:425 actions/register.php:429
 #, fuzzy
 msgid "Used only for updates, announcements, and password recovery."
 msgstr "Usata solo per aggiornamenti, annunci e recupero password"
 
-#: actions/register.php:436
 #, fuzzy
 msgid "Longer name, preferably your \"real\" name."
 msgstr "Nome completo, preferibilmente il tuo \"vero\" nome"
 
-#: actions/register.php:464
 #, fuzzy
 msgid "Where you are, like \"City, State (or Region), Country\"."
 msgstr "Dove ti trovi, tipo \"città, regione, stato\""
 
-#: actions/register.php:503
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
 msgstr ""
 "Comprendo che i contenuti e i dati di %1$s sono privati e confidenziali."
 
-#: actions/register.php:513
 #, php-format
 msgid "My text and files are copyright by %1$s."
 msgstr "I miei testi e i miei file sono copyright di %1$s."
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:517
 msgid "My text and files remain under my own copyright."
 msgstr "I miei testi e file restano sotto il mio diretto copyright."
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:520
 msgid "All rights reserved."
 msgstr "Tutti i diritti riservati."
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:525
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -5195,7 +4289,6 @@ msgstr ""
 "dati personali: password, indirizzo email, indirizzo messaggistica "
 "istantanea e numero di telefono."
 
-#: actions/register.php:566
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -5229,7 +4322,6 @@ msgstr ""
 "Grazie per la tua iscrizione e speriamo tu possa divertiti usando questo "
 "servizio."
 
-#: actions/register.php:590
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5237,7 +4329,6 @@ msgstr ""
 "(Dovresti ricevere, entro breve, un messaggio email con istruzioni su come "
 "confermare il tuo indirizzo email.)"
 
-#: actions/remotesubscribe.php:97
 #, php-format
 msgid ""
 "To subscribe, you can [login](%%action.login%%), or [register](%%action."
@@ -5249,119 +4340,93 @@ msgstr ""
 "microblog compatibile](%%doc.openmublog%%), inserisci l'indirizzo del tuo "
 "profilo qui di seguito."
 
-#: actions/remotesubscribe.php:111
 msgid "Remote subscribe"
 msgstr "Abbonamento remoto"
 
-#: actions/remotesubscribe.php:123
 msgid "Subscribe to a remote user"
 msgstr "Abbonati a un utente remoto"
 
-#: actions/remotesubscribe.php:128
 msgid "User nickname"
 msgstr "Soprannome dell'utente"
 
-#: actions/remotesubscribe.php:129
 #, fuzzy
 msgid "Nickname of the user you want to follow."
 msgstr "Soprannome dell'utente che vuoi seguire"
 
-#: actions/remotesubscribe.php:132
 msgid "Profile URL"
 msgstr "URL del profilo"
 
-#: actions/remotesubscribe.php:133
 #, fuzzy
 msgid "URL of your profile on another compatible microblogging service."
 msgstr "URL del tuo profilo su un altro servizio di microblog compatibile"
 
 #. TRANS: Link text for link that will subscribe to a remote profile.
-#: actions/remotesubscribe.php:136 lib/subscribeform.php:139
-#: lib/userprofile.php:402
 msgid "Subscribe"
 msgstr "Abbonati"
 
-#: actions/remotesubscribe.php:158
 #, fuzzy
 msgid "Invalid profile URL (bad format)."
 msgstr "URL del profilo non valido (formato errato)"
 
-#: actions/remotesubscribe.php:167
 msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
 msgstr ""
 "Non è un URL di profilo valido (nessun documento YADIS o XRDS definito non "
 "valido)."
 
-#: actions/remotesubscribe.php:175
 #, fuzzy
 msgid "That is a local profile! Login to subscribe."
 msgstr "Quello è un profilo locale! Accedi per abbonarti."
 
-#: actions/remotesubscribe.php:182
 #, fuzzy
 msgid "Could not get a request token."
 msgstr "Impossibile ottenere un token di richiesta."
 
-#: actions/repeat.php:56
 msgid "Only logged-in users can repeat notices."
 msgstr "Solo gli utenti collegati possono ripetere i messaggi."
 
-#: actions/repeat.php:63 actions/repeat.php:70
 msgid "No notice specified."
 msgstr "Nessun messaggio specificato."
 
-#: actions/repeat.php:75
 #, fuzzy
 msgid "You cannot repeat your own notice."
 msgstr "Non puoi ripetere i tuoi stessi messaggi."
 
-#: actions/repeat.php:89
 msgid "You already repeated that notice."
 msgstr "Hai già ripetuto quel messaggio."
 
-#: actions/repeat.php:112 lib/noticelist.php:697
 msgid "Repeated"
 msgstr "Ripetuti"
 
-#: actions/repeat.php:117
 msgid "Repeated!"
 msgstr "Ripetuti!"
 
 #. TRANS: RSS reply feed title. %s is a user nickname.
-#: actions/replies.php:126 actions/repliesrss.php:68
-#: lib/personalgroupnav.php:105
 #, php-format
 msgid "Replies to %s"
 msgstr "Risposte a %s"
 
-#: actions/replies.php:128
 #, php-format
 msgid "Replies to %1$s, page %2$d"
 msgstr "Risposte a %1$s, pagina %2$d"
 
-#: actions/replies.php:145
 #, php-format
 msgid "Replies feed for %s (RSS 1.0)"
 msgstr "Feed delle risposte di %s (RSS 1.0)"
 
-#: actions/replies.php:152
 #, php-format
 msgid "Replies feed for %s (RSS 2.0)"
 msgstr "Feed delle risposte di %s (RSS 2.0)"
 
-#: actions/replies.php:159
 #, php-format
 msgid "Replies feed for %s (Atom)"
 msgstr "Feed delle risposte di %s (Atom)"
 
-#: actions/replies.php:199
 #, php-format
 msgid ""
 "This is the timeline showing replies to %1$s but %2$s hasn't received a "
 "notice to them yet."
 msgstr "Questa è l'attività di %1$s, ma %2$s non ha ancora scritto nulla."
 
-#: actions/replies.php:204
 #, php-format
 msgid ""
 "You can engage other users in a conversation, subscribe to more people or "
@@ -5370,7 +4435,6 @@ msgstr ""
 "Puoi avviare una discussione con altri utenti, abbonarti a più persone o "
 "[entrare in qualche gruppo](%%action.groups%%)."
 
-#: actions/replies.php:206
 #, php-format
 msgid ""
 "You can try to [nudge %1$s](../%2$s) or [post something to them](%%%%action."
@@ -5381,37 +4445,31 @@ msgstr ""
 
 #. TRANS: RSS reply feed description.
 #. TRANS: %1$s is a user nickname, %2$s is the StatusNet site name.
-#: actions/repliesrss.php:74
 #, fuzzy, php-format
 msgid "Replies to %1$s on %2$s."
 msgstr "Risposte a %1$s su %2$s!"
 
 #. TRANS: Client exception displayed when trying to restore an account while not logged in.
-#: actions/restoreaccount.php:78
 #, fuzzy
 msgid "Only logged-in users can restore their account."
 msgstr "Solo gli utenti collegati possono ripetere i messaggi."
 
 #. TRANS: Client exception displayed when trying to restore an account without having restore rights.
-#: actions/restoreaccount.php:83
 #, fuzzy
 msgid "You may not restore your account."
 msgstr "Non hai ancora registrato alcuna applicazione."
 
 #. TRANS: Client exception displayed trying to restore an account while something went wrong uploading a file.
 #. TRANS: Client exception. No file; probably just a non-AJAX submission.
-#: actions/restoreaccount.php:121 actions/restoreaccount.php:146
 #, fuzzy
 msgid "No uploaded file."
 msgstr "Carica file"
 
 #. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
-#: actions/restoreaccount.php:129 lib/mediafile.php:194
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
 msgstr "Il file caricato eccede la direttiva upload_max_filesize in php.ini."
 
 #. TRANS: Client exception.
-#: actions/restoreaccount.php:135 lib/mediafile.php:200
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form."
@@ -5420,145 +4478,117 @@ msgstr ""
 "HTML."
 
 #. TRANS: Client exception.
-#: actions/restoreaccount.php:141 lib/mediafile.php:206
 msgid "The uploaded file was only partially uploaded."
 msgstr "Il file caricato è stato caricato solo parzialmente."
 
 #. TRANS: Client exception thrown when a temporary folder is not present to store a file upload.
-#: actions/restoreaccount.php:150 lib/mediafile.php:214
 msgid "Missing a temporary folder."
 msgstr "Manca una directory temporanea."
 
 #. TRANS: Client exception thrown when writing to disk is not possible during a file upload operation.
-#: actions/restoreaccount.php:154 lib/mediafile.php:218
 msgid "Failed to write file to disk."
 msgstr "Scrittura del file su disco non riuscita."
 
 #. TRANS: Client exception thrown when a file upload operation has been stopped by an extension.
-#: actions/restoreaccount.php:158 lib/mediafile.php:222
 msgid "File upload stopped by extension."
 msgstr "Caricamento del file bloccato dall'estensione."
 
 #. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
 #. TRANS: Exception thrown when uploading an image fails for an unknown reason.
 #. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
-#: actions/restoreaccount.php:164 lib/imagefile.php:106 lib/mediafile.php:228
 msgid "System error uploading file."
 msgstr "Errore di sistema nel caricare il file."
 
 #. TRANS: Client exception thrown when a feed is not an Atom feed.
-#: actions/restoreaccount.php:207
 #, fuzzy
 msgid "Not an Atom feed."
 msgstr "Tutti i membri"
 
 #. TRANS: Success message when a feed has been restored.
-#: actions/restoreaccount.php:241
 msgid ""
 "Feed has been restored. Your old posts should now appear in search and your "
 "profile page."
 msgstr ""
 
 #. TRANS: Message when a feed restore is in progress.
-#: actions/restoreaccount.php:245
 msgid "Feed will be restored. Please wait a few minutes for results."
 msgstr ""
 
 #. TRANS: Form instructions for feed restore.
-#: actions/restoreaccount.php:342
 msgid ""
 "You can upload a backed-up stream in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format."
 msgstr ""
 
 #. TRANS: Title for submit button to confirm upload of a user backup file for account restore.
-#: actions/restoreaccount.php:373
 #, fuzzy
 msgid "Upload the file"
 msgstr "Carica file"
 
-#: actions/revokerole.php:75
 msgid "You cannot revoke user roles on this site."
 msgstr "Non puoi revocare i ruoli degli utenti su questo sito."
 
-#: actions/revokerole.php:82
 msgid "User doesn't have this role."
 msgstr "L'utente non ricopre questo ruolo."
 
-#: actions/rsd.php:142 actions/version.php:159
 msgid "StatusNet"
 msgstr "StatusNet"
 
-#: actions/sandbox.php:65 actions/unsandbox.php:65
 msgid "You cannot sandbox users on this site."
 msgstr "Non puoi mettere in \"sandbox\" gli utenti su questo sito."
 
-#: actions/sandbox.php:72
 msgid "User is already sandboxed."
 msgstr "L'utente è già nella \"sandbox\"."
 
 #. TRANS: Menu item for site administration
-#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
-#: lib/adminpanelaction.php:379
 msgid "Sessions"
 msgstr "Sessioni"
 
-#: actions/sessionsadminpanel.php:65
 msgid "Session settings for this StatusNet site"
 msgstr "Impostazioni sessione per questo sito StatusNet"
 
-#: actions/sessionsadminpanel.php:175
 msgid "Handle sessions"
 msgstr "Gestione sessioni"
 
-#: actions/sessionsadminpanel.php:177
 msgid "Whether to handle sessions ourselves."
 msgstr "Indica se gestire autonomamente le sessioni"
 
-#: actions/sessionsadminpanel.php:181
 msgid "Session debugging"
 msgstr "Debug delle sessioni"
 
-#: actions/sessionsadminpanel.php:183
 msgid "Turn on debugging output for sessions."
 msgstr "Abilita il debug per le sessioni"
 
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
+#. TRANS: Submit button title.
+msgid "Save"
+msgstr "Salva"
+
 msgid "Save site settings"
 msgstr "Salva impostazioni"
 
-#: actions/showapplication.php:78
 msgid "You must be logged in to view an application."
 msgstr "Devi eseguire l'accesso per visualizzare un'applicazione."
 
-#: actions/showapplication.php:151
 msgid "Application profile"
 msgstr "Profilo applicazione"
 
-#: actions/showapplication.php:179
 #, php-format
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr "creata da %1$s - %2$s accessi predefiniti - %3$d utenti"
 
-#: actions/showapplication.php:189
 msgid "Application actions"
 msgstr "Azioni applicazione"
 
-#: actions/showapplication.php:212
 msgid "Reset key & secret"
 msgstr "Reimposta chiave e segreto"
 
 #. TRANS: Title of form for deleting a user.
-#: actions/showapplication.php:228 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:64 lib/noticelist.php:678
 msgid "Delete"
 msgstr "Elimina"
 
-#: actions/showapplication.php:237
 msgid "Application info"
 msgstr "Informazioni applicazione"
 
-#: actions/showapplication.php:255
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
@@ -5566,42 +4596,35 @@ msgstr ""
 "Nota: sono supportate firme HMAC-SHA1, ma non è supportato il metodo di "
 "firma di testo in chiaro."
 
-#: actions/showapplication.php:275
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr "Ripristinare la chiave e il segreto?"
 
 #. TRANS: Title for all but the first page of favourite notices of a user.
 #. TRANS: %1$s is the user for whom the favourite notices are displayed, %2$d is the page number.
-#: actions/showfavorites.php:80
 #, php-format
 msgid "%1$s's favorite notices, page %2$d"
 msgstr "Messaggi preferiti di %1$s, pagina %2$d"
 
 #. TRANS: Server error displayed when favourite notices could not be retrieved from the database.
-#: actions/showfavorites.php:134
 msgid "Could not retrieve favorite notices."
 msgstr "Impossibile recuperare i messaggi preferiti."
 
 #. TRANS: Feed link text. %s is a username.
-#: actions/showfavorites.php:172
 #, php-format
 msgid "Feed for favorites of %s (RSS 1.0)"
 msgstr "Feed dei preferiti di %s (RSS 1.0)"
 
 #. TRANS: Feed link text. %s is a username.
-#: actions/showfavorites.php:180
 #, php-format
 msgid "Feed for favorites of %s (RSS 2.0)"
 msgstr "Feed dei preferiti di %s (RSS 2.0)"
 
 #. TRANS: Feed link text. %s is a username.
-#: actions/showfavorites.php:188
 #, php-format
 msgid "Feed for favorites of %s (Atom)"
 msgstr "Feed dei preferiti di di %s (Atom)"
 
 #. TRANS: Text displayed instead of favourite notices for the current logged in user that has no favourites.
-#: actions/showfavorites.php:209
 msgid ""
 "You haven't chosen any favorite notices yet. Click the fave button on "
 "notices you like to bookmark them for later or shed a spotlight on them."
@@ -5611,7 +4634,6 @@ msgstr ""
 
 #. TRANS: Text displayed instead of favourite notices for a user that has no favourites while logged in.
 #. TRANS: %s is a username.
-#: actions/showfavorites.php:213
 #, php-format
 msgid ""
 "%s hasn't added any favorite notices yet. Post something interesting they "
@@ -5623,7 +4645,6 @@ msgstr ""
 #. TRANS: Text displayed instead of favourite notices for a user that has no favourites while not logged in.
 #. TRANS: %s is a username, %%%%action.register%%%% is a link to the user registration page.
 #. TRANS: (link text)[link] is a Mark Down link.
-#: actions/showfavorites.php:220
 #, php-format
 msgid ""
 "%s hasn't added any favorite notices yet. Why not [register an account](%%%%"
@@ -5634,64 +4655,53 @@ msgstr ""
 "tra i tuoi preferiti!"
 
 #. TRANS: Page notice for show favourites page.
-#: actions/showfavorites.php:251
 msgid "This is a way to share what you like."
 msgstr "Questo è un modo per condividere ciò che ti piace."
 
 #. TRANS: Page title for first group page. %s is a group name.
-#: actions/showgroup.php:75
 #, php-format
 msgid "%s group"
 msgstr "Gruppo %s"
 
 #. TRANS: Page title for any but first group page.
 #. TRANS: %1$s is a group name, $2$s is a page number.
-#: actions/showgroup.php:79
 #, php-format
 msgid "%1$s group, page %2$d"
 msgstr "Gruppi di %1$s, pagina %2$d"
 
 #. TRANS: Label for group description or group note (dt). Text hidden by default.
-#: actions/showgroup.php:266
 msgid "Note"
 msgstr "Nota"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:277 lib/groupeditform.php:180
 msgid "Aliases"
 msgstr "Alias"
 
 #. TRANS: Group actions header (h2). Text hidden by default.
-#: actions/showgroup.php:294
 msgid "Group actions"
 msgstr "Azioni dei gruppi"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:338
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
 msgstr "Feed dei messaggi per il gruppo %s (RSS 1.0)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:345
 #, php-format
 msgid "Notice feed for %s group (RSS 2.0)"
 msgstr "Feed dei messaggi per il gruppo %s (RSS 2.0)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:352
 #, php-format
 msgid "Notice feed for %s group (Atom)"
 msgstr "Feed dei messaggi per il gruppo %s (Atom)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:358
 #, php-format
 msgid "FOAF for %s group"
 msgstr "FOAF per il gruppo %s"
 
 #. TRANS: Header for mini list of group members on a group page (h2).
-#: actions/showgroup.php:395
 msgid "Members"
 msgstr "Membri"
 
@@ -5699,31 +4709,24 @@ msgstr "Membri"
 #. TRANS: Text for user subscription statistics if the user has no subscriptions.
 #. TRANS: Text for user subscriber statistics if user has no subscribers.
 #. TRANS: Text for user user group membership statistics if user is not a member of any group.
-#: actions/showgroup.php:401 lib/profileaction.php:137
-#: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
-#: lib/subscriptionlist.php:123 lib/tagcloudsection.php:71
 msgid "(None)"
 msgstr "(nessuno)"
 
 #. TRANS: Link to all group members from mini list of group members if group has more than n members.
-#: actions/showgroup.php:410
 msgid "All members"
 msgstr "Tutti i membri"
 
 #. TRANS: Header for group statistics on a group page (h2).
 #. TRANS: H2 text for user statistics.
-#: actions/showgroup.php:441 lib/profileaction.php:205
 msgid "Statistics"
 msgstr "Statistiche"
 
-#: actions/showgroup.php:444
 #, fuzzy
 msgctxt "LABEL"
 msgid "Created"
 msgstr "Creato"
 
 #. TRANS: Label for member count in statistics on group page.
-#: actions/showgroup.php:449
 #, fuzzy
 msgctxt "LABEL"
 msgid "Members"
@@ -5733,7 +4736,6 @@ msgstr "Membri"
 #. TRANS: **%s** is the group alias, %%%%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).
-#: actions/showgroup.php:464
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5752,7 +4754,6 @@ 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: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
-#: actions/showgroup.php:474
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5765,99 +4766,83 @@ msgstr ""
 "[StatusNet](http://status.net/)."
 
 #. TRANS: Header for list of group administrators on a group page (h2).
-#: actions/showgroup.php:503
 msgid "Admins"
 msgstr "Amministratori"
 
 #. TRANS: Client error displayed requesting a single message that does not exist.
-#: actions/showmessage.php:76
 msgid "No such message."
 msgstr "Nessun messaggio."
 
 #. TRANS: Client error displayed requesting a single direct message the requesting user was not a party in.
-#: actions/showmessage.php:86
 msgid "Only the sender and recipient may read this message."
 msgstr "Solo mittente e destinatario possono leggere questo messaggio."
 
 #. TRANS: Page title for single direct message display when viewing user is the sender.
 #. TRANS: %1$s is the addressed user's nickname, $2$s is a timestamp.
-#: actions/showmessage.php:105
 #, php-format
 msgid "Message to %1$s on %2$s"
 msgstr "Messaggio a %1$s su %2$s"
 
 #. TRANS: Page title for single message display.
 #. TRANS: %1$s is the sending user's nickname, $2$s is a timestamp.
-#: actions/showmessage.php:113
 #, php-format
 msgid "Message from %1$s on %2$s"
 msgstr "Messaggio da %1$s su %2$s"
 
-#: actions/shownotice.php:90
 msgid "Notice deleted."
 msgstr "Messaggio eliminato."
 
 #. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
-#: actions/showstream.php:70
 #, fuzzy, php-format
 msgid "%1$s tagged %2$s"
 msgstr "%1$s, pagina %2$s"
 
 #. TRANS: Page title showing tagged notices in one user's stream.
 #. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
-#: actions/showstream.php:74
 #, fuzzy, php-format
 msgid "%1$s tagged %2$s, page %3$d"
 msgstr "Messaggi etichettati con %1$s, pagina %2$d"
 
 #. TRANS: Extended page title showing tagged notices in one user's stream.
 #. TRANS: %1$s is the username, %2$d is the page number.
-#: actions/showstream.php:82
 #, php-format
 msgid "%1$s, page %2$d"
 msgstr "%1$s, pagina %2$d"
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %1$s is a user nickname, %2$s is a hashtag.
-#: actions/showstream.php:127
 #, php-format
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
 msgstr "Feed dei messaggi per %1$s etichettati con %2$s (RSS 1.0)"
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.
-#: actions/showstream.php:136
 #, php-format
 msgid "Notice feed for %s (RSS 1.0)"
 msgstr "Feed dei messaggi per %s (RSS 1.0)"
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.
-#: actions/showstream.php:145
 #, php-format
 msgid "Notice feed for %s (RSS 2.0)"
 msgstr "Feed dei messaggi per %s (RSS 2.0)"
 
-#: actions/showstream.php:152
 #, php-format
 msgid "Notice feed for %s (Atom)"
 msgstr "Feed dei messaggi per %s (Atom)"
 
 #. TRANS: Title for link to notice feed. FOAF stands for Friend of a Friend.
 #. TRANS: More information at http://www.foaf-project.org. %s is a user nickname.
-#: actions/showstream.php:159
 #, php-format
 msgid "FOAF for %s"
 msgstr "FOAF per %s"
 
 #. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
-#: actions/showstream.php:205
 #, fuzzy, php-format
 msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr "Questa è l'attività di %1$s, ma %2$s non ha ancora scritto nulla."
 
 #. TRANS: Second sentence of empty list message for a stream for the user themselves.
-#: actions/showstream.php:211
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
@@ -5867,7 +4852,6 @@ msgstr ""
 
 #. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:215
 #, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
@@ -5878,7 +4862,6 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:258
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5894,7 +4877,6 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:265
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5906,224 +4888,177 @@ msgstr ""
 "(http://status.net/). "
 
 #. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
-#: actions/showstream.php:322
 #, php-format
 msgid "Repeat of %s"
 msgstr "Ripetizione di %s"
 
-#: actions/silence.php:65 actions/unsilence.php:65
 msgid "You cannot silence users on this site."
 msgstr "Non puoi zittire gli utenti su questo sito."
 
-#: actions/silence.php:72
 msgid "User is already silenced."
 msgstr "L'utente è già stato zittito."
 
-#: actions/siteadminpanel.php:69
 msgid "Basic settings for this StatusNet site"
 msgstr "Impostazioni di base per questo sito StatusNet"
 
-#: actions/siteadminpanel.php:133
 msgid "Site name must have non-zero length."
 msgstr "Il nome del sito non deve avere lunghezza parti a zero."
 
-#: actions/siteadminpanel.php:141
 msgid "You must have a valid contact email address."
 msgstr "Devi avere un'email di contatto valida."
 
-#: actions/siteadminpanel.php:159
 #, php-format
 msgid "Unknown language \"%s\"."
 msgstr "Lingua \"%s\" sconosciuta."
 
-#: actions/siteadminpanel.php:165
 msgid "Minimum text limit is 0 (unlimited)."
 msgstr "Il limite minimo del testo è di 0 caratteri (illimitato)."
 
-#: actions/siteadminpanel.php:171
 msgid "Dupe limit must be one or more seconds."
 msgstr "Il limite per i duplicati deve essere di 1 o più secondi."
 
-#: actions/siteadminpanel.php:221
 msgid "General"
 msgstr "Generale"
 
-#: actions/siteadminpanel.php:224
 msgid "Site name"
 msgstr "Nome del sito"
 
-#: actions/siteadminpanel.php:225
 msgid "The name of your site, like \"Yourcompany Microblog\""
 msgstr "Il nome del tuo sito, topo \"Acme Microblog\""
 
-#: actions/siteadminpanel.php:229
 msgid "Brought by"
 msgstr "Offerto da"
 
-#: actions/siteadminpanel.php:230
 msgid "Text used for credits link in footer of each page"
 msgstr "Testo usato per i crediti nel piè di pagina di ogni pagina"
 
-#: actions/siteadminpanel.php:234
 msgid "Brought by URL"
 msgstr "URL per offerto da"
 
-#: actions/siteadminpanel.php:235
 msgid "URL used for credits link in footer of each page"
 msgstr "URL usato per i crediti nel piè di pagina di ogni pagina"
 
-#: actions/siteadminpanel.php:239
 msgid "Contact email address for your site"
 msgstr "Indirizzo email di contatto per il sito"
 
-#: actions/siteadminpanel.php:245
 msgid "Local"
 msgstr "Locale"
 
-#: actions/siteadminpanel.php:256
 msgid "Default timezone"
 msgstr "Fuso orario predefinito"
 
-#: actions/siteadminpanel.php:257
 msgid "Default timezone for the site; usually UTC."
 msgstr "Fuso orario predefinito; tipicamente UTC"
 
-#: actions/siteadminpanel.php:262
 msgid "Default language"
 msgstr "Lingua predefinita"
 
-#: actions/siteadminpanel.php:263
 msgid "Site language when autodetection from browser settings is not available"
 msgstr ""
 "Lingua del sito quando il rilevamento automatico del browser non è "
 "disponibile"
 
-#: actions/siteadminpanel.php:271
 msgid "Limits"
 msgstr "Limiti"
 
-#: actions/siteadminpanel.php:274
 msgid "Text limit"
 msgstr "Limiti del testo"
 
-#: actions/siteadminpanel.php:274
 msgid "Maximum number of characters for notices."
 msgstr "Numero massimo di caratteri per messaggo"
 
-#: actions/siteadminpanel.php:278
 msgid "Dupe limit"
 msgstr "Limite duplicati"
 
-#: actions/siteadminpanel.php:278
 msgid "How long users must wait (in seconds) to post the same thing again."
 msgstr ""
 "Quanto tempo gli utenti devono attendere (in secondi) prima di inviare "
 "nuovamente lo stesso messaggio"
 
 #. TRANS: Page title for site-wide notice tab in admin panel.
-#: actions/sitenoticeadminpanel.php:55
 msgid "Site Notice"
 msgstr "Messaggio del sito"
 
 #. TRANS: Instructions for site-wide notice tab in admin panel.
-#: actions/sitenoticeadminpanel.php:66
 msgid "Edit site-wide message"
 msgstr "Modifica il messaggio del sito"
 
 #. TRANS: Server error displayed when saving a site-wide notice was impossible.
-#: actions/sitenoticeadminpanel.php:101
 msgid "Unable to save site notice."
 msgstr "Impossibile salvare il messaggio del sito."
 
 #. TRANS: Client error displayed when a site-wide notice was longer than allowed.
-#: actions/sitenoticeadminpanel.php:112
 #, fuzzy
 msgid "Maximum length for the site-wide notice is 255 characters."
 msgstr "La dimensione massima del messaggio del sito è di 255 caratteri."
 
 #. TRANS: Label for site-wide notice text field in admin panel.
-#: actions/sitenoticeadminpanel.php:176
 msgid "Site notice text"
 msgstr "Testo messaggio del sito"
 
 #. TRANS: Tooltip for site-wide notice text field in admin panel.
-#: actions/sitenoticeadminpanel.php:179
 #, fuzzy
 msgid "Site-wide notice text (255 characters maximum; HTML allowed)"
 msgstr "Testo messaggio del sito (massimo 255 caratteri, HTML consentito)"
 
 #. TRANS: Title for button to save site notice in admin panel.
-#: actions/sitenoticeadminpanel.php:201
 #, fuzzy
 msgid "Save site notice."
 msgstr "Salva messaggio"
 
 #. TRANS: Title for SMS settings.
-#: actions/smssettings.php:56
 msgid "SMS settings"
 msgstr "Impostazioni SMS"
 
 #. TRANS: SMS settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/smssettings.php:70
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr "Puoi ricevere messaggi SMS attraverso l'email da %%site.name%%."
 
 #. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
-#: actions/smssettings.php:92
 msgid "SMS is not available."
 msgstr "Il servizio SMS non è disponibile."
 
 #. TRANS: Form legend for SMS settings form.
-#: actions/smssettings.php:106
 msgid "SMS address"
 msgstr "Indirizzo SMS"
 
 #. TRANS: Form guide in SMS settings form.
-#: actions/smssettings.php:115
 msgid "Current confirmed SMS-enabled phone number."
 msgstr "Numero di telefono attualmente confermato per gli SMS."
 
 #. TRANS: Form guide in IM settings form.
-#: actions/smssettings.php:128
 msgid "Awaiting confirmation on this phone number."
 msgstr "In attesa della conferma per questo numero di telefono."
 
 #. TRANS: Field label for SMS address input in SMS settings form.
-#: actions/smssettings.php:137
 msgid "Confirmation code"
 msgstr "Codice di conferma"
 
 #. TRANS: Form field instructions in SMS settings form.
-#: actions/smssettings.php:139
 msgid "Enter the code you received on your phone."
 msgstr "Inserisci il codice che hai ricevuto sul tuo telefono."
 
 #. TRANS: Button label to confirm SMS confirmation code in SMS settings.
-#: actions/smssettings.php:143
 msgctxt "BUTTON"
 msgid "Confirm"
 msgstr "Conferma"
 
 #. TRANS: Field label for SMS phone number input in SMS settings form.
-#: actions/smssettings.php:148
 msgid "SMS phone number"
 msgstr "Numero di telefono per SMS"
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
-#: actions/smssettings.php:151
 #, fuzzy
 msgid "Phone number, no punctuation or spaces, with area code."
 msgstr "Numero di telefono, senza punteggiatura o spazi, con il prefisso"
 
 #. TRANS: Form legend for SMS preferences form.
-#: actions/smssettings.php:190
 msgid "SMS preferences"
 msgstr "Preferenze dell'SMS"
 
 #. TRANS: Checkbox label in SMS preferences form.
-#: actions/smssettings.php:196
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
@@ -6132,32 +5067,26 @@ msgstr ""
 "bollette da parte del mio operatore"
 
 #. TRANS: Confirmation message for successful SMS preferences save.
-#: actions/smssettings.php:307
 msgid "SMS preferences saved."
 msgstr "Preferenze dell'SMS salvate."
 
 #. TRANS: Message given saving SMS phone number without having provided one.
-#: actions/smssettings.php:329
 msgid "No phone number."
 msgstr "Nessun numero di telefono."
 
 #. TRANS: Message given saving SMS phone number without having selected a carrier.
-#: actions/smssettings.php:335
 msgid "No carrier selected."
 msgstr "Nessun operatore selezionato."
 
 #. TRANS: Message given saving SMS phone number that is already set.
-#: actions/smssettings.php:343
 msgid "That is already your phone number."
 msgstr "Quello è già il tuo numero di telefono."
 
 #. TRANS: Message given saving SMS phone number that is already set for another user.
-#: actions/smssettings.php:347
 msgid "That phone number already belongs to another user."
 msgstr "Quel numero di telefono appartiene già a un altro utente."
 
 #. TRANS: Message given saving valid SMS phone number that is to be confirmed.
-#: actions/smssettings.php:375
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
 "for the code and instructions on how to use it."
@@ -6167,39 +5096,32 @@ msgstr ""
 "usarlo."
 
 #. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
-#: actions/smssettings.php:403
 msgid "That is the wrong confirmation number."
 msgstr "Quello è il numero di conferma errato."
 
 #. TRANS: Message given after successfully canceling SMS phone number confirmation.
-#: actions/smssettings.php:417
 msgid "SMS confirmation cancelled."
 msgstr "Conferma dell'SMS annullata."
 
 #. TRANS: Message given trying to remove an SMS phone number that is not
 #. TRANS: registered for the active user.
-#: actions/smssettings.php:437
 msgid "That is not your phone number."
 msgstr "Quello non è il tuo numero di telefono."
 
 #. TRANS: Message given after successfully removing a registered SMS phone number.
-#: actions/smssettings.php:459
 msgid "The SMS phone number was removed."
 msgstr "Il numero di telefono per SMS è stato rimosso."
 
 #. TRANS: Label for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:498
 msgid "Mobile carrier"
 msgstr "Operatore telefonico"
 
 #. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:503
 msgid "Select a carrier"
 msgstr "Seleziona un operatore"
 
 #. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
 #. TRANS: %s is an administrative contact's e-mail address.
-#: actions/smssettings.php:512
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -6209,120 +5131,95 @@ msgstr ""
 "via email, ma non è elencato qui, scrivici a %s."
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
-#: actions/smssettings.php:534
 #, fuzzy
 msgid "No code entered."
 msgstr "Nessun codice inserito"
 
 #. TRANS: Menu item for site administration
-#: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
-#: lib/adminpanelaction.php:395
 msgid "Snapshots"
 msgstr "Snapshot"
 
-#: actions/snapshotadminpanel.php:65
 msgid "Manage snapshot configuration"
 msgstr "Gestisci configurazione snapshot"
 
-#: actions/snapshotadminpanel.php:127
 msgid "Invalid snapshot run value."
 msgstr "Valore di esecuzione dello snapshot non valido."
 
-#: actions/snapshotadminpanel.php:133
 msgid "Snapshot frequency must be a number."
 msgstr "La frequenza degli snapshot deve essere un numero."
 
-#: actions/snapshotadminpanel.php:144
 msgid "Invalid snapshot report URL."
 msgstr "URL di segnalazione snapshot non valido."
 
-#: actions/snapshotadminpanel.php:200
 msgid "Randomly during web hit"
 msgstr "A caso quando avviene un web hit"
 
-#: actions/snapshotadminpanel.php:201
 msgid "In a scheduled job"
 msgstr "In un job pianificato"
 
-#: actions/snapshotadminpanel.php:206
 msgid "Data snapshots"
 msgstr "Snapshot dei dati"
 
-#: actions/snapshotadminpanel.php:208
 msgid "When to send statistical data to status.net servers"
 msgstr "Quando inviare dati statistici a status.net"
 
-#: actions/snapshotadminpanel.php:217
 msgid "Frequency"
 msgstr "Frequenza"
 
-#: actions/snapshotadminpanel.php:218
 msgid "Snapshots will be sent once every N web hits"
 msgstr "Gli snapshot verranno inviati ogni N web hit"
 
-#: actions/snapshotadminpanel.php:226
 msgid "Report URL"
 msgstr "URL per la segnalazione"
 
-#: actions/snapshotadminpanel.php:227
 msgid "Snapshots will be sent to this URL"
 msgstr "Gli snapshot verranno inviati a questo URL"
 
-#: actions/snapshotadminpanel.php:248
 msgid "Save snapshot settings"
 msgstr "Salva impostazioni snapshot"
 
 #. TRANS: Client error displayed trying a change a subscription for a non-subscribed profile.
-#: actions/subedit.php:75
 msgid "You are not subscribed to that profile."
 msgstr "Non hai una abbonamento a quel profilo."
 
 #. TRANS: Server error displayed when updating a subscription fails with a database error.
 #. TRANS: Exception thrown when a subscription could not be stored on the server.
-#: actions/subedit.php:89 classes/Subscription.php:141
 msgid "Could not save subscription."
 msgstr "Impossibile salvare l'abbonamento."
 
 #. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
-#: actions/subscribe.php:121
 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
 msgstr ""
 "Non è possibile abbonarsi a un profilo remoto OMB 0.1 con quest'azione."
 
 #. TRANS: Page title when subscription succeeded.
-#: actions/subscribe.php:149
 msgid "Subscribed"
 msgstr "Abbonati"
 
 #. TRANS: Header for list of subscribers for a user (first page).
 #. TRANS: %s is the user's nickname.
-#: actions/subscribers.php:51
 #, php-format
 msgid "%s subscribers"
 msgstr "Abbonati a %s"
 
 #. TRANS: Header for list of subscribers for a user (not first page).
 #. TRANS: %1$s is the user's nickname, $2$d is the page number.
-#: actions/subscribers.php:55
 #, php-format
 msgid "%1$s subscribers, page %2$d"
 msgstr "Abbonati a %1$s, pagina %2$d"
 
 #. TRANS: Page notice for page with an overview of all subscribers
 #. TRANS: of the logged in user's own profile.
-#: actions/subscribers.php:68
 msgid "These are the people who listen to your notices."
 msgstr "Queste sono le persone che ti seguono."
 
 #. TRANS: Page notice for page with an overview of all subscribers of a user other
 #. TRANS: than the logged in user. %s is the user nickname.
-#: actions/subscribers.php:74
 #, php-format
 msgid "These are the people who listen to %s's notices."
 msgstr "Queste sono le persone che seguono %s."
 
 #. TRANS: Subscriber list text when the logged in user has no subscribers.
-#: actions/subscribers.php:114
 #, fuzzy
 msgid ""
 "You have no subscribers. Try subscribing to people you know and they might "
@@ -6333,7 +5230,6 @@ msgstr ""
 
 #. TRANS: Subscriber list text when looking at the subscribers for a of a user other
 #. TRANS: than the logged in user that has no subscribers. %s is the user nickname.
-#: actions/subscribers.php:118
 #, php-format
 msgid "%s has no subscribers. Want to be the first?"
 msgstr "%s non ha abbonati. Vuoi abbonarti tu?"
@@ -6343,7 +5239,6 @@ msgstr "%s non ha abbonati. Vuoi abbonarti tu?"
 #. TRANS: This message contains a Markdown URL. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.
-#: actions/subscribers.php:127
 #, php-format
 msgid ""
 "%s has no subscribers. Why not [register an account](%%%%action.register%%%"
@@ -6354,20 +5249,17 @@ msgstr ""
 
 #. TRANS: Header for subscriptions overview for a user (not first page).
 #. TRANS: %1$s is a user nickname, %2$d is the page number.
-#: actions/subscriptions.php:55
 #, php-format
 msgid "%1$s subscriptions, page %2$d"
 msgstr "Abbonamenti di %1$s, pagina %2$d"
 
 #. TRANS: Page notice for page with an overview of all subscriptions
 #. TRANS: of the logged in user's own profile.
-#: actions/subscriptions.php:68
 msgid "These are the people whose notices you listen to."
 msgstr "Queste sono le persone che stai seguendo."
 
 #. TRANS: Page notice for page with an overview of all subscriptions of a user other
 #. TRANS: than the logged in user. %s is the user nickname.
-#: actions/subscriptions.php:74
 #, php-format
 msgid "These are the people whose notices %s listens to."
 msgstr "Queste sono le persone seguite da %s."
@@ -6376,7 +5268,6 @@ msgstr "Queste sono le persone seguite da %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.
-#: actions/subscriptions.php:133
 #, php-format
 msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "
@@ -6395,69 +5286,55 @@ msgstr ""
 #. TRANS: than the logged in user that has no subscriptions. %s is the user nickname.
 #. TRANS: Subscription list text when looking at the subscriptions for a of a user that has none
 #. TRANS: as an anonymous user. %s is the user nickname.
-#: actions/subscriptions.php:141 actions/subscriptions.php:147
 #, php-format
 msgid "%s is not listening to anyone."
 msgstr "%s non sta seguendo nessuno."
 
 #. TRANS: Atom feed title. %s is a profile nickname.
-#: actions/subscriptions.php:176
 #, fuzzy, php-format
 msgid "Subscription feed for %s (Atom)"
 msgstr "Feed dei messaggi per %s (Atom)"
 
 #. TRANS: Checkbox label for enabling Jabber messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:241 lib/settingsnav.php:110
-#, fuzzy
 msgid "IM"
 msgstr "MI"
 
 #. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:256 lib/settingsnav.php:117
 msgid "SMS"
 msgstr "SMS"
 
 #. TRANS: Title for all but the first page of notices with tags.
 #. TRANS: %1$s is the tag, %2$d is the page number.
-#: actions/tag.php:73
 #, php-format
 msgid "Notices tagged with %1$s, page %2$d"
 msgstr "Messaggi etichettati con %1$s, pagina %2$d"
 
-#: actions/tag.php:91
 #, php-format
 msgid "Notice feed for tag %s (RSS 1.0)"
 msgstr "Feed dei messaggi per l'etichetta %s (RSS 1.0)"
 
-#: actions/tag.php:97
 #, php-format
 msgid "Notice feed for tag %s (RSS 2.0)"
 msgstr "Feed dei messaggi per l'etichetta %s (RSS 2.0)"
 
-#: actions/tag.php:103
 #, php-format
 msgid "Notice feed for tag %s (Atom)"
 msgstr "Feed dei messaggi per l'etichetta %s (Atom)"
 
-#: actions/tagother.php:39
 msgid "No ID argument."
 msgstr "Nessun argomento ID."
 
-#: actions/tagother.php:65
 #, php-format
 msgid "Tag %s"
 msgstr "Etichetta %s"
 
 #. TRANS: H2 for user profile information.
-#: actions/tagother.php:77 lib/userprofile.php:76
 msgid "User profile"
 msgstr "Profilo utente"
 
-#: actions/tagother.php:120
 msgid "Tag user"
 msgstr "Etichette utente"
 
-#: actions/tagother.php:130
 msgid ""
 "Tags for this user (letters, numbers, -, ., and _), comma- or space- "
 "separated"
@@ -6465,50 +5342,40 @@ msgstr ""
 "Etichette per questo utente (lettere, numeri, -, . e _), separate da virgole "
 "o spazi"
 
-#: actions/tagother.php:157
 #, php-format
 msgid "Invalid tag: \"%s\""
 msgstr "Etichetta non valida: \"%s\""
 
-#: actions/tagother.php:172
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 "Puoi etichettare sole le persone di cui hai un abbonamento o che sono "
 "abbonate a te."
 
-#: actions/tagother.php:215
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
 "Usa questo modulo per aggiungere etichette ai tuoi abbonati o ai tuoi "
 "abbonamenti."
 
-#: actions/tagrss.php:35
 msgid "No such tag."
 msgstr "Nessuna etichetta."
 
 #. TRANS: Client error displayed when trying to unblock a non-blocked user.
-#: actions/unblock.php:59
 msgid "You haven't blocked that user."
 msgstr "Non hai bloccato quell'utente."
 
-#: actions/unsandbox.php:72
 msgid "User is not sandboxed."
 msgstr "L'utente non è nella \"sandbox\"."
 
-#: actions/unsilence.php:72
 msgid "User is not silenced."
 msgstr "L'utente non è zittito."
 
-#: actions/unsubscribe.php:77
 msgid "No profile ID in request."
 msgstr "Nessun ID di profilo nella richiesta."
 
-#: actions/unsubscribe.php:98
 msgid "Unsubscribed"
 msgstr "Abbonamento annullato"
 
-#: actions/updateprofile.php:64
 #, php-format
 msgid ""
 "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
@@ -6516,96 +5383,77 @@ msgstr ""
 "La licenza \"%1$s\" dello stream di chi ascolti non è compatibile con la "
 "licenza \"%2$s\" di questo sito."
 
-#: actions/urlsettings.php:60
 #, fuzzy
 msgid "URL settings"
 msgstr "Impostazioni messaggistica istantanea"
 
 #. TRANS: Instructions for tab "Other" in user profile settings.
-#: actions/urlsettings.php:72
 msgid "Manage various other options."
 msgstr "Gestisci altre opzioni."
 
 #. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
 #. TRANS: user's profile settings. This message has one space at the beginning. Use your
 #. TRANS: language's word separator here if it has one (most likely a single space).
-#: actions/urlsettings.php:115
 msgid " (free service)"
 msgstr " (servizio libero)"
 
-#: actions/urlsettings.php:121
 #, fuzzy
 msgid "[none]"
 msgstr "Nessuno"
 
-#: actions/urlsettings.php:122
 msgid "[internal]"
 msgstr ""
 
 #. TRANS: Label for dropdown with URL shortener services.
-#: actions/urlsettings.php:130
 msgid "Shorten URLs with"
 msgstr "Accorcia gli URL con"
 
 #. TRANS: Tooltip for for dropdown with URL shortener services.
-#: actions/urlsettings.php:132
 msgid "Automatic shortening service to use."
 msgstr "Servizio di autoriduzione da usare"
 
-#: actions/urlsettings.php:138
 msgid "URL longer than"
 msgstr ""
 
-#: actions/urlsettings.php:141
 msgid "URLs longer than this will be shortened, 0 means always shorten."
 msgstr ""
 
-#: actions/urlsettings.php:145
 msgid "Text longer than"
 msgstr ""
 
-#: actions/urlsettings.php:148
 msgid ""
 "URLs in notices longer than this will be shortened, 0 means always shorten."
 msgstr ""
 
 #. TRANS: Form validation error for form "Other settings" in user profile.
-#: actions/urlsettings.php:180
 #, fuzzy
 msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr "Il servizio di riduzione degli URL è troppo lungo (max 50 caratteri)."
 
-#: actions/urlsettings.php:187
 msgid "Invalid number for max url length."
 msgstr ""
 
-#: actions/urlsettings.php:193
 #, fuzzy
 msgid "Invalid number for max notice length."
 msgstr "Contenuto del messaggio non valido."
 
-#: actions/urlsettings.php:238
 msgid "Error saving user URL shortening preferences."
 msgstr ""
 
 #. TRANS: User admin panel title
-#: actions/useradminpanel.php:58
 msgctxt "TITLE"
 msgid "User"
 msgstr "Utente"
 
 #. TRANS: Instruction for user admin panel.
-#: actions/useradminpanel.php:69
 msgid "User settings for this StatusNet site"
 msgstr "Impostazioni utente per questo sito StatusNet"
 
 #. TRANS: Form validation error in user admin panel when a non-numeric character limit was set.
-#: actions/useradminpanel.php:147
 msgid "Invalid bio limit. Must be numeric."
 msgstr "Limite per la biografia non valido. Deve essere numerico."
 
 #. TRANS: Form validation error in user admin panel when welcome text is too long.
-#: actions/useradminpanel.php:154
 #, fuzzy
 msgid "Invalid welcome text. Maximum length is 255 characters."
 msgstr ""
@@ -6613,80 +5461,64 @@ msgstr ""
 
 #. TRANS: Client error displayed when trying to set a non-existing user as default subscription for new
 #. TRANS: users in user admin panel. %1$s is the invalid nickname.
-#: actions/useradminpanel.php:166
 #, fuzzy, php-format
 msgid "Invalid default subscripton: \"%1$s\" is not a user."
 msgstr "Abbonamento predefinito non valido: \"%1$s\" non è un utente."
 
-#: actions/useradminpanel.php:215 lib/action.php:565 lib/settingsnav.php:77
-#: lib/subgroupnav.php:81
 msgid "Profile"
 msgstr "Profilo"
 
 #. TRANS: Field label in user admin panel for setting the character limit for the bio field.
-#: actions/useradminpanel.php:220
 msgid "Bio Limit"
 msgstr "Limite biografia"
 
 #. TRANS: Tooltip in user admin panel for setting the character limit for the bio field.
-#: actions/useradminpanel.php:222
 msgid "Maximum length of a profile bio in characters."
 msgstr "Lunghezza massima in caratteri della biografia"
 
 #. TRANS: Form legend in user admin panel.
-#: actions/useradminpanel.php:231
 msgid "New users"
 msgstr "Nuovi utenti"
 
 #. TRANS: Field label in user admin panel for setting new user welcome text.
-#: actions/useradminpanel.php:236
 msgid "New user welcome"
 msgstr "Messaggio per nuovi utenti"
 
 #. TRANS: Tooltip in user admin panel for setting new user welcome text.
-#: actions/useradminpanel.php:238
 #, fuzzy
 msgid "Welcome text for new users (maximum 255 characters)."
 msgstr "Messaggio di benvenuto per nuovi utenti (max 255 caratteri)"
 
 #. TRANS: Field label in user admin panel for setting default subscription for new users.
-#: actions/useradminpanel.php:244
 msgid "Default subscription"
 msgstr "Abbonamento predefinito"
 
 #. TRANS: Tooltip in user admin panel for setting default subscription for new users.
-#: actions/useradminpanel.php:246
 msgid "Automatically subscribe new users to this user."
 msgstr "Abbonare automaticamente i nuovi utenti a questo utente"
 
 #. TRANS: Form legend in user admin panel.
-#: actions/useradminpanel.php:256
 msgid "Invitations"
 msgstr "Inviti"
 
 #. TRANS: Field label for checkbox in user admin panel for allowing users to invite friend using site e-mail.
-#: actions/useradminpanel.php:262
 msgid "Invitations enabled"
 msgstr "Inviti abilitati"
 
 #. TRANS: Tooltip for checkbox in user admin panel for allowing users to invite friend using site e-mail.
-#: actions/useradminpanel.php:265
 msgid "Whether to allow users to invite new users."
 msgstr "Indica se consentire agli utenti di invitarne di nuovi"
 
 #. TRANS: Title for button to save user settings in user admin panel.
-#: actions/useradminpanel.php:302
 #, fuzzy
 msgid "Save user settings."
 msgstr "Salva impostazioni utente"
 
 #. TRANS: Page title.
-#: actions/userauthorization.php:109
 msgid "Authorize subscription"
 msgstr "Autorizza abbonamento"
 
 #. TRANS: Page notice on "Auhtorize subscription" page.
-#: actions/userauthorization.php:115
 #, fuzzy
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
@@ -6697,42 +5529,35 @@ msgstr ""
 "messaggi di questo utente. Se non hai richiesto ciò, fai clic su \"Rifiuta\"."
 
 #. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:200
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Accept"
 msgstr "Accetta"
 
 #. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:202
 #, fuzzy
 msgid "Subscribe to this user."
 msgstr "Abbonati a questo utente"
 
 #. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:204
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Reject"
 msgstr "Rifiuta"
 
 #. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:206
 #, fuzzy
 msgid "Reject this subscription."
 msgstr "Rifiuta questo abbonamento"
 
 #. TRANS: Client error displayed for an empty authorisation request.
-#: actions/userauthorization.php:219
 msgid "No authorization request!"
 msgstr "Nessuna richiesta di autorizzazione!"
 
 #. TRANS: Accept message header from Authorise subscription page.
-#: actions/userauthorization.php:242
 msgid "Subscription authorized"
 msgstr "Abbonamento autorizzato"
 
-#: actions/userauthorization.php:245
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to authorize the "
@@ -6743,11 +5568,9 @@ msgstr ""
 "autorizzare l'abbonamento. Il tuo token per l'abbonamento è:"
 
 #. TRANS: Reject message header from Authorise subscription page.
-#: actions/userauthorization.php:256
 msgid "Subscription rejected"
 msgstr "Abbonamento rifiutato"
 
-#: actions/userauthorization.php:259
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to fully reject the "
@@ -6759,35 +5582,30 @@ msgstr ""
 
 #. TRANS: Exception thrown when no valid user is found for an authorisation request.
 #. TRANS: %s is a listener URI.
-#: actions/userauthorization.php:296
 #, fuzzy, php-format
 msgid "Listener URI \"%s\" not found here."
 msgstr "URL \"%s\" dell'ascoltatore non trovato qui."
 
 #. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
 #. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:303
 #, fuzzy, php-format
 msgid "Listenee URI \"%s\" is too long."
 msgstr "L'URI \"%s\" di colui che si ascolta è troppo lungo."
 
 #. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
 #. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:311
 #, fuzzy, php-format
 msgid "Listenee URI \"%s\" is a local user."
 msgstr "L'URI \"%s\" di colui che si ascolta è un utente locale."
 
 #. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
 #. TRANS: %s is a profile URL.
-#: actions/userauthorization.php:329
 #, fuzzy, php-format
 msgid "Profile URL \"%s\" is for a local user."
 msgstr "L'URL \"%s\" del profilo è per un utente locale."
 
 #. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
 #. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
-#: actions/userauthorization.php:339
 #, fuzzy, php-format
 msgid ""
 "Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
@@ -6798,32 +5616,27 @@ msgstr ""
 
 #. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
 #. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:349
 #, fuzzy, php-format
 msgid "Avatar URL \"%s\" is not valid."
 msgstr "L'URL \"%s\" dell'immagine non è valido."
 
 #. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
 #. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:356
 #, fuzzy, php-format
 msgid "Cannot read avatar URL \"%s\"."
 msgstr "Impossibile leggere l'URL \"%s\" dell'immagine."
 
 #. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
 #. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:363
 #, fuzzy, php-format
 msgid "Wrong image type for avatar URL \"%s\"."
 msgstr "Tipo di immagine errata per l'URL \"%s\"."
 
 #. TRANS: Page title for profile design page.
-#: actions/userdesignsettings.php:74 lib/designsettings.php:61
 msgid "Profile design"
 msgstr "Aspetto del profilo"
 
 #. TRANS: Instructions for profile design page.
-#: actions/userdesignsettings.php:84 lib/designsettings.php:72
 msgid ""
 "Customize the way your profile looks with a background image and a colour "
 "palette of your choice."
@@ -6831,44 +5644,35 @@ msgstr ""
 "Personalizza l'aspetto del tuo profilo con un'immagine di sfondo e dei "
 "colori personalizzati."
 
-#: actions/userdesignsettings.php:289
 msgid "Enjoy your hotdog!"
 msgstr "Gustati il tuo hotdog!"
 
-#: actions/userdesignsettings.php:325
 #, fuzzy
 msgid "Design settings"
 msgstr "Salva impostazioni"
 
-#: actions/userdesignsettings.php:340
 msgid "View profile designs"
 msgstr "Visualizza aspetto"
 
-#: actions/userdesignsettings.php:341
 msgid "Show or hide profile designs."
 msgstr "Mostra o nasconde gli aspetti del profilo"
 
-#: actions/userdesignsettings.php:348
 #, fuzzy
 msgid "Background file"
 msgstr "Sfondo"
 
 #. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number.
-#: actions/usergroups.php:66
 #, php-format
 msgid "%1$s groups, page %2$d"
 msgstr "Gruppi di %1$s, pagina %2$d"
 
-#: actions/usergroups.php:132
 msgid "Search for more groups"
 msgstr "Cerca altri gruppi"
 
-#: actions/usergroups.php:159
 #, php-format
 msgid "%s is not a member of any group."
 msgstr "%s non fa parte di alcun gruppo."
 
-#: actions/usergroups.php:164
 #, php-format
 msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
 msgstr "Prova a [cercare dei gruppi](%%action.groupsearch%%) e iscriviti."
@@ -6878,18 +5682,14 @@ msgstr "Prova a [cercare dei gruppi](%%action.groupsearch%%) e iscriviti."
 #. TRANS: %1$s is a group name, %2$s is a site name.
 #. TRANS: Message is used as a subtitle in atom user notice feed.
 #. TRANS: %1$s is a user name, %2$s is a site name.
-#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:70
-#: lib/atomusernoticefeed.php:95
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr "Messaggi da %1$s su %2$s!"
 
-#: actions/version.php:75
 #, php-format
 msgid "StatusNet %s"
 msgstr "StatusNet %s"
 
-#: actions/version.php:155
 #, php-format
 msgid ""
 "This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
@@ -6898,16 +5698,13 @@ msgstr ""
 "Questo sito esegue il software %1$s versione %2$s, Copyright 2008-2010 "
 "StatusNet, Inc. e collaboratori."
 
-#: actions/version.php:163
 msgid "Contributors"
 msgstr "Collaboratori"
 
 #. TRANS: Menu item for site administration
-#: actions/version.php:167 lib/adminpanelaction.php:403
 msgid "License"
 msgstr "Licenza"
 
-#: actions/version.php:170
 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 "
@@ -6919,7 +5716,6 @@ msgstr ""
 "Software Foundation, versione 3 o (a scelta) una qualsiasi versione "
 "successiva. "
 
-#: actions/version.php:176
 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 "
@@ -6931,7 +5727,6 @@ msgstr ""
 "o di UTILIZZABILITÀ PER UN PARTICOLARE SCOPO. Per maggiori informazioni "
 "consultare la GNU Affero General Public License. "
 
-#: actions/version.php:182
 #, php-format
 msgid ""
 "You should have received a copy of the GNU Affero General Public License "
@@ -6941,52 +5736,42 @@ msgstr ""
 "disponibile assieme a questo programma. Se così non fosse, consultare %s."
 
 #. TRANS: Form input field label for application name.
-#: actions/version.php:197 lib/applicationeditform.php:190
 msgid "Name"
 msgstr "Nome"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:885
 msgid "Version"
 msgstr "Versione"
 
-#: actions/version.php:199
 msgid "Author(s)"
 msgstr "Autori"
 
 #. TRANS: Form input field label.
-#: actions/version.php:200 lib/applicationeditform.php:208
-#: lib/groupeditform.php:168
 msgid "Description"
 msgstr "Descrizione"
 
 #. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:164
 msgid "Favor"
 msgstr "Preferisci"
 
 #. TRANS: Ntofication given when a user marks a notice as favorite.
 #. TRANS: %1$s is a user nickname or full name, %2$s is a notice URI.
-#: classes/Fave.php:167
 #, fuzzy, php-format
 msgid "%1$s marked notice %2$s as a favorite."
 msgstr "%s (@%s) ha aggiunto il tuo messaggio tra i suoi preferiti"
 
 #. TRANS: Server exception thrown when a URL cannot be processed.
-#: classes/File.php:162
 #, php-format
 msgid "Cannot process URL '%s'"
 msgstr "Impossibile elaborare l'indirizzo \"%s\""
 
 #. TRANS: Server exception thrown when... Robin thinks something is impossible!
-#: classes/File.php:194
 msgid "Robin thinks something is impossible."
 msgstr "Si è verificato qualche cosa di impossibile."
 
 #. 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$s is used for plural.
-#: classes/File.php:210
 #, fuzzy, php-format
 msgid ""
 "No file may be larger than %1$d byte and the file you sent was %2$d bytes. "
@@ -7003,7 +5788,6 @@ msgstr[1] ""
 
 #. TRANS: Message given if an upload would exceed user quota.
 #. TRANS: %d (number) is the user quota in bytes and is used for plural.
-#: classes/File.php:223
 #, fuzzy, php-format
 msgid "A file this large would exceed your user quota of %d byte."
 msgid_plural "A file this large would exceed your user quota of %d bytes."
@@ -7014,7 +5798,6 @@ msgstr[1] ""
 
 #. TRANS: Message given id an upload would exceed a user's monthly quota.
 #. TRANS: $d (number) is the monthly user quota in bytes and is used for plural.
-#: classes/File.php:235
 #, fuzzy, php-format
 msgid "A file this large would exceed your monthly quota of %d byte."
 msgid_plural "A file this large would exceed your monthly quota of %d bytes."
@@ -7024,108 +5807,89 @@ msgstr[1] ""
 "Un file di questa dimensione supererebbe la tua quota mensile di %d byte."
 
 #. TRANS: Client exception thrown if a file upload does not have a valid name.
-#: classes/File.php:282 classes/File.php:297
 msgid "Invalid filename."
 msgstr "Nome file non valido."
 
 #. TRANS: Exception thrown when joining a group fails.
-#: classes/Group_member.php:51
 msgid "Group join failed."
 msgstr "Ingresso nel gruppo non riuscito."
 
 #. TRANS: Exception thrown when trying to leave a group the user is not a member of.
-#: classes/Group_member.php:64
 msgid "Not part of group."
 msgstr "Non si fa parte del gruppo."
 
 #. TRANS: Exception thrown when trying to leave a group fails.
-#: classes/Group_member.php:72
 msgid "Group leave failed."
 msgstr "Uscita dal gruppo non riuscita."
 
 #. TRANS: Exception thrown providing an invalid profile ID.
 #. TRANS: %s is the invalid profile ID.
-#: classes/Group_member.php:85
 #, php-format
 msgid "Profile ID %s is invalid."
 msgstr "L'ID di profilo %s non è valido."
 
 #. TRANS: Exception thrown providing an invalid group ID.
 #. TRANS: %s is the invalid group ID.
-#: classes/Group_member.php:98
 #, fuzzy, php-format
 msgid "Group ID %s is invalid."
 msgstr "Errore nel salvare l'utente; non valido."
 
 #. TRANS: Activity title.
-#: classes/Group_member.php:147 lib/joinform.php:114
 msgid "Join"
 msgstr "Iscriviti"
 
 #. TRANS: Success message for subscribe to group attempt through OStatus.
 #. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
-#: classes/Group_member.php:151
 #, php-format
 msgid "%1$s has joined group %2$s."
 msgstr "L'utente %1$s è entrato nel gruppo %2$s."
 
 #. TRANS: Server exception thrown when updating a local group fails.
-#: classes/Local_group.php:42
 msgid "Could not update local group."
 msgstr "Impossibile aggiornare il gruppo locale."
 
 #. TRANS: Exception thrown when trying creating a login token failed.
 #. TRANS: %s is the user nickname for which token creation failed.
-#: classes/Login_token.php:78
 #, php-format
 msgid "Could not create login token for %s"
 msgstr "Impossibile creare il token di accesso per %s"
 
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
-#: classes/Memcached_DataObject.php:556
 msgid "No database name or DSN found anywhere."
 msgstr "Non è stato trovato un nome di database o DNS."
 
 #. TRANS: Client exception thrown when a user tries to send a direct message while being banned from sending them.
-#: classes/Message.php:45
 msgid "You are banned from sending direct messages."
 msgstr "Ti è proibito inviare messaggi diretti."
 
 #. TRANS: Message given when a message could not be stored on the server.
-#: classes/Message.php:69
 msgid "Could not insert message."
 msgstr "Impossibile inserire il messaggio."
 
 #. TRANS: Message given when a message could not be updated on the server.
-#: classes/Message.php:80
 msgid "Could not update message with new URI."
 msgstr "Impossibile aggiornare il messaggio con il nuovo URI."
 
 #. TRANS: Server exception thrown when a user profile for a notice cannot be found.
 #. TRANS: %1$d is a profile ID (number), %2$d is a notice ID (number).
-#: classes/Notice.php:98
 #, php-format
 msgid "No such profile (%1$d) for notice (%2$d)."
 msgstr "Non c'è alcun profilo (%1$d) per il messaggio (%2$d)."
 
 #. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:199
 #, php-format
 msgid "Database error inserting hashtag: %s"
 msgstr "Errore del database nell'inserire un hashtag: %s"
 
 #. TRANS: Client exception thrown if a notice contains too many characters.
-#: classes/Notice.php:279
 msgid "Problem saving notice. Too long."
 msgstr "Problema nel salvare il messaggio. Troppo lungo."
 
 #. TRANS: Client exception thrown when trying to save a notice for an unknown user.
-#: classes/Notice.php:284
 msgid "Problem saving notice. Unknown user."
 msgstr "Problema nel salvare il messaggio. Utente sconosciuto."
 
 #. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
-#: classes/Notice.php:290
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
@@ -7133,7 +5897,6 @@ msgstr ""
 "qualche minuto."
 
 #. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
-#: classes/Notice.php:297
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
 "few minutes."
@@ -7142,43 +5905,36 @@ msgstr ""
 "nuovo tra qualche minuto."
 
 #. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:305
 msgid "You are banned from posting notices on this site."
 msgstr "Ti è proibito inviare messaggi su questo sito."
 
 #. TRANS: Server exception thrown when a notice cannot be saved.
 #. TRANS: Server exception thrown when a notice cannot be updated.
-#: classes/Notice.php:372 classes/Notice.php:399
 msgid "Problem saving notice."
 msgstr "Problema nel salvare il messaggio."
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:929
 #, fuzzy
 msgid "Bad type provided to saveKnownGroups."
 msgstr "Fornito un tipo errato per saveKnownGroups"
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:1028
 msgid "Problem saving group inbox."
 msgstr "Problema nel salvare la casella della posta del gruppo."
 
 #. TRANS: Server exception thrown when a reply cannot be saved.
 #. TRANS: %1$d is a notice ID, %2$d is the ID of the mentioned user.
-#: classes/Notice.php:1144
 #, fuzzy, php-format
 msgid "Could not save reply for %1$d, %2$d."
 msgstr "Impossibile salvare le informazioni del gruppo locale."
 
 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1663
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
 
 #. TRANS: Full name of a profile or group followed by nickname in parens
-#: classes/Profile.php:172 classes/User_group.php:242
 #, fuzzy, php-format
 msgctxt "FANCYNAME"
 msgid "%1$s (%2$s)"
@@ -7186,7 +5942,6 @@ msgstr "%1$s (%2$s)"
 
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:779
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
@@ -7194,7 +5949,6 @@ msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:788
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -7202,251 +5956,198 @@ msgstr ""
 "database."
 
 #. TRANS: Exception thrown when a right for a non-existing user profile is checked.
-#: classes/Remote_profile.php:54
 msgid "Missing profile."
 msgstr "Profilo mancante."
 
 #. TRANS: Exception thrown when a tag cannot be saved.
-#: classes/Status_network.php:338
 msgid "Unable to save tag."
 msgstr "Impossibile salvare l'etichetta."
 
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#: classes/Subscription.php:77 lib/oauthstore.php:482
 msgid "You have been banned from subscribing."
 msgstr "Non ti è possibile abbonarti."
 
 #. TRANS: Exception thrown when trying to subscribe while already subscribed.
-#: classes/Subscription.php:82
 msgid "Already subscribed!"
 msgstr "Hai già l'abbonamento!"
 
 #. TRANS: Exception thrown when trying to subscribe to a user who has blocked the subscribing user.
-#: classes/Subscription.php:87
 msgid "User has blocked you."
 msgstr "L'utente non ti consente di seguirlo."
 
 #. TRANS: Exception thrown when trying to unsibscribe without a subscription.
-#: classes/Subscription.php:176
 msgid "Not subscribed!"
 msgstr "Non hai l'abbonamento!"
 
 #. TRANS: Exception thrown when trying to unsubscribe a user from themselves.
-#: classes/Subscription.php:183
 msgid "Could not delete self-subscription."
 msgstr "Impossibile salvare l'abbonamento."
 
 #. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
-#: classes/Subscription.php:211
 msgid "Could not delete subscription OMB token."
 msgstr "Impossibile salvare l'abbonamento."
 
 #. TRANS: Exception thrown when a subscription could not be deleted on the server.
-#: classes/Subscription.php:223
 msgid "Could not delete subscription."
 msgstr "Impossibile salvare l'abbonamento."
 
 #. TRANS: Activity tile when subscribing to another person.
-#: classes/Subscription.php:265
 msgid "Follow"
 msgstr "Segui"
 
 #. TRANS: Notification given when one person starts following another.
 #. TRANS: %1$s is the subscriber, %2$s is the subscribed.
-#: classes/Subscription.php:268
 #, fuzzy, php-format
 msgid "%1$s is now following %2$s."
 msgstr "L'utente %1$s è entrato nel gruppo %2$s."
 
 #. TRANS: Notice given on user registration.
 #. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:390
 #, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr "Benvenuti su %1$s, @%2$s!"
 
 #. TRANS: Server exception.
-#: classes/User.php:923
 msgid "No single user defined for single-user mode."
 msgstr "Nessun utente singolo definito per la modalità single-user."
 
 #. TRANS: Server exception.
-#: classes/User.php:927
 msgid "Single-user mode code called when not enabled."
 msgstr ""
 
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:522
 msgid "Could not create group."
 msgstr "Impossibile creare il gruppo."
 
 #. TRANS: Server exception thrown when updating a group URI failed.
-#: classes/User_group.php:532
 msgid "Could not set group URI."
 msgstr "Impossibile impostare l'URI del gruppo."
 
 #. TRANS: Server exception thrown when setting group membership failed.
-#: classes/User_group.php:555
 msgid "Could not set group membership."
 msgstr "Impossibile impostare la membership al gruppo."
 
 #. TRANS: Server exception thrown when saving local group information failed.
-#: classes/User_group.php:570
 msgid "Could not save local group info."
 msgstr "Impossibile salvare le informazioni del gruppo locale."
 
 #. TRANS: Exception thrown when an account could not be located when it should be moved.
 #. TRANS: %s is the remote site.
-#: lib/accountmover.php:65
 #, fuzzy, php-format
 msgid "Cannot locate account %s."
 msgstr "Non puoi eliminare utenti."
 
 #. TRANS: Exception thrown when a service document could not be located account move.
 #. TRANS: %s is the remote site.
-#: lib/accountmover.php:106
 #, php-format
 msgid "Cannot find XRD for %s."
 msgstr ""
 
 #. TRANS: Exception thrown when an account could not be located when it should be moved.
 #. TRANS: %s is the remote site.
-#: lib/accountmover.php:131
 #, php-format
 msgid "No AtomPub API service for %s."
 msgstr ""
 
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: lib/action.php:161
 #, php-format
 msgid "%1$s - %2$s"
 msgstr "%1$s - %2$s"
 
 #. TRANS: Page title for a page without a title set.
-#: lib/action.php:177
 msgid "Untitled page"
 msgstr "Pagina senza nome"
 
 #. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.
-#: lib/action.php:325
 msgctxt "TOOLTIP"
 msgid "Show more"
 msgstr ""
 
 #. TRANS: Inline reply form submit button: submits a reply comment.
-#: lib/action.php:328
 #, fuzzy
 msgctxt "BUTTON"
-msgid "Comment"
-msgstr "Contenuto"
+msgid "Reply"
+msgstr "Rispondi"
 
 #. TRANS: Placeholder text for inline reply form. Clicking in this box will turn it into a mini notice form.
-#: lib/action.php:331
-msgid "Add a comment..."
+msgid "Write a reply..."
 msgstr ""
 
-#: lib/action.php:559 lib/personalgroupnav.php:99
-#, fuzzy
 msgid "Home"
 msgstr "Pagina web"
 
-#: lib/action.php:560
 #, fuzzy
 msgid "Friends timeline"
 msgstr "Attività di %s"
 
-#: lib/action.php:566
 #, fuzzy
 msgid "Your profile"
 msgstr "Profilo del gruppo"
 
-#: lib/action.php:570 lib/action.php:593 lib/publicgroupnav.php:78
 msgid "Public"
 msgstr "Pubblico"
 
-#: lib/action.php:571 lib/action.php:594
 #, fuzzy
 msgid "Everyone on this site"
 msgstr "Trova persone in questo sito"
 
-#: lib/action.php:575
-#, fuzzy
 msgid "Settings"
 msgstr "Impostazioni SMS"
 
-#: lib/action.php:576
 #, fuzzy
 msgid "Change your personal settings"
 msgstr "Modifica le impostazioni del tuo profilo"
 
-#: lib/action.php:582
 #, fuzzy
 msgid "Site configuration"
 msgstr "Configurazione utente"
 
-#: lib/action.php:587
-#, fuzzy
 msgid "Logout"
 msgstr "Esci"
 
-#: lib/action.php:588
-#, fuzzy
 msgid "Logout from the site"
 msgstr "Termina la tua sessione sul sito"
 
-#: lib/action.php:599
-#, fuzzy
 msgid "Login to the site"
 msgstr "Accedi al sito"
 
-#: lib/action.php:606
-#, fuzzy
 msgid "Search"
 msgstr "Cerca"
 
-#: lib/action.php:607
 #, fuzzy
 msgid "Search the site"
 msgstr "Cerca nel sito"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:864
 msgid "Help"
 msgstr "Aiuto"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:867
 msgid "About"
 msgstr "Informazioni"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:870
 msgid "FAQ"
 msgstr "FAQ"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:875
 msgid "TOS"
 msgstr "TOS"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:879
 msgid "Privacy"
 msgstr "Privacy"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:882
 msgid "Source"
 msgstr "Sorgenti"
 
 #. TRANS: Secondary navigation menu option leading to e-mail contact information on the
 #. TRANS: StatusNet site, where to report bugs, ...
-#: lib/action.php:889
 msgid "Contact"
 msgstr "Contatti"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:892
 msgid "Badge"
 msgstr "Badge"
 
@@ -7454,7 +6155,6 @@ msgstr "Badge"
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:921
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7464,7 +6164,6 @@ msgstr ""
 "(%%site.broughtbyurl%%)."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:924
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** è un servizio di microblog."
@@ -7473,7 +6172,6 @@ msgstr "**%%site.name%%** è un servizio di microblog."
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:931
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7486,21 +6184,18 @@ msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:949
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr "I contenuti e i dati di %1$s sono privati e confidenziali."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:956
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
 "I contenuti e i dati sono copyright di %1$s. Tutti i diritti riservati."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:960
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 "I contenuti e i dati sono forniti dai collaboratori. Tutti i diritti "
@@ -7508,7 +6203,6 @@ msgstr ""
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:992
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
@@ -7517,80 +6211,66 @@ msgstr ""
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1335
 msgid "After"
 msgstr "Successivi"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1345
 msgid "Before"
 msgstr "Precedenti"
 
 #. TRANS: Client exception thrown when a feed instance is a DOMDocument.
-#: lib/activity.php:125
 msgid "Expecting a root feed element but got a whole XML document."
 msgstr "Atteso un elemento root del feed, ma ricevuto un documento XML intero."
 
 #. TRANS: Client exception thrown when using an unknown verb for the activity importer.
-#: lib/activityimporter.php:81
 #, fuzzy, php-format
 msgid "Unknown verb: \"%s\"."
 msgstr "Lingua \"%s\" sconosciuta."
 
 #. TRANS: Client exception thrown when trying to force a subscription for an untrusted user.
-#: lib/activityimporter.php:107
 msgid "Cannot force subscription for untrusted user."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to for a remote user to subscribe.
-#: lib/activityimporter.php:117
 #, fuzzy
 msgid "Cannot force remote user to subscribe."
 msgstr "Specifica il nome dell'utente a cui abbonarti."
 
 #. TRANS: Client exception thrown when trying to subscribe to an unknown profile.
-#: lib/activityimporter.php:132
 #, fuzzy
 msgid "Unknown profile."
 msgstr "Tipo di file sconosciuto"
 
 #. TRANS: Client exception thrown when trying to import an event not related to the importing user.
-#: lib/activityimporter.php:138
 msgid "This activity seems unrelated to our user."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to join a remote group that is not a group.
-#: lib/activityimporter.php:154
 msgid "Remote profile is not a group!"
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to join a group the importing user is already a member of.
-#: lib/activityimporter.php:163
 #, fuzzy
 msgid "User is already a member of this group."
 msgstr "Fai già parte di quel gruppo."
 
 #. TRANS: Client exception thrown when trying to import a notice by another user.
 #. TRANS: %1$s is the source URI of the notice, %2$s is the URI of the author.
-#: lib/activityimporter.php:201
 #, php-format
 msgid "Already know about notice %1$s and  it has a different author %2$s."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to overwrite the author information for a non-trusted user during import.
-#: lib/activityimporter.php:207
 msgid "Not overwriting author info for non-trusted user."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to import a notice without content.
 #. TRANS: %s is the notice URI.
-#: lib/activityimporter.php:223
 #, fuzzy, php-format
 msgid "No content for notice %s."
 msgstr "Trova contenuto dei messaggi"
 
-#: lib/activitymover.php:84
 #, fuzzy, php-format
 msgid "No such user %s."
 msgstr "Utente inesistente."
@@ -7601,215 +6281,175 @@ msgstr "Utente inesistente."
 #. TRANS: %1$s is a URL, %2$s is the status, %s$s is the fail reason.
 #. TRANS: Exception thrown when post to collection fails with a status that is not handled.
 #. TRANS: %1$s is a URL, %2$s is the status, %s$s is the fail reason.
-#: lib/activitysink.php:163 lib/activitysink.php:167 lib/activitysink.php:172
 #, fuzzy, php-format
 msgctxt "URLSTATUSREASON"
 msgid "%1$s %2$s %3$s"
 msgstr "%1$s - %2$s"
 
 #. TRANS: Client exception thrown when there is no source attribute.
-#: lib/activityutils.php:200
 msgid "Can't handle remote content yet."
 msgstr "Impossibile gestire contenuti remoti."
 
 #. TRANS: Client exception thrown when there embedded XML content is found that cannot be processed yet.
-#: lib/activityutils.php:237
 msgid "Can't handle embedded XML content yet."
 msgstr "Impossibile gestire contenuti XML incorporati."
 
 #. TRANS: Client exception thrown when base64 encoded content is found that cannot be processed yet.
-#: lib/activityutils.php:242
 msgid "Can't handle embedded Base64 content yet."
 msgstr "Impossibile gestire contenuti Base64."
 
 #. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights.
-#: lib/adminpanelaction.php:96
 msgid "You cannot make changes to this site."
 msgstr "Non puoi apportare modifiche al sito."
 
 #. TRANS: Client error message throw when a certain panel's settings cannot be changed.
-#: lib/adminpanelaction.php:108
 msgid "Changes to that panel are not allowed."
 msgstr "Le modifiche al pannello non sono consentite."
 
 #. TRANS: Client error message.
-#: lib/adminpanelaction.php:222
 msgid "showForm() not implemented."
 msgstr "showForm() non implementata."
 
 #. TRANS: Client error message
-#: lib/adminpanelaction.php:250
 msgid "saveSettings() not implemented."
 msgstr "saveSettings() non implementata."
 
 #. TRANS: Client error message thrown if design settings could not be deleted in
 #. TRANS: the admin panel Design.
-#: lib/adminpanelaction.php:274
 msgid "Unable to delete design setting."
 msgstr "Impossibile eliminare le impostazioni dell'aspetto."
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:337
 msgid "Basic site configuration"
 msgstr "Configurazione di base"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:339
 msgctxt "MENU"
 msgid "Site"
 msgstr "Sito"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:345
 msgid "Design configuration"
 msgstr "Configurazione aspetto"
 
 #. TRANS: Menu item for site administration
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/adminpanelaction.php:347 lib/groupnav.php:135
 msgctxt "MENU"
 msgid "Design"
 msgstr "Aspetto"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:353
 msgid "User configuration"
 msgstr "Configurazione utente"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:110
 msgid "User"
 msgstr "Utente"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:361
 msgid "Access configuration"
 msgstr "Configurazione di accesso"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:369
 msgid "Paths configuration"
 msgstr "Configurazione percorsi"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:377
 msgid "Sessions configuration"
 msgstr "Configurazione sessioni"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:385
 msgid "Edit site notice"
 msgstr "Modifica messaggio del sito"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:387
 msgid "Site notice"
 msgstr "Messaggio del sito"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:393
 msgid "Snapshots configuration"
 msgstr "Configurazione snapshot"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:401
 msgid "Set site license"
 msgstr "Imposta licenza"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:409
 #, fuzzy
 msgid "Plugins configuration"
 msgstr "Configurazione percorsi"
 
 #. TRANS: Client error 401.
-#: lib/apiauth.php:111
 msgid "API resource requires read-write access, but you only have read access."
 msgstr ""
 "Le risorse API richiedono accesso lettura-scrittura, ma si dispone del solo "
 "accesso in lettura."
 
 #. TRANS: OAuth exception thrown when no application is found for a given consumer key.
-#: lib/apiauth.php:177
 msgid "No application for that consumer key."
 msgstr "Nessuna applicazione per quella chiave."
 
-#: lib/apiauth.php:202 lib/apiauth.php:284
 msgid "Not allowed to use API."
 msgstr ""
 
 #. TRANS: OAuth exception given when an incorrect access token was given for a user.
-#: lib/apiauth.php:225
 msgid "Bad access token."
 msgstr "Token di accesso errato."
 
 #. TRANS: OAuth exception given when no user was found for a given token (no token was found).
-#: lib/apiauth.php:230
 msgid "No user for that token."
 msgstr "Nessun utente per quel token."
 
 #. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel".
 #. TRANS: Client error thrown when authentication fails.
-#: lib/apiauth.php:272 lib/apiauth.php:302
 msgid "Could not authenticate you."
 msgstr "Impossibile autenticarti."
 
 #. TRANS: Server error displayed when trying to create an anynymous OAuth consumer.
-#: lib/apioauthstore.php:45
 #, fuzzy
 msgid "Could not create anonymous consumer."
 msgstr "Impossibile creare gli alias."
 
 #. TRANS: Server error displayed when trying to create an anynymous OAuth application.
-#: lib/apioauthstore.php:69
 #, fuzzy
 msgid "Could not create anonymous OAuth application."
 msgstr "Impossibile creare l'applicazione."
 
 #. TRANS: Exception thrown when no token association could be found.
-#: lib/apioauthstore.php:151
 msgid ""
 "Could not find a profile and application associated with the request token."
 msgstr ""
 
 #. TRANS: Exception thrown when no access token can be issued.
-#: lib/apioauthstore.php:209
 #, fuzzy
 msgid "Could not issue access token."
 msgstr "Impossibile inserire il messaggio."
 
-#: lib/apioauthstore.php:317
 msgid "Database error inserting OAuth application user."
 msgstr "Errore nel database nell'inserire l'applicazione utente OAuth."
 
-#: lib/apioauthstore.php:345
 #, fuzzy
 msgid "Database error updating OAuth application user."
 msgstr "Errore nel database nell'inserire l'applicazione utente OAuth."
 
 #. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
-#: lib/apioauthstore.php:371
 msgid "Tried to revoke unknown token."
 msgstr "Tentativo di revocare un token sconosciuto."
 
 #. TRANS: Exception thrown when an attempt is made to remove a revoked token.
-#: lib/apioauthstore.php:376
 msgid "Failed to delete revoked token."
 msgstr "Eliminazione del token revocato non riuscita."
 
 #. TRANS: Form input field label for application icon.
-#: lib/applicationeditform.php:177
 msgid "Icon"
 msgstr "Icona"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:182
 msgid "Icon for this application"
 msgstr "Icona per questa applicazione"
 
 #. TRANS: Form input field instructions.
 #. TRANS: %d is the number of available characters for the description.
-#: lib/applicationeditform.php:201
 #, fuzzy, php-format
 msgid "Describe your application in %d character"
 msgid_plural "Describe your application in %d characters"
@@ -7817,211 +6457,172 @@ msgstr[0] "Descrivi l'applicazione in %d caratteri"
 msgstr[1] "Descrivi l'applicazione in %d caratteri"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:205
 msgid "Describe your application"
 msgstr "Descrivi l'applicazione"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:216
 msgid "URL of the homepage of this application"
 msgstr "URL della pagina web di questa applicazione"
 
 #. TRANS: Form input field label.
-#: lib/applicationeditform.php:218
 msgid "Source URL"
 msgstr "URL sorgente"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:225
 msgid "Organization responsible for this application"
 msgstr "Organizzazione responsabile per questa applicazione"
 
 #. TRANS: Form input field label.
-#: lib/applicationeditform.php:227
 msgid "Organization"
 msgstr "Organizzazione"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:234
 msgid "URL for the homepage of the organization"
 msgstr "URL della pagina web dell'organizzazione"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:243
 msgid "URL to redirect to after authentication"
 msgstr "URL verso cui redirigere dopo l'autenticazione"
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:271
 msgid "Browser"
 msgstr "Browser"
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:288
 msgid "Desktop"
 msgstr "Desktop"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:290
 msgid "Type of application, browser or desktop"
 msgstr "Tipo di applicazione, browser o desktop"
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:314
 msgid "Read-only"
 msgstr "Sola lettura"
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:334
 msgid "Read-write"
 msgstr "Lettura-scrittura"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:336
 msgid "Default access for this application: read-only, or read-write"
 msgstr ""
 "Accesso predefinito per questa applicazione, sola lettura o lettura-scrittura"
 
 #. TRANS: Submit button title.
-#: lib/applicationeditform.php:353
 msgid "Cancel"
 msgstr "Annulla"
 
-#: lib/applicationlist.php:247
 msgid " by "
 msgstr ""
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:260
 msgid "read-write"
 msgstr "Lettura-scrittura"
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:262
 msgid "read-only"
 msgstr "Sola lettura"
 
 #. TRANS: Used in application list. %1$s is a modified date, %2$s is access type ("read-write" or "read-only")
-#: lib/applicationlist.php:268
 #, php-format
 msgid "Approved %1$s - \"%2$s\" access."
 msgstr "Approvata %1$s - Accesso \"%2$s\"."
 
 #. TRANS: Access token in the application list.
 #. TRANS: %s are the first 7 characters of the access token.
-#: lib/applicationlist.php:282
 #, php-format
 msgid "Access token starting with: %s"
 msgstr ""
 
 #. TRANS: Button label
-#: lib/applicationlist.php:298
 msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "Revoca"
 
-#: lib/atom10feed.php:113
 #, fuzzy
 msgid "Author element must contain a name element."
 msgstr "L'elemento author deve contenere un elemento name."
 
 #. TRANS: Server exception thrown when using the method setActivitySubject() in the class Atom10Feed.
-#: lib/atom10feed.php:160
 #, fuzzy
 msgid "Do not use this method!"
 msgstr "Non eliminare il messaggio"
 
 #. TRANS: Title.
-#: lib/attachmentnoticesection.php:67
 msgid "Notices where this attachment appears"
 msgstr "Messaggi in cui appare questo allegato"
 
 #. TRANS: Title.
-#: lib/attachmenttagcloudsection.php:48
 msgid "Tags for this attachment"
 msgstr "Etichette per questo allegato"
 
 #. TRANS: Exception thrown when a password change fails.
-#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:227
 #, fuzzy
 msgid "Password changing failed."
 msgstr "Modifica della password non riuscita"
 
 #. TRANS: Exception thrown when a password change attempt fails because it is not allowed.
-#: lib/authenticationplugin.php:238
 #, fuzzy
 msgid "Password changing is not allowed."
 msgstr "La modifica della password non è permessa"
 
 #. TRANS: Title for the form to block a user.
-#: lib/blockform.php:68
 msgid "Block"
 msgstr "Blocca"
 
 #. TRANS: Description of the form to block a user.
-#: lib/blockform.php:79
 msgid "Block this user"
 msgstr "Blocca questo utente"
 
 #. TRANS: Title for command results.
-#: lib/channel.php:104 lib/channel.php:125
 msgid "Command results"
 msgstr "Risultati comando"
 
 #. TRANS: Title for command results.
-#: lib/channel.php:138
 #, fuzzy
 msgid "AJAX error"
 msgstr "Errore di Ajax"
 
 #. TRANS: E-mail subject when a command has completed.
-#: lib/channel.php:177 lib/mailhandler.php:143
 msgid "Command complete"
 msgstr "Comando completato"
 
 #. TRANS: E-mail subject when a command has failed.
-#: lib/channel.php:188
 msgid "Command failed"
 msgstr "Comando non riuscito"
 
 #. TRANS: Command exception text shown when a notice ID is requested that does not exist.
-#: lib/command.php:82 lib/command.php:106
 msgid "Notice with that id does not exist."
 msgstr "Un messaggio con quel ID non esiste."
 
 #. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
 #. TRANS: Error text shown when a last user notice is requested and it does not exist.
-#: lib/command.php:99 lib/command.php:642
 msgid "User has no last notice."
 msgstr "L'utente non ha un ultimo messaggio."
 
 #. TRANS: Message given requesting a profile for a non-existing user.
 #. TRANS: %s is the nickname of the user for which the profile could not be found.
-#: lib/command.php:128
 #, php-format
 msgid "Could not find a user with nickname %s."
 msgstr "Impossibile trovare un utente col soprannome %s."
 
 #. TRANS: Message given getting a non-existing user.
 #. TRANS: %s is the nickname of the user that could not be found.
-#: lib/command.php:148
 #, php-format
 msgid "Could not find a local user with nickname %s."
 msgstr "Impossibile trovare un utente locale dal soprannome %s."
 
 #. TRANS: Error text shown when an unimplemented command is given.
-#: lib/command.php:183
 msgid "Sorry, this command is not yet implemented."
 msgstr "Questo comando non è ancora implementato."
 
 #. TRANS: Command exception text shown when a user tries to nudge themselves.
-#: lib/command.php:229
 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr "Non ha molto senso se cerchi di richiamarti!"
 
 #. TRANS: Message given having nudged another user.
 #. TRANS: %s is the nickname of the user that was nudged.
-#: lib/command.php:238
 #, php-format
 msgid "Nudge sent to %s."
 msgstr "Richiamo inviato a %s."
@@ -8030,7 +6631,6 @@ msgstr "Richiamo inviato a %s."
 #. TRANS: %1$s is the number of other user the user is subscribed to.
 #. TRANS: %2$s is the number of users that are subscribed to the user.
 #. TRANS: %3$s is the number of notices the user has sent.
-#: lib/command.php:268
 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"
@@ -8042,40 +6642,34 @@ msgstr ""
 "Messaggi: %3$s"
 
 #. TRANS: Error message text shown when a favorite could not be set because it has already been favorited.
-#: lib/command.php:298
 #, fuzzy
 msgid "Could not create favorite: already favorited."
 msgstr "Impossibile creare un preferito."
 
 #. TRANS: Text shown when a notice has been marked as favourite successfully.
-#: lib/command.php:324
 msgid "Notice marked as fave."
 msgstr "Messaggio indicato come preferito."
 
 #. TRANS: Message given having added a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:369
 #, php-format
 msgid "%1$s joined group %2$s."
 msgstr "L'utente %1$s è entrato nel gruppo %2$s."
 
 #. TRANS: Message given having removed a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:417
 #, php-format
 msgid "%1$s left group %2$s."
 msgstr "%1$s ha lasciato il gruppo %2$s."
 
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: lib/command.php:438
 #, fuzzy, php-format
 msgctxt "WHOIS"
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
 
 #. TRANS: Whois output. %s is the full name of the queried user.
-#: lib/command.php:442
 #, php-format
 msgid "Fullname: %s"
 msgstr "Nome completo: %s"
@@ -8083,7 +6677,6 @@ msgstr "Nome completo: %s"
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a location.
-#: lib/command.php:446 lib/mail.php:275
 #, php-format
 msgid "Location: %s"
 msgstr "Posizione: %s"
@@ -8091,20 +6684,17 @@ msgstr "Posizione: %s"
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a homepage.
-#: lib/command.php:450 lib/mail.php:279
 #, php-format
 msgid "Homepage: %s"
 msgstr "Pagina web: %s"
 
 #. TRANS: Whois output. %s is the bio information of the queried user.
-#: lib/command.php:454
 #, php-format
 msgid "About: %s"
 msgstr "Informazioni: %s"
 
 #. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).
 #. TRANS: %s is a remote profile.
-#: lib/command.php:483
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
@@ -8115,33 +6705,32 @@ msgstr ""
 
 #. TRANS: Message given if content is too long. %1$sd is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:500
 #, fuzzy, php-format
 msgid "Message too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
 msgstr[0] "Messaggio troppo lungo: massimo %1$d caratteri, inviati %2$d."
 msgstr[1] "Messaggio troppo lungo: massimo %1$d caratteri, inviati %2$d."
 
+#. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
+msgid "You can't send a message to this user."
+msgstr "Non puoi inviare un messaggio a questo utente."
+
 #. TRANS: Error text shown sending a direct message fails with an unknown reason.
-#: lib/command.php:528
 msgid "Error sending direct message."
 msgstr "Errore nell'inviare il messaggio diretto."
 
 #. TRANS: Message given having repeated a notice from another user.
 #. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:565
 #, php-format
 msgid "Notice from %s repeated."
 msgstr "Messaggio da %s ripetuto."
 
 #. TRANS: Error text shown when repeating a notice fails with an unknown reason.
-#: lib/command.php:568
 msgid "Error repeating notice."
 msgstr "Errore nel ripetere il messaggio."
 
 #. TRANS: Message given if content of a notice for a reply is too long. %1$d is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:603
 #, fuzzy, php-format
 msgid "Notice too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Notice too long - maximum is %1$d characters, you sent %2$d."
@@ -8150,80 +6739,66 @@ msgstr[1] "Messaggio troppo lungo: massimo %1$d caratteri, inviati %2$d."
 
 #. TRANS: Text shown having sent a reply to a notice successfully.
 #. TRANS: %s is the nickname of the user of the notice the reply was sent to.
-#: lib/command.php:616
 #, php-format
 msgid "Reply to %s sent."
 msgstr "Risposta a %s inviata."
 
 #. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
-#: lib/command.php:619
 msgid "Error saving notice."
 msgstr "Errore nel salvare il messaggio."
 
 #. TRANS: Error text shown when no username was provided when issuing a subscribe command.
-#: lib/command.php:666
 msgid "Specify the name of the user to subscribe to."
 msgstr "Specifica il nome dell'utente a cui abbonarti."
 
 #. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
-#: lib/command.php:675
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "Impossibile abbonarsi ai profili OMB attraverso un comando."
 
 #. TRANS: Text shown after having subscribed to another user successfully.
 #. TRANS: %s is the name of the user the subscription was requested for.
-#: lib/command.php:683
 #, php-format
 msgid "Subscribed to %s."
 msgstr "Abbonati a %s."
 
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.
-#: lib/command.php:704 lib/command.php:815
 msgid "Specify the name of the user to unsubscribe from."
 msgstr "Specifica il nome dell'utente da cui annullare l'abbonamento."
 
 #. TRANS: Text shown after having unsubscribed from another user successfully.
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:715
 #, php-format
 msgid "Unsubscribed from %s."
 msgstr "Abbonamento a %s annullato."
 
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
-#: lib/command.php:735 lib/command.php:761
 msgid "Command not yet implemented."
 msgstr "Comando non ancora implementato."
 
 #. TRANS: Text shown when issuing the command "off" successfully.
-#: lib/command.php:739
 msgid "Notification off."
 msgstr "Notifiche disattivate."
 
 #. TRANS: Error text shown when the command "off" fails for an unknown reason.
-#: lib/command.php:742
 msgid "Can't turn off notification."
 msgstr "Impossibile disattivare le notifiche."
 
 #. TRANS: Text shown when issuing the command "on" successfully.
-#: lib/command.php:765
 msgid "Notification on."
 msgstr "Notifiche attivate."
 
 #. TRANS: Error text shown when the command "on" fails for an unknown reason.
-#: lib/command.php:768
 msgid "Can't turn on notification."
 msgstr "Impossibile attivare le notifiche."
 
 #. TRANS: Error text shown when issuing the login command while login is disabled.
-#: lib/command.php:782
 msgid "Login command is disabled."
 msgstr "Il comando di accesso è disabilitato."
 
 #. TRANS: Text shown after issuing the login command successfully.
 #. TRANS: %s is a logon link..
-#: lib/command.php:795
 #, php-format
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
@@ -8232,20 +6807,17 @@ msgstr ""
 
 #. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:824
 #, php-format
 msgid "Unsubscribed %s."
 msgstr "Abbonamento di %s annullato."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
-#: lib/command.php:842
 msgid "You are not subscribed to anyone."
 msgstr "Il tuo abbonamento è stato annullato."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
-#: lib/command.php:847
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Persona di cui hai già un abbonamento:"
@@ -8253,14 +6825,12 @@ msgstr[1] "Persone di cui hai già un abbonamento:"
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user
 #. TRANS: (followers) without having any subscribers.
-#: lib/command.php:869
 msgid "No one is subscribed to you."
 msgstr "Nessuno è abbonato ai tuoi messaggi."
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
-#: lib/command.php:874
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Questa persona è abbonata ai tuoi messaggi:"
@@ -8268,21 +6838,18 @@ msgstr[1] "Queste persone sono abbonate ai tuoi messaggi:"
 
 #. TRANS: Text shown after requesting groups a user is subscribed to without having
 #. TRANS: any group subscriptions.
-#: lib/command.php:896
 msgid "You are not a member of any groups."
 msgstr "Non fai parte di alcun gruppo."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
-#: lib/command.php:901
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "Non fai parte di questo gruppo:"
 msgstr[1] "Non fai parte di questi gruppi:"
 
 #. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-#: lib/command.php:916
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -8365,20 +6932,17 @@ msgstr ""
 "tracking - non ancora implementato\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:36
 #, fuzzy
 msgid "No configuration file found."
 msgstr "Non è stato trovato alcun file di configurazione. "
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:39
 #, fuzzy
 msgid "I looked for configuration files in the following places:"
 msgstr "I file di configurazione sono stati cercati in questi posti: "
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:42
 msgid "You may wish to run the installer to fix this."
 msgstr ""
 "Potrebbe essere necessario lanciare il programma d'installazione per "
@@ -8386,52 +6950,42 @@ msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:46
 msgid "Go to the installer."
 msgstr "Vai al programma d'installazione."
 
-#: lib/dberroraction.php:59
 msgid "Database error"
 msgstr "Errore del database"
 
 #. TRANS: Description of form for deleting a user.
-#: lib/deleteuserform.php:75
 msgid "Delete this user"
 msgstr "Elimina questo utente"
 
-#: lib/designform.php:114
 #, fuzzy
 msgid "Change design"
 msgstr "Salva aspetto"
 
 #. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: lib/designform.php:131
 msgid "Change colours"
 msgstr "Modifica colori"
 
 #. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: lib/designform.php:138
 msgid "Use defaults"
 msgstr "Usa predefiniti"
 
 #. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: lib/designform.php:140
 msgid "Restore default designs"
 msgstr "Ripristina i valori predefiniti"
 
 #. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: lib/designform.php:148
 msgid "Reset back to default"
 msgstr "Reimposta i valori predefiniti"
 
 #. TRANS: Label in form on profile design page.
 #. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
-#: lib/designform.php:158
 msgid "Upload file"
 msgstr "Carica file"
 
 #. TRANS: Instructions for form on profile design page.
-#: lib/designform.php:163
 #, fuzzy
 msgid ""
 "You can upload your personal background image. The maximum file size is 2Mb."
@@ -8440,49 +6994,41 @@ msgstr ""
 "2MB."
 
 #. TRANS: Radio button on profile design page that will enable use of the uploaded profile image.
-#: lib/designform.php:194
 #, fuzzy
 msgctxt "RADIO"
 msgid "On"
 msgstr "On"
 
 #. TRANS: Radio button on profile design page that will disable use of the uploaded profile image.
-#: lib/designform.php:211
 #, fuzzy
 msgctxt "RADIO"
 msgid "Off"
 msgstr "Off"
 
 #. TRANS: Title for button on profile design page to save settings.
-#: lib/designform.php:322
 msgid "Save design"
 msgstr "Salva aspetto"
 
 #. TRANS: Error message displayed if design settings could not be saved.
 #. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
-#: lib/designsettings.php:216 lib/designsettings.php:238
 msgid "Couldn't update your design."
 msgstr "Impossibile aggiornare l'aspetto."
 
 #. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
-#: lib/designsettings.php:244
 msgid "Design defaults restored."
 msgstr "Valori predefiniti ripristinati."
 
 #. TRANS: Exception. %s is an ID.
-#: lib/discovery.php:153
 #, fuzzy, php-format
 msgid "Unable to find services for %s."
 msgstr "Impossibile revocare l'accesso per l'applicazione: %s."
 
 #. TRANS: Form legend for removing the favourite status for a favourite notice.
 #. TRANS: Title for button text for removing the favourite status for a favourite notice.
-#: lib/disfavorform.php:108 lib/disfavorform.php:140
 msgid "Disfavor this notice"
 msgstr "Togli questo messaggio dai preferiti"
 
 #. TRANS: Button text for removing the favourite status for a favourite notice.
-#: lib/disfavorform.php:136
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Disfavor favorite"
@@ -8490,104 +7036,82 @@ msgstr "Rimuovi preferito"
 
 #. TRANS: Form legend for adding the favourite status to a notice.
 #. TRANS: Title for button text for adding the favourite status to a notice.
-#: lib/favorform.php:108 lib/favorform.php:139
 msgid "Favor this notice"
 msgstr "Rendi questo messaggio un preferito"
 
 #. TRANS: Button text for adding the favourite status to a notice.
-#: lib/favorform.php:135
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Favor"
 msgstr "Preferisci"
 
-#: lib/feed.php:84
 msgid "RSS 1.0"
 msgstr "RSS 1.0"
 
-#: lib/feed.php:86
 msgid "RSS 2.0"
 msgstr "RSS 2.0"
 
-#: lib/feed.php:88
 msgid "Atom"
 msgstr "Atom"
 
-#: lib/feed.php:90
 msgid "FOAF"
 msgstr "FOAF"
 
-#: lib/feedimporter.php:75
 #, fuzzy
 msgid "Not an atom feed."
 msgstr "Tutti i membri"
 
-#: lib/feedimporter.php:82
 msgid "No author in the feed."
 msgstr ""
 
-#: lib/feedimporter.php:89
 msgid "Can't import without a user."
 msgstr ""
 
 #. TRANS: Header for feed links (h2).
-#: lib/feedlist.php:66
 msgid "Feeds"
 msgstr "Feed"
 
-#: lib/galleryaction.php:128
 msgid "All"
 msgstr "Tutto"
 
-#: lib/galleryaction.php:136
 msgid "Select tag to filter"
 msgstr "Seleziona un'etichetta da filtrare"
 
-#: lib/galleryaction.php:137
 msgid "Tag"
 msgstr "Etichetta"
 
-#: lib/galleryaction.php:138
 msgid "Choose a tag to narrow list"
 msgstr "Scegli un'etichetta per ridurre l'elenco"
 
-#: lib/galleryaction.php:140
 msgid "Go"
 msgstr "Vai"
 
-#: lib/grantroleform.php:91
 #, php-format
 msgid "Grant this user the \"%s\" role"
 msgstr "Concedi a questo utente il ruolo \"%s\""
 
-#: lib/groupeditform.php:147
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr ""
 "1-64 lettere minuscole o numeri, senza spazi o simboli di punteggiatura"
 
-#: lib/groupeditform.php:156
 #, fuzzy
 msgid "URL of the homepage or blog of the group or topic."
 msgstr "URL della pagina web, blog del gruppo o l'argomento"
 
-#: lib/groupeditform.php:161
 msgid "Describe the group or topic"
 msgstr "Descrivi il gruppo o l'argomento"
 
-#: lib/groupeditform.php:163
 #, fuzzy, php-format
 msgid "Describe the group or topic in %d character or less"
 msgid_plural "Describe the group or topic in %d characters or less"
 msgstr[0] "Descrivi il gruppo o l'argomento in %d caratteri"
 msgstr[1] "Descrivi il gruppo o l'argomento in %d caratteri"
 
-#: lib/groupeditform.php:175
 #, fuzzy
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\"."
 msgstr "Dove è situato il gruppo, tipo \"città, regione, stato\""
 
-#: lib/groupeditform.php:183
 #, fuzzy, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -8601,70 +7125,60 @@ msgstr[1] ""
 "Soprannomi aggiuntivi per il gruppo, separati da virgole o spazi, max %d"
 
 #. TRANS: Menu item in the group navigation page.
-#: lib/groupnav.php:86
 msgctxt "MENU"
 msgid "Group"
 msgstr "Gruppo"
 
 #. TRANS: Tooltip for menu item in the group navigation page.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:89
 #, php-format
 msgctxt "TOOLTIP"
 msgid "%s group"
 msgstr "Gruppo %s"
 
 #. TRANS: Menu item in the group navigation page.
-#: lib/groupnav.php:95
 msgctxt "MENU"
 msgid "Members"
 msgstr "Membri"
 
 #. TRANS: Tooltip for menu item in the group navigation page.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:98
 #, php-format
 msgctxt "TOOLTIP"
 msgid "%s group members"
 msgstr "Membri del gruppo %s"
 
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/groupnav.php:108
 msgctxt "MENU"
 msgid "Blocked"
 msgstr "Bloccato"
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:111
 #, php-format
 msgctxt "TOOLTIP"
 msgid "%s blocked users"
 msgstr "Utenti bloccati di %s"
 
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "Amministra"
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:120
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Edit %s group properties"
 msgstr "Modifica proprietà di %s"
 
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/groupnav.php:126
 msgctxt "MENU"
 msgid "Logo"
 msgstr "Logo"
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:129
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Add or edit %s logo"
@@ -8672,69 +7186,57 @@ msgstr "Aggiungi o modifica il logo di %s"
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:138
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Add or edit %s design"
 msgstr "Aggiungi o modifica l'aspetto di %s"
 
 #. TRANS: Title for groups with the most members section.
-#: lib/groupsbymemberssection.php:71
 msgid "Groups with most members"
 msgstr "I gruppi più numerosi"
 
 #. TRANS: Title for groups with the most posts section.
-#: lib/groupsbypostssection.php:71
 msgid "Groups with most posts"
 msgstr "I gruppi con più messaggi"
 
 #. TRANS: Title for group tag cloud section.
 #. TRANS: %s is a group name.
-#: lib/grouptagcloudsection.php:57
 #, php-format
 msgid "Tags in %s group's notices"
 msgstr "Etichette nei messaggi del gruppo %s"
 
 #. TRANS: Client exception 406
-#: lib/htmloutputter.php:104
 msgid "This page is not available in a media type you accept"
 msgstr "Questa pagina non è disponibile in un tipo di supporto che tu accetti"
 
 #. TRANS: Exception thrown when trying to upload an unsupported image file format.
-#: lib/imagefile.php:73
 msgid "Unsupported image file format."
 msgstr "Formato file immagine non supportato."
 
 #. TRANS: Exception thrown when too large a file is uploaded.
 #. TRANS: %s is the maximum file size, for example "500b", "10kB" or "2MB".
-#: lib/imagefile.php:91
 #, php-format
 msgid "That file is too big. The maximum file size is %s."
 msgstr "Quel file è troppo grande. La dimensione massima è %s."
 
 #. TRANS: Exception thrown when uploading an image and that action could not be completed.
-#: lib/imagefile.php:97
 msgid "Partial upload."
 msgstr "Caricamento parziale."
 
 #. TRANS: Exception thrown when uploading a file as image that is not an image or is a corrupt file.
-#: lib/imagefile.php:115
 msgid "Not an image or corrupt file."
 msgstr "Non è un'immagine o il file è danneggiato."
 
 #. TRANS: Exception thrown during resize when image has been registered as present, but is no longer there.
-#: lib/imagefile.php:178
 msgid "Lost our file."
 msgstr "Perso il nostro file."
 
 #. TRANS: Exception thrown when trying to resize an unknown file type.
 #. TRANS: Exception thrown when trying resize an unknown file type.
-#: lib/imagefile.php:216 lib/imagefile.php:257
 msgid "Unknown file type"
 msgstr "Tipo di file sconosciuto"
 
 #. TRANS: Number of megabytes. %d is the number.
-#: lib/imagefile.php:303
 #, fuzzy, php-format
 msgid "%dMB"
 msgid_plural "%dMB"
@@ -8742,7 +7244,6 @@ msgstr[0] "MB"
 msgstr[1] "MB"
 
 #. TRANS: Number of kilobytes. %d is the number.
-#: lib/imagefile.php:307
 #, fuzzy, php-format
 msgid "%dkB"
 msgid_plural "%dkB"
@@ -8750,14 +7251,12 @@ msgstr[0] "kB"
 msgstr[1] "kB"
 
 #. TRANS: Number of bytes. %d is the number.
-#: lib/imagefile.php:310
 #, php-format
 msgid "%dB"
 msgid_plural "%dB"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/implugin.php:262
 #, php-format
 msgid ""
 "User \"%s\" on %s has said that your %s screenname belongs to them. If "
@@ -8767,51 +7266,42 @@ msgid ""
 "message."
 msgstr ""
 
-#: lib/implugin.php:349
 #, php-format
 msgid "Unknown inbox source %d."
 msgstr "Sorgente casella in arrivo %d sconosciuta."
 
-#: lib/implugin.php:485
-#, fuzzy, php-format
+#, php-format
 msgid "Message too long - maximum is %1$d characters, you sent %2$d."
 msgstr "Messaggio troppo lungo: massimo %1$d caratteri, inviati %2$d."
 
-#: lib/leaveform.php:114
 msgid "Leave"
 msgstr "Lascia"
 
 #. TRANS: Menu item for logging in to the StatusNet site.
-#: lib/logingroupnav.php:77
 msgctxt "MENU"
 msgid "Login"
 msgstr "Accedi"
 
 #. TRANS: Title for menu item for logging in to the StatusNet site.
-#: lib/logingroupnav.php:79
 msgid "Login with a username and password"
 msgstr "Accedi con nome utente e password"
 
 #. TRANS: Menu item for registering with the StatusNet site.
-#: lib/logingroupnav.php:85
 msgctxt "MENU"
 msgid "Register"
 msgstr "Registrati"
 
 #. TRANS: Title for menu item for registering with the StatusNet site.
-#: lib/logingroupnav.php:87
 msgid "Sign up for a new account"
 msgstr "Iscriviti per un nuovo account"
 
 #. TRANS: Subject for address confirmation email.
-#: lib/mail.php:172
 msgid "Email address confirmation"
 msgstr "Conferma indirizzo email"
 
 #. TRANS: Body for address confirmation email.
 #. TRANS: %1$s is the addressed user's nickname, %2$s is the StatusNet sitename,
 #. TRANS: %3$s is the URL to confirm at.
-#: lib/mail.php:177
 #, fuzzy, php-format
 msgid ""
 "Hey, %1$s.\n"
@@ -8843,14 +7333,12 @@ msgstr ""
 
 #. TRANS: Subject of new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
-#: lib/mail.php:243
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1$s sta ora seguendo i tuoi messaggi su %2$s."
 
 #. TRANS: This is a paragraph in a new-subscriber e-mail.
 #. TRANS: %s is a URL where the subscriber can be reported as abusive.
-#: lib/mail.php:250
 #, php-format
 msgid ""
 "If you believe this account is being used abusively, you can block them from "
@@ -8865,7 +7353,6 @@ msgstr ""
 #. TRANS: %3$s is the subscriber's profile URL, %4$s is the subscriber's location (or empty)
 #. TRANS: %5$s is the subscriber's homepage URL (or empty), %6%s is the subscriber's bio (or empty)
 #. TRANS: %7$s is a link to the addressed user's e-mail settings.
-#: lib/mail.php:260
 #, fuzzy, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -8892,14 +7379,12 @@ msgstr ""
 
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is biographical information.
-#: lib/mail.php:283
 #, php-format
 msgid "Bio: %s"
 msgstr "Biografia: %s"
 
 #. TRANS: Subject of notification mail for new posting email address.
 #. TRANS: %s is the StatusNet sitename.
-#: lib/mail.php:312
 #, php-format
 msgid "New email address for posting to %s"
 msgstr "Nuovo indirizzo email per inviare messaggi a %s"
@@ -8907,7 +7392,6 @@ msgstr "Nuovo indirizzo email per inviare messaggi a %s"
 #. TRANS: Body of notification mail for new posting email address.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is the e-mail address to send
 #. TRANS: to to post by e-mail, %3$s is a URL to more instructions.
-#: lib/mail.php:318
 #, fuzzy, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -8930,19 +7414,16 @@ msgstr ""
 
 #. TRANS: Subject line for SMS-by-email notification messages.
 #. TRANS: %s is the posting user's nickname.
-#: lib/mail.php:439
 #, php-format
 msgid "%s status"
 msgstr "stato di %s"
 
 #. TRANS: Subject line for SMS-by-email address confirmation message.
-#: lib/mail.php:465
 msgid "SMS confirmation"
 msgstr "Conferma SMS"
 
 #. TRANS: Main body heading for SMS-by-email address confirmation message.
 #. TRANS: %s is the addressed user's nickname.
-#: lib/mail.php:469
 #, php-format
 msgid "%s: confirm you own this phone number with this code:"
 msgstr ""
@@ -8950,7 +7431,6 @@ msgstr ""
 
 #. TRANS: Subject for 'nudge' notification email.
 #. TRANS: %s is the nudging user.
-#: lib/mail.php:490
 #, fuzzy, php-format
 msgid "You have been nudged by %s"
 msgstr "%s ti ha richiamato"
@@ -8958,7 +7438,6 @@ msgstr "%s ti ha richiamato"
 #. TRANS: Body for 'nudge' notification email.
 #. TRANS: %1$s is the nuding user's long name, $2$s is the nudging user's nickname,
 #. TRANS: %3$s is a URL to post notices at, %4$s is the StatusNet sitename.
-#: lib/mail.php:497
 #, php-format
 msgid ""
 "%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -8987,7 +7466,6 @@ msgstr ""
 
 #. TRANS: Subject for direct-message notification email.
 #. TRANS: %s is the sending user's nickname.
-#: lib/mail.php:544
 #, php-format
 msgid "New private message from %s"
 msgstr "Nuovo messaggio privato da %s"
@@ -8996,7 +7474,6 @@ msgstr "Nuovo messaggio privato da %s"
 #. TRANS: %1$s is the sending user's long name, %2$s is the sending user's nickname,
 #. TRANS: %3$s is the message content, %4$s a URL to the message,
 #. TRANS: %5$s is the StatusNet sitename.
-#: lib/mail.php:552
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -9031,7 +7508,6 @@ msgstr ""
 
 #. TRANS: Subject for favorite notification e-mail.
 #. TRANS: %1$s is the adding user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:604
 #, fuzzy, php-format
 msgid "%1$s (@%2$s) added your notice as a favorite"
 msgstr "%s (@%s) ha aggiunto il tuo messaggio tra i suoi preferiti"
@@ -9041,7 +7517,6 @@ msgstr "%s (@%s) ha aggiunto il tuo messaggio tra i suoi preferiti"
 #. TRANS: %3$s is a URL to the faved notice, %4$s is the faved notice text,
 #. TRANS: %5$s is a URL to all faves of the adding user, %6$s is the StatusNet sitename,
 #. TRANS: %7$s is the adding user's nickname.
-#: lib/mail.php:611
 #, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -9080,7 +7555,6 @@ msgstr ""
 "%6$s\n"
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:669
 #, php-format
 msgid ""
 "The full conversation can be read here:\n"
@@ -9093,7 +7567,6 @@ msgstr ""
 
 #. TRANS: E-mail subject for notice notification.
 #. TRANS: %1$s is the sending user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:677
 #, fuzzy, php-format
 msgid "%1$s (@%2$s) sent a notice to your attention"
 msgstr "%s (@%s) ti ha inviato un messaggio"
@@ -9104,7 +7577,6 @@ msgstr "%s (@%s) ti ha inviato un messaggio"
 #. TRANS: %5$s is a URL to the full conversion if it exists (otherwise empty),
 #. TRANS: %6$s is a URL to reply to the notice, %7$s is a URL to all @-replied for the addressed user,
 #. TRANS: %8$s is a URL to the addressed user's e-mail settings, %9$s is the sender's nickname.
-#: lib/mail.php:685
 #, php-format
 msgid ""
 "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -9154,11 +7626,9 @@ msgstr ""
 "\n"
 "P.S: puoi disabilitare le notifiche via email qui: %8$s\n"
 
-#: lib/mailbox.php:87
 msgid "Only the user can read their own mailboxes."
 msgstr "Solo l'utente può leggere la propria casella di posta."
 
-#: lib/mailbox.php:125
 msgid ""
 "You have no private messages. You can send private message to engage other "
 "users in conversation. People can send you messages for your eyes only."
@@ -9167,54 +7637,44 @@ msgstr ""
 "iniziare una conversazione con altri utenti. Altre persone possono mandare "
 "messaggi riservati solamente a te."
 
-#: lib/mailhandler.php:37
 msgid "Could not parse message."
 msgstr "Impossibile analizzare il messaggio."
 
-#: lib/mailhandler.php:42
 msgid "Not a registered user."
 msgstr "Non è un utente registrato."
 
-#: lib/mailhandler.php:46
 msgid "Sorry, that is not your incoming email address."
 msgstr "Quella non è la tua email di ricezione."
 
-#: lib/mailhandler.php:50
 msgid "Sorry, no incoming email allowed."
 msgstr "Email di ricezione non consentita."
 
-#: lib/mailhandler.php:229
 #, php-format
 msgid "Unsupported message type: %s"
 msgstr "Tipo di messaggio non supportato: %s"
 
 #. TRANS: Client exception thrown when a database error was thrown during a file upload operation.
-#: lib/mediafile.php:102 lib/mediafile.php:174
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
 "Si è verificato un errore nel database nel salvare il file. Prova di nuovo."
 
 #. TRANS: Client exception thrown when a file upload operation would cause a user to exceed a set quota.
-#: lib/mediafile.php:238 lib/mediafile.php:281
 msgid "File exceeds user's quota."
 msgstr "Il file supera la quota dell'utente."
 
 #. TRANS: Client exception thrown when a file upload operation fails because the file could
 #. TRANS: not be moved from the temporary folder to the permanent file location.
-#: lib/mediafile.php:258 lib/mediafile.php:300
 msgid "File could not be moved to destination directory."
 msgstr "Impossibile spostare il file nella directory di destinazione."
 
 #. TRANS: Client exception thrown when a file upload operation has been stopped because the MIME
 #. TRANS: type of the uploaded file could not be determined.
-#: lib/mediafile.php:265 lib/mediafile.php:306
 msgid "Could not determine file's MIME type."
 msgstr "Impossibile determinare il tipo MIME del file."
 
 #. TRANS: Client exception thrown trying to upload a forbidden MIME type.
 #. TRANS: %1$s is the file type that was denied, %2$s is the application part of
 #. TRANS: the MIME type that was denied.
-#: lib/mediafile.php:396
 #, php-format
 msgid ""
 "\"%1$s\" is not a supported file type on this server. Try using another %2$s "
@@ -9225,84 +7685,75 @@ msgstr ""
 
 #. TRANS: Client exception thrown trying to upload a forbidden MIME type.
 #. TRANS: %s is the file type that was denied.
-#: lib/mediafile.php:401
 #, php-format
 msgid "\"%s\" is not a supported file type on this server."
 msgstr "\"%s\" non è un tipo di file supportata su questo server."
 
-#: lib/messageform.php:120
 msgid "Send a direct notice"
 msgstr "Invia un messaggio diretto"
 
 #. TRANS Label entry in drop-down selection box in direct-message inbox/outbox. This is the default entry in the drop-down box, doubling as instructions and a brake against accidental submissions with the first user in the list.
-#: lib/messageform.php:137
 #, fuzzy
 msgid "Select recipient:"
 msgstr "Seleziona licenza"
 
 #. TRANS Entry in drop-down selection box in direct-message inbox/outbox when no one is available to message.
-#: lib/messageform.php:150
 #, fuzzy
 msgid "No mutual subscribers."
 msgstr "Non hai l'abbonamento!"
 
-#: lib/messageform.php:153
 msgid "To"
 msgstr "A"
 
-#: lib/messageform.php:184 lib/noticeform.php:236
 msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr "Invia"
 
-#: lib/messagelist.php:77
 #, fuzzy
 msgid "Messages"
 msgstr "Messaggio"
 
-#: lib/messagelistitem.php:123 lib/noticelist.php:527
 msgid "from"
 msgstr "via"
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:178
 msgid "Nickname cannot be empty."
 msgstr ""
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:191
 #, php-format
 msgid "Nickname cannot be more than %d character long."
 msgid_plural "Nickname cannot be more than %d characters long."
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/noticeform.php:160
+#. TRANS: Form legend for notice form.
 msgid "Send a notice"
 msgstr "Invia un messaggio"
 
-#: lib/noticeform.php:174
+#. TRANS: Title for notice label. %s is the user's nickname.
 #, php-format
 msgid "What's up, %s?"
 msgstr "Cosa succede, %s?"
 
-#: lib/noticeform.php:193
+#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr "Allega"
 
-#: lib/noticeform.php:197
-msgid "Attach a file"
+#. TRANS: Title for input field to attach a file to a notice.
+#, fuzzy
+msgid "Attach a file."
 msgstr "Allega un file"
 
-#: lib/noticeform.php:212
+#. TRANS: Field label to add location to a notice.
 msgid "Share my location"
 msgstr "Condividi la mia posizione"
 
-#: lib/noticeform.php:215
+#. TRANS: Text to not share location for a notice in notice form.
 msgid "Do not share my location"
 msgstr "Non condividere la mia posizione"
 
-#: lib/noticeform.php:216
+#. TRANS: Timeout error text for location retrieval in notice form.
 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
 "try again later"
@@ -9311,419 +7762,318 @@ msgstr ""
 "previsto. Riprova più tardi."
 
 #. TRANS: Used in coordinates as abbreviation of north
-#: lib/noticelist.php:457
 msgid "N"
 msgstr "N"
 
 #. TRANS: Used in coordinates as abbreviation of south
-#: lib/noticelist.php:459
 msgid "S"
 msgstr "S"
 
 #. TRANS: Used in coordinates as abbreviation of east
-#: lib/noticelist.php:461
 msgid "E"
 msgstr "E"
 
 #. TRANS: Used in coordinates as abbreviation of west
-#: lib/noticelist.php:463
 msgid "W"
 msgstr "O"
 
-#: lib/noticelist.php:465
 #, php-format
 msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 
-#: lib/noticelist.php:474
 msgid "at"
 msgstr "presso"
 
-#: lib/noticelist.php:523
 msgid "web"
 msgstr "web"
 
-#: lib/noticelist.php:589
 msgid "in context"
 msgstr "in una discussione"
 
-#: lib/noticelist.php:624
 msgid "Repeated by"
 msgstr "Ripetuto da"
 
-#: lib/noticelist.php:651
 msgid "Reply to this notice"
 msgstr "Rispondi a questo messaggio"
 
-#: lib/noticelist.php:652
 msgid "Reply"
 msgstr "Rispondi"
 
-#: lib/noticelist.php:678
 msgid "Delete this notice"
 msgstr "Elimina questo messaggio"
 
-#: lib/noticelist.php:696
 msgid "Notice repeated"
 msgstr "Messaggio ripetuto"
 
-#: lib/nudgeform.php:116
 msgid "Nudge this user"
 msgstr "Richiama questo utente"
 
-#: lib/nudgeform.php:128
 msgid "Nudge"
 msgstr "Richiama"
 
-#: lib/nudgeform.php:128
 msgid "Send a nudge to this user"
 msgstr "Invia un richiamo a questo utente"
 
-#: lib/oauthstore.php:294
 msgid "Error inserting new profile."
 msgstr "Errore nell'inserire il nuovo profilo."
 
-#: lib/oauthstore.php:302
 msgid "Error inserting avatar."
 msgstr "Errore nell'inserire l'immagine."
 
-#: lib/oauthstore.php:322
 msgid "Error inserting remote profile."
 msgstr "Errore nell'inserire il profilo remoto."
 
 #. TRANS: Exception thrown when a notice is denied because it has been sent before.
-#: lib/oauthstore.php:362
 msgid "Duplicate notice."
 msgstr "Messaggio duplicato."
 
-#: lib/oauthstore.php:507
 msgid "Couldn't insert new subscription."
 msgstr "Impossibile inserire un nuovo abbonamento."
 
-#: lib/personalgroupnav.php:104
-#, fuzzy
 msgid "Replies"
 msgstr "Risposte"
 
-#: lib/personalgroupnav.php:109
-#, fuzzy
 msgid "Favorites"
 msgstr "Preferiti"
 
-#: lib/personalgroupnav.php:120
-#, fuzzy
 msgid "Inbox"
 msgstr "In arrivo"
 
-#: lib/personalgroupnav.php:121
 msgid "Your incoming messages"
 msgstr "I tuoi messaggi in arrivo"
 
-#: lib/personalgroupnav.php:125
-#, fuzzy
 msgid "Outbox"
 msgstr "Inviati"
 
-#: lib/personalgroupnav.php:126
 msgid "Your sent messages"
 msgstr "I tuoi messaggi inviati"
 
 #. TRANS: Title for personal tag cloud section. %s is a user nickname.
-#: lib/personaltagcloudsection.php:56
 #, php-format
 msgid "Tags in %s's notices"
 msgstr "Etichette nei messaggi di %s"
 
 #. TRANS: Displayed as version information for a plugin if no version information was found.
-#: lib/plugin.php:126
 msgid "Unknown"
 msgstr "Sconosciuto"
 
 #. TRANS: Plugin admin panel controls
-#: lib/plugindisableform.php:90
 msgctxt "plugin"
 msgid "Disable"
 msgstr ""
 
 #. TRANS: Plugin admin panel controls
-#: lib/pluginenableform.php:112
 msgctxt "plugin"
 msgid "Enable"
 msgstr ""
 
-#: lib/pluginlist.php:196
 msgctxt "plugin-description"
 msgid "(Plugin descriptions unavailable when disabled.)"
 msgstr ""
 
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:88
 msgid "Subscriptions"
 msgstr "Abbonamenti"
 
 #. TRANS: Text for user subscription statistics if user has more subscriptions than displayed.
-#: lib/profileaction.php:144
 msgid "All subscriptions"
 msgstr "Tutti gli abbonamenti"
 
 #. TRANS: H2 text for user subscriber statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:96
 msgid "Subscribers"
 msgstr "Abbonati"
 
 #. TRANS: Text for user subscription statistics if user has more subscribers than displayed.
-#: lib/profileaction.php:181
 msgid "All subscribers"
 msgstr "Tutti gli abbonati"
 
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:213
 msgid "User ID"
 msgstr "ID utente"
 
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:219
 msgid "Member since"
 msgstr "Membro dal"
 
 #. TRANS: Label for user statistics.
 #. TRANS: H2 text for user group membership statistics.
-#: lib/profileaction.php:239 lib/profileaction.php:290
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:104
 msgid "Groups"
 msgstr "Gruppi"
 
 #. TRANS: Label for user statistics.
 #. TRANS: Average count of posts made per day since account registration.
-#: lib/profileaction.php:253
 msgid "Daily average"
 msgstr "Media giornaliera"
 
 #. TRANS: Text for user group membership statistics if user has more subscriptions than displayed.
-#: lib/profileaction.php:305
 msgid "All groups"
 msgstr "Tutti i gruppi"
 
 #. TRANS: Server error displayed when using an unimplemented method.
-#: lib/profileformaction.php:123
 msgid "Unimplemented method."
 msgstr "Metodo non implementato"
 
-#: lib/publicgroupnav.php:82
 msgid "User groups"
 msgstr "Gruppi dell'utente"
 
-#: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
 msgid "Recent tags"
 msgstr "Etichette recenti"
 
-#: lib/publicgroupnav.php:88
 msgid "Featured"
 msgstr "In evidenza"
 
-#: lib/publicgroupnav.php:92
 msgid "Popular"
 msgstr "Famosi"
 
-#: lib/redirectingaction.php:95
 msgid "No return-to arguments."
 msgstr "Nessun argomento return-to."
 
-#: lib/repeatform.php:107
 msgid "Repeat this notice?"
 msgstr "Ripetere questo messaggio?"
 
-#: lib/repeatform.php:132
 msgid "Yes"
 msgstr "Sì"
 
-#: lib/repeatform.php:132
 msgid "Repeat this notice"
 msgstr "Ripeti questo messaggio"
 
-#: lib/revokeroleform.php:91
 #, php-format
 msgid "Revoke the \"%s\" role from this user"
 msgstr "Revoca il ruolo \"%s\" a questo utente"
 
 #. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:1001
 #, fuzzy
 msgid "Page not found."
 msgstr "Metodo delle API non trovato."
 
-#: lib/sandboxform.php:67
 msgid "Sandbox"
 msgstr "Sandbox"
 
-#: lib/sandboxform.php:78
 msgid "Sandbox this user"
 msgstr "Metti questo utente nella \"sandbox\""
 
 #. TRANS: Fieldset legend for the search form.
-#: lib/searchaction.php:120
 msgid "Search site"
 msgstr "Cerca nel sito"
 
 #. TRANS: Used as a field label for the field where one or more keywords
 #. TRANS: for searching can be entered.
-#: lib/searchaction.php:128
 msgid "Keyword(s)"
 msgstr "Parole"
 
 #. TRANS: Button text for searching site.
-#: lib/searchaction.php:130
 msgctxt "BUTTON"
 msgid "Search"
 msgstr "Cerca"
 
-#: lib/searchgroupnav.php:80
 msgid "People"
 msgstr "Persone"
 
-#: lib/searchgroupnav.php:81
 msgid "Find people on this site"
 msgstr "Trova persone in questo sito"
 
-#: lib/searchgroupnav.php:83
 msgid "Find content of notices"
 msgstr "Trova contenuto dei messaggi"
 
-#: lib/searchgroupnav.php:85
 msgid "Find groups on this site"
 msgstr "Trova gruppi in questo sito"
 
-#: lib/section.php:89
 msgid "Untitled section"
 msgstr "Sezione senza nome"
 
-#: lib/section.php:106
 msgid "More..."
 msgstr "Altro..."
 
-#: lib/settingsnav.php:78
 msgid "Change your profile settings"
 msgstr "Modifica le impostazioni del tuo profilo"
 
-#: lib/settingsnav.php:83
 msgid "Upload an avatar"
 msgstr "Carica un'immagine"
 
-#: lib/settingsnav.php:88
 msgid "Change your password"
 msgstr "Modifica la tua password"
 
-#: lib/settingsnav.php:93
 msgid "Change email handling"
 msgstr "Modifica la gestione dell'email"
 
-#: lib/settingsnav.php:98
 msgid "Design your profile"
 msgstr "Progetta il tuo profilo"
 
-#: lib/settingsnav.php:102
 msgid "URL"
 msgstr "URL"
 
-#: lib/settingsnav.php:103
 msgid "URL shorteners"
 msgstr ""
 
-#: lib/settingsnav.php:111
 msgid "Updates by instant messenger (IM)"
 msgstr "Messaggi via messaggistica istantanea (MI)"
 
-#: lib/settingsnav.php:118
 msgid "Updates by SMS"
 msgstr "Messaggi via SMS"
 
-#: lib/settingsnav.php:123
-#, fuzzy
 msgid "Connections"
 msgstr "Connessioni"
 
-#: lib/settingsnav.php:124
 msgid "Authorized connected applications"
 msgstr "Applicazioni collegate autorizzate"
 
-#: lib/silenceform.php:67
 msgid "Silence"
 msgstr "Zittisci"
 
-#: lib/silenceform.php:78
 msgid "Silence this user"
 msgstr "Zittisci questo utente"
 
-#: lib/subgroupnav.php:89
 #, php-format
 msgid "People %s subscribes to"
 msgstr "Persone di cui %s ha un abbonamento"
 
-#: lib/subgroupnav.php:97
 #, php-format
 msgid "People subscribed to %s"
 msgstr "Persone abbonate a %s"
 
-#: lib/subgroupnav.php:105
 #, php-format
 msgid "Groups %s is a member of"
 msgstr "Gruppi di cui %s fa parte"
 
-#: lib/subgroupnav.php:111
 msgid "Invite"
 msgstr "Invita"
 
-#: lib/subgroupnav.php:112
 #, php-format
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Invita amici e colleghi a seguirti su %s"
 
-#: lib/subscribeform.php:115 lib/subscribeform.php:139
 msgid "Subscribe to this user"
 msgstr "Abbonati a questo utente"
 
-#: lib/subscriberspeopleselftagcloudsection.php:48
-#: lib/subscriptionspeopleselftagcloudsection.php:48
 msgid "People Tagcloud as self-tagged"
 msgstr "Insieme delle etichette delle persone come auto-etichettate"
 
-#: lib/subscriberspeopletagcloudsection.php:48
-#: lib/subscriptionspeopletagcloudsection.php:48
 msgid "People Tagcloud as tagged"
 msgstr "Insieme delle etichette delle persone come etichettate"
 
-#: lib/tagcloudsection.php:56
 msgid "None"
 msgstr "Nessuno"
 
 #. TRANS: Server exception displayed if a theme name was invalid.
-#: lib/theme.php:74
 #, fuzzy
 msgid "Invalid theme name."
 msgstr "Nome file non valido."
 
-#: lib/themeuploader.php:50
 msgid "This server cannot handle theme uploads without ZIP support."
 msgstr ""
 "Questo server non è in grado di gestire caricamenti senza il supporto ZIP."
 
-#: lib/themeuploader.php:58 lib/themeuploader.php:61
 msgid "The theme file is missing or the upload failed."
 msgstr "Manca il file del tema o il caricamento non è riuscito."
 
-#: lib/themeuploader.php:91 lib/themeuploader.php:102
-#: lib/themeuploader.php:279 lib/themeuploader.php:283
-#: lib/themeuploader.php:291 lib/themeuploader.php:298
 msgid "Failed saving theme."
 msgstr "Salvataggio del tema non riuscito."
 
-#: lib/themeuploader.php:147
 msgid "Invalid theme: bad directory structure."
 msgstr "Tema non valido: struttura directory non corretta."
 
-#: lib/themeuploader.php:166
 #, fuzzy, php-format
 msgid "Uploaded theme is too large; must be less than %d byte uncompressed."
 msgid_plural ""
@@ -9733,11 +8083,9 @@ msgstr[0] ""
 msgstr[1] ""
 "Il tema caricato è troppo grande, deve essere meno di %d byte non compresso."
 
-#: lib/themeuploader.php:179
 msgid "Invalid theme archive: missing file css/display.css"
 msgstr "File di tema non valido: manca il file css/display.css"
 
-#: lib/themeuploader.php:219
 msgid ""
 "Theme contains invalid file or folder name. Stick with ASCII letters, "
 "digits, underscore, and minus sign."
@@ -9745,143 +8093,115 @@ msgstr ""
 "Il tema contiene file non o nomi di cartelle non validi. Utilizzare "
 "solamente caratteri ASCII, numeri, il trattino basso e il segno meno."
 
-#: lib/themeuploader.php:225
 msgid "Theme contains unsafe file extension names; may be unsafe."
 msgstr ""
 "Il tema contiene file con estensioni non sicure: potrebbe non essere sicuro."
 
-#: lib/themeuploader.php:242
 #, php-format
 msgid "Theme contains file of type '.%s', which is not allowed."
 msgstr "Il tema contiene file di tipo \".%s\" che non sono supportati."
 
-#: lib/themeuploader.php:260
 msgid "Error opening theme archive."
 msgstr "Errore nell'aprire il file del tema."
 
-#: lib/threadednoticelist.php:270
 #, php-format
-msgid "Show all %d comment"
-msgid_plural "Show all %d comments"
+msgid "Show %d reply"
+msgid_plural "Show all %d replies"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/topposterssection.php:74
 msgid "Top posters"
 msgstr "Chi scrive più messaggi"
 
 #. TRANS: Title for the form to unblock a user.
-#: lib/unblockform.php:67
 #, fuzzy
 msgctxt "TITLE"
 msgid "Unblock"
 msgstr "Sblocca"
 
-#: lib/unsandboxform.php:69
 msgid "Unsandbox"
 msgstr "Unsandbox"
 
-#: lib/unsandboxform.php:80
 msgid "Unsandbox this user"
 msgstr "Togli questo utente dalla \"sandbox\""
 
-#: lib/unsilenceform.php:67
 msgid "Unsilence"
 msgstr "De-zittisci"
 
-#: lib/unsilenceform.php:78
 msgid "Unsilence this user"
 msgstr "Fai parlare nuovamente questo utente"
 
-#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
 msgid "Unsubscribe from this user"
 msgstr "Annulla l'abbonamento da questo utente"
 
-#: lib/unsubscribeform.php:137
 msgid "Unsubscribe"
 msgstr "Disabbonati"
 
 #. 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).
-#: lib/usernoprofileexception.php:60
 #, fuzzy, php-format
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "L'utente non ha un profilo."
 
-#: lib/userprofile.php:116
 msgid "Edit Avatar"
 msgstr "Modifica immagine"
 
 #. TRANS: H2 for user actions in a profile.
 #. TRANS: H2 for entity actions in a profile.
-#: lib/userprofile.php:216 lib/userprofile.php:232
 msgid "User actions"
 msgstr "Azioni utente"
 
 #. TRANS: Text shown in user profile of not yet compeltely deleted users.
-#: lib/userprofile.php:220
 msgid "User deletion in progress..."
 msgstr "Eliminazione utente..."
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:248
 msgid "Edit profile settings"
 msgstr "Modifica impostazioni del profilo"
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:250
 msgid "Edit"
 msgstr "Modifica"
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:274
 msgid "Send a direct message to this user"
 msgstr "Invia un messaggio diretto a questo utente"
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:276
 msgid "Message"
 msgstr "Messaggio"
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:318
 msgid "Moderate"
 msgstr "Modera"
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:357
 msgid "User role"
 msgstr "Ruolo dell'utente"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:360
 msgctxt "role"
 msgid "Administrator"
 msgstr "Amministratore"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:362
 msgctxt "role"
 msgid "Moderator"
 msgstr "Moderatore"
 
-#: lib/util.php:321
 #, fuzzy
 msgid "Not allowed to log in."
 msgstr "Accesso non effettuato."
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1337
 msgid "a few seconds ago"
 msgstr "pochi secondi fa"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1340
 msgid "about a minute ago"
 msgstr "circa un minuto fa"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1344
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
@@ -9889,12 +8209,10 @@ msgstr[0] "circa un minuto fa"
 msgstr[1] "circa %d minuti fa"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1347
 msgid "about an hour ago"
 msgstr "circa un'ora fa"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1351
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
@@ -9902,12 +8220,10 @@ msgstr[0] "circa un'ora fa"
 msgstr[1] "circa %d ore fa"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1354
 msgid "about a day ago"
 msgstr "circa un giorno fa"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1358
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
@@ -9915,12 +8231,10 @@ msgstr[0] "circa un giorno fa"
 msgstr[1] "circa %d giorni fa"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1361
 msgid "about a month ago"
 msgstr "circa un mese fa"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1365
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
@@ -9928,206 +8242,42 @@ msgstr[0] "circa un mese fa"
 msgstr[1] "circa %d mesi fa"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1368
 msgid "about a year ago"
 msgstr "circa un anno fa"
 
 #. TRANS: Web color exception thrown when a hexadecimal color code does not validate.
 #. TRANS: %s is the provided (invalid) color code.
-#: lib/webcolor.php:81 lib/webcolor.php:121
 #, fuzzy, php-format
 msgid "%s is not a valid color! Use 3 or 6 hex characters."
 msgstr "%s non è un colore valido. Usa 3 o 6 caratteri esadecimali."
 
 #. TRANS: Exception.
-#: lib/xrd.php:63
 #, fuzzy
 msgid "Invalid XML."
 msgstr "Dimensione non valida."
 
 #. TRANS: Exception.
-#: lib/xrd.php:68
 msgid "Invalid XML, missing XRD root."
 msgstr ""
 
 #. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
-#: scripts/restoreuser.php:62
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
 
-#, fuzzy
-#~ msgid "Could not generate feed for group - %s"
-#~ msgstr "Impossibile aggiornare il gruppo."
+#~ msgid "Full name is too long (max 255 chars)."
+#~ msgstr "Nome troppo lungo (max 255 caratteri)."
+
+#~ msgid "description is too long (max %d chars)."
+#~ msgstr "La descrizione è troppo lunga (max %d caratteri)."
+
+#~ msgid "Location is too long (max 255 chars)."
+#~ msgstr "Ubicazione troppo lunga (max 255 caratteri)."
+
+#~ msgid "Too many aliases! Maximum %d."
+#~ msgstr "Troppi alias! Massimo %d."
 
 #, fuzzy
-#~ msgid "Current confirmed Jabber/Google Talk address."
-#~ msgstr "Indirizzo Jabber/GTalk attualmente confermato."
-
-#, fuzzy
-#~ msgid ""
-#~ "Jabber or Google Talk address, like \"UserName@example.org\". First, make "
-#~ "sure to add %s to your buddy list in your IM client or on Google Talk."
-#~ msgstr ""
-#~ "Indirizzo Jabber o GTalk nella forma \"nomeutente@example.org\". Per "
-#~ "prima cosa, assicurati di aggiungere %s all'elenco dei contatti nel tuo "
-#~ "programma di messaggistica o su GTalk."
-
-#, fuzzy
-#~ msgid "Send me notices through Jabber/Google Talk."
-#~ msgstr "Inviami i messaggi via Jabber/GTalk"
-
-#, fuzzy
-#~ msgid "Publish a MicroID for my Jabber/Google Talk address."
-#~ msgstr "Pubblica un MicroID per il mio indirizzo Jabber/GTalk"
-
-#~ msgid "No Jabber ID."
-#~ msgstr "Nessun ID di Jabber."
-
-#, fuzzy
-#~ msgid "Not a valid Jabber ID."
-#~ msgstr "Non è un ID Jabber valido"
-
-#~ msgid "That is already your Jabber ID."
-#~ msgstr "Quello è già il tuo ID di Jabber."
-
-#~ msgid "That is not your Jabber ID."
-#~ msgstr "Quello non è il tuo ID di Jabber."
-
-#~ msgid "Other settings"
-#~ msgstr "Altre impostazioni"
-
-#~ msgid "Tag cloud"
-#~ msgstr "Insieme delle etichette"
-
-#~ msgid "Consumer key"
-#~ msgstr "Chiave consumatore"
-
-#~ msgid "Consumer secret"
-#~ msgstr "Segreto consumatore"
-
-#~ msgid "Request token URL"
-#~ msgstr "URL token di richiesta"
-
-#~ msgid "Access token URL"
-#~ msgstr "URL token di accesso"
-
-#~ msgid "Authorize URL"
-#~ msgstr "URL di autorizzazione"
-
-#~ msgid "Jabber"
-#~ msgstr "Jabber"
-
-#~ msgid "Photo"
-#~ msgstr "Fotografia"
-
-#~ msgid "Other options"
-#~ msgstr "Altre opzioni"
-
-#~ msgid "Other"
-#~ msgstr "Altro"
-
-#~ msgid "Primary site navigation"
-#~ msgstr "Esplorazione sito primaria"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Personal profile and friends timeline"
-#~ msgstr "Profilo personale e attività degli amici"
-
-#~ msgctxt "MENU"
-#~ msgid "Personal"
-#~ msgstr "Personale"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Change your email, avatar, password, profile"
-#~ msgstr "Modifica la tua email, immagine, password o il tuo profilo"
-
-#~ msgid "Account"
-#~ msgstr "Account"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Connect to services"
-#~ msgstr "Connettiti con altri servizi"
-
-#~ msgid "Connect"
-#~ msgstr "Connetti"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Change site configuration"
-#~ msgstr "Modifica la configurazione del sito"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Invite friends and colleagues to join you on %s"
-#~ msgstr "Invita amici e colleghi a seguirti su %s"
-
-#~ msgctxt "MENU"
-#~ msgid "Invite"
-#~ msgstr "Invita"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Create an account"
-#~ msgstr "Crea un account"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Help me!"
-#~ msgstr "Aiutami!"
-
-#~ msgctxt "MENU"
-#~ msgid "Help"
-#~ msgstr "Aiuto"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Search for people or text"
-#~ msgstr "Cerca persone o del testo"
-
-#~ msgid "Local views"
-#~ msgstr "Viste locali"
-
-#~ msgid "Page notice"
-#~ msgstr "Pagina messaggio"
-
-#~ msgid "Secondary site navigation"
-#~ msgstr "Esplorazione secondaria del sito"
-
-#~ msgid "StatusNet software license"
-#~ msgstr "Licenza del software StatusNet"
-
-#~ msgid "Site content license"
-#~ msgstr "Licenza del contenuto del sito"
-
-#~ msgid "Pagination"
-#~ msgstr "Paginazione"
-
-#~ msgid "Author"
-#~ msgstr "Autore"
-
-#~ msgid "Provider"
-#~ msgstr "Provider"
-
-#, fuzzy
-#~ msgctxt "MENU"
-#~ msgid "SMS"
-#~ msgstr "SMS"
-
-#~ msgid "Filter tags"
-#~ msgstr "Filtra etichette"
-
-#~ msgid "[%s]"
-#~ msgstr "[%s]"
-
-#~ msgid "Available characters"
-#~ msgstr "Caratteri disponibili"
-
-#, fuzzy
-#~ msgctxt "MENU"
-#~ msgid "Profile"
-#~ msgstr "Profilo"
-
-#~ msgid "Search help"
-#~ msgstr "Aiuto sulla ricerca"
-
-#, fuzzy
-#~ msgid "Message too long. Maximum is %1$d character, you sent %2$d."
-#~ msgid_plural "Message too long. Maximum is %1$d characters, you sent %2$d."
-#~ msgstr[0] "Messaggio troppo lungo: massimo %1$d caratteri, inviati %2$d."
-#~ msgstr[1] "Messaggio troppo lungo: massimo %1$d caratteri, inviati %2$d."
+#~ msgctxt "BUTTON"
+#~ msgid "Comment"
+#~ msgstr "Contenuto"
diff --git a/locale/ja/LC_MESSAGES/statusnet.po b/locale/ja/LC_MESSAGES/statusnet.po
index 6647d44952..859ac92bf3 100644
--- a/locale/ja/LC_MESSAGES/statusnet.po
+++ b/locale/ja/LC_MESSAGES/statusnet.po
@@ -14,68 +14,58 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:23+0000\n"
-"PO-Revision-Date: 2011-03-03 17:26:09+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:26+0000\n"
 "Language-Team: Japanese <http://translatewiki.net/wiki/Portal:ja>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ja\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-POT-Import-Date: 2011-02-25 23:49:23+0000\n"
+"X-POT-Import-Date: 2011-03-03 17:59:19+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
-#: actions/accessadminpanel.php:53 lib/adminpanelaction.php:363
 msgid "Access"
 msgstr "アクセス"
 
 #. TRANS: Page notice.
-#: actions/accessadminpanel.php:64
 msgid "Site access settings"
 msgstr "サイトアクセス設定"
 
 #. TRANS: Form legend for registration form.
-#: actions/accessadminpanel.php:151
 msgid "Registration"
 msgstr "登録"
 
 #. TRANS: Checkbox instructions for admin setting "Private".
-#: actions/accessadminpanel.php:155
 msgid "Prohibit anonymous users (not logged in) from viewing site?"
 msgstr ""
 "匿名ユーザー（ログインしていないユーザー）がサイトを見るのを禁止しますか？"
 
 #. TRANS: Checkbox label for prohibiting anonymous users from viewing site.
-#: actions/accessadminpanel.php:157
 msgctxt "LABEL"
 msgid "Private"
 msgstr "プライベート"
 
 #. TRANS: Checkbox instructions for admin setting "Invite only".
-#: actions/accessadminpanel.php:164
 msgid "Make registration invitation only."
 msgstr "招待のみ登録させる。"
 
 #. TRANS: Checkbox label for configuring site as invite only.
-#: actions/accessadminpanel.php:166
 msgid "Invite only"
 msgstr "招待のみ"
 
 #. TRANS: Checkbox instructions for admin setting "Closed" (no new registrations).
-#: actions/accessadminpanel.php:173
 msgid "Disable new registrations."
 msgstr "新規登録を無効。"
 
 #. TRANS: Checkbox label for disabling new user registrations.
-#: actions/accessadminpanel.php:175
 msgid "Closed"
 msgstr "閉じられた"
 
 #. TRANS: Title for button to save access settings in site admin panel.
-#: actions/accessadminpanel.php:191
 msgid "Save access settings"
 msgstr "アクセス設定の保存"
 
@@ -83,6 +73,7 @@ msgstr "アクセス設定の保存"
 #. TRANS: Button text for saving theme settings.
 #. TRANS: Button label to save e-mail preferences.
 #. TRANS: Button label to save IM preferences.
+#. TRANS: Button text in the license admin panel.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
 #. TRANS: Button text for saving site notice in admin panel.
@@ -92,21 +83,12 @@ msgstr "アクセス設定の保存"
 #. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
 #. TRANS: Button text on profile design page to save settings.
-#: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
-#: actions/emailsettings.php:251 actions/imsettings.php:199
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:198
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:204
-#: actions/subscriptions.php:261 actions/urlsettings.php:152
-#: actions/useradminpanel.php:298 lib/applicationeditform.php:355
-#: lib/designform.php:320 lib/groupeditform.php:201
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "保存"
 
 #. TRANS: Server error when page not found (404).
 #. TRANS: Server error when page not found (404)
-#: actions/all.php:68 actions/public.php:98 actions/replies.php:93
-#: actions/showfavorites.php:140 actions/tag.php:52
 msgid "No such page."
 msgstr "そのようなページはありません。"
 
@@ -125,6 +107,7 @@ msgstr "そのようなページはありません。"
 #. TRANS: Client error displayed when checking group membership for a non-existing user.
 #. TRANS: Client error displayed when trying to have a non-existing user join a group.
 #. TRANS: Client error displayed when trying to have a non-existing user leave a group.
+#. TRANS: Client error displayed when not providing a user or an invalid user.
 #. TRANS: Client error displayed when updating a status for a non-existing user.
 #. TRANS: Client error displayed when requesting a list of followers for a non-existing user.
 #. TRANS: Client error displayed when requesting most recent favourite notices by a user for a non-existing user.
@@ -137,6 +120,8 @@ msgstr "そのようなページはありません。"
 #. 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.
 #. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
@@ -144,33 +129,10 @@ msgstr "そのようなページはありません。"
 #. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when calling a profile action without specifying a user.
-#: actions/all.php:80 actions/allrss.php:69
-#: actions/apiaccountupdatedeliverydevice.php:110
-#: actions/apiaccountupdateprofile.php:103
-#: actions/apiaccountupdateprofilebackgroundimage.php:118
-#: actions/apiaccountupdateprofileimage.php:104 actions/apiatomservice.php:59
-#: actions/apiblockcreate.php:96 actions/apiblockdestroy.php:94
-#: actions/apidirectmessage.php:75 actions/apidirectmessagenew.php:72
-#: actions/apigroupcreate.php:111 actions/apigroupismember.php:89
-#: actions/apigroupjoin.php:98 actions/apigroupleave.php:98
-#: actions/apigrouplist.php:70 actions/apigroupprofileupdate.php:108
-#: actions/apistatusesupdate.php:230 actions/apisubscriptions.php:85
-#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:173
-#: actions/apitimelinehome.php:78 actions/apitimelinementions.php:77
-#: actions/apitimelineuser.php:79 actions/avatarbynickname.php:79
-#: actions/favoritesrss.php:72 actions/foaf.php:42 actions/foaf.php:61
-#: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116
-#: actions/otp.php:78 actions/remotesubscribe.php:144
-#: actions/remotesubscribe.php:153 actions/replies.php:73
-#: actions/repliesrss.php:38 actions/rsd.php:113 actions/showfavorites.php:106
-#: actions/userbyid.php:75 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/userxrd.php:59 actions/xrds.php:71 lib/command.php:509
-#: lib/galleryaction.php:59 lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "そのようなユーザはいません。"
 
 #. TRANS: Page title. %1$s is user nickname, %2$d is page number
-#: actions/all.php:91
 #, php-format
 msgid "%1$s and friends, page %2$d"
 msgstr "%1$sとその友人、%2$dページ目"
@@ -179,33 +141,26 @@ msgstr "%1$sとその友人、%2$dページ目"
 #. TRANS: H1 text for page. %s is a user nickname.
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Timeline title for user and friends. %s is a user nickname.
-#: actions/all.php:94 actions/all.php:191 actions/allrss.php:117
-#: actions/apitimelinefriends.php:207 actions/apitimelinehome.php:113
-#: lib/personalgroupnav.php:100
 #, php-format
 msgid "%s and friends"
 msgstr "%sとその友人"
 
 #. TRANS: %s is user nickname.
-#: actions/all.php:108
 #, php-format
 msgid "Feed for friends of %s (RSS 1.0)"
 msgstr "%sの友人のフィード(RSS 1.0)"
 
 #. TRANS: %s is user nickname.
-#: actions/all.php:117
 #, php-format
 msgid "Feed for friends of %s (RSS 2.0)"
 msgstr "%sの友人のフィード(RSS 2.0)"
 
 #. TRANS: %s is user nickname.
-#: actions/all.php:126
 #, php-format
 msgid "Feed for friends of %s (Atom)"
 msgstr "%sの友人のフィード(Atom)"
 
 #. TRANS: Empty list message. %s is a user nickname.
-#: actions/all.php:139
 #, php-format
 msgid ""
 "This is the timeline for %s and friends but no one has posted anything yet."
@@ -213,7 +168,6 @@ msgstr "これは%sとその友人のタイムラインですが、まだ誰も
 
 #. TRANS: Encouragement displayed on logged in user's empty timeline.
 #. TRANS: This message contains Markdown links. Keep "](" together.
-#: actions/all.php:146
 #, php-format
 msgid ""
 "Try subscribing to more people, [join a group](%%action.groups%%) or post "
@@ -224,7 +178,6 @@ msgstr ""
 
 #. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@".
 #. TRANS: This message contains Markdown links. Keep "](" together.
-#: actions/all.php:150
 #, php-format
 msgid ""
 "You can try to [nudge %1$s](../%2$s) from their profile or [post something "
@@ -237,7 +190,6 @@ msgstr ""
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
 #. TRANS: Second sentence of empty message for anonymous users. %s is a user nickname.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:221
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -247,14 +199,11 @@ msgstr ""
 "してください!"
 
 #. TRANS: H1 text for page when viewing a list for self.
-#: actions/all.php:188
 msgid "You and friends"
 msgstr "あなたと友人"
 
 #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
 #. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name.
-#: actions/allrss.php:122 actions/apitimelinefriends.php:213
-#: actions/apitimelinehome.php:119
 #, php-format
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr "%2$s に %1$s と友人からの更新があります！"
@@ -273,55 +222,20 @@ msgstr "%2$s に %1$s と友人からの更新があります！"
 #. TRANS: Client error displayed trying to execute an unknown API method checking group membership.
 #. TRANS: Client error displayed trying to execute an unknown API method listing the latest 20 groups.
 #. TRANS: Client error displayed trying to execute an unknown API method showing group membership.
+#. TRANS: Client error displayed when using an unsupported API format.
 #. TRANS: Client error displayed trying to execute an unknown API method showing a group.
 #. TRANS: Client error displayed trying to execute an unknown API method testing API connectivity.
 #. TRANS: Client error displayed trying to execute an unknown API method deleting a status.
 #. TRANS: Client error displayed when trying to handle an unknown API method.
-#: actions/apiaccountratelimitstatus.php:69
-#: actions/apiaccountupdatedeliverydevice.php:92
-#: actions/apiaccountupdateprofile.php:94
-#: actions/apiaccountupdateprofilebackgroundimage.php:92
-#: actions/apiaccountupdateprofilecolors.php:115
-#: actions/apiaccountverifycredentials.php:68 actions/apidirectmessage.php:157
-#: actions/apifavoritecreate.php:98 actions/apifavoritedestroy.php:98
-#: actions/apifriendshipscreate.php:99 actions/apifriendshipsdestroy.php:99
-#: actions/apifriendshipsshow.php:124 actions/apigroupcreate.php:138
-#: actions/apigroupismember.php:115 actions/apigroupjoin.php:151
-#: actions/apigroupleave.php:141 actions/apigrouplist.php:134
-#: actions/apigrouplistall.php:120 actions/apigroupmembership.php:105
-#: actions/apigroupprofileupdate.php:100 actions/apigroupprofileupdate.php:213
-#: actions/apigroupshow.php:114 actions/apihelptest.php:84
-#: actions/apistatusesdestroy.php:101 actions/apistatusesretweets.php:110
-#: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:139
-#: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
-#: actions/apitimelinefavorites.php:182 actions/apitimelinefriends.php:276
-#: actions/apitimelinegroup.php:148 actions/apitimelinehome.php:181
-#: actions/apitimelinementions.php:182 actions/apitimelinepublic.php:247
-#: actions/apitimelineretweetedtome.php:147
-#: actions/apitimelineretweetsofme.php:147 actions/apitimelinetag.php:165
-#: actions/apitimelineuser.php:217 actions/apiusershow.php:100
 msgid "API method not found."
 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.
-#: actions/apiaccountupdatedeliverydevice.php:83
-#: actions/apiaccountupdateprofile.php:85
-#: actions/apiaccountupdateprofilebackgroundimage.php:83
-#: actions/apiaccountupdateprofilecolors.php:106
-#: actions/apiaccountupdateprofileimage.php:80 actions/apiblockcreate.php:87
-#: actions/apiblockdestroy.php:85 actions/apidirectmessagenew.php:107
-#: actions/apifavoritecreate.php:88 actions/apifavoritedestroy.php:88
-#: actions/apifriendshipscreate.php:89 actions/apifriendshipsdestroy.php:89
-#: actions/apigroupcreate.php:102 actions/apigroupjoin.php:89
-#: actions/apigroupleave.php:89 actions/apigroupprofileupdate.php:92
-#: actions/apimediaupload.php:66 actions/apistatusesretweet.php:63
-#: actions/apistatusesupdate.php:194
 msgid "This method requires a POST."
 msgstr "このメソッドには POST が必要です。"
 
 #. TRANS: Client error displayed when no valid device parameter is provided for a user's delivery device setting.
-#: actions/apiaccountupdatedeliverydevice.php:103
 #, fuzzy
 msgid ""
 "You must specify a parameter named 'device' with a value of one of: sms, im, "
@@ -337,10 +251,6 @@ msgstr ""
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
-#: actions/apiaccountupdatedeliverydevice.php:136
-#: actions/emailsettings.php:353 actions/emailsettings.php:499
-#: actions/profilesettings.php:323 actions/smssettings.php:300
-#: actions/smssettings.php:453 actions/urlsettings.php:211
 msgid "Could not update user."
 msgstr "ユーザを更新できませんでした。"
 
@@ -353,32 +263,17 @@ msgstr "ユーザを更新できませんでした。"
 #. TRANS: Server error displayed when requesting Friends of a Friend feed for a user for which the profile could not be found.
 #. TRANS: Server error displayed when trying to get a user hCard for a user without a profile.
 #. TRANS: Server error displayed when calling a profile action while the specified user does not have a profile.
-#: actions/apiaccountupdateprofile.php:111
-#: actions/apiaccountupdateprofilebackgroundimage.php:199
-#: actions/apiaccountupdateprofilecolors.php:183
-#: actions/apiaccountupdateprofileimage.php:131
-#: actions/apiuserprofileimage.php:88 actions/apiusershow.php:108
-#: actions/avatarbynickname.php:85 actions/foaf.php:69 actions/hcard.php:75
-#: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
-#: lib/profileaction.php:85
 msgid "User has no profile."
 msgstr "ユーザはプロフィールをもっていません。"
 
 #. TRANS: Server error displayed if a user profile could not be saved.
 #. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:419
 msgid "Could not save profile."
 msgstr "プロフィールを保存できませんでした。"
 
 #. TRANS: Client error displayed when the number of bytes in a POST request exceeds a limit.
 #. TRANS: %s is the number of bytes of the CONTENT_LENGTH.
 #. TRANS: Form validation error in design settings form. POST should remain untranslated.
-#: actions/apiaccountupdateprofilebackgroundimage.php:108
-#: actions/apiaccountupdateprofileimage.php:95 actions/apimediaupload.php:81
-#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
-#: actions/designadminpanel.php:120 actions/editapplication.php:121
-#: actions/newapplication.php:102 actions/newnotice.php:95
-#: lib/designsettings.php:110
 #, fuzzy, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s byte) due to its "
@@ -395,26 +290,15 @@ msgstr[0] ""
 #. TRANS: Client error displayed when a database error occurs inserting profile colours.
 #. TRANS: Client error displayed when a database error occurs updating profile colours.
 #. TRANS: Form validation error displayed when group design settings could not be saved because of an application issue.
-#: actions/apiaccountupdateprofilebackgroundimage.php:138
-#: actions/apiaccountupdateprofilebackgroundimage.php:149
-#: actions/apiaccountupdateprofilecolors.php:160
-#: actions/apiaccountupdateprofilecolors.php:171
-#: actions/groupdesignsettings.php:285 actions/groupdesignsettings.php:296
-#: actions/userdesignsettings.php:218 actions/userdesignsettings.php:228
-#: actions/userdesignsettings.php:270 actions/userdesignsettings.php:280
 msgid "Unable to save your design settings."
 msgstr "あなたのデザイン設定を保存できません。"
 
 #. TRANS: Error displayed when updating design settings fails.
 #. TRANS: Client error displayed when a database error occurs updating profile colours.
-#: actions/apiaccountupdateprofilebackgroundimage.php:191
-#: actions/apiaccountupdateprofilecolors.php:139
-#: actions/userdesignsettings.php:196
 msgid "Could not update your design."
 msgstr "デザインを更新できませんでした。"
 
 #. TRANS: Title for Atom feed.
-#: actions/apiatomservice.php:85
 msgctxt "ATOM"
 msgid "Main"
 msgstr ""
@@ -423,9 +307,6 @@ msgstr ""
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Title in atom group notice feed. %s is a group name.
 #. TRANS: Title in atom user notice feed. %s is a user name.
-#: actions/apiatomservice.php:93 actions/grouprss.php:138
-#: actions/userrss.php:94 lib/atomgroupnoticefeed.php:63
-#: lib/atomusernoticefeed.php:88
 #, php-format
 msgid "%s timeline"
 msgstr "%s のタイムライン"
@@ -435,8 +316,6 @@ msgstr "%s のタイムライン"
 #. TRANS: %s is a user nickname.
 #. TRANS: Header for subscriptions overview for a user (first page).
 #. TRANS: %s is a user nickname.
-#: actions/apiatomservice.php:104 actions/atompubsubscriptionfeed.php:148
-#: actions/subscriptions.php:51
 #, php-format
 msgid "%s subscriptions"
 msgstr "%s フォローしている"
@@ -444,58 +323,48 @@ msgstr "%s フォローしている"
 #. TRANS: Title for Atom feed with a user's favorite notices. %s is a user nickname.
 #. TRANS: Title for Atom favorites feed.
 #. TRANS: %s is a user nickname.
-#: actions/apiatomservice.php:115 actions/atompubfavoritefeed.php:142
 #, fuzzy, php-format
 msgid "%s favorites"
 msgstr "お気に入り"
 
 #. TRANS: Title for Atom feed with a user's memberships. %s is a user nickname.
-#: actions/apiatomservice.php:126
 #, fuzzy, php-format
 msgid "%s memberships"
 msgstr "%s グループメンバー"
 
 #. TRANS: Client error displayed when users try to block themselves.
-#: actions/apiblockcreate.php:105
 msgid "You cannot block yourself!"
 msgstr "自分自身をブロックすることはできません！"
 
 #. TRANS: Server error displayed when blocking a user has failed.
-#: actions/apiblockcreate.php:127
 msgid "Block user failed."
 msgstr "ユーザのブロックに失敗しました。"
 
 #. TRANS: Server error displayed when unblocking a user has failed.
-#: actions/apiblockdestroy.php:113
 msgid "Unblock user failed."
 msgstr "ユーザのブロック解除に失敗しました。"
 
 #. TRANS: Title. %s is a user nickname.
-#: actions/apidirectmessage.php:88
 #, php-format
 msgid "Direct messages from %s"
 msgstr "%s からのダイレクトメッセージ"
 
 #. TRANS: Subtitle. %s is a user nickname.
-#: actions/apidirectmessage.php:93
 #, php-format
 msgid "All the direct messages sent from %s"
 msgstr "%s から送られた全てのダイレクトメッセージ"
 
 #. TRANS: Title. %s is a user nickname.
-#: actions/apidirectmessage.php:102
 #, php-format
 msgid "Direct messages to %s"
 msgstr "%s へのダイレクトメッセージ"
 
 #. TRANS: Subtitle. %s is a user nickname.
-#: actions/apidirectmessage.php:107
 #, php-format
 msgid "All the direct messages sent to %s"
 msgstr "%s へ送った全てのダイレクトメッセージ"
 
 #. TRANS: Client error displayed when no message text was submitted (406).
-#: actions/apidirectmessagenew.php:117
 msgid "No message text!"
 msgstr "メッセージの本文がありません！"
 
@@ -503,25 +372,21 @@ msgstr "メッセージの本文がありません！"
 #. TRANS: %d is the maximum number of characters for a message.
 #. TRANS: Form validation error displayed when message content is too long.
 #. TRANS: %d is the maximum number of characters for a message.
-#: actions/apidirectmessagenew.php:127 actions/newmessage.php:152
 #, fuzzy, php-format
 msgid "That's too long. Maximum message size is %d character."
 msgid_plural "That's too long. Maximum message size is %d characters."
 msgstr[0] "長すぎます。メッセージは最大 %d 字までです。"
 
 #. TRANS: Client error displayed if a recipient user could not be found (403).
-#: actions/apidirectmessagenew.php:139
 msgid "Recipient user not found."
 msgstr "受け取り手のユーザが見つかりません。"
 
 #. TRANS: Client error displayed trying to direct message another user who's not a friend (403).
-#: actions/apidirectmessagenew.php:144
 #, fuzzy
 msgid "Cannot send direct messages to users who aren't your friend."
 msgstr "友人でないユーザにダイレクトメッセージを送ることはできません。"
 
 #. TRANS: Client error displayed trying to direct message self (403).
-#: actions/apidirectmessagenew.php:154
 #, fuzzy
 msgid ""
 "Do not send a message to yourself; just say it to yourself quietly instead."
@@ -531,119 +396,99 @@ 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.
 #. TRANS: Client error displayed trying to delete a status with an invalid ID.
-#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:108
-#: actions/apistatusesdestroy.php:121
 msgid "No status found with that ID."
 msgstr "そのＩＤのステータスが見つかりません。"
 
 #. TRANS: Client error displayed when trying to mark a notice favourite that already is a favourite.
-#: actions/apifavoritecreate.php:120
 msgid "This status is already a favorite."
 msgstr "このステータスはすでにお気に入りです。"
 
 #. TRANS: Client error displayed when marking a notice as favourite fails.
 #. TRANS: Server error displayed when trying to mark a notice as favorite fails in the database.
 #. TRANS: Error message text shown when a favorite could not be set.
-#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:306
 msgid "Could not create favorite."
 msgstr "お気に入りを作成できません。"
 
 #. TRANS: Client error displayed when trying to remove a favourite that was not a favourite.
-#: actions/apifavoritedestroy.php:122
 msgid "That status is not a favorite."
 msgstr "そのステータスはお気に入りではありません。"
 
 #. TRANS: Client error displayed when removing a favourite has failed.
 #. TRANS: Server error displayed when removing a favorite from the database fails.
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:90
 msgid "Could not delete favorite."
 msgstr "お気に入りを取り消すことができません。"
 
 #. TRANS: Client error displayed when trying follow who's profile could not be found.
-#: actions/apifriendshipscreate.php:109
 msgid "Could not follow user: profile not found."
 msgstr "ユーザのフォローを停止できませんでした: ユーザが見つかりません。"
 
 #. TRANS: Client error displayed when trying to follow a user that's already being followed.
 #. TRANS: %s is the nickname of the user that is already being followed.
-#: actions/apifriendshipscreate.php:120
 #, php-format
 msgid "Could not follow user: %s is already on your list."
 msgstr ""
 "ユーザをフォローできませんでした: %s は既にあなたのリストに入っています。"
 
 #. TRANS: Client error displayed when trying to unfollow a user that cannot be found.
-#: actions/apifriendshipsdestroy.php:109
 msgid "Could not unfollow user: User not found."
 msgstr "ユーザのフォローを停止できませんでした: ユーザが見つかりません。"
 
 #. TRANS: Client error displayed when trying to unfollow self.
-#: actions/apifriendshipsdestroy.php:121
 msgid "You cannot unfollow yourself."
 msgstr "自分自身をフォロー停止することはできません。"
 
 #. TRANS: Client error displayed when supplying invalid parameters to an API call checking if a friendship exists.
-#: actions/apifriendshipsexists.php:88
 #, fuzzy
 msgid "Two valid IDs or nick names must be supplied."
 msgstr "ふたつのＩＤかスクリーンネームが必要です。"
 
 #. TRANS: Client error displayed when a source user could not be determined showing friendship.
-#: actions/apifriendshipsshow.php:131
 msgid "Could not determine source user."
 msgstr "ソースユーザーを決定できません。"
 
 #. TRANS: Client error displayed when a target user could not be determined showing friendship.
-#: actions/apifriendshipsshow.php:140
 msgid "Could not find target user."
 msgstr "ターゲットユーザーを見つけられません。"
 
 #. TRANS: Client error trying to create a group with a nickname this is already in use.
+#. TRANS: API validation exception thrown when nickname is already used.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:156 actions/apigroupprofileupdate.php:255
-#: actions/editgroup.php:191 actions/newgroup.php:137
-#: actions/profilesettings.php:274 actions/register.php:199
 msgid "Nickname already in use. Try another one."
 msgstr "そのニックネームは既に使用されています。他のものを試してみて下さい。"
 
 #. TRANS: Client error in form for group creation.
+#. TRANS: API validation exception thrown when nickname does not validate.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:164 actions/apigroupprofileupdate.php:259
-#: actions/editgroup.php:195 actions/newgroup.php:141
-#: actions/profilesettings.php:244 actions/register.php:201
 msgid "Not a valid nickname."
 msgstr "有効なニックネームではありません。"
 
 #. TRANS: Client error in form for group creation.
+#. TRANS: API validation exception thrown when homepage URL does not validate.
 #. TRANS: Validation error shown when providing an invalid homepage URL in the "Edit application" form.
 #. TRANS: Group edit form validation error.
 #. TRANS: Validation error shown when providing an invalid homepage URL in the "New application" form.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:181 actions/apigroupprofileupdate.php:277
-#: actions/editapplication.php:235 actions/editgroup.php:202
-#: actions/newapplication.php:221 actions/newgroup.php:148
-#: actions/profilesettings.php:249 actions/register.php:208
 msgid "Homepage is not a valid URL."
 msgstr "ホームページのURLが不適切です。"
 
 #. TRANS: Client error in form for group creation.
+#. TRANS: API validation exception thrown when full name does not validate.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:191 actions/editgroup.php:206
-#: actions/newgroup.php:152 actions/profilesettings.php:253
-#: actions/register.php:211
 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "フルネームが長すぎます。（255字まで）"
 
 #. TRANS: Client error shown when providing too long a description during group creation.
 #. TRANS: %d is the maximum number of allowed characters.
+#. TRANS: API validation exception thrown when description does not validate.
+#. TRANS: %d is the maximum description length and used for plural.
 #. TRANS: Validation error shown when providing too long a description in the "Edit application" form.
 #. TRANS: %d is the maximum number of allowed characters.
 #. TRANS: Group edit form validation error.
@@ -651,33 +496,28 @@ msgstr "フルネームが長すぎます。（255字まで）"
 #. TRANS: %d is the maximum number of characters for the description.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed characters.
-#: actions/apigroupcreate.php:201 actions/editapplication.php:202
-#: actions/editgroup.php:211 actions/newapplication.php:182
-#: actions/newgroup.php:157
 #, fuzzy, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."
 msgstr[0] "記述が長すぎます。（最長%d字）"
 
 #. TRANS: Client error shown when providing too long a location during group creation.
+#. TRANS: API validation exception thrown when location does not validate.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:215 actions/editgroup.php:218
-#: actions/newgroup.php:164 actions/profilesettings.php:266
-#: actions/register.php:220
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
 msgstr "場所が長すぎます。（255字まで）"
 
 #. TRANS: Client error shown when providing too many aliases during group creation.
 #. TRANS: %d is the maximum number of allowed aliases.
+#. TRANS: API validation exception thrown when aliases do not validate.
+#. TRANS: %d is the maximum number of aliases and used for plural.
 #. TRANS: Group edit form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.
-#: actions/apigroupcreate.php:236 actions/editgroup.php:231
-#: actions/newgroup.php:177
 #, fuzzy, php-format
 msgid "Too many aliases! Maximum %d allowed."
 msgid_plural "Too many aliases! Maximum %d allowed."
@@ -685,25 +525,24 @@ msgstr[0] "別名が多すぎます! 最大 %d。"
 
 #. TRANS: Client error shown when providing an invalid alias during group creation.
 #. TRANS: %s is the invalid alias.
-#: actions/apigroupcreate.php:253
+#. TRANS: API validation exception thrown when aliases does not validate.
+#. TRANS: %s is the invalid alias.
 #, fuzzy, php-format
 msgid "Invalid alias: \"%s\"."
 msgstr "不正な別名: \"%s\""
 
 #. TRANS: Client error displayed when trying to use an alias during group creation that is already in use.
 #. TRANS: %s is the alias that is already in use.
+#. TRANS: API validation exception thrown when aliases is already used.
+#. TRANS: %s is the already used alias.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error. %s is the already used alias.
-#: actions/apigroupcreate.php:264 actions/apigroupprofileupdate.php:351
-#: actions/editgroup.php:246 actions/newgroup.php:193
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "別名 \"%s\" は既に使用されています。他のものを試してみて下さい。"
 
 #. TRANS: Client error displayed when trying to use an alias during group creation that is the same as the group's nickname.
 #. TRANS: Group edit form validation error.
-#: actions/apigroupcreate.php:278 actions/apigroupprofileupdate.php:359
-#: actions/editgroup.php:253
 msgid "Alias can't be the same as nickname."
 msgstr "別名はニックネームと同じではいけません。"
 
@@ -711,26 +550,21 @@ msgstr "別名はニックネームと同じではいけません。"
 #. TRANS: Client error displayed when trying to join a group that does not exist.
 #. TRANS: Client error displayed when trying to leave a group that does not exist.
 #. TRANS: Client error displayed trying to show group membership on a non-existing group.
+#. TRANS: Client error displayed when not providing a group or an invalid group.
 #. TRANS: Client error displayed when trying to show a group that could not be found.
 #. TRANS: Client error displayed requesting most recent notices to a group for a non-existing group.
-#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
-#: actions/apigroupleave.php:104 actions/apigroupmembership.php:71
-#: actions/apigroupprofileupdate.php:113 actions/apigroupshow.php:81
-#: actions/apitimelinegroup.php:89
 msgid "Group not found."
 msgstr "見つかりません。"
 
 #. TRANS: Server error displayed when trying to join a group the user is already a member of.
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:345
 msgid "You are already a member of that group."
 msgstr "すでにこのグループのメンバーです。"
 
 #. TRANS: Server error displayed when trying to join a group the user is blocked from joining.
 #. 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.
-#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:350
 msgid "You have been blocked from that group by the admin."
 msgstr "管理者によってこのグループからブロックされています。"
 
@@ -738,13 +572,11 @@ msgstr "管理者によってこのグループからブロックされていま
 #. TRANS: %1$s is the joining user's nickname, $2$s is the group nickname for which the join failed.
 #. TRANS: Message given having failed to add a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:136 actions/joingroup.php:139 lib/command.php:362
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "ユーザ %1$s はグループ %2$s に参加できません。"
 
 #. TRANS: Server error displayed when trying to leave a group the user is not a member of.
-#: actions/apigroupleave.php:115
 msgid "You are not a member of this group."
 msgstr "このグループのメンバーではありません。"
 
@@ -752,119 +584,82 @@ msgstr "このグループのメンバーではありません。"
 #. TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
 #. TRANS: Message given having failed to remove a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupleave.php:127 actions/leavegroup.php:133
-#: lib/command.php:410
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
 msgstr "ユーザ %1$s をグループ %2$s から削除できません。"
 
 #. TRANS: Used as title in check for group membership. %s is a user name.
-#: actions/apigrouplist.php:94
 #, php-format
 msgid "%s's groups"
 msgstr "%s のグループ"
 
 #. TRANS: Used as subtitle in check for group membership. %1$s is a user name, %2$s is the site name.
-#: actions/apigrouplist.php:104
 #, fuzzy, php-format
 msgid "%1$s groups %2$s is a member of."
 msgstr "グループ %s はメンバー"
 
 #. TRANS: Message is used as a title when listing the lastest 20 groups. %s is a site name.
 #. TRANS: Message is used as a page title. %s is a nick name.
-#: actions/apigrouplistall.php:88 actions/usergroups.php:63
 #, php-format
 msgid "%s groups"
 msgstr "%s グループ"
 
 #. TRANS: Message is used as a subtitle when listing the lastest 20 groups. %s is a site name.
-#: actions/apigrouplistall.php:93
 #, php-format
 msgid "groups on %s"
 msgstr "%s 上のグループ"
 
+#. TRANS: Client error displayed when trying to edit a group without being an admin.
 #. TRANS: Client error displayed trying to edit a group while not being a group admin.
 #. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
 #. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
-#: actions/apigroupprofileupdate.php:118 actions/editgroup.php:110
-#: actions/editgroup.php:176 actions/groupdesignsettings.php:109
-#: actions/grouplogo.php:111
 msgid "You must be an admin to edit the group."
 msgstr "グループを編集するには管理者である必要があります。"
 
+#. TRANS: Server error displayed when group update fails.
 #. TRANS: Server error displayed when editing a group fails.
-#: actions/apigroupprofileupdate.php:171 actions/editgroup.php:274
 msgid "Could not update group."
 msgstr "グループを更新できません。"
 
+#. TRANS: Server error displayed when adding group aliases fails.
 #. TRANS: Server error displayed when group aliases could not be added.
 #. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/apigroupprofileupdate.php:194 actions/editgroup.php:281
-#: classes/User_group.php:540
 msgid "Could not create aliases."
 msgstr "別名を作成できません。"
 
+#. TRANS: API validation exception thrown when nickname does not validate.
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: actions/apigroupprofileupdate.php:249 lib/nickname.php:165
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr ""
 "ニックネームには、小文字アルファベットと数字のみ使用できます。スペースは使用"
 "できません。"
 
-#: actions/apigroupprofileupdate.php:286
-#, fuzzy
-msgid "Full name is too long (max 255 chars)."
-msgstr "フルネームが長すぎます。（255字まで）"
-
-#: actions/apigroupprofileupdate.php:296
-#, fuzzy, php-format
-msgid "description is too long (max %d chars)."
-msgstr "記述が長すぎます。（最長%d字）"
-
-#: actions/apigroupprofileupdate.php:307
-#, fuzzy
-msgid "Location is too long (max 255 chars)."
-msgstr "場所が長すぎます。（255字まで）"
-
-#: actions/apigroupprofileupdate.php:326
-#, fuzzy, php-format
-msgid "Too many aliases! Maximum %d."
-msgstr "別名が多すぎます! 最大 %d。"
-
-#. TRANS: Group edit form validation error.
+#. TRANS: API validation exception thrown when alias is the same as nickname.
 #. TRANS: Group create form validation error.
-#. TRANS: %s is the invalid alias.
-#: actions/apigroupprofileupdate.php:342 actions/editgroup.php:241
-#: actions/newgroup.php:188
-#, php-format
-msgid "Invalid alias: \"%s\""
-msgstr "不正な別名: \"%s\""
+#, fuzzy
+msgid "Alias cannot be the same as nickname."
+msgstr "別名はニックネームと同じではいけません。"
 
 #. TRANS: Client error displayed when uploading a media file has failed.
-#: actions/apimediaupload.php:101
 #, fuzzy
 msgid "Upload failed."
 msgstr "ファイルアップロード"
 
 #. TRANS: Client error given from the OAuth API when the request token or verifier is invalid.
-#: actions/apioauthaccesstoken.php:102
 #, fuzzy
 msgid "Invalid request token or verifier."
 msgstr "不正なログイントークンが指定されています。"
 
 #. TRANS: Client error given when no oauth_token was passed to the OAuth API.
-#: actions/apioauthauthorize.php:107
 msgid "No oauth_token parameter provided."
 msgstr "oauth_token パラメータは提供されませんでした。"
 
 #. TRANS: Client error given when an invalid request token was passed to the OAuth API.
-#: actions/apioauthauthorize.php:115 actions/apioauthauthorize.php:129
 #, fuzzy
 msgid "Invalid request token."
 msgstr "不正なトークン。"
 
 #. TRANS: Client error given when an invalid request token was passed to the OAuth API.
-#: actions/apioauthauthorize.php:121
 #, fuzzy
 msgid "Request token already authorized."
 msgstr "認証されていません。"
@@ -875,31 +670,14 @@ msgstr "認証されていません。"
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
 #. TRANS: Client error displayed when the session token is not okay.
-#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:75
-#: actions/emailsettings.php:292 actions/favor.php:75 actions/geocode.php:55
-#: actions/groupblock.php:65 actions/grouplogo.php:321
-#: actions/groupunblock.php:65 actions/imsettings.php:241
-#: actions/invite.php:60 actions/makeadmin.php:66 actions/newmessage.php:135
-#: actions/newnotice.php:105 actions/nudge.php:80
-#: actions/oauthappssettings.php:162 actions/oauthconnectionssettings.php:135
-#: actions/passwordsettings.php:137 actions/pluginenable.php:87
-#: actions/profilesettings.php:218 actions/recoverpassword.php:383
-#: actions/register.php:157 actions/remotesubscribe.php:76
-#: actions/repeat.php:82 actions/smssettings.php:249 actions/subedit.php:40
-#: actions/subscribe.php:87 actions/tagother.php:145
-#: actions/unsubscribe.php:69 actions/urlsettings.php:171
-#: actions/userauthorization.php:53 lib/designsettings.php:122
 msgid "There was a problem with your session token. Try again, please."
 msgstr "あなたのセッショントークンに問題がありました。再度お試しください。"
 
 #. TRANS: Form validation error given when an invalid username and/or password was passed to the OAuth API.
-#: actions/apioauthauthorize.php:168
 msgid "Invalid nickname / password!"
 msgstr "不正なユーザ名またはパスワード。"
 
 #. TRANS: Server error displayed when a database action fails.
-#: actions/apioauthauthorize.php:217
 #, fuzzy
 msgid "Database error inserting oauth_token_association."
 msgstr "OAuth アプリケーションユーザの追加時ＤＢエラー。"
@@ -916,28 +694,19 @@ msgstr "OAuth アプリケーションユーザの追加時ＤＢエラー。"
 #. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
 #. TRANS: Message given submitting a form with an unknown action in SMS settings.
 #. TRANS: Unknown form validation error in design settings form.
-#: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
-#: actions/designadminpanel.php:100 actions/editapplication.php:144
-#: actions/emailsettings.php:311 actions/grouplogo.php:332
-#: actions/imsettings.php:256 actions/newapplication.php:124
-#: actions/oauthconnectionssettings.php:144 actions/recoverpassword.php:46
-#: actions/smssettings.php:270 lib/designsettings.php:133
 msgid "Unexpected form submission."
 msgstr "予期せぬフォーム送信です。"
 
 #. TRANS: Title for a page where a user can confirm/deny account access by an external application.
-#: actions/apioauthauthorize.php:387
 msgid "An application would like to connect to your account"
 msgstr "アプリケーションはあなたのアカウントに接続したいです"
 
 #. TRANS: Fieldset legend.
-#: actions/apioauthauthorize.php:404
 msgid "Allow or deny access"
 msgstr "アクセスを許可または拒絶"
 
 #. TRANS: User notification of external application requesting account access.
 #. TRANS: %3$s is the access type requested (read-write or read-only), %4$s is the StatusNet sitename.
-#: actions/apioauthauthorize.php:425
 #, php-format
 msgid ""
 "An application would like the ability to <strong>%3$s</strong> your %4$s "
@@ -948,7 +717,6 @@ msgstr ""
 #. TRANS: User notification of external application requesting account access.
 #. TRANS: %1$s is the application name requesting access, %2$s is the organisation behind the application,
 #. TRANS: %3$s is the access type requested, %4$s is the StatusNet sitename.
-#: actions/apioauthauthorize.php:433
 #, php-format
 msgid ""
 "The application <strong>%1$s</strong> by <strong>%2$s</strong> would like "
@@ -957,23 +725,19 @@ msgid ""
 msgstr ""
 
 #. TRANS: Fieldset legend.
-#: actions/apioauthauthorize.php:455
 #, fuzzy
 msgctxt "LEGEND"
 msgid "Account"
 msgstr "アカウント"
 
 #. TRANS: Field label on OAuth API authorisation form.
+#. TRANS: Field label on login page.
 #. TRANS: Field label in form for profile settings.
-#: actions/apioauthauthorize.php:459 actions/login.php:225
-#: actions/profilesettings.php:107 actions/register.php:411
-#: actions/userauthorization.php:145 lib/groupeditform.php:145
 msgid "Nickname"
 msgstr "ニックネーム"
 
 #. TRANS: Field label on OAuth API authorisation form.
-#: actions/apioauthauthorize.php:463 actions/login.php:228
-#: actions/register.php:415 lib/settingsnav.php:87
+#. TRANS: Field label on login page.
 msgid "Password"
 msgstr "パスワード"
 
@@ -983,48 +747,39 @@ msgstr "パスワード"
 #. TRANS: Button label to cancel an IM address confirmation procedure.
 #. TRANS: Button label to cancel a SMS address confirmation procedure.
 #. TRANS: Button label in the "Edit application" form.
-#: actions/apioauthauthorize.php:478 actions/emailsettings.php:125
-#: actions/imsettings.php:136 actions/smssettings.php:132
-#: lib/applicationeditform.php:351
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Cancel"
 msgstr "中止"
 
 #. TRANS: Button text that when clicked will allow access to an account by an external application.
-#: actions/apioauthauthorize.php:485
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Allow"
 msgstr "許可"
 
 #. TRANS: Form instructions.
-#: actions/apioauthauthorize.php:502
 #, fuzzy
 msgid "Authorize access to your account information."
 msgstr "アカウント情報へのアクセスを許可するか、または拒絶してください。"
 
 #. TRANS: Header for user notification after revoking OAuth access to an application.
-#: actions/apioauthauthorize.php:594
 #, fuzzy
 msgid "Authorization canceled."
 msgstr "確認コードがありません。"
 
 #. TRANS: User notification after revoking OAuth access to an application.
 #. TRANS: %s is an OAuth token.
-#: actions/apioauthauthorize.php:598
 #, fuzzy, php-format
 msgid "The request token %s has been revoked."
 msgstr "リクエストトークン%sは、拒否されて、取り消されました。"
 
 #. TRANS: Title of the page notifying the user that an anonymous client application was successfully authorized to access the user's account with OAuth.
-#: actions/apioauthauthorize.php:621
 #, fuzzy
 msgid "You have successfully authorized the application"
 msgstr "認証されていません。"
 
 #. TRANS: Message notifying the user that an anonymous client application was successfully authorized to access the user's account with OAuth.
-#: actions/apioauthauthorize.php:625
 msgid ""
 "Please return to the application and enter the following security code to "
 "complete the process."
@@ -1032,14 +787,12 @@ msgstr ""
 
 #. TRANS: Title of the page notifying the user that the client application was successfully authorized to access the user's account with OAuth.
 #. TRANS: %s is the authorised application name.
-#: actions/apioauthauthorize.php:632
 #, fuzzy, php-format
 msgid "You have successfully authorized %s"
 msgstr "認証されていません。"
 
 #. TRANS: Message notifying the user that the client application was successfully authorized to access the user's account with OAuth.
 #. TRANS: %s is the authorised application name.
-#: actions/apioauthauthorize.php:639
 #, php-format
 msgid ""
 "Please return to %s and enter the following security code to complete the "
@@ -1048,12 +801,10 @@ msgstr ""
 
 #. TRANS: Client error displayed trying to delete a status not using POST or DELETE.
 #. TRANS: POST and DELETE should not be translated.
-#: actions/apistatusesdestroy.php:111
 msgid "This method requires a POST or DELETE."
 msgstr "このメソッドには POST か DELETE が必要です。"
 
 #. TRANS: Client error displayed trying to delete a status of another user.
-#: actions/apistatusesdestroy.php:136
 msgid "You may not delete another user's status."
 msgstr "他のユーザのステータスを消すことはできません。"
 
@@ -1061,21 +812,16 @@ msgstr "他のユーザのステータスを消すことはできません。"
 #. TRANS: Client error displayed trying to display redents of a non-exiting notice.
 #. TRANS: Client exception thrown when referencing a non-existing notice.
 #. TRANS: Error message displayed trying to delete a non-existing notice.
-#: actions/apistatusesretweet.php:74 actions/apistatusesretweets.php:70
-#: actions/atompubshowfavorite.php:82 actions/deletenotice.php:61
-#: actions/shownotice.php:92
 msgid "No such notice."
 msgstr "そのようなつぶやきはありません。"
 
 #. TRANS: Client error displayed trying to repeat an own notice through the API.
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:549
 msgid "Cannot repeat your own notice."
 msgstr "あなたのつぶやきを繰り返せません。"
 
 #. TRANS: Client error displayed trying to re-repeat a notice through the API.
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:92 lib/command.php:555
 msgid "Already repeated that notice."
 msgstr "すでにつぶやきを繰り返しています。"
 
@@ -1085,73 +831,57 @@ msgstr "すでにつぶやきを繰り返しています。"
 #. TRANS: Client exception thrown when using an unsupported HTTP method.
 #. TRANS: Client error shown when using a non-supported HTTP method.
 #. TRANS: Client exception thrown when using an unsupported HTTP method.
-#: actions/apistatusesshow.php:118 actions/atompubfavoritefeed.php:103
-#: actions/atompubmembershipfeed.php:105 actions/atompubshowfavorite.php:117
-#: actions/atompubshowmembership.php:116
-#: actions/atompubshowsubscription.php:122
-#: actions/atompubsubscriptionfeed.php:109
 #, fuzzy
 msgid "HTTP method not supported."
 msgstr "API メソッドが見つかりません。"
 
 #. TRANS: Exception thrown requesting an unsupported notice output format.
 #. TRANS: %s is the requested output format.
-#: actions/apistatusesshow.php:144
 #, fuzzy, php-format
 msgid "Unsupported format: %s."
 msgstr "サポート外の形式です。"
 
 #. TRANS: Client error displayed requesting a deleted status.
-#: actions/apistatusesshow.php:155
 msgid "Status deleted."
 msgstr "ステータスを削除しました。"
 
 #. TRANS: Client error displayed requesting a status with an invalid ID.
-#: actions/apistatusesshow.php:162
 msgid "No status with that ID found."
 msgstr "そのＩＤでのステータスはありません。"
 
 #. TRANS: Client error displayed when trying to delete a notice not using the Atom format.
-#: actions/apistatusesshow.php:227
 msgid "Can only delete using the Atom format."
 msgstr ""
 
 #. TRANS: Client error displayed when a user has no rights to delete notices of other users.
 #. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
-#: actions/apistatusesshow.php:235 actions/deletenotice.php:78
 #, fuzzy
 msgid "Cannot delete this notice."
 msgstr "このつぶやきを削除できません。"
 
 #. TRANS: Confirmation of notice deletion in API. %d is the ID (number) of the deleted notice.
-#: actions/apistatusesshow.php:249
 #, fuzzy, php-format
 msgid "Deleted notice %d"
 msgstr "つぶやき削除"
 
 #. TRANS: Client error displayed when the parameter "status" is missing.
-#: actions/apistatusesupdate.php:221
 msgid "Client must provide a 'status' parameter with a value."
 msgstr ""
 
 #. TRANS: Client error displayed when the parameter "status" is missing.
 #. TRANS: %d is the maximum number of character for a notice.
-#: actions/apistatusesupdate.php:244 actions/newnotice.php:161
-#: lib/mailhandler.php:60
 #, fuzzy, php-format
 msgid "That's too long. Maximum notice size is %d character."
 msgid_plural "That's too long. Maximum notice size is %d characters."
 msgstr[0] "長すぎます。つぶやきは最大 %d 字までです。"
 
 #. TRANS: Client error displayed when replying to a non-existing notice.
-#: actions/apistatusesupdate.php:284
 #, fuzzy
 msgid "Parent notice not found."
 msgstr "API メソッドが見つかりません。"
 
 #. TRANS: Client error displayed exceeding the maximum notice length.
 #. TRANS: %d is the maximum lenth for a notice.
-#: actions/apistatusesupdate.php:308 actions/newnotice.php:184
 #, fuzzy, php-format
 msgid "Maximum notice size is %d character, including attachment URL."
 msgid_plural "Maximum notice size is %d characters, including attachment URL."
@@ -1159,13 +889,11 @@ msgstr[0] "つぶやきは URL を含めて最大 %d 字までです。"
 
 #. TRANS: Client error displayed when requesting profiles of followers in an unsupported format.
 #. TRANS: Client error displayed when requesting IDs of followers in an unsupported format.
-#: actions/apisubscriptions.php:228 actions/apisubscriptions.php:258
 msgid "Unsupported format."
 msgstr "サポート外の形式です。"
 
 #. TRANS: Title for timeline of most recent favourite notices by a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname.
-#: actions/apitimelinefavorites.php:108
 #, php-format
 msgid "%1$s / Favorites from %2$s"
 msgstr "%1$s / %2$s からのお気に入り"
@@ -1173,14 +901,12 @@ msgstr "%1$s / %2$s からのお気に入り"
 #. TRANS: Subtitle for timeline of most recent favourite notices by a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user's full name,
 #. TRANS: %3$s is a user nickname.
-#: actions/apitimelinefavorites.php:120
 #, fuzzy, php-format
 msgid "%1$s updates favorited by %2$s / %3$s."
 msgstr "%1$s は %2$s でお気に入りを更新しました / %2$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.
-#: actions/apitimelinementions.php:115
 #, php-format
 msgid "%1$s / Updates mentioning %2$s"
 msgstr "%1$s / %2$s について更新"
@@ -1188,49 +914,41 @@ msgstr "%1$s / %2$s について更新"
 #. TRANS: Subtitle for timeline of most recent mentions of a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname,
 #. TRANS: %3$s is a user's full name.
-#: actions/apitimelinementions.php:131
 #, php-format
 msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr "%2$s からアップデートに答える %1$s アップデート"
 
 #. TRANS: Title for site timeline. %s is the StatusNet sitename.
 #. TRANS: Public RSS feed title. %s is the StatusNet site name.
-#: actions/apitimelinepublic.php:193 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "%s のパブリックタイムライン"
 
 #. TRANS: Subtitle for site timeline. %s is the StatusNet sitename.
-#: actions/apitimelinepublic.php:199
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "皆からの %s アップデート!"
 
 #. TRANS: Server error displayed calling unimplemented API method for 'retweeted by me'.
-#: actions/apitimelineretweetedbyme.php:71
 #, fuzzy
 msgid "Unimplemented."
 msgstr "未実装のメソッド。"
 
 #. TRANS: Title for Atom feed "repeated to me". %s is the user nickname.
-#: actions/apitimelineretweetedtome.php:96
 #, php-format
 msgid "Repeated to %s"
 msgstr "%s への返信"
 
-#: actions/apitimelineretweetedtome.php:98
 #, fuzzy, php-format
 msgid "%1$s notices that were to repeated to %2$s / %3$s."
 msgstr "%2$s からアップデートに答える %1$s アップデート"
 
 #. TRANS: Title of list of repeated notices of the logged in user.
 #. TRANS: %s is the nickname of the logged in user.
-#: actions/apitimelineretweetsofme.php:98
 #, php-format
 msgid "Repeats of %s"
 msgstr "%s の返信"
 
-#: actions/apitimelineretweetsofme.php:104
 #, fuzzy, php-format
 msgid "%1$s notices that %2$s / %3$s has repeated."
 msgstr "%s (@%s) はお気に入りとしてあなたのつぶやきを加えました"
@@ -1239,79 +957,64 @@ msgstr "%s (@%s) はお気に入りとしてあなたのつぶやきを加えま
 #. TRANS: %s is the tag.
 #. TRANS: Title for first page of notices with tags.
 #. TRANS: %s is the tag.
-#: actions/apitimelinetag.php:101 actions/tag.php:69
 #, php-format
 msgid "Notices tagged with %s"
 msgstr "%s とタグ付けされたつぶやき"
 
 #. TRANS: Subtitle for timeline with lastest notices with a given tag.
 #. TRANS: %1$s is the tag, $2$s is the StatusNet sitename.
-#: actions/apitimelinetag.php:105 actions/tagrss.php:65
 #, php-format
 msgid "Updates tagged with %1$s on %2$s!"
 msgstr "%2$s に %1$s による更新があります！"
 
 #. TRANS: Client error displayed trying to add a notice to another user's timeline.
-#: actions/apitimelineuser.php:308
 #, fuzzy
 msgid "Only the user can add to their own timeline."
 msgstr "ユーザだけがかれら自身のメールボックスを読むことができます。"
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:315
 msgid "Only accept AtomPub for Atom feeds."
 msgstr ""
 
 #. TRANS: Client error displayed attempting to post an empty API notice.
-#: actions/apitimelineuser.php:322
 msgid "Atom post must not be empty."
 msgstr ""
 
 #. TRANS: Client error displayed attempting to post an API that is not well-formed XML.
-#: actions/apitimelineuser.php:328
 msgid "Atom post must be well-formed XML."
 msgstr ""
 
 #. TRANS: Client error displayed when not using an Atom entry.
-#: actions/apitimelineuser.php:334 actions/atompubfavoritefeed.php:228
-#: actions/atompubmembershipfeed.php:230
-#: actions/atompubsubscriptionfeed.php:236
 msgid "Atom post must be an Atom entry."
 msgstr ""
 
 #. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
-#: actions/apitimelineuser.php:345
 msgid "Can only handle POST activities."
 msgstr ""
 
 #. TRANS: Client error displayed when using an unsupported activity object type.
 #. TRANS: %s is the unsupported activity object type.
-#: actions/apitimelineuser.php:356
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
 #. TRANS: %d is the notice ID (number).
-#: actions/apitimelineuser.php:390
 #, fuzzy, php-format
 msgid "No content for notice %d."
 msgstr "つぶやきの内容を探す"
 
 #. TRANS: Client error displayed when using another format than AtomPub.
 #. TRANS: %s is the notice URI.
-#: actions/apitimelineuser.php:419
 #, fuzzy, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "その ID によるつぶやきは存在していません"
 
 #. TRANS: Server error for unfinished API method showTrends.
-#: actions/apitrends.php:85
 msgid "API method under construction."
 msgstr "API メソッドが工事中です。"
 
 #. TRANS: Client error displayed when requesting user information for a non-existing user.
-#: actions/apiuserprofileimage.php:80 actions/apiusershow.php:94
 #, fuzzy
 msgid "User not found."
 msgstr "API メソッドが見つかりません。"
@@ -1319,103 +1022,85 @@ msgstr "API メソッドが見つかりません。"
 #. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
 #. TRANS: Client exception.
 #. TRANS: Client error displayed trying to subscribe to a non-existing profile.
-#: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
-#: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
-#: actions/subscribe.php:110
 #, fuzzy
 msgid "No such profile."
 msgstr "そのようなファイルはありません。"
 
 #. TRANS: Subtitle for Atom favorites feed.
 #. TRANS: %1$s is a user nickname, %2$s is the StatusNet sitename.
-#: actions/atompubfavoritefeed.php:147
 #, fuzzy, php-format
 msgid "Notices %1$s has favorited on %2$s"
 msgstr "%2$s に %1$s と友人からの更新があります！"
 
 #. TRANS: Client exception thrown when trying to set a favorite for another user.
 #. TRANS: Client exception thrown when trying to subscribe another user.
-#: actions/atompubfavoritefeed.php:217 actions/atompubsubscriptionfeed.php:225
 #, fuzzy
 msgid "Cannot add someone else's subscription."
 msgstr "サブスクリプションを追加できません"
 
 #. TRANS: Client exception thrown when trying use an incorrect activity verb for the Atom pub method.
-#: actions/atompubfavoritefeed.php:240
 #, fuzzy
 msgid "Can only handle favorite activities."
 msgstr "つぶやきの内容を探す"
 
 #. TRANS: Client exception thrown when trying favorite an object that is not a notice.
-#: actions/atompubfavoritefeed.php:250 actions/atompubmembershipfeed.php:250
 #, fuzzy
 msgid "Can only fave notices."
 msgstr "つぶやきの内容を探す"
 
 #. TRANS: Client exception thrown when trying favorite a notice without content.
-#: actions/atompubfavoritefeed.php:259
 #, fuzzy
 msgid "Unknown note."
 msgstr "不明"
 
 #. TRANS: Client exception thrown when trying favorite an already favorited notice.
-#: actions/atompubfavoritefeed.php:267
 #, fuzzy
 msgid "Already a favorite."
 msgstr "お気に入りに加える"
 
 #. TRANS: Title for group membership feed.
 #. TRANS: %s is a username.
-#: actions/atompubmembershipfeed.php:144
 #, fuzzy, php-format
 msgid "%s group memberships"
 msgstr "%s グループメンバー"
 
 #. TRANS: Subtitle for group membership feed.
 #. TRANS: %1$s is a username, %2$s is the StatusNet sitename.
-#: actions/atompubmembershipfeed.php:149
 #, fuzzy, php-format
 msgid "Groups %1$s is a member of on %2$s"
 msgstr "グループ %s はメンバー"
 
 #. TRANS: Client exception thrown when trying subscribe someone else to a group.
-#: actions/atompubmembershipfeed.php:219
 #, fuzzy
 msgid "Cannot add someone else's membership."
 msgstr "サブスクリプションを追加できません"
 
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#: actions/atompubmembershipfeed.php:242
 #, fuzzy
 msgid "Can only handle join activities."
 msgstr "つぶやきの内容を探す"
 
 #. TRANS: Client exception thrown when trying to subscribe to a non-existing group.
-#: actions/atompubmembershipfeed.php:259
 #, fuzzy
 msgid "Unknown group."
 msgstr "不明"
 
 #. TRANS: Client exception thrown when trying to subscribe to an already subscribed group.
-#: actions/atompubmembershipfeed.php:267
 #, fuzzy
 msgid "Already a member."
 msgstr "全てのメンバー"
 
 #. TRANS: Client exception thrown when trying to subscribe to group while blocked from that group.
-#: actions/atompubmembershipfeed.php:275
 msgid "Blocked by admin."
 msgstr ""
 
 #. TRANS: Client exception thrown when referencing a non-existing favorite.
-#: actions/atompubshowfavorite.php:90
 #, fuzzy
 msgid "No such favorite."
 msgstr "そのようなファイルはありません。"
 
 #. TRANS: Client exception thrown when trying to remove a favorite notice of another user.
-#: actions/atompubshowfavorite.php:151
 #, fuzzy
 msgid "Cannot delete someone else's favorite."
 msgstr "お気に入りを取り消すことができません。"
@@ -1442,93 +1127,68 @@ msgstr "お気に入りを取り消すことができません。"
 #. TRANS: Client error displayed when trying to join a non-existing group.
 #. TRANS: Client error displayed when trying to leave a non-local group.
 #. TRANS: Client error displayed when trying to leave a non-existing group.
+#. TRANS: Client error displayed when providing an invalid group ID on the Make Admin page.
 #. 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.
 #. TRANS: Command exception text shown when a group is requested that does not exist.
 #. TRANS: Error text shown when trying to leave a group that does not exist.
-#: actions/atompubshowmembership.php:81 actions/blockedfromgroup.php:81
-#: actions/blockedfromgroup.php:89 actions/deletegroup.php:87
-#: actions/deletegroup.php:100 actions/editgroup.php:102
-#: actions/foafgroup.php:46 actions/foafgroup.php:65 actions/foafgroup.php:73
-#: actions/groupblock.php:89 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:101 actions/grouplogo.php:103
-#: actions/groupmembers.php:84 actions/groupmembers.php:92
-#: actions/grouprss.php:97 actions/grouprss.php:105
-#: actions/groupunblock.php:89 actions/joingroup.php:82
-#: actions/joingroup.php:95 actions/leavegroup.php:82
-#: actions/leavegroup.php:95 actions/makeadmin.php:86
-#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:392
 msgid "No such group."
 msgstr "そのようなグループはありません。"
 
 #. TRANS: Client exception thrown when trying to show membership of a non-subscribed group
-#: actions/atompubshowmembership.php:91
 #, fuzzy
 msgid "Not a member."
 msgstr "全てのメンバー"
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
-#: actions/atompubshowmembership.php:150
 #, fuzzy
 msgid "Cannot delete someone else's membership."
 msgstr "フォローを保存できません。"
 
 #. TRANS: Client exception thrown when trying to display a subscription for a non-existing profile ID.
 #. TRANS: %d is the non-existing profile ID number.
-#: actions/atompubshowsubscription.php:72
-#: actions/atompubshowsubscription.php:83
-#: actions/atompubsubscriptionfeed.php:74
 #, fuzzy, php-format
 msgid "No such profile id: %d."
 msgstr "そのようなファイルはありません。"
 
 #. 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.
-#: actions/atompubshowsubscription.php:94
 #, fuzzy, php-format
 msgid "Profile %1$d not subscribed to profile %2$d."
 msgstr "あなたはそのプロファイルにフォローされていません。"
 
 #. TRANS: Client exception thrown when trying to delete a subscription of another user.
-#: actions/atompubshowsubscription.php:157
 #, fuzzy
 msgid "Cannot delete someone else's subscription."
 msgstr "フォローを保存できません。"
 
 #. TRANS: Subtitle for Atom subscription feed.
 #. TRANS: %1$s is a user nickname, %s$s is the StatusNet sitename.
-#: actions/atompubsubscriptionfeed.php:153
 #, fuzzy, php-format
 msgid "People %1$s has subscribed to on %2$s"
 msgstr "人々は %s をフォローしました。"
 
 #. TRANS: Client error displayed when not using the follow verb.
-#: actions/atompubsubscriptionfeed.php:248
 msgid "Can only handle Follow activities."
 msgstr ""
 
 #. TRANS: Client exception thrown when subscribing to an object that is not a person.
-#: actions/atompubsubscriptionfeed.php:256
 msgid "Can only follow people."
 msgstr ""
 
 #. TRANS: Client exception thrown when subscribing to a non-existing profile.
 #. TRANS: %s is the unknown profile ID.
-#: actions/atompubsubscriptionfeed.php:267
 #, fuzzy, php-format
 msgid "Unknown profile %s."
 msgstr "不明なファイルタイプ"
 
 #. TRANS: Client error displayed trying to subscribe to an already subscribed profile.
 #. TRANS: %s is the profile the user already has a subscription on.
-#: actions/atompubsubscriptionfeed.php:275
 #, fuzzy, php-format
 msgid "Already subscribed to %s."
 msgstr "すでにフォローしています!"
 
 #. TRANS: Client error displayed trying to get a non-existing attachment.
-#: actions/attachment.php:73
 msgid "No such attachment."
 msgstr "そのような添付はありません。"
 
@@ -1540,31 +1200,23 @@ msgstr "そのような添付はありません。"
 #. TRANS: Client error displayed when trying to view group members without providing a group nickname.
 #. TRANS: Client error displayed when requesting a group RSS feed without providing a group nickname.
 #. TRANS: Client error displayed if no nickname argument was given requesting a group page.
-#: actions/avatarbynickname.php:60 actions/blockedfromgroup.php:73
-#: actions/editgroup.php:85 actions/groupdesignsettings.php:84
-#: actions/grouplogo.php:86 actions/groupmembers.php:76
-#: actions/grouprss.php:89 actions/showgroup.php:116
 msgid "No nickname."
 msgstr "ニックネームがありません。"
 
 #. TRANS: Client error displayed trying to get an avatar without providing an avatar size.
-#: actions/avatarbynickname.php:66
 msgid "No size."
 msgstr "サイズがありません。"
 
 #. TRANS: Client error displayed trying to get an avatar providing an invalid avatar size.
-#: actions/avatarbynickname.php:72
 msgid "Invalid size."
 msgstr "不正なサイズ。"
 
 #. TRANS: Title for avatar upload page.
-#: actions/avatarsettings.php:66 lib/settingsnav.php:82
 msgid "Avatar"
 msgstr "アバター"
 
 #. TRANS: Instruction for avatar upload page.
 #. TRANS: %s is the maximum file size, for example "500b", "10kB" or "2MB".
-#: actions/avatarsettings.php:78
 #, php-format
 msgid "You can upload your personal avatar. The maximum file size is %s."
 msgstr "自分のアバターをアップロードできます。最大サイズは%sです。"
@@ -1573,17 +1225,12 @@ msgstr "自分のアバターをアップロードできます。最大サイズ
 #. TRANS: Server error displayed coming across a request from a user without a profile.
 #. TRANS: Server error displayed when trying to authorise a remote subscription request
 #. TRANS: while the user has no profile.
-#: actions/avatarsettings.php:108 actions/avatarsettings.php:192
-#: actions/grouplogo.php:184 actions/remotesubscribe.php:190
-#: actions/userauthorization.php:75 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr "合っているプロフィールのないユーザ"
 
 #. TRANS: Avatar upload page form legend.
 #. TRANS: Avatar upload page crop form legend.
 #. TRANS: Legend for group logo settings fieldset.
-#: actions/avatarsettings.php:122 actions/avatarsettings.php:205
-#: actions/grouplogo.php:261
 msgid "Avatar settings"
 msgstr "アバター設定"
 
@@ -1591,8 +1238,6 @@ msgstr "アバター設定"
 #. TRANS: Header on avatar upload crop form for thumbnail of originally uploaded avatar (h2).
 #. TRANS: Uploaded original file in group logo form.
 #. TRANS: Header for originally uploaded file before a crop on the group logo page.
-#: actions/avatarsettings.php:131 actions/avatarsettings.php:214
-#: actions/grouplogo.php:207 actions/grouplogo.php:270
 msgid "Original"
 msgstr "オリジナル"
 
@@ -1600,14 +1245,11 @@ msgstr "オリジナル"
 #. TRANS: Header on avatar upload crop form for thumbnail of to be used rendition of uploaded avatar (h2).
 #. TRANS: Header for preview of to be displayed group logo.
 #. TRANS: Header for the cropped group logo on the group logo page.
-#: actions/avatarsettings.php:147 actions/avatarsettings.php:227
-#: actions/grouplogo.php:219 actions/grouplogo.php:283
 msgid "Preview"
 msgstr "プレビュー"
 
 #. TRANS: Button on avatar upload page to delete current avatar.
 #. TRANS: Button text for user account deletion.
-#: actions/avatarsettings.php:155 actions/deleteaccount.php:319
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Delete"
@@ -1615,71 +1257,59 @@ msgstr "削除"
 
 #. TRANS: Button on avatar upload page to upload an avatar.
 #. TRANS: Submit button to confirm upload of a user backup file for account restore.
-#: actions/avatarsettings.php:173 actions/restoreaccount.php:369
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Upload"
 msgstr "アップロード"
 
 #. TRANS: Button on avatar upload crop form to confirm a selected crop as avatar.
-#: actions/avatarsettings.php:243
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Crop"
 msgstr "切り取り"
 
 #. TRANS: Validation error on avatar upload form when no file was uploaded.
-#: actions/avatarsettings.php:318
 #, fuzzy
 msgid "No file uploaded."
 msgstr "プロファイル記述がありません。"
 
 #. TRANS: Avatar upload form instruction after uploading a file.
-#: actions/avatarsettings.php:345
 #, fuzzy
 msgid "Pick a square area of the image to be your avatar."
 msgstr "あなたのアバターとなるイメージを正方形で指定"
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
 #. TRANS: Server error displayed trying to crop an uploaded group logo that is no longer present.
-#: actions/avatarsettings.php:360 actions/grouplogo.php:391
 msgid "Lost our file data."
 msgstr "ファイルデータを紛失しました。"
 
 #. TRANS: Success message for having updated a user avatar.
-#: actions/avatarsettings.php:384
 msgid "Avatar updated."
 msgstr "アバターが更新されました。"
 
 #. TRANS: Error displayed on the avatar upload page if the avatar could not be updated for an unknown reason.
-#: actions/avatarsettings.php:388
 msgid "Failed updating avatar."
 msgstr "アバターの更新に失敗しました。"
 
 #. TRANS: Success message for deleting a user avatar.
-#: actions/avatarsettings.php:412
 msgid "Avatar deleted."
 msgstr "アバターが削除されました。"
 
 #. TRANS: Title for backup account page.
 #. TRANS: Option in profile settings to create a backup of the account of the currently logged in user.
-#: actions/backupaccount.php:61 actions/profilesettings.php:468
 msgid "Backup account"
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to backup an account while not logged in.
-#: actions/backupaccount.php:79
 #, fuzzy
 msgid "Only logged-in users can backup their account."
 msgstr "ログインユーザだけがつぶやきを繰り返せます。"
 
 #. TRANS: Client exception thrown when trying to backup an account without having backup rights.
-#: actions/backupaccount.php:84
 msgid "You may not backup your account."
 msgstr ""
 
 #. TRANS: Information displayed on the backup account page.
-#: actions/backupaccount.php:227
 msgid ""
 "You can backup your account data in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format. This is an experimental feature and provides "
@@ -1689,31 +1319,26 @@ msgid ""
 msgstr ""
 
 #. TRANS: Submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:250
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Backup"
 msgstr "バックグラウンド"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:254
 msgid "Backup your account."
 msgstr ""
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
-#: actions/block.php:68
 msgid "You already blocked that user."
 msgstr "そのユーザはすでにブロック済みです。"
 
 #. TRANS: Title for block user page.
 #. TRANS: Legend for block user form.
 #. TRANS: Fieldset legend for block user from group form.
-#: actions/block.php:106 actions/block.php:136 actions/groupblock.php:165
 msgid "Block user"
 msgstr "ユーザをブロック"
 
 #. TRANS: Explanation of consequences when blocking a user on the block user page.
-#: actions/block.php:139
 #, fuzzy
 msgid ""
 "Are you sure you want to block this user? Afterwards, they will be "
@@ -1730,15 +1355,11 @@ msgstr ""
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:154 actions/deleteapplication.php:157
-#: actions/deletegroup.php:220 actions/deletenotice.php:155
-#: actions/deleteuser.php:154 actions/groupblock.php:187
 msgctxt "BUTTON"
 msgid "No"
 msgstr "ノート"
 
 #. TRANS: Submit button title for 'No' when blocking a user.
-#: actions/block.php:158
 #, fuzzy
 msgid "Do not block this user."
 msgstr "このユーザをアンブロックする"
@@ -1749,50 +1370,40 @@ msgstr "このユーザをアンブロックする"
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:161 actions/deleteapplication.php:164
-#: actions/deletegroup.php:227 actions/deletenotice.php:162
-#: actions/deleteuser.php:161 actions/groupblock.php:194
 msgctxt "BUTTON"
 msgid "Yes"
 msgstr "はい"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:165
 #, fuzzy
 msgid "Block this user."
 msgstr "このユーザをブロックする"
 
 #. TRANS: Server error displayed when blocking a user fails.
-#: actions/block.php:189
 msgid "Failed to save block information."
 msgstr "ブロック情報の保存に失敗しました。"
 
 #. TRANS: Title for first page with list of users blocked from a group.
 #. TRANS: %s is a group nickname.
-#: actions/blockedfromgroup.php:101
 #, php-format
 msgid "%s blocked profiles"
 msgstr "%s ブロックされたプロファイル"
 
 #. TRANS: Title for any but the first page with list of users blocked from a group.
 #. TRANS: %1$s is a group nickname, %2$d is a page number.
-#: actions/blockedfromgroup.php:106
 #, php-format
 msgid "%1$s blocked profiles, page %2$d"
 msgstr "%1$s ブロックされたプロファイル、ページ %2$d"
 
 #. TRANS: Instructions for list of users blocked from a group.
-#: actions/blockedfromgroup.php:122
 msgid "A list of the users blocked from joining this group."
 msgstr "このグループへの参加をブロックされたユーザのリスト。"
 
 #. TRANS: Form legend for unblocking a user from a group.
-#: actions/blockedfromgroup.php:291
 msgid "Unblock user from group"
 msgstr "グループからのアンブロックユーザ"
 
 #. TRANS: Button text for unblocking a user from a group.
-#: actions/blockedfromgroup.php:323
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Unblock"
@@ -1800,130 +1411,104 @@ msgstr "アンブロック"
 
 #. TRANS: Tooltip for button for unblocking a user from a group.
 #. TRANS: Description of the form to unblock a user.
-#: actions/blockedfromgroup.php:327 lib/unblockform.php:78
 msgid "Unblock this user"
 msgstr "このユーザをアンブロックする"
 
 #. TRANS: Title for mini-posting window loaded from bookmarklet.
 #. TRANS: %s is the StatusNet site name.
-#: actions/bookmarklet.php:51
 #, php-format
 msgid "Post to %s"
 msgstr "%s 上のグループ"
 
 #. TRANS: Client error displayed when not providing a confirmation code in the contact address confirmation action.
-#: actions/confirmaddress.php:74
 msgid "No confirmation code."
 msgstr "確認コードがありません。"
 
 #. TRANS: Client error displayed when providing a non-existing confirmation code in the contact address confirmation action.
-#: actions/confirmaddress.php:80
 msgid "Confirmation code not found."
 msgstr "確認コードが見つかりません。"
 
 #. TRANS: Client error displayed when not providing a confirmation code for another user in the contact address confirmation action.
-#: actions/confirmaddress.php:86
 msgid "That confirmation code is not for you!"
 msgstr "その確認コードはあなたのものではありません！"
 
 #. TRANS: Server error for an unknown address type, which can be 'email', 'sms', or the name of an IM network (such as 'xmpp' or 'aim')
-#: actions/confirmaddress.php:94
-#, fuzzy, php-format
+#, php-format
 msgid "Unrecognized address type %s"
 msgstr "不明なアドレスタイプ %s"
 
 #. TRANS: Client error for an already confirmed email/jabber/sms address.
-#: actions/confirmaddress.php:103 actions/confirmaddress.php:136
 msgid "That address has already been confirmed."
 msgstr "そのアドレスは既に承認されています。"
 
-#: actions/confirmaddress.php:121 actions/imsettings.php:444
-#: actions/userdesignsettings.php:306
-#, fuzzy
 msgid "Couldn't update user."
 msgstr "ユーザを更新できませんでした。"
 
-#: actions/confirmaddress.php:144
 #, fuzzy
 msgid "Couldn't update user im preferences."
 msgstr "ユーザレコードを更新できません。"
 
-#: actions/confirmaddress.php:156
 #, fuzzy
 msgid "Couldn't insert user im preferences."
 msgstr "サブスクリプションを追加できません"
 
 #. TRANS: Server error displayed when an address confirmation code deletion from the
 #. TRANS: database fails in the contact address confirmation action.
-#: actions/confirmaddress.php:169
 #, fuzzy
 msgid "Could not delete address confirmation."
 msgstr "メール承認を削除できません"
 
 #. TRANS: Title for the contact address confirmation action.
-#: actions/confirmaddress.php:185
 msgid "Confirm address"
 msgstr "アドレスの確認"
 
 #. TRANS: Success message for the contact address confirmation action.
 #. TRANS: %s can be 'email', 'jabber', or 'sms'.
-#: actions/confirmaddress.php:200
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "アドレス \"%s\" はあなたのアカウントとして承認されています。"
 
 #. TRANS: Title for page with a conversion (multiple notices in context).
-#: actions/conversation.php:96
 msgid "Conversation"
 msgstr "会話"
 
 #. TRANS: Header on conversation page. Hidden by default (h2).
 #. TRANS: Label for user statistics.
-#: actions/conversation.php:149 lib/noticelist.php:87
-#: lib/profileaction.php:246 lib/searchgroupnav.php:82
-#: lib/threadednoticelist.php:66
 msgid "Notices"
 msgstr "つぶやき"
 
 #. TRANS: Client exception displayed trying to delete a user account while not logged in.
-#: actions/deleteaccount.php:71
 #, fuzzy
 msgid "Only logged-in users can delete their account."
 msgstr "ログインユーザだけがつぶやきを繰り返せます。"
 
 #. TRANS: Client exception displayed trying to delete a user account without have the rights to do that.
-#: actions/deleteaccount.php:77
 #, fuzzy
 msgid "You cannot delete your account."
 msgstr "ユーザを削除できません"
 
 #. TRANS: Confirmation text for user deletion. The user has to type this exactly the same, including punctuation.
-#: actions/deleteaccount.php:160 actions/deleteaccount.php:297
 msgid "I am sure."
 msgstr ""
 
 #. TRANS: Notification for user about the text that must be input to be able to delete a user account.
 #. TRANS: %s is the text that needs to be input.
-#: actions/deleteaccount.php:164
 #, php-format
 msgid "You must write \"%s\" exactly in the box."
 msgstr ""
 
 #. TRANS: Confirmation that a user account has been deleted.
-#: actions/deleteaccount.php:206
 #, fuzzy
 msgid "Account deleted."
 msgstr "アバターが削除されました。"
 
 #. TRANS: Page title for page on which a user account can be deleted.
 #. TRANS: Option in profile settings to delete the account of the currently logged in user.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:476
 #, fuzzy
 msgid "Delete account"
 msgstr "新しいグループを作成"
 
 #. TRANS: Form text for user deletion form.
-#: actions/deleteaccount.php:279
 msgid ""
 "This will <strong>permanently delete</strong> your account data from this "
 "server."
@@ -1931,7 +1516,6 @@ msgstr ""
 
 #. TRANS: Additional form text for user deletion form shown if a user has account backup rights.
 #. TRANS: %s is a URL to the backup page.
-#: actions/deleteaccount.php:285
 #, php-format
 msgid ""
 "You are strongly advised to <a href=\"%s\">back up your data</a> before "
@@ -1940,56 +1524,43 @@ msgstr ""
 
 #. TRANS: Field label for delete account confirmation entry.
 #. TRANS: Field label for password reset form where the password has to be typed again.
-#: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:262 actions/register.php:419
 msgid "Confirm"
 msgstr "パスワード確認"
 
 #. TRANS: Input title for the delete account field.
 #. TRANS: %s is the text that needs to be input.
-#: actions/deleteaccount.php:304
 #, fuzzy, php-format
 msgid "Enter \"%s\" to confirm that you want to delete your account."
 msgstr "ユーザを削除できません"
 
 #. TRANS: Button title for user account deletion.
-#: actions/deleteaccount.php:323
 #, fuzzy
 msgid "Permanently delete your account"
 msgstr "ユーザを削除できません"
 
 #. TRANS: Client error displayed trying to delete an application while not logged in.
-#: actions/deleteapplication.php:62
 msgid "You must be logged in to delete an application."
 msgstr "アプリケーションを削除するにはログインしていなければなりません。"
 
 #. TRANS: Client error displayed trying to delete an application that does not exist.
-#: actions/deleteapplication.php:71
 msgid "Application not found."
 msgstr "アプリケーションが見つかりません。"
 
 #. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
-#: actions/deleteapplication.php:79 actions/editapplication.php:78
-#: actions/showapplication.php:90
 msgid "You are not the owner of this application."
 msgstr "このアプリケーションのオーナーではありません。"
 
 #. TRANS: Client error text when there is a problem with the session token.
-#: actions/deleteapplication.php:102 actions/editapplication.php:131
-#: actions/newapplication.php:112 actions/showapplication.php:113
-#: lib/action.php:1391
 msgid "There was a problem with your session token."
 msgstr "あなたのセッショントークンに関する問題がありました。"
 
 #. TRANS: Title for delete application page.
 #. TRANS: Fieldset legend on delete application page.
-#: actions/deleteapplication.php:124 actions/deleteapplication.php:149
 msgid "Delete application"
 msgstr "アプリケーション削除"
 
 #. TRANS: Confirmation text on delete application page.
-#: actions/deleteapplication.php:152
 #, fuzzy
 msgid ""
 "Are you sure you want to delete this application? This will clear all data "
@@ -2000,19 +1571,16 @@ msgstr ""
 "ベースからユーザに関するすべてのデータをクリアします。"
 
 #. TRANS: Submit button title for 'No' when deleting an application.
-#: actions/deleteapplication.php:161
 #, fuzzy
 msgid "Do not delete this application."
 msgstr "このアプリケーションを削除しないでください"
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
-#: actions/deleteapplication.php:167
 #, fuzzy
 msgid "Delete this application."
 msgstr "このアプリケーションを削除"
 
 #. TRANS: Client error when trying to delete group while not logged in.
-#: actions/deletegroup.php:64
 #, fuzzy
 msgid "You must be logged in to delete a group."
 msgstr "グループから離れるにはログインしていなければなりません。"
@@ -2020,41 +1588,34 @@ msgstr "グループから離れるにはログインしていなければなり
 #. TRANS: Client error when trying to delete a group without providing a nickname or ID for the group.
 #. TRANS: Client error displayed when trying to join a group without providing a group name or group ID.
 #. TRANS: Client error displayed when trying to leave a group without providing a group name or group ID.
-#: actions/deletegroup.php:94 actions/joingroup.php:89
-#: actions/leavegroup.php:89
 #, fuzzy
 msgid "No nickname or ID."
 msgstr "ニックネームがありません。"
 
 #. TRANS: Client error when trying to delete a group without having the rights to delete it.
-#: actions/deletegroup.php:107
 #, fuzzy
 msgid "You are not allowed to delete this group."
 msgstr "このグループのメンバーではありません。"
 
 #. TRANS: Server error displayed if a group could not be deleted.
 #. TRANS: %s is the name of the group that could not be deleted.
-#: actions/deletegroup.php:150
 #, fuzzy, php-format
 msgid "Could not delete group %s."
 msgstr "グループを更新できません。"
 
 #. TRANS: Message given after deleting a group.
 #. TRANS: %s is the deleted group's name.
-#: actions/deletegroup.php:159
 #, fuzzy, php-format
 msgid "Deleted group %s"
 msgstr "%1$s はグループ %2$s に残りました。"
 
 #. TRANS: Title of delete group page.
 #. TRANS: Form legend for deleting a group.
-#: actions/deletegroup.php:176 actions/deletegroup.php:202
 #, fuzzy
 msgid "Delete group"
 msgstr "ユーザ削除"
 
 #. TRANS: Warning in form for deleleting a group.
-#: actions/deletegroup.php:206
 #, fuzzy
 msgid ""
 "Are you sure you want to delete this group? This will clear all data about "
@@ -2065,13 +1626,11 @@ msgstr ""
 "ベースからユーザに関するすべてのデータをクリアします。"
 
 #. TRANS: Submit button title for 'No' when deleting a group.
-#: actions/deletegroup.php:224
 #, fuzzy
 msgid "Do not delete this group."
 msgstr "このつぶやきを削除できません。"
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
-#: actions/deletegroup.php:231
 #, fuzzy
 msgid "Delete this group."
 msgstr "このユーザを削除"
@@ -2082,22 +1641,18 @@ msgstr "このユーザを削除"
 #. TRANS: Client error displayed trying to block a user from a group while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying to log out when not logged in.
+#. TRANS: Client error displayed when trying to access the "make admin" page while not logged in.
+#. TRANS: Client error displayed trying to create a new direct message while not logged in.
+#. TRANS: Client error displayed trying to send a notice while not logged in.
+#. TRANS: Client error displayed trying to nudge a user without being logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
 #. TRANS: Client error displayed when trying to change user options while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
-#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:70
-#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
-#: actions/nudge.php:63 actions/pluginenable.php:97 actions/subedit.php:33
-#: actions/subscribe.php:98 actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:71 lib/profileformaction.php:63
-#: lib/settingsaction.php:72
 msgid "Not logged in."
 msgstr "ログインしていません。"
 
 #. TRANS: Instructions for deleting a notice.
-#: actions/deletenotice.php:110
 msgid ""
 "You are about to permanently delete a notice. Once this is done, it cannot "
 "be undone."
@@ -2107,51 +1662,42 @@ msgstr ""
 
 #. TRANS: Page title when deleting a notice.
 #. TRANS: Fieldset legend for the delete notice form.
-#: actions/deletenotice.php:117 actions/deletenotice.php:148
 msgid "Delete notice"
 msgstr "つぶやき削除"
 
 #. TRANS: Message for the delete notice form.
-#: actions/deletenotice.php:152
 msgid "Are you sure you want to delete this notice?"
 msgstr "本当にこのつぶやきを削除しますか？"
 
 #. TRANS: Submit button title for 'No' when deleting a notice.
-#: actions/deletenotice.php:159
 #, fuzzy
 msgid "Do not delete this notice."
 msgstr "このつぶやきを削除できません。"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:166
 #, fuzzy
 msgid "Delete this notice."
 msgstr "このつぶやきを削除"
 
 #. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
-#: actions/deleteuser.php:66
 msgid "You cannot delete users."
 msgstr "ユーザを削除できません"
 
 #. TRANS: Client error displayed when trying to delete a non-local user.
-#: actions/deleteuser.php:74
 msgid "You can only delete local users."
 msgstr "ローカルユーザのみ削除できます。"
 
 #. TRANS: Title of delete user page.
-#: actions/deleteuser.php:110
 #, fuzzy
 msgctxt "TITLE"
 msgid "Delete user"
 msgstr "ユーザ削除"
 
 #. TRANS: Fieldset legend on delete user page.
-#: actions/deleteuser.php:134
 msgid "Delete user"
 msgstr "ユーザ削除"
 
 #. TRANS: Information text to request if a user is certain that the described action has to be performed.
-#: actions/deleteuser.php:138
 msgid ""
 "Are you sure you want to delete this user? This will clear all data about "
 "the user from the database, without a backup."
@@ -2160,102 +1706,83 @@ msgstr ""
 "ベースからユーザに関するすべてのデータをクリアします。"
 
 #. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/deleteuser.php:158
 #, fuzzy
 msgid "Do not delete this user."
 msgstr "このつぶやきを削除できません。"
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
-#: actions/deleteuser.php:165
 #, fuzzy
 msgid "Delete this user."
 msgstr "このユーザを削除"
 
 #. TRANS: Message used as title for design settings for the site.
-#: actions/designadminpanel.php:60 lib/settingsnav.php:97
 msgid "Design"
 msgstr "デザイン"
 
 #. TRANS: Instructions for design adminsitration panel.
-#: actions/designadminpanel.php:71
 msgid "Design settings for this StatusNet site"
 msgstr ""
 
 #. TRANS: Client error displayed when a logo URL does is not valid.
-#: actions/designadminpanel.php:327
 msgid "Invalid logo URL."
 msgstr "不正なロゴ URL"
 
 #. TRANS: Client error displayed when an SSL logo URL is invalid.
-#: actions/designadminpanel.php:333
 #, fuzzy
 msgid "Invalid SSL logo URL."
 msgstr "不正なロゴ URL"
 
 #. TRANS: Client error displayed when a theme is submitted through the form that is not in the theme list.
 #. TRANS: %s is the chosen unavailable theme.
-#: actions/designadminpanel.php:339
 #, php-format
 msgid "Theme not available: %s."
 msgstr "ＩＭ が利用不可。"
 
 #. TRANS: Fieldset legend for form to change logo.
-#: actions/designadminpanel.php:437
 msgid "Change logo"
 msgstr "ロゴの変更"
 
 #. TRANS: Field label for StatusNet site logo.
-#: actions/designadminpanel.php:444
 msgid "Site logo"
 msgstr "サイトロゴ"
 
 #. TRANS: Field label for SSL StatusNet site logo.
-#: actions/designadminpanel.php:452
 #, fuzzy
 msgid "SSL logo"
 msgstr "サイトロゴ"
 
 #. TRANS: Fieldset legend for form change StatusNet site's theme.
-#: actions/designadminpanel.php:467
 msgid "Change theme"
 msgstr "テーマ変更"
 
 #. TRANS: Field label for dropdown to choose site theme.
-#: actions/designadminpanel.php:485
 msgid "Site theme"
 msgstr "サイトテーマ"
 
 #. TRANS: Title for field label for dropdown to choose site theme.
-#: actions/designadminpanel.php:487
 msgid "Theme for the site."
 msgstr "サイトのテーマ"
 
 #. TRANS: Field label for uploading a cutom theme.
-#: actions/designadminpanel.php:494
 #, fuzzy
 msgid "Custom theme"
 msgstr "サイトテーマ"
 
 #. TRANS: Form instructions for uploading a cutom StatusNet theme.
-#: actions/designadminpanel.php:499
 msgid "You can upload a custom StatusNet theme as a .ZIP archive."
 msgstr ""
 
 #. TRANS: Fieldset legend for theme background image.
-#: actions/designadminpanel.php:515
 msgid "Change background image"
 msgstr "バックグラウンドイメージの変更"
 
 #. TRANS: Field label for background image on theme designer page.
 #. TRANS: Field label for background color selector.
 #. TRANS: Label on profile design page for setting a profile page background colour.
-#: actions/designadminpanel.php:525 actions/designadminpanel.php:609
-#: lib/designform.php:238
 msgid "Background"
 msgstr "バックグラウンド"
 
 #. TRANS: Form guide for background image upload form on theme designer page.
-#: actions/designadminpanel.php:531
 #, php-format
 msgid ""
 "You can upload a background image for the site. The maximum file size is %1"
@@ -2265,204 +1792,169 @@ msgstr ""
 "イズは %1$s。"
 
 #. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:558
 msgid "On"
 msgstr "オン"
 
 #. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:575
 msgid "Off"
 msgstr "オフ"
 
 #. TRANS: Form guide for turning background image on or off on theme designer page.
 #. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
 #. TRANS: use of the uploaded profile image.
-#: actions/designadminpanel.php:577 lib/designform.php:214
 msgid "Turn background image on or off."
 msgstr "バックグラウンドイメージのオンまたはオフ。"
 
 #. TRANS: Checkbox label to title background image on theme designer page.
 #. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-#: actions/designadminpanel.php:583 lib/designform.php:220
 msgid "Tile background image"
 msgstr "タイルバックグラウンドイメージ"
 
 #. TRANS: Fieldset legend for theme colors.
-#: actions/designadminpanel.php:598
 #, fuzzy
 msgid "Change colors"
 msgstr "色の変更"
 
 #. TRANS: Field label for content color selector.
 #. TRANS: Label on profile design page for setting a profile page content colour.
-#: actions/designadminpanel.php:623 lib/designform.php:252
 msgid "Content"
 msgstr "内容"
 
 #. TRANS: Field label for sidebar color selector.
 #. TRANS: Label on profile design page for setting a profile page sidebar colour.
-#: actions/designadminpanel.php:637 lib/designform.php:266
 msgid "Sidebar"
 msgstr "サイドバー"
 
 #. TRANS: Field label for text color selector.
 #. TRANS: Label on profile design page for setting a profile page text colour.
-#: actions/designadminpanel.php:651 lib/designform.php:280
 msgid "Text"
 msgstr "テキスト"
 
 #. TRANS: Field label for link color selector.
 #. TRANS: Label on profile design page for setting a profile page links colour.
-#: actions/designadminpanel.php:665 lib/designform.php:294
 msgid "Links"
 msgstr "リンク"
 
 #. TRANS: Fieldset legend for advanced theme design settings.
-#: actions/designadminpanel.php:691
 msgid "Advanced"
 msgstr ""
 
 #. TRANS: Field label for custom CSS.
-#: actions/designadminpanel.php:696
 msgid "Custom CSS"
 msgstr ""
 
 #. TRANS: Button text for resetting theme settings.
-#: actions/designadminpanel.php:718
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Use defaults"
 msgstr "デフォルトを使用"
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:720
 #, fuzzy
 msgid "Restore default designs."
 msgstr "デフォルトデザインに戻す。"
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:728
 #, fuzzy
 msgid "Reset back to default."
 msgstr "デフォルトへリセットする"
 
 #. TRANS: Title for button for saving theme settings.
-#: actions/designadminpanel.php:736
 #, fuzzy
 msgid "Save design."
 msgstr "デザインの保存"
 
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
-#: actions/disfavor.php:83
 msgid "This notice is not a favorite!"
 msgstr "このつぶやきはお気に入りではありません!"
 
 #. TRANS: Title for page on which favorites can be added.
-#: actions/disfavor.php:98
 msgid "Add to favorites"
 msgstr "お気に入りに加える"
 
 #. TRANS: Client exception thrown when requesting a document from the documentation that does not exist.
 #. TRANS: %s is the non-existing document.
-#: actions/doc.php:155
 #, fuzzy, php-format
 msgid "No such document \"%s\"."
 msgstr "そのようなドキュメントはありません。\"%s\""
 
 #. TRANS: Title for "Edit application" form.
 #. TRANS: Form legend.
-#: actions/editapplication.php:54 lib/applicationeditform.php:129
 msgid "Edit application"
 msgstr "アプリケーション編集"
 
 #. TRANS: Client error displayed trying to edit an application while not logged in.
-#: actions/editapplication.php:66
 msgid "You must be logged in to edit an application."
 msgstr "アプリケーションを編集するにはログインしていなければなりません。"
 
 #. TRANS: Client error displayed trying to edit an application that does not exist.
-#: actions/editapplication.php:83 actions/showapplication.php:83
 msgid "No such application."
 msgstr "そのようなアプリケーションはありません。"
 
 #. TRANS: Instructions for "Edit application" form.
-#: actions/editapplication.php:167
 msgid "Use this form to edit your application."
 msgstr "このフォームを使ってアプリケーションを編集します。"
 
 #. TRANS: Validation error shown when not providing a name in the "Edit application" form.
 #. TRANS: Validation error shown when not providing a name in the "New application" form.
-#: actions/editapplication.php:184 actions/newapplication.php:164
 msgid "Name is required."
 msgstr "名前は必須です。"
 
 #. 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.
-#: actions/editapplication.php:188 actions/newapplication.php:172
 #, fuzzy
 msgid "Name is too long (maximum 255 characters)."
 msgstr "名前が長すぎます。（最大255字まで）"
 
 #. TRANS: Validation error shown when providing a name for an application that already exists in the "Edit application" form.
 #. TRANS: Validation error shown when providing a name for an application that already exists in the "New application" form.
-#: actions/editapplication.php:192 actions/newapplication.php:168
 msgid "Name already in use. Try another one."
 msgstr "そのニックネームは既に使用されています。他のものを試してみて下さい。"
 
 #. TRANS: Validation error shown when not providing a description in the "Edit application" form.
 #. TRANS: Validation error shown when not providing a description in the "New application" form.
-#: actions/editapplication.php:196 actions/newapplication.php:176
 msgid "Description is required."
 msgstr "概要が必要です。"
 
 #. TRANS: Validation error shown when providing too long a source URL in the "Edit application" form.
-#: actions/editapplication.php:209
 msgid "Source URL is too long."
 msgstr "ソースＵＲＬが長すぎます。"
 
 #. TRANS: Validation error shown when providing an invalid source URL in the "Edit application" form.
 #. TRANS: Validation error shown when providing an invalid source URL in the "New application" form.
-#: actions/editapplication.php:216 actions/newapplication.php:199
 msgid "Source URL is not valid."
 msgstr "ソースＵＲＬが不正です。"
 
 #. 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.
-#: actions/editapplication.php:220 actions/newapplication.php:203
 msgid "Organization is required."
 msgstr "組織が必要です。"
 
 #. TRANS: Validation error shown when providing too long an arganisation name in the "Edit application" form.
-#: actions/editapplication.php:224 actions/newapplication.php:207
 #, fuzzy
 msgid "Organization is too long (maximum 255 characters)."
 msgstr "組織が長すぎます。（最大255字）"
 
 #. TRANS: Form validation error show when an organisation name has not been provided in the edit application form.
 #. TRANS: Form validation error show when an organisation name has not been provided in the new application form.
-#: actions/editapplication.php:228 actions/newapplication.php:211
 msgid "Organization homepage is required."
 msgstr "組織のホームページが必要です。"
 
 #. TRANS: Validation error shown when providing too long a callback URL in the "Edit application" form.
 #. TRANS: Validation error shown when providing too long a callback URL in the "New application" form.
-#: actions/editapplication.php:239 actions/newapplication.php:225
 msgid "Callback is too long."
 msgstr "コールバックが長すぎます。"
 
 #. TRANS: Validation error shown when providing an invalid callback URL in the "Edit application" form.
 #. TRANS: Validation error shown when providing an invalid callback URL in the "New application" form.
-#: actions/editapplication.php:247 actions/newapplication.php:235
 msgid "Callback URL is not valid."
 msgstr "コールバックURLが不正です。"
 
 #. TRANS: Server error occuring when an application could not be updated from the "Edit application" form.
-#: actions/editapplication.php:284
 msgid "Could not update application."
 msgstr "アプリケーションを更新できません。"
 
 #. TRANS: Title for form to edit a group. %s is a group nickname.
-#: actions/editgroup.php:55
 #, php-format
 msgid "Edit %s group"
 msgstr "%s グループを編集"
@@ -2470,40 +1962,40 @@ msgstr "%s グループを編集"
 #. TRANS: Client error displayed trying to edit a group while not logged in.
 #. TRANS: Client error displayed when trying to create a group while not logged in.
 #. TRANS: Client error displayed trying to create a group while not logged in.
-#: actions/editgroup.php:68 actions/grouplogo.php:69 actions/newgroup.php:65
 msgid "You must be logged in to create a group."
 msgstr "グループを作るにはログインしていなければなりません。"
 
 #. TRANS: Form instructions for group edit form.
-#: actions/editgroup.php:161
 msgid "Use this form to edit the group."
 msgstr "このフォームを使ってグループを編集します。"
 
+#. TRANS: Group edit form validation error.
+#. TRANS: Group create form validation error.
+#. TRANS: %s is the invalid alias.
+#, php-format
+msgid "Invalid alias: \"%s\""
+msgstr "不正な別名: \"%s\""
+
 #. TRANS: Group edit form success message.
-#: actions/editgroup.php:301
 msgid "Options saved."
 msgstr "オプションが保存されました。"
 
 #. TRANS: Title for e-mail settings.
-#: actions/emailsettings.php:60
 msgid "Email settings"
 msgstr "メール設定"
 
 #. TRANS: E-mail settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/emailsettings.php:74
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 msgstr "%%site.name%% からのメールを管理。"
 
 #. TRANS: Form legend for e-mail settings form.
 #. TRANS: Field label for e-mail address input in e-mail settings form.
-#: actions/emailsettings.php:104 actions/emailsettings.php:130
 msgid "Email address"
 msgstr "メールアドレス"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:110
 msgid "Current confirmed email address."
 msgstr "現在確認されているメールアドレス。"
 
@@ -2512,15 +2004,11 @@ msgstr "現在確認されているメールアドレス。"
 #. TRANS: Button label to remove a confirmed IM address.
 #. TRANS: Button label to remove a confirmed SMS address.
 #. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
-#: actions/emailsettings.php:113 actions/emailsettings.php:180
-#: actions/imsettings.php:119 actions/smssettings.php:119
-#: actions/smssettings.php:175
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "回復"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:120
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -2533,15 +2021,12 @@ msgstr ""
 #. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
 #. TRANS: Any other domain may be owned by a legitimate person or
 #. TRANS: organization.
-#: actions/emailsettings.php:137
 msgid "Email address, like \"UserName@example.org\""
 msgstr "メールアドレス、\"UserName@example.org\" のような"
 
 #. TRANS: Button label for adding an e-mail address in e-mail settings form.
 #. TRANS: Button label for adding an IM address in IM settings form.
 #. TRANS: Button label for adding a SMS phone number in SMS settings form.
-#: actions/emailsettings.php:141 actions/imsettings.php:147
-#: actions/smssettings.php:157
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Add"
@@ -2549,29 +2034,24 @@ msgstr "追加"
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:149 actions/smssettings.php:166
 msgid "Incoming email"
 msgstr "入ってくるメール"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:155
 msgid "I want to post notices by email."
 msgstr "メールでつぶやきを投稿したい。"
 
 #. TRANS: Form instructions for incoming e-mail form in e-mail settings.
 #. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
-#: actions/emailsettings.php:177 actions/smssettings.php:173
 msgid "Send email to this address to post new notices."
 msgstr "新しいつぶやき投稿にこのアドレスへメールする"
 
 #. TRANS: Instructions for incoming e-mail address input form, when an address has already been assigned.
 #. TRANS: Instructions for incoming SMS e-mail address input form.
-#: actions/emailsettings.php:186 actions/smssettings.php:181
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr "投稿のための新しいEメールアドレスを作ります; 古い方を取り消します。"
 
 #. TRANS: Instructions for incoming e-mail address input form.
-#: actions/emailsettings.php:190
 msgid ""
 "To send notices via email, we need to create a unique email address for you "
 "on this server:"
@@ -2579,94 +2059,76 @@ msgstr ""
 
 #. TRANS: Button label for adding an e-mail address to send notices from.
 #. TRANS: Button label for adding an SMS e-mail address to send notices from.
-#: actions/emailsettings.php:196 actions/smssettings.php:184
 #, fuzzy
 msgctxt "BUTTON"
 msgid "New"
 msgstr "New"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:205
 msgid "Email preferences"
 msgstr "メールアドレス"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:213
 msgid "Send me notices of new subscriptions through email."
 msgstr "メールで新規フォローの通知を私に送ってください。"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:219
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr ""
 "だれかがお気に入りとして私のつぶやきを加えたら、メールを私に送ってください。"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:226
 msgid "Send me email when someone sends me a private message."
 msgstr ""
 "だれかがプライベート・メッセージを私に送るときには、メールを私に送ってくださ"
 "い。"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:232
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr "だれかが\"@-返信\"を私を送るときには、メールを私に送ってください、"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:238
 msgid "Allow friends to nudge me and send me an email."
 msgstr "友達が私に合図とメールを送ることを許可する。"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:244
 msgid "Publish a MicroID for my email address."
 msgstr "私のメールアドレスのためにMicroIDを発行してください。"
 
 #. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:362
 #, fuzzy
 msgid "Email preferences saved."
 msgstr "デザイン設定が保存されました。"
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:381
 msgid "No email address."
 msgstr "メールアドレスがありません。"
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:389
 #, fuzzy
 msgid "Cannot normalize that email address."
 msgstr "そのメールアドレスを正規化できません"
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:394 actions/register.php:197
-#: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "有効なメールアドレスではありません。"
 
 #. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:398
 msgid "That is already your email address."
 msgstr "これはすでにあなたのメールアドレスです。"
 
 #. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:402
 msgid "That email address already belongs to another user."
 msgstr "このメールアドレスは既に他の人が使っています。"
 
 #. TRANS: Server error thrown on database error adding e-mail confirmation code.
 #. TRANS: Server error thrown on database error adding Instant Messaging confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:419 actions/imsettings.php:362
-#: actions/smssettings.php:364
 #, fuzzy
 msgid "Could not insert confirmation code."
 msgstr "承認コードを追加できません"
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:426
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
@@ -2678,105 +2140,85 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling Instant Messaging address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:446 actions/imsettings.php:391
-#: actions/smssettings.php:398
 msgid "No pending confirmation to cancel."
 msgstr "承認待ちのものはありません。"
 
 #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:451
 #, fuzzy
 msgid "That is the wrong email address."
 msgstr "その IM アドレスは不正です。"
 
 #. TRANS: Server error thrown on database error canceling e-mail address confirmation.
 #. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
-#: actions/emailsettings.php:460 actions/smssettings.php:412
 #, fuzzy
 msgid "Could not delete email confirmation."
 msgstr "メール承認を削除できません"
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:465
 msgid "Email confirmation cancelled."
 msgstr "承認待ちのものはありません。"
 
 #. TRANS: Message given trying to remove an e-mail address that is not
 #. TRANS: registered for the active user.
-#: actions/emailsettings.php:484
 msgid "That is not your email address."
 msgstr "これはあなたのメールアドレスではありません。"
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:505
 msgid "The email address was removed."
 msgstr "入ってくるメールアドレスは削除されました。"
 
 #. TRANS: Form validation error displayed when trying to remove an incoming e-mail address while no address has been set.
-#: actions/emailsettings.php:519 actions/smssettings.php:554
 msgid "No incoming email address."
 msgstr "入ってくるメールアドレスではありません。"
 
 #. 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.
-#: actions/emailsettings.php:531 actions/emailsettings.php:555
-#: actions/smssettings.php:565 actions/smssettings.php:590
 #, fuzzy
 msgid "Could not update user record."
 msgstr "ユーザレコードを更新できません。"
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
 #. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:535 actions/smssettings.php:569
 msgid "Incoming email address removed."
 msgstr "入ってくるメールアドレスは削除されました。"
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
 #. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:559 actions/smssettings.php:594
 msgid "New incoming email address added."
 msgstr "新しい入ってくるメールアドレスが追加されました。"
 
 #. TRANS: Client error displayed when trying to mark a notice as favorite that already is a favorite.
-#: actions/favor.php:80
 msgid "This notice is already a favorite!"
 msgstr "このつぶやきはすでにお気に入りです!"
 
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
-#: actions/favor.php:95
 #, fuzzy
 msgid "Disfavor favorite."
 msgstr "お気に入りをやめる"
 
 #. TRANS: Page title for first page of favorited notices.
 #. TRANS: Title for favourited notices section.
-#: actions/favorited.php:65 lib/popularnoticesection.php:62
-#: lib/publicgroupnav.php:93
 msgid "Popular notices"
 msgstr "人気のつぶやき"
 
 #. TRANS: Page title for all but first page of favorited notices.
 #. TRANS: %d is the page number being displayed.
-#: actions/favorited.php:69
 #, php-format
 msgid "Popular notices, page %d"
 msgstr "人気のつぶやき、ページ %d"
 
 #. TRANS: Description on page displaying favorited notices.
-#: actions/favorited.php:81
 msgid "The most popular notices on the site right now."
 msgstr "現在サイトで最も人気のつぶやき。"
 
 #. TRANS: Text displayed instead of a list when a site does not yet have any favourited notices.
-#: actions/favorited.php:149
 msgid "Favorite notices appear on this page but no one has favorited one yet."
 msgstr ""
 "お気に入りのつぶやきがページに表示されます、しかしまだお気に入りがありませ"
 "ん。"
 
 #. TRANS: Additional text displayed instead of a list when a site does not yet have any favourited notices for logged in users.
-#: actions/favorited.php:153
 msgid ""
 "Be the first to add a notice to your favorites by clicking the fave button "
 "next to any notice you like."
@@ -2786,7 +2228,6 @@ msgstr ""
 
 #. TRANS: Additional text displayed instead of a list when a site does not yet have any favourited notices for not logged in users.
 #. TRANS: %%action.register%% is a registration link. "[link text](link)" is Mark Down. Do not change the formatting.
-#: actions/favorited.php:158
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to add a "
@@ -2799,186 +2240,151 @@ msgstr ""
 #. TRANS: %s is a user's nickname.
 #. TRANS: Title for first page of favourite notices of a user.
 #. TRANS: %s is the user for whom the favourite notices are displayed.
-#: actions/favoritesrss.php:111 actions/showfavorites.php:76
-#: lib/personalgroupnav.php:110
 #, php-format
 msgid "%s's favorite notices"
 msgstr "%s のお気に入りのつぶやき"
 
 #. TRANS: Desciption of RSS feed with favourite notices of a user.
 #. TRANS: %1$s is a user's nickname, %2$s is the name of the StatusNet site.
-#: actions/favoritesrss.php:117
 #, php-format
 msgid "Updates favored by %1$s on %2$s!"
 msgstr "%1$s による %2$s 上のお気に入りを更新!"
 
 #. TRANS: Page title for first page of featured users.
 #. TRANS: Title for featured users section.
-#: actions/featured.php:69 lib/featureduserssection.php:87
-#: lib/publicgroupnav.php:89
 msgid "Featured users"
 msgstr "フィーチャーされたユーザ"
 
 #. TRANS: Page title for all but first page of featured users.
 #. TRANS: %d is the page number being displayed.
-#: actions/featured.php:73
 #, php-format
 msgid "Featured users, page %d"
 msgstr "フィーチャーされたユーザ、ページ %d"
 
 #. TRANS: Description on page displaying featured users.
-#: actions/featured.php:102
 #, fuzzy, php-format
 msgid "A selection of some great users on %s."
 msgstr "%s 上の優れたユーザの集まり"
 
 #. TRANS: Client error displayed when no notice ID was given trying do display a file.
-#: actions/file.php:36
 msgid "No notice ID."
 msgstr "つぶやきＩＤがありません。"
 
 #. TRANS: Client error displayed when an invalid notice ID was given trying do display a file.
-#: actions/file.php:41
 msgid "No notice."
 msgstr "つぶやきがありません。"
 
 #. TRANS: Client error displayed when trying do display a file for a notice without a file attachement.
-#: actions/file.php:46
 msgid "No attachments."
 msgstr "そのような添付はありません。"
 
 #. TRANS: Client error displayed when trying do display a file for a notice with file attachements
 #. TRANS: that could not be found.
-#: actions/file.php:58
 msgid "No uploaded attachments."
 msgstr "アップロードされた添付はありません。"
 
 #. TRANS: Client error displayed when subscribing to a remote profile and an unexpected response is received.
-#: actions/finishremotesubscribe.php:69
 msgid "Not expecting this response!"
 msgstr "想定外のレスポンスです！"
 
 #. TRANS: Client error displayed when subscribing to a remote profile that does not exist.
-#: actions/finishremotesubscribe.php:81
 msgid "User being listened to does not exist."
 msgstr "存在しないように聴かれているユーザ。"
 
 #. TRANS: Client error displayed when subscribing to a remote profile that is a local profile.
-#: actions/finishremotesubscribe.php:89 actions/remotesubscribe.php:58
 msgid "You can use the local subscription!"
 msgstr "ローカルサブスクリプションを使用可能です！"
 
 #. TRANS: Client error displayed when subscribing to a remote profile that is blocked form subscribing to.
-#: actions/finishremotesubscribe.php:102
 msgid "That user has blocked you from subscribing."
 msgstr "このユーザはフォローをブロックされています。"
 
 #. TRANS: Client error displayed when subscribing to a remote profile without providing an authorised token.
-#: actions/finishremotesubscribe.php:114
 msgid "You are not authorized."
 msgstr "認証されていません。"
 
 #. TRANS: Client error displayed when subscribing to a remote profile and conversion of the request token to access token fails.
-#: actions/finishremotesubscribe.php:118
 msgid "Could not convert request token to access token."
 msgstr "リクエストトークンをアクセストークンに変換できません"
 
 #. TRANS: Client error displayed when subscribing to a remote profile fails because of an unsupported version of the OMB protocol.
-#: actions/finishremotesubscribe.php:124
 msgid "Remote service uses unknown version of OMB protocol."
 msgstr ""
 "リモートサービスは、不明なバージョンの OMB プロトコルを使用しています。"
 
 #. TRANS: Server error displayed when subscribing to a remote profile fails because the remote profile could not be updated.
-#: actions/finishremotesubscribe.php:145 lib/oauthstore.php:317
 #, fuzzy
 msgid "Error updating remote profile."
 msgstr "リモートプロファイル更新エラー"
 
 #. TRANS: Client error displayed when requesting a non-existent file.
-#: actions/getfile.php:77
 msgid "No such file."
 msgstr "そのようなファイルはありません。"
 
 #. TRANS: Client error displayed when requesting a file without having read access to it.
-#: actions/getfile.php:82
 msgid "Cannot read file."
 msgstr "ファイルを読み込めません。"
 
 #. TRANS: Client error displayed when trying to assign an invalid role to a user.
-#: actions/grantrole.php:61 actions/revokerole.php:62
 #, fuzzy
 msgid "Invalid role."
 msgstr "不正なトークン。"
 
 #. TRANS: Client error displayed when trying to assign an reserved role to a user.
-#: actions/grantrole.php:66 actions/revokerole.php:66
 msgid "This role is reserved and cannot be set."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to assign a role to a user while not being allowed to set roles.
-#: actions/grantrole.php:76
 #, fuzzy
 msgid "You cannot grant user roles on this site."
 msgstr "あなたはこのサイトのサンドボックスユーザができません。"
 
 #. TRANS: Client error displayed when trying to assign a role to a user that already has that role.
-#: actions/grantrole.php:84
 #, fuzzy
 msgid "User already has this role."
 msgstr "ユーザは既に黙っています。"
 
 #. TRANS: Client error displayed trying to block a user from a group while not specifying a to be blocked user profile.
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing a profile.
+#. TRANS: Client error displayed when not providing a profile ID on the Make Admin page.
 #. TRANS: Client error displayed trying a change a subscription without providing a profile.
 #. TRANS: Client error displayed when trying to change user options without specifying a user to work on.
-#: actions/groupblock.php:71 actions/groupunblock.php:71
-#: actions/makeadmin.php:71 actions/subedit.php:49
-#: lib/profileformaction.php:79
 msgid "No profile specified."
 msgstr "プロファイル記述がありません。"
 
 #. TRANS: Client error displayed trying to block a user from a group while specifying a non-existing profile.
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing an existing profile.
+#. TRANS: Client error displayed when specifying an invalid profile ID on the Make Admin page.
 #. TRANS: Client error displayed trying a change a subscription for a non-existant profile ID.
 #. TRANS: Client error displayed when trying to change user options without specifying an existing user to work on.
-#: actions/groupblock.php:77 actions/groupunblock.php:77
-#: actions/makeadmin.php:76 actions/subedit.php:57 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:87
 msgid "No profile with that ID."
 msgstr "そのＩＤのプロファイルがありません。"
 
 #. TRANS: Client error displayed trying to block a user from a group while not specifying a group to block a profile from.
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing a group.
-#: actions/groupblock.php:83 actions/groupunblock.php:83
-#: actions/makeadmin.php:81
+#. TRANS: Client error displayed when not providing a group ID on the Make Admin page.
 msgid "No group specified."
 msgstr "グループ記述がありません。"
 
 #. TRANS: Client error displayed trying to block a user from a group while not being an admin user.
-#: actions/groupblock.php:95
 msgid "Only an admin can block group members."
 msgstr "管理者だけがグループメンバーをブロックできます。"
 
 #. TRANS: Client error displayed trying to block a user from a group while user is already blocked from the given group.
-#: actions/groupblock.php:100
 msgid "User is already blocked from group."
 msgstr "ユーザはすでにグループからブロックされています。"
 
 #. TRANS: Client error displayed trying to block a user from a group while user is not a member of given group.
-#: actions/groupblock.php:106
 msgid "User is not a member of group."
 msgstr "ユーザはグループのメンバーではありません。"
 
 #. TRANS: Title for block user from group page.
 #. TRANS: Form legend for form to block user from a group.
-#: actions/groupblock.php:141 actions/groupmembers.php:364
 msgid "Block user from group"
 msgstr "グループからユーザをブロック"
 
 #. TRANS: Explanatory text for block user from group form before setting the block.
 #. TRANS: %1$s is that to be blocked user, %2$s is the group the user will be blocked from.
-#: actions/groupblock.php:169
 #, php-format
 msgid ""
 "Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They "
@@ -2989,40 +2395,33 @@ msgstr ""
 "除される、投稿できない、グループをフォローできなくなります。"
 
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
-#: actions/groupblock.php:191
 #, fuzzy
 msgid "Do not block this user from this group."
 msgstr "このグループからこのユーザをブロックしない"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
-#: actions/groupblock.php:198
 #, fuzzy
 msgid "Block this user from this group."
 msgstr "このグループからこのユーザをブロック"
 
 #. TRANS: Server error displayed when trying to block a user from a group fails because of an application error.
-#: actions/groupblock.php:215
 msgid "Database error blocking user from group."
 msgstr "グループからのブロックユーザのデータベースエラー"
 
 #. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
 #. TRANS: Client error displayed trying to find a user by ID without providing an ID.
-#: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr "ID がありません。"
 
 #. TRANS: Client error displayed trying to change group design settings while not logged in.
-#: actions/groupdesignsettings.php:67
 msgid "You must be logged in to edit a group."
 msgstr "グループを編集するにはログインしていなければなりません。"
 
 #. TRANS: Title group design settings page.
-#: actions/groupdesignsettings.php:146
 msgid "Group design"
 msgstr "グループデザイン"
 
 #. TRANS: Instructions for group design settings page.
-#: actions/groupdesignsettings.php:157
 msgid ""
 "Customize the way your group looks with a background image and a colour "
 "palette of your choice."
@@ -3031,25 +2430,21 @@ msgstr ""
 "タマイズしてください。"
 
 #. TRANS: Form validation error displayed when group design settings could not be updated because of an application issue.
-#: actions/groupdesignsettings.php:262
 #, fuzzy
 msgid "Unable to update your design settings."
 msgstr "あなたのデザイン設定を保存できません。"
 
 #. TRANS: Form text to confirm saved group design settings.
-#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:239
 msgid "Design preferences saved."
 msgstr "デザイン設定が保存されました。"
 
 #. TRANS: Title for group logo settings page.
 #. TRANS: Group logo form legend.
-#: actions/grouplogo.php:144 actions/grouplogo.php:199
 msgid "Group logo"
 msgstr "グループロゴ"
 
 #. TRANS: Instructions for group logo page.
 #. TRANS: %s is the maximum file size for that site.
-#: actions/grouplogo.php:156
 #, php-format
 msgid ""
 "You can upload a logo image for your group. The maximum file size is %s."
@@ -3058,91 +2453,75 @@ msgstr ""
 "%s。"
 
 #. TRANS: Submit button for uploading a group logo.
-#: actions/grouplogo.php:243
 msgid "Upload"
 msgstr "アップロード"
 
 #. TRANS: Button text for cropping an uploaded group logo.
-#: actions/grouplogo.php:299
 msgid "Crop"
 msgstr "切り取り"
 
 #. TRANS: Form instructions on the group logo page.
-#: actions/grouplogo.php:376
 msgid "Pick a square area of the image to be the logo."
 msgstr "ロゴとなるイメージの正方形を選択。"
 
 #. TRANS: Form success message after updating a group logo.
-#: actions/grouplogo.php:411
 msgid "Logo updated."
 msgstr "ロゴが更新されました。"
 
 #. TRANS: Form failure message after failing to update a group logo.
-#: actions/grouplogo.php:414
 msgid "Failed updating logo."
 msgstr "ロゴの更新に失敗しました。"
 
 #. TRANS: Title of the page showing group members.
 #. TRANS: %s is the name of the group.
-#: actions/groupmembers.php:104
 #, php-format
 msgid "%s group members"
 msgstr "%s グループメンバー"
 
 #. TRANS: Title of the page showing group members.
 #. TRANS: %1$s is the name of the group, %2$d is the page number of the members list.
-#: actions/groupmembers.php:109
 #, php-format
 msgid "%1$s group members, page %2$d"
 msgstr "%1$s グループメンバー、ページ %2$d"
 
 #. TRANS: Page notice for group members page.
-#: actions/groupmembers.php:125
 msgid "A list of the users in this group."
 msgstr "このグループのユーザのリスト。"
 
 #. TRANS: Indicator in group members list that this user is a group administrator.
-#: actions/groupmembers.php:190 lib/action.php:581
 msgid "Admin"
 msgstr "管理者"
 
 #. TRANS: Button text for the form that will block a user from a group.
-#: actions/groupmembers.php:397
 msgctxt "BUTTON"
 msgid "Block"
 msgstr ""
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:401
 msgctxt "TOOLTIP"
 msgid "Block this user"
 msgstr ""
 
 #. TRANS: Form legend for form to make a user a group admin.
-#: actions/groupmembers.php:488
 msgid "Make user an admin of the group"
 msgstr "ユーザをグループの管理者にする"
 
 #. TRANS: Button text for the form that will make a user administrator.
-#: actions/groupmembers.php:521
 msgctxt "BUTTON"
 msgid "Make Admin"
 msgstr ""
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:525
 msgctxt "TOOLTIP"
 msgid "Make this user an admin"
 msgstr ""
 
 #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
-#: actions/grouprss.php:141
 #, php-format
 msgid "Updates from members of %1$s on %2$s!"
 msgstr "%2$s 上の %1$s のメンバーから更新する"
 
 #. TRANS: Title for first page of the groups list.
-#: actions/groups.php:62
 #, fuzzy
 msgctxt "TITLE"
 msgid "Groups"
@@ -3150,7 +2529,6 @@ msgstr "グループ"
 
 #. TRANS: Title for all but the first page of the groups list.
 #. TRANS: %d is the page number.
-#: actions/groups.php:66
 #, fuzzy, php-format
 msgctxt "TITLE"
 msgid "Groups, page %d"
@@ -3159,7 +2537,6 @@ msgstr "グループ、ページ %d"
 #. TRANS: Page notice of group list. %%%%site.name%%%% is the StatusNet site name,
 #. TRANS: %%%%action.groupsearch%%%% and %%%%action.newgroup%%%% are URLs. Do not change them.
 #. TRANS: This message contains Markdown links in the form [link text](link).
-#: actions/groups.php:95
 #, fuzzy, php-format
 msgid ""
 "%%%%site.name%%%% groups let you find and talk with people of similar "
@@ -3175,12 +2552,10 @@ msgstr ""
 "(%%%%action.newgroup%%%%)"
 
 #. TRANS: Link to create a new group on the group list page.
-#: actions/groups.php:113 actions/usergroups.php:126 lib/groupeditform.php:115
 msgid "Create a new group"
 msgstr "新しいグループを作成"
 
 #. TRANS: Instructions for page where groups can be searched. %%site.name%% is the name of the StatusNet site.
-#: actions/groupsearch.php:53
 #, php-format
 msgid ""
 "Search for groups on %%site.name%% by their name, location, or description. "
@@ -3190,21 +2565,17 @@ msgstr ""
 "り。3字以上。"
 
 #. TRANS: Title for page where groups can be searched.
-#: actions/groupsearch.php:60
 msgid "Group search"
 msgstr "グループの検索"
 
 #. TRANS: Text on page where groups can be searched if no results were found for a query.
 #. TRANS: Text for notice search results is the query had no results.
 #. TRANS: Message on the "People search" page where a query has no results.
-#: actions/groupsearch.php:82 actions/noticesearch.php:122
-#: actions/peoplesearch.php:87
 msgid "No results."
 msgstr "結果なし。"
 
 #. TRANS: Additional text on page where groups can be searched if no results were found for a query for a logged in user.
 #. TRANS: This message contains Markdown links in the form [link text](link).
-#: actions/groupsearch.php:87
 #, fuzzy, php-format
 msgid ""
 "If you cannot find the group you're looking for, you can [create it](%%"
@@ -3215,7 +2586,6 @@ msgstr ""
 
 #. TRANS: Additional text on page where groups can be searched if no results were found for a query for a not logged in user.
 #. TRANS: This message contains Markdown links in the form [link text](link).
-#: actions/groupsearch.php:92
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and [create the group](%%"
@@ -3225,30 +2595,25 @@ msgstr ""
 "%%) しないのか!"
 
 #. TRANS: Client error displayed when trying to unblock a user from a group without being an administrator for the group.
-#: actions/groupunblock.php:95
 msgid "Only an admin can unblock group members."
 msgstr "管理者だけがグループメンバーをアンブロックできます。"
 
 #. TRANS: Client error displayed when trying to unblock a non-blocked user from a group.
-#: actions/groupunblock.php:100
 msgid "User is not blocked from group."
 msgstr "ユーザはグループからブロックされていません。"
 
 #. TRANS: Server error displayed when unblocking a user from a group fails because of an unknown error.
 #. TRANS: Server error displayed when removing a user block.
-#: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "ブロックの削除エラー"
 
 #. TRANS: Title for Instant Messaging settings.
-#: actions/imsettings.php:56
 msgid "IM settings"
 msgstr "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.
-#: actions/imsettings.php:69
 #, fuzzy, php-format
 msgid ""
 "You can send and receive notices through instant messaging [instant messages]"
@@ -3258,18 +2623,15 @@ msgstr ""
 "す。下のアドレスを設定して下さい。"
 
 #. TRANS: Message given in the IM settings if IM is not enabled on the site.
-#: actions/imsettings.php:90
 msgid "IM is not available."
 msgstr "ＩＭ が利用不可。"
 
-#: actions/imsettings.php:116
 #, fuzzy, php-format
 msgid "Current confirmed %s address."
 msgstr "現在確認されているメールアドレス。"
 
 #. TRANS: Form note in IM settings form.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:128
 #, fuzzy, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your %s account for a message "
@@ -3278,35 +2640,29 @@ msgstr ""
 "このアドレスは承認待ちです。Jabber か Gtalk のアカウントで追加の指示が書かれ"
 "たメッセージを確認してください。(%s を友人リストに追加しましたか？)"
 
-#: actions/imsettings.php:140
 msgid "IM address"
 msgstr "IMアドレス"
 
-#: actions/imsettings.php:142
 #, php-format
 msgid "%s screenname."
 msgstr ""
 
 #. TRANS: Header for IM preferences form.
-#: actions/imsettings.php:163
 #, fuzzy
 msgid "IM Preferences"
 msgstr "設定が保存されました。"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:174
 #, fuzzy
 msgid "Send me notices"
 msgstr "つぶやきを送る"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:176
 #, fuzzy
 msgid "Post a notice when my status changes."
 msgstr "Jabber/GTalkのステータスが変更された時に通知を送る。"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:178
 #, fuzzy
 msgid "Send me replies from people I'm not subscribed to."
 msgstr ""
@@ -3314,54 +2670,45 @@ msgstr ""
 "い。"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:181
 #, fuzzy
 msgid "Publish a MicroID"
 msgstr "私のメールアドレスのためにMicroIDを発行してください。"
 
 #. TRANS: Server error thrown on database error updating IM preferences.
-#: actions/imsettings.php:291
 #, fuzzy
 msgid "Couldn't update IM preferences."
 msgstr "ユーザを更新できませんでした。"
 
 #. TRANS: Confirmation message for successful IM preferences save.
 #. TRANS: Confirmation message after saving preferences.
-#: actions/imsettings.php:298 actions/urlsettings.php:244
 msgid "Preferences saved."
 msgstr "設定が保存されました。"
 
 #. TRANS: Message given saving IM address without having provided one.
-#: actions/imsettings.php:320
 #, fuzzy
 msgid "No screenname."
 msgstr "ニックネームがありません。"
 
-#: actions/imsettings.php:325
 #, fuzzy
 msgid "No transport."
 msgstr "つぶやきがありません。"
 
 #. TRANS: Message given saving IM address that cannot be normalised.
-#: actions/imsettings.php:333
 #, fuzzy
 msgid "Cannot normalize that screenname"
 msgstr "その Jabbar ID を正規化できません"
 
 #. TRANS: Message given saving IM address that not valid.
-#: actions/imsettings.php:340
 #, fuzzy
 msgid "Not a valid screenname"
 msgstr "有効なニックネームではありません。"
 
 #. TRANS: Message given saving IM address that is already set for another user.
-#: actions/imsettings.php:344
 #, fuzzy
 msgid "Screenname already belongs to another user."
 msgstr "Jabber ID ｊは既に別のユーザが使用しています。"
 
 #. TRANS: Message given saving valid IM address that is to be confirmed.
-#: actions/imsettings.php:369
 #, fuzzy
 msgid "A confirmation code was sent to the IM address you added."
 msgstr ""
@@ -3369,86 +2716,72 @@ msgstr ""
 "ようにするには%sを承認してください。"
 
 #. TRANS: Message given canceling IM address confirmation for the wrong IM address.
-#: actions/imsettings.php:396
 msgid "That is the wrong IM address."
 msgstr "その IM アドレスは不正です。"
 
 #. TRANS: Server error thrown on database error canceling IM address confirmation.
-#: actions/imsettings.php:405
 #, fuzzy
 msgid "Couldn't delete confirmation."
 msgstr "メール承認を削除できません"
 
 #. TRANS: Message given after successfully canceling IM address confirmation.
-#: actions/imsettings.php:410
 msgid "IM confirmation cancelled."
 msgstr "確認コードがありません。"
 
 #. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.
-#: actions/imsettings.php:434
 #, fuzzy
 msgid "That is not your screenname."
 msgstr "それはあなたの電話番号ではありません。"
 
 #. TRANS: Server error thrown on database error removing a registered IM address.
-#: actions/imsettings.php:443
 #, fuzzy
 msgid "Couldn't update user im prefs."
 msgstr "ユーザレコードを更新できません。"
 
 #. TRANS: Message given after successfully removing a registered Instant Messaging address.
-#: actions/imsettings.php:451
 msgid "The IM address was removed."
 msgstr "入ってくるメールアドレスは削除されました。"
 
 #. TRANS: Title for all but the first page of the inbox page.
 #. TRANS: %1$s is the user's nickname, %2$s is the page number.
-#: actions/inbox.php:59
 #, php-format
 msgid "Inbox for %1$s - page %2$d"
 msgstr "%1$s の受信箱 - ページ %2$d"
 
 #. TRANS: Title for the first page of the inbox page.
 #. TRANS: %s is the user's nickname.
-#: actions/inbox.php:64
 #, php-format
 msgid "Inbox for %s"
 msgstr "%s の受信箱"
 
 #. TRANS: Instructions for user inbox page.
-#: actions/inbox.php:106
 msgid "This is your inbox, which lists your incoming private messages."
 msgstr ""
 "これはあなたの受信箱です、やってきたプライベートメッセージをリストします。"
 
 #. TRANS: Client error displayed when trying to sent invites while they have been disabled.
-#: actions/invite.php:41
 msgid "Invites have been disabled."
 msgstr "招待は無効にされました。"
 
 #. TRANS: Client error displayed when trying to sent invites while not logged in.
 #. TRANS: %s is the StatusNet site name.
-#: actions/invite.php:45
 #, php-format
 msgid "You must be logged in to invite other users to use %s."
 msgstr "グループを編集するにはログインしていなければなりません。"
 
 #. TRANS: Form validation message when providing an e-mail address that does not validate.
 #. TRANS: %s is an invalid e-mail address.
-#: actions/invite.php:78
 #, fuzzy, php-format
 msgid "Invalid email address: %s."
 msgstr "不正なメールアドレス：%s'"
 
 #. TRANS: Page title when invitations have been sent.
-#: actions/invite.php:117
 #, fuzzy
 msgid "Invitations sent"
 msgstr "招待を送りました。"
 
 #. TRANS: Page title when inviting potential users.
-#: actions/invite.php:120
 msgid "Invite new users"
 msgstr "新しいユーザを招待"
 
@@ -3456,7 +2789,6 @@ msgstr "新しいユーザを招待"
 #. TRANS: is already subscribed to one or more users with the given e-mail address(es).
 #. TRANS: Plural form is based on the number of reported already subscribed e-mail addresses.
 #. TRANS: Followed by a bullet list.
-#: actions/invite.php:140
 #, fuzzy
 msgid "You are already subscribed to this user:"
 msgid_plural "You are already subscribed to these users:"
@@ -3464,7 +2796,6 @@ msgstr[0] "すでにこれらのユーザをフォローしています:"
 
 #. TRANS: Used as list item for already subscribed users (%1$s is nickname, %2$s is e-mail address).
 #. TRANS: Used as list item for already registered people (%1$s is nickname, %2$s is e-mail address).
-#: actions/invite.php:146 actions/invite.php:160
 #, fuzzy, php-format
 msgctxt "INVITE"
 msgid "%1$s (%2$s)"
@@ -3473,7 +2804,6 @@ msgstr "%1$s (%2$s)"
 #. TRANS: Message displayed inviting users to use a StatusNet site while the invited user
 #. TRANS: already uses a this StatusNet site. Plural form is based on the number of
 #. TRANS: reported already present people. Followed by a bullet list.
-#: actions/invite.php:154
 #, fuzzy
 msgid "This person is already a user and you were automatically subscribed:"
 msgid_plural ""
@@ -3485,7 +2815,6 @@ msgstr[0] ""
 #. TRANS: Message displayed inviting users to use a StatusNet site. Plural form is
 #. TRANS: based on the number of invitations sent. Followed by a bullet list of
 #. TRANS: e-mail addresses to which invitations were sent.
-#: actions/invite.php:168
 #, fuzzy
 msgid "Invitation sent to the following person:"
 msgid_plural "Invitations sent to the following people:"
@@ -3493,7 +2822,6 @@ msgstr[0] "招待を以下の人々に送信しました:"
 
 #. TRANS: Generic message displayed after sending out one or more invitations to
 #. TRANS: people to join a StatusNet site.
-#: actions/invite.php:178
 msgid ""
 "You will be notified when your invitees accept the invitation and register "
 "on the site. Thanks for growing the community!"
@@ -3502,35 +2830,30 @@ msgstr ""
 "しょう。 コミュニティを広げてくださってありがとうございます!"
 
 #. TRANS: Form instructions.
-#: actions/invite.php:191
 msgid ""
 "Use this form to invite your friends and colleagues to use this service."
 msgstr ""
 "友人や同僚がこのサービスを利用するようこのフォームを使用して誘ってください。"
 
 #. TRANS: Field label for a list of e-mail addresses.
-#: actions/invite.php:218
 msgid "Email addresses"
 msgstr "メールアドレス"
 
 #. TRANS: Tooltip for field label for a list of e-mail addresses.
-#: actions/invite.php:221
 #, fuzzy
 msgid "Addresses of friends to invite (one per line)."
 msgstr "招待する友人のアドレス (一行に一つ)"
 
 #. TRANS: Field label for a personal message to send to invitees.
-#: actions/invite.php:225
 msgid "Personal message"
 msgstr "パーソナルメッセージ"
 
 #. TRANS: Tooltip for field label for a personal message to send to invitees.
-#: actions/invite.php:228
 msgid "Optionally add a personal message to the invitation."
 msgstr "任意に招待にパーソナルメッセージを加えてください。"
 
 #. TRANS: Send button for inviting friends
-#: actions/invite.php:232
+#. TRANS: Button text for sending notice.
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Send"
@@ -3539,7 +2862,6 @@ msgstr "投稿"
 #. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral
 #. TRANS: singular 3rd-person pronoun in English. %1$s is the inviting user, $2$s is
 #. TRANS: the StatusNet sitename.
-#: actions/invite.php:264
 #, php-format
 msgid "%1$s has invited you to join them on %2$s"
 msgstr "%1$s があなたを %2$s へ招待しました"
@@ -3549,7 +2871,6 @@ msgstr "%1$s があなたを %2$s へ招待しました"
 #. TRANS: StatusNet sitename, %3$s is the site URL, %4$s is the personal message from the
 #. TRANS: inviting user, %s%5 a link to the timeline for the inviting user, %s$6 is a link
 #. TRANS: to register with the StatusNet site.
-#: actions/invite.php:271
 #, php-format
 msgid ""
 "%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -3607,182 +2928,177 @@ msgstr ""
 "%2$s\n"
 
 #. TRANS: Client error displayed when trying to join a group while not logged in.
-#: actions/joingroup.php:59
 msgid "You must be logged in to join a group."
 msgstr "グループに入るためにはログインしなければなりません。"
 
 #. TRANS: Title for join group page after joining.
-#: actions/joingroup.php:148
 #, fuzzy, php-format
 msgctxt "TITLE"
 msgid "%1$s joined group %2$s"
 msgstr "%1$s はグループ %2$s に参加しました"
 
 #. TRANS: Client error displayed when trying to leave a group while not logged in.
-#: actions/leavegroup.php:59
 msgid "You must be logged in to leave a group."
 msgstr "グループから離れるにはログインしていなければなりません。"
 
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
-#: actions/leavegroup.php:103 lib/command.php:398
 msgid "You are not a member of that group."
 msgstr "あなたはそのグループのメンバーではありません。"
 
 #. TRANS: Title for leave group page after leaving.
-#: actions/leavegroup.php:142
 #, fuzzy, php-format
 msgctxt "TITLE"
 msgid "%1$s left group %2$s"
 msgstr "%1$s はグループ %2$s に残りました。"
 
 #. TRANS: User admin panel title
-#: actions/licenseadminpanel.php:55
 msgctxt "TITLE"
 msgid "License"
 msgstr "ライセンス"
 
-#: actions/licenseadminpanel.php:65
+#. TRANS: Form instructions for the site license admin panel.
 msgid "License for this StatusNet site"
 msgstr "このStatusNetサイトのライセンス"
 
-#: actions/licenseadminpanel.php:134
+#. TRANS: Client error displayed selecting an invalid license in the license admin panel.
 msgid "Invalid license selection."
 msgstr ""
 
-#: actions/licenseadminpanel.php:144
+#. TRANS: Client error displayed when not specifying an owner for the all rights reserved license in the license admin panel.
 msgid ""
 "You must specify the owner of the content when using the All Rights Reserved "
 "license."
 msgstr ""
 
-#: actions/licenseadminpanel.php:151
+#. TRANS: Client error displayed selecting a too long license title in the license admin panel.
 #, fuzzy
 msgid "Invalid license title. Maximum length is 255 characters."
 msgstr "不正なウェルカムテキスト。最大長は255字です。"
 
-#: actions/licenseadminpanel.php:163
+#. TRANS: Client error displayed specifying an invalid license URL in the license admin panel.
 msgid "Invalid license URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:166
+#. TRANS: Client error displayed specifying an invalid license image URL in the license admin panel.
 msgid "Invalid license image URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:174
+#. TRANS: Client error displayed specifying an invalid license URL in the license admin panel.
 msgid "License URL must be blank or a valid URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:182
+#. TRANS: Client error displayed specifying an invalid license image URL in the license admin panel.
 msgid "License image must be blank or valid URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:232
+#. TRANS: Form legend in the license admin panel.
 msgid "License selection"
 msgstr ""
 
-#: actions/licenseadminpanel.php:238
+#. TRANS: License option in the license admin panel.
 msgid "Private"
 msgstr "プライベート"
 
-#: actions/licenseadminpanel.php:239
+#. TRANS: License option in the license admin panel.
 msgid "All Rights Reserved"
 msgstr ""
 
-#: actions/licenseadminpanel.php:240
+#. TRANS: License option in the license admin panel.
 msgid "Creative Commons"
 msgstr ""
 
-#: actions/licenseadminpanel.php:245
+#. TRANS: Dropdown field label in the license admin panel.
 msgid "Type"
 msgstr ""
 
-#: actions/licenseadminpanel.php:247
-msgid "Select license"
-msgstr ""
+#. TRANS: Dropdown field instructions in the license admin panel.
+#, fuzzy
+msgid "Select a license."
+msgstr "キャリア選択"
 
-#: actions/licenseadminpanel.php:261
+#. TRANS: Form legend in the license admin panel.
 msgid "License details"
 msgstr ""
 
-#: actions/licenseadminpanel.php:267
+#. TRANS: Field label in the license admin panel.
 msgid "Owner"
 msgstr ""
 
-#: actions/licenseadminpanel.php:268
+#. TRANS: Field title in the license admin panel.
 msgid "Name of the owner of the site's content (if applicable)."
 msgstr ""
 
-#: actions/licenseadminpanel.php:276
+#. TRANS: Field label in the license admin panel.
 msgid "License Title"
 msgstr ""
 
-#: actions/licenseadminpanel.php:277
+#. TRANS: Field title in the license admin panel.
 msgid "The title of the license."
 msgstr ""
 
-#: actions/licenseadminpanel.php:285
+#. TRANS: Field label in the license admin panel.
 msgid "License URL"
 msgstr ""
 
-#: actions/licenseadminpanel.php:286
+#. TRANS: Field title in the license admin panel.
 msgid "URL for more information about the license."
 msgstr ""
 
-#: actions/licenseadminpanel.php:293
+#. TRANS: Field label in the license admin panel.
 msgid "License Image URL"
 msgstr ""
 
-#: actions/licenseadminpanel.php:294
+#. TRANS: Field title in the license admin panel.
 msgid "URL for an image to display with the license."
 msgstr ""
 
-#. TRANS: Submit button title.
-#: actions/licenseadminpanel.php:311 actions/sessionsadminpanel.php:199
-#: actions/siteadminpanel.php:292 actions/snapshotadminpanel.php:245
-#: actions/tagother.php:133 lib/applicationeditform.php:357
-msgid "Save"
-msgstr "保存"
-
-#: actions/licenseadminpanel.php:311
-msgid "Save license settings"
-msgstr ""
+#. TRANS: Button title in the license admin panel.
+#, fuzzy
+msgid "Save license settings."
+msgstr "サイト設定の保存"
 
+#. TRANS: Client error displayed when trying to log in while already logged in.
 #. TRANS: Client error displayed trying to use "one time password login" when already logged in.
-#: actions/login.php:97 actions/otp.php:62 actions/register.php:130
 msgid "Already logged in."
 msgstr "既にログインしています。"
 
-#: actions/login.php:125
+#. TRANS: Form validation error displayed when trying to log in with incorrect credentials.
 msgid "Incorrect username or password."
 msgstr "ユーザ名またはパスワードが間違っています。"
 
+#. TRANS: Server error displayed when during login a server error occurs.
 #. TRANS: Server error displayed when a user object could not be created trying to login using "one time password login".
-#: actions/login.php:131 actions/otp.php:127
 msgid "Error setting user. You are probably not authorized."
 msgstr "ユーザ設定エラー。 あなたはたぶん承認されていません。"
 
-#: actions/login.php:185 actions/login.php:236 lib/action.php:598
+#. TRANS: Page title for login page.
 msgid "Login"
 msgstr "ログイン"
 
-#: actions/login.php:222
+#. TRANS: Form legend on login page.
 msgid "Login to site"
 msgstr "サイトへログイン"
 
-#: actions/login.php:231 actions/register.php:469
+#. TRANS: Checkbox label label on login page.
 msgid "Remember me"
 msgstr "ログイン状態を保持"
 
-#: actions/login.php:232 actions/register.php:471
+#. TRANS: Checkbox title on login page.
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "以降は自動的にログインする。共用コンピューターでは避けましょう！"
 
-#: actions/login.php:241
+#. TRANS: Button text for log in on login page.
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Login"
+msgstr "ログイン"
+
+#. TRANS: Link text for link to "reset password" on login page.
 msgid "Lost or forgotten password?"
 msgstr "パスワードを紛失、忘れた？"
 
-#: actions/login.php:259
+#. TRANS: Form instructions on login page before being able to change user settings.
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -3790,12 +3106,13 @@ msgstr ""
 "セキュリティー上の理由により、設定を変更する前にユーザ名とパスワードを入力し"
 "て下さい。"
 
-#: actions/login.php:263
+#. TRANS: Form instructions on login page.
 #, fuzzy
 msgid "Login with your username and password."
 msgstr "ユーザ名とパスワードでログイン"
 
-#: actions/login.php:266
+#. TRANS: Form instructions on login page. This message contains Markdown links in the form [Link text](Link).
+#. TRANS: %%action.register%% is a link to the registration page.
 #, fuzzy, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -3803,129 +3120,123 @@ msgstr ""
 "ユーザ名とパスワードで、ログインしてください。 まだユーザ名を持っていません"
 "か? 新しいアカウントを [登録](%%action.register%%)。"
 
-#: actions/makeadmin.php:92
+#. TRANS: Client error displayed when trying to make another user admin on the Make Admin page while not an admin.
 msgid "Only an admin can make another user an admin."
 msgstr "管理者だけが別のユーザを管理者にすることができます。"
 
-#: actions/makeadmin.php:96
+#. TRANS: Client error displayed when trying to make another user admin on the Make Admin page who already is admin.
+#. TRANS: %1$s is the user that is already admin, %2$s is the group user is already admin for.
 #, php-format
 msgid "%1$s is already an admin for group \"%2$s\"."
 msgstr "%1$s はすでにグループ \"%2$s\" の管理者です。"
 
-#: actions/makeadmin.php:133
+#. TRANS: Server error displayed when trying to make another user admin on the Make Admin page fails
+#. TRANS: because the group membership record could not be gotten.
+#. TRANS: %1$s is the to be admin user, %2$s is the group user should be admin for.
 #, php-format
 msgid "Can't get membership record for %1$s in group %2$s."
 msgstr "%1$s の会員資格記録をグループ %2$s 中から取得できません。"
 
-#: actions/makeadmin.php:146
+#. TRANS: Server error displayed when trying to make another user admin on the Make Admin page fails
+#. TRANS: because the group adminship record coud not be saved properly.
+#. TRANS: %1$s is the to be admin user, %2$s is the group user is already admin for.
 #, php-format
 msgid "Can't make %1$s an admin for group %2$s."
 msgstr "%1$s をグループ %2$s の管理者にすることはできません"
 
-#: actions/microsummary.php:69
+#. TRANS: Client error displayed trying to make a micro summary without providing a status.
 msgid "No current status."
 msgstr "結果なし。"
 
 #. TRANS: This is the title of the form for adding a new application.
-#: actions/newapplication.php:52
 msgid "New application"
 msgstr "新しいアプリケーション"
 
 #. TRANS: Client error displayed trying to add a new application while not logged in.
-#: actions/newapplication.php:64
 msgid "You must be logged in to register an application."
 msgstr "アプリケーションを登録するにはログインしていなければなりません。"
 
 #. TRANS: Form instructions for registering a new application.
-#: actions/newapplication.php:147
 msgid "Use this form to register a new application."
 msgstr "このフォームを使って新しいアプリケーションを登録します。"
 
 #. TRANS: Validation error shown when not providing a source URL in the "New application" form.
-#: actions/newapplication.php:189
 msgid "Source URL is required."
 msgstr "ソースURLが必要です。"
 
 #. TRANS: Server error displayed when an application could not be registered in the database through the "New application" form.
-#: actions/newapplication.php:279 actions/newapplication.php:289
 msgid "Could not create application."
 msgstr "アプリケーションを作成できません。"
 
 #. TRANS: Title for form to create a group.
-#: actions/newgroup.php:53
 msgid "New group"
 msgstr "新しいグループ"
 
 #. TRANS: Client exception thrown when a user tries to create a group while banned.
-#: actions/newgroup.php:73 classes/User_group.php:485
 #, fuzzy
 msgid "You are not allowed to create groups on this site."
 msgstr "このグループのメンバーではありません。"
 
 #. TRANS: Form instructions for group create form.
-#: actions/newgroup.php:117
 msgid "Use this form to create a new group."
 msgstr "このフォームを使って新しいグループを作成します。"
 
-#. TRANS: Group create form validation error.
-#: actions/newgroup.php:200
-#, fuzzy
-msgid "Alias cannot be the same as nickname."
-msgstr "別名はニックネームと同じではいけません。"
-
-#: actions/newmessage.php:71 actions/newmessage.php:234
+#. TRANS: Page title for new direct message page.
+#. TRANS: Page title on page for sending a direct message.
 msgid "New message"
 msgstr "新しいメッセージ"
 
-#. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
-#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:513
-msgid "You can't send a message to this user."
+#. TRANS: Client error displayed trying to send a direct message to a user while sender and
+#. TRANS: receiver are not subscribed to each other.
+#, fuzzy
+msgid "You cannot send a message to this user."
 msgstr "このユーザにメッセージを送ることはできません。"
 
+#. TRANS: Form validator error displayed trying to send a direct message without content.
+#. TRANS: Client error displayed trying to send a notice without content.
 #. TRANS: Command exception text shown when trying to send a direct message to another user without content.
 #. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
-#: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:490
-#: lib/command.php:593
 msgid "No content!"
 msgstr "コンテンツがありません！"
 
-#: actions/newmessage.php:161
+#. TRANS: Form validation error displayed trying to send a direct message without specifying a recipient.
 msgid "No recipient specified."
 msgstr "受取人が書かれていません。"
 
+#. TRANS: Client error displayed trying to send a direct message to self.
 #. TRANS: Error text shown when trying to send a direct message to self.
-#: actions/newmessage.php:167 lib/command.php:517
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
 "自分自身にメッセージを送ることはできません; かわりに独り言を言いましょう。"
 
-#: actions/newmessage.php:184
+#. TRANS: Page title after sending a direct message.
 msgid "Message sent"
 msgstr "メッセージを送りました"
 
+#. TRANS: Confirmation text after sending a direct message.
+#. TRANS: %s is the direct message recipient.
 #. TRANS: Message given have sent a direct message to another user.
 #. TRANS: %s is the name of the other user.
-#: actions/newmessage.php:188 lib/command.php:525
 #, php-format
 msgid "Direct message to %s sent."
 msgstr "ダイレクトメッセージを %s  に送りました"
 
-#: actions/newmessage.php:213 actions/newnotice.php:264
+#. TRANS: Page title after an AJAX error occurred on the "send direct message" page.
+#. TRANS: Page title after an AJAX error occurs on the send notice page.
 msgid "Ajax Error"
 msgstr "Ajax エラー"
 
-#: actions/newnotice.php:69
+#. TRANS: Page title for sending a new notice.
 msgid "New notice"
 msgstr "新しいつぶやき"
 
-#: actions/newnotice.php:230
+#. TRANS: Page title after sending a notice.
 msgid "Notice posted"
 msgstr "つぶやきを投稿しました"
 
 #. TRANS: Instructions for Notice search page.
 #. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/noticesearch.php:69
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -3934,20 +3245,17 @@ msgstr ""
 "%%site.name%% のつぶやきを内容から検索。検索語はスペース区切り。3字以上"
 
 #. TRANS: Title of the page where users can search for notices.
-#: actions/noticesearch.php:80
 msgid "Text search"
 msgstr "テキスト検索"
 
 #. TRANS: Test in RSS notice search.
 #. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearch.php:95
 #, php-format
 msgid "Search results for \"%1$s\" on %2$s"
 msgstr "\"%1$s\" の %2$s 上の検索結果"
 
 #. TRANS: Text for logged in users making a query for notices without results.
 #. TRANS: This message contains a Markdown link.
-#: actions/noticesearch.php:128
 #, php-format
 msgid ""
 "Be the first to [post on this topic](%%%%action.newnotice%%%%?"
@@ -3958,7 +3266,6 @@ msgstr ""
 
 #. TRANS: Text for not logged in users making a query for notices without results.
 #. TRANS: This message contains Markdown links.
-#: actions/noticesearch.php:133
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and be the first to "
@@ -3968,19 +3275,17 @@ msgstr ""
 "[このトピック投稿](%%%%action.newnotice%%%%?status_textarea=%s)してください!"
 
 #. TRANS: RSS notice search feed title. %s is the query.
-#: actions/noticesearchrss.php:95
 #, php-format
 msgid "Updates with \"%s\""
 msgstr "%s で更新"
 
 #. TRANS: RSS notice search feed description.
 #. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearchrss.php:99
 #, fuzzy, php-format
 msgid "Updates matching search term \"%1$s\" on %2$s."
 msgstr "\"%2$s\" 上の検索語 \"$1$s\" に一致するすべての更新"
 
-#: actions/nudge.php:85
+#. TRANS: Client error displayed trying to nudge a user that cannot be nudged.
 #, fuzzy
 msgid ""
 "This user doesn't allow nudges or hasn't confirmed or set their email "
@@ -3989,60 +3294,51 @@ msgstr ""
 "このユーザは、合図を許可していないか、確認されていた状態でないか、メール設定"
 "をしていません。"
 
-#: actions/nudge.php:94
+#. TRANS: Page title after sending a nudge.
 msgid "Nudge sent"
 msgstr "合図を送った"
 
-#: actions/nudge.php:97
+#. TRANS: Confirmation text after sending a nudge.
 msgid "Nudge sent!"
 msgstr "合図を送った!"
 
 #. TRANS: Message displayed to an anonymous user trying to view OAuth application list.
-#: actions/oauthappssettings.php:57
 msgid "You must be logged in to list your applications."
 msgstr "アプリケーションをリストするにはログインしていなければなりません。"
 
 #. TRANS: Page title for OAuth applications
-#: actions/oauthappssettings.php:73
 msgid "OAuth applications"
 msgstr "OAuth アプリケーション"
 
 #. TRANS: Page instructions for OAuth applications
-#: actions/oauthappssettings.php:85
 msgid "Applications you have registered"
 msgstr "あなたが登録したアプリケーション"
 
 #. TRANS: Empty list message on page with OAuth applications.
-#: actions/oauthappssettings.php:138
 #, php-format
 msgid "You have not registered any applications yet."
 msgstr "あなたはまだなんのアプリケーションも登録していません。"
 
 #. TRANS: Title for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:69
 msgid "Connected applications"
 msgstr "接続されたアプリケーション"
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:80
 msgid "The following connections exist for your account."
 msgstr ""
 
 #. TRANS: Client error when trying to revoke access for an application while not being a user of it.
-#: actions/oauthconnectionssettings.php:165
 msgid "You are not a user of that application."
 msgstr "あなたはそのアプリケーションのユーザではありません。"
 
 #. TRANS: Client error when revoking access has failed for some reason.
 #. TRANS: %s is the application ID revoking access failed for.
-#: actions/oauthconnectionssettings.php:180
 #, fuzzy, php-format
 msgid "Unable to revoke access for application: %s."
 msgstr "アプリケーションのための取消しアクセスができません: "
 
 #. TRANS: Success message after revoking access for an application.
 #. TRANS: %1$s is the application name, %2$s is the first part of the user token.
-#: actions/oauthconnectionssettings.php:199
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -4050,7 +3346,6 @@ msgid ""
 msgstr ""
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:210
 msgid "You have not authorized any applications to use your account."
 msgstr ""
 "あなたは、どんなアプリケーションもあなたのアカウントを使用するのを認可してい"
@@ -4059,468 +3354,386 @@ msgstr ""
 #. TRANS: Note for developers in the OAuth connection settings form.
 #. TRANS: This message contains a Markdown link. Do not separate "](".
 #. TRANS: %s is the URL to the OAuth settings.
-#: actions/oauthconnectionssettings.php:230
 #, php-format
 msgid ""
 "Are you a developer? [Register an OAuth client application](%s) to use with "
 "this instance of StatusNet."
 msgstr ""
 
-#: actions/oembed.php:64
+#. TRANS: Server error displayed in oEmbed action when path not found.
+#. TRANS: %s is a path.
 #, fuzzy, php-format
 msgid "\"%s\" not found."
 msgstr "API メソッドが見つかりません。"
 
-#: actions/oembed.php:76
+#. TRANS: Server error displayed in oEmbed action when notice not found.
+#. TRANS: %s is a notice.
 #, fuzzy, php-format
 msgid "Notice %s not found."
 msgstr "API メソッドが見つかりません。"
 
-#: actions/oembed.php:80 actions/shownotice.php:100
+#. TRANS: Server error displayed in oEmbed action when notice has not profile.
 msgid "Notice has no profile."
 msgstr "ユーザはプロフィールをもっていません。"
 
-#: actions/oembed.php:83 actions/shownotice.php:172
+#. TRANS: oEmbed title. %1$s is the author name, %2$s is the creation date.
 #, php-format
 msgid "%1$s's status on %2$s"
 msgstr "%2$s における %1$s のステータス"
 
-#: actions/oembed.php:95
+#. TRANS: Server error displayed in oEmbed action when attachment not found.
+#. TRANS: %d is an attachment ID.
 #, fuzzy, php-format
 msgid "Attachment %s not found."
 msgstr "受け取り手のユーザが見つかりません。"
 
-#: actions/oembed.php:136
+#. TRANS: Server error displayed in oEmbed request when a path is not supported.
+#. TRANS: %s is a path.
 #, php-format
 msgid "\"%s\" not supported for oembed requests."
 msgstr ""
 
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
-#: actions/oembed.php:168
 #, fuzzy, php-format
 msgid "Content type %s not supported."
 msgstr "内容種別 "
 
 #. TRANS: Error message displaying attachments. %s is the site's base URL.
-#: actions/oembed.php:172
 #, php-format
 msgid "Only %s URLs over plain HTTP please."
 msgstr ""
 
+#. TRANS: Server error displayed in oEmbed action when request specifies an unsupported data format.
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1207
-#: lib/apiaction.php:1234 lib/apiaction.php:1369
 msgid "Not a supported data format."
 msgstr "サポートされていないデータ形式。"
 
 #. TRANS: ShortName in the OpenSearch interface when trying to find users.
-#: actions/opensearch.php:64
 msgid "People Search"
 msgstr "ピープル検索"
 
-#: actions/opensearch.php:68
+#. TRANS: ShortName in the OpenSearch interface when trying to find notices.
 msgid "Notice Search"
 msgstr "つぶやき検索"
 
 #. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
-#: actions/otp.php:70
 msgid "No user ID specified."
 msgstr "ユーザIDの記述がありません。"
 
 #. TRANS: Client error displayed trying to use "one time password login" without specifying a login token.
-#: actions/otp.php:86
 msgid "No login token specified."
 msgstr "ログイントークンの記述がありません。"
 
 #. TRANS: Client error displayed trying to use "one time password login" without requesting a login token.
-#: actions/otp.php:94
 msgid "No login token requested."
 msgstr "ログイントークンが要求されていません。"
 
 #. TRANS: Client error displayed trying to use "one time password login" while specifying an invalid login token.
-#: actions/otp.php:100
 msgid "Invalid login token specified."
 msgstr "不正なログイントークンが指定されています。"
 
 #. TRANS: Client error displayed trying to use "one time password login" while specifying an expired login token.
-#: actions/otp.php:110
 msgid "Login token expired."
 msgstr "ログイントークンが期限切れです・"
 
 #. TRANS: Title for outbox for any but the fist page.
 #. TRANS: %1$s is the user nickname, %2$d is the page number.
-#: actions/outbox.php:57
 #, php-format
 msgid "Outbox for %1$s - page %2$d"
 msgstr "%1$s の送信箱 - ページ %2$d"
 
 #. TRANS: Title for first page of outbox.
-#: actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
 msgstr "%s の送信箱"
 
 #. TRANS: Instructions for outbox.
-#: actions/outbox.php:103
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr ""
 "これはあなたの送信箱です、あなたが送ったプライベート・メッセージをリストしま"
 "す。"
 
-#: actions/passwordsettings.php:58
 msgid "Change password"
 msgstr "パスワードの変更"
 
-#: actions/passwordsettings.php:69
 msgid "Change your password."
 msgstr "パスワードを変更します。"
 
 #. TRANS: Fieldset legend for password reset form.
-#: actions/passwordsettings.php:96 actions/recoverpassword.php:251
 msgid "Password change"
 msgstr "パスワード変更"
 
-#: actions/passwordsettings.php:104
 msgid "Old password"
 msgstr "古いパスワード"
 
 #. TRANS: Field label for password reset form.
-#: actions/passwordsettings.php:108 actions/recoverpassword.php:256
 msgid "New password"
 msgstr "新しいパスワード"
 
-#: actions/passwordsettings.php:109 actions/register.php:416
 #, fuzzy
 msgid "6 or more characters."
 msgstr "6文字以上"
 
 #. TRANS: Ttile for field label for password reset form where the password has to be typed again.
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:264
-#: actions/register.php:420
 #, fuzzy
 msgid "Same as password above."
 msgstr "上と同じパスワード"
 
-#: actions/passwordsettings.php:117
 msgid "Change"
 msgstr "変更"
 
-#: actions/passwordsettings.php:153 actions/register.php:223
 msgid "Password must be 6 or more characters."
 msgstr "パスワードは6文字以上にする必要があります。"
 
-#: actions/passwordsettings.php:156 actions/register.php:226
 msgid "Passwords don't match."
 msgstr "パスワードが一致しません。"
 
-#: actions/passwordsettings.php:164
 msgid "Incorrect old password"
 msgstr "古いパスワードが間違っています。"
 
-#: actions/passwordsettings.php:180
 msgid "Error saving user; invalid."
 msgstr "ユーザ保存エラー; 不正なユーザ"
 
 #. TRANS: Reset password form validation error message.
-#: actions/passwordsettings.php:185 actions/recoverpassword.php:418
 #, fuzzy
 msgid "Cannot save new password."
 msgstr "新しいパスワードを保存できません。"
 
-#: actions/passwordsettings.php:191
 msgid "Password saved."
 msgstr "パスワードが保存されました。"
 
 #. TRANS: Title for Paths admin panel.
 #. TRANS: Menu item for site administration
-#: actions/pathsadminpanel.php:58 lib/adminpanelaction.php:371
 msgid "Paths"
 msgstr "パス"
 
 #. TRANS: Form instructions for Path admin panel.
-#: actions/pathsadminpanel.php:69
 msgid "Path and server settings for this StatusNet site"
 msgstr ""
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the directory that could not be read from.
-#: actions/pathsadminpanel.php:155
 #, php-format
 msgid "Theme directory not readable: %s."
 msgstr "テーマディレクトリ"
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the avatar directory that could not be written to.
-#: actions/pathsadminpanel.php:163
 #, php-format
 msgid "Avatar directory not writable: %s."
 msgstr "アバターディレクトリ"
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the background directory that could not be written to.
-#: actions/pathsadminpanel.php:171
 #, php-format
 msgid "Background directory not writable: %s."
 msgstr "バックグラウンドディレクトリ"
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the locales directory that could not be read from.
-#: actions/pathsadminpanel.php:181
 #, fuzzy, php-format
 msgid "Locales directory not readable: %s."
 msgstr "場所ディレクトリが読み込めません: %s"
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the SSL server URL that is too long.
-#: actions/pathsadminpanel.php:189
 msgid "Invalid SSL server. The maximum length is 255 characters."
 msgstr "不正な SSL サーバー。最大 255 文字まで。"
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:235 actions/siteadminpanel.php:58
 msgid "Site"
 msgstr "サイト"
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:241 actions/pathsadminpanel.php:279
-#: actions/pathsadminpanel.php:370 actions/pathsadminpanel.php:425
 msgid "Server"
 msgstr "サーバー"
 
-#: actions/pathsadminpanel.php:242
 msgid "Site's server hostname."
 msgstr "サイトのサーバーホスト名"
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:248 actions/pathsadminpanel.php:288
-#: actions/pathsadminpanel.php:379 actions/pathsadminpanel.php:434
 msgid "Path"
 msgstr "パス"
 
-#: actions/pathsadminpanel.php:249
 #, fuzzy
 msgid "Site path."
 msgstr "サイトパス"
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:255
 #, fuzzy
 msgid "Locale directory"
 msgstr "テーマディレクトリ"
 
-#: actions/pathsadminpanel.php:256
 #, fuzzy
 msgid "Directory path to locales."
 msgstr "ロケールへのディレクトリパス"
 
 #. TRANS: Checkbox label in Paths admin panel.
-#: actions/pathsadminpanel.php:263
 msgid "Fancy URLs"
 msgstr ""
 
-#: actions/pathsadminpanel.php:265
 msgid "Use fancy (more readable and memorable) URLs?"
 msgstr "Fancy URL (読みやすく忘れにくい) を使用しますか?"
 
-#: actions/pathsadminpanel.php:272
 msgid "Theme"
 msgstr "テーマ"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:281
 #, fuzzy
 msgid "Server for themes."
 msgstr "サイトのテーマ"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:290
 msgid "Web path to themes."
 msgstr ""
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:297 actions/pathsadminpanel.php:388
-#: actions/pathsadminpanel.php:443 actions/pathsadminpanel.php:495
 msgid "SSL server"
 msgstr "SSLサーバ"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:299
 msgid "SSL server for themes (default: SSL server)."
 msgstr ""
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:306 actions/pathsadminpanel.php:397
-#: actions/pathsadminpanel.php:452
 #, fuzzy
 msgid "SSL path"
 msgstr "サイトパス"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:308
 msgid "SSL path to themes (default: /theme/)."
 msgstr ""
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:315 actions/pathsadminpanel.php:406
-#: actions/pathsadminpanel.php:461
 #, fuzzy
 msgid "Directory"
 msgstr "テーマディレクトリ"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:317
 #, fuzzy
 msgid "Directory where themes are located."
 msgstr "ロケールへのディレクトリパス"
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:326
 msgid "Avatars"
 msgstr "アバター"
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:333
 msgid "Avatar server"
 msgstr "アバターサーバー"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:335
 #, fuzzy
 msgid "Server for avatars."
 msgstr "サイトのテーマ"
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:342
 msgid "Avatar path"
 msgstr "アバターパス"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:344
 #, fuzzy
 msgid "Web path to avatars."
 msgstr "アバターの更新に失敗しました。"
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:351
 msgid "Avatar directory"
 msgstr "アバターディレクトリ"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:353
 #, fuzzy
 msgid "Directory where avatars are located."
 msgstr "ロケールへのディレクトリパス"
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:364
 msgid "Backgrounds"
 msgstr "バックグラウンド"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:372
 #, fuzzy
 msgid "Server for backgrounds."
 msgstr "サイトのテーマ"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:381
 msgid "Web path to backgrounds."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:390
 msgid "Server for backgrounds on SSL pages."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:399
 msgid "Web path to backgrounds on SSL pages."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:408
 #, fuzzy
 msgid "Directory where backgrounds are located."
 msgstr "ロケールへのディレクトリパス"
 
 #. TRANS: Fieldset legens in Paths admin panel.
-#: actions/pathsadminpanel.php:419
 msgid "Attachments"
 msgstr "添付"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:427
 #, fuzzy
 msgid "Server for attachments."
 msgstr "サイトのテーマ"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:436
 #, fuzzy
 msgid "Web path to attachments."
 msgstr "そのような添付はありません。"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:445
 #, fuzzy
 msgid "Server for attachments on SSL pages."
 msgstr "サイトのテーマ"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:454
 msgid "Web path to attachments on SSL pages."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:463
 #, fuzzy
 msgid "Directory where attachments are located."
 msgstr "ロケールへのディレクトリパス"
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:472
 msgid "SSL"
 msgstr "SSL"
 
 #. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
-#: actions/pathsadminpanel.php:477 actions/snapshotadminpanel.php:202
 msgid "Never"
 msgstr ""
 
 #. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
-#: actions/pathsadminpanel.php:479
 msgid "Sometimes"
 msgstr "ときどき"
 
 #. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
-#: actions/pathsadminpanel.php:481
 msgid "Always"
 msgstr "いつも"
 
-#: actions/pathsadminpanel.php:485
 msgid "Use SSL"
 msgstr "SSL 使用"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:487
 #, fuzzy
 msgid "When to use SSL."
 msgstr "SSL 使用時"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:497
 #, fuzzy
 msgid "Server to direct SSL requests to."
 msgstr "ダイレクト SSL リクエストを向けるサーバ"
 
 #. TRANS: Button title text to store form data in the Paths admin panel.
-#: actions/pathsadminpanel.php:514
 msgid "Save paths"
 msgstr "保存パス"
 
 #. TRANS: Instructions for the "People search" page.
 #. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/peoplesearch.php:54
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
@@ -4530,57 +3743,46 @@ msgstr ""
 "上。"
 
 #. TRANS: Title of a page where users can search for other users.
-#: actions/peoplesearch.php:61
 msgid "People search"
 msgstr "ピープルサーチ"
 
-#: actions/peopletag.php:68
 #, php-format
 msgid "Not a valid people tag: %s."
 msgstr "有効なメールアドレスではありません。"
 
-#: actions/peopletag.php:142
 #, php-format
 msgid "Users self-tagged with %1$s - page %2$d"
 msgstr "ユーザ自身がつけたタグ %1$s  - ページ %2$d"
 
 #. TRANS: Page title for AJAX form return when a disabling a plugin.
-#: actions/plugindisable.php:69
 msgctxt "plugin"
 msgid "Disabled"
 msgstr ""
 
 #. TRANS: Client error displayed trying to perform any request method other than POST.
 #. TRANS: Do not translate POST.
-#: actions/pluginenable.php:78 actions/subscribe.php:77
 msgid "This action only accepts POST requests."
 msgstr ""
 
-#: actions/pluginenable.php:102
 #, fuzzy
 msgid "You cannot administer plugins."
 msgstr "ユーザを削除できません"
 
-#: actions/pluginenable.php:109
 #, fuzzy
 msgid "No such plugin."
 msgstr "そのようなページはありません。"
 
 #. TRANS: Page title for AJAX form return when enabling a plugin.
-#: actions/pluginenable.php:159
 msgctxt "plugin"
 msgid "Enabled"
 msgstr ""
 
 #. TRANS: Tab and title for plugins admin panel.
 #. TRANS: Menu item for site administration
-#: actions/pluginsadminpanel.php:56 actions/version.php:191
-#: lib/adminpanelaction.php:411
 msgid "Plugins"
 msgstr "プラグイン"
 
 #. TRANS: Instructions at top of plugin admin page.
-#: actions/pluginsadminpanel.php:68
 msgid ""
 "Additional plugins can be enabled and configured manually. See the <a href="
 "\"http://status.net/wiki/Plugins\">online plugin documentation</a> for more "
@@ -4588,33 +3790,27 @@ msgid ""
 msgstr ""
 
 #. TRANS: Admin form section header
-#: actions/pluginsadminpanel.php:84
 #, fuzzy
 msgid "Default plugins"
 msgstr "ご希望の言語"
 
-#: actions/pluginsadminpanel.php:106
 msgid ""
 "All default plugins have been disabled from the site's configuration file."
 msgstr ""
 
-#: actions/postnotice.php:95
 msgid "Invalid notice content."
 msgstr "不正なトークン。"
 
-#: actions/postnotice.php:101
 #, php-format
 msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’."
 msgstr ""
 "つぶやきライセンス ‘%1$s’ はサイトライセンス ‘%2$s’ と互換性がありません。"
 
 #. TRANS: Page title for profile settings.
-#: actions/profilesettings.php:60
 msgid "Profile settings"
 msgstr "プロファイル設定"
 
 #. TRANS: Usage instructions for profile settings.
-#: actions/profilesettings.php:71
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
@@ -4622,31 +3818,24 @@ msgstr ""
 "す。"
 
 #. TRANS: Profile settings form legend.
-#: actions/profilesettings.php:99
 msgid "Profile information"
 msgstr "プロファイル情報"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:110 actions/register.php:412
 #, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr "1-64文字の、小文字アルファベットか数字で、スペースや句読点は除く"
 
 #. TRANS: Field label in form for profile settings.
-#: actions/profilesettings.php:114 actions/register.php:434
-#: lib/groupeditform.php:150
 msgid "Full name"
 msgstr "フルネーム"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:119 actions/register.php:439
-#: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "ホームページ"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:122 actions/register.php:441
 #, fuzzy
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr "ホームページ、ブログ、プロファイル、その他サイトの URL"
@@ -4654,48 +3843,37 @@ msgstr "ホームページ、ブログ、プロファイル、その他サイト
 #. TRANS: Tooltip for field label in form for profile settings. Plural
 #. TRANS: is decided by the number of characters available for the
 #. TRANS: biography (%d).
-#: actions/profilesettings.php:130 actions/register.php:450
 #, fuzzy, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
 msgstr[0] "%d字以内で自分自身と自分の興味について書いてください"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:136 actions/register.php:455
 msgid "Describe yourself and your interests"
 msgstr "自分自身と自分の興味について書いてください"
 
 #. TRANS: Text area label in form for profile settings where users can provide.
 #. TRANS: their biography.
-#: actions/profilesettings.php:140 actions/register.php:457
 msgid "Bio"
 msgstr "自己紹介"
 
 #. TRANS: Field label in form for profile settings.
-#: actions/profilesettings.php:146 actions/register.php:462
-#: lib/groupeditform.php:173
 msgid "Location"
 msgstr "場所"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:149
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "自分のいる場所。例：「都市, 都道府県 (または地域), 国」"
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:154
 msgid "Share my current location when posting notices"
 msgstr "つぶやきを投稿するときには私の現在の場所を共有してください"
 
 #. TRANS: Field label in form for profile settings.
-#: actions/profilesettings.php:162 actions/tagother.php:128
-#: actions/tagother.php:188 lib/subscriptionlist.php:104
-#: lib/subscriptionlist.php:106
 msgid "Tags"
 msgstr "タグ"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:165
 #, fuzzy
 msgid ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- "
@@ -4705,28 +3883,23 @@ msgstr ""
 "りで"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:170
 msgid "Language"
 msgstr "言語"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:172
 #, fuzzy
 msgid "Preferred language."
 msgstr "ご希望の言語"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:182
 msgid "Timezone"
 msgstr "タイムゾーン"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:184
 msgid "What timezone are you normally in?"
 msgstr "普段のタイムゾーンはどれですか？"
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:190
 #, fuzzy
 msgid ""
 "Automatically subscribe to whoever subscribes to me (best for non-humans)."
@@ -4735,92 +3908,75 @@ msgstr "自分をフォローしている者を自動的にフォローする (B
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Plural form is used based on the maximum number of allowed
 #. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:259 actions/register.php:214
 #, fuzzy, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
 msgstr[0] "自己紹介が長すぎます (最長%d文字)。"
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:270 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr "タイムゾーンが選ばれていません。"
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:278
 #, fuzzy
 msgid "Language is too long (maximum 50 characters)."
 msgstr "言語が長すぎます。(最大50字)"
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:292
 #, fuzzy, php-format
 msgid "Invalid tag: \"%s\"."
 msgstr "不正なタグ: \"%s\""
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:348
 #, fuzzy
 msgid "Could not update user for autosubscribe."
 msgstr "自動フォローのためのユーザを更新できませんでした。"
 
 #. TRANS: Server error thrown when user profile location preference settings could not be updated.
-#: actions/profilesettings.php:406
 #, fuzzy
 msgid "Could not save location prefs."
 msgstr "場所情報を保存できません。"
 
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:428 actions/tagother.php:179
 msgid "Could not save tags."
 msgstr "タグをを保存できません。"
 
 #. TRANS: Confirmation shown when user profile settings are saved.
 #. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:437 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "設定が保存されました。"
 
 #. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
 #. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:484 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "新しいグループを作成"
 
-#: actions/public.php:83
 #, fuzzy, php-format
 msgid "Beyond the page limit (%s)."
 msgstr "ページ制限を超えました (%s)"
 
-#: actions/public.php:92
 msgid "Could not retrieve public stream."
 msgstr "パブリックストリームを検索できません。"
 
-#: actions/public.php:130
 #, php-format
 msgid "Public timeline, page %d"
 msgstr "パブリックタイムライン、ページ %d"
 
-#: actions/public.php:132 lib/publicgroupnav.php:79
 msgid "Public timeline"
 msgstr "パブリックタイムライン"
 
-#: actions/public.php:160
 msgid "Public Stream Feed (RSS 1.0)"
 msgstr "パブリックストリームフィード (RSS 1.0)"
 
-#: actions/public.php:164
 msgid "Public Stream Feed (RSS 2.0)"
 msgstr "パブリックストリームフィード (RSS 2.0)"
 
-#: actions/public.php:168
 msgid "Public Stream Feed (Atom)"
 msgstr "パブリックストリームフィード (Atom)"
 
-#: actions/public.php:188
 #, php-format
 msgid ""
 "This is the public timeline for %%site.name%% but no one has posted anything "
@@ -4829,11 +3985,9 @@ msgstr ""
 "これは %%site.name%% のパブリックタイムラインです、しかしまだ誰も投稿していま"
 "せん。"
 
-#: actions/public.php:191
 msgid "Be the first to post!"
 msgstr "投稿する1番目になってください!"
 
-#: actions/public.php:195
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post!"
@@ -4841,7 +3995,6 @@ msgstr ""
 "なぜ [アカウント登録](%%action.register%%) しないのですか、そして最初の投稿を"
 "してください!"
 
-#: actions/public.php:242
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -4855,7 +4008,6 @@ msgstr ""
 "族そして同僚などについてのつぶやきを共有しましょう! ([もっと読む](%%doc.help%"
 "%))"
 
-#: actions/public.php:247
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -4867,19 +4019,16 @@ msgstr ""
 "blogging) サービス。"
 
 #. TRANS: Public RSS feed description. %s is the StatusNet site name.
-#: actions/publicrss.php:106
 #, fuzzy, php-format
 msgid "%s updates from everyone."
 msgstr "皆からの %s アップデート!"
 
 #. TRANS: Title for public tag cloud.
-#: actions/publictagcloud.php:57
 msgid "Public tag cloud"
 msgstr "パブリックタグクラウド"
 
 #. TRANS: Instructions (more used like an explanation/header).
 #. TRANS: %s is the StatusNet sitename.
-#: actions/publictagcloud.php:65
 #, fuzzy, php-format
 msgid "These are most popular recent tags on %s"
 msgstr "これらは %s の人気がある最近のタグです "
@@ -4887,7 +4036,6 @@ msgstr "これらは %s の人気がある最近のタグです "
 #. TRANS: This message contains a Markdown URL. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.
-#: actions/publictagcloud.php:74
 #, php-format
 msgid "No one has posted a notice with a [hashtag](%%doc.tags%%) yet."
 msgstr ""
@@ -4895,7 +4043,6 @@ 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.
-#: actions/publictagcloud.php:79
 msgid "Be the first to post one!"
 msgstr "投稿する1番目になってください!"
 
@@ -4904,7 +4051,6 @@ msgstr "投稿する1番目になってください!"
 #. TRANS: This message contains a Markdown URL. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.
-#: actions/publictagcloud.php:87
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post "
@@ -4914,42 +4060,34 @@ msgstr ""
 "してください!"
 
 #. TRANS: Client error displayed trying to recover password while already logged in.
-#: actions/recoverpassword.php:37
 msgid "You are already logged in!"
 msgstr "既にログイン済みです。"
 
 #. TRANS: Client error displayed when password recovery code is not correct.
-#: actions/recoverpassword.php:64
 msgid "No such recovery code."
 msgstr "そのような回復コードはありません。"
 
 #. TRANS: Client error displayed when no proper password recovery code was submitted.
-#: actions/recoverpassword.php:69
 msgid "Not a recovery code."
 msgstr "回復コードではありません。"
 
 #. TRANS: Server error displayed trying to recover password without providing a user.
-#: actions/recoverpassword.php:77
 msgid "Recovery code for unknown user."
 msgstr "不明なユーザのための回復コード。"
 
 #. TRANS: Server error displayed removing a password recovery code from the database.
-#: actions/recoverpassword.php:91
 msgid "Error with confirmation code."
 msgstr "確認コードにエラーがあります。"
 
 #. TRANS: Client error displayed trying to recover password with too old a recovery code.
-#: actions/recoverpassword.php:103
 msgid "This confirmation code is too old. Please start again."
 msgstr "確認コードが古すぎます。もう一度やり直してください。"
 
 #. TRANS: Server error displayed when updating a user's e-mail address in the database fails while recovering a password.
-#: actions/recoverpassword.php:118
 msgid "Could not update user with confirmed email address."
 msgstr "確認されたメールアドレスでユーザを更新できません。"
 
 #. TRANS: Page notice for password recovery page.
-#: actions/recoverpassword.php:160
 msgid ""
 "If you have forgotten or lost your password, you can get a new one sent to "
 "the email address you have stored in your account."
@@ -4957,175 +4095,141 @@ msgstr ""
 "あなたのパスワードを忘れるか紛失したなら、あなたはアカウントに格納したメール"
 "アドレスに新しいものを送らせることができます。"
 
-#: actions/recoverpassword.php:167
 msgid "You have been identified. Enter a new password below."
 msgstr "あなたは特定されました。 以下の新しいパスワードを入力してください。"
 
 #. TRANS: Fieldset legend for password recovery page.
-#: actions/recoverpassword.php:198
 msgid "Password recovery"
 msgstr "パスワード回復"
 
 #. TRANS: Field label on password recovery page.
-#: actions/recoverpassword.php:202
 msgid "Nickname or email address"
 msgstr "ニックネームまたはメールアドレス"
 
 #. TRANS: Title for field label on password recovery page.
-#: actions/recoverpassword.php:205
 msgid "Your nickname on this server, or your registered email address."
 msgstr "このサーバでのニックネーム、または登録したメールアドレス。"
 
 #. TRANS: Field label on password recovery page.
-#: actions/recoverpassword.php:212
 msgid "Recover"
 msgstr "回復"
 
 #. TRANS: Button text on password recovery page.
-#: actions/recoverpassword.php:214
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Recover"
 msgstr "回復"
 
 #. TRANS: Title for password recovery page in password reset mode.
-#: actions/recoverpassword.php:223
 msgid "Reset password"
 msgstr "パスワードをリセット"
 
 #. TRANS: Title for password recovery page in password recover mode.
-#: actions/recoverpassword.php:225
 msgid "Recover password"
 msgstr "パスワードを回復"
 
 #. TRANS: Title for password recovery page in email sent mode.
 #. TRANS: Subject for password recovery e-mail.
-#: actions/recoverpassword.php:227 actions/recoverpassword.php:366
 msgid "Password recovery requested"
 msgstr "パスワード回復がリクエストされました"
 
 #. TRANS: Title for password recovery page in password saved mode.
-#: actions/recoverpassword.php:229
 #, fuzzy
 msgid "Password saved"
 msgstr "パスワードが保存されました。"
 
 #. TRANS: Title for password recovery page when an unknown action has been specified.
-#: actions/recoverpassword.php:232
 msgid "Unknown action"
 msgstr "不明なアクション"
 
 #. TRANS: Title for field label for password reset form.
-#: actions/recoverpassword.php:258
 #, fuzzy
 msgid "6 or more characters, and do not forget it!"
 msgstr "6文字以上。忘れないでください！"
 
 #. TRANS: Button text for password reset form.
 #. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: actions/recoverpassword.php:268 lib/designform.php:145
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Reset"
 msgstr "リセット"
 
 #. TRANS: Form instructions for password recovery form.
-#: actions/recoverpassword.php:278
 msgid "Enter a nickname or email address."
 msgstr "ニックネームかメールアドレスを入力してください。"
 
 #. TRANS: Information on password recovery form if no known username or e-mail address was specified.
-#: actions/recoverpassword.php:309
 msgid "No user with that email address or username."
 msgstr "そのメールアドレスかユーザ名をもっているユーザがありません。"
 
 #. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
-#: actions/recoverpassword.php:327
 msgid "No registered email address for that user."
 msgstr "そのユーザにはメールアドレスの登録がありません。"
 
 #. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
-#: actions/recoverpassword.php:342
 msgid "Error saving address confirmation."
 msgstr "アドレス確認保存エラー"
 
 #. TRANS: User notification after an e-mail with instructions was sent from the password recovery form.
-#: actions/recoverpassword.php:370
 msgid ""
 "Instructions for recovering your password have been sent to the email "
 "address registered to your account."
 msgstr "登録されたメールアドレスにパスワードの回復方法をお送りしました。"
 
 #. TRANS: Client error displayed when trying to reset as password without providing a user.
-#: actions/recoverpassword.php:391
 msgid "Unexpected password reset."
 msgstr "予期せぬパスワードのリセットです。"
 
 #. TRANS: Reset password form validation error message.
-#: actions/recoverpassword.php:400
 #, fuzzy
 msgid "Password must be 6 characters or more."
 msgstr "パスワードは6字以上でなければいけません。"
 
 #. TRANS: Reset password form validation error message.
-#: actions/recoverpassword.php:405
 msgid "Password and confirmation do not match."
 msgstr "パスワードと確認が一致しません。"
 
 #. TRANS: Server error displayed when something does wrong with the user object during password reset.
-#: actions/recoverpassword.php:426 actions/register.php:241
 msgid "Error setting user."
 msgstr "ユーザ設定エラー"
 
 #. TRANS: Success message for user after password reset.
-#: actions/recoverpassword.php:434
 msgid "New password successfully saved. You are now logged in."
 msgstr "新しいパスワードの保存に成功しました。ログインしています。"
 
-#: actions/redirecturl.php:70
 #, fuzzy
 msgid "No id parameter"
 msgstr "ID引数がありません。"
 
-#: actions/redirecturl.php:76
 #, fuzzy, php-format
 msgid "No such file \"%d\""
 msgstr "そのようなファイルはありません。"
 
-#: actions/register.php:80 actions/register.php:181 actions/register.php:392
 msgid "Sorry, only invited people can register."
 msgstr "すみません、招待された人々だけが登録できます。"
 
-#: actions/register.php:87
 msgid "Sorry, invalid invitation code."
 msgstr "すみません、不正な招待コード。"
 
-#: actions/register.php:106
 msgid "Registration successful"
 msgstr "登録成功"
 
-#: actions/register.php:108 actions/register.php:490
 msgid "Register"
 msgstr "登録"
 
-#: actions/register.php:128
 msgid "Registration not allowed."
 msgstr "登録は許可されていません。"
 
-#: actions/register.php:194
 #, fuzzy
 msgid "You cannot register if you don't agree to the license."
 msgstr "ライセンスに同意頂けない場合は登録できません。"
 
-#: actions/register.php:203
 msgid "Email address already exists."
 msgstr "メールアドレスが既に存在します。"
 
-#: actions/register.php:236 actions/register.php:258
 msgid "Invalid username or password."
 msgstr "不正なユーザ名またはパスワード。"
 
-#: actions/register.php:333
 #, fuzzy
 msgid ""
 "With this form you can create a new account. You can then post notices and "
@@ -5134,56 +4238,45 @@ msgstr ""
 "このフォームで新しいアカウントを作成できます。 次につぶやきを投稿して、友人や"
 "同僚にリンクできます。 "
 
-#: actions/register.php:424 actions/register.php:428
-#: actions/siteadminpanel.php:238 lib/settingsnav.php:92
 msgid "Email"
 msgstr "メール"
 
-#: actions/register.php:425 actions/register.php:429
 #, fuzzy
 msgid "Used only for updates, announcements, and password recovery."
 msgstr "更新、アナウンス、パスワードリカバリーでのみ使用されます。"
 
-#: actions/register.php:436
 #, fuzzy
 msgid "Longer name, preferably your \"real\" name."
 msgstr "長い名前"
 
-#: actions/register.php:464
 #, fuzzy
 msgid "Where you are, like \"City, State (or Region), Country\"."
 msgstr "自分のいる場所。例：「都市, 都道府県 (または地域), 国」"
 
-#: actions/register.php:503
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
 msgstr ""
 
-#: actions/register.php:513
 #, php-format
 msgid "My text and files are copyright by %1$s."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:517
 msgid "My text and files remain under my own copyright."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:520
 msgid "All rights reserved."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:525
 #, fuzzy, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
 "email address, IM address, and phone number."
 msgstr "個人情報を除く: パスワード、メールアドレス、IMアドレス、電話番号"
 
-#: actions/register.php:566
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -5216,7 +4309,6 @@ msgstr ""
 "参加してくださってありがとうございます。私たちはあなたがこのサービスを楽しん"
 "で使ってくれることを願っています。"
 
-#: actions/register.php:590
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5224,7 +4316,6 @@ msgstr ""
 "(メールアドレスを承認する方法を読んで、すぐにメールによるメッセージを受け取る"
 "ようにしてください)"
 
-#: actions/remotesubscribe.php:97
 #, php-format
 msgid ""
 "To subscribe, you can [login](%%action.login%%), or [register](%%action."
@@ -5236,120 +4327,94 @@ msgstr ""
 "openmublog%%) にアカウントをお持ちの場合は、下にプロファイルURLを入力して下さ"
 "い."
 
-#: actions/remotesubscribe.php:111
 msgid "Remote subscribe"
 msgstr "リモートフォロー"
 
-#: actions/remotesubscribe.php:123
 msgid "Subscribe to a remote user"
 msgstr "リモートユーザーをフォロー"
 
-#: actions/remotesubscribe.php:128
 msgid "User nickname"
 msgstr "ユーザのニックネーム"
 
-#: actions/remotesubscribe.php:129
 #, fuzzy
 msgid "Nickname of the user you want to follow."
 msgstr "フォローしたいユーザのニックネーム"
 
-#: actions/remotesubscribe.php:132
 msgid "Profile URL"
 msgstr "プロファイルURL"
 
-#: actions/remotesubscribe.php:133
 #, fuzzy
 msgid "URL of your profile on another compatible microblogging service."
 msgstr "プロファイルサービスまたはマイクロブロギングサービスのURL"
 
 #. TRANS: Link text for link that will subscribe to a remote profile.
-#: actions/remotesubscribe.php:136 lib/subscribeform.php:139
-#: lib/userprofile.php:402
 msgid "Subscribe"
 msgstr "フォロー"
 
-#: actions/remotesubscribe.php:158
 #, fuzzy
 msgid "Invalid profile URL (bad format)."
 msgstr "不正なプロファイルURL。（形式不備）"
 
-#: actions/remotesubscribe.php:167
 msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
 msgstr ""
 "有効なプロファイルURLではありません。（YADIS ドキュメントがないかまたは 不正"
 "な XRDS 定義）"
 
-#: actions/remotesubscribe.php:175
 #, fuzzy
 msgid "That is a local profile! Login to subscribe."
 msgstr ""
 "それはローカルのプロファイルです! フォローするには、ログインしてください。"
 
-#: actions/remotesubscribe.php:182
 #, fuzzy
 msgid "Could not get a request token."
 msgstr "リクエストトークンを取得できません"
 
-#: actions/repeat.php:56
 msgid "Only logged-in users can repeat notices."
 msgstr "ログインユーザだけがつぶやきを繰り返せます。"
 
-#: actions/repeat.php:63 actions/repeat.php:70
 msgid "No notice specified."
 msgstr "つぶやきがありません。"
 
-#: actions/repeat.php:75
 #, fuzzy
 msgid "You cannot repeat your own notice."
 msgstr "自分のつぶやきは繰り返せません。"
 
-#: actions/repeat.php:89
 msgid "You already repeated that notice."
 msgstr "すでにそのつぶやきを繰り返しています。"
 
-#: actions/repeat.php:112 lib/noticelist.php:697
 msgid "Repeated"
 msgstr "繰り返された"
 
-#: actions/repeat.php:117
 msgid "Repeated!"
 msgstr "繰り返されました!"
 
 #. TRANS: RSS reply feed title. %s is a user nickname.
-#: actions/replies.php:126 actions/repliesrss.php:68
-#: lib/personalgroupnav.php:105
 #, php-format
 msgid "Replies to %s"
 msgstr "%s への返信"
 
-#: actions/replies.php:128
 #, php-format
 msgid "Replies to %1$s, page %2$d"
 msgstr "%1$s への返信、ページ %2$s"
 
-#: actions/replies.php:145
 #, php-format
 msgid "Replies feed for %s (RSS 1.0)"
 msgstr "%s の返信フィード (RSS 1.0)"
 
-#: actions/replies.php:152
 #, php-format
 msgid "Replies feed for %s (RSS 2.0)"
 msgstr "%s の返信フィード (RSS 2.0)"
 
-#: actions/replies.php:159
 #, php-format
 msgid "Replies feed for %s (Atom)"
 msgstr "%s の返信フィード (Atom)"
 
-#: actions/replies.php:199
 #, php-format
 msgid ""
 "This is the timeline showing replies to %1$s but %2$s hasn't received a "
 "notice to them yet."
 msgstr "これは %1$s のタイムラインですが、%2$s はまだなにも投稿していません。"
 
-#: actions/replies.php:204
 #, php-format
 msgid ""
 "You can engage other users in a conversation, subscribe to more people or "
@@ -5358,7 +4423,6 @@ msgstr ""
 "あなたは、他のユーザを会話をするか、多くの人々をフォローするか、または [グ"
 "ループに加わる](%%action.groups%%)ことができます。"
 
-#: actions/replies.php:206
 #, php-format
 msgid ""
 "You can try to [nudge %1$s](../%2$s) or [post something to them](%%%%action."
@@ -5369,39 +4433,33 @@ msgstr ""
 
 #. TRANS: RSS reply feed description.
 #. TRANS: %1$s is a user nickname, %2$s is the StatusNet site name.
-#: actions/repliesrss.php:74
 #, fuzzy, php-format
 msgid "Replies to %1$s on %2$s."
 msgstr "%2$s 上の %1$s への返信!"
 
 #. TRANS: Client exception displayed when trying to restore an account while not logged in.
-#: actions/restoreaccount.php:78
 #, fuzzy
 msgid "Only logged-in users can restore their account."
 msgstr "ログインユーザだけがつぶやきを繰り返せます。"
 
 #. TRANS: Client exception displayed when trying to restore an account without having restore rights.
-#: actions/restoreaccount.php:83
 #, fuzzy
 msgid "You may not restore your account."
 msgstr "あなたはまだなんのアプリケーションも登録していません。"
 
 #. TRANS: Client exception displayed trying to restore an account while something went wrong uploading a file.
 #. TRANS: Client exception. No file; probably just a non-AJAX submission.
-#: actions/restoreaccount.php:121 actions/restoreaccount.php:146
 #, fuzzy
 msgid "No uploaded file."
 msgstr "ファイルアップロード"
 
 #. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
-#: actions/restoreaccount.php:129 lib/mediafile.php:194
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
 msgstr ""
 "アップロードされたファイルは php.ini の upload_max_filesize ディレクティブを"
 "超えています。"
 
 #. TRANS: Client exception.
-#: actions/restoreaccount.php:135 lib/mediafile.php:200
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form."
@@ -5410,147 +4468,119 @@ msgstr ""
 "ティブを超えています。"
 
 #. TRANS: Client exception.
-#: actions/restoreaccount.php:141 lib/mediafile.php:206
 msgid "The uploaded file was only partially uploaded."
 msgstr "アップロードされたファイルは部分的にアップロードされていただけです。"
 
 #. TRANS: Client exception thrown when a temporary folder is not present to store a file upload.
-#: actions/restoreaccount.php:150 lib/mediafile.php:214
 msgid "Missing a temporary folder."
 msgstr "一時フォルダを失いました。"
 
 #. TRANS: Client exception thrown when writing to disk is not possible during a file upload operation.
-#: actions/restoreaccount.php:154 lib/mediafile.php:218
 msgid "Failed to write file to disk."
 msgstr "ディスクへのファイル書き込みに失敗しました。"
 
 #. TRANS: Client exception thrown when a file upload operation has been stopped by an extension.
-#: actions/restoreaccount.php:158 lib/mediafile.php:222
 msgid "File upload stopped by extension."
 msgstr "エクステンションによってファイルアップロードを中止しました。"
 
 #. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
 #. TRANS: Exception thrown when uploading an image fails for an unknown reason.
 #. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
-#: actions/restoreaccount.php:164 lib/imagefile.php:106 lib/mediafile.php:228
 msgid "System error uploading file."
 msgstr "ファイルのアップロードでシステムエラー"
 
 #. TRANS: Client exception thrown when a feed is not an Atom feed.
-#: actions/restoreaccount.php:207
 #, fuzzy
 msgid "Not an Atom feed."
 msgstr "全てのメンバー"
 
 #. TRANS: Success message when a feed has been restored.
-#: actions/restoreaccount.php:241
 msgid ""
 "Feed has been restored. Your old posts should now appear in search and your "
 "profile page."
 msgstr ""
 
 #. TRANS: Message when a feed restore is in progress.
-#: actions/restoreaccount.php:245
 msgid "Feed will be restored. Please wait a few minutes for results."
 msgstr ""
 
 #. TRANS: Form instructions for feed restore.
-#: actions/restoreaccount.php:342
 msgid ""
 "You can upload a backed-up stream in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format."
 msgstr ""
 
 #. TRANS: Title for submit button to confirm upload of a user backup file for account restore.
-#: actions/restoreaccount.php:373
 #, fuzzy
 msgid "Upload the file"
 msgstr "ファイルアップロード"
 
-#: actions/revokerole.php:75
 #, fuzzy
 msgid "You cannot revoke user roles on this site."
 msgstr "あなたはこのサイトでユーザを黙らせることができません。"
 
-#: actions/revokerole.php:82
 #, fuzzy
 msgid "User doesn't have this role."
 msgstr "合っているプロフィールのないユーザ"
 
-#: actions/rsd.php:142 actions/version.php:159
 msgid "StatusNet"
 msgstr "StatusNet"
 
-#: actions/sandbox.php:65 actions/unsandbox.php:65
 msgid "You cannot sandbox users on this site."
 msgstr "あなたはこのサイトのサンドボックスユーザができません。"
 
-#: actions/sandbox.php:72
 msgid "User is already sandboxed."
 msgstr "ユーザはすでにサンドボックスです。"
 
 #. TRANS: Menu item for site administration
-#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
-#: lib/adminpanelaction.php:379
 msgid "Sessions"
 msgstr "セッション"
 
-#: actions/sessionsadminpanel.php:65
 msgid "Session settings for this StatusNet site"
 msgstr ""
 
-#: actions/sessionsadminpanel.php:175
 msgid "Handle sessions"
 msgstr "セッションの扱い"
 
-#: actions/sessionsadminpanel.php:177
 msgid "Whether to handle sessions ourselves."
 msgstr "自分達でセッションを扱うのであるかどうか。"
 
-#: actions/sessionsadminpanel.php:181
 msgid "Session debugging"
 msgstr "セッションデバッグ"
 
-#: actions/sessionsadminpanel.php:183
 msgid "Turn on debugging output for sessions."
 msgstr "セッションのためのデバッグ出力をオン。"
 
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
+#. TRANS: Submit button title.
+msgid "Save"
+msgstr "保存"
+
 msgid "Save site settings"
 msgstr "サイト設定の保存"
 
-#: actions/showapplication.php:78
 msgid "You must be logged in to view an application."
 msgstr "!!アプリケーションを見るためにはログインしていなければなりません。"
 
-#: actions/showapplication.php:151
 msgid "Application profile"
 msgstr "アプリケーションプロファイル"
 
-#: actions/showapplication.php:179
 #, php-format
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr ""
 
-#: actions/showapplication.php:189
 msgid "Application actions"
 msgstr "アプリケーションアクション"
 
-#: actions/showapplication.php:212
 msgid "Reset key & secret"
 msgstr "key と secret のリセット"
 
 #. TRANS: Title of form for deleting a user.
-#: actions/showapplication.php:228 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:64 lib/noticelist.php:678
 msgid "Delete"
 msgstr "削除"
 
-#: actions/showapplication.php:237
 msgid "Application info"
 msgstr "アプリケーション情報"
 
-#: actions/showapplication.php:255
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
@@ -5558,43 +4588,36 @@ msgstr ""
 "注意: 私たちはHMAC-SHA1署名をサポートします。 私たちは平文署名メソッドをサ"
 "ポートしません。"
 
-#: actions/showapplication.php:275
 #, fuzzy
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr "本当にこのつぶやきを削除しますか？"
 
 #. TRANS: Title for all but the first page of favourite notices of a user.
 #. TRANS: %1$s is the user for whom the favourite notices are displayed, %2$d is the page number.
-#: actions/showfavorites.php:80
 #, php-format
 msgid "%1$s's favorite notices, page %2$d"
 msgstr "%1$s のお気に入りのつぶやき、ページ %2$d"
 
 #. TRANS: Server error displayed when favourite notices could not be retrieved from the database.
-#: actions/showfavorites.php:134
 msgid "Could not retrieve favorite notices."
 msgstr "お気に入りのつぶやきを検索できません。"
 
 #. TRANS: Feed link text. %s is a username.
-#: actions/showfavorites.php:172
 #, php-format
 msgid "Feed for favorites of %s (RSS 1.0)"
 msgstr "%s のお気に入りのフィード (RSS 1.0)"
 
 #. TRANS: Feed link text. %s is a username.
-#: actions/showfavorites.php:180
 #, php-format
 msgid "Feed for favorites of %s (RSS 2.0)"
 msgstr "%s のお気に入りのフィード (RSS 2.0)"
 
 #. TRANS: Feed link text. %s is a username.
-#: actions/showfavorites.php:188
 #, php-format
 msgid "Feed for favorites of %s (Atom)"
 msgstr "%s のお気に入りのフィード (Atom)"
 
 #. TRANS: Text displayed instead of favourite notices for the current logged in user that has no favourites.
-#: actions/showfavorites.php:209
 msgid ""
 "You haven't chosen any favorite notices yet. Click the fave button on "
 "notices you like to bookmark them for later or shed a spotlight on them."
@@ -5605,7 +4628,6 @@ msgstr ""
 
 #. TRANS: Text displayed instead of favourite notices for a user that has no favourites while logged in.
 #. TRANS: %s is a username.
-#: actions/showfavorites.php:213
 #, fuzzy, php-format
 msgid ""
 "%s hasn't added any favorite notices yet. Post something interesting they "
@@ -5617,7 +4639,6 @@ msgstr ""
 #. TRANS: Text displayed instead of favourite notices for a user that has no favourites while not logged in.
 #. TRANS: %s is a username, %%%%action.register%%%% is a link to the user registration page.
 #. TRANS: (link text)[link] is a Mark Down link.
-#: actions/showfavorites.php:220
 #, php-format
 msgid ""
 "%s hasn't added any favorite notices yet. Why not [register an account](%%%%"
@@ -5628,64 +4649,53 @@ msgstr ""
 "気に入りにつぶやきを加える最初になりましょう!"
 
 #. TRANS: Page notice for show favourites page.
-#: actions/showfavorites.php:251
 msgid "This is a way to share what you like."
 msgstr "これは、あなたが好きなことを共有する方法です。"
 
 #. TRANS: Page title for first group page. %s is a group name.
-#: actions/showgroup.php:75
 #, php-format
 msgid "%s group"
 msgstr "%s グループ"
 
 #. TRANS: Page title for any but first group page.
 #. TRANS: %1$s is a group name, $2$s is a page number.
-#: actions/showgroup.php:79
 #, php-format
 msgid "%1$s group, page %2$d"
 msgstr "%1$s グループ、ページ %2$d"
 
 #. TRANS: Label for group description or group note (dt). Text hidden by default.
-#: actions/showgroup.php:266
 msgid "Note"
 msgstr "ノート"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:277 lib/groupeditform.php:180
 msgid "Aliases"
 msgstr "別名"
 
 #. TRANS: Group actions header (h2). Text hidden by default.
-#: actions/showgroup.php:294
 msgid "Group actions"
 msgstr "グループアクション"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:338
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
 msgstr "%s グループのつぶやきフィード (RSS 1.0)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:345
 #, php-format
 msgid "Notice feed for %s group (RSS 2.0)"
 msgstr "%s グループのつぶやきフィード (RSS 2.0)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:352
 #, php-format
 msgid "Notice feed for %s group (Atom)"
 msgstr "%s グループのつぶやきフィード (Atom)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:358
 #, php-format
 msgid "FOAF for %s group"
 msgstr "%s グループの FOAF"
 
 #. TRANS: Header for mini list of group members on a group page (h2).
-#: actions/showgroup.php:395
 msgid "Members"
 msgstr "メンバー"
 
@@ -5693,31 +4703,24 @@ msgstr "メンバー"
 #. TRANS: Text for user subscription statistics if the user has no subscriptions.
 #. TRANS: Text for user subscriber statistics if user has no subscribers.
 #. TRANS: Text for user user group membership statistics if user is not a member of any group.
-#: actions/showgroup.php:401 lib/profileaction.php:137
-#: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
-#: lib/subscriptionlist.php:123 lib/tagcloudsection.php:71
 msgid "(None)"
 msgstr "(なし)"
 
 #. TRANS: Link to all group members from mini list of group members if group has more than n members.
-#: actions/showgroup.php:410
 msgid "All members"
 msgstr "全てのメンバー"
 
 #. TRANS: Header for group statistics on a group page (h2).
 #. TRANS: H2 text for user statistics.
-#: actions/showgroup.php:441 lib/profileaction.php:205
 msgid "Statistics"
 msgstr "統計データ"
 
-#: actions/showgroup.php:444
 #, fuzzy
 msgctxt "LABEL"
 msgid "Created"
 msgstr "作成日"
 
 #. TRANS: Label for member count in statistics on group page.
-#: actions/showgroup.php:449
 #, fuzzy
 msgctxt "LABEL"
 msgid "Members"
@@ -5727,7 +4730,6 @@ msgstr "メンバー"
 #. TRANS: **%s** is the group alias, %%%%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).
-#: actions/showgroup.php:464
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5745,7 +4747,6 @@ 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: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
-#: actions/showgroup.php:474
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5759,99 +4760,83 @@ msgstr ""
 "する短いメッセージを共有します。"
 
 #. TRANS: Header for list of group administrators on a group page (h2).
-#: actions/showgroup.php:503
 msgid "Admins"
 msgstr "管理者"
 
 #. TRANS: Client error displayed requesting a single message that does not exist.
-#: actions/showmessage.php:76
 msgid "No such message."
 msgstr "そのようなメッセージはありません。"
 
 #. TRANS: Client error displayed requesting a single direct message the requesting user was not a party in.
-#: actions/showmessage.php:86
 msgid "Only the sender and recipient may read this message."
 msgstr "送信者と受取人だけがこのメッセージを読めます。"
 
 #. TRANS: Page title for single direct message display when viewing user is the sender.
 #. TRANS: %1$s is the addressed user's nickname, $2$s is a timestamp.
-#: actions/showmessage.php:105
 #, php-format
 msgid "Message to %1$s on %2$s"
 msgstr "%2$s 上の %1$s へのメッセージ"
 
 #. TRANS: Page title for single message display.
 #. TRANS: %1$s is the sending user's nickname, $2$s is a timestamp.
-#: actions/showmessage.php:113
 #, php-format
 msgid "Message from %1$s on %2$s"
 msgstr "%2$s 上の %1$s からのメッセージ"
 
-#: actions/shownotice.php:90
 msgid "Notice deleted."
 msgstr "つぶやきを削除しました。"
 
 #. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
-#: actions/showstream.php:70
 #, fuzzy, php-format
 msgid "%1$s tagged %2$s"
 msgstr "%1$s、ページ %2$d"
 
 #. TRANS: Page title showing tagged notices in one user's stream.
 #. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
-#: actions/showstream.php:74
 #, fuzzy, php-format
 msgid "%1$s tagged %2$s, page %3$d"
 msgstr "%1$s とタグ付けされたつぶやき、ページ %2$d"
 
 #. TRANS: Extended page title showing tagged notices in one user's stream.
 #. TRANS: %1$s is the username, %2$d is the page number.
-#: actions/showstream.php:82
 #, php-format
 msgid "%1$s, page %2$d"
 msgstr "%1$s、ページ %2$d"
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %1$s is a user nickname, %2$s is a hashtag.
-#: actions/showstream.php:127
 #, php-format
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
 msgstr "%1$sの%2$sとタグ付けされたつぶやきフィード (RSS 1.0)"
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.
-#: actions/showstream.php:136
 #, php-format
 msgid "Notice feed for %s (RSS 1.0)"
 msgstr "%sのつぶやきフィード (RSS 1.0)"
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.
-#: actions/showstream.php:145
 #, php-format
 msgid "Notice feed for %s (RSS 2.0)"
 msgstr "%sのつぶやきフィード (RSS 2.0)"
 
-#: actions/showstream.php:152
 #, php-format
 msgid "Notice feed for %s (Atom)"
 msgstr "%sのつぶやきフィード (Atom)"
 
 #. TRANS: Title for link to notice feed. FOAF stands for Friend of a Friend.
 #. TRANS: More information at http://www.foaf-project.org. %s is a user nickname.
-#: actions/showstream.php:159
 #, php-format
 msgid "FOAF for %s"
 msgstr "%s の FOAF"
 
 #. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
-#: actions/showstream.php:205
 #, fuzzy, php-format
 msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr "これは %1$s のタイムラインですが、%2$s はまだなにも投稿していません。"
 
 #. TRANS: Second sentence of empty list message for a stream for the user themselves.
-#: actions/showstream.php:211
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
@@ -5861,7 +4846,6 @@ msgstr ""
 
 #. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:215
 #, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
@@ -5872,7 +4856,6 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:258
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5888,7 +4871,6 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:265
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5900,233 +4882,186 @@ msgstr ""
 "wikipedia.org/wiki/Micro-blogging) サービス。"
 
 #. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
-#: actions/showstream.php:322
 #, php-format
 msgid "Repeat of %s"
 msgstr "%s の繰り返し"
 
-#: actions/silence.php:65 actions/unsilence.php:65
 msgid "You cannot silence users on this site."
 msgstr "あなたはこのサイトでユーザを黙らせることができません。"
 
-#: actions/silence.php:72
 msgid "User is already silenced."
 msgstr "ユーザは既に黙っています。"
 
-#: actions/siteadminpanel.php:69
 msgid "Basic settings for this StatusNet site"
 msgstr "この StatusNet サイトのデザイン設定。"
 
-#: actions/siteadminpanel.php:133
 msgid "Site name must have non-zero length."
 msgstr "サイト名は長さ0ではいけません。"
 
-#: actions/siteadminpanel.php:141
 msgid "You must have a valid contact email address."
 msgstr "有効な連絡用メールアドレスがなければなりません。"
 
-#: actions/siteadminpanel.php:159
 #, php-format
 msgid "Unknown language \"%s\"."
 msgstr "不明な言語 \"%s\""
 
-#: actions/siteadminpanel.php:165
 #, fuzzy
 msgid "Minimum text limit is 0 (unlimited)."
 msgstr "最小のテキスト制限は140字です。"
 
-#: actions/siteadminpanel.php:171
 #, fuzzy
 msgid "Dupe limit must be one or more seconds."
 msgstr "デュープ制限は1秒以上でなければなりません。"
 
-#: actions/siteadminpanel.php:221
 msgid "General"
 msgstr "一般"
 
-#: actions/siteadminpanel.php:224
 msgid "Site name"
 msgstr "サイト名"
 
-#: actions/siteadminpanel.php:225
 msgid "The name of your site, like \"Yourcompany Microblog\""
 msgstr "あなたのサイトの名前、\"Yourcompany Microblog\"のような。"
 
-#: actions/siteadminpanel.php:229
 msgid "Brought by"
 msgstr "持って来られます"
 
-#: actions/siteadminpanel.php:230
 msgid "Text used for credits link in footer of each page"
 msgstr ""
 "クレジットに使用されるテキストは、それぞれのページのフッターでリンクされま"
 "す。"
 
-#: actions/siteadminpanel.php:234
 msgid "Brought by URL"
 msgstr "URLで、持って来られます"
 
-#: actions/siteadminpanel.php:235
 msgid "URL used for credits link in footer of each page"
 msgstr ""
 "クレジットに使用されるURLは、それぞれのページのフッターでリンクされます。"
 
-#: actions/siteadminpanel.php:239
 msgid "Contact email address for your site"
 msgstr "あなたのサイトにコンタクトするメールアドレス"
 
-#: actions/siteadminpanel.php:245
 msgid "Local"
 msgstr "ローカル"
 
-#: actions/siteadminpanel.php:256
 msgid "Default timezone"
 msgstr "デフォルトタイムゾーン"
 
-#: actions/siteadminpanel.php:257
 msgid "Default timezone for the site; usually UTC."
 msgstr "サイトのデフォルトタイムゾーン; 通常UTC。"
 
-#: actions/siteadminpanel.php:262
 msgid "Default language"
 msgstr "ご希望の言語"
 
-#: actions/siteadminpanel.php:263
 msgid "Site language when autodetection from browser settings is not available"
 msgstr ""
 
-#: actions/siteadminpanel.php:271
 msgid "Limits"
 msgstr "制限"
 
-#: actions/siteadminpanel.php:274
 msgid "Text limit"
 msgstr "テキスト制限"
 
-#: actions/siteadminpanel.php:274
 msgid "Maximum number of characters for notices."
 msgstr "つぶやきの文字の最大数"
 
-#: actions/siteadminpanel.php:278
 msgid "Dupe limit"
 msgstr "デュープ制限"
 
-#: actions/siteadminpanel.php:278
 msgid "How long users must wait (in seconds) to post the same thing again."
 msgstr ""
 "どれくらい長い間(秒)、ユーザは、再び同じものを投稿するのを待たなければならな"
 "いか。"
 
 #. TRANS: Page title for site-wide notice tab in admin panel.
-#: actions/sitenoticeadminpanel.php:55
 #, fuzzy
 msgid "Site Notice"
 msgstr "サイトつぶやき"
 
 #. TRANS: Instructions for site-wide notice tab in admin panel.
-#: actions/sitenoticeadminpanel.php:66
 #, fuzzy
 msgid "Edit site-wide message"
 msgstr "新しいメッセージ"
 
 #. TRANS: Server error displayed when saving a site-wide notice was impossible.
-#: actions/sitenoticeadminpanel.php:101
 #, fuzzy
 msgid "Unable to save site notice."
 msgstr "あなたのデザイン設定を保存できません。"
 
 #. TRANS: Client error displayed when a site-wide notice was longer than allowed.
-#: actions/sitenoticeadminpanel.php:112
 #, fuzzy
 msgid "Maximum length for the site-wide notice is 255 characters."
 msgstr "プロファイル自己紹介の最大文字長。"
 
 #. TRANS: Label for site-wide notice text field in admin panel.
-#: actions/sitenoticeadminpanel.php:176
 #, fuzzy
 msgid "Site notice text"
 msgstr "サイトつぶやき"
 
 #. TRANS: Tooltip for site-wide notice text field in admin panel.
-#: actions/sitenoticeadminpanel.php:179
 msgid "Site-wide notice text (255 characters maximum; HTML allowed)"
 msgstr ""
 
 #. TRANS: Title for button to save site notice in admin panel.
-#: actions/sitenoticeadminpanel.php:201
 #, fuzzy
 msgid "Save site notice."
 msgstr "サイトつぶやき"
 
 #. TRANS: Title for SMS settings.
-#: actions/smssettings.php:56
 msgid "SMS settings"
 msgstr "SMS 設定"
 
 #. TRANS: SMS settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/smssettings.php:70
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr ""
 "あなたは %%site.name%% からメールでSMSメッセージを受け取ることができます。"
 
 #. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
-#: actions/smssettings.php:92
 msgid "SMS is not available."
 msgstr "SMS は利用できません。"
 
 #. TRANS: Form legend for SMS settings form.
-#: actions/smssettings.php:106
 #, fuzzy
 msgid "SMS address"
 msgstr "IMアドレス"
 
 #. TRANS: Form guide in SMS settings form.
-#: actions/smssettings.php:115
 msgid "Current confirmed SMS-enabled phone number."
 msgstr "現在の確認された SMS 可能な電話番号。"
 
 #. TRANS: Form guide in IM settings form.
-#: actions/smssettings.php:128
 msgid "Awaiting confirmation on this phone number."
 msgstr "この電話番号は確認待ちです。"
 
 #. TRANS: Field label for SMS address input in SMS settings form.
-#: actions/smssettings.php:137
 msgid "Confirmation code"
 msgstr "確認コード"
 
 #. TRANS: Form field instructions in SMS settings form.
-#: actions/smssettings.php:139
 msgid "Enter the code you received on your phone."
 msgstr "あなたがあなたの電話で受け取ったコードを入れてください。"
 
 #. TRANS: Button label to confirm SMS confirmation code in SMS settings.
-#: actions/smssettings.php:143
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Confirm"
 msgstr "パスワード確認"
 
 #. TRANS: Field label for SMS phone number input in SMS settings form.
-#: actions/smssettings.php:148
 msgid "SMS phone number"
 msgstr "SMS 電話番号"
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
-#: actions/smssettings.php:151
 #, fuzzy
 msgid "Phone number, no punctuation or spaces, with area code."
 msgstr "電話番号、句読点またはスペースがない、市街番号付き"
 
 #. TRANS: Form legend for SMS preferences form.
-#: actions/smssettings.php:190
 msgid "SMS preferences"
 msgstr "設定が保存されました。"
 
 #. TRANS: Checkbox label in SMS preferences form.
-#: actions/smssettings.php:196
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
@@ -6135,33 +5070,27 @@ msgstr ""
 "るかもしれないのを理解しています。"
 
 #. TRANS: Confirmation message for successful SMS preferences save.
-#: actions/smssettings.php:307
 #, fuzzy
 msgid "SMS preferences saved."
 msgstr "設定が保存されました。"
 
 #. TRANS: Message given saving SMS phone number without having provided one.
-#: actions/smssettings.php:329
 msgid "No phone number."
 msgstr "電話番号がありません。"
 
 #. TRANS: Message given saving SMS phone number without having selected a carrier.
-#: actions/smssettings.php:335
 msgid "No carrier selected."
 msgstr "キャリアが選択されていません。"
 
 #. TRANS: Message given saving SMS phone number that is already set.
-#: actions/smssettings.php:343
 msgid "That is already your phone number."
 msgstr "これはすでにあなたの電話番号です。"
 
 #. TRANS: Message given saving SMS phone number that is already set for another user.
-#: actions/smssettings.php:347
 msgid "That phone number already belongs to another user."
 msgstr "この電話番号はすでに他のユーザに使われています。"
 
 #. TRANS: Message given saving valid SMS phone number that is to be confirmed.
-#: actions/smssettings.php:375
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
 "for the code and instructions on how to use it."
@@ -6170,40 +5099,33 @@ msgstr ""
 "コードと指示のために電話をチェックしてください。"
 
 #. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
-#: actions/smssettings.php:403
 msgid "That is the wrong confirmation number."
 msgstr "それは間違った確認番号です。"
 
 #. TRANS: Message given after successfully canceling SMS phone number confirmation.
-#: actions/smssettings.php:417
 msgid "SMS confirmation cancelled."
 msgstr "SMS確認"
 
 #. TRANS: Message given trying to remove an SMS phone number that is not
 #. TRANS: registered for the active user.
-#: actions/smssettings.php:437
 msgid "That is not your phone number."
 msgstr "それはあなたの電話番号ではありません。"
 
 #. TRANS: Message given after successfully removing a registered SMS phone number.
-#: actions/smssettings.php:459
 #, fuzzy
 msgid "The SMS phone number was removed."
 msgstr "SMS 電話番号"
 
 #. TRANS: Label for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:498
 msgid "Mobile carrier"
 msgstr "携帯電話会社"
 
 #. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:503
 msgid "Select a carrier"
 msgstr "キャリア選択"
 
 #. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
 #. TRANS: %s is an administrative contact's e-mail address.
-#: actions/smssettings.php:512
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -6214,121 +5136,96 @@ msgstr ""
 "ください。"
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
-#: actions/smssettings.php:534
 #, fuzzy
 msgid "No code entered."
 msgstr "コードが入力されていません"
 
 #. TRANS: Menu item for site administration
-#: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
-#: lib/adminpanelaction.php:395
 msgid "Snapshots"
 msgstr "スナップショット"
 
-#: actions/snapshotadminpanel.php:65
 msgid "Manage snapshot configuration"
 msgstr "セッション設定"
 
-#: actions/snapshotadminpanel.php:127
 msgid "Invalid snapshot run value."
 msgstr "不正なスナップショットランバリュー"
 
-#: actions/snapshotadminpanel.php:133
 msgid "Snapshot frequency must be a number."
 msgstr "スナップショット頻度は数でなければなりません。"
 
-#: actions/snapshotadminpanel.php:144
 msgid "Invalid snapshot report URL."
 msgstr "不正なスナップショットレポートURL。"
 
-#: actions/snapshotadminpanel.php:200
 msgid "Randomly during web hit"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:201
 msgid "In a scheduled job"
 msgstr "予定されているジョブで"
 
-#: actions/snapshotadminpanel.php:206
 msgid "Data snapshots"
 msgstr "データスナップショット"
 
-#: actions/snapshotadminpanel.php:208
 msgid "When to send statistical data to status.net servers"
 msgstr "いつ status.net サーバに統計データを送りますか"
 
-#: actions/snapshotadminpanel.php:217
 msgid "Frequency"
 msgstr "頻度"
 
-#: actions/snapshotadminpanel.php:218
 msgid "Snapshots will be sent once every N web hits"
 msgstr "レポート URL"
 
-#: actions/snapshotadminpanel.php:226
 msgid "Report URL"
 msgstr "レポート URL"
 
-#: actions/snapshotadminpanel.php:227
 msgid "Snapshots will be sent to this URL"
 msgstr "このURLにスナップショットを送るでしょう"
 
-#: actions/snapshotadminpanel.php:248
 #, fuzzy
 msgid "Save snapshot settings"
 msgstr "サイト設定の保存"
 
 #. TRANS: Client error displayed trying a change a subscription for a non-subscribed profile.
-#: actions/subedit.php:75
 msgid "You are not subscribed to that profile."
 msgstr "あなたはそのプロファイルにフォローされていません。"
 
 #. TRANS: Server error displayed when updating a subscription fails with a database error.
 #. TRANS: Exception thrown when a subscription could not be stored on the server.
-#: actions/subedit.php:89 classes/Subscription.php:141
 msgid "Could not save subscription."
 msgstr "フォローを保存できません。"
 
 #. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
-#: actions/subscribe.php:121
 #, fuzzy
 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
 msgstr "あなたはそのプロファイルにフォローされていません。"
 
 #. TRANS: Page title when subscription succeeded.
-#: actions/subscribe.php:149
 msgid "Subscribed"
 msgstr "フォローしている"
 
 #. TRANS: Header for list of subscribers for a user (first page).
 #. TRANS: %s is the user's nickname.
-#: actions/subscribers.php:51
 #, php-format
 msgid "%s subscribers"
 msgstr "フォローされている"
 
 #. TRANS: Header for list of subscribers for a user (not first page).
 #. TRANS: %1$s is the user's nickname, $2$d is the page number.
-#: actions/subscribers.php:55
 #, php-format
 msgid "%1$s subscribers, page %2$d"
 msgstr "%1$s フォローされている、ページ %2$d"
 
 #. TRANS: Page notice for page with an overview of all subscribers
 #. TRANS: of the logged in user's own profile.
-#: actions/subscribers.php:68
 msgid "These are the people who listen to your notices."
 msgstr "あなたのつぶやきを聞いている人"
 
 #. TRANS: Page notice for page with an overview of all subscribers of a user other
 #. TRANS: than the logged in user. %s is the user nickname.
-#: actions/subscribers.php:74
 #, php-format
 msgid "These are the people who listen to %s's notices."
 msgstr "%s　のつぶやきを聞いている人"
 
 #. TRANS: Subscriber list text when the logged in user has no subscribers.
-#: actions/subscribers.php:114
 #, fuzzy
 msgid ""
 "You have no subscribers. Try subscribing to people you know and they might "
@@ -6339,7 +5236,6 @@ msgstr ""
 
 #. TRANS: Subscriber list text when looking at the subscribers for a of a user other
 #. TRANS: than the logged in user that has no subscribers. %s is the user nickname.
-#: actions/subscribers.php:118
 #, php-format
 msgid "%s has no subscribers. Want to be the first?"
 msgstr "%s にはフォローしている人がいません。最初の人になりますか?"
@@ -6349,7 +5245,6 @@ msgstr "%s にはフォローしている人がいません。最初の人にな
 #. TRANS: This message contains a Markdown URL. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.
-#: actions/subscribers.php:127
 #, php-format
 msgid ""
 "%s has no subscribers. Why not [register an account](%%%%action.register%%%"
@@ -6360,20 +5255,17 @@ msgstr ""
 
 #. TRANS: Header for subscriptions overview for a user (not first page).
 #. TRANS: %1$s is a user nickname, %2$d is the page number.
-#: actions/subscriptions.php:55
 #, php-format
 msgid "%1$s subscriptions, page %2$d"
 msgstr "%1$s フォローしている、ページ %2$d"
 
 #. TRANS: Page notice for page with an overview of all subscriptions
 #. TRANS: of the logged in user's own profile.
-#: actions/subscriptions.php:68
 msgid "These are the people whose notices you listen to."
 msgstr "あなたがつぶやきを聞いている人"
 
 #. TRANS: Page notice for page with an overview of all subscriptions of a user other
 #. TRANS: than the logged in user. %s is the user nickname.
-#: actions/subscriptions.php:74
 #, php-format
 msgid "These are the people whose notices %s listens to."
 msgstr "%s がつぶやきを聞いている人"
@@ -6382,7 +5274,6 @@ 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.
-#: actions/subscriptions.php:133
 #, php-format
 msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "
@@ -6402,117 +5293,93 @@ msgstr ""
 #. TRANS: than the logged in user that has no subscriptions. %s is the user nickname.
 #. TRANS: Subscription list text when looking at the subscriptions for a of a user that has none
 #. TRANS: as an anonymous user. %s is the user nickname.
-#: actions/subscriptions.php:141 actions/subscriptions.php:147
 #, php-format
 msgid "%s is not listening to anyone."
 msgstr "%s はだれも言うことを聞いていません。"
 
 #. TRANS: Atom feed title. %s is a profile nickname.
-#: actions/subscriptions.php:176
 #, fuzzy, php-format
 msgid "Subscription feed for %s (Atom)"
 msgstr "%sのつぶやきフィード (Atom)"
 
 #. TRANS: Checkbox label for enabling Jabber messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:241 lib/settingsnav.php:110
-#, fuzzy
 msgid "IM"
 msgstr "IM"
 
 #. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:256 lib/settingsnav.php:117
 msgid "SMS"
 msgstr "SMS"
 
 #. TRANS: Title for all but the first page of notices with tags.
 #. TRANS: %1$s is the tag, %2$d is the page number.
-#: actions/tag.php:73
 #, php-format
 msgid "Notices tagged with %1$s, page %2$d"
 msgstr "%1$s とタグ付けされたつぶやき、ページ %2$d"
 
-#: actions/tag.php:91
 #, php-format
 msgid "Notice feed for tag %s (RSS 1.0)"
 msgstr "%s とタグ付けされたつぶやきフィード (RSS 1.0)"
 
-#: actions/tag.php:97
 #, php-format
 msgid "Notice feed for tag %s (RSS 2.0)"
 msgstr "%s とタグ付けされたつぶやきフィード (RSS 2.0)"
 
-#: actions/tag.php:103
 #, php-format
 msgid "Notice feed for tag %s (Atom)"
 msgstr "%s とタグ付けされたつぶやきフィード (Atom)"
 
-#: actions/tagother.php:39
 msgid "No ID argument."
 msgstr "ID引数がありません。"
 
-#: actions/tagother.php:65
 #, php-format
 msgid "Tag %s"
 msgstr "タグ %s"
 
 #. TRANS: H2 for user profile information.
-#: actions/tagother.php:77 lib/userprofile.php:76
 msgid "User profile"
 msgstr "ユーザプロファイル"
 
-#: actions/tagother.php:120
 msgid "Tag user"
 msgstr "タグユーザ"
 
-#: actions/tagother.php:130
 msgid ""
 "Tags for this user (letters, numbers, -, ., and _), comma- or space- "
 "separated"
 msgstr ""
 "このユーザのタグ (アルファベット、数字、-、.、_)、カンマかスペース区切り"
 
-#: actions/tagother.php:157
 #, php-format
 msgid "Invalid tag: \"%s\""
 msgstr "不正なタグ: \"%s\""
 
-#: actions/tagother.php:172
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 "あなたはフォローされる人々にタグ付けをすることができるだけか、あなたをフォ"
 "ローされているか。"
 
-#: actions/tagother.php:215
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr "このフォームを使用して、フォロー者かフォローにタグを加えてください。"
 
-#: actions/tagrss.php:35
 msgid "No such tag."
 msgstr "そのようなタグはありません。"
 
 #. TRANS: Client error displayed when trying to unblock a non-blocked user.
-#: actions/unblock.php:59
 msgid "You haven't blocked that user."
 msgstr "あなたはそのユーザをブロックしていません。"
 
-#: actions/unsandbox.php:72
 msgid "User is not sandboxed."
 msgstr "ユーザはサンドボックスではありません。"
 
-#: actions/unsilence.php:72
 msgid "User is not silenced."
 msgstr "ユーザはサイレンスではありません。"
 
-#: actions/unsubscribe.php:77
 msgid "No profile ID in request."
 msgstr "ログイントークンが要求されていません。"
 
-#: actions/unsubscribe.php:98
 msgid "Unsubscribed"
 msgstr "フォロー解除済み"
 
-#: actions/updateprofile.php:64
 #, php-format
 msgid ""
 "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
@@ -6520,177 +5387,142 @@ msgstr ""
 "リスニーストリームライセンス ‘%1$s’ は、サイトライセンス ‘%2$s’ と互換性があ"
 "りません。"
 
-#: actions/urlsettings.php:60
 #, fuzzy
 msgid "URL settings"
 msgstr "IM設定"
 
 #. TRANS: Instructions for tab "Other" in user profile settings.
-#: actions/urlsettings.php:72
 msgid "Manage various other options."
 msgstr "他のオプションを管理。"
 
 #. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
 #. TRANS: user's profile settings. This message has one space at the beginning. Use your
 #. TRANS: language's word separator here if it has one (most likely a single space).
-#: actions/urlsettings.php:115
 msgid " (free service)"
 msgstr "(フリーサービス)"
 
-#: actions/urlsettings.php:121
 #, fuzzy
 msgid "[none]"
 msgstr "なし"
 
-#: actions/urlsettings.php:122
 msgid "[internal]"
 msgstr ""
 
 #. TRANS: Label for dropdown with URL shortener services.
-#: actions/urlsettings.php:130
 msgid "Shorten URLs with"
 msgstr "URLを短くします"
 
 #. TRANS: Tooltip for for dropdown with URL shortener services.
-#: actions/urlsettings.php:132
 msgid "Automatic shortening service to use."
 msgstr "使用する自動短縮サービス。"
 
-#: actions/urlsettings.php:138
 msgid "URL longer than"
 msgstr ""
 
-#: actions/urlsettings.php:141
 msgid "URLs longer than this will be shortened, 0 means always shorten."
 msgstr ""
 
-#: actions/urlsettings.php:145
 msgid "Text longer than"
 msgstr ""
 
-#: actions/urlsettings.php:148
 msgid ""
 "URLs in notices longer than this will be shortened, 0 means always shorten."
 msgstr ""
 
 #. TRANS: Form validation error for form "Other settings" in user profile.
-#: actions/urlsettings.php:180
 #, fuzzy
 msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr "URL 短縮サービスが長すぎます。（最大50字）"
 
-#: actions/urlsettings.php:187
 msgid "Invalid number for max url length."
 msgstr ""
 
-#: actions/urlsettings.php:193
 #, fuzzy
 msgid "Invalid number for max notice length."
 msgstr "不正なトークン。"
 
-#: actions/urlsettings.php:238
 msgid "Error saving user URL shortening preferences."
 msgstr ""
 
 #. TRANS: User admin panel title
-#: actions/useradminpanel.php:58
 #, fuzzy
 msgctxt "TITLE"
 msgid "User"
 msgstr "ユーザ"
 
 #. TRANS: Instruction for user admin panel.
-#: actions/useradminpanel.php:69
 msgid "User settings for this StatusNet site"
 msgstr ""
 
 #. TRANS: Form validation error in user admin panel when a non-numeric character limit was set.
-#: actions/useradminpanel.php:147
 msgid "Invalid bio limit. Must be numeric."
 msgstr "不正な自己紹介制限。数字である必要があります。"
 
 #. TRANS: Form validation error in user admin panel when welcome text is too long.
-#: actions/useradminpanel.php:154
 #, fuzzy
 msgid "Invalid welcome text. Maximum length is 255 characters."
 msgstr "不正なウェルカムテキスト。最大長は255字です。"
 
 #. TRANS: Client error displayed when trying to set a non-existing user as default subscription for new
 #. TRANS: users in user admin panel. %1$s is the invalid nickname.
-#: actions/useradminpanel.php:166
 #, fuzzy, php-format
 msgid "Invalid default subscripton: \"%1$s\" is not a user."
 msgstr "不正なデフォルトフォローです: '%1$s'  はユーザではありません。"
 
-#: actions/useradminpanel.php:215 lib/action.php:565 lib/settingsnav.php:77
-#: lib/subgroupnav.php:81
 msgid "Profile"
 msgstr "プロファイル"
 
 #. TRANS: Field label in user admin panel for setting the character limit for the bio field.
-#: actions/useradminpanel.php:220
 msgid "Bio Limit"
 msgstr "自己紹介制限"
 
 #. TRANS: Tooltip in user admin panel for setting the character limit for the bio field.
-#: actions/useradminpanel.php:222
 msgid "Maximum length of a profile bio in characters."
 msgstr "プロファイル自己紹介の最大文字長。"
 
 #. TRANS: Form legend in user admin panel.
-#: actions/useradminpanel.php:231
 msgid "New users"
 msgstr "新しいユーザ"
 
 #. TRANS: Field label in user admin panel for setting new user welcome text.
-#: actions/useradminpanel.php:236
 msgid "New user welcome"
 msgstr "新しいユーザを歓迎"
 
 #. TRANS: Tooltip in user admin panel for setting new user welcome text.
-#: actions/useradminpanel.php:238
 #, fuzzy
 msgid "Welcome text for new users (maximum 255 characters)."
 msgstr "新しいユーザへのウェルカムテキスト (最大255字)。"
 
 #. TRANS: Field label in user admin panel for setting default subscription for new users.
-#: actions/useradminpanel.php:244
 msgid "Default subscription"
 msgstr "デフォルトフォロー"
 
 #. TRANS: Tooltip in user admin panel for setting default subscription for new users.
-#: actions/useradminpanel.php:246
 msgid "Automatically subscribe new users to this user."
 msgstr "自動的にこのユーザに新しいユーザをフォローしてください。"
 
 #. TRANS: Form legend in user admin panel.
-#: actions/useradminpanel.php:256
 msgid "Invitations"
 msgstr "招待"
 
 #. TRANS: Field label for checkbox in user admin panel for allowing users to invite friend using site e-mail.
-#: actions/useradminpanel.php:262
 msgid "Invitations enabled"
 msgstr "招待が可能"
 
 #. TRANS: Tooltip for checkbox in user admin panel for allowing users to invite friend using site e-mail.
-#: actions/useradminpanel.php:265
 msgid "Whether to allow users to invite new users."
 msgstr "ユーザが新しいユーザを招待するのを許容するかどうか。"
 
 #. TRANS: Title for button to save user settings in user admin panel.
-#: actions/useradminpanel.php:302
 #, fuzzy
 msgid "Save user settings."
 msgstr "サイト設定の保存"
 
 #. TRANS: Page title.
-#: actions/userauthorization.php:109
 msgid "Authorize subscription"
 msgstr "フォローを承認"
 
 #. TRANS: Page notice on "Auhtorize subscription" page.
-#: actions/userauthorization.php:115
 #, fuzzy
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
@@ -6701,42 +5533,35 @@ msgstr ""
 "フォローするために尋ねない場合は、\"Reject\" をクリックして下さい。"
 
 #. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:200
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Accept"
 msgstr "承認"
 
 #. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:202
 #, fuzzy
 msgid "Subscribe to this user."
 msgstr "このユーザーをフォロー"
 
 #. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:204
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Reject"
 msgstr "拒否"
 
 #. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:206
 #, fuzzy
 msgid "Reject this subscription."
 msgstr "このフォローを拒否"
 
 #. TRANS: Client error displayed for an empty authorisation request.
-#: actions/userauthorization.php:219
 msgid "No authorization request!"
 msgstr "認証のリクエストがありません。"
 
 #. TRANS: Accept message header from Authorise subscription page.
-#: actions/userauthorization.php:242
 msgid "Subscription authorized"
 msgstr "フォローが承認されました"
 
-#: actions/userauthorization.php:245
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to authorize the "
@@ -6747,11 +5572,9 @@ msgstr ""
 "あなたのフォロートークンは:"
 
 #. TRANS: Reject message header from Authorise subscription page.
-#: actions/userauthorization.php:256
 msgid "Subscription rejected"
 msgstr "フォローが拒否"
 
-#: actions/userauthorization.php:259
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to fully reject the "
@@ -6763,35 +5586,30 @@ msgstr ""
 
 #. TRANS: Exception thrown when no valid user is found for an authorisation request.
 #. TRANS: %s is a listener URI.
-#: actions/userauthorization.php:296
 #, fuzzy, php-format
 msgid "Listener URI \"%s\" not found here."
 msgstr "リスナー URI  ‘%s’ はここでは見つかりません。"
 
 #. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
 #. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:303
 #, fuzzy, php-format
 msgid "Listenee URI \"%s\" is too long."
 msgstr "リスニー URI  ‘%s’ が長すぎます。"
 
 #. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
 #. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:311
 #, fuzzy, php-format
 msgid "Listenee URI \"%s\" is a local user."
 msgstr "リスニー URI  ‘%s’ はローカルユーザーではありません。"
 
 #. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
 #. TRANS: %s is a profile URL.
-#: actions/userauthorization.php:329
 #, fuzzy, php-format
 msgid "Profile URL \"%s\" is for a local user."
 msgstr "プロファイル URL  ‘%s’ はローカルユーザーではありません。"
 
 #. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
 #. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
-#: actions/userauthorization.php:339
 #, fuzzy, php-format
 msgid ""
 "Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
@@ -6802,32 +5620,27 @@ msgstr ""
 
 #. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
 #. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:349
 #, fuzzy, php-format
 msgid "Avatar URL \"%s\" is not valid."
 msgstr "アバター URL  ‘%s’ が正しくありません。"
 
 #. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
 #. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:356
 #, fuzzy, php-format
 msgid "Cannot read avatar URL \"%s\"."
 msgstr "アバターURL　を読み取れません '%s'"
 
 #. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
 #. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:363
 #, fuzzy, php-format
 msgid "Wrong image type for avatar URL \"%s\"."
 msgstr "アバター URL '%s' は不正な画像形式。"
 
 #. TRANS: Page title for profile design page.
-#: actions/userdesignsettings.php:74 lib/designsettings.php:61
 msgid "Profile design"
 msgstr "プロファイルデザイン"
 
 #. TRANS: Instructions for profile design page.
-#: actions/userdesignsettings.php:84 lib/designsettings.php:72
 msgid ""
 "Customize the way your profile looks with a background image and a colour "
 "palette of your choice."
@@ -6835,45 +5648,36 @@ msgstr ""
 "あなたのプロフィールがバックグラウンド画像とあなたの選択の色のパレットで見る"
 "方法をカスタマイズしてください。"
 
-#: actions/userdesignsettings.php:289
 #, fuzzy
 msgid "Enjoy your hotdog!"
 msgstr "あなたのhotdogを楽しんでください!"
 
-#: actions/userdesignsettings.php:325
 #, fuzzy
 msgid "Design settings"
 msgstr "サイト設定の保存"
 
-#: actions/userdesignsettings.php:340
 msgid "View profile designs"
 msgstr "プロファイルデザインを表示"
 
-#: actions/userdesignsettings.php:341
 msgid "Show or hide profile designs."
 msgstr "プロファイルデザインの表示または非表示"
 
-#: actions/userdesignsettings.php:348
 #, fuzzy
 msgid "Background file"
 msgstr "バックグラウンド"
 
 #. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number.
-#: actions/usergroups.php:66
 #, php-format
 msgid "%1$s groups, page %2$d"
 msgstr "%1$s グループ、ページ %2$d"
 
-#: actions/usergroups.php:132
 msgid "Search for more groups"
 msgstr "もっとグループを検索"
 
-#: actions/usergroups.php:159
 #, php-format
 msgid "%s is not a member of any group."
 msgstr "%s はどのグループのメンバーでもありません。"
 
-#: actions/usergroups.php:164
 #, php-format
 msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
 msgstr "[グループを探して](%%action.groupsearch%%)それに加入してください。"
@@ -6883,18 +5687,14 @@ msgstr "[グループを探して](%%action.groupsearch%%)それに加入して
 #. TRANS: %1$s is a group name, %2$s is a site name.
 #. TRANS: Message is used as a subtitle in atom user notice feed.
 #. TRANS: %1$s is a user name, %2$s is a site name.
-#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:70
-#: lib/atomusernoticefeed.php:95
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr "%1$s から %2$s  上の更新をしました!"
 
-#: actions/version.php:75
 #, php-format
 msgid "StatusNet %s"
 msgstr "StatusNet %s"
 
-#: actions/version.php:155
 #, php-format
 msgid ""
 "This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
@@ -6903,16 +5703,13 @@ msgstr ""
 "This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
 "Inc. and contributors."
 
-#: actions/version.php:163
 msgid "Contributors"
 msgstr "コントリビュータ"
 
 #. TRANS: Menu item for site administration
-#: actions/version.php:167 lib/adminpanelaction.php:403
 msgid "License"
 msgstr "ライセンス"
 
-#: actions/version.php:170
 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 "
@@ -6920,7 +5717,6 @@ msgid ""
 "any later version. "
 msgstr ""
 
-#: actions/version.php:176
 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 "
@@ -6928,7 +5724,6 @@ msgid ""
 "for more details. "
 msgstr ""
 
-#: actions/version.php:182
 #, php-format
 msgid ""
 "You should have received a copy of the GNU Affero General Public License "
@@ -6936,52 +5731,42 @@ msgid ""
 msgstr ""
 
 #. TRANS: Form input field label for application name.
-#: actions/version.php:197 lib/applicationeditform.php:190
 msgid "Name"
 msgstr "名前"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:885
 msgid "Version"
 msgstr "バージョン"
 
-#: actions/version.php:199
 msgid "Author(s)"
 msgstr "作者"
 
 #. TRANS: Form input field label.
-#: actions/version.php:200 lib/applicationeditform.php:208
-#: lib/groupeditform.php:168
 msgid "Description"
 msgstr "概要"
 
 #. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:164
 msgid "Favor"
 msgstr "お気に入り"
 
 #. TRANS: Ntofication given when a user marks a notice as favorite.
 #. TRANS: %1$s is a user nickname or full name, %2$s is a notice URI.
-#: classes/Fave.php:167
 #, fuzzy, php-format
 msgid "%1$s marked notice %2$s as a favorite."
 msgstr "%s (@%s) はお気に入りとしてあなたのつぶやきを加えました"
 
 #. TRANS: Server exception thrown when a URL cannot be processed.
-#: classes/File.php:162
 #, php-format
 msgid "Cannot process URL '%s'"
 msgstr ""
 
 #. TRANS: Server exception thrown when... Robin thinks something is impossible!
-#: classes/File.php:194
 msgid "Robin thinks something is impossible."
 msgstr ""
 
 #. 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$s is used for plural.
-#: classes/File.php:210
 #, fuzzy, php-format
 msgid ""
 "No file may be larger than %1$d byte and the file you sent was %2$d bytes. "
@@ -6996,7 +5781,6 @@ msgstr[0] ""
 
 #. TRANS: Message given if an upload would exceed user quota.
 #. TRANS: %d (number) is the user quota in bytes and is used for plural.
-#: classes/File.php:223
 #, fuzzy, php-format
 msgid "A file this large would exceed your user quota of %d byte."
 msgid_plural "A file this large would exceed your user quota of %d bytes."
@@ -7005,7 +5789,6 @@ msgstr[0] ""
 
 #. TRANS: Message given id an upload would exceed a user's monthly quota.
 #. TRANS: $d (number) is the monthly user quota in bytes and is used for plural.
-#: classes/File.php:235
 #, fuzzy, php-format
 msgid "A file this large would exceed your monthly quota of %d byte."
 msgid_plural "A file this large would exceed your monthly quota of %d bytes."
@@ -7013,117 +5796,97 @@ msgstr[0] ""
 "これほど大きいファイルはあなたの%dバイトの毎月の割当てを超えているでしょう。"
 
 #. TRANS: Client exception thrown if a file upload does not have a valid name.
-#: classes/File.php:282 classes/File.php:297
 #, fuzzy
 msgid "Invalid filename."
 msgstr "不正なサイズ。"
 
 #. TRANS: Exception thrown when joining a group fails.
-#: classes/Group_member.php:51
 msgid "Group join failed."
 msgstr "グループ参加に失敗しました。"
 
 #. TRANS: Exception thrown when trying to leave a group the user is not a member of.
-#: classes/Group_member.php:64
 msgid "Not part of group."
 msgstr "グループの一部ではありません。"
 
 #. TRANS: Exception thrown when trying to leave a group fails.
-#: classes/Group_member.php:72
 msgid "Group leave failed."
 msgstr "グループ脱退に失敗しました。"
 
 #. TRANS: Exception thrown providing an invalid profile ID.
 #. TRANS: %s is the invalid profile ID.
-#: classes/Group_member.php:85
 #, php-format
 msgid "Profile ID %s is invalid."
 msgstr ""
 
 #. TRANS: Exception thrown providing an invalid group ID.
 #. TRANS: %s is the invalid group ID.
-#: classes/Group_member.php:98
 #, fuzzy, php-format
 msgid "Group ID %s is invalid."
 msgstr "ユーザ保存エラー; 不正なユーザ"
 
 #. TRANS: Activity title.
-#: classes/Group_member.php:147 lib/joinform.php:114
 msgid "Join"
 msgstr "参加"
 
 #. TRANS: Success message for subscribe to group attempt through OStatus.
 #. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
-#: classes/Group_member.php:151
 #, php-format
 msgid "%1$s has joined group %2$s."
 msgstr ""
 
 #. TRANS: Server exception thrown when updating a local group fails.
-#: classes/Local_group.php:42
 #, fuzzy
 msgid "Could not update local group."
 msgstr "グループを更新できません。"
 
 #. TRANS: Exception thrown when trying creating a login token failed.
 #. TRANS: %s is the user nickname for which token creation failed.
-#: classes/Login_token.php:78
 #, php-format
 msgid "Could not create login token for %s"
 msgstr "%s 用のログイン・トークンを作成できませんでした"
 
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
-#: classes/Memcached_DataObject.php:556
 msgid "No database name or DSN found anywhere."
 msgstr ""
 
 #. TRANS: Client exception thrown when a user tries to send a direct message while being banned from sending them.
-#: classes/Message.php:45
 msgid "You are banned from sending direct messages."
 msgstr "あなたはダイレクトメッセージを送るのが禁止されています。"
 
 #. TRANS: Message given when a message could not be stored on the server.
-#: classes/Message.php:69
 msgid "Could not insert message."
 msgstr "メッセージを追加できません。"
 
 #. TRANS: Message given when a message could not be updated on the server.
-#: classes/Message.php:80
 msgid "Could not update message with new URI."
 msgstr "新しいURIでメッセージをアップデートできませんでした。"
 
 #. TRANS: Server exception thrown when a user profile for a notice cannot be found.
 #. TRANS: %1$d is a profile ID (number), %2$d is a notice ID (number).
-#: classes/Notice.php:98
 #, php-format
 msgid "No such profile (%1$d) for notice (%2$d)."
 msgstr ""
 
 #. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:199
 #, php-format
 msgid "Database error inserting hashtag: %s"
 msgstr "OAuth アプリケーションユーザの追加時ＤＢエラー。"
 
 #. TRANS: Client exception thrown if a notice contains too many characters.
-#: classes/Notice.php:279
 msgid "Problem saving notice. Too long."
 msgstr "つぶやきを保存する際に問題が発生しました。長すぎです。"
 
 #. TRANS: Client exception thrown when trying to save a notice for an unknown user.
-#: classes/Notice.php:284
 msgid "Problem saving notice. Unknown user."
 msgstr "つぶやきを保存する際に問題が発生しました。不明なユーザです。"
 
 #. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
-#: classes/Notice.php:290
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 "多すぎるつぶやきが速すぎます; 数分間の休みを取ってから再投稿してください。"
 
 #. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
-#: classes/Notice.php:297
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
 "few minutes."
@@ -7132,42 +5895,35 @@ msgstr ""
 "い。"
 
 #. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:305
 msgid "You are banned from posting notices on this site."
 msgstr "あなたはこのサイトでつぶやきを投稿するのが禁止されています。"
 
 #. TRANS: Server exception thrown when a notice cannot be saved.
 #. TRANS: Server exception thrown when a notice cannot be updated.
-#: classes/Notice.php:372 classes/Notice.php:399
 msgid "Problem saving notice."
 msgstr "つぶやきを保存する際に問題が発生しました。"
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:929
 msgid "Bad type provided to saveKnownGroups."
 msgstr ""
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:1028
 msgid "Problem saving group inbox."
 msgstr "グループ受信箱を保存する際に問題が発生しました。"
 
 #. TRANS: Server exception thrown when a reply cannot be saved.
 #. TRANS: %1$d is a notice ID, %2$d is the ID of the mentioned user.
-#: classes/Notice.php:1144
 #, fuzzy, php-format
 msgid "Could not save reply for %1$d, %2$d."
 msgstr "フォローを保存できません。"
 
 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1663
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr ""
 
 #. TRANS: Full name of a profile or group followed by nickname in parens
-#: classes/Profile.php:172 classes/User_group.php:242
 #, fuzzy, php-format
 msgctxt "FANCYNAME"
 msgid "%1$s (%2$s)"
@@ -7175,266 +5931,210 @@ msgstr "%1$s (%2$s)"
 
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:779
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:788
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
 
 #. TRANS: Exception thrown when a right for a non-existing user profile is checked.
-#: classes/Remote_profile.php:54
 #, fuzzy
 msgid "Missing profile."
 msgstr "ユーザはプロフィールをもっていません。"
 
 #. TRANS: Exception thrown when a tag cannot be saved.
-#: classes/Status_network.php:338
 msgid "Unable to save tag."
 msgstr "タグをを保存できません。"
 
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#: classes/Subscription.php:77 lib/oauthstore.php:482
 msgid "You have been banned from subscribing."
 msgstr "あなたはフォローが禁止されました。"
 
 #. TRANS: Exception thrown when trying to subscribe while already subscribed.
-#: classes/Subscription.php:82
 msgid "Already subscribed!"
 msgstr "すでにフォローしています!"
 
 #. TRANS: Exception thrown when trying to subscribe to a user who has blocked the subscribing user.
-#: classes/Subscription.php:87
 msgid "User has blocked you."
 msgstr "ユーザはあなたをブロックしました。"
 
 #. TRANS: Exception thrown when trying to unsibscribe without a subscription.
-#: classes/Subscription.php:176
 msgid "Not subscribed!"
 msgstr "フォローしていません！"
 
 #. TRANS: Exception thrown when trying to unsubscribe a user from themselves.
-#: classes/Subscription.php:183
 msgid "Could not delete self-subscription."
 msgstr "フォローを保存できません。"
 
 #. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
-#: classes/Subscription.php:211
 msgid "Could not delete subscription OMB token."
 msgstr "フォローを保存できません。"
 
 #. TRANS: Exception thrown when a subscription could not be deleted on the server.
-#: classes/Subscription.php:223
 msgid "Could not delete subscription."
 msgstr "フォローを保存できません。"
 
 #. TRANS: Activity tile when subscribing to another person.
-#: classes/Subscription.php:265
 msgid "Follow"
 msgstr ""
 
 #. TRANS: Notification given when one person starts following another.
 #. TRANS: %1$s is the subscriber, %2$s is the subscribed.
-#: classes/Subscription.php:268
 #, fuzzy, php-format
 msgid "%1$s is now following %2$s."
 msgstr "%1$s は %2$s であなたのつぶやきを聞いています。"
 
 #. TRANS: Notice given on user registration.
 #. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:390
 #, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr "ようこそ %1$s、@%2$s!"
 
 #. TRANS: Server exception.
-#: classes/User.php:923
 msgid "No single user defined for single-user mode."
 msgstr "single-user　モードのためのシングルユーザが定義されていません。"
 
 #. TRANS: Server exception.
-#: classes/User.php:927
 msgid "Single-user mode code called when not enabled."
 msgstr ""
 
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:522
 msgid "Could not create group."
 msgstr "グループを作成できません。"
 
 #. TRANS: Server exception thrown when updating a group URI failed.
-#: classes/User_group.php:532
 msgid "Could not set group URI."
 msgstr "グループを作成できません。"
 
 #. TRANS: Server exception thrown when setting group membership failed.
-#: classes/User_group.php:555
 msgid "Could not set group membership."
 msgstr "グループメンバーシップをセットできません。"
 
 #. TRANS: Server exception thrown when saving local group information failed.
-#: classes/User_group.php:570
 #, fuzzy
 msgid "Could not save local group info."
 msgstr "フォローを保存できません。"
 
 #. TRANS: Exception thrown when an account could not be located when it should be moved.
 #. TRANS: %s is the remote site.
-#: lib/accountmover.php:65
 #, fuzzy, php-format
 msgid "Cannot locate account %s."
 msgstr "ユーザを削除できません"
 
 #. TRANS: Exception thrown when a service document could not be located account move.
 #. TRANS: %s is the remote site.
-#: lib/accountmover.php:106
 #, php-format
 msgid "Cannot find XRD for %s."
 msgstr ""
 
 #. TRANS: Exception thrown when an account could not be located when it should be moved.
 #. TRANS: %s is the remote site.
-#: lib/accountmover.php:131
 #, php-format
 msgid "No AtomPub API service for %s."
 msgstr ""
 
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: lib/action.php:161
 #, php-format
 msgid "%1$s - %2$s"
 msgstr ""
 
 #. TRANS: Page title for a page without a title set.
-#: lib/action.php:177
 msgid "Untitled page"
 msgstr "名称未設定ページ"
 
 #. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.
-#: lib/action.php:325
 msgctxt "TOOLTIP"
 msgid "Show more"
 msgstr ""
 
 #. TRANS: Inline reply form submit button: submits a reply comment.
-#: lib/action.php:328
 #, fuzzy
 msgctxt "BUTTON"
-msgid "Comment"
-msgstr "内容"
+msgid "Reply"
+msgstr "返信"
 
 #. TRANS: Placeholder text for inline reply form. Clicking in this box will turn it into a mini notice form.
-#: lib/action.php:331
-msgid "Add a comment..."
+msgid "Write a reply..."
 msgstr ""
 
-#: lib/action.php:559 lib/personalgroupnav.php:99
-#, fuzzy
 msgid "Home"
 msgstr "ホームページ"
 
-#: lib/action.php:560
 #, fuzzy
 msgid "Friends timeline"
 msgstr "%s のタイムライン"
 
-#: lib/action.php:566
-#, fuzzy
 msgid "Your profile"
 msgstr "グループプロファイル"
 
-#: lib/action.php:570 lib/action.php:593 lib/publicgroupnav.php:78
 msgid "Public"
 msgstr "パブリック"
 
-#: lib/action.php:571 lib/action.php:594
 #, fuzzy
 msgid "Everyone on this site"
 msgstr "このサイトの人々を探す"
 
-#: lib/action.php:575
-#, fuzzy
 msgid "Settings"
 msgstr "SMS 設定"
 
-#: lib/action.php:576
 #, fuzzy
 msgid "Change your personal settings"
 msgstr "プロファイル設定の変更"
 
-#: lib/action.php:582
 #, fuzzy
 msgid "Site configuration"
 msgstr "ユーザ設定"
 
-#: lib/action.php:587
-#, fuzzy
 msgid "Logout"
 msgstr "ロゴ"
 
-#: lib/action.php:588
-#, fuzzy
 msgid "Logout from the site"
 msgstr "サイトのテーマ"
 
-#: lib/action.php:599
-#, fuzzy
 msgid "Login to the site"
 msgstr "サイトへログイン"
 
-#: lib/action.php:606
-#, fuzzy
 msgid "Search"
 msgstr "検索"
 
-#: lib/action.php:607
 #, fuzzy
 msgid "Search the site"
 msgstr "サイト検索"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:864
 msgid "Help"
 msgstr "ヘルプ"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:867
 msgid "About"
 msgstr "About"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:870
 msgid "FAQ"
 msgstr "よくある質問"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:875
 msgid "TOS"
 msgstr ""
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:879
 msgid "Privacy"
 msgstr "プライバシー"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:882
 msgid "Source"
 msgstr "ソース"
 
 #. TRANS: Secondary navigation menu option leading to e-mail contact information on the
 #. TRANS: StatusNet site, where to report bugs, ...
-#: lib/action.php:889
 msgid "Contact"
 msgstr "連絡先"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:892
 msgid "Badge"
 msgstr "バッジ"
 
@@ -7442,7 +6142,6 @@ msgstr "バッジ"
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:921
 #, fuzzy, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7452,7 +6151,6 @@ msgstr ""
 "イクロブログサービスです。 "
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:924
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** はマイクロブログサービスです。"
@@ -7461,7 +6159,6 @@ msgstr "**%%site.name%%** はマイクロブログサービスです。"
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:931
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7474,106 +6171,88 @@ msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:949
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:956
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:960
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:992
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1335
 msgid "After"
 msgstr "<<後"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1345
 msgid "Before"
 msgstr "前>>"
 
 #. TRANS: Client exception thrown when a feed instance is a DOMDocument.
-#: lib/activity.php:125
 msgid "Expecting a root feed element but got a whole XML document."
 msgstr ""
 
 #. TRANS: Client exception thrown when using an unknown verb for the activity importer.
-#: lib/activityimporter.php:81
 #, fuzzy, php-format
 msgid "Unknown verb: \"%s\"."
 msgstr "不明な言語 \"%s\""
 
 #. TRANS: Client exception thrown when trying to force a subscription for an untrusted user.
-#: lib/activityimporter.php:107
 msgid "Cannot force subscription for untrusted user."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to for a remote user to subscribe.
-#: lib/activityimporter.php:117
 #, fuzzy
 msgid "Cannot force remote user to subscribe."
 msgstr "フォローする利用者の名前を指定してください"
 
 #. TRANS: Client exception thrown when trying to subscribe to an unknown profile.
-#: lib/activityimporter.php:132
 #, fuzzy
 msgid "Unknown profile."
 msgstr "不明なファイルタイプ"
 
 #. TRANS: Client exception thrown when trying to import an event not related to the importing user.
-#: lib/activityimporter.php:138
 msgid "This activity seems unrelated to our user."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to join a remote group that is not a group.
-#: lib/activityimporter.php:154
 msgid "Remote profile is not a group!"
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to join a group the importing user is already a member of.
-#: lib/activityimporter.php:163
 #, fuzzy
 msgid "User is already a member of this group."
 msgstr "すでにこのグループのメンバーです。"
 
 #. TRANS: Client exception thrown when trying to import a notice by another user.
 #. TRANS: %1$s is the source URI of the notice, %2$s is the URI of the author.
-#: lib/activityimporter.php:201
 #, php-format
 msgid "Already know about notice %1$s and  it has a different author %2$s."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to overwrite the author information for a non-trusted user during import.
-#: lib/activityimporter.php:207
 msgid "Not overwriting author info for non-trusted user."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to import a notice without content.
 #. TRANS: %s is the notice URI.
-#: lib/activityimporter.php:223
 #, fuzzy, php-format
 msgid "No content for notice %s."
 msgstr "つぶやきの内容を探す"
 
-#: lib/activitymover.php:84
 #, fuzzy, php-format
 msgid "No such user %s."
 msgstr "そのようなユーザはいません。"
@@ -7584,434 +6263,355 @@ msgstr "そのようなユーザはいません。"
 #. TRANS: %1$s is a URL, %2$s is the status, %s$s is the fail reason.
 #. TRANS: Exception thrown when post to collection fails with a status that is not handled.
 #. TRANS: %1$s is a URL, %2$s is the status, %s$s is the fail reason.
-#: lib/activitysink.php:163 lib/activitysink.php:167 lib/activitysink.php:172
 #, fuzzy, php-format
 msgctxt "URLSTATUSREASON"
 msgid "%1$s %2$s %3$s"
 msgstr "%1$s (%2$s)"
 
 #. TRANS: Client exception thrown when there is no source attribute.
-#: lib/activityutils.php:200
 msgid "Can't handle remote content yet."
 msgstr ""
 
 #. TRANS: Client exception thrown when there embedded XML content is found that cannot be processed yet.
-#: lib/activityutils.php:237
 msgid "Can't handle embedded XML content yet."
 msgstr ""
 
 #. TRANS: Client exception thrown when base64 encoded content is found that cannot be processed yet.
-#: lib/activityutils.php:242
 msgid "Can't handle embedded Base64 content yet."
 msgstr ""
 
 #. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights.
-#: lib/adminpanelaction.php:96
 msgid "You cannot make changes to this site."
 msgstr "あなたはこのサイトへの変更を行うことができません。"
 
 #. TRANS: Client error message throw when a certain panel's settings cannot be changed.
-#: lib/adminpanelaction.php:108
 msgid "Changes to that panel are not allowed."
 msgstr "そのパネルへの変更は許可されていません。"
 
 #. TRANS: Client error message.
-#: lib/adminpanelaction.php:222
 msgid "showForm() not implemented."
 msgstr "showForm() は実装されていません。"
 
 #. TRANS: Client error message
-#: lib/adminpanelaction.php:250
 msgid "saveSettings() not implemented."
 msgstr "saveSettings() は実装されていません。"
 
 #. TRANS: Client error message thrown if design settings could not be deleted in
 #. TRANS: the admin panel Design.
-#: lib/adminpanelaction.php:274
 msgid "Unable to delete design setting."
 msgstr "デザイン設定を削除できません。"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:337
 msgid "Basic site configuration"
 msgstr "基本サイト設定"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:339
 #, fuzzy
 msgctxt "MENU"
 msgid "Site"
 msgstr "サイト"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:345
 msgid "Design configuration"
 msgstr "デザイン設定"
 
 #. TRANS: Menu item for site administration
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/adminpanelaction.php:347 lib/groupnav.php:135
 #, fuzzy
 msgctxt "MENU"
 msgid "Design"
 msgstr "デザイン"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:353
 msgid "User configuration"
 msgstr "ユーザ設定"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:110
 msgid "User"
 msgstr "ユーザ"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:361
 msgid "Access configuration"
 msgstr "アクセス設定"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:369
 msgid "Paths configuration"
 msgstr "パス設定"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:377
 msgid "Sessions configuration"
 msgstr "セッション設定"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:385
 #, fuzzy
 msgid "Edit site notice"
 msgstr "サイトつぶやき"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:387
 msgid "Site notice"
 msgstr "サイトつぶやき"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:393
 #, fuzzy
 msgid "Snapshots configuration"
 msgstr "パス設定"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:401
 msgid "Set site license"
 msgstr ""
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:409
 #, fuzzy
 msgid "Plugins configuration"
 msgstr "パス設定"
 
 #. TRANS: Client error 401.
-#: lib/apiauth.php:111
 msgid "API resource requires read-write access, but you only have read access."
 msgstr ""
 "APIリソースは読み書きアクセスが必要です、しかしあなたは読みアクセスしか持って"
 "いません。"
 
 #. TRANS: OAuth exception thrown when no application is found for a given consumer key.
-#: lib/apiauth.php:177
 msgid "No application for that consumer key."
 msgstr ""
 
-#: lib/apiauth.php:202 lib/apiauth.php:284
 msgid "Not allowed to use API."
 msgstr ""
 
 #. TRANS: OAuth exception given when an incorrect access token was given for a user.
-#: lib/apiauth.php:225
 msgid "Bad access token."
 msgstr ""
 
 #. TRANS: OAuth exception given when no user was found for a given token (no token was found).
-#: lib/apiauth.php:230
 msgid "No user for that token."
 msgstr ""
 
 #. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel".
 #. TRANS: Client error thrown when authentication fails.
-#: lib/apiauth.php:272 lib/apiauth.php:302
 msgid "Could not authenticate you."
 msgstr ""
 
 #. TRANS: Server error displayed when trying to create an anynymous OAuth consumer.
-#: lib/apioauthstore.php:45
 #, fuzzy
 msgid "Could not create anonymous consumer."
 msgstr "別名を作成できません。"
 
 #. TRANS: Server error displayed when trying to create an anynymous OAuth application.
-#: lib/apioauthstore.php:69
 #, fuzzy
 msgid "Could not create anonymous OAuth application."
 msgstr "アプリケーションを作成できません。"
 
 #. TRANS: Exception thrown when no token association could be found.
-#: lib/apioauthstore.php:151
 msgid ""
 "Could not find a profile and application associated with the request token."
 msgstr ""
 
 #. TRANS: Exception thrown when no access token can be issued.
-#: lib/apioauthstore.php:209
 #, fuzzy
 msgid "Could not issue access token."
 msgstr "メッセージを追加できません。"
 
-#: lib/apioauthstore.php:317
 msgid "Database error inserting OAuth application user."
 msgstr "OAuth アプリケーションユーザの追加時ＤＢエラー。"
 
-#: lib/apioauthstore.php:345
 #, fuzzy
 msgid "Database error updating OAuth application user."
 msgstr "OAuth アプリケーションユーザの追加時ＤＢエラー。"
 
 #. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
-#: lib/apioauthstore.php:371
 msgid "Tried to revoke unknown token."
 msgstr ""
 
 #. TRANS: Exception thrown when an attempt is made to remove a revoked token.
-#: lib/apioauthstore.php:376
 msgid "Failed to delete revoked token."
 msgstr ""
 
 #. TRANS: Form input field label for application icon.
-#: lib/applicationeditform.php:177
 msgid "Icon"
 msgstr "アイコン"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:182
 msgid "Icon for this application"
 msgstr "このアプリケーションのアイコン"
 
 #. TRANS: Form input field instructions.
 #. TRANS: %d is the number of available characters for the description.
-#: lib/applicationeditform.php:201
 #, fuzzy, php-format
 msgid "Describe your application in %d character"
 msgid_plural "Describe your application in %d characters"
 msgstr[0] "あなたのアプリケーションを %d 字以内記述"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:205
 msgid "Describe your application"
 msgstr "あなたのアプリケーションを記述"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:216
 msgid "URL of the homepage of this application"
 msgstr "このアプリケーションのホームページの URL"
 
 #. TRANS: Form input field label.
-#: lib/applicationeditform.php:218
 msgid "Source URL"
 msgstr "ソース URL"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:225
 msgid "Organization responsible for this application"
 msgstr "このアプリケーションに責任がある組織"
 
 #. TRANS: Form input field label.
-#: lib/applicationeditform.php:227
 msgid "Organization"
 msgstr "組織"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:234
 msgid "URL for the homepage of the organization"
 msgstr "組織のホームページのURL"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:243
 msgid "URL to redirect to after authentication"
 msgstr "認証の後にリダイレクトするURL"
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:271
 msgid "Browser"
 msgstr "ブラウザ"
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:288
 msgid "Desktop"
 msgstr "デスクトップ"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:290
 msgid "Type of application, browser or desktop"
 msgstr "アプリケーション、ブラウザ、またはデスクトップのタイプ"
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:314
 msgid "Read-only"
 msgstr "リードオンリー"
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:334
 msgid "Read-write"
 msgstr "リードライト"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:336
 msgid "Default access for this application: read-only, or read-write"
 msgstr ""
 "このアプリケーションのためのデフォルトアクセス: リードオンリー、またはリード"
 "ライト"
 
 #. TRANS: Submit button title.
-#: lib/applicationeditform.php:353
 msgid "Cancel"
 msgstr "中止"
 
-#: lib/applicationlist.php:247
 msgid " by "
 msgstr ""
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:260
 #, fuzzy
 msgid "read-write"
 msgstr "リードライト"
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:262
 #, fuzzy
 msgid "read-only"
 msgstr "リードオンリー"
 
 #. TRANS: Used in application list. %1$s is a modified date, %2$s is access type ("read-write" or "read-only")
-#: lib/applicationlist.php:268
 #, php-format
 msgid "Approved %1$s - \"%2$s\" access."
 msgstr ""
 
 #. TRANS: Access token in the application list.
 #. TRANS: %s are the first 7 characters of the access token.
-#: lib/applicationlist.php:282
 #, php-format
 msgid "Access token starting with: %s"
 msgstr ""
 
 #. TRANS: Button label
-#: lib/applicationlist.php:298
 msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "回復"
 
-#: lib/atom10feed.php:113
 msgid "Author element must contain a name element."
 msgstr ""
 
 #. TRANS: Server exception thrown when using the method setActivitySubject() in the class Atom10Feed.
-#: lib/atom10feed.php:160
 #, fuzzy
 msgid "Do not use this method!"
 msgstr "このつぶやきを削除できません。"
 
 #. TRANS: Title.
-#: lib/attachmentnoticesection.php:67
 msgid "Notices where this attachment appears"
 msgstr "この添付が現れるつぶやき"
 
 #. TRANS: Title.
-#: lib/attachmenttagcloudsection.php:48
 msgid "Tags for this attachment"
 msgstr "この添付のタグ"
 
 #. TRANS: Exception thrown when a password change fails.
-#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:227
 #, fuzzy
 msgid "Password changing failed."
 msgstr "パスワード変更に失敗しました"
 
 #. TRANS: Exception thrown when a password change attempt fails because it is not allowed.
-#: lib/authenticationplugin.php:238
 #, fuzzy
 msgid "Password changing is not allowed."
 msgstr "パスワード変更は許可されていません"
 
 #. TRANS: Title for the form to block a user.
-#: lib/blockform.php:68
 msgid "Block"
 msgstr "ブロック"
 
 #. TRANS: Description of the form to block a user.
-#: lib/blockform.php:79
 msgid "Block this user"
 msgstr "このユーザをブロックする"
 
 #. TRANS: Title for command results.
-#: lib/channel.php:104 lib/channel.php:125
 msgid "Command results"
 msgstr "コマンド結果"
 
 #. TRANS: Title for command results.
-#: lib/channel.php:138
 #, fuzzy
 msgid "AJAX error"
 msgstr "Ajax エラー"
 
 #. TRANS: E-mail subject when a command has completed.
-#: lib/channel.php:177 lib/mailhandler.php:143
 msgid "Command complete"
 msgstr "コマンド完了"
 
 #. TRANS: E-mail subject when a command has failed.
-#: lib/channel.php:188
 msgid "Command failed"
 msgstr "コマンド失敗"
 
 #. TRANS: Command exception text shown when a notice ID is requested that does not exist.
-#: lib/command.php:82 lib/command.php:106
 #, fuzzy
 msgid "Notice with that id does not exist."
 msgstr "その ID によるつぶやきは存在していません"
 
 #. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
 #. TRANS: Error text shown when a last user notice is requested and it does not exist.
-#: lib/command.php:99 lib/command.php:642
 #, fuzzy
 msgid "User has no last notice."
 msgstr "利用者はまだつぶやいていません"
 
 #. TRANS: Message given requesting a profile for a non-existing user.
 #. TRANS: %s is the nickname of the user for which the profile could not be found.
-#: lib/command.php:128
 #, fuzzy, php-format
 msgid "Could not find a user with nickname %s."
 msgstr "ユーザを更新できません"
 
 #. TRANS: Message given getting a non-existing user.
 #. TRANS: %s is the nickname of the user that could not be found.
-#: lib/command.php:148
 #, php-format
 msgid "Could not find a local user with nickname %s."
 msgstr ""
 
 #. TRANS: Error text shown when an unimplemented command is given.
-#: lib/command.php:183
 msgid "Sorry, this command is not yet implemented."
 msgstr "すみません、このコマンドはまだ実装されていません。"
 
 #. TRANS: Command exception text shown when a user tries to nudge themselves.
-#: lib/command.php:229
 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr "それは自分自身への合図で多くは意味がありません!"
 
 #. TRANS: Message given having nudged another user.
 #. TRANS: %s is the nickname of the user that was nudged.
-#: lib/command.php:238
 #, fuzzy, php-format
 msgid "Nudge sent to %s."
 msgstr "%s へ合図を送りました"
@@ -8020,7 +6620,6 @@ msgstr "%s へ合図を送りました"
 #. TRANS: %1$s is the number of other user the user is subscribed to.
 #. TRANS: %2$s is the number of users that are subscribed to the user.
 #. TRANS: %3$s is the number of notices the user has sent.
-#: lib/command.php:268
 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"
@@ -8032,40 +6631,34 @@ msgstr ""
 "つぶやき: %3$s"
 
 #. TRANS: Error message text shown when a favorite could not be set because it has already been favorited.
-#: lib/command.php:298
 #, fuzzy
 msgid "Could not create favorite: already favorited."
 msgstr "お気に入りを作成できません。"
 
 #. TRANS: Text shown when a notice has been marked as favourite successfully.
-#: lib/command.php:324
 msgid "Notice marked as fave."
 msgstr "お気に入りにされているつぶやき。"
 
 #. TRANS: Message given having added a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:369
 #, php-format
 msgid "%1$s joined group %2$s."
 msgstr ""
 
 #. TRANS: Message given having removed a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:417
 #, php-format
 msgid "%1$s left group %2$s."
 msgstr ""
 
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: lib/command.php:438
 #, fuzzy, php-format
 msgctxt "WHOIS"
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
 
 #. TRANS: Whois output. %s is the full name of the queried user.
-#: lib/command.php:442
 #, php-format
 msgid "Fullname: %s"
 msgstr "フルネーム： %s"
@@ -8073,7 +6666,6 @@ msgstr "フルネーム： %s"
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a location.
-#: lib/command.php:446 lib/mail.php:275
 #, php-format
 msgid "Location: %s"
 msgstr "場所: %s"
@@ -8081,20 +6673,17 @@ msgstr "場所: %s"
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a homepage.
-#: lib/command.php:450 lib/mail.php:279
 #, php-format
 msgid "Homepage: %s"
 msgstr "ホームページ: %s"
 
 #. TRANS: Whois output. %s is the bio information of the queried user.
-#: lib/command.php:454
 #, php-format
 msgid "About: %s"
 msgstr "About: %s"
 
 #. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).
 #. TRANS: %s is a remote profile.
-#: lib/command.php:483
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
@@ -8103,32 +6692,31 @@ msgstr ""
 
 #. TRANS: Message given if content is too long. %1$sd is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:500
 #, fuzzy, php-format
 msgid "Message too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
 msgstr[0] "メッセージが長すぎます - 最大 %1$d 字、あなたが送ったのは %2$d。"
 
+#. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
+msgid "You can't send a message to this user."
+msgstr "このユーザにメッセージを送ることはできません。"
+
 #. TRANS: Error text shown sending a direct message fails with an unknown reason.
-#: lib/command.php:528
 msgid "Error sending direct message."
 msgstr "ダイレクトメッセージ送信エラー。"
 
 #. TRANS: Message given having repeated a notice from another user.
 #. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:565
 #, fuzzy, php-format
 msgid "Notice from %s repeated."
 msgstr "%s からつぶやきが繰り返されています"
 
 #. TRANS: Error text shown when repeating a notice fails with an unknown reason.
-#: lib/command.php:568
 msgid "Error repeating notice."
 msgstr "つぶやき繰り返しエラー"
 
 #. TRANS: Message given if content of a notice for a reply is too long. %1$d is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:603
 #, fuzzy, php-format
 msgid "Notice too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Notice too long - maximum is %1$d characters, you sent %2$d."
@@ -8136,138 +6724,116 @@ msgstr[0] "つぶやきが長すぎます - 最大 %d 字、あなたが送っ
 
 #. TRANS: Text shown having sent a reply to a notice successfully.
 #. TRANS: %s is the nickname of the user of the notice the reply was sent to.
-#: lib/command.php:616
 #, fuzzy, php-format
 msgid "Reply to %s sent."
 msgstr "%s へ返信を送りました"
 
 #. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
-#: lib/command.php:619
 msgid "Error saving notice."
 msgstr "つぶやき保存エラー。"
 
 #. TRANS: Error text shown when no username was provided when issuing a subscribe command.
-#: lib/command.php:666
 #, fuzzy
 msgid "Specify the name of the user to subscribe to."
 msgstr "フォローする利用者の名前を指定してください"
 
 #. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
-#: lib/command.php:675
 #, fuzzy
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "あなたはそのプロファイルにフォローされていません。"
 
 #. TRANS: Text shown after having subscribed to another user successfully.
 #. TRANS: %s is the name of the user the subscription was requested for.
-#: lib/command.php:683
 #, php-format
 msgid "Subscribed to %s."
 msgstr ""
 
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.
-#: lib/command.php:704 lib/command.php:815
 #, fuzzy
 msgid "Specify the name of the user to unsubscribe from."
 msgstr "フォローをやめるユーザの名前を指定してください"
 
 #. TRANS: Text shown after having unsubscribed from another user successfully.
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:715
 #, php-format
 msgid "Unsubscribed from %s."
 msgstr ""
 
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
-#: lib/command.php:735 lib/command.php:761
 msgid "Command not yet implemented."
 msgstr "コマンドはまだ実装されていません。"
 
 #. TRANS: Text shown when issuing the command "off" successfully.
-#: lib/command.php:739
 msgid "Notification off."
 msgstr "通知オフ。"
 
 #. TRANS: Error text shown when the command "off" fails for an unknown reason.
-#: lib/command.php:742
 msgid "Can't turn off notification."
 msgstr "通知をオフできません。"
 
 #. TRANS: Text shown when issuing the command "on" successfully.
-#: lib/command.php:765
 msgid "Notification on."
 msgstr "通知オン。"
 
 #. TRANS: Error text shown when the command "on" fails for an unknown reason.
-#: lib/command.php:768
 msgid "Can't turn on notification."
 msgstr "通知をオンできません。"
 
 #. TRANS: Error text shown when issuing the login command while login is disabled.
-#: lib/command.php:782
 #, fuzzy
 msgid "Login command is disabled."
 msgstr "ログインコマンドが無効になっています。"
 
 #. TRANS: Text shown after issuing the login command successfully.
 #. TRANS: %s is a logon link..
-#: lib/command.php:795
 #, php-format
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
 
 #. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:824
 #, php-format
 msgid "Unsubscribed %s."
 msgstr ""
 
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
-#: lib/command.php:842
 msgid "You are not subscribed to anyone."
 msgstr "あなたはだれにもフォローされていません。"
 
 #. TRANS: Text shown after requesting other users a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
-#: lib/command.php:847
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "あなたはこの人にフォローされています:"
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user
 #. TRANS: (followers) without having any subscribers.
-#: lib/command.php:869
 msgid "No one is subscribed to you."
 msgstr "誰もフォローしていません。"
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
-#: lib/command.php:874
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "この人はあなたにフォローされている:"
 
 #. TRANS: Text shown after requesting groups a user is subscribed to without having
 #. TRANS: any group subscriptions.
-#: lib/command.php:896
 msgid "You are not a member of any groups."
 msgstr "あなたはどのグループのメンバーでもありません。"
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
-#: lib/command.php:901
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "あなたはこのグループのメンバーではありません:"
 
 #. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-#: lib/command.php:916
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -8310,20 +6876,17 @@ msgid ""
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:36
 #, fuzzy
 msgid "No configuration file found."
 msgstr "コンフィギュレーションファイルがありません。 "
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:39
 #, fuzzy
 msgid "I looked for configuration files in the following places:"
 msgstr "私は以下の場所でコンフィギュレーションファイルを探しました: "
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:42
 msgid "You may wish to run the installer to fix this."
 msgstr ""
 "あなたは、これを修理するためにインストーラを動かしたがっているかもしれませ"
@@ -8331,52 +6894,42 @@ msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:46
 msgid "Go to the installer."
 msgstr "インストーラへ。"
 
-#: lib/dberroraction.php:59
 msgid "Database error"
 msgstr "データベースエラー"
 
 #. TRANS: Description of form for deleting a user.
-#: lib/deleteuserform.php:75
 msgid "Delete this user"
 msgstr "このユーザを削除"
 
-#: lib/designform.php:114
 #, fuzzy
 msgid "Change design"
 msgstr "デザインの保存"
 
 #. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: lib/designform.php:131
 msgid "Change colours"
 msgstr "色の変更"
 
 #. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: lib/designform.php:138
 msgid "Use defaults"
 msgstr "デフォルトを使用"
 
 #. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: lib/designform.php:140
 msgid "Restore default designs"
 msgstr "デフォルトデザインに戻す。"
 
 #. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: lib/designform.php:148
 msgid "Reset back to default"
 msgstr "デフォルトへリセットする"
 
 #. TRANS: Label in form on profile design page.
 #. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
-#: lib/designform.php:158
 msgid "Upload file"
 msgstr "ファイルアップロード"
 
 #. TRANS: Instructions for form on profile design page.
-#: lib/designform.php:163
 #, fuzzy
 msgid ""
 "You can upload your personal background image. The maximum file size is 2Mb."
@@ -8385,49 +6938,41 @@ msgstr ""
 "す。"
 
 #. TRANS: Radio button on profile design page that will enable use of the uploaded profile image.
-#: lib/designform.php:194
 #, fuzzy
 msgctxt "RADIO"
 msgid "On"
 msgstr "オン"
 
 #. TRANS: Radio button on profile design page that will disable use of the uploaded profile image.
-#: lib/designform.php:211
 #, fuzzy
 msgctxt "RADIO"
 msgid "Off"
 msgstr "オフ"
 
 #. TRANS: Title for button on profile design page to save settings.
-#: lib/designform.php:322
 msgid "Save design"
 msgstr "デザインの保存"
 
 #. TRANS: Error message displayed if design settings could not be saved.
 #. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
-#: lib/designsettings.php:216 lib/designsettings.php:238
 msgid "Couldn't update your design."
 msgstr "あなたのデザインを更新できません。"
 
 #. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
-#: lib/designsettings.php:244
 msgid "Design defaults restored."
 msgstr "デフォルトのデザインを回復。"
 
 #. TRANS: Exception. %s is an ID.
-#: lib/discovery.php:153
 #, fuzzy, php-format
 msgid "Unable to find services for %s."
 msgstr "アプリケーションのための取消しアクセスができません: "
 
 #. TRANS: Form legend for removing the favourite status for a favourite notice.
 #. TRANS: Title for button text for removing the favourite status for a favourite notice.
-#: lib/disfavorform.php:108 lib/disfavorform.php:140
 msgid "Disfavor this notice"
 msgstr "このつぶやきのお気に入りをやめる"
 
 #. TRANS: Button text for removing the favourite status for a favourite notice.
-#: lib/disfavorform.php:136
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Disfavor favorite"
@@ -8435,102 +6980,80 @@ msgstr "お気に入りをやめる"
 
 #. TRANS: Form legend for adding the favourite status to a notice.
 #. TRANS: Title for button text for adding the favourite status to a notice.
-#: lib/favorform.php:108 lib/favorform.php:139
 msgid "Favor this notice"
 msgstr "このつぶやきをお気に入りにする"
 
 #. TRANS: Button text for adding the favourite status to a notice.
-#: lib/favorform.php:135
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Favor"
 msgstr "お気に入り"
 
-#: lib/feed.php:84
 msgid "RSS 1.0"
 msgstr "RSS 1.0"
 
-#: lib/feed.php:86
 msgid "RSS 2.0"
 msgstr "RSS 2.0"
 
-#: lib/feed.php:88
 msgid "Atom"
 msgstr "Atom"
 
-#: lib/feed.php:90
 msgid "FOAF"
 msgstr "FOAF"
 
-#: lib/feedimporter.php:75
 #, fuzzy
 msgid "Not an atom feed."
 msgstr "全てのメンバー"
 
-#: lib/feedimporter.php:82
 msgid "No author in the feed."
 msgstr ""
 
-#: lib/feedimporter.php:89
 msgid "Can't import without a user."
 msgstr ""
 
 #. TRANS: Header for feed links (h2).
-#: lib/feedlist.php:66
 msgid "Feeds"
 msgstr ""
 
-#: lib/galleryaction.php:128
 msgid "All"
 msgstr "全て"
 
-#: lib/galleryaction.php:136
 msgid "Select tag to filter"
 msgstr "フィルターにかけるタグを選択"
 
-#: lib/galleryaction.php:137
 msgid "Tag"
 msgstr "タグ"
 
-#: lib/galleryaction.php:138
 msgid "Choose a tag to narrow list"
 msgstr "タグを選んで、リストを狭くしてください"
 
-#: lib/galleryaction.php:140
 msgid "Go"
 msgstr "移動"
 
-#: lib/grantroleform.php:91
 #, php-format
 msgid "Grant this user the \"%s\" role"
 msgstr ""
 
-#: lib/groupeditform.php:147
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "1-64文字の、小文字アルファベットか数字で、スペースや句読点は除く"
 
-#: lib/groupeditform.php:156
 #, fuzzy
 msgid "URL of the homepage or blog of the group or topic."
 msgstr "グループやトピックのホームページやブログの URL"
 
-#: lib/groupeditform.php:161
 msgid "Describe the group or topic"
 msgstr "グループやトピックを記述"
 
-#: lib/groupeditform.php:163
 #, fuzzy, php-format
 msgid "Describe the group or topic in %d character or less"
 msgid_plural "Describe the group or topic in %d characters or less"
 msgstr[0] "グループやトピックを %d 字以内記述"
 
-#: lib/groupeditform.php:175
 #, fuzzy
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\"."
 msgstr "グループの場所, 例えば \"都市, 都道府県 (または 地域), 国\""
 
-#: lib/groupeditform.php:183
 #, fuzzy, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -8542,49 +7065,42 @@ msgstr[0] ""
 "グループのエクストラニックネーム、カンマまたはスペース区切り、最大 %d"
 
 #. TRANS: Menu item in the group navigation page.
-#: lib/groupnav.php:86
 msgctxt "MENU"
 msgid "Group"
 msgstr ""
 
 #. TRANS: Tooltip for menu item in the group navigation page.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:89
 #, php-format
 msgctxt "TOOLTIP"
 msgid "%s group"
 msgstr ""
 
 #. TRANS: Menu item in the group navigation page.
-#: lib/groupnav.php:95
 msgctxt "MENU"
 msgid "Members"
 msgstr ""
 
 #. TRANS: Tooltip for menu item in the group navigation page.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:98
 #, php-format
 msgctxt "TOOLTIP"
 msgid "%s group members"
 msgstr ""
 
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/groupnav.php:108
 msgctxt "MENU"
 msgid "Blocked"
 msgstr ""
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:111
 #, php-format
 msgctxt "TOOLTIP"
 msgid "%s blocked users"
 msgstr ""
 
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/groupnav.php:117
 #, fuzzy
 msgctxt "MENU"
 msgid "Admin"
@@ -8592,21 +7108,18 @@ msgstr "管理者"
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:120
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Edit %s group properties"
 msgstr ""
 
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/groupnav.php:126
 msgctxt "MENU"
 msgid "Logo"
 msgstr ""
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:129
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Add or edit %s logo"
@@ -8614,89 +7127,74 @@ msgstr ""
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:138
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Add or edit %s design"
 msgstr ""
 
 #. TRANS: Title for groups with the most members section.
-#: lib/groupsbymemberssection.php:71
 msgid "Groups with most members"
 msgstr "メンバー数が多いグループ"
 
 #. TRANS: Title for groups with the most posts section.
-#: lib/groupsbypostssection.php:71
 msgid "Groups with most posts"
 msgstr "投稿が多いグループ"
 
 #. TRANS: Title for group tag cloud section.
 #. TRANS: %s is a group name.
-#: lib/grouptagcloudsection.php:57
 #, php-format
 msgid "Tags in %s group's notices"
 msgstr "%s グループのつぶやきにあるタグ"
 
 #. TRANS: Client exception 406
-#: lib/htmloutputter.php:104
 msgid "This page is not available in a media type you accept"
 msgstr "このページはあなたが承認したメディアタイプでは利用できません。"
 
 #. TRANS: Exception thrown when trying to upload an unsupported image file format.
-#: lib/imagefile.php:73
 msgid "Unsupported image file format."
 msgstr "サポート外の画像形式です。"
 
 #. TRANS: Exception thrown when too large a file is uploaded.
 #. TRANS: %s is the maximum file size, for example "500b", "10kB" or "2MB".
-#: lib/imagefile.php:91
 #, php-format
 msgid "That file is too big. The maximum file size is %s."
 msgstr "ファイルが大きすぎます。最大ファイルサイズは %s 。"
 
 #. TRANS: Exception thrown when uploading an image and that action could not be completed.
-#: lib/imagefile.php:97
 msgid "Partial upload."
 msgstr "不完全なアップロード。"
 
 #. TRANS: Exception thrown when uploading a file as image that is not an image or is a corrupt file.
-#: lib/imagefile.php:115
 msgid "Not an image or corrupt file."
 msgstr "画像ではないかファイルが破損しています。"
 
 #. TRANS: Exception thrown during resize when image has been registered as present, but is no longer there.
-#: lib/imagefile.php:178
 msgid "Lost our file."
 msgstr "ファイルを紛失。"
 
 #. TRANS: Exception thrown when trying to resize an unknown file type.
 #. TRANS: Exception thrown when trying resize an unknown file type.
-#: lib/imagefile.php:216 lib/imagefile.php:257
 msgid "Unknown file type"
 msgstr "不明なファイルタイプ"
 
 #. TRANS: Number of megabytes. %d is the number.
-#: lib/imagefile.php:303
 #, fuzzy, php-format
 msgid "%dMB"
 msgid_plural "%dMB"
 msgstr[0] "MB"
 
 #. TRANS: Number of kilobytes. %d is the number.
-#: lib/imagefile.php:307
 #, fuzzy, php-format
 msgid "%dkB"
 msgid_plural "%dkB"
 msgstr[0] "kB"
 
 #. TRANS: Number of bytes. %d is the number.
-#: lib/imagefile.php:310
 #, php-format
 msgid "%dB"
 msgid_plural "%dB"
 msgstr[0] ""
 
-#: lib/implugin.php:262
 #, php-format
 msgid ""
 "User \"%s\" on %s has said that your %s screenname belongs to them. If "
@@ -8706,53 +7204,44 @@ msgid ""
 "message."
 msgstr ""
 
-#: lib/implugin.php:349
 #, php-format
 msgid "Unknown inbox source %d."
 msgstr "不明な受信箱のソース %d。"
 
-#: lib/implugin.php:485
-#, fuzzy, php-format
+#, php-format
 msgid "Message too long - maximum is %1$d characters, you sent %2$d."
 msgstr "メッセージが長すぎます - 最大 %1$d 字、あなたが送ったのは %2$d。"
 
-#: lib/leaveform.php:114
 msgid "Leave"
 msgstr "離れる"
 
 #. TRANS: Menu item for logging in to the StatusNet site.
-#: lib/logingroupnav.php:77
 #, fuzzy
 msgctxt "MENU"
 msgid "Login"
 msgstr "ログイン"
 
 #. TRANS: Title for menu item for logging in to the StatusNet site.
-#: lib/logingroupnav.php:79
 msgid "Login with a username and password"
 msgstr "ユーザ名とパスワードでログイン"
 
 #. TRANS: Menu item for registering with the StatusNet site.
-#: lib/logingroupnav.php:85
 #, fuzzy
 msgctxt "MENU"
 msgid "Register"
 msgstr "登録"
 
 #. TRANS: Title for menu item for registering with the StatusNet site.
-#: lib/logingroupnav.php:87
 msgid "Sign up for a new account"
 msgstr "新しいアカウントでサインアップ"
 
 #. TRANS: Subject for address confirmation email.
-#: lib/mail.php:172
 msgid "Email address confirmation"
 msgstr "メールアドレス確認"
 
 #. TRANS: Body for address confirmation email.
 #. TRANS: %1$s is the addressed user's nickname, %2$s is the StatusNet sitename,
 #. TRANS: %3$s is the URL to confirm at.
-#: lib/mail.php:177
 #, fuzzy, php-format
 msgid ""
 "Hey, %1$s.\n"
@@ -8783,14 +7272,12 @@ msgstr ""
 
 #. TRANS: Subject of new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
-#: lib/mail.php:243
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1$s は %2$s であなたのつぶやきを聞いています。"
 
 #. TRANS: This is a paragraph in a new-subscriber e-mail.
 #. TRANS: %s is a URL where the subscriber can be reported as abusive.
-#: lib/mail.php:250
 #, php-format
 msgid ""
 "If you believe this account is being used abusively, you can block them from "
@@ -8802,7 +7289,6 @@ msgstr ""
 #. TRANS: %3$s is the subscriber's profile URL, %4$s is the subscriber's location (or empty)
 #. TRANS: %5$s is the subscriber's homepage URL (or empty), %6%s is the subscriber's bio (or empty)
 #. TRANS: %7$s is a link to the addressed user's e-mail settings.
-#: lib/mail.php:260
 #, fuzzy, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -8829,14 +7315,12 @@ msgstr ""
 
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is biographical information.
-#: lib/mail.php:283
 #, php-format
 msgid "Bio: %s"
 msgstr "自己紹介: %s"
 
 #. TRANS: Subject of notification mail for new posting email address.
 #. TRANS: %s is the StatusNet sitename.
-#: lib/mail.php:312
 #, php-format
 msgid "New email address for posting to %s"
 msgstr "%s へ投稿のための新しいメールアドレス"
@@ -8844,7 +7328,6 @@ msgstr "%s へ投稿のための新しいメールアドレス"
 #. TRANS: Body of notification mail for new posting email address.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is the e-mail address to send
 #. TRANS: to to post by e-mail, %3$s is a URL to more instructions.
-#: lib/mail.php:318
 #, fuzzy, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -8867,26 +7350,22 @@ msgstr ""
 
 #. TRANS: Subject line for SMS-by-email notification messages.
 #. TRANS: %s is the posting user's nickname.
-#: lib/mail.php:439
 #, php-format
 msgid "%s status"
 msgstr "%s の状態"
 
 #. TRANS: Subject line for SMS-by-email address confirmation message.
-#: lib/mail.php:465
 msgid "SMS confirmation"
 msgstr "SMS確認"
 
 #. TRANS: Main body heading for SMS-by-email address confirmation message.
 #. TRANS: %s is the addressed user's nickname.
-#: lib/mail.php:469
 #, fuzzy, php-format
 msgid "%s: confirm you own this phone number with this code:"
 msgstr "この電話番号は確認待ちです。"
 
 #. TRANS: Subject for 'nudge' notification email.
 #. TRANS: %s is the nudging user.
-#: lib/mail.php:490
 #, fuzzy, php-format
 msgid "You have been nudged by %s"
 msgstr "あなたは %s に合図されています"
@@ -8894,7 +7373,6 @@ msgstr "あなたは %s に合図されています"
 #. TRANS: Body for 'nudge' notification email.
 #. TRANS: %1$s is the nuding user's long name, $2$s is the nudging user's nickname,
 #. TRANS: %3$s is a URL to post notices at, %4$s is the StatusNet sitename.
-#: lib/mail.php:497
 #, fuzzy, php-format
 msgid ""
 "%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -8923,7 +7401,6 @@ msgstr ""
 
 #. TRANS: Subject for direct-message notification email.
 #. TRANS: %s is the sending user's nickname.
-#: lib/mail.php:544
 #, php-format
 msgid "New private message from %s"
 msgstr "%s からの新しいプライベートメッセージ"
@@ -8932,7 +7409,6 @@ msgstr "%s からの新しいプライベートメッセージ"
 #. TRANS: %1$s is the sending user's long name, %2$s is the sending user's nickname,
 #. TRANS: %3$s is the message content, %4$s a URL to the message,
 #. TRANS: %5$s is the StatusNet sitename.
-#: lib/mail.php:552
 #, fuzzy, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -8967,7 +7443,6 @@ msgstr ""
 
 #. TRANS: Subject for favorite notification e-mail.
 #. TRANS: %1$s is the adding user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:604
 #, fuzzy, php-format
 msgid "%1$s (@%2$s) added your notice as a favorite"
 msgstr "%s (@%s) はお気に入りとしてあなたのつぶやきを加えました"
@@ -8977,7 +7452,6 @@ msgstr "%s (@%s) はお気に入りとしてあなたのつぶやきを加えま
 #. TRANS: %3$s is a URL to the faved notice, %4$s is the faved notice text,
 #. TRANS: %5$s is a URL to all faves of the adding user, %6$s is the StatusNet sitename,
 #. TRANS: %7$s is the adding user's nickname.
-#: lib/mail.php:611
 #, fuzzy, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -9016,7 +7490,6 @@ msgstr ""
 "%6%s\n"
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:669
 #, php-format
 msgid ""
 "The full conversation can be read here:\n"
@@ -9026,7 +7499,6 @@ msgstr ""
 
 #. TRANS: E-mail subject for notice notification.
 #. TRANS: %1$s is the sending user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:677
 #, fuzzy, php-format
 msgid "%1$s (@%2$s) sent a notice to your attention"
 msgstr "%s (@%s) はあなた宛てにつぶやきを送りました"
@@ -9037,7 +7509,6 @@ msgstr "%s (@%s) はあなた宛てにつぶやきを送りました"
 #. TRANS: %5$s is a URL to the full conversion if it exists (otherwise empty),
 #. TRANS: %6$s is a URL to reply to the notice, %7$s is a URL to all @-replied for the addressed user,
 #. TRANS: %8$s is a URL to the addressed user's e-mail settings, %9$s is the sender's nickname.
-#: lib/mail.php:685
 #, php-format
 msgid ""
 "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -9064,11 +7535,9 @@ msgid ""
 "P.S. You can turn off these email notifications here: %8$s\n"
 msgstr ""
 
-#: lib/mailbox.php:87
 msgid "Only the user can read their own mailboxes."
 msgstr "ユーザだけがかれら自身のメールボックスを読むことができます。"
 
-#: lib/mailbox.php:125
 msgid ""
 "You have no private messages. You can send private message to engage other "
 "users in conversation. People can send you messages for your eyes only."
@@ -9077,55 +7546,45 @@ msgstr ""
 "に引き込むプライベートメッセージを送ることができます。人々はあなただけへの"
 "メッセージを送ることができます。"
 
-#: lib/mailhandler.php:37
 msgid "Could not parse message."
 msgstr "メッセージを分析できませんでした。"
 
-#: lib/mailhandler.php:42
 msgid "Not a registered user."
 msgstr "登録ユーザではありません。"
 
-#: lib/mailhandler.php:46
 msgid "Sorry, that is not your incoming email address."
 msgstr "すみません、それはあなたの入って来るメールアドレスではありません。"
 
-#: lib/mailhandler.php:50
 msgid "Sorry, no incoming email allowed."
 msgstr "すみません、入ってくるメールは許可されていません。"
 
-#: lib/mailhandler.php:229
 #, php-format
 msgid "Unsupported message type: %s"
 msgstr "サポート外のメッセージタイプ: %s"
 
 #. TRANS: Client exception thrown when a database error was thrown during a file upload operation.
-#: lib/mediafile.php:102 lib/mediafile.php:174
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
 "データベースエラーがあなたのファイルを保存しているときにありました。 再試行し"
 "てください。"
 
 #. TRANS: Client exception thrown when a file upload operation would cause a user to exceed a set quota.
-#: lib/mediafile.php:238 lib/mediafile.php:281
 msgid "File exceeds user's quota."
 msgstr "ファイルはユーザの割当てを超えています。"
 
 #. TRANS: Client exception thrown when a file upload operation fails because the file could
 #. TRANS: not be moved from the temporary folder to the permanent file location.
-#: lib/mediafile.php:258 lib/mediafile.php:300
 msgid "File could not be moved to destination directory."
 msgstr "ファイルを目的ディレクトリに動かすことができませんでした。"
 
 #. TRANS: Client exception thrown when a file upload operation has been stopped because the MIME
 #. TRANS: type of the uploaded file could not be determined.
-#: lib/mediafile.php:265 lib/mediafile.php:306
 msgid "Could not determine file's MIME type."
 msgstr "ファイルのMIMEタイプを決定できません。"
 
 #. TRANS: Client exception thrown trying to upload a forbidden MIME type.
 #. TRANS: %1$s is the file type that was denied, %2$s is the application part of
 #. TRANS: the MIME type that was denied.
-#: lib/mediafile.php:396
 #, php-format
 msgid ""
 "\"%1$s\" is not a supported file type on this server. Try using another %2$s "
@@ -9134,84 +7593,75 @@ msgstr ""
 
 #. TRANS: Client exception thrown trying to upload a forbidden MIME type.
 #. TRANS: %s is the file type that was denied.
-#: lib/mediafile.php:401
 #, php-format
 msgid "\"%s\" is not a supported file type on this server."
 msgstr ""
 
-#: lib/messageform.php:120
 msgid "Send a direct notice"
 msgstr "直接つぶやきを送る"
 
 #. TRANS Label entry in drop-down selection box in direct-message inbox/outbox. This is the default entry in the drop-down box, doubling as instructions and a brake against accidental submissions with the first user in the list.
-#: lib/messageform.php:137
 #, fuzzy
 msgid "Select recipient:"
 msgstr "キャリア選択"
 
 #. TRANS Entry in drop-down selection box in direct-message inbox/outbox when no one is available to message.
-#: lib/messageform.php:150
 #, fuzzy
 msgid "No mutual subscribers."
 msgstr "フォローしていません！"
 
-#: lib/messageform.php:153
 msgid "To"
 msgstr "To"
 
-#: lib/messageform.php:184 lib/noticeform.php:236
 #, fuzzy
 msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr "投稿"
 
-#: lib/messagelist.php:77
 #, fuzzy
 msgid "Messages"
 msgstr "メッセージ"
 
-#: lib/messagelistitem.php:123 lib/noticelist.php:527
 msgid "from"
 msgstr "from"
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:178
 msgid "Nickname cannot be empty."
 msgstr ""
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:191
 #, php-format
 msgid "Nickname cannot be more than %d character long."
 msgid_plural "Nickname cannot be more than %d characters long."
 msgstr[0] ""
 
-#: lib/noticeform.php:160
+#. TRANS: Form legend for notice form.
 msgid "Send a notice"
 msgstr "つぶやきを送る"
 
-#: lib/noticeform.php:174
+#. TRANS: Title for notice label. %s is the user's nickname.
 #, php-format
 msgid "What's up, %s?"
 msgstr "最近どう %s?"
 
-#: lib/noticeform.php:193
+#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr "添付"
 
-#: lib/noticeform.php:197
-msgid "Attach a file"
+#. TRANS: Title for input field to attach a file to a notice.
+#, fuzzy
+msgid "Attach a file."
 msgstr "ファイル添付"
 
-#: lib/noticeform.php:212
+#. TRANS: Field label to add location to a notice.
 msgid "Share my location"
 msgstr "あなたの場所を共有する"
 
-#: lib/noticeform.php:215
+#. TRANS: Text to not share location for a notice in notice form.
 msgid "Do not share my location"
 msgstr "あなたの場所を共有しない"
 
-#: lib/noticeform.php:216
+#. TRANS: Timeout error text for location retrieval in notice form.
 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
 "try again later"
@@ -9220,814 +7670,519 @@ msgstr ""
 "度試みてください"
 
 #. TRANS: Used in coordinates as abbreviation of north
-#: lib/noticelist.php:457
 #, fuzzy
 msgid "N"
 msgstr "北"
 
 #. TRANS: Used in coordinates as abbreviation of south
-#: lib/noticelist.php:459
 #, fuzzy
 msgid "S"
 msgstr "南"
 
 #. TRANS: Used in coordinates as abbreviation of east
-#: lib/noticelist.php:461
 #, fuzzy
 msgid "E"
 msgstr "東"
 
 #. TRANS: Used in coordinates as abbreviation of west
-#: lib/noticelist.php:463
 #, fuzzy
 msgid "W"
 msgstr "西"
 
-#: lib/noticelist.php:465
 #, php-format
 msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgstr ""
 
-#: lib/noticelist.php:474
 msgid "at"
 msgstr "at"
 
-#: lib/noticelist.php:523
 msgid "web"
 msgstr ""
 
-#: lib/noticelist.php:589
 msgid "in context"
 msgstr ""
 
-#: lib/noticelist.php:624
 msgid "Repeated by"
 msgstr ""
 
-#: lib/noticelist.php:651
 msgid "Reply to this notice"
 msgstr "このつぶやきへ返信"
 
-#: lib/noticelist.php:652
 msgid "Reply"
 msgstr "返信"
 
-#: lib/noticelist.php:678
 msgid "Delete this notice"
 msgstr "このつぶやきを削除"
 
-#: lib/noticelist.php:696
 msgid "Notice repeated"
 msgstr "つぶやきを繰り返しました"
 
-#: lib/nudgeform.php:116
 msgid "Nudge this user"
 msgstr "このユーザへ合図"
 
-#: lib/nudgeform.php:128
 msgid "Nudge"
 msgstr "合図"
 
-#: lib/nudgeform.php:128
 msgid "Send a nudge to this user"
 msgstr "このユーザへ合図を送る"
 
-#: lib/oauthstore.php:294
 msgid "Error inserting new profile."
 msgstr ""
 
-#: lib/oauthstore.php:302
 msgid "Error inserting avatar."
 msgstr ""
 
-#: lib/oauthstore.php:322
 msgid "Error inserting remote profile."
 msgstr ""
 
 #. TRANS: Exception thrown when a notice is denied because it has been sent before.
-#: lib/oauthstore.php:362
 msgid "Duplicate notice."
 msgstr ""
 
-#: lib/oauthstore.php:507
 msgid "Couldn't insert new subscription."
 msgstr "サブスクリプションを追加できません"
 
-#: lib/personalgroupnav.php:104
-#, fuzzy
 msgid "Replies"
 msgstr "返信"
 
-#: lib/personalgroupnav.php:109
-#, fuzzy
 msgid "Favorites"
 msgstr "お気に入り"
 
-#: lib/personalgroupnav.php:120
-#, fuzzy
 msgid "Inbox"
 msgstr "受信箱"
 
-#: lib/personalgroupnav.php:121
 msgid "Your incoming messages"
 msgstr "あなたの入ってくるメッセージ"
 
-#: lib/personalgroupnav.php:125
-#, fuzzy
 msgid "Outbox"
 msgstr "送信箱"
 
-#: lib/personalgroupnav.php:126
 msgid "Your sent messages"
 msgstr "あなたが送ったメッセージ"
 
 #. TRANS: Title for personal tag cloud section. %s is a user nickname.
-#: lib/personaltagcloudsection.php:56
 #, php-format
 msgid "Tags in %s's notices"
 msgstr "%s のつぶやきのタグ"
 
 #. TRANS: Displayed as version information for a plugin if no version information was found.
-#: lib/plugin.php:126
 msgid "Unknown"
 msgstr "不明"
 
 #. TRANS: Plugin admin panel controls
-#: lib/plugindisableform.php:90
 msgctxt "plugin"
 msgid "Disable"
 msgstr ""
 
 #. TRANS: Plugin admin panel controls
-#: lib/pluginenableform.php:112
 msgctxt "plugin"
 msgid "Enable"
 msgstr ""
 
-#: lib/pluginlist.php:196
 msgctxt "plugin-description"
 msgid "(Plugin descriptions unavailable when disabled.)"
 msgstr ""
 
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:88
 msgid "Subscriptions"
 msgstr "フォロー"
 
 #. TRANS: Text for user subscription statistics if user has more subscriptions than displayed.
-#: lib/profileaction.php:144
 msgid "All subscriptions"
 msgstr "すべてのフォロー"
 
 #. TRANS: H2 text for user subscriber statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:96
 msgid "Subscribers"
 msgstr "フォローされている"
 
 #. TRANS: Text for user subscription statistics if user has more subscribers than displayed.
-#: lib/profileaction.php:181
 msgid "All subscribers"
 msgstr "すべてのフォローされている"
 
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:213
 msgid "User ID"
 msgstr "ユーザＩＤ"
 
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:219
 msgid "Member since"
 msgstr "利用開始日"
 
 #. TRANS: Label for user statistics.
 #. TRANS: H2 text for user group membership statistics.
-#: lib/profileaction.php:239 lib/profileaction.php:290
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:104
 msgid "Groups"
 msgstr "グループ"
 
 #. TRANS: Label for user statistics.
 #. TRANS: Average count of posts made per day since account registration.
-#: lib/profileaction.php:253
 msgid "Daily average"
 msgstr ""
 
 #. TRANS: Text for user group membership statistics if user has more subscriptions than displayed.
-#: lib/profileaction.php:305
 msgid "All groups"
 msgstr "全てのグループ"
 
 #. TRANS: Server error displayed when using an unimplemented method.
-#: lib/profileformaction.php:123
 msgid "Unimplemented method."
 msgstr "未実装のメソッド。"
 
-#: lib/publicgroupnav.php:82
 msgid "User groups"
 msgstr "ユーザグループ"
 
-#: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
 msgid "Recent tags"
 msgstr "最近のタグ"
 
-#: lib/publicgroupnav.php:88
 msgid "Featured"
 msgstr "フィーチャーされた"
 
-#: lib/publicgroupnav.php:92
 msgid "Popular"
 msgstr "人気"
 
-#: lib/redirectingaction.php:95
 msgid "No return-to arguments."
 msgstr "return-to 引数がありません。"
 
-#: lib/repeatform.php:107
 msgid "Repeat this notice?"
 msgstr "このつぶやきを繰り返しますか?"
 
-#: lib/repeatform.php:132
 msgid "Yes"
 msgstr "はい"
 
-#: lib/repeatform.php:132
 msgid "Repeat this notice"
 msgstr "このつぶやきを繰り返す"
 
-#: lib/revokeroleform.php:91
 #, fuzzy, php-format
 msgid "Revoke the \"%s\" role from this user"
 msgstr "このグループからこのユーザをブロック"
 
 #. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:1001
 #, fuzzy
 msgid "Page not found."
 msgstr "API メソッドが見つかりません。"
 
-#: lib/sandboxform.php:67
 msgid "Sandbox"
 msgstr "サンドボックス"
 
-#: lib/sandboxform.php:78
 msgid "Sandbox this user"
 msgstr "このユーザをサンドボックス"
 
 #. TRANS: Fieldset legend for the search form.
-#: lib/searchaction.php:120
 msgid "Search site"
 msgstr "サイト検索"
 
 #. TRANS: Used as a field label for the field where one or more keywords
 #. TRANS: for searching can be entered.
-#: lib/searchaction.php:128
 msgid "Keyword(s)"
 msgstr "キーワード"
 
 #. TRANS: Button text for searching site.
-#: lib/searchaction.php:130
 msgctxt "BUTTON"
 msgid "Search"
 msgstr ""
 
-#: lib/searchgroupnav.php:80
 msgid "People"
 msgstr "人々"
 
-#: lib/searchgroupnav.php:81
 msgid "Find people on this site"
 msgstr "このサイトの人々を探す"
 
-#: lib/searchgroupnav.php:83
 msgid "Find content of notices"
 msgstr "つぶやきの内容を探す"
 
-#: lib/searchgroupnav.php:85
 msgid "Find groups on this site"
 msgstr "このサイト上のグループを検索する"
 
-#: lib/section.php:89
 msgid "Untitled section"
 msgstr "名称未設定のセクション"
 
-#: lib/section.php:106
 msgid "More..."
 msgstr "さらに..."
 
-#: lib/settingsnav.php:78
 msgid "Change your profile settings"
 msgstr "プロファイル設定の変更"
 
-#: lib/settingsnav.php:83
 msgid "Upload an avatar"
 msgstr "アバターのアップロード"
 
-#: lib/settingsnav.php:88
 msgid "Change your password"
 msgstr "パスワードの変更"
 
-#: lib/settingsnav.php:93
 msgid "Change email handling"
 msgstr "メールの扱いを変更"
 
-#: lib/settingsnav.php:98
 msgid "Design your profile"
 msgstr "あなたのプロファイルをデザイン"
 
-#: lib/settingsnav.php:102
 msgid "URL"
 msgstr "URL"
 
-#: lib/settingsnav.php:103
 msgid "URL shorteners"
 msgstr ""
 
-#: lib/settingsnav.php:111
 msgid "Updates by instant messenger (IM)"
 msgstr "インスタントメッセンジャー(IM)での更新"
 
-#: lib/settingsnav.php:118
 msgid "Updates by SMS"
 msgstr "SMSでの更新"
 
-#: lib/settingsnav.php:123
-#, fuzzy
 msgid "Connections"
 msgstr "接続"
 
-#: lib/settingsnav.php:124
 msgid "Authorized connected applications"
 msgstr "承認された接続アプリケーション"
 
-#: lib/silenceform.php:67
 msgid "Silence"
 msgstr "サイレンス"
 
-#: lib/silenceform.php:78
 msgid "Silence this user"
 msgstr "このユーザをサイレンスに"
 
-#: lib/subgroupnav.php:89
 #, php-format
 msgid "People %s subscribes to"
 msgstr "人々 %s はフォロー"
 
-#: lib/subgroupnav.php:97
 #, php-format
 msgid "People subscribed to %s"
 msgstr "人々は %s をフォローしました。"
 
-#: lib/subgroupnav.php:105
 #, php-format
 msgid "Groups %s is a member of"
 msgstr "グループ %s はメンバー"
 
-#: lib/subgroupnav.php:111
 msgid "Invite"
 msgstr "招待"
 
-#: lib/subgroupnav.php:112
 #, php-format
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "友人や同僚が %s で加わるよう誘ってください。"
 
-#: lib/subscribeform.php:115 lib/subscribeform.php:139
 msgid "Subscribe to this user"
 msgstr "このユーザーをフォロー"
 
-#: lib/subscriberspeopleselftagcloudsection.php:48
-#: lib/subscriptionspeopleselftagcloudsection.php:48
 msgid "People Tagcloud as self-tagged"
 msgstr "自己タグづけとしての人々タグクラウド"
 
-#: lib/subscriberspeopletagcloudsection.php:48
-#: lib/subscriptionspeopletagcloudsection.php:48
 msgid "People Tagcloud as tagged"
 msgstr "タグ付けとしての人々タグクラウド"
 
-#: lib/tagcloudsection.php:56
 msgid "None"
 msgstr "なし"
 
 #. TRANS: Server exception displayed if a theme name was invalid.
-#: lib/theme.php:74
 #, fuzzy
 msgid "Invalid theme name."
 msgstr "不正なサイズ。"
 
-#: lib/themeuploader.php:50
 msgid "This server cannot handle theme uploads without ZIP support."
 msgstr ""
 
-#: lib/themeuploader.php:58 lib/themeuploader.php:61
 msgid "The theme file is missing or the upload failed."
 msgstr ""
 
-#: lib/themeuploader.php:91 lib/themeuploader.php:102
-#: lib/themeuploader.php:279 lib/themeuploader.php:283
-#: lib/themeuploader.php:291 lib/themeuploader.php:298
 #, fuzzy
 msgid "Failed saving theme."
 msgstr "アバターの更新に失敗しました。"
 
-#: lib/themeuploader.php:147
 msgid "Invalid theme: bad directory structure."
 msgstr ""
 
-#: lib/themeuploader.php:166
 #, php-format
 msgid "Uploaded theme is too large; must be less than %d byte uncompressed."
 msgid_plural ""
 "Uploaded theme is too large; must be less than %d bytes uncompressed."
 msgstr[0] ""
 
-#: lib/themeuploader.php:179
 msgid "Invalid theme archive: missing file css/display.css"
 msgstr ""
 
-#: lib/themeuploader.php:219
 msgid ""
 "Theme contains invalid file or folder name. Stick with ASCII letters, "
 "digits, underscore, and minus sign."
 msgstr ""
 
-#: lib/themeuploader.php:225
 msgid "Theme contains unsafe file extension names; may be unsafe."
 msgstr ""
 
-#: lib/themeuploader.php:242
 #, php-format
 msgid "Theme contains file of type '.%s', which is not allowed."
 msgstr ""
 
-#: lib/themeuploader.php:260
 msgid "Error opening theme archive."
 msgstr "ブロックの削除エラー"
 
-#: lib/threadednoticelist.php:270
 #, php-format
-msgid "Show all %d comment"
-msgid_plural "Show all %d comments"
+msgid "Show %d reply"
+msgid_plural "Show all %d replies"
 msgstr[0] ""
 
-#: lib/topposterssection.php:74
 msgid "Top posters"
 msgstr "上位投稿者"
 
 #. TRANS: Title for the form to unblock a user.
-#: lib/unblockform.php:67
 #, fuzzy
 msgctxt "TITLE"
 msgid "Unblock"
 msgstr "アンブロック"
 
-#: lib/unsandboxform.php:69
 msgid "Unsandbox"
 msgstr "アンサンドボックス"
 
-#: lib/unsandboxform.php:80
 msgid "Unsandbox this user"
 msgstr "この利用者をアンサンドボックス"
 
-#: lib/unsilenceform.php:67
 msgid "Unsilence"
 msgstr "アンサイレンス"
 
-#: lib/unsilenceform.php:78
 msgid "Unsilence this user"
 msgstr "この利用者をアンサイレンス"
 
-#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
 msgid "Unsubscribe from this user"
 msgstr "この利用者からのフォローを解除する"
 
-#: lib/unsubscribeform.php:137
 msgid "Unsubscribe"
 msgstr "フォロー解除"
 
 #. 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).
-#: lib/usernoprofileexception.php:60
 #, fuzzy, php-format
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "ユーザはプロフィールをもっていません。"
 
-#: lib/userprofile.php:116
 msgid "Edit Avatar"
 msgstr "アバターを編集する"
 
 #. TRANS: H2 for user actions in a profile.
 #. TRANS: H2 for entity actions in a profile.
-#: lib/userprofile.php:216 lib/userprofile.php:232
 msgid "User actions"
 msgstr "利用者アクション"
 
 #. TRANS: Text shown in user profile of not yet compeltely deleted users.
-#: lib/userprofile.php:220
 msgid "User deletion in progress..."
 msgstr ""
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:248
 msgid "Edit profile settings"
 msgstr "プロファイル設定編集"
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:250
 msgid "Edit"
 msgstr "編集"
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:274
 msgid "Send a direct message to this user"
 msgstr "この利用者にダイレクトメッセージを送る"
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:276
 msgid "Message"
 msgstr "メッセージ"
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:318
 #, fuzzy
 msgid "Moderate"
 msgstr "管理"
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:357
 #, fuzzy
 msgid "User role"
 msgstr "ユーザプロファイル"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:360
 #, fuzzy
 msgctxt "role"
 msgid "Administrator"
 msgstr "管理者"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:362
 #, fuzzy
 msgctxt "role"
 msgid "Moderator"
 msgstr "管理"
 
-#: lib/util.php:321
 #, fuzzy
 msgid "Not allowed to log in."
 msgstr "ログインしていません。"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1337
 msgid "a few seconds ago"
 msgstr "数秒前"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1340
 msgid "about a minute ago"
 msgstr "約 1 分前"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1344
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
 msgstr[0] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1347
 msgid "about an hour ago"
 msgstr "約 1 時間前"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1351
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
 msgstr[0] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1354
 msgid "about a day ago"
 msgstr "約 1 日前"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1358
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
 msgstr[0] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1361
 msgid "about a month ago"
 msgstr "約 1 ヵ月前"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1365
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
 msgstr[0] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1368
 msgid "about a year ago"
 msgstr "約 1 年前"
 
 #. TRANS: Web color exception thrown when a hexadecimal color code does not validate.
 #. TRANS: %s is the provided (invalid) color code.
-#: lib/webcolor.php:81 lib/webcolor.php:121
 #, fuzzy, php-format
 msgid "%s is not a valid color! Use 3 or 6 hex characters."
 msgstr "%s は有効な色ではありません! 3か6の16進数を使ってください。"
 
 #. TRANS: Exception.
-#: lib/xrd.php:63
 #, fuzzy
 msgid "Invalid XML."
 msgstr "不正なサイズ。"
 
 #. TRANS: Exception.
-#: lib/xrd.php:68
 msgid "Invalid XML, missing XRD root."
 msgstr ""
 
 #. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
-#: scripts/restoreuser.php:62
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
 
-#, fuzzy
-#~ msgid "Could not generate feed for group - %s"
-#~ msgstr "グループを更新できません。"
+#~ msgid "Full name is too long (max 255 chars)."
+#~ msgstr "フルネームが長すぎます。（255字まで）"
+
+#~ msgid "description is too long (max %d chars)."
+#~ msgstr "記述が長すぎます。（最長 %d 字）"
+
+#~ msgid "Location is too long (max 255 chars)."
+#~ msgstr "場所が長すぎます。（255字まで）"
+
+#~ msgid "Too many aliases! Maximum %d."
+#~ msgstr "別名が多すぎます! 最大 %d。"
 
 #, fuzzy
-#~ msgid "Current confirmed Jabber/Google Talk address."
-#~ msgstr "確認された最新の　Jabber/GTakk アドレス"
-
-#, fuzzy
-#~ msgid ""
-#~ "Jabber or Google Talk address, like \"UserName@example.org\". First, make "
-#~ "sure to add %s to your buddy list in your IM client or on Google Talk."
-#~ msgstr ""
-#~ "\"UserName@example.org\" といった Jabber または GTalk のアドレス。まず、%"
-#~ "s をIMクライアントやGTalkに追加して下さい。"
-
-#, fuzzy
-#~ msgid "Send me notices through Jabber/Google Talk."
-#~ msgstr "Jabber/GTalk で私に通知を送って下さい。"
-
-#, fuzzy
-#~ msgid "Publish a MicroID for my Jabber/Google Talk address."
-#~ msgstr "私のJabber/GTalkアドレスのためにMicroIDを発行してください。"
-
-#~ msgid "No Jabber ID."
-#~ msgstr "Jabbar ID はありません。"
-
-#, fuzzy
-#~ msgid "Not a valid Jabber ID."
-#~ msgstr "有効な Jabber ID ではありません。"
-
-#~ msgid "That is already your Jabber ID."
-#~ msgstr "その Jabber ID は既にあなたのものです。"
-
-#~ msgid "That is not your Jabber ID."
-#~ msgstr "その Jabber ID はあなたのものではありません。"
-
-#~ msgid "Other settings"
-#~ msgstr "その他の設定"
-
-#~ msgid "Tag cloud"
-#~ msgstr "タグクラウド"
-
-#~ msgid "Request token URL"
-#~ msgstr "リクエストトークンURL"
-
-#~ msgid "Access token URL"
-#~ msgstr "アクセストークンURL"
-
-#~ msgid "Authorize URL"
-#~ msgstr "承認URL"
-
-#~ msgid "Jabber"
-#~ msgstr "Jabber"
-
-#~ msgid "Photo"
-#~ msgstr "写真"
-
-#~ msgid "Other options"
-#~ msgstr "その他のオプション"
-
-#~ msgid "Other"
-#~ msgstr "その他"
-
-#~ msgid "Primary site navigation"
-#~ msgstr "プライマリサイトナビゲーション"
-
-#, fuzzy
-#~ msgctxt "TOOLTIP"
-#~ msgid "Personal profile and friends timeline"
-#~ msgstr "パーソナルプロファイルと友人のタイムライン"
-
-#, fuzzy
-#~ msgctxt "MENU"
-#~ msgid "Personal"
-#~ msgstr "パーソナル"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Change your email, avatar, password, profile"
-#~ msgstr "パスワードの変更"
-
-#~ msgid "Account"
-#~ msgstr "アカウント"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Connect to services"
-#~ msgstr "接続"
-
-#~ msgid "Connect"
-#~ msgstr "接続"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Change site configuration"
-#~ msgstr "基本サイト設定"
-
-#, fuzzy
-#~ msgctxt "TOOLTIP"
-#~ msgid "Invite friends and colleagues to join you on %s"
-#~ msgstr "友人や同僚が %s で加わるよう誘ってください。"
-
-#, fuzzy
-#~ msgctxt "MENU"
-#~ msgid "Invite"
-#~ msgstr "招待"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Create an account"
-#~ msgstr "新しいグループを作成"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Help me!"
-#~ msgstr "ヘルプ"
-
-#, fuzzy
-#~ msgctxt "MENU"
-#~ msgid "Help"
-#~ msgstr "ヘルプ"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Search for people or text"
-#~ msgstr "もっとグループを検索"
-
-#~ msgid "Local views"
-#~ msgstr "ローカルビュー"
-
-#~ msgid "Page notice"
-#~ msgstr "ページつぶやき"
-
-#~ msgid "Secondary site navigation"
-#~ msgstr "セカンダリサイトナビゲーション"
-
-#~ msgid "StatusNet software license"
-#~ msgstr "StatusNet ソフトウェアライセンス"
-
-#~ msgid "Site content license"
-#~ msgstr "サイト内容ライセンス"
-
-#~ msgid "Pagination"
-#~ msgstr "ページ化"
-
-#~ msgid "Author"
-#~ msgstr "作者"
-
-#~ msgid "Provider"
-#~ msgstr "プロバイダ"
-
-#, fuzzy
-#~ msgctxt "MENU"
-#~ msgid "SMS"
-#~ msgstr "SMS"
-
-#~ msgid "Filter tags"
-#~ msgstr "タグのフィルター"
-
-#~ msgid "Available characters"
-#~ msgstr "利用可能な文字"
-
-#, fuzzy
-#~ msgctxt "MENU"
-#~ msgid "Profile"
-#~ msgstr "プロファイル"
-
-#~ msgid "Search help"
-#~ msgstr "ヘルプ検索"
-
-#, fuzzy
-#~ msgid "Message too long. Maximum is %1$d character, you sent %2$d."
-#~ msgid_plural "Message too long. Maximum is %1$d characters, you sent %2$d."
-#~ msgstr[0] "メッセージが長すぎます - 最大 %1$d 字、あなたが送ったのは %2$d。"
+#~ msgctxt "BUTTON"
+#~ msgid "Comment"
+#~ msgstr "内容"
diff --git a/locale/ka/LC_MESSAGES/statusnet.po b/locale/ka/LC_MESSAGES/statusnet.po
index 02c8e513d3..67e579623d 100644
--- a/locale/ka/LC_MESSAGES/statusnet.po
+++ b/locale/ka/LC_MESSAGES/statusnet.po
@@ -9,67 +9,57 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:23+0000\n"
-"PO-Revision-Date: 2011-03-03 17:26:11+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:27+0000\n"
 "Language-Team: Georgian <http://translatewiki.net/wiki/Portal:ka>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ka\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-POT-Import-Date: 2011-02-25 23:49:23+0000\n"
+"X-POT-Import-Date: 2011-03-03 17:59:19+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
-#: actions/accessadminpanel.php:53 lib/adminpanelaction.php:363
 msgid "Access"
 msgstr "შესვლა"
 
 #. TRANS: Page notice.
-#: actions/accessadminpanel.php:64
 msgid "Site access settings"
 msgstr "საიტზე შესვლის პარამეტრები"
 
 #. TRANS: Form legend for registration form.
-#: actions/accessadminpanel.php:151
 msgid "Registration"
 msgstr "რეგისტრაცია"
 
 #. TRANS: Checkbox instructions for admin setting "Private".
-#: actions/accessadminpanel.php:155
 msgid "Prohibit anonymous users (not logged in) from viewing site?"
 msgstr "აეკრძალოს ანონიმურ (არაავტორიზირებულ) მომხმარებლებს საიტის ნახვა?"
 
 #. TRANS: Checkbox label for prohibiting anonymous users from viewing site.
-#: actions/accessadminpanel.php:157
 msgctxt "LABEL"
 msgid "Private"
 msgstr "პირადი"
 
 #. TRANS: Checkbox instructions for admin setting "Invite only".
-#: actions/accessadminpanel.php:164
 msgid "Make registration invitation only."
 msgstr "რეგისტრაცია მხოლოდ მოწვევით."
 
 #. TRANS: Checkbox label for configuring site as invite only.
-#: actions/accessadminpanel.php:166
 msgid "Invite only"
 msgstr "მხოლოდ მოწვევით"
 
 #. TRANS: Checkbox instructions for admin setting "Closed" (no new registrations).
-#: actions/accessadminpanel.php:173
 msgid "Disable new registrations."
 msgstr "ახალი რეგისტრაციების გაუქმება."
 
 #. TRANS: Checkbox label for disabling new user registrations.
-#: actions/accessadminpanel.php:175
 msgid "Closed"
 msgstr "დახურული"
 
 #. TRANS: Title for button to save access settings in site admin panel.
-#: actions/accessadminpanel.php:191
 msgid "Save access settings"
 msgstr "შეინახე შესვლის პარამეტრები"
 
@@ -77,6 +67,7 @@ msgstr "შეინახე შესვლის პარამეტრე
 #. TRANS: Button text for saving theme settings.
 #. TRANS: Button label to save e-mail preferences.
 #. TRANS: Button label to save IM preferences.
+#. TRANS: Button text in the license admin panel.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
 #. TRANS: Button text for saving site notice in admin panel.
@@ -86,21 +77,12 @@ msgstr "შეინახე შესვლის პარამეტრე
 #. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
 #. TRANS: Button text on profile design page to save settings.
-#: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
-#: actions/emailsettings.php:251 actions/imsettings.php:199
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:198
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:204
-#: actions/subscriptions.php:261 actions/urlsettings.php:152
-#: actions/useradminpanel.php:298 lib/applicationeditform.php:355
-#: lib/designform.php:320 lib/groupeditform.php:201
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "შეინახე"
 
 #. TRANS: Server error when page not found (404).
 #. TRANS: Server error when page not found (404)
-#: actions/all.php:68 actions/public.php:98 actions/replies.php:93
-#: actions/showfavorites.php:140 actions/tag.php:52
 msgid "No such page."
 msgstr "ასეთი გვერდი არ არსებობს."
 
@@ -119,6 +101,7 @@ msgstr "ასეთი გვერდი არ არსებობს."
 #. TRANS: Client error displayed when checking group membership for a non-existing user.
 #. TRANS: Client error displayed when trying to have a non-existing user join a group.
 #. TRANS: Client error displayed when trying to have a non-existing user leave a group.
+#. TRANS: Client error displayed when not providing a user or an invalid user.
 #. TRANS: Client error displayed when updating a status for a non-existing user.
 #. TRANS: Client error displayed when requesting a list of followers for a non-existing user.
 #. TRANS: Client error displayed when requesting most recent favourite notices by a user for a non-existing user.
@@ -131,6 +114,8 @@ msgstr "ასეთი გვერდი არ არსებობს."
 #. 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.
 #. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
@@ -138,33 +123,10 @@ msgstr "ასეთი გვერდი არ არსებობს."
 #. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when calling a profile action without specifying a user.
-#: actions/all.php:80 actions/allrss.php:69
-#: actions/apiaccountupdatedeliverydevice.php:110
-#: actions/apiaccountupdateprofile.php:103
-#: actions/apiaccountupdateprofilebackgroundimage.php:118
-#: actions/apiaccountupdateprofileimage.php:104 actions/apiatomservice.php:59
-#: actions/apiblockcreate.php:96 actions/apiblockdestroy.php:94
-#: actions/apidirectmessage.php:75 actions/apidirectmessagenew.php:72
-#: actions/apigroupcreate.php:111 actions/apigroupismember.php:89
-#: actions/apigroupjoin.php:98 actions/apigroupleave.php:98
-#: actions/apigrouplist.php:70 actions/apigroupprofileupdate.php:108
-#: actions/apistatusesupdate.php:230 actions/apisubscriptions.php:85
-#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:173
-#: actions/apitimelinehome.php:78 actions/apitimelinementions.php:77
-#: actions/apitimelineuser.php:79 actions/avatarbynickname.php:79
-#: actions/favoritesrss.php:72 actions/foaf.php:42 actions/foaf.php:61
-#: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116
-#: actions/otp.php:78 actions/remotesubscribe.php:144
-#: actions/remotesubscribe.php:153 actions/replies.php:73
-#: actions/repliesrss.php:38 actions/rsd.php:113 actions/showfavorites.php:106
-#: actions/userbyid.php:75 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/userxrd.php:59 actions/xrds.php:71 lib/command.php:509
-#: lib/galleryaction.php:59 lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "ასეთი მომხმარებელი არ არსებობს."
 
 #. TRANS: Page title. %1$s is user nickname, %2$d is page number
-#: actions/all.php:91
 #, php-format
 msgid "%1$s and friends, page %2$d"
 msgstr "%1$s და მეგობრები, გვერდი %2$d"
@@ -173,33 +135,26 @@ msgstr "%1$s და მეგობრები, გვერდი %2$d"
 #. TRANS: H1 text for page. %s is a user nickname.
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Timeline title for user and friends. %s is a user nickname.
-#: actions/all.php:94 actions/all.php:191 actions/allrss.php:117
-#: actions/apitimelinefriends.php:207 actions/apitimelinehome.php:113
-#: lib/personalgroupnav.php:100
 #, php-format
 msgid "%s and friends"
 msgstr " %s და მეგობრები"
 
 #. TRANS: %s is user nickname.
-#: actions/all.php:108
 #, php-format
 msgid "Feed for friends of %s (RSS 1.0)"
 msgstr ""
 
 #. TRANS: %s is user nickname.
-#: actions/all.php:117
 #, php-format
 msgid "Feed for friends of %s (RSS 2.0)"
 msgstr ""
 
 #. TRANS: %s is user nickname.
-#: actions/all.php:126
 #, php-format
 msgid "Feed for friends of %s (Atom)"
 msgstr ""
 
 #. TRANS: Empty list message. %s is a user nickname.
-#: actions/all.php:139
 #, php-format
 msgid ""
 "This is the timeline for %s and friends but no one has posted anything yet."
@@ -209,7 +164,6 @@ msgstr ""
 
 #. TRANS: Encouragement displayed on logged in user's empty timeline.
 #. TRANS: This message contains Markdown links. Keep "](" together.
-#: actions/all.php:146
 #, php-format
 msgid ""
 "Try subscribing to more people, [join a group](%%action.groups%%) or post "
@@ -220,7 +174,6 @@ msgstr ""
 
 #. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@".
 #. TRANS: This message contains Markdown links. Keep "](" together.
-#: actions/all.php:150
 #, php-format
 msgid ""
 "You can try to [nudge %1$s](../%2$s) from their profile or [post something "
@@ -231,7 +184,6 @@ msgstr ""
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
 #. TRANS: Second sentence of empty message for anonymous users. %s is a user nickname.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:221
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -241,14 +193,11 @@ msgstr ""
 "შეტყობინება."
 
 #. TRANS: H1 text for page when viewing a list for self.
-#: actions/all.php:188
 msgid "You and friends"
 msgstr "შენ და მეგობრები"
 
 #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
 #. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name.
-#: actions/allrss.php:122 actions/apitimelinefriends.php:213
-#: actions/apitimelinehome.php:119
 #, php-format
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr " %1$s და მეგობრების განახლებები %2$s-ზე!"
@@ -267,55 +216,20 @@ msgstr " %1$s და მეგობრების განახლებე
 #. TRANS: Client error displayed trying to execute an unknown API method checking group membership.
 #. TRANS: Client error displayed trying to execute an unknown API method listing the latest 20 groups.
 #. TRANS: Client error displayed trying to execute an unknown API method showing group membership.
+#. TRANS: Client error displayed when using an unsupported API format.
 #. TRANS: Client error displayed trying to execute an unknown API method showing a group.
 #. TRANS: Client error displayed trying to execute an unknown API method testing API connectivity.
 #. TRANS: Client error displayed trying to execute an unknown API method deleting a status.
 #. TRANS: Client error displayed when trying to handle an unknown API method.
-#: actions/apiaccountratelimitstatus.php:69
-#: actions/apiaccountupdatedeliverydevice.php:92
-#: actions/apiaccountupdateprofile.php:94
-#: actions/apiaccountupdateprofilebackgroundimage.php:92
-#: actions/apiaccountupdateprofilecolors.php:115
-#: actions/apiaccountverifycredentials.php:68 actions/apidirectmessage.php:157
-#: actions/apifavoritecreate.php:98 actions/apifavoritedestroy.php:98
-#: actions/apifriendshipscreate.php:99 actions/apifriendshipsdestroy.php:99
-#: actions/apifriendshipsshow.php:124 actions/apigroupcreate.php:138
-#: actions/apigroupismember.php:115 actions/apigroupjoin.php:151
-#: actions/apigroupleave.php:141 actions/apigrouplist.php:134
-#: actions/apigrouplistall.php:120 actions/apigroupmembership.php:105
-#: actions/apigroupprofileupdate.php:100 actions/apigroupprofileupdate.php:213
-#: actions/apigroupshow.php:114 actions/apihelptest.php:84
-#: actions/apistatusesdestroy.php:101 actions/apistatusesretweets.php:110
-#: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:139
-#: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
-#: actions/apitimelinefavorites.php:182 actions/apitimelinefriends.php:276
-#: actions/apitimelinegroup.php:148 actions/apitimelinehome.php:181
-#: actions/apitimelinementions.php:182 actions/apitimelinepublic.php:247
-#: actions/apitimelineretweetedtome.php:147
-#: actions/apitimelineretweetsofme.php:147 actions/apitimelinetag.php:165
-#: actions/apitimelineuser.php:217 actions/apiusershow.php:100
 msgid "API method not found."
 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.
-#: actions/apiaccountupdatedeliverydevice.php:83
-#: actions/apiaccountupdateprofile.php:85
-#: actions/apiaccountupdateprofilebackgroundimage.php:83
-#: actions/apiaccountupdateprofilecolors.php:106
-#: actions/apiaccountupdateprofileimage.php:80 actions/apiblockcreate.php:87
-#: actions/apiblockdestroy.php:85 actions/apidirectmessagenew.php:107
-#: actions/apifavoritecreate.php:88 actions/apifavoritedestroy.php:88
-#: actions/apifriendshipscreate.php:89 actions/apifriendshipsdestroy.php:89
-#: actions/apigroupcreate.php:102 actions/apigroupjoin.php:89
-#: actions/apigroupleave.php:89 actions/apigroupprofileupdate.php:92
-#: actions/apimediaupload.php:66 actions/apistatusesretweet.php:63
-#: actions/apistatusesupdate.php:194
 msgid "This method requires a POST."
 msgstr "ეს მეთოდი მოითხოვს POST-ს."
 
 #. TRANS: Client error displayed when no valid device parameter is provided for a user's delivery device setting.
-#: actions/apiaccountupdatedeliverydevice.php:103
 msgid ""
 "You must specify a parameter named 'device' with a value of one of: sms, im, "
 "none."
@@ -330,10 +244,6 @@ msgstr ""
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
-#: actions/apiaccountupdatedeliverydevice.php:136
-#: actions/emailsettings.php:353 actions/emailsettings.php:499
-#: actions/profilesettings.php:323 actions/smssettings.php:300
-#: actions/smssettings.php:453 actions/urlsettings.php:211
 msgid "Could not update user."
 msgstr "მომხმარებლის განახლება ვერ მოხერხდა."
 
@@ -346,32 +256,17 @@ msgstr "მომხმარებლის განახლება ვე
 #. TRANS: Server error displayed when requesting Friends of a Friend feed for a user for which the profile could not be found.
 #. TRANS: Server error displayed when trying to get a user hCard for a user without a profile.
 #. TRANS: Server error displayed when calling a profile action while the specified user does not have a profile.
-#: actions/apiaccountupdateprofile.php:111
-#: actions/apiaccountupdateprofilebackgroundimage.php:199
-#: actions/apiaccountupdateprofilecolors.php:183
-#: actions/apiaccountupdateprofileimage.php:131
-#: actions/apiuserprofileimage.php:88 actions/apiusershow.php:108
-#: actions/avatarbynickname.php:85 actions/foaf.php:69 actions/hcard.php:75
-#: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
-#: lib/profileaction.php:85
 msgid "User has no profile."
 msgstr "მომხმარებელს პროფილი არ გააჩნია."
 
 #. TRANS: Server error displayed if a user profile could not be saved.
 #. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:419
 msgid "Could not save profile."
 msgstr "პროფილის შენახვა ვერ მოხერხდა."
 
 #. TRANS: Client error displayed when the number of bytes in a POST request exceeds a limit.
 #. TRANS: %s is the number of bytes of the CONTENT_LENGTH.
 #. TRANS: Form validation error in design settings form. POST should remain untranslated.
-#: actions/apiaccountupdateprofilebackgroundimage.php:108
-#: actions/apiaccountupdateprofileimage.php:95 actions/apimediaupload.php:81
-#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
-#: actions/designadminpanel.php:120 actions/editapplication.php:121
-#: actions/newapplication.php:102 actions/newnotice.php:95
-#: lib/designsettings.php:110
 #, fuzzy, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s byte) due to its "
@@ -388,26 +283,15 @@ msgstr[0] ""
 #. TRANS: Client error displayed when a database error occurs inserting profile colours.
 #. TRANS: Client error displayed when a database error occurs updating profile colours.
 #. TRANS: Form validation error displayed when group design settings could not be saved because of an application issue.
-#: actions/apiaccountupdateprofilebackgroundimage.php:138
-#: actions/apiaccountupdateprofilebackgroundimage.php:149
-#: actions/apiaccountupdateprofilecolors.php:160
-#: actions/apiaccountupdateprofilecolors.php:171
-#: actions/groupdesignsettings.php:285 actions/groupdesignsettings.php:296
-#: actions/userdesignsettings.php:218 actions/userdesignsettings.php:228
-#: actions/userdesignsettings.php:270 actions/userdesignsettings.php:280
 msgid "Unable to save your design settings."
 msgstr "სამწუხაროდ თქვენი დიზაინის პარამეტრების შენახვა ვერ მოხერხდა."
 
 #. TRANS: Error displayed when updating design settings fails.
 #. TRANS: Client error displayed when a database error occurs updating profile colours.
-#: actions/apiaccountupdateprofilebackgroundimage.php:191
-#: actions/apiaccountupdateprofilecolors.php:139
-#: actions/userdesignsettings.php:196
 msgid "Could not update your design."
 msgstr "დიზაინის განახლება ვერ მოხერხდა."
 
 #. TRANS: Title for Atom feed.
-#: actions/apiatomservice.php:85
 msgctxt "ATOM"
 msgid "Main"
 msgstr ""
@@ -416,9 +300,6 @@ msgstr ""
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Title in atom group notice feed. %s is a group name.
 #. TRANS: Title in atom user notice feed. %s is a user name.
-#: actions/apiatomservice.php:93 actions/grouprss.php:138
-#: actions/userrss.php:94 lib/atomgroupnoticefeed.php:63
-#: lib/atomusernoticefeed.php:88
 #, php-format
 msgid "%s timeline"
 msgstr "%s-ის ნაკადი"
@@ -428,8 +309,6 @@ msgstr "%s-ის ნაკადი"
 #. TRANS: %s is a user nickname.
 #. TRANS: Header for subscriptions overview for a user (first page).
 #. TRANS: %s is a user nickname.
-#: actions/apiatomservice.php:104 actions/atompubsubscriptionfeed.php:148
-#: actions/subscriptions.php:51
 #, php-format
 msgid "%s subscriptions"
 msgstr "%s გამოწერები"
@@ -437,58 +316,48 @@ msgstr "%s გამოწერები"
 #. TRANS: Title for Atom feed with a user's favorite notices. %s is a user nickname.
 #. TRANS: Title for Atom favorites feed.
 #. TRANS: %s is a user nickname.
-#: actions/apiatomservice.php:115 actions/atompubfavoritefeed.php:142
 #, fuzzy, php-format
 msgid "%s favorites"
 msgstr "რჩეულები"
 
 #. TRANS: Title for Atom feed with a user's memberships. %s is a user nickname.
-#: actions/apiatomservice.php:126
 #, fuzzy, php-format
 msgid "%s memberships"
 msgstr "%s ჯგუფის წევრი"
 
 #. TRANS: Client error displayed when users try to block themselves.
-#: actions/apiblockcreate.php:105
 msgid "You cannot block yourself!"
 msgstr "საკუთარი თავის დაბლოკვა შეუძლებელია."
 
 #. TRANS: Server error displayed when blocking a user has failed.
-#: actions/apiblockcreate.php:127
 msgid "Block user failed."
 msgstr "მომხმარებლის დაბლოკვა ვერ მოხერხდა."
 
 #. TRANS: Server error displayed when unblocking a user has failed.
-#: actions/apiblockdestroy.php:113
 msgid "Unblock user failed."
 msgstr "ვერ მოხერხდა მომხმარებელზე ბლოკის მოხსნა."
 
 #. TRANS: Title. %s is a user nickname.
-#: actions/apidirectmessage.php:88
 #, php-format
 msgid "Direct messages from %s"
 msgstr "პირდაპირი შეტყობინებები %s-სგან"
 
 #. TRANS: Subtitle. %s is a user nickname.
-#: actions/apidirectmessage.php:93
 #, php-format
 msgid "All the direct messages sent from %s"
 msgstr "%s-ს მიერ გამოგზავნილი ყველა პირდაპირი შეტყობინება"
 
 #. TRANS: Title. %s is a user nickname.
-#: actions/apidirectmessage.php:102
 #, php-format
 msgid "Direct messages to %s"
 msgstr "%s-სთვის გაგზავნილი პირდაპირი შეტყობინებები"
 
 #. TRANS: Subtitle. %s is a user nickname.
-#: actions/apidirectmessage.php:107
 #, php-format
 msgid "All the direct messages sent to %s"
 msgstr "%s-სთვის გაგზავნილი ყველა პირდაპირი შეტყობინება"
 
 #. TRANS: Client error displayed when no message text was submitted (406).
-#: actions/apidirectmessagenew.php:117
 msgid "No message text!"
 msgstr "შეტყობინების ტექსტი არ არის!"
 
@@ -496,25 +365,21 @@ msgstr "შეტყობინების ტექსტი არ არი
 #. TRANS: %d is the maximum number of characters for a message.
 #. TRANS: Form validation error displayed when message content is too long.
 #. TRANS: %d is the maximum number of characters for a message.
-#: actions/apidirectmessagenew.php:127 actions/newmessage.php:152
 #, fuzzy, php-format
 msgid "That's too long. Maximum message size is %d character."
 msgid_plural "That's too long. Maximum message size is %d characters."
 msgstr[0] "ეს ძალიან გრძელია. შეტყობინებაში დასაშვებია %d სიმბოლო."
 
 #. TRANS: Client error displayed if a recipient user could not be found (403).
-#: actions/apidirectmessagenew.php:139
 msgid "Recipient user not found."
 msgstr "მიმღები მომხმარებელი ვერ მოიძებნა."
 
 #. TRANS: Client error displayed trying to direct message another user who's not a friend (403).
-#: actions/apidirectmessagenew.php:144
 #, fuzzy
 msgid "Cannot send direct messages to users who aren't your friend."
 msgstr "ვერ გაუგზავნი პირდაპირ შეტყობინებას იმას, ვისთანაც არ მეგობრობ."
 
 #. TRANS: Client error displayed trying to direct message self (403).
-#: actions/apidirectmessagenew.php:154
 #, fuzzy
 msgid ""
 "Do not send a message to yourself; just say it to yourself quietly instead."
@@ -523,118 +388,98 @@ 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.
 #. TRANS: Client error displayed trying to delete a status with an invalid ID.
-#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:108
-#: actions/apistatusesdestroy.php:121
 msgid "No status found with that ID."
 msgstr "სტატუსი ასეთი ID-თ ვერ მოიძებნა."
 
 #. TRANS: Client error displayed when trying to mark a notice favourite that already is a favourite.
-#: actions/apifavoritecreate.php:120
 msgid "This status is already a favorite."
 msgstr "ეს სტატუსი უკვე ფავორიტია."
 
 #. TRANS: Client error displayed when marking a notice as favourite fails.
 #. TRANS: Server error displayed when trying to mark a notice as favorite fails in the database.
 #. TRANS: Error message text shown when a favorite could not be set.
-#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:306
 msgid "Could not create favorite."
 msgstr "ფავორიტის შექმნა ვერ მოხერხდა."
 
 #. TRANS: Client error displayed when trying to remove a favourite that was not a favourite.
-#: actions/apifavoritedestroy.php:122
 msgid "That status is not a favorite."
 msgstr "ეს სტატუსი არა არის ფავორიტი."
 
 #. TRANS: Client error displayed when removing a favourite has failed.
 #. TRANS: Server error displayed when removing a favorite from the database fails.
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:90
 msgid "Could not delete favorite."
 msgstr "ფავორიტის წაშლა ვერ მოხერხდა."
 
 #. TRANS: Client error displayed when trying follow who's profile could not be found.
-#: actions/apifriendshipscreate.php:109
 msgid "Could not follow user: profile not found."
 msgstr "ამ მომხმარებლის მიმდევარი ვერ გახდებით, რადგან პროფილი ვერ მოიძებნა"
 
 #. TRANS: Client error displayed when trying to follow a user that's already being followed.
 #. TRANS: %s is the nickname of the user that is already being followed.
-#: actions/apifriendshipscreate.php:120
 #, php-format
 msgid "Could not follow user: %s is already on your list."
 msgstr "თქვენ უკვე ხართ %s-ის მიმდევარი."
 
 #. TRANS: Client error displayed when trying to unfollow a user that cannot be found.
-#: actions/apifriendshipsdestroy.php:109
 msgid "Could not unfollow user: User not found."
 msgstr "მომხმარებლის ჩამოშორება ვერ მოხერხდა. მომხმარებელი ვერ მოიძებნა."
 
 #. TRANS: Client error displayed when trying to unfollow self.
-#: actions/apifriendshipsdestroy.php:121
 msgid "You cannot unfollow yourself."
 msgstr "საკუთარი თავის ჩამოშორება შეუძლებელია."
 
 #. TRANS: Client error displayed when supplying invalid parameters to an API call checking if a friendship exists.
-#: actions/apifriendshipsexists.php:88
 #, fuzzy
 msgid "Two valid IDs or nick names must be supplied."
 msgstr "საჭიროა 2 სწორი სახელის ან ID-ს მოწოდება."
 
 #. TRANS: Client error displayed when a source user could not be determined showing friendship.
-#: actions/apifriendshipsshow.php:131
 msgid "Could not determine source user."
 msgstr "ავტორი მომხმარებლის განსაზღვრა ვერ მოხერხდა."
 
 #. TRANS: Client error displayed when a target user could not be determined showing friendship.
-#: actions/apifriendshipsshow.php:140
 msgid "Could not find target user."
 msgstr "სასურველი მომხმარებელი ვერ მოიძებნა."
 
 #. TRANS: Client error trying to create a group with a nickname this is already in use.
+#. TRANS: API validation exception thrown when nickname is already used.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:156 actions/apigroupprofileupdate.php:255
-#: actions/editgroup.php:191 actions/newgroup.php:137
-#: actions/profilesettings.php:274 actions/register.php:199
 msgid "Nickname already in use. Try another one."
 msgstr "მეტსახელი უკვე გამოყენებულია. სცადე სხვა."
 
 #. TRANS: Client error in form for group creation.
+#. TRANS: API validation exception thrown when nickname does not validate.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:164 actions/apigroupprofileupdate.php:259
-#: actions/editgroup.php:195 actions/newgroup.php:141
-#: actions/profilesettings.php:244 actions/register.php:201
 msgid "Not a valid nickname."
 msgstr "მეტსახელი არასწორია."
 
 #. TRANS: Client error in form for group creation.
+#. TRANS: API validation exception thrown when homepage URL does not validate.
 #. TRANS: Validation error shown when providing an invalid homepage URL in the "Edit application" form.
 #. TRANS: Group edit form validation error.
 #. TRANS: Validation error shown when providing an invalid homepage URL in the "New application" form.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:181 actions/apigroupprofileupdate.php:277
-#: actions/editapplication.php:235 actions/editgroup.php:202
-#: actions/newapplication.php:221 actions/newgroup.php:148
-#: actions/profilesettings.php:249 actions/register.php:208
 msgid "Homepage is not a valid URL."
 msgstr "სასტარტო გვერდი არასწორი URL-ია."
 
 #. TRANS: Client error in form for group creation.
+#. TRANS: API validation exception thrown when full name does not validate.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:191 actions/editgroup.php:206
-#: actions/newgroup.php:152 actions/profilesettings.php:253
-#: actions/register.php:211
 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "სრული სახელი ძალიან გრძელია (არაუმეტეს 255 სიმბოლო)."
 
 #. TRANS: Client error shown when providing too long a description during group creation.
 #. TRANS: %d is the maximum number of allowed characters.
+#. TRANS: API validation exception thrown when description does not validate.
+#. TRANS: %d is the maximum description length and used for plural.
 #. TRANS: Validation error shown when providing too long a description in the "Edit application" form.
 #. TRANS: %d is the maximum number of allowed characters.
 #. TRANS: Group edit form validation error.
@@ -642,33 +487,28 @@ msgstr "სრული სახელი ძალიან გრძელი
 #. TRANS: %d is the maximum number of characters for the description.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed characters.
-#: actions/apigroupcreate.php:201 actions/editapplication.php:202
-#: actions/editgroup.php:211 actions/newapplication.php:182
-#: actions/newgroup.php:157
 #, fuzzy, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."
 msgstr[0] "აღწერა ძალიან გრძელია (არაუმეტეს %d სიმბოლო)."
 
 #. TRANS: Client error shown when providing too long a location during group creation.
+#. TRANS: API validation exception thrown when location does not validate.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:215 actions/editgroup.php:218
-#: actions/newgroup.php:164 actions/profilesettings.php:266
-#: actions/register.php:220
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
 msgstr "ადგილმდებარეობა ძალიან გრძელია (არაუმეტეს 255 სიმბოლო)."
 
 #. TRANS: Client error shown when providing too many aliases during group creation.
 #. TRANS: %d is the maximum number of allowed aliases.
+#. TRANS: API validation exception thrown when aliases do not validate.
+#. TRANS: %d is the maximum number of aliases and used for plural.
 #. TRANS: Group edit form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.
-#: actions/apigroupcreate.php:236 actions/editgroup.php:231
-#: actions/newgroup.php:177
 #, php-format
 msgid "Too many aliases! Maximum %d allowed."
 msgid_plural "Too many aliases! Maximum %d allowed."
@@ -676,25 +516,24 @@ msgstr[0] ""
 
 #. TRANS: Client error shown when providing an invalid alias during group creation.
 #. TRANS: %s is the invalid alias.
-#: actions/apigroupcreate.php:253
+#. TRANS: API validation exception thrown when aliases does not validate.
+#. TRANS: %s is the invalid alias.
 #, php-format
 msgid "Invalid alias: \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to use an alias during group creation that is already in use.
 #. TRANS: %s is the alias that is already in use.
+#. TRANS: API validation exception thrown when aliases is already used.
+#. TRANS: %s is the already used alias.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error. %s is the already used alias.
-#: actions/apigroupcreate.php:264 actions/apigroupprofileupdate.php:351
-#: actions/editgroup.php:246 actions/newgroup.php:193
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to use an alias during group creation that is the same as the group's nickname.
 #. TRANS: Group edit form validation error.
-#: actions/apigroupcreate.php:278 actions/apigroupprofileupdate.php:359
-#: actions/editgroup.php:253
 msgid "Alias can't be the same as nickname."
 msgstr ""
 
@@ -702,26 +541,21 @@ msgstr ""
 #. TRANS: Client error displayed when trying to join a group that does not exist.
 #. TRANS: Client error displayed when trying to leave a group that does not exist.
 #. TRANS: Client error displayed trying to show group membership on a non-existing group.
+#. TRANS: Client error displayed when not providing a group or an invalid group.
 #. TRANS: Client error displayed when trying to show a group that could not be found.
 #. TRANS: Client error displayed requesting most recent notices to a group for a non-existing group.
-#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
-#: actions/apigroupleave.php:104 actions/apigroupmembership.php:71
-#: actions/apigroupprofileupdate.php:113 actions/apigroupshow.php:81
-#: actions/apitimelinegroup.php:89
 msgid "Group not found."
 msgstr "ჯგუფი ვერ მოიძებნა."
 
 #. TRANS: Server error displayed when trying to join a group the user is already a member of.
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:345
 msgid "You are already a member of that group."
 msgstr "თქვენ უკვე ხართ ამ ჯგუფის წევრი."
 
 #. TRANS: Server error displayed when trying to join a group the user is blocked from joining.
 #. 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.
-#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:350
 msgid "You have been blocked from that group by the admin."
 msgstr "თქვენ დაბლოკილი ხართ ამ ჯგუფიდან ადმინისტრატორის მიერ."
 
@@ -729,13 +563,11 @@ msgstr "თქვენ დაბლოკილი ხართ ამ ჯგ
 #. TRANS: %1$s is the joining user's nickname, $2$s is the group nickname for which the join failed.
 #. TRANS: Message given having failed to add a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:136 actions/joingroup.php:139 lib/command.php:362
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "ვერ მოხერხდა მომხმარებელ %1$s-სთან ერთად ჯგუფ %2$s-ში გაერთიანება."
 
 #. TRANS: Server error displayed when trying to leave a group the user is not a member of.
-#: actions/apigroupleave.php:115
 msgid "You are not a member of this group."
 msgstr "თვენ არ ხართ ამ ჯგუფის წევრი."
 
@@ -743,115 +575,77 @@ msgstr "თვენ არ ხართ ამ ჯგუფის წევრ
 #. TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
 #. TRANS: Message given having failed to remove a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupleave.php:127 actions/leavegroup.php:133
-#: lib/command.php:410
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
 msgstr "მომხმარებლ %1$s-ის გარიცხვა ჯგუფიდან %2$s ვერ მოხერხდა."
 
 #. TRANS: Used as title in check for group membership. %s is a user name.
-#: actions/apigrouplist.php:94
 #, php-format
 msgid "%s's groups"
 msgstr "%s-ს ჯგუფები"
 
 #. TRANS: Used as subtitle in check for group membership. %1$s is a user name, %2$s is the site name.
-#: actions/apigrouplist.php:104
 #, php-format
 msgid "%1$s groups %2$s is a member of."
 msgstr "%1$s-ს ის ჯგუფები რომლებშიც გაერთიანებულია %2$s."
 
 #. TRANS: Message is used as a title when listing the lastest 20 groups. %s is a site name.
 #. TRANS: Message is used as a page title. %s is a nick name.
-#: actions/apigrouplistall.php:88 actions/usergroups.php:63
 #, php-format
 msgid "%s groups"
 msgstr "%s ჯგუფები"
 
 #. TRANS: Message is used as a subtitle when listing the lastest 20 groups. %s is a site name.
-#: actions/apigrouplistall.php:93
 #, php-format
 msgid "groups on %s"
 msgstr "ჯგუფები %s-ზე"
 
+#. TRANS: Client error displayed when trying to edit a group without being an admin.
 #. TRANS: Client error displayed trying to edit a group while not being a group admin.
 #. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
 #. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
-#: actions/apigroupprofileupdate.php:118 actions/editgroup.php:110
-#: actions/editgroup.php:176 actions/groupdesignsettings.php:109
-#: actions/grouplogo.php:111
 msgid "You must be an admin to edit the group."
 msgstr "ჯგუფის რედაქტირებისათვის საჭიროა ადმინის უფლებები."
 
+#. TRANS: Server error displayed when group update fails.
 #. TRANS: Server error displayed when editing a group fails.
-#: actions/apigroupprofileupdate.php:171 actions/editgroup.php:274
 msgid "Could not update group."
 msgstr "ჯგუფის განახლება ვერ მოხერხდა."
 
+#. TRANS: Server error displayed when adding group aliases fails.
 #. TRANS: Server error displayed when group aliases could not be added.
 #. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/apigroupprofileupdate.php:194 actions/editgroup.php:281
-#: classes/User_group.php:540
 msgid "Could not create aliases."
 msgstr ""
 
+#. TRANS: API validation exception thrown when nickname does not validate.
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: actions/apigroupprofileupdate.php:249 lib/nickname.php:165
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr "მეტსახელში დასაშვებია მხოლოდ პატარა ასოები და ციფრები."
 
-#: actions/apigroupprofileupdate.php:286
-#, fuzzy
-msgid "Full name is too long (max 255 chars)."
-msgstr "სრული სახელი ძალიან გრძელია (არაუმეტეს 255 სიმბოლო)."
-
-#: actions/apigroupprofileupdate.php:296
-#, fuzzy, php-format
-msgid "description is too long (max %d chars)."
-msgstr "აღწერა ძალიან გრძელია (არაუმეტეს %d სიმბოლო)."
-
-#: actions/apigroupprofileupdate.php:307
-#, fuzzy
-msgid "Location is too long (max 255 chars)."
-msgstr "ადგილმდებარეობა ძალიან გრძელია (არაუმეტეს 255 სიმბოლო)."
-
-#: actions/apigroupprofileupdate.php:326
-#, php-format
-msgid "Too many aliases! Maximum %d."
-msgstr ""
-
-#. TRANS: Group edit form validation error.
+#. TRANS: API validation exception thrown when alias is the same as nickname.
 #. TRANS: Group create form validation error.
-#. TRANS: %s is the invalid alias.
-#: actions/apigroupprofileupdate.php:342 actions/editgroup.php:241
-#: actions/newgroup.php:188
-#, php-format
-msgid "Invalid alias: \"%s\""
+msgid "Alias cannot be the same as nickname."
 msgstr ""
 
 #. TRANS: Client error displayed when uploading a media file has failed.
-#: actions/apimediaupload.php:101
 msgid "Upload failed."
 msgstr "ატვირთვა ვერ მოხერხდა."
 
 #. TRANS: Client error given from the OAuth API when the request token or verifier is invalid.
-#: actions/apioauthaccesstoken.php:102
 msgid "Invalid request token or verifier."
 msgstr ""
 
 #. TRANS: Client error given when no oauth_token was passed to the OAuth API.
-#: actions/apioauthauthorize.php:107
 msgid "No oauth_token parameter provided."
 msgstr "oauth_token პარამეტრი არ არის მოწოდებული."
 
 #. TRANS: Client error given when an invalid request token was passed to the OAuth API.
-#: actions/apioauthauthorize.php:115 actions/apioauthauthorize.php:129
 #, fuzzy
 msgid "Invalid request token."
 msgstr "არასწორი როლი."
 
 #. TRANS: Client error given when an invalid request token was passed to the OAuth API.
-#: actions/apioauthauthorize.php:121
 #, fuzzy
 msgid "Request token already authorized."
 msgstr "თქვენ არ ხართ ავტორიზირებული."
@@ -862,31 +656,14 @@ msgstr "თქვენ არ ხართ ავტორიზირებუ
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
 #. TRANS: Client error displayed when the session token is not okay.
-#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:75
-#: actions/emailsettings.php:292 actions/favor.php:75 actions/geocode.php:55
-#: actions/groupblock.php:65 actions/grouplogo.php:321
-#: actions/groupunblock.php:65 actions/imsettings.php:241
-#: actions/invite.php:60 actions/makeadmin.php:66 actions/newmessage.php:135
-#: actions/newnotice.php:105 actions/nudge.php:80
-#: actions/oauthappssettings.php:162 actions/oauthconnectionssettings.php:135
-#: actions/passwordsettings.php:137 actions/pluginenable.php:87
-#: actions/profilesettings.php:218 actions/recoverpassword.php:383
-#: actions/register.php:157 actions/remotesubscribe.php:76
-#: actions/repeat.php:82 actions/smssettings.php:249 actions/subedit.php:40
-#: actions/subscribe.php:87 actions/tagother.php:145
-#: actions/unsubscribe.php:69 actions/urlsettings.php:171
-#: actions/userauthorization.php:53 lib/designsettings.php:122
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 
 #. TRANS: Form validation error given when an invalid username and/or password was passed to the OAuth API.
-#: actions/apioauthauthorize.php:168
 msgid "Invalid nickname / password!"
 msgstr "არასწორი მეტსახელი / პაროლი!"
 
 #. TRANS: Server error displayed when a database action fails.
-#: actions/apioauthauthorize.php:217
 #, fuzzy
 msgid "Database error inserting oauth_token_association."
 msgstr "ბაზამ დაუშვა შეცდომა OAuth აპლიკაციის მომხმარებლის ჩასმისას."
@@ -903,28 +680,19 @@ msgstr "ბაზამ დაუშვა შეცდომა OAuth აპლ
 #. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
 #. TRANS: Message given submitting a form with an unknown action in SMS settings.
 #. TRANS: Unknown form validation error in design settings form.
-#: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
-#: actions/designadminpanel.php:100 actions/editapplication.php:144
-#: actions/emailsettings.php:311 actions/grouplogo.php:332
-#: actions/imsettings.php:256 actions/newapplication.php:124
-#: actions/oauthconnectionssettings.php:144 actions/recoverpassword.php:46
-#: actions/smssettings.php:270 lib/designsettings.php:133
 msgid "Unexpected form submission."
 msgstr ""
 
 #. TRANS: Title for a page where a user can confirm/deny account access by an external application.
-#: actions/apioauthauthorize.php:387
 msgid "An application would like to connect to your account"
 msgstr "აპლიკაციას უნდა რომ დაუკავშირდეს თქვენს ანგარიშს"
 
 #. TRANS: Fieldset legend.
-#: actions/apioauthauthorize.php:404
 msgid "Allow or deny access"
 msgstr "დოუშვი ან აკრძალე შესვლა"
 
 #. TRANS: User notification of external application requesting account access.
 #. TRANS: %3$s is the access type requested (read-write or read-only), %4$s is the StatusNet sitename.
-#: actions/apioauthauthorize.php:425
 #, php-format
 msgid ""
 "An application would like the ability to <strong>%3$s</strong> your %4$s "
@@ -935,7 +703,6 @@ msgstr ""
 #. TRANS: User notification of external application requesting account access.
 #. TRANS: %1$s is the application name requesting access, %2$s is the organisation behind the application,
 #. TRANS: %3$s is the access type requested, %4$s is the StatusNet sitename.
-#: actions/apioauthauthorize.php:433
 #, php-format
 msgid ""
 "The application <strong>%1$s</strong> by <strong>%2$s</strong> would like "
@@ -944,23 +711,19 @@ msgid ""
 msgstr ""
 
 #. TRANS: Fieldset legend.
-#: actions/apioauthauthorize.php:455
 #, fuzzy
 msgctxt "LEGEND"
 msgid "Account"
 msgstr "ანგარიში"
 
 #. TRANS: Field label on OAuth API authorisation form.
+#. TRANS: Field label on login page.
 #. TRANS: Field label in form for profile settings.
-#: actions/apioauthauthorize.php:459 actions/login.php:225
-#: actions/profilesettings.php:107 actions/register.php:411
-#: actions/userauthorization.php:145 lib/groupeditform.php:145
 msgid "Nickname"
 msgstr "მეტსახელი"
 
 #. TRANS: Field label on OAuth API authorisation form.
-#: actions/apioauthauthorize.php:463 actions/login.php:228
-#: actions/register.php:415 lib/settingsnav.php:87
+#. TRANS: Field label on login page.
 msgid "Password"
 msgstr "პაროლი"
 
@@ -970,47 +733,38 @@ msgstr "პაროლი"
 #. TRANS: Button label to cancel an IM address confirmation procedure.
 #. TRANS: Button label to cancel a SMS address confirmation procedure.
 #. TRANS: Button label in the "Edit application" form.
-#: actions/apioauthauthorize.php:478 actions/emailsettings.php:125
-#: actions/imsettings.php:136 actions/smssettings.php:132
-#: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Cancel"
 msgstr "გაუქმება"
 
 #. TRANS: Button text that when clicked will allow access to an account by an external application.
-#: actions/apioauthauthorize.php:485
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Allow"
 msgstr "დაშვება"
 
 #. TRANS: Form instructions.
-#: actions/apioauthauthorize.php:502
 #, fuzzy
 msgid "Authorize access to your account information."
 msgstr "დაუშვი ან აკრძალე წვდომა თქვენი ანგარიშის ინფორმაციაზე."
 
 #. TRANS: Header for user notification after revoking OAuth access to an application.
-#: actions/apioauthauthorize.php:594
 #, fuzzy
 msgid "Authorization canceled."
 msgstr "IM დასტური გაუქმდა."
 
 #. TRANS: User notification after revoking OAuth access to an application.
 #. TRANS: %s is an OAuth token.
-#: actions/apioauthauthorize.php:598
 #, php-format
 msgid "The request token %s has been revoked."
 msgstr ""
 
 #. TRANS: Title of the page notifying the user that an anonymous client application was successfully authorized to access the user's account with OAuth.
-#: actions/apioauthauthorize.php:621
 #, fuzzy
 msgid "You have successfully authorized the application"
 msgstr "თქვენ არ ხართ ავტორიზირებული."
 
 #. TRANS: Message notifying the user that an anonymous client application was successfully authorized to access the user's account with OAuth.
-#: actions/apioauthauthorize.php:625
 msgid ""
 "Please return to the application and enter the following security code to "
 "complete the process."
@@ -1018,14 +772,12 @@ msgstr ""
 
 #. TRANS: Title of the page notifying the user that the client application was successfully authorized to access the user's account with OAuth.
 #. TRANS: %s is the authorised application name.
-#: actions/apioauthauthorize.php:632
 #, fuzzy, php-format
 msgid "You have successfully authorized %s"
 msgstr "თქვენ არ ხართ ავტორიზირებული."
 
 #. TRANS: Message notifying the user that the client application was successfully authorized to access the user's account with OAuth.
 #. TRANS: %s is the authorised application name.
-#: actions/apioauthauthorize.php:639
 #, php-format
 msgid ""
 "Please return to %s and enter the following security code to complete the "
@@ -1034,12 +786,10 @@ msgstr ""
 
 #. TRANS: Client error displayed trying to delete a status not using POST or DELETE.
 #. TRANS: POST and DELETE should not be translated.
-#: actions/apistatusesdestroy.php:111
 msgid "This method requires a POST or DELETE."
 msgstr "ეს მეთოდი მოითხოვს POST-ს ან DELETE-ს."
 
 #. TRANS: Client error displayed trying to delete a status of another user.
-#: actions/apistatusesdestroy.php:136
 msgid "You may not delete another user's status."
 msgstr "სხვა მომხმარებლის სტატუსის წაშლა არ შეგიძლიათ."
 
@@ -1047,21 +797,16 @@ msgstr "სხვა მომხმარებლის სტატუსი
 #. TRANS: Client error displayed trying to display redents of a non-exiting notice.
 #. TRANS: Client exception thrown when referencing a non-existing notice.
 #. TRANS: Error message displayed trying to delete a non-existing notice.
-#: actions/apistatusesretweet.php:74 actions/apistatusesretweets.php:70
-#: actions/atompubshowfavorite.php:82 actions/deletenotice.php:61
-#: actions/shownotice.php:92
 msgid "No such notice."
 msgstr "ასეთი შეტყობინება არ არსებობს."
 
 #. TRANS: Client error displayed trying to repeat an own notice through the API.
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:549
 msgid "Cannot repeat your own notice."
 msgstr "საკუთარი შეტყობინების გამეორება არ შეიძლება."
 
 #. TRANS: Client error displayed trying to re-repeat a notice through the API.
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:92 lib/command.php:555
 msgid "Already repeated that notice."
 msgstr "ეს შეტყობინება უკვე გამეორებულია."
 
@@ -1071,73 +816,57 @@ msgstr "ეს შეტყობინება უკვე გამეორ
 #. TRANS: Client exception thrown when using an unsupported HTTP method.
 #. TRANS: Client error shown when using a non-supported HTTP method.
 #. TRANS: Client exception thrown when using an unsupported HTTP method.
-#: actions/apistatusesshow.php:118 actions/atompubfavoritefeed.php:103
-#: actions/atompubmembershipfeed.php:105 actions/atompubshowfavorite.php:117
-#: actions/atompubshowmembership.php:116
-#: actions/atompubshowsubscription.php:122
-#: actions/atompubsubscriptionfeed.php:109
 #, fuzzy
 msgid "HTTP method not supported."
 msgstr "API მეთოდი ვერ მოიძებნა."
 
 #. TRANS: Exception thrown requesting an unsupported notice output format.
 #. TRANS: %s is the requested output format.
-#: actions/apistatusesshow.php:144
 #, fuzzy, php-format
 msgid "Unsupported format: %s."
 msgstr "ფორმატი არ არის მხარდაჭერილი."
 
 #. TRANS: Client error displayed requesting a deleted status.
-#: actions/apistatusesshow.php:155
 msgid "Status deleted."
 msgstr "სტატუსი წაშლილია."
 
 #. TRANS: Client error displayed requesting a status with an invalid ID.
-#: actions/apistatusesshow.php:162
 msgid "No status with that ID found."
 msgstr "ასეთი ID-ს სტატუსი ვერ მოიძებნა."
 
 #. TRANS: Client error displayed when trying to delete a notice not using the Atom format.
-#: actions/apistatusesshow.php:227
 msgid "Can only delete using the Atom format."
 msgstr ""
 
 #. TRANS: Client error displayed when a user has no rights to delete notices of other users.
 #. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
-#: actions/apistatusesshow.php:235 actions/deletenotice.php:78
 #, fuzzy
 msgid "Cannot delete this notice."
 msgstr "ამ შეტყობინების წაშლა შეუძლებელია."
 
 #. TRANS: Confirmation of notice deletion in API. %d is the ID (number) of the deleted notice.
-#: actions/apistatusesshow.php:249
 #, fuzzy, php-format
 msgid "Deleted notice %d"
 msgstr "შეტყობინების წაშლა"
 
 #. TRANS: Client error displayed when the parameter "status" is missing.
-#: actions/apistatusesupdate.php:221
 msgid "Client must provide a 'status' parameter with a value."
 msgstr ""
 
 #. TRANS: Client error displayed when the parameter "status" is missing.
 #. TRANS: %d is the maximum number of character for a notice.
-#: actions/apistatusesupdate.php:244 actions/newnotice.php:161
-#: lib/mailhandler.php:60
 #, fuzzy, php-format
 msgid "That's too long. Maximum notice size is %d character."
 msgid_plural "That's too long. Maximum notice size is %d characters."
 msgstr[0] "შეტყობინების დასაძვები ზომაა %d სიმბოლო."
 
 #. TRANS: Client error displayed when replying to a non-existing notice.
-#: actions/apistatusesupdate.php:284
 #, fuzzy
 msgid "Parent notice not found."
 msgstr "API მეთოდი ვერ მოიძებნა."
 
 #. TRANS: Client error displayed exceeding the maximum notice length.
 #. TRANS: %d is the maximum lenth for a notice.
-#: actions/apistatusesupdate.php:308 actions/newnotice.php:184
 #, fuzzy, php-format
 msgid "Maximum notice size is %d character, including attachment URL."
 msgid_plural "Maximum notice size is %d characters, including attachment URL."
@@ -1145,13 +874,11 @@ msgstr[0] "შეყობინების დასაშვები ზო
 
 #. TRANS: Client error displayed when requesting profiles of followers in an unsupported format.
 #. TRANS: Client error displayed when requesting IDs of followers in an unsupported format.
-#: actions/apisubscriptions.php:228 actions/apisubscriptions.php:258
 msgid "Unsupported format."
 msgstr "ფორმატი არ არის მხარდაჭერილი."
 
 #. TRANS: Title for timeline of most recent favourite notices by a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname.
-#: actions/apitimelinefavorites.php:108
 #, php-format
 msgid "%1$s / Favorites from %2$s"
 msgstr ""
@@ -1159,14 +886,12 @@ msgstr ""
 #. TRANS: Subtitle for timeline of most recent favourite notices by a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user's full name,
 #. TRANS: %3$s is a user nickname.
-#: actions/apitimelinefavorites.php:120
 #, fuzzy, php-format
 msgid "%1$s updates favorited by %2$s / %3$s."
 msgstr "განახლებები არჩეული %1$s-ს მიერ %2$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.
-#: actions/apitimelinementions.php:115
 #, php-format
 msgid "%1$s / Updates mentioning %2$s"
 msgstr ""
@@ -1174,49 +899,41 @@ msgstr ""
 #. TRANS: Subtitle for timeline of most recent mentions of a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname,
 #. TRANS: %3$s is a user's full name.
-#: actions/apitimelinementions.php:131
 #, php-format
 msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr ""
 
 #. TRANS: Title for site timeline. %s is the StatusNet sitename.
 #. TRANS: Public RSS feed title. %s is the StatusNet site name.
-#: actions/apitimelinepublic.php:193 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "%s საჯარო ნაკადი"
 
 #. TRANS: Subtitle for site timeline. %s is the StatusNet sitename.
-#: actions/apitimelinepublic.php:199
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "%s განახლებები ყველასგან!"
 
 #. TRANS: Server error displayed calling unimplemented API method for 'retweeted by me'.
-#: actions/apitimelineretweetedbyme.php:71
 #, fuzzy
 msgid "Unimplemented."
 msgstr "მეთოდი განუხორციელებელია."
 
 #. TRANS: Title for Atom feed "repeated to me". %s is the user nickname.
-#: actions/apitimelineretweetedtome.php:96
 #, php-format
 msgid "Repeated to %s"
 msgstr ""
 
-#: actions/apitimelineretweetedtome.php:98
 #, fuzzy, php-format
 msgid "%1$s notices that were to repeated to %2$s / %3$s."
 msgstr "განახლებები არჩეული %1$s-ს მიერ %2$s-ზე!"
 
 #. TRANS: Title of list of repeated notices of the logged in user.
 #. TRANS: %s is the nickname of the logged in user.
-#: actions/apitimelineretweetsofme.php:98
 #, php-format
 msgid "Repeats of %s"
 msgstr ""
 
-#: actions/apitimelineretweetsofme.php:104
 #, fuzzy, php-format
 msgid "%1$s notices that %2$s / %3$s has repeated."
 msgstr "%s-მა (@%s) დაამატა თქვენი შეტყობინება თავის რჩეულებში"
@@ -1225,79 +942,64 @@ msgstr "%s-მა (@%s) დაამატა თქვენი შეტყო
 #. TRANS: %s is the tag.
 #. TRANS: Title for first page of notices with tags.
 #. TRANS: %s is the tag.
-#: actions/apitimelinetag.php:101 actions/tag.php:69
 #, php-format
 msgid "Notices tagged with %s"
 msgstr "შეტყობინებები მონიშნული როგორც %s"
 
 #. TRANS: Subtitle for timeline with lastest notices with a given tag.
 #. TRANS: %1$s is the tag, $2$s is the StatusNet sitename.
-#: actions/apitimelinetag.php:105 actions/tagrss.php:65
 #, php-format
 msgid "Updates tagged with %1$s on %2$s!"
 msgstr "განახლებები მონიშნული როგორც %1$s %2$s-ზე!"
 
 #. TRANS: Client error displayed trying to add a notice to another user's timeline.
-#: actions/apitimelineuser.php:308
 #, fuzzy
 msgid "Only the user can add to their own timeline."
 msgstr "მხოლოდ მომხმარებელს შეუძლია თავისი ფოსტის წაკითხვა."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:315
 msgid "Only accept AtomPub for Atom feeds."
 msgstr ""
 
 #. TRANS: Client error displayed attempting to post an empty API notice.
-#: actions/apitimelineuser.php:322
 msgid "Atom post must not be empty."
 msgstr ""
 
 #. TRANS: Client error displayed attempting to post an API that is not well-formed XML.
-#: actions/apitimelineuser.php:328
 msgid "Atom post must be well-formed XML."
 msgstr ""
 
 #. TRANS: Client error displayed when not using an Atom entry.
-#: actions/apitimelineuser.php:334 actions/atompubfavoritefeed.php:228
-#: actions/atompubmembershipfeed.php:230
-#: actions/atompubsubscriptionfeed.php:236
 msgid "Atom post must be an Atom entry."
 msgstr ""
 
 #. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
-#: actions/apitimelineuser.php:345
 msgid "Can only handle POST activities."
 msgstr ""
 
 #. TRANS: Client error displayed when using an unsupported activity object type.
 #. TRANS: %s is the unsupported activity object type.
-#: actions/apitimelineuser.php:356
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
 #. TRANS: %d is the notice ID (number).
-#: actions/apitimelineuser.php:390
 #, fuzzy, php-format
 msgid "No content for notice %d."
 msgstr "მოძებნე შეტყობინებებში"
 
 #. TRANS: Client error displayed when using another format than AtomPub.
 #. TRANS: %s is the notice URI.
-#: actions/apitimelineuser.php:419
 #, fuzzy, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "შეტყობინებები ამ ID-თ არ არსებობს."
 
 #. TRANS: Server error for unfinished API method showTrends.
-#: actions/apitrends.php:85
 msgid "API method under construction."
 msgstr "API მეთოდი დამუშავების პროცესშია."
 
 #. TRANS: Client error displayed when requesting user information for a non-existing user.
-#: actions/apiuserprofileimage.php:80 actions/apiusershow.php:94
 #, fuzzy
 msgid "User not found."
 msgstr "API მეთოდი ვერ მოიძებნა."
@@ -1305,101 +1007,83 @@ msgstr "API მეთოდი ვერ მოიძებნა."
 #. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
 #. TRANS: Client exception.
 #. TRANS: Client error displayed trying to subscribe to a non-existing profile.
-#: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
-#: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
-#: actions/subscribe.php:110
 msgid "No such profile."
 msgstr "ასეთი პროფილი არ არსებობს."
 
 #. TRANS: Subtitle for Atom favorites feed.
 #. TRANS: %1$s is a user nickname, %2$s is the StatusNet sitename.
-#: actions/atompubfavoritefeed.php:147
 #, fuzzy, php-format
 msgid "Notices %1$s has favorited on %2$s"
 msgstr " %1$s და მეგობრების განახლებები %2$s-ზე!"
 
 #. TRANS: Client exception thrown when trying to set a favorite for another user.
 #. TRANS: Client exception thrown when trying to subscribe another user.
-#: actions/atompubfavoritefeed.php:217 actions/atompubsubscriptionfeed.php:225
 #, fuzzy
 msgid "Cannot add someone else's subscription."
 msgstr "ახალი გამოწერის ჩასმა ვერ მოხერხდა."
 
 #. TRANS: Client exception thrown when trying use an incorrect activity verb for the Atom pub method.
-#: actions/atompubfavoritefeed.php:240
 #, fuzzy
 msgid "Can only handle favorite activities."
 msgstr "მოძებნე შეტყობინებებში"
 
 #. TRANS: Client exception thrown when trying favorite an object that is not a notice.
-#: actions/atompubfavoritefeed.php:250 actions/atompubmembershipfeed.php:250
 #, fuzzy
 msgid "Can only fave notices."
 msgstr "მოძებნე შეტყობინებებში"
 
 #. TRANS: Client exception thrown when trying favorite a notice without content.
-#: actions/atompubfavoritefeed.php:259
 #, fuzzy
 msgid "Unknown note."
 msgstr "უცნობი"
 
 #. TRANS: Client exception thrown when trying favorite an already favorited notice.
-#: actions/atompubfavoritefeed.php:267
 #, fuzzy
 msgid "Already a favorite."
 msgstr "რჩეულებში დამატება"
 
 #. TRANS: Title for group membership feed.
 #. TRANS: %s is a username.
-#: actions/atompubmembershipfeed.php:144
 #, fuzzy, php-format
 msgid "%s group memberships"
 msgstr "%s ჯგუფის წევრი"
 
 #. TRANS: Subtitle for group membership feed.
 #. TRANS: %1$s is a username, %2$s is the StatusNet sitename.
-#: actions/atompubmembershipfeed.php:149
 #, fuzzy, php-format
 msgid "Groups %1$s is a member of on %2$s"
 msgstr "%1$s-ს ის ჯგუფები რომლებშიც გაერთიანებულია %2$s."
 
 #. TRANS: Client exception thrown when trying subscribe someone else to a group.
-#: actions/atompubmembershipfeed.php:219
 #, fuzzy
 msgid "Cannot add someone else's membership."
 msgstr "ახალი გამოწერის ჩასმა ვერ მოხერხდა."
 
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#: actions/atompubmembershipfeed.php:242
 #, fuzzy
 msgid "Can only handle join activities."
 msgstr "მოძებნე შეტყობინებებში"
 
 #. TRANS: Client exception thrown when trying to subscribe to a non-existing group.
-#: actions/atompubmembershipfeed.php:259
 #, fuzzy
 msgid "Unknown group."
 msgstr "უცნობი"
 
 #. TRANS: Client exception thrown when trying to subscribe to an already subscribed group.
-#: actions/atompubmembershipfeed.php:267
 msgid "Already a member."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to subscribe to group while blocked from that group.
-#: actions/atompubmembershipfeed.php:275
 msgid "Blocked by admin."
 msgstr ""
 
 #. TRANS: Client exception thrown when referencing a non-existing favorite.
-#: actions/atompubshowfavorite.php:90
 #, fuzzy
 msgid "No such favorite."
 msgstr "ასეთი ფაილი არ არსებობს."
 
 #. TRANS: Client exception thrown when trying to remove a favorite notice of another user.
-#: actions/atompubshowfavorite.php:151
 #, fuzzy
 msgid "Cannot delete someone else's favorite."
 msgstr "ფავორიტის წაშლა ვერ მოხერხდა."
@@ -1426,93 +1110,68 @@ msgstr "ფავორიტის წაშლა ვერ მოხერხ
 #. TRANS: Client error displayed when trying to join a non-existing group.
 #. TRANS: Client error displayed when trying to leave a non-local group.
 #. TRANS: Client error displayed when trying to leave a non-existing group.
+#. TRANS: Client error displayed when providing an invalid group ID on the Make Admin page.
 #. 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.
 #. TRANS: Command exception text shown when a group is requested that does not exist.
 #. TRANS: Error text shown when trying to leave a group that does not exist.
-#: actions/atompubshowmembership.php:81 actions/blockedfromgroup.php:81
-#: actions/blockedfromgroup.php:89 actions/deletegroup.php:87
-#: actions/deletegroup.php:100 actions/editgroup.php:102
-#: actions/foafgroup.php:46 actions/foafgroup.php:65 actions/foafgroup.php:73
-#: actions/groupblock.php:89 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:101 actions/grouplogo.php:103
-#: actions/groupmembers.php:84 actions/groupmembers.php:92
-#: actions/grouprss.php:97 actions/grouprss.php:105
-#: actions/groupunblock.php:89 actions/joingroup.php:82
-#: actions/joingroup.php:95 actions/leavegroup.php:82
-#: actions/leavegroup.php:95 actions/makeadmin.php:86
-#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:392
 msgid "No such group."
 msgstr "ასეთი ჯგუფი ვერ მოიძებნა."
 
 #. TRANS: Client exception thrown when trying to show membership of a non-subscribed group
-#: actions/atompubshowmembership.php:91
 #, fuzzy
 msgid "Not a member."
 msgstr "ტელეფონის ნომერი არ არის."
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
-#: actions/atompubshowmembership.php:150
 #, fuzzy
 msgid "Cannot delete someone else's membership."
 msgstr "საკუთარი გამოწერის წაშლა ვერ ხერხდება."
 
 #. TRANS: Client exception thrown when trying to display a subscription for a non-existing profile ID.
 #. TRANS: %d is the non-existing profile ID number.
-#: actions/atompubshowsubscription.php:72
-#: actions/atompubshowsubscription.php:83
-#: actions/atompubsubscriptionfeed.php:74
 #, fuzzy, php-format
 msgid "No such profile id: %d."
 msgstr "ასეთი პროფილი არ არსებობს."
 
 #. 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.
-#: actions/atompubshowsubscription.php:94
 #, fuzzy, php-format
 msgid "Profile %1$d not subscribed to profile %2$d."
 msgstr "თქვენ არ გაქვთ გამოწერილი ამ პროფილის განახლებები."
 
 #. TRANS: Client exception thrown when trying to delete a subscription of another user.
-#: actions/atompubshowsubscription.php:157
 #, fuzzy
 msgid "Cannot delete someone else's subscription."
 msgstr "საკუთარი გამოწერის წაშლა ვერ ხერხდება."
 
 #. TRANS: Subtitle for Atom subscription feed.
 #. TRANS: %1$s is a user nickname, %s$s is the StatusNet sitename.
-#: actions/atompubsubscriptionfeed.php:153
 #, fuzzy, php-format
 msgid "People %1$s has subscribed to on %2$s"
 msgstr "თქვენ არ გაქვთ გამოწერილი ამ პროფილის განახლებები."
 
 #. TRANS: Client error displayed when not using the follow verb.
-#: actions/atompubsubscriptionfeed.php:248
 msgid "Can only handle Follow activities."
 msgstr ""
 
 #. TRANS: Client exception thrown when subscribing to an object that is not a person.
-#: actions/atompubsubscriptionfeed.php:256
 msgid "Can only follow people."
 msgstr ""
 
 #. TRANS: Client exception thrown when subscribing to a non-existing profile.
 #. TRANS: %s is the unknown profile ID.
-#: actions/atompubsubscriptionfeed.php:267
 #, fuzzy, php-format
 msgid "Unknown profile %s."
 msgstr "ფაილის ტიპი უცნობია"
 
 #. TRANS: Client error displayed trying to subscribe to an already subscribed profile.
 #. TRANS: %s is the profile the user already has a subscription on.
-#: actions/atompubsubscriptionfeed.php:275
 #, fuzzy, php-format
 msgid "Already subscribed to %s."
 msgstr "უკვე გამოწერილია!"
 
 #. TRANS: Client error displayed trying to get a non-existing attachment.
-#: actions/attachment.php:73
 msgid "No such attachment."
 msgstr "ასეთი მიმაგრებული დოკუმენტი ვერ მოიძებნა."
 
@@ -1524,31 +1183,23 @@ msgstr "ასეთი მიმაგრებული დოკუმენ
 #. TRANS: Client error displayed when trying to view group members without providing a group nickname.
 #. TRANS: Client error displayed when requesting a group RSS feed without providing a group nickname.
 #. TRANS: Client error displayed if no nickname argument was given requesting a group page.
-#: actions/avatarbynickname.php:60 actions/blockedfromgroup.php:73
-#: actions/editgroup.php:85 actions/groupdesignsettings.php:84
-#: actions/grouplogo.php:86 actions/groupmembers.php:76
-#: actions/grouprss.php:89 actions/showgroup.php:116
 msgid "No nickname."
 msgstr "მეტსახელი უცნობია."
 
 #. TRANS: Client error displayed trying to get an avatar without providing an avatar size.
-#: actions/avatarbynickname.php:66
 msgid "No size."
 msgstr "ზომა უცნობია."
 
 #. TRANS: Client error displayed trying to get an avatar providing an invalid avatar size.
-#: actions/avatarbynickname.php:72
 msgid "Invalid size."
 msgstr "ზომა არასწორია."
 
 #. TRANS: Title for avatar upload page.
-#: actions/avatarsettings.php:66 lib/settingsnav.php:82
 msgid "Avatar"
 msgstr "ავატარი"
 
 #. TRANS: Instruction for avatar upload page.
 #. TRANS: %s is the maximum file size, for example "500b", "10kB" or "2MB".
-#: actions/avatarsettings.php:78
 #, php-format
 msgid "You can upload your personal avatar. The maximum file size is %s."
 msgstr ""
@@ -1558,17 +1209,12 @@ msgstr ""
 #. TRANS: Server error displayed coming across a request from a user without a profile.
 #. TRANS: Server error displayed when trying to authorise a remote subscription request
 #. TRANS: while the user has no profile.
-#: actions/avatarsettings.php:108 actions/avatarsettings.php:192
-#: actions/grouplogo.php:184 actions/remotesubscribe.php:190
-#: actions/userauthorization.php:75 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr "მომხმარებელი შესაბამისი პროფილის გარეშე."
 
 #. TRANS: Avatar upload page form legend.
 #. TRANS: Avatar upload page crop form legend.
 #. TRANS: Legend for group logo settings fieldset.
-#: actions/avatarsettings.php:122 actions/avatarsettings.php:205
-#: actions/grouplogo.php:261
 msgid "Avatar settings"
 msgstr "ავატარის პარამეტრები."
 
@@ -1576,8 +1222,6 @@ msgstr "ავატარის პარამეტრები."
 #. TRANS: Header on avatar upload crop form for thumbnail of originally uploaded avatar (h2).
 #. TRANS: Uploaded original file in group logo form.
 #. TRANS: Header for originally uploaded file before a crop on the group logo page.
-#: actions/avatarsettings.php:131 actions/avatarsettings.php:214
-#: actions/grouplogo.php:207 actions/grouplogo.php:270
 msgid "Original"
 msgstr "ორიგინალი"
 
@@ -1585,14 +1229,11 @@ msgstr "ორიგინალი"
 #. TRANS: Header on avatar upload crop form for thumbnail of to be used rendition of uploaded avatar (h2).
 #. TRANS: Header for preview of to be displayed group logo.
 #. TRANS: Header for the cropped group logo on the group logo page.
-#: actions/avatarsettings.php:147 actions/avatarsettings.php:227
-#: actions/grouplogo.php:219 actions/grouplogo.php:283
 msgid "Preview"
 msgstr "წინასწარი გადახედვა"
 
 #. TRANS: Button on avatar upload page to delete current avatar.
 #. TRANS: Button text for user account deletion.
-#: actions/avatarsettings.php:155 actions/deleteaccount.php:319
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Delete"
@@ -1600,70 +1241,58 @@ msgstr "წაშლა"
 
 #. TRANS: Button on avatar upload page to upload an avatar.
 #. TRANS: Submit button to confirm upload of a user backup file for account restore.
-#: actions/avatarsettings.php:173 actions/restoreaccount.php:369
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Upload"
 msgstr "ატვირთვა"
 
 #. TRANS: Button on avatar upload crop form to confirm a selected crop as avatar.
-#: actions/avatarsettings.php:243
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Crop"
 msgstr "მოჭრა"
 
 #. TRANS: Validation error on avatar upload form when no file was uploaded.
-#: actions/avatarsettings.php:318
 msgid "No file uploaded."
 msgstr "არცერთი ფაილი არ ატვირთულა"
 
 #. TRANS: Avatar upload form instruction after uploading a file.
-#: actions/avatarsettings.php:345
 #, fuzzy
 msgid "Pick a square area of the image to be your avatar."
 msgstr "აირჩიეთ სურათის კვადრატული მონაკვეთი თქვენი ავატარისთვის"
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
 #. TRANS: Server error displayed trying to crop an uploaded group logo that is no longer present.
-#: actions/avatarsettings.php:360 actions/grouplogo.php:391
 msgid "Lost our file data."
 msgstr ""
 
 #. TRANS: Success message for having updated a user avatar.
-#: actions/avatarsettings.php:384
 msgid "Avatar updated."
 msgstr "ავატარი განახლდა."
 
 #. TRANS: Error displayed on the avatar upload page if the avatar could not be updated for an unknown reason.
-#: actions/avatarsettings.php:388
 msgid "Failed updating avatar."
 msgstr "ავატარის განახლება ვერ მოხერხდა."
 
 #. TRANS: Success message for deleting a user avatar.
-#: actions/avatarsettings.php:412
 msgid "Avatar deleted."
 msgstr "ავატარი წაიშალა."
 
 #. TRANS: Title for backup account page.
 #. TRANS: Option in profile settings to create a backup of the account of the currently logged in user.
-#: actions/backupaccount.php:61 actions/profilesettings.php:468
 msgid "Backup account"
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to backup an account while not logged in.
-#: actions/backupaccount.php:79
 #, fuzzy
 msgid "Only logged-in users can backup their account."
 msgstr "მხოლოდ ავტორიზირებულ მომხმარებლებს შეუძლიათ შეტყობინებების გამეორება."
 
 #. TRANS: Client exception thrown when trying to backup an account without having backup rights.
-#: actions/backupaccount.php:84
 msgid "You may not backup your account."
 msgstr ""
 
 #. TRANS: Information displayed on the backup account page.
-#: actions/backupaccount.php:227
 msgid ""
 "You can backup your account data in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format. This is an experimental feature and provides "
@@ -1673,31 +1302,26 @@ msgid ""
 msgstr ""
 
 #. TRANS: Submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:250
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Backup"
 msgstr "ფონი"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:254
 msgid "Backup your account."
 msgstr ""
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
-#: actions/block.php:68
 msgid "You already blocked that user."
 msgstr "თქვენ უკვე დაბლოკეთ ეს მომხმარებელი."
 
 #. TRANS: Title for block user page.
 #. TRANS: Legend for block user form.
 #. TRANS: Fieldset legend for block user from group form.
-#: actions/block.php:106 actions/block.php:136 actions/groupblock.php:165
 msgid "Block user"
 msgstr "მომხმარებლის დაბლოკვა"
 
 #. TRANS: Explanation of consequences when blocking a user on the block user page.
-#: actions/block.php:139
 msgid ""
 "Are you sure you want to block this user? Afterwards, they will be "
 "unsubscribed from you, unable to subscribe to you in the future, and you "
@@ -1710,15 +1334,11 @@ msgstr ""
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:154 actions/deleteapplication.php:157
-#: actions/deletegroup.php:220 actions/deletenotice.php:155
-#: actions/deleteuser.php:154 actions/groupblock.php:187
 msgctxt "BUTTON"
 msgid "No"
 msgstr "არა"
 
 #. TRANS: Submit button title for 'No' when blocking a user.
-#: actions/block.php:158
 #, fuzzy
 msgid "Do not block this user."
 msgstr "არ დაბლოკო ეს მომხმარებელი"
@@ -1729,50 +1349,40 @@ msgstr "არ დაბლოკო ეს მომხმარებელი
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:161 actions/deleteapplication.php:164
-#: actions/deletegroup.php:227 actions/deletenotice.php:162
-#: actions/deleteuser.php:161 actions/groupblock.php:194
 msgctxt "BUTTON"
 msgid "Yes"
 msgstr "დიახ"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:165
 #, fuzzy
 msgid "Block this user."
 msgstr "დაბლოკე ეს მომხმარებელი"
 
 #. TRANS: Server error displayed when blocking a user fails.
-#: actions/block.php:189
 msgid "Failed to save block information."
 msgstr "დაბლოკვის შესახებ ინფორმაციის შენახვა ვერ მოხერხდა."
 
 #. TRANS: Title for first page with list of users blocked from a group.
 #. TRANS: %s is a group nickname.
-#: actions/blockedfromgroup.php:101
 #, php-format
 msgid "%s blocked profiles"
 msgstr "%s დაბლოკილი პროფილი"
 
 #. TRANS: Title for any but the first page with list of users blocked from a group.
 #. TRANS: %1$s is a group nickname, %2$d is a page number.
-#: actions/blockedfromgroup.php:106
 #, php-format
 msgid "%1$s blocked profiles, page %2$d"
 msgstr "%1$s დაბლოკილი პროფილი, გვერდი %2$d"
 
 #. TRANS: Instructions for list of users blocked from a group.
-#: actions/blockedfromgroup.php:122
 msgid "A list of the users blocked from joining this group."
 msgstr "ამ ჯგუფში გაწევრიანებისგან დაბლოკილ მომხმარებელთა სია."
 
 #. TRANS: Form legend for unblocking a user from a group.
-#: actions/blockedfromgroup.php:291
 msgid "Unblock user from group"
 msgstr "მომხმარებლის ბლოკირების მოხსნა ჯგუფიდან"
 
 #. TRANS: Button text for unblocking a user from a group.
-#: actions/blockedfromgroup.php:323
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Unblock"
@@ -1780,130 +1390,104 @@ msgstr "ბლოკირების მოხსნა"
 
 #. TRANS: Tooltip for button for unblocking a user from a group.
 #. TRANS: Description of the form to unblock a user.
-#: actions/blockedfromgroup.php:327 lib/unblockform.php:78
 msgid "Unblock this user"
 msgstr "მომხმარებლის ბლოკირების მოხსნა"
 
 #. TRANS: Title for mini-posting window loaded from bookmarklet.
 #. TRANS: %s is the StatusNet site name.
-#: actions/bookmarklet.php:51
 #, php-format
 msgid "Post to %s"
 msgstr "დაუპოსტე %s-ს"
 
 #. TRANS: Client error displayed when not providing a confirmation code in the contact address confirmation action.
-#: actions/confirmaddress.php:74
 msgid "No confirmation code."
 msgstr "დასადასტურებელი კოდი არ არის."
 
 #. TRANS: Client error displayed when providing a non-existing confirmation code in the contact address confirmation action.
-#: actions/confirmaddress.php:80
 msgid "Confirmation code not found."
 msgstr "დასადასტურებელი კოდი ვერ მოიძებნა."
 
 #. TRANS: Client error displayed when not providing a confirmation code for another user in the contact address confirmation action.
-#: actions/confirmaddress.php:86
 msgid "That confirmation code is not for you!"
 msgstr "ეს დასადასტურებელი კოდი თქვენთვის არ არის!"
 
 #. TRANS: Server error for an unknown address type, which can be 'email', 'sms', or the name of an IM network (such as 'xmpp' or 'aim')
-#: actions/confirmaddress.php:94
 #, fuzzy, php-format
 msgid "Unrecognized address type %s"
 msgstr "მისამართის ამოუცნობი ტიპი %s."
 
 #. TRANS: Client error for an already confirmed email/jabber/sms address.
-#: actions/confirmaddress.php:103 actions/confirmaddress.php:136
 msgid "That address has already been confirmed."
 msgstr "ეს მისამართი უკვე დადასტურებულია."
 
-#: actions/confirmaddress.php:121 actions/imsettings.php:444
-#: actions/userdesignsettings.php:306
-#, fuzzy
 msgid "Couldn't update user."
 msgstr "მომხმარებლის განახლება ვერ მოხერხდა."
 
-#: actions/confirmaddress.php:144
 #, fuzzy
 msgid "Couldn't update user im preferences."
 msgstr "მომხმარებლის ჩანაწერის განახლება ვერ მოხერხდა."
 
-#: actions/confirmaddress.php:156
 #, fuzzy
 msgid "Couldn't insert user im preferences."
 msgstr "ახალი გამოწერის ჩასმა ვერ მოხერხდა."
 
 #. TRANS: Server error displayed when an address confirmation code deletion from the
 #. TRANS: database fails in the contact address confirmation action.
-#: actions/confirmaddress.php:169
 #, fuzzy
 msgid "Could not delete address confirmation."
 msgstr "IM დასტურის წაშლა ვერ მოხერხდა."
 
 #. TRANS: Title for the contact address confirmation action.
-#: actions/confirmaddress.php:185
 msgid "Confirm address"
 msgstr "მისამართის დასტური"
 
 #. TRANS: Success message for the contact address confirmation action.
 #. TRANS: %s can be 'email', 'jabber', or 'sms'.
-#: actions/confirmaddress.php:200
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "მისამართი \"%s\" დადასტურდა თქვენი ანგარიშისთვის."
 
 #. TRANS: Title for page with a conversion (multiple notices in context).
-#: actions/conversation.php:96
 msgid "Conversation"
 msgstr "საუბარი"
 
 #. TRANS: Header on conversation page. Hidden by default (h2).
 #. TRANS: Label for user statistics.
-#: actions/conversation.php:149 lib/noticelist.php:87
-#: lib/profileaction.php:246 lib/searchgroupnav.php:82
-#: lib/threadednoticelist.php:66
 msgid "Notices"
 msgstr "შეტყობინებები"
 
 #. TRANS: Client exception displayed trying to delete a user account while not logged in.
-#: actions/deleteaccount.php:71
 #, fuzzy
 msgid "Only logged-in users can delete their account."
 msgstr "მხოლოდ ავტორიზირებულ მომხმარებლებს შეუძლიათ შეტყობინებების გამეორება."
 
 #. TRANS: Client exception displayed trying to delete a user account without have the rights to do that.
-#: actions/deleteaccount.php:77
 #, fuzzy
 msgid "You cannot delete your account."
 msgstr "თქვენ ვერ შეძლებთ მომხმარებლების წაშლას."
 
 #. TRANS: Confirmation text for user deletion. The user has to type this exactly the same, including punctuation.
-#: actions/deleteaccount.php:160 actions/deleteaccount.php:297
 msgid "I am sure."
 msgstr ""
 
 #. TRANS: Notification for user about the text that must be input to be able to delete a user account.
 #. TRANS: %s is the text that needs to be input.
-#: actions/deleteaccount.php:164
 #, php-format
 msgid "You must write \"%s\" exactly in the box."
 msgstr ""
 
 #. TRANS: Confirmation that a user account has been deleted.
-#: actions/deleteaccount.php:206
 #, fuzzy
 msgid "Account deleted."
 msgstr "ავატარი წაიშალა."
 
 #. TRANS: Page title for page on which a user account can be deleted.
 #. TRANS: Option in profile settings to delete the account of the currently logged in user.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:476
 #, fuzzy
 msgid "Delete account"
 msgstr "გახსენი ანგარიში"
 
 #. TRANS: Form text for user deletion form.
-#: actions/deleteaccount.php:279
 msgid ""
 "This will <strong>permanently delete</strong> your account data from this "
 "server."
@@ -1911,7 +1495,6 @@ msgstr ""
 
 #. TRANS: Additional form text for user deletion form shown if a user has account backup rights.
 #. TRANS: %s is a URL to the backup page.
-#: actions/deleteaccount.php:285
 #, php-format
 msgid ""
 "You are strongly advised to <a href=\"%s\">back up your data</a> before "
@@ -1920,56 +1503,43 @@ msgstr ""
 
 #. TRANS: Field label for delete account confirmation entry.
 #. TRANS: Field label for password reset form where the password has to be typed again.
-#: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:262 actions/register.php:419
 msgid "Confirm"
 msgstr "ვადასტურებ"
 
 #. TRANS: Input title for the delete account field.
 #. TRANS: %s is the text that needs to be input.
-#: actions/deleteaccount.php:304
 #, fuzzy, php-format
 msgid "Enter \"%s\" to confirm that you want to delete your account."
 msgstr "თქვენ ვერ შეძლებთ მომხმარებლების წაშლას."
 
 #. TRANS: Button title for user account deletion.
-#: actions/deleteaccount.php:323
 #, fuzzy
 msgid "Permanently delete your account"
 msgstr "თქვენ ვერ შეძლებთ მომხმარებლების წაშლას."
 
 #. TRANS: Client error displayed trying to delete an application while not logged in.
-#: actions/deleteapplication.php:62
 msgid "You must be logged in to delete an application."
 msgstr "აპლიკაციის წასაშლელად საჭიროა ავროტიზაცია."
 
 #. TRANS: Client error displayed trying to delete an application that does not exist.
-#: actions/deleteapplication.php:71
 msgid "Application not found."
 msgstr "აპლიკაცია ვერ მოიძებნა."
 
 #. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
-#: actions/deleteapplication.php:79 actions/editapplication.php:78
-#: actions/showapplication.php:90
 msgid "You are not the owner of this application."
 msgstr "თქვენ არ ხართ ამ აპლიკაციის მფლობელი."
 
 #. TRANS: Client error text when there is a problem with the session token.
-#: actions/deleteapplication.php:102 actions/editapplication.php:131
-#: actions/newapplication.php:112 actions/showapplication.php:113
-#: lib/action.php:1391
 msgid "There was a problem with your session token."
 msgstr ""
 
 #. TRANS: Title for delete application page.
 #. TRANS: Fieldset legend on delete application page.
-#: actions/deleteapplication.php:124 actions/deleteapplication.php:149
 msgid "Delete application"
 msgstr "აპლიკაციის წაშლა"
 
 #. TRANS: Confirmation text on delete application page.
-#: actions/deleteapplication.php:152
 msgid ""
 "Are you sure you want to delete this application? This will clear all data "
 "about the application from the database, including all existing user "
@@ -1979,19 +1549,16 @@ msgstr ""
 "მონაცემებს ამ აპლიკაციის შესახებ, ყველა შეერთებული მომხმარებლის ჩათვლით."
 
 #. TRANS: Submit button title for 'No' when deleting an application.
-#: actions/deleteapplication.php:161
 #, fuzzy
 msgid "Do not delete this application."
 msgstr "არ წაშალო ეს აპლიკაცია"
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
-#: actions/deleteapplication.php:167
 #, fuzzy
 msgid "Delete this application."
 msgstr "აპლიკაციის წაშლა"
 
 #. TRANS: Client error when trying to delete group while not logged in.
-#: actions/deletegroup.php:64
 #, fuzzy
 msgid "You must be logged in to delete a group."
 msgstr "გჯუფის დატოვებისათვის საჭიროა ავტორიზაცია."
@@ -1999,40 +1566,33 @@ msgstr "გჯუფის დატოვებისათვის საჭ
 #. TRANS: Client error when trying to delete a group without providing a nickname or ID for the group.
 #. TRANS: Client error displayed when trying to join a group without providing a group name or group ID.
 #. TRANS: Client error displayed when trying to leave a group without providing a group name or group ID.
-#: actions/deletegroup.php:94 actions/joingroup.php:89
-#: actions/leavegroup.php:89
 msgid "No nickname or ID."
 msgstr "მეტსახელი ან ID უცნობია."
 
 #. TRANS: Client error when trying to delete a group without having the rights to delete it.
-#: actions/deletegroup.php:107
 #, fuzzy
 msgid "You are not allowed to delete this group."
 msgstr "თვენ არ ხართ ამ ჯგუფის წევრი."
 
 #. TRANS: Server error displayed if a group could not be deleted.
 #. TRANS: %s is the name of the group that could not be deleted.
-#: actions/deletegroup.php:150
 #, fuzzy, php-format
 msgid "Could not delete group %s."
 msgstr "ჯგუფის განახლება ვერ მოხერხდა."
 
 #. TRANS: Message given after deleting a group.
 #. TRANS: %s is the deleted group's name.
-#: actions/deletegroup.php:159
 #, fuzzy, php-format
 msgid "Deleted group %s"
 msgstr "%1$s-მა დატოვა ჯგუფი %2$s"
 
 #. TRANS: Title of delete group page.
 #. TRANS: Form legend for deleting a group.
-#: actions/deletegroup.php:176 actions/deletegroup.php:202
 #, fuzzy
 msgid "Delete group"
 msgstr "მომხმარებლის წაშლა"
 
 #. TRANS: Warning in form for deleleting a group.
-#: actions/deletegroup.php:206
 #, fuzzy
 msgid ""
 "Are you sure you want to delete this group? This will clear all data about "
@@ -2043,13 +1603,11 @@ msgstr ""
 "მომხმარებლის შესახებ სარეზერვო ასლის გარეშე."
 
 #. TRANS: Submit button title for 'No' when deleting a group.
-#: actions/deletegroup.php:224
 #, fuzzy
 msgid "Do not delete this group."
 msgstr "არ წაშალო ეს შეტყობინება"
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
-#: actions/deletegroup.php:231
 #, fuzzy
 msgid "Delete this group."
 msgstr "ამ მომხმარებლის წაშლა"
@@ -2060,22 +1618,18 @@ msgstr "ამ მომხმარებლის წაშლა"
 #. TRANS: Client error displayed trying to block a user from a group while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying to log out when not logged in.
+#. TRANS: Client error displayed when trying to access the "make admin" page while not logged in.
+#. TRANS: Client error displayed trying to create a new direct message while not logged in.
+#. TRANS: Client error displayed trying to send a notice while not logged in.
+#. TRANS: Client error displayed trying to nudge a user without being logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
 #. TRANS: Client error displayed when trying to change user options while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
-#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:70
-#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
-#: actions/nudge.php:63 actions/pluginenable.php:97 actions/subedit.php:33
-#: actions/subscribe.php:98 actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:71 lib/profileformaction.php:63
-#: lib/settingsaction.php:72
 msgid "Not logged in."
 msgstr "ავტორიზებული არ ხართ."
 
 #. TRANS: Instructions for deleting a notice.
-#: actions/deletenotice.php:110
 msgid ""
 "You are about to permanently delete a notice. Once this is done, it cannot "
 "be undone."
@@ -2083,51 +1637,42 @@ msgstr "თქვენ შეტყობინების სამუდა
 
 #. TRANS: Page title when deleting a notice.
 #. TRANS: Fieldset legend for the delete notice form.
-#: actions/deletenotice.php:117 actions/deletenotice.php:148
 msgid "Delete notice"
 msgstr "შეტყობინების წაშლა"
 
 #. TRANS: Message for the delete notice form.
-#: actions/deletenotice.php:152
 msgid "Are you sure you want to delete this notice?"
 msgstr "ნამდვილად გსურთ ამ შეტყობინების წაშლა?"
 
 #. TRANS: Submit button title for 'No' when deleting a notice.
-#: actions/deletenotice.php:159
 #, fuzzy
 msgid "Do not delete this notice."
 msgstr "არ წაშალო ეს შეტყობინება"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:166
 #, fuzzy
 msgid "Delete this notice."
 msgstr "შეტყობინების წაშლა"
 
 #. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
-#: actions/deleteuser.php:66
 msgid "You cannot delete users."
 msgstr "თქვენ ვერ შეძლებთ მომხმარებლების წაშლას."
 
 #. TRANS: Client error displayed when trying to delete a non-local user.
-#: actions/deleteuser.php:74
 msgid "You can only delete local users."
 msgstr "თქვენ მხოლოდ ადგილობრივი მომხმარებლების წაშლა გძალუძთ."
 
 #. TRANS: Title of delete user page.
-#: actions/deleteuser.php:110
 #, fuzzy
 msgctxt "TITLE"
 msgid "Delete user"
 msgstr "მომხმარებლის წაშლა"
 
 #. TRANS: Fieldset legend on delete user page.
-#: actions/deleteuser.php:134
 msgid "Delete user"
 msgstr "მომხმარებლის წაშლა"
 
 #. TRANS: Information text to request if a user is certain that the described action has to be performed.
-#: actions/deleteuser.php:138
 msgid ""
 "Are you sure you want to delete this user? This will clear all data about "
 "the user from the database, without a backup."
@@ -2136,102 +1681,83 @@ msgstr ""
 "მომხმარებლის შესახებ სარეზერვო ასლის გარეშე."
 
 #. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/deleteuser.php:158
 #, fuzzy
 msgid "Do not delete this user."
 msgstr "არ წაშალო ეს შეტყობინება"
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
-#: actions/deleteuser.php:165
 #, fuzzy
 msgid "Delete this user."
 msgstr "ამ მომხმარებლის წაშლა"
 
 #. TRANS: Message used as title for design settings for the site.
-#: actions/designadminpanel.php:60 lib/settingsnav.php:97
 msgid "Design"
 msgstr "ამ მომხმარებლის წაშლა"
 
 #. TRANS: Instructions for design adminsitration panel.
-#: actions/designadminpanel.php:71
 msgid "Design settings for this StatusNet site"
 msgstr ""
 
 #. TRANS: Client error displayed when a logo URL does is not valid.
-#: actions/designadminpanel.php:327
 msgid "Invalid logo URL."
 msgstr "ლოგოს არასწორი URL-ი"
 
 #. TRANS: Client error displayed when an SSL logo URL is invalid.
-#: actions/designadminpanel.php:333
 #, fuzzy
 msgid "Invalid SSL logo URL."
 msgstr "ლოგოს არასწორი URL-ი"
 
 #. TRANS: Client error displayed when a theme is submitted through the form that is not in the theme list.
 #. TRANS: %s is the chosen unavailable theme.
-#: actions/designadminpanel.php:339
 #, php-format
 msgid "Theme not available: %s."
 msgstr "იერსახე არ არის ხელმისაწვდომი %s."
 
 #. TRANS: Fieldset legend for form to change logo.
-#: actions/designadminpanel.php:437
 msgid "Change logo"
 msgstr "შეცვალე ლოგო"
 
 #. TRANS: Field label for StatusNet site logo.
-#: actions/designadminpanel.php:444
 msgid "Site logo"
 msgstr "საიტის ლოგო"
 
 #. TRANS: Field label for SSL StatusNet site logo.
-#: actions/designadminpanel.php:452
 #, fuzzy
 msgid "SSL logo"
 msgstr "საიტის ლოგო"
 
 #. TRANS: Fieldset legend for form change StatusNet site's theme.
-#: actions/designadminpanel.php:467
 msgid "Change theme"
 msgstr "შეცვალე იერსახე"
 
 #. TRANS: Field label for dropdown to choose site theme.
-#: actions/designadminpanel.php:485
 msgid "Site theme"
 msgstr "საიტის იერსახე"
 
 #. TRANS: Title for field label for dropdown to choose site theme.
-#: actions/designadminpanel.php:487
 msgid "Theme for the site."
 msgstr "იერსახე ამ საიტისთვის"
 
 #. TRANS: Field label for uploading a cutom theme.
-#: actions/designadminpanel.php:494
 msgid "Custom theme"
 msgstr "საკუთარი იერსახე"
 
 #. TRANS: Form instructions for uploading a cutom StatusNet theme.
-#: actions/designadminpanel.php:499
 msgid "You can upload a custom StatusNet theme as a .ZIP archive."
 msgstr ""
 "თქვენ შეგიძლიათ ატვირთოთ საკუთარი StatusNet–იერსახე .ZIP არქივის სახით."
 
 #. TRANS: Fieldset legend for theme background image.
-#: actions/designadminpanel.php:515
 msgid "Change background image"
 msgstr "შეცვალე ფონური სურათი"
 
 #. TRANS: Field label for background image on theme designer page.
 #. TRANS: Field label for background color selector.
 #. TRANS: Label on profile design page for setting a profile page background colour.
-#: actions/designadminpanel.php:525 actions/designadminpanel.php:609
-#: lib/designform.php:238
 msgid "Background"
 msgstr "ფონი"
 
 #. TRANS: Form guide for background image upload form on theme designer page.
-#: actions/designadminpanel.php:531
 #, php-format
 msgid ""
 "You can upload a background image for the site. The maximum file size is %1"
@@ -2241,204 +1767,169 @@ msgstr ""
 "ზომაა %1$s."
 
 #. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:558
 msgid "On"
 msgstr "ჩართვა"
 
 #. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:575
 msgid "Off"
 msgstr "გამორთვა"
 
 #. TRANS: Form guide for turning background image on or off on theme designer page.
 #. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
 #. TRANS: use of the uploaded profile image.
-#: actions/designadminpanel.php:577 lib/designform.php:214
 msgid "Turn background image on or off."
 msgstr "ჩართე ან გამორთე ფონური სურათის ფუნქცია."
 
 #. TRANS: Checkbox label to title background image on theme designer page.
 #. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-#: actions/designadminpanel.php:583 lib/designform.php:220
 msgid "Tile background image"
 msgstr "გაამრავლე ფონური სურათი"
 
 #. TRANS: Fieldset legend for theme colors.
-#: actions/designadminpanel.php:598
 #, fuzzy
 msgid "Change colors"
 msgstr "შეცვალე ფერები"
 
 #. TRANS: Field label for content color selector.
 #. TRANS: Label on profile design page for setting a profile page content colour.
-#: actions/designadminpanel.php:623 lib/designform.php:252
 msgid "Content"
 msgstr "შიგთავსი"
 
 #. TRANS: Field label for sidebar color selector.
 #. TRANS: Label on profile design page for setting a profile page sidebar colour.
-#: actions/designadminpanel.php:637 lib/designform.php:266
 msgid "Sidebar"
 msgstr "გვერდითი პანელი"
 
 #. TRANS: Field label for text color selector.
 #. TRANS: Label on profile design page for setting a profile page text colour.
-#: actions/designadminpanel.php:651 lib/designform.php:280
 msgid "Text"
 msgstr "ტექსტი"
 
 #. TRANS: Field label for link color selector.
 #. TRANS: Label on profile design page for setting a profile page links colour.
-#: actions/designadminpanel.php:665 lib/designform.php:294
 msgid "Links"
 msgstr "ბმულები"
 
 #. TRANS: Fieldset legend for advanced theme design settings.
-#: actions/designadminpanel.php:691
 msgid "Advanced"
 msgstr "მეტი პარამეტრები"
 
 #. TRANS: Field label for custom CSS.
-#: actions/designadminpanel.php:696
 msgid "Custom CSS"
 msgstr "საკუთარი CSS"
 
 #. TRANS: Button text for resetting theme settings.
-#: actions/designadminpanel.php:718
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Use defaults"
 msgstr "გამოიყენე პირვანდელი მდგომარეობა"
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:720
 #, fuzzy
 msgid "Restore default designs."
 msgstr "დააბრუნე პირვანდელი დიზაინი"
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:728
 #, fuzzy
 msgid "Reset back to default."
 msgstr "პირვანდელის პარამეტრების დაბრუნება"
 
 #. TRANS: Title for button for saving theme settings.
-#: actions/designadminpanel.php:736
 #, fuzzy
 msgid "Save design."
 msgstr "შეინახე დიზაინი"
 
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
-#: actions/disfavor.php:83
 msgid "This notice is not a favorite!"
 msgstr "ეს შეტყობინება არ არის რჩეული!"
 
 #. TRANS: Title for page on which favorites can be added.
-#: actions/disfavor.php:98
 msgid "Add to favorites"
 msgstr "რჩეულებში დამატება"
 
 #. TRANS: Client exception thrown when requesting a document from the documentation that does not exist.
 #. TRANS: %s is the non-existing document.
-#: actions/doc.php:155
 #, fuzzy, php-format
 msgid "No such document \"%s\"."
 msgstr "ასეთი დოკუმენტი არ არის \"%s\""
 
 #. TRANS: Title for "Edit application" form.
 #. TRANS: Form legend.
-#: actions/editapplication.php:54 lib/applicationeditform.php:129
 msgid "Edit application"
 msgstr "ჩაასწორე აპლიკაცია"
 
 #. TRANS: Client error displayed trying to edit an application while not logged in.
-#: actions/editapplication.php:66
 msgid "You must be logged in to edit an application."
 msgstr "აპლიკაციის ჩასასწორებლად საჭიროა ავროტიზაცია."
 
 #. TRANS: Client error displayed trying to edit an application that does not exist.
-#: actions/editapplication.php:83 actions/showapplication.php:83
 msgid "No such application."
 msgstr "ასეთი აპლიკაცია არ არის."
 
 #. TRANS: Instructions for "Edit application" form.
-#: actions/editapplication.php:167
 msgid "Use this form to edit your application."
 msgstr "აპლიკაციაში ცვლილებების შესატანად გამოიყენეთ ეს ფორმა."
 
 #. TRANS: Validation error shown when not providing a name in the "Edit application" form.
 #. TRANS: Validation error shown when not providing a name in the "New application" form.
-#: actions/editapplication.php:184 actions/newapplication.php:164
 msgid "Name is required."
 msgstr "სახელი სავალდებულოა."
 
 #. 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.
-#: actions/editapplication.php:188 actions/newapplication.php:172
 #, fuzzy
 msgid "Name is too long (maximum 255 characters)."
 msgstr "სახელი ძალიან გრძელია (არაუმეტეს 255 სიმბოლო)."
 
 #. TRANS: Validation error shown when providing a name for an application that already exists in the "Edit application" form.
 #. TRANS: Validation error shown when providing a name for an application that already exists in the "New application" form.
-#: actions/editapplication.php:192 actions/newapplication.php:168
 msgid "Name already in use. Try another one."
 msgstr "სახელი უკვე გამოყენებულია. სცადე სხვა."
 
 #. TRANS: Validation error shown when not providing a description in the "Edit application" form.
 #. TRANS: Validation error shown when not providing a description in the "New application" form.
-#: actions/editapplication.php:196 actions/newapplication.php:176
 msgid "Description is required."
 msgstr "აღწერა სავალდებულოა."
 
 #. TRANS: Validation error shown when providing too long a source URL in the "Edit application" form.
-#: actions/editapplication.php:209
 msgid "Source URL is too long."
 msgstr "წყაროს URL ძალიან გრძელია."
 
 #. TRANS: Validation error shown when providing an invalid source URL in the "Edit application" form.
 #. TRANS: Validation error shown when providing an invalid source URL in the "New application" form.
-#: actions/editapplication.php:216 actions/newapplication.php:199
 msgid "Source URL is not valid."
 msgstr "წყაროს URL  არასწორია."
 
 #. 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.
-#: actions/editapplication.php:220 actions/newapplication.php:203
 msgid "Organization is required."
 msgstr "ორგანიზაცია სავალდებულოა."
 
 #. TRANS: Validation error shown when providing too long an arganisation name in the "Edit application" form.
-#: actions/editapplication.php:224 actions/newapplication.php:207
 #, fuzzy
 msgid "Organization is too long (maximum 255 characters)."
 msgstr "ორგანიზაცია ძალიან გრძელია (არაუმეტეს 255 სიმბოლო)."
 
 #. TRANS: Form validation error show when an organisation name has not been provided in the edit application form.
 #. TRANS: Form validation error show when an organisation name has not been provided in the new application form.
-#: actions/editapplication.php:228 actions/newapplication.php:211
 msgid "Organization homepage is required."
 msgstr "ორგანიზაციის ვებ. გვერდი სავალდებულოა."
 
 #. TRANS: Validation error shown when providing too long a callback URL in the "Edit application" form.
 #. TRANS: Validation error shown when providing too long a callback URL in the "New application" form.
-#: actions/editapplication.php:239 actions/newapplication.php:225
 msgid "Callback is too long."
 msgstr ""
 
 #. TRANS: Validation error shown when providing an invalid callback URL in the "Edit application" form.
 #. TRANS: Validation error shown when providing an invalid callback URL in the "New application" form.
-#: actions/editapplication.php:247 actions/newapplication.php:235
 msgid "Callback URL is not valid."
 msgstr ""
 
 #. TRANS: Server error occuring when an application could not be updated from the "Edit application" form.
-#: actions/editapplication.php:284
 msgid "Could not update application."
 msgstr "აპლიკაციის განახლება ვერ მოხერხდა."
 
 #. TRANS: Title for form to edit a group. %s is a group nickname.
-#: actions/editgroup.php:55
 #, php-format
 msgid "Edit %s group"
 msgstr "%s ჯგუფის რედაქტირება"
@@ -2446,40 +1937,40 @@ msgstr "%s ჯგუფის რედაქტირება"
 #. TRANS: Client error displayed trying to edit a group while not logged in.
 #. TRANS: Client error displayed when trying to create a group while not logged in.
 #. TRANS: Client error displayed trying to create a group while not logged in.
-#: actions/editgroup.php:68 actions/grouplogo.php:69 actions/newgroup.php:65
 msgid "You must be logged in to create a group."
 msgstr "გჯუფის შესაქმნელად საჭიროა ავტორიზაცია."
 
 #. TRANS: Form instructions for group edit form.
-#: actions/editgroup.php:161
 msgid "Use this form to edit the group."
 msgstr "ჯგუფის რედაქტირებისათვის გამოიყენეთ ეს ფორმა."
 
+#. TRANS: Group edit form validation error.
+#. TRANS: Group create form validation error.
+#. TRANS: %s is the invalid alias.
+#, php-format
+msgid "Invalid alias: \"%s\""
+msgstr ""
+
 #. TRANS: Group edit form success message.
-#: actions/editgroup.php:301
 msgid "Options saved."
 msgstr "პარამეტრები შენახულია."
 
 #. TRANS: Title for e-mail settings.
-#: actions/emailsettings.php:60
 msgid "Email settings"
 msgstr "ელ. ფოსტის პარამეტრები"
 
 #. TRANS: E-mail settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/emailsettings.php:74
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 msgstr "%%site.name%%–სგან ელ. ფოსტის მიღების მართვა."
 
 #. TRANS: Form legend for e-mail settings form.
 #. TRANS: Field label for e-mail address input in e-mail settings form.
-#: actions/emailsettings.php:104 actions/emailsettings.php:130
 msgid "Email address"
 msgstr "ელ. ფოსტის მისამართი"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:110
 msgid "Current confirmed email address."
 msgstr "მიმდინარე დადასტურებული ელ. ფოსტის მისამართი."
 
@@ -2488,15 +1979,11 @@ msgstr "მიმდინარე დადასტურებული ე
 #. TRANS: Button label to remove a confirmed IM address.
 #. TRANS: Button label to remove a confirmed SMS address.
 #. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
-#: actions/emailsettings.php:113 actions/emailsettings.php:180
-#: actions/imsettings.php:119 actions/smssettings.php:119
-#: actions/smssettings.php:175
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "წაშლა"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:120
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -2509,44 +1996,36 @@ msgstr ""
 #. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
 #. TRANS: Any other domain may be owned by a legitimate person or
 #. TRANS: organization.
-#: actions/emailsettings.php:137
 msgid "Email address, like \"UserName@example.org\""
 msgstr "ელ. ფოსტის მისამართი, როგორც \"UserName@example.org\""
 
 #. TRANS: Button label for adding an e-mail address in e-mail settings form.
 #. TRANS: Button label for adding an IM address in IM settings form.
 #. TRANS: Button label for adding a SMS phone number in SMS settings form.
-#: actions/emailsettings.php:141 actions/imsettings.php:147
-#: actions/smssettings.php:157
 msgctxt "BUTTON"
 msgid "Add"
 msgstr "დამატება"
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:149 actions/smssettings.php:166
 msgid "Incoming email"
 msgstr "შემომავალი ელ. ფოსტა"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:155
 msgid "I want to post notices by email."
 msgstr "მინდა დავპოსტო შეტყობინებები ელ. ფოსტით."
 
 #. TRANS: Form instructions for incoming e-mail form in e-mail settings.
 #. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
-#: actions/emailsettings.php:177 actions/smssettings.php:173
 msgid "Send email to this address to post new notices."
 msgstr "გააგზავნე ელ. ფოსტა ამ მისამართზე ახალი შეტყობინებების დასაპოსტად."
 
 #. TRANS: Instructions for incoming e-mail address input form, when an address has already been assigned.
 #. TRANS: Instructions for incoming SMS e-mail address input form.
-#: actions/emailsettings.php:186 actions/smssettings.php:181
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr ""
 
 #. TRANS: Instructions for incoming e-mail address input form.
-#: actions/emailsettings.php:190
 msgid ""
 "To send notices via email, we need to create a unique email address for you "
 "on this server:"
@@ -2554,91 +2033,73 @@ msgstr ""
 
 #. TRANS: Button label for adding an e-mail address to send notices from.
 #. TRANS: Button label for adding an SMS e-mail address to send notices from.
-#: actions/emailsettings.php:196 actions/smssettings.php:184
 msgctxt "BUTTON"
 msgid "New"
 msgstr "ახალი"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:205
 msgid "Email preferences"
 msgstr "ელ. ფოსტის პარამეტრები"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:213
 msgid "Send me notices of new subscriptions through email."
 msgstr ""
 "გამომიგზავნე შეტყობინებები ახალი გამოწერების შესახებ ელ. ფოსტის საშუალებით."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:219
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr ""
 "გამომიგზავნე ელ. წერილი როდესაც ვინმე ჩემს შეტყობინებას რჩეულებში დაიმატებს."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:226
 msgid "Send me email when someone sends me a private message."
 msgstr "გამომიგზავნე ელ. წერილი როდესაც ვინმე პირად შეტყობინებას მომწერს."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:232
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr "გამომიგზავნე წერილი როდესაც ვინმე გამომიგზავნის \"@-პასუხს\"."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:238
 msgid "Allow friends to nudge me and send me an email."
 msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:244
 msgid "Publish a MicroID for my email address."
 msgstr "გამოაქვეყნე MicroID ჩემი ელ. ფოსტის მისამართისთვის."
 
 #. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:362
 msgid "Email preferences saved."
 msgstr "ელ. ფოსტის პარამეტრები შენახულია."
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:381
 msgid "No email address."
 msgstr " ელ. ფოსტის მისამართი მითითებული არ არის."
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:389
 #, fuzzy
 msgid "Cannot normalize that email address."
 msgstr "Jabber ID-ს ნორმალიზაცია ვერ ხერხდება"
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:394 actions/register.php:197
-#: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "არასწორი ელ. ფოსტის მისამართი."
 
 #. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:398
 msgid "That is already your email address."
 msgstr "ეს უკვე არის თქვენი ელ. ფოსტის მისამართი."
 
 #. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:402
 msgid "That email address already belongs to another user."
 msgstr "ეს ელ. ფოსტის მისამართი დაკავებულია."
 
 #. TRANS: Server error thrown on database error adding e-mail confirmation code.
 #. TRANS: Server error thrown on database error adding Instant Messaging confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:419 actions/imsettings.php:362
-#: actions/smssettings.php:364
 #, fuzzy
 msgid "Could not insert confirmation code."
 msgstr "დასტურის კოდის ჩასმა ვერ მოხერხდა."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:426
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
@@ -2650,104 +2111,84 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling Instant Messaging address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:446 actions/imsettings.php:391
-#: actions/smssettings.php:398
 msgid "No pending confirmation to cancel."
 msgstr "გასაუქმებელიარაფერია. არ არის მომლოდინე დასტური."
 
 #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:451
 msgid "That is the wrong email address."
 msgstr "ეს არასწორი ელ. ფოსტის მისამართია."
 
 #. TRANS: Server error thrown on database error canceling e-mail address confirmation.
 #. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
-#: actions/emailsettings.php:460 actions/smssettings.php:412
 #, fuzzy
 msgid "Could not delete email confirmation."
 msgstr "ელ. ფოსტის დადასტურების წაშლა ვერ მოხერხდა."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:465
 msgid "Email confirmation cancelled."
 msgstr "ელ. ფოსტის დადასტურება გაუქმებულია."
 
 #. TRANS: Message given trying to remove an e-mail address that is not
 #. TRANS: registered for the active user.
-#: actions/emailsettings.php:484
 msgid "That is not your email address."
 msgstr "ეს არ არის თქვენი ელ. ფოსტის მისამართი."
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:505
 msgid "The email address was removed."
 msgstr "ელ. ფოსტის მისამართი მოშორებულია."
 
 #. TRANS: Form validation error displayed when trying to remove an incoming e-mail address while no address has been set.
-#: actions/emailsettings.php:519 actions/smssettings.php:554
 msgid "No incoming email address."
 msgstr "შემომავალი ელ. ფოსტის მისამართი არ არის."
 
 #. 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.
-#: actions/emailsettings.php:531 actions/emailsettings.php:555
-#: actions/smssettings.php:565 actions/smssettings.php:590
 #, fuzzy
 msgid "Could not update user record."
 msgstr "მომხმარებლის ჩანაწერის განახლება ვერ მოხერხდა."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
 #. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:535 actions/smssettings.php:569
 msgid "Incoming email address removed."
 msgstr "შემომავალი ელ. ფოსტის მისამართი მოშორებულია."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
 #. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:559 actions/smssettings.php:594
 msgid "New incoming email address added."
 msgstr "დამატებულია ახალი შემომავალი ელ. ფოსტა."
 
 #. TRANS: Client error displayed when trying to mark a notice as favorite that already is a favorite.
-#: actions/favor.php:80
 msgid "This notice is already a favorite!"
 msgstr "ეს შეტყობინება უკვე რჩეულია!"
 
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
-#: actions/favor.php:95
 #, fuzzy
 msgid "Disfavor favorite."
 msgstr "რჩეულის გაუქმება"
 
 #. TRANS: Page title for first page of favorited notices.
 #. TRANS: Title for favourited notices section.
-#: actions/favorited.php:65 lib/popularnoticesection.php:62
-#: lib/publicgroupnav.php:93
 msgid "Popular notices"
 msgstr "პოპულარული შეტყობინებები"
 
 #. TRANS: Page title for all but first page of favorited notices.
 #. TRANS: %d is the page number being displayed.
-#: actions/favorited.php:69
 #, php-format
 msgid "Popular notices, page %d"
 msgstr "პოპულარული შეტყობინებები, გვერდი %d"
 
 #. TRANS: Description on page displaying favorited notices.
-#: actions/favorited.php:81
 msgid "The most popular notices on the site right now."
 msgstr "ყველაზე პოპულარული შეტყობინებები ამ მომენტისათვის საიტზე."
 
 #. TRANS: Text displayed instead of a list when a site does not yet have any favourited notices.
-#: actions/favorited.php:149
 msgid "Favorite notices appear on this page but no one has favorited one yet."
 msgstr ""
 "რჩეული შეტყობინებები ამ გვერდზე ჩნდება, მაგრამ ჯერჯერობით არავის აურჩევია "
 "არაფერი."
 
 #. TRANS: Additional text displayed instead of a list when a site does not yet have any favourited notices for logged in users.
-#: actions/favorited.php:153
 msgid ""
 "Be the first to add a notice to your favorites by clicking the fave button "
 "next to any notice you like."
@@ -2757,7 +2198,6 @@ msgstr ""
 
 #. TRANS: Additional text displayed instead of a list when a site does not yet have any favourited notices for not logged in users.
 #. TRANS: %%action.register%% is a registration link. "[link text](link)" is Mark Down. Do not change the formatting.
-#: actions/favorited.php:158
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to add a "
@@ -2769,181 +2209,146 @@ msgstr ""
 #. TRANS: %s is a user's nickname.
 #. TRANS: Title for first page of favourite notices of a user.
 #. TRANS: %s is the user for whom the favourite notices are displayed.
-#: actions/favoritesrss.php:111 actions/showfavorites.php:76
-#: lib/personalgroupnav.php:110
 #, php-format
 msgid "%s's favorite notices"
 msgstr "%s-ს რჩეული შეტყობინებები"
 
 #. TRANS: Desciption of RSS feed with favourite notices of a user.
 #. TRANS: %1$s is a user's nickname, %2$s is the name of the StatusNet site.
-#: actions/favoritesrss.php:117
 #, php-format
 msgid "Updates favored by %1$s on %2$s!"
 msgstr "განახლებები არჩეული %1$s-ს მიერ %2$s-ზე!"
 
 #. TRANS: Page title for first page of featured users.
 #. TRANS: Title for featured users section.
-#: actions/featured.php:69 lib/featureduserssection.php:87
-#: lib/publicgroupnav.php:89
 msgid "Featured users"
 msgstr "წარმოდგენილი მომხმარებლები"
 
 #. TRANS: Page title for all but first page of featured users.
 #. TRANS: %d is the page number being displayed.
-#: actions/featured.php:73
 #, php-format
 msgid "Featured users, page %d"
 msgstr "წარმოდგენილი მომხმარებლები, გვერდი $d"
 
 #. TRANS: Description on page displaying featured users.
-#: actions/featured.php:102
 #, fuzzy, php-format
 msgid "A selection of some great users on %s."
 msgstr "ზოგიერთ ჩინებულ მომხმარებელთა განყოფილება %s-ზე"
 
 #. TRANS: Client error displayed when no notice ID was given trying do display a file.
-#: actions/file.php:36
 msgid "No notice ID."
 msgstr "შეტყობინების ID არ არის."
 
 #. TRANS: Client error displayed when an invalid notice ID was given trying do display a file.
-#: actions/file.php:41
 msgid "No notice."
 msgstr "შეტყობინება არ არის."
 
 #. TRANS: Client error displayed when trying do display a file for a notice without a file attachement.
-#: actions/file.php:46
 msgid "No attachments."
 msgstr "მიმაგრებული დოკუმენტი არ არის."
 
 #. TRANS: Client error displayed when trying do display a file for a notice with file attachements
 #. TRANS: that could not be found.
-#: actions/file.php:58
 msgid "No uploaded attachments."
 msgstr "ატვირთული მიმაგრებული დოკუმენტი არ არის."
 
 #. TRANS: Client error displayed when subscribing to a remote profile and an unexpected response is received.
-#: actions/finishremotesubscribe.php:69
 msgid "Not expecting this response!"
 msgstr "ეს უკუქმედება არ არის მოსალოდნელი."
 
 #. TRANS: Client error displayed when subscribing to a remote profile that does not exist.
-#: actions/finishremotesubscribe.php:81
 msgid "User being listened to does not exist."
 msgstr "მისადევნებელი მომხმარებელი არ არსებობს."
 
 #. TRANS: Client error displayed when subscribing to a remote profile that is a local profile.
-#: actions/finishremotesubscribe.php:89 actions/remotesubscribe.php:58
 msgid "You can use the local subscription!"
 msgstr "შეგიძლიათ გამოიყენოთ ადგილობრივი გამოწერა!"
 
 #. TRANS: Client error displayed when subscribing to a remote profile that is blocked form subscribing to.
-#: actions/finishremotesubscribe.php:102
 msgid "That user has blocked you from subscribing."
 msgstr "ამ მომხმარებელმა აგიკრძალათ მიდევნება."
 
 #. TRANS: Client error displayed when subscribing to a remote profile without providing an authorised token.
-#: actions/finishremotesubscribe.php:114
 msgid "You are not authorized."
 msgstr "თქვენ არ ხართ ავტორიზირებული."
 
 #. TRANS: Client error displayed when subscribing to a remote profile and conversion of the request token to access token fails.
-#: actions/finishremotesubscribe.php:118
 msgid "Could not convert request token to access token."
 msgstr ""
 
 #. TRANS: Client error displayed when subscribing to a remote profile fails because of an unsupported version of the OMB protocol.
-#: actions/finishremotesubscribe.php:124
 msgid "Remote service uses unknown version of OMB protocol."
 msgstr "დაშორებული სერვისი OMB პროტოკოლის უცნობ ვერსიას იყენებს."
 
 #. TRANS: Server error displayed when subscribing to a remote profile fails because the remote profile could not be updated.
-#: actions/finishremotesubscribe.php:145 lib/oauthstore.php:317
 msgid "Error updating remote profile."
 msgstr "შეცდომა დაშორებული პროფილის განახლებისას."
 
 #. TRANS: Client error displayed when requesting a non-existent file.
-#: actions/getfile.php:77
 msgid "No such file."
 msgstr "ასეთი ფაილი არ არსებობს."
 
 #. TRANS: Client error displayed when requesting a file without having read access to it.
-#: actions/getfile.php:82
 msgid "Cannot read file."
 msgstr "ფაილის წაკითხვა ვერ ხერხდება."
 
 #. TRANS: Client error displayed when trying to assign an invalid role to a user.
-#: actions/grantrole.php:61 actions/revokerole.php:62
 msgid "Invalid role."
 msgstr "არასწორი როლი."
 
 #. TRANS: Client error displayed when trying to assign an reserved role to a user.
-#: actions/grantrole.php:66 actions/revokerole.php:66
 msgid "This role is reserved and cannot be set."
 msgstr "ეს როლი დარეზერვებულია და გამოყენება შეუძლებელია."
 
 #. TRANS: Client error displayed when trying to assign a role to a user while not being allowed to set roles.
-#: actions/grantrole.php:76
 msgid "You cannot grant user roles on this site."
 msgstr "თქვენ არ შეგიძლიათ როლების მინიჭება ამ საიტზე."
 
 #. TRANS: Client error displayed when trying to assign a role to a user that already has that role.
-#: actions/grantrole.php:84
 msgid "User already has this role."
 msgstr "მომხმარებელს უკვე აქვს ეს როლი."
 
 #. TRANS: Client error displayed trying to block a user from a group while not specifying a to be blocked user profile.
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing a profile.
+#. TRANS: Client error displayed when not providing a profile ID on the Make Admin page.
 #. TRANS: Client error displayed trying a change a subscription without providing a profile.
 #. TRANS: Client error displayed when trying to change user options without specifying a user to work on.
-#: actions/groupblock.php:71 actions/groupunblock.php:71
-#: actions/makeadmin.php:71 actions/subedit.php:49
-#: lib/profileformaction.php:79
 msgid "No profile specified."
 msgstr "პროფილი მითითებული არ არის."
 
 #. TRANS: Client error displayed trying to block a user from a group while specifying a non-existing profile.
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing an existing profile.
+#. TRANS: Client error displayed when specifying an invalid profile ID on the Make Admin page.
 #. TRANS: Client error displayed trying a change a subscription for a non-existant profile ID.
 #. TRANS: Client error displayed when trying to change user options without specifying an existing user to work on.
-#: actions/groupblock.php:77 actions/groupunblock.php:77
-#: actions/makeadmin.php:76 actions/subedit.php:57 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:87
 msgid "No profile with that ID."
 msgstr "ასეთი ID-ს მქონე პროფილი ვერ მოიძებნა."
 
 #. TRANS: Client error displayed trying to block a user from a group while not specifying a group to block a profile from.
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing a group.
-#: actions/groupblock.php:83 actions/groupunblock.php:83
-#: actions/makeadmin.php:81
+#. TRANS: Client error displayed when not providing a group ID on the Make Admin page.
 msgid "No group specified."
 msgstr "ჯგუფი მითითებული არ არის."
 
 #. TRANS: Client error displayed trying to block a user from a group while not being an admin user.
-#: actions/groupblock.php:95
 msgid "Only an admin can block group members."
 msgstr "მხოლოდ ადმინს შეუძლია ჯგუფიდან მომხმარებლების გარიცხვა."
 
 #. TRANS: Client error displayed trying to block a user from a group while user is already blocked from the given group.
-#: actions/groupblock.php:100
 msgid "User is already blocked from group."
 msgstr "მომხმარებელი უკვე გარიცხულია ჯგუფიდან."
 
 #. TRANS: Client error displayed trying to block a user from a group while user is not a member of given group.
-#: actions/groupblock.php:106
 msgid "User is not a member of group."
 msgstr "მომხმარებელი არ არის ჯგუფის წევრი."
 
 #. TRANS: Title for block user from group page.
 #. TRANS: Form legend for form to block user from a group.
-#: actions/groupblock.php:141 actions/groupmembers.php:364
 msgid "Block user from group"
 msgstr "მომხმარებლის გარიცხვა ჯგუფიდან."
 
 #. TRANS: Explanatory text for block user from group form before setting the block.
 #. TRANS: %1$s is that to be blocked user, %2$s is the group the user will be blocked from.
-#: actions/groupblock.php:169
 #, php-format
 msgid ""
 "Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They "
@@ -2955,40 +2360,33 @@ msgstr ""
 "მომავალშიც."
 
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
-#: actions/groupblock.php:191
 #, fuzzy
 msgid "Do not block this user from this group."
 msgstr "არ გარიცხო ემ მომხმარებელი ამ ჯგუფიდან"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
-#: actions/groupblock.php:198
 #, fuzzy
 msgid "Block this user from this group."
 msgstr "გარიცხე ეს მომხმარებელი ამ ჯგუფიდან"
 
 #. TRANS: Server error displayed when trying to block a user from a group fails because of an application error.
-#: actions/groupblock.php:215
 msgid "Database error blocking user from group."
 msgstr "მომხმარებლის ჯგუფიდან გარიცხვისას მოხდა შეცდომა ბაზაში."
 
 #. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
 #. TRANS: Client error displayed trying to find a user by ID without providing an ID.
-#: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr "ID უცნობია."
 
 #. TRANS: Client error displayed trying to change group design settings while not logged in.
-#: actions/groupdesignsettings.php:67
 msgid "You must be logged in to edit a group."
 msgstr "ჯგუფის რედაქტირებისათვის საჭიროა ავტორიზაცია."
 
 #. TRANS: Title group design settings page.
-#: actions/groupdesignsettings.php:146
 msgid "Group design"
 msgstr "ჯგუფის დიზაინი"
 
 #. TRANS: Instructions for group design settings page.
-#: actions/groupdesignsettings.php:157
 msgid ""
 "Customize the way your group looks with a background image and a colour "
 "palette of your choice."
@@ -2997,25 +2395,21 @@ msgstr ""
 "პალიტრის შეცვლით."
 
 #. TRANS: Form validation error displayed when group design settings could not be updated because of an application issue.
-#: actions/groupdesignsettings.php:262
 #, fuzzy
 msgid "Unable to update your design settings."
 msgstr "სამწუხაროდ თქვენი დიზაინის პარამეტრების შენახვა ვერ მოხერხდა."
 
 #. TRANS: Form text to confirm saved group design settings.
-#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:239
 msgid "Design preferences saved."
 msgstr "დიზაინის პარამეტრები შენახულია."
 
 #. TRANS: Title for group logo settings page.
 #. TRANS: Group logo form legend.
-#: actions/grouplogo.php:144 actions/grouplogo.php:199
 msgid "Group logo"
 msgstr "ჯგუფის ლოგო"
 
 #. TRANS: Instructions for group logo page.
 #. TRANS: %s is the maximum file size for that site.
-#: actions/grouplogo.php:156
 #, php-format
 msgid ""
 "You can upload a logo image for your group. The maximum file size is %s."
@@ -3023,91 +2417,75 @@ msgstr ""
 "თქვენ შეგიძლიათ ატვირთოთ ლოგოს თქვენი ჯგუფისათვის. ფაილის დასაშვები ზომაა %s."
 
 #. TRANS: Submit button for uploading a group logo.
-#: actions/grouplogo.php:243
 msgid "Upload"
 msgstr "ატვირთვა"
 
 #. TRANS: Button text for cropping an uploaded group logo.
-#: actions/grouplogo.php:299
 msgid "Crop"
 msgstr "მოჭრა"
 
 #. TRANS: Form instructions on the group logo page.
-#: actions/grouplogo.php:376
 msgid "Pick a square area of the image to be the logo."
 msgstr "აირჩიეთ სურათის კვადრატული მონაკვეთი ლოგოსათვის."
 
 #. TRANS: Form success message after updating a group logo.
-#: actions/grouplogo.php:411
 msgid "Logo updated."
 msgstr "ლოგო განახლდა."
 
 #. TRANS: Form failure message after failing to update a group logo.
-#: actions/grouplogo.php:414
 msgid "Failed updating logo."
 msgstr "ლოგოს განახლება ვერ მოხერხდა."
 
 #. TRANS: Title of the page showing group members.
 #. TRANS: %s is the name of the group.
-#: actions/groupmembers.php:104
 #, php-format
 msgid "%s group members"
 msgstr "%s ჯგუფის წევრი"
 
 #. TRANS: Title of the page showing group members.
 #. TRANS: %1$s is the name of the group, %2$d is the page number of the members list.
-#: actions/groupmembers.php:109
 #, php-format
 msgid "%1$s group members, page %2$d"
 msgstr "%1$s ჯგუფის წევრი, გვერდი %2$d"
 
 #. TRANS: Page notice for group members page.
-#: actions/groupmembers.php:125
 msgid "A list of the users in this group."
 msgstr "ამ ჯგუფის წევრების სია."
 
 #. TRANS: Indicator in group members list that this user is a group administrator.
-#: actions/groupmembers.php:190 lib/action.php:581
 msgid "Admin"
 msgstr "ადმინი"
 
 #. TRANS: Button text for the form that will block a user from a group.
-#: actions/groupmembers.php:397
 msgctxt "BUTTON"
 msgid "Block"
 msgstr ""
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:401
 msgctxt "TOOLTIP"
 msgid "Block this user"
 msgstr ""
 
 #. TRANS: Form legend for form to make a user a group admin.
-#: actions/groupmembers.php:488
 msgid "Make user an admin of the group"
 msgstr "მიანიჭე მომხმარებელს ჯგუფის ადმინობა"
 
 #. TRANS: Button text for the form that will make a user administrator.
-#: actions/groupmembers.php:521
 msgctxt "BUTTON"
 msgid "Make Admin"
 msgstr ""
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:525
 msgctxt "TOOLTIP"
 msgid "Make this user an admin"
 msgstr ""
 
 #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
-#: actions/grouprss.php:141
 #, php-format
 msgid "Updates from members of %1$s on %2$s!"
 msgstr "%1$s-ის წევრების განახლებები %2$s-ზე!"
 
 #. TRANS: Title for first page of the groups list.
-#: actions/groups.php:62
 #, fuzzy
 msgctxt "TITLE"
 msgid "Groups"
@@ -3115,7 +2493,6 @@ msgstr "ჯგუფები"
 
 #. TRANS: Title for all but the first page of the groups list.
 #. TRANS: %d is the page number.
-#: actions/groups.php:66
 #, fuzzy, php-format
 msgctxt "TITLE"
 msgid "Groups, page %d"
@@ -3124,7 +2501,6 @@ msgstr "ჯგუფები, გვერდი $d"
 #. TRANS: Page notice of group list. %%%%site.name%%%% is the StatusNet site name,
 #. TRANS: %%%%action.groupsearch%%%% and %%%%action.newgroup%%%% are URLs. Do not change them.
 #. TRANS: This message contains Markdown links in the form [link text](link).
-#: actions/groups.php:95
 #, fuzzy, php-format
 msgid ""
 "%%%%site.name%%%% groups let you find and talk with people of similar "
@@ -3140,12 +2516,10 @@ msgstr ""
 "[შექმენით საკუთარი!](%%%%action.newgroup%%%%)"
 
 #. TRANS: Link to create a new group on the group list page.
-#: actions/groups.php:113 actions/usergroups.php:126 lib/groupeditform.php:115
 msgid "Create a new group"
 msgstr "შექმენი ახალი ჯგუფი"
 
 #. TRANS: Instructions for page where groups can be searched. %%site.name%% is the name of the StatusNet site.
-#: actions/groupsearch.php:53
 #, php-format
 msgid ""
 "Search for groups on %%site.name%% by their name, location, or description. "
@@ -3156,21 +2530,17 @@ msgstr ""
 "იყოს."
 
 #. TRANS: Title for page where groups can be searched.
-#: actions/groupsearch.php:60
 msgid "Group search"
 msgstr "ჯგუფის ძიება"
 
 #. TRANS: Text on page where groups can be searched if no results were found for a query.
 #. TRANS: Text for notice search results is the query had no results.
 #. TRANS: Message on the "People search" page where a query has no results.
-#: actions/groupsearch.php:82 actions/noticesearch.php:122
-#: actions/peoplesearch.php:87
 msgid "No results."
 msgstr "უშედეგოდ."
 
 #. TRANS: Additional text on page where groups can be searched if no results were found for a query for a logged in user.
 #. TRANS: This message contains Markdown links in the form [link text](link).
-#: actions/groupsearch.php:87
 #, fuzzy, php-format
 msgid ""
 "If you cannot find the group you're looking for, you can [create it](%%"
@@ -3181,7 +2551,6 @@ msgstr ""
 
 #. TRANS: Additional text on page where groups can be searched if no results were found for a query for a not logged in user.
 #. TRANS: This message contains Markdown links in the form [link text](link).
-#: actions/groupsearch.php:92
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and [create the group](%%"
@@ -3191,30 +2560,25 @@ msgstr ""
 "newgroup%%) თვითონ!"
 
 #. TRANS: Client error displayed when trying to unblock a user from a group without being an administrator for the group.
-#: actions/groupunblock.php:95
 msgid "Only an admin can unblock group members."
 msgstr "მხოლოდ ადმინს შეუძლია ჯგუფის წევრისთვის ბლოკის მოხსნა."
 
 #. TRANS: Client error displayed when trying to unblock a non-blocked user from a group.
-#: actions/groupunblock.php:100
 msgid "User is not blocked from group."
 msgstr "მომხმარებელი არ არის დაბლოკილი ჯგუფიდან."
 
 #. TRANS: Server error displayed when unblocking a user from a group fails because of an unknown error.
 #. TRANS: Server error displayed when removing a user block.
-#: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "შეცდომა ბლოკის მოხსნისას."
 
 #. TRANS: Title for Instant Messaging settings.
-#: actions/imsettings.php:56
 msgid "IM settings"
 msgstr "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.
-#: actions/imsettings.php:69
 #, fuzzy, php-format
 msgid ""
 "You can send and receive notices through instant messaging [instant messages]"
@@ -3224,18 +2588,15 @@ msgstr ""
 "doc.im%%). მომართეთ თქვენი მისამართი და პარამეტრები ქვევით."
 
 #. TRANS: Message given in the IM settings if IM is not enabled on the site.
-#: actions/imsettings.php:90
 msgid "IM is not available."
 msgstr "IM არ არის ხელმისაწვდომი."
 
-#: actions/imsettings.php:116
 #, fuzzy, php-format
 msgid "Current confirmed %s address."
 msgstr "მიმდინარე დადასტურებული ელ. ფოსტის მისამართი."
 
 #. TRANS: Form note in IM settings form.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:128
 #, fuzzy, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your %s account for a message "
@@ -3244,89 +2605,74 @@ msgstr ""
 "ამ მისამართის დადასტურება მოლოდინშია. შეამოწმეთ თქვენი Jabber/GTalk ანგარიში "
 "შეტყობინებისათვის შემდგომი ინსტრუქციებით. (დაიმატეთ %s მეგობრების სიაში?)"
 
-#: actions/imsettings.php:140
 msgid "IM address"
 msgstr "IM მისამართი"
 
-#: actions/imsettings.php:142
 #, php-format
 msgid "%s screenname."
 msgstr ""
 
 #. TRANS: Header for IM preferences form.
-#: actions/imsettings.php:163
 #, fuzzy
 msgid "IM Preferences"
 msgstr "IM პარამეტრები"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:174
 #, fuzzy
 msgid "Send me notices"
 msgstr "შეტყობინების გაგზავნა"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:176
 #, fuzzy
 msgid "Post a notice when my status changes."
 msgstr "დაპოსტე შეტყობინება, როდესაც ჩემი Jabber/GTalk სტატუსი შეიცვლება."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:178
 #, fuzzy
 msgid "Send me replies from people I'm not subscribed to."
 msgstr ""
 "გამომიგზავნე პასუხები Jabber/GTalk-ით ხალხისგან, რომლთა მიმდევარი არ ვარ."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:181
 #, fuzzy
 msgid "Publish a MicroID"
 msgstr "გამოაქვეყნე MicroID ჩემი ელ. ფოსტის მისამართისთვის."
 
 #. TRANS: Server error thrown on database error updating IM preferences.
-#: actions/imsettings.php:291
 #, fuzzy
 msgid "Couldn't update IM preferences."
 msgstr "მომხმარებლის განახლება ვერ მოხერხდა."
 
 #. TRANS: Confirmation message for successful IM preferences save.
 #. TRANS: Confirmation message after saving preferences.
-#: actions/imsettings.php:298 actions/urlsettings.php:244
 msgid "Preferences saved."
 msgstr "პარამეტრები შენახულია."
 
 #. TRANS: Message given saving IM address without having provided one.
-#: actions/imsettings.php:320
 #, fuzzy
 msgid "No screenname."
 msgstr "მეტსახელი უცნობია."
 
-#: actions/imsettings.php:325
 #, fuzzy
 msgid "No transport."
 msgstr "შეტყობინება არ არის."
 
 #. TRANS: Message given saving IM address that cannot be normalised.
-#: actions/imsettings.php:333
 #, fuzzy
 msgid "Cannot normalize that screenname"
 msgstr "Jabber ID-ს ნორმალიზაცია ვერ ხერხდება"
 
 #. TRANS: Message given saving IM address that not valid.
-#: actions/imsettings.php:340
 #, fuzzy
 msgid "Not a valid screenname"
 msgstr "მეტსახელი არასწორია."
 
 #. TRANS: Message given saving IM address that is already set for another user.
-#: actions/imsettings.php:344
 #, fuzzy
 msgid "Screenname already belongs to another user."
 msgstr "Jabber ID უკვე ეკუთვნის სხვა მომხმარებელს."
 
 #. TRANS: Message given saving valid IM address that is to be confirmed.
-#: actions/imsettings.php:369
 #, fuzzy
 msgid "A confirmation code was sent to the IM address you added."
 msgstr ""
@@ -3334,86 +2680,72 @@ msgstr ""
 "s-ს გამოგიგზავნოთ შეტყობინებები."
 
 #. TRANS: Message given canceling IM address confirmation for the wrong IM address.
-#: actions/imsettings.php:396
 msgid "That is the wrong IM address."
 msgstr "ეს არასწორი IM მისამართია."
 
 #. TRANS: Server error thrown on database error canceling IM address confirmation.
-#: actions/imsettings.php:405
 #, fuzzy
 msgid "Couldn't delete confirmation."
 msgstr "IM დასტურის წაშლა ვერ მოხერხდა."
 
 #. TRANS: Message given after successfully canceling IM address confirmation.
-#: actions/imsettings.php:410
 msgid "IM confirmation cancelled."
 msgstr "IM დასტური გაუქმდა."
 
 #. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.
-#: actions/imsettings.php:434
 #, fuzzy
 msgid "That is not your screenname."
 msgstr "ეს არ არის თქვენი ნომერი."
 
 #. TRANS: Server error thrown on database error removing a registered IM address.
-#: actions/imsettings.php:443
 #, fuzzy
 msgid "Couldn't update user im prefs."
 msgstr "მომხმარებლის ჩანაწერის განახლება ვერ მოხერხდა."
 
 #. TRANS: Message given after successfully removing a registered Instant Messaging address.
-#: actions/imsettings.php:451
 msgid "The IM address was removed."
 msgstr "IM მისამართი მოშორებულია."
 
 #. TRANS: Title for all but the first page of the inbox page.
 #. TRANS: %1$s is the user's nickname, %2$s is the page number.
-#: actions/inbox.php:59
 #, php-format
 msgid "Inbox for %1$s - page %2$d"
 msgstr "%1$s-ის შემომავალი ფოსტა - გვერდი %2$d"
 
 #. TRANS: Title for the first page of the inbox page.
 #. TRANS: %s is the user's nickname.
-#: actions/inbox.php:64
 #, php-format
 msgid "Inbox for %s"
 msgstr "%s-ის შემომავალი ფოსტა"
 
 #. TRANS: Instructions for user inbox page.
-#: actions/inbox.php:106
 msgid "This is your inbox, which lists your incoming private messages."
 msgstr ""
 "ეს არის თქვენი საფოსტო ყუთი, რომელშიც ჩამოთვლილია შემომავალი პირადი წერილები."
 
 #. TRANS: Client error displayed when trying to sent invites while they have been disabled.
-#: actions/invite.php:41
 msgid "Invites have been disabled."
 msgstr "მოწვევები გათიშულია."
 
 #. TRANS: Client error displayed when trying to sent invites while not logged in.
 #. TRANS: %s is the StatusNet site name.
-#: actions/invite.php:45
 #, php-format
 msgid "You must be logged in to invite other users to use %s."
 msgstr "%s-ში სხვა მომხმარებლების დასაპატიჯებლად საწიროა ავტორიზაცია."
 
 #. TRANS: Form validation message when providing an e-mail address that does not validate.
 #. TRANS: %s is an invalid e-mail address.
-#: actions/invite.php:78
 #, fuzzy, php-format
 msgid "Invalid email address: %s."
 msgstr "არასწორი ელექტრონული ფოსტის მისამართი: %s"
 
 #. TRANS: Page title when invitations have been sent.
-#: actions/invite.php:117
 #, fuzzy
 msgid "Invitations sent"
 msgstr "მოწვევა/მოწვევები გაგზავნილია"
 
 #. TRANS: Page title when inviting potential users.
-#: actions/invite.php:120
 msgid "Invite new users"
 msgstr "დაპატიჯე ახალი მომხმარებლები"
 
@@ -3421,7 +2753,6 @@ msgstr "დაპატიჯე ახალი მომხმარებლ
 #. TRANS: is already subscribed to one or more users with the given e-mail address(es).
 #. TRANS: Plural form is based on the number of reported already subscribed e-mail addresses.
 #. TRANS: Followed by a bullet list.
-#: actions/invite.php:140
 #, fuzzy
 msgid "You are already subscribed to this user:"
 msgid_plural "You are already subscribed to these users:"
@@ -3429,7 +2760,6 @@ msgstr[0] "თქვენ უკვე გამოწერილი გაქ
 
 #. TRANS: Used as list item for already subscribed users (%1$s is nickname, %2$s is e-mail address).
 #. TRANS: Used as list item for already registered people (%1$s is nickname, %2$s is e-mail address).
-#: actions/invite.php:146 actions/invite.php:160
 #, fuzzy, php-format
 msgctxt "INVITE"
 msgid "%1$s (%2$s)"
@@ -3438,7 +2768,6 @@ msgstr "%1$s (%2$s)"
 #. TRANS: Message displayed inviting users to use a StatusNet site while the invited user
 #. TRANS: already uses a this StatusNet site. Plural form is based on the number of
 #. TRANS: reported already present people. Followed by a bullet list.
-#: actions/invite.php:154
 #, fuzzy
 msgid "This person is already a user and you were automatically subscribed:"
 msgid_plural ""
@@ -3450,7 +2779,6 @@ msgstr[0] ""
 #. TRANS: Message displayed inviting users to use a StatusNet site. Plural form is
 #. TRANS: based on the number of invitations sent. Followed by a bullet list of
 #. TRANS: e-mail addresses to which invitations were sent.
-#: actions/invite.php:168
 #, fuzzy
 msgid "Invitation sent to the following person:"
 msgid_plural "Invitations sent to the following people:"
@@ -3458,7 +2786,6 @@ msgstr[0] "მოწვევა გაიგზავნა შემდეგ
 
 #. TRANS: Generic message displayed after sending out one or more invitations to
 #. TRANS: people to join a StatusNet site.
-#: actions/invite.php:178
 msgid ""
 "You will be notified when your invitees accept the invitation and register "
 "on the site. Thanks for growing the community!"
@@ -3468,7 +2795,6 @@ msgstr ""
 "ზრდას!"
 
 #. TRANS: Form instructions.
-#: actions/invite.php:191
 msgid ""
 "Use this form to invite your friends and colleagues to use this service."
 msgstr ""
@@ -3476,28 +2802,24 @@ msgstr ""
 "გამოსაყენებლად."
 
 #. TRANS: Field label for a list of e-mail addresses.
-#: actions/invite.php:218
 msgid "Email addresses"
 msgstr "ელ. ფოსტის მისამართები"
 
 #. TRANS: Tooltip for field label for a list of e-mail addresses.
-#: actions/invite.php:221
 #, fuzzy
 msgid "Addresses of friends to invite (one per line)."
 msgstr "დასაპატიჟებელი მოგობრების მისამართები (თითო ხაზზე თითო)"
 
 #. TRANS: Field label for a personal message to send to invitees.
-#: actions/invite.php:225
 msgid "Personal message"
 msgstr "პირადი შეტყობინება"
 
 #. TRANS: Tooltip for field label for a personal message to send to invitees.
-#: actions/invite.php:228
 msgid "Optionally add a personal message to the invitation."
 msgstr "დაუმატეთ პირადი შეტყობინება მოწვევას (არასავალდებულო)."
 
 #. TRANS: Send button for inviting friends
-#: actions/invite.php:232
+#. TRANS: Button text for sending notice.
 msgctxt "BUTTON"
 msgid "Send"
 msgstr "გაგზავნა"
@@ -3505,7 +2827,6 @@ msgstr "გაგზავნა"
 #. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral
 #. TRANS: singular 3rd-person pronoun in English. %1$s is the inviting user, $2$s is
 #. TRANS: the StatusNet sitename.
-#: actions/invite.php:264
 #, php-format
 msgid "%1$s has invited you to join them on %2$s"
 msgstr "%1$s-მა დაგპატიჟათ რომ შეუერთდეთ მას %2$s-ზე"
@@ -3515,7 +2836,6 @@ msgstr "%1$s-მა დაგპატიჟათ რომ შეუერთ
 #. TRANS: StatusNet sitename, %3$s is the site URL, %4$s is the personal message from the
 #. TRANS: inviting user, %s%5 a link to the timeline for the inviting user, %s$6 is a link
 #. TRANS: to register with the StatusNet site.
-#: actions/invite.php:271
 #, php-format
 msgid ""
 "%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -3573,182 +2893,177 @@ msgstr ""
 "პატივისცემით, %2$s\n"
 
 #. TRANS: Client error displayed when trying to join a group while not logged in.
-#: actions/joingroup.php:59
 msgid "You must be logged in to join a group."
 msgstr "გჯუფში გაწევრიანებისათვის საჭიროა ავტორიზაცია."
 
 #. TRANS: Title for join group page after joining.
-#: actions/joingroup.php:148
 #, fuzzy, php-format
 msgctxt "TITLE"
 msgid "%1$s joined group %2$s"
 msgstr "%1$s გაწევრიანდა ჯგუფში %2$s"
 
 #. TRANS: Client error displayed when trying to leave a group while not logged in.
-#: actions/leavegroup.php:59
 msgid "You must be logged in to leave a group."
 msgstr "გჯუფის დატოვებისათვის საჭიროა ავტორიზაცია."
 
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
-#: actions/leavegroup.php:103 lib/command.php:398
 msgid "You are not a member of that group."
 msgstr "თვენ არ ხართ ამ ჯგუფის წევრი."
 
 #. TRANS: Title for leave group page after leaving.
-#: actions/leavegroup.php:142
 #, fuzzy, php-format
 msgctxt "TITLE"
 msgid "%1$s left group %2$s"
 msgstr "%1$s-მა დატოვა ჯგუფი %2$s"
 
 #. TRANS: User admin panel title
-#: actions/licenseadminpanel.php:55
 msgctxt "TITLE"
 msgid "License"
 msgstr ""
 
-#: actions/licenseadminpanel.php:65
+#. TRANS: Form instructions for the site license admin panel.
 msgid "License for this StatusNet site"
 msgstr ""
 
-#: actions/licenseadminpanel.php:134
+#. TRANS: Client error displayed selecting an invalid license in the license admin panel.
 msgid "Invalid license selection."
 msgstr ""
 
-#: actions/licenseadminpanel.php:144
+#. TRANS: Client error displayed when not specifying an owner for the all rights reserved license in the license admin panel.
 msgid ""
 "You must specify the owner of the content when using the All Rights Reserved "
 "license."
 msgstr ""
 
-#: actions/licenseadminpanel.php:151
+#. TRANS: Client error displayed selecting a too long license title in the license admin panel.
 #, fuzzy
 msgid "Invalid license title. Maximum length is 255 characters."
 msgstr "არასწორი მისასალმებელი ტექსტი. სიმბოლოების მაქს. რაოდენობაა 255."
 
-#: actions/licenseadminpanel.php:163
+#. TRANS: Client error displayed specifying an invalid license URL in the license admin panel.
 msgid "Invalid license URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:166
+#. TRANS: Client error displayed specifying an invalid license image URL in the license admin panel.
 msgid "Invalid license image URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:174
+#. TRANS: Client error displayed specifying an invalid license URL in the license admin panel.
 msgid "License URL must be blank or a valid URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:182
+#. TRANS: Client error displayed specifying an invalid license image URL in the license admin panel.
 msgid "License image must be blank or valid URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:232
+#. TRANS: Form legend in the license admin panel.
 msgid "License selection"
 msgstr ""
 
-#: actions/licenseadminpanel.php:238
+#. TRANS: License option in the license admin panel.
 msgid "Private"
 msgstr ""
 
-#: actions/licenseadminpanel.php:239
+#. TRANS: License option in the license admin panel.
 msgid "All Rights Reserved"
 msgstr ""
 
-#: actions/licenseadminpanel.php:240
+#. TRANS: License option in the license admin panel.
 msgid "Creative Commons"
 msgstr ""
 
-#: actions/licenseadminpanel.php:245
+#. TRANS: Dropdown field label in the license admin panel.
 msgid "Type"
 msgstr ""
 
-#: actions/licenseadminpanel.php:247
-msgid "Select license"
-msgstr ""
+#. TRANS: Dropdown field instructions in the license admin panel.
+#, fuzzy
+msgid "Select a license."
+msgstr "აირჩიეთ ოპერატორი"
 
-#: actions/licenseadminpanel.php:261
+#. TRANS: Form legend in the license admin panel.
 msgid "License details"
 msgstr ""
 
-#: actions/licenseadminpanel.php:267
+#. TRANS: Field label in the license admin panel.
 msgid "Owner"
 msgstr ""
 
-#: actions/licenseadminpanel.php:268
+#. TRANS: Field title in the license admin panel.
 msgid "Name of the owner of the site's content (if applicable)."
 msgstr ""
 
-#: actions/licenseadminpanel.php:276
+#. TRANS: Field label in the license admin panel.
 msgid "License Title"
 msgstr ""
 
-#: actions/licenseadminpanel.php:277
+#. TRANS: Field title in the license admin panel.
 msgid "The title of the license."
 msgstr ""
 
-#: actions/licenseadminpanel.php:285
+#. TRANS: Field label in the license admin panel.
 msgid "License URL"
 msgstr ""
 
-#: actions/licenseadminpanel.php:286
+#. TRANS: Field title in the license admin panel.
 msgid "URL for more information about the license."
 msgstr ""
 
-#: actions/licenseadminpanel.php:293
+#. TRANS: Field label in the license admin panel.
 msgid "License Image URL"
 msgstr ""
 
-#: actions/licenseadminpanel.php:294
+#. TRANS: Field title in the license admin panel.
 msgid "URL for an image to display with the license."
 msgstr ""
 
-#. TRANS: Submit button title.
-#: actions/licenseadminpanel.php:311 actions/sessionsadminpanel.php:199
-#: actions/siteadminpanel.php:292 actions/snapshotadminpanel.php:245
-#: actions/tagother.php:133 lib/applicationeditform.php:357
-msgid "Save"
-msgstr "შენახვა"
-
-#: actions/licenseadminpanel.php:311
-msgid "Save license settings"
-msgstr ""
+#. TRANS: Button title in the license admin panel.
+#, fuzzy
+msgid "Save license settings."
+msgstr "საიტის პარამეტრების შენახვა"
 
+#. TRANS: Client error displayed when trying to log in while already logged in.
 #. TRANS: Client error displayed trying to use "one time password login" when already logged in.
-#: actions/login.php:97 actions/otp.php:62 actions/register.php:130
 msgid "Already logged in."
 msgstr "უკვე ავტორიზირებული ხართ."
 
-#: actions/login.php:125
+#. TRANS: Form validation error displayed when trying to log in with incorrect credentials.
 msgid "Incorrect username or password."
 msgstr "არასწორი მომხმარებლის სახელი ან პაროლი."
 
+#. TRANS: Server error displayed when during login a server error occurs.
 #. TRANS: Server error displayed when a user object could not be created trying to login using "one time password login".
-#: actions/login.php:131 actions/otp.php:127
 msgid "Error setting user. You are probably not authorized."
 msgstr ""
 
-#: actions/login.php:185 actions/login.php:236 lib/action.php:598
+#. TRANS: Page title for login page.
 msgid "Login"
 msgstr "შესვლა"
 
-#: actions/login.php:222
+#. TRANS: Form legend on login page.
 msgid "Login to site"
 msgstr "საიტზე შესვლა"
 
-#: actions/login.php:231 actions/register.php:469
+#. TRANS: Checkbox label label on login page.
 msgid "Remember me"
 msgstr "დამიმახსოვრე"
 
-#: actions/login.php:232 actions/register.php:471
+#. TRANS: Checkbox title on login page.
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "მომავალში ავტომატურად შემიყვანე; არა საზიარო კომპიუტერებისათვის!"
 
-#: actions/login.php:241
+#. TRANS: Button text for log in on login page.
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Login"
+msgstr "შესვლა"
+
+#. TRANS: Link text for link to "reset password" on login page.
 msgid "Lost or forgotten password?"
 msgstr "დაკარგეთ ან დაგავიწყდათ პაროლი?"
 
-#: actions/login.php:259
+#. TRANS: Form instructions on login page before being able to change user settings.
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -3756,11 +3071,12 @@ msgstr ""
 "უსაფრთხოების მიზნებისათვის, გთხოვთ შეიყვანოთ თქვენი მომხ. სახელი და პაროლი "
 "პარამეტრების შეცვლამდე."
 
-#: actions/login.php:263
+#. TRANS: Form instructions on login page.
 msgid "Login with your username and password."
 msgstr "შედი საკუთარი მომხ. სახელით და პაროლით."
 
-#: actions/login.php:266
+#. TRANS: Form instructions on login page. This message contains Markdown links in the form [Link text](Link).
+#. TRANS: %%action.register%% is a link to the registration page.
 #, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -3768,128 +3084,123 @@ msgstr ""
 "ჯერ კიდევ არ გაქვთ მომხ. სახელი? [დაარეგისტრირე](%%action.register%%) ახალი "
 "ანგარიში."
 
-#: actions/makeadmin.php:92
+#. TRANS: Client error displayed when trying to make another user admin on the Make Admin page while not an admin.
 msgid "Only an admin can make another user an admin."
 msgstr "მხოლოდ ადმინს შეძლია სხვა მომხმარებელი ადმინად აქციოს."
 
-#: actions/makeadmin.php:96
+#. TRANS: Client error displayed when trying to make another user admin on the Make Admin page who already is admin.
+#. TRANS: %1$s is the user that is already admin, %2$s is the group user is already admin for.
 #, php-format
 msgid "%1$s is already an admin for group \"%2$s\"."
 msgstr "%1$s უკვე არის \"%2$s\" ჯგუფის ადმინი."
 
-#: actions/makeadmin.php:133
+#. TRANS: Server error displayed when trying to make another user admin on the Make Admin page fails
+#. TRANS: because the group membership record could not be gotten.
+#. TRANS: %1$s is the to be admin user, %2$s is the group user should be admin for.
 #, php-format
 msgid "Can't get membership record for %1$s in group %2$s."
 msgstr "%1$s–ის წევრობის ჩანაწერის გამოთხოვნა %2$s ჯგუფიდან ვერ მოხერხდა."
 
-#: actions/makeadmin.php:146
+#. TRANS: Server error displayed when trying to make another user admin on the Make Admin page fails
+#. TRANS: because the group adminship record coud not be saved properly.
+#. TRANS: %1$s is the to be admin user, %2$s is the group user is already admin for.
 #, php-format
 msgid "Can't make %1$s an admin for group %2$s."
 msgstr "%1$s–ის %2$s ჯგუფის ადმინად ქცევა ვერ ხერხდება."
 
-#: actions/microsummary.php:69
+#. TRANS: Client error displayed trying to make a micro summary without providing a status.
 msgid "No current status."
 msgstr "მიმდინარე სტატუსი არ არის."
 
 #. TRANS: This is the title of the form for adding a new application.
-#: actions/newapplication.php:52
 #, fuzzy
 msgid "New application"
 msgstr "ახალი აპლიკაცია"
 
 #. TRANS: Client error displayed trying to add a new application while not logged in.
-#: actions/newapplication.php:64
 msgid "You must be logged in to register an application."
 msgstr "აპლიკაციის დასარეგისტრირებლად საჭიროა ავროტიზაცია."
 
 #. TRANS: Form instructions for registering a new application.
-#: actions/newapplication.php:147
 msgid "Use this form to register a new application."
 msgstr "აპლიკაციაში დასარეგისტრირებლად გამოიყენეთ ეს ფორმა."
 
 #. TRANS: Validation error shown when not providing a source URL in the "New application" form.
-#: actions/newapplication.php:189
 msgid "Source URL is required."
 msgstr "წყაროს URL სავალდებულოა."
 
 #. TRANS: Server error displayed when an application could not be registered in the database through the "New application" form.
-#: actions/newapplication.php:279 actions/newapplication.php:289
 msgid "Could not create application."
 msgstr "აპლიკაციის შექმნა ვერ მოხერხდა."
 
 #. TRANS: Title for form to create a group.
-#: actions/newgroup.php:53
 msgid "New group"
 msgstr "ახალი ჯგუფი"
 
 #. TRANS: Client exception thrown when a user tries to create a group while banned.
-#: actions/newgroup.php:73 classes/User_group.php:485
 #, fuzzy
 msgid "You are not allowed to create groups on this site."
 msgstr "თვენ არ ხართ ამ ჯგუფის წევრი."
 
 #. TRANS: Form instructions for group create form.
-#: actions/newgroup.php:117
 msgid "Use this form to create a new group."
 msgstr "ახალი ჯგუფის შესაქმნელად გამოიყენეთ ეს ფორმა."
 
-#. TRANS: Group create form validation error.
-#: actions/newgroup.php:200
-msgid "Alias cannot be the same as nickname."
-msgstr ""
-
-#: actions/newmessage.php:71 actions/newmessage.php:234
+#. TRANS: Page title for new direct message page.
+#. TRANS: Page title on page for sending a direct message.
 msgid "New message"
 msgstr "ახალი შეტყობინება"
 
-#. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
-#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:513
-msgid "You can't send a message to this user."
+#. TRANS: Client error displayed trying to send a direct message to a user while sender and
+#. TRANS: receiver are not subscribed to each other.
+#, fuzzy
+msgid "You cannot send a message to this user."
 msgstr "ამ მომხმარებელს შეტყობინებას ვერ გაუგზავნი."
 
+#. TRANS: Form validator error displayed trying to send a direct message without content.
+#. TRANS: Client error displayed trying to send a notice without content.
 #. TRANS: Command exception text shown when trying to send a direct message to another user without content.
 #. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
-#: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:490
-#: lib/command.php:593
 msgid "No content!"
 msgstr "შიგთავსი არ არის!"
 
-#: actions/newmessage.php:161
+#. TRANS: Form validation error displayed trying to send a direct message without specifying a recipient.
 msgid "No recipient specified."
 msgstr "მიმღები მითითებული არ არის."
 
+#. TRANS: Client error displayed trying to send a direct message to self.
 #. TRANS: Error text shown when trying to send a direct message to self.
-#: actions/newmessage.php:167 lib/command.php:517
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr "ნუ გაუგზავნი შეტყობინებას საკუთარ თავს; უბრალოდ ჩუმად ჩაუჩურჩულე."
 
-#: actions/newmessage.php:184
+#. TRANS: Page title after sending a direct message.
 msgid "Message sent"
 msgstr "შეტყობინება გაგზავნილია"
 
+#. TRANS: Confirmation text after sending a direct message.
+#. TRANS: %s is the direct message recipient.
 #. TRANS: Message given have sent a direct message to another user.
 #. TRANS: %s is the name of the other user.
-#: actions/newmessage.php:188 lib/command.php:525
 #, php-format
 msgid "Direct message to %s sent."
 msgstr "პირდაპირი შეტყობინება გაეგზავნა %s–ს."
 
-#: actions/newmessage.php:213 actions/newnotice.php:264
+#. TRANS: Page title after an AJAX error occurred on the "send direct message" page.
+#. TRANS: Page title after an AJAX error occurs on the send notice page.
 msgid "Ajax Error"
 msgstr "Ajax შეცდომა"
 
-#: actions/newnotice.php:69
+#. TRANS: Page title for sending a new notice.
 msgid "New notice"
 msgstr "ახალი შეტყობინება"
 
-#: actions/newnotice.php:230
+#. TRANS: Page title after sending a notice.
 msgid "Notice posted"
 msgstr "შეტყობინება დაიპოსტა"
 
 #. TRANS: Instructions for Notice search page.
 #. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/noticesearch.php:69
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -3899,20 +3210,17 @@ msgstr ""
 "ფრაზები სივრცით; საძიებო ფრაზა 3 სიმბოლოზე მეტი უნდა იყოს."
 
 #. TRANS: Title of the page where users can search for notices.
-#: actions/noticesearch.php:80
 msgid "Text search"
 msgstr "ტექსტური ძიება"
 
 #. TRANS: Test in RSS notice search.
 #. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearch.php:95
 #, php-format
 msgid "Search results for \"%1$s\" on %2$s"
 msgstr "\"%1$s\"–ს ძიების შედეგები %2$s–ზე"
 
 #. TRANS: Text for logged in users making a query for notices without results.
 #. TRANS: This message contains a Markdown link.
-#: actions/noticesearch.php:128
 #, php-format
 msgid ""
 "Be the first to [post on this topic](%%%%action.newnotice%%%%?"
@@ -3922,7 +3230,6 @@ msgstr ""
 
 #. TRANS: Text for not logged in users making a query for notices without results.
 #. TRANS: This message contains Markdown links.
-#: actions/noticesearch.php:133
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and be the first to "
@@ -3932,78 +3239,67 @@ msgstr ""
 "[დაპოსტავს](%%%%action.newnotice%%%%?status_textarea=%s)!"
 
 #. TRANS: RSS notice search feed title. %s is the query.
-#: actions/noticesearchrss.php:95
 #, php-format
 msgid "Updates with \"%s\""
 msgstr "განახლებები \"%s\"–თ"
 
 #. TRANS: RSS notice search feed description.
 #. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearchrss.php:99
 #, fuzzy, php-format
 msgid "Updates matching search term \"%1$s\" on %2$s."
 msgstr "განახლებები, რომლებიც შეიცავენ საძიებო სიტყვას \"%1$s\" %2$s–ზე!"
 
-#: actions/nudge.php:85
+#. TRANS: Client error displayed trying to nudge a user that cannot be nudged.
 msgid ""
 "This user doesn't allow nudges or hasn't confirmed or set their email "
 "address yet."
 msgstr ""
 
-#: actions/nudge.php:94
+#. TRANS: Page title after sending a nudge.
 msgid "Nudge sent"
 msgstr ""
 
-#: actions/nudge.php:97
+#. TRANS: Confirmation text after sending a nudge.
 msgid "Nudge sent!"
 msgstr ""
 
 #. TRANS: Message displayed to an anonymous user trying to view OAuth application list.
-#: actions/oauthappssettings.php:57
 msgid "You must be logged in to list your applications."
 msgstr "თქვენი აპლიკაციების სიის სანახავად საჭიროა ავროტიზაცია."
 
 #. TRANS: Page title for OAuth applications
-#: actions/oauthappssettings.php:73
 msgid "OAuth applications"
 msgstr "OAuth აპლიკაციები"
 
 #. TRANS: Page instructions for OAuth applications
-#: actions/oauthappssettings.php:85
 msgid "Applications you have registered"
 msgstr "თქვენს მიერ დარეგისტრირებული აპლიკაციები"
 
 #. TRANS: Empty list message on page with OAuth applications.
-#: actions/oauthappssettings.php:138
 #, php-format
 msgid "You have not registered any applications yet."
 msgstr "თქვენ ჯერჯერობით არცერთი აპლიკაცია არ დაგირეგისტრირებიათ."
 
 #. TRANS: Title for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:69
 msgid "Connected applications"
 msgstr "მიერთებული აპლიკაციები"
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:80
 msgid "The following connections exist for your account."
 msgstr ""
 
 #. TRANS: Client error when trying to revoke access for an application while not being a user of it.
-#: actions/oauthconnectionssettings.php:165
 msgid "You are not a user of that application."
 msgstr "თქვენ არ ხართ ამ აპლიკაციის მომხმარებელი."
 
 #. TRANS: Client error when revoking access has failed for some reason.
 #. TRANS: %s is the application ID revoking access failed for.
-#: actions/oauthconnectionssettings.php:180
 #, fuzzy, php-format
 msgid "Unable to revoke access for application: %s."
 msgstr "%s აპლიკაციის მიერ ზვდომის გაუქმება ვერ ხერხდება."
 
 #. TRANS: Success message after revoking access for an application.
 #. TRANS: %1$s is the application name, %2$s is the first part of the user token.
-#: actions/oauthconnectionssettings.php:199
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -4011,7 +3307,6 @@ msgid ""
 msgstr ""
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:210
 msgid "You have not authorized any applications to use your account."
 msgstr ""
 "თქვენ არცერთი აპლიკაციისთვის არ მიგიციათ თქვენი ანგარიშის გამოყენების უფლება."
@@ -4019,463 +3314,381 @@ msgstr ""
 #. TRANS: Note for developers in the OAuth connection settings form.
 #. TRANS: This message contains a Markdown link. Do not separate "](".
 #. TRANS: %s is the URL to the OAuth settings.
-#: actions/oauthconnectionssettings.php:230
 #, php-format
 msgid ""
 "Are you a developer? [Register an OAuth client application](%s) to use with "
 "this instance of StatusNet."
 msgstr ""
 
-#: actions/oembed.php:64
+#. TRANS: Server error displayed in oEmbed action when path not found.
+#. TRANS: %s is a path.
 #, fuzzy, php-format
 msgid "\"%s\" not found."
 msgstr "API მეთოდი ვერ მოიძებნა."
 
-#: actions/oembed.php:76
+#. TRANS: Server error displayed in oEmbed action when notice not found.
+#. TRANS: %s is a notice.
 #, fuzzy, php-format
 msgid "Notice %s not found."
 msgstr "API მეთოდი ვერ მოიძებნა."
 
-#: actions/oembed.php:80 actions/shownotice.php:100
+#. TRANS: Server error displayed in oEmbed action when notice has not profile.
 msgid "Notice has no profile."
 msgstr "შეტყობინებას პრფილი არ გააჩნია."
 
-#: actions/oembed.php:83 actions/shownotice.php:172
+#. TRANS: oEmbed title. %1$s is the author name, %2$s is the creation date.
 #, php-format
 msgid "%1$s's status on %2$s"
 msgstr "%1$s–ის სტატუსი %2$s–ზე"
 
-#: actions/oembed.php:95
+#. TRANS: Server error displayed in oEmbed action when attachment not found.
+#. TRANS: %d is an attachment ID.
 #, fuzzy, php-format
 msgid "Attachment %s not found."
 msgstr "მიმღები მომხმარებელი ვერ მოიძებნა."
 
-#: actions/oembed.php:136
+#. TRANS: Server error displayed in oEmbed request when a path is not supported.
+#. TRANS: %s is a path.
 #, php-format
 msgid "\"%s\" not supported for oembed requests."
 msgstr ""
 
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
-#: actions/oembed.php:168
 #, php-format
 msgid "Content type %s not supported."
 msgstr "შიგთავსის ტიპი %s არ არის მხარდაჭერილი."
 
 #. TRANS: Error message displaying attachments. %s is the site's base URL.
-#: actions/oembed.php:172
 #, php-format
 msgid "Only %s URLs over plain HTTP please."
 msgstr "გთხოვთ გამოიყენოთ მხოლოდ %s URL–ები წმინდა HTTP მეთოდით."
 
+#. TRANS: Server error displayed in oEmbed action when request specifies an unsupported data format.
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1207
-#: lib/apiaction.php:1234 lib/apiaction.php:1369
 msgid "Not a supported data format."
 msgstr "მონაცემთა ფორმატი მხარდაჭერილი არ არის."
 
 #. TRANS: ShortName in the OpenSearch interface when trying to find users.
-#: actions/opensearch.php:64
 msgid "People Search"
 msgstr "პიროვნებების ძიება"
 
-#: actions/opensearch.php:68
+#. TRANS: ShortName in the OpenSearch interface when trying to find notices.
 msgid "Notice Search"
 msgstr "შეტყობინებების ძიება"
 
 #. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
-#: actions/otp.php:70
 msgid "No user ID specified."
 msgstr "მომხმარებლის ID მითითებული არ არის."
 
 #. TRANS: Client error displayed trying to use "one time password login" without specifying a login token.
-#: actions/otp.php:86
 msgid "No login token specified."
 msgstr ""
 
 #. TRANS: Client error displayed trying to use "one time password login" without requesting a login token.
-#: actions/otp.php:94
 msgid "No login token requested."
 msgstr ""
 
 #. TRANS: Client error displayed trying to use "one time password login" while specifying an invalid login token.
-#: actions/otp.php:100
 msgid "Invalid login token specified."
 msgstr ""
 
 #. TRANS: Client error displayed trying to use "one time password login" while specifying an expired login token.
-#: actions/otp.php:110
 msgid "Login token expired."
 msgstr ""
 
 #. TRANS: Title for outbox for any but the fist page.
 #. TRANS: %1$s is the user nickname, %2$d is the page number.
-#: actions/outbox.php:57
 #, php-format
 msgid "Outbox for %1$s - page %2$d"
 msgstr "%1$s-ის გამავალი ფოსტა - გვერდი %2$d"
 
 #. TRANS: Title for first page of outbox.
-#: actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
 msgstr "%s-ის გამავალი ფოსტა"
 
 #. TRANS: Instructions for outbox.
-#: actions/outbox.php:103
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr ""
 "ეს არის თქვენი გამავალი ფოსტა, რომელშიც ჩამოთვლილია პირადი შეტყობინებები "
 "რომლებიც თქვენ გააგზავნეთ."
 
-#: actions/passwordsettings.php:58
 msgid "Change password"
 msgstr "შეცვალეთ პაროლი"
 
-#: actions/passwordsettings.php:69
 msgid "Change your password."
 msgstr "შეცვალეთ თქვენი პაროლი."
 
 #. TRANS: Fieldset legend for password reset form.
-#: actions/passwordsettings.php:96 actions/recoverpassword.php:251
 msgid "Password change"
 msgstr "პაროლის შეცვლა"
 
-#: actions/passwordsettings.php:104
 msgid "Old password"
 msgstr "ძველი პაროლი"
 
 #. TRANS: Field label for password reset form.
-#: actions/passwordsettings.php:108 actions/recoverpassword.php:256
 msgid "New password"
 msgstr "ახალი პაროლი"
 
-#: actions/passwordsettings.php:109 actions/register.php:416
 #, fuzzy
 msgid "6 or more characters."
 msgstr "6 ან მეტი სიმბოლო"
 
 #. TRANS: Ttile for field label for password reset form where the password has to be typed again.
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:264
-#: actions/register.php:420
 #, fuzzy
 msgid "Same as password above."
 msgstr "იგივე რაც ზედა პაროლი"
 
-#: actions/passwordsettings.php:117
 msgid "Change"
 msgstr "შეცვლა"
 
-#: actions/passwordsettings.php:153 actions/register.php:223
 msgid "Password must be 6 or more characters."
 msgstr "პაროლი უნდა შედგებოდეს 6 ან მეტი სიმბოლოსგან."
 
-#: actions/passwordsettings.php:156 actions/register.php:226
 msgid "Passwords don't match."
 msgstr "პაროლები არ ემთხვევა."
 
-#: actions/passwordsettings.php:164
 msgid "Incorrect old password"
 msgstr "არასწორი ძველი პაროლი"
 
-#: actions/passwordsettings.php:180
 msgid "Error saving user; invalid."
 msgstr "შეცდომა მომხმარებლის შენახვისას; არასწორი."
 
 #. TRANS: Reset password form validation error message.
-#: actions/passwordsettings.php:185 actions/recoverpassword.php:418
 #, fuzzy
 msgid "Cannot save new password."
 msgstr "ვერ ვინახავ ახალ პაროლს."
 
-#: actions/passwordsettings.php:191
 msgid "Password saved."
 msgstr "პაროლი შენახულია."
 
 #. TRANS: Title for Paths admin panel.
 #. TRANS: Menu item for site administration
-#: actions/pathsadminpanel.php:58 lib/adminpanelaction.php:371
 msgid "Paths"
 msgstr "გზები"
 
 #. TRANS: Form instructions for Path admin panel.
-#: actions/pathsadminpanel.php:69
 msgid "Path and server settings for this StatusNet site"
 msgstr ""
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the directory that could not be read from.
-#: actions/pathsadminpanel.php:155
 #, php-format
 msgid "Theme directory not readable: %s."
 msgstr "იერსახის დირექტორია არ არის წაკითხვადი: %s."
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the avatar directory that could not be written to.
-#: actions/pathsadminpanel.php:163
 #, php-format
 msgid "Avatar directory not writable: %s."
 msgstr "ავატარის დირექტორია არ არის ჩაწერადი: %s."
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the background directory that could not be written to.
-#: actions/pathsadminpanel.php:171
 #, php-format
 msgid "Background directory not writable: %s."
 msgstr "ფონის დირექტორია არ არის ჩაწერადი: %s."
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the locales directory that could not be read from.
-#: actions/pathsadminpanel.php:181
 #, php-format
 msgid "Locales directory not readable: %s."
 msgstr ""
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the SSL server URL that is too long.
-#: actions/pathsadminpanel.php:189
 msgid "Invalid SSL server. The maximum length is 255 characters."
 msgstr "არასწორი SSL სერვერი. მაქსიმალური სიგრძე არის 255 სიმბოლო."
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:235 actions/siteadminpanel.php:58
 msgid "Site"
 msgstr "საიტი"
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:241 actions/pathsadminpanel.php:279
-#: actions/pathsadminpanel.php:370 actions/pathsadminpanel.php:425
 msgid "Server"
 msgstr "სერვერი"
 
-#: actions/pathsadminpanel.php:242
 msgid "Site's server hostname."
 msgstr "საიტის სერვერის ჰოსტის სახელი."
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:248 actions/pathsadminpanel.php:288
-#: actions/pathsadminpanel.php:379 actions/pathsadminpanel.php:434
 msgid "Path"
 msgstr "გზა"
 
-#: actions/pathsadminpanel.php:249
 #, fuzzy
 msgid "Site path."
 msgstr "საიტის გზა"
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:255
 #, fuzzy
 msgid "Locale directory"
 msgstr "იერსახის დირექტორია"
 
-#: actions/pathsadminpanel.php:256
 msgid "Directory path to locales."
 msgstr ""
 
 #. TRANS: Checkbox label in Paths admin panel.
-#: actions/pathsadminpanel.php:263
 msgid "Fancy URLs"
 msgstr "ლამაზი URL–ები"
 
-#: actions/pathsadminpanel.php:265
 msgid "Use fancy (more readable and memorable) URLs?"
 msgstr "გამოვიყენო ლამაზი (მეტად კითხვადი და დასამახსოვრებელი) URL–ები?"
 
-#: actions/pathsadminpanel.php:272
 msgid "Theme"
 msgstr "იერსახე"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:281
 #, fuzzy
 msgid "Server for themes."
 msgstr "იერსახე ამ საიტისთვის"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:290
 msgid "Web path to themes."
 msgstr ""
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:297 actions/pathsadminpanel.php:388
-#: actions/pathsadminpanel.php:443 actions/pathsadminpanel.php:495
 msgid "SSL server"
 msgstr "SSL სერვერი"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:299
 msgid "SSL server for themes (default: SSL server)."
 msgstr ""
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:306 actions/pathsadminpanel.php:397
-#: actions/pathsadminpanel.php:452
 #, fuzzy
 msgid "SSL path"
 msgstr "საიტის გზა"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:308
 msgid "SSL path to themes (default: /theme/)."
 msgstr ""
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:315 actions/pathsadminpanel.php:406
-#: actions/pathsadminpanel.php:461
 #, fuzzy
 msgid "Directory"
 msgstr "იერსახის დირექტორია"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:317
 msgid "Directory where themes are located."
 msgstr ""
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:326
 msgid "Avatars"
 msgstr "ავატარები"
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:333
 msgid "Avatar server"
 msgstr "ავატარების სერვერი"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:335
 #, fuzzy
 msgid "Server for avatars."
 msgstr "იერსახე ამ საიტისთვის"
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:342
 msgid "Avatar path"
 msgstr "ავატარების გზა"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:344
 #, fuzzy
 msgid "Web path to avatars."
 msgstr "ავატარის განახლება ვერ მოხერხდა."
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:351
 msgid "Avatar directory"
 msgstr "ავატარების დირექტორია"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:353
 msgid "Directory where avatars are located."
 msgstr ""
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:364
 msgid "Backgrounds"
 msgstr "ფონები"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:372
 #, fuzzy
 msgid "Server for backgrounds."
 msgstr "იერსახე ამ საიტისთვის"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:381
 msgid "Web path to backgrounds."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:390
 msgid "Server for backgrounds on SSL pages."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:399
 msgid "Web path to backgrounds on SSL pages."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:408
 msgid "Directory where backgrounds are located."
 msgstr ""
 
 #. TRANS: Fieldset legens in Paths admin panel.
-#: actions/pathsadminpanel.php:419
 msgid "Attachments"
 msgstr "მიმაგრებები"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:427
 #, fuzzy
 msgid "Server for attachments."
 msgstr "იერსახე ამ საიტისთვის"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:436
 #, fuzzy
 msgid "Web path to attachments."
 msgstr "მიმაგრებული დოკუმენტი არ არის."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:445
 #, fuzzy
 msgid "Server for attachments on SSL pages."
 msgstr "იერსახე ამ საიტისთვის"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:454
 msgid "Web path to attachments on SSL pages."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:463
 msgid "Directory where attachments are located."
 msgstr ""
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:472
 msgid "SSL"
 msgstr "SSL"
 
 #. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
-#: actions/pathsadminpanel.php:477 actions/snapshotadminpanel.php:202
 msgid "Never"
 msgstr "არასდროს"
 
 #. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
-#: actions/pathsadminpanel.php:479
 msgid "Sometimes"
 msgstr "ზოგჯერ"
 
 #. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
-#: actions/pathsadminpanel.php:481
 msgid "Always"
 msgstr "მუდამ"
 
-#: actions/pathsadminpanel.php:485
 msgid "Use SSL"
 msgstr "გამოიყენე SSL"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:487
 #, fuzzy
 msgid "When to use SSL."
 msgstr "როდის გამოვიყენო SSL"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:497
 #, fuzzy
 msgid "Server to direct SSL requests to."
 msgstr "სერვერი რომელზეც მიემართოს SSL მოთხოვნები"
 
 #. TRANS: Button title text to store form data in the Paths admin panel.
-#: actions/pathsadminpanel.php:514
 msgid "Save paths"
 msgstr "გზების დამახსოვრება"
 
 #. TRANS: Instructions for the "People search" page.
 #. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/peoplesearch.php:54
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
@@ -4486,58 +3699,47 @@ msgstr ""
 "იყოს."
 
 #. TRANS: Title of a page where users can search for other users.
-#: actions/peoplesearch.php:61
 msgid "People search"
 msgstr "პიროვნებების ძიება"
 
-#: actions/peopletag.php:68
 #, php-format
 msgid "Not a valid people tag: %s."
 msgstr "პიროვნებების არასწორი სანიშნე: %s."
 
-#: actions/peopletag.php:142
 #, php-format
 msgid "Users self-tagged with %1$s - page %2$d"
 msgstr ""
 "მომხმარებლები რომლებმაც საკუთარი თავი მონიშნეს როგორც %1$s – გვერდი %2$d"
 
 #. TRANS: Page title for AJAX form return when a disabling a plugin.
-#: actions/plugindisable.php:69
 msgctxt "plugin"
 msgid "Disabled"
 msgstr ""
 
 #. TRANS: Client error displayed trying to perform any request method other than POST.
 #. TRANS: Do not translate POST.
-#: actions/pluginenable.php:78 actions/subscribe.php:77
 msgid "This action only accepts POST requests."
 msgstr "ეს მოქმედება მხოლოდ POST მოთხოვნებს იღებს."
 
-#: actions/pluginenable.php:102
 #, fuzzy
 msgid "You cannot administer plugins."
 msgstr "თქვენ ვერ შეძლებთ მომხმარებლების წაშლას."
 
-#: actions/pluginenable.php:109
 #, fuzzy
 msgid "No such plugin."
 msgstr "ასეთი გვერდი არ არსებობს."
 
 #. TRANS: Page title for AJAX form return when enabling a plugin.
-#: actions/pluginenable.php:159
 msgctxt "plugin"
 msgid "Enabled"
 msgstr ""
 
 #. TRANS: Tab and title for plugins admin panel.
 #. TRANS: Menu item for site administration
-#: actions/pluginsadminpanel.php:56 actions/version.php:191
-#: lib/adminpanelaction.php:411
 msgid "Plugins"
 msgstr "დამატებები"
 
 #. TRANS: Instructions at top of plugin admin page.
-#: actions/pluginsadminpanel.php:68
 msgid ""
 "Additional plugins can be enabled and configured manually. See the <a href="
 "\"http://status.net/wiki/Plugins\">online plugin documentation</a> for more "
@@ -4545,32 +3747,26 @@ msgid ""
 msgstr ""
 
 #. TRANS: Admin form section header
-#: actions/pluginsadminpanel.php:84
 #, fuzzy
 msgid "Default plugins"
 msgstr "პირვანდელი ენა"
 
-#: actions/pluginsadminpanel.php:106
 msgid ""
 "All default plugins have been disabled from the site's configuration file."
 msgstr ""
 
-#: actions/postnotice.php:95
 msgid "Invalid notice content."
 msgstr "შეტყობინების არასწორი შიგთავსი."
 
-#: actions/postnotice.php:101
 #, php-format
 msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’."
 msgstr "შეტყობინების ლიცენზია ‘%1$s’ შეუთავსებელია საიტის ლიცენზიასთან ‘%2$s’."
 
 #. TRANS: Page title for profile settings.
-#: actions/profilesettings.php:60
 msgid "Profile settings"
 msgstr "პროფილის პარამეტრები"
 
 #. TRANS: Usage instructions for profile settings.
-#: actions/profilesettings.php:71
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
@@ -4578,31 +3774,24 @@ msgstr ""
 "თქვენს შესახებ."
 
 #. TRANS: Profile settings form legend.
-#: actions/profilesettings.php:99
 msgid "Profile information"
 msgstr "ინფორმაცია პროფილზე"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:110 actions/register.php:412
 #, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr "1–64 პატარა ასოები ან ციფრები. პუნქტუაციები ან სივრცეები დაუშვებელია"
 
 #. TRANS: Field label in form for profile settings.
-#: actions/profilesettings.php:114 actions/register.php:434
-#: lib/groupeditform.php:150
 msgid "Full name"
 msgstr "სრული სახელი"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:119 actions/register.php:439
-#: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "ვებ. გვერსი"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:122 actions/register.php:441
 #, fuzzy
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr "თქვენი ვებ. გვერდის URL, ბლოგი, ან პროფილი სხვა საიტზე"
@@ -4610,48 +3799,37 @@ msgstr "თქვენი ვებ. გვერდის URL, ბლოგი
 #. TRANS: Tooltip for field label in form for profile settings. Plural
 #. TRANS: is decided by the number of characters available for the
 #. TRANS: biography (%d).
-#: actions/profilesettings.php:130 actions/register.php:450
 #, fuzzy, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
 msgstr[0] "აღწერეთ საკუთარი თავი და თქვენი ინტერესები %d სიმბოლოთი"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:136 actions/register.php:455
 msgid "Describe yourself and your interests"
 msgstr "აღწერეთ საკუთარი თავი და თქვენი ინტერესები"
 
 #. TRANS: Text area label in form for profile settings where users can provide.
 #. TRANS: their biography.
-#: actions/profilesettings.php:140 actions/register.php:457
 msgid "Bio"
 msgstr "ბიოგრაფია"
 
 #. TRANS: Field label in form for profile settings.
-#: actions/profilesettings.php:146 actions/register.php:462
-#: lib/groupeditform.php:173
 msgid "Location"
 msgstr "მდებარეობა"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:149
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "რომელ ქალაქში, რეგიონში, ქვეყანაში ხართ?"
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:154
 msgid "Share my current location when posting notices"
 msgstr "გააზიარე ჩემი მდებარეობა შეტყობინებების დაპოსტვისას"
 
 #. TRANS: Field label in form for profile settings.
-#: actions/profilesettings.php:162 actions/tagother.php:128
-#: actions/tagother.php:188 lib/subscriptionlist.php:104
-#: lib/subscriptionlist.php:106
 msgid "Tags"
 msgstr "სანიშნეები"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:165
 #, fuzzy
 msgid ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- "
@@ -4661,28 +3839,23 @@ msgstr ""
 "სივრცით"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:170
 msgid "Language"
 msgstr "ენა"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:172
 #, fuzzy
 msgid "Preferred language."
 msgstr "სასურველი ენა"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:182
 msgid "Timezone"
 msgstr "დროის სარტყელი"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:184
 msgid "What timezone are you normally in?"
 msgstr "რომელ დროის სარტყელში ხართ ხომლე ჩვეულებრივ?"
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:190
 #, fuzzy
 msgid ""
 "Automatically subscribe to whoever subscribes to me (best for non-humans)."
@@ -4692,92 +3865,75 @@ msgstr ""
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Plural form is used based on the maximum number of allowed
 #. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:259 actions/register.php:214
 #, fuzzy, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
 msgstr[0] "ბიოგრაფია ძალიან გრძელია (არაუმეტეს %d სიმბოლო)."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:270 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr "დროის სარტყელი არ არის არჩეული."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:278
 #, fuzzy
 msgid "Language is too long (maximum 50 characters)."
 msgstr "ენა ძალიან გრძელია (არაუმეტეს 50 სიმბოლო)."
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:292
 #, fuzzy, php-format
 msgid "Invalid tag: \"%s\"."
 msgstr "არასწორი სანიშნე: \"%s\""
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:348
 #, fuzzy
 msgid "Could not update user for autosubscribe."
 msgstr "მომხმარებლის განახლება ავტოგამოწერისათვის ვერ მოხერხდა."
 
 #. TRANS: Server error thrown when user profile location preference settings could not be updated.
-#: actions/profilesettings.php:406
 #, fuzzy
 msgid "Could not save location prefs."
 msgstr "მდებარეობის პარამეტრების შენახვა ვერ მოხერხდა."
 
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:428 actions/tagother.php:179
 msgid "Could not save tags."
 msgstr "სანიშნეების შენახვა ვერ მოხერხდა."
 
 #. TRANS: Confirmation shown when user profile settings are saved.
 #. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:437 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "პარამეტრები შენახულია."
 
 #. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
 #. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:484 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "გახსენი ანგარიში"
 
-#: actions/public.php:83
 #, php-format
 msgid "Beyond the page limit (%s)."
 msgstr "გვერსიდ საზღვრის მიღმა (%s)."
 
-#: actions/public.php:92
 msgid "Could not retrieve public stream."
 msgstr "საჯარო ნაკადის გამოთხოვნა ვერ ხერხდება."
 
-#: actions/public.php:130
 #, php-format
 msgid "Public timeline, page %d"
 msgstr "საჯარო განახლებების ნაკადი, გვერდი %d"
 
-#: actions/public.php:132 lib/publicgroupnav.php:79
 msgid "Public timeline"
 msgstr "საჯარო განახლებების ნაკადი"
 
-#: actions/public.php:160
 msgid "Public Stream Feed (RSS 1.0)"
 msgstr ""
 
-#: actions/public.php:164
 msgid "Public Stream Feed (RSS 2.0)"
 msgstr ""
 
-#: actions/public.php:168
 msgid "Public Stream Feed (Atom)"
 msgstr ""
 
-#: actions/public.php:188
 #, php-format
 msgid ""
 "This is the public timeline for %%site.name%% but no one has posted anything "
@@ -4785,17 +3941,14 @@ msgid ""
 msgstr ""
 "ეს არის საჯარო განახლებების ნაკადი, მაგრამ ჯერჯერობით არავის დაუპოსტავს."
 
-#: actions/public.php:191
 msgid "Be the first to post!"
 msgstr "დაპოსტე პირველმა!"
 
-#: actions/public.php:195
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post!"
 msgstr "[დარეგისტრირდი](%%action.register%%) და დაპოსტე პირველმა!"
 
-#: actions/public.php:242
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -4808,7 +3961,6 @@ msgstr ""
 "[შემოგვიერთდი ახლავე](%%action.register%%) და გაუზიარე შეტყობინებები "
 "მეგობრებს, ოჯახის წევრებს და კოლეგებს! ([გაიგე მეტი](%%doc.help%%))"
 
-#: actions/public.php:247
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -4819,19 +3971,16 @@ msgstr ""
 "blogging) სერვისი, დაფუძნებული უფასო [StatusNet](http://status.net/) კოდზე."
 
 #. TRANS: Public RSS feed description. %s is the StatusNet site name.
-#: actions/publicrss.php:106
 #, fuzzy, php-format
 msgid "%s updates from everyone."
 msgstr "%s განახლებები ყველასგან!"
 
 #. TRANS: Title for public tag cloud.
-#: actions/publictagcloud.php:57
 msgid "Public tag cloud"
 msgstr "საჯარო სანიშნეების ღრუბელი."
 
 #. TRANS: Instructions (more used like an explanation/header).
 #. TRANS: %s is the StatusNet sitename.
-#: actions/publictagcloud.php:65
 #, fuzzy, php-format
 msgid "These are most popular recent tags on %s"
 msgstr "ეს არის ყველაზე პოპულარული სანიშნეები %s–ზე "
@@ -4839,14 +3988,12 @@ msgstr "ეს არის ყველაზე პოპულარული
 #. TRANS: This message contains a Markdown URL. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.
-#: actions/publictagcloud.php:74
 #, php-format
 msgid "No one has posted a notice with a [hashtag](%%doc.tags%%) yet."
 msgstr "ჯერჯერობით არავის დაუპოსტავს შეტყობინება [hashtag](%%doc.tags%%)–ით."
 
 #. 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.
-#: actions/publictagcloud.php:79
 msgid "Be the first to post one!"
 msgstr "დაპოსტე პირველმა!"
 
@@ -4855,7 +4002,6 @@ msgstr "დაპოსტე პირველმა!"
 #. TRANS: This message contains a Markdown URL. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.
-#: actions/publictagcloud.php:87
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post "
@@ -4863,43 +4009,35 @@ msgid ""
 msgstr "[დარეგისტრირდი](%%action.register%%) და დაპოსტე პირველმა!"
 
 #. TRANS: Client error displayed trying to recover password while already logged in.
-#: actions/recoverpassword.php:37
 msgid "You are already logged in!"
 msgstr "თქვენ უკვე ავტორიზირებული ხართ!"
 
 #. TRANS: Client error displayed when password recovery code is not correct.
-#: actions/recoverpassword.php:64
 msgid "No such recovery code."
 msgstr "ასეთი აღსადგენი კოდი არ არსებობს."
 
 #. TRANS: Client error displayed when no proper password recovery code was submitted.
-#: actions/recoverpassword.php:69
 msgid "Not a recovery code."
 msgstr "ეს არ არის აღსადგენი კოდი."
 
 #. TRANS: Server error displayed trying to recover password without providing a user.
-#: actions/recoverpassword.php:77
 msgid "Recovery code for unknown user."
 msgstr "აღსადგენი კოდი უცნობი მომხმარებლისთვის."
 
 #. TRANS: Server error displayed removing a password recovery code from the database.
-#: actions/recoverpassword.php:91
 msgid "Error with confirmation code."
 msgstr "სადასტურე კოდს შეცდომა აქვს."
 
 #. TRANS: Client error displayed trying to recover password with too old a recovery code.
-#: actions/recoverpassword.php:103
 msgid "This confirmation code is too old. Please start again."
 msgstr "სადასტურე კოდი ძალიან გრძელია. გთხოვთ ხელახლა დაიწყოთ."
 
 #. TRANS: Server error displayed when updating a user's e-mail address in the database fails while recovering a password.
-#: actions/recoverpassword.php:118
 msgid "Could not update user with confirmed email address."
 msgstr ""
 "მომხმარებლის განახლება დადასტურებული ელ. ფოსტის მისამართით ვერ მოხერხდა."
 
 #. TRANS: Page notice for password recovery page.
-#: actions/recoverpassword.php:160
 msgid ""
 "If you have forgotten or lost your password, you can get a new one sent to "
 "the email address you have stored in your account."
@@ -4907,100 +4045,82 @@ msgstr ""
 "თუ დაგავიწყდათ, ან დაკარგეთ თქვენი პაროლი, შეგიძლიათ მიიღოთ ახალი, თქვენს "
 "ანგარიშში მითითებულ ელ. ფოსტის მისამართზე."
 
-#: actions/recoverpassword.php:167
 msgid "You have been identified. Enter a new password below."
 msgstr "თქვენ იდენტიფიცირებული ხართ, შეიყვანეთ ახალი პაროლი ქვევით."
 
 #. TRANS: Fieldset legend for password recovery page.
-#: actions/recoverpassword.php:198
 msgid "Password recovery"
 msgstr "პაროლის აღდგენა"
 
 #. TRANS: Field label on password recovery page.
-#: actions/recoverpassword.php:202
 msgid "Nickname or email address"
 msgstr "მეტსახელი ან ელ. ფოსტის მისამართი"
 
 #. TRANS: Title for field label on password recovery page.
-#: actions/recoverpassword.php:205
 msgid "Your nickname on this server, or your registered email address."
 msgstr "თქვენი მეტსახელი ამ სერვერზე, ან რეგისტრირებული ელ. ფოსტის მისამართი."
 
 #. TRANS: Field label on password recovery page.
-#: actions/recoverpassword.php:212
 msgid "Recover"
 msgstr "აღდგენა"
 
 #. TRANS: Button text on password recovery page.
-#: actions/recoverpassword.php:214
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Recover"
 msgstr "აღდგენა"
 
 #. TRANS: Title for password recovery page in password reset mode.
-#: actions/recoverpassword.php:223
 msgid "Reset password"
 msgstr "პაროლის გადაყენება"
 
 #. TRANS: Title for password recovery page in password recover mode.
-#: actions/recoverpassword.php:225
 msgid "Recover password"
 msgstr "პაროლის აღდგენა"
 
 #. TRANS: Title for password recovery page in email sent mode.
 #. TRANS: Subject for password recovery e-mail.
-#: actions/recoverpassword.php:227 actions/recoverpassword.php:366
 msgid "Password recovery requested"
 msgstr "პაროლის აღდგენა მოთხოვნილია"
 
 #. TRANS: Title for password recovery page in password saved mode.
-#: actions/recoverpassword.php:229
 #, fuzzy
 msgid "Password saved"
 msgstr "პაროლი შენახულია."
 
 #. TRANS: Title for password recovery page when an unknown action has been specified.
-#: actions/recoverpassword.php:232
 msgid "Unknown action"
 msgstr "უცნობი მოქმედება"
 
 #. TRANS: Title for field label for password reset form.
-#: actions/recoverpassword.php:258
 #, fuzzy
 msgid "6 or more characters, and do not forget it!"
 msgstr "6 ან მეტი სიმბოლო, და არ დაგავიწყდეთ!"
 
 #. TRANS: Button text for password reset form.
 #. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: actions/recoverpassword.php:268 lib/designform.php:145
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Reset"
 msgstr "გადაყენება"
 
 #. TRANS: Form instructions for password recovery form.
-#: actions/recoverpassword.php:278
 msgid "Enter a nickname or email address."
 msgstr "შეიყვანეთ მეტსახელი ან ელ. ფოსტის მისამართი."
 
 #. TRANS: Information on password recovery form if no known username or e-mail address was specified.
-#: actions/recoverpassword.php:309
 msgid "No user with that email address or username."
 msgstr "ასეთი ელ. ფოსტის მისამართით ან სახელით არ არსებობს."
 
 #. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
-#: actions/recoverpassword.php:327
 msgid "No registered email address for that user."
 msgstr "ამ მომხმარებლისთვის ვერ მოიძებნა რეგისტრირებული ელ. ფოსტის მისამართი."
 
 #. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
-#: actions/recoverpassword.php:342
 msgid "Error saving address confirmation."
 msgstr "მისამართის დადასტურების სენახვისას მოხდა შეცდომა."
 
 #. TRANS: User notification after an e-mail with instructions was sent from the password recovery form.
-#: actions/recoverpassword.php:370
 msgid ""
 "Instructions for recovering your password have been sent to the email "
 "address registered to your account."
@@ -5009,74 +4129,58 @@ msgstr ""
 "ფოსტაზე."
 
 #. TRANS: Client error displayed when trying to reset as password without providing a user.
-#: actions/recoverpassword.php:391
 msgid "Unexpected password reset."
 msgstr "პაროლის მოულოდნელი გადაყენება."
 
 #. TRANS: Reset password form validation error message.
-#: actions/recoverpassword.php:400
 #, fuzzy
 msgid "Password must be 6 characters or more."
 msgstr "პაროლი უნდა შედგებოდეს 6 ან მეტი სიმბოლოსგან."
 
 #. TRANS: Reset password form validation error message.
-#: actions/recoverpassword.php:405
 msgid "Password and confirmation do not match."
 msgstr "პაროლი და დასტური არ ემთხვევა."
 
 #. TRANS: Server error displayed when something does wrong with the user object during password reset.
-#: actions/recoverpassword.php:426 actions/register.php:241
 msgid "Error setting user."
 msgstr "მომხმარებელის დაყენებისას მოხდა შეცდომა."
 
 #. TRANS: Success message for user after password reset.
-#: actions/recoverpassword.php:434
 msgid "New password successfully saved. You are now logged in."
 msgstr "ახალი პაროლი წარმატებით იქნა შენახული. თქვენ ახლა ავტორიზირებული ხართ."
 
-#: actions/redirecturl.php:70
 msgid "No id parameter"
 msgstr ""
 
-#: actions/redirecturl.php:76
 #, fuzzy, php-format
 msgid "No such file \"%d\""
 msgstr "ასეთი ფაილი არ არსებობს."
 
-#: actions/register.php:80 actions/register.php:181 actions/register.php:392
 msgid "Sorry, only invited people can register."
 msgstr "ბოდიშს გიხდით, დარეგისტრირება მხოლოდ მოწვევითაა შესაძლებელი."
 
-#: actions/register.php:87
 msgid "Sorry, invalid invitation code."
 msgstr "ბოდიშს გიხდით, მოსაწვევი კოდი არასწორია."
 
-#: actions/register.php:106
 msgid "Registration successful"
 msgstr "რეგისტრაცია წარმატებით დასრულდა"
 
-#: actions/register.php:108 actions/register.php:490
 msgid "Register"
 msgstr "რეგისტრაცია"
 
-#: actions/register.php:128
 msgid "Registration not allowed."
 msgstr "რეგისტრაცია არ არის დაშვებული."
 
-#: actions/register.php:194
 #, fuzzy
 msgid "You cannot register if you don't agree to the license."
 msgstr "ვერ დარეგისტრირდებით თუ არ დაეთანხმებით ლიცენზიის პირობებს."
 
-#: actions/register.php:203
 msgid "Email address already exists."
 msgstr "ელ. ფოსტის მისამართი უკვე არსებობს."
 
-#: actions/register.php:236 actions/register.php:258
 msgid "Invalid username or password."
 msgstr "არასწორი მომხმარებლის სახელი ან პაროლი."
 
-#: actions/register.php:333
 #, fuzzy
 msgid ""
 "With this form you can create a new account. You can then post notices and "
@@ -5085,28 +4189,22 @@ msgstr ""
 "ამ ფორმით შეგიძლიათ შექმნათ ახალი ანგარიში. შემდგომ შეძლებთ შეტყობინებების "
 "დაპოსტვას და მეგობრებთან და კოლეგებთან ურთიერთობას. "
 
-#: actions/register.php:424 actions/register.php:428
-#: actions/siteadminpanel.php:238 lib/settingsnav.php:92
 msgid "Email"
 msgstr "ელ. ფოსტა"
 
-#: actions/register.php:425 actions/register.php:429
 #, fuzzy
 msgid "Used only for updates, announcements, and password recovery."
 msgstr ""
 "გამოიყენება მხოლოდ განახლებებისთვის, განცხადებებისთვის და პაროლის აღსადგენად"
 
-#: actions/register.php:436
 #, fuzzy
 msgid "Longer name, preferably your \"real\" name."
 msgstr "გრძელი სახელი, სასურველია თქვენი ნამდვილი სახელი"
 
-#: actions/register.php:464
 #, fuzzy
 msgid "Where you are, like \"City, State (or Region), Country\"."
 msgstr "რომელ ქალაქში, რეგიონში, ქვეყანაში ხართ?"
 
-#: actions/register.php:503
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
@@ -5114,23 +4212,19 @@ msgstr ""
 "მე ვაცნობიერებ, რომ %1$s–ის შიგთავსი და მონაცემები არის პირადული და "
 "კონციდენციალური."
 
-#: actions/register.php:513
 #, php-format
 msgid "My text and files are copyright by %1$s."
 msgstr "ჩემი ტექსტის და ფაილების საავტორო უფლება ეკუტვნის %1$s–ს."
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:517
 msgid "My text and files remain under my own copyright."
 msgstr "ჩემი ტექსტი და ფაილები ჩემივე საკუთრებაა."
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:520
 msgid "All rights reserved."
 msgstr "ყველა უფლება დაცულია."
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:525
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -5139,7 +4233,6 @@ msgstr ""
 "ჩემი ტექსტი და ფაილები ხელმისაწვდომია %s–ით, გარდა ამ პირადი ინფორმაციისა: "
 "პაროლი, ელ. ფოსტის მისამართი, IM მისამართი და ტელეფონის ნომერი."
 
-#: actions/register.php:566
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -5172,7 +4265,6 @@ msgstr ""
 "\n"
 "გმადლობთ რომ დარეგისტრირდით. იმედი გვაქვს ისიამოვნებთ ამ სერვისით."
 
-#: actions/register.php:590
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5180,7 +4272,6 @@ msgstr ""
 "(თქვენ უნდა მიიღოს ელ. წერილი მომენტალურად. ინსტრუქციებით, თუ როგორ "
 "დაადასტუროთ თქვენი ელ. ფოსტის მისამართი.)"
 
-#: actions/remotesubscribe.php:97
 #, php-format
 msgid ""
 "To subscribe, you can [login](%%action.login%%), or [register](%%action."
@@ -5192,112 +4283,87 @@ msgstr ""
 "ანგარიში [თავსებად მიკრობლოგინგის საიტზე](%%doc.openmublog%%), მაშინ "
 "შეიყვანეთ თქვენი პროფილის URL ქვევით."
 
-#: actions/remotesubscribe.php:111
 msgid "Remote subscribe"
 msgstr "დაშორებული გამოწერა"
 
-#: actions/remotesubscribe.php:123
 msgid "Subscribe to a remote user"
 msgstr "გამოიწერე დაშორებული მომხმარებელი"
 
-#: actions/remotesubscribe.php:128
 msgid "User nickname"
 msgstr "მომხმარებლის მეტსახელი"
 
-#: actions/remotesubscribe.php:129
 #, fuzzy
 msgid "Nickname of the user you want to follow."
 msgstr "მომხმარებლის მეტსახელი რომელსაც გინდათ რომ მიჰყვეთ"
 
-#: actions/remotesubscribe.php:132
 msgid "Profile URL"
 msgstr "პროფილის URL"
 
-#: actions/remotesubscribe.php:133
 #, fuzzy
 msgid "URL of your profile on another compatible microblogging service."
 msgstr "თქვენი პროფილის URL სხვა თავსებად მიკრობლოგინგის სერვისზე"
 
 #. TRANS: Link text for link that will subscribe to a remote profile.
-#: actions/remotesubscribe.php:136 lib/subscribeform.php:139
-#: lib/userprofile.php:402
 msgid "Subscribe"
 msgstr "გამოწერა"
 
-#: actions/remotesubscribe.php:158
 #, fuzzy
 msgid "Invalid profile URL (bad format)."
 msgstr "პროფილის არასწორი URL (ცუდი ფორმატი)"
 
-#: actions/remotesubscribe.php:167
 msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
 msgstr ""
 "ეს არ არის პროფილის სწორი URL (YADIS დოკუმენტი არ არის, ან არასწორი XRDS–ა "
 "განსაზღვრული)."
 
-#: actions/remotesubscribe.php:175
 #, fuzzy
 msgid "That is a local profile! Login to subscribe."
 msgstr "ეს ადგილობრივი პროფილია! შედით რომ გამოიწეროთ."
 
-#: actions/remotesubscribe.php:182
 #, fuzzy
 msgid "Could not get a request token."
 msgstr "შეტყობინების ჩასმა ვერ მოხერხდა."
 
-#: actions/repeat.php:56
 msgid "Only logged-in users can repeat notices."
 msgstr "მხოლოდ ავტორიზირებულ მომხმარებლებს შეუძლიათ შეტყობინებების გამეორება."
 
-#: actions/repeat.php:63 actions/repeat.php:70
 msgid "No notice specified."
 msgstr "შეტყობინება მითითებული არ არის."
 
-#: actions/repeat.php:75
 #, fuzzy
 msgid "You cannot repeat your own notice."
 msgstr "საკუთარი შეტყობინების გამეორება არ შეიძლება."
 
-#: actions/repeat.php:89
 msgid "You already repeated that notice."
 msgstr "თქვენ უკვე გაიმეორეთ ეს შეტყობინება."
 
-#: actions/repeat.php:112 lib/noticelist.php:697
 msgid "Repeated"
 msgstr "გამეორებული"
 
-#: actions/repeat.php:117
 msgid "Repeated!"
 msgstr "გამეორებული!"
 
 #. TRANS: RSS reply feed title. %s is a user nickname.
-#: actions/replies.php:126 actions/repliesrss.php:68
-#: lib/personalgroupnav.php:105
 #, php-format
 msgid "Replies to %s"
 msgstr "პასუხები %s–ს"
 
-#: actions/replies.php:128
 #, php-format
 msgid "Replies to %1$s, page %2$d"
 msgstr "პასუხები %1$s–ს, გვერდი %2$d"
 
-#: actions/replies.php:145
 #, php-format
 msgid "Replies feed for %s (RSS 1.0)"
 msgstr ""
 
-#: actions/replies.php:152
 #, php-format
 msgid "Replies feed for %s (RSS 2.0)"
 msgstr ""
 
-#: actions/replies.php:159
 #, php-format
 msgid "Replies feed for %s (Atom)"
 msgstr ""
 
-#: actions/replies.php:199
 #, php-format
 msgid ""
 "This is the timeline showing replies to %1$s but %2$s hasn't received a "
@@ -5306,7 +4372,6 @@ msgstr ""
 "ეს არის პასუხების ნაკადი %1$s–სთვის, მაგრამ %2$s–ს ჯერ არ მიუღია შეტყობინება "
 "მათ შესახებ."
 
-#: actions/replies.php:204
 #, php-format
 msgid ""
 "You can engage other users in a conversation, subscribe to more people or "
@@ -5315,7 +4380,6 @@ msgstr ""
 "თქვენ შეგიძლიათ ჩაერთოთ საუბარში სხვა მომხმარებლებთან ერთად, გამოიწეროთ მეტი "
 "პიროვნებების განახლებები, ან [გაწევრიანდეთ ჯგუფში](%%action.groups%%)."
 
-#: actions/replies.php:206
 #, php-format
 msgid ""
 "You can try to [nudge %1$s](../%2$s) or [post something to them](%%%%action."
@@ -5324,39 +4388,33 @@ msgstr ""
 
 #. TRANS: RSS reply feed description.
 #. TRANS: %1$s is a user nickname, %2$s is the StatusNet site name.
-#: actions/repliesrss.php:74
 #, fuzzy, php-format
 msgid "Replies to %1$s on %2$s."
 msgstr "პასუხები %1$s–ს %2$s–ზე!"
 
 #. TRANS: Client exception displayed when trying to restore an account while not logged in.
-#: actions/restoreaccount.php:78
 #, fuzzy
 msgid "Only logged-in users can restore their account."
 msgstr "მხოლოდ ავტორიზირებულ მომხმარებლებს შეუძლიათ შეტყობინებების გამეორება."
 
 #. TRANS: Client exception displayed when trying to restore an account without having restore rights.
-#: actions/restoreaccount.php:83
 #, fuzzy
 msgid "You may not restore your account."
 msgstr "თქვენ ჯერჯერობით არცერთი აპლიკაცია არ დაგირეგისტრირებიათ."
 
 #. TRANS: Client exception displayed trying to restore an account while something went wrong uploading a file.
 #. TRANS: Client exception. No file; probably just a non-AJAX submission.
-#: actions/restoreaccount.php:121 actions/restoreaccount.php:146
 #, fuzzy
 msgid "No uploaded file."
 msgstr "ფაილის ატვირთვა"
 
 #. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
-#: actions/restoreaccount.php:129 lib/mediafile.php:194
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
 msgstr ""
 "ასატვირთი ფაილი სცდება  ფაილის დაშვებულ ზომას. upload_max_filesize დირექტივა "
 "php.ini-ში."
 
 #. TRANS: Client exception.
-#: actions/restoreaccount.php:135 lib/mediafile.php:200
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form."
@@ -5365,144 +4423,116 @@ msgstr ""
 "ფორმაში."
 
 #. TRANS: Client exception.
-#: actions/restoreaccount.php:141 lib/mediafile.php:206
 msgid "The uploaded file was only partially uploaded."
 msgstr "ასატვირთი ფაილი მხოლოდ ნაწილობრივ აიტვირთა."
 
 #. TRANS: Client exception thrown when a temporary folder is not present to store a file upload.
-#: actions/restoreaccount.php:150 lib/mediafile.php:214
 msgid "Missing a temporary folder."
 msgstr "დროებითი საქაღალდე ვერ მოიძებნა."
 
 #. TRANS: Client exception thrown when writing to disk is not possible during a file upload operation.
-#: actions/restoreaccount.php:154 lib/mediafile.php:218
 msgid "Failed to write file to disk."
 msgstr "ფაილის დისკზე ჩაწერა ვერ მოხერხდა."
 
 #. TRANS: Client exception thrown when a file upload operation has been stopped by an extension.
-#: actions/restoreaccount.php:158 lib/mediafile.php:222
 msgid "File upload stopped by extension."
 msgstr "ფაილის არვირთვა გაჩერდა გაფართოების გამო."
 
 #. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
 #. TRANS: Exception thrown when uploading an image fails for an unknown reason.
 #. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
-#: actions/restoreaccount.php:164 lib/imagefile.php:106 lib/mediafile.php:228
 msgid "System error uploading file."
 msgstr "სისტემური შეცდომა ფაილის ატვირთვისას."
 
 #. TRANS: Client exception thrown when a feed is not an Atom feed.
-#: actions/restoreaccount.php:207
 msgid "Not an Atom feed."
 msgstr ""
 
 #. TRANS: Success message when a feed has been restored.
-#: actions/restoreaccount.php:241
 msgid ""
 "Feed has been restored. Your old posts should now appear in search and your "
 "profile page."
 msgstr ""
 
 #. TRANS: Message when a feed restore is in progress.
-#: actions/restoreaccount.php:245
 msgid "Feed will be restored. Please wait a few minutes for results."
 msgstr ""
 
 #. TRANS: Form instructions for feed restore.
-#: actions/restoreaccount.php:342
 msgid ""
 "You can upload a backed-up stream in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format."
 msgstr ""
 
 #. TRANS: Title for submit button to confirm upload of a user backup file for account restore.
-#: actions/restoreaccount.php:373
 #, fuzzy
 msgid "Upload the file"
 msgstr "ფაილის ატვირთვა"
 
-#: actions/revokerole.php:75
 msgid "You cannot revoke user roles on this site."
 msgstr "თქვენ არ შეგიძლიათ მომხმარებლის როლის გაუქმება ამ საიტზე."
 
-#: actions/revokerole.php:82
 msgid "User doesn't have this role."
 msgstr "მომხმარებელს არ გააჩნია ეს როლი."
 
-#: actions/rsd.php:142 actions/version.php:159
 msgid "StatusNet"
 msgstr "StatusNet"
 
-#: actions/sandbox.php:65 actions/unsandbox.php:65
 msgid "You cannot sandbox users on this site."
 msgstr "თქვენ ვერ შეძლებთ მომხმარებლების იზოლირებას ამ საიტზე."
 
-#: actions/sandbox.php:72
 msgid "User is already sandboxed."
 msgstr "მომხმარებელი უკვე იზოლირებულია."
 
 #. TRANS: Menu item for site administration
-#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
-#: lib/adminpanelaction.php:379
 msgid "Sessions"
 msgstr "სესიები"
 
-#: actions/sessionsadminpanel.php:65
 msgid "Session settings for this StatusNet site"
 msgstr ""
 
-#: actions/sessionsadminpanel.php:175
 msgid "Handle sessions"
 msgstr "სესიების მართვა"
 
-#: actions/sessionsadminpanel.php:177
 msgid "Whether to handle sessions ourselves."
 msgstr "ვმართოთ თუ არა სესიები ჩვენით."
 
-#: actions/sessionsadminpanel.php:181
 msgid "Session debugging"
 msgstr "სესიების შეცდომების გამოსწორება (debugging)"
 
-#: actions/sessionsadminpanel.php:183
 msgid "Turn on debugging output for sessions."
 msgstr ""
 
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
+#. TRANS: Submit button title.
+msgid "Save"
+msgstr "შენახვა"
+
 msgid "Save site settings"
 msgstr "საიტის პარამეტრების შენახვა"
 
-#: actions/showapplication.php:78
 msgid "You must be logged in to view an application."
 msgstr "აპლიკაციის სანახავად საჭიროა ავროტიზაცია."
 
-#: actions/showapplication.php:151
 msgid "Application profile"
 msgstr "აპლიკაციის პროფილი"
 
-#: actions/showapplication.php:179
 #, php-format
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr ""
 
-#: actions/showapplication.php:189
 msgid "Application actions"
 msgstr "აპლიკაციის მოქმედებები"
 
-#: actions/showapplication.php:212
 msgid "Reset key & secret"
 msgstr "გასაღების და საიდუმლოს გადაყენება"
 
 #. TRANS: Title of form for deleting a user.
-#: actions/showapplication.php:228 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:64 lib/noticelist.php:678
 msgid "Delete"
 msgstr "წაშლა"
 
-#: actions/showapplication.php:237
 msgid "Application info"
 msgstr "ინფო აპლიკაციაზე"
 
-#: actions/showapplication.php:255
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
@@ -5510,7 +4540,6 @@ msgstr ""
 "შენიშვნა: ჩვენ მხარს ვუჭერთ HMAC-SHA1 ხელმოწერებს. ჩვენ არ ვუჭერთ მხარს "
 "მხოლოდ ტექსტური ხელმოწერის მეთოდს."
 
-#: actions/showapplication.php:275
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr ""
 "დარწმუნებული ხართ რომ გნებავთ თქვენი მომხმარებლის გასაღების და საიდუმლოს "
@@ -5518,36 +4547,30 @@ msgstr ""
 
 #. TRANS: Title for all but the first page of favourite notices of a user.
 #. TRANS: %1$s is the user for whom the favourite notices are displayed, %2$d is the page number.
-#: actions/showfavorites.php:80
 #, php-format
 msgid "%1$s's favorite notices, page %2$d"
 msgstr "%1$s-ის რჩეული შეტყობინებები, გვერდი %2$d"
 
 #. TRANS: Server error displayed when favourite notices could not be retrieved from the database.
-#: actions/showfavorites.php:134
 msgid "Could not retrieve favorite notices."
 msgstr "რჩეული შეტყობინებების გამოთხოვნა ვერ მოხერხდა."
 
 #. TRANS: Feed link text. %s is a username.
-#: actions/showfavorites.php:172
 #, php-format
 msgid "Feed for favorites of %s (RSS 1.0)"
 msgstr ""
 
 #. TRANS: Feed link text. %s is a username.
-#: actions/showfavorites.php:180
 #, php-format
 msgid "Feed for favorites of %s (RSS 2.0)"
 msgstr ""
 
 #. TRANS: Feed link text. %s is a username.
-#: actions/showfavorites.php:188
 #, php-format
 msgid "Feed for favorites of %s (Atom)"
 msgstr ""
 
 #. TRANS: Text displayed instead of favourite notices for the current logged in user that has no favourites.
-#: actions/showfavorites.php:209
 msgid ""
 "You haven't chosen any favorite notices yet. Click the fave button on "
 "notices you like to bookmark them for later or shed a spotlight on them."
@@ -5557,7 +4580,6 @@ msgstr ""
 
 #. TRANS: Text displayed instead of favourite notices for a user that has no favourites while logged in.
 #. TRANS: %s is a username.
-#: actions/showfavorites.php:213
 #, php-format
 msgid ""
 "%s hasn't added any favorite notices yet. Post something interesting they "
@@ -5567,7 +4589,6 @@ msgstr ""
 #. TRANS: Text displayed instead of favourite notices for a user that has no favourites while not logged in.
 #. TRANS: %s is a username, %%%%action.register%%%% is a link to the user registration page.
 #. TRANS: (link text)[link] is a Mark Down link.
-#: actions/showfavorites.php:220
 #, php-format
 msgid ""
 "%s hasn't added any favorite notices yet. Why not [register an account](%%%%"
@@ -5576,64 +4597,53 @@ msgid ""
 msgstr ""
 
 #. TRANS: Page notice for show favourites page.
-#: actions/showfavorites.php:251
 msgid "This is a way to share what you like."
 msgstr ""
 
 #. TRANS: Page title for first group page. %s is a group name.
-#: actions/showgroup.php:75
 #, php-format
 msgid "%s group"
 msgstr ""
 
 #. TRANS: Page title for any but first group page.
 #. TRANS: %1$s is a group name, $2$s is a page number.
-#: actions/showgroup.php:79
 #, php-format
 msgid "%1$s group, page %2$d"
 msgstr ""
 
 #. TRANS: Label for group description or group note (dt). Text hidden by default.
-#: actions/showgroup.php:266
 msgid "Note"
 msgstr "შენიშვნა"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:277 lib/groupeditform.php:180
 msgid "Aliases"
 msgstr ""
 
 #. TRANS: Group actions header (h2). Text hidden by default.
-#: actions/showgroup.php:294
 msgid "Group actions"
 msgstr ""
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:338
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
 msgstr ""
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:345
 #, php-format
 msgid "Notice feed for %s group (RSS 2.0)"
 msgstr ""
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:352
 #, php-format
 msgid "Notice feed for %s group (Atom)"
 msgstr ""
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:358
 #, php-format
 msgid "FOAF for %s group"
 msgstr ""
 
 #. TRANS: Header for mini list of group members on a group page (h2).
-#: actions/showgroup.php:395
 msgid "Members"
 msgstr "წევრები"
 
@@ -5641,31 +4651,24 @@ msgstr "წევრები"
 #. TRANS: Text for user subscription statistics if the user has no subscriptions.
 #. TRANS: Text for user subscriber statistics if user has no subscribers.
 #. TRANS: Text for user user group membership statistics if user is not a member of any group.
-#: actions/showgroup.php:401 lib/profileaction.php:137
-#: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
-#: lib/subscriptionlist.php:123 lib/tagcloudsection.php:71
 msgid "(None)"
 msgstr "(არცერთი)"
 
 #. TRANS: Link to all group members from mini list of group members if group has more than n members.
-#: actions/showgroup.php:410
 msgid "All members"
 msgstr ""
 
 #. TRANS: Header for group statistics on a group page (h2).
 #. TRANS: H2 text for user statistics.
-#: actions/showgroup.php:441 lib/profileaction.php:205
 msgid "Statistics"
 msgstr "სტატისტიკა"
 
-#: actions/showgroup.php:444
 #, fuzzy
 msgctxt "LABEL"
 msgid "Created"
 msgstr "შექმნილია"
 
 #. TRANS: Label for member count in statistics on group page.
-#: actions/showgroup.php:449
 #, fuzzy
 msgctxt "LABEL"
 msgid "Members"
@@ -5675,7 +4678,6 @@ msgstr "წევრები"
 #. TRANS: **%s** is the group alias, %%%%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).
-#: actions/showgroup.php:464
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5688,7 +4690,6 @@ 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: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
-#: actions/showgroup.php:474
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5698,93 +4699,78 @@ msgid ""
 msgstr ""
 
 #. TRANS: Header for list of group administrators on a group page (h2).
-#: actions/showgroup.php:503
 msgid "Admins"
 msgstr ""
 
 #. TRANS: Client error displayed requesting a single message that does not exist.
-#: actions/showmessage.php:76
 msgid "No such message."
 msgstr ""
 
 #. TRANS: Client error displayed requesting a single direct message the requesting user was not a party in.
-#: actions/showmessage.php:86
 msgid "Only the sender and recipient may read this message."
 msgstr ""
 
 #. TRANS: Page title for single direct message display when viewing user is the sender.
 #. TRANS: %1$s is the addressed user's nickname, $2$s is a timestamp.
-#: actions/showmessage.php:105
 #, php-format
 msgid "Message to %1$s on %2$s"
 msgstr ""
 
 #. TRANS: Page title for single message display.
 #. TRANS: %1$s is the sending user's nickname, $2$s is a timestamp.
-#: actions/showmessage.php:113
 #, php-format
 msgid "Message from %1$s on %2$s"
 msgstr ""
 
-#: actions/shownotice.php:90
 msgid "Notice deleted."
 msgstr ""
 
 #. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
-#: actions/showstream.php:70
 #, fuzzy, php-format
 msgid "%1$s tagged %2$s"
 msgstr "%1$s - %2$s"
 
 #. TRANS: Page title showing tagged notices in one user's stream.
 #. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
-#: actions/showstream.php:74
 #, fuzzy, php-format
 msgid "%1$s tagged %2$s, page %3$d"
 msgstr "შეტყობინებები მონიშნული %1$s-ით, გვერდი %2$d"
 
 #. TRANS: Extended page title showing tagged notices in one user's stream.
 #. TRANS: %1$s is the username, %2$d is the page number.
-#: actions/showstream.php:82
 #, php-format
 msgid "%1$s, page %2$d"
 msgstr ""
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %1$s is a user nickname, %2$s is a hashtag.
-#: actions/showstream.php:127
 #, php-format
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
 msgstr ""
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.
-#: actions/showstream.php:136
 #, php-format
 msgid "Notice feed for %s (RSS 1.0)"
 msgstr ""
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.
-#: actions/showstream.php:145
 #, php-format
 msgid "Notice feed for %s (RSS 2.0)"
 msgstr ""
 
-#: actions/showstream.php:152
 #, php-format
 msgid "Notice feed for %s (Atom)"
 msgstr ""
 
 #. TRANS: Title for link to notice feed. FOAF stands for Friend of a Friend.
 #. TRANS: More information at http://www.foaf-project.org. %s is a user nickname.
-#: actions/showstream.php:159
 #, php-format
 msgid "FOAF for %s"
 msgstr ""
 
 #. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
-#: actions/showstream.php:205
 #, fuzzy, php-format
 msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr ""
@@ -5792,7 +4778,6 @@ msgstr ""
 "დაუპოსტავს."
 
 #. TRANS: Second sentence of empty list message for a stream for the user themselves.
-#: actions/showstream.php:211
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
@@ -5800,7 +4785,6 @@ msgstr ""
 
 #. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:215
 #, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
@@ -5809,7 +4793,6 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:258
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5820,7 +4803,6 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:265
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5829,163 +4811,127 @@ msgid ""
 msgstr ""
 
 #. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
-#: actions/showstream.php:322
 #, php-format
 msgid "Repeat of %s"
 msgstr ""
 
-#: actions/silence.php:65 actions/unsilence.php:65
 msgid "You cannot silence users on this site."
 msgstr "თქვენ ვერ შეძლებთ მომხმარებლების დადუმებას ამ საიტზე."
 
-#: actions/silence.php:72
 msgid "User is already silenced."
 msgstr "მომხმარებელი უკვე დადუმებულია."
 
-#: actions/siteadminpanel.php:69
 msgid "Basic settings for this StatusNet site"
 msgstr "ამ საიტის ძირითადი პარამეტრები"
 
-#: actions/siteadminpanel.php:133
 msgid "Site name must have non-zero length."
 msgstr "საიტის სახელი არ უნდა იყოს ნულოვანი სიგრძის."
 
-#: actions/siteadminpanel.php:141
 msgid "You must have a valid contact email address."
 msgstr "თქვენ უნდა გქონდეთ ნამდვილი საკონტაქტო ელ. ფოსტის მისამართი."
 
-#: actions/siteadminpanel.php:159
 #, php-format
 msgid "Unknown language \"%s\"."
 msgstr "უცნობი ენა \"%s\"."
 
-#: actions/siteadminpanel.php:165
 msgid "Minimum text limit is 0 (unlimited)."
 msgstr "ტექსტის მინიმალური ზღვარია 0 (ულიმიტო)."
 
-#: actions/siteadminpanel.php:171
 msgid "Dupe limit must be one or more seconds."
 msgstr ""
 
-#: actions/siteadminpanel.php:221
 msgid "General"
 msgstr "ძირითადი"
 
-#: actions/siteadminpanel.php:224
 msgid "Site name"
 msgstr "საიტის სახელი"
 
-#: actions/siteadminpanel.php:225
 msgid "The name of your site, like \"Yourcompany Microblog\""
 msgstr "თქვენი საიტის სახელი, როგორც \"თქვენი კომპანიის მიკრობლოგი\""
 
-#: actions/siteadminpanel.php:229
 msgid "Brought by"
 msgstr ""
 
-#: actions/siteadminpanel.php:230
 msgid "Text used for credits link in footer of each page"
 msgstr "ტექსტი გამოყენებული თითოეული გვერდის ბოლოს კრედიტებისთვის"
 
-#: actions/siteadminpanel.php:234
 msgid "Brought by URL"
 msgstr "მომწოდებლის URL"
 
-#: actions/siteadminpanel.php:235
 msgid "URL used for credits link in footer of each page"
 msgstr "URL გამოყენებული კრედიტებისათვის თითოეული გვერდი ბოლოს"
 
-#: actions/siteadminpanel.php:239
 msgid "Contact email address for your site"
 msgstr "თქვენი საიტის საკონტაქტო ელ. ფოსტის მისამართი"
 
-#: actions/siteadminpanel.php:245
 msgid "Local"
 msgstr "ლოკალური"
 
-#: actions/siteadminpanel.php:256
 msgid "Default timezone"
 msgstr "პირვანდელი დროის სარტყელი"
 
-#: actions/siteadminpanel.php:257
 msgid "Default timezone for the site; usually UTC."
 msgstr "პირვანდელი დროის სარტყელი ამ საიტისთვის; ძირითადად UTC."
 
-#: actions/siteadminpanel.php:262
 msgid "Default language"
 msgstr "პირვანდელი ენა"
 
-#: actions/siteadminpanel.php:263
 msgid "Site language when autodetection from browser settings is not available"
 msgstr "საიტის ენა, როდესაც ბროუზერის ავტოდამდგენი არ არის ხელმისაწვდომი"
 
-#: actions/siteadminpanel.php:271
 msgid "Limits"
 msgstr "ზღვრები"
 
-#: actions/siteadminpanel.php:274
 msgid "Text limit"
 msgstr "ტექსტის ზღვარი"
 
-#: actions/siteadminpanel.php:274
 msgid "Maximum number of characters for notices."
 msgstr "შეტყობინების სიმბოლოთა მაქსიმალური რაოდენობა."
 
-#: actions/siteadminpanel.php:278
 msgid "Dupe limit"
 msgstr ""
 
-#: actions/siteadminpanel.php:278
 msgid "How long users must wait (in seconds) to post the same thing again."
 msgstr ""
 "რამდენი ხანი (წამებში) უნდა ელოდოს მომხმარებელი რომ დაპოსტოს ერთი და იგივე."
 
 #. TRANS: Page title for site-wide notice tab in admin panel.
-#: actions/sitenoticeadminpanel.php:55
 msgid "Site Notice"
 msgstr "საიტის შეტყობინება"
 
 #. TRANS: Instructions for site-wide notice tab in admin panel.
-#: actions/sitenoticeadminpanel.php:66
 msgid "Edit site-wide message"
 msgstr "ჩაასწორე საიტის მომცველი შეტყობინება"
 
 #. TRANS: Server error displayed when saving a site-wide notice was impossible.
-#: actions/sitenoticeadminpanel.php:101
 msgid "Unable to save site notice."
 msgstr "საიტის შეტყობინების შენახვა ვერ მოხერხდა."
 
 #. TRANS: Client error displayed when a site-wide notice was longer than allowed.
-#: actions/sitenoticeadminpanel.php:112
 #, fuzzy
 msgid "Maximum length for the site-wide notice is 255 characters."
 msgstr "საიტის მომცველი შეტყობინების მაქს. ზომაა 255 სიმბოლო."
 
 #. TRANS: Label for site-wide notice text field in admin panel.
-#: actions/sitenoticeadminpanel.php:176
 msgid "Site notice text"
 msgstr "საიტის შეტყობინების ტექსტი"
 
 #. TRANS: Tooltip for site-wide notice text field in admin panel.
-#: actions/sitenoticeadminpanel.php:179
 #, fuzzy
 msgid "Site-wide notice text (255 characters maximum; HTML allowed)"
 msgstr "საერთო სასაიტო შეტყობინების ტექსტი (მაქს. 255 სიმბოლო; HTML შეიძლება)"
 
 #. TRANS: Title for button to save site notice in admin panel.
-#: actions/sitenoticeadminpanel.php:201
 #, fuzzy
 msgid "Save site notice."
 msgstr "შეინახე საერთოსასაიტო შეტყობინება"
 
 #. TRANS: Title for SMS settings.
-#: actions/smssettings.php:56
 msgid "SMS settings"
 msgstr "SMS პარამეტრები"
 
 #. TRANS: SMS settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/smssettings.php:70
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr ""
@@ -5993,59 +4939,48 @@ msgstr ""
 "საშუალებით."
 
 #. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
-#: actions/smssettings.php:92
 msgid "SMS is not available."
 msgstr "SMS არ არის ხელმისაწვდომი."
 
 #. TRANS: Form legend for SMS settings form.
-#: actions/smssettings.php:106
 msgid "SMS address"
 msgstr "SMS მისამართი"
 
 #. TRANS: Form guide in SMS settings form.
-#: actions/smssettings.php:115
 msgid "Current confirmed SMS-enabled phone number."
 msgstr "მიმდინარე დადასტურებული SMS გააქტიურებული ტელ. ნომერი."
 
 #. TRANS: Form guide in IM settings form.
-#: actions/smssettings.php:128
 msgid "Awaiting confirmation on this phone number."
 msgstr "ამ ტელ. ნომრის დასტური მოლოდინშია."
 
 #. TRANS: Field label for SMS address input in SMS settings form.
-#: actions/smssettings.php:137
 msgid "Confirmation code"
 msgstr "დასტურის კოდი"
 
 #. TRANS: Form field instructions in SMS settings form.
-#: actions/smssettings.php:139
 msgid "Enter the code you received on your phone."
 msgstr "შეიყვანეთ კოდი, რომელიც მიიღეთ თქვენს ტელეფონზე."
 
 #. TRANS: Button label to confirm SMS confirmation code in SMS settings.
-#: actions/smssettings.php:143
 msgctxt "BUTTON"
 msgid "Confirm"
 msgstr "დასტური"
 
 #. TRANS: Field label for SMS phone number input in SMS settings form.
-#: actions/smssettings.php:148
 msgid "SMS phone number"
 msgstr "SMS ტელეფონის ნომერი"
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
-#: actions/smssettings.php:151
 #, fuzzy
 msgid "Phone number, no punctuation or spaces, with area code."
 msgstr "ტელ. ნომერი, პუნქტუაციის ან სივრცეების გარეშე, ქვეყნის კოდით."
 
 #. TRANS: Form legend for SMS preferences form.
-#: actions/smssettings.php:190
 msgid "SMS preferences"
 msgstr "SMS კონფიგურაცია"
 
 #. TRANS: Checkbox label in SMS preferences form.
-#: actions/smssettings.php:196
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
@@ -6054,32 +4989,26 @@ msgstr ""
 "საგრძნობი გადასახადები დამაკისროს."
 
 #. TRANS: Confirmation message for successful SMS preferences save.
-#: actions/smssettings.php:307
 msgid "SMS preferences saved."
 msgstr "SMS კონფიგურაცია შენახულია."
 
 #. TRANS: Message given saving SMS phone number without having provided one.
-#: actions/smssettings.php:329
 msgid "No phone number."
 msgstr "ტელეფონის ნომერი არ არის."
 
 #. TRANS: Message given saving SMS phone number without having selected a carrier.
-#: actions/smssettings.php:335
 msgid "No carrier selected."
 msgstr "ოპერატორი შერჩეული არ არის."
 
 #. TRANS: Message given saving SMS phone number that is already set.
-#: actions/smssettings.php:343
 msgid "That is already your phone number."
 msgstr "ეს უკვე არის ტქვენი ტელეფონის მისამართი."
 
 #. TRANS: Message given saving SMS phone number that is already set for another user.
-#: actions/smssettings.php:347
 msgid "That phone number already belongs to another user."
 msgstr "ეს ტელეფონის ნომერი სხვას ეკუთვნის."
 
 #. TRANS: Message given saving valid SMS phone number that is to be confirmed.
-#: actions/smssettings.php:375
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
 "for the code and instructions on how to use it."
@@ -6089,39 +5018,32 @@ msgstr ""
 "ინსტრუქცია გამოყენებისთვის."
 
 #. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
-#: actions/smssettings.php:403
 msgid "That is the wrong confirmation number."
 msgstr "ეს დასტურის კოდი არასწორია."
 
 #. TRANS: Message given after successfully canceling SMS phone number confirmation.
-#: actions/smssettings.php:417
 msgid "SMS confirmation cancelled."
 msgstr "SMS დადასტურება გაუქმებულია."
 
 #. TRANS: Message given trying to remove an SMS phone number that is not
 #. TRANS: registered for the active user.
-#: actions/smssettings.php:437
 msgid "That is not your phone number."
 msgstr "ეს არ არის თქვენი ნომერი."
 
 #. TRANS: Message given after successfully removing a registered SMS phone number.
-#: actions/smssettings.php:459
 msgid "The SMS phone number was removed."
 msgstr "SMS ტელეფონის ნომერი წაშლილია."
 
 #. TRANS: Label for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:498
 msgid "Mobile carrier"
 msgstr "მობილური ოპერატორი"
 
 #. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:503
 msgid "Select a carrier"
 msgstr "აირჩიეთ ოპერატორი"
 
 #. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
 #. TRANS: %s is an administrative contact's e-mail address.
-#: actions/smssettings.php:512
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -6132,120 +5054,95 @@ msgstr ""
 "გაგვაგებინეთ ამის შესახებ, მოგვწერეთ მისამართზე - %s."
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
-#: actions/smssettings.php:534
 #, fuzzy
 msgid "No code entered."
 msgstr "კოდი არ არის შეყვანილი"
 
 #. TRANS: Menu item for site administration
-#: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
-#: lib/adminpanelaction.php:395
 msgid "Snapshots"
 msgstr "წინა ვერსიები"
 
-#: actions/snapshotadminpanel.php:65
 msgid "Manage snapshot configuration"
 msgstr "წინა ვერსიების მართვა"
 
-#: actions/snapshotadminpanel.php:127
 msgid "Invalid snapshot run value."
 msgstr "წინა ვერსიის გაშვების არასწორი მონაცემი."
 
-#: actions/snapshotadminpanel.php:133
 msgid "Snapshot frequency must be a number."
 msgstr "წინა ვერსიის სიხშირე ციფრი უნდა იყოს."
 
-#: actions/snapshotadminpanel.php:144
 msgid "Invalid snapshot report URL."
 msgstr ""
 
-#: actions/snapshotadminpanel.php:200
 msgid "Randomly during web hit"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:201
 msgid "In a scheduled job"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:206
 msgid "Data snapshots"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:208
 msgid "When to send statistical data to status.net servers"
 msgstr "როდის გაეგზავნოს სტატისტიკური მონაცემები status.net სერვერს"
 
-#: actions/snapshotadminpanel.php:217
 msgid "Frequency"
 msgstr "სიხშირე"
 
-#: actions/snapshotadminpanel.php:218
 msgid "Snapshots will be sent once every N web hits"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:226
 msgid "Report URL"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:227
 msgid "Snapshots will be sent to this URL"
 msgstr "მდგომარეობა გაიგზავნება ამ URL-ზე"
 
-#: actions/snapshotadminpanel.php:248
 msgid "Save snapshot settings"
 msgstr "დაიმახსოვრე მდგომარეობის პარამეტრები"
 
 #. TRANS: Client error displayed trying a change a subscription for a non-subscribed profile.
-#: actions/subedit.php:75
 msgid "You are not subscribed to that profile."
 msgstr "თქვენ არ გაქვთ გამოწერილი ამ პროფილის განახლებები."
 
 #. TRANS: Server error displayed when updating a subscription fails with a database error.
 #. TRANS: Exception thrown when a subscription could not be stored on the server.
-#: actions/subedit.php:89 classes/Subscription.php:141
 msgid "Could not save subscription."
 msgstr "გამოწერის დამახსოვრება ვერ მოხერხდა."
 
 #. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
-#: actions/subscribe.php:121
 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
 msgstr ""
 "თქვენ არ შეგიძლიათ გამოიწეროთ 0მბ-იანი 0.1 დაშორებული პროფილი ამ მოქმედებით."
 
 #. TRANS: Page title when subscription succeeded.
-#: actions/subscribe.php:149
 msgid "Subscribed"
 msgstr "გამოწერილია"
 
 #. TRANS: Header for list of subscribers for a user (first page).
 #. TRANS: %s is the user's nickname.
-#: actions/subscribers.php:51
 #, php-format
 msgid "%s subscribers"
 msgstr "%s გამომწერი"
 
 #. TRANS: Header for list of subscribers for a user (not first page).
 #. TRANS: %1$s is the user's nickname, $2$d is the page number.
-#: actions/subscribers.php:55
 #, php-format
 msgid "%1$s subscribers, page %2$d"
 msgstr "%1$s გამომწერი, გვერდი %2$d"
 
 #. TRANS: Page notice for page with an overview of all subscribers
 #. TRANS: of the logged in user's own profile.
-#: actions/subscribers.php:68
 msgid "These are the people who listen to your notices."
 msgstr "არის ხალხი, ვინც თქვენს შეტყობინებებს თვალ-ყურს ადევნებს."
 
 #. TRANS: Page notice for page with an overview of all subscribers of a user other
 #. TRANS: than the logged in user. %s is the user nickname.
-#: actions/subscribers.php:74
 #, php-format
 msgid "These are the people who listen to %s's notices."
 msgstr "არის ხალხი, ვინც %s-ს შეტყობინებებს თვალ-ყურს ადევნებს."
 
 #. TRANS: Subscriber list text when the logged in user has no subscribers.
-#: actions/subscribers.php:114
 #, fuzzy
 msgid ""
 "You have no subscribers. Try subscribing to people you know and they might "
@@ -6256,7 +5153,6 @@ msgstr ""
 
 #. TRANS: Subscriber list text when looking at the subscribers for a of a user other
 #. TRANS: than the logged in user that has no subscribers. %s is the user nickname.
-#: actions/subscribers.php:118
 #, php-format
 msgid "%s has no subscribers. Want to be the first?"
 msgstr "%s არ ჰყავს გამომწერები. გინდა გახდე პირველი?"
@@ -6266,7 +5162,6 @@ msgstr "%s არ ჰყავს გამომწერები. გინ
 #. TRANS: This message contains a Markdown URL. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.
-#: actions/subscribers.php:127
 #, php-format
 msgid ""
 "%s has no subscribers. Why not [register an account](%%%%action.register%%%"
@@ -6277,20 +5172,17 @@ msgstr ""
 
 #. TRANS: Header for subscriptions overview for a user (not first page).
 #. TRANS: %1$s is a user nickname, %2$d is the page number.
-#: actions/subscriptions.php:55
 #, php-format
 msgid "%1$s subscriptions, page %2$d"
 msgstr "%1$s გამოწერები, გვერდი %2$d"
 
 #. TRANS: Page notice for page with an overview of all subscriptions
 #. TRANS: of the logged in user's own profile.
-#: actions/subscriptions.php:68
 msgid "These are the people whose notices you listen to."
 msgstr "ეს არის ხალხი, ვის შეტყობინებებსაც უსმენთ."
 
 #. TRANS: Page notice for page with an overview of all subscriptions of a user other
 #. TRANS: than the logged in user. %s is the user nickname.
-#: actions/subscriptions.php:74
 #, php-format
 msgid "These are the people whose notices %s listens to."
 msgstr "ეს არის ხალხი ვის შეტყობინებებსაც ყურს უგდებს %s."
@@ -6299,7 +5191,6 @@ msgstr "ეს არის ხალხი ვის შეტყობინ
 #. 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.
-#: actions/subscriptions.php:133
 #, php-format
 msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "
@@ -6319,69 +5210,55 @@ msgstr ""
 #. TRANS: than the logged in user that has no subscriptions. %s is the user nickname.
 #. TRANS: Subscription list text when looking at the subscriptions for a of a user that has none
 #. TRANS: as an anonymous user. %s is the user nickname.
-#: actions/subscriptions.php:141 actions/subscriptions.php:147
 #, php-format
 msgid "%s is not listening to anyone."
 msgstr "%s არავის უსმენს."
 
 #. TRANS: Atom feed title. %s is a profile nickname.
-#: actions/subscriptions.php:176
 #, fuzzy, php-format
 msgid "Subscription feed for %s (Atom)"
 msgstr "შეტყობინებების RSS მონიშნული %s-თ (Atom)"
 
 #. TRANS: Checkbox label for enabling Jabber messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:241 lib/settingsnav.php:110
-#, fuzzy
 msgid "IM"
 msgstr "IM"
 
 #. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:256 lib/settingsnav.php:117
 msgid "SMS"
 msgstr "SMS"
 
 #. TRANS: Title for all but the first page of notices with tags.
 #. TRANS: %1$s is the tag, %2$d is the page number.
-#: actions/tag.php:73
 #, php-format
 msgid "Notices tagged with %1$s, page %2$d"
 msgstr "შეტყობინებები მონიშნული %1$s-ით, გვერდი %2$d"
 
-#: actions/tag.php:91
 #, php-format
 msgid "Notice feed for tag %s (RSS 1.0)"
 msgstr "შეტყობინებების RSS მონიშნული %s-თ (RSS 1.0)"
 
-#: actions/tag.php:97
 #, php-format
 msgid "Notice feed for tag %s (RSS 2.0)"
 msgstr "შეტყობინებების RSS მონიშნული %s-თ (RSS 2.0)"
 
-#: actions/tag.php:103
 #, php-format
 msgid "Notice feed for tag %s (Atom)"
 msgstr "შეტყობინებების RSS მონიშნული %s-თ (Atom)"
 
-#: actions/tagother.php:39
 msgid "No ID argument."
 msgstr ""
 
-#: actions/tagother.php:65
 #, php-format
 msgid "Tag %s"
 msgstr "სანიშნე %s"
 
 #. TRANS: H2 for user profile information.
-#: actions/tagother.php:77 lib/userprofile.php:76
 msgid "User profile"
 msgstr "მომხმარებლის პროფილი"
 
-#: actions/tagother.php:120
 msgid "Tag user"
 msgstr "მონიშნე მომხმარებელი"
 
-#: actions/tagother.php:130
 msgid ""
 "Tags for this user (letters, numbers, -, ., and _), comma- or space- "
 "separated"
@@ -6389,50 +5266,40 @@ msgstr ""
 "სანიშნეები ამ მომხმარებლისთვის (ასოები, ციფრები, -, ., და _). გამოყავით "
 "მძიმით ან სივრცით"
 
-#: actions/tagother.php:157
 #, php-format
 msgid "Invalid tag: \"%s\""
 msgstr "არასწორი სანიშნე: \"%s\""
 
-#: actions/tagother.php:172
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 "ადამიანების მონიშვნა შესაძლებელია მხოლოდ მაშინ, როდესაც ან თქვენ გაქვთ "
 "გამოწერილი მისი განახლებები, ან იმას."
 
-#: actions/tagother.php:215
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
 "გამოიყენეთ ეს ფორმა, რომ მიანიჭოთ სანიშნეები თქვენს გამოწერებს ან "
 "გამომწერებს."
 
-#: actions/tagrss.php:35
 msgid "No such tag."
 msgstr "ასეთი სანიშნე არ არსებობს."
 
 #. TRANS: Client error displayed when trying to unblock a non-blocked user.
-#: actions/unblock.php:59
 msgid "You haven't blocked that user."
 msgstr "თქვენ არ დაგიბლოკავთ ეს მომხმარებელი."
 
-#: actions/unsandbox.php:72
 msgid "User is not sandboxed."
 msgstr "მომხმარებელი არ არის იზოლირებული."
 
-#: actions/unsilence.php:72
 msgid "User is not silenced."
 msgstr "მომხმარებელი არ არის დადუმებული."
 
-#: actions/unsubscribe.php:77
 msgid "No profile ID in request."
 msgstr "არცერთი პროფილის ID არ არის მოთხოვნილი."
 
-#: actions/unsubscribe.php:98
 msgid "Unsubscribed"
 msgstr "გამოწერა გაუქმებულია"
 
-#: actions/updateprofile.php:64
 #, php-format
 msgid ""
 "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
@@ -6440,176 +5307,141 @@ msgstr ""
 "გამოსაწერი მომხმარებლის ნაკადის ლიცენზია ‘%1$s’ შეუთავსებელია საიტის "
 "ლიცენზიასთან ‘%2$s’."
 
-#: actions/urlsettings.php:60
 #, fuzzy
 msgid "URL settings"
 msgstr "IM პარამეტრები"
 
 #. TRANS: Instructions for tab "Other" in user profile settings.
-#: actions/urlsettings.php:72
 msgid "Manage various other options."
 msgstr "სხა მრავალნაირი პარამეტრების მართვა."
 
 #. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
 #. TRANS: user's profile settings. This message has one space at the beginning. Use your
 #. TRANS: language's word separator here if it has one (most likely a single space).
-#: actions/urlsettings.php:115
 msgid " (free service)"
 msgstr " (უფასო სერვისი)"
 
-#: actions/urlsettings.php:121
 #, fuzzy
 msgid "[none]"
 msgstr "არაფერი"
 
-#: actions/urlsettings.php:122
 msgid "[internal]"
 msgstr ""
 
 #. TRANS: Label for dropdown with URL shortener services.
-#: actions/urlsettings.php:130
 msgid "Shorten URLs with"
 msgstr "შეამოკლე URL–ები შემდეგით"
 
 #. TRANS: Tooltip for for dropdown with URL shortener services.
-#: actions/urlsettings.php:132
 msgid "Automatic shortening service to use."
 msgstr "გამოსაყენებელი შემოკლების ავტომატური სერვისი."
 
-#: actions/urlsettings.php:138
 msgid "URL longer than"
 msgstr ""
 
-#: actions/urlsettings.php:141
 msgid "URLs longer than this will be shortened, 0 means always shorten."
 msgstr ""
 
-#: actions/urlsettings.php:145
 msgid "Text longer than"
 msgstr ""
 
-#: actions/urlsettings.php:148
 msgid ""
 "URLs in notices longer than this will be shortened, 0 means always shorten."
 msgstr ""
 
 #. TRANS: Form validation error for form "Other settings" in user profile.
-#: actions/urlsettings.php:180
 #, fuzzy
 msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr "URL–ს შემოკლების სერვისი ძალიან გრძელია (მაქს. 50 სიმბოლო)."
 
-#: actions/urlsettings.php:187
 msgid "Invalid number for max url length."
 msgstr ""
 
-#: actions/urlsettings.php:193
 #, fuzzy
 msgid "Invalid number for max notice length."
 msgstr "შეტყობინების არასწორი შიგთავსი."
 
-#: actions/urlsettings.php:238
 msgid "Error saving user URL shortening preferences."
 msgstr ""
 
 #. TRANS: User admin panel title
-#: actions/useradminpanel.php:58
 msgctxt "TITLE"
 msgid "User"
 msgstr "მომხმარებელი"
 
 #. TRANS: Instruction for user admin panel.
-#: actions/useradminpanel.php:69
 msgid "User settings for this StatusNet site"
 msgstr ""
 
 #. TRANS: Form validation error in user admin panel when a non-numeric character limit was set.
-#: actions/useradminpanel.php:147
 msgid "Invalid bio limit. Must be numeric."
 msgstr "ბიოგრაფიის არასწორი ლიმიტი. უნდა იყოს ციფრი."
 
 #. TRANS: Form validation error in user admin panel when welcome text is too long.
-#: actions/useradminpanel.php:154
 #, fuzzy
 msgid "Invalid welcome text. Maximum length is 255 characters."
 msgstr "არასწორი მისასალმებელი ტექსტი. სიმბოლოების მაქს. რაოდენობაა 255."
 
 #. TRANS: Client error displayed when trying to set a non-existing user as default subscription for new
 #. TRANS: users in user admin panel. %1$s is the invalid nickname.
-#: actions/useradminpanel.php:166
 #, php-format
 msgid "Invalid default subscripton: \"%1$s\" is not a user."
 msgstr ""
 
-#: actions/useradminpanel.php:215 lib/action.php:565 lib/settingsnav.php:77
-#: lib/subgroupnav.php:81
 msgid "Profile"
 msgstr "პროფილი"
 
 #. TRANS: Field label in user admin panel for setting the character limit for the bio field.
-#: actions/useradminpanel.php:220
 msgid "Bio Limit"
 msgstr "ბიოგრაფიის ლიმიტი"
 
 #. TRANS: Tooltip in user admin panel for setting the character limit for the bio field.
-#: actions/useradminpanel.php:222
 msgid "Maximum length of a profile bio in characters."
 msgstr "პროფილის ბიოგრაფიის მაქსიმალური ზომა სიმბოლოებში."
 
 #. TRANS: Form legend in user admin panel.
-#: actions/useradminpanel.php:231
 msgid "New users"
 msgstr "ახალი მომხმარებლები"
 
 #. TRANS: Field label in user admin panel for setting new user welcome text.
-#: actions/useradminpanel.php:236
 msgid "New user welcome"
 msgstr "ახალი მომხმარებლის მისალმება"
 
 #. TRANS: Tooltip in user admin panel for setting new user welcome text.
-#: actions/useradminpanel.php:238
 #, fuzzy
 msgid "Welcome text for new users (maximum 255 characters)."
 msgstr "მისალმების ტექსტი ახალი მომხმარებლებისთვის (მაქს. 255 სიმბოლო)."
 
 #. TRANS: Field label in user admin panel for setting default subscription for new users.
-#: actions/useradminpanel.php:244
 msgid "Default subscription"
 msgstr ""
 
 #. TRANS: Tooltip in user admin panel for setting default subscription for new users.
-#: actions/useradminpanel.php:246
 msgid "Automatically subscribe new users to this user."
 msgstr "ავტომატურად გამოაწერინე ამ მომხმარებელს ახალი მომხმარებლები."
 
 #. TRANS: Form legend in user admin panel.
-#: actions/useradminpanel.php:256
 msgid "Invitations"
 msgstr "მოსაწვევეი"
 
 #. TRANS: Field label for checkbox in user admin panel for allowing users to invite friend using site e-mail.
-#: actions/useradminpanel.php:262
 msgid "Invitations enabled"
 msgstr "მოსაწვევები გააქტიურებულია"
 
 #. TRANS: Tooltip for checkbox in user admin panel for allowing users to invite friend using site e-mail.
-#: actions/useradminpanel.php:265
 msgid "Whether to allow users to invite new users."
 msgstr "მიეცეთ თუ არა მომხმარებლებს სხვების მოწვევის უფლება."
 
 #. TRANS: Title for button to save user settings in user admin panel.
-#: actions/useradminpanel.php:302
 #, fuzzy
 msgid "Save user settings."
 msgstr "საიტის პარამეტრების შენახვა"
 
 #. TRANS: Page title.
-#: actions/userauthorization.php:109
 msgid "Authorize subscription"
 msgstr "გამოწერის ავტორიზაცია"
 
 #. TRANS: Page notice on "Auhtorize subscription" page.
-#: actions/userauthorization.php:115
 #, fuzzy
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
@@ -6621,42 +5453,35 @@ msgstr ""
 "\"უარყოფა\"."
 
 #. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:200
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Accept"
 msgstr "მიღება"
 
 #. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:202
 #, fuzzy
 msgid "Subscribe to this user."
 msgstr "გამოიწერე ეს მომხმარებელი"
 
 #. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:204
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Reject"
 msgstr "უარყოფა"
 
 #. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:206
 #, fuzzy
 msgid "Reject this subscription."
 msgstr "ამ გამოწერის უარყოფა"
 
 #. TRANS: Client error displayed for an empty authorisation request.
-#: actions/userauthorization.php:219
 msgid "No authorization request!"
 msgstr "ავტორიზაციის მოთხოვნა არ არის!"
 
 #. TRANS: Accept message header from Authorise subscription page.
-#: actions/userauthorization.php:242
 msgid "Subscription authorized"
 msgstr "გამოწერა ავტორიზირებულია"
 
-#: actions/userauthorization.php:245
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to authorize the "
@@ -6667,11 +5492,9 @@ msgstr ""
 "გამოწერის ტოკენია:"
 
 #. TRANS: Reject message header from Authorise subscription page.
-#: actions/userauthorization.php:256
 msgid "Subscription rejected"
 msgstr "გამოწერა უარყოფილია"
 
-#: actions/userauthorization.php:259
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to fully reject the "
@@ -6683,35 +5506,30 @@ msgstr ""
 
 #. TRANS: Exception thrown when no valid user is found for an authorisation request.
 #. TRANS: %s is a listener URI.
-#: actions/userauthorization.php:296
 #, fuzzy, php-format
 msgid "Listener URI \"%s\" not found here."
 msgstr "მსმენელის  URI ‘%s’ აქ ვერ მოიძებნა."
 
 #. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
 #. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:303
 #, fuzzy, php-format
 msgid "Listenee URI \"%s\" is too long."
 msgstr "წყაროს URL ძალიან გრძელია."
 
 #. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
 #. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:311
 #, fuzzy, php-format
 msgid "Listenee URI \"%s\" is a local user."
 msgstr "პროფილის URL ‘%s’ ლოკალური მომხმარებლისთვისაა განკუთვნილი."
 
 #. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
 #. TRANS: %s is a profile URL.
-#: actions/userauthorization.php:329
 #, fuzzy, php-format
 msgid "Profile URL \"%s\" is for a local user."
 msgstr "პროფილის URL ‘%s’ ლოკალური მომხმარებლისთვისაა განკუთვნილი."
 
 #. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
 #. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
-#: actions/userauthorization.php:339
 #, fuzzy, php-format
 msgid ""
 "Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
@@ -6722,32 +5540,27 @@ msgstr ""
 
 #. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
 #. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:349
 #, fuzzy, php-format
 msgid "Avatar URL \"%s\" is not valid."
 msgstr "ავატარის URL ‘%s’ არ არის სწორი."
 
 #. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
 #. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:356
 #, fuzzy, php-format
 msgid "Cannot read avatar URL \"%s\"."
 msgstr "ვერ ვკითხულობ ავატარის URL ‘%s’."
 
 #. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
 #. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:363
 #, fuzzy, php-format
 msgid "Wrong image type for avatar URL \"%s\"."
 msgstr "ავატარის სურათის ფორმატი არასწორია URL ‘%s’."
 
 #. TRANS: Page title for profile design page.
-#: actions/userdesignsettings.php:74 lib/designsettings.php:61
 msgid "Profile design"
 msgstr "პროფილის დიზაინი"
 
 #. TRANS: Instructions for profile design page.
-#: actions/userdesignsettings.php:84 lib/designsettings.php:72
 msgid ""
 "Customize the way your profile looks with a background image and a colour "
 "palette of your choice."
@@ -6755,44 +5568,35 @@ msgstr ""
 "აირჩიეთ, როგორ გნებავთ გამოიყურებოდეს თქვენი პროფილი ფონური სურათისა და "
 "ფერთა პალიტრის შეცვლით."
 
-#: actions/userdesignsettings.php:289
 msgid "Enjoy your hotdog!"
 msgstr "ისიამოვნეთ ჰოთ დოგით!"
 
-#: actions/userdesignsettings.php:325
 #, fuzzy
 msgid "Design settings"
 msgstr "საიტის პარამეტრების შენახვა"
 
-#: actions/userdesignsettings.php:340
 msgid "View profile designs"
 msgstr "პროფილის დიზაინების ნახვა"
 
-#: actions/userdesignsettings.php:341
 msgid "Show or hide profile designs."
 msgstr "აჩვენე ან დამალე პროფილის დიზაინები."
 
-#: actions/userdesignsettings.php:348
 #, fuzzy
 msgid "Background file"
 msgstr "ფონი"
 
 #. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number.
-#: actions/usergroups.php:66
 #, php-format
 msgid "%1$s groups, page %2$d"
 msgstr "%1$s ჯგუფი, გვერდი %2$d"
 
-#: actions/usergroups.php:132
 msgid "Search for more groups"
 msgstr "მოძებნე მეტი ჯგუფები"
 
-#: actions/usergroups.php:159
 #, php-format
 msgid "%s is not a member of any group."
 msgstr "მომხმარებელი %s არ არის არცერთი ჯგუფის წევრი."
 
-#: actions/usergroups.php:164
 #, php-format
 msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
 msgstr "სცადეთ [ჯგუფების მოძებნა](%%action.groupsearch%%) გაერთიენდით მათში."
@@ -6802,18 +5606,14 @@ msgstr "სცადეთ [ჯგუფების მოძებნა](%%ac
 #. TRANS: %1$s is a group name, %2$s is a site name.
 #. TRANS: Message is used as a subtitle in atom user notice feed.
 #. TRANS: %1$s is a user name, %2$s is a site name.
-#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:70
-#: lib/atomusernoticefeed.php:95
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr "%1$s-ს განახლებები %2$s-ზე!"
 
-#: actions/version.php:75
 #, php-format
 msgid "StatusNet %s"
 msgstr "StatusNet %s"
 
-#: actions/version.php:155
 #, php-format
 msgid ""
 "This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
@@ -6822,16 +5622,13 @@ msgstr ""
 "ეს საიტი მუშაობს %1$s-ის %2$s ვერსიაზე, ყველა უფლება დაცულია 2008-2010 "
 "StatusNet, Inc. და წვლილის შემომტანები."
 
-#: actions/version.php:163
 msgid "Contributors"
 msgstr "წვლილის შემომტანები"
 
 #. TRANS: Menu item for site administration
-#: actions/version.php:167 lib/adminpanelaction.php:403
 msgid "License"
 msgstr "ლიცენზია"
 
-#: actions/version.php:170
 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 "
@@ -6843,7 +5640,6 @@ msgstr ""
 "გამოქვეყნებულია Free Software Foundation-ის მიერ, ან ლიცენზიის 3 ვერსიით, ან "
 "ნებისმიერი უფრო ახალი ვერსიით. "
 
-#: actions/version.php:176
 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 "
@@ -6855,7 +5651,6 @@ msgstr ""
 "კონკრეტული მიზნისთვის თავსებადობაზე. იხილეთ GNU Affero ძირითადი საჯარო "
 "ლიცენზია მეტი ინფორმაციისთვის."
 
-#: actions/version.php:182
 #, php-format
 msgid ""
 "You should have received a copy of the GNU Affero General Public License "
@@ -6865,52 +5660,42 @@ msgstr ""
 "ერთად. თუ არა, იხილეთ %s."
 
 #. TRANS: Form input field label for application name.
-#: actions/version.php:197 lib/applicationeditform.php:190
 msgid "Name"
 msgstr "დასახელება"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:885
 msgid "Version"
 msgstr "ვერსია"
 
-#: actions/version.php:199
 msgid "Author(s)"
 msgstr "ავტორი(ები)"
 
 #. TRANS: Form input field label.
-#: actions/version.php:200 lib/applicationeditform.php:208
-#: lib/groupeditform.php:168
 msgid "Description"
 msgstr "აღწერა"
 
 #. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:164
 msgid "Favor"
 msgstr "რჩეული"
 
 #. TRANS: Ntofication given when a user marks a notice as favorite.
 #. TRANS: %1$s is a user nickname or full name, %2$s is a notice URI.
-#: classes/Fave.php:167
 #, fuzzy, php-format
 msgid "%1$s marked notice %2$s as a favorite."
 msgstr "%s-მა (@%s) დაამატა თქვენი შეტყობინება თავის რჩეულებში"
 
 #. TRANS: Server exception thrown when a URL cannot be processed.
-#: classes/File.php:162
 #, php-format
 msgid "Cannot process URL '%s'"
 msgstr "ვერ ვამოუშავებ URL '%s'"
 
 #. TRANS: Server exception thrown when... Robin thinks something is impossible!
-#: classes/File.php:194
 msgid "Robin thinks something is impossible."
 msgstr "რობინი ფიქრობს რაღაც შეუძლებელია."
 
 #. 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$s is used for plural.
-#: classes/File.php:210
 #, fuzzy, php-format
 msgid ""
 "No file may be larger than %1$d byte and the file you sent was %2$d bytes. "
@@ -6924,7 +5709,6 @@ msgstr[0] ""
 
 #. TRANS: Message given if an upload would exceed user quota.
 #. TRANS: %d (number) is the user quota in bytes and is used for plural.
-#: classes/File.php:223
 #, fuzzy, php-format
 msgid "A file this large would exceed your user quota of %d byte."
 msgid_plural "A file this large would exceed your user quota of %d bytes."
@@ -6933,7 +5717,6 @@ msgstr[0] ""
 
 #. TRANS: Message given id an upload would exceed a user's monthly quota.
 #. TRANS: $d (number) is the monthly user quota in bytes and is used for plural.
-#: classes/File.php:235
 #, fuzzy, php-format
 msgid "A file this large would exceed your monthly quota of %d byte."
 msgid_plural "A file this large would exceed your monthly quota of %d bytes."
@@ -6942,108 +5725,89 @@ msgstr[0] ""
 "ბაიტს."
 
 #. TRANS: Client exception thrown if a file upload does not have a valid name.
-#: classes/File.php:282 classes/File.php:297
 msgid "Invalid filename."
 msgstr "ფაილის არასწორი სახელი."
 
 #. TRANS: Exception thrown when joining a group fails.
-#: classes/Group_member.php:51
 msgid "Group join failed."
 msgstr "ჯგუფში გაწევრიანება ვერ მოხერხდა."
 
 #. TRANS: Exception thrown when trying to leave a group the user is not a member of.
-#: classes/Group_member.php:64
 msgid "Not part of group."
 msgstr "ჯგუფის წევრი არ ხართ."
 
 #. TRANS: Exception thrown when trying to leave a group fails.
-#: classes/Group_member.php:72
 msgid "Group leave failed."
 msgstr "ჯგუფის დატოვება ვერ მოხერხდა."
 
 #. TRANS: Exception thrown providing an invalid profile ID.
 #. TRANS: %s is the invalid profile ID.
-#: classes/Group_member.php:85
 #, php-format
 msgid "Profile ID %s is invalid."
 msgstr ""
 
 #. TRANS: Exception thrown providing an invalid group ID.
 #. TRANS: %s is the invalid group ID.
-#: classes/Group_member.php:98
 #, fuzzy, php-format
 msgid "Group ID %s is invalid."
 msgstr "შეცდომა მომხმარებლის შენახვისას; არასწორი."
 
 #. TRANS: Activity title.
-#: classes/Group_member.php:147 lib/joinform.php:114
 msgid "Join"
 msgstr "გაერთიანება"
 
 #. TRANS: Success message for subscribe to group attempt through OStatus.
 #. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
-#: classes/Group_member.php:151
 #, php-format
 msgid "%1$s has joined group %2$s."
 msgstr ""
 
 #. TRANS: Server exception thrown when updating a local group fails.
-#: classes/Local_group.php:42
 msgid "Could not update local group."
 msgstr "ლოკალური ჯგუფის განახლება ვერ მოხერხდა."
 
 #. TRANS: Exception thrown when trying creating a login token failed.
 #. TRANS: %s is the user nickname for which token creation failed.
-#: classes/Login_token.php:78
 #, php-format
 msgid "Could not create login token for %s"
 msgstr "შესასვლელი ტოკენის შექმნა %s-სთვის ვერ მოხერხდა."
 
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
-#: classes/Memcached_DataObject.php:556
 msgid "No database name or DSN found anywhere."
 msgstr "ბაზის სახელი ან DSN ვერსად ვერ მოიძებნა."
 
 #. TRANS: Client exception thrown when a user tries to send a direct message while being banned from sending them.
-#: classes/Message.php:45
 msgid "You are banned from sending direct messages."
 msgstr "თქვენ აგეკრძალათ პირდაპირი შეტყობინებების გაგზავნის უფლება."
 
 #. TRANS: Message given when a message could not be stored on the server.
-#: classes/Message.php:69
 msgid "Could not insert message."
 msgstr "შეტყობინების ჩასმა ვერ მოხერხდა."
 
 #. TRANS: Message given when a message could not be updated on the server.
-#: classes/Message.php:80
 msgid "Could not update message with new URI."
 msgstr "შეტყობინების ახალი URI-თ განახლება ვერ მოხერხდა."
 
 #. TRANS: Server exception thrown when a user profile for a notice cannot be found.
 #. TRANS: %1$d is a profile ID (number), %2$d is a notice ID (number).
-#: classes/Notice.php:98
 #, php-format
 msgid "No such profile (%1$d) for notice (%2$d)."
 msgstr "ასეთი პროფილი (%1$d) შეტყობინებისათვის (%2$d) არ არსებობს."
 
 #. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:199
 #, php-format
 msgid "Database error inserting hashtag: %s"
 msgstr "ბაზის შეცდომა hashtag-ის ჩასმისას: %s"
 
 #. TRANS: Client exception thrown if a notice contains too many characters.
-#: classes/Notice.php:279
 msgid "Problem saving notice. Too long."
 msgstr "პრობლემა შეტყობინების შენახვისას. ძალიან გრძელია."
 
 #. TRANS: Client exception thrown when trying to save a notice for an unknown user.
-#: classes/Notice.php:284
 msgid "Problem saving notice. Unknown user."
 msgstr "პრობლემა შეტყობინების შენახვისას. მომხმარებელი უცნობია."
 
 #. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
-#: classes/Notice.php:290
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
@@ -7051,7 +5815,6 @@ msgstr ""
 "კიდევ დაპოსტეთ."
 
 #. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
-#: classes/Notice.php:297
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
 "few minutes."
@@ -7060,43 +5823,36 @@ msgstr ""
 "რამდენიმე წუთში ისევ დაპოსტეთ."
 
 #. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:305
 msgid "You are banned from posting notices on this site."
 msgstr "თქვენ აგეკრძალათ ამ საიტზე შეტყობინებების დაპოსტვა."
 
 #. TRANS: Server exception thrown when a notice cannot be saved.
 #. TRANS: Server exception thrown when a notice cannot be updated.
-#: classes/Notice.php:372 classes/Notice.php:399
 msgid "Problem saving notice."
 msgstr "პრობლემა შეტყობინების შენახვისას."
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:929
 #, fuzzy
 msgid "Bad type provided to saveKnownGroups."
 msgstr "saveKnownGroups-სათვის არასწორი ტიპია მოწოდებული"
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:1028
 msgid "Problem saving group inbox."
 msgstr "პრობლემა ჯგუფის ინდექსის შენახვისას."
 
 #. TRANS: Server exception thrown when a reply cannot be saved.
 #. TRANS: %1$d is a notice ID, %2$d is the ID of the mentioned user.
-#: classes/Notice.php:1144
 #, fuzzy, php-format
 msgid "Could not save reply for %1$d, %2$d."
 msgstr "ჯგუფის ლოკალური ინფორმაციის დამახსოვრება ვერ მოხერხდა."
 
 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1663
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
 
 #. TRANS: Full name of a profile or group followed by nickname in parens
-#: classes/Profile.php:172 classes/User_group.php:242
 #, fuzzy, php-format
 msgctxt "FANCYNAME"
 msgid "%1$s (%2$s)"
@@ -7104,7 +5860,6 @@ msgstr "%1$s (%2$s)"
 
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:779
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
@@ -7112,7 +5867,6 @@ msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:788
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -7120,251 +5874,203 @@ msgstr ""
 "შეცდომა."
 
 #. TRANS: Exception thrown when a right for a non-existing user profile is checked.
-#: classes/Remote_profile.php:54
 msgid "Missing profile."
 msgstr "პროფილი არ არსებობს."
 
 #. TRANS: Exception thrown when a tag cannot be saved.
-#: classes/Status_network.php:338
 msgid "Unable to save tag."
 msgstr "სანიშნეს დამახსოვრება ვერ ხერხდება."
 
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#: classes/Subscription.php:77 lib/oauthstore.php:482
 msgid "You have been banned from subscribing."
 msgstr "თქვენ აგეკრძალათ გამოწერა."
 
 #. TRANS: Exception thrown when trying to subscribe while already subscribed.
-#: classes/Subscription.php:82
 msgid "Already subscribed!"
 msgstr "უკვე გამოწერილია!"
 
 #. TRANS: Exception thrown when trying to subscribe to a user who has blocked the subscribing user.
-#: classes/Subscription.php:87
 msgid "User has blocked you."
 msgstr "მომხმარებელმა დაგბლოკათ."
 
 #. TRANS: Exception thrown when trying to unsibscribe without a subscription.
-#: classes/Subscription.php:176
 msgid "Not subscribed!"
 msgstr "არ გაქვთ გამოწერილი!"
 
 #. TRANS: Exception thrown when trying to unsubscribe a user from themselves.
-#: classes/Subscription.php:183
 msgid "Could not delete self-subscription."
 msgstr "საკუთარი გამოწერის წაშლა ვერ ხერხდება."
 
 #. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
-#: classes/Subscription.php:211
 msgid "Could not delete subscription OMB token."
 msgstr "გამოწერის წაშლა ვერ მოხერხდა. 0მბ-იანი ტოკენი"
 
 #. TRANS: Exception thrown when a subscription could not be deleted on the server.
-#: classes/Subscription.php:223
 msgid "Could not delete subscription."
 msgstr "გამოწერის წაშლა ვერ მოხერხდა."
 
 #. TRANS: Activity tile when subscribing to another person.
-#: classes/Subscription.php:265
 msgid "Follow"
 msgstr ""
 
 #. TRANS: Notification given when one person starts following another.
 #. TRANS: %1$s is the subscriber, %2$s is the subscribed.
-#: classes/Subscription.php:268
 #, fuzzy, php-format
 msgid "%1$s is now following %2$s."
 msgstr "%1$s ამიერიდან ყურს უგდებს თქვენს შეტყობინებებს %2$s-ზე."
 
 #. TRANS: Notice given on user registration.
 #. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:390
 #, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr "გამარჯობა @%2$s, კეთილი იყოს თქვენი მობრძანება %1$s-ზე!"
 
 #. TRANS: Server exception.
-#: classes/User.php:923
 msgid "No single user defined for single-user mode."
 msgstr "ერთი მომხმარებელი არ განსაზღვრულა ერთარედთი-მომხმარებლის რეჟიმისთვის."
 
 #. TRANS: Server exception.
-#: classes/User.php:927
 msgid "Single-user mode code called when not enabled."
 msgstr ""
 
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:522
 msgid "Could not create group."
 msgstr "ჯგუფის შექმნა ვერ მოხერხდა."
 
 #. TRANS: Server exception thrown when updating a group URI failed.
-#: classes/User_group.php:532
 msgid "Could not set group URI."
 msgstr "ჯგუფის URI-ს მინიჭება ვერ მოხერხდა."
 
 #. TRANS: Server exception thrown when setting group membership failed.
-#: classes/User_group.php:555
 msgid "Could not set group membership."
 msgstr "ჯგუფის წევრობის მინიჭება ვერ მოხერხდა."
 
 #. TRANS: Server exception thrown when saving local group information failed.
-#: classes/User_group.php:570
 msgid "Could not save local group info."
 msgstr "ჯგუფის ლოკალური ინფორმაციის დამახსოვრება ვერ მოხერხდა."
 
 #. TRANS: Exception thrown when an account could not be located when it should be moved.
 #. TRANS: %s is the remote site.
-#: lib/accountmover.php:65
 #, fuzzy, php-format
 msgid "Cannot locate account %s."
 msgstr "თქვენ ვერ შეძლებთ მომხმარებლების წაშლას."
 
 #. TRANS: Exception thrown when a service document could not be located account move.
 #. TRANS: %s is the remote site.
-#: lib/accountmover.php:106
 #, php-format
 msgid "Cannot find XRD for %s."
 msgstr ""
 
 #. TRANS: Exception thrown when an account could not be located when it should be moved.
 #. TRANS: %s is the remote site.
-#: lib/accountmover.php:131
 #, php-format
 msgid "No AtomPub API service for %s."
 msgstr ""
 
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: lib/action.php:161
 #, php-format
 msgid "%1$s - %2$s"
 msgstr "%1$s - %2$s"
 
 #. TRANS: Page title for a page without a title set.
-#: lib/action.php:177
 msgid "Untitled page"
 msgstr "უსათაურო გვერდი"
 
 #. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.
-#: lib/action.php:325
 msgctxt "TOOLTIP"
 msgid "Show more"
 msgstr ""
 
 #. TRANS: Inline reply form submit button: submits a reply comment.
-#: lib/action.php:328
 #, fuzzy
 msgctxt "BUTTON"
-msgid "Comment"
-msgstr "შიგთავსი"
+msgid "Reply"
+msgstr "პასუხი"
 
 #. TRANS: Placeholder text for inline reply form. Clicking in this box will turn it into a mini notice form.
-#: lib/action.php:331
-msgid "Add a comment..."
+msgid "Write a reply..."
 msgstr ""
 
-#: lib/action.php:559 lib/personalgroupnav.php:99
 #, fuzzy
 msgid "Home"
 msgstr "ვებ. გვერსი"
 
-#: lib/action.php:560
 #, fuzzy
 msgid "Friends timeline"
 msgstr "%s-ის ნაკადი"
 
-#: lib/action.php:566
 #, fuzzy
 msgid "Your profile"
 msgstr "მომხმარებლის პროფილი"
 
-#: lib/action.php:570 lib/action.php:593 lib/publicgroupnav.php:78
 msgid "Public"
 msgstr "საჯარო"
 
-#: lib/action.php:571 lib/action.php:594
 #, fuzzy
 msgid "Everyone on this site"
 msgstr "მოძებნე ადამიანები ამ საიტზე"
 
-#: lib/action.php:575
 #, fuzzy
 msgid "Settings"
 msgstr "SMS პარამეტრები"
 
-#: lib/action.php:576
 #, fuzzy
 msgid "Change your personal settings"
 msgstr "შეცვალე პროფილის პარამეტრები"
 
-#: lib/action.php:582
 #, fuzzy
 msgid "Site configuration"
 msgstr "მომხმარებლის კონფიგურაცია"
 
-#: lib/action.php:587
 #, fuzzy
 msgid "Logout"
 msgstr "გასვლა"
 
-#: lib/action.php:588
 #, fuzzy
 msgid "Logout from the site"
 msgstr "გასვლა საიტიდან"
 
-#: lib/action.php:599
 #, fuzzy
 msgid "Login to the site"
 msgstr "საიტზე შესვლა"
 
-#: lib/action.php:606
-#, fuzzy
 msgid "Search"
 msgstr "ძიება"
 
-#: lib/action.php:607
 #, fuzzy
 msgid "Search the site"
 msgstr "ძიება საიტზე"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:864
 msgid "Help"
 msgstr "დახმარება"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:867
 msgid "About"
 msgstr "საიტის შესახებ"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:870
 msgid "FAQ"
 msgstr "ხდკ"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:875
 msgid "TOS"
 msgstr "მპ"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:879
 msgid "Privacy"
 msgstr "პირადი"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:882
 msgid "Source"
 msgstr "წყარო"
 
 #. TRANS: Secondary navigation menu option leading to e-mail contact information on the
 #. TRANS: StatusNet site, where to report bugs, ...
-#: lib/action.php:889
 msgid "Contact"
 msgstr "კონტაქტი"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:892
 msgid "Badge"
 msgstr "იარლიყი"
 
@@ -7372,7 +6078,6 @@ msgstr "იარლიყი"
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:921
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7382,7 +6087,6 @@ msgstr ""
 "(%%site.broughtbyurl%%)-ს მიერ."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:924
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** არის მიკრობლოგინგის სერვისი."
@@ -7391,7 +6095,6 @@ msgstr "**%%site.name%%** არის მიკრობლოგინგი
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:931
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7404,107 +6107,89 @@ msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:949
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr "%1$s ის შიგთავსი და მონაცემები არის პირადული და კონფიდენციალური."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:956
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr "შიგთავსი და მონაცემები %1$s-ის საკუთრებაა. ყველა უფლება დაცულია."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:960
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 "შიგთავსი და მონაცემები წვლილის შემტანების საკუთრებაა. ყველა უფლება დაცულია."
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:992
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr "%1$s-ს მთლიანი შიგთავსი და მონაცემები ხელმისაწვდომია %2$s ლიცენზიით."
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1335
 msgid "After"
 msgstr "შემდეგი"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1345
 msgid "Before"
 msgstr "წინა"
 
 #. TRANS: Client exception thrown when a feed instance is a DOMDocument.
-#: lib/activity.php:125
 msgid "Expecting a root feed element but got a whole XML document."
 msgstr ""
 
 #. TRANS: Client exception thrown when using an unknown verb for the activity importer.
-#: lib/activityimporter.php:81
 #, fuzzy, php-format
 msgid "Unknown verb: \"%s\"."
 msgstr "უცნობი ენა \"%s\"."
 
 #. TRANS: Client exception thrown when trying to force a subscription for an untrusted user.
-#: lib/activityimporter.php:107
 msgid "Cannot force subscription for untrusted user."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to for a remote user to subscribe.
-#: lib/activityimporter.php:117
 #, fuzzy
 msgid "Cannot force remote user to subscribe."
 msgstr "მიუთითეთ მომხმარებლის სახელი, რომელსაც გინდათ ყური დაუგდოთ."
 
 #. TRANS: Client exception thrown when trying to subscribe to an unknown profile.
-#: lib/activityimporter.php:132
 #, fuzzy
 msgid "Unknown profile."
 msgstr "ფაილის ტიპი უცნობია"
 
 #. TRANS: Client exception thrown when trying to import an event not related to the importing user.
-#: lib/activityimporter.php:138
 msgid "This activity seems unrelated to our user."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to join a remote group that is not a group.
-#: lib/activityimporter.php:154
 msgid "Remote profile is not a group!"
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to join a group the importing user is already a member of.
-#: lib/activityimporter.php:163
 #, fuzzy
 msgid "User is already a member of this group."
 msgstr "თქვენ უკვე ხართ ამ ჯგუფის წევრი."
 
 #. TRANS: Client exception thrown when trying to import a notice by another user.
 #. TRANS: %1$s is the source URI of the notice, %2$s is the URI of the author.
-#: lib/activityimporter.php:201
 #, php-format
 msgid "Already know about notice %1$s and  it has a different author %2$s."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to overwrite the author information for a non-trusted user during import.
-#: lib/activityimporter.php:207
 msgid "Not overwriting author info for non-trusted user."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to import a notice without content.
 #. TRANS: %s is the notice URI.
-#: lib/activityimporter.php:223
 #, fuzzy, php-format
 msgid "No content for notice %s."
 msgstr "მოძებნე შეტყობინებებში"
 
-#: lib/activitymover.php:84
 #, fuzzy, php-format
 msgid "No such user %s."
 msgstr "ასეთი მომხმარებელი არ არსებობს."
@@ -7515,426 +6200,347 @@ msgstr "ასეთი მომხმარებელი არ არსე
 #. TRANS: %1$s is a URL, %2$s is the status, %s$s is the fail reason.
 #. TRANS: Exception thrown when post to collection fails with a status that is not handled.
 #. TRANS: %1$s is a URL, %2$s is the status, %s$s is the fail reason.
-#: lib/activitysink.php:163 lib/activitysink.php:167 lib/activitysink.php:172
 #, fuzzy, php-format
 msgctxt "URLSTATUSREASON"
 msgid "%1$s %2$s %3$s"
 msgstr "%1$s - %2$s"
 
 #. TRANS: Client exception thrown when there is no source attribute.
-#: lib/activityutils.php:200
 msgid "Can't handle remote content yet."
 msgstr "ჯერჯერობით ვერ ვამუშავებ დაშორებულ შიგთავსს."
 
 #. TRANS: Client exception thrown when there embedded XML content is found that cannot be processed yet.
-#: lib/activityutils.php:237
 msgid "Can't handle embedded XML content yet."
 msgstr ""
 
 #. TRANS: Client exception thrown when base64 encoded content is found that cannot be processed yet.
-#: lib/activityutils.php:242
 msgid "Can't handle embedded Base64 content yet."
 msgstr ""
 
 #. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights.
-#: lib/adminpanelaction.php:96
 msgid "You cannot make changes to this site."
 msgstr "თქვენ არ გაქვთ ამ საიტზე ცვლილებების შეტანის უფლება."
 
 #. TRANS: Client error message throw when a certain panel's settings cannot be changed.
-#: lib/adminpanelaction.php:108
 msgid "Changes to that panel are not allowed."
 msgstr "ამ პანელის ცვლილებები არ არის დაშვებული."
 
 #. TRANS: Client error message.
-#: lib/adminpanelaction.php:222
 msgid "showForm() not implemented."
 msgstr "showForm() არ არის განხორციელებული."
 
 #. TRANS: Client error message
-#: lib/adminpanelaction.php:250
 msgid "saveSettings() not implemented."
 msgstr "saveSettings() არ არის განხორციელებული."
 
 #. TRANS: Client error message thrown if design settings could not be deleted in
 #. TRANS: the admin panel Design.
-#: lib/adminpanelaction.php:274
 msgid "Unable to delete design setting."
 msgstr "დიზაინის პარამეტრების წაშლა ვერ ხერხდება."
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:337
 msgid "Basic site configuration"
 msgstr "საიტის ძირითადი კონფიგურაცია"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:339
 msgctxt "MENU"
 msgid "Site"
 msgstr "საიტი"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:345
 msgid "Design configuration"
 msgstr "დიზაინის კონფიგურაცია"
 
 #. TRANS: Menu item for site administration
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/adminpanelaction.php:347 lib/groupnav.php:135
 msgctxt "MENU"
 msgid "Design"
 msgstr "დიზაინი"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:353
 msgid "User configuration"
 msgstr "მომხმარებლის კონფიგურაცია"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:110
 msgid "User"
 msgstr "მომხმარებელი"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:361
 msgid "Access configuration"
 msgstr "შესვლის კონფიგურაცია"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:369
 msgid "Paths configuration"
 msgstr "გზების კონფიგურაცია"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:377
 msgid "Sessions configuration"
 msgstr "სესიების კონფიგურაცია"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:385
 msgid "Edit site notice"
 msgstr "საიტის შეტყობინების რედაქტირება"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:387
 msgid "Site notice"
 msgstr "საიტის შეტყობინება"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:393
 msgid "Snapshots configuration"
 msgstr "წინა ვერსიების კონფიგურაცია"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:401
 msgid "Set site license"
 msgstr ""
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:409
 #, fuzzy
 msgid "Plugins configuration"
 msgstr "გზების კონფიგურაცია"
 
 #. TRANS: Client error 401.
-#: lib/apiauth.php:111
 msgid "API resource requires read-write access, but you only have read access."
 msgstr ""
 "API რესურსი მოითხოვს ჩაწერა-წაკითხვის წვდომას, მაგრამ თვენ მხოლოდ წაკითხვის "
 "უფლება გაქვთ."
 
 #. TRANS: OAuth exception thrown when no application is found for a given consumer key.
-#: lib/apiauth.php:177
 msgid "No application for that consumer key."
 msgstr ""
 
-#: lib/apiauth.php:202 lib/apiauth.php:284
 msgid "Not allowed to use API."
 msgstr ""
 
 #. TRANS: OAuth exception given when an incorrect access token was given for a user.
-#: lib/apiauth.php:225
 msgid "Bad access token."
 msgstr ""
 
 #. TRANS: OAuth exception given when no user was found for a given token (no token was found).
-#: lib/apiauth.php:230
 msgid "No user for that token."
 msgstr ""
 
 #. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel".
 #. TRANS: Client error thrown when authentication fails.
-#: lib/apiauth.php:272 lib/apiauth.php:302
 msgid "Could not authenticate you."
 msgstr ""
 
 #. TRANS: Server error displayed when trying to create an anynymous OAuth consumer.
-#: lib/apioauthstore.php:45
 #, fuzzy
 msgid "Could not create anonymous consumer."
 msgstr "ჯგუფის შექმნა ვერ მოხერხდა."
 
 #. TRANS: Server error displayed when trying to create an anynymous OAuth application.
-#: lib/apioauthstore.php:69
 #, fuzzy
 msgid "Could not create anonymous OAuth application."
 msgstr "აპლიკაციის შექმნა ვერ მოხერხდა."
 
 #. TRANS: Exception thrown when no token association could be found.
-#: lib/apioauthstore.php:151
 msgid ""
 "Could not find a profile and application associated with the request token."
 msgstr ""
 
 #. TRANS: Exception thrown when no access token can be issued.
-#: lib/apioauthstore.php:209
 #, fuzzy
 msgid "Could not issue access token."
 msgstr "შეტყობინების ჩასმა ვერ მოხერხდა."
 
-#: lib/apioauthstore.php:317
 msgid "Database error inserting OAuth application user."
 msgstr "ბაზამ დაუშვა შეცდომა OAuth აპლიკაციის მომხმარებლის ჩასმისას."
 
-#: lib/apioauthstore.php:345
 #, fuzzy
 msgid "Database error updating OAuth application user."
 msgstr "ბაზამ დაუშვა შეცდომა OAuth აპლიკაციის მომხმარებლის ჩასმისას."
 
 #. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
-#: lib/apioauthstore.php:371
 msgid "Tried to revoke unknown token."
 msgstr ""
 
 #. TRANS: Exception thrown when an attempt is made to remove a revoked token.
-#: lib/apioauthstore.php:376
 msgid "Failed to delete revoked token."
 msgstr ""
 
 #. TRANS: Form input field label for application icon.
-#: lib/applicationeditform.php:177
 msgid "Icon"
 msgstr ""
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:182
 msgid "Icon for this application"
 msgstr "ამ აპლიკაციის ხატულა"
 
 #. TRANS: Form input field instructions.
 #. TRANS: %d is the number of available characters for the description.
-#: lib/applicationeditform.php:201
 #, fuzzy, php-format
 msgid "Describe your application in %d character"
 msgid_plural "Describe your application in %d characters"
 msgstr[0] "აღწერეთ თქვენი აპლიკაცია %d სიმბოლოთი"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:205
 msgid "Describe your application"
 msgstr "აღწერეთ თქვენი აპლიკაცია"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:216
 msgid "URL of the homepage of this application"
 msgstr "აპლიკაციის საწყისი გვერდის URL"
 
 #. TRANS: Form input field label.
-#: lib/applicationeditform.php:218
 msgid "Source URL"
 msgstr "წყაროს URL"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:225
 msgid "Organization responsible for this application"
 msgstr "ამ აპლიკაციაზე პასუხისმგებელი ორგანიზაცია"
 
 #. TRANS: Form input field label.
-#: lib/applicationeditform.php:227
 msgid "Organization"
 msgstr "ორგანიზაცია"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:234
 msgid "URL for the homepage of the organization"
 msgstr "ორგანიზაციის საწყისი გვერდის URL"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:243
 msgid "URL to redirect to after authentication"
 msgstr "ავტორიზაციის შემდეგ გადასამისამართებელი URL"
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:271
 msgid "Browser"
 msgstr "ბროუზერი"
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:288
 msgid "Desktop"
 msgstr "ინსტალირებადი"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:290
 msgid "Type of application, browser or desktop"
 msgstr "აპლიკაციის ტიპი, ბროუზერისთვის ან ინსტალირებადი"
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:314
 msgid "Read-only"
 msgstr "მხოლოდ წაკითხვადი"
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:334
 msgid "Read-write"
 msgstr "კიტხვა-წერადი"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:336
 msgid "Default access for this application: read-only, or read-write"
 msgstr ""
 "შესვლის პირვანდელი მდგომარეობა ამ აპლიკაციისთვის: მხოლოდ წაკითხვადი, ან "
 "კითხვა-წერადი"
 
 #. TRANS: Submit button title.
-#: lib/applicationeditform.php:353
 msgid "Cancel"
 msgstr "გაუქმება"
 
-#: lib/applicationlist.php:247
 msgid " by "
 msgstr ""
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:260
 msgid "read-write"
 msgstr "კიტხვა-წერადი"
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:262
 msgid "read-only"
 msgstr "მხოლოდ წაკითხვადი"
 
 #. TRANS: Used in application list. %1$s is a modified date, %2$s is access type ("read-write" or "read-only")
-#: lib/applicationlist.php:268
 #, php-format
 msgid "Approved %1$s - \"%2$s\" access."
 msgstr "დამტკიცებულია %1$s - \"%2$s\" შესვლა"
 
 #. TRANS: Access token in the application list.
 #. TRANS: %s are the first 7 characters of the access token.
-#: lib/applicationlist.php:282
 #, php-format
 msgid "Access token starting with: %s"
 msgstr ""
 
 #. TRANS: Button label
-#: lib/applicationlist.php:298
 msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "უკუგება"
 
-#: lib/atom10feed.php:113
 msgid "Author element must contain a name element."
 msgstr ""
 
 #. TRANS: Server exception thrown when using the method setActivitySubject() in the class Atom10Feed.
-#: lib/atom10feed.php:160
 #, fuzzy
 msgid "Do not use this method!"
 msgstr "არ წაშალო ეს შეტყობინება"
 
 #. TRANS: Title.
-#: lib/attachmentnoticesection.php:67
 msgid "Notices where this attachment appears"
 msgstr "შეტყობინებები სადაც ეს მიმაგრება გამოჩენილა"
 
 #. TRANS: Title.
-#: lib/attachmenttagcloudsection.php:48
 msgid "Tags for this attachment"
 msgstr "ამ მიმაგრების სანიშნეები"
 
 #. TRANS: Exception thrown when a password change fails.
-#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:227
 #, fuzzy
 msgid "Password changing failed."
 msgstr "პაროლის ცვლილება ჩაიშალა"
 
 #. TRANS: Exception thrown when a password change attempt fails because it is not allowed.
-#: lib/authenticationplugin.php:238
 #, fuzzy
 msgid "Password changing is not allowed."
 msgstr "პაროლის ცვლილება არ არის ნებადართული"
 
 #. TRANS: Title for the form to block a user.
-#: lib/blockform.php:68
 msgid "Block"
 msgstr "ბლოკირება"
 
 #. TRANS: Description of the form to block a user.
-#: lib/blockform.php:79
 msgid "Block this user"
 msgstr "დაბლოკე ეს მომხმარებელი"
 
 #. TRANS: Title for command results.
-#: lib/channel.php:104 lib/channel.php:125
 msgid "Command results"
 msgstr "ბრძანების შედეგები"
 
 #. TRANS: Title for command results.
-#: lib/channel.php:138
 #, fuzzy
 msgid "AJAX error"
 msgstr "Ajax შეცდომა"
 
 #. TRANS: E-mail subject when a command has completed.
-#: lib/channel.php:177 lib/mailhandler.php:143
 msgid "Command complete"
 msgstr "ბრძანება დასრულდა"
 
 #. TRANS: E-mail subject when a command has failed.
-#: lib/channel.php:188
 msgid "Command failed"
 msgstr "ბრძანება ჩაიშალა"
 
 #. TRANS: Command exception text shown when a notice ID is requested that does not exist.
-#: lib/command.php:82 lib/command.php:106
 msgid "Notice with that id does not exist."
 msgstr "შეტყობინებები ამ ID-თ არ არსებობს."
 
 #. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
 #. TRANS: Error text shown when a last user notice is requested and it does not exist.
-#: lib/command.php:99 lib/command.php:642
 msgid "User has no last notice."
 msgstr "მომხმარებელს არ გააჩნია ბოლო შეტყობინება."
 
 #. TRANS: Message given requesting a profile for a non-existing user.
 #. TRANS: %s is the nickname of the user for which the profile could not be found.
-#: lib/command.php:128
 #, php-format
 msgid "Could not find a user with nickname %s."
 msgstr "მომხმარებელი მეტსახელით %s ვერ მოიძებნა."
 
 #. TRANS: Message given getting a non-existing user.
 #. TRANS: %s is the nickname of the user that could not be found.
-#: lib/command.php:148
 #, php-format
 msgid "Could not find a local user with nickname %s."
 msgstr "ლოკალური მომხმარებელი მეტსახელით %s ვერ მოიძებნა."
 
 #. TRANS: Error text shown when an unimplemented command is given.
-#: lib/command.php:183
 msgid "Sorry, this command is not yet implemented."
 msgstr "ბოდიში, ეს ბრძანება ჯერ არ არის განხორციელებული."
 
 #. TRANS: Command exception text shown when a user tries to nudge themselves.
-#: lib/command.php:229
 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr ""
 
 #. TRANS: Message given having nudged another user.
 #. TRANS: %s is the nickname of the user that was nudged.
-#: lib/command.php:238
 #, php-format
 msgid "Nudge sent to %s."
 msgstr ""
@@ -7943,7 +6549,6 @@ msgstr ""
 #. TRANS: %1$s is the number of other user the user is subscribed to.
 #. TRANS: %2$s is the number of users that are subscribed to the user.
 #. TRANS: %3$s is the number of notices the user has sent.
-#: lib/command.php:268
 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"
@@ -7955,40 +6560,34 @@ msgstr ""
 "შეტყობინებები: %3$s"
 
 #. TRANS: Error message text shown when a favorite could not be set because it has already been favorited.
-#: lib/command.php:298
 #, fuzzy
 msgid "Could not create favorite: already favorited."
 msgstr "ფავორიტის შექმნა ვერ მოხერხდა."
 
 #. TRANS: Text shown when a notice has been marked as favourite successfully.
-#: lib/command.php:324
 msgid "Notice marked as fave."
 msgstr "შეტყობინება მონიშნულია რჩეულად."
 
 #. TRANS: Message given having added a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:369
 #, php-format
 msgid "%1$s joined group %2$s."
 msgstr "%1$s გაწევრიანდა ჯგუფში %2$s."
 
 #. TRANS: Message given having removed a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:417
 #, php-format
 msgid "%1$s left group %2$s."
 msgstr "%1$s-მა დატოვა ჯგუფი %2$s."
 
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: lib/command.php:438
 #, fuzzy, php-format
 msgctxt "WHOIS"
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
 
 #. TRANS: Whois output. %s is the full name of the queried user.
-#: lib/command.php:442
 #, php-format
 msgid "Fullname: %s"
 msgstr "სრული სახელი: %s"
@@ -7996,7 +6595,6 @@ msgstr "სრული სახელი: %s"
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a location.
-#: lib/command.php:446 lib/mail.php:275
 #, php-format
 msgid "Location: %s"
 msgstr "მდებარეობა: %s"
@@ -8004,20 +6602,17 @@ msgstr "მდებარეობა: %s"
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a homepage.
-#: lib/command.php:450 lib/mail.php:279
 #, php-format
 msgid "Homepage: %s"
 msgstr "გვერდი: %s"
 
 #. TRANS: Whois output. %s is the bio information of the queried user.
-#: lib/command.php:454
 #, php-format
 msgid "About: %s"
 msgstr "%s-ის შესახებ"
 
 #. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).
 #. TRANS: %s is a remote profile.
-#: lib/command.php:483
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
@@ -8028,7 +6623,6 @@ msgstr ""
 
 #. TRANS: Message given if content is too long. %1$sd is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:500
 #, fuzzy, php-format
 msgid "Message too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
@@ -8036,26 +6630,26 @@ msgstr[0] ""
 "შეტყობინება ძალიან გრძელია - დასაშვები რაოდენობაა %1$d სიმბოლომდე, თქვენ "
 "გააგზავნეთ %2$d."
 
+#. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
+msgid "You can't send a message to this user."
+msgstr "ამ მომხმარებელს შეტყობინებას ვერ გაუგზავნი."
+
 #. TRANS: Error text shown sending a direct message fails with an unknown reason.
-#: lib/command.php:528
 msgid "Error sending direct message."
 msgstr "შეცდომა პირდაპირი შეტყობინების გაგზავნისას."
 
 #. TRANS: Message given having repeated a notice from another user.
 #. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:565
 #, php-format
 msgid "Notice from %s repeated."
 msgstr "შეტყობინება %s-გან გამეორდა."
 
 #. TRANS: Error text shown when repeating a notice fails with an unknown reason.
-#: lib/command.php:568
 msgid "Error repeating notice."
 msgstr "შეცდომა შეტყობინების გამეორებისას."
 
 #. TRANS: Message given if content of a notice for a reply is too long. %1$d is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:603
 #, fuzzy, php-format
 msgid "Notice too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Notice too long - maximum is %1$d characters, you sent %2$d."
@@ -8065,134 +6659,112 @@ msgstr[0] ""
 
 #. TRANS: Text shown having sent a reply to a notice successfully.
 #. TRANS: %s is the nickname of the user of the notice the reply was sent to.
-#: lib/command.php:616
 #, php-format
 msgid "Reply to %s sent."
 msgstr "პასუხი %s-ს გაეგზავნა."
 
 #. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
-#: lib/command.php:619
 msgid "Error saving notice."
 msgstr "შეცდომა შეტყობინების შენახვისას."
 
 #. TRANS: Error text shown when no username was provided when issuing a subscribe command.
-#: lib/command.php:666
 msgid "Specify the name of the user to subscribe to."
 msgstr "მიუთითეთ მომხმარებლის სახელი, რომელსაც გინდათ ყური დაუგდოთ."
 
 #. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
-#: lib/command.php:675
 msgid "Can't subscribe to OMB profiles by command."
 msgstr ""
 
 #. TRANS: Text shown after having subscribed to another user successfully.
 #. TRANS: %s is the name of the user the subscription was requested for.
-#: lib/command.php:683
 #, php-format
 msgid "Subscribed to %s."
 msgstr "%s-ს გამოწერა დასრულდა წარმატებით."
 
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.
-#: lib/command.php:704 lib/command.php:815
 msgid "Specify the name of the user to unsubscribe from."
 msgstr "მიუთითეთ მომხმარებლის სახელი, რომ გამოწერა გააუქმოთ."
 
 #. TRANS: Text shown after having unsubscribed from another user successfully.
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:715
 #, php-format
 msgid "Unsubscribed from %s."
 msgstr "%s-ს გამოწერა გაუქმდა."
 
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
-#: lib/command.php:735 lib/command.php:761
 msgid "Command not yet implemented."
 msgstr "ბრძანება ჯერ არ არის შემუშავებული."
 
 #. TRANS: Text shown when issuing the command "off" successfully.
-#: lib/command.php:739
 msgid "Notification off."
 msgstr ""
 
 #. TRANS: Error text shown when the command "off" fails for an unknown reason.
-#: lib/command.php:742
 msgid "Can't turn off notification."
 msgstr ""
 
 #. TRANS: Text shown when issuing the command "on" successfully.
-#: lib/command.php:765
 msgid "Notification on."
 msgstr ""
 
 #. TRANS: Error text shown when the command "on" fails for an unknown reason.
-#: lib/command.php:768
 msgid "Can't turn on notification."
 msgstr ""
 
 #. TRANS: Error text shown when issuing the login command while login is disabled.
-#: lib/command.php:782
 msgid "Login command is disabled."
 msgstr ""
 
 #. TRANS: Text shown after issuing the login command successfully.
 #. TRANS: %s is a logon link..
-#: lib/command.php:795
 #, php-format
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
 
 #. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:824
 #, php-format
 msgid "Unsubscribed %s."
 msgstr ""
 
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
-#: lib/command.php:842
 msgid "You are not subscribed to anyone."
 msgstr ""
 
 #. TRANS: Text shown after requesting other users a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
-#: lib/command.php:847
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] ""
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user
 #. TRANS: (followers) without having any subscribers.
-#: lib/command.php:869
 msgid "No one is subscribed to you."
 msgstr ""
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
-#: lib/command.php:874
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] ""
 
 #. TRANS: Text shown after requesting groups a user is subscribed to without having
 #. TRANS: any group subscriptions.
-#: lib/command.php:896
 msgid "You are not a member of any groups."
 msgstr ""
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
-#: lib/command.php:901
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] ""
 
 #. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-#: lib/command.php:916
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -8235,71 +6807,58 @@ msgid ""
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:36
 #, fuzzy
 msgid "No configuration file found."
 msgstr "კონფიგურაციის ფაილი ვერ მოიძებნა. "
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:39
 #, fuzzy
 msgid "I looked for configuration files in the following places:"
 msgstr "კონფიგურაციის ფაილები შემდეგ ადგილებში ვეძებე: "
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:42
 msgid "You may wish to run the installer to fix this."
 msgstr "თუ გინდათ ინსტალატორი გაუშვით ამის გასასწორებლად."
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:46
 msgid "Go to the installer."
 msgstr "გადადი ამ ინსტალატორზე."
 
-#: lib/dberroraction.php:59
 msgid "Database error"
 msgstr "მონაცემთა ბაზის შეცდომა"
 
 #. TRANS: Description of form for deleting a user.
-#: lib/deleteuserform.php:75
 msgid "Delete this user"
 msgstr "ამ მომხმარებლის წაშლა"
 
-#: lib/designform.php:114
 #, fuzzy
 msgid "Change design"
 msgstr "შეინახე დიზაინი"
 
 #. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: lib/designform.php:131
 msgid "Change colours"
 msgstr "შეცვალე ფერები"
 
 #. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: lib/designform.php:138
 msgid "Use defaults"
 msgstr "გამოიყენე პირვანდელი მდგომარეობა"
 
 #. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: lib/designform.php:140
 msgid "Restore default designs"
 msgstr "დააბრუნე პირვანდელი დიზაინი"
 
 #. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: lib/designform.php:148
 msgid "Reset back to default"
 msgstr "პირვანდელის პარამეტრების დაბრუნება"
 
 #. TRANS: Label in form on profile design page.
 #. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
-#: lib/designform.php:158
 msgid "Upload file"
 msgstr "ფაილის ატვირთვა"
 
 #. TRANS: Instructions for form on profile design page.
-#: lib/designform.php:163
 #, fuzzy
 msgid ""
 "You can upload your personal background image. The maximum file size is 2Mb."
@@ -8308,49 +6867,41 @@ msgstr ""
 "2მბ."
 
 #. TRANS: Radio button on profile design page that will enable use of the uploaded profile image.
-#: lib/designform.php:194
 #, fuzzy
 msgctxt "RADIO"
 msgid "On"
 msgstr "ჩართვა"
 
 #. TRANS: Radio button on profile design page that will disable use of the uploaded profile image.
-#: lib/designform.php:211
 #, fuzzy
 msgctxt "RADIO"
 msgid "Off"
 msgstr "გამორთვა"
 
 #. TRANS: Title for button on profile design page to save settings.
-#: lib/designform.php:322
 msgid "Save design"
 msgstr "შეინახე დიზაინი"
 
 #. TRANS: Error message displayed if design settings could not be saved.
 #. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
-#: lib/designsettings.php:216 lib/designsettings.php:238
 msgid "Couldn't update your design."
 msgstr "დიზაინის განახლება ვერ მოხერხდა."
 
 #. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
-#: lib/designsettings.php:244
 msgid "Design defaults restored."
 msgstr "დიზაინის პირველადი პარამეტრები დაბრუნებულია."
 
 #. TRANS: Exception. %s is an ID.
-#: lib/discovery.php:153
 #, fuzzy, php-format
 msgid "Unable to find services for %s."
 msgstr "%s აპლიკაციის მიერ ზვდომის გაუქმება ვერ ხერხდება."
 
 #. TRANS: Form legend for removing the favourite status for a favourite notice.
 #. TRANS: Title for button text for removing the favourite status for a favourite notice.
-#: lib/disfavorform.php:108 lib/disfavorform.php:140
 msgid "Disfavor this notice"
 msgstr "ამოშალე რჩეულებიდან ეს შეტყობინება"
 
 #. TRANS: Button text for removing the favourite status for a favourite notice.
-#: lib/disfavorform.php:136
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Disfavor favorite"
@@ -8358,95 +6909,74 @@ msgstr "რჩეულის გაუქმება"
 
 #. TRANS: Form legend for adding the favourite status to a notice.
 #. TRANS: Title for button text for adding the favourite status to a notice.
-#: lib/favorform.php:108 lib/favorform.php:139
 msgid "Favor this notice"
 msgstr "ჩაამატე რჩეულებში ეს შეტყობინება"
 
 #. TRANS: Button text for adding the favourite status to a notice.
-#: lib/favorform.php:135
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Favor"
 msgstr "რჩეული"
 
-#: lib/feed.php:84
 msgid "RSS 1.0"
 msgstr "RSS 1.0"
 
-#: lib/feed.php:86
 msgid "RSS 2.0"
 msgstr "RSS 2.0"
 
-#: lib/feed.php:88
 msgid "Atom"
 msgstr "Atom"
 
-#: lib/feed.php:90
 msgid "FOAF"
 msgstr "FOAF"
 
-#: lib/feedimporter.php:75
 msgid "Not an atom feed."
 msgstr ""
 
-#: lib/feedimporter.php:82
 msgid "No author in the feed."
 msgstr ""
 
-#: lib/feedimporter.php:89
 msgid "Can't import without a user."
 msgstr ""
 
 #. TRANS: Header for feed links (h2).
-#: lib/feedlist.php:66
 msgid "Feeds"
 msgstr ""
 
-#: lib/galleryaction.php:128
 msgid "All"
 msgstr "ყველა"
 
-#: lib/galleryaction.php:136
 msgid "Select tag to filter"
 msgstr "აირჩიე გასაფილტრი სანიშნე"
 
-#: lib/galleryaction.php:137
 msgid "Tag"
 msgstr "სანიშნე"
 
-#: lib/galleryaction.php:138
 msgid "Choose a tag to narrow list"
 msgstr "სიის გასაფილტრად აირჩიე სანიშნე"
 
-#: lib/galleryaction.php:140
 msgid "Go"
 msgstr "წინ"
 
-#: lib/grantroleform.php:91
 #, php-format
 msgid "Grant this user the \"%s\" role"
 msgstr "მიანიჭე ამ მომხმარებელს \"%s\" როლი"
 
-#: lib/groupeditform.php:147
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "1–64 პატარა ასოები ან ციფრები. პუნქტუაციები ან სივრცეები დაუშვებელია"
 
-#: lib/groupeditform.php:156
 #, fuzzy
 msgid "URL of the homepage or blog of the group or topic."
 msgstr "საწყისი გვერდის URL, ან ჯგუფის/თემის ბლოგი"
 
-#: lib/groupeditform.php:161
 msgid "Describe the group or topic"
 msgstr "აღწერე ჯგუფი ან თემა"
 
-#: lib/groupeditform.php:163
 #, fuzzy, php-format
 msgid "Describe the group or topic in %d character or less"
 msgid_plural "Describe the group or topic in %d characters or less"
 msgstr[0] "არწერე ჯგუფი ან თემა %d სიმბოლოთი"
 
-#: lib/groupeditform.php:175
 #, fuzzy
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\"."
@@ -8454,7 +6984,6 @@ msgstr ""
 "ჯგუფის მდებარეობა არსებობის შემთხვევაში. მაგ.: \"ქალაქი, ქვეყანა (ან რეგიონი)"
 "\""
 
-#: lib/groupeditform.php:183
 #, fuzzy, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -8467,70 +6996,60 @@ msgstr[0] ""
 "სიმბოლო"
 
 #. TRANS: Menu item in the group navigation page.
-#: lib/groupnav.php:86
 msgctxt "MENU"
 msgid "Group"
 msgstr ""
 
 #. TRANS: Tooltip for menu item in the group navigation page.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:89
 #, php-format
 msgctxt "TOOLTIP"
 msgid "%s group"
 msgstr ""
 
 #. TRANS: Menu item in the group navigation page.
-#: lib/groupnav.php:95
 msgctxt "MENU"
 msgid "Members"
 msgstr ""
 
 #. TRANS: Tooltip for menu item in the group navigation page.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:98
 #, php-format
 msgctxt "TOOLTIP"
 msgid "%s group members"
 msgstr ""
 
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/groupnav.php:108
 msgctxt "MENU"
 msgid "Blocked"
 msgstr ""
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:111
 #, php-format
 msgctxt "TOOLTIP"
 msgid "%s blocked users"
 msgstr ""
 
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "ადმინი"
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:120
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Edit %s group properties"
 msgstr ""
 
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/groupnav.php:126
 msgctxt "MENU"
 msgid "Logo"
 msgstr ""
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:129
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Add or edit %s logo"
@@ -8538,89 +7057,74 @@ msgstr ""
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:138
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Add or edit %s design"
 msgstr ""
 
 #. TRANS: Title for groups with the most members section.
-#: lib/groupsbymemberssection.php:71
 msgid "Groups with most members"
 msgstr "ჯგუფები უმეტესი მომხმარებლებით"
 
 #. TRANS: Title for groups with the most posts section.
-#: lib/groupsbypostssection.php:71
 msgid "Groups with most posts"
 msgstr "ჯგუფები უმეტესი პოსტებით"
 
 #. TRANS: Title for group tag cloud section.
 #. TRANS: %s is a group name.
-#: lib/grouptagcloudsection.php:57
 #, php-format
 msgid "Tags in %s group's notices"
 msgstr "%s ჯგუფის შეტყობინებებში გამოყენებული სანიშნეები"
 
 #. TRANS: Client exception 406
-#: lib/htmloutputter.php:104
 msgid "This page is not available in a media type you accept"
 msgstr "ეს გვერდი მიუწვდომელია იმ მედია ფორმატში რომელსაც თქვენ იღებთ"
 
 #. TRANS: Exception thrown when trying to upload an unsupported image file format.
-#: lib/imagefile.php:73
 msgid "Unsupported image file format."
 msgstr "სურათის ფორმატი მხარდაჭერილი არ არის."
 
 #. TRANS: Exception thrown when too large a file is uploaded.
 #. TRANS: %s is the maximum file size, for example "500b", "10kB" or "2MB".
-#: lib/imagefile.php:91
 #, php-format
 msgid "That file is too big. The maximum file size is %s."
 msgstr "ეს ფაილი ძალიან დიდია. ფაილის მაქს. ზომაა %s."
 
 #. TRANS: Exception thrown when uploading an image and that action could not be completed.
-#: lib/imagefile.php:97
 msgid "Partial upload."
 msgstr "ნაწილობრივი ატვირთვა."
 
 #. TRANS: Exception thrown when uploading a file as image that is not an image or is a corrupt file.
-#: lib/imagefile.php:115
 msgid "Not an image or corrupt file."
 msgstr "სურათი არ არის, ან ფაილი დაზიანებულია."
 
 #. TRANS: Exception thrown during resize when image has been registered as present, but is no longer there.
-#: lib/imagefile.php:178
 msgid "Lost our file."
 msgstr "ფაილი დაიკარგა."
 
 #. TRANS: Exception thrown when trying to resize an unknown file type.
 #. TRANS: Exception thrown when trying resize an unknown file type.
-#: lib/imagefile.php:216 lib/imagefile.php:257
 msgid "Unknown file type"
 msgstr "ფაილის ტიპი უცნობია"
 
 #. TRANS: Number of megabytes. %d is the number.
-#: lib/imagefile.php:303
 #, fuzzy, php-format
 msgid "%dMB"
 msgid_plural "%dMB"
 msgstr[0] "მბ"
 
 #. TRANS: Number of kilobytes. %d is the number.
-#: lib/imagefile.php:307
 #, fuzzy, php-format
 msgid "%dkB"
 msgid_plural "%dkB"
 msgstr[0] "კბ"
 
 #. TRANS: Number of bytes. %d is the number.
-#: lib/imagefile.php:310
 #, php-format
 msgid "%dB"
 msgid_plural "%dB"
 msgstr[0] ""
 
-#: lib/implugin.php:262
 #, php-format
 msgid ""
 "User \"%s\" on %s has said that your %s screenname belongs to them. If "
@@ -8630,53 +7134,44 @@ msgid ""
 "message."
 msgstr ""
 
-#: lib/implugin.php:349
 #, php-format
 msgid "Unknown inbox source %d."
 msgstr ""
 
-#: lib/implugin.php:485
-#, fuzzy, php-format
+#, php-format
 msgid "Message too long - maximum is %1$d characters, you sent %2$d."
 msgstr ""
 "შეტყობინება ძალიან გრძელია - დასაშვები რაოდენობაა %1$d სიმბოლომდე, თქვენ "
 "გააგზავნეთ %2$d."
 
-#: lib/leaveform.php:114
 msgid "Leave"
 msgstr "დატოვება"
 
 #. TRANS: Menu item for logging in to the StatusNet site.
-#: lib/logingroupnav.php:77
 msgctxt "MENU"
 msgid "Login"
 msgstr "შესვლა"
 
 #. TRANS: Title for menu item for logging in to the StatusNet site.
-#: lib/logingroupnav.php:79
 msgid "Login with a username and password"
 msgstr "შედი მომხ. სახელით და პაროლით."
 
 #. TRANS: Menu item for registering with the StatusNet site.
-#: lib/logingroupnav.php:85
 msgctxt "MENU"
 msgid "Register"
 msgstr "რეგისტრაცია"
 
 #. TRANS: Title for menu item for registering with the StatusNet site.
-#: lib/logingroupnav.php:87
 msgid "Sign up for a new account"
 msgstr "ახალი ანგარიშის გერისტრაცია"
 
 #. TRANS: Subject for address confirmation email.
-#: lib/mail.php:172
 msgid "Email address confirmation"
 msgstr "ელ. ფოსტის მისამართის დადასტურება"
 
 #. TRANS: Body for address confirmation email.
 #. TRANS: %1$s is the addressed user's nickname, %2$s is the StatusNet sitename,
 #. TRANS: %3$s is the URL to confirm at.
-#: lib/mail.php:177
 #, fuzzy, php-format
 msgid ""
 "Hey, %1$s.\n"
@@ -8707,14 +7202,12 @@ msgstr ""
 
 #. TRANS: Subject of new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
-#: lib/mail.php:243
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1$s ამიერიდან ყურს უგდებს თქვენს შეტყობინებებს %2$s-ზე."
 
 #. TRANS: This is a paragraph in a new-subscriber e-mail.
 #. TRANS: %s is a URL where the subscriber can be reported as abusive.
-#: lib/mail.php:250
 #, php-format
 msgid ""
 "If you believe this account is being used abusively, you can block them from "
@@ -8729,7 +7222,6 @@ msgstr ""
 #. TRANS: %3$s is the subscriber's profile URL, %4$s is the subscriber's location (or empty)
 #. TRANS: %5$s is the subscriber's homepage URL (or empty), %6%s is the subscriber's bio (or empty)
 #. TRANS: %7$s is a link to the addressed user's e-mail settings.
-#: lib/mail.php:260
 #, fuzzy, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -8756,14 +7248,12 @@ msgstr ""
 
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is biographical information.
-#: lib/mail.php:283
 #, php-format
 msgid "Bio: %s"
 msgstr "ბიოგრაფია: %s"
 
 #. TRANS: Subject of notification mail for new posting email address.
 #. TRANS: %s is the StatusNet sitename.
-#: lib/mail.php:312
 #, php-format
 msgid "New email address for posting to %s"
 msgstr "%s-ზე დასაპოსტი ახალი ელ. ფოსტის მისამართი"
@@ -8771,7 +7261,6 @@ msgstr "%s-ზე დასაპოსტი ახალი ელ. ფოს
 #. TRANS: Body of notification mail for new posting email address.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is the e-mail address to send
 #. TRANS: to to post by e-mail, %3$s is a URL to more instructions.
-#: lib/mail.php:318
 #, fuzzy, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -8794,19 +7283,16 @@ msgstr ""
 
 #. TRANS: Subject line for SMS-by-email notification messages.
 #. TRANS: %s is the posting user's nickname.
-#: lib/mail.php:439
 #, php-format
 msgid "%s status"
 msgstr "%s სტატუსი"
 
 #. TRANS: Subject line for SMS-by-email address confirmation message.
-#: lib/mail.php:465
 msgid "SMS confirmation"
 msgstr "SMS დადასტურება"
 
 #. TRANS: Main body heading for SMS-by-email address confirmation message.
 #. TRANS: %s is the addressed user's nickname.
-#: lib/mail.php:469
 #, php-format
 msgid "%s: confirm you own this phone number with this code:"
 msgstr ""
@@ -8814,7 +7300,6 @@ msgstr ""
 
 #. TRANS: Subject for 'nudge' notification email.
 #. TRANS: %s is the nudging user.
-#: lib/mail.php:490
 #, fuzzy, php-format
 msgid "You have been nudged by %s"
 msgstr "თქვენ აგეკრძალათ გამოწერა."
@@ -8822,7 +7307,6 @@ msgstr "თქვენ აგეკრძალათ გამოწერა.
 #. TRANS: Body for 'nudge' notification email.
 #. TRANS: %1$s is the nuding user's long name, $2$s is the nudging user's nickname,
 #. TRANS: %3$s is a URL to post notices at, %4$s is the StatusNet sitename.
-#: lib/mail.php:497
 #, php-format
 msgid ""
 "%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -8851,7 +7335,6 @@ msgstr ""
 
 #. TRANS: Subject for direct-message notification email.
 #. TRANS: %s is the sending user's nickname.
-#: lib/mail.php:544
 #, php-format
 msgid "New private message from %s"
 msgstr "ახალი პირადი შეტყობინება %s-სგან"
@@ -8860,7 +7343,6 @@ msgstr "ახალი პირადი შეტყობინება %s-
 #. TRANS: %1$s is the sending user's long name, %2$s is the sending user's nickname,
 #. TRANS: %3$s is the message content, %4$s a URL to the message,
 #. TRANS: %5$s is the StatusNet sitename.
-#: lib/mail.php:552
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -8895,7 +7377,6 @@ msgstr ""
 
 #. TRANS: Subject for favorite notification e-mail.
 #. TRANS: %1$s is the adding user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:604
 #, fuzzy, php-format
 msgid "%1$s (@%2$s) added your notice as a favorite"
 msgstr "%s-მა (@%s) დაამატა თქვენი შეტყობინება თავის რჩეულებში"
@@ -8905,7 +7386,6 @@ msgstr "%s-მა (@%s) დაამატა თქვენი შეტყო
 #. TRANS: %3$s is a URL to the faved notice, %4$s is the faved notice text,
 #. TRANS: %5$s is a URL to all faves of the adding user, %6$s is the StatusNet sitename,
 #. TRANS: %7$s is the adding user's nickname.
-#: lib/mail.php:611
 #, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -8944,7 +7424,6 @@ msgstr ""
 "%6$s\n"
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:669
 #, php-format
 msgid ""
 "The full conversation can be read here:\n"
@@ -8957,7 +7436,6 @@ msgstr ""
 
 #. TRANS: E-mail subject for notice notification.
 #. TRANS: %1$s is the sending user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:677
 #, fuzzy, php-format
 msgid "%1$s (@%2$s) sent a notice to your attention"
 msgstr "%s-მა (@%s) გამოაგზავნა შეტყობინება თქვენს საყურადღებოდ"
@@ -8968,7 +7446,6 @@ msgstr "%s-მა (@%s) გამოაგზავნა შეტყობი
 #. TRANS: %5$s is a URL to the full conversion if it exists (otherwise empty),
 #. TRANS: %6$s is a URL to reply to the notice, %7$s is a URL to all @-replied for the addressed user,
 #. TRANS: %8$s is a URL to the addressed user's e-mail settings, %9$s is the sender's nickname.
-#: lib/mail.php:685
 #, php-format
 msgid ""
 "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -8995,11 +7472,9 @@ msgid ""
 "P.S. You can turn off these email notifications here: %8$s\n"
 msgstr ""
 
-#: lib/mailbox.php:87
 msgid "Only the user can read their own mailboxes."
 msgstr "მხოლოდ მომხმარებელს შეუძლია თავისი ფოსტის წაკითხვა."
 
-#: lib/mailbox.php:125
 msgid ""
 "You have no private messages. You can send private message to engage other "
 "users in conversation. People can send you messages for your eyes only."
@@ -9008,55 +7483,45 @@ msgstr ""
 "შეტყობინებები, რომ ჩაერთოთ საუბრებში სხვა ხალხთან. ხალხს შეუძლია "
 "გამოგიგზავნონ შეტყობინებები მხოლოდ თქვენ დასანახად."
 
-#: lib/mailhandler.php:37
 msgid "Could not parse message."
 msgstr "შეტყობინების გაცრა (გა-parse-ვა) ვერ მოხერხდა."
 
-#: lib/mailhandler.php:42
 msgid "Not a registered user."
 msgstr "მომხმარებელი რეგისტრირებული არ არის."
 
-#: lib/mailhandler.php:46
 msgid "Sorry, that is not your incoming email address."
 msgstr ""
 "ბოდიში, მაგრამ ეს არ არის თქვენი რეგისტრირებული შემომავალი ელ. ფოსტის "
 "მისამართი."
 
-#: lib/mailhandler.php:50
 msgid "Sorry, no incoming email allowed."
 msgstr "ბოდიში, შემომავალი ელ. ფოსტის მისამართი არ არის დაშვებული."
 
-#: lib/mailhandler.php:229
 #, php-format
 msgid "Unsupported message type: %s"
 msgstr "შეტყობინების ტიპი არ არის მხარდაჭერილი: %s"
 
 #. TRANS: Client exception thrown when a database error was thrown during a file upload operation.
-#: lib/mediafile.php:102 lib/mediafile.php:174
 msgid "There was a database error while saving your file. Please try again."
 msgstr "ფაილის შენახვისას მოხდა მონაცემთა ბაზის შეცდომა. გთხოვთ კიდევ სცადოთ."
 
 #. TRANS: Client exception thrown when a file upload operation would cause a user to exceed a set quota.
-#: lib/mediafile.php:238 lib/mediafile.php:281
 msgid "File exceeds user's quota."
 msgstr "ფაილი სცდება მომხმარებლის კვოტას."
 
 #. TRANS: Client exception thrown when a file upload operation fails because the file could
 #. TRANS: not be moved from the temporary folder to the permanent file location.
-#: lib/mediafile.php:258 lib/mediafile.php:300
 msgid "File could not be moved to destination directory."
 msgstr "ფაილის გადატანა დანიშნულების დირექტორიაში ვერ მოხერხდა."
 
 #. TRANS: Client exception thrown when a file upload operation has been stopped because the MIME
 #. TRANS: type of the uploaded file could not be determined.
-#: lib/mediafile.php:265 lib/mediafile.php:306
 msgid "Could not determine file's MIME type."
 msgstr "ფაილის MIME ტიპი ვერ დადგინდა."
 
 #. TRANS: Client exception thrown trying to upload a forbidden MIME type.
 #. TRANS: %1$s is the file type that was denied, %2$s is the application part of
 #. TRANS: the MIME type that was denied.
-#: lib/mediafile.php:396
 #, php-format
 msgid ""
 "\"%1$s\" is not a supported file type on this server. Try using another %2$s "
@@ -9065,83 +7530,74 @@ msgstr ""
 
 #. TRANS: Client exception thrown trying to upload a forbidden MIME type.
 #. TRANS: %s is the file type that was denied.
-#: lib/mediafile.php:401
 #, php-format
 msgid "\"%s\" is not a supported file type on this server."
 msgstr ""
 
-#: lib/messageform.php:120
 msgid "Send a direct notice"
 msgstr "გააგზავნე პირდაპირი შეტყობინება"
 
 #. TRANS Label entry in drop-down selection box in direct-message inbox/outbox. This is the default entry in the drop-down box, doubling as instructions and a brake against accidental submissions with the first user in the list.
-#: lib/messageform.php:137
 #, fuzzy
 msgid "Select recipient:"
 msgstr "აირჩიეთ ოპერატორი"
 
 #. TRANS Entry in drop-down selection box in direct-message inbox/outbox when no one is available to message.
-#: lib/messageform.php:150
 #, fuzzy
 msgid "No mutual subscribers."
 msgstr "არ გაქვთ გამოწერილი!"
 
-#: lib/messageform.php:153
 msgid "To"
 msgstr "ვის"
 
-#: lib/messageform.php:184 lib/noticeform.php:236
 msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr "გაგზავნა"
 
-#: lib/messagelist.php:77
 #, fuzzy
 msgid "Messages"
 msgstr "შეტყობინება"
 
-#: lib/messagelistitem.php:123 lib/noticelist.php:527
 msgid "from"
 msgstr "ვისგან"
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:178
 msgid "Nickname cannot be empty."
 msgstr ""
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:191
 #, php-format
 msgid "Nickname cannot be more than %d character long."
 msgid_plural "Nickname cannot be more than %d characters long."
 msgstr[0] ""
 
-#: lib/noticeform.php:160
+#. TRANS: Form legend for notice form.
 msgid "Send a notice"
 msgstr "შეტყობინების გაგზავნა"
 
-#: lib/noticeform.php:174
+#. TRANS: Title for notice label. %s is the user's nickname.
 #, php-format
 msgid "What's up, %s?"
 msgstr "რა არის ახალი %s?"
 
-#: lib/noticeform.php:193
+#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr "ფაილის მიმაგრება"
 
-#: lib/noticeform.php:197
-msgid "Attach a file"
+#. TRANS: Title for input field to attach a file to a notice.
+#, fuzzy
+msgid "Attach a file."
 msgstr "მიამაგრე ფაილი"
 
-#: lib/noticeform.php:212
+#. TRANS: Field label to add location to a notice.
 msgid "Share my location"
 msgstr "გააზიარე ჩემი მდებარეობა"
 
-#: lib/noticeform.php:215
+#. TRANS: Text to not share location for a notice in notice form.
 msgid "Do not share my location"
 msgstr "არ გააზიარო ჩემი მდებარეობა"
 
-#: lib/noticeform.php:216
+#. TRANS: Timeout error text for location retrieval in notice form.
 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
 "try again later"
@@ -9150,418 +7606,317 @@ msgstr ""
 "სჭირდება, გთხოვთ სცადოთ მოგვიანებით"
 
 #. TRANS: Used in coordinates as abbreviation of north
-#: lib/noticelist.php:457
 msgid "N"
 msgstr "ჩ"
 
 #. TRANS: Used in coordinates as abbreviation of south
-#: lib/noticelist.php:459
 msgid "S"
 msgstr "ს"
 
 #. TRANS: Used in coordinates as abbreviation of east
-#: lib/noticelist.php:461
 msgid "E"
 msgstr "ა"
 
 #. TRANS: Used in coordinates as abbreviation of west
-#: lib/noticelist.php:463
 msgid "W"
 msgstr "დ"
 
-#: lib/noticelist.php:465
 #, php-format
 msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 
-#: lib/noticelist.php:474
 msgid "at"
 msgstr ""
 
-#: lib/noticelist.php:523
 msgid "web"
 msgstr ""
 
-#: lib/noticelist.php:589
 msgid "in context"
 msgstr ""
 
-#: lib/noticelist.php:624
 msgid "Repeated by"
 msgstr ""
 
-#: lib/noticelist.php:651
 msgid "Reply to this notice"
 msgstr "უპასუხე ამ შეტყობინებას"
 
-#: lib/noticelist.php:652
 msgid "Reply"
 msgstr "პასუხი"
 
-#: lib/noticelist.php:678
 msgid "Delete this notice"
 msgstr "შეტყობინების წაშლა"
 
-#: lib/noticelist.php:696
 msgid "Notice repeated"
 msgstr "შეტყობინება გამეორებულია"
 
-#: lib/nudgeform.php:116
 msgid "Nudge this user"
 msgstr ""
 
-#: lib/nudgeform.php:128
 msgid "Nudge"
 msgstr ""
 
-#: lib/nudgeform.php:128
 msgid "Send a nudge to this user"
 msgstr ""
 
-#: lib/oauthstore.php:294
 msgid "Error inserting new profile."
 msgstr ""
 
-#: lib/oauthstore.php:302
 msgid "Error inserting avatar."
 msgstr ""
 
-#: lib/oauthstore.php:322
 msgid "Error inserting remote profile."
 msgstr ""
 
 #. TRANS: Exception thrown when a notice is denied because it has been sent before.
-#: lib/oauthstore.php:362
 msgid "Duplicate notice."
 msgstr ""
 
-#: lib/oauthstore.php:507
 msgid "Couldn't insert new subscription."
 msgstr "ახალი გამოწერის ჩასმა ვერ მოხერხდა."
 
-#: lib/personalgroupnav.php:104
-#, fuzzy
 msgid "Replies"
 msgstr "პასუხები"
 
-#: lib/personalgroupnav.php:109
-#, fuzzy
 msgid "Favorites"
 msgstr "რჩეულები"
 
-#: lib/personalgroupnav.php:120
-#, fuzzy
 msgid "Inbox"
 msgstr "შემომავალი წერილების ყუთი"
 
-#: lib/personalgroupnav.php:121
 msgid "Your incoming messages"
 msgstr "თქვენი შემომავალი შეტყობინებები"
 
-#: lib/personalgroupnav.php:125
-#, fuzzy
 msgid "Outbox"
 msgstr "გამავალი წერილების ყუთი"
 
-#: lib/personalgroupnav.php:126
 msgid "Your sent messages"
 msgstr "თქვენი გაგზავნილი წერილები"
 
 #. TRANS: Title for personal tag cloud section. %s is a user nickname.
-#: lib/personaltagcloudsection.php:56
 #, php-format
 msgid "Tags in %s's notices"
 msgstr "%s-ს შეტყობინებებში გამოყენებული სანიშნეები"
 
 #. TRANS: Displayed as version information for a plugin if no version information was found.
-#: lib/plugin.php:126
 msgid "Unknown"
 msgstr "უცნობი"
 
 #. TRANS: Plugin admin panel controls
-#: lib/plugindisableform.php:90
 msgctxt "plugin"
 msgid "Disable"
 msgstr ""
 
 #. TRANS: Plugin admin panel controls
-#: lib/pluginenableform.php:112
 msgctxt "plugin"
 msgid "Enable"
 msgstr ""
 
-#: lib/pluginlist.php:196
 msgctxt "plugin-description"
 msgid "(Plugin descriptions unavailable when disabled.)"
 msgstr ""
 
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:88
 msgid "Subscriptions"
 msgstr "გამოწერები"
 
 #. TRANS: Text for user subscription statistics if user has more subscriptions than displayed.
-#: lib/profileaction.php:144
 msgid "All subscriptions"
 msgstr "ყველა გამოწერა"
 
 #. TRANS: H2 text for user subscriber statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:96
 msgid "Subscribers"
 msgstr "გამომწერები"
 
 #. TRANS: Text for user subscription statistics if user has more subscribers than displayed.
-#: lib/profileaction.php:181
 msgid "All subscribers"
 msgstr "ყველა გამომწერი"
 
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:213
 msgid "User ID"
 msgstr "მომხმარებლის იდ"
 
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:219
 msgid "Member since"
 msgstr ""
 
 #. TRANS: Label for user statistics.
 #. TRANS: H2 text for user group membership statistics.
-#: lib/profileaction.php:239 lib/profileaction.php:290
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:104
 msgid "Groups"
 msgstr "ჯგუფები"
 
 #. TRANS: Label for user statistics.
 #. TRANS: Average count of posts made per day since account registration.
-#: lib/profileaction.php:253
 msgid "Daily average"
 msgstr "დღიური საშუალო"
 
 #. TRANS: Text for user group membership statistics if user has more subscriptions than displayed.
-#: lib/profileaction.php:305
 msgid "All groups"
 msgstr "ყველა ჯგუფი"
 
 #. TRANS: Server error displayed when using an unimplemented method.
-#: lib/profileformaction.php:123
 msgid "Unimplemented method."
 msgstr "მეთოდი განუხორციელებელია."
 
-#: lib/publicgroupnav.php:82
 msgid "User groups"
 msgstr ""
 
-#: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
 msgid "Recent tags"
 msgstr "ბოლო სანიშნეები"
 
-#: lib/publicgroupnav.php:88
 msgid "Featured"
 msgstr ""
 
-#: lib/publicgroupnav.php:92
 msgid "Popular"
 msgstr "პოპულარული"
 
-#: lib/redirectingaction.php:95
 msgid "No return-to arguments."
 msgstr ""
 
-#: lib/repeatform.php:107
 msgid "Repeat this notice?"
 msgstr "გავიმეორო ეს შეტყობინება?"
 
-#: lib/repeatform.php:132
 msgid "Yes"
 msgstr "დიახ"
 
-#: lib/repeatform.php:132
 msgid "Repeat this notice"
 msgstr "შეტყობინების გამეორება"
 
-#: lib/revokeroleform.php:91
 #, php-format
 msgid "Revoke the \"%s\" role from this user"
 msgstr "ჩამოართვი \"%s\" როლი ამ მომხმარებელს"
 
 #. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:1001
 #, fuzzy
 msgid "Page not found."
 msgstr "API მეთოდი ვერ მოიძებნა."
 
-#: lib/sandboxform.php:67
 msgid "Sandbox"
 msgstr ""
 
-#: lib/sandboxform.php:78
 msgid "Sandbox this user"
 msgstr "ამ მომხმარებლის იზოლირება"
 
 #. TRANS: Fieldset legend for the search form.
-#: lib/searchaction.php:120
 msgid "Search site"
 msgstr "ძიება საიტზე"
 
 #. TRANS: Used as a field label for the field where one or more keywords
 #. TRANS: for searching can be entered.
-#: lib/searchaction.php:128
 msgid "Keyword(s)"
 msgstr "საკვანძო სიტყვები"
 
 #. TRANS: Button text for searching site.
-#: lib/searchaction.php:130
 msgctxt "BUTTON"
 msgid "Search"
 msgstr ""
 
-#: lib/searchgroupnav.php:80
 msgid "People"
 msgstr "ადამიანები"
 
-#: lib/searchgroupnav.php:81
 msgid "Find people on this site"
 msgstr "მოძებნე ადამიანები ამ საიტზე"
 
-#: lib/searchgroupnav.php:83
 msgid "Find content of notices"
 msgstr "მოძებნე შეტყობინებებში"
 
-#: lib/searchgroupnav.php:85
 msgid "Find groups on this site"
 msgstr "მოძებნე ჯგუფები ამ საიტზე"
 
-#: lib/section.php:89
 msgid "Untitled section"
 msgstr "უსათაურო სექცია"
 
-#: lib/section.php:106
 msgid "More..."
 msgstr "მეტი..."
 
-#: lib/settingsnav.php:78
 msgid "Change your profile settings"
 msgstr "შეცვალე პროფილის პარამეტრები"
 
-#: lib/settingsnav.php:83
 msgid "Upload an avatar"
 msgstr "ატვირთე ავატარი"
 
-#: lib/settingsnav.php:88
 msgid "Change your password"
 msgstr "შეცვალე პაროლი"
 
-#: lib/settingsnav.php:93
 msgid "Change email handling"
 msgstr "ელ. ფოსტის მართვა"
 
-#: lib/settingsnav.php:98
 msgid "Design your profile"
 msgstr "პროფილის პარამეტრები"
 
-#: lib/settingsnav.php:102
 msgid "URL"
 msgstr ""
 
-#: lib/settingsnav.php:103
 msgid "URL shorteners"
 msgstr ""
 
-#: lib/settingsnav.php:111
 msgid "Updates by instant messenger (IM)"
 msgstr "განახლებები ჩათ კლიენტისგან (IM)"
 
-#: lib/settingsnav.php:118
 msgid "Updates by SMS"
 msgstr "განახლებები SMS-თ"
 
-#: lib/settingsnav.php:123
-#, fuzzy
 msgid "Connections"
 msgstr "შეერთებები"
 
-#: lib/settingsnav.php:124
 msgid "Authorized connected applications"
 msgstr "ავტორიზირებული შეერთებული აპლიკაციები"
 
-#: lib/silenceform.php:67
 msgid "Silence"
 msgstr "დადუმება"
 
-#: lib/silenceform.php:78
 msgid "Silence this user"
 msgstr "ამ მომხმარებლის დადუმება"
 
-#: lib/subgroupnav.php:89
 #, php-format
 msgid "People %s subscribes to"
 msgstr ""
 
-#: lib/subgroupnav.php:97
 #, php-format
 msgid "People subscribed to %s"
 msgstr ""
 
-#: lib/subgroupnav.php:105
 #, php-format
 msgid "Groups %s is a member of"
 msgstr ""
 
-#: lib/subgroupnav.php:111
 msgid "Invite"
 msgstr "მოწვევა"
 
-#: lib/subgroupnav.php:112
 #, php-format
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "მოიწვიე მეგობრები და კოლეგები %s-ზე"
 
-#: lib/subscribeform.php:115 lib/subscribeform.php:139
 msgid "Subscribe to this user"
 msgstr "გამოიწერე ეს მომხმარებელი"
 
-#: lib/subscriberspeopleselftagcloudsection.php:48
-#: lib/subscriptionspeopleselftagcloudsection.php:48
 msgid "People Tagcloud as self-tagged"
 msgstr "მომხმარებლების სანიშნეების ღრუბელი (თვითმონიშნული)"
 
-#: lib/subscriberspeopletagcloudsection.php:48
-#: lib/subscriptionspeopletagcloudsection.php:48
 msgid "People Tagcloud as tagged"
 msgstr "მომხმარებლების სანიშნეების ღრუბელი (როგორც სხვებმა მონიშნეს)"
 
-#: lib/tagcloudsection.php:56
 msgid "None"
 msgstr "არაფერი"
 
 #. TRANS: Server exception displayed if a theme name was invalid.
-#: lib/theme.php:74
 #, fuzzy
 msgid "Invalid theme name."
 msgstr "ფაილის არასწორი სახელი."
 
-#: lib/themeuploader.php:50
 msgid "This server cannot handle theme uploads without ZIP support."
 msgstr "ამ სერვერს არ შეუძლია თემების ატვირთვა ZIP-ის მხარდაჭერის გარეშე."
 
-#: lib/themeuploader.php:58 lib/themeuploader.php:61
 msgid "The theme file is missing or the upload failed."
 msgstr "თემის ფაილი არ არის, ან ატვირთვა ვერ მოხერხდა."
 
-#: lib/themeuploader.php:91 lib/themeuploader.php:102
-#: lib/themeuploader.php:279 lib/themeuploader.php:283
-#: lib/themeuploader.php:291 lib/themeuploader.php:298
 msgid "Failed saving theme."
 msgstr "თემის შენახვა ჩაიშალა."
 
-#: lib/themeuploader.php:147
 msgid "Invalid theme: bad directory structure."
 msgstr "არასწორი თემა: დირექტორიების არასწორი სტრუქტურა."
 
-#: lib/themeuploader.php:166
 #, fuzzy, php-format
 msgid "Uploaded theme is too large; must be less than %d byte uncompressed."
 msgid_plural ""
@@ -9569,11 +7924,9 @@ msgid_plural ""
 msgstr[0] ""
 "ატვირთული თემა ძალიან დიდია; შეუკუმშავი უნდა იყოს %d ბაიტზე ნაკლები."
 
-#: lib/themeuploader.php:179
 msgid "Invalid theme archive: missing file css/display.css"
 msgstr "თემის არასწორი არქივი: ფაილი css/display.css არ არის"
 
-#: lib/themeuploader.php:219
 msgid ""
 "Theme contains invalid file or folder name. Stick with ASCII letters, "
 "digits, underscore, and minus sign."
@@ -9581,380 +7934,184 @@ msgstr ""
 "თემა შეიცავს ფაილის ან საქაღალდის არასწორ სახელს. გამოიყენეთ ASCII ასოები, "
 "ციფრები, ქვედა ტირე, და მინუსის ნიშანი."
 
-#: lib/themeuploader.php:225
 msgid "Theme contains unsafe file extension names; may be unsafe."
 msgstr ""
 "თემა ფაილის  გაფართოებების საშიშ სახელებს შეიცავს; შეიძლება არ იყოს უსაფრთხო."
 
-#: lib/themeuploader.php:242
 #, php-format
 msgid "Theme contains file of type '.%s', which is not allowed."
 msgstr "თემა შეიცავს ფაილის ტიპს '.%s', რომელიც აკრძალულია."
 
-#: lib/themeuploader.php:260
 msgid "Error opening theme archive."
 msgstr "თემის არქივის გახსნისას მოხდა შეცდომა."
 
-#: lib/threadednoticelist.php:270
 #, php-format
-msgid "Show all %d comment"
-msgid_plural "Show all %d comments"
+msgid "Show %d reply"
+msgid_plural "Show all %d replies"
 msgstr[0] ""
 
-#: lib/topposterssection.php:74
 msgid "Top posters"
 msgstr "საუკეთესო მპოსტავები"
 
 #. TRANS: Title for the form to unblock a user.
-#: lib/unblockform.php:67
 #, fuzzy
 msgctxt "TITLE"
 msgid "Unblock"
 msgstr "ბლოკირების მოხსნა"
 
-#: lib/unsandboxform.php:69
 msgid "Unsandbox"
 msgstr "იზოლირების მოხსნა"
 
-#: lib/unsandboxform.php:80
 msgid "Unsandbox this user"
 msgstr "ამ მომხმარებლის იზოლირების მოხსნა"
 
-#: lib/unsilenceform.php:67
 msgid "Unsilence"
 msgstr "დადუმების მოხსნა"
 
-#: lib/unsilenceform.php:78
 msgid "Unsilence this user"
 msgstr "ამ მომხმარებლის დადუმების მოხსნა"
 
-#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
 msgid "Unsubscribe from this user"
 msgstr "ამ მომხმარებლის გამოწერის გაუქმება"
 
-#: lib/unsubscribeform.php:137
 msgid "Unsubscribe"
 msgstr "გამოწერის გაუქმება"
 
 #. 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).
-#: lib/usernoprofileexception.php:60
 #, fuzzy, php-format
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "მომხმარებელს პროფილი არ გააჩნია."
 
-#: lib/userprofile.php:116
 msgid "Edit Avatar"
 msgstr "ავატარის რედაქტირება"
 
 #. TRANS: H2 for user actions in a profile.
 #. TRANS: H2 for entity actions in a profile.
-#: lib/userprofile.php:216 lib/userprofile.php:232
 msgid "User actions"
 msgstr "მომხმარებლის მოქმედებები"
 
 #. TRANS: Text shown in user profile of not yet compeltely deleted users.
-#: lib/userprofile.php:220
 msgid "User deletion in progress..."
 msgstr "მომხმარებლის წაშლა პროგრესშია..."
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:248
 msgid "Edit profile settings"
 msgstr "პროფილის პარამეტრების რედაქტირება"
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:250
 msgid "Edit"
 msgstr "რედაქტირება"
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:274
 msgid "Send a direct message to this user"
 msgstr "გაუგზავნე პირდაპირი შეტყობინება ამ მომხმარებელს"
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:276
 msgid "Message"
 msgstr "შეტყობინება"
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:318
 msgid "Moderate"
 msgstr "მოდერაცია"
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:357
 msgid "User role"
 msgstr "მომხმარებლის როლი"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:360
 msgctxt "role"
 msgid "Administrator"
 msgstr "ადმინისტრატორი"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:362
 msgctxt "role"
 msgid "Moderator"
 msgstr "მოდერატორი"
 
-#: lib/util.php:321
 #, fuzzy
 msgid "Not allowed to log in."
 msgstr "ავტორიზებული არ ხართ."
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1337
 msgid "a few seconds ago"
 msgstr "რამდენიმე წამის წინ"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1340
 msgid "about a minute ago"
 msgstr "დაახლოებით 1 წუთის წინ"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1344
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
 msgstr[0] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1347
 msgid "about an hour ago"
 msgstr "დაახლოებით 1 საათის წინ"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1351
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
 msgstr[0] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1354
 msgid "about a day ago"
 msgstr "დაახლოებით 1 დღის წინ"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1358
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
 msgstr[0] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1361
 msgid "about a month ago"
 msgstr "დაახლოებით 1 თვის წინ"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1365
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
 msgstr[0] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1368
 msgid "about a year ago"
 msgstr "დაახლოებით 1 წლის წინ"
 
 #. TRANS: Web color exception thrown when a hexadecimal color code does not validate.
 #. TRANS: %s is the provided (invalid) color code.
-#: lib/webcolor.php:81 lib/webcolor.php:121
 #, fuzzy, php-format
 msgid "%s is not a valid color! Use 3 or 6 hex characters."
 msgstr ""
 "%s არ არის სწორი ფერი! გამოიყენეთ 3 ან 6 სიმბოლოიანი თექვსმეტობითი ციფრი."
 
 #. TRANS: Exception.
-#: lib/xrd.php:63
 #, fuzzy
 msgid "Invalid XML."
 msgstr "ზომა არასწორია."
 
 #. TRANS: Exception.
-#: lib/xrd.php:68
 msgid "Invalid XML, missing XRD root."
 msgstr ""
 
 #. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
-#: scripts/restoreuser.php:62
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
 
-#, fuzzy
-#~ msgid "Could not generate feed for group - %s"
-#~ msgstr "ჯგუფის განახლება ვერ მოხერხდა."
+#~ msgid "Full name is too long (max 255 chars)."
+#~ msgstr "სრული სახელი ძალიან გრძელია (არაუმეტეს 255 სიმბოლო)."
+
+#~ msgid "description is too long (max %d chars)."
+#~ msgstr "აღწერა ძალიან გრძელია (არაუმეტეს %d სიმბოლო)."
+
+#~ msgid "Location is too long (max 255 chars)."
+#~ msgstr "ადგილმდებარეობა ძალიან გრძელია (არაუმეტეს 255 სიმბოლო)."
 
 #, fuzzy
-#~ msgid "Current confirmed Jabber/Google Talk address."
-#~ msgstr "მიმდინარე დადასტურებული Jabber/GTalk მისამართი."
-
-#, fuzzy
-#~ msgid ""
-#~ "Jabber or Google Talk address, like \"UserName@example.org\". First, make "
-#~ "sure to add %s to your buddy list in your IM client or on Google Talk."
-#~ msgstr ""
-#~ "Jabber ან GTalk მისამართი, როგორც \"UserName@example.org\". პირველ რიგში "
-#~ "დარწმუნდით, რომ დაიმატეთ %s მეგობრების სიაში თქვენს IM კლიენტში ან GTalk-"
-#~ "ში."
-
-#, fuzzy
-#~ msgid "Send me notices through Jabber/Google Talk."
-#~ msgstr "გამომიგზავნე შეტყობინებები  Jabber/GTalk-ის მეშვეობით."
-
-#, fuzzy
-#~ msgid "Publish a MicroID for my Jabber/Google Talk address."
-#~ msgstr "გამოაქვეყნე  MicroID ჩემი Jabber/GTalk მისამართისთვის."
-
-#~ msgid "No Jabber ID."
-#~ msgstr "Jabber ID უცნობია."
-
-#, fuzzy
-#~ msgid "Not a valid Jabber ID."
-#~ msgstr "არასწორი Jabber ID"
-
-#~ msgid "That is already your Jabber ID."
-#~ msgstr "ეს უკვე არის თქვენი Jabber ID."
-
-#~ msgid "That is not your Jabber ID."
-#~ msgstr "ეს არ არის თქვენი Jabber ID"
-
-#~ msgid "Other settings"
-#~ msgstr "სხვა პარამეტრები"
-
-#~ msgid "Tag cloud"
-#~ msgstr "სანიშნეების ღრუბელი"
-
-#~ msgid "Consumer key"
-#~ msgstr "მომხმარებლის გასაღები"
-
-#~ msgid "Consumer secret"
-#~ msgstr "მომხმარებლის საიდუმლო"
-
-#~ msgid "Authorize URL"
-#~ msgstr "URL-ის ავტორიზაცია"
-
-#~ msgid "Jabber"
-#~ msgstr "Jabber"
-
-#~ msgid "Photo"
-#~ msgstr "ფოტო"
-
-#~ msgid "Other options"
-#~ msgstr "სხვა ოფციები"
-
-#~ msgid "Other"
-#~ msgstr "სხვა"
-
-#~ msgid "Primary site navigation"
-#~ msgstr "საიტის ძირითადი ნავიგაცია"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Personal profile and friends timeline"
-#~ msgstr "პირადი პროფილი და მეგობრების ნაკადი"
-
-#~ msgctxt "MENU"
-#~ msgid "Personal"
-#~ msgstr "პირადი"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Change your email, avatar, password, profile"
-#~ msgstr "შეცვალე ელ. ფოსტა, ავატარი, პაროლი, პროფილი"
-
-#~ msgid "Account"
-#~ msgstr "ანგარიში"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Connect to services"
-#~ msgstr "სერვისებთან დაკავშირება"
-
-#~ msgid "Connect"
-#~ msgstr "კავშირი"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Change site configuration"
-#~ msgstr "საიტის კონფიგურაცია"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Invite friends and colleagues to join you on %s"
-#~ msgstr "მოიწვიე მეგობრები და კოლეგები %s-ზე"
-
-#~ msgctxt "MENU"
-#~ msgid "Invite"
-#~ msgstr "მოწვევა"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Create an account"
-#~ msgstr "გახსენი ანგარიში"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Help me!"
-#~ msgstr "დამეხმარეთ!"
-
-#~ msgctxt "MENU"
-#~ msgid "Help"
-#~ msgstr "დახმარება"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Search for people or text"
-#~ msgstr "მოძებნე ხალხი ან ტექსტი"
-
-#~ msgid "Local views"
-#~ msgstr "ლოკალური ხედები"
-
-#~ msgid "Page notice"
-#~ msgstr "გვერდის შეტყობინება"
-
-#~ msgid "Secondary site navigation"
-#~ msgstr "საიტის მეორადი ნავიგაცია"
-
-#~ msgid "StatusNet software license"
-#~ msgstr "StatusNet კოდის ლიცენზია"
-
-#~ msgid "Site content license"
-#~ msgstr "საიტის შიგთავსის ლიცენზია"
-
-#~ msgid "Pagination"
-#~ msgstr "გვერდებათ დაყოფა"
-
-#~ msgid "Author"
-#~ msgstr "ავტორი"
-
-#~ msgid "Provider"
-#~ msgstr "მომწოდებელი"
-
-#, fuzzy
-#~ msgctxt "MENU"
-#~ msgid "SMS"
-#~ msgstr "SMS"
-
-#~ msgid "Filter tags"
-#~ msgstr "სანიშნეების გაფილტვრა"
-
-#~ msgid "[%s]"
-#~ msgstr "[%s]"
-
-#~ msgid "Available characters"
-#~ msgstr "ხელმისაწვდომი სიმბოლოები"
-
-#, fuzzy
-#~ msgctxt "MENU"
-#~ msgid "Profile"
-#~ msgstr "პროფილი"
-
-#~ msgid "Search help"
-#~ msgstr "ძიება დახმარებაში"
-
-#, fuzzy
-#~ msgid "Message too long. Maximum is %1$d character, you sent %2$d."
-#~ msgid_plural "Message too long. Maximum is %1$d characters, you sent %2$d."
-#~ msgstr[0] ""
-#~ "შეტყობინება ძალიან გრძელია - დასაშვები რაოდენობაა %1$d სიმბოლომდე, თქვენ "
-#~ "გააგზავნეთ %2$d."
+#~ msgctxt "BUTTON"
+#~ msgid "Comment"
+#~ msgstr "შიგთავსი"
diff --git a/locale/ko/LC_MESSAGES/statusnet.po b/locale/ko/LC_MESSAGES/statusnet.po
index ad6af84903..33e9120240 100644
--- a/locale/ko/LC_MESSAGES/statusnet.po
+++ b/locale/ko/LC_MESSAGES/statusnet.po
@@ -11,67 +11,57 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:23+0000\n"
-"PO-Revision-Date: 2011-03-03 17:26:12+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:28+0000\n"
 "Language-Team: Korean <http://translatewiki.net/wiki/Portal:ko>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ko\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-POT-Import-Date: 2011-02-25 23:49:23+0000\n"
+"X-POT-Import-Date: 2011-03-03 17:59:19+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
-#: actions/accessadminpanel.php:53 lib/adminpanelaction.php:363
 msgid "Access"
 msgstr "접근"
 
 #. TRANS: Page notice.
-#: actions/accessadminpanel.php:64
 msgid "Site access settings"
 msgstr "사이트 접근 설정"
 
 #. TRANS: Form legend for registration form.
-#: actions/accessadminpanel.php:151
 msgid "Registration"
 msgstr "등록"
 
 #. TRANS: Checkbox instructions for admin setting "Private".
-#: actions/accessadminpanel.php:155
 msgid "Prohibit anonymous users (not logged in) from viewing site?"
 msgstr "로그인하지 않은 익명 이용자의 사이트 보기 금지"
 
 #. TRANS: Checkbox label for prohibiting anonymous users from viewing site.
-#: actions/accessadminpanel.php:157
 msgctxt "LABEL"
 msgid "Private"
 msgstr "비공개"
 
 #. TRANS: Checkbox instructions for admin setting "Invite only".
-#: actions/accessadminpanel.php:164
 msgid "Make registration invitation only."
 msgstr "초대받은 경우만 등록허용"
 
 #. TRANS: Checkbox label for configuring site as invite only.
-#: actions/accessadminpanel.php:166
 msgid "Invite only"
 msgstr "초대 전용"
 
 #. TRANS: Checkbox instructions for admin setting "Closed" (no new registrations).
-#: actions/accessadminpanel.php:173
 msgid "Disable new registrations."
 msgstr "신규회원등록 기능차단"
 
 #. TRANS: Checkbox label for disabling new user registrations.
-#: actions/accessadminpanel.php:175
 msgid "Closed"
 msgstr "폐쇄"
 
 #. TRANS: Title for button to save access settings in site admin panel.
-#: actions/accessadminpanel.php:191
 msgid "Save access settings"
 msgstr "접근 설정을 저장"
 
@@ -79,6 +69,7 @@ msgstr "접근 설정을 저장"
 #. TRANS: Button text for saving theme settings.
 #. TRANS: Button label to save e-mail preferences.
 #. TRANS: Button label to save IM preferences.
+#. TRANS: Button text in the license admin panel.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
 #. TRANS: Button text for saving site notice in admin panel.
@@ -88,21 +79,12 @@ msgstr "접근 설정을 저장"
 #. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
 #. TRANS: Button text on profile design page to save settings.
-#: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
-#: actions/emailsettings.php:251 actions/imsettings.php:199
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:198
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:204
-#: actions/subscriptions.php:261 actions/urlsettings.php:152
-#: actions/useradminpanel.php:298 lib/applicationeditform.php:355
-#: lib/designform.php:320 lib/groupeditform.php:201
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "저장"
 
 #. TRANS: Server error when page not found (404).
 #. TRANS: Server error when page not found (404)
-#: actions/all.php:68 actions/public.php:98 actions/replies.php:93
-#: actions/showfavorites.php:140 actions/tag.php:52
 msgid "No such page."
 msgstr "해당하는 페이지 없음"
 
@@ -121,6 +103,7 @@ msgstr "해당하는 페이지 없음"
 #. TRANS: Client error displayed when checking group membership for a non-existing user.
 #. TRANS: Client error displayed when trying to have a non-existing user join a group.
 #. TRANS: Client error displayed when trying to have a non-existing user leave a group.
+#. TRANS: Client error displayed when not providing a user or an invalid user.
 #. TRANS: Client error displayed when updating a status for a non-existing user.
 #. TRANS: Client error displayed when requesting a list of followers for a non-existing user.
 #. TRANS: Client error displayed when requesting most recent favourite notices by a user for a non-existing user.
@@ -133,6 +116,8 @@ msgstr "해당하는 페이지 없음"
 #. 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.
 #. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
@@ -140,33 +125,10 @@ msgstr "해당하는 페이지 없음"
 #. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when calling a profile action without specifying a user.
-#: actions/all.php:80 actions/allrss.php:69
-#: actions/apiaccountupdatedeliverydevice.php:110
-#: actions/apiaccountupdateprofile.php:103
-#: actions/apiaccountupdateprofilebackgroundimage.php:118
-#: actions/apiaccountupdateprofileimage.php:104 actions/apiatomservice.php:59
-#: actions/apiblockcreate.php:96 actions/apiblockdestroy.php:94
-#: actions/apidirectmessage.php:75 actions/apidirectmessagenew.php:72
-#: actions/apigroupcreate.php:111 actions/apigroupismember.php:89
-#: actions/apigroupjoin.php:98 actions/apigroupleave.php:98
-#: actions/apigrouplist.php:70 actions/apigroupprofileupdate.php:108
-#: actions/apistatusesupdate.php:230 actions/apisubscriptions.php:85
-#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:173
-#: actions/apitimelinehome.php:78 actions/apitimelinementions.php:77
-#: actions/apitimelineuser.php:79 actions/avatarbynickname.php:79
-#: actions/favoritesrss.php:72 actions/foaf.php:42 actions/foaf.php:61
-#: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116
-#: actions/otp.php:78 actions/remotesubscribe.php:144
-#: actions/remotesubscribe.php:153 actions/replies.php:73
-#: actions/repliesrss.php:38 actions/rsd.php:113 actions/showfavorites.php:106
-#: actions/userbyid.php:75 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/userxrd.php:59 actions/xrds.php:71 lib/command.php:509
-#: lib/galleryaction.php:59 lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "해당하는 이용자 없음"
 
 #. TRANS: Page title. %1$s is user nickname, %2$d is page number
-#: actions/all.php:91
 #, php-format
 msgid "%1$s and friends, page %2$d"
 msgstr "%s 및 친구들, %d 페이지"
@@ -175,33 +137,26 @@ msgstr "%s 및 친구들, %d 페이지"
 #. TRANS: H1 text for page. %s is a user nickname.
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Timeline title for user and friends. %s is a user nickname.
-#: actions/all.php:94 actions/all.php:191 actions/allrss.php:117
-#: actions/apitimelinefriends.php:207 actions/apitimelinehome.php:113
-#: lib/personalgroupnav.php:100
 #, php-format
 msgid "%s and friends"
 msgstr "%s 및 친구들"
 
 #. TRANS: %s is user nickname.
-#: actions/all.php:108
 #, php-format
 msgid "Feed for friends of %s (RSS 1.0)"
 msgstr "%s의 친구들에 대한 피드 (RSS 1.0)"
 
 #. TRANS: %s is user nickname.
-#: actions/all.php:117
 #, php-format
 msgid "Feed for friends of %s (RSS 2.0)"
 msgstr "%s의 친구들에 대한 피드 (RSS 2.0)"
 
 #. TRANS: %s is user nickname.
-#: actions/all.php:126
 #, php-format
 msgid "Feed for friends of %s (Atom)"
 msgstr "%s의 친구들에 대한 피드 (Atom)"
 
 #. TRANS: Empty list message. %s is a user nickname.
-#: actions/all.php:139
 #, php-format
 msgid ""
 "This is the timeline for %s and friends but no one has posted anything yet."
@@ -209,7 +164,6 @@ msgstr "%s 및 친구들의 타임라인이지만, 아직 아무도 글을 작
 
 #. TRANS: Encouragement displayed on logged in user's empty timeline.
 #. TRANS: This message contains Markdown links. Keep "](" together.
-#: actions/all.php:146
 #, php-format
 msgid ""
 "Try subscribing to more people, [join a group](%%action.groups%%) or post "
@@ -220,7 +174,6 @@ msgstr ""
 
 #. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@".
 #. TRANS: This message contains Markdown links. Keep "](" together.
-#: actions/all.php:150
 #, php-format
 msgid ""
 "You can try to [nudge %1$s](../%2$s) from their profile or [post something "
@@ -231,7 +184,6 @@ msgstr ""
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
 #. TRANS: Second sentence of empty message for anonymous users. %s is a user nickname.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:221
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -239,14 +191,11 @@ msgid ""
 msgstr ""
 
 #. TRANS: H1 text for page when viewing a list for self.
-#: actions/all.php:188
 msgid "You and friends"
 msgstr "당신 및 친구들"
 
 #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
 #. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name.
-#: actions/allrss.php:122 actions/apitimelinefriends.php:213
-#: actions/apitimelinehome.php:119
 #, php-format
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr "%2$s에 있는 %1$s 및 친구들의 업데이트!"
@@ -265,55 +214,20 @@ msgstr "%2$s에 있는 %1$s 및 친구들의 업데이트!"
 #. TRANS: Client error displayed trying to execute an unknown API method checking group membership.
 #. TRANS: Client error displayed trying to execute an unknown API method listing the latest 20 groups.
 #. TRANS: Client error displayed trying to execute an unknown API method showing group membership.
+#. TRANS: Client error displayed when using an unsupported API format.
 #. TRANS: Client error displayed trying to execute an unknown API method showing a group.
 #. TRANS: Client error displayed trying to execute an unknown API method testing API connectivity.
 #. TRANS: Client error displayed trying to execute an unknown API method deleting a status.
 #. TRANS: Client error displayed when trying to handle an unknown API method.
-#: actions/apiaccountratelimitstatus.php:69
-#: actions/apiaccountupdatedeliverydevice.php:92
-#: actions/apiaccountupdateprofile.php:94
-#: actions/apiaccountupdateprofilebackgroundimage.php:92
-#: actions/apiaccountupdateprofilecolors.php:115
-#: actions/apiaccountverifycredentials.php:68 actions/apidirectmessage.php:157
-#: actions/apifavoritecreate.php:98 actions/apifavoritedestroy.php:98
-#: actions/apifriendshipscreate.php:99 actions/apifriendshipsdestroy.php:99
-#: actions/apifriendshipsshow.php:124 actions/apigroupcreate.php:138
-#: actions/apigroupismember.php:115 actions/apigroupjoin.php:151
-#: actions/apigroupleave.php:141 actions/apigrouplist.php:134
-#: actions/apigrouplistall.php:120 actions/apigroupmembership.php:105
-#: actions/apigroupprofileupdate.php:100 actions/apigroupprofileupdate.php:213
-#: actions/apigroupshow.php:114 actions/apihelptest.php:84
-#: actions/apistatusesdestroy.php:101 actions/apistatusesretweets.php:110
-#: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:139
-#: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
-#: actions/apitimelinefavorites.php:182 actions/apitimelinefriends.php:276
-#: actions/apitimelinegroup.php:148 actions/apitimelinehome.php:181
-#: actions/apitimelinementions.php:182 actions/apitimelinepublic.php:247
-#: actions/apitimelineretweetedtome.php:147
-#: actions/apitimelineretweetsofme.php:147 actions/apitimelinetag.php:165
-#: actions/apitimelineuser.php:217 actions/apiusershow.php:100
 msgid "API method not found."
 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.
-#: actions/apiaccountupdatedeliverydevice.php:83
-#: actions/apiaccountupdateprofile.php:85
-#: actions/apiaccountupdateprofilebackgroundimage.php:83
-#: actions/apiaccountupdateprofilecolors.php:106
-#: actions/apiaccountupdateprofileimage.php:80 actions/apiblockcreate.php:87
-#: actions/apiblockdestroy.php:85 actions/apidirectmessagenew.php:107
-#: actions/apifavoritecreate.php:88 actions/apifavoritedestroy.php:88
-#: actions/apifriendshipscreate.php:89 actions/apifriendshipsdestroy.php:89
-#: actions/apigroupcreate.php:102 actions/apigroupjoin.php:89
-#: actions/apigroupleave.php:89 actions/apigroupprofileupdate.php:92
-#: actions/apimediaupload.php:66 actions/apistatusesretweet.php:63
-#: actions/apistatusesupdate.php:194
 msgid "This method requires a POST."
 msgstr "이 메서드는 POST를 요구합니다."
 
 #. TRANS: Client error displayed when no valid device parameter is provided for a user's delivery device setting.
-#: actions/apiaccountupdatedeliverydevice.php:103
 msgid ""
 "You must specify a parameter named 'device' with a value of one of: sms, im, "
 "none."
@@ -326,10 +240,6 @@ msgstr ""
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
-#: actions/apiaccountupdatedeliverydevice.php:136
-#: actions/emailsettings.php:353 actions/emailsettings.php:499
-#: actions/profilesettings.php:323 actions/smssettings.php:300
-#: actions/smssettings.php:453 actions/urlsettings.php:211
 msgid "Could not update user."
 msgstr "이용자를 업데이트 할 수 없습니다."
 
@@ -342,32 +252,17 @@ msgstr "이용자를 업데이트 할 수 없습니다."
 #. TRANS: Server error displayed when requesting Friends of a Friend feed for a user for which the profile could not be found.
 #. TRANS: Server error displayed when trying to get a user hCard for a user without a profile.
 #. TRANS: Server error displayed when calling a profile action while the specified user does not have a profile.
-#: actions/apiaccountupdateprofile.php:111
-#: actions/apiaccountupdateprofilebackgroundimage.php:199
-#: actions/apiaccountupdateprofilecolors.php:183
-#: actions/apiaccountupdateprofileimage.php:131
-#: actions/apiuserprofileimage.php:88 actions/apiusershow.php:108
-#: actions/avatarbynickname.php:85 actions/foaf.php:69 actions/hcard.php:75
-#: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
-#: lib/profileaction.php:85
 msgid "User has no profile."
 msgstr "이용자가 프로필을 가지고 있지 않습니다."
 
 #. TRANS: Server error displayed if a user profile could not be saved.
 #. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:419
 msgid "Could not save profile."
 msgstr "프로필을 저장 할 수 없습니다."
 
 #. TRANS: Client error displayed when the number of bytes in a POST request exceeds a limit.
 #. TRANS: %s is the number of bytes of the CONTENT_LENGTH.
 #. TRANS: Form validation error in design settings form. POST should remain untranslated.
-#: actions/apiaccountupdateprofilebackgroundimage.php:108
-#: actions/apiaccountupdateprofileimage.php:95 actions/apimediaupload.php:81
-#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
-#: actions/designadminpanel.php:120 actions/editapplication.php:121
-#: actions/newapplication.php:102 actions/newnotice.php:95
-#: lib/designsettings.php:110
 #, fuzzy, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s byte) due to its "
@@ -384,26 +279,15 @@ msgstr[0] ""
 #. TRANS: Client error displayed when a database error occurs inserting profile colours.
 #. TRANS: Client error displayed when a database error occurs updating profile colours.
 #. TRANS: Form validation error displayed when group design settings could not be saved because of an application issue.
-#: actions/apiaccountupdateprofilebackgroundimage.php:138
-#: actions/apiaccountupdateprofilebackgroundimage.php:149
-#: actions/apiaccountupdateprofilecolors.php:160
-#: actions/apiaccountupdateprofilecolors.php:171
-#: actions/groupdesignsettings.php:285 actions/groupdesignsettings.php:296
-#: actions/userdesignsettings.php:218 actions/userdesignsettings.php:228
-#: actions/userdesignsettings.php:270 actions/userdesignsettings.php:280
 msgid "Unable to save your design settings."
 msgstr "디자인 설정을 저장할 수 없습니다."
 
 #. TRANS: Error displayed when updating design settings fails.
 #. TRANS: Client error displayed when a database error occurs updating profile colours.
-#: actions/apiaccountupdateprofilebackgroundimage.php:191
-#: actions/apiaccountupdateprofilecolors.php:139
-#: actions/userdesignsettings.php:196
 msgid "Could not update your design."
 msgstr "디자인을 업데이트 할 수 없습니다."
 
 #. TRANS: Title for Atom feed.
-#: actions/apiatomservice.php:85
 msgctxt "ATOM"
 msgid "Main"
 msgstr ""
@@ -412,9 +296,6 @@ msgstr ""
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Title in atom group notice feed. %s is a group name.
 #. TRANS: Title in atom user notice feed. %s is a user name.
-#: actions/apiatomservice.php:93 actions/grouprss.php:138
-#: actions/userrss.php:94 lib/atomgroupnoticefeed.php:63
-#: lib/atomusernoticefeed.php:88
 #, php-format
 msgid "%s timeline"
 msgstr "%s 타임라인"
@@ -424,8 +305,6 @@ msgstr "%s 타임라인"
 #. TRANS: %s is a user nickname.
 #. TRANS: Header for subscriptions overview for a user (first page).
 #. TRANS: %s is a user nickname.
-#: actions/apiatomservice.php:104 actions/atompubsubscriptionfeed.php:148
-#: actions/subscriptions.php:51
 #, php-format
 msgid "%s subscriptions"
 msgstr "%s 구독"
@@ -433,58 +312,48 @@ msgstr "%s 구독"
 #. TRANS: Title for Atom feed with a user's favorite notices. %s is a user nickname.
 #. TRANS: Title for Atom favorites feed.
 #. TRANS: %s is a user nickname.
-#: actions/apiatomservice.php:115 actions/atompubfavoritefeed.php:142
 #, fuzzy, php-format
 msgid "%s favorites"
 msgstr "좋아하는 글들"
 
 #. TRANS: Title for Atom feed with a user's memberships. %s is a user nickname.
-#: actions/apiatomservice.php:126
 #, fuzzy, php-format
 msgid "%s memberships"
 msgstr "%s 그룹 회원"
 
 #. TRANS: Client error displayed when users try to block themselves.
-#: actions/apiblockcreate.php:105
 msgid "You cannot block yourself!"
 msgstr "자기 자신은 차단할 수 없습니다."
 
 #. TRANS: Server error displayed when blocking a user has failed.
-#: actions/apiblockcreate.php:127
 msgid "Block user failed."
 msgstr "이용자 차단에 실패했습니다."
 
 #. TRANS: Server error displayed when unblocking a user has failed.
-#: actions/apiblockdestroy.php:113
 msgid "Unblock user failed."
 msgstr "이용자 차단 해제에 실패했습니다."
 
 #. TRANS: Title. %s is a user nickname.
-#: actions/apidirectmessage.php:88
 #, php-format
 msgid "Direct messages from %s"
 msgstr "%s으로부터 직접 메시지"
 
 #. TRANS: Subtitle. %s is a user nickname.
-#: actions/apidirectmessage.php:93
 #, php-format
 msgid "All the direct messages sent from %s"
 msgstr "%s에서 보낸 모든 직접 메시지"
 
 #. TRANS: Title. %s is a user nickname.
-#: actions/apidirectmessage.php:102
 #, php-format
 msgid "Direct messages to %s"
 msgstr "%s에게 직접 메시지"
 
 #. TRANS: Subtitle. %s is a user nickname.
-#: actions/apidirectmessage.php:107
 #, php-format
 msgid "All the direct messages sent to %s"
 msgstr "%s에게 모든 직접 메시지"
 
 #. TRANS: Client error displayed when no message text was submitted (406).
-#: actions/apidirectmessagenew.php:117
 msgid "No message text!"
 msgstr "메시지 내용이 없습니다!"
 
@@ -492,25 +361,21 @@ msgstr "메시지 내용이 없습니다!"
 #. TRANS: %d is the maximum number of characters for a message.
 #. TRANS: Form validation error displayed when message content is too long.
 #. TRANS: %d is the maximum number of characters for a message.
-#: actions/apidirectmessagenew.php:127 actions/newmessage.php:152
 #, fuzzy, php-format
 msgid "That's too long. Maximum message size is %d character."
 msgid_plural "That's too long. Maximum message size is %d characters."
 msgstr[0] "너무 깁니다. 최대 메시지 길이는 %d자 까지입니다."
 
 #. TRANS: Client error displayed if a recipient user could not be found (403).
-#: actions/apidirectmessagenew.php:139
 msgid "Recipient user not found."
 msgstr "받는 사용자가 없습니다."
 
 #. TRANS: Client error displayed trying to direct message another user who's not a friend (403).
-#: actions/apidirectmessagenew.php:144
 #, fuzzy
 msgid "Cannot send direct messages to users who aren't your friend."
 msgstr "당신의 친구가 아닌 사용자에게 직접 메시지를 보낼 수 없습니다."
 
 #. TRANS: Client error displayed trying to direct message self (403).
-#: actions/apidirectmessagenew.php:154
 #, fuzzy
 msgid ""
 "Do not send a message to yourself; just say it to yourself quietly instead."
@@ -520,118 +385,98 @@ 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.
 #. TRANS: Client error displayed trying to delete a status with an invalid ID.
-#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:108
-#: actions/apistatusesdestroy.php:121
 msgid "No status found with that ID."
 msgstr "그 ID로 발견된 상태가 없습니다."
 
 #. TRANS: Client error displayed when trying to mark a notice favourite that already is a favourite.
-#: actions/apifavoritecreate.php:120
 msgid "This status is already a favorite."
 msgstr "이 소식은 이미 관심소식으로 등록되어 있습니다."
 
 #. TRANS: Client error displayed when marking a notice as favourite fails.
 #. TRANS: Server error displayed when trying to mark a notice as favorite fails in the database.
 #. TRANS: Error message text shown when a favorite could not be set.
-#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:306
 msgid "Could not create favorite."
 msgstr "관심소식을 생성할 수 없습니다."
 
 #. TRANS: Client error displayed when trying to remove a favourite that was not a favourite.
-#: actions/apifavoritedestroy.php:122
 msgid "That status is not a favorite."
 msgstr "이 소식은 관심소식이 아닙니다."
 
 #. TRANS: Client error displayed when removing a favourite has failed.
 #. TRANS: Server error displayed when removing a favorite from the database fails.
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:90
 msgid "Could not delete favorite."
 msgstr "관심소식을 삭제할 수 없습니다."
 
 #. TRANS: Client error displayed when trying follow who's profile could not be found.
-#: actions/apifriendshipscreate.php:109
 msgid "Could not follow user: profile not found."
 msgstr "언팔로우할 수 없습니다: 이용자 없음."
 
 #. TRANS: Client error displayed when trying to follow a user that's already being followed.
 #. TRANS: %s is the nickname of the user that is already being followed.
-#: actions/apifriendshipscreate.php:120
 #, php-format
 msgid "Could not follow user: %s is already on your list."
 msgstr "팔로우할 수 없습니다 : %s 님은 이미 리스트에 있습니다."
 
 #. TRANS: Client error displayed when trying to unfollow a user that cannot be found.
-#: actions/apifriendshipsdestroy.php:109
 msgid "Could not unfollow user: User not found."
 msgstr "언팔로우할 수 없습니다: 이용자 없음."
 
 #. TRANS: Client error displayed when trying to unfollow self.
-#: actions/apifriendshipsdestroy.php:121
 msgid "You cannot unfollow yourself."
 msgstr "자기 자신을 언팔로우할 수 없습니다."
 
 #. TRANS: Client error displayed when supplying invalid parameters to an API call checking if a friendship exists.
-#: actions/apifriendshipsexists.php:88
 #, fuzzy
 msgid "Two valid IDs or nick names must be supplied."
 msgstr "두 개의 사용자 ID나 대화명을 입력해야 합니다."
 
 #. TRANS: Client error displayed when a source user could not be determined showing friendship.
-#: actions/apifriendshipsshow.php:131
 msgid "Could not determine source user."
 msgstr "소스 이용자를 확인할 수 없습니다."
 
 #. TRANS: Client error displayed when a target user could not be determined showing friendship.
-#: actions/apifriendshipsshow.php:140
 msgid "Could not find target user."
 msgstr "타겟 이용자를 찾을 수 없습니다."
 
 #. TRANS: Client error trying to create a group with a nickname this is already in use.
+#. TRANS: API validation exception thrown when nickname is already used.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:156 actions/apigroupprofileupdate.php:255
-#: actions/editgroup.php:191 actions/newgroup.php:137
-#: actions/profilesettings.php:274 actions/register.php:199
 msgid "Nickname already in use. Try another one."
 msgstr "별명이 이미 사용중 입니다. 다른 별명을 시도해 보십시오."
 
 #. TRANS: Client error in form for group creation.
+#. TRANS: API validation exception thrown when nickname does not validate.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:164 actions/apigroupprofileupdate.php:259
-#: actions/editgroup.php:195 actions/newgroup.php:141
-#: actions/profilesettings.php:244 actions/register.php:201
 msgid "Not a valid nickname."
 msgstr "유효한 별명이 아닙니다"
 
 #. TRANS: Client error in form for group creation.
+#. TRANS: API validation exception thrown when homepage URL does not validate.
 #. TRANS: Validation error shown when providing an invalid homepage URL in the "Edit application" form.
 #. TRANS: Group edit form validation error.
 #. TRANS: Validation error shown when providing an invalid homepage URL in the "New application" form.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:181 actions/apigroupprofileupdate.php:277
-#: actions/editapplication.php:235 actions/editgroup.php:202
-#: actions/newapplication.php:221 actions/newgroup.php:148
-#: actions/profilesettings.php:249 actions/register.php:208
 msgid "Homepage is not a valid URL."
 msgstr "홈페이지 주소형식이 올바르지 않습니다."
 
 #. TRANS: Client error in form for group creation.
+#. TRANS: API validation exception thrown when full name does not validate.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:191 actions/editgroup.php:206
-#: actions/newgroup.php:152 actions/profilesettings.php:253
-#: actions/register.php:211
 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "실명이 너무 깁니다. (최대 255글자)"
 
 #. TRANS: Client error shown when providing too long a description during group creation.
 #. TRANS: %d is the maximum number of allowed characters.
+#. TRANS: API validation exception thrown when description does not validate.
+#. TRANS: %d is the maximum description length and used for plural.
 #. TRANS: Validation error shown when providing too long a description in the "Edit application" form.
 #. TRANS: %d is the maximum number of allowed characters.
 #. TRANS: Group edit form validation error.
@@ -639,33 +484,28 @@ msgstr "실명이 너무 깁니다. (최대 255글자)"
 #. TRANS: %d is the maximum number of characters for the description.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed characters.
-#: actions/apigroupcreate.php:201 actions/editapplication.php:202
-#: actions/editgroup.php:211 actions/newapplication.php:182
-#: actions/newgroup.php:157
 #, fuzzy, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."
 msgstr[0] "설명이 너무 깁니다. (최대 %d 글자)"
 
 #. TRANS: Client error shown when providing too long a location during group creation.
+#. TRANS: API validation exception thrown when location does not validate.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:215 actions/editgroup.php:218
-#: actions/newgroup.php:164 actions/profilesettings.php:266
-#: actions/register.php:220
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
 msgstr "위치가 너무 깁니다. (최대 255글자)"
 
 #. TRANS: Client error shown when providing too many aliases during group creation.
 #. TRANS: %d is the maximum number of allowed aliases.
+#. TRANS: API validation exception thrown when aliases do not validate.
+#. TRANS: %d is the maximum number of aliases and used for plural.
 #. TRANS: Group edit form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.
-#: actions/apigroupcreate.php:236 actions/editgroup.php:231
-#: actions/newgroup.php:177
 #, fuzzy, php-format
 msgid "Too many aliases! Maximum %d allowed."
 msgid_plural "Too many aliases! Maximum %d allowed."
@@ -673,25 +513,24 @@ msgstr[0] "별명이 너무 많습니다! 최대 %d개."
 
 #. TRANS: Client error shown when providing an invalid alias during group creation.
 #. TRANS: %s is the invalid alias.
-#: actions/apigroupcreate.php:253
+#. TRANS: API validation exception thrown when aliases does not validate.
+#. TRANS: %s is the invalid alias.
 #, fuzzy, php-format
 msgid "Invalid alias: \"%s\"."
 msgstr "사용할 수 없는 별명 : \"%s\""
 
 #. TRANS: Client error displayed when trying to use an alias during group creation that is already in use.
 #. TRANS: %s is the alias that is already in use.
+#. TRANS: API validation exception thrown when aliases is already used.
+#. TRANS: %s is the already used alias.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error. %s is the already used alias.
-#: actions/apigroupcreate.php:264 actions/apigroupprofileupdate.php:351
-#: actions/editgroup.php:246 actions/newgroup.php:193
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "별명 \"%s\" 이 이미 사용중 입니다. 다른 별명을 시도해 보십시오."
 
 #. TRANS: Client error displayed when trying to use an alias during group creation that is the same as the group's nickname.
 #. TRANS: Group edit form validation error.
-#: actions/apigroupcreate.php:278 actions/apigroupprofileupdate.php:359
-#: actions/editgroup.php:253
 msgid "Alias can't be the same as nickname."
 msgstr ""
 
@@ -699,26 +538,21 @@ msgstr ""
 #. TRANS: Client error displayed when trying to join a group that does not exist.
 #. TRANS: Client error displayed when trying to leave a group that does not exist.
 #. TRANS: Client error displayed trying to show group membership on a non-existing group.
+#. TRANS: Client error displayed when not providing a group or an invalid group.
 #. TRANS: Client error displayed when trying to show a group that could not be found.
 #. TRANS: Client error displayed requesting most recent notices to a group for a non-existing group.
-#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
-#: actions/apigroupleave.php:104 actions/apigroupmembership.php:71
-#: actions/apigroupprofileupdate.php:113 actions/apigroupshow.php:81
-#: actions/apitimelinegroup.php:89
 msgid "Group not found."
 msgstr "찾을 수가 없습니다."
 
 #. TRANS: Server error displayed when trying to join a group the user is already a member of.
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:345
 msgid "You are already a member of that group."
 msgstr "당신은 이미 이 그룹의 멤버입니다."
 
 #. TRANS: Server error displayed when trying to join a group the user is blocked from joining.
 #. 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.
-#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:350
 msgid "You have been blocked from that group by the admin."
 msgstr "이미 차단된 이용자입니다."
 
@@ -726,13 +560,11 @@ msgstr "이미 차단된 이용자입니다."
 #. TRANS: %1$s is the joining user's nickname, $2$s is the group nickname for which the join failed.
 #. TRANS: Message given having failed to add a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:136 actions/joingroup.php:139 lib/command.php:362
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "이용자 %1$s 의 그룹 %2$s 가입에 실패했습니다."
 
 #. TRANS: Server error displayed when trying to leave a group the user is not a member of.
-#: actions/apigroupleave.php:115
 msgid "You are not a member of this group."
 msgstr "당신은 해당 그룹의 멤버가 아닙니다."
 
@@ -740,118 +572,80 @@ msgstr "당신은 해당 그룹의 멤버가 아닙니다."
 #. TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
 #. TRANS: Message given having failed to remove a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupleave.php:127 actions/leavegroup.php:133
-#: lib/command.php:410
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
 msgstr "이용자 %1$s 의 그룹 %2$s 가입에 실패했습니다."
 
 #. TRANS: Used as title in check for group membership. %s is a user name.
-#: actions/apigrouplist.php:94
 #, php-format
 msgid "%s's groups"
 msgstr "%s의 그룹"
 
 #. TRANS: Used as subtitle in check for group membership. %1$s is a user name, %2$s is the site name.
-#: actions/apigrouplist.php:104
 #, php-format
 msgid "%1$s groups %2$s is a member of."
 msgstr "%1$s 사이트의 그룹에 %2$s 사용자가 멤버입니다."
 
 #. TRANS: Message is used as a title when listing the lastest 20 groups. %s is a site name.
 #. TRANS: Message is used as a page title. %s is a nick name.
-#: actions/apigrouplistall.php:88 actions/usergroups.php:63
 #, php-format
 msgid "%s groups"
 msgstr "%s 그룹"
 
 #. TRANS: Message is used as a subtitle when listing the lastest 20 groups. %s is a site name.
-#: actions/apigrouplistall.php:93
 #, php-format
 msgid "groups on %s"
 msgstr "%s 사이트의 그룹"
 
+#. TRANS: Client error displayed when trying to edit a group without being an admin.
 #. TRANS: Client error displayed trying to edit a group while not being a group admin.
 #. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
 #. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
-#: actions/apigroupprofileupdate.php:118 actions/editgroup.php:110
-#: actions/editgroup.php:176 actions/groupdesignsettings.php:109
-#: actions/grouplogo.php:111
 msgid "You must be an admin to edit the group."
 msgstr "관리자만 그룹을 편집할 수 있습니다."
 
+#. TRANS: Server error displayed when group update fails.
 #. TRANS: Server error displayed when editing a group fails.
-#: actions/apigroupprofileupdate.php:171 actions/editgroup.php:274
 msgid "Could not update group."
 msgstr "그룹을 업데이트 할 수 없습니다."
 
+#. TRANS: Server error displayed when adding group aliases fails.
 #. TRANS: Server error displayed when group aliases could not be added.
 #. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/apigroupprofileupdate.php:194 actions/editgroup.php:281
-#: classes/User_group.php:540
 msgid "Could not create aliases."
 msgstr "관심소식을 생성할 수 없습니다."
 
+#. TRANS: API validation exception thrown when nickname does not validate.
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: actions/apigroupprofileupdate.php:249 lib/nickname.php:165
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr ""
 "별명은 반드시 영소문자와 숫자로만 이루어져야 하며 스페이스의 사용이 불가 합니"
 "다."
 
-#: actions/apigroupprofileupdate.php:286
-#, fuzzy
-msgid "Full name is too long (max 255 chars)."
-msgstr "실명이 너무 깁니다. (최대 255글자)"
-
-#: actions/apigroupprofileupdate.php:296
-#, fuzzy, php-format
-msgid "description is too long (max %d chars)."
-msgstr "설명이 너무 깁니다. (최대 %d 글자)"
-
-#: actions/apigroupprofileupdate.php:307
-#, fuzzy
-msgid "Location is too long (max 255 chars)."
-msgstr "위치가 너무 깁니다. (최대 255글자)"
-
-#: actions/apigroupprofileupdate.php:326
-#, fuzzy, php-format
-msgid "Too many aliases! Maximum %d."
-msgstr "별명이 너무 많습니다! 최대 %d개."
-
-#. TRANS: Group edit form validation error.
+#. TRANS: API validation exception thrown when alias is the same as nickname.
 #. TRANS: Group create form validation error.
-#. TRANS: %s is the invalid alias.
-#: actions/apigroupprofileupdate.php:342 actions/editgroup.php:241
-#: actions/newgroup.php:188
-#, php-format
-msgid "Invalid alias: \"%s\""
-msgstr "사용할 수 없는 별명 : \"%s\""
+msgid "Alias cannot be the same as nickname."
+msgstr ""
 
 #. TRANS: Client error displayed when uploading a media file has failed.
-#: actions/apimediaupload.php:101
 msgid "Upload failed."
 msgstr "실행 실패"
 
 #. TRANS: Client error given from the OAuth API when the request token or verifier is invalid.
-#: actions/apioauthaccesstoken.php:102
 #, fuzzy
 msgid "Invalid request token or verifier."
 msgstr "허용되지 않는 요청입니다."
 
 #. TRANS: Client error given when no oauth_token was passed to the OAuth API.
-#: actions/apioauthauthorize.php:107
 msgid "No oauth_token parameter provided."
 msgstr ""
 
 #. TRANS: Client error given when an invalid request token was passed to the OAuth API.
-#: actions/apioauthauthorize.php:115 actions/apioauthauthorize.php:129
 #, fuzzy
 msgid "Invalid request token."
 msgstr "토큰이 잘못되었습니다."
 
 #. TRANS: Client error given when an invalid request token was passed to the OAuth API.
-#: actions/apioauthauthorize.php:121
 #, fuzzy
 msgid "Request token already authorized."
 msgstr "당신은 이 프로필에 구독되지 않고있습니다."
@@ -862,31 +656,14 @@ msgstr "당신은 이 프로필에 구독되지 않고있습니다."
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
 #. TRANS: Client error displayed when the session token is not okay.
-#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:75
-#: actions/emailsettings.php:292 actions/favor.php:75 actions/geocode.php:55
-#: actions/groupblock.php:65 actions/grouplogo.php:321
-#: actions/groupunblock.php:65 actions/imsettings.php:241
-#: actions/invite.php:60 actions/makeadmin.php:66 actions/newmessage.php:135
-#: actions/newnotice.php:105 actions/nudge.php:80
-#: actions/oauthappssettings.php:162 actions/oauthconnectionssettings.php:135
-#: actions/passwordsettings.php:137 actions/pluginenable.php:87
-#: actions/profilesettings.php:218 actions/recoverpassword.php:383
-#: actions/register.php:157 actions/remotesubscribe.php:76
-#: actions/repeat.php:82 actions/smssettings.php:249 actions/subedit.php:40
-#: actions/subscribe.php:87 actions/tagother.php:145
-#: actions/unsubscribe.php:69 actions/urlsettings.php:171
-#: actions/userauthorization.php:53 lib/designsettings.php:122
 msgid "There was a problem with your session token. Try again, please."
 msgstr "세션토큰에 문제가 있습니다. 다시 시도해주십시오."
 
 #. TRANS: Form validation error given when an invalid username and/or password was passed to the OAuth API.
-#: actions/apioauthauthorize.php:168
 msgid "Invalid nickname / password!"
 msgstr "사용자 이름이나 비밀 번호가 틀렸습니다."
 
 #. TRANS: Server error displayed when a database action fails.
-#: actions/apioauthauthorize.php:217
 #, fuzzy
 msgid "Database error inserting oauth_token_association."
 msgstr "OAuth 응용 프로그램 사용자 추가 중 데이터베이스 오류"
@@ -903,28 +680,19 @@ msgstr "OAuth 응용 프로그램 사용자 추가 중 데이터베이스 오류
 #. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
 #. TRANS: Message given submitting a form with an unknown action in SMS settings.
 #. TRANS: Unknown form validation error in design settings form.
-#: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
-#: actions/designadminpanel.php:100 actions/editapplication.php:144
-#: actions/emailsettings.php:311 actions/grouplogo.php:332
-#: actions/imsettings.php:256 actions/newapplication.php:124
-#: actions/oauthconnectionssettings.php:144 actions/recoverpassword.php:46
-#: actions/smssettings.php:270 lib/designsettings.php:133
 msgid "Unexpected form submission."
 msgstr "잘못된 폼 제출"
 
 #. TRANS: Title for a page where a user can confirm/deny account access by an external application.
-#: actions/apioauthauthorize.php:387
 msgid "An application would like to connect to your account"
 msgstr "응용 프로그램이 계정에 연결하려고 할 것입니다."
 
 #. TRANS: Fieldset legend.
-#: actions/apioauthauthorize.php:404
 msgid "Allow or deny access"
 msgstr "접근 허용 또는 거부"
 
 #. TRANS: User notification of external application requesting account access.
 #. TRANS: %3$s is the access type requested (read-write or read-only), %4$s is the StatusNet sitename.
-#: actions/apioauthauthorize.php:425
 #, fuzzy, php-format
 msgid ""
 "An application would like the ability to <strong>%3$s</strong> your %4$s "
@@ -938,7 +706,6 @@ msgstr ""
 #. TRANS: User notification of external application requesting account access.
 #. TRANS: %1$s is the application name requesting access, %2$s is the organisation behind the application,
 #. TRANS: %3$s is the access type requested, %4$s is the StatusNet sitename.
-#: actions/apioauthauthorize.php:433
 #, php-format
 msgid ""
 "The application <strong>%1$s</strong> by <strong>%2$s</strong> would like "
@@ -950,23 +717,19 @@ msgstr ""
 "$s 계정의 접근을 허용해야 합니다."
 
 #. TRANS: Fieldset legend.
-#: actions/apioauthauthorize.php:455
 #, fuzzy
 msgctxt "LEGEND"
 msgid "Account"
 msgstr "계정"
 
 #. TRANS: Field label on OAuth API authorisation form.
+#. TRANS: Field label on login page.
 #. TRANS: Field label in form for profile settings.
-#: actions/apioauthauthorize.php:459 actions/login.php:225
-#: actions/profilesettings.php:107 actions/register.php:411
-#: actions/userauthorization.php:145 lib/groupeditform.php:145
 msgid "Nickname"
 msgstr "별명"
 
 #. TRANS: Field label on OAuth API authorisation form.
-#: actions/apioauthauthorize.php:463 actions/login.php:228
-#: actions/register.php:415 lib/settingsnav.php:87
+#. TRANS: Field label on login page.
 msgid "Password"
 msgstr "비밀 번호"
 
@@ -976,47 +739,38 @@ msgstr "비밀 번호"
 #. TRANS: Button label to cancel an IM address confirmation procedure.
 #. TRANS: Button label to cancel a SMS address confirmation procedure.
 #. TRANS: Button label in the "Edit application" form.
-#: actions/apioauthauthorize.php:478 actions/emailsettings.php:125
-#: actions/imsettings.php:136 actions/smssettings.php:132
-#: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Cancel"
 msgstr "취소"
 
 #. TRANS: Button text that when clicked will allow access to an account by an external application.
-#: actions/apioauthauthorize.php:485
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Allow"
 msgstr "허용"
 
 #. TRANS: Form instructions.
-#: actions/apioauthauthorize.php:502
 #, fuzzy
 msgid "Authorize access to your account information."
 msgstr "계정 정보에 대한 접근을 허용 또는 거부합니다."
 
 #. TRANS: Header for user notification after revoking OAuth access to an application.
-#: actions/apioauthauthorize.php:594
 #, fuzzy
 msgid "Authorization canceled."
 msgstr "확인 코드가 없습니다."
 
 #. TRANS: User notification after revoking OAuth access to an application.
 #. TRANS: %s is an OAuth token.
-#: actions/apioauthauthorize.php:598
 #, php-format
 msgid "The request token %s has been revoked."
 msgstr ""
 
 #. TRANS: Title of the page notifying the user that an anonymous client application was successfully authorized to access the user's account with OAuth.
-#: actions/apioauthauthorize.php:621
 #, fuzzy
 msgid "You have successfully authorized the application"
 msgstr "당신은 이 프로필에 구독되지 않고있습니다."
 
 #. TRANS: Message notifying the user that an anonymous client application was successfully authorized to access the user's account with OAuth.
-#: actions/apioauthauthorize.php:625
 msgid ""
 "Please return to the application and enter the following security code to "
 "complete the process."
@@ -1024,14 +778,12 @@ msgstr ""
 
 #. TRANS: Title of the page notifying the user that the client application was successfully authorized to access the user's account with OAuth.
 #. TRANS: %s is the authorised application name.
-#: actions/apioauthauthorize.php:632
 #, fuzzy, php-format
 msgid "You have successfully authorized %s"
 msgstr "당신은 이 프로필에 구독되지 않고있습니다."
 
 #. TRANS: Message notifying the user that the client application was successfully authorized to access the user's account with OAuth.
 #. TRANS: %s is the authorised application name.
-#: actions/apioauthauthorize.php:639
 #, php-format
 msgid ""
 "Please return to %s and enter the following security code to complete the "
@@ -1040,12 +792,10 @@ msgstr ""
 
 #. TRANS: Client error displayed trying to delete a status not using POST or DELETE.
 #. TRANS: POST and DELETE should not be translated.
-#: actions/apistatusesdestroy.php:111
 msgid "This method requires a POST or DELETE."
 msgstr "이 메서드는 POST 또는 DELETE를 요구합니다."
 
 #. TRANS: Client error displayed trying to delete a status of another user.
-#: actions/apistatusesdestroy.php:136
 msgid "You may not delete another user's status."
 msgstr "당신은 다른 사용자의 상태를 삭제하지 않아도 된다."
 
@@ -1053,21 +803,16 @@ msgstr "당신은 다른 사용자의 상태를 삭제하지 않아도 된다."
 #. TRANS: Client error displayed trying to display redents of a non-exiting notice.
 #. TRANS: Client exception thrown when referencing a non-existing notice.
 #. TRANS: Error message displayed trying to delete a non-existing notice.
-#: actions/apistatusesretweet.php:74 actions/apistatusesretweets.php:70
-#: actions/atompubshowfavorite.php:82 actions/deletenotice.php:61
-#: actions/shownotice.php:92
 msgid "No such notice."
 msgstr "그러한 통지는 없습니다."
 
 #. TRANS: Client error displayed trying to repeat an own notice through the API.
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:549
 msgid "Cannot repeat your own notice."
 msgstr "자기 자신의 소식은 재전송할 수 없습니다."
 
 #. TRANS: Client error displayed trying to re-repeat a notice through the API.
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:92 lib/command.php:555
 msgid "Already repeated that notice."
 msgstr "이미 재전송된 소식입니다."
 
@@ -1077,73 +822,57 @@ msgstr "이미 재전송된 소식입니다."
 #. TRANS: Client exception thrown when using an unsupported HTTP method.
 #. TRANS: Client error shown when using a non-supported HTTP method.
 #. TRANS: Client exception thrown when using an unsupported HTTP method.
-#: actions/apistatusesshow.php:118 actions/atompubfavoritefeed.php:103
-#: actions/atompubmembershipfeed.php:105 actions/atompubshowfavorite.php:117
-#: actions/atompubshowmembership.php:116
-#: actions/atompubshowsubscription.php:122
-#: actions/atompubsubscriptionfeed.php:109
 #, fuzzy
 msgid "HTTP method not supported."
 msgstr "API 메서드 발견 안 됨."
 
 #. TRANS: Exception thrown requesting an unsupported notice output format.
 #. TRANS: %s is the requested output format.
-#: actions/apistatusesshow.php:144
 #, fuzzy, php-format
 msgid "Unsupported format: %s."
 msgstr "지원하지 않는 형식입니다."
 
 #. TRANS: Client error displayed requesting a deleted status.
-#: actions/apistatusesshow.php:155
 msgid "Status deleted."
 msgstr "삭제된 소식입니다."
 
 #. TRANS: Client error displayed requesting a status with an invalid ID.
-#: actions/apistatusesshow.php:162
 msgid "No status with that ID found."
 msgstr "발견된 ID의 상태가 없습니다."
 
 #. TRANS: Client error displayed when trying to delete a notice not using the Atom format.
-#: actions/apistatusesshow.php:227
 msgid "Can only delete using the Atom format."
 msgstr ""
 
 #. TRANS: Client error displayed when a user has no rights to delete notices of other users.
 #. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
-#: actions/apistatusesshow.php:235 actions/deletenotice.php:78
 #, fuzzy
 msgid "Cannot delete this notice."
 msgstr "이 통지를 지울 수 없습니다."
 
 #. TRANS: Confirmation of notice deletion in API. %d is the ID (number) of the deleted notice.
-#: actions/apistatusesshow.php:249
 #, fuzzy, php-format
 msgid "Deleted notice %d"
 msgstr "통지 삭제"
 
 #. TRANS: Client error displayed when the parameter "status" is missing.
-#: actions/apistatusesupdate.php:221
 msgid "Client must provide a 'status' parameter with a value."
 msgstr ""
 
 #. TRANS: Client error displayed when the parameter "status" is missing.
 #. TRANS: %d is the maximum number of character for a notice.
-#: actions/apistatusesupdate.php:244 actions/newnotice.php:161
-#: lib/mailhandler.php:60
 #, fuzzy, php-format
 msgid "That's too long. Maximum notice size is %d character."
 msgid_plural "That's too long. Maximum notice size is %d characters."
 msgstr[0] "너무 깁니다. 통지의 최대 길이는 %d 글자 입니다."
 
 #. TRANS: Client error displayed when replying to a non-existing notice.
-#: actions/apistatusesupdate.php:284
 #, fuzzy
 msgid "Parent notice not found."
 msgstr "API 메서드 발견 안 됨."
 
 #. TRANS: Client error displayed exceeding the maximum notice length.
 #. TRANS: %d is the maximum lenth for a notice.
-#: actions/apistatusesupdate.php:308 actions/newnotice.php:184
 #, fuzzy, php-format
 msgid "Maximum notice size is %d character, including attachment URL."
 msgid_plural "Maximum notice size is %d characters, including attachment URL."
@@ -1151,13 +880,11 @@ msgstr[0] "소식의 최대 길이는 첨부 URL을 포함하여 %d 글자입니
 
 #. TRANS: Client error displayed when requesting profiles of followers in an unsupported format.
 #. TRANS: Client error displayed when requesting IDs of followers in an unsupported format.
-#: actions/apisubscriptions.php:228 actions/apisubscriptions.php:258
 msgid "Unsupported format."
 msgstr "지원하지 않는 형식입니다."
 
 #. TRANS: Title for timeline of most recent favourite notices by a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname.
-#: actions/apitimelinefavorites.php:108
 #, fuzzy, php-format
 msgid "%1$s / Favorites from %2$s"
 msgstr "%s / %s의 좋아하는 글"
@@ -1165,14 +892,12 @@ msgstr "%s / %s의 좋아하는 글"
 #. TRANS: Subtitle for timeline of most recent favourite notices by a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user's full name,
 #. TRANS: %3$s is a user nickname.
-#: actions/apitimelinefavorites.php:120
 #, fuzzy, php-format
 msgid "%1$s updates favorited by %2$s / %3$s."
 msgstr "%1$s님이 %2$s/%3$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.
-#: actions/apitimelinementions.php:115
 #, php-format
 msgid "%1$s / Updates mentioning %2$s"
 msgstr "%1$s의 상태 (%2$s에서)"
@@ -1180,49 +905,41 @@ msgstr "%1$s의 상태 (%2$s에서)"
 #. TRANS: Subtitle for timeline of most recent mentions of a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname,
 #. TRANS: %3$s is a user's full name.
-#: actions/apitimelinementions.php:131
 #, php-format
 msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr "%1$s님이 %2$s/%3$s의 업데이트에 답변했습니다."
 
 #. TRANS: Title for site timeline. %s is the StatusNet sitename.
 #. TRANS: Public RSS feed title. %s is the StatusNet site name.
-#: actions/apitimelinepublic.php:193 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "%s 공개 타임라인"
 
 #. TRANS: Subtitle for site timeline. %s is the StatusNet sitename.
-#: actions/apitimelinepublic.php:199
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "모두로부터의 업데이트 %s개!"
 
 #. TRANS: Server error displayed calling unimplemented API method for 'retweeted by me'.
-#: actions/apitimelineretweetedbyme.php:71
 #, fuzzy
 msgid "Unimplemented."
 msgstr "명령이 아직 실행되지 않았습니다."
 
 #. TRANS: Title for Atom feed "repeated to me". %s is the user nickname.
-#: actions/apitimelineretweetedtome.php:96
 #, fuzzy, php-format
 msgid "Repeated to %s"
 msgstr "%s에 답신"
 
-#: actions/apitimelineretweetedtome.php:98
 #, fuzzy, php-format
 msgid "%1$s notices that were to repeated to %2$s / %3$s."
 msgstr "%1$s님이 %2$s/%3$s의 업데이트에 답변했습니다."
 
 #. TRANS: Title of list of repeated notices of the logged in user.
 #. TRANS: %s is the nickname of the logged in user.
-#: actions/apitimelineretweetsofme.php:98
 #, fuzzy, php-format
 msgid "Repeats of %s"
 msgstr "%s에 답신"
 
-#: actions/apitimelineretweetsofme.php:104
 #, fuzzy, php-format
 msgid "%1$s notices that %2$s / %3$s has repeated."
 msgstr "누군가 내 글을 좋아하는 게시글로 추가했을 때, 메일을 보냅니다."
@@ -1231,181 +948,148 @@ msgstr "누군가 내 글을 좋아하는 게시글로 추가했을 때, 메일
 #. TRANS: %s is the tag.
 #. TRANS: Title for first page of notices with tags.
 #. TRANS: %s is the tag.
-#: actions/apitimelinetag.php:101 actions/tag.php:69
 #, php-format
 msgid "Notices tagged with %s"
 msgstr "%s 태그된 통지"
 
 #. TRANS: Subtitle for timeline with lastest notices with a given tag.
 #. TRANS: %1$s is the tag, $2$s is the StatusNet sitename.
-#: actions/apitimelinetag.php:105 actions/tagrss.php:65
 #, fuzzy, php-format
 msgid "Updates tagged with %1$s on %2$s!"
 msgstr "%2$s에 있는 %1$s의 업데이트!"
 
 #. TRANS: Client error displayed trying to add a notice to another user's timeline.
-#: actions/apitimelineuser.php:308
 #, fuzzy
 msgid "Only the user can add to their own timeline."
 msgstr "오직 해당 사용자만 자신의 메일박스를 열람할 수 있습니다."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:315
 msgid "Only accept AtomPub for Atom feeds."
 msgstr ""
 
 #. TRANS: Client error displayed attempting to post an empty API notice.
-#: actions/apitimelineuser.php:322
 msgid "Atom post must not be empty."
 msgstr ""
 
 #. TRANS: Client error displayed attempting to post an API that is not well-formed XML.
-#: actions/apitimelineuser.php:328
 msgid "Atom post must be well-formed XML."
 msgstr ""
 
 #. TRANS: Client error displayed when not using an Atom entry.
-#: actions/apitimelineuser.php:334 actions/atompubfavoritefeed.php:228
-#: actions/atompubmembershipfeed.php:230
-#: actions/atompubsubscriptionfeed.php:236
 msgid "Atom post must be an Atom entry."
 msgstr ""
 
 #. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
-#: actions/apitimelineuser.php:345
 msgid "Can only handle POST activities."
 msgstr ""
 
 #. TRANS: Client error displayed when using an unsupported activity object type.
 #. TRANS: %s is the unsupported activity object type.
-#: actions/apitimelineuser.php:356
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
 #. TRANS: %d is the notice ID (number).
-#: actions/apitimelineuser.php:390
 #, fuzzy, php-format
 msgid "No content for notice %d."
 msgstr "통지들의 내용 찾기"
 
 #. TRANS: Client error displayed when using another format than AtomPub.
 #. TRANS: %s is the notice URI.
-#: actions/apitimelineuser.php:419
 #, fuzzy, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "해당 id의 프로필이 없습니다."
 
 #. TRANS: Server error for unfinished API method showTrends.
-#: actions/apitrends.php:85
 msgid "API method under construction."
 msgstr "API 메서드를 구성중 입니다."
 
 #. TRANS: Client error displayed when requesting user information for a non-existing user.
-#: actions/apiuserprofileimage.php:80 actions/apiusershow.php:94
 msgid "User not found."
 msgstr "API 메서드 발견 안 됨."
 
 #. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
 #. TRANS: Client exception.
 #. TRANS: Client error displayed trying to subscribe to a non-existing profile.
-#: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
-#: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
-#: actions/subscribe.php:110
 msgid "No such profile."
 msgstr "해당하는 파일이 없습니다."
 
 #. TRANS: Subtitle for Atom favorites feed.
 #. TRANS: %1$s is a user nickname, %2$s is the StatusNet sitename.
-#: actions/atompubfavoritefeed.php:147
 #, fuzzy, php-format
 msgid "Notices %1$s has favorited on %2$s"
 msgstr "%2$s에 있는 %1$s 및 친구들의 업데이트!"
 
 #. TRANS: Client exception thrown when trying to set a favorite for another user.
 #. TRANS: Client exception thrown when trying to subscribe another user.
-#: actions/atompubfavoritefeed.php:217 actions/atompubsubscriptionfeed.php:225
 #, fuzzy
 msgid "Cannot add someone else's subscription."
 msgstr "예약 구독을 추가 할 수 없습니다."
 
 #. TRANS: Client exception thrown when trying use an incorrect activity verb for the Atom pub method.
-#: actions/atompubfavoritefeed.php:240
 #, fuzzy
 msgid "Can only handle favorite activities."
 msgstr "통지들의 내용 찾기"
 
 #. TRANS: Client exception thrown when trying favorite an object that is not a notice.
-#: actions/atompubfavoritefeed.php:250 actions/atompubmembershipfeed.php:250
 #, fuzzy
 msgid "Can only fave notices."
 msgstr "통지들의 내용 찾기"
 
 #. TRANS: Client exception thrown when trying favorite a notice without content.
-#: actions/atompubfavoritefeed.php:259
 #, fuzzy
 msgid "Unknown note."
 msgstr "알려지지 않은 행동"
 
 #. TRANS: Client exception thrown when trying favorite an already favorited notice.
-#: actions/atompubfavoritefeed.php:267
 #, fuzzy
 msgid "Already a favorite."
 msgstr "좋아하는 게시글로 추가하기"
 
 #. TRANS: Title for group membership feed.
 #. TRANS: %s is a username.
-#: actions/atompubmembershipfeed.php:144
 #, fuzzy, php-format
 msgid "%s group memberships"
 msgstr "%s 그룹 회원"
 
 #. TRANS: Subtitle for group membership feed.
 #. TRANS: %1$s is a username, %2$s is the StatusNet sitename.
-#: actions/atompubmembershipfeed.php:149
 #, fuzzy, php-format
 msgid "Groups %1$s is a member of on %2$s"
 msgstr "%s 사용자가 멤버인 그룹"
 
 #. TRANS: Client exception thrown when trying subscribe someone else to a group.
-#: actions/atompubmembershipfeed.php:219
 #, fuzzy
 msgid "Cannot add someone else's membership."
 msgstr "예약 구독을 추가 할 수 없습니다."
 
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#: actions/atompubmembershipfeed.php:242
 #, fuzzy
 msgid "Can only handle join activities."
 msgstr "통지들의 내용 찾기"
 
 #. TRANS: Client exception thrown when trying to subscribe to a non-existing group.
-#: actions/atompubmembershipfeed.php:259
 #, fuzzy
 msgid "Unknown group."
 msgstr "알려지지 않은 행동"
 
 #. TRANS: Client exception thrown when trying to subscribe to an already subscribed group.
-#: actions/atompubmembershipfeed.php:267
 #, fuzzy
 msgid "Already a member."
 msgstr "모든 회원"
 
 #. TRANS: Client exception thrown when trying to subscribe to group while blocked from that group.
-#: actions/atompubmembershipfeed.php:275
 msgid "Blocked by admin."
 msgstr ""
 
 #. TRANS: Client exception thrown when referencing a non-existing favorite.
-#: actions/atompubshowfavorite.php:90
 #, fuzzy
 msgid "No such favorite."
 msgstr "해당하는 파일이 없습니다."
 
 #. TRANS: Client exception thrown when trying to remove a favorite notice of another user.
-#: actions/atompubshowfavorite.php:151
 #, fuzzy
 msgid "Cannot delete someone else's favorite."
 msgstr "관심소식을 삭제할 수 없습니다."
@@ -1432,93 +1116,68 @@ msgstr "관심소식을 삭제할 수 없습니다."
 #. TRANS: Client error displayed when trying to join a non-existing group.
 #. TRANS: Client error displayed when trying to leave a non-local group.
 #. TRANS: Client error displayed when trying to leave a non-existing group.
+#. TRANS: Client error displayed when providing an invalid group ID on the Make Admin page.
 #. 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.
 #. TRANS: Command exception text shown when a group is requested that does not exist.
 #. TRANS: Error text shown when trying to leave a group that does not exist.
-#: actions/atompubshowmembership.php:81 actions/blockedfromgroup.php:81
-#: actions/blockedfromgroup.php:89 actions/deletegroup.php:87
-#: actions/deletegroup.php:100 actions/editgroup.php:102
-#: actions/foafgroup.php:46 actions/foafgroup.php:65 actions/foafgroup.php:73
-#: actions/groupblock.php:89 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:101 actions/grouplogo.php:103
-#: actions/groupmembers.php:84 actions/groupmembers.php:92
-#: actions/grouprss.php:97 actions/grouprss.php:105
-#: actions/groupunblock.php:89 actions/joingroup.php:82
-#: actions/joingroup.php:95 actions/leavegroup.php:82
-#: actions/leavegroup.php:95 actions/makeadmin.php:86
-#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:392
 msgid "No such group."
 msgstr "그러한 그룹이 없습니다."
 
 #. TRANS: Client exception thrown when trying to show membership of a non-subscribed group
-#: actions/atompubshowmembership.php:91
 #, fuzzy
 msgid "Not a member."
 msgstr "모든 회원"
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
-#: actions/atompubshowmembership.php:150
 #, fuzzy
 msgid "Cannot delete someone else's membership."
 msgstr "구독을 저장할 수 없습니다."
 
 #. TRANS: Client exception thrown when trying to display a subscription for a non-existing profile ID.
 #. TRANS: %d is the non-existing profile ID number.
-#: actions/atompubshowsubscription.php:72
-#: actions/atompubshowsubscription.php:83
-#: actions/atompubsubscriptionfeed.php:74
 #, fuzzy, php-format
 msgid "No such profile id: %d."
 msgstr "해당하는 파일이 없습니다."
 
 #. 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.
-#: actions/atompubshowsubscription.php:94
 #, fuzzy, php-format
 msgid "Profile %1$d not subscribed to profile %2$d."
 msgstr "당신은 이 프로필에 구독되지 않고있습니다."
 
 #. TRANS: Client exception thrown when trying to delete a subscription of another user.
-#: actions/atompubshowsubscription.php:157
 #, fuzzy
 msgid "Cannot delete someone else's subscription."
 msgstr "구독을 저장할 수 없습니다."
 
 #. TRANS: Subtitle for Atom subscription feed.
 #. TRANS: %1$s is a user nickname, %s$s is the StatusNet sitename.
-#: actions/atompubsubscriptionfeed.php:153
 #, fuzzy, php-format
 msgid "People %1$s has subscribed to on %2$s"
 msgstr "%s에 의해 구독되는 사람들"
 
 #. TRANS: Client error displayed when not using the follow verb.
-#: actions/atompubsubscriptionfeed.php:248
 msgid "Can only handle Follow activities."
 msgstr ""
 
 #. TRANS: Client exception thrown when subscribing to an object that is not a person.
-#: actions/atompubsubscriptionfeed.php:256
 msgid "Can only follow people."
 msgstr ""
 
 #. TRANS: Client exception thrown when subscribing to a non-existing profile.
 #. TRANS: %s is the unknown profile ID.
-#: actions/atompubsubscriptionfeed.php:267
 #, fuzzy, php-format
 msgid "Unknown profile %s."
 msgstr "알 수 없는 종류의 파일입니다"
 
 #. TRANS: Client error displayed trying to subscribe to an already subscribed profile.
 #. TRANS: %s is the profile the user already has a subscription on.
-#: actions/atompubsubscriptionfeed.php:275
 #, fuzzy, php-format
 msgid "Already subscribed to %s."
 msgstr "구독하고 있지 않습니다!"
 
 #. TRANS: Client error displayed trying to get a non-existing attachment.
-#: actions/attachment.php:73
 msgid "No such attachment."
 msgstr "해당하는 첨부파일이 없습니다."
 
@@ -1530,31 +1189,23 @@ msgstr "해당하는 첨부파일이 없습니다."
 #. TRANS: Client error displayed when trying to view group members without providing a group nickname.
 #. TRANS: Client error displayed when requesting a group RSS feed without providing a group nickname.
 #. TRANS: Client error displayed if no nickname argument was given requesting a group page.
-#: actions/avatarbynickname.php:60 actions/blockedfromgroup.php:73
-#: actions/editgroup.php:85 actions/groupdesignsettings.php:84
-#: actions/grouplogo.php:86 actions/groupmembers.php:76
-#: actions/grouprss.php:89 actions/showgroup.php:116
 msgid "No nickname."
 msgstr "별명이 없습니다."
 
 #. TRANS: Client error displayed trying to get an avatar without providing an avatar size.
-#: actions/avatarbynickname.php:66
 msgid "No size."
 msgstr "사이즈가 없습니다."
 
 #. TRANS: Client error displayed trying to get an avatar providing an invalid avatar size.
-#: actions/avatarbynickname.php:72
 msgid "Invalid size."
 msgstr "옳지 않은 크기"
 
 #. TRANS: Title for avatar upload page.
-#: actions/avatarsettings.php:66 lib/settingsnav.php:82
 msgid "Avatar"
 msgstr "아바타"
 
 #. TRANS: Instruction for avatar upload page.
 #. TRANS: %s is the maximum file size, for example "500b", "10kB" or "2MB".
-#: actions/avatarsettings.php:78
 #, php-format
 msgid "You can upload your personal avatar. The maximum file size is %s."
 msgstr "당신의 개인 아바타를 업로드할 수 있습니다. 최대 파일 크기는 %s 입니다."
@@ -1563,17 +1214,12 @@ msgstr "당신의 개인 아바타를 업로드할 수 있습니다. 최대 파
 #. TRANS: Server error displayed coming across a request from a user without a profile.
 #. TRANS: Server error displayed when trying to authorise a remote subscription request
 #. TRANS: while the user has no profile.
-#: actions/avatarsettings.php:108 actions/avatarsettings.php:192
-#: actions/grouplogo.php:184 actions/remotesubscribe.php:190
-#: actions/userauthorization.php:75 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr "이용자가 프로필을 가지고 있지 않습니다."
 
 #. TRANS: Avatar upload page form legend.
 #. TRANS: Avatar upload page crop form legend.
 #. TRANS: Legend for group logo settings fieldset.
-#: actions/avatarsettings.php:122 actions/avatarsettings.php:205
-#: actions/grouplogo.php:261
 msgid "Avatar settings"
 msgstr "아바타 설정"
 
@@ -1581,8 +1227,6 @@ msgstr "아바타 설정"
 #. TRANS: Header on avatar upload crop form for thumbnail of originally uploaded avatar (h2).
 #. TRANS: Uploaded original file in group logo form.
 #. TRANS: Header for originally uploaded file before a crop on the group logo page.
-#: actions/avatarsettings.php:131 actions/avatarsettings.php:214
-#: actions/grouplogo.php:207 actions/grouplogo.php:270
 msgid "Original"
 msgstr "원래 설정"
 
@@ -1590,14 +1234,11 @@ msgstr "원래 설정"
 #. TRANS: Header on avatar upload crop form for thumbnail of to be used rendition of uploaded avatar (h2).
 #. TRANS: Header for preview of to be displayed group logo.
 #. TRANS: Header for the cropped group logo on the group logo page.
-#: actions/avatarsettings.php:147 actions/avatarsettings.php:227
-#: actions/grouplogo.php:219 actions/grouplogo.php:283
 msgid "Preview"
 msgstr "미리보기"
 
 #. TRANS: Button on avatar upload page to delete current avatar.
 #. TRANS: Button text for user account deletion.
-#: actions/avatarsettings.php:155 actions/deleteaccount.php:319
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Delete"
@@ -1605,70 +1246,58 @@ msgstr "삭제"
 
 #. TRANS: Button on avatar upload page to upload an avatar.
 #. TRANS: Submit button to confirm upload of a user backup file for account restore.
-#: actions/avatarsettings.php:173 actions/restoreaccount.php:369
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Upload"
 msgstr "올리기"
 
 #. TRANS: Button on avatar upload crop form to confirm a selected crop as avatar.
-#: actions/avatarsettings.php:243
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Crop"
 msgstr "자르기"
 
 #. TRANS: Validation error on avatar upload form when no file was uploaded.
-#: actions/avatarsettings.php:318
 msgid "No file uploaded."
 msgstr "파일을 업로드하지 않았습니다."
 
 #. TRANS: Avatar upload form instruction after uploading a file.
-#: actions/avatarsettings.php:345
 #, fuzzy
 msgid "Pick a square area of the image to be your avatar."
 msgstr "그림에서 당신의 아바타로 사용할 영역을 지정하십시오."
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
 #. TRANS: Server error displayed trying to crop an uploaded group logo that is no longer present.
-#: actions/avatarsettings.php:360 actions/grouplogo.php:391
 msgid "Lost our file data."
 msgstr "파일 데이터를 잃어버렸습니다."
 
 #. TRANS: Success message for having updated a user avatar.
-#: actions/avatarsettings.php:384
 msgid "Avatar updated."
 msgstr "아바타가 업데이트 되었습니다."
 
 #. TRANS: Error displayed on the avatar upload page if the avatar could not be updated for an unknown reason.
-#: actions/avatarsettings.php:388
 msgid "Failed updating avatar."
 msgstr "아바타 업데이트 실패"
 
 #. TRANS: Success message for deleting a user avatar.
-#: actions/avatarsettings.php:412
 msgid "Avatar deleted."
 msgstr "아바타가 삭제되었습니다."
 
 #. TRANS: Title for backup account page.
 #. TRANS: Option in profile settings to create a backup of the account of the currently logged in user.
-#: actions/backupaccount.php:61 actions/profilesettings.php:468
 msgid "Backup account"
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to backup an account while not logged in.
-#: actions/backupaccount.php:79
 #, fuzzy
 msgid "Only logged-in users can backup their account."
 msgstr "오직 해당 사용자만 자신의 메일박스를 열람할 수 있습니다."
 
 #. TRANS: Client exception thrown when trying to backup an account without having backup rights.
-#: actions/backupaccount.php:84
 msgid "You may not backup your account."
 msgstr ""
 
 #. TRANS: Information displayed on the backup account page.
-#: actions/backupaccount.php:227
 msgid ""
 "You can backup your account data in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format. This is an experimental feature and provides "
@@ -1678,31 +1307,26 @@ msgid ""
 msgstr ""
 
 #. TRANS: Submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:250
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Backup"
 msgstr "배경"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:254
 msgid "Backup your account."
 msgstr ""
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
-#: actions/block.php:68
 msgid "You already blocked that user."
 msgstr "이미 차단된 이용자입니다."
 
 #. TRANS: Title for block user page.
 #. TRANS: Legend for block user form.
 #. TRANS: Fieldset legend for block user from group form.
-#: actions/block.php:106 actions/block.php:136 actions/groupblock.php:165
 msgid "Block user"
 msgstr "사용자를 차단합니다."
 
 #. TRANS: Explanation of consequences when blocking a user on the block user page.
-#: actions/block.php:139
 msgid ""
 "Are you sure you want to block this user? Afterwards, they will be "
 "unsubscribed from you, unable to subscribe to you in the future, and you "
@@ -1717,15 +1341,11 @@ msgstr ""
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:154 actions/deleteapplication.php:157
-#: actions/deletegroup.php:220 actions/deletenotice.php:155
-#: actions/deleteuser.php:154 actions/groupblock.php:187
 msgctxt "BUTTON"
 msgid "No"
 msgstr "아니오"
 
 #. TRANS: Submit button title for 'No' when blocking a user.
-#: actions/block.php:158
 #, fuzzy
 msgid "Do not block this user."
 msgstr "이용자를 차단하지 않는다."
@@ -1736,51 +1356,41 @@ msgstr "이용자를 차단하지 않는다."
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:161 actions/deleteapplication.php:164
-#: actions/deletegroup.php:227 actions/deletenotice.php:162
-#: actions/deleteuser.php:161 actions/groupblock.php:194
 msgctxt "BUTTON"
 msgid "Yes"
 msgstr "예"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:165
 #, fuzzy
 msgid "Block this user."
 msgstr "이 사용자 차단하기"
 
 #. TRANS: Server error displayed when blocking a user fails.
-#: actions/block.php:189
 msgid "Failed to save block information."
 msgstr "정보차단을 저장하는데 실패했습니다."
 
 #. TRANS: Title for first page with list of users blocked from a group.
 #. TRANS: %s is a group nickname.
-#: actions/blockedfromgroup.php:101
 #, php-format
 msgid "%s blocked profiles"
 msgstr "%s 및 친구들, %d 페이지"
 
 #. TRANS: Title for any but the first page with list of users blocked from a group.
 #. TRANS: %1$s is a group nickname, %2$d is a page number.
-#: actions/blockedfromgroup.php:106
 #, php-format
 msgid "%1$s blocked profiles, page %2$d"
 msgstr "%1$s 및 친구들, %2$d 페이지"
 
 #. TRANS: Instructions for list of users blocked from a group.
-#: actions/blockedfromgroup.php:122
 #, fuzzy
 msgid "A list of the users blocked from joining this group."
 msgstr "이 그룹의 회원리스트"
 
 #. TRANS: Form legend for unblocking a user from a group.
-#: actions/blockedfromgroup.php:291
 msgid "Unblock user from group"
 msgstr "그룹 이용자는 차단해제"
 
 #. TRANS: Button text for unblocking a user from a group.
-#: actions/blockedfromgroup.php:323
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Unblock"
@@ -1788,130 +1398,104 @@ msgstr "차단해제"
 
 #. TRANS: Tooltip for button for unblocking a user from a group.
 #. TRANS: Description of the form to unblock a user.
-#: actions/blockedfromgroup.php:327 lib/unblockform.php:78
 msgid "Unblock this user"
 msgstr "이 사용자를 차단해제합니다."
 
 #. TRANS: Title for mini-posting window loaded from bookmarklet.
 #. TRANS: %s is the StatusNet site name.
-#: actions/bookmarklet.php:51
 #, php-format
 msgid "Post to %s"
 msgstr "%s 사이트의 그룹"
 
 #. TRANS: Client error displayed when not providing a confirmation code in the contact address confirmation action.
-#: actions/confirmaddress.php:74
 msgid "No confirmation code."
 msgstr "확인 코드가 없습니다."
 
 #. TRANS: Client error displayed when providing a non-existing confirmation code in the contact address confirmation action.
-#: actions/confirmaddress.php:80
 msgid "Confirmation code not found."
 msgstr "인증 코드가 없습니다."
 
 #. TRANS: Client error displayed when not providing a confirmation code for another user in the contact address confirmation action.
-#: actions/confirmaddress.php:86
 msgid "That confirmation code is not for you!"
 msgstr "그 인증 코드는 귀하의 것이 아닙니다!"
 
 #. TRANS: Server error for an unknown address type, which can be 'email', 'sms', or the name of an IM network (such as 'xmpp' or 'aim')
-#: actions/confirmaddress.php:94
-#, fuzzy, php-format
+#, php-format
 msgid "Unrecognized address type %s"
 msgstr "인식되지않은 주소유형 %s"
 
 #. TRANS: Client error for an already confirmed email/jabber/sms address.
-#: actions/confirmaddress.php:103 actions/confirmaddress.php:136
 msgid "That address has already been confirmed."
 msgstr "그 주소는 이미 승인되었습니다."
 
-#: actions/confirmaddress.php:121 actions/imsettings.php:444
-#: actions/userdesignsettings.php:306
-#, fuzzy
 msgid "Couldn't update user."
 msgstr "이용자를 업데이트 할 수 없습니다."
 
-#: actions/confirmaddress.php:144
 #, fuzzy
 msgid "Couldn't update user im preferences."
 msgstr "사용자 기록을 업데이트 할 수 없습니다."
 
-#: actions/confirmaddress.php:156
 #, fuzzy
 msgid "Couldn't insert user im preferences."
 msgstr "예약 구독을 추가 할 수 없습니다."
 
 #. TRANS: Server error displayed when an address confirmation code deletion from the
 #. TRANS: database fails in the contact address confirmation action.
-#: actions/confirmaddress.php:169
 #, fuzzy
 msgid "Could not delete address confirmation."
 msgstr "메신저 승인을 삭제 할 수 없습니다."
 
 #. TRANS: Title for the contact address confirmation action.
-#: actions/confirmaddress.php:185
 msgid "Confirm address"
 msgstr "주소 확인"
 
 #. TRANS: Success message for the contact address confirmation action.
 #. TRANS: %s can be 'email', 'jabber', or 'sms'.
-#: actions/confirmaddress.php:200
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "\"%s\" 는 귀하의 계정으로 승인되었습니다."
 
 #. TRANS: Title for page with a conversion (multiple notices in context).
-#: actions/conversation.php:96
 msgid "Conversation"
 msgstr "대화"
 
 #. TRANS: Header on conversation page. Hidden by default (h2).
 #. TRANS: Label for user statistics.
-#: actions/conversation.php:149 lib/noticelist.php:87
-#: lib/profileaction.php:246 lib/searchgroupnav.php:82
-#: lib/threadednoticelist.php:66
 msgid "Notices"
 msgstr "통지"
 
 #. TRANS: Client exception displayed trying to delete a user account while not logged in.
-#: actions/deleteaccount.php:71
 #, fuzzy
 msgid "Only logged-in users can delete their account."
 msgstr "오직 해당 사용자만 자신의 메일박스를 열람할 수 있습니다."
 
 #. TRANS: Client exception displayed trying to delete a user account without have the rights to do that.
-#: actions/deleteaccount.php:77
 #, fuzzy
 msgid "You cannot delete your account."
 msgstr "이용자를 업데이트 할 수 없습니다."
 
 #. TRANS: Confirmation text for user deletion. The user has to type this exactly the same, including punctuation.
-#: actions/deleteaccount.php:160 actions/deleteaccount.php:297
 msgid "I am sure."
 msgstr ""
 
 #. TRANS: Notification for user about the text that must be input to be able to delete a user account.
 #. TRANS: %s is the text that needs to be input.
-#: actions/deleteaccount.php:164
 #, php-format
 msgid "You must write \"%s\" exactly in the box."
 msgstr ""
 
 #. TRANS: Confirmation that a user account has been deleted.
-#: actions/deleteaccount.php:206
 #, fuzzy
 msgid "Account deleted."
 msgstr "아바타가 삭제되었습니다."
 
 #. TRANS: Page title for page on which a user account can be deleted.
 #. TRANS: Option in profile settings to delete the account of the currently logged in user.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:476
 #, fuzzy
 msgid "Delete account"
 msgstr "새 계정 만들기"
 
 #. TRANS: Form text for user deletion form.
-#: actions/deleteaccount.php:279
 msgid ""
 "This will <strong>permanently delete</strong> your account data from this "
 "server."
@@ -1919,7 +1503,6 @@ msgstr ""
 
 #. TRANS: Additional form text for user deletion form shown if a user has account backup rights.
 #. TRANS: %s is a URL to the backup page.
-#: actions/deleteaccount.php:285
 #, php-format
 msgid ""
 "You are strongly advised to <a href=\"%s\">back up your data</a> before "
@@ -1928,56 +1511,43 @@ msgstr ""
 
 #. TRANS: Field label for delete account confirmation entry.
 #. TRANS: Field label for password reset form where the password has to be typed again.
-#: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:262 actions/register.php:419
 msgid "Confirm"
 msgstr "인증"
 
 #. TRANS: Input title for the delete account field.
 #. TRANS: %s is the text that needs to be input.
-#: actions/deleteaccount.php:304
 #, fuzzy, php-format
 msgid "Enter \"%s\" to confirm that you want to delete your account."
 msgstr "이용자를 업데이트 할 수 없습니다."
 
 #. TRANS: Button title for user account deletion.
-#: actions/deleteaccount.php:323
 #, fuzzy
 msgid "Permanently delete your account"
 msgstr "이용자를 업데이트 할 수 없습니다."
 
 #. TRANS: Client error displayed trying to delete an application while not logged in.
-#: actions/deleteapplication.php:62
 msgid "You must be logged in to delete an application."
 msgstr "응용 프로그램 수정을 위해서는 로그인해야 합니다."
 
 #. TRANS: Client error displayed trying to delete an application that does not exist.
-#: actions/deleteapplication.php:71
 msgid "Application not found."
 msgstr "인증 코드가 없습니다."
 
 #. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
-#: actions/deleteapplication.php:79 actions/editapplication.php:78
-#: actions/showapplication.php:90
 msgid "You are not the owner of this application."
 msgstr "이 응용프로그램 삭제 않기"
 
 #. TRANS: Client error text when there is a problem with the session token.
-#: actions/deleteapplication.php:102 actions/editapplication.php:131
-#: actions/newapplication.php:112 actions/showapplication.php:113
-#: lib/action.php:1391
 msgid "There was a problem with your session token."
 msgstr "당신의 세션토큰관련 문제가 있습니다."
 
 #. TRANS: Title for delete application page.
 #. TRANS: Fieldset legend on delete application page.
-#: actions/deleteapplication.php:124 actions/deleteapplication.php:149
 msgid "Delete application"
 msgstr "응용프로그램 삭제"
 
 #. TRANS: Confirmation text on delete application page.
-#: actions/deleteapplication.php:152
 msgid ""
 "Are you sure you want to delete this application? This will clear all data "
 "about the application from the database, including all existing user "
@@ -1985,19 +1555,16 @@ msgid ""
 msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting an application.
-#: actions/deleteapplication.php:161
 #, fuzzy
 msgid "Do not delete this application."
 msgstr "이 응용프로그램 삭제 않기"
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
-#: actions/deleteapplication.php:167
 #, fuzzy
 msgid "Delete this application."
 msgstr "이 응용프로그램 삭제"
 
 #. TRANS: Client error when trying to delete group while not logged in.
-#: actions/deletegroup.php:64
 #, fuzzy
 msgid "You must be logged in to delete a group."
 msgstr "그룹을 떠나기 위해서는 로그인해야 합니다."
@@ -2005,41 +1572,34 @@ msgstr "그룹을 떠나기 위해서는 로그인해야 합니다."
 #. TRANS: Client error when trying to delete a group without providing a nickname or ID for the group.
 #. TRANS: Client error displayed when trying to join a group without providing a group name or group ID.
 #. TRANS: Client error displayed when trying to leave a group without providing a group name or group ID.
-#: actions/deletegroup.php:94 actions/joingroup.php:89
-#: actions/leavegroup.php:89
 #, fuzzy
 msgid "No nickname or ID."
 msgstr "별명이 없습니다."
 
 #. TRANS: Client error when trying to delete a group without having the rights to delete it.
-#: actions/deletegroup.php:107
 #, fuzzy
 msgid "You are not allowed to delete this group."
 msgstr "당신은 해당 그룹의 멤버가 아닙니다."
 
 #. TRANS: Server error displayed if a group could not be deleted.
 #. TRANS: %s is the name of the group that could not be deleted.
-#: actions/deletegroup.php:150
 #, fuzzy, php-format
 msgid "Could not delete group %s."
 msgstr "그룹을 업데이트 할 수 없습니다."
 
 #. TRANS: Message given after deleting a group.
 #. TRANS: %s is the deleted group's name.
-#: actions/deletegroup.php:159
 #, fuzzy, php-format
 msgid "Deleted group %s"
 msgstr "%1$s의 상태 (%2$s에서)"
 
 #. TRANS: Title of delete group page.
 #. TRANS: Form legend for deleting a group.
-#: actions/deletegroup.php:176 actions/deletegroup.php:202
 #, fuzzy
 msgid "Delete group"
 msgstr "이용자 삭제"
 
 #. TRANS: Warning in form for deleleting a group.
-#: actions/deletegroup.php:206
 msgid ""
 "Are you sure you want to delete this group? This will clear all data about "
 "the group from the database, without a backup. Public posts to this group "
@@ -2047,13 +1607,11 @@ msgid ""
 msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting a group.
-#: actions/deletegroup.php:224
 #, fuzzy
 msgid "Do not delete this group."
 msgstr "이 통지를 지울 수 없습니다."
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
-#: actions/deletegroup.php:231
 #, fuzzy
 msgid "Delete this group."
 msgstr "이 사용자 삭제"
@@ -2064,22 +1622,18 @@ msgstr "이 사용자 삭제"
 #. TRANS: Client error displayed trying to block a user from a group while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying to log out when not logged in.
+#. TRANS: Client error displayed when trying to access the "make admin" page while not logged in.
+#. TRANS: Client error displayed trying to create a new direct message while not logged in.
+#. TRANS: Client error displayed trying to send a notice while not logged in.
+#. TRANS: Client error displayed trying to nudge a user without being logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
 #. TRANS: Client error displayed when trying to change user options while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
-#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:70
-#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
-#: actions/nudge.php:63 actions/pluginenable.php:97 actions/subedit.php:33
-#: actions/subscribe.php:98 actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:71 lib/profileformaction.php:63
-#: lib/settingsaction.php:72
 msgid "Not logged in."
 msgstr "로그인하고 있지 않습니다."
 
 #. TRANS: Instructions for deleting a notice.
-#: actions/deletenotice.php:110
 #, fuzzy
 msgid ""
 "You are about to permanently delete a notice. Once this is done, it cannot "
@@ -2089,152 +1643,124 @@ msgstr ""
 
 #. TRANS: Page title when deleting a notice.
 #. TRANS: Fieldset legend for the delete notice form.
-#: actions/deletenotice.php:117 actions/deletenotice.php:148
 msgid "Delete notice"
 msgstr "통지 삭제"
 
 #. TRANS: Message for the delete notice form.
-#: actions/deletenotice.php:152
 msgid "Are you sure you want to delete this notice?"
 msgstr "정말로 통지를 삭제하시겠습니까?"
 
 #. TRANS: Submit button title for 'No' when deleting a notice.
-#: actions/deletenotice.php:159
 #, fuzzy
 msgid "Do not delete this notice."
 msgstr "이 통지를 지울 수 없습니다."
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:166
 #, fuzzy
 msgid "Delete this notice."
 msgstr "이 게시글 삭제하기"
 
 #. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
-#: actions/deleteuser.php:66
 msgid "You cannot delete users."
 msgstr "이용자를 업데이트 할 수 없습니다."
 
 #. TRANS: Client error displayed when trying to delete a non-local user.
-#: actions/deleteuser.php:74
 msgid "You can only delete local users."
 msgstr "이용자를 업데이트 할 수 없습니다."
 
 #. TRANS: Title of delete user page.
-#: actions/deleteuser.php:110
 #, fuzzy
 msgctxt "TITLE"
 msgid "Delete user"
 msgstr "이용자 삭제"
 
 #. TRANS: Fieldset legend on delete user page.
-#: actions/deleteuser.php:134
 msgid "Delete user"
 msgstr "이용자 삭제"
 
 #. TRANS: Information text to request if a user is certain that the described action has to be performed.
-#: actions/deleteuser.php:138
 msgid ""
 "Are you sure you want to delete this user? This will clear all data about "
 "the user from the database, without a backup."
 msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/deleteuser.php:158
 #, fuzzy
 msgid "Do not delete this user."
 msgstr "이 통지를 지울 수 없습니다."
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
-#: actions/deleteuser.php:165
 #, fuzzy
 msgid "Delete this user."
 msgstr "이 사용자 삭제"
 
 #. TRANS: Message used as title for design settings for the site.
-#: actions/designadminpanel.php:60 lib/settingsnav.php:97
 msgid "Design"
 msgstr "디자인"
 
 #. TRANS: Instructions for design adminsitration panel.
-#: actions/designadminpanel.php:71
 msgid "Design settings for this StatusNet site"
 msgstr ""
 
 #. TRANS: Client error displayed when a logo URL does is not valid.
-#: actions/designadminpanel.php:327
 msgid "Invalid logo URL."
 msgstr "잘못된 로고 URL 입니다."
 
 #. TRANS: Client error displayed when an SSL logo URL is invalid.
-#: actions/designadminpanel.php:333
 #, fuzzy
 msgid "Invalid SSL logo URL."
 msgstr "잘못된 로고 URL 입니다."
 
 #. TRANS: Client error displayed when a theme is submitted through the form that is not in the theme list.
 #. TRANS: %s is the chosen unavailable theme.
-#: actions/designadminpanel.php:339
 #, php-format
 msgid "Theme not available: %s."
 msgstr "인스턴트 메신저를 사용할 수 없습니다."
 
 #. TRANS: Fieldset legend for form to change logo.
-#: actions/designadminpanel.php:437
 msgid "Change logo"
 msgstr "로고 변경"
 
 #. TRANS: Field label for StatusNet site logo.
-#: actions/designadminpanel.php:444
 msgid "Site logo"
 msgstr "사이트 로고"
 
 #. TRANS: Field label for SSL StatusNet site logo.
-#: actions/designadminpanel.php:452
 #, fuzzy
 msgid "SSL logo"
 msgstr "사이트 로고"
 
 #. TRANS: Fieldset legend for form change StatusNet site's theme.
-#: actions/designadminpanel.php:467
 msgid "Change theme"
 msgstr "테마 바꾸기"
 
 #. TRANS: Field label for dropdown to choose site theme.
-#: actions/designadminpanel.php:485
 msgid "Site theme"
 msgstr "사이트 테마"
 
 #. TRANS: Title for field label for dropdown to choose site theme.
-#: actions/designadminpanel.php:487
 msgid "Theme for the site."
 msgstr "사이트에 대한 테마"
 
 #. TRANS: Field label for uploading a cutom theme.
-#: actions/designadminpanel.php:494
 msgid "Custom theme"
 msgstr "사용자 지정 테마"
 
 #. TRANS: Form instructions for uploading a cutom StatusNet theme.
-#: actions/designadminpanel.php:499
 msgid "You can upload a custom StatusNet theme as a .ZIP archive."
 msgstr ""
 
 #. TRANS: Fieldset legend for theme background image.
-#: actions/designadminpanel.php:515
 msgid "Change background image"
 msgstr "배경 이미지 바꾸기"
 
 #. TRANS: Field label for background image on theme designer page.
 #. TRANS: Field label for background color selector.
 #. TRANS: Label on profile design page for setting a profile page background colour.
-#: actions/designadminpanel.php:525 actions/designadminpanel.php:609
-#: lib/designform.php:238
 msgid "Background"
 msgstr "배경"
 
 #. TRANS: Form guide for background image upload form on theme designer page.
-#: actions/designadminpanel.php:531
 #, php-format
 msgid ""
 "You can upload a background image for the site. The maximum file size is %1"
@@ -2243,205 +1769,170 @@ msgstr ""
 "사이트의 배경 이미지를 업로드할 수 있습니다. 최대 파일 크기는 %1$s 입니다."
 
 #. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:558
 msgid "On"
 msgstr "켜기"
 
 #. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:575
 msgid "Off"
 msgstr "끄기"
 
 #. TRANS: Form guide for turning background image on or off on theme designer page.
 #. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
 #. TRANS: use of the uploaded profile image.
-#: actions/designadminpanel.php:577 lib/designform.php:214
 msgid "Turn background image on or off."
 msgstr "배경 이미지를 켜거나 끈다."
 
 #. TRANS: Checkbox label to title background image on theme designer page.
 #. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-#: actions/designadminpanel.php:583 lib/designform.php:220
 msgid "Tile background image"
 msgstr "배경 이미지를 반복 나열"
 
 #. TRANS: Fieldset legend for theme colors.
-#: actions/designadminpanel.php:598
 #, fuzzy
 msgid "Change colors"
 msgstr "색상 변경"
 
 #. TRANS: Field label for content color selector.
 #. TRANS: Label on profile design page for setting a profile page content colour.
-#: actions/designadminpanel.php:623 lib/designform.php:252
 msgid "Content"
 msgstr "만족하는"
 
 #. TRANS: Field label for sidebar color selector.
 #. TRANS: Label on profile design page for setting a profile page sidebar colour.
-#: actions/designadminpanel.php:637 lib/designform.php:266
 msgid "Sidebar"
 msgstr "가장자리 창"
 
 #. TRANS: Field label for text color selector.
 #. TRANS: Label on profile design page for setting a profile page text colour.
-#: actions/designadminpanel.php:651 lib/designform.php:280
 msgid "Text"
 msgstr "문자"
 
 #. TRANS: Field label for link color selector.
 #. TRANS: Label on profile design page for setting a profile page links colour.
-#: actions/designadminpanel.php:665 lib/designform.php:294
 msgid "Links"
 msgstr "링크"
 
 #. TRANS: Fieldset legend for advanced theme design settings.
-#: actions/designadminpanel.php:691
 msgid "Advanced"
 msgstr "고급 검색"
 
 #. TRANS: Field label for custom CSS.
-#: actions/designadminpanel.php:696
 msgid "Custom CSS"
 msgstr "사용자 정의 CSS"
 
 #. TRANS: Button text for resetting theme settings.
-#: actions/designadminpanel.php:718
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Use defaults"
 msgstr "기본값 사용"
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:720
 #, fuzzy
 msgid "Restore default designs."
 msgstr "기본값 사용"
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:728
 msgid "Reset back to default."
 msgstr ""
 
 #. TRANS: Title for button for saving theme settings.
-#: actions/designadminpanel.php:736
 #, fuzzy
 msgid "Save design."
 msgstr "디자인 저장"
 
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
-#: actions/disfavor.php:83
 msgid "This notice is not a favorite!"
 msgstr "이 메시지는 favorite이 아닙니다."
 
 #. TRANS: Title for page on which favorites can be added.
-#: actions/disfavor.php:98
 msgid "Add to favorites"
 msgstr "좋아하는 게시글로 추가하기"
 
 #. TRANS: Client exception thrown when requesting a document from the documentation that does not exist.
 #. TRANS: %s is the non-existing document.
-#: actions/doc.php:155
 #, fuzzy, php-format
 msgid "No such document \"%s\"."
 msgstr "해당하는 첨부파일이 없습니다."
 
 #. TRANS: Title for "Edit application" form.
 #. TRANS: Form legend.
-#: actions/editapplication.php:54 lib/applicationeditform.php:129
 msgid "Edit application"
 msgstr "응용 프로그램 편집"
 
 #. TRANS: Client error displayed trying to edit an application while not logged in.
-#: actions/editapplication.php:66
 msgid "You must be logged in to edit an application."
 msgstr "응용 프로그램 수정을 위해서는 로그인해야 합니다."
 
 #. TRANS: Client error displayed trying to edit an application that does not exist.
-#: actions/editapplication.php:83 actions/showapplication.php:83
 msgid "No such application."
 msgstr "신규 응용 프로그램"
 
 #. TRANS: Instructions for "Edit application" form.
-#: actions/editapplication.php:167
 #, fuzzy
 msgid "Use this form to edit your application."
 msgstr "다음 양식을 이용해 그룹을 편집하십시오."
 
 #. TRANS: Validation error shown when not providing a name in the "Edit application" form.
 #. TRANS: Validation error shown when not providing a name in the "New application" form.
-#: actions/editapplication.php:184 actions/newapplication.php:164
 msgid "Name is required."
 msgstr "기관 이름이 필요합니다."
 
 #. 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.
-#: actions/editapplication.php:188 actions/newapplication.php:172
 #, fuzzy
 msgid "Name is too long (maximum 255 characters)."
 msgstr "실명이 너무 깁니다. (최대 255글자)"
 
 #. TRANS: Validation error shown when providing a name for an application that already exists in the "Edit application" form.
 #. TRANS: Validation error shown when providing a name for an application that already exists in the "New application" form.
-#: actions/editapplication.php:192 actions/newapplication.php:168
 #, fuzzy
 msgid "Name already in use. Try another one."
 msgstr "별명이 이미 사용중 입니다. 다른 별명을 시도해 보십시오."
 
 #. TRANS: Validation error shown when not providing a description in the "Edit application" form.
 #. TRANS: Validation error shown when not providing a description in the "New application" form.
-#: actions/editapplication.php:196 actions/newapplication.php:176
 msgid "Description is required."
 msgstr "기관 이름이 필요합니다."
 
 #. TRANS: Validation error shown when providing too long a source URL in the "Edit application" form.
-#: actions/editapplication.php:209
 msgid "Source URL is too long."
 msgstr "소스 URL이 너무 깁니다."
 
 #. TRANS: Validation error shown when providing an invalid source URL in the "Edit application" form.
 #. TRANS: Validation error shown when providing an invalid source URL in the "New application" form.
-#: actions/editapplication.php:216 actions/newapplication.php:199
 msgid "Source URL is not valid."
 msgstr "소스 URL이 올바르지 않습니다."
 
 #. 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.
-#: actions/editapplication.php:220 actions/newapplication.php:203
 msgid "Organization is required."
 msgstr "기관 이름이 필요합니다."
 
 #. TRANS: Validation error shown when providing too long an arganisation name in the "Edit application" form.
-#: actions/editapplication.php:224 actions/newapplication.php:207
 #, fuzzy
 msgid "Organization is too long (maximum 255 characters)."
 msgstr "기관 이름이 너무 깁니다. (최대 255글자)"
 
 #. TRANS: Form validation error show when an organisation name has not been provided in the edit application form.
 #. TRANS: Form validation error show when an organisation name has not been provided in the new application form.
-#: actions/editapplication.php:228 actions/newapplication.php:211
 msgid "Organization homepage is required."
 msgstr "기관 홈페이지가 필요합니다."
 
 #. TRANS: Validation error shown when providing too long a callback URL in the "Edit application" form.
 #. TRANS: Validation error shown when providing too long a callback URL in the "New application" form.
-#: actions/editapplication.php:239 actions/newapplication.php:225
 msgid "Callback is too long."
 msgstr ""
 
 #. TRANS: Validation error shown when providing an invalid callback URL in the "Edit application" form.
 #. TRANS: Validation error shown when providing an invalid callback URL in the "New application" form.
-#: actions/editapplication.php:247 actions/newapplication.php:235
 msgid "Callback URL is not valid."
 msgstr ""
 
 #. TRANS: Server error occuring when an application could not be updated from the "Edit application" form.
-#: actions/editapplication.php:284
 msgid "Could not update application."
 msgstr "관심소식을 생성할 수 없습니다."
 
 #. TRANS: Title for form to edit a group. %s is a group nickname.
-#: actions/editgroup.php:55
 #, php-format
 msgid "Edit %s group"
 msgstr "%s 그룹 편집"
@@ -2449,40 +1940,40 @@ msgstr "%s 그룹 편집"
 #. TRANS: Client error displayed trying to edit a group while not logged in.
 #. TRANS: Client error displayed when trying to create a group while not logged in.
 #. TRANS: Client error displayed trying to create a group while not logged in.
-#: actions/editgroup.php:68 actions/grouplogo.php:69 actions/newgroup.php:65
 msgid "You must be logged in to create a group."
 msgstr "그룹을 만들기 위해서는 로그인해야 합니다."
 
 #. TRANS: Form instructions for group edit form.
-#: actions/editgroup.php:161
 msgid "Use this form to edit the group."
 msgstr "다음 양식을 이용해 그룹을 편집하십시오."
 
+#. TRANS: Group edit form validation error.
+#. TRANS: Group create form validation error.
+#. TRANS: %s is the invalid alias.
+#, php-format
+msgid "Invalid alias: \"%s\""
+msgstr "사용할 수 없는 별명 : \"%s\""
+
 #. TRANS: Group edit form success message.
-#: actions/editgroup.php:301
 msgid "Options saved."
 msgstr "옵션을 저장했습니다."
 
 #. TRANS: Title for e-mail settings.
-#: actions/emailsettings.php:60
 msgid "Email settings"
 msgstr "메일 설정"
 
 #. TRANS: E-mail settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/emailsettings.php:74
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 msgstr "%%site.name%%에서 어떻게 메일을 받을지 정하십시오."
 
 #. TRANS: Form legend for e-mail settings form.
 #. TRANS: Field label for e-mail address input in e-mail settings form.
-#: actions/emailsettings.php:104 actions/emailsettings.php:130
 msgid "Email address"
 msgstr "메일 주소"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:110
 msgid "Current confirmed email address."
 msgstr "확인된 최신의 메일 계정"
 
@@ -2491,15 +1982,11 @@ msgstr "확인된 최신의 메일 계정"
 #. TRANS: Button label to remove a confirmed IM address.
 #. TRANS: Button label to remove a confirmed SMS address.
 #. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
-#: actions/emailsettings.php:113 actions/emailsettings.php:180
-#: actions/imsettings.php:119 actions/smssettings.php:119
-#: actions/smssettings.php:175
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "제거"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:120
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -2512,44 +1999,36 @@ msgstr ""
 #. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
 #. TRANS: Any other domain may be owned by a legitimate person or
 #. TRANS: organization.
-#: actions/emailsettings.php:137
 msgid "Email address, like \"UserName@example.org\""
 msgstr "\"사용자이름@예제.org\"와 같은 메일 계정"
 
 #. TRANS: Button label for adding an e-mail address in e-mail settings form.
 #. TRANS: Button label for adding an IM address in IM settings form.
 #. TRANS: Button label for adding a SMS phone number in SMS settings form.
-#: actions/emailsettings.php:141 actions/imsettings.php:147
-#: actions/smssettings.php:157
 msgctxt "BUTTON"
 msgid "Add"
 msgstr "추가"
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:149 actions/smssettings.php:166
 msgid "Incoming email"
 msgstr "받은 메일"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:155
 msgid "I want to post notices by email."
 msgstr "메일로 통보를 포스트합니다."
 
 #. TRANS: Form instructions for incoming e-mail form in e-mail settings.
 #. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
-#: actions/emailsettings.php:177 actions/smssettings.php:173
 msgid "Send email to this address to post new notices."
 msgstr "새로운 통지를 올리려면 이 주소로 메일을 보내십시오."
 
 #. TRANS: Instructions for incoming e-mail address input form, when an address has already been assigned.
 #. TRANS: Instructions for incoming SMS e-mail address input form.
-#: actions/emailsettings.php:186 actions/smssettings.php:181
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr "포스팅을 위한 새 메일 계정의 생성; 전 메일 계정은 취소."
 
 #. TRANS: Instructions for incoming e-mail address input form.
-#: actions/emailsettings.php:190
 msgid ""
 "To send notices via email, we need to create a unique email address for you "
 "on this server:"
@@ -2557,89 +2036,71 @@ msgstr ""
 
 #. TRANS: Button label for adding an e-mail address to send notices from.
 #. TRANS: Button label for adding an SMS e-mail address to send notices from.
-#: actions/emailsettings.php:196 actions/smssettings.php:184
 msgctxt "BUTTON"
 msgid "New"
 msgstr "새 게임"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:205
 msgid "Email preferences"
 msgstr "메일 설정"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:213
 msgid "Send me notices of new subscriptions through email."
 msgstr "새로운 예약 구독의 통지를 메일로 보내주세요."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:219
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr "누군가 내 글을 좋아하는 게시글로 추가했을 때, 메일을 보냅니다."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:226
 msgid "Send me email when someone sends me a private message."
 msgstr "누군가 내게 비밀메시지를 보냈을 때, 메일을 보냅니다."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:232
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr "누군가 내게 @ 답장을 보냈을 때, 메일을 보냅니다."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:238
 msgid "Allow friends to nudge me and send me an email."
 msgstr "친구들이 내게 메일이나 쪽지를 보낼 수 있도록 허용합니다."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:244
 msgid "Publish a MicroID for my email address."
 msgstr "메일 주소를 위한 MicroID의 생성"
 
 #. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:362
 msgid "Email preferences saved."
 msgstr "메일 설정이 저장되었습니다."
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:381
 msgid "No email address."
 msgstr "메일 주소가 없습니다."
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:389
 #, fuzzy
 msgid "Cannot normalize that email address."
 msgstr "메일 주소를 정규화 할 수 없습니다."
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:394 actions/register.php:197
-#: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "올바른 메일 주소가 아닙니다."
 
 #. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:398
 msgid "That is already your email address."
 msgstr "그 메일 주소는 이미 귀하의 것입니다."
 
 #. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:402
 msgid "That email address already belongs to another user."
 msgstr "그 메일 주소는 이미 다른 사용자의 소유입니다."
 
 #. TRANS: Server error thrown on database error adding e-mail confirmation code.
 #. TRANS: Server error thrown on database error adding Instant Messaging confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:419 actions/imsettings.php:362
-#: actions/smssettings.php:364
 #, fuzzy
 msgid "Could not insert confirmation code."
 msgstr "확인 코드를 추가 할 수 없습니다."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:426
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
@@ -2650,103 +2111,83 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling Instant Messaging address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:446 actions/imsettings.php:391
-#: actions/smssettings.php:398
 msgid "No pending confirmation to cancel."
 msgstr "취소 할 대기중인 인증이 없습니다."
 
 #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:451
 #, fuzzy
 msgid "That is the wrong email address."
 msgstr "옳지 않은 메신저 계정 입니다."
 
 #. TRANS: Server error thrown on database error canceling e-mail address confirmation.
 #. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
-#: actions/emailsettings.php:460 actions/smssettings.php:412
 #, fuzzy
 msgid "Could not delete email confirmation."
 msgstr "메일 승인을 삭제 할 수 없습니다."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:465
 msgid "Email confirmation cancelled."
 msgstr "취소 할 대기중인 인증이 없습니다."
 
 #. TRANS: Message given trying to remove an e-mail address that is not
 #. TRANS: registered for the active user.
-#: actions/emailsettings.php:484
 msgid "That is not your email address."
 msgstr "그 메일 주소는 귀하의 것이 아닙니다."
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:505
 msgid "The email address was removed."
 msgstr "메일 주소를 지웠습니다."
 
 #. TRANS: Form validation error displayed when trying to remove an incoming e-mail address while no address has been set.
-#: actions/emailsettings.php:519 actions/smssettings.php:554
 msgid "No incoming email address."
 msgstr "받는 메일 주소가 없습니다."
 
 #. 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.
-#: actions/emailsettings.php:531 actions/emailsettings.php:555
-#: actions/smssettings.php:565 actions/smssettings.php:590
 #, fuzzy
 msgid "Could not update user record."
 msgstr "사용자 기록을 업데이트 할 수 없습니다."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
 #. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:535 actions/smssettings.php:569
 msgid "Incoming email address removed."
 msgstr "받는 메일 주소를 지웠습니다."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
 #. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:559 actions/smssettings.php:594
 msgid "New incoming email address added."
 msgstr "새로운 받는 메일 주소를 추가했습니다."
 
 #. TRANS: Client error displayed when trying to mark a notice as favorite that already is a favorite.
-#: actions/favor.php:80
 msgid "This notice is already a favorite!"
 msgstr "이 게시글은 이미 좋아하는 게시글입니다."
 
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
-#: actions/favor.php:95
 #, fuzzy
 msgid "Disfavor favorite."
 msgstr "좋아하는글 취소"
 
 #. TRANS: Page title for first page of favorited notices.
 #. TRANS: Title for favourited notices section.
-#: actions/favorited.php:65 lib/popularnoticesection.php:62
-#: lib/publicgroupnav.php:93
 msgid "Popular notices"
 msgstr "인기있는 게시글"
 
 #. TRANS: Page title for all but first page of favorited notices.
 #. TRANS: %d is the page number being displayed.
-#: actions/favorited.php:69
 #, php-format
 msgid "Popular notices, page %d"
 msgstr "인기있는 게시글, %d 페이지"
 
 #. TRANS: Description on page displaying favorited notices.
-#: actions/favorited.php:81
 msgid "The most popular notices on the site right now."
 msgstr "사이트에서 지금 가장 인기있는 게시글"
 
 #. TRANS: Text displayed instead of a list when a site does not yet have any favourited notices.
-#: actions/favorited.php:149
 msgid "Favorite notices appear on this page but no one has favorited one yet."
 msgstr ""
 
 #. TRANS: Additional text displayed instead of a list when a site does not yet have any favourited notices for logged in users.
-#: actions/favorited.php:153
 msgid ""
 "Be the first to add a notice to your favorites by clicking the fave button "
 "next to any notice you like."
@@ -2754,7 +2195,6 @@ msgstr ""
 
 #. TRANS: Additional text displayed instead of a list when a site does not yet have any favourited notices for not logged in users.
 #. TRANS: %%action.register%% is a registration link. "[link text](link)" is Mark Down. Do not change the formatting.
-#: actions/favorited.php:158
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to add a "
@@ -2765,187 +2205,152 @@ msgstr ""
 #. TRANS: %s is a user's nickname.
 #. TRANS: Title for first page of favourite notices of a user.
 #. TRANS: %s is the user for whom the favourite notices are displayed.
-#: actions/favoritesrss.php:111 actions/showfavorites.php:76
-#: lib/personalgroupnav.php:110
 #, php-format
 msgid "%s's favorite notices"
 msgstr "%s 님의 좋아하는 글"
 
 #. TRANS: Desciption of RSS feed with favourite notices of a user.
 #. TRANS: %1$s is a user's nickname, %2$s is the name of the StatusNet site.
-#: actions/favoritesrss.php:117
 #, fuzzy, php-format
 msgid "Updates favored by %1$s on %2$s!"
 msgstr "%2$s에 있는 %1$s의 업데이트!"
 
 #. TRANS: Page title for first page of featured users.
 #. TRANS: Title for featured users section.
-#: actions/featured.php:69 lib/featureduserssection.php:87
-#: lib/publicgroupnav.php:89
 msgid "Featured users"
 msgstr "인기있는 회원"
 
 #. TRANS: Page title for all but first page of featured users.
 #. TRANS: %d is the page number being displayed.
-#: actions/featured.php:73
 #, php-format
 msgid "Featured users, page %d"
 msgstr "인기있는 회원, %d페이지"
 
 #. TRANS: Description on page displaying featured users.
-#: actions/featured.php:102
 #, fuzzy, php-format
 msgid "A selection of some great users on %s."
 msgstr "%s의 훌륭한 회원의 일부 선택"
 
 #. TRANS: Client error displayed when no notice ID was given trying do display a file.
-#: actions/file.php:36
 msgid "No notice ID."
 msgstr "그러한 통지는 없습니다."
 
 #. TRANS: Client error displayed when an invalid notice ID was given trying do display a file.
-#: actions/file.php:41
 msgid "No notice."
 msgstr "그러한 통지는 없습니다."
 
 #. TRANS: Client error displayed when trying do display a file for a notice without a file attachement.
-#: actions/file.php:46
 msgid "No attachments."
 msgstr "첨부문서 없음"
 
 #. TRANS: Client error displayed when trying do display a file for a notice with file attachements
 #. TRANS: that could not be found.
-#: actions/file.php:58
 msgid "No uploaded attachments."
 msgstr "첨부문서 없음"
 
 #. TRANS: Client error displayed when subscribing to a remote profile and an unexpected response is received.
-#: actions/finishremotesubscribe.php:69
 msgid "Not expecting this response!"
 msgstr "예상치 못한 반응 입니다."
 
 #. TRANS: Client error displayed when subscribing to a remote profile that does not exist.
-#: actions/finishremotesubscribe.php:81
 #, fuzzy
 msgid "User being listened to does not exist."
 msgstr "살펴 보고 있는 사용자가 없습니다."
 
 #. TRANS: Client error displayed when subscribing to a remote profile that is a local profile.
-#: actions/finishremotesubscribe.php:89 actions/remotesubscribe.php:58
 msgid "You can use the local subscription!"
 msgstr "당신은 로컬 구독을 사용할 수 있습니다."
 
 #. TRANS: Client error displayed when subscribing to a remote profile that is blocked form subscribing to.
-#: actions/finishremotesubscribe.php:102
 msgid "That user has blocked you from subscribing."
 msgstr "이 사용자는 귀하의 구독을 차단했습니다."
 
 #. TRANS: Client error displayed when subscribing to a remote profile without providing an authorised token.
-#: actions/finishremotesubscribe.php:114
 msgid "You are not authorized."
 msgstr "당신은 이 프로필에 구독되지 않고있습니다."
 
 #. TRANS: Client error displayed when subscribing to a remote profile and conversion of the request token to access token fails.
-#: actions/finishremotesubscribe.php:118
 #, fuzzy
 msgid "Could not convert request token to access token."
 msgstr "리퀘스트 토큰을 엑세스 토큰으로 변환 할 수 없습니다."
 
 #. TRANS: Client error displayed when subscribing to a remote profile fails because of an unsupported version of the OMB protocol.
-#: actions/finishremotesubscribe.php:124
 #, fuzzy
 msgid "Remote service uses unknown version of OMB protocol."
 msgstr "OMB 프로토콜의 알려지지 않은 버전"
 
 #. TRANS: Server error displayed when subscribing to a remote profile fails because the remote profile could not be updated.
-#: actions/finishremotesubscribe.php:145 lib/oauthstore.php:317
 #, fuzzy
 msgid "Error updating remote profile."
 msgstr "리모트 프로필 업데이트 오류"
 
 #. TRANS: Client error displayed when requesting a non-existent file.
-#: actions/getfile.php:77
 msgid "No such file."
 msgstr "해당하는 파일이 없습니다."
 
 #. TRANS: Client error displayed when requesting a file without having read access to it.
-#: actions/getfile.php:82
 msgid "Cannot read file."
 msgstr "파일을 읽을 수 없습니다."
 
 #. TRANS: Client error displayed when trying to assign an invalid role to a user.
-#: actions/grantrole.php:61 actions/revokerole.php:62
 #, fuzzy
 msgid "Invalid role."
 msgstr "옳지 않은 크기"
 
 #. TRANS: Client error displayed when trying to assign an reserved role to a user.
-#: actions/grantrole.php:66 actions/revokerole.php:66
 msgid "This role is reserved and cannot be set."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to assign a role to a user while not being allowed to set roles.
-#: actions/grantrole.php:76
 msgid "You cannot grant user roles on this site."
 msgstr "이 사이트의 이용자에 대해 권한정지 할 수 없습니다."
 
 #. TRANS: Client error displayed when trying to assign a role to a user that already has that role.
-#: actions/grantrole.php:84
 msgid "User already has this role."
 msgstr "이용자가 프로필을 가지고 있지 않습니다."
 
 #. TRANS: Client error displayed trying to block a user from a group while not specifying a to be blocked user profile.
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing a profile.
+#. TRANS: Client error displayed when not providing a profile ID on the Make Admin page.
 #. TRANS: Client error displayed trying a change a subscription without providing a profile.
 #. TRANS: Client error displayed when trying to change user options without specifying a user to work on.
-#: actions/groupblock.php:71 actions/groupunblock.php:71
-#: actions/makeadmin.php:71 actions/subedit.php:49
-#: lib/profileformaction.php:79
 msgid "No profile specified."
 msgstr "프로필을 지정하지 않았습니다."
 
 #. TRANS: Client error displayed trying to block a user from a group while specifying a non-existing profile.
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing an existing profile.
+#. TRANS: Client error displayed when specifying an invalid profile ID on the Make Admin page.
 #. TRANS: Client error displayed trying a change a subscription for a non-existant profile ID.
 #. TRANS: Client error displayed when trying to change user options without specifying an existing user to work on.
-#: actions/groupblock.php:77 actions/groupunblock.php:77
-#: actions/makeadmin.php:76 actions/subedit.php:57 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:87
 msgid "No profile with that ID."
 msgstr "해당 ID의 프로필이 없습니다."
 
 #. TRANS: Client error displayed trying to block a user from a group while not specifying a group to block a profile from.
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing a group.
-#: actions/groupblock.php:83 actions/groupunblock.php:83
-#: actions/makeadmin.php:81
+#. TRANS: Client error displayed when not providing a group ID on the Make Admin page.
 #, fuzzy
 msgid "No group specified."
 msgstr "프로필을 지정하지 않았습니다."
 
 #. TRANS: Client error displayed trying to block a user from a group while not being an admin user.
-#: actions/groupblock.php:95
 msgid "Only an admin can block group members."
 msgstr ""
 
 #. TRANS: Client error displayed trying to block a user from a group while user is already blocked from the given group.
-#: actions/groupblock.php:100
 msgid "User is already blocked from group."
 msgstr "사용자가 귀하를 차단했습니다."
 
 #. TRANS: Client error displayed trying to block a user from a group while user is not a member of given group.
-#: actions/groupblock.php:106
 msgid "User is not a member of group."
 msgstr "그룹 이용자는 차단해제"
 
 #. TRANS: Title for block user from group page.
 #. TRANS: Form legend for form to block user from a group.
-#: actions/groupblock.php:141 actions/groupmembers.php:364
 msgid "Block user from group"
 msgstr "그룹 이용자는 차단해제"
 
 #. TRANS: Explanatory text for block user from group form before setting the block.
 #. TRANS: %1$s is that to be blocked user, %2$s is the group the user will be blocked from.
-#: actions/groupblock.php:169
 #, fuzzy, php-format
 msgid ""
 "Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They "
@@ -2956,67 +2361,56 @@ msgstr ""
 "독할 수 없으며, 차단된 이용자로부터 @-답장의 통보를 받지 않게 됩니다."
 
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
-#: actions/groupblock.php:191
 #, fuzzy
 msgid "Do not block this user from this group."
 msgstr "이용자를 차단하지 않는다."
 
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
-#: actions/groupblock.php:198
 #, fuzzy
 msgid "Block this user from this group."
 msgstr "그룹 이용자는 차단해제"
 
 #. TRANS: Server error displayed when trying to block a user from a group fails because of an application error.
-#: actions/groupblock.php:215
 #, fuzzy
 msgid "Database error blocking user from group."
 msgstr "그룹 이용자는 차단해제"
 
 #. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
 #. TRANS: Client error displayed trying to find a user by ID without providing an ID.
-#: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr "ID가 없습니다."
 
 #. TRANS: Client error displayed trying to change group design settings while not logged in.
-#: actions/groupdesignsettings.php:67
 #, fuzzy
 msgid "You must be logged in to edit a group."
 msgstr "그룹을 만들기 위해서는 로그인해야 합니다."
 
 #. TRANS: Title group design settings page.
-#: actions/groupdesignsettings.php:146
 msgid "Group design"
 msgstr "프로필 디자인"
 
 #. TRANS: Instructions for group design settings page.
-#: actions/groupdesignsettings.php:157
 msgid ""
 "Customize the way your group looks with a background image and a colour "
 "palette of your choice."
 msgstr ""
 
 #. TRANS: Form validation error displayed when group design settings could not be updated because of an application issue.
-#: actions/groupdesignsettings.php:262
 #, fuzzy
 msgid "Unable to update your design settings."
 msgstr "디자인 설정을 저장할 수 없습니다."
 
 #. TRANS: Form text to confirm saved group design settings.
-#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:239
 msgid "Design preferences saved."
 msgstr "메일 설정이 저장되었습니다."
 
 #. TRANS: Title for group logo settings page.
 #. TRANS: Group logo form legend.
-#: actions/grouplogo.php:144 actions/grouplogo.php:199
 msgid "Group logo"
 msgstr "그룹 로고"
 
 #. TRANS: Instructions for group logo page.
 #. TRANS: %s is the maximum file size for that site.
-#: actions/grouplogo.php:156
 #, php-format
 msgid ""
 "You can upload a logo image for your group. The maximum file size is %s."
@@ -3024,91 +2418,75 @@ msgstr ""
 "사이트의 배경 이미지를 업로드할 수 있습니다. 최대 파일 크기는 %1$s 입니다."
 
 #. TRANS: Submit button for uploading a group logo.
-#: actions/grouplogo.php:243
 msgid "Upload"
 msgstr "올리기"
 
 #. TRANS: Button text for cropping an uploaded group logo.
-#: actions/grouplogo.php:299
 msgid "Crop"
 msgstr "자르기"
 
 #. TRANS: Form instructions on the group logo page.
-#: actions/grouplogo.php:376
 msgid "Pick a square area of the image to be the logo."
 msgstr "이미지에서 로고로 사용할 사각 영역을 지정하세요."
 
 #. TRANS: Form success message after updating a group logo.
-#: actions/grouplogo.php:411
 msgid "Logo updated."
 msgstr "로고를 업데이트했습니다."
 
 #. TRANS: Form failure message after failing to update a group logo.
-#: actions/grouplogo.php:414
 msgid "Failed updating logo."
 msgstr "로고 업데이트에 실패했습니다."
 
 #. TRANS: Title of the page showing group members.
 #. TRANS: %s is the name of the group.
-#: actions/groupmembers.php:104
 #, php-format
 msgid "%s group members"
 msgstr "%s 그룹 회원"
 
 #. TRANS: Title of the page showing group members.
 #. TRANS: %1$s is the name of the group, %2$d is the page number of the members list.
-#: actions/groupmembers.php:109
 #, php-format
 msgid "%1$s group members, page %2$d"
 msgstr "%s 그룹 회원"
 
 #. TRANS: Page notice for group members page.
-#: actions/groupmembers.php:125
 msgid "A list of the users in this group."
 msgstr "이 그룹의 회원리스트"
 
 #. TRANS: Indicator in group members list that this user is a group administrator.
-#: actions/groupmembers.php:190 lib/action.php:581
 msgid "Admin"
 msgstr "관리자"
 
 #. TRANS: Button text for the form that will block a user from a group.
-#: actions/groupmembers.php:397
 msgctxt "BUTTON"
 msgid "Block"
 msgstr "차단"
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:401
 msgctxt "TOOLTIP"
 msgid "Block this user"
 msgstr "이 사용자 차단"
 
 #. TRANS: Form legend for form to make a user a group admin.
-#: actions/groupmembers.php:488
 msgid "Make user an admin of the group"
 msgstr "사용자를 그룹의 관리자로 만듭니다"
 
 #. TRANS: Button text for the form that will make a user administrator.
-#: actions/groupmembers.php:521
 msgctxt "BUTTON"
 msgid "Make Admin"
 msgstr "관리자 만들기"
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:525
 msgctxt "TOOLTIP"
 msgid "Make this user an admin"
 msgstr ""
 
 #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
-#: actions/grouprss.php:141
 #, fuzzy, php-format
 msgid "Updates from members of %1$s on %2$s!"
 msgstr "%2$s에 있는 %1$s의 업데이트!"
 
 #. TRANS: Title for first page of the groups list.
-#: actions/groups.php:62
 #, fuzzy
 msgctxt "TITLE"
 msgid "Groups"
@@ -3116,7 +2494,6 @@ msgstr "그룹"
 
 #. TRANS: Title for all but the first page of the groups list.
 #. TRANS: %d is the page number.
-#: actions/groups.php:66
 #, fuzzy, php-format
 msgctxt "TITLE"
 msgid "Groups, page %d"
@@ -3125,7 +2502,6 @@ msgstr "그룹, %d 페이지"
 #. TRANS: Page notice of group list. %%%%site.name%%%% is the StatusNet site name,
 #. TRANS: %%%%action.groupsearch%%%% and %%%%action.newgroup%%%% are URLs. Do not change them.
 #. TRANS: This message contains Markdown links in the form [link text](link).
-#: actions/groups.php:95
 #, php-format
 msgid ""
 "%%%%site.name%%%% groups let you find and talk with people of similar "
@@ -3136,12 +2512,10 @@ msgid ""
 msgstr ""
 
 #. TRANS: Link to create a new group on the group list page.
-#: actions/groups.php:113 actions/usergroups.php:126 lib/groupeditform.php:115
 msgid "Create a new group"
 msgstr "새 그룹을 만듭니다."
 
 #. TRANS: Instructions for page where groups can be searched. %%site.name%% is the name of the StatusNet site.
-#: actions/groupsearch.php:53
 #, php-format
 msgid ""
 "Search for groups on %%site.name%% by their name, location, or description. "
@@ -3151,21 +2525,17 @@ msgstr ""
 "구분하고, 적어도 3글자 이상 필요합니다."
 
 #. TRANS: Title for page where groups can be searched.
-#: actions/groupsearch.php:60
 msgid "Group search"
 msgstr "그룹 찾기"
 
 #. TRANS: Text on page where groups can be searched if no results were found for a query.
 #. TRANS: Text for notice search results is the query had no results.
 #. TRANS: Message on the "People search" page where a query has no results.
-#: actions/groupsearch.php:82 actions/noticesearch.php:122
-#: actions/peoplesearch.php:87
 msgid "No results."
 msgstr "결과 없음"
 
 #. TRANS: Additional text on page where groups can be searched if no results were found for a query for a logged in user.
 #. TRANS: This message contains Markdown links in the form [link text](link).
-#: actions/groupsearch.php:87
 #, php-format
 msgid ""
 "If you cannot find the group you're looking for, you can [create it](%%"
@@ -3174,7 +2544,6 @@ msgstr ""
 
 #. TRANS: Additional text on page where groups can be searched if no results were found for a query for a not logged in user.
 #. TRANS: This message contains Markdown links in the form [link text](link).
-#: actions/groupsearch.php:92
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and [create the group](%%"
@@ -3182,30 +2551,25 @@ msgid ""
 msgstr ""
 
 #. TRANS: Client error displayed when trying to unblock a user from a group without being an administrator for the group.
-#: actions/groupunblock.php:95
 msgid "Only an admin can unblock group members."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to unblock a non-blocked user from a group.
-#: actions/groupunblock.php:100
 msgid "User is not blocked from group."
 msgstr "그룹 이용자는 차단해제"
 
 #. TRANS: Server error displayed when unblocking a user from a group fails because of an unknown error.
 #. TRANS: Server error displayed when removing a user block.
-#: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "차단 제거 에러!"
 
 #. TRANS: Title for Instant Messaging settings.
-#: actions/imsettings.php:56
 msgid "IM settings"
 msgstr "메일 설정"
 
 #. 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.
-#: actions/imsettings.php:69
 #, fuzzy, php-format
 msgid ""
 "You can send and receive notices through instant messaging [instant messages]"
@@ -3215,18 +2579,15 @@ msgstr ""
 "래 당신의 주소와 환경설정을 조정하세요."
 
 #. TRANS: Message given in the IM settings if IM is not enabled on the site.
-#: actions/imsettings.php:90
 msgid "IM is not available."
 msgstr "인스턴트 메신저를 사용할 수 없습니다."
 
-#: actions/imsettings.php:116
 #, fuzzy, php-format
 msgid "Current confirmed %s address."
 msgstr "확인된 최신의 메일 계정"
 
 #. TRANS: Form note in IM settings form.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:128
 #, fuzzy, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your %s account for a message "
@@ -3235,89 +2596,74 @@ msgstr ""
 "이 주소는 인증 대기 중입니다. Jabber/Gtalk로 메시지를 확인해 주십시오.(%s 항"
 "목을 추가하셨습니까?)"
 
-#: actions/imsettings.php:140
 msgid "IM address"
 msgstr "SMS 주소"
 
-#: actions/imsettings.php:142
 #, php-format
 msgid "%s screenname."
 msgstr ""
 
 #. TRANS: Header for IM preferences form.
-#: actions/imsettings.php:163
 #, fuzzy
 msgid "IM Preferences"
 msgstr "메일 설정"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:174
 #, fuzzy
 msgid "Send me notices"
 msgstr "게시글 보내기"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:176
 #, fuzzy
 msgid "Post a notice when my status changes."
 msgstr "Jabber/GTalk의 상태가 변경되었을 때 통지를 보냅니다."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:178
 #, fuzzy
 msgid "Send me replies from people I'm not subscribed to."
 msgstr ""
 "내가 구독하지 않는 사람으로 부터의 답장을  Jabber/GTalk을 통해 보내주세요."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:181
 #, fuzzy
 msgid "Publish a MicroID"
 msgstr "메일 주소를 위한 MicroID의 생성"
 
 #. TRANS: Server error thrown on database error updating IM preferences.
-#: actions/imsettings.php:291
 #, fuzzy
 msgid "Couldn't update IM preferences."
 msgstr "이용자를 업데이트 할 수 없습니다."
 
 #. TRANS: Confirmation message for successful IM preferences save.
 #. TRANS: Confirmation message after saving preferences.
-#: actions/imsettings.php:298 actions/urlsettings.php:244
 msgid "Preferences saved."
 msgstr "설정이 저장되었습니다."
 
 #. TRANS: Message given saving IM address without having provided one.
-#: actions/imsettings.php:320
 #, fuzzy
 msgid "No screenname."
 msgstr "별명이 없습니다."
 
-#: actions/imsettings.php:325
 #, fuzzy
 msgid "No transport."
 msgstr "그러한 통지는 없습니다."
 
 #. TRANS: Message given saving IM address that cannot be normalised.
-#: actions/imsettings.php:333
 #, fuzzy
 msgid "Cannot normalize that screenname"
 msgstr "그 Jabbar ID를 정규화 할 수 없습니다."
 
 #. TRANS: Message given saving IM address that not valid.
-#: actions/imsettings.php:340
 #, fuzzy
 msgid "Not a valid screenname"
 msgstr "유효한 별명이 아닙니다"
 
 #. TRANS: Message given saving IM address that is already set for another user.
-#: actions/imsettings.php:344
 #, fuzzy
 msgid "Screenname already belongs to another user."
 msgstr "Jabber ID가 이미 다른 사용자에 의하여 사용되고 있습니다."
 
 #. TRANS: Message given saving valid IM address that is to be confirmed.
-#: actions/imsettings.php:369
 #, fuzzy
 msgid "A confirmation code was sent to the IM address you added."
 msgstr ""
@@ -3325,85 +2671,71 @@ msgstr ""
 "달할 수 있습니다."
 
 #. TRANS: Message given canceling IM address confirmation for the wrong IM address.
-#: actions/imsettings.php:396
 msgid "That is the wrong IM address."
 msgstr "옳지 않은 메신저 계정 입니다."
 
 #. TRANS: Server error thrown on database error canceling IM address confirmation.
-#: actions/imsettings.php:405
 #, fuzzy
 msgid "Couldn't delete confirmation."
 msgstr "메신저 승인을 삭제 할 수 없습니다."
 
 #. TRANS: Message given after successfully canceling IM address confirmation.
-#: actions/imsettings.php:410
 msgid "IM confirmation cancelled."
 msgstr "확인 코드가 없습니다."
 
 #. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.
-#: actions/imsettings.php:434
 #, fuzzy
 msgid "That is not your screenname."
 msgstr "그 휴대폰 번호는 귀하의 것이 아닙니다."
 
 #. TRANS: Server error thrown on database error removing a registered IM address.
-#: actions/imsettings.php:443
 #, fuzzy
 msgid "Couldn't update user im prefs."
 msgstr "사용자 기록을 업데이트 할 수 없습니다."
 
 #. TRANS: Message given after successfully removing a registered Instant Messaging address.
-#: actions/imsettings.php:451
 msgid "The IM address was removed."
 msgstr "메일 주소를 지웠습니다."
 
 #. TRANS: Title for all but the first page of the inbox page.
 #. TRANS: %1$s is the user's nickname, %2$s is the page number.
-#: actions/inbox.php:59
 #, php-format
 msgid "Inbox for %1$s - page %2$d"
 msgstr "%1$s 및 친구들, %2$d 페이지"
 
 #. TRANS: Title for the first page of the inbox page.
 #. TRANS: %s is the user's nickname.
-#: actions/inbox.php:64
 #, php-format
 msgid "Inbox for %s"
 msgstr "%s의 받은쪽지함"
 
 #. TRANS: Instructions for user inbox page.
-#: actions/inbox.php:106
 msgid "This is your inbox, which lists your incoming private messages."
 msgstr "당신의 받은 쪽지함입니다. 당신이 받은 비밀 메시지가 있습니다."
 
 #. TRANS: Client error displayed when trying to sent invites while they have been disabled.
-#: actions/invite.php:41
 msgid "Invites have been disabled."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to sent invites while not logged in.
 #. TRANS: %s is the StatusNet site name.
-#: actions/invite.php:45
 #, php-format
 msgid "You must be logged in to invite other users to use %s."
 msgstr "그룹가입을 위해서는 로그인이 필요합니다."
 
 #. TRANS: Form validation message when providing an e-mail address that does not validate.
 #. TRANS: %s is an invalid e-mail address.
-#: actions/invite.php:78
 #, fuzzy, php-format
 msgid "Invalid email address: %s."
 msgstr "올바르지 않은 메일 주소 : %s"
 
 #. TRANS: Page title when invitations have been sent.
-#: actions/invite.php:117
 #, fuzzy
 msgid "Invitations sent"
 msgstr "초대권을 보냈습니다"
 
 #. TRANS: Page title when inviting potential users.
-#: actions/invite.php:120
 msgid "Invite new users"
 msgstr "새 사용자를 초대"
 
@@ -3411,7 +2743,6 @@ msgstr "새 사용자를 초대"
 #. TRANS: is already subscribed to one or more users with the given e-mail address(es).
 #. TRANS: Plural form is based on the number of reported already subscribed e-mail addresses.
 #. TRANS: Followed by a bullet list.
-#: actions/invite.php:140
 #, fuzzy
 msgid "You are already subscribed to this user:"
 msgid_plural "You are already subscribed to these users:"
@@ -3419,7 +2750,6 @@ msgstr[0] "당신은 다음 사용자를 이미 구독하고 있습니다."
 
 #. TRANS: Used as list item for already subscribed users (%1$s is nickname, %2$s is e-mail address).
 #. TRANS: Used as list item for already registered people (%1$s is nickname, %2$s is e-mail address).
-#: actions/invite.php:146 actions/invite.php:160
 #, fuzzy, php-format
 msgctxt "INVITE"
 msgid "%1$s (%2$s)"
@@ -3428,7 +2758,6 @@ msgstr "%1$s (%2$s)"
 #. TRANS: Message displayed inviting users to use a StatusNet site while the invited user
 #. TRANS: already uses a this StatusNet site. Plural form is based on the number of
 #. TRANS: reported already present people. Followed by a bullet list.
-#: actions/invite.php:154
 #, fuzzy
 msgid "This person is already a user and you were automatically subscribed:"
 msgid_plural ""
@@ -3438,7 +2767,6 @@ msgstr[0] "자동 구독 신청이 된 사용자:"
 #. TRANS: Message displayed inviting users to use a StatusNet site. Plural form is
 #. TRANS: based on the number of invitations sent. Followed by a bullet list of
 #. TRANS: e-mail addresses to which invitations were sent.
-#: actions/invite.php:168
 #, fuzzy
 msgid "Invitation sent to the following person:"
 msgid_plural "Invitations sent to the following people:"
@@ -3446,7 +2774,6 @@ msgstr[0] "다음 사람들에게 초대권을 보냈습니다:"
 
 #. TRANS: Generic message displayed after sending out one or more invitations to
 #. TRANS: people to join a StatusNet site.
-#: actions/invite.php:178
 msgid ""
 "You will be notified when your invitees accept the invitation and register "
 "on the site. Thanks for growing the community!"
@@ -3455,34 +2782,29 @@ msgstr ""
 "다. 커뮤니티를 키워주셔서 대단히 감사합니다. ^^"
 
 #. TRANS: Form instructions.
-#: actions/invite.php:191
 msgid ""
 "Use this form to invite your friends and colleagues to use this service."
 msgstr "다음 양식을 이용해 친구와 동료를 이 서비스에 초대하십시오."
 
 #. TRANS: Field label for a list of e-mail addresses.
-#: actions/invite.php:218
 msgid "Email addresses"
 msgstr "메일 주소"
 
 #. TRANS: Tooltip for field label for a list of e-mail addresses.
-#: actions/invite.php:221
 #, fuzzy
 msgid "Addresses of friends to invite (one per line)."
 msgstr "초청할 친구 주소 (한 줄에 한 명씩)"
 
 #. TRANS: Field label for a personal message to send to invitees.
-#: actions/invite.php:225
 msgid "Personal message"
 msgstr "개인 메시지"
 
 #. TRANS: Tooltip for field label for a personal message to send to invitees.
-#: actions/invite.php:228
 msgid "Optionally add a personal message to the invitation."
 msgstr "초대장에 메시지 첨부하기."
 
 #. TRANS: Send button for inviting friends
-#: actions/invite.php:232
+#. TRANS: Button text for sending notice.
 msgctxt "BUTTON"
 msgid "Send"
 msgstr "보내기"
@@ -3490,7 +2812,6 @@ msgstr "보내기"
 #. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral
 #. TRANS: singular 3rd-person pronoun in English. %1$s is the inviting user, $2$s is
 #. TRANS: the StatusNet sitename.
-#: actions/invite.php:264
 #, php-format
 msgid "%1$s has invited you to join them on %2$s"
 msgstr "%1$s님이 귀하를 %2$s에 초대하였습니다."
@@ -3500,7 +2821,6 @@ msgstr "%1$s님이 귀하를 %2$s에 초대하였습니다."
 #. TRANS: StatusNet sitename, %3$s is the site URL, %4$s is the personal message from the
 #. TRANS: inviting user, %s%5 a link to the timeline for the inviting user, %s$6 is a link
 #. TRANS: to register with the StatusNet site.
-#: actions/invite.php:271
 #, php-format
 msgid ""
 "%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -3553,195 +2873,191 @@ msgstr ""
 "%2$s 보냄\n"
 
 #. TRANS: Client error displayed when trying to join a group while not logged in.
-#: actions/joingroup.php:59
 msgid "You must be logged in to join a group."
 msgstr "그룹가입을 위해서는 로그인이 필요합니다."
 
 #. TRANS: Title for join group page after joining.
-#: actions/joingroup.php:148
 #, fuzzy, php-format
 msgctxt "TITLE"
 msgid "%1$s joined group %2$s"
 msgstr "%1$s의 상태 (%2$s에서)"
 
 #. TRANS: Client error displayed when trying to leave a group while not logged in.
-#: actions/leavegroup.php:59
 msgid "You must be logged in to leave a group."
 msgstr "그룹을 떠나기 위해서는 로그인해야 합니다."
 
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
-#: actions/leavegroup.php:103 lib/command.php:398
 msgid "You are not a member of that group."
 msgstr "당신은 해당 그룹의 멤버가 아닙니다."
 
 #. TRANS: Title for leave group page after leaving.
-#: actions/leavegroup.php:142
 #, fuzzy, php-format
 msgctxt "TITLE"
 msgid "%1$s left group %2$s"
 msgstr "%1$s의 상태 (%2$s에서)"
 
 #. TRANS: User admin panel title
-#: actions/licenseadminpanel.php:55
 msgctxt "TITLE"
 msgid "License"
 msgstr "라이선스"
 
-#: actions/licenseadminpanel.php:65
+#. TRANS: Form instructions for the site license admin panel.
 msgid "License for this StatusNet site"
 msgstr ""
 
-#: actions/licenseadminpanel.php:134
+#. TRANS: Client error displayed selecting an invalid license in the license admin panel.
 msgid "Invalid license selection."
 msgstr ""
 
-#: actions/licenseadminpanel.php:144
+#. TRANS: Client error displayed when not specifying an owner for the all rights reserved license in the license admin panel.
 msgid ""
 "You must specify the owner of the content when using the All Rights Reserved "
 "license."
 msgstr ""
 
-#: actions/licenseadminpanel.php:151
+#. TRANS: Client error displayed selecting a too long license title in the license admin panel.
 #, fuzzy
 msgid "Invalid license title. Maximum length is 255 characters."
 msgstr "위치가 너무 깁니다. (최대 255글자)"
 
-#: actions/licenseadminpanel.php:163
+#. TRANS: Client error displayed specifying an invalid license URL in the license admin panel.
 msgid "Invalid license URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:166
+#. TRANS: Client error displayed specifying an invalid license image URL in the license admin panel.
 msgid "Invalid license image URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:174
+#. TRANS: Client error displayed specifying an invalid license URL in the license admin panel.
 msgid "License URL must be blank or a valid URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:182
+#. TRANS: Client error displayed specifying an invalid license image URL in the license admin panel.
 msgid "License image must be blank or valid URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:232
+#. TRANS: Form legend in the license admin panel.
 msgid "License selection"
 msgstr ""
 
-#: actions/licenseadminpanel.php:238
+#. TRANS: License option in the license admin panel.
 #, fuzzy
 msgid "Private"
 msgstr "개인정보 취급방침"
 
-#: actions/licenseadminpanel.php:239
+#. TRANS: License option in the license admin panel.
 msgid "All Rights Reserved"
 msgstr "All Rights Reserved"
 
-#: actions/licenseadminpanel.php:240
+#. TRANS: License option in the license admin panel.
 msgid "Creative Commons"
 msgstr "크리에이티브 커먼즈 (Creative Commons)"
 
-#: actions/licenseadminpanel.php:245
+#. TRANS: Dropdown field label in the license admin panel.
 msgid "Type"
 msgstr "종류"
 
-#: actions/licenseadminpanel.php:247
-msgid "Select license"
+#. TRANS: Dropdown field instructions in the license admin panel.
+#, fuzzy
+msgid "Select a license."
 msgstr "라이선스 선택"
 
-#: actions/licenseadminpanel.php:261
+#. TRANS: Form legend in the license admin panel.
 msgid "License details"
 msgstr "라이선스 세부 정보"
 
-#: actions/licenseadminpanel.php:267
+#. TRANS: Field label in the license admin panel.
 msgid "Owner"
 msgstr ""
 
-#: actions/licenseadminpanel.php:268
+#. TRANS: Field title in the license admin panel.
 msgid "Name of the owner of the site's content (if applicable)."
 msgstr ""
 
-#: actions/licenseadminpanel.php:276
+#. TRANS: Field label in the license admin panel.
 msgid "License Title"
 msgstr ""
 
-#: actions/licenseadminpanel.php:277
+#. TRANS: Field title in the license admin panel.
 msgid "The title of the license."
 msgstr "라이선스 이름"
 
-#: actions/licenseadminpanel.php:285
+#. TRANS: Field label in the license admin panel.
 msgid "License URL"
 msgstr "라이선스 URL"
 
-#: actions/licenseadminpanel.php:286
+#. TRANS: Field title in the license admin panel.
 msgid "URL for more information about the license."
 msgstr ""
 
-#: actions/licenseadminpanel.php:293
+#. TRANS: Field label in the license admin panel.
 msgid "License Image URL"
 msgstr "라이선스 이미지 URL"
 
-#: actions/licenseadminpanel.php:294
+#. TRANS: Field title in the license admin panel.
 msgid "URL for an image to display with the license."
 msgstr ""
 
-#. TRANS: Submit button title.
-#: actions/licenseadminpanel.php:311 actions/sessionsadminpanel.php:199
-#: actions/siteadminpanel.php:292 actions/snapshotadminpanel.php:245
-#: actions/tagother.php:133 lib/applicationeditform.php:357
-msgid "Save"
-msgstr "저장"
-
-#: actions/licenseadminpanel.php:311
-msgid "Save license settings"
-msgstr ""
+#. TRANS: Button title in the license admin panel.
+#, fuzzy
+msgid "Save license settings."
+msgstr "접근 설정을 저장"
 
+#. TRANS: Client error displayed when trying to log in while already logged in.
 #. TRANS: Client error displayed trying to use "one time password login" when already logged in.
-#: actions/login.php:97 actions/otp.php:62 actions/register.php:130
 msgid "Already logged in."
 msgstr "이미 로그인 하셨습니다."
 
-#: actions/login.php:125
+#. TRANS: Form validation error displayed when trying to log in with incorrect credentials.
 msgid "Incorrect username or password."
 msgstr "틀린 계정 또는 비밀 번호"
 
+#. TRANS: Server error displayed when during login a server error occurs.
 #. TRANS: Server error displayed when a user object could not be created trying to login using "one time password login".
-#: actions/login.php:131 actions/otp.php:127
 msgid "Error setting user. You are probably not authorized."
 msgstr "당신은 이 프로필에 구독되지 않고있습니다."
 
-#: actions/login.php:185 actions/login.php:236 lib/action.php:598
+#. TRANS: Page title for login page.
 msgid "Login"
 msgstr "로그인"
 
-#: actions/login.php:222
+#. TRANS: Form legend on login page.
 msgid "Login to site"
 msgstr "사이트에 로그인하세요."
 
-#: actions/login.php:231 actions/register.php:469
+#. TRANS: Checkbox label label on login page.
 msgid "Remember me"
 msgstr "자동 로그인"
 
-#: actions/login.php:232 actions/register.php:471
+#. TRANS: Checkbox title on login page.
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "앞으로는 자동으로 로그인합니다. 공용 컴퓨터에서는 이용하지 마십시오!"
 
-#: actions/login.php:241
+#. TRANS: Button text for log in on login page.
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Login"
+msgstr "로그인"
+
+#. TRANS: Link text for link to "reset password" on login page.
 msgid "Lost or forgotten password?"
 msgstr "비밀 번호를 잊으셨나요?"
 
-#: actions/login.php:259
+#. TRANS: Form instructions on login page before being able to change user settings.
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
 msgstr ""
 "보안을 위해 세팅을 저장하기 전에 계정과 비밀 번호를 다시 입력 해 주십시오."
 
-#: actions/login.php:263
+#. TRANS: Form instructions on login page.
 #, fuzzy
 msgid "Login with your username and password."
 msgstr "사용자 이름과 비밀번호로 로그인"
 
-#: actions/login.php:266
+#. TRANS: Form instructions on login page. This message contains Markdown links in the form [Link text](Link).
+#. TRANS: %%action.register%% is a link to the registration page.
 #, fuzzy, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -3750,130 +3066,125 @@ msgstr ""
 "action.register%%) 새 계정을 생성 또는 [OpenID](%%action.openidlogin%%)를 사"
 "용해 보세요."
 
-#: actions/makeadmin.php:92
+#. TRANS: Client error displayed when trying to make another user admin on the Make Admin page while not an admin.
 msgid "Only an admin can make another user an admin."
 msgstr ""
 
-#: actions/makeadmin.php:96
+#. TRANS: Client error displayed when trying to make another user admin on the Make Admin page who already is admin.
+#. TRANS: %1$s is the user that is already admin, %2$s is the group user is already admin for.
 #, php-format
 msgid "%1$s is already an admin for group \"%2$s\"."
 msgstr "이용자 %1$s 의 그룹 %2$s 가입에 실패했습니다."
 
-#: actions/makeadmin.php:133
+#. TRANS: Server error displayed when trying to make another user admin on the Make Admin page fails
+#. TRANS: because the group membership record could not be gotten.
+#. TRANS: %1$s is the to be admin user, %2$s is the group user should be admin for.
 #, php-format
 msgid "Can't get membership record for %1$s in group %2$s."
 msgstr "이용자 %1$s 의 그룹 %2$s 가입에 실패했습니다."
 
-#: actions/makeadmin.php:146
+#. TRANS: Server error displayed when trying to make another user admin on the Make Admin page fails
+#. TRANS: because the group adminship record coud not be saved properly.
+#. TRANS: %1$s is the to be admin user, %2$s is the group user is already admin for.
 #, php-format
 msgid "Can't make %1$s an admin for group %2$s."
 msgstr "이용자 %1$s 의 그룹 %2$s 가입에 실패했습니다."
 
-#: actions/microsummary.php:69
+#. TRANS: Client error displayed trying to make a micro summary without providing a status.
 msgid "No current status."
 msgstr "결과 없음"
 
 #. TRANS: This is the title of the form for adding a new application.
-#: actions/newapplication.php:52
 #, fuzzy
 msgid "New application"
 msgstr "신규 응용 프로그램"
 
 #. TRANS: Client error displayed trying to add a new application while not logged in.
-#: actions/newapplication.php:64
 msgid "You must be logged in to register an application."
 msgstr "응용 프로그램 수정을 위해서는 로그인해야 합니다."
 
 #. TRANS: Form instructions for registering a new application.
-#: actions/newapplication.php:147
 #, fuzzy
 msgid "Use this form to register a new application."
 msgstr "새 그룹을 만들기 위해 이 양식을 사용하세요."
 
 #. TRANS: Validation error shown when not providing a source URL in the "New application" form.
-#: actions/newapplication.php:189
 msgid "Source URL is required."
 msgstr "소스 URL이 필요합니다."
 
 #. TRANS: Server error displayed when an application could not be registered in the database through the "New application" form.
-#: actions/newapplication.php:279 actions/newapplication.php:289
 msgid "Could not create application."
 msgstr "관심소식을 생성할 수 없습니다."
 
 #. TRANS: Title for form to create a group.
-#: actions/newgroup.php:53
 msgid "New group"
 msgstr "새로운 그룹"
 
 #. TRANS: Client exception thrown when a user tries to create a group while banned.
-#: actions/newgroup.php:73 classes/User_group.php:485
 #, fuzzy
 msgid "You are not allowed to create groups on this site."
 msgstr "당신은 해당 그룹의 멤버가 아닙니다."
 
 #. TRANS: Form instructions for group create form.
-#: actions/newgroup.php:117
 msgid "Use this form to create a new group."
 msgstr "새 그룹을 만들기 위해 이 양식을 사용하세요."
 
-#. TRANS: Group create form validation error.
-#: actions/newgroup.php:200
-msgid "Alias cannot be the same as nickname."
-msgstr ""
-
-#: actions/newmessage.php:71 actions/newmessage.php:234
+#. TRANS: Page title for new direct message page.
+#. TRANS: Page title on page for sending a direct message.
 msgid "New message"
 msgstr "새로운 메시지입니다."
 
-#. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
-#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:513
-msgid "You can't send a message to this user."
+#. TRANS: Client error displayed trying to send a direct message to a user while sender and
+#. TRANS: receiver are not subscribed to each other.
+#, fuzzy
+msgid "You cannot send a message to this user."
 msgstr "당신은 이 사용자에게 메시지를 보낼 수 없습니다."
 
+#. TRANS: Form validator error displayed trying to send a direct message without content.
+#. TRANS: Client error displayed trying to send a notice without content.
 #. TRANS: Command exception text shown when trying to send a direct message to another user without content.
 #. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
-#: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:490
-#: lib/command.php:593
 msgid "No content!"
 msgstr "내용이 없습니다!"
 
-#: actions/newmessage.php:161
+#. TRANS: Form validation error displayed trying to send a direct message without specifying a recipient.
 msgid "No recipient specified."
 msgstr "수신자를 지정하지 않았습니다."
 
+#. TRANS: Client error displayed trying to send a direct message to self.
 #. TRANS: Error text shown when trying to send a direct message to self.
-#: actions/newmessage.php:167 lib/command.php:517
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
 "자신에게 메시지를 보내지 마세요. 대신 조용하게 스스로에게 그것을 말하세요;;"
 
-#: actions/newmessage.php:184
+#. TRANS: Page title after sending a direct message.
 msgid "Message sent"
 msgstr "쪽지가 전송되었습니다."
 
+#. TRANS: Confirmation text after sending a direct message.
+#. TRANS: %s is the direct message recipient.
 #. TRANS: Message given have sent a direct message to another user.
 #. TRANS: %s is the name of the other user.
-#: actions/newmessage.php:188 lib/command.php:525
 #, fuzzy, php-format
 msgid "Direct message to %s sent."
 msgstr "%s에게 보낸 직접 메시지"
 
-#: actions/newmessage.php:213 actions/newnotice.php:264
+#. TRANS: Page title after an AJAX error occurred on the "send direct message" page.
+#. TRANS: Page title after an AJAX error occurs on the send notice page.
 msgid "Ajax Error"
 msgstr "Ajax 에러입니다."
 
-#: actions/newnotice.php:69
+#. TRANS: Page title for sending a new notice.
 msgid "New notice"
 msgstr "새로운 통지"
 
-#: actions/newnotice.php:230
+#. TRANS: Page title after sending a notice.
 msgid "Notice posted"
 msgstr "게시글이 등록되었습니다."
 
 #. TRANS: Instructions for Notice search page.
 #. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/noticesearch.php:69
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -3883,20 +3194,17 @@ msgstr ""
 "자 이상 필요합니다."
 
 #. TRANS: Title of the page where users can search for notices.
-#: actions/noticesearch.php:80
 msgid "Text search"
 msgstr "문자 검색"
 
 #. TRANS: Test in RSS notice search.
 #. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearch.php:95
 #, php-format
 msgid "Search results for \"%1$s\" on %2$s"
 msgstr "%1$s에서 %2$s까지 메시지"
 
 #. TRANS: Text for logged in users making a query for notices without results.
 #. TRANS: This message contains a Markdown link.
-#: actions/noticesearch.php:128
 #, php-format
 msgid ""
 "Be the first to [post on this topic](%%%%action.newnotice%%%%?"
@@ -3905,7 +3213,6 @@ msgstr ""
 
 #. TRANS: Text for not logged in users making a query for notices without results.
 #. TRANS: This message contains Markdown links.
-#: actions/noticesearch.php:133
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and be the first to "
@@ -3913,19 +3220,17 @@ msgid ""
 msgstr ""
 
 #. TRANS: RSS notice search feed title. %s is the query.
-#: actions/noticesearchrss.php:95
 #, fuzzy, php-format
 msgid "Updates with \"%s\""
 msgstr "%2$s에 있는 %1$s의 업데이트!"
 
 #. TRANS: RSS notice search feed description.
 #. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearchrss.php:99
 #, fuzzy, php-format
 msgid "Updates matching search term \"%1$s\" on %2$s."
 msgstr "%2$s에 있는 %1$s의 업데이트!"
 
-#: actions/nudge.php:85
+#. TRANS: Client error displayed trying to nudge a user that cannot be nudged.
 #, fuzzy
 msgid ""
 "This user doesn't allow nudges or hasn't confirmed or set their email "
@@ -3933,61 +3238,52 @@ msgid ""
 msgstr ""
 "이 사용자는 nudge를 허용하지 않았고, 아직 그의 메일을 인증하지 않았습니다."
 
-#: actions/nudge.php:94
+#. TRANS: Page title after sending a nudge.
 msgid "Nudge sent"
 msgstr "찔러 보기를 보냈습니다."
 
-#: actions/nudge.php:97
+#. TRANS: Confirmation text after sending a nudge.
 msgid "Nudge sent!"
 msgstr "찔러 보기를 보냈습니다!"
 
 #. TRANS: Message displayed to an anonymous user trying to view OAuth application list.
-#: actions/oauthappssettings.php:57
 msgid "You must be logged in to list your applications."
 msgstr "응용 프로그램 수정을 위해서는 로그인해야 합니다."
 
 #. TRANS: Page title for OAuth applications
-#: actions/oauthappssettings.php:73
 msgid "OAuth applications"
 msgstr "응용프로그램 삭제"
 
 #. TRANS: Page instructions for OAuth applications
-#: actions/oauthappssettings.php:85
 msgid "Applications you have registered"
 msgstr ""
 
 #. TRANS: Empty list message on page with OAuth applications.
-#: actions/oauthappssettings.php:138
 #, fuzzy, php-format
 msgid "You have not registered any applications yet."
 msgstr "응용 프로그램 수정을 위해서는 로그인해야 합니다."
 
 #. TRANS: Title for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:69
 msgid "Connected applications"
 msgstr "연결한 응용프로그램"
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:80
 msgid "The following connections exist for your account."
 msgstr ""
 
 #. TRANS: Client error when trying to revoke access for an application while not being a user of it.
-#: actions/oauthconnectionssettings.php:165
 #, fuzzy
 msgid "You are not a user of that application."
 msgstr "당신은 해당 그룹의 멤버가 아닙니다."
 
 #. TRANS: Client error when revoking access has failed for some reason.
 #. TRANS: %s is the application ID revoking access failed for.
-#: actions/oauthconnectionssettings.php:180
 #, fuzzy, php-format
 msgid "Unable to revoke access for application: %s."
 msgstr "다음 양식을 이용해 그룹을 편집하십시오."
 
 #. TRANS: Success message after revoking access for an application.
 #. TRANS: %1$s is the application name, %2$s is the first part of the user token.
-#: actions/oauthconnectionssettings.php:199
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -3995,469 +3291,386 @@ msgid ""
 msgstr ""
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:210
 msgid "You have not authorized any applications to use your account."
 msgstr "계정에서 사용하도록 허용한 응용 프로그램이 없습니다."
 
 #. TRANS: Note for developers in the OAuth connection settings form.
 #. TRANS: This message contains a Markdown link. Do not separate "](".
 #. TRANS: %s is the URL to the OAuth settings.
-#: actions/oauthconnectionssettings.php:230
 #, php-format
 msgid ""
 "Are you a developer? [Register an OAuth client application](%s) to use with "
 "this instance of StatusNet."
 msgstr ""
 
-#: actions/oembed.php:64
+#. TRANS: Server error displayed in oEmbed action when path not found.
+#. TRANS: %s is a path.
 #, fuzzy, php-format
 msgid "\"%s\" not found."
 msgstr "API 메서드 발견 안 됨."
 
-#: actions/oembed.php:76
+#. TRANS: Server error displayed in oEmbed action when notice not found.
+#. TRANS: %s is a notice.
 #, fuzzy, php-format
 msgid "Notice %s not found."
 msgstr "API 메서드 발견 안 됨."
 
-#: actions/oembed.php:80 actions/shownotice.php:100
+#. TRANS: Server error displayed in oEmbed action when notice has not profile.
 msgid "Notice has no profile."
 msgstr "이용자가 프로필을 가지고 있지 않습니다."
 
-#: actions/oembed.php:83 actions/shownotice.php:172
+#. TRANS: oEmbed title. %1$s is the author name, %2$s is the creation date.
 #, php-format
 msgid "%1$s's status on %2$s"
 msgstr "%1$s의 상태 (%2$s에서)"
 
-#: actions/oembed.php:95
+#. TRANS: Server error displayed in oEmbed action when attachment not found.
+#. TRANS: %d is an attachment ID.
 #, fuzzy, php-format
 msgid "Attachment %s not found."
 msgstr "받는 사용자가 없습니다."
 
-#: actions/oembed.php:136
+#. TRANS: Server error displayed in oEmbed request when a path is not supported.
+#. TRANS: %s is a path.
 #, php-format
 msgid "\"%s\" not supported for oembed requests."
 msgstr ""
 
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
-#: actions/oembed.php:168
 #, fuzzy, php-format
 msgid "Content type %s not supported."
 msgstr "연결"
 
 #. TRANS: Error message displaying attachments. %s is the site's base URL.
-#: actions/oembed.php:172
 #, php-format
 msgid "Only %s URLs over plain HTTP please."
 msgstr ""
 
+#. TRANS: Server error displayed in oEmbed action when request specifies an unsupported data format.
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1207
-#: lib/apiaction.php:1234 lib/apiaction.php:1369
 msgid "Not a supported data format."
 msgstr "지원하는 형식의 데이터가 아닙니다."
 
 #. TRANS: ShortName in the OpenSearch interface when trying to find users.
-#: actions/opensearch.php:64
 msgid "People Search"
 msgstr "사람 찾기"
 
-#: actions/opensearch.php:68
+#. TRANS: ShortName in the OpenSearch interface when trying to find notices.
 msgid "Notice Search"
 msgstr "통지 검색"
 
 #. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
-#: actions/otp.php:70
 #, fuzzy
 msgid "No user ID specified."
 msgstr "프로필을 지정하지 않았습니다."
 
 #. TRANS: Client error displayed trying to use "one time password login" without specifying a login token.
-#: actions/otp.php:86
 msgid "No login token specified."
 msgstr "허용되지 않는 요청입니다."
 
 #. TRANS: Client error displayed trying to use "one time password login" without requesting a login token.
-#: actions/otp.php:94
 msgid "No login token requested."
 msgstr "허용되지 않는 요청입니다."
 
 #. TRANS: Client error displayed trying to use "one time password login" while specifying an invalid login token.
-#: actions/otp.php:100
 msgid "Invalid login token specified."
 msgstr "허용되지 않는 요청입니다."
 
 #. TRANS: Client error displayed trying to use "one time password login" while specifying an expired login token.
-#: actions/otp.php:110
 #, fuzzy
 msgid "Login token expired."
 msgstr "사이트에 로그인하세요."
 
 #. TRANS: Title for outbox for any but the fist page.
 #. TRANS: %1$s is the user nickname, %2$d is the page number.
-#: actions/outbox.php:57
 #, php-format
 msgid "Outbox for %1$s - page %2$d"
 msgstr "%s 및 친구들, %d 페이지"
 
 #. TRANS: Title for first page of outbox.
-#: actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
 msgstr "%s의 보낸쪽지함"
 
 #. TRANS: Instructions for outbox.
-#: actions/outbox.php:103
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr "당신의 보낸 쪽지함입니다. 이곳엔 당신이 보냈던 비밀 쪽지가 있습니다."
 
-#: actions/passwordsettings.php:58
 msgid "Change password"
 msgstr "비밀번호 바꾸기"
 
-#: actions/passwordsettings.php:69
 msgid "Change your password."
 msgstr "비밀번호를 변경하세요."
 
 #. TRANS: Fieldset legend for password reset form.
-#: actions/passwordsettings.php:96 actions/recoverpassword.php:251
 msgid "Password change"
 msgstr "비밀번호 변경"
 
-#: actions/passwordsettings.php:104
 msgid "Old password"
 msgstr "기존 비밀 번호"
 
 #. TRANS: Field label for password reset form.
-#: actions/passwordsettings.php:108 actions/recoverpassword.php:256
 msgid "New password"
 msgstr "새로운 비밀 번호"
 
-#: actions/passwordsettings.php:109 actions/register.php:416
 #, fuzzy
 msgid "6 or more characters."
 msgstr "6글자 이상"
 
 #. TRANS: Ttile for field label for password reset form where the password has to be typed again.
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:264
-#: actions/register.php:420
 #, fuzzy
 msgid "Same as password above."
 msgstr "위와 같은 비밀 번호"
 
-#: actions/passwordsettings.php:117
 msgid "Change"
 msgstr "변경"
 
-#: actions/passwordsettings.php:153 actions/register.php:223
 msgid "Password must be 6 or more characters."
 msgstr "비밀번호는 6자리 이상이어야 합니다."
 
-#: actions/passwordsettings.php:156 actions/register.php:226
 msgid "Passwords don't match."
 msgstr "비밀 번호가 일치하지 않습니다."
 
-#: actions/passwordsettings.php:164
 msgid "Incorrect old password"
 msgstr "기존 비밀 번호가 틀렸습니다"
 
-#: actions/passwordsettings.php:180
 msgid "Error saving user; invalid."
 msgstr "사용자 저장 오류; 무효한 사용자"
 
 #. TRANS: Reset password form validation error message.
-#: actions/passwordsettings.php:185 actions/recoverpassword.php:418
 #, fuzzy
 msgid "Cannot save new password."
 msgstr "새 비밀번호를 저장 할 수 없습니다."
 
-#: actions/passwordsettings.php:191
 msgid "Password saved."
 msgstr "비밀 번호 저장"
 
 #. TRANS: Title for Paths admin panel.
 #. TRANS: Menu item for site administration
-#: actions/pathsadminpanel.php:58 lib/adminpanelaction.php:371
 msgid "Paths"
 msgstr "경로"
 
 #. TRANS: Form instructions for Path admin panel.
-#: actions/pathsadminpanel.php:69
 msgid "Path and server settings for this StatusNet site"
 msgstr ""
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the directory that could not be read from.
-#: actions/pathsadminpanel.php:155
 #, php-format
 msgid "Theme directory not readable: %s."
 msgstr "인스턴트 메신저를 사용할 수 없습니다."
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the avatar directory that could not be written to.
-#: actions/pathsadminpanel.php:163
 #, php-format
 msgid "Avatar directory not writable: %s."
 msgstr "아바타가 삭제되었습니다."
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the background directory that could not be written to.
-#: actions/pathsadminpanel.php:171
 #, fuzzy, php-format
 msgid "Background directory not writable: %s."
 msgstr "아바타 디렉토리에 쓸 수 없습니다 : %s"
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the locales directory that could not be read from.
-#: actions/pathsadminpanel.php:181
 #, fuzzy, php-format
 msgid "Locales directory not readable: %s."
 msgstr "이 페이지는 귀하가 승인한 미디어 타입에서는 이용할 수 없습니다."
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the SSL server URL that is too long.
-#: actions/pathsadminpanel.php:189
 msgid "Invalid SSL server. The maximum length is 255 characters."
 msgstr ""
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:235 actions/siteadminpanel.php:58
 msgid "Site"
 msgstr "사이트"
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:241 actions/pathsadminpanel.php:279
-#: actions/pathsadminpanel.php:370 actions/pathsadminpanel.php:425
 msgid "Server"
 msgstr "SSL 서버"
 
-#: actions/pathsadminpanel.php:242
 msgid "Site's server hostname."
 msgstr ""
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:248 actions/pathsadminpanel.php:288
-#: actions/pathsadminpanel.php:379 actions/pathsadminpanel.php:434
 msgid "Path"
 msgstr "경로"
 
-#: actions/pathsadminpanel.php:249
 #, fuzzy
 msgid "Site path."
 msgstr "사이트 테마"
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:255
 #, fuzzy
 msgid "Locale directory"
 msgstr "테마 디렉터리"
 
-#: actions/pathsadminpanel.php:256
 msgid "Directory path to locales."
 msgstr ""
 
 #. TRANS: Checkbox label in Paths admin panel.
-#: actions/pathsadminpanel.php:263
 msgid "Fancy URLs"
 msgstr ""
 
-#: actions/pathsadminpanel.php:265
 msgid "Use fancy (more readable and memorable) URLs?"
 msgstr ""
 
-#: actions/pathsadminpanel.php:272
 msgid "Theme"
 msgstr "테마"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:281
 #, fuzzy
 msgid "Server for themes."
 msgstr "사이트에 대한 테마"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:290
 msgid "Web path to themes."
 msgstr ""
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:297 actions/pathsadminpanel.php:388
-#: actions/pathsadminpanel.php:443 actions/pathsadminpanel.php:495
 msgid "SSL server"
 msgstr "SSL 서버"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:299
 msgid "SSL server for themes (default: SSL server)."
 msgstr ""
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:306 actions/pathsadminpanel.php:397
-#: actions/pathsadminpanel.php:452
 #, fuzzy
 msgid "SSL path"
 msgstr "사이트 테마"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:308
 msgid "SSL path to themes (default: /theme/)."
 msgstr ""
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:315 actions/pathsadminpanel.php:406
-#: actions/pathsadminpanel.php:461
 #, fuzzy
 msgid "Directory"
 msgstr "테마 디렉터리"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:317
 msgid "Directory where themes are located."
 msgstr ""
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:326
 msgid "Avatars"
 msgstr "아바타"
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:333
 msgid "Avatar server"
 msgstr "아바타가 삭제되었습니다."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:335
 #, fuzzy
 msgid "Server for avatars."
 msgstr "사이트에 대한 테마"
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:342
 msgid "Avatar path"
 msgstr "아바타 경로"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:344
 #, fuzzy
 msgid "Web path to avatars."
 msgstr "아바타 업데이트 실패"
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:351
 msgid "Avatar directory"
 msgstr "아바타가 삭제되었습니다."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:353
 msgid "Directory where avatars are located."
 msgstr ""
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:364
 msgid "Backgrounds"
 msgstr "배경"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:372
 #, fuzzy
 msgid "Server for backgrounds."
 msgstr "사이트에 대한 테마"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:381
 msgid "Web path to backgrounds."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:390
 msgid "Server for backgrounds on SSL pages."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:399
 msgid "Web path to backgrounds on SSL pages."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:408
 msgid "Directory where backgrounds are located."
 msgstr ""
 
 #. TRANS: Fieldset legens in Paths admin panel.
-#: actions/pathsadminpanel.php:419
 msgid "Attachments"
 msgstr "첨부파일"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:427
 #, fuzzy
 msgid "Server for attachments."
 msgstr "사이트에 대한 테마"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:436
 #, fuzzy
 msgid "Web path to attachments."
 msgstr "첨부문서 없음"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:445
 #, fuzzy
 msgid "Server for attachments on SSL pages."
 msgstr "사이트에 대한 테마"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:454
 msgid "Web path to attachments on SSL pages."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:463
 msgid "Directory where attachments are located."
 msgstr ""
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:472
 msgid "SSL"
 msgstr "SSL"
 
 #. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
-#: actions/pathsadminpanel.php:477 actions/snapshotadminpanel.php:202
 msgid "Never"
 msgstr "SSL 서버"
 
 #. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
-#: actions/pathsadminpanel.php:479
 msgid "Sometimes"
 msgstr "가끔"
 
 #. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
-#: actions/pathsadminpanel.php:481
 msgid "Always"
 msgstr "언제나"
 
-#: actions/pathsadminpanel.php:485
 msgid "Use SSL"
 msgstr "SSL 사용"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:487
 #, fuzzy
 msgid "When to use SSL."
 msgstr "언제 SSL 사용"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:497
 msgid "Server to direct SSL requests to."
 msgstr ""
 
 #. TRANS: Button title text to store form data in the Paths admin panel.
-#: actions/pathsadminpanel.php:514
 msgid "Save paths"
 msgstr "사이트 테마"
 
 #. TRANS: Instructions for the "People search" page.
 #. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/peoplesearch.php:54
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
@@ -4467,57 +3680,46 @@ msgstr ""
 "구분하고, 적어도 3글자 이상 필요합니다."
 
 #. TRANS: Title of a page where users can search for other users.
-#: actions/peoplesearch.php:61
 msgid "People search"
 msgstr "사람 찾기"
 
-#: actions/peopletag.php:68
 #, php-format
 msgid "Not a valid people tag: %s."
 msgstr "올바른 메일 주소가 아닙니다."
 
-#: actions/peopletag.php:142
 #, php-format
 msgid "Users self-tagged with %1$s - page %2$d"
 msgstr "%s 태그된 통지"
 
 #. TRANS: Page title for AJAX form return when a disabling a plugin.
-#: actions/plugindisable.php:69
 msgctxt "plugin"
 msgid "Disabled"
 msgstr ""
 
 #. TRANS: Client error displayed trying to perform any request method other than POST.
 #. TRANS: Do not translate POST.
-#: actions/pluginenable.php:78 actions/subscribe.php:77
 msgid "This action only accepts POST requests."
 msgstr ""
 
-#: actions/pluginenable.php:102
 #, fuzzy
 msgid "You cannot administer plugins."
 msgstr "이용자를 업데이트 할 수 없습니다."
 
-#: actions/pluginenable.php:109
 #, fuzzy
 msgid "No such plugin."
 msgstr "해당하는 페이지 없음"
 
 #. TRANS: Page title for AJAX form return when enabling a plugin.
-#: actions/pluginenable.php:159
 msgctxt "plugin"
 msgid "Enabled"
 msgstr ""
 
 #. TRANS: Tab and title for plugins admin panel.
 #. TRANS: Menu item for site administration
-#: actions/pluginsadminpanel.php:56 actions/version.php:191
-#: lib/adminpanelaction.php:411
 msgid "Plugins"
 msgstr "플러그인"
 
 #. TRANS: Instructions at top of plugin admin page.
-#: actions/pluginsadminpanel.php:68
 msgid ""
 "Additional plugins can be enabled and configured manually. See the <a href="
 "\"http://status.net/wiki/Plugins\">online plugin documentation</a> for more "
@@ -4525,32 +3727,26 @@ msgid ""
 msgstr ""
 
 #. TRANS: Admin form section header
-#: actions/pluginsadminpanel.php:84
 #, fuzzy
 msgid "Default plugins"
 msgstr "기본 언어"
 
-#: actions/pluginsadminpanel.php:106
 msgid ""
 "All default plugins have been disabled from the site's configuration file."
 msgstr ""
 
-#: actions/postnotice.php:95
 msgid "Invalid notice content."
 msgstr "옳지 않은 크기"
 
-#: actions/postnotice.php:101
 #, php-format
 msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’."
 msgstr ""
 
 #. TRANS: Page title for profile settings.
-#: actions/profilesettings.php:60
 msgid "Profile settings"
 msgstr "프로필 설정"
 
 #. TRANS: Usage instructions for profile settings.
-#: actions/profilesettings.php:71
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
@@ -4558,31 +3754,24 @@ msgstr ""
 "트 할 수 있습니다. "
 
 #. TRANS: Profile settings form legend.
-#: actions/profilesettings.php:99
 msgid "Profile information"
 msgstr "프로필 정보"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:110 actions/register.php:412
 #, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr "1-64자 사이에 영소문자, 숫자로만 씁니다. 기호나 공백을 쓰면 안 됩니다."
 
 #. TRANS: Field label in form for profile settings.
-#: actions/profilesettings.php:114 actions/register.php:434
-#: lib/groupeditform.php:150
 msgid "Full name"
 msgstr "실명"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:119 actions/register.php:439
-#: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "홈페이지"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:122 actions/register.php:441
 #, fuzzy
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr "귀하의 홈페이지, 블로그 혹은 다른 사이트의 프로필 페이지 URL"
@@ -4590,48 +3779,37 @@ msgstr "귀하의 홈페이지, 블로그 혹은 다른 사이트의 프로필 
 #. TRANS: Tooltip for field label in form for profile settings. Plural
 #. TRANS: is decided by the number of characters available for the
 #. TRANS: biography (%d).
-#: actions/profilesettings.php:130 actions/register.php:450
 #, fuzzy, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
 msgstr[0] "%d자 이내에서 자기 소개 및 자기 관심사"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:136 actions/register.php:455
 msgid "Describe yourself and your interests"
 msgstr "자기 소개 및 자기 관심사"
 
 #. TRANS: Text area label in form for profile settings where users can provide.
 #. TRANS: their biography.
-#: actions/profilesettings.php:140 actions/register.php:457
 msgid "Bio"
 msgstr "자기소개"
 
 #. TRANS: Field label in form for profile settings.
-#: actions/profilesettings.php:146 actions/register.php:462
-#: lib/groupeditform.php:173
 msgid "Location"
 msgstr "위치"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:149
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "당신은 어디에 삽니까? \"시, 도 (or 군,구), 나라\""
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:154
 msgid "Share my current location when posting notices"
 msgstr ""
 
 #. TRANS: Field label in form for profile settings.
-#: actions/profilesettings.php:162 actions/tagother.php:128
-#: actions/tagother.php:188 lib/subscriptionlist.php:104
-#: lib/subscriptionlist.php:106
 msgid "Tags"
 msgstr "태그"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:165
 #, fuzzy
 msgid ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- "
@@ -4639,28 +3817,23 @@ msgid ""
 msgstr "당신을 위한 태그, (문자,숫자,-, ., _로 구성) 콤마 혹은 공백으로 구분."
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:170
 msgid "Language"
 msgstr "언어"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:172
 #, fuzzy
 msgid "Preferred language."
 msgstr "언어 설정"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:182
 msgid "Timezone"
 msgstr "시간대"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:184
 msgid "What timezone are you normally in?"
 msgstr "주로 생활하는 곳이 어느 시간대입니까?"
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:190
 #, fuzzy
 msgid ""
 "Automatically subscribe to whoever subscribes to me (best for non-humans)."
@@ -4669,93 +3842,76 @@ msgstr "나에게 구독하는 사람에게 자동 구독 신청"
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Plural form is used based on the maximum number of allowed
 #. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:259 actions/register.php:214
 #, fuzzy, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
 msgstr[0] "설명이 너무 깁니다. (최대 %d 글자)"
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:270 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr "타임존이 설정 되지 않았습니다."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:278
 #, fuzzy
 msgid "Language is too long (maximum 50 characters)."
 msgstr "언어가 너무 깁니다. (최대 50글자)"
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:292
 #, fuzzy, php-format
 msgid "Invalid tag: \"%s\"."
 msgstr "올바르지 않은 태그: \"%s\""
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:348
 #, fuzzy
 msgid "Could not update user for autosubscribe."
 msgstr "자동구독에 사용자를 업데이트 할 수 없습니다."
 
 #. TRANS: Server error thrown when user profile location preference settings could not be updated.
-#: actions/profilesettings.php:406
 #, fuzzy
 msgid "Could not save location prefs."
 msgstr "태그를 저장할 수 없습니다."
 
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:428 actions/tagother.php:179
 msgid "Could not save tags."
 msgstr "태그를 저장할 수 없습니다."
 
 #. TRANS: Confirmation shown when user profile settings are saved.
 #. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:437 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "설정 저장"
 
 #. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
 #. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:484 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "새 계정 만들기"
 
-#: actions/public.php:83
 #, php-format
 msgid "Beyond the page limit (%s)."
 msgstr ""
 
-#: actions/public.php:92
 msgid "Could not retrieve public stream."
 msgstr "공개 stream을 불러올 수 없습니다."
 
-#: actions/public.php:130
 #, php-format
 msgid "Public timeline, page %d"
 msgstr "공개 타임라인, %d 페이지"
 
-#: actions/public.php:132 lib/publicgroupnav.php:79
 msgid "Public timeline"
 msgstr "퍼블릭 타임라인"
 
-#: actions/public.php:160
 msgid "Public Stream Feed (RSS 1.0)"
 msgstr "%s 그룹을 위한 공지피드 (RSS 1.0)"
 
-#: actions/public.php:164
 msgid "Public Stream Feed (RSS 2.0)"
 msgstr "%s 그룹을 위한 공지피드 (RSS 2.0)"
 
-#: actions/public.php:168
 #, fuzzy
 msgid "Public Stream Feed (Atom)"
 msgstr "퍼블릭 스트림 피드"
 
-#: actions/public.php:188
 #, php-format
 msgid ""
 "This is the public timeline for %%site.name%% but no one has posted anything "
@@ -4763,18 +3919,15 @@ msgid ""
 msgstr ""
 "%%site.name%% 의 공개 타임라인이지만, 아직 아무도 글을 쓰지 않았습니다."
 
-#: actions/public.php:191
 #, fuzzy
 msgid "Be the first to post!"
 msgstr "글을 올린 첫번째 사람이 되세요!"
 
-#: actions/public.php:195
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post!"
 msgstr ""
 
-#: actions/public.php:242
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -4783,7 +3936,6 @@ msgid ""
 "friends, family, and colleagues! ([Read more](%%doc.help%%))"
 msgstr ""
 
-#: actions/public.php:247
 #, fuzzy, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -4794,19 +3946,16 @@ msgstr ""
 "서비스 입니다."
 
 #. TRANS: Public RSS feed description. %s is the StatusNet site name.
-#: actions/publicrss.php:106
 #, fuzzy, php-format
 msgid "%s updates from everyone."
 msgstr "모두로부터의 업데이트 %s개!"
 
 #. TRANS: Title for public tag cloud.
-#: actions/publictagcloud.php:57
 msgid "Public tag cloud"
 msgstr "공개 태그 클라우드"
 
 #. TRANS: Instructions (more used like an explanation/header).
 #. TRANS: %s is the StatusNet sitename.
-#: actions/publictagcloud.php:65
 #, fuzzy, php-format
 msgid "These are most popular recent tags on %s"
 msgstr "다음은 %에서 가장 인기 있는 최근 태그입니다."
@@ -4814,14 +3963,12 @@ msgstr "다음은 %에서 가장 인기 있는 최근 태그입니다."
 #. TRANS: This message contains a Markdown URL. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.
-#: actions/publictagcloud.php:74
 #, php-format
 msgid "No one has posted a notice with a [hashtag](%%doc.tags%%) yet."
 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.
-#: actions/publictagcloud.php:79
 msgid "Be the first to post one!"
 msgstr "글을 올린 첫번째 사람이 되세요!"
 
@@ -4830,7 +3977,6 @@ msgstr "글을 올린 첫번째 사람이 되세요!"
 #. TRANS: This message contains a Markdown URL. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.
-#: actions/publictagcloud.php:87
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post "
@@ -4838,275 +3984,222 @@ msgid ""
 msgstr ""
 
 #. TRANS: Client error displayed trying to recover password while already logged in.
-#: actions/recoverpassword.php:37
 msgid "You are already logged in!"
 msgstr "당신은 이미 로그인되어 있습니다."
 
 #. TRANS: Client error displayed when password recovery code is not correct.
-#: actions/recoverpassword.php:64
 msgid "No such recovery code."
 msgstr "그러한 복구 코드는 없습니다."
 
 #. TRANS: Client error displayed when no proper password recovery code was submitted.
-#: actions/recoverpassword.php:69
 msgid "Not a recovery code."
 msgstr "복구 코드가 아닙니다."
 
 #. TRANS: Server error displayed trying to recover password without providing a user.
-#: actions/recoverpassword.php:77
 msgid "Recovery code for unknown user."
 msgstr "알 수 없는 취소를 위한 리커버리 코드"
 
 #. TRANS: Server error displayed removing a password recovery code from the database.
-#: actions/recoverpassword.php:91
 msgid "Error with confirmation code."
 msgstr "확인 코드 오류"
 
 #. TRANS: Client error displayed trying to recover password with too old a recovery code.
-#: actions/recoverpassword.php:103
 msgid "This confirmation code is too old. Please start again."
 msgstr "이 인증 코드는 오래됐습니다. 다시 발급 받아 주십시오."
 
 #. TRANS: Server error displayed when updating a user's e-mail address in the database fails while recovering a password.
-#: actions/recoverpassword.php:118
 msgid "Could not update user with confirmed email address."
 msgstr "이 이메일 주소로 사용자를 업데이트 할 수 없습니다."
 
 #. TRANS: Page notice for password recovery page.
-#: actions/recoverpassword.php:160
 #, fuzzy
 msgid ""
 "If you have forgotten or lost your password, you can get a new one sent to "
 "the email address you have stored in your account."
 msgstr "가입하신 이메일로 비밀 번호 재발급에 관한 안내를 보냈습니다."
 
-#: actions/recoverpassword.php:167
 msgid "You have been identified. Enter a new password below."
 msgstr ""
 
 #. TRANS: Fieldset legend for password recovery page.
-#: actions/recoverpassword.php:198
 msgid "Password recovery"
 msgstr "비밀 번호 복구"
 
 #. TRANS: Field label on password recovery page.
-#: actions/recoverpassword.php:202
 #, fuzzy
 msgid "Nickname or email address"
 msgstr "별명이나 이메일 계정을 입력하십시오."
 
 #. TRANS: Title for field label on password recovery page.
-#: actions/recoverpassword.php:205
 msgid "Your nickname on this server, or your registered email address."
 msgstr "이 서버에서 당신의 닉네임 혹은 당신의 등록된 이메일주소"
 
 #. TRANS: Field label on password recovery page.
-#: actions/recoverpassword.php:212
 msgid "Recover"
 msgstr "복구"
 
 #. TRANS: Button text on password recovery page.
-#: actions/recoverpassword.php:214
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Recover"
 msgstr "복구"
 
 #. TRANS: Title for password recovery page in password reset mode.
-#: actions/recoverpassword.php:223
 msgid "Reset password"
 msgstr "비밀 번호 초기화"
 
 #. TRANS: Title for password recovery page in password recover mode.
-#: actions/recoverpassword.php:225
 msgid "Recover password"
 msgstr "비밀 번호 복구"
 
 #. TRANS: Title for password recovery page in email sent mode.
 #. TRANS: Subject for password recovery e-mail.
-#: actions/recoverpassword.php:227 actions/recoverpassword.php:366
 msgid "Password recovery requested"
 msgstr "비밀 번호 복구가 요청되었습니다."
 
 #. TRANS: Title for password recovery page in password saved mode.
-#: actions/recoverpassword.php:229
 #, fuzzy
 msgid "Password saved"
 msgstr "비밀 번호 저장"
 
 #. TRANS: Title for password recovery page when an unknown action has been specified.
-#: actions/recoverpassword.php:232
 msgid "Unknown action"
 msgstr "알려지지 않은 행동"
 
 #. TRANS: Title for field label for password reset form.
-#: actions/recoverpassword.php:258
 #, fuzzy
 msgid "6 or more characters, and do not forget it!"
 msgstr "6글자 이상, 잊어 버리지 마십시오!"
 
 #. TRANS: Button text for password reset form.
 #. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: actions/recoverpassword.php:268 lib/designform.php:145
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Reset"
 msgstr "초기화"
 
 #. TRANS: Form instructions for password recovery form.
-#: actions/recoverpassword.php:278
 msgid "Enter a nickname or email address."
 msgstr "별명이나 이메일 계정을 입력하십시오."
 
 #. TRANS: Information on password recovery form if no known username or e-mail address was specified.
-#: actions/recoverpassword.php:309
 msgid "No user with that email address or username."
 msgstr "그러한 이메일 주소나 계정을 가진 사용자는 없습니다."
 
 #. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
-#: actions/recoverpassword.php:327
 msgid "No registered email address for that user."
 msgstr "그 사용자는 등록된 메일주소가 없습니다."
 
 #. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
-#: actions/recoverpassword.php:342
 msgid "Error saving address confirmation."
 msgstr "주소 확인 저장 에러"
 
 #. TRANS: User notification after an e-mail with instructions was sent from the password recovery form.
-#: actions/recoverpassword.php:370
 msgid ""
 "Instructions for recovering your password have been sent to the email "
 "address registered to your account."
 msgstr "가입하신 이메일로 비밀 번호 재발급에 관한 안내를 보냈습니다."
 
 #. TRANS: Client error displayed when trying to reset as password without providing a user.
-#: actions/recoverpassword.php:391
 msgid "Unexpected password reset."
 msgstr "잘못된 비밀 번호 지정"
 
 #. TRANS: Reset password form validation error message.
-#: actions/recoverpassword.php:400
 #, fuzzy
 msgid "Password must be 6 characters or more."
 msgstr "비밀 번호는 6자 이상이어야 합니다."
 
 #. TRANS: Reset password form validation error message.
-#: actions/recoverpassword.php:405
 msgid "Password and confirmation do not match."
 msgstr "비밀 번호가 일치하지 않습니다."
 
 #. TRANS: Server error displayed when something does wrong with the user object during password reset.
-#: actions/recoverpassword.php:426 actions/register.php:241
 msgid "Error setting user."
 msgstr "사용자 세팅 오류"
 
 #. TRANS: Success message for user after password reset.
-#: actions/recoverpassword.php:434
 msgid "New password successfully saved. You are now logged in."
 msgstr ""
 "새로운 비밀 번호를 성공적으로 저장했습니다. 귀하는 이제 로그인 되었습니다."
 
-#: actions/redirecturl.php:70
 #, fuzzy
 msgid "No id parameter"
 msgstr "첨부문서 없음"
 
-#: actions/redirecturl.php:76
 #, fuzzy, php-format
 msgid "No such file \"%d\""
 msgstr "해당하는 파일이 없습니다."
 
-#: actions/register.php:80 actions/register.php:181 actions/register.php:392
 msgid "Sorry, only invited people can register."
 msgstr "죄송합니다. 단지 초대된 사람들만 등록할 수 있습니다."
 
-#: actions/register.php:87
 #, fuzzy
 msgid "Sorry, invalid invitation code."
 msgstr "확인 코드 오류"
 
-#: actions/register.php:106
 msgid "Registration successful"
 msgstr "회원 가입이 성공적입니다."
 
-#: actions/register.php:108 actions/register.php:490
 msgid "Register"
 msgstr "등록"
 
-#: actions/register.php:128
 msgid "Registration not allowed."
 msgstr "가입이 허용되지 않습니다."
 
-#: actions/register.php:194
 #, fuzzy
 msgid "You cannot register if you don't agree to the license."
 msgstr "라이선스에 동의하지 않는다면 등록할 수 없습니다."
 
-#: actions/register.php:203
 msgid "Email address already exists."
 msgstr "이메일 주소가 이미 존재 합니다."
 
-#: actions/register.php:236 actions/register.php:258
 msgid "Invalid username or password."
 msgstr "사용자 이름이나 비밀 번호가 틀렸습니다."
 
-#: actions/register.php:333
 msgid ""
 "With this form you can create a new account. You can then post notices and "
 "link up to friends and colleagues."
 msgstr ""
 
-#: actions/register.php:424 actions/register.php:428
-#: actions/siteadminpanel.php:238 lib/settingsnav.php:92
 msgid "Email"
 msgstr "메일"
 
-#: actions/register.php:425 actions/register.php:429
 #, fuzzy
 msgid "Used only for updates, announcements, and password recovery."
 msgstr "업데이트나 공지, 비밀번호 찾기에 사용하세요."
 
-#: actions/register.php:436
 #, fuzzy
 msgid "Longer name, preferably your \"real\" name."
 msgstr "더욱 긴 이름을 요구합니다."
 
-#: actions/register.php:464
 #, fuzzy
 msgid "Where you are, like \"City, State (or Region), Country\"."
 msgstr "당신은 어디에 삽니까? \"시, 도 (or 군,구), 나라\""
 
-#: actions/register.php:503
 #, fuzzy, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
 msgstr "%1$s의 컨텐츠와 데이터는 외부 유출을 금지합니다."
 
-#: actions/register.php:513
 #, php-format
 msgid "My text and files are copyright by %1$s."
 msgstr "글과 파일의 저작권은 %1$s의 소유입니다"
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:517
 msgid "My text and files remain under my own copyright."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:520
 msgid "All rights reserved."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:525
 #, fuzzy, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
 "email address, IM address, and phone number."
 msgstr "다음 개인정보 제외: 비밀 번호, 메일 주소, 메신저 주소, 전화 번호"
 
-#: actions/register.php:566
 #, fuzzy, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -5139,7 +4232,6 @@ msgstr ""
 "\n"
 "다시 한번 가입하신 것을 환영하면서 즐거운 서비스가 되셨으면 합니다."
 
-#: actions/register.php:590
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5147,7 +4239,6 @@ msgstr ""
 "(지금 귀하는 귀하의 이메일 주소를 확인하는 방법에 대한 지침을 메일로 받으셨습"
 "니다.)"
 
-#: actions/remotesubscribe.php:97
 #, php-format
 msgid ""
 "To subscribe, you can [login](%%action.login%%), or [register](%%action."
@@ -5158,127 +4249,100 @@ msgstr ""
 "register%%)하십시오. 이미 계정이 [호환되는 마이크로블로깅 사이트]((%%doc."
 "openmublog%%)에 계정이 있으면, 아래에 프로파일 URL을 입력하십시오."
 
-#: actions/remotesubscribe.php:111
 msgid "Remote subscribe"
 msgstr "리모트 구독 예약"
 
-#: actions/remotesubscribe.php:123
 msgid "Subscribe to a remote user"
 msgstr "원격 사용자에 구독"
 
-#: actions/remotesubscribe.php:128
 msgid "User nickname"
 msgstr "이용자 닉네임"
 
-#: actions/remotesubscribe.php:129
 #, fuzzy
 msgid "Nickname of the user you want to follow."
 msgstr "따라가고 싶은 사용자의 별명"
 
-#: actions/remotesubscribe.php:132
 msgid "Profile URL"
 msgstr "프로필 URL"
 
-#: actions/remotesubscribe.php:133
 #, fuzzy
 msgid "URL of your profile on another compatible microblogging service."
 msgstr "다른 마이크로블로깅 서비스의 귀하의 프로필 URL"
 
 #. TRANS: Link text for link that will subscribe to a remote profile.
-#: actions/remotesubscribe.php:136 lib/subscribeform.php:139
-#: lib/userprofile.php:402
 msgid "Subscribe"
 msgstr "구독"
 
-#: actions/remotesubscribe.php:158
 #, fuzzy
 msgid "Invalid profile URL (bad format)."
 msgstr "옳지 않은 프로필 URL (나쁜 포멧)"
 
-#: actions/remotesubscribe.php:167
 #, fuzzy
 msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
 msgstr "유효한 프로필 URL이 아닙니다. (YADIS 문서가 없습니다)"
 
-#: actions/remotesubscribe.php:175
 #, fuzzy
 msgid "That is a local profile! Login to subscribe."
 msgstr "그것은 로컬프로필입니다. 구독을 위해서는 로그인하십시오."
 
-#: actions/remotesubscribe.php:182
 #, fuzzy
 msgid "Could not get a request token."
 msgstr "리퀘스트 토큰을 취득 할 수 없습니다."
 
-#: actions/repeat.php:56
 #, fuzzy
 msgid "Only logged-in users can repeat notices."
 msgstr "오직 해당 사용자만 자신의 메일박스를 열람할 수 있습니다."
 
-#: actions/repeat.php:63 actions/repeat.php:70
 #, fuzzy
 msgid "No notice specified."
 msgstr "프로필을 지정하지 않았습니다."
 
-#: actions/repeat.php:75
 #, fuzzy
 msgid "You cannot repeat your own notice."
 msgstr "자신의 글은 재전송할 수 없습니다."
 
-#: actions/repeat.php:89
 msgid "You already repeated that notice."
 msgstr "이미 재전송된 소식입니다."
 
-#: actions/repeat.php:112 lib/noticelist.php:697
 msgid "Repeated"
 msgstr "재전송됨"
 
-#: actions/repeat.php:117
 msgid "Repeated!"
 msgstr "재전송됨!"
 
 #. TRANS: RSS reply feed title. %s is a user nickname.
-#: actions/replies.php:126 actions/repliesrss.php:68
-#: lib/personalgroupnav.php:105
 #, php-format
 msgid "Replies to %s"
 msgstr "%s에 답신"
 
-#: actions/replies.php:128
 #, php-format
 msgid "Replies to %1$s, page %2$d"
 msgstr "%s에 답신"
 
-#: actions/replies.php:145
 #, php-format
 msgid "Replies feed for %s (RSS 1.0)"
 msgstr "%s 그룹을 위한 공지피드 (RSS 1.0)"
 
-#: actions/replies.php:152
 #, php-format
 msgid "Replies feed for %s (RSS 2.0)"
 msgstr "%s 그룹을 위한 공지피드 (RSS 2.0)"
 
-#: actions/replies.php:159
 #, php-format
 msgid "Replies feed for %s (Atom)"
 msgstr "%s의 통지 피드"
 
-#: actions/replies.php:199
 #, fuzzy, php-format
 msgid ""
 "This is the timeline showing replies to %1$s but %2$s hasn't received a "
 "notice to them yet."
 msgstr "%s 및 친구들의 타임라인이지만, 아직 아무도 글을 작성하지 않았습니다."
 
-#: actions/replies.php:204
 #, php-format
 msgid ""
 "You can engage other users in a conversation, subscribe to more people or "
 "[join groups](%%action.groups%%)."
 msgstr ""
 
-#: actions/replies.php:206
 #, php-format
 msgid ""
 "You can try to [nudge %1$s](../%2$s) or [post something to them](%%%%action."
@@ -5287,225 +4351,184 @@ msgstr ""
 
 #. TRANS: RSS reply feed description.
 #. TRANS: %1$s is a user nickname, %2$s is the StatusNet site name.
-#: actions/repliesrss.php:74
 #, fuzzy, php-format
 msgid "Replies to %1$s on %2$s."
 msgstr "%s에 답신"
 
 #. TRANS: Client exception displayed when trying to restore an account while not logged in.
-#: actions/restoreaccount.php:78
 #, fuzzy
 msgid "Only logged-in users can restore their account."
 msgstr "오직 해당 사용자만 자신의 메일박스를 열람할 수 있습니다."
 
 #. TRANS: Client exception displayed when trying to restore an account without having restore rights.
-#: actions/restoreaccount.php:83
 #, fuzzy
 msgid "You may not restore your account."
 msgstr "응용 프로그램 수정을 위해서는 로그인해야 합니다."
 
 #. TRANS: Client exception displayed trying to restore an account while something went wrong uploading a file.
 #. TRANS: Client exception. No file; probably just a non-AJAX submission.
-#: actions/restoreaccount.php:121 actions/restoreaccount.php:146
 #, fuzzy
 msgid "No uploaded file."
 msgstr "실행 실패"
 
 #. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
-#: actions/restoreaccount.php:129 lib/mediafile.php:194
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
 msgstr ""
 "업로드 파일이 php.ini 설정 파일의 upload_max_filesize 값을 넘어갔습니다."
 
 #. TRANS: Client exception.
-#: actions/restoreaccount.php:135 lib/mediafile.php:200
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form."
 msgstr "업로드 파일이 HTML 폼에서 지정한 MAX_FILE_SIZE 값을 넘어갔습니다."
 
 #. TRANS: Client exception.
-#: actions/restoreaccount.php:141 lib/mediafile.php:206
 msgid "The uploaded file was only partially uploaded."
 msgstr "업로드 파일이 일부만 업로드되었습니다."
 
 #. TRANS: Client exception thrown when a temporary folder is not present to store a file upload.
-#: actions/restoreaccount.php:150 lib/mediafile.php:214
 msgid "Missing a temporary folder."
 msgstr "임시 폴더가 없습니다"
 
 #. TRANS: Client exception thrown when writing to disk is not possible during a file upload operation.
-#: actions/restoreaccount.php:154 lib/mediafile.php:218
 msgid "Failed to write file to disk."
 msgstr "디스크에 파일을 쓰는 데 실패했습니다."
 
 #. TRANS: Client exception thrown when a file upload operation has been stopped by an extension.
-#: actions/restoreaccount.php:158 lib/mediafile.php:222
 msgid "File upload stopped by extension."
 msgstr ""
 
 #. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
 #. TRANS: Exception thrown when uploading an image fails for an unknown reason.
 #. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
-#: actions/restoreaccount.php:164 lib/imagefile.php:106 lib/mediafile.php:228
 msgid "System error uploading file."
 msgstr "파일을 올리는데 시스템 오류 발생"
 
 #. TRANS: Client exception thrown when a feed is not an Atom feed.
-#: actions/restoreaccount.php:207
 #, fuzzy
 msgid "Not an Atom feed."
 msgstr "모든 회원"
 
 #. TRANS: Success message when a feed has been restored.
-#: actions/restoreaccount.php:241
 msgid ""
 "Feed has been restored. Your old posts should now appear in search and your "
 "profile page."
 msgstr ""
 
 #. TRANS: Message when a feed restore is in progress.
-#: actions/restoreaccount.php:245
 msgid "Feed will be restored. Please wait a few minutes for results."
 msgstr ""
 
 #. TRANS: Form instructions for feed restore.
-#: actions/restoreaccount.php:342
 msgid ""
 "You can upload a backed-up stream in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format."
 msgstr ""
 
 #. TRANS: Title for submit button to confirm upload of a user backup file for account restore.
-#: actions/restoreaccount.php:373
 #, fuzzy
 msgid "Upload the file"
 msgstr "실행 실패"
 
-#: actions/revokerole.php:75
 msgid "You cannot revoke user roles on this site."
 msgstr "이 사이트의 이용자에 대해 권한정지 할 수 없습니다."
 
-#: actions/revokerole.php:82
 msgid "User doesn't have this role."
 msgstr "이용자가 프로필을 가지고 있지 않습니다."
 
-#: actions/rsd.php:142 actions/version.php:159
 msgid "StatusNet"
 msgstr "StatusNet %s"
 
-#: actions/sandbox.php:65 actions/unsandbox.php:65
 msgid "You cannot sandbox users on this site."
 msgstr "이 사이트의 이용자에 대해 권한정지 할 수 없습니다."
 
-#: actions/sandbox.php:72
 msgid "User is already sandboxed."
 msgstr "이용자의 지속적인 게시글이 없습니다."
 
 #. TRANS: Menu item for site administration
-#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
-#: lib/adminpanelaction.php:379
 msgid "Sessions"
 msgstr "세션"
 
-#: actions/sessionsadminpanel.php:65
 msgid "Session settings for this StatusNet site"
 msgstr ""
 
-#: actions/sessionsadminpanel.php:175
 msgid "Handle sessions"
 msgstr ""
 
-#: actions/sessionsadminpanel.php:177
 msgid "Whether to handle sessions ourselves."
 msgstr ""
 
-#: actions/sessionsadminpanel.php:181
 msgid "Session debugging"
 msgstr "세션 디버깅"
 
-#: actions/sessionsadminpanel.php:183
 msgid "Turn on debugging output for sessions."
 msgstr ""
 
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
+#. TRANS: Submit button title.
+msgid "Save"
+msgstr "저장"
+
 msgid "Save site settings"
 msgstr "접근 설정을 저장"
 
-#: actions/showapplication.php:78
 msgid "You must be logged in to view an application."
 msgstr "응용 프로그램 수정을 위해서는 로그인해야 합니다."
 
-#: actions/showapplication.php:151
 msgid "Application profile"
 msgstr "신규 응용 프로그램"
 
-#: actions/showapplication.php:179
 #, php-format
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr ""
 
-#: actions/showapplication.php:189
 msgid "Application actions"
 msgstr "인증 코드가 없습니다."
 
-#: actions/showapplication.php:212
 msgid "Reset key & secret"
 msgstr ""
 
 #. TRANS: Title of form for deleting a user.
-#: actions/showapplication.php:228 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:64 lib/noticelist.php:678
 msgid "Delete"
 msgstr "삭제"
 
-#: actions/showapplication.php:237
 msgid "Application info"
 msgstr "인증 코드가 없습니다."
 
-#: actions/showapplication.php:255
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
 msgstr ""
 
-#: actions/showapplication.php:275
 #, fuzzy
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr "정말로 통지를 삭제하시겠습니까?"
 
 #. TRANS: Title for all but the first page of favourite notices of a user.
 #. TRANS: %1$s is the user for whom the favourite notices are displayed, %2$d is the page number.
-#: actions/showfavorites.php:80
 #, php-format
 msgid "%1$s's favorite notices, page %2$d"
 msgstr "%s 님의 좋아하는 글"
 
 #. TRANS: Server error displayed when favourite notices could not be retrieved from the database.
-#: actions/showfavorites.php:134
 msgid "Could not retrieve favorite notices."
 msgstr "좋아하는 게시글을 복구할 수 없습니다."
 
 #. TRANS: Feed link text. %s is a username.
-#: actions/showfavorites.php:172
 #, php-format
 msgid "Feed for favorites of %s (RSS 1.0)"
 msgstr "%s의 좋아하는 글 피드 (RSS 1.0)"
 
 #. TRANS: Feed link text. %s is a username.
-#: actions/showfavorites.php:180
 #, php-format
 msgid "Feed for favorites of %s (RSS 2.0)"
 msgstr "%s의 좋아하는 글 피드 (RSS 2.0)"
 
 #. TRANS: Feed link text. %s is a username.
-#: actions/showfavorites.php:188
 #, php-format
 msgid "Feed for favorites of %s (Atom)"
 msgstr "%s의 좋아하는 글 피드 (Atom)"
 
 #. TRANS: Text displayed instead of favourite notices for the current logged in user that has no favourites.
-#: actions/showfavorites.php:209
 msgid ""
 "You haven't chosen any favorite notices yet. Click the fave button on "
 "notices you like to bookmark them for later or shed a spotlight on them."
@@ -5513,7 +4536,6 @@ msgstr ""
 
 #. TRANS: Text displayed instead of favourite notices for a user that has no favourites while logged in.
 #. TRANS: %s is a username.
-#: actions/showfavorites.php:213
 #, php-format
 msgid ""
 "%s hasn't added any favorite notices yet. Post something interesting they "
@@ -5523,7 +4545,6 @@ msgstr ""
 #. TRANS: Text displayed instead of favourite notices for a user that has no favourites while not logged in.
 #. TRANS: %s is a username, %%%%action.register%%%% is a link to the user registration page.
 #. TRANS: (link text)[link] is a Mark Down link.
-#: actions/showfavorites.php:220
 #, php-format
 msgid ""
 "%s hasn't added any favorite notices yet. Why not [register an account](%%%%"
@@ -5532,64 +4553,53 @@ msgid ""
 msgstr ""
 
 #. TRANS: Page notice for show favourites page.
-#: actions/showfavorites.php:251
 msgid "This is a way to share what you like."
 msgstr "좋아하는 글을 지정하면 자기가 무엇을 좋아하는지 알릴 수 있습니다."
 
 #. TRANS: Page title for first group page. %s is a group name.
-#: actions/showgroup.php:75
 #, php-format
 msgid "%s group"
 msgstr "%s 그룹"
 
 #. TRANS: Page title for any but first group page.
 #. TRANS: %1$s is a group name, $2$s is a page number.
-#: actions/showgroup.php:79
 #, php-format
 msgid "%1$s group, page %2$d"
 msgstr "그룹, %d페이지"
 
 #. TRANS: Label for group description or group note (dt). Text hidden by default.
-#: actions/showgroup.php:266
 msgid "Note"
 msgstr "설명"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:277 lib/groupeditform.php:180
 msgid "Aliases"
 msgstr ""
 
 #. TRANS: Group actions header (h2). Text hidden by default.
-#: actions/showgroup.php:294
 msgid "Group actions"
 msgstr "그룹 행동"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:338
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
 msgstr "%s 그룹을 위한 공지피드 (RSS 1.0)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:345
 #, php-format
 msgid "Notice feed for %s group (RSS 2.0)"
 msgstr "%s 그룹을 위한 공지피드 (RSS 2.0)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:352
 #, php-format
 msgid "Notice feed for %s group (Atom)"
 msgstr "%s 그룹을 위한 공지피드 (Atom)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:358
 #, php-format
 msgid "FOAF for %s group"
 msgstr "%s의 보낸쪽지함"
 
 #. TRANS: Header for mini list of group members on a group page (h2).
-#: actions/showgroup.php:395
 msgid "Members"
 msgstr "회원"
 
@@ -5597,31 +4607,24 @@ msgstr "회원"
 #. TRANS: Text for user subscription statistics if the user has no subscriptions.
 #. TRANS: Text for user subscriber statistics if user has no subscribers.
 #. TRANS: Text for user user group membership statistics if user is not a member of any group.
-#: actions/showgroup.php:401 lib/profileaction.php:137
-#: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
-#: lib/subscriptionlist.php:123 lib/tagcloudsection.php:71
 msgid "(None)"
 msgstr "(없음)"
 
 #. TRANS: Link to all group members from mini list of group members if group has more than n members.
-#: actions/showgroup.php:410
 msgid "All members"
 msgstr "모든 회원"
 
 #. TRANS: Header for group statistics on a group page (h2).
 #. TRANS: H2 text for user statistics.
-#: actions/showgroup.php:441 lib/profileaction.php:205
 msgid "Statistics"
 msgstr "통계"
 
-#: actions/showgroup.php:444
 #, fuzzy
 msgctxt "LABEL"
 msgid "Created"
 msgstr "생성됨"
 
 #. TRANS: Label for member count in statistics on group page.
-#: actions/showgroup.php:449
 #, fuzzy
 msgctxt "LABEL"
 msgid "Members"
@@ -5631,7 +4634,6 @@ msgstr "회원"
 #. TRANS: **%s** is the group alias, %%%%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).
-#: actions/showgroup.php:464
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5644,7 +4646,6 @@ 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: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
-#: actions/showgroup.php:474
 #, fuzzy, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5656,101 +4657,85 @@ msgstr ""
 "Micro-blogging)의 사용자 그룹입니다. "
 
 #. TRANS: Header for list of group administrators on a group page (h2).
-#: actions/showgroup.php:503
 #, fuzzy
 msgid "Admins"
 msgstr "관리자"
 
 #. TRANS: Client error displayed requesting a single message that does not exist.
-#: actions/showmessage.php:76
 msgid "No such message."
 msgstr "그러한 메시지가 없습니다."
 
 #. TRANS: Client error displayed requesting a single direct message the requesting user was not a party in.
-#: actions/showmessage.php:86
 msgid "Only the sender and recipient may read this message."
 msgstr "오직 발송자가 수신자가 이 메시지를 읽는것이 좋습니다."
 
 #. TRANS: Page title for single direct message display when viewing user is the sender.
 #. TRANS: %1$s is the addressed user's nickname, $2$s is a timestamp.
-#: actions/showmessage.php:105
 #, php-format
 msgid "Message to %1$s on %2$s"
 msgstr "%2$s에서 %1$s까지 메시지"
 
 #. TRANS: Page title for single message display.
 #. TRANS: %1$s is the sending user's nickname, $2$s is a timestamp.
-#: actions/showmessage.php:113
 #, php-format
 msgid "Message from %1$s on %2$s"
 msgstr "%1$s에서 %2$s까지 메시지"
 
-#: actions/shownotice.php:90
 #, fuzzy
 msgid "Notice deleted."
 msgstr "게시글이 등록되었습니다."
 
 #. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
-#: actions/showstream.php:70
 #, fuzzy, php-format
 msgid "%1$s tagged %2$s"
 msgstr "%s 및 친구들, %d 페이지"
 
 #. TRANS: Page title showing tagged notices in one user's stream.
 #. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
-#: actions/showstream.php:74
 #, fuzzy, php-format
 msgid "%1$s tagged %2$s, page %3$d"
 msgstr "%s 태그된 통지"
 
 #. TRANS: Extended page title showing tagged notices in one user's stream.
 #. TRANS: %1$s is the username, %2$d is the page number.
-#: actions/showstream.php:82
 #, php-format
 msgid "%1$s, page %2$d"
 msgstr "%s 및 친구들, %d 페이지"
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %1$s is a user nickname, %2$s is a hashtag.
-#: actions/showstream.php:127
 #, php-format
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
 msgstr "%s 그룹을 위한 공지피드 (RSS 1.0)"
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.
-#: actions/showstream.php:136
 #, php-format
 msgid "Notice feed for %s (RSS 1.0)"
 msgstr "%s 그룹을 위한 공지피드 (RSS 1.0)"
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.
-#: actions/showstream.php:145
 #, php-format
 msgid "Notice feed for %s (RSS 2.0)"
 msgstr "%s 그룹을 위한 공지피드 (RSS 2.0)"
 
-#: actions/showstream.php:152
 #, php-format
 msgid "Notice feed for %s (Atom)"
 msgstr "%s 그룹을 위한 공지피드 (Atom)"
 
 #. TRANS: Title for link to notice feed. FOAF stands for Friend of a Friend.
 #. TRANS: More information at http://www.foaf-project.org. %s is a user nickname.
-#: actions/showstream.php:159
 #, fuzzy, php-format
 msgid "FOAF for %s"
 msgstr "%s의 보낸쪽지함"
 
 #. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
-#: actions/showstream.php:205
 #, fuzzy, php-format
 msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr "%s 및 친구들의 타임라인이지만, 아직 아무도 글을 작성하지 않았습니다."
 
 #. TRANS: Second sentence of empty list message for a stream for the user themselves.
-#: actions/showstream.php:211
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
@@ -5760,7 +4745,6 @@ msgstr ""
 
 #. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:215
 #, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
@@ -5769,7 +4753,6 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:258
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5780,7 +4763,6 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:265
 #, fuzzy, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5791,224 +4773,177 @@ msgstr ""
 "Micro-blogging) 서비스에 계정을 갖고 있습니다."
 
 #. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
-#: actions/showstream.php:322
 #, fuzzy, php-format
 msgid "Repeat of %s"
 msgstr "%s에 답신"
 
-#: actions/silence.php:65 actions/unsilence.php:65
 msgid "You cannot silence users on this site."
 msgstr "이 사이트의 이용자에 대해 권한정지 할 수 없습니다."
 
-#: actions/silence.php:72
 msgid "User is already silenced."
 msgstr "사용자가 귀하를 차단했습니다."
 
-#: actions/siteadminpanel.php:69
 #, fuzzy
 msgid "Basic settings for this StatusNet site"
 msgstr "이 StatusNet 사이트에 대한 디자인 설정"
 
-#: actions/siteadminpanel.php:133
 msgid "Site name must have non-zero length."
 msgstr ""
 
-#: actions/siteadminpanel.php:141
 msgid "You must have a valid contact email address."
 msgstr "올바른 메일 주소가 아닙니다."
 
-#: actions/siteadminpanel.php:159
 #, php-format
 msgid "Unknown language \"%s\"."
 msgstr ""
 
-#: actions/siteadminpanel.php:165
 msgid "Minimum text limit is 0 (unlimited)."
 msgstr ""
 
-#: actions/siteadminpanel.php:171
 msgid "Dupe limit must be one or more seconds."
 msgstr ""
 
-#: actions/siteadminpanel.php:221
 msgid "General"
 msgstr "일반"
 
-#: actions/siteadminpanel.php:224
 msgid "Site name"
 msgstr "사이트 테마"
 
-#: actions/siteadminpanel.php:225
 msgid "The name of your site, like \"Yourcompany Microblog\""
 msgstr ""
 
-#: actions/siteadminpanel.php:229
 msgid "Brought by"
 msgstr ""
 
-#: actions/siteadminpanel.php:230
 msgid "Text used for credits link in footer of each page"
 msgstr ""
 
-#: actions/siteadminpanel.php:234
 msgid "Brought by URL"
 msgstr ""
 
-#: actions/siteadminpanel.php:235
 msgid "URL used for credits link in footer of each page"
 msgstr ""
 
-#: actions/siteadminpanel.php:239
 msgid "Contact email address for your site"
 msgstr "%s에 포스팅 할 새로운 메일 주소"
 
-#: actions/siteadminpanel.php:245
 #, fuzzy
 msgid "Local"
 msgstr "로컬 뷰"
 
-#: actions/siteadminpanel.php:256
 #, fuzzy
 msgid "Default timezone"
 msgstr "기본 언어"
 
-#: actions/siteadminpanel.php:257
 msgid "Default timezone for the site; usually UTC."
 msgstr ""
 
-#: actions/siteadminpanel.php:262
 msgid "Default language"
 msgstr "기본 언어"
 
-#: actions/siteadminpanel.php:263
 msgid "Site language when autodetection from browser settings is not available"
 msgstr ""
 
-#: actions/siteadminpanel.php:271
 msgid "Limits"
 msgstr ""
 
-#: actions/siteadminpanel.php:274
 msgid "Text limit"
 msgstr ""
 
-#: actions/siteadminpanel.php:274
 msgid "Maximum number of characters for notices."
 msgstr ""
 
-#: actions/siteadminpanel.php:278
 msgid "Dupe limit"
 msgstr ""
 
-#: actions/siteadminpanel.php:278
 msgid "How long users must wait (in seconds) to post the same thing again."
 msgstr ""
 
 #. TRANS: Page title for site-wide notice tab in admin panel.
-#: actions/sitenoticeadminpanel.php:55
 msgid "Site Notice"
 msgstr "사이트 공지 사항"
 
 #. TRANS: Instructions for site-wide notice tab in admin panel.
-#: actions/sitenoticeadminpanel.php:66
 #, fuzzy
 msgid "Edit site-wide message"
 msgstr "새로운 메시지입니다."
 
 #. TRANS: Server error displayed when saving a site-wide notice was impossible.
-#: actions/sitenoticeadminpanel.php:101
 msgid "Unable to save site notice."
 msgstr "디자인 설정을 저장할 수 없습니다."
 
 #. TRANS: Client error displayed when a site-wide notice was longer than allowed.
-#: actions/sitenoticeadminpanel.php:112
 msgid "Maximum length for the site-wide notice is 255 characters."
 msgstr ""
 
 #. TRANS: Label for site-wide notice text field in admin panel.
-#: actions/sitenoticeadminpanel.php:176
 #, fuzzy
 msgid "Site notice text"
 msgstr "사이트 공지"
 
 #. TRANS: Tooltip for site-wide notice text field in admin panel.
-#: actions/sitenoticeadminpanel.php:179
 msgid "Site-wide notice text (255 characters maximum; HTML allowed)"
 msgstr ""
 
 #. TRANS: Title for button to save site notice in admin panel.
-#: actions/sitenoticeadminpanel.php:201
 #, fuzzy
 msgid "Save site notice."
 msgstr "사이트 공지"
 
 #. TRANS: Title for SMS settings.
-#: actions/smssettings.php:56
 msgid "SMS settings"
 msgstr "메일 설정"
 
 #. TRANS: SMS settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/smssettings.php:70
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr ""
 "당신은 %%site.name%% 로부터 이메일을 통해 SMS메시지를 받을 수 있습니다."
 
 #. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
-#: actions/smssettings.php:92
 msgid "SMS is not available."
 msgstr "인스턴트 메신저를 사용할 수 없습니다."
 
 #. TRANS: Form legend for SMS settings form.
-#: actions/smssettings.php:106
 msgid "SMS address"
 msgstr "SMS 주소"
 
 #. TRANS: Form guide in SMS settings form.
-#: actions/smssettings.php:115
 msgid "Current confirmed SMS-enabled phone number."
 msgstr "확인된 최신의 SMS가 가능한 휴대폰 번호"
 
 #. TRANS: Form guide in IM settings form.
-#: actions/smssettings.php:128
 msgid "Awaiting confirmation on this phone number."
 msgstr "이 전화 번호는 인증 대기중입니다."
 
 #. TRANS: Field label for SMS address input in SMS settings form.
-#: actions/smssettings.php:137
 msgid "Confirmation code"
 msgstr "인증 코드"
 
 #. TRANS: Form field instructions in SMS settings form.
-#: actions/smssettings.php:139
 msgid "Enter the code you received on your phone."
 msgstr "휴대폰으로 받으신 인증번호를 입력하십시오."
 
 #. TRANS: Button label to confirm SMS confirmation code in SMS settings.
-#: actions/smssettings.php:143
 msgctxt "BUTTON"
 msgid "Confirm"
 msgstr "확인"
 
 #. TRANS: Field label for SMS phone number input in SMS settings form.
-#: actions/smssettings.php:148
 msgid "SMS phone number"
 msgstr "휴대폰 번호가 없습니다."
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
-#: actions/smssettings.php:151
 #, fuzzy
 msgid "Phone number, no punctuation or spaces, with area code."
 msgstr "지역번호와 함께 띄어쓰기 없이 번호를 적어 주세요."
 
 #. TRANS: Form legend for SMS preferences form.
-#: actions/smssettings.php:190
 msgid "SMS preferences"
 msgstr "메일 설정"
 
 #. TRANS: Checkbox label in SMS preferences form.
-#: actions/smssettings.php:196
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
@@ -6017,32 +4952,26 @@ msgstr ""
 "습니다."
 
 #. TRANS: Confirmation message for successful SMS preferences save.
-#: actions/smssettings.php:307
 msgid "SMS preferences saved."
 msgstr "SMS 설정을 저장했습니다."
 
 #. TRANS: Message given saving SMS phone number without having provided one.
-#: actions/smssettings.php:329
 msgid "No phone number."
 msgstr "휴대폰 번호가 없습니다."
 
 #. TRANS: Message given saving SMS phone number without having selected a carrier.
-#: actions/smssettings.php:335
 msgid "No carrier selected."
 msgstr "통신회사가 선택 되지 않았습니다."
 
 #. TRANS: Message given saving SMS phone number that is already set.
-#: actions/smssettings.php:343
 msgid "That is already your phone number."
 msgstr "그 휴대폰 번호는 이미 귀하의 것입니다."
 
 #. TRANS: Message given saving SMS phone number that is already set for another user.
-#: actions/smssettings.php:347
 msgid "That phone number already belongs to another user."
 msgstr "그 휴대폰 번호는 이미 다른 사용자의 것입니다."
 
 #. TRANS: Message given saving valid SMS phone number that is to be confirmed.
-#: actions/smssettings.php:375
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
 "for the code and instructions on how to use it."
@@ -6051,39 +4980,32 @@ msgstr ""
 "와 사용법을 확인하여 주시기 바랍니다."
 
 #. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
-#: actions/smssettings.php:403
 msgid "That is the wrong confirmation number."
 msgstr "옳지 않은 인증 번호 입니다."
 
 #. TRANS: Message given after successfully canceling SMS phone number confirmation.
-#: actions/smssettings.php:417
 msgid "SMS confirmation cancelled."
 msgstr "SMS 인증"
 
 #. TRANS: Message given trying to remove an SMS phone number that is not
 #. TRANS: registered for the active user.
-#: actions/smssettings.php:437
 msgid "That is not your phone number."
 msgstr "그 휴대폰 번호는 귀하의 것이 아닙니다."
 
 #. TRANS: Message given after successfully removing a registered SMS phone number.
-#: actions/smssettings.php:459
 msgid "The SMS phone number was removed."
 msgstr "메일 주소를 지웠습니다."
 
 #. TRANS: Label for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:498
 msgid "Mobile carrier"
 msgstr "휴대전화 사업자"
 
 #. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:503
 msgid "Select a carrier"
 msgstr "통신 회사를 선택 하세요."
 
 #. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
 #. TRANS: %s is an administrative contact's e-mail address.
-#: actions/smssettings.php:512
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -6091,124 +5013,99 @@ msgid ""
 msgstr "귀하의 휴대폰의 통신회사는 무엇입니까?"
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
-#: actions/smssettings.php:534
 #, fuzzy
 msgid "No code entered."
 msgstr "코드가 입력 되지 않았습니다."
 
 #. TRANS: Menu item for site administration
-#: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
-#: lib/adminpanelaction.php:395
 msgid "Snapshots"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:65
 msgid "Manage snapshot configuration"
 msgstr "메일 주소 확인"
 
-#: actions/snapshotadminpanel.php:127
 #, fuzzy
 msgid "Invalid snapshot run value."
 msgstr "옳지 않은 크기"
 
-#: actions/snapshotadminpanel.php:133
 msgid "Snapshot frequency must be a number."
 msgstr ""
 
-#: actions/snapshotadminpanel.php:144
 #, fuzzy
 msgid "Invalid snapshot report URL."
 msgstr "잘못된 로고 URL 입니다."
 
-#: actions/snapshotadminpanel.php:200
 msgid "Randomly during web hit"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:201
 msgid "In a scheduled job"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:206
 #, fuzzy
 msgid "Data snapshots"
 msgstr "접근 설정을 저장"
 
-#: actions/snapshotadminpanel.php:208
 msgid "When to send statistical data to status.net servers"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:217
 msgid "Frequency"
 msgstr "주기"
 
-#: actions/snapshotadminpanel.php:218
 msgid "Snapshots will be sent once every N web hits"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:226
 #, fuzzy
 msgid "Report URL"
 msgstr "소스 코드 URL"
 
-#: actions/snapshotadminpanel.php:227
 msgid "Snapshots will be sent to this URL"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:248
 msgid "Save snapshot settings"
 msgstr "접근 설정을 저장"
 
 #. TRANS: Client error displayed trying a change a subscription for a non-subscribed profile.
-#: actions/subedit.php:75
 msgid "You are not subscribed to that profile."
 msgstr "당신은 이 프로필에 구독되지 않고있습니다."
 
 #. TRANS: Server error displayed when updating a subscription fails with a database error.
 #. TRANS: Exception thrown when a subscription could not be stored on the server.
-#: actions/subedit.php:89 classes/Subscription.php:141
 msgid "Could not save subscription."
 msgstr "구독을 저장할 수 없습니다."
 
 #. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
-#: actions/subscribe.php:121
 #, fuzzy
 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
 msgstr "당신은 이 프로필에 구독되지 않고있습니다."
 
 #. TRANS: Page title when subscription succeeded.
-#: actions/subscribe.php:149
 msgid "Subscribed"
 msgstr "구독하였습니다."
 
 #. TRANS: Header for list of subscribers for a user (first page).
 #. TRANS: %s is the user's nickname.
-#: actions/subscribers.php:51
 #, php-format
 msgid "%s subscribers"
 msgstr "%s 구독자"
 
 #. TRANS: Header for list of subscribers for a user (not first page).
 #. TRANS: %1$s is the user's nickname, $2$d is the page number.
-#: actions/subscribers.php:55
 #, php-format
 msgid "%1$s subscribers, page %2$d"
 msgstr "%s 및 친구들, %d 페이지"
 
 #. TRANS: Page notice for page with an overview of all subscribers
 #. TRANS: of the logged in user's own profile.
-#: actions/subscribers.php:68
 msgid "These are the people who listen to your notices."
 msgstr "귀하의 통지를 받고 있는 사람"
 
 #. TRANS: Page notice for page with an overview of all subscribers of a user other
 #. TRANS: than the logged in user. %s is the user nickname.
-#: actions/subscribers.php:74
 #, php-format
 msgid "These are the people who listen to %s's notices."
 msgstr "%s의 통지를 받고 있는 사람"
 
 #. TRANS: Subscriber list text when the logged in user has no subscribers.
-#: actions/subscribers.php:114
 msgid ""
 "You have no subscribers. Try subscribing to people you know and they might "
 "return the favor."
@@ -6216,7 +5113,6 @@ msgstr ""
 
 #. TRANS: Subscriber list text when looking at the subscribers for a of a user other
 #. TRANS: than the logged in user that has no subscribers. %s is the user nickname.
-#: actions/subscribers.php:118
 #, php-format
 msgid "%s has no subscribers. Want to be the first?"
 msgstr ""
@@ -6226,7 +5122,6 @@ msgstr ""
 #. TRANS: This message contains a Markdown URL. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.
-#: actions/subscribers.php:127
 #, php-format
 msgid ""
 "%s has no subscribers. Why not [register an account](%%%%action.register%%%"
@@ -6235,20 +5130,17 @@ msgstr ""
 
 #. TRANS: Header for subscriptions overview for a user (not first page).
 #. TRANS: %1$s is a user nickname, %2$d is the page number.
-#: actions/subscriptions.php:55
 #, php-format
 msgid "%1$s subscriptions, page %2$d"
 msgstr "%s 및 친구들, %d 페이지"
 
 #. TRANS: Page notice for page with an overview of all subscriptions
 #. TRANS: of the logged in user's own profile.
-#: actions/subscriptions.php:68
 msgid "These are the people whose notices you listen to."
 msgstr "귀하의 통지를 받고 있는 사람"
 
 #. TRANS: Page notice for page with an overview of all subscriptions of a user other
 #. TRANS: than the logged in user. %s is the user nickname.
-#: actions/subscriptions.php:74
 #, php-format
 msgid "These are the people whose notices %s listens to."
 msgstr "%s님이 받고 있는 통지의 사람"
@@ -6257,7 +5149,6 @@ 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.
-#: actions/subscriptions.php:133
 #, php-format
 msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "
@@ -6271,69 +5162,55 @@ msgstr ""
 #. TRANS: than the logged in user that has no subscriptions. %s is the user nickname.
 #. TRANS: Subscription list text when looking at the subscriptions for a of a user that has none
 #. TRANS: as an anonymous user. %s is the user nickname.
-#: actions/subscriptions.php:141 actions/subscriptions.php:147
 #, php-format
 msgid "%s is not listening to anyone."
 msgstr "%1$s님이 귀하의 알림 메시지를 %2$s에서 듣고 있습니다."
 
 #. TRANS: Atom feed title. %s is a profile nickname.
-#: actions/subscriptions.php:176
 #, fuzzy, php-format
 msgid "Subscription feed for %s (Atom)"
 msgstr "%s 그룹을 위한 공지피드 (Atom)"
 
 #. TRANS: Checkbox label for enabling Jabber messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:241 lib/settingsnav.php:110
-#, fuzzy
 msgid "IM"
 msgstr "메신저"
 
 #. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:256 lib/settingsnav.php:117
 msgid "SMS"
 msgstr "SMS"
 
 #. TRANS: Title for all but the first page of notices with tags.
 #. TRANS: %1$s is the tag, %2$d is the page number.
-#: actions/tag.php:73
 #, php-format
 msgid "Notices tagged with %1$s, page %2$d"
 msgstr "%s 태그된 통지"
 
-#: actions/tag.php:91
 #, php-format
 msgid "Notice feed for tag %s (RSS 1.0)"
 msgstr "%s 그룹을 위한 공지피드 (RSS 1.0)"
 
-#: actions/tag.php:97
 #, php-format
 msgid "Notice feed for tag %s (RSS 2.0)"
 msgstr "%s 그룹을 위한 공지피드 (RSS 2.0)"
 
-#: actions/tag.php:103
 #, php-format
 msgid "Notice feed for tag %s (Atom)"
 msgstr "%s 그룹을 위한 공지피드 (Atom)"
 
-#: actions/tagother.php:39
 msgid "No ID argument."
 msgstr "첨부문서 없음"
 
-#: actions/tagother.php:65
 #, php-format
 msgid "Tag %s"
 msgstr "태그 %s"
 
 #. TRANS: H2 for user profile information.
-#: actions/tagother.php:77 lib/userprofile.php:76
 msgid "User profile"
 msgstr "이용자 프로필"
 
-#: actions/tagother.php:120
 msgid "Tag user"
 msgstr "태그 사용자"
 
-#: actions/tagother.php:130
 msgid ""
 "Tags for this user (letters, numbers, -, ., and _), comma- or space- "
 "separated"
@@ -6341,225 +5218,180 @@ msgstr ""
 "사용자를 위한 태그 (문자,숫자, -, . ,그리고 _), 콤마 혹은 공백으로 분리하세"
 "요."
 
-#: actions/tagother.php:157
 #, php-format
 msgid "Invalid tag: \"%s\""
 msgstr "올바르지 않은 태그: \"%s\""
 
-#: actions/tagother.php:172
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 "당신이 구독하거나 당신을 구독하는 사람들에 대해서만 태그를 붙일 수 있습니다."
 
-#: actions/tagother.php:215
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr "당신의 구독자나 구독하는 사람에 태깅을 위해 이 양식을 사용하세요."
 
-#: actions/tagrss.php:35
 msgid "No such tag."
 msgstr "그러한 태그가 없습니다."
 
 #. TRANS: Client error displayed when trying to unblock a non-blocked user.
-#: actions/unblock.php:59
 msgid "You haven't blocked that user."
 msgstr "이미 차단된 이용자입니다."
 
-#: actions/unsandbox.php:72
 msgid "User is not sandboxed."
 msgstr "이용자의 지속적인 게시글이 없습니다."
 
-#: actions/unsilence.php:72
 msgid "User is not silenced."
 msgstr "이용자의 지속적인 게시글이 없습니다."
 
-#: actions/unsubscribe.php:77
 msgid "No profile ID in request."
 msgstr "해당 ID의 프로필이 없습니다."
 
-#: actions/unsubscribe.php:98
 msgid "Unsubscribed"
 msgstr "구독취소 되었습니다."
 
-#: actions/updateprofile.php:64
 #, php-format
 msgid ""
 "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
 msgstr ""
 
-#: actions/urlsettings.php:60
 #, fuzzy
 msgid "URL settings"
 msgstr "메일 설정"
 
 #. TRANS: Instructions for tab "Other" in user profile settings.
-#: actions/urlsettings.php:72
 msgid "Manage various other options."
 msgstr "여러가지 기타 옵션을 관리합니다."
 
 #. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
 #. TRANS: user's profile settings. This message has one space at the beginning. Use your
 #. TRANS: language's word separator here if it has one (most likely a single space).
-#: actions/urlsettings.php:115
 msgid " (free service)"
 msgstr " (무료 서비스)"
 
-#: actions/urlsettings.php:121
 #, fuzzy
 msgid "[none]"
 msgstr "없음"
 
-#: actions/urlsettings.php:122
 msgid "[internal]"
 msgstr ""
 
 #. TRANS: Label for dropdown with URL shortener services.
-#: actions/urlsettings.php:130
 msgid "Shorten URLs with"
 msgstr "URL 줄이기 기능"
 
 #. TRANS: Tooltip for for dropdown with URL shortener services.
-#: actions/urlsettings.php:132
 msgid "Automatic shortening service to use."
 msgstr "사용할 URL 자동 줄이기 서비스."
 
-#: actions/urlsettings.php:138
 msgid "URL longer than"
 msgstr ""
 
-#: actions/urlsettings.php:141
 msgid "URLs longer than this will be shortened, 0 means always shorten."
 msgstr ""
 
-#: actions/urlsettings.php:145
 msgid "Text longer than"
 msgstr ""
 
-#: actions/urlsettings.php:148
 msgid ""
 "URLs in notices longer than this will be shortened, 0 means always shorten."
 msgstr ""
 
 #. TRANS: Form validation error for form "Other settings" in user profile.
-#: actions/urlsettings.php:180
 #, fuzzy
 msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr "URL 줄이기 서비스 너무 깁니다. (최대 50글자)"
 
-#: actions/urlsettings.php:187
 msgid "Invalid number for max url length."
 msgstr ""
 
-#: actions/urlsettings.php:193
 #, fuzzy
 msgid "Invalid number for max notice length."
 msgstr "옳지 않은 크기"
 
-#: actions/urlsettings.php:238
 msgid "Error saving user URL shortening preferences."
 msgstr ""
 
 #. TRANS: User admin panel title
-#: actions/useradminpanel.php:58
 msgctxt "TITLE"
 msgid "User"
 msgstr "사용자"
 
 #. TRANS: Instruction for user admin panel.
-#: actions/useradminpanel.php:69
 msgid "User settings for this StatusNet site"
 msgstr ""
 
 #. TRANS: Form validation error in user admin panel when a non-numeric character limit was set.
-#: actions/useradminpanel.php:147
 msgid "Invalid bio limit. Must be numeric."
 msgstr ""
 
 #. TRANS: Form validation error in user admin panel when welcome text is too long.
-#: actions/useradminpanel.php:154
 msgid "Invalid welcome text. Maximum length is 255 characters."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to set a non-existing user as default subscription for new
 #. TRANS: users in user admin panel. %1$s is the invalid nickname.
-#: actions/useradminpanel.php:166
 #, php-format
 msgid "Invalid default subscripton: \"%1$s\" is not a user."
 msgstr ""
 
-#: actions/useradminpanel.php:215 lib/action.php:565 lib/settingsnav.php:77
-#: lib/subgroupnav.php:81
 msgid "Profile"
 msgstr "프로필"
 
 #. TRANS: Field label in user admin panel for setting the character limit for the bio field.
-#: actions/useradminpanel.php:220
 msgid "Bio Limit"
 msgstr ""
 
 #. TRANS: Tooltip in user admin panel for setting the character limit for the bio field.
-#: actions/useradminpanel.php:222
 msgid "Maximum length of a profile bio in characters."
 msgstr ""
 
 #. TRANS: Form legend in user admin panel.
-#: actions/useradminpanel.php:231
 msgid "New users"
 msgstr "새 사용자"
 
 #. TRANS: Field label in user admin panel for setting new user welcome text.
-#: actions/useradminpanel.php:236
 msgid "New user welcome"
 msgstr ""
 
 #. TRANS: Tooltip in user admin panel for setting new user welcome text.
-#: actions/useradminpanel.php:238
 #, fuzzy
 msgid "Welcome text for new users (maximum 255 characters)."
 msgstr "실명이 너무 깁니다. (최대 255글자)"
 
 #. TRANS: Field label in user admin panel for setting default subscription for new users.
-#: actions/useradminpanel.php:244
 #, fuzzy
 msgid "Default subscription"
 msgstr "모든 예약 구독"
 
 #. TRANS: Tooltip in user admin panel for setting default subscription for new users.
-#: actions/useradminpanel.php:246
 #, fuzzy
 msgid "Automatically subscribe new users to this user."
 msgstr "나에게 구독하는 사람에게 자동 구독 신청"
 
 #. TRANS: Form legend in user admin panel.
-#: actions/useradminpanel.php:256
 #, fuzzy
 msgid "Invitations"
 msgstr "초대권을 보냈습니다"
 
 #. TRANS: Field label for checkbox in user admin panel for allowing users to invite friend using site e-mail.
-#: actions/useradminpanel.php:262
 #, fuzzy
 msgid "Invitations enabled"
 msgstr "초대권을 보냈습니다"
 
 #. TRANS: Tooltip for checkbox in user admin panel for allowing users to invite friend using site e-mail.
-#: actions/useradminpanel.php:265
 msgid "Whether to allow users to invite new users."
 msgstr ""
 
 #. TRANS: Title for button to save user settings in user admin panel.
-#: actions/useradminpanel.php:302
 #, fuzzy
 msgid "Save user settings."
 msgstr "접근 설정을 저장"
 
 #. TRANS: Page title.
-#: actions/userauthorization.php:109
 msgid "Authorize subscription"
 msgstr "구독을 허가"
 
 #. TRANS: Page notice on "Auhtorize subscription" page.
-#: actions/userauthorization.php:115
 #, fuzzy
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
@@ -6570,42 +5402,35 @@ msgstr ""
 "\"를 클릭해 주세요."
 
 #. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:200
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Accept"
 msgstr "수락"
 
 #. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:202
 #, fuzzy
 msgid "Subscribe to this user."
 msgstr "이 회원을 구독합니다."
 
 #. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:204
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Reject"
 msgstr "거부"
 
 #. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:206
 #, fuzzy
 msgid "Reject this subscription."
 msgstr "%s 구독"
 
 #. TRANS: Client error displayed for an empty authorisation request.
-#: actions/userauthorization.php:219
 msgid "No authorization request!"
 msgstr "허용되지 않는 요청입니다."
 
 #. TRANS: Accept message header from Authorise subscription page.
-#: actions/userauthorization.php:242
 msgid "Subscription authorized"
 msgstr "구독 허가"
 
-#: actions/userauthorization.php:245
 #, fuzzy
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
@@ -6616,11 +5441,9 @@ msgstr ""
 "시를 찾아 구독 승인 방법에 대하여 읽어보십시오. 귀하의 구독 토큰은 : "
 
 #. TRANS: Reject message header from Authorise subscription page.
-#: actions/userauthorization.php:256
 msgid "Subscription rejected"
 msgstr "구독 거부"
 
-#: actions/userauthorization.php:259
 #, fuzzy
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
@@ -6632,35 +5455,30 @@ msgstr ""
 
 #. TRANS: Exception thrown when no valid user is found for an authorisation request.
 #. TRANS: %s is a listener URI.
-#: actions/userauthorization.php:296
 #, php-format
 msgid "Listener URI \"%s\" not found here."
 msgstr ""
 
 #. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
 #. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:303
 #, fuzzy, php-format
 msgid "Listenee URI \"%s\" is too long."
 msgstr "소스 URL이 너무 깁니다."
 
 #. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
 #. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:311
 #, php-format
 msgid "Listenee URI \"%s\" is a local user."
 msgstr ""
 
 #. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
 #. TRANS: %s is a profile URL.
-#: actions/userauthorization.php:329
 #, php-format
 msgid "Profile URL \"%s\" is for a local user."
 msgstr ""
 
 #. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
 #. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
-#: actions/userauthorization.php:339
 #, php-format
 msgid ""
 "Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
@@ -6669,76 +5487,62 @@ msgstr ""
 
 #. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
 #. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:349
 #, fuzzy, php-format
 msgid "Avatar URL \"%s\" is not valid."
 msgstr "소스 URL이 올바르지 않습니다."
 
 #. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
 #. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:356
 #, fuzzy, php-format
 msgid "Cannot read avatar URL \"%s\"."
 msgstr "아바타 URL '%s'을(를) 읽어낼 수 없습니다."
 
 #. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
 #. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:363
 #, fuzzy, php-format
 msgid "Wrong image type for avatar URL \"%s\"."
 msgstr "%S 잘못된 그림 파일 타입입니다. "
 
 #. TRANS: Page title for profile design page.
-#: actions/userdesignsettings.php:74 lib/designsettings.php:61
 msgid "Profile design"
 msgstr "프로필 디자인"
 
 #. TRANS: Instructions for profile design page.
-#: actions/userdesignsettings.php:84 lib/designsettings.php:72
 msgid ""
 "Customize the way your profile looks with a background image and a colour "
 "palette of your choice."
 msgstr ""
 
-#: actions/userdesignsettings.php:289
 msgid "Enjoy your hotdog!"
 msgstr ""
 
-#: actions/userdesignsettings.php:325
 #, fuzzy
 msgid "Design settings"
 msgstr "접근 설정을 저장"
 
-#: actions/userdesignsettings.php:340
 msgid "View profile designs"
 msgstr "프로필 디자인 보기"
 
-#: actions/userdesignsettings.php:341
 msgid "Show or hide profile designs."
 msgstr "프로필 디자인 보이거나 감춥니다."
 
-#: actions/userdesignsettings.php:348
 #, fuzzy
 msgid "Background file"
 msgstr "배경"
 
 #. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number.
-#: actions/usergroups.php:66
 #, php-format
 msgid "%1$s groups, page %2$d"
 msgstr "그룹, %d 페이지"
 
-#: actions/usergroups.php:132
 #, fuzzy
 msgid "Search for more groups"
 msgstr "프로필이나 텍스트 검색"
 
-#: actions/usergroups.php:159
 #, fuzzy, php-format
 msgid "%s is not a member of any group."
 msgstr "당신은 해당 그룹의 멤버가 아닙니다."
 
-#: actions/usergroups.php:164
 #, php-format
 msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
 msgstr ""
@@ -6748,18 +5552,14 @@ msgstr ""
 #. TRANS: %1$s is a group name, %2$s is a site name.
 #. TRANS: Message is used as a subtitle in atom user notice feed.
 #. TRANS: %1$s is a user name, %2$s is a site name.
-#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:70
-#: lib/atomusernoticefeed.php:95
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr "%2$s에 있는 %1$s의 업데이트!"
 
-#: actions/version.php:75
 #, php-format
 msgid "StatusNet %s"
 msgstr "StatusNet %s"
 
-#: actions/version.php:155
 #, php-format
 msgid ""
 "This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
@@ -6768,16 +5568,13 @@ msgstr ""
 "이 사이트는 %1$s %2$s 버전으로 운영됩니다. Copyright 2008-2010 StatusNet, "
 "Inc. and contributors."
 
-#: actions/version.php:163
 msgid "Contributors"
 msgstr "편집자"
 
 #. TRANS: Menu item for site administration
-#: actions/version.php:167 lib/adminpanelaction.php:403
 msgid "License"
 msgstr "라이센스"
 
-#: actions/version.php:170
 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 "
@@ -6788,7 +5585,6 @@ msgstr ""
 "재단이 공표한 GNU Affero 일반 공중 사용 허가서 3판 또는 그 이후 판을 임의로 "
 "선택해서, 그 규정에 따라 프로그램을 개작하거나 재배포할 수 있습니다."
 
-#: actions/version.php:176
 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 "
@@ -6800,7 +5596,6 @@ msgstr ""
 "함한 어떠한 형태의 보증도 제공하지 않습니다. 보다 자세한 사항에 대해서는 GNU "
 "Affero 일반 공중 사용 허가서를 참고하시기 바랍니다."
 
-#: actions/version.php:182
 #, php-format
 msgid ""
 "You should have received a copy of the GNU Affero General Public License "
@@ -6810,52 +5605,42 @@ msgstr ""
 "락되어 있다면 %s 페이지를 보십시오."
 
 #. TRANS: Form input field label for application name.
-#: actions/version.php:197 lib/applicationeditform.php:190
 msgid "Name"
 msgstr "이름"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:885
 msgid "Version"
 msgstr "버전"
 
-#: actions/version.php:199
 msgid "Author(s)"
 msgstr "작성자"
 
 #. TRANS: Form input field label.
-#: actions/version.php:200 lib/applicationeditform.php:208
-#: lib/groupeditform.php:168
 msgid "Description"
 msgstr "설명"
 
 #. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:164
 msgid "Favor"
 msgstr "좋아합니다"
 
 #. TRANS: Ntofication given when a user marks a notice as favorite.
 #. TRANS: %1$s is a user nickname or full name, %2$s is a notice URI.
-#: classes/Fave.php:167
 #, fuzzy, php-format
 msgid "%1$s marked notice %2$s as a favorite."
 msgstr "누군가 내 글을 좋아하는 게시글로 추가했을 때, 메일을 보냅니다."
 
 #. TRANS: Server exception thrown when a URL cannot be processed.
-#: classes/File.php:162
 #, php-format
 msgid "Cannot process URL '%s'"
 msgstr "'%s' URL을 처리할 수 없습니다"
 
 #. TRANS: Server exception thrown when... Robin thinks something is impossible!
-#: classes/File.php:194
 msgid "Robin thinks something is impossible."
 msgstr ""
 
 #. 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$s is used for plural.
-#: classes/File.php:210
 #, php-format
 msgid ""
 "No file may be larger than %1$d byte and the file you sent was %2$d bytes. "
@@ -6867,7 +5652,6 @@ msgstr[0] ""
 
 #. TRANS: Message given if an upload would exceed user quota.
 #. TRANS: %d (number) is the user quota in bytes and is used for plural.
-#: classes/File.php:223
 #, php-format
 msgid "A file this large would exceed your user quota of %d byte."
 msgid_plural "A file this large would exceed your user quota of %d bytes."
@@ -6875,120 +5659,100 @@ msgstr[0] ""
 
 #. TRANS: Message given id an upload would exceed a user's monthly quota.
 #. TRANS: $d (number) is the monthly user quota in bytes and is used for plural.
-#: classes/File.php:235
 #, php-format
 msgid "A file this large would exceed your monthly quota of %d byte."
 msgid_plural "A file this large would exceed your monthly quota of %d bytes."
 msgstr[0] ""
 
 #. TRANS: Client exception thrown if a file upload does not have a valid name.
-#: classes/File.php:282 classes/File.php:297
 #, fuzzy
 msgid "Invalid filename."
 msgstr "옳지 않은 크기"
 
 #. TRANS: Exception thrown when joining a group fails.
-#: classes/Group_member.php:51
 msgid "Group join failed."
 msgstr "그룹에 가입하지 못했습니다."
 
 #. TRANS: Exception thrown when trying to leave a group the user is not a member of.
-#: classes/Group_member.php:64
 #, fuzzy
 msgid "Not part of group."
 msgstr "그룹을 업데이트 할 수 없습니다."
 
 #. TRANS: Exception thrown when trying to leave a group fails.
-#: classes/Group_member.php:72
 msgid "Group leave failed."
 msgstr "그룹에 가입하지 못했습니다."
 
 #. TRANS: Exception thrown providing an invalid profile ID.
 #. TRANS: %s is the invalid profile ID.
-#: classes/Group_member.php:85
 #, php-format
 msgid "Profile ID %s is invalid."
 msgstr ""
 
 #. TRANS: Exception thrown providing an invalid group ID.
 #. TRANS: %s is the invalid group ID.
-#: classes/Group_member.php:98
 #, fuzzy, php-format
 msgid "Group ID %s is invalid."
 msgstr "사용자 저장 오류; 무효한 사용자"
 
 #. TRANS: Activity title.
-#: classes/Group_member.php:147 lib/joinform.php:114
 msgid "Join"
 msgstr "가입"
 
 #. TRANS: Success message for subscribe to group attempt through OStatus.
 #. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
-#: classes/Group_member.php:151
 #, php-format
 msgid "%1$s has joined group %2$s."
 msgstr ""
 
 #. TRANS: Server exception thrown when updating a local group fails.
-#: classes/Local_group.php:42
 #, fuzzy
 msgid "Could not update local group."
 msgstr "그룹을 업데이트 할 수 없습니다."
 
 #. TRANS: Exception thrown when trying creating a login token failed.
 #. TRANS: %s is the user nickname for which token creation failed.
-#: classes/Login_token.php:78
 #, php-format
 msgid "Could not create login token for %s"
 msgstr "%s 에 대한 로그인 토큰을 만들 수 없습니다."
 
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
-#: classes/Memcached_DataObject.php:556
 msgid "No database name or DSN found anywhere."
 msgstr ""
 
 #. TRANS: Client exception thrown when a user tries to send a direct message while being banned from sending them.
-#: classes/Message.php:45
 #, fuzzy
 msgid "You are banned from sending direct messages."
 msgstr "직접 메시지 보내기 오류."
 
 #. TRANS: Message given when a message could not be stored on the server.
-#: classes/Message.php:69
 msgid "Could not insert message."
 msgstr "메시지를 삽입할 수 없습니다."
 
 #. TRANS: Message given when a message could not be updated on the server.
-#: classes/Message.php:80
 msgid "Could not update message with new URI."
 msgstr "새 URI와 함께 메시지를 업데이트할 수 없습니다."
 
 #. TRANS: Server exception thrown when a user profile for a notice cannot be found.
 #. TRANS: %1$d is a profile ID (number), %2$d is a notice ID (number).
-#: classes/Notice.php:98
 #, php-format
 msgid "No such profile (%1$d) for notice (%2$d)."
 msgstr ""
 
 #. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:199
 #, php-format
 msgid "Database error inserting hashtag: %s"
 msgstr "OAuth 응용 프로그램 사용자 추가 중 데이터베이스 오류"
 
 #. TRANS: Client exception thrown if a notice contains too many characters.
-#: classes/Notice.php:279
 #, fuzzy
 msgid "Problem saving notice. Too long."
 msgstr "통지를 저장하는데 문제가 발생했습니다."
 
 #. TRANS: Client exception thrown when trying to save a notice for an unknown user.
-#: classes/Notice.php:284
 msgid "Problem saving notice. Unknown user."
 msgstr "게시글 저장문제. 알려지지않은 회원"
 
 #. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
-#: classes/Notice.php:290
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
@@ -6996,7 +5760,6 @@ msgstr ""
 "해보세요."
 
 #. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
-#: classes/Notice.php:297
 #, fuzzy
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
@@ -7006,43 +5769,36 @@ msgstr ""
 "해보세요."
 
 #. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:305
 msgid "You are banned from posting notices on this site."
 msgstr "이 사이트에 게시글 포스팅으로부터 당신은 금지되었습니다."
 
 #. TRANS: Server exception thrown when a notice cannot be saved.
 #. TRANS: Server exception thrown when a notice cannot be updated.
-#: classes/Notice.php:372 classes/Notice.php:399
 msgid "Problem saving notice."
 msgstr "통지를 저장하는데 문제가 발생했습니다."
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:929
 msgid "Bad type provided to saveKnownGroups."
 msgstr ""
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:1028
 #, fuzzy
 msgid "Problem saving group inbox."
 msgstr "통지를 저장하는데 문제가 발생했습니다."
 
 #. TRANS: Server exception thrown when a reply cannot be saved.
 #. TRANS: %1$d is a notice ID, %2$d is the ID of the mentioned user.
-#: classes/Notice.php:1144
 #, fuzzy, php-format
 msgid "Could not save reply for %1$d, %2$d."
 msgstr "새 그룹을 만들 수 없습니다."
 
 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1663
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
 
 #. TRANS: Full name of a profile or group followed by nickname in parens
-#: classes/Profile.php:172 classes/User_group.php:242
 #, fuzzy, php-format
 msgctxt "FANCYNAME"
 msgid "%1$s (%2$s)"
@@ -7050,266 +5806,211 @@ msgstr "%1$s (%2$s)"
 
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:779
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:788
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
 
 #. TRANS: Exception thrown when a right for a non-existing user profile is checked.
-#: classes/Remote_profile.php:54
 msgid "Missing profile."
 msgstr "프로파일이 없습니다."
 
 #. TRANS: Exception thrown when a tag cannot be saved.
-#: classes/Status_network.php:338
 msgid "Unable to save tag."
 msgstr "태그를 저장할 수 없습니다."
 
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#: classes/Subscription.php:77 lib/oauthstore.php:482
 msgid "You have been banned from subscribing."
 msgstr "귀하는 구독이 금지되었습니다."
 
 #. TRANS: Exception thrown when trying to subscribe while already subscribed.
-#: classes/Subscription.php:82
 #, fuzzy
 msgid "Already subscribed!"
 msgstr "구독하고 있지 않습니다!"
 
 #. TRANS: Exception thrown when trying to subscribe to a user who has blocked the subscribing user.
-#: classes/Subscription.php:87
 msgid "User has blocked you."
 msgstr "사용자가 귀하를 차단했습니다."
 
 #. TRANS: Exception thrown when trying to unsibscribe without a subscription.
-#: classes/Subscription.php:176
 #, fuzzy
 msgid "Not subscribed!"
 msgstr "구독하고 있지 않습니다!"
 
 #. TRANS: Exception thrown when trying to unsubscribe a user from themselves.
-#: classes/Subscription.php:183
 msgid "Could not delete self-subscription."
 msgstr "구독을 저장할 수 없습니다."
 
 #. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
-#: classes/Subscription.php:211
 msgid "Could not delete subscription OMB token."
 msgstr "구독을 저장할 수 없습니다."
 
 #. TRANS: Exception thrown when a subscription could not be deleted on the server.
-#: classes/Subscription.php:223
 msgid "Could not delete subscription."
 msgstr "구독을 저장할 수 없습니다."
 
 #. TRANS: Activity tile when subscribing to another person.
-#: classes/Subscription.php:265
 msgid "Follow"
 msgstr "팔로우"
 
 #. TRANS: Notification given when one person starts following another.
 #. TRANS: %1$s is the subscriber, %2$s is the subscribed.
-#: classes/Subscription.php:268
 #, fuzzy, php-format
 msgid "%1$s is now following %2$s."
 msgstr "%1$s님이 귀하의 알림 메시지를 %2$s에서 듣고 있습니다."
 
 #. TRANS: Notice given on user registration.
 #. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:390
 #, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr "%s에 답신"
 
 #. TRANS: Server exception.
-#: classes/User.php:923
 msgid "No single user defined for single-user mode."
 msgstr ""
 
 #. TRANS: Server exception.
-#: classes/User.php:927
 msgid "Single-user mode code called when not enabled."
 msgstr ""
 
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:522
 msgid "Could not create group."
 msgstr "새 그룹을 만들 수 없습니다."
 
 #. TRANS: Server exception thrown when updating a group URI failed.
-#: classes/User_group.php:532
 msgid "Could not set group URI."
 msgstr "새 그룹을 만들 수 없습니다."
 
 #. TRANS: Server exception thrown when setting group membership failed.
-#: classes/User_group.php:555
 msgid "Could not set group membership."
 msgstr "그룹 맴버십을 세팅할 수 없습니다."
 
 #. TRANS: Server exception thrown when saving local group information failed.
-#: classes/User_group.php:570
 msgid "Could not save local group info."
 msgstr "새 그룹을 만들 수 없습니다."
 
 #. TRANS: Exception thrown when an account could not be located when it should be moved.
 #. TRANS: %s is the remote site.
-#: lib/accountmover.php:65
 #, fuzzy, php-format
 msgid "Cannot locate account %s."
 msgstr "이용자를 업데이트 할 수 없습니다."
 
 #. TRANS: Exception thrown when a service document could not be located account move.
 #. TRANS: %s is the remote site.
-#: lib/accountmover.php:106
 #, php-format
 msgid "Cannot find XRD for %s."
 msgstr ""
 
 #. TRANS: Exception thrown when an account could not be located when it should be moved.
 #. TRANS: %s is the remote site.
-#: lib/accountmover.php:131
 #, php-format
 msgid "No AtomPub API service for %s."
 msgstr ""
 
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: lib/action.php:161
 #, php-format
 msgid "%1$s - %2$s"
 msgstr "%1$s - %2$s"
 
 #. TRANS: Page title for a page without a title set.
-#: lib/action.php:177
 msgid "Untitled page"
 msgstr "제목없는 페이지"
 
 #. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.
-#: lib/action.php:325
 msgctxt "TOOLTIP"
 msgid "Show more"
 msgstr ""
 
 #. TRANS: Inline reply form submit button: submits a reply comment.
-#: lib/action.php:328
 #, fuzzy
 msgctxt "BUTTON"
-msgid "Comment"
-msgstr "만족하는"
+msgid "Reply"
+msgstr "답장하기"
 
 #. TRANS: Placeholder text for inline reply form. Clicking in this box will turn it into a mini notice form.
-#: lib/action.php:331
-msgid "Add a comment..."
+msgid "Write a reply..."
 msgstr ""
 
-#: lib/action.php:559 lib/personalgroupnav.php:99
-#, fuzzy
 msgid "Home"
 msgstr "홈페이지"
 
-#: lib/action.php:560
 #, fuzzy
 msgid "Friends timeline"
 msgstr "%s 타임라인"
 
-#: lib/action.php:566
 #, fuzzy
 msgid "Your profile"
 msgstr "그룹 프로필"
 
-#: lib/action.php:570 lib/action.php:593 lib/publicgroupnav.php:78
 msgid "Public"
 msgstr "공개"
 
-#: lib/action.php:571 lib/action.php:594
 #, fuzzy
 msgid "Everyone on this site"
 msgstr "이 사이트에 있는 사람 찾기"
 
-#: lib/action.php:575
-#, fuzzy
 msgid "Settings"
 msgstr "메일 설정"
 
-#: lib/action.php:576
 #, fuzzy
 msgid "Change your personal settings"
 msgstr "프로필 세팅 바꾸기"
 
-#: lib/action.php:582
 #, fuzzy
 msgid "Site configuration"
 msgstr "메일 주소 확인"
 
-#: lib/action.php:587
-#, fuzzy
 msgid "Logout"
 msgstr "로그아웃"
 
-#: lib/action.php:588
-#, fuzzy
 msgid "Logout from the site"
 msgstr "이 사이트에서 로그아웃"
 
-#: lib/action.php:599
-#, fuzzy
 msgid "Login to the site"
 msgstr "이 사이트에 로그인"
 
-#: lib/action.php:606
-#, fuzzy
 msgid "Search"
 msgstr "검색"
 
-#: lib/action.php:607
 #, fuzzy
 msgid "Search the site"
 msgstr "검색 도움말"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:864
 msgid "Help"
 msgstr "도움말"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:867
 msgid "About"
 msgstr "정보"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:870
 msgid "FAQ"
 msgstr "자주 묻는 질문"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:875
 msgid "TOS"
 msgstr "서비스 약관"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:879
 msgid "Privacy"
 msgstr "개인정보 취급방침"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:882
 msgid "Source"
 msgstr "소스 코드"
 
 #. TRANS: Secondary navigation menu option leading to e-mail contact information on the
 #. TRANS: StatusNet site, where to report bugs, ...
-#: lib/action.php:889
 msgid "Contact"
 msgstr "연락하기"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:892
 msgid "Badge"
 msgstr "배지"
 
@@ -7317,7 +6018,6 @@ msgstr "배지"
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:921
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7327,7 +6027,6 @@ msgstr ""
 "공하는 마이크로블로깅서비스입니다."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:924
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** 는 마이크로블로깅서비스입니다."
@@ -7336,7 +6035,6 @@ msgstr "**%%site.name%%** 는 마이크로블로깅서비스입니다."
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:931
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7349,107 +6047,89 @@ msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:949
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr "%1$s의 컨텐츠와 데이터는 외부 유출을 금지합니다."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:956
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr "컨텐츠와 데이터의 저작권은 %1$s의 소유입니다. All rights reserved."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:960
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 "컨텐츠와 데이터의 저작권은 각 이용자의 소유입니다. All rights reserved."
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:992
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr "%1$s의 모든 컨텐츠와 데이터는 %2$s 라이선스에 따라 이용할 수 있습니다."
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1335
 msgid "After"
 msgstr "뒷 페이지"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1345
 msgid "Before"
 msgstr "앞 페이지"
 
 #. TRANS: Client exception thrown when a feed instance is a DOMDocument.
-#: lib/activity.php:125
 msgid "Expecting a root feed element but got a whole XML document."
 msgstr ""
 
 #. TRANS: Client exception thrown when using an unknown verb for the activity importer.
-#: lib/activityimporter.php:81
 #, fuzzy, php-format
 msgid "Unknown verb: \"%s\"."
 msgstr "알 수 없는 종류의 파일입니다"
 
 #. TRANS: Client exception thrown when trying to force a subscription for an untrusted user.
-#: lib/activityimporter.php:107
 msgid "Cannot force subscription for untrusted user."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to for a remote user to subscribe.
-#: lib/activityimporter.php:117
 #, fuzzy
 msgid "Cannot force remote user to subscribe."
 msgstr "구독하려는 사용자의 이름을 지정하십시오."
 
 #. TRANS: Client exception thrown when trying to subscribe to an unknown profile.
-#: lib/activityimporter.php:132
 #, fuzzy
 msgid "Unknown profile."
 msgstr "알 수 없는 종류의 파일입니다"
 
 #. TRANS: Client exception thrown when trying to import an event not related to the importing user.
-#: lib/activityimporter.php:138
 msgid "This activity seems unrelated to our user."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to join a remote group that is not a group.
-#: lib/activityimporter.php:154
 msgid "Remote profile is not a group!"
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to join a group the importing user is already a member of.
-#: lib/activityimporter.php:163
 #, fuzzy
 msgid "User is already a member of this group."
 msgstr "당신은 이미 이 그룹의 멤버입니다."
 
 #. TRANS: Client exception thrown when trying to import a notice by another user.
 #. TRANS: %1$s is the source URI of the notice, %2$s is the URI of the author.
-#: lib/activityimporter.php:201
 #, php-format
 msgid "Already know about notice %1$s and  it has a different author %2$s."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to overwrite the author information for a non-trusted user during import.
-#: lib/activityimporter.php:207
 msgid "Not overwriting author info for non-trusted user."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to import a notice without content.
 #. TRANS: %s is the notice URI.
-#: lib/activityimporter.php:223
 #, fuzzy, php-format
 msgid "No content for notice %s."
 msgstr "통지들의 내용 찾기"
 
-#: lib/activitymover.php:84
 #, fuzzy, php-format
 msgid "No such user %s."
 msgstr "해당하는 이용자 없음"
@@ -7460,431 +6140,352 @@ msgstr "해당하는 이용자 없음"
 #. TRANS: %1$s is a URL, %2$s is the status, %s$s is the fail reason.
 #. TRANS: Exception thrown when post to collection fails with a status that is not handled.
 #. TRANS: %1$s is a URL, %2$s is the status, %s$s is the fail reason.
-#: lib/activitysink.php:163 lib/activitysink.php:167 lib/activitysink.php:172
 #, fuzzy, php-format
 msgctxt "URLSTATUSREASON"
 msgid "%1$s %2$s %3$s"
 msgstr "%1$s - %2$s"
 
 #. TRANS: Client exception thrown when there is no source attribute.
-#: lib/activityutils.php:200
 msgid "Can't handle remote content yet."
 msgstr ""
 
 #. TRANS: Client exception thrown when there embedded XML content is found that cannot be processed yet.
-#: lib/activityutils.php:237
 msgid "Can't handle embedded XML content yet."
 msgstr ""
 
 #. TRANS: Client exception thrown when base64 encoded content is found that cannot be processed yet.
-#: lib/activityutils.php:242
 msgid "Can't handle embedded Base64 content yet."
 msgstr ""
 
 #. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights.
-#: lib/adminpanelaction.php:96
 msgid "You cannot make changes to this site."
 msgstr "이 사이트의 이용자에 대해 권한정지 할 수 없습니다."
 
 #. TRANS: Client error message throw when a certain panel's settings cannot be changed.
-#: lib/adminpanelaction.php:108
 #, fuzzy
 msgid "Changes to that panel are not allowed."
 msgstr "가입이 허용되지 않습니다."
 
 #. TRANS: Client error message.
-#: lib/adminpanelaction.php:222
 #, fuzzy
 msgid "showForm() not implemented."
 msgstr "명령이 아직 실행되지 않았습니다."
 
 #. TRANS: Client error message
-#: lib/adminpanelaction.php:250
 #, fuzzy
 msgid "saveSettings() not implemented."
 msgstr "명령이 아직 실행되지 않았습니다."
 
 #. TRANS: Client error message thrown if design settings could not be deleted in
 #. TRANS: the admin panel Design.
-#: lib/adminpanelaction.php:274
 msgid "Unable to delete design setting."
 msgstr "디자인 설정을 저장할 수 없습니다."
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:337
 msgid "Basic site configuration"
 msgstr "메일 주소 확인"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:339
 msgctxt "MENU"
 msgid "Site"
 msgstr "사이트"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:345
 msgid "Design configuration"
 msgstr "메일 주소 확인"
 
 #. TRANS: Menu item for site administration
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/adminpanelaction.php:347 lib/groupnav.php:135
 msgctxt "MENU"
 msgid "Design"
 msgstr "디자인"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:353
 msgid "User configuration"
 msgstr "메일 주소 확인"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:110
 msgid "User"
 msgstr "사용자"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:361
 msgid "Access configuration"
 msgstr "메일 주소 확인"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:369
 msgid "Paths configuration"
 msgstr "메일 주소 확인"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:377
 msgid "Sessions configuration"
 msgstr "메일 주소 확인"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:385
 msgid "Edit site notice"
 msgstr "사이트 공지 편집"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:387
 msgid "Site notice"
 msgstr "사이트 공지"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:393
 msgid "Snapshots configuration"
 msgstr "메일 주소 확인"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:401
 msgid "Set site license"
 msgstr ""
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:409
 #, fuzzy
 msgid "Plugins configuration"
 msgstr "메일 주소 확인"
 
 #. TRANS: Client error 401.
-#: lib/apiauth.php:111
 msgid "API resource requires read-write access, but you only have read access."
 msgstr ""
 
 #. TRANS: OAuth exception thrown when no application is found for a given consumer key.
-#: lib/apiauth.php:177
 msgid "No application for that consumer key."
 msgstr ""
 
-#: lib/apiauth.php:202 lib/apiauth.php:284
 msgid "Not allowed to use API."
 msgstr ""
 
 #. TRANS: OAuth exception given when an incorrect access token was given for a user.
-#: lib/apiauth.php:225
 msgid "Bad access token."
 msgstr ""
 
 #. TRANS: OAuth exception given when no user was found for a given token (no token was found).
-#: lib/apiauth.php:230
 msgid "No user for that token."
 msgstr ""
 
 #. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel".
 #. TRANS: Client error thrown when authentication fails.
-#: lib/apiauth.php:272 lib/apiauth.php:302
 msgid "Could not authenticate you."
 msgstr ""
 
 #. TRANS: Server error displayed when trying to create an anynymous OAuth consumer.
-#: lib/apioauthstore.php:45
 #, fuzzy
 msgid "Could not create anonymous consumer."
 msgstr "관심소식을 생성할 수 없습니다."
 
 #. TRANS: Server error displayed when trying to create an anynymous OAuth application.
-#: lib/apioauthstore.php:69
 #, fuzzy
 msgid "Could not create anonymous OAuth application."
 msgstr "관심소식을 생성할 수 없습니다."
 
 #. TRANS: Exception thrown when no token association could be found.
-#: lib/apioauthstore.php:151
 msgid ""
 "Could not find a profile and application associated with the request token."
 msgstr ""
 
 #. TRANS: Exception thrown when no access token can be issued.
-#: lib/apioauthstore.php:209
 #, fuzzy
 msgid "Could not issue access token."
 msgstr "메시지를 삽입할 수 없습니다."
 
-#: lib/apioauthstore.php:317
 msgid "Database error inserting OAuth application user."
 msgstr "OAuth 응용 프로그램 사용자 추가 중 데이터베이스 오류"
 
-#: lib/apioauthstore.php:345
 #, fuzzy
 msgid "Database error updating OAuth application user."
 msgstr "OAuth 응용 프로그램 사용자 추가 중 데이터베이스 오류"
 
 #. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
-#: lib/apioauthstore.php:371
 msgid "Tried to revoke unknown token."
 msgstr ""
 
 #. TRANS: Exception thrown when an attempt is made to remove a revoked token.
-#: lib/apioauthstore.php:376
 msgid "Failed to delete revoked token."
 msgstr ""
 
 #. TRANS: Form input field label for application icon.
-#: lib/applicationeditform.php:177
 msgid "Icon"
 msgstr "아이콘"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:182
 msgid "Icon for this application"
 msgstr "이 응용프로그램 삭제 않기"
 
 #. TRANS: Form input field instructions.
 #. TRANS: %d is the number of available characters for the description.
-#: lib/applicationeditform.php:201
 #, fuzzy, php-format
 msgid "Describe your application in %d character"
 msgid_plural "Describe your application in %d characters"
 msgstr[0] "응용프로그램 삭제"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:205
 msgid "Describe your application"
 msgstr "응용프로그램 삭제"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:216
 #, fuzzy
 msgid "URL of the homepage of this application"
 msgstr "그룹 혹은 토픽의 홈페이지나 블로그 URL"
 
 #. TRANS: Form input field label.
-#: lib/applicationeditform.php:218
 msgid "Source URL"
 msgstr "소스 코드 URL"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:225
 #, fuzzy
 msgid "Organization responsible for this application"
 msgstr "이 응용프로그램 삭제 않기"
 
 #. TRANS: Form input field label.
-#: lib/applicationeditform.php:227
 msgid "Organization"
 msgstr "기관 이름이 필요합니다."
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:234
 #, fuzzy
 msgid "URL for the homepage of the organization"
 msgstr "그룹 혹은 토픽의 홈페이지나 블로그 URL"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:243
 msgid "URL to redirect to after authentication"
 msgstr ""
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:271
 msgid "Browser"
 msgstr "브라우저"
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:288
 msgid "Desktop"
 msgstr "데스크톱"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:290
 msgid "Type of application, browser or desktop"
 msgstr ""
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:314
 msgid "Read-only"
 msgstr "읽기 전용"
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:334
 msgid "Read-write"
 msgstr "읽기 쓰기"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:336
 msgid "Default access for this application: read-only, or read-write"
 msgstr ""
 
 #. TRANS: Submit button title.
-#: lib/applicationeditform.php:353
 msgid "Cancel"
 msgstr "취소"
 
-#: lib/applicationlist.php:247
 msgid " by "
 msgstr ""
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:260
 msgid "read-write"
 msgstr "읽기 쓰기"
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:262
 msgid "read-only"
 msgstr "읽기 전용"
 
 #. TRANS: Used in application list. %1$s is a modified date, %2$s is access type ("read-write" or "read-only")
-#: lib/applicationlist.php:268
 #, php-format
 msgid "Approved %1$s - \"%2$s\" access."
 msgstr ""
 
 #. TRANS: Access token in the application list.
 #. TRANS: %s are the first 7 characters of the access token.
-#: lib/applicationlist.php:282
 #, php-format
 msgid "Access token starting with: %s"
 msgstr ""
 
 #. TRANS: Button label
-#: lib/applicationlist.php:298
 msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "제거"
 
-#: lib/atom10feed.php:113
 msgid "Author element must contain a name element."
 msgstr ""
 
 #. TRANS: Server exception thrown when using the method setActivitySubject() in the class Atom10Feed.
-#: lib/atom10feed.php:160
 #, fuzzy
 msgid "Do not use this method!"
 msgstr "이 통지를 지울 수 없습니다."
 
 #. TRANS: Title.
-#: lib/attachmentnoticesection.php:67
 msgid "Notices where this attachment appears"
 msgstr ""
 
 #. TRANS: Title.
-#: lib/attachmenttagcloudsection.php:48
 #, fuzzy
 msgid "Tags for this attachment"
 msgstr "해당하는 첨부파일이 없습니다."
 
 #. TRANS: Exception thrown when a password change fails.
-#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:227
 #, fuzzy
 msgid "Password changing failed."
 msgstr "비밀번호 변경"
 
 #. TRANS: Exception thrown when a password change attempt fails because it is not allowed.
-#: lib/authenticationplugin.php:238
 #, fuzzy
 msgid "Password changing is not allowed."
 msgstr "비밀번호 변경"
 
 #. TRANS: Title for the form to block a user.
-#: lib/blockform.php:68
 msgid "Block"
 msgstr "차단하기"
 
 #. TRANS: Description of the form to block a user.
-#: lib/blockform.php:79
 msgid "Block this user"
 msgstr "이 사용자 차단하기"
 
 #. TRANS: Title for command results.
-#: lib/channel.php:104 lib/channel.php:125
 msgid "Command results"
 msgstr "실행결과"
 
 #. TRANS: Title for command results.
-#: lib/channel.php:138
 #, fuzzy
 msgid "AJAX error"
 msgstr "Ajax 에러입니다."
 
 #. TRANS: E-mail subject when a command has completed.
-#: lib/channel.php:177 lib/mailhandler.php:143
 msgid "Command complete"
 msgstr "실행 완료"
 
 #. TRANS: E-mail subject when a command has failed.
-#: lib/channel.php:188
 msgid "Command failed"
 msgstr "실행 실패"
 
 #. TRANS: Command exception text shown when a notice ID is requested that does not exist.
-#: lib/command.php:82 lib/command.php:106
 #, fuzzy
 msgid "Notice with that id does not exist."
 msgstr "해당 id의 프로필이 없습니다."
 
 #. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
 #. TRANS: Error text shown when a last user notice is requested and it does not exist.
-#: lib/command.php:99 lib/command.php:642
 #, fuzzy
 msgid "User has no last notice."
 msgstr "이용자의 지속적인 게시글이 없습니다."
 
 #. TRANS: Message given requesting a profile for a non-existing user.
 #. TRANS: %s is the nickname of the user for which the profile could not be found.
-#: lib/command.php:128
 #, fuzzy, php-format
 msgid "Could not find a user with nickname %s."
 msgstr "이 이메일 주소로 사용자를 업데이트 할 수 없습니다."
 
 #. TRANS: Message given getting a non-existing user.
 #. TRANS: %s is the nickname of the user that could not be found.
-#: lib/command.php:148
 #, php-format
 msgid "Could not find a local user with nickname %s."
 msgstr ""
 
 #. TRANS: Error text shown when an unimplemented command is given.
-#: lib/command.php:183
 msgid "Sorry, this command is not yet implemented."
 msgstr "죄송합니다. 이 명령은 아직 실행되지 않았습니다."
 
 #. TRANS: Command exception text shown when a user tries to nudge themselves.
-#: lib/command.php:229
 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr ""
 
 #. TRANS: Message given having nudged another user.
 #. TRANS: %s is the nickname of the user that was nudged.
-#: lib/command.php:238
 #, fuzzy, php-format
 msgid "Nudge sent to %s."
 msgstr "찔러 보기를 보냈습니다."
@@ -7893,7 +6494,6 @@ msgstr "찔러 보기를 보냈습니다."
 #. TRANS: %1$s is the number of other user the user is subscribed to.
 #. TRANS: %2$s is the number of users that are subscribed to the user.
 #. TRANS: %3$s is the number of notices the user has sent.
-#: lib/command.php:268
 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"
@@ -7902,40 +6502,34 @@ msgid ""
 msgstr ""
 
 #. TRANS: Error message text shown when a favorite could not be set because it has already been favorited.
-#: lib/command.php:298
 #, fuzzy
 msgid "Could not create favorite: already favorited."
 msgstr "관심소식을 생성할 수 없습니다."
 
 #. TRANS: Text shown when a notice has been marked as favourite successfully.
-#: lib/command.php:324
 msgid "Notice marked as fave."
 msgstr "게시글이 좋아하는 글로 지정되었습니다."
 
 #. TRANS: Message given having added a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:369
 #, php-format
 msgid "%1$s joined group %2$s."
 msgstr ""
 
 #. TRANS: Message given having removed a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:417
 #, php-format
 msgid "%1$s left group %2$s."
 msgstr ""
 
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: lib/command.php:438
 #, fuzzy, php-format
 msgctxt "WHOIS"
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
 
 #. TRANS: Whois output. %s is the full name of the queried user.
-#: lib/command.php:442
 #, php-format
 msgid "Fullname: %s"
 msgstr "전체이름: %s"
@@ -7943,7 +6537,6 @@ msgstr "전체이름: %s"
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a location.
-#: lib/command.php:446 lib/mail.php:275
 #, php-format
 msgid "Location: %s"
 msgstr "위치: %s"
@@ -7951,20 +6544,17 @@ msgstr "위치: %s"
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a homepage.
-#: lib/command.php:450 lib/mail.php:279
 #, php-format
 msgid "Homepage: %s"
 msgstr "홈페이지: %s"
 
 #. TRANS: Whois output. %s is the bio information of the queried user.
-#: lib/command.php:454
 #, php-format
 msgid "About: %s"
 msgstr "자기소개: %s"
 
 #. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).
 #. TRANS: %s is a remote profile.
-#: lib/command.php:483
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
@@ -7973,32 +6563,31 @@ msgstr ""
 
 #. TRANS: Message given if content is too long. %1$sd is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:500
 #, fuzzy, php-format
 msgid "Message too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
 msgstr[0] "당신이 보낸 메시지가 너무 길어요. 최대 140글자까지입니다."
 
+#. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
+msgid "You can't send a message to this user."
+msgstr "당신은 이 사용자에게 메시지를 보낼 수 없습니다."
+
 #. TRANS: Error text shown sending a direct message fails with an unknown reason.
-#: lib/command.php:528
 msgid "Error sending direct message."
 msgstr "직접 메시지 보내기 오류."
 
 #. TRANS: Message given having repeated a notice from another user.
 #. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:565
 #, fuzzy, php-format
 msgid "Notice from %s repeated."
 msgstr "게시글이 등록되었습니다."
 
 #. TRANS: Error text shown when repeating a notice fails with an unknown reason.
-#: lib/command.php:568
 msgid "Error repeating notice."
 msgstr "사용자 세팅 오류"
 
 #. TRANS: Message given if content of a notice for a reply is too long. %1$d is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:603
 #, fuzzy, php-format
 msgid "Notice too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Notice too long - maximum is %1$d characters, you sent %2$d."
@@ -8006,96 +6595,80 @@ msgstr[0] "당신이 보낸 메시지가 너무 길어요. 최대 140글자까
 
 #. TRANS: Text shown having sent a reply to a notice successfully.
 #. TRANS: %s is the nickname of the user of the notice the reply was sent to.
-#: lib/command.php:616
 #, fuzzy, php-format
 msgid "Reply to %s sent."
 msgstr "이 게시글에 대해 답장하기"
 
 #. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
-#: lib/command.php:619
 msgid "Error saving notice."
 msgstr "사용자 세팅 오류"
 
 #. TRANS: Error text shown when no username was provided when issuing a subscribe command.
-#: lib/command.php:666
 #, fuzzy
 msgid "Specify the name of the user to subscribe to."
 msgstr "구독하려는 사용자의 이름을 지정하십시오."
 
 #. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
-#: lib/command.php:675
 #, fuzzy
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "당신은 이 프로필에 구독되지 않고있습니다."
 
 #. TRANS: Text shown after having subscribed to another user successfully.
 #. TRANS: %s is the name of the user the subscription was requested for.
-#: lib/command.php:683
 #, php-format
 msgid "Subscribed to %s."
 msgstr ""
 
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.
-#: lib/command.php:704 lib/command.php:815
 #, fuzzy
 msgid "Specify the name of the user to unsubscribe from."
 msgstr "구독을 해제하려는 사용자의 이름을 지정하십시오."
 
 #. TRANS: Text shown after having unsubscribed from another user successfully.
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:715
 #, php-format
 msgid "Unsubscribed from %s."
 msgstr ""
 
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
-#: lib/command.php:735 lib/command.php:761
 msgid "Command not yet implemented."
 msgstr "명령이 아직 실행되지 않았습니다."
 
 #. TRANS: Text shown when issuing the command "off" successfully.
-#: lib/command.php:739
 msgid "Notification off."
 msgstr "알림끄기."
 
 #. TRANS: Error text shown when the command "off" fails for an unknown reason.
-#: lib/command.php:742
 msgid "Can't turn off notification."
 msgstr "알림을 끌 수 없습니다."
 
 #. TRANS: Text shown when issuing the command "on" successfully.
-#: lib/command.php:765
 msgid "Notification on."
 msgstr "알림이 켜졌습니다."
 
 #. TRANS: Error text shown when the command "on" fails for an unknown reason.
-#: lib/command.php:768
 msgid "Can't turn on notification."
 msgstr "알림을 켤 수 없습니다."
 
 #. TRANS: Error text shown when issuing the login command while login is disabled.
-#: lib/command.php:782
 msgid "Login command is disabled."
 msgstr ""
 
 #. TRANS: Text shown after issuing the login command successfully.
 #. TRANS: %s is a logon link..
-#: lib/command.php:795
 #, php-format
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
 
 #. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:824
 #, php-format
 msgid "Unsubscribed %s."
 msgstr ""
 
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
-#: lib/command.php:842
 #, fuzzy
 msgid "You are not subscribed to anyone."
 msgstr "당신은 이 프로필에 구독되지 않고있습니다."
@@ -8103,14 +6676,12 @@ msgstr "당신은 이 프로필에 구독되지 않고있습니다."
 #. TRANS: Text shown after requesting other users a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
-#: lib/command.php:847
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "당신은 다음 사용자를 이미 구독하고 있습니다."
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user
 #. TRANS: (followers) without having any subscribers.
-#: lib/command.php:869
 #, fuzzy
 msgid "No one is subscribed to you."
 msgstr "다른 사람을 구독 하실 수 없습니다."
@@ -8118,14 +6689,12 @@ msgstr "다른 사람을 구독 하실 수 없습니다."
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
-#: lib/command.php:874
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "다른 사람을 구독 하실 수 없습니다."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to without having
 #. TRANS: any group subscriptions.
-#: lib/command.php:896
 #, fuzzy
 msgid "You are not a member of any groups."
 msgstr "당신은 해당 그룹의 멤버가 아닙니다."
@@ -8133,13 +6702,11 @@ msgstr "당신은 해당 그룹의 멤버가 아닙니다."
 #. TRANS: Text shown after requesting groups a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
-#: lib/command.php:901
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "당신은 해당 그룹의 멤버가 아닙니다."
 
 #. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-#: lib/command.php:916
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -8182,121 +6749,100 @@ msgid ""
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:36
 #, fuzzy
 msgid "No configuration file found."
 msgstr "확인 코드가 없습니다."
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:39
 #, fuzzy
 msgid "I looked for configuration files in the following places:"
 msgstr "다음 사람들에게 초대권을 보냈습니다:"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:42
 msgid "You may wish to run the installer to fix this."
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:46
 msgid "Go to the installer."
 msgstr "이 사이트에 로그인"
 
-#: lib/dberroraction.php:59
 msgid "Database error"
 msgstr "데이터베이스 오류"
 
 #. TRANS: Description of form for deleting a user.
-#: lib/deleteuserform.php:75
 msgid "Delete this user"
 msgstr "이 사용자 삭제"
 
-#: lib/designform.php:114
 #, fuzzy
 msgid "Change design"
 msgstr "디자인 저장"
 
 #. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: lib/designform.php:131
 msgid "Change colours"
 msgstr "색상 변경"
 
 #. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: lib/designform.php:138
 msgid "Use defaults"
 msgstr "기본값 사용"
 
 #. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: lib/designform.php:140
 msgid "Restore default designs"
 msgstr ""
 
 #. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: lib/designform.php:148
 msgid "Reset back to default"
 msgstr ""
 
 #. TRANS: Label in form on profile design page.
 #. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
-#: lib/designform.php:158
 msgid "Upload file"
 msgstr "실행 실패"
 
 #. TRANS: Instructions for form on profile design page.
-#: lib/designform.php:163
 #, fuzzy
 msgid ""
 "You can upload your personal background image. The maximum file size is 2Mb."
 msgstr "개인 아바타를 올릴 수 있습니다. 최대 파일 크기는 2MB입니다."
 
 #. TRANS: Radio button on profile design page that will enable use of the uploaded profile image.
-#: lib/designform.php:194
 #, fuzzy
 msgctxt "RADIO"
 msgid "On"
 msgstr "켜기"
 
 #. TRANS: Radio button on profile design page that will disable use of the uploaded profile image.
-#: lib/designform.php:211
 #, fuzzy
 msgctxt "RADIO"
 msgid "Off"
 msgstr "끄기"
 
 #. TRANS: Title for button on profile design page to save settings.
-#: lib/designform.php:322
 msgid "Save design"
 msgstr "디자인 저장"
 
 #. TRANS: Error message displayed if design settings could not be saved.
 #. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
-#: lib/designsettings.php:216 lib/designsettings.php:238
 msgid "Couldn't update your design."
 msgstr "디자인을 수정할 수 없습니다."
 
 #. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
-#: lib/designsettings.php:244
 #, fuzzy
 msgid "Design defaults restored."
 msgstr "메일 설정이 저장되었습니다."
 
 #. TRANS: Exception. %s is an ID.
-#: lib/discovery.php:153
 #, fuzzy, php-format
 msgid "Unable to find services for %s."
 msgstr "다음 양식을 이용해 그룹을 편집하십시오."
 
 #. TRANS: Form legend for removing the favourite status for a favourite notice.
 #. TRANS: Title for button text for removing the favourite status for a favourite notice.
-#: lib/disfavorform.php:108 lib/disfavorform.php:140
 msgid "Disfavor this notice"
 msgstr "이 게시글 좋아하기 취소"
 
 #. TRANS: Button text for removing the favourite status for a favourite notice.
-#: lib/disfavorform.php:136
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Disfavor favorite"
@@ -8304,103 +6850,81 @@ msgstr "좋아하는글 취소"
 
 #. TRANS: Form legend for adding the favourite status to a notice.
 #. TRANS: Title for button text for adding the favourite status to a notice.
-#: lib/favorform.php:108 lib/favorform.php:139
 msgid "Favor this notice"
 msgstr "이 게시글을 좋아합니다."
 
 #. TRANS: Button text for adding the favourite status to a notice.
-#: lib/favorform.php:135
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Favor"
 msgstr "좋아합니다"
 
-#: lib/feed.php:84
 msgid "RSS 1.0"
 msgstr "RSS 1.0"
 
-#: lib/feed.php:86
 msgid "RSS 2.0"
 msgstr "RSS 2.0"
 
-#: lib/feed.php:88
 msgid "Atom"
 msgstr "Atom"
 
-#: lib/feed.php:90
 msgid "FOAF"
 msgstr "FOAF"
 
-#: lib/feedimporter.php:75
 #, fuzzy
 msgid "Not an atom feed."
 msgstr "모든 회원"
 
-#: lib/feedimporter.php:82
 msgid "No author in the feed."
 msgstr ""
 
-#: lib/feedimporter.php:89
 msgid "Can't import without a user."
 msgstr ""
 
 #. TRANS: Header for feed links (h2).
-#: lib/feedlist.php:66
 msgid "Feeds"
 msgstr ""
 
-#: lib/galleryaction.php:128
 msgid "All"
 msgstr "모든 것"
 
-#: lib/galleryaction.php:136
 #, fuzzy
 msgid "Select tag to filter"
 msgstr "통신 회사를 선택 하세요."
 
-#: lib/galleryaction.php:137
 msgid "Tag"
 msgstr "태그"
 
-#: lib/galleryaction.php:138
 msgid "Choose a tag to narrow list"
 msgstr "좁은 리스트에서 태그 선택하기"
 
-#: lib/galleryaction.php:140
 msgid "Go"
 msgstr "이동"
 
-#: lib/grantroleform.php:91
 #, php-format
 msgid "Grant this user the \"%s\" role"
 msgstr ""
 
-#: lib/groupeditform.php:147
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "1-64자 사이에 영소문자, 숫자로만 씁니다. 기호나 공백을 쓰면 안 됩니다."
 
-#: lib/groupeditform.php:156
 #, fuzzy
 msgid "URL of the homepage or blog of the group or topic."
 msgstr "그룹 혹은 토픽의 홈페이지나 블로그 URL"
 
-#: lib/groupeditform.php:161
 msgid "Describe the group or topic"
 msgstr "응용프로그램 삭제"
 
-#: lib/groupeditform.php:163
 #, fuzzy, php-format
 msgid "Describe the group or topic in %d character or less"
 msgid_plural "Describe the group or topic in %d characters or less"
 msgstr[0] "140글자로 그룹이나 토픽 설명하기"
 
-#: lib/groupeditform.php:175
 #, fuzzy
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\"."
 msgstr "그룹의 위치, \"시/군/구, 도, 국가\""
 
-#: lib/groupeditform.php:183
 #, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -8411,70 +6935,60 @@ msgid_plural ""
 msgstr[0] ""
 
 #. TRANS: Menu item in the group navigation page.
-#: lib/groupnav.php:86
 msgctxt "MENU"
 msgid "Group"
 msgstr "그룹"
 
 #. TRANS: Tooltip for menu item in the group navigation page.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:89
 #, php-format
 msgctxt "TOOLTIP"
 msgid "%s group"
 msgstr ""
 
 #. TRANS: Menu item in the group navigation page.
-#: lib/groupnav.php:95
 msgctxt "MENU"
 msgid "Members"
 msgstr "구성원"
 
 #. TRANS: Tooltip for menu item in the group navigation page.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:98
 #, php-format
 msgctxt "TOOLTIP"
 msgid "%s group members"
 msgstr ""
 
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/groupnav.php:108
 msgctxt "MENU"
 msgid "Blocked"
 msgstr ""
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:111
 #, php-format
 msgctxt "TOOLTIP"
 msgid "%s blocked users"
 msgstr ""
 
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "관리"
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:120
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Edit %s group properties"
 msgstr ""
 
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/groupnav.php:126
 msgctxt "MENU"
 msgid "Logo"
 msgstr "로고"
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:129
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Add or edit %s logo"
@@ -8482,89 +6996,74 @@ msgstr ""
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:138
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Add or edit %s design"
 msgstr ""
 
 #. TRANS: Title for groups with the most members section.
-#: lib/groupsbymemberssection.php:71
 msgid "Groups with most members"
 msgstr "가장 많은 회원수를 가진 그룹들"
 
 #. TRANS: Title for groups with the most posts section.
-#: lib/groupsbypostssection.php:71
 msgid "Groups with most posts"
 msgstr "가장 많은 게시글이 있는 그룹들"
 
 #. TRANS: Title for group tag cloud section.
 #. TRANS: %s is a group name.
-#: lib/grouptagcloudsection.php:57
 #, php-format
 msgid "Tags in %s group's notices"
 msgstr "%s 그룹 게시글의 태그"
 
 #. TRANS: Client exception 406
-#: lib/htmloutputter.php:104
 msgid "This page is not available in a media type you accept"
 msgstr "이 페이지는 귀하가 승인한 미디어 타입에서는 이용할 수 없습니다."
 
 #. TRANS: Exception thrown when trying to upload an unsupported image file format.
-#: lib/imagefile.php:73
 msgid "Unsupported image file format."
 msgstr "지원하지 않는 그림 파일 형식입니다."
 
 #. TRANS: Exception thrown when too large a file is uploaded.
 #. TRANS: %s is the maximum file size, for example "500b", "10kB" or "2MB".
-#: lib/imagefile.php:91
 #, fuzzy, php-format
 msgid "That file is too big. The maximum file size is %s."
 msgstr "당신그룹의 로고 이미지를 업로드할 수 있습니다."
 
 #. TRANS: Exception thrown when uploading an image and that action could not be completed.
-#: lib/imagefile.php:97
 msgid "Partial upload."
 msgstr "불완전한 업로드."
 
 #. TRANS: Exception thrown when uploading a file as image that is not an image or is a corrupt file.
-#: lib/imagefile.php:115
 msgid "Not an image or corrupt file."
 msgstr "그림 파일이 아니거나 손상된 파일 입니다."
 
 #. TRANS: Exception thrown during resize when image has been registered as present, but is no longer there.
-#: lib/imagefile.php:178
 msgid "Lost our file."
 msgstr "파일을 잃어버렸습니다."
 
 #. TRANS: Exception thrown when trying to resize an unknown file type.
 #. TRANS: Exception thrown when trying resize an unknown file type.
-#: lib/imagefile.php:216 lib/imagefile.php:257
 msgid "Unknown file type"
 msgstr "알 수 없는 종류의 파일입니다"
 
 #. TRANS: Number of megabytes. %d is the number.
-#: lib/imagefile.php:303
 #, fuzzy, php-format
 msgid "%dMB"
 msgid_plural "%dMB"
 msgstr[0] "MB"
 
 #. TRANS: Number of kilobytes. %d is the number.
-#: lib/imagefile.php:307
 #, fuzzy, php-format
 msgid "%dkB"
 msgid_plural "%dkB"
 msgstr[0] "kB"
 
 #. TRANS: Number of bytes. %d is the number.
-#: lib/imagefile.php:310
 #, php-format
 msgid "%dB"
 msgid_plural "%dB"
 msgstr[0] ""
 
-#: lib/implugin.php:262
 #, php-format
 msgid ""
 "User \"%s\" on %s has said that your %s screenname belongs to them. If "
@@ -8574,51 +7073,42 @@ msgid ""
 "message."
 msgstr ""
 
-#: lib/implugin.php:349
 #, php-format
 msgid "Unknown inbox source %d."
 msgstr ""
 
-#: lib/implugin.php:485
 #, fuzzy, php-format
 msgid "Message too long - maximum is %1$d characters, you sent %2$d."
 msgstr "당신이 보낸 메시지가 너무 길어요. 최대 140글자까지입니다."
 
-#: lib/leaveform.php:114
 msgid "Leave"
 msgstr "떠나기"
 
 #. TRANS: Menu item for logging in to the StatusNet site.
-#: lib/logingroupnav.php:77
 msgctxt "MENU"
 msgid "Login"
 msgstr "로그인"
 
 #. TRANS: Title for menu item for logging in to the StatusNet site.
-#: lib/logingroupnav.php:79
 msgid "Login with a username and password"
 msgstr "사용자 이름과 비밀번호로 로그인"
 
 #. TRANS: Menu item for registering with the StatusNet site.
-#: lib/logingroupnav.php:85
 msgctxt "MENU"
 msgid "Register"
 msgstr "등록"
 
 #. TRANS: Title for menu item for registering with the StatusNet site.
-#: lib/logingroupnav.php:87
 msgid "Sign up for a new account"
 msgstr "새 계정을 위한 회원가입"
 
 #. TRANS: Subject for address confirmation email.
-#: lib/mail.php:172
 msgid "Email address confirmation"
 msgstr "메일 주소 확인"
 
 #. TRANS: Body for address confirmation email.
 #. TRANS: %1$s is the addressed user's nickname, %2$s is the StatusNet sitename,
 #. TRANS: %3$s is the URL to confirm at.
-#: lib/mail.php:177
 #, php-format
 msgid ""
 "Hey, %1$s.\n"
@@ -8637,14 +7127,12 @@ msgstr ""
 
 #. TRANS: Subject of new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
-#: lib/mail.php:243
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1$s님이 귀하의 알림 메시지를 %2$s에서 듣고 있습니다."
 
 #. TRANS: This is a paragraph in a new-subscriber e-mail.
 #. TRANS: %s is a URL where the subscriber can be reported as abusive.
-#: lib/mail.php:250
 #, php-format
 msgid ""
 "If you believe this account is being used abusively, you can block them from "
@@ -8656,7 +7144,6 @@ msgstr ""
 #. TRANS: %3$s is the subscriber's profile URL, %4$s is the subscriber's location (or empty)
 #. TRANS: %5$s is the subscriber's homepage URL (or empty), %6%s is the subscriber's bio (or empty)
 #. TRANS: %7$s is a link to the addressed user's e-mail settings.
-#: lib/mail.php:260
 #, fuzzy, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -8677,14 +7164,12 @@ msgstr ""
 
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is biographical information.
-#: lib/mail.php:283
 #, php-format
 msgid "Bio: %s"
 msgstr "위치: %s"
 
 #. TRANS: Subject of notification mail for new posting email address.
 #. TRANS: %s is the StatusNet sitename.
-#: lib/mail.php:312
 #, php-format
 msgid "New email address for posting to %s"
 msgstr "%s에 포스팅 할 새로운 메일 주소"
@@ -8692,7 +7177,6 @@ msgstr "%s에 포스팅 할 새로운 메일 주소"
 #. TRANS: Body of notification mail for new posting email address.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is the e-mail address to send
 #. TRANS: to to post by e-mail, %3$s is a URL to more instructions.
-#: lib/mail.php:318
 #, fuzzy, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -8709,26 +7193,22 @@ msgstr ""
 
 #. TRANS: Subject line for SMS-by-email notification messages.
 #. TRANS: %s is the posting user's nickname.
-#: lib/mail.php:439
 #, php-format
 msgid "%s status"
 msgstr "%s 상태"
 
 #. TRANS: Subject line for SMS-by-email address confirmation message.
-#: lib/mail.php:465
 msgid "SMS confirmation"
 msgstr "SMS 인증"
 
 #. TRANS: Main body heading for SMS-by-email address confirmation message.
 #. TRANS: %s is the addressed user's nickname.
-#: lib/mail.php:469
 #, fuzzy, php-format
 msgid "%s: confirm you own this phone number with this code:"
 msgstr "이 전화 번호는 인증 대기중입니다."
 
 #. TRANS: Subject for 'nudge' notification email.
 #. TRANS: %s is the nudging user.
-#: lib/mail.php:490
 #, fuzzy, php-format
 msgid "You have been nudged by %s"
 msgstr "%s 사용자가 찔러 봤습니다."
@@ -8736,7 +7216,6 @@ msgstr "%s 사용자가 찔러 봤습니다."
 #. TRANS: Body for 'nudge' notification email.
 #. TRANS: %1$s is the nuding user's long name, $2$s is the nudging user's nickname,
 #. TRANS: %3$s is a URL to post notices at, %4$s is the StatusNet sitename.
-#: lib/mail.php:497
 #, php-format
 msgid ""
 "%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -8754,7 +7233,6 @@ msgstr ""
 
 #. TRANS: Subject for direct-message notification email.
 #. TRANS: %s is the sending user's nickname.
-#: lib/mail.php:544
 #, php-format
 msgid "New private message from %s"
 msgstr "%s로부터 새로운 비밀 메시지가 도착하였습니다."
@@ -8763,7 +7241,6 @@ msgstr "%s로부터 새로운 비밀 메시지가 도착하였습니다."
 #. TRANS: %1$s is the sending user's long name, %2$s is the sending user's nickname,
 #. TRANS: %3$s is the message content, %4$s a URL to the message,
 #. TRANS: %5$s is the StatusNet sitename.
-#: lib/mail.php:552
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -8784,7 +7261,6 @@ msgstr ""
 
 #. TRANS: Subject for favorite notification e-mail.
 #. TRANS: %1$s is the adding user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:604
 #, fuzzy, php-format
 msgid "%1$s (@%2$s) added your notice as a favorite"
 msgstr "누군가 내 글을 좋아하는 게시글로 추가했을 때, 메일을 보냅니다."
@@ -8794,7 +7270,6 @@ msgstr "누군가 내 글을 좋아하는 게시글로 추가했을 때, 메일
 #. TRANS: %3$s is a URL to the faved notice, %4$s is the faved notice text,
 #. TRANS: %5$s is a URL to all faves of the adding user, %6$s is the StatusNet sitename,
 #. TRANS: %7$s is the adding user's nickname.
-#: lib/mail.php:611
 #, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -8816,7 +7291,6 @@ msgid ""
 msgstr ""
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:669
 #, php-format
 msgid ""
 "The full conversation can be read here:\n"
@@ -8826,7 +7300,6 @@ msgstr ""
 
 #. TRANS: E-mail subject for notice notification.
 #. TRANS: %1$s is the sending user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:677
 #, fuzzy, php-format
 msgid "%1$s (@%2$s) sent a notice to your attention"
 msgstr "누군가 내 글을 좋아하는 게시글로 추가했을 때, 메일을 보냅니다."
@@ -8837,7 +7310,6 @@ msgstr "누군가 내 글을 좋아하는 게시글로 추가했을 때, 메일
 #. TRANS: %5$s is a URL to the full conversion if it exists (otherwise empty),
 #. TRANS: %6$s is a URL to reply to the notice, %7$s is a URL to all @-replied for the addressed user,
 #. TRANS: %8$s is a URL to the addressed user's e-mail settings, %9$s is the sender's nickname.
-#: lib/mail.php:685
 #, php-format
 msgid ""
 "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -8864,63 +7336,51 @@ msgid ""
 "P.S. You can turn off these email notifications here: %8$s\n"
 msgstr ""
 
-#: lib/mailbox.php:87
 msgid "Only the user can read their own mailboxes."
 msgstr "오직 해당 사용자만 자신의 메일박스를 열람할 수 있습니다."
 
-#: lib/mailbox.php:125
 msgid ""
 "You have no private messages. You can send private message to engage other "
 "users in conversation. People can send you messages for your eyes only."
 msgstr ""
 
-#: lib/mailhandler.php:37
 msgid "Could not parse message."
 msgstr "메시지를 분리할 수 없습니다."
 
-#: lib/mailhandler.php:42
 msgid "Not a registered user."
 msgstr "가입된 사용자가 아닙니다."
 
-#: lib/mailhandler.php:46
 msgid "Sorry, that is not your incoming email address."
 msgstr "죄송합니다. 귀하의 이메일이 아닙니다."
 
-#: lib/mailhandler.php:50
 msgid "Sorry, no incoming email allowed."
 msgstr "죄송합니다. 이메일이 허용되지 않습니다."
 
-#: lib/mailhandler.php:229
 #, fuzzy, php-format
 msgid "Unsupported message type: %s"
 msgstr "지원하지 않는 그림 파일 형식입니다."
 
 #. TRANS: Client exception thrown when a database error was thrown during a file upload operation.
-#: lib/mediafile.php:102 lib/mediafile.php:174
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
 
 #. TRANS: Client exception thrown when a file upload operation would cause a user to exceed a set quota.
-#: lib/mediafile.php:238 lib/mediafile.php:281
 msgid "File exceeds user's quota."
 msgstr "파일이 사용자의 제한 용량을 넘어갑니다."
 
 #. TRANS: Client exception thrown when a file upload operation fails because the file could
 #. TRANS: not be moved from the temporary folder to the permanent file location.
-#: lib/mediafile.php:258 lib/mediafile.php:300
 msgid "File could not be moved to destination directory."
 msgstr ""
 
 #. TRANS: Client exception thrown when a file upload operation has been stopped because the MIME
 #. TRANS: type of the uploaded file could not be determined.
-#: lib/mediafile.php:265 lib/mediafile.php:306
 msgid "Could not determine file's MIME type."
 msgstr "소스 이용자를 확인할 수 없습니다."
 
 #. TRANS: Client exception thrown trying to upload a forbidden MIME type.
 #. TRANS: %1$s is the file type that was denied, %2$s is the application part of
 #. TRANS: the MIME type that was denied.
-#: lib/mediafile.php:396
 #, php-format
 msgid ""
 "\"%1$s\" is not a supported file type on this server. Try using another %2$s "
@@ -8929,895 +7389,596 @@ msgstr ""
 
 #. TRANS: Client exception thrown trying to upload a forbidden MIME type.
 #. TRANS: %s is the file type that was denied.
-#: lib/mediafile.php:401
 #, php-format
 msgid "\"%s\" is not a supported file type on this server."
 msgstr ""
 
-#: lib/messageform.php:120
 msgid "Send a direct notice"
 msgstr "직접 메시지 보내기"
 
 #. TRANS Label entry in drop-down selection box in direct-message inbox/outbox. This is the default entry in the drop-down box, doubling as instructions and a brake against accidental submissions with the first user in the list.
-#: lib/messageform.php:137
 #, fuzzy
 msgid "Select recipient:"
 msgstr "라이선스 선택"
 
 #. TRANS Entry in drop-down selection box in direct-message inbox/outbox when no one is available to message.
-#: lib/messageform.php:150
 #, fuzzy
 msgid "No mutual subscribers."
 msgstr "구독하고 있지 않습니다!"
 
-#: lib/messageform.php:153
 msgid "To"
 msgstr "받는 이"
 
-#: lib/messageform.php:184 lib/noticeform.php:236
 msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr "보내기"
 
-#: lib/messagelist.php:77
 #, fuzzy
 msgid "Messages"
 msgstr "메시지"
 
-#: lib/messagelistitem.php:123 lib/noticelist.php:527
 msgid "from"
 msgstr "방법"
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:178
 msgid "Nickname cannot be empty."
 msgstr ""
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:191
 #, php-format
 msgid "Nickname cannot be more than %d character long."
 msgid_plural "Nickname cannot be more than %d characters long."
 msgstr[0] ""
 
-#: lib/noticeform.php:160
+#. TRANS: Form legend for notice form.
 msgid "Send a notice"
 msgstr "게시글 보내기"
 
-#: lib/noticeform.php:174
+#. TRANS: Title for notice label. %s is the user's nickname.
 #, php-format
 msgid "What's up, %s?"
 msgstr "뭐하세요 %s님?"
 
-#: lib/noticeform.php:193
+#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr "첨부"
 
-#: lib/noticeform.php:197
-msgid "Attach a file"
-msgstr ""
+#. TRANS: Title for input field to attach a file to a notice.
+#, fuzzy
+msgid "Attach a file."
+msgstr "첨부"
 
-#: lib/noticeform.php:212
+#. TRANS: Field label to add location to a notice.
 msgid "Share my location"
 msgstr "내 위치 공유"
 
-#: lib/noticeform.php:215
+#. TRANS: Text to not share location for a notice in notice form.
 msgid "Do not share my location"
 msgstr "내 위치 공유하지 않기"
 
-#: lib/noticeform.php:216
+#. TRANS: Timeout error text for location retrieval in notice form.
 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
 "try again later"
 msgstr ""
 
 #. TRANS: Used in coordinates as abbreviation of north
-#: lib/noticelist.php:457
 msgid "N"
 msgstr "북"
 
 #. TRANS: Used in coordinates as abbreviation of south
-#: lib/noticelist.php:459
 msgid "S"
 msgstr "남"
 
 #. TRANS: Used in coordinates as abbreviation of east
-#: lib/noticelist.php:461
 msgid "E"
 msgstr "동"
 
 #. TRANS: Used in coordinates as abbreviation of west
-#: lib/noticelist.php:463
 msgid "W"
 msgstr "서"
 
-#: lib/noticelist.php:465
 #, php-format
 msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 
-#: lib/noticelist.php:474
 msgid "at"
 msgstr "위치"
 
-#: lib/noticelist.php:523
 msgid "web"
 msgstr "웹"
 
-#: lib/noticelist.php:589
 msgid "in context"
 msgstr "문맥"
 
-#: lib/noticelist.php:624
 msgid "Repeated by"
 msgstr "재전송됨"
 
-#: lib/noticelist.php:651
 msgid "Reply to this notice"
 msgstr "이 게시글에 대해 답장하기"
 
-#: lib/noticelist.php:652
 msgid "Reply"
 msgstr "답장하기"
 
-#: lib/noticelist.php:678
 msgid "Delete this notice"
 msgstr "이 게시글 삭제하기"
 
-#: lib/noticelist.php:696
 #, fuzzy
 msgid "Notice repeated"
 msgstr "게시글이 등록되었습니다."
 
-#: lib/nudgeform.php:116
 msgid "Nudge this user"
 msgstr "이 사용자 찔러 보기"
 
-#: lib/nudgeform.php:128
 msgid "Nudge"
 msgstr "찔러 보기"
 
-#: lib/nudgeform.php:128
 msgid "Send a nudge to this user"
 msgstr "이 사용자에게 찔러 보기 메시지 보내기"
 
-#: lib/oauthstore.php:294
 msgid "Error inserting new profile."
 msgstr ""
 
-#: lib/oauthstore.php:302
 msgid "Error inserting avatar."
 msgstr ""
 
-#: lib/oauthstore.php:322
 msgid "Error inserting remote profile."
 msgstr ""
 
 #. TRANS: Exception thrown when a notice is denied because it has been sent before.
-#: lib/oauthstore.php:362
 msgid "Duplicate notice."
 msgstr ""
 
-#: lib/oauthstore.php:507
 msgid "Couldn't insert new subscription."
 msgstr "예약 구독을 추가 할 수 없습니다."
 
-#: lib/personalgroupnav.php:104
-#, fuzzy
 msgid "Replies"
 msgstr "답신"
 
-#: lib/personalgroupnav.php:109
-#, fuzzy
 msgid "Favorites"
 msgstr "좋아하는 글들"
 
-#: lib/personalgroupnav.php:120
-#, fuzzy
 msgid "Inbox"
 msgstr "받은 쪽지함"
 
-#: lib/personalgroupnav.php:121
 msgid "Your incoming messages"
 msgstr "받은 메시지"
 
-#: lib/personalgroupnav.php:125
-#, fuzzy
 msgid "Outbox"
 msgstr "보낸 쪽지함"
 
-#: lib/personalgroupnav.php:126
 msgid "Your sent messages"
 msgstr "보낸 메시지"
 
 #. TRANS: Title for personal tag cloud section. %s is a user nickname.
-#: lib/personaltagcloudsection.php:56
 #, php-format
 msgid "Tags in %s's notices"
 msgstr "%s의 게시글의 태그"
 
 #. TRANS: Displayed as version information for a plugin if no version information was found.
-#: lib/plugin.php:126
 #, fuzzy
 msgid "Unknown"
 msgstr "알려지지 않은 행동"
 
 #. TRANS: Plugin admin panel controls
-#: lib/plugindisableform.php:90
 msgctxt "plugin"
 msgid "Disable"
 msgstr ""
 
 #. TRANS: Plugin admin panel controls
-#: lib/pluginenableform.php:112
 msgctxt "plugin"
 msgid "Enable"
 msgstr ""
 
-#: lib/pluginlist.php:196
 msgctxt "plugin-description"
 msgid "(Plugin descriptions unavailable when disabled.)"
 msgstr ""
 
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:88
 msgid "Subscriptions"
 msgstr "구독"
 
 #. TRANS: Text for user subscription statistics if user has more subscriptions than displayed.
-#: lib/profileaction.php:144
 msgid "All subscriptions"
 msgstr "모든 예약 구독"
 
 #. TRANS: H2 text for user subscriber statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:96
 msgid "Subscribers"
 msgstr "구독자"
 
 #. TRANS: Text for user subscription statistics if user has more subscribers than displayed.
-#: lib/profileaction.php:181
 msgid "All subscribers"
 msgstr "모든 구독자"
 
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:213
 msgid "User ID"
 msgstr "이용자 ID"
 
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:219
 msgid "Member since"
 msgstr "가입한 때"
 
 #. TRANS: Label for user statistics.
 #. TRANS: H2 text for user group membership statistics.
-#: lib/profileaction.php:239 lib/profileaction.php:290
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:104
 msgid "Groups"
 msgstr "그룹"
 
 #. TRANS: Label for user statistics.
 #. TRANS: Average count of posts made per day since account registration.
-#: lib/profileaction.php:253
 msgid "Daily average"
 msgstr "하루 평균"
 
 #. TRANS: Text for user group membership statistics if user has more subscriptions than displayed.
-#: lib/profileaction.php:305
 msgid "All groups"
 msgstr "모든 그룹"
 
 #. TRANS: Server error displayed when using an unimplemented method.
-#: lib/profileformaction.php:123
 msgid "Unimplemented method."
 msgstr ""
 
-#: lib/publicgroupnav.php:82
 msgid "User groups"
 msgstr "사용자 그룹"
 
-#: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
 msgid "Recent tags"
 msgstr "최근 태그"
 
-#: lib/publicgroupnav.php:88
 msgid "Featured"
 msgstr "피쳐링됨"
 
-#: lib/publicgroupnav.php:92
 msgid "Popular"
 msgstr "인기있는"
 
-#: lib/redirectingaction.php:95
 msgid "No return-to arguments."
 msgstr "첨부문서 없음"
 
-#: lib/repeatform.php:107
 #, fuzzy
 msgid "Repeat this notice?"
 msgstr "이 게시글에 대해 답장하기"
 
-#: lib/repeatform.php:132
 msgid "Yes"
 msgstr "예"
 
-#: lib/repeatform.php:132
 #, fuzzy
 msgid "Repeat this notice"
 msgstr "이 게시글에 대해 답장하기"
 
-#: lib/revokeroleform.php:91
 #, php-format
 msgid "Revoke the \"%s\" role from this user"
 msgstr "그룹 이용자는 차단해제"
 
 #. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:1001
 #, fuzzy
 msgid "Page not found."
 msgstr "API 메서드 발견 안 됨."
 
-#: lib/sandboxform.php:67
 #, fuzzy
 msgid "Sandbox"
 msgstr "받은 쪽지함"
 
-#: lib/sandboxform.php:78
 #, fuzzy
 msgid "Sandbox this user"
 msgstr "이 사용자를 차단해제합니다."
 
 #. TRANS: Fieldset legend for the search form.
-#: lib/searchaction.php:120
 msgid "Search site"
 msgstr "검색 도움말"
 
 #. TRANS: Used as a field label for the field where one or more keywords
 #. TRANS: for searching can be entered.
-#: lib/searchaction.php:128
 msgid "Keyword(s)"
 msgstr "검색어"
 
 #. TRANS: Button text for searching site.
-#: lib/searchaction.php:130
 msgctxt "BUTTON"
 msgid "Search"
 msgstr "검색"
 
-#: lib/searchgroupnav.php:80
 msgid "People"
 msgstr "사람들"
 
-#: lib/searchgroupnav.php:81
 msgid "Find people on this site"
 msgstr "이 사이트에 있는 사람 찾기"
 
-#: lib/searchgroupnav.php:83
 msgid "Find content of notices"
 msgstr "통지들의 내용 찾기"
 
-#: lib/searchgroupnav.php:85
 msgid "Find groups on this site"
 msgstr "이 사이트에서 그룹 찾기"
 
-#: lib/section.php:89
 msgid "Untitled section"
 msgstr "제목없는 섹션"
 
-#: lib/section.php:106
 msgid "More..."
 msgstr "더 보기..."
 
-#: lib/settingsnav.php:78
 msgid "Change your profile settings"
 msgstr "프로필 세팅 바꾸기"
 
-#: lib/settingsnav.php:83
 msgid "Upload an avatar"
 msgstr "아바타를 업로드하세요."
 
-#: lib/settingsnav.php:88
 msgid "Change your password"
 msgstr "비밀번호 바꾸기"
 
-#: lib/settingsnav.php:93
 msgid "Change email handling"
 msgstr "메일 처리 변경"
 
-#: lib/settingsnav.php:98
 #, fuzzy
 msgid "Design your profile"
 msgstr "이용자 프로필"
 
-#: lib/settingsnav.php:102
 msgid "URL"
 msgstr "URL"
 
-#: lib/settingsnav.php:103
 msgid "URL shorteners"
 msgstr ""
 
-#: lib/settingsnav.php:111
 msgid "Updates by instant messenger (IM)"
 msgstr "인스턴트 메신저에 의한 업데이트"
 
-#: lib/settingsnav.php:118
 msgid "Updates by SMS"
 msgstr "SMS에 의한 업데이트"
 
-#: lib/settingsnav.php:123
-#, fuzzy
 msgid "Connections"
 msgstr "연결"
 
-#: lib/settingsnav.php:124
 #, fuzzy
 msgid "Authorized connected applications"
 msgstr "응용프로그램 삭제"
 
-#: lib/silenceform.php:67
 #, fuzzy
 msgid "Silence"
 msgstr "사이트 공지"
 
-#: lib/silenceform.php:78
 msgid "Silence this user"
 msgstr "이 사용자 삭제"
 
-#: lib/subgroupnav.php:89
 #, php-format
 msgid "People %s subscribes to"
 msgstr "%s 사람들은 구독합니다."
 
-#: lib/subgroupnav.php:97
 #, php-format
 msgid "People subscribed to %s"
 msgstr "%s에 의해 구독되는 사람들"
 
-#: lib/subgroupnav.php:105
 #, php-format
 msgid "Groups %s is a member of"
 msgstr "%s 사용자가 멤버인 그룹"
 
-#: lib/subgroupnav.php:111
 msgid "Invite"
 msgstr "초대"
 
-#: lib/subgroupnav.php:112
 #, php-format
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "%s에 친구를 가입시키기 위해 친구와 동료를 초대합니다."
 
-#: lib/subscribeform.php:115 lib/subscribeform.php:139
 msgid "Subscribe to this user"
 msgstr "이 회원을 구독합니다."
 
-#: lib/subscriberspeopleselftagcloudsection.php:48
-#: lib/subscriptionspeopleselftagcloudsection.php:48
 msgid "People Tagcloud as self-tagged"
 msgstr ""
 
-#: lib/subscriberspeopletagcloudsection.php:48
-#: lib/subscriptionspeopletagcloudsection.php:48
 msgid "People Tagcloud as tagged"
 msgstr ""
 
-#: lib/tagcloudsection.php:56
 msgid "None"
 msgstr "없음"
 
 #. TRANS: Server exception displayed if a theme name was invalid.
-#: lib/theme.php:74
 #, fuzzy
 msgid "Invalid theme name."
 msgstr "옳지 않은 크기"
 
-#: lib/themeuploader.php:50
 msgid "This server cannot handle theme uploads without ZIP support."
 msgstr ""
 
-#: lib/themeuploader.php:58 lib/themeuploader.php:61
 msgid "The theme file is missing or the upload failed."
 msgstr ""
 
-#: lib/themeuploader.php:91 lib/themeuploader.php:102
-#: lib/themeuploader.php:279 lib/themeuploader.php:283
-#: lib/themeuploader.php:291 lib/themeuploader.php:298
 #, fuzzy
 msgid "Failed saving theme."
 msgstr "아바타 업데이트 실패"
 
-#: lib/themeuploader.php:147
 msgid "Invalid theme: bad directory structure."
 msgstr ""
 
-#: lib/themeuploader.php:166
 #, php-format
 msgid "Uploaded theme is too large; must be less than %d byte uncompressed."
 msgid_plural ""
 "Uploaded theme is too large; must be less than %d bytes uncompressed."
 msgstr[0] ""
 
-#: lib/themeuploader.php:179
 msgid "Invalid theme archive: missing file css/display.css"
 msgstr ""
 
-#: lib/themeuploader.php:219
 msgid ""
 "Theme contains invalid file or folder name. Stick with ASCII letters, "
 "digits, underscore, and minus sign."
 msgstr ""
 
-#: lib/themeuploader.php:225
 msgid "Theme contains unsafe file extension names; may be unsafe."
 msgstr ""
 
-#: lib/themeuploader.php:242
 #, php-format
 msgid "Theme contains file of type '.%s', which is not allowed."
 msgstr ""
 
-#: lib/themeuploader.php:260
 msgid "Error opening theme archive."
 msgstr "차단 제거 에러!"
 
-#: lib/threadednoticelist.php:270
 #, php-format
-msgid "Show all %d comment"
-msgid_plural "Show all %d comments"
+msgid "Show %d reply"
+msgid_plural "Show all %d replies"
 msgstr[0] ""
 
-#: lib/topposterssection.php:74
 msgid "Top posters"
 msgstr "상위 게시글 등록자"
 
 #. TRANS: Title for the form to unblock a user.
-#: lib/unblockform.php:67
 #, fuzzy
 msgctxt "TITLE"
 msgid "Unblock"
 msgstr "차단해제"
 
-#: lib/unsandboxform.php:69
 msgid "Unsandbox"
 msgstr ""
 
-#: lib/unsandboxform.php:80
 #, fuzzy
 msgid "Unsandbox this user"
 msgstr "이 사용자를 차단해제합니다."
 
-#: lib/unsilenceform.php:67
 msgid "Unsilence"
 msgstr ""
 
-#: lib/unsilenceform.php:78
 msgid "Unsilence this user"
 msgstr "이 사용자 삭제"
 
-#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
 msgid "Unsubscribe from this user"
 msgstr "이 사용자로부터 구독취소합니다."
 
-#: lib/unsubscribeform.php:137
 msgid "Unsubscribe"
 msgstr "구독 해제"
 
 #. 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).
-#: lib/usernoprofileexception.php:60
 #, fuzzy, php-format
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "이용자가 프로필을 가지고 있지 않습니다."
 
-#: lib/userprofile.php:116
 msgid "Edit Avatar"
 msgstr "아바타 편집"
 
 #. TRANS: H2 for user actions in a profile.
 #. TRANS: H2 for entity actions in a profile.
-#: lib/userprofile.php:216 lib/userprofile.php:232
 msgid "User actions"
 msgstr "사용자 동작"
 
 #. TRANS: Text shown in user profile of not yet compeltely deleted users.
-#: lib/userprofile.php:220
 msgid "User deletion in progress..."
 msgstr ""
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:248
 msgid "Edit profile settings"
 msgstr "프로필 설정"
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:250
 msgid "Edit"
 msgstr "편집"
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:274
 msgid "Send a direct message to this user"
 msgstr "이 회원에게 직접 메시지를 보냅니다."
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:276
 msgid "Message"
 msgstr "메시지"
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:318
 msgid "Moderate"
 msgstr ""
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:357
 #, fuzzy
 msgid "User role"
 msgstr "이용자 프로필"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:360
 msgctxt "role"
 msgid "Administrator"
 msgstr "관리자"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:362
 msgctxt "role"
 msgid "Moderator"
 msgstr ""
 
-#: lib/util.php:321
 #, fuzzy
 msgid "Not allowed to log in."
 msgstr "로그인하고 있지 않습니다."
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1337
 msgid "a few seconds ago"
 msgstr "몇 초 전"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1340
 msgid "about a minute ago"
 msgstr "1분 전"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1344
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
 msgstr[0] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1347
 msgid "about an hour ago"
 msgstr "1시간 전"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1351
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
 msgstr[0] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1354
 msgid "about a day ago"
 msgstr "하루 전"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1358
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
 msgstr[0] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1361
 msgid "about a month ago"
 msgstr "1달 전"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1365
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
 msgstr[0] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1368
 msgid "about a year ago"
 msgstr "1년 전"
 
 #. TRANS: Web color exception thrown when a hexadecimal color code does not validate.
 #. TRANS: %s is the provided (invalid) color code.
-#: lib/webcolor.php:81 lib/webcolor.php:121
 #, fuzzy, php-format
 msgid "%s is not a valid color! Use 3 or 6 hex characters."
 msgstr "홈페이지 주소형식이 올바르지 않습니다."
 
 #. TRANS: Exception.
-#: lib/xrd.php:63
 #, fuzzy
 msgid "Invalid XML."
 msgstr "옳지 않은 크기"
 
 #. TRANS: Exception.
-#: lib/xrd.php:68
 msgid "Invalid XML, missing XRD root."
 msgstr ""
 
 #. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
-#: scripts/restoreuser.php:62
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
 
-#, fuzzy
-#~ msgid "Could not generate feed for group - %s"
-#~ msgstr "그룹을 업데이트 할 수 없습니다."
+#~ msgid "Full name is too long (max 255 chars)."
+#~ msgstr "실명이 너무 깁니다. (최대 255글자)"
+
+#~ msgid "description is too long (max %d chars)."
+#~ msgstr "설명이 너무 길어요. (최대 %d글자)"
+
+#~ msgid "Location is too long (max 255 chars)."
+#~ msgstr "위치가 너무 깁니다. (최대 255글자)"
+
+#~ msgid "Too many aliases! Maximum %d."
+#~ msgstr "별명이 너무 많습니다! 최대 %d개."
 
 #, fuzzy
-#~ msgid "Current confirmed Jabber/Google Talk address."
-#~ msgstr "확인된 최신의 Jabber/GTalk 계정"
-
-#, fuzzy
-#~ msgid ""
-#~ "Jabber or Google Talk address, like \"UserName@example.org\". First, make "
-#~ "sure to add %s to your buddy list in your IM client or on Google Talk."
-#~ msgstr ""
-#~ "\"UserName@example.org\" 와 같은 Jabber 또는 GTalk 계정은 귀하의 메신저나 "
-#~ "GTalk 친구목록에 반드시 %s 주소를 추가하여 주십시오."
-
-#, fuzzy
-#~ msgid "Send me notices through Jabber/Google Talk."
-#~ msgstr "Jabber/GTalk 로 통지를 보내주세요."
-
-#, fuzzy
-#~ msgid "Publish a MicroID for my Jabber/Google Talk address."
-#~ msgstr "Jabber/GTalk 계정을 위한 MicroID의 생성"
-
-#~ msgid "No Jabber ID."
-#~ msgstr "Jabber ID가 아닙니다."
-
-#, fuzzy
-#~ msgid "Not a valid Jabber ID."
-#~ msgstr "유효한 Jabber ID가 아닙니다."
-
-#~ msgid "That is already your Jabber ID."
-#~ msgstr "그 Jabber ID는 이미 귀하의 것입니다."
-
-#~ msgid "That is not your Jabber ID."
-#~ msgstr "그 Jabber ID는 귀하의 것이 아닙니다."
-
-#~ msgid "Other settings"
-#~ msgstr "아바타 설정"
-
-#~ msgid "Tag cloud"
-#~ msgstr "태그 클라우드"
-
-#, fuzzy
-#~ msgid "Authorize URL"
-#~ msgstr "작성자"
-
-#~ msgid "Jabber"
-#~ msgstr "Jabber"
-
-#~ msgid "Photo"
-#~ msgstr "사진"
-
-#~ msgid "Other options"
-#~ msgstr "다른 옵션들"
-
-#~ msgid "Other"
-#~ msgstr "기타"
-
-#~ msgid "Primary site navigation"
-#~ msgstr "주 사이트 네비게이션"
-
-#, fuzzy
-#~ msgctxt "TOOLTIP"
-#~ msgid "Personal profile and friends timeline"
-#~ msgstr "개인 프로필과 친구 타임라인"
-
-#~ msgctxt "MENU"
-#~ msgid "Personal"
-#~ msgstr "개인"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Change your email, avatar, password, profile"
-#~ msgstr "당신의 메일, 아바타, 비밀 번호, 프로필을 변경하세요."
-
-#~ msgid "Account"
-#~ msgstr "계정"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Connect to services"
-#~ msgstr "연결"
-
-#~ msgid "Connect"
-#~ msgstr "연결"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Change site configuration"
-#~ msgstr "메일 주소 확인"
-
-#, fuzzy
-#~ msgctxt "TOOLTIP"
-#~ msgid "Invite friends and colleagues to join you on %s"
-#~ msgstr "%s에 친구를 가입시키기 위해 친구와 동료를 초대합니다."
-
-#~ msgctxt "MENU"
-#~ msgid "Invite"
-#~ msgstr "초대"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Create an account"
-#~ msgstr "새 계정 만들기"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Help me!"
-#~ msgstr "도움말"
-
-#~ msgctxt "MENU"
-#~ msgid "Help"
-#~ msgstr "도움말"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Search for people or text"
-#~ msgstr "사람이나 단어 검색"
-
-#~ msgid "Local views"
-#~ msgstr "로컬 뷰"
-
-#~ msgid "Page notice"
-#~ msgstr "페이지 공지"
-
-#~ msgid "Secondary site navigation"
-#~ msgstr "보조 사이트 네비게이션"
-
-#~ msgid "StatusNet software license"
-#~ msgstr "StatusNet 소프트웨어 라이선스"
-
-#~ msgid "Site content license"
-#~ msgstr "사이트 컨텐츠 라이선스"
-
-#~ msgid "Pagination"
-#~ msgstr "페이지수"
-
-#~ msgid "Author"
-#~ msgstr "작성자"
-
-#~ msgid "Provider"
-#~ msgstr "미리보기"
-
-#, fuzzy
-#~ msgctxt "MENU"
-#~ msgid "SMS"
-#~ msgstr "SMS"
-
-#~ msgid "Filter tags"
-#~ msgstr "태그 필터링하기"
-
-#~ msgid "[%s]"
-#~ msgstr "[%s]"
-
-#~ msgid "Available characters"
-#~ msgstr "사용 가능한 글자"
-
-#, fuzzy
-#~ msgctxt "MENU"
-#~ msgid "Profile"
-#~ msgstr "프로필"
-
-#~ msgid "Search help"
-#~ msgstr "검색 도움말"
-
-#, fuzzy
-#~ msgid "Message too long. Maximum is %1$d character, you sent %2$d."
-#~ msgid_plural "Message too long. Maximum is %1$d characters, you sent %2$d."
-#~ msgstr[0] "당신이 보낸 메시지가 너무 길어요. 최대 140글자까지입니다."
+#~ msgctxt "BUTTON"
+#~ msgid "Comment"
+#~ msgstr "만족하는"
diff --git a/locale/mk/LC_MESSAGES/statusnet.po b/locale/mk/LC_MESSAGES/statusnet.po
index d4516d7781..a366dfc6e2 100644
--- a/locale/mk/LC_MESSAGES/statusnet.po
+++ b/locale/mk/LC_MESSAGES/statusnet.po
@@ -10,69 +10,59 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:23+0000\n"
-"PO-Revision-Date: 2011-03-03 17:26:14+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:29+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
-"X-POT-Import-Date: 2011-02-25 23:49:23+0000\n"
+"X-POT-Import-Date: 2011-03-03 17:59:19+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
-#: actions/accessadminpanel.php:53 lib/adminpanelaction.php:363
 msgid "Access"
 msgstr "Пристап"
 
 #. TRANS: Page notice.
-#: actions/accessadminpanel.php:64
 msgid "Site access settings"
 msgstr "Нагодувања за пристап на мрежното место"
 
 #. TRANS: Form legend for registration form.
-#: actions/accessadminpanel.php:151
 msgid "Registration"
 msgstr "Регистрација"
 
 #. TRANS: Checkbox instructions for admin setting "Private".
-#: actions/accessadminpanel.php:155
 msgid "Prohibit anonymous users (not logged in) from viewing site?"
 msgstr ""
 "Да им забранам на анонимните (ненајавени) корисници да го гледаат мрежното "
 "место?"
 
 #. TRANS: Checkbox label for prohibiting anonymous users from viewing site.
-#: actions/accessadminpanel.php:157
 msgctxt "LABEL"
 msgid "Private"
 msgstr "Приватно"
 
 #. TRANS: Checkbox instructions for admin setting "Invite only".
-#: actions/accessadminpanel.php:164
 msgid "Make registration invitation only."
 msgstr "Регистрирање само со покана."
 
 #. TRANS: Checkbox label for configuring site as invite only.
-#: actions/accessadminpanel.php:166
 msgid "Invite only"
 msgstr "Само со покана"
 
 #. TRANS: Checkbox instructions for admin setting "Closed" (no new registrations).
-#: actions/accessadminpanel.php:173
 msgid "Disable new registrations."
 msgstr "Оневозможи нови регистрации."
 
 #. TRANS: Checkbox label for disabling new user registrations.
-#: actions/accessadminpanel.php:175
 msgid "Closed"
 msgstr "Затворен"
 
 #. TRANS: Title for button to save access settings in site admin panel.
-#: actions/accessadminpanel.php:191
 msgid "Save access settings"
 msgstr "Зачувај нагодувања на пристап"
 
@@ -80,6 +70,7 @@ msgstr "Зачувај нагодувања на пристап"
 #. TRANS: Button text for saving theme settings.
 #. TRANS: Button label to save e-mail preferences.
 #. TRANS: Button label to save IM preferences.
+#. TRANS: Button text in the license admin panel.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
 #. TRANS: Button text for saving site notice in admin panel.
@@ -89,21 +80,12 @@ msgstr "Зачувај нагодувања на пристап"
 #. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
 #. TRANS: Button text on profile design page to save settings.
-#: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
-#: actions/emailsettings.php:251 actions/imsettings.php:199
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:198
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:204
-#: actions/subscriptions.php:261 actions/urlsettings.php:152
-#: actions/useradminpanel.php:298 lib/applicationeditform.php:355
-#: lib/designform.php:320 lib/groupeditform.php:201
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Зачувај"
 
 #. TRANS: Server error when page not found (404).
 #. TRANS: Server error when page not found (404)
-#: actions/all.php:68 actions/public.php:98 actions/replies.php:93
-#: actions/showfavorites.php:140 actions/tag.php:52
 msgid "No such page."
 msgstr "Нема таква страница."
 
@@ -122,6 +104,7 @@ msgstr "Нема таква страница."
 #. TRANS: Client error displayed when checking group membership for a non-existing user.
 #. TRANS: Client error displayed when trying to have a non-existing user join a group.
 #. TRANS: Client error displayed when trying to have a non-existing user leave a group.
+#. TRANS: Client error displayed when not providing a user or an invalid user.
 #. TRANS: Client error displayed when updating a status for a non-existing user.
 #. TRANS: Client error displayed when requesting a list of followers for a non-existing user.
 #. TRANS: Client error displayed when requesting most recent favourite notices by a user for a non-existing user.
@@ -134,6 +117,8 @@ msgstr "Нема таква страница."
 #. 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.
 #. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
@@ -141,33 +126,10 @@ msgstr "Нема таква страница."
 #. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when calling a profile action without specifying a user.
-#: actions/all.php:80 actions/allrss.php:69
-#: actions/apiaccountupdatedeliverydevice.php:110
-#: actions/apiaccountupdateprofile.php:103
-#: actions/apiaccountupdateprofilebackgroundimage.php:118
-#: actions/apiaccountupdateprofileimage.php:104 actions/apiatomservice.php:59
-#: actions/apiblockcreate.php:96 actions/apiblockdestroy.php:94
-#: actions/apidirectmessage.php:75 actions/apidirectmessagenew.php:72
-#: actions/apigroupcreate.php:111 actions/apigroupismember.php:89
-#: actions/apigroupjoin.php:98 actions/apigroupleave.php:98
-#: actions/apigrouplist.php:70 actions/apigroupprofileupdate.php:108
-#: actions/apistatusesupdate.php:230 actions/apisubscriptions.php:85
-#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:173
-#: actions/apitimelinehome.php:78 actions/apitimelinementions.php:77
-#: actions/apitimelineuser.php:79 actions/avatarbynickname.php:79
-#: actions/favoritesrss.php:72 actions/foaf.php:42 actions/foaf.php:61
-#: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116
-#: actions/otp.php:78 actions/remotesubscribe.php:144
-#: actions/remotesubscribe.php:153 actions/replies.php:73
-#: actions/repliesrss.php:38 actions/rsd.php:113 actions/showfavorites.php:106
-#: actions/userbyid.php:75 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/userxrd.php:59 actions/xrds.php:71 lib/command.php:509
-#: lib/galleryaction.php:59 lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Нема таков корисник."
 
 #. TRANS: Page title. %1$s is user nickname, %2$d is page number
-#: actions/all.php:91
 #, php-format
 msgid "%1$s and friends, page %2$d"
 msgstr "%1$s и пријателите, стр. %2$d"
@@ -176,33 +138,26 @@ msgstr "%1$s и пријателите, стр. %2$d"
 #. TRANS: H1 text for page. %s is a user nickname.
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Timeline title for user and friends. %s is a user nickname.
-#: actions/all.php:94 actions/all.php:191 actions/allrss.php:117
-#: actions/apitimelinefriends.php:207 actions/apitimelinehome.php:113
-#: lib/personalgroupnav.php:100
 #, php-format
 msgid "%s and friends"
 msgstr "%s и пријатели"
 
 #. TRANS: %s is user nickname.
-#: actions/all.php:108
 #, php-format
 msgid "Feed for friends of %s (RSS 1.0)"
 msgstr "Канал со пријатели на %s (RSS 1.0)"
 
 #. TRANS: %s is user nickname.
-#: actions/all.php:117
 #, php-format
 msgid "Feed for friends of %s (RSS 2.0)"
 msgstr "Канал со пријатели на %s (RSS 2.0)"
 
 #. TRANS: %s is user nickname.
-#: actions/all.php:126
 #, php-format
 msgid "Feed for friends of %s (Atom)"
 msgstr "Канал за пријатели на %S (Atom)"
 
 #. TRANS: Empty list message. %s is a user nickname.
-#: actions/all.php:139
 #, php-format
 msgid ""
 "This is the timeline for %s and friends but no one has posted anything yet."
@@ -211,7 +166,6 @@ msgstr ""
 
 #. TRANS: Encouragement displayed on logged in user's empty timeline.
 #. TRANS: This message contains Markdown links. Keep "](" together.
-#: actions/all.php:146
 #, php-format
 msgid ""
 "Try subscribing to more people, [join a group](%%action.groups%%) or post "
@@ -222,7 +176,6 @@ msgstr ""
 
 #. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@".
 #. TRANS: This message contains Markdown links. Keep "](" together.
-#: actions/all.php:150
 #, php-format
 msgid ""
 "You can try to [nudge %1$s](../%2$s) from their profile or [post something "
@@ -235,7 +188,6 @@ msgstr ""
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
 #. TRANS: Second sentence of empty message for anonymous users. %s is a user nickname.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:221
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -245,14 +197,11 @@ msgstr ""
 "подбуцнете корисникот %s или да му испратите забелешка."
 
 #. TRANS: H1 text for page when viewing a list for self.
-#: actions/all.php:188
 msgid "You and friends"
 msgstr "Вие и пријателите"
 
 #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
 #. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name.
-#: actions/allrss.php:122 actions/apitimelinefriends.php:213
-#: actions/apitimelinehome.php:119
 #, php-format
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr "Подновувања од %1$s и пријатели на %2$s!"
@@ -271,55 +220,20 @@ msgstr "Подновувања од %1$s и пријатели на %2$s!"
 #. TRANS: Client error displayed trying to execute an unknown API method checking group membership.
 #. TRANS: Client error displayed trying to execute an unknown API method listing the latest 20 groups.
 #. TRANS: Client error displayed trying to execute an unknown API method showing group membership.
+#. TRANS: Client error displayed when using an unsupported API format.
 #. TRANS: Client error displayed trying to execute an unknown API method showing a group.
 #. TRANS: Client error displayed trying to execute an unknown API method testing API connectivity.
 #. TRANS: Client error displayed trying to execute an unknown API method deleting a status.
 #. TRANS: Client error displayed when trying to handle an unknown API method.
-#: actions/apiaccountratelimitstatus.php:69
-#: actions/apiaccountupdatedeliverydevice.php:92
-#: actions/apiaccountupdateprofile.php:94
-#: actions/apiaccountupdateprofilebackgroundimage.php:92
-#: actions/apiaccountupdateprofilecolors.php:115
-#: actions/apiaccountverifycredentials.php:68 actions/apidirectmessage.php:157
-#: actions/apifavoritecreate.php:98 actions/apifavoritedestroy.php:98
-#: actions/apifriendshipscreate.php:99 actions/apifriendshipsdestroy.php:99
-#: actions/apifriendshipsshow.php:124 actions/apigroupcreate.php:138
-#: actions/apigroupismember.php:115 actions/apigroupjoin.php:151
-#: actions/apigroupleave.php:141 actions/apigrouplist.php:134
-#: actions/apigrouplistall.php:120 actions/apigroupmembership.php:105
-#: actions/apigroupprofileupdate.php:100 actions/apigroupprofileupdate.php:213
-#: actions/apigroupshow.php:114 actions/apihelptest.php:84
-#: actions/apistatusesdestroy.php:101 actions/apistatusesretweets.php:110
-#: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:139
-#: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
-#: actions/apitimelinefavorites.php:182 actions/apitimelinefriends.php:276
-#: actions/apitimelinegroup.php:148 actions/apitimelinehome.php:181
-#: actions/apitimelinementions.php:182 actions/apitimelinepublic.php:247
-#: actions/apitimelineretweetedtome.php:147
-#: actions/apitimelineretweetsofme.php:147 actions/apitimelinetag.php:165
-#: actions/apitimelineuser.php:217 actions/apiusershow.php:100
 msgid "API method not found."
 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.
-#: actions/apiaccountupdatedeliverydevice.php:83
-#: actions/apiaccountupdateprofile.php:85
-#: actions/apiaccountupdateprofilebackgroundimage.php:83
-#: actions/apiaccountupdateprofilecolors.php:106
-#: actions/apiaccountupdateprofileimage.php:80 actions/apiblockcreate.php:87
-#: actions/apiblockdestroy.php:85 actions/apidirectmessagenew.php:107
-#: actions/apifavoritecreate.php:88 actions/apifavoritedestroy.php:88
-#: actions/apifriendshipscreate.php:89 actions/apifriendshipsdestroy.php:89
-#: actions/apigroupcreate.php:102 actions/apigroupjoin.php:89
-#: actions/apigroupleave.php:89 actions/apigroupprofileupdate.php:92
-#: actions/apimediaupload.php:66 actions/apistatusesretweet.php:63
-#: actions/apistatusesupdate.php:194
 msgid "This method requires a POST."
 msgstr "Овој метод бара POST."
 
 #. TRANS: Client error displayed when no valid device parameter is provided for a user's delivery device setting.
-#: actions/apiaccountupdatedeliverydevice.php:103
 msgid ""
 "You must specify a parameter named 'device' with a value of one of: sms, im, "
 "none."
@@ -334,10 +248,6 @@ msgstr ""
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
-#: actions/apiaccountupdatedeliverydevice.php:136
-#: actions/emailsettings.php:353 actions/emailsettings.php:499
-#: actions/profilesettings.php:323 actions/smssettings.php:300
-#: actions/smssettings.php:453 actions/urlsettings.php:211
 msgid "Could not update user."
 msgstr "Не можев да го подновам корисникот."
 
@@ -350,32 +260,17 @@ msgstr "Не можев да го подновам корисникот."
 #. TRANS: Server error displayed when requesting Friends of a Friend feed for a user for which the profile could not be found.
 #. TRANS: Server error displayed when trying to get a user hCard for a user without a profile.
 #. TRANS: Server error displayed when calling a profile action while the specified user does not have a profile.
-#: actions/apiaccountupdateprofile.php:111
-#: actions/apiaccountupdateprofilebackgroundimage.php:199
-#: actions/apiaccountupdateprofilecolors.php:183
-#: actions/apiaccountupdateprofileimage.php:131
-#: actions/apiuserprofileimage.php:88 actions/apiusershow.php:108
-#: actions/avatarbynickname.php:85 actions/foaf.php:69 actions/hcard.php:75
-#: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
-#: lib/profileaction.php:85
 msgid "User has no profile."
 msgstr "Корисникот нема профил."
 
 #. TRANS: Server error displayed if a user profile could not be saved.
 #. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:419
 msgid "Could not save profile."
 msgstr "Не може да се зачува профил."
 
 #. TRANS: Client error displayed when the number of bytes in a POST request exceeds a limit.
 #. TRANS: %s is the number of bytes of the CONTENT_LENGTH.
 #. TRANS: Form validation error in design settings form. POST should remain untranslated.
-#: actions/apiaccountupdateprofilebackgroundimage.php:108
-#: actions/apiaccountupdateprofileimage.php:95 actions/apimediaupload.php:81
-#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
-#: actions/designadminpanel.php:120 actions/editapplication.php:121
-#: actions/newapplication.php:102 actions/newnotice.php:95
-#: lib/designsettings.php:110
 #, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s byte) due to its "
@@ -395,26 +290,15 @@ msgstr[1] ""
 #. TRANS: Client error displayed when a database error occurs inserting profile colours.
 #. TRANS: Client error displayed when a database error occurs updating profile colours.
 #. TRANS: Form validation error displayed when group design settings could not be saved because of an application issue.
-#: actions/apiaccountupdateprofilebackgroundimage.php:138
-#: actions/apiaccountupdateprofilebackgroundimage.php:149
-#: actions/apiaccountupdateprofilecolors.php:160
-#: actions/apiaccountupdateprofilecolors.php:171
-#: actions/groupdesignsettings.php:285 actions/groupdesignsettings.php:296
-#: actions/userdesignsettings.php:218 actions/userdesignsettings.php:228
-#: actions/userdesignsettings.php:270 actions/userdesignsettings.php:280
 msgid "Unable to save your design settings."
 msgstr "Не можам да ги зачувам Вашите нагодувања за изглед."
 
 #. TRANS: Error displayed when updating design settings fails.
 #. TRANS: Client error displayed when a database error occurs updating profile colours.
-#: actions/apiaccountupdateprofilebackgroundimage.php:191
-#: actions/apiaccountupdateprofilecolors.php:139
-#: actions/userdesignsettings.php:196
 msgid "Could not update your design."
 msgstr "Не може да се поднови Вашиот изглед."
 
 #. TRANS: Title for Atom feed.
-#: actions/apiatomservice.php:85
 msgctxt "ATOM"
 msgid "Main"
 msgstr "Главна"
@@ -423,9 +307,6 @@ msgstr "Главна"
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Title in atom group notice feed. %s is a group name.
 #. TRANS: Title in atom user notice feed. %s is a user name.
-#: actions/apiatomservice.php:93 actions/grouprss.php:138
-#: actions/userrss.php:94 lib/atomgroupnoticefeed.php:63
-#: lib/atomusernoticefeed.php:88
 #, php-format
 msgid "%s timeline"
 msgstr "Историја на %s"
@@ -435,8 +316,6 @@ msgstr "Историја на %s"
 #. TRANS: %s is a user nickname.
 #. TRANS: Header for subscriptions overview for a user (first page).
 #. TRANS: %s is a user nickname.
-#: actions/apiatomservice.php:104 actions/atompubsubscriptionfeed.php:148
-#: actions/subscriptions.php:51
 #, php-format
 msgid "%s subscriptions"
 msgstr "Претплати на %s"
@@ -444,58 +323,48 @@ msgstr "Претплати на %s"
 #. TRANS: Title for Atom feed with a user's favorite notices. %s is a user nickname.
 #. TRANS: Title for Atom favorites feed.
 #. TRANS: %s is a user nickname.
-#: actions/apiatomservice.php:115 actions/atompubfavoritefeed.php:142
 #, php-format
 msgid "%s favorites"
 msgstr "%s бендисани"
 
 #. TRANS: Title for Atom feed with a user's memberships. %s is a user nickname.
-#: actions/apiatomservice.php:126
 #, php-format
 msgid "%s memberships"
 msgstr "%s членства"
 
 #. TRANS: Client error displayed when users try to block themselves.
-#: actions/apiblockcreate.php:105
 msgid "You cannot block yourself!"
 msgstr "Не можете да се блокирате самите себеси!"
 
 #. TRANS: Server error displayed when blocking a user has failed.
-#: actions/apiblockcreate.php:127
 msgid "Block user failed."
 msgstr "Блокирањето на корисникот не успеа."
 
 #. TRANS: Server error displayed when unblocking a user has failed.
-#: actions/apiblockdestroy.php:113
 msgid "Unblock user failed."
 msgstr "Не успеа одблокирањето на корисникот."
 
 #. TRANS: Title. %s is a user nickname.
-#: actions/apidirectmessage.php:88
 #, php-format
 msgid "Direct messages from %s"
 msgstr "Директни пораки од %s"
 
 #. TRANS: Subtitle. %s is a user nickname.
-#: actions/apidirectmessage.php:93
 #, php-format
 msgid "All the direct messages sent from %s"
 msgstr "Сите директни пораки испратени од %s"
 
 #. TRANS: Title. %s is a user nickname.
-#: actions/apidirectmessage.php:102
 #, php-format
 msgid "Direct messages to %s"
 msgstr "Директни пораки до %s"
 
 #. TRANS: Subtitle. %s is a user nickname.
-#: actions/apidirectmessage.php:107
 #, php-format
 msgid "All the direct messages sent to %s"
 msgstr "Сите директни пораки испратени до %s"
 
 #. TRANS: Client error displayed when no message text was submitted (406).
-#: actions/apidirectmessagenew.php:117
 msgid "No message text!"
 msgstr "Нема текст за пораката!"
 
@@ -503,7 +372,6 @@ msgstr "Нема текст за пораката!"
 #. TRANS: %d is the maximum number of characters for a message.
 #. TRANS: Form validation error displayed when message content is too long.
 #. TRANS: %d is the maximum number of characters for a message.
-#: actions/apidirectmessagenew.php:127 actions/newmessage.php:152
 #, php-format
 msgid "That's too long. Maximum message size is %d character."
 msgid_plural "That's too long. Maximum message size is %d characters."
@@ -511,18 +379,15 @@ msgstr[0] "Ова е предолго. Дозволен е највеќе %d з
 msgstr[1] "Ова е предолго. Дозволени се највеќе %d знаци во пораката."
 
 #. TRANS: Client error displayed if a recipient user could not be found (403).
-#: actions/apidirectmessagenew.php:139
 msgid "Recipient user not found."
 msgstr "Примачот не е пронајден."
 
 #. TRANS: Client error displayed trying to direct message another user who's not a friend (403).
-#: actions/apidirectmessagenew.php:144
 msgid "Cannot send direct messages to users who aren't your friend."
 msgstr ""
 "Не можете да испраќате непосредни пораки на корисници што не Ви се пријатели."
 
 #. TRANS: Client error displayed trying to direct message self (403).
-#: actions/apidirectmessagenew.php:154
 msgid ""
 "Do not send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
@@ -532,117 +397,97 @@ 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.
 #. TRANS: Client error displayed trying to delete a status with an invalid ID.
-#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:108
-#: actions/apistatusesdestroy.php:121
 msgid "No status found with that ID."
 msgstr "Нема пронајдено статус со таков ID."
 
 #. TRANS: Client error displayed when trying to mark a notice favourite that already is a favourite.
-#: actions/apifavoritecreate.php:120
 msgid "This status is already a favorite."
 msgstr "Веќе сте го бендисале овој статус."
 
 #. TRANS: Client error displayed when marking a notice as favourite fails.
 #. TRANS: Server error displayed when trying to mark a notice as favorite fails in the database.
 #. TRANS: Error message text shown when a favorite could not be set.
-#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:306
 msgid "Could not create favorite."
 msgstr "Не можам да создадам бендисана забелешка."
 
 #. TRANS: Client error displayed when trying to remove a favourite that was not a favourite.
-#: actions/apifavoritedestroy.php:122
 msgid "That status is not a favorite."
 msgstr "Тој статус не Ви е бендисан."
 
 #. TRANS: Client error displayed when removing a favourite has failed.
 #. TRANS: Server error displayed when removing a favorite from the database fails.
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:90
 msgid "Could not delete favorite."
 msgstr "Не можам да ја избришам бендисаната забелешка."
 
 #. TRANS: Client error displayed when trying follow who's profile could not be found.
-#: actions/apifriendshipscreate.php:109
 msgid "Could not follow user: profile not found."
 msgstr "Не можам да го следам корисникот: профилот не е пронајден."
 
 #. TRANS: Client error displayed when trying to follow a user that's already being followed.
 #. TRANS: %s is the nickname of the user that is already being followed.
-#: actions/apifriendshipscreate.php:120
 #, php-format
 msgid "Could not follow user: %s is already on your list."
 msgstr "Не можам да го следам корисникот: %s веќе е на Вашиот список."
 
 #. TRANS: Client error displayed when trying to unfollow a user that cannot be found.
-#: actions/apifriendshipsdestroy.php:109
 msgid "Could not unfollow user: User not found."
 msgstr ""
 "Не можам да престанам да го следам корисникот: Корисникот не е пронајден."
 
 #. TRANS: Client error displayed when trying to unfollow self.
-#: actions/apifriendshipsdestroy.php:121
 msgid "You cannot unfollow yourself."
 msgstr "Не можете да престанете да се следите самите себеси."
 
 #. TRANS: Client error displayed when supplying invalid parameters to an API call checking if a friendship exists.
-#: actions/apifriendshipsexists.php:88
 msgid "Two valid IDs or nick names must be supplied."
 msgstr "Мора да наведете две назнаки (ID) или прекари."
 
 #. TRANS: Client error displayed when a source user could not be determined showing friendship.
-#: actions/apifriendshipsshow.php:131
 msgid "Could not determine source user."
 msgstr "Не можев да го утврдам целниот корисник."
 
 #. TRANS: Client error displayed when a target user could not be determined showing friendship.
-#: actions/apifriendshipsshow.php:140
 msgid "Could not find target user."
 msgstr "Не можев да го пронајдам целниот корисник."
 
 #. TRANS: Client error trying to create a group with a nickname this is already in use.
+#. TRANS: API validation exception thrown when nickname is already used.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:156 actions/apigroupprofileupdate.php:255
-#: actions/editgroup.php:191 actions/newgroup.php:137
-#: actions/profilesettings.php:274 actions/register.php:199
 msgid "Nickname already in use. Try another one."
 msgstr "Тој прекар е во употреба. Одберете друг."
 
 #. TRANS: Client error in form for group creation.
+#. TRANS: API validation exception thrown when nickname does not validate.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:164 actions/apigroupprofileupdate.php:259
-#: actions/editgroup.php:195 actions/newgroup.php:141
-#: actions/profilesettings.php:244 actions/register.php:201
 msgid "Not a valid nickname."
 msgstr "Неправилен прекар."
 
 #. TRANS: Client error in form for group creation.
+#. TRANS: API validation exception thrown when homepage URL does not validate.
 #. TRANS: Validation error shown when providing an invalid homepage URL in the "Edit application" form.
 #. TRANS: Group edit form validation error.
 #. TRANS: Validation error shown when providing an invalid homepage URL in the "New application" form.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:181 actions/apigroupprofileupdate.php:277
-#: actions/editapplication.php:235 actions/editgroup.php:202
-#: actions/newapplication.php:221 actions/newgroup.php:148
-#: actions/profilesettings.php:249 actions/register.php:208
 msgid "Homepage is not a valid URL."
 msgstr "Главната страница не е важечка URL-адреса."
 
 #. TRANS: Client error in form for group creation.
+#. TRANS: API validation exception thrown when full name does not validate.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:191 actions/editgroup.php:206
-#: actions/newgroup.php:152 actions/profilesettings.php:253
-#: actions/register.php:211
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "Полното име е предолго (највеќе 255 знаци)."
 
 #. TRANS: Client error shown when providing too long a description during group creation.
 #. TRANS: %d is the maximum number of allowed characters.
+#. TRANS: API validation exception thrown when description does not validate.
+#. TRANS: %d is the maximum description length and used for plural.
 #. TRANS: Validation error shown when providing too long a description in the "Edit application" form.
 #. TRANS: %d is the maximum number of allowed characters.
 #. TRANS: Group edit form validation error.
@@ -650,9 +495,6 @@ msgstr "Полното име е предолго (највеќе 255 знаци
 #. TRANS: %d is the maximum number of characters for the description.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed characters.
-#: actions/apigroupcreate.php:201 actions/editapplication.php:202
-#: actions/editgroup.php:211 actions/newapplication.php:182
-#: actions/newgroup.php:157
 #, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."
@@ -660,23 +502,21 @@ msgstr[0] "Описот е предолг (дозволено е највеќе
 msgstr[1] "Описот е предолг (дозволено е највеќе %d знаци)."
 
 #. TRANS: Client error shown when providing too long a location during group creation.
+#. TRANS: API validation exception thrown when location does not validate.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:215 actions/editgroup.php:218
-#: actions/newgroup.php:164 actions/profilesettings.php:266
-#: actions/register.php:220
 msgid "Location is too long (maximum 255 characters)."
 msgstr "Местоположбата е предолга (највеќе 255 знаци)."
 
 #. TRANS: Client error shown when providing too many aliases during group creation.
 #. TRANS: %d is the maximum number of allowed aliases.
+#. TRANS: API validation exception thrown when aliases do not validate.
+#. TRANS: %d is the maximum number of aliases and used for plural.
 #. TRANS: Group edit form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.
-#: actions/apigroupcreate.php:236 actions/editgroup.php:231
-#: actions/newgroup.php:177
 #, php-format
 msgid "Too many aliases! Maximum %d allowed."
 msgid_plural "Too many aliases! Maximum %d allowed."
@@ -685,25 +525,24 @@ msgstr[1] "Премногу алијаси! Дозволено е највеќе
 
 #. TRANS: Client error shown when providing an invalid alias during group creation.
 #. TRANS: %s is the invalid alias.
-#: actions/apigroupcreate.php:253
+#. TRANS: API validation exception thrown when aliases does not validate.
+#. TRANS: %s is the invalid alias.
 #, php-format
 msgid "Invalid alias: \"%s\"."
 msgstr "Неважечки алијас: „%s“."
 
 #. TRANS: Client error displayed when trying to use an alias during group creation that is already in use.
 #. TRANS: %s is the alias that is already in use.
+#. TRANS: API validation exception thrown when aliases is already used.
+#. TRANS: %s is the already used alias.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error. %s is the already used alias.
-#: actions/apigroupcreate.php:264 actions/apigroupprofileupdate.php:351
-#: actions/editgroup.php:246 actions/newgroup.php:193
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "Алијасот „%s“ е зафатен. Одберете друг."
 
 #. TRANS: Client error displayed when trying to use an alias during group creation that is the same as the group's nickname.
 #. TRANS: Group edit form validation error.
-#: actions/apigroupcreate.php:278 actions/apigroupprofileupdate.php:359
-#: actions/editgroup.php:253
 msgid "Alias can't be the same as nickname."
 msgstr "Алијасот не може да биде ист како прекарот."
 
@@ -711,26 +550,21 @@ msgstr "Алијасот не може да биде ист како прека
 #. TRANS: Client error displayed when trying to join a group that does not exist.
 #. TRANS: Client error displayed when trying to leave a group that does not exist.
 #. TRANS: Client error displayed trying to show group membership on a non-existing group.
+#. TRANS: Client error displayed when not providing a group or an invalid group.
 #. TRANS: Client error displayed when trying to show a group that could not be found.
 #. TRANS: Client error displayed requesting most recent notices to a group for a non-existing group.
-#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
-#: actions/apigroupleave.php:104 actions/apigroupmembership.php:71
-#: actions/apigroupprofileupdate.php:113 actions/apigroupshow.php:81
-#: actions/apitimelinegroup.php:89
 msgid "Group not found."
 msgstr "Групата не е пронајдена."
 
 #. TRANS: Server error displayed when trying to join a group the user is already a member of.
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:345
 msgid "You are already a member of that group."
 msgstr "Веќе членувате во таа група."
 
 #. TRANS: Server error displayed when trying to join a group the user is blocked from joining.
 #. 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.
-#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:350
 msgid "You have been blocked from that group by the admin."
 msgstr "Блокирани сте од таа група од администраторот."
 
@@ -738,13 +572,11 @@ msgstr "Блокирани сте од таа група од администр
 #. TRANS: %1$s is the joining user's nickname, $2$s is the group nickname for which the join failed.
 #. TRANS: Message given having failed to add a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:136 actions/joingroup.php:139 lib/command.php:362
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "Не можам да го зачленам корисникот %1$s во групата 2$s."
 
 #. TRANS: Server error displayed when trying to leave a group the user is not a member of.
-#: actions/apigroupleave.php:115
 msgid "You are not a member of this group."
 msgstr "Не членувате во оваа група."
 
@@ -752,114 +584,76 @@ msgstr "Не членувате во оваа група."
 #. TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
 #. TRANS: Message given having failed to remove a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupleave.php:127 actions/leavegroup.php:133
-#: lib/command.php:410
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
 msgstr "Не можев да го отстранам корисникот %1$s од групата %2$s."
 
 #. TRANS: Used as title in check for group membership. %s is a user name.
-#: actions/apigrouplist.php:94
 #, php-format
 msgid "%s's groups"
 msgstr "%s групи"
 
 #. TRANS: Used as subtitle in check for group membership. %1$s is a user name, %2$s is the site name.
-#: actions/apigrouplist.php:104
 #, php-format
 msgid "%1$s groups %2$s is a member of."
 msgstr "%1$s групи кадешто членува %2$s."
 
 #. TRANS: Message is used as a title when listing the lastest 20 groups. %s is a site name.
 #. TRANS: Message is used as a page title. %s is a nick name.
-#: actions/apigrouplistall.php:88 actions/usergroups.php:63
 #, php-format
 msgid "%s groups"
 msgstr "%s групи"
 
 #. TRANS: Message is used as a subtitle when listing the lastest 20 groups. %s is a site name.
-#: actions/apigrouplistall.php:93
 #, php-format
 msgid "groups on %s"
 msgstr "групи на %s"
 
+#. TRANS: Client error displayed when trying to edit a group without being an admin.
 #. TRANS: Client error displayed trying to edit a group while not being a group admin.
 #. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
 #. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
-#: actions/apigroupprofileupdate.php:118 actions/editgroup.php:110
-#: actions/editgroup.php:176 actions/groupdesignsettings.php:109
-#: actions/grouplogo.php:111
 msgid "You must be an admin to edit the group."
 msgstr "Мора да сте администратор за да можете да ја уредите групата."
 
+#. TRANS: Server error displayed when group update fails.
 #. TRANS: Server error displayed when editing a group fails.
-#: actions/apigroupprofileupdate.php:171 actions/editgroup.php:274
 msgid "Could not update group."
 msgstr "Не можев да ја подновам групата."
 
+#. TRANS: Server error displayed when adding group aliases fails.
 #. TRANS: Server error displayed when group aliases could not be added.
 #. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/apigroupprofileupdate.php:194 actions/editgroup.php:281
-#: classes/User_group.php:540
 msgid "Could not create aliases."
 msgstr "Не можеше да се создадат алијаси."
 
+#. TRANS: API validation exception thrown when nickname does not validate.
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: actions/apigroupprofileupdate.php:249 lib/nickname.php:165
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr "Прекарот мора да има само мали букви и бројки и да нема празни места."
 
-#: actions/apigroupprofileupdate.php:286
-#, fuzzy
-msgid "Full name is too long (max 255 chars)."
-msgstr "Полното име е предолго (највеќе 255 знаци)."
-
-#: actions/apigroupprofileupdate.php:296
-#, fuzzy, php-format
-msgid "description is too long (max %d chars)."
-msgstr "Описот е предолг (дозволено е највеќе %d знак."
-
-#: actions/apigroupprofileupdate.php:307
-#, fuzzy
-msgid "Location is too long (max 255 chars)."
-msgstr "Местоположбата е предолга (највеќе 255 знаци)."
-
-#: actions/apigroupprofileupdate.php:326
-#, fuzzy, php-format
-msgid "Too many aliases! Maximum %d."
-msgstr "Премногу алијаси! Дозволено е највеќе %d."
-
-#. TRANS: Group edit form validation error.
+#. TRANS: API validation exception thrown when alias is the same as nickname.
 #. TRANS: Group create form validation error.
-#. TRANS: %s is the invalid alias.
-#: actions/apigroupprofileupdate.php:342 actions/editgroup.php:241
-#: actions/newgroup.php:188
-#, php-format
-msgid "Invalid alias: \"%s\""
-msgstr "Неважечки алијас: „%s“"
+msgid "Alias cannot be the same as nickname."
+msgstr "Алијасот не може да биде ист како прекарот."
 
 #. TRANS: Client error displayed when uploading a media file has failed.
-#: actions/apimediaupload.php:101
 msgid "Upload failed."
 msgstr "Подигањето не успеа."
 
 #. TRANS: Client error given from the OAuth API when the request token or verifier is invalid.
-#: actions/apioauthaccesstoken.php:102
 msgid "Invalid request token or verifier."
 msgstr "Неважечки жетон за барање или потврдник."
 
 #. TRANS: Client error given when no oauth_token was passed to the OAuth API.
-#: actions/apioauthauthorize.php:107
 msgid "No oauth_token parameter provided."
 msgstr "Нема наведено oauth_token параметар."
 
 #. TRANS: Client error given when an invalid request token was passed to the OAuth API.
-#: actions/apioauthauthorize.php:115 actions/apioauthauthorize.php:129
 msgid "Invalid request token."
 msgstr "Неважечки жетон за барање."
 
 #. TRANS: Client error given when an invalid request token was passed to the OAuth API.
-#: actions/apioauthauthorize.php:121
 msgid "Request token already authorized."
 msgstr "Жетонот за барање е веќе овластен."
 
@@ -869,31 +663,14 @@ msgstr "Жетонот за барање е веќе овластен."
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
 #. TRANS: Client error displayed when the session token is not okay.
-#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:75
-#: actions/emailsettings.php:292 actions/favor.php:75 actions/geocode.php:55
-#: actions/groupblock.php:65 actions/grouplogo.php:321
-#: actions/groupunblock.php:65 actions/imsettings.php:241
-#: actions/invite.php:60 actions/makeadmin.php:66 actions/newmessage.php:135
-#: actions/newnotice.php:105 actions/nudge.php:80
-#: actions/oauthappssettings.php:162 actions/oauthconnectionssettings.php:135
-#: actions/passwordsettings.php:137 actions/pluginenable.php:87
-#: actions/profilesettings.php:218 actions/recoverpassword.php:383
-#: actions/register.php:157 actions/remotesubscribe.php:76
-#: actions/repeat.php:82 actions/smssettings.php:249 actions/subedit.php:40
-#: actions/subscribe.php:87 actions/tagother.php:145
-#: actions/unsubscribe.php:69 actions/urlsettings.php:171
-#: actions/userauthorization.php:53 lib/designsettings.php:122
 msgid "There was a problem with your session token. Try again, please."
 msgstr "Се поајви проблем со Вашиот сесиски жетон. Обидете се повторно."
 
 #. TRANS: Form validation error given when an invalid username and/or password was passed to the OAuth API.
-#: actions/apioauthauthorize.php:168
 msgid "Invalid nickname / password!"
 msgstr "Погрешен прекар / лозинка!"
 
 #. TRANS: Server error displayed when a database action fails.
-#: actions/apioauthauthorize.php:217
 msgid "Database error inserting oauth_token_association."
 msgstr "Грешка во базата при вметнувањето на auth_token_association."
 
@@ -909,28 +686,19 @@ msgstr "Грешка во базата при вметнувањето на auth
 #. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
 #. TRANS: Message given submitting a form with an unknown action in SMS settings.
 #. TRANS: Unknown form validation error in design settings form.
-#: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
-#: actions/designadminpanel.php:100 actions/editapplication.php:144
-#: actions/emailsettings.php:311 actions/grouplogo.php:332
-#: actions/imsettings.php:256 actions/newapplication.php:124
-#: actions/oauthconnectionssettings.php:144 actions/recoverpassword.php:46
-#: actions/smssettings.php:270 lib/designsettings.php:133
 msgid "Unexpected form submission."
 msgstr "Неочекувано поднесување на образец."
 
 #. TRANS: Title for a page where a user can confirm/deny account access by an external application.
-#: actions/apioauthauthorize.php:387
 msgid "An application would like to connect to your account"
 msgstr "Има програм кој сака да се поврзе со Вашата сметка"
 
 #. TRANS: Fieldset legend.
-#: actions/apioauthauthorize.php:404
 msgid "Allow or deny access"
 msgstr "Дозволи или одбиј пристап"
 
 #. TRANS: User notification of external application requesting account access.
 #. TRANS: %3$s is the access type requested (read-write or read-only), %4$s is the StatusNet sitename.
-#: actions/apioauthauthorize.php:425
 #, php-format
 msgid ""
 "An application would like the ability to <strong>%3$s</strong> your %4$s "
@@ -944,7 +712,6 @@ msgstr ""
 #. TRANS: User notification of external application requesting account access.
 #. TRANS: %1$s is the application name requesting access, %2$s is the organisation behind the application,
 #. TRANS: %3$s is the access type requested, %4$s is the StatusNet sitename.
-#: actions/apioauthauthorize.php:433
 #, php-format
 msgid ""
 "The application <strong>%1$s</strong> by <strong>%2$s</strong> would like "
@@ -956,22 +723,18 @@ msgstr ""
 "пристап до Вашата %4$s сметка само на трети страни на кои им верувате."
 
 #. TRANS: Fieldset legend.
-#: actions/apioauthauthorize.php:455
 msgctxt "LEGEND"
 msgid "Account"
 msgstr "Сметка"
 
 #. TRANS: Field label on OAuth API authorisation form.
+#. TRANS: Field label on login page.
 #. TRANS: Field label in form for profile settings.
-#: actions/apioauthauthorize.php:459 actions/login.php:225
-#: actions/profilesettings.php:107 actions/register.php:411
-#: actions/userauthorization.php:145 lib/groupeditform.php:145
 msgid "Nickname"
 msgstr "Прекар"
 
 #. TRANS: Field label on OAuth API authorisation form.
-#: actions/apioauthauthorize.php:463 actions/login.php:228
-#: actions/register.php:415 lib/settingsnav.php:87
+#. TRANS: Field label on login page.
 msgid "Password"
 msgstr "Лозинка"
 
@@ -981,43 +744,34 @@ msgstr "Лозинка"
 #. TRANS: Button label to cancel an IM address confirmation procedure.
 #. TRANS: Button label to cancel a SMS address confirmation procedure.
 #. TRANS: Button label in the "Edit application" form.
-#: actions/apioauthauthorize.php:478 actions/emailsettings.php:125
-#: actions/imsettings.php:136 actions/smssettings.php:132
-#: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Cancel"
 msgstr "Откажи"
 
 #. TRANS: Button text that when clicked will allow access to an account by an external application.
-#: actions/apioauthauthorize.php:485
 msgctxt "BUTTON"
 msgid "Allow"
 msgstr "Дозволи"
 
 #. TRANS: Form instructions.
-#: actions/apioauthauthorize.php:502
 msgid "Authorize access to your account information."
 msgstr "Овластете пристап до податоците за Вашата сметка."
 
 #. TRANS: Header for user notification after revoking OAuth access to an application.
-#: actions/apioauthauthorize.php:594
 msgid "Authorization canceled."
 msgstr "Овластувањето е откажано."
 
 #. TRANS: User notification after revoking OAuth access to an application.
 #. TRANS: %s is an OAuth token.
-#: actions/apioauthauthorize.php:598
 #, php-format
 msgid "The request token %s has been revoked."
 msgstr "Жетонот за барање %s е повлечен."
 
 #. TRANS: Title of the page notifying the user that an anonymous client application was successfully authorized to access the user's account with OAuth.
-#: actions/apioauthauthorize.php:621
 msgid "You have successfully authorized the application"
 msgstr "Успешно го овластивте програмот."
 
 #. TRANS: Message notifying the user that an anonymous client application was successfully authorized to access the user's account with OAuth.
-#: actions/apioauthauthorize.php:625
 msgid ""
 "Please return to the application and enter the following security code to "
 "complete the process."
@@ -1027,14 +781,12 @@ msgstr ""
 
 #. TRANS: Title of the page notifying the user that the client application was successfully authorized to access the user's account with OAuth.
 #. TRANS: %s is the authorised application name.
-#: actions/apioauthauthorize.php:632
 #, php-format
 msgid "You have successfully authorized %s"
 msgstr "Успешно дадовте овластување на %s."
 
 #. TRANS: Message notifying the user that the client application was successfully authorized to access the user's account with OAuth.
 #. TRANS: %s is the authorised application name.
-#: actions/apioauthauthorize.php:639
 #, php-format
 msgid ""
 "Please return to %s and enter the following security code to complete the "
@@ -1045,12 +797,10 @@ msgstr ""
 
 #. TRANS: Client error displayed trying to delete a status not using POST or DELETE.
 #. TRANS: POST and DELETE should not be translated.
-#: actions/apistatusesdestroy.php:111
 msgid "This method requires a POST or DELETE."
 msgstr "Методот бара POST или DELETE."
 
 #. TRANS: Client error displayed trying to delete a status of another user.
-#: actions/apistatusesdestroy.php:136
 msgid "You may not delete another user's status."
 msgstr "Не можете да избришете статус на друг корисник."
 
@@ -1058,21 +808,16 @@ msgstr "Не можете да избришете статус на друг к
 #. TRANS: Client error displayed trying to display redents of a non-exiting notice.
 #. TRANS: Client exception thrown when referencing a non-existing notice.
 #. TRANS: Error message displayed trying to delete a non-existing notice.
-#: actions/apistatusesretweet.php:74 actions/apistatusesretweets.php:70
-#: actions/atompubshowfavorite.php:82 actions/deletenotice.php:61
-#: actions/shownotice.php:92
 msgid "No such notice."
 msgstr "Нема таква забелешка."
 
 #. TRANS: Client error displayed trying to repeat an own notice through the API.
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:549
 msgid "Cannot repeat your own notice."
 msgstr "Не можете да ја повторувате сопствената забелешка."
 
 #. TRANS: Client error displayed trying to re-repeat a notice through the API.
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:92 lib/command.php:555
 msgid "Already repeated that notice."
 msgstr "Забелешката е веќе повторена."
 
@@ -1082,57 +827,43 @@ msgstr "Забелешката е веќе повторена."
 #. TRANS: Client exception thrown when using an unsupported HTTP method.
 #. TRANS: Client error shown when using a non-supported HTTP method.
 #. TRANS: Client exception thrown when using an unsupported HTTP method.
-#: actions/apistatusesshow.php:118 actions/atompubfavoritefeed.php:103
-#: actions/atompubmembershipfeed.php:105 actions/atompubshowfavorite.php:117
-#: actions/atompubshowmembership.php:116
-#: actions/atompubshowsubscription.php:122
-#: actions/atompubsubscriptionfeed.php:109
 msgid "HTTP method not supported."
 msgstr "HTML-методот не е поддржан."
 
 #. TRANS: Exception thrown requesting an unsupported notice output format.
 #. TRANS: %s is the requested output format.
-#: actions/apistatusesshow.php:144
 #, php-format
 msgid "Unsupported format: %s."
 msgstr "Неподдржан формат: %s."
 
 #. TRANS: Client error displayed requesting a deleted status.
-#: actions/apistatusesshow.php:155
 msgid "Status deleted."
 msgstr "Статусот е избришан."
 
 #. TRANS: Client error displayed requesting a status with an invalid ID.
-#: actions/apistatusesshow.php:162
 msgid "No status with that ID found."
 msgstr "Нема пронајдено статус со тој ID."
 
 #. TRANS: Client error displayed when trying to delete a notice not using the Atom format.
-#: actions/apistatusesshow.php:227
 msgid "Can only delete using the Atom format."
 msgstr "Може да се избрише само користејќи го форматот Atom."
 
 #. TRANS: Client error displayed when a user has no rights to delete notices of other users.
 #. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
-#: actions/apistatusesshow.php:235 actions/deletenotice.php:78
 msgid "Cannot delete this notice."
 msgstr "Не можам да ја избришам оваа забелешка."
 
 #. TRANS: Confirmation of notice deletion in API. %d is the ID (number) of the deleted notice.
-#: actions/apistatusesshow.php:249
 #, php-format
 msgid "Deleted notice %d"
 msgstr "Избришана забелешката %d"
 
 #. TRANS: Client error displayed when the parameter "status" is missing.
-#: actions/apistatusesupdate.php:221
 msgid "Client must provide a 'status' parameter with a value."
 msgstr "Клиентот мора да укаже вредност за параметарот „статус“"
 
 #. TRANS: Client error displayed when the parameter "status" is missing.
 #. TRANS: %d is the maximum number of character for a notice.
-#: actions/apistatusesupdate.php:244 actions/newnotice.php:161
-#: lib/mailhandler.php:60
 #, php-format
 msgid "That's too long. Maximum notice size is %d character."
 msgid_plural "That's too long. Maximum notice size is %d characters."
@@ -1140,13 +871,11 @@ msgstr[0] "Ова е предолго. Дозволен е највеќе %d з
 msgstr[1] "Ова е предолго. Дозволени се највеќе %d знаци."
 
 #. TRANS: Client error displayed when replying to a non-existing notice.
-#: actions/apistatusesupdate.php:284
 msgid "Parent notice not found."
 msgstr "Матичната забелешка не е пронајдена."
 
 #. TRANS: Client error displayed exceeding the maximum notice length.
 #. TRANS: %d is the maximum lenth for a notice.
-#: actions/apistatusesupdate.php:308 actions/newnotice.php:184
 #, php-format
 msgid "Maximum notice size is %d character, including attachment URL."
 msgid_plural "Maximum notice size is %d characters, including attachment URL."
@@ -1159,13 +888,11 @@ msgstr[1] ""
 
 #. TRANS: Client error displayed when requesting profiles of followers in an unsupported format.
 #. TRANS: Client error displayed when requesting IDs of followers in an unsupported format.
-#: actions/apisubscriptions.php:228 actions/apisubscriptions.php:258
 msgid "Unsupported format."
 msgstr "Неподдржан формат."
 
 #. TRANS: Title for timeline of most recent favourite notices by a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname.
-#: actions/apitimelinefavorites.php:108
 #, php-format
 msgid "%1$s / Favorites from %2$s"
 msgstr "%1$s / Бендисани од %2$s"
@@ -1173,14 +900,12 @@ msgstr "%1$s / Бендисани од %2$s"
 #. TRANS: Subtitle for timeline of most recent favourite notices by a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user's full name,
 #. TRANS: %3$s is a user nickname.
-#: actions/apitimelinefavorites.php:120
 #, php-format
 msgid "%1$s updates favorited by %2$s / %3$s."
 msgstr "Подновувања на %1$s бендисани од %2$s / %3$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.
-#: actions/apitimelinementions.php:115
 #, php-format
 msgid "%1$s / Updates mentioning %2$s"
 msgstr "%1$s / Подновувања кои споменуваат %2$s"
@@ -1188,220 +913,179 @@ msgstr "%1$s / Подновувања кои споменуваат %2$s"
 #. TRANS: Subtitle for timeline of most recent mentions of a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname,
 #. TRANS: %3$s is a user's full name.
-#: actions/apitimelinementions.php:131
 #, php-format
 msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr "%1$s подновувања коишто се одговор на подновувањата од %2$s / %3$s."
 
 #. TRANS: Title for site timeline. %s is the StatusNet sitename.
 #. TRANS: Public RSS feed title. %s is the StatusNet site name.
-#: actions/apitimelinepublic.php:193 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "Јавна историја на %s"
 
 #. TRANS: Subtitle for site timeline. %s is the StatusNet sitename.
-#: actions/apitimelinepublic.php:199
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "%s подновуввања од сите!"
 
 #. TRANS: Server error displayed calling unimplemented API method for 'retweeted by me'.
-#: actions/apitimelineretweetedbyme.php:71
 msgid "Unimplemented."
 msgstr "Неспроведено."
 
 #. TRANS: Title for Atom feed "repeated to me". %s is the user nickname.
-#: actions/apitimelineretweetedtome.php:96
 #, php-format
 msgid "Repeated to %s"
 msgstr "Повторено за %s"
 
-#: actions/apitimelineretweetedtome.php:98
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s notices that were to repeated to %2$s / %3$s."
-msgstr "%1$s подновувања коишто се одговор на подновувањата од %2$s / %3$s."
+msgstr "%1$s забелешки што му се повторени на корисникот %2$s / %3$s."
 
 #. TRANS: Title of list of repeated notices of the logged in user.
 #. TRANS: %s is the nickname of the logged in user.
-#: actions/apitimelineretweetsofme.php:98
 #, php-format
 msgid "Repeats of %s"
 msgstr "Повторувања на %s"
 
-#: actions/apitimelineretweetsofme.php:104
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s notices that %2$s / %3$s has repeated."
-msgstr "%1$s ја бендиса забелешката %2$s."
+msgstr "Забелешки од %1$s што ги повторил корисникот %2$s / %3$s."
 
 #. TRANS: Title for timeline with lastest notices with a given tag.
 #. TRANS: %s is the tag.
 #. TRANS: Title for first page of notices with tags.
 #. TRANS: %s is the tag.
-#: actions/apitimelinetag.php:101 actions/tag.php:69
 #, php-format
 msgid "Notices tagged with %s"
 msgstr "Забелешки означени со %s"
 
 #. TRANS: Subtitle for timeline with lastest notices with a given tag.
 #. TRANS: %1$s is the tag, $2$s is the StatusNet sitename.
-#: actions/apitimelinetag.php:105 actions/tagrss.php:65
 #, php-format
 msgid "Updates tagged with %1$s on %2$s!"
 msgstr "Подновувањата се означени со %1$s на %2$s!"
 
 #. TRANS: Client error displayed trying to add a notice to another user's timeline.
-#: actions/apitimelineuser.php:308
 msgid "Only the user can add to their own timeline."
 msgstr "Само корисникот може да ја надополнува својата хронологија."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:315
 msgid "Only accept AtomPub for Atom feeds."
 msgstr "Прифаќај само AtomPub за Atom-канали."
 
 #. TRANS: Client error displayed attempting to post an empty API notice.
-#: actions/apitimelineuser.php:322
 msgid "Atom post must not be empty."
 msgstr "Забелешката преку Atom не смее да биде празна."
 
 #. TRANS: Client error displayed attempting to post an API that is not well-formed XML.
-#: actions/apitimelineuser.php:328
 msgid "Atom post must be well-formed XML."
 msgstr "Забелешката преку Atom мора да биде добро-поставен XML."
 
 #. TRANS: Client error displayed when not using an Atom entry.
-#: actions/apitimelineuser.php:334 actions/atompubfavoritefeed.php:228
-#: actions/atompubmembershipfeed.php:230
-#: actions/atompubsubscriptionfeed.php:236
 msgid "Atom post must be an Atom entry."
 msgstr "Забелешката преку Atom мора да биде Atom-ставка."
 
 #. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
-#: actions/apitimelineuser.php:345
 msgid "Can only handle POST activities."
 msgstr "Може да работи само со POST-активности."
 
 #. TRANS: Client error displayed when using an unsupported activity object type.
 #. TRANS: %s is the unsupported activity object type.
-#: actions/apitimelineuser.php:356
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr "Не може да работи со предмети на активност од типот „%s“."
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
 #. TRANS: %d is the notice ID (number).
-#: actions/apitimelineuser.php:390
 #, php-format
 msgid "No content for notice %d."
 msgstr "Нема содржина за забелешката %d."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
 #. TRANS: %s is the notice URI.
-#: actions/apitimelineuser.php:419
 #, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "Веќе постои забелешка со URI „%s“."
 
 #. TRANS: Server error for unfinished API method showTrends.
-#: actions/apitrends.php:85
 msgid "API method under construction."
 msgstr "API-методот е во изработка."
 
 #. TRANS: Client error displayed when requesting user information for a non-existing user.
-#: actions/apiuserprofileimage.php:80 actions/apiusershow.php:94
 msgid "User not found."
 msgstr "Корисникот не е пронајден."
 
 #. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
 #. TRANS: Client exception.
 #. TRANS: Client error displayed trying to subscribe to a non-existing profile.
-#: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
-#: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
-#: actions/subscribe.php:110
 msgid "No such profile."
 msgstr "Нема таков профил."
 
 #. TRANS: Subtitle for Atom favorites feed.
 #. TRANS: %1$s is a user nickname, %2$s is the StatusNet sitename.
-#: actions/atompubfavoritefeed.php:147
 #, php-format
 msgid "Notices %1$s has favorited on %2$s"
 msgstr "Забелешки на %2$s што ги бендисал(а) %1$s"
 
 #. TRANS: Client exception thrown when trying to set a favorite for another user.
 #. TRANS: Client exception thrown when trying to subscribe another user.
-#: actions/atompubfavoritefeed.php:217 actions/atompubsubscriptionfeed.php:225
 msgid "Cannot add someone else's subscription."
 msgstr "Не можам да додадам туѓа претплата."
 
 #. TRANS: Client exception thrown when trying use an incorrect activity verb for the Atom pub method.
-#: actions/atompubfavoritefeed.php:240
 msgid "Can only handle favorite activities."
 msgstr "Може да работи само со бендисани активности."
 
 #. TRANS: Client exception thrown when trying favorite an object that is not a notice.
-#: actions/atompubfavoritefeed.php:250 actions/atompubmembershipfeed.php:250
 msgid "Can only fave notices."
 msgstr "Може само да бендисува забелешки."
 
 #. TRANS: Client exception thrown when trying favorite a notice without content.
-#: actions/atompubfavoritefeed.php:259
 msgid "Unknown note."
 msgstr "Непозната белешка."
 
 #. TRANS: Client exception thrown when trying favorite an already favorited notice.
-#: actions/atompubfavoritefeed.php:267
 msgid "Already a favorite."
 msgstr "Веќе е бендисано."
 
 #. TRANS: Title for group membership feed.
 #. TRANS: %s is a username.
-#: actions/atompubmembershipfeed.php:144
 #, php-format
 msgid "%s group memberships"
 msgstr "Членства на групата %s"
 
 #. TRANS: Subtitle for group membership feed.
 #. TRANS: %1$s is a username, %2$s is the StatusNet sitename.
-#: actions/atompubmembershipfeed.php:149
 #, php-format
 msgid "Groups %1$s is a member of on %2$s"
 msgstr "Групи на %2$s кадешто членува %1$s"
 
 #. TRANS: Client exception thrown when trying subscribe someone else to a group.
-#: actions/atompubmembershipfeed.php:219
 msgid "Cannot add someone else's membership."
 msgstr "Не можам да додадам туѓо членство."
 
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#: actions/atompubmembershipfeed.php:242
 msgid "Can only handle join activities."
 msgstr "Може да работи само со активности за зачленување."
 
 #. TRANS: Client exception thrown when trying to subscribe to a non-existing group.
-#: actions/atompubmembershipfeed.php:259
 msgid "Unknown group."
 msgstr "Непозната група."
 
 #. TRANS: Client exception thrown when trying to subscribe to an already subscribed group.
-#: actions/atompubmembershipfeed.php:267
 msgid "Already a member."
 msgstr "Веќе членувате."
 
 #. TRANS: Client exception thrown when trying to subscribe to group while blocked from that group.
-#: actions/atompubmembershipfeed.php:275
 msgid "Blocked by admin."
 msgstr "Блокиран од администратор."
 
 #. TRANS: Client exception thrown when referencing a non-existing favorite.
-#: actions/atompubshowfavorite.php:90
 msgid "No such favorite."
 msgstr "Нема таква бендисана ставка."
 
 #. TRANS: Client exception thrown when trying to remove a favorite notice of another user.
-#: actions/atompubshowfavorite.php:151
 msgid "Cannot delete someone else's favorite."
 msgstr "Не можам да избришам туѓo бендисанo."
 
@@ -1427,90 +1111,65 @@ msgstr "Не можам да избришам туѓo бендисанo."
 #. TRANS: Client error displayed when trying to join a non-existing group.
 #. TRANS: Client error displayed when trying to leave a non-local group.
 #. TRANS: Client error displayed when trying to leave a non-existing group.
+#. TRANS: Client error displayed when providing an invalid group ID on the Make Admin page.
 #. 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.
 #. TRANS: Command exception text shown when a group is requested that does not exist.
 #. TRANS: Error text shown when trying to leave a group that does not exist.
-#: actions/atompubshowmembership.php:81 actions/blockedfromgroup.php:81
-#: actions/blockedfromgroup.php:89 actions/deletegroup.php:87
-#: actions/deletegroup.php:100 actions/editgroup.php:102
-#: actions/foafgroup.php:46 actions/foafgroup.php:65 actions/foafgroup.php:73
-#: actions/groupblock.php:89 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:101 actions/grouplogo.php:103
-#: actions/groupmembers.php:84 actions/groupmembers.php:92
-#: actions/grouprss.php:97 actions/grouprss.php:105
-#: actions/groupunblock.php:89 actions/joingroup.php:82
-#: actions/joingroup.php:95 actions/leavegroup.php:82
-#: actions/leavegroup.php:95 actions/makeadmin.php:86
-#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:392
 msgid "No such group."
 msgstr "Нема таква група."
 
 #. TRANS: Client exception thrown when trying to show membership of a non-subscribed group
-#: actions/atompubshowmembership.php:91
 msgid "Not a member."
 msgstr "Не членувате."
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
-#: actions/atompubshowmembership.php:150
 msgid "Cannot delete someone else's membership."
 msgstr "Не можам да избришам туѓо членство."
 
 #. TRANS: Client exception thrown when trying to display a subscription for a non-existing profile ID.
 #. TRANS: %d is the non-existing profile ID number.
-#: actions/atompubshowsubscription.php:72
-#: actions/atompubshowsubscription.php:83
-#: actions/atompubsubscriptionfeed.php:74
 #, php-format
 msgid "No such profile id: %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.
-#: actions/atompubshowsubscription.php:94
 #, php-format
 msgid "Profile %1$d not subscribed to profile %2$d."
 msgstr "Профилот %1$d не е претплатен на профилот %2$d."
 
 #. TRANS: Client exception thrown when trying to delete a subscription of another user.
-#: actions/atompubshowsubscription.php:157
 msgid "Cannot delete someone else's subscription."
 msgstr "Не можам да избришам туѓа претплата."
 
 #. TRANS: Subtitle for Atom subscription feed.
 #. TRANS: %1$s is a user nickname, %s$s is the StatusNet sitename.
-#: actions/atompubsubscriptionfeed.php:153
 #, php-format
 msgid "People %1$s has subscribed to on %2$s"
 msgstr "Луѓе на %2$s на коишто е претплатен(а) %1$s"
 
 #. TRANS: Client error displayed when not using the follow verb.
-#: actions/atompubsubscriptionfeed.php:248
 msgid "Can only handle Follow activities."
 msgstr "Може да работи само со аквитности за следење."
 
 #. TRANS: Client exception thrown when subscribing to an object that is not a person.
-#: actions/atompubsubscriptionfeed.php:256
 msgid "Can only follow people."
 msgstr "Може само да следи луѓе."
 
 #. TRANS: Client exception thrown when subscribing to a non-existing profile.
 #. TRANS: %s is the unknown profile ID.
-#: actions/atompubsubscriptionfeed.php:267
 #, php-format
 msgid "Unknown profile %s."
 msgstr "Непознат профил %s."
 
 #. TRANS: Client error displayed trying to subscribe to an already subscribed profile.
 #. TRANS: %s is the profile the user already has a subscription on.
-#: actions/atompubsubscriptionfeed.php:275
 #, php-format
 msgid "Already subscribed to %s."
 msgstr "Веќе сте претплатени на %s."
 
 #. TRANS: Client error displayed trying to get a non-existing attachment.
-#: actions/attachment.php:73
 msgid "No such attachment."
 msgstr "Нема таков прилог."
 
@@ -1522,31 +1181,23 @@ msgstr "Нема таков прилог."
 #. TRANS: Client error displayed when trying to view group members without providing a group nickname.
 #. TRANS: Client error displayed when requesting a group RSS feed without providing a group nickname.
 #. TRANS: Client error displayed if no nickname argument was given requesting a group page.
-#: actions/avatarbynickname.php:60 actions/blockedfromgroup.php:73
-#: actions/editgroup.php:85 actions/groupdesignsettings.php:84
-#: actions/grouplogo.php:86 actions/groupmembers.php:76
-#: actions/grouprss.php:89 actions/showgroup.php:116
 msgid "No nickname."
 msgstr "Нема прекар."
 
 #. TRANS: Client error displayed trying to get an avatar without providing an avatar size.
-#: actions/avatarbynickname.php:66
 msgid "No size."
 msgstr "Нема големина."
 
 #. TRANS: Client error displayed trying to get an avatar providing an invalid avatar size.
-#: actions/avatarbynickname.php:72
 msgid "Invalid size."
 msgstr "Погрешна големина."
 
 #. TRANS: Title for avatar upload page.
-#: actions/avatarsettings.php:66 lib/settingsnav.php:82
 msgid "Avatar"
 msgstr "Аватар"
 
 #. TRANS: Instruction for avatar upload page.
 #. TRANS: %s is the maximum file size, for example "500b", "10kB" or "2MB".
-#: actions/avatarsettings.php:78
 #, php-format
 msgid "You can upload your personal avatar. The maximum file size is %s."
 msgstr ""
@@ -1557,17 +1208,12 @@ msgstr ""
 #. TRANS: Server error displayed coming across a request from a user without a profile.
 #. TRANS: Server error displayed when trying to authorise a remote subscription request
 #. TRANS: while the user has no profile.
-#: actions/avatarsettings.php:108 actions/avatarsettings.php:192
-#: actions/grouplogo.php:184 actions/remotesubscribe.php:190
-#: actions/userauthorization.php:75 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr "Корисник без соодветен профил."
 
 #. TRANS: Avatar upload page form legend.
 #. TRANS: Avatar upload page crop form legend.
 #. TRANS: Legend for group logo settings fieldset.
-#: actions/avatarsettings.php:122 actions/avatarsettings.php:205
-#: actions/grouplogo.php:261
 msgid "Avatar settings"
 msgstr "Нагодувања на аватарот"
 
@@ -1575,8 +1221,6 @@ msgstr "Нагодувања на аватарот"
 #. TRANS: Header on avatar upload crop form for thumbnail of originally uploaded avatar (h2).
 #. TRANS: Uploaded original file in group logo form.
 #. TRANS: Header for originally uploaded file before a crop on the group logo page.
-#: actions/avatarsettings.php:131 actions/avatarsettings.php:214
-#: actions/grouplogo.php:207 actions/grouplogo.php:270
 msgid "Original"
 msgstr "Оригинал"
 
@@ -1584,80 +1228,65 @@ msgstr "Оригинал"
 #. TRANS: Header on avatar upload crop form for thumbnail of to be used rendition of uploaded avatar (h2).
 #. TRANS: Header for preview of to be displayed group logo.
 #. TRANS: Header for the cropped group logo on the group logo page.
-#: actions/avatarsettings.php:147 actions/avatarsettings.php:227
-#: actions/grouplogo.php:219 actions/grouplogo.php:283
 msgid "Preview"
 msgstr "Преглед"
 
 #. TRANS: Button on avatar upload page to delete current avatar.
 #. TRANS: Button text for user account deletion.
-#: actions/avatarsettings.php:155 actions/deleteaccount.php:319
 msgctxt "BUTTON"
 msgid "Delete"
 msgstr "Избриши"
 
 #. TRANS: Button on avatar upload page to upload an avatar.
 #. TRANS: Submit button to confirm upload of a user backup file for account restore.
-#: actions/avatarsettings.php:173 actions/restoreaccount.php:369
 msgctxt "BUTTON"
 msgid "Upload"
 msgstr "Подигни"
 
 #. TRANS: Button on avatar upload crop form to confirm a selected crop as avatar.
-#: actions/avatarsettings.php:243
 msgctxt "BUTTON"
 msgid "Crop"
 msgstr "Отсечи"
 
 #. TRANS: Validation error on avatar upload form when no file was uploaded.
-#: actions/avatarsettings.php:318
 msgid "No file uploaded."
 msgstr "Нема подигнато податотека."
 
 #. TRANS: Avatar upload form instruction after uploading a file.
-#: actions/avatarsettings.php:345
 msgid "Pick a square area of the image to be your avatar."
 msgstr "Одберете квадратна површина од сликата за аватар."
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
 #. TRANS: Server error displayed trying to crop an uploaded group logo that is no longer present.
-#: actions/avatarsettings.php:360 actions/grouplogo.php:391
 msgid "Lost our file data."
 msgstr "Податоците за податотеката се изгубени."
 
 #. TRANS: Success message for having updated a user avatar.
-#: actions/avatarsettings.php:384
 msgid "Avatar updated."
 msgstr "Аватарот е подновен."
 
 #. TRANS: Error displayed on the avatar upload page if the avatar could not be updated for an unknown reason.
-#: actions/avatarsettings.php:388
 msgid "Failed updating avatar."
 msgstr "Подновата на аватарот не успеа."
 
 #. TRANS: Success message for deleting a user avatar.
-#: actions/avatarsettings.php:412
 msgid "Avatar deleted."
 msgstr "Аватарот е избришан."
 
 #. TRANS: Title for backup account page.
 #. TRANS: Option in profile settings to create a backup of the account of the currently logged in user.
-#: actions/backupaccount.php:61 actions/profilesettings.php:468
 msgid "Backup account"
 msgstr "Резервна сметка"
 
 #. TRANS: Client exception thrown when trying to backup an account while not logged in.
-#: actions/backupaccount.php:79
 msgid "Only logged-in users can backup their account."
 msgstr "Само одјавени корисници можат да прават резервна верзија на сметката."
 
 #. TRANS: Client exception thrown when trying to backup an account without having backup rights.
-#: actions/backupaccount.php:84
 msgid "You may not backup your account."
 msgstr "Не можете да направите резрвна верзија на Вашата сметка."
 
 #. TRANS: Information displayed on the backup account page.
-#: actions/backupaccount.php:227
 msgid ""
 "You can backup your account data in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format. This is an experimental feature and provides "
@@ -1672,30 +1301,25 @@ msgstr ""
 "резервата не се зачувуваат и подигнатите податотеки и непосредните пораки."
 
 #. TRANS: Submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:250
 msgctxt "BUTTON"
 msgid "Backup"
 msgstr "Резерва"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:254
 msgid "Backup your account."
 msgstr "Направете резервна верзија на сметката."
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
-#: actions/block.php:68
 msgid "You already blocked that user."
 msgstr "Веќе го имате блокирано тој корисник."
 
 #. TRANS: Title for block user page.
 #. TRANS: Legend for block user form.
 #. TRANS: Fieldset legend for block user from group form.
-#: actions/block.php:106 actions/block.php:136 actions/groupblock.php:165
 msgid "Block user"
 msgstr "Блокирај корисник"
 
 #. TRANS: Explanation of consequences when blocking a user on the block user page.
-#: actions/block.php:139
 msgid ""
 "Are you sure you want to block this user? Afterwards, they will be "
 "unsubscribed from you, unable to subscribe to you in the future, and you "
@@ -1712,15 +1336,11 @@ msgstr ""
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:154 actions/deleteapplication.php:157
-#: actions/deletegroup.php:220 actions/deletenotice.php:155
-#: actions/deleteuser.php:154 actions/groupblock.php:187
 msgctxt "BUTTON"
 msgid "No"
 msgstr "Не"
 
 #. TRANS: Submit button title for 'No' when blocking a user.
-#: actions/block.php:158
 msgid "Do not block this user."
 msgstr "Не го блокирај корисников."
 
@@ -1730,174 +1350,136 @@ msgstr "Не го блокирај корисников."
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:161 actions/deleteapplication.php:164
-#: actions/deletegroup.php:227 actions/deletenotice.php:162
-#: actions/deleteuser.php:161 actions/groupblock.php:194
 msgctxt "BUTTON"
 msgid "Yes"
 msgstr "Да"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:165
 msgid "Block this user."
 msgstr "Блокирај го корисников."
 
 #. TRANS: Server error displayed when blocking a user fails.
-#: actions/block.php:189
 msgid "Failed to save block information."
 msgstr "Не можев да ги снимам инофрмациите за блокот."
 
 #. TRANS: Title for first page with list of users blocked from a group.
 #. TRANS: %s is a group nickname.
-#: actions/blockedfromgroup.php:101
 #, php-format
 msgid "%s blocked profiles"
 msgstr "%s блокирани профили"
 
 #. TRANS: Title for any but the first page with list of users blocked from a group.
 #. TRANS: %1$s is a group nickname, %2$d is a page number.
-#: actions/blockedfromgroup.php:106
 #, php-format
 msgid "%1$s blocked profiles, page %2$d"
 msgstr "%1$s блокирани профили, стр. %2$d"
 
 #. TRANS: Instructions for list of users blocked from a group.
-#: actions/blockedfromgroup.php:122
 msgid "A list of the users blocked from joining this group."
 msgstr "Листана корисниците блокирани од придружување во оваа група."
 
 #. TRANS: Form legend for unblocking a user from a group.
-#: actions/blockedfromgroup.php:291
 msgid "Unblock user from group"
 msgstr "Одблокирај корисник од група"
 
 #. TRANS: Button text for unblocking a user from a group.
-#: actions/blockedfromgroup.php:323
 msgctxt "BUTTON"
 msgid "Unblock"
 msgstr "Одблокирај"
 
 #. TRANS: Tooltip for button for unblocking a user from a group.
 #. TRANS: Description of the form to unblock a user.
-#: actions/blockedfromgroup.php:327 lib/unblockform.php:78
 msgid "Unblock this user"
 msgstr "Одблокирај го овој корсник"
 
 #. TRANS: Title for mini-posting window loaded from bookmarklet.
 #. TRANS: %s is the StatusNet site name.
-#: actions/bookmarklet.php:51
 #, php-format
 msgid "Post to %s"
 msgstr "Објави во %s"
 
 #. TRANS: Client error displayed when not providing a confirmation code in the contact address confirmation action.
-#: actions/confirmaddress.php:74
 msgid "No confirmation code."
 msgstr "Нема потврден код."
 
 #. TRANS: Client error displayed when providing a non-existing confirmation code in the contact address confirmation action.
-#: actions/confirmaddress.php:80
 msgid "Confirmation code not found."
 msgstr "Потврдниот код не е пронајден."
 
 #. TRANS: Client error displayed when not providing a confirmation code for another user in the contact address confirmation action.
-#: actions/confirmaddress.php:86
 msgid "That confirmation code is not for you!"
 msgstr "Овој потврден код не е за Вас!"
 
 #. TRANS: Server error for an unknown address type, which can be 'email', 'sms', or the name of an IM network (such as 'xmpp' or 'aim')
-#: actions/confirmaddress.php:94
-#, fuzzy, php-format
+#, php-format
 msgid "Unrecognized address type %s"
 msgstr "Непознат тип на адреса %s."
 
 #. TRANS: Client error for an already confirmed email/jabber/sms address.
-#: actions/confirmaddress.php:103 actions/confirmaddress.php:136
 msgid "That address has already been confirmed."
 msgstr "Оваа адреса веќе е потврдена."
 
-#: actions/confirmaddress.php:121 actions/imsettings.php:444
-#: actions/userdesignsettings.php:306
-#, fuzzy
 msgid "Couldn't update user."
 msgstr "Не можев да го подновам корисникот."
 
-#: actions/confirmaddress.php:144
-#, fuzzy
 msgid "Couldn't update user im preferences."
-msgstr "Не можев да ја подновам корисничката евиденција."
+msgstr "Не можев да ги подновам корисничките нагодувања."
 
-#: actions/confirmaddress.php:156
-#, fuzzy
 msgid "Couldn't insert user im preferences."
-msgstr "Не може да се внесе нова претплата."
+msgstr "Не можев да се вметнам кориснички нагодувања за IM."
 
 #. TRANS: Server error displayed when an address confirmation code deletion from the
 #. TRANS: database fails in the contact address confirmation action.
-#: actions/confirmaddress.php:169
 msgid "Could not delete address confirmation."
 msgstr "Не можев да ја избришам потврдата на адреса."
 
 #. TRANS: Title for the contact address confirmation action.
-#: actions/confirmaddress.php:185
 msgid "Confirm address"
 msgstr "Потврди адреса"
 
 #. TRANS: Success message for the contact address confirmation action.
 #. TRANS: %s can be 'email', 'jabber', or 'sms'.
-#: actions/confirmaddress.php:200
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "Адресата  \"%s\" е потврдена за Вашата сметка."
 
 #. TRANS: Title for page with a conversion (multiple notices in context).
-#: actions/conversation.php:96
 msgid "Conversation"
 msgstr "Разговор"
 
 #. TRANS: Header on conversation page. Hidden by default (h2).
 #. TRANS: Label for user statistics.
-#: actions/conversation.php:149 lib/noticelist.php:87
-#: lib/profileaction.php:246 lib/searchgroupnav.php:82
-#: lib/threadednoticelist.php:66
 msgid "Notices"
 msgstr "Забелешки"
 
 #. TRANS: Client exception displayed trying to delete a user account while not logged in.
-#: actions/deleteaccount.php:71
 msgid "Only logged-in users can delete their account."
 msgstr "Само најавени корисници можат да си ја избришат сметката."
 
 #. TRANS: Client exception displayed trying to delete a user account without have the rights to do that.
-#: actions/deleteaccount.php:77
 msgid "You cannot delete your account."
 msgstr "Не можете да си ја избришете сметката."
 
 #. TRANS: Confirmation text for user deletion. The user has to type this exactly the same, including punctuation.
-#: actions/deleteaccount.php:160 actions/deleteaccount.php:297
 msgid "I am sure."
 msgstr "Сигурен сум."
 
 #. TRANS: Notification for user about the text that must be input to be able to delete a user account.
 #. TRANS: %s is the text that needs to be input.
-#: actions/deleteaccount.php:164
 #, php-format
 msgid "You must write \"%s\" exactly in the box."
 msgstr "Во кутијата морате точно да го впишете „%s“ како што е."
 
 #. TRANS: Confirmation that a user account has been deleted.
-#: actions/deleteaccount.php:206
 msgid "Account deleted."
 msgstr "Сметката е избришана."
 
 #. TRANS: Page title for page on which a user account can be deleted.
 #. TRANS: Option in profile settings to delete the account of the currently logged in user.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:476
 msgid "Delete account"
 msgstr "Избриши сметка"
 
 #. TRANS: Form text for user deletion form.
-#: actions/deleteaccount.php:279
 msgid ""
 "This will <strong>permanently delete</strong> your account data from this "
 "server."
@@ -1906,7 +1488,6 @@ msgstr ""
 
 #. TRANS: Additional form text for user deletion form shown if a user has account backup rights.
 #. TRANS: %s is a URL to the backup page.
-#: actions/deleteaccount.php:285
 #, php-format
 msgid ""
 "You are strongly advised to <a href=\"%s\">back up your data</a> before "
@@ -1917,55 +1498,42 @@ msgstr ""
 
 #. TRANS: Field label for delete account confirmation entry.
 #. TRANS: Field label for password reset form where the password has to be typed again.
-#: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:262 actions/register.php:419
 msgid "Confirm"
 msgstr "Потврди"
 
 #. TRANS: Input title for the delete account field.
 #. TRANS: %s is the text that needs to be input.
-#: actions/deleteaccount.php:304
 #, php-format
 msgid "Enter \"%s\" to confirm that you want to delete your account."
 msgstr "Внесете го „%s“ за да потврдите дека сакате да ја избришете сметката."
 
 #. TRANS: Button title for user account deletion.
-#: actions/deleteaccount.php:323
 msgid "Permanently delete your account"
 msgstr "Трајно бришење на сметката"
 
 #. TRANS: Client error displayed trying to delete an application while not logged in.
-#: actions/deleteapplication.php:62
 msgid "You must be logged in to delete an application."
 msgstr "Мора да сте најавени за да можете да избришете програм."
 
 #. TRANS: Client error displayed trying to delete an application that does not exist.
-#: actions/deleteapplication.php:71
 msgid "Application not found."
 msgstr "Програмот не е пронајден."
 
 #. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
-#: actions/deleteapplication.php:79 actions/editapplication.php:78
-#: actions/showapplication.php:90
 msgid "You are not the owner of this application."
 msgstr "Не сте сопственик на овој програм."
 
 #. TRANS: Client error text when there is a problem with the session token.
-#: actions/deleteapplication.php:102 actions/editapplication.php:131
-#: actions/newapplication.php:112 actions/showapplication.php:113
-#: lib/action.php:1391
 msgid "There was a problem with your session token."
 msgstr "Се појави проблем со Вашиот сесиски жетон."
 
 #. TRANS: Title for delete application page.
 #. TRANS: Fieldset legend on delete application page.
-#: actions/deleteapplication.php:124 actions/deleteapplication.php:149
 msgid "Delete application"
 msgstr "Избриши програм"
 
 #. TRANS: Confirmation text on delete application page.
-#: actions/deleteapplication.php:152
 msgid ""
 "Are you sure you want to delete this application? This will clear all data "
 "about the application from the database, including all existing user "
@@ -1976,55 +1544,45 @@ msgstr ""
 "поврзувања."
 
 #. TRANS: Submit button title for 'No' when deleting an application.
-#: actions/deleteapplication.php:161
 msgid "Do not delete this application."
 msgstr "Не го бриши овој програм."
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
-#: actions/deleteapplication.php:167
 msgid "Delete this application."
 msgstr "Избриши го програмов."
 
 #. TRANS: Client error when trying to delete group while not logged in.
-#: actions/deletegroup.php:64
 msgid "You must be logged in to delete a group."
 msgstr "Мора да сте најавени за да избришете група."
 
 #. TRANS: Client error when trying to delete a group without providing a nickname or ID for the group.
 #. TRANS: Client error displayed when trying to join a group without providing a group name or group ID.
 #. TRANS: Client error displayed when trying to leave a group without providing a group name or group ID.
-#: actions/deletegroup.php:94 actions/joingroup.php:89
-#: actions/leavegroup.php:89
 msgid "No nickname or ID."
 msgstr "Нема прекар или ID."
 
 #. TRANS: Client error when trying to delete a group without having the rights to delete it.
-#: actions/deletegroup.php:107
 msgid "You are not allowed to delete this group."
 msgstr "Не Ви е дозволено да ја избришете оваа група."
 
 #. TRANS: Server error displayed if a group could not be deleted.
 #. TRANS: %s is the name of the group that could not be deleted.
-#: actions/deletegroup.php:150
 #, php-format
 msgid "Could not delete group %s."
 msgstr "Не можев да ја избришам групата %s."
 
 #. TRANS: Message given after deleting a group.
 #. TRANS: %s is the deleted group's name.
-#: actions/deletegroup.php:159
 #, php-format
 msgid "Deleted group %s"
 msgstr "Групата %s е избришана"
 
 #. TRANS: Title of delete group page.
 #. TRANS: Form legend for deleting a group.
-#: actions/deletegroup.php:176 actions/deletegroup.php:202
 msgid "Delete group"
 msgstr "Избриши група"
 
 #. TRANS: Warning in form for deleleting a group.
-#: actions/deletegroup.php:206
 msgid ""
 "Are you sure you want to delete this group? This will clear all data about "
 "the group from the database, without a backup. Public posts to this group "
@@ -2035,12 +1593,10 @@ msgstr ""
 "Јавните објави на оваа група ќе си останат во поединечните хронологии."
 
 #. TRANS: Submit button title for 'No' when deleting a group.
-#: actions/deletegroup.php:224
 msgid "Do not delete this group."
 msgstr "Не ја бриши групава."
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
-#: actions/deletegroup.php:231
 msgid "Delete this group."
 msgstr "Избриши ја групава."
 
@@ -2050,22 +1606,18 @@ msgstr "Избриши ја групава."
 #. TRANS: Client error displayed trying to block a user from a group while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying to log out when not logged in.
+#. TRANS: Client error displayed when trying to access the "make admin" page while not logged in.
+#. TRANS: Client error displayed trying to create a new direct message while not logged in.
+#. TRANS: Client error displayed trying to send a notice while not logged in.
+#. TRANS: Client error displayed trying to nudge a user without being logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
 #. TRANS: Client error displayed when trying to change user options while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
-#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:70
-#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
-#: actions/nudge.php:63 actions/pluginenable.php:97 actions/subedit.php:33
-#: actions/subscribe.php:98 actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:71 lib/profileformaction.php:63
-#: lib/settingsaction.php:72
 msgid "Not logged in."
 msgstr "Не сте најавени."
 
 #. TRANS: Instructions for deleting a notice.
-#: actions/deletenotice.php:110
 msgid ""
 "You are about to permanently delete a notice. Once this is done, it cannot "
 "be undone."
@@ -2075,48 +1627,39 @@ msgstr ""
 
 #. TRANS: Page title when deleting a notice.
 #. TRANS: Fieldset legend for the delete notice form.
-#: actions/deletenotice.php:117 actions/deletenotice.php:148
 msgid "Delete notice"
 msgstr "Избриши забелешка"
 
 #. TRANS: Message for the delete notice form.
-#: actions/deletenotice.php:152
 msgid "Are you sure you want to delete this notice?"
 msgstr "Дали сте сигурни дека сакате да ја избришете оваа заблешка?"
 
 #. TRANS: Submit button title for 'No' when deleting a notice.
-#: actions/deletenotice.php:159
 msgid "Do not delete this notice."
 msgstr "Не ја бриши оваа забелешка."
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:166
 msgid "Delete this notice."
 msgstr "Избриши ја забелешкава."
 
 #. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
-#: actions/deleteuser.php:66
 msgid "You cannot delete users."
 msgstr "Не можете да бришете корисници."
 
 #. TRANS: Client error displayed when trying to delete a non-local user.
-#: actions/deleteuser.php:74
 msgid "You can only delete local users."
 msgstr "Може да бришете само локални корисници."
 
 #. TRANS: Title of delete user page.
-#: actions/deleteuser.php:110
 msgctxt "TITLE"
 msgid "Delete user"
 msgstr "Избриши корисник"
 
 #. TRANS: Fieldset legend on delete user page.
-#: actions/deleteuser.php:134
 msgid "Delete user"
 msgstr "Избриши корисник"
 
 #. TRANS: Information text to request if a user is certain that the described action has to be performed.
-#: actions/deleteuser.php:138
 msgid ""
 "Are you sure you want to delete this user? This will clear all data about "
 "the user from the database, without a backup."
@@ -2125,97 +1668,78 @@ msgstr ""
 "избрише сите податоци за корисникот од базата, без да може да се вратат."
 
 #. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/deleteuser.php:158
 msgid "Do not delete this user."
 msgstr "Не го бриши корисников."
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
-#: actions/deleteuser.php:165
 msgid "Delete this user."
 msgstr "Избриши го корисников."
 
 #. TRANS: Message used as title for design settings for the site.
-#: actions/designadminpanel.php:60 lib/settingsnav.php:97
 msgid "Design"
 msgstr "Изглед"
 
 #. TRANS: Instructions for design adminsitration panel.
-#: actions/designadminpanel.php:71
 msgid "Design settings for this StatusNet site"
 msgstr "Нагодувања на изгледот на ова StatusNet-мрежно место."
 
 #. TRANS: Client error displayed when a logo URL does is not valid.
-#: actions/designadminpanel.php:327
 msgid "Invalid logo URL."
 msgstr "Погрешен URL на лого."
 
 #. TRANS: Client error displayed when an SSL logo URL is invalid.
-#: actions/designadminpanel.php:333
 msgid "Invalid SSL logo URL."
 msgstr "Неважечка URL-адреса на SSL-логото."
 
 #. TRANS: Client error displayed when a theme is submitted through the form that is not in the theme list.
 #. TRANS: %s is the chosen unavailable theme.
-#: actions/designadminpanel.php:339
 #, php-format
 msgid "Theme not available: %s."
 msgstr "Темата е недостапна: %s."
 
 #. TRANS: Fieldset legend for form to change logo.
-#: actions/designadminpanel.php:437
 msgid "Change logo"
 msgstr "Промени лого"
 
 #. TRANS: Field label for StatusNet site logo.
-#: actions/designadminpanel.php:444
 msgid "Site logo"
 msgstr "Лого на мрежното место"
 
 #. TRANS: Field label for SSL StatusNet site logo.
-#: actions/designadminpanel.php:452
 msgid "SSL logo"
 msgstr "SSL-лого"
 
 #. TRANS: Fieldset legend for form change StatusNet site's theme.
-#: actions/designadminpanel.php:467
 msgid "Change theme"
 msgstr "Промени изглед"
 
 #. TRANS: Field label for dropdown to choose site theme.
-#: actions/designadminpanel.php:485
 msgid "Site theme"
 msgstr "Изглед на мрежното место"
 
 #. TRANS: Title for field label for dropdown to choose site theme.
-#: actions/designadminpanel.php:487
 msgid "Theme for the site."
 msgstr "Изглед за мрежното место."
 
 #. TRANS: Field label for uploading a cutom theme.
-#: actions/designadminpanel.php:494
 msgid "Custom theme"
 msgstr "Прилагоден мотив"
 
 #. TRANS: Form instructions for uploading a cutom StatusNet theme.
-#: actions/designadminpanel.php:499
 msgid "You can upload a custom StatusNet theme as a .ZIP archive."
 msgstr "Можете да подигнете свој изглед за StatusNet како .ZIP архив."
 
 #. TRANS: Fieldset legend for theme background image.
-#: actions/designadminpanel.php:515
 msgid "Change background image"
 msgstr "Промена на слика за позадина"
 
 #. TRANS: Field label for background image on theme designer page.
 #. TRANS: Field label for background color selector.
 #. TRANS: Label on profile design page for setting a profile page background colour.
-#: actions/designadminpanel.php:525 actions/designadminpanel.php:609
-#: lib/designform.php:238
 msgid "Background"
 msgstr "Позадина"
 
 #. TRANS: Form guide for background image upload form on theme designer page.
-#: actions/designadminpanel.php:531
 #, php-format
 msgid ""
 "You can upload a background image for the site. The maximum file size is %1"
@@ -2225,197 +1749,162 @@ msgstr ""
 "големина на податотеката е %1$s."
 
 #. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:558
 msgid "On"
 msgstr "Вкл."
 
 #. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:575
 msgid "Off"
 msgstr "Искл."
 
 #. TRANS: Form guide for turning background image on or off on theme designer page.
 #. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
 #. TRANS: use of the uploaded profile image.
-#: actions/designadminpanel.php:577 lib/designform.php:214
 msgid "Turn background image on or off."
 msgstr "Вклучи или исклучи позадинска слика."
 
 #. TRANS: Checkbox label to title background image on theme designer page.
 #. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-#: actions/designadminpanel.php:583 lib/designform.php:220
 msgid "Tile background image"
 msgstr "Позадината во квадрати"
 
 #. TRANS: Fieldset legend for theme colors.
-#: actions/designadminpanel.php:598
 msgid "Change colors"
 msgstr "Смени бои"
 
 #. TRANS: Field label for content color selector.
 #. TRANS: Label on profile design page for setting a profile page content colour.
-#: actions/designadminpanel.php:623 lib/designform.php:252
 msgid "Content"
 msgstr "Содржина"
 
 #. TRANS: Field label for sidebar color selector.
 #. TRANS: Label on profile design page for setting a profile page sidebar colour.
-#: actions/designadminpanel.php:637 lib/designform.php:266
 msgid "Sidebar"
 msgstr "Странична лента"
 
 #. TRANS: Field label for text color selector.
 #. TRANS: Label on profile design page for setting a profile page text colour.
-#: actions/designadminpanel.php:651 lib/designform.php:280
 msgid "Text"
 msgstr "Текст"
 
 #. TRANS: Field label for link color selector.
 #. TRANS: Label on profile design page for setting a profile page links colour.
-#: actions/designadminpanel.php:665 lib/designform.php:294
 msgid "Links"
 msgstr "Врски"
 
 #. TRANS: Fieldset legend for advanced theme design settings.
-#: actions/designadminpanel.php:691
 msgid "Advanced"
 msgstr "Напредно"
 
 #. TRANS: Field label for custom CSS.
-#: actions/designadminpanel.php:696
 msgid "Custom CSS"
 msgstr "Прилагодено CSS"
 
 #. TRANS: Button text for resetting theme settings.
-#: actions/designadminpanel.php:718
 msgctxt "BUTTON"
 msgid "Use defaults"
 msgstr "Користи по основно"
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:720
 msgid "Restore default designs."
 msgstr "Врати ги изгледите по основно."
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:728
 msgid "Reset back to default."
 msgstr "Врати по основно."
 
 #. TRANS: Title for button for saving theme settings.
-#: actions/designadminpanel.php:736
 msgid "Save design."
 msgstr "Зачувај изглед."
 
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
-#: actions/disfavor.php:83
 msgid "This notice is not a favorite!"
 msgstr "Оваа забелешка не Ви е бендисана!"
 
 #. TRANS: Title for page on which favorites can be added.
-#: actions/disfavor.php:98
 msgid "Add to favorites"
 msgstr "Додај во бендисани"
 
 #. TRANS: Client exception thrown when requesting a document from the documentation that does not exist.
 #. TRANS: %s is the non-existing document.
-#: actions/doc.php:155
 #, php-format
 msgid "No such document \"%s\"."
 msgstr "Нема документ со наслов „%s“."
 
 #. TRANS: Title for "Edit application" form.
 #. TRANS: Form legend.
-#: actions/editapplication.php:54 lib/applicationeditform.php:129
 msgid "Edit application"
 msgstr "Уреди програм"
 
 #. TRANS: Client error displayed trying to edit an application while not logged in.
-#: actions/editapplication.php:66
 msgid "You must be logged in to edit an application."
 msgstr "Мора да сте најавени за да можете да уредувате програми."
 
 #. TRANS: Client error displayed trying to edit an application that does not exist.
-#: actions/editapplication.php:83 actions/showapplication.php:83
 msgid "No such application."
 msgstr "Нема таков програм."
 
 #. TRANS: Instructions for "Edit application" form.
-#: actions/editapplication.php:167
 msgid "Use this form to edit your application."
 msgstr "Образецов служи за уредување на програмот."
 
 #. TRANS: Validation error shown when not providing a name in the "Edit application" form.
 #. TRANS: Validation error shown when not providing a name in the "New application" form.
-#: actions/editapplication.php:184 actions/newapplication.php:164
 msgid "Name is required."
 msgstr "Треба име."
 
 #. 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.
-#: actions/editapplication.php:188 actions/newapplication.php:172
 msgid "Name is too long (maximum 255 characters)."
 msgstr "Името е предолго (највеќе 255 знаци)."
 
 #. TRANS: Validation error shown when providing a name for an application that already exists in the "Edit application" form.
 #. TRANS: Validation error shown when providing a name for an application that already exists in the "New application" form.
-#: actions/editapplication.php:192 actions/newapplication.php:168
 msgid "Name already in use. Try another one."
 msgstr "Тоа име е во употреба. Одберете друго."
 
 #. TRANS: Validation error shown when not providing a description in the "Edit application" form.
 #. TRANS: Validation error shown when not providing a description in the "New application" form.
-#: actions/editapplication.php:196 actions/newapplication.php:176
 msgid "Description is required."
 msgstr "Треба опис."
 
 #. TRANS: Validation error shown when providing too long a source URL in the "Edit application" form.
-#: actions/editapplication.php:209
 msgid "Source URL is too long."
 msgstr "Изворната URL-адреса е предолга."
 
 #. TRANS: Validation error shown when providing an invalid source URL in the "Edit application" form.
 #. TRANS: Validation error shown when providing an invalid source URL in the "New application" form.
-#: actions/editapplication.php:216 actions/newapplication.php:199
 msgid "Source URL is not valid."
 msgstr "Изворната URL-адреса е неважечка."
 
 #. 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.
-#: actions/editapplication.php:220 actions/newapplication.php:203
 msgid "Organization is required."
 msgstr "Треба организација."
 
 #. TRANS: Validation error shown when providing too long an arganisation name in the "Edit application" form.
-#: actions/editapplication.php:224 actions/newapplication.php:207
 msgid "Organization is too long (maximum 255 characters)."
 msgstr "Името на организацијата е предолго (највеќе 255 знаци)."
 
 #. TRANS: Form validation error show when an organisation name has not been provided in the edit application form.
 #. TRANS: Form validation error show when an organisation name has not been provided in the new application form.
-#: actions/editapplication.php:228 actions/newapplication.php:211
 msgid "Organization homepage is required."
 msgstr "Треба домашна страница на организацијата."
 
 #. TRANS: Validation error shown when providing too long a callback URL in the "Edit application" form.
 #. TRANS: Validation error shown when providing too long a callback URL in the "New application" form.
-#: actions/editapplication.php:239 actions/newapplication.php:225
 msgid "Callback is too long."
 msgstr "Повикувањето е предолго."
 
 #. TRANS: Validation error shown when providing an invalid callback URL in the "Edit application" form.
 #. TRANS: Validation error shown when providing an invalid callback URL in the "New application" form.
-#: actions/editapplication.php:247 actions/newapplication.php:235
 msgid "Callback URL is not valid."
 msgstr "URL-адресата за повикување е неважечка."
 
 #. TRANS: Server error occuring when an application could not be updated from the "Edit application" form.
-#: actions/editapplication.php:284
 msgid "Could not update application."
 msgstr "Не можев да го подновам програмот."
 
 #. TRANS: Title for form to edit a group. %s is a group nickname.
-#: actions/editgroup.php:55
 #, php-format
 msgid "Edit %s group"
 msgstr "Уреди ја групата %s"
@@ -2423,40 +1912,40 @@ msgstr "Уреди ја групата %s"
 #. TRANS: Client error displayed trying to edit a group while not logged in.
 #. TRANS: Client error displayed when trying to create a group while not logged in.
 #. TRANS: Client error displayed trying to create a group while not logged in.
-#: actions/editgroup.php:68 actions/grouplogo.php:69 actions/newgroup.php:65
 msgid "You must be logged in to create a group."
 msgstr "Мора да сте најавени за да можете да создавате групи."
 
 #. TRANS: Form instructions for group edit form.
-#: actions/editgroup.php:161
 msgid "Use this form to edit the group."
 msgstr "ОБразецов служи за уредување на групата."
 
+#. TRANS: Group edit form validation error.
+#. TRANS: Group create form validation error.
+#. TRANS: %s is the invalid alias.
+#, php-format
+msgid "Invalid alias: \"%s\""
+msgstr "Неважечки алијас: „%s“"
+
 #. TRANS: Group edit form success message.
-#: actions/editgroup.php:301
 msgid "Options saved."
 msgstr "Нагодувањата се зачувани."
 
 #. TRANS: Title for e-mail settings.
-#: actions/emailsettings.php:60
 msgid "Email settings"
 msgstr "Нагодувања за е-пошта"
 
 #. TRANS: E-mail settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/emailsettings.php:74
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 msgstr "Раководење со начинот на кој добивате е-пошта од %%site.name%%."
 
 #. TRANS: Form legend for e-mail settings form.
 #. TRANS: Field label for e-mail address input in e-mail settings form.
-#: actions/emailsettings.php:104 actions/emailsettings.php:130
 msgid "Email address"
 msgstr "Е-поштенска адреса"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:110
 msgid "Current confirmed email address."
 msgstr "Тековна потврдена е-поштенска адреса."
 
@@ -2465,15 +1954,11 @@ msgstr "Тековна потврдена е-поштенска адреса."
 #. TRANS: Button label to remove a confirmed IM address.
 #. TRANS: Button label to remove a confirmed SMS address.
 #. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
-#: actions/emailsettings.php:113 actions/emailsettings.php:180
-#: actions/imsettings.php:119 actions/smssettings.php:119
-#: actions/smssettings.php:175
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Отстрани"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:120
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -2486,45 +1971,37 @@ msgstr ""
 #. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
 #. TRANS: Any other domain may be owned by a legitimate person or
 #. TRANS: organization.
-#: actions/emailsettings.php:137
 msgid "Email address, like \"UserName@example.org\""
 msgstr "Е-пошта, од обликот „UserName@example.org“"
 
 #. TRANS: Button label for adding an e-mail address in e-mail settings form.
 #. TRANS: Button label for adding an IM address in IM settings form.
 #. TRANS: Button label for adding a SMS phone number in SMS settings form.
-#: actions/emailsettings.php:141 actions/imsettings.php:147
-#: actions/smssettings.php:157
 msgctxt "BUTTON"
 msgid "Add"
 msgstr "Додај"
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:149 actions/smssettings.php:166
 msgid "Incoming email"
 msgstr "Приемна пошта"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:155
 msgid "I want to post notices by email."
 msgstr "Сакам да објавувам забелешки по е-пошта."
 
 #. TRANS: Form instructions for incoming e-mail form in e-mail settings.
 #. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
-#: actions/emailsettings.php:177 actions/smssettings.php:173
 msgid "Send email to this address to post new notices."
 msgstr "Испраќајте е-пошта на оваа адреса за да објавувате нови забелешки."
 
 #. TRANS: Instructions for incoming e-mail address input form, when an address has already been assigned.
 #. TRANS: Instructions for incoming SMS e-mail address input form.
-#: actions/emailsettings.php:186 actions/smssettings.php:181
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr ""
 "Создај нова е-поштенска адреса за примање објави; ја заменува старата адреса."
 
 #. TRANS: Instructions for incoming e-mail address input form.
-#: actions/emailsettings.php:190
 msgid ""
 "To send notices via email, we need to create a unique email address for you "
 "on this server:"
@@ -2534,89 +2011,71 @@ msgstr ""
 
 #. TRANS: Button label for adding an e-mail address to send notices from.
 #. TRANS: Button label for adding an SMS e-mail address to send notices from.
-#: actions/emailsettings.php:196 actions/smssettings.php:184
 msgctxt "BUTTON"
 msgid "New"
 msgstr "Нова"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:205
 msgid "Email preferences"
 msgstr "Нагодувања за е-пошта"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:213
 msgid "Send me notices of new subscriptions through email."
 msgstr "Испраќај ми известувања за нови претплати по е-пошта."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:219
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr "Испраќај ми е-пошта кога некој ќе бендиса моја забелешка."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:226
 msgid "Send me email when someone sends me a private message."
 msgstr "Испраќај ми е-пошта кога некој ќе ми испрати приватна порака."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:232
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr "Испраќај ми е-пошта кога некој ќе ми испрати „@-одговор“"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:238
 msgid "Allow friends to nudge me and send me an email."
 msgstr ""
 "Дозволи им на пријателите да можат да ме подбуцнуваат и да ми испраќаат е-"
 "пошта."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:244
 msgid "Publish a MicroID for my email address."
 msgstr "Објави MicroID за мојата е-поштенска адреса."
 
 #. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:362
 msgid "Email preferences saved."
 msgstr "Нагодувањата за е-пошта се зачувани."
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:381
 msgid "No email address."
 msgstr "Нема е-поштенска адреса."
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:389
 msgid "Cannot normalize that email address."
 msgstr "Не можам да ја нормализирам таа е-поштенска адреса."
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:394 actions/register.php:197
-#: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "Неправилна адреса за е-пошта."
 
 #. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:398
 msgid "That is already your email address."
 msgstr "Оваа е-поштенска адреса е веќе Ваша."
 
 #. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:402
 msgid "That email address already belongs to another user."
 msgstr "Таа е-поштенска адреса е веќе зафатена од друг корисник."
 
 #. TRANS: Server error thrown on database error adding e-mail confirmation code.
 #. TRANS: Server error thrown on database error adding Instant Messaging confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:419 actions/imsettings.php:362
-#: actions/smssettings.php:364
 msgid "Could not insert confirmation code."
 msgstr "Не можев да го внесам потврдниот код."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:426
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
@@ -2628,101 +2087,81 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling Instant Messaging address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:446 actions/imsettings.php:391
-#: actions/smssettings.php:398
 msgid "No pending confirmation to cancel."
 msgstr "Нема потврди кои може да се откажат."
 
 #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:451
 msgid "That is the wrong email address."
 msgstr "Ова е погрешна е-поштенска адреса."
 
 #. TRANS: Server error thrown on database error canceling e-mail address confirmation.
 #. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
-#: actions/emailsettings.php:460 actions/smssettings.php:412
 msgid "Could not delete email confirmation."
 msgstr "Не можев да ја избришам потврдата по е-пошта."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:465
 msgid "Email confirmation cancelled."
 msgstr "Потврдата на е-пошта е откажана."
 
 #. TRANS: Message given trying to remove an e-mail address that is not
 #. TRANS: registered for the active user.
-#: actions/emailsettings.php:484
 msgid "That is not your email address."
 msgstr "Ова не е Вашата е-поштенска адреса."
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:505
 msgid "The email address was removed."
 msgstr "Е-поштенската адреса е отстранета."
 
 #. TRANS: Form validation error displayed when trying to remove an incoming e-mail address while no address has been set.
-#: actions/emailsettings.php:519 actions/smssettings.php:554
 msgid "No incoming email address."
 msgstr "Нема приемна е-поштенска адреса."
 
 #. 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.
-#: actions/emailsettings.php:531 actions/emailsettings.php:555
-#: actions/smssettings.php:565 actions/smssettings.php:590
 msgid "Could not update user record."
 msgstr "Не можев да ја подновам корисничката евиденција."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
 #. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:535 actions/smssettings.php:569
 msgid "Incoming email address removed."
 msgstr "Приемната е-поштенска адреса е отстранета."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
 #. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:559 actions/smssettings.php:594
 msgid "New incoming email address added."
 msgstr "Додадена е нова влезна е-поштенска адреса."
 
 #. TRANS: Client error displayed when trying to mark a notice as favorite that already is a favorite.
-#: actions/favor.php:80
 msgid "This notice is already a favorite!"
 msgstr "Веќе сте ја бендисале оваа забелешка!"
 
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
-#: actions/favor.php:95
 msgid "Disfavor favorite."
 msgstr "Тргни од бендисани."
 
 #. TRANS: Page title for first page of favorited notices.
 #. TRANS: Title for favourited notices section.
-#: actions/favorited.php:65 lib/popularnoticesection.php:62
-#: lib/publicgroupnav.php:93
 msgid "Popular notices"
 msgstr "Популарни забелешки"
 
 #. TRANS: Page title for all but first page of favorited notices.
 #. TRANS: %d is the page number being displayed.
-#: actions/favorited.php:69
 #, php-format
 msgid "Popular notices, page %d"
 msgstr "Популарни забелешки, стр. %d"
 
 #. TRANS: Description on page displaying favorited notices.
-#: actions/favorited.php:81
 msgid "The most popular notices on the site right now."
 msgstr "Моментално најпопуларни забелешки на мрежното место."
 
 #. TRANS: Text displayed instead of a list when a site does not yet have any favourited notices.
-#: actions/favorited.php:149
 msgid "Favorite notices appear on this page but no one has favorited one yet."
 msgstr ""
 "Бендисаните забелешки се појавуваат на оваа страница, но досега никој нема "
 "бендисано ништо."
 
 #. TRANS: Additional text displayed instead of a list when a site does not yet have any favourited notices for logged in users.
-#: actions/favorited.php:153
 msgid ""
 "Be the first to add a notice to your favorites by clicking the fave button "
 "next to any notice you like."
@@ -2732,7 +2171,6 @@ msgstr ""
 
 #. TRANS: Additional text displayed instead of a list when a site does not yet have any favourited notices for not logged in users.
 #. TRANS: %%action.register%% is a registration link. "[link text](link)" is Mark Down. Do not change the formatting.
-#: actions/favorited.php:158
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to add a "
@@ -2745,181 +2183,146 @@ msgstr ""
 #. TRANS: %s is a user's nickname.
 #. TRANS: Title for first page of favourite notices of a user.
 #. TRANS: %s is the user for whom the favourite notices are displayed.
-#: actions/favoritesrss.php:111 actions/showfavorites.php:76
-#: lib/personalgroupnav.php:110
 #, php-format
 msgid "%s's favorite notices"
 msgstr "Бендисани забелешки на %s"
 
 #. TRANS: Desciption of RSS feed with favourite notices of a user.
 #. TRANS: %1$s is a user's nickname, %2$s is the name of the StatusNet site.
-#: actions/favoritesrss.php:117
 #, php-format
 msgid "Updates favored by %1$s on %2$s!"
 msgstr "Подновувања, бендисани од %1$s на %2$s!"
 
 #. TRANS: Page title for first page of featured users.
 #. TRANS: Title for featured users section.
-#: actions/featured.php:69 lib/featureduserssection.php:87
-#: lib/publicgroupnav.php:89
 msgid "Featured users"
 msgstr "Избрани корисници"
 
 #. TRANS: Page title for all but first page of featured users.
 #. TRANS: %d is the page number being displayed.
-#: actions/featured.php:73
 #, php-format
 msgid "Featured users, page %d"
 msgstr "Избрани корисници, стр. %d"
 
 #. TRANS: Description on page displaying featured users.
-#: actions/featured.php:102
 #, php-format
 msgid "A selection of some great users on %s."
 msgstr "Некои од пославните корисници на %s."
 
 #. TRANS: Client error displayed when no notice ID was given trying do display a file.
-#: actions/file.php:36
 msgid "No notice ID."
 msgstr "Нема ID за белешка."
 
 #. TRANS: Client error displayed when an invalid notice ID was given trying do display a file.
-#: actions/file.php:41
 msgid "No notice."
 msgstr "Нема забелешка."
 
 #. TRANS: Client error displayed when trying do display a file for a notice without a file attachement.
-#: actions/file.php:46
 msgid "No attachments."
 msgstr "Нема прилози."
 
 #. TRANS: Client error displayed when trying do display a file for a notice with file attachements
 #. TRANS: that could not be found.
-#: actions/file.php:58
 msgid "No uploaded attachments."
 msgstr "Нема подигнато прилози."
 
 #. TRANS: Client error displayed when subscribing to a remote profile and an unexpected response is received.
-#: actions/finishremotesubscribe.php:69
 msgid "Not expecting this response!"
 msgstr "Овој одговор не беше очекуван!"
 
 #. TRANS: Client error displayed when subscribing to a remote profile that does not exist.
-#: actions/finishremotesubscribe.php:81
 msgid "User being listened to does not exist."
 msgstr "Следениот корисник не постои."
 
 #. TRANS: Client error displayed when subscribing to a remote profile that is a local profile.
-#: actions/finishremotesubscribe.php:89 actions/remotesubscribe.php:58
 msgid "You can use the local subscription!"
 msgstr "Може да ја користите локалната претплата."
 
 #. TRANS: Client error displayed when subscribing to a remote profile that is blocked form subscribing to.
-#: actions/finishremotesubscribe.php:102
 msgid "That user has blocked you from subscribing."
 msgstr "Тој корисник Ве има блокирано од претплаќање."
 
 #. TRANS: Client error displayed when subscribing to a remote profile without providing an authorised token.
-#: actions/finishremotesubscribe.php:114
 msgid "You are not authorized."
 msgstr "Не сте овластени."
 
 #. TRANS: Client error displayed when subscribing to a remote profile and conversion of the request token to access token fails.
-#: actions/finishremotesubscribe.php:118
 msgid "Could not convert request token to access token."
 msgstr "Не можев да ги претворам жетоните за барање во жетони за пристап."
 
 #. TRANS: Client error displayed when subscribing to a remote profile fails because of an unsupported version of the OMB protocol.
-#: actions/finishremotesubscribe.php:124
 msgid "Remote service uses unknown version of OMB protocol."
 msgstr "Далечинската служба користи непозната верзија на OMB протокол."
 
 #. TRANS: Server error displayed when subscribing to a remote profile fails because the remote profile could not be updated.
-#: actions/finishremotesubscribe.php:145 lib/oauthstore.php:317
 msgid "Error updating remote profile."
 msgstr "Грешка во подновувањето на далечинскиот профил."
 
 #. TRANS: Client error displayed when requesting a non-existent file.
-#: actions/getfile.php:77
 msgid "No such file."
 msgstr "Нема таква податотека."
 
 #. TRANS: Client error displayed when requesting a file without having read access to it.
-#: actions/getfile.php:82
 msgid "Cannot read file."
 msgstr "Податотеката не може да се прочита."
 
 #. TRANS: Client error displayed when trying to assign an invalid role to a user.
-#: actions/grantrole.php:61 actions/revokerole.php:62
 msgid "Invalid role."
 msgstr "Погрешна улога."
 
 #. TRANS: Client error displayed when trying to assign an reserved role to a user.
-#: actions/grantrole.php:66 actions/revokerole.php:66
 msgid "This role is reserved and cannot be set."
 msgstr "Оваа улога е резервирана и не може да се зададе."
 
 #. TRANS: Client error displayed when trying to assign a role to a user while not being allowed to set roles.
-#: actions/grantrole.php:76
 msgid "You cannot grant user roles on this site."
 msgstr "Не можете да им доделувате улоги на корисниците на ова мрежно место."
 
 #. TRANS: Client error displayed when trying to assign a role to a user that already has that role.
-#: actions/grantrole.php:84
 msgid "User already has this role."
 msgstr "Корисникот веќе ја има таа улога."
 
 #. TRANS: Client error displayed trying to block a user from a group while not specifying a to be blocked user profile.
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing a profile.
+#. TRANS: Client error displayed when not providing a profile ID on the Make Admin page.
 #. TRANS: Client error displayed trying a change a subscription without providing a profile.
 #. TRANS: Client error displayed when trying to change user options without specifying a user to work on.
-#: actions/groupblock.php:71 actions/groupunblock.php:71
-#: actions/makeadmin.php:71 actions/subedit.php:49
-#: lib/profileformaction.php:79
 msgid "No profile specified."
 msgstr "Нема назначено профил."
 
 #. TRANS: Client error displayed trying to block a user from a group while specifying a non-existing profile.
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing an existing profile.
+#. TRANS: Client error displayed when specifying an invalid profile ID on the Make Admin page.
 #. TRANS: Client error displayed trying a change a subscription for a non-existant profile ID.
 #. TRANS: Client error displayed when trying to change user options without specifying an existing user to work on.
-#: actions/groupblock.php:77 actions/groupunblock.php:77
-#: actions/makeadmin.php:76 actions/subedit.php:57 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:87
 msgid "No profile with that ID."
 msgstr "Нема профил со тоа ID."
 
 #. TRANS: Client error displayed trying to block a user from a group while not specifying a group to block a profile from.
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing a group.
-#: actions/groupblock.php:83 actions/groupunblock.php:83
-#: actions/makeadmin.php:81
+#. TRANS: Client error displayed when not providing a group ID on the Make Admin page.
 msgid "No group specified."
 msgstr "Нема назначено група."
 
 #. TRANS: Client error displayed trying to block a user from a group while not being an admin user.
-#: actions/groupblock.php:95
 msgid "Only an admin can block group members."
 msgstr "Само администратор може да блокира членови на група."
 
 #. TRANS: Client error displayed trying to block a user from a group while user is already blocked from the given group.
-#: actions/groupblock.php:100
 msgid "User is already blocked from group."
 msgstr "Корисникот е веќе блокиран од оваа група."
 
 #. TRANS: Client error displayed trying to block a user from a group while user is not a member of given group.
-#: actions/groupblock.php:106
 msgid "User is not a member of group."
 msgstr "Корисникот не членува во групата."
 
 #. TRANS: Title for block user from group page.
 #. TRANS: Form legend for form to block user from a group.
-#: actions/groupblock.php:141 actions/groupmembers.php:364
 msgid "Block user from group"
 msgstr "Блокирај корисник од група"
 
 #. TRANS: Explanatory text for block user from group form before setting the block.
 #. TRANS: %1$s is that to be blocked user, %2$s is the group the user will be blocked from.
-#: actions/groupblock.php:169
 #, php-format
 msgid ""
 "Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They "
@@ -2931,17 +2334,14 @@ msgstr ""
 "објавува во таа група и да се претплаќа на неа."
 
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
-#: actions/groupblock.php:191
 msgid "Do not block this user from this group."
 msgstr "Не го блокирај овој корисник од групава."
 
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
-#: actions/groupblock.php:198
 msgid "Block this user from this group."
 msgstr "Блокирај го овој корисник од групава."
 
 #. TRANS: Server error displayed when trying to block a user from a group fails because of an application error.
-#: actions/groupblock.php:215
 msgid "Database error blocking user from group."
 msgstr ""
 "Се појави грешка во базата наподатоци при блокирањето на корисникот од "
@@ -2949,22 +2349,18 @@ msgstr ""
 
 #. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
 #. TRANS: Client error displayed trying to find a user by ID without providing an ID.
-#: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr "Нема ID."
 
 #. TRANS: Client error displayed trying to change group design settings while not logged in.
-#: actions/groupdesignsettings.php:67
 msgid "You must be logged in to edit a group."
 msgstr "Мора да сте најавени за да можете да уредувате група."
 
 #. TRANS: Title group design settings page.
-#: actions/groupdesignsettings.php:146
 msgid "Group design"
 msgstr "Изглед на групата"
 
 #. TRANS: Instructions for group design settings page.
-#: actions/groupdesignsettings.php:157
 msgid ""
 "Customize the way your group looks with a background image and a colour "
 "palette of your choice."
@@ -2973,24 +2369,20 @@ msgstr ""
 "по Ваш избор."
 
 #. TRANS: Form validation error displayed when group design settings could not be updated because of an application issue.
-#: actions/groupdesignsettings.php:262
 msgid "Unable to update your design settings."
 msgstr "Не можам да ги подновам Вашите нагодувања за изглед."
 
 #. TRANS: Form text to confirm saved group design settings.
-#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:239
 msgid "Design preferences saved."
 msgstr "Нагодувањата се зачувани."
 
 #. TRANS: Title for group logo settings page.
 #. TRANS: Group logo form legend.
-#: actions/grouplogo.php:144 actions/grouplogo.php:199
 msgid "Group logo"
 msgstr "Лого на групата"
 
 #. TRANS: Instructions for group logo page.
 #. TRANS: %s is the maximum file size for that site.
-#: actions/grouplogo.php:156
 #, php-format
 msgid ""
 "You can upload a logo image for your group. The maximum file size is %s."
@@ -2999,98 +2391,81 @@ msgstr ""
 "големина на податотеката е %s."
 
 #. TRANS: Submit button for uploading a group logo.
-#: actions/grouplogo.php:243
 msgid "Upload"
 msgstr "Подигни"
 
 #. TRANS: Button text for cropping an uploaded group logo.
-#: actions/grouplogo.php:299
 msgid "Crop"
 msgstr "Отсечи"
 
 #. TRANS: Form instructions on the group logo page.
-#: actions/grouplogo.php:376
 msgid "Pick a square area of the image to be the logo."
 msgstr "Одберете квадратен простор на сликата за лого."
 
 #. TRANS: Form success message after updating a group logo.
-#: actions/grouplogo.php:411
 msgid "Logo updated."
 msgstr "Логото е подновено."
 
 #. TRANS: Form failure message after failing to update a group logo.
-#: actions/grouplogo.php:414
 msgid "Failed updating logo."
 msgstr "Подновата на логото не успеа."
 
 #. TRANS: Title of the page showing group members.
 #. TRANS: %s is the name of the group.
-#: actions/groupmembers.php:104
 #, php-format
 msgid "%s group members"
 msgstr "Членови на групата %s"
 
 #. TRANS: Title of the page showing group members.
 #. TRANS: %1$s is the name of the group, %2$d is the page number of the members list.
-#: actions/groupmembers.php:109
 #, php-format
 msgid "%1$s group members, page %2$d"
 msgstr "Членови на групата %1$s, стр. %2$d"
 
 #. TRANS: Page notice for group members page.
-#: actions/groupmembers.php:125
 msgid "A list of the users in this group."
 msgstr "Список на корисниците на оваа група."
 
 #. TRANS: Indicator in group members list that this user is a group administrator.
-#: actions/groupmembers.php:190 lib/action.php:581
 msgid "Admin"
 msgstr "Администратор"
 
 #. TRANS: Button text for the form that will block a user from a group.
-#: actions/groupmembers.php:397
 msgctxt "BUTTON"
 msgid "Block"
 msgstr "Блокирај"
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:401
 msgctxt "TOOLTIP"
 msgid "Block this user"
 msgstr "Блокирај го корисников"
 
 #. TRANS: Form legend for form to make a user a group admin.
-#: actions/groupmembers.php:488
 msgid "Make user an admin of the group"
 msgstr "Направи го корисникот администратор на групата"
 
 #. TRANS: Button text for the form that will make a user administrator.
-#: actions/groupmembers.php:521
 msgctxt "BUTTON"
 msgid "Make Admin"
 msgstr "Назначи за администратор"
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:525
 msgctxt "TOOLTIP"
 msgid "Make this user an admin"
 msgstr "Назначи го корисников за администратор"
 
 #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
-#: actions/grouprss.php:141
 #, php-format
 msgid "Updates from members of %1$s on %2$s!"
 msgstr "Подновувања од членови на %1$s на %2$s!"
 
 #. TRANS: Title for first page of the groups list.
-#: actions/groups.php:62
 msgctxt "TITLE"
 msgid "Groups"
 msgstr "Групи"
 
 #. TRANS: Title for all but the first page of the groups list.
 #. TRANS: %d is the page number.
-#: actions/groups.php:66
 #, php-format
 msgctxt "TITLE"
 msgid "Groups, page %d"
@@ -3099,7 +2474,6 @@ msgstr "Групи, страница %d"
 #. TRANS: Page notice of group list. %%%%site.name%%%% is the StatusNet site name,
 #. TRANS: %%%%action.groupsearch%%%% and %%%%action.newgroup%%%% are URLs. Do not change them.
 #. TRANS: This message contains Markdown links in the form [link text](link).
-#: actions/groups.php:95
 #, php-format
 msgid ""
 "%%%%site.name%%%% groups let you find and talk with people of similar "
@@ -3116,12 +2490,10 @@ msgstr ""
 "newgroup%%%%)!"
 
 #. TRANS: Link to create a new group on the group list page.
-#: actions/groups.php:113 actions/usergroups.php:126 lib/groupeditform.php:115
 msgid "Create a new group"
 msgstr "Создај нова група"
 
 #. TRANS: Instructions for page where groups can be searched. %%site.name%% is the name of the StatusNet site.
-#: actions/groupsearch.php:53
 #, php-format
 msgid ""
 "Search for groups on %%site.name%% by their name, location, or description. "
@@ -3131,21 +2503,17 @@ msgstr ""
 "поимите со празни места; зборовите мора да имаат барем по 3 букви."
 
 #. TRANS: Title for page where groups can be searched.
-#: actions/groupsearch.php:60
 msgid "Group search"
 msgstr "Пребарување на групи"
 
 #. TRANS: Text on page where groups can be searched if no results were found for a query.
 #. TRANS: Text for notice search results is the query had no results.
 #. TRANS: Message on the "People search" page where a query has no results.
-#: actions/groupsearch.php:82 actions/noticesearch.php:122
-#: actions/peoplesearch.php:87
 msgid "No results."
 msgstr "Нема резултати."
 
 #. TRANS: Additional text on page where groups can be searched if no results were found for a query for a logged in user.
 #. TRANS: This message contains Markdown links in the form [link text](link).
-#: actions/groupsearch.php:87
 #, php-format
 msgid ""
 "If you cannot find the group you're looking for, you can [create it](%%"
@@ -3156,7 +2524,6 @@ msgstr ""
 
 #. TRANS: Additional text on page where groups can be searched if no results were found for a query for a not logged in user.
 #. TRANS: This message contains Markdown links in the form [link text](link).
-#: actions/groupsearch.php:92
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and [create the group](%%"
@@ -3166,214 +2533,160 @@ msgstr ""
 "група](%%action.newgroup%%)!"
 
 #. TRANS: Client error displayed when trying to unblock a user from a group without being an administrator for the group.
-#: actions/groupunblock.php:95
 msgid "Only an admin can unblock group members."
 msgstr "Само администратор може да одблокира членови на група."
 
 #. TRANS: Client error displayed when trying to unblock a non-blocked user from a group.
-#: actions/groupunblock.php:100
 msgid "User is not blocked from group."
 msgstr "Корисникот не е блокиран од групата."
 
 #. TRANS: Server error displayed when unblocking a user from a group fails because of an unknown error.
 #. TRANS: Server error displayed when removing a user block.
-#: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "Грешка при отстранување на блокот."
 
 #. TRANS: Title for Instant Messaging settings.
-#: actions/imsettings.php:56
 msgid "IM settings"
 msgstr "Нагодувања за 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.
-#: actions/imsettings.php:69
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "You can send and receive notices through instant messaging [instant messages]"
 "(%%doc.im%%). Configure your addresses and settings below."
 msgstr ""
-"Можете да праќате и примате забелешки преку [непосредни пораки](%%doc.im%%) "
-"на Jabber/Google Talk . Подолу ставете адреса и наместете ги нагодувањата."
+"Можете да праќате и примате забелешки преку [непосредни пораки](%%doc.im%%). "
+"Подолу поставете адреси и направете нагодувања."
 
 #. TRANS: Message given in the IM settings if IM is not enabled on the site.
-#: actions/imsettings.php:90
 msgid "IM is not available."
 msgstr "IM е недостапно."
 
-#: actions/imsettings.php:116
-#, fuzzy, php-format
+#, php-format
 msgid "Current confirmed %s address."
-msgstr "Тековна потврдена е-поштенска адреса."
+msgstr "Тековна потврдена адреса на %s."
 
 #. TRANS: Form note in IM settings form.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:128
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your %s account for a message "
 "with further instructions. (Did you add %s to your buddy list?)"
 msgstr ""
-"Чекам потврда за оваа адреса. Проверете ја Вашата сметка на Jabber/Google "
-"Talk - треба да добиете порака со понатамошни напатствија. (Дали го/ја "
-"додадовте %s на Вашиот список со пријатели?)"
+"Чекам потврда за оваа адреса. Проверете ја Вашата сметка на %s - треба да "
+"добиете порака со понатамошни напатствија. (Дали го/ја додадовте %s на "
+"Вашиот список со пријатели?)"
 
-#: actions/imsettings.php:140
 msgid "IM address"
 msgstr "IM адреса"
 
-#: actions/imsettings.php:142
 #, php-format
 msgid "%s screenname."
-msgstr ""
+msgstr "%s прекар."
 
 #. TRANS: Header for IM preferences form.
-#: actions/imsettings.php:163
-#, fuzzy
 msgid "IM Preferences"
-msgstr "IM нагодувања"
+msgstr "Нагодувања на IM"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:174
-#, fuzzy
 msgid "Send me notices"
-msgstr "Испрати забелешка"
+msgstr "Праќај ми забелешки"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:176
-#, fuzzy
 msgid "Post a notice when my status changes."
-msgstr ""
-"Објавувај забелешка кога ќе се промени мојот статус на Jabber/Google Talk."
+msgstr "Објавувај забелешка кога ќе се измени мојот статус."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:178
-#, fuzzy
 msgid "Send me replies from people I'm not subscribed to."
-msgstr ""
-"Испраќај ми одговори преку Jabber/Google Talk од луѓе на кои не се имам "
-"претплатено."
+msgstr "Праќај ми одговори од луѓе на кои се немам претплатено."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:181
-#, fuzzy
 msgid "Publish a MicroID"
-msgstr "Објави MicroID за мојата е-поштенска адреса."
+msgstr "Објави MicroID"
 
 #. TRANS: Server error thrown on database error updating IM preferences.
-#: actions/imsettings.php:291
-#, fuzzy
 msgid "Couldn't update IM preferences."
-msgstr "Не можев да го подновам корисникот."
+msgstr "Не можев да ги подновам нагодувањата за IM."
 
 #. TRANS: Confirmation message for successful IM preferences save.
 #. TRANS: Confirmation message after saving preferences.
-#: actions/imsettings.php:298 actions/urlsettings.php:244
 msgid "Preferences saved."
 msgstr "Нагодувањата се зачувани."
 
 #. TRANS: Message given saving IM address without having provided one.
-#: actions/imsettings.php:320
-#, fuzzy
 msgid "No screenname."
 msgstr "Нема прекар."
 
-#: actions/imsettings.php:325
-#, fuzzy
 msgid "No transport."
-msgstr "Нема забелешка."
+msgstr "Нема пренос."
 
 #. TRANS: Message given saving IM address that cannot be normalised.
-#: actions/imsettings.php:333
-#, fuzzy
 msgid "Cannot normalize that screenname"
-msgstr "Не можам да го нормализирам овој ID за Jabber."
+msgstr "Не можам да го нормализирам тој прекар"
 
 #. TRANS: Message given saving IM address that not valid.
-#: actions/imsettings.php:340
-#, fuzzy
 msgid "Not a valid screenname"
-msgstr "Неправилен прекар."
+msgstr "Ова не е важечки прекар"
 
 #. TRANS: Message given saving IM address that is already set for another user.
-#: actions/imsettings.php:344
-#, fuzzy
 msgid "Screenname already belongs to another user."
-msgstr "Ова Jabber ID му припаѓа на друг корисник."
+msgstr "Прекарот му припаѓа на друг корисник."
 
 #. TRANS: Message given saving valid IM address that is to be confirmed.
-#: actions/imsettings.php:369
-#, fuzzy
 msgid "A confirmation code was sent to the IM address you added."
-msgstr ""
-"Испративме потврден код на IM-адресата што ја додадовте. Ќе мора да му "
-"одобрите на %s да Ви испраќа пораки."
+msgstr "Испративме потврден код на IM-адресата што ја додадовте."
 
 #. TRANS: Message given canceling IM address confirmation for the wrong IM address.
-#: actions/imsettings.php:396
 msgid "That is the wrong IM address."
 msgstr "Ова е погрешната IM адреса."
 
 #. TRANS: Server error thrown on database error canceling IM address confirmation.
-#: actions/imsettings.php:405
-#, fuzzy
 msgid "Couldn't delete confirmation."
-msgstr "Не можев да ја избришам потврдата на IM."
+msgstr "Не можев да ја избришам потврдата."
 
 #. TRANS: Message given after successfully canceling IM address confirmation.
-#: actions/imsettings.php:410
 msgid "IM confirmation cancelled."
 msgstr "Потврдата на IM е откажана."
 
 #. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.
-#: actions/imsettings.php:434
-#, fuzzy
 msgid "That is not your screenname."
-msgstr "Тоа не е Вашиот телефонски број."
+msgstr "Тоа не е Вашиот прекар."
 
 #. TRANS: Server error thrown on database error removing a registered IM address.
-#: actions/imsettings.php:443
-#, fuzzy
 msgid "Couldn't update user im prefs."
-msgstr "Не можев да ја подновам корисничката евиденција."
+msgstr "Не можев да ги подновам корисничките нагодувања за IM."
 
 #. TRANS: Message given after successfully removing a registered Instant Messaging address.
-#: actions/imsettings.php:451
 msgid "The IM address was removed."
 msgstr "IM-адресата е отстранета."
 
 #. TRANS: Title for all but the first page of the inbox page.
 #. TRANS: %1$s is the user's nickname, %2$s is the page number.
-#: actions/inbox.php:59
 #, php-format
 msgid "Inbox for %1$s - page %2$d"
 msgstr "Приемно сандаче за %1$s - стр. %2$d"
 
 #. TRANS: Title for the first page of the inbox page.
 #. TRANS: %s is the user's nickname.
-#: actions/inbox.php:64
 #, php-format
 msgid "Inbox for %s"
 msgstr "Приемно сандаче за %s"
 
 #. TRANS: Instructions for user inbox page.
-#: actions/inbox.php:106
 msgid "This is your inbox, which lists your incoming private messages."
 msgstr ""
 "Ова е Вашето приемно сандаче, кадешто се наведени Вашите добиени приватни "
 "пораки."
 
 #. TRANS: Client error displayed when trying to sent invites while they have been disabled.
-#: actions/invite.php:41
 msgid "Invites have been disabled."
 msgstr "Поканите се оневозможени."
 
 #. TRANS: Client error displayed when trying to sent invites while not logged in.
 #. TRANS: %s is the StatusNet site name.
-#: actions/invite.php:45
 #, php-format
 msgid "You must be logged in to invite other users to use %s."
 msgstr ""
@@ -3381,18 +2694,15 @@ msgstr ""
 
 #. TRANS: Form validation message when providing an e-mail address that does not validate.
 #. TRANS: %s is an invalid e-mail address.
-#: actions/invite.php:78
 #, php-format
 msgid "Invalid email address: %s."
 msgstr "Неважечка е-поштенска адреса: %s."
 
 #. TRANS: Page title when invitations have been sent.
-#: actions/invite.php:117
 msgid "Invitations sent"
 msgstr "Поканите се испратени"
 
 #. TRANS: Page title when inviting potential users.
-#: actions/invite.php:120
 msgid "Invite new users"
 msgstr "Покани нови корисници"
 
@@ -3400,7 +2710,6 @@ msgstr "Покани нови корисници"
 #. TRANS: is already subscribed to one or more users with the given e-mail address(es).
 #. TRANS: Plural form is based on the number of reported already subscribed e-mail addresses.
 #. TRANS: Followed by a bullet list.
-#: actions/invite.php:140
 msgid "You are already subscribed to this user:"
 msgid_plural "You are already subscribed to these users:"
 msgstr[0] "Веќе сте претплатени на овој корисник:"
@@ -3408,7 +2717,6 @@ msgstr[1] "Веќе сте претплатени на овие корисниц
 
 #. TRANS: Used as list item for already subscribed users (%1$s is nickname, %2$s is e-mail address).
 #. TRANS: Used as list item for already registered people (%1$s is nickname, %2$s is e-mail address).
-#: actions/invite.php:146 actions/invite.php:160
 #, php-format
 msgctxt "INVITE"
 msgid "%1$s (%2$s)"
@@ -3417,7 +2725,6 @@ msgstr "%1$s (%2$s)"
 #. TRANS: Message displayed inviting users to use a StatusNet site while the invited user
 #. TRANS: already uses a this StatusNet site. Plural form is based on the number of
 #. TRANS: reported already present people. Followed by a bullet list.
-#: actions/invite.php:154
 msgid "This person is already a user and you were automatically subscribed:"
 msgid_plural ""
 "These people are already users and you were automatically subscribed to them:"
@@ -3427,7 +2734,6 @@ msgstr[1] "Овие луѓе веќе се корисници и автомат
 #. TRANS: Message displayed inviting users to use a StatusNet site. Plural form is
 #. TRANS: based on the number of invitations sent. Followed by a bullet list of
 #. TRANS: e-mail addresses to which invitations were sent.
-#: actions/invite.php:168
 msgid "Invitation sent to the following person:"
 msgid_plural "Invitations sent to the following people:"
 msgstr[0] "Испратена е покана до следново лице:"
@@ -3435,7 +2741,6 @@ msgstr[1] "Испратени се покани до следниве лица:"
 
 #. TRANS: Generic message displayed after sending out one or more invitations to
 #. TRANS: people to join a StatusNet site.
-#: actions/invite.php:178
 msgid ""
 "You will be notified when your invitees accept the invitation and register "
 "on the site. Thanks for growing the community!"
@@ -3445,7 +2750,6 @@ msgstr ""
 "помагате да ја прошириме заедницата!"
 
 #. TRANS: Form instructions.
-#: actions/invite.php:191
 msgid ""
 "Use this form to invite your friends and colleagues to use this service."
 msgstr ""
@@ -3453,27 +2757,23 @@ msgstr ""
 "место."
 
 #. TRANS: Field label for a list of e-mail addresses.
-#: actions/invite.php:218
 msgid "Email addresses"
 msgstr "Е-поштенски адреси"
 
 #. TRANS: Tooltip for field label for a list of e-mail addresses.
-#: actions/invite.php:221
 msgid "Addresses of friends to invite (one per line)."
 msgstr "Адреси на пријателите што ги каните (по една во секој ред)."
 
 #. TRANS: Field label for a personal message to send to invitees.
-#: actions/invite.php:225
 msgid "Personal message"
 msgstr "Лична порака"
 
 #. TRANS: Tooltip for field label for a personal message to send to invitees.
-#: actions/invite.php:228
 msgid "Optionally add a personal message to the invitation."
 msgstr "Можете да додадете и лична порака во поканата."
 
 #. TRANS: Send button for inviting friends
-#: actions/invite.php:232
+#. TRANS: Button text for sending notice.
 msgctxt "BUTTON"
 msgid "Send"
 msgstr "Испрати"
@@ -3481,7 +2781,6 @@ msgstr "Испрати"
 #. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral
 #. TRANS: singular 3rd-person pronoun in English. %1$s is the inviting user, $2$s is
 #. TRANS: the StatusNet sitename.
-#: actions/invite.php:264
 #, php-format
 msgid "%1$s has invited you to join them on %2$s"
 msgstr "%1$s Ве покани да се придружите на %2$s"
@@ -3491,7 +2790,6 @@ msgstr "%1$s Ве покани да се придружите на %2$s"
 #. TRANS: StatusNet sitename, %3$s is the site URL, %4$s is the personal message from the
 #. TRANS: inviting user, %s%5 a link to the timeline for the inviting user, %s$6 is a link
 #. TRANS: to register with the StatusNet site.
-#: actions/invite.php:271
 #, php-format
 msgid ""
 "%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -3549,50 +2847,44 @@ msgstr ""
 "Со почит, %2$s\n"
 
 #. TRANS: Client error displayed when trying to join a group while not logged in.
-#: actions/joingroup.php:59
 msgid "You must be logged in to join a group."
 msgstr "Мора да сте најавени за да можете да се зачлените во група."
 
 #. TRANS: Title for join group page after joining.
-#: actions/joingroup.php:148
 #, php-format
 msgctxt "TITLE"
 msgid "%1$s joined group %2$s"
 msgstr "%1$s се зачлени во групата %2$s"
 
 #. TRANS: Client error displayed when trying to leave a group while not logged in.
-#: actions/leavegroup.php:59
 msgid "You must be logged in to leave a group."
 msgstr "Мора да сте најавени за да можете да ја напуштите групата."
 
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
-#: actions/leavegroup.php:103 lib/command.php:398
 msgid "You are not a member of that group."
 msgstr "Не членувате во таа група."
 
 #. TRANS: Title for leave group page after leaving.
-#: actions/leavegroup.php:142
 #, php-format
 msgctxt "TITLE"
 msgid "%1$s left group %2$s"
 msgstr "%1$s ја напушти групата %2$s"
 
 #. TRANS: User admin panel title
-#: actions/licenseadminpanel.php:55
 msgctxt "TITLE"
 msgid "License"
 msgstr "Лиценца"
 
-#: actions/licenseadminpanel.php:65
+#. TRANS: Form instructions for the site license admin panel.
 msgid "License for this StatusNet site"
 msgstr "Лиценца на ова StatusNet-мрежно место"
 
-#: actions/licenseadminpanel.php:134
+#. TRANS: Client error displayed selecting an invalid license in the license admin panel.
 msgid "Invalid license selection."
 msgstr "Неважечки избор на лиценца."
 
-#: actions/licenseadminpanel.php:144
+#. TRANS: Client error displayed when not specifying an owner for the all rights reserved license in the license admin panel.
 msgid ""
 "You must specify the owner of the content when using the All Rights Reserved "
 "license."
@@ -3600,137 +2892,138 @@ msgstr ""
 "Мора да го наведете сопственикот на содржината кога користите лиценца со "
 "Сите права задржани."
 
-#: actions/licenseadminpanel.php:151
+#. TRANS: Client error displayed selecting a too long license title in the license admin panel.
 msgid "Invalid license title. Maximum length is 255 characters."
 msgstr "Неважечки наслов на лиценцата. Дозволени се највеќе 255 знаци."
 
-#: actions/licenseadminpanel.php:163
+#. TRANS: Client error displayed specifying an invalid license URL in the license admin panel.
 msgid "Invalid license URL."
 msgstr "Неважечка URL-адреса на лиценцата."
 
-#: actions/licenseadminpanel.php:166
+#. TRANS: Client error displayed specifying an invalid license image URL in the license admin panel.
 msgid "Invalid license image URL."
 msgstr "Неважечка URL-адреса за сликата на лиценцата."
 
-#: actions/licenseadminpanel.php:174
+#. TRANS: Client error displayed specifying an invalid license URL in the license admin panel.
 msgid "License URL must be blank or a valid URL."
 msgstr ""
 "URL-адресата на лиценцата мора да стои празна или да биде важечка адреса."
 
-#: actions/licenseadminpanel.php:182
+#. TRANS: Client error displayed specifying an invalid license image URL in the license admin panel.
 msgid "License image must be blank or valid URL."
 msgstr ""
 "Сликата на лиценцата мора да стои празна или да биде важечка URL-адреса."
 
-#: actions/licenseadminpanel.php:232
+#. TRANS: Form legend in the license admin panel.
 msgid "License selection"
 msgstr "Избор на лиценца"
 
-#: actions/licenseadminpanel.php:238
+#. TRANS: License option in the license admin panel.
 msgid "Private"
 msgstr "Приватен"
 
-#: actions/licenseadminpanel.php:239
+#. TRANS: License option in the license admin panel.
 msgid "All Rights Reserved"
 msgstr "Сите права задржани"
 
-#: actions/licenseadminpanel.php:240
+#. TRANS: License option in the license admin panel.
 msgid "Creative Commons"
 msgstr "Creative Commons"
 
-#: actions/licenseadminpanel.php:245
+#. TRANS: Dropdown field label in the license admin panel.
 msgid "Type"
 msgstr "Тип"
 
-#: actions/licenseadminpanel.php:247
-msgid "Select license"
+#. TRANS: Dropdown field instructions in the license admin panel.
+#, fuzzy
+msgid "Select a license."
 msgstr "Одберете лиценца"
 
-#: actions/licenseadminpanel.php:261
+#. TRANS: Form legend in the license admin panel.
 msgid "License details"
 msgstr "Податоци за лиценцата"
 
-#: actions/licenseadminpanel.php:267
+#. TRANS: Field label in the license admin panel.
 msgid "Owner"
 msgstr "Сопственик"
 
-#: actions/licenseadminpanel.php:268
+#. TRANS: Field title in the license admin panel.
 msgid "Name of the owner of the site's content (if applicable)."
 msgstr ""
 "Име и презиме на сопственикот на содржината на мрежното место (ако е "
 "применливо)."
 
-#: actions/licenseadminpanel.php:276
+#. TRANS: Field label in the license admin panel.
 msgid "License Title"
 msgstr "Наслов на лиценцата"
 
-#: actions/licenseadminpanel.php:277
+#. TRANS: Field title in the license admin panel.
 msgid "The title of the license."
 msgstr "Насловот на лиценцата."
 
-#: actions/licenseadminpanel.php:285
+#. TRANS: Field label in the license admin panel.
 msgid "License URL"
 msgstr "URL-адреса на лиценцата"
 
-#: actions/licenseadminpanel.php:286
+#. TRANS: Field title in the license admin panel.
 msgid "URL for more information about the license."
 msgstr "URL-адреса за повеќе информации во врска со лиценцата."
 
-#: actions/licenseadminpanel.php:293
+#. TRANS: Field label in the license admin panel.
 msgid "License Image URL"
 msgstr "URL-адреса за сликата на лиценцата"
 
-#: actions/licenseadminpanel.php:294
+#. TRANS: Field title in the license admin panel.
 msgid "URL for an image to display with the license."
 msgstr "URL-адреса за слика што ќе се прикажува со лиценцата."
 
-#. TRANS: Submit button title.
-#: actions/licenseadminpanel.php:311 actions/sessionsadminpanel.php:199
-#: actions/siteadminpanel.php:292 actions/snapshotadminpanel.php:245
-#: actions/tagother.php:133 lib/applicationeditform.php:357
-msgid "Save"
-msgstr "Зачувај"
-
-#: actions/licenseadminpanel.php:311
-msgid "Save license settings"
+#. TRANS: Button title in the license admin panel.
+#, fuzzy
+msgid "Save license settings."
 msgstr "Зачувај нагодувања на лиценцата"
 
+#. TRANS: Client error displayed when trying to log in while already logged in.
 #. TRANS: Client error displayed trying to use "one time password login" when already logged in.
-#: actions/login.php:97 actions/otp.php:62 actions/register.php:130
 msgid "Already logged in."
 msgstr "Веќе сте најавени."
 
-#: actions/login.php:125
+#. TRANS: Form validation error displayed when trying to log in with incorrect credentials.
 msgid "Incorrect username or password."
 msgstr "Неточно корисничко име или лозинка"
 
+#. TRANS: Server error displayed when during login a server error occurs.
 #. TRANS: Server error displayed when a user object could not be created trying to login using "one time password login".
-#: actions/login.php:131 actions/otp.php:127
 msgid "Error setting user. You are probably not authorized."
 msgstr "Грешка при поставувањето на корисникот. Веројатно не се заверени."
 
-#: actions/login.php:185 actions/login.php:236 lib/action.php:598
+#. TRANS: Page title for login page.
 msgid "Login"
 msgstr "Најава"
 
-#: actions/login.php:222
+#. TRANS: Form legend on login page.
 msgid "Login to site"
 msgstr "Најавете се"
 
-#: actions/login.php:231 actions/register.php:469
+#. TRANS: Checkbox label label on login page.
 msgid "Remember me"
 msgstr "Запамети ме"
 
-#: actions/login.php:232 actions/register.php:471
+#. TRANS: Checkbox title on login page.
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 "Отсега врши автоматска најава. Не треба да се користи за јавни сметачи!"
 
-#: actions/login.php:241
+#. TRANS: Button text for log in on login page.
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Login"
+msgstr "Најава"
+
+#. TRANS: Link text for link to "reset password" on login page.
 msgid "Lost or forgotten password?"
 msgstr "Ја загубивте или заборавивте лозинката?"
 
-#: actions/login.php:259
+#. TRANS: Form instructions on login page before being able to change user settings.
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -3738,139 +3031,135 @@ msgstr ""
 "Поради безбедносни причини треба повторно да го внесете Вашето корисничко "
 "име и лозинка пред да ги смените Вашите нагодувања."
 
-#: actions/login.php:263
+#. TRANS: Form instructions on login page.
 msgid "Login with your username and password."
 msgstr "Најавете се со корисничко име и лозинка."
 
-#: actions/login.php:266
+#. TRANS: Form instructions on login page. This message contains Markdown links in the form [Link text](Link).
+#. TRANS: %%action.register%% is a link to the registration page.
 #, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
 msgstr ""
 "Сè уште немате корисничко име? [Направете](%%action.register%%) нова сметка."
 
-#: actions/makeadmin.php:92
+#. TRANS: Client error displayed when trying to make another user admin on the Make Admin page while not an admin.
 msgid "Only an admin can make another user an admin."
 msgstr "Само администратор може да направи друг корисник администратор."
 
-#: actions/makeadmin.php:96
+#. TRANS: Client error displayed when trying to make another user admin on the Make Admin page who already is admin.
+#. TRANS: %1$s is the user that is already admin, %2$s is the group user is already admin for.
 #, php-format
 msgid "%1$s is already an admin for group \"%2$s\"."
 msgstr "%1$s веќе е администратор на групата „%2$s“."
 
-#: actions/makeadmin.php:133
+#. TRANS: Server error displayed when trying to make another user admin on the Make Admin page fails
+#. TRANS: because the group membership record could not be gotten.
+#. TRANS: %1$s is the to be admin user, %2$s is the group user should be admin for.
 #, php-format
 msgid "Can't get membership record for %1$s in group %2$s."
 msgstr "Не можам да добијам евиденција за членство на %1$s во групата %2$s."
 
-#: actions/makeadmin.php:146
+#. TRANS: Server error displayed when trying to make another user admin on the Make Admin page fails
+#. TRANS: because the group adminship record coud not be saved properly.
+#. TRANS: %1$s is the to be admin user, %2$s is the group user is already admin for.
 #, php-format
 msgid "Can't make %1$s an admin for group %2$s."
 msgstr "Не можам да го направам корисникот %1$s администратор на групата %2$s."
 
-#: actions/microsummary.php:69
+#. TRANS: Client error displayed trying to make a micro summary without providing a status.
 msgid "No current status."
 msgstr "Нема тековен статус."
 
 #. TRANS: This is the title of the form for adding a new application.
-#: actions/newapplication.php:52
 msgid "New application"
 msgstr "Нов програм"
 
 #. TRANS: Client error displayed trying to add a new application while not logged in.
-#: actions/newapplication.php:64
 msgid "You must be logged in to register an application."
 msgstr "Мора да сте најавени за да можете да регистрирате програм."
 
 #. TRANS: Form instructions for registering a new application.
-#: actions/newapplication.php:147
 msgid "Use this form to register a new application."
 msgstr "Овој образец служи за регистрирање на нов програм."
 
 #. TRANS: Validation error shown when not providing a source URL in the "New application" form.
-#: actions/newapplication.php:189
 msgid "Source URL is required."
 msgstr "Треба изворна URL-адреса."
 
 #. TRANS: Server error displayed when an application could not be registered in the database through the "New application" form.
-#: actions/newapplication.php:279 actions/newapplication.php:289
 msgid "Could not create application."
 msgstr "Не можеше да се создаде програмот."
 
 #. TRANS: Title for form to create a group.
-#: actions/newgroup.php:53
 msgid "New group"
 msgstr "Нова група"
 
 #. TRANS: Client exception thrown when a user tries to create a group while banned.
-#: actions/newgroup.php:73 classes/User_group.php:485
 msgid "You are not allowed to create groups on this site."
 msgstr "Не Ви е дозволено да создавате групи на ова мреж. место."
 
 #. TRANS: Form instructions for group create form.
-#: actions/newgroup.php:117
 msgid "Use this form to create a new group."
 msgstr "Овој образец служи за создавање нова група."
 
-#. TRANS: Group create form validation error.
-#: actions/newgroup.php:200
-msgid "Alias cannot be the same as nickname."
-msgstr "Алијасот не може да биде ист како прекарот."
-
-#: actions/newmessage.php:71 actions/newmessage.php:234
+#. TRANS: Page title for new direct message page.
+#. TRANS: Page title on page for sending a direct message.
 msgid "New message"
 msgstr "Нова порака"
 
-#. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
-#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:513
-msgid "You can't send a message to this user."
+#. TRANS: Client error displayed trying to send a direct message to a user while sender and
+#. TRANS: receiver are not subscribed to each other.
+#, fuzzy
+msgid "You cannot send a message to this user."
 msgstr "Не можете да испратите порака до овојо корисник."
 
+#. TRANS: Form validator error displayed trying to send a direct message without content.
+#. TRANS: Client error displayed trying to send a notice without content.
 #. TRANS: Command exception text shown when trying to send a direct message to another user without content.
 #. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
-#: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:490
-#: lib/command.php:593
 msgid "No content!"
 msgstr "Нема содржина!"
 
-#: actions/newmessage.php:161
+#. TRANS: Form validation error displayed trying to send a direct message without specifying a recipient.
 msgid "No recipient specified."
 msgstr "Нема назначено примач."
 
+#. TRANS: Client error displayed trying to send a direct message to self.
 #. TRANS: Error text shown when trying to send a direct message to self.
-#: actions/newmessage.php:167 lib/command.php:517
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
 "Не испраќајте си порака самите на себе; подобро тивко кажете си го тоа на "
 "себеси."
 
-#: actions/newmessage.php:184
+#. TRANS: Page title after sending a direct message.
 msgid "Message sent"
 msgstr "Пораката е испратена"
 
+#. TRANS: Confirmation text after sending a direct message.
+#. TRANS: %s is the direct message recipient.
 #. TRANS: Message given have sent a direct message to another user.
 #. TRANS: %s is the name of the other user.
-#: actions/newmessage.php:188 lib/command.php:525
 #, php-format
 msgid "Direct message to %s sent."
 msgstr "Директната порака до %s е испратена."
 
-#: actions/newmessage.php:213 actions/newnotice.php:264
+#. TRANS: Page title after an AJAX error occurred on the "send direct message" page.
+#. TRANS: Page title after an AJAX error occurs on the send notice page.
 msgid "Ajax Error"
 msgstr "Ajax-грешка"
 
-#: actions/newnotice.php:69
+#. TRANS: Page title for sending a new notice.
 msgid "New notice"
 msgstr "Ново забелешка"
 
-#: actions/newnotice.php:230
+#. TRANS: Page title after sending a notice.
 msgid "Notice posted"
 msgstr "Забелешката е објавена"
 
 #. TRANS: Instructions for Notice search page.
 #. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/noticesearch.php:69
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -3880,20 +3169,17 @@ msgstr ""
 "одделете ги со празни места; мора да имаат барем по 3 знаци."
 
 #. TRANS: Title of the page where users can search for notices.
-#: actions/noticesearch.php:80
 msgid "Text search"
 msgstr "Текстуално пребарување"
 
 #. TRANS: Test in RSS notice search.
 #. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearch.php:95
 #, php-format
 msgid "Search results for \"%1$s\" on %2$s"
 msgstr "Резултати од пребарувањето за „%1$s“ на %2$s"
 
 #. TRANS: Text for logged in users making a query for notices without results.
 #. TRANS: This message contains a Markdown link.
-#: actions/noticesearch.php:128
 #, php-format
 msgid ""
 "Be the first to [post on this topic](%%%%action.newnotice%%%%?"
@@ -3904,7 +3190,6 @@ msgstr ""
 
 #. TRANS: Text for not logged in users making a query for notices without results.
 #. TRANS: This message contains Markdown links.
-#: actions/noticesearch.php:133
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and be the first to "
@@ -3915,19 +3200,17 @@ msgstr ""
 "s)!"
 
 #. TRANS: RSS notice search feed title. %s is the query.
-#: actions/noticesearchrss.php:95
 #, php-format
 msgid "Updates with \"%s\""
 msgstr "Подновувања со „%s“"
 
 #. TRANS: RSS notice search feed description.
 #. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearchrss.php:99
 #, php-format
 msgid "Updates matching search term \"%1$s\" on %2$s."
 msgstr "Подновувања кои се совпаѓаат со пребараниот израз „%1$s“ на %2$s."
 
-#: actions/nudge.php:85
+#. TRANS: Client error displayed trying to nudge a user that cannot be nudged.
 msgid ""
 "This user doesn't allow nudges or hasn't confirmed or set their email "
 "address yet."
@@ -3935,60 +3218,51 @@ msgstr ""
 "Овој корисник не дозволува подбуцнувања или сè уште нема потврдено или "
 "внесено своја е-пошта."
 
-#: actions/nudge.php:94
+#. TRANS: Page title after sending a nudge.
 msgid "Nudge sent"
 msgstr "Подбуцнувањето е испратено"
 
-#: actions/nudge.php:97
+#. TRANS: Confirmation text after sending a nudge.
 msgid "Nudge sent!"
 msgstr "Подбуцнувањето е испратено!"
 
 #. TRANS: Message displayed to an anonymous user trying to view OAuth application list.
-#: actions/oauthappssettings.php:57
 msgid "You must be logged in to list your applications."
 msgstr "Мора да сте најавени за да можете да ги наведете програмите."
 
 #. TRANS: Page title for OAuth applications
-#: actions/oauthappssettings.php:73
 msgid "OAuth applications"
 msgstr "OAuth програми"
 
 #. TRANS: Page instructions for OAuth applications
-#: actions/oauthappssettings.php:85
 msgid "Applications you have registered"
 msgstr "Програми што ги имате регистрирано"
 
 #. TRANS: Empty list message on page with OAuth applications.
-#: actions/oauthappssettings.php:138
 #, php-format
 msgid "You have not registered any applications yet."
 msgstr "Сè уште немате регистрирано ниеден програм,"
 
 #. TRANS: Title for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:69
 msgid "Connected applications"
 msgstr "Поврзани програми"
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:80
 msgid "The following connections exist for your account."
 msgstr "За Вашата сметка постојат следниве врски."
 
 #. TRANS: Client error when trying to revoke access for an application while not being a user of it.
-#: actions/oauthconnectionssettings.php:165
 msgid "You are not a user of that application."
 msgstr "Не сте корисник на тој програм."
 
 #. TRANS: Client error when revoking access has failed for some reason.
 #. TRANS: %s is the application ID revoking access failed for.
-#: actions/oauthconnectionssettings.php:180
 #, php-format
 msgid "Unable to revoke access for application: %s."
 msgstr "Не можам да му го одземам пристапот на програмот: %s."
 
 #. TRANS: Success message after revoking access for an application.
 #. TRANS: %1$s is the application name, %2$s is the first part of the user token.
-#: actions/oauthconnectionssettings.php:199
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -3997,14 +3271,12 @@ msgstr ""
 "Успешно одземавте пристап за %1$s и пристапниот жетон што почнува со %2$s."
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:210
 msgid "You have not authorized any applications to use your account."
 msgstr "Му немате дозволено пристап до Вашата сметка на ниеден програм."
 
 #. TRANS: Note for developers in the OAuth connection settings form.
 #. TRANS: This message contains a Markdown link. Do not separate "](".
 #. TRANS: %s is the URL to the OAuth settings.
-#: actions/oauthconnectionssettings.php:230
 #, php-format
 msgid ""
 "Are you a developer? [Register an OAuth client application](%s) to use with "
@@ -4013,440 +3285,359 @@ msgstr ""
 "Дали сте програмер? [Регистрирајте клиентски програм за OAuth](%s) за да го "
 "користите овој примерок на StatusNet."
 
-#: actions/oembed.php:64
+#. TRANS: Server error displayed in oEmbed action when path not found.
+#. TRANS: %s is a path.
 #, php-format
 msgid "\"%s\" not found."
 msgstr "„%s“ не е пронајден."
 
-#: actions/oembed.php:76
+#. TRANS: Server error displayed in oEmbed action when notice not found.
+#. TRANS: %s is a notice.
 #, php-format
 msgid "Notice %s not found."
 msgstr "Забелешката %s не е пронајдена."
 
-#: actions/oembed.php:80 actions/shownotice.php:100
+#. TRANS: Server error displayed in oEmbed action when notice has not profile.
 msgid "Notice has no profile."
 msgstr "Забелешката нема профил."
 
-#: actions/oembed.php:83 actions/shownotice.php:172
+#. TRANS: oEmbed title. %1$s is the author name, %2$s is the creation date.
 #, php-format
 msgid "%1$s's status on %2$s"
 msgstr "%1$s статус на %2$s"
 
-#: actions/oembed.php:95
+#. TRANS: Server error displayed in oEmbed action when attachment not found.
+#. TRANS: %d is an attachment ID.
 #, php-format
 msgid "Attachment %s not found."
 msgstr "Прилогот %s не е пронајден."
 
-#: actions/oembed.php:136
+#. TRANS: Server error displayed in oEmbed request when a path is not supported.
+#. TRANS: %s is a path.
 #, php-format
 msgid "\"%s\" not supported for oembed requests."
 msgstr "„%s“ не е поддржано за oembed-барања."
 
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
-#: actions/oembed.php:168
 #, php-format
 msgid "Content type %s not supported."
 msgstr "Содржините од типот %s не се поддржани."
 
 #. TRANS: Error message displaying attachments. %s is the site's base URL.
-#: actions/oembed.php:172
 #, php-format
 msgid "Only %s URLs over plain HTTP please."
 msgstr "Ве молиме користете само %s URL-адреси врз прост HTTP-код."
 
+#. TRANS: Server error displayed in oEmbed action when request specifies an unsupported data format.
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1207
-#: lib/apiaction.php:1234 lib/apiaction.php:1369
 msgid "Not a supported data format."
 msgstr "Ова не е поддржан формат на податотека."
 
 #. TRANS: ShortName in the OpenSearch interface when trying to find users.
-#: actions/opensearch.php:64
 msgid "People Search"
 msgstr "Пребарување на луѓе"
 
-#: actions/opensearch.php:68
+#. TRANS: ShortName in the OpenSearch interface when trying to find notices.
 msgid "Notice Search"
 msgstr "Пребарување на забелешки"
 
 #. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
-#: actions/otp.php:70
 msgid "No user ID specified."
 msgstr "Нема назначено кориснички ID."
 
 #. TRANS: Client error displayed trying to use "one time password login" without specifying a login token.
-#: actions/otp.php:86
 msgid "No login token specified."
 msgstr "Нема назначено најавен жетон."
 
 #. TRANS: Client error displayed trying to use "one time password login" without requesting a login token.
-#: actions/otp.php:94
 msgid "No login token requested."
 msgstr "Не е побаран најавен жетон."
 
 #. TRANS: Client error displayed trying to use "one time password login" while specifying an invalid login token.
-#: actions/otp.php:100
 msgid "Invalid login token specified."
 msgstr "Назначен е неважечки најавен жетон."
 
 #. TRANS: Client error displayed trying to use "one time password login" while specifying an expired login token.
-#: actions/otp.php:110
 msgid "Login token expired."
 msgstr "Најавниот жетон е истечен."
 
 #. TRANS: Title for outbox for any but the fist page.
 #. TRANS: %1$s is the user nickname, %2$d is the page number.
-#: actions/outbox.php:57
 #, php-format
 msgid "Outbox for %1$s - page %2$d"
 msgstr "Излезно сандаче за %1$s - стр. %2$d"
 
 #. TRANS: Title for first page of outbox.
-#: actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
 msgstr "Излезно сандаче за %s"
 
 #. TRANS: Instructions for outbox.
-#: actions/outbox.php:103
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr ""
 "Ова е Вашето излезно сандче, во кое се наведени приватните пораки кои ги "
 "имате испратено."
 
-#: actions/passwordsettings.php:58
 msgid "Change password"
 msgstr "Промени ја лозинката"
 
-#: actions/passwordsettings.php:69
 msgid "Change your password."
 msgstr "Променете си ја лозинката."
 
 #. TRANS: Fieldset legend for password reset form.
-#: actions/passwordsettings.php:96 actions/recoverpassword.php:251
 msgid "Password change"
 msgstr "Промена на лозинка"
 
-#: actions/passwordsettings.php:104
 msgid "Old password"
 msgstr "Стара лозинка"
 
 #. TRANS: Field label for password reset form.
-#: actions/passwordsettings.php:108 actions/recoverpassword.php:256
 msgid "New password"
 msgstr "Нова лозинка"
 
-#: actions/passwordsettings.php:109 actions/register.php:416
 msgid "6 or more characters."
 msgstr "6 или повеќе знаци."
 
 #. TRANS: Ttile for field label for password reset form where the password has to be typed again.
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:264
-#: actions/register.php:420
 msgid "Same as password above."
 msgstr "Исто како лозинката погоре."
 
-#: actions/passwordsettings.php:117
 msgid "Change"
 msgstr "Промени"
 
-#: actions/passwordsettings.php:153 actions/register.php:223
 msgid "Password must be 6 or more characters."
 msgstr "Лозинката мора да содржи барем 6 знаци."
 
-#: actions/passwordsettings.php:156 actions/register.php:226
 msgid "Passwords don't match."
 msgstr "Лозинките не се совпаѓаат."
 
-#: actions/passwordsettings.php:164
 msgid "Incorrect old password"
 msgstr "Неточна стара лозинка"
 
-#: actions/passwordsettings.php:180
 msgid "Error saving user; invalid."
 msgstr "Грешка во зачувувањето на корисникот; неправилен."
 
 #. TRANS: Reset password form validation error message.
-#: actions/passwordsettings.php:185 actions/recoverpassword.php:418
 msgid "Cannot save new password."
 msgstr "Не можам да ја зачувам новата лозинка."
 
-#: actions/passwordsettings.php:191
 msgid "Password saved."
 msgstr "Лозинката е зачувана."
 
 #. TRANS: Title for Paths admin panel.
 #. TRANS: Menu item for site administration
-#: actions/pathsadminpanel.php:58 lib/adminpanelaction.php:371
 msgid "Paths"
 msgstr "Патеки"
 
 #. TRANS: Form instructions for Path admin panel.
-#: actions/pathsadminpanel.php:69
 msgid "Path and server settings for this StatusNet site"
 msgstr "Нагодувања за патеки и опслужувачи за оваа StatusNet-мрежно место."
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the directory that could not be read from.
-#: actions/pathsadminpanel.php:155
 #, php-format
 msgid "Theme directory not readable: %s."
 msgstr "Директориумот на темата е нечитлив: %s."
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the avatar directory that could not be written to.
-#: actions/pathsadminpanel.php:163
 #, php-format
 msgid "Avatar directory not writable: %s."
 msgstr "Директориумот на аватарот е недостапен за запишување: %s."
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the background directory that could not be written to.
-#: actions/pathsadminpanel.php:171
 #, php-format
 msgid "Background directory not writable: %s."
 msgstr "Директориумот на позадината е нечитлив: %s."
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the locales directory that could not be read from.
-#: actions/pathsadminpanel.php:181
 #, php-format
 msgid "Locales directory not readable: %s."
 msgstr "Директориумот на локалите е нечитлив: %s."
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the SSL server URL that is too long.
-#: actions/pathsadminpanel.php:189
 msgid "Invalid SSL server. The maximum length is 255 characters."
 msgstr "Неважечки SSL-опслужувач. Дозволени се најмногу до 255 знаци"
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:235 actions/siteadminpanel.php:58
 msgid "Site"
 msgstr "Мреж. место"
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:241 actions/pathsadminpanel.php:279
-#: actions/pathsadminpanel.php:370 actions/pathsadminpanel.php:425
 msgid "Server"
 msgstr "Опслужувач"
 
-#: actions/pathsadminpanel.php:242
 msgid "Site's server hostname."
 msgstr "Назив на домаќинот на опслужувачот на мрежното место"
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:248 actions/pathsadminpanel.php:288
-#: actions/pathsadminpanel.php:379 actions/pathsadminpanel.php:434
 msgid "Path"
 msgstr "Патека"
 
-#: actions/pathsadminpanel.php:249
 msgid "Site path."
 msgstr "Патека на мреж. место."
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:255
 msgid "Locale directory"
 msgstr "Директориум на места"
 
-#: actions/pathsadminpanel.php:256
 msgid "Directory path to locales."
 msgstr "Патека на директориумот на местата."
 
 #. TRANS: Checkbox label in Paths admin panel.
-#: actions/pathsadminpanel.php:263
 msgid "Fancy URLs"
 msgstr "Интересни URL-адреси"
 
-#: actions/pathsadminpanel.php:265
 msgid "Use fancy (more readable and memorable) URLs?"
 msgstr "Да користам интересни (почитливи и повпечатливи) URL-адреси?"
 
-#: actions/pathsadminpanel.php:272
 msgid "Theme"
 msgstr "Изглед"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:281
 msgid "Server for themes."
 msgstr "Опслужувач за изгледи."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:290
 msgid "Web path to themes."
 msgstr "Мрежна патека за изгледите."
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:297 actions/pathsadminpanel.php:388
-#: actions/pathsadminpanel.php:443 actions/pathsadminpanel.php:495
 msgid "SSL server"
 msgstr "SSL-опслужувач"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:299
 msgid "SSL server for themes (default: SSL server)."
 msgstr "SSL-опслужувач за изгледи (стандарден: SSL-опслужувач)."
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:306 actions/pathsadminpanel.php:397
-#: actions/pathsadminpanel.php:452
 msgid "SSL path"
 msgstr "SSL-патека"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:308
 msgid "SSL path to themes (default: /theme/)."
 msgstr "SSL-патека за изгледите (стандардно: /theme/)."
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:315 actions/pathsadminpanel.php:406
-#: actions/pathsadminpanel.php:461
 msgid "Directory"
 msgstr "Директориум"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:317
 msgid "Directory where themes are located."
 msgstr "Директориумот кадешто се сместени изгледите."
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:326
 msgid "Avatars"
 msgstr "Аватари"
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:333
 msgid "Avatar server"
 msgstr "Опслужувач на аватарот"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:335
 msgid "Server for avatars."
 msgstr "Опслужувач за аватари."
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:342
 msgid "Avatar path"
 msgstr "Патека на аватарот"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:344
 msgid "Web path to avatars."
 msgstr "Мрежна патека за аватарите."
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:351
 msgid "Avatar directory"
 msgstr "Директориум на аватарот"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:353
 msgid "Directory where avatars are located."
 msgstr "Директориумот кадешто се сместени аватарите."
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:364
 msgid "Backgrounds"
 msgstr "Позадини"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:372
 msgid "Server for backgrounds."
 msgstr "Опслужувач за позадини."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:381
 msgid "Web path to backgrounds."
 msgstr "Мрежна патека за позадините."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:390
 msgid "Server for backgrounds on SSL pages."
 msgstr "Опслужувач за позадини на SSL-страници."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:399
 msgid "Web path to backgrounds on SSL pages."
 msgstr "Мрежна патека за позадините на SSL-страници."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:408
 msgid "Directory where backgrounds are located."
 msgstr "Директориумот кадешто се сместени позадините."
 
 #. TRANS: Fieldset legens in Paths admin panel.
-#: actions/pathsadminpanel.php:419
 msgid "Attachments"
 msgstr "Прилози"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:427
 msgid "Server for attachments."
 msgstr "Опслужувач за прилози."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:436
 msgid "Web path to attachments."
 msgstr "Мрежна патека до прилозите."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:445
 msgid "Server for attachments on SSL pages."
 msgstr "Опслужувач за прилози на SSL-страници."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:454
 msgid "Web path to attachments on SSL pages."
 msgstr "Мрежна патека за прилози на SSL-страници."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:463
 msgid "Directory where attachments are located."
 msgstr "Директориумот кадешто се сместени прилозите."
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:472
 msgid "SSL"
 msgstr "SSL"
 
 #. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
-#: actions/pathsadminpanel.php:477 actions/snapshotadminpanel.php:202
 msgid "Never"
 msgstr "Никогаш"
 
 #. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
-#: actions/pathsadminpanel.php:479
 msgid "Sometimes"
 msgstr "Понекогаш"
 
 #. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
-#: actions/pathsadminpanel.php:481
 msgid "Always"
 msgstr "Секогаш"
 
-#: actions/pathsadminpanel.php:485
 msgid "Use SSL"
 msgstr "Користи SSL"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:487
 msgid "When to use SSL."
 msgstr "Кога да се користи SSL."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:497
 msgid "Server to direct SSL requests to."
 msgstr "Oпслужувач, кому ќе му се испраќаат SSL-барања."
 
 #. TRANS: Button title text to store form data in the Paths admin panel.
-#: actions/pathsadminpanel.php:514
 msgid "Save paths"
 msgstr "Зачувај патеки"
 
 #. TRANS: Instructions for the "People search" page.
 #. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/peoplesearch.php:54
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
@@ -4457,79 +3648,65 @@ msgstr ""
 "знаци."
 
 #. TRANS: Title of a page where users can search for other users.
-#: actions/peoplesearch.php:61
 msgid "People search"
 msgstr "Пребарување на луѓе"
 
-#: actions/peopletag.php:68
 #, php-format
 msgid "Not a valid people tag: %s."
 msgstr "Не е важечка ознака за луѓе: %s."
 
-#: actions/peopletag.php:142
 #, php-format
 msgid "Users self-tagged with %1$s - page %2$d"
 msgstr "Користници самоозначени со %1$s - стр. %2$d"
 
 #. TRANS: Page title for AJAX form return when a disabling a plugin.
-#: actions/plugindisable.php:69
 msgctxt "plugin"
 msgid "Disabled"
-msgstr ""
+msgstr "Оневозможено"
 
 #. TRANS: Client error displayed trying to perform any request method other than POST.
 #. TRANS: Do not translate POST.
-#: actions/pluginenable.php:78 actions/subscribe.php:77
 msgid "This action only accepts POST requests."
 msgstr "Ова дејство прифаќа само POST-барања"
 
-#: actions/pluginenable.php:102
-#, fuzzy
 msgid "You cannot administer plugins."
-msgstr "Не можете да бришете корисници."
+msgstr "Не можете да раководите со приклучоци."
 
-#: actions/pluginenable.php:109
-#, fuzzy
 msgid "No such plugin."
-msgstr "Нема таква страница."
+msgstr "Нема таков приклучок."
 
 #. TRANS: Page title for AJAX form return when enabling a plugin.
-#: actions/pluginenable.php:159
 msgctxt "plugin"
 msgid "Enabled"
-msgstr ""
+msgstr "Овозможено"
 
 #. TRANS: Tab and title for plugins admin panel.
 #. TRANS: Menu item for site administration
-#: actions/pluginsadminpanel.php:56 actions/version.php:191
-#: lib/adminpanelaction.php:411
 msgid "Plugins"
 msgstr "Приклучоци"
 
 #. TRANS: Instructions at top of plugin admin page.
-#: actions/pluginsadminpanel.php:68
 msgid ""
 "Additional plugins can be enabled and configured manually. See the <a href="
 "\"http://status.net/wiki/Plugins\">online plugin documentation</a> for more "
 "details."
 msgstr ""
+"Можат да се овозможат и прилагодат дополнителни приклучоци. Повеќе на <a "
+"href=\"http://status.net/wiki/Plugins\">документацијата за мрежни "
+"приклучоци</a>."
 
 #. TRANS: Admin form section header
-#: actions/pluginsadminpanel.php:84
-#, fuzzy
 msgid "Default plugins"
-msgstr "Основен јазик"
+msgstr "Основни приклучоци"
 
-#: actions/pluginsadminpanel.php:106
 msgid ""
 "All default plugins have been disabled from the site's configuration file."
 msgstr ""
+"Сите основни приклучоци се оневозможени во поставките на мрежното место."
 
-#: actions/postnotice.php:95
 msgid "Invalid notice content."
 msgstr "Неважечка содржина на забелешката."
 
-#: actions/postnotice.php:101
 #, php-format
 msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’."
 msgstr ""
@@ -4537,12 +3714,10 @@ msgstr ""
 "место „%2$s“."
 
 #. TRANS: Page title for profile settings.
-#: actions/profilesettings.php:60
 msgid "Profile settings"
 msgstr "Нагодувања на профилот"
 
 #. TRANS: Usage instructions for profile settings.
-#: actions/profilesettings.php:71
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
@@ -4550,30 +3725,23 @@ msgstr ""
 "повеќе за Вас."
 
 #. TRANS: Profile settings form legend.
-#: actions/profilesettings.php:99
 msgid "Profile information"
 msgstr "Информации за профил"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:110 actions/register.php:412
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr "1-64 мали букви или бројки, без интерпукциски знаци и празни места."
 
 #. TRANS: Field label in form for profile settings.
-#: actions/profilesettings.php:114 actions/register.php:434
-#: lib/groupeditform.php:150
 msgid "Full name"
 msgstr "Име и презиме"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:119 actions/register.php:439
-#: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "Домашна страница"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:122 actions/register.php:441
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr ""
 "URL-адреса на Вашата домашна страница, блог или профил на друго мрежно место."
@@ -4581,7 +3749,6 @@ msgstr ""
 #. TRANS: Tooltip for field label in form for profile settings. Plural
 #. TRANS: is decided by the number of characters available for the
 #. TRANS: biography (%d).
-#: actions/profilesettings.php:130 actions/register.php:450
 #, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4589,42 +3756,32 @@ msgstr[0] "Опишете се себеси и своите интереси с
 msgstr[1] "Опишете се себеси и своите интереси со %d знаци."
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:136 actions/register.php:455
 msgid "Describe yourself and your interests"
 msgstr "Опишете се себеси и Вашите интереси"
 
 #. TRANS: Text area label in form for profile settings where users can provide.
 #. TRANS: their biography.
-#: actions/profilesettings.php:140 actions/register.php:457
 msgid "Bio"
 msgstr "Биографија"
 
 #. TRANS: Field label in form for profile settings.
-#: actions/profilesettings.php:146 actions/register.php:462
-#: lib/groupeditform.php:173
 msgid "Location"
 msgstr "Местоположба"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:149
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Каде се наоѓате, на пр. „Град, Област, Земја“."
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:154
 msgid "Share my current location when posting notices"
 msgstr ""
 "Прикажувај ја мојата тековна местоположба при објавување на забелешките"
 
 #. TRANS: Field label in form for profile settings.
-#: actions/profilesettings.php:162 actions/tagother.php:128
-#: actions/tagother.php:188 lib/subscriptionlist.php:104
-#: lib/subscriptionlist.php:106
 msgid "Tags"
 msgstr "Ознаки"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:165
 msgid ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- "
 "separated."
@@ -4633,27 +3790,22 @@ msgstr ""
 "празно место."
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:170
 msgid "Language"
 msgstr "Јазик"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:172
 msgid "Preferred language."
 msgstr "Претпочитан јазик"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:182
 msgid "Timezone"
 msgstr "Часовна зона"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:184
 msgid "What timezone are you normally in?"
 msgstr "Во која часовна зона обично се наоѓате?"
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:190
 msgid ""
 "Automatically subscribe to whoever subscribes to me (best for non-humans)."
 msgstr ""
@@ -4663,7 +3815,6 @@ msgstr ""
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Plural form is used based on the maximum number of allowed
 #. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:259 actions/register.php:214
 #, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4671,81 +3822,65 @@ msgstr[0] "Биографијата е предолга (највеќе до %d
 msgstr[1] "Биографијата е предолга (највеќе до %d знаци)."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:270 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr "Не е избрана часовна зона."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:278
 msgid "Language is too long (maximum 50 characters)."
 msgstr "Јазикот е предолг (највеќе до 50 знаци)."
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:292
 #, php-format
 msgid "Invalid tag: \"%s\"."
 msgstr "Неважечка ознака: „%s“."
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:348
 msgid "Could not update user for autosubscribe."
 msgstr "Не можев да го подновам корисникот за автопретплата."
 
 #. TRANS: Server error thrown when user profile location preference settings could not be updated.
-#: actions/profilesettings.php:406
 msgid "Could not save location prefs."
 msgstr "Не можев да ги зачувам нагодувањата за местоположба."
 
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:428 actions/tagother.php:179
 msgid "Could not save tags."
 msgstr "Не можев да ги зачувам ознаките."
 
 #. TRANS: Confirmation shown when user profile settings are saved.
 #. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:437 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "Нагодувањата се зачувани"
 
 #. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
 #. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:484 actions/restoreaccount.php:60
 msgid "Restore account"
 msgstr "Врати сметка"
 
-#: actions/public.php:83
 #, php-format
 msgid "Beyond the page limit (%s)."
 msgstr "Надминато е ограничувањето на страницата (%s)."
 
-#: actions/public.php:92
 msgid "Could not retrieve public stream."
 msgstr "Не можам да го вратам јавниот поток."
 
-#: actions/public.php:130
 #, php-format
 msgid "Public timeline, page %d"
 msgstr "Јавна историја, стр. %d"
 
-#: actions/public.php:132 lib/publicgroupnav.php:79
 msgid "Public timeline"
 msgstr "Јавна историја"
 
-#: actions/public.php:160
 msgid "Public Stream Feed (RSS 1.0)"
 msgstr "Канал на јавниот поток (RSS 1.0)"
 
-#: actions/public.php:164
 msgid "Public Stream Feed (RSS 2.0)"
 msgstr "Канал на јавниот поток (RSS 2.0)"
 
-#: actions/public.php:168
 msgid "Public Stream Feed (Atom)"
 msgstr "Канал на јавниот поток (Atom)"
 
-#: actions/public.php:188
 #, php-format
 msgid ""
 "This is the public timeline for %%site.name%% but no one has posted anything "
@@ -4753,11 +3888,9 @@ msgid ""
 msgstr ""
 "Ова е јавната историја за %%site.name%%, но досега никој ништо нема објавено."
 
-#: actions/public.php:191
 msgid "Be the first to post!"
 msgstr "Создајте ја првата забелешка!"
 
-#: actions/public.php:195
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post!"
@@ -4765,7 +3898,6 @@ msgstr ""
 "Зошто не [регистрирате сметка](%%action.register%%) и станете првиот "
 "објавувач!"
 
-#: actions/public.php:242
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -4779,7 +3911,6 @@ msgstr ""
 "си споделувате забелешки за себе со приајтелите, семејството и колегите! "
 "([Прочитајте повеќе](%%doc.help%%))"
 
-#: actions/public.php:247
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -4791,19 +3922,16 @@ msgstr ""
 "[StatusNet](http://status.net/)."
 
 #. TRANS: Public RSS feed description. %s is the StatusNet site name.
-#: actions/publicrss.php:106
 #, php-format
 msgid "%s updates from everyone."
 msgstr "%s подновувања од сите."
 
 #. TRANS: Title for public tag cloud.
-#: actions/publictagcloud.php:57
 msgid "Public tag cloud"
 msgstr "Јавен облак од ознаки"
 
 #. TRANS: Instructions (more used like an explanation/header).
 #. TRANS: %s is the StatusNet sitename.
-#: actions/publictagcloud.php:65
 #, php-format
 msgid "These are most popular recent tags on %s"
 msgstr "Овие се најпопуларните скорешни ознаки на %s"
@@ -4811,7 +3939,6 @@ msgstr "Овие се најпопуларните скорешни ознаки
 #. TRANS: This message contains a Markdown URL. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.
-#: actions/publictagcloud.php:74
 #, php-format
 msgid "No one has posted a notice with a [hashtag](%%doc.tags%%) yet."
 msgstr ""
@@ -4819,7 +3946,6 @@ 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.
-#: actions/publictagcloud.php:79
 msgid "Be the first to post one!"
 msgstr "Бидете првиот објавувач!"
 
@@ -4828,7 +3954,6 @@ msgstr "Бидете првиот објавувач!"
 #. TRANS: This message contains a Markdown URL. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.
-#: actions/publictagcloud.php:87
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post "
@@ -4838,42 +3963,34 @@ msgstr ""
 "објави!"
 
 #. TRANS: Client error displayed trying to recover password while already logged in.
-#: actions/recoverpassword.php:37
 msgid "You are already logged in!"
 msgstr "Веќе сте најавени!"
 
 #. TRANS: Client error displayed when password recovery code is not correct.
-#: actions/recoverpassword.php:64
 msgid "No such recovery code."
 msgstr "Нема таков код за спасување."
 
 #. TRANS: Client error displayed when no proper password recovery code was submitted.
-#: actions/recoverpassword.php:69
 msgid "Not a recovery code."
 msgstr "Ова не е код за спасување."
 
 #. TRANS: Server error displayed trying to recover password without providing a user.
-#: actions/recoverpassword.php:77
 msgid "Recovery code for unknown user."
 msgstr "Код за пронаоѓање за непознат корисник."
 
 #. TRANS: Server error displayed removing a password recovery code from the database.
-#: actions/recoverpassword.php:91
 msgid "Error with confirmation code."
 msgstr "Грешка со кодот за потврдување."
 
 #. TRANS: Client error displayed trying to recover password with too old a recovery code.
-#: actions/recoverpassword.php:103
 msgid "This confirmation code is too old. Please start again."
 msgstr "Овој код потврден код е престар. Почнете од почеток."
 
 #. TRANS: Server error displayed when updating a user's e-mail address in the database fails while recovering a password.
-#: actions/recoverpassword.php:118
 msgid "Could not update user with confirmed email address."
 msgstr "Не можев да го подновам корисникот со потврдена е-поштенска адреса."
 
 #. TRANS: Page notice for password recovery page.
-#: actions/recoverpassword.php:160
 msgid ""
 "If you have forgotten or lost your password, you can get a new one sent to "
 "the email address you have stored in your account."
@@ -4881,98 +3998,80 @@ msgstr ""
 "Ако ја имате заборавено или загубено лозинката, можете да побарате да Ви се "
 "испрати нова по е-поштата која сте ја назначиле за сметката."
 
-#: actions/recoverpassword.php:167
 msgid "You have been identified. Enter a new password below."
 msgstr "Препознаени сте. Внесете нова лозинка подполу."
 
 #. TRANS: Fieldset legend for password recovery page.
-#: actions/recoverpassword.php:198
 msgid "Password recovery"
 msgstr "Враќање на лозинката"
 
 #. TRANS: Field label on password recovery page.
-#: actions/recoverpassword.php:202
 msgid "Nickname or email address"
 msgstr "Прекар или е-поштенска адреса"
 
 #. TRANS: Title for field label on password recovery page.
-#: actions/recoverpassword.php:205
 msgid "Your nickname on this server, or your registered email address."
 msgstr ""
 "Вашиот прекар на овој опслужувач или адресата за е-пошта со која се "
 "регистриравте."
 
 #. TRANS: Field label on password recovery page.
-#: actions/recoverpassword.php:212
 msgid "Recover"
 msgstr "Пронајди"
 
 #. TRANS: Button text on password recovery page.
-#: actions/recoverpassword.php:214
 msgctxt "BUTTON"
 msgid "Recover"
 msgstr "Пронајди"
 
 #. TRANS: Title for password recovery page in password reset mode.
-#: actions/recoverpassword.php:223
 msgid "Reset password"
 msgstr "Рестетирај ја лозинката"
 
 #. TRANS: Title for password recovery page in password recover mode.
-#: actions/recoverpassword.php:225
 msgid "Recover password"
 msgstr "Пронаоѓање на лозинка"
 
 #. TRANS: Title for password recovery page in email sent mode.
 #. TRANS: Subject for password recovery e-mail.
-#: actions/recoverpassword.php:227 actions/recoverpassword.php:366
 msgid "Password recovery requested"
 msgstr "Побарано е пронаоѓање на лозинката"
 
 #. TRANS: Title for password recovery page in password saved mode.
-#: actions/recoverpassword.php:229
 msgid "Password saved"
 msgstr "Лозинката е зачувана"
 
 #. TRANS: Title for password recovery page when an unknown action has been specified.
-#: actions/recoverpassword.php:232
 msgid "Unknown action"
 msgstr "Непознато дејство"
 
 #. TRANS: Title for field label for password reset form.
-#: actions/recoverpassword.php:258
 msgid "6 or more characters, and do not forget it!"
 msgstr "6 или повеќе знаци - не заборавајте!"
 
 #. TRANS: Button text for password reset form.
 #. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: actions/recoverpassword.php:268 lib/designform.php:145
 msgctxt "BUTTON"
 msgid "Reset"
 msgstr "Врати одново"
 
 #. TRANS: Form instructions for password recovery form.
-#: actions/recoverpassword.php:278
 msgid "Enter a nickname or email address."
 msgstr "Внесете прекар или е-пошта"
 
 #. TRANS: Information on password recovery form if no known username or e-mail address was specified.
-#: actions/recoverpassword.php:309
 msgid "No user with that email address or username."
 msgstr "Нема корисник со таа е-поштенска адреса или корисничко име."
 
 #. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
-#: actions/recoverpassword.php:327
 msgid "No registered email address for that user."
 msgstr "Нема регистрирана адреса за е-пошта за тој корисник."
 
 #. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
-#: actions/recoverpassword.php:342
 msgid "Error saving address confirmation."
 msgstr "Грешка при зачувувањето на потврдата за адреса."
 
 #. TRANS: User notification after an e-mail with instructions was sent from the password recovery form.
-#: actions/recoverpassword.php:370
 msgid ""
 "Instructions for recovering your password have been sent to the email "
 "address registered to your account."
@@ -4981,73 +4080,56 @@ msgstr ""
 "пошта што е регистрирана со Вашата сметка."
 
 #. TRANS: Client error displayed when trying to reset as password without providing a user.
-#: actions/recoverpassword.php:391
 msgid "Unexpected password reset."
 msgstr "Неочекувано подновување на лозинката."
 
 #. TRANS: Reset password form validation error message.
-#: actions/recoverpassword.php:400
 msgid "Password must be 6 characters or more."
 msgstr "Лозинката мора да има барем 6 знаци."
 
 #. TRANS: Reset password form validation error message.
-#: actions/recoverpassword.php:405
 msgid "Password and confirmation do not match."
 msgstr "Двете лозинки не се совпаѓаат."
 
 #. TRANS: Server error displayed when something does wrong with the user object during password reset.
-#: actions/recoverpassword.php:426 actions/register.php:241
 msgid "Error setting user."
 msgstr "Грешка во поставувањето на корисникот."
 
 #. TRANS: Success message for user after password reset.
-#: actions/recoverpassword.php:434
 msgid "New password successfully saved. You are now logged in."
 msgstr "Новата лозинка е успешно зачувана. Сега сте најавени."
 
-#: actions/redirecturl.php:70
-#, fuzzy
 msgid "No id parameter"
-msgstr "Нема ID-аргумент."
+msgstr "Нема параметар за ID"
 
-#: actions/redirecturl.php:76
-#, fuzzy, php-format
+#, php-format
 msgid "No such file \"%d\""
-msgstr "Нема таква податотека."
+msgstr "Нема податотека „%d“"
 
-#: actions/register.php:80 actions/register.php:181 actions/register.php:392
 msgid "Sorry, only invited people can register."
 msgstr "Жалиме, регистрацијата е само со покана."
 
-#: actions/register.php:87
 msgid "Sorry, invalid invitation code."
 msgstr "Жалиме, неважечки код за поканата."
 
-#: actions/register.php:106
 msgid "Registration successful"
 msgstr "Регистрацијата е успешна"
 
-#: actions/register.php:108 actions/register.php:490
 msgid "Register"
 msgstr "Регистрирај се"
 
-#: actions/register.php:128
 msgid "Registration not allowed."
 msgstr "Регистрирањето не е дозволено."
 
-#: actions/register.php:194
 msgid "You cannot register if you don't agree to the license."
 msgstr "Не може да се регистрирате ако не ја прифаќате лиценцата."
 
-#: actions/register.php:203
 msgid "Email address already exists."
 msgstr "Адресата веќе постои."
 
-#: actions/register.php:236 actions/register.php:258
 msgid "Invalid username or password."
 msgstr "Погрешно име или лозинка."
 
-#: actions/register.php:333
 msgid ""
 "With this form you can create a new account. You can then post notices and "
 "link up to friends and colleagues."
@@ -5055,48 +4137,38 @@ msgstr ""
 "Со овој образец можете да создадете нова сметка. Потоа ќе можете да "
 "објавувате забелешки и да се поврзувате со пријатели и колеги."
 
-#: actions/register.php:424 actions/register.php:428
-#: actions/siteadminpanel.php:238 lib/settingsnav.php:92
 msgid "Email"
 msgstr "Е-пошта"
 
-#: actions/register.php:425 actions/register.php:429
 msgid "Used only for updates, announcements, and password recovery."
 msgstr "Се користи само за подновувања, објави и повраќање на лозинка."
 
-#: actions/register.php:436
 msgid "Longer name, preferably your \"real\" name."
 msgstr "Подолго име, по можност Вашето „вистинско“ име и презиме"
 
-#: actions/register.php:464
 msgid "Where you are, like \"City, State (or Region), Country\"."
 msgstr "Каде се наоѓате, на пр. „Град, Сојуз. држава (или Област), Земја“."
 
-#: actions/register.php:503
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
 msgstr "Сфаќам дека содржината и податоците на %1$s се лични и доверливи."
 
-#: actions/register.php:513
 #, php-format
 msgid "My text and files are copyright by %1$s."
 msgstr "Авторското правво на мојот текст и податотеки го има %1$s."
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:517
 msgid "My text and files remain under my own copyright."
 msgstr ""
 "Јас ја задржувам сопственоста на авторското право врз мојот текст и "
 "податотеки."
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:520
 msgid "All rights reserved."
 msgstr "Сите права задржани."
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:525
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -5105,7 +4177,6 @@ msgstr ""
 "Мојот текст и податотеки се достапни под %s, освен следниве приватни "
 "податоци: лозинка, е-пошта, IM-адреса и телефонски број."
 
-#: actions/register.php:566
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -5139,7 +4210,6 @@ msgstr ""
 "Ви благодариме што се зачленивте и Ви пожелуваме пријатни мигови со оваа "
 "служба."
 
-#: actions/register.php:590
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5147,7 +4217,6 @@ msgstr ""
 "(Би требало веднаш да добиете порака по е-пошта, во која стојат напатствија "
 "за потврдување на е-поштенската адреса.)"
 
-#: actions/remotesubscribe.php:97
 #, php-format
 msgid ""
 "To subscribe, you can [login](%%action.login%%), or [register](%%action."
@@ -5159,106 +4228,81 @@ msgstr ""
 "[усогласиво мреж. место за микроблогирање](%%doc.openmublog%%), внесете го "
 "URL-то на Вашиот профил подолу."
 
-#: actions/remotesubscribe.php:111
 msgid "Remote subscribe"
 msgstr "Оддалечена претплата"
 
-#: actions/remotesubscribe.php:123
 msgid "Subscribe to a remote user"
 msgstr "Претплати се на далечински корисник"
 
-#: actions/remotesubscribe.php:128
 msgid "User nickname"
 msgstr "Прекар на корисникот"
 
-#: actions/remotesubscribe.php:129
 msgid "Nickname of the user you want to follow."
 msgstr "Прекар на корисникот што сакате да го следите."
 
-#: actions/remotesubscribe.php:132
 msgid "Profile URL"
 msgstr "URL на профилот"
 
-#: actions/remotesubscribe.php:133
 msgid "URL of your profile on another compatible microblogging service."
 msgstr "!URL на Вашиот профил на друга складна служба за микроблогирање."
 
 #. TRANS: Link text for link that will subscribe to a remote profile.
-#: actions/remotesubscribe.php:136 lib/subscribeform.php:139
-#: lib/userprofile.php:402
 msgid "Subscribe"
 msgstr "Претплати се"
 
-#: actions/remotesubscribe.php:158
 msgid "Invalid profile URL (bad format)."
 msgstr "Неправилна URL на профилот (лош формат)."
 
-#: actions/remotesubscribe.php:167
 msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
 msgstr ""
 "Неважечка URL-адреса на профил (нема YADIS документ или определен е "
 "неважечки XRDS)."
 
-#: actions/remotesubscribe.php:175
 msgid "That is a local profile! Login to subscribe."
 msgstr "Тоа е локален профил! Најавете се за да се претплатите."
 
-#: actions/remotesubscribe.php:182
 msgid "Could not get a request token."
 msgstr "Не можев да добијам жетон за барање."
 
-#: actions/repeat.php:56
 msgid "Only logged-in users can repeat notices."
 msgstr "Само најавени корисници можат да повторуваат забелешки."
 
-#: actions/repeat.php:63 actions/repeat.php:70
 msgid "No notice specified."
 msgstr "Нема назначено забелешка."
 
-#: actions/repeat.php:75
 msgid "You cannot repeat your own notice."
 msgstr "Не можете да повторувате сопствена забелешка."
 
-#: actions/repeat.php:89
 msgid "You already repeated that notice."
 msgstr "Веќе ја имате повторено таа забелешка."
 
-#: actions/repeat.php:112 lib/noticelist.php:697
 msgid "Repeated"
 msgstr "Повторено"
 
-#: actions/repeat.php:117
 msgid "Repeated!"
 msgstr "Повторено!"
 
 #. TRANS: RSS reply feed title. %s is a user nickname.
-#: actions/replies.php:126 actions/repliesrss.php:68
-#: lib/personalgroupnav.php:105
 #, php-format
 msgid "Replies to %s"
 msgstr "Одговори испратени до %s"
 
-#: actions/replies.php:128
 #, php-format
 msgid "Replies to %1$s, page %2$d"
 msgstr "Одговори на %1$s, стр. %2$d"
 
-#: actions/replies.php:145
 #, php-format
 msgid "Replies feed for %s (RSS 1.0)"
 msgstr "Канал со одговори за %s (RSS 1.0)"
 
-#: actions/replies.php:152
 #, php-format
 msgid "Replies feed for %s (RSS 2.0)"
 msgstr "Канал со одговори за %s (RSS 2.0)"
 
-#: actions/replies.php:159
 #, php-format
 msgid "Replies feed for %s (Atom)"
 msgstr "Канал со одговори за %s (Atom)"
 
-#: actions/replies.php:199
 #, php-format
 msgid ""
 "This is the timeline showing replies to %1$s but %2$s hasn't received a "
@@ -5267,7 +4311,6 @@ msgstr ""
 "Ова е историјата на која се прикажани одговорите на %1$s, но %2$s сè уште "
 "нема добиено забелешка за нив."
 
-#: actions/replies.php:204
 #, php-format
 msgid ""
 "You can engage other users in a conversation, subscribe to more people or "
@@ -5276,7 +4319,6 @@ msgstr ""
 "Можете да започнувате разговори со други корисници, да се претплаќате на "
 "други луѓе или да [се зачленувате во групи](%%action.groups%%)."
 
-#: actions/replies.php:206
 #, php-format
 msgid ""
 "You can try to [nudge %1$s](../%2$s) or [post something to them](%%%%action."
@@ -5287,36 +4329,30 @@ msgstr ""
 
 #. TRANS: RSS reply feed description.
 #. TRANS: %1$s is a user nickname, %2$s is the StatusNet site name.
-#: actions/repliesrss.php:74
 #, php-format
 msgid "Replies to %1$s on %2$s."
 msgstr "Одговори на %1$s на %2$s."
 
 #. TRANS: Client exception displayed when trying to restore an account while not logged in.
-#: actions/restoreaccount.php:78
 msgid "Only logged-in users can restore their account."
 msgstr "Само најавени корисници можат да си ја вратат сметката."
 
 #. TRANS: Client exception displayed when trying to restore an account without having restore rights.
-#: actions/restoreaccount.php:83
 msgid "You may not restore your account."
 msgstr "Не можете да ја вратите Вашата сметка."
 
 #. TRANS: Client exception displayed trying to restore an account while something went wrong uploading a file.
 #. TRANS: Client exception. No file; probably just a non-AJAX submission.
-#: actions/restoreaccount.php:121 actions/restoreaccount.php:146
 msgid "No uploaded file."
 msgstr "Нема подигната податотека."
 
 #. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
-#: actions/restoreaccount.php:129 lib/mediafile.php:194
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
 msgstr ""
 "Подигнатата податотека ја надминува директивата upload_max_filesize во php."
 "ini."
 
 #. TRANS: Client exception.
-#: actions/restoreaccount.php:135 lib/mediafile.php:200
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form."
@@ -5325,39 +4361,32 @@ msgstr ""
 "во HTML-образецот."
 
 #. TRANS: Client exception.
-#: actions/restoreaccount.php:141 lib/mediafile.php:206
 msgid "The uploaded file was only partially uploaded."
 msgstr "Подигнатата податотека е само делумно подигната."
 
 #. TRANS: Client exception thrown when a temporary folder is not present to store a file upload.
-#: actions/restoreaccount.php:150 lib/mediafile.php:214
 msgid "Missing a temporary folder."
 msgstr "Недостасува привремена папка."
 
 #. TRANS: Client exception thrown when writing to disk is not possible during a file upload operation.
-#: actions/restoreaccount.php:154 lib/mediafile.php:218
 msgid "Failed to write file to disk."
 msgstr "Податотеката не може да се запише на дискот."
 
 #. TRANS: Client exception thrown when a file upload operation has been stopped by an extension.
-#: actions/restoreaccount.php:158 lib/mediafile.php:222
 msgid "File upload stopped by extension."
 msgstr "Подигањето на податотеката е запрено од додатокот."
 
 #. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
 #. TRANS: Exception thrown when uploading an image fails for an unknown reason.
 #. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
-#: actions/restoreaccount.php:164 lib/imagefile.php:106 lib/mediafile.php:228
 msgid "System error uploading file."
 msgstr "Системска грешка при подигањето на податотеката."
 
 #. TRANS: Client exception thrown when a feed is not an Atom feed.
-#: actions/restoreaccount.php:207
 msgid "Not an Atom feed."
 msgstr "Ова не е Atom-канал."
 
 #. TRANS: Success message when a feed has been restored.
-#: actions/restoreaccount.php:241
 msgid ""
 "Feed has been restored. Your old posts should now appear in search and your "
 "profile page."
@@ -5366,13 +4395,11 @@ msgstr ""
 "Вашата профилна страница."
 
 #. TRANS: Message when a feed restore is in progress.
-#: actions/restoreaccount.php:245
 msgid "Feed will be restored. Please wait a few minutes for results."
 msgstr ""
 "Каналот ќе биде вратен. Почејате некоја минута за да се појават резултатите."
 
 #. TRANS: Form instructions for feed restore.
-#: actions/restoreaccount.php:342
 msgid ""
 "You can upload a backed-up stream in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format."
@@ -5381,92 +4408,73 @@ msgstr ""
 "activitystrea.ms/\">Activity Streams</a>."
 
 #. TRANS: Title for submit button to confirm upload of a user backup file for account restore.
-#: actions/restoreaccount.php:373
 msgid "Upload the file"
 msgstr "Подигни ја податотеката"
 
-#: actions/revokerole.php:75
 msgid "You cannot revoke user roles on this site."
 msgstr "На ова мрежно место не можете да одземате кориснички улоги."
 
-#: actions/revokerole.php:82
 msgid "User doesn't have this role."
 msgstr "Корисникот ја нема оваа улога."
 
-#: actions/rsd.php:142 actions/version.php:159
 msgid "StatusNet"
 msgstr "StatusNet"
 
-#: actions/sandbox.php:65 actions/unsandbox.php:65
 msgid "You cannot sandbox users on this site."
 msgstr "Не можете да ставате корисници во песочен режим на ова мрежно место."
 
-#: actions/sandbox.php:72
 msgid "User is already sandboxed."
 msgstr "Корисникот е веќе во песочен режим."
 
 #. TRANS: Menu item for site administration
-#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
-#: lib/adminpanelaction.php:379
 msgid "Sessions"
 msgstr "Сесии"
 
-#: actions/sessionsadminpanel.php:65
 msgid "Session settings for this StatusNet site"
 msgstr "Сесиски нагодувања за ова StatusNet-мрежно место"
 
-#: actions/sessionsadminpanel.php:175
 msgid "Handle sessions"
 msgstr "Раководење со сесии"
 
-#: actions/sessionsadminpanel.php:177
 msgid "Whether to handle sessions ourselves."
 msgstr "Дали самите да си раководиме со сесиите."
 
-#: actions/sessionsadminpanel.php:181
 msgid "Session debugging"
 msgstr "Поправка на грешки во сесија"
 
-#: actions/sessionsadminpanel.php:183
 msgid "Turn on debugging output for sessions."
 msgstr "Вклучи извод од поправка на грешки за сесии."
 
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
+#. TRANS: Submit button title.
+msgid "Save"
+msgstr "Зачувај"
+
 msgid "Save site settings"
 msgstr "Зачувај нагодувања на мреж. место"
 
-#: actions/showapplication.php:78
 msgid "You must be logged in to view an application."
 msgstr "Мора да сте најавени за да можете да го видите програмот."
 
-#: actions/showapplication.php:151
 msgid "Application profile"
 msgstr "Профил на програмот"
 
-#: actions/showapplication.php:179
 #, php-format
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr "Создадено од %1$s - основен пристап: %2$s - %3$d корисници"
 
-#: actions/showapplication.php:189
 msgid "Application actions"
 msgstr "Дејства на програмот"
 
-#: actions/showapplication.php:212
 msgid "Reset key & secret"
 msgstr "Клуч за промена и тајна"
 
 #. TRANS: Title of form for deleting a user.
-#: actions/showapplication.php:228 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:64 lib/noticelist.php:678
 msgid "Delete"
 msgstr "Избриши"
 
-#: actions/showapplication.php:237
 msgid "Application info"
 msgstr "Инфо за програмот"
 
-#: actions/showapplication.php:255
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
@@ -5474,43 +4482,36 @@ msgstr ""
 "Напомена: Поддржуваме HMAC-SHA1 потписи. Не поддржуваме потпишување со прост "
 "текст."
 
-#: actions/showapplication.php:275
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr ""
 "Дали сте сигурни дека сакате да го смените Вашиот кориснички клуч и тајна?"
 
 #. TRANS: Title for all but the first page of favourite notices of a user.
 #. TRANS: %1$s is the user for whom the favourite notices are displayed, %2$d is the page number.
-#: actions/showfavorites.php:80
 #, php-format
 msgid "%1$s's favorite notices, page %2$d"
 msgstr "Бендисан забелешки на %1$s, страница %2$d"
 
 #. TRANS: Server error displayed when favourite notices could not be retrieved from the database.
-#: actions/showfavorites.php:134
 msgid "Could not retrieve favorite notices."
 msgstr "Не можев да ги повратам бендисаните забелешки."
 
 #. TRANS: Feed link text. %s is a username.
-#: actions/showfavorites.php:172
 #, php-format
 msgid "Feed for favorites of %s (RSS 1.0)"
 msgstr "Канал за бендисани забелешки на %s (RSS 1.0)"
 
 #. TRANS: Feed link text. %s is a username.
-#: actions/showfavorites.php:180
 #, php-format
 msgid "Feed for favorites of %s (RSS 2.0)"
 msgstr "Канал за бендисани забелешки на %s (RSS 2.0)"
 
 #. TRANS: Feed link text. %s is a username.
-#: actions/showfavorites.php:188
 #, php-format
 msgid "Feed for favorites of %s (Atom)"
 msgstr "Канал за бендисани забелешки на %s (Atom)"
 
 #. TRANS: Text displayed instead of favourite notices for the current logged in user that has no favourites.
-#: actions/showfavorites.php:209
 msgid ""
 "You haven't chosen any favorite notices yet. Click the fave button on "
 "notices you like to bookmark them for later or shed a spotlight on them."
@@ -5521,7 +4522,6 @@ msgstr ""
 
 #. TRANS: Text displayed instead of favourite notices for a user that has no favourites while logged in.
 #. TRANS: %s is a username.
-#: actions/showfavorites.php:213
 #, php-format
 msgid ""
 "%s hasn't added any favorite notices yet. Post something interesting they "
@@ -5533,7 +4533,6 @@ msgstr ""
 #. TRANS: Text displayed instead of favourite notices for a user that has no favourites while not logged in.
 #. TRANS: %s is a username, %%%%action.register%%%% is a link to the user registration page.
 #. TRANS: (link text)[link] is a Mark Down link.
-#: actions/showfavorites.php:220
 #, php-format
 msgid ""
 "%s hasn't added any favorite notices yet. Why not [register an account](%%%%"
@@ -5545,64 +4544,53 @@ msgstr ""
 "бендисал :)"
 
 #. TRANS: Page notice for show favourites page.
-#: actions/showfavorites.php:251
 msgid "This is a way to share what you like."
 msgstr "Ова е начин да го споделите она што Ви се допаѓа."
 
 #. TRANS: Page title for first group page. %s is a group name.
-#: actions/showgroup.php:75
 #, php-format
 msgid "%s group"
 msgstr "Група %s"
 
 #. TRANS: Page title for any but first group page.
 #. TRANS: %1$s is a group name, $2$s is a page number.
-#: actions/showgroup.php:79
 #, php-format
 msgid "%1$s group, page %2$d"
 msgstr "Група %1$s, стр. %2$d"
 
 #. TRANS: Label for group description or group note (dt). Text hidden by default.
-#: actions/showgroup.php:266
 msgid "Note"
 msgstr "Забелешка"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:277 lib/groupeditform.php:180
 msgid "Aliases"
 msgstr "Алијаси"
 
 #. TRANS: Group actions header (h2). Text hidden by default.
-#: actions/showgroup.php:294
 msgid "Group actions"
 msgstr "Групни дејства"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:338
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
 msgstr "Канал со забелешки за групата %s (RSS 1.0)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:345
 #, php-format
 msgid "Notice feed for %s group (RSS 2.0)"
 msgstr "Канал со забелешки за групата %s (RSS 2.0)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:352
 #, php-format
 msgid "Notice feed for %s group (Atom)"
 msgstr "Канал со забелешки за групата%s (Atom)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:358
 #, php-format
 msgid "FOAF for %s group"
 msgstr "FOAF за групата %s"
 
 #. TRANS: Header for mini list of group members on a group page (h2).
-#: actions/showgroup.php:395
 msgid "Members"
 msgstr "Членови"
 
@@ -5610,30 +4598,23 @@ msgstr "Членови"
 #. TRANS: Text for user subscription statistics if the user has no subscriptions.
 #. TRANS: Text for user subscriber statistics if user has no subscribers.
 #. TRANS: Text for user user group membership statistics if user is not a member of any group.
-#: actions/showgroup.php:401 lib/profileaction.php:137
-#: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
-#: lib/subscriptionlist.php:123 lib/tagcloudsection.php:71
 msgid "(None)"
 msgstr "(Нема)"
 
 #. TRANS: Link to all group members from mini list of group members if group has more than n members.
-#: actions/showgroup.php:410
 msgid "All members"
 msgstr "Сите членови"
 
 #. TRANS: Header for group statistics on a group page (h2).
 #. TRANS: H2 text for user statistics.
-#: actions/showgroup.php:441 lib/profileaction.php:205
 msgid "Statistics"
 msgstr "Статистики"
 
-#: actions/showgroup.php:444
 msgctxt "LABEL"
 msgid "Created"
 msgstr "Создадено"
 
 #. TRANS: Label for member count in statistics on group page.
-#: actions/showgroup.php:449
 msgctxt "LABEL"
 msgid "Members"
 msgstr "Членови"
@@ -5642,7 +4623,6 @@ msgstr "Членови"
 #. TRANS: **%s** is the group alias, %%%%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).
-#: actions/showgroup.php:464
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5661,7 +4641,6 @@ 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: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
-#: actions/showgroup.php:474
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5675,99 +4654,83 @@ msgstr ""
 "членови си разменуваат кратки пораки за нивниот живот и интереси. "
 
 #. TRANS: Header for list of group administrators on a group page (h2).
-#: actions/showgroup.php:503
 msgid "Admins"
 msgstr "Администратори"
 
 #. TRANS: Client error displayed requesting a single message that does not exist.
-#: actions/showmessage.php:76
 msgid "No such message."
 msgstr "Нема таква порака."
 
 #. TRANS: Client error displayed requesting a single direct message the requesting user was not a party in.
-#: actions/showmessage.php:86
 msgid "Only the sender and recipient may read this message."
 msgstr "Само испраќачот и примачот можат да ја читаат оваа порака."
 
 #. TRANS: Page title for single direct message display when viewing user is the sender.
 #. TRANS: %1$s is the addressed user's nickname, $2$s is a timestamp.
-#: actions/showmessage.php:105
 #, php-format
 msgid "Message to %1$s on %2$s"
 msgstr "Порака за %1$s на %2$s"
 
 #. TRANS: Page title for single message display.
 #. TRANS: %1$s is the sending user's nickname, $2$s is a timestamp.
-#: actions/showmessage.php:113
 #, php-format
 msgid "Message from %1$s on %2$s"
 msgstr "Порака од %1$s на %2$s"
 
-#: actions/shownotice.php:90
 msgid "Notice deleted."
 msgstr "Избришана забелешка"
 
 #. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
-#: actions/showstream.php:70
 #, php-format
 msgid "%1$s tagged %2$s"
 msgstr "%1$s го/ја означи %2$s"
 
 #. TRANS: Page title showing tagged notices in one user's stream.
 #. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
-#: actions/showstream.php:74
 #, php-format
 msgid "%1$s tagged %2$s, page %3$d"
 msgstr "%1$s го/ја означи %2$s, страница %3$d"
 
 #. TRANS: Extended page title showing tagged notices in one user's stream.
 #. TRANS: %1$s is the username, %2$d is the page number.
-#: actions/showstream.php:82
 #, php-format
 msgid "%1$s, page %2$d"
 msgstr "%1$s, стр. %2$d"
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %1$s is a user nickname, %2$s is a hashtag.
-#: actions/showstream.php:127
 #, php-format
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
 msgstr "Канал со забелешки за %1$s означен со %2$s (RSS 1.0)"
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.
-#: actions/showstream.php:136
 #, php-format
 msgid "Notice feed for %s (RSS 1.0)"
 msgstr "Канал со забелешки за %s (RSS 1.0)"
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.
-#: actions/showstream.php:145
 #, php-format
 msgid "Notice feed for %s (RSS 2.0)"
 msgstr "Канал со забелешки за %s (RSS 2.0)"
 
-#: actions/showstream.php:152
 #, php-format
 msgid "Notice feed for %s (Atom)"
 msgstr "Канал со забелешки за %s (Atom)"
 
 #. TRANS: Title for link to notice feed. FOAF stands for Friend of a Friend.
 #. TRANS: More information at http://www.foaf-project.org. %s is a user nickname.
-#: actions/showstream.php:159
 #, php-format
 msgid "FOAF for %s"
 msgstr "FOAF за %s"
 
 #. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
-#: actions/showstream.php:205
 #, php-format
 msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr "Ова е хронологијата за %1$s, но %1$s сè уште нема објавено ништо."
 
 #. TRANS: Second sentence of empty list message for a stream for the user themselves.
-#: actions/showstream.php:211
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
@@ -5777,7 +4740,6 @@ msgstr ""
 
 #. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:215
 #, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
@@ -5788,7 +4750,6 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:258
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5804,7 +4765,6 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:265
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5816,226 +4776,179 @@ msgstr ""
 "програмска алатка [StatusNet](http://status.net/). "
 
 #. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
-#: actions/showstream.php:322
 #, php-format
 msgid "Repeat of %s"
 msgstr "Повторувања на %s"
 
-#: actions/silence.php:65 actions/unsilence.php:65
 msgid "You cannot silence users on this site."
 msgstr "Не можете да замолчувате корисници на ова мрежно место."
 
-#: actions/silence.php:72
 msgid "User is already silenced."
 msgstr "Корисникот е веќе замолчен."
 
-#: actions/siteadminpanel.php:69
 msgid "Basic settings for this StatusNet site"
 msgstr "Основни поставки за оваа StatusNet-мрежно место."
 
-#: actions/siteadminpanel.php:133
 msgid "Site name must have non-zero length."
 msgstr "Должината на името на мрежното место не може да изнесува нула."
 
-#: actions/siteadminpanel.php:141
 msgid "You must have a valid contact email address."
 msgstr "Мора да имате важечка контактна е-поштенска адреса."
 
-#: actions/siteadminpanel.php:159
 #, php-format
 msgid "Unknown language \"%s\"."
 msgstr "Непознат јазик „%s“"
 
-#: actions/siteadminpanel.php:165
 msgid "Minimum text limit is 0 (unlimited)."
 msgstr "Минималниот дозволен текст изнесува 0 (неограничено)."
 
-#: actions/siteadminpanel.php:171
 msgid "Dupe limit must be one or more seconds."
 msgstr "Ограничувањето на дуплирањето мора да изнесува барем 1 секунда."
 
-#: actions/siteadminpanel.php:221
 msgid "General"
 msgstr "Општи"
 
-#: actions/siteadminpanel.php:224
 msgid "Site name"
 msgstr "Име на мрежното место"
 
-#: actions/siteadminpanel.php:225
 msgid "The name of your site, like \"Yourcompany Microblog\""
 msgstr "Името на Вашето мрежно место, како на пр. „Микроблог на Вашафирма“"
 
-#: actions/siteadminpanel.php:229
 msgid "Brought by"
 msgstr "Овозможено од"
 
-#: actions/siteadminpanel.php:230
 msgid "Text used for credits link in footer of each page"
 msgstr ""
 "Текст за врската за наведување на авторите во долната колонцифра на секоја "
 "страница"
 
-#: actions/siteadminpanel.php:234
 msgid "Brought by URL"
 msgstr "URL-адреса на овозможувачот на услугите"
 
-#: actions/siteadminpanel.php:235
 msgid "URL used for credits link in footer of each page"
 msgstr ""
 "URL-адресата која е користи за врски за автори во долната колоцифра на "
 "секоја страница"
 
-#: actions/siteadminpanel.php:239
 msgid "Contact email address for your site"
 msgstr "Контактна е-пошта за Вашето мрежното место"
 
-#: actions/siteadminpanel.php:245
 msgid "Local"
 msgstr "Локално"
 
-#: actions/siteadminpanel.php:256
 msgid "Default timezone"
 msgstr "Основна часовна зона"
 
-#: actions/siteadminpanel.php:257
 msgid "Default timezone for the site; usually UTC."
 msgstr "Матична часовна зона за мрежното место; обично UTC."
 
-#: actions/siteadminpanel.php:262
 msgid "Default language"
 msgstr "Основен јазик"
 
-#: actions/siteadminpanel.php:263
 msgid "Site language when autodetection from browser settings is not available"
 msgstr "Јазик на мрежното место ако прелистувачот не може да го препознае сам"
 
-#: actions/siteadminpanel.php:271
 msgid "Limits"
 msgstr "Ограничувања"
 
-#: actions/siteadminpanel.php:274
 msgid "Text limit"
 msgstr "Ограничување на текстот"
 
-#: actions/siteadminpanel.php:274
 msgid "Maximum number of characters for notices."
 msgstr "Максимален број на знаци за забелешки."
 
-#: actions/siteadminpanel.php:278
 msgid "Dupe limit"
 msgstr "Ограничување на дуплирањето"
 
-#: actions/siteadminpanel.php:278
 msgid "How long users must wait (in seconds) to post the same thing again."
 msgstr ""
 "Колку долго треба да почекаат корисниците (во секунди) за да можат повторно "
 "да го објават истото."
 
 #. TRANS: Page title for site-wide notice tab in admin panel.
-#: actions/sitenoticeadminpanel.php:55
 msgid "Site Notice"
 msgstr "Објава на страница"
 
 #. TRANS: Instructions for site-wide notice tab in admin panel.
-#: actions/sitenoticeadminpanel.php:66
 msgid "Edit site-wide message"
 msgstr "Уреди објава за цело мрежно место"
 
 #. TRANS: Server error displayed when saving a site-wide notice was impossible.
-#: actions/sitenoticeadminpanel.php:101
 msgid "Unable to save site notice."
 msgstr "Не можам да ја зачувам објавата за мрежното место."
 
 #. TRANS: Client error displayed when a site-wide notice was longer than allowed.
-#: actions/sitenoticeadminpanel.php:112
 msgid "Maximum length for the site-wide notice is 255 characters."
 msgstr "Објавата за цело мрежно место не треба да содржи повеќе од 255 знаци."
 
 #. TRANS: Label for site-wide notice text field in admin panel.
-#: actions/sitenoticeadminpanel.php:176
 msgid "Site notice text"
 msgstr "Текст на објавата за мрежното место"
 
 #. TRANS: Tooltip for site-wide notice text field in admin panel.
-#: actions/sitenoticeadminpanel.php:179
 msgid "Site-wide notice text (255 characters maximum; HTML allowed)"
 msgstr ""
 "Текст на главната објава по цело мрежно место (највеќе до 255 знаци; "
 "дозволено и HTML)"
 
 #. TRANS: Title for button to save site notice in admin panel.
-#: actions/sitenoticeadminpanel.php:201
 msgid "Save site notice."
 msgstr "Зачувај ја објавата на мреж. место."
 
 #. TRANS: Title for SMS settings.
-#: actions/smssettings.php:56
 msgid "SMS settings"
 msgstr "Нагодувања за СМС"
 
 #. TRANS: SMS settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/smssettings.php:70
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr "Можете да примате СМС пораки по е-пошта од %%site.name%%."
 
 #. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
-#: actions/smssettings.php:92
 msgid "SMS is not available."
 msgstr "СМС-пораките се недостапни."
 
 #. TRANS: Form legend for SMS settings form.
-#: actions/smssettings.php:106
 msgid "SMS address"
 msgstr "СМС адреса"
 
 #. TRANS: Form guide in SMS settings form.
-#: actions/smssettings.php:115
 msgid "Current confirmed SMS-enabled phone number."
 msgstr "Тековен потврден телефонски број со можност за СМС."
 
 #. TRANS: Form guide in IM settings form.
-#: actions/smssettings.php:128
 msgid "Awaiting confirmation on this phone number."
 msgstr "Очекувам потврда за овој телефонски број."
 
 #. TRANS: Field label for SMS address input in SMS settings form.
-#: actions/smssettings.php:137
 msgid "Confirmation code"
 msgstr "Потврден код"
 
 #. TRANS: Form field instructions in SMS settings form.
-#: actions/smssettings.php:139
 msgid "Enter the code you received on your phone."
 msgstr "Внесете го кодот што го добивте по телефон."
 
 #. TRANS: Button label to confirm SMS confirmation code in SMS settings.
-#: actions/smssettings.php:143
 msgctxt "BUTTON"
 msgid "Confirm"
 msgstr "Потврди"
 
 #. TRANS: Field label for SMS phone number input in SMS settings form.
-#: actions/smssettings.php:148
 msgid "SMS phone number"
 msgstr "Телефонски број за СМС"
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
-#: actions/smssettings.php:151
 msgid "Phone number, no punctuation or spaces, with area code."
 msgstr ""
 "Телефонски број, без интерпункциски знаци и празни места, со повикувачки "
 "број."
 
 #. TRANS: Form legend for SMS preferences form.
-#: actions/smssettings.php:190
 msgid "SMS preferences"
 msgstr "СМС нагодувања"
 
 #. TRANS: Checkbox label in SMS preferences form.
-#: actions/smssettings.php:196
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
@@ -6044,32 +4957,26 @@ msgstr ""
 "трошоци."
 
 #. TRANS: Confirmation message for successful SMS preferences save.
-#: actions/smssettings.php:307
 msgid "SMS preferences saved."
 msgstr "СМС нагодувањата се зачувани."
 
 #. TRANS: Message given saving SMS phone number without having provided one.
-#: actions/smssettings.php:329
 msgid "No phone number."
 msgstr "Нема телефонски број."
 
 #. TRANS: Message given saving SMS phone number without having selected a carrier.
-#: actions/smssettings.php:335
 msgid "No carrier selected."
 msgstr "Немате избрано оператор."
 
 #. TRANS: Message given saving SMS phone number that is already set.
-#: actions/smssettings.php:343
 msgid "That is already your phone number."
 msgstr "Ова и сега е Вашиот телефонски број."
 
 #. TRANS: Message given saving SMS phone number that is already set for another user.
-#: actions/smssettings.php:347
 msgid "That phone number already belongs to another user."
 msgstr "Тој телефонски број е веќе во употреба од друг корисник."
 
 #. TRANS: Message given saving valid SMS phone number that is to be confirmed.
-#: actions/smssettings.php:375
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
 "for the code and instructions on how to use it."
@@ -6078,39 +4985,32 @@ msgstr ""
 "го телефонот за да го видите кодот, заедно со напатствија за негова употреба."
 
 #. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
-#: actions/smssettings.php:403
 msgid "That is the wrong confirmation number."
 msgstr "Ова е погрешен потврден број."
 
 #. TRANS: Message given after successfully canceling SMS phone number confirmation.
-#: actions/smssettings.php:417
 msgid "SMS confirmation cancelled."
 msgstr "Потврдата за СМС е откажана."
 
 #. TRANS: Message given trying to remove an SMS phone number that is not
 #. TRANS: registered for the active user.
-#: actions/smssettings.php:437
 msgid "That is not your phone number."
 msgstr "Тоа не е Вашиот телефонски број."
 
 #. TRANS: Message given after successfully removing a registered SMS phone number.
-#: actions/smssettings.php:459
 msgid "The SMS phone number was removed."
 msgstr "Телефонскиот број за СМС е отстранет."
 
 #. TRANS: Label for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:498
 msgid "Mobile carrier"
 msgstr "Мобилен оператор"
 
 #. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:503
 msgid "Select a carrier"
 msgstr "Изберете оператор"
 
 #. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
 #. TRANS: %s is an administrative contact's e-mail address.
-#: actions/smssettings.php:512
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -6120,120 +5020,95 @@ msgstr ""
 "пошта, но не фигурира овде, известете нè на %s."
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
-#: actions/smssettings.php:534
 msgid "No code entered."
 msgstr "Нема внесено код."
 
 #. TRANS: Menu item for site administration
-#: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
-#: lib/adminpanelaction.php:395
 msgid "Snapshots"
 msgstr "Снимки"
 
-#: actions/snapshotadminpanel.php:65
 msgid "Manage snapshot configuration"
 msgstr "Раководење со поставки за снимки"
 
-#: actions/snapshotadminpanel.php:127
 msgid "Invalid snapshot run value."
 msgstr "Неважечка вредност на пуштањето на снимката."
 
-#: actions/snapshotadminpanel.php:133
 msgid "Snapshot frequency must be a number."
 msgstr "Честотата на снимките мора да биде бројка."
 
-#: actions/snapshotadminpanel.php:144
 msgid "Invalid snapshot report URL."
 msgstr "Неважечки URL за извештај од снимката."
 
-#: actions/snapshotadminpanel.php:200
 msgid "Randomly during web hit"
 msgstr "По случајност во текот на посета"
 
-#: actions/snapshotadminpanel.php:201
 msgid "In a scheduled job"
 msgstr "Во зададена задача"
 
-#: actions/snapshotadminpanel.php:206
 msgid "Data snapshots"
 msgstr "Снимки од податоци"
 
-#: actions/snapshotadminpanel.php:208
 msgid "When to send statistical data to status.net servers"
 msgstr ""
 "Кога да им се испраќаат статистички податоци на status.net опслужувачите"
 
-#: actions/snapshotadminpanel.php:217
 msgid "Frequency"
 msgstr "Честота"
 
-#: actions/snapshotadminpanel.php:218
 msgid "Snapshots will be sent once every N web hits"
 msgstr "Ќе се испраќаат снимки на секои N посети"
 
-#: actions/snapshotadminpanel.php:226
 msgid "Report URL"
 msgstr "URL на извештајот"
 
-#: actions/snapshotadminpanel.php:227
 msgid "Snapshots will be sent to this URL"
 msgstr "Снимките ќе се испраќаат на оваа URL-адреса"
 
-#: actions/snapshotadminpanel.php:248
 msgid "Save snapshot settings"
 msgstr "Зачувај поставки за снимки"
 
 #. TRANS: Client error displayed trying a change a subscription for a non-subscribed profile.
-#: actions/subedit.php:75
 msgid "You are not subscribed to that profile."
 msgstr "Не сте претплатени на тој профил."
 
 #. TRANS: Server error displayed when updating a subscription fails with a database error.
 #. TRANS: Exception thrown when a subscription could not be stored on the server.
-#: actions/subedit.php:89 classes/Subscription.php:141
 msgid "Could not save subscription."
 msgstr "Не можев да ја зачувам претплатата."
 
 #. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
-#: actions/subscribe.php:121
 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
 msgstr ""
 "Не можете да се претплатите на OMB 0.1 далечински профил со ова дејство."
 
 #. TRANS: Page title when subscription succeeded.
-#: actions/subscribe.php:149
 msgid "Subscribed"
 msgstr "Претплатено"
 
 #. TRANS: Header for list of subscribers for a user (first page).
 #. TRANS: %s is the user's nickname.
-#: actions/subscribers.php:51
 #, php-format
 msgid "%s subscribers"
 msgstr "Претплатници на %s"
 
 #. TRANS: Header for list of subscribers for a user (not first page).
 #. TRANS: %1$s is the user's nickname, $2$d is the page number.
-#: actions/subscribers.php:55
 #, php-format
 msgid "%1$s subscribers, page %2$d"
 msgstr "Претплатници на %1$s, стр. %2$d"
 
 #. TRANS: Page notice for page with an overview of all subscribers
 #. TRANS: of the logged in user's own profile.
-#: actions/subscribers.php:68
 msgid "These are the people who listen to your notices."
 msgstr "Ова се луѓето што ги следат Вашите забелешки."
 
 #. TRANS: Page notice for page with an overview of all subscribers of a user other
 #. TRANS: than the logged in user. %s is the user nickname.
-#: actions/subscribers.php:74
 #, php-format
 msgid "These are the people who listen to %s's notices."
 msgstr "Ова се луѓето што ги следат забелешките на %s."
 
 #. TRANS: Subscriber list text when the logged in user has no subscribers.
-#: actions/subscribers.php:114
 msgid ""
 "You have no subscribers. Try subscribing to people you know and they might "
 "return the favor."
@@ -6243,7 +5118,6 @@ msgstr ""
 
 #. TRANS: Subscriber list text when looking at the subscribers for a of a user other
 #. TRANS: than the logged in user that has no subscribers. %s is the user nickname.
-#: actions/subscribers.php:118
 #, php-format
 msgid "%s has no subscribers. Want to be the first?"
 msgstr "%s нема претплатници. Сакате да бидете првиот?"
@@ -6253,7 +5127,6 @@ msgstr "%s нема претплатници. Сакате да бидете п
 #. TRANS: This message contains a Markdown URL. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.
-#: actions/subscribers.php:127
 #, php-format
 msgid ""
 "%s has no subscribers. Why not [register an account](%%%%action.register%%%"
@@ -6264,20 +5137,17 @@ msgstr ""
 
 #. TRANS: Header for subscriptions overview for a user (not first page).
 #. TRANS: %1$s is a user nickname, %2$d is the page number.
-#: actions/subscriptions.php:55
 #, php-format
 msgid "%1$s subscriptions, page %2$d"
 msgstr "Претплати на %1$s, стр. %2$d"
 
 #. TRANS: Page notice for page with an overview of all subscriptions
 #. TRANS: of the logged in user's own profile.
-#: actions/subscriptions.php:68
 msgid "These are the people whose notices you listen to."
 msgstr "Ова се луѓето чии забелешки ги следите."
 
 #. TRANS: Page notice for page with an overview of all subscriptions of a user other
 #. TRANS: than the logged in user. %s is the user nickname.
-#: actions/subscriptions.php:74
 #, php-format
 msgid "These are the people whose notices %s listens to."
 msgstr "Ова се луѓето чии забелешки ги следи %s."
@@ -6286,7 +5156,6 @@ 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.
-#: actions/subscriptions.php:133
 #, php-format
 msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "
@@ -6305,69 +5174,55 @@ msgstr ""
 #. TRANS: than the logged in user that has no subscriptions. %s is the user nickname.
 #. TRANS: Subscription list text when looking at the subscriptions for a of a user that has none
 #. TRANS: as an anonymous user. %s is the user nickname.
-#: actions/subscriptions.php:141 actions/subscriptions.php:147
 #, php-format
 msgid "%s is not listening to anyone."
 msgstr "%s не следи никого."
 
 #. TRANS: Atom feed title. %s is a profile nickname.
-#: actions/subscriptions.php:176
 #, php-format
 msgid "Subscription feed for %s (Atom)"
 msgstr "Канал со забелешки за %s (Atom)"
 
 #. TRANS: Checkbox label for enabling Jabber messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:241 lib/settingsnav.php:110
-#, fuzzy
 msgid "IM"
 msgstr "IM"
 
 #. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:256 lib/settingsnav.php:117
 msgid "SMS"
 msgstr "СМС"
 
 #. TRANS: Title for all but the first page of notices with tags.
 #. TRANS: %1$s is the tag, %2$d is the page number.
-#: actions/tag.php:73
 #, php-format
 msgid "Notices tagged with %1$s, page %2$d"
 msgstr "Забелешки означени со %1$s, стр. %2$d"
 
-#: actions/tag.php:91
 #, php-format
 msgid "Notice feed for tag %s (RSS 1.0)"
 msgstr "Канал со забелешки за ознаката %s (RSS 1.0)"
 
-#: actions/tag.php:97
 #, php-format
 msgid "Notice feed for tag %s (RSS 2.0)"
 msgstr "Канал со забелешки за ознаката %s (RSS 2.0)"
 
-#: actions/tag.php:103
 #, php-format
 msgid "Notice feed for tag %s (Atom)"
 msgstr "Канал со забелешки за ознаката %s (Atom)"
 
-#: actions/tagother.php:39
 msgid "No ID argument."
 msgstr "Нема ID-аргумент."
 
-#: actions/tagother.php:65
 #, php-format
 msgid "Tag %s"
 msgstr "Означи %s"
 
 #. TRANS: H2 for user profile information.
-#: actions/tagother.php:77 lib/userprofile.php:76
 msgid "User profile"
 msgstr "Кориснички профил"
 
-#: actions/tagother.php:120
 msgid "Tag user"
 msgstr "Означи корисник"
 
-#: actions/tagother.php:130
 msgid ""
 "Tags for this user (letters, numbers, -, ., and _), comma- or space- "
 "separated"
@@ -6375,48 +5230,38 @@ msgstr ""
 "Ознаки за овој корисник (букви, бројки, -, . и _), одделени со запирка или "
 "празно место"
 
-#: actions/tagother.php:157
 #, php-format
 msgid "Invalid tag: \"%s\""
 msgstr "Неважечка ознака: „%s“"
 
-#: actions/tagother.php:172
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 "Можете да означувате само луѓе на коишто сте претплатени или луѓе "
 "претплатени на Вас."
 
-#: actions/tagother.php:215
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr "Со овој образец додавајте ознаки во Вашите претплатници или претплати."
 
-#: actions/tagrss.php:35
 msgid "No such tag."
 msgstr "Нема таква ознака."
 
 #. TRANS: Client error displayed when trying to unblock a non-blocked user.
-#: actions/unblock.php:59
 msgid "You haven't blocked that user."
 msgstr "Го немате блокирано тој корисник."
 
-#: actions/unsandbox.php:72
 msgid "User is not sandboxed."
 msgstr "Корисникот не е ставен во песочен режим."
 
-#: actions/unsilence.php:72
 msgid "User is not silenced."
 msgstr "Корисникот не е замолчен."
 
-#: actions/unsubscribe.php:77
 msgid "No profile ID in request."
 msgstr "!Во барањето нема ID на профилот."
 
-#: actions/unsubscribe.php:98
 msgid "Unsubscribed"
 msgstr "Претплатата е откажана"
 
-#: actions/updateprofile.php:64
 #, php-format
 msgid ""
 "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
@@ -6424,172 +5269,140 @@ msgstr ""
 "Лиценцата на каналот на следачот „%1$s“ не е соодветна на лиценцата на "
 "мрежното место „%2$s“."
 
-#: actions/urlsettings.php:60
-#, fuzzy
 msgid "URL settings"
-msgstr "Нагодувања за IM"
+msgstr "Нагодувања за URL"
 
 #. TRANS: Instructions for tab "Other" in user profile settings.
-#: actions/urlsettings.php:72
 msgid "Manage various other options."
 msgstr "Раководење со разни други можности."
 
 #. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
 #. TRANS: user's profile settings. This message has one space at the beginning. Use your
 #. TRANS: language's word separator here if it has one (most likely a single space).
-#: actions/urlsettings.php:115
 msgid " (free service)"
 msgstr " (слободна служба)"
 
-#: actions/urlsettings.php:121
-#, fuzzy
 msgid "[none]"
-msgstr "Без ознаки"
+msgstr "[без ознаки]"
 
-#: actions/urlsettings.php:122
 msgid "[internal]"
-msgstr ""
+msgstr "[внатрешни]"
 
 #. TRANS: Label for dropdown with URL shortener services.
-#: actions/urlsettings.php:130
 msgid "Shorten URLs with"
 msgstr "Скратувај URL-адреси со"
 
 #. TRANS: Tooltip for for dropdown with URL shortener services.
-#: actions/urlsettings.php:132
 msgid "Automatic shortening service to use."
 msgstr "Која автоматска служба за скратување да се користи."
 
-#: actions/urlsettings.php:138
 msgid "URL longer than"
-msgstr ""
+msgstr "URL не подолга од"
 
-#: actions/urlsettings.php:141
 msgid "URLs longer than this will be shortened, 0 means always shorten."
 msgstr ""
+"URL-адресите подолги од ова ќе бидат скратени. 0 значи дека секогаш ќе се "
+"скратуваат."
 
-#: actions/urlsettings.php:145
 msgid "Text longer than"
-msgstr ""
+msgstr "Текст подолг од"
 
-#: actions/urlsettings.php:148
 msgid ""
 "URLs in notices longer than this will be shortened, 0 means always shorten."
 msgstr ""
+"URL-адресите во забелешките подолги од ова ќе бидат скратени. 0 значи дека "
+"секогаш ќе се скратуваат."
 
 #. TRANS: Form validation error for form "Other settings" in user profile.
-#: actions/urlsettings.php:180
 msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr "Услугата за скратување на URL-адреси е предолга (највеќе до 50 знаци)."
 
-#: actions/urlsettings.php:187
 msgid "Invalid number for max url length."
-msgstr ""
+msgstr "Неважечки број за максимална должина на URL-адреса."
 
-#: actions/urlsettings.php:193
-#, fuzzy
 msgid "Invalid number for max notice length."
-msgstr "Неважечка содржина на забелешката."
+msgstr "Неважечки број за макс. должина на забелешка."
 
-#: actions/urlsettings.php:238
 msgid "Error saving user URL shortening preferences."
 msgstr ""
+"Грешка при зачувувањето на корисничките нагодувања за скратување на URL-"
+"адреси."
 
 #. TRANS: User admin panel title
-#: actions/useradminpanel.php:58
 msgctxt "TITLE"
 msgid "User"
 msgstr "Корисник"
 
 #. TRANS: Instruction for user admin panel.
-#: actions/useradminpanel.php:69
 msgid "User settings for this StatusNet site"
 msgstr "Кориснички нагодувања за ова StatusNet-мрежно место"
 
 #. TRANS: Form validation error in user admin panel when a non-numeric character limit was set.
-#: actions/useradminpanel.php:147
 msgid "Invalid bio limit. Must be numeric."
 msgstr "Неважечко ограничување за биографијата. Мора да е бројчено."
 
 #. TRANS: Form validation error in user admin panel when welcome text is too long.
-#: actions/useradminpanel.php:154
 msgid "Invalid welcome text. Maximum length is 255 characters."
 msgstr "Неважечки текст за добредојде. Дозволени се највеќе 255 знаци."
 
 #. TRANS: Client error displayed when trying to set a non-existing user as default subscription for new
 #. TRANS: users in user admin panel. %1$s is the invalid nickname.
-#: actions/useradminpanel.php:166
 #, php-format
 msgid "Invalid default subscripton: \"%1$s\" is not a user."
 msgstr "Неважечки опис по основно: „%1$s“ не е корисник."
 
-#: actions/useradminpanel.php:215 lib/action.php:565 lib/settingsnav.php:77
-#: lib/subgroupnav.php:81
 msgid "Profile"
 msgstr "Профил"
 
 #. TRANS: Field label in user admin panel for setting the character limit for the bio field.
-#: actions/useradminpanel.php:220
 msgid "Bio Limit"
 msgstr "Ограничување за биографијата"
 
 #. TRANS: Tooltip in user admin panel for setting the character limit for the bio field.
-#: actions/useradminpanel.php:222
 msgid "Maximum length of a profile bio in characters."
 msgstr "Максимална големина на профилната биографија во знаци."
 
 #. TRANS: Form legend in user admin panel.
-#: actions/useradminpanel.php:231
 msgid "New users"
 msgstr "Нови корисници"
 
 #. TRANS: Field label in user admin panel for setting new user welcome text.
-#: actions/useradminpanel.php:236
 msgid "New user welcome"
 msgstr "Добредојде за нов корисник"
 
 #. TRANS: Tooltip in user admin panel for setting new user welcome text.
-#: actions/useradminpanel.php:238
 msgid "Welcome text for new users (maximum 255 characters)."
 msgstr "Текст за добредојде на нови корисници (највеќе до 255 знаци)."
 
 #. TRANS: Field label in user admin panel for setting default subscription for new users.
-#: actions/useradminpanel.php:244
 msgid "Default subscription"
 msgstr "Основно-зададена претплата"
 
 #. TRANS: Tooltip in user admin panel for setting default subscription for new users.
-#: actions/useradminpanel.php:246
 msgid "Automatically subscribe new users to this user."
 msgstr "Автоматски претплатувај нови корисници на овој корисник."
 
 #. TRANS: Form legend in user admin panel.
-#: actions/useradminpanel.php:256
 msgid "Invitations"
 msgstr "Покани"
 
 #. TRANS: Field label for checkbox in user admin panel for allowing users to invite friend using site e-mail.
-#: actions/useradminpanel.php:262
 msgid "Invitations enabled"
 msgstr "Поканите се овозможени"
 
 #. TRANS: Tooltip for checkbox in user admin panel for allowing users to invite friend using site e-mail.
-#: actions/useradminpanel.php:265
 msgid "Whether to allow users to invite new users."
 msgstr "Дали да им е дозволено на корисниците да канат други корисници."
 
 #. TRANS: Title for button to save user settings in user admin panel.
-#: actions/useradminpanel.php:302
 msgid "Save user settings."
 msgstr "Зачувај кориснички нагодувања."
 
 #. TRANS: Page title.
-#: actions/userauthorization.php:109
 msgid "Authorize subscription"
 msgstr "Одобрете ја претплатата"
 
 #. TRANS: Page notice on "Auhtorize subscription" page.
-#: actions/userauthorization.php:115
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
 "user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
@@ -6600,38 +5413,31 @@ msgstr ""
 "стиснете на „Одбиј“."
 
 #. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:200
 msgctxt "BUTTON"
 msgid "Accept"
 msgstr "Прифати"
 
 #. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:202
 msgid "Subscribe to this user."
 msgstr "Претплати се на корисников."
 
 #. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:204
 msgctxt "BUTTON"
 msgid "Reject"
 msgstr "Одбиј"
 
 #. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:206
 msgid "Reject this subscription."
 msgstr "Одбиј ја оваа претплата."
 
 #. TRANS: Client error displayed for an empty authorisation request.
-#: actions/userauthorization.php:219
 msgid "No authorization request!"
 msgstr "Нема барање за проверка!"
 
 #. TRANS: Accept message header from Authorise subscription page.
-#: actions/userauthorization.php:242
 msgid "Subscription authorized"
 msgstr "Претплатата е одобрена"
 
-#: actions/userauthorization.php:245
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to authorize the "
@@ -6642,11 +5448,9 @@ msgstr ""
 "Жетонот на Вашата претплата е:"
 
 #. TRANS: Reject message header from Authorise subscription page.
-#: actions/userauthorization.php:256
 msgid "Subscription rejected"
 msgstr "Претплатата е одбиена"
 
-#: actions/userauthorization.php:259
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to fully reject the "
@@ -6658,35 +5462,30 @@ msgstr ""
 
 #. TRANS: Exception thrown when no valid user is found for an authorisation request.
 #. TRANS: %s is a listener URI.
-#: actions/userauthorization.php:296
 #, php-format
 msgid "Listener URI \"%s\" not found here."
 msgstr "URI-то на следачот „%s“ не е пронајдено тука."
 
 #. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
 #. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:303
 #, php-format
 msgid "Listenee URI \"%s\" is too long."
 msgstr "Следеното URI „%s“ е предолго."
 
 #. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
 #. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:311
 #, php-format
 msgid "Listenee URI \"%s\" is a local user."
 msgstr "Следеното URI „%s“ е локален корисник."
 
 #. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
 #. TRANS: %s is a profile URL.
-#: actions/userauthorization.php:329
 #, php-format
 msgid "Profile URL \"%s\" is for a local user."
 msgstr "Профилната URL-адреса „%s“ е за локален корисник."
 
 #. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
 #. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
-#: actions/userauthorization.php:339
 #, php-format
 msgid ""
 "Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
@@ -6697,32 +5496,27 @@ msgstr ""
 
 #. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
 #. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:349
 #, php-format
 msgid "Avatar URL \"%s\" is not valid."
 msgstr "URL-адресата „%s“ за аватар е неважечка."
 
 #. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
 #. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:356
 #, php-format
 msgid "Cannot read avatar URL \"%s\"."
 msgstr "Не можам да ја прочитам URL-адресата на аватарот „%s“."
 
 #. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
 #. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:363
 #, php-format
 msgid "Wrong image type for avatar URL \"%s\"."
 msgstr "Погрешен тип на слика за аватарот со URL „%s“."
 
 #. TRANS: Page title for profile design page.
-#: actions/userdesignsettings.php:74 lib/designsettings.php:61
 msgid "Profile design"
 msgstr "Изглед на профилот"
 
 #. TRANS: Instructions for profile design page.
-#: actions/userdesignsettings.php:84 lib/designsettings.php:72
 msgid ""
 "Customize the way your profile looks with a background image and a colour "
 "palette of your choice."
@@ -6730,44 +5524,33 @@ msgstr ""
 "Прилагодете го изгледот на Вашиот профил, со позадинска слика и палета од "
 "бои по Ваш избор."
 
-#: actions/userdesignsettings.php:289
 msgid "Enjoy your hotdog!"
 msgstr "Добар апетит!"
 
-#: actions/userdesignsettings.php:325
-#, fuzzy
 msgid "Design settings"
-msgstr "Зачувај нагодувања на мреж. место"
+msgstr "Нагодувања на изгледот"
 
-#: actions/userdesignsettings.php:340
 msgid "View profile designs"
 msgstr "Види изгледи на профилот"
 
-#: actions/userdesignsettings.php:341
 msgid "Show or hide profile designs."
 msgstr "Прикажи или скриј изгледи на профилот."
 
-#: actions/userdesignsettings.php:348
-#, fuzzy
 msgid "Background file"
-msgstr "Позадина"
+msgstr "Податотека за позадината"
 
 #. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number.
-#: actions/usergroups.php:66
 #, php-format
 msgid "%1$s groups, page %2$d"
 msgstr "Групи %1$s, стр. %2$d"
 
-#: actions/usergroups.php:132
 msgid "Search for more groups"
 msgstr "Пребарај уште групи"
 
-#: actions/usergroups.php:159
 #, php-format
 msgid "%s is not a member of any group."
 msgstr "%s не членува во ниедна група."
 
-#: actions/usergroups.php:164
 #, php-format
 msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
 msgstr ""
@@ -6778,18 +5561,14 @@ msgstr ""
 #. TRANS: %1$s is a group name, %2$s is a site name.
 #. TRANS: Message is used as a subtitle in atom user notice feed.
 #. TRANS: %1$s is a user name, %2$s is a site name.
-#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:70
-#: lib/atomusernoticefeed.php:95
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr "Подновувања од %1$s на %2$s!"
 
-#: actions/version.php:75
 #, php-format
 msgid "StatusNet %s"
 msgstr "StatusNet %s"
 
-#: actions/version.php:155
 #, php-format
 msgid ""
 "This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
@@ -6798,16 +5577,13 @@ msgstr ""
 "Ова мрежно место работи на %1$s верзија %2$s, Авторски права 2008-2010 "
 "StatusNet, Inc. и учесници."
 
-#: actions/version.php:163
 msgid "Contributors"
 msgstr "Учесници"
 
 #. TRANS: Menu item for site administration
-#: actions/version.php:167 lib/adminpanelaction.php:403
 msgid "License"
 msgstr "Лиценца"
 
-#: actions/version.php:170
 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 "
@@ -6819,7 +5595,6 @@ msgstr ""
 "Фондацијата за слободна програмска опрема, верзија 3 на лиценцата, или (по "
 "Ваш избор) било која подоцнежна верзија. "
 
-#: actions/version.php:176
 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 "
@@ -6831,7 +5606,6 @@ msgstr ""
 "или ПОГОДНОСТ ЗА ОПРЕДЕЛЕНА ЦЕЛ.  Погледајте ја Општата јавна лиценца ГНУ "
 "Аферо за повеќе подробности. "
 
-#: actions/version.php:182
 #, php-format
 msgid ""
 "You should have received a copy of the GNU Affero General Public License "
@@ -6841,52 +5615,42 @@ msgstr ""
 "овој програм.  Ако ја немате, погледајте %s."
 
 #. TRANS: Form input field label for application name.
-#: actions/version.php:197 lib/applicationeditform.php:190
 msgid "Name"
 msgstr "Име"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:885
 msgid "Version"
 msgstr "Верзија"
 
-#: actions/version.php:199
 msgid "Author(s)"
 msgstr "Автор(и)"
 
 #. TRANS: Form input field label.
-#: actions/version.php:200 lib/applicationeditform.php:208
-#: lib/groupeditform.php:168
 msgid "Description"
 msgstr "Опис"
 
 #. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:164
 msgid "Favor"
 msgstr "Бендисај"
 
 #. TRANS: Ntofication given when a user marks a notice as favorite.
 #. TRANS: %1$s is a user nickname or full name, %2$s is a notice URI.
-#: classes/Fave.php:167
 #, php-format
 msgid "%1$s marked notice %2$s as a favorite."
 msgstr "%1$s ја бендиса забелешката %2$s."
 
 #. TRANS: Server exception thrown when a URL cannot be processed.
-#: classes/File.php:162
 #, php-format
 msgid "Cannot process URL '%s'"
 msgstr "Не можам да ја обработам URL-адресата „%s“"
 
 #. TRANS: Server exception thrown when... Robin thinks something is impossible!
-#: classes/File.php:194
 msgid "Robin thinks something is impossible."
 msgstr "Робин мисли дека нешто е невозможно."
 
 #. 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$s is used for plural.
-#: classes/File.php:210
 #, php-format
 msgid ""
 "No file may be larger than %1$d byte and the file you sent was %2$d bytes. "
@@ -6903,7 +5667,6 @@ msgstr[1] ""
 
 #. TRANS: Message given if an upload would exceed user quota.
 #. TRANS: %d (number) is the user quota in bytes and is used for plural.
-#: classes/File.php:223
 #, php-format
 msgid "A file this large would exceed your user quota of %d byte."
 msgid_plural "A file this large would exceed your user quota of %d bytes."
@@ -6915,7 +5678,6 @@ msgstr[1] ""
 
 #. TRANS: Message given id an upload would exceed a user's monthly quota.
 #. TRANS: $d (number) is the monthly user quota in bytes and is used for plural.
-#: classes/File.php:235
 #, php-format
 msgid "A file this large would exceed your monthly quota of %d byte."
 msgid_plural "A file this large would exceed your monthly quota of %d bytes."
@@ -6925,108 +5687,89 @@ msgstr[1] ""
 "Волку голема податотека ќе го надмине Вашето месечно следување од %d бајти"
 
 #. TRANS: Client exception thrown if a file upload does not have a valid name.
-#: classes/File.php:282 classes/File.php:297
 msgid "Invalid filename."
 msgstr "Погрешно податотечно име."
 
 #. TRANS: Exception thrown when joining a group fails.
-#: classes/Group_member.php:51
 msgid "Group join failed."
 msgstr "Зачленувањето во групата не успеа."
 
 #. TRANS: Exception thrown when trying to leave a group the user is not a member of.
-#: classes/Group_member.php:64
 msgid "Not part of group."
 msgstr "Не е дел од групата."
 
 #. TRANS: Exception thrown when trying to leave a group fails.
-#: classes/Group_member.php:72
 msgid "Group leave failed."
 msgstr "Напуштањето на групата не успеа."
 
 #. TRANS: Exception thrown providing an invalid profile ID.
 #. TRANS: %s is the invalid profile ID.
-#: classes/Group_member.php:85
 #, php-format
 msgid "Profile ID %s is invalid."
 msgstr "Назнаката (ID) %s на профилот е неважечка."
 
 #. TRANS: Exception thrown providing an invalid group ID.
 #. TRANS: %s is the invalid group ID.
-#: classes/Group_member.php:98
 #, php-format
 msgid "Group ID %s is invalid."
 msgstr "Групната назнака %s е неважечка."
 
 #. TRANS: Activity title.
-#: classes/Group_member.php:147 lib/joinform.php:114
 msgid "Join"
 msgstr "Зачлени се"
 
 #. TRANS: Success message for subscribe to group attempt through OStatus.
 #. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
-#: classes/Group_member.php:151
 #, php-format
 msgid "%1$s has joined group %2$s."
 msgstr "%1$s се зачлени во групата %2$s."
 
 #. TRANS: Server exception thrown when updating a local group fails.
-#: classes/Local_group.php:42
 msgid "Could not update local group."
 msgstr "Не можев да ја подновам локалната група."
 
 #. TRANS: Exception thrown when trying creating a login token failed.
 #. TRANS: %s is the user nickname for which token creation failed.
-#: classes/Login_token.php:78
 #, php-format
 msgid "Could not create login token for %s"
 msgstr "Не можам да создадам најавен жетон за"
 
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
-#: classes/Memcached_DataObject.php:556
 msgid "No database name or DSN found anywhere."
 msgstr "Никаде не е пронајдено име на базата или DSN."
 
 #. TRANS: Client exception thrown when a user tries to send a direct message while being banned from sending them.
-#: classes/Message.php:45
 msgid "You are banned from sending direct messages."
 msgstr "Забрането Ви е испраќање на директни пораки."
 
 #. TRANS: Message given when a message could not be stored on the server.
-#: classes/Message.php:69
 msgid "Could not insert message."
 msgstr "Не можев да ја испратам пораката."
 
 #. TRANS: Message given when a message could not be updated on the server.
-#: classes/Message.php:80
 msgid "Could not update message with new URI."
 msgstr "Не можев да ја подновам пораката со нов URI."
 
 #. TRANS: Server exception thrown when a user profile for a notice cannot be found.
 #. TRANS: %1$d is a profile ID (number), %2$d is a notice ID (number).
-#: classes/Notice.php:98
 #, php-format
 msgid "No such profile (%1$d) for notice (%2$d)."
 msgstr "Нема таков профил (%1$d) за забелешката (%2$d)."
 
 #. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:199
 #, php-format
 msgid "Database error inserting hashtag: %s"
 msgstr "Грешка во базата на податоци при вметнувањето на тарабната ознака: %s"
 
 #. TRANS: Client exception thrown if a notice contains too many characters.
-#: classes/Notice.php:279
 msgid "Problem saving notice. Too long."
 msgstr "Проблем со зачувувањето на белешката. Премногу долго."
 
 #. TRANS: Client exception thrown when trying to save a notice for an unknown user.
-#: classes/Notice.php:284
 msgid "Problem saving notice. Unknown user."
 msgstr "Проблем со зачувувањето на белешката. Непознат корисник."
 
 #. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
-#: classes/Notice.php:290
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
@@ -7034,7 +5777,6 @@ msgstr ""
 "неколку минути."
 
 #. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
-#: classes/Notice.php:297
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
 "few minutes."
@@ -7043,42 +5785,35 @@ msgstr ""
 "неколку минути."
 
 #. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:305
 msgid "You are banned from posting notices on this site."
 msgstr "Забрането Ви е да објавувате забелешки на ова мрежно место."
 
 #. TRANS: Server exception thrown when a notice cannot be saved.
 #. TRANS: Server exception thrown when a notice cannot be updated.
-#: classes/Notice.php:372 classes/Notice.php:399
 msgid "Problem saving notice."
 msgstr "Проблем во зачувувањето на белешката."
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:929
 msgid "Bad type provided to saveKnownGroups."
 msgstr "На saveKnownGroups му е укажан погрешен тип."
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:1028
 msgid "Problem saving group inbox."
 msgstr "Проблем при зачувувањето на групното приемно сандаче."
 
 #. TRANS: Server exception thrown when a reply cannot be saved.
 #. TRANS: %1$d is a notice ID, %2$d is the ID of the mentioned user.
-#: classes/Notice.php:1144
 #, php-format
 msgid "Could not save reply for %1$d, %2$d."
 msgstr "Не можев да го зачувам одговорот за %1$d, %2$d."
 
 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1663
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
 
 #. TRANS: Full name of a profile or group followed by nickname in parens
-#: classes/Profile.php:172 classes/User_group.php:242
 #, php-format
 msgctxt "FANCYNAME"
 msgid "%1$s (%2$s)"
@@ -7086,7 +5821,6 @@ msgstr "%1$s (%2$s)"
 
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:779
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
@@ -7095,7 +5829,6 @@ msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:788
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -7103,251 +5836,192 @@ msgstr ""
 "базата на податоци."
 
 #. TRANS: Exception thrown when a right for a non-existing user profile is checked.
-#: classes/Remote_profile.php:54
 msgid "Missing profile."
 msgstr "Недостасува профил."
 
 #. TRANS: Exception thrown when a tag cannot be saved.
-#: classes/Status_network.php:338
 msgid "Unable to save tag."
 msgstr "Не можам да ја зачувам ознаката."
 
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#: classes/Subscription.php:77 lib/oauthstore.php:482
 msgid "You have been banned from subscribing."
 msgstr "Блокирани сте од претплаќање."
 
 #. TRANS: Exception thrown when trying to subscribe while already subscribed.
-#: classes/Subscription.php:82
 msgid "Already subscribed!"
 msgstr "Веќе претплатено!"
 
 #. TRANS: Exception thrown when trying to subscribe to a user who has blocked the subscribing user.
-#: classes/Subscription.php:87
 msgid "User has blocked you."
 msgstr "Корисникот Ве има блокирано."
 
 #. TRANS: Exception thrown when trying to unsibscribe without a subscription.
-#: classes/Subscription.php:176
 msgid "Not subscribed!"
 msgstr "Не сте ни претплатени!"
 
 #. TRANS: Exception thrown when trying to unsubscribe a user from themselves.
-#: classes/Subscription.php:183
 msgid "Could not delete self-subscription."
 msgstr "Не можам да ја избришам самопретплатата."
 
 #. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
-#: classes/Subscription.php:211
 msgid "Could not delete subscription OMB token."
 msgstr "Не можам да го избришам OMB-жетонот за претплата."
 
 #. TRANS: Exception thrown when a subscription could not be deleted on the server.
-#: classes/Subscription.php:223
 msgid "Could not delete subscription."
 msgstr "Не можам да ја избришам претплатата."
 
 #. TRANS: Activity tile when subscribing to another person.
-#: classes/Subscription.php:265
 msgid "Follow"
 msgstr "Следи"
 
 #. TRANS: Notification given when one person starts following another.
 #. TRANS: %1$s is the subscriber, %2$s is the subscribed.
-#: classes/Subscription.php:268
 #, php-format
 msgid "%1$s is now following %2$s."
 msgstr "%1$s сега го/ја следи %2$s."
 
 #. TRANS: Notice given on user registration.
 #. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:390
 #, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr "Добредојдовте на %1$s, @%2$s!"
 
 #. TRANS: Server exception.
-#: classes/User.php:923
 msgid "No single user defined for single-user mode."
 msgstr "Не е зададен корисник за еднокорисничкиот режим."
 
 #. TRANS: Server exception.
-#: classes/User.php:927
 msgid "Single-user mode code called when not enabled."
 msgstr "Повикан е еднокориснички режим, но не е овозможен."
 
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:522
 msgid "Could not create group."
 msgstr "Не можев да ја создадам групата."
 
 #. TRANS: Server exception thrown when updating a group URI failed.
-#: classes/User_group.php:532
 msgid "Could not set group URI."
 msgstr "Не можев да поставам URI на групата."
 
 #. TRANS: Server exception thrown when setting group membership failed.
-#: classes/User_group.php:555
 msgid "Could not set group membership."
 msgstr "Не можев да назначам членство во групата."
 
 #. TRANS: Server exception thrown when saving local group information failed.
-#: classes/User_group.php:570
 msgid "Could not save local group info."
 msgstr "Не можев да ги зачувам информациите за локалните групи."
 
 #. TRANS: Exception thrown when an account could not be located when it should be moved.
 #. TRANS: %s is the remote site.
-#: lib/accountmover.php:65
 #, php-format
 msgid "Cannot locate account %s."
 msgstr "Не можам да ја најдам сметката %s."
 
 #. TRANS: Exception thrown when a service document could not be located account move.
 #. TRANS: %s is the remote site.
-#: lib/accountmover.php:106
 #, php-format
 msgid "Cannot find XRD for %s."
 msgstr "Не можам да најдам XRD за %s."
 
 #. TRANS: Exception thrown when an account could not be located when it should be moved.
 #. TRANS: %s is the remote site.
-#: lib/accountmover.php:131
 #, php-format
 msgid "No AtomPub API service for %s."
 msgstr "Нема служба за API на AtomPub за %s."
 
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: lib/action.php:161
 #, php-format
 msgid "%1$s - %2$s"
 msgstr "%1$s - %2$s"
 
 #. TRANS: Page title for a page without a title set.
-#: lib/action.php:177
 msgid "Untitled page"
 msgstr "Страница без наслов"
 
 #. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.
-#: lib/action.php:325
 msgctxt "TOOLTIP"
 msgid "Show more"
 msgstr "Повеќе"
 
 #. TRANS: Inline reply form submit button: submits a reply comment.
-#: lib/action.php:328
 #, fuzzy
 msgctxt "BUTTON"
-msgid "Comment"
-msgstr "Содржина"
+msgid "Reply"
+msgstr "Одговор"
 
 #. TRANS: Placeholder text for inline reply form. Clicking in this box will turn it into a mini notice form.
-#: lib/action.php:331
-msgid "Add a comment..."
+msgid "Write a reply..."
 msgstr ""
 
-#: lib/action.php:559 lib/personalgroupnav.php:99
-#, fuzzy
 msgid "Home"
 msgstr "Домашна страница"
 
-#: lib/action.php:560
-#, fuzzy
 msgid "Friends timeline"
-msgstr "Историја на %s"
+msgstr "Историја на пријатели"
 
-#: lib/action.php:566
-#, fuzzy
 msgid "Your profile"
 msgstr "Профил на група"
 
-#: lib/action.php:570 lib/action.php:593 lib/publicgroupnav.php:78
 msgid "Public"
 msgstr "Јавен"
 
-#: lib/action.php:571 lib/action.php:594
-#, fuzzy
 msgid "Everyone on this site"
-msgstr "Пронајдете луѓе на ова мрежно место"
+msgstr "Сите на ова мрежно место"
 
-#: lib/action.php:575
-#, fuzzy
 msgid "Settings"
 msgstr "Нагодувања за СМС"
 
-#: lib/action.php:576
-#, fuzzy
 msgid "Change your personal settings"
-msgstr "Смени профилни нагодувања"
+msgstr "Измена на лични поставки"
 
-#: lib/action.php:582
-#, fuzzy
 msgid "Site configuration"
-msgstr "Кориснички поставки"
+msgstr "Поставки на мреж. место"
 
-#: lib/action.php:587
-#, fuzzy
 msgid "Logout"
 msgstr "Одјава"
 
-#: lib/action.php:588
-#, fuzzy
 msgid "Logout from the site"
 msgstr "Одјава"
 
-#: lib/action.php:599
-#, fuzzy
 msgid "Login to the site"
 msgstr "Најава"
 
-#: lib/action.php:606
-#, fuzzy
 msgid "Search"
 msgstr "Барај"
 
-#: lib/action.php:607
-#, fuzzy
 msgid "Search the site"
 msgstr "Пребарај по мрежното место"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:864
 msgid "Help"
 msgstr "Помош"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:867
 msgid "About"
 msgstr "За нас"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:870
 msgid "FAQ"
 msgstr "ЧПП"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:875
 msgid "TOS"
 msgstr "Услови"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:879
 msgid "Privacy"
 msgstr "Приватност"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:882
 msgid "Source"
 msgstr "Изворен код"
 
 #. TRANS: Secondary navigation menu option leading to e-mail contact information on the
 #. TRANS: StatusNet site, where to report bugs, ...
-#: lib/action.php:889
 msgid "Contact"
 msgstr "Контакт"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:892
 msgid "Badge"
 msgstr "Значка"
 
@@ -7355,7 +6029,6 @@ msgstr "Значка"
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:921
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7365,7 +6038,6 @@ msgstr ""
 "%](%%site.broughtbyurl%%)."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:924
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** е сервис за микроблогирање."
@@ -7374,7 +6046,6 @@ msgstr "**%%site.name%%** е сервис за микроблогирање."
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:931
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7387,14 +6058,12 @@ msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:949
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr "Содржината и податоците на %1$s се лични и доверливи."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:956
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
@@ -7402,7 +6071,6 @@ msgstr ""
 "права задржани."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:960
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 "Авторските права на содржината и податоците им припаѓаат на учесниците. Сите "
@@ -7410,84 +6078,69 @@ msgstr ""
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:992
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr "Сите содржини и податоци на %1$s се достапни под лиценцата %2$s."
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1335
 msgid "After"
 msgstr "Следно"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1345
 msgid "Before"
 msgstr "Претходно"
 
 #. TRANS: Client exception thrown when a feed instance is a DOMDocument.
-#: lib/activity.php:125
 msgid "Expecting a root feed element but got a whole XML document."
 msgstr "Се очекува коренски каналски елемент, но добив цел XML документ."
 
 #. TRANS: Client exception thrown when using an unknown verb for the activity importer.
-#: lib/activityimporter.php:81
 #, php-format
 msgid "Unknown verb: \"%s\"."
 msgstr "Непознат глагол: „%s“."
 
 #. TRANS: Client exception thrown when trying to force a subscription for an untrusted user.
-#: lib/activityimporter.php:107
 msgid "Cannot force subscription for untrusted user."
 msgstr "Не можам да наметнам претплата од недоверлив корисник."
 
 #. TRANS: Client exception thrown when trying to for a remote user to subscribe.
-#: lib/activityimporter.php:117
 msgid "Cannot force remote user to subscribe."
 msgstr "Не можам да му наметнам на далечинскиот корисник да се претплати."
 
 #. TRANS: Client exception thrown when trying to subscribe to an unknown profile.
-#: lib/activityimporter.php:132
 msgid "Unknown profile."
 msgstr "Непознат профил."
 
 #. TRANS: Client exception thrown when trying to import an event not related to the importing user.
-#: lib/activityimporter.php:138
 msgid "This activity seems unrelated to our user."
 msgstr "Оваа активност се чини неповрзана со нашиот корисник."
 
 #. TRANS: Client exception thrown when trying to join a remote group that is not a group.
-#: lib/activityimporter.php:154
 msgid "Remote profile is not a group!"
 msgstr "Далечинскиот профил не е група!"
 
 #. TRANS: Client exception thrown when trying to join a group the importing user is already a member of.
-#: lib/activityimporter.php:163
 msgid "User is already a member of this group."
 msgstr "Корисникот веќе членува во групава."
 
 #. TRANS: Client exception thrown when trying to import a notice by another user.
 #. TRANS: %1$s is the source URI of the notice, %2$s is the URI of the author.
-#: lib/activityimporter.php:201
 #, php-format
 msgid "Already know about notice %1$s and  it has a different author %2$s."
 msgstr "Веќе ми е позната забелешката %1$s и таа има друг автор %2$s."
 
 #. TRANS: Client exception thrown when trying to overwrite the author information for a non-trusted user during import.
-#: lib/activityimporter.php:207
 msgid "Not overwriting author info for non-trusted user."
 msgstr "Не презапишувам авторски податоци за недоверлив корисник."
 
 #. TRANS: Client exception thrown when trying to import a notice without content.
 #. TRANS: %s is the notice URI.
-#: lib/activityimporter.php:223
 #, php-format
 msgid "No content for notice %s."
 msgstr "Нема содржина за забелешката %s."
 
-#: lib/activitymover.php:84
 #, php-format
 msgid "No such user %s."
 msgstr "Нема корисник по име %s."
@@ -7498,214 +6151,173 @@ msgstr "Нема корисник по име %s."
 #. TRANS: %1$s is a URL, %2$s is the status, %s$s is the fail reason.
 #. TRANS: Exception thrown when post to collection fails with a status that is not handled.
 #. TRANS: %1$s is a URL, %2$s is the status, %s$s is the fail reason.
-#: lib/activitysink.php:163 lib/activitysink.php:167 lib/activitysink.php:172
 #, php-format
 msgctxt "URLSTATUSREASON"
 msgid "%1$s %2$s %3$s"
 msgstr "%1$s %2$s %3$s"
 
 #. TRANS: Client exception thrown when there is no source attribute.
-#: lib/activityutils.php:200
 msgid "Can't handle remote content yet."
 msgstr "Сè уште не е поддржана обработката на далечинска содржина."
 
 #. TRANS: Client exception thrown when there embedded XML content is found that cannot be processed yet.
-#: lib/activityutils.php:237
 msgid "Can't handle embedded XML content yet."
 msgstr "Сè уште не е поддржана обработката на XML содржина."
 
 #. TRANS: Client exception thrown when base64 encoded content is found that cannot be processed yet.
-#: lib/activityutils.php:242
 msgid "Can't handle embedded Base64 content yet."
 msgstr "Сè уште не е достапна обработката на вметната Base64 содржина."
 
 #. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights.
-#: lib/adminpanelaction.php:96
 msgid "You cannot make changes to this site."
 msgstr "Не можете да врште измени на ова мрежно место."
 
 #. TRANS: Client error message throw when a certain panel's settings cannot be changed.
-#: lib/adminpanelaction.php:108
 msgid "Changes to that panel are not allowed."
 msgstr "Менувањето на тој алатник не е дозволено."
 
 #. TRANS: Client error message.
-#: lib/adminpanelaction.php:222
 msgid "showForm() not implemented."
 msgstr "showForm() не е имплементирано."
 
 #. TRANS: Client error message
-#: lib/adminpanelaction.php:250
 msgid "saveSettings() not implemented."
 msgstr "saveSettings() не е имплементирано."
 
 #. TRANS: Client error message thrown if design settings could not be deleted in
 #. TRANS: the admin panel Design.
-#: lib/adminpanelaction.php:274
 msgid "Unable to delete design setting."
 msgstr "Не можам да ги избришам нагодувањата за изглед."
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:337
 msgid "Basic site configuration"
 msgstr "Основни нагодувања на мрежното место"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:339
 msgctxt "MENU"
 msgid "Site"
 msgstr "Мреж. место"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:345
 msgid "Design configuration"
 msgstr "Поставки на изгледот"
 
 #. TRANS: Menu item for site administration
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/adminpanelaction.php:347 lib/groupnav.php:135
 msgctxt "MENU"
 msgid "Design"
 msgstr "Изглед"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:353
 msgid "User configuration"
 msgstr "Кориснички поставки"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:110
 msgid "User"
 msgstr "Корисник"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:361
 msgid "Access configuration"
 msgstr "Поставки на пристапот"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:369
 msgid "Paths configuration"
 msgstr "Поставки на патеки"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:377
 msgid "Sessions configuration"
 msgstr "Поставки на сесиите"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:385
 msgid "Edit site notice"
 msgstr "Уреди објава за мрежното место"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:387
 msgid "Site notice"
 msgstr "Напомена за мрежното место"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:393
 msgid "Snapshots configuration"
 msgstr "Поставки за снимки"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:401
 msgid "Set site license"
 msgstr "Постави лиценца за мреж. место"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:409
-#, fuzzy
 msgid "Plugins configuration"
-msgstr "Поставки на патеки"
+msgstr "Поставки за приклучоци"
 
 #. TRANS: Client error 401.
-#: lib/apiauth.php:111
 msgid "API resource requires read-write access, but you only have read access."
 msgstr ""
 "API-ресурсот бара да може и да чита и да запишува, а вие можете само да "
 "читате."
 
 #. TRANS: OAuth exception thrown when no application is found for a given consumer key.
-#: lib/apiauth.php:177
 msgid "No application for that consumer key."
 msgstr "Нема програм за тој потрошувачки клуч."
 
-#: lib/apiauth.php:202 lib/apiauth.php:284
 msgid "Not allowed to use API."
 msgstr "Не е дозволено да се користи API."
 
 #. TRANS: OAuth exception given when an incorrect access token was given for a user.
-#: lib/apiauth.php:225
 msgid "Bad access token."
 msgstr "Лош пристапен жетон."
 
 #. TRANS: OAuth exception given when no user was found for a given token (no token was found).
-#: lib/apiauth.php:230
 msgid "No user for that token."
 msgstr "Нема корисник за тој жетон."
 
 #. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel".
 #. TRANS: Client error thrown when authentication fails.
-#: lib/apiauth.php:272 lib/apiauth.php:302
 msgid "Could not authenticate you."
 msgstr "Не можевме да Ве потврдиме."
 
 #. TRANS: Server error displayed when trying to create an anynymous OAuth consumer.
-#: lib/apioauthstore.php:45
 msgid "Could not create anonymous consumer."
 msgstr "Не можев да создадам анонимен потрошувач."
 
 #. TRANS: Server error displayed when trying to create an anynymous OAuth application.
-#: lib/apioauthstore.php:69
 msgid "Could not create anonymous OAuth application."
 msgstr "Не можев да создадам анонимен OAuth-програм."
 
 #. TRANS: Exception thrown when no token association could be found.
-#: lib/apioauthstore.php:151
 msgid ""
 "Could not find a profile and application associated with the request token."
 msgstr "Не можев да пронајдам профил и програм поврзан со жетонот за барање."
 
 #. TRANS: Exception thrown when no access token can be issued.
-#: lib/apioauthstore.php:209
 msgid "Could not issue access token."
 msgstr "Не можев да го издадам жетонот за пристап."
 
-#: lib/apioauthstore.php:317
 msgid "Database error inserting OAuth application user."
 msgstr ""
 "Грешка во базата на податоци при вметнувањето на корисникот на OAuth-"
 "програмот."
 
-#: lib/apioauthstore.php:345
 msgid "Database error updating OAuth application user."
 msgstr ""
 "Грешка во базата на податоци при подновата на корисникот на OAuth-програмот."
 
 #. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
-#: lib/apioauthstore.php:371
 msgid "Tried to revoke unknown token."
 msgstr "Се обидовте да отповикате непознат жетон."
 
 #. TRANS: Exception thrown when an attempt is made to remove a revoked token.
-#: lib/apioauthstore.php:376
 msgid "Failed to delete revoked token."
 msgstr "Не успеав да го избришам отповиканиот жетон."
 
 #. TRANS: Form input field label for application icon.
-#: lib/applicationeditform.php:177
 msgid "Icon"
 msgstr "Икона"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:182
 msgid "Icon for this application"
 msgstr "Икона за овој програм"
 
 #. TRANS: Form input field instructions.
 #. TRANS: %d is the number of available characters for the description.
-#: lib/applicationeditform.php:201
 #, php-format
 msgid "Describe your application in %d character"
 msgid_plural "Describe your application in %d characters"
@@ -7713,206 +6325,167 @@ msgstr[0] "Опишете го програмот со %d знак"
 msgstr[1] "Опишете го програмот со %d знака"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:205
 msgid "Describe your application"
 msgstr "Опишете го Вашиот програм"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:216
 msgid "URL of the homepage of this application"
 msgstr "URL на страницата на програмот"
 
 #. TRANS: Form input field label.
-#: lib/applicationeditform.php:218
 msgid "Source URL"
 msgstr "Изворна URL-адреса"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:225
 msgid "Organization responsible for this application"
 msgstr "Организацијата одговорна за овој програм"
 
 #. TRANS: Form input field label.
-#: lib/applicationeditform.php:227
 msgid "Organization"
 msgstr "Организација"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:234
 msgid "URL for the homepage of the organization"
 msgstr "URL на страницата на организацијата"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:243
 msgid "URL to redirect to after authentication"
 msgstr "URL за пренасочување по заверката"
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:271
 msgid "Browser"
 msgstr "Прелистувач"
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:288
 msgid "Desktop"
 msgstr "Работна површина"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:290
 msgid "Type of application, browser or desktop"
 msgstr "Тип на програм, прелистувач или работна површина"
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:314
 msgid "Read-only"
 msgstr "Само читање"
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:334
 msgid "Read-write"
 msgstr "Читање-пишување"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:336
 msgid "Default access for this application: read-only, or read-write"
 msgstr ""
 "Основно-зададен пристап за овој програм: само читање, или читање-пишување"
 
 #. TRANS: Submit button title.
-#: lib/applicationeditform.php:353
 msgid "Cancel"
 msgstr "Откажи"
 
-#: lib/applicationlist.php:247
 msgid " by "
 msgstr " од "
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:260
 msgid "read-write"
 msgstr "читање-пишување"
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:262
 msgid "read-only"
 msgstr "само читање"
 
 #. TRANS: Used in application list. %1$s is a modified date, %2$s is access type ("read-write" or "read-only")
-#: lib/applicationlist.php:268
 #, php-format
 msgid "Approved %1$s - \"%2$s\" access."
 msgstr "Одобрено %1$s - „%2$s“ пристап."
 
 #. TRANS: Access token in the application list.
 #. TRANS: %s are the first 7 characters of the access token.
-#: lib/applicationlist.php:282
 #, php-format
 msgid "Access token starting with: %s"
 msgstr "Пристапен жетон што почнува со: %s"
 
 #. TRANS: Button label
-#: lib/applicationlist.php:298
 msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "Одземи"
 
-#: lib/atom10feed.php:113
 msgid "Author element must contain a name element."
 msgstr "Авторскиот елемент мора да содржи елемент за име."
 
 #. TRANS: Server exception thrown when using the method setActivitySubject() in the class Atom10Feed.
-#: lib/atom10feed.php:160
 msgid "Do not use this method!"
 msgstr "Не користете го овој метод!"
 
 #. TRANS: Title.
-#: lib/attachmentnoticesection.php:67
 msgid "Notices where this attachment appears"
 msgstr "Забелешки кадешто се јавува овој прилог"
 
 #. TRANS: Title.
-#: lib/attachmenttagcloudsection.php:48
 msgid "Tags for this attachment"
 msgstr "Ознаки за овој прилог"
 
 #. TRANS: Exception thrown when a password change fails.
-#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:227
 msgid "Password changing failed."
 msgstr "Промената на лозинката не успеа."
 
 #. TRANS: Exception thrown when a password change attempt fails because it is not allowed.
-#: lib/authenticationplugin.php:238
 msgid "Password changing is not allowed."
 msgstr "Менувањето на лозинки не е дозволено."
 
 #. TRANS: Title for the form to block a user.
-#: lib/blockform.php:68
 msgid "Block"
 msgstr "Блокирај"
 
 #. TRANS: Description of the form to block a user.
-#: lib/blockform.php:79
 msgid "Block this user"
 msgstr "Блокирај го корисников"
 
 #. TRANS: Title for command results.
-#: lib/channel.php:104 lib/channel.php:125
 msgid "Command results"
 msgstr "Резултати од наредбата"
 
 #. TRANS: Title for command results.
-#: lib/channel.php:138
 msgid "AJAX error"
 msgstr "AJAX-грешка"
 
 #. TRANS: E-mail subject when a command has completed.
-#: lib/channel.php:177 lib/mailhandler.php:143
 msgid "Command complete"
 msgstr "Наредбата е завршена"
 
 #. TRANS: E-mail subject when a command has failed.
-#: lib/channel.php:188
 msgid "Command failed"
 msgstr "Наредбата не успеа"
 
 #. TRANS: Command exception text shown when a notice ID is requested that does not exist.
-#: lib/command.php:82 lib/command.php:106
 msgid "Notice with that id does not exist."
 msgstr "Не постои забелешка со таков id."
 
 #. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
 #. TRANS: Error text shown when a last user notice is requested and it does not exist.
-#: lib/command.php:99 lib/command.php:642
 msgid "User has no last notice."
 msgstr "Корисникот нема последна забелешка"
 
 #. TRANS: Message given requesting a profile for a non-existing user.
 #. TRANS: %s is the nickname of the user for which the profile could not be found.
-#: lib/command.php:128
 #, php-format
 msgid "Could not find a user with nickname %s."
 msgstr "Не можев да пронајдам корисник со прекар %s."
 
 #. TRANS: Message given getting a non-existing user.
 #. TRANS: %s is the nickname of the user that could not be found.
-#: lib/command.php:148
 #, php-format
 msgid "Could not find a local user with nickname %s."
 msgstr "Не можев да најдам локален корисник со прекар %s."
 
 #. TRANS: Error text shown when an unimplemented command is given.
-#: lib/command.php:183
 msgid "Sorry, this command is not yet implemented."
 msgstr "Жалиме, оваа наредба сè уште не е имплементирана."
 
 #. TRANS: Command exception text shown when a user tries to nudge themselves.
-#: lib/command.php:229
 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr "Нема баш логика да се подбуцнувате сами себеси."
 
 #. TRANS: Message given having nudged another user.
 #. TRANS: %s is the nickname of the user that was nudged.
-#: lib/command.php:238
 #, php-format
 msgid "Nudge sent to %s."
 msgstr "Испратено подбуцнување на %s."
@@ -7921,7 +6494,6 @@ msgstr "Испратено подбуцнување на %s."
 #. TRANS: %1$s is the number of other user the user is subscribed to.
 #. TRANS: %2$s is the number of users that are subscribed to the user.
 #. TRANS: %3$s is the number of notices the user has sent.
-#: lib/command.php:268
 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"
@@ -7933,40 +6505,33 @@ msgstr ""
 "Забелешки: %3$s"
 
 #. TRANS: Error message text shown when a favorite could not be set because it has already been favorited.
-#: lib/command.php:298
-#, fuzzy
 msgid "Could not create favorite: already favorited."
-msgstr "Не можам да создадам бендисана забелешка."
+msgstr "Не можев да создадам бендисана забелешка: веќе Ви е бендисана."
 
 #. TRANS: Text shown when a notice has been marked as favourite successfully.
-#: lib/command.php:324
 msgid "Notice marked as fave."
 msgstr "Забелешката е обележана како бендисана."
 
 #. TRANS: Message given having added a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:369
 #, php-format
 msgid "%1$s joined group %2$s."
 msgstr "%1$s се зачлени во групата %2$s."
 
 #. TRANS: Message given having removed a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:417
 #, php-format
 msgid "%1$s left group %2$s."
 msgstr "%1$s ја напушти групата %2$s."
 
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: lib/command.php:438
 #, php-format
 msgctxt "WHOIS"
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
 
 #. TRANS: Whois output. %s is the full name of the queried user.
-#: lib/command.php:442
 #, php-format
 msgid "Fullname: %s"
 msgstr "Име и презиме: %s"
@@ -7974,7 +6539,6 @@ msgstr "Име и презиме: %s"
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a location.
-#: lib/command.php:446 lib/mail.php:275
 #, php-format
 msgid "Location: %s"
 msgstr "Местоположба: %s"
@@ -7982,20 +6546,17 @@ msgstr "Местоположба: %s"
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a homepage.
-#: lib/command.php:450 lib/mail.php:279
 #, php-format
 msgid "Homepage: %s"
 msgstr "Домашна страница: %s"
 
 #. TRANS: Whois output. %s is the bio information of the queried user.
-#: lib/command.php:454
 #, php-format
 msgid "About: %s"
 msgstr "За: %s"
 
 #. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).
 #. TRANS: %s is a remote profile.
-#: lib/command.php:483
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
@@ -8006,7 +6567,6 @@ msgstr ""
 
 #. TRANS: Message given if content is too long. %1$sd is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:500
 #, php-format
 msgid "Message too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
@@ -8015,26 +6575,26 @@ msgstr[0] ""
 msgstr[1] ""
 "Пораката е предолга - дозволени се највеќе %1$d знаци, а Вие испративте %2$d."
 
+#. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
+msgid "You can't send a message to this user."
+msgstr "Не можете да испратите порака до овојо корисник."
+
 #. TRANS: Error text shown sending a direct message fails with an unknown reason.
-#: lib/command.php:528
 msgid "Error sending direct message."
 msgstr "Грашка при испаќањето на директната порака."
 
 #. TRANS: Message given having repeated a notice from another user.
 #. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:565
 #, php-format
 msgid "Notice from %s repeated."
 msgstr "Забелешката од %s е повторена."
 
 #. TRANS: Error text shown when repeating a notice fails with an unknown reason.
-#: lib/command.php:568
 msgid "Error repeating notice."
 msgstr "Грешка при повторувањето на белешката."
 
 #. TRANS: Message given if content of a notice for a reply is too long. %1$d is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:603
 #, php-format
 msgid "Notice too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Notice too long - maximum is %1$d characters, you sent %2$d."
@@ -8047,100 +6607,83 @@ msgstr[1] ""
 
 #. TRANS: Text shown having sent a reply to a notice successfully.
 #. TRANS: %s is the nickname of the user of the notice the reply was sent to.
-#: lib/command.php:616
 #, php-format
 msgid "Reply to %s sent."
 msgstr "Одговорот на %s е испратен."
 
 #. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
-#: lib/command.php:619
 msgid "Error saving notice."
 msgstr "Грешка при зачувувањето на белешката."
 
 #. TRANS: Error text shown when no username was provided when issuing a subscribe command.
-#: lib/command.php:666
 msgid "Specify the name of the user to subscribe to."
 msgstr "Назначете го името на корисникот на којшто сакате да се претплатите."
 
 #. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
-#: lib/command.php:675
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "Не можете да се претплаќате на OMB профили по наредба."
 
 #. TRANS: Text shown after having subscribed to another user successfully.
 #. TRANS: %s is the name of the user the subscription was requested for.
-#: lib/command.php:683
 #, php-format
 msgid "Subscribed to %s."
 msgstr "Претплатено на %s."
 
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.
-#: lib/command.php:704 lib/command.php:815
 msgid "Specify the name of the user to unsubscribe from."
 msgstr "Назначете го името на корисникот од кого откажувате претплата."
 
 #. TRANS: Text shown after having unsubscribed from another user successfully.
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:715
 #, php-format
 msgid "Unsubscribed from %s."
 msgstr "Откажана претплата на %s."
 
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
-#: lib/command.php:735 lib/command.php:761
 msgid "Command not yet implemented."
 msgstr "Наредбата сè уште не е имплементирана."
 
 #. TRANS: Text shown when issuing the command "off" successfully.
-#: lib/command.php:739
 msgid "Notification off."
 msgstr "Известувањето е исклучено."
 
 #. TRANS: Error text shown when the command "off" fails for an unknown reason.
-#: lib/command.php:742
 msgid "Can't turn off notification."
 msgstr "Не можам да исклучам известување."
 
 #. TRANS: Text shown when issuing the command "on" successfully.
-#: lib/command.php:765
 msgid "Notification on."
 msgstr "Известувањето е вклучено."
 
 #. TRANS: Error text shown when the command "on" fails for an unknown reason.
-#: lib/command.php:768
 msgid "Can't turn on notification."
 msgstr "Не можам да вклучам известување."
 
 #. TRANS: Error text shown when issuing the login command while login is disabled.
-#: lib/command.php:782
 msgid "Login command is disabled."
 msgstr "Наредбата за најава е оневозможена."
 
 #. TRANS: Text shown after issuing the login command successfully.
 #. TRANS: %s is a logon link..
-#: lib/command.php:795
 #, php-format
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr "Оваа врска може да се употреби само еднаш, и трае само 2 минути: %s"
 
 #. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:824
 #, php-format
 msgid "Unsubscribed %s."
 msgstr "Откажана претплата на %s."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
-#: lib/command.php:842
 msgid "You are not subscribed to anyone."
 msgstr "Не сте претплатени никому."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
-#: lib/command.php:847
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Не ни го испративте тој профил."
@@ -8148,14 +6691,12 @@ msgstr[1] "Не ни го испративте тој профил."
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user
 #. TRANS: (followers) without having any subscribers.
-#: lib/command.php:869
 msgid "No one is subscribed to you."
 msgstr "Никој не е претплатен на Вас."
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
-#: lib/command.php:874
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Оддалечена претплата"
@@ -8163,21 +6704,18 @@ msgstr[1] "Оддалечена претплата"
 
 #. TRANS: Text shown after requesting groups a user is subscribed to without having
 #. TRANS: any group subscriptions.
-#: lib/command.php:896
 msgid "You are not a member of any groups."
 msgstr "Не членувате во ниедна група."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
-#: lib/command.php:901
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "Не ни го испративте тој профил."
 msgstr[1] "Не ни го испративте тој профил."
 
 #. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-#: lib/command.php:916
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -8257,218 +6795,173 @@ msgstr ""
 "tracking - сè уште не е имплементирано.\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:36
 msgid "No configuration file found."
 msgstr "Нема пронајдено податотека со поставки."
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:39
 msgid "I looked for configuration files in the following places:"
 msgstr "Пребарав податотеки со поставки на следниве места:"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:42
 msgid "You may wish to run the installer to fix this."
 msgstr "Препорачуваме да го пуштите инсталатерот за да го поправите ова."
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:46
 msgid "Go to the installer."
 msgstr "Оди на инсталаторот."
 
-#: lib/dberroraction.php:59
 msgid "Database error"
 msgstr "Грешка во базата на податоци"
 
 #. TRANS: Description of form for deleting a user.
-#: lib/deleteuserform.php:75
 msgid "Delete this user"
 msgstr "Избриши овој корисник"
 
-#: lib/designform.php:114
-#, fuzzy
 msgid "Change design"
-msgstr "Зачувај изглед"
+msgstr "Измени изглед"
 
 #. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: lib/designform.php:131
 msgid "Change colours"
 msgstr "Промена на бои"
 
 #. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: lib/designform.php:138
 msgid "Use defaults"
 msgstr "Користи по основно"
 
 #. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: lib/designform.php:140
 msgid "Restore default designs"
 msgstr "Врати основно-зададени нагодувања"
 
 #. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: lib/designform.php:148
 msgid "Reset back to default"
 msgstr "Врати по основно"
 
 #. TRANS: Label in form on profile design page.
 #. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
-#: lib/designform.php:158
 msgid "Upload file"
 msgstr "Подигање"
 
 #. TRANS: Instructions for form on profile design page.
-#: lib/designform.php:163
-#, fuzzy
 msgid ""
 "You can upload your personal background image. The maximum file size is 2Mb."
 msgstr ""
-"Можете да подигнете лична позадинска слика. Максималната дозволена големина "
-"изнесува 2МБ."
+"Можете да подигнете Ваша лична позадинска слика. Максималната дозволена "
+"големина изнесува 2 МБ."
 
 #. TRANS: Radio button on profile design page that will enable use of the uploaded profile image.
-#: lib/designform.php:194
 msgctxt "RADIO"
 msgid "On"
 msgstr "Вкл."
 
 #. TRANS: Radio button on profile design page that will disable use of the uploaded profile image.
-#: lib/designform.php:211
 msgctxt "RADIO"
 msgid "Off"
 msgstr "Искл."
 
 #. TRANS: Title for button on profile design page to save settings.
-#: lib/designform.php:322
 msgid "Save design"
 msgstr "Зачувај изглед"
 
 #. TRANS: Error message displayed if design settings could not be saved.
 #. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
-#: lib/designsettings.php:216 lib/designsettings.php:238
 msgid "Couldn't update your design."
 msgstr "Не можев да го подновам Вашиот изглед."
 
 #. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
-#: lib/designsettings.php:244
 msgid "Design defaults restored."
 msgstr "Основно-зададениот изглед е вратен."
 
 #. TRANS: Exception. %s is an ID.
-#: lib/discovery.php:153
 #, php-format
 msgid "Unable to find services for %s."
 msgstr "Не можам да пронајдам служби за: %s."
 
 #. TRANS: Form legend for removing the favourite status for a favourite notice.
 #. TRANS: Title for button text for removing the favourite status for a favourite notice.
-#: lib/disfavorform.php:108 lib/disfavorform.php:140
 msgid "Disfavor this notice"
 msgstr "Одбендисај ја забелешкава"
 
 #. TRANS: Button text for removing the favourite status for a favourite notice.
-#: lib/disfavorform.php:136
 msgctxt "BUTTON"
 msgid "Disfavor favorite"
 msgstr "Тргни од бендисани"
 
 #. TRANS: Form legend for adding the favourite status to a notice.
 #. TRANS: Title for button text for adding the favourite status to a notice.
-#: lib/favorform.php:108 lib/favorform.php:139
 msgid "Favor this notice"
 msgstr "Бендисај ја забелешкава"
 
 #. TRANS: Button text for adding the favourite status to a notice.
-#: lib/favorform.php:135
 msgctxt "BUTTON"
 msgid "Favor"
 msgstr "Бендисај"
 
-#: lib/feed.php:84
 msgid "RSS 1.0"
 msgstr "RSS 1.0"
 
-#: lib/feed.php:86
 msgid "RSS 2.0"
 msgstr "RSS 2.0"
 
-#: lib/feed.php:88
 msgid "Atom"
 msgstr "Atom"
 
-#: lib/feed.php:90
 msgid "FOAF"
 msgstr "FOAF"
 
-#: lib/feedimporter.php:75
 msgid "Not an atom feed."
 msgstr "Ова не е Atom-канал."
 
-#: lib/feedimporter.php:82
 msgid "No author in the feed."
 msgstr "Нема автор во емитувањето."
 
-#: lib/feedimporter.php:89
 msgid "Can't import without a user."
 msgstr "Не можам да увезам без корисник."
 
 #. TRANS: Header for feed links (h2).
-#: lib/feedlist.php:66
 msgid "Feeds"
 msgstr "Канали"
 
-#: lib/galleryaction.php:128
 msgid "All"
 msgstr "Сè"
 
-#: lib/galleryaction.php:136
 msgid "Select tag to filter"
 msgstr "Одберете ознака за филтрирање"
 
-#: lib/galleryaction.php:137
 msgid "Tag"
 msgstr "Ознака"
 
-#: lib/galleryaction.php:138
 msgid "Choose a tag to narrow list"
 msgstr "Одберете ознака за да го ограничите списокот"
 
-#: lib/galleryaction.php:140
 msgid "Go"
 msgstr "Оди"
 
-#: lib/grantroleform.php:91
 #, php-format
 msgid "Grant this user the \"%s\" role"
 msgstr "Додели улога „%s“ на корисников"
 
-#: lib/groupeditform.php:147
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "1-64 мали букви или бројки, без интерпукциски знаци и празни места."
 
-#: lib/groupeditform.php:156
 msgid "URL of the homepage or blog of the group or topic."
 msgstr "URL на страницата или блогот на групата или темата"
 
-#: lib/groupeditform.php:161
 msgid "Describe the group or topic"
 msgstr "Опишете ја групата или темата"
 
-#: lib/groupeditform.php:163
 #, php-format
 msgid "Describe the group or topic in %d character or less"
 msgid_plural "Describe the group or topic in %d characters or less"
 msgstr[0] "Опишете ја групата или темата со највеќе %d знак"
 msgstr[1] "Опишете ја групата или темата со највеќе %d знаци"
 
-#: lib/groupeditform.php:175
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\"."
 msgstr ""
 "Местоположба на групата (ако има). На пр. „Град, Сој. држава/област, Земја“"
 
-#: lib/groupeditform.php:183
 #, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -8484,70 +6977,60 @@ msgstr[1] ""
 "највеќе до %d"
 
 #. TRANS: Menu item in the group navigation page.
-#: lib/groupnav.php:86
 msgctxt "MENU"
 msgid "Group"
 msgstr "Група"
 
 #. TRANS: Tooltip for menu item in the group navigation page.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:89
 #, php-format
 msgctxt "TOOLTIP"
 msgid "%s group"
 msgstr "Група „%s“"
 
 #. TRANS: Menu item in the group navigation page.
-#: lib/groupnav.php:95
 msgctxt "MENU"
 msgid "Members"
 msgstr "Членови"
 
 #. TRANS: Tooltip for menu item in the group navigation page.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:98
 #, php-format
 msgctxt "TOOLTIP"
 msgid "%s group members"
 msgstr "Членови на групата „%s“"
 
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/groupnav.php:108
 msgctxt "MENU"
 msgid "Blocked"
 msgstr "Блокирани"
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:111
 #, php-format
 msgctxt "TOOLTIP"
 msgid "%s blocked users"
 msgstr "Блокирани корисници од групата „%s“"
 
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "Админ"
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:120
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Edit %s group properties"
 msgstr "Уредување на својства на групата „%s“"
 
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/groupnav.php:126
 msgctxt "MENU"
 msgid "Logo"
 msgstr "Лого"
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:129
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Add or edit %s logo"
@@ -8555,69 +7038,57 @@ msgstr "Додавање или уредување на лого на група
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:138
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Add or edit %s design"
 msgstr "Додавање или уредување на изгледот на групата „%s“"
 
 #. TRANS: Title for groups with the most members section.
-#: lib/groupsbymemberssection.php:71
 msgid "Groups with most members"
 msgstr "Групи со највеќе членови"
 
 #. TRANS: Title for groups with the most posts section.
-#: lib/groupsbypostssection.php:71
 msgid "Groups with most posts"
 msgstr "Групи со највеќе објави"
 
 #. TRANS: Title for group tag cloud section.
 #. TRANS: %s is a group name.
-#: lib/grouptagcloudsection.php:57
 #, php-format
 msgid "Tags in %s group's notices"
 msgstr "Ознаки во забелешките на групата %s"
 
 #. TRANS: Client exception 406
-#: lib/htmloutputter.php:104
 msgid "This page is not available in a media type you accept"
 msgstr "Оваа страница не е достапна во форматот кој Вие го прифаќате."
 
 #. TRANS: Exception thrown when trying to upload an unsupported image file format.
-#: lib/imagefile.php:73
 msgid "Unsupported image file format."
 msgstr "Неподдржан фомрат на слики."
 
 #. TRANS: Exception thrown when too large a file is uploaded.
 #. TRANS: %s is the maximum file size, for example "500b", "10kB" or "2MB".
-#: lib/imagefile.php:91
 #, php-format
 msgid "That file is too big. The maximum file size is %s."
 msgstr "Податотеката е преголема. Максималната дозволена големина изнесува %s."
 
 #. TRANS: Exception thrown when uploading an image and that action could not be completed.
-#: lib/imagefile.php:97
 msgid "Partial upload."
 msgstr "Делумно подигање."
 
 #. TRANS: Exception thrown when uploading a file as image that is not an image or is a corrupt file.
-#: lib/imagefile.php:115
 msgid "Not an image or corrupt file."
 msgstr "Не е слика или податотеката е пореметена."
 
 #. TRANS: Exception thrown during resize when image has been registered as present, but is no longer there.
-#: lib/imagefile.php:178
 msgid "Lost our file."
 msgstr "Податотеката е изгубена."
 
 #. TRANS: Exception thrown when trying to resize an unknown file type.
 #. TRANS: Exception thrown when trying resize an unknown file type.
-#: lib/imagefile.php:216 lib/imagefile.php:257
 msgid "Unknown file type"
 msgstr "Непознат тип на податотека"
 
 #. TRANS: Number of megabytes. %d is the number.
-#: lib/imagefile.php:303
 #, php-format
 msgid "%dMB"
 msgid_plural "%dMB"
@@ -8625,7 +7096,6 @@ msgstr[0] "%d МБ"
 msgstr[1] "%d МБ"
 
 #. TRANS: Number of kilobytes. %d is the number.
-#: lib/imagefile.php:307
 #, php-format
 msgid "%dkB"
 msgid_plural "%dkB"
@@ -8633,14 +7103,12 @@ msgstr[0] "%d кБ"
 msgstr[1] "%d кБ"
 
 #. TRANS: Number of bytes. %d is the number.
-#: lib/imagefile.php:310
 #, php-format
 msgid "%dB"
 msgid_plural "%dB"
 msgstr[0] "%d Б"
 msgstr[1] "%d Б"
 
-#: lib/implugin.php:262
 #, php-format
 msgid ""
 "User \"%s\" on %s has said that your %s screenname belongs to them. If "
@@ -8649,53 +7117,49 @@ msgid ""
 "user isn't you, or if you didn't request this confirmation, just ignore this "
 "message."
 msgstr ""
+"Корисникот „%s“ на %s има изјавено дека Вашиот прекар на %s е негов. Ако ова "
+"е вистина, можете да потврдите стискајќи на оваа URL-адреса: %s . (Ако не "
+"можете да јс стиснете, прекопирајте ја во адресната лента на прелистувачот). "
+"Ако ова не сте Вие, или ако не ја имате побарано оваа потврда, слободно "
+"занемарете ја поракава."
 
-#: lib/implugin.php:349
 #, php-format
 msgid "Unknown inbox source %d."
 msgstr "Непознат извор на приемна пошта %d."
 
-#: lib/implugin.php:485
-#, fuzzy, php-format
+#, php-format
 msgid "Message too long - maximum is %1$d characters, you sent %2$d."
 msgstr ""
-"Пораката е предолга - дозволен е највеќе %1$d знак, а Вие испративте %2$d."
+"Пораката е предолга - дозволени се највеќе %1$d знаци, а вие испративте %2$d."
 
-#: lib/leaveform.php:114
 msgid "Leave"
 msgstr "Напушти"
 
 #. TRANS: Menu item for logging in to the StatusNet site.
-#: lib/logingroupnav.php:77
 msgctxt "MENU"
 msgid "Login"
 msgstr "Најава"
 
 #. TRANS: Title for menu item for logging in to the StatusNet site.
-#: lib/logingroupnav.php:79
 msgid "Login with a username and password"
 msgstr "Најава со корисничко име и лозинка"
 
 #. TRANS: Menu item for registering with the StatusNet site.
-#: lib/logingroupnav.php:85
 msgctxt "MENU"
 msgid "Register"
 msgstr "Регистрација"
 
 #. TRANS: Title for menu item for registering with the StatusNet site.
-#: lib/logingroupnav.php:87
 msgid "Sign up for a new account"
 msgstr "Создај нова сметка"
 
 #. TRANS: Subject for address confirmation email.
-#: lib/mail.php:172
 msgid "Email address confirmation"
 msgstr "Потврдување на адресата"
 
 #. TRANS: Body for address confirmation email.
 #. TRANS: %1$s is the addressed user's nickname, %2$s is the StatusNet sitename,
 #. TRANS: %3$s is the URL to confirm at.
-#: lib/mail.php:177
 #, php-format
 msgid ""
 "Hey, %1$s.\n"
@@ -8727,14 +7191,12 @@ msgstr ""
 
 #. TRANS: Subject of new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
-#: lib/mail.php:243
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1$s сега ги следи Вашите забелешки на %2$s."
 
 #. TRANS: This is a paragraph in a new-subscriber e-mail.
 #. TRANS: %s is a URL where the subscriber can be reported as abusive.
-#: lib/mail.php:250
 #, php-format
 msgid ""
 "If you believe this account is being used abusively, you can block them from "
@@ -8749,7 +7211,6 @@ msgstr ""
 #. TRANS: %3$s is the subscriber's profile URL, %4$s is the subscriber's location (or empty)
 #. TRANS: %5$s is the subscriber's homepage URL (or empty), %6%s is the subscriber's bio (or empty)
 #. TRANS: %7$s is a link to the addressed user's e-mail settings.
-#: lib/mail.php:260
 #, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -8777,14 +7238,12 @@ msgstr ""
 
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is biographical information.
-#: lib/mail.php:283
 #, php-format
 msgid "Bio: %s"
 msgstr "Биографија: %s"
 
 #. TRANS: Subject of notification mail for new posting email address.
 #. TRANS: %s is the StatusNet sitename.
-#: lib/mail.php:312
 #, php-format
 msgid "New email address for posting to %s"
 msgstr "Нова е-поштенска адреса за објавување на %s"
@@ -8792,7 +7251,6 @@ msgstr "Нова е-поштенска адреса за објавување н
 #. TRANS: Body of notification mail for new posting email address.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is the e-mail address to send
 #. TRANS: to to post by e-mail, %3$s is a URL to more instructions.
-#: lib/mail.php:318
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -8815,26 +7273,22 @@ msgstr ""
 
 #. TRANS: Subject line for SMS-by-email notification messages.
 #. TRANS: %s is the posting user's nickname.
-#: lib/mail.php:439
 #, php-format
 msgid "%s status"
 msgstr "Статус на %s"
 
 #. TRANS: Subject line for SMS-by-email address confirmation message.
-#: lib/mail.php:465
 msgid "SMS confirmation"
 msgstr "Потврда за СМС"
 
 #. TRANS: Main body heading for SMS-by-email address confirmation message.
 #. TRANS: %s is the addressed user's nickname.
-#: lib/mail.php:469
 #, php-format
 msgid "%s: confirm you own this phone number with this code:"
 msgstr "%s: потврдете го како свој телефонскиов број со следниов код:"
 
 #. TRANS: Subject for 'nudge' notification email.
 #. TRANS: %s is the nudging user.
-#: lib/mail.php:490
 #, php-format
 msgid "You have been nudged by %s"
 msgstr "%s Ве подбуцна"
@@ -8842,7 +7296,6 @@ msgstr "%s Ве подбуцна"
 #. TRANS: Body for 'nudge' notification email.
 #. TRANS: %1$s is the nuding user's long name, $2$s is the nudging user's nickname,
 #. TRANS: %3$s is a URL to post notices at, %4$s is the StatusNet sitename.
-#: lib/mail.php:497
 #, php-format
 msgid ""
 "%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -8871,7 +7324,6 @@ msgstr ""
 
 #. TRANS: Subject for direct-message notification email.
 #. TRANS: %s is the sending user's nickname.
-#: lib/mail.php:544
 #, php-format
 msgid "New private message from %s"
 msgstr "Нова приватна порака од %s"
@@ -8880,7 +7332,6 @@ msgstr "Нова приватна порака од %s"
 #. TRANS: %1$s is the sending user's long name, %2$s is the sending user's nickname,
 #. TRANS: %3$s is the message content, %4$s a URL to the message,
 #. TRANS: %5$s is the StatusNet sitename.
-#: lib/mail.php:552
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -8915,7 +7366,6 @@ msgstr ""
 
 #. TRANS: Subject for favorite notification e-mail.
 #. TRANS: %1$s is the adding user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:604
 #, php-format
 msgid "%1$s (@%2$s) added your notice as a favorite"
 msgstr "%1$s (@%2$s) ја бендиса вашата забелешка"
@@ -8925,7 +7375,6 @@ msgstr "%1$s (@%2$s) ја бендиса вашата забелешка"
 #. TRANS: %3$s is a URL to the faved notice, %4$s is the faved notice text,
 #. TRANS: %5$s is a URL to all faves of the adding user, %6$s is the StatusNet sitename,
 #. TRANS: %7$s is the adding user's nickname.
-#: lib/mail.php:611
 #, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -8963,7 +7412,6 @@ msgstr ""
 "%6$s\n"
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:669
 #, php-format
 msgid ""
 "The full conversation can be read here:\n"
@@ -8976,7 +7424,6 @@ msgstr ""
 
 #. TRANS: E-mail subject for notice notification.
 #. TRANS: %1$s is the sending user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:677
 #, php-format
 msgid "%1$s (@%2$s) sent a notice to your attention"
 msgstr "%1$s (@%2$s) Ви испрати забелешка што сака да ја прочитате"
@@ -8987,7 +7434,6 @@ msgstr "%1$s (@%2$s) Ви испрати забелешка што сака да
 #. TRANS: %5$s is a URL to the full conversion if it exists (otherwise empty),
 #. TRANS: %6$s is a URL to reply to the notice, %7$s is a URL to all @-replied for the addressed user,
 #. TRANS: %8$s is a URL to the addressed user's e-mail settings, %9$s is the sender's nickname.
-#: lib/mail.php:685
 #, php-format
 msgid ""
 "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -9037,11 +7483,9 @@ msgstr ""
 "\n"
 "П.С. Можете да ги исклучите овие известувања по е-пошта тука: %8$s\n"
 
-#: lib/mailbox.php:87
 msgid "Only the user can read their own mailboxes."
 msgstr "Само корисникот може да го чита своето сандаче."
 
-#: lib/mailbox.php:125
 msgid ""
 "You have no private messages. You can send private message to engage other "
 "users in conversation. People can send you messages for your eyes only."
@@ -9050,55 +7494,45 @@ msgstr ""
 "впуштите во разговор со други корисници. Луѓето можат да Ви испраќаат пораки "
 "што ќе можете да ги видите само Вие."
 
-#: lib/mailhandler.php:37
 msgid "Could not parse message."
 msgstr "Не можев да ја парсирам пораката."
 
-#: lib/mailhandler.php:42
 msgid "Not a registered user."
 msgstr "Тоа не е регистриран корисник."
 
-#: lib/mailhandler.php:46
 msgid "Sorry, that is not your incoming email address."
 msgstr "Жалиме, но тоа не е Вашата приемна е-поштенска адреса."
 
-#: lib/mailhandler.php:50
 msgid "Sorry, no incoming email allowed."
 msgstr "Жалиме, приемната пошта не е дозволена."
 
-#: lib/mailhandler.php:229
 #, php-format
 msgid "Unsupported message type: %s"
 msgstr "Неподдржан формат на порака: %s"
 
 #. TRANS: Client exception thrown when a database error was thrown during a file upload operation.
-#: lib/mediafile.php:102 lib/mediafile.php:174
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
 "Се појави грешка во базата на податоци при зачувувањето на Вашата "
 "податотека. Обидете се повторно."
 
 #. TRANS: Client exception thrown when a file upload operation would cause a user to exceed a set quota.
-#: lib/mediafile.php:238 lib/mediafile.php:281
 msgid "File exceeds user's quota."
 msgstr "Податотеката ја надминува квотата на корисникот."
 
 #. TRANS: Client exception thrown when a file upload operation fails because the file could
 #. TRANS: not be moved from the temporary folder to the permanent file location.
-#: lib/mediafile.php:258 lib/mediafile.php:300
 msgid "File could not be moved to destination directory."
 msgstr "Податотеката не може да се премести во целниот директориум."
 
 #. TRANS: Client exception thrown when a file upload operation has been stopped because the MIME
 #. TRANS: type of the uploaded file could not be determined.
-#: lib/mediafile.php:265 lib/mediafile.php:306
 msgid "Could not determine file's MIME type."
 msgstr "Не можев да го утврдам mime-типот на податотеката."
 
 #. TRANS: Client exception thrown trying to upload a forbidden MIME type.
 #. TRANS: %1$s is the file type that was denied, %2$s is the application part of
 #. TRANS: the MIME type that was denied.
-#: lib/mediafile.php:396
 #, php-format
 msgid ""
 "\"%1$s\" is not a supported file type on this server. Try using another %2$s "
@@ -9109,81 +7543,72 @@ msgstr ""
 
 #. TRANS: Client exception thrown trying to upload a forbidden MIME type.
 #. TRANS: %s is the file type that was denied.
-#: lib/mediafile.php:401
 #, php-format
 msgid "\"%s\" is not a supported file type on this server."
 msgstr "„%s„ не е поддржан податотечен тип на овој опслужувач."
 
-#: lib/messageform.php:120
 msgid "Send a direct notice"
 msgstr "Испрати директна забелешка"
 
 #. TRANS Label entry in drop-down selection box in direct-message inbox/outbox. This is the default entry in the drop-down box, doubling as instructions and a brake against accidental submissions with the first user in the list.
-#: lib/messageform.php:137
 msgid "Select recipient:"
 msgstr "Оберете примач:"
 
 #. TRANS Entry in drop-down selection box in direct-message inbox/outbox when no one is available to message.
-#: lib/messageform.php:150
 msgid "No mutual subscribers."
 msgstr "Нема заемни претплатници."
 
-#: lib/messageform.php:153
 msgid "To"
 msgstr "За"
 
-#: lib/messageform.php:184 lib/noticeform.php:236
 msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr "Испрати"
 
-#: lib/messagelist.php:77
 msgid "Messages"
 msgstr "Пораки"
 
-#: lib/messagelistitem.php:123 lib/noticelist.php:527
 msgid "from"
 msgstr "од"
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:178
 msgid "Nickname cannot be empty."
 msgstr "Прекарот не може да стои празен."
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:191
 #, php-format
 msgid "Nickname cannot be more than %d character long."
 msgid_plural "Nickname cannot be more than %d characters long."
 msgstr[0] "Прекарот не смее да биде подолг од %d знак."
 msgstr[1] "Прекарот не смее да биде подолг од %d знака."
 
-#: lib/noticeform.php:160
+#. TRANS: Form legend for notice form.
 msgid "Send a notice"
 msgstr "Испрати забелешка"
 
-#: lib/noticeform.php:174
+#. TRANS: Title for notice label. %s is the user's nickname.
 #, php-format
 msgid "What's up, %s?"
 msgstr "Што има ново, %s?"
 
-#: lib/noticeform.php:193
+#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr "Приложи"
 
-#: lib/noticeform.php:197
-msgid "Attach a file"
+#. TRANS: Title for input field to attach a file to a notice.
+#, fuzzy
+msgid "Attach a file."
 msgstr "Приложи податотека"
 
-#: lib/noticeform.php:212
+#. TRANS: Field label to add location to a notice.
 msgid "Share my location"
 msgstr "Прикажи ја мојата местоположба."
 
-#: lib/noticeform.php:215
+#. TRANS: Text to not share location for a notice in notice form.
 msgid "Do not share my location"
 msgstr "Не ја прикажувај мојата местоположба"
 
-#: lib/noticeform.php:216
+#. TRANS: Timeout error text for location retrieval in notice form.
 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
 "try again later"
@@ -9192,417 +7617,316 @@ msgstr ""
 "Обидете се подоцна."
 
 #. TRANS: Used in coordinates as abbreviation of north
-#: lib/noticelist.php:457
 msgid "N"
 msgstr "С"
 
 #. TRANS: Used in coordinates as abbreviation of south
-#: lib/noticelist.php:459
 msgid "S"
 msgstr "Ј"
 
 #. TRANS: Used in coordinates as abbreviation of east
-#: lib/noticelist.php:461
 msgid "E"
 msgstr "И"
 
 #. TRANS: Used in coordinates as abbreviation of west
-#: lib/noticelist.php:463
 msgid "W"
 msgstr "З"
 
-#: lib/noticelist.php:465
 #, php-format
 msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 
-#: lib/noticelist.php:474
 msgid "at"
 msgstr "во"
 
-#: lib/noticelist.php:523
 msgid "web"
 msgstr "интернет"
 
-#: lib/noticelist.php:589
 msgid "in context"
 msgstr "во контекст"
 
-#: lib/noticelist.php:624
 msgid "Repeated by"
 msgstr "Повторено од"
 
-#: lib/noticelist.php:651
 msgid "Reply to this notice"
 msgstr "Одговори на забелешкава"
 
-#: lib/noticelist.php:652
 msgid "Reply"
 msgstr "Одговор"
 
-#: lib/noticelist.php:678
 msgid "Delete this notice"
 msgstr "Избриши ја оваа забелешка"
 
-#: lib/noticelist.php:696
 msgid "Notice repeated"
 msgstr "Забелешката е повторена"
 
-#: lib/nudgeform.php:116
 msgid "Nudge this user"
 msgstr "Подбуцни го корисников"
 
-#: lib/nudgeform.php:128
 msgid "Nudge"
 msgstr "Подбуцни"
 
-#: lib/nudgeform.php:128
 msgid "Send a nudge to this user"
 msgstr "Испрати подбуцнување на корисников"
 
-#: lib/oauthstore.php:294
 msgid "Error inserting new profile."
 msgstr "Грешка при вметнувањето на новиот профил."
 
-#: lib/oauthstore.php:302
 msgid "Error inserting avatar."
 msgstr "Грешка при вметнувањето на аватарот."
 
-#: lib/oauthstore.php:322
 msgid "Error inserting remote profile."
 msgstr "Грешка при вметнувањето на далечинскиот профил."
 
 #. TRANS: Exception thrown when a notice is denied because it has been sent before.
-#: lib/oauthstore.php:362
 msgid "Duplicate notice."
 msgstr "Дуплирана забелешка."
 
-#: lib/oauthstore.php:507
 msgid "Couldn't insert new subscription."
 msgstr "Не може да се внесе нова претплата."
 
-#: lib/personalgroupnav.php:104
-#, fuzzy
 msgid "Replies"
 msgstr "Одговори"
 
-#: lib/personalgroupnav.php:109
-#, fuzzy
 msgid "Favorites"
 msgstr "Бендисани"
 
-#: lib/personalgroupnav.php:120
-#, fuzzy
 msgid "Inbox"
 msgstr "Примени"
 
-#: lib/personalgroupnav.php:121
 msgid "Your incoming messages"
 msgstr "Ваши приемни пораки"
 
-#: lib/personalgroupnav.php:125
-#, fuzzy
 msgid "Outbox"
 msgstr "За праќање"
 
-#: lib/personalgroupnav.php:126
 msgid "Your sent messages"
 msgstr "Ваши испратени пораки"
 
 #. TRANS: Title for personal tag cloud section. %s is a user nickname.
-#: lib/personaltagcloudsection.php:56
 #, php-format
 msgid "Tags in %s's notices"
 msgstr "Ознаки во забелешките на %s"
 
 #. TRANS: Displayed as version information for a plugin if no version information was found.
-#: lib/plugin.php:126
 msgid "Unknown"
 msgstr "Непознато"
 
 #. TRANS: Plugin admin panel controls
-#: lib/plugindisableform.php:90
 msgctxt "plugin"
 msgid "Disable"
-msgstr ""
+msgstr "Оневозможи"
 
 #. TRANS: Plugin admin panel controls
-#: lib/pluginenableform.php:112
 msgctxt "plugin"
 msgid "Enable"
-msgstr ""
+msgstr "Овозможи"
 
-#: lib/pluginlist.php:196
 msgctxt "plugin-description"
 msgid "(Plugin descriptions unavailable when disabled.)"
-msgstr ""
+msgstr "(Описите на приклучоците не се достапни ако е оневозможено.)"
 
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:88
 msgid "Subscriptions"
 msgstr "Претплати"
 
 #. TRANS: Text for user subscription statistics if user has more subscriptions than displayed.
-#: lib/profileaction.php:144
 msgid "All subscriptions"
 msgstr "Сите претплати"
 
 #. TRANS: H2 text for user subscriber statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:96
 msgid "Subscribers"
 msgstr "Претплатници"
 
 #. TRANS: Text for user subscription statistics if user has more subscribers than displayed.
-#: lib/profileaction.php:181
 msgid "All subscribers"
 msgstr "Сите претплатници"
 
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:213
 msgid "User ID"
 msgstr "Кориснички ID"
 
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:219
 msgid "Member since"
 msgstr "Член од"
 
 #. TRANS: Label for user statistics.
 #. TRANS: H2 text for user group membership statistics.
-#: lib/profileaction.php:239 lib/profileaction.php:290
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:104
 msgid "Groups"
 msgstr "Групи"
 
 #. TRANS: Label for user statistics.
 #. TRANS: Average count of posts made per day since account registration.
-#: lib/profileaction.php:253
 msgid "Daily average"
 msgstr "Дневен просек"
 
 #. TRANS: Text for user group membership statistics if user has more subscriptions than displayed.
-#: lib/profileaction.php:305
 msgid "All groups"
 msgstr "Сите групи"
 
 #. TRANS: Server error displayed when using an unimplemented method.
-#: lib/profileformaction.php:123
 msgid "Unimplemented method."
 msgstr "Неимплементиран метод."
 
-#: lib/publicgroupnav.php:82
 msgid "User groups"
 msgstr "Кориснички групи"
 
-#: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
 msgid "Recent tags"
 msgstr "Скорешни ознаки"
 
-#: lib/publicgroupnav.php:88
 msgid "Featured"
 msgstr "Избрани"
 
-#: lib/publicgroupnav.php:92
 msgid "Popular"
 msgstr "Популарно"
 
-#: lib/redirectingaction.php:95
 msgid "No return-to arguments."
 msgstr "Нема return-to аргументи."
 
-#: lib/repeatform.php:107
 msgid "Repeat this notice?"
 msgstr "Да ја повторам белешкава?"
 
-#: lib/repeatform.php:132
 msgid "Yes"
 msgstr "Да"
 
-#: lib/repeatform.php:132
 msgid "Repeat this notice"
 msgstr "Повтори ја забелешкава"
 
-#: lib/revokeroleform.php:91
 #, php-format
 msgid "Revoke the \"%s\" role from this user"
 msgstr "Одземи му ја улогата „%s“ на корисников"
 
 #. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:1001
 msgid "Page not found."
 msgstr "Страницата не е пронајдена."
 
-#: lib/sandboxform.php:67
 msgid "Sandbox"
 msgstr "Песок"
 
-#: lib/sandboxform.php:78
 msgid "Sandbox this user"
 msgstr "Стави го корисников во песочен режим"
 
 #. TRANS: Fieldset legend for the search form.
-#: lib/searchaction.php:120
 msgid "Search site"
 msgstr "Пребарај по мрежното место"
 
 #. TRANS: Used as a field label for the field where one or more keywords
 #. TRANS: for searching can be entered.
-#: lib/searchaction.php:128
 msgid "Keyword(s)"
 msgstr "Клучен збор"
 
 #. TRANS: Button text for searching site.
-#: lib/searchaction.php:130
 msgctxt "BUTTON"
 msgid "Search"
 msgstr "Пребарај"
 
-#: lib/searchgroupnav.php:80
 msgid "People"
 msgstr "Луѓе"
 
-#: lib/searchgroupnav.php:81
 msgid "Find people on this site"
 msgstr "Пронајдете луѓе на ова мрежно место"
 
-#: lib/searchgroupnav.php:83
 msgid "Find content of notices"
 msgstr "Пронајдете содржини на забелешките"
 
-#: lib/searchgroupnav.php:85
 msgid "Find groups on this site"
 msgstr "Пронајдете групи на ова мрежно место"
 
-#: lib/section.php:89
 msgid "Untitled section"
 msgstr "Заглавие без наслов"
 
-#: lib/section.php:106
 msgid "More..."
 msgstr "Повеќе..."
 
-#: lib/settingsnav.php:78
 msgid "Change your profile settings"
 msgstr "Смени профилни нагодувања"
 
-#: lib/settingsnav.php:83
 msgid "Upload an avatar"
 msgstr "Подигни аватар"
 
-#: lib/settingsnav.php:88
 msgid "Change your password"
 msgstr "Смени лозинка"
 
-#: lib/settingsnav.php:93
 msgid "Change email handling"
 msgstr "Смени ракување со е-пошта"
 
-#: lib/settingsnav.php:98
 msgid "Design your profile"
 msgstr "Наместете изглед на Вашиот профил"
 
-#: lib/settingsnav.php:102
 msgid "URL"
 msgstr "URL"
 
-#: lib/settingsnav.php:103
 msgid "URL shorteners"
-msgstr ""
+msgstr "Скратувачи на URL"
 
-#: lib/settingsnav.php:111
 msgid "Updates by instant messenger (IM)"
 msgstr "Подновувања преку инстант-пораки (IM)"
 
-#: lib/settingsnav.php:118
 msgid "Updates by SMS"
 msgstr "Подновувања по СМС"
 
-#: lib/settingsnav.php:123
-#, fuzzy
 msgid "Connections"
-msgstr "Поврзувања"
+msgstr "Сврзувања"
 
-#: lib/settingsnav.php:124
 msgid "Authorized connected applications"
 msgstr "Овластени поврзани програми"
 
-#: lib/silenceform.php:67
 msgid "Silence"
 msgstr "Замолчи"
 
-#: lib/silenceform.php:78
 msgid "Silence this user"
 msgstr "Замолчи го овој корисник"
 
-#: lib/subgroupnav.php:89
 #, php-format
 msgid "People %s subscribes to"
 msgstr "Луѓе на кои е претплатен корисникот %s"
 
-#: lib/subgroupnav.php:97
 #, php-format
 msgid "People subscribed to %s"
 msgstr "Луѓе претплатени на %s"
 
-#: lib/subgroupnav.php:105
 #, php-format
 msgid "Groups %s is a member of"
 msgstr "Групи кадешто членува %s"
 
-#: lib/subgroupnav.php:111
 msgid "Invite"
 msgstr "Покани"
 
-#: lib/subgroupnav.php:112
 #, php-format
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Поканете пријатели и колеги да Ви се придружат на %s"
 
-#: lib/subscribeform.php:115 lib/subscribeform.php:139
 msgid "Subscribe to this user"
 msgstr "Претплати се на корисников"
 
-#: lib/subscriberspeopleselftagcloudsection.php:48
-#: lib/subscriptionspeopleselftagcloudsection.php:48
 msgid "People Tagcloud as self-tagged"
 msgstr "Облак од самоозначени ознаки за луѓе"
 
-#: lib/subscriberspeopletagcloudsection.php:48
-#: lib/subscriptionspeopletagcloudsection.php:48
 msgid "People Tagcloud as tagged"
 msgstr "Облак од ознаки за луѓе"
 
-#: lib/tagcloudsection.php:56
 msgid "None"
 msgstr "Без ознаки"
 
 #. TRANS: Server exception displayed if a theme name was invalid.
-#: lib/theme.php:74
 msgid "Invalid theme name."
 msgstr "Неважечко име за изгледот."
 
-#: lib/themeuploader.php:50
 msgid "This server cannot handle theme uploads without ZIP support."
 msgstr ""
 "Опслужувачот не може да се справи со подигања на изгледи без ZIP-поддршка."
 
-#: lib/themeuploader.php:58 lib/themeuploader.php:61
 msgid "The theme file is missing or the upload failed."
 msgstr "Податотеката за изгледот недостасува или подигањето не успеало."
 
-#: lib/themeuploader.php:91 lib/themeuploader.php:102
-#: lib/themeuploader.php:279 lib/themeuploader.php:283
-#: lib/themeuploader.php:291 lib/themeuploader.php:298
 msgid "Failed saving theme."
 msgstr "Зачувувањето на мотивот не успеа."
 
-#: lib/themeuploader.php:147
 msgid "Invalid theme: bad directory structure."
 msgstr "Неважечки изглед: лош состав на папката."
 
-#: lib/themeuploader.php:166
 #, php-format
 msgid "Uploaded theme is too large; must be less than %d byte uncompressed."
 msgid_plural ""
@@ -9612,11 +7936,9 @@ msgstr[0] ""
 msgstr[1] ""
 "Подигнатиот изглед е преголем; мора да биде помал од %d бајти (ненабиен)."
 
-#: lib/themeuploader.php:179
 msgid "Invalid theme archive: missing file css/display.css"
 msgstr "Неважечки архив за изглеедот: недостасува податотеката css/display.css"
 
-#: lib/themeuploader.php:219
 msgid ""
 "Theme contains invalid file or folder name. Stick with ASCII letters, "
 "digits, underscore, and minus sign."
@@ -9624,140 +7946,112 @@ msgstr ""
 "Изгледот содржи неважечки назив на податотека или папка. Дозволени се само "
 "ASCII-букви, бројки, долна црта и знак за минус."
 
-#: lib/themeuploader.php:225
 msgid "Theme contains unsafe file extension names; may be unsafe."
 msgstr "Овој изглед содржи небезбедни податотечни наставки."
 
-#: lib/themeuploader.php:242
 #, php-format
 msgid "Theme contains file of type '.%s', which is not allowed."
 msgstr "Изгледот содржи податотека од типот „.%s“, која не е дозволена."
 
-#: lib/themeuploader.php:260
 msgid "Error opening theme archive."
 msgstr "Грешка при отворањето на архивот за мотив."
 
-#: lib/threadednoticelist.php:270
-#, php-format
-msgid "Show all %d comment"
-msgid_plural "Show all %d comments"
-msgstr[0] ""
-msgstr[1] ""
+#, fuzzy, php-format
+msgid "Show %d reply"
+msgid_plural "Show all %d replies"
+msgstr[0] "Повеќе"
+msgstr[1] "Повеќе"
 
-#: lib/topposterssection.php:74
 msgid "Top posters"
 msgstr "Најактивни објавувачи"
 
 #. TRANS: Title for the form to unblock a user.
-#: lib/unblockform.php:67
 msgctxt "TITLE"
 msgid "Unblock"
 msgstr "Одблокирај"
 
-#: lib/unsandboxform.php:69
 msgid "Unsandbox"
 msgstr "Извади од песочен режим"
 
-#: lib/unsandboxform.php:80
 msgid "Unsandbox this user"
 msgstr "Тргни го корисников од песочен режим"
 
-#: lib/unsilenceform.php:67
 msgid "Unsilence"
 msgstr "Тргни замолчување"
 
-#: lib/unsilenceform.php:78
 msgid "Unsilence this user"
 msgstr "Тргни замолчување за овој корисник"
 
-#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
 msgid "Unsubscribe from this user"
 msgstr "Откажи претплата од овој корсиник"
 
-#: lib/unsubscribeform.php:137
 msgid "Unsubscribe"
 msgstr "Откажи ја претплатата"
 
 #. 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).
-#: lib/usernoprofileexception.php:60
 #, php-format
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "Корисникот %1$s (%2$d) нема профилен запис."
 
-#: lib/userprofile.php:116
 msgid "Edit Avatar"
 msgstr "Уреди аватар"
 
 #. TRANS: H2 for user actions in a profile.
 #. TRANS: H2 for entity actions in a profile.
-#: lib/userprofile.php:216 lib/userprofile.php:232
 msgid "User actions"
 msgstr "Кориснички дејства"
 
 #. TRANS: Text shown in user profile of not yet compeltely deleted users.
-#: lib/userprofile.php:220
 msgid "User deletion in progress..."
 msgstr "Бришењето на корисникот е во тек..."
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:248
 msgid "Edit profile settings"
 msgstr "Уреди нагодувања на профилот"
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:250
 msgid "Edit"
 msgstr "Уреди"
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:274
 msgid "Send a direct message to this user"
 msgstr "Испрати му директна порака на корисников"
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:276
 msgid "Message"
 msgstr "Порака"
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:318
 msgid "Moderate"
 msgstr "Модерирај"
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:357
 msgid "User role"
 msgstr "Корисничка улога"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:360
 msgctxt "role"
 msgid "Administrator"
 msgstr "Администратор"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:362
 msgctxt "role"
 msgid "Moderator"
 msgstr "Модератор"
 
-#: lib/util.php:321
 msgid "Not allowed to log in."
 msgstr "Не Ви е дозволено да се најавите."
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1337
 msgid "a few seconds ago"
 msgstr "пред неколку секунди"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1340
 msgid "about a minute ago"
 msgstr "пред една минута"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1344
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
@@ -9765,12 +8059,10 @@ msgstr[0] "пред околу една минута"
 msgstr[1] "пред околу %d минути"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1347
 msgid "about an hour ago"
 msgstr "пред еден час"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1351
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
@@ -9778,12 +8070,10 @@ msgstr[0] "пред околу еден час"
 msgstr[1] "пред околу %d часа"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1354
 msgid "about a day ago"
 msgstr "пред еден ден"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1358
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
@@ -9791,12 +8081,10 @@ msgstr[0] "пред околу еден ден"
 msgstr[1] "пред околу %d дена"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1361
 msgid "about a month ago"
 msgstr "пред еден месец"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1365
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
@@ -9804,204 +8092,49 @@ msgstr[0] "пред околу еден месец"
 msgstr[1] "пред околу %d месеци"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1368
 msgid "about a year ago"
 msgstr "пред една година"
 
 #. TRANS: Web color exception thrown when a hexadecimal color code does not validate.
 #. TRANS: %s is the provided (invalid) color code.
-#: lib/webcolor.php:81 lib/webcolor.php:121
 #, php-format
 msgid "%s is not a valid color! Use 3 or 6 hex characters."
 msgstr ""
 "%s не претставува важечка боја! Користете 3 или 6 шеснаесетни (hex) знаци."
 
 #. TRANS: Exception.
-#: lib/xrd.php:63
 msgid "Invalid XML."
 msgstr "Неважечки XML."
 
 #. TRANS: Exception.
-#: lib/xrd.php:68
 msgid "Invalid XML, missing XRD root."
 msgstr "Неважечки XML. Нема XRD-корен."
 
 #. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
-#: scripts/restoreuser.php:62
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr "Земам резерва на податотеката „%s“."
 
-#~ msgid "Could not generate feed for group - %s"
-#~ msgstr "Не можев да создадам канал за групата - %s"
+#~ msgid "Full name is too long (max 255 chars)."
+#~ msgstr "Целото име е предолго (највеќе 255 знаци)"
 
-#~ msgid "Current confirmed Jabber/Google Talk address."
-#~ msgstr "Моментално потврдена адреса на Jabber/Google Talk."
+#~ msgid "description is too long (max %d chars)."
+#~ msgstr "описот е предолг (највеќе %d знаци)"
 
-#~ msgid ""
-#~ "Jabber or Google Talk address, like \"UserName@example.org\". First, make "
-#~ "sure to add %s to your buddy list in your IM client or on Google Talk."
-#~ msgstr ""
-#~ "Адреса на Jabber или Google Talk, како на пр. „KorisnickoIme@example."
-#~ "org“. Но прво додајте го/ја %s во Вашиот контактен список на Вашиот "
-#~ "клиент за НП или Google Talk."
+#~ msgid "Location is too long (max 255 chars)."
+#~ msgstr "Местоположбата е предолга (дозволени се највеќе 255 знаци)."
 
-#~ msgid "Send me notices through Jabber/Google Talk."
-#~ msgstr "Испраќај ми забелешки преку Jabber/Google Talk."
+#~ msgid "Too many aliases! Maximum %d."
+#~ msgstr "Премногу алијаси! Дозволено е највеќе %d."
 
-#~ msgid "Publish a MicroID for my Jabber/Google Talk address."
-#~ msgstr "Објави MicroID за мојата адреса на Jabber/Google Talk."
+#~ msgctxt "BUTTON"
+#~ msgid "Comment"
+#~ msgstr "Коментар"
 
-#~ msgid "No Jabber ID."
-#~ msgstr "Нема JabberID."
+#~ msgid "Add a comment..."
+#~ msgstr "Додај коментар..."
 
-#~ msgid "Not a valid Jabber ID."
-#~ msgstr "Ова не е важечки ID за Jabber."
-
-#~ msgid "That is already your Jabber ID."
-#~ msgstr "Ова веќе е Вашиот Jabber ID."
-
-#~ msgid "That is not your Jabber ID."
-#~ msgstr "Ова не е Вашиот Jabber ID."
-
-#~ msgid "Other settings"
-#~ msgstr "Други нагодувања"
-
-#~ msgid "Tag cloud"
-#~ msgstr "Облак од ознаки"
-
-#~ msgid "Consumer key"
-#~ msgstr "Потрошувачки клуч"
-
-#~ msgid "Consumer secret"
-#~ msgstr "Потрошувачка тајна"
-
-#~ msgid "Request token URL"
-#~ msgstr "URL на жетонот на барањето"
-
-#~ msgid "Access token URL"
-#~ msgstr "URL на пристапниот жетон"
-
-#~ msgid "Authorize URL"
-#~ msgstr "Одобри URL"
-
-#~ msgid "Jabber"
-#~ msgstr "Jabber"
-
-#~ msgid "Photo"
-#~ msgstr "Фото"
-
-#~ msgid "Other options"
-#~ msgstr "Други нагодувања"
-
-#~ msgid "Other"
-#~ msgstr "Друго"
-
-#~ msgid "Primary site navigation"
-#~ msgstr "Главна навигација"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Personal profile and friends timeline"
-#~ msgstr "Личен профил и хронологија на пријатели"
-
-#~ msgctxt "MENU"
-#~ msgid "Personal"
-#~ msgstr "Лично"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Change your email, avatar, password, profile"
-#~ msgstr "Промена на е-пошта, аватар, лозинка, профил"
-
-#~ msgid "Account"
-#~ msgstr "Сметка"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Connect to services"
-#~ msgstr "Поврзи се со услуги"
-
-#~ msgid "Connect"
-#~ msgstr "Поврзи се"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Change site configuration"
-#~ msgstr "Промена на поставките на мрежното место"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Invite friends and colleagues to join you on %s"
-#~ msgstr "Поканете пријатели и колеги да Ви се придружат на %s"
-
-#~ msgctxt "MENU"
-#~ msgid "Invite"
-#~ msgstr "Покани"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Create an account"
-#~ msgstr "Создај сметка"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Help me!"
-#~ msgstr "Напомош!"
-
-#~ msgctxt "MENU"
-#~ msgid "Help"
-#~ msgstr "Помош"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Search for people or text"
-#~ msgstr "Пребарајте луѓе или текст"
-
-#~ msgid "Local views"
-#~ msgstr "Локални прегледи"
-
-#~ msgid "Page notice"
-#~ msgstr "Напомена за страницата"
-
-#~ msgid "Secondary site navigation"
-#~ msgstr "Споредна навигација"
-
-#~ msgid "StatusNet software license"
-#~ msgstr "Лиценца на програмот StatusNet"
-
-#~ msgid "Site content license"
-#~ msgstr "Лиценца на содржините на мрежното место"
-
-#~ msgid "Pagination"
-#~ msgstr "Прелом на страници"
-
-#~ msgid "Author"
-#~ msgstr "Автор"
-
-#~ msgid "Provider"
-#~ msgstr "Обезбедувач"
-
-#~ msgctxt "MENU"
-#~ msgid "SMS"
-#~ msgstr "СМС"
-
-#~ msgid "Filter tags"
-#~ msgstr "Филтрирај ознаки"
-
-#~ msgid "[%s]"
-#~ msgstr "[%s]"
-
-#~ msgid "Available characters"
-#~ msgstr "Расположиви знаци"
-
-#~ msgctxt "MENU"
-#~ msgid "Profile"
-#~ msgstr "Профил"
-
-#~ msgid "Search help"
-#~ msgstr "Помош со пребарување"
-
-#~ msgid "Unknown user. Go to %s to add your address to your account"
-#~ msgstr ""
-#~ "Непознат корисник. Одете на %s за да внесете адреса во Вашата сметка."
-
-#~ msgid "Message too long. Maximum is %1$d character, you sent %2$d."
-#~ msgid_plural "Message too long. Maximum is %1$d characters, you sent %2$d."
-#~ msgstr[0] ""
-#~ "Пораката е предолга. Дозволен е највеќе %1$d знак, а вие испративте %2$d."
-#~ msgstr[1] ""
-#~ "Пораката е предолга - дозволени се највеќе %1$d знаци, а вие испративте %2"
-#~ "$d."
+#~ msgid "Show all %d comment"
+#~ msgid_plural "Show all %d comments"
+#~ msgstr[0] "Прикажи го коментарот"
+#~ msgstr[1] "Прикажи ги сите %d коментари"
diff --git a/locale/ml/LC_MESSAGES/statusnet.po b/locale/ml/LC_MESSAGES/statusnet.po
index 0a4a7502c5..56658d79f5 100644
--- a/locale/ml/LC_MESSAGES/statusnet.po
+++ b/locale/ml/LC_MESSAGES/statusnet.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:23+0000\n"
-"PO-Revision-Date: 2011-03-03 17:26:15+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:30+0000\n"
 "Language-Team: Malayalam <http://translatewiki.net/wiki/Portal:ml>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-25 23:49:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:59:19+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ml\n"
 "X-Message-Group: #out-statusnet-core\n"
@@ -23,53 +23,43 @@ msgstr ""
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
-#: actions/accessadminpanel.php:53 lib/adminpanelaction.php:363
 msgid "Access"
 msgstr "അഭിഗമ്യത"
 
 #. TRANS: Page notice.
-#: actions/accessadminpanel.php:64
 msgid "Site access settings"
 msgstr "സൈറ്റ് അഭിഗമ്യതാ സജ്ജീകരണങ്ങൾ"
 
 #. TRANS: Form legend for registration form.
-#: actions/accessadminpanel.php:151
 msgid "Registration"
 msgstr "രെജിസ്റ്ററേഷൻ"
 
 #. TRANS: Checkbox instructions for admin setting "Private".
-#: actions/accessadminpanel.php:155
 msgid "Prohibit anonymous users (not logged in) from viewing site?"
 msgstr "അജ്ഞാത ഉപയോക്താക്കളെ (ലോഗിൻ ചെയ്യാത്തവരെ) സൈറ്റ് കാണുന്നതിൽ നിന്നും വിലക്കണോ?"
 
 #. TRANS: Checkbox label for prohibiting anonymous users from viewing site.
-#: actions/accessadminpanel.php:157
 msgctxt "LABEL"
 msgid "Private"
 msgstr "സ്വകാര്യം"
 
 #. TRANS: Checkbox instructions for admin setting "Invite only".
-#: actions/accessadminpanel.php:164
 msgid "Make registration invitation only."
 msgstr "രജിസ്ട്രേഷൻ ക്ഷണിച്ചിട്ടുള്ളവർക്കു മാത്രം."
 
 #. TRANS: Checkbox label for configuring site as invite only.
-#: actions/accessadminpanel.php:166
 msgid "Invite only"
 msgstr "ക്ഷണിക്കപ്പെട്ടവർക്ക് മാത്രം"
 
 #. TRANS: Checkbox instructions for admin setting "Closed" (no new registrations).
-#: actions/accessadminpanel.php:173
 msgid "Disable new registrations."
 msgstr "പുതിയ രജിസ്ട്രേഷനുകൾ വേണ്ട."
 
 #. TRANS: Checkbox label for disabling new user registrations.
-#: actions/accessadminpanel.php:175
 msgid "Closed"
 msgstr "അടച്ചു"
 
 #. TRANS: Title for button to save access settings in site admin panel.
-#: actions/accessadminpanel.php:191
 msgid "Save access settings"
 msgstr "അഭിഗമ്യതാ സജ്ജീകരണങ്ങൾ സേവ് ചെയ്യുക"
 
@@ -77,6 +67,7 @@ msgstr "അഭിഗമ്യതാ സജ്ജീകരണങ്ങൾ സേ
 #. TRANS: Button text for saving theme settings.
 #. TRANS: Button label to save e-mail preferences.
 #. TRANS: Button label to save IM preferences.
+#. TRANS: Button text in the license admin panel.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
 #. TRANS: Button text for saving site notice in admin panel.
@@ -86,21 +77,12 @@ msgstr "അഭിഗമ്യതാ സജ്ജീകരണങ്ങൾ സേ
 #. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
 #. TRANS: Button text on profile design page to save settings.
-#: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
-#: actions/emailsettings.php:251 actions/imsettings.php:199
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:198
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:204
-#: actions/subscriptions.php:261 actions/urlsettings.php:152
-#: actions/useradminpanel.php:298 lib/applicationeditform.php:355
-#: lib/designform.php:320 lib/groupeditform.php:201
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "സേവ് ചെയ്യുക"
 
 #. TRANS: Server error when page not found (404).
 #. TRANS: Server error when page not found (404)
-#: actions/all.php:68 actions/public.php:98 actions/replies.php:93
-#: actions/showfavorites.php:140 actions/tag.php:52
 msgid "No such page."
 msgstr "അത്തരത്തിൽ ഒരു താളില്ല."
 
@@ -119,6 +101,7 @@ msgstr "അത്തരത്തിൽ ഒരു താളില്ല."
 #. TRANS: Client error displayed when checking group membership for a non-existing user.
 #. TRANS: Client error displayed when trying to have a non-existing user join a group.
 #. TRANS: Client error displayed when trying to have a non-existing user leave a group.
+#. TRANS: Client error displayed when not providing a user or an invalid user.
 #. TRANS: Client error displayed when updating a status for a non-existing user.
 #. TRANS: Client error displayed when requesting a list of followers for a non-existing user.
 #. TRANS: Client error displayed when requesting most recent favourite notices by a user for a non-existing user.
@@ -131,6 +114,8 @@ msgstr "അത്തരത്തിൽ ഒരു താളില്ല."
 #. 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.
 #. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
@@ -138,33 +123,10 @@ msgstr "അത്തരത്തിൽ ഒരു താളില്ല."
 #. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when calling a profile action without specifying a user.
-#: actions/all.php:80 actions/allrss.php:69
-#: actions/apiaccountupdatedeliverydevice.php:110
-#: actions/apiaccountupdateprofile.php:103
-#: actions/apiaccountupdateprofilebackgroundimage.php:118
-#: actions/apiaccountupdateprofileimage.php:104 actions/apiatomservice.php:59
-#: actions/apiblockcreate.php:96 actions/apiblockdestroy.php:94
-#: actions/apidirectmessage.php:75 actions/apidirectmessagenew.php:72
-#: actions/apigroupcreate.php:111 actions/apigroupismember.php:89
-#: actions/apigroupjoin.php:98 actions/apigroupleave.php:98
-#: actions/apigrouplist.php:70 actions/apigroupprofileupdate.php:108
-#: actions/apistatusesupdate.php:230 actions/apisubscriptions.php:85
-#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:173
-#: actions/apitimelinehome.php:78 actions/apitimelinementions.php:77
-#: actions/apitimelineuser.php:79 actions/avatarbynickname.php:79
-#: actions/favoritesrss.php:72 actions/foaf.php:42 actions/foaf.php:61
-#: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116
-#: actions/otp.php:78 actions/remotesubscribe.php:144
-#: actions/remotesubscribe.php:153 actions/replies.php:73
-#: actions/repliesrss.php:38 actions/rsd.php:113 actions/showfavorites.php:106
-#: actions/userbyid.php:75 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/userxrd.php:59 actions/xrds.php:71 lib/command.php:509
-#: lib/galleryaction.php:59 lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "അങ്ങനെ ഒരു ഉപയോക്താവില്ല."
 
 #. TRANS: Page title. %1$s is user nickname, %2$d is page number
-#: actions/all.php:91
 #, php-format
 msgid "%1$s and friends, page %2$d"
 msgstr "%1$s ഒപ്പം സുഹൃത്തുക്കളും, താൾ %2$d"
@@ -173,33 +135,26 @@ msgstr "%1$s ഒപ്പം സുഹൃത്തുക്കളും, താ
 #. TRANS: H1 text for page. %s is a user nickname.
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Timeline title for user and friends. %s is a user nickname.
-#: actions/all.php:94 actions/all.php:191 actions/allrss.php:117
-#: actions/apitimelinefriends.php:207 actions/apitimelinehome.php:113
-#: lib/personalgroupnav.php:100
 #, php-format
 msgid "%s and friends"
 msgstr "%s ഒപ്പം സുഹൃത്തുക്കളും"
 
 #. TRANS: %s is user nickname.
-#: actions/all.php:108
 #, php-format
 msgid "Feed for friends of %s (RSS 1.0)"
 msgstr ""
 
 #. TRANS: %s is user nickname.
-#: actions/all.php:117
 #, php-format
 msgid "Feed for friends of %s (RSS 2.0)"
 msgstr ""
 
 #. TRANS: %s is user nickname.
-#: actions/all.php:126
 #, php-format
 msgid "Feed for friends of %s (Atom)"
 msgstr ""
 
 #. TRANS: Empty list message. %s is a user nickname.
-#: actions/all.php:139
 #, php-format
 msgid ""
 "This is the timeline for %s and friends but no one has posted anything yet."
@@ -207,7 +162,6 @@ msgstr ""
 
 #. TRANS: Encouragement displayed on logged in user's empty timeline.
 #. TRANS: This message contains Markdown links. Keep "](" together.
-#: actions/all.php:146
 #, php-format
 msgid ""
 "Try subscribing to more people, [join a group](%%action.groups%%) or post "
@@ -216,7 +170,6 @@ msgstr ""
 
 #. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@".
 #. TRANS: This message contains Markdown links. Keep "](" together.
-#: actions/all.php:150
 #, php-format
 msgid ""
 "You can try to [nudge %1$s](../%2$s) from their profile or [post something "
@@ -227,7 +180,6 @@ msgstr ""
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
 #. TRANS: Second sentence of empty message for anonymous users. %s is a user nickname.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:221
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -235,14 +187,11 @@ msgid ""
 msgstr ""
 
 #. TRANS: H1 text for page when viewing a list for self.
-#: actions/all.php:188
 msgid "You and friends"
 msgstr "താങ്കളും സുഹൃത്തുക്കളും"
 
 #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
 #. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name.
-#: actions/allrss.php:122 actions/apitimelinefriends.php:213
-#: actions/apitimelinehome.php:119
 #, php-format
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr ""
@@ -261,55 +210,20 @@ msgstr ""
 #. TRANS: Client error displayed trying to execute an unknown API method checking group membership.
 #. TRANS: Client error displayed trying to execute an unknown API method listing the latest 20 groups.
 #. TRANS: Client error displayed trying to execute an unknown API method showing group membership.
+#. TRANS: Client error displayed when using an unsupported API format.
 #. TRANS: Client error displayed trying to execute an unknown API method showing a group.
 #. TRANS: Client error displayed trying to execute an unknown API method testing API connectivity.
 #. TRANS: Client error displayed trying to execute an unknown API method deleting a status.
 #. TRANS: Client error displayed when trying to handle an unknown API method.
-#: actions/apiaccountratelimitstatus.php:69
-#: actions/apiaccountupdatedeliverydevice.php:92
-#: actions/apiaccountupdateprofile.php:94
-#: actions/apiaccountupdateprofilebackgroundimage.php:92
-#: actions/apiaccountupdateprofilecolors.php:115
-#: actions/apiaccountverifycredentials.php:68 actions/apidirectmessage.php:157
-#: actions/apifavoritecreate.php:98 actions/apifavoritedestroy.php:98
-#: actions/apifriendshipscreate.php:99 actions/apifriendshipsdestroy.php:99
-#: actions/apifriendshipsshow.php:124 actions/apigroupcreate.php:138
-#: actions/apigroupismember.php:115 actions/apigroupjoin.php:151
-#: actions/apigroupleave.php:141 actions/apigrouplist.php:134
-#: actions/apigrouplistall.php:120 actions/apigroupmembership.php:105
-#: actions/apigroupprofileupdate.php:100 actions/apigroupprofileupdate.php:213
-#: actions/apigroupshow.php:114 actions/apihelptest.php:84
-#: actions/apistatusesdestroy.php:101 actions/apistatusesretweets.php:110
-#: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:139
-#: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
-#: actions/apitimelinefavorites.php:182 actions/apitimelinefriends.php:276
-#: actions/apitimelinegroup.php:148 actions/apitimelinehome.php:181
-#: actions/apitimelinementions.php:182 actions/apitimelinepublic.php:247
-#: actions/apitimelineretweetedtome.php:147
-#: actions/apitimelineretweetsofme.php:147 actions/apitimelinetag.php:165
-#: actions/apitimelineuser.php:217 actions/apiusershow.php:100
 msgid "API method not found."
 msgstr "എ.പി.ഐ. മെതേഡ് കണ്ടെത്താനായില്ല."
 
 #. 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.
-#: actions/apiaccountupdatedeliverydevice.php:83
-#: actions/apiaccountupdateprofile.php:85
-#: actions/apiaccountupdateprofilebackgroundimage.php:83
-#: actions/apiaccountupdateprofilecolors.php:106
-#: actions/apiaccountupdateprofileimage.php:80 actions/apiblockcreate.php:87
-#: actions/apiblockdestroy.php:85 actions/apidirectmessagenew.php:107
-#: actions/apifavoritecreate.php:88 actions/apifavoritedestroy.php:88
-#: actions/apifriendshipscreate.php:89 actions/apifriendshipsdestroy.php:89
-#: actions/apigroupcreate.php:102 actions/apigroupjoin.php:89
-#: actions/apigroupleave.php:89 actions/apigroupprofileupdate.php:92
-#: actions/apimediaupload.php:66 actions/apistatusesretweet.php:63
-#: actions/apistatusesupdate.php:194
 msgid "This method requires a POST."
 msgstr ""
 
 #. TRANS: Client error displayed when no valid device parameter is provided for a user's delivery device setting.
-#: actions/apiaccountupdatedeliverydevice.php:103
 msgid ""
 "You must specify a parameter named 'device' with a value of one of: sms, im, "
 "none."
@@ -322,10 +236,6 @@ msgstr ""
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
-#: actions/apiaccountupdatedeliverydevice.php:136
-#: actions/emailsettings.php:353 actions/emailsettings.php:499
-#: actions/profilesettings.php:323 actions/smssettings.php:300
-#: actions/smssettings.php:453 actions/urlsettings.php:211
 msgid "Could not update user."
 msgstr "ഉപയോക്തൃ വിവരങ്ങൾ പുതുക്കാൻ കഴിഞ്ഞില്ല."
 
@@ -338,32 +248,17 @@ msgstr "ഉപയോക്തൃ വിവരങ്ങൾ പുതുക്ക
 #. TRANS: Server error displayed when requesting Friends of a Friend feed for a user for which the profile could not be found.
 #. TRANS: Server error displayed when trying to get a user hCard for a user without a profile.
 #. TRANS: Server error displayed when calling a profile action while the specified user does not have a profile.
-#: actions/apiaccountupdateprofile.php:111
-#: actions/apiaccountupdateprofilebackgroundimage.php:199
-#: actions/apiaccountupdateprofilecolors.php:183
-#: actions/apiaccountupdateprofileimage.php:131
-#: actions/apiuserprofileimage.php:88 actions/apiusershow.php:108
-#: actions/avatarbynickname.php:85 actions/foaf.php:69 actions/hcard.php:75
-#: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
-#: lib/profileaction.php:85
 msgid "User has no profile."
 msgstr ""
 
 #. TRANS: Server error displayed if a user profile could not be saved.
 #. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:419
 msgid "Could not save profile."
 msgstr ""
 
 #. TRANS: Client error displayed when the number of bytes in a POST request exceeds a limit.
 #. TRANS: %s is the number of bytes of the CONTENT_LENGTH.
 #. TRANS: Form validation error in design settings form. POST should remain untranslated.
-#: actions/apiaccountupdateprofilebackgroundimage.php:108
-#: actions/apiaccountupdateprofileimage.php:95 actions/apimediaupload.php:81
-#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
-#: actions/designadminpanel.php:120 actions/editapplication.php:121
-#: actions/newapplication.php:102 actions/newnotice.php:95
-#: lib/designsettings.php:110
 #, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s byte) due to its "
@@ -379,26 +274,15 @@ msgstr[1] ""
 #. TRANS: Client error displayed when a database error occurs inserting profile colours.
 #. TRANS: Client error displayed when a database error occurs updating profile colours.
 #. TRANS: Form validation error displayed when group design settings could not be saved because of an application issue.
-#: actions/apiaccountupdateprofilebackgroundimage.php:138
-#: actions/apiaccountupdateprofilebackgroundimage.php:149
-#: actions/apiaccountupdateprofilecolors.php:160
-#: actions/apiaccountupdateprofilecolors.php:171
-#: actions/groupdesignsettings.php:285 actions/groupdesignsettings.php:296
-#: actions/userdesignsettings.php:218 actions/userdesignsettings.php:228
-#: actions/userdesignsettings.php:270 actions/userdesignsettings.php:280
 msgid "Unable to save your design settings."
 msgstr "താങ്കളുടെ രൂപകല്പനാ സജ്ജീകരണങ്ങൾ കാത്തുസൂക്ഷിക്കാനായില്ല."
 
 #. TRANS: Error displayed when updating design settings fails.
 #. TRANS: Client error displayed when a database error occurs updating profile colours.
-#: actions/apiaccountupdateprofilebackgroundimage.php:191
-#: actions/apiaccountupdateprofilecolors.php:139
-#: actions/userdesignsettings.php:196
 msgid "Could not update your design."
 msgstr "താങ്കളുടെ രൂപകല്പന പുതുക്കാനായില്ല."
 
 #. TRANS: Title for Atom feed.
-#: actions/apiatomservice.php:85
 msgctxt "ATOM"
 msgid "Main"
 msgstr "മുഖ്യം"
@@ -407,9 +291,6 @@ msgstr "മുഖ്യം"
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Title in atom group notice feed. %s is a group name.
 #. TRANS: Title in atom user notice feed. %s is a user name.
-#: actions/apiatomservice.php:93 actions/grouprss.php:138
-#: actions/userrss.php:94 lib/atomgroupnoticefeed.php:63
-#: lib/atomusernoticefeed.php:88
 #, php-format
 msgid "%s timeline"
 msgstr "%s എന്ന ഉപയോക്താവിന്റെ സമയരേഖ"
@@ -419,8 +300,6 @@ msgstr "%s എന്ന ഉപയോക്താവിന്റെ സമയര
 #. TRANS: %s is a user nickname.
 #. TRANS: Header for subscriptions overview for a user (first page).
 #. TRANS: %s is a user nickname.
-#: actions/apiatomservice.php:104 actions/atompubsubscriptionfeed.php:148
-#: actions/subscriptions.php:51
 #, php-format
 msgid "%s subscriptions"
 msgstr "%s എന്ന ഉപയോക്താവിന്റെ വരിക്കാരനാകലുകൾ"
@@ -428,58 +307,48 @@ msgstr "%s എന്ന ഉപയോക്താവിന്റെ വരിക
 #. TRANS: Title for Atom feed with a user's favorite notices. %s is a user nickname.
 #. TRANS: Title for Atom favorites feed.
 #. TRANS: %s is a user nickname.
-#: actions/apiatomservice.php:115 actions/atompubfavoritefeed.php:142
 #, php-format
 msgid "%s favorites"
 msgstr "%s എന്ന ഉപയോക്താവിന് പ്രിയങ്കരമായവ"
 
 #. TRANS: Title for Atom feed with a user's memberships. %s is a user nickname.
-#: actions/apiatomservice.php:126
 #, php-format
 msgid "%s memberships"
 msgstr "%s അംഗത്വങ്ങൾ"
 
 #. TRANS: Client error displayed when users try to block themselves.
-#: actions/apiblockcreate.php:105
 msgid "You cannot block yourself!"
 msgstr "താങ്കൾക്ക് താങ്കളെത്തന്നെ തടയാൻ പറ്റില്ല!"
 
 #. TRANS: Server error displayed when blocking a user has failed.
-#: actions/apiblockcreate.php:127
 msgid "Block user failed."
 msgstr "ഉപയോക്താവിനെ തടയൽ പരാജയപ്പെട്ടു."
 
 #. TRANS: Server error displayed when unblocking a user has failed.
-#: actions/apiblockdestroy.php:113
 msgid "Unblock user failed."
 msgstr "ഉപയോക്താവിന്റെ തടയൽ നീക്കൽ പരാജയപ്പെട്ടു."
 
 #. TRANS: Title. %s is a user nickname.
-#: actions/apidirectmessage.php:88
 #, php-format
 msgid "Direct messages from %s"
 msgstr "%s നേരിട്ടയച്ച സന്ദേശങ്ങൾ"
 
 #. TRANS: Subtitle. %s is a user nickname.
-#: actions/apidirectmessage.php:93
 #, php-format
 msgid "All the direct messages sent from %s"
 msgstr "%s നേരിട്ടയച്ച എല്ലാ സന്ദേശങ്ങളും"
 
 #. TRANS: Title. %s is a user nickname.
-#: actions/apidirectmessage.php:102
 #, php-format
 msgid "Direct messages to %s"
 msgstr "%s എന്ന ഉപയോക്താവിന് നേരിട്ടുള്ള സന്ദേശങ്ങൾ"
 
 #. TRANS: Subtitle. %s is a user nickname.
-#: actions/apidirectmessage.php:107
 #, php-format
 msgid "All the direct messages sent to %s"
 msgstr "%s എന്ന ഉപയോക്താവിന് നേരിട്ടുള്ള എല്ലാ സന്ദേശങ്ങളും"
 
 #. TRANS: Client error displayed when no message text was submitted (406).
-#: actions/apidirectmessagenew.php:117
 msgid "No message text!"
 msgstr "സന്ദേശത്തിൽ എഴുത്ത് ഇല്ല!"
 
@@ -487,7 +356,6 @@ msgstr "സന്ദേശത്തിൽ എഴുത്ത് ഇല്ല!"
 #. TRANS: %d is the maximum number of characters for a message.
 #. TRANS: Form validation error displayed when message content is too long.
 #. TRANS: %d is the maximum number of characters for a message.
-#: actions/apidirectmessagenew.php:127 actions/newmessage.php:152
 #, php-format
 msgid "That's too long. Maximum message size is %d character."
 msgid_plural "That's too long. Maximum message size is %d characters."
@@ -495,17 +363,14 @@ msgstr[0] "അത് വളരെ വലുതാണ്. സന്ദേശത
 msgstr[1] "അത് വളരെ വലുതാണ്. സന്ദേശത്തിന്റെ പരമാവധി വലിപ്പം %d അക്ഷരങ്ങളാണ്."
 
 #. TRANS: Client error displayed if a recipient user could not be found (403).
-#: actions/apidirectmessagenew.php:139
 msgid "Recipient user not found."
 msgstr "സ്വീകർത്താവായ ഉപയോക്താവിനെ കണ്ടെത്താനായില്ല."
 
 #. TRANS: Client error displayed trying to direct message another user who's not a friend (403).
-#: actions/apidirectmessagenew.php:144
 msgid "Cannot send direct messages to users who aren't your friend."
 msgstr "താങ്കളുടെ സുഹൃത്തുക്കളല്ലാത്ത ഉപയോക്താക്കൾക്ക് നേരിട്ടുള്ള സന്ദേശങ്ങൾ അയയ്ക്കാൻ കഴിയില്ല."
 
 #. TRANS: Client error displayed trying to direct message self (403).
-#: actions/apidirectmessagenew.php:154
 msgid ""
 "Do not send a message to yourself; just say it to yourself quietly instead."
 msgstr "താങ്കൾക്കു തന്നെ സന്ദേശം അയയ്ക്കരുത്; പകരം അത് പതുക്കെ സ്വയം പറയുക."
@@ -513,116 +378,96 @@ 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.
 #. TRANS: Client error displayed trying to delete a status with an invalid ID.
-#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:108
-#: actions/apistatusesdestroy.php:121
 msgid "No status found with that ID."
 msgstr "ആ ഐ.ഡി.യോട് യോജിക്കുന്ന സ്ഥിതിവിവരം കണ്ടെത്താനായില്ല."
 
 #. TRANS: Client error displayed when trying to mark a notice favourite that already is a favourite.
-#: actions/apifavoritecreate.php:120
 msgid "This status is already a favorite."
 msgstr "ഈ സ്ഥിതിവിവരം മുമ്പേ തന്നെ പ്രിയങ്കരമാണ്!"
 
 #. TRANS: Client error displayed when marking a notice as favourite fails.
 #. TRANS: Server error displayed when trying to mark a notice as favorite fails in the database.
 #. TRANS: Error message text shown when a favorite could not be set.
-#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:306
 msgid "Could not create favorite."
 msgstr "പ്രിയങ്കരങ്ങൾ സൃഷ്ടിക്കാൻ കഴിഞ്ഞില്ല."
 
 #. TRANS: Client error displayed when trying to remove a favourite that was not a favourite.
-#: actions/apifavoritedestroy.php:122
 msgid "That status is not a favorite."
 msgstr "ഈ സ്ഥിതിവിവരം പ്രിയങ്കരമല്ല."
 
 #. TRANS: Client error displayed when removing a favourite has failed.
 #. TRANS: Server error displayed when removing a favorite from the database fails.
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:90
 msgid "Could not delete favorite."
 msgstr "പ്രിയങ്കരം മായ്ക്കാൻ കഴിഞ്ഞില്ല."
 
 #. TRANS: Client error displayed when trying follow who's profile could not be found.
-#: actions/apifriendshipscreate.php:109
 msgid "Could not follow user: profile not found."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to follow a user that's already being followed.
 #. TRANS: %s is the nickname of the user that is already being followed.
-#: actions/apifriendshipscreate.php:120
 #, php-format
 msgid "Could not follow user: %s is already on your list."
 msgstr "ഉപയോക്താവിനെ പിന്തുടരാൻ കഴിഞ്ഞില്ല: %s താങ്കളുടെ പട്ടികയിൽ മുമ്പേയുണ്ട്."
 
 #. TRANS: Client error displayed when trying to unfollow a user that cannot be found.
-#: actions/apifriendshipsdestroy.php:109
 msgid "Could not unfollow user: User not found."
 msgstr "ഉപയോക്താവിനെ പിന്തുടരൽ നീക്കംചെയ്യാൻ കഴിഞ്ഞില്ല: ഉപയോക്താവിനെ കണ്ടെത്താനായില്ല."
 
 #. TRANS: Client error displayed when trying to unfollow self.
-#: actions/apifriendshipsdestroy.php:121
 msgid "You cannot unfollow yourself."
 msgstr "താങ്കൾക്ക് താങ്കളെത്തന്നെ പിന്തുടരൽ നീക്കാൻ പറ്റില്ല."
 
 #. TRANS: Client error displayed when supplying invalid parameters to an API call checking if a friendship exists.
-#: actions/apifriendshipsexists.php:88
 msgid "Two valid IDs or nick names must be supplied."
 msgstr ""
 
 #. TRANS: Client error displayed when a source user could not be determined showing friendship.
-#: actions/apifriendshipsshow.php:131
 msgid "Could not determine source user."
 msgstr "സ്രോതസ്സ് ഉപയോക്താവിനെ നിർണ്ണയിക്കാനായില്ല."
 
 #. TRANS: Client error displayed when a target user could not be determined showing friendship.
-#: actions/apifriendshipsshow.php:140
 msgid "Could not find target user."
 msgstr "ലക്ഷ്യമിട്ട ഉപയോക്താവിനെ കണ്ടെത്താനായില്ല."
 
 #. TRANS: Client error trying to create a group with a nickname this is already in use.
+#. TRANS: API validation exception thrown when nickname is already used.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:156 actions/apigroupprofileupdate.php:255
-#: actions/editgroup.php:191 actions/newgroup.php:137
-#: actions/profilesettings.php:274 actions/register.php:199
 msgid "Nickname already in use. Try another one."
 msgstr "വിളിപ്പേര് മുമ്പേ ഉപയോഗത്തിലുണ്ട്. മറ്റൊരെണ്ണം ശ്രമിക്കുക."
 
 #. TRANS: Client error in form for group creation.
+#. TRANS: API validation exception thrown when nickname does not validate.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:164 actions/apigroupprofileupdate.php:259
-#: actions/editgroup.php:195 actions/newgroup.php:141
-#: actions/profilesettings.php:244 actions/register.php:201
 msgid "Not a valid nickname."
 msgstr "സാധുവായ വിളിപ്പേര് അല്ല."
 
 #. TRANS: Client error in form for group creation.
+#. TRANS: API validation exception thrown when homepage URL does not validate.
 #. TRANS: Validation error shown when providing an invalid homepage URL in the "Edit application" form.
 #. TRANS: Group edit form validation error.
 #. TRANS: Validation error shown when providing an invalid homepage URL in the "New application" form.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:181 actions/apigroupprofileupdate.php:277
-#: actions/editapplication.php:235 actions/editgroup.php:202
-#: actions/newapplication.php:221 actions/newgroup.php:148
-#: actions/profilesettings.php:249 actions/register.php:208
 msgid "Homepage is not a valid URL."
 msgstr "ഹോംപേജിന്റെ യൂ.ആർ.എൽ. സാധുവല്ല."
 
 #. TRANS: Client error in form for group creation.
+#. TRANS: API validation exception thrown when full name does not validate.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:191 actions/editgroup.php:206
-#: actions/newgroup.php:152 actions/profilesettings.php:253
-#: actions/register.php:211
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "പൂർണ്ണ നാമത്തിന്റെ നീളം വളരെ കൂടുതലാണ് (പരമാവധി 255 അക്ഷരങ്ങൾ)."
 
 #. TRANS: Client error shown when providing too long a description during group creation.
 #. TRANS: %d is the maximum number of allowed characters.
+#. TRANS: API validation exception thrown when description does not validate.
+#. TRANS: %d is the maximum description length and used for plural.
 #. TRANS: Validation error shown when providing too long a description in the "Edit application" form.
 #. TRANS: %d is the maximum number of allowed characters.
 #. TRANS: Group edit form validation error.
@@ -630,9 +475,6 @@ msgstr "പൂർണ്ണ നാമത്തിന്റെ നീളം വള
 #. TRANS: %d is the maximum number of characters for the description.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed characters.
-#: actions/apigroupcreate.php:201 actions/editapplication.php:202
-#: actions/editgroup.php:211 actions/newapplication.php:182
-#: actions/newgroup.php:157
 #, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."
@@ -640,23 +482,21 @@ msgstr[0] "വിവരണത്തിനു നീളം കൂടുതലാ
 msgstr[1] "വിവരണത്തിനു നീളം കൂടുതലാണ് (പരമാവധി %d അക്ഷരങ്ങൾ)."
 
 #. TRANS: Client error shown when providing too long a location during group creation.
+#. TRANS: API validation exception thrown when location does not validate.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:215 actions/editgroup.php:218
-#: actions/newgroup.php:164 actions/profilesettings.php:266
-#: actions/register.php:220
 msgid "Location is too long (maximum 255 characters)."
 msgstr ""
 
 #. TRANS: Client error shown when providing too many aliases during group creation.
 #. TRANS: %d is the maximum number of allowed aliases.
+#. TRANS: API validation exception thrown when aliases do not validate.
+#. TRANS: %d is the maximum number of aliases and used for plural.
 #. TRANS: Group edit form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.
-#: actions/apigroupcreate.php:236 actions/editgroup.php:231
-#: actions/newgroup.php:177
 #, php-format
 msgid "Too many aliases! Maximum %d allowed."
 msgid_plural "Too many aliases! Maximum %d allowed."
@@ -665,25 +505,24 @@ msgstr[1] ""
 
 #. TRANS: Client error shown when providing an invalid alias during group creation.
 #. TRANS: %s is the invalid alias.
-#: actions/apigroupcreate.php:253
+#. TRANS: API validation exception thrown when aliases does not validate.
+#. TRANS: %s is the invalid alias.
 #, php-format
 msgid "Invalid alias: \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to use an alias during group creation that is already in use.
 #. TRANS: %s is the alias that is already in use.
+#. TRANS: API validation exception thrown when aliases is already used.
+#. TRANS: %s is the already used alias.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error. %s is the already used alias.
-#: actions/apigroupcreate.php:264 actions/apigroupprofileupdate.php:351
-#: actions/editgroup.php:246 actions/newgroup.php:193
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to use an alias during group creation that is the same as the group's nickname.
 #. TRANS: Group edit form validation error.
-#: actions/apigroupcreate.php:278 actions/apigroupprofileupdate.php:359
-#: actions/editgroup.php:253
 msgid "Alias can't be the same as nickname."
 msgstr ""
 
@@ -691,26 +530,21 @@ msgstr ""
 #. TRANS: Client error displayed when trying to join a group that does not exist.
 #. TRANS: Client error displayed when trying to leave a group that does not exist.
 #. TRANS: Client error displayed trying to show group membership on a non-existing group.
+#. TRANS: Client error displayed when not providing a group or an invalid group.
 #. TRANS: Client error displayed when trying to show a group that could not be found.
 #. TRANS: Client error displayed requesting most recent notices to a group for a non-existing group.
-#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
-#: actions/apigroupleave.php:104 actions/apigroupmembership.php:71
-#: actions/apigroupprofileupdate.php:113 actions/apigroupshow.php:81
-#: actions/apitimelinegroup.php:89
 msgid "Group not found."
 msgstr "സംഘത്തെ കണ്ടെത്താനായില്ല."
 
 #. TRANS: Server error displayed when trying to join a group the user is already a member of.
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:345
 msgid "You are already a member of that group."
 msgstr "താങ്കൾ ആ സംഘത്തിൽ മുമ്പേ തന്നെ അംഗമാണ്."
 
 #. TRANS: Server error displayed when trying to join a group the user is blocked from joining.
 #. 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.
-#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:350
 msgid "You have been blocked from that group by the admin."
 msgstr "ആ സംഘത്തിൽ നിന്നും കാര്യനിർവ്വാഹകൻ താങ്കളെ തടഞ്ഞിരിക്കുന്നു."
 
@@ -718,13 +552,11 @@ msgstr "ആ സംഘത്തിൽ നിന്നും കാര്യനി
 #. TRANS: %1$s is the joining user's nickname, $2$s is the group nickname for which the join failed.
 #. TRANS: Message given having failed to add a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:136 actions/joingroup.php:139 lib/command.php:362
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "%2$s എന്ന സംഘത്തിൽ %1$s എന്ന ഉപയോക്താവിനെ ചേർക്കാൻ കഴിഞ്ഞില്ല."
 
 #. TRANS: Server error displayed when trying to leave a group the user is not a member of.
-#: actions/apigroupleave.php:115
 msgid "You are not a member of this group."
 msgstr "താങ്കൾ ഈ സംഘത്തിൽ അംഗമല്ല."
 
@@ -732,114 +564,76 @@ msgstr "താങ്കൾ ഈ സംഘത്തിൽ അംഗമല്ല."
 #. TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
 #. TRANS: Message given having failed to remove a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupleave.php:127 actions/leavegroup.php:133
-#: lib/command.php:410
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
 msgstr "%2$s എന്ന സംഘത്തിൽ നിന്നും %1$s  എന്ന ഉപയോക്താവിനെ നീക്കം ചെയ്യാൻ കഴിഞ്ഞില്ല."
 
 #. TRANS: Used as title in check for group membership. %s is a user name.
-#: actions/apigrouplist.php:94
 #, php-format
 msgid "%s's groups"
 msgstr "%s എന്ന ഉപയോക്താവിന്റെ സംഘങ്ങൾ"
 
 #. TRANS: Used as subtitle in check for group membership. %1$s is a user name, %2$s is the site name.
-#: actions/apigrouplist.php:104
 #, php-format
 msgid "%1$s groups %2$s is a member of."
 msgstr "%2$s അംഗമായ %1$s സംഘങ്ങൾ."
 
 #. TRANS: Message is used as a title when listing the lastest 20 groups. %s is a site name.
 #. TRANS: Message is used as a page title. %s is a nick name.
-#: actions/apigrouplistall.php:88 actions/usergroups.php:63
 #, php-format
 msgid "%s groups"
 msgstr "%s സംഘങ്ങൾ"
 
 #. TRANS: Message is used as a subtitle when listing the lastest 20 groups. %s is a site name.
-#: actions/apigrouplistall.php:93
 #, php-format
 msgid "groups on %s"
 msgstr "%s സൈറ്റിലെ സംഘങ്ങൾ"
 
+#. TRANS: Client error displayed when trying to edit a group without being an admin.
 #. TRANS: Client error displayed trying to edit a group while not being a group admin.
 #. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
 #. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
-#: actions/apigroupprofileupdate.php:118 actions/editgroup.php:110
-#: actions/editgroup.php:176 actions/groupdesignsettings.php:109
-#: actions/grouplogo.php:111
 msgid "You must be an admin to edit the group."
 msgstr "സംഘത്തിൽ മാറ്റം വരുത്താൻ താങ്കൾ ഒരു കാര്യനിർവ്വാഹകനായിരിക്കണം."
 
+#. TRANS: Server error displayed when group update fails.
 #. TRANS: Server error displayed when editing a group fails.
-#: actions/apigroupprofileupdate.php:171 actions/editgroup.php:274
 msgid "Could not update group."
 msgstr ""
 
+#. TRANS: Server error displayed when adding group aliases fails.
 #. TRANS: Server error displayed when group aliases could not be added.
 #. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/apigroupprofileupdate.php:194 actions/editgroup.php:281
-#: classes/User_group.php:540
 msgid "Could not create aliases."
 msgstr ""
 
+#. TRANS: API validation exception thrown when nickname does not validate.
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: actions/apigroupprofileupdate.php:249 lib/nickname.php:165
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr "വിളിപ്പേരിൽ ഇംഗ്ലീഷ് ചെറിയക്ഷരങ്ങളും അക്കങ്ങളും ഇടവിടാതെ നൽകുക."
 
-#: actions/apigroupprofileupdate.php:286
-#, fuzzy
-msgid "Full name is too long (max 255 chars)."
-msgstr "പൂർണ്ണ നാമത്തിന്റെ നീളം വളരെ കൂടുതലാണ് (പരമാവധി 255 അക്ഷരങ്ങൾ)."
-
-#: actions/apigroupprofileupdate.php:296
-#, fuzzy, php-format
-msgid "description is too long (max %d chars)."
-msgstr "വിവരണത്തിനു നീളം കൂടുതലാണ് (പരമാവധി %d അക്ഷരം)."
-
-#: actions/apigroupprofileupdate.php:307
-#, fuzzy
-msgid "Location is too long (max 255 chars)."
-msgstr "സംഘടനയുടെ പേരിന്റെ നീളം വളരെക്കൂടുതലാണ് (പരമാവധി 255 അക്ഷരങ്ങൾ)."
-
-#: actions/apigroupprofileupdate.php:326
-#, php-format
-msgid "Too many aliases! Maximum %d."
-msgstr ""
-
-#. TRANS: Group edit form validation error.
+#. TRANS: API validation exception thrown when alias is the same as nickname.
 #. TRANS: Group create form validation error.
-#. TRANS: %s is the invalid alias.
-#: actions/apigroupprofileupdate.php:342 actions/editgroup.php:241
-#: actions/newgroup.php:188
-#, php-format
-msgid "Invalid alias: \"%s\""
+msgid "Alias cannot be the same as nickname."
 msgstr ""
 
 #. TRANS: Client error displayed when uploading a media file has failed.
-#: actions/apimediaupload.php:101
 msgid "Upload failed."
 msgstr "അപ്‌ലോഡ് പരാജയപ്പെട്ടു."
 
 #. TRANS: Client error given from the OAuth API when the request token or verifier is invalid.
-#: actions/apioauthaccesstoken.php:102
 msgid "Invalid request token or verifier."
 msgstr "അസാധുവായ അഭ്യർത്ഥനാ ചീട്ട് അല്ലെങ്കിൽ പരിശോധനോപാധി."
 
 #. TRANS: Client error given when no oauth_token was passed to the OAuth API.
-#: actions/apioauthauthorize.php:107
 msgid "No oauth_token parameter provided."
 msgstr ""
 
 #. TRANS: Client error given when an invalid request token was passed to the OAuth API.
-#: actions/apioauthauthorize.php:115 actions/apioauthauthorize.php:129
 msgid "Invalid request token."
 msgstr "അസാധുവായ അഭ്യർത്ഥനാ ചീട്ട്."
 
 #. TRANS: Client error given when an invalid request token was passed to the OAuth API.
-#: actions/apioauthauthorize.php:121
 msgid "Request token already authorized."
 msgstr "അഭ്യർത്ഥനാ ചീട്ട് മുമ്പേ തന്നെ അംഗീകരിക്കപ്പെട്ടതാണ്."
 
@@ -849,31 +643,14 @@ msgstr "അഭ്യർത്ഥനാ ചീട്ട് മുമ്പേ ത
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
 #. TRANS: Client error displayed when the session token is not okay.
-#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:75
-#: actions/emailsettings.php:292 actions/favor.php:75 actions/geocode.php:55
-#: actions/groupblock.php:65 actions/grouplogo.php:321
-#: actions/groupunblock.php:65 actions/imsettings.php:241
-#: actions/invite.php:60 actions/makeadmin.php:66 actions/newmessage.php:135
-#: actions/newnotice.php:105 actions/nudge.php:80
-#: actions/oauthappssettings.php:162 actions/oauthconnectionssettings.php:135
-#: actions/passwordsettings.php:137 actions/pluginenable.php:87
-#: actions/profilesettings.php:218 actions/recoverpassword.php:383
-#: actions/register.php:157 actions/remotesubscribe.php:76
-#: actions/repeat.php:82 actions/smssettings.php:249 actions/subedit.php:40
-#: actions/subscribe.php:87 actions/tagother.php:145
-#: actions/unsubscribe.php:69 actions/urlsettings.php:171
-#: actions/userauthorization.php:53 lib/designsettings.php:122
 msgid "There was a problem with your session token. Try again, please."
 msgstr "താങ്കളുടെ സെഷൻ ചീട്ടിൽ ഒരു ചെറിയ പ്രശ്നം. ദയവായി വീണ്ടും ശ്രമിക്കുക."
 
 #. TRANS: Form validation error given when an invalid username and/or password was passed to the OAuth API.
-#: actions/apioauthauthorize.php:168
 msgid "Invalid nickname / password!"
 msgstr "അസാധുവായ വിളിപ്പേര് / രഹസ്യവാക്ക്!"
 
 #. TRANS: Server error displayed when a database action fails.
-#: actions/apioauthauthorize.php:217
 msgid "Database error inserting oauth_token_association."
 msgstr ""
 
@@ -889,28 +666,19 @@ msgstr ""
 #. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
 #. TRANS: Message given submitting a form with an unknown action in SMS settings.
 #. TRANS: Unknown form validation error in design settings form.
-#: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
-#: actions/designadminpanel.php:100 actions/editapplication.php:144
-#: actions/emailsettings.php:311 actions/grouplogo.php:332
-#: actions/imsettings.php:256 actions/newapplication.php:124
-#: actions/oauthconnectionssettings.php:144 actions/recoverpassword.php:46
-#: actions/smssettings.php:270 lib/designsettings.php:133
 msgid "Unexpected form submission."
 msgstr "അപ്രതീക്ഷിത ഫോം സമർപ്പിക്കൽ."
 
 #. TRANS: Title for a page where a user can confirm/deny account access by an external application.
-#: actions/apioauthauthorize.php:387
 msgid "An application would like to connect to your account"
 msgstr ""
 
 #. TRANS: Fieldset legend.
-#: actions/apioauthauthorize.php:404
 msgid "Allow or deny access"
 msgstr "ലഭ്യത അനുവദിക്കുക അല്ലെങ്കിൽ നിരാകരിക്കുക"
 
 #. TRANS: User notification of external application requesting account access.
 #. TRANS: %3$s is the access type requested (read-write or read-only), %4$s is the StatusNet sitename.
-#: actions/apioauthauthorize.php:425
 #, php-format
 msgid ""
 "An application would like the ability to <strong>%3$s</strong> your %4$s "
@@ -921,7 +689,6 @@ msgstr ""
 #. TRANS: User notification of external application requesting account access.
 #. TRANS: %1$s is the application name requesting access, %2$s is the organisation behind the application,
 #. TRANS: %3$s is the access type requested, %4$s is the StatusNet sitename.
-#: actions/apioauthauthorize.php:433
 #, php-format
 msgid ""
 "The application <strong>%1$s</strong> by <strong>%2$s</strong> would like "
@@ -930,22 +697,18 @@ msgid ""
 msgstr ""
 
 #. TRANS: Fieldset legend.
-#: actions/apioauthauthorize.php:455
 msgctxt "LEGEND"
 msgid "Account"
 msgstr "അംഗത്വം"
 
 #. TRANS: Field label on OAuth API authorisation form.
+#. TRANS: Field label on login page.
 #. TRANS: Field label in form for profile settings.
-#: actions/apioauthauthorize.php:459 actions/login.php:225
-#: actions/profilesettings.php:107 actions/register.php:411
-#: actions/userauthorization.php:145 lib/groupeditform.php:145
 msgid "Nickname"
 msgstr "വിളിപ്പേര്"
 
 #. TRANS: Field label on OAuth API authorisation form.
-#: actions/apioauthauthorize.php:463 actions/login.php:228
-#: actions/register.php:415 lib/settingsnav.php:87
+#. TRANS: Field label on login page.
 msgid "Password"
 msgstr "രഹസ്യവാക്ക്"
 
@@ -955,43 +718,34 @@ msgstr "രഹസ്യവാക്ക്"
 #. TRANS: Button label to cancel an IM address confirmation procedure.
 #. TRANS: Button label to cancel a SMS address confirmation procedure.
 #. TRANS: Button label in the "Edit application" form.
-#: actions/apioauthauthorize.php:478 actions/emailsettings.php:125
-#: actions/imsettings.php:136 actions/smssettings.php:132
-#: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Cancel"
 msgstr "റദ്ദാക്കുക"
 
 #. TRANS: Button text that when clicked will allow access to an account by an external application.
-#: actions/apioauthauthorize.php:485
 msgctxt "BUTTON"
 msgid "Allow"
 msgstr "അനുവദിക്കുക"
 
 #. TRANS: Form instructions.
-#: actions/apioauthauthorize.php:502
 msgid "Authorize access to your account information."
 msgstr "താങ്കളുടെ അംഗത്വ വിവരങ്ങളിലേയ്ക്കുള്ള പ്രവേശനത്തിനു അംഗീകാരം നൽകുക."
 
 #. TRANS: Header for user notification after revoking OAuth access to an application.
-#: actions/apioauthauthorize.php:594
 msgid "Authorization canceled."
 msgstr "അംഗീകാരം നൽകൽ റദ്ദാക്കി."
 
 #. TRANS: User notification after revoking OAuth access to an application.
 #. TRANS: %s is an OAuth token.
-#: actions/apioauthauthorize.php:598
 #, php-format
 msgid "The request token %s has been revoked."
 msgstr ""
 
 #. TRANS: Title of the page notifying the user that an anonymous client application was successfully authorized to access the user's account with OAuth.
-#: actions/apioauthauthorize.php:621
 msgid "You have successfully authorized the application"
 msgstr ""
 
 #. TRANS: Message notifying the user that an anonymous client application was successfully authorized to access the user's account with OAuth.
-#: actions/apioauthauthorize.php:625
 msgid ""
 "Please return to the application and enter the following security code to "
 "complete the process."
@@ -999,14 +753,12 @@ msgstr ""
 
 #. TRANS: Title of the page notifying the user that the client application was successfully authorized to access the user's account with OAuth.
 #. TRANS: %s is the authorised application name.
-#: actions/apioauthauthorize.php:632
 #, php-format
 msgid "You have successfully authorized %s"
 msgstr "താങ്കൾ വിജയകരമായി %s അംഗീകരിച്ചിരിക്കുന്നു"
 
 #. TRANS: Message notifying the user that the client application was successfully authorized to access the user's account with OAuth.
 #. TRANS: %s is the authorised application name.
-#: actions/apioauthauthorize.php:639
 #, php-format
 msgid ""
 "Please return to %s and enter the following security code to complete the "
@@ -1015,12 +767,10 @@ msgstr ""
 
 #. TRANS: Client error displayed trying to delete a status not using POST or DELETE.
 #. TRANS: POST and DELETE should not be translated.
-#: actions/apistatusesdestroy.php:111
 msgid "This method requires a POST or DELETE."
 msgstr ""
 
 #. TRANS: Client error displayed trying to delete a status of another user.
-#: actions/apistatusesdestroy.php:136
 msgid "You may not delete another user's status."
 msgstr "മറ്റൊരു ഉപയോക്താവിന്റെ സ്ഥിതിവിവരം മായ്ക്കാൻ താങ്കൾക്ക് കഴിയില്ല."
 
@@ -1028,21 +778,16 @@ msgstr "മറ്റൊരു ഉപയോക്താവിന്റെ സ്
 #. TRANS: Client error displayed trying to display redents of a non-exiting notice.
 #. TRANS: Client exception thrown when referencing a non-existing notice.
 #. TRANS: Error message displayed trying to delete a non-existing notice.
-#: actions/apistatusesretweet.php:74 actions/apistatusesretweets.php:70
-#: actions/atompubshowfavorite.php:82 actions/deletenotice.php:61
-#: actions/shownotice.php:92
 msgid "No such notice."
 msgstr "അത്തരത്തിൽ ഒരു അറിയിപ്പ് ഇല്ല."
 
 #. TRANS: Client error displayed trying to repeat an own notice through the API.
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:549
 msgid "Cannot repeat your own notice."
 msgstr "താങ്കൾക്ക് താങ്കളുടെ തന്നെ അറിയിപ്പ് ആവർത്തിക്കാനാവില്ല."
 
 #. TRANS: Client error displayed trying to re-repeat a notice through the API.
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:92 lib/command.php:555
 msgid "Already repeated that notice."
 msgstr "ആ അറിയിപ്പ് മുമ്പേ തന്നെ ആവർത്തിച്ചിരിക്കുന്നു."
 
@@ -1052,57 +797,43 @@ msgstr "ആ അറിയിപ്പ് മുമ്പേ തന്നെ ആ
 #. TRANS: Client exception thrown when using an unsupported HTTP method.
 #. TRANS: Client error shown when using a non-supported HTTP method.
 #. TRANS: Client exception thrown when using an unsupported HTTP method.
-#: actions/apistatusesshow.php:118 actions/atompubfavoritefeed.php:103
-#: actions/atompubmembershipfeed.php:105 actions/atompubshowfavorite.php:117
-#: actions/atompubshowmembership.php:116
-#: actions/atompubshowsubscription.php:122
-#: actions/atompubsubscriptionfeed.php:109
 msgid "HTTP method not supported."
 msgstr "എച്ച്.റ്റി.റ്റി.പി. രീതി പിന്തുണയ്ക്കുന്നില്ല."
 
 #. TRANS: Exception thrown requesting an unsupported notice output format.
 #. TRANS: %s is the requested output format.
-#: actions/apistatusesshow.php:144
 #, php-format
 msgid "Unsupported format: %s."
 msgstr "പിന്തുണയ്ക്കാത്തയിനം തരം: %s."
 
 #. TRANS: Client error displayed requesting a deleted status.
-#: actions/apistatusesshow.php:155
 msgid "Status deleted."
 msgstr "സ്ഥിതിവിവരക്കുറിപ്പ് മായ്ച്ചിരിക്കുന്നു."
 
 #. TRANS: Client error displayed requesting a status with an invalid ID.
-#: actions/apistatusesshow.php:162
 msgid "No status with that ID found."
 msgstr "ആ ഐ.ഡി.യിൽ ഒരു സ്ഥിതിവിവരം കണ്ടെത്താനായില്ല."
 
 #. TRANS: Client error displayed when trying to delete a notice not using the Atom format.
-#: actions/apistatusesshow.php:227
 msgid "Can only delete using the Atom format."
 msgstr "ആറ്റം ഫോർമാറ്റ് ഉപയോഗിച്ചു മാത്രമേ മായ്ക്കാൻ കഴിയൂ."
 
 #. TRANS: Client error displayed when a user has no rights to delete notices of other users.
 #. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
-#: actions/apistatusesshow.php:235 actions/deletenotice.php:78
 msgid "Cannot delete this notice."
 msgstr "ഈ അറിയിപ്പ് മായ്ക്കാൻ കഴിയില്ല."
 
 #. TRANS: Confirmation of notice deletion in API. %d is the ID (number) of the deleted notice.
-#: actions/apistatusesshow.php:249
 #, php-format
 msgid "Deleted notice %d"
 msgstr "%d എന്ന അറിയിപ്പ് മായ്ക്കുക"
 
 #. TRANS: Client error displayed when the parameter "status" is missing.
-#: actions/apistatusesupdate.php:221
 msgid "Client must provide a 'status' parameter with a value."
 msgstr "ക്ലയന്റ് 'status' ചരത്തിന് ഒരു വില നൽകിയിരിക്കണം."
 
 #. TRANS: Client error displayed when the parameter "status" is missing.
 #. TRANS: %d is the maximum number of character for a notice.
-#: actions/apistatusesupdate.php:244 actions/newnotice.php:161
-#: lib/mailhandler.php:60
 #, php-format
 msgid "That's too long. Maximum notice size is %d character."
 msgid_plural "That's too long. Maximum notice size is %d characters."
@@ -1110,13 +841,11 @@ msgstr[0] "അത് വളരെ വലുതാണ്. അറിയിപ്
 msgstr[1] "അത് വളരെ വലുതാണ്. അറിയിപ്പിന്റെ പരമാവധി വലിപ്പം %d അക്ഷരങ്ങളാണ്."
 
 #. TRANS: Client error displayed when replying to a non-existing notice.
-#: actions/apistatusesupdate.php:284
 msgid "Parent notice not found."
 msgstr "മാതൃ അറിയിപ്പ് കണ്ടെത്താനായില്ല."
 
 #. TRANS: Client error displayed exceeding the maximum notice length.
 #. TRANS: %d is the maximum lenth for a notice.
-#: actions/apistatusesupdate.php:308 actions/newnotice.php:184
 #, php-format
 msgid "Maximum notice size is %d character, including attachment URL."
 msgid_plural "Maximum notice size is %d characters, including attachment URL."
@@ -1127,13 +856,11 @@ msgstr[1] ""
 
 #. TRANS: Client error displayed when requesting profiles of followers in an unsupported format.
 #. TRANS: Client error displayed when requesting IDs of followers in an unsupported format.
-#: actions/apisubscriptions.php:228 actions/apisubscriptions.php:258
 msgid "Unsupported format."
 msgstr "പിന്തുണയ്ക്കാത്തയിനം തരം."
 
 #. TRANS: Title for timeline of most recent favourite notices by a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname.
-#: actions/apitimelinefavorites.php:108
 #, php-format
 msgid "%1$s / Favorites from %2$s"
 msgstr "%1$s / %2$s എന്ന ഉപയോക്താവിന് പ്രിയങ്കരമായവ"
@@ -1141,14 +868,12 @@ msgstr "%1$s / %2$s എന്ന ഉപയോക്താവിന് പ്ര
 #. TRANS: Subtitle for timeline of most recent favourite notices by a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user's full name,
 #. TRANS: %3$s is a user nickname.
-#: actions/apitimelinefavorites.php:120
 #, php-format
 msgid "%1$s updates favorited by %2$s / %3$s."
 msgstr ""
 
 #. TRANS: Title for timeline of most recent mentions of a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname.
-#: actions/apitimelinementions.php:115
 #, php-format
 msgid "%1$s / Updates mentioning %2$s"
 msgstr ""
@@ -1156,48 +881,40 @@ msgstr ""
 #. TRANS: Subtitle for timeline of most recent mentions of a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname,
 #. TRANS: %3$s is a user's full name.
-#: actions/apitimelinementions.php:131
 #, php-format
 msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr ""
 
 #. TRANS: Title for site timeline. %s is the StatusNet sitename.
 #. TRANS: Public RSS feed title. %s is the StatusNet site name.
-#: actions/apitimelinepublic.php:193 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "%s സാർവ്വജനിക സമയരേഖ"
 
 #. TRANS: Subtitle for site timeline. %s is the StatusNet sitename.
-#: actions/apitimelinepublic.php:199
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "%s പദ്ധതിയിൽ എല്ലാവരും അയച്ചിട്ടുള്ള പുതിയവാർത്തകൾ!"
 
 #. TRANS: Server error displayed calling unimplemented API method for 'retweeted by me'.
-#: actions/apitimelineretweetedbyme.php:71
 msgid "Unimplemented."
 msgstr "പ്രാവർത്തികമാക്കിയിട്ടില്ല."
 
 #. TRANS: Title for Atom feed "repeated to me". %s is the user nickname.
-#: actions/apitimelineretweetedtome.php:96
 #, php-format
 msgid "Repeated to %s"
 msgstr "%s എന്ന ഉപയോക്താവിനായി ആവർത്തിച്ചത്"
 
-#: actions/apitimelineretweetedtome.php:98
 #, php-format
 msgid "%1$s notices that were to repeated to %2$s / %3$s."
 msgstr ""
 
 #. TRANS: Title of list of repeated notices of the logged in user.
 #. TRANS: %s is the nickname of the logged in user.
-#: actions/apitimelineretweetsofme.php:98
 #, php-format
 msgid "Repeats of %s"
 msgstr "%s എന്ന ഉപയോക്താവിന്റെ ആവർത്തനങ്ങൾ"
 
-#: actions/apitimelineretweetsofme.php:104
 #, php-format
 msgid "%1$s notices that %2$s / %3$s has repeated."
 msgstr ""
@@ -1206,171 +923,138 @@ msgstr ""
 #. TRANS: %s is the tag.
 #. TRANS: Title for first page of notices with tags.
 #. TRANS: %s is the tag.
-#: actions/apitimelinetag.php:101 actions/tag.php:69
 #, php-format
 msgid "Notices tagged with %s"
 msgstr "%s എന്നു റ്റാഗ് ചെയ്തിട്ടുള്ള അറിയിപ്പുകൾ"
 
 #. TRANS: Subtitle for timeline with lastest notices with a given tag.
 #. TRANS: %1$s is the tag, $2$s is the StatusNet sitename.
-#: actions/apitimelinetag.php:105 actions/tagrss.php:65
 #, php-format
 msgid "Updates tagged with %1$s on %2$s!"
 msgstr ""
 
 #. TRANS: Client error displayed trying to add a notice to another user's timeline.
-#: actions/apitimelineuser.php:308
 msgid "Only the user can add to their own timeline."
 msgstr "ഉപയോക്താവിനു മാത്രമേ അദ്ദേഹത്തിന്റെ സ്വന്തം സമയരേഖ ചേർക്കാൻ കഴിയൂ."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:315
 msgid "Only accept AtomPub for Atom feeds."
 msgstr ""
 
 #. TRANS: Client error displayed attempting to post an empty API notice.
-#: actions/apitimelineuser.php:322
 msgid "Atom post must not be empty."
 msgstr ""
 
 #. TRANS: Client error displayed attempting to post an API that is not well-formed XML.
-#: actions/apitimelineuser.php:328
 msgid "Atom post must be well-formed XML."
 msgstr ""
 
 #. TRANS: Client error displayed when not using an Atom entry.
-#: actions/apitimelineuser.php:334 actions/atompubfavoritefeed.php:228
-#: actions/atompubmembershipfeed.php:230
-#: actions/atompubsubscriptionfeed.php:236
 msgid "Atom post must be an Atom entry."
 msgstr ""
 
 #. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
-#: actions/apitimelineuser.php:345
 msgid "Can only handle POST activities."
 msgstr ""
 
 #. TRANS: Client error displayed when using an unsupported activity object type.
 #. TRANS: %s is the unsupported activity object type.
-#: actions/apitimelineuser.php:356
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
 #. TRANS: %d is the notice ID (number).
-#: actions/apitimelineuser.php:390
 #, php-format
 msgid "No content for notice %d."
 msgstr "%d എന്ന അറിയിപ്പിനു ഉള്ളടക്കമില്ല"
 
 #. TRANS: Client error displayed when using another format than AtomPub.
 #. TRANS: %s is the notice URI.
-#: actions/apitimelineuser.php:419
 #, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "\"%s\" എന്ന യൂ.ആർ.ഐ.യിൽ അറിയിപ്പ് മുമ്പേ നിലവിലുണ്ട്."
 
 #. TRANS: Server error for unfinished API method showTrends.
-#: actions/apitrends.php:85
 msgid "API method under construction."
 msgstr "എ.പി.ഐ. മെഥേഡ് നിർമ്മാണത്തിലാണ്."
 
 #. TRANS: Client error displayed when requesting user information for a non-existing user.
-#: actions/apiuserprofileimage.php:80 actions/apiusershow.php:94
 msgid "User not found."
 msgstr "ഉപയോക്താവിനെ കണ്ടത്താനായില്ല."
 
 #. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
 #. TRANS: Client exception.
 #. TRANS: Client error displayed trying to subscribe to a non-existing profile.
-#: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
-#: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
-#: actions/subscribe.php:110
 msgid "No such profile."
 msgstr ""
 
 #. TRANS: Subtitle for Atom favorites feed.
 #. TRANS: %1$s is a user nickname, %2$s is the StatusNet sitename.
-#: actions/atompubfavoritefeed.php:147
 #, php-format
 msgid "Notices %1$s has favorited on %2$s"
 msgstr "%2$s പദ്ധതിയിലെ അറിയിപ്പുകൾ %1$s എന്ന ഉപയോക്താവ് പ്രിയങ്കരമാണെന്ന് കുറിച്ചിട്ടുണ്ട്"
 
 #. TRANS: Client exception thrown when trying to set a favorite for another user.
 #. TRANS: Client exception thrown when trying to subscribe another user.
-#: actions/atompubfavoritefeed.php:217 actions/atompubsubscriptionfeed.php:225
 #, fuzzy
 msgid "Cannot add someone else's subscription."
 msgstr "മറ്റൊരാളുടെ അംഗത്വം മായ്ക്കാനാവില്ല."
 
 #. TRANS: Client exception thrown when trying use an incorrect activity verb for the Atom pub method.
-#: actions/atompubfavoritefeed.php:240
 msgid "Can only handle favorite activities."
 msgstr "പ്രിയങ്കരമാക്കാനുള്ള പ്രക്രിയകൾ മാത്രം കൈകാര്യം ചെയ്യാനേ കഴിയൂ."
 
 #. TRANS: Client exception thrown when trying favorite an object that is not a notice.
-#: actions/atompubfavoritefeed.php:250 actions/atompubmembershipfeed.php:250
 msgid "Can only fave notices."
 msgstr "അറിയിപ്പുകൾ മാത്രമേ പ്രിയങ്കരമാണെന്ന് കുറിക്കാനാവൂ."
 
 #. TRANS: Client exception thrown when trying favorite a notice without content.
-#: actions/atompubfavoritefeed.php:259
 msgid "Unknown note."
 msgstr "അജ്ഞാതമായ കുറിപ്പ്."
 
 #. TRANS: Client exception thrown when trying favorite an already favorited notice.
-#: actions/atompubfavoritefeed.php:267
 msgid "Already a favorite."
 msgstr "മുമ്പേ തന്നെ പ്രിയങ്കരമാണ്."
 
 #. TRANS: Title for group membership feed.
 #. TRANS: %s is a username.
-#: actions/atompubmembershipfeed.php:144
 #, php-format
 msgid "%s group memberships"
 msgstr "%s സംഘ അംഗത്വങ്ങൾ"
 
 #. TRANS: Subtitle for group membership feed.
 #. TRANS: %1$s is a username, %2$s is the StatusNet sitename.
-#: actions/atompubmembershipfeed.php:149
 #, php-format
 msgid "Groups %1$s is a member of on %2$s"
 msgstr "%2$s സൈറ്റിലെ ഒരു ഭാഗമാണ് %1$s എന്ന സംഘം"
 
 #. TRANS: Client exception thrown when trying subscribe someone else to a group.
-#: actions/atompubmembershipfeed.php:219
 msgid "Cannot add someone else's membership."
 msgstr "മറ്റൊരാളുടെ അംഗത്വം കൂട്ടിച്ചേർക്കാനാവില്ല."
 
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#: actions/atompubmembershipfeed.php:242
 msgid "Can only handle join activities."
 msgstr "പങ്ക് ചേരൽ പ്രക്രിയകൾ മാത്രം കൈകാര്യം ചെയ്യാനേ കഴിയൂ."
 
 #. TRANS: Client exception thrown when trying to subscribe to a non-existing group.
-#: actions/atompubmembershipfeed.php:259
 msgid "Unknown group."
 msgstr "അജ്ഞാത സംഘം."
 
 #. TRANS: Client exception thrown when trying to subscribe to an already subscribed group.
-#: actions/atompubmembershipfeed.php:267
 msgid "Already a member."
 msgstr "ഇപ്പോൾ തന്നെ അംഗമാണ്."
 
 #. TRANS: Client exception thrown when trying to subscribe to group while blocked from that group.
-#: actions/atompubmembershipfeed.php:275
 msgid "Blocked by admin."
 msgstr "കാര്യനിർവ്വാഹകനാൽ തടയപ്പെട്ടിരിക്കുന്നു."
 
 #. TRANS: Client exception thrown when referencing a non-existing favorite.
-#: actions/atompubshowfavorite.php:90
 msgid "No such favorite."
 msgstr "അത്തരത്തിൽ പ്രിയങ്കരമാക്കപ്പെട്ട ഒന്നും ഇല്ല."
 
 #. TRANS: Client exception thrown when trying to remove a favorite notice of another user.
-#: actions/atompubshowfavorite.php:151
 msgid "Cannot delete someone else's favorite."
 msgstr "മറ്റൊരാൾക്ക് പ്രിയങ്കരമാണ് എന്നത് മായ്ക്കാനാവില്ല."
 
@@ -1396,90 +1080,65 @@ msgstr "മറ്റൊരാൾക്ക് പ്രിയങ്കരമാ
 #. TRANS: Client error displayed when trying to join a non-existing group.
 #. TRANS: Client error displayed when trying to leave a non-local group.
 #. TRANS: Client error displayed when trying to leave a non-existing group.
+#. TRANS: Client error displayed when providing an invalid group ID on the Make Admin page.
 #. 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.
 #. TRANS: Command exception text shown when a group is requested that does not exist.
 #. TRANS: Error text shown when trying to leave a group that does not exist.
-#: actions/atompubshowmembership.php:81 actions/blockedfromgroup.php:81
-#: actions/blockedfromgroup.php:89 actions/deletegroup.php:87
-#: actions/deletegroup.php:100 actions/editgroup.php:102
-#: actions/foafgroup.php:46 actions/foafgroup.php:65 actions/foafgroup.php:73
-#: actions/groupblock.php:89 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:101 actions/grouplogo.php:103
-#: actions/groupmembers.php:84 actions/groupmembers.php:92
-#: actions/grouprss.php:97 actions/grouprss.php:105
-#: actions/groupunblock.php:89 actions/joingroup.php:82
-#: actions/joingroup.php:95 actions/leavegroup.php:82
-#: actions/leavegroup.php:95 actions/makeadmin.php:86
-#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:392
 msgid "No such group."
 msgstr "അങ്ങനെ ഒരു സംഘം ഇല്ല."
 
 #. TRANS: Client exception thrown when trying to show membership of a non-subscribed group
-#: actions/atompubshowmembership.php:91
 msgid "Not a member."
 msgstr "അംഗം അല്ല"
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
-#: actions/atompubshowmembership.php:150
 msgid "Cannot delete someone else's membership."
 msgstr "മറ്റൊരാളുടെ അംഗത്വം മായ്ക്കാനാവില്ല."
 
 #. TRANS: Client exception thrown when trying to display a subscription for a non-existing profile ID.
 #. TRANS: %d is the non-existing profile ID number.
-#: actions/atompubshowsubscription.php:72
-#: actions/atompubshowsubscription.php:83
-#: actions/atompubsubscriptionfeed.php:74
 #, fuzzy, php-format
 msgid "No such profile id: %d."
 msgstr "അത്തരത്തിൽ ഒരു അറിയിപ്പ് ഇല്ല."
 
 #. 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.
-#: actions/atompubshowsubscription.php:94
 #, php-format
 msgid "Profile %1$d not subscribed to profile %2$d."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to delete a subscription of another user.
-#: actions/atompubshowsubscription.php:157
 msgid "Cannot delete someone else's subscription."
 msgstr "മറ്റൊരാളുടെ വരിക്കാരനാകൽ നീക്കം ചെയ്യാനാകില്ല."
 
 #. TRANS: Subtitle for Atom subscription feed.
 #. TRANS: %1$s is a user nickname, %s$s is the StatusNet sitename.
-#: actions/atompubsubscriptionfeed.php:153
 #, fuzzy, php-format
 msgid "People %1$s has subscribed to on %2$s"
 msgstr "എല്ലാ വരിക്കാരും"
 
 #. TRANS: Client error displayed when not using the follow verb.
-#: actions/atompubsubscriptionfeed.php:248
 msgid "Can only handle Follow activities."
 msgstr "പിന്തുടരൽ പ്രക്രിയകൾ മാത്രം കൈകാര്യം ചെയ്യാനേ കഴിയൂ."
 
 #. TRANS: Client exception thrown when subscribing to an object that is not a person.
-#: actions/atompubsubscriptionfeed.php:256
 msgid "Can only follow people."
 msgstr "ഉപയോക്താക്കളെ പിന്തുടരാൻ മാത്രമേ കഴിയൂ."
 
 #. TRANS: Client exception thrown when subscribing to a non-existing profile.
 #. TRANS: %s is the unknown profile ID.
-#: actions/atompubsubscriptionfeed.php:267
 #, fuzzy, php-format
 msgid "Unknown profile %s."
 msgstr "അജ്ഞാതമായ കുറിപ്പ്."
 
 #. TRANS: Client error displayed trying to subscribe to an already subscribed profile.
 #. TRANS: %s is the profile the user already has a subscription on.
-#: actions/atompubsubscriptionfeed.php:275
 #, php-format
 msgid "Already subscribed to %s."
 msgstr "മുമ്പേ തന്നെ %s എന്ന ഉപയോക്താവിന്റെ വരിക്കാരനാണ്."
 
 #. TRANS: Client error displayed trying to get a non-existing attachment.
-#: actions/attachment.php:73
 msgid "No such attachment."
 msgstr ""
 
@@ -1491,31 +1150,23 @@ msgstr ""
 #. TRANS: Client error displayed when trying to view group members without providing a group nickname.
 #. TRANS: Client error displayed when requesting a group RSS feed without providing a group nickname.
 #. TRANS: Client error displayed if no nickname argument was given requesting a group page.
-#: actions/avatarbynickname.php:60 actions/blockedfromgroup.php:73
-#: actions/editgroup.php:85 actions/groupdesignsettings.php:84
-#: actions/grouplogo.php:86 actions/groupmembers.php:76
-#: actions/grouprss.php:89 actions/showgroup.php:116
 msgid "No nickname."
 msgstr "അങ്ങിനെ വിളിപ്പേര് ഇല്ല."
 
 #. TRANS: Client error displayed trying to get an avatar without providing an avatar size.
-#: actions/avatarbynickname.php:66
 msgid "No size."
 msgstr "വലിപ്പം നൽകിയിട്ടില്ല."
 
 #. TRANS: Client error displayed trying to get an avatar providing an invalid avatar size.
-#: actions/avatarbynickname.php:72
 msgid "Invalid size."
 msgstr "അസാധുവായ വലിപ്പം."
 
 #. TRANS: Title for avatar upload page.
-#: actions/avatarsettings.php:66 lib/settingsnav.php:82
 msgid "Avatar"
 msgstr "അവതാരം"
 
 #. TRANS: Instruction for avatar upload page.
 #. TRANS: %s is the maximum file size, for example "500b", "10kB" or "2MB".
-#: actions/avatarsettings.php:78
 #, php-format
 msgid "You can upload your personal avatar. The maximum file size is %s."
 msgstr ""
@@ -1524,17 +1175,12 @@ msgstr ""
 #. TRANS: Server error displayed coming across a request from a user without a profile.
 #. TRANS: Server error displayed when trying to authorise a remote subscription request
 #. TRANS: while the user has no profile.
-#: actions/avatarsettings.php:108 actions/avatarsettings.php:192
-#: actions/grouplogo.php:184 actions/remotesubscribe.php:190
-#: actions/userauthorization.php:75 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr ""
 
 #. TRANS: Avatar upload page form legend.
 #. TRANS: Avatar upload page crop form legend.
 #. TRANS: Legend for group logo settings fieldset.
-#: actions/avatarsettings.php:122 actions/avatarsettings.php:205
-#: actions/grouplogo.php:261
 msgid "Avatar settings"
 msgstr "അവതാരത്തിന്റെ സജ്ജീകരണം"
 
@@ -1542,8 +1188,6 @@ msgstr "അവതാരത്തിന്റെ സജ്ജീകരണം"
 #. TRANS: Header on avatar upload crop form for thumbnail of originally uploaded avatar (h2).
 #. TRANS: Uploaded original file in group logo form.
 #. TRANS: Header for originally uploaded file before a crop on the group logo page.
-#: actions/avatarsettings.php:131 actions/avatarsettings.php:214
-#: actions/grouplogo.php:207 actions/grouplogo.php:270
 msgid "Original"
 msgstr "യഥാർത്ഥം"
 
@@ -1551,81 +1195,66 @@ msgstr "യഥാർത്ഥം"
 #. TRANS: Header on avatar upload crop form for thumbnail of to be used rendition of uploaded avatar (h2).
 #. TRANS: Header for preview of to be displayed group logo.
 #. TRANS: Header for the cropped group logo on the group logo page.
-#: actions/avatarsettings.php:147 actions/avatarsettings.php:227
-#: actions/grouplogo.php:219 actions/grouplogo.php:283
 msgid "Preview"
 msgstr "എങ്ങനെയുണ്ടെന്നു കാണുക"
 
 #. TRANS: Button on avatar upload page to delete current avatar.
 #. TRANS: Button text for user account deletion.
-#: actions/avatarsettings.php:155 actions/deleteaccount.php:319
 msgctxt "BUTTON"
 msgid "Delete"
 msgstr "മായ്ക്കുക"
 
 #. TRANS: Button on avatar upload page to upload an avatar.
 #. TRANS: Submit button to confirm upload of a user backup file for account restore.
-#: actions/avatarsettings.php:173 actions/restoreaccount.php:369
 msgctxt "BUTTON"
 msgid "Upload"
 msgstr "അപ്‌ലോഡ്"
 
 #. TRANS: Button on avatar upload crop form to confirm a selected crop as avatar.
-#: actions/avatarsettings.php:243
 msgctxt "BUTTON"
 msgid "Crop"
 msgstr "വെട്ടിച്ചെറുതാക്കുക"
 
 #. TRANS: Validation error on avatar upload form when no file was uploaded.
-#: actions/avatarsettings.php:318
 msgid "No file uploaded."
 msgstr "പ്രമാണമൊന്നും അപ്‌ലോഡ് ചെയ്തിട്ടില്ല."
 
 #. TRANS: Avatar upload form instruction after uploading a file.
-#: actions/avatarsettings.php:345
 #, fuzzy
 msgid "Pick a square area of the image to be your avatar."
 msgstr "ലോഗോ ആക്കാൻ ചിത്രത്തിന്റെ ഒരു സമചതുരത്തിലുള്ള ഭാഗം തിരഞ്ഞെടുക്കുക."
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
 #. TRANS: Server error displayed trying to crop an uploaded group logo that is no longer present.
-#: actions/avatarsettings.php:360 actions/grouplogo.php:391
 msgid "Lost our file data."
 msgstr ""
 
 #. TRANS: Success message for having updated a user avatar.
-#: actions/avatarsettings.php:384
 msgid "Avatar updated."
 msgstr "അവതാരം പുതുക്കി."
 
 #. TRANS: Error displayed on the avatar upload page if the avatar could not be updated for an unknown reason.
-#: actions/avatarsettings.php:388
 msgid "Failed updating avatar."
 msgstr "അവതാരം അപ്‌ലോഡ് ചെയ്യുന്നത് പരാജയപ്പെട്ടു."
 
 #. TRANS: Success message for deleting a user avatar.
-#: actions/avatarsettings.php:412
 msgid "Avatar deleted."
 msgstr ""
 
 #. TRANS: Title for backup account page.
 #. TRANS: Option in profile settings to create a backup of the account of the currently logged in user.
-#: actions/backupaccount.php:61 actions/profilesettings.php:468
 msgid "Backup account"
 msgstr "അംഗത്വത്തിന്റെ ബാക്ക്അപ് എടുക്കുക"
 
 #. TRANS: Client exception thrown when trying to backup an account while not logged in.
-#: actions/backupaccount.php:79
 msgid "Only logged-in users can backup their account."
 msgstr "ലോഗിൻ ചെയ്തിട്ടുള്ള ഉപയോക്താക്കൾക്കു മാത്രമേ അവരുടെ അംഗത്വത്തിന്റെ ബാക്ക്അപ് എടുക്കാനാവു."
 
 #. TRANS: Client exception thrown when trying to backup an account without having backup rights.
-#: actions/backupaccount.php:84
 msgid "You may not backup your account."
 msgstr "താങ്കൾക്ക് താങ്കളുടെ അംഗത്വത്തിന്റെ ബാക്ക്അപ് എടുക്കാനായേക്കില്ല."
 
 #. TRANS: Information displayed on the backup account page.
-#: actions/backupaccount.php:227
 msgid ""
 "You can backup your account data in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format. This is an experimental feature and provides "
@@ -1635,30 +1264,25 @@ msgid ""
 msgstr ""
 
 #. TRANS: Submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:250
 msgctxt "BUTTON"
 msgid "Backup"
 msgstr "ബാക്ക്അപ്"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:254
 msgid "Backup your account."
 msgstr "താങ്കളുടെ അംഗത്വത്തിന്റെ ബാക്ക്അപ് എടുക്കുക."
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
-#: actions/block.php:68
 msgid "You already blocked that user."
 msgstr "താങ്കൾ മുമ്പേ തന്നെ ആ ഉപയോക്താവിനെ തടഞ്ഞിരിക്കുകയാണ്."
 
 #. TRANS: Title for block user page.
 #. TRANS: Legend for block user form.
 #. TRANS: Fieldset legend for block user from group form.
-#: actions/block.php:106 actions/block.php:136 actions/groupblock.php:165
 msgid "Block user"
 msgstr "ഉപയോക്താവിനെ തടയുക"
 
 #. TRANS: Explanation of consequences when blocking a user on the block user page.
-#: actions/block.php:139
 msgid ""
 "Are you sure you want to block this user? Afterwards, they will be "
 "unsubscribed from you, unable to subscribe to you in the future, and you "
@@ -1671,15 +1295,11 @@ msgstr ""
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:154 actions/deleteapplication.php:157
-#: actions/deletegroup.php:220 actions/deletenotice.php:155
-#: actions/deleteuser.php:154 actions/groupblock.php:187
 msgctxt "BUTTON"
 msgid "No"
 msgstr "അല്ല"
 
 #. TRANS: Submit button title for 'No' when blocking a user.
-#: actions/block.php:158
 msgid "Do not block this user."
 msgstr "ഈ ഉപയോക്താവിനെ തടയരുത്."
 
@@ -1689,174 +1309,138 @@ msgstr "ഈ ഉപയോക്താവിനെ തടയരുത്."
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:161 actions/deleteapplication.php:164
-#: actions/deletegroup.php:227 actions/deletenotice.php:162
-#: actions/deleteuser.php:161 actions/groupblock.php:194
 msgctxt "BUTTON"
 msgid "Yes"
 msgstr "അതെ"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:165
 msgid "Block this user."
 msgstr "ഈ ഉപയോക്താവിനെ തടയുക."
 
 #. TRANS: Server error displayed when blocking a user fails.
-#: actions/block.php:189
 msgid "Failed to save block information."
 msgstr "തടയലിന്റെ വിവരങ്ങൾ സേവ് ചെയ്യുന്നതിൽ പരാജയപ്പെട്ടു."
 
 #. TRANS: Title for first page with list of users blocked from a group.
 #. TRANS: %s is a group nickname.
-#: actions/blockedfromgroup.php:101
 #, php-format
 msgid "%s blocked profiles"
 msgstr ""
 
 #. TRANS: Title for any but the first page with list of users blocked from a group.
 #. TRANS: %1$s is a group nickname, %2$d is a page number.
-#: actions/blockedfromgroup.php:106
 #, php-format
 msgid "%1$s blocked profiles, page %2$d"
 msgstr ""
 
 #. TRANS: Instructions for list of users blocked from a group.
-#: actions/blockedfromgroup.php:122
 msgid "A list of the users blocked from joining this group."
 msgstr "ഈ സംഘത്തിൽ ചേരുന്നതിൽ നിന്നും തടയപ്പെട്ടിട്ടുള്ള ഉപയോക്താക്കളുടെ പട്ടിക."
 
 #. TRANS: Form legend for unblocking a user from a group.
-#: actions/blockedfromgroup.php:291
 msgid "Unblock user from group"
 msgstr "സംഘത്തിൽ നിന്നും ഉപയോക്താവിനുള്ള തടയൽ നീക്കുക"
 
 #. TRANS: Button text for unblocking a user from a group.
-#: actions/blockedfromgroup.php:323
 msgctxt "BUTTON"
 msgid "Unblock"
 msgstr "തടയൽ നീക്കുക"
 
 #. TRANS: Tooltip for button for unblocking a user from a group.
 #. TRANS: Description of the form to unblock a user.
-#: actions/blockedfromgroup.php:327 lib/unblockform.php:78
 msgid "Unblock this user"
 msgstr "ഈ ഉപയോക്താവിന്റെ തടയൽ നീക്കുക"
 
 #. TRANS: Title for mini-posting window loaded from bookmarklet.
 #. TRANS: %s is the StatusNet site name.
-#: actions/bookmarklet.php:51
 #, php-format
 msgid "Post to %s"
 msgstr ""
 
 #. TRANS: Client error displayed when not providing a confirmation code in the contact address confirmation action.
-#: actions/confirmaddress.php:74
 msgid "No confirmation code."
 msgstr "സ്ഥിരീകരണ കോഡ് ഇല്ല."
 
 #. TRANS: Client error displayed when providing a non-existing confirmation code in the contact address confirmation action.
-#: actions/confirmaddress.php:80
 msgid "Confirmation code not found."
 msgstr "സ്ഥിരീകരണ കോഡ് കണ്ടെത്താനായില്ല."
 
 #. TRANS: Client error displayed when not providing a confirmation code for another user in the contact address confirmation action.
-#: actions/confirmaddress.php:86
 msgid "That confirmation code is not for you!"
 msgstr "ആ സ്ഥിരീകരണ കോഡ് താങ്കൾക്കുള്ളതല്ല!"
 
 #. TRANS: Server error for an unknown address type, which can be 'email', 'sms', or the name of an IM network (such as 'xmpp' or 'aim')
-#: actions/confirmaddress.php:94
 #, fuzzy, php-format
 msgid "Unrecognized address type %s"
 msgstr "തിരിച്ചറിയാവാത്ത തരം വിലാസം %s."
 
 #. TRANS: Client error for an already confirmed email/jabber/sms address.
-#: actions/confirmaddress.php:103 actions/confirmaddress.php:136
 msgid "That address has already been confirmed."
 msgstr "ആ വിലാസം മുമ്പേ തന്നെ സ്ഥിരീകരിക്കപ്പെട്ടതാണ്."
 
-#: actions/confirmaddress.php:121 actions/imsettings.php:444
-#: actions/userdesignsettings.php:306
-#, fuzzy
 msgid "Couldn't update user."
 msgstr "ഉപയോക്തൃ വിവരങ്ങൾ പുതുക്കാൻ കഴിഞ്ഞില്ല."
 
-#: actions/confirmaddress.php:144
 #, fuzzy
 msgid "Couldn't update user im preferences."
 msgstr "ഉപയോക്തൃ രേഖകൾ പുതുക്കാൻ കഴിഞ്ഞില്ല."
 
-#: actions/confirmaddress.php:156
 #, fuzzy
 msgid "Couldn't insert user im preferences."
 msgstr "സന്ദേശം ഉൾപ്പെടുത്താൻ കഴിഞ്ഞില്ല."
 
 #. TRANS: Server error displayed when an address confirmation code deletion from the
 #. TRANS: database fails in the contact address confirmation action.
-#: actions/confirmaddress.php:169
 msgid "Could not delete address confirmation."
 msgstr "ഇമെയിൽ സ്ഥിരീകരണം നീക്കം ചെയ്യാൻ കഴിഞ്ഞില്ല."
 
 #. TRANS: Title for the contact address confirmation action.
-#: actions/confirmaddress.php:185
 msgid "Confirm address"
 msgstr "വിലാസം സ്ഥിരീകരിക്കുക"
 
 #. TRANS: Success message for the contact address confirmation action.
 #. TRANS: %s can be 'email', 'jabber', or 'sms'.
-#: actions/confirmaddress.php:200
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "താങ്കളുടെ അംഗത്വത്തിന് \"%s\" എന്ന വിലാസം സ്ഥിരീകരിച്ചിരിക്കുന്നു."
 
 #. TRANS: Title for page with a conversion (multiple notices in context).
-#: actions/conversation.php:96
 msgid "Conversation"
 msgstr "സംഭാഷണം"
 
 #. TRANS: Header on conversation page. Hidden by default (h2).
 #. TRANS: Label for user statistics.
-#: actions/conversation.php:149 lib/noticelist.php:87
-#: lib/profileaction.php:246 lib/searchgroupnav.php:82
-#: lib/threadednoticelist.php:66
 msgid "Notices"
 msgstr "അറിയിപ്പുകൾ"
 
 #. TRANS: Client exception displayed trying to delete a user account while not logged in.
-#: actions/deleteaccount.php:71
 msgid "Only logged-in users can delete their account."
 msgstr "ലോഗിൻ ചെയ്തിട്ടുള്ള ഉപയോക്താക്കൾക്കു മാത്രമേ അവരുടെ അംഗത്വം മായ്ക്കാനാകൂ."
 
 #. TRANS: Client exception displayed trying to delete a user account without have the rights to do that.
-#: actions/deleteaccount.php:77
 msgid "You cannot delete your account."
 msgstr "താങ്കളുടെ അംഗത്വം താങ്കൾക്ക് മായ്ക്കാനാകില്ല."
 
 #. TRANS: Confirmation text for user deletion. The user has to type this exactly the same, including punctuation.
-#: actions/deleteaccount.php:160 actions/deleteaccount.php:297
 msgid "I am sure."
 msgstr "എനിക്കുറപ്പാണ്."
 
 #. TRANS: Notification for user about the text that must be input to be able to delete a user account.
 #. TRANS: %s is the text that needs to be input.
-#: actions/deleteaccount.php:164
 #, php-format
 msgid "You must write \"%s\" exactly in the box."
 msgstr "പെട്ടിയിൽ  \"%s\" എന്നു തന്നെ താങ്കൾ എഴുതി നൽകണം."
 
 #. TRANS: Confirmation that a user account has been deleted.
-#: actions/deleteaccount.php:206
 msgid "Account deleted."
 msgstr "അംഗത്വം മായ്ച്ചിരിക്കുന്നു."
 
 #. TRANS: Page title for page on which a user account can be deleted.
 #. TRANS: Option in profile settings to delete the account of the currently logged in user.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:476
 msgid "Delete account"
 msgstr "അംഗത്വം മായ്ക്കുക"
 
 #. TRANS: Form text for user deletion form.
-#: actions/deleteaccount.php:279
 msgid ""
 "This will <strong>permanently delete</strong> your account data from this "
 "server."
@@ -1865,7 +1449,6 @@ msgstr ""
 
 #. TRANS: Additional form text for user deletion form shown if a user has account backup rights.
 #. TRANS: %s is a URL to the backup page.
-#: actions/deleteaccount.php:285
 #, php-format
 msgid ""
 "You are strongly advised to <a href=\"%s\">back up your data</a> before "
@@ -1874,55 +1457,42 @@ msgstr ""
 
 #. TRANS: Field label for delete account confirmation entry.
 #. TRANS: Field label for password reset form where the password has to be typed again.
-#: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:262 actions/register.php:419
 msgid "Confirm"
 msgstr "സ്ഥിരീകരിക്കുക"
 
 #. TRANS: Input title for the delete account field.
 #. TRANS: %s is the text that needs to be input.
-#: actions/deleteaccount.php:304
 #, php-format
 msgid "Enter \"%s\" to confirm that you want to delete your account."
 msgstr "താങ്കളുടെ അംഗത്വം മായ്ക്കണമെന്ന് സ്ഥിരികരിക്കാൻ  \"%s\" നൽകുക."
 
 #. TRANS: Button title for user account deletion.
-#: actions/deleteaccount.php:323
 msgid "Permanently delete your account"
 msgstr "താങ്കളുടെ അംഗത്വം എന്നെന്നേക്കുമായി മായ്ച്ചുകളയുക"
 
 #. TRANS: Client error displayed trying to delete an application while not logged in.
-#: actions/deleteapplication.php:62
 msgid "You must be logged in to delete an application."
 msgstr ""
 
 #. TRANS: Client error displayed trying to delete an application that does not exist.
-#: actions/deleteapplication.php:71
 msgid "Application not found."
 msgstr ""
 
 #. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
-#: actions/deleteapplication.php:79 actions/editapplication.php:78
-#: actions/showapplication.php:90
 msgid "You are not the owner of this application."
 msgstr ""
 
 #. TRANS: Client error text when there is a problem with the session token.
-#: actions/deleteapplication.php:102 actions/editapplication.php:131
-#: actions/newapplication.php:112 actions/showapplication.php:113
-#: lib/action.php:1391
 msgid "There was a problem with your session token."
 msgstr "താങ്കളുടെ സെഷൻ ചീട്ടിൽ ഒരു പ്രശ്നമുണ്ടായിരുന്നു."
 
 #. TRANS: Title for delete application page.
 #. TRANS: Fieldset legend on delete application page.
-#: actions/deleteapplication.php:124 actions/deleteapplication.php:149
 msgid "Delete application"
 msgstr ""
 
 #. TRANS: Confirmation text on delete application page.
-#: actions/deleteapplication.php:152
 msgid ""
 "Are you sure you want to delete this application? This will clear all data "
 "about the application from the database, including all existing user "
@@ -1930,57 +1500,47 @@ msgid ""
 msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting an application.
-#: actions/deleteapplication.php:161
 #, fuzzy
 msgid "Do not delete this application."
 msgstr "ഈ അറിയിപ്പ് മായ്ക്കരുത്"
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
-#: actions/deleteapplication.php:167
 #, fuzzy
 msgid "Delete this application."
 msgstr "ഈ അറിയിപ്പ് മായ്ക്കുക"
 
 #. TRANS: Client error when trying to delete group while not logged in.
-#: actions/deletegroup.php:64
 msgid "You must be logged in to delete a group."
 msgstr ""
 
 #. TRANS: Client error when trying to delete a group without providing a nickname or ID for the group.
 #. TRANS: Client error displayed when trying to join a group without providing a group name or group ID.
 #. TRANS: Client error displayed when trying to leave a group without providing a group name or group ID.
-#: actions/deletegroup.php:94 actions/joingroup.php:89
-#: actions/leavegroup.php:89
 msgid "No nickname or ID."
 msgstr "വിളിപ്പേരോ ഐ.ഡി.യോ ഇല്ല."
 
 #. TRANS: Client error when trying to delete a group without having the rights to delete it.
-#: actions/deletegroup.php:107
 msgid "You are not allowed to delete this group."
 msgstr ""
 
 #. TRANS: Server error displayed if a group could not be deleted.
 #. TRANS: %s is the name of the group that could not be deleted.
-#: actions/deletegroup.php:150
 #, php-format
 msgid "Could not delete group %s."
 msgstr ""
 
 #. TRANS: Message given after deleting a group.
 #. TRANS: %s is the deleted group's name.
-#: actions/deletegroup.php:159
 #, php-format
 msgid "Deleted group %s"
 msgstr "%s സംഘം മായ്ച്ചിരിക്കുന്നു"
 
 #. TRANS: Title of delete group page.
 #. TRANS: Form legend for deleting a group.
-#: actions/deletegroup.php:176 actions/deletegroup.php:202
 msgid "Delete group"
 msgstr "സംഘം മായ്ക്കുക"
 
 #. TRANS: Warning in form for deleleting a group.
-#: actions/deletegroup.php:206
 msgid ""
 "Are you sure you want to delete this group? This will clear all data about "
 "the group from the database, without a backup. Public posts to this group "
@@ -1988,12 +1548,10 @@ msgid ""
 msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting a group.
-#: actions/deletegroup.php:224
 msgid "Do not delete this group."
 msgstr "ഈ സംഘത്തെ മായ്ക്കരുത്."
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
-#: actions/deletegroup.php:231
 msgid "Delete this group."
 msgstr "ഈ സംഘത്തെ മായ്ക്കുക."
 
@@ -2003,22 +1561,18 @@ msgstr "ഈ സംഘത്തെ മായ്ക്കുക."
 #. TRANS: Client error displayed trying to block a user from a group while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying to log out when not logged in.
+#. TRANS: Client error displayed when trying to access the "make admin" page while not logged in.
+#. TRANS: Client error displayed trying to create a new direct message while not logged in.
+#. TRANS: Client error displayed trying to send a notice while not logged in.
+#. TRANS: Client error displayed trying to nudge a user without being logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
 #. TRANS: Client error displayed when trying to change user options while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
-#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:70
-#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
-#: actions/nudge.php:63 actions/pluginenable.php:97 actions/subedit.php:33
-#: actions/subscribe.php:98 actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:71 lib/profileformaction.php:63
-#: lib/settingsaction.php:72
 msgid "Not logged in."
 msgstr "ലോഗിൻ ചെയ്തിട്ടില്ല"
 
 #. TRANS: Instructions for deleting a notice.
-#: actions/deletenotice.php:110
 msgid ""
 "You are about to permanently delete a notice. Once this is done, it cannot "
 "be undone."
@@ -2028,48 +1582,39 @@ msgstr ""
 
 #. TRANS: Page title when deleting a notice.
 #. TRANS: Fieldset legend for the delete notice form.
-#: actions/deletenotice.php:117 actions/deletenotice.php:148
 msgid "Delete notice"
 msgstr "അറിയിപ്പ് മായ്ക്കുക"
 
 #. TRANS: Message for the delete notice form.
-#: actions/deletenotice.php:152
 msgid "Are you sure you want to delete this notice?"
 msgstr "ഈ അറിയിപ്പ് ഒഴിവാക്കണമെന്നു താങ്കൾക്ക് ഉറപ്പാണോ?"
 
 #. TRANS: Submit button title for 'No' when deleting a notice.
-#: actions/deletenotice.php:159
 msgid "Do not delete this notice."
 msgstr "ഈ അറിയിപ്പ് മായ്ക്കരുത്."
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:166
 msgid "Delete this notice."
 msgstr "ഈ അറിയിപ്പ് മായ്ക്കുക."
 
 #. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
-#: actions/deleteuser.php:66
 msgid "You cannot delete users."
 msgstr "താങ്കൾക്ക് ഉപയോക്താക്കളെ നീക്കം ചെയ്യാൻ കഴിയില്ല."
 
 #. TRANS: Client error displayed when trying to delete a non-local user.
-#: actions/deleteuser.php:74
 msgid "You can only delete local users."
 msgstr "താങ്കൾക്ക് പ്രാദേശിക ഉപയോക്താക്കളെ മാത്രമേ നീക്കം ചെയ്യാൻ കഴിയൂ."
 
 #. TRANS: Title of delete user page.
-#: actions/deleteuser.php:110
 msgctxt "TITLE"
 msgid "Delete user"
 msgstr "ഉപയോക്താവിനെ നീക്കം ചെയ്യുക"
 
 #. TRANS: Fieldset legend on delete user page.
-#: actions/deleteuser.php:134
 msgid "Delete user"
 msgstr "ഉപയോക്താവിനെ നീക്കം ചെയ്യുക"
 
 #. TRANS: Information text to request if a user is certain that the described action has to be performed.
-#: actions/deleteuser.php:138
 msgid ""
 "Are you sure you want to delete this user? This will clear all data about "
 "the user from the database, without a backup."
@@ -2078,99 +1623,80 @@ msgstr ""
 "ഇല്ലാതെ ഉപയോക്താവിനെ കുറിച്ചുള്ള എല്ലാ വിവരങ്ങളും നീക്കം ചെയ്യും."
 
 #. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/deleteuser.php:158
 msgid "Do not delete this user."
 msgstr "ഈ ഉപയോക്താവിനെ നീക്കം ചെയ്യരുത്."
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
-#: actions/deleteuser.php:165
 msgid "Delete this user."
 msgstr "ഈ ഉപയോക്താവിനെ നീക്കം ചെയ്യുക."
 
 #. TRANS: Message used as title for design settings for the site.
-#: actions/designadminpanel.php:60 lib/settingsnav.php:97
 msgid "Design"
 msgstr "രൂപകല്പന"
 
 #. TRANS: Instructions for design adminsitration panel.
-#: actions/designadminpanel.php:71
 msgid "Design settings for this StatusNet site"
 msgstr "ഈ സ്റ്റാറ്റസ്‌നെറ്റ് സൈറ്റിന്റെ രൂപകല്പനാ സജ്ജീകരണങ്ങൾ"
 
 #. TRANS: Client error displayed when a logo URL does is not valid.
-#: actions/designadminpanel.php:327
 msgid "Invalid logo URL."
 msgstr "ലോഗോ യൂ.ആർ.എൽ. അസാധുവാണ്."
 
 #. TRANS: Client error displayed when an SSL logo URL is invalid.
-#: actions/designadminpanel.php:333
 msgid "Invalid SSL logo URL."
 msgstr "അസാധുവായ എസ്.എസ്.എൽ. ലോഗോ യൂ.ആർ.എൽ."
 
 #. TRANS: Client error displayed when a theme is submitted through the form that is not in the theme list.
 #. TRANS: %s is the chosen unavailable theme.
-#: actions/designadminpanel.php:339
 #, php-format
 msgid "Theme not available: %s."
 msgstr "ദൃശ്യരൂപം ലഭ്യമല്ല: %s."
 
 #. TRANS: Fieldset legend for form to change logo.
-#: actions/designadminpanel.php:437
 msgid "Change logo"
 msgstr "ലോഗോ മാറ്റുക"
 
 #. TRANS: Field label for StatusNet site logo.
-#: actions/designadminpanel.php:444
 msgid "Site logo"
 msgstr "സൈറ്റിന്റെ ലോഗോ"
 
 #. TRANS: Field label for SSL StatusNet site logo.
-#: actions/designadminpanel.php:452
 msgid "SSL logo"
 msgstr "എസ്.എസ്.എൽ. ലോഗോ"
 
 #. TRANS: Fieldset legend for form change StatusNet site's theme.
-#: actions/designadminpanel.php:467
 msgid "Change theme"
 msgstr "ദൃശ്യരൂപം മാറ്റുക"
 
 #. TRANS: Field label for dropdown to choose site theme.
-#: actions/designadminpanel.php:485
 msgid "Site theme"
 msgstr "സൈറ്റിന്റെ ദൃശ്യരൂപം"
 
 #. TRANS: Title for field label for dropdown to choose site theme.
-#: actions/designadminpanel.php:487
 msgid "Theme for the site."
 msgstr "ഈ സൈറ്റിന്റെ ദൃശ്യരൂപം."
 
 #. TRANS: Field label for uploading a cutom theme.
-#: actions/designadminpanel.php:494
 msgid "Custom theme"
 msgstr "ഐച്ഛിക ദൃശ്യരൂപം"
 
 #. TRANS: Form instructions for uploading a cutom StatusNet theme.
-#: actions/designadminpanel.php:499
 msgid "You can upload a custom StatusNet theme as a .ZIP archive."
 msgstr ""
 "താങ്കളുടെ ഇച്ഛാനുസരണം നിർമ്മിച്ച സ്റ്റാറ്റസ്‌നെറ്റ് ദൃശ്യരൂപം .സിപ് ആർക്കൈവ് ആയി താങ്കൾക്ക് അപ്‌ലോഡ് "
 "ചെയ്യാവുന്നതാണ്."
 
 #. TRANS: Fieldset legend for theme background image.
-#: actions/designadminpanel.php:515
 msgid "Change background image"
 msgstr "പശ്ചാത്തലചിത്രം മാറ്റുക"
 
 #. TRANS: Field label for background image on theme designer page.
 #. TRANS: Field label for background color selector.
 #. TRANS: Label on profile design page for setting a profile page background colour.
-#: actions/designadminpanel.php:525 actions/designadminpanel.php:609
-#: lib/designform.php:238
 msgid "Background"
 msgstr "പശ്ചാത്തലം"
 
 #. TRANS: Form guide for background image upload form on theme designer page.
-#: actions/designadminpanel.php:531
 #, php-format
 msgid ""
 "You can upload a background image for the site. The maximum file size is %1"
@@ -2180,197 +1706,162 @@ msgstr ""
 "വലിപ്പം %1$s ആയിരിക്കണം."
 
 #. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:558
 msgid "On"
 msgstr "സജ്ജം"
 
 #. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:575
 msgid "Off"
 msgstr "രഹിതം"
 
 #. TRANS: Form guide for turning background image on or off on theme designer page.
 #. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
 #. TRANS: use of the uploaded profile image.
-#: actions/designadminpanel.php:577 lib/designform.php:214
 msgid "Turn background image on or off."
 msgstr "പശ്ചാത്തലചിത്രം പ്രവർത്തന സജ്ജമാക്കുക അല്ലെങ്കിൽ രഹിതമാക്കുക."
 
 #. TRANS: Checkbox label to title background image on theme designer page.
 #. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-#: actions/designadminpanel.php:583 lib/designform.php:220
 msgid "Tile background image"
 msgstr "പശ്ചാത്തലചിത്രം ആവർത്തിച്ചു ചേർക്കുക"
 
 #. TRANS: Fieldset legend for theme colors.
-#: actions/designadminpanel.php:598
 msgid "Change colors"
 msgstr "നിറങ്ങൾ മാറ്റുക"
 
 #. TRANS: Field label for content color selector.
 #. TRANS: Label on profile design page for setting a profile page content colour.
-#: actions/designadminpanel.php:623 lib/designform.php:252
 msgid "Content"
 msgstr "ഉള്ളടക്കം"
 
 #. TRANS: Field label for sidebar color selector.
 #. TRANS: Label on profile design page for setting a profile page sidebar colour.
-#: actions/designadminpanel.php:637 lib/designform.php:266
 msgid "Sidebar"
 msgstr "പാർശ്വഭിത്തി"
 
 #. TRANS: Field label for text color selector.
 #. TRANS: Label on profile design page for setting a profile page text colour.
-#: actions/designadminpanel.php:651 lib/designform.php:280
 msgid "Text"
 msgstr "എഴുത്ത്"
 
 #. TRANS: Field label for link color selector.
 #. TRANS: Label on profile design page for setting a profile page links colour.
-#: actions/designadminpanel.php:665 lib/designform.php:294
 msgid "Links"
 msgstr "കണ്ണികൾ"
 
 #. TRANS: Fieldset legend for advanced theme design settings.
-#: actions/designadminpanel.php:691
 msgid "Advanced"
 msgstr "വിപുലം"
 
 #. TRANS: Field label for custom CSS.
-#: actions/designadminpanel.php:696
 msgid "Custom CSS"
 msgstr "സ്വന്തം സി.എസ്.എസ്."
 
 #. TRANS: Button text for resetting theme settings.
-#: actions/designadminpanel.php:718
 msgctxt "BUTTON"
 msgid "Use defaults"
 msgstr "സ്വതേയുള്ളവ ഉപയോഗിക്കുക"
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:720
 msgid "Restore default designs."
 msgstr "സ്വതേയുള്ള രൂപകല്പനകൾ പുനഃസ്ഥാപിക്കുക."
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:728
 msgid "Reset back to default."
 msgstr "മുമ്പ് സ്വതേയുണ്ടായിരുന്നതിലേയ്ക്ക് പുനഃസ്ഥാപിക്കുക."
 
 #. TRANS: Title for button for saving theme settings.
-#: actions/designadminpanel.php:736
 msgid "Save design."
 msgstr "രൂപകല്പന സേവ്‌ ചെയ്യുക."
 
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
-#: actions/disfavor.php:83
 msgid "This notice is not a favorite!"
 msgstr "ഈ അറിയിപ്പ് പ്രിയങ്കരമാണെന്ന് അടയാളപ്പെടുത്തിയിട്ടില്ല!"
 
 #. TRANS: Title for page on which favorites can be added.
-#: actions/disfavor.php:98
 msgid "Add to favorites"
 msgstr "പ്രിയങ്കരങ്ങളിലേയ്ക്ക് ചേർക്കുക"
 
 #. TRANS: Client exception thrown when requesting a document from the documentation that does not exist.
 #. TRANS: %s is the non-existing document.
-#: actions/doc.php:155
 #, php-format
 msgid "No such document \"%s\"."
 msgstr "\"%s\" എന്നൊരു രേഖ ഇല്ല."
 
 #. TRANS: Title for "Edit application" form.
 #. TRANS: Form legend.
-#: actions/editapplication.php:54 lib/applicationeditform.php:129
 msgid "Edit application"
 msgstr ""
 
 #. TRANS: Client error displayed trying to edit an application while not logged in.
-#: actions/editapplication.php:66
 msgid "You must be logged in to edit an application."
 msgstr ""
 
 #. TRANS: Client error displayed trying to edit an application that does not exist.
-#: actions/editapplication.php:83 actions/showapplication.php:83
 msgid "No such application."
 msgstr ""
 
 #. TRANS: Instructions for "Edit application" form.
-#: actions/editapplication.php:167
 msgid "Use this form to edit your application."
 msgstr ""
 
 #. TRANS: Validation error shown when not providing a name in the "Edit application" form.
 #. TRANS: Validation error shown when not providing a name in the "New application" form.
-#: actions/editapplication.php:184 actions/newapplication.php:164
 msgid "Name is required."
 msgstr "പേര് ആവശ്യമാണ്."
 
 #. 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.
-#: actions/editapplication.php:188 actions/newapplication.php:172
 msgid "Name is too long (maximum 255 characters)."
 msgstr "പേരിനു നീളം വളരെ കൂടുതലാണ് (പരമാവധി 255 അക്ഷരങ്ങൾ)."
 
 #. TRANS: Validation error shown when providing a name for an application that already exists in the "Edit application" form.
 #. TRANS: Validation error shown when providing a name for an application that already exists in the "New application" form.
-#: actions/editapplication.php:192 actions/newapplication.php:168
 msgid "Name already in use. Try another one."
 msgstr "പേര് മുമ്പേ ഉപയോഗത്തിലുണ്ട്. മറ്റൊരെണ്ണം ശ്രമിക്കുക."
 
 #. TRANS: Validation error shown when not providing a description in the "Edit application" form.
 #. TRANS: Validation error shown when not providing a description in the "New application" form.
-#: actions/editapplication.php:196 actions/newapplication.php:176
 msgid "Description is required."
 msgstr "വിവരണം ആവശ്യമാണ്."
 
 #. TRANS: Validation error shown when providing too long a source URL in the "Edit application" form.
-#: actions/editapplication.php:209
 msgid "Source URL is too long."
 msgstr "സ്രോതസ്സ് യൂ.ആർ.എൽ. വളരെ വലുതാണ്."
 
 #. TRANS: Validation error shown when providing an invalid source URL in the "Edit application" form.
 #. TRANS: Validation error shown when providing an invalid source URL in the "New application" form.
-#: actions/editapplication.php:216 actions/newapplication.php:199
 msgid "Source URL is not valid."
 msgstr "സ്രോതസ്സ് യൂ.ആർ.എൽ. അസാധുവാണ്."
 
 #. 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.
-#: actions/editapplication.php:220 actions/newapplication.php:203
 msgid "Organization is required."
 msgstr "സംഘടനയേതെന്ന് ആവശ്യമാണ്."
 
 #. TRANS: Validation error shown when providing too long an arganisation name in the "Edit application" form.
-#: actions/editapplication.php:224 actions/newapplication.php:207
 msgid "Organization is too long (maximum 255 characters)."
 msgstr "സംഘടനയുടെ പേരിന്റെ നീളം വളരെക്കൂടുതലാണ് (പരമാവധി 255 അക്ഷരങ്ങൾ)."
 
 #. TRANS: Form validation error show when an organisation name has not been provided in the edit application form.
 #. TRANS: Form validation error show when an organisation name has not been provided in the new application form.
-#: actions/editapplication.php:228 actions/newapplication.php:211
 msgid "Organization homepage is required."
 msgstr "സംഘടനയുടെ പ്രധാനതാൾ ആവശ്യമാണ്."
 
 #. TRANS: Validation error shown when providing too long a callback URL in the "Edit application" form.
 #. TRANS: Validation error shown when providing too long a callback URL in the "New application" form.
-#: actions/editapplication.php:239 actions/newapplication.php:225
 msgid "Callback is too long."
 msgstr ""
 
 #. TRANS: Validation error shown when providing an invalid callback URL in the "Edit application" form.
 #. TRANS: Validation error shown when providing an invalid callback URL in the "New application" form.
-#: actions/editapplication.php:247 actions/newapplication.php:235
 msgid "Callback URL is not valid."
 msgstr ""
 
 #. TRANS: Server error occuring when an application could not be updated from the "Edit application" form.
-#: actions/editapplication.php:284
 msgid "Could not update application."
 msgstr ""
 
 #. TRANS: Title for form to edit a group. %s is a group nickname.
-#: actions/editgroup.php:55
 #, php-format
 msgid "Edit %s group"
 msgstr "%s എന്ന സംഘത്തിൽ മാറ്റം വരുത്തുക"
@@ -2378,40 +1869,40 @@ msgstr "%s എന്ന സംഘത്തിൽ മാറ്റം വരുത
 #. TRANS: Client error displayed trying to edit a group while not logged in.
 #. TRANS: Client error displayed when trying to create a group while not logged in.
 #. TRANS: Client error displayed trying to create a group while not logged in.
-#: actions/editgroup.php:68 actions/grouplogo.php:69 actions/newgroup.php:65
 msgid "You must be logged in to create a group."
 msgstr "ഒരു സംഘം സൃഷ്ടിക്കാൻ താങ്കൾ ലോഗിൻ ചെയ്തിരിക്കണം."
 
 #. TRANS: Form instructions for group edit form.
-#: actions/editgroup.php:161
 msgid "Use this form to edit the group."
 msgstr "സംഘത്തിൽ മാറ്റം വരുത്താൻ ഈ ഫോം ഉപയോഗിക്കുക."
 
+#. TRANS: Group edit form validation error.
+#. TRANS: Group create form validation error.
+#. TRANS: %s is the invalid alias.
+#, php-format
+msgid "Invalid alias: \"%s\""
+msgstr ""
+
 #. TRANS: Group edit form success message.
-#: actions/editgroup.php:301
 msgid "Options saved."
 msgstr "ഐച്ഛികങ്ങൾ സേവ് ചെയ്തിരിക്കുന്നു."
 
 #. TRANS: Title for e-mail settings.
-#: actions/emailsettings.php:60
 msgid "Email settings"
 msgstr "ഇമെയിൽ സജ്ജീകരണങ്ങൾ"
 
 #. TRANS: E-mail settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/emailsettings.php:74
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 msgstr "%%site.name%% സൈറ്റിൽ നിന്നുള്ള ഇമെയിൽ എപ്രകാരമാണ് ലഭിക്കേണ്ടതെന്ന് ക്രമീകരിക്കുക."
 
 #. TRANS: Form legend for e-mail settings form.
 #. TRANS: Field label for e-mail address input in e-mail settings form.
-#: actions/emailsettings.php:104 actions/emailsettings.php:130
 msgid "Email address"
 msgstr "ഇമെയിൽ വിലാസം"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:110
 msgid "Current confirmed email address."
 msgstr "ഇപ്പോൾ സ്ഥിരീകരിക്കപ്പെട്ടിട്ടുള്ള ഇമെയിൽ വിലാസം."
 
@@ -2420,15 +1911,11 @@ msgstr "ഇപ്പോൾ സ്ഥിരീകരിക്കപ്പെട
 #. TRANS: Button label to remove a confirmed IM address.
 #. TRANS: Button label to remove a confirmed SMS address.
 #. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
-#: actions/emailsettings.php:113 actions/emailsettings.php:180
-#: actions/imsettings.php:119 actions/smssettings.php:119
-#: actions/smssettings.php:175
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "നീക്കം ചെയ്യുക"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:120
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -2441,44 +1928,36 @@ msgstr ""
 #. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
 #. TRANS: Any other domain may be owned by a legitimate person or
 #. TRANS: organization.
-#: actions/emailsettings.php:137
 msgid "Email address, like \"UserName@example.org\""
 msgstr "\"UserName@example.org\" പോലെയുള്ള ഇമെയിൽ വിലാസം"
 
 #. TRANS: Button label for adding an e-mail address in e-mail settings form.
 #. TRANS: Button label for adding an IM address in IM settings form.
 #. TRANS: Button label for adding a SMS phone number in SMS settings form.
-#: actions/emailsettings.php:141 actions/imsettings.php:147
-#: actions/smssettings.php:157
 msgctxt "BUTTON"
 msgid "Add"
 msgstr "കൂട്ടിച്ചേർക്കുക"
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:149 actions/smssettings.php:166
 msgid "Incoming email"
 msgstr "ഇങ്ങോട്ടുള്ള ഇമെയിൽ"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:155
 msgid "I want to post notices by email."
 msgstr "എനിക്ക് അറിയിപ്പുകൾ ഇമെയിൽ വഴി പ്രസിദ്ധീകരിക്കണം."
 
 #. TRANS: Form instructions for incoming e-mail form in e-mail settings.
 #. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
-#: actions/emailsettings.php:177 actions/smssettings.php:173
 msgid "Send email to this address to post new notices."
 msgstr "പുതിയ അറിയിപ്പുകൾ പ്രസിദ്ധീകരിക്കാൻ ഈ വിലാസത്തിൽ ഇമെയിൽ അയയ്ക്കുക."
 
 #. TRANS: Instructions for incoming e-mail address input form, when an address has already been assigned.
 #. TRANS: Instructions for incoming SMS e-mail address input form.
-#: actions/emailsettings.php:186 actions/smssettings.php:181
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr "പ്രസിദ്ധീകരിക്കാനായി പുതിയൊരു ഇമെയിൽ വിലാസം സൃഷ്ടിക്കുക; പഴയതു റദ്ദാക്കപ്പെടും."
 
 #. TRANS: Instructions for incoming e-mail address input form.
-#: actions/emailsettings.php:190
 msgid ""
 "To send notices via email, we need to create a unique email address for you "
 "on this server:"
@@ -2488,88 +1967,70 @@ msgstr ""
 
 #. TRANS: Button label for adding an e-mail address to send notices from.
 #. TRANS: Button label for adding an SMS e-mail address to send notices from.
-#: actions/emailsettings.php:196 actions/smssettings.php:184
 msgctxt "BUTTON"
 msgid "New"
 msgstr "പുതിയത്"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:205
 msgid "Email preferences"
 msgstr "ഇമെയിൽ ക്രമീകരണങ്ങൾ"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:213
 msgid "Send me notices of new subscriptions through email."
 msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:219
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:226
 msgid "Send me email when someone sends me a private message."
 msgstr "ആരെങ്കിലും എനിക്കൊരു സ്വകാര്യ സന്ദേശമയച്ചാൽ എനിക്ക് ഇമെയിൽ അയയ്ക്കുക."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:232
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr "ആരെങ്കിലും എനിക്കൊരു \"@-reply\" അയച്ചാൽ എനിക്ക് ഇമെയിൽ അയയ്ക്കുക."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:238
 msgid "Allow friends to nudge me and send me an email."
 msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:244
 msgid "Publish a MicroID for my email address."
 msgstr ""
 
 #. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:362
 msgid "Email preferences saved."
 msgstr "ഇമെയിൽ ക്രമീകരണങ്ങൾ സേവ് ചെയ്തിരിക്കുന്നു."
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:381
 msgid "No email address."
 msgstr "ഇമെയിൽ വിലാസം ഇല്ല."
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:389
 #, fuzzy
 msgid "Cannot normalize that email address."
 msgstr "സാധുവായ ഇമെയിൽ വിലാസം അല്ല."
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:394 actions/register.php:197
-#: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "സാധുവായ ഇമെയിൽ വിലാസം അല്ല."
 
 #. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:398
 msgid "That is already your email address."
 msgstr "അതാണ് താങ്കളുടെ ഇമെയിൽ വിലാസം."
 
 #. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:402
 msgid "That email address already belongs to another user."
 msgstr "ആ ഇമെയിൽ വിലാസം മറ്റൊരു ഉപയോക്താവ് മുമ്പേ ഉപയോഗിക്കുന്നു."
 
 #. TRANS: Server error thrown on database error adding e-mail confirmation code.
 #. TRANS: Server error thrown on database error adding Instant Messaging confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:419 actions/imsettings.php:362
-#: actions/smssettings.php:364
 msgid "Could not insert confirmation code."
 msgstr "സ്ഥിരീകരണ കോഡ് ഉൾപ്പെടുത്താൻ കഴിഞ്ഞില്ല."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:426
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
@@ -2581,101 +2042,81 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling Instant Messaging address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:446 actions/imsettings.php:391
-#: actions/smssettings.php:398
 msgid "No pending confirmation to cancel."
 msgstr "റദ്ദാക്കാനായി സ്ഥിരീകരണങ്ങളൊന്നും അവശേഷിക്കുന്നില്ല."
 
 #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:451
 msgid "That is the wrong email address."
 msgstr "അത് തെറ്റായ ഇമെയിൽ വിലാസമാണ്."
 
 #. TRANS: Server error thrown on database error canceling e-mail address confirmation.
 #. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
-#: actions/emailsettings.php:460 actions/smssettings.php:412
 msgid "Could not delete email confirmation."
 msgstr "ഇമെയിൽ സ്ഥിരീകരണം നീക്കം ചെയ്യാൻ കഴിഞ്ഞില്ല."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:465
 msgid "Email confirmation cancelled."
 msgstr "ഇമെയിൽ സ്ഥിരീകരണം റദ്ദാക്കി."
 
 #. TRANS: Message given trying to remove an e-mail address that is not
 #. TRANS: registered for the active user.
-#: actions/emailsettings.php:484
 msgid "That is not your email address."
 msgstr "അത് താങ്കളുടെ ഇമെയിൽ വിലാസമല്ല."
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:505
 msgid "The email address was removed."
 msgstr "ഇമെയിൽ വിലാസം നീക്കം ചെയ്തിരിക്കുന്നു."
 
 #. TRANS: Form validation error displayed when trying to remove an incoming e-mail address while no address has been set.
-#: actions/emailsettings.php:519 actions/smssettings.php:554
 msgid "No incoming email address."
 msgstr "സ്വീകരിക്കാനുള്ള ഇമെയിൽ വിലാസം ഇല്ല."
 
 #. 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.
-#: actions/emailsettings.php:531 actions/emailsettings.php:555
-#: actions/smssettings.php:565 actions/smssettings.php:590
 msgid "Could not update user record."
 msgstr "ഉപയോക്തൃ രേഖകൾ പുതുക്കാൻ കഴിഞ്ഞില്ല."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
 #. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:535 actions/smssettings.php:569
 msgid "Incoming email address removed."
 msgstr "സ്വീകരിക്കാനുള്ള ഇമെയിൽ വിലാസം നീക്കം ചെയ്തിരിക്കുന്നു."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
 #. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:559 actions/smssettings.php:594
 msgid "New incoming email address added."
 msgstr "സ്വീകരിക്കാനുള്ള പുതിയ ഇമെയിൽ വിലാസം കൂട്ടിച്ചേർത്തിരിക്കുന്നു."
 
 #. TRANS: Client error displayed when trying to mark a notice as favorite that already is a favorite.
-#: actions/favor.php:80
 msgid "This notice is already a favorite!"
 msgstr "ഈ അറിയിപ്പ് മുമ്പേ തന്നെ പ്രിയങ്കരമാണ്!"
 
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
-#: actions/favor.php:95
 msgid "Disfavor favorite."
 msgstr "പ്രിയങ്കരമാണ് എന്നത് നീക്കം ചെയ്യുക."
 
 #. TRANS: Page title for first page of favorited notices.
 #. TRANS: Title for favourited notices section.
-#: actions/favorited.php:65 lib/popularnoticesection.php:62
-#: lib/publicgroupnav.php:93
 msgid "Popular notices"
 msgstr "ജനപ്രിയ അറിയിപ്പുകൾ"
 
 #. TRANS: Page title for all but first page of favorited notices.
 #. TRANS: %d is the page number being displayed.
-#: actions/favorited.php:69
 #, php-format
 msgid "Popular notices, page %d"
 msgstr "ജനപ്രിയ അറിയിപ്പുകൾ, താൾ %d"
 
 #. TRANS: Description on page displaying favorited notices.
-#: actions/favorited.php:81
 msgid "The most popular notices on the site right now."
 msgstr "ഈ സൈറ്റിൽ ഇപ്പോഴുള്ള ഏറ്റവും ജനപ്രിയ അറിയിപ്പുകൾ."
 
 #. TRANS: Text displayed instead of a list when a site does not yet have any favourited notices.
-#: actions/favorited.php:149
 msgid "Favorite notices appear on this page but no one has favorited one yet."
 msgstr ""
 "പ്രിയങ്കരമായ അറിയിപ്പുകൾ ഈ താളിലാണ് പ്രത്യക്ഷപ്പെടേണ്ടത് പക്ഷെ ഒന്നും ആരും ഇതുവരെ "
 "പ്രിയങ്കരമാണെന്ന് അടയാളപ്പെടുത്തിയിട്ടില്ല."
 
 #. TRANS: Additional text displayed instead of a list when a site does not yet have any favourited notices for logged in users.
-#: actions/favorited.php:153
 msgid ""
 "Be the first to add a notice to your favorites by clicking the fave button "
 "next to any notice you like."
@@ -2683,7 +2124,6 @@ msgstr ""
 
 #. TRANS: Additional text displayed instead of a list when a site does not yet have any favourited notices for not logged in users.
 #. TRANS: %%action.register%% is a registration link. "[link text](link)" is Mark Down. Do not change the formatting.
-#: actions/favorited.php:158
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to add a "
@@ -2694,181 +2134,146 @@ msgstr ""
 #. TRANS: %s is a user's nickname.
 #. TRANS: Title for first page of favourite notices of a user.
 #. TRANS: %s is the user for whom the favourite notices are displayed.
-#: actions/favoritesrss.php:111 actions/showfavorites.php:76
-#: lib/personalgroupnav.php:110
 #, php-format
 msgid "%s's favorite notices"
 msgstr "%s എന്ന ഉപയോക്താവിനു പ്രിയങ്കരങ്ങളായ അറിയിപ്പുകൾ"
 
 #. TRANS: Desciption of RSS feed with favourite notices of a user.
 #. TRANS: %1$s is a user's nickname, %2$s is the name of the StatusNet site.
-#: actions/favoritesrss.php:117
 #, php-format
 msgid "Updates favored by %1$s on %2$s!"
 msgstr ""
 
 #. TRANS: Page title for first page of featured users.
 #. TRANS: Title for featured users section.
-#: actions/featured.php:69 lib/featureduserssection.php:87
-#: lib/publicgroupnav.php:89
 msgid "Featured users"
 msgstr "പ്രമുഖ ഉപയോക്താക്കൾ"
 
 #. TRANS: Page title for all but first page of featured users.
 #. TRANS: %d is the page number being displayed.
-#: actions/featured.php:73
 #, php-format
 msgid "Featured users, page %d"
 msgstr "പ്രമുഖ ഉപയോക്താക്കൾ, താൾ %d"
 
 #. TRANS: Description on page displaying featured users.
-#: actions/featured.php:102
 #, php-format
 msgid "A selection of some great users on %s."
 msgstr "%s പദ്ധതിയിലെ ചില മഹദ് ഉപയോക്താക്കൾ."
 
 #. TRANS: Client error displayed when no notice ID was given trying do display a file.
-#: actions/file.php:36
 msgid "No notice ID."
 msgstr "അറിയിപ്പിന്റെ ഐ.ഡി. ഇല്ല."
 
 #. TRANS: Client error displayed when an invalid notice ID was given trying do display a file.
-#: actions/file.php:41
 msgid "No notice."
 msgstr "അറിയിപ്പ് ഇല്ല."
 
 #. TRANS: Client error displayed when trying do display a file for a notice without a file attachement.
-#: actions/file.php:46
 msgid "No attachments."
 msgstr ""
 
 #. TRANS: Client error displayed when trying do display a file for a notice with file attachements
 #. TRANS: that could not be found.
-#: actions/file.php:58
 msgid "No uploaded attachments."
 msgstr ""
 
 #. TRANS: Client error displayed when subscribing to a remote profile and an unexpected response is received.
-#: actions/finishremotesubscribe.php:69
 msgid "Not expecting this response!"
 msgstr "ഈ പ്രതികരണമല്ല പ്രതീക്ഷിച്ചത്!"
 
 #. TRANS: Client error displayed when subscribing to a remote profile that does not exist.
-#: actions/finishremotesubscribe.php:81
 msgid "User being listened to does not exist."
 msgstr ""
 
 #. TRANS: Client error displayed when subscribing to a remote profile that is a local profile.
-#: actions/finishremotesubscribe.php:89 actions/remotesubscribe.php:58
 msgid "You can use the local subscription!"
 msgstr ""
 
 #. TRANS: Client error displayed when subscribing to a remote profile that is blocked form subscribing to.
-#: actions/finishremotesubscribe.php:102
 msgid "That user has blocked you from subscribing."
 msgstr "വരിക്കാരനാകുന്നതിൽ നിന്നും ആ ഉപയോക്താവ് താങ്കളെ തടഞ്ഞിരിക്കുന്നു."
 
 #. TRANS: Client error displayed when subscribing to a remote profile without providing an authorised token.
-#: actions/finishremotesubscribe.php:114
 msgid "You are not authorized."
 msgstr "താങ്കൾക്ക് അംഗീകാരം ലഭിച്ചിട്ടില്ല."
 
 #. TRANS: Client error displayed when subscribing to a remote profile and conversion of the request token to access token fails.
-#: actions/finishremotesubscribe.php:118
 msgid "Could not convert request token to access token."
 msgstr "അഭ്യർത്ഥനാ ചീട്ടിനെ അഭിഗമ്യതാ ചീട്ടാക്കാൻ കഴിയില്ല."
 
 #. TRANS: Client error displayed when subscribing to a remote profile fails because of an unsupported version of the OMB protocol.
-#: actions/finishremotesubscribe.php:124
 msgid "Remote service uses unknown version of OMB protocol."
 msgstr "വിദൂര സേവനം അപരിചിതമായ ഒ.എം.ബി. പ്രോട്ടോകോൾ ഉപയോഗിക്കുന്നു."
 
 #. TRANS: Server error displayed when subscribing to a remote profile fails because the remote profile could not be updated.
-#: actions/finishremotesubscribe.php:145 lib/oauthstore.php:317
 msgid "Error updating remote profile."
 msgstr ""
 
 #. TRANS: Client error displayed when requesting a non-existent file.
-#: actions/getfile.php:77
 msgid "No such file."
 msgstr ""
 
 #. TRANS: Client error displayed when requesting a file without having read access to it.
-#: actions/getfile.php:82
 msgid "Cannot read file."
 msgstr "പ്രമാണം വായിക്കാനാവില്ല."
 
 #. TRANS: Client error displayed when trying to assign an invalid role to a user.
-#: actions/grantrole.php:61 actions/revokerole.php:62
 msgid "Invalid role."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to assign an reserved role to a user.
-#: actions/grantrole.php:66 actions/revokerole.php:66
 msgid "This role is reserved and cannot be set."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to assign a role to a user while not being allowed to set roles.
-#: actions/grantrole.php:76
 msgid "You cannot grant user roles on this site."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to assign a role to a user that already has that role.
-#: actions/grantrole.php:84
 msgid "User already has this role."
 msgstr ""
 
 #. TRANS: Client error displayed trying to block a user from a group while not specifying a to be blocked user profile.
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing a profile.
+#. TRANS: Client error displayed when not providing a profile ID on the Make Admin page.
 #. TRANS: Client error displayed trying a change a subscription without providing a profile.
 #. TRANS: Client error displayed when trying to change user options without specifying a user to work on.
-#: actions/groupblock.php:71 actions/groupunblock.php:71
-#: actions/makeadmin.php:71 actions/subedit.php:49
-#: lib/profileformaction.php:79
 msgid "No profile specified."
 msgstr ""
 
 #. TRANS: Client error displayed trying to block a user from a group while specifying a non-existing profile.
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing an existing profile.
+#. TRANS: Client error displayed when specifying an invalid profile ID on the Make Admin page.
 #. TRANS: Client error displayed trying a change a subscription for a non-existant profile ID.
 #. TRANS: Client error displayed when trying to change user options without specifying an existing user to work on.
-#: actions/groupblock.php:77 actions/groupunblock.php:77
-#: actions/makeadmin.php:76 actions/subedit.php:57 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:87
 msgid "No profile with that ID."
 msgstr ""
 
 #. TRANS: Client error displayed trying to block a user from a group while not specifying a group to block a profile from.
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing a group.
-#: actions/groupblock.php:83 actions/groupunblock.php:83
-#: actions/makeadmin.php:81
+#. TRANS: Client error displayed when not providing a group ID on the Make Admin page.
 msgid "No group specified."
 msgstr "സംഘമൊന്നും വ്യക്തമാക്കിയിട്ടില്ല."
 
 #. TRANS: Client error displayed trying to block a user from a group while not being an admin user.
-#: actions/groupblock.php:95
 msgid "Only an admin can block group members."
 msgstr "സംഘത്തിലെ അംഗങ്ങളെ തടയൻ കാര്യനിർവ്വാഹകനു മാത്രമേ കഴിയൂ."
 
 #. TRANS: Client error displayed trying to block a user from a group while user is already blocked from the given group.
-#: actions/groupblock.php:100
 msgid "User is already blocked from group."
 msgstr "ഉപയോക്താവ് സംഘത്തിൽ നിന്നും മുമ്പേ തന്നെ തടയപ്പെട്ടിരിക്കുന്നു."
 
 #. TRANS: Client error displayed trying to block a user from a group while user is not a member of given group.
-#: actions/groupblock.php:106
 msgid "User is not a member of group."
 msgstr "ഉപയോക്താവ് സംഘത്തിലെ അംഗമല്ല."
 
 #. TRANS: Title for block user from group page.
 #. TRANS: Form legend for form to block user from a group.
-#: actions/groupblock.php:141 actions/groupmembers.php:364
 msgid "Block user from group"
 msgstr "സംഘത്തിൽ നിന്നും ഉപയോക്താവിനെ തടയുക"
 
 #. TRANS: Explanatory text for block user from group form before setting the block.
 #. TRANS: %1$s is that to be blocked user, %2$s is the group the user will be blocked from.
-#: actions/groupblock.php:169
 #, php-format
 msgid ""
 "Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They "
@@ -2880,62 +2285,51 @@ msgstr ""
 "നീക്കം ചെയ്യപ്പെടും."
 
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
-#: actions/groupblock.php:191
 msgid "Do not block this user from this group."
 msgstr "ഈ സംഘത്തിൽ നിന്നും ഈ ഉപയോക്താവിനെ തടയരുത്."
 
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
-#: actions/groupblock.php:198
 msgid "Block this user from this group."
 msgstr "ഈ സംഘത്തിൽ നിന്നും ഈ ഉപയോക്താവിനെ തടയുക."
 
 #. TRANS: Server error displayed when trying to block a user from a group fails because of an application error.
-#: actions/groupblock.php:215
 msgid "Database error blocking user from group."
 msgstr "സംഘത്തിൽ നിന്നും ഉപയോക്താവിനെ തടയുമ്പോൾ ഡേറ്റാബേസ് പിഴവുണ്ടായി."
 
 #. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
 #. TRANS: Client error displayed trying to find a user by ID without providing an ID.
-#: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr "ഐ.ഡി. ഇല്ല."
 
 #. TRANS: Client error displayed trying to change group design settings while not logged in.
-#: actions/groupdesignsettings.php:67
 msgid "You must be logged in to edit a group."
 msgstr "സംഘത്തിൽ മാറ്റങ്ങൾ വരുത്താൻ താങ്കൾ ലോഗിൻ ചെയ്തിരിക്കേണ്ടതാണ്."
 
 #. TRANS: Title group design settings page.
-#: actions/groupdesignsettings.php:146
 msgid "Group design"
 msgstr "സംഘത്തിന്റെ രൂപകല്പന"
 
 #. TRANS: Instructions for group design settings page.
-#: actions/groupdesignsettings.php:157
 msgid ""
 "Customize the way your group looks with a background image and a colour "
 "palette of your choice."
 msgstr "പശ്ചാത്തല്ല ചിത്രവും വർണ്ണങ്ങളും ചേർത്ത് സംഘത്തിന്റെ ദൃശ്യരൂപം ഇച്ഛാനുസരണമാക്കുക."
 
 #. TRANS: Form validation error displayed when group design settings could not be updated because of an application issue.
-#: actions/groupdesignsettings.php:262
 msgid "Unable to update your design settings."
 msgstr "താങ്കളുടെ രൂപകല്പനാ സജ്ജീകരണങ്ങൾ പുതുക്കാനായില്ല."
 
 #. TRANS: Form text to confirm saved group design settings.
-#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:239
 msgid "Design preferences saved."
 msgstr "രൂപകല്പനാ ക്രമീകരണങ്ങൾ സേവ് ചെയ്തിരിക്കുന്നു."
 
 #. TRANS: Title for group logo settings page.
 #. TRANS: Group logo form legend.
-#: actions/grouplogo.php:144 actions/grouplogo.php:199
 msgid "Group logo"
 msgstr "സംഘത്തിന്റെ ലോഗോ"
 
 #. TRANS: Instructions for group logo page.
 #. TRANS: %s is the maximum file size for that site.
-#: actions/grouplogo.php:156
 #, php-format
 msgid ""
 "You can upload a logo image for your group. The maximum file size is %s."
@@ -2944,98 +2338,81 @@ msgstr ""
 "%s ആയിരിക്കണം."
 
 #. TRANS: Submit button for uploading a group logo.
-#: actions/grouplogo.php:243
 msgid "Upload"
 msgstr "അപ്‌ലോഡ്"
 
 #. TRANS: Button text for cropping an uploaded group logo.
-#: actions/grouplogo.php:299
 msgid "Crop"
 msgstr "വെട്ടിച്ചെറുതാക്കുക"
 
 #. TRANS: Form instructions on the group logo page.
-#: actions/grouplogo.php:376
 msgid "Pick a square area of the image to be the logo."
 msgstr "ലോഗോ ആക്കാൻ ചിത്രത്തിന്റെ ഒരു സമചതുരത്തിലുള്ള ഭാഗം തിരഞ്ഞെടുക്കുക."
 
 #. TRANS: Form success message after updating a group logo.
-#: actions/grouplogo.php:411
 msgid "Logo updated."
 msgstr "ലോഗോ പുതുക്കി."
 
 #. TRANS: Form failure message after failing to update a group logo.
-#: actions/grouplogo.php:414
 msgid "Failed updating logo."
 msgstr "ലോഗോ പുതുക്കൽ പരാജയപ്പെട്ടു."
 
 #. TRANS: Title of the page showing group members.
 #. TRANS: %s is the name of the group.
-#: actions/groupmembers.php:104
 #, php-format
 msgid "%s group members"
 msgstr "%s സംഘ അംഗങ്ങൾ"
 
 #. TRANS: Title of the page showing group members.
 #. TRANS: %1$s is the name of the group, %2$d is the page number of the members list.
-#: actions/groupmembers.php:109
 #, php-format
 msgid "%1$s group members, page %2$d"
 msgstr "%1$s സംഘത്തിലെ അംഗങ്ങൾ, താൾ %2$d"
 
 #. TRANS: Page notice for group members page.
-#: actions/groupmembers.php:125
 msgid "A list of the users in this group."
 msgstr "ഈ സംഘത്തിലെ ഉപയോക്താക്കളുടെ പട്ടിക."
 
 #. TRANS: Indicator in group members list that this user is a group administrator.
-#: actions/groupmembers.php:190 lib/action.php:581
 msgid "Admin"
 msgstr "കാര്യനിർവാഹകൻ"
 
 #. TRANS: Button text for the form that will block a user from a group.
-#: actions/groupmembers.php:397
 msgctxt "BUTTON"
 msgid "Block"
 msgstr "തടയുക"
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:401
 msgctxt "TOOLTIP"
 msgid "Block this user"
 msgstr "ഈ ഉപയോക്താവിനെ തടയുക"
 
 #. TRANS: Form legend for form to make a user a group admin.
-#: actions/groupmembers.php:488
 msgid "Make user an admin of the group"
 msgstr "ഉപയോക്താവിനെ സംഘത്തിന്റെ കാര്യനിർവ്വാഹകനാക്കുക"
 
 #. TRANS: Button text for the form that will make a user administrator.
-#: actions/groupmembers.php:521
 msgctxt "BUTTON"
 msgid "Make Admin"
 msgstr "കാര്യനിർവ്വാഹകനാക്കുക"
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:525
 msgctxt "TOOLTIP"
 msgid "Make this user an admin"
 msgstr "ഈ ഉപയോക്താവിനെ കാര്യനിർവ്വാഹകനാക്കുക"
 
 #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
-#: actions/grouprss.php:141
 #, php-format
 msgid "Updates from members of %1$s on %2$s!"
 msgstr "%2$s സൈറ്റിലെ %1$s സംഘാങ്ങളുടെ പുതുക്കലുകൾ!"
 
 #. TRANS: Title for first page of the groups list.
-#: actions/groups.php:62
 msgctxt "TITLE"
 msgid "Groups"
 msgstr "സംഘങ്ങൾ"
 
 #. TRANS: Title for all but the first page of the groups list.
 #. TRANS: %d is the page number.
-#: actions/groups.php:66
 #, php-format
 msgctxt "TITLE"
 msgid "Groups, page %d"
@@ -3044,7 +2421,6 @@ msgstr "സംഘങ്ങൾ, താൾ %d"
 #. TRANS: Page notice of group list. %%%%site.name%%%% is the StatusNet site name,
 #. TRANS: %%%%action.groupsearch%%%% and %%%%action.newgroup%%%% are URLs. Do not change them.
 #. TRANS: This message contains Markdown links in the form [link text](link).
-#: actions/groups.php:95
 #, php-format
 msgid ""
 "%%%%site.name%%%% groups let you find and talk with people of similar "
@@ -3060,12 +2436,10 @@ msgstr ""
 "newgroup%%%%)"
 
 #. TRANS: Link to create a new group on the group list page.
-#: actions/groups.php:113 actions/usergroups.php:126 lib/groupeditform.php:115
 msgid "Create a new group"
 msgstr "പുതിയൊരു സംഘം സൃഷ്ടിക്കുക"
 
 #. TRANS: Instructions for page where groups can be searched. %%site.name%% is the name of the StatusNet site.
-#: actions/groupsearch.php:53
 #, php-format
 msgid ""
 "Search for groups on %%site.name%% by their name, location, or description. "
@@ -3076,21 +2450,17 @@ msgstr ""
 "അതിലധികമോ അക്ഷരങ്ങൾ ഉണ്ടായിരിക്കണം."
 
 #. TRANS: Title for page where groups can be searched.
-#: actions/groupsearch.php:60
 msgid "Group search"
 msgstr "സംഘത്തിൽ തിരയുക"
 
 #. TRANS: Text on page where groups can be searched if no results were found for a query.
 #. TRANS: Text for notice search results is the query had no results.
 #. TRANS: Message on the "People search" page where a query has no results.
-#: actions/groupsearch.php:82 actions/noticesearch.php:122
-#: actions/peoplesearch.php:87
 msgid "No results."
 msgstr "ഫലങ്ങൾ ഒന്നുമില്ല"
 
 #. TRANS: Additional text on page where groups can be searched if no results were found for a query for a logged in user.
 #. TRANS: This message contains Markdown links in the form [link text](link).
-#: actions/groupsearch.php:87
 #, php-format
 msgid ""
 "If you cannot find the group you're looking for, you can [create it](%%"
@@ -3101,7 +2471,6 @@ msgstr ""
 
 #. TRANS: Additional text on page where groups can be searched if no results were found for a query for a not logged in user.
 #. TRANS: This message contains Markdown links in the form [link text](link).
-#: actions/groupsearch.php:92
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and [create the group](%%"
@@ -3111,30 +2480,25 @@ msgstr ""
 "action.newgroup%%) ചെയ്തുകൂട!"
 
 #. TRANS: Client error displayed when trying to unblock a user from a group without being an administrator for the group.
-#: actions/groupunblock.php:95
 msgid "Only an admin can unblock group members."
 msgstr "സംഘത്തിലെ അംഗങ്ങളുടെ തടയൽ നീക്കാൻ കാര്യനിർവ്വാഹകനു മാത്രമേ കഴിയൂ."
 
 #. TRANS: Client error displayed when trying to unblock a non-blocked user from a group.
-#: actions/groupunblock.php:100
 msgid "User is not blocked from group."
 msgstr "ഉപയോക്താവ് സംഘത്തിൽ നിന്നും തടയപ്പെട്ടിട്ടില്ല."
 
 #. TRANS: Server error displayed when unblocking a user from a group fails because of an unknown error.
 #. TRANS: Server error displayed when removing a user block.
-#: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "തടയൽ നീക്കുന്നതിൽ പിഴവുണ്ടായി."
 
 #. TRANS: Title for Instant Messaging settings.
-#: actions/imsettings.php:56
 msgid "IM settings"
 msgstr "ഐ.എം. സജ്ജീകരണങ്ങൾ"
 
 #. 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.
-#: actions/imsettings.php:69
 #, fuzzy, php-format
 msgid ""
 "You can send and receive notices through instant messaging [instant messages]"
@@ -3145,18 +2509,15 @@ msgstr ""
 "താഴെ ക്രമീകരിക്കുക."
 
 #. TRANS: Message given in the IM settings if IM is not enabled on the site.
-#: actions/imsettings.php:90
 msgid "IM is not available."
 msgstr "ഐ.എം. ലഭ്യമല്ല."
 
-#: actions/imsettings.php:116
 #, fuzzy, php-format
 msgid "Current confirmed %s address."
 msgstr "ഇപ്പോൾ സ്ഥിരീകരിക്കപ്പെട്ടിട്ടുള്ള ഇമെയിൽ വിലാസം."
 
 #. TRANS: Form note in IM settings form.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:128
 #, fuzzy, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your %s account for a message "
@@ -3165,86 +2526,71 @@ msgstr ""
 "ഈ വിലാസം സ്ഥിരീകരണത്തിന് അവശേഷിക്കുന്നു. കൂടുതൽ നിർദ്ദേശങ്ങൾക്ക് താങ്കളുടെ ജാബ്ബർ/ജിറ്റോക് "
 "അംഗത്വത്തിലുള്ള സന്ദേശം പരിശോധിക്കുക. (%s ഒരു സുഹൃത്തായി താങ്കളുടെ പട്ടികയിലുണ്ടോ?)"
 
-#: actions/imsettings.php:140
 msgid "IM address"
 msgstr "ഐ.എം. വിലാസം"
 
-#: actions/imsettings.php:142
 #, php-format
 msgid "%s screenname."
 msgstr ""
 
 #. TRANS: Header for IM preferences form.
-#: actions/imsettings.php:163
 #, fuzzy
 msgid "IM Preferences"
 msgstr "ഐ.എം. ക്രമീകരണങ്ങൾ"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:174
 #, fuzzy
 msgid "Send me notices"
 msgstr "അറിയിപ്പ് അയയ്ക്കുക"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:176
 #, fuzzy
 msgid "Post a notice when my status changes."
 msgstr "എന്റെ ജാബ്ബർ/ജിറ്റോക് സ്ഥിതിവിവരം മാറുമ്പോൾ അറിയിപ്പുകൾ പ്രസിദ്ധീകരിക്കുക."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:178
 msgid "Send me replies from people I'm not subscribed to."
 msgstr ""
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:181
 msgid "Publish a MicroID"
 msgstr ""
 
 #. TRANS: Server error thrown on database error updating IM preferences.
-#: actions/imsettings.php:291
 #, fuzzy
 msgid "Couldn't update IM preferences."
 msgstr "ഉപയോക്തൃ വിവരങ്ങൾ പുതുക്കാൻ കഴിഞ്ഞില്ല."
 
 #. TRANS: Confirmation message for successful IM preferences save.
 #. TRANS: Confirmation message after saving preferences.
-#: actions/imsettings.php:298 actions/urlsettings.php:244
 msgid "Preferences saved."
 msgstr "ക്രമീകരണങ്ങൾ സേവ് ചെയ്തു."
 
 #. TRANS: Message given saving IM address without having provided one.
-#: actions/imsettings.php:320
 #, fuzzy
 msgid "No screenname."
 msgstr "അങ്ങിനെ വിളിപ്പേര് ഇല്ല."
 
-#: actions/imsettings.php:325
 #, fuzzy
 msgid "No transport."
 msgstr "അറിയിപ്പ് ഇല്ല."
 
 #. TRANS: Message given saving IM address that cannot be normalised.
-#: actions/imsettings.php:333
 #, fuzzy
 msgid "Cannot normalize that screenname"
 msgstr "സാധുവായ ഇമെയിൽ വിലാസം അല്ല."
 
 #. TRANS: Message given saving IM address that not valid.
-#: actions/imsettings.php:340
 #, fuzzy
 msgid "Not a valid screenname"
 msgstr "സാധുവായ വിളിപ്പേര് അല്ല."
 
 #. TRANS: Message given saving IM address that is already set for another user.
-#: actions/imsettings.php:344
 #, fuzzy
 msgid "Screenname already belongs to another user."
 msgstr "ജാബ്ബർ ഐ.ഡി. മുമ്പേ തന്നെ മറ്റൊരു ഉപയോക്താവിന്റേതാണ്."
 
 #. TRANS: Message given saving valid IM address that is to be confirmed.
-#: actions/imsettings.php:369
 #, fuzzy
 msgid "A confirmation code was sent to the IM address you added."
 msgstr ""
@@ -3252,84 +2598,70 @@ msgstr ""
 "സന്ദേശങ്ങൾ അയയ്ക്കാൻ താങ്കൾ %s അയയ്ക്കേണ്ടതാണ്."
 
 #. TRANS: Message given canceling IM address confirmation for the wrong IM address.
-#: actions/imsettings.php:396
 msgid "That is the wrong IM address."
 msgstr "ഇത് തെറ്റായ ഐ.എം. വിലാസമാണ്."
 
 #. TRANS: Server error thrown on database error canceling IM address confirmation.
-#: actions/imsettings.php:405
 #, fuzzy
 msgid "Couldn't delete confirmation."
 msgstr "ഐ.എം. സ്ഥിരീകരണം നീക്കം ചെയ്യാൻ കഴിഞ്ഞില്ല."
 
 #. TRANS: Message given after successfully canceling IM address confirmation.
-#: actions/imsettings.php:410
 msgid "IM confirmation cancelled."
 msgstr "ഐ.എം. സ്ഥിരീകരണം റദ്ദാക്കി."
 
 #. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.
-#: actions/imsettings.php:434
 #, fuzzy
 msgid "That is not your screenname."
 msgstr "അത് താങ്കളുടെ ഫോൺ നമ്പരല്ല."
 
 #. TRANS: Server error thrown on database error removing a registered IM address.
-#: actions/imsettings.php:443
 #, fuzzy
 msgid "Couldn't update user im prefs."
 msgstr "ഉപയോക്തൃ രേഖകൾ പുതുക്കാൻ കഴിഞ്ഞില്ല."
 
 #. TRANS: Message given after successfully removing a registered Instant Messaging address.
-#: actions/imsettings.php:451
 msgid "The IM address was removed."
 msgstr "ഐ.എം. വിലാസം നീക്കം ചെയ്തിരിക്കുന്നു."
 
 #. TRANS: Title for all but the first page of the inbox page.
 #. TRANS: %1$s is the user's nickname, %2$s is the page number.
-#: actions/inbox.php:59
 #, php-format
 msgid "Inbox for %1$s - page %2$d"
 msgstr "%1$s എന്ന ഉപയോക്താവിന്റെ ഇൻബോക്സ് - താൾ %2$d"
 
 #. TRANS: Title for the first page of the inbox page.
 #. TRANS: %s is the user's nickname.
-#: actions/inbox.php:64
 #, php-format
 msgid "Inbox for %s"
 msgstr "%s എന്ന ഉപയോക്താവിന്റെ ഇൻബോക്സ്"
 
 #. TRANS: Instructions for user inbox page.
-#: actions/inbox.php:106
 msgid "This is your inbox, which lists your incoming private messages."
 msgstr "ഇതാണ് താങ്കളുടെ ഇൻബോക്സ്, താങ്കൾക്ക് വരുന്ന സ്വകാര്യസന്ദേശങ്ങൾ ഇവിടെയാണെത്തുക."
 
 #. TRANS: Client error displayed when trying to sent invites while they have been disabled.
-#: actions/invite.php:41
 msgid "Invites have been disabled."
 msgstr "ക്ഷണം പ്രവർത്തന രഹിതമാക്കിയിരിക്കുന്നു."
 
 #. TRANS: Client error displayed when trying to sent invites while not logged in.
 #. TRANS: %s is the StatusNet site name.
-#: actions/invite.php:45
 #, php-format
 msgid "You must be logged in to invite other users to use %s."
 msgstr "%s ഉപയോഗിക്കാൻ മറ്റുപയോക്താക്കളെ ക്ഷണിക്കാൻ താങ്കൾ ലോഗിൻ ചെയ്തിരിക്കണം."
 
 #. TRANS: Form validation message when providing an e-mail address that does not validate.
 #. TRANS: %s is an invalid e-mail address.
-#: actions/invite.php:78
 #, php-format
 msgid "Invalid email address: %s."
 msgstr "അസാധുവായ ഇമെയിൽ വിലാസം: %s."
 
 #. TRANS: Page title when invitations have been sent.
-#: actions/invite.php:117
 msgid "Invitations sent"
 msgstr "ക്ഷണങ്ങൾ അയച്ചിരിക്കുന്നു"
 
 #. TRANS: Page title when inviting potential users.
-#: actions/invite.php:120
 msgid "Invite new users"
 msgstr "പുതിയ ഉപയോക്താക്കളെ ക്ഷണിക്കുക"
 
@@ -3337,7 +2669,6 @@ msgstr "പുതിയ ഉപയോക്താക്കളെ ക്ഷണി
 #. TRANS: is already subscribed to one or more users with the given e-mail address(es).
 #. TRANS: Plural form is based on the number of reported already subscribed e-mail addresses.
 #. TRANS: Followed by a bullet list.
-#: actions/invite.php:140
 msgid "You are already subscribed to this user:"
 msgid_plural "You are already subscribed to these users:"
 msgstr[0] ""
@@ -3345,7 +2676,6 @@ msgstr[1] ""
 
 #. TRANS: Used as list item for already subscribed users (%1$s is nickname, %2$s is e-mail address).
 #. TRANS: Used as list item for already registered people (%1$s is nickname, %2$s is e-mail address).
-#: actions/invite.php:146 actions/invite.php:160
 #, php-format
 msgctxt "INVITE"
 msgid "%1$s (%2$s)"
@@ -3354,7 +2684,6 @@ msgstr ""
 #. TRANS: Message displayed inviting users to use a StatusNet site while the invited user
 #. TRANS: already uses a this StatusNet site. Plural form is based on the number of
 #. TRANS: reported already present people. Followed by a bullet list.
-#: actions/invite.php:154
 msgid "This person is already a user and you were automatically subscribed:"
 msgid_plural ""
 "These people are already users and you were automatically subscribed to them:"
@@ -3364,7 +2693,6 @@ msgstr[1] ""
 #. TRANS: Message displayed inviting users to use a StatusNet site. Plural form is
 #. TRANS: based on the number of invitations sent. Followed by a bullet list of
 #. TRANS: e-mail addresses to which invitations were sent.
-#: actions/invite.php:168
 msgid "Invitation sent to the following person:"
 msgid_plural "Invitations sent to the following people:"
 msgstr[0] "താഴെക്കൊടുത്തിരിക്കുന്ന വ്യക്തിയെ ക്ഷണിച്ചിരിക്കുന്നു:"
@@ -3372,7 +2700,6 @@ msgstr[1] "താഴെക്കൊടുത്തിരിക്കുന്ന
 
 #. TRANS: Generic message displayed after sending out one or more invitations to
 #. TRANS: people to join a StatusNet site.
-#: actions/invite.php:178
 msgid ""
 "You will be notified when your invitees accept the invitation and register "
 "on the site. Thanks for growing the community!"
@@ -3381,34 +2708,29 @@ msgstr ""
 "വളർത്തുന്നതിനു നന്ദി!"
 
 #. TRANS: Form instructions.
-#: actions/invite.php:191
 msgid ""
 "Use this form to invite your friends and colleagues to use this service."
 msgstr ""
 "ഈ സേവനം ഉപയോഗിക്കാൻ താങ്കളുടെ സുഹൃത്തുക്കളേയും സഹപ്രവർത്തകരേയും ക്ഷണിക്കാൻ ഈ ഫോം ഉപയോഗിക്കുക."
 
 #. TRANS: Field label for a list of e-mail addresses.
-#: actions/invite.php:218
 msgid "Email addresses"
 msgstr "ഇമെയിൽ വിലാസം"
 
 #. TRANS: Tooltip for field label for a list of e-mail addresses.
-#: actions/invite.php:221
 msgid "Addresses of friends to invite (one per line)."
 msgstr "ക്ഷണിക്കേണ്ട സുഹൃത്തുക്കളുടെ വിലാസം (ഒരു വരിയിൽ ഒന്നു വീതം)."
 
 #. TRANS: Field label for a personal message to send to invitees.
-#: actions/invite.php:225
 msgid "Personal message"
 msgstr "സ്വകാര്യ സന്ദേശം"
 
 #. TRANS: Tooltip for field label for a personal message to send to invitees.
-#: actions/invite.php:228
 msgid "Optionally add a personal message to the invitation."
 msgstr "ക്ഷണത്തിൽ താങ്കളുടെ സ്വന്തം സന്ദേശം കൂടി വേണമെങ്കിൽ കൂട്ടിച്ചേർക്കുക."
 
 #. TRANS: Send button for inviting friends
-#: actions/invite.php:232
+#. TRANS: Button text for sending notice.
 msgctxt "BUTTON"
 msgid "Send"
 msgstr "അയക്കുക"
@@ -3416,7 +2738,6 @@ msgstr "അയക്കുക"
 #. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral
 #. TRANS: singular 3rd-person pronoun in English. %1$s is the inviting user, $2$s is
 #. TRANS: the StatusNet sitename.
-#: actions/invite.php:264
 #, php-format
 msgid "%1$s has invited you to join them on %2$s"
 msgstr "%1$s താങ്കളെ, അവരോടൊപ്പം %2$s സൈറ്റിൽ ചേരാൻ ക്ഷണിച്ചിരിക്കുന്നു"
@@ -3426,7 +2747,6 @@ msgstr "%1$s താങ്കളെ, അവരോടൊപ്പം %2$s സൈ
 #. TRANS: StatusNet sitename, %3$s is the site URL, %4$s is the personal message from the
 #. TRANS: inviting user, %s%5 a link to the timeline for the inviting user, %s$6 is a link
 #. TRANS: to register with the StatusNet site.
-#: actions/invite.php:271
 #, php-format
 msgid ""
 "%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -3458,182 +2778,177 @@ msgid ""
 msgstr ""
 
 #. TRANS: Client error displayed when trying to join a group while not logged in.
-#: actions/joingroup.php:59
 msgid "You must be logged in to join a group."
 msgstr "ഒരു സംഘത്തിൽ ചേരാൻ താങ്കൾ ലോഗിൻ ചെയ്തിരിക്കേണ്ടതാണ്."
 
 #. TRANS: Title for join group page after joining.
-#: actions/joingroup.php:148
 #, php-format
 msgctxt "TITLE"
 msgid "%1$s joined group %2$s"
 msgstr "%1$s %2$s എന്ന സംഘത്തിൽ ചേർന്നു"
 
 #. TRANS: Client error displayed when trying to leave a group while not logged in.
-#: actions/leavegroup.php:59
 msgid "You must be logged in to leave a group."
 msgstr "ഒരു സംഘത്തിൽ നിന്നും പുറത്തുപോകാൻ താങ്കൾ ലോഗിൻ ചെയ്തിരിക്കേണ്ടതാണ്."
 
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
-#: actions/leavegroup.php:103 lib/command.php:398
 msgid "You are not a member of that group."
 msgstr "താങ്കൾ ആ സംഘത്തിൽ അംഗമല്ല."
 
 #. TRANS: Title for leave group page after leaving.
-#: actions/leavegroup.php:142
 #, php-format
 msgctxt "TITLE"
 msgid "%1$s left group %2$s"
 msgstr "%1$s %2$s എന്ന സംഘത്തിൽ നിന്നും ഒഴിവായി"
 
 #. TRANS: User admin panel title
-#: actions/licenseadminpanel.php:55
 msgctxt "TITLE"
 msgid "License"
 msgstr "അനുമതി"
 
-#: actions/licenseadminpanel.php:65
+#. TRANS: Form instructions for the site license admin panel.
 msgid "License for this StatusNet site"
 msgstr "ഈ സ്റ്റാറ്റസ്‌നെറ്റ് സൈറ്റിന്റെ ഉപയോഗാനുമതി"
 
-#: actions/licenseadminpanel.php:134
+#. TRANS: Client error displayed selecting an invalid license in the license admin panel.
 msgid "Invalid license selection."
 msgstr "അനുമതി തിരഞ്ഞെടുക്കൽ അസാധുവാണ്."
 
-#: actions/licenseadminpanel.php:144
+#. TRANS: Client error displayed when not specifying an owner for the all rights reserved license in the license admin panel.
 msgid ""
 "You must specify the owner of the content when using the All Rights Reserved "
 "license."
 msgstr ""
 "എല്ലാ അവകാശങ്ങളും സംരക്ഷിതമായ ഉള്ളടക്കമാണ് ഉപയോഗിക്കുന്നതെങ്കിൽ ഉടമയെ വ്യക്തമാക്കേണ്ടതാണ്."
 
-#: actions/licenseadminpanel.php:151
+#. TRANS: Client error displayed selecting a too long license title in the license admin panel.
 msgid "Invalid license title. Maximum length is 255 characters."
 msgstr "അസാധുവായ അനുമതി തലക്കെട്ട്. പരമാവധി നീളം 255 അക്ഷരങ്ങൾ."
 
-#: actions/licenseadminpanel.php:163
+#. TRANS: Client error displayed specifying an invalid license URL in the license admin panel.
 msgid "Invalid license URL."
 msgstr "അനുമതിയുടെ യു.ആർ.എൽ. അസാധുവാണ്."
 
-#: actions/licenseadminpanel.php:166
+#. TRANS: Client error displayed specifying an invalid license image URL in the license admin panel.
 msgid "Invalid license image URL."
 msgstr "അനുമതി ചിത്രത്തിന്റെ യു.ആർ.എൽ. അസാധുവാണ്."
 
-#: actions/licenseadminpanel.php:174
+#. TRANS: Client error displayed specifying an invalid license URL in the license admin panel.
 msgid "License URL must be blank or a valid URL."
 msgstr "അനുമതിപത്ര യൂ.ആർ.എൽ. ശൂന്യമായിരിക്കണം അല്ലെങ്കിൽ സാധുവായ യൂ.ആർ.എൽ. ആയിരിക്കണം."
 
-#: actions/licenseadminpanel.php:182
+#. TRANS: Client error displayed specifying an invalid license image URL in the license admin panel.
 msgid "License image must be blank or valid URL."
 msgstr "അനുമതിപത്ര ചിത്രം ശൂന്യമായിരിക്കണം അല്ലെങ്കിൽ സാധുവായ യൂ.ആർ.എൽ. ആയിരിക്കണം."
 
-#: actions/licenseadminpanel.php:232
+#. TRANS: Form legend in the license admin panel.
 msgid "License selection"
 msgstr "അനുമതി തിരഞ്ഞെടുക്കൽ"
 
-#: actions/licenseadminpanel.php:238
+#. TRANS: License option in the license admin panel.
 msgid "Private"
 msgstr "സ്വകാര്യം"
 
-#: actions/licenseadminpanel.php:239
+#. TRANS: License option in the license admin panel.
 msgid "All Rights Reserved"
 msgstr "എല്ലാ അവകാശങ്ങളും സംരക്ഷിതം"
 
-#: actions/licenseadminpanel.php:240
+#. TRANS: License option in the license admin panel.
 msgid "Creative Commons"
 msgstr "ക്രിയേറ്റീവ് കോമൺസ്"
 
-#: actions/licenseadminpanel.php:245
+#. TRANS: Dropdown field label in the license admin panel.
 msgid "Type"
 msgstr "തരം"
 
-#: actions/licenseadminpanel.php:247
-msgid "Select license"
+#. TRANS: Dropdown field instructions in the license admin panel.
+#, fuzzy
+msgid "Select a license."
 msgstr "അനുമതി തിരഞ്ഞെടുക്കുക"
 
-#: actions/licenseadminpanel.php:261
+#. TRANS: Form legend in the license admin panel.
 msgid "License details"
 msgstr "അനുമതിയുടെ വിശദാംശങ്ങൾ"
 
-#: actions/licenseadminpanel.php:267
+#. TRANS: Field label in the license admin panel.
 msgid "Owner"
 msgstr "ഉടമ"
 
-#: actions/licenseadminpanel.php:268
+#. TRANS: Field title in the license admin panel.
 msgid "Name of the owner of the site's content (if applicable)."
 msgstr "സൈറ്റിന്റെ ഉള്ളടക്കത്തിന്റെ ഉടമയുടെ (സാദ്ധ്യമെങ്കിൽ) പേര്."
 
-#: actions/licenseadminpanel.php:276
+#. TRANS: Field label in the license admin panel.
 msgid "License Title"
 msgstr "അനുമതിയുടെ തലക്കെട്ട്"
 
-#: actions/licenseadminpanel.php:277
+#. TRANS: Field title in the license admin panel.
 msgid "The title of the license."
 msgstr "അനുമതിയുടെ ശീർഷകം."
 
-#: actions/licenseadminpanel.php:285
+#. TRANS: Field label in the license admin panel.
 msgid "License URL"
 msgstr "അനുമതിയുടെ യൂ.ആർ.എൽ."
 
-#: actions/licenseadminpanel.php:286
+#. TRANS: Field title in the license admin panel.
 msgid "URL for more information about the license."
 msgstr "അനുമതിയെക്കുറിച്ച് കൂടുതൽ വിവരങ്ങൾ നൽകുന്ന യൂ.ആർ.എൽ."
 
-#: actions/licenseadminpanel.php:293
+#. TRANS: Field label in the license admin panel.
 msgid "License Image URL"
 msgstr "അനുമതി ചിത്ര യൂ.ആർ.എൽ."
 
-#: actions/licenseadminpanel.php:294
+#. TRANS: Field title in the license admin panel.
 msgid "URL for an image to display with the license."
 msgstr "അനുമതിയോടൊപ്പം പ്രദർശിപ്പിക്കേണ്ട ചിത്രത്തിന്റെ യൂ.ആർ.എൽ.."
 
-#. TRANS: Submit button title.
-#: actions/licenseadminpanel.php:311 actions/sessionsadminpanel.php:199
-#: actions/siteadminpanel.php:292 actions/snapshotadminpanel.php:245
-#: actions/tagother.php:133 lib/applicationeditform.php:357
-msgid "Save"
-msgstr "സേവ് ചെയ്യുക"
-
-#: actions/licenseadminpanel.php:311
-msgid "Save license settings"
+#. TRANS: Button title in the license admin panel.
+#, fuzzy
+msgid "Save license settings."
 msgstr "അനുമതി സജ്ജീകരണങ്ങൾ സേവ് ചെയ്യുക"
 
+#. TRANS: Client error displayed when trying to log in while already logged in.
 #. TRANS: Client error displayed trying to use "one time password login" when already logged in.
-#: actions/login.php:97 actions/otp.php:62 actions/register.php:130
 msgid "Already logged in."
 msgstr "മുമ്പേ തന്നെ ലോഗിൻ ചെയ്തിട്ടുണ്ട്."
 
-#: actions/login.php:125
+#. TRANS: Form validation error displayed when trying to log in with incorrect credentials.
 msgid "Incorrect username or password."
 msgstr "ഉപയോക്തൃനാമമോ രഹസ്യവാക്കോ തെറ്റാണ്."
 
+#. TRANS: Server error displayed when during login a server error occurs.
 #. TRANS: Server error displayed when a user object could not be created trying to login using "one time password login".
-#: actions/login.php:131 actions/otp.php:127
 msgid "Error setting user. You are probably not authorized."
 msgstr "ഉപയോക്തൃ സജ്ജീകരണത്തിൽ പിഴവുണ്ടായി. താങ്കൾക്ക് മിക്കവാറും അനുമതിയുണ്ടാവില്ല."
 
-#: actions/login.php:185 actions/login.php:236 lib/action.php:598
+#. TRANS: Page title for login page.
 msgid "Login"
 msgstr "പ്രവേശിക്കുക"
 
-#: actions/login.php:222
+#. TRANS: Form legend on login page.
 msgid "Login to site"
 msgstr "സൈറ്റിലേക്ക് പ്രവേശിക്കുക"
 
-#: actions/login.php:231 actions/register.php:469
+#. TRANS: Checkbox label label on login page.
 msgid "Remember me"
 msgstr "എന്നെ ഓർത്തുവെയ്ക്കുക"
 
-#: actions/login.php:232 actions/register.php:471
+#. TRANS: Checkbox title on login page.
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "ഭാവിയിൽ സ്വയം ലോഗിൻ ചെയ്യുക; പങ്ക് വെച്ച് ഉപയോഗിക്കുന്ന കമ്പ്യൂട്ടറുകളിൽ പാടില്ല!"
 
-#: actions/login.php:241
+#. TRANS: Button text for log in on login page.
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Login"
+msgstr "പ്രവേശിക്കുക"
+
+#. TRANS: Link text for link to "reset password" on login page.
 msgid "Lost or forgotten password?"
 msgstr "രഹസ്യവാക്ക് നഷ്ടപ്പെടുകയോ മറക്കുകയോ ചെയ്തോ?"
 
-#: actions/login.php:259
+#. TRANS: Form instructions on login page before being able to change user settings.
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -3641,136 +2956,132 @@ msgstr ""
 "സുരക്ഷാകാരണങ്ങളാൽ, താങ്കളുടെ ഉപയോക്തൃനാമവും രഹസ്യവാക്കും സജ്ജീകരണങ്ങളിൽ മാറ്റം വരുത്തുന്നതിനു "
 "മുമ്പ് ഒരു പ്രാവശ്യം നൽകേണ്ടതാണ്."
 
-#: actions/login.php:263
+#. TRANS: Form instructions on login page.
 msgid "Login with your username and password."
 msgstr "താങ്കളുടെ ഉപയോക്തൃനാമവും രഹസ്യവാക്കും ഉപയോഗിച്ച് ലോഗിൻ ചെയ്യുക."
 
-#: actions/login.php:266
+#. TRANS: Form instructions on login page. This message contains Markdown links in the form [Link text](Link).
+#. TRANS: %%action.register%% is a link to the registration page.
 #, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
 msgstr "ഇതുവരെ ഒരു ഉപയോക്തൃനാമം ഇല്ലേ?? പുതിയൊരു [അംഗത്വമെടുക്കുക](%%action.register%%)."
 
-#: actions/makeadmin.php:92
+#. TRANS: Client error displayed when trying to make another user admin on the Make Admin page while not an admin.
 msgid "Only an admin can make another user an admin."
 msgstr "ഒരു കാര്യനിർവ്വാഹകനു മാത്രമേ മറ്റൊരുപയോക്താവിനെ കാര്യനിർവ്വാഹകനാക്കാൻ കഴിയൂ."
 
-#: actions/makeadmin.php:96
+#. TRANS: Client error displayed when trying to make another user admin on the Make Admin page who already is admin.
+#. TRANS: %1$s is the user that is already admin, %2$s is the group user is already admin for.
 #, php-format
 msgid "%1$s is already an admin for group \"%2$s\"."
 msgstr "%1$s എന്ന ഉപയോക്താവ് \"%2$s\" എന്ന സംഘത്തിൽ മുമ്പേ തന്നെ കാര്യനിർവ്വാഹകനാണ്."
 
-#: actions/makeadmin.php:133
+#. TRANS: Server error displayed when trying to make another user admin on the Make Admin page fails
+#. TRANS: because the group membership record could not be gotten.
+#. TRANS: %1$s is the to be admin user, %2$s is the group user should be admin for.
 #, php-format
 msgid "Can't get membership record for %1$s in group %2$s."
 msgstr "%2$s സൈറ്റിലെ %1$s സംഘാംഗങ്ങളുടെ അംഗത്വരേഖ ലഭ്യമായില്ല."
 
-#: actions/makeadmin.php:146
+#. TRANS: Server error displayed when trying to make another user admin on the Make Admin page fails
+#. TRANS: because the group adminship record coud not be saved properly.
+#. TRANS: %1$s is the to be admin user, %2$s is the group user is already admin for.
 #, php-format
 msgid "Can't make %1$s an admin for group %2$s."
 msgstr "%1$s എന്ന ഉപയോക്താവിനെ %2$s എന്ന സംഘത്തിലെ കാര്യനിർവ്വാഹകനാക്കാൻ കഴിയില്ല."
 
-#: actions/microsummary.php:69
+#. TRANS: Client error displayed trying to make a micro summary without providing a status.
 msgid "No current status."
 msgstr "തൽസ്ഥിതിവിവരം ഒന്നും ഇല്ല."
 
 #. TRANS: This is the title of the form for adding a new application.
-#: actions/newapplication.php:52
 msgid "New application"
 msgstr ""
 
 #. TRANS: Client error displayed trying to add a new application while not logged in.
-#: actions/newapplication.php:64
 msgid "You must be logged in to register an application."
 msgstr ""
 
 #. TRANS: Form instructions for registering a new application.
-#: actions/newapplication.php:147
 msgid "Use this form to register a new application."
 msgstr ""
 
 #. TRANS: Validation error shown when not providing a source URL in the "New application" form.
-#: actions/newapplication.php:189
 msgid "Source URL is required."
 msgstr "സ്രോതസ്സ് യു.ആർ.എൽ. ആവശ്യമാണ്."
 
 #. TRANS: Server error displayed when an application could not be registered in the database through the "New application" form.
-#: actions/newapplication.php:279 actions/newapplication.php:289
 msgid "Could not create application."
 msgstr ""
 
 #. TRANS: Title for form to create a group.
-#: actions/newgroup.php:53
 msgid "New group"
 msgstr "പുതിയ സംഘം"
 
 #. TRANS: Client exception thrown when a user tries to create a group while banned.
-#: actions/newgroup.php:73 classes/User_group.php:485
 msgid "You are not allowed to create groups on this site."
 msgstr "ഈ സൈറ്റിൽ സംഘങ്ങൾ ഉണ്ടാക്കാൻ താങ്കൾക്ക് അനുമതിയില്ല."
 
 #. TRANS: Form instructions for group create form.
-#: actions/newgroup.php:117
 msgid "Use this form to create a new group."
 msgstr "പുതിയൊരു സംഘം സൃഷ്ടിക്കാൻ ഈ ഫോം ഉപയോഗിക്കുക."
 
-#. TRANS: Group create form validation error.
-#: actions/newgroup.php:200
-msgid "Alias cannot be the same as nickname."
-msgstr ""
-
-#: actions/newmessage.php:71 actions/newmessage.php:234
+#. TRANS: Page title for new direct message page.
+#. TRANS: Page title on page for sending a direct message.
 msgid "New message"
 msgstr "പുതിയ സന്ദേശം"
 
-#. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
-#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:513
-msgid "You can't send a message to this user."
+#. TRANS: Client error displayed trying to send a direct message to a user while sender and
+#. TRANS: receiver are not subscribed to each other.
+#, fuzzy
+msgid "You cannot send a message to this user."
 msgstr "ഈ ഉപയോക്താവിന് സന്ദേശമയയ്ക്കാൻ താങ്കൾക്കാവില്ല."
 
+#. TRANS: Form validator error displayed trying to send a direct message without content.
+#. TRANS: Client error displayed trying to send a notice without content.
 #. TRANS: Command exception text shown when trying to send a direct message to another user without content.
 #. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
-#: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:490
-#: lib/command.php:593
 msgid "No content!"
 msgstr "ഉള്ളടക്കമില്ല!"
 
-#: actions/newmessage.php:161
+#. TRANS: Form validation error displayed trying to send a direct message without specifying a recipient.
 msgid "No recipient specified."
 msgstr "സ്വീകർത്താവിനെ വ്യക്തമാക്കിയിട്ടില്ല."
 
+#. TRANS: Client error displayed trying to send a direct message to self.
 #. TRANS: Error text shown when trying to send a direct message to self.
-#: actions/newmessage.php:167 lib/command.php:517
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr "താങ്കൾക്കു തന്നെ സന്ദേശം അയയ്ക്കരുത്; പകരം അത് പതുക്കെ സ്വയം പറയുക."
 
-#: actions/newmessage.php:184
+#. TRANS: Page title after sending a direct message.
 msgid "Message sent"
 msgstr "സന്ദേശം അയച്ചു"
 
+#. TRANS: Confirmation text after sending a direct message.
+#. TRANS: %s is the direct message recipient.
 #. TRANS: Message given have sent a direct message to another user.
 #. TRANS: %s is the name of the other user.
-#: actions/newmessage.php:188 lib/command.php:525
 #, php-format
 msgid "Direct message to %s sent."
 msgstr "%s എന്ന ഉപയോക്താവിന് നേരിട്ട് അയച്ച സന്ദേശങ്ങൾ."
 
-#: actions/newmessage.php:213 actions/newnotice.php:264
+#. TRANS: Page title after an AJAX error occurred on the "send direct message" page.
+#. TRANS: Page title after an AJAX error occurs on the send notice page.
 msgid "Ajax Error"
 msgstr "അജാക്സ് പിഴവ്"
 
-#: actions/newnotice.php:69
+#. TRANS: Page title for sending a new notice.
 msgid "New notice"
 msgstr "പുതിയ അറിയിപ്പ്"
 
-#: actions/newnotice.php:230
+#. TRANS: Page title after sending a notice.
 msgid "Notice posted"
 msgstr "അറിയിപ്പ് പ്രസിദ്ധീകരിച്ചിരിക്കുന്നു"
 
 #. TRANS: Instructions for Notice search page.
 #. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/noticesearch.php:69
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -3778,20 +3089,17 @@ msgid ""
 msgstr ""
 
 #. TRANS: Title of the page where users can search for notices.
-#: actions/noticesearch.php:80
 msgid "Text search"
 msgstr "എഴുത്തുകളിലെ തിരച്ചിൽ"
 
 #. TRANS: Test in RSS notice search.
 #. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearch.php:95
 #, php-format
 msgid "Search results for \"%1$s\" on %2$s"
 msgstr ""
 
 #. TRANS: Text for logged in users making a query for notices without results.
 #. TRANS: This message contains a Markdown link.
-#: actions/noticesearch.php:128
 #, php-format
 msgid ""
 "Be the first to [post on this topic](%%%%action.newnotice%%%%?"
@@ -3801,7 +3109,6 @@ msgstr ""
 
 #. TRANS: Text for not logged in users making a query for notices without results.
 #. TRANS: This message contains Markdown links.
-#: actions/noticesearch.php:133
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and be the first to "
@@ -3811,78 +3118,67 @@ msgstr ""
 "action.newnotice%%%%?status_textarea=%s) ആദ്യയാളാകുകയും ചെയ്തുകൂട!"
 
 #. TRANS: RSS notice search feed title. %s is the query.
-#: actions/noticesearchrss.php:95
 #, php-format
 msgid "Updates with \"%s\""
 msgstr ""
 
 #. TRANS: RSS notice search feed description.
 #. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearchrss.php:99
 #, fuzzy, php-format
 msgid "Updates matching search term \"%1$s\" on %2$s."
 msgstr "%2$s സൈറ്റിലെ %1$s സംഘാങ്ങളുടെ പുതുക്കലുകൾ!"
 
-#: actions/nudge.php:85
+#. TRANS: Client error displayed trying to nudge a user that cannot be nudged.
 msgid ""
 "This user doesn't allow nudges or hasn't confirmed or set their email "
 "address yet."
 msgstr ""
 
-#: actions/nudge.php:94
+#. TRANS: Page title after sending a nudge.
 msgid "Nudge sent"
 msgstr ""
 
-#: actions/nudge.php:97
+#. TRANS: Confirmation text after sending a nudge.
 msgid "Nudge sent!"
 msgstr ""
 
 #. TRANS: Message displayed to an anonymous user trying to view OAuth application list.
-#: actions/oauthappssettings.php:57
 msgid "You must be logged in to list your applications."
 msgstr ""
 
 #. TRANS: Page title for OAuth applications
-#: actions/oauthappssettings.php:73
 msgid "OAuth applications"
 msgstr ""
 
 #. TRANS: Page instructions for OAuth applications
-#: actions/oauthappssettings.php:85
 msgid "Applications you have registered"
 msgstr ""
 
 #. TRANS: Empty list message on page with OAuth applications.
-#: actions/oauthappssettings.php:138
 #, php-format
 msgid "You have not registered any applications yet."
 msgstr ""
 
 #. TRANS: Title for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:69
 msgid "Connected applications"
 msgstr ""
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:80
 msgid "The following connections exist for your account."
 msgstr ""
 
 #. TRANS: Client error when trying to revoke access for an application while not being a user of it.
-#: actions/oauthconnectionssettings.php:165
 msgid "You are not a user of that application."
 msgstr ""
 
 #. TRANS: Client error when revoking access has failed for some reason.
 #. TRANS: %s is the application ID revoking access failed for.
-#: actions/oauthconnectionssettings.php:180
 #, php-format
 msgid "Unable to revoke access for application: %s."
 msgstr ""
 
 #. TRANS: Success message after revoking access for an application.
 #. TRANS: %1$s is the application name, %2$s is the first part of the user token.
-#: actions/oauthconnectionssettings.php:199
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -3890,452 +3186,369 @@ msgid ""
 msgstr ""
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:210
 msgid "You have not authorized any applications to use your account."
 msgstr ""
 
 #. TRANS: Note for developers in the OAuth connection settings form.
 #. TRANS: This message contains a Markdown link. Do not separate "](".
 #. TRANS: %s is the URL to the OAuth settings.
-#: actions/oauthconnectionssettings.php:230
 #, php-format
 msgid ""
 "Are you a developer? [Register an OAuth client application](%s) to use with "
 "this instance of StatusNet."
 msgstr ""
 
-#: actions/oembed.php:64
+#. TRANS: Server error displayed in oEmbed action when path not found.
+#. TRANS: %s is a path.
 #, fuzzy, php-format
 msgid "\"%s\" not found."
 msgstr "ഉപയോക്താവിനെ കണ്ടത്താനായില്ല."
 
-#: actions/oembed.php:76
+#. TRANS: Server error displayed in oEmbed action when notice not found.
+#. TRANS: %s is a notice.
 #, php-format
 msgid "Notice %s not found."
 msgstr "%s എന്ന അറിയിപ്പ് കണ്ടെത്താനായില്ല."
 
-#: actions/oembed.php:80 actions/shownotice.php:100
+#. TRANS: Server error displayed in oEmbed action when notice has not profile.
 msgid "Notice has no profile."
 msgstr ""
 
-#: actions/oembed.php:83 actions/shownotice.php:172
+#. TRANS: oEmbed title. %1$s is the author name, %2$s is the creation date.
 #, php-format
 msgid "%1$s's status on %2$s"
 msgstr "%2$s പദ്ധതിയിൽ %1$s എന്ന ഉപയോക്താവിന്റെ സ്ഥിതിവിവരം"
 
-#: actions/oembed.php:95
+#. TRANS: Server error displayed in oEmbed action when attachment not found.
+#. TRANS: %d is an attachment ID.
 #, fuzzy, php-format
 msgid "Attachment %s not found."
 msgstr "സ്വീകർത്താവായ ഉപയോക്താവിനെ കണ്ടെത്താനായില്ല."
 
-#: actions/oembed.php:136
+#. TRANS: Server error displayed in oEmbed request when a path is not supported.
+#. TRANS: %s is a path.
 #, php-format
 msgid "\"%s\" not supported for oembed requests."
 msgstr ""
 
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
-#: actions/oembed.php:168
 #, php-format
 msgid "Content type %s not supported."
 msgstr "%s എന്ന തരം ഉള്ളടക്കം പിന്തുണയ്ക്കുന്നില്ല."
 
 #. TRANS: Error message displaying attachments. %s is the site's base URL.
-#: actions/oembed.php:172
 #, php-format
 msgid "Only %s URLs over plain HTTP please."
 msgstr ""
 
+#. TRANS: Server error displayed in oEmbed action when request specifies an unsupported data format.
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1207
-#: lib/apiaction.php:1234 lib/apiaction.php:1369
 msgid "Not a supported data format."
 msgstr "പിന്തുണയില്ലാത്ത തരം ഡേറ്റ."
 
 #. TRANS: ShortName in the OpenSearch interface when trying to find users.
-#: actions/opensearch.php:64
 msgid "People Search"
 msgstr "ഉപയോക്താക്കളെ തിരയുക"
 
-#: actions/opensearch.php:68
+#. TRANS: ShortName in the OpenSearch interface when trying to find notices.
 msgid "Notice Search"
 msgstr "അറിയിപ്പുകൾ തിരയുക"
 
 #. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
-#: actions/otp.php:70
 msgid "No user ID specified."
 msgstr "ഉപയോക്തൃ ഐ.ഡി. വ്യക്തമാക്കിയിട്ടില്ല."
 
 #. TRANS: Client error displayed trying to use "one time password login" without specifying a login token.
-#: actions/otp.php:86
 msgid "No login token specified."
 msgstr "ലോഗിൻ ചീട്ട് വ്യക്തമാക്കിയിട്ടില്ല."
 
 #. TRANS: Client error displayed trying to use "one time password login" without requesting a login token.
-#: actions/otp.php:94
 msgid "No login token requested."
 msgstr "ലോഗിൻ ചീറ്റ് ആവശ്യപ്പെട്ടിട്ടില്ല."
 
 #. TRANS: Client error displayed trying to use "one time password login" while specifying an invalid login token.
-#: actions/otp.php:100
 msgid "Invalid login token specified."
 msgstr "വ്യക്തമാക്കിയത് അസാധുവായ ലോഗിൻ ചീട്ട് ആണ്."
 
 #. TRANS: Client error displayed trying to use "one time password login" while specifying an expired login token.
-#: actions/otp.php:110
 msgid "Login token expired."
 msgstr "ലോഗിൻ ചീട്ട് കാലഹരണപ്പെട്ടിരിക്കുന്നു."
 
 #. TRANS: Title for outbox for any but the fist page.
 #. TRANS: %1$s is the user nickname, %2$d is the page number.
-#: actions/outbox.php:57
 #, php-format
 msgid "Outbox for %1$s - page %2$d"
 msgstr "%1$s എന്ന ഉപയോക്താവിന്റെ ഔട്ട്ബോക്സ് - താൾ %2$d"
 
 #. TRANS: Title for first page of outbox.
-#: actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
 msgstr "%s എന്ന ഉപയോക്താവിന്റെ ഔട്ട്ബോക്സ്"
 
 #. TRANS: Instructions for outbox.
-#: actions/outbox.php:103
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr "ഇത് താങ്കളുടെ ഔട്ട്ബോക്സ് ആണ്, താങ്കൾ അയച്ച സ്വകാര്യ സന്ദേശങ്ങൾ ഇവിടെ കാണാം."
 
-#: actions/passwordsettings.php:58
 msgid "Change password"
 msgstr "രഹസ്യവാക്ക് മാറ്റുക"
 
-#: actions/passwordsettings.php:69
 msgid "Change your password."
 msgstr "താങ്കളുടെ രഹസ്യവാക്ക് മാറ്റുക."
 
 #. TRANS: Fieldset legend for password reset form.
-#: actions/passwordsettings.php:96 actions/recoverpassword.php:251
 msgid "Password change"
 msgstr "രഹസ്യവാക്ക് മാറ്റൽ"
 
-#: actions/passwordsettings.php:104
 msgid "Old password"
 msgstr "പഴയ രഹസ്യവാക്ക്"
 
 #. TRANS: Field label for password reset form.
-#: actions/passwordsettings.php:108 actions/recoverpassword.php:256
 msgid "New password"
 msgstr "പുതിയ രഹസ്യവാക്ക്"
 
-#: actions/passwordsettings.php:109 actions/register.php:416
 msgid "6 or more characters."
 msgstr "ആറോ അതിലധികമോ അക്ഷരങ്ങൾ."
 
 #. TRANS: Ttile for field label for password reset form where the password has to be typed again.
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:264
-#: actions/register.php:420
 msgid "Same as password above."
 msgstr "മുകളിൽ നൽകിയ അതേ രഹസ്യവാക്ക്."
 
-#: actions/passwordsettings.php:117
 msgid "Change"
 msgstr "മാറ്റുക"
 
-#: actions/passwordsettings.php:153 actions/register.php:223
 msgid "Password must be 6 or more characters."
 msgstr "രഹസ്യവാക്കിന് ആറോ അതിലധികമോ അക്ഷരങ്ങളുണ്ടായിരിക്കണം."
 
-#: actions/passwordsettings.php:156 actions/register.php:226
 msgid "Passwords don't match."
 msgstr "രഹസ്യവാക്കുകൾ തമ്മിൽ യോജിക്കുന്നില്ല"
 
-#: actions/passwordsettings.php:164
 msgid "Incorrect old password"
 msgstr "പഴയ രഹസ്യവാക്ക് തെറ്റാണ്"
 
-#: actions/passwordsettings.php:180
 msgid "Error saving user; invalid."
 msgstr "ഉപയോക്താവിനെ സേവ് ചെയ്യുന്നതിൽ പിഴവുണ്ടായി; അസാധുവാണ്."
 
 #. TRANS: Reset password form validation error message.
-#: actions/passwordsettings.php:185 actions/recoverpassword.php:418
 msgid "Cannot save new password."
 msgstr "പുതിയ രഹസ്യവാക്ക് സേവ് ചെയ്യാനാവില്ല."
 
-#: actions/passwordsettings.php:191
 msgid "Password saved."
 msgstr "രഹസ്യവാക്ക് സേവ് ചെയ്തിരിക്കുന്നു."
 
 #. TRANS: Title for Paths admin panel.
 #. TRANS: Menu item for site administration
-#: actions/pathsadminpanel.php:58 lib/adminpanelaction.php:371
 msgid "Paths"
 msgstr ""
 
 #. TRANS: Form instructions for Path admin panel.
-#: actions/pathsadminpanel.php:69
 msgid "Path and server settings for this StatusNet site"
 msgstr ""
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the directory that could not be read from.
-#: actions/pathsadminpanel.php:155
 #, php-format
 msgid "Theme directory not readable: %s."
 msgstr ""
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the avatar directory that could not be written to.
-#: actions/pathsadminpanel.php:163
 #, php-format
 msgid "Avatar directory not writable: %s."
 msgstr ""
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the background directory that could not be written to.
-#: actions/pathsadminpanel.php:171
 #, php-format
 msgid "Background directory not writable: %s."
 msgstr ""
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the locales directory that could not be read from.
-#: actions/pathsadminpanel.php:181
 #, php-format
 msgid "Locales directory not readable: %s."
 msgstr ""
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the SSL server URL that is too long.
-#: actions/pathsadminpanel.php:189
 msgid "Invalid SSL server. The maximum length is 255 characters."
 msgstr ""
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:235 actions/siteadminpanel.php:58
 msgid "Site"
 msgstr "സൈറ്റ്"
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:241 actions/pathsadminpanel.php:279
-#: actions/pathsadminpanel.php:370 actions/pathsadminpanel.php:425
 msgid "Server"
 msgstr "സെർവർ"
 
-#: actions/pathsadminpanel.php:242
 msgid "Site's server hostname."
 msgstr ""
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:248 actions/pathsadminpanel.php:288
-#: actions/pathsadminpanel.php:379 actions/pathsadminpanel.php:434
 msgid "Path"
 msgstr ""
 
-#: actions/pathsadminpanel.php:249
 msgid "Site path."
 msgstr ""
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:255
 msgid "Locale directory"
 msgstr ""
 
-#: actions/pathsadminpanel.php:256
 msgid "Directory path to locales."
 msgstr ""
 
 #. TRANS: Checkbox label in Paths admin panel.
-#: actions/pathsadminpanel.php:263
 msgid "Fancy URLs"
 msgstr "അലങ്കൃത യൂ.ആർ.എല്ലുകൾ"
 
-#: actions/pathsadminpanel.php:265
 msgid "Use fancy (more readable and memorable) URLs?"
 msgstr "അലങ്കൃത (വായിക്കാനും ഓർത്തിരിക്കാനും എളുപ്പമായവ) യൂ.ആർ.എല്ലുകൾ ഉപയോഗിക്കണോ?"
 
-#: actions/pathsadminpanel.php:272
 msgid "Theme"
 msgstr "ദൃശ്യരൂപം"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:281
 msgid "Server for themes."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:290
 msgid "Web path to themes."
 msgstr ""
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:297 actions/pathsadminpanel.php:388
-#: actions/pathsadminpanel.php:443 actions/pathsadminpanel.php:495
 msgid "SSL server"
 msgstr "എസ്.എസ്.എൽ. സെർവർ"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:299
 msgid "SSL server for themes (default: SSL server)."
 msgstr ""
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:306 actions/pathsadminpanel.php:397
-#: actions/pathsadminpanel.php:452
 msgid "SSL path"
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:308
 msgid "SSL path to themes (default: /theme/)."
 msgstr ""
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:315 actions/pathsadminpanel.php:406
-#: actions/pathsadminpanel.php:461
 msgid "Directory"
 msgstr "ഡയറക്ടറി"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:317
 msgid "Directory where themes are located."
 msgstr ""
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:326
 msgid "Avatars"
 msgstr "അവതാരങ്ങൾ"
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:333
 msgid "Avatar server"
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:335
 msgid "Server for avatars."
 msgstr ""
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:342
 msgid "Avatar path"
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:344
 msgid "Web path to avatars."
 msgstr ""
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:351
 msgid "Avatar directory"
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:353
 msgid "Directory where avatars are located."
 msgstr ""
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:364
 msgid "Backgrounds"
 msgstr "പശ്ചാത്തലം"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:372
 msgid "Server for backgrounds."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:381
 msgid "Web path to backgrounds."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:390
 msgid "Server for backgrounds on SSL pages."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:399
 msgid "Web path to backgrounds on SSL pages."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:408
 msgid "Directory where backgrounds are located."
 msgstr ""
 
 #. TRANS: Fieldset legens in Paths admin panel.
-#: actions/pathsadminpanel.php:419
 msgid "Attachments"
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:427
 msgid "Server for attachments."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:436
 msgid "Web path to attachments."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:445
 msgid "Server for attachments on SSL pages."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:454
 msgid "Web path to attachments on SSL pages."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:463
 msgid "Directory where attachments are located."
 msgstr ""
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:472
 msgid "SSL"
 msgstr "എസ്.എസ്.എൽ."
 
 #. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
-#: actions/pathsadminpanel.php:477 actions/snapshotadminpanel.php:202
 msgid "Never"
 msgstr "ഒരിക്കലുമരുത്"
 
 #. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
-#: actions/pathsadminpanel.php:479
 msgid "Sometimes"
 msgstr "ചിലപ്പോഴൊക്കെ"
 
 #. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
-#: actions/pathsadminpanel.php:481
 msgid "Always"
 msgstr "എല്ലായ്പ്പോഴും"
 
-#: actions/pathsadminpanel.php:485
 msgid "Use SSL"
 msgstr "എസ്.എസ്.എൽ. ഉപയോഗിക്കുക"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:487
 msgid "When to use SSL."
 msgstr "എസ്.എസ്.എൽ. എപ്പോഴാണ് ഉപയോഗിക്കേണ്ടത്."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:497
 msgid "Server to direct SSL requests to."
 msgstr ""
 
 #. TRANS: Button title text to store form data in the Paths admin panel.
-#: actions/pathsadminpanel.php:514
 msgid "Save paths"
 msgstr ""
 
 #. TRANS: Instructions for the "People search" page.
 #. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/peoplesearch.php:54
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
@@ -4343,57 +3556,46 @@ msgid ""
 msgstr ""
 
 #. TRANS: Title of a page where users can search for other users.
-#: actions/peoplesearch.php:61
 msgid "People search"
 msgstr "ആൾക്കാരെ തിരയുക"
 
-#: actions/peopletag.php:68
 #, php-format
 msgid "Not a valid people tag: %s."
 msgstr ""
 
-#: actions/peopletag.php:142
 #, php-format
 msgid "Users self-tagged with %1$s - page %2$d"
 msgstr ""
 
 #. TRANS: Page title for AJAX form return when a disabling a plugin.
-#: actions/plugindisable.php:69
 msgctxt "plugin"
 msgid "Disabled"
 msgstr ""
 
 #. TRANS: Client error displayed trying to perform any request method other than POST.
 #. TRANS: Do not translate POST.
-#: actions/pluginenable.php:78 actions/subscribe.php:77
 msgid "This action only accepts POST requests."
 msgstr ""
 
-#: actions/pluginenable.php:102
 #, fuzzy
 msgid "You cannot administer plugins."
 msgstr "താങ്കൾക്ക് ഉപയോക്താക്കളെ നീക്കം ചെയ്യാൻ കഴിയില്ല."
 
-#: actions/pluginenable.php:109
 #, fuzzy
 msgid "No such plugin."
 msgstr "അത്തരത്തിൽ ഒരു താളില്ല."
 
 #. TRANS: Page title for AJAX form return when enabling a plugin.
-#: actions/pluginenable.php:159
 msgctxt "plugin"
 msgid "Enabled"
 msgstr ""
 
 #. TRANS: Tab and title for plugins admin panel.
 #. TRANS: Menu item for site administration
-#: actions/pluginsadminpanel.php:56 actions/version.php:191
-#: lib/adminpanelaction.php:411
 msgid "Plugins"
 msgstr "പ്ലഗിനുകൾ"
 
 #. TRANS: Instructions at top of plugin admin page.
-#: actions/pluginsadminpanel.php:68
 msgid ""
 "Additional plugins can be enabled and configured manually. See the <a href="
 "\"http://status.net/wiki/Plugins\">online plugin documentation</a> for more "
@@ -4401,21 +3603,17 @@ msgid ""
 msgstr ""
 
 #. TRANS: Admin form section header
-#: actions/pluginsadminpanel.php:84
 #, fuzzy
 msgid "Default plugins"
 msgstr "സ്വതേ വേണ്ട ഭാഷ"
 
-#: actions/pluginsadminpanel.php:106
 msgid ""
 "All default plugins have been disabled from the site's configuration file."
 msgstr ""
 
-#: actions/postnotice.php:95
 msgid "Invalid notice content."
 msgstr "അറിയിപ്പിന്റെ ഉള്ളടക്കം അസാധുവാണ്."
 
-#: actions/postnotice.php:101
 #, php-format
 msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’."
 msgstr ""
@@ -4423,41 +3621,32 @@ msgstr ""
 "ചേർന്നു പോകുന്നില്ല."
 
 #. TRANS: Page title for profile settings.
-#: actions/profilesettings.php:60
 msgid "Profile settings"
 msgstr ""
 
 #. TRANS: Usage instructions for profile settings.
-#: actions/profilesettings.php:71
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
 
 #. TRANS: Profile settings form legend.
-#: actions/profilesettings.php:99
 msgid "Profile information"
 msgstr ""
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:110 actions/register.php:412
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr ""
 
 #. TRANS: Field label in form for profile settings.
-#: actions/profilesettings.php:114 actions/register.php:434
-#: lib/groupeditform.php:150
 msgid "Full name"
 msgstr "പൂർണ്ണനാമം"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:119 actions/register.php:439
-#: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "ഹോംപേജ്"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:122 actions/register.php:441
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr ""
 "താങ്കളുടെ ഹോംപേജിന്റെ, ബ്ലോഗിന്റെ അല്ലെങ്കിൽ മറ്റൊരു സൈറ്റിലെ താങ്കളെക്കുറിച്ചുള്ള "
@@ -4466,7 +3655,6 @@ msgstr ""
 #. TRANS: Tooltip for field label in form for profile settings. Plural
 #. TRANS: is decided by the number of characters available for the
 #. TRANS: biography (%d).
-#: actions/profilesettings.php:130 actions/register.php:450
 #, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4474,68 +3662,53 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:136 actions/register.php:455
 msgid "Describe yourself and your interests"
 msgstr "താങ്കളെക്കുറിച്ചും താങ്കളുടെ ഇഷ്ടങ്ങളെക്കുറിച്ചും വിവരിക്കുക"
 
 #. TRANS: Text area label in form for profile settings where users can provide.
 #. TRANS: their biography.
-#: actions/profilesettings.php:140 actions/register.php:457
 msgid "Bio"
 msgstr ""
 
 #. TRANS: Field label in form for profile settings.
-#: actions/profilesettings.php:146 actions/register.php:462
-#: lib/groupeditform.php:173
 msgid "Location"
 msgstr "സ്ഥലം"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:149
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "താങ്കളെവിടെയാണ്, അതായത് \"നഗരം, സംസ്ഥാനം (അഥവ പ്രദേശം), രാജ്യം\" എന്ന്"
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:154
 msgid "Share my current location when posting notices"
 msgstr "അറിയിപ്പുകൾ പ്രസിദ്ധീകരിക്കുന്നതിനോടൊപ്പം എന്റെ ഇപ്പോഴത്തെ സ്ഥലവും പങ്കുവെയ്ക്കുക"
 
 #. TRANS: Field label in form for profile settings.
-#: actions/profilesettings.php:162 actions/tagother.php:128
-#: actions/tagother.php:188 lib/subscriptionlist.php:104
-#: lib/subscriptionlist.php:106
 msgid "Tags"
 msgstr "റ്റാഗുകൾ"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:165
 msgid ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- "
 "separated."
 msgstr ""
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:170
 msgid "Language"
 msgstr "ഭാഷ"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:172
 msgid "Preferred language."
 msgstr "പ്രിയങ്കര ഭാഷ."
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:182
 msgid "Timezone"
 msgstr "സമയ മേഖല"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:184
 msgid "What timezone are you normally in?"
 msgstr "താങ്കൾ സാധാരണയുണ്ടാകാറുള്ള സമയമേഖല ഏതാണ്?"
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:190
 msgid ""
 "Automatically subscribe to whoever subscribes to me (best for non-humans)."
 msgstr ""
@@ -4543,7 +3716,6 @@ msgstr ""
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Plural form is used based on the maximum number of allowed
 #. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:259 actions/register.php:214
 #, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4551,93 +3723,75 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:270 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr "സമയമേഖല തിരഞ്ഞെടുത്തിട്ടില്ല."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:278
 msgid "Language is too long (maximum 50 characters)."
 msgstr "ഭാഷയുടെ നീളം വളരെ കൂടുതലാണ് (പരമാവധി 50 അക്ഷരങ്ങൾ)."
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:292
 #, fuzzy, php-format
 msgid "Invalid tag: \"%s\"."
 msgstr "അസാധുവായ റ്റാഗ്: \"%s\""
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:348
 #, fuzzy
 msgid "Could not update user for autosubscribe."
 msgstr "ഉപയോക്തൃ വിവരങ്ങൾ പുതുക്കാൻ കഴിഞ്ഞില്ല."
 
 #. TRANS: Server error thrown when user profile location preference settings could not be updated.
-#: actions/profilesettings.php:406
 msgid "Could not save location prefs."
 msgstr "സ്ഥാനം സംബന്ധിച്ച ക്രമീകരണങ്ങൾ സേവ് ചെയ്യാൻ കഴിഞ്ഞില്ല."
 
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:428 actions/tagother.php:179
 msgid "Could not save tags."
 msgstr "റ്റാഗുകൾ സേവ് ചെയ്യാൻ കഴിഞ്ഞില്ല."
 
 #. TRANS: Confirmation shown when user profile settings are saved.
 #. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:437 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "സജ്ജീകരണങ്ങൾ സേവ് ചെയ്തിരിക്കുന്നു."
 
 #. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
 #. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:484 actions/restoreaccount.php:60
 msgid "Restore account"
 msgstr "അംഗത്വം പുനഃക്രമീകരിക്കുക"
 
-#: actions/public.php:83
 #, php-format
 msgid "Beyond the page limit (%s)."
 msgstr "താളിന്റെ പരിധിയ്ക്ക് (%s) പുറത്താണ്."
 
-#: actions/public.php:92
 msgid "Could not retrieve public stream."
 msgstr ""
 
-#: actions/public.php:130
 #, php-format
 msgid "Public timeline, page %d"
 msgstr "സാർവ്വജനിക സമയരേഖ, താൾ %d"
 
-#: actions/public.php:132 lib/publicgroupnav.php:79
 msgid "Public timeline"
 msgstr "സാർവ്വജനിക സമയരേഖ"
 
-#: actions/public.php:160
 msgid "Public Stream Feed (RSS 1.0)"
 msgstr ""
 
-#: actions/public.php:164
 msgid "Public Stream Feed (RSS 2.0)"
 msgstr ""
 
-#: actions/public.php:168
 msgid "Public Stream Feed (Atom)"
 msgstr ""
 
-#: actions/public.php:188
 #, php-format
 msgid ""
 "This is the public timeline for %%site.name%% but no one has posted anything "
 "yet."
 msgstr ""
 
-#: actions/public.php:191
 msgid "Be the first to post!"
 msgstr "പ്രസിദ്ധീകരിക്കുന്ന ആദ്യ വ്യക്തിയാകുക!"
 
-#: actions/public.php:195
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post!"
@@ -4645,7 +3799,6 @@ msgstr ""
 "എന്തുകൊണ്ട് [അംഗത്വമെടുക്കുകയും](%%action.register%%) പ്രസിദ്ധീകരിക്കുന്ന ആദ്യ വ്യക്തിയാകുകയും "
 "ചെയ്തുകൂട!"
 
-#: actions/public.php:242
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -4659,7 +3812,6 @@ msgstr ""
 "സഹപ്രവർത്തകരുമായും പങ്ക് വെയ്ക്കുവാൻ [ഇപ്പോൾ തന്നെ ചേരുക](%%action.register%%)! (കൂടുതൽ "
 "അറിയുക](%%doc.help%%))"
 
-#: actions/public.php:247
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -4668,19 +3820,16 @@ msgid ""
 msgstr ""
 
 #. TRANS: Public RSS feed description. %s is the StatusNet site name.
-#: actions/publicrss.php:106
 #, fuzzy, php-format
 msgid "%s updates from everyone."
 msgstr "%s പദ്ധതിയിൽ എല്ലാവരും അയച്ചിട്ടുള്ള പുതിയവാർത്തകൾ!"
 
 #. TRANS: Title for public tag cloud.
-#: actions/publictagcloud.php:57
 msgid "Public tag cloud"
 msgstr ""
 
 #. TRANS: Instructions (more used like an explanation/header).
 #. TRANS: %s is the StatusNet sitename.
-#: actions/publictagcloud.php:65
 #, php-format
 msgid "These are most popular recent tags on %s"
 msgstr "സമീപകാലത്ത് %s സൈറ്റിൽ ഏറ്റവും ജനപ്രിയമായ റ്റാഗുകൾ"
@@ -4688,14 +3837,12 @@ msgstr "സമീപകാലത്ത് %s സൈറ്റിൽ ഏറ്റ
 #. TRANS: This message contains a Markdown URL. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.
-#: actions/publictagcloud.php:74
 #, php-format
 msgid "No one has posted a notice with a [hashtag](%%doc.tags%%) yet."
 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.
-#: actions/publictagcloud.php:79
 msgid "Be the first to post one!"
 msgstr "പ്രസിദ്ധീകരിക്കുന്ന ആദ്യ വ്യക്തിയാകുക!"
 
@@ -4704,7 +3851,6 @@ msgstr "പ്രസിദ്ധീകരിക്കുന്ന ആദ്യ 
 #. TRANS: This message contains a Markdown URL. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.
-#: actions/publictagcloud.php:87
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post "
@@ -4714,42 +3860,34 @@ msgstr ""
 "ചെയ്തുകൂട!"
 
 #. TRANS: Client error displayed trying to recover password while already logged in.
-#: actions/recoverpassword.php:37
 msgid "You are already logged in!"
 msgstr "താങ്കൾ മുമ്പേതന്നെ ലോഗിൻ ചെയ്തിട്ടുണ്ട്!"
 
 #. TRANS: Client error displayed when password recovery code is not correct.
-#: actions/recoverpassword.php:64
 msgid "No such recovery code."
 msgstr "അത്തരത്തിലൊരു വീണ്ടെടുക്കൽ കോഡ് ഇല്ല."
 
 #. TRANS: Client error displayed when no proper password recovery code was submitted.
-#: actions/recoverpassword.php:69
 msgid "Not a recovery code."
 msgstr "അതൊരു വീണ്ടെടുക്കൽ കോഡ് അല്ല."
 
 #. TRANS: Server error displayed trying to recover password without providing a user.
-#: actions/recoverpassword.php:77
 msgid "Recovery code for unknown user."
 msgstr "അജ്ഞാത ഉപയോക്താവിന്റെ വീണ്ടെടുക്കൽ കോഡ് ആണ്."
 
 #. TRANS: Server error displayed removing a password recovery code from the database.
-#: actions/recoverpassword.php:91
 msgid "Error with confirmation code."
 msgstr "സ്ഥിരീകരണ കോഡിൽ പിഴവുണ്ട്."
 
 #. TRANS: Client error displayed trying to recover password with too old a recovery code.
-#: actions/recoverpassword.php:103
 msgid "This confirmation code is too old. Please start again."
 msgstr "ഈ സ്ഥിരീകരണ കോഡ് വളരെ പഴക്കമേറിയതാണ്. ദയവായി ആദ്യം മുതൽ വീണ്ടും ശ്രമിക്കുക."
 
 #. TRANS: Server error displayed when updating a user's e-mail address in the database fails while recovering a password.
-#: actions/recoverpassword.php:118
 msgid "Could not update user with confirmed email address."
 msgstr "സ്ഥിരീകരിച്ച ഇമെയിൽ വിലാസത്തോടെ ഉപയോക്തൃവിവരങ്ങൾ പുതുക്കാൻ കഴിഞ്ഞില്ല."
 
 #. TRANS: Page notice for password recovery page.
-#: actions/recoverpassword.php:160
 msgid ""
 "If you have forgotten or lost your password, you can get a new one sent to "
 "the email address you have stored in your account."
@@ -4757,97 +3895,79 @@ msgstr ""
 "താങ്കളുടെ രഹസ്യവാക്ക് നഷ്ടപ്പെടുകയോ മറക്കുകയോ ചെയ്താൽ, താങ്കളുടെ അംഗത്വത്തിനൊപ്പം "
 "സൂക്ഷിച്ചിട്ടുള്ള ഇമെയിൽ വിലാസത്തിലേക്ക് പുതിയ ഒരെണ്ണം അയച്ചു വാങ്ങാനാകുന്നതാണ്."
 
-#: actions/recoverpassword.php:167
 msgid "You have been identified. Enter a new password below."
 msgstr "താങ്കൾ തിരിച്ചറിയപ്പെട്ടിരിക്കുന്നു. താഴെ പുതിയ രഹസ്യവാക്ക് നൽകുക."
 
 #. TRANS: Fieldset legend for password recovery page.
-#: actions/recoverpassword.php:198
 msgid "Password recovery"
 msgstr "രഹസ്യവാക്ക് വീണ്ടെടുക്കൽ"
 
 #. TRANS: Field label on password recovery page.
-#: actions/recoverpassword.php:202
 msgid "Nickname or email address"
 msgstr "വിളിപ്പേര് അല്ലെങ്കിൽ ഇമെയിൽ വിലാസം"
 
 #. TRANS: Title for field label on password recovery page.
-#: actions/recoverpassword.php:205
 msgid "Your nickname on this server, or your registered email address."
 msgstr ""
 "ഈ സെർവറിലെ താങ്കളുടെ വിളിപ്പേര്, അഥവാ താങ്കൾ രജിസ്റ്റർ ചെയ്തിട്ടുള്ള ഇമെയിൽ വിലാസം."
 
 #. TRANS: Field label on password recovery page.
-#: actions/recoverpassword.php:212
 msgid "Recover"
 msgstr "വീണ്ടെടുക്കുക"
 
 #. TRANS: Button text on password recovery page.
-#: actions/recoverpassword.php:214
 msgctxt "BUTTON"
 msgid "Recover"
 msgstr "വീണ്ടെടുക്കുക"
 
 #. TRANS: Title for password recovery page in password reset mode.
-#: actions/recoverpassword.php:223
 msgid "Reset password"
 msgstr "രഹസ്യവാക്ക് പുനഃക്രമീകരിക്കുക"
 
 #. TRANS: Title for password recovery page in password recover mode.
-#: actions/recoverpassword.php:225
 msgid "Recover password"
 msgstr "രഹസ്യവാക്ക് വീണ്ടെടുക്കുക"
 
 #. TRANS: Title for password recovery page in email sent mode.
 #. TRANS: Subject for password recovery e-mail.
-#: actions/recoverpassword.php:227 actions/recoverpassword.php:366
 msgid "Password recovery requested"
 msgstr "രഹസ്യവാക്ക് വീണ്ടെടുക്കൽ ആവശ്യപ്പെട്ടിരിക്കുന്നു"
 
 #. TRANS: Title for password recovery page in password saved mode.
-#: actions/recoverpassword.php:229
 msgid "Password saved"
 msgstr "രഹസ്യവാക്ക് സേവ് ചെയ്തിരിക്കുന്നു"
 
 #. TRANS: Title for password recovery page when an unknown action has been specified.
-#: actions/recoverpassword.php:232
 msgid "Unknown action"
 msgstr "അജ്ഞാതമായ പ്രവൃത്തി"
 
 #. TRANS: Title for field label for password reset form.
-#: actions/recoverpassword.php:258
 msgid "6 or more characters, and do not forget it!"
 msgstr "ആറോ അതിലധികമോ അക്ഷരങ്ങൾ, അത് മറക്കരുത്!"
 
 #. TRANS: Button text for password reset form.
 #. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: actions/recoverpassword.php:268 lib/designform.php:145
 msgctxt "BUTTON"
 msgid "Reset"
 msgstr "പുനഃക്രമീകരിക്കുക"
 
 #. TRANS: Form instructions for password recovery form.
-#: actions/recoverpassword.php:278
 msgid "Enter a nickname or email address."
 msgstr "ഒരു വിളിപ്പേരോ ഇമെയിൽ വിലാസമോ നൽകുക."
 
 #. TRANS: Information on password recovery form if no known username or e-mail address was specified.
-#: actions/recoverpassword.php:309
 msgid "No user with that email address or username."
 msgstr "ആ ഇമെയിൽ വിലാസമോ ഉപയോക്തൃനാമമോ ഉപയോഗിക്കുന്ന ഒരു ഉപയോക്താവും ഇല്ല."
 
 #. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
-#: actions/recoverpassword.php:327
 msgid "No registered email address for that user."
 msgstr "ആ ഉപയോക്താവ് ഇമെയിൽ വിലാസമൊന്നും നൽകിയിട്ടില്ല."
 
 #. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
-#: actions/recoverpassword.php:342
 msgid "Error saving address confirmation."
 msgstr "വിലാസത്തിന്റെ സ്ഥിരീകരണം സേവ് ചെയ്യുമ്പോൾ പിഴവുണ്ടായി."
 
 #. TRANS: User notification after an e-mail with instructions was sent from the password recovery form.
-#: actions/recoverpassword.php:370
 msgid ""
 "Instructions for recovering your password have been sent to the email "
 "address registered to your account."
@@ -4856,72 +3976,56 @@ msgstr ""
 "ഇമെയിൽ വിലാസത്തിലേയ്ക്ക് അയച്ചിട്ടുണ്ട്."
 
 #. TRANS: Client error displayed when trying to reset as password without providing a user.
-#: actions/recoverpassword.php:391
 msgid "Unexpected password reset."
 msgstr "അപ്രതീക്ഷിത രഹസ്യവാക്ക് പുനഃക്രമീകരണം."
 
 #. TRANS: Reset password form validation error message.
-#: actions/recoverpassword.php:400
 msgid "Password must be 6 characters or more."
 msgstr "രഹസ്യവാക്കിന് ആറോ അതിലധികമോ അക്ഷരങ്ങളുണ്ടായിരിക്കണം."
 
 #. TRANS: Reset password form validation error message.
-#: actions/recoverpassword.php:405
 msgid "Password and confirmation do not match."
 msgstr "രഹസ്യവാക്കും സ്ഥിരീകരണവും യോജിക്കുന്നില്ല."
 
 #. TRANS: Server error displayed when something does wrong with the user object during password reset.
-#: actions/recoverpassword.php:426 actions/register.php:241
 msgid "Error setting user."
 msgstr "ഉപയോക്താവിനെ സജ്ജീകരിക്കുന്നതിൽ പിഴവുണ്ടായി."
 
 #. TRANS: Success message for user after password reset.
-#: actions/recoverpassword.php:434
 msgid "New password successfully saved. You are now logged in."
 msgstr "പുതിയ രഹസ്യവാക്ക് വിജയകരമായി സേവ് ചെയ്തു. താങ്കൾക്ക് ലോഗിൻ ചെയ്യാവുന്നതാണ്."
 
-#: actions/redirecturl.php:70
 msgid "No id parameter"
 msgstr ""
 
-#: actions/redirecturl.php:76
 #, fuzzy, php-format
 msgid "No such file \"%d\""
 msgstr "അത്തരത്തിൽ ഒരു അറിയിപ്പ് ഇല്ല."
 
-#: actions/register.php:80 actions/register.php:181 actions/register.php:392
 msgid "Sorry, only invited people can register."
 msgstr "ക്ഷമിക്കുക, ക്ഷണിക്കപ്പെട്ടവർക്കു മാത്രമേ അംഗത്വമെടുക്കാനാകൂ."
 
-#: actions/register.php:87
 msgid "Sorry, invalid invitation code."
 msgstr "ക്ഷമിക്കുക, ക്ഷണത്തിന്റെ കോഡ് അസാധുവാണ്."
 
-#: actions/register.php:106
 msgid "Registration successful"
 msgstr "അംഗത്വമെടുക്കൽ വിജയകരം"
 
-#: actions/register.php:108 actions/register.php:490
 msgid "Register"
 msgstr "അംഗത്വമെടുക്കുക"
 
-#: actions/register.php:128
 msgid "Registration not allowed."
 msgstr "അംഗത്വമെടുക്കൽ അനുവദിച്ചിട്ടില്ല."
 
-#: actions/register.php:194
 msgid "You cannot register if you don't agree to the license."
 msgstr "താങ്കൾ അനുവാദ പത്രം അംഗീകരിക്കുകയില്ലെങ്കിൽ ഭാഗമാകാനാകില്ല."
 
-#: actions/register.php:203
 msgid "Email address already exists."
 msgstr "ഇമെയിൽ വിലാസം മുമ്പേ നിലവിലുണ്ട്."
 
-#: actions/register.php:236 actions/register.php:258
 msgid "Invalid username or password."
 msgstr "ഉപയോക്തൃനാമമോ രഹസ്യവാക്കോ അസാധുവാണ്."
 
-#: actions/register.php:333
 msgid ""
 "With this form you can create a new account. You can then post notices and "
 "link up to friends and colleagues."
@@ -4929,55 +4033,44 @@ msgstr ""
 "ഈ ഫോം ഉപയോഗിച്ച് താങ്കൾക്ക് പുതിയൊരു അംഗത്വം സൃഷ്ടിക്കാനാകും. പിന്നീട് താങ്കൾക്ക് അറിയിപ്പുകൾ "
 "പ്രസിദ്ധീകരിക്കാനും സുഹൃത്തുക്കളേയും സഹപ്രവർത്തകരേയും കണ്ണിചേർക്കാനുമാകും."
 
-#: actions/register.php:424 actions/register.php:428
-#: actions/siteadminpanel.php:238 lib/settingsnav.php:92
 msgid "Email"
 msgstr "ഇമെയിൽ"
 
-#: actions/register.php:425 actions/register.php:429
 msgid "Used only for updates, announcements, and password recovery."
 msgstr ""
 "പുതുക്കൽ വിവരങ്ങൾക്കും, അറിയിപ്പുകൾക്കും, രഹസ്യവാക്ക് വീണ്ടെടുക്കൽ പ്രവർത്തനത്തിനും മാത്രം "
 "ഉപയോഗിച്ചത്."
 
-#: actions/register.php:436
 msgid "Longer name, preferably your \"real\" name."
 msgstr "വലിയ പേര്, താങ്കളുടെ \"യഥാർത്ഥ\" പേര് നൽകാൻ താത്പര്യപ്പെടുന്നു."
 
-#: actions/register.php:464
 msgid "Where you are, like \"City, State (or Region), Country\"."
 msgstr "താങ്കളെവിടെയാണ്, അതായത് \"നഗരം, സംസ്ഥാനം (അഥവ പ്രദേശം), രാജ്യം\" എന്നിവ."
 
-#: actions/register.php:503
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
 msgstr ""
 
-#: actions/register.php:513
 #, php-format
 msgid "My text and files are copyright by %1$s."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:517
 msgid "My text and files remain under my own copyright."
 msgstr "എന്റെ എഴുത്തുകളും പ്രമാണങ്ങളും എന്റെ സ്വന്തം പകർപ്പവകാശത്തിലായിരിക്കും."
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:520
 msgid "All rights reserved."
 msgstr "എല്ലാ അവകാശങ്ങളും സംരക്ഷിതം."
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:525
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
 "email address, IM address, and phone number."
 msgstr ""
 
-#: actions/register.php:566
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -4996,7 +4089,6 @@ msgid ""
 "Thanks for signing up and we hope you enjoy using this service."
 msgstr ""
 
-#: actions/register.php:590
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5004,7 +4096,6 @@ msgstr ""
 "(അല്പസമയത്തിനകം, താങ്കളുടെ ഇമെയിൽ വിലാസം എങ്ങനെ സ്ഥിരീകരിക്കാം എന്ന നിർദ്ദേശങ്ങളടങ്ങിയ "
 "സന്ദേശം താങ്കളുടെ ഇമെയിലിൽ ലഭിക്കും.)"
 
-#: actions/remotesubscribe.php:97
 #, php-format
 msgid ""
 "To subscribe, you can [login](%%action.login%%), or [register](%%action."
@@ -5012,120 +4103,93 @@ msgid ""
 "microblogging site](%%doc.openmublog%%),  enter your profile URL below."
 msgstr ""
 
-#: actions/remotesubscribe.php:111
 msgid "Remote subscribe"
 msgstr ""
 
-#: actions/remotesubscribe.php:123
 msgid "Subscribe to a remote user"
 msgstr ""
 
-#: actions/remotesubscribe.php:128
 msgid "User nickname"
 msgstr "ഉപയോക്തൃ വിളിപ്പേര്"
 
-#: actions/remotesubscribe.php:129
 msgid "Nickname of the user you want to follow."
 msgstr "താങ്കൾക്ക് പിന്തുടരേണ്ട ഉപയോക്താവിന്റെ വിളിപ്പേര്."
 
-#: actions/remotesubscribe.php:132
 msgid "Profile URL"
 msgstr ""
 
-#: actions/remotesubscribe.php:133
 msgid "URL of your profile on another compatible microblogging service."
 msgstr ""
 
 #. TRANS: Link text for link that will subscribe to a remote profile.
-#: actions/remotesubscribe.php:136 lib/subscribeform.php:139
-#: lib/userprofile.php:402
 msgid "Subscribe"
 msgstr "വരിക്കാരാകുക"
 
-#: actions/remotesubscribe.php:158
 #, fuzzy
 msgid "Invalid profile URL (bad format)."
 msgstr "പ്രമാണത്തിന്റെ പേര് അസാധുവാണ്."
 
-#: actions/remotesubscribe.php:167
 msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
 msgstr ""
 
-#: actions/remotesubscribe.php:175
 #, fuzzy
 msgid "That is a local profile! Login to subscribe."
 msgstr "വരിക്കാരനാകുന്നതിൽ നിന്നും ആ ഉപയോക്താവ് താങ്കളെ തടഞ്ഞിരിക്കുന്നു."
 
-#: actions/remotesubscribe.php:182
 msgid "Could not get a request token."
 msgstr "അഭ്യർത്ഥനാ ചീട്ട് ലഭ്യമാക്കാനായില്ല."
 
-#: actions/repeat.php:56
 msgid "Only logged-in users can repeat notices."
 msgstr "ലോഗിൻ ചെയ്തിട്ടുള്ള ഉപയോക്താക്കൾക്കു മാത്രമേ അറിയിപ്പ് ആവർത്തിക്കാനാവൂ."
 
-#: actions/repeat.php:63 actions/repeat.php:70
 msgid "No notice specified."
 msgstr "അറിയിപ്പുകളൊന്നും വ്യക്തമാക്കിയിട്ടില്ല."
 
-#: actions/repeat.php:75
 msgid "You cannot repeat your own notice."
 msgstr "താങ്കൾക്ക് താങ്കളുടെ തന്നെ അറിയിപ്പ് ആവർത്തിക്കാനാവില്ല."
 
-#: actions/repeat.php:89
 msgid "You already repeated that notice."
 msgstr "താങ്കൾ ആ അറിയിപ്പ് മുമ്പേ തന്നെ ആവർത്തിച്ചിരിക്കുന്നു."
 
-#: actions/repeat.php:112 lib/noticelist.php:697
 msgid "Repeated"
 msgstr "ആവർത്തിച്ചു"
 
-#: actions/repeat.php:117
 msgid "Repeated!"
 msgstr "ആവർത്തിച്ചു!"
 
 #. TRANS: RSS reply feed title. %s is a user nickname.
-#: actions/replies.php:126 actions/repliesrss.php:68
-#: lib/personalgroupnav.php:105
 #, php-format
 msgid "Replies to %s"
 msgstr "%s എന്ന ഉപയോക്താവിനുള്ള മറുപടികൾ"
 
-#: actions/replies.php:128
 #, php-format
 msgid "Replies to %1$s, page %2$d"
 msgstr "%1$s എന്ന ഉപയോക്താവിനുള്ള മറുപടികൾ, താൾ %2$d"
 
-#: actions/replies.php:145
 #, php-format
 msgid "Replies feed for %s (RSS 1.0)"
 msgstr ""
 
-#: actions/replies.php:152
 #, php-format
 msgid "Replies feed for %s (RSS 2.0)"
 msgstr ""
 
-#: actions/replies.php:159
 #, php-format
 msgid "Replies feed for %s (Atom)"
 msgstr ""
 
-#: actions/replies.php:199
 #, php-format
 msgid ""
 "This is the timeline showing replies to %1$s but %2$s hasn't received a "
 "notice to them yet."
 msgstr ""
 
-#: actions/replies.php:204
 #, php-format
 msgid ""
 "You can engage other users in a conversation, subscribe to more people or "
 "[join groups](%%action.groups%%)."
 msgstr ""
 
-#: actions/replies.php:206
 #, php-format
 msgid ""
 "You can try to [nudge %1$s](../%2$s) or [post something to them](%%%%action."
@@ -5134,177 +4198,143 @@ msgstr ""
 
 #. TRANS: RSS reply feed description.
 #. TRANS: %1$s is a user nickname, %2$s is the StatusNet site name.
-#: actions/repliesrss.php:74
 #, fuzzy, php-format
 msgid "Replies to %1$s on %2$s."
 msgstr "%2$s സംരംഭത്തിൽ %1$s എന്ന ഉപയോക്താവിന് അയച്ച മറുപടികൾ!"
 
 #. TRANS: Client exception displayed when trying to restore an account while not logged in.
-#: actions/restoreaccount.php:78
 msgid "Only logged-in users can restore their account."
 msgstr "ലോഗിൻ ചെയ്തിട്ടുള്ള ഉപയോക്താക്കൾക്കു മാത്രമേ അവരുടെ അംഗത്വം പുനഃസ്ഥാപിക്കാനാകൂ."
 
 #. TRANS: Client exception displayed when trying to restore an account without having restore rights.
-#: actions/restoreaccount.php:83
 msgid "You may not restore your account."
 msgstr "താങ്കൾക്ക് താങ്കളുടെ അംഗത്വം പുനഃസ്ഥാപിക്കാനായേക്കില്ല."
 
 #. TRANS: Client exception displayed trying to restore an account while something went wrong uploading a file.
 #. TRANS: Client exception. No file; probably just a non-AJAX submission.
-#: actions/restoreaccount.php:121 actions/restoreaccount.php:146
 msgid "No uploaded file."
 msgstr "പ്രമാണമൊന്നും അപ്‌ലോഡ് ചെയ്തിട്ടില്ല."
 
 #. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
-#: actions/restoreaccount.php:129 lib/mediafile.php:194
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
 msgstr ""
 
 #. TRANS: Client exception.
-#: actions/restoreaccount.php:135 lib/mediafile.php:200
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form."
 msgstr ""
 
 #. TRANS: Client exception.
-#: actions/restoreaccount.php:141 lib/mediafile.php:206
 msgid "The uploaded file was only partially uploaded."
 msgstr "അപ്‌ലോഡ് ചെയ്യപ്പെട്ട പ്രമാണം ഭാഗികമായി മാത്രമേ അപ്‌ലോഡ് ചെയ്യപ്പെട്ടിട്ടുള്ളു."
 
 #. TRANS: Client exception thrown when a temporary folder is not present to store a file upload.
-#: actions/restoreaccount.php:150 lib/mediafile.php:214
 msgid "Missing a temporary folder."
 msgstr "താത്കാലിക ഫോൾഡർ കാണുന്നില്ല."
 
 #. TRANS: Client exception thrown when writing to disk is not possible during a file upload operation.
-#: actions/restoreaccount.php:154 lib/mediafile.php:218
 msgid "Failed to write file to disk."
 msgstr ""
 
 #. TRANS: Client exception thrown when a file upload operation has been stopped by an extension.
-#: actions/restoreaccount.php:158 lib/mediafile.php:222
 msgid "File upload stopped by extension."
 msgstr "ഒരു അനുബന്ധം പ്രമാണം അപ്‌ലോഡ് ചെയ്യുന്നത് തടഞ്ഞു."
 
 #. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
 #. TRANS: Exception thrown when uploading an image fails for an unknown reason.
 #. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
-#: actions/restoreaccount.php:164 lib/imagefile.php:106 lib/mediafile.php:228
 msgid "System error uploading file."
 msgstr "പ്രമാണം അപ്‌ലോഡ് ചെയ്തുകൊണ്ടിരിക്കെ സിസ്റ്റം പിഴവുണ്ടായി."
 
 #. TRANS: Client exception thrown when a feed is not an Atom feed.
-#: actions/restoreaccount.php:207
 msgid "Not an Atom feed."
 msgstr "ഒരു ആറ്റം ഫീഡ് അല്ല."
 
 #. TRANS: Success message when a feed has been restored.
-#: actions/restoreaccount.php:241
 msgid ""
 "Feed has been restored. Your old posts should now appear in search and your "
 "profile page."
 msgstr ""
 
 #. TRANS: Message when a feed restore is in progress.
-#: actions/restoreaccount.php:245
 msgid "Feed will be restored. Please wait a few minutes for results."
 msgstr ""
 
 #. TRANS: Form instructions for feed restore.
-#: actions/restoreaccount.php:342
 msgid ""
 "You can upload a backed-up stream in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format."
 msgstr ""
 
 #. TRANS: Title for submit button to confirm upload of a user backup file for account restore.
-#: actions/restoreaccount.php:373
 msgid "Upload the file"
 msgstr "പ്രമാണം അപ്‌ലോഡ് ചെയ്യുക"
 
-#: actions/revokerole.php:75
 msgid "You cannot revoke user roles on this site."
 msgstr ""
 
-#: actions/revokerole.php:82
 msgid "User doesn't have this role."
 msgstr ""
 
-#: actions/rsd.php:142 actions/version.php:159
 msgid "StatusNet"
 msgstr "സ്റ്റാറ്റസ്‌നെറ്റ്"
 
-#: actions/sandbox.php:65 actions/unsandbox.php:65
 msgid "You cannot sandbox users on this site."
 msgstr ""
 
-#: actions/sandbox.php:72
 msgid "User is already sandboxed."
 msgstr ""
 
 #. TRANS: Menu item for site administration
-#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
-#: lib/adminpanelaction.php:379
 msgid "Sessions"
 msgstr ""
 
-#: actions/sessionsadminpanel.php:65
 msgid "Session settings for this StatusNet site"
 msgstr "ഈ സ്റ്റാറ്റസ്‌നെറ്റ് സൈറ്റിന്റെ സെഷൻ സജ്ജീകരണങ്ങൾ"
 
-#: actions/sessionsadminpanel.php:175
 msgid "Handle sessions"
 msgstr ""
 
-#: actions/sessionsadminpanel.php:177
 msgid "Whether to handle sessions ourselves."
 msgstr ""
 
-#: actions/sessionsadminpanel.php:181
 msgid "Session debugging"
 msgstr ""
 
-#: actions/sessionsadminpanel.php:183
 msgid "Turn on debugging output for sessions."
 msgstr ""
 
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
+#. TRANS: Submit button title.
+msgid "Save"
+msgstr "സേവ് ചെയ്യുക"
+
 msgid "Save site settings"
 msgstr "സൈറ്റ് സജ്ജീകരണങ്ങൾ ചേവ് ചെയ്യുക"
 
-#: actions/showapplication.php:78
 msgid "You must be logged in to view an application."
 msgstr ""
 
-#: actions/showapplication.php:151
 msgid "Application profile"
 msgstr ""
 
-#: actions/showapplication.php:179
 #, php-format
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr ""
 
-#: actions/showapplication.php:189
 msgid "Application actions"
 msgstr ""
 
-#: actions/showapplication.php:212
 msgid "Reset key & secret"
 msgstr "പുനഃക്രമീകരണ ചാവിയും രഹസ്യവും"
 
 #. TRANS: Title of form for deleting a user.
-#: actions/showapplication.php:228 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:64 lib/noticelist.php:678
 msgid "Delete"
 msgstr "മായ്ക്കുക"
 
-#: actions/showapplication.php:237
 msgid "Application info"
 msgstr ""
 
-#: actions/showapplication.php:255
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
@@ -5312,42 +4342,35 @@ msgstr ""
 "ശ്രദ്ധിക്കുക: HMAC-SHA1 ഒപ്പുകളാണ് ഞങ്ങൾ പിന്തുണയ്ക്കുന്നത്. പ്ലെയിൻ-ടെക്സ്റ്റ് ഒപ്പ് രീതി ഞങ്ങൾ "
 "പിന്തുണയ്ക്കുന്നില്ല."
 
-#: actions/showapplication.php:275
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr "ഉപയോക്തൃ ചാവിയും രഹസ്യവും പുനഃക്രമീകരണം എന്ന് താങ്കൾക്ക് തീർച്ചയാണോ?"
 
 #. TRANS: Title for all but the first page of favourite notices of a user.
 #. TRANS: %1$s is the user for whom the favourite notices are displayed, %2$d is the page number.
-#: actions/showfavorites.php:80
 #, php-format
 msgid "%1$s's favorite notices, page %2$d"
 msgstr "%1$s എന്ന ഉപയോക്താവിന് പ്രിയങ്കരങ്ങളായ അറിയിപ്പുകൾ, താൾ %2$d"
 
 #. TRANS: Server error displayed when favourite notices could not be retrieved from the database.
-#: actions/showfavorites.php:134
 msgid "Could not retrieve favorite notices."
 msgstr "പ്രിയങ്കരങ്ങളായ അറിയിപ്പുകൾ ശേഖരിക്കാൻ കഴിഞ്ഞില്ല."
 
 #. TRANS: Feed link text. %s is a username.
-#: actions/showfavorites.php:172
 #, php-format
 msgid "Feed for favorites of %s (RSS 1.0)"
 msgstr ""
 
 #. TRANS: Feed link text. %s is a username.
-#: actions/showfavorites.php:180
 #, php-format
 msgid "Feed for favorites of %s (RSS 2.0)"
 msgstr ""
 
 #. TRANS: Feed link text. %s is a username.
-#: actions/showfavorites.php:188
 #, php-format
 msgid "Feed for favorites of %s (Atom)"
 msgstr ""
 
 #. TRANS: Text displayed instead of favourite notices for the current logged in user that has no favourites.
-#: actions/showfavorites.php:209
 msgid ""
 "You haven't chosen any favorite notices yet. Click the fave button on "
 "notices you like to bookmark them for later or shed a spotlight on them."
@@ -5358,7 +4381,6 @@ msgstr ""
 
 #. TRANS: Text displayed instead of favourite notices for a user that has no favourites while logged in.
 #. TRANS: %s is a username.
-#: actions/showfavorites.php:213
 #, php-format
 msgid ""
 "%s hasn't added any favorite notices yet. Post something interesting they "
@@ -5368,7 +4390,6 @@ msgstr ""
 #. TRANS: Text displayed instead of favourite notices for a user that has no favourites while not logged in.
 #. TRANS: %s is a username, %%%%action.register%%%% is a link to the user registration page.
 #. TRANS: (link text)[link] is a Mark Down link.
-#: actions/showfavorites.php:220
 #, php-format
 msgid ""
 "%s hasn't added any favorite notices yet. Why not [register an account](%%%%"
@@ -5377,64 +4398,53 @@ msgid ""
 msgstr ""
 
 #. TRANS: Page notice for show favourites page.
-#: actions/showfavorites.php:251
 msgid "This is a way to share what you like."
 msgstr "താങ്കളാഗ്രഹിക്കുന്നത് പങ്ക് വെയ്ക്കാനുള്ള ഒരു മാർഗ്ഗമാണിത്."
 
 #. TRANS: Page title for first group page. %s is a group name.
-#: actions/showgroup.php:75
 #, php-format
 msgid "%s group"
 msgstr "%s സംഘം"
 
 #. TRANS: Page title for any but first group page.
 #. TRANS: %1$s is a group name, $2$s is a page number.
-#: actions/showgroup.php:79
 #, php-format
 msgid "%1$s group, page %2$d"
 msgstr "%1$s സംഘം, താൾ %2$d"
 
 #. TRANS: Label for group description or group note (dt). Text hidden by default.
-#: actions/showgroup.php:266
 msgid "Note"
 msgstr "കുറിപ്പ്"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:277 lib/groupeditform.php:180
 msgid "Aliases"
 msgstr ""
 
 #. TRANS: Group actions header (h2). Text hidden by default.
-#: actions/showgroup.php:294
 msgid "Group actions"
 msgstr "സംഘത്തിന്റെ പ്രവൃത്തികൾ"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:338
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
 msgstr ""
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:345
 #, php-format
 msgid "Notice feed for %s group (RSS 2.0)"
 msgstr ""
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:352
 #, php-format
 msgid "Notice feed for %s group (Atom)"
 msgstr ""
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:358
 #, php-format
 msgid "FOAF for %s group"
 msgstr ""
 
 #. TRANS: Header for mini list of group members on a group page (h2).
-#: actions/showgroup.php:395
 msgid "Members"
 msgstr "അംഗങ്ങൾ"
 
@@ -5442,30 +4452,23 @@ msgstr "അംഗങ്ങൾ"
 #. TRANS: Text for user subscription statistics if the user has no subscriptions.
 #. TRANS: Text for user subscriber statistics if user has no subscribers.
 #. TRANS: Text for user user group membership statistics if user is not a member of any group.
-#: actions/showgroup.php:401 lib/profileaction.php:137
-#: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
-#: lib/subscriptionlist.php:123 lib/tagcloudsection.php:71
 msgid "(None)"
 msgstr "(ഒന്നുമില്ല)"
 
 #. TRANS: Link to all group members from mini list of group members if group has more than n members.
-#: actions/showgroup.php:410
 msgid "All members"
 msgstr "എല്ലാ അംഗങ്ങളും"
 
 #. TRANS: Header for group statistics on a group page (h2).
 #. TRANS: H2 text for user statistics.
-#: actions/showgroup.php:441 lib/profileaction.php:205
 msgid "Statistics"
 msgstr "സ്ഥിതിവിവരക്കണക്കുകൾ"
 
-#: actions/showgroup.php:444
 msgctxt "LABEL"
 msgid "Created"
 msgstr "സൃഷ്ടിച്ചിരിക്കുന്നു"
 
 #. TRANS: Label for member count in statistics on group page.
-#: actions/showgroup.php:449
 msgctxt "LABEL"
 msgid "Members"
 msgstr "അംഗങ്ങൾ"
@@ -5474,7 +4477,6 @@ msgstr "അംഗങ്ങൾ"
 #. TRANS: **%s** is the group alias, %%%%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).
-#: actions/showgroup.php:464
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5487,7 +4489,6 @@ 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: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
-#: actions/showgroup.php:474
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5497,99 +4498,83 @@ msgid ""
 msgstr ""
 
 #. TRANS: Header for list of group administrators on a group page (h2).
-#: actions/showgroup.php:503
 msgid "Admins"
 msgstr "കാര്യനിർവാഹകർ"
 
 #. TRANS: Client error displayed requesting a single message that does not exist.
-#: actions/showmessage.php:76
 msgid "No such message."
 msgstr "അത്തരത്തിൽ ഒരു സന്ദേശമില്ല."
 
 #. TRANS: Client error displayed requesting a single direct message the requesting user was not a party in.
-#: actions/showmessage.php:86
 msgid "Only the sender and recipient may read this message."
 msgstr "അയച്ചയാൾക്കും സ്വീകർത്താവിനും മാത്രമേ ഈ സന്ദേശം വായിക്കാനാകൂ."
 
 #. TRANS: Page title for single direct message display when viewing user is the sender.
 #. TRANS: %1$s is the addressed user's nickname, $2$s is a timestamp.
-#: actions/showmessage.php:105
 #, php-format
 msgid "Message to %1$s on %2$s"
 msgstr "%2$s സംരംഭത്തിൽ %1$s എന്ന ഉപയോക്താവിന് അയച്ച സന്ദേശങ്ങൾ"
 
 #. TRANS: Page title for single message display.
 #. TRANS: %1$s is the sending user's nickname, $2$s is a timestamp.
-#: actions/showmessage.php:113
 #, php-format
 msgid "Message from %1$s on %2$s"
 msgstr "%2$s സംരംഭത്തിൽ %1$s അയച്ച സന്ദേശങ്ങൾ"
 
-#: actions/shownotice.php:90
 msgid "Notice deleted."
 msgstr "അറിയിപ്പ് മായ്ച്ചിരിക്കുന്നു."
 
 #. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
-#: actions/showstream.php:70
 #, php-format
 msgid "%1$s tagged %2$s"
 msgstr ""
 
 #. TRANS: Page title showing tagged notices in one user's stream.
 #. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
-#: actions/showstream.php:74
 #, php-format
 msgid "%1$s tagged %2$s, page %3$d"
 msgstr ""
 
 #. TRANS: Extended page title showing tagged notices in one user's stream.
 #. TRANS: %1$s is the username, %2$d is the page number.
-#: actions/showstream.php:82
 #, php-format
 msgid "%1$s, page %2$d"
 msgstr "%1$s, താൾ %2$d"
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %1$s is a user nickname, %2$s is a hashtag.
-#: actions/showstream.php:127
 #, php-format
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
 msgstr ""
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.
-#: actions/showstream.php:136
 #, php-format
 msgid "Notice feed for %s (RSS 1.0)"
 msgstr ""
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.
-#: actions/showstream.php:145
 #, php-format
 msgid "Notice feed for %s (RSS 2.0)"
 msgstr ""
 
-#: actions/showstream.php:152
 #, php-format
 msgid "Notice feed for %s (Atom)"
 msgstr ""
 
 #. TRANS: Title for link to notice feed. FOAF stands for Friend of a Friend.
 #. TRANS: More information at http://www.foaf-project.org. %s is a user nickname.
-#: actions/showstream.php:159
 #, php-format
 msgid "FOAF for %s"
 msgstr ""
 
 #. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
-#: actions/showstream.php:205
 #, php-format
 msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr ""
 
 #. TRANS: Second sentence of empty list message for a stream for the user themselves.
-#: actions/showstream.php:211
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
@@ -5599,7 +4584,6 @@ msgstr ""
 
 #. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:215
 #, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
@@ -5608,7 +4592,6 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:258
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5624,7 +4607,6 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:265
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5636,161 +4618,125 @@ msgstr ""
 "% എന്ന സൈറ്റിൽ **%s** എന്നയാൾക്ക് അംഗത്വമുണ്ട്. "
 
 #. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
-#: actions/showstream.php:322
 #, php-format
 msgid "Repeat of %s"
 msgstr "%s എന്ന ഉപയോക്താവിന്റെ ആവർത്തനം"
 
-#: actions/silence.php:65 actions/unsilence.php:65
 msgid "You cannot silence users on this site."
 msgstr "ഈ സൈറ്റിലെ ഉപയോക്താക്കളെ താങ്കൾക്ക് നിശബ്ദരാക്കാനാകില്ല."
 
-#: actions/silence.php:72
 msgid "User is already silenced."
 msgstr "ഉപയോക്താവ് മുമ്പ് തന്നെ നിശബ്ദനാക്കപ്പെട്ടിരിക്കുന്നു."
 
-#: actions/siteadminpanel.php:69
 msgid "Basic settings for this StatusNet site"
 msgstr "ഈ സ്റ്റാറ്റസ്‌നെറ്റ് സൈറ്റിന്റെ അടിസ്ഥാന സജ്ജീകരണങ്ങൾ"
 
-#: actions/siteadminpanel.php:133
 msgid "Site name must have non-zero length."
 msgstr "സൈറ്റിന്റെ പേര് ശൂന്യമായിരിക്കരുത്."
 
-#: actions/siteadminpanel.php:141
 msgid "You must have a valid contact email address."
 msgstr "താങ്കളെ ബന്ധപ്പെടാനായി സാധുവായ ഇമെയിൽ വിലാസമുണ്ടായിരിക്കണം."
 
-#: actions/siteadminpanel.php:159
 #, php-format
 msgid "Unknown language \"%s\"."
 msgstr "അപരിചിതമായ ഭാഷ \"%s\"."
 
-#: actions/siteadminpanel.php:165
 msgid "Minimum text limit is 0 (unlimited)."
 msgstr "എഴുത്തുകളുടെ ഏറ്റവും ചെറിയ പരിധി 0 ആണ് (പരിധിയില്ല)."
 
-#: actions/siteadminpanel.php:171
 msgid "Dupe limit must be one or more seconds."
 msgstr ""
 
-#: actions/siteadminpanel.php:221
 msgid "General"
 msgstr "സാർവത്രികം"
 
-#: actions/siteadminpanel.php:224
 msgid "Site name"
 msgstr "സൈറ്റിന്റെ പേര്‌"
 
-#: actions/siteadminpanel.php:225
 msgid "The name of your site, like \"Yourcompany Microblog\""
 msgstr ""
 
-#: actions/siteadminpanel.php:229
 msgid "Brought by"
 msgstr ""
 
-#: actions/siteadminpanel.php:230
 msgid "Text used for credits link in footer of each page"
 msgstr ""
 
-#: actions/siteadminpanel.php:234
 msgid "Brought by URL"
 msgstr ""
 
-#: actions/siteadminpanel.php:235
 msgid "URL used for credits link in footer of each page"
 msgstr ""
 
-#: actions/siteadminpanel.php:239
 msgid "Contact email address for your site"
 msgstr ""
 
-#: actions/siteadminpanel.php:245
 msgid "Local"
 msgstr ""
 
-#: actions/siteadminpanel.php:256
 msgid "Default timezone"
 msgstr "സ്വതേ വേണ്ട സമയമേഖല"
 
-#: actions/siteadminpanel.php:257
 msgid "Default timezone for the site; usually UTC."
 msgstr "സൈറ്റിന്റെ സ്വതേയുള്ള സമയമേഖല; സാധാരണ ഗതിയിൽ യു.റ്റി.സി.."
 
-#: actions/siteadminpanel.php:262
 msgid "Default language"
 msgstr "സ്വതേ വേണ്ട ഭാഷ"
 
-#: actions/siteadminpanel.php:263
 msgid "Site language when autodetection from browser settings is not available"
 msgstr ""
 
-#: actions/siteadminpanel.php:271
 msgid "Limits"
 msgstr "പരിധികൾ"
 
-#: actions/siteadminpanel.php:274
 msgid "Text limit"
 msgstr "എഴുത്തിന്റെ പരിധി"
 
-#: actions/siteadminpanel.php:274
 msgid "Maximum number of characters for notices."
 msgstr "അറിയിപ്പുകളിലെ അക്ഷരങ്ങളുടെ പരമാവധി പരിധി."
 
-#: actions/siteadminpanel.php:278
 msgid "Dupe limit"
 msgstr ""
 
-#: actions/siteadminpanel.php:278
 msgid "How long users must wait (in seconds) to post the same thing again."
 msgstr ""
 "ഒരേ കാര്യം വീണ്ടും പ്രസിദ്ധീകരിക്കാൻ ഉപയോക്താക്കൾ എത്ര നേരമാണ് (സെക്കന്റുകളിൽ) "
 "കാത്തിരിക്കേണ്ടത്."
 
 #. TRANS: Page title for site-wide notice tab in admin panel.
-#: actions/sitenoticeadminpanel.php:55
 msgid "Site Notice"
 msgstr "സൈറ്റ് അറിയിപ്പ്"
 
 #. TRANS: Instructions for site-wide notice tab in admin panel.
-#: actions/sitenoticeadminpanel.php:66
 msgid "Edit site-wide message"
 msgstr ""
 
 #. TRANS: Server error displayed when saving a site-wide notice was impossible.
-#: actions/sitenoticeadminpanel.php:101
 msgid "Unable to save site notice."
 msgstr "സൈറ്റ് അറിയിപ്പ് സേവ് ചെയ്യാനായില്ല."
 
 #. TRANS: Client error displayed when a site-wide notice was longer than allowed.
-#: actions/sitenoticeadminpanel.php:112
 msgid "Maximum length for the site-wide notice is 255 characters."
 msgstr ""
 
 #. TRANS: Label for site-wide notice text field in admin panel.
-#: actions/sitenoticeadminpanel.php:176
 msgid "Site notice text"
 msgstr "സൈറ്റ് അറിയിപ്പ് എഴുത്ത്"
 
 #. TRANS: Tooltip for site-wide notice text field in admin panel.
-#: actions/sitenoticeadminpanel.php:179
 msgid "Site-wide notice text (255 characters maximum; HTML allowed)"
 msgstr ""
 
 #. TRANS: Title for button to save site notice in admin panel.
-#: actions/sitenoticeadminpanel.php:201
 msgid "Save site notice."
 msgstr "സൈറ്റ് അറിയിപ്പ് സേവ് ചെയ്യുക."
 
 #. TRANS: Title for SMS settings.
-#: actions/smssettings.php:56
 msgid "SMS settings"
 msgstr "എസ്.എം.എസ്. സജ്ജീകരണങ്ങൾ"
 
 #. TRANS: SMS settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/smssettings.php:70
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr ""
@@ -5798,90 +4744,73 @@ msgstr ""
 "സ്വീകരിക്കാവുന്നതാണ്."
 
 #. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
-#: actions/smssettings.php:92
 msgid "SMS is not available."
 msgstr "എസ്.എം.എസ്. ലഭ്യമല്ല."
 
 #. TRANS: Form legend for SMS settings form.
-#: actions/smssettings.php:106
 msgid "SMS address"
 msgstr "എസ്.എം.എസ്. വിലാസം"
 
 #. TRANS: Form guide in SMS settings form.
-#: actions/smssettings.php:115
 msgid "Current confirmed SMS-enabled phone number."
 msgstr "ഇപ്പോഴത്തെ സ്ഥിരീകരിച്ച എസ്.എം.എസ്. സജ്ജമായ ഫോൺ നമ്പർ."
 
 #. TRANS: Form guide in IM settings form.
-#: actions/smssettings.php:128
 msgid "Awaiting confirmation on this phone number."
 msgstr "ഈ ഫോൺ നമ്പരിൽ നിന്നുള്ള സ്ഥിരീകരണത്തിനായി കാക്കുന്നു."
 
 #. TRANS: Field label for SMS address input in SMS settings form.
-#: actions/smssettings.php:137
 msgid "Confirmation code"
 msgstr "സ്ഥിരീകരണ കോഡ്"
 
 #. TRANS: Form field instructions in SMS settings form.
-#: actions/smssettings.php:139
 msgid "Enter the code you received on your phone."
 msgstr "താങ്കളുടെ ഫോണിൽ ലഭിച്ച കോഡ് നൽകുക."
 
 #. TRANS: Button label to confirm SMS confirmation code in SMS settings.
-#: actions/smssettings.php:143
 msgctxt "BUTTON"
 msgid "Confirm"
 msgstr "സ്ഥിരീകരിക്കുക"
 
 #. TRANS: Field label for SMS phone number input in SMS settings form.
-#: actions/smssettings.php:148
 msgid "SMS phone number"
 msgstr "എസ്.എം.എസ്. ഫോൺ നമ്പർ."
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
-#: actions/smssettings.php:151
 msgid "Phone number, no punctuation or spaces, with area code."
 msgstr "ഫോൺ നമ്പർ, വിരാമചിഹ്നമോ ഇടയോ ചേർക്കാതെ പ്രദേശത്തിന്റെ കോഡിനോടൊപ്പം നൽകുക."
 
 #. TRANS: Form legend for SMS preferences form.
-#: actions/smssettings.php:190
 msgid "SMS preferences"
 msgstr "എസ്.എം.എസ്. ക്രമീകരണങ്ങൾ"
 
 #. TRANS: Checkbox label in SMS preferences form.
-#: actions/smssettings.php:196
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
 msgstr ""
 
 #. TRANS: Confirmation message for successful SMS preferences save.
-#: actions/smssettings.php:307
 msgid "SMS preferences saved."
 msgstr "എസ്.എം.എസ്. ക്രമീകരണങ്ങൾ സേവ് ചെയ്യപ്പെട്ടിട്ടുണ്ട്."
 
 #. TRANS: Message given saving SMS phone number without having provided one.
-#: actions/smssettings.php:329
 msgid "No phone number."
 msgstr "ഫോൺ നമ്പർ നൽകിയിട്ടില്ല."
 
 #. TRANS: Message given saving SMS phone number without having selected a carrier.
-#: actions/smssettings.php:335
 msgid "No carrier selected."
 msgstr ""
 
 #. TRANS: Message given saving SMS phone number that is already set.
-#: actions/smssettings.php:343
 msgid "That is already your phone number."
 msgstr "അതാണ് താങ്കളുടെ ഫോൺ നമ്പരായി മുമ്പേ ഉള്ളത്."
 
 #. TRANS: Message given saving SMS phone number that is already set for another user.
-#: actions/smssettings.php:347
 msgid "That phone number already belongs to another user."
 msgstr "ആ ഫോൺ നമ്പർ മുമ്പേ തന്നെ മറ്റൊരു ഉപയോക്താവിന് അവകാശപ്പെട്ടതാണ്."
 
 #. TRANS: Message given saving valid SMS phone number that is to be confirmed.
-#: actions/smssettings.php:375
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
 "for the code and instructions on how to use it."
@@ -5890,39 +4819,32 @@ msgstr ""
 "ഉപയോഗിക്കാമെന്ന മാർഗ്ഗനിർദ്ദേശങ്ങൾക്കും താങ്കളുടെ ഫോൺ പരിശോധിക്കുക."
 
 #. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
-#: actions/smssettings.php:403
 msgid "That is the wrong confirmation number."
 msgstr "അത് തെറ്റായ സ്ഥിരീകരണ സംഖ്യയാണ്."
 
 #. TRANS: Message given after successfully canceling SMS phone number confirmation.
-#: actions/smssettings.php:417
 msgid "SMS confirmation cancelled."
 msgstr "എസ്.എം.എസ്. സ്ഥിരീകരണം റദ്ദാക്കി."
 
 #. TRANS: Message given trying to remove an SMS phone number that is not
 #. TRANS: registered for the active user.
-#: actions/smssettings.php:437
 msgid "That is not your phone number."
 msgstr "അത് താങ്കളുടെ ഫോൺ നമ്പരല്ല."
 
 #. TRANS: Message given after successfully removing a registered SMS phone number.
-#: actions/smssettings.php:459
 msgid "The SMS phone number was removed."
 msgstr "എസ്.എം.എസ്. ഫോൺ നമ്പർ നീക്കം ചെയ്തിരിക്കുന്നു."
 
 #. TRANS: Label for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:498
 msgid "Mobile carrier"
 msgstr ""
 
 #. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:503
 msgid "Select a carrier"
 msgstr ""
 
 #. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
 #. TRANS: %s is an administrative contact's e-mail address.
-#: actions/smssettings.php:512
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -5930,118 +4852,93 @@ msgid ""
 msgstr ""
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
-#: actions/smssettings.php:534
 msgid "No code entered."
 msgstr "യാതൊരു കോഡും നൽകിയിട്ടില്ല."
 
 #. TRANS: Menu item for site administration
-#: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
-#: lib/adminpanelaction.php:395
 msgid "Snapshots"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:65
 msgid "Manage snapshot configuration"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:127
 msgid "Invalid snapshot run value."
 msgstr ""
 
-#: actions/snapshotadminpanel.php:133
 msgid "Snapshot frequency must be a number."
 msgstr ""
 
-#: actions/snapshotadminpanel.php:144
 msgid "Invalid snapshot report URL."
 msgstr ""
 
-#: actions/snapshotadminpanel.php:200
 msgid "Randomly during web hit"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:201
 msgid "In a scheduled job"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:206
 msgid "Data snapshots"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:208
 msgid "When to send statistical data to status.net servers"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:217
 msgid "Frequency"
 msgstr "ആവൃതി"
 
-#: actions/snapshotadminpanel.php:218
 msgid "Snapshots will be sent once every N web hits"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:226
 msgid "Report URL"
 msgstr "യൂ.ആർ.എൽ. അറിയിക്കുക"
 
-#: actions/snapshotadminpanel.php:227
 msgid "Snapshots will be sent to this URL"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:248
 msgid "Save snapshot settings"
 msgstr ""
 
 #. TRANS: Client error displayed trying a change a subscription for a non-subscribed profile.
-#: actions/subedit.php:75
 msgid "You are not subscribed to that profile."
 msgstr ""
 
 #. TRANS: Server error displayed when updating a subscription fails with a database error.
 #. TRANS: Exception thrown when a subscription could not be stored on the server.
-#: actions/subedit.php:89 classes/Subscription.php:141
 msgid "Could not save subscription."
 msgstr ""
 
 #. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
-#: actions/subscribe.php:121
 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
 msgstr ""
 
 #. TRANS: Page title when subscription succeeded.
-#: actions/subscribe.php:149
 msgid "Subscribed"
 msgstr ""
 
 #. TRANS: Header for list of subscribers for a user (first page).
 #. TRANS: %s is the user's nickname.
-#: actions/subscribers.php:51
 #, php-format
 msgid "%s subscribers"
 msgstr "%s വരിക്കാർ"
 
 #. TRANS: Header for list of subscribers for a user (not first page).
 #. TRANS: %1$s is the user's nickname, $2$d is the page number.
-#: actions/subscribers.php:55
 #, php-format
 msgid "%1$s subscribers, page %2$d"
 msgstr "%1$s എന്ന ഉപയോക്താവിന്റെ വരിക്കാർ, താൾ %2$d"
 
 #. TRANS: Page notice for page with an overview of all subscribers
 #. TRANS: of the logged in user's own profile.
-#: actions/subscribers.php:68
 msgid "These are the people who listen to your notices."
 msgstr "ഈ ആൾക്കാരാണ് താങ്കളുടെ അറിയിപ്പുകൾ ശ്രദ്ധിക്കുന്നത്."
 
 #. TRANS: Page notice for page with an overview of all subscribers of a user other
 #. TRANS: than the logged in user. %s is the user nickname.
-#: actions/subscribers.php:74
 #, php-format
 msgid "These are the people who listen to %s's notices."
 msgstr "ഈ ആൾക്കാരാണ് %s എന്ന ഉപയോക്താവിന്റെ അറിയിപ്പുകൾ ശ്രദ്ധിക്കുന്നത്."
 
 #. TRANS: Subscriber list text when the logged in user has no subscribers.
-#: actions/subscribers.php:114
 msgid ""
 "You have no subscribers. Try subscribing to people you know and they might "
 "return the favor."
@@ -6051,7 +4948,6 @@ msgstr ""
 
 #. TRANS: Subscriber list text when looking at the subscribers for a of a user other
 #. TRANS: than the logged in user that has no subscribers. %s is the user nickname.
-#: actions/subscribers.php:118
 #, php-format
 msgid "%s has no subscribers. Want to be the first?"
 msgstr "%s എന്ന ഉപയോക്താവിന് വരിക്കാരില്ല. ആദ്യത്തെ ആളാകുന്നോ?"
@@ -6061,7 +4957,6 @@ msgstr "%s എന്ന ഉപയോക്താവിന് വരിക്ക
 #. TRANS: This message contains a Markdown URL. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.
-#: actions/subscribers.php:127
 #, php-format
 msgid ""
 "%s has no subscribers. Why not [register an account](%%%%action.register%%%"
@@ -6072,20 +4967,17 @@ msgstr ""
 
 #. TRANS: Header for subscriptions overview for a user (not first page).
 #. TRANS: %1$s is a user nickname, %2$d is the page number.
-#: actions/subscriptions.php:55
 #, php-format
 msgid "%1$s subscriptions, page %2$d"
 msgstr "%1$s വരിക്കാരാകലുകൾ, താൾ %2$d"
 
 #. TRANS: Page notice for page with an overview of all subscriptions
 #. TRANS: of the logged in user's own profile.
-#: actions/subscriptions.php:68
 msgid "These are the people whose notices you listen to."
 msgstr "ഈ ആൾക്കാരുടെ അറിയിപ്പുകളാണ് താങ്കൾ ശ്രദ്ധിക്കുന്നത്."
 
 #. TRANS: Page notice for page with an overview of all subscriptions of a user other
 #. TRANS: than the logged in user. %s is the user nickname.
-#: actions/subscriptions.php:74
 #, php-format
 msgid "These are the people whose notices %s listens to."
 msgstr "ഈ ആൾക്കാരുടെ അറിയിപ്പുകളാണ് %s ശ്രദ്ധിക്കുന്നത്."
@@ -6094,7 +4986,6 @@ msgstr "ഈ ആൾക്കാരുടെ അറിയിപ്പുകളാ
 #. 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.
-#: actions/subscriptions.php:133
 #, php-format
 msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "
@@ -6108,284 +4999,226 @@ msgstr ""
 #. TRANS: than the logged in user that has no subscriptions. %s is the user nickname.
 #. TRANS: Subscription list text when looking at the subscriptions for a of a user that has none
 #. TRANS: as an anonymous user. %s is the user nickname.
-#: actions/subscriptions.php:141 actions/subscriptions.php:147
 #, php-format
 msgid "%s is not listening to anyone."
 msgstr "%s ആരേയും ശ്രദ്ധിക്കുന്നില്ല."
 
 #. TRANS: Atom feed title. %s is a profile nickname.
-#: actions/subscriptions.php:176
 #, php-format
 msgid "Subscription feed for %s (Atom)"
 msgstr ""
 
 #. TRANS: Checkbox label for enabling Jabber messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:241 lib/settingsnav.php:110
 msgid "IM"
 msgstr ""
 
 #. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:256 lib/settingsnav.php:117
 msgid "SMS"
 msgstr "എസ്.എം.എസ്."
 
 #. TRANS: Title for all but the first page of notices with tags.
 #. TRANS: %1$s is the tag, %2$d is the page number.
-#: actions/tag.php:73
 #, php-format
 msgid "Notices tagged with %1$s, page %2$d"
 msgstr ""
 
-#: actions/tag.php:91
 #, php-format
 msgid "Notice feed for tag %s (RSS 1.0)"
 msgstr ""
 
-#: actions/tag.php:97
 #, php-format
 msgid "Notice feed for tag %s (RSS 2.0)"
 msgstr ""
 
-#: actions/tag.php:103
 #, php-format
 msgid "Notice feed for tag %s (Atom)"
 msgstr ""
 
-#: actions/tagother.php:39
 msgid "No ID argument."
 msgstr ""
 
-#: actions/tagother.php:65
 #, php-format
 msgid "Tag %s"
 msgstr "റ്റാഗ് %s"
 
 #. TRANS: H2 for user profile information.
-#: actions/tagother.php:77 lib/userprofile.php:76
 msgid "User profile"
 msgstr ""
 
-#: actions/tagother.php:120
 msgid "Tag user"
 msgstr "ഉപയോക്താവിനെ റ്റാഗ് ചെയ്യുക"
 
-#: actions/tagother.php:130
 msgid ""
 "Tags for this user (letters, numbers, -, ., and _), comma- or space- "
 "separated"
 msgstr ""
 
-#: actions/tagother.php:157
 #, php-format
 msgid "Invalid tag: \"%s\""
 msgstr "അസാധുവായ റ്റാഗ്: \"%s\""
 
-#: actions/tagother.php:172
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 
-#: actions/tagother.php:215
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
 
-#: actions/tagrss.php:35
 msgid "No such tag."
 msgstr "അത്തരത്തിൽ ഒരു റ്റാഗില്ല."
 
 #. TRANS: Client error displayed when trying to unblock a non-blocked user.
-#: actions/unblock.php:59
 msgid "You haven't blocked that user."
 msgstr ""
 
-#: actions/unsandbox.php:72
 msgid "User is not sandboxed."
 msgstr ""
 
-#: actions/unsilence.php:72
 msgid "User is not silenced."
 msgstr ""
 
-#: actions/unsubscribe.php:77
 msgid "No profile ID in request."
 msgstr ""
 
-#: actions/unsubscribe.php:98
 msgid "Unsubscribed"
 msgstr ""
 
-#: actions/updateprofile.php:64
 #, php-format
 msgid ""
 "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
 msgstr ""
 
-#: actions/urlsettings.php:60
 #, fuzzy
 msgid "URL settings"
 msgstr "ഐ.എം. സജ്ജീകരണങ്ങൾ"
 
 #. TRANS: Instructions for tab "Other" in user profile settings.
-#: actions/urlsettings.php:72
 msgid "Manage various other options."
 msgstr "മറ്റ് നിരവധി ഐച്ഛികങ്ങൾ കൈകാര്യം ചെയ്യുക."
 
 #. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
 #. TRANS: user's profile settings. This message has one space at the beginning. Use your
 #. TRANS: language's word separator here if it has one (most likely a single space).
-#: actions/urlsettings.php:115
 msgid " (free service)"
 msgstr " (സൗജന്യ സേവനം)"
 
-#: actions/urlsettings.php:121
 #, fuzzy
 msgid "[none]"
 msgstr "ഒന്നുമില്ല"
 
-#: actions/urlsettings.php:122
 msgid "[internal]"
 msgstr ""
 
 #. TRANS: Label for dropdown with URL shortener services.
-#: actions/urlsettings.php:130
 msgid "Shorten URLs with"
 msgstr "യൂ.ആർ.എൽ. ചെറുതാക്കാൻ ഇതുപയോഗിക്കുക"
 
 #. TRANS: Tooltip for for dropdown with URL shortener services.
-#: actions/urlsettings.php:132
 msgid "Automatic shortening service to use."
 msgstr "ഉപയോഗിക്കാവുന്ന സ്വയംപ്രവർത്തിത ചെറുതാക്കൽ സേവനം."
 
-#: actions/urlsettings.php:138
 msgid "URL longer than"
 msgstr ""
 
-#: actions/urlsettings.php:141
 msgid "URLs longer than this will be shortened, 0 means always shorten."
 msgstr ""
 
-#: actions/urlsettings.php:145
 msgid "Text longer than"
 msgstr ""
 
-#: actions/urlsettings.php:148
 msgid ""
 "URLs in notices longer than this will be shortened, 0 means always shorten."
 msgstr ""
 
 #. TRANS: Form validation error for form "Other settings" in user profile.
-#: actions/urlsettings.php:180
 msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr "യൂ.ആർ.എൽ. ചെറുതാക്കൽ സേവനം വളരെ വലുതാണ് (പരമാവധി 50 അക്ഷരങ്ങൾ)."
 
-#: actions/urlsettings.php:187
 msgid "Invalid number for max url length."
 msgstr ""
 
-#: actions/urlsettings.php:193
 #, fuzzy
 msgid "Invalid number for max notice length."
 msgstr "അറിയിപ്പിന്റെ ഉള്ളടക്കം അസാധുവാണ്."
 
-#: actions/urlsettings.php:238
 msgid "Error saving user URL shortening preferences."
 msgstr ""
 
 #. TRANS: User admin panel title
-#: actions/useradminpanel.php:58
 msgctxt "TITLE"
 msgid "User"
 msgstr "ഉപയോക്താവ്"
 
 #. TRANS: Instruction for user admin panel.
-#: actions/useradminpanel.php:69
 msgid "User settings for this StatusNet site"
 msgstr "ഈ സ്റ്റാറ്റസ്‌നെറ്റ് സൈറ്റിന്റെ ഉപയോക്തൃ സജ്ജീകരണങ്ങൾ"
 
 #. TRANS: Form validation error in user admin panel when a non-numeric character limit was set.
-#: actions/useradminpanel.php:147
 msgid "Invalid bio limit. Must be numeric."
 msgstr ""
 
 #. TRANS: Form validation error in user admin panel when welcome text is too long.
-#: actions/useradminpanel.php:154
 msgid "Invalid welcome text. Maximum length is 255 characters."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to set a non-existing user as default subscription for new
 #. TRANS: users in user admin panel. %1$s is the invalid nickname.
-#: actions/useradminpanel.php:166
 #, php-format
 msgid "Invalid default subscripton: \"%1$s\" is not a user."
 msgstr ""
 
-#: actions/useradminpanel.php:215 lib/action.php:565 lib/settingsnav.php:77
-#: lib/subgroupnav.php:81
 msgid "Profile"
 msgstr ""
 
 #. TRANS: Field label in user admin panel for setting the character limit for the bio field.
-#: actions/useradminpanel.php:220
 msgid "Bio Limit"
 msgstr ""
 
 #. TRANS: Tooltip in user admin panel for setting the character limit for the bio field.
-#: actions/useradminpanel.php:222
 msgid "Maximum length of a profile bio in characters."
 msgstr ""
 
 #. TRANS: Form legend in user admin panel.
-#: actions/useradminpanel.php:231
 msgid "New users"
 msgstr "പുതിയ ഉപയോക്താക്കൾ"
 
 #. TRANS: Field label in user admin panel for setting new user welcome text.
-#: actions/useradminpanel.php:236
 msgid "New user welcome"
 msgstr "പുതിയ ഉപയോക്താവിനുള്ള സ്വാഗതം"
 
 #. TRANS: Tooltip in user admin panel for setting new user welcome text.
-#: actions/useradminpanel.php:238
 msgid "Welcome text for new users (maximum 255 characters)."
 msgstr "പുതിയ ഉപയോക്താക്കൾക്കുള്ള സ്വാഗത സന്ദേശം (പരമാവധി 255 അക്ഷരങ്ങൾ)."
 
 #. TRANS: Field label in user admin panel for setting default subscription for new users.
-#: actions/useradminpanel.php:244
 msgid "Default subscription"
 msgstr ""
 
 #. TRANS: Tooltip in user admin panel for setting default subscription for new users.
-#: actions/useradminpanel.php:246
 msgid "Automatically subscribe new users to this user."
 msgstr ""
 
 #. TRANS: Form legend in user admin panel.
-#: actions/useradminpanel.php:256
 msgid "Invitations"
 msgstr "ക്ഷണങ്ങൾ"
 
 #. TRANS: Field label for checkbox in user admin panel for allowing users to invite friend using site e-mail.
-#: actions/useradminpanel.php:262
 msgid "Invitations enabled"
 msgstr "ക്ഷണിക്കൽ സജ്ജമാക്കിയിരിക്കുന്നു"
 
 #. TRANS: Tooltip for checkbox in user admin panel for allowing users to invite friend using site e-mail.
-#: actions/useradminpanel.php:265
 msgid "Whether to allow users to invite new users."
 msgstr "പുതിയ ഉപയോക്താക്കളെ ക്ഷണിക്കാൻ ഉപയോക്താക്കളെ അനുവദിക്കേണ്ടതുണ്ടോ."
 
 #. TRANS: Title for button to save user settings in user admin panel.
-#: actions/useradminpanel.php:302
 msgid "Save user settings."
 msgstr "ഉപയോക്തൃ സജ്ജീകരണങ്ങൾ സേവ് ചെയ്യുക."
 
 #. TRANS: Page title.
-#: actions/userauthorization.php:109
 msgid "Authorize subscription"
 msgstr "വരിക്കാരനാകൽ അംഗീകരിക്കുക"
 
 #. TRANS: Page notice on "Auhtorize subscription" page.
-#: actions/userauthorization.php:115
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
 "user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
@@ -6393,38 +5226,31 @@ msgid ""
 msgstr ""
 
 #. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:200
 msgctxt "BUTTON"
 msgid "Accept"
 msgstr "സ്വീകരിക്കുക"
 
 #. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:202
 msgid "Subscribe to this user."
 msgstr "ഈ ഉപയോക്താവിന്റെ വരിക്കാരൻ/വരിക്കാരി ആകുക."
 
 #. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:204
 msgctxt "BUTTON"
 msgid "Reject"
 msgstr "നിരസിക്കുക"
 
 #. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:206
 msgid "Reject this subscription."
 msgstr "ഈ വരിക്കാരനാകൽ നിരസിക്കുക."
 
 #. TRANS: Client error displayed for an empty authorisation request.
-#: actions/userauthorization.php:219
 msgid "No authorization request!"
 msgstr ""
 
 #. TRANS: Accept message header from Authorise subscription page.
-#: actions/userauthorization.php:242
 msgid "Subscription authorized"
 msgstr "വരിക്കാരനാകൽ അംഗീകരിക്കപ്പെട്ടു"
 
-#: actions/userauthorization.php:245
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to authorize the "
@@ -6432,11 +5258,9 @@ msgid ""
 msgstr ""
 
 #. TRANS: Reject message header from Authorise subscription page.
-#: actions/userauthorization.php:256
 msgid "Subscription rejected"
 msgstr "വരിക്കാരനാകൽ നിരസിക്കപ്പെട്ടു"
 
-#: actions/userauthorization.php:259
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to fully reject the "
@@ -6445,35 +5269,30 @@ msgstr ""
 
 #. TRANS: Exception thrown when no valid user is found for an authorisation request.
 #. TRANS: %s is a listener URI.
-#: actions/userauthorization.php:296
 #, php-format
 msgid "Listener URI \"%s\" not found here."
 msgstr ""
 
 #. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
 #. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:303
 #, fuzzy, php-format
 msgid "Listenee URI \"%s\" is too long."
 msgstr "സ്രോതസ്സ് യൂ.ആർ.എൽ. വളരെ വലുതാണ്."
 
 #. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
 #. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:311
 #, php-format
 msgid "Listenee URI \"%s\" is a local user."
 msgstr ""
 
 #. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
 #. TRANS: %s is a profile URL.
-#: actions/userauthorization.php:329
 #, php-format
 msgid "Profile URL \"%s\" is for a local user."
 msgstr ""
 
 #. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
 #. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
-#: actions/userauthorization.php:339
 #, fuzzy, php-format
 msgid ""
 "Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
@@ -6484,75 +5303,61 @@ msgstr ""
 
 #. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
 #. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:349
 #, fuzzy, php-format
 msgid "Avatar URL \"%s\" is not valid."
 msgstr "സ്രോതസ്സ് യൂ.ആർ.എൽ. അസാധുവാണ്."
 
 #. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
 #. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:356
 #, php-format
 msgid "Cannot read avatar URL \"%s\"."
 msgstr ""
 
 #. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
 #. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:363
 #, php-format
 msgid "Wrong image type for avatar URL \"%s\"."
 msgstr ""
 
 #. TRANS: Page title for profile design page.
-#: actions/userdesignsettings.php:74 lib/designsettings.php:61
 msgid "Profile design"
 msgstr ""
 
 #. TRANS: Instructions for profile design page.
-#: actions/userdesignsettings.php:84 lib/designsettings.php:72
 msgid ""
 "Customize the way your profile looks with a background image and a colour "
 "palette of your choice."
 msgstr ""
 
-#: actions/userdesignsettings.php:289
 msgid "Enjoy your hotdog!"
 msgstr "താങ്കളുടെ ഹോട്ട്ഡോഗ് ആസ്വദിക്കൂ!"
 
-#: actions/userdesignsettings.php:325
 #, fuzzy
 msgid "Design settings"
 msgstr "സൈറ്റ് സജ്ജീകരണങ്ങൾ ചേവ് ചെയ്യുക"
 
-#: actions/userdesignsettings.php:340
 msgid "View profile designs"
 msgstr ""
 
-#: actions/userdesignsettings.php:341
 msgid "Show or hide profile designs."
 msgstr ""
 
-#: actions/userdesignsettings.php:348
 #, fuzzy
 msgid "Background file"
 msgstr "പശ്ചാത്തലം"
 
 #. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number.
-#: actions/usergroups.php:66
 #, php-format
 msgid "%1$s groups, page %2$d"
 msgstr "%1$s സംഘങ്ങൾ, താൾ %2$d"
 
-#: actions/usergroups.php:132
 msgid "Search for more groups"
 msgstr "കൂടുതൽ സംഘങ്ങൾക്കായി തിരയുക"
 
-#: actions/usergroups.php:159
 #, php-format
 msgid "%s is not a member of any group."
 msgstr "%s എന്ന ഉപയോക്താവ് ഒരു സംഘത്തിലേയും അംഗമല്ല."
 
-#: actions/usergroups.php:164
 #, php-format
 msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
 msgstr "[സംഘങ്ങൾ തിരയുക](%%action.groupsearch%%), അവയിൽ ചേരുക."
@@ -6562,34 +5367,27 @@ msgstr "[സംഘങ്ങൾ തിരയുക](%%action.groupsearch%%), അ
 #. TRANS: %1$s is a group name, %2$s is a site name.
 #. TRANS: Message is used as a subtitle in atom user notice feed.
 #. TRANS: %1$s is a user name, %2$s is a site name.
-#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:70
-#: lib/atomusernoticefeed.php:95
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr ""
 
-#: actions/version.php:75
 #, php-format
 msgid "StatusNet %s"
 msgstr "സ്റ്റാറ്റസ്‌നെറ്റ് %s"
 
-#: actions/version.php:155
 #, php-format
 msgid ""
 "This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
 "Inc. and contributors."
 msgstr ""
 
-#: actions/version.php:163
 msgid "Contributors"
 msgstr "സംഭാവന ചെയ്തവർ"
 
 #. TRANS: Menu item for site administration
-#: actions/version.php:167 lib/adminpanelaction.php:403
 msgid "License"
 msgstr "അനുമതി"
 
-#: actions/version.php:170
 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 "
@@ -6597,7 +5395,6 @@ msgid ""
 "any later version. "
 msgstr ""
 
-#: actions/version.php:176
 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 "
@@ -6605,7 +5402,6 @@ msgid ""
 "for more details. "
 msgstr ""
 
-#: actions/version.php:182
 #, php-format
 msgid ""
 "You should have received a copy of the GNU Affero General Public License "
@@ -6613,52 +5409,42 @@ msgid ""
 msgstr ""
 
 #. TRANS: Form input field label for application name.
-#: actions/version.php:197 lib/applicationeditform.php:190
 msgid "Name"
 msgstr "പേര്"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:885
 msgid "Version"
 msgstr "പതിപ്പ്"
 
-#: actions/version.php:199
 msgid "Author(s)"
 msgstr "രചയിതാവ് (രചയിതാക്കൾ)"
 
 #. TRANS: Form input field label.
-#: actions/version.php:200 lib/applicationeditform.php:208
-#: lib/groupeditform.php:168
 msgid "Description"
 msgstr "വിവരണം"
 
 #. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:164
 msgid "Favor"
 msgstr ""
 
 #. TRANS: Ntofication given when a user marks a notice as favorite.
 #. TRANS: %1$s is a user nickname or full name, %2$s is a notice URI.
-#: classes/Fave.php:167
 #, php-format
 msgid "%1$s marked notice %2$s as a favorite."
 msgstr ""
 
 #. TRANS: Server exception thrown when a URL cannot be processed.
-#: classes/File.php:162
 #, php-format
 msgid "Cannot process URL '%s'"
 msgstr ""
 
 #. TRANS: Server exception thrown when... Robin thinks something is impossible!
-#: classes/File.php:194
 msgid "Robin thinks something is impossible."
 msgstr "ചിലത് അസാധ്യമാണെന്നാണ് റോബിനും സന്ദേശം പരിഭാഷ ചെയ്ത പ്രവീണും കരുതുന്നത്."
 
 #. 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$s is used for plural.
-#: classes/File.php:210
 #, php-format
 msgid ""
 "No file may be larger than %1$d byte and the file you sent was %2$d bytes. "
@@ -6671,7 +5457,6 @@ msgstr[1] ""
 
 #. TRANS: Message given if an upload would exceed user quota.
 #. TRANS: %d (number) is the user quota in bytes and is used for plural.
-#: classes/File.php:223
 #, php-format
 msgid "A file this large would exceed your user quota of %d byte."
 msgid_plural "A file this large would exceed your user quota of %d bytes."
@@ -6680,7 +5465,6 @@ msgstr[1] ""
 
 #. TRANS: Message given id an upload would exceed a user's monthly quota.
 #. TRANS: $d (number) is the monthly user quota in bytes and is used for plural.
-#: classes/File.php:235
 #, php-format
 msgid "A file this large would exceed your monthly quota of %d byte."
 msgid_plural "A file this large would exceed your monthly quota of %d bytes."
@@ -6688,108 +5472,89 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Client exception thrown if a file upload does not have a valid name.
-#: classes/File.php:282 classes/File.php:297
 msgid "Invalid filename."
 msgstr "പ്രമാണത്തിന്റെ പേര് അസാധുവാണ്."
 
 #. TRANS: Exception thrown when joining a group fails.
-#: classes/Group_member.php:51
 msgid "Group join failed."
 msgstr "സംഘത്തിൽ ചേരൽ പരാജയപ്പെട്ടു."
 
 #. TRANS: Exception thrown when trying to leave a group the user is not a member of.
-#: classes/Group_member.php:64
 msgid "Not part of group."
 msgstr "സംഘത്തിന്റെ ഭാഗമല്ല."
 
 #. TRANS: Exception thrown when trying to leave a group fails.
-#: classes/Group_member.php:72
 msgid "Group leave failed."
 msgstr "സംഘത്തിൽ നിന്നും ഒഴിവാകൽ പരാജയപ്പെട്ടിരിക്കുന്നു."
 
 #. TRANS: Exception thrown providing an invalid profile ID.
 #. TRANS: %s is the invalid profile ID.
-#: classes/Group_member.php:85
 #, php-format
 msgid "Profile ID %s is invalid."
 msgstr ""
 
 #. TRANS: Exception thrown providing an invalid group ID.
 #. TRANS: %s is the invalid group ID.
-#: classes/Group_member.php:98
 #, php-format
 msgid "Group ID %s is invalid."
 msgstr ""
 
 #. TRANS: Activity title.
-#: classes/Group_member.php:147 lib/joinform.php:114
 msgid "Join"
 msgstr "ഭാഗഭാക്കാകുക"
 
 #. TRANS: Success message for subscribe to group attempt through OStatus.
 #. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
-#: classes/Group_member.php:151
 #, php-format
 msgid "%1$s has joined group %2$s."
 msgstr ""
 
 #. TRANS: Server exception thrown when updating a local group fails.
-#: classes/Local_group.php:42
 msgid "Could not update local group."
 msgstr ""
 
 #. TRANS: Exception thrown when trying creating a login token failed.
 #. TRANS: %s is the user nickname for which token creation failed.
-#: classes/Login_token.php:78
 #, php-format
 msgid "Could not create login token for %s"
 msgstr ""
 
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
-#: classes/Memcached_DataObject.php:556
 msgid "No database name or DSN found anywhere."
 msgstr ""
 
 #. TRANS: Client exception thrown when a user tries to send a direct message while being banned from sending them.
-#: classes/Message.php:45
 msgid "You are banned from sending direct messages."
 msgstr "നേരിട്ടുള്ള സന്ദേശങ്ങൾ അയക്കുന്നതിൽ നിന്നും താങ്കൾ തടയപ്പെട്ടിരിക്കുന്നു."
 
 #. TRANS: Message given when a message could not be stored on the server.
-#: classes/Message.php:69
 msgid "Could not insert message."
 msgstr "സന്ദേശം ഉൾപ്പെടുത്താൻ കഴിഞ്ഞില്ല."
 
 #. TRANS: Message given when a message could not be updated on the server.
-#: classes/Message.php:80
 msgid "Could not update message with new URI."
 msgstr ""
 
 #. TRANS: Server exception thrown when a user profile for a notice cannot be found.
 #. TRANS: %1$d is a profile ID (number), %2$d is a notice ID (number).
-#: classes/Notice.php:98
 #, php-format
 msgid "No such profile (%1$d) for notice (%2$d)."
 msgstr ""
 
 #. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:199
 #, php-format
 msgid "Database error inserting hashtag: %s"
 msgstr ""
 
 #. TRANS: Client exception thrown if a notice contains too many characters.
-#: classes/Notice.php:279
 msgid "Problem saving notice. Too long."
 msgstr "അറിയിപ്പ് സേവ് ചെയ്യുന്നതിൽ കുഴപ്പമുണ്ടായി. അധികം വലിപ്പം."
 
 #. TRANS: Client exception thrown when trying to save a notice for an unknown user.
-#: classes/Notice.php:284
 msgid "Problem saving notice. Unknown user."
 msgstr "അറിയിപ്പ് സേവ് ചെയ്യുന്നതിൽ കുഴപ്പമുണ്ടായി. അപരിചിത ഉപയോക്താവ്."
 
 #. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
-#: classes/Notice.php:290
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
@@ -6797,7 +5562,6 @@ msgstr ""
 "പ്രസിദ്ധീകരിക്കൂ."
 
 #. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
-#: classes/Notice.php:297
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
 "few minutes."
@@ -6806,42 +5570,35 @@ msgstr ""
 "ശേഷം പ്രസിദ്ധീകരിക്കൂ."
 
 #. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:305
 msgid "You are banned from posting notices on this site."
 msgstr "ഈ സൈറ്റിൽ അറിയിപ്പുകൾ പ്രസിദ്ധീകരിക്കുന്നതിൽ നിന്നും താങ്കൾ തടയപ്പെട്ടിരിക്കുന്നു."
 
 #. TRANS: Server exception thrown when a notice cannot be saved.
 #. TRANS: Server exception thrown when a notice cannot be updated.
-#: classes/Notice.php:372 classes/Notice.php:399
 msgid "Problem saving notice."
 msgstr "അറിയിപ്പ് സേവ് ചെയ്യുന്നതിൽ പിഴവുണ്ടായി."
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:929
 msgid "Bad type provided to saveKnownGroups."
 msgstr ""
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:1028
 msgid "Problem saving group inbox."
 msgstr "സംഘത്തിന്റെ ഇൻബോക്സ് സേവ് ചെയ്യുന്നതിൽ പ്രശ്നമുണ്ടായി."
 
 #. TRANS: Server exception thrown when a reply cannot be saved.
 #. TRANS: %1$d is a notice ID, %2$d is the ID of the mentioned user.
-#: classes/Notice.php:1144
 #, php-format
 msgid "Could not save reply for %1$d, %2$d."
 msgstr " %2$d, %1$d എന്ന അറിയിപ്പിനുള്ള മറുപടി സേവ് ചെയ്യാൻ കഴിഞ്ഞില്ല."
 
 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1663
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr ""
 
 #. TRANS: Full name of a profile or group followed by nickname in parens
-#: classes/Profile.php:172 classes/User_group.php:242
 #, php-format
 msgctxt "FANCYNAME"
 msgid "%1$s (%2$s)"
@@ -6849,264 +5606,215 @@ msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:779
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:788
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
 
 #. TRANS: Exception thrown when a right for a non-existing user profile is checked.
-#: classes/Remote_profile.php:54
 msgid "Missing profile."
 msgstr ""
 
 #. TRANS: Exception thrown when a tag cannot be saved.
-#: classes/Status_network.php:338
 msgid "Unable to save tag."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#: classes/Subscription.php:77 lib/oauthstore.php:482
 msgid "You have been banned from subscribing."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to subscribe while already subscribed.
-#: classes/Subscription.php:82
 msgid "Already subscribed!"
 msgstr ""
 
 #. TRANS: Exception thrown when trying to subscribe to a user who has blocked the subscribing user.
-#: classes/Subscription.php:87
 msgid "User has blocked you."
 msgstr "ഉപയോക്താവ് താങ്കളെ തടഞ്ഞിരിക്കുന്നു."
 
 #. TRANS: Exception thrown when trying to unsibscribe without a subscription.
-#: classes/Subscription.php:176
 msgid "Not subscribed!"
 msgstr ""
 
 #. TRANS: Exception thrown when trying to unsubscribe a user from themselves.
-#: classes/Subscription.php:183
 msgid "Could not delete self-subscription."
 msgstr ""
 
 #. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
-#: classes/Subscription.php:211
 msgid "Could not delete subscription OMB token."
 msgstr ""
 
 #. TRANS: Exception thrown when a subscription could not be deleted on the server.
-#: classes/Subscription.php:223
 msgid "Could not delete subscription."
 msgstr ""
 
 #. TRANS: Activity tile when subscribing to another person.
-#: classes/Subscription.php:265
 msgid "Follow"
 msgstr "പിന്തുടരുക"
 
 #. TRANS: Notification given when one person starts following another.
 #. TRANS: %1$s is the subscriber, %2$s is the subscribed.
-#: classes/Subscription.php:268
 #, php-format
 msgid "%1$s is now following %2$s."
 msgstr "%1$s ഇപ്പോൾ %2$s എന്ന ഉപയോക്താവിനെ പിന്തുടരുന്നു."
 
 #. TRANS: Notice given on user registration.
 #. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:390
 #, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr "%1$s സൈറ്റിലേയ്ക്ക് സ്വാഗതം, @%2$s!"
 
 #. TRANS: Server exception.
-#: classes/User.php:923
 msgid "No single user defined for single-user mode."
 msgstr ""
 
 #. TRANS: Server exception.
-#: classes/User.php:927
 msgid "Single-user mode code called when not enabled."
 msgstr ""
 
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:522
 msgid "Could not create group."
 msgstr "സംഘം സൃഷ്ടിക്കാൻ കഴിഞ്ഞില്ല."
 
 #. TRANS: Server exception thrown when updating a group URI failed.
-#: classes/User_group.php:532
 msgid "Could not set group URI."
 msgstr ""
 
 #. TRANS: Server exception thrown when setting group membership failed.
-#: classes/User_group.php:555
 msgid "Could not set group membership."
 msgstr "സംഘ അംഗത്വം സജ്ജീകരിച്ചിട്ടില്ല."
 
 #. TRANS: Server exception thrown when saving local group information failed.
-#: classes/User_group.php:570
 msgid "Could not save local group info."
 msgstr "പ്രാദേശിക സംഘത്തിന്റെ വിവരങ്ങൾ സേവ് ചെയ്യാൻ കഴിഞ്ഞില്ല."
 
 #. TRANS: Exception thrown when an account could not be located when it should be moved.
 #. TRANS: %s is the remote site.
-#: lib/accountmover.php:65
 #, php-format
 msgid "Cannot locate account %s."
 msgstr "%s എന്ന അംഗത്വം കണ്ടെത്താനായില്ല."
 
 #. TRANS: Exception thrown when a service document could not be located account move.
 #. TRANS: %s is the remote site.
-#: lib/accountmover.php:106
 #, php-format
 msgid "Cannot find XRD for %s."
 msgstr ""
 
 #. TRANS: Exception thrown when an account could not be located when it should be moved.
 #. TRANS: %s is the remote site.
-#: lib/accountmover.php:131
 #, php-format
 msgid "No AtomPub API service for %s."
 msgstr ""
 
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: lib/action.php:161
 #, php-format
 msgid "%1$s - %2$s"
 msgstr ""
 
 #. TRANS: Page title for a page without a title set.
-#: lib/action.php:177
 msgid "Untitled page"
 msgstr "തലക്കെട്ടില്ലാത്ത താൾ"
 
 #. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.
-#: lib/action.php:325
 msgctxt "TOOLTIP"
 msgid "Show more"
 msgstr "കൂടുതൽ പ്രദർശിപ്പിക്കുക"
 
 #. TRANS: Inline reply form submit button: submits a reply comment.
-#: lib/action.php:328
 #, fuzzy
 msgctxt "BUTTON"
-msgid "Comment"
-msgstr "ഉള്ളടക്കം"
+msgid "Reply"
+msgstr "മറുപടി"
 
 #. TRANS: Placeholder text for inline reply form. Clicking in this box will turn it into a mini notice form.
-#: lib/action.php:331
-msgid "Add a comment..."
+msgid "Write a reply..."
 msgstr ""
 
-#: lib/action.php:559 lib/personalgroupnav.php:99
 #, fuzzy
 msgid "Home"
 msgstr "ഹോംപേജ്"
 
-#: lib/action.php:560
 #, fuzzy
 msgid "Friends timeline"
 msgstr "%s എന്ന ഉപയോക്താവിന്റെ സമയരേഖ"
 
-#: lib/action.php:566
 #, fuzzy
 msgid "Your profile"
 msgstr "അജ്ഞാതമായ കുറിപ്പ്."
 
-#: lib/action.php:570 lib/action.php:593 lib/publicgroupnav.php:78
 msgid "Public"
 msgstr "സാർവ്വജനികം"
 
-#: lib/action.php:571 lib/action.php:594
 #, fuzzy
 msgid "Everyone on this site"
 msgstr "ഈ സൈറ്റിലെ ആൾക്കാരെ കണ്ടെത്തുക"
 
-#: lib/action.php:575
 #, fuzzy
 msgid "Settings"
 msgstr "എസ്.എം.എസ്. സജ്ജീകരണങ്ങൾ"
 
-#: lib/action.php:576
 #, fuzzy
 msgid "Change your personal settings"
 msgstr "താങ്കളുടെ രഹസ്യവാക്ക് മാറ്റുക"
 
-#: lib/action.php:582
 #, fuzzy
 msgid "Site configuration"
 msgstr "ഉപയോക്തൃ ക്രമീകരണം"
 
-#: lib/action.php:587
 #, fuzzy
 msgid "Logout"
 msgstr "ലോഗൗട്ട്"
 
-#: lib/action.php:588
 #, fuzzy
 msgid "Logout from the site"
 msgstr "സൈറ്റിൽ നിന്നും പുറത്തുകടക്കുക"
 
-#: lib/action.php:599
 #, fuzzy
 msgid "Login to the site"
 msgstr "സൈറ്റിലേക്ക് പ്രവേശിക്കുക"
 
-#: lib/action.php:606
 #, fuzzy
 msgid "Search"
 msgstr "തിരയുക"
 
-#: lib/action.php:607
 #, fuzzy
 msgid "Search the site"
 msgstr "സൈറ്റിൽ തിരയുക"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:864
 msgid "Help"
 msgstr "സഹായം"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:867
 msgid "About"
 msgstr "വിവരണം"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:870
 msgid "FAQ"
 msgstr "പതിവുചോദ്യങ്ങൾ"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:875
 msgid "TOS"
 msgstr ""
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:879
 msgid "Privacy"
 msgstr "സ്വകാര്യത"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:882
 msgid "Source"
 msgstr "സ്രോതസ്സ്"
 
 #. TRANS: Secondary navigation menu option leading to e-mail contact information on the
 #. TRANS: StatusNet site, where to report bugs, ...
-#: lib/action.php:889
 msgid "Contact"
 msgstr "സമ്പർക്കം"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:892
 msgid "Badge"
 msgstr ""
 
@@ -7114,7 +5822,6 @@ msgstr ""
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:921
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7122,7 +5829,6 @@ msgid ""
 msgstr ""
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:924
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr ""
@@ -7131,7 +5837,6 @@ msgstr ""
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:931
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7141,104 +5846,86 @@ msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:949
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr "%1$s സൈറ്റിന്റെ ഉള്ളടക്കം സ്വകാര്യവും രഹസ്യവുമാണ്."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:956
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:960
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr "ഉള്ളടക്കവും വിവരങ്ങളും സംഭാവകർക്ക് പകർപ്പവകാശമുള്ളതാണ്. എല്ലാ അവകാശങ്ങളും സംരക്ഷിതം."
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:992
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1335
 msgid "After"
 msgstr "ശേഷം"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1345
 msgid "Before"
 msgstr "മുമ്പ്"
 
 #. TRANS: Client exception thrown when a feed instance is a DOMDocument.
-#: lib/activity.php:125
 msgid "Expecting a root feed element but got a whole XML document."
 msgstr ""
 
 #. TRANS: Client exception thrown when using an unknown verb for the activity importer.
-#: lib/activityimporter.php:81
 #, php-format
 msgid "Unknown verb: \"%s\"."
 msgstr "അപരിചിതമായ ക്രിയ: \"%s\"."
 
 #. TRANS: Client exception thrown when trying to force a subscription for an untrusted user.
-#: lib/activityimporter.php:107
 msgid "Cannot force subscription for untrusted user."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to for a remote user to subscribe.
-#: lib/activityimporter.php:117
 msgid "Cannot force remote user to subscribe."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to subscribe to an unknown profile.
-#: lib/activityimporter.php:132
 #, fuzzy
 msgid "Unknown profile."
 msgstr "അജ്ഞാതമായ കുറിപ്പ്."
 
 #. TRANS: Client exception thrown when trying to import an event not related to the importing user.
-#: lib/activityimporter.php:138
 msgid "This activity seems unrelated to our user."
 msgstr "ഈ പ്രവൃത്തി ഞങ്ങളുടെ ഒരുപയോക്താവ് ചെയ്തതാണെന്ന് തോന്നുന്നില്ല."
 
 #. TRANS: Client exception thrown when trying to join a remote group that is not a group.
-#: lib/activityimporter.php:154
 msgid "Remote profile is not a group!"
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to join a group the importing user is already a member of.
-#: lib/activityimporter.php:163
 msgid "User is already a member of this group."
 msgstr "ഉപയോക്താവ് ഈ സംഘത്തിൽ മുമ്പേ തന്നെ അംഗമാണ്."
 
 #. TRANS: Client exception thrown when trying to import a notice by another user.
 #. TRANS: %1$s is the source URI of the notice, %2$s is the URI of the author.
-#: lib/activityimporter.php:201
 #, php-format
 msgid "Already know about notice %1$s and  it has a different author %2$s."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to overwrite the author information for a non-trusted user during import.
-#: lib/activityimporter.php:207
 msgid "Not overwriting author info for non-trusted user."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to import a notice without content.
 #. TRANS: %s is the notice URI.
-#: lib/activityimporter.php:223
 #, php-format
 msgid "No content for notice %s."
 msgstr "ഉള്ളടക്കമൊന്നും %s എന്ന അറിയിപ്പിൽ നൽകിയിട്ടില്ല."
 
-#: lib/activitymover.php:84
 #, php-format
 msgid "No such user %s."
 msgstr "%s എന്നൊരു ഉപയോക്താവില്ല."
@@ -7249,209 +5936,169 @@ msgstr "%s എന്നൊരു ഉപയോക്താവില്ല."
 #. TRANS: %1$s is a URL, %2$s is the status, %s$s is the fail reason.
 #. TRANS: Exception thrown when post to collection fails with a status that is not handled.
 #. TRANS: %1$s is a URL, %2$s is the status, %s$s is the fail reason.
-#: lib/activitysink.php:163 lib/activitysink.php:167 lib/activitysink.php:172
 #, php-format
 msgctxt "URLSTATUSREASON"
 msgid "%1$s %2$s %3$s"
 msgstr ""
 
 #. TRANS: Client exception thrown when there is no source attribute.
-#: lib/activityutils.php:200
 msgid "Can't handle remote content yet."
 msgstr ""
 
 #. TRANS: Client exception thrown when there embedded XML content is found that cannot be processed yet.
-#: lib/activityutils.php:237
 msgid "Can't handle embedded XML content yet."
 msgstr ""
 
 #. TRANS: Client exception thrown when base64 encoded content is found that cannot be processed yet.
-#: lib/activityutils.php:242
 msgid "Can't handle embedded Base64 content yet."
 msgstr ""
 
 #. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights.
-#: lib/adminpanelaction.php:96
 msgid "You cannot make changes to this site."
 msgstr ""
 
 #. TRANS: Client error message throw when a certain panel's settings cannot be changed.
-#: lib/adminpanelaction.php:108
 msgid "Changes to that panel are not allowed."
 msgstr ""
 
 #. TRANS: Client error message.
-#: lib/adminpanelaction.php:222
 msgid "showForm() not implemented."
 msgstr ""
 
 #. TRANS: Client error message
-#: lib/adminpanelaction.php:250
 msgid "saveSettings() not implemented."
 msgstr ""
 
 #. TRANS: Client error message thrown if design settings could not be deleted in
 #. TRANS: the admin panel Design.
-#: lib/adminpanelaction.php:274
 msgid "Unable to delete design setting."
 msgstr "രൂപകല്പനാ സജ്ജീകരണങ്ങൾ മായ്ക്കാൻ കഴിഞ്ഞില്ല."
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:337
 msgid "Basic site configuration"
 msgstr "സൈറ്റിന്റെ അടിസ്ഥാന ക്രമീകരണം"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:339
 msgctxt "MENU"
 msgid "Site"
 msgstr "സൈറ്റ്"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:345
 msgid "Design configuration"
 msgstr "രൂപകല്പനാ ക്രമീകരണം"
 
 #. TRANS: Menu item for site administration
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/adminpanelaction.php:347 lib/groupnav.php:135
 msgctxt "MENU"
 msgid "Design"
 msgstr "രൂപകല്പന"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:353
 msgid "User configuration"
 msgstr "ഉപയോക്തൃ ക്രമീകരണം"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:110
 msgid "User"
 msgstr "ഉപയോക്താവ്"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:361
 msgid "Access configuration"
 msgstr "അഭിഗമ്യതാ ക്രമീകരണം"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:369
 msgid "Paths configuration"
 msgstr ""
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:377
 msgid "Sessions configuration"
 msgstr ""
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:385
 msgid "Edit site notice"
 msgstr "സൈറ്റ് അറിയിപ്പ് തിരുത്തുക"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:387
 msgid "Site notice"
 msgstr "സൈറ്റ് അറിയിപ്പ്"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:393
 msgid "Snapshots configuration"
 msgstr ""
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:401
 msgid "Set site license"
 msgstr "സൈറ്റിന്റെ ഉപയോഗാനുമതി സജ്ജീകരിക്കുക"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:409
 #, fuzzy
 msgid "Plugins configuration"
 msgstr "രൂപകല്പനാ ക്രമീകരണം"
 
 #. TRANS: Client error 401.
-#: lib/apiauth.php:111
 msgid "API resource requires read-write access, but you only have read access."
 msgstr ""
 
 #. TRANS: OAuth exception thrown when no application is found for a given consumer key.
-#: lib/apiauth.php:177
 msgid "No application for that consumer key."
 msgstr ""
 
-#: lib/apiauth.php:202 lib/apiauth.php:284
 msgid "Not allowed to use API."
 msgstr ""
 
 #. TRANS: OAuth exception given when an incorrect access token was given for a user.
-#: lib/apiauth.php:225
 msgid "Bad access token."
 msgstr ""
 
 #. TRANS: OAuth exception given when no user was found for a given token (no token was found).
-#: lib/apiauth.php:230
 msgid "No user for that token."
 msgstr ""
 
 #. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel".
 #. TRANS: Client error thrown when authentication fails.
-#: lib/apiauth.php:272 lib/apiauth.php:302
 msgid "Could not authenticate you."
 msgstr ""
 
 #. TRANS: Server error displayed when trying to create an anynymous OAuth consumer.
-#: lib/apioauthstore.php:45
 msgid "Could not create anonymous consumer."
 msgstr ""
 
 #. TRANS: Server error displayed when trying to create an anynymous OAuth application.
-#: lib/apioauthstore.php:69
 msgid "Could not create anonymous OAuth application."
 msgstr ""
 
 #. TRANS: Exception thrown when no token association could be found.
-#: lib/apioauthstore.php:151
 msgid ""
 "Could not find a profile and application associated with the request token."
 msgstr ""
 
 #. TRANS: Exception thrown when no access token can be issued.
-#: lib/apioauthstore.php:209
 msgid "Could not issue access token."
 msgstr ""
 
-#: lib/apioauthstore.php:317
 msgid "Database error inserting OAuth application user."
 msgstr ""
 
-#: lib/apioauthstore.php:345
 msgid "Database error updating OAuth application user."
 msgstr ""
 
 #. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
-#: lib/apioauthstore.php:371
 msgid "Tried to revoke unknown token."
 msgstr ""
 
 #. TRANS: Exception thrown when an attempt is made to remove a revoked token.
-#: lib/apioauthstore.php:376
 msgid "Failed to delete revoked token."
 msgstr ""
 
 #. TRANS: Form input field label for application icon.
-#: lib/applicationeditform.php:177
 msgid "Icon"
 msgstr "ഐകോൺ"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:182
 msgid "Icon for this application"
 msgstr ""
 
 #. TRANS: Form input field instructions.
 #. TRANS: %d is the number of available characters for the description.
-#: lib/applicationeditform.php:201
 #, php-format
 msgid "Describe your application in %d character"
 msgid_plural "Describe your application in %d characters"
@@ -7459,205 +6106,166 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:205
 msgid "Describe your application"
 msgstr ""
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:216
 msgid "URL of the homepage of this application"
 msgstr ""
 
 #. TRANS: Form input field label.
-#: lib/applicationeditform.php:218
 msgid "Source URL"
 msgstr "സ്രോതസ്സ് യു.ആർ.എൽ"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:225
 msgid "Organization responsible for this application"
 msgstr ""
 
 #. TRANS: Form input field label.
-#: lib/applicationeditform.php:227
 msgid "Organization"
 msgstr "സംഘടന"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:234
 msgid "URL for the homepage of the organization"
 msgstr ""
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:243
 msgid "URL to redirect to after authentication"
 msgstr ""
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:271
 msgid "Browser"
 msgstr "ബ്രൗസർ"
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:288
 msgid "Desktop"
 msgstr "ഡെസ്ക്ടോപ്പ്"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:290
 msgid "Type of application, browser or desktop"
 msgstr ""
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:314
 msgid "Read-only"
 msgstr ""
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:334
 msgid "Read-write"
 msgstr ""
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:336
 msgid "Default access for this application: read-only, or read-write"
 msgstr ""
 
 #. TRANS: Submit button title.
-#: lib/applicationeditform.php:353
 msgid "Cancel"
 msgstr "റദ്ദാക്കുക"
 
-#: lib/applicationlist.php:247
 msgid " by "
 msgstr ""
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:260
 msgid "read-write"
 msgstr ""
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:262
 msgid "read-only"
 msgstr ""
 
 #. TRANS: Used in application list. %1$s is a modified date, %2$s is access type ("read-write" or "read-only")
-#: lib/applicationlist.php:268
 #, php-format
 msgid "Approved %1$s - \"%2$s\" access."
 msgstr ""
 
 #. TRANS: Access token in the application list.
 #. TRANS: %s are the first 7 characters of the access token.
-#: lib/applicationlist.php:282
 #, php-format
 msgid "Access token starting with: %s"
 msgstr ""
 
 #. TRANS: Button label
-#: lib/applicationlist.php:298
 msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "തിരിച്ചെടുക്കുക"
 
-#: lib/atom10feed.php:113
 msgid "Author element must contain a name element."
 msgstr ""
 
 #. TRANS: Server exception thrown when using the method setActivitySubject() in the class Atom10Feed.
-#: lib/atom10feed.php:160
 msgid "Do not use this method!"
 msgstr "ഈ മാർഗ്ഗം ഉപയോഗിക്കരുത്!"
 
 #. TRANS: Title.
-#: lib/attachmentnoticesection.php:67
 msgid "Notices where this attachment appears"
 msgstr ""
 
 #. TRANS: Title.
-#: lib/attachmenttagcloudsection.php:48
 msgid "Tags for this attachment"
 msgstr ""
 
 #. TRANS: Exception thrown when a password change fails.
-#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:227
 msgid "Password changing failed."
 msgstr "രഹസ്യവാക്ക് മാറ്റൽ പരാജയപ്പെട്ടിരിക്കുന്നു."
 
 #. TRANS: Exception thrown when a password change attempt fails because it is not allowed.
-#: lib/authenticationplugin.php:238
 msgid "Password changing is not allowed."
 msgstr "രഹസ്യവാക്ക് മാറ്റൽ അനുവദിച്ചിട്ടില്ല."
 
 #. TRANS: Title for the form to block a user.
-#: lib/blockform.php:68
 msgid "Block"
 msgstr "തടയുക"
 
 #. TRANS: Description of the form to block a user.
-#: lib/blockform.php:79
 msgid "Block this user"
 msgstr "ഈ ഉപയോക്താവിനെ തടയുക"
 
 #. TRANS: Title for command results.
-#: lib/channel.php:104 lib/channel.php:125
 msgid "Command results"
 msgstr ""
 
 #. TRANS: Title for command results.
-#: lib/channel.php:138
 msgid "AJAX error"
 msgstr "അജാക്സ് പിഴവ്"
 
 #. TRANS: E-mail subject when a command has completed.
-#: lib/channel.php:177 lib/mailhandler.php:143
 msgid "Command complete"
 msgstr ""
 
 #. TRANS: E-mail subject when a command has failed.
-#: lib/channel.php:188
 msgid "Command failed"
 msgstr ""
 
 #. TRANS: Command exception text shown when a notice ID is requested that does not exist.
-#: lib/command.php:82 lib/command.php:106
 msgid "Notice with that id does not exist."
 msgstr "ആ ഐ.ഡി.യിൽ അറിയിപ്പ് നിലവിലില്ല."
 
 #. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
 #. TRANS: Error text shown when a last user notice is requested and it does not exist.
-#: lib/command.php:99 lib/command.php:642
 msgid "User has no last notice."
 msgstr ""
 
 #. TRANS: Message given requesting a profile for a non-existing user.
 #. TRANS: %s is the nickname of the user for which the profile could not be found.
-#: lib/command.php:128
 #, php-format
 msgid "Could not find a user with nickname %s."
 msgstr ""
 
 #. TRANS: Message given getting a non-existing user.
 #. TRANS: %s is the nickname of the user that could not be found.
-#: lib/command.php:148
 #, php-format
 msgid "Could not find a local user with nickname %s."
 msgstr ""
 
 #. TRANS: Error text shown when an unimplemented command is given.
-#: lib/command.php:183
 msgid "Sorry, this command is not yet implemented."
 msgstr ""
 
 #. TRANS: Command exception text shown when a user tries to nudge themselves.
-#: lib/command.php:229
 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr ""
 
 #. TRANS: Message given having nudged another user.
 #. TRANS: %s is the nickname of the user that was nudged.
-#: lib/command.php:238
 #, php-format
 msgid "Nudge sent to %s."
 msgstr ""
@@ -7666,7 +6274,6 @@ msgstr ""
 #. TRANS: %1$s is the number of other user the user is subscribed to.
 #. TRANS: %2$s is the number of users that are subscribed to the user.
 #. TRANS: %3$s is the number of notices the user has sent.
-#: lib/command.php:268
 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"
@@ -7678,40 +6285,34 @@ msgstr ""
 "അറിയിപ്പുകൾ: %3$s"
 
 #. TRANS: Error message text shown when a favorite could not be set because it has already been favorited.
-#: lib/command.php:298
 #, fuzzy
 msgid "Could not create favorite: already favorited."
 msgstr "പ്രിയങ്കരങ്ങൾ സൃഷ്ടിക്കാൻ കഴിഞ്ഞില്ല."
 
 #. TRANS: Text shown when a notice has been marked as favourite successfully.
-#: lib/command.php:324
 msgid "Notice marked as fave."
 msgstr "അറിയിപ്പ് പ്രിയങ്കരമെന്ന് അടയാളപ്പെടുത്തി."
 
 #. TRANS: Message given having added a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:369
 #, php-format
 msgid "%1$s joined group %2$s."
 msgstr "%2$s എന്ന സംഘത്തിൽ %1$s എന്ന ഉപയോക്താവ് ചേർന്നു."
 
 #. TRANS: Message given having removed a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:417
 #, php-format
 msgid "%1$s left group %2$s."
 msgstr "%2$s എന്ന സംഘത്തിൽ നിന്ന് %1$s എന്ന ഉപയോക്താവ് വിട്ടുപോയി."
 
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: lib/command.php:438
 #, php-format
 msgctxt "WHOIS"
 msgid "%1$s (%2$s)"
 msgstr ""
 
 #. TRANS: Whois output. %s is the full name of the queried user.
-#: lib/command.php:442
 #, php-format
 msgid "Fullname: %s"
 msgstr "പൂർണ്ണനാമം: %s"
@@ -7719,7 +6320,6 @@ msgstr "പൂർണ്ണനാമം: %s"
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a location.
-#: lib/command.php:446 lib/mail.php:275
 #, php-format
 msgid "Location: %s"
 msgstr "സ്ഥാനം: %s"
@@ -7727,20 +6327,17 @@ msgstr "സ്ഥാനം: %s"
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a homepage.
-#: lib/command.php:450 lib/mail.php:279
 #, php-format
 msgid "Homepage: %s"
 msgstr "പ്രധാനതാൾ: %s"
 
 #. TRANS: Whois output. %s is the bio information of the queried user.
-#: lib/command.php:454
 #, php-format
 msgid "About: %s"
 msgstr "വിവരണം: %s"
 
 #. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).
 #. TRANS: %s is a remote profile.
-#: lib/command.php:483
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
@@ -7749,33 +6346,32 @@ msgstr ""
 
 #. TRANS: Message given if content is too long. %1$sd is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:500
 #, php-format
 msgid "Message too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
 msgstr[0] ""
 msgstr[1] ""
 
+#. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
+msgid "You can't send a message to this user."
+msgstr "ഈ ഉപയോക്താവിന് സന്ദേശമയയ്ക്കാൻ താങ്കൾക്കാവില്ല."
+
 #. TRANS: Error text shown sending a direct message fails with an unknown reason.
-#: lib/command.php:528
 msgid "Error sending direct message."
 msgstr "നേരിട്ടുള്ള സന്ദേശം അയക്കുന്നതിൽ പിഴവുണ്ടായി."
 
 #. TRANS: Message given having repeated a notice from another user.
 #. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:565
 #, php-format
 msgid "Notice from %s repeated."
 msgstr "%s എന്ന ഉപയോക്താവിന്റെ അറിയിപ്പ് ആവർത്തിച്ചു."
 
 #. TRANS: Error text shown when repeating a notice fails with an unknown reason.
-#: lib/command.php:568
 msgid "Error repeating notice."
 msgstr "അറിയിപ്പ് ആവർത്തിക്കുന്നതിൽ പിഴവുണ്ടായി."
 
 #. TRANS: Message given if content of a notice for a reply is too long. %1$d is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:603
 #, php-format
 msgid "Notice too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Notice too long - maximum is %1$d characters, you sent %2$d."
@@ -7784,80 +6380,66 @@ msgstr[1] ""
 
 #. TRANS: Text shown having sent a reply to a notice successfully.
 #. TRANS: %s is the nickname of the user of the notice the reply was sent to.
-#: lib/command.php:616
 #, php-format
 msgid "Reply to %s sent."
 msgstr "%s എന്ന ഉപയോക്താവിനുള്ള മറുപടി അയച്ചു."
 
 #. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
-#: lib/command.php:619
 msgid "Error saving notice."
 msgstr "അറിയിപ്പ് സേവ് ചെയ്യുന്നതിൽ പിഴവുണ്ടായി."
 
 #. TRANS: Error text shown when no username was provided when issuing a subscribe command.
-#: lib/command.php:666
 msgid "Specify the name of the user to subscribe to."
 msgstr ""
 
 #. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
-#: lib/command.php:675
 msgid "Can't subscribe to OMB profiles by command."
 msgstr ""
 
 #. TRANS: Text shown after having subscribed to another user successfully.
 #. TRANS: %s is the name of the user the subscription was requested for.
-#: lib/command.php:683
 #, php-format
 msgid "Subscribed to %s."
 msgstr ""
 
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.
-#: lib/command.php:704 lib/command.php:815
 msgid "Specify the name of the user to unsubscribe from."
 msgstr ""
 
 #. TRANS: Text shown after having unsubscribed from another user successfully.
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:715
 #, php-format
 msgid "Unsubscribed from %s."
 msgstr ""
 
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
-#: lib/command.php:735 lib/command.php:761
 msgid "Command not yet implemented."
 msgstr ""
 
 #. TRANS: Text shown when issuing the command "off" successfully.
-#: lib/command.php:739
 msgid "Notification off."
 msgstr ""
 
 #. TRANS: Error text shown when the command "off" fails for an unknown reason.
-#: lib/command.php:742
 msgid "Can't turn off notification."
 msgstr ""
 
 #. TRANS: Text shown when issuing the command "on" successfully.
-#: lib/command.php:765
 msgid "Notification on."
 msgstr ""
 
 #. TRANS: Error text shown when the command "on" fails for an unknown reason.
-#: lib/command.php:768
 msgid "Can't turn on notification."
 msgstr ""
 
 #. TRANS: Error text shown when issuing the login command while login is disabled.
-#: lib/command.php:782
 msgid "Login command is disabled."
 msgstr ""
 
 #. TRANS: Text shown after issuing the login command successfully.
 #. TRANS: %s is a logon link..
-#: lib/command.php:795
 #, php-format
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
@@ -7866,20 +6448,17 @@ msgstr ""
 
 #. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:824
 #, php-format
 msgid "Unsubscribed %s."
 msgstr ""
 
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
-#: lib/command.php:842
 msgid "You are not subscribed to anyone."
 msgstr ""
 
 #. TRANS: Text shown after requesting other users a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
-#: lib/command.php:847
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] ""
@@ -7887,14 +6466,12 @@ msgstr[1] ""
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user
 #. TRANS: (followers) without having any subscribers.
-#: lib/command.php:869
 msgid "No one is subscribed to you."
 msgstr ""
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
-#: lib/command.php:874
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] ""
@@ -7902,21 +6479,18 @@ msgstr[1] ""
 
 #. TRANS: Text shown after requesting groups a user is subscribed to without having
 #. TRANS: any group subscriptions.
-#: lib/command.php:896
 msgid "You are not a member of any groups."
 msgstr "താങ്കൾ ഒരു സംഘത്തിലേയും അംഗമല്ല."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
-#: lib/command.php:901
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "താങ്കൾ ഈ സംഘത്തിലെ അംഗമാണ്:"
 msgstr[1] "താങ്കൾ ഈ സംഘങ്ങളിലെ അംഗമാണ്:"
 
 #. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-#: lib/command.php:916
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -7959,69 +6533,56 @@ msgid ""
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:36
 msgid "No configuration file found."
 msgstr "ക്രമീകരണ പ്രമാണം കണ്ടെത്താനായില്ല."
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:39
 msgid "I looked for configuration files in the following places:"
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:42
 msgid "You may wish to run the installer to fix this."
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:46
 msgid "Go to the installer."
 msgstr ""
 
-#: lib/dberroraction.php:59
 msgid "Database error"
 msgstr "ഡാറ്റാബേസ് പിഴവ്"
 
 #. TRANS: Description of form for deleting a user.
-#: lib/deleteuserform.php:75
 msgid "Delete this user"
 msgstr "ഈ ഉപയോക്താവിനെ നീക്കം ചെയ്യുക"
 
-#: lib/designform.php:114
 #, fuzzy
 msgid "Change design"
 msgstr "രൂപകല്പന സേവ്‌ ചെയ്യുക"
 
 #. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: lib/designform.php:131
 msgid "Change colours"
 msgstr "നിറങ്ങൾ മാറ്റുക"
 
 #. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: lib/designform.php:138
 msgid "Use defaults"
 msgstr "സ്വതേയുള്ളവ ഉപയോഗിക്കുക"
 
 #. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: lib/designform.php:140
 msgid "Restore default designs"
 msgstr "സ്വതേയുള്ള രൂപകല്പനകൾ പുനഃസ്ഥാപിക്കുക"
 
 #. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: lib/designform.php:148
 msgid "Reset back to default"
 msgstr "മുമ്പ് സ്വതേയുണ്ടായിരുന്നതിലേയ്ക്ക് പുനഃസ്ഥാപിക്കുക"
 
 #. TRANS: Label in form on profile design page.
 #. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
-#: lib/designform.php:158
 msgid "Upload file"
 msgstr "പ്രമാണം അപ്‌ലോഡ് ചെയ്യുക"
 
 #. TRANS: Instructions for form on profile design page.
-#: lib/designform.php:163
 #, fuzzy
 msgid ""
 "You can upload your personal background image. The maximum file size is 2Mb."
@@ -8030,148 +6591,118 @@ msgstr ""
 "വലിപ്പം %1$s ആയിരിക്കണം."
 
 #. TRANS: Radio button on profile design page that will enable use of the uploaded profile image.
-#: lib/designform.php:194
 msgctxt "RADIO"
 msgid "On"
 msgstr "സജ്ജം"
 
 #. TRANS: Radio button on profile design page that will disable use of the uploaded profile image.
-#: lib/designform.php:211
 msgctxt "RADIO"
 msgid "Off"
 msgstr "രഹിതം"
 
 #. TRANS: Title for button on profile design page to save settings.
-#: lib/designform.php:322
 msgid "Save design"
 msgstr "രൂപകല്പന സേവ്‌ ചെയ്യുക"
 
 #. TRANS: Error message displayed if design settings could not be saved.
 #. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
-#: lib/designsettings.php:216 lib/designsettings.php:238
 msgid "Couldn't update your design."
 msgstr "താങ്കളുടെ രൂപകല്പന പുതുക്കാനായില്ല."
 
 #. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
-#: lib/designsettings.php:244
 msgid "Design defaults restored."
 msgstr "സ്വതേയുള്ള രൂപകല്പന പുനഃസ്ഥാപിച്ചിരിക്കുന്നു."
 
 #. TRANS: Exception. %s is an ID.
-#: lib/discovery.php:153
 #, php-format
 msgid "Unable to find services for %s."
 msgstr ""
 
 #. TRANS: Form legend for removing the favourite status for a favourite notice.
 #. TRANS: Title for button text for removing the favourite status for a favourite notice.
-#: lib/disfavorform.php:108 lib/disfavorform.php:140
 msgid "Disfavor this notice"
 msgstr ""
 
 #. TRANS: Button text for removing the favourite status for a favourite notice.
-#: lib/disfavorform.php:136
 msgctxt "BUTTON"
 msgid "Disfavor favorite"
 msgstr ""
 
 #. TRANS: Form legend for adding the favourite status to a notice.
 #. TRANS: Title for button text for adding the favourite status to a notice.
-#: lib/favorform.php:108 lib/favorform.php:139
 msgid "Favor this notice"
 msgstr ""
 
 #. TRANS: Button text for adding the favourite status to a notice.
-#: lib/favorform.php:135
 msgctxt "BUTTON"
 msgid "Favor"
 msgstr ""
 
-#: lib/feed.php:84
 msgid "RSS 1.0"
 msgstr "ആർ.എസ്.എസ്. 1.0"
 
-#: lib/feed.php:86
 msgid "RSS 2.0"
 msgstr "ആർ.എസ്.എസ്. 2.0"
 
-#: lib/feed.php:88
 msgid "Atom"
 msgstr "ആറ്റം"
 
-#: lib/feed.php:90
 msgid "FOAF"
 msgstr ""
 
-#: lib/feedimporter.php:75
 msgid "Not an atom feed."
 msgstr "ഒരു ആറ്റം ഫീഡ് അല്ല."
 
-#: lib/feedimporter.php:82
 msgid "No author in the feed."
 msgstr ""
 
-#: lib/feedimporter.php:89
 msgid "Can't import without a user."
 msgstr ""
 
 #. TRANS: Header for feed links (h2).
-#: lib/feedlist.php:66
 msgid "Feeds"
 msgstr "ഫീഡ്"
 
-#: lib/galleryaction.php:128
 msgid "All"
 msgstr "എല്ലാം"
 
-#: lib/galleryaction.php:136
 msgid "Select tag to filter"
 msgstr ""
 
-#: lib/galleryaction.php:137
 msgid "Tag"
 msgstr "റ്റാഗ്"
 
-#: lib/galleryaction.php:138
 msgid "Choose a tag to narrow list"
 msgstr ""
 
-#: lib/galleryaction.php:140
 msgid "Go"
 msgstr "പോകൂ"
 
-#: lib/grantroleform.php:91
 #, php-format
 msgid "Grant this user the \"%s\" role"
 msgstr ""
 
-#: lib/groupeditform.php:147
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr ""
 
-#: lib/groupeditform.php:156
 msgid "URL of the homepage or blog of the group or topic."
 msgstr ""
 
-#: lib/groupeditform.php:161
 msgid "Describe the group or topic"
 msgstr "സംഘത്തെക്കുറിച്ചോ വിഷയത്തെക്കുറിച്ചോ വിവരിക്കുക"
 
-#: lib/groupeditform.php:163
 #, fuzzy, php-format
 msgid "Describe the group or topic in %d character or less"
 msgid_plural "Describe the group or topic in %d characters or less"
 msgstr[0] "സംഘത്തെക്കുറിച്ചോ വിഷയത്തെക്കുറിച്ചോ %d അക്ഷരത്തിൽ കൂടാതെ വിവരിക്കുക."
 msgstr[1] "സംഘത്തെക്കുറിച്ചോ വിഷയത്തെക്കുറിച്ചോ %d അക്ഷരങ്ങളിൽ കൂടാതെ വിവരിക്കുക."
 
-#: lib/groupeditform.php:175
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\"."
 msgstr ""
 "സംഘത്തിന്റെ പ്രദേശം, അങ്ങനെയൊന്നുണ്ടെങ്കിൽ - ഉദാ: \"പട്ടണം, സംസ്ഥാനം (അഥവാ പ്രദേശം), "
 "രാജ്യം\"."
 
-#: lib/groupeditform.php:183
 #, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -8183,70 +6714,60 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Menu item in the group navigation page.
-#: lib/groupnav.php:86
 msgctxt "MENU"
 msgid "Group"
 msgstr "സംഘം"
 
 #. TRANS: Tooltip for menu item in the group navigation page.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:89
 #, php-format
 msgctxt "TOOLTIP"
 msgid "%s group"
 msgstr "%s സംഘം"
 
 #. TRANS: Menu item in the group navigation page.
-#: lib/groupnav.php:95
 msgctxt "MENU"
 msgid "Members"
 msgstr "അംഗങ്ങൾ"
 
 #. TRANS: Tooltip for menu item in the group navigation page.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:98
 #, php-format
 msgctxt "TOOLTIP"
 msgid "%s group members"
 msgstr "%s സംഘ അംഗങ്ങൾ"
 
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/groupnav.php:108
 msgctxt "MENU"
 msgid "Blocked"
 msgstr "തടയപ്പെട്ടിരിക്കുന്നു"
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:111
 #, php-format
 msgctxt "TOOLTIP"
 msgid "%s blocked users"
 msgstr "%s തടയപ്പെട്ട ഉപയോക്താക്കൾ"
 
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "കാര്യനിർവാഹക(ൻ)"
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:120
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Edit %s group properties"
 msgstr ""
 
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/groupnav.php:126
 msgctxt "MENU"
 msgid "Logo"
 msgstr "ലോഗോ"
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:129
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Add or edit %s logo"
@@ -8254,69 +6775,57 @@ msgstr ""
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:138
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Add or edit %s design"
 msgstr "%s എന്ന സംഘത്തിനു രൂപകല്പന കൂട്ടിച്ചേർക്കുക അല്ലെങ്കിൽ മാറ്റം വരുത്തുക"
 
 #. TRANS: Title for groups with the most members section.
-#: lib/groupsbymemberssection.php:71
 msgid "Groups with most members"
 msgstr ""
 
 #. TRANS: Title for groups with the most posts section.
-#: lib/groupsbypostssection.php:71
 msgid "Groups with most posts"
 msgstr ""
 
 #. TRANS: Title for group tag cloud section.
 #. TRANS: %s is a group name.
-#: lib/grouptagcloudsection.php:57
 #, php-format
 msgid "Tags in %s group's notices"
 msgstr ""
 
 #. TRANS: Client exception 406
-#: lib/htmloutputter.php:104
 msgid "This page is not available in a media type you accept"
 msgstr ""
 
 #. TRANS: Exception thrown when trying to upload an unsupported image file format.
-#: lib/imagefile.php:73
 msgid "Unsupported image file format."
 msgstr "ചിത്രത്തിന്റെ തരത്തിനു പിന്തുണയില്ല."
 
 #. TRANS: Exception thrown when too large a file is uploaded.
 #. TRANS: %s is the maximum file size, for example "500b", "10kB" or "2MB".
-#: lib/imagefile.php:91
 #, php-format
 msgid "That file is too big. The maximum file size is %s."
 msgstr ""
 
 #. TRANS: Exception thrown when uploading an image and that action could not be completed.
-#: lib/imagefile.php:97
 msgid "Partial upload."
 msgstr "ഭാഗിക അപ്‌ലോഡ്."
 
 #. TRANS: Exception thrown when uploading a file as image that is not an image or is a corrupt file.
-#: lib/imagefile.php:115
 msgid "Not an image or corrupt file."
 msgstr "ഒന്നുകിൽ ചിത്രമല്ല അല്ലെങ്കിൽ ചിത്രത്തിൽ പിഴവുണ്ട്."
 
 #. TRANS: Exception thrown during resize when image has been registered as present, but is no longer there.
-#: lib/imagefile.php:178
 msgid "Lost our file."
 msgstr "ഞങ്ങളുടെ പ്രമാണം നഷ്ടപ്പെട്ടു."
 
 #. TRANS: Exception thrown when trying to resize an unknown file type.
 #. TRANS: Exception thrown when trying resize an unknown file type.
-#: lib/imagefile.php:216 lib/imagefile.php:257
 msgid "Unknown file type"
 msgstr "അപരിചിതമായ തരം പ്രമാണം"
 
 #. TRANS: Number of megabytes. %d is the number.
-#: lib/imagefile.php:303
 #, php-format
 msgid "%dMB"
 msgid_plural "%dMB"
@@ -8324,7 +6833,6 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Number of kilobytes. %d is the number.
-#: lib/imagefile.php:307
 #, php-format
 msgid "%dkB"
 msgid_plural "%dkB"
@@ -8332,14 +6840,12 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Number of bytes. %d is the number.
-#: lib/imagefile.php:310
 #, php-format
 msgid "%dB"
 msgid_plural "%dB"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/implugin.php:262
 #, php-format
 msgid ""
 "User \"%s\" on %s has said that your %s screenname belongs to them. If "
@@ -8349,52 +6855,43 @@ msgid ""
 "message."
 msgstr ""
 
-#: lib/implugin.php:349
 #, php-format
 msgid "Unknown inbox source %d."
 msgstr ""
 
-#: lib/implugin.php:485
 #, fuzzy, php-format
 msgid "Message too long - maximum is %1$d characters, you sent %2$d."
 msgstr ""
 "സന്ദേശത്തിന് നീളം കൂടുതലാണ്. പരമാവധി %1$d അക്ഷരം മാത്രം, താങ്കൾ അയച്ചത് %2$d അക്ഷരങ്ങൾ."
 
-#: lib/leaveform.php:114
 msgid "Leave"
 msgstr "ഒഴിവായി പോവുക"
 
 #. TRANS: Menu item for logging in to the StatusNet site.
-#: lib/logingroupnav.php:77
 msgctxt "MENU"
 msgid "Login"
 msgstr "പ്രവേശിക്കുക"
 
 #. TRANS: Title for menu item for logging in to the StatusNet site.
-#: lib/logingroupnav.php:79
 msgid "Login with a username and password"
 msgstr "ഉപയോക്തൃനാമവും രഹസ്യവാക്കും ഉപയോഗിച്ച് ലോഗിൻ ചെയ്യുക"
 
 #. TRANS: Menu item for registering with the StatusNet site.
-#: lib/logingroupnav.php:85
 msgctxt "MENU"
 msgid "Register"
 msgstr "രജിസ്റ്റർ"
 
 #. TRANS: Title for menu item for registering with the StatusNet site.
-#: lib/logingroupnav.php:87
 msgid "Sign up for a new account"
 msgstr "പുതിയൊരംഗത്വം എടുക്കുക"
 
 #. TRANS: Subject for address confirmation email.
-#: lib/mail.php:172
 msgid "Email address confirmation"
 msgstr "ഇമെയിൽ വിലാസത്തിന്റെ സ്ഥിരീകരണം"
 
 #. TRANS: Body for address confirmation email.
 #. TRANS: %1$s is the addressed user's nickname, %2$s is the StatusNet sitename,
 #. TRANS: %3$s is the URL to confirm at.
-#: lib/mail.php:177
 #, php-format
 msgid ""
 "Hey, %1$s.\n"
@@ -8413,14 +6910,12 @@ msgstr ""
 
 #. TRANS: Subject of new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
-#: lib/mail.php:243
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr ""
 
 #. TRANS: This is a paragraph in a new-subscriber e-mail.
 #. TRANS: %s is a URL where the subscriber can be reported as abusive.
-#: lib/mail.php:250
 #, php-format
 msgid ""
 "If you believe this account is being used abusively, you can block them from "
@@ -8432,7 +6927,6 @@ msgstr ""
 #. TRANS: %3$s is the subscriber's profile URL, %4$s is the subscriber's location (or empty)
 #. TRANS: %5$s is the subscriber's homepage URL (or empty), %6%s is the subscriber's bio (or empty)
 #. TRANS: %7$s is a link to the addressed user's e-mail settings.
-#: lib/mail.php:260
 #, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -8449,14 +6943,12 @@ msgstr ""
 
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is biographical information.
-#: lib/mail.php:283
 #, php-format
 msgid "Bio: %s"
 msgstr ""
 
 #. TRANS: Subject of notification mail for new posting email address.
 #. TRANS: %s is the StatusNet sitename.
-#: lib/mail.php:312
 #, php-format
 msgid "New email address for posting to %s"
 msgstr "%s സൈറ്റിൽ പ്രസിദ്ധീകരിക്കാനുള്ള പുതിയ ഇമെയിൽ വിലാസം"
@@ -8464,7 +6956,6 @@ msgstr "%s സൈറ്റിൽ പ്രസിദ്ധീകരിക്ക
 #. TRANS: Body of notification mail for new posting email address.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is the e-mail address to send
 #. TRANS: to to post by e-mail, %3$s is a URL to more instructions.
-#: lib/mail.php:318
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -8479,26 +6970,22 @@ msgstr ""
 
 #. TRANS: Subject line for SMS-by-email notification messages.
 #. TRANS: %s is the posting user's nickname.
-#: lib/mail.php:439
 #, php-format
 msgid "%s status"
 msgstr "%s സ്ഥിതി"
 
 #. TRANS: Subject line for SMS-by-email address confirmation message.
-#: lib/mail.php:465
 msgid "SMS confirmation"
 msgstr "എസ്.എം.എസ്. സ്ഥിരീകരണം"
 
 #. TRANS: Main body heading for SMS-by-email address confirmation message.
 #. TRANS: %s is the addressed user's nickname.
-#: lib/mail.php:469
 #, php-format
 msgid "%s: confirm you own this phone number with this code:"
 msgstr "%s: താങ്കളുടെ സ്വന്തം ഫോൺ നമ്പർ ഈ കോഡ് ഉപയോഗിച്ച് സ്ഥിരീകരിക്കുക:"
 
 #. TRANS: Subject for 'nudge' notification email.
 #. TRANS: %s is the nudging user.
-#: lib/mail.php:490
 #, php-format
 msgid "You have been nudged by %s"
 msgstr ""
@@ -8506,7 +6993,6 @@ msgstr ""
 #. TRANS: Body for 'nudge' notification email.
 #. TRANS: %1$s is the nuding user's long name, $2$s is the nudging user's nickname,
 #. TRANS: %3$s is a URL to post notices at, %4$s is the StatusNet sitename.
-#: lib/mail.php:497
 #, php-format
 msgid ""
 "%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -8524,7 +7010,6 @@ msgstr ""
 
 #. TRANS: Subject for direct-message notification email.
 #. TRANS: %s is the sending user's nickname.
-#: lib/mail.php:544
 #, php-format
 msgid "New private message from %s"
 msgstr "%s അയച്ച സ്വകാര്യ സന്ദേശങ്ങൾ"
@@ -8533,7 +7018,6 @@ msgstr "%s അയച്ച സ്വകാര്യ സന്ദേശങ്ങ
 #. TRANS: %1$s is the sending user's long name, %2$s is the sending user's nickname,
 #. TRANS: %3$s is the message content, %4$s a URL to the message,
 #. TRANS: %5$s is the StatusNet sitename.
-#: lib/mail.php:552
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -8554,7 +7038,6 @@ msgstr ""
 
 #. TRANS: Subject for favorite notification e-mail.
 #. TRANS: %1$s is the adding user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:604
 #, php-format
 msgid "%1$s (@%2$s) added your notice as a favorite"
 msgstr ""
@@ -8564,7 +7047,6 @@ msgstr ""
 #. TRANS: %3$s is a URL to the faved notice, %4$s is the faved notice text,
 #. TRANS: %5$s is a URL to all faves of the adding user, %6$s is the StatusNet sitename,
 #. TRANS: %7$s is the adding user's nickname.
-#: lib/mail.php:611
 #, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -8586,7 +7068,6 @@ msgid ""
 msgstr ""
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:669
 #, php-format
 msgid ""
 "The full conversation can be read here:\n"
@@ -8599,7 +7080,6 @@ msgstr ""
 
 #. TRANS: E-mail subject for notice notification.
 #. TRANS: %1$s is the sending user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:677
 #, php-format
 msgid "%1$s (@%2$s) sent a notice to your attention"
 msgstr "%1$s (@%2$s) താങ്കളുടെ ശ്രദ്ധയ്ക്കായി ഒരു അറിയിപ്പ് അയച്ചിരിക്കുന്നു"
@@ -8610,7 +7090,6 @@ msgstr "%1$s (@%2$s) താങ്കളുടെ ശ്രദ്ധയ്ക്
 #. TRANS: %5$s is a URL to the full conversion if it exists (otherwise empty),
 #. TRANS: %6$s is a URL to reply to the notice, %7$s is a URL to all @-replied for the addressed user,
 #. TRANS: %8$s is a URL to the addressed user's e-mail settings, %9$s is the sender's nickname.
-#: lib/mail.php:685
 #, php-format
 msgid ""
 "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -8637,11 +7116,9 @@ msgid ""
 "P.S. You can turn off these email notifications here: %8$s\n"
 msgstr ""
 
-#: lib/mailbox.php:87
 msgid "Only the user can read their own mailboxes."
 msgstr "ഉപയോക്താവിനു മാത്രമേ അദ്ദേഹത്തിന്റെ സ്വന്തം മെയിൽബോക്സ് വായിക്കാനാകൂ."
 
-#: lib/mailbox.php:125
 msgid ""
 "You have no private messages. You can send private message to engage other "
 "users in conversation. People can send you messages for your eyes only."
@@ -8650,53 +7127,43 @@ msgstr ""
 "സന്ദേശങ്ങൾ അയയ്ക്കാവുന്നതാണ്. താങ്കൾക്ക് മാത്രം കാണാവുന്ന സന്ദേശങ്ങൾ അയയ്ക്കാൻ മറ്റുള്ളവർക്കും "
 "കഴിയുന്നതാണ്."
 
-#: lib/mailhandler.php:37
 msgid "Could not parse message."
 msgstr ""
 
-#: lib/mailhandler.php:42
 msgid "Not a registered user."
 msgstr "അംഗത്വമുള്ള ഉപയോക്താവല്ല."
 
-#: lib/mailhandler.php:46
 msgid "Sorry, that is not your incoming email address."
 msgstr "ക്ഷമിക്കുക, അത് താങ്കളുടെ ഇൻകമിങ് ഇമെയിൽ വിലാസം അല്ല."
 
-#: lib/mailhandler.php:50
 msgid "Sorry, no incoming email allowed."
 msgstr "ക്ഷമിക്കുക, ഇങ്ങോട്ട് ഇമെയിൽ അനുവദിച്ചിട്ടില്ല."
 
-#: lib/mailhandler.php:229
 #, php-format
 msgid "Unsupported message type: %s"
 msgstr "പിന്തുണയില്ലാത്ത തരം സന്ദേശം: %s"
 
 #. TRANS: Client exception thrown when a database error was thrown during a file upload operation.
-#: lib/mediafile.php:102 lib/mediafile.php:174
 msgid "There was a database error while saving your file. Please try again."
 msgstr "താങ്കളുടെ പ്രമാണം സേവ് ചെയ്തപ്പോൾ ഡേറ്റാബേസ് പിഴവുണ്ടായി. ദയവായി വീണ്ടും ശ്രമിക്കുക."
 
 #. TRANS: Client exception thrown when a file upload operation would cause a user to exceed a set quota.
-#: lib/mediafile.php:238 lib/mediafile.php:281
 msgid "File exceeds user's quota."
 msgstr ""
 
 #. TRANS: Client exception thrown when a file upload operation fails because the file could
 #. TRANS: not be moved from the temporary folder to the permanent file location.
-#: lib/mediafile.php:258 lib/mediafile.php:300
 msgid "File could not be moved to destination directory."
 msgstr ""
 
 #. TRANS: Client exception thrown when a file upload operation has been stopped because the MIME
 #. TRANS: type of the uploaded file could not be determined.
-#: lib/mediafile.php:265 lib/mediafile.php:306
 msgid "Could not determine file's MIME type."
 msgstr "പ്രമാണത്തിന്റെ മൈം തരം നിർണ്ണയിക്കാനായില്ല."
 
 #. TRANS: Client exception thrown trying to upload a forbidden MIME type.
 #. TRANS: %1$s is the file type that was denied, %2$s is the application part of
 #. TRANS: the MIME type that was denied.
-#: lib/mediafile.php:396
 #, php-format
 msgid ""
 "\"%1$s\" is not a supported file type on this server. Try using another %2$s "
@@ -8706,81 +7173,72 @@ msgstr ""
 
 #. TRANS: Client exception thrown trying to upload a forbidden MIME type.
 #. TRANS: %s is the file type that was denied.
-#: lib/mediafile.php:401
 #, php-format
 msgid "\"%s\" is not a supported file type on this server."
 msgstr "\"%s\" എന്ന തരം പ്രമാണത്തിന് ഈ സെർവറിൽ പിന്തുണയില്ല."
 
-#: lib/messageform.php:120
 msgid "Send a direct notice"
 msgstr "അറിയിപ്പ് നേരിട്ട് അയയ്ക്കുക"
 
 #. TRANS Label entry in drop-down selection box in direct-message inbox/outbox. This is the default entry in the drop-down box, doubling as instructions and a brake against accidental submissions with the first user in the list.
-#: lib/messageform.php:137
 msgid "Select recipient:"
 msgstr "സ്വീകർത്താവിനെ തിരഞ്ഞെടുക്കുക:"
 
 #. TRANS Entry in drop-down selection box in direct-message inbox/outbox when no one is available to message.
-#: lib/messageform.php:150
 msgid "No mutual subscribers."
 msgstr ""
 
-#: lib/messageform.php:153
 msgid "To"
 msgstr "സ്വീകർത്താവ്"
 
-#: lib/messageform.php:184 lib/noticeform.php:236
 msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr "അയക്കുക"
 
-#: lib/messagelist.php:77
 msgid "Messages"
 msgstr "സന്ദേശങ്ങൾ"
 
-#: lib/messagelistitem.php:123 lib/noticelist.php:527
 msgid "from"
 msgstr "അയച്ചത്"
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:178
 msgid "Nickname cannot be empty."
 msgstr "വിളിപ്പേര് ശൂന്യമായിരിക്കാൻ പാടില്ല."
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:191
 #, php-format
 msgid "Nickname cannot be more than %d character long."
 msgid_plural "Nickname cannot be more than %d characters long."
 msgstr[0] "വിളിപ്പേര് %d അക്ഷരത്തിലധികം ഉണ്ടാകരുത്."
 msgstr[1] "വിളിപ്പേര് %d അക്ഷരങ്ങളിലധികം ഉണ്ടാകരുത്."
 
-#: lib/noticeform.php:160
+#. TRANS: Form legend for notice form.
 msgid "Send a notice"
 msgstr "അറിയിപ്പ് അയയ്ക്കുക"
 
-#: lib/noticeform.php:174
+#. TRANS: Title for notice label. %s is the user's nickname.
 #, php-format
 msgid "What's up, %s?"
 msgstr "എന്തൊക്കെയുണ്ട്, %s?"
 
-#: lib/noticeform.php:193
+#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr "ചേർത്തുവെയ്ക്കുക"
 
-#: lib/noticeform.php:197
-msgid "Attach a file"
+#. TRANS: Title for input field to attach a file to a notice.
+#, fuzzy
+msgid "Attach a file."
 msgstr "പ്രമാണം ചേർത്തു വെയ്ക്കുക"
 
-#: lib/noticeform.php:212
+#. TRANS: Field label to add location to a notice.
 msgid "Share my location"
 msgstr "എന്റെ സ്ഥാനം പങ്ക് വെയ്ക്കുക"
 
-#: lib/noticeform.php:215
+#. TRANS: Text to not share location for a notice in notice form.
 msgid "Do not share my location"
 msgstr "എന്റെ സ്ഥാനം പങ്ക് വെയ്ക്കരുത്"
 
-#: lib/noticeform.php:216
+#. TRANS: Timeout error text for location retrieval in notice form.
 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
 "try again later"
@@ -8789,416 +7247,317 @@ msgstr ""
 "വീണ്ടും ശ്രമിക്കുക"
 
 #. TRANS: Used in coordinates as abbreviation of north
-#: lib/noticelist.php:457
 msgid "N"
 msgstr "വ"
 
 #. TRANS: Used in coordinates as abbreviation of south
-#: lib/noticelist.php:459
 msgid "S"
 msgstr "തെ"
 
 #. TRANS: Used in coordinates as abbreviation of east
-#: lib/noticelist.php:461
 msgid "E"
 msgstr "കി"
 
 #. TRANS: Used in coordinates as abbreviation of west
-#: lib/noticelist.php:463
 msgid "W"
 msgstr "പ"
 
-#: lib/noticelist.php:465
 #, php-format
 msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgstr ""
 
-#: lib/noticelist.php:474
 msgid "at"
 msgstr ""
 
-#: lib/noticelist.php:523
 msgid "web"
 msgstr "വെബ്"
 
-#: lib/noticelist.php:589
 msgid "in context"
 msgstr ""
 
-#: lib/noticelist.php:624
 msgid "Repeated by"
 msgstr "ആവർത്തിച്ചത്"
 
-#: lib/noticelist.php:651
 msgid "Reply to this notice"
 msgstr "ഈ അറിയിപ്പിന് മറുപടിയിടുക"
 
-#: lib/noticelist.php:652
 msgid "Reply"
 msgstr "മറുപടി"
 
-#: lib/noticelist.php:678
 msgid "Delete this notice"
 msgstr "ഈ അറിയിപ്പ് മായ്ക്കുക"
 
-#: lib/noticelist.php:696
 msgid "Notice repeated"
 msgstr "അറിയിപ്പ് ആവർത്തിച്ചിരിക്കുന്നു"
 
-#: lib/nudgeform.php:116
 msgid "Nudge this user"
 msgstr ""
 
-#: lib/nudgeform.php:128
 msgid "Nudge"
 msgstr ""
 
-#: lib/nudgeform.php:128
 msgid "Send a nudge to this user"
 msgstr ""
 
-#: lib/oauthstore.php:294
 msgid "Error inserting new profile."
 msgstr ""
 
-#: lib/oauthstore.php:302
 msgid "Error inserting avatar."
 msgstr ""
 
-#: lib/oauthstore.php:322
 msgid "Error inserting remote profile."
 msgstr ""
 
 #. TRANS: Exception thrown when a notice is denied because it has been sent before.
-#: lib/oauthstore.php:362
 msgid "Duplicate notice."
 msgstr "അറിയിപ്പിന്റെ പകർപ്പ്."
 
-#: lib/oauthstore.php:507
 msgid "Couldn't insert new subscription."
 msgstr ""
 
-#: lib/personalgroupnav.php:104
-#, fuzzy
 msgid "Replies"
 msgstr "മറുപടികൾ"
 
-#: lib/personalgroupnav.php:109
 #, fuzzy
 msgid "Favorites"
 msgstr "%s എന്ന ഉപയോക്താവിന് പ്രിയങ്കരമായവ"
 
-#: lib/personalgroupnav.php:120
-#, fuzzy
 msgid "Inbox"
 msgstr "ഇൻബോക്സ്"
 
-#: lib/personalgroupnav.php:121
 msgid "Your incoming messages"
 msgstr "താങ്കൾക്ക് വരുന്ന സന്ദേശങ്ങൾ"
 
-#: lib/personalgroupnav.php:125
-#, fuzzy
 msgid "Outbox"
 msgstr "ഔട്ട്ബോക്സ്"
 
-#: lib/personalgroupnav.php:126
 msgid "Your sent messages"
 msgstr "താങ്കൾ അയച്ച സന്ദേശങ്ങൾ"
 
 #. TRANS: Title for personal tag cloud section. %s is a user nickname.
-#: lib/personaltagcloudsection.php:56
 #, php-format
 msgid "Tags in %s's notices"
 msgstr ""
 
 #. TRANS: Displayed as version information for a plugin if no version information was found.
-#: lib/plugin.php:126
 msgid "Unknown"
 msgstr "അജ്ഞാതം"
 
 #. TRANS: Plugin admin panel controls
-#: lib/plugindisableform.php:90
 msgctxt "plugin"
 msgid "Disable"
 msgstr ""
 
 #. TRANS: Plugin admin panel controls
-#: lib/pluginenableform.php:112
 msgctxt "plugin"
 msgid "Enable"
 msgstr ""
 
-#: lib/pluginlist.php:196
 msgctxt "plugin-description"
 msgid "(Plugin descriptions unavailable when disabled.)"
 msgstr ""
 
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:88
 msgid "Subscriptions"
 msgstr ""
 
 #. TRANS: Text for user subscription statistics if user has more subscriptions than displayed.
-#: lib/profileaction.php:144
 msgid "All subscriptions"
 msgstr ""
 
 #. TRANS: H2 text for user subscriber statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:96
 msgid "Subscribers"
 msgstr "വരിക്കാർ"
 
 #. TRANS: Text for user subscription statistics if user has more subscribers than displayed.
-#: lib/profileaction.php:181
 msgid "All subscribers"
 msgstr "എല്ലാ വരിക്കാരും"
 
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:213
 msgid "User ID"
 msgstr "ഉപയോക്തൃ ഐ.ഡി"
 
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:219
 msgid "Member since"
 msgstr "അംഗമായത്"
 
 #. TRANS: Label for user statistics.
 #. TRANS: H2 text for user group membership statistics.
-#: lib/profileaction.php:239 lib/profileaction.php:290
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:104
 msgid "Groups"
 msgstr "സംഘങ്ങൾ"
 
 #. TRANS: Label for user statistics.
 #. TRANS: Average count of posts made per day since account registration.
-#: lib/profileaction.php:253
 msgid "Daily average"
 msgstr "ദൈനിക ശരാശരി"
 
 #. TRANS: Text for user group membership statistics if user has more subscriptions than displayed.
-#: lib/profileaction.php:305
 msgid "All groups"
 msgstr "എല്ലാ സംഘങ്ങളും"
 
 #. TRANS: Server error displayed when using an unimplemented method.
-#: lib/profileformaction.php:123
 msgid "Unimplemented method."
 msgstr ""
 
-#: lib/publicgroupnav.php:82
 msgid "User groups"
 msgstr "ഉപയോക്തൃ സംഘങ്ങൾ"
 
-#: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
 msgid "Recent tags"
 msgstr "സമീപകാല റ്റാഗുകൾ"
 
-#: lib/publicgroupnav.php:88
 msgid "Featured"
 msgstr "തിരഞ്ഞെടുക്കപ്പെട്ടത്"
 
-#: lib/publicgroupnav.php:92
 msgid "Popular"
 msgstr "ജനപ്രിയം"
 
-#: lib/redirectingaction.php:95
 msgid "No return-to arguments."
 msgstr ""
 
-#: lib/repeatform.php:107
 msgid "Repeat this notice?"
 msgstr "ഈ അറിയിപ്പ് ആവർത്തിക്കണോ?"
 
-#: lib/repeatform.php:132
 msgid "Yes"
 msgstr "അതെ"
 
-#: lib/repeatform.php:132
 msgid "Repeat this notice"
 msgstr "ഈ അറിയിപ്പ് ആവർത്തിക്കുക"
 
-#: lib/revokeroleform.php:91
 #, php-format
 msgid "Revoke the \"%s\" role from this user"
 msgstr ""
 
 #. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:1001
 msgid "Page not found."
 msgstr "താൾ കണ്ടെത്താനായില്ല."
 
-#: lib/sandboxform.php:67
 msgid "Sandbox"
 msgstr "എഴുത്തുകളരി"
 
-#: lib/sandboxform.php:78
 msgid "Sandbox this user"
 msgstr "ഈ ഉപയോക്താവിന്റെ എഴുത്തുകളരി"
 
 #. TRANS: Fieldset legend for the search form.
-#: lib/searchaction.php:120
 msgid "Search site"
 msgstr "സൈറ്റിൽ തിരയുക"
 
 #. TRANS: Used as a field label for the field where one or more keywords
 #. TRANS: for searching can be entered.
-#: lib/searchaction.php:128
 msgid "Keyword(s)"
 msgstr "അടയാളവാക്ക്(വാക്കുകൾ)"
 
 #. TRANS: Button text for searching site.
-#: lib/searchaction.php:130
 msgctxt "BUTTON"
 msgid "Search"
 msgstr "തിരയുക"
 
-#: lib/searchgroupnav.php:80
 msgid "People"
 msgstr "ജനങ്ങൾ"
 
-#: lib/searchgroupnav.php:81
 msgid "Find people on this site"
 msgstr "ഈ സൈറ്റിലെ ആൾക്കാരെ കണ്ടെത്തുക"
 
-#: lib/searchgroupnav.php:83
 msgid "Find content of notices"
 msgstr "അറിയിപ്പുകളുടെ ഉള്ളടക്കം കണ്ടെത്തുക"
 
-#: lib/searchgroupnav.php:85
 msgid "Find groups on this site"
 msgstr "ഈ സൈറ്റിലെ സംഘങ്ങൾ കണ്ടെത്തുക"
 
-#: lib/section.php:89
 msgid "Untitled section"
 msgstr "തലക്കെട്ടില്ലാത്ത ഭാഗം"
 
-#: lib/section.php:106
 msgid "More..."
 msgstr "കൂടുതൽ..."
 
-#: lib/settingsnav.php:78
 msgid "Change your profile settings"
 msgstr ""
 
-#: lib/settingsnav.php:83
 msgid "Upload an avatar"
 msgstr ""
 
-#: lib/settingsnav.php:88
 msgid "Change your password"
 msgstr "താങ്കളുടെ രഹസ്യവാക്ക് മാറ്റുക"
 
-#: lib/settingsnav.php:93
 msgid "Change email handling"
 msgstr "ഇമെയിൽ കൈകാര്യരീതിയിൽ മാറ്റം വരുത്തുക"
 
-#: lib/settingsnav.php:98
 msgid "Design your profile"
 msgstr ""
 
-#: lib/settingsnav.php:102
 msgid "URL"
 msgstr "യൂ.ആർ.എൽ."
 
-#: lib/settingsnav.php:103
 msgid "URL shorteners"
 msgstr ""
 
-#: lib/settingsnav.php:111
 msgid "Updates by instant messenger (IM)"
 msgstr ""
 
-#: lib/settingsnav.php:118
 msgid "Updates by SMS"
 msgstr ""
 
-#: lib/settingsnav.php:123
 #, fuzzy
 msgid "Connections"
 msgstr "ബന്ധങ്ങൾ"
 
-#: lib/settingsnav.php:124
 msgid "Authorized connected applications"
 msgstr ""
 
-#: lib/silenceform.php:67
 msgid "Silence"
 msgstr "നിശബ്ദമാക്കുക"
 
-#: lib/silenceform.php:78
 msgid "Silence this user"
 msgstr "ഈ ഉപയോക്താവിനെ നിശബ്ദനാക്കുക"
 
-#: lib/subgroupnav.php:89
 #, php-format
 msgid "People %s subscribes to"
 msgstr ""
 
-#: lib/subgroupnav.php:97
 #, php-format
 msgid "People subscribed to %s"
 msgstr ""
 
-#: lib/subgroupnav.php:105
 #, php-format
 msgid "Groups %s is a member of"
 msgstr ""
 
-#: lib/subgroupnav.php:111
 msgid "Invite"
 msgstr "ക്ഷണിക്കുക"
 
-#: lib/subgroupnav.php:112
 #, php-format
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "%s-ൽ നമ്മോടൊപ്പം ചേരാൻ സുഹൃത്തുക്കളേയും സഹപ്രവർത്തകരേയും ക്ഷണിക്കുക"
 
-#: lib/subscribeform.php:115 lib/subscribeform.php:139
 msgid "Subscribe to this user"
 msgstr "ഈ ഉപയോക്താവിന്റെ വരിക്കാരൻ/വരിക്കാരി ആകുക"
 
-#: lib/subscriberspeopleselftagcloudsection.php:48
-#: lib/subscriptionspeopleselftagcloudsection.php:48
 msgid "People Tagcloud as self-tagged"
 msgstr ""
 
-#: lib/subscriberspeopletagcloudsection.php:48
-#: lib/subscriptionspeopletagcloudsection.php:48
 msgid "People Tagcloud as tagged"
 msgstr ""
 
-#: lib/tagcloudsection.php:56
 msgid "None"
 msgstr "ഒന്നുമില്ല"
 
 #. TRANS: Server exception displayed if a theme name was invalid.
-#: lib/theme.php:74
 msgid "Invalid theme name."
 msgstr "ദൃശ്യരൂപത്തിന്റെ പേര് അസാധുവാണ്."
 
-#: lib/themeuploader.php:50
 msgid "This server cannot handle theme uploads without ZIP support."
 msgstr ""
 
-#: lib/themeuploader.php:58 lib/themeuploader.php:61
 msgid "The theme file is missing or the upload failed."
 msgstr "ദൃശ്യരൂപത്തിനുള്ള പ്രമാണം ലഭ്യമല്ല അല്ലെങ്കിൽ അപ്‌ലോഡ് പരാജയപ്പെട്ടു."
 
-#: lib/themeuploader.php:91 lib/themeuploader.php:102
-#: lib/themeuploader.php:279 lib/themeuploader.php:283
-#: lib/themeuploader.php:291 lib/themeuploader.php:298
 msgid "Failed saving theme."
 msgstr "ദൃശ്യരൂപം സേവ് ചെയ്യുന്നതിൽ പരാജയപ്പെട്ടു."
 
-#: lib/themeuploader.php:147
 msgid "Invalid theme: bad directory structure."
 msgstr ""
 
-#: lib/themeuploader.php:166
 #, php-format
 msgid "Uploaded theme is too large; must be less than %d byte uncompressed."
 msgid_plural ""
@@ -9206,151 +7565,121 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/themeuploader.php:179
 msgid "Invalid theme archive: missing file css/display.css"
 msgstr ""
 
-#: lib/themeuploader.php:219
 msgid ""
 "Theme contains invalid file or folder name. Stick with ASCII letters, "
 "digits, underscore, and minus sign."
 msgstr ""
 
-#: lib/themeuploader.php:225
 msgid "Theme contains unsafe file extension names; may be unsafe."
 msgstr ""
 
-#: lib/themeuploader.php:242
 #, php-format
 msgid "Theme contains file of type '.%s', which is not allowed."
 msgstr ""
 
-#: lib/themeuploader.php:260
 msgid "Error opening theme archive."
 msgstr ""
 
-#: lib/threadednoticelist.php:270
-#, php-format
-msgid "Show all %d comment"
-msgid_plural "Show all %d comments"
-msgstr[0] ""
-msgstr[1] ""
+#, fuzzy, php-format
+msgid "Show %d reply"
+msgid_plural "Show all %d replies"
+msgstr[0] "കൂടുതൽ പ്രദർശിപ്പിക്കുക"
+msgstr[1] "കൂടുതൽ പ്രദർശിപ്പിക്കുക"
 
-#: lib/topposterssection.php:74
 msgid "Top posters"
 msgstr ""
 
 #. TRANS: Title for the form to unblock a user.
-#: lib/unblockform.php:67
 msgctxt "TITLE"
 msgid "Unblock"
 msgstr "തടയൽ നീക്കുക"
 
-#: lib/unsandboxform.php:69
 msgid "Unsandbox"
 msgstr ""
 
-#: lib/unsandboxform.php:80
 msgid "Unsandbox this user"
 msgstr ""
 
-#: lib/unsilenceform.php:67
 msgid "Unsilence"
 msgstr ""
 
-#: lib/unsilenceform.php:78
 msgid "Unsilence this user"
 msgstr ""
 
-#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
 msgid "Unsubscribe from this user"
 msgstr ""
 
-#: lib/unsubscribeform.php:137
 msgid "Unsubscribe"
 msgstr ""
 
 #. 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).
-#: lib/usernoprofileexception.php:60
 #, php-format
 msgid "User %1$s (%2$d) has no profile record."
 msgstr ""
 
-#: lib/userprofile.php:116
 msgid "Edit Avatar"
 msgstr ""
 
 #. TRANS: H2 for user actions in a profile.
 #. TRANS: H2 for entity actions in a profile.
-#: lib/userprofile.php:216 lib/userprofile.php:232
 msgid "User actions"
 msgstr "ഉപയോക്തൃ പ്രവൃത്തികൾ"
 
 #. TRANS: Text shown in user profile of not yet compeltely deleted users.
-#: lib/userprofile.php:220
 msgid "User deletion in progress..."
 msgstr "ഉപയോക്താവിനെ നീക്കം ചെയ്യൽ പുരോഗമിക്കുന്നു..."
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:248
 msgid "Edit profile settings"
 msgstr "ക്രമീകരണങ്ങളുടെ സജ്ജീകരണം മാറ്റുക"
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:250
 msgid "Edit"
 msgstr "തിരുത്തുക"
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:274
 msgid "Send a direct message to this user"
 msgstr "ഈ ഉപയോക്താവിന് നേരിട്ട് സന്ദേശമയയ്ക്കുക"
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:276
 msgid "Message"
 msgstr "സന്ദേശം"
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:318
 msgid "Moderate"
 msgstr "മാദ്ധ്യസ്ഥം വഹിക്കുക"
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:357
 msgid "User role"
 msgstr ""
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:360
 msgctxt "role"
 msgid "Administrator"
 msgstr "കാര്യനിർവ്വാഹക(ൻ)"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:362
 msgctxt "role"
 msgid "Moderator"
 msgstr "മദ്ധ്യസ്ഥ(ൻ)"
 
-#: lib/util.php:321
 #, fuzzy
 msgid "Not allowed to log in."
 msgstr "ലോഗിൻ ചെയ്തിട്ടില്ല"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1337
 msgid "a few seconds ago"
 msgstr "ഏതാനം സെക്കന്റുകൾ മുമ്പ്"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1340
 msgid "about a minute ago"
 msgstr "ഏകദേശം ഒരു മിനിറ്റ് മുമ്പ്"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1344
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
@@ -9358,12 +7687,10 @@ msgstr[0] "ഏകദേശം ഒരു മിനിറ്റ് മുമ്പ
 msgstr[1] "ഏകദേശം %d മിനിറ്റ് മുമ്പ്"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1347
 msgid "about an hour ago"
 msgstr "ഏകദേശം ഒരു മണിക്കൂർ മുമ്പ്"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1351
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
@@ -9371,12 +7698,10 @@ msgstr[0] "ഏകദേശം ഒരു മണിക്കൂർ മുമ്പ
 msgstr[1] "ഏകദേശം %d മണിക്കൂർ മുമ്പ്"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1354
 msgid "about a day ago"
 msgstr "ഏകദേശം ഒരു ദിവസം മുമ്പ്"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1358
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
@@ -9384,12 +7709,10 @@ msgstr[0] "ഏകദേശം ഒരു ദിവസം മുമ്പ്"
 msgstr[1] "ഏകദേശം %d ദിവസം മുമ്പ്"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1361
 msgid "about a month ago"
 msgstr "ഏകദേഅം ഒരു മാസം മുമ്പ്"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1365
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
@@ -9397,165 +7720,41 @@ msgstr[0] "ഏകദേശം ഒരു മാസം മുമ്പ്"
 msgstr[1] "ഏകദേശം %d മാസം മുമ്പ്"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1368
 msgid "about a year ago"
 msgstr "ഏകദേശം ഒരു വർഷം മുമ്പ്"
 
 #. TRANS: Web color exception thrown when a hexadecimal color code does not validate.
 #. TRANS: %s is the provided (invalid) color code.
-#: lib/webcolor.php:81 lib/webcolor.php:121
 #, php-format
 msgid "%s is not a valid color! Use 3 or 6 hex characters."
 msgstr "%s സാധുതയുള്ള നിറമല്ല! 3 അല്ലെങ്കിൽ 6 ഹെക്സ് അക്ഷരങ്ങൾ ഉപയോഗിക്കുക."
 
 #. TRANS: Exception.
-#: lib/xrd.php:63
 msgid "Invalid XML."
 msgstr "അസാധുവായ എക്സ്.എം.എൽ.."
 
 #. TRANS: Exception.
-#: lib/xrd.php:68
 msgid "Invalid XML, missing XRD root."
 msgstr ""
 
 #. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
-#: scripts/restoreuser.php:62
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
 
-#~ msgid "Could not generate feed for group - %s"
-#~ msgstr "സംഘത്തിനുള്ള ഫീഡ് സൃഷ്ടിക്കാൻ കഴിഞ്ഞില്ല - %s"
-
-#~ msgid "Current confirmed Jabber/Google Talk address."
-#~ msgstr "ഇപ്പോഴത്തെ സ്ഥിരീകരിക്കപ്പെട്ട ജാബ്ബർ/ജിറ്റോക് വിലാസം."
-
-#~ msgid ""
-#~ "Jabber or Google Talk address, like \"UserName@example.org\". First, make "
-#~ "sure to add %s to your buddy list in your IM client or on Google Talk."
-#~ msgstr ""
-#~ "ജാബ്ബർ അല്ലെങ്കിൽ ജിറ്റോക് വിലാസം, \"UserName@example.org\" എന്ന രീതിയിൽ. ആദ്യം %"
-#~ "s താങ്കളുടെ ഐ.എം. ക്ലയന്റിലോ ജിറ്റോക്കിലോ സുഹൃത്തുക്കളുടെ പട്ടികയിലുണ്ടെന്നുറപ്പാക്കുക."
-
-#~ msgid "Send me notices through Jabber/Google Talk."
-#~ msgstr "ജാബ്ബർ/ജിറ്റോക് വഴി എനിക്ക് അറിയിപ്പുകൾ അയയ്ക്കുക."
+#, fuzzy
+#~ msgid "Full name is too long (max 255 chars)."
+#~ msgstr "പൂർണ്ണ നാമത്തിന്റെ നീളം വളരെ കൂടുതലാണ് (പരമാവധി 255 അക്ഷരങ്ങൾ)."
 
 #, fuzzy
-#~ msgid "Publish a MicroID for my Jabber/Google Talk address."
-#~ msgstr "ഇപ്പോഴത്തെ സ്ഥിരീകരിക്കപ്പെട്ട ജാബ്ബർ/ജിറ്റോക് വിലാസം"
-
-#~ msgid "No Jabber ID."
-#~ msgstr "ജാബ്ബർ ഐ.ഡി. അല്ല."
-
-#~ msgid "Not a valid Jabber ID."
-#~ msgstr "അസാധുവായ ജാബർ ഐ.ഡി.."
-
-#~ msgid "That is already your Jabber ID."
-#~ msgstr "അത് ഇപ്പോൾ തന്നെ താങ്കളുടെ ജാബ്ബർ ഐ.ഡി. ആണ്."
-
-#~ msgid "That is not your Jabber ID."
-#~ msgstr "അത് താങ്കളുടെ ജാബ്ബർ ഐ.ഡി. അല്ല."
-
-#~ msgid "Other settings"
-#~ msgstr "മറ്റ് സജ്ജീകരണങ്ങൾ"
-
-#~ msgid "Consumer secret"
-#~ msgstr "ഉപയോക്തൃ രഹസ്യം"
-
-#~ msgid "Request token URL"
-#~ msgstr "അഭ്യർത്ഥനാ ചീട്ടിന്റെ യൂ.ആർ.എൽ."
-
-#~ msgid "Access token URL"
-#~ msgstr "അഭിഗമ്യതാ ചീട്ടിന്റെ യൂ.ആർ.എൽ."
-
-#~ msgid "Authorize URL"
-#~ msgstr "അംഗീകരണത്തിനുള്ള യൂ.ആർ.എൽ."
-
-#~ msgid "Jabber"
-#~ msgstr "ജാബ്ബർ"
-
-#~ msgid "Photo"
-#~ msgstr "ഛായാചിത്രം"
-
-#~ msgid "Other options"
-#~ msgstr "മറ്റ് ഐച്ഛികങ്ങൾ"
-
-#~ msgid "Other"
-#~ msgstr "മറ്റുള്ളവ"
-
-#~ msgctxt "MENU"
-#~ msgid "Personal"
-#~ msgstr "വ്യക്തിപരം"
-
-#~ msgid "Account"
-#~ msgstr "അംഗത്വം"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Connect to services"
-#~ msgstr "സേവനങ്ങളിൽ ബന്ധപ്പെടുക"
-
-#~ msgid "Connect"
-#~ msgstr "ബന്ധപ്പെടുക"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Change site configuration"
-#~ msgstr "സൈറ്റ് ക്രമീകരണങ്ങൾ മാറ്റുക"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Invite friends and colleagues to join you on %s"
-#~ msgstr "%s-ൽ നമ്മോടൊപ്പം ചേരാൻ സുഹൃത്തുക്കളേയും സഹപ്രവർത്തകരേയും ക്ഷണിക്കുക"
-
-#~ msgctxt "MENU"
-#~ msgid "Invite"
-#~ msgstr "ക്ഷണിക്കുക"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Create an account"
-#~ msgstr "ഒരംഗത്വമെടുക്കുക"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Help me!"
-#~ msgstr "എന്നെ സഹായിക്കൂ!"
-
-#~ msgctxt "MENU"
-#~ msgid "Help"
-#~ msgstr "സഹായം"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Search for people or text"
-#~ msgstr "ആൾക്കാരെയോ എഴുത്തോ തിരയുക"
-
-#~ msgid "Local views"
-#~ msgstr "പ്രാദേശിക എടുത്തുനോക്കലുകൾ"
-
-#~ msgid "Page notice"
-#~ msgstr "താളിലെ അറിയിപ്പ്"
-
-#~ msgid "StatusNet software license"
-#~ msgstr "സ്റ്റാറ്റസ്‌നെറ്റ് സോഫ്റ്റ്‌വേർ അനുമതി"
-
-#~ msgid "Site content license"
-#~ msgstr "സൈറ്റിന്റെ ഉള്ളടക്കത്തിന്റെ ഉപയോഗാനുമതി"
-
-#~ msgid "Author"
-#~ msgstr "രചയിതാവ്"
-
-#~ msgctxt "MENU"
-#~ msgid "SMS"
-#~ msgstr "എസ്.എം.എസ്."
-
-#~ msgid "Available characters"
-#~ msgstr "ലഭ്യമായ അക്ഷരങ്ങൾ"
+#~ msgid "description is too long (max %d chars)."
+#~ msgstr "വിവരണത്തിനു നീളം കൂടുതലാണ് (പരമാവധി %d അക്ഷരം)."
 
 #, fuzzy
-#~ msgctxt "MENU"
-#~ msgid "Profile"
-#~ msgstr "ജനങ്ങൾ"
+#~ msgid "Location is too long (max 255 chars)."
+#~ msgstr "സംഘടനയുടെ പേരിന്റെ നീളം വളരെക്കൂടുതലാണ് (പരമാവധി 255 അക്ഷരങ്ങൾ)."
 
-#~ msgid "Search help"
-#~ msgstr "തിരച്ചിലിനുള്ള സഹായം"
-
-#~ msgid "Unknown user. Go to %s to add your address to your account"
-#~ msgstr ""
-#~ "ഉപയോക്താവിനെക്കുറിച്ച് അറിവില്ല. %s എന്നതിൽ ചെന്ന് താങ്കളുടെ അംഗത്വത്തിൽ താങ്കളുടെ "
-#~ "വിലാസം ചേർക്കുക."
+#, fuzzy
+#~ msgctxt "BUTTON"
+#~ msgid "Comment"
+#~ msgstr "ഉള്ളടക്കം"
diff --git a/locale/nb/LC_MESSAGES/statusnet.po b/locale/nb/LC_MESSAGES/statusnet.po
index 17f7235930..192917074d 100644
--- a/locale/nb/LC_MESSAGES/statusnet.po
+++ b/locale/nb/LC_MESSAGES/statusnet.po
@@ -12,67 +12,57 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:23+0000\n"
-"PO-Revision-Date: 2011-03-03 17:26:19+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:33+0000\n"
 "Language-Team: Norwegian (bokmål)‬ <http://translatewiki.net/wiki/Portal:no>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-02-25 23:49:23+0000\n"
+"X-POT-Import-Date: 2011-03-03 17:59:19+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
-#: actions/accessadminpanel.php:53 lib/adminpanelaction.php:363
 msgid "Access"
 msgstr "Tilgang"
 
 #. TRANS: Page notice.
-#: actions/accessadminpanel.php:64
 msgid "Site access settings"
 msgstr "Innstillinger for nettstedstilgang"
 
 #. TRANS: Form legend for registration form.
-#: actions/accessadminpanel.php:151
 msgid "Registration"
 msgstr "Registrering"
 
 #. TRANS: Checkbox instructions for admin setting "Private".
-#: actions/accessadminpanel.php:155
 msgid "Prohibit anonymous users (not logged in) from viewing site?"
 msgstr "Forhindre anonyme brukere (ikke innlogget) å se nettsted?"
 
 #. TRANS: Checkbox label for prohibiting anonymous users from viewing site.
-#: actions/accessadminpanel.php:157
 msgctxt "LABEL"
 msgid "Private"
 msgstr "Privat"
 
 #. TRANS: Checkbox instructions for admin setting "Invite only".
-#: actions/accessadminpanel.php:164
 msgid "Make registration invitation only."
 msgstr "Gjør at registrering kun kan skje gjennom invitasjon."
 
 #. TRANS: Checkbox label for configuring site as invite only.
-#: actions/accessadminpanel.php:166
 msgid "Invite only"
 msgstr "Kun invitasjon"
 
 #. TRANS: Checkbox instructions for admin setting "Closed" (no new registrations).
-#: actions/accessadminpanel.php:173
 msgid "Disable new registrations."
 msgstr "Deaktiver nye registreringer."
 
 #. TRANS: Checkbox label for disabling new user registrations.
-#: actions/accessadminpanel.php:175
 msgid "Closed"
 msgstr "Lukket"
 
 #. TRANS: Title for button to save access settings in site admin panel.
-#: actions/accessadminpanel.php:191
 msgid "Save access settings"
 msgstr "Lagre tilgangsinnstillinger"
 
@@ -80,6 +70,7 @@ msgstr "Lagre tilgangsinnstillinger"
 #. TRANS: Button text for saving theme settings.
 #. TRANS: Button label to save e-mail preferences.
 #. TRANS: Button label to save IM preferences.
+#. TRANS: Button text in the license admin panel.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
 #. TRANS: Button text for saving site notice in admin panel.
@@ -89,21 +80,12 @@ msgstr "Lagre tilgangsinnstillinger"
 #. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
 #. TRANS: Button text on profile design page to save settings.
-#: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
-#: actions/emailsettings.php:251 actions/imsettings.php:199
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:198
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:204
-#: actions/subscriptions.php:261 actions/urlsettings.php:152
-#: actions/useradminpanel.php:298 lib/applicationeditform.php:355
-#: lib/designform.php:320 lib/groupeditform.php:201
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Lagre"
 
 #. TRANS: Server error when page not found (404).
 #. TRANS: Server error when page not found (404)
-#: actions/all.php:68 actions/public.php:98 actions/replies.php:93
-#: actions/showfavorites.php:140 actions/tag.php:52
 msgid "No such page."
 msgstr "Ingen slik side."
 
@@ -122,6 +104,7 @@ msgstr "Ingen slik side."
 #. TRANS: Client error displayed when checking group membership for a non-existing user.
 #. TRANS: Client error displayed when trying to have a non-existing user join a group.
 #. TRANS: Client error displayed when trying to have a non-existing user leave a group.
+#. TRANS: Client error displayed when not providing a user or an invalid user.
 #. TRANS: Client error displayed when updating a status for a non-existing user.
 #. TRANS: Client error displayed when requesting a list of followers for a non-existing user.
 #. TRANS: Client error displayed when requesting most recent favourite notices by a user for a non-existing user.
@@ -134,6 +117,8 @@ msgstr "Ingen slik side."
 #. 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.
 #. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
@@ -141,33 +126,10 @@ msgstr "Ingen slik side."
 #. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when calling a profile action without specifying a user.
-#: actions/all.php:80 actions/allrss.php:69
-#: actions/apiaccountupdatedeliverydevice.php:110
-#: actions/apiaccountupdateprofile.php:103
-#: actions/apiaccountupdateprofilebackgroundimage.php:118
-#: actions/apiaccountupdateprofileimage.php:104 actions/apiatomservice.php:59
-#: actions/apiblockcreate.php:96 actions/apiblockdestroy.php:94
-#: actions/apidirectmessage.php:75 actions/apidirectmessagenew.php:72
-#: actions/apigroupcreate.php:111 actions/apigroupismember.php:89
-#: actions/apigroupjoin.php:98 actions/apigroupleave.php:98
-#: actions/apigrouplist.php:70 actions/apigroupprofileupdate.php:108
-#: actions/apistatusesupdate.php:230 actions/apisubscriptions.php:85
-#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:173
-#: actions/apitimelinehome.php:78 actions/apitimelinementions.php:77
-#: actions/apitimelineuser.php:79 actions/avatarbynickname.php:79
-#: actions/favoritesrss.php:72 actions/foaf.php:42 actions/foaf.php:61
-#: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116
-#: actions/otp.php:78 actions/remotesubscribe.php:144
-#: actions/remotesubscribe.php:153 actions/replies.php:73
-#: actions/repliesrss.php:38 actions/rsd.php:113 actions/showfavorites.php:106
-#: actions/userbyid.php:75 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/userxrd.php:59 actions/xrds.php:71 lib/command.php:509
-#: lib/galleryaction.php:59 lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Ingen slik bruker."
 
 #. TRANS: Page title. %1$s is user nickname, %2$d is page number
-#: actions/all.php:91
 #, php-format
 msgid "%1$s and friends, page %2$d"
 msgstr "%1$s og venner, side %2$d"
@@ -176,33 +138,26 @@ msgstr "%1$s og venner, side %2$d"
 #. TRANS: H1 text for page. %s is a user nickname.
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Timeline title for user and friends. %s is a user nickname.
-#: actions/all.php:94 actions/all.php:191 actions/allrss.php:117
-#: actions/apitimelinefriends.php:207 actions/apitimelinehome.php:113
-#: lib/personalgroupnav.php:100
 #, php-format
 msgid "%s and friends"
 msgstr "%s og venner"
 
 #. TRANS: %s is user nickname.
-#: actions/all.php:108
 #, php-format
 msgid "Feed for friends of %s (RSS 1.0)"
 msgstr "Mating for venner av %s (RSS 1.0)"
 
 #. TRANS: %s is user nickname.
-#: actions/all.php:117
 #, php-format
 msgid "Feed for friends of %s (RSS 2.0)"
 msgstr "Mating for venner av %s (RSS 2.0)"
 
 #. TRANS: %s is user nickname.
-#: actions/all.php:126
 #, php-format
 msgid "Feed for friends of %s (Atom)"
 msgstr "Mating for venner av %s (Atom)"
 
 #. TRANS: Empty list message. %s is a user nickname.
-#: actions/all.php:139
 #, php-format
 msgid ""
 "This is the timeline for %s and friends but no one has posted anything yet."
@@ -210,7 +165,6 @@ msgstr "Dette er tidslinjen for %s og venner, men ingen har postet noe enda."
 
 #. TRANS: Encouragement displayed on logged in user's empty timeline.
 #. TRANS: This message contains Markdown links. Keep "](" together.
-#: actions/all.php:146
 #, php-format
 msgid ""
 "Try subscribing to more people, [join a group](%%action.groups%%) or post "
@@ -221,7 +175,6 @@ msgstr ""
 
 #. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@".
 #. TRANS: This message contains Markdown links. Keep "](" together.
-#: actions/all.php:150
 #, php-format
 msgid ""
 "You can try to [nudge %1$s](../%2$s) from their profile or [post something "
@@ -234,7 +187,6 @@ msgstr ""
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
 #. TRANS: Second sentence of empty message for anonymous users. %s is a user nickname.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:221
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -244,14 +196,11 @@ msgstr ""
 "til å poste en!"
 
 #. TRANS: H1 text for page when viewing a list for self.
-#: actions/all.php:188
 msgid "You and friends"
 msgstr "Du og venner"
 
 #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
 #. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name.
-#: actions/allrss.php:122 actions/apitimelinefriends.php:213
-#: actions/apitimelinehome.php:119
 #, php-format
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr "Oppdateringer fra %1$s og venner på %2$s!"
@@ -270,55 +219,20 @@ msgstr "Oppdateringer fra %1$s og venner på %2$s!"
 #. TRANS: Client error displayed trying to execute an unknown API method checking group membership.
 #. TRANS: Client error displayed trying to execute an unknown API method listing the latest 20 groups.
 #. TRANS: Client error displayed trying to execute an unknown API method showing group membership.
+#. TRANS: Client error displayed when using an unsupported API format.
 #. TRANS: Client error displayed trying to execute an unknown API method showing a group.
 #. TRANS: Client error displayed trying to execute an unknown API method testing API connectivity.
 #. TRANS: Client error displayed trying to execute an unknown API method deleting a status.
 #. TRANS: Client error displayed when trying to handle an unknown API method.
-#: actions/apiaccountratelimitstatus.php:69
-#: actions/apiaccountupdatedeliverydevice.php:92
-#: actions/apiaccountupdateprofile.php:94
-#: actions/apiaccountupdateprofilebackgroundimage.php:92
-#: actions/apiaccountupdateprofilecolors.php:115
-#: actions/apiaccountverifycredentials.php:68 actions/apidirectmessage.php:157
-#: actions/apifavoritecreate.php:98 actions/apifavoritedestroy.php:98
-#: actions/apifriendshipscreate.php:99 actions/apifriendshipsdestroy.php:99
-#: actions/apifriendshipsshow.php:124 actions/apigroupcreate.php:138
-#: actions/apigroupismember.php:115 actions/apigroupjoin.php:151
-#: actions/apigroupleave.php:141 actions/apigrouplist.php:134
-#: actions/apigrouplistall.php:120 actions/apigroupmembership.php:105
-#: actions/apigroupprofileupdate.php:100 actions/apigroupprofileupdate.php:213
-#: actions/apigroupshow.php:114 actions/apihelptest.php:84
-#: actions/apistatusesdestroy.php:101 actions/apistatusesretweets.php:110
-#: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:139
-#: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
-#: actions/apitimelinefavorites.php:182 actions/apitimelinefriends.php:276
-#: actions/apitimelinegroup.php:148 actions/apitimelinehome.php:181
-#: actions/apitimelinementions.php:182 actions/apitimelinepublic.php:247
-#: actions/apitimelineretweetedtome.php:147
-#: actions/apitimelineretweetsofme.php:147 actions/apitimelinetag.php:165
-#: actions/apitimelineuser.php:217 actions/apiusershow.php:100
 msgid "API method not found."
 msgstr "API-metode ikke funnet."
 
 #. 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.
-#: actions/apiaccountupdatedeliverydevice.php:83
-#: actions/apiaccountupdateprofile.php:85
-#: actions/apiaccountupdateprofilebackgroundimage.php:83
-#: actions/apiaccountupdateprofilecolors.php:106
-#: actions/apiaccountupdateprofileimage.php:80 actions/apiblockcreate.php:87
-#: actions/apiblockdestroy.php:85 actions/apidirectmessagenew.php:107
-#: actions/apifavoritecreate.php:88 actions/apifavoritedestroy.php:88
-#: actions/apifriendshipscreate.php:89 actions/apifriendshipsdestroy.php:89
-#: actions/apigroupcreate.php:102 actions/apigroupjoin.php:89
-#: actions/apigroupleave.php:89 actions/apigroupprofileupdate.php:92
-#: actions/apimediaupload.php:66 actions/apistatusesretweet.php:63
-#: actions/apistatusesupdate.php:194
 msgid "This method requires a POST."
 msgstr "Denne metoden krever en POST."
 
 #. TRANS: Client error displayed when no valid device parameter is provided for a user's delivery device setting.
-#: actions/apiaccountupdatedeliverydevice.php:103
 msgid ""
 "You must specify a parameter named 'device' with a value of one of: sms, im, "
 "none."
@@ -331,10 +245,6 @@ msgstr "Du må angi en verdi for parameteren 'device' med en av: sms, im, none."
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
-#: actions/apiaccountupdatedeliverydevice.php:136
-#: actions/emailsettings.php:353 actions/emailsettings.php:499
-#: actions/profilesettings.php:323 actions/smssettings.php:300
-#: actions/smssettings.php:453 actions/urlsettings.php:211
 msgid "Could not update user."
 msgstr "Kunne ikke oppdatere bruker."
 
@@ -347,32 +257,17 @@ msgstr "Kunne ikke oppdatere bruker."
 #. TRANS: Server error displayed when requesting Friends of a Friend feed for a user for which the profile could not be found.
 #. TRANS: Server error displayed when trying to get a user hCard for a user without a profile.
 #. TRANS: Server error displayed when calling a profile action while the specified user does not have a profile.
-#: actions/apiaccountupdateprofile.php:111
-#: actions/apiaccountupdateprofilebackgroundimage.php:199
-#: actions/apiaccountupdateprofilecolors.php:183
-#: actions/apiaccountupdateprofileimage.php:131
-#: actions/apiuserprofileimage.php:88 actions/apiusershow.php:108
-#: actions/avatarbynickname.php:85 actions/foaf.php:69 actions/hcard.php:75
-#: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
-#: lib/profileaction.php:85
 msgid "User has no profile."
 msgstr "Brukeren har ingen profil."
 
 #. TRANS: Server error displayed if a user profile could not be saved.
 #. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:419
 msgid "Could not save profile."
 msgstr "Kunne ikke lagre profil."
 
 #. TRANS: Client error displayed when the number of bytes in a POST request exceeds a limit.
 #. TRANS: %s is the number of bytes of the CONTENT_LENGTH.
 #. TRANS: Form validation error in design settings form. POST should remain untranslated.
-#: actions/apiaccountupdateprofilebackgroundimage.php:108
-#: actions/apiaccountupdateprofileimage.php:95 actions/apimediaupload.php:81
-#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
-#: actions/designadminpanel.php:120 actions/editapplication.php:121
-#: actions/newapplication.php:102 actions/newnotice.php:95
-#: lib/designsettings.php:110
 #, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s byte) due to its "
@@ -392,26 +287,15 @@ msgstr[1] ""
 #. TRANS: Client error displayed when a database error occurs inserting profile colours.
 #. TRANS: Client error displayed when a database error occurs updating profile colours.
 #. TRANS: Form validation error displayed when group design settings could not be saved because of an application issue.
-#: actions/apiaccountupdateprofilebackgroundimage.php:138
-#: actions/apiaccountupdateprofilebackgroundimage.php:149
-#: actions/apiaccountupdateprofilecolors.php:160
-#: actions/apiaccountupdateprofilecolors.php:171
-#: actions/groupdesignsettings.php:285 actions/groupdesignsettings.php:296
-#: actions/userdesignsettings.php:218 actions/userdesignsettings.php:228
-#: actions/userdesignsettings.php:270 actions/userdesignsettings.php:280
 msgid "Unable to save your design settings."
 msgstr "Kunne ikke lagre dine innstillinger for utseende."
 
 #. TRANS: Error displayed when updating design settings fails.
 #. TRANS: Client error displayed when a database error occurs updating profile colours.
-#: actions/apiaccountupdateprofilebackgroundimage.php:191
-#: actions/apiaccountupdateprofilecolors.php:139
-#: actions/userdesignsettings.php:196
 msgid "Could not update your design."
 msgstr "Kunne ikke oppdatere din profils utseende."
 
 #. TRANS: Title for Atom feed.
-#: actions/apiatomservice.php:85
 #, fuzzy
 msgctxt "ATOM"
 msgid "Main"
@@ -421,9 +305,6 @@ msgstr "Hoved"
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Title in atom group notice feed. %s is a group name.
 #. TRANS: Title in atom user notice feed. %s is a user name.
-#: actions/apiatomservice.php:93 actions/grouprss.php:138
-#: actions/userrss.php:94 lib/atomgroupnoticefeed.php:63
-#: lib/atomusernoticefeed.php:88
 #, php-format
 msgid "%s timeline"
 msgstr "%s tidslinje"
@@ -433,8 +314,6 @@ msgstr "%s tidslinje"
 #. TRANS: %s is a user nickname.
 #. TRANS: Header for subscriptions overview for a user (first page).
 #. TRANS: %s is a user nickname.
-#: actions/apiatomservice.php:104 actions/atompubsubscriptionfeed.php:148
-#: actions/subscriptions.php:51
 #, php-format
 msgid "%s subscriptions"
 msgstr "%s abonnementer"
@@ -442,58 +321,48 @@ msgstr "%s abonnementer"
 #. TRANS: Title for Atom feed with a user's favorite notices. %s is a user nickname.
 #. TRANS: Title for Atom favorites feed.
 #. TRANS: %s is a user nickname.
-#: actions/apiatomservice.php:115 actions/atompubfavoritefeed.php:142
 #, php-format
 msgid "%s favorites"
 msgstr "%s favoritter"
 
 #. TRANS: Title for Atom feed with a user's memberships. %s is a user nickname.
-#: actions/apiatomservice.php:126
 #, php-format
 msgid "%s memberships"
 msgstr "%s medlemsskap"
 
 #. TRANS: Client error displayed when users try to block themselves.
-#: actions/apiblockcreate.php:105
 msgid "You cannot block yourself!"
 msgstr "Du kan ikke blokkere deg selv!"
 
 #. TRANS: Server error displayed when blocking a user has failed.
-#: actions/apiblockcreate.php:127
 msgid "Block user failed."
 msgstr "Blokkering av bruker mislyktes."
 
 #. TRANS: Server error displayed when unblocking a user has failed.
-#: actions/apiblockdestroy.php:113
 msgid "Unblock user failed."
 msgstr "Oppheving av blokkering av bruker mislyktes."
 
 #. TRANS: Title. %s is a user nickname.
-#: actions/apidirectmessage.php:88
 #, php-format
 msgid "Direct messages from %s"
 msgstr "Direktemeldinger fra %s"
 
 #. TRANS: Subtitle. %s is a user nickname.
-#: actions/apidirectmessage.php:93
 #, php-format
 msgid "All the direct messages sent from %s"
 msgstr "Alle direktemeldinger sendt fra %s"
 
 #. TRANS: Title. %s is a user nickname.
-#: actions/apidirectmessage.php:102
 #, php-format
 msgid "Direct messages to %s"
 msgstr "Direktemeldinger til %s"
 
 #. TRANS: Subtitle. %s is a user nickname.
-#: actions/apidirectmessage.php:107
 #, php-format
 msgid "All the direct messages sent to %s"
 msgstr "Alle direktemeldinger sendt til %s"
 
 #. TRANS: Client error displayed when no message text was submitted (406).
-#: actions/apidirectmessagenew.php:117
 msgid "No message text!"
 msgstr "Ingen meldingstekst!"
 
@@ -501,7 +370,6 @@ msgstr "Ingen meldingstekst!"
 #. TRANS: %d is the maximum number of characters for a message.
 #. TRANS: Form validation error displayed when message content is too long.
 #. TRANS: %d is the maximum number of characters for a message.
-#: actions/apidirectmessagenew.php:127 actions/newmessage.php:152
 #, php-format
 msgid "That's too long. Maximum message size is %d character."
 msgid_plural "That's too long. Maximum message size is %d characters."
@@ -509,18 +377,15 @@ msgstr[0] "Dette er for langt. Meldingen kan bare være %d tegn lang."
 msgstr[1] "Dette er for langt. Meldingen kan bare være %d tegn lang."
 
 #. TRANS: Client error displayed if a recipient user could not be found (403).
-#: actions/apidirectmessagenew.php:139
 msgid "Recipient user not found."
 msgstr "Fant ikke mottakeren."
 
 #. TRANS: Client error displayed trying to direct message another user who's not a friend (403).
-#: actions/apidirectmessagenew.php:144
 #, fuzzy
 msgid "Cannot send direct messages to users who aren't your friend."
 msgstr "Kan ikke sende direktemeldinger til brukere du ikke er venn med."
 
 #. TRANS: Client error displayed trying to direct message self (403).
-#: actions/apidirectmessagenew.php:154
 msgid ""
 "Do not send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
@@ -529,116 +394,96 @@ 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.
 #. TRANS: Client error displayed trying to delete a status with an invalid ID.
-#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:108
-#: actions/apistatusesdestroy.php:121
 msgid "No status found with that ID."
 msgstr "Fant ingen status med den ID-en."
 
 #. TRANS: Client error displayed when trying to mark a notice favourite that already is a favourite.
-#: actions/apifavoritecreate.php:120
 msgid "This status is already a favorite."
 msgstr "Denne statusen er allerede en favoritt."
 
 #. TRANS: Client error displayed when marking a notice as favourite fails.
 #. TRANS: Server error displayed when trying to mark a notice as favorite fails in the database.
 #. TRANS: Error message text shown when a favorite could not be set.
-#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:306
 msgid "Could not create favorite."
 msgstr "Kunne ikke opprette favoritt."
 
 #. TRANS: Client error displayed when trying to remove a favourite that was not a favourite.
-#: actions/apifavoritedestroy.php:122
 msgid "That status is not a favorite."
 msgstr "Den statusen er ikke en favoritt."
 
 #. TRANS: Client error displayed when removing a favourite has failed.
 #. TRANS: Server error displayed when removing a favorite from the database fails.
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:90
 msgid "Could not delete favorite."
 msgstr "Kunne ikke slette favoritt."
 
 #. TRANS: Client error displayed when trying follow who's profile could not be found.
-#: actions/apifriendshipscreate.php:109
 msgid "Could not follow user: profile not found."
 msgstr "Kunne ikke følge brukeren: fant ikke profilen."
 
 #. TRANS: Client error displayed when trying to follow a user that's already being followed.
 #. TRANS: %s is the nickname of the user that is already being followed.
-#: actions/apifriendshipscreate.php:120
 #, php-format
 msgid "Could not follow user: %s is already on your list."
 msgstr "Kunne ikke følge brukeren: %s er allerede i listen din."
 
 #. TRANS: Client error displayed when trying to unfollow a user that cannot be found.
-#: actions/apifriendshipsdestroy.php:109
 msgid "Could not unfollow user: User not found."
 msgstr "Kunne ikke slutte å følge brukeren: Fant ikke brukeren."
 
 #. TRANS: Client error displayed when trying to unfollow self.
-#: actions/apifriendshipsdestroy.php:121
 msgid "You cannot unfollow yourself."
 msgstr "Du kan ikke slutte å følge deg selv."
 
 #. TRANS: Client error displayed when supplying invalid parameters to an API call checking if a friendship exists.
-#: actions/apifriendshipsexists.php:88
 msgid "Two valid IDs or nick names must be supplied."
 msgstr "To gyldige ID-er eller kallenavn må oppgis."
 
 #. TRANS: Client error displayed when a source user could not be determined showing friendship.
-#: actions/apifriendshipsshow.php:131
 msgid "Could not determine source user."
 msgstr "Kunne ikke bestemme kildebruker."
 
 #. TRANS: Client error displayed when a target user could not be determined showing friendship.
-#: actions/apifriendshipsshow.php:140
 msgid "Could not find target user."
 msgstr "Kunne ikke finne målbruker."
 
 #. TRANS: Client error trying to create a group with a nickname this is already in use.
+#. TRANS: API validation exception thrown when nickname is already used.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:156 actions/apigroupprofileupdate.php:255
-#: actions/editgroup.php:191 actions/newgroup.php:137
-#: actions/profilesettings.php:274 actions/register.php:199
 msgid "Nickname already in use. Try another one."
 msgstr "Det nicket er allerede i bruk. Prøv et annet."
 
 #. TRANS: Client error in form for group creation.
+#. TRANS: API validation exception thrown when nickname does not validate.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:164 actions/apigroupprofileupdate.php:259
-#: actions/editgroup.php:195 actions/newgroup.php:141
-#: actions/profilesettings.php:244 actions/register.php:201
 msgid "Not a valid nickname."
 msgstr "Ugyldig nick."
 
 #. TRANS: Client error in form for group creation.
+#. TRANS: API validation exception thrown when homepage URL does not validate.
 #. TRANS: Validation error shown when providing an invalid homepage URL in the "Edit application" form.
 #. TRANS: Group edit form validation error.
 #. TRANS: Validation error shown when providing an invalid homepage URL in the "New application" form.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:181 actions/apigroupprofileupdate.php:277
-#: actions/editapplication.php:235 actions/editgroup.php:202
-#: actions/newapplication.php:221 actions/newgroup.php:148
-#: actions/profilesettings.php:249 actions/register.php:208
 msgid "Homepage is not a valid URL."
 msgstr "Hjemmesiden er ikke en gyldig URL."
 
 #. TRANS: Client error in form for group creation.
+#. TRANS: API validation exception thrown when full name does not validate.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:191 actions/editgroup.php:206
-#: actions/newgroup.php:152 actions/profilesettings.php:253
-#: actions/register.php:211
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "Fullt navn er for langt (maks 255 tegn)."
 
 #. TRANS: Client error shown when providing too long a description during group creation.
 #. TRANS: %d is the maximum number of allowed characters.
+#. TRANS: API validation exception thrown when description does not validate.
+#. TRANS: %d is the maximum description length and used for plural.
 #. TRANS: Validation error shown when providing too long a description in the "Edit application" form.
 #. TRANS: %d is the maximum number of allowed characters.
 #. TRANS: Group edit form validation error.
@@ -646,9 +491,6 @@ msgstr "Fullt navn er for langt (maks 255 tegn)."
 #. TRANS: %d is the maximum number of characters for the description.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed characters.
-#: actions/apigroupcreate.php:201 actions/editapplication.php:202
-#: actions/editgroup.php:211 actions/newapplication.php:182
-#: actions/newgroup.php:157
 #, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."
@@ -656,23 +498,21 @@ msgstr[0] "Beskrivelsen er for lang (maks %d tegn)."
 msgstr[1] "Beskrivelsen er for lang (maks %d tegn)."
 
 #. TRANS: Client error shown when providing too long a location during group creation.
+#. TRANS: API validation exception thrown when location does not validate.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:215 actions/editgroup.php:218
-#: actions/newgroup.php:164 actions/profilesettings.php:266
-#: actions/register.php:220
 msgid "Location is too long (maximum 255 characters)."
 msgstr "Plasseringen er for lang (maks 255 tegn)."
 
 #. TRANS: Client error shown when providing too many aliases during group creation.
 #. TRANS: %d is the maximum number of allowed aliases.
+#. TRANS: API validation exception thrown when aliases do not validate.
+#. TRANS: %d is the maximum number of aliases and used for plural.
 #. TRANS: Group edit form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.
-#: actions/apigroupcreate.php:236 actions/editgroup.php:231
-#: actions/newgroup.php:177
 #, php-format
 msgid "Too many aliases! Maximum %d allowed."
 msgid_plural "Too many aliases! Maximum %d allowed."
@@ -681,25 +521,24 @@ msgstr[1] "For mange alias. Maks %d er tillatt."
 
 #. TRANS: Client error shown when providing an invalid alias during group creation.
 #. TRANS: %s is the invalid alias.
-#: actions/apigroupcreate.php:253
+#. TRANS: API validation exception thrown when aliases does not validate.
+#. TRANS: %s is the invalid alias.
 #, php-format
 msgid "Invalid alias: \"%s\"."
 msgstr "Ugyldig alias: «%s»."
 
 #. TRANS: Client error displayed when trying to use an alias during group creation that is already in use.
 #. TRANS: %s is the alias that is already in use.
+#. TRANS: API validation exception thrown when aliases is already used.
+#. TRANS: %s is the already used alias.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error. %s is the already used alias.
-#: actions/apigroupcreate.php:264 actions/apigroupprofileupdate.php:351
-#: actions/editgroup.php:246 actions/newgroup.php:193
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "Aliaset «%s» er allerede i bruk. Prøv et annet."
 
 #. TRANS: Client error displayed when trying to use an alias during group creation that is the same as the group's nickname.
 #. TRANS: Group edit form validation error.
-#: actions/apigroupcreate.php:278 actions/apigroupprofileupdate.php:359
-#: actions/editgroup.php:253
 msgid "Alias can't be the same as nickname."
 msgstr "Alias kan ikke være det samme som kallenavn."
 
@@ -707,26 +546,21 @@ msgstr "Alias kan ikke være det samme som kallenavn."
 #. TRANS: Client error displayed when trying to join a group that does not exist.
 #. TRANS: Client error displayed when trying to leave a group that does not exist.
 #. TRANS: Client error displayed trying to show group membership on a non-existing group.
+#. TRANS: Client error displayed when not providing a group or an invalid group.
 #. TRANS: Client error displayed when trying to show a group that could not be found.
 #. TRANS: Client error displayed requesting most recent notices to a group for a non-existing group.
-#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
-#: actions/apigroupleave.php:104 actions/apigroupmembership.php:71
-#: actions/apigroupprofileupdate.php:113 actions/apigroupshow.php:81
-#: actions/apitimelinegroup.php:89
 msgid "Group not found."
 msgstr "Gruppe ikke funnet."
 
 #. TRANS: Server error displayed when trying to join a group the user is already a member of.
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:345
 msgid "You are already a member of that group."
 msgstr "Du er allerede medlem av den gruppen."
 
 #. TRANS: Server error displayed when trying to join a group the user is blocked from joining.
 #. 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.
-#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:350
 msgid "You have been blocked from that group by the admin."
 msgstr "Du har blitt blokkert fra den gruppen av administratoren."
 
@@ -734,13 +568,11 @@ msgstr "Du har blitt blokkert fra den gruppen av administratoren."
 #. TRANS: %1$s is the joining user's nickname, $2$s is the group nickname for which the join failed.
 #. TRANS: Message given having failed to add a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:136 actions/joingroup.php:139 lib/command.php:362
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "Kunne ikke legge bruker %1$s til gruppe %2$s."
 
 #. TRANS: Server error displayed when trying to leave a group the user is not a member of.
-#: actions/apigroupleave.php:115
 msgid "You are not a member of this group."
 msgstr "Du er ikke et medlem av denne gruppen."
 
@@ -748,116 +580,79 @@ msgstr "Du er ikke et medlem av denne gruppen."
 #. TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
 #. TRANS: Message given having failed to remove a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupleave.php:127 actions/leavegroup.php:133
-#: lib/command.php:410
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
 msgstr "Kunne ikke fjerne bruker %1$s fra gruppe %2$s."
 
 #. TRANS: Used as title in check for group membership. %s is a user name.
-#: actions/apigrouplist.php:94
 #, php-format
 msgid "%s's groups"
 msgstr "%s sine grupper"
 
 #. TRANS: Used as subtitle in check for group membership. %1$s is a user name, %2$s is the site name.
-#: actions/apigrouplist.php:104
 #, php-format
 msgid "%1$s groups %2$s is a member of."
 msgstr "%1$s grupper %2$s er et medlem av."
 
 #. TRANS: Message is used as a title when listing the lastest 20 groups. %s is a site name.
 #. TRANS: Message is used as a page title. %s is a nick name.
-#: actions/apigrouplistall.php:88 actions/usergroups.php:63
 #, php-format
 msgid "%s groups"
 msgstr "%s grupper"
 
 #. TRANS: Message is used as a subtitle when listing the lastest 20 groups. %s is a site name.
-#: actions/apigrouplistall.php:93
 #, php-format
 msgid "groups on %s"
 msgstr "grupper på %s"
 
+#. TRANS: Client error displayed when trying to edit a group without being an admin.
 #. TRANS: Client error displayed trying to edit a group while not being a group admin.
 #. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
 #. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
-#: actions/apigroupprofileupdate.php:118 actions/editgroup.php:110
-#: actions/editgroup.php:176 actions/groupdesignsettings.php:109
-#: actions/grouplogo.php:111
 msgid "You must be an admin to edit the group."
 msgstr "Du må være en administrator for å redigere gruppen."
 
+#. TRANS: Server error displayed when group update fails.
 #. TRANS: Server error displayed when editing a group fails.
-#: actions/apigroupprofileupdate.php:171 actions/editgroup.php:274
 msgid "Could not update group."
 msgstr "Kunne ikke oppdatere gruppe."
 
+#. TRANS: Server error displayed when adding group aliases fails.
 #. TRANS: Server error displayed when group aliases could not be added.
 #. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/apigroupprofileupdate.php:194 actions/editgroup.php:281
-#: classes/User_group.php:540
 msgid "Could not create aliases."
 msgstr "Kunne ikke opprette alias."
 
+#. TRANS: API validation exception thrown when nickname does not validate.
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: actions/apigroupprofileupdate.php:249 lib/nickname.php:165
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr "Kallenavn kan kun ha små bokstaver og tall og ingen mellomrom."
 
-#: actions/apigroupprofileupdate.php:286
-#, fuzzy
-msgid "Full name is too long (max 255 chars)."
-msgstr "Fullt navn er for langt (maks 255 tegn)."
-
-#: actions/apigroupprofileupdate.php:296
-#, fuzzy, php-format
-msgid "description is too long (max %d chars)."
-msgstr "Beskrivelsen er for lang (maks %d tegn)."
-
-#: actions/apigroupprofileupdate.php:307
-#, fuzzy
-msgid "Location is too long (max 255 chars)."
-msgstr "Plasseringen er for lang (maks 255 tegn)."
-
-#: actions/apigroupprofileupdate.php:326
-#, fuzzy, php-format
-msgid "Too many aliases! Maximum %d."
-msgstr "For mange alias. Maks %d er tillatt."
-
-#. TRANS: Group edit form validation error.
+#. TRANS: API validation exception thrown when alias is the same as nickname.
 #. TRANS: Group create form validation error.
-#. TRANS: %s is the invalid alias.
-#: actions/apigroupprofileupdate.php:342 actions/editgroup.php:241
-#: actions/newgroup.php:188
-#, php-format
-msgid "Invalid alias: \"%s\""
-msgstr "Ugyldig alias: «%s»"
+#, fuzzy
+msgid "Alias cannot be the same as nickname."
+msgstr "Alias kan ikke være det samme som kallenavn."
 
 #. TRANS: Client error displayed when uploading a media file has failed.
-#: actions/apimediaupload.php:101
 msgid "Upload failed."
 msgstr "Opplasting feilet."
 
 #. TRANS: Client error given from the OAuth API when the request token or verifier is invalid.
-#: actions/apioauthaccesstoken.php:102
 #, fuzzy
 msgid "Invalid request token or verifier."
 msgstr "Ugyldig symbol."
 
 #. TRANS: Client error given when no oauth_token was passed to the OAuth API.
-#: actions/apioauthauthorize.php:107
 msgid "No oauth_token parameter provided."
 msgstr "Ingen verdi for oauth_token er oppgitt."
 
 #. TRANS: Client error given when an invalid request token was passed to the OAuth API.
-#: actions/apioauthauthorize.php:115 actions/apioauthauthorize.php:129
 #, fuzzy
 msgid "Invalid request token."
 msgstr "Ugyldig symbol."
 
 #. TRANS: Client error given when an invalid request token was passed to the OAuth API.
-#: actions/apioauthauthorize.php:121
 #, fuzzy
 msgid "Request token already authorized."
 msgstr "Du er ikke autorisert."
@@ -868,31 +663,14 @@ msgstr "Du er ikke autorisert."
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
 #. TRANS: Client error displayed when the session token is not okay.
-#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:75
-#: actions/emailsettings.php:292 actions/favor.php:75 actions/geocode.php:55
-#: actions/groupblock.php:65 actions/grouplogo.php:321
-#: actions/groupunblock.php:65 actions/imsettings.php:241
-#: actions/invite.php:60 actions/makeadmin.php:66 actions/newmessage.php:135
-#: actions/newnotice.php:105 actions/nudge.php:80
-#: actions/oauthappssettings.php:162 actions/oauthconnectionssettings.php:135
-#: actions/passwordsettings.php:137 actions/pluginenable.php:87
-#: actions/profilesettings.php:218 actions/recoverpassword.php:383
-#: actions/register.php:157 actions/remotesubscribe.php:76
-#: actions/repeat.php:82 actions/smssettings.php:249 actions/subedit.php:40
-#: actions/subscribe.php:87 actions/tagother.php:145
-#: actions/unsubscribe.php:69 actions/urlsettings.php:171
-#: actions/userauthorization.php:53 lib/designsettings.php:122
 msgid "There was a problem with your session token. Try again, please."
 msgstr "Det var et problem med din sesjons-autentisering. Prøv igjen."
 
 #. TRANS: Form validation error given when an invalid username and/or password was passed to the OAuth API.
-#: actions/apioauthauthorize.php:168
 msgid "Invalid nickname / password!"
 msgstr "Ugyldig kallenavn / passord!"
 
 #. TRANS: Server error displayed when a database action fails.
-#: actions/apioauthauthorize.php:217
 msgid "Database error inserting oauth_token_association."
 msgstr "Databasefeil ved innsetting av oauth_token_association."
 
@@ -908,28 +686,19 @@ msgstr "Databasefeil ved innsetting av oauth_token_association."
 #. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
 #. TRANS: Message given submitting a form with an unknown action in SMS settings.
 #. TRANS: Unknown form validation error in design settings form.
-#: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
-#: actions/designadminpanel.php:100 actions/editapplication.php:144
-#: actions/emailsettings.php:311 actions/grouplogo.php:332
-#: actions/imsettings.php:256 actions/newapplication.php:124
-#: actions/oauthconnectionssettings.php:144 actions/recoverpassword.php:46
-#: actions/smssettings.php:270 lib/designsettings.php:133
 msgid "Unexpected form submission."
 msgstr "Uventet skjemainnsending."
 
 #. TRANS: Title for a page where a user can confirm/deny account access by an external application.
-#: actions/apioauthauthorize.php:387
 msgid "An application would like to connect to your account"
 msgstr "Et program ønsker å koble til kontoen din"
 
 #. TRANS: Fieldset legend.
-#: actions/apioauthauthorize.php:404
 msgid "Allow or deny access"
 msgstr "Tillat eller nekt tilgang"
 
 #. TRANS: User notification of external application requesting account access.
 #. TRANS: %3$s is the access type requested (read-write or read-only), %4$s is the StatusNet sitename.
-#: actions/apioauthauthorize.php:425
 #, php-format
 msgid ""
 "An application would like the ability to <strong>%3$s</strong> your %4$s "
@@ -943,7 +712,6 @@ msgstr ""
 #. TRANS: User notification of external application requesting account access.
 #. TRANS: %1$s is the application name requesting access, %2$s is the organisation behind the application,
 #. TRANS: %3$s is the access type requested, %4$s is the StatusNet sitename.
-#: actions/apioauthauthorize.php:433
 #, php-format
 msgid ""
 "The application <strong>%1$s</strong> by <strong>%2$s</strong> would like "
@@ -955,22 +723,18 @@ msgstr ""
 "$s-konto til tredjeparter du stoler på."
 
 #. TRANS: Fieldset legend.
-#: actions/apioauthauthorize.php:455
 msgctxt "LEGEND"
 msgid "Account"
 msgstr "Konto"
 
 #. TRANS: Field label on OAuth API authorisation form.
+#. TRANS: Field label on login page.
 #. TRANS: Field label in form for profile settings.
-#: actions/apioauthauthorize.php:459 actions/login.php:225
-#: actions/profilesettings.php:107 actions/register.php:411
-#: actions/userauthorization.php:145 lib/groupeditform.php:145
 msgid "Nickname"
 msgstr "Nick"
 
 #. TRANS: Field label on OAuth API authorisation form.
-#: actions/apioauthauthorize.php:463 actions/login.php:228
-#: actions/register.php:415 lib/settingsnav.php:87
+#. TRANS: Field label on login page.
 msgid "Password"
 msgstr "Passord"
 
@@ -980,43 +744,34 @@ msgstr "Passord"
 #. TRANS: Button label to cancel an IM address confirmation procedure.
 #. TRANS: Button label to cancel a SMS address confirmation procedure.
 #. TRANS: Button label in the "Edit application" form.
-#: actions/apioauthauthorize.php:478 actions/emailsettings.php:125
-#: actions/imsettings.php:136 actions/smssettings.php:132
-#: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Cancel"
 msgstr "Avbryt"
 
 #. TRANS: Button text that when clicked will allow access to an account by an external application.
-#: actions/apioauthauthorize.php:485
 msgctxt "BUTTON"
 msgid "Allow"
 msgstr "Tillat"
 
 #. TRANS: Form instructions.
-#: actions/apioauthauthorize.php:502
 msgid "Authorize access to your account information."
 msgstr "Autoriser tilgang til din kontoinformasjon."
 
 #. TRANS: Header for user notification after revoking OAuth access to an application.
-#: actions/apioauthauthorize.php:594
 msgid "Authorization canceled."
 msgstr "Autorisasjon kansellert."
 
 #. TRANS: User notification after revoking OAuth access to an application.
 #. TRANS: %s is an OAuth token.
-#: actions/apioauthauthorize.php:598
 #, php-format
 msgid "The request token %s has been revoked."
 msgstr ""
 
 #. TRANS: Title of the page notifying the user that an anonymous client application was successfully authorized to access the user's account with OAuth.
-#: actions/apioauthauthorize.php:621
 msgid "You have successfully authorized the application"
 msgstr "Du har autorisert programmet"
 
 #. TRANS: Message notifying the user that an anonymous client application was successfully authorized to access the user's account with OAuth.
-#: actions/apioauthauthorize.php:625
 msgid ""
 "Please return to the application and enter the following security code to "
 "complete the process."
@@ -1026,14 +781,12 @@ msgstr ""
 
 #. TRANS: Title of the page notifying the user that the client application was successfully authorized to access the user's account with OAuth.
 #. TRANS: %s is the authorised application name.
-#: actions/apioauthauthorize.php:632
 #, php-format
 msgid "You have successfully authorized %s"
 msgstr "Du har autorisert %s"
 
 #. TRANS: Message notifying the user that the client application was successfully authorized to access the user's account with OAuth.
 #. TRANS: %s is the authorised application name.
-#: actions/apioauthauthorize.php:639
 #, php-format
 msgid ""
 "Please return to %s and enter the following security code to complete the "
@@ -1044,12 +797,10 @@ msgstr ""
 
 #. TRANS: Client error displayed trying to delete a status not using POST or DELETE.
 #. TRANS: POST and DELETE should not be translated.
-#: actions/apistatusesdestroy.php:111
 msgid "This method requires a POST or DELETE."
 msgstr "Denne metoden krever en POST eller DELETE."
 
 #. TRANS: Client error displayed trying to delete a status of another user.
-#: actions/apistatusesdestroy.php:136
 msgid "You may not delete another user's status."
 msgstr "Du kan ikke slette statusen til en annen bruker."
 
@@ -1057,21 +808,16 @@ msgstr "Du kan ikke slette statusen til en annen bruker."
 #. TRANS: Client error displayed trying to display redents of a non-exiting notice.
 #. TRANS: Client exception thrown when referencing a non-existing notice.
 #. TRANS: Error message displayed trying to delete a non-existing notice.
-#: actions/apistatusesretweet.php:74 actions/apistatusesretweets.php:70
-#: actions/atompubshowfavorite.php:82 actions/deletenotice.php:61
-#: actions/shownotice.php:92
 msgid "No such notice."
 msgstr "Ingen slik notis."
 
 #. TRANS: Client error displayed trying to repeat an own notice through the API.
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:549
 msgid "Cannot repeat your own notice."
 msgstr "Kan ikke gjenta din egen notis."
 
 #. TRANS: Client error displayed trying to re-repeat a notice through the API.
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:92 lib/command.php:555
 msgid "Already repeated that notice."
 msgstr "Allerede gjentatt den notisen."
 
@@ -1081,58 +827,44 @@ msgstr "Allerede gjentatt den notisen."
 #. TRANS: Client exception thrown when using an unsupported HTTP method.
 #. TRANS: Client error shown when using a non-supported HTTP method.
 #. TRANS: Client exception thrown when using an unsupported HTTP method.
-#: actions/apistatusesshow.php:118 actions/atompubfavoritefeed.php:103
-#: actions/atompubmembershipfeed.php:105 actions/atompubshowfavorite.php:117
-#: actions/atompubshowmembership.php:116
-#: actions/atompubshowsubscription.php:122
-#: actions/atompubsubscriptionfeed.php:109
 msgid "HTTP method not supported."
 msgstr "HTTP-metoden støttes ikke."
 
 #. TRANS: Exception thrown requesting an unsupported notice output format.
 #. TRANS: %s is the requested output format.
-#: actions/apistatusesshow.php:144
 #, fuzzy, php-format
 msgid "Unsupported format: %s."
 msgstr "Formatet støttes ikke: %s"
 
 #. TRANS: Client error displayed requesting a deleted status.
-#: actions/apistatusesshow.php:155
 msgid "Status deleted."
 msgstr "Status slettet."
 
 #. TRANS: Client error displayed requesting a status with an invalid ID.
-#: actions/apistatusesshow.php:162
 msgid "No status with that ID found."
 msgstr "Ingen status med den ID-en funnet."
 
 #. TRANS: Client error displayed when trying to delete a notice not using the Atom format.
-#: actions/apistatusesshow.php:227
 msgid "Can only delete using the Atom format."
 msgstr "Kan bare slette med Atom-formatet."
 
 #. TRANS: Client error displayed when a user has no rights to delete notices of other users.
 #. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
-#: actions/apistatusesshow.php:235 actions/deletenotice.php:78
 #, fuzzy
 msgid "Cannot delete this notice."
 msgstr "Kan ikke slette notisen."
 
 #. TRANS: Confirmation of notice deletion in API. %d is the ID (number) of the deleted notice.
-#: actions/apistatusesshow.php:249
 #, php-format
 msgid "Deleted notice %d"
 msgstr "Slettet notis %d"
 
 #. TRANS: Client error displayed when the parameter "status" is missing.
-#: actions/apistatusesupdate.php:221
 msgid "Client must provide a 'status' parameter with a value."
 msgstr "Klienten må angi en 'status'-parameter med en verdi."
 
 #. TRANS: Client error displayed when the parameter "status" is missing.
 #. TRANS: %d is the maximum number of character for a notice.
-#: actions/apistatusesupdate.php:244 actions/newnotice.php:161
-#: lib/mailhandler.php:60
 #, php-format
 msgid "That's too long. Maximum notice size is %d character."
 msgid_plural "That's too long. Maximum notice size is %d characters."
@@ -1140,13 +872,11 @@ msgstr[0] "Det er for langt. Maks notisstørrelse er %d tegn."
 msgstr[1] "Det er for langt. Maks notisstørrelse er %d tegn."
 
 #. TRANS: Client error displayed when replying to a non-existing notice.
-#: actions/apistatusesupdate.php:284
 msgid "Parent notice not found."
 msgstr "Foreldrenotis ikke funnet."
 
 #. TRANS: Client error displayed exceeding the maximum notice length.
 #. TRANS: %d is the maximum lenth for a notice.
-#: actions/apistatusesupdate.php:308 actions/newnotice.php:184
 #, php-format
 msgid "Maximum notice size is %d character, including attachment URL."
 msgid_plural "Maximum notice size is %d characters, including attachment URL."
@@ -1155,13 +885,11 @@ msgstr[1] "Maks notisstørrelse er %d tegn, inklusive vedleggs-URL."
 
 #. TRANS: Client error displayed when requesting profiles of followers in an unsupported format.
 #. TRANS: Client error displayed when requesting IDs of followers in an unsupported format.
-#: actions/apisubscriptions.php:228 actions/apisubscriptions.php:258
 msgid "Unsupported format."
 msgstr "Formatet støttes ikke."
 
 #. TRANS: Title for timeline of most recent favourite notices by a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname.
-#: actions/apitimelinefavorites.php:108
 #, php-format
 msgid "%1$s / Favorites from %2$s"
 msgstr "%1$s / Favoritter fra %2$s"
@@ -1169,14 +897,12 @@ msgstr "%1$s / Favoritter fra %2$s"
 #. TRANS: Subtitle for timeline of most recent favourite notices by a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user's full name,
 #. TRANS: %3$s is a user nickname.
-#: actions/apitimelinefavorites.php:120
 #, php-format
 msgid "%1$s updates favorited by %2$s / %3$s."
 msgstr "%1$s-oppdateringer markert som favoritt av %2$s / %3$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.
-#: actions/apitimelinementions.php:115
 #, php-format
 msgid "%1$s / Updates mentioning %2$s"
 msgstr "%1$s / Oppdateringer som nevner %2$s"
@@ -1184,48 +910,40 @@ msgstr "%1$s / Oppdateringer som nevner %2$s"
 #. TRANS: Subtitle for timeline of most recent mentions of a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname,
 #. TRANS: %3$s is a user's full name.
-#: actions/apitimelinementions.php:131
 #, php-format
 msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr "%1$s oppdateringer som svarer på oppdateringer fra %2$s / %3$s."
 
 #. TRANS: Title for site timeline. %s is the StatusNet sitename.
 #. TRANS: Public RSS feed title. %s is the StatusNet site name.
-#: actions/apitimelinepublic.php:193 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "%s offentlig tidslinje"
 
 #. TRANS: Subtitle for site timeline. %s is the StatusNet sitename.
-#: actions/apitimelinepublic.php:199
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "%s oppdateringer fra alle sammen!"
 
 #. TRANS: Server error displayed calling unimplemented API method for 'retweeted by me'.
-#: actions/apitimelineretweetedbyme.php:71
 msgid "Unimplemented."
 msgstr "Ikke-implementert."
 
 #. TRANS: Title for Atom feed "repeated to me". %s is the user nickname.
-#: actions/apitimelineretweetedtome.php:96
 #, php-format
 msgid "Repeated to %s"
 msgstr "Gjentatt til %s"
 
-#: actions/apitimelineretweetedtome.php:98
 #, fuzzy, php-format
 msgid "%1$s notices that were to repeated to %2$s / %3$s."
 msgstr "%1$s oppdateringer som svarer på oppdateringer fra %2$s / %3$s."
 
 #. TRANS: Title of list of repeated notices of the logged in user.
 #. TRANS: %s is the nickname of the logged in user.
-#: actions/apitimelineretweetsofme.php:98
 #, php-format
 msgid "Repeats of %s"
 msgstr "Repetisjoner av %s"
 
-#: actions/apitimelineretweetsofme.php:104
 #, fuzzy, php-format
 msgid "%1$s notices that %2$s / %3$s has repeated."
 msgstr "%s /@%s) la din notis til som en favoritt"
@@ -1234,179 +952,146 @@ msgstr "%s /@%s) la din notis til som en favoritt"
 #. TRANS: %s is the tag.
 #. TRANS: Title for first page of notices with tags.
 #. TRANS: %s is the tag.
-#: actions/apitimelinetag.php:101 actions/tag.php:69
 #, php-format
 msgid "Notices tagged with %s"
 msgstr "Notiser merket med %s"
 
 #. TRANS: Subtitle for timeline with lastest notices with a given tag.
 #. TRANS: %1$s is the tag, $2$s is the StatusNet sitename.
-#: actions/apitimelinetag.php:105 actions/tagrss.php:65
 #, php-format
 msgid "Updates tagged with %1$s on %2$s!"
 msgstr "Oppdateringer merket med %1$s på %2$s!"
 
 #. TRANS: Client error displayed trying to add a notice to another user's timeline.
-#: actions/apitimelineuser.php:308
 msgid "Only the user can add to their own timeline."
 msgstr "Bare brukeren kan legge til sin egen tidslinje."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:315
 msgid "Only accept AtomPub for Atom feeds."
 msgstr "Aksepterer kun AtomPub for Atom-matinger."
 
 #. TRANS: Client error displayed attempting to post an empty API notice.
-#: actions/apitimelineuser.php:322
 msgid "Atom post must not be empty."
 msgstr "Atom-innlegget kan ikke være tomt."
 
 #. TRANS: Client error displayed attempting to post an API that is not well-formed XML.
-#: actions/apitimelineuser.php:328
 msgid "Atom post must be well-formed XML."
 msgstr "Atom-innlegget må være velformatert XML."
 
 #. TRANS: Client error displayed when not using an Atom entry.
-#: actions/apitimelineuser.php:334 actions/atompubfavoritefeed.php:228
-#: actions/atompubmembershipfeed.php:230
-#: actions/atompubsubscriptionfeed.php:236
 msgid "Atom post must be an Atom entry."
 msgstr "Atom-innlegget må være en Atom-oppføring."
 
 #. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
-#: actions/apitimelineuser.php:345
 msgid "Can only handle POST activities."
 msgstr "Kan bare håndtere POST-handlinger."
 
 #. TRANS: Client error displayed when using an unsupported activity object type.
 #. TRANS: %s is the unsupported activity object type.
-#: actions/apitimelineuser.php:356
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr "Kan ikke håndtere handlingsobjekttype «%s»."
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
 #. TRANS: %d is the notice ID (number).
-#: actions/apitimelineuser.php:390
 #, php-format
 msgid "No content for notice %d."
 msgstr "Inget innhold for notis %d."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
 #. TRANS: %s is the notice URI.
-#: actions/apitimelineuser.php:419
 #, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "Notis med URI «%s» finnes allerede."
 
 #. TRANS: Server error for unfinished API method showTrends.
-#: actions/apitrends.php:85
 msgid "API method under construction."
 msgstr "API-metode under utvikling."
 
 #. TRANS: Client error displayed when requesting user information for a non-existing user.
-#: actions/apiuserprofileimage.php:80 actions/apiusershow.php:94
 msgid "User not found."
 msgstr "Bruker ikke funnet."
 
 #. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
 #. TRANS: Client exception.
 #. TRANS: Client error displayed trying to subscribe to a non-existing profile.
-#: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
-#: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
-#: actions/subscribe.php:110
 msgid "No such profile."
 msgstr "Ingen slik profil."
 
 #. TRANS: Subtitle for Atom favorites feed.
 #. TRANS: %1$s is a user nickname, %2$s is the StatusNet sitename.
-#: actions/atompubfavoritefeed.php:147
 #, fuzzy, php-format
 msgid "Notices %1$s has favorited on %2$s"
 msgstr "Oppdateringer fra %1$s og venner på %2$s!"
 
 #. TRANS: Client exception thrown when trying to set a favorite for another user.
 #. TRANS: Client exception thrown when trying to subscribe another user.
-#: actions/atompubfavoritefeed.php:217 actions/atompubsubscriptionfeed.php:225
 #, fuzzy
 msgid "Cannot add someone else's subscription."
 msgstr "Kan ikke legge til noen andres abonnement"
 
 #. TRANS: Client exception thrown when trying use an incorrect activity verb for the Atom pub method.
-#: actions/atompubfavoritefeed.php:240
 #, fuzzy
 msgid "Can only handle favorite activities."
 msgstr "Kan bare håndtere POST-handlinger."
 
 #. TRANS: Client exception thrown when trying favorite an object that is not a notice.
-#: actions/atompubfavoritefeed.php:250 actions/atompubmembershipfeed.php:250
 #, fuzzy
 msgid "Can only fave notices."
 msgstr "Finn innhold i notiser"
 
 #. TRANS: Client exception thrown when trying favorite a notice without content.
-#: actions/atompubfavoritefeed.php:259
 msgid "Unknown note."
 msgstr "Ukjent notat."
 
 #. TRANS: Client exception thrown when trying favorite an already favorited notice.
-#: actions/atompubfavoritefeed.php:267
 #, fuzzy
 msgid "Already a favorite."
 msgstr "Legg til i favoritter"
 
 #. TRANS: Title for group membership feed.
 #. TRANS: %s is a username.
-#: actions/atompubmembershipfeed.php:144
 #, fuzzy, php-format
 msgid "%s group memberships"
 msgstr "%s gruppemedlemmer"
 
 #. TRANS: Subtitle for group membership feed.
 #. TRANS: %1$s is a username, %2$s is the StatusNet sitename.
-#: actions/atompubmembershipfeed.php:149
 #, fuzzy, php-format
 msgid "Groups %1$s is a member of on %2$s"
 msgstr "%1$s grupper %2$s er et medlem av."
 
 #. TRANS: Client exception thrown when trying subscribe someone else to a group.
-#: actions/atompubmembershipfeed.php:219
 #, fuzzy
 msgid "Cannot add someone else's membership."
 msgstr "Kan ikke legge til noen andres abonnement"
 
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#: actions/atompubmembershipfeed.php:242
 #, fuzzy
 msgid "Can only handle join activities."
 msgstr "Kan bare håndtere POST-handlinger."
 
 #. TRANS: Client exception thrown when trying to subscribe to a non-existing group.
-#: actions/atompubmembershipfeed.php:259
 #, fuzzy
 msgid "Unknown group."
 msgstr "Ukjent"
 
 #. TRANS: Client exception thrown when trying to subscribe to an already subscribed group.
-#: actions/atompubmembershipfeed.php:267
 #, fuzzy
 msgid "Already a member."
 msgstr "Alle medlemmer"
 
 #. TRANS: Client exception thrown when trying to subscribe to group while blocked from that group.
-#: actions/atompubmembershipfeed.php:275
 msgid "Blocked by admin."
 msgstr ""
 
 #. TRANS: Client exception thrown when referencing a non-existing favorite.
-#: actions/atompubshowfavorite.php:90
 #, fuzzy
 msgid "No such favorite."
 msgstr "Ingen slik fil."
 
 #. TRANS: Client exception thrown when trying to remove a favorite notice of another user.
-#: actions/atompubshowfavorite.php:151
 #, fuzzy
 msgid "Cannot delete someone else's favorite."
 msgstr "Kunne ikke slette favoritt."
@@ -1433,93 +1118,68 @@ msgstr "Kunne ikke slette favoritt."
 #. TRANS: Client error displayed when trying to join a non-existing group.
 #. TRANS: Client error displayed when trying to leave a non-local group.
 #. TRANS: Client error displayed when trying to leave a non-existing group.
+#. TRANS: Client error displayed when providing an invalid group ID on the Make Admin page.
 #. 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.
 #. TRANS: Command exception text shown when a group is requested that does not exist.
 #. TRANS: Error text shown when trying to leave a group that does not exist.
-#: actions/atompubshowmembership.php:81 actions/blockedfromgroup.php:81
-#: actions/blockedfromgroup.php:89 actions/deletegroup.php:87
-#: actions/deletegroup.php:100 actions/editgroup.php:102
-#: actions/foafgroup.php:46 actions/foafgroup.php:65 actions/foafgroup.php:73
-#: actions/groupblock.php:89 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:101 actions/grouplogo.php:103
-#: actions/groupmembers.php:84 actions/groupmembers.php:92
-#: actions/grouprss.php:97 actions/grouprss.php:105
-#: actions/groupunblock.php:89 actions/joingroup.php:82
-#: actions/joingroup.php:95 actions/leavegroup.php:82
-#: actions/leavegroup.php:95 actions/makeadmin.php:86
-#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:392
 msgid "No such group."
 msgstr "Ingen slik gruppe."
 
 #. TRANS: Client exception thrown when trying to show membership of a non-subscribed group
-#: actions/atompubshowmembership.php:91
 #, fuzzy
 msgid "Not a member."
 msgstr "Alle medlemmer"
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
-#: actions/atompubshowmembership.php:150
 #, fuzzy
 msgid "Cannot delete someone else's membership."
 msgstr "Kunne ikke slette favoritt."
 
 #. TRANS: Client exception thrown when trying to display a subscription for a non-existing profile ID.
 #. TRANS: %d is the non-existing profile ID number.
-#: actions/atompubshowsubscription.php:72
-#: actions/atompubshowsubscription.php:83
-#: actions/atompubsubscriptionfeed.php:74
 #, fuzzy, php-format
 msgid "No such profile id: %d."
 msgstr "Ingen slik profil."
 
 #. 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.
-#: actions/atompubshowsubscription.php:94
 #, fuzzy, php-format
 msgid "Profile %1$d not subscribed to profile %2$d."
 msgstr "Ikke autorisert."
 
 #. TRANS: Client exception thrown when trying to delete a subscription of another user.
-#: actions/atompubshowsubscription.php:157
 #, fuzzy
 msgid "Cannot delete someone else's subscription."
 msgstr "Kunne ikke slette favoritt."
 
 #. TRANS: Subtitle for Atom subscription feed.
 #. TRANS: %1$s is a user nickname, %s$s is the StatusNet sitename.
-#: actions/atompubsubscriptionfeed.php:153
 #, fuzzy, php-format
 msgid "People %1$s has subscribed to on %2$s"
 msgstr "Fjernabonner"
 
 #. TRANS: Client error displayed when not using the follow verb.
-#: actions/atompubsubscriptionfeed.php:248
 msgid "Can only handle Follow activities."
 msgstr ""
 
 #. TRANS: Client exception thrown when subscribing to an object that is not a person.
-#: actions/atompubsubscriptionfeed.php:256
 msgid "Can only follow people."
 msgstr ""
 
 #. TRANS: Client exception thrown when subscribing to a non-existing profile.
 #. TRANS: %s is the unknown profile ID.
-#: actions/atompubsubscriptionfeed.php:267
 #, fuzzy, php-format
 msgid "Unknown profile %s."
 msgstr "Ukjent filtype"
 
 #. TRANS: Client error displayed trying to subscribe to an already subscribed profile.
 #. TRANS: %s is the profile the user already has a subscription on.
-#: actions/atompubsubscriptionfeed.php:275
 #, fuzzy, php-format
 msgid "Already subscribed to %s."
 msgstr "Alle abonnementer"
 
 #. TRANS: Client error displayed trying to get a non-existing attachment.
-#: actions/attachment.php:73
 msgid "No such attachment."
 msgstr "Ingen slike vedlegg."
 
@@ -1531,31 +1191,23 @@ msgstr "Ingen slike vedlegg."
 #. TRANS: Client error displayed when trying to view group members without providing a group nickname.
 #. TRANS: Client error displayed when requesting a group RSS feed without providing a group nickname.
 #. TRANS: Client error displayed if no nickname argument was given requesting a group page.
-#: actions/avatarbynickname.php:60 actions/blockedfromgroup.php:73
-#: actions/editgroup.php:85 actions/groupdesignsettings.php:84
-#: actions/grouplogo.php:86 actions/groupmembers.php:76
-#: actions/grouprss.php:89 actions/showgroup.php:116
 msgid "No nickname."
 msgstr "Ingen kallenavn."
 
 #. TRANS: Client error displayed trying to get an avatar without providing an avatar size.
-#: actions/avatarbynickname.php:66
 msgid "No size."
 msgstr "Ingen størrelse."
 
 #. TRANS: Client error displayed trying to get an avatar providing an invalid avatar size.
-#: actions/avatarbynickname.php:72
 msgid "Invalid size."
 msgstr "Ugyldig størrelse"
 
 #. TRANS: Title for avatar upload page.
-#: actions/avatarsettings.php:66 lib/settingsnav.php:82
 msgid "Avatar"
 msgstr "Brukerbilde"
 
 #. TRANS: Instruction for avatar upload page.
 #. TRANS: %s is the maximum file size, for example "500b", "10kB" or "2MB".
-#: actions/avatarsettings.php:78
 #, php-format
 msgid "You can upload your personal avatar. The maximum file size is %s."
 msgstr "Du kan laste opp en personlig avatar. Maks filstørrelse er %s."
@@ -1564,17 +1216,12 @@ msgstr "Du kan laste opp en personlig avatar. Maks filstørrelse er %s."
 #. TRANS: Server error displayed coming across a request from a user without a profile.
 #. TRANS: Server error displayed when trying to authorise a remote subscription request
 #. TRANS: while the user has no profile.
-#: actions/avatarsettings.php:108 actions/avatarsettings.php:192
-#: actions/grouplogo.php:184 actions/remotesubscribe.php:190
-#: actions/userauthorization.php:75 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr "Bruker uten samsvarende profil."
 
 #. TRANS: Avatar upload page form legend.
 #. TRANS: Avatar upload page crop form legend.
 #. TRANS: Legend for group logo settings fieldset.
-#: actions/avatarsettings.php:122 actions/avatarsettings.php:205
-#: actions/grouplogo.php:261
 msgid "Avatar settings"
 msgstr "Avatarinnstillinger"
 
@@ -1582,8 +1229,6 @@ msgstr "Avatarinnstillinger"
 #. TRANS: Header on avatar upload crop form for thumbnail of originally uploaded avatar (h2).
 #. TRANS: Uploaded original file in group logo form.
 #. TRANS: Header for originally uploaded file before a crop on the group logo page.
-#: actions/avatarsettings.php:131 actions/avatarsettings.php:214
-#: actions/grouplogo.php:207 actions/grouplogo.php:270
 msgid "Original"
 msgstr "Opprinnelig"
 
@@ -1591,82 +1236,67 @@ msgstr "Opprinnelig"
 #. TRANS: Header on avatar upload crop form for thumbnail of to be used rendition of uploaded avatar (h2).
 #. TRANS: Header for preview of to be displayed group logo.
 #. TRANS: Header for the cropped group logo on the group logo page.
-#: actions/avatarsettings.php:147 actions/avatarsettings.php:227
-#: actions/grouplogo.php:219 actions/grouplogo.php:283
 msgid "Preview"
 msgstr "Forhåndsvis"
 
 #. TRANS: Button on avatar upload page to delete current avatar.
 #. TRANS: Button text for user account deletion.
-#: actions/avatarsettings.php:155 actions/deleteaccount.php:319
 msgctxt "BUTTON"
 msgid "Delete"
 msgstr "Slett"
 
 #. TRANS: Button on avatar upload page to upload an avatar.
 #. TRANS: Submit button to confirm upload of a user backup file for account restore.
-#: actions/avatarsettings.php:173 actions/restoreaccount.php:369
 msgctxt "BUTTON"
 msgid "Upload"
 msgstr "Last opp"
 
 #. TRANS: Button on avatar upload crop form to confirm a selected crop as avatar.
-#: actions/avatarsettings.php:243
 msgctxt "BUTTON"
 msgid "Crop"
 msgstr "Beskjær"
 
 #. TRANS: Validation error on avatar upload form when no file was uploaded.
-#: actions/avatarsettings.php:318
 msgid "No file uploaded."
 msgstr "Ingen fil lastet opp."
 
 #. TRANS: Avatar upload form instruction after uploading a file.
-#: actions/avatarsettings.php:345
 #, fuzzy
 msgid "Pick a square area of the image to be your avatar."
 msgstr "Velg et kvadratisk utsnitt av bildet som din avatar."
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
 #. TRANS: Server error displayed trying to crop an uploaded group logo that is no longer present.
-#: actions/avatarsettings.php:360 actions/grouplogo.php:391
 msgid "Lost our file data."
 msgstr "Mistet våre fildata."
 
 #. TRANS: Success message for having updated a user avatar.
-#: actions/avatarsettings.php:384
 msgid "Avatar updated."
 msgstr "Brukerbildet har blitt oppdatert."
 
 #. TRANS: Error displayed on the avatar upload page if the avatar could not be updated for an unknown reason.
-#: actions/avatarsettings.php:388
 msgid "Failed updating avatar."
 msgstr "Oppdatering av avatar mislyktes."
 
 #. TRANS: Success message for deleting a user avatar.
-#: actions/avatarsettings.php:412
 msgid "Avatar deleted."
 msgstr "Avatar slettet."
 
 #. TRANS: Title for backup account page.
 #. TRANS: Option in profile settings to create a backup of the account of the currently logged in user.
-#: actions/backupaccount.php:61 actions/profilesettings.php:468
 msgid "Backup account"
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to backup an account while not logged in.
-#: actions/backupaccount.php:79
 #, fuzzy
 msgid "Only logged-in users can backup their account."
 msgstr "Bare innloggede brukere kan repetere notiser."
 
 #. TRANS: Client exception thrown when trying to backup an account without having backup rights.
-#: actions/backupaccount.php:84
 msgid "You may not backup your account."
 msgstr ""
 
 #. TRANS: Information displayed on the backup account page.
-#: actions/backupaccount.php:227
 msgid ""
 "You can backup your account data in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format. This is an experimental feature and provides "
@@ -1676,31 +1306,26 @@ msgid ""
 msgstr ""
 
 #. TRANS: Submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:250
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Backup"
 msgstr "Bakgrunn"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:254
 msgid "Backup your account."
 msgstr ""
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
-#: actions/block.php:68
 msgid "You already blocked that user."
 msgstr "Du har allerede blokkert den brukeren."
 
 #. TRANS: Title for block user page.
 #. TRANS: Legend for block user form.
 #. TRANS: Fieldset legend for block user from group form.
-#: actions/block.php:106 actions/block.php:136 actions/groupblock.php:165
 msgid "Block user"
 msgstr "Blokker brukeren"
 
 #. TRANS: Explanation of consequences when blocking a user on the block user page.
-#: actions/block.php:139
 msgid ""
 "Are you sure you want to block this user? Afterwards, they will be "
 "unsubscribed from you, unable to subscribe to you in the future, and you "
@@ -1716,15 +1341,11 @@ msgstr ""
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:154 actions/deleteapplication.php:157
-#: actions/deletegroup.php:220 actions/deletenotice.php:155
-#: actions/deleteuser.php:154 actions/groupblock.php:187
 msgctxt "BUTTON"
 msgid "No"
 msgstr "Nei"
 
 #. TRANS: Submit button title for 'No' when blocking a user.
-#: actions/block.php:158
 #, fuzzy
 msgid "Do not block this user."
 msgstr "Ikke blokker denne brukeren"
@@ -1735,179 +1356,143 @@ msgstr "Ikke blokker denne brukeren"
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:161 actions/deleteapplication.php:164
-#: actions/deletegroup.php:227 actions/deletenotice.php:162
-#: actions/deleteuser.php:161 actions/groupblock.php:194
 msgctxt "BUTTON"
 msgid "Yes"
 msgstr "Ja"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:165
 #, fuzzy
 msgid "Block this user."
 msgstr "Blokker denne brukeren"
 
 #. TRANS: Server error displayed when blocking a user fails.
-#: actions/block.php:189
 msgid "Failed to save block information."
 msgstr "Kunne ikke lagre blokkeringsinformasjon."
 
 #. TRANS: Title for first page with list of users blocked from a group.
 #. TRANS: %s is a group nickname.
-#: actions/blockedfromgroup.php:101
 #, php-format
 msgid "%s blocked profiles"
 msgstr "%s blokkerte profiler"
 
 #. TRANS: Title for any but the first page with list of users blocked from a group.
 #. TRANS: %1$s is a group nickname, %2$d is a page number.
-#: actions/blockedfromgroup.php:106
 #, php-format
 msgid "%1$s blocked profiles, page %2$d"
 msgstr "%1$s blokkerte profiler, side %2$d"
 
 #. TRANS: Instructions for list of users blocked from a group.
-#: actions/blockedfromgroup.php:122
 msgid "A list of the users blocked from joining this group."
 msgstr "En liste over brukere som er blokkert fra å delta i denne gruppen."
 
 #. TRANS: Form legend for unblocking a user from a group.
-#: actions/blockedfromgroup.php:291
 msgid "Unblock user from group"
 msgstr "Opphev blokkering av bruker fra gruppe"
 
 #. TRANS: Button text for unblocking a user from a group.
-#: actions/blockedfromgroup.php:323
 msgctxt "BUTTON"
 msgid "Unblock"
 msgstr "Opphev blokkering"
 
 #. TRANS: Tooltip for button for unblocking a user from a group.
 #. TRANS: Description of the form to unblock a user.
-#: actions/blockedfromgroup.php:327 lib/unblockform.php:78
 msgid "Unblock this user"
 msgstr "Opphev blokkering av denne brukeren"
 
 #. TRANS: Title for mini-posting window loaded from bookmarklet.
 #. TRANS: %s is the StatusNet site name.
-#: actions/bookmarklet.php:51
 #, php-format
 msgid "Post to %s"
 msgstr "Post til %s"
 
 #. TRANS: Client error displayed when not providing a confirmation code in the contact address confirmation action.
-#: actions/confirmaddress.php:74
 msgid "No confirmation code."
 msgstr "Ingen bekreftelseskode."
 
 #. TRANS: Client error displayed when providing a non-existing confirmation code in the contact address confirmation action.
-#: actions/confirmaddress.php:80
 msgid "Confirmation code not found."
 msgstr "Fant ikke bekreftelseskode."
 
 #. TRANS: Client error displayed when not providing a confirmation code for another user in the contact address confirmation action.
-#: actions/confirmaddress.php:86
 msgid "That confirmation code is not for you!"
 msgstr "Den bekreftelseskoden er ikke til deg."
 
 #. TRANS: Server error for an unknown address type, which can be 'email', 'sms', or the name of an IM network (such as 'xmpp' or 'aim')
-#: actions/confirmaddress.php:94
-#, fuzzy, php-format
+#, php-format
 msgid "Unrecognized address type %s"
-msgstr "Ukjent adressetype %s."
+msgstr "Ukjent adressetype %s"
 
 #. TRANS: Client error for an already confirmed email/jabber/sms address.
-#: actions/confirmaddress.php:103 actions/confirmaddress.php:136
 msgid "That address has already been confirmed."
 msgstr "Den adressen har allerede blitt bekreftet."
 
-#: actions/confirmaddress.php:121 actions/imsettings.php:444
-#: actions/userdesignsettings.php:306
-#, fuzzy
 msgid "Couldn't update user."
 msgstr "Kunne ikke oppdatere bruker."
 
-#: actions/confirmaddress.php:144
 #, fuzzy
 msgid "Couldn't update user im preferences."
 msgstr "Kunne ikke oppdatere brukeroppføring."
 
-#: actions/confirmaddress.php:156
 #, fuzzy
 msgid "Couldn't insert user im preferences."
 msgstr "Kunne ikke sette inn bekreftelseskode."
 
 #. TRANS: Server error displayed when an address confirmation code deletion from the
 #. TRANS: database fails in the contact address confirmation action.
-#: actions/confirmaddress.php:169
 msgid "Could not delete address confirmation."
 msgstr "Kunne ikke slette adressebekreftelse."
 
 #. TRANS: Title for the contact address confirmation action.
-#: actions/confirmaddress.php:185
 msgid "Confirm address"
 msgstr "Bekreft adresse"
 
 #. TRANS: Success message for the contact address confirmation action.
 #. TRANS: %s can be 'email', 'jabber', or 'sms'.
-#: actions/confirmaddress.php:200
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "Adressen «%s» har blitt bekreftet for din konto."
 
 #. TRANS: Title for page with a conversion (multiple notices in context).
-#: actions/conversation.php:96
 msgid "Conversation"
 msgstr "Samtale"
 
 #. TRANS: Header on conversation page. Hidden by default (h2).
 #. TRANS: Label for user statistics.
-#: actions/conversation.php:149 lib/noticelist.php:87
-#: lib/profileaction.php:246 lib/searchgroupnav.php:82
-#: lib/threadednoticelist.php:66
 msgid "Notices"
 msgstr "Notiser"
 
 #. TRANS: Client exception displayed trying to delete a user account while not logged in.
-#: actions/deleteaccount.php:71
 #, fuzzy
 msgid "Only logged-in users can delete their account."
 msgstr "Bare innloggede brukere kan repetere notiser."
 
 #. TRANS: Client exception displayed trying to delete a user account without have the rights to do that.
-#: actions/deleteaccount.php:77
 #, fuzzy
 msgid "You cannot delete your account."
 msgstr "Du kan ikke slette brukere."
 
 #. TRANS: Confirmation text for user deletion. The user has to type this exactly the same, including punctuation.
-#: actions/deleteaccount.php:160 actions/deleteaccount.php:297
 msgid "I am sure."
 msgstr ""
 
 #. TRANS: Notification for user about the text that must be input to be able to delete a user account.
 #. TRANS: %s is the text that needs to be input.
-#: actions/deleteaccount.php:164
 #, php-format
 msgid "You must write \"%s\" exactly in the box."
 msgstr ""
 
 #. TRANS: Confirmation that a user account has been deleted.
-#: actions/deleteaccount.php:206
 #, fuzzy
 msgid "Account deleted."
 msgstr "Avatar slettet."
 
 #. TRANS: Page title for page on which a user account can be deleted.
 #. TRANS: Option in profile settings to delete the account of the currently logged in user.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:476
 #, fuzzy
 msgid "Delete account"
 msgstr "Opprett en konto"
 
 #. TRANS: Form text for user deletion form.
-#: actions/deleteaccount.php:279
 msgid ""
 "This will <strong>permanently delete</strong> your account data from this "
 "server."
@@ -1915,7 +1500,6 @@ msgstr ""
 
 #. TRANS: Additional form text for user deletion form shown if a user has account backup rights.
 #. TRANS: %s is a URL to the backup page.
-#: actions/deleteaccount.php:285
 #, php-format
 msgid ""
 "You are strongly advised to <a href=\"%s\">back up your data</a> before "
@@ -1924,57 +1508,44 @@ msgstr ""
 
 #. TRANS: Field label for delete account confirmation entry.
 #. TRANS: Field label for password reset form where the password has to be typed again.
-#: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:262 actions/register.php:419
 msgid "Confirm"
 msgstr "Bekreft"
 
 #. TRANS: Input title for the delete account field.
 #. TRANS: %s is the text that needs to be input.
-#: actions/deleteaccount.php:304
 #, fuzzy, php-format
 msgid "Enter \"%s\" to confirm that you want to delete your account."
 msgstr "Du kan ikke slette brukere."
 
 #. TRANS: Button title for user account deletion.
-#: actions/deleteaccount.php:323
 #, fuzzy
 msgid "Permanently delete your account"
 msgstr "Du kan ikke slette brukere."
 
 #. TRANS: Client error displayed trying to delete an application while not logged in.
-#: actions/deleteapplication.php:62
 msgid "You must be logged in to delete an application."
 msgstr "Du må være innlogget for å slette et program."
 
 #. TRANS: Client error displayed trying to delete an application that does not exist.
-#: actions/deleteapplication.php:71
 msgid "Application not found."
 msgstr "Program ikke funnet."
 
 #. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
-#: actions/deleteapplication.php:79 actions/editapplication.php:78
-#: actions/showapplication.php:90
 msgid "You are not the owner of this application."
 msgstr "Du er ikke eieren av dette programmet."
 
 #. TRANS: Client error text when there is a problem with the session token.
-#: actions/deleteapplication.php:102 actions/editapplication.php:131
-#: actions/newapplication.php:112 actions/showapplication.php:113
-#: lib/action.php:1391
 #, fuzzy
 msgid "There was a problem with your session token."
 msgstr "Det var et problem med din sesjons-autentisering. Prøv igjen."
 
 #. TRANS: Title for delete application page.
 #. TRANS: Fieldset legend on delete application page.
-#: actions/deleteapplication.php:124 actions/deleteapplication.php:149
 msgid "Delete application"
 msgstr "Slett program"
 
 #. TRANS: Confirmation text on delete application page.
-#: actions/deleteapplication.php:152
 msgid ""
 "Are you sure you want to delete this application? This will clear all data "
 "about the application from the database, including all existing user "
@@ -1985,57 +1556,47 @@ msgstr ""
 "brukertilkoblinger."
 
 #. TRANS: Submit button title for 'No' when deleting an application.
-#: actions/deleteapplication.php:161
 #, fuzzy
 msgid "Do not delete this application."
 msgstr "Ikke slett dette programmet"
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
-#: actions/deleteapplication.php:167
 #, fuzzy
 msgid "Delete this application."
 msgstr "Slett dette programmet"
 
 #. TRANS: Client error when trying to delete group while not logged in.
-#: actions/deletegroup.php:64
 msgid "You must be logged in to delete a group."
 msgstr "Du må være innlogget for å slette en gruppe."
 
 #. TRANS: Client error when trying to delete a group without providing a nickname or ID for the group.
 #. TRANS: Client error displayed when trying to join a group without providing a group name or group ID.
 #. TRANS: Client error displayed when trying to leave a group without providing a group name or group ID.
-#: actions/deletegroup.php:94 actions/joingroup.php:89
-#: actions/leavegroup.php:89
 msgid "No nickname or ID."
 msgstr "ngen kallenavn eller ID."
 
 #. TRANS: Client error when trying to delete a group without having the rights to delete it.
-#: actions/deletegroup.php:107
 msgid "You are not allowed to delete this group."
 msgstr "Du har ikke tillatelse til å slette denne gruppen."
 
 #. TRANS: Server error displayed if a group could not be deleted.
 #. TRANS: %s is the name of the group that could not be deleted.
-#: actions/deletegroup.php:150
 #, php-format
 msgid "Could not delete group %s."
 msgstr "Kunne ikke slette gruppen %s."
 
 #. TRANS: Message given after deleting a group.
 #. TRANS: %s is the deleted group's name.
-#: actions/deletegroup.php:159
 #, php-format
 msgid "Deleted group %s"
 msgstr "Slettet gruppen %s"
 
 #. TRANS: Title of delete group page.
 #. TRANS: Form legend for deleting a group.
-#: actions/deletegroup.php:176 actions/deletegroup.php:202
 msgid "Delete group"
 msgstr "Slett gruppe"
 
 #. TRANS: Warning in form for deleleting a group.
-#: actions/deletegroup.php:206
 #, fuzzy
 msgid ""
 "Are you sure you want to delete this group? This will clear all data about "
@@ -2046,13 +1607,11 @@ msgstr ""
 "om brukeren fra databasen, uten sikkerhetskopi."
 
 #. TRANS: Submit button title for 'No' when deleting a group.
-#: actions/deletegroup.php:224
 #, fuzzy
 msgid "Do not delete this group."
 msgstr "Ikke slett denne gruppen"
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
-#: actions/deletegroup.php:231
 #, fuzzy
 msgid "Delete this group."
 msgstr "Slett denne gruppen"
@@ -2063,22 +1622,18 @@ msgstr "Slett denne gruppen"
 #. TRANS: Client error displayed trying to block a user from a group while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying to log out when not logged in.
+#. TRANS: Client error displayed when trying to access the "make admin" page while not logged in.
+#. TRANS: Client error displayed trying to create a new direct message while not logged in.
+#. TRANS: Client error displayed trying to send a notice while not logged in.
+#. TRANS: Client error displayed trying to nudge a user without being logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
 #. TRANS: Client error displayed when trying to change user options while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
-#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:70
-#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
-#: actions/nudge.php:63 actions/pluginenable.php:97 actions/subedit.php:33
-#: actions/subscribe.php:98 actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:71 lib/profileformaction.php:63
-#: lib/settingsaction.php:72
 msgid "Not logged in."
 msgstr "Ikke logget inn."
 
 #. TRANS: Instructions for deleting a notice.
-#: actions/deletenotice.php:110
 msgid ""
 "You are about to permanently delete a notice. Once this is done, it cannot "
 "be undone."
@@ -2088,51 +1643,42 @@ msgstr ""
 
 #. TRANS: Page title when deleting a notice.
 #. TRANS: Fieldset legend for the delete notice form.
-#: actions/deletenotice.php:117 actions/deletenotice.php:148
 msgid "Delete notice"
 msgstr "Slett notis"
 
 #. TRANS: Message for the delete notice form.
-#: actions/deletenotice.php:152
 msgid "Are you sure you want to delete this notice?"
 msgstr "Er du sikker på at du vil slette denne notisen?"
 
 #. TRANS: Submit button title for 'No' when deleting a notice.
-#: actions/deletenotice.php:159
 #, fuzzy
 msgid "Do not delete this notice."
 msgstr "Ikke slett denne notisen"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:166
 #, fuzzy
 msgid "Delete this notice."
 msgstr "Slett denne notisen"
 
 #. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
-#: actions/deleteuser.php:66
 msgid "You cannot delete users."
 msgstr "Du kan ikke slette brukere."
 
 #. TRANS: Client error displayed when trying to delete a non-local user.
-#: actions/deleteuser.php:74
 msgid "You can only delete local users."
 msgstr "Du kan bare slette lokale brukere."
 
 #. TRANS: Title of delete user page.
-#: actions/deleteuser.php:110
 #, fuzzy
 msgctxt "TITLE"
 msgid "Delete user"
 msgstr "Slett bruker"
 
 #. TRANS: Fieldset legend on delete user page.
-#: actions/deleteuser.php:134
 msgid "Delete user"
 msgstr "Slett bruker"
 
 #. TRANS: Information text to request if a user is certain that the described action has to be performed.
-#: actions/deleteuser.php:138
 msgid ""
 "Are you sure you want to delete this user? This will clear all data about "
 "the user from the database, without a backup."
@@ -2141,99 +1687,80 @@ msgstr ""
 "om brukeren fra databasen, uten sikkerhetskopi."
 
 #. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/deleteuser.php:158
 #, fuzzy
 msgid "Do not delete this user."
 msgstr "Ikke slett denne gruppen"
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
-#: actions/deleteuser.php:165
 #, fuzzy
 msgid "Delete this user."
 msgstr "Slett denne brukeren"
 
 #. TRANS: Message used as title for design settings for the site.
-#: actions/designadminpanel.php:60 lib/settingsnav.php:97
 msgid "Design"
 msgstr "Utseende"
 
 #. TRANS: Instructions for design adminsitration panel.
-#: actions/designadminpanel.php:71
 msgid "Design settings for this StatusNet site"
 msgstr ""
 
 #. TRANS: Client error displayed when a logo URL does is not valid.
-#: actions/designadminpanel.php:327
 msgid "Invalid logo URL."
 msgstr "Ugyldig logo-URL."
 
 #. TRANS: Client error displayed when an SSL logo URL is invalid.
-#: actions/designadminpanel.php:333
 msgid "Invalid SSL logo URL."
 msgstr "Ugyldig SSL-logo-URL."
 
 #. TRANS: Client error displayed when a theme is submitted through the form that is not in the theme list.
 #. TRANS: %s is the chosen unavailable theme.
-#: actions/designadminpanel.php:339
 #, php-format
 msgid "Theme not available: %s."
 msgstr "Tema ikke tilgjengelig: %s."
 
 #. TRANS: Fieldset legend for form to change logo.
-#: actions/designadminpanel.php:437
 msgid "Change logo"
 msgstr "Endre logo"
 
 #. TRANS: Field label for StatusNet site logo.
-#: actions/designadminpanel.php:444
 msgid "Site logo"
 msgstr "Nettstedslogo"
 
 #. TRANS: Field label for SSL StatusNet site logo.
-#: actions/designadminpanel.php:452
 msgid "SSL logo"
 msgstr "SSL-logo"
 
 #. TRANS: Fieldset legend for form change StatusNet site's theme.
-#: actions/designadminpanel.php:467
 msgid "Change theme"
 msgstr "Endre tema"
 
 #. TRANS: Field label for dropdown to choose site theme.
-#: actions/designadminpanel.php:485
 msgid "Site theme"
 msgstr "Nettstedstema"
 
 #. TRANS: Title for field label for dropdown to choose site theme.
-#: actions/designadminpanel.php:487
 msgid "Theme for the site."
 msgstr "Tema for nettstedet."
 
 #. TRANS: Field label for uploading a cutom theme.
-#: actions/designadminpanel.php:494
 msgid "Custom theme"
 msgstr "Egendefinert tema"
 
 #. TRANS: Form instructions for uploading a cutom StatusNet theme.
-#: actions/designadminpanel.php:499
 msgid "You can upload a custom StatusNet theme as a .ZIP archive."
 msgstr "Du kan laste opp et egendefinert StatusNet-tema som et .ZIP-arkiv."
 
 #. TRANS: Fieldset legend for theme background image.
-#: actions/designadminpanel.php:515
 msgid "Change background image"
 msgstr "Endre bakgrunnsbilde"
 
 #. TRANS: Field label for background image on theme designer page.
 #. TRANS: Field label for background color selector.
 #. TRANS: Label on profile design page for setting a profile page background colour.
-#: actions/designadminpanel.php:525 actions/designadminpanel.php:609
-#: lib/designform.php:238
 msgid "Background"
 msgstr "Bakgrunn"
 
 #. TRANS: Form guide for background image upload form on theme designer page.
-#: actions/designadminpanel.php:531
 #, php-format
 msgid ""
 "You can upload a background image for the site. The maximum file size is %1"
@@ -2242,202 +1769,167 @@ msgstr ""
 "Du kan laste opp et bakgrunnsbilde for nettstedet. Maks filstørrelse er %1$s."
 
 #. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:558
 msgid "On"
 msgstr "På"
 
 #. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:575
 msgid "Off"
 msgstr "Av"
 
 #. TRANS: Form guide for turning background image on or off on theme designer page.
 #. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
 #. TRANS: use of the uploaded profile image.
-#: actions/designadminpanel.php:577 lib/designform.php:214
 msgid "Turn background image on or off."
 msgstr "Slå på eller av bakgrunnsbilde."
 
 #. TRANS: Checkbox label to title background image on theme designer page.
 #. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-#: actions/designadminpanel.php:583 lib/designform.php:220
 msgid "Tile background image"
 msgstr "Gjenta bakgrunnsbildet"
 
 #. TRANS: Fieldset legend for theme colors.
-#: actions/designadminpanel.php:598
 #, fuzzy
 msgid "Change colors"
 msgstr "Endre farger"
 
 #. TRANS: Field label for content color selector.
 #. TRANS: Label on profile design page for setting a profile page content colour.
-#: actions/designadminpanel.php:623 lib/designform.php:252
 msgid "Content"
 msgstr "Innhold"
 
 #. TRANS: Field label for sidebar color selector.
 #. TRANS: Label on profile design page for setting a profile page sidebar colour.
-#: actions/designadminpanel.php:637 lib/designform.php:266
 msgid "Sidebar"
 msgstr "Sidelinje"
 
 #. TRANS: Field label for text color selector.
 #. TRANS: Label on profile design page for setting a profile page text colour.
-#: actions/designadminpanel.php:651 lib/designform.php:280
 msgid "Text"
 msgstr "Tekst"
 
 #. TRANS: Field label for link color selector.
 #. TRANS: Label on profile design page for setting a profile page links colour.
-#: actions/designadminpanel.php:665 lib/designform.php:294
 msgid "Links"
 msgstr "Lenker"
 
 #. TRANS: Fieldset legend for advanced theme design settings.
-#: actions/designadminpanel.php:691
 msgid "Advanced"
 msgstr "Avansert"
 
 #. TRANS: Field label for custom CSS.
-#: actions/designadminpanel.php:696
 msgid "Custom CSS"
 msgstr "Egendefinert CSS"
 
 #. TRANS: Button text for resetting theme settings.
-#: actions/designadminpanel.php:718
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Use defaults"
 msgstr "Bruk standard"
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:720
 #, fuzzy
 msgid "Restore default designs."
 msgstr "Gjenopprett standardutseende"
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:728
 #, fuzzy
 msgid "Reset back to default."
 msgstr "Tilbakestill til standardverdier"
 
 #. TRANS: Title for button for saving theme settings.
-#: actions/designadminpanel.php:736
 #, fuzzy
 msgid "Save design."
 msgstr "Lagre utseende"
 
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
-#: actions/disfavor.php:83
 msgid "This notice is not a favorite!"
 msgstr "Denne notisen er ikke en favoritt!"
 
 #. TRANS: Title for page on which favorites can be added.
-#: actions/disfavor.php:98
 msgid "Add to favorites"
 msgstr "Legg til i favoritter"
 
 #. TRANS: Client exception thrown when requesting a document from the documentation that does not exist.
 #. TRANS: %s is the non-existing document.
-#: actions/doc.php:155
 #, fuzzy, php-format
 msgid "No such document \"%s\"."
 msgstr "Inget slikt dokument «%s»"
 
 #. TRANS: Title for "Edit application" form.
 #. TRANS: Form legend.
-#: actions/editapplication.php:54 lib/applicationeditform.php:129
 msgid "Edit application"
 msgstr "Rediger program"
 
 #. TRANS: Client error displayed trying to edit an application while not logged in.
-#: actions/editapplication.php:66
 msgid "You must be logged in to edit an application."
 msgstr "Du må være innlogget for å redigere et program."
 
 #. TRANS: Client error displayed trying to edit an application that does not exist.
-#: actions/editapplication.php:83 actions/showapplication.php:83
 msgid "No such application."
 msgstr "Inget slikt program."
 
 #. TRANS: Instructions for "Edit application" form.
-#: actions/editapplication.php:167
 msgid "Use this form to edit your application."
 msgstr "Bruk dette skjemaet for å redigere programmet ditt."
 
 #. TRANS: Validation error shown when not providing a name in the "Edit application" form.
 #. TRANS: Validation error shown when not providing a name in the "New application" form.
-#: actions/editapplication.php:184 actions/newapplication.php:164
 msgid "Name is required."
 msgstr "Navn kreves."
 
 #. 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.
-#: actions/editapplication.php:188 actions/newapplication.php:172
 msgid "Name is too long (maximum 255 characters)."
 msgstr "Navnet er for langt (maks 255 tegn)."
 
 #. TRANS: Validation error shown when providing a name for an application that already exists in the "Edit application" form.
 #. TRANS: Validation error shown when providing a name for an application that already exists in the "New application" form.
-#: actions/editapplication.php:192 actions/newapplication.php:168
 msgid "Name already in use. Try another one."
 msgstr "Navn allerede i bruk. Prøv et annet."
 
 #. TRANS: Validation error shown when not providing a description in the "Edit application" form.
 #. TRANS: Validation error shown when not providing a description in the "New application" form.
-#: actions/editapplication.php:196 actions/newapplication.php:176
 msgid "Description is required."
 msgstr "Beskrivelse kreves."
 
 #. TRANS: Validation error shown when providing too long a source URL in the "Edit application" form.
-#: actions/editapplication.php:209
 msgid "Source URL is too long."
 msgstr "Kilde-URL er for lang."
 
 #. TRANS: Validation error shown when providing an invalid source URL in the "Edit application" form.
 #. TRANS: Validation error shown when providing an invalid source URL in the "New application" form.
-#: actions/editapplication.php:216 actions/newapplication.php:199
 msgid "Source URL is not valid."
 msgstr "Kilde-URL er ikke gyldig."
 
 #. 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.
-#: actions/editapplication.php:220 actions/newapplication.php:203
 msgid "Organization is required."
 msgstr "Organisasjon kreves."
 
 #. TRANS: Validation error shown when providing too long an arganisation name in the "Edit application" form.
-#: actions/editapplication.php:224 actions/newapplication.php:207
 msgid "Organization is too long (maximum 255 characters)."
 msgstr "Organisasjon er for lang (maks 255 tegn)."
 
 #. TRANS: Form validation error show when an organisation name has not been provided in the edit application form.
 #. TRANS: Form validation error show when an organisation name has not been provided in the new application form.
-#: actions/editapplication.php:228 actions/newapplication.php:211
 msgid "Organization homepage is required."
 msgstr "Hjemmeside for organisasjon kreves."
 
 #. TRANS: Validation error shown when providing too long a callback URL in the "Edit application" form.
 #. TRANS: Validation error shown when providing too long a callback URL in the "New application" form.
-#: actions/editapplication.php:239 actions/newapplication.php:225
 msgid "Callback is too long."
 msgstr "Anrop er for langt."
 
 #. TRANS: Validation error shown when providing an invalid callback URL in the "Edit application" form.
 #. TRANS: Validation error shown when providing an invalid callback URL in the "New application" form.
-#: actions/editapplication.php:247 actions/newapplication.php:235
 msgid "Callback URL is not valid."
 msgstr "Anrops-URL er ikke gyldig."
 
 #. TRANS: Server error occuring when an application could not be updated from the "Edit application" form.
-#: actions/editapplication.php:284
 msgid "Could not update application."
 msgstr "Kunne ikke oppdatere programmet."
 
 #. TRANS: Title for form to edit a group. %s is a group nickname.
-#: actions/editgroup.php:55
 #, php-format
 msgid "Edit %s group"
 msgstr "Rediger %s gruppe"
@@ -2445,40 +1937,40 @@ msgstr "Rediger %s gruppe"
 #. TRANS: Client error displayed trying to edit a group while not logged in.
 #. TRANS: Client error displayed when trying to create a group while not logged in.
 #. TRANS: Client error displayed trying to create a group while not logged in.
-#: actions/editgroup.php:68 actions/grouplogo.php:69 actions/newgroup.php:65
 msgid "You must be logged in to create a group."
 msgstr "Du må være innlogget for å opprette en gruppe."
 
 #. TRANS: Form instructions for group edit form.
-#: actions/editgroup.php:161
 msgid "Use this form to edit the group."
 msgstr "Bruk dette skjemaet for å redigere gruppen."
 
+#. TRANS: Group edit form validation error.
+#. TRANS: Group create form validation error.
+#. TRANS: %s is the invalid alias.
+#, php-format
+msgid "Invalid alias: \"%s\""
+msgstr "Ugyldig alias: «%s»"
+
 #. TRANS: Group edit form success message.
-#: actions/editgroup.php:301
 msgid "Options saved."
 msgstr "Lagret valg."
 
 #. TRANS: Title for e-mail settings.
-#: actions/emailsettings.php:60
 msgid "Email settings"
 msgstr "E-postinnstillinger"
 
 #. TRANS: E-mail settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/emailsettings.php:74
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 msgstr "Velg hvordan du mottar e-post fra %%site.name%%."
 
 #. TRANS: Form legend for e-mail settings form.
 #. TRANS: Field label for e-mail address input in e-mail settings form.
-#: actions/emailsettings.php:104 actions/emailsettings.php:130
 msgid "Email address"
 msgstr "E-postadresse"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:110
 msgid "Current confirmed email address."
 msgstr "Nåværende bekreftede e-postadresse"
 
@@ -2487,15 +1979,11 @@ msgstr "Nåværende bekreftede e-postadresse"
 #. TRANS: Button label to remove a confirmed IM address.
 #. TRANS: Button label to remove a confirmed SMS address.
 #. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
-#: actions/emailsettings.php:113 actions/emailsettings.php:180
-#: actions/imsettings.php:119 actions/smssettings.php:119
-#: actions/smssettings.php:175
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Fjern"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:120
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -2508,44 +1996,36 @@ msgstr ""
 #. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
 #. TRANS: Any other domain may be owned by a legitimate person or
 #. TRANS: organization.
-#: actions/emailsettings.php:137
 msgid "Email address, like \"UserName@example.org\""
 msgstr "E-postadresse («brukernavn@eksempel.org»)"
 
 #. TRANS: Button label for adding an e-mail address in e-mail settings form.
 #. TRANS: Button label for adding an IM address in IM settings form.
 #. TRANS: Button label for adding a SMS phone number in SMS settings form.
-#: actions/emailsettings.php:141 actions/imsettings.php:147
-#: actions/smssettings.php:157
 msgctxt "BUTTON"
 msgid "Add"
 msgstr "Legg til"
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:149 actions/smssettings.php:166
 msgid "Incoming email"
 msgstr "innkommende e-post"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:155
 msgid "I want to post notices by email."
 msgstr "Jeg vil poste notiser med e-post."
 
 #. TRANS: Form instructions for incoming e-mail form in e-mail settings.
 #. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
-#: actions/emailsettings.php:177 actions/smssettings.php:173
 msgid "Send email to this address to post new notices."
 msgstr "Send e-post til denne adressen for å poste nye notiser."
 
 #. TRANS: Instructions for incoming e-mail address input form, when an address has already been assigned.
 #. TRANS: Instructions for incoming SMS e-mail address input form.
-#: actions/emailsettings.php:186 actions/smssettings.php:181
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr "Angi en ny e-postadresse for å poste til; fjerner den gamle."
 
 #. TRANS: Instructions for incoming e-mail address input form.
-#: actions/emailsettings.php:190
 msgid ""
 "To send notices via email, we need to create a unique email address for you "
 "on this server:"
@@ -2553,89 +2033,71 @@ msgstr ""
 
 #. TRANS: Button label for adding an e-mail address to send notices from.
 #. TRANS: Button label for adding an SMS e-mail address to send notices from.
-#: actions/emailsettings.php:196 actions/smssettings.php:184
 msgctxt "BUTTON"
 msgid "New"
 msgstr "Ny"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:205
 msgid "Email preferences"
 msgstr "E-postinnstillinger"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:213
 msgid "Send me notices of new subscriptions through email."
 msgstr "Send meg varsler om nye abonnementer gjennom e-post."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:219
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr "Send meg en e-post når noen legger min notis til som favoritt."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:226
 msgid "Send me email when someone sends me a private message."
 msgstr "Send meg en e-post når noen sender meg en privat melding."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:232
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr "Send meg en e-post når noen sender meg et «@-svar»."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:238
 msgid "Allow friends to nudge me and send me an email."
 msgstr "Tillat venner å knuffe meg og sende meg en e-post."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:244
 msgid "Publish a MicroID for my email address."
 msgstr "Publiser en MicroID for min e-postadresse."
 
 #. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:362
 msgid "Email preferences saved."
 msgstr "E-postinnstillinger lagret."
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:381
 msgid "No email address."
 msgstr "Ingen e-postadresse."
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:389
 #, fuzzy
 msgid "Cannot normalize that email address."
 msgstr "Klarer ikke normalisere epostadressen"
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:394 actions/register.php:197
-#: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "Ugyldig e-postadresse."
 
 #. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:398
 msgid "That is already your email address."
 msgstr "Det er allerede din e-postadresse."
 
 #. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:402
 msgid "That email address already belongs to another user."
 msgstr "Den e-postadressen tilhører allerede en annen bruker."
 
 #. TRANS: Server error thrown on database error adding e-mail confirmation code.
 #. TRANS: Server error thrown on database error adding Instant Messaging confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:419 actions/imsettings.php:362
-#: actions/smssettings.php:364
 #, fuzzy
 msgid "Could not insert confirmation code."
 msgstr "Kunne ikke sette inn bekreftelseskode."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:426
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
@@ -2646,104 +2108,84 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling Instant Messaging address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:446 actions/imsettings.php:391
-#: actions/smssettings.php:398
 msgid "No pending confirmation to cancel."
 msgstr "Ingen ventende bekreftelse å avbryte."
 
 #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:451
 msgid "That is the wrong email address."
 msgstr "Dette er feil e-postadresse."
 
 #. TRANS: Server error thrown on database error canceling e-mail address confirmation.
 #. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
-#: actions/emailsettings.php:460 actions/smssettings.php:412
 #, fuzzy
 msgid "Could not delete email confirmation."
 msgstr "Kunne ikke slette e-postbekreftelse."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:465
 msgid "Email confirmation cancelled."
 msgstr "E-postbekreftelse avbrutt."
 
 #. TRANS: Message given trying to remove an e-mail address that is not
 #. TRANS: registered for the active user.
-#: actions/emailsettings.php:484
 msgid "That is not your email address."
 msgstr "Det er ikke din e-postadresse."
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:505
 msgid "The email address was removed."
 msgstr "E-postadressen ble fjernet."
 
 #. TRANS: Form validation error displayed when trying to remove an incoming e-mail address while no address has been set.
-#: actions/emailsettings.php:519 actions/smssettings.php:554
 msgid "No incoming email address."
 msgstr "Ingen innkommende e-postadresse."
 
 #. 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.
-#: actions/emailsettings.php:531 actions/emailsettings.php:555
-#: actions/smssettings.php:565 actions/smssettings.php:590
 #, fuzzy
 msgid "Could not update user record."
 msgstr "Kunne ikke oppdatere brukeroppføring."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
 #. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:535 actions/smssettings.php:569
 msgid "Incoming email address removed."
 msgstr "Inkommende e-postadresse fjernet."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
 #. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:559 actions/smssettings.php:594
 msgid "New incoming email address added."
 msgstr "Ny innkommende e-postadresse lagt til."
 
 #. TRANS: Client error displayed when trying to mark a notice as favorite that already is a favorite.
-#: actions/favor.php:80
 msgid "This notice is already a favorite!"
 msgstr "Denne notisen er allerede en favoritt."
 
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
-#: actions/favor.php:95
 #, fuzzy
 msgid "Disfavor favorite."
 msgstr "Fjern favoritt"
 
 #. TRANS: Page title for first page of favorited notices.
 #. TRANS: Title for favourited notices section.
-#: actions/favorited.php:65 lib/popularnoticesection.php:62
-#: lib/publicgroupnav.php:93
 msgid "Popular notices"
 msgstr "Populære notiser"
 
 #. TRANS: Page title for all but first page of favorited notices.
 #. TRANS: %d is the page number being displayed.
-#: actions/favorited.php:69
 #, php-format
 msgid "Popular notices, page %d"
 msgstr "Populære notiser, side %d"
 
 #. TRANS: Description on page displaying favorited notices.
-#: actions/favorited.php:81
 msgid "The most popular notices on the site right now."
 msgstr "De mest populære notisene på nettstedet akkurat nå."
 
 #. TRANS: Text displayed instead of a list when a site does not yet have any favourited notices.
-#: actions/favorited.php:149
 msgid "Favorite notices appear on this page but no one has favorited one yet."
 msgstr ""
 "Favorittnotiser vises på denne siden, men det er ingen som har noen "
 "favoritter ennå."
 
 #. TRANS: Additional text displayed instead of a list when a site does not yet have any favourited notices for logged in users.
-#: actions/favorited.php:153
 msgid ""
 "Be the first to add a notice to your favorites by clicking the fave button "
 "next to any notice you like."
@@ -2753,7 +2195,6 @@ msgstr ""
 
 #. TRANS: Additional text displayed instead of a list when a site does not yet have any favourited notices for not logged in users.
 #. TRANS: %%action.register%% is a registration link. "[link text](link)" is Mark Down. Do not change the formatting.
-#: actions/favorited.php:158
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to add a "
@@ -2766,181 +2207,146 @@ msgstr ""
 #. TRANS: %s is a user's nickname.
 #. TRANS: Title for first page of favourite notices of a user.
 #. TRANS: %s is the user for whom the favourite notices are displayed.
-#: actions/favoritesrss.php:111 actions/showfavorites.php:76
-#: lib/personalgroupnav.php:110
 #, php-format
 msgid "%s's favorite notices"
 msgstr "%s sine favorittnotiser"
 
 #. TRANS: Desciption of RSS feed with favourite notices of a user.
 #. TRANS: %1$s is a user's nickname, %2$s is the name of the StatusNet site.
-#: actions/favoritesrss.php:117
 #, php-format
 msgid "Updates favored by %1$s on %2$s!"
 msgstr "Oppdateringer markert som favoritt av %1$s på %2$s!"
 
 #. TRANS: Page title for first page of featured users.
 #. TRANS: Title for featured users section.
-#: actions/featured.php:69 lib/featureduserssection.php:87
-#: lib/publicgroupnav.php:89
 msgid "Featured users"
 msgstr "Profilerte brukere"
 
 #. TRANS: Page title for all but first page of featured users.
 #. TRANS: %d is the page number being displayed.
-#: actions/featured.php:73
 #, php-format
 msgid "Featured users, page %d"
 msgstr "Profilerte brukere, side %d"
 
 #. TRANS: Description on page displaying featured users.
-#: actions/featured.php:102
 #, fuzzy, php-format
 msgid "A selection of some great users on %s."
 msgstr "Et utvalg av noen store brukere på %s"
 
 #. TRANS: Client error displayed when no notice ID was given trying do display a file.
-#: actions/file.php:36
 msgid "No notice ID."
 msgstr "Ingen notis-ID."
 
 #. TRANS: Client error displayed when an invalid notice ID was given trying do display a file.
-#: actions/file.php:41
 msgid "No notice."
 msgstr "Ingen notis."
 
 #. TRANS: Client error displayed when trying do display a file for a notice without a file attachement.
-#: actions/file.php:46
 msgid "No attachments."
 msgstr "Ingen vedlegg."
 
 #. TRANS: Client error displayed when trying do display a file for a notice with file attachements
 #. TRANS: that could not be found.
-#: actions/file.php:58
 msgid "No uploaded attachments."
 msgstr "Ingen opplastede vedlegg."
 
 #. TRANS: Client error displayed when subscribing to a remote profile and an unexpected response is received.
-#: actions/finishremotesubscribe.php:69
 msgid "Not expecting this response!"
 msgstr "Forventet ikke denne responsen!"
 
 #. TRANS: Client error displayed when subscribing to a remote profile that does not exist.
-#: actions/finishremotesubscribe.php:81
 msgid "User being listened to does not exist."
 msgstr "Brukeren som lyttes til finnes ikke."
 
 #. TRANS: Client error displayed when subscribing to a remote profile that is a local profile.
-#: actions/finishremotesubscribe.php:89 actions/remotesubscribe.php:58
 msgid "You can use the local subscription!"
 msgstr "Du kan bruke det lokale abonnementet!"
 
 #. TRANS: Client error displayed when subscribing to a remote profile that is blocked form subscribing to.
-#: actions/finishremotesubscribe.php:102
 msgid "That user has blocked you from subscribing."
 msgstr "Brukeren har blokkert deg fra å abonnere."
 
 #. TRANS: Client error displayed when subscribing to a remote profile without providing an authorised token.
-#: actions/finishremotesubscribe.php:114
 msgid "You are not authorized."
 msgstr "Du er ikke autorisert."
 
 #. TRANS: Client error displayed when subscribing to a remote profile and conversion of the request token to access token fails.
-#: actions/finishremotesubscribe.php:118
 msgid "Could not convert request token to access token."
 msgstr ""
 
 #. TRANS: Client error displayed when subscribing to a remote profile fails because of an unsupported version of the OMB protocol.
-#: actions/finishremotesubscribe.php:124
 msgid "Remote service uses unknown version of OMB protocol."
 msgstr "Fjerntjeneste bruker ukjent versjon av OMB-protokollen."
 
 #. TRANS: Server error displayed when subscribing to a remote profile fails because the remote profile could not be updated.
-#: actions/finishremotesubscribe.php:145 lib/oauthstore.php:317
 msgid "Error updating remote profile."
 msgstr "Feil ved oppdatering av fjernprofil."
 
 #. TRANS: Client error displayed when requesting a non-existent file.
-#: actions/getfile.php:77
 msgid "No such file."
 msgstr "Ingen slik fil."
 
 #. TRANS: Client error displayed when requesting a file without having read access to it.
-#: actions/getfile.php:82
 msgid "Cannot read file."
 msgstr "Kan ikke lese fil."
 
 #. TRANS: Client error displayed when trying to assign an invalid role to a user.
-#: actions/grantrole.php:61 actions/revokerole.php:62
 msgid "Invalid role."
 msgstr "Ugyldig rolle."
 
 #. TRANS: Client error displayed when trying to assign an reserved role to a user.
-#: actions/grantrole.php:66 actions/revokerole.php:66
 msgid "This role is reserved and cannot be set."
 msgstr "Denne rollen er reservert og kan ikke stilles inn."
 
 #. TRANS: Client error displayed when trying to assign a role to a user while not being allowed to set roles.
-#: actions/grantrole.php:76
 msgid "You cannot grant user roles on this site."
 msgstr "Du kan ikke tildele brukerroller på dette nettstedet."
 
 #. TRANS: Client error displayed when trying to assign a role to a user that already has that role.
-#: actions/grantrole.php:84
 msgid "User already has this role."
 msgstr "Bruker har allerede denne rollen."
 
 #. TRANS: Client error displayed trying to block a user from a group while not specifying a to be blocked user profile.
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing a profile.
+#. TRANS: Client error displayed when not providing a profile ID on the Make Admin page.
 #. TRANS: Client error displayed trying a change a subscription without providing a profile.
 #. TRANS: Client error displayed when trying to change user options without specifying a user to work on.
-#: actions/groupblock.php:71 actions/groupunblock.php:71
-#: actions/makeadmin.php:71 actions/subedit.php:49
-#: lib/profileformaction.php:79
 msgid "No profile specified."
 msgstr "Ingen profil oppgitt."
 
 #. TRANS: Client error displayed trying to block a user from a group while specifying a non-existing profile.
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing an existing profile.
+#. TRANS: Client error displayed when specifying an invalid profile ID on the Make Admin page.
 #. TRANS: Client error displayed trying a change a subscription for a non-existant profile ID.
 #. TRANS: Client error displayed when trying to change user options without specifying an existing user to work on.
-#: actions/groupblock.php:77 actions/groupunblock.php:77
-#: actions/makeadmin.php:76 actions/subedit.php:57 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:87
 msgid "No profile with that ID."
 msgstr "Ingen profil med den ID'en."
 
 #. TRANS: Client error displayed trying to block a user from a group while not specifying a group to block a profile from.
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing a group.
-#: actions/groupblock.php:83 actions/groupunblock.php:83
-#: actions/makeadmin.php:81
+#. TRANS: Client error displayed when not providing a group ID on the Make Admin page.
 msgid "No group specified."
 msgstr "Ingen gruppe oppgitt."
 
 #. TRANS: Client error displayed trying to block a user from a group while not being an admin user.
-#: actions/groupblock.php:95
 msgid "Only an admin can block group members."
 msgstr "Bare en admin kan blokkere gruppemedlemmer."
 
 #. TRANS: Client error displayed trying to block a user from a group while user is already blocked from the given group.
-#: actions/groupblock.php:100
 msgid "User is already blocked from group."
 msgstr "Bruker er allerede blokkert fra gruppe."
 
 #. TRANS: Client error displayed trying to block a user from a group while user is not a member of given group.
-#: actions/groupblock.php:106
 msgid "User is not a member of group."
 msgstr "Bruker er ikke et medlem av gruppa."
 
 #. TRANS: Title for block user from group page.
 #. TRANS: Form legend for form to block user from a group.
-#: actions/groupblock.php:141 actions/groupmembers.php:364
 msgid "Block user from group"
 msgstr "Blokker bruker fra gruppe"
 
 #. TRANS: Explanatory text for block user from group form before setting the block.
 #. TRANS: %1$s is that to be blocked user, %2$s is the group the user will be blocked from.
-#: actions/groupblock.php:169
 #, php-format
 msgid ""
 "Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They "
@@ -2952,40 +2358,33 @@ msgstr ""
 "fremtiden."
 
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
-#: actions/groupblock.php:191
 #, fuzzy
 msgid "Do not block this user from this group."
 msgstr "Ikke blokker denne brukeren fra denne gruppa"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
-#: actions/groupblock.php:198
 #, fuzzy
 msgid "Block this user from this group."
 msgstr "Blokker denne brukeren fra denne gruppen"
 
 #. TRANS: Server error displayed when trying to block a user from a group fails because of an application error.
-#: actions/groupblock.php:215
 msgid "Database error blocking user from group."
 msgstr "Databasefeil ved blokkering av bruker fra gruppe."
 
 #. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
 #. TRANS: Client error displayed trying to find a user by ID without providing an ID.
-#: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr "Ingen ID."
 
 #. TRANS: Client error displayed trying to change group design settings while not logged in.
-#: actions/groupdesignsettings.php:67
 msgid "You must be logged in to edit a group."
 msgstr "Du må være logget inn for å redigere en gruppe."
 
 #. TRANS: Title group design settings page.
-#: actions/groupdesignsettings.php:146
 msgid "Group design"
 msgstr "Gruppeutseende"
 
 #. TRANS: Instructions for group design settings page.
-#: actions/groupdesignsettings.php:157
 msgid ""
 "Customize the way your group looks with a background image and a colour "
 "palette of your choice."
@@ -2994,116 +2393,96 @@ msgstr ""
 "av ditt valg."
 
 #. TRANS: Form validation error displayed when group design settings could not be updated because of an application issue.
-#: actions/groupdesignsettings.php:262
 #, fuzzy
 msgid "Unable to update your design settings."
 msgstr "Kunne ikke lagre dine innstillinger for utseende."
 
 #. TRANS: Form text to confirm saved group design settings.
-#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:239
 msgid "Design preferences saved."
 msgstr "Utseende lagret."
 
 #. TRANS: Title for group logo settings page.
 #. TRANS: Group logo form legend.
-#: actions/grouplogo.php:144 actions/grouplogo.php:199
 msgid "Group logo"
 msgstr "Gruppelogo"
 
 #. TRANS: Instructions for group logo page.
 #. TRANS: %s is the maximum file size for that site.
-#: actions/grouplogo.php:156
 #, php-format
 msgid ""
 "You can upload a logo image for your group. The maximum file size is %s."
 msgstr "Du kan laste opp en logo for gruppen din. Maks filstørrelse er %s."
 
 #. TRANS: Submit button for uploading a group logo.
-#: actions/grouplogo.php:243
 msgid "Upload"
 msgstr "Last opp"
 
 #. TRANS: Button text for cropping an uploaded group logo.
-#: actions/grouplogo.php:299
 msgid "Crop"
 msgstr "Beskjær"
 
 #. TRANS: Form instructions on the group logo page.
-#: actions/grouplogo.php:376
 msgid "Pick a square area of the image to be the logo."
 msgstr "Velg et kvadratisk område av bildet som skal bli logoen."
 
 #. TRANS: Form success message after updating a group logo.
-#: actions/grouplogo.php:411
 msgid "Logo updated."
 msgstr "Logo oppdatert."
 
 #. TRANS: Form failure message after failing to update a group logo.
-#: actions/grouplogo.php:414
 msgid "Failed updating logo."
 msgstr "Kunne ikke oppdatere logo."
 
 #. TRANS: Title of the page showing group members.
 #. TRANS: %s is the name of the group.
-#: actions/groupmembers.php:104
 #, php-format
 msgid "%s group members"
 msgstr "%s gruppemedlemmer"
 
 #. TRANS: Title of the page showing group members.
 #. TRANS: %1$s is the name of the group, %2$d is the page number of the members list.
-#: actions/groupmembers.php:109
 #, php-format
 msgid "%1$s group members, page %2$d"
 msgstr "%1$s gruppemedlemmer, side %2$d"
 
 #. TRANS: Page notice for group members page.
-#: actions/groupmembers.php:125
 msgid "A list of the users in this group."
 msgstr "En liste over brukerne i denne gruppen."
 
 #. TRANS: Indicator in group members list that this user is a group administrator.
-#: actions/groupmembers.php:190 lib/action.php:581
 msgid "Admin"
 msgstr "Administrator"
 
 #. TRANS: Button text for the form that will block a user from a group.
-#: actions/groupmembers.php:397
 msgctxt "BUTTON"
 msgid "Block"
 msgstr "Blokker"
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:401
 msgctxt "TOOLTIP"
 msgid "Block this user"
 msgstr "Blokker denne brukeren"
 
 #. TRANS: Form legend for form to make a user a group admin.
-#: actions/groupmembers.php:488
 msgid "Make user an admin of the group"
 msgstr "Gjør brukeren til en administrator for gruppen"
 
 #. TRANS: Button text for the form that will make a user administrator.
-#: actions/groupmembers.php:521
 msgctxt "BUTTON"
 msgid "Make Admin"
 msgstr "Gjør til administrator"
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:525
 msgctxt "TOOLTIP"
 msgid "Make this user an admin"
 msgstr "Gjør denne burkeren til administrator"
 
 #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
-#: actions/grouprss.php:141
 #, php-format
 msgid "Updates from members of %1$s on %2$s!"
 msgstr "Oppdateringer fra medlemmer av %1$s på %2$s!"
 
 #. TRANS: Title for first page of the groups list.
-#: actions/groups.php:62
 #, fuzzy
 msgctxt "TITLE"
 msgid "Groups"
@@ -3111,7 +2490,6 @@ msgstr "Grupper"
 
 #. TRANS: Title for all but the first page of the groups list.
 #. TRANS: %d is the page number.
-#: actions/groups.php:66
 #, fuzzy, php-format
 msgctxt "TITLE"
 msgid "Groups, page %d"
@@ -3120,7 +2498,6 @@ msgstr "Grupper, side %d"
 #. TRANS: Page notice of group list. %%%%site.name%%%% is the StatusNet site name,
 #. TRANS: %%%%action.groupsearch%%%% and %%%%action.newgroup%%%% are URLs. Do not change them.
 #. TRANS: This message contains Markdown links in the form [link text](link).
-#: actions/groups.php:95
 #, fuzzy, php-format
 msgid ""
 "%%%%site.name%%%% groups let you find and talk with people of similar "
@@ -3136,12 +2513,10 @@ msgstr ""
 "%%action.newgroup%%%%)"
 
 #. TRANS: Link to create a new group on the group list page.
-#: actions/groups.php:113 actions/usergroups.php:126 lib/groupeditform.php:115
 msgid "Create a new group"
 msgstr "Opprett en ny gruppe"
 
 #. TRANS: Instructions for page where groups can be searched. %%site.name%% is the name of the StatusNet site.
-#: actions/groupsearch.php:53
 #, php-format
 msgid ""
 "Search for groups on %%site.name%% by their name, location, or description. "
@@ -3151,21 +2526,17 @@ msgstr ""
 "Skill nøkkelord med mellomrom; de må være minst 3 tegn eller lengre."
 
 #. TRANS: Title for page where groups can be searched.
-#: actions/groupsearch.php:60
 msgid "Group search"
 msgstr "Gruppesøk"
 
 #. TRANS: Text on page where groups can be searched if no results were found for a query.
 #. TRANS: Text for notice search results is the query had no results.
 #. TRANS: Message on the "People search" page where a query has no results.
-#: actions/groupsearch.php:82 actions/noticesearch.php:122
-#: actions/peoplesearch.php:87
 msgid "No results."
 msgstr "Ingen resultat."
 
 #. TRANS: Additional text on page where groups can be searched if no results were found for a query for a logged in user.
 #. TRANS: This message contains Markdown links in the form [link text](link).
-#: actions/groupsearch.php:87
 #, fuzzy, php-format
 msgid ""
 "If you cannot find the group you're looking for, you can [create it](%%"
@@ -3176,7 +2547,6 @@ msgstr ""
 
 #. TRANS: Additional text on page where groups can be searched if no results were found for a query for a not logged in user.
 #. TRANS: This message contains Markdown links in the form [link text](link).
-#: actions/groupsearch.php:92
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and [create the group](%%"
@@ -3186,30 +2556,25 @@ msgstr ""
 "(%%action.newgroup%%) selv!"
 
 #. TRANS: Client error displayed when trying to unblock a user from a group without being an administrator for the group.
-#: actions/groupunblock.php:95
 msgid "Only an admin can unblock group members."
 msgstr "Bare en admin kan oppheve blokkering av gruppemedlemmer."
 
 #. TRANS: Client error displayed when trying to unblock a non-blocked user from a group.
-#: actions/groupunblock.php:100
 msgid "User is not blocked from group."
 msgstr "Bruker er ikke blokkert fra gruppe."
 
 #. TRANS: Server error displayed when unblocking a user from a group fails because of an unknown error.
 #. TRANS: Server error displayed when removing a user block.
-#: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "Feil under oppheving av blokkering."
 
 #. TRANS: Title for Instant Messaging settings.
-#: actions/imsettings.php:56
 msgid "IM settings"
 msgstr "Innstillinger for direktemeldinger"
 
 #. 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.
-#: actions/imsettings.php:69
 #, fuzzy, php-format
 msgid ""
 "You can send and receive notices through instant messaging [instant messages]"
@@ -3219,18 +2584,15 @@ msgstr ""
 "im%%). Konfigurer adresse og innstillinger under."
 
 #. TRANS: Message given in the IM settings if IM is not enabled on the site.
-#: actions/imsettings.php:90
 msgid "IM is not available."
 msgstr "Direktemeldinger ikke tilgjengelig."
 
-#: actions/imsettings.php:116
 #, fuzzy, php-format
 msgid "Current confirmed %s address."
 msgstr "Nåværende bekreftede e-postadresse"
 
 #. TRANS: Form note in IM settings form.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:128
 #, fuzzy, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your %s account for a message "
@@ -3239,88 +2601,73 @@ msgstr ""
 "Venter på godkjenning. Sjekk din Jabber/GTalk-konto for en melding med "
 "instruksjoner (la du %s til vennelisten din?)"
 
-#: actions/imsettings.php:140
 msgid "IM address"
 msgstr "Direktemeldingsadresse"
 
-#: actions/imsettings.php:142
 #, php-format
 msgid "%s screenname."
 msgstr ""
 
 #. TRANS: Header for IM preferences form.
-#: actions/imsettings.php:163
 #, fuzzy
 msgid "IM Preferences"
 msgstr "Direktemeldingsinnstillinger"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:174
 #, fuzzy
 msgid "Send me notices"
 msgstr "Send en notis"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:176
 #, fuzzy
 msgid "Post a notice when my status changes."
 msgstr "Post en notis når min Jabber/Gtalk-status endres."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:178
 #, fuzzy
 msgid "Send me replies from people I'm not subscribed to."
 msgstr "Send meg svar gjennom Jabber/GTalk fra personer jeg ikke abonnerer på."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:181
 #, fuzzy
 msgid "Publish a MicroID"
 msgstr "Publiser en MicroID for min e-postadresse."
 
 #. TRANS: Server error thrown on database error updating IM preferences.
-#: actions/imsettings.php:291
 #, fuzzy
 msgid "Couldn't update IM preferences."
 msgstr "Kunne ikke oppdatere bruker."
 
 #. TRANS: Confirmation message for successful IM preferences save.
 #. TRANS: Confirmation message after saving preferences.
-#: actions/imsettings.php:298 actions/urlsettings.php:244
 msgid "Preferences saved."
 msgstr "Innstillinger lagret."
 
 #. TRANS: Message given saving IM address without having provided one.
-#: actions/imsettings.php:320
 #, fuzzy
 msgid "No screenname."
 msgstr "Ingen kallenavn."
 
-#: actions/imsettings.php:325
 #, fuzzy
 msgid "No transport."
 msgstr "Ingen notis."
 
 #. TRANS: Message given saving IM address that cannot be normalised.
-#: actions/imsettings.php:333
 #, fuzzy
 msgid "Cannot normalize that screenname"
 msgstr "Klarer ikke normalisere Jabber-IDen"
 
 #. TRANS: Message given saving IM address that not valid.
-#: actions/imsettings.php:340
 #, fuzzy
 msgid "Not a valid screenname"
 msgstr "Ugyldig nick."
 
 #. TRANS: Message given saving IM address that is already set for another user.
-#: actions/imsettings.php:344
 #, fuzzy
 msgid "Screenname already belongs to another user."
 msgstr "Jabber-ID tilhører allerede en annen bruker."
 
 #. TRANS: Message given saving valid IM address that is to be confirmed.
-#: actions/imsettings.php:369
 #, fuzzy
 msgid "A confirmation code was sent to the IM address you added."
 msgstr ""
@@ -3328,85 +2675,71 @@ msgstr ""
 "godkjenne %s for å sende meldinger til deg."
 
 #. TRANS: Message given canceling IM address confirmation for the wrong IM address.
-#: actions/imsettings.php:396
 msgid "That is the wrong IM address."
 msgstr "Det er feil IM-adresse."
 
 #. TRANS: Server error thrown on database error canceling IM address confirmation.
-#: actions/imsettings.php:405
 #, fuzzy
 msgid "Couldn't delete confirmation."
 msgstr "Kunne ikke slette direktemeldingsbekreftelse."
 
 #. TRANS: Message given after successfully canceling IM address confirmation.
-#: actions/imsettings.php:410
 msgid "IM confirmation cancelled."
 msgstr "Direktemeldingsbekreftelse avbrutt."
 
 #. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.
-#: actions/imsettings.php:434
 #, fuzzy
 msgid "That is not your screenname."
 msgstr "Det er ikke ditt telefonnummer."
 
 #. TRANS: Server error thrown on database error removing a registered IM address.
-#: actions/imsettings.php:443
 #, fuzzy
 msgid "Couldn't update user im prefs."
 msgstr "Kunne ikke oppdatere brukeroppføring."
 
 #. TRANS: Message given after successfully removing a registered Instant Messaging address.
-#: actions/imsettings.php:451
 msgid "The IM address was removed."
 msgstr "Direktemeldingsadressen ble fjernet."
 
 #. TRANS: Title for all but the first page of the inbox page.
 #. TRANS: %1$s is the user's nickname, %2$s is the page number.
-#: actions/inbox.php:59
 #, php-format
 msgid "Inbox for %1$s - page %2$d"
 msgstr "Innboks for %1$s - side %2$d"
 
 #. TRANS: Title for the first page of the inbox page.
 #. TRANS: %s is the user's nickname.
-#: actions/inbox.php:64
 #, php-format
 msgid "Inbox for %s"
 msgstr "Innboks for %s"
 
 #. TRANS: Instructions for user inbox page.
-#: actions/inbox.php:106
 msgid "This is your inbox, which lists your incoming private messages."
 msgstr ""
 "Dette er innboksen din som innholder dine innkommende private meldinger."
 
 #. TRANS: Client error displayed when trying to sent invites while they have been disabled.
-#: actions/invite.php:41
 msgid "Invites have been disabled."
 msgstr "Invitasjoner har blitt deaktivert."
 
 #. TRANS: Client error displayed when trying to sent invites while not logged in.
 #. TRANS: %s is the StatusNet site name.
-#: actions/invite.php:45
 #, php-format
 msgid "You must be logged in to invite other users to use %s."
 msgstr "Du må være innlogget for å invitere andre brukere til å bruke %s."
 
 #. TRANS: Form validation message when providing an e-mail address that does not validate.
 #. TRANS: %s is an invalid e-mail address.
-#: actions/invite.php:78
 #, php-format
 msgid "Invalid email address: %s."
 msgstr "Ugyldig e-postadresse: %s."
 
 #. TRANS: Page title when invitations have been sent.
-#: actions/invite.php:117
 msgid "Invitations sent"
 msgstr "Invitasjoner sendt"
 
 #. TRANS: Page title when inviting potential users.
-#: actions/invite.php:120
 msgid "Invite new users"
 msgstr "Inviter nye brukere"
 
@@ -3414,7 +2747,6 @@ msgstr "Inviter nye brukere"
 #. TRANS: is already subscribed to one or more users with the given e-mail address(es).
 #. TRANS: Plural form is based on the number of reported already subscribed e-mail addresses.
 #. TRANS: Followed by a bullet list.
-#: actions/invite.php:140
 msgid "You are already subscribed to this user:"
 msgid_plural "You are already subscribed to these users:"
 msgstr[0] "Du abonnerer allerede på denne brukeren:"
@@ -3422,7 +2754,6 @@ msgstr[1] "Du abonnerer allerede på disse brukerne:"
 
 #. TRANS: Used as list item for already subscribed users (%1$s is nickname, %2$s is e-mail address).
 #. TRANS: Used as list item for already registered people (%1$s is nickname, %2$s is e-mail address).
-#: actions/invite.php:146 actions/invite.php:160
 #, php-format
 msgctxt "INVITE"
 msgid "%1$s (%2$s)"
@@ -3431,7 +2762,6 @@ msgstr "%1$s (%2$s)"
 #. TRANS: Message displayed inviting users to use a StatusNet site while the invited user
 #. TRANS: already uses a this StatusNet site. Plural form is based on the number of
 #. TRANS: reported already present people. Followed by a bullet list.
-#: actions/invite.php:154
 msgid "This person is already a user and you were automatically subscribed:"
 msgid_plural ""
 "These people are already users and you were automatically subscribed to them:"
@@ -3444,7 +2774,6 @@ msgstr[1] ""
 #. TRANS: Message displayed inviting users to use a StatusNet site. Plural form is
 #. TRANS: based on the number of invitations sent. Followed by a bullet list of
 #. TRANS: e-mail addresses to which invitations were sent.
-#: actions/invite.php:168
 msgid "Invitation sent to the following person:"
 msgid_plural "Invitations sent to the following people:"
 msgstr[0] "Invitasjon sendt til følgende person:"
@@ -3452,7 +2781,6 @@ msgstr[1] "Invitasjoner sendt til følgende personer:"
 
 #. TRANS: Generic message displayed after sending out one or more invitations to
 #. TRANS: people to join a StatusNet site.
-#: actions/invite.php:178
 msgid ""
 "You will be notified when your invitees accept the invitation and register "
 "on the site. Thanks for growing the community!"
@@ -3461,7 +2789,6 @@ msgstr ""
 "seg på nettstedet. Takk for at du hjelper oss å vokse!"
 
 #. TRANS: Form instructions.
-#: actions/invite.php:191
 msgid ""
 "Use this form to invite your friends and colleagues to use this service."
 msgstr ""
@@ -3469,28 +2796,24 @@ msgstr ""
 "denne tjenesten."
 
 #. TRANS: Field label for a list of e-mail addresses.
-#: actions/invite.php:218
 msgid "Email addresses"
 msgstr "E-postadresser"
 
 #. TRANS: Tooltip for field label for a list of e-mail addresses.
-#: actions/invite.php:221
 #, fuzzy
 msgid "Addresses of friends to invite (one per line)."
 msgstr "Adresser til venner som skal inviteres (én per linje)"
 
 #. TRANS: Field label for a personal message to send to invitees.
-#: actions/invite.php:225
 msgid "Personal message"
 msgstr "Personlig melding"
 
 #. TRANS: Tooltip for field label for a personal message to send to invitees.
-#: actions/invite.php:228
 msgid "Optionally add a personal message to the invitation."
 msgstr "Om du vil kan du legge til en personlig melding i invitasjonen."
 
 #. TRANS: Send button for inviting friends
-#: actions/invite.php:232
+#. TRANS: Button text for sending notice.
 msgctxt "BUTTON"
 msgid "Send"
 msgstr "Send"
@@ -3498,7 +2821,6 @@ msgstr "Send"
 #. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral
 #. TRANS: singular 3rd-person pronoun in English. %1$s is the inviting user, $2$s is
 #. TRANS: the StatusNet sitename.
-#: actions/invite.php:264
 #, php-format
 msgid "%1$s has invited you to join them on %2$s"
 msgstr "%1$s har invitert deg til %2$s"
@@ -3508,7 +2830,6 @@ msgstr "%1$s har invitert deg til %2$s"
 #. TRANS: StatusNet sitename, %3$s is the site URL, %4$s is the personal message from the
 #. TRANS: inviting user, %s%5 a link to the timeline for the inviting user, %s$6 is a link
 #. TRANS: to register with the StatusNet site.
-#: actions/invite.php:271
 #, php-format
 msgid ""
 "%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -3561,182 +2882,177 @@ msgstr ""
 "Vennlig hilsen, %2$s\n"
 
 #. TRANS: Client error displayed when trying to join a group while not logged in.
-#: actions/joingroup.php:59
 msgid "You must be logged in to join a group."
 msgstr "Du må være innlogget for å bli med i en gruppe."
 
 #. TRANS: Title for join group page after joining.
-#: actions/joingroup.php:148
 #, fuzzy, php-format
 msgctxt "TITLE"
 msgid "%1$s joined group %2$s"
 msgstr "%1$s ble med i gruppen %2$s"
 
 #. TRANS: Client error displayed when trying to leave a group while not logged in.
-#: actions/leavegroup.php:59
 msgid "You must be logged in to leave a group."
 msgstr "Du må være innlogget for å forlate en gruppe."
 
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
-#: actions/leavegroup.php:103 lib/command.php:398
 msgid "You are not a member of that group."
 msgstr "Du er ikke et medlem av den gruppen."
 
 #. TRANS: Title for leave group page after leaving.
-#: actions/leavegroup.php:142
 #, fuzzy, php-format
 msgctxt "TITLE"
 msgid "%1$s left group %2$s"
 msgstr "%1$s forlot gruppe %2$s"
 
 #. TRANS: User admin panel title
-#: actions/licenseadminpanel.php:55
 msgctxt "TITLE"
 msgid "License"
 msgstr "Lisens"
 
-#: actions/licenseadminpanel.php:65
+#. TRANS: Form instructions for the site license admin panel.
 msgid "License for this StatusNet site"
 msgstr "Lisens for denne StatusNet-siden"
 
-#: actions/licenseadminpanel.php:134
+#. TRANS: Client error displayed selecting an invalid license in the license admin panel.
 msgid "Invalid license selection."
 msgstr "Ugyldig lisensvalg."
 
-#: actions/licenseadminpanel.php:144
+#. TRANS: Client error displayed when not specifying an owner for the all rights reserved license in the license admin panel.
 msgid ""
 "You must specify the owner of the content when using the All Rights Reserved "
 "license."
 msgstr "Du må oppgi opphavsperson når du bruker enerettslisens."
 
-#: actions/licenseadminpanel.php:151
+#. TRANS: Client error displayed selecting a too long license title in the license admin panel.
 msgid "Invalid license title. Maximum length is 255 characters."
 msgstr "Ugyldig lisenstittel. Maksimal lengde er 255 tegn."
 
-#: actions/licenseadminpanel.php:163
+#. TRANS: Client error displayed specifying an invalid license URL in the license admin panel.
 msgid "Invalid license URL."
 msgstr "Ugyldig lisensadresse."
 
-#: actions/licenseadminpanel.php:166
+#. TRANS: Client error displayed specifying an invalid license image URL in the license admin panel.
 msgid "Invalid license image URL."
 msgstr "Ugyldig lisensbildeadresse."
 
-#: actions/licenseadminpanel.php:174
+#. TRANS: Client error displayed specifying an invalid license URL in the license admin panel.
 msgid "License URL must be blank or a valid URL."
 msgstr "Lisensadressen må være tom eller en gyldig nettadresse."
 
-#: actions/licenseadminpanel.php:182
+#. TRANS: Client error displayed specifying an invalid license image URL in the license admin panel.
 msgid "License image must be blank or valid URL."
 msgstr "Lisensbildet må være tomt eller en gyldig nettadresse."
 
-#: actions/licenseadminpanel.php:232
+#. TRANS: Form legend in the license admin panel.
 msgid "License selection"
 msgstr "Lisensvalg"
 
-#: actions/licenseadminpanel.php:238
+#. TRANS: License option in the license admin panel.
 msgid "Private"
 msgstr "Privat"
 
-#: actions/licenseadminpanel.php:239
+#. TRANS: License option in the license admin panel.
 msgid "All Rights Reserved"
 msgstr "Alle rettigheter reservert"
 
-#: actions/licenseadminpanel.php:240
+#. TRANS: License option in the license admin panel.
 msgid "Creative Commons"
 msgstr "Creative Commons"
 
-#: actions/licenseadminpanel.php:245
+#. TRANS: Dropdown field label in the license admin panel.
 msgid "Type"
 msgstr "Type"
 
-#: actions/licenseadminpanel.php:247
-msgid "Select license"
+#. TRANS: Dropdown field instructions in the license admin panel.
+#, fuzzy
+msgid "Select a license."
 msgstr "Velg lisens"
 
-#: actions/licenseadminpanel.php:261
+#. TRANS: Form legend in the license admin panel.
 msgid "License details"
 msgstr "Lisensdetaljer"
 
-#: actions/licenseadminpanel.php:267
+#. TRANS: Field label in the license admin panel.
 msgid "Owner"
 msgstr "Eier"
 
-#: actions/licenseadminpanel.php:268
+#. TRANS: Field title in the license admin panel.
 msgid "Name of the owner of the site's content (if applicable)."
 msgstr "Navn på eieren av nettstedets innhold (hvis aktuelt)."
 
-#: actions/licenseadminpanel.php:276
+#. TRANS: Field label in the license admin panel.
 msgid "License Title"
 msgstr "Lisenstittel"
 
-#: actions/licenseadminpanel.php:277
+#. TRANS: Field title in the license admin panel.
 msgid "The title of the license."
 msgstr "Tittelen på lisensen."
 
-#: actions/licenseadminpanel.php:285
+#. TRANS: Field label in the license admin panel.
 msgid "License URL"
 msgstr "Lisensadresse"
 
-#: actions/licenseadminpanel.php:286
+#. TRANS: Field title in the license admin panel.
 msgid "URL for more information about the license."
 msgstr "Adresse til mer informasjon om lisensen."
 
-#: actions/licenseadminpanel.php:293
+#. TRANS: Field label in the license admin panel.
 msgid "License Image URL"
 msgstr "Lisensbildeadresse"
 
-#: actions/licenseadminpanel.php:294
+#. TRANS: Field title in the license admin panel.
 msgid "URL for an image to display with the license."
 msgstr "Adresse til et bilde som vises med lisensen."
 
-#. TRANS: Submit button title.
-#: actions/licenseadminpanel.php:311 actions/sessionsadminpanel.php:199
-#: actions/siteadminpanel.php:292 actions/snapshotadminpanel.php:245
-#: actions/tagother.php:133 lib/applicationeditform.php:357
-msgid "Save"
-msgstr "Lagre"
-
-#: actions/licenseadminpanel.php:311
-msgid "Save license settings"
+#. TRANS: Button title in the license admin panel.
+#, fuzzy
+msgid "Save license settings."
 msgstr "Lagre lisensinnstillinger"
 
+#. TRANS: Client error displayed when trying to log in while already logged in.
 #. TRANS: Client error displayed trying to use "one time password login" when already logged in.
-#: actions/login.php:97 actions/otp.php:62 actions/register.php:130
 msgid "Already logged in."
 msgstr "Allerede innlogget."
 
-#: actions/login.php:125
+#. TRANS: Form validation error displayed when trying to log in with incorrect credentials.
 msgid "Incorrect username or password."
 msgstr "Feil brukernavn eller passord."
 
+#. TRANS: Server error displayed when during login a server error occurs.
 #. TRANS: Server error displayed when a user object could not be created trying to login using "one time password login".
-#: actions/login.php:131 actions/otp.php:127
 msgid "Error setting user. You are probably not authorized."
 msgstr "Feil ved innstilling av bruker. Du er mest sannsynlig kke autorisert."
 
-#: actions/login.php:185 actions/login.php:236 lib/action.php:598
+#. TRANS: Page title for login page.
 msgid "Login"
 msgstr "Logg inn"
 
-#: actions/login.php:222
+#. TRANS: Form legend on login page.
 msgid "Login to site"
 msgstr "Logg inn på nettstedet"
 
-#: actions/login.php:231 actions/register.php:469
+#. TRANS: Checkbox label label on login page.
 msgid "Remember me"
 msgstr "Husk meg"
 
-#: actions/login.php:232 actions/register.php:471
+#. TRANS: Checkbox title on login page.
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 "Logg inn automatisk i framtiden. Ikke for datamaskiner du deler med andre!"
 
-#: actions/login.php:241
+#. TRANS: Button text for log in on login page.
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Login"
+msgstr "Logg inn"
+
+#. TRANS: Link text for link to "reset password" on login page.
 msgid "Lost or forgotten password?"
 msgstr "Mistet eller glemt passordet?"
 
-#: actions/login.php:259
+#. TRANS: Form instructions on login page before being able to change user settings.
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -3744,140 +3060,135 @@ msgstr ""
 "Av sikkerhetsmessige årsaker, skriv inn brukernavn og passord på nytt før du "
 "endrer innstillingene dine."
 
-#: actions/login.php:263
+#. TRANS: Form instructions on login page.
 msgid "Login with your username and password."
 msgstr "Logg inn med brukernavn og passord."
 
-#: actions/login.php:266
+#. TRANS: Form instructions on login page. This message contains Markdown links in the form [Link text](Link).
+#. TRANS: %%action.register%% is a link to the registration page.
 #, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
 msgstr ""
 "Har du ikke et brukernavn ennå? [Opprett](%%action.register%%) en ny konto."
 
-#: actions/makeadmin.php:92
+#. TRANS: Client error displayed when trying to make another user admin on the Make Admin page while not an admin.
 msgid "Only an admin can make another user an admin."
 msgstr "Bare en administrator kan gjøre en annen bruker til administrator."
 
-#: actions/makeadmin.php:96
+#. TRANS: Client error displayed when trying to make another user admin on the Make Admin page who already is admin.
+#. TRANS: %1$s is the user that is already admin, %2$s is the group user is already admin for.
 #, php-format
 msgid "%1$s is already an admin for group \"%2$s\"."
 msgstr "%1$s er allerede en administrator for gruppen «%2$s»."
 
-#: actions/makeadmin.php:133
+#. TRANS: Server error displayed when trying to make another user admin on the Make Admin page fails
+#. TRANS: because the group membership record could not be gotten.
+#. TRANS: %1$s is the to be admin user, %2$s is the group user should be admin for.
 #, php-format
 msgid "Can't get membership record for %1$s in group %2$s."
 msgstr "Kan ikke hente medlemsoppføring for %$1s i gruppen %2$s."
 
-#: actions/makeadmin.php:146
+#. TRANS: Server error displayed when trying to make another user admin on the Make Admin page fails
+#. TRANS: because the group adminship record coud not be saved properly.
+#. TRANS: %1$s is the to be admin user, %2$s is the group user is already admin for.
 #, php-format
 msgid "Can't make %1$s an admin for group %2$s."
 msgstr "Kan ikke gjøre %1$s til administrator for gruppen %2$s."
 
-#: actions/microsummary.php:69
+#. TRANS: Client error displayed trying to make a micro summary without providing a status.
 msgid "No current status."
 msgstr "Ingen nåværende status."
 
 #. TRANS: This is the title of the form for adding a new application.
-#: actions/newapplication.php:52
 msgid "New application"
 msgstr "Ny applikasjon"
 
 #. TRANS: Client error displayed trying to add a new application while not logged in.
-#: actions/newapplication.php:64
 msgid "You must be logged in to register an application."
 msgstr "Du må være logget inn for å registrere et program."
 
 #. TRANS: Form instructions for registering a new application.
-#: actions/newapplication.php:147
 msgid "Use this form to register a new application."
 msgstr "Bruk dette skjemaet for å registrere et nytt program."
 
 #. TRANS: Validation error shown when not providing a source URL in the "New application" form.
-#: actions/newapplication.php:189
 msgid "Source URL is required."
 msgstr "Nettadresse til kilde kreves."
 
 #. TRANS: Server error displayed when an application could not be registered in the database through the "New application" form.
-#: actions/newapplication.php:279 actions/newapplication.php:289
 msgid "Could not create application."
 msgstr "Kunne ikke opprette program."
 
 #. TRANS: Title for form to create a group.
-#: actions/newgroup.php:53
 msgid "New group"
 msgstr "Ny gruppe"
 
 #. TRANS: Client exception thrown when a user tries to create a group while banned.
-#: actions/newgroup.php:73 classes/User_group.php:485
 #, fuzzy
 msgid "You are not allowed to create groups on this site."
 msgstr "Du har ikke tillatelse til å slette denne gruppen."
 
 #. TRANS: Form instructions for group create form.
-#: actions/newgroup.php:117
 msgid "Use this form to create a new group."
 msgstr "Bruk dette skjemaet for å opprette en ny gruppe."
 
-#. TRANS: Group create form validation error.
-#: actions/newgroup.php:200
-#, fuzzy
-msgid "Alias cannot be the same as nickname."
-msgstr "Alias kan ikke være det samme som kallenavn."
-
-#: actions/newmessage.php:71 actions/newmessage.php:234
+#. TRANS: Page title for new direct message page.
+#. TRANS: Page title on page for sending a direct message.
 msgid "New message"
 msgstr "Ny melding"
 
-#. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
-#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:513
-msgid "You can't send a message to this user."
+#. TRANS: Client error displayed trying to send a direct message to a user while sender and
+#. TRANS: receiver are not subscribed to each other.
+#, fuzzy
+msgid "You cannot send a message to this user."
 msgstr "Du kan ikke sende en melding til denne brukeren."
 
+#. TRANS: Form validator error displayed trying to send a direct message without content.
+#. TRANS: Client error displayed trying to send a notice without content.
 #. TRANS: Command exception text shown when trying to send a direct message to another user without content.
 #. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
-#: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:490
-#: lib/command.php:593
 msgid "No content!"
 msgstr "Inget innhold."
 
-#: actions/newmessage.php:161
+#. TRANS: Form validation error displayed trying to send a direct message without specifying a recipient.
 msgid "No recipient specified."
 msgstr "Ingen mottaker oppgitt."
 
+#. TRANS: Client error displayed trying to send a direct message to self.
 #. TRANS: Error text shown when trying to send a direct message to self.
-#: actions/newmessage.php:167 lib/command.php:517
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
 "Ikke send en melding til degselv; bare hvisk det stille til degselv istedet."
 
-#: actions/newmessage.php:184
+#. TRANS: Page title after sending a direct message.
 msgid "Message sent"
 msgstr "Melding sendt"
 
+#. TRANS: Confirmation text after sending a direct message.
+#. TRANS: %s is the direct message recipient.
 #. TRANS: Message given have sent a direct message to another user.
 #. TRANS: %s is the name of the other user.
-#: actions/newmessage.php:188 lib/command.php:525
 #, php-format
 msgid "Direct message to %s sent."
 msgstr "Direktemelding til %s sendt."
 
-#: actions/newmessage.php:213 actions/newnotice.php:264
+#. TRANS: Page title after an AJAX error occurred on the "send direct message" page.
+#. TRANS: Page title after an AJAX error occurs on the send notice page.
 msgid "Ajax Error"
 msgstr "Ajax-feil"
 
-#: actions/newnotice.php:69
+#. TRANS: Page title for sending a new notice.
 msgid "New notice"
 msgstr "Ny notis"
 
-#: actions/newnotice.php:230
+#. TRANS: Page title after sending a notice.
 msgid "Notice posted"
 msgstr "Notis postet"
 
 #. TRANS: Instructions for Notice search page.
 #. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/noticesearch.php:69
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -3887,20 +3198,17 @@ msgstr ""
 "mellomrom; de må være minst 3 tegn lange."
 
 #. TRANS: Title of the page where users can search for notices.
-#: actions/noticesearch.php:80
 msgid "Text search"
 msgstr "Tekst-søk"
 
 #. TRANS: Test in RSS notice search.
 #. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearch.php:95
 #, php-format
 msgid "Search results for \"%1$s\" on %2$s"
 msgstr "Søkeresultat for «%1$s» på %2$s"
 
 #. TRANS: Text for logged in users making a query for notices without results.
 #. TRANS: This message contains a Markdown link.
-#: actions/noticesearch.php:128
 #, php-format
 msgid ""
 "Be the first to [post on this topic](%%%%action.newnotice%%%%?"
@@ -3911,7 +3219,6 @@ msgstr ""
 
 #. TRANS: Text for not logged in users making a query for notices without results.
 #. TRANS: This message contains Markdown links.
-#: actions/noticesearch.php:133
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and be the first to "
@@ -3922,19 +3229,17 @@ msgstr ""
 "%s)!"
 
 #. TRANS: RSS notice search feed title. %s is the query.
-#: actions/noticesearchrss.php:95
 #, php-format
 msgid "Updates with \"%s\""
 msgstr "Oppdateringer med «%s»"
 
 #. TRANS: RSS notice search feed description.
 #. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearchrss.php:99
 #, fuzzy, php-format
 msgid "Updates matching search term \"%1$s\" on %2$s."
 msgstr "Oppdateringer som samsvarer søkestrengen «%1$s» på %2$s."
 
-#: actions/nudge.php:85
+#. TRANS: Client error displayed trying to nudge a user that cannot be nudged.
 msgid ""
 "This user doesn't allow nudges or hasn't confirmed or set their email "
 "address yet."
@@ -3942,60 +3247,51 @@ msgstr ""
 "Denne brukeren tillater ikke dultinger, eller har ikke satt opp e-"
 "postadressen sin ennå."
 
-#: actions/nudge.php:94
+#. TRANS: Page title after sending a nudge.
 msgid "Nudge sent"
 msgstr "Knuff sendt"
 
-#: actions/nudge.php:97
+#. TRANS: Confirmation text after sending a nudge.
 msgid "Nudge sent!"
 msgstr "Knuff sendt!"
 
 #. TRANS: Message displayed to an anonymous user trying to view OAuth application list.
-#: actions/oauthappssettings.php:57
 msgid "You must be logged in to list your applications."
 msgstr "Du må være logget inn for å liste opp programmene dine."
 
 #. TRANS: Page title for OAuth applications
-#: actions/oauthappssettings.php:73
 msgid "OAuth applications"
 msgstr "OAuth-program"
 
 #. TRANS: Page instructions for OAuth applications
-#: actions/oauthappssettings.php:85
 msgid "Applications you have registered"
 msgstr "Program du har registrert"
 
 #. TRANS: Empty list message on page with OAuth applications.
-#: actions/oauthappssettings.php:138
 #, php-format
 msgid "You have not registered any applications yet."
 msgstr "Du har ikke registrert noen program ennå."
 
 #. TRANS: Title for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:69
 msgid "Connected applications"
 msgstr "Tilkoblede program"
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:80
 msgid "The following connections exist for your account."
 msgstr "Følgende tilkoblinger finnes for kontoen din."
 
 #. TRANS: Client error when trying to revoke access for an application while not being a user of it.
-#: actions/oauthconnectionssettings.php:165
 msgid "You are not a user of that application."
 msgstr "Du er ikke bruker av dette programmet."
 
 #. TRANS: Client error when revoking access has failed for some reason.
 #. TRANS: %s is the application ID revoking access failed for.
-#: actions/oauthconnectionssettings.php:180
 #, fuzzy, php-format
 msgid "Unable to revoke access for application: %s."
 msgstr "Kunne ikke fjerne tilgang for applikasjonen: %s."
 
 #. TRANS: Success message after revoking access for an application.
 #. TRANS: %1$s is the application name, %2$s is the first part of the user token.
-#: actions/oauthconnectionssettings.php:199
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -4004,458 +3300,375 @@ msgstr ""
 "Du har fjernet tilgangen for %1$s og tilgangstegnet som begynner med %2$s."
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:210
 msgid "You have not authorized any applications to use your account."
 msgstr "Du har ikke tillatt noen programmer å bruke din konto."
 
 #. TRANS: Note for developers in the OAuth connection settings form.
 #. TRANS: This message contains a Markdown link. Do not separate "](".
 #. TRANS: %s is the URL to the OAuth settings.
-#: actions/oauthconnectionssettings.php:230
 #, php-format
 msgid ""
 "Are you a developer? [Register an OAuth client application](%s) to use with "
 "this instance of StatusNet."
 msgstr ""
 
-#: actions/oembed.php:64
+#. TRANS: Server error displayed in oEmbed action when path not found.
+#. TRANS: %s is a path.
 #, fuzzy, php-format
 msgid "\"%s\" not found."
 msgstr "Bruker ikke funnet."
 
-#: actions/oembed.php:76
+#. TRANS: Server error displayed in oEmbed action when notice not found.
+#. TRANS: %s is a notice.
 #, fuzzy, php-format
 msgid "Notice %s not found."
 msgstr "Foreldrenotis ikke funnet."
 
-#: actions/oembed.php:80 actions/shownotice.php:100
+#. TRANS: Server error displayed in oEmbed action when notice has not profile.
 msgid "Notice has no profile."
 msgstr "Notisen har ingen profil."
 
-#: actions/oembed.php:83 actions/shownotice.php:172
+#. TRANS: oEmbed title. %1$s is the author name, %2$s is the creation date.
 #, php-format
 msgid "%1$s's status on %2$s"
 msgstr "%1$s sin status på %2$s"
 
-#: actions/oembed.php:95
+#. TRANS: Server error displayed in oEmbed action when attachment not found.
+#. TRANS: %d is an attachment ID.
 #, fuzzy, php-format
 msgid "Attachment %s not found."
 msgstr "Fant ikke mottakeren."
 
-#: actions/oembed.php:136
+#. TRANS: Server error displayed in oEmbed request when a path is not supported.
+#. TRANS: %s is a path.
 #, php-format
 msgid "\"%s\" not supported for oembed requests."
 msgstr ""
 
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
-#: actions/oembed.php:168
 #, php-format
 msgid "Content type %s not supported."
 msgstr "Innholdstypen %s støttes ikke."
 
 #. TRANS: Error message displaying attachments. %s is the site's base URL.
-#: actions/oembed.php:172
 #, php-format
 msgid "Only %s URLs over plain HTTP please."
 msgstr "Bare %s-nettadresser over vanlig HTTP."
 
+#. TRANS: Server error displayed in oEmbed action when request specifies an unsupported data format.
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1207
-#: lib/apiaction.php:1234 lib/apiaction.php:1369
 msgid "Not a supported data format."
 msgstr "Ikke et støttet dataformat."
 
 #. TRANS: ShortName in the OpenSearch interface when trying to find users.
-#: actions/opensearch.php:64
 msgid "People Search"
 msgstr "Personsøk"
 
-#: actions/opensearch.php:68
+#. TRANS: ShortName in the OpenSearch interface when trying to find notices.
 msgid "Notice Search"
 msgstr "Notissøk"
 
 #. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
-#: actions/otp.php:70
 msgid "No user ID specified."
 msgstr "Ingen bruker-ID spesifisert."
 
 #. TRANS: Client error displayed trying to use "one time password login" without specifying a login token.
-#: actions/otp.php:86
 msgid "No login token specified."
 msgstr "Ingen notis spesifisert."
 
 #. TRANS: Client error displayed trying to use "one time password login" without requesting a login token.
-#: actions/otp.php:94
 msgid "No login token requested."
 msgstr ""
 
 #. TRANS: Client error displayed trying to use "one time password login" while specifying an invalid login token.
-#: actions/otp.php:100
 msgid "Invalid login token specified."
 msgstr "Ugyldig symbol."
 
 #. TRANS: Client error displayed trying to use "one time password login" while specifying an expired login token.
-#: actions/otp.php:110
 #, fuzzy
 msgid "Login token expired."
 msgstr "Logg inn på nettstedet"
 
 #. TRANS: Title for outbox for any but the fist page.
 #. TRANS: %1$s is the user nickname, %2$d is the page number.
-#: actions/outbox.php:57
 #, php-format
 msgid "Outbox for %1$s - page %2$d"
 msgstr "Utboks for %1$s - side %2$d"
 
 #. TRANS: Title for first page of outbox.
-#: actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
 msgstr "Utboks for %s"
 
 #. TRANS: Instructions for outbox.
-#: actions/outbox.php:103
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr "Dette er utboksen din som viser alle private meldinger du har sendt."
 
-#: actions/passwordsettings.php:58
 msgid "Change password"
 msgstr "Endre passord"
 
-#: actions/passwordsettings.php:69
 msgid "Change your password."
 msgstr "Endre passordet ditt."
 
 #. TRANS: Fieldset legend for password reset form.
-#: actions/passwordsettings.php:96 actions/recoverpassword.php:251
 msgid "Password change"
 msgstr "Endre passord"
 
-#: actions/passwordsettings.php:104
 msgid "Old password"
 msgstr "Gammelt passord"
 
 #. TRANS: Field label for password reset form.
-#: actions/passwordsettings.php:108 actions/recoverpassword.php:256
 msgid "New password"
 msgstr "Nytt passord"
 
-#: actions/passwordsettings.php:109 actions/register.php:416
 #, fuzzy
 msgid "6 or more characters."
 msgstr "6 eller flere tegn"
 
 #. TRANS: Ttile for field label for password reset form where the password has to be typed again.
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:264
-#: actions/register.php:420
 #, fuzzy
 msgid "Same as password above."
 msgstr "Samme som passord ovenfor"
 
-#: actions/passwordsettings.php:117
 msgid "Change"
 msgstr "Endre"
 
-#: actions/passwordsettings.php:153 actions/register.php:223
 msgid "Password must be 6 or more characters."
 msgstr "Passord må være minst 6 tegn."
 
-#: actions/passwordsettings.php:156 actions/register.php:226
 msgid "Passwords don't match."
 msgstr "Passordene var ikke like."
 
-#: actions/passwordsettings.php:164
 msgid "Incorrect old password"
 msgstr "Feil gammelt passord"
 
-#: actions/passwordsettings.php:180
 msgid "Error saving user; invalid."
 msgstr "Feil ved lagring av bruker; ugyldig."
 
 #. TRANS: Reset password form validation error message.
-#: actions/passwordsettings.php:185 actions/recoverpassword.php:418
 #, fuzzy
 msgid "Cannot save new password."
 msgstr "Klarer ikke å lagre nytt passord."
 
-#: actions/passwordsettings.php:191
 msgid "Password saved."
 msgstr "Passordet ble lagret"
 
 #. TRANS: Title for Paths admin panel.
 #. TRANS: Menu item for site administration
-#: actions/pathsadminpanel.php:58 lib/adminpanelaction.php:371
 msgid "Paths"
 msgstr "Stier"
 
 #. TRANS: Form instructions for Path admin panel.
-#: actions/pathsadminpanel.php:69
 msgid "Path and server settings for this StatusNet site"
 msgstr "Sti- og tjenerinnstillinger for denne StatusNet-siden"
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the directory that could not be read from.
-#: actions/pathsadminpanel.php:155
 #, php-format
 msgid "Theme directory not readable: %s."
 msgstr "Temamappe ikke lesbar: %s."
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the avatar directory that could not be written to.
-#: actions/pathsadminpanel.php:163
 #, php-format
 msgid "Avatar directory not writable: %s."
 msgstr "Avatarmappe ikke skrivbar: %s."
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the background directory that could not be written to.
-#: actions/pathsadminpanel.php:171
 #, php-format
 msgid "Background directory not writable: %s."
 msgstr "Bakgrunnsmappe ikke skrivbar: %s."
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the locales directory that could not be read from.
-#: actions/pathsadminpanel.php:181
 #, php-format
 msgid "Locales directory not readable: %s."
 msgstr "Lokaliseringsmappe ikke lesbar: %s."
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the SSL server URL that is too long.
-#: actions/pathsadminpanel.php:189
 msgid "Invalid SSL server. The maximum length is 255 characters."
 msgstr "Ugyldig SSL-tjener. Maks lengde er 255 tegn."
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:235 actions/siteadminpanel.php:58
 msgid "Site"
 msgstr "Nettsted"
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:241 actions/pathsadminpanel.php:279
-#: actions/pathsadminpanel.php:370 actions/pathsadminpanel.php:425
 msgid "Server"
 msgstr "Tjener"
 
-#: actions/pathsadminpanel.php:242
 msgid "Site's server hostname."
 msgstr "Vertsnavn for nettstedets tjener."
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:248 actions/pathsadminpanel.php:288
-#: actions/pathsadminpanel.php:379 actions/pathsadminpanel.php:434
 msgid "Path"
 msgstr "Sti"
 
-#: actions/pathsadminpanel.php:249
 msgid "Site path."
 msgstr "Nettstedssti."
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:255
 #, fuzzy
 msgid "Locale directory"
 msgstr "Temamappe"
 
-#: actions/pathsadminpanel.php:256
 #, fuzzy
 msgid "Directory path to locales."
 msgstr "Lokaliseringsmappesti"
 
 #. TRANS: Checkbox label in Paths admin panel.
-#: actions/pathsadminpanel.php:263
 msgid "Fancy URLs"
 msgstr "Pyntede nettadresser"
 
-#: actions/pathsadminpanel.php:265
 msgid "Use fancy (more readable and memorable) URLs?"
 msgstr "Bruk pyntede (mer lesbare og lettere å huske) nettadresser?"
 
-#: actions/pathsadminpanel.php:272
 msgid "Theme"
 msgstr "Tema"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:281
 msgid "Server for themes."
 msgstr "Tjener for drakter."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:290
 msgid "Web path to themes."
 msgstr "Sti til drakter."
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:297 actions/pathsadminpanel.php:388
-#: actions/pathsadminpanel.php:443 actions/pathsadminpanel.php:495
 msgid "SSL server"
 msgstr "SSL-tjener"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:299
 msgid "SSL server for themes (default: SSL server)."
 msgstr "SSL-tjener for drakter (standard: SSL-tjener)."
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:306 actions/pathsadminpanel.php:397
-#: actions/pathsadminpanel.php:452
 msgid "SSL path"
 msgstr "SSL-sti"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:308
 msgid "SSL path to themes (default: /theme/)."
 msgstr "SSL-sti til drakter (standard: /theme/)."
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:315 actions/pathsadminpanel.php:406
-#: actions/pathsadminpanel.php:461
 msgid "Directory"
 msgstr "Mappe"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:317
 msgid "Directory where themes are located."
 msgstr "Mappen drakter er plassert i."
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:326
 msgid "Avatars"
 msgstr "Avatarer"
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:333
 msgid "Avatar server"
 msgstr "Avatartjener"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:335
 msgid "Server for avatars."
 msgstr "Tjener for avatarer."
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:342
 msgid "Avatar path"
 msgstr "Avatarsti"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:344
 msgid "Web path to avatars."
 msgstr "Sti til avatarer."
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:351
 msgid "Avatar directory"
 msgstr "Avatarmappe"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:353
 msgid "Directory where avatars are located."
 msgstr "Mappen avatarer er plassert i."
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:364
 msgid "Backgrounds"
 msgstr "Bakgrunner"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:372
 msgid "Server for backgrounds."
 msgstr "Tjener for bakgrunner."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:381
 msgid "Web path to backgrounds."
 msgstr "Sti til bakgrunner."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:390
 msgid "Server for backgrounds on SSL pages."
 msgstr "Tjener for bakgrunner på SSL-sider."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:399
 msgid "Web path to backgrounds on SSL pages."
 msgstr "Sti til bakgrunner på SSL-sider."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:408
 msgid "Directory where backgrounds are located."
 msgstr "Mappen bakgrunner er plassert i."
 
 #. TRANS: Fieldset legens in Paths admin panel.
-#: actions/pathsadminpanel.php:419
 msgid "Attachments"
 msgstr "Vedlegg"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:427
 msgid "Server for attachments."
 msgstr "Tjener for vedlegg."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:436
 msgid "Web path to attachments."
 msgstr "Sti til vedlegg."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:445
 msgid "Server for attachments on SSL pages."
 msgstr "Tjener for vedlegg på SSL-sider."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:454
 msgid "Web path to attachments on SSL pages."
 msgstr "Sti til vedlegg på SSL-sider."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:463
 msgid "Directory where attachments are located."
 msgstr "Mappen vedlegg er plassert i."
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:472
 msgid "SSL"
 msgstr "SSL"
 
 #. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
-#: actions/pathsadminpanel.php:477 actions/snapshotadminpanel.php:202
 msgid "Never"
 msgstr "Aldri"
 
 #. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
-#: actions/pathsadminpanel.php:479
 msgid "Sometimes"
 msgstr "Noen ganger"
 
 #. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
-#: actions/pathsadminpanel.php:481
 msgid "Always"
 msgstr "Alltid"
 
-#: actions/pathsadminpanel.php:485
 msgid "Use SSL"
 msgstr "Bruk SSL"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:487
 msgid "When to use SSL."
 msgstr "Når SSL skal brukes."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:497
 msgid "Server to direct SSL requests to."
 msgstr "Tjener SSL-forespørsler skal rettes til."
 
 #. TRANS: Button title text to store form data in the Paths admin panel.
-#: actions/pathsadminpanel.php:514
 msgid "Save paths"
 msgstr "Lagre stier"
 
 #. TRANS: Instructions for the "People search" page.
 #. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/peoplesearch.php:54
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
@@ -4465,57 +3678,46 @@ msgstr ""
 "interesser. Skill nøkkelord med mellomrom; de må være 3 tegn eller lengre."
 
 #. TRANS: Title of a page where users can search for other users.
-#: actions/peoplesearch.php:61
 msgid "People search"
 msgstr "Personsøk"
 
-#: actions/peopletag.php:68
 #, php-format
 msgid "Not a valid people tag: %s."
 msgstr "Ikke en gyldig personmerkelapp: %s."
 
-#: actions/peopletag.php:142
 #, php-format
 msgid "Users self-tagged with %1$s - page %2$d"
 msgstr "Brukere som har merket seg selv med %1$s - side %2$d"
 
 #. TRANS: Page title for AJAX form return when a disabling a plugin.
-#: actions/plugindisable.php:69
 msgctxt "plugin"
 msgid "Disabled"
 msgstr ""
 
 #. TRANS: Client error displayed trying to perform any request method other than POST.
 #. TRANS: Do not translate POST.
-#: actions/pluginenable.php:78 actions/subscribe.php:77
 msgid "This action only accepts POST requests."
 msgstr ""
 
-#: actions/pluginenable.php:102
 #, fuzzy
 msgid "You cannot administer plugins."
 msgstr "Du kan ikke slette brukere."
 
-#: actions/pluginenable.php:109
 #, fuzzy
 msgid "No such plugin."
 msgstr "Ingen slik side."
 
 #. TRANS: Page title for AJAX form return when enabling a plugin.
-#: actions/pluginenable.php:159
 msgctxt "plugin"
 msgid "Enabled"
 msgstr ""
 
 #. TRANS: Tab and title for plugins admin panel.
 #. TRANS: Menu item for site administration
-#: actions/pluginsadminpanel.php:56 actions/version.php:191
-#: lib/adminpanelaction.php:411
 msgid "Plugins"
 msgstr "Programtillegg"
 
 #. TRANS: Instructions at top of plugin admin page.
-#: actions/pluginsadminpanel.php:68
 msgid ""
 "Additional plugins can be enabled and configured manually. See the <a href="
 "\"http://status.net/wiki/Plugins\">online plugin documentation</a> for more "
@@ -4523,32 +3725,26 @@ msgid ""
 msgstr ""
 
 #. TRANS: Admin form section header
-#: actions/pluginsadminpanel.php:84
 #, fuzzy
 msgid "Default plugins"
 msgstr "Standardspråk"
 
-#: actions/pluginsadminpanel.php:106
 msgid ""
 "All default plugins have been disabled from the site's configuration file."
 msgstr ""
 
-#: actions/postnotice.php:95
 msgid "Invalid notice content."
 msgstr "Ugyldig notisinnhold."
 
-#: actions/postnotice.php:101
 #, php-format
 msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’."
 msgstr "Notislisensen ‘%1$s’ er ikke kompatibel med nettstedslisensen ‘%2$s’."
 
 #. TRANS: Page title for profile settings.
-#: actions/profilesettings.php:60
 msgid "Profile settings"
 msgstr "Profilinnstillinger"
 
 #. TRANS: Usage instructions for profile settings.
-#: actions/profilesettings.php:71
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
@@ -4556,37 +3752,29 @@ msgstr ""
 "mer om deg."
 
 #. TRANS: Profile settings form legend.
-#: actions/profilesettings.php:99
 msgid "Profile information"
 msgstr "Profilinformasjon"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:110 actions/register.php:412
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr "1‒64 små bokstaver eller tall, ingen tegnsetting eller mellomrom."
 
 #. TRANS: Field label in form for profile settings.
-#: actions/profilesettings.php:114 actions/register.php:434
-#: lib/groupeditform.php:150
 msgid "Full name"
 msgstr "Fullt navn"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:119 actions/register.php:439
-#: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "Hjemmesiden"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:122 actions/register.php:441
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr "Adressen til din hjemmeside, blogg eller profil på et annet nettsted."
 
 #. TRANS: Tooltip for field label in form for profile settings. Plural
 #. TRANS: is decided by the number of characters available for the
 #. TRANS: biography (%d).
-#: actions/profilesettings.php:130 actions/register.php:450
 #, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4594,41 +3782,31 @@ msgstr[0] "Beskriv deg selv og dine interesser på %d tegn"
 msgstr[1] "Beskriv deg selv og dine interesser på %d tegn"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:136 actions/register.php:455
 msgid "Describe yourself and your interests"
 msgstr "Beskriv degselv og dine interesser"
 
 #. TRANS: Text area label in form for profile settings where users can provide.
 #. TRANS: their biography.
-#: actions/profilesettings.php:140 actions/register.php:457
 msgid "Bio"
 msgstr "Om meg"
 
 #. TRANS: Field label in form for profile settings.
-#: actions/profilesettings.php:146 actions/register.php:462
-#: lib/groupeditform.php:173
 msgid "Location"
 msgstr "Plassering"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:149
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Hvor du er, for eksempel «By, fylke (eller region), land»"
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:154
 msgid "Share my current location when posting notices"
 msgstr "Del min nåværende plassering når jeg poster notiser"
 
 #. TRANS: Field label in form for profile settings.
-#: actions/profilesettings.php:162 actions/tagother.php:128
-#: actions/tagother.php:188 lib/subscriptionlist.php:104
-#: lib/subscriptionlist.php:106
 msgid "Tags"
 msgstr "Tagger"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:165
 #, fuzzy
 msgid ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- "
@@ -4638,28 +3816,23 @@ msgstr ""
 "eller mellomrom"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:170
 msgid "Language"
 msgstr "Språk"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:172
 #, fuzzy
 msgid "Preferred language."
 msgstr "Foretrukket språk"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:182
 msgid "Timezone"
 msgstr "Tidssone"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:184
 msgid "What timezone are you normally in?"
 msgstr "Hvilken tidssone er du vanligvis i?"
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:190
 #, fuzzy
 msgid ""
 "Automatically subscribe to whoever subscribes to me (best for non-humans)."
@@ -4669,7 +3842,6 @@ msgstr ""
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Plural form is used based on the maximum number of allowed
 #. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:259 actions/register.php:214
 #, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4677,84 +3849,68 @@ msgstr[0] "Biografien er for lang (maks %d tegn)."
 msgstr[1] "Biografien er for lang (maks %d tegn)."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:270 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr "Tidssone ikke valgt."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:278
 msgid "Language is too long (maximum 50 characters)."
 msgstr "Språknavnet er for langt (maks 50 tegn)."
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:292
 #, fuzzy, php-format
 msgid "Invalid tag: \"%s\"."
 msgstr "Ugyldig merkelapp: «%s»"
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:348
 #, fuzzy
 msgid "Could not update user for autosubscribe."
 msgstr "Kunne ikke oppdatere bruker for autoabonnering."
 
 #. TRANS: Server error thrown when user profile location preference settings could not be updated.
-#: actions/profilesettings.php:406
 #, fuzzy
 msgid "Could not save location prefs."
 msgstr "Kunne ikke lagre plasseringsinnstillinger."
 
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:428 actions/tagother.php:179
 msgid "Could not save tags."
 msgstr "Kunne ikke lagre merkelapper."
 
 #. TRANS: Confirmation shown when user profile settings are saved.
 #. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:437 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "Innstillinger lagret."
 
 #. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
 #. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:484 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "Opprett en konto"
 
-#: actions/public.php:83
 #, php-format
 msgid "Beyond the page limit (%s)."
 msgstr "Over sidegrensen (%s)."
 
-#: actions/public.php:92
 msgid "Could not retrieve public stream."
 msgstr "Kunne ikke hente offentlig strøm."
 
-#: actions/public.php:130
 #, php-format
 msgid "Public timeline, page %d"
 msgstr "Offentlig tidslinje, side %d"
 
-#: actions/public.php:132 lib/publicgroupnav.php:79
 msgid "Public timeline"
 msgstr "Offentlig tidslinje"
 
-#: actions/public.php:160
 msgid "Public Stream Feed (RSS 1.0)"
 msgstr "Offentlig strømmating (RSS 1.0)"
 
-#: actions/public.php:164
 msgid "Public Stream Feed (RSS 2.0)"
 msgstr "Offentlig strømmating (RSS 2.0)"
 
-#: actions/public.php:168
 msgid "Public Stream Feed (Atom)"
 msgstr "Offentlig strømmating (Atom)"
 
-#: actions/public.php:188
 #, php-format
 msgid ""
 "This is the public timeline for %%site.name%% but no one has posted anything "
@@ -4763,11 +3919,9 @@ msgstr ""
 "Dette er den offentlige tidslinjen for %%site.name%% men ingen har postet "
 "noe ennå."
 
-#: actions/public.php:191
 msgid "Be the first to post!"
 msgstr "Vær den første til å poste!"
 
-#: actions/public.php:195
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post!"
@@ -4775,7 +3929,6 @@ msgstr ""
 "Hvorfor ikke [registrere en konto](%%action.register%%) og vær den første "
 "til å poste!"
 
-#: actions/public.php:242
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -4788,7 +3941,6 @@ msgstr ""
 "(http://status.net). [Bli med nå](%%action.register%%) for å dele notiser om "
 "degselv med venner, familie og kollegaer! ([Les mer](%%doc.help%%))"
 
-#: actions/public.php:247
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -4800,19 +3952,16 @@ msgstr ""
 "(http://status.net)."
 
 #. TRANS: Public RSS feed description. %s is the StatusNet site name.
-#: actions/publicrss.php:106
 #, fuzzy, php-format
 msgid "%s updates from everyone."
 msgstr "%s oppdateringer fra alle sammen!"
 
 #. TRANS: Title for public tag cloud.
-#: actions/publictagcloud.php:57
 msgid "Public tag cloud"
 msgstr "Offentlig merkelappsky"
 
 #. TRANS: Instructions (more used like an explanation/header).
 #. TRANS: %s is the StatusNet sitename.
-#: actions/publictagcloud.php:65
 #, fuzzy, php-format
 msgid "These are most popular recent tags on %s"
 msgstr "Dette er de siste mest populære merkelappene på %s "
@@ -4820,14 +3969,12 @@ msgstr "Dette er de siste mest populære merkelappene på %s "
 #. TRANS: This message contains a Markdown URL. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.
-#: actions/publictagcloud.php:74
 #, php-format
 msgid "No one has posted a notice with a [hashtag](%%doc.tags%%) yet."
 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.
-#: actions/publictagcloud.php:79
 msgid "Be the first to post one!"
 msgstr "Vær den første til å poste en!"
 
@@ -4836,7 +3983,6 @@ msgstr "Vær den første til å poste en!"
 #. TRANS: This message contains a Markdown URL. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.
-#: actions/publictagcloud.php:87
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post "
@@ -4846,42 +3992,34 @@ msgstr ""
 "til å poste en!"
 
 #. TRANS: Client error displayed trying to recover password while already logged in.
-#: actions/recoverpassword.php:37
 msgid "You are already logged in!"
 msgstr "Du er allerede logget inn!"
 
 #. TRANS: Client error displayed when password recovery code is not correct.
-#: actions/recoverpassword.php:64
 msgid "No such recovery code."
 msgstr "Ingen slik gjenopprettingskode."
 
 #. TRANS: Client error displayed when no proper password recovery code was submitted.
-#: actions/recoverpassword.php:69
 msgid "Not a recovery code."
 msgstr "Ikke en gjenopprettingskode."
 
 #. TRANS: Server error displayed trying to recover password without providing a user.
-#: actions/recoverpassword.php:77
 msgid "Recovery code for unknown user."
 msgstr "Gjenopprettingskode for ukjent bruker."
 
 #. TRANS: Server error displayed removing a password recovery code from the database.
-#: actions/recoverpassword.php:91
 msgid "Error with confirmation code."
 msgstr "Bekreftelseskodefeil."
 
 #. TRANS: Client error displayed trying to recover password with too old a recovery code.
-#: actions/recoverpassword.php:103
 msgid "This confirmation code is too old. Please start again."
 msgstr "Denne bekreftelseskoden er for gammel. Start på nytt."
 
 #. TRANS: Server error displayed when updating a user's e-mail address in the database fails while recovering a password.
-#: actions/recoverpassword.php:118
 msgid "Could not update user with confirmed email address."
 msgstr "Klarte ikke å oppdatere bruker med bekreftet e-post."
 
 #. TRANS: Page notice for password recovery page.
-#: actions/recoverpassword.php:160
 msgid ""
 "If you have forgotten or lost your password, you can get a new one sent to "
 "the email address you have stored in your account."
@@ -4889,100 +4027,82 @@ msgstr ""
 "Om du har glemt eller mistet passordet ditt kan du få et nytt tilsendt på e-"
 "postadressen du har lagret på kontoen din."
 
-#: actions/recoverpassword.php:167
 msgid "You have been identified. Enter a new password below."
 msgstr "Du har blitt identifisert. Skriv inn et nytt passord nedenfor."
 
 #. TRANS: Fieldset legend for password recovery page.
-#: actions/recoverpassword.php:198
 msgid "Password recovery"
 msgstr "Passordgjenoppretting"
 
 #. TRANS: Field label on password recovery page.
-#: actions/recoverpassword.php:202
 msgid "Nickname or email address"
 msgstr "Kallenavn eller e-postadresse"
 
 #. TRANS: Title for field label on password recovery page.
-#: actions/recoverpassword.php:205
 msgid "Your nickname on this server, or your registered email address."
 msgstr "Ditt kallenavn på denne tjeneren eller din registrerte e-postadresse."
 
 #. TRANS: Field label on password recovery page.
-#: actions/recoverpassword.php:212
 msgid "Recover"
 msgstr "Gjenopprett"
 
 #. TRANS: Button text on password recovery page.
-#: actions/recoverpassword.php:214
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Recover"
 msgstr "Gjenopprett"
 
 #. TRANS: Title for password recovery page in password reset mode.
-#: actions/recoverpassword.php:223
 msgid "Reset password"
 msgstr "Tilbakestill passord"
 
 #. TRANS: Title for password recovery page in password recover mode.
-#: actions/recoverpassword.php:225
 msgid "Recover password"
 msgstr "Gjenopprett passord"
 
 #. TRANS: Title for password recovery page in email sent mode.
 #. TRANS: Subject for password recovery e-mail.
-#: actions/recoverpassword.php:227 actions/recoverpassword.php:366
 msgid "Password recovery requested"
 msgstr "Passordgjenoppretting forespurt"
 
 #. TRANS: Title for password recovery page in password saved mode.
-#: actions/recoverpassword.php:229
 #, fuzzy
 msgid "Password saved"
 msgstr "Passordet ble lagret"
 
 #. TRANS: Title for password recovery page when an unknown action has been specified.
-#: actions/recoverpassword.php:232
 msgid "Unknown action"
 msgstr "Ukjent handling"
 
 #. TRANS: Title for field label for password reset form.
-#: actions/recoverpassword.php:258
 #, fuzzy
 msgid "6 or more characters, and do not forget it!"
 msgstr "6 eller flere tegn. Og ikke glem det!"
 
 #. TRANS: Button text for password reset form.
 #. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: actions/recoverpassword.php:268 lib/designform.php:145
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Reset"
 msgstr "Nullstill"
 
 #. TRANS: Form instructions for password recovery form.
-#: actions/recoverpassword.php:278
 msgid "Enter a nickname or email address."
 msgstr "Skriv inn et kallenavn eller en e-postadresse."
 
 #. TRANS: Information on password recovery form if no known username or e-mail address was specified.
-#: actions/recoverpassword.php:309
 msgid "No user with that email address or username."
 msgstr "Ingen bruker med den e-postadressen eller det kallenavnet."
 
 #. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
-#: actions/recoverpassword.php:327
 msgid "No registered email address for that user."
 msgstr "Ingen registrert e-postadresse for den brukeren."
 
 #. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
-#: actions/recoverpassword.php:342
 msgid "Error saving address confirmation."
 msgstr "Feil ved lagring av adressebekreftelse."
 
 #. TRANS: User notification after an e-mail with instructions was sent from the password recovery form.
-#: actions/recoverpassword.php:370
 msgid ""
 "Instructions for recovering your password have been sent to the email "
 "address registered to your account."
@@ -4991,74 +4111,58 @@ msgstr ""
 "til din registrerte e-postadresse."
 
 #. TRANS: Client error displayed when trying to reset as password without providing a user.
-#: actions/recoverpassword.php:391
 msgid "Unexpected password reset."
 msgstr "Uventet tilbakestilling av passord."
 
 #. TRANS: Reset password form validation error message.
-#: actions/recoverpassword.php:400
 msgid "Password must be 6 characters or more."
 msgstr "Passordet må bestå av 6 eller flere tegn."
 
 #. TRANS: Reset password form validation error message.
-#: actions/recoverpassword.php:405
 msgid "Password and confirmation do not match."
 msgstr "Passord og bekreftelse samsvarer ikke."
 
 #. TRANS: Server error displayed when something does wrong with the user object during password reset.
-#: actions/recoverpassword.php:426 actions/register.php:241
 msgid "Error setting user."
 msgstr "Feil ved innstilling av bruker."
 
 #. TRANS: Success message for user after password reset.
-#: actions/recoverpassword.php:434
 msgid "New password successfully saved. You are now logged in."
 msgstr "Nytt passord ble lagret. Du er nå logget inn."
 
-#: actions/redirecturl.php:70
 #, fuzzy
 msgid "No id parameter"
 msgstr "Ingen vedlegg."
 
-#: actions/redirecturl.php:76
 #, fuzzy, php-format
 msgid "No such file \"%d\""
 msgstr "Ingen slik fil."
 
-#: actions/register.php:80 actions/register.php:181 actions/register.php:392
 msgid "Sorry, only invited people can register."
 msgstr "Beklager, kun inviterte personer kan registrere seg."
 
-#: actions/register.php:87
 msgid "Sorry, invalid invitation code."
 msgstr "Beklager, ugyldig invitasjonskode."
 
-#: actions/register.php:106
 msgid "Registration successful"
 msgstr "Registrering vellykket"
 
-#: actions/register.php:108 actions/register.php:490
 msgid "Register"
 msgstr "Registrer"
 
-#: actions/register.php:128
 msgid "Registration not allowed."
 msgstr "Registrering ikke tillatt."
 
-#: actions/register.php:194
 #, fuzzy
 msgid "You cannot register if you don't agree to the license."
 msgstr "Du kan ikke registrere deg om du ikke godtar lisensvilkårene."
 
-#: actions/register.php:203
 msgid "Email address already exists."
 msgstr "E-postadressen finnes allerede."
 
-#: actions/register.php:236 actions/register.php:258
 msgid "Invalid username or password."
 msgstr "Ugyldig brukernavn eller passord."
 
-#: actions/register.php:333
 #, fuzzy
 msgid ""
 "With this form you can create a new account. You can then post notices and "
@@ -5067,49 +4171,39 @@ msgstr ""
 "Med dette skjemaet kan du opprette en ny konto. Du kan så poste notiser og "
 "knytte deg til venner og kollegaer. "
 
-#: actions/register.php:424 actions/register.php:428
-#: actions/siteadminpanel.php:238 lib/settingsnav.php:92
 msgid "Email"
 msgstr "E-post"
 
-#: actions/register.php:425 actions/register.php:429
 #, fuzzy
 msgid "Used only for updates, announcements, and password recovery."
 msgstr "Kun brukt for oppdateringer, kunngjøringer og passordgjenoppretting"
 
-#: actions/register.php:436
 #, fuzzy
 msgid "Longer name, preferably your \"real\" name."
 msgstr "Lengre navn, helst ditt \"ekte\" navn"
 
-#: actions/register.php:464
 #, fuzzy
 msgid "Where you are, like \"City, State (or Region), Country\"."
 msgstr "Hvor du er, for eksempel «By, fylke (eller region), land»"
 
-#: actions/register.php:503
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
 msgstr ""
 
-#: actions/register.php:513
 #, php-format
 msgid "My text and files are copyright by %1$s."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:517
 msgid "My text and files remain under my own copyright."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:520
 msgid "All rights reserved."
 msgstr "Alle rettigheter reservert."
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:525
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -5118,7 +4212,6 @@ msgstr ""
 "Mine tekster og filer er tilgjengelig under %s med unntak av disse private "
 "dataene: passord, e-postadresse, direktemeldingsadresse og telefonnummer."
 
-#: actions/register.php:566
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -5151,7 +4244,6 @@ msgstr ""
 "\n"
 "Takk for at du registrerte deg og vi håper du kommer til å like tjenesten."
 
-#: actions/register.php:590
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5159,7 +4251,6 @@ msgstr ""
 "(Du vil straks motta en epost med instruksjoner om hvordan du kan bekrefte "
 "din epostadresse)"
 
-#: actions/remotesubscribe.php:97
 #, php-format
 msgid ""
 "To subscribe, you can [login](%%action.login%%), or [register](%%action."
@@ -5171,120 +4262,94 @@ msgstr ""
 "[kompatibelt mikrobloggingsnettsted](%%doc.openmublog%%), skriv inn "
 "profilnettadressen din nedenfor."
 
-#: actions/remotesubscribe.php:111
 msgid "Remote subscribe"
 msgstr "Fjernabonner"
 
-#: actions/remotesubscribe.php:123
 msgid "Subscribe to a remote user"
 msgstr "Abonner på en fjernbruker"
 
-#: actions/remotesubscribe.php:128
 msgid "User nickname"
 msgstr "Brukerens kallenavn"
 
-#: actions/remotesubscribe.php:129
 #, fuzzy
 msgid "Nickname of the user you want to follow."
 msgstr "Kallenavn på brukeren du vil følge"
 
-#: actions/remotesubscribe.php:132
 msgid "Profile URL"
 msgstr "Profilnettadresse"
 
-#: actions/remotesubscribe.php:133
 #, fuzzy
 msgid "URL of your profile on another compatible microblogging service."
 msgstr ""
 "Nettadresse til profilen din på en annen kompatibel mikrobloggingstjeneste"
 
 #. TRANS: Link text for link that will subscribe to a remote profile.
-#: actions/remotesubscribe.php:136 lib/subscribeform.php:139
-#: lib/userprofile.php:402
 msgid "Subscribe"
 msgstr "Abonner"
 
-#: actions/remotesubscribe.php:158
 #, fuzzy
 msgid "Invalid profile URL (bad format)."
 msgstr "Ugyldig profilnettadresse (dårlig format)"
 
-#: actions/remotesubscribe.php:167
 msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
 msgstr ""
 "Ikke en gyldig profilnettadresse (inget YADIS-dokument eller ugyldig XRDS "
 "definert)."
 
-#: actions/remotesubscribe.php:175
 #, fuzzy
 msgid "That is a local profile! Login to subscribe."
 msgstr "Det er en lokal profil! Logg inn for å abonnere."
 
-#: actions/remotesubscribe.php:182
 #, fuzzy
 msgid "Could not get a request token."
 msgstr "Kunne ikke sette inn melding."
 
-#: actions/repeat.php:56
 msgid "Only logged-in users can repeat notices."
 msgstr "Bare innloggede brukere kan repetere notiser."
 
-#: actions/repeat.php:63 actions/repeat.php:70
 msgid "No notice specified."
 msgstr "Ingen notis spesifisert."
 
-#: actions/repeat.php:75
 #, fuzzy
 msgid "You cannot repeat your own notice."
 msgstr "Du kan ikke gjenta din egen notis."
 
-#: actions/repeat.php:89
 msgid "You already repeated that notice."
 msgstr "Du har allerede gjentatt den notisen."
 
-#: actions/repeat.php:112 lib/noticelist.php:697
 msgid "Repeated"
 msgstr "Gjentatt"
 
-#: actions/repeat.php:117
 msgid "Repeated!"
 msgstr "Gjentatt!"
 
 #. TRANS: RSS reply feed title. %s is a user nickname.
-#: actions/replies.php:126 actions/repliesrss.php:68
-#: lib/personalgroupnav.php:105
 #, php-format
 msgid "Replies to %s"
 msgstr "Svar til %s"
 
-#: actions/replies.php:128
 #, php-format
 msgid "Replies to %1$s, page %2$d"
 msgstr "Svar til %1$s, side %2$d"
 
-#: actions/replies.php:145
 #, php-format
 msgid "Replies feed for %s (RSS 1.0)"
 msgstr "Svarstrøm for %s (RSS 1.0)"
 
-#: actions/replies.php:152
 #, php-format
 msgid "Replies feed for %s (RSS 2.0)"
 msgstr "Svarstrøm for %s (RSS 2.0)"
 
-#: actions/replies.php:159
 #, php-format
 msgid "Replies feed for %s (Atom)"
 msgstr "Svarstrøm for %s (Atom)"
 
-#: actions/replies.php:199
 #, php-format
 msgid ""
 "This is the timeline showing replies to %1$s but %2$s hasn't received a "
 "notice to them yet."
 msgstr "Dette er tidslinjen for %1$s men %2$s har ikke postet noe ennå."
 
-#: actions/replies.php:204
 #, php-format
 msgid ""
 "You can engage other users in a conversation, subscribe to more people or "
@@ -5293,7 +4358,6 @@ msgstr ""
 "Du kan engasjere andre brukere i en samtale, abonnere på flere personer "
 "eller [bli med i grupper](%%action.groups%%)."
 
-#: actions/replies.php:206
 #, php-format
 msgid ""
 "You can try to [nudge %1$s](../%2$s) or [post something to them](%%%%action."
@@ -5304,182 +4368,148 @@ msgstr ""
 
 #. TRANS: RSS reply feed description.
 #. TRANS: %1$s is a user nickname, %2$s is the StatusNet site name.
-#: actions/repliesrss.php:74
 #, fuzzy, php-format
 msgid "Replies to %1$s on %2$s."
 msgstr "Svar til %1$s på %2$s!"
 
 #. TRANS: Client exception displayed when trying to restore an account while not logged in.
-#: actions/restoreaccount.php:78
 #, fuzzy
 msgid "Only logged-in users can restore their account."
 msgstr "Bare innloggede brukere kan repetere notiser."
 
 #. TRANS: Client exception displayed when trying to restore an account without having restore rights.
-#: actions/restoreaccount.php:83
 #, fuzzy
 msgid "You may not restore your account."
 msgstr "Du har ikke registrert noen program ennå."
 
 #. TRANS: Client exception displayed trying to restore an account while something went wrong uploading a file.
 #. TRANS: Client exception. No file; probably just a non-AJAX submission.
-#: actions/restoreaccount.php:121 actions/restoreaccount.php:146
 #, fuzzy
 msgid "No uploaded file."
 msgstr "Last opp fil"
 
 #. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
-#: actions/restoreaccount.php:129 lib/mediafile.php:194
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
 msgstr ""
 
 #. TRANS: Client exception.
-#: actions/restoreaccount.php:135 lib/mediafile.php:200
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form."
 msgstr ""
 
 #. TRANS: Client exception.
-#: actions/restoreaccount.php:141 lib/mediafile.php:206
 msgid "The uploaded file was only partially uploaded."
 msgstr ""
 
 #. TRANS: Client exception thrown when a temporary folder is not present to store a file upload.
-#: actions/restoreaccount.php:150 lib/mediafile.php:214
 msgid "Missing a temporary folder."
 msgstr ""
 
 #. TRANS: Client exception thrown when writing to disk is not possible during a file upload operation.
-#: actions/restoreaccount.php:154 lib/mediafile.php:218
 msgid "Failed to write file to disk."
 msgstr ""
 
 #. TRANS: Client exception thrown when a file upload operation has been stopped by an extension.
-#: actions/restoreaccount.php:158 lib/mediafile.php:222
 msgid "File upload stopped by extension."
 msgstr "Filopplasting stoppet grunnet filendelse."
 
 #. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
 #. TRANS: Exception thrown when uploading an image fails for an unknown reason.
 #. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
-#: actions/restoreaccount.php:164 lib/imagefile.php:106 lib/mediafile.php:228
 msgid "System error uploading file."
 msgstr "Systemfeil ved opplasting av fil."
 
 #. TRANS: Client exception thrown when a feed is not an Atom feed.
-#: actions/restoreaccount.php:207
 #, fuzzy
 msgid "Not an Atom feed."
 msgstr "Alle medlemmer"
 
 #. TRANS: Success message when a feed has been restored.
-#: actions/restoreaccount.php:241
 msgid ""
 "Feed has been restored. Your old posts should now appear in search and your "
 "profile page."
 msgstr ""
 
 #. TRANS: Message when a feed restore is in progress.
-#: actions/restoreaccount.php:245
 msgid "Feed will be restored. Please wait a few minutes for results."
 msgstr ""
 
 #. TRANS: Form instructions for feed restore.
-#: actions/restoreaccount.php:342
 msgid ""
 "You can upload a backed-up stream in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format."
 msgstr ""
 
 #. TRANS: Title for submit button to confirm upload of a user backup file for account restore.
-#: actions/restoreaccount.php:373
 #, fuzzy
 msgid "Upload the file"
 msgstr "Last opp fil"
 
-#: actions/revokerole.php:75
 msgid "You cannot revoke user roles on this site."
 msgstr "Du kan ikke trekke tilbake brukerroller på dette nettstedet."
 
-#: actions/revokerole.php:82
 msgid "User doesn't have this role."
 msgstr "Brukeren har ikke denne rollen."
 
-#: actions/rsd.php:142 actions/version.php:159
 msgid "StatusNet"
 msgstr "StatusNet"
 
-#: actions/sandbox.php:65 actions/unsandbox.php:65
 msgid "You cannot sandbox users on this site."
 msgstr "Du kan ikke flytte brukere til sandkassen på dette nettstedet."
 
-#: actions/sandbox.php:72
 msgid "User is already sandboxed."
 msgstr "Brukeren er allerede i sandkassen."
 
 #. TRANS: Menu item for site administration
-#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
-#: lib/adminpanelaction.php:379
 msgid "Sessions"
 msgstr "Økter"
 
-#: actions/sessionsadminpanel.php:65
 msgid "Session settings for this StatusNet site"
 msgstr ""
 
-#: actions/sessionsadminpanel.php:175
 msgid "Handle sessions"
 msgstr "Håndter økter"
 
-#: actions/sessionsadminpanel.php:177
 msgid "Whether to handle sessions ourselves."
 msgstr "Hvorvidt økter skal håndteres av oss selv."
 
-#: actions/sessionsadminpanel.php:181
 msgid "Session debugging"
 msgstr "Øktfeilsøking"
 
-#: actions/sessionsadminpanel.php:183
 msgid "Turn on debugging output for sessions."
 msgstr "Slå på feilsøkingsutdata for økter."
 
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
+#. TRANS: Submit button title.
+msgid "Save"
+msgstr "Lagre"
+
 msgid "Save site settings"
 msgstr "Lagre nettstedsinnstillinger"
 
-#: actions/showapplication.php:78
 msgid "You must be logged in to view an application."
 msgstr "Du må være innlogget for å se et program."
 
-#: actions/showapplication.php:151
 msgid "Application profile"
 msgstr "Programprofil"
 
-#: actions/showapplication.php:179
 #, php-format
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr "Opprettet av %1$s - %2$s standardtilgang - %3$d brukere"
 
-#: actions/showapplication.php:189
 msgid "Application actions"
 msgstr "Programhandlinger"
 
-#: actions/showapplication.php:212
 msgid "Reset key & secret"
 msgstr "Tilbakestill nøkkel & hemmelighet"
 
 #. TRANS: Title of form for deleting a user.
-#: actions/showapplication.php:228 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:64 lib/noticelist.php:678
 msgid "Delete"
 msgstr "Slett"
 
-#: actions/showapplication.php:237
 msgid "Application info"
 msgstr "Programinformasjon"
 
-#: actions/showapplication.php:255
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
@@ -5487,43 +4517,36 @@ msgstr ""
 "Merk: Vi støtter HMAC-SHA1-signaturer. Vi støtter ikke metoden for "
 "klartekstsignatur."
 
-#: actions/showapplication.php:275
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr ""
 "Er du sikker på at du vil tilbakestille din forbrukernøkkel og -hemmelighet?"
 
 #. TRANS: Title for all but the first page of favourite notices of a user.
 #. TRANS: %1$s is the user for whom the favourite notices are displayed, %2$d is the page number.
-#: actions/showfavorites.php:80
 #, php-format
 msgid "%1$s's favorite notices, page %2$d"
 msgstr "%1$s sine favorittnotiser, side %2$d"
 
 #. TRANS: Server error displayed when favourite notices could not be retrieved from the database.
-#: actions/showfavorites.php:134
 msgid "Could not retrieve favorite notices."
 msgstr "Kunne ikke hente favorittnotiser."
 
 #. TRANS: Feed link text. %s is a username.
-#: actions/showfavorites.php:172
 #, php-format
 msgid "Feed for favorites of %s (RSS 1.0)"
 msgstr "Mating for favoritter av %s (RSS 1.0)"
 
 #. TRANS: Feed link text. %s is a username.
-#: actions/showfavorites.php:180
 #, php-format
 msgid "Feed for favorites of %s (RSS 2.0)"
 msgstr "Mating for favoritter av %s (RSS 2.0)"
 
 #. TRANS: Feed link text. %s is a username.
-#: actions/showfavorites.php:188
 #, php-format
 msgid "Feed for favorites of %s (Atom)"
 msgstr "Mating for favoritter av %s (Atom)"
 
 #. TRANS: Text displayed instead of favourite notices for the current logged in user that has no favourites.
-#: actions/showfavorites.php:209
 msgid ""
 "You haven't chosen any favorite notices yet. Click the fave button on "
 "notices you like to bookmark them for later or shed a spotlight on them."
@@ -5533,7 +4556,6 @@ msgstr ""
 
 #. TRANS: Text displayed instead of favourite notices for a user that has no favourites while logged in.
 #. TRANS: %s is a username.
-#: actions/showfavorites.php:213
 #, php-format
 msgid ""
 "%s hasn't added any favorite notices yet. Post something interesting they "
@@ -5545,7 +4567,6 @@ msgstr ""
 #. TRANS: Text displayed instead of favourite notices for a user that has no favourites while not logged in.
 #. TRANS: %s is a username, %%%%action.register%%%% is a link to the user registration page.
 #. TRANS: (link text)[link] is a Mark Down link.
-#: actions/showfavorites.php:220
 #, php-format
 msgid ""
 "%s hasn't added any favorite notices yet. Why not [register an account](%%%%"
@@ -5557,64 +4578,53 @@ msgstr ""
 "sine favoritter :)"
 
 #. TRANS: Page notice for show favourites page.
-#: actions/showfavorites.php:251
 msgid "This is a way to share what you like."
 msgstr "Dette er en måte å dele det du liker."
 
 #. TRANS: Page title for first group page. %s is a group name.
-#: actions/showgroup.php:75
 #, php-format
 msgid "%s group"
 msgstr "%s gruppe"
 
 #. TRANS: Page title for any but first group page.
 #. TRANS: %1$s is a group name, $2$s is a page number.
-#: actions/showgroup.php:79
 #, php-format
 msgid "%1$s group, page %2$d"
 msgstr "%1$s gruppe, side %2$d"
 
 #. TRANS: Label for group description or group note (dt). Text hidden by default.
-#: actions/showgroup.php:266
 msgid "Note"
 msgstr "Merk"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:277 lib/groupeditform.php:180
 msgid "Aliases"
 msgstr "Alias"
 
 #. TRANS: Group actions header (h2). Text hidden by default.
-#: actions/showgroup.php:294
 msgid "Group actions"
 msgstr "Gruppehandlinger"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:338
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
 msgstr "Notismating for %s gruppe (RSS 1.0)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:345
 #, php-format
 msgid "Notice feed for %s group (RSS 2.0)"
 msgstr "Notismating for %s gruppe (RSS 2.0)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:352
 #, php-format
 msgid "Notice feed for %s group (Atom)"
 msgstr "Notismating for %s gruppe (Atom)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:358
 #, php-format
 msgid "FOAF for %s group"
 msgstr "FOAF for gruppen %s"
 
 #. TRANS: Header for mini list of group members on a group page (h2).
-#: actions/showgroup.php:395
 msgid "Members"
 msgstr "Medlemmer"
 
@@ -5622,30 +4632,23 @@ msgstr "Medlemmer"
 #. TRANS: Text for user subscription statistics if the user has no subscriptions.
 #. TRANS: Text for user subscriber statistics if user has no subscribers.
 #. TRANS: Text for user user group membership statistics if user is not a member of any group.
-#: actions/showgroup.php:401 lib/profileaction.php:137
-#: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
-#: lib/subscriptionlist.php:123 lib/tagcloudsection.php:71
 msgid "(None)"
 msgstr "(Ingen)"
 
 #. TRANS: Link to all group members from mini list of group members if group has more than n members.
-#: actions/showgroup.php:410
 msgid "All members"
 msgstr "Alle medlemmer"
 
 #. TRANS: Header for group statistics on a group page (h2).
 #. TRANS: H2 text for user statistics.
-#: actions/showgroup.php:441 lib/profileaction.php:205
 msgid "Statistics"
 msgstr "Statistikk"
 
-#: actions/showgroup.php:444
 msgctxt "LABEL"
 msgid "Created"
 msgstr "Opprettet"
 
 #. TRANS: Label for member count in statistics on group page.
-#: actions/showgroup.php:449
 msgctxt "LABEL"
 msgid "Members"
 msgstr "Medlemmer"
@@ -5654,7 +4657,6 @@ msgstr "Medlemmer"
 #. TRANS: **%s** is the group alias, %%%%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).
-#: actions/showgroup.php:464
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5673,7 +4675,6 @@ 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: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
-#: actions/showgroup.php:474
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5687,99 +4688,83 @@ msgstr ""
 "korte meldinger om deres liv og interesser. "
 
 #. TRANS: Header for list of group administrators on a group page (h2).
-#: actions/showgroup.php:503
 msgid "Admins"
 msgstr "Administratorer"
 
 #. TRANS: Client error displayed requesting a single message that does not exist.
-#: actions/showmessage.php:76
 msgid "No such message."
 msgstr "Ingen slik melding."
 
 #. TRANS: Client error displayed requesting a single direct message the requesting user was not a party in.
-#: actions/showmessage.php:86
 msgid "Only the sender and recipient may read this message."
 msgstr "Kun senderen og mottakeren kan lese denne meldingen."
 
 #. TRANS: Page title for single direct message display when viewing user is the sender.
 #. TRANS: %1$s is the addressed user's nickname, $2$s is a timestamp.
-#: actions/showmessage.php:105
 #, php-format
 msgid "Message to %1$s on %2$s"
 msgstr "Melding til %1$s på %2$s"
 
 #. TRANS: Page title for single message display.
 #. TRANS: %1$s is the sending user's nickname, $2$s is a timestamp.
-#: actions/showmessage.php:113
 #, php-format
 msgid "Message from %1$s on %2$s"
 msgstr "Melding fra %1$s på %2$s"
 
-#: actions/shownotice.php:90
 msgid "Notice deleted."
 msgstr "Notis slettet."
 
 #. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
-#: actions/showstream.php:70
 #, fuzzy, php-format
 msgid "%1$s tagged %2$s"
 msgstr "%1$s, side %2$d"
 
 #. TRANS: Page title showing tagged notices in one user's stream.
 #. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
-#: actions/showstream.php:74
 #, fuzzy, php-format
 msgid "%1$s tagged %2$s, page %3$d"
 msgstr "Brukere som har merket seg selv med %1$s - side %2$d"
 
 #. TRANS: Extended page title showing tagged notices in one user's stream.
 #. TRANS: %1$s is the username, %2$d is the page number.
-#: actions/showstream.php:82
 #, php-format
 msgid "%1$s, page %2$d"
 msgstr "%1$s, side %2$d"
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %1$s is a user nickname, %2$s is a hashtag.
-#: actions/showstream.php:127
 #, php-format
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
 msgstr "Notismating for %1$s merket %2$s (RSS 1.0)"
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.
-#: actions/showstream.php:136
 #, php-format
 msgid "Notice feed for %s (RSS 1.0)"
 msgstr "Notismating for %s (RSS 1.0)"
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.
-#: actions/showstream.php:145
 #, php-format
 msgid "Notice feed for %s (RSS 2.0)"
 msgstr "Notismating for %s (RSS 2.0)"
 
-#: actions/showstream.php:152
 #, php-format
 msgid "Notice feed for %s (Atom)"
 msgstr "Notismating for %s (Atom)"
 
 #. TRANS: Title for link to notice feed. FOAF stands for Friend of a Friend.
 #. TRANS: More information at http://www.foaf-project.org. %s is a user nickname.
-#: actions/showstream.php:159
 #, php-format
 msgid "FOAF for %s"
 msgstr "FOAF for %s"
 
 #. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
-#: actions/showstream.php:205
 #, fuzzy, php-format
 msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr "Dette er tidslinjen for %1$s men %2$s har ikke postet noe ennå."
 
 #. TRANS: Second sentence of empty list message for a stream for the user themselves.
-#: actions/showstream.php:211
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
@@ -5789,7 +4774,6 @@ msgstr ""
 
 #. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:215
 #, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
@@ -5800,7 +4784,6 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:258
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5815,7 +4798,6 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:265
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5827,221 +4809,174 @@ msgstr ""
 "[StatusNet](http://status.net/). "
 
 #. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
-#: actions/showstream.php:322
 #, php-format
 msgid "Repeat of %s"
 msgstr "Repetisjon av %s"
 
-#: actions/silence.php:65 actions/unsilence.php:65
 msgid "You cannot silence users on this site."
 msgstr "Du kan ikke bringe brukere til taushet på dette nettstedet."
 
-#: actions/silence.php:72
 msgid "User is already silenced."
 msgstr "Bruker er allerede brakt til taushet."
 
-#: actions/siteadminpanel.php:69
 msgid "Basic settings for this StatusNet site"
 msgstr "Grunninnstillinger for dette StatusNet-nettstedet"
 
-#: actions/siteadminpanel.php:133
 msgid "Site name must have non-zero length."
 msgstr "Nettstedsnavnet må være minst ett tegn langt."
 
-#: actions/siteadminpanel.php:141
 msgid "You must have a valid contact email address."
 msgstr "Du må ha en gyldig e-postadresse."
 
-#: actions/siteadminpanel.php:159
 #, php-format
 msgid "Unknown language \"%s\"."
 msgstr "Ukjent språk «%s»."
 
-#: actions/siteadminpanel.php:165
 msgid "Minimum text limit is 0 (unlimited)."
 msgstr "Minste tekstgrense er 0 (ubegrenset)."
 
-#: actions/siteadminpanel.php:171
 msgid "Dupe limit must be one or more seconds."
 msgstr ""
 
-#: actions/siteadminpanel.php:221
 msgid "General"
 msgstr "Generell"
 
-#: actions/siteadminpanel.php:224
 msgid "Site name"
 msgstr "Nettstedsnavn"
 
-#: actions/siteadminpanel.php:225
 msgid "The name of your site, like \"Yourcompany Microblog\""
 msgstr "Navnet på nettstedet ditt, for eksempel «Foretaksnavn mikroblogg»"
 
-#: actions/siteadminpanel.php:229
 msgid "Brought by"
 msgstr ""
 
-#: actions/siteadminpanel.php:230
 msgid "Text used for credits link in footer of each page"
 msgstr ""
 
-#: actions/siteadminpanel.php:234
 msgid "Brought by URL"
 msgstr ""
 
-#: actions/siteadminpanel.php:235
 msgid "URL used for credits link in footer of each page"
 msgstr ""
 
-#: actions/siteadminpanel.php:239
 msgid "Contact email address for your site"
 msgstr "Kontakte-postadresse for nettstedet ditt"
 
-#: actions/siteadminpanel.php:245
 msgid "Local"
 msgstr "Lokal"
 
-#: actions/siteadminpanel.php:256
 msgid "Default timezone"
 msgstr "Standard tidssone"
 
-#: actions/siteadminpanel.php:257
 msgid "Default timezone for the site; usually UTC."
 msgstr "Standard tidssone for nettstedet; vanligvis UTC."
 
-#: actions/siteadminpanel.php:262
 msgid "Default language"
 msgstr "Standardspråk"
 
-#: actions/siteadminpanel.php:263
 msgid "Site language when autodetection from browser settings is not available"
 msgstr ""
 
-#: actions/siteadminpanel.php:271
 msgid "Limits"
 msgstr "Grenser"
 
-#: actions/siteadminpanel.php:274
 msgid "Text limit"
 msgstr "Tekstgrense"
 
-#: actions/siteadminpanel.php:274
 msgid "Maximum number of characters for notices."
 msgstr "Maks antall tegn for notiser."
 
-#: actions/siteadminpanel.php:278
 msgid "Dupe limit"
 msgstr "Duplikatsgrense"
 
-#: actions/siteadminpanel.php:278
 msgid "How long users must wait (in seconds) to post the same thing again."
 msgstr ""
 "Hvor lenge en bruker må vente (i sekund) for å poste den samme tingen igjen."
 
 #. TRANS: Page title for site-wide notice tab in admin panel.
-#: actions/sitenoticeadminpanel.php:55
 msgid "Site Notice"
 msgstr "Nettstedsnotis"
 
 #. TRANS: Instructions for site-wide notice tab in admin panel.
-#: actions/sitenoticeadminpanel.php:66
 #, fuzzy
 msgid "Edit site-wide message"
 msgstr "Ny melding"
 
 #. TRANS: Server error displayed when saving a site-wide notice was impossible.
-#: actions/sitenoticeadminpanel.php:101
 msgid "Unable to save site notice."
 msgstr "Kunne ikke lagre nettstedsnotis."
 
 #. TRANS: Client error displayed when a site-wide notice was longer than allowed.
-#: actions/sitenoticeadminpanel.php:112
 #, fuzzy
 msgid "Maximum length for the site-wide notice is 255 characters."
 msgstr "Maks lengde på en profilbiografi i tegn."
 
 #. TRANS: Label for site-wide notice text field in admin panel.
-#: actions/sitenoticeadminpanel.php:176
 msgid "Site notice text"
 msgstr "Tekst for nettstedsnotis"
 
 #. TRANS: Tooltip for site-wide notice text field in admin panel.
-#: actions/sitenoticeadminpanel.php:179
 msgid "Site-wide notice text (255 characters maximum; HTML allowed)"
 msgstr ""
 
 #. TRANS: Title for button to save site notice in admin panel.
-#: actions/sitenoticeadminpanel.php:201
 #, fuzzy
 msgid "Save site notice."
 msgstr "Lagre nettstedsnotis"
 
 #. TRANS: Title for SMS settings.
-#: actions/smssettings.php:56
 msgid "SMS settings"
 msgstr "SMS-innstillinger"
 
 #. TRANS: SMS settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/smssettings.php:70
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr "Du kan motta SMS-meldinger gjennom e-post fra %%site.name%%."
 
 #. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
-#: actions/smssettings.php:92
 msgid "SMS is not available."
 msgstr "SMS er ikke tilgjengelig."
 
 #. TRANS: Form legend for SMS settings form.
-#: actions/smssettings.php:106
 msgid "SMS address"
 msgstr "SMS-adresse"
 
 #. TRANS: Form guide in SMS settings form.
-#: actions/smssettings.php:115
 msgid "Current confirmed SMS-enabled phone number."
 msgstr "Nåværende bekreftede telefonnummer med mulighet for å motta SMS."
 
 #. TRANS: Form guide in IM settings form.
-#: actions/smssettings.php:128
 msgid "Awaiting confirmation on this phone number."
 msgstr "Venter på bekreftelse for dette telefonnummeret."
 
 #. TRANS: Field label for SMS address input in SMS settings form.
-#: actions/smssettings.php:137
 msgid "Confirmation code"
 msgstr "Bekreftelseskode"
 
 #. TRANS: Form field instructions in SMS settings form.
-#: actions/smssettings.php:139
 msgid "Enter the code you received on your phone."
 msgstr "Skriv inn koden du mottok på telefonen din."
 
 #. TRANS: Button label to confirm SMS confirmation code in SMS settings.
-#: actions/smssettings.php:143
 msgctxt "BUTTON"
 msgid "Confirm"
 msgstr "Bekreft"
 
 #. TRANS: Field label for SMS phone number input in SMS settings form.
-#: actions/smssettings.php:148
 msgid "SMS phone number"
 msgstr "Telefonnummer for SMS"
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
-#: actions/smssettings.php:151
 #, fuzzy
 msgid "Phone number, no punctuation or spaces, with area code."
 msgstr "Telefonnummer, ingen tegnsetting eller mellomrom, med retningsnummer"
 
 #. TRANS: Form legend for SMS preferences form.
-#: actions/smssettings.php:190
 msgid "SMS preferences"
 msgstr "SMS-innstillinger"
 
 #. TRANS: Checkbox label in SMS preferences form.
-#: actions/smssettings.php:196
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
@@ -6050,32 +4985,26 @@ msgstr ""
 "min teleoperatør."
 
 #. TRANS: Confirmation message for successful SMS preferences save.
-#: actions/smssettings.php:307
 msgid "SMS preferences saved."
 msgstr "SMS-innstillinger lagret."
 
 #. TRANS: Message given saving SMS phone number without having provided one.
-#: actions/smssettings.php:329
 msgid "No phone number."
 msgstr "Ingen telefonnummer."
 
 #. TRANS: Message given saving SMS phone number without having selected a carrier.
-#: actions/smssettings.php:335
 msgid "No carrier selected."
 msgstr "Ingen operatør valgt."
 
 #. TRANS: Message given saving SMS phone number that is already set.
-#: actions/smssettings.php:343
 msgid "That is already your phone number."
 msgstr "Det er allerede din ditt telefonnummer."
 
 #. TRANS: Message given saving SMS phone number that is already set for another user.
-#: actions/smssettings.php:347
 msgid "That phone number already belongs to another user."
 msgstr "Telefonnummeret tilhører allerede en annen bruker."
 
 #. TRANS: Message given saving valid SMS phone number that is to be confirmed.
-#: actions/smssettings.php:375
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
 "for the code and instructions on how to use it."
@@ -6084,39 +5013,32 @@ msgstr ""
 "din for koden og hvordan du skal bruke den."
 
 #. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
-#: actions/smssettings.php:403
 msgid "That is the wrong confirmation number."
 msgstr "Dette er feil bekreftelsesnummer."
 
 #. TRANS: Message given after successfully canceling SMS phone number confirmation.
-#: actions/smssettings.php:417
 msgid "SMS confirmation cancelled."
 msgstr "SMS-bekreftelse avbrutt."
 
 #. TRANS: Message given trying to remove an SMS phone number that is not
 #. TRANS: registered for the active user.
-#: actions/smssettings.php:437
 msgid "That is not your phone number."
 msgstr "Det er ikke ditt telefonnummer."
 
 #. TRANS: Message given after successfully removing a registered SMS phone number.
-#: actions/smssettings.php:459
 msgid "The SMS phone number was removed."
 msgstr "Telefonnummeret for SMS ble fjernet."
 
 #. TRANS: Label for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:498
 msgid "Mobile carrier"
 msgstr "Mobiloperatør"
 
 #. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:503
 msgid "Select a carrier"
 msgstr "Velg en operatør"
 
 #. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
 #. TRANS: %s is an administrative contact's e-mail address.
-#: actions/smssettings.php:512
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -6127,125 +5049,100 @@ msgstr ""
 "fortell oss."
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
-#: actions/smssettings.php:534
 #, fuzzy
 msgid "No code entered."
 msgstr "Ingen kode skrevet inn"
 
 #. TRANS: Menu item for site administration
-#: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
-#: lib/adminpanelaction.php:395
 msgid "Snapshots"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:65
 #, fuzzy
 msgid "Manage snapshot configuration"
 msgstr "Endre nettstedskonfigurasjon"
 
-#: actions/snapshotadminpanel.php:127
 #, fuzzy
 msgid "Invalid snapshot run value."
 msgstr "Ugyldig rolle."
 
-#: actions/snapshotadminpanel.php:133
 msgid "Snapshot frequency must be a number."
 msgstr ""
 
-#: actions/snapshotadminpanel.php:144
 #, fuzzy
 msgid "Invalid snapshot report URL."
 msgstr "Ugyldig logo-URL."
 
-#: actions/snapshotadminpanel.php:200
 msgid "Randomly during web hit"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:201
 msgid "In a scheduled job"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:206
 msgid "Data snapshots"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:208
 msgid "When to send statistical data to status.net servers"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:217
 msgid "Frequency"
 msgstr "Frekvens"
 
-#: actions/snapshotadminpanel.php:218
 msgid "Snapshots will be sent once every N web hits"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:226
 #, fuzzy
 msgid "Report URL"
 msgstr "Nettadresse til kilde"
 
-#: actions/snapshotadminpanel.php:227
 msgid "Snapshots will be sent to this URL"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:248
 msgid "Save snapshot settings"
 msgstr "Lagre nettstedsinnstillinger"
 
 #. TRANS: Client error displayed trying a change a subscription for a non-subscribed profile.
-#: actions/subedit.php:75
 #, fuzzy
 msgid "You are not subscribed to that profile."
 msgstr "Ikke autorisert."
 
 #. TRANS: Server error displayed when updating a subscription fails with a database error.
 #. TRANS: Exception thrown when a subscription could not be stored on the server.
-#: actions/subedit.php:89 classes/Subscription.php:141
 msgid "Could not save subscription."
 msgstr "Kunne ikke lagre merkelapper."
 
 #. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
-#: actions/subscribe.php:121
 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
 msgstr ""
 
 #. TRANS: Page title when subscription succeeded.
-#: actions/subscribe.php:149
 #, fuzzy
 msgid "Subscribed"
 msgstr "Abonner"
 
 #. TRANS: Header for list of subscribers for a user (first page).
 #. TRANS: %s is the user's nickname.
-#: actions/subscribers.php:51
 #, fuzzy, php-format
 msgid "%s subscribers"
 msgstr "Alle abonnenter"
 
 #. TRANS: Header for list of subscribers for a user (not first page).
 #. TRANS: %1$s is the user's nickname, $2$d is the page number.
-#: actions/subscribers.php:55
 #, php-format
 msgid "%1$s subscribers, page %2$d"
 msgstr "%1$s gruppemedlemmer, side %2$d"
 
 #. TRANS: Page notice for page with an overview of all subscribers
 #. TRANS: of the logged in user's own profile.
-#: actions/subscribers.php:68
 msgid "These are the people who listen to your notices."
 msgstr "Dette er personene som lytter til dine notiser."
 
 #. TRANS: Page notice for page with an overview of all subscribers of a user other
 #. TRANS: than the logged in user. %s is the user nickname.
-#: actions/subscribers.php:74
 #, php-format
 msgid "These are the people who listen to %s's notices."
 msgstr "Dette er personene som lytter til %ss notiser."
 
 #. TRANS: Subscriber list text when the logged in user has no subscribers.
-#: actions/subscribers.php:114
 msgid ""
 "You have no subscribers. Try subscribing to people you know and they might "
 "return the favor."
@@ -6253,7 +5150,6 @@ msgstr ""
 
 #. TRANS: Subscriber list text when looking at the subscribers for a of a user other
 #. TRANS: than the logged in user that has no subscribers. %s is the user nickname.
-#: actions/subscribers.php:118
 #, php-format
 msgid "%s has no subscribers. Want to be the first?"
 msgstr ""
@@ -6263,7 +5159,6 @@ msgstr ""
 #. TRANS: This message contains a Markdown URL. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.
-#: actions/subscribers.php:127
 #, fuzzy, php-format
 msgid ""
 "%s has no subscribers. Why not [register an account](%%%%action.register%%%"
@@ -6274,20 +5169,17 @@ msgstr ""
 
 #. TRANS: Header for subscriptions overview for a user (not first page).
 #. TRANS: %1$s is a user nickname, %2$d is the page number.
-#: actions/subscriptions.php:55
 #, php-format
 msgid "%1$s subscriptions, page %2$d"
 msgstr "%1$s grupper, side %2$d"
 
 #. TRANS: Page notice for page with an overview of all subscriptions
 #. TRANS: of the logged in user's own profile.
-#: actions/subscriptions.php:68
 msgid "These are the people whose notices you listen to."
 msgstr "Dette er personene hvis notiser du lytter til."
 
 #. TRANS: Page notice for page with an overview of all subscriptions of a user other
 #. TRANS: than the logged in user. %s is the user nickname.
-#: actions/subscriptions.php:74
 #, php-format
 msgid "These are the people whose notices %s listens to."
 msgstr "Dette er personene hvis notiser %s lytter til."
@@ -6296,7 +5188,6 @@ msgstr "Dette er personene hvis notiser %s lytter til."
 #. 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.
-#: actions/subscriptions.php:133
 #, php-format
 msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "
@@ -6310,69 +5201,56 @@ msgstr ""
 #. TRANS: than the logged in user that has no subscriptions. %s is the user nickname.
 #. TRANS: Subscription list text when looking at the subscriptions for a of a user that has none
 #. TRANS: as an anonymous user. %s is the user nickname.
-#: actions/subscriptions.php:141 actions/subscriptions.php:147
 #, php-format
 msgid "%s is not listening to anyone."
 msgstr "%s lytter ikke til noen."
 
 #. TRANS: Atom feed title. %s is a profile nickname.
-#: actions/subscriptions.php:176
 #, fuzzy, php-format
 msgid "Subscription feed for %s (Atom)"
 msgstr "Notismating for %s (Atom)"
 
 #. TRANS: Checkbox label for enabling Jabber messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:241 lib/settingsnav.php:110
 msgid "IM"
 msgstr ""
 
 #. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:256 lib/settingsnav.php:117
 msgid "SMS"
 msgstr "SMS"
 
 #. TRANS: Title for all but the first page of notices with tags.
 #. TRANS: %1$s is the tag, %2$d is the page number.
-#: actions/tag.php:73
 #, php-format
 msgid "Notices tagged with %1$s, page %2$d"
 msgstr "Brukere som har merket seg selv med %1$s - side %2$d"
 
-#: actions/tag.php:91
 #, php-format
 msgid "Notice feed for tag %s (RSS 1.0)"
 msgstr "Notismating for merkelapp %s (RSS 1.0)"
 
-#: actions/tag.php:97
 #, php-format
 msgid "Notice feed for tag %s (RSS 2.0)"
 msgstr "Notismating for merkelapp %s (RSS 2.0)"
 
-#: actions/tag.php:103
 #, php-format
 msgid "Notice feed for tag %s (Atom)"
 msgstr "Notismating for merkelapp %s (Atom)"
 
-#: actions/tagother.php:39
 #, fuzzy
 msgid "No ID argument."
 msgstr "Ingen vedlegg."
 
-#: actions/tagother.php:65
 #, php-format
 msgid "Tag %s"
 msgstr "Merk %s"
 
 #. TRANS: H2 for user profile information.
-#: actions/tagother.php:77 lib/userprofile.php:76
 msgid "User profile"
 msgstr "Brukerprofil"
 
-#: actions/tagother.php:120
 msgid "Tag user"
 msgstr "Merk bruker"
 
-#: actions/tagother.php:130
 #, fuzzy
 msgid ""
 "Tags for this user (letters, numbers, -, ., and _), comma- or space- "
@@ -6381,226 +5259,181 @@ msgstr ""
 "Merkelapper for degselv (bokstaver, nummer, -, ., og _), adskilt med komma "
 "eller mellomrom"
 
-#: actions/tagother.php:157
 #, php-format
 msgid "Invalid tag: \"%s\""
 msgstr "Ugyldig merkelapp: «%s»"
 
-#: actions/tagother.php:172
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 
-#: actions/tagother.php:215
 #, fuzzy
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr "Bruk dette skjemaet for å redigere programmet ditt."
 
-#: actions/tagrss.php:35
 #, fuzzy
 msgid "No such tag."
 msgstr "Ingen slik side."
 
 #. TRANS: Client error displayed when trying to unblock a non-blocked user.
-#: actions/unblock.php:59
 msgid "You haven't blocked that user."
 msgstr "Du har ikke blokkert den brukeren."
 
-#: actions/unsandbox.php:72
 #, fuzzy
 msgid "User is not sandboxed."
 msgstr "Brukeren er allerede i sandkassen."
 
-#: actions/unsilence.php:72
 #, fuzzy
 msgid "User is not silenced."
 msgstr "Bruker er allerede brakt til taushet."
 
-#: actions/unsubscribe.php:77
 #, fuzzy
 msgid "No profile ID in request."
 msgstr "Ingen profil med den ID'en."
 
-#: actions/unsubscribe.php:98
 #, fuzzy
 msgid "Unsubscribed"
 msgstr "Abonner"
 
-#: actions/updateprofile.php:64
 #, fuzzy, php-format
 msgid ""
 "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
 msgstr "Notislisensen ‘%1$s’ er ikke kompatibel med nettstedslisensen ‘%2$s’."
 
-#: actions/urlsettings.php:60
 #, fuzzy
 msgid "URL settings"
 msgstr "Innstillinger for direktemeldinger"
 
 #. TRANS: Instructions for tab "Other" in user profile settings.
-#: actions/urlsettings.php:72
 msgid "Manage various other options."
 msgstr "Håndter diverse andre alternativ."
 
 #. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
 #. TRANS: user's profile settings. This message has one space at the beginning. Use your
 #. TRANS: language's word separator here if it has one (most likely a single space).
-#: actions/urlsettings.php:115
 msgid " (free service)"
 msgstr " (fri tjeneste)"
 
-#: actions/urlsettings.php:121
 #, fuzzy
 msgid "[none]"
 msgstr "Ingen"
 
-#: actions/urlsettings.php:122
 msgid "[internal]"
 msgstr ""
 
 #. TRANS: Label for dropdown with URL shortener services.
-#: actions/urlsettings.php:130
 msgid "Shorten URLs with"
 msgstr "Forkort nettadresser med"
 
 #. TRANS: Tooltip for for dropdown with URL shortener services.
-#: actions/urlsettings.php:132
 msgid "Automatic shortening service to use."
 msgstr "Automatisk fortkortelsestjeneste å bruke."
 
-#: actions/urlsettings.php:138
 msgid "URL longer than"
 msgstr ""
 
-#: actions/urlsettings.php:141
 msgid "URLs longer than this will be shortened, 0 means always shorten."
 msgstr ""
 
-#: actions/urlsettings.php:145
 msgid "Text longer than"
 msgstr ""
 
-#: actions/urlsettings.php:148
 msgid ""
 "URLs in notices longer than this will be shortened, 0 means always shorten."
 msgstr ""
 
 #. TRANS: Form validation error for form "Other settings" in user profile.
-#: actions/urlsettings.php:180
 msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr "Adresseforkortelsestjenesten er for lang (maks 50 tegn)."
 
-#: actions/urlsettings.php:187
 msgid "Invalid number for max url length."
 msgstr ""
 
-#: actions/urlsettings.php:193
 #, fuzzy
 msgid "Invalid number for max notice length."
 msgstr "Ugyldig notisinnhold."
 
-#: actions/urlsettings.php:238
 msgid "Error saving user URL shortening preferences."
 msgstr ""
 
 #. TRANS: User admin panel title
-#: actions/useradminpanel.php:58
 msgctxt "TITLE"
 msgid "User"
 msgstr "Bruker"
 
 #. TRANS: Instruction for user admin panel.
-#: actions/useradminpanel.php:69
 msgid "User settings for this StatusNet site"
 msgstr ""
 
 #. TRANS: Form validation error in user admin panel when a non-numeric character limit was set.
-#: actions/useradminpanel.php:147
 msgid "Invalid bio limit. Must be numeric."
 msgstr "Ugyldig biografigrense. Må være numerisk."
 
 #. TRANS: Form validation error in user admin panel when welcome text is too long.
-#: actions/useradminpanel.php:154
 #, fuzzy
 msgid "Invalid welcome text. Maximum length is 255 characters."
 msgstr "Ugyldig velkomsttekst. Maks lengde er 255 tegn."
 
 #. TRANS: Client error displayed when trying to set a non-existing user as default subscription for new
 #. TRANS: users in user admin panel. %1$s is the invalid nickname.
-#: actions/useradminpanel.php:166
 #, fuzzy, php-format
 msgid "Invalid default subscripton: \"%1$s\" is not a user."
 msgstr "Ugyldig standardabonnement: '%1$s' er ikke bruker."
 
-#: actions/useradminpanel.php:215 lib/action.php:565 lib/settingsnav.php:77
-#: lib/subgroupnav.php:81
 msgid "Profile"
 msgstr "Profil"
 
 #. TRANS: Field label in user admin panel for setting the character limit for the bio field.
-#: actions/useradminpanel.php:220
 msgid "Bio Limit"
 msgstr "Biografigrense"
 
 #. TRANS: Tooltip in user admin panel for setting the character limit for the bio field.
-#: actions/useradminpanel.php:222
 msgid "Maximum length of a profile bio in characters."
 msgstr "Maks lengde på en profilbiografi i tegn."
 
 #. TRANS: Form legend in user admin panel.
-#: actions/useradminpanel.php:231
 msgid "New users"
 msgstr "Nye brukere"
 
 #. TRANS: Field label in user admin panel for setting new user welcome text.
-#: actions/useradminpanel.php:236
 msgid "New user welcome"
 msgstr "Velkomst av ny bruker"
 
 #. TRANS: Tooltip in user admin panel for setting new user welcome text.
-#: actions/useradminpanel.php:238
 #, fuzzy
 msgid "Welcome text for new users (maximum 255 characters)."
 msgstr "Velkomsttekst for nye brukere (Maks 255 tegn)."
 
 #. TRANS: Field label in user admin panel for setting default subscription for new users.
-#: actions/useradminpanel.php:244
 msgid "Default subscription"
 msgstr "Standardabonnement"
 
 #. TRANS: Tooltip in user admin panel for setting default subscription for new users.
-#: actions/useradminpanel.php:246
 msgid "Automatically subscribe new users to this user."
 msgstr "Legger automatisk til et abonnement på denne brukeren til nye brukere."
 
 #. TRANS: Form legend in user admin panel.
-#: actions/useradminpanel.php:256
 msgid "Invitations"
 msgstr "Invitasjoner"
 
 #. TRANS: Field label for checkbox in user admin panel for allowing users to invite friend using site e-mail.
-#: actions/useradminpanel.php:262
 msgid "Invitations enabled"
 msgstr "Invitasjoner aktivert"
 
 #. TRANS: Tooltip for checkbox in user admin panel for allowing users to invite friend using site e-mail.
-#: actions/useradminpanel.php:265
 msgid "Whether to allow users to invite new users."
 msgstr "Hvorvidt brukere tillates å invitere nye brukere."
 
 #. TRANS: Title for button to save user settings in user admin panel.
-#: actions/useradminpanel.php:302
 #, fuzzy
 msgid "Save user settings."
 msgstr "Lagre nettstedsinnstillinger"
 
 #. TRANS: Page title.
-#: actions/userauthorization.php:109
 msgid "Authorize subscription"
 msgstr "Autoriser abonnementet"
 
 #. TRANS: Page notice on "Auhtorize subscription" page.
-#: actions/userauthorization.php:115
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
 "user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
@@ -6608,43 +5441,36 @@ msgid ""
 msgstr ""
 
 #. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:200
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Accept"
 msgstr "Godta"
 
 #. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:202
 #, fuzzy
 msgid "Subscribe to this user."
 msgstr "Abonner på denne brukeren"
 
 #. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:204
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Reject"
 msgstr "Avvis"
 
 #. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:206
 #, fuzzy
 msgid "Reject this subscription."
 msgstr "Avvis dette abonnementet"
 
 #. TRANS: Client error displayed for an empty authorisation request.
-#: actions/userauthorization.php:219
 msgid "No authorization request!"
 msgstr ""
 
 #. TRANS: Accept message header from Authorise subscription page.
-#: actions/userauthorization.php:242
 #, fuzzy
 msgid "Subscription authorized"
 msgstr "Abonnement"
 
-#: actions/userauthorization.php:245
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to authorize the "
@@ -6652,12 +5478,10 @@ msgid ""
 msgstr ""
 
 #. TRANS: Reject message header from Authorise subscription page.
-#: actions/userauthorization.php:256
 #, fuzzy
 msgid "Subscription rejected"
 msgstr "Abonnement"
 
-#: actions/userauthorization.php:259
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to fully reject the "
@@ -6666,35 +5490,30 @@ msgstr ""
 
 #. TRANS: Exception thrown when no valid user is found for an authorisation request.
 #. TRANS: %s is a listener URI.
-#: actions/userauthorization.php:296
 #, php-format
 msgid "Listener URI \"%s\" not found here."
 msgstr ""
 
 #. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
 #. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:303
 #, fuzzy, php-format
 msgid "Listenee URI \"%s\" is too long."
 msgstr "Kilde-URL er for lang."
 
 #. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
 #. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:311
 #, fuzzy, php-format
 msgid "Listenee URI \"%s\" is a local user."
 msgstr "Profil-URL ‘%s’ er for en lokal bruker."
 
 #. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
 #. TRANS: %s is a profile URL.
-#: actions/userauthorization.php:329
 #, fuzzy, php-format
 msgid "Profile URL \"%s\" is for a local user."
 msgstr "Profil-URL ‘%s’ er for en lokal bruker."
 
 #. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
 #. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
-#: actions/userauthorization.php:339
 #, fuzzy, php-format
 msgid ""
 "Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
@@ -6703,32 +5522,27 @@ msgstr "Notislisensen ‘%1$s’ er ikke kompatibel med nettstedslisensen ‘%2$
 
 #. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
 #. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:349
 #, fuzzy, php-format
 msgid "Avatar URL \"%s\" is not valid."
 msgstr "Avatar-URL ‘%s’ er ikke gyldig."
 
 #. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
 #. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:356
 #, fuzzy, php-format
 msgid "Cannot read avatar URL \"%s\"."
 msgstr "Kan ikke lese avatar-URL ‘%s’"
 
 #. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
 #. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:363
 #, fuzzy, php-format
 msgid "Wrong image type for avatar URL \"%s\"."
 msgstr "Feil bildetype for avatar-URL ‘%s’."
 
 #. TRANS: Page title for profile design page.
-#: actions/userdesignsettings.php:74 lib/designsettings.php:61
 msgid "Profile design"
 msgstr "Vis profilutseender"
 
 #. TRANS: Instructions for profile design page.
-#: actions/userdesignsettings.php:84 lib/designsettings.php:72
 #, fuzzy
 msgid ""
 "Customize the way your profile looks with a background image and a colour "
@@ -6737,44 +5551,35 @@ msgstr ""
 "Tilpass hvordan gruppen din ser ut med et bakgrunnsbilde og en fargepalett "
 "av ditt valg."
 
-#: actions/userdesignsettings.php:289
 msgid "Enjoy your hotdog!"
 msgstr "Bon appétit."
 
-#: actions/userdesignsettings.php:325
 #, fuzzy
 msgid "Design settings"
 msgstr "Lagre nettstedsinnstillinger"
 
-#: actions/userdesignsettings.php:340
 msgid "View profile designs"
 msgstr "Vis profilutseender"
 
-#: actions/userdesignsettings.php:341
 msgid "Show or hide profile designs."
 msgstr "Vis eller skjul profilutseender."
 
-#: actions/userdesignsettings.php:348
 #, fuzzy
 msgid "Background file"
 msgstr "Bakgrunn"
 
 #. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number.
-#: actions/usergroups.php:66
 #, php-format
 msgid "%1$s groups, page %2$d"
 msgstr "%1$s grupper, side %2$d"
 
-#: actions/usergroups.php:132
 msgid "Search for more groups"
 msgstr "Søk etter flere grupper"
 
-#: actions/usergroups.php:159
 #, php-format
 msgid "%s is not a member of any group."
 msgstr "%s er ikke medlem av noen gruppe."
 
-#: actions/usergroups.php:164
 #, php-format
 msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
 msgstr "Prøv å [søke etter grupper](%%action.groupsearch%%) og bli med i dem."
@@ -6784,18 +5589,14 @@ msgstr "Prøv å [søke etter grupper](%%action.groupsearch%%) og bli med i dem.
 #. TRANS: %1$s is a group name, %2$s is a site name.
 #. TRANS: Message is used as a subtitle in atom user notice feed.
 #. TRANS: %1$s is a user name, %2$s is a site name.
-#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:70
-#: lib/atomusernoticefeed.php:95
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr "Oppdateringar fra %1$s på %2$s!"
 
-#: actions/version.php:75
 #, php-format
 msgid "StatusNet %s"
 msgstr "StatusNet %s"
 
-#: actions/version.php:155
 #, php-format
 msgid ""
 "This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
@@ -6804,16 +5605,13 @@ msgstr ""
 "Dette nettstedet drives av %1$s versjon %2$s, Copyright 2008-2010 StatusNet, "
 "Inc. og andre bidragsytere."
 
-#: actions/version.php:163
 msgid "Contributors"
 msgstr "Bidragsytere"
 
 #. TRANS: Menu item for site administration
-#: actions/version.php:167 lib/adminpanelaction.php:403
 msgid "License"
 msgstr "Lisens"
 
-#: actions/version.php:170
 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 "
@@ -6821,7 +5619,6 @@ msgid ""
 "any later version. "
 msgstr ""
 
-#: actions/version.php:176
 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 "
@@ -6829,7 +5626,6 @@ msgid ""
 "for more details. "
 msgstr ""
 
-#: actions/version.php:182
 #, php-format
 msgid ""
 "You should have received a copy of the GNU Affero General Public License "
@@ -6837,53 +5633,43 @@ msgid ""
 msgstr ""
 
 #. TRANS: Form input field label for application name.
-#: actions/version.php:197 lib/applicationeditform.php:190
 msgid "Name"
 msgstr "Navn"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:885
 msgid "Version"
 msgstr "Versjon"
 
-#: actions/version.php:199
 msgid "Author(s)"
 msgstr "Forfatter(e)"
 
 #. TRANS: Form input field label.
-#: actions/version.php:200 lib/applicationeditform.php:208
-#: lib/groupeditform.php:168
 msgid "Description"
 msgstr "Beskrivelse"
 
 #. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:164
 #, fuzzy
 msgid "Favor"
 msgstr "Favoritter"
 
 #. TRANS: Ntofication given when a user marks a notice as favorite.
 #. TRANS: %1$s is a user nickname or full name, %2$s is a notice URI.
-#: classes/Fave.php:167
 #, fuzzy, php-format
 msgid "%1$s marked notice %2$s as a favorite."
 msgstr "%s /@%s) la din notis til som en favoritt"
 
 #. TRANS: Server exception thrown when a URL cannot be processed.
-#: classes/File.php:162
 #, php-format
 msgid "Cannot process URL '%s'"
 msgstr ""
 
 #. TRANS: Server exception thrown when... Robin thinks something is impossible!
-#: classes/File.php:194
 msgid "Robin thinks something is impossible."
 msgstr ""
 
 #. 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$s is used for plural.
-#: classes/File.php:210
 #, php-format
 msgid ""
 "No file may be larger than %1$d byte and the file you sent was %2$d bytes. "
@@ -6896,7 +5682,6 @@ msgstr[1] ""
 
 #. TRANS: Message given if an upload would exceed user quota.
 #. TRANS: %d (number) is the user quota in bytes and is used for plural.
-#: classes/File.php:223
 #, php-format
 msgid "A file this large would exceed your user quota of %d byte."
 msgid_plural "A file this large would exceed your user quota of %d bytes."
@@ -6905,7 +5690,6 @@ msgstr[1] ""
 
 #. TRANS: Message given id an upload would exceed a user's monthly quota.
 #. TRANS: $d (number) is the monthly user quota in bytes and is used for plural.
-#: classes/File.php:235
 #, php-format
 msgid "A file this large would exceed your monthly quota of %d byte."
 msgid_plural "A file this large would exceed your monthly quota of %d bytes."
@@ -6913,158 +5697,131 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Client exception thrown if a file upload does not have a valid name.
-#: classes/File.php:282 classes/File.php:297
 msgid "Invalid filename."
 msgstr "Ugyldig filnavn."
 
 #. TRANS: Exception thrown when joining a group fails.
-#: classes/Group_member.php:51
 msgid "Group join failed."
 msgstr "Gruppeprofil"
 
 #. TRANS: Exception thrown when trying to leave a group the user is not a member of.
-#: classes/Group_member.php:64
 msgid "Not part of group."
 msgstr "Kunne ikke oppdatere gruppe."
 
 #. TRANS: Exception thrown when trying to leave a group fails.
-#: classes/Group_member.php:72
 msgid "Group leave failed."
 msgstr "Gruppeprofil"
 
 #. TRANS: Exception thrown providing an invalid profile ID.
 #. TRANS: %s is the invalid profile ID.
-#: classes/Group_member.php:85
 #, php-format
 msgid "Profile ID %s is invalid."
 msgstr ""
 
 #. TRANS: Exception thrown providing an invalid group ID.
 #. TRANS: %s is the invalid group ID.
-#: classes/Group_member.php:98
 #, fuzzy, php-format
 msgid "Group ID %s is invalid."
 msgstr "Feil ved lagring av bruker; ugyldig."
 
 #. TRANS: Activity title.
-#: classes/Group_member.php:147 lib/joinform.php:114
 msgid "Join"
 msgstr "Bli med"
 
 #. TRANS: Success message for subscribe to group attempt through OStatus.
 #. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
-#: classes/Group_member.php:151
 #, php-format
 msgid "%1$s has joined group %2$s."
 msgstr ""
 
 #. TRANS: Server exception thrown when updating a local group fails.
-#: classes/Local_group.php:42
 msgid "Could not update local group."
 msgstr "Kunne ikke oppdatere lokal gruppe."
 
 #. TRANS: Exception thrown when trying creating a login token failed.
 #. TRANS: %s is the user nickname for which token creation failed.
-#: classes/Login_token.php:78
 #, php-format
 msgid "Could not create login token for %s"
 msgstr "Kunne ikke opprette alias."
 
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
-#: classes/Memcached_DataObject.php:556
 msgid "No database name or DSN found anywhere."
 msgstr ""
 
 #. TRANS: Client exception thrown when a user tries to send a direct message while being banned from sending them.
-#: classes/Message.php:45
 #, fuzzy
 msgid "You are banned from sending direct messages."
 msgstr "Feil ved sending av direktemelding."
 
 #. TRANS: Message given when a message could not be stored on the server.
-#: classes/Message.php:69
 msgid "Could not insert message."
 msgstr "Kunne ikke sette inn melding."
 
 #. TRANS: Message given when a message could not be updated on the server.
-#: classes/Message.php:80
 msgid "Could not update message with new URI."
 msgstr "Kunne ikke oppdatere melding med ny nettadresse."
 
 #. TRANS: Server exception thrown when a user profile for a notice cannot be found.
 #. TRANS: %1$d is a profile ID (number), %2$d is a notice ID (number).
-#: classes/Notice.php:98
 #, php-format
 msgid "No such profile (%1$d) for notice (%2$d)."
 msgstr ""
 
 #. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:199
 #, fuzzy, php-format
 msgid "Database error inserting hashtag: %s"
 msgstr "Databasefeil ved innsetting av bruker i programmet OAuth."
 
 #. TRANS: Client exception thrown if a notice contains too many characters.
-#: classes/Notice.php:279
 msgid "Problem saving notice. Too long."
 msgstr "Problem ved lagring av notis. For lang."
 
 #. TRANS: Client exception thrown when trying to save a notice for an unknown user.
-#: classes/Notice.php:284
 msgid "Problem saving notice. Unknown user."
 msgstr "Problem ved lagring av notis. Ukjent bruker."
 
 #. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
-#: classes/Notice.php:290
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 
 #. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
-#: classes/Notice.php:297
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
 "few minutes."
 msgstr ""
 
 #. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:305
 #, fuzzy
 msgid "You are banned from posting notices on this site."
 msgstr "Du kan ikke bringe brukere til taushet på dette nettstedet."
 
 #. TRANS: Server exception thrown when a notice cannot be saved.
 #. TRANS: Server exception thrown when a notice cannot be updated.
-#: classes/Notice.php:372 classes/Notice.php:399
 msgid "Problem saving notice."
 msgstr "Problem ved lagring av notis."
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:929
 msgid "Bad type provided to saveKnownGroups."
 msgstr ""
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:1028
 msgid "Problem saving group inbox."
 msgstr "Problem ved lagring av gruppeinnboks."
 
 #. TRANS: Server exception thrown when a reply cannot be saved.
 #. TRANS: %1$d is a notice ID, %2$d is the ID of the mentioned user.
-#: classes/Notice.php:1144
 #, fuzzy, php-format
 msgid "Could not save reply for %1$d, %2$d."
 msgstr "Kunne ikke lagre lokal gruppeinformasjon."
 
 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1663
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
 
 #. TRANS: Full name of a profile or group followed by nickname in parens
-#: classes/Profile.php:172 classes/User_group.php:242
 #, fuzzy, php-format
 msgctxt "FANCYNAME"
 msgid "%1$s (%2$s)"
@@ -7072,269 +5829,216 @@ msgstr "%1$s (%2$s)"
 
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:779
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:788
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
 
 #. TRANS: Exception thrown when a right for a non-existing user profile is checked.
-#: classes/Remote_profile.php:54
 msgid "Missing profile."
 msgstr "Manglende profil."
 
 #. TRANS: Exception thrown when a tag cannot be saved.
-#: classes/Status_network.php:338
 #, fuzzy
 msgid "Unable to save tag."
 msgstr "Kunne ikke lagre nettstedsnotis."
 
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#: classes/Subscription.php:77 lib/oauthstore.php:482
 #, fuzzy
 msgid "You have been banned from subscribing."
 msgstr "Brukeren har blokkert deg fra å abonnere."
 
 #. TRANS: Exception thrown when trying to subscribe while already subscribed.
-#: classes/Subscription.php:82
 #, fuzzy
 msgid "Already subscribed!"
 msgstr "Alle abonnementer"
 
 #. TRANS: Exception thrown when trying to subscribe to a user who has blocked the subscribing user.
-#: classes/Subscription.php:87
 msgid "User has blocked you."
 msgstr "Bruker har blokkert deg."
 
 #. TRANS: Exception thrown when trying to unsibscribe without a subscription.
-#: classes/Subscription.php:176
 #, fuzzy
 msgid "Not subscribed!"
 msgstr "Alle abonnementer"
 
 #. TRANS: Exception thrown when trying to unsubscribe a user from themselves.
-#: classes/Subscription.php:183
 msgid "Could not delete self-subscription."
 msgstr "Kunne ikke slette favoritt."
 
 #. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
-#: classes/Subscription.php:211
 msgid "Could not delete subscription OMB token."
 msgstr "Kunne ikke slette favoritt."
 
 #. TRANS: Exception thrown when a subscription could not be deleted on the server.
-#: classes/Subscription.php:223
 msgid "Could not delete subscription."
 msgstr "Kunne ikke slette favoritt."
 
 #. TRANS: Activity tile when subscribing to another person.
-#: classes/Subscription.php:265
 msgid "Follow"
 msgstr ""
 
 #. TRANS: Notification given when one person starts following another.
 #. TRANS: %1$s is the subscriber, %2$s is the subscribed.
-#: classes/Subscription.php:268
 #, fuzzy, php-format
 msgid "%1$s is now following %2$s."
 msgstr "%1$s lytter nå til dine notiser på %2$s."
 
 #. TRANS: Notice given on user registration.
 #. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:390
 #, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr "Velkommen til %1$s, @%2$s."
 
 #. TRANS: Server exception.
-#: classes/User.php:923
 msgid "No single user defined for single-user mode."
 msgstr ""
 
 #. TRANS: Server exception.
-#: classes/User.php:927
 msgid "Single-user mode code called when not enabled."
 msgstr ""
 
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:522
 msgid "Could not create group."
 msgstr "Kunne ikke opprette gruppe."
 
 #. TRANS: Server exception thrown when updating a group URI failed.
-#: classes/User_group.php:532
 msgid "Could not set group URI."
 msgstr "Kunne ikke stille inn gruppe-URI."
 
 #. TRANS: Server exception thrown when setting group membership failed.
-#: classes/User_group.php:555
 msgid "Could not set group membership."
 msgstr "Kunne ikke stille inn gruppemedlemskap."
 
 #. TRANS: Server exception thrown when saving local group information failed.
-#: classes/User_group.php:570
 msgid "Could not save local group info."
 msgstr "Kunne ikke lagre lokal gruppeinformasjon."
 
 #. TRANS: Exception thrown when an account could not be located when it should be moved.
 #. TRANS: %s is the remote site.
-#: lib/accountmover.php:65
 #, fuzzy, php-format
 msgid "Cannot locate account %s."
 msgstr "Du kan ikke slette brukere."
 
 #. TRANS: Exception thrown when a service document could not be located account move.
 #. TRANS: %s is the remote site.
-#: lib/accountmover.php:106
 #, php-format
 msgid "Cannot find XRD for %s."
 msgstr ""
 
 #. TRANS: Exception thrown when an account could not be located when it should be moved.
 #. TRANS: %s is the remote site.
-#: lib/accountmover.php:131
 #, php-format
 msgid "No AtomPub API service for %s."
 msgstr ""
 
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: lib/action.php:161
 #, php-format
 msgid "%1$s - %2$s"
 msgstr "%1$s - %2$s"
 
 #. TRANS: Page title for a page without a title set.
-#: lib/action.php:177
 msgid "Untitled page"
 msgstr "Side uten tittel"
 
 #. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.
-#: lib/action.php:325
 msgctxt "TOOLTIP"
 msgid "Show more"
 msgstr ""
 
 #. TRANS: Inline reply form submit button: submits a reply comment.
-#: lib/action.php:328
 #, fuzzy
 msgctxt "BUTTON"
-msgid "Comment"
-msgstr "Innhold"
+msgid "Reply"
+msgstr "Svar"
 
 #. TRANS: Placeholder text for inline reply form. Clicking in this box will turn it into a mini notice form.
-#: lib/action.php:331
-msgid "Add a comment..."
+msgid "Write a reply..."
 msgstr ""
 
-#: lib/action.php:559 lib/personalgroupnav.php:99
-#, fuzzy
 msgid "Home"
 msgstr "Hjemmesiden"
 
-#: lib/action.php:560
 #, fuzzy
 msgid "Friends timeline"
 msgstr "%s tidslinje"
 
-#: lib/action.php:566
-#, fuzzy
 msgid "Your profile"
 msgstr "Gruppeprofil"
 
-#: lib/action.php:570 lib/action.php:593 lib/publicgroupnav.php:78
 msgid "Public"
 msgstr "Offentlig"
 
-#: lib/action.php:571 lib/action.php:594
 #, fuzzy
 msgid "Everyone on this site"
 msgstr "Finn personer på dette nettstedet"
 
-#: lib/action.php:575
 #, fuzzy
 msgid "Settings"
 msgstr "SMS-innstillinger"
 
-#: lib/action.php:576
 #, fuzzy
 msgid "Change your personal settings"
 msgstr "Endre profilinnstillingene dine"
 
-#: lib/action.php:582
 #, fuzzy
 msgid "Site configuration"
 msgstr "Brukerkonfigurasjon"
 
-#: lib/action.php:587
-#, fuzzy
 msgid "Logout"
 msgstr "Logg ut"
 
-#: lib/action.php:588
 #, fuzzy
 msgid "Logout from the site"
 msgstr "Logg ut fra nettstedet"
 
-#: lib/action.php:599
 #, fuzzy
 msgid "Login to the site"
 msgstr "Log inn på nettstedet"
 
-#: lib/action.php:606
-#, fuzzy
 msgid "Search"
 msgstr "Søk"
 
-#: lib/action.php:607
 #, fuzzy
 msgid "Search the site"
 msgstr "Søk nettsted"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:864
 msgid "Help"
 msgstr "Hjelp"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:867
 msgid "About"
 msgstr "Om"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:870
 msgid "FAQ"
 msgstr "OSS/FAQ"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:875
 msgid "TOS"
 msgstr ""
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:879
 #, fuzzy
 msgid "Privacy"
 msgstr "Privat"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:882
 msgid "Source"
 msgstr "Kilde"
 
 #. TRANS: Secondary navigation menu option leading to e-mail contact information on the
 #. TRANS: StatusNet site, where to report bugs, ...
-#: lib/action.php:889
 msgid "Contact"
 msgstr "Kontakt"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:892
 #, fuzzy
 msgid "Badge"
 msgstr "Knuff"
@@ -7343,7 +6047,6 @@ msgstr "Knuff"
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:921
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7353,7 +6056,6 @@ msgstr ""
 "broughtby%%](%%site.broughtbyurl%%)."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:924
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** er en mikrobloggingtjeneste."
@@ -7362,7 +6064,6 @@ msgstr "**%%site.name%%** er en mikrobloggingtjeneste."
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:931
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7372,106 +6073,88 @@ msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:949
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:956
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:960
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:992
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1335
 msgid "After"
 msgstr "Etter"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1345
 msgid "Before"
 msgstr "Før"
 
 #. TRANS: Client exception thrown when a feed instance is a DOMDocument.
-#: lib/activity.php:125
 msgid "Expecting a root feed element but got a whole XML document."
 msgstr ""
 
 #. TRANS: Client exception thrown when using an unknown verb for the activity importer.
-#: lib/activityimporter.php:81
 #, fuzzy, php-format
 msgid "Unknown verb: \"%s\"."
 msgstr "Ukjent språk «%s»."
 
 #. TRANS: Client exception thrown when trying to force a subscription for an untrusted user.
-#: lib/activityimporter.php:107
 msgid "Cannot force subscription for untrusted user."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to for a remote user to subscribe.
-#: lib/activityimporter.php:117
 #, fuzzy
 msgid "Cannot force remote user to subscribe."
 msgstr "Kunne ikke oppdatere bruker for autoabonnering."
 
 #. TRANS: Client exception thrown when trying to subscribe to an unknown profile.
-#: lib/activityimporter.php:132
 #, fuzzy
 msgid "Unknown profile."
 msgstr "Ukjent filtype"
 
 #. TRANS: Client exception thrown when trying to import an event not related to the importing user.
-#: lib/activityimporter.php:138
 msgid "This activity seems unrelated to our user."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to join a remote group that is not a group.
-#: lib/activityimporter.php:154
 msgid "Remote profile is not a group!"
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to join a group the importing user is already a member of.
-#: lib/activityimporter.php:163
 #, fuzzy
 msgid "User is already a member of this group."
 msgstr "Du er allerede medlem av den gruppen."
 
 #. TRANS: Client exception thrown when trying to import a notice by another user.
 #. TRANS: %1$s is the source URI of the notice, %2$s is the URI of the author.
-#: lib/activityimporter.php:201
 #, php-format
 msgid "Already know about notice %1$s and  it has a different author %2$s."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to overwrite the author information for a non-trusted user during import.
-#: lib/activityimporter.php:207
 msgid "Not overwriting author info for non-trusted user."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to import a notice without content.
 #. TRANS: %s is the notice URI.
-#: lib/activityimporter.php:223
 #, fuzzy, php-format
 msgid "No content for notice %s."
 msgstr "Inget innhold for notis %d."
 
-#: lib/activitymover.php:84
 #, fuzzy, php-format
 msgid "No such user %s."
 msgstr "Ingen slik bruker."
@@ -7482,219 +6165,179 @@ msgstr "Ingen slik bruker."
 #. TRANS: %1$s is a URL, %2$s is the status, %s$s is the fail reason.
 #. TRANS: Exception thrown when post to collection fails with a status that is not handled.
 #. TRANS: %1$s is a URL, %2$s is the status, %s$s is the fail reason.
-#: lib/activitysink.php:163 lib/activitysink.php:167 lib/activitysink.php:172
 #, fuzzy, php-format
 msgctxt "URLSTATUSREASON"
 msgid "%1$s %2$s %3$s"
 msgstr "%1$s - %2$s"
 
 #. TRANS: Client exception thrown when there is no source attribute.
-#: lib/activityutils.php:200
 msgid "Can't handle remote content yet."
 msgstr ""
 
 #. TRANS: Client exception thrown when there embedded XML content is found that cannot be processed yet.
-#: lib/activityutils.php:237
 msgid "Can't handle embedded XML content yet."
 msgstr ""
 
 #. TRANS: Client exception thrown when base64 encoded content is found that cannot be processed yet.
-#: lib/activityutils.php:242
 msgid "Can't handle embedded Base64 content yet."
 msgstr ""
 
 #. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights.
-#: lib/adminpanelaction.php:96
 msgid "You cannot make changes to this site."
 msgstr "Du kan ikke gjøre endringer på dette nettstedet."
 
 #. TRANS: Client error message throw when a certain panel's settings cannot be changed.
-#: lib/adminpanelaction.php:108
 #, fuzzy
 msgid "Changes to that panel are not allowed."
 msgstr "Registrering ikke tillatt."
 
 #. TRANS: Client error message.
-#: lib/adminpanelaction.php:222
 msgid "showForm() not implemented."
 msgstr "showForm() ikke implementert."
 
 #. TRANS: Client error message
-#: lib/adminpanelaction.php:250
 msgid "saveSettings() not implemented."
 msgstr "saveSettings() ikke implementert."
 
 #. TRANS: Client error message thrown if design settings could not be deleted in
 #. TRANS: the admin panel Design.
-#: lib/adminpanelaction.php:274
 #, fuzzy
 msgid "Unable to delete design setting."
 msgstr "Kunne ikke lagre dine innstillinger for utseende."
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:337
 #, fuzzy
 msgid "Basic site configuration"
 msgstr "Endre nettstedskonfigurasjon"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:339
 msgctxt "MENU"
 msgid "Site"
 msgstr "Nettsted"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:345
 #, fuzzy
 msgid "Design configuration"
 msgstr "Tilgangskonfigurasjon"
 
 #. TRANS: Menu item for site administration
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/adminpanelaction.php:347 lib/groupnav.php:135
 msgctxt "MENU"
 msgid "Design"
 msgstr "Utseende"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:353
 msgid "User configuration"
 msgstr "Brukerkonfigurasjon"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:110
 msgid "User"
 msgstr "Bruker"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:361
 msgid "Access configuration"
 msgstr "Tilgangskonfigurasjon"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:369
 msgid "Paths configuration"
 msgstr "Stikonfigurasjon"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:377
 #, fuzzy
 msgid "Sessions configuration"
 msgstr "Tilgangskonfigurasjon"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:385
 msgid "Edit site notice"
 msgstr "Rediger nettstedsnotis"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:387
 msgid "Site notice"
 msgstr "Nettstedsnotis"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:393
 #, fuzzy
 msgid "Snapshots configuration"
 msgstr "Stikonfigurasjon"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:401
 msgid "Set site license"
 msgstr ""
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:409
 #, fuzzy
 msgid "Plugins configuration"
 msgstr "Stikonfigurasjon"
 
 #. TRANS: Client error 401.
-#: lib/apiauth.php:111
 msgid "API resource requires read-write access, but you only have read access."
 msgstr ""
 
 #. TRANS: OAuth exception thrown when no application is found for a given consumer key.
-#: lib/apiauth.php:177
 msgid "No application for that consumer key."
 msgstr ""
 
-#: lib/apiauth.php:202 lib/apiauth.php:284
 msgid "Not allowed to use API."
 msgstr ""
 
 #. TRANS: OAuth exception given when an incorrect access token was given for a user.
-#: lib/apiauth.php:225
 msgid "Bad access token."
 msgstr ""
 
 #. TRANS: OAuth exception given when no user was found for a given token (no token was found).
-#: lib/apiauth.php:230
 msgid "No user for that token."
 msgstr ""
 
 #. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel".
 #. TRANS: Client error thrown when authentication fails.
-#: lib/apiauth.php:272 lib/apiauth.php:302
 msgid "Could not authenticate you."
 msgstr ""
 
 #. TRANS: Server error displayed when trying to create an anynymous OAuth consumer.
-#: lib/apioauthstore.php:45
 #, fuzzy
 msgid "Could not create anonymous consumer."
 msgstr "Kunne ikke opprette alias."
 
 #. TRANS: Server error displayed when trying to create an anynymous OAuth application.
-#: lib/apioauthstore.php:69
 #, fuzzy
 msgid "Could not create anonymous OAuth application."
 msgstr "Kunne ikke opprette program."
 
 #. TRANS: Exception thrown when no token association could be found.
-#: lib/apioauthstore.php:151
 msgid ""
 "Could not find a profile and application associated with the request token."
 msgstr ""
 
 #. TRANS: Exception thrown when no access token can be issued.
-#: lib/apioauthstore.php:209
 #, fuzzy
 msgid "Could not issue access token."
 msgstr "Kunne ikke sette inn melding."
 
-#: lib/apioauthstore.php:317
 msgid "Database error inserting OAuth application user."
 msgstr "Databasefeil ved innsetting av bruker i programmet OAuth."
 
-#: lib/apioauthstore.php:345
 #, fuzzy
 msgid "Database error updating OAuth application user."
 msgstr "Databasefeil ved innsetting av bruker i programmet OAuth."
 
 #. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
-#: lib/apioauthstore.php:371
 msgid "Tried to revoke unknown token."
 msgstr ""
 
 #. TRANS: Exception thrown when an attempt is made to remove a revoked token.
-#: lib/apioauthstore.php:376
 msgid "Failed to delete revoked token."
 msgstr ""
 
 #. TRANS: Form input field label for application icon.
-#: lib/applicationeditform.php:177
 msgid "Icon"
 msgstr "Ikon"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:182
 msgid "Icon for this application"
 msgstr "Ikon for dette programmet"
 
 #. TRANS: Form input field instructions.
 #. TRANS: %d is the number of available characters for the description.
-#: lib/applicationeditform.php:201
 #, fuzzy, php-format
 msgid "Describe your application in %d character"
 msgid_plural "Describe your application in %d characters"
@@ -7702,214 +6345,175 @@ msgstr[0] "Beskriv programmet ditt med %d tegn"
 msgstr[1] "Beskriv programmet ditt med %d tegn"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:205
 msgid "Describe your application"
 msgstr "Beskriv programmet ditt"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:216
 msgid "URL of the homepage of this application"
 msgstr "Nettadresse til hjemmesiden for dette programmet"
 
 #. TRANS: Form input field label.
-#: lib/applicationeditform.php:218
 msgid "Source URL"
 msgstr "Nettadresse til kilde"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:225
 #, fuzzy
 msgid "Organization responsible for this application"
 msgstr "Ikon for dette programmet"
 
 #. TRANS: Form input field label.
-#: lib/applicationeditform.php:227
 msgid "Organization"
 msgstr "Organisasjon"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:234
 msgid "URL for the homepage of the organization"
 msgstr "URL til organisasjonens hjemmeside"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:243
 msgid "URL to redirect to after authentication"
 msgstr ""
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:271
 msgid "Browser"
 msgstr "Nettleser"
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:288
 msgid "Desktop"
 msgstr "Skrivebord"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:290
 msgid "Type of application, browser or desktop"
 msgstr "Type program, nettleser eller skrivebord"
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:314
 msgid "Read-only"
 msgstr "Skrivebeskyttet"
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:334
 msgid "Read-write"
 msgstr "Les og skriv"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:336
 msgid "Default access for this application: read-only, or read-write"
 msgstr ""
 "Standardtilgang for dette programmet: skrivebeskyttet eller lese- og "
 "skrivetilgang"
 
 #. TRANS: Submit button title.
-#: lib/applicationeditform.php:353
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: lib/applicationlist.php:247
 msgid " by "
 msgstr ""
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:260
 msgid "read-write"
 msgstr "les og skriv"
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:262
 msgid "read-only"
 msgstr "skrivebeskyttet"
 
 #. TRANS: Used in application list. %1$s is a modified date, %2$s is access type ("read-write" or "read-only")
-#: lib/applicationlist.php:268
 #, php-format
 msgid "Approved %1$s - \"%2$s\" access."
 msgstr ""
 
 #. TRANS: Access token in the application list.
 #. TRANS: %s are the first 7 characters of the access token.
-#: lib/applicationlist.php:282
 #, php-format
 msgid "Access token starting with: %s"
 msgstr ""
 
 #. TRANS: Button label
-#: lib/applicationlist.php:298
 msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "Tilbakekall"
 
-#: lib/atom10feed.php:113
 msgid "Author element must contain a name element."
 msgstr ""
 
 #. TRANS: Server exception thrown when using the method setActivitySubject() in the class Atom10Feed.
-#: lib/atom10feed.php:160
 #, fuzzy
 msgid "Do not use this method!"
 msgstr "Ikke slett denne gruppen"
 
 #. TRANS: Title.
-#: lib/attachmentnoticesection.php:67
 msgid "Notices where this attachment appears"
 msgstr "Notiser hvor dette vedlegget forekommer"
 
 #. TRANS: Title.
-#: lib/attachmenttagcloudsection.php:48
 #, fuzzy
 msgid "Tags for this attachment"
 msgstr "Ingen slike vedlegg."
 
 #. TRANS: Exception thrown when a password change fails.
-#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:227
 #, fuzzy
 msgid "Password changing failed."
 msgstr "Endring av passord mislyktes"
 
 #. TRANS: Exception thrown when a password change attempt fails because it is not allowed.
-#: lib/authenticationplugin.php:238
 #, fuzzy
 msgid "Password changing is not allowed."
 msgstr "Endring av passord er ikke tillatt"
 
 #. TRANS: Title for the form to block a user.
-#: lib/blockform.php:68
 msgid "Block"
 msgstr "Blokkér"
 
 #. TRANS: Description of the form to block a user.
-#: lib/blockform.php:79
 msgid "Block this user"
 msgstr "Blokker denne brukeren"
 
 #. TRANS: Title for command results.
-#: lib/channel.php:104 lib/channel.php:125
 msgid "Command results"
 msgstr "Kommandoresultat"
 
 #. TRANS: Title for command results.
-#: lib/channel.php:138
 #, fuzzy
 msgid "AJAX error"
 msgstr "Ajax-feil"
 
 #. TRANS: E-mail subject when a command has completed.
-#: lib/channel.php:177 lib/mailhandler.php:143
 msgid "Command complete"
 msgstr "Kommando fullført"
 
 #. TRANS: E-mail subject when a command has failed.
-#: lib/channel.php:188
 msgid "Command failed"
 msgstr "Kommando feilet"
 
 #. TRANS: Command exception text shown when a notice ID is requested that does not exist.
-#: lib/command.php:82 lib/command.php:106
 msgid "Notice with that id does not exist."
 msgstr ""
 
 #. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
 #. TRANS: Error text shown when a last user notice is requested and it does not exist.
-#: lib/command.php:99 lib/command.php:642
 #, fuzzy
 msgid "User has no last notice."
 msgstr "Brukeren har ingen profil."
 
 #. TRANS: Message given requesting a profile for a non-existing user.
 #. TRANS: %s is the nickname of the user for which the profile could not be found.
-#: lib/command.php:128
 #, fuzzy, php-format
 msgid "Could not find a user with nickname %s."
 msgstr "Klarte ikke å oppdatere bruker med bekreftet e-post."
 
 #. TRANS: Message given getting a non-existing user.
 #. TRANS: %s is the nickname of the user that could not be found.
-#: lib/command.php:148
 #, php-format
 msgid "Could not find a local user with nickname %s."
 msgstr ""
 
 #. TRANS: Error text shown when an unimplemented command is given.
-#: lib/command.php:183
 msgid "Sorry, this command is not yet implemented."
 msgstr "Beklager, denne kommandoen er ikke implementert ennå."
 
 #. TRANS: Command exception text shown when a user tries to nudge themselves.
-#: lib/command.php:229
 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr "Det gir ikke så mye mening å knuffe seg selv."
 
 #. TRANS: Message given having nudged another user.
 #. TRANS: %s is the nickname of the user that was nudged.
-#: lib/command.php:238
 #, php-format
 msgid "Nudge sent to %s."
 msgstr ""
@@ -7918,7 +6522,6 @@ msgstr ""
 #. TRANS: %1$s is the number of other user the user is subscribed to.
 #. TRANS: %2$s is the number of users that are subscribed to the user.
 #. TRANS: %3$s is the number of notices the user has sent.
-#: lib/command.php:268
 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"
@@ -7930,40 +6533,34 @@ msgstr ""
 "Notiser: %3$s"
 
 #. TRANS: Error message text shown when a favorite could not be set because it has already been favorited.
-#: lib/command.php:298
 #, fuzzy
 msgid "Could not create favorite: already favorited."
 msgstr "Kunne ikke opprette favoritt."
 
 #. TRANS: Text shown when a notice has been marked as favourite successfully.
-#: lib/command.php:324
 msgid "Notice marked as fave."
 msgstr "Notis markert som favoritt."
 
 #. TRANS: Message given having added a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:369
 #, php-format
 msgid "%1$s joined group %2$s."
 msgstr ""
 
 #. TRANS: Message given having removed a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:417
 #, php-format
 msgid "%1$s left group %2$s."
 msgstr ""
 
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: lib/command.php:438
 #, fuzzy, php-format
 msgctxt "WHOIS"
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
 
 #. TRANS: Whois output. %s is the full name of the queried user.
-#: lib/command.php:442
 #, php-format
 msgid "Fullname: %s"
 msgstr "Fullt navn: %s"
@@ -7971,7 +6568,6 @@ msgstr "Fullt navn: %s"
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a location.
-#: lib/command.php:446 lib/mail.php:275
 #, php-format
 msgid "Location: %s"
 msgstr "Posisjon: %s"
@@ -7979,20 +6575,17 @@ msgstr "Posisjon: %s"
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a homepage.
-#: lib/command.php:450 lib/mail.php:279
 #, php-format
 msgid "Homepage: %s"
 msgstr "Hjemmeside: %s"
 
 #. TRANS: Whois output. %s is the bio information of the queried user.
-#: lib/command.php:454
 #, php-format
 msgid "About: %s"
 msgstr "Om: %s"
 
 #. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).
 #. TRANS: %s is a remote profile.
-#: lib/command.php:483
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
@@ -8001,33 +6594,32 @@ msgstr ""
 
 #. TRANS: Message given if content is too long. %1$sd is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:500
 #, fuzzy, php-format
 msgid "Message too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
 msgstr[0] "Melding for lang - maks er %1$d tegn, du sendte %2$d."
 msgstr[1] "Melding for lang - maks er %1$d tegn, du sendte %2$d."
 
+#. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
+msgid "You can't send a message to this user."
+msgstr "Du kan ikke sende en melding til denne brukeren."
+
 #. TRANS: Error text shown sending a direct message fails with an unknown reason.
-#: lib/command.php:528
 msgid "Error sending direct message."
 msgstr "Feil ved sending av direktemelding."
 
 #. TRANS: Message given having repeated a notice from another user.
 #. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:565
 #, fuzzy, php-format
 msgid "Notice from %s repeated."
 msgstr "Nytt nick"
 
 #. TRANS: Error text shown when repeating a notice fails with an unknown reason.
-#: lib/command.php:568
 msgid "Error repeating notice."
 msgstr "Feil ved repetering av notis."
 
 #. TRANS: Message given if content of a notice for a reply is too long. %1$d is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:603
 #, fuzzy, php-format
 msgid "Notice too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Notice too long - maximum is %1$d characters, you sent %2$d."
@@ -8036,97 +6628,81 @@ msgstr[1] "Melding for lang - maks er %1$d tegn, du sendte %2$d."
 
 #. TRANS: Text shown having sent a reply to a notice successfully.
 #. TRANS: %s is the nickname of the user of the notice the reply was sent to.
-#: lib/command.php:616
 #, fuzzy, php-format
 msgid "Reply to %s sent."
 msgstr "Svar til %s"
 
 #. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
-#: lib/command.php:619
 msgid "Error saving notice."
 msgstr "Feil ved lagring av notis."
 
 #. TRANS: Error text shown when no username was provided when issuing a subscribe command.
-#: lib/command.php:666
 msgid "Specify the name of the user to subscribe to."
 msgstr ""
 
 #. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
-#: lib/command.php:675
 msgid "Can't subscribe to OMB profiles by command."
 msgstr ""
 
 #. TRANS: Text shown after having subscribed to another user successfully.
 #. TRANS: %s is the name of the user the subscription was requested for.
-#: lib/command.php:683
 #, php-format
 msgid "Subscribed to %s."
 msgstr ""
 
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.
-#: lib/command.php:704 lib/command.php:815
 msgid "Specify the name of the user to unsubscribe from."
 msgstr ""
 
 #. TRANS: Text shown after having unsubscribed from another user successfully.
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:715
 #, php-format
 msgid "Unsubscribed from %s."
 msgstr ""
 
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
-#: lib/command.php:735 lib/command.php:761
 #, fuzzy
 msgid "Command not yet implemented."
 msgstr "Beklager, denne kommandoen er ikke implementert ennå."
 
 #. TRANS: Text shown when issuing the command "off" successfully.
-#: lib/command.php:739
 #, fuzzy
 msgid "Notification off."
 msgstr "Ingen bekreftelseskode."
 
 #. TRANS: Error text shown when the command "off" fails for an unknown reason.
-#: lib/command.php:742
 msgid "Can't turn off notification."
 msgstr ""
 
 #. TRANS: Text shown when issuing the command "on" successfully.
-#: lib/command.php:765
 #, fuzzy
 msgid "Notification on."
 msgstr "Ingen bekreftelseskode."
 
 #. TRANS: Error text shown when the command "on" fails for an unknown reason.
-#: lib/command.php:768
 #, fuzzy
 msgid "Can't turn on notification."
 msgstr "Kan ikke gjenta din egen notis."
 
 #. TRANS: Error text shown when issuing the login command while login is disabled.
-#: lib/command.php:782
 msgid "Login command is disabled."
 msgstr ""
 
 #. TRANS: Text shown after issuing the login command successfully.
 #. TRANS: %s is a logon link..
-#: lib/command.php:795
 #, php-format
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
 
 #. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:824
 #, php-format
 msgid "Unsubscribed %s."
 msgstr ""
 
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
-#: lib/command.php:842
 #, fuzzy
 msgid "You are not subscribed to anyone."
 msgstr "Ikke autorisert."
@@ -8134,7 +6710,6 @@ msgstr "Ikke autorisert."
 #. TRANS: Text shown after requesting other users a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
-#: lib/command.php:847
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Ikke autorisert."
@@ -8142,7 +6717,6 @@ msgstr[1] "Ikke autorisert."
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user
 #. TRANS: (followers) without having any subscribers.
-#: lib/command.php:869
 #, fuzzy
 msgid "No one is subscribed to you."
 msgstr "Svar til %s"
@@ -8150,7 +6724,6 @@ msgstr "Svar til %s"
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
-#: lib/command.php:874
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Svar til %s"
@@ -8158,21 +6731,18 @@ msgstr[1] "Svar til %s"
 
 #. TRANS: Text shown after requesting groups a user is subscribed to without having
 #. TRANS: any group subscriptions.
-#: lib/command.php:896
 msgid "You are not a member of any groups."
 msgstr "Du er ikke et medlem av den gruppen."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
-#: lib/command.php:901
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "Du er allerede logget inn!"
 msgstr[1] "Du er allerede logget inn!"
 
 #. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-#: lib/command.php:916
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -8215,123 +6785,102 @@ msgid ""
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:36
 #, fuzzy
 msgid "No configuration file found."
 msgstr "Ingen konfigurasjonsfil funnet. "
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:39
 #, fuzzy
 msgid "I looked for configuration files in the following places:"
 msgstr "Jeg så etter konfigurasjonfiler på følgende seter: "
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:42
 msgid "You may wish to run the installer to fix this."
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:46
 #, fuzzy
 msgid "Go to the installer."
 msgstr "Log inn på nettstedet"
 
-#: lib/dberroraction.php:59
 msgid "Database error"
 msgstr "Databasefeil"
 
 #. TRANS: Description of form for deleting a user.
-#: lib/deleteuserform.php:75
 msgid "Delete this user"
 msgstr "Slett denne brukeren"
 
-#: lib/designform.php:114
 #, fuzzy
 msgid "Change design"
 msgstr "Lagre utseende"
 
 #. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: lib/designform.php:131
 msgid "Change colours"
 msgstr "Endre farger"
 
 #. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: lib/designform.php:138
 msgid "Use defaults"
 msgstr "Bruk standard"
 
 #. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: lib/designform.php:140
 msgid "Restore default designs"
 msgstr "Gjenopprett standardutseende"
 
 #. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: lib/designform.php:148
 msgid "Reset back to default"
 msgstr "Tilbakestill til standardverdier"
 
 #. TRANS: Label in form on profile design page.
 #. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
-#: lib/designform.php:158
 msgid "Upload file"
 msgstr "Last opp fil"
 
 #. TRANS: Instructions for form on profile design page.
-#: lib/designform.php:163
 #, fuzzy
 msgid ""
 "You can upload your personal background image. The maximum file size is 2Mb."
 msgstr "Du kan laste opp en personlig avatar. Maks filstørrelse er %s."
 
 #. TRANS: Radio button on profile design page that will enable use of the uploaded profile image.
-#: lib/designform.php:194
 #, fuzzy
 msgctxt "RADIO"
 msgid "On"
 msgstr "På"
 
 #. TRANS: Radio button on profile design page that will disable use of the uploaded profile image.
-#: lib/designform.php:211
 #, fuzzy
 msgctxt "RADIO"
 msgid "Off"
 msgstr "Av"
 
 #. TRANS: Title for button on profile design page to save settings.
-#: lib/designform.php:322
 msgid "Save design"
 msgstr "Lagre utseende"
 
 #. TRANS: Error message displayed if design settings could not be saved.
 #. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
-#: lib/designsettings.php:216 lib/designsettings.php:238
 msgid "Couldn't update your design."
 msgstr "Kunne ikke oppdatere utseende."
 
 #. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
-#: lib/designsettings.php:244
 #, fuzzy
 msgid "Design defaults restored."
 msgstr "Utseende lagret."
 
 #. TRANS: Exception. %s is an ID.
-#: lib/discovery.php:153
 #, fuzzy, php-format
 msgid "Unable to find services for %s."
 msgstr "Kunne ikke fjerne tilgang for applikasjonen: %s."
 
 #. TRANS: Form legend for removing the favourite status for a favourite notice.
 #. TRANS: Title for button text for removing the favourite status for a favourite notice.
-#: lib/disfavorform.php:108 lib/disfavorform.php:140
 #, fuzzy
 msgid "Disfavor this notice"
 msgstr "Slett denne notisen"
 
 #. TRANS: Button text for removing the favourite status for a favourite notice.
-#: lib/disfavorform.php:136
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Disfavor favorite"
@@ -8339,106 +6888,84 @@ msgstr "Fjern favoritt"
 
 #. TRANS: Form legend for adding the favourite status to a notice.
 #. TRANS: Title for button text for adding the favourite status to a notice.
-#: lib/favorform.php:108 lib/favorform.php:139
 #, fuzzy
 msgid "Favor this notice"
 msgstr "Repeter denne notisen"
 
 #. TRANS: Button text for adding the favourite status to a notice.
-#: lib/favorform.php:135
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Favor"
 msgstr "Favoritter"
 
-#: lib/feed.php:84
 msgid "RSS 1.0"
 msgstr "RSS 1.0"
 
-#: lib/feed.php:86
 msgid "RSS 2.0"
 msgstr "RSS 2.0"
 
-#: lib/feed.php:88
 msgid "Atom"
 msgstr "Atom"
 
-#: lib/feed.php:90
 msgid "FOAF"
 msgstr "Venn av en venn"
 
-#: lib/feedimporter.php:75
 #, fuzzy
 msgid "Not an atom feed."
 msgstr "Alle medlemmer"
 
-#: lib/feedimporter.php:82
 msgid "No author in the feed."
 msgstr ""
 
-#: lib/feedimporter.php:89
 msgid "Can't import without a user."
 msgstr ""
 
 #. TRANS: Header for feed links (h2).
-#: lib/feedlist.php:66
 msgid "Feeds"
 msgstr ""
 
-#: lib/galleryaction.php:128
 msgid "All"
 msgstr "Alle"
 
-#: lib/galleryaction.php:136
 #, fuzzy
 msgid "Select tag to filter"
 msgstr "Velg en operatør"
 
-#: lib/galleryaction.php:137
 #, fuzzy
 msgid "Tag"
 msgstr "Tagger"
 
-#: lib/galleryaction.php:138
 msgid "Choose a tag to narrow list"
 msgstr ""
 
-#: lib/galleryaction.php:140
 msgid "Go"
 msgstr "Gå"
 
-#: lib/grantroleform.php:91
 #, php-format
 msgid "Grant this user the \"%s\" role"
 msgstr "Innvilg denne brukeren rollen «%s»"
 
-#: lib/groupeditform.php:147
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "1-64 små bokstaver eller tall, ingen punktum eller mellomrom"
 
-#: lib/groupeditform.php:156
 #, fuzzy
 msgid "URL of the homepage or blog of the group or topic."
 msgstr "Nettadresse til hjemmesiden for dette programmet"
 
-#: lib/groupeditform.php:161
 msgid "Describe the group or topic"
 msgstr "Beskriv programmet ditt"
 
-#: lib/groupeditform.php:163
 #, fuzzy, php-format
 msgid "Describe the group or topic in %d character or less"
 msgid_plural "Describe the group or topic in %d characters or less"
 msgstr[0] "Beskriv programmet ditt med %d tegn"
 msgstr[1] "Beskriv programmet ditt med %d tegn"
 
-#: lib/groupeditform.php:175
 #, fuzzy
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\"."
 msgstr "Hvor du er, for eksempel «By, fylke (eller region), land»"
 
-#: lib/groupeditform.php:183
 #, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -8450,70 +6977,60 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Menu item in the group navigation page.
-#: lib/groupnav.php:86
 msgctxt "MENU"
 msgid "Group"
 msgstr ""
 
 #. TRANS: Tooltip for menu item in the group navigation page.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:89
 #, php-format
 msgctxt "TOOLTIP"
 msgid "%s group"
 msgstr ""
 
 #. TRANS: Menu item in the group navigation page.
-#: lib/groupnav.php:95
 msgctxt "MENU"
 msgid "Members"
 msgstr ""
 
 #. TRANS: Tooltip for menu item in the group navigation page.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:98
 #, php-format
 msgctxt "TOOLTIP"
 msgid "%s group members"
 msgstr ""
 
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/groupnav.php:108
 msgctxt "MENU"
 msgid "Blocked"
 msgstr ""
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:111
 #, php-format
 msgctxt "TOOLTIP"
 msgid "%s blocked users"
 msgstr ""
 
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "Administrator"
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:120
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Edit %s group properties"
 msgstr ""
 
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/groupnav.php:126
 msgctxt "MENU"
 msgid "Logo"
 msgstr ""
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:129
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Add or edit %s logo"
@@ -8521,69 +7038,57 @@ msgstr ""
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:138
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Add or edit %s design"
 msgstr ""
 
 #. TRANS: Title for groups with the most members section.
-#: lib/groupsbymemberssection.php:71
 msgid "Groups with most members"
 msgstr "Grupper med flest medlemmer"
 
 #. TRANS: Title for groups with the most posts section.
-#: lib/groupsbypostssection.php:71
 msgid "Groups with most posts"
 msgstr "Grupper med flest innlegg"
 
 #. TRANS: Title for group tag cloud section.
 #. TRANS: %s is a group name.
-#: lib/grouptagcloudsection.php:57
 #, fuzzy, php-format
 msgid "Tags in %s group's notices"
 msgstr "Rediger %s gruppeegenskaper"
 
 #. TRANS: Client exception 406
-#: lib/htmloutputter.php:104
 msgid "This page is not available in a media type you accept"
 msgstr "Denne siden er ikke tilgjengelig i en mediatype du aksepterer"
 
 #. TRANS: Exception thrown when trying to upload an unsupported image file format.
-#: lib/imagefile.php:73
 msgid "Unsupported image file format."
 msgstr "Bildefilformatet støttes ikke."
 
 #. TRANS: Exception thrown when too large a file is uploaded.
 #. TRANS: %s is the maximum file size, for example "500b", "10kB" or "2MB".
-#: lib/imagefile.php:91
 #, php-format
 msgid "That file is too big. The maximum file size is %s."
 msgstr "Filen er for stor. Maks filstørrelse er %s."
 
 #. TRANS: Exception thrown when uploading an image and that action could not be completed.
-#: lib/imagefile.php:97
 msgid "Partial upload."
 msgstr "Delvis opplasting."
 
 #. TRANS: Exception thrown when uploading a file as image that is not an image or is a corrupt file.
-#: lib/imagefile.php:115
 msgid "Not an image or corrupt file."
 msgstr "Ikke et bilde eller en korrupt fil."
 
 #. TRANS: Exception thrown during resize when image has been registered as present, but is no longer there.
-#: lib/imagefile.php:178
 msgid "Lost our file."
 msgstr "Mistet filen vår."
 
 #. TRANS: Exception thrown when trying to resize an unknown file type.
 #. TRANS: Exception thrown when trying resize an unknown file type.
-#: lib/imagefile.php:216 lib/imagefile.php:257
 msgid "Unknown file type"
 msgstr "Ukjent filtype"
 
 #. TRANS: Number of megabytes. %d is the number.
-#: lib/imagefile.php:303
 #, fuzzy, php-format
 msgid "%dMB"
 msgid_plural "%dMB"
@@ -8591,7 +7096,6 @@ msgstr[0] "MB"
 msgstr[1] "MB"
 
 #. TRANS: Number of kilobytes. %d is the number.
-#: lib/imagefile.php:307
 #, fuzzy, php-format
 msgid "%dkB"
 msgid_plural "%dkB"
@@ -8599,14 +7103,12 @@ msgstr[0] "kB"
 msgstr[1] "kB"
 
 #. TRANS: Number of bytes. %d is the number.
-#: lib/imagefile.php:310
 #, php-format
 msgid "%dB"
 msgid_plural "%dB"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/implugin.php:262
 #, php-format
 msgid ""
 "User \"%s\" on %s has said that your %s screenname belongs to them. If "
@@ -8616,51 +7118,42 @@ msgid ""
 "message."
 msgstr ""
 
-#: lib/implugin.php:349
 #, php-format
 msgid "Unknown inbox source %d."
 msgstr "Ukjent innbokskilde %d."
 
-#: lib/implugin.php:485
-#, fuzzy, php-format
+#, php-format
 msgid "Message too long - maximum is %1$d characters, you sent %2$d."
 msgstr "Melding for lang - maks er %1$d tegn, du sendte %2$d."
 
-#: lib/leaveform.php:114
 msgid "Leave"
 msgstr "Forlat"
 
 #. TRANS: Menu item for logging in to the StatusNet site.
-#: lib/logingroupnav.php:77
 msgctxt "MENU"
 msgid "Login"
 msgstr "Logg inn"
 
 #. TRANS: Title for menu item for logging in to the StatusNet site.
-#: lib/logingroupnav.php:79
 msgid "Login with a username and password"
 msgstr "Logg inn med brukernavn og passord"
 
 #. TRANS: Menu item for registering with the StatusNet site.
-#: lib/logingroupnav.php:85
 msgctxt "MENU"
 msgid "Register"
 msgstr "Registrer"
 
 #. TRANS: Title for menu item for registering with the StatusNet site.
-#: lib/logingroupnav.php:87
 msgid "Sign up for a new account"
 msgstr "Registrer deg for en ny konto"
 
 #. TRANS: Subject for address confirmation email.
-#: lib/mail.php:172
 msgid "Email address confirmation"
 msgstr "Bekreftelse av e-postadresse"
 
 #. TRANS: Body for address confirmation email.
 #. TRANS: %1$s is the addressed user's nickname, %2$s is the StatusNet sitename,
 #. TRANS: %3$s is the URL to confirm at.
-#: lib/mail.php:177
 #, fuzzy, php-format
 msgid ""
 "Hey, %1$s.\n"
@@ -8691,14 +7184,12 @@ msgstr ""
 
 #. TRANS: Subject of new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
-#: lib/mail.php:243
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1$s lytter nå til dine notiser på %2$s."
 
 #. TRANS: This is a paragraph in a new-subscriber e-mail.
 #. TRANS: %s is a URL where the subscriber can be reported as abusive.
-#: lib/mail.php:250
 #, php-format
 msgid ""
 "If you believe this account is being used abusively, you can block them from "
@@ -8710,7 +7201,6 @@ msgstr ""
 #. TRANS: %3$s is the subscriber's profile URL, %4$s is the subscriber's location (or empty)
 #. TRANS: %5$s is the subscriber's homepage URL (or empty), %6%s is the subscriber's bio (or empty)
 #. TRANS: %7$s is a link to the addressed user's e-mail settings.
-#: lib/mail.php:260
 #, fuzzy, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -8737,14 +7227,12 @@ msgstr ""
 
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is biographical information.
-#: lib/mail.php:283
 #, php-format
 msgid "Bio: %s"
 msgstr "Biografi: %s"
 
 #. TRANS: Subject of notification mail for new posting email address.
 #. TRANS: %s is the StatusNet sitename.
-#: lib/mail.php:312
 #, php-format
 msgid "New email address for posting to %s"
 msgstr "Ny e-postadresse for posting til %s"
@@ -8752,7 +7240,6 @@ msgstr "Ny e-postadresse for posting til %s"
 #. TRANS: Body of notification mail for new posting email address.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is the e-mail address to send
 #. TRANS: to to post by e-mail, %3$s is a URL to more instructions.
-#: lib/mail.php:318
 #, fuzzy, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -8775,26 +7262,22 @@ msgstr ""
 
 #. TRANS: Subject line for SMS-by-email notification messages.
 #. TRANS: %s is the posting user's nickname.
-#: lib/mail.php:439
 #, php-format
 msgid "%s status"
 msgstr "%s status"
 
 #. TRANS: Subject line for SMS-by-email address confirmation message.
-#: lib/mail.php:465
 msgid "SMS confirmation"
 msgstr "SMS-bekreftelse"
 
 #. TRANS: Main body heading for SMS-by-email address confirmation message.
 #. TRANS: %s is the addressed user's nickname.
-#: lib/mail.php:469
 #, php-format
 msgid "%s: confirm you own this phone number with this code:"
 msgstr "%s: bekreft telefonnummeret ditt med denne koden:"
 
 #. TRANS: Subject for 'nudge' notification email.
 #. TRANS: %s is the nudging user.
-#: lib/mail.php:490
 #, fuzzy, php-format
 msgid "You have been nudged by %s"
 msgstr "Du har blitt knuffet av %s"
@@ -8802,7 +7285,6 @@ msgstr "Du har blitt knuffet av %s"
 #. TRANS: Body for 'nudge' notification email.
 #. TRANS: %1$s is the nuding user's long name, $2$s is the nudging user's nickname,
 #. TRANS: %3$s is a URL to post notices at, %4$s is the StatusNet sitename.
-#: lib/mail.php:497
 #, php-format
 msgid ""
 "%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -8831,7 +7313,6 @@ msgstr ""
 
 #. TRANS: Subject for direct-message notification email.
 #. TRANS: %s is the sending user's nickname.
-#: lib/mail.php:544
 #, php-format
 msgid "New private message from %s"
 msgstr "Ny privat melding fra %s"
@@ -8840,7 +7321,6 @@ msgstr "Ny privat melding fra %s"
 #. TRANS: %1$s is the sending user's long name, %2$s is the sending user's nickname,
 #. TRANS: %3$s is the message content, %4$s a URL to the message,
 #. TRANS: %5$s is the StatusNet sitename.
-#: lib/mail.php:552
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -8875,7 +7355,6 @@ msgstr ""
 
 #. TRANS: Subject for favorite notification e-mail.
 #. TRANS: %1$s is the adding user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:604
 #, fuzzy, php-format
 msgid "%1$s (@%2$s) added your notice as a favorite"
 msgstr "%s /@%s) la din notis til som en favoritt"
@@ -8885,7 +7364,6 @@ msgstr "%s /@%s) la din notis til som en favoritt"
 #. TRANS: %3$s is a URL to the faved notice, %4$s is the faved notice text,
 #. TRANS: %5$s is a URL to all faves of the adding user, %6$s is the StatusNet sitename,
 #. TRANS: %7$s is the adding user's nickname.
-#: lib/mail.php:611
 #, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -8923,7 +7401,6 @@ msgstr ""
 "%6$s\n"
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:669
 #, php-format
 msgid ""
 "The full conversation can be read here:\n"
@@ -8936,7 +7413,6 @@ msgstr ""
 
 #. TRANS: E-mail subject for notice notification.
 #. TRANS: %1$s is the sending user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:677
 #, fuzzy, php-format
 msgid "%1$s (@%2$s) sent a notice to your attention"
 msgstr "%s (@%s) sendte en notis for din oppmerksomhet"
@@ -8947,7 +7423,6 @@ msgstr "%s (@%s) sendte en notis for din oppmerksomhet"
 #. TRANS: %5$s is a URL to the full conversion if it exists (otherwise empty),
 #. TRANS: %6$s is a URL to reply to the notice, %7$s is a URL to all @-replied for the addressed user,
 #. TRANS: %8$s is a URL to the addressed user's e-mail settings, %9$s is the sender's nickname.
-#: lib/mail.php:685
 #, php-format
 msgid ""
 "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -8997,11 +7472,9 @@ msgstr ""
 "\n"
 "P.S. Du kan slå av disse e-postvarslene her: %8$s\n"
 
-#: lib/mailbox.php:87
 msgid "Only the user can read their own mailboxes."
 msgstr "Bare brukeren kan lese sine egne postbokser."
 
-#: lib/mailbox.php:125
 msgid ""
 "You have no private messages. You can send private message to engage other "
 "users in conversation. People can send you messages for your eyes only."
@@ -9010,55 +7483,45 @@ msgstr ""
 "engasjere andre brukere i en samtale. Personer kan sende deg meldinger som "
 "bare du kan se."
 
-#: lib/mailhandler.php:37
 msgid "Could not parse message."
 msgstr "Kunne ikke tolke meldingen."
 
-#: lib/mailhandler.php:42
 msgid "Not a registered user."
 msgstr "Ikke en registrert bruker."
 
-#: lib/mailhandler.php:46
 #, fuzzy
 msgid "Sorry, that is not your incoming email address."
 msgstr "Det er ikke din e-postadresse."
 
-#: lib/mailhandler.php:50
 #, fuzzy
 msgid "Sorry, no incoming email allowed."
 msgstr "Ingen innkommende e-postadresse."
 
-#: lib/mailhandler.php:229
 #, php-format
 msgid "Unsupported message type: %s"
 msgstr "Meldingstypen støttes ikke: %s"
 
 #. TRANS: Client exception thrown when a database error was thrown during a file upload operation.
-#: lib/mediafile.php:102 lib/mediafile.php:174
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
 
 #. TRANS: Client exception thrown when a file upload operation would cause a user to exceed a set quota.
-#: lib/mediafile.php:238 lib/mediafile.php:281
 msgid "File exceeds user's quota."
 msgstr "Fil overgår brukers kvote."
 
 #. TRANS: Client exception thrown when a file upload operation fails because the file could
 #. TRANS: not be moved from the temporary folder to the permanent file location.
-#: lib/mediafile.php:258 lib/mediafile.php:300
 msgid "File could not be moved to destination directory."
 msgstr "Filen kunne ikke flyttes til målmappen."
 
 #. TRANS: Client exception thrown when a file upload operation has been stopped because the MIME
 #. TRANS: type of the uploaded file could not be determined.
-#: lib/mediafile.php:265 lib/mediafile.php:306
 msgid "Could not determine file's MIME type."
 msgstr "Kunne ikke avgjøre filens MIME-type."
 
 #. TRANS: Client exception thrown trying to upload a forbidden MIME type.
 #. TRANS: %1$s is the file type that was denied, %2$s is the application part of
 #. TRANS: the MIME type that was denied.
-#: lib/mediafile.php:396
 #, php-format
 msgid ""
 "\"%1$s\" is not a supported file type on this server. Try using another %2$s "
@@ -9067,84 +7530,75 @@ msgstr ""
 
 #. TRANS: Client exception thrown trying to upload a forbidden MIME type.
 #. TRANS: %s is the file type that was denied.
-#: lib/mediafile.php:401
 #, php-format
 msgid "\"%s\" is not a supported file type on this server."
 msgstr ""
 
-#: lib/messageform.php:120
 msgid "Send a direct notice"
 msgstr "Send en direktenotis"
 
 #. TRANS Label entry in drop-down selection box in direct-message inbox/outbox. This is the default entry in the drop-down box, doubling as instructions and a brake against accidental submissions with the first user in the list.
-#: lib/messageform.php:137
 #, fuzzy
 msgid "Select recipient:"
 msgstr "Velg lisens"
 
 #. TRANS Entry in drop-down selection box in direct-message inbox/outbox when no one is available to message.
-#: lib/messageform.php:150
 #, fuzzy
 msgid "No mutual subscribers."
 msgstr "Alle abonnementer"
 
-#: lib/messageform.php:153
 msgid "To"
 msgstr "Til"
 
-#: lib/messageform.php:184 lib/noticeform.php:236
 msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr "Send"
 
-#: lib/messagelist.php:77
 #, fuzzy
 msgid "Messages"
 msgstr "Melding"
 
-#: lib/messagelistitem.php:123 lib/noticelist.php:527
 msgid "from"
 msgstr "fra"
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:178
 msgid "Nickname cannot be empty."
 msgstr ""
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:191
 #, php-format
 msgid "Nickname cannot be more than %d character long."
 msgid_plural "Nickname cannot be more than %d characters long."
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/noticeform.php:160
+#. TRANS: Form legend for notice form.
 msgid "Send a notice"
 msgstr "Send en notis"
 
-#: lib/noticeform.php:174
+#. TRANS: Title for notice label. %s is the user's nickname.
 #, php-format
 msgid "What's up, %s?"
 msgstr "Hva skjer %s?"
 
-#: lib/noticeform.php:193
+#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr "Legg ved"
 
-#: lib/noticeform.php:197
-msgid "Attach a file"
+#. TRANS: Title for input field to attach a file to a notice.
+#, fuzzy
+msgid "Attach a file."
 msgstr "Legg ved en fil"
 
-#: lib/noticeform.php:212
+#. TRANS: Field label to add location to a notice.
 msgid "Share my location"
 msgstr "Del min posisjon"
 
-#: lib/noticeform.php:215
+#. TRANS: Text to not share location for a notice in notice form.
 msgid "Do not share my location"
 msgstr "Ikke del min posisjon"
 
-#: lib/noticeform.php:216
+#. TRANS: Timeout error text for location retrieval in notice form.
 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
 "try again later"
@@ -9153,429 +7607,328 @@ msgstr ""
 "igjen senere"
 
 #. TRANS: Used in coordinates as abbreviation of north
-#: lib/noticelist.php:457
 msgid "N"
 msgstr "N"
 
 #. TRANS: Used in coordinates as abbreviation of south
-#: lib/noticelist.php:459
 msgid "S"
 msgstr "S"
 
 #. TRANS: Used in coordinates as abbreviation of east
-#: lib/noticelist.php:461
 msgid "E"
 msgstr "Ø"
 
 #. TRANS: Used in coordinates as abbreviation of west
-#: lib/noticelist.php:463
 msgid "W"
 msgstr "V"
 
-#: lib/noticelist.php:465
 #, php-format
 msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 
-#: lib/noticelist.php:474
 msgid "at"
 msgstr "på"
 
-#: lib/noticelist.php:523
 msgid "web"
 msgstr ""
 
-#: lib/noticelist.php:589
 #, fuzzy
 msgid "in context"
 msgstr "Inget innhold."
 
-#: lib/noticelist.php:624
 msgid "Repeated by"
 msgstr "Repetert av"
 
-#: lib/noticelist.php:651
 msgid "Reply to this notice"
 msgstr "Svar på denne notisen"
 
-#: lib/noticelist.php:652
 msgid "Reply"
 msgstr "Svar"
 
-#: lib/noticelist.php:678
 msgid "Delete this notice"
 msgstr "Slett denne notisen"
 
-#: lib/noticelist.php:696
 msgid "Notice repeated"
 msgstr "Notis repetert"
 
-#: lib/nudgeform.php:116
 msgid "Nudge this user"
 msgstr "Knuff denne brukeren"
 
-#: lib/nudgeform.php:128
 msgid "Nudge"
 msgstr "Knuff"
 
-#: lib/nudgeform.php:128
 msgid "Send a nudge to this user"
 msgstr "Send et knuff til denne brukeren"
 
-#: lib/oauthstore.php:294
 msgid "Error inserting new profile."
 msgstr ""
 
-#: lib/oauthstore.php:302
 msgid "Error inserting avatar."
 msgstr ""
 
-#: lib/oauthstore.php:322
 msgid "Error inserting remote profile."
 msgstr ""
 
 #. TRANS: Exception thrown when a notice is denied because it has been sent before.
-#: lib/oauthstore.php:362
 msgid "Duplicate notice."
 msgstr ""
 
-#: lib/oauthstore.php:507
 #, fuzzy
 msgid "Couldn't insert new subscription."
 msgstr "Kunne ikke sette inn bekreftelseskode."
 
-#: lib/personalgroupnav.php:104
-#, fuzzy
 msgid "Replies"
 msgstr "Svar"
 
-#: lib/personalgroupnav.php:109
-#, fuzzy
 msgid "Favorites"
 msgstr "Favoritter"
 
-#: lib/personalgroupnav.php:120
-#, fuzzy
 msgid "Inbox"
 msgstr "Innboks"
 
-#: lib/personalgroupnav.php:121
 msgid "Your incoming messages"
 msgstr "Dine innkommende meldinger"
 
-#: lib/personalgroupnav.php:125
-#, fuzzy
 msgid "Outbox"
 msgstr "Utboks"
 
-#: lib/personalgroupnav.php:126
 msgid "Your sent messages"
 msgstr "Dine sendte meldinger"
 
 #. TRANS: Title for personal tag cloud section. %s is a user nickname.
-#: lib/personaltagcloudsection.php:56
 #, fuzzy, php-format
 msgid "Tags in %s's notices"
 msgstr "Bruker har ingen siste notis"
 
 #. TRANS: Displayed as version information for a plugin if no version information was found.
-#: lib/plugin.php:126
 msgid "Unknown"
 msgstr "Ukjent"
 
 #. TRANS: Plugin admin panel controls
-#: lib/plugindisableform.php:90
 msgctxt "plugin"
 msgid "Disable"
 msgstr ""
 
 #. TRANS: Plugin admin panel controls
-#: lib/pluginenableform.php:112
 msgctxt "plugin"
 msgid "Enable"
 msgstr ""
 
-#: lib/pluginlist.php:196
 msgctxt "plugin-description"
 msgid "(Plugin descriptions unavailable when disabled.)"
 msgstr ""
 
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:88
 msgid "Subscriptions"
 msgstr "Abonnement"
 
 #. TRANS: Text for user subscription statistics if user has more subscriptions than displayed.
-#: lib/profileaction.php:144
 msgid "All subscriptions"
 msgstr "Alle abonnementer"
 
 #. TRANS: H2 text for user subscriber statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:96
 msgid "Subscribers"
 msgstr "Abonnenter"
 
 #. TRANS: Text for user subscription statistics if user has more subscribers than displayed.
-#: lib/profileaction.php:181
 msgid "All subscribers"
 msgstr "Alle abonnenter"
 
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:213
 msgid "User ID"
 msgstr "Bruker-ID"
 
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:219
 msgid "Member since"
 msgstr "Medlem siden"
 
 #. TRANS: Label for user statistics.
 #. TRANS: H2 text for user group membership statistics.
-#: lib/profileaction.php:239 lib/profileaction.php:290
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:104
 msgid "Groups"
 msgstr "Grupper"
 
 #. TRANS: Label for user statistics.
 #. TRANS: Average count of posts made per day since account registration.
-#: lib/profileaction.php:253
 msgid "Daily average"
 msgstr "Daglig gjennomsnitt"
 
 #. TRANS: Text for user group membership statistics if user has more subscriptions than displayed.
-#: lib/profileaction.php:305
 msgid "All groups"
 msgstr "Alle grupper"
 
 #. TRANS: Server error displayed when using an unimplemented method.
-#: lib/profileformaction.php:123
 msgid "Unimplemented method."
 msgstr "Ikke-implementert metode."
 
-#: lib/publicgroupnav.php:82
 msgid "User groups"
 msgstr "Brukergrupper"
 
-#: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
 #, fuzzy
 msgid "Recent tags"
 msgstr "Nyeste Tagger"
 
-#: lib/publicgroupnav.php:88
 #, fuzzy
 msgid "Featured"
 msgstr "Profilerte brukere"
 
-#: lib/publicgroupnav.php:92
 #, fuzzy
 msgid "Popular"
 msgstr "Populære notiser"
 
-#: lib/redirectingaction.php:95
 #, fuzzy
 msgid "No return-to arguments."
 msgstr "Ingen vedlegg."
 
-#: lib/repeatform.php:107
 msgid "Repeat this notice?"
 msgstr "Repeter denne notisen?"
 
-#: lib/repeatform.php:132
 msgid "Yes"
 msgstr "Ja"
 
-#: lib/repeatform.php:132
 msgid "Repeat this notice"
 msgstr "Repeter denne notisen"
 
-#: lib/revokeroleform.php:91
 #, fuzzy, php-format
 msgid "Revoke the \"%s\" role from this user"
 msgstr "Blokker denne brukeren fra denne gruppen"
 
 #. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:1001
 #, fuzzy
 msgid "Page not found."
 msgstr "API-metode ikke funnet!"
 
-#: lib/sandboxform.php:67
 #, fuzzy
 msgid "Sandbox"
 msgstr "Innboks"
 
-#: lib/sandboxform.php:78
 msgid "Sandbox this user"
 msgstr "Opphev blokkering av denne brukeren"
 
 #. TRANS: Fieldset legend for the search form.
-#: lib/searchaction.php:120
 msgid "Search site"
 msgstr "Søk nettsted"
 
 #. TRANS: Used as a field label for the field where one or more keywords
 #. TRANS: for searching can be entered.
-#: lib/searchaction.php:128
 msgid "Keyword(s)"
 msgstr "Nøkkelord"
 
 #. TRANS: Button text for searching site.
-#: lib/searchaction.php:130
 msgctxt "BUTTON"
 msgid "Search"
 msgstr ""
 
-#: lib/searchgroupnav.php:80
 msgid "People"
 msgstr "Personer"
 
-#: lib/searchgroupnav.php:81
 msgid "Find people on this site"
 msgstr "Finn personer på dette nettstedet"
 
-#: lib/searchgroupnav.php:83
 msgid "Find content of notices"
 msgstr "Finn innhold i notiser"
 
-#: lib/searchgroupnav.php:85
 msgid "Find groups on this site"
 msgstr "Finn grupper på dette nettstedet"
 
-#: lib/section.php:89
 #, fuzzy
 msgid "Untitled section"
 msgstr "Side uten tittel"
 
-#: lib/section.php:106
 msgid "More..."
 msgstr "Mer..."
 
-#: lib/settingsnav.php:78
 msgid "Change your profile settings"
 msgstr "Endre profilinnstillingene dine"
 
-#: lib/settingsnav.php:83
 msgid "Upload an avatar"
 msgstr "Last opp en avatar"
 
-#: lib/settingsnav.php:88
 msgid "Change your password"
 msgstr "Endre passordet ditt"
 
-#: lib/settingsnav.php:93
 msgid "Change email handling"
 msgstr "Endre eposthåndtering"
 
-#: lib/settingsnav.php:98
 msgid "Design your profile"
 msgstr "Brukerprofil"
 
-#: lib/settingsnav.php:102
 msgid "URL"
 msgstr "Nettadresse"
 
-#: lib/settingsnav.php:103
 msgid "URL shorteners"
 msgstr ""
 
-#: lib/settingsnav.php:111
 msgid "Updates by instant messenger (IM)"
 msgstr ""
 
-#: lib/settingsnav.php:118
 msgid "Updates by SMS"
 msgstr "Oppdatert med SMS"
 
-#: lib/settingsnav.php:123
-#, fuzzy
 msgid "Connections"
 msgstr "Tilkoblinger"
 
-#: lib/settingsnav.php:124
 #, fuzzy
 msgid "Authorized connected applications"
 msgstr "Tilkoblede program"
 
-#: lib/silenceform.php:67
 #, fuzzy
 msgid "Silence"
 msgstr "Nettstedsnotis"
 
-#: lib/silenceform.php:78
 msgid "Silence this user"
 msgstr "Slett denne brukeren"
 
-#: lib/subgroupnav.php:89
 #, fuzzy, php-format
 msgid "People %s subscribes to"
 msgstr "Fjernabonner"
 
-#: lib/subgroupnav.php:97
 #, php-format
 msgid "People subscribed to %s"
 msgstr "Fjernabonner"
 
-#: lib/subgroupnav.php:105
 #, fuzzy, php-format
 msgid "Groups %s is a member of"
 msgstr "%1$s grupper %2$s er et medlem av."
 
-#: lib/subgroupnav.php:111
 msgid "Invite"
 msgstr "Inviter"
 
-#: lib/subgroupnav.php:112
 #, fuzzy, php-format
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Inviter venner og kollegaer til å bli med deg på %s"
 
-#: lib/subscribeform.php:115 lib/subscribeform.php:139
 msgid "Subscribe to this user"
 msgstr "Abonner på denne brukeren"
 
-#: lib/subscriberspeopleselftagcloudsection.php:48
-#: lib/subscriptionspeopleselftagcloudsection.php:48
 msgid "People Tagcloud as self-tagged"
 msgstr ""
 
-#: lib/subscriberspeopletagcloudsection.php:48
-#: lib/subscriptionspeopletagcloudsection.php:48
 msgid "People Tagcloud as tagged"
 msgstr ""
 
-#: lib/tagcloudsection.php:56
 msgid "None"
 msgstr "Ingen"
 
 #. TRANS: Server exception displayed if a theme name was invalid.
-#: lib/theme.php:74
 #, fuzzy
 msgid "Invalid theme name."
 msgstr "Ugyldig filnavn."
 
-#: lib/themeuploader.php:50
 msgid "This server cannot handle theme uploads without ZIP support."
 msgstr ""
 
-#: lib/themeuploader.php:58 lib/themeuploader.php:61
 msgid "The theme file is missing or the upload failed."
 msgstr ""
 
-#: lib/themeuploader.php:91 lib/themeuploader.php:102
-#: lib/themeuploader.php:279 lib/themeuploader.php:283
-#: lib/themeuploader.php:291 lib/themeuploader.php:298
 #, fuzzy
 msgid "Failed saving theme."
 msgstr "Oppdatering av avatar mislyktes."
 
-#: lib/themeuploader.php:147
 msgid "Invalid theme: bad directory structure."
 msgstr ""
 
-#: lib/themeuploader.php:166
 #, php-format
 msgid "Uploaded theme is too large; must be less than %d byte uncompressed."
 msgid_plural ""
@@ -9583,157 +7936,127 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/themeuploader.php:179
 msgid "Invalid theme archive: missing file css/display.css"
 msgstr ""
 
-#: lib/themeuploader.php:219
 msgid ""
 "Theme contains invalid file or folder name. Stick with ASCII letters, "
 "digits, underscore, and minus sign."
 msgstr ""
 
-#: lib/themeuploader.php:225
 msgid "Theme contains unsafe file extension names; may be unsafe."
 msgstr ""
 
-#: lib/themeuploader.php:242
 #, php-format
 msgid "Theme contains file of type '.%s', which is not allowed."
 msgstr ""
 
-#: lib/themeuploader.php:260
 #, fuzzy
 msgid "Error opening theme archive."
 msgstr "Feil ved oppdatering av fjernprofil."
 
-#: lib/threadednoticelist.php:270
 #, php-format
-msgid "Show all %d comment"
-msgid_plural "Show all %d comments"
+msgid "Show %d reply"
+msgid_plural "Show all %d replies"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/topposterssection.php:74
 msgid "Top posters"
 msgstr ""
 
 #. TRANS: Title for the form to unblock a user.
-#: lib/unblockform.php:67
 #, fuzzy
 msgctxt "TITLE"
 msgid "Unblock"
 msgstr "Opphev blokkering"
 
-#: lib/unsandboxform.php:69
 msgid "Unsandbox"
 msgstr ""
 
-#: lib/unsandboxform.php:80
 msgid "Unsandbox this user"
 msgstr "Opphev blokkering av denne brukeren"
 
-#: lib/unsilenceform.php:67
 msgid "Unsilence"
 msgstr ""
 
-#: lib/unsilenceform.php:78
 msgid "Unsilence this user"
 msgstr "Opphev blokkering av denne brukeren"
 
-#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
 #, fuzzy
 msgid "Unsubscribe from this user"
 msgstr "Abonner på denne brukeren"
 
-#: lib/unsubscribeform.php:137
 #, fuzzy
 msgid "Unsubscribe"
 msgstr "Abonner"
 
 #. 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).
-#: lib/usernoprofileexception.php:60
 #, fuzzy, php-format
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "Brukeren har ingen profil."
 
-#: lib/userprofile.php:116
 #, fuzzy
 msgid "Edit Avatar"
 msgstr "Brukerbilde"
 
 #. TRANS: H2 for user actions in a profile.
 #. TRANS: H2 for entity actions in a profile.
-#: lib/userprofile.php:216 lib/userprofile.php:232
 #, fuzzy
 msgid "User actions"
 msgstr "Gruppehandlinger"
 
 #. TRANS: Text shown in user profile of not yet compeltely deleted users.
-#: lib/userprofile.php:220
 msgid "User deletion in progress..."
 msgstr ""
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:248
 msgid "Edit profile settings"
 msgstr "Endre profilinnstillinger"
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:250
 msgid "Edit"
 msgstr "Rediger"
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:274
 msgid "Send a direct message to this user"
 msgstr "Send en direktemelding til denne brukeren"
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:276
 msgid "Message"
 msgstr "Melding"
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:318
 msgid "Moderate"
 msgstr "Moderer"
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:357
 msgid "User role"
 msgstr "Brukerrolle"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:360
 msgctxt "role"
 msgid "Administrator"
 msgstr "Administrator"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:362
 msgctxt "role"
 msgid "Moderator"
 msgstr "Moderator"
 
-#: lib/util.php:321
 #, fuzzy
 msgid "Not allowed to log in."
 msgstr "Ikke logget inn."
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1337
 msgid "a few seconds ago"
 msgstr "noen få sekunder siden"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1340
 msgid "about a minute ago"
 msgstr "omtrent ett minutt siden"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1344
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
@@ -9741,12 +8064,10 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1347
 msgid "about an hour ago"
 msgstr "omtrent én time siden"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1351
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
@@ -9754,12 +8075,10 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1354
 msgid "about a day ago"
 msgstr "omtrent én dag siden"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1358
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
@@ -9767,12 +8086,10 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1361
 msgid "about a month ago"
 msgstr "omtrent én måned siden"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1365
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
@@ -9780,196 +8097,42 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1368
 msgid "about a year ago"
 msgstr "omtrent ett år siden"
 
 #. TRANS: Web color exception thrown when a hexadecimal color code does not validate.
 #. TRANS: %s is the provided (invalid) color code.
-#: lib/webcolor.php:81 lib/webcolor.php:121
 #, fuzzy, php-format
 msgid "%s is not a valid color! Use 3 or 6 hex characters."
 msgstr "%s er ikke en gyldig farge. Bruk 3 eller 6 heksadesimale tegn."
 
 #. TRANS: Exception.
-#: lib/xrd.php:63
 #, fuzzy
 msgid "Invalid XML."
 msgstr "Ugyldig størrelse"
 
 #. TRANS: Exception.
-#: lib/xrd.php:68
 msgid "Invalid XML, missing XRD root."
 msgstr ""
 
 #. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
-#: scripts/restoreuser.php:62
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
 
-#~ msgid "Could not generate feed for group - %s"
-#~ msgstr "Kunne ikke generere mating for gruppe - %s"
+#~ msgid "Full name is too long (max 255 chars)."
+#~ msgstr "Fullt navn er for langt (maks 255 tegn)."
+
+#~ msgid "description is too long (max %d chars)."
+#~ msgstr "beskrivelse er for lang (maks %d tegn)"
+
+#~ msgid "Location is too long (max 255 chars)."
+#~ msgstr "Plassering er for lang (maks 255 tegn)."
+
+#~ msgid "Too many aliases! Maximum %d."
+#~ msgstr "For mange alias! Maksimum %d."
 
 #, fuzzy
-#~ msgid "Current confirmed Jabber/Google Talk address."
-#~ msgstr "Nåværende bekreftede Jabber/GTak-adresse."
-
-#, fuzzy
-#~ msgid ""
-#~ "Jabber or Google Talk address, like \"UserName@example.org\". First, make "
-#~ "sure to add %s to your buddy list in your IM client or on Google Talk."
-#~ msgstr ""
-#~ "Jabber- og GTalk-adresse, som «brukernavn@example.org». Husk å legge %s "
-#~ "til vennelisten din i direktemeldingsklienten din eller på GTalk."
-
-#, fuzzy
-#~ msgid "Send me notices through Jabber/Google Talk."
-#~ msgstr "Send meg notiser gjennom Jabber/GTalk."
-
-#, fuzzy
-#~ msgid "Publish a MicroID for my Jabber/Google Talk address."
-#~ msgstr "Publiser en MicroID for min Jabber/Gtalk-adresse."
-
-#~ msgid "No Jabber ID."
-#~ msgstr "Ingen Jabber ID."
-
-#, fuzzy
-#~ msgid "Not a valid Jabber ID."
-#~ msgstr "Ugyldig Jabber ID"
-
-#~ msgid "That is already your Jabber ID."
-#~ msgstr "Det er allerede din Jabber ID."
-
-#~ msgid "That is not your Jabber ID."
-#~ msgstr "Det er ikke din Jabber ID."
-
-#~ msgid "Other settings"
-#~ msgstr "Andre innstillinger"
-
-#~ msgid "Tag cloud"
-#~ msgstr "Merkelappsky"
-
-#~ msgid "Consumer key"
-#~ msgstr "Forbrukernøkkel"
-
-#~ msgid "Consumer secret"
-#~ msgstr "Forbrukerhemmelighet"
-
-#, fuzzy
-#~ msgid "Authorize URL"
-#~ msgstr "Forfatter"
-
-#~ msgid "Jabber"
-#~ msgstr "Jabber"
-
-#~ msgid "Photo"
-#~ msgstr "Foto"
-
-#~ msgid "Other options"
-#~ msgstr "Andre valg"
-
-#~ msgid "Other"
-#~ msgstr "Andre"
-
-#, fuzzy
-#~ msgid "Primary site navigation"
-#~ msgstr "Endre nettstedskonfigurasjon"
-
-#~ msgctxt "MENU"
-#~ msgid "Personal"
-#~ msgstr "Personlig"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Change your email, avatar, password, profile"
-#~ msgstr "Endre e-posten, avateren, passordet og profilen din"
-
-#~ msgid "Account"
-#~ msgstr "Konto"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Connect to services"
-#~ msgstr "Koble til tjenester"
-
-#~ msgid "Connect"
-#~ msgstr "Koble til"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Change site configuration"
-#~ msgstr "Endre nettstedskonfigurasjon"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Invite friends and colleagues to join you on %s"
-#~ msgstr "Inviter venner og kollegaer til å bli med deg på %s"
-
-#~ msgctxt "MENU"
-#~ msgid "Invite"
-#~ msgstr "Inviter"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Create an account"
-#~ msgstr "Opprett en konto"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Help me!"
-#~ msgstr "Hjelp meg."
-
-#~ msgctxt "MENU"
-#~ msgid "Help"
-#~ msgstr "Hjelp"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Search for people or text"
-#~ msgstr "Søk etter personer eller tekst"
-
-#~ msgid "Local views"
-#~ msgstr "Lokale visninger"
-
-#~ msgid "Page notice"
-#~ msgstr "Sidenotis"
-
-#~ msgid "StatusNet software license"
-#~ msgstr "Programvarelisens for StatusNet"
-
-#, fuzzy
-#~ msgid "Site content license"
-#~ msgstr "Programvarelisens for StatusNet"
-
-#, fuzzy
-#~ msgid "Pagination"
-#~ msgstr "Registrering"
-
-#~ msgid "Author"
-#~ msgstr "Forfatter"
-
-#~ msgid "Provider"
-#~ msgstr "Leverandør"
-
-#, fuzzy
-#~ msgctxt "MENU"
-#~ msgid "SMS"
-#~ msgstr "SMS"
-
-#, fuzzy
-#~ msgid "Filter tags"
-#~ msgstr "Feed for taggen %s"
-
-#~ msgid "[%s]"
-#~ msgstr "[%s]"
-
-#~ msgid "Available characters"
-#~ msgstr "Tilgjengelige tegn"
-
-#, fuzzy
-#~ msgctxt "MENU"
-#~ msgid "Profile"
-#~ msgstr "Profil"
-
-#~ msgid "Search help"
-#~ msgstr "Søkehjelp"
-
-#, fuzzy
-#~ msgid "Message too long. Maximum is %1$d character, you sent %2$d."
-#~ msgid_plural "Message too long. Maximum is %1$d characters, you sent %2$d."
-#~ msgstr[0] "Melding for lang - maks er %1$d tegn, du sendte %2$d."
-#~ msgstr[1] "Melding for lang - maks er %1$d tegn, du sendte %2$d."
+#~ msgctxt "BUTTON"
+#~ msgid "Comment"
+#~ msgstr "Innhold"
diff --git a/locale/nl/LC_MESSAGES/statusnet.po b/locale/nl/LC_MESSAGES/statusnet.po
index 7744e3175f..90e79433cf 100644
--- a/locale/nl/LC_MESSAGES/statusnet.po
+++ b/locale/nl/LC_MESSAGES/statusnet.po
@@ -12,67 +12,57 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:23+0000\n"
-"PO-Revision-Date: 2011-03-03 17:26:17+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:31+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-02-25 23:49:23+0000\n"
+"X-POT-Import-Date: 2011-03-03 17:59:19+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
-#: actions/accessadminpanel.php:53 lib/adminpanelaction.php:363
 msgid "Access"
 msgstr "Toegang"
 
 #. TRANS: Page notice.
-#: actions/accessadminpanel.php:64
 msgid "Site access settings"
 msgstr "Instellingen voor sitetoegang"
 
 #. TRANS: Form legend for registration form.
-#: actions/accessadminpanel.php:151
 msgid "Registration"
 msgstr "Registratie"
 
 #. TRANS: Checkbox instructions for admin setting "Private".
-#: actions/accessadminpanel.php:155
 msgid "Prohibit anonymous users (not logged in) from viewing site?"
 msgstr "Mogen anonieme gebruikers (niet aangemeld) de website bekijken?"
 
 #. TRANS: Checkbox label for prohibiting anonymous users from viewing site.
-#: actions/accessadminpanel.php:157
 msgctxt "LABEL"
 msgid "Private"
 msgstr "Geen anonieme toegang"
 
 #. TRANS: Checkbox instructions for admin setting "Invite only".
-#: actions/accessadminpanel.php:164
 msgid "Make registration invitation only."
 msgstr "Registratie alleen op uitnodiging."
 
 #. TRANS: Checkbox label for configuring site as invite only.
-#: actions/accessadminpanel.php:166
 msgid "Invite only"
 msgstr "Alleen op uitnodiging"
 
 #. TRANS: Checkbox instructions for admin setting "Closed" (no new registrations).
-#: actions/accessadminpanel.php:173
 msgid "Disable new registrations."
 msgstr "Nieuwe registraties uitschakelen."
 
 #. TRANS: Checkbox label for disabling new user registrations.
-#: actions/accessadminpanel.php:175
 msgid "Closed"
 msgstr "Gesloten"
 
 #. TRANS: Title for button to save access settings in site admin panel.
-#: actions/accessadminpanel.php:191
 msgid "Save access settings"
 msgstr "Toegangsinstellingen opslaan"
 
@@ -80,6 +70,7 @@ msgstr "Toegangsinstellingen opslaan"
 #. TRANS: Button text for saving theme settings.
 #. TRANS: Button label to save e-mail preferences.
 #. TRANS: Button label to save IM preferences.
+#. TRANS: Button text in the license admin panel.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
 #. TRANS: Button text for saving site notice in admin panel.
@@ -89,21 +80,12 @@ msgstr "Toegangsinstellingen opslaan"
 #. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
 #. TRANS: Button text on profile design page to save settings.
-#: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
-#: actions/emailsettings.php:251 actions/imsettings.php:199
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:198
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:204
-#: actions/subscriptions.php:261 actions/urlsettings.php:152
-#: actions/useradminpanel.php:298 lib/applicationeditform.php:355
-#: lib/designform.php:320 lib/groupeditform.php:201
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Opslaan"
 
 #. TRANS: Server error when page not found (404).
 #. TRANS: Server error when page not found (404)
-#: actions/all.php:68 actions/public.php:98 actions/replies.php:93
-#: actions/showfavorites.php:140 actions/tag.php:52
 msgid "No such page."
 msgstr "Deze pagina bestaat niet."
 
@@ -122,6 +104,7 @@ msgstr "Deze pagina bestaat niet."
 #. TRANS: Client error displayed when checking group membership for a non-existing user.
 #. TRANS: Client error displayed when trying to have a non-existing user join a group.
 #. TRANS: Client error displayed when trying to have a non-existing user leave a group.
+#. TRANS: Client error displayed when not providing a user or an invalid user.
 #. TRANS: Client error displayed when updating a status for a non-existing user.
 #. TRANS: Client error displayed when requesting a list of followers for a non-existing user.
 #. TRANS: Client error displayed when requesting most recent favourite notices by a user for a non-existing user.
@@ -134,6 +117,8 @@ msgstr "Deze pagina bestaat niet."
 #. 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.
 #. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
@@ -141,33 +126,10 @@ msgstr "Deze pagina bestaat niet."
 #. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when calling a profile action without specifying a user.
-#: actions/all.php:80 actions/allrss.php:69
-#: actions/apiaccountupdatedeliverydevice.php:110
-#: actions/apiaccountupdateprofile.php:103
-#: actions/apiaccountupdateprofilebackgroundimage.php:118
-#: actions/apiaccountupdateprofileimage.php:104 actions/apiatomservice.php:59
-#: actions/apiblockcreate.php:96 actions/apiblockdestroy.php:94
-#: actions/apidirectmessage.php:75 actions/apidirectmessagenew.php:72
-#: actions/apigroupcreate.php:111 actions/apigroupismember.php:89
-#: actions/apigroupjoin.php:98 actions/apigroupleave.php:98
-#: actions/apigrouplist.php:70 actions/apigroupprofileupdate.php:108
-#: actions/apistatusesupdate.php:230 actions/apisubscriptions.php:85
-#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:173
-#: actions/apitimelinehome.php:78 actions/apitimelinementions.php:77
-#: actions/apitimelineuser.php:79 actions/avatarbynickname.php:79
-#: actions/favoritesrss.php:72 actions/foaf.php:42 actions/foaf.php:61
-#: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116
-#: actions/otp.php:78 actions/remotesubscribe.php:144
-#: actions/remotesubscribe.php:153 actions/replies.php:73
-#: actions/repliesrss.php:38 actions/rsd.php:113 actions/showfavorites.php:106
-#: actions/userbyid.php:75 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/userxrd.php:59 actions/xrds.php:71 lib/command.php:509
-#: lib/galleryaction.php:59 lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Onbekende gebruiker."
 
 #. TRANS: Page title. %1$s is user nickname, %2$d is page number
-#: actions/all.php:91
 #, php-format
 msgid "%1$s and friends, page %2$d"
 msgstr "%1$s en vrienden, pagina %2$d"
@@ -176,33 +138,26 @@ msgstr "%1$s en vrienden, pagina %2$d"
 #. TRANS: H1 text for page. %s is a user nickname.
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Timeline title for user and friends. %s is a user nickname.
-#: actions/all.php:94 actions/all.php:191 actions/allrss.php:117
-#: actions/apitimelinefriends.php:207 actions/apitimelinehome.php:113
-#: lib/personalgroupnav.php:100
 #, php-format
 msgid "%s and friends"
 msgstr "%s en vrienden"
 
 #. TRANS: %s is user nickname.
-#: actions/all.php:108
 #, php-format
 msgid "Feed for friends of %s (RSS 1.0)"
 msgstr "Feed voor vrienden van %s (RSS 1.0)"
 
 #. TRANS: %s is user nickname.
-#: actions/all.php:117
 #, php-format
 msgid "Feed for friends of %s (RSS 2.0)"
 msgstr "Feed voor vrienden van %s (RSS 2.0)"
 
 #. TRANS: %s is user nickname.
-#: actions/all.php:126
 #, php-format
 msgid "Feed for friends of %s (Atom)"
 msgstr "Feed voor vrienden van %s (Atom)"
 
 #. TRANS: Empty list message. %s is a user nickname.
-#: actions/all.php:139
 #, php-format
 msgid ""
 "This is the timeline for %s and friends but no one has posted anything yet."
@@ -212,7 +167,6 @@ msgstr ""
 
 #. TRANS: Encouragement displayed on logged in user's empty timeline.
 #. TRANS: This message contains Markdown links. Keep "](" together.
-#: actions/all.php:146
 #, php-format
 msgid ""
 "Try subscribing to more people, [join a group](%%action.groups%%) or post "
@@ -223,7 +177,6 @@ msgstr ""
 
 #. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@".
 #. TRANS: This message contains Markdown links. Keep "](" together.
-#: actions/all.php:150
 #, php-format
 msgid ""
 "You can try to [nudge %1$s](../%2$s) from their profile or [post something "
@@ -237,7 +190,6 @@ msgstr ""
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
 #. TRANS: Second sentence of empty message for anonymous users. %s is a user nickname.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:221
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -247,14 +199,11 @@ msgstr ""
 "een bericht sturen."
 
 #. TRANS: H1 text for page when viewing a list for self.
-#: actions/all.php:188
 msgid "You and friends"
 msgstr "U en vrienden"
 
 #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
 #. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name.
-#: actions/allrss.php:122 actions/apitimelinefriends.php:213
-#: actions/apitimelinehome.php:119
 #, php-format
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr "Updates van %1$s en vrienden op %2$s."
@@ -273,55 +222,20 @@ msgstr "Updates van %1$s en vrienden op %2$s."
 #. TRANS: Client error displayed trying to execute an unknown API method checking group membership.
 #. TRANS: Client error displayed trying to execute an unknown API method listing the latest 20 groups.
 #. TRANS: Client error displayed trying to execute an unknown API method showing group membership.
+#. TRANS: Client error displayed when using an unsupported API format.
 #. TRANS: Client error displayed trying to execute an unknown API method showing a group.
 #. TRANS: Client error displayed trying to execute an unknown API method testing API connectivity.
 #. TRANS: Client error displayed trying to execute an unknown API method deleting a status.
 #. TRANS: Client error displayed when trying to handle an unknown API method.
-#: actions/apiaccountratelimitstatus.php:69
-#: actions/apiaccountupdatedeliverydevice.php:92
-#: actions/apiaccountupdateprofile.php:94
-#: actions/apiaccountupdateprofilebackgroundimage.php:92
-#: actions/apiaccountupdateprofilecolors.php:115
-#: actions/apiaccountverifycredentials.php:68 actions/apidirectmessage.php:157
-#: actions/apifavoritecreate.php:98 actions/apifavoritedestroy.php:98
-#: actions/apifriendshipscreate.php:99 actions/apifriendshipsdestroy.php:99
-#: actions/apifriendshipsshow.php:124 actions/apigroupcreate.php:138
-#: actions/apigroupismember.php:115 actions/apigroupjoin.php:151
-#: actions/apigroupleave.php:141 actions/apigrouplist.php:134
-#: actions/apigrouplistall.php:120 actions/apigroupmembership.php:105
-#: actions/apigroupprofileupdate.php:100 actions/apigroupprofileupdate.php:213
-#: actions/apigroupshow.php:114 actions/apihelptest.php:84
-#: actions/apistatusesdestroy.php:101 actions/apistatusesretweets.php:110
-#: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:139
-#: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
-#: actions/apitimelinefavorites.php:182 actions/apitimelinefriends.php:276
-#: actions/apitimelinegroup.php:148 actions/apitimelinehome.php:181
-#: actions/apitimelinementions.php:182 actions/apitimelinepublic.php:247
-#: actions/apitimelineretweetedtome.php:147
-#: actions/apitimelineretweetsofme.php:147 actions/apitimelinetag.php:165
-#: actions/apitimelineuser.php:217 actions/apiusershow.php:100
 msgid "API method not found."
 msgstr "De API-functie is niet aangetroffen."
 
 #. 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.
-#: actions/apiaccountupdatedeliverydevice.php:83
-#: actions/apiaccountupdateprofile.php:85
-#: actions/apiaccountupdateprofilebackgroundimage.php:83
-#: actions/apiaccountupdateprofilecolors.php:106
-#: actions/apiaccountupdateprofileimage.php:80 actions/apiblockcreate.php:87
-#: actions/apiblockdestroy.php:85 actions/apidirectmessagenew.php:107
-#: actions/apifavoritecreate.php:88 actions/apifavoritedestroy.php:88
-#: actions/apifriendshipscreate.php:89 actions/apifriendshipsdestroy.php:89
-#: actions/apigroupcreate.php:102 actions/apigroupjoin.php:89
-#: actions/apigroupleave.php:89 actions/apigroupprofileupdate.php:92
-#: actions/apimediaupload.php:66 actions/apistatusesretweet.php:63
-#: actions/apistatusesupdate.php:194
 msgid "This method requires a POST."
 msgstr "Deze methode vereist een POST."
 
 #. TRANS: Client error displayed when no valid device parameter is provided for a user's delivery device setting.
-#: actions/apiaccountupdatedeliverydevice.php:103
 msgid ""
 "You must specify a parameter named 'device' with a value of one of: sms, im, "
 "none."
@@ -336,10 +250,6 @@ msgstr ""
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
-#: actions/apiaccountupdatedeliverydevice.php:136
-#: actions/emailsettings.php:353 actions/emailsettings.php:499
-#: actions/profilesettings.php:323 actions/smssettings.php:300
-#: actions/smssettings.php:453 actions/urlsettings.php:211
 msgid "Could not update user."
 msgstr "Het was niet mogelijk de gebruiker bij te werken."
 
@@ -352,32 +262,17 @@ msgstr "Het was niet mogelijk de gebruiker bij te werken."
 #. TRANS: Server error displayed when requesting Friends of a Friend feed for a user for which the profile could not be found.
 #. TRANS: Server error displayed when trying to get a user hCard for a user without a profile.
 #. TRANS: Server error displayed when calling a profile action while the specified user does not have a profile.
-#: actions/apiaccountupdateprofile.php:111
-#: actions/apiaccountupdateprofilebackgroundimage.php:199
-#: actions/apiaccountupdateprofilecolors.php:183
-#: actions/apiaccountupdateprofileimage.php:131
-#: actions/apiuserprofileimage.php:88 actions/apiusershow.php:108
-#: actions/avatarbynickname.php:85 actions/foaf.php:69 actions/hcard.php:75
-#: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
-#: lib/profileaction.php:85
 msgid "User has no profile."
 msgstr "Deze gebruiker heeft geen profiel."
 
 #. TRANS: Server error displayed if a user profile could not be saved.
 #. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:419
 msgid "Could not save profile."
 msgstr "Het was niet mogelijk het profiel op te slaan."
 
 #. TRANS: Client error displayed when the number of bytes in a POST request exceeds a limit.
 #. TRANS: %s is the number of bytes of the CONTENT_LENGTH.
 #. TRANS: Form validation error in design settings form. POST should remain untranslated.
-#: actions/apiaccountupdateprofilebackgroundimage.php:108
-#: actions/apiaccountupdateprofileimage.php:95 actions/apimediaupload.php:81
-#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
-#: actions/designadminpanel.php:120 actions/editapplication.php:121
-#: actions/newapplication.php:102 actions/newnotice.php:95
-#: lib/designsettings.php:110
 #, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s byte) due to its "
@@ -397,26 +292,15 @@ msgstr[1] ""
 #. TRANS: Client error displayed when a database error occurs inserting profile colours.
 #. TRANS: Client error displayed when a database error occurs updating profile colours.
 #. TRANS: Form validation error displayed when group design settings could not be saved because of an application issue.
-#: actions/apiaccountupdateprofilebackgroundimage.php:138
-#: actions/apiaccountupdateprofilebackgroundimage.php:149
-#: actions/apiaccountupdateprofilecolors.php:160
-#: actions/apiaccountupdateprofilecolors.php:171
-#: actions/groupdesignsettings.php:285 actions/groupdesignsettings.php:296
-#: actions/userdesignsettings.php:218 actions/userdesignsettings.php:228
-#: actions/userdesignsettings.php:270 actions/userdesignsettings.php:280
 msgid "Unable to save your design settings."
 msgstr "Het was niet mogelijk om uw ontwerpinstellingen op te slaan."
 
 #. TRANS: Error displayed when updating design settings fails.
 #. TRANS: Client error displayed when a database error occurs updating profile colours.
-#: actions/apiaccountupdateprofilebackgroundimage.php:191
-#: actions/apiaccountupdateprofilecolors.php:139
-#: actions/userdesignsettings.php:196
 msgid "Could not update your design."
 msgstr "Het was niet mogelijk uw ontwerp bij te werken."
 
 #. TRANS: Title for Atom feed.
-#: actions/apiatomservice.php:85
 msgctxt "ATOM"
 msgid "Main"
 msgstr "Overzicht"
@@ -425,9 +309,6 @@ msgstr "Overzicht"
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Title in atom group notice feed. %s is a group name.
 #. TRANS: Title in atom user notice feed. %s is a user name.
-#: actions/apiatomservice.php:93 actions/grouprss.php:138
-#: actions/userrss.php:94 lib/atomgroupnoticefeed.php:63
-#: lib/atomusernoticefeed.php:88
 #, php-format
 msgid "%s timeline"
 msgstr "%s tijdlijn"
@@ -437,8 +318,6 @@ msgstr "%s tijdlijn"
 #. TRANS: %s is a user nickname.
 #. TRANS: Header for subscriptions overview for a user (first page).
 #. TRANS: %s is a user nickname.
-#: actions/apiatomservice.php:104 actions/atompubsubscriptionfeed.php:148
-#: actions/subscriptions.php:51
 #, php-format
 msgid "%s subscriptions"
 msgstr "Abonnementen van %s"
@@ -446,58 +325,48 @@ msgstr "Abonnementen van %s"
 #. TRANS: Title for Atom feed with a user's favorite notices. %s is a user nickname.
 #. TRANS: Title for Atom favorites feed.
 #. TRANS: %s is a user nickname.
-#: actions/apiatomservice.php:115 actions/atompubfavoritefeed.php:142
 #, php-format
 msgid "%s favorites"
 msgstr "Favorieten van %s"
 
 #. TRANS: Title for Atom feed with a user's memberships. %s is a user nickname.
-#: actions/apiatomservice.php:126
 #, php-format
 msgid "%s memberships"
 msgstr "Lidmaatschappen van %s"
 
 #. TRANS: Client error displayed when users try to block themselves.
-#: actions/apiblockcreate.php:105
 msgid "You cannot block yourself!"
 msgstr "U kunt zichzelf niet blokkeren!"
 
 #. TRANS: Server error displayed when blocking a user has failed.
-#: actions/apiblockcreate.php:127
 msgid "Block user failed."
 msgstr "Het blokkeren van de gebruiker is mislukt."
 
 #. TRANS: Server error displayed when unblocking a user has failed.
-#: actions/apiblockdestroy.php:113
 msgid "Unblock user failed."
 msgstr "Het deblokkeren van de gebruiker is mislukt."
 
 #. TRANS: Title. %s is a user nickname.
-#: actions/apidirectmessage.php:88
 #, php-format
 msgid "Direct messages from %s"
 msgstr "Privéberichten van %s"
 
 #. TRANS: Subtitle. %s is a user nickname.
-#: actions/apidirectmessage.php:93
 #, php-format
 msgid "All the direct messages sent from %s"
 msgstr "Alle privéberichten van %s"
 
 #. TRANS: Title. %s is a user nickname.
-#: actions/apidirectmessage.php:102
 #, php-format
 msgid "Direct messages to %s"
 msgstr "Privéberichten aan %s"
 
 #. TRANS: Subtitle. %s is a user nickname.
-#: actions/apidirectmessage.php:107
 #, php-format
 msgid "All the direct messages sent to %s"
 msgstr "Alle privéberichten aan %s"
 
 #. TRANS: Client error displayed when no message text was submitted (406).
-#: actions/apidirectmessagenew.php:117
 msgid "No message text!"
 msgstr "Het bericht is leeg!"
 
@@ -505,7 +374,6 @@ msgstr "Het bericht is leeg!"
 #. TRANS: %d is the maximum number of characters for a message.
 #. TRANS: Form validation error displayed when message content is too long.
 #. TRANS: %d is the maximum number of characters for a message.
-#: actions/apidirectmessagenew.php:127 actions/newmessage.php:152
 #, php-format
 msgid "That's too long. Maximum message size is %d character."
 msgid_plural "That's too long. Maximum message size is %d characters."
@@ -513,19 +381,16 @@ msgstr[0] "Dat is te lang. De maximale berichtlengte is %d teken."
 msgstr[1] "Dat is te lang. De maximale berichtlengte is %d tekens."
 
 #. TRANS: Client error displayed if a recipient user could not be found (403).
-#: actions/apidirectmessagenew.php:139
 msgid "Recipient user not found."
 msgstr "De ontvanger is niet aangetroffen."
 
 #. TRANS: Client error displayed trying to direct message another user who's not a friend (403).
-#: actions/apidirectmessagenew.php:144
 msgid "Cannot send direct messages to users who aren't your friend."
 msgstr ""
 "U kunt geen privéberichten sturen aan gebruikers die niet op uw "
 "vriendenlijst staan."
 
 #. TRANS: Client error displayed trying to direct message self (403).
-#: actions/apidirectmessagenew.php:154
 msgid ""
 "Do not send a message to yourself; just say it to yourself quietly instead."
 msgstr "Stuur geen berichten naar uzelf. Zeg het gewoon in uw hoofd."
@@ -533,120 +398,100 @@ msgstr "Stuur geen berichten naar uzelf. Zeg het gewoon in uw hoofd."
 #. 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.
 #. TRANS: Client error displayed trying to delete a status with an invalid ID.
-#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:108
-#: actions/apistatusesdestroy.php:121
 msgid "No status found with that ID."
 msgstr "Er is geen status gevonden met dit ID."
 
 #. TRANS: Client error displayed when trying to mark a notice favourite that already is a favourite.
-#: actions/apifavoritecreate.php:120
 msgid "This status is already a favorite."
 msgstr "Deze mededeling staat al in uw favorietenlijst."
 
 #. TRANS: Client error displayed when marking a notice as favourite fails.
 #. TRANS: Server error displayed when trying to mark a notice as favorite fails in the database.
 #. TRANS: Error message text shown when a favorite could not be set.
-#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:306
 msgid "Could not create favorite."
 msgstr "Het was niet mogelijk een favoriet aan te maken."
 
 #. TRANS: Client error displayed when trying to remove a favourite that was not a favourite.
-#: actions/apifavoritedestroy.php:122
 msgid "That status is not a favorite."
 msgstr "Deze mededeling staat niet in uw favorietenlijst."
 
 #. TRANS: Client error displayed when removing a favourite has failed.
 #. TRANS: Server error displayed when removing a favorite from the database fails.
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:90
 msgid "Could not delete favorite."
 msgstr ""
 "Het was niet mogelijk deze mededeling van uw favorietenlijst te verwijderen."
 
 #. TRANS: Client error displayed when trying follow who's profile could not be found.
-#: actions/apifriendshipscreate.php:109
 msgid "Could not follow user: profile not found."
 msgstr "U kunt deze gebruiker niet volgen, omdat deze niet bestaat."
 
 #. TRANS: Client error displayed when trying to follow a user that's already being followed.
 #. TRANS: %s is the nickname of the user that is already being followed.
-#: actions/apifriendshipscreate.php:120
 #, php-format
 msgid "Could not follow user: %s is already on your list."
 msgstr "U kunt de gebruiker %s niet volgen, omdat deze al op uw lijst staat."
 
 #. TRANS: Client error displayed when trying to unfollow a user that cannot be found.
-#: actions/apifriendshipsdestroy.php:109
 msgid "Could not unfollow user: User not found."
 msgstr ""
 "Het is niet mogelijk deze gebruiker niet langer te volgen: de gebruiker is "
 "niet aangetroffen."
 
 #. TRANS: Client error displayed when trying to unfollow self.
-#: actions/apifriendshipsdestroy.php:121
 msgid "You cannot unfollow yourself."
 msgstr "U kunt het abonnement op uzelf niet opzeggen."
 
 #. TRANS: Client error displayed when supplying invalid parameters to an API call checking if a friendship exists.
-#: actions/apifriendshipsexists.php:88
 msgid "Two valid IDs or nick names must be supplied."
 msgstr "Er moeten twee ID's of gebruikersnamen opgegeven worden."
 
 #. TRANS: Client error displayed when a source user could not be determined showing friendship.
-#: actions/apifriendshipsshow.php:131
 msgid "Could not determine source user."
 msgstr "Het was niet mogelijk de brongebruiker te bepalen."
 
 #. TRANS: Client error displayed when a target user could not be determined showing friendship.
-#: actions/apifriendshipsshow.php:140
 msgid "Could not find target user."
 msgstr "Het was niet mogelijk de doelgebruiker te vinden."
 
 #. TRANS: Client error trying to create a group with a nickname this is already in use.
+#. TRANS: API validation exception thrown when nickname is already used.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:156 actions/apigroupprofileupdate.php:255
-#: actions/editgroup.php:191 actions/newgroup.php:137
-#: actions/profilesettings.php:274 actions/register.php:199
 msgid "Nickname already in use. Try another one."
 msgstr ""
 "De opgegeven gebruikersnaam is al in gebruik. Kies een andere gebruikersnaam."
 
 #. TRANS: Client error in form for group creation.
+#. TRANS: API validation exception thrown when nickname does not validate.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:164 actions/apigroupprofileupdate.php:259
-#: actions/editgroup.php:195 actions/newgroup.php:141
-#: actions/profilesettings.php:244 actions/register.php:201
 msgid "Not a valid nickname."
 msgstr "Ongeldige gebruikersnaam!"
 
 #. TRANS: Client error in form for group creation.
+#. TRANS: API validation exception thrown when homepage URL does not validate.
 #. TRANS: Validation error shown when providing an invalid homepage URL in the "Edit application" form.
 #. TRANS: Group edit form validation error.
 #. TRANS: Validation error shown when providing an invalid homepage URL in the "New application" form.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:181 actions/apigroupprofileupdate.php:277
-#: actions/editapplication.php:235 actions/editgroup.php:202
-#: actions/newapplication.php:221 actions/newgroup.php:148
-#: actions/profilesettings.php:249 actions/register.php:208
 msgid "Homepage is not a valid URL."
 msgstr "De thuispagina is geen geldige URL."
 
 #. TRANS: Client error in form for group creation.
+#. TRANS: API validation exception thrown when full name does not validate.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:191 actions/editgroup.php:206
-#: actions/newgroup.php:152 actions/profilesettings.php:253
-#: actions/register.php:211
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "De volledige naam is te lang (maximaal 255 tekens)."
 
 #. TRANS: Client error shown when providing too long a description during group creation.
 #. TRANS: %d is the maximum number of allowed characters.
+#. TRANS: API validation exception thrown when description does not validate.
+#. TRANS: %d is the maximum description length and used for plural.
 #. TRANS: Validation error shown when providing too long a description in the "Edit application" form.
 #. TRANS: %d is the maximum number of allowed characters.
 #. TRANS: Group edit form validation error.
@@ -654,9 +499,6 @@ msgstr "De volledige naam is te lang (maximaal 255 tekens)."
 #. TRANS: %d is the maximum number of characters for the description.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed characters.
-#: actions/apigroupcreate.php:201 actions/editapplication.php:202
-#: actions/editgroup.php:211 actions/newapplication.php:182
-#: actions/newgroup.php:157
 #, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."
@@ -664,23 +506,21 @@ msgstr[0] "De beschrijving is te lang (maximaal %d teken)."
 msgstr[1] "De beschrijving is te lang (maximaal %d tekens)."
 
 #. TRANS: Client error shown when providing too long a location during group creation.
+#. TRANS: API validation exception thrown when location does not validate.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:215 actions/editgroup.php:218
-#: actions/newgroup.php:164 actions/profilesettings.php:266
-#: actions/register.php:220
 msgid "Location is too long (maximum 255 characters)."
 msgstr "De locatie is te lang (maximaal 255 tekens)."
 
 #. TRANS: Client error shown when providing too many aliases during group creation.
 #. TRANS: %d is the maximum number of allowed aliases.
+#. TRANS: API validation exception thrown when aliases do not validate.
+#. TRANS: %d is the maximum number of aliases and used for plural.
 #. TRANS: Group edit form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.
-#: actions/apigroupcreate.php:236 actions/editgroup.php:231
-#: actions/newgroup.php:177
 #, php-format
 msgid "Too many aliases! Maximum %d allowed."
 msgid_plural "Too many aliases! Maximum %d allowed."
@@ -689,25 +529,24 @@ msgstr[1] "Te veel aliassen! Het maximale aantal is %d."
 
 #. TRANS: Client error shown when providing an invalid alias during group creation.
 #. TRANS: %s is the invalid alias.
-#: actions/apigroupcreate.php:253
+#. TRANS: API validation exception thrown when aliases does not validate.
+#. TRANS: %s is the invalid alias.
 #, php-format
 msgid "Invalid alias: \"%s\"."
 msgstr "Ongeldige alias: \"%s\"."
 
 #. TRANS: Client error displayed when trying to use an alias during group creation that is already in use.
 #. TRANS: %s is the alias that is already in use.
+#. TRANS: API validation exception thrown when aliases is already used.
+#. TRANS: %s is the already used alias.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error. %s is the already used alias.
-#: actions/apigroupcreate.php:264 actions/apigroupprofileupdate.php:351
-#: actions/editgroup.php:246 actions/newgroup.php:193
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "De alias \"%s\" wordt al gebruikt. Geef een andere alias op."
 
 #. TRANS: Client error displayed when trying to use an alias during group creation that is the same as the group's nickname.
 #. TRANS: Group edit form validation error.
-#: actions/apigroupcreate.php:278 actions/apigroupprofileupdate.php:359
-#: actions/editgroup.php:253
 msgid "Alias can't be the same as nickname."
 msgstr "Een alias kan niet hetzelfde zijn als de gebruikersnaam."
 
@@ -715,26 +554,21 @@ msgstr "Een alias kan niet hetzelfde zijn als de gebruikersnaam."
 #. TRANS: Client error displayed when trying to join a group that does not exist.
 #. TRANS: Client error displayed when trying to leave a group that does not exist.
 #. TRANS: Client error displayed trying to show group membership on a non-existing group.
+#. TRANS: Client error displayed when not providing a group or an invalid group.
 #. TRANS: Client error displayed when trying to show a group that could not be found.
 #. TRANS: Client error displayed requesting most recent notices to a group for a non-existing group.
-#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
-#: actions/apigroupleave.php:104 actions/apigroupmembership.php:71
-#: actions/apigroupprofileupdate.php:113 actions/apigroupshow.php:81
-#: actions/apitimelinegroup.php:89
 msgid "Group not found."
 msgstr "De groep is niet aangetroffen."
 
 #. TRANS: Server error displayed when trying to join a group the user is already a member of.
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:345
 msgid "You are already a member of that group."
 msgstr "U bent al lid van die groep."
 
 #. TRANS: Server error displayed when trying to join a group the user is blocked from joining.
 #. 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.
-#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:350
 msgid "You have been blocked from that group by the admin."
 msgstr "Een beheerder heeft ingesteld dat u geen lid mag worden van die groep."
 
@@ -742,13 +576,11 @@ msgstr "Een beheerder heeft ingesteld dat u geen lid mag worden van die groep."
 #. TRANS: %1$s is the joining user's nickname, $2$s is the group nickname for which the join failed.
 #. TRANS: Message given having failed to add a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:136 actions/joingroup.php:139 lib/command.php:362
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "Het was niet mogelijk gebruiker %1$s toe te voegen aan de groep %2$s."
 
 #. TRANS: Server error displayed when trying to leave a group the user is not a member of.
-#: actions/apigroupleave.php:115
 msgid "You are not a member of this group."
 msgstr "U bent geen lid van deze groep."
 
@@ -756,116 +588,78 @@ msgstr "U bent geen lid van deze groep."
 #. TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
 #. TRANS: Message given having failed to remove a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupleave.php:127 actions/leavegroup.php:133
-#: lib/command.php:410
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
 msgstr "Het was niet mogelijk gebruiker %1$s uit de groep %2$s te verwijderen."
 
 #. TRANS: Used as title in check for group membership. %s is a user name.
-#: actions/apigrouplist.php:94
 #, php-format
 msgid "%s's groups"
 msgstr "Groepen van %s"
 
 #. TRANS: Used as subtitle in check for group membership. %1$s is a user name, %2$s is the site name.
-#: actions/apigrouplist.php:104
 #, php-format
 msgid "%1$s groups %2$s is a member of."
 msgstr "Groepen op de site %1$s waar %2$s lid van is."
 
 #. TRANS: Message is used as a title when listing the lastest 20 groups. %s is a site name.
 #. TRANS: Message is used as a page title. %s is a nick name.
-#: actions/apigrouplistall.php:88 actions/usergroups.php:63
 #, php-format
 msgid "%s groups"
 msgstr "%s groepen"
 
 #. TRANS: Message is used as a subtitle when listing the lastest 20 groups. %s is a site name.
-#: actions/apigrouplistall.php:93
 #, php-format
 msgid "groups on %s"
 msgstr "groepen op %s"
 
+#. TRANS: Client error displayed when trying to edit a group without being an admin.
 #. TRANS: Client error displayed trying to edit a group while not being a group admin.
 #. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
 #. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
-#: actions/apigroupprofileupdate.php:118 actions/editgroup.php:110
-#: actions/editgroup.php:176 actions/groupdesignsettings.php:109
-#: actions/grouplogo.php:111
 msgid "You must be an admin to edit the group."
 msgstr "U moet beheerder zijn om de groep te kunnen bewerken."
 
+#. TRANS: Server error displayed when group update fails.
 #. TRANS: Server error displayed when editing a group fails.
-#: actions/apigroupprofileupdate.php:171 actions/editgroup.php:274
 msgid "Could not update group."
 msgstr "Het was niet mogelijk de groep bij te werken."
 
+#. TRANS: Server error displayed when adding group aliases fails.
 #. TRANS: Server error displayed when group aliases could not be added.
 #. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/apigroupprofileupdate.php:194 actions/editgroup.php:281
-#: classes/User_group.php:540
 msgid "Could not create aliases."
 msgstr "Het was niet mogelijk de aliassen aan te maken."
 
+#. TRANS: API validation exception thrown when nickname does not validate.
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: actions/apigroupprofileupdate.php:249 lib/nickname.php:165
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr ""
 "De gebruikersnaam mag alleen kleine letters en cijfers bevatten. Spaties "
 "zijn niet toegestaan."
 
-#: actions/apigroupprofileupdate.php:286
-#, fuzzy
-msgid "Full name is too long (max 255 chars)."
-msgstr "De volledige naam is te lang (maximaal 255 tekens)."
-
-#: actions/apigroupprofileupdate.php:296
-#, fuzzy, php-format
-msgid "description is too long (max %d chars)."
-msgstr "De beschrijving is te lang (maximaal %d teken)."
-
-#: actions/apigroupprofileupdate.php:307
-#, fuzzy
-msgid "Location is too long (max 255 chars)."
-msgstr "De locatie is te lang (maximaal 255 tekens)."
-
-#: actions/apigroupprofileupdate.php:326
-#, fuzzy, php-format
-msgid "Too many aliases! Maximum %d."
-msgstr "Te veel aliassen! Het maximale aantal is %d."
-
-#. TRANS: Group edit form validation error.
+#. TRANS: API validation exception thrown when alias is the same as nickname.
 #. TRANS: Group create form validation error.
-#. TRANS: %s is the invalid alias.
-#: actions/apigroupprofileupdate.php:342 actions/editgroup.php:241
-#: actions/newgroup.php:188
-#, php-format
-msgid "Invalid alias: \"%s\""
-msgstr "Ongeldige alias: \"%s\""
+msgid "Alias cannot be the same as nickname."
+msgstr "Een alias kan niet hetzelfde zijn als de gebruikersnaam."
 
 #. TRANS: Client error displayed when uploading a media file has failed.
-#: actions/apimediaupload.php:101
 msgid "Upload failed."
 msgstr "Uploaden is mislukt."
 
 #. TRANS: Client error given from the OAuth API when the request token or verifier is invalid.
-#: actions/apioauthaccesstoken.php:102
 msgid "Invalid request token or verifier."
 msgstr "Het opgegeven token of controlegetal is ongeldig."
 
 #. TRANS: Client error given when no oauth_token was passed to the OAuth API.
-#: actions/apioauthauthorize.php:107
 msgid "No oauth_token parameter provided."
 msgstr "Er is geen parameter oauth_token opgegeven."
 
 #. TRANS: Client error given when an invalid request token was passed to the OAuth API.
-#: actions/apioauthauthorize.php:115 actions/apioauthauthorize.php:129
 msgid "Invalid request token."
 msgstr "Ongeldig verzoektoken."
 
 #. TRANS: Client error given when an invalid request token was passed to the OAuth API.
-#: actions/apioauthauthorize.php:121
 msgid "Request token already authorized."
 msgstr "Het verzoektoken is al geautoriseerd."
 
@@ -875,33 +669,16 @@ msgstr "Het verzoektoken is al geautoriseerd."
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
 #. TRANS: Client error displayed when the session token is not okay.
-#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:75
-#: actions/emailsettings.php:292 actions/favor.php:75 actions/geocode.php:55
-#: actions/groupblock.php:65 actions/grouplogo.php:321
-#: actions/groupunblock.php:65 actions/imsettings.php:241
-#: actions/invite.php:60 actions/makeadmin.php:66 actions/newmessage.php:135
-#: actions/newnotice.php:105 actions/nudge.php:80
-#: actions/oauthappssettings.php:162 actions/oauthconnectionssettings.php:135
-#: actions/passwordsettings.php:137 actions/pluginenable.php:87
-#: actions/profilesettings.php:218 actions/recoverpassword.php:383
-#: actions/register.php:157 actions/remotesubscribe.php:76
-#: actions/repeat.php:82 actions/smssettings.php:249 actions/subedit.php:40
-#: actions/subscribe.php:87 actions/tagother.php:145
-#: actions/unsubscribe.php:69 actions/urlsettings.php:171
-#: actions/userauthorization.php:53 lib/designsettings.php:122
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 "Er is een probleem ontstaan met uw sessie. Probeer het nog een keer, "
 "alstublieft."
 
 #. TRANS: Form validation error given when an invalid username and/or password was passed to the OAuth API.
-#: actions/apioauthauthorize.php:168
 msgid "Invalid nickname / password!"
 msgstr "Ongeldige gebruikersnaam of wachtwoord."
 
 #. TRANS: Server error displayed when a database action fails.
-#: actions/apioauthauthorize.php:217
 msgid "Database error inserting oauth_token_association."
 msgstr ""
 "Er is een databasefout opgetreden tijdens het invoegen van de "
@@ -919,28 +696,19 @@ msgstr ""
 #. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
 #. TRANS: Message given submitting a form with an unknown action in SMS settings.
 #. TRANS: Unknown form validation error in design settings form.
-#: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
-#: actions/designadminpanel.php:100 actions/editapplication.php:144
-#: actions/emailsettings.php:311 actions/grouplogo.php:332
-#: actions/imsettings.php:256 actions/newapplication.php:124
-#: actions/oauthconnectionssettings.php:144 actions/recoverpassword.php:46
-#: actions/smssettings.php:270 lib/designsettings.php:133
 msgid "Unexpected form submission."
 msgstr "Het formulier is onverwacht ingezonden."
 
 #. TRANS: Title for a page where a user can confirm/deny account access by an external application.
-#: actions/apioauthauthorize.php:387
 msgid "An application would like to connect to your account"
 msgstr "Een applicatie vraagt toegang tot uw gebruikersgegevens"
 
 #. TRANS: Fieldset legend.
-#: actions/apioauthauthorize.php:404
 msgid "Allow or deny access"
 msgstr "Toegang toestaan of ontzeggen"
 
 #. TRANS: User notification of external application requesting account access.
 #. TRANS: %3$s is the access type requested (read-write or read-only), %4$s is the StatusNet sitename.
-#: actions/apioauthauthorize.php:425
 #, php-format
 msgid ""
 "An application would like the ability to <strong>%3$s</strong> your %4$s "
@@ -954,7 +722,6 @@ msgstr ""
 #. TRANS: User notification of external application requesting account access.
 #. TRANS: %1$s is the application name requesting access, %2$s is the organisation behind the application,
 #. TRANS: %3$s is the access type requested, %4$s is the StatusNet sitename.
-#: actions/apioauthauthorize.php:433
 #, php-format
 msgid ""
 "The application <strong>%1$s</strong> by <strong>%2$s</strong> would like "
@@ -966,22 +733,18 @@ msgstr ""
 "toegang tot uw gebruiker bij %4$s aan derde partijen die u vertrouwt."
 
 #. TRANS: Fieldset legend.
-#: actions/apioauthauthorize.php:455
 msgctxt "LEGEND"
 msgid "Account"
 msgstr "Gebruikersgegevens"
 
 #. TRANS: Field label on OAuth API authorisation form.
+#. TRANS: Field label on login page.
 #. TRANS: Field label in form for profile settings.
-#: actions/apioauthauthorize.php:459 actions/login.php:225
-#: actions/profilesettings.php:107 actions/register.php:411
-#: actions/userauthorization.php:145 lib/groupeditform.php:145
 msgid "Nickname"
 msgstr "Gebruikersnaam"
 
 #. TRANS: Field label on OAuth API authorisation form.
-#: actions/apioauthauthorize.php:463 actions/login.php:228
-#: actions/register.php:415 lib/settingsnav.php:87
+#. TRANS: Field label on login page.
 msgid "Password"
 msgstr "Wachtwoord"
 
@@ -991,43 +754,34 @@ msgstr "Wachtwoord"
 #. TRANS: Button label to cancel an IM address confirmation procedure.
 #. TRANS: Button label to cancel a SMS address confirmation procedure.
 #. TRANS: Button label in the "Edit application" form.
-#: actions/apioauthauthorize.php:478 actions/emailsettings.php:125
-#: actions/imsettings.php:136 actions/smssettings.php:132
-#: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Cancel"
 msgstr "Annuleren"
 
 #. TRANS: Button text that when clicked will allow access to an account by an external application.
-#: actions/apioauthauthorize.php:485
 msgctxt "BUTTON"
 msgid "Allow"
 msgstr "Toestaan"
 
 #. TRANS: Form instructions.
-#: actions/apioauthauthorize.php:502
 msgid "Authorize access to your account information."
 msgstr "Toegang tot uw gebruikersgegevens geven."
 
 #. TRANS: Header for user notification after revoking OAuth access to an application.
-#: actions/apioauthauthorize.php:594
 msgid "Authorization canceled."
 msgstr "Autorisatie geannuleerd."
 
 #. TRANS: User notification after revoking OAuth access to an application.
 #. TRANS: %s is an OAuth token.
-#: actions/apioauthauthorize.php:598
 #, php-format
 msgid "The request token %s has been revoked."
 msgstr "Het verzoektoken %s is ingetrokken."
 
 #. TRANS: Title of the page notifying the user that an anonymous client application was successfully authorized to access the user's account with OAuth.
-#: actions/apioauthauthorize.php:621
 msgid "You have successfully authorized the application"
 msgstr "U hebt de applicatie toegang gegeven"
 
 #. TRANS: Message notifying the user that an anonymous client application was successfully authorized to access the user's account with OAuth.
-#: actions/apioauthauthorize.php:625
 msgid ""
 "Please return to the application and enter the following security code to "
 "complete the process."
@@ -1037,14 +791,12 @@ msgstr ""
 
 #. TRANS: Title of the page notifying the user that the client application was successfully authorized to access the user's account with OAuth.
 #. TRANS: %s is the authorised application name.
-#: actions/apioauthauthorize.php:632
 #, php-format
 msgid "You have successfully authorized %s"
 msgstr "U hebt %s toegang gegeven"
 
 #. TRANS: Message notifying the user that the client application was successfully authorized to access the user's account with OAuth.
 #. TRANS: %s is the authorised application name.
-#: actions/apioauthauthorize.php:639
 #, php-format
 msgid ""
 "Please return to %s and enter the following security code to complete the "
@@ -1055,12 +807,10 @@ msgstr ""
 
 #. TRANS: Client error displayed trying to delete a status not using POST or DELETE.
 #. TRANS: POST and DELETE should not be translated.
-#: actions/apistatusesdestroy.php:111
 msgid "This method requires a POST or DELETE."
 msgstr "Deze methode vereist een POST of DELETE."
 
 #. TRANS: Client error displayed trying to delete a status of another user.
-#: actions/apistatusesdestroy.php:136
 msgid "You may not delete another user's status."
 msgstr "U kunt de status van een andere gebruiker niet verwijderen."
 
@@ -1068,21 +818,16 @@ msgstr "U kunt de status van een andere gebruiker niet verwijderen."
 #. TRANS: Client error displayed trying to display redents of a non-exiting notice.
 #. TRANS: Client exception thrown when referencing a non-existing notice.
 #. TRANS: Error message displayed trying to delete a non-existing notice.
-#: actions/apistatusesretweet.php:74 actions/apistatusesretweets.php:70
-#: actions/atompubshowfavorite.php:82 actions/deletenotice.php:61
-#: actions/shownotice.php:92
 msgid "No such notice."
 msgstr "De mededeling bestaat niet."
 
 #. TRANS: Client error displayed trying to repeat an own notice through the API.
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:549
 msgid "Cannot repeat your own notice."
 msgstr "U kunt uw eigen mededeling niet herhalen."
 
 #. TRANS: Client error displayed trying to re-repeat a notice through the API.
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:92 lib/command.php:555
 msgid "Already repeated that notice."
 msgstr "U hebt die mededeling al herhaald."
 
@@ -1092,57 +837,43 @@ msgstr "U hebt die mededeling al herhaald."
 #. TRANS: Client exception thrown when using an unsupported HTTP method.
 #. TRANS: Client error shown when using a non-supported HTTP method.
 #. TRANS: Client exception thrown when using an unsupported HTTP method.
-#: actions/apistatusesshow.php:118 actions/atompubfavoritefeed.php:103
-#: actions/atompubmembershipfeed.php:105 actions/atompubshowfavorite.php:117
-#: actions/atompubshowmembership.php:116
-#: actions/atompubshowsubscription.php:122
-#: actions/atompubsubscriptionfeed.php:109
 msgid "HTTP method not supported."
 msgstr "HTTP-methode wordt niet ondersteund."
 
 #. TRANS: Exception thrown requesting an unsupported notice output format.
 #. TRANS: %s is the requested output format.
-#: actions/apistatusesshow.php:144
 #, php-format
 msgid "Unsupported format: %s."
 msgstr "Niet-ondersteund formaat: %s."
 
 #. TRANS: Client error displayed requesting a deleted status.
-#: actions/apistatusesshow.php:155
 msgid "Status deleted."
 msgstr "De status is verwijderd."
 
 #. TRANS: Client error displayed requesting a status with an invalid ID.
-#: actions/apistatusesshow.php:162
 msgid "No status with that ID found."
 msgstr "Er is geen status gevonden met dit ID."
 
 #. TRANS: Client error displayed when trying to delete a notice not using the Atom format.
-#: actions/apistatusesshow.php:227
 msgid "Can only delete using the Atom format."
 msgstr "Het is alleen mogelijk te verwijderen via de Atomopmaak."
 
 #. TRANS: Client error displayed when a user has no rights to delete notices of other users.
 #. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
-#: actions/apistatusesshow.php:235 actions/deletenotice.php:78
 msgid "Cannot delete this notice."
 msgstr "Deze mededeling kan niet verwijderd worden."
 
 #. TRANS: Confirmation of notice deletion in API. %d is the ID (number) of the deleted notice.
-#: actions/apistatusesshow.php:249
 #, php-format
 msgid "Deleted notice %d"
 msgstr "Mededeling %d is verwijderd"
 
 #. TRANS: Client error displayed when the parameter "status" is missing.
-#: actions/apistatusesupdate.php:221
 msgid "Client must provide a 'status' parameter with a value."
 msgstr "De client moet een parameter \"status\" met een waarde opgeven."
 
 #. TRANS: Client error displayed when the parameter "status" is missing.
 #. TRANS: %d is the maximum number of character for a notice.
-#: actions/apistatusesupdate.php:244 actions/newnotice.php:161
-#: lib/mailhandler.php:60
 #, php-format
 msgid "That's too long. Maximum notice size is %d character."
 msgid_plural "That's too long. Maximum notice size is %d characters."
@@ -1150,13 +881,11 @@ msgstr[0] "De mededeling is te lang. Gebruik maximaal %d teken."
 msgstr[1] "De mededeling is te lang. Gebruik maximaal %d tekens."
 
 #. TRANS: Client error displayed when replying to a non-existing notice.
-#: actions/apistatusesupdate.php:284
 msgid "Parent notice not found."
 msgstr "De bovenliggende mededeling is niet aangetroffen."
 
 #. TRANS: Client error displayed exceeding the maximum notice length.
 #. TRANS: %d is the maximum lenth for a notice.
-#: actions/apistatusesupdate.php:308 actions/newnotice.php:184
 #, php-format
 msgid "Maximum notice size is %d character, including attachment URL."
 msgid_plural "Maximum notice size is %d characters, including attachment URL."
@@ -1168,13 +897,11 @@ msgstr[1] ""
 
 #. TRANS: Client error displayed when requesting profiles of followers in an unsupported format.
 #. TRANS: Client error displayed when requesting IDs of followers in an unsupported format.
-#: actions/apisubscriptions.php:228 actions/apisubscriptions.php:258
 msgid "Unsupported format."
 msgstr "Niet-ondersteund bestandsformaat."
 
 #. TRANS: Title for timeline of most recent favourite notices by a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname.
-#: actions/apitimelinefavorites.php:108
 #, php-format
 msgid "%1$s / Favorites from %2$s"
 msgstr "%1$s / Favorieten van %2$s"
@@ -1182,7 +909,6 @@ msgstr "%1$s / Favorieten van %2$s"
 #. TRANS: Subtitle for timeline of most recent favourite notices by a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user's full name,
 #. TRANS: %3$s is a user nickname.
-#: actions/apitimelinefavorites.php:120
 #, php-format
 msgid "%1$s updates favorited by %2$s / %3$s."
 msgstr ""
@@ -1191,7 +917,6 @@ msgstr ""
 
 #. TRANS: Title for timeline of most recent mentions of a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname.
-#: actions/apitimelinementions.php:115
 #, php-format
 msgid "%1$s / Updates mentioning %2$s"
 msgstr "%1$s / Updates over %2$s"
@@ -1199,224 +924,183 @@ msgstr "%1$s / Updates over %2$s"
 #. TRANS: Subtitle for timeline of most recent mentions of a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname,
 #. TRANS: %3$s is a user's full name.
-#: actions/apitimelinementions.php:131
 #, php-format
 msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr "%1$s updates die een reactie zijn op updates van %2$s / %3$s."
 
 #. TRANS: Title for site timeline. %s is the StatusNet sitename.
 #. TRANS: Public RSS feed title. %s is the StatusNet site name.
-#: actions/apitimelinepublic.php:193 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "%s publieke tijdlijn"
 
 #. TRANS: Subtitle for site timeline. %s is the StatusNet sitename.
-#: actions/apitimelinepublic.php:199
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "%s updates van iedereen"
 
 #. TRANS: Server error displayed calling unimplemented API method for 'retweeted by me'.
-#: actions/apitimelineretweetedbyme.php:71
 msgid "Unimplemented."
 msgstr "Niet geïmplementeerd."
 
 #. TRANS: Title for Atom feed "repeated to me". %s is the user nickname.
-#: actions/apitimelineretweetedtome.php:96
 #, php-format
 msgid "Repeated to %s"
 msgstr "Herhaald naar %s"
 
-#: actions/apitimelineretweetedtome.php:98
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s notices that were to repeated to %2$s / %3$s."
-msgstr "%1$s updates die een reactie zijn op updates van %2$s / %3$s."
+msgstr "Mededelingen van %1$s die zijn herhaald naar %2$s / %3$s."
 
 #. TRANS: Title of list of repeated notices of the logged in user.
 #. TRANS: %s is the nickname of the logged in user.
-#: actions/apitimelineretweetsofme.php:98
 #, php-format
 msgid "Repeats of %s"
 msgstr "Herhaald van %s"
 
-#: actions/apitimelineretweetsofme.php:104
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s notices that %2$s / %3$s has repeated."
-msgstr "%1$s heeft de mededeling %2$s als favoriet gemarkeerd."
+msgstr "Mededelingen van %1$s die %2$s / %3$s heeft herhaald."
 
 #. TRANS: Title for timeline with lastest notices with a given tag.
 #. TRANS: %s is the tag.
 #. TRANS: Title for first page of notices with tags.
 #. TRANS: %s is the tag.
-#: actions/apitimelinetag.php:101 actions/tag.php:69
 #, php-format
 msgid "Notices tagged with %s"
 msgstr "Mededelingen met het label %s"
 
 #. TRANS: Subtitle for timeline with lastest notices with a given tag.
 #. TRANS: %1$s is the tag, $2$s is the StatusNet sitename.
-#: actions/apitimelinetag.php:105 actions/tagrss.php:65
 #, php-format
 msgid "Updates tagged with %1$s on %2$s!"
 msgstr "Updates met het label %1$s op %2$s!"
 
 #. TRANS: Client error displayed trying to add a notice to another user's timeline.
-#: actions/apitimelineuser.php:308
 msgid "Only the user can add to their own timeline."
 msgstr "Gebruikers kunnen alleen zelf aan hun eigen tijdlijn toevoegen."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:315
 msgid "Only accept AtomPub for Atom feeds."
 msgstr "Alleen AtomPub voor Atomfeeds accepteren."
 
 #. TRANS: Client error displayed attempting to post an empty API notice.
-#: actions/apitimelineuser.php:322
 msgid "Atom post must not be empty."
 msgstr "Het Atombericht mag niet leeg zijn."
 
 #. TRANS: Client error displayed attempting to post an API that is not well-formed XML.
-#: actions/apitimelineuser.php:328
 msgid "Atom post must be well-formed XML."
 msgstr "Het Atombericht moet correct opgemaakte XML zijn."
 
 #. TRANS: Client error displayed when not using an Atom entry.
-#: actions/apitimelineuser.php:334 actions/atompubfavoritefeed.php:228
-#: actions/atompubmembershipfeed.php:230
-#: actions/atompubsubscriptionfeed.php:236
 msgid "Atom post must be an Atom entry."
 msgstr "Het Atombericht moet een Atomopmaak hebben."
 
 #. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
-#: actions/apitimelineuser.php:345
 msgid "Can only handle POST activities."
 msgstr "Het is alleen mogelijk om POST-activiteiten af te handelen."
 
 #. TRANS: Client error displayed when using an unsupported activity object type.
 #. TRANS: %s is the unsupported activity object type.
-#: actions/apitimelineuser.php:356
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr "Het is niet mogelijk om het activiteitobjecttype \"%s\" te verwerken."
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
 #. TRANS: %d is the notice ID (number).
-#: actions/apitimelineuser.php:390
 #, php-format
 msgid "No content for notice %d."
 msgstr "Geen inhoud voor mededeling %d."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
 #. TRANS: %s is the notice URI.
-#: actions/apitimelineuser.php:419
 #, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "De mededeling met URI \"%s\" bestaat al."
 
 #. TRANS: Server error for unfinished API method showTrends.
-#: actions/apitrends.php:85
 msgid "API method under construction."
 msgstr "De API-functie is in bewerking."
 
 #. TRANS: Client error displayed when requesting user information for a non-existing user.
-#: actions/apiuserprofileimage.php:80 actions/apiusershow.php:94
 msgid "User not found."
 msgstr "De pagina is niet aangetroffen."
 
 #. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
 #. TRANS: Client exception.
 #. TRANS: Client error displayed trying to subscribe to a non-existing profile.
-#: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
-#: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
-#: actions/subscribe.php:110
 msgid "No such profile."
 msgstr "Het profiel bestaat niet."
 
 #. TRANS: Subtitle for Atom favorites feed.
 #. TRANS: %1$s is a user nickname, %2$s is the StatusNet sitename.
-#: actions/atompubfavoritefeed.php:147
 #, php-format
 msgid "Notices %1$s has favorited on %2$s"
 msgstr "Mededelingen die %1$s op %2$s op de favorietenlijst heeft geplaatst"
 
 #. TRANS: Client exception thrown when trying to set a favorite for another user.
 #. TRANS: Client exception thrown when trying to subscribe another user.
-#: actions/atompubfavoritefeed.php:217 actions/atompubsubscriptionfeed.php:225
 msgid "Cannot add someone else's subscription."
 msgstr "Het is niet mogelijk het abonnement voor iemand anders toe te voegen"
 
 #. TRANS: Client exception thrown when trying use an incorrect activity verb for the Atom pub method.
-#: actions/atompubfavoritefeed.php:240
 msgid "Can only handle favorite activities."
 msgstr ""
 "Het is alleen mogelijk om activiteiten met betrekking tot favorieten af te "
 "handelen."
 
 #. TRANS: Client exception thrown when trying favorite an object that is not a notice.
-#: actions/atompubfavoritefeed.php:250 actions/atompubmembershipfeed.php:250
 msgid "Can only fave notices."
 msgstr "Het is alleen mogelijk om mededelingen als favoriet aan te merken."
 
 #. TRANS: Client exception thrown when trying favorite a notice without content.
-#: actions/atompubfavoritefeed.php:259
 msgid "Unknown note."
 msgstr "Onbekend mededeling."
 
 #. TRANS: Client exception thrown when trying favorite an already favorited notice.
-#: actions/atompubfavoritefeed.php:267
 msgid "Already a favorite."
 msgstr "Deze mededeling is al een favoriet."
 
 #. TRANS: Title for group membership feed.
 #. TRANS: %s is a username.
-#: actions/atompubmembershipfeed.php:144
 #, php-format
 msgid "%s group memberships"
 msgstr "groepslidmaatschappen van %s"
 
 #. TRANS: Subtitle for group membership feed.
 #. TRANS: %1$s is a username, %2$s is the StatusNet sitename.
-#: actions/atompubmembershipfeed.php:149
 #, php-format
 msgid "Groups %1$s is a member of on %2$s"
 msgstr "Groepen waar %1$s lid van is op %2$s"
 
 #. TRANS: Client exception thrown when trying subscribe someone else to a group.
-#: actions/atompubmembershipfeed.php:219
 msgid "Cannot add someone else's membership."
 msgstr "Het is niet mogelijk om een lidmaatschap van een ander toe te voegen."
 
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#: actions/atompubmembershipfeed.php:242
 msgid "Can only handle join activities."
 msgstr ""
 "Het is alleen mogelijk om activiteiten met betrekking tot lidmaatschap af te "
 "handelen."
 
 #. TRANS: Client exception thrown when trying to subscribe to a non-existing group.
-#: actions/atompubmembershipfeed.php:259
 msgid "Unknown group."
 msgstr "Onbekende groep."
 
 #. TRANS: Client exception thrown when trying to subscribe to an already subscribed group.
-#: actions/atompubmembershipfeed.php:267
 msgid "Already a member."
 msgstr "U bent al lid."
 
 #. TRANS: Client exception thrown when trying to subscribe to group while blocked from that group.
-#: actions/atompubmembershipfeed.php:275
 msgid "Blocked by admin."
 msgstr "Geblokkeerd door een beheerder."
 
 #. TRANS: Client exception thrown when referencing a non-existing favorite.
-#: actions/atompubshowfavorite.php:90
 msgid "No such favorite."
 msgstr "De favoriet bestaat niet."
 
 #. TRANS: Client exception thrown when trying to remove a favorite notice of another user.
-#: actions/atompubshowfavorite.php:151
 msgid "Cannot delete someone else's favorite."
 msgstr "Het is niet mogelijk om een favoriet van een ander te verwijderen."
 
@@ -1442,93 +1126,68 @@ msgstr "Het is niet mogelijk om een favoriet van een ander te verwijderen."
 #. TRANS: Client error displayed when trying to join a non-existing group.
 #. TRANS: Client error displayed when trying to leave a non-local group.
 #. TRANS: Client error displayed when trying to leave a non-existing group.
+#. TRANS: Client error displayed when providing an invalid group ID on the Make Admin page.
 #. 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.
 #. TRANS: Command exception text shown when a group is requested that does not exist.
 #. TRANS: Error text shown when trying to leave a group that does not exist.
-#: actions/atompubshowmembership.php:81 actions/blockedfromgroup.php:81
-#: actions/blockedfromgroup.php:89 actions/deletegroup.php:87
-#: actions/deletegroup.php:100 actions/editgroup.php:102
-#: actions/foafgroup.php:46 actions/foafgroup.php:65 actions/foafgroup.php:73
-#: actions/groupblock.php:89 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:101 actions/grouplogo.php:103
-#: actions/groupmembers.php:84 actions/groupmembers.php:92
-#: actions/grouprss.php:97 actions/grouprss.php:105
-#: actions/groupunblock.php:89 actions/joingroup.php:82
-#: actions/joingroup.php:95 actions/leavegroup.php:82
-#: actions/leavegroup.php:95 actions/makeadmin.php:86
-#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:392
 msgid "No such group."
 msgstr "De opgegeven groep bestaat niet."
 
 #. TRANS: Client exception thrown when trying to show membership of a non-subscribed group
-#: actions/atompubshowmembership.php:91
 msgid "Not a member."
 msgstr "Geen lid."
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
-#: actions/atompubshowmembership.php:150
 msgid "Cannot delete someone else's membership."
 msgstr "Het is niet mogelijk om een lidmaatschap van een ander te verwijderen."
 
 #. TRANS: Client exception thrown when trying to display a subscription for a non-existing profile ID.
 #. TRANS: %d is the non-existing profile ID number.
-#: actions/atompubshowsubscription.php:72
-#: actions/atompubshowsubscription.php:83
-#: actions/atompubsubscriptionfeed.php:74
 #, php-format
 msgid "No such profile id: %d."
 msgstr "Het profielnummer bestaat niet: %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.
-#: actions/atompubshowsubscription.php:94
 #, php-format
 msgid "Profile %1$d not subscribed to profile %2$d."
 msgstr "Profiel %1$d is niet geabonneerd op profiel %2$d."
 
 #. TRANS: Client exception thrown when trying to delete a subscription of another user.
-#: actions/atompubshowsubscription.php:157
 msgid "Cannot delete someone else's subscription."
 msgstr ""
 "Het is niet mogelijk het abonnement van een andere gebruiker op te zeggen."
 
 #. TRANS: Subtitle for Atom subscription feed.
 #. TRANS: %1$s is a user nickname, %s$s is the StatusNet sitename.
-#: actions/atompubsubscriptionfeed.php:153
 #, php-format
 msgid "People %1$s has subscribed to on %2$s"
 msgstr "Gebruikers die %1$s volgen op %2$s"
 
 #. TRANS: Client error displayed when not using the follow verb.
-#: actions/atompubsubscriptionfeed.php:248
 msgid "Can only handle Follow activities."
 msgstr ""
 "Het is alleen mogelijk om activiteiten met betrekking tot volgen af te "
 "handelen."
 
 #. TRANS: Client exception thrown when subscribing to an object that is not a person.
-#: actions/atompubsubscriptionfeed.php:256
 msgid "Can only follow people."
 msgstr "Het is alleen mogelijk om mensen te volgen."
 
 #. TRANS: Client exception thrown when subscribing to a non-existing profile.
 #. TRANS: %s is the unknown profile ID.
-#: actions/atompubsubscriptionfeed.php:267
 #, php-format
 msgid "Unknown profile %s."
 msgstr "Onbekend profiel %s."
 
 #. TRANS: Client error displayed trying to subscribe to an already subscribed profile.
 #. TRANS: %s is the profile the user already has a subscription on.
-#: actions/atompubsubscriptionfeed.php:275
 #, php-format
 msgid "Already subscribed to %s."
 msgstr "U bent al geabonneerd op %s."
 
 #. TRANS: Client error displayed trying to get a non-existing attachment.
-#: actions/attachment.php:73
 msgid "No such attachment."
 msgstr "Deze bijlage bestaat niet."
 
@@ -1540,31 +1199,23 @@ msgstr "Deze bijlage bestaat niet."
 #. TRANS: Client error displayed when trying to view group members without providing a group nickname.
 #. TRANS: Client error displayed when requesting a group RSS feed without providing a group nickname.
 #. TRANS: Client error displayed if no nickname argument was given requesting a group page.
-#: actions/avatarbynickname.php:60 actions/blockedfromgroup.php:73
-#: actions/editgroup.php:85 actions/groupdesignsettings.php:84
-#: actions/grouplogo.php:86 actions/groupmembers.php:76
-#: actions/grouprss.php:89 actions/showgroup.php:116
 msgid "No nickname."
 msgstr "Geen gebruikersnaam."
 
 #. TRANS: Client error displayed trying to get an avatar without providing an avatar size.
-#: actions/avatarbynickname.php:66
 msgid "No size."
 msgstr "Geen afmeting."
 
 #. TRANS: Client error displayed trying to get an avatar providing an invalid avatar size.
-#: actions/avatarbynickname.php:72
 msgid "Invalid size."
 msgstr "Ongeldige afmetingen."
 
 #. TRANS: Title for avatar upload page.
-#: actions/avatarsettings.php:66 lib/settingsnav.php:82
 msgid "Avatar"
 msgstr "Avatar"
 
 #. TRANS: Instruction for avatar upload page.
 #. TRANS: %s is the maximum file size, for example "500b", "10kB" or "2MB".
-#: actions/avatarsettings.php:78
 #, php-format
 msgid "You can upload your personal avatar. The maximum file size is %s."
 msgstr ""
@@ -1574,17 +1225,12 @@ msgstr ""
 #. TRANS: Server error displayed coming across a request from a user without a profile.
 #. TRANS: Server error displayed when trying to authorise a remote subscription request
 #. TRANS: while the user has no profile.
-#: actions/avatarsettings.php:108 actions/avatarsettings.php:192
-#: actions/grouplogo.php:184 actions/remotesubscribe.php:190
-#: actions/userauthorization.php:75 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr "Gebruiker zonder bijbehorend profiel."
 
 #. TRANS: Avatar upload page form legend.
 #. TRANS: Avatar upload page crop form legend.
 #. TRANS: Legend for group logo settings fieldset.
-#: actions/avatarsettings.php:122 actions/avatarsettings.php:205
-#: actions/grouplogo.php:261
 msgid "Avatar settings"
 msgstr "Avatarinstellingen"
 
@@ -1592,8 +1238,6 @@ msgstr "Avatarinstellingen"
 #. TRANS: Header on avatar upload crop form for thumbnail of originally uploaded avatar (h2).
 #. TRANS: Uploaded original file in group logo form.
 #. TRANS: Header for originally uploaded file before a crop on the group logo page.
-#: actions/avatarsettings.php:131 actions/avatarsettings.php:214
-#: actions/grouplogo.php:207 actions/grouplogo.php:270
 msgid "Original"
 msgstr "Origineel"
 
@@ -1601,81 +1245,66 @@ msgstr "Origineel"
 #. TRANS: Header on avatar upload crop form for thumbnail of to be used rendition of uploaded avatar (h2).
 #. TRANS: Header for preview of to be displayed group logo.
 #. TRANS: Header for the cropped group logo on the group logo page.
-#: actions/avatarsettings.php:147 actions/avatarsettings.php:227
-#: actions/grouplogo.php:219 actions/grouplogo.php:283
 msgid "Preview"
 msgstr "Voorvertoning"
 
 #. TRANS: Button on avatar upload page to delete current avatar.
 #. TRANS: Button text for user account deletion.
-#: actions/avatarsettings.php:155 actions/deleteaccount.php:319
 msgctxt "BUTTON"
 msgid "Delete"
 msgstr "Verwijderen"
 
 #. TRANS: Button on avatar upload page to upload an avatar.
 #. TRANS: Submit button to confirm upload of a user backup file for account restore.
-#: actions/avatarsettings.php:173 actions/restoreaccount.php:369
 msgctxt "BUTTON"
 msgid "Upload"
 msgstr "Uploaden"
 
 #. TRANS: Button on avatar upload crop form to confirm a selected crop as avatar.
-#: actions/avatarsettings.php:243
 msgctxt "BUTTON"
 msgid "Crop"
 msgstr "Uitsnijden"
 
 #. TRANS: Validation error on avatar upload form when no file was uploaded.
-#: actions/avatarsettings.php:318
 msgid "No file uploaded."
 msgstr "Er is geen bestand geüpload."
 
 #. TRANS: Avatar upload form instruction after uploading a file.
-#: actions/avatarsettings.php:345
 msgid "Pick a square area of the image to be your avatar."
 msgstr ""
 "Selecteer een vierkant in de afbeelding om deze als uw avatar in te stellen."
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
 #. TRANS: Server error displayed trying to crop an uploaded group logo that is no longer present.
-#: actions/avatarsettings.php:360 actions/grouplogo.php:391
 msgid "Lost our file data."
 msgstr "Ons bestand is verloren gegaan."
 
 #. TRANS: Success message for having updated a user avatar.
-#: actions/avatarsettings.php:384
 msgid "Avatar updated."
 msgstr "De avatar is bijgewerkt."
 
 #. TRANS: Error displayed on the avatar upload page if the avatar could not be updated for an unknown reason.
-#: actions/avatarsettings.php:388
 msgid "Failed updating avatar."
 msgstr "Het bijwerken van de avatar is mislukt."
 
 #. TRANS: Success message for deleting a user avatar.
-#: actions/avatarsettings.php:412
 msgid "Avatar deleted."
 msgstr "De avatar is verwijderd."
 
 #. TRANS: Title for backup account page.
 #. TRANS: Option in profile settings to create a backup of the account of the currently logged in user.
-#: actions/backupaccount.php:61 actions/profilesettings.php:468
 msgid "Backup account"
 msgstr "Reservekopie van gebruiker maken"
 
 #. TRANS: Client exception thrown when trying to backup an account while not logged in.
-#: actions/backupaccount.php:79
 msgid "Only logged-in users can backup their account."
 msgstr "Alleen aangemelde gebruikers kunnen hun gebruiker back-uppen."
 
 #. TRANS: Client exception thrown when trying to backup an account without having backup rights.
-#: actions/backupaccount.php:84
 msgid "You may not backup your account."
 msgstr "U kunt geen back-up van uw gebruiker maken."
 
 #. TRANS: Information displayed on the backup account page.
-#: actions/backupaccount.php:227
 msgid ""
 "You can backup your account data in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format. This is an experimental feature and provides "
@@ -1690,30 +1319,25 @@ msgstr ""
 "meegenomen. Hetzelfde geldt voor geüploade bestanden en directe berichten."
 
 #. TRANS: Submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:250
 msgctxt "BUTTON"
 msgid "Backup"
 msgstr "Reservekopie"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:254
 msgid "Backup your account."
 msgstr "Uw gebruiker back-uppen."
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
-#: actions/block.php:68
 msgid "You already blocked that user."
 msgstr "U hebt deze gebruiker reeds geblokkeerd."
 
 #. TRANS: Title for block user page.
 #. TRANS: Legend for block user form.
 #. TRANS: Fieldset legend for block user from group form.
-#: actions/block.php:106 actions/block.php:136 actions/groupblock.php:165
 msgid "Block user"
 msgstr "Gebruiker blokkeren"
 
 #. TRANS: Explanation of consequences when blocking a user on the block user page.
-#: actions/block.php:139
 msgid ""
 "Are you sure you want to block this user? Afterwards, they will be "
 "unsubscribed from you, unable to subscribe to you in the future, and you "
@@ -1729,15 +1353,11 @@ msgstr ""
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:154 actions/deleteapplication.php:157
-#: actions/deletegroup.php:220 actions/deletenotice.php:155
-#: actions/deleteuser.php:154 actions/groupblock.php:187
 msgctxt "BUTTON"
 msgid "No"
 msgstr "Nee"
 
 #. TRANS: Submit button title for 'No' when blocking a user.
-#: actions/block.php:158
 msgid "Do not block this user."
 msgstr "Deze gebruiker niet blokkeren."
 
@@ -1747,174 +1367,137 @@ msgstr "Deze gebruiker niet blokkeren."
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:161 actions/deleteapplication.php:164
-#: actions/deletegroup.php:227 actions/deletenotice.php:162
-#: actions/deleteuser.php:161 actions/groupblock.php:194
 msgctxt "BUTTON"
 msgid "Yes"
 msgstr "Ja"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:165
 msgid "Block this user."
 msgstr "Deze gebruiker blokkeren."
 
 #. TRANS: Server error displayed when blocking a user fails.
-#: actions/block.php:189
 msgid "Failed to save block information."
 msgstr "Het was niet mogelijk om de blokkadeinformatie op te slaan."
 
 #. TRANS: Title for first page with list of users blocked from a group.
 #. TRANS: %s is a group nickname.
-#: actions/blockedfromgroup.php:101
 #, php-format
 msgid "%s blocked profiles"
 msgstr "Geblokkeerde profielen voor %s"
 
 #. TRANS: Title for any but the first page with list of users blocked from a group.
 #. TRANS: %1$s is a group nickname, %2$d is a page number.
-#: actions/blockedfromgroup.php:106
 #, php-format
 msgid "%1$s blocked profiles, page %2$d"
 msgstr "Geblokkeerde profielen voor %1$s, pagina %2$d"
 
 #. TRANS: Instructions for list of users blocked from a group.
-#: actions/blockedfromgroup.php:122
 msgid "A list of the users blocked from joining this group."
 msgstr "Een lijst met voor deze groep geblokkeerde gebruikers."
 
 #. TRANS: Form legend for unblocking a user from a group.
-#: actions/blockedfromgroup.php:291
 msgid "Unblock user from group"
 msgstr "Deze gebruiker weer toegang geven tot de groep"
 
 #. TRANS: Button text for unblocking a user from a group.
-#: actions/blockedfromgroup.php:323
 msgctxt "BUTTON"
 msgid "Unblock"
 msgstr "Deblokkeren"
 
 #. TRANS: Tooltip for button for unblocking a user from a group.
 #. TRANS: Description of the form to unblock a user.
-#: actions/blockedfromgroup.php:327 lib/unblockform.php:78
 msgid "Unblock this user"
 msgstr "Deblokkeer deze gebruiker."
 
 #. TRANS: Title for mini-posting window loaded from bookmarklet.
 #. TRANS: %s is the StatusNet site name.
-#: actions/bookmarklet.php:51
 #, php-format
 msgid "Post to %s"
 msgstr "Verzenden naar %s"
 
 #. TRANS: Client error displayed when not providing a confirmation code in the contact address confirmation action.
-#: actions/confirmaddress.php:74
 msgid "No confirmation code."
 msgstr "Geen bevestigingscode."
 
 #. TRANS: Client error displayed when providing a non-existing confirmation code in the contact address confirmation action.
-#: actions/confirmaddress.php:80
 msgid "Confirmation code not found."
 msgstr "De bevestigingscode niet gevonden."
 
 #. TRANS: Client error displayed when not providing a confirmation code for another user in the contact address confirmation action.
-#: actions/confirmaddress.php:86
 msgid "That confirmation code is not for you!"
 msgstr "Dit is niet uw bevestigingscode!"
 
 #. TRANS: Server error for an unknown address type, which can be 'email', 'sms', or the name of an IM network (such as 'xmpp' or 'aim')
-#: actions/confirmaddress.php:94
-#, fuzzy, php-format
+#, php-format
 msgid "Unrecognized address type %s"
-msgstr "Onbekend adrestype %s."
+msgstr "Onbekend adrestype %s"
 
 #. TRANS: Client error for an already confirmed email/jabber/sms address.
-#: actions/confirmaddress.php:103 actions/confirmaddress.php:136
 msgid "That address has already been confirmed."
 msgstr "Dit adres is al bevestigd."
 
-#: actions/confirmaddress.php:121 actions/imsettings.php:444
-#: actions/userdesignsettings.php:306
-#, fuzzy
 msgid "Couldn't update user."
-msgstr "Het was niet mogelijk de gebruiker bij te werken."
+msgstr "De gebruiker kon gebruiker niet bijwerkt worden."
 
-#: actions/confirmaddress.php:144
-#, fuzzy
 msgid "Couldn't update user im preferences."
-msgstr "Kan de gebruikersgegevens niet vernieuwen."
+msgstr ""
+"Het was niet mogelijk de IM-instellingen van de gebruiker bij te werken."
 
-#: actions/confirmaddress.php:156
-#, fuzzy
 msgid "Couldn't insert user im preferences."
-msgstr "Kon nieuw abonnement niet toevoegen."
+msgstr "Het was niet mogelijk de IM-instelingen voor de gebruiker op te slaan."
 
 #. TRANS: Server error displayed when an address confirmation code deletion from the
 #. TRANS: database fails in the contact address confirmation action.
-#: actions/confirmaddress.php:169
 msgid "Could not delete address confirmation."
 msgstr "De adresbevestiging kon niet verwijderd worden."
 
 #. TRANS: Title for the contact address confirmation action.
-#: actions/confirmaddress.php:185
 msgid "Confirm address"
 msgstr "Adres bevestigen"
 
 #. TRANS: Success message for the contact address confirmation action.
 #. TRANS: %s can be 'email', 'jabber', or 'sms'.
-#: actions/confirmaddress.php:200
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "Het adres \"%s\" is voor uw gebruiker bevestigd."
 
 #. TRANS: Title for page with a conversion (multiple notices in context).
-#: actions/conversation.php:96
 msgid "Conversation"
 msgstr "Dialoog"
 
 #. TRANS: Header on conversation page. Hidden by default (h2).
 #. TRANS: Label for user statistics.
-#: actions/conversation.php:149 lib/noticelist.php:87
-#: lib/profileaction.php:246 lib/searchgroupnav.php:82
-#: lib/threadednoticelist.php:66
 msgid "Notices"
 msgstr "Mededelingen"
 
 #. TRANS: Client exception displayed trying to delete a user account while not logged in.
-#: actions/deleteaccount.php:71
 msgid "Only logged-in users can delete their account."
 msgstr "Alleen aangemelde gebruikers kunnen hun gebruiker verwijderen."
 
 #. TRANS: Client exception displayed trying to delete a user account without have the rights to do that.
-#: actions/deleteaccount.php:77
 msgid "You cannot delete your account."
 msgstr "U kunt uw gebruiker niet verwijderen."
 
 #. TRANS: Confirmation text for user deletion. The user has to type this exactly the same, including punctuation.
-#: actions/deleteaccount.php:160 actions/deleteaccount.php:297
 msgid "I am sure."
 msgstr "Ik weet het zeker."
 
 #. TRANS: Notification for user about the text that must be input to be able to delete a user account.
 #. TRANS: %s is the text that needs to be input.
-#: actions/deleteaccount.php:164
 #, php-format
 msgid "You must write \"%s\" exactly in the box."
 msgstr "U moet de tekst \"%s\" precies in het veld overnemen."
 
 #. TRANS: Confirmation that a user account has been deleted.
-#: actions/deleteaccount.php:206
 msgid "Account deleted."
 msgstr "De gebruiker is verwijderd."
 
 #. TRANS: Page title for page on which a user account can be deleted.
 #. TRANS: Option in profile settings to delete the account of the currently logged in user.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:476
 msgid "Delete account"
 msgstr "Gebruiker verwijderen"
 
 #. TRANS: Form text for user deletion form.
-#: actions/deleteaccount.php:279
 msgid ""
 "This will <strong>permanently delete</strong> your account data from this "
 "server."
@@ -1924,7 +1507,6 @@ msgstr ""
 
 #. TRANS: Additional form text for user deletion form shown if a user has account backup rights.
 #. TRANS: %s is a URL to the backup page.
-#: actions/deleteaccount.php:285
 #, php-format
 msgid ""
 "You are strongly advised to <a href=\"%s\">back up your data</a> before "
@@ -1935,14 +1517,11 @@ msgstr ""
 
 #. TRANS: Field label for delete account confirmation entry.
 #. TRANS: Field label for password reset form where the password has to be typed again.
-#: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:262 actions/register.php:419
 msgid "Confirm"
 msgstr "Bevestigen"
 
 #. TRANS: Input title for the delete account field.
 #. TRANS: %s is the text that needs to be input.
-#: actions/deleteaccount.php:304
 #, php-format
 msgid "Enter \"%s\" to confirm that you want to delete your account."
 msgstr ""
@@ -1950,42 +1529,32 @@ msgstr ""
 "verwijderen: \"%s\"."
 
 #. TRANS: Button title for user account deletion.
-#: actions/deleteaccount.php:323
 msgid "Permanently delete your account"
 msgstr "Uw gebruiker permanent verwijderen"
 
 #. TRANS: Client error displayed trying to delete an application while not logged in.
-#: actions/deleteapplication.php:62
 msgid "You must be logged in to delete an application."
 msgstr "U moet aangemeld zijn om een applicatie te kunnen verwijderen."
 
 #. TRANS: Client error displayed trying to delete an application that does not exist.
-#: actions/deleteapplication.php:71
 msgid "Application not found."
 msgstr "De applicatie is niet gevonden."
 
 #. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
-#: actions/deleteapplication.php:79 actions/editapplication.php:78
-#: actions/showapplication.php:90
 msgid "You are not the owner of this application."
 msgstr "U bent niet de eigenaar van deze applicatie."
 
 #. TRANS: Client error text when there is a problem with the session token.
-#: actions/deleteapplication.php:102 actions/editapplication.php:131
-#: actions/newapplication.php:112 actions/showapplication.php:113
-#: lib/action.php:1391
 msgid "There was a problem with your session token."
 msgstr "Er is een probleem met uw sessietoken."
 
 #. TRANS: Title for delete application page.
 #. TRANS: Fieldset legend on delete application page.
-#: actions/deleteapplication.php:124 actions/deleteapplication.php:149
 msgid "Delete application"
 msgstr "Applicatie verwijderen"
 
 #. TRANS: Confirmation text on delete application page.
-#: actions/deleteapplication.php:152
 msgid ""
 "Are you sure you want to delete this application? This will clear all data "
 "about the application from the database, including all existing user "
@@ -1996,55 +1565,45 @@ msgstr ""
 "inclusief alle bestaande gebruikersverbindingen."
 
 #. TRANS: Submit button title for 'No' when deleting an application.
-#: actions/deleteapplication.php:161
 msgid "Do not delete this application."
 msgstr "Deze applicatie niet verwijderen."
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
-#: actions/deleteapplication.php:167
 msgid "Delete this application."
 msgstr "Deze applicatie verwijderen."
 
 #. TRANS: Client error when trying to delete group while not logged in.
-#: actions/deletegroup.php:64
 msgid "You must be logged in to delete a group."
 msgstr "U moet aangemeld zijn om een groep te kunnen verwijderen."
 
 #. TRANS: Client error when trying to delete a group without providing a nickname or ID for the group.
 #. TRANS: Client error displayed when trying to join a group without providing a group name or group ID.
 #. TRANS: Client error displayed when trying to leave a group without providing a group name or group ID.
-#: actions/deletegroup.php:94 actions/joingroup.php:89
-#: actions/leavegroup.php:89
 msgid "No nickname or ID."
 msgstr "Geen gebruikersnaam of ID."
 
 #. TRANS: Client error when trying to delete a group without having the rights to delete it.
-#: actions/deletegroup.php:107
 msgid "You are not allowed to delete this group."
 msgstr "U mag deze groep niet verwijderen."
 
 #. TRANS: Server error displayed if a group could not be deleted.
 #. TRANS: %s is the name of the group that could not be deleted.
-#: actions/deletegroup.php:150
 #, php-format
 msgid "Could not delete group %s."
 msgstr "Het was niet mogelijk de groep %s te verwijderen."
 
 #. TRANS: Message given after deleting a group.
 #. TRANS: %s is the deleted group's name.
-#: actions/deletegroup.php:159
 #, php-format
 msgid "Deleted group %s"
 msgstr "De groep %s is verwijderd."
 
 #. TRANS: Title of delete group page.
 #. TRANS: Form legend for deleting a group.
-#: actions/deletegroup.php:176 actions/deletegroup.php:202
 msgid "Delete group"
 msgstr "Groep verwijderen"
 
 #. TRANS: Warning in form for deleleting a group.
-#: actions/deletegroup.php:206
 msgid ""
 "Are you sure you want to delete this group? This will clear all data about "
 "the group from the database, without a backup. Public posts to this group "
@@ -2056,12 +1615,10 @@ msgstr ""
 "individuele tijdlijnen."
 
 #. TRANS: Submit button title for 'No' when deleting a group.
-#: actions/deletegroup.php:224
 msgid "Do not delete this group."
 msgstr "Deze groep niet verwijderen."
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
-#: actions/deletegroup.php:231
 msgid "Delete this group."
 msgstr "Deze groep verwijderen."
 
@@ -2071,22 +1628,18 @@ msgstr "Deze groep verwijderen."
 #. TRANS: Client error displayed trying to block a user from a group while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying to log out when not logged in.
+#. TRANS: Client error displayed when trying to access the "make admin" page while not logged in.
+#. TRANS: Client error displayed trying to create a new direct message while not logged in.
+#. TRANS: Client error displayed trying to send a notice while not logged in.
+#. TRANS: Client error displayed trying to nudge a user without being logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
 #. TRANS: Client error displayed when trying to change user options while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
-#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:70
-#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
-#: actions/nudge.php:63 actions/pluginenable.php:97 actions/subedit.php:33
-#: actions/subscribe.php:98 actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:71 lib/profileformaction.php:63
-#: lib/settingsaction.php:72
 msgid "Not logged in."
 msgstr "Niet aangemeld."
 
 #. TRANS: Instructions for deleting a notice.
-#: actions/deletenotice.php:110
 msgid ""
 "You are about to permanently delete a notice. Once this is done, it cannot "
 "be undone."
@@ -2096,48 +1649,39 @@ msgstr ""
 
 #. TRANS: Page title when deleting a notice.
 #. TRANS: Fieldset legend for the delete notice form.
-#: actions/deletenotice.php:117 actions/deletenotice.php:148
 msgid "Delete notice"
 msgstr "Mededeling verwijderen"
 
 #. TRANS: Message for the delete notice form.
-#: actions/deletenotice.php:152
 msgid "Are you sure you want to delete this notice?"
 msgstr "Weet u zeker dat u deze aankondiging wilt verwijderen?"
 
 #. TRANS: Submit button title for 'No' when deleting a notice.
-#: actions/deletenotice.php:159
 msgid "Do not delete this notice."
 msgstr "Deze mededeling niet verwijderen."
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:166
 msgid "Delete this notice."
 msgstr "Deze mededeling verwijderen."
 
 #. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
-#: actions/deleteuser.php:66
 msgid "You cannot delete users."
 msgstr "U kunt gebruikers niet verwijderen."
 
 #. TRANS: Client error displayed when trying to delete a non-local user.
-#: actions/deleteuser.php:74
 msgid "You can only delete local users."
 msgstr "U kunt alleen lokale gebruikers verwijderen."
 
 #. TRANS: Title of delete user page.
-#: actions/deleteuser.php:110
 msgctxt "TITLE"
 msgid "Delete user"
 msgstr "Gebruiker verwijderen"
 
 #. TRANS: Fieldset legend on delete user page.
-#: actions/deleteuser.php:134
 msgid "Delete user"
 msgstr "Gebruiker verwijderen"
 
 #. TRANS: Information text to request if a user is certain that the described action has to be performed.
-#: actions/deleteuser.php:138
 msgid ""
 "Are you sure you want to delete this user? This will clear all data about "
 "the user from the database, without a backup."
@@ -2147,97 +1691,78 @@ msgstr ""
 "niet mogelijk ze terug te zetten."
 
 #. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/deleteuser.php:158
 msgid "Do not delete this user."
 msgstr "Deze gebruiker niet verwijderen."
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
-#: actions/deleteuser.php:165
 msgid "Delete this user."
 msgstr "Deze gebruiker verwijderen."
 
 #. TRANS: Message used as title for design settings for the site.
-#: actions/designadminpanel.php:60 lib/settingsnav.php:97
 msgid "Design"
 msgstr "Uiterlijk"
 
 #. TRANS: Instructions for design adminsitration panel.
-#: actions/designadminpanel.php:71
 msgid "Design settings for this StatusNet site"
 msgstr "Instellingen voor de vormgeving van deze StatusNet-website"
 
 #. TRANS: Client error displayed when a logo URL does is not valid.
-#: actions/designadminpanel.php:327
 msgid "Invalid logo URL."
 msgstr "De logo-URL is ongeldig."
 
 #. TRANS: Client error displayed when an SSL logo URL is invalid.
-#: actions/designadminpanel.php:333
 msgid "Invalid SSL logo URL."
 msgstr "De SSL logo-URL is ongeldig."
 
 #. TRANS: Client error displayed when a theme is submitted through the form that is not in the theme list.
 #. TRANS: %s is the chosen unavailable theme.
-#: actions/designadminpanel.php:339
 #, php-format
 msgid "Theme not available: %s."
 msgstr "De vormgeving is niet beschikbaar: %s."
 
 #. TRANS: Fieldset legend for form to change logo.
-#: actions/designadminpanel.php:437
 msgid "Change logo"
 msgstr "Logo wijzigen"
 
 #. TRANS: Field label for StatusNet site logo.
-#: actions/designadminpanel.php:444
 msgid "Site logo"
 msgstr "Websitelogo"
 
 #. TRANS: Field label for SSL StatusNet site logo.
-#: actions/designadminpanel.php:452
 msgid "SSL logo"
 msgstr "SSL-logo"
 
 #. TRANS: Fieldset legend for form change StatusNet site's theme.
-#: actions/designadminpanel.php:467
 msgid "Change theme"
 msgstr "Vormgeving wijzigen"
 
 #. TRANS: Field label for dropdown to choose site theme.
-#: actions/designadminpanel.php:485
 msgid "Site theme"
 msgstr "Vormgeving website"
 
 #. TRANS: Title for field label for dropdown to choose site theme.
-#: actions/designadminpanel.php:487
 msgid "Theme for the site."
 msgstr "Mogelijke vormgevingen voor deze website."
 
 #. TRANS: Field label for uploading a cutom theme.
-#: actions/designadminpanel.php:494
 msgid "Custom theme"
 msgstr "Aangepaste vormgeving"
 
 #. TRANS: Form instructions for uploading a cutom StatusNet theme.
-#: actions/designadminpanel.php:499
 msgid "You can upload a custom StatusNet theme as a .ZIP archive."
 msgstr "U kunt een vormgeving voor StatusNet uploaden als ZIP-archief."
 
 #. TRANS: Fieldset legend for theme background image.
-#: actions/designadminpanel.php:515
 msgid "Change background image"
 msgstr "Achtergrondafbeelding wijzigen"
 
 #. TRANS: Field label for background image on theme designer page.
 #. TRANS: Field label for background color selector.
 #. TRANS: Label on profile design page for setting a profile page background colour.
-#: actions/designadminpanel.php:525 actions/designadminpanel.php:609
-#: lib/designform.php:238
 msgid "Background"
 msgstr "Achtergrond"
 
 #. TRANS: Form guide for background image upload form on theme designer page.
-#: actions/designadminpanel.php:531
 #, php-format
 msgid ""
 "You can upload a background image for the site. The maximum file size is %1"
@@ -2247,197 +1772,162 @@ msgstr ""
 "bestandsgrootte is %1$s."
 
 #. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:558
 msgid "On"
 msgstr "Aan"
 
 #. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:575
 msgid "Off"
 msgstr "Uit"
 
 #. TRANS: Form guide for turning background image on or off on theme designer page.
 #. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
 #. TRANS: use of the uploaded profile image.
-#: actions/designadminpanel.php:577 lib/designform.php:214
 msgid "Turn background image on or off."
 msgstr "Achtergrondafbeelding inschakelen of uitschakelen."
 
 #. TRANS: Checkbox label to title background image on theme designer page.
 #. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-#: actions/designadminpanel.php:583 lib/designform.php:220
 msgid "Tile background image"
 msgstr "Achtergrondafbeelding naast elkaar"
 
 #. TRANS: Fieldset legend for theme colors.
-#: actions/designadminpanel.php:598
 msgid "Change colors"
 msgstr "Kleuren wijzigen"
 
 #. TRANS: Field label for content color selector.
 #. TRANS: Label on profile design page for setting a profile page content colour.
-#: actions/designadminpanel.php:623 lib/designform.php:252
 msgid "Content"
 msgstr "Inhoud"
 
 #. TRANS: Field label for sidebar color selector.
 #. TRANS: Label on profile design page for setting a profile page sidebar colour.
-#: actions/designadminpanel.php:637 lib/designform.php:266
 msgid "Sidebar"
 msgstr "Menubalk"
 
 #. TRANS: Field label for text color selector.
 #. TRANS: Label on profile design page for setting a profile page text colour.
-#: actions/designadminpanel.php:651 lib/designform.php:280
 msgid "Text"
 msgstr "Tekst"
 
 #. TRANS: Field label for link color selector.
 #. TRANS: Label on profile design page for setting a profile page links colour.
-#: actions/designadminpanel.php:665 lib/designform.php:294
 msgid "Links"
 msgstr "Verwijzingen"
 
 #. TRANS: Fieldset legend for advanced theme design settings.
-#: actions/designadminpanel.php:691
 msgid "Advanced"
 msgstr "Uitgebreid"
 
 #. TRANS: Field label for custom CSS.
-#: actions/designadminpanel.php:696
 msgid "Custom CSS"
 msgstr "Aangepaste CSS"
 
 #. TRANS: Button text for resetting theme settings.
-#: actions/designadminpanel.php:718
 msgctxt "BUTTON"
 msgid "Use defaults"
 msgstr "Standaardinstellingen gebruiken"
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:720
 msgid "Restore default designs."
 msgstr "Het standaardontwerp toepassen."
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:728
 msgid "Reset back to default."
 msgstr "De standaardinstellingen toepassen."
 
 #. TRANS: Title for button for saving theme settings.
-#: actions/designadminpanel.php:736
 msgid "Save design."
 msgstr "Ontwerp opslaan."
 
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
-#: actions/disfavor.php:83
 msgid "This notice is not a favorite!"
 msgstr "Deze mededeling staat niet op uw favorietenlijst."
 
 #. TRANS: Title for page on which favorites can be added.
-#: actions/disfavor.php:98
 msgid "Add to favorites"
 msgstr "Aan favorieten toevoegen"
 
 #. TRANS: Client exception thrown when requesting a document from the documentation that does not exist.
 #. TRANS: %s is the non-existing document.
-#: actions/doc.php:155
 #, php-format
 msgid "No such document \"%s\"."
 msgstr "Onbekend document \"%s\"."
 
 #. TRANS: Title for "Edit application" form.
 #. TRANS: Form legend.
-#: actions/editapplication.php:54 lib/applicationeditform.php:129
 msgid "Edit application"
 msgstr "Applicatie bewerken"
 
 #. TRANS: Client error displayed trying to edit an application while not logged in.
-#: actions/editapplication.php:66
 msgid "You must be logged in to edit an application."
 msgstr "U moet aangemeld zijn om een applicatie te kunnen bewerken."
 
 #. TRANS: Client error displayed trying to edit an application that does not exist.
-#: actions/editapplication.php:83 actions/showapplication.php:83
 msgid "No such application."
 msgstr "De applicatie bestaat niet."
 
 #. TRANS: Instructions for "Edit application" form.
-#: actions/editapplication.php:167
 msgid "Use this form to edit your application."
 msgstr "Gebruik dit formulier om uw applicatiegegevens te bewerken."
 
 #. TRANS: Validation error shown when not providing a name in the "Edit application" form.
 #. TRANS: Validation error shown when not providing a name in the "New application" form.
-#: actions/editapplication.php:184 actions/newapplication.php:164
 msgid "Name is required."
 msgstr "Een naam is verplicht."
 
 #. 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.
-#: actions/editapplication.php:188 actions/newapplication.php:172
 msgid "Name is too long (maximum 255 characters)."
 msgstr "De naam is te lang (maximaal 255 tekens)."
 
 #. TRANS: Validation error shown when providing a name for an application that already exists in the "Edit application" form.
 #. TRANS: Validation error shown when providing a name for an application that already exists in the "New application" form.
-#: actions/editapplication.php:192 actions/newapplication.php:168
 msgid "Name already in use. Try another one."
 msgstr "Deze naam wordt al gebruikt. Kies een andere."
 
 #. TRANS: Validation error shown when not providing a description in the "Edit application" form.
 #. TRANS: Validation error shown when not providing a description in the "New application" form.
-#: actions/editapplication.php:196 actions/newapplication.php:176
 msgid "Description is required."
 msgstr "Een beschrijving is verplicht"
 
 #. TRANS: Validation error shown when providing too long a source URL in the "Edit application" form.
-#: actions/editapplication.php:209
 msgid "Source URL is too long."
 msgstr "De bron-URL is te lang."
 
 #. TRANS: Validation error shown when providing an invalid source URL in the "Edit application" form.
 #. TRANS: Validation error shown when providing an invalid source URL in the "New application" form.
-#: actions/editapplication.php:216 actions/newapplication.php:199
 msgid "Source URL is not valid."
 msgstr "De bron-URL is niet geldig."
 
 #. 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.
-#: actions/editapplication.php:220 actions/newapplication.php:203
 msgid "Organization is required."
 msgstr "Organisatie is verplicht."
 
 #. TRANS: Validation error shown when providing too long an arganisation name in the "Edit application" form.
-#: actions/editapplication.php:224 actions/newapplication.php:207
 msgid "Organization is too long (maximum 255 characters)."
 msgstr "De organisatienaam is te lang (maximaal 255 tekens)."
 
 #. TRANS: Form validation error show when an organisation name has not been provided in the edit application form.
 #. TRANS: Form validation error show when an organisation name has not been provided in the new application form.
-#: actions/editapplication.php:228 actions/newapplication.php:211
 msgid "Organization homepage is required."
 msgstr "De homepage voor een organisatie is verplicht."
 
 #. TRANS: Validation error shown when providing too long a callback URL in the "Edit application" form.
 #. TRANS: Validation error shown when providing too long a callback URL in the "New application" form.
-#: actions/editapplication.php:239 actions/newapplication.php:225
 msgid "Callback is too long."
 msgstr "De callback is te lang."
 
 #. TRANS: Validation error shown when providing an invalid callback URL in the "Edit application" form.
 #. TRANS: Validation error shown when providing an invalid callback URL in the "New application" form.
-#: actions/editapplication.php:247 actions/newapplication.php:235
 msgid "Callback URL is not valid."
 msgstr "De callback-URL is niet geldig."
 
 #. TRANS: Server error occuring when an application could not be updated from the "Edit application" form.
-#: actions/editapplication.php:284
 msgid "Could not update application."
 msgstr "Het was niet mogelijk de applicatie bij te werken."
 
 #. TRANS: Title for form to edit a group. %s is a group nickname.
-#: actions/editgroup.php:55
 #, php-format
 msgid "Edit %s group"
 msgstr "Groep %s bewerken"
@@ -2445,40 +1935,40 @@ msgstr "Groep %s bewerken"
 #. TRANS: Client error displayed trying to edit a group while not logged in.
 #. TRANS: Client error displayed when trying to create a group while not logged in.
 #. TRANS: Client error displayed trying to create a group while not logged in.
-#: actions/editgroup.php:68 actions/grouplogo.php:69 actions/newgroup.php:65
 msgid "You must be logged in to create a group."
 msgstr "U moet aangemeld zijn om een groep aan te kunnen maken."
 
 #. TRANS: Form instructions for group edit form.
-#: actions/editgroup.php:161
 msgid "Use this form to edit the group."
 msgstr "Gebruik dit formulier om de groep te bewerken."
 
+#. TRANS: Group edit form validation error.
+#. TRANS: Group create form validation error.
+#. TRANS: %s is the invalid alias.
+#, php-format
+msgid "Invalid alias: \"%s\""
+msgstr "Ongeldige alias: \"%s\""
+
 #. TRANS: Group edit form success message.
-#: actions/editgroup.php:301
 msgid "Options saved."
 msgstr "De instellingen zijn opgeslagen."
 
 #. TRANS: Title for e-mail settings.
-#: actions/emailsettings.php:60
 msgid "Email settings"
 msgstr "E-mailvoorkeuren"
 
 #. TRANS: E-mail settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/emailsettings.php:74
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 msgstr "Uw e-mailinstellingen op %%site.name%% beheren."
 
 #. TRANS: Form legend for e-mail settings form.
 #. TRANS: Field label for e-mail address input in e-mail settings form.
-#: actions/emailsettings.php:104 actions/emailsettings.php:130
 msgid "Email address"
 msgstr "E-mailadres"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:110
 msgid "Current confirmed email address."
 msgstr "Huidige bevestigde e-mailadres"
 
@@ -2487,15 +1977,11 @@ msgstr "Huidige bevestigde e-mailadres"
 #. TRANS: Button label to remove a confirmed IM address.
 #. TRANS: Button label to remove a confirmed SMS address.
 #. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
-#: actions/emailsettings.php:113 actions/emailsettings.php:180
-#: actions/imsettings.php:119 actions/smssettings.php:119
-#: actions/smssettings.php:175
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Verwijderen"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:120
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -2508,46 +1994,38 @@ msgstr ""
 #. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
 #. TRANS: Any other domain may be owned by a legitimate person or
 #. TRANS: organization.
-#: actions/emailsettings.php:137
 msgid "Email address, like \"UserName@example.org\""
 msgstr "E-mailadres, zoals \"gebruikersnaam@example.org\""
 
 #. TRANS: Button label for adding an e-mail address in e-mail settings form.
 #. TRANS: Button label for adding an IM address in IM settings form.
 #. TRANS: Button label for adding a SMS phone number in SMS settings form.
-#: actions/emailsettings.php:141 actions/imsettings.php:147
-#: actions/smssettings.php:157
 msgctxt "BUTTON"
 msgid "Add"
 msgstr "Toevoegen"
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:149 actions/smssettings.php:166
 msgid "Incoming email"
 msgstr "Inkomende e-mail"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:155
 msgid "I want to post notices by email."
 msgstr "Ik wil mededelingen per e-mail plaatsen."
 
 #. TRANS: Form instructions for incoming e-mail form in e-mail settings.
 #. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
-#: actions/emailsettings.php:177 actions/smssettings.php:173
 msgid "Send email to this address to post new notices."
 msgstr "Stuur een email naar dit adres om een nieuw bericht te posten"
 
 #. TRANS: Instructions for incoming e-mail address input form, when an address has already been assigned.
 #. TRANS: Instructions for incoming SMS e-mail address input form.
-#: actions/emailsettings.php:186 actions/smssettings.php:181
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr ""
 "Stelt een nieuw e-mailadres in voor het ontvangen van berichten. Het "
 "bestaande e-mailadres wordt verwijderd."
 
 #. TRANS: Instructions for incoming e-mail address input form.
-#: actions/emailsettings.php:190
 msgid ""
 "To send notices via email, we need to create a unique email address for you "
 "on this server:"
@@ -2557,87 +2035,69 @@ msgstr ""
 
 #. TRANS: Button label for adding an e-mail address to send notices from.
 #. TRANS: Button label for adding an SMS e-mail address to send notices from.
-#: actions/emailsettings.php:196 actions/smssettings.php:184
 msgctxt "BUTTON"
 msgid "New"
 msgstr "Nieuw"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:205
 msgid "Email preferences"
 msgstr "E-mailvoorkeuren"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:213
 msgid "Send me notices of new subscriptions through email."
 msgstr "Mij e-mailen bij nieuwe abonnementen."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:219
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr "Mij e-mailen als iemand mijn mededeling als favoriet instelt."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:226
 msgid "Send me email when someone sends me a private message."
 msgstr "Mij e-mailen als iemand mij een privébericht zendt."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:232
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr "Mij e-mailen als iemand mij een antwoord met \"@\" erin stuurt."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:238
 msgid "Allow friends to nudge me and send me an email."
 msgstr "Vrienden mogen me porren en e-mailen."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:244
 msgid "Publish a MicroID for my email address."
 msgstr "Een MicroID voor mijn e-mailadres publiceren."
 
 #. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:362
 msgid "Email preferences saved."
 msgstr "De e-mailvoorkeuren zijn opgeslagen."
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:381
 msgid "No email address."
 msgstr "Geen e-mailadres"
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:389
 msgid "Cannot normalize that email address."
 msgstr "Kan het e-mailadres niet normaliseren."
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:394 actions/register.php:197
-#: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "Geen geldig e-mailadres."
 
 #. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:398
 msgid "That is already your email address."
 msgstr "U hebt dit e-mailadres als ingesteld als uw e-mailadres."
 
 #. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:402
 msgid "That email address already belongs to another user."
 msgstr "Dit e-mailadres is al geregistreerd door een andere gebruiker."
 
 #. TRANS: Server error thrown on database error adding e-mail confirmation code.
 #. TRANS: Server error thrown on database error adding Instant Messaging confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:419 actions/imsettings.php:362
-#: actions/smssettings.php:364
 msgid "Could not insert confirmation code."
 msgstr "De bevestigingscode kon niet ingevoegd worden."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:426
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
@@ -2649,101 +2109,81 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling Instant Messaging address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:446 actions/imsettings.php:391
-#: actions/smssettings.php:398
 msgid "No pending confirmation to cancel."
 msgstr "Er is geen openstaand bevestigingsverzoek om te annuleren."
 
 #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:451
 msgid "That is the wrong email address."
 msgstr "Dat is het verkeerde e-mailadres."
 
 #. TRANS: Server error thrown on database error canceling e-mail address confirmation.
 #. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
-#: actions/emailsettings.php:460 actions/smssettings.php:412
 msgid "Could not delete email confirmation."
 msgstr "De e-mailbevestiging kon niet verwijderd worden."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:465
 msgid "Email confirmation cancelled."
 msgstr "E-mailbevestiging geannuleerd."
 
 #. TRANS: Message given trying to remove an e-mail address that is not
 #. TRANS: registered for the active user.
-#: actions/emailsettings.php:484
 msgid "That is not your email address."
 msgstr "Dit is niet uw e-mailadres."
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:505
 msgid "The email address was removed."
 msgstr "Het e-mailadres is verwijderd."
 
 #. TRANS: Form validation error displayed when trying to remove an incoming e-mail address while no address has been set.
-#: actions/emailsettings.php:519 actions/smssettings.php:554
 msgid "No incoming email address."
 msgstr "Geen binnenkomend e-mailadres"
 
 #. 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.
-#: actions/emailsettings.php:531 actions/emailsettings.php:555
-#: actions/smssettings.php:565 actions/smssettings.php:590
 msgid "Could not update user record."
 msgstr "Kan de gebruikersgegevens niet vernieuwen."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
 #. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:535 actions/smssettings.php:569
 msgid "Incoming email address removed."
 msgstr "Het e-mailadres voor inkomende mail is verwijderd."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
 #. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:559 actions/smssettings.php:594
 msgid "New incoming email address added."
 msgstr "Het nieuwe binnenkomende e-mailadres is toegevoegd."
 
 #. TRANS: Client error displayed when trying to mark a notice as favorite that already is a favorite.
-#: actions/favor.php:80
 msgid "This notice is already a favorite!"
 msgstr "Deze mededeling staat al in uw favorietenlijst."
 
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
-#: actions/favor.php:95
 msgid "Disfavor favorite."
 msgstr "Van uw favorietenlijst verwijderen."
 
 #. TRANS: Page title for first page of favorited notices.
 #. TRANS: Title for favourited notices section.
-#: actions/favorited.php:65 lib/popularnoticesection.php:62
-#: lib/publicgroupnav.php:93
 msgid "Popular notices"
 msgstr "Populaire mededelingen"
 
 #. TRANS: Page title for all but first page of favorited notices.
 #. TRANS: %d is the page number being displayed.
-#: actions/favorited.php:69
 #, php-format
 msgid "Popular notices, page %d"
 msgstr "Populaire mededelingen, pagina %d"
 
 #. TRANS: Description on page displaying favorited notices.
-#: actions/favorited.php:81
 msgid "The most popular notices on the site right now."
 msgstr "De meest populaire mededelingen op de site op dit moment."
 
 #. TRANS: Text displayed instead of a list when a site does not yet have any favourited notices.
-#: actions/favorited.php:149
 msgid "Favorite notices appear on this page but no one has favorited one yet."
 msgstr ""
 "Favoriete mededelingen zijn te zien op deze pagina, maar er zijn nog geen "
 "favoriete mededelingen."
 
 #. TRANS: Additional text displayed instead of a list when a site does not yet have any favourited notices for logged in users.
-#: actions/favorited.php:153
 msgid ""
 "Be the first to add a notice to your favorites by clicking the fave button "
 "next to any notice you like."
@@ -2754,7 +2194,6 @@ msgstr ""
 
 #. TRANS: Additional text displayed instead of a list when a site does not yet have any favourited notices for not logged in users.
 #. TRANS: %%action.register%% is a registration link. "[link text](link)" is Mark Down. Do not change the formatting.
-#: actions/favorited.php:158
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to add a "
@@ -2767,185 +2206,150 @@ msgstr ""
 #. TRANS: %s is a user's nickname.
 #. TRANS: Title for first page of favourite notices of a user.
 #. TRANS: %s is the user for whom the favourite notices are displayed.
-#: actions/favoritesrss.php:111 actions/showfavorites.php:76
-#: lib/personalgroupnav.php:110
 #, php-format
 msgid "%s's favorite notices"
 msgstr "Favoriete mededelingen van %s"
 
 #. TRANS: Desciption of RSS feed with favourite notices of a user.
 #. TRANS: %1$s is a user's nickname, %2$s is the name of the StatusNet site.
-#: actions/favoritesrss.php:117
 #, php-format
 msgid "Updates favored by %1$s on %2$s!"
 msgstr "Updates op de favorietenlijst van %1$s op %2$s."
 
 #. TRANS: Page title for first page of featured users.
 #. TRANS: Title for featured users section.
-#: actions/featured.php:69 lib/featureduserssection.php:87
-#: lib/publicgroupnav.php:89
 msgid "Featured users"
 msgstr "Nieuwe gebruikers"
 
 #. TRANS: Page title for all but first page of featured users.
 #. TRANS: %d is the page number being displayed.
-#: actions/featured.php:73
 #, php-format
 msgid "Featured users, page %d"
 msgstr "Nieuwe gebruikers, pagina %d"
 
 #. TRANS: Description on page displaying featured users.
-#: actions/featured.php:102
 #, php-format
 msgid "A selection of some great users on %s."
 msgstr "Een selectie van gewaardeerde gebruikers op %s."
 
 #. TRANS: Client error displayed when no notice ID was given trying do display a file.
-#: actions/file.php:36
 msgid "No notice ID."
 msgstr "Geen mededelingnummer."
 
 #. TRANS: Client error displayed when an invalid notice ID was given trying do display a file.
-#: actions/file.php:41
 msgid "No notice."
 msgstr "Geen mededeling."
 
 #. TRANS: Client error displayed when trying do display a file for a notice without a file attachement.
-#: actions/file.php:46
 msgid "No attachments."
 msgstr "Geen bijlagen."
 
 #. TRANS: Client error displayed when trying do display a file for a notice with file attachements
 #. TRANS: that could not be found.
-#: actions/file.php:58
 msgid "No uploaded attachments."
 msgstr "Geen toegevoegde bijlagen."
 
 #. TRANS: Client error displayed when subscribing to a remote profile and an unexpected response is received.
-#: actions/finishremotesubscribe.php:69
 msgid "Not expecting this response!"
 msgstr "Onverwacht antwoord!"
 
 #. TRANS: Client error displayed when subscribing to a remote profile that does not exist.
-#: actions/finishremotesubscribe.php:81
 msgid "User being listened to does not exist."
 msgstr "De gebruiker waarnaar wordt geluisterd bestaat niet."
 
 #. TRANS: Client error displayed when subscribing to a remote profile that is a local profile.
-#: actions/finishremotesubscribe.php:89 actions/remotesubscribe.php:58
 msgid "You can use the local subscription!"
 msgstr "U kunt het lokale abonnement gebruiken!"
 
 #. TRANS: Client error displayed when subscribing to a remote profile that is blocked form subscribing to.
-#: actions/finishremotesubscribe.php:102
 msgid "That user has blocked you from subscribing."
 msgstr ""
 "Die gebruiker heeft de mogelijkheid om te abonneren voor u geblokkeerd."
 
 #. TRANS: Client error displayed when subscribing to a remote profile without providing an authorised token.
-#: actions/finishremotesubscribe.php:114
 msgid "You are not authorized."
 msgstr "U hebt niet de juiste toegangsrechten."
 
 #. TRANS: Client error displayed when subscribing to a remote profile and conversion of the request token to access token fails.
-#: actions/finishremotesubscribe.php:118
 msgid "Could not convert request token to access token."
 msgstr ""
 "Het was niet mogelijk het verzoektoken te converteren naar een toegangstoken."
 
 #. TRANS: Client error displayed when subscribing to a remote profile fails because of an unsupported version of the OMB protocol.
-#: actions/finishremotesubscribe.php:124
 msgid "Remote service uses unknown version of OMB protocol."
 msgstr ""
 "De diensten op afstand gebruiken een onbekende versie van het OMB-protocol."
 
 #. TRANS: Server error displayed when subscribing to a remote profile fails because the remote profile could not be updated.
-#: actions/finishremotesubscribe.php:145 lib/oauthstore.php:317
 msgid "Error updating remote profile."
 msgstr ""
 "Er is een fout opgetreden tijdens het bijwerken van het profiel op afstand."
 
 #. TRANS: Client error displayed when requesting a non-existent file.
-#: actions/getfile.php:77
 msgid "No such file."
 msgstr "Het bestand bestaat niet."
 
 #. TRANS: Client error displayed when requesting a file without having read access to it.
-#: actions/getfile.php:82
 msgid "Cannot read file."
 msgstr "Het bestand kon niet gelezen worden."
 
 #. TRANS: Client error displayed when trying to assign an invalid role to a user.
-#: actions/grantrole.php:61 actions/revokerole.php:62
 msgid "Invalid role."
 msgstr "Ongeldige rol."
 
 #. TRANS: Client error displayed when trying to assign an reserved role to a user.
-#: actions/grantrole.php:66 actions/revokerole.php:66
 msgid "This role is reserved and cannot be set."
 msgstr "Deze rol is gereserveerd en kan niet ingesteld worden."
 
 #. TRANS: Client error displayed when trying to assign a role to a user while not being allowed to set roles.
-#: actions/grantrole.php:76
 msgid "You cannot grant user roles on this site."
 msgstr "Op deze website kunt u geen gebruikersrollen toekennen."
 
 #. TRANS: Client error displayed when trying to assign a role to a user that already has that role.
-#: actions/grantrole.php:84
 msgid "User already has this role."
 msgstr "Deze gebruiker heeft deze rol al."
 
 #. TRANS: Client error displayed trying to block a user from a group while not specifying a to be blocked user profile.
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing a profile.
+#. TRANS: Client error displayed when not providing a profile ID on the Make Admin page.
 #. TRANS: Client error displayed trying a change a subscription without providing a profile.
 #. TRANS: Client error displayed when trying to change user options without specifying a user to work on.
-#: actions/groupblock.php:71 actions/groupunblock.php:71
-#: actions/makeadmin.php:71 actions/subedit.php:49
-#: lib/profileformaction.php:79
 msgid "No profile specified."
 msgstr "Er is geen profiel opgegeven."
 
 #. TRANS: Client error displayed trying to block a user from a group while specifying a non-existing profile.
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing an existing profile.
+#. TRANS: Client error displayed when specifying an invalid profile ID on the Make Admin page.
 #. TRANS: Client error displayed trying a change a subscription for a non-existant profile ID.
 #. TRANS: Client error displayed when trying to change user options without specifying an existing user to work on.
-#: actions/groupblock.php:77 actions/groupunblock.php:77
-#: actions/makeadmin.php:76 actions/subedit.php:57 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:87
 msgid "No profile with that ID."
 msgstr "Er is geen profiel met dat ID."
 
 #. TRANS: Client error displayed trying to block a user from a group while not specifying a group to block a profile from.
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing a group.
-#: actions/groupblock.php:83 actions/groupunblock.php:83
-#: actions/makeadmin.php:81
+#. TRANS: Client error displayed when not providing a group ID on the Make Admin page.
 msgid "No group specified."
 msgstr "Er is geen groep aangegeven."
 
 #. TRANS: Client error displayed trying to block a user from a group while not being an admin user.
-#: actions/groupblock.php:95
 msgid "Only an admin can block group members."
 msgstr "Alleen een beheerder kan groepsleden blokkeren."
 
 #. TRANS: Client error displayed trying to block a user from a group while user is already blocked from the given group.
-#: actions/groupblock.php:100
 msgid "User is already blocked from group."
 msgstr "Deze gebruiker is al de toegang tot de groep ontzegd."
 
 #. TRANS: Client error displayed trying to block a user from a group while user is not a member of given group.
-#: actions/groupblock.php:106
 msgid "User is not a member of group."
 msgstr "De gebruiker is geen lid van de groep."
 
 #. TRANS: Title for block user from group page.
 #. TRANS: Form legend for form to block user from a group.
-#: actions/groupblock.php:141 actions/groupmembers.php:364
 msgid "Block user from group"
 msgstr "Gebruiker toegang tot de groep blokkeren"
 
 #. TRANS: Explanatory text for block user from group form before setting the block.
 #. TRANS: %1$s is that to be blocked user, %2$s is the group the user will be blocked from.
-#: actions/groupblock.php:169
 #, php-format
 msgid ""
 "Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They "
@@ -2957,17 +2361,14 @@ msgstr ""
 "plaatsen en kan zich in de toekomst ook niet meer op de groep abonneren."
 
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
-#: actions/groupblock.php:191
 msgid "Do not block this user from this group."
 msgstr "Deze gebruiker niet de toegang tot deze groep ontzeggen."
 
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
-#: actions/groupblock.php:198
 msgid "Block this user from this group."
 msgstr "Deze gebruiker de toegang tot deze groep ontzeggen."
 
 #. TRANS: Server error displayed when trying to block a user from a group fails because of an application error.
-#: actions/groupblock.php:215
 msgid "Database error blocking user from group."
 msgstr ""
 "Er is een databasefout opgetreden bij het uitsluiten van de gebruiker van de "
@@ -2975,22 +2376,18 @@ msgstr ""
 
 #. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
 #. TRANS: Client error displayed trying to find a user by ID without providing an ID.
-#: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr "Geen ID."
 
 #. TRANS: Client error displayed trying to change group design settings while not logged in.
-#: actions/groupdesignsettings.php:67
 msgid "You must be logged in to edit a group."
 msgstr "U moet aangemeld zijn om een groep te kunnen bewerken."
 
 #. TRANS: Title group design settings page.
-#: actions/groupdesignsettings.php:146
 msgid "Group design"
 msgstr "Groepsontwerp"
 
 #. TRANS: Instructions for group design settings page.
-#: actions/groupdesignsettings.php:157
 msgid ""
 "Customize the way your group looks with a background image and a colour "
 "palette of your choice."
@@ -2999,24 +2396,20 @@ msgstr ""
 "kleurenpalet van uw keuze."
 
 #. TRANS: Form validation error displayed when group design settings could not be updated because of an application issue.
-#: actions/groupdesignsettings.php:262
 msgid "Unable to update your design settings."
 msgstr "Het was niet mogelijk om uw ontwerpinstellingen bij te werken."
 
 #. TRANS: Form text to confirm saved group design settings.
-#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:239
 msgid "Design preferences saved."
 msgstr "De ontwerpvoorkeuren zijn opgeslagen."
 
 #. TRANS: Title for group logo settings page.
 #. TRANS: Group logo form legend.
-#: actions/grouplogo.php:144 actions/grouplogo.php:199
 msgid "Group logo"
 msgstr "Groepslogo"
 
 #. TRANS: Instructions for group logo page.
 #. TRANS: %s is the maximum file size for that site.
-#: actions/grouplogo.php:156
 #, php-format
 msgid ""
 "You can upload a logo image for your group. The maximum file size is %s."
@@ -3025,98 +2418,81 @@ msgstr ""
 "s."
 
 #. TRANS: Submit button for uploading a group logo.
-#: actions/grouplogo.php:243
 msgid "Upload"
 msgstr "Uploaden"
 
 #. TRANS: Button text for cropping an uploaded group logo.
-#: actions/grouplogo.php:299
 msgid "Crop"
 msgstr "Uitsnijden"
 
 #. TRANS: Form instructions on the group logo page.
-#: actions/grouplogo.php:376
 msgid "Pick a square area of the image to be the logo."
 msgstr "Selecteer een vierkant uit de afbeelding die het logo wordt."
 
 #. TRANS: Form success message after updating a group logo.
-#: actions/grouplogo.php:411
 msgid "Logo updated."
 msgstr "Logo geactualiseerd."
 
 #. TRANS: Form failure message after failing to update a group logo.
-#: actions/grouplogo.php:414
 msgid "Failed updating logo."
 msgstr "Het bijwerken van het logo is mislukt."
 
 #. TRANS: Title of the page showing group members.
 #. TRANS: %s is the name of the group.
-#: actions/groupmembers.php:104
 #, php-format
 msgid "%s group members"
 msgstr "leden van de groep %s"
 
 #. TRANS: Title of the page showing group members.
 #. TRANS: %1$s is the name of the group, %2$d is the page number of the members list.
-#: actions/groupmembers.php:109
 #, php-format
 msgid "%1$s group members, page %2$d"
 msgstr "%1$s groeps leden, pagina %2$d"
 
 #. TRANS: Page notice for group members page.
-#: actions/groupmembers.php:125
 msgid "A list of the users in this group."
 msgstr "Ledenlijst van deze groep"
 
 #. TRANS: Indicator in group members list that this user is a group administrator.
-#: actions/groupmembers.php:190 lib/action.php:581
 msgid "Admin"
 msgstr "Beheerder"
 
 #. TRANS: Button text for the form that will block a user from a group.
-#: actions/groupmembers.php:397
 msgctxt "BUTTON"
 msgid "Block"
 msgstr "Blokkeren"
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:401
 msgctxt "TOOLTIP"
 msgid "Block this user"
 msgstr "Deze gebruiker blokkeren"
 
 #. TRANS: Form legend for form to make a user a group admin.
-#: actions/groupmembers.php:488
 msgid "Make user an admin of the group"
 msgstr "Deze gebruiker groepsbeheerder maken"
 
 #. TRANS: Button text for the form that will make a user administrator.
-#: actions/groupmembers.php:521
 msgctxt "BUTTON"
 msgid "Make Admin"
 msgstr "Beheerder maken"
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:525
 msgctxt "TOOLTIP"
 msgid "Make this user an admin"
 msgstr "Deze gebruiker beheerder maken"
 
 #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
-#: actions/grouprss.php:141
 #, php-format
 msgid "Updates from members of %1$s on %2$s!"
 msgstr "Updates voor leden van %1$s op %2$s."
 
 #. TRANS: Title for first page of the groups list.
-#: actions/groups.php:62
 msgctxt "TITLE"
 msgid "Groups"
 msgstr "Groepen"
 
 #. TRANS: Title for all but the first page of the groups list.
 #. TRANS: %d is the page number.
-#: actions/groups.php:66
 #, php-format
 msgctxt "TITLE"
 msgid "Groups, page %d"
@@ -3125,7 +2501,6 @@ msgstr "Groepen, pagina %d"
 #. TRANS: Page notice of group list. %%%%site.name%%%% is the StatusNet site name,
 #. TRANS: %%%%action.groupsearch%%%% and %%%%action.newgroup%%%% are URLs. Do not change them.
 #. TRANS: This message contains Markdown links in the form [link text](link).
-#: actions/groups.php:95
 #, php-format
 msgid ""
 "%%%%site.name%%%% groups let you find and talk with people of similar "
@@ -3142,12 +2517,10 @@ msgstr ""
 "groep](%%%%action.newgroup%%%%)!"
 
 #. TRANS: Link to create a new group on the group list page.
-#: actions/groups.php:113 actions/usergroups.php:126 lib/groupeditform.php:115
 msgid "Create a new group"
 msgstr "Nieuwe groep aanmaken"
 
 #. TRANS: Instructions for page where groups can be searched. %%site.name%% is the name of the StatusNet site.
-#: actions/groupsearch.php:53
 #, php-format
 msgid ""
 "Search for groups on %%site.name%% by their name, location, or description. "
@@ -3158,21 +2531,17 @@ msgstr ""
 "zoekterm moet uit drie of meer tekens bestaan."
 
 #. TRANS: Title for page where groups can be searched.
-#: actions/groupsearch.php:60
 msgid "Group search"
 msgstr "Groepen zoeken"
 
 #. TRANS: Text on page where groups can be searched if no results were found for a query.
 #. TRANS: Text for notice search results is the query had no results.
 #. TRANS: Message on the "People search" page where a query has no results.
-#: actions/groupsearch.php:82 actions/noticesearch.php:122
-#: actions/peoplesearch.php:87
 msgid "No results."
 msgstr "Geen resultaten."
 
 #. TRANS: Additional text on page where groups can be searched if no results were found for a query for a logged in user.
 #. TRANS: This message contains Markdown links in the form [link text](link).
-#: actions/groupsearch.php:87
 #, php-format
 msgid ""
 "If you cannot find the group you're looking for, you can [create it](%%"
@@ -3183,7 +2552,6 @@ msgstr ""
 
 #. TRANS: Additional text on page where groups can be searched if no results were found for a query for a not logged in user.
 #. TRANS: This message contains Markdown links in the form [link text](link).
-#: actions/groupsearch.php:92
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and [create the group](%%"
@@ -3193,213 +2561,158 @@ msgstr ""
 "[aanmaken](%%action.newgroup%%)!"
 
 #. TRANS: Client error displayed when trying to unblock a user from a group without being an administrator for the group.
-#: actions/groupunblock.php:95
 msgid "Only an admin can unblock group members."
 msgstr "Alleen beheerders kunnen groepsleden deblokkeren."
 
 #. TRANS: Client error displayed when trying to unblock a non-blocked user from a group.
-#: actions/groupunblock.php:100
 msgid "User is not blocked from group."
 msgstr "De gebruiker is niet de toegang tot de groep ontzegd."
 
 #. TRANS: Server error displayed when unblocking a user from a group fails because of an unknown error.
 #. TRANS: Server error displayed when removing a user block.
-#: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "Er is een fout opgetreden bij het verwijderen van de blokkade."
 
 #. TRANS: Title for Instant Messaging settings.
-#: actions/imsettings.php:56
 msgid "IM settings"
 msgstr "IM-instellingen"
 
 #. 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.
-#: actions/imsettings.php:69
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "You can send and receive notices through instant messaging [instant messages]"
 "(%%doc.im%%). Configure your addresses and settings below."
 msgstr ""
 "U kunt berichten verzenden en ontvangen via [\"onmiddellijke berichten\"](%%"
-"doc.im%%) van Jabber en Google Talk. Voer hieronder uw adres in en maak uw "
-"instellingen."
+"doc.im%%). Voer hieronder uw adres in en maak uw instellingen."
 
 #. TRANS: Message given in the IM settings if IM is not enabled on the site.
-#: actions/imsettings.php:90
 msgid "IM is not available."
 msgstr "IM is niet beschikbaar."
 
-#: actions/imsettings.php:116
-#, fuzzy, php-format
+#, php-format
 msgid "Current confirmed %s address."
-msgstr "Huidige bevestigde e-mailadres"
+msgstr "Huidige bevestigde adres voor %s."
 
 #. TRANS: Form note in IM settings form.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:128
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your %s account for a message "
 "with further instructions. (Did you add %s to your buddy list?)"
 msgstr ""
-"Er wordt gewacht op bevestiging van dit adres. Controleer uw Jabber- of "
-"Google Talk-gebruiker op een bericht met nadere instructies. Hebt u %s aan "
-"uw contactenlijst toegevoegd?"
+"Er wordt gewacht op bevestiging van dit adres. Controleer uw gebruiker bij %"
+"s op een bericht met nadere instructies. Hebt u %s aan uw contactenlijst "
+"toegevoegd?"
 
-#: actions/imsettings.php:140
 msgid "IM address"
 msgstr "IM-adres"
 
-#: actions/imsettings.php:142
 #, php-format
 msgid "%s screenname."
-msgstr ""
+msgstr "Schermnaam van %s."
 
 #. TRANS: Header for IM preferences form.
-#: actions/imsettings.php:163
-#, fuzzy
 msgid "IM Preferences"
 msgstr "IM-voorkeuren"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:174
-#, fuzzy
 msgid "Send me notices"
-msgstr "Mededeling verzenden"
+msgstr "Mij mededelingen sturen"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:176
-#, fuzzy
 msgid "Post a notice when my status changes."
-msgstr ""
-"Een mededeling verzenden als mijn Jabber- of Google Talk-status wijzigt."
+msgstr "Een mededeling verzenden als mijn status wijzigt."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:178
-#, fuzzy
 msgid "Send me replies from people I'm not subscribed to."
-msgstr ""
-"Mij antwoorden sturen via Jabber of Google Talk van gebruikers op wie ik "
-"niet geabonneerd ben."
+msgstr "Mij antwoorden sturen van gebruikers op wie ik niet geabonneerd ben."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:181
-#, fuzzy
 msgid "Publish a MicroID"
-msgstr "Een MicroID voor mijn e-mailadres publiceren."
+msgstr "Een MicroID voor publiceren."
 
 #. TRANS: Server error thrown on database error updating IM preferences.
-#: actions/imsettings.php:291
-#, fuzzy
 msgid "Couldn't update IM preferences."
-msgstr "Het was niet mogelijk de gebruiker bij te werken."
+msgstr "Het was niet mogelijk de IM-voorkeuren bij te werken."
 
 #. TRANS: Confirmation message for successful IM preferences save.
 #. TRANS: Confirmation message after saving preferences.
-#: actions/imsettings.php:298 actions/urlsettings.php:244
 msgid "Preferences saved."
 msgstr "Uw voorkeuren zijn opgeslagen."
 
 #. TRANS: Message given saving IM address without having provided one.
-#: actions/imsettings.php:320
-#, fuzzy
 msgid "No screenname."
-msgstr "Geen gebruikersnaam."
+msgstr "Geen schermnaam."
 
-#: actions/imsettings.php:325
-#, fuzzy
 msgid "No transport."
-msgstr "Geen mededeling."
+msgstr "Geen transport."
 
 #. TRANS: Message given saving IM address that cannot be normalised.
-#: actions/imsettings.php:333
-#, fuzzy
 msgid "Cannot normalize that screenname"
-msgstr "Het was niet mogelijk om het Jabber-ID te normaliseren."
+msgstr "Het was niet mogelijk om die schermnaam te normaliseren."
 
 #. TRANS: Message given saving IM address that not valid.
-#: actions/imsettings.php:340
-#, fuzzy
 msgid "Not a valid screenname"
-msgstr "Ongeldige gebruikersnaam!"
+msgstr "Ongeldige schermnaam"
 
 #. TRANS: Message given saving IM address that is already set for another user.
-#: actions/imsettings.php:344
-#, fuzzy
 msgid "Screenname already belongs to another user."
-msgstr "Het Jabber-ID wordt al gebruikt door een andere gebruiker."
+msgstr "De schermnaam wordt al gebruikt door een andere gebruiker."
 
 #. TRANS: Message given saving valid IM address that is to be confirmed.
-#: actions/imsettings.php:369
-#, fuzzy
 msgid "A confirmation code was sent to the IM address you added."
-msgstr ""
-"Er is een bevestigingscode verstuurd naar het opgegeven IM-adres. U moet "
-"ermee akkoord gaan dat %s berichten aan u verzendt."
+msgstr "Er is een bevestigingscode verstuurd naar het opgegeven IM-adres."
 
 #. TRANS: Message given canceling IM address confirmation for the wrong IM address.
-#: actions/imsettings.php:396
 msgid "That is the wrong IM address."
 msgstr "Dat is het verkeerde IM-adres."
 
 #. TRANS: Server error thrown on database error canceling IM address confirmation.
-#: actions/imsettings.php:405
-#, fuzzy
 msgid "Couldn't delete confirmation."
-msgstr "De IM-bevestiging kon niet verwijderd worden."
+msgstr "De bevestiging kon niet verwijderd worden."
 
 #. TRANS: Message given after successfully canceling IM address confirmation.
-#: actions/imsettings.php:410
 msgid "IM confirmation cancelled."
 msgstr "IM-bevestiging geannuleerd."
 
 #. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.
-#: actions/imsettings.php:434
-#, fuzzy
 msgid "That is not your screenname."
-msgstr "Dit is niet uw telefoonnummer."
+msgstr "Dit is niet uw schermnaam."
 
 #. TRANS: Server error thrown on database error removing a registered IM address.
-#: actions/imsettings.php:443
-#, fuzzy
 msgid "Couldn't update user im prefs."
-msgstr "Kan de gebruikersgegevens niet vernieuwen."
+msgstr "Kan de IM-instellingen van de gebruiker niet bijwerken."
 
 #. TRANS: Message given after successfully removing a registered Instant Messaging address.
-#: actions/imsettings.php:451
 msgid "The IM address was removed."
 msgstr "Het IM-adres is verwijderd."
 
 #. TRANS: Title for all but the first page of the inbox page.
 #. TRANS: %1$s is the user's nickname, %2$s is the page number.
-#: actions/inbox.php:59
 #, php-format
 msgid "Inbox for %1$s - page %2$d"
 msgstr "Postvak IN van %s - pagina %2$d"
 
 #. TRANS: Title for the first page of the inbox page.
 #. TRANS: %s is the user's nickname.
-#: actions/inbox.php:64
 #, php-format
 msgid "Inbox for %s"
 msgstr "Postvak IN van %s"
 
 #. TRANS: Instructions for user inbox page.
-#: actions/inbox.php:106
 msgid "This is your inbox, which lists your incoming private messages."
 msgstr "Dit is uw Postvak IN dat uw inkomende privéberichten bevat."
 
 #. TRANS: Client error displayed when trying to sent invites while they have been disabled.
-#: actions/invite.php:41
 msgid "Invites have been disabled."
 msgstr "Het is niet mogelijk uitnodigingen te verzenden."
 
 #. TRANS: Client error displayed when trying to sent invites while not logged in.
 #. TRANS: %s is the StatusNet site name.
-#: actions/invite.php:45
 #, php-format
 msgid "You must be logged in to invite other users to use %s."
 msgstr ""
@@ -3408,18 +2721,15 @@ msgstr ""
 
 #. TRANS: Form validation message when providing an e-mail address that does not validate.
 #. TRANS: %s is an invalid e-mail address.
-#: actions/invite.php:78
 #, php-format
 msgid "Invalid email address: %s."
 msgstr "Ongeldig e-mailadres: %s."
 
 #. TRANS: Page title when invitations have been sent.
-#: actions/invite.php:117
 msgid "Invitations sent"
 msgstr "De uitnodigingen zijn verzonden"
 
 #. TRANS: Page title when inviting potential users.
-#: actions/invite.php:120
 msgid "Invite new users"
 msgstr "Nieuwe gebruikers uitnodigen"
 
@@ -3427,7 +2737,6 @@ msgstr "Nieuwe gebruikers uitnodigen"
 #. TRANS: is already subscribed to one or more users with the given e-mail address(es).
 #. TRANS: Plural form is based on the number of reported already subscribed e-mail addresses.
 #. TRANS: Followed by a bullet list.
-#: actions/invite.php:140
 msgid "You are already subscribed to this user:"
 msgid_plural "You are already subscribed to these users:"
 msgstr[0] "U bent al geabonneerd op deze gebruiker:"
@@ -3435,7 +2744,6 @@ msgstr[1] "U bent al geabonneerd op deze gebruikers:"
 
 #. TRANS: Used as list item for already subscribed users (%1$s is nickname, %2$s is e-mail address).
 #. TRANS: Used as list item for already registered people (%1$s is nickname, %2$s is e-mail address).
-#: actions/invite.php:146 actions/invite.php:160
 #, php-format
 msgctxt "INVITE"
 msgid "%1$s (%2$s)"
@@ -3444,7 +2752,6 @@ msgstr "%1$s (%2$s)"
 #. TRANS: Message displayed inviting users to use a StatusNet site while the invited user
 #. TRANS: already uses a this StatusNet site. Plural form is based on the number of
 #. TRANS: reported already present people. Followed by a bullet list.
-#: actions/invite.php:154
 msgid "This person is already a user and you were automatically subscribed:"
 msgid_plural ""
 "These people are already users and you were automatically subscribed to them:"
@@ -3455,7 +2762,6 @@ msgstr[1] ""
 #. TRANS: Message displayed inviting users to use a StatusNet site. Plural form is
 #. TRANS: based on the number of invitations sent. Followed by a bullet list of
 #. TRANS: e-mail addresses to which invitations were sent.
-#: actions/invite.php:168
 msgid "Invitation sent to the following person:"
 msgid_plural "Invitations sent to the following people:"
 msgstr[0] "De uitnodiging is verzonden naar de volgende persoon:"
@@ -3463,7 +2769,6 @@ msgstr[1] "De uitnodigingen zijn verzonden naar de volgende personen:"
 
 #. TRANS: Generic message displayed after sending out one or more invitations to
 #. TRANS: people to join a StatusNet site.
-#: actions/invite.php:178
 msgid ""
 "You will be notified when your invitees accept the invitation and register "
 "on the site. Thanks for growing the community!"
@@ -3473,7 +2778,6 @@ msgstr ""
 "gemeenschap!"
 
 #. TRANS: Form instructions.
-#: actions/invite.php:191
 msgid ""
 "Use this form to invite your friends and colleagues to use this service."
 msgstr ""
@@ -3481,27 +2785,23 @@ msgstr ""
 "te gebruiken."
 
 #. TRANS: Field label for a list of e-mail addresses.
-#: actions/invite.php:218
 msgid "Email addresses"
 msgstr "E-mailadressen"
 
 #. TRANS: Tooltip for field label for a list of e-mail addresses.
-#: actions/invite.php:221
 msgid "Addresses of friends to invite (one per line)."
 msgstr "Adressen van uit te nodigen vrienden (één per regel)."
 
 #. TRANS: Field label for a personal message to send to invitees.
-#: actions/invite.php:225
 msgid "Personal message"
 msgstr "Persoonlijk bericht"
 
 #. TRANS: Tooltip for field label for a personal message to send to invitees.
-#: actions/invite.php:228
 msgid "Optionally add a personal message to the invitation."
 msgstr "Persoonlijk bericht bij de uitnodiging (optioneel)."
 
 #. TRANS: Send button for inviting friends
-#: actions/invite.php:232
+#. TRANS: Button text for sending notice.
 msgctxt "BUTTON"
 msgid "Send"
 msgstr "Verzenden"
@@ -3509,7 +2809,6 @@ msgstr "Verzenden"
 #. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral
 #. TRANS: singular 3rd-person pronoun in English. %1$s is the inviting user, $2$s is
 #. TRANS: the StatusNet sitename.
-#: actions/invite.php:264
 #, php-format
 msgid "%1$s has invited you to join them on %2$s"
 msgstr "%1$s heeft u uitgenodigd voor %2$s"
@@ -3519,7 +2818,6 @@ msgstr "%1$s heeft u uitgenodigd voor %2$s"
 #. TRANS: StatusNet sitename, %3$s is the site URL, %4$s is the personal message from the
 #. TRANS: inviting user, %s%5 a link to the timeline for the inviting user, %s$6 is a link
 #. TRANS: to register with the StatusNet site.
-#: actions/invite.php:271
 #, php-format
 msgid ""
 "%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -3577,50 +2875,44 @@ msgstr ""
 "Met vriendelijke groet, %2$s\n"
 
 #. TRANS: Client error displayed when trying to join a group while not logged in.
-#: actions/joingroup.php:59
 msgid "You must be logged in to join a group."
 msgstr "U moet aangemeld zijn om lid te worden van een groep."
 
 #. TRANS: Title for join group page after joining.
-#: actions/joingroup.php:148
 #, php-format
 msgctxt "TITLE"
 msgid "%1$s joined group %2$s"
 msgstr "%1$s is lid geworden van de groep %2$s"
 
 #. TRANS: Client error displayed when trying to leave a group while not logged in.
-#: actions/leavegroup.php:59
 msgid "You must be logged in to leave a group."
 msgstr "U moet aangemeld zijn om een groep te kunnen verlaten."
 
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
-#: actions/leavegroup.php:103 lib/command.php:398
 msgid "You are not a member of that group."
 msgstr "U bent geen lid van deze groep"
 
 #. TRANS: Title for leave group page after leaving.
-#: actions/leavegroup.php:142
 #, php-format
 msgctxt "TITLE"
 msgid "%1$s left group %2$s"
 msgstr "%1$s heeft de groep %2$s verlaten"
 
 #. TRANS: User admin panel title
-#: actions/licenseadminpanel.php:55
 msgctxt "TITLE"
 msgid "License"
 msgstr "Licentie"
 
-#: actions/licenseadminpanel.php:65
+#. TRANS: Form instructions for the site license admin panel.
 msgid "License for this StatusNet site"
 msgstr "Licentie voor deze StatusNetsite"
 
-#: actions/licenseadminpanel.php:134
+#. TRANS: Client error displayed selecting an invalid license in the license admin panel.
 msgid "Invalid license selection."
 msgstr "Ongeldige licentieselectie."
 
-#: actions/licenseadminpanel.php:144
+#. TRANS: Client error displayed when not specifying an owner for the all rights reserved license in the license admin panel.
 msgid ""
 "You must specify the owner of the content when using the All Rights Reserved "
 "license."
@@ -3628,134 +2920,135 @@ msgstr ""
 "U moet de eigenaar van de inhoud opgeven als u de licentie \"Alle rechten "
 "voorbehouden\" gebruikt."
 
-#: actions/licenseadminpanel.php:151
+#. TRANS: Client error displayed selecting a too long license title in the license admin panel.
 msgid "Invalid license title. Maximum length is 255 characters."
 msgstr "De licentienaam is ongeldig. De maximale lengte is 255 tekens."
 
-#: actions/licenseadminpanel.php:163
+#. TRANS: Client error displayed specifying an invalid license URL in the license admin panel.
 msgid "Invalid license URL."
 msgstr "Ongeldige licentie-URL."
 
-#: actions/licenseadminpanel.php:166
+#. TRANS: Client error displayed specifying an invalid license image URL in the license admin panel.
 msgid "Invalid license image URL."
 msgstr "Ongeldige URL voor licentieafbeelding."
 
-#: actions/licenseadminpanel.php:174
+#. TRANS: Client error displayed specifying an invalid license URL in the license admin panel.
 msgid "License URL must be blank or a valid URL."
 msgstr "De licentie-URL moet leeg zijn of een geldige URL."
 
-#: actions/licenseadminpanel.php:182
+#. TRANS: Client error displayed specifying an invalid license image URL in the license admin panel.
 msgid "License image must be blank or valid URL."
 msgstr "De licentieafbeelding moet leeg zijn of een geldige URL."
 
-#: actions/licenseadminpanel.php:232
+#. TRANS: Form legend in the license admin panel.
 msgid "License selection"
 msgstr "Licentieselectie"
 
-#: actions/licenseadminpanel.php:238
+#. TRANS: License option in the license admin panel.
 msgid "Private"
 msgstr "Privé"
 
-#: actions/licenseadminpanel.php:239
+#. TRANS: License option in the license admin panel.
 msgid "All Rights Reserved"
 msgstr "Alle rechten voorbehouden"
 
-#: actions/licenseadminpanel.php:240
+#. TRANS: License option in the license admin panel.
 msgid "Creative Commons"
 msgstr "Creative Commons"
 
-#: actions/licenseadminpanel.php:245
+#. TRANS: Dropdown field label in the license admin panel.
 msgid "Type"
 msgstr "Type"
 
-#: actions/licenseadminpanel.php:247
-msgid "Select license"
+#. TRANS: Dropdown field instructions in the license admin panel.
+#, fuzzy
+msgid "Select a license."
 msgstr "Selecteer licentie"
 
-#: actions/licenseadminpanel.php:261
+#. TRANS: Form legend in the license admin panel.
 msgid "License details"
 msgstr "Licentiedetails"
 
-#: actions/licenseadminpanel.php:267
+#. TRANS: Field label in the license admin panel.
 msgid "Owner"
 msgstr "Eigenaar"
 
-#: actions/licenseadminpanel.php:268
+#. TRANS: Field title in the license admin panel.
 msgid "Name of the owner of the site's content (if applicable)."
 msgstr "Naam van de eigenaar van de inhoud van de site (als van toepassing)."
 
-#: actions/licenseadminpanel.php:276
+#. TRANS: Field label in the license admin panel.
 msgid "License Title"
 msgstr "Licentienaam"
 
-#: actions/licenseadminpanel.php:277
+#. TRANS: Field title in the license admin panel.
 msgid "The title of the license."
 msgstr "De naam van de licentie."
 
-#: actions/licenseadminpanel.php:285
+#. TRANS: Field label in the license admin panel.
 msgid "License URL"
 msgstr "Licentie-URL"
 
-#: actions/licenseadminpanel.php:286
+#. TRANS: Field title in the license admin panel.
 msgid "URL for more information about the license."
 msgstr "URL voor meer informatie over de licentie."
 
-#: actions/licenseadminpanel.php:293
+#. TRANS: Field label in the license admin panel.
 msgid "License Image URL"
 msgstr "URL voor licentieafbeelding"
 
-#: actions/licenseadminpanel.php:294
+#. TRANS: Field title in the license admin panel.
 msgid "URL for an image to display with the license."
 msgstr "Een URL voor een afbeelding om weer te geven met de licentie."
 
-#. TRANS: Submit button title.
-#: actions/licenseadminpanel.php:311 actions/sessionsadminpanel.php:199
-#: actions/siteadminpanel.php:292 actions/snapshotadminpanel.php:245
-#: actions/tagother.php:133 lib/applicationeditform.php:357
-msgid "Save"
-msgstr "Opslaan"
-
-#: actions/licenseadminpanel.php:311
-msgid "Save license settings"
+#. TRANS: Button title in the license admin panel.
+#, fuzzy
+msgid "Save license settings."
 msgstr "Licentieinstellingen opslaan"
 
+#. TRANS: Client error displayed when trying to log in while already logged in.
 #. TRANS: Client error displayed trying to use "one time password login" when already logged in.
-#: actions/login.php:97 actions/otp.php:62 actions/register.php:130
 msgid "Already logged in."
 msgstr "U bent al aangemeld."
 
-#: actions/login.php:125
+#. TRANS: Form validation error displayed when trying to log in with incorrect credentials.
 msgid "Incorrect username or password."
 msgstr "De gebruikersnaam of wachtwoord is onjuist."
 
+#. TRANS: Server error displayed when during login a server error occurs.
 #. TRANS: Server error displayed when a user object could not be created trying to login using "one time password login".
-#: actions/login.php:131 actions/otp.php:127
 msgid "Error setting user. You are probably not authorized."
 msgstr ""
 "Er is een fout opgetreden bij het maken van de instellingen. U hebt "
 "waarschijnlijk niet de juiste rechten."
 
-#: actions/login.php:185 actions/login.php:236 lib/action.php:598
+#. TRANS: Page title for login page.
 msgid "Login"
 msgstr "Aanmelden"
 
-#: actions/login.php:222
+#. TRANS: Form legend on login page.
 msgid "Login to site"
 msgstr "Aanmelden"
 
-#: actions/login.php:231 actions/register.php:469
+#. TRANS: Checkbox label label on login page.
 msgid "Remember me"
 msgstr "Aanmeldgegevens onthouden"
 
-#: actions/login.php:232 actions/register.php:471
+#. TRANS: Checkbox title on login page.
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "Voortaan automatisch aanmelden. Niet gebruiken op gedeelde computers!"
 
-#: actions/login.php:241
+#. TRANS: Button text for log in on login page.
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Login"
+msgstr "Aanmelden"
+
+#. TRANS: Link text for link to "reset password" on login page.
 msgid "Lost or forgotten password?"
 msgstr "Wachtwoord kwijt of vergeten?"
 
-#: actions/login.php:259
+#. TRANS: Form instructions on login page before being able to change user settings.
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -3763,11 +3056,12 @@ msgstr ""
 "Om veiligheidsredenen moet u uw gebruikersnaam en wachtwoord nogmaals "
 "invoeren alvorens u uw instellingen kunt wijzigen."
 
-#: actions/login.php:263
+#. TRANS: Form instructions on login page.
 msgid "Login with your username and password."
 msgstr "Aanmelden met uw gebruikersnaam en wachtwoord."
 
-#: actions/login.php:266
+#. TRANS: Form instructions on login page. This message contains Markdown links in the form [Link text](Link).
+#. TRANS: %%action.register%% is a link to the registration page.
 #, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -3775,126 +3069,121 @@ msgstr ""
 "Hebt u nog geen gebruikersnaam? [Registreer een nieuwe gebruiker](%%action."
 "register%%)."
 
-#: actions/makeadmin.php:92
+#. TRANS: Client error displayed when trying to make another user admin on the Make Admin page while not an admin.
 msgid "Only an admin can make another user an admin."
 msgstr "Alleen beheerders kunnen andere gebruikers beheerder maken."
 
-#: actions/makeadmin.php:96
+#. TRANS: Client error displayed when trying to make another user admin on the Make Admin page who already is admin.
+#. TRANS: %1$s is the user that is already admin, %2$s is the group user is already admin for.
 #, php-format
 msgid "%1$s is already an admin for group \"%2$s\"."
 msgstr "%1$s is al beheerder van de groep \"%2$s\""
 
-#: actions/makeadmin.php:133
+#. TRANS: Server error displayed when trying to make another user admin on the Make Admin page fails
+#. TRANS: because the group membership record could not be gotten.
+#. TRANS: %1$s is the to be admin user, %2$s is the group user should be admin for.
 #, php-format
 msgid "Can't get membership record for %1$s in group %2$s."
 msgstr "Het was niet mogelijk te bevestigen dat %1$s lid is van de groep %2$s."
 
-#: actions/makeadmin.php:146
+#. TRANS: Server error displayed when trying to make another user admin on the Make Admin page fails
+#. TRANS: because the group adminship record coud not be saved properly.
+#. TRANS: %1$s is the to be admin user, %2$s is the group user is already admin for.
 #, php-format
 msgid "Can't make %1$s an admin for group %2$s."
 msgstr "Het is niet mogelijk %1$s beheerder te maken van de groep %2$s."
 
-#: actions/microsummary.php:69
+#. TRANS: Client error displayed trying to make a micro summary without providing a status.
 msgid "No current status."
 msgstr "Geen huidige status."
 
 #. TRANS: This is the title of the form for adding a new application.
-#: actions/newapplication.php:52
 msgid "New application"
 msgstr "Nieuwe applicatie"
 
 #. TRANS: Client error displayed trying to add a new application while not logged in.
-#: actions/newapplication.php:64
 msgid "You must be logged in to register an application."
 msgstr "U moet aangemeld zijn om een applicatie te kunnen registreren."
 
 #. TRANS: Form instructions for registering a new application.
-#: actions/newapplication.php:147
 msgid "Use this form to register a new application."
 msgstr "Gebruik dit formulier om een nieuwe applicatie te registreren."
 
 #. TRANS: Validation error shown when not providing a source URL in the "New application" form.
-#: actions/newapplication.php:189
 msgid "Source URL is required."
 msgstr "Een bron-URL is verplicht."
 
 #. TRANS: Server error displayed when an application could not be registered in the database through the "New application" form.
-#: actions/newapplication.php:279 actions/newapplication.php:289
 msgid "Could not create application."
 msgstr "Het was niet mogelijk de applicatie aan te maken."
 
 #. TRANS: Title for form to create a group.
-#: actions/newgroup.php:53
 msgid "New group"
 msgstr "Nieuwe groep"
 
 #. TRANS: Client exception thrown when a user tries to create a group while banned.
-#: actions/newgroup.php:73 classes/User_group.php:485
 msgid "You are not allowed to create groups on this site."
 msgstr "U mag geen groepen aanmaken op deze site."
 
 #. TRANS: Form instructions for group create form.
-#: actions/newgroup.php:117
 msgid "Use this form to create a new group."
 msgstr "Gebruik dit formulier om een nieuwe groep aan te maken."
 
-#. TRANS: Group create form validation error.
-#: actions/newgroup.php:200
-msgid "Alias cannot be the same as nickname."
-msgstr "Een alias kan niet hetzelfde zijn als de gebruikersnaam."
-
-#: actions/newmessage.php:71 actions/newmessage.php:234
+#. TRANS: Page title for new direct message page.
+#. TRANS: Page title on page for sending a direct message.
 msgid "New message"
 msgstr "Nieuw bericht"
 
-#. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
-#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:513
-msgid "You can't send a message to this user."
+#. TRANS: Client error displayed trying to send a direct message to a user while sender and
+#. TRANS: receiver are not subscribed to each other.
+#, fuzzy
+msgid "You cannot send a message to this user."
 msgstr "U kunt geen bericht naar deze gebruiker zenden."
 
+#. TRANS: Form validator error displayed trying to send a direct message without content.
+#. TRANS: Client error displayed trying to send a notice without content.
 #. TRANS: Command exception text shown when trying to send a direct message to another user without content.
 #. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
-#: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:490
-#: lib/command.php:593
 msgid "No content!"
 msgstr "Geen inhoud!"
 
-#: actions/newmessage.php:161
+#. TRANS: Form validation error displayed trying to send a direct message without specifying a recipient.
 msgid "No recipient specified."
 msgstr "Er is geen ontvanger aangegeven."
 
+#. TRANS: Client error displayed trying to send a direct message to self.
 #. TRANS: Error text shown when trying to send a direct message to self.
-#: actions/newmessage.php:167 lib/command.php:517
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr "Stuur geen berichten naar uzelf. Zeg het gewoon in uw hoofd."
 
-#: actions/newmessage.php:184
+#. TRANS: Page title after sending a direct message.
 msgid "Message sent"
 msgstr "Bericht verzonden."
 
+#. TRANS: Confirmation text after sending a direct message.
+#. TRANS: %s is the direct message recipient.
 #. TRANS: Message given have sent a direct message to another user.
 #. TRANS: %s is the name of the other user.
-#: actions/newmessage.php:188 lib/command.php:525
 #, php-format
 msgid "Direct message to %s sent."
 msgstr "Het directe bericht aan %s is verzonden."
 
-#: actions/newmessage.php:213 actions/newnotice.php:264
+#. TRANS: Page title after an AJAX error occurred on the "send direct message" page.
+#. TRANS: Page title after an AJAX error occurs on the send notice page.
 msgid "Ajax Error"
 msgstr "Er is een Ajax-fout opgetreden"
 
-#: actions/newnotice.php:69
+#. TRANS: Page title for sending a new notice.
 msgid "New notice"
 msgstr "Nieuw bericht"
 
-#: actions/newnotice.php:230
+#. TRANS: Page title after sending a notice.
 msgid "Notice posted"
 msgstr "De mededeling is verzonden"
 
 #. TRANS: Instructions for Notice search page.
 #. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/noticesearch.php:69
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -3904,20 +3193,17 @@ msgstr ""
 "zoektermen met spaties. Zoektermen moeten uit drie of meer tekens bestaan."
 
 #. TRANS: Title of the page where users can search for notices.
-#: actions/noticesearch.php:80
 msgid "Text search"
 msgstr "Tekst doorzoeken"
 
 #. TRANS: Test in RSS notice search.
 #. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearch.php:95
 #, php-format
 msgid "Search results for \"%1$s\" on %2$s"
 msgstr "Zoekresultaten voor \"%1$s\" op %2$s"
 
 #. TRANS: Text for logged in users making a query for notices without results.
 #. TRANS: This message contains a Markdown link.
-#: actions/noticesearch.php:128
 #, php-format
 msgid ""
 "Be the first to [post on this topic](%%%%action.newnotice%%%%?"
@@ -3928,7 +3214,6 @@ msgstr ""
 
 #. TRANS: Text for not logged in users making a query for notices without results.
 #. TRANS: This message contains Markdown links.
-#: actions/noticesearch.php:133
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and be the first to "
@@ -3939,74 +3224,64 @@ msgstr ""
 "status_textarea=%s)!"
 
 #. TRANS: RSS notice search feed title. %s is the query.
-#: actions/noticesearchrss.php:95
 #, php-format
 msgid "Updates with \"%s\""
 msgstr "Updates met \"%s\""
 
 #. TRANS: RSS notice search feed description.
 #. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearchrss.php:99
 #, php-format
 msgid "Updates matching search term \"%1$s\" on %2$s."
 msgstr "Updates die overeenkomen met de zoekterm \"%1$s\" op %2$s."
 
-#: actions/nudge.php:85
+#. TRANS: Client error displayed trying to nudge a user that cannot be nudged.
 msgid ""
 "This user doesn't allow nudges or hasn't confirmed or set their email "
 "address yet."
 msgstr ""
 "Deze gebruiker is niet te porren of heeft nog geen bevestigd e-mailadres."
 
-#: actions/nudge.php:94
+#. TRANS: Page title after sending a nudge.
 msgid "Nudge sent"
 msgstr "De por is verzonden"
 
-#: actions/nudge.php:97
+#. TRANS: Confirmation text after sending a nudge.
 msgid "Nudge sent!"
 msgstr "De por is verzonden!"
 
 #. TRANS: Message displayed to an anonymous user trying to view OAuth application list.
-#: actions/oauthappssettings.php:57
 msgid "You must be logged in to list your applications."
 msgstr ""
 "U moet aangemeld zijn om een lijst met uw applicaties te kunnen bekijken."
 
 #. TRANS: Page title for OAuth applications
-#: actions/oauthappssettings.php:73
 msgid "OAuth applications"
 msgstr "Overige instellingen"
 
 #. TRANS: Page instructions for OAuth applications
-#: actions/oauthappssettings.php:85
 msgid "Applications you have registered"
 msgstr "Door u geregistreerde applicaties"
 
 #. TRANS: Empty list message on page with OAuth applications.
-#: actions/oauthappssettings.php:138
 #, php-format
 msgid "You have not registered any applications yet."
 msgstr "U hebt nog geen applicaties geregistreerd."
 
 #. TRANS: Title for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:69
 msgid "Connected applications"
 msgstr "Verbonden applicaties"
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:80
 msgid "The following connections exist for your account."
 msgstr ""
 "U hebt de onderstaande applicaties toegang gegeven tot uw gebruikersgegevens."
 
 #. TRANS: Client error when trying to revoke access for an application while not being a user of it.
-#: actions/oauthconnectionssettings.php:165
 msgid "You are not a user of that application."
 msgstr "U bent geen gebruiker van die applicatie."
 
 #. TRANS: Client error when revoking access has failed for some reason.
 #. TRANS: %s is the application ID revoking access failed for.
-#: actions/oauthconnectionssettings.php:180
 #, php-format
 msgid "Unable to revoke access for application: %s."
 msgstr ""
@@ -4015,7 +3290,6 @@ msgstr ""
 
 #. TRANS: Success message after revoking access for an application.
 #. TRANS: %1$s is the application name, %2$s is the first part of the user token.
-#: actions/oauthconnectionssettings.php:199
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -4025,7 +3299,6 @@ msgstr ""
 "ingetrokken."
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:210
 msgid "You have not authorized any applications to use your account."
 msgstr ""
 "U hebt geen enkele applicatie geautoriseerd voor toegang tot uw "
@@ -4034,7 +3307,6 @@ msgstr ""
 #. TRANS: Note for developers in the OAuth connection settings form.
 #. TRANS: This message contains a Markdown link. Do not separate "](".
 #. TRANS: %s is the URL to the OAuth settings.
-#: actions/oauthconnectionssettings.php:230
 #, php-format
 msgid ""
 "Are you a developer? [Register an OAuth client application](%s) to use with "
@@ -4043,438 +3315,357 @@ msgstr ""
 "Bet u ontwikkelaar? [Registreer dan een OAuthprogramma](%s) om te gebruiken "
 "met deze Statusnetsite."
 
-#: actions/oembed.php:64
+#. TRANS: Server error displayed in oEmbed action when path not found.
+#. TRANS: %s is a path.
 #, php-format
 msgid "\"%s\" not found."
 msgstr "\"%s\" is niet aangetroffen."
 
-#: actions/oembed.php:76
+#. TRANS: Server error displayed in oEmbed action when notice not found.
+#. TRANS: %s is a notice.
 #, php-format
 msgid "Notice %s not found."
 msgstr "Opmerking \"%s\" is niet gevonden."
 
-#: actions/oembed.php:80 actions/shownotice.php:100
+#. TRANS: Server error displayed in oEmbed action when notice has not profile.
 msgid "Notice has no profile."
 msgstr "Mededeling heeft geen profiel."
 
-#: actions/oembed.php:83 actions/shownotice.php:172
+#. TRANS: oEmbed title. %1$s is the author name, %2$s is the creation date.
 #, php-format
 msgid "%1$s's status on %2$s"
 msgstr "Status van %1$s op %2$s"
 
-#: actions/oembed.php:95
+#. TRANS: Server error displayed in oEmbed action when attachment not found.
+#. TRANS: %d is an attachment ID.
 #, php-format
 msgid "Attachment %s not found."
 msgstr "De bijlage %s is niet gevonden."
 
-#: actions/oembed.php:136
+#. TRANS: Server error displayed in oEmbed request when a path is not supported.
+#. TRANS: %s is a path.
 #, php-format
 msgid "\"%s\" not supported for oembed requests."
 msgstr "\"%s\" wordt niet ondersteund voor oembed-verzoeken."
 
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
-#: actions/oembed.php:168
 #, php-format
 msgid "Content type %s not supported."
 msgstr "Inhoudstype %s wordt niet ondersteund."
 
 #. TRANS: Error message displaying attachments. %s is the site's base URL.
-#: actions/oembed.php:172
 #, php-format
 msgid "Only %s URLs over plain HTTP please."
 msgstr "Alleen URL's voor %s via normale HTTP alstublieft."
 
+#. TRANS: Server error displayed in oEmbed action when request specifies an unsupported data format.
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1207
-#: lib/apiaction.php:1234 lib/apiaction.php:1369
 msgid "Not a supported data format."
 msgstr "Geen ondersteund gegevensformaat."
 
 #. TRANS: ShortName in the OpenSearch interface when trying to find users.
-#: actions/opensearch.php:64
 msgid "People Search"
 msgstr "Mensen zoeken"
 
-#: actions/opensearch.php:68
+#. TRANS: ShortName in the OpenSearch interface when trying to find notices.
 msgid "Notice Search"
 msgstr "Mededeling zoeken"
 
 #. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
-#: actions/otp.php:70
 msgid "No user ID specified."
 msgstr "Er is geen ID opgegeven."
 
 #. TRANS: Client error displayed trying to use "one time password login" without specifying a login token.
-#: actions/otp.php:86
 msgid "No login token specified."
 msgstr "Er is geen token opgegeven."
 
 #. TRANS: Client error displayed trying to use "one time password login" without requesting a login token.
-#: actions/otp.php:94
 msgid "No login token requested."
 msgstr "Er is niet om een aanmeldtoken gevraagd."
 
 #. TRANS: Client error displayed trying to use "one time password login" while specifying an invalid login token.
-#: actions/otp.php:100
 msgid "Invalid login token specified."
 msgstr "Het opgegeven token is ongeldig."
 
 #. TRANS: Client error displayed trying to use "one time password login" while specifying an expired login token.
-#: actions/otp.php:110
 msgid "Login token expired."
 msgstr "Het aanmeldtoken is verlopen."
 
 #. TRANS: Title for outbox for any but the fist page.
 #. TRANS: %1$s is the user nickname, %2$d is the page number.
-#: actions/outbox.php:57
 #, php-format
 msgid "Outbox for %1$s - page %2$d"
 msgstr "Postvak UIT voor %1$s - pagina %2$d"
 
 #. TRANS: Title for first page of outbox.
-#: actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
 msgstr "Postvak UIT voor %s"
 
 #. TRANS: Instructions for outbox.
-#: actions/outbox.php:103
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr "Dit is uw Postvak UIT waarin de door u verzonden privéberichten staan."
 
-#: actions/passwordsettings.php:58
 msgid "Change password"
 msgstr "Wachtwoord wijzigen"
 
-#: actions/passwordsettings.php:69
 msgid "Change your password."
 msgstr "Wachtwoord wijzigen"
 
 #. TRANS: Fieldset legend for password reset form.
-#: actions/passwordsettings.php:96 actions/recoverpassword.php:251
 msgid "Password change"
 msgstr "Wachtwoord wijzigen"
 
-#: actions/passwordsettings.php:104
 msgid "Old password"
 msgstr "Huidige wachtwoord"
 
 #. TRANS: Field label for password reset form.
-#: actions/passwordsettings.php:108 actions/recoverpassword.php:256
 msgid "New password"
 msgstr "Nieuw wachtwoord"
 
-#: actions/passwordsettings.php:109 actions/register.php:416
 msgid "6 or more characters."
 msgstr "Zes of meer tekens"
 
 #. TRANS: Ttile for field label for password reset form where the password has to be typed again.
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:264
-#: actions/register.php:420
 msgid "Same as password above."
 msgstr "Gelijk aan het wachtwoord hierboven."
 
-#: actions/passwordsettings.php:117
 msgid "Change"
 msgstr "Wijzigen"
 
-#: actions/passwordsettings.php:153 actions/register.php:223
 msgid "Password must be 6 or more characters."
 msgstr "Het wachtwoord moet zes of meer tekens bevatten."
 
-#: actions/passwordsettings.php:156 actions/register.php:226
 msgid "Passwords don't match."
 msgstr "De wachtwoorden komen niet overeen."
 
-#: actions/passwordsettings.php:164
 msgid "Incorrect old password"
 msgstr "Het oude wachtwoord is onjuist"
 
-#: actions/passwordsettings.php:180
 msgid "Error saving user; invalid."
 msgstr "Fout bij opslaan gebruiker; ongeldig."
 
 #. TRANS: Reset password form validation error message.
-#: actions/passwordsettings.php:185 actions/recoverpassword.php:418
 msgid "Cannot save new password."
 msgstr "Het was niet mogelijk het nieuwe wachtwoord op te slaan."
 
-#: actions/passwordsettings.php:191
 msgid "Password saved."
 msgstr "Het wachtwoord is opgeslagen."
 
 #. TRANS: Title for Paths admin panel.
 #. TRANS: Menu item for site administration
-#: actions/pathsadminpanel.php:58 lib/adminpanelaction.php:371
 msgid "Paths"
 msgstr "Paden"
 
 #. TRANS: Form instructions for Path admin panel.
-#: actions/pathsadminpanel.php:69
 msgid "Path and server settings for this StatusNet site"
 msgstr "Pad- en serverinstellingen voor de StatusNet-website"
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the directory that could not be read from.
-#: actions/pathsadminpanel.php:155
 #, php-format
 msgid "Theme directory not readable: %s."
 msgstr "Er kan niet uit de vormgevingmap gelezen worden: %s."
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the avatar directory that could not be written to.
-#: actions/pathsadminpanel.php:163
 #, php-format
 msgid "Avatar directory not writable: %s."
 msgstr "Er kan niet in de avatarmap geschreven worden: %s."
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the background directory that could not be written to.
-#: actions/pathsadminpanel.php:171
 #, php-format
 msgid "Background directory not writable: %s."
 msgstr "Er kan niet in de achtergrondmap geschreven worden: %s."
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the locales directory that could not be read from.
-#: actions/pathsadminpanel.php:181
 #, php-format
 msgid "Locales directory not readable: %s."
 msgstr "Er kan niet uit de talenmap gelezen worden: %s."
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the SSL server URL that is too long.
-#: actions/pathsadminpanel.php:189
 msgid "Invalid SSL server. The maximum length is 255 characters."
 msgstr "De SSL-server is ongeldig. De maximale lengte is 255 tekens."
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:235 actions/siteadminpanel.php:58
 msgid "Site"
 msgstr "Website"
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:241 actions/pathsadminpanel.php:279
-#: actions/pathsadminpanel.php:370 actions/pathsadminpanel.php:425
 msgid "Server"
 msgstr "Server"
 
-#: actions/pathsadminpanel.php:242
 msgid "Site's server hostname."
 msgstr "Hostnaam van de website server."
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:248 actions/pathsadminpanel.php:288
-#: actions/pathsadminpanel.php:379 actions/pathsadminpanel.php:434
 msgid "Path"
 msgstr "Pad"
 
-#: actions/pathsadminpanel.php:249
 msgid "Site path."
 msgstr "Websitepad."
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:255
 msgid "Locale directory"
 msgstr "Map voor taalondersteuning"
 
-#: actions/pathsadminpanel.php:256
 msgid "Directory path to locales."
 msgstr "Map voor taalondersteuning."
 
 #. TRANS: Checkbox label in Paths admin panel.
-#: actions/pathsadminpanel.php:263
 msgid "Fancy URLs"
 msgstr "Nette URL's"
 
-#: actions/pathsadminpanel.php:265
 msgid "Use fancy (more readable and memorable) URLs?"
 msgstr "Nette URL's (meer leesbaar en beter te onthouden) gebruiken?"
 
-#: actions/pathsadminpanel.php:272
 msgid "Theme"
 msgstr "Vormgeving"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:281
 msgid "Server for themes."
 msgstr "Server voor vormgevingen."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:290
 msgid "Web path to themes."
 msgstr "Webpad voor vormgevingen."
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:297 actions/pathsadminpanel.php:388
-#: actions/pathsadminpanel.php:443 actions/pathsadminpanel.php:495
 msgid "SSL server"
 msgstr "SSL-server"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:299
 msgid "SSL server for themes (default: SSL server)."
 msgstr "SSL-server voor vormgevingen (standaard: SSL-server)."
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:306 actions/pathsadminpanel.php:397
-#: actions/pathsadminpanel.php:452
 msgid "SSL path"
 msgstr "SSL-pad"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:308
 msgid "SSL path to themes (default: /theme/)."
 msgstr "SSL-pad naar vorgevingen (standaard: /theme/)."
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:315 actions/pathsadminpanel.php:406
-#: actions/pathsadminpanel.php:461
 msgid "Directory"
 msgstr "Map"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:317
 msgid "Directory where themes are located."
 msgstr "Map waar alle vormgevingen worden opgeslagen."
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:326
 msgid "Avatars"
 msgstr "Avatars"
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:333
 msgid "Avatar server"
 msgstr "Avatarserver"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:335
 msgid "Server for avatars."
 msgstr "Server voor avatars."
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:342
 msgid "Avatar path"
 msgstr "Avatarpad"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:344
 msgid "Web path to avatars."
 msgstr "Webpad naar avatars."
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:351
 msgid "Avatar directory"
 msgstr "Avatarmap"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:353
 msgid "Directory where avatars are located."
 msgstr "Map waar alle avatars worden opgeslagen."
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:364
 msgid "Backgrounds"
 msgstr "Achtergronden"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:372
 msgid "Server for backgrounds."
 msgstr "Server voor achtergronden."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:381
 msgid "Web path to backgrounds."
 msgstr "Webpad naar achtergronden."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:390
 msgid "Server for backgrounds on SSL pages."
 msgstr "Server voor achtergronden op SSL-pagina's."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:399
 msgid "Web path to backgrounds on SSL pages."
 msgstr "Webpad naar achtergronden op SSL-pagina's."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:408
 msgid "Directory where backgrounds are located."
 msgstr "Map waar achtergronden worden opgeslagen."
 
 #. TRANS: Fieldset legens in Paths admin panel.
-#: actions/pathsadminpanel.php:419
 msgid "Attachments"
 msgstr "Bijlagen"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:427
 msgid "Server for attachments."
 msgstr "Server voor bijlagen."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:436
 msgid "Web path to attachments."
 msgstr "Webpad voor bijlagen."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:445
 msgid "Server for attachments on SSL pages."
 msgstr "Server voor bijlagen op SSL-pagina's."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:454
 msgid "Web path to attachments on SSL pages."
 msgstr "Webpad voor bijlagen op SSL-pagina's."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:463
 msgid "Directory where attachments are located."
 msgstr "Map waar bijlagen worden opgeslagen."
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:472
 msgid "SSL"
 msgstr "SSL"
 
 #. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
-#: actions/pathsadminpanel.php:477 actions/snapshotadminpanel.php:202
 msgid "Never"
 msgstr "Nooit"
 
 #. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
-#: actions/pathsadminpanel.php:479
 msgid "Sometimes"
 msgstr "Soms"
 
 #. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
-#: actions/pathsadminpanel.php:481
 msgid "Always"
 msgstr "Altijd"
 
-#: actions/pathsadminpanel.php:485
 msgid "Use SSL"
 msgstr "SSL gebruiken"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:487
 msgid "When to use SSL."
 msgstr "Wanneer SSL gebruikt moet worden."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:497
 msgid "Server to direct SSL requests to."
 msgstr "De server waar SSL-verzoeken heen gestuurd moeten worden."
 
 #. TRANS: Button title text to store form data in the Paths admin panel.
-#: actions/pathsadminpanel.php:514
 msgid "Save paths"
 msgstr "Opslagpaden"
 
 #. TRANS: Instructions for the "People search" page.
 #. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/peoplesearch.php:54
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
@@ -4485,79 +3676,66 @@ msgstr ""
 "meer tekens bestaan."
 
 #. TRANS: Title of a page where users can search for other users.
-#: actions/peoplesearch.php:61
 msgid "People search"
 msgstr "Gebruikers zoeken"
 
-#: actions/peopletag.php:68
 #, php-format
 msgid "Not a valid people tag: %s."
 msgstr "Geen geldig gebruikerslabel: %s."
 
-#: actions/peopletag.php:142
 #, php-format
 msgid "Users self-tagged with %1$s - page %2$d"
 msgstr "Gebruikers die zichzelf met %1$s hebben gelabeld - pagina %2$d"
 
 #. TRANS: Page title for AJAX form return when a disabling a plugin.
-#: actions/plugindisable.php:69
 msgctxt "plugin"
 msgid "Disabled"
-msgstr ""
+msgstr "Uitgeschakeld"
 
 #. TRANS: Client error displayed trying to perform any request method other than POST.
 #. TRANS: Do not translate POST.
-#: actions/pluginenable.php:78 actions/subscribe.php:77
 msgid "This action only accepts POST requests."
 msgstr "Deze handeling accepteert alleen POST-verzoeken."
 
-#: actions/pluginenable.php:102
-#, fuzzy
 msgid "You cannot administer plugins."
-msgstr "U kunt gebruikers niet verwijderen."
+msgstr "U kunt plug-ins niet beheren."
 
-#: actions/pluginenable.php:109
-#, fuzzy
 msgid "No such plugin."
-msgstr "Deze pagina bestaat niet."
+msgstr "Deze plug-in bestaat niet."
 
 #. TRANS: Page title for AJAX form return when enabling a plugin.
-#: actions/pluginenable.php:159
 msgctxt "plugin"
 msgid "Enabled"
-msgstr ""
+msgstr "Ingeschakeld"
 
 #. TRANS: Tab and title for plugins admin panel.
 #. TRANS: Menu item for site administration
-#: actions/pluginsadminpanel.php:56 actions/version.php:191
-#: lib/adminpanelaction.php:411
 msgid "Plugins"
 msgstr "Plug-ins"
 
 #. TRANS: Instructions at top of plugin admin page.
-#: actions/pluginsadminpanel.php:68
 msgid ""
 "Additional plugins can be enabled and configured manually. See the <a href="
 "\"http://status.net/wiki/Plugins\">online plugin documentation</a> for more "
 "details."
 msgstr ""
+"Extra plug-ins kunnen handmatig ingeschakeld en ingesteld worden. Zie de <a "
+"href=\"http://status.net/wiki/Plugins\">online plug-indocumentatie</a> voor "
+"meer details."
 
 #. TRANS: Admin form section header
-#: actions/pluginsadminpanel.php:84
-#, fuzzy
 msgid "Default plugins"
-msgstr "Standaardtaal"
+msgstr "Standaard plug-ins"
 
-#: actions/pluginsadminpanel.php:106
 msgid ""
 "All default plugins have been disabled from the site's configuration file."
 msgstr ""
+"Alle standaard plug-ins zijn uitgeschakeld in het bestand met "
+"siteinstellingen."
 
-#: actions/postnotice.php:95
 msgid "Invalid notice content."
 msgstr "Ongeldige mededelinginhoud."
 
-#: actions/postnotice.php:101
 #, php-format
 msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’."
 msgstr ""
@@ -4565,12 +3743,10 @@ msgstr ""
 "van deze site."
 
 #. TRANS: Page title for profile settings.
-#: actions/profilesettings.php:60
 msgid "Profile settings"
 msgstr "Profielinstellingen"
 
 #. TRANS: Usage instructions for profile settings.
-#: actions/profilesettings.php:71
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
@@ -4578,37 +3754,29 @@ msgstr ""
 "andere gebruikers."
 
 #. TRANS: Profile settings form legend.
-#: actions/profilesettings.php:99
 msgid "Profile information"
 msgstr "Profielinformatie"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:110 actions/register.php:412
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr "1-64 kleine letters of cijfers, geen leestekens of spaties."
 
 #. TRANS: Field label in form for profile settings.
-#: actions/profilesettings.php:114 actions/register.php:434
-#: lib/groupeditform.php:150
 msgid "Full name"
 msgstr "Volledige naam"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:119 actions/register.php:439
-#: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "Startpagina"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:122 actions/register.php:441
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr "De URL van uw thuispagina, blog of profiel bij een andere website."
 
 #. TRANS: Tooltip for field label in form for profile settings. Plural
 #. TRANS: is decided by the number of characters available for the
 #. TRANS: biography (%d).
-#: actions/profilesettings.php:130 actions/register.php:450
 #, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4616,41 +3784,31 @@ msgstr[0] "Beschrijf uzelf en uw interesses in %d teken"
 msgstr[1] "Beschrijf uzelf en uw interesses in %d tekens"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:136 actions/register.php:455
 msgid "Describe yourself and your interests"
 msgstr "Beschrijf uzelf en uw interesses"
 
 #. TRANS: Text area label in form for profile settings where users can provide.
 #. TRANS: their biography.
-#: actions/profilesettings.php:140 actions/register.php:457
 msgid "Bio"
 msgstr "Beschrijving"
 
 #. TRANS: Field label in form for profile settings.
-#: actions/profilesettings.php:146 actions/register.php:462
-#: lib/groupeditform.php:173
 msgid "Location"
 msgstr "Locatie"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:149
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Waar u bent, bijvoorbeeld \"woonplaats, land\" of \"postcode, land\""
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:154
 msgid "Share my current location when posting notices"
 msgstr "Mijn huidige locatie weergeven bij het plaatsen van mededelingen"
 
 #. TRANS: Field label in form for profile settings.
-#: actions/profilesettings.php:162 actions/tagother.php:128
-#: actions/tagother.php:188 lib/subscriptionlist.php:104
-#: lib/subscriptionlist.php:106
 msgid "Tags"
 msgstr "Labels"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:165
 msgid ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- "
 "separated."
@@ -4659,27 +3817,22 @@ msgstr ""
 "spaties."
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:170
 msgid "Language"
 msgstr "Taal"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:172
 msgid "Preferred language."
 msgstr "Uw voorkeurstaal."
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:182
 msgid "Timezone"
 msgstr "Tijdzone"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:184
 msgid "What timezone are you normally in?"
 msgstr "In welke tijdzone verblijft u meestal?"
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:190
 msgid ""
 "Automatically subscribe to whoever subscribes to me (best for non-humans)."
 msgstr ""
@@ -4689,7 +3842,6 @@ msgstr ""
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Plural form is used based on the maximum number of allowed
 #. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:259 actions/register.php:214
 #, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4697,83 +3849,67 @@ msgstr[0] "De persoonlijke beschrijving is te lang (maximaal %d teken)."
 msgstr[1] "De persoonlijke beschrijving is te lang (maximaal %d tekens)."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:270 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr "Er is geen tijdzone geselecteerd."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:278
 msgid "Language is too long (maximum 50 characters)."
 msgstr "De taal is te lang (maximaal 50 tekens)."
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:292
 #, php-format
 msgid "Invalid tag: \"%s\"."
 msgstr "Ongeldig label: \"%s\"."
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:348
 msgid "Could not update user for autosubscribe."
 msgstr ""
 "Het was niet mogelijk de instelling voor automatisch abonneren voor de "
 "gebruiker bij te werken."
 
 #. TRANS: Server error thrown when user profile location preference settings could not be updated.
-#: actions/profilesettings.php:406
 msgid "Could not save location prefs."
 msgstr "Het was niet mogelijk de locatievoorkeuren op te slaan."
 
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:428 actions/tagother.php:179
 msgid "Could not save tags."
 msgstr "Het was niet mogelijk de labels op te slaan."
 
 #. TRANS: Confirmation shown when user profile settings are saved.
 #. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:437 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "De instellingen zijn opgeslagen."
 
 #. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
 #. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:484 actions/restoreaccount.php:60
 msgid "Restore account"
 msgstr "Gebruiker terugladen van back-up"
 
-#: actions/public.php:83
 #, php-format
 msgid "Beyond the page limit (%s)."
 msgstr "Meer dan de paginalimiet (%s)."
 
-#: actions/public.php:92
 msgid "Could not retrieve public stream."
 msgstr "Het was niet mogelijk de publieke stream op te halen."
 
-#: actions/public.php:130
 #, php-format
 msgid "Public timeline, page %d"
 msgstr "Openbare tijdlijn, pagina %d"
 
-#: actions/public.php:132 lib/publicgroupnav.php:79
 msgid "Public timeline"
 msgstr "Openbare tijdlijn"
 
-#: actions/public.php:160
 msgid "Public Stream Feed (RSS 1.0)"
 msgstr "Publieke streamfeed (RSS 1.0)"
 
-#: actions/public.php:164
 msgid "Public Stream Feed (RSS 2.0)"
 msgstr "Publieke streamfeed (RSS 1.0)"
 
-#: actions/public.php:168
 msgid "Public Stream Feed (Atom)"
 msgstr "Publieke streamfeed (Atom)"
 
-#: actions/public.php:188
 #, php-format
 msgid ""
 "This is the public timeline for %%site.name%% but no one has posted anything "
@@ -4782,11 +3918,9 @@ msgstr ""
 "Dit is de publieke tijdlijn voor %%site.name%%, maar niemand heeft nog "
 "berichten geplaatst."
 
-#: actions/public.php:191
 msgid "Be the first to post!"
 msgstr "U kunt de eerste zijn die een bericht plaatst!"
 
-#: actions/public.php:195
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post!"
@@ -4794,7 +3928,6 @@ msgstr ""
 "Waarom [registreert u geen gebruiker](%%action.register%%) en plaatst u als "
 "eerste een bericht?"
 
-#: actions/public.php:242
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -4807,7 +3940,6 @@ msgstr ""
 "net/). [Registreer nu](%%action.register%%) om mededelingen over uzelf te "
 "delen met vrienden, familie en collega's! [Meer lezen...](%%doc.help%%)"
 
-#: actions/public.php:247
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -4819,19 +3951,16 @@ msgstr ""
 "net/)"
 
 #. TRANS: Public RSS feed description. %s is the StatusNet site name.
-#: actions/publicrss.php:106
 #, php-format
 msgid "%s updates from everyone."
 msgstr "%s updates van iedereen."
 
 #. TRANS: Title for public tag cloud.
-#: actions/publictagcloud.php:57
 msgid "Public tag cloud"
 msgstr "Publieke woordwolk"
 
 #. TRANS: Instructions (more used like an explanation/header).
 #. TRANS: %s is the StatusNet sitename.
-#: actions/publictagcloud.php:65
 #, php-format
 msgid "These are most popular recent tags on %s"
 msgstr "De meest recente en populairste labels op %s"
@@ -4839,7 +3968,6 @@ msgstr "De meest recente en populairste labels op %s"
 #. TRANS: This message contains a Markdown URL. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.
-#: actions/publictagcloud.php:74
 #, php-format
 msgid "No one has posted a notice with a [hashtag](%%doc.tags%%) yet."
 msgstr ""
@@ -4847,7 +3975,6 @@ 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.
-#: actions/publictagcloud.php:79
 msgid "Be the first to post one!"
 msgstr "U kunt de eerste zijn die een bericht plaatst!"
 
@@ -4856,7 +3983,6 @@ msgstr "U kunt de eerste zijn die een bericht plaatst!"
 #. TRANS: This message contains a Markdown URL. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.
-#: actions/publictagcloud.php:87
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post "
@@ -4866,44 +3992,36 @@ msgstr ""
 "die er een plaatst!"
 
 #. TRANS: Client error displayed trying to recover password while already logged in.
-#: actions/recoverpassword.php:37
 msgid "You are already logged in!"
 msgstr "U bent al aangemeld!"
 
 #. TRANS: Client error displayed when password recovery code is not correct.
-#: actions/recoverpassword.php:64
 msgid "No such recovery code."
 msgstr "Onbekende herstelcode."
 
 #. TRANS: Client error displayed when no proper password recovery code was submitted.
-#: actions/recoverpassword.php:69
 msgid "Not a recovery code."
 msgstr "Geen geldige herstelcode."
 
 #. TRANS: Server error displayed trying to recover password without providing a user.
-#: actions/recoverpassword.php:77
 msgid "Recovery code for unknown user."
 msgstr "Herstelcode voor onbekende gebruiker."
 
 #. TRANS: Server error displayed removing a password recovery code from the database.
-#: actions/recoverpassword.php:91
 msgid "Error with confirmation code."
 msgstr "Er is een fout opgetreden die te maken heeft met de bevestigingscode."
 
 #. TRANS: Client error displayed trying to recover password with too old a recovery code.
-#: actions/recoverpassword.php:103
 msgid "This confirmation code is too old. Please start again."
 msgstr "Deze bevestigingscode is te oud. Begin alstublieft opnieuw."
 
 #. TRANS: Server error displayed when updating a user's e-mail address in the database fails while recovering a password.
-#: actions/recoverpassword.php:118
 msgid "Could not update user with confirmed email address."
 msgstr ""
 "Het was niet mogelijk het bevestigde e-mailadres voor de gebruiker bij te "
 "werken."
 
 #. TRANS: Page notice for password recovery page.
-#: actions/recoverpassword.php:160
 msgid ""
 "If you have forgotten or lost your password, you can get a new one sent to "
 "the email address you have stored in your account."
@@ -4912,98 +4030,80 @@ msgstr ""
 "nieuw wachtwoord toegezonden te krijgen op het e-mailadres dat bij uw "
 "gebruiker staat opgeslagen."
 
-#: actions/recoverpassword.php:167
 msgid "You have been identified. Enter a new password below."
 msgstr "U bent geïdentificeerd. Voer hieronder een nieuw wachtwoord in."
 
 #. TRANS: Fieldset legend for password recovery page.
-#: actions/recoverpassword.php:198
 msgid "Password recovery"
 msgstr "Wachtwoordherstel"
 
 #. TRANS: Field label on password recovery page.
-#: actions/recoverpassword.php:202
 msgid "Nickname or email address"
 msgstr "Gebruikersnaam of e-mailadres"
 
 #. TRANS: Title for field label on password recovery page.
-#: actions/recoverpassword.php:205
 msgid "Your nickname on this server, or your registered email address."
 msgstr "Uw gebruikersnaam op deze server, of uw geregistreerde e-mailadres."
 
 #. TRANS: Field label on password recovery page.
-#: actions/recoverpassword.php:212
 msgid "Recover"
 msgstr "Herstellen"
 
 #. TRANS: Button text on password recovery page.
-#: actions/recoverpassword.php:214
 msgctxt "BUTTON"
 msgid "Recover"
 msgstr "Herstellen"
 
 #. TRANS: Title for password recovery page in password reset mode.
-#: actions/recoverpassword.php:223
 msgid "Reset password"
 msgstr "Wachtwoord herstellen"
 
 #. TRANS: Title for password recovery page in password recover mode.
-#: actions/recoverpassword.php:225
 msgid "Recover password"
 msgstr "Wachtwoord herstellen"
 
 #. TRANS: Title for password recovery page in email sent mode.
 #. TRANS: Subject for password recovery e-mail.
-#: actions/recoverpassword.php:227 actions/recoverpassword.php:366
 msgid "Password recovery requested"
 msgstr "Wachtwoordherstel aangevraagd"
 
 #. TRANS: Title for password recovery page in password saved mode.
-#: actions/recoverpassword.php:229
 msgid "Password saved"
 msgstr "Het wachtwoord is opgeslagen"
 
 #. TRANS: Title for password recovery page when an unknown action has been specified.
-#: actions/recoverpassword.php:232
 msgid "Unknown action"
 msgstr "Onbekende handeling"
 
 #. TRANS: Title for field label for password reset form.
-#: actions/recoverpassword.php:258
 msgid "6 or more characters, and do not forget it!"
 msgstr "Zes of meer tekens, en vergeet uw wachtwoord niet!"
 
 #. TRANS: Button text for password reset form.
 #. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: actions/recoverpassword.php:268 lib/designform.php:145
 msgctxt "BUTTON"
 msgid "Reset"
 msgstr "Opnieuw instellen"
 
 #. TRANS: Form instructions for password recovery form.
-#: actions/recoverpassword.php:278
 msgid "Enter a nickname or email address."
 msgstr "Voer een gebruikersnaam of e-mailadres in."
 
 #. TRANS: Information on password recovery form if no known username or e-mail address was specified.
-#: actions/recoverpassword.php:309
 msgid "No user with that email address or username."
 msgstr ""
 "Er bestaat geen gebruiker met het opgegeven e-mailadres of de opgegeven "
 "gebruikersnaam."
 
 #. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
-#: actions/recoverpassword.php:327
 msgid "No registered email address for that user."
 msgstr "Die gebruiker heeft geen e-mailadres geregistreerd."
 
 #. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
-#: actions/recoverpassword.php:342
 msgid "Error saving address confirmation."
 msgstr "Er is een fout opgetreden bij het opslaan van de adresbevestiging."
 
 #. TRANS: User notification after an e-mail with instructions was sent from the password recovery form.
-#: actions/recoverpassword.php:370
 msgid ""
 "Instructions for recovering your password have been sent to the email "
 "address registered to your account."
@@ -5012,73 +4112,56 @@ msgstr ""
 "mailadres dat voor uw gebruiker is geregistreerd."
 
 #. TRANS: Client error displayed when trying to reset as password without providing a user.
-#: actions/recoverpassword.php:391
 msgid "Unexpected password reset."
 msgstr "Het wachtwoord is onverwacht opnieuw ingesteld."
 
 #. TRANS: Reset password form validation error message.
-#: actions/recoverpassword.php:400
 msgid "Password must be 6 characters or more."
 msgstr "Het wachtwoord moet uit zes of meer tekens bestaan."
 
 #. TRANS: Reset password form validation error message.
-#: actions/recoverpassword.php:405
 msgid "Password and confirmation do not match."
 msgstr "Het wachtwoord en de bevestiging komen niet overeen."
 
 #. TRANS: Server error displayed when something does wrong with the user object during password reset.
-#: actions/recoverpassword.php:426 actions/register.php:241
 msgid "Error setting user."
 msgstr "Er is een fout opgetreden tijdens het instellen van de gebruiker."
 
 #. TRANS: Success message for user after password reset.
-#: actions/recoverpassword.php:434
 msgid "New password successfully saved. You are now logged in."
 msgstr "Het nieuwe wachtwoord is opgeslagen. U bent nu aangemeld."
 
-#: actions/redirecturl.php:70
-#, fuzzy
 msgid "No id parameter"
-msgstr "Geen ID-argument."
+msgstr "Geen ID-argument"
 
-#: actions/redirecturl.php:76
-#, fuzzy, php-format
+#, php-format
 msgid "No such file \"%d\""
-msgstr "Het bestand bestaat niet."
+msgstr "Het bestand \"%d\" bestaat niet."
 
-#: actions/register.php:80 actions/register.php:181 actions/register.php:392
 msgid "Sorry, only invited people can register."
 msgstr "U kunt zich alleen registreren als u wordt uitgenodigd."
 
-#: actions/register.php:87
 msgid "Sorry, invalid invitation code."
 msgstr "Sorry. De uitnodigingscode is ongeldig."
 
-#: actions/register.php:106
 msgid "Registration successful"
 msgstr "De registratie is voltooid"
 
-#: actions/register.php:108 actions/register.php:490
 msgid "Register"
 msgstr "Registreren"
 
-#: actions/register.php:128
 msgid "Registration not allowed."
 msgstr "Registratie is niet toegestaan."
 
-#: actions/register.php:194
 msgid "You cannot register if you don't agree to the license."
 msgstr "U kunt zich niet registreren als u niet akkoord gaat met de licentie."
 
-#: actions/register.php:203
 msgid "Email address already exists."
 msgstr "Het e-mailadres bestaat al."
 
-#: actions/register.php:236 actions/register.php:258
 msgid "Invalid username or password."
 msgstr "Ongeldige gebruikersnaam of wachtwoord."
 
-#: actions/register.php:333
 msgid ""
 "With this form you can create a new account. You can then post notices and "
 "link up to friends and colleagues."
@@ -5086,47 +4169,37 @@ msgstr ""
 "Via dit formulier kunt u een nieuwe gebruiker aanmaken. Daarna kunt u "
 "mededelingen uitsturen en contact maken met vrienden en collega's."
 
-#: actions/register.php:424 actions/register.php:428
-#: actions/siteadminpanel.php:238 lib/settingsnav.php:92
 msgid "Email"
 msgstr "E-mail"
 
-#: actions/register.php:425 actions/register.php:429
 msgid "Used only for updates, announcements, and password recovery."
 msgstr "Alleen gebruikt voor updates, aankondigingen en wachtwoordherstel."
 
-#: actions/register.php:436
 msgid "Longer name, preferably your \"real\" name."
 msgstr "Een langere naam, mogelijk uw echte naam."
 
-#: actions/register.php:464
 msgid "Where you are, like \"City, State (or Region), Country\"."
 msgstr "Waar u bent, bijvoorbeeld \"woonplaats, land\" of \"postcode, land\"."
 
-#: actions/register.php:503
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
 msgstr ""
 "Ik begrijp dat inhoud en gegevens van %1$s persoonlijk en vertrouwelijk zijn."
 
-#: actions/register.php:513
 #, php-format
 msgid "My text and files are copyright by %1$s."
 msgstr "Voor mijn teksten en bestanden rust het auteursrecht bij %1$s."
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:517
 msgid "My text and files remain under my own copyright."
 msgstr "Ik ben de rechthebbende voor mijn teksten en bestanden."
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:520
 msgid "All rights reserved."
 msgstr "Alle rechten voorbehouden."
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:525
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -5135,7 +4208,6 @@ msgstr ""
 "Mijn teksten en bestanden zijn beschikbaar onder %s, behalve de volgende "
 "privégegevens: wachtwoord, e-mailadres, IM-adres, telefoonnummer."
 
-#: actions/register.php:566
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -5169,7 +4241,6 @@ msgstr ""
 "Dank u wel voor het registreren en we hopen dat deze dienst u biedt wat u "
 "ervan verwacht."
 
-#: actions/register.php:590
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5177,7 +4248,6 @@ msgstr ""
 "U ontvangt snel een e-mailbericht  met daarin instructies over hoe u uw e-"
 "mail kunt bevestigen."
 
-#: actions/remotesubscribe.php:97
 #, php-format
 msgid ""
 "To subscribe, you can [login](%%action.login%%), or [register](%%action."
@@ -5189,106 +4259,81 @@ msgstr ""
 "[compatibele microblogsite](%%doc.openmublog%%) hebt, voer dan hieronder uw "
 "profiel-URL in."
 
-#: actions/remotesubscribe.php:111
 msgid "Remote subscribe"
 msgstr "Abonneren op afstand"
 
-#: actions/remotesubscribe.php:123
 msgid "Subscribe to a remote user"
 msgstr "Op een gebruiker uit een andere systeem abonneren"
 
-#: actions/remotesubscribe.php:128
 msgid "User nickname"
 msgstr "Gebruikersnaam"
 
-#: actions/remotesubscribe.php:129
 msgid "Nickname of the user you want to follow."
 msgstr "Gebruikersnaam van de gebruiker waarop u wilt abonneren."
 
-#: actions/remotesubscribe.php:132
 msgid "Profile URL"
 msgstr "Profiel-URL"
 
-#: actions/remotesubscribe.php:133
 msgid "URL of your profile on another compatible microblogging service."
 msgstr "De URL van uw profiel bij een andere, compatibele microblogdienst."
 
 #. TRANS: Link text for link that will subscribe to a remote profile.
-#: actions/remotesubscribe.php:136 lib/subscribeform.php:139
-#: lib/userprofile.php:402
 msgid "Subscribe"
 msgstr "Abonneren"
 
-#: actions/remotesubscribe.php:158
 msgid "Invalid profile URL (bad format)."
 msgstr "Ongeldige profiel-URL (foutieve opmaak)."
 
-#: actions/remotesubscribe.php:167
 msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
 msgstr ""
 "De URL is niet geldig (het is geen YADIS-document of er een ongeldige XRDS "
 "gedefinieerd)."
 
-#: actions/remotesubscribe.php:175
 msgid "That is a local profile! Login to subscribe."
 msgstr "Dat is een lokaal profiel. Meld u aan om te abonneren."
 
-#: actions/remotesubscribe.php:182
 msgid "Could not get a request token."
 msgstr "Het was niet mogelijk een verzoektoken te krijgen."
 
-#: actions/repeat.php:56
 msgid "Only logged-in users can repeat notices."
 msgstr "Alleen aangemelde gebruikers kunnen hun mededelingen herhalen."
 
-#: actions/repeat.php:63 actions/repeat.php:70
 msgid "No notice specified."
 msgstr "Er is geen mededeling opgegeven."
 
-#: actions/repeat.php:75
 msgid "You cannot repeat your own notice."
 msgstr "U kunt uw eigen mededeling niet herhalen."
 
-#: actions/repeat.php:89
 msgid "You already repeated that notice."
 msgstr "U hent die mededeling al herhaald."
 
-#: actions/repeat.php:112 lib/noticelist.php:697
 msgid "Repeated"
 msgstr "Herhaald"
 
-#: actions/repeat.php:117
 msgid "Repeated!"
 msgstr "Herhaald!"
 
 #. TRANS: RSS reply feed title. %s is a user nickname.
-#: actions/replies.php:126 actions/repliesrss.php:68
-#: lib/personalgroupnav.php:105
 #, php-format
 msgid "Replies to %s"
 msgstr "Antwoorden aan %s"
 
-#: actions/replies.php:128
 #, php-format
 msgid "Replies to %1$s, page %2$d"
 msgstr "Antwoorden aan %1$s, pagina %2$d"
 
-#: actions/replies.php:145
 #, php-format
 msgid "Replies feed for %s (RSS 1.0)"
 msgstr "Antwoordenfeed voor %s (RSS 1.0)"
 
-#: actions/replies.php:152
 #, php-format
 msgid "Replies feed for %s (RSS 2.0)"
 msgstr "Antwoordenfeed voor %s (RSS 2.0)"
 
-#: actions/replies.php:159
 #, php-format
 msgid "Replies feed for %s (Atom)"
 msgstr "Antwoordenfeed voor %s (Atom)"
 
-#: actions/replies.php:199
 #, php-format
 msgid ""
 "This is the timeline showing replies to %1$s but %2$s hasn't received a "
@@ -5297,7 +4342,6 @@ msgstr ""
 "Dit is de tijdlijn met antwoorden aan %1$s, maar %2$s heeft nog geen "
 "antwoorden ontvangen."
 
-#: actions/replies.php:204
 #, php-format
 msgid ""
 "You can engage other users in a conversation, subscribe to more people or "
@@ -5306,7 +4350,6 @@ msgstr ""
 "U kunt gesprekken aanknopen met andere gebruikers, op meer gebruikers "
 "abonneren of [lid worden van groepen](%%action.groups%%)."
 
-#: actions/replies.php:206
 #, php-format
 msgid ""
 "You can try to [nudge %1$s](../%2$s) or [post something to them](%%%%action."
@@ -5317,37 +4360,31 @@ msgstr ""
 
 #. TRANS: RSS reply feed description.
 #. TRANS: %1$s is a user nickname, %2$s is the StatusNet site name.
-#: actions/repliesrss.php:74
 #, php-format
 msgid "Replies to %1$s on %2$s."
 msgstr "Antwoorden aan %1$s op %2$s."
 
 #. TRANS: Client exception displayed when trying to restore an account while not logged in.
-#: actions/restoreaccount.php:78
 msgid "Only logged-in users can restore their account."
 msgstr ""
 "Alleen aangemelde gebruikers kunnen hun gebruiker terugladen van back-up."
 
 #. TRANS: Client exception displayed when trying to restore an account without having restore rights.
-#: actions/restoreaccount.php:83
 msgid "You may not restore your account."
 msgstr "U mag uw gebruiker niet terugladen van back-up."
 
 #. TRANS: Client exception displayed trying to restore an account while something went wrong uploading a file.
 #. TRANS: Client exception. No file; probably just a non-AJAX submission.
-#: actions/restoreaccount.php:121 actions/restoreaccount.php:146
 msgid "No uploaded file."
 msgstr "Er is geen geüpload bestand."
 
 #. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
-#: actions/restoreaccount.php:129 lib/mediafile.php:194
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
 msgstr ""
 "Het te uploaden bestand is groter dan de ingestelde upload_max_filesize in "
 "php.ini."
 
 #. TRANS: Client exception.
-#: actions/restoreaccount.php:135 lib/mediafile.php:200
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form."
@@ -5356,39 +4393,32 @@ msgstr ""
 "HTML-formulier."
 
 #. TRANS: Client exception.
-#: actions/restoreaccount.php:141 lib/mediafile.php:206
 msgid "The uploaded file was only partially uploaded."
 msgstr "De upload is slechts gedeeltelijk voltooid."
 
 #. TRANS: Client exception thrown when a temporary folder is not present to store a file upload.
-#: actions/restoreaccount.php:150 lib/mediafile.php:214
 msgid "Missing a temporary folder."
 msgstr "De tijdelijke map is niet aanwezig."
 
 #. TRANS: Client exception thrown when writing to disk is not possible during a file upload operation.
-#: actions/restoreaccount.php:154 lib/mediafile.php:218
 msgid "Failed to write file to disk."
 msgstr "Het was niet mogelijk naar schijf te schrijven."
 
 #. TRANS: Client exception thrown when a file upload operation has been stopped by an extension.
-#: actions/restoreaccount.php:158 lib/mediafile.php:222
 msgid "File upload stopped by extension."
 msgstr "Het uploaden van het bestand is tegengehouden door een uitbreiding."
 
 #. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
 #. TRANS: Exception thrown when uploading an image fails for an unknown reason.
 #. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
-#: actions/restoreaccount.php:164 lib/imagefile.php:106 lib/mediafile.php:228
 msgid "System error uploading file."
 msgstr "Er is een systeemfout opgetreden tijdens het uploaden van het bestand."
 
 #. TRANS: Client exception thrown when a feed is not an Atom feed.
-#: actions/restoreaccount.php:207
 msgid "Not an Atom feed."
 msgstr "Dit is geen Atomfeed."
 
 #. TRANS: Success message when a feed has been restored.
-#: actions/restoreaccount.php:241
 msgid ""
 "Feed has been restored. Your old posts should now appear in search and your "
 "profile page."
@@ -5397,12 +4427,10 @@ msgstr ""
 "weergegeven en op uw profielpagina."
 
 #. TRANS: Message when a feed restore is in progress.
-#: actions/restoreaccount.php:245
 msgid "Feed will be restored. Please wait a few minutes for results."
 msgstr "De feed wordt teruggeplaatst. Een paar minuten geduld, alstublieft."
 
 #. TRANS: Form instructions for feed restore.
-#: actions/restoreaccount.php:342
 msgid ""
 "You can upload a backed-up stream in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format."
@@ -5411,92 +4439,73 @@ msgstr ""
 "activitystrea.ms/\">Activity Streams</a>."
 
 #. TRANS: Title for submit button to confirm upload of a user backup file for account restore.
-#: actions/restoreaccount.php:373
 msgid "Upload the file"
 msgstr "Bestand uploaden"
 
-#: actions/revokerole.php:75
 msgid "You cannot revoke user roles on this site."
 msgstr "U kunt geen gebruikersrollen intrekken op deze website."
 
-#: actions/revokerole.php:82
 msgid "User doesn't have this role."
 msgstr "Deze gebruiker heeft deze rol niet."
 
-#: actions/rsd.php:142 actions/version.php:159
 msgid "StatusNet"
 msgstr "StatusNet"
 
-#: actions/sandbox.php:65 actions/unsandbox.php:65
 msgid "You cannot sandbox users on this site."
 msgstr "Op deze website kunt u gebruikers niet in de zandbak plaatsen."
 
-#: actions/sandbox.php:72
 msgid "User is already sandboxed."
 msgstr "Deze gebruiker is al in de zandbak geplaatst."
 
 #. TRANS: Menu item for site administration
-#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
-#: lib/adminpanelaction.php:379
 msgid "Sessions"
 msgstr "Sessies"
 
-#: actions/sessionsadminpanel.php:65
 msgid "Session settings for this StatusNet site"
 msgstr "Sessieinstellingen voor deze StatusNet-website"
 
-#: actions/sessionsadminpanel.php:175
 msgid "Handle sessions"
 msgstr "Sessieafhandeling"
 
-#: actions/sessionsadminpanel.php:177
 msgid "Whether to handle sessions ourselves."
 msgstr "Of sessies door de software zelf afgehandeld moeten worden."
 
-#: actions/sessionsadminpanel.php:181
 msgid "Session debugging"
 msgstr "Sessies debuggen"
 
-#: actions/sessionsadminpanel.php:183
 msgid "Turn on debugging output for sessions."
 msgstr "Debuguitvoer voor sessies inschakelen."
 
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
+#. TRANS: Submit button title.
+msgid "Save"
+msgstr "Opslaan"
+
 msgid "Save site settings"
 msgstr "Websiteinstellingen opslaan"
 
-#: actions/showapplication.php:78
 msgid "You must be logged in to view an application."
 msgstr "U moet aangemeld zijn om een applicatie te kunnen bekijken."
 
-#: actions/showapplication.php:151
 msgid "Application profile"
 msgstr "Applicatieprofiel"
 
-#: actions/showapplication.php:179
 #, php-format
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr "Aangemaakt door %1$s - standaardtoegang \"%2$s\" - %3$d gebruikers"
 
-#: actions/showapplication.php:189
 msgid "Application actions"
 msgstr "Applicatiehandelingen"
 
-#: actions/showapplication.php:212
 msgid "Reset key & secret"
 msgstr "Sleutel en wachtwoord op nieuw instellen"
 
 #. TRANS: Title of form for deleting a user.
-#: actions/showapplication.php:228 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:64 lib/noticelist.php:678
 msgid "Delete"
 msgstr "Verwijderen"
 
-#: actions/showapplication.php:237
 msgid "Application info"
 msgstr "Applicatieinformatie"
 
-#: actions/showapplication.php:255
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
@@ -5504,43 +4513,36 @@ msgstr ""
 "Opmerking: HMAC-SHA1 ondertekening wordt ondersteund. Ondertekening in "
 "platte tekst is niet mogelijk."
 
-#: actions/showapplication.php:275
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr ""
 "Weet u zeker dat u uw gebruikerssleutel en geheime code wilt verwijderen?"
 
 #. TRANS: Title for all but the first page of favourite notices of a user.
 #. TRANS: %1$s is the user for whom the favourite notices are displayed, %2$d is the page number.
-#: actions/showfavorites.php:80
 #, php-format
 msgid "%1$s's favorite notices, page %2$d"
 msgstr "Favoriete mededelingen van %1$s, pagina %2$d"
 
 #. TRANS: Server error displayed when favourite notices could not be retrieved from the database.
-#: actions/showfavorites.php:134
 msgid "Could not retrieve favorite notices."
 msgstr "Het was niet mogelijk de favoriete mededelingen op te halen."
 
 #. TRANS: Feed link text. %s is a username.
-#: actions/showfavorites.php:172
 #, php-format
 msgid "Feed for favorites of %s (RSS 1.0)"
 msgstr "Favorietenfeed van %s (RSS 1.0)"
 
 #. TRANS: Feed link text. %s is a username.
-#: actions/showfavorites.php:180
 #, php-format
 msgid "Feed for favorites of %s (RSS 2.0)"
 msgstr "Favorietenfeed van %s (RSS 2.0)"
 
 #. TRANS: Feed link text. %s is a username.
-#: actions/showfavorites.php:188
 #, php-format
 msgid "Feed for favorites of %s (Atom)"
 msgstr "Favorietenfeed van %s (Atom)"
 
 #. TRANS: Text displayed instead of favourite notices for the current logged in user that has no favourites.
-#: actions/showfavorites.php:209
 msgid ""
 "You haven't chosen any favorite notices yet. Click the fave button on "
 "notices you like to bookmark them for later or shed a spotlight on them."
@@ -5551,7 +4553,6 @@ msgstr ""
 
 #. TRANS: Text displayed instead of favourite notices for a user that has no favourites while logged in.
 #. TRANS: %s is a username.
-#: actions/showfavorites.php:213
 #, php-format
 msgid ""
 "%s hasn't added any favorite notices yet. Post something interesting they "
@@ -5564,7 +4565,6 @@ msgstr ""
 #. TRANS: Text displayed instead of favourite notices for a user that has no favourites while not logged in.
 #. TRANS: %s is a username, %%%%action.register%%%% is a link to the user registration page.
 #. TRANS: (link text)[link] is a Mark Down link.
-#: actions/showfavorites.php:220
 #, php-format
 msgid ""
 "%s hasn't added any favorite notices yet. Why not [register an account](%%%%"
@@ -5576,64 +4576,53 @@ msgstr ""
 "misschien aan favorietenlijsten zijn toe te voegen. :)"
 
 #. TRANS: Page notice for show favourites page.
-#: actions/showfavorites.php:251
 msgid "This is a way to share what you like."
 msgstr "Dit is de manier om dat te delen wat u wilt."
 
 #. TRANS: Page title for first group page. %s is a group name.
-#: actions/showgroup.php:75
 #, php-format
 msgid "%s group"
 msgstr "%s groep"
 
 #. TRANS: Page title for any but first group page.
 #. TRANS: %1$s is a group name, $2$s is a page number.
-#: actions/showgroup.php:79
 #, php-format
 msgid "%1$s group, page %2$d"
 msgstr "Groep %1$s, pagina %2$d"
 
 #. TRANS: Label for group description or group note (dt). Text hidden by default.
-#: actions/showgroup.php:266
 msgid "Note"
 msgstr "Opmerking"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:277 lib/groupeditform.php:180
 msgid "Aliases"
 msgstr "Aliassen"
 
 #. TRANS: Group actions header (h2). Text hidden by default.
-#: actions/showgroup.php:294
 msgid "Group actions"
 msgstr "Groepshandelingen"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:338
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
 msgstr "Mededelingenfeed voor groep %s (RSS 1.0)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:345
 #, php-format
 msgid "Notice feed for %s group (RSS 2.0)"
 msgstr "Mededelingenfeed voor groep %s (RSS 2.0)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:352
 #, php-format
 msgid "Notice feed for %s group (Atom)"
 msgstr "Mededelingenfeed voor groep %s (Atom)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:358
 #, php-format
 msgid "FOAF for %s group"
 msgstr "Vriend van een vriend voor de groep %s"
 
 #. TRANS: Header for mini list of group members on a group page (h2).
-#: actions/showgroup.php:395
 msgid "Members"
 msgstr "Leden"
 
@@ -5641,30 +4630,23 @@ msgstr "Leden"
 #. TRANS: Text for user subscription statistics if the user has no subscriptions.
 #. TRANS: Text for user subscriber statistics if user has no subscribers.
 #. TRANS: Text for user user group membership statistics if user is not a member of any group.
-#: actions/showgroup.php:401 lib/profileaction.php:137
-#: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
-#: lib/subscriptionlist.php:123 lib/tagcloudsection.php:71
 msgid "(None)"
 msgstr "(geen)"
 
 #. TRANS: Link to all group members from mini list of group members if group has more than n members.
-#: actions/showgroup.php:410
 msgid "All members"
 msgstr "Alle leden"
 
 #. TRANS: Header for group statistics on a group page (h2).
 #. TRANS: H2 text for user statistics.
-#: actions/showgroup.php:441 lib/profileaction.php:205
 msgid "Statistics"
 msgstr "Statistieken"
 
-#: actions/showgroup.php:444
 msgctxt "LABEL"
 msgid "Created"
 msgstr "Aangemaakt"
 
 #. TRANS: Label for member count in statistics on group page.
-#: actions/showgroup.php:449
 msgctxt "LABEL"
 msgid "Members"
 msgstr "Leden"
@@ -5673,7 +4655,6 @@ msgstr "Leden"
 #. TRANS: **%s** is the group alias, %%%%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).
-#: actions/showgroup.php:464
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5692,7 +4673,6 @@ 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: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
-#: actions/showgroup.php:474
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5706,100 +4686,84 @@ msgstr ""
 "over hun ervaringen en interesses. "
 
 #. TRANS: Header for list of group administrators on a group page (h2).
-#: actions/showgroup.php:503
 msgid "Admins"
 msgstr "Beheerders"
 
 #. TRANS: Client error displayed requesting a single message that does not exist.
-#: actions/showmessage.php:76
 msgid "No such message."
 msgstr "Dat bericht bestaat niet."
 
 #. TRANS: Client error displayed requesting a single direct message the requesting user was not a party in.
-#: actions/showmessage.php:86
 msgid "Only the sender and recipient may read this message."
 msgstr "Alleen de verzender en de ontvanger kunnen dit bericht lezen."
 
 #. TRANS: Page title for single direct message display when viewing user is the sender.
 #. TRANS: %1$s is the addressed user's nickname, $2$s is a timestamp.
-#: actions/showmessage.php:105
 #, php-format
 msgid "Message to %1$s on %2$s"
 msgstr "Bericht aan %1$s op %2$s"
 
 #. TRANS: Page title for single message display.
 #. TRANS: %1$s is the sending user's nickname, $2$s is a timestamp.
-#: actions/showmessage.php:113
 #, php-format
 msgid "Message from %1$s on %2$s"
 msgstr "Bericht van %1$s op %2$s"
 
-#: actions/shownotice.php:90
 msgid "Notice deleted."
 msgstr "Deze mededeling is verwijderd."
 
 #. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
-#: actions/showstream.php:70
 #, php-format
 msgid "%1$s tagged %2$s"
 msgstr "%2$s gelabeld door %1$s"
 
 #. TRANS: Page title showing tagged notices in one user's stream.
 #. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
-#: actions/showstream.php:74
 #, php-format
 msgid "%1$s tagged %2$s, page %3$d"
 msgstr "%2$s gelabeld door %1$s, pagina %3$d"
 
 #. TRANS: Extended page title showing tagged notices in one user's stream.
 #. TRANS: %1$s is the username, %2$d is the page number.
-#: actions/showstream.php:82
 #, php-format
 msgid "%1$s, page %2$d"
 msgstr "%1$s, pagina %2$d"
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %1$s is a user nickname, %2$s is a hashtag.
-#: actions/showstream.php:127
 #, php-format
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
 msgstr "Mededelingenfeed voor %1$s met het label %2$s (RSS 1.0)"
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.
-#: actions/showstream.php:136
 #, php-format
 msgid "Notice feed for %s (RSS 1.0)"
 msgstr "Mededelingenfeed voor %s (RSS 1.0)"
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.
-#: actions/showstream.php:145
 #, php-format
 msgid "Notice feed for %s (RSS 2.0)"
 msgstr "Mededelingenfeed voor %s (RSS 2.0)"
 
-#: actions/showstream.php:152
 #, php-format
 msgid "Notice feed for %s (Atom)"
 msgstr "Mededelingenfeed voor %s (Atom)"
 
 #. TRANS: Title for link to notice feed. FOAF stands for Friend of a Friend.
 #. TRANS: More information at http://www.foaf-project.org. %s is a user nickname.
-#: actions/showstream.php:159
 #, php-format
 msgid "FOAF for %s"
 msgstr "Vriend van een vriend (FOAF) voor %s"
 
 #. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
-#: actions/showstream.php:205
 #, php-format
 msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr ""
 "Dit is de tijdlijn voor %1$s, maar %1$s heeft nog geen berichten verzonden."
 
 #. TRANS: Second sentence of empty list message for a stream for the user themselves.
-#: actions/showstream.php:211
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
@@ -5809,7 +4773,6 @@ msgstr ""
 
 #. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:215
 #, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
@@ -5820,7 +4783,6 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:258
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5836,7 +4798,6 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:265
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5848,227 +4809,180 @@ msgstr ""
 "[StatusNet](http://status.net/). "
 
 #. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
-#: actions/showstream.php:322
 #, php-format
 msgid "Repeat of %s"
 msgstr "Herhaald van %s"
 
-#: actions/silence.php:65 actions/unsilence.php:65
 msgid "You cannot silence users on this site."
 msgstr "U kunt gebruikers op deze website niet muilkorven."
 
-#: actions/silence.php:72
 msgid "User is already silenced."
 msgstr "Deze gebruiker is al gemuilkorfd."
 
-#: actions/siteadminpanel.php:69
 msgid "Basic settings for this StatusNet site"
 msgstr "Basisinstellingen voor deze StatusNet-website"
 
-#: actions/siteadminpanel.php:133
 msgid "Site name must have non-zero length."
 msgstr "De sitenaam moet ingevoerd worden en mag niet leeg zijn."
 
-#: actions/siteadminpanel.php:141
 msgid "You must have a valid contact email address."
 msgstr ""
 "U moet een geldig e-mailadres opgeven waarop contact opgenomen kan worden."
 
-#: actions/siteadminpanel.php:159
 #, php-format
 msgid "Unknown language \"%s\"."
 msgstr "De taal \"%s\" is niet bekend."
 
-#: actions/siteadminpanel.php:165
 msgid "Minimum text limit is 0 (unlimited)."
 msgstr "De minimale tekstlimiet is 0 tekens (ongelimiteerd)."
 
-#: actions/siteadminpanel.php:171
 msgid "Dupe limit must be one or more seconds."
 msgstr "De duplicaatlimiet moet één of meer seconden zijn."
 
-#: actions/siteadminpanel.php:221
 msgid "General"
 msgstr "Algemeen"
 
-#: actions/siteadminpanel.php:224
 msgid "Site name"
 msgstr "Websitenaam"
 
-#: actions/siteadminpanel.php:225
 msgid "The name of your site, like \"Yourcompany Microblog\""
 msgstr "De naam van de website, zoals \"UwBedrijf Microblog\""
 
-#: actions/siteadminpanel.php:229
 msgid "Brought by"
 msgstr "Mogelijk gemaakt door"
 
-#: actions/siteadminpanel.php:230
 msgid "Text used for credits link in footer of each page"
 msgstr ""
 "De tekst die gebruikt worden in de \"creditsverwijzing\" in de voettekst van "
 "iedere pagina"
 
-#: actions/siteadminpanel.php:234
 msgid "Brought by URL"
 msgstr "\"Mogelijk gemaakt door\"-URL"
 
-#: actions/siteadminpanel.php:235
 msgid "URL used for credits link in footer of each page"
 msgstr ""
 "URL die wordt gebruikt voor de verwijzing naar de hoster en dergelijke in de "
 "voettekst van iedere pagina"
 
-#: actions/siteadminpanel.php:239
 msgid "Contact email address for your site"
 msgstr "E-mailadres om contact op te nemen met de websitebeheerder"
 
-#: actions/siteadminpanel.php:245
 msgid "Local"
 msgstr "Lokaal"
 
-#: actions/siteadminpanel.php:256
 msgid "Default timezone"
 msgstr "Standaardtijdzone"
 
-#: actions/siteadminpanel.php:257
 msgid "Default timezone for the site; usually UTC."
 msgstr "Standaardtijdzone voor de website. Meestal UTC."
 
-#: actions/siteadminpanel.php:262
 msgid "Default language"
 msgstr "Standaardtaal"
 
-#: actions/siteadminpanel.php:263
 msgid "Site language when autodetection from browser settings is not available"
 msgstr ""
 "De taal voor de website als deze niet uit de browserinstellingen opgemaakt "
 "kan worden"
 
-#: actions/siteadminpanel.php:271
 msgid "Limits"
 msgstr "Limieten"
 
-#: actions/siteadminpanel.php:274
 msgid "Text limit"
 msgstr "Tekstlimiet"
 
-#: actions/siteadminpanel.php:274
 msgid "Maximum number of characters for notices."
 msgstr "Maximaal aantal te gebruiken tekens voor mededelingen."
 
-#: actions/siteadminpanel.php:278
 msgid "Dupe limit"
 msgstr "Duplicaatlimiet"
 
-#: actions/siteadminpanel.php:278
 msgid "How long users must wait (in seconds) to post the same thing again."
 msgstr ""
 "Hoe lang gebruikers moeten wachten (in seconden) voor ze hetzelfde kunnen "
 "zenden."
 
 #. TRANS: Page title for site-wide notice tab in admin panel.
-#: actions/sitenoticeadminpanel.php:55
 msgid "Site Notice"
 msgstr "Websitebrede mededeling"
 
 #. TRANS: Instructions for site-wide notice tab in admin panel.
-#: actions/sitenoticeadminpanel.php:66
 msgid "Edit site-wide message"
 msgstr "Websitebrede mededeling bewerken"
 
 #. TRANS: Server error displayed when saving a site-wide notice was impossible.
-#: actions/sitenoticeadminpanel.php:101
 msgid "Unable to save site notice."
 msgstr "Het was niet mogelijk om de websitebrede mededeling op te slaan."
 
 #. TRANS: Client error displayed when a site-wide notice was longer than allowed.
-#: actions/sitenoticeadminpanel.php:112
 msgid "Maximum length for the site-wide notice is 255 characters."
 msgstr "De maximale lengte voor de websitebrede aankondiging is 255 tekens."
 
 #. TRANS: Label for site-wide notice text field in admin panel.
-#: actions/sitenoticeadminpanel.php:176
 msgid "Site notice text"
 msgstr "Tekst voor websitebrede mededeling"
 
 #. TRANS: Tooltip for site-wide notice text field in admin panel.
-#: actions/sitenoticeadminpanel.php:179
 msgid "Site-wide notice text (255 characters maximum; HTML allowed)"
 msgstr ""
 "Tekst voor websitebrede aankondiging (maximaal 255 tekens en HTML is "
 "toegestaan)"
 
 #. TRANS: Title for button to save site notice in admin panel.
-#: actions/sitenoticeadminpanel.php:201
 msgid "Save site notice."
 msgstr "Websitebrede mededeling opslaan."
 
 #. TRANS: Title for SMS settings.
-#: actions/smssettings.php:56
 msgid "SMS settings"
 msgstr "SMS-instellingen"
 
 #. TRANS: SMS settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/smssettings.php:70
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr "U kunt SMS-berichten per e-mail ontvangen van %%site.name%%."
 
 #. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
-#: actions/smssettings.php:92
 msgid "SMS is not available."
 msgstr "SMS is niet beschikbaar."
 
 #. TRANS: Form legend for SMS settings form.
-#: actions/smssettings.php:106
 msgid "SMS address"
 msgstr "SMS-adres"
 
 #. TRANS: Form guide in SMS settings form.
-#: actions/smssettings.php:115
 msgid "Current confirmed SMS-enabled phone number."
 msgstr "Huidige bevestigde telefoonnummer met SMS-functie."
 
 #. TRANS: Form guide in IM settings form.
-#: actions/smssettings.php:128
 msgid "Awaiting confirmation on this phone number."
 msgstr "Er wordt gewacht op bevestiging van dit telefoonnummer."
 
 #. TRANS: Field label for SMS address input in SMS settings form.
-#: actions/smssettings.php:137
 msgid "Confirmation code"
 msgstr "Bevestigingscode"
 
 #. TRANS: Form field instructions in SMS settings form.
-#: actions/smssettings.php:139
 msgid "Enter the code you received on your phone."
 msgstr "Voer de code in die u via uw telefoon hebt ontvangen."
 
 #. TRANS: Button label to confirm SMS confirmation code in SMS settings.
-#: actions/smssettings.php:143
 msgctxt "BUTTON"
 msgid "Confirm"
 msgstr "Bevestigen"
 
 #. TRANS: Field label for SMS phone number input in SMS settings form.
-#: actions/smssettings.php:148
 msgid "SMS phone number"
 msgstr "SMS-nummer"
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
-#: actions/smssettings.php:151
 msgid "Phone number, no punctuation or spaces, with area code."
 msgstr "Telefoonnummer zonder spaties of leestekens, met netnummer."
 
 #. TRANS: Form legend for SMS preferences form.
-#: actions/smssettings.php:190
 msgid "SMS preferences"
 msgstr "SMS-voorkeuren"
 
 #. TRANS: Checkbox label in SMS preferences form.
-#: actions/smssettings.php:196
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
@@ -6077,32 +4991,26 @@ msgstr ""
 "van mijn provider kan opleveren."
 
 #. TRANS: Confirmation message for successful SMS preferences save.
-#: actions/smssettings.php:307
 msgid "SMS preferences saved."
 msgstr "Uw SMS-voorkeuren zijn opgeslagen."
 
 #. TRANS: Message given saving SMS phone number without having provided one.
-#: actions/smssettings.php:329
 msgid "No phone number."
 msgstr "Geen telefoonnummer."
 
 #. TRANS: Message given saving SMS phone number without having selected a carrier.
-#: actions/smssettings.php:335
 msgid "No carrier selected."
 msgstr "Er is geen provider geselecteerd."
 
 #. TRANS: Message given saving SMS phone number that is already set.
-#: actions/smssettings.php:343
 msgid "That is already your phone number."
 msgstr "U hebt dit al ingesteld als uw telefoonnummer."
 
 #. TRANS: Message given saving SMS phone number that is already set for another user.
-#: actions/smssettings.php:347
 msgid "That phone number already belongs to another user."
 msgstr "Dit telefoonnummer is al geregistrerd door een andere gebruiker."
 
 #. TRANS: Message given saving valid SMS phone number that is to be confirmed.
-#: actions/smssettings.php:375
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
 "for the code and instructions on how to use it."
@@ -6111,39 +5019,32 @@ msgstr ""
 "toegevoegd. Op uw telefoon vindt u de code en de instructies."
 
 #. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
-#: actions/smssettings.php:403
 msgid "That is the wrong confirmation number."
 msgstr "Dit is het verkeerde bevestigingsnummer."
 
 #. TRANS: Message given after successfully canceling SMS phone number confirmation.
-#: actions/smssettings.php:417
 msgid "SMS confirmation cancelled."
 msgstr "SMS-bevestiging geannuleerd."
 
 #. TRANS: Message given trying to remove an SMS phone number that is not
 #. TRANS: registered for the active user.
-#: actions/smssettings.php:437
 msgid "That is not your phone number."
 msgstr "Dit is niet uw telefoonnummer."
 
 #. TRANS: Message given after successfully removing a registered SMS phone number.
-#: actions/smssettings.php:459
 msgid "The SMS phone number was removed."
 msgstr "Het SMS-nummer is verwijderd."
 
 #. TRANS: Label for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:498
 msgid "Mobile carrier"
 msgstr "Mobiele aanbieder"
 
 #. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:503
 msgid "Select a carrier"
 msgstr "Selecteer een provider"
 
 #. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
 #. TRANS: %s is an administrative contact's e-mail address.
-#: actions/smssettings.php:512
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -6154,121 +5055,96 @@ msgstr ""
 "via e-mail weten op het e-mailadres %s."
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
-#: actions/smssettings.php:534
 msgid "No code entered."
 msgstr "Er is geen code ingevoerd."
 
 #. TRANS: Menu item for site administration
-#: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
-#: lib/adminpanelaction.php:395
 msgid "Snapshots"
 msgstr "Snapshots"
 
-#: actions/snapshotadminpanel.php:65
 msgid "Manage snapshot configuration"
 msgstr "Snapshotinstellingen beheren"
 
-#: actions/snapshotadminpanel.php:127
 msgid "Invalid snapshot run value."
 msgstr "De waarde voor het uitvoeren van snapshots is ongeldig."
 
-#: actions/snapshotadminpanel.php:133
 msgid "Snapshot frequency must be a number."
 msgstr "De snapshotfrequentie moet een getal zijn."
 
-#: actions/snapshotadminpanel.php:144
 msgid "Invalid snapshot report URL."
 msgstr "De rapportage-URL voor snapshots is ongeldig."
 
-#: actions/snapshotadminpanel.php:200
 msgid "Randomly during web hit"
 msgstr "Willekeurig tijdens een websitehit"
 
-#: actions/snapshotadminpanel.php:201
 msgid "In a scheduled job"
 msgstr "Als geplande taak"
 
-#: actions/snapshotadminpanel.php:206
 msgid "Data snapshots"
 msgstr "Snapshots van gegevens"
 
-#: actions/snapshotadminpanel.php:208
 msgid "When to send statistical data to status.net servers"
 msgstr ""
 "Wanneer statistische gegevens naar de status.net-servers verzonden worden"
 
-#: actions/snapshotadminpanel.php:217
 msgid "Frequency"
 msgstr "Frequentie"
 
-#: actions/snapshotadminpanel.php:218
 msgid "Snapshots will be sent once every N web hits"
 msgstr "Iedere zoveel websitehits wordt een snapshot verzonden"
 
-#: actions/snapshotadminpanel.php:226
 msgid "Report URL"
 msgstr "Rapportage-URL"
 
-#: actions/snapshotadminpanel.php:227
 msgid "Snapshots will be sent to this URL"
 msgstr "Snapshots worden naar deze URL verzonden"
 
-#: actions/snapshotadminpanel.php:248
 msgid "Save snapshot settings"
 msgstr "Snapshotinstellingen opslaan"
 
 #. TRANS: Client error displayed trying a change a subscription for a non-subscribed profile.
-#: actions/subedit.php:75
 msgid "You are not subscribed to that profile."
 msgstr "U bent niet geabonneerd op dat profiel."
 
 #. TRANS: Server error displayed when updating a subscription fails with a database error.
 #. TRANS: Exception thrown when a subscription could not be stored on the server.
-#: actions/subedit.php:89 classes/Subscription.php:141
 msgid "Could not save subscription."
 msgstr "Het was niet mogelijk het abonnement op te slaan."
 
 #. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
-#: actions/subscribe.php:121
 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
 msgstr ""
 "U kunt niet abonneren op een OMB 1.0 profiel van een andere omgeving via "
 "deze handeling."
 
 #. TRANS: Page title when subscription succeeded.
-#: actions/subscribe.php:149
 msgid "Subscribed"
 msgstr "Geabonneerd"
 
 #. TRANS: Header for list of subscribers for a user (first page).
 #. TRANS: %s is the user's nickname.
-#: actions/subscribers.php:51
 #, php-format
 msgid "%s subscribers"
 msgstr "Abonnees van %s"
 
 #. TRANS: Header for list of subscribers for a user (not first page).
 #. TRANS: %1$s is the user's nickname, $2$d is the page number.
-#: actions/subscribers.php:55
 #, php-format
 msgid "%1$s subscribers, page %2$d"
 msgstr "Abonnees van %1$s, pagina %2$d"
 
 #. TRANS: Page notice for page with an overview of all subscribers
 #. TRANS: of the logged in user's own profile.
-#: actions/subscribers.php:68
 msgid "These are the people who listen to your notices."
 msgstr "Dit zijn de gebruikers die uw mededelingen volgen."
 
 #. TRANS: Page notice for page with an overview of all subscribers of a user other
 #. TRANS: than the logged in user. %s is the user nickname.
-#: actions/subscribers.php:74
 #, php-format
 msgid "These are the people who listen to %s's notices."
 msgstr "Dit zijn de gebruikers die de mededelingen van %s volgen."
 
 #. TRANS: Subscriber list text when the logged in user has no subscribers.
-#: actions/subscribers.php:114
 msgid ""
 "You have no subscribers. Try subscribing to people you know and they might "
 "return the favor."
@@ -6278,7 +5154,6 @@ msgstr ""
 
 #. TRANS: Subscriber list text when looking at the subscribers for a of a user other
 #. TRANS: than the logged in user that has no subscribers. %s is the user nickname.
-#: actions/subscribers.php:118
 #, php-format
 msgid "%s has no subscribers. Want to be the first?"
 msgstr "%s heeft geen abonnees. Wilt u de eerste zijn?"
@@ -6288,7 +5163,6 @@ msgstr "%s heeft geen abonnees. Wilt u de eerste zijn?"
 #. TRANS: This message contains a Markdown URL. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.
-#: actions/subscribers.php:127
 #, php-format
 msgid ""
 "%s has no subscribers. Why not [register an account](%%%%action.register%%%"
@@ -6299,20 +5173,17 @@ msgstr ""
 
 #. TRANS: Header for subscriptions overview for a user (not first page).
 #. TRANS: %1$s is a user nickname, %2$d is the page number.
-#: actions/subscriptions.php:55
 #, php-format
 msgid "%1$s subscriptions, page %2$d"
 msgstr "Abonnementen van %1$s, pagina %2$d"
 
 #. TRANS: Page notice for page with an overview of all subscriptions
 #. TRANS: of the logged in user's own profile.
-#: actions/subscriptions.php:68
 msgid "These are the people whose notices you listen to."
 msgstr "Dit zijn de gebruikers van wie u de mededelingen volgt."
 
 #. TRANS: Page notice for page with an overview of all subscriptions of a user other
 #. TRANS: than the logged in user. %s is the user nickname.
-#: actions/subscriptions.php:74
 #, php-format
 msgid "These are the people whose notices %s listens to."
 msgstr "Dit zijn de gebruikers waarvan %s de mededelingen volgt."
@@ -6321,7 +5192,6 @@ msgstr "Dit zijn de gebruikers waarvan %s de mededelingen volgt."
 #. 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.
-#: actions/subscriptions.php:133
 #, php-format
 msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "
@@ -6341,69 +5211,55 @@ msgstr ""
 #. TRANS: than the logged in user that has no subscriptions. %s is the user nickname.
 #. TRANS: Subscription list text when looking at the subscriptions for a of a user that has none
 #. TRANS: as an anonymous user. %s is the user nickname.
-#: actions/subscriptions.php:141 actions/subscriptions.php:147
 #, php-format
 msgid "%s is not listening to anyone."
 msgstr "%s volgt niemand."
 
 #. TRANS: Atom feed title. %s is a profile nickname.
-#: actions/subscriptions.php:176
 #, php-format
 msgid "Subscription feed for %s (Atom)"
 msgstr "Abonneefeed voor %s (Atom)"
 
 #. TRANS: Checkbox label for enabling Jabber messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:241 lib/settingsnav.php:110
-#, fuzzy
 msgid "IM"
 msgstr "IM"
 
 #. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:256 lib/settingsnav.php:117
 msgid "SMS"
 msgstr "SMS"
 
 #. TRANS: Title for all but the first page of notices with tags.
 #. TRANS: %1$s is the tag, %2$d is the page number.
-#: actions/tag.php:73
 #, php-format
 msgid "Notices tagged with %1$s, page %2$d"
 msgstr "Mededelingen met het label %1$s, pagina %2$d"
 
-#: actions/tag.php:91
 #, php-format
 msgid "Notice feed for tag %s (RSS 1.0)"
 msgstr "Mededelingenfeed voor label %s (RSS 1.0)"
 
-#: actions/tag.php:97
 #, php-format
 msgid "Notice feed for tag %s (RSS 2.0)"
 msgstr "Mededelingenfeed voor label %s (RSS 2.0)"
 
-#: actions/tag.php:103
 #, php-format
 msgid "Notice feed for tag %s (Atom)"
 msgstr "Mededelingenfeed voor label %s (Atom)"
 
-#: actions/tagother.php:39
 msgid "No ID argument."
 msgstr "Geen ID-argument."
 
-#: actions/tagother.php:65
 #, php-format
 msgid "Tag %s"
 msgstr "Label %s"
 
 #. TRANS: H2 for user profile information.
-#: actions/tagother.php:77 lib/userprofile.php:76
 msgid "User profile"
 msgstr "Gebruikersprofiel"
 
-#: actions/tagother.php:120
 msgid "Tag user"
 msgstr "Gebruiker labelen"
 
-#: actions/tagother.php:130
 msgid ""
 "Tags for this user (letters, numbers, -, ., and _), comma- or space- "
 "separated"
@@ -6411,50 +5267,40 @@ msgstr ""
 "Labels voor deze gebruiker (letters, cijfers, -, ., en _). Gebruik komma's "
 "of spaties als scheidingsteken"
 
-#: actions/tagother.php:157
 #, php-format
 msgid "Invalid tag: \"%s\""
 msgstr "Ongeldig label: '%s'"
 
-#: actions/tagother.php:172
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 "U kunt alleen gebruikers labelen waarop u geabonneerd bent of die op u "
 "geabonneerd zijn."
 
-#: actions/tagother.php:215
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
 "Gebruik dit formulier om labels toe te voegen aan uw abonnementen of "
 "abonnees."
 
-#: actions/tagrss.php:35
 msgid "No such tag."
 msgstr "Onbekend label."
 
 #. TRANS: Client error displayed when trying to unblock a non-blocked user.
-#: actions/unblock.php:59
 msgid "You haven't blocked that user."
 msgstr "U hebt deze gebruiker niet geblokkeerd."
 
-#: actions/unsandbox.php:72
 msgid "User is not sandboxed."
 msgstr "Deze gebruiker is niet in de zandbak geplaatst."
 
-#: actions/unsilence.php:72
 msgid "User is not silenced."
 msgstr "Deze gebruiker is niet gemuilkorfd."
 
-#: actions/unsubscribe.php:77
 msgid "No profile ID in request."
 msgstr "Het profiel-ID was niet aanwezig in het verzoek."
 
-#: actions/unsubscribe.php:98
 msgid "Unsubscribed"
 msgstr "Het abonnement is opgezegd"
 
-#: actions/updateprofile.php:64
 #, php-format
 msgid ""
 "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
@@ -6462,172 +5308,136 @@ msgstr ""
 "De licentie \"%1$s\" voor de stream die u wilt volgen is niet compatibel met "
 "de sitelicentie \"%2$s\"."
 
-#: actions/urlsettings.php:60
-#, fuzzy
 msgid "URL settings"
-msgstr "IM-instellingen"
+msgstr "URL-instellingen"
 
 #. TRANS: Instructions for tab "Other" in user profile settings.
-#: actions/urlsettings.php:72
 msgid "Manage various other options."
 msgstr "Overige instellingen beheren."
 
 #. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
 #. TRANS: user's profile settings. This message has one space at the beginning. Use your
 #. TRANS: language's word separator here if it has one (most likely a single space).
-#: actions/urlsettings.php:115
 msgid " (free service)"
 msgstr " (vrij beschikbare dienst)"
 
-#: actions/urlsettings.php:121
-#, fuzzy
 msgid "[none]"
-msgstr "Geen"
+msgstr "[geen]"
 
-#: actions/urlsettings.php:122
 msgid "[internal]"
-msgstr ""
+msgstr "[intern]"
 
 #. TRANS: Label for dropdown with URL shortener services.
-#: actions/urlsettings.php:130
 msgid "Shorten URLs with"
 msgstr "URL's inkorten met"
 
 #. TRANS: Tooltip for for dropdown with URL shortener services.
-#: actions/urlsettings.php:132
 msgid "Automatic shortening service to use."
 msgstr "Te gebruiken automatische verkortingsdienst."
 
-#: actions/urlsettings.php:138
 msgid "URL longer than"
-msgstr ""
+msgstr "URL langer dan"
 
-#: actions/urlsettings.php:141
 msgid "URLs longer than this will be shortened, 0 means always shorten."
-msgstr ""
+msgstr "URL's langer dan dit worden ingekort. 0 betekent altijd inkorten."
 
-#: actions/urlsettings.php:145
 msgid "Text longer than"
-msgstr ""
+msgstr "Tekst langer dan"
 
-#: actions/urlsettings.php:148
 msgid ""
 "URLs in notices longer than this will be shortened, 0 means always shorten."
 msgstr ""
+"URL's in berichten langer dan dit zal worden ingekort. 0 betekent altijd "
+"inkorten."
 
 #. TRANS: Form validation error for form "Other settings" in user profile.
-#: actions/urlsettings.php:180
 msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr "De URL voor de verkortingdienst is te lang (maximaal 50 tekens)."
 
-#: actions/urlsettings.php:187
 msgid "Invalid number for max url length."
-msgstr ""
+msgstr "Ongeldig getal voor maximale URL-lengte."
 
-#: actions/urlsettings.php:193
-#, fuzzy
 msgid "Invalid number for max notice length."
-msgstr "Ongeldige mededelinginhoud."
+msgstr "Ongeldig getal voor maximale mededelingslengte."
 
-#: actions/urlsettings.php:238
 msgid "Error saving user URL shortening preferences."
-msgstr ""
+msgstr "Fout bij het opslaan van gebruikersinstellingen voor URL-verkorting."
 
 #. TRANS: User admin panel title
-#: actions/useradminpanel.php:58
 msgctxt "TITLE"
 msgid "User"
 msgstr "Gebruiker"
 
 #. TRANS: Instruction for user admin panel.
-#: actions/useradminpanel.php:69
 msgid "User settings for this StatusNet site"
 msgstr "Gebruikersinstellingen voor deze StatusNet-website"
 
 #. TRANS: Form validation error in user admin panel when a non-numeric character limit was set.
-#: actions/useradminpanel.php:147
 msgid "Invalid bio limit. Must be numeric."
 msgstr "Ongeldige beschrijvingslimiet. Het moet een getal zijn."
 
 #. TRANS: Form validation error in user admin panel when welcome text is too long.
-#: actions/useradminpanel.php:154
 msgid "Invalid welcome text. Maximum length is 255 characters."
 msgstr "Ongeldige welkomsttekst. De maximale lengte is 255 tekens."
 
 #. TRANS: Client error displayed when trying to set a non-existing user as default subscription for new
 #. TRANS: users in user admin panel. %1$s is the invalid nickname.
-#: actions/useradminpanel.php:166
 #, php-format
 msgid "Invalid default subscripton: \"%1$s\" is not a user."
 msgstr "Ongeldig standaardabonnement: \"%1$s\" is geen gebruiker."
 
-#: actions/useradminpanel.php:215 lib/action.php:565 lib/settingsnav.php:77
-#: lib/subgroupnav.php:81
 msgid "Profile"
 msgstr "Profiel"
 
 #. TRANS: Field label in user admin panel for setting the character limit for the bio field.
-#: actions/useradminpanel.php:220
 msgid "Bio Limit"
 msgstr "Profiellimiet"
 
 #. TRANS: Tooltip in user admin panel for setting the character limit for the bio field.
-#: actions/useradminpanel.php:222
 msgid "Maximum length of a profile bio in characters."
 msgstr "De maximale lengte van de profieltekst in tekens."
 
 #. TRANS: Form legend in user admin panel.
-#: actions/useradminpanel.php:231
 msgid "New users"
 msgstr "Nieuwe gebruikers"
 
 #. TRANS: Field label in user admin panel for setting new user welcome text.
-#: actions/useradminpanel.php:236
 msgid "New user welcome"
 msgstr "Welkom voor nieuwe gebruikers"
 
 #. TRANS: Tooltip in user admin panel for setting new user welcome text.
-#: actions/useradminpanel.php:238
 msgid "Welcome text for new users (maximum 255 characters)."
 msgstr "Welkomsttekst voor nieuwe gebruikers. Maximaal 255 tekens."
 
 #. TRANS: Field label in user admin panel for setting default subscription for new users.
-#: actions/useradminpanel.php:244
 msgid "Default subscription"
 msgstr "Standaardabonnement"
 
 #. TRANS: Tooltip in user admin panel for setting default subscription for new users.
-#: actions/useradminpanel.php:246
 msgid "Automatically subscribe new users to this user."
 msgstr "Nieuwe gebruikers automatisch op deze gebruiker abonneren"
 
 #. TRANS: Form legend in user admin panel.
-#: actions/useradminpanel.php:256
 msgid "Invitations"
 msgstr "Uitnodigingen"
 
 #. TRANS: Field label for checkbox in user admin panel for allowing users to invite friend using site e-mail.
-#: actions/useradminpanel.php:262
 msgid "Invitations enabled"
 msgstr "Uitnodigingen ingeschakeld"
 
 #. TRANS: Tooltip for checkbox in user admin panel for allowing users to invite friend using site e-mail.
-#: actions/useradminpanel.php:265
 msgid "Whether to allow users to invite new users."
 msgstr "Of gebruikers nieuwe gebruikers kunnen uitnodigen."
 
 #. TRANS: Title for button to save user settings in user admin panel.
-#: actions/useradminpanel.php:302
 msgid "Save user settings."
 msgstr "Gebruikersinstellingen opslaan."
 
 #. TRANS: Page title.
-#: actions/userauthorization.php:109
 msgid "Authorize subscription"
 msgstr "Abonneren"
 
 #. TRANS: Page notice on "Auhtorize subscription" page.
-#: actions/userauthorization.php:115
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
 "user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
@@ -6639,38 +5449,31 @@ msgstr ""
 "klik dan op \"Afwijzen\"."
 
 #. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:200
 msgctxt "BUTTON"
 msgid "Accept"
 msgstr "Aanvaarden"
 
 #. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:202
 msgid "Subscribe to this user."
 msgstr "Abonneren op deze gebruiker."
 
 #. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:204
 msgctxt "BUTTON"
 msgid "Reject"
 msgstr "Afwijzen"
 
 #. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:206
 msgid "Reject this subscription."
 msgstr "Dit abonnement weigeren."
 
 #. TRANS: Client error displayed for an empty authorisation request.
-#: actions/userauthorization.php:219
 msgid "No authorization request!"
 msgstr "Geen autorisatieverzoek!"
 
 #. TRANS: Accept message header from Authorise subscription page.
-#: actions/userauthorization.php:242
 msgid "Subscription authorized"
 msgstr "Het abonnement is geautoriseerd"
 
-#: actions/userauthorization.php:245
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to authorize the "
@@ -6681,11 +5484,9 @@ msgstr ""
 "afwijzen van een abonnement. Uw abonnementstoken is:"
 
 #. TRANS: Reject message header from Authorise subscription page.
-#: actions/userauthorization.php:256
 msgid "Subscription rejected"
 msgstr "Het abonnement is afgewezen"
 
-#: actions/userauthorization.php:259
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to fully reject the "
@@ -6697,35 +5498,30 @@ msgstr ""
 
 #. TRANS: Exception thrown when no valid user is found for an authorisation request.
 #. TRANS: %s is a listener URI.
-#: actions/userauthorization.php:296
 #, php-format
 msgid "Listener URI \"%s\" not found here."
 msgstr "De abonnee-URI \"%s\" is hier niet te vinden."
 
 #. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
 #. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:303
 #, php-format
 msgid "Listenee URI \"%s\" is too long."
 msgstr "De URI \"%s\" van de gevolgde gebruiker is te lang."
 
 #. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
 #. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:311
 #, php-format
 msgid "Listenee URI \"%s\" is a local user."
 msgstr "De abonnements-URI \"%s\" is een lokale gebruiker."
 
 #. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
 #. TRANS: %s is a profile URL.
-#: actions/userauthorization.php:329
 #, php-format
 msgid "Profile URL \"%s\" is for a local user."
 msgstr "De profiel-URL \"%s\" is van een lokale gebruiker."
 
 #. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
 #. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
-#: actions/userauthorization.php:339
 #, php-format
 msgid ""
 "Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
@@ -6736,32 +5532,27 @@ msgstr ""
 
 #. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
 #. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:349
 #, php-format
 msgid "Avatar URL \"%s\" is not valid."
 msgstr "De avatar-URL \"%s\" is niet geldig."
 
 #. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
 #. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:356
 #, php-format
 msgid "Cannot read avatar URL \"%s\"."
 msgstr "Het was niet mogelijk de avatar-URL \"%s\" te lezen."
 
 #. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
 #. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:363
 #, php-format
 msgid "Wrong image type for avatar URL \"%s\"."
 msgstr "Er staat een verkeerd afbeeldingsttype op de avatar-URL \"%s\"."
 
 #. TRANS: Page title for profile design page.
-#: actions/userdesignsettings.php:74 lib/designsettings.php:61
 msgid "Profile design"
 msgstr "Profielontwerp"
 
 #. TRANS: Instructions for profile design page.
-#: actions/userdesignsettings.php:84 lib/designsettings.php:72
 msgid ""
 "Customize the way your profile looks with a background image and a colour "
 "palette of your choice."
@@ -6769,44 +5560,33 @@ msgstr ""
 "U kunt de vormgeving van uw profiel aanpassen door een achtergrondafbeelding "
 "toe te voegen of het kleurenpalet aan te passen."
 
-#: actions/userdesignsettings.php:289
 msgid "Enjoy your hotdog!"
 msgstr "Geniet van uw hotdog!"
 
-#: actions/userdesignsettings.php:325
-#, fuzzy
 msgid "Design settings"
-msgstr "Websiteinstellingen opslaan"
+msgstr "Vormgevingsinstellingen"
 
-#: actions/userdesignsettings.php:340
 msgid "View profile designs"
 msgstr "Profielontwerpen gebruiken"
 
-#: actions/userdesignsettings.php:341
 msgid "Show or hide profile designs."
 msgstr "Profielontwerpen weergeven of verbergen"
 
-#: actions/userdesignsettings.php:348
-#, fuzzy
 msgid "Background file"
-msgstr "Achtergrond"
+msgstr "Achtergrondbestand"
 
 #. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number.
-#: actions/usergroups.php:66
 #, php-format
 msgid "%1$s groups, page %2$d"
 msgstr "Groepen voor %1$s, pagina %2$d"
 
-#: actions/usergroups.php:132
 msgid "Search for more groups"
 msgstr "Meer groepen zoeken"
 
-#: actions/usergroups.php:159
 #, php-format
 msgid "%s is not a member of any group."
 msgstr "%s is van geen enkele groep lid."
 
-#: actions/usergroups.php:164
 #, php-format
 msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
 msgstr ""
@@ -6817,18 +5597,14 @@ msgstr ""
 #. TRANS: %1$s is a group name, %2$s is a site name.
 #. TRANS: Message is used as a subtitle in atom user notice feed.
 #. TRANS: %1$s is a user name, %2$s is a site name.
-#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:70
-#: lib/atomusernoticefeed.php:95
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr "Updates van %1$s op %2$s."
 
-#: actions/version.php:75
 #, php-format
 msgid "StatusNet %s"
 msgstr "StatusNet %s"
 
-#: actions/version.php:155
 #, php-format
 msgid ""
 "This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
@@ -6837,16 +5613,13 @@ msgstr ""
 "Deze website wordt aangedreven door %1$s versie %2$s. Auteursrechten "
 "voorbehouden 2008-2010 Statusnet, Inc. en medewerkers."
 
-#: actions/version.php:163
 msgid "Contributors"
 msgstr "Medewerkers"
 
 #. TRANS: Menu item for site administration
-#: actions/version.php:167 lib/adminpanelaction.php:403
 msgid "License"
 msgstr "Licentie"
 
-#: actions/version.php:170
 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 "
@@ -6858,7 +5631,6 @@ msgstr ""
 "zoals gepubliceerd door de Free Software Foundation, versie 3 van de "
 "Licentie, of (naar uw keuze) elke latere versie. "
 
-#: actions/version.php:176
 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 "
@@ -6870,7 +5642,6 @@ msgstr ""
 "GESCHIKTHEID VOOR EEN BEPAALD DOEL. Zie de GNU Affero General Public License "
 "voor meer details. "
 
-#: actions/version.php:182
 #, php-format
 msgid ""
 "You should have received a copy of the GNU Affero General Public License "
@@ -6880,52 +5651,42 @@ msgstr ""
 "License te hebben ontvangen. Zo niet, zie dan %s."
 
 #. TRANS: Form input field label for application name.
-#: actions/version.php:197 lib/applicationeditform.php:190
 msgid "Name"
 msgstr "Naam"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:885
 msgid "Version"
 msgstr "Versie"
 
-#: actions/version.php:199
 msgid "Author(s)"
 msgstr "Auteur(s)"
 
 #. TRANS: Form input field label.
-#: actions/version.php:200 lib/applicationeditform.php:208
-#: lib/groupeditform.php:168
 msgid "Description"
 msgstr "Beschrijving"
 
 #. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:164
 msgid "Favor"
 msgstr "Aan favorieten toevoegen"
 
 #. TRANS: Ntofication given when a user marks a notice as favorite.
 #. TRANS: %1$s is a user nickname or full name, %2$s is a notice URI.
-#: classes/Fave.php:167
 #, php-format
 msgid "%1$s marked notice %2$s as a favorite."
 msgstr "%1$s heeft de mededeling %2$s als favoriet gemarkeerd."
 
 #. TRANS: Server exception thrown when a URL cannot be processed.
-#: classes/File.php:162
 #, php-format
 msgid "Cannot process URL '%s'"
 msgstr "Het was niet mogelijk de URL \"%s\" te verwerken."
 
 #. TRANS: Server exception thrown when... Robin thinks something is impossible!
-#: classes/File.php:194
 msgid "Robin thinks something is impossible."
 msgstr "Robin denkt dat iets onmogelijk is."
 
 #. 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$s is used for plural.
-#: classes/File.php:210
 #, php-format
 msgid ""
 "No file may be larger than %1$d byte and the file you sent was %2$d bytes. "
@@ -6942,7 +5703,6 @@ msgstr[1] ""
 
 #. TRANS: Message given if an upload would exceed user quota.
 #. TRANS: %d (number) is the user quota in bytes and is used for plural.
-#: classes/File.php:223
 #, php-format
 msgid "A file this large would exceed your user quota of %d byte."
 msgid_plural "A file this large would exceed your user quota of %d bytes."
@@ -6951,7 +5711,6 @@ msgstr[1] ""
 
 #. TRANS: Message given id an upload would exceed a user's monthly quota.
 #. TRANS: $d (number) is the monthly user quota in bytes and is used for plural.
-#: classes/File.php:235
 #, php-format
 msgid "A file this large would exceed your monthly quota of %d byte."
 msgid_plural "A file this large would exceed your monthly quota of %d bytes."
@@ -6962,112 +5721,93 @@ msgstr[1] ""
 "bytes."
 
 #. TRANS: Client exception thrown if a file upload does not have a valid name.
-#: classes/File.php:282 classes/File.php:297
 msgid "Invalid filename."
 msgstr "Ongeldige bestandsnaam."
 
 #. TRANS: Exception thrown when joining a group fails.
-#: classes/Group_member.php:51
 msgid "Group join failed."
 msgstr "Groepslidmaatschap toevoegen is mislukt."
 
 #. TRANS: Exception thrown when trying to leave a group the user is not a member of.
-#: classes/Group_member.php:64
 msgid "Not part of group."
 msgstr "Geen lid van groep."
 
 #. TRANS: Exception thrown when trying to leave a group fails.
-#: classes/Group_member.php:72
 msgid "Group leave failed."
 msgstr "Groepslidmaatschap opzeggen is mislukt."
 
 #. TRANS: Exception thrown providing an invalid profile ID.
 #. TRANS: %s is the invalid profile ID.
-#: classes/Group_member.php:85
 #, php-format
 msgid "Profile ID %s is invalid."
 msgstr "Profiel-ID %s is ongeldig."
 
 #. TRANS: Exception thrown providing an invalid group ID.
 #. TRANS: %s is the invalid group ID.
-#: classes/Group_member.php:98
 #, php-format
 msgid "Group ID %s is invalid."
 msgstr "Groep-ID %s is ongeldig."
 
 #. TRANS: Activity title.
-#: classes/Group_member.php:147 lib/joinform.php:114
 msgid "Join"
 msgstr "Toetreden"
 
 #. TRANS: Success message for subscribe to group attempt through OStatus.
 #. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
-#: classes/Group_member.php:151
 #, php-format
 msgid "%1$s has joined group %2$s."
 msgstr "%1$s is lid geworden van de groep %2$s."
 
 #. TRANS: Server exception thrown when updating a local group fails.
-#: classes/Local_group.php:42
 msgid "Could not update local group."
 msgstr "Het was niet mogelijk de lokale groep bij te werken."
 
 #. TRANS: Exception thrown when trying creating a login token failed.
 #. TRANS: %s is the user nickname for which token creation failed.
-#: classes/Login_token.php:78
 #, php-format
 msgid "Could not create login token for %s"
 msgstr "Het was niet mogelijk een aanmeldtoken aan te maken voor %s"
 
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
-#: classes/Memcached_DataObject.php:556
 msgid "No database name or DSN found anywhere."
 msgstr "Geen databasenaam of DSN gevonden."
 
 #. TRANS: Client exception thrown when a user tries to send a direct message while being banned from sending them.
-#: classes/Message.php:45
 msgid "You are banned from sending direct messages."
 msgstr "U mag geen directe berichten verzenden."
 
 #. TRANS: Message given when a message could not be stored on the server.
-#: classes/Message.php:69
 msgid "Could not insert message."
 msgstr "Het was niet mogelijk het bericht in te voegen."
 
 #. TRANS: Message given when a message could not be updated on the server.
-#: classes/Message.php:80
 msgid "Could not update message with new URI."
 msgstr "Het was niet mogelijk het bericht bij te werken met de nieuwe URI."
 
 #. TRANS: Server exception thrown when a user profile for a notice cannot be found.
 #. TRANS: %1$d is a profile ID (number), %2$d is a notice ID (number).
-#: classes/Notice.php:98
 #, php-format
 msgid "No such profile (%1$d) for notice (%2$d)."
 msgstr "Er is geen profiel (%1$d) te vinden bij de mededeling (%2$d)."
 
 #. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:199
 #, php-format
 msgid "Database error inserting hashtag: %s"
 msgstr "Er is een databasefout opgetreden bij de invoer van de hashtag: %s"
 
 #. TRANS: Client exception thrown if a notice contains too many characters.
-#: classes/Notice.php:279
 msgid "Problem saving notice. Too long."
 msgstr ""
 "Er is een probleem opgetreden bij het opslaan van de mededeling. Deze is te "
 "lang."
 
 #. TRANS: Client exception thrown when trying to save a notice for an unknown user.
-#: classes/Notice.php:284
 msgid "Problem saving notice. Unknown user."
 msgstr ""
 "Er was een probleem bij het opslaan van de mededeling. De gebruiker is "
 "onbekend."
 
 #. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
-#: classes/Notice.php:290
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
@@ -7075,7 +5815,6 @@ msgstr ""
 "het over enige tijd weer."
 
 #. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
-#: classes/Notice.php:297
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
 "few minutes."
@@ -7084,24 +5823,20 @@ msgstr ""
 "plaats over een aantal minuten pas weer een bericht."
 
 #. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:305
 msgid "You are banned from posting notices on this site."
 msgstr ""
 "U bent geblokkeerd en mag geen mededelingen meer achterlaten op deze site."
 
 #. TRANS: Server exception thrown when a notice cannot be saved.
 #. TRANS: Server exception thrown when a notice cannot be updated.
-#: classes/Notice.php:372 classes/Notice.php:399
 msgid "Problem saving notice."
 msgstr "Er is een probleem opgetreden bij het opslaan van de mededeling."
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:929
 msgid "Bad type provided to saveKnownGroups."
 msgstr "Het gegevenstype dat is opgegeven aan saveKnownGroups is onjuist"
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:1028
 msgid "Problem saving group inbox."
 msgstr ""
 "Er is een probleem opgetreden bij het opslaan van het Postvak IN van de "
@@ -7109,20 +5844,17 @@ msgstr ""
 
 #. TRANS: Server exception thrown when a reply cannot be saved.
 #. TRANS: %1$d is a notice ID, %2$d is the ID of the mentioned user.
-#: classes/Notice.php:1144
 #, php-format
 msgid "Could not save reply for %1$d, %2$d."
 msgstr "Het was niet mogelijk antwoord %1$d voor %2$d op te slaan."
 
 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1663
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
 
 #. TRANS: Full name of a profile or group followed by nickname in parens
-#: classes/Profile.php:172 classes/User_group.php:242
 #, php-format
 msgctxt "FANCYNAME"
 msgid "%1$s (%2$s)"
@@ -7130,7 +5862,6 @@ msgstr "%1$s (%2$s)"
 
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:779
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
@@ -7139,7 +5870,6 @@ msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:788
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -7147,253 +5877,194 @@ msgstr ""
 "Databasefout."
 
 #. TRANS: Exception thrown when a right for a non-existing user profile is checked.
-#: classes/Remote_profile.php:54
 msgid "Missing profile."
 msgstr "Ontbrekend profiel."
 
 #. TRANS: Exception thrown when a tag cannot be saved.
-#: classes/Status_network.php:338
 msgid "Unable to save tag."
 msgstr "Het was niet mogelijk om het label op te slaan."
 
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#: classes/Subscription.php:77 lib/oauthstore.php:482
 msgid "You have been banned from subscribing."
 msgstr "U mag zich niet abonneren."
 
 #. TRANS: Exception thrown when trying to subscribe while already subscribed.
-#: classes/Subscription.php:82
 msgid "Already subscribed!"
 msgstr "U bent al gebonneerd!"
 
 #. TRANS: Exception thrown when trying to subscribe to a user who has blocked the subscribing user.
-#: classes/Subscription.php:87
 msgid "User has blocked you."
 msgstr "Deze gebruiker negeert u."
 
 #. TRANS: Exception thrown when trying to unsibscribe without a subscription.
-#: classes/Subscription.php:176
 msgid "Not subscribed!"
 msgstr "Niet geabonneerd!"
 
 #. TRANS: Exception thrown when trying to unsubscribe a user from themselves.
-#: classes/Subscription.php:183
 msgid "Could not delete self-subscription."
 msgstr "Kon abonnement op eigen gebruiker niet verwijderen."
 
 #. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
-#: classes/Subscription.php:211
 msgid "Could not delete subscription OMB token."
 msgstr ""
 "Het was niet mogelijk om het OMB-token voor het abonnement te verwijderen."
 
 #. TRANS: Exception thrown when a subscription could not be deleted on the server.
-#: classes/Subscription.php:223
 msgid "Could not delete subscription."
 msgstr "Kon abonnement niet verwijderen."
 
 #. TRANS: Activity tile when subscribing to another person.
-#: classes/Subscription.php:265
 msgid "Follow"
 msgstr "Volgen"
 
 #. TRANS: Notification given when one person starts following another.
 #. TRANS: %1$s is the subscriber, %2$s is the subscribed.
-#: classes/Subscription.php:268
 #, php-format
 msgid "%1$s is now following %2$s."
 msgstr "%1$s is %2$s gaan volgen."
 
 #. TRANS: Notice given on user registration.
 #. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:390
 #, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr "Welkom bij %1$s, @%2$s!"
 
 #. TRANS: Server exception.
-#: classes/User.php:923
 msgid "No single user defined for single-user mode."
 msgstr "Er is geen gebruiker gedefinieerd voor single-usermodus."
 
 #. TRANS: Server exception.
-#: classes/User.php:927
 msgid "Single-user mode code called when not enabled."
 msgstr ""
 "De \"single-user\"-modus is aangeroepen terwijl deze niet is ingeschakeld."
 
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:522
 msgid "Could not create group."
 msgstr "Het was niet mogelijk de groep aan te maken."
 
 #. TRANS: Server exception thrown when updating a group URI failed.
-#: classes/User_group.php:532
 msgid "Could not set group URI."
 msgstr "Het was niet mogelijk de groeps-URI in te stellen."
 
 #. TRANS: Server exception thrown when setting group membership failed.
-#: classes/User_group.php:555
 msgid "Could not set group membership."
 msgstr "Het was niet mogelijk het groepslidmaatschap in te stellen."
 
 #. TRANS: Server exception thrown when saving local group information failed.
-#: classes/User_group.php:570
 msgid "Could not save local group info."
 msgstr "Het was niet mogelijk de lokale groepsinformatie op te slaan."
 
 #. TRANS: Exception thrown when an account could not be located when it should be moved.
 #. TRANS: %s is the remote site.
-#: lib/accountmover.php:65
 #, php-format
 msgid "Cannot locate account %s."
 msgstr "De gebruiker %s is niet gevonden."
 
 #. TRANS: Exception thrown when a service document could not be located account move.
 #. TRANS: %s is the remote site.
-#: lib/accountmover.php:106
 #, php-format
 msgid "Cannot find XRD for %s."
 msgstr "Er is geen XSD aangetroffen voor %s."
 
 #. TRANS: Exception thrown when an account could not be located when it should be moved.
 #. TRANS: %s is the remote site.
-#: lib/accountmover.php:131
 #, php-format
 msgid "No AtomPub API service for %s."
 msgstr "Er is geen AtomPub API-dienst voor %s."
 
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: lib/action.php:161
 #, php-format
 msgid "%1$s - %2$s"
 msgstr "%1$s - %2$s"
 
 #. TRANS: Page title for a page without a title set.
-#: lib/action.php:177
 msgid "Untitled page"
 msgstr "Naamloze pagina"
 
 #. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.
-#: lib/action.php:325
 msgctxt "TOOLTIP"
 msgid "Show more"
 msgstr "Meer weergeven"
 
 #. TRANS: Inline reply form submit button: submits a reply comment.
-#: lib/action.php:328
 #, fuzzy
 msgctxt "BUTTON"
-msgid "Comment"
-msgstr "Inhoud"
+msgid "Reply"
+msgstr "Antwoorden"
 
 #. TRANS: Placeholder text for inline reply form. Clicking in this box will turn it into a mini notice form.
-#: lib/action.php:331
-msgid "Add a comment..."
+msgid "Write a reply..."
 msgstr ""
 
-#: lib/action.php:559 lib/personalgroupnav.php:99
-#, fuzzy
 msgid "Home"
-msgstr "Startpagina"
+msgstr "Start"
 
-#: lib/action.php:560
-#, fuzzy
 msgid "Friends timeline"
-msgstr "%s tijdlijn"
+msgstr "Tijdlijn van vrienden"
 
-#: lib/action.php:566
-#, fuzzy
 msgid "Your profile"
-msgstr "Groepsprofiel"
+msgstr "Uw profiel"
 
-#: lib/action.php:570 lib/action.php:593 lib/publicgroupnav.php:78
 msgid "Public"
 msgstr "Openbaar"
 
-#: lib/action.php:571 lib/action.php:594
-#, fuzzy
 msgid "Everyone on this site"
-msgstr "Gebruikers op deze site vinden"
+msgstr "Iedereen op deze site"
 
-#: lib/action.php:575
-#, fuzzy
 msgid "Settings"
 msgstr "SMS-instellingen"
 
-#: lib/action.php:576
-#, fuzzy
 msgid "Change your personal settings"
-msgstr "Uw profielgegevens wijzigen"
+msgstr "Persoonlijke instellingen wijzigen"
 
-#: lib/action.php:582
-#, fuzzy
 msgid "Site configuration"
-msgstr "Gebruikersinstellingen"
+msgstr "Siteinstellingen"
 
-#: lib/action.php:587
-#, fuzzy
 msgid "Logout"
 msgstr "Afmelden"
 
-#: lib/action.php:588
-#, fuzzy
 msgid "Logout from the site"
-msgstr "Gebruiker afmelden"
+msgstr "Van de site afmelden"
 
-#: lib/action.php:599
-#, fuzzy
 msgid "Login to the site"
-msgstr "Gebruiker aanmelden"
+msgstr "Bij de site aanmelden"
 
-#: lib/action.php:606
-#, fuzzy
 msgid "Search"
 msgstr "Zoeken"
 
-#: lib/action.php:607
-#, fuzzy
 msgid "Search the site"
 msgstr "Site doorzoeken"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:864
 msgid "Help"
 msgstr "Help"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:867
 msgid "About"
 msgstr "Over"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:870
 msgid "FAQ"
 msgstr "Veel gestelde vragen"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:875
 msgid "TOS"
 msgstr "Gebruiksvoorwaarden"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:879
 msgid "Privacy"
 msgstr "Privacy"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:882
 msgid "Source"
 msgstr "Broncode"
 
 #. TRANS: Secondary navigation menu option leading to e-mail contact information on the
 #. TRANS: StatusNet site, where to report bugs, ...
-#: lib/action.php:889
 msgid "Contact"
 msgstr "Contact"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:892
 msgid "Badge"
 msgstr "Widget"
 
@@ -7401,7 +6072,6 @@ msgstr "Widget"
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:921
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7411,7 +6081,6 @@ msgstr ""
 "broughtbyurl%%)."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:924
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** is een microblogdienst."
@@ -7420,7 +6089,6 @@ msgstr "**%%site.name%%** is een microblogdienst."
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:931
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7433,14 +6101,12 @@ msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:949
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr "Inhoud en gegevens van %1$s zijn persoonlijk en vertrouwelijk."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:956
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
@@ -7448,7 +6114,6 @@ msgstr ""
 "voorbehouden."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:960
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 "Auteursrechten op inhoud en gegevens rusten bij de respectievelijke "
@@ -7456,7 +6121,6 @@ msgstr ""
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:992
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
@@ -7464,69 +6128,57 @@ msgstr ""
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1335
 msgid "After"
 msgstr "Later"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1345
 msgid "Before"
 msgstr "Eerder"
 
 #. TRANS: Client exception thrown when a feed instance is a DOMDocument.
-#: lib/activity.php:125
 msgid "Expecting a root feed element but got a whole XML document."
 msgstr "Verwachtte een root-feed element maar kreeg een heel XML-document."
 
 #. TRANS: Client exception thrown when using an unknown verb for the activity importer.
-#: lib/activityimporter.php:81
 #, php-format
 msgid "Unknown verb: \"%s\"."
 msgstr "Onbekend werkwoord: \"%s\"."
 
 #. TRANS: Client exception thrown when trying to force a subscription for an untrusted user.
-#: lib/activityimporter.php:107
 msgid "Cannot force subscription for untrusted user."
 msgstr ""
 "Het is niet mogelijk een niet-vertrouwde gebruiker gedwongen te abonneren."
 
 #. TRANS: Client exception thrown when trying to for a remote user to subscribe.
-#: lib/activityimporter.php:117
 msgid "Cannot force remote user to subscribe."
 msgstr ""
 "Het is niet mogelijk een gebruiker op een andere server te verplichten te "
 "abonneren."
 
 #. TRANS: Client exception thrown when trying to subscribe to an unknown profile.
-#: lib/activityimporter.php:132
 msgid "Unknown profile."
 msgstr "Onbekende profiel."
 
 #. TRANS: Client exception thrown when trying to import an event not related to the importing user.
-#: lib/activityimporter.php:138
 msgid "This activity seems unrelated to our user."
 msgstr "Deze activiteit lijkt geen relatie te hebben met onze gebruiker."
 
 #. TRANS: Client exception thrown when trying to join a remote group that is not a group.
-#: lib/activityimporter.php:154
 msgid "Remote profile is not a group!"
 msgstr "Het profiel op de andere server is geen groep!"
 
 #. TRANS: Client exception thrown when trying to join a group the importing user is already a member of.
-#: lib/activityimporter.php:163
 msgid "User is already a member of this group."
 msgstr "De gebruiker is al lid van deze groep."
 
 #. TRANS: Client exception thrown when trying to import a notice by another user.
 #. TRANS: %1$s is the source URI of the notice, %2$s is the URI of the author.
-#: lib/activityimporter.php:201
 #, php-format
 msgid "Already know about notice %1$s and  it has a different author %2$s."
 msgstr "De mededeling %1$s is al bekend en heeft een andere auteur %2$s."
 
 #. TRANS: Client exception thrown when trying to overwrite the author information for a non-trusted user during import.
-#: lib/activityimporter.php:207
 msgid "Not overwriting author info for non-trusted user."
 msgstr ""
 "De auteursgegevens voor de niet-vertrouwde gebruiker worden niet "
@@ -7534,12 +6186,10 @@ msgstr ""
 
 #. TRANS: Client exception thrown when trying to import a notice without content.
 #. TRANS: %s is the notice URI.
-#: lib/activityimporter.php:223
 #, php-format
 msgid "No content for notice %s."
 msgstr "Geen inhoud voor mededeling %s."
 
-#: lib/activitymover.php:84
 #, php-format
 msgid "No such user %s."
 msgstr "De gebruiker %s bestaat niet."
@@ -7550,171 +6200,138 @@ msgstr "De gebruiker %s bestaat niet."
 #. TRANS: %1$s is a URL, %2$s is the status, %s$s is the fail reason.
 #. TRANS: Exception thrown when post to collection fails with a status that is not handled.
 #. TRANS: %1$s is a URL, %2$s is the status, %s$s is the fail reason.
-#: lib/activitysink.php:163 lib/activitysink.php:167 lib/activitysink.php:172
 #, php-format
 msgctxt "URLSTATUSREASON"
 msgid "%1$s %2$s %3$s"
 msgstr "%1$s %2$s %3$s"
 
 #. TRANS: Client exception thrown when there is no source attribute.
-#: lib/activityutils.php:200
 msgid "Can't handle remote content yet."
 msgstr "Het is nog niet mogelijk inhoud uit andere omgevingen te verwerken."
 
 #. TRANS: Client exception thrown when there embedded XML content is found that cannot be processed yet.
-#: lib/activityutils.php:237
 msgid "Can't handle embedded XML content yet."
 msgstr "Het is nog niet mogelijk ingebedde XML-inhoud te verwerken"
 
 #. TRANS: Client exception thrown when base64 encoded content is found that cannot be processed yet.
-#: lib/activityutils.php:242
 msgid "Can't handle embedded Base64 content yet."
 msgstr "Het is nog niet mogelijk ingebedde Base64-inhoud te verwerken"
 
 #. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights.
-#: lib/adminpanelaction.php:96
 msgid "You cannot make changes to this site."
 msgstr "U mag geen wijzigingen maken aan deze website."
 
 #. TRANS: Client error message throw when a certain panel's settings cannot be changed.
-#: lib/adminpanelaction.php:108
 msgid "Changes to that panel are not allowed."
 msgstr "Wijzigingen aan dat venster zijn niet toegestaan."
 
 #. TRANS: Client error message.
-#: lib/adminpanelaction.php:222
 msgid "showForm() not implemented."
 msgstr "showForm() is niet geïmplementeerd."
 
 #. TRANS: Client error message
-#: lib/adminpanelaction.php:250
 msgid "saveSettings() not implemented."
 msgstr "saveSettings() is nog niet geïmplementeerd."
 
 #. TRANS: Client error message thrown if design settings could not be deleted in
 #. TRANS: the admin panel Design.
-#: lib/adminpanelaction.php:274
 msgid "Unable to delete design setting."
 msgstr "Het was niet mogelijk om de ontwerpinstellingen te verwijderen."
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:337
 msgid "Basic site configuration"
 msgstr "Basisinstellingen voor de website"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:339
 msgctxt "MENU"
 msgid "Site"
 msgstr "Website"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:345
 msgid "Design configuration"
 msgstr "Instellingen vormgeving"
 
 #. TRANS: Menu item for site administration
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/adminpanelaction.php:347 lib/groupnav.php:135
 msgctxt "MENU"
 msgid "Design"
 msgstr "Uiterlijk"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:353
 msgid "User configuration"
 msgstr "Gebruikersinstellingen"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:110
 msgid "User"
 msgstr "Gebruiker"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:361
 msgid "Access configuration"
 msgstr "Toegangsinstellingen"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:369
 msgid "Paths configuration"
 msgstr "Padinstellingen"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:377
 msgid "Sessions configuration"
 msgstr "Sessieinstellingen"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:385
 msgid "Edit site notice"
 msgstr "Websitebrede mededeling opslaan"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:387
 msgid "Site notice"
 msgstr "Mededeling van de website"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:393
 msgid "Snapshots configuration"
 msgstr "Snapshotinstellingen"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:401
 msgid "Set site license"
 msgstr "Sitelicentie instellen"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:409
-#, fuzzy
 msgid "Plugins configuration"
-msgstr "Padinstellingen"
+msgstr "Plug-ininstellingen"
 
 #. TRANS: Client error 401.
-#: lib/apiauth.php:111
 msgid "API resource requires read-write access, but you only have read access."
 msgstr ""
 "Het API-programma heeft lezen-en-schrijventoegang nodig, maar u hebt alleen "
 "maar leestoegang."
 
 #. TRANS: OAuth exception thrown when no application is found for a given consumer key.
-#: lib/apiauth.php:177
 msgid "No application for that consumer key."
 msgstr "Er is geen applicatie voor die gebruikerssleutel."
 
-#: lib/apiauth.php:202 lib/apiauth.php:284
 msgid "Not allowed to use API."
 msgstr "Het gebruik van de API is niet toegestaan."
 
 #. TRANS: OAuth exception given when an incorrect access token was given for a user.
-#: lib/apiauth.php:225
 msgid "Bad access token."
 msgstr "Ongeldig toegangstoken."
 
 #. TRANS: OAuth exception given when no user was found for a given token (no token was found).
-#: lib/apiauth.php:230
 msgid "No user for that token."
 msgstr "Er is geen gebruiker voor dat token."
 
 #. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel".
 #. TRANS: Client error thrown when authentication fails.
-#: lib/apiauth.php:272 lib/apiauth.php:302
 msgid "Could not authenticate you."
 msgstr "U kon niet geauthenticeerd worden."
 
 #. TRANS: Server error displayed when trying to create an anynymous OAuth consumer.
-#: lib/apioauthstore.php:45
 msgid "Could not create anonymous consumer."
 msgstr "Het was niet mogelijk een anonieme consumer aan te maken."
 
 #. TRANS: Server error displayed when trying to create an anynymous OAuth application.
-#: lib/apioauthstore.php:69
 msgid "Could not create anonymous OAuth application."
 msgstr "Het was niet mogelijk een anonieme OAuthapplicatie aan te maken."
 
 #. TRANS: Exception thrown when no token association could be found.
-#: lib/apioauthstore.php:151
 msgid ""
 "Could not find a profile and application associated with the request token."
 msgstr ""
@@ -7722,45 +6339,37 @@ msgstr ""
 "niet aangetroffen."
 
 #. TRANS: Exception thrown when no access token can be issued.
-#: lib/apioauthstore.php:209
 msgid "Could not issue access token."
 msgstr "Het was niet mogelijk het toegangstoken uit te geven."
 
-#: lib/apioauthstore.php:317
 msgid "Database error inserting OAuth application user."
 msgstr ""
 "Er is een databasefout opgetreden tijdens het toevoegen van de OAuth "
 "applicatiegebruiker."
 
-#: lib/apioauthstore.php:345
 msgid "Database error updating OAuth application user."
 msgstr ""
 "Er is een databasefout opgetreden tijdens het toevoegen van de OAuth "
 "applicatiegebruiker."
 
 #. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
-#: lib/apioauthstore.php:371
 msgid "Tried to revoke unknown token."
 msgstr "Er is geprobeerd een onbekend token in te trekken."
 
 #. TRANS: Exception thrown when an attempt is made to remove a revoked token.
-#: lib/apioauthstore.php:376
 msgid "Failed to delete revoked token."
 msgstr "Het was niet mogelijk een ingetrokken token te verwijderen."
 
 #. TRANS: Form input field label for application icon.
-#: lib/applicationeditform.php:177
 msgid "Icon"
 msgstr "Icoon"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:182
 msgid "Icon for this application"
 msgstr "Icoon voor deze applicatie"
 
 #. TRANS: Form input field instructions.
 #. TRANS: %d is the number of available characters for the description.
-#: lib/applicationeditform.php:201
 #, php-format
 msgid "Describe your application in %d character"
 msgid_plural "Describe your application in %d characters"
@@ -7768,206 +6377,167 @@ msgstr[0] "Beschrijf uw applicatie in een enkel teken"
 msgstr[1] "Beschrijf uw applicatie in %d tekens"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:205
 msgid "Describe your application"
 msgstr "Beschrijf uw applicatie"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:216
 msgid "URL of the homepage of this application"
 msgstr "De URL van de homepage van deze applicatie"
 
 #. TRANS: Form input field label.
-#: lib/applicationeditform.php:218
 msgid "Source URL"
 msgstr "Bron-URL"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:225
 msgid "Organization responsible for this application"
 msgstr "Organisatie verantwoordelijk voor deze applicatie"
 
 #. TRANS: Form input field label.
-#: lib/applicationeditform.php:227
 msgid "Organization"
 msgstr "Organisatie"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:234
 msgid "URL for the homepage of the organization"
 msgstr "De URL van de homepage van de organisatie"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:243
 msgid "URL to redirect to after authentication"
 msgstr "URL om naar door te verwijzen na authenticatie"
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:271
 msgid "Browser"
 msgstr "Browser"
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:288
 msgid "Desktop"
 msgstr "Desktop"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:290
 msgid "Type of application, browser or desktop"
 msgstr "Type applicatie; browser of desktop"
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:314
 msgid "Read-only"
 msgstr "Alleen-lezen"
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:334
 msgid "Read-write"
 msgstr "Lezen en schrijven"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:336
 msgid "Default access for this application: read-only, or read-write"
 msgstr ""
 "Standaardtoegang voor deze applicatie: alleen-lezen of lezen en schrijven"
 
 #. TRANS: Submit button title.
-#: lib/applicationeditform.php:353
 msgid "Cancel"
 msgstr "Annuleren"
 
-#: lib/applicationlist.php:247
 msgid " by "
 msgstr " door "
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:260
 msgid "read-write"
 msgstr "lezen en schrijven"
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:262
 msgid "read-only"
 msgstr "alleen-lezen"
 
 #. TRANS: Used in application list. %1$s is a modified date, %2$s is access type ("read-write" or "read-only")
-#: lib/applicationlist.php:268
 #, php-format
 msgid "Approved %1$s - \"%2$s\" access."
 msgstr "Goedgekeurd op %1$s met toegang \"%2$s\"."
 
 #. TRANS: Access token in the application list.
 #. TRANS: %s are the first 7 characters of the access token.
-#: lib/applicationlist.php:282
 #, php-format
 msgid "Access token starting with: %s"
 msgstr "Toegangstoken begint met: %s"
 
 #. TRANS: Button label
-#: lib/applicationlist.php:298
 msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "Intrekken"
 
-#: lib/atom10feed.php:113
 msgid "Author element must contain a name element."
 msgstr "Het element author moet een element name bevatten."
 
 #. TRANS: Server exception thrown when using the method setActivitySubject() in the class Atom10Feed.
-#: lib/atom10feed.php:160
 msgid "Do not use this method!"
 msgstr "Gebruik deze methode niet!"
 
 #. TRANS: Title.
-#: lib/attachmentnoticesection.php:67
 msgid "Notices where this attachment appears"
 msgstr "Mededelingen die deze bijlage bevatten"
 
 #. TRANS: Title.
-#: lib/attachmenttagcloudsection.php:48
 msgid "Tags for this attachment"
 msgstr "Labels voor deze bijlage"
 
 #. TRANS: Exception thrown when a password change fails.
-#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:227
 msgid "Password changing failed."
 msgstr "Wachtwoord wijzigen is mislukt"
 
 #. TRANS: Exception thrown when a password change attempt fails because it is not allowed.
-#: lib/authenticationplugin.php:238
 msgid "Password changing is not allowed."
 msgstr "Wachtwoord wijzigen is niet toegestaan"
 
 #. TRANS: Title for the form to block a user.
-#: lib/blockform.php:68
 msgid "Block"
 msgstr "Blokkeren"
 
 #. TRANS: Description of the form to block a user.
-#: lib/blockform.php:79
 msgid "Block this user"
 msgstr "Deze gebruiker blokkeren"
 
 #. TRANS: Title for command results.
-#: lib/channel.php:104 lib/channel.php:125
 msgid "Command results"
 msgstr "Commandoresultaten"
 
 #. TRANS: Title for command results.
-#: lib/channel.php:138
 msgid "AJAX error"
 msgstr "Er is een Ajax-fout opgetreden"
 
 #. TRANS: E-mail subject when a command has completed.
-#: lib/channel.php:177 lib/mailhandler.php:143
 msgid "Command complete"
 msgstr "Het commando is uitgevoerd"
 
 #. TRANS: E-mail subject when a command has failed.
-#: lib/channel.php:188
 msgid "Command failed"
 msgstr "Het uitvoeren van het commando is mislukt"
 
 #. TRANS: Command exception text shown when a notice ID is requested that does not exist.
-#: lib/command.php:82 lib/command.php:106
 msgid "Notice with that id does not exist."
 msgstr "Er bestaat geen mededeling met dat ID."
 
 #. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
 #. TRANS: Error text shown when a last user notice is requested and it does not exist.
-#: lib/command.php:99 lib/command.php:642
 msgid "User has no last notice."
 msgstr "Deze gebruiker heeft geen laatste mededeling."
 
 #. TRANS: Message given requesting a profile for a non-existing user.
 #. TRANS: %s is the nickname of the user for which the profile could not be found.
-#: lib/command.php:128
 #, php-format
 msgid "Could not find a user with nickname %s."
 msgstr "De gebruiker %s is niet aangetroffen."
 
 #. TRANS: Message given getting a non-existing user.
 #. TRANS: %s is the nickname of the user that could not be found.
-#: lib/command.php:148
 #, php-format
 msgid "Could not find a local user with nickname %s."
 msgstr "De lokale gebruiker %s is niet aangetroffen."
 
 #. TRANS: Error text shown when an unimplemented command is given.
-#: lib/command.php:183
 msgid "Sorry, this command is not yet implemented."
 msgstr "Dit commando is nog niet geïmplementeerd."
 
 #. TRANS: Command exception text shown when a user tries to nudge themselves.
-#: lib/command.php:229
 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr "Het heeft niet zoveel zin om uzelf te porren..."
 
 #. TRANS: Message given having nudged another user.
 #. TRANS: %s is the nickname of the user that was nudged.
-#: lib/command.php:238
 #, php-format
 msgid "Nudge sent to %s."
 msgstr "De por naar %s is verzonden."
@@ -7976,7 +6546,6 @@ msgstr "De por naar %s is verzonden."
 #. TRANS: %1$s is the number of other user the user is subscribed to.
 #. TRANS: %2$s is the number of users that are subscribed to the user.
 #. TRANS: %3$s is the number of notices the user has sent.
-#: lib/command.php:268
 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"
@@ -7988,40 +6557,35 @@ msgstr ""
 "Mededelingen: %3$s"
 
 #. TRANS: Error message text shown when a favorite could not be set because it has already been favorited.
-#: lib/command.php:298
-#, fuzzy
 msgid "Could not create favorite: already favorited."
-msgstr "Het was niet mogelijk een favoriet aan te maken."
+msgstr ""
+"Het was niet mogelijk een favoriet aan te maken. De mededeling is al "
+"favoriet."
 
 #. TRANS: Text shown when a notice has been marked as favourite successfully.
-#: lib/command.php:324
 msgid "Notice marked as fave."
 msgstr "De mededeling is op de favorietenlijst geplaatst."
 
 #. TRANS: Message given having added a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:369
 #, php-format
 msgid "%1$s joined group %2$s."
 msgstr "%1$s is lid geworden van de groep %2$s."
 
 #. TRANS: Message given having removed a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:417
 #, php-format
 msgid "%1$s left group %2$s."
 msgstr "%1$s heeft de groep %2$s verlaten."
 
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: lib/command.php:438
 #, php-format
 msgctxt "WHOIS"
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
 
 #. TRANS: Whois output. %s is the full name of the queried user.
-#: lib/command.php:442
 #, php-format
 msgid "Fullname: %s"
 msgstr "Volledige naam: %s"
@@ -8029,7 +6593,6 @@ msgstr "Volledige naam: %s"
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a location.
-#: lib/command.php:446 lib/mail.php:275
 #, php-format
 msgid "Location: %s"
 msgstr "Locatie: %s"
@@ -8037,20 +6600,17 @@ msgstr "Locatie: %s"
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a homepage.
-#: lib/command.php:450 lib/mail.php:279
 #, php-format
 msgid "Homepage: %s"
 msgstr "Thuispagina: %s"
 
 #. TRANS: Whois output. %s is the bio information of the queried user.
-#: lib/command.php:454
 #, php-format
 msgid "About: %s"
 msgstr "Over: %s"
 
 #. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).
 #. TRANS: %s is a remote profile.
-#: lib/command.php:483
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
@@ -8061,7 +6621,6 @@ msgstr ""
 
 #. TRANS: Message given if content is too long. %1$sd is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:500
 #, php-format
 msgid "Message too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
@@ -8072,26 +6631,26 @@ msgstr[1] ""
 "Het bericht is te lang. Het mag maximaal %1$d tekens bevatten en u hebt er %2"
 "$d gebruikt."
 
+#. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
+msgid "You can't send a message to this user."
+msgstr "U kunt geen bericht naar deze gebruiker zenden."
+
 #. TRANS: Error text shown sending a direct message fails with an unknown reason.
-#: lib/command.php:528
 msgid "Error sending direct message."
 msgstr "Er is een fout opgetreden bij het verzonden van het directe bericht."
 
 #. TRANS: Message given having repeated a notice from another user.
 #. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:565
 #, php-format
 msgid "Notice from %s repeated."
 msgstr "De mededeling van %s is herhaald."
 
 #. TRANS: Error text shown when repeating a notice fails with an unknown reason.
-#: lib/command.php:568
 msgid "Error repeating notice."
 msgstr "Er is een fout opgetreden bij het herhalen van de mededeling."
 
 #. TRANS: Message given if content of a notice for a reply is too long. %1$d is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:603
 #, php-format
 msgid "Notice too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Notice too long - maximum is %1$d characters, you sent %2$d."
@@ -8104,81 +6663,67 @@ msgstr[1] ""
 
 #. TRANS: Text shown having sent a reply to a notice successfully.
 #. TRANS: %s is the nickname of the user of the notice the reply was sent to.
-#: lib/command.php:616
 #, php-format
 msgid "Reply to %s sent."
 msgstr "Het antwoord aan %s is verzonden."
 
 #. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
-#: lib/command.php:619
 msgid "Error saving notice."
 msgstr "Er is een fout opgetreden bij het opslaan van de mededeling."
 
 #. TRANS: Error text shown when no username was provided when issuing a subscribe command.
-#: lib/command.php:666
 msgid "Specify the name of the user to subscribe to."
 msgstr "Geef de naam op van de gebruiker waarop u zich wilt abonneren."
 
 #. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
-#: lib/command.php:675
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "Abonneren op OMB-profielen op commando is niet mogelijk."
 
 #. TRANS: Text shown after having subscribed to another user successfully.
 #. TRANS: %s is the name of the user the subscription was requested for.
-#: lib/command.php:683
 #, php-format
 msgid "Subscribed to %s."
 msgstr "Geabonneerd op %s."
 
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.
-#: lib/command.php:704 lib/command.php:815
 msgid "Specify the name of the user to unsubscribe from."
 msgstr ""
 "Geef de naam op van de gebruiker waarop u het abonnement wilt opzeggen."
 
 #. TRANS: Text shown after having unsubscribed from another user successfully.
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:715
 #, php-format
 msgid "Unsubscribed from %s."
 msgstr "Uw abonnement op %s is opgezegd."
 
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
-#: lib/command.php:735 lib/command.php:761
 msgid "Command not yet implemented."
 msgstr "Dit commando is nog niet geïmplementeerd."
 
 #. TRANS: Text shown when issuing the command "off" successfully.
-#: lib/command.php:739
 msgid "Notification off."
 msgstr "Notificaties uitgeschakeld."
 
 #. TRANS: Error text shown when the command "off" fails for an unknown reason.
-#: lib/command.php:742
 msgid "Can't turn off notification."
 msgstr "Het is niet mogelijk de mededelingen uit te schakelen."
 
 #. TRANS: Text shown when issuing the command "on" successfully.
-#: lib/command.php:765
 msgid "Notification on."
 msgstr "Notificaties ingeschakeld."
 
 #. TRANS: Error text shown when the command "on" fails for an unknown reason.
-#: lib/command.php:768
 msgid "Can't turn on notification."
 msgstr "Het is niet mogelijk de notificatie uit te schakelen."
 
 #. TRANS: Error text shown when issuing the login command while login is disabled.
-#: lib/command.php:782
 msgid "Login command is disabled."
 msgstr "Het aanmeldcommando is uitgeschakeld."
 
 #. TRANS: Text shown after issuing the login command successfully.
 #. TRANS: %s is a logon link..
-#: lib/command.php:795
 #, php-format
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
@@ -8187,20 +6732,17 @@ msgstr ""
 
 #. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:824
 #, php-format
 msgid "Unsubscribed %s."
 msgstr "Het abonnement van %s is opgeheven."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
-#: lib/command.php:842
 msgid "You are not subscribed to anyone."
 msgstr "U bent op geen enkele gebruiker geabonneerd."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
-#: lib/command.php:847
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "U bent geabonneerd op deze gebruiker:"
@@ -8208,14 +6750,12 @@ msgstr[1] "U bent geabonneerd op deze gebruikers:"
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user
 #. TRANS: (followers) without having any subscribers.
-#: lib/command.php:869
 msgid "No one is subscribed to you."
 msgstr "Niemand heeft een abonnenment op u."
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
-#: lib/command.php:874
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Deze gebruiker is op u geabonneerd:"
@@ -8223,21 +6763,18 @@ msgstr[1] "Deze gebruikers zijn op u geabonneerd:"
 
 #. TRANS: Text shown after requesting groups a user is subscribed to without having
 #. TRANS: any group subscriptions.
-#: lib/command.php:896
 msgid "You are not a member of any groups."
 msgstr "U bent lid van geen enkele groep."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
-#: lib/command.php:901
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "U bent lid van deze groep:"
 msgstr[1] "U bent lid van deze groepen:"
 
 #. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-#: lib/command.php:916
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -8320,219 +6857,174 @@ msgstr ""
 "tracking - nog niet beschikbaar\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:36
 msgid "No configuration file found."
 msgstr "Er is geen instellingenbestand aangetroffen."
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:39
 msgid "I looked for configuration files in the following places:"
 msgstr "Er is gezocht naar instellingenbestanden op de volgende plaatsen:"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:42
 msgid "You may wish to run the installer to fix this."
 msgstr ""
 "U kunt proberen de installer uit te voeren om dit probleem op te lossen."
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:46
 msgid "Go to the installer."
 msgstr "Naar het installatieprogramma gaan."
 
-#: lib/dberroraction.php:59
 msgid "Database error"
 msgstr "Databasefout"
 
 #. TRANS: Description of form for deleting a user.
-#: lib/deleteuserform.php:75
 msgid "Delete this user"
 msgstr "Gebruiker verwijderen"
 
-#: lib/designform.php:114
-#, fuzzy
 msgid "Change design"
-msgstr "Ontwerp opslaan"
+msgstr "Ontwerp wijzigen"
 
 #. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: lib/designform.php:131
 msgid "Change colours"
 msgstr "Kleuren wijzigen"
 
 #. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: lib/designform.php:138
 msgid "Use defaults"
 msgstr "Standaardinstellingen gebruiken"
 
 #. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: lib/designform.php:140
 msgid "Restore default designs"
 msgstr "Standaardontwerp toepassen"
 
 #. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: lib/designform.php:148
 msgid "Reset back to default"
 msgstr "Standaardinstellingen toepassen"
 
 #. TRANS: Label in form on profile design page.
 #. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
-#: lib/designform.php:158
 msgid "Upload file"
 msgstr "Bestand uploaden"
 
 #. TRANS: Instructions for form on profile design page.
-#: lib/designform.php:163
-#, fuzzy
 msgid ""
 "You can upload your personal background image. The maximum file size is 2Mb."
 msgstr ""
 "U kunt een persoonlijke achtergrondafbeelding uploaden. De maximale "
-"bestandsgrootte is 2 megabyte."
+"bestandsgroote is 2 megabyte."
 
 #. TRANS: Radio button on profile design page that will enable use of the uploaded profile image.
-#: lib/designform.php:194
 msgctxt "RADIO"
 msgid "On"
 msgstr "Aan"
 
 #. TRANS: Radio button on profile design page that will disable use of the uploaded profile image.
-#: lib/designform.php:211
 msgctxt "RADIO"
 msgid "Off"
 msgstr "Uit"
 
 #. TRANS: Title for button on profile design page to save settings.
-#: lib/designform.php:322
 msgid "Save design"
 msgstr "Ontwerp opslaan"
 
 #. TRANS: Error message displayed if design settings could not be saved.
 #. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
-#: lib/designsettings.php:216 lib/designsettings.php:238
 msgid "Couldn't update your design."
 msgstr "Het was niet mogelijk uw ontwerp bij te werken."
 
 #. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
-#: lib/designsettings.php:244
 msgid "Design defaults restored."
 msgstr "Het standaardontwerp is weer ingesteld."
 
 #. TRANS: Exception. %s is an ID.
-#: lib/discovery.php:153
 #, php-format
 msgid "Unable to find services for %s."
 msgstr "Er zijn geen diensten aantroffen voor %s."
 
 #. TRANS: Form legend for removing the favourite status for a favourite notice.
 #. TRANS: Title for button text for removing the favourite status for a favourite notice.
-#: lib/disfavorform.php:108 lib/disfavorform.php:140
 msgid "Disfavor this notice"
 msgstr "Uit de favorietenlijst verwijderen"
 
 #. TRANS: Button text for removing the favourite status for a favourite notice.
-#: lib/disfavorform.php:136
 msgctxt "BUTTON"
 msgid "Disfavor favorite"
 msgstr "Van favorietenlijst verwijderen"
 
 #. TRANS: Form legend for adding the favourite status to a notice.
 #. TRANS: Title for button text for adding the favourite status to a notice.
-#: lib/favorform.php:108 lib/favorform.php:139
 msgid "Favor this notice"
 msgstr "Op de favorietenlijst plaatsen"
 
 #. TRANS: Button text for adding the favourite status to a notice.
-#: lib/favorform.php:135
 msgctxt "BUTTON"
 msgid "Favor"
 msgstr "Aan favorietenlijst toevoegen"
 
-#: lib/feed.php:84
 msgid "RSS 1.0"
 msgstr "RSS 1.0"
 
-#: lib/feed.php:86
 msgid "RSS 2.0"
 msgstr "RSS 2.0"
 
-#: lib/feed.php:88
 msgid "Atom"
 msgstr "Atom"
 
-#: lib/feed.php:90
 msgid "FOAF"
 msgstr "Vrienden van vrienden (FOAF)"
 
-#: lib/feedimporter.php:75
 msgid "Not an atom feed."
 msgstr "Dit is geen Atomfeed."
 
-#: lib/feedimporter.php:82
 msgid "No author in the feed."
 msgstr "Er staat geen auteur in de feed."
 
-#: lib/feedimporter.php:89
 msgid "Can't import without a user."
 msgstr "Het is niet mogelijk te importeren zonder gebruiker."
 
 #. TRANS: Header for feed links (h2).
-#: lib/feedlist.php:66
 msgid "Feeds"
 msgstr "Feeds"
 
-#: lib/galleryaction.php:128
 msgid "All"
 msgstr "Alle"
 
-#: lib/galleryaction.php:136
 msgid "Select tag to filter"
 msgstr "Selecteer een label om op te filteren"
 
-#: lib/galleryaction.php:137
 msgid "Tag"
 msgstr "Label"
 
-#: lib/galleryaction.php:138
 msgid "Choose a tag to narrow list"
 msgstr "Kies een label om de lijst kleiner te maken"
 
-#: lib/galleryaction.php:140
 msgid "Go"
 msgstr "OK"
 
-#: lib/grantroleform.php:91
 #, php-format
 msgid "Grant this user the \"%s\" role"
 msgstr "Deze gebruiker de rol \"%s\" geven"
 
-#: lib/groupeditform.php:147
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "1-64 kleine letters of cijfers, geen leestekens of spaties."
 
-#: lib/groupeditform.php:156
 msgid "URL of the homepage or blog of the group or topic."
 msgstr "De URL van de thuispagina of de blog van de groep of het onderwerp"
 
-#: lib/groupeditform.php:161
 msgid "Describe the group or topic"
 msgstr "Beschrijf de groep of het onderwerp"
 
-#: lib/groupeditform.php:163
 #, php-format
 msgid "Describe the group or topic in %d character or less"
 msgid_plural "Describe the group or topic in %d characters or less"
 msgstr[0] "Beschrijf de group in %d teken of minder"
 msgstr[1] "Beschrijf de group in %d tekens of minder"
 
-#: lib/groupeditform.php:175
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\"."
 msgstr ""
 "Locatie voor de groep - als relevant. Iets als \"Plaats, regio, land\"."
 
-#: lib/groupeditform.php:183
 #, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -8546,70 +7038,60 @@ msgstr[1] ""
 "aliasen toegestaan."
 
 #. TRANS: Menu item in the group navigation page.
-#: lib/groupnav.php:86
 msgctxt "MENU"
 msgid "Group"
 msgstr "Groep"
 
 #. TRANS: Tooltip for menu item in the group navigation page.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:89
 #, php-format
 msgctxt "TOOLTIP"
 msgid "%s group"
 msgstr "Groep %s"
 
 #. TRANS: Menu item in the group navigation page.
-#: lib/groupnav.php:95
 msgctxt "MENU"
 msgid "Members"
 msgstr "Leden"
 
 #. TRANS: Tooltip for menu item in the group navigation page.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:98
 #, php-format
 msgctxt "TOOLTIP"
 msgid "%s group members"
 msgstr "Leden van de groep %s"
 
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/groupnav.php:108
 msgctxt "MENU"
 msgid "Blocked"
 msgstr "Geblokkeerd"
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:111
 #, php-format
 msgctxt "TOOLTIP"
 msgid "%s blocked users"
 msgstr "Geblokkeerde gebruikers in %s"
 
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "Beheer"
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:120
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Edit %s group properties"
 msgstr "Eigenschappen van de groep %s bewerken"
 
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/groupnav.php:126
 msgctxt "MENU"
 msgid "Logo"
 msgstr "Logo"
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:129
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Add or edit %s logo"
@@ -8617,69 +7099,57 @@ msgstr "Logo voor de groep %s toevoegen of bewerken"
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:138
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Add or edit %s design"
 msgstr "Vormgeving van de groep %s toevoegen of aanpassen"
 
 #. TRANS: Title for groups with the most members section.
-#: lib/groupsbymemberssection.php:71
 msgid "Groups with most members"
 msgstr "Groepen met de meeste leden"
 
 #. TRANS: Title for groups with the most posts section.
-#: lib/groupsbypostssection.php:71
 msgid "Groups with most posts"
 msgstr "Groepen met de meeste berichten"
 
 #. TRANS: Title for group tag cloud section.
 #. TRANS: %s is a group name.
-#: lib/grouptagcloudsection.php:57
 #, php-format
 msgid "Tags in %s group's notices"
 msgstr "Labels in de groepsmededelingen van %s"
 
 #. TRANS: Client exception 406
-#: lib/htmloutputter.php:104
 msgid "This page is not available in a media type you accept"
 msgstr "Deze pagina is niet beschikbaar in een mediatype dat u accepteert"
 
 #. TRANS: Exception thrown when trying to upload an unsupported image file format.
-#: lib/imagefile.php:73
 msgid "Unsupported image file format."
 msgstr "Niet ondersteund beeldbestandsformaat."
 
 #. TRANS: Exception thrown when too large a file is uploaded.
 #. TRANS: %s is the maximum file size, for example "500b", "10kB" or "2MB".
-#: lib/imagefile.php:91
 #, php-format
 msgid "That file is too big. The maximum file size is %s."
 msgstr "Dat bestand is te groot. De maximale bestandsgrootte is %s."
 
 #. TRANS: Exception thrown when uploading an image and that action could not be completed.
-#: lib/imagefile.php:97
 msgid "Partial upload."
 msgstr "Gedeeltelijke upload."
 
 #. TRANS: Exception thrown when uploading a file as image that is not an image or is a corrupt file.
-#: lib/imagefile.php:115
 msgid "Not an image or corrupt file."
 msgstr "Het bestand is geen afbeelding of het bestand is beschadigd."
 
 #. TRANS: Exception thrown during resize when image has been registered as present, but is no longer there.
-#: lib/imagefile.php:178
 msgid "Lost our file."
 msgstr "Het bestand is zoekgeraakt."
 
 #. TRANS: Exception thrown when trying to resize an unknown file type.
 #. TRANS: Exception thrown when trying resize an unknown file type.
-#: lib/imagefile.php:216 lib/imagefile.php:257
 msgid "Unknown file type"
 msgstr "Onbekend bestandstype"
 
 #. TRANS: Number of megabytes. %d is the number.
-#: lib/imagefile.php:303
 #, php-format
 msgid "%dMB"
 msgid_plural "%dMB"
@@ -8687,7 +7157,6 @@ msgstr[0] "%d MB"
 msgstr[1] "%d MB"
 
 #. TRANS: Number of kilobytes. %d is the number.
-#: lib/imagefile.php:307
 #, php-format
 msgid "%dkB"
 msgid_plural "%dkB"
@@ -8695,14 +7164,12 @@ msgstr[0] "%d kB"
 msgstr[1] "%d kB"
 
 #. TRANS: Number of bytes. %d is the number.
-#: lib/imagefile.php:310
 #, php-format
 msgid "%dB"
 msgid_plural "%dB"
 msgstr[0] "%d byte"
 msgstr[1] "%d bytes"
 
-#: lib/implugin.php:262
 #, php-format
 msgid ""
 "User \"%s\" on %s has said that your %s screenname belongs to them. If "
@@ -8711,54 +7178,50 @@ msgid ""
 "user isn't you, or if you didn't request this confirmation, just ignore this "
 "message."
 msgstr ""
+"Gebruiker \"%s\" op de site %s heeft aangegeven dat de schermnaam %s van hem "
+"is. Als dat klopt, dan kunt u dit bevestigen door op deze verwijzing te "
+"klikken: %s. Als u hier niet op kunt klikken, kopieer en plak deze "
+"verwijzing naar in de adresbalk van uw webbrowser. Als u deze gebruiker niet "
+"bent, of u hebt niet om deze bevestiging gevraagd, negeer dit bericht dan."
 
-#: lib/implugin.php:349
 #, php-format
 msgid "Unknown inbox source %d."
 msgstr "Onbekende bron Postvak IN %d."
 
-#: lib/implugin.php:485
-#, fuzzy, php-format
+#, php-format
 msgid "Message too long - maximum is %1$d characters, you sent %2$d."
 msgstr ""
-"Het bericht is te lang. Het mag maximaal %1$d teken bevatten en u hebt er %2"
-"$d gebruikt."
+"Het bericht te is lang. De maximale lengte is %1$d tekens. De lengte van uw "
+"bericht was %2$d."
 
-#: lib/leaveform.php:114
 msgid "Leave"
 msgstr "Verlaten"
 
 #. TRANS: Menu item for logging in to the StatusNet site.
-#: lib/logingroupnav.php:77
 msgctxt "MENU"
 msgid "Login"
 msgstr "Aanmelden"
 
 #. TRANS: Title for menu item for logging in to the StatusNet site.
-#: lib/logingroupnav.php:79
 msgid "Login with a username and password"
 msgstr "Aanmelden met gebruikersnaam en wachtwoord"
 
 #. TRANS: Menu item for registering with the StatusNet site.
-#: lib/logingroupnav.php:85
 msgctxt "MENU"
 msgid "Register"
 msgstr "Registreren"
 
 #. TRANS: Title for menu item for registering with the StatusNet site.
-#: lib/logingroupnav.php:87
 msgid "Sign up for a new account"
 msgstr "Nieuwe gebruiker aanmaken"
 
 #. TRANS: Subject for address confirmation email.
-#: lib/mail.php:172
 msgid "Email address confirmation"
 msgstr "E-mailadresbevestiging"
 
 #. TRANS: Body for address confirmation email.
 #. TRANS: %1$s is the addressed user's nickname, %2$s is the StatusNet sitename,
 #. TRANS: %3$s is the URL to confirm at.
-#: lib/mail.php:177
 #, php-format
 msgid ""
 "Hey, %1$s.\n"
@@ -8790,14 +7253,12 @@ msgstr ""
 
 #. TRANS: Subject of new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
-#: lib/mail.php:243
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1$s volgt nu uw berichten %2$s."
 
 #. TRANS: This is a paragraph in a new-subscriber e-mail.
 #. TRANS: %s is a URL where the subscriber can be reported as abusive.
-#: lib/mail.php:250
 #, php-format
 msgid ""
 "If you believe this account is being used abusively, you can block them from "
@@ -8811,7 +7272,6 @@ msgstr ""
 #. TRANS: %3$s is the subscriber's profile URL, %4$s is the subscriber's location (or empty)
 #. TRANS: %5$s is the subscriber's homepage URL (or empty), %6%s is the subscriber's bio (or empty)
 #. TRANS: %7$s is a link to the addressed user's e-mail settings.
-#: lib/mail.php:260
 #, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -8838,14 +7298,12 @@ msgstr ""
 
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is biographical information.
-#: lib/mail.php:283
 #, php-format
 msgid "Bio: %s"
 msgstr "Beschrijving: %s"
 
 #. TRANS: Subject of notification mail for new posting email address.
 #. TRANS: %s is the StatusNet sitename.
-#: lib/mail.php:312
 #, php-format
 msgid "New email address for posting to %s"
 msgstr "Nieuw e-mailadres om e-mail te versturen aan %s"
@@ -8853,7 +7311,6 @@ msgstr "Nieuw e-mailadres om e-mail te versturen aan %s"
 #. TRANS: Body of notification mail for new posting email address.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is the e-mail address to send
 #. TRANS: to to post by e-mail, %3$s is a URL to more instructions.
-#: lib/mail.php:318
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -8876,26 +7333,22 @@ msgstr ""
 
 #. TRANS: Subject line for SMS-by-email notification messages.
 #. TRANS: %s is the posting user's nickname.
-#: lib/mail.php:439
 #, php-format
 msgid "%s status"
 msgstr "%s status"
 
 #. TRANS: Subject line for SMS-by-email address confirmation message.
-#: lib/mail.php:465
 msgid "SMS confirmation"
 msgstr "SMS-bevestiging"
 
 #. TRANS: Main body heading for SMS-by-email address confirmation message.
 #. TRANS: %s is the addressed user's nickname.
-#: lib/mail.php:469
 #, php-format
 msgid "%s: confirm you own this phone number with this code:"
 msgstr "%s: bevestig dat u deze telefoon bezit met deze code:"
 
 #. TRANS: Subject for 'nudge' notification email.
 #. TRANS: %s is the nudging user.
-#: lib/mail.php:490
 #, php-format
 msgid "You have been nudged by %s"
 msgstr "%s heeft u gepord"
@@ -8903,7 +7356,6 @@ msgstr "%s heeft u gepord"
 #. TRANS: Body for 'nudge' notification email.
 #. TRANS: %1$s is the nuding user's long name, $2$s is the nudging user's nickname,
 #. TRANS: %3$s is a URL to post notices at, %4$s is the StatusNet sitename.
-#: lib/mail.php:497
 #, php-format
 msgid ""
 "%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -8933,7 +7385,6 @@ msgstr ""
 
 #. TRANS: Subject for direct-message notification email.
 #. TRANS: %s is the sending user's nickname.
-#: lib/mail.php:544
 #, php-format
 msgid "New private message from %s"
 msgstr "U hebt een nieuw privébericht van %s."
@@ -8942,7 +7393,6 @@ msgstr "U hebt een nieuw privébericht van %s."
 #. TRANS: %1$s is the sending user's long name, %2$s is the sending user's nickname,
 #. TRANS: %3$s is the message content, %4$s a URL to the message,
 #. TRANS: %5$s is the StatusNet sitename.
-#: lib/mail.php:552
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -8978,7 +7428,6 @@ msgstr ""
 
 #. TRANS: Subject for favorite notification e-mail.
 #. TRANS: %1$s is the adding user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:604
 #, php-format
 msgid "%1$s (@%2$s) added your notice as a favorite"
 msgstr "%1$s (@%2$s) heeft uw mededeling als favoriet toegevoegd"
@@ -8988,7 +7437,6 @@ msgstr "%1$s (@%2$s) heeft uw mededeling als favoriet toegevoegd"
 #. TRANS: %3$s is a URL to the faved notice, %4$s is the faved notice text,
 #. TRANS: %5$s is a URL to all faves of the adding user, %6$s is the StatusNet sitename,
 #. TRANS: %7$s is the adding user's nickname.
-#: lib/mail.php:611
 #, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -9027,7 +7475,6 @@ msgstr ""
 "%6$s\n"
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:669
 #, php-format
 msgid ""
 "The full conversation can be read here:\n"
@@ -9040,7 +7487,6 @@ msgstr ""
 
 #. TRANS: E-mail subject for notice notification.
 #. TRANS: %1$s is the sending user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:677
 #, php-format
 msgid "%1$s (@%2$s) sent a notice to your attention"
 msgstr "%1$s (@%2$s) heeft u een mededeling gestuurd"
@@ -9051,7 +7497,6 @@ msgstr "%1$s (@%2$s) heeft u een mededeling gestuurd"
 #. TRANS: %5$s is a URL to the full conversion if it exists (otherwise empty),
 #. TRANS: %6$s is a URL to reply to the notice, %7$s is a URL to all @-replied for the addressed user,
 #. TRANS: %8$s is a URL to the addressed user's e-mail settings, %9$s is the sender's nickname.
-#: lib/mail.php:685
 #, php-format
 msgid ""
 "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -9101,11 +7546,9 @@ msgstr ""
 "\n"
 "Ps. U kunt de e-mailmeldingen hier uitschakelen: %8$s\n"
 
-#: lib/mailbox.php:87
 msgid "Only the user can read their own mailboxes."
 msgstr "Gebruikers kunnen alleen hun eigen postvakken lezen."
 
-#: lib/mailbox.php:125
 msgid ""
 "You have no private messages. You can send private message to engage other "
 "users in conversation. People can send you messages for your eyes only."
@@ -9113,55 +7556,45 @@ msgstr ""
 "U hebt geen privéberichten. U kunt privéberichten verzenden aan andere "
 "gebruikers. Mensen kunnen u privéberichten sturen die alleen u kunt lezen."
 
-#: lib/mailhandler.php:37
 msgid "Could not parse message."
 msgstr "Het was niet mogelijk het bericht te verwerken."
 
-#: lib/mailhandler.php:42
 msgid "Not a registered user."
 msgstr "Geen geregistreerde gebruiker"
 
-#: lib/mailhandler.php:46
 msgid "Sorry, that is not your incoming email address."
 msgstr "Dit is niet uw inkomende e-mailadres."
 
-#: lib/mailhandler.php:50
 msgid "Sorry, no incoming email allowed."
 msgstr "Inkomende e-mail is niet toegestaan."
 
-#: lib/mailhandler.php:229
 #, php-format
 msgid "Unsupported message type: %s"
 msgstr "Niet ondersteund berichttype: %s"
 
 #. TRANS: Client exception thrown when a database error was thrown during a file upload operation.
-#: lib/mediafile.php:102 lib/mediafile.php:174
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
 "Er is een databasefout opgetreden tijdens het opslaan van uw bestand. "
 "Probeer het alstublieft opnieuw."
 
 #. TRANS: Client exception thrown when a file upload operation would cause a user to exceed a set quota.
-#: lib/mediafile.php:238 lib/mediafile.php:281
 msgid "File exceeds user's quota."
 msgstr "Met dit bestand wordt het quotum van de gebruiker overschreden."
 
 #. TRANS: Client exception thrown when a file upload operation fails because the file could
 #. TRANS: not be moved from the temporary folder to the permanent file location.
-#: lib/mediafile.php:258 lib/mediafile.php:300
 msgid "File could not be moved to destination directory."
 msgstr "Het bestand kon niet verplaatst worden naar de doelmap."
 
 #. TRANS: Client exception thrown when a file upload operation has been stopped because the MIME
 #. TRANS: type of the uploaded file could not be determined.
-#: lib/mediafile.php:265 lib/mediafile.php:306
 msgid "Could not determine file's MIME type."
 msgstr "Het was niet mogelijk het MIME-type van het bestand te bepalen."
 
 #. TRANS: Client exception thrown trying to upload a forbidden MIME type.
 #. TRANS: %1$s is the file type that was denied, %2$s is the application part of
 #. TRANS: the MIME type that was denied.
-#: lib/mediafile.php:396
 #, php-format
 msgid ""
 "\"%1$s\" is not a supported file type on this server. Try using another %2$s "
@@ -9172,81 +7605,72 @@ msgstr ""
 
 #. TRANS: Client exception thrown trying to upload a forbidden MIME type.
 #. TRANS: %s is the file type that was denied.
-#: lib/mediafile.php:401
 #, php-format
 msgid "\"%s\" is not a supported file type on this server."
 msgstr "\"%s\" is geen ondersteund bestandstype op deze server."
 
-#: lib/messageform.php:120
 msgid "Send a direct notice"
 msgstr "Directe mededeling verzenden"
 
 #. TRANS Label entry in drop-down selection box in direct-message inbox/outbox. This is the default entry in the drop-down box, doubling as instructions and a brake against accidental submissions with the first user in the list.
-#: lib/messageform.php:137
 msgid "Select recipient:"
 msgstr "Selecteer ontvanger:"
 
 #. TRANS Entry in drop-down selection box in direct-message inbox/outbox when no one is available to message.
-#: lib/messageform.php:150
 msgid "No mutual subscribers."
 msgstr "Geen wederzijdse abonnees."
 
-#: lib/messageform.php:153
 msgid "To"
 msgstr "Aan"
 
-#: lib/messageform.php:184 lib/noticeform.php:236
 msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr "Verzenden"
 
-#: lib/messagelist.php:77
 msgid "Messages"
 msgstr "Berichten"
 
-#: lib/messagelistitem.php:123 lib/noticelist.php:527
 msgid "from"
 msgstr "van"
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:178
 msgid "Nickname cannot be empty."
 msgstr "Gebruikersnaam kan niet leeg zijn."
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:191
 #, php-format
 msgid "Nickname cannot be more than %d character long."
 msgid_plural "Nickname cannot be more than %d characters long."
 msgstr[0] "De gebruikersnaam mag niet langer zijn dan %d teken."
 msgstr[1] "De gebruikersnaam mag niet langer zijn dan %d tekens."
 
-#: lib/noticeform.php:160
+#. TRANS: Form legend for notice form.
 msgid "Send a notice"
 msgstr "Mededeling verzenden"
 
-#: lib/noticeform.php:174
+#. TRANS: Title for notice label. %s is the user's nickname.
 #, php-format
 msgid "What's up, %s?"
 msgstr "Hallo, %s."
 
-#: lib/noticeform.php:193
+#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr "Toevoegen"
 
-#: lib/noticeform.php:197
-msgid "Attach a file"
+#. TRANS: Title for input field to attach a file to a notice.
+#, fuzzy
+msgid "Attach a file."
 msgstr "Bestand toevoegen"
 
-#: lib/noticeform.php:212
+#. TRANS: Field label to add location to a notice.
 msgid "Share my location"
 msgstr "Mijn locatie bekend maken"
 
-#: lib/noticeform.php:215
+#. TRANS: Text to not share location for a notice in notice form.
 msgid "Do not share my location"
 msgstr "Mijn locatie niet bekend maken"
 
-#: lib/noticeform.php:216
+#. TRANS: Timeout error text for location retrieval in notice form.
 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
 "try again later"
@@ -9255,418 +7679,317 @@ msgstr ""
 "nog eens"
 
 #. TRANS: Used in coordinates as abbreviation of north
-#: lib/noticelist.php:457
 msgid "N"
 msgstr "N"
 
 #. TRANS: Used in coordinates as abbreviation of south
-#: lib/noticelist.php:459
 msgid "S"
 msgstr "Z"
 
 #. TRANS: Used in coordinates as abbreviation of east
-#: lib/noticelist.php:461
 msgid "E"
 msgstr "O"
 
 #. TRANS: Used in coordinates as abbreviation of west
-#: lib/noticelist.php:463
 msgid "W"
 msgstr "W"
 
-#: lib/noticelist.php:465
 #, php-format
 msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 
-#: lib/noticelist.php:474
 msgid "at"
 msgstr "op"
 
-#: lib/noticelist.php:523
 msgid "web"
 msgstr "web"
 
-#: lib/noticelist.php:589
 msgid "in context"
 msgstr "in context"
 
-#: lib/noticelist.php:624
 msgid "Repeated by"
 msgstr "Herhaald door"
 
-#: lib/noticelist.php:651
 msgid "Reply to this notice"
 msgstr "Op deze mededeling antwoorden"
 
-#: lib/noticelist.php:652
 msgid "Reply"
 msgstr "Antwoorden"
 
-#: lib/noticelist.php:678
 msgid "Delete this notice"
 msgstr "Deze mededeling verwijderen"
 
-#: lib/noticelist.php:696
 msgid "Notice repeated"
 msgstr "Mededeling herhaald"
 
-#: lib/nudgeform.php:116
 msgid "Nudge this user"
 msgstr "Deze gebruiker porren"
 
-#: lib/nudgeform.php:128
 msgid "Nudge"
 msgstr "Porren"
 
-#: lib/nudgeform.php:128
 msgid "Send a nudge to this user"
 msgstr "Deze gebruiker porren"
 
-#: lib/oauthstore.php:294
 msgid "Error inserting new profile."
 msgstr "Fout tijdens het invoegen van een nieuw profiel."
 
-#: lib/oauthstore.php:302
 msgid "Error inserting avatar."
 msgstr "Fout bij het invoegen van de avatar."
 
-#: lib/oauthstore.php:322
 msgid "Error inserting remote profile."
 msgstr "Fout bij het invoegen van het profiel van een andere server."
 
 #. TRANS: Exception thrown when a notice is denied because it has been sent before.
-#: lib/oauthstore.php:362
 msgid "Duplicate notice."
 msgstr "Dubbele mededeling."
 
-#: lib/oauthstore.php:507
 msgid "Couldn't insert new subscription."
 msgstr "Kon nieuw abonnement niet toevoegen."
 
-#: lib/personalgroupnav.php:104
-#, fuzzy
 msgid "Replies"
 msgstr "Antwoorden"
 
-#: lib/personalgroupnav.php:109
-#, fuzzy
 msgid "Favorites"
 msgstr "Favorieten"
 
-#: lib/personalgroupnav.php:120
-#, fuzzy
 msgid "Inbox"
 msgstr "Postvak IN"
 
-#: lib/personalgroupnav.php:121
 msgid "Your incoming messages"
 msgstr "Uw inkomende berichten"
 
-#: lib/personalgroupnav.php:125
-#, fuzzy
 msgid "Outbox"
 msgstr "Postvak UIT"
 
-#: lib/personalgroupnav.php:126
 msgid "Your sent messages"
 msgstr "Uw verzonden berichten"
 
 #. TRANS: Title for personal tag cloud section. %s is a user nickname.
-#: lib/personaltagcloudsection.php:56
 #, php-format
 msgid "Tags in %s's notices"
 msgstr "Labels in de mededelingen van %s"
 
 #. TRANS: Displayed as version information for a plugin if no version information was found.
-#: lib/plugin.php:126
 msgid "Unknown"
 msgstr "Onbekend"
 
 #. TRANS: Plugin admin panel controls
-#: lib/plugindisableform.php:90
 msgctxt "plugin"
 msgid "Disable"
-msgstr ""
+msgstr "Uitschakelen"
 
 #. TRANS: Plugin admin panel controls
-#: lib/pluginenableform.php:112
 msgctxt "plugin"
 msgid "Enable"
-msgstr ""
+msgstr "Inschakelen"
 
-#: lib/pluginlist.php:196
 msgctxt "plugin-description"
 msgid "(Plugin descriptions unavailable when disabled.)"
-msgstr ""
+msgstr "Plug-inbeschrijvingen zijn niet beschikbaar als uitgeschakeld."
 
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:88
 msgid "Subscriptions"
 msgstr "Abonnementen"
 
 #. TRANS: Text for user subscription statistics if user has more subscriptions than displayed.
-#: lib/profileaction.php:144
 msgid "All subscriptions"
 msgstr "Alle abonnementen"
 
 #. TRANS: H2 text for user subscriber statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:96
 msgid "Subscribers"
 msgstr "Abonnees"
 
 #. TRANS: Text for user subscription statistics if user has more subscribers than displayed.
-#: lib/profileaction.php:181
 msgid "All subscribers"
 msgstr "Alle abonnees"
 
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:213
 msgid "User ID"
 msgstr "Gebruikers-ID"
 
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:219
 msgid "Member since"
 msgstr "Lid sinds"
 
 #. TRANS: Label for user statistics.
 #. TRANS: H2 text for user group membership statistics.
-#: lib/profileaction.php:239 lib/profileaction.php:290
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:104
 msgid "Groups"
 msgstr "Groepen"
 
 #. TRANS: Label for user statistics.
 #. TRANS: Average count of posts made per day since account registration.
-#: lib/profileaction.php:253
 msgid "Daily average"
 msgstr "Dagelijks gemiddelde"
 
 #. TRANS: Text for user group membership statistics if user has more subscriptions than displayed.
-#: lib/profileaction.php:305
 msgid "All groups"
 msgstr "Alle groepen"
 
 #. TRANS: Server error displayed when using an unimplemented method.
-#: lib/profileformaction.php:123
 msgid "Unimplemented method."
 msgstr "Methode niet geïmplementeerd."
 
-#: lib/publicgroupnav.php:82
 msgid "User groups"
 msgstr "Gebruikersgroepen"
 
-#: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
 msgid "Recent tags"
 msgstr "Recente labels"
 
-#: lib/publicgroupnav.php:88
 msgid "Featured"
 msgstr "Uitgelicht"
 
-#: lib/publicgroupnav.php:92
 msgid "Popular"
 msgstr "Populair"
 
-#: lib/redirectingaction.php:95
 msgid "No return-to arguments."
 msgstr "Er zijn geen \"terug naar\"-parameters opgegeven."
 
-#: lib/repeatform.php:107
 msgid "Repeat this notice?"
 msgstr "Deze mededeling herhalen?"
 
-#: lib/repeatform.php:132
 msgid "Yes"
 msgstr "Ja"
 
-#: lib/repeatform.php:132
 msgid "Repeat this notice"
 msgstr "Deze mededeling herhalen"
 
-#: lib/revokeroleform.php:91
 #, php-format
 msgid "Revoke the \"%s\" role from this user"
 msgstr "De gebruikersrol \"%s\" voor deze gebruiker intrekken"
 
 #. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:1001
 msgid "Page not found."
 msgstr "De pagina is niet aangetroffen."
 
-#: lib/sandboxform.php:67
 msgid "Sandbox"
 msgstr "Zandbak"
 
-#: lib/sandboxform.php:78
 msgid "Sandbox this user"
 msgstr "Deze gebruiker in de zandbak plaatsen"
 
 #. TRANS: Fieldset legend for the search form.
-#: lib/searchaction.php:120
 msgid "Search site"
 msgstr "Site doorzoeken"
 
 #. TRANS: Used as a field label for the field where one or more keywords
 #. TRANS: for searching can be entered.
-#: lib/searchaction.php:128
 msgid "Keyword(s)"
 msgstr "Term(en)"
 
 #. TRANS: Button text for searching site.
-#: lib/searchaction.php:130
 msgctxt "BUTTON"
 msgid "Search"
 msgstr "Zoeken"
 
-#: lib/searchgroupnav.php:80
 msgid "People"
 msgstr "Gebruikers"
 
-#: lib/searchgroupnav.php:81
 msgid "Find people on this site"
 msgstr "Gebruikers op deze site vinden"
 
-#: lib/searchgroupnav.php:83
 msgid "Find content of notices"
 msgstr "Inhoud van mededelingen vinden"
 
-#: lib/searchgroupnav.php:85
 msgid "Find groups on this site"
 msgstr "Groepen op deze site vinden"
 
-#: lib/section.php:89
 msgid "Untitled section"
 msgstr "Naamloze sectie"
 
-#: lib/section.php:106
 msgid "More..."
 msgstr "Meer..."
 
-#: lib/settingsnav.php:78
 msgid "Change your profile settings"
 msgstr "Uw profielgegevens wijzigen"
 
-#: lib/settingsnav.php:83
 msgid "Upload an avatar"
 msgstr "Avatar uploaden"
 
-#: lib/settingsnav.php:88
 msgid "Change your password"
 msgstr "Uw wachtwoord wijzigen"
 
-#: lib/settingsnav.php:93
 msgid "Change email handling"
 msgstr "E-mailafhandeling wijzigen"
 
-#: lib/settingsnav.php:98
 msgid "Design your profile"
 msgstr "Uw profiel ontwerpen"
 
-#: lib/settingsnav.php:102
 msgid "URL"
 msgstr "URL"
 
-#: lib/settingsnav.php:103
 msgid "URL shorteners"
-msgstr ""
+msgstr "URL-verkorters"
 
-#: lib/settingsnav.php:111
 msgid "Updates by instant messenger (IM)"
 msgstr "Updates via instant messenger (IM)"
 
-#: lib/settingsnav.php:118
 msgid "Updates by SMS"
 msgstr "Updates via SMS"
 
-#: lib/settingsnav.php:123
-#, fuzzy
 msgid "Connections"
-msgstr "Koppelingen"
+msgstr "Verbindingen"
 
-#: lib/settingsnav.php:124
 msgid "Authorized connected applications"
 msgstr "Geautoriseerde verbonden applicaties"
 
-#: lib/silenceform.php:67
 msgid "Silence"
 msgstr "Muilkorven"
 
-#: lib/silenceform.php:78
 msgid "Silence this user"
 msgstr "Deze gebruiker muilkorven"
 
-#: lib/subgroupnav.php:89
 #, php-format
 msgid "People %s subscribes to"
 msgstr "Gebruikers waarop %s een abonnement heeft"
 
-#: lib/subgroupnav.php:97
 #, php-format
 msgid "People subscribed to %s"
 msgstr "Gebruikers met een abonnement op %s"
 
-#: lib/subgroupnav.php:105
 #, php-format
 msgid "Groups %s is a member of"
 msgstr "Groepen waar %s lid van is"
 
-#: lib/subgroupnav.php:111
 msgid "Invite"
 msgstr "Uitnodigen"
 
-#: lib/subgroupnav.php:112
 #, php-format
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Vrienden en collega's uitnodigen om u te vergezellen op %s"
 
-#: lib/subscribeform.php:115 lib/subscribeform.php:139
 msgid "Subscribe to this user"
 msgstr "Abonneren op deze gebruiker"
 
-#: lib/subscriberspeopleselftagcloudsection.php:48
-#: lib/subscriptionspeopleselftagcloudsection.php:48
 msgid "People Tagcloud as self-tagged"
 msgstr "Gebruikerslabelwolk als zelf gelabeld"
 
-#: lib/subscriberspeopletagcloudsection.php:48
-#: lib/subscriptionspeopletagcloudsection.php:48
 msgid "People Tagcloud as tagged"
 msgstr "Gebruikerslabelwolk"
 
-#: lib/tagcloudsection.php:56
 msgid "None"
 msgstr "Geen"
 
 #. TRANS: Server exception displayed if a theme name was invalid.
-#: lib/theme.php:74
 msgid "Invalid theme name."
 msgstr "Ongeldige naam voor vormgeving."
 
-#: lib/themeuploader.php:50
 msgid "This server cannot handle theme uploads without ZIP support."
 msgstr ""
 "Deze server kan niet overweg met uploads van vormgevingsbestanden zonder ZIP-"
 "ondersteuning."
 
-#: lib/themeuploader.php:58 lib/themeuploader.php:61
 msgid "The theme file is missing or the upload failed."
 msgstr "Het vormgevingsbestand ontbreekt of is de upload mislukt."
 
-#: lib/themeuploader.php:91 lib/themeuploader.php:102
-#: lib/themeuploader.php:279 lib/themeuploader.php:283
-#: lib/themeuploader.php:291 lib/themeuploader.php:298
 msgid "Failed saving theme."
 msgstr "Het opslaan van de vormgeving is mislukt."
 
-#: lib/themeuploader.php:147
 msgid "Invalid theme: bad directory structure."
 msgstr "Ongeldige vormgeving: de mappenstructuur is onjuist."
 
-#: lib/themeuploader.php:166
 #, php-format
 msgid "Uploaded theme is too large; must be less than %d byte uncompressed."
 msgid_plural ""
@@ -9678,12 +8001,10 @@ msgstr[1] ""
 "De geüploade vormgeving is te groot; deze moet omgecomprimeerd kleiner zijn "
 "dan %d bytes."
 
-#: lib/themeuploader.php:179
 msgid "Invalid theme archive: missing file css/display.css"
 msgstr ""
 "Ongeldig bestand met vormgeving: het bestand css/display.css is niet aanwezig"
 
-#: lib/themeuploader.php:219
 msgid ""
 "Theme contains invalid file or folder name. Stick with ASCII letters, "
 "digits, underscore, and minus sign."
@@ -9691,143 +8012,115 @@ msgstr ""
 "De vormgeving bevat een ongeldige bestandsnaam of mapnaam. Gebruik alleen "
 "maar ASCII-letters, getallen, liggende streepjes en het minteken."
 
-#: lib/themeuploader.php:225
 msgid "Theme contains unsafe file extension names; may be unsafe."
 msgstr "Het uiterlijk bevat onveilige namen voor bestandsextensies."
 
-#: lib/themeuploader.php:242
 #, php-format
 msgid "Theme contains file of type '.%s', which is not allowed."
 msgstr ""
 "De vormgeving bevat een bestand van het type \".%s\". Dit is niet toegestaan."
 
-#: lib/themeuploader.php:260
 msgid "Error opening theme archive."
 msgstr ""
 "Er is een fout opgetreden tijdens het openen van het archiefbestand met de "
 "vormgeving."
 
-#: lib/threadednoticelist.php:270
-#, php-format
-msgid "Show all %d comment"
-msgid_plural "Show all %d comments"
-msgstr[0] ""
-msgstr[1] ""
+#, fuzzy, php-format
+msgid "Show %d reply"
+msgid_plural "Show all %d replies"
+msgstr[0] "Meer weergeven"
+msgstr[1] "Meer weergeven"
 
-#: lib/topposterssection.php:74
 msgid "Top posters"
 msgstr "Meest actieve gebruikers"
 
 #. TRANS: Title for the form to unblock a user.
-#: lib/unblockform.php:67
 msgctxt "TITLE"
 msgid "Unblock"
 msgstr "Deblokkeren"
 
-#: lib/unsandboxform.php:69
 msgid "Unsandbox"
 msgstr "Uit de zandbak halen"
 
-#: lib/unsandboxform.php:80
 msgid "Unsandbox this user"
 msgstr "Deze gebruiker uit de zandbak halen"
 
-#: lib/unsilenceform.php:67
 msgid "Unsilence"
 msgstr "Muilkorf afnemen"
 
-#: lib/unsilenceform.php:78
 msgid "Unsilence this user"
 msgstr "Deze gebruiker de muilkorf afnemen"
 
-#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
 msgid "Unsubscribe from this user"
 msgstr "Uitschrijven van deze gebruiker"
 
-#: lib/unsubscribeform.php:137
 msgid "Unsubscribe"
 msgstr "Abonnement opheffen"
 
 #. 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).
-#: lib/usernoprofileexception.php:60
 #, php-format
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "Gebruiker %1$s (%2$d) heeft geen profielrecord."
 
-#: lib/userprofile.php:116
 msgid "Edit Avatar"
 msgstr "Avatar bewerken"
 
 #. TRANS: H2 for user actions in a profile.
 #. TRANS: H2 for entity actions in a profile.
-#: lib/userprofile.php:216 lib/userprofile.php:232
 msgid "User actions"
 msgstr "Gebruikershandelingen"
 
 #. TRANS: Text shown in user profile of not yet compeltely deleted users.
-#: lib/userprofile.php:220
 msgid "User deletion in progress..."
 msgstr "Bezig met het verwijderen van de gebruiker..."
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:248
 msgid "Edit profile settings"
 msgstr "Profielinstellingen bewerken"
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:250
 msgid "Edit"
 msgstr "Bewerken"
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:274
 msgid "Send a direct message to this user"
 msgstr "Deze gebruiker een direct bericht zenden"
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:276
 msgid "Message"
 msgstr "Bericht"
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:318
 msgid "Moderate"
 msgstr "Modereren"
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:357
 msgid "User role"
 msgstr "Gebruikersrol"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:360
 msgctxt "role"
 msgid "Administrator"
 msgstr "Beheerder"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:362
 msgctxt "role"
 msgid "Moderator"
 msgstr "Moderator"
 
-#: lib/util.php:321
 msgid "Not allowed to log in."
 msgstr "Aanmelden is niet toegestaan."
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1337
 msgid "a few seconds ago"
 msgstr "een paar seconden geleden"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1340
 msgid "about a minute ago"
 msgstr "ongeveer een minuut geleden"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1344
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
@@ -9835,12 +8128,10 @@ msgstr[0] "ongeveer een minuut geleden"
 msgstr[1] "ongeveer %d minuten geleden"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1347
 msgid "about an hour ago"
 msgstr "ongeveer een uur geleden"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1351
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
@@ -9848,12 +8139,10 @@ msgstr[0] "ongeveer een uur geleden"
 msgstr[1] "ongeveer %d uur geleden"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1354
 msgid "about a day ago"
 msgstr "ongeveer een dag geleden"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1358
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
@@ -9861,12 +8150,10 @@ msgstr[0] "ongeveer een dag geleden"
 msgstr[1] "ongeveer %d dagen geleden"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1361
 msgid "about a month ago"
 msgstr "ongeveer een maand geleden"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1365
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
@@ -9874,205 +8161,48 @@ msgstr[0] "ongeveer een maand geleden"
 msgstr[1] "ongeveer %d maanden geleden"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1368
 msgid "about a year ago"
 msgstr "ongeveer een jaar geleden"
 
 #. TRANS: Web color exception thrown when a hexadecimal color code does not validate.
 #. TRANS: %s is the provided (invalid) color code.
-#: lib/webcolor.php:81 lib/webcolor.php:121
 #, php-format
 msgid "%s is not a valid color! Use 3 or 6 hex characters."
 msgstr "%s is geen geldige kleur. Gebruik drie of zes hexadecimale tekens."
 
 #. TRANS: Exception.
-#: lib/xrd.php:63
 msgid "Invalid XML."
 msgstr "Ongeldige XML."
 
 #. TRANS: Exception.
-#: lib/xrd.php:68
 msgid "Invalid XML, missing XRD root."
 msgstr "Ongeldige XML. De XRD-root mist."
 
 #. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
-#: scripts/restoreuser.php:62
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr "De back-up wordt uit het bestand \"%s\" geladen."
 
-#~ msgid "Could not generate feed for group - %s"
-#~ msgstr "Het was niet mogelijk een groepfeed te maken - %s"
+#~ msgid "Full name is too long (max 255 chars)."
+#~ msgstr "De volledige naam is te lang (maximaal 255 tekens)."
 
-#~ msgid "Current confirmed Jabber/Google Talk address."
-#~ msgstr "Huidige bevestigde Jabber- of Google Talk-adres."
+#~ msgid "description is too long (max %d chars)."
+#~ msgstr "de beschrijving is te lang (maximaal %d tekens)"
 
-#~ msgid ""
-#~ "Jabber or Google Talk address, like \"UserName@example.org\". First, make "
-#~ "sure to add %s to your buddy list in your IM client or on Google Talk."
-#~ msgstr ""
-#~ "Jabber-ID of Google Talk-adres, zoals \"gebruiker@example.org\". Zorg "
-#~ "ervoor dat u %s eerst aan uw contactenlijst in uw IM-programma of in "
-#~ "Google Talk toevoegt."
+#~ msgid "Location is too long (max 255 chars)."
+#~ msgstr "De locatie is te lang (maximaal 255 tekens)."
 
-#~ msgid "Send me notices through Jabber/Google Talk."
-#~ msgstr "Mij berichten sturen via Jabber of Google Talk."
+#~ msgid "Too many aliases! Maximum %d."
+#~ msgstr "Te veel aliassen! Het maximale aantal is %d."
 
-#~ msgid "Publish a MicroID for my Jabber/Google Talk address."
-#~ msgstr "Een MicroID voor mijn Jabber- of Google Talk-adres publiceren."
+#~ msgctxt "BUTTON"
+#~ msgid "Comment"
+#~ msgstr "Opmerking"
 
-#~ msgid "No Jabber ID."
-#~ msgstr "Geen Jabber-ID."
+#~ msgid "Add a comment..."
+#~ msgstr "Opmerking toevoegen..."
 
-#~ msgid "Not a valid Jabber ID."
-#~ msgstr "Geen geldige Jabber-ID."
-
-#~ msgid "That is already your Jabber ID."
-#~ msgstr "U hebt dit al ingesteld als uw Jabber-ID."
-
-#~ msgid "That is not your Jabber ID."
-#~ msgstr "Dit is niet uw Jabber-ID."
-
-#~ msgid "Other settings"
-#~ msgstr "Overige instellingen"
-
-#~ msgid "Tag cloud"
-#~ msgstr "Woordwolk"
-
-#~ msgid "Consumer key"
-#~ msgstr "Gebruikerssleutel"
-
-#~ msgid "Consumer secret"
-#~ msgstr "Gebruikersgeheim"
-
-#~ msgid "Request token URL"
-#~ msgstr "URL voor verzoektoken"
-
-#~ msgid "Access token URL"
-#~ msgstr "URL voor toegangstoken"
-
-#~ msgid "Authorize URL"
-#~ msgstr "Autorisatie-URL"
-
-#~ msgid "Jabber"
-#~ msgstr "Jabber"
-
-#~ msgid "Photo"
-#~ msgstr "Foto"
-
-#~ msgid "Other options"
-#~ msgstr "Overige instellingen"
-
-#~ msgid "Other"
-#~ msgstr "Overige"
-
-#~ msgid "Primary site navigation"
-#~ msgstr "Primaire sitenavigatie"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Personal profile and friends timeline"
-#~ msgstr "Persoonlijk profiel en tijdlijn van vrienden"
-
-#~ msgctxt "MENU"
-#~ msgid "Personal"
-#~ msgstr "Persoonlijk"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Change your email, avatar, password, profile"
-#~ msgstr "Uw e-mailadres, avatar, wachtwoord of profiel wijzigen"
-
-#~ msgid "Account"
-#~ msgstr "Gebruiker"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Connect to services"
-#~ msgstr "Met andere diensten koppelen"
-
-#~ msgid "Connect"
-#~ msgstr "Koppelen"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Change site configuration"
-#~ msgstr "Websiteinstellingen wijzigen"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Invite friends and colleagues to join you on %s"
-#~ msgstr "Vrienden en collega's uitnodigen om u te vergezellen op %s"
-
-#~ msgctxt "MENU"
-#~ msgid "Invite"
-#~ msgstr "Uitnodigingen"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Create an account"
-#~ msgstr "Gebruiker aanmaken"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Help me!"
-#~ msgstr "Help me!"
-
-#~ msgctxt "MENU"
-#~ msgid "Help"
-#~ msgstr "Help"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Search for people or text"
-#~ msgstr "Naar gebruikers of tekst zoeken"
-
-#~ msgid "Local views"
-#~ msgstr "Lokale weergaven"
-
-#~ msgid "Page notice"
-#~ msgstr "Mededeling van de pagina"
-
-#~ msgid "Secondary site navigation"
-#~ msgstr "Secundaire sitenavigatie"
-
-#~ msgid "StatusNet software license"
-#~ msgstr "Licentie van de StatusNet-software"
-
-#~ msgid "Site content license"
-#~ msgstr "Licentie voor siteinhoud"
-
-#~ msgid "Pagination"
-#~ msgstr "Paginering"
-
-#~ msgid "Author"
-#~ msgstr "Auteur"
-
-#~ msgid "Provider"
-#~ msgstr "Provider"
-
-#~ msgctxt "MENU"
-#~ msgid "SMS"
-#~ msgstr "SMS"
-
-#~ msgid "Filter tags"
-#~ msgstr "Labels filteren"
-
-#~ msgid "[%s]"
-#~ msgstr "[%s]"
-
-#~ msgid "Available characters"
-#~ msgstr "Beschikbare tekens"
-
-#~ msgctxt "MENU"
-#~ msgid "Profile"
-#~ msgstr "Profiel"
-
-#~ msgid "Search help"
-#~ msgstr "Hulp bij zoeken"
-
-#~ msgid "Unknown user. Go to %s to add your address to your account"
-#~ msgstr ""
-#~ "Onbekende gebruiker. Ga naar %s om uw adres toe te voegen aan uw "
-#~ "gebruiker."
-
-#~ msgid "Message too long. Maximum is %1$d character, you sent %2$d."
-#~ msgid_plural "Message too long. Maximum is %1$d characters, you sent %2$d."
-#~ msgstr[0] ""
-#~ "Het bericht te is lang. De maximale lengte is %1$d tekens. De lengte van "
-#~ "uw bericht was %2$d."
-#~ msgstr[1] ""
-#~ "Het bericht te is lang. De maximale lengte is %1$d tekens. De lengte van "
-#~ "uw bericht was %2$d."
+#~ msgid "Show all %d comment"
+#~ msgid_plural "Show all %d comments"
+#~ msgstr[0] "Opmerking weergeven"
+#~ msgstr[1] "Alle %d opmerkingen weergeven"
diff --git a/locale/nn/LC_MESSAGES/statusnet.po b/locale/nn/LC_MESSAGES/statusnet.po
index 8858866316..7915f43312 100644
--- a/locale/nn/LC_MESSAGES/statusnet.po
+++ b/locale/nn/LC_MESSAGES/statusnet.po
@@ -10,73 +10,63 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:23+0000\n"
-"PO-Revision-Date: 2011-03-03 17:26:18+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:32+0000\n"
 "Language-Team: Norwegian Nynorsk <http://translatewiki.net/wiki/Portal:nn>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nn\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-02-25 23:49:23+0000\n"
+"X-POT-Import-Date: 2011-03-03 17:59:19+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
-#: actions/accessadminpanel.php:53 lib/adminpanelaction.php:363
 #, fuzzy
 msgid "Access"
 msgstr "Godta"
 
 #. TRANS: Page notice.
-#: actions/accessadminpanel.php:64
 #, fuzzy
 msgid "Site access settings"
 msgstr "Avatar-innstillingar"
 
 #. TRANS: Form legend for registration form.
-#: actions/accessadminpanel.php:151
 #, fuzzy
 msgid "Registration"
 msgstr "Registrér"
 
 #. TRANS: Checkbox instructions for admin setting "Private".
-#: actions/accessadminpanel.php:155
 msgid "Prohibit anonymous users (not logged in) from viewing site?"
 msgstr ""
 
 #. TRANS: Checkbox label for prohibiting anonymous users from viewing site.
-#: actions/accessadminpanel.php:157
 #, fuzzy
 msgctxt "LABEL"
 msgid "Private"
 msgstr "Personvern"
 
 #. TRANS: Checkbox instructions for admin setting "Invite only".
-#: actions/accessadminpanel.php:164
 msgid "Make registration invitation only."
 msgstr ""
 
 #. TRANS: Checkbox label for configuring site as invite only.
-#: actions/accessadminpanel.php:166
 #, fuzzy
 msgid "Invite only"
 msgstr "Invitér"
 
 #. TRANS: Checkbox instructions for admin setting "Closed" (no new registrations).
-#: actions/accessadminpanel.php:173
 msgid "Disable new registrations."
 msgstr ""
 
 #. TRANS: Checkbox label for disabling new user registrations.
-#: actions/accessadminpanel.php:175
 #, fuzzy
 msgid "Closed"
 msgstr "Blokkér"
 
 #. TRANS: Title for button to save access settings in site admin panel.
-#: actions/accessadminpanel.php:191
 #, fuzzy
 msgid "Save access settings"
 msgstr "Avatar-innstillingar"
@@ -85,6 +75,7 @@ msgstr "Avatar-innstillingar"
 #. TRANS: Button text for saving theme settings.
 #. TRANS: Button label to save e-mail preferences.
 #. TRANS: Button label to save IM preferences.
+#. TRANS: Button text in the license admin panel.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
 #. TRANS: Button text for saving site notice in admin panel.
@@ -94,13 +85,6 @@ msgstr "Avatar-innstillingar"
 #. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
 #. TRANS: Button text on profile design page to save settings.
-#: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
-#: actions/emailsettings.php:251 actions/imsettings.php:199
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:198
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:204
-#: actions/subscriptions.php:261 actions/urlsettings.php:152
-#: actions/useradminpanel.php:298 lib/applicationeditform.php:355
-#: lib/designform.php:320 lib/groupeditform.php:201
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Save"
@@ -108,8 +92,6 @@ msgstr "Lagra"
 
 #. TRANS: Server error when page not found (404).
 #. TRANS: Server error when page not found (404)
-#: actions/all.php:68 actions/public.php:98 actions/replies.php:93
-#: actions/showfavorites.php:140 actions/tag.php:52
 #, fuzzy
 msgid "No such page."
 msgstr "Dette emneord finst ikkje."
@@ -129,6 +111,7 @@ msgstr "Dette emneord finst ikkje."
 #. TRANS: Client error displayed when checking group membership for a non-existing user.
 #. TRANS: Client error displayed when trying to have a non-existing user join a group.
 #. TRANS: Client error displayed when trying to have a non-existing user leave a group.
+#. TRANS: Client error displayed when not providing a user or an invalid user.
 #. TRANS: Client error displayed when updating a status for a non-existing user.
 #. TRANS: Client error displayed when requesting a list of followers for a non-existing user.
 #. TRANS: Client error displayed when requesting most recent favourite notices by a user for a non-existing user.
@@ -141,6 +124,8 @@ msgstr "Dette emneord finst ikkje."
 #. 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.
 #. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
@@ -148,33 +133,10 @@ msgstr "Dette emneord finst ikkje."
 #. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when calling a profile action without specifying a user.
-#: actions/all.php:80 actions/allrss.php:69
-#: actions/apiaccountupdatedeliverydevice.php:110
-#: actions/apiaccountupdateprofile.php:103
-#: actions/apiaccountupdateprofilebackgroundimage.php:118
-#: actions/apiaccountupdateprofileimage.php:104 actions/apiatomservice.php:59
-#: actions/apiblockcreate.php:96 actions/apiblockdestroy.php:94
-#: actions/apidirectmessage.php:75 actions/apidirectmessagenew.php:72
-#: actions/apigroupcreate.php:111 actions/apigroupismember.php:89
-#: actions/apigroupjoin.php:98 actions/apigroupleave.php:98
-#: actions/apigrouplist.php:70 actions/apigroupprofileupdate.php:108
-#: actions/apistatusesupdate.php:230 actions/apisubscriptions.php:85
-#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:173
-#: actions/apitimelinehome.php:78 actions/apitimelinementions.php:77
-#: actions/apitimelineuser.php:79 actions/avatarbynickname.php:79
-#: actions/favoritesrss.php:72 actions/foaf.php:42 actions/foaf.php:61
-#: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116
-#: actions/otp.php:78 actions/remotesubscribe.php:144
-#: actions/remotesubscribe.php:153 actions/replies.php:73
-#: actions/repliesrss.php:38 actions/rsd.php:113 actions/showfavorites.php:106
-#: actions/userbyid.php:75 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/userxrd.php:59 actions/xrds.php:71 lib/command.php:509
-#: lib/galleryaction.php:59 lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Brukaren finst ikkje."
 
 #. TRANS: Page title. %1$s is user nickname, %2$d is page number
-#: actions/all.php:91
 #, php-format
 msgid "%1$s and friends, page %2$d"
 msgstr "%s med vener"
@@ -183,33 +145,26 @@ msgstr "%s med vener"
 #. TRANS: H1 text for page. %s is a user nickname.
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Timeline title for user and friends. %s is a user nickname.
-#: actions/all.php:94 actions/all.php:191 actions/allrss.php:117
-#: actions/apitimelinefriends.php:207 actions/apitimelinehome.php:113
-#: lib/personalgroupnav.php:100
 #, php-format
 msgid "%s and friends"
 msgstr "%s med vener"
 
 #. TRANS: %s is user nickname.
-#: actions/all.php:108
 #, fuzzy, php-format
 msgid "Feed for friends of %s (RSS 1.0)"
 msgstr "Straum for vener av %s"
 
 #. TRANS: %s is user nickname.
-#: actions/all.php:117
 #, fuzzy, php-format
 msgid "Feed for friends of %s (RSS 2.0)"
 msgstr "Straum for vener av %s"
 
 #. TRANS: %s is user nickname.
-#: actions/all.php:126
 #, fuzzy, php-format
 msgid "Feed for friends of %s (Atom)"
 msgstr "Straum for vener av %s"
 
 #. TRANS: Empty list message. %s is a user nickname.
-#: actions/all.php:139
 #, php-format
 msgid ""
 "This is the timeline for %s and friends but no one has posted anything yet."
@@ -217,7 +172,6 @@ msgstr ""
 
 #. TRANS: Encouragement displayed on logged in user's empty timeline.
 #. TRANS: This message contains Markdown links. Keep "](" together.
-#: actions/all.php:146
 #, php-format
 msgid ""
 "Try subscribing to more people, [join a group](%%action.groups%%) or post "
@@ -226,7 +180,6 @@ msgstr ""
 
 #. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@".
 #. TRANS: This message contains Markdown links. Keep "](" together.
-#: actions/all.php:150
 #, php-format
 msgid ""
 "You can try to [nudge %1$s](../%2$s) from their profile or [post something "
@@ -237,7 +190,6 @@ msgstr ""
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
 #. TRANS: Second sentence of empty message for anonymous users. %s is a user nickname.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:221
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -245,15 +197,12 @@ msgid ""
 msgstr ""
 
 #. TRANS: H1 text for page when viewing a list for self.
-#: actions/all.php:188
 #, fuzzy
 msgid "You and friends"
 msgstr "%s med vener"
 
 #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
 #. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name.
-#: actions/allrss.php:122 actions/apitimelinefriends.php:213
-#: actions/apitimelinehome.php:119
 #, php-format
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr "Oppdateringar frå %1$s og vener på %2$s!"
@@ -272,55 +221,20 @@ msgstr "Oppdateringar frå %1$s og vener på %2$s!"
 #. TRANS: Client error displayed trying to execute an unknown API method checking group membership.
 #. TRANS: Client error displayed trying to execute an unknown API method listing the latest 20 groups.
 #. TRANS: Client error displayed trying to execute an unknown API method showing group membership.
+#. TRANS: Client error displayed when using an unsupported API format.
 #. TRANS: Client error displayed trying to execute an unknown API method showing a group.
 #. TRANS: Client error displayed trying to execute an unknown API method testing API connectivity.
 #. TRANS: Client error displayed trying to execute an unknown API method deleting a status.
 #. TRANS: Client error displayed when trying to handle an unknown API method.
-#: actions/apiaccountratelimitstatus.php:69
-#: actions/apiaccountupdatedeliverydevice.php:92
-#: actions/apiaccountupdateprofile.php:94
-#: actions/apiaccountupdateprofilebackgroundimage.php:92
-#: actions/apiaccountupdateprofilecolors.php:115
-#: actions/apiaccountverifycredentials.php:68 actions/apidirectmessage.php:157
-#: actions/apifavoritecreate.php:98 actions/apifavoritedestroy.php:98
-#: actions/apifriendshipscreate.php:99 actions/apifriendshipsdestroy.php:99
-#: actions/apifriendshipsshow.php:124 actions/apigroupcreate.php:138
-#: actions/apigroupismember.php:115 actions/apigroupjoin.php:151
-#: actions/apigroupleave.php:141 actions/apigrouplist.php:134
-#: actions/apigrouplistall.php:120 actions/apigroupmembership.php:105
-#: actions/apigroupprofileupdate.php:100 actions/apigroupprofileupdate.php:213
-#: actions/apigroupshow.php:114 actions/apihelptest.php:84
-#: actions/apistatusesdestroy.php:101 actions/apistatusesretweets.php:110
-#: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:139
-#: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
-#: actions/apitimelinefavorites.php:182 actions/apitimelinefriends.php:276
-#: actions/apitimelinegroup.php:148 actions/apitimelinehome.php:181
-#: actions/apitimelinementions.php:182 actions/apitimelinepublic.php:247
-#: actions/apitimelineretweetedtome.php:147
-#: actions/apitimelineretweetsofme.php:147 actions/apitimelinetag.php:165
-#: actions/apitimelineuser.php:217 actions/apiusershow.php:100
 msgid "API method not found."
 msgstr "Fann ikkje API-metode."
 
 #. 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.
-#: actions/apiaccountupdatedeliverydevice.php:83
-#: actions/apiaccountupdateprofile.php:85
-#: actions/apiaccountupdateprofilebackgroundimage.php:83
-#: actions/apiaccountupdateprofilecolors.php:106
-#: actions/apiaccountupdateprofileimage.php:80 actions/apiblockcreate.php:87
-#: actions/apiblockdestroy.php:85 actions/apidirectmessagenew.php:107
-#: actions/apifavoritecreate.php:88 actions/apifavoritedestroy.php:88
-#: actions/apifriendshipscreate.php:89 actions/apifriendshipsdestroy.php:89
-#: actions/apigroupcreate.php:102 actions/apigroupjoin.php:89
-#: actions/apigroupleave.php:89 actions/apigroupprofileupdate.php:92
-#: actions/apimediaupload.php:66 actions/apistatusesretweet.php:63
-#: actions/apistatusesupdate.php:194
 msgid "This method requires a POST."
 msgstr "Dette krev ein POST."
 
 #. TRANS: Client error displayed when no valid device parameter is provided for a user's delivery device setting.
-#: actions/apiaccountupdatedeliverydevice.php:103
 msgid ""
 "You must specify a parameter named 'device' with a value of one of: sms, im, "
 "none."
@@ -333,10 +247,6 @@ msgstr ""
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
-#: actions/apiaccountupdatedeliverydevice.php:136
-#: actions/emailsettings.php:353 actions/emailsettings.php:499
-#: actions/profilesettings.php:323 actions/smssettings.php:300
-#: actions/smssettings.php:453 actions/urlsettings.php:211
 msgid "Could not update user."
 msgstr "Kan ikkje oppdatera brukar."
 
@@ -349,32 +259,17 @@ msgstr "Kan ikkje oppdatera brukar."
 #. TRANS: Server error displayed when requesting Friends of a Friend feed for a user for which the profile could not be found.
 #. TRANS: Server error displayed when trying to get a user hCard for a user without a profile.
 #. TRANS: Server error displayed when calling a profile action while the specified user does not have a profile.
-#: actions/apiaccountupdateprofile.php:111
-#: actions/apiaccountupdateprofilebackgroundimage.php:199
-#: actions/apiaccountupdateprofilecolors.php:183
-#: actions/apiaccountupdateprofileimage.php:131
-#: actions/apiuserprofileimage.php:88 actions/apiusershow.php:108
-#: actions/avatarbynickname.php:85 actions/foaf.php:69 actions/hcard.php:75
-#: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
-#: lib/profileaction.php:85
 msgid "User has no profile."
 msgstr "Brukaren har inga profil."
 
 #. TRANS: Server error displayed if a user profile could not be saved.
 #. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:419
 msgid "Could not save profile."
 msgstr "Kan ikkje lagra profil."
 
 #. TRANS: Client error displayed when the number of bytes in a POST request exceeds a limit.
 #. TRANS: %s is the number of bytes of the CONTENT_LENGTH.
 #. TRANS: Form validation error in design settings form. POST should remain untranslated.
-#: actions/apiaccountupdateprofilebackgroundimage.php:108
-#: actions/apiaccountupdateprofileimage.php:95 actions/apimediaupload.php:81
-#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
-#: actions/designadminpanel.php:120 actions/editapplication.php:121
-#: actions/newapplication.php:102 actions/newnotice.php:95
-#: lib/designsettings.php:110
 #, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s byte) due to its "
@@ -390,28 +285,17 @@ msgstr[1] ""
 #. TRANS: Client error displayed when a database error occurs inserting profile colours.
 #. TRANS: Client error displayed when a database error occurs updating profile colours.
 #. TRANS: Form validation error displayed when group design settings could not be saved because of an application issue.
-#: actions/apiaccountupdateprofilebackgroundimage.php:138
-#: actions/apiaccountupdateprofilebackgroundimage.php:149
-#: actions/apiaccountupdateprofilecolors.php:160
-#: actions/apiaccountupdateprofilecolors.php:171
-#: actions/groupdesignsettings.php:285 actions/groupdesignsettings.php:296
-#: actions/userdesignsettings.php:218 actions/userdesignsettings.php:228
-#: actions/userdesignsettings.php:270 actions/userdesignsettings.php:280
 #, fuzzy
 msgid "Unable to save your design settings."
 msgstr "Klarte ikkje å lagra Twitter-innstillingane dine!"
 
 #. TRANS: Error displayed when updating design settings fails.
 #. TRANS: Client error displayed when a database error occurs updating profile colours.
-#: actions/apiaccountupdateprofilebackgroundimage.php:191
-#: actions/apiaccountupdateprofilecolors.php:139
-#: actions/userdesignsettings.php:196
 #, fuzzy
 msgid "Could not update your design."
 msgstr "Kan ikkje oppdatera brukar."
 
 #. TRANS: Title for Atom feed.
-#: actions/apiatomservice.php:85
 msgctxt "ATOM"
 msgid "Main"
 msgstr ""
@@ -420,9 +304,6 @@ msgstr ""
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Title in atom group notice feed. %s is a group name.
 #. TRANS: Title in atom user notice feed. %s is a user name.
-#: actions/apiatomservice.php:93 actions/grouprss.php:138
-#: actions/userrss.php:94 lib/atomgroupnoticefeed.php:63
-#: lib/atomusernoticefeed.php:88
 #, php-format
 msgid "%s timeline"
 msgstr "%s tidsline"
@@ -432,8 +313,6 @@ msgstr "%s tidsline"
 #. TRANS: %s is a user nickname.
 #. TRANS: Header for subscriptions overview for a user (first page).
 #. TRANS: %s is a user nickname.
-#: actions/apiatomservice.php:104 actions/atompubsubscriptionfeed.php:148
-#: actions/subscriptions.php:51
 #, php-format
 msgid "%s subscriptions"
 msgstr "%s tingarar"
@@ -441,59 +320,49 @@ msgstr "%s tingarar"
 #. TRANS: Title for Atom feed with a user's favorite notices. %s is a user nickname.
 #. TRANS: Title for Atom favorites feed.
 #. TRANS: %s is a user nickname.
-#: actions/apiatomservice.php:115 actions/atompubfavoritefeed.php:142
 #, php-format
 msgid "%s favorites"
 msgstr "%s favorittar"
 
 #. TRANS: Title for Atom feed with a user's memberships. %s is a user nickname.
-#: actions/apiatomservice.php:126
 #, fuzzy, php-format
 msgid "%s memberships"
 msgstr "%s medlemmar i gruppa"
 
 #. TRANS: Client error displayed when users try to block themselves.
-#: actions/apiblockcreate.php:105
 #, fuzzy
 msgid "You cannot block yourself!"
 msgstr "Kan ikkje oppdatera brukar."
 
 #. TRANS: Server error displayed when blocking a user has failed.
-#: actions/apiblockcreate.php:127
 msgid "Block user failed."
 msgstr "Blokkering av brukar feila."
 
 #. TRANS: Server error displayed when unblocking a user has failed.
-#: actions/apiblockdestroy.php:113
 msgid "Unblock user failed."
 msgstr "De-blokkering av brukar feila."
 
 #. TRANS: Title. %s is a user nickname.
-#: actions/apidirectmessage.php:88
 #, fuzzy, php-format
 msgid "Direct messages from %s"
 msgstr "Direkte meldingar til %s"
 
 #. TRANS: Subtitle. %s is a user nickname.
-#: actions/apidirectmessage.php:93
 #, php-format
 msgid "All the direct messages sent from %s"
 msgstr "Alle direkte meldingar sendt fra %s"
 
 #. TRANS: Title. %s is a user nickname.
-#: actions/apidirectmessage.php:102
 #, php-format
 msgid "Direct messages to %s"
 msgstr "Direkte meldingar til %s"
 
 #. TRANS: Subtitle. %s is a user nickname.
-#: actions/apidirectmessage.php:107
 #, php-format
 msgid "All the direct messages sent to %s"
 msgstr "Alle direkte meldingar sendt til %s"
 
 #. TRANS: Client error displayed when no message text was submitted (406).
-#: actions/apidirectmessagenew.php:117
 msgid "No message text!"
 msgstr "Inga meldingstekst!"
 
@@ -501,7 +370,6 @@ msgstr "Inga meldingstekst!"
 #. TRANS: %d is the maximum number of characters for a message.
 #. TRANS: Form validation error displayed when message content is too long.
 #. TRANS: %d is the maximum number of characters for a message.
-#: actions/apidirectmessagenew.php:127 actions/newmessage.php:152
 #, fuzzy, php-format
 msgid "That's too long. Maximum message size is %d character."
 msgid_plural "That's too long. Maximum message size is %d characters."
@@ -509,18 +377,15 @@ msgstr[0] "Du kan lasta opp ein logo for gruppa."
 msgstr[1] "Du kan lasta opp ein logo for gruppa."
 
 #. TRANS: Client error displayed if a recipient user could not be found (403).
-#: actions/apidirectmessagenew.php:139
 msgid "Recipient user not found."
 msgstr "Kunne ikkje finne mottakar."
 
 #. TRANS: Client error displayed trying to direct message another user who's not a friend (403).
-#: actions/apidirectmessagenew.php:144
 #, fuzzy
 msgid "Cannot send direct messages to users who aren't your friend."
 msgstr "Kan ikkje senda direktemeldingar til brukarar som du ikkje er ven med."
 
 #. TRANS: Client error displayed trying to direct message self (403).
-#: actions/apidirectmessagenew.php:154
 #, fuzzy
 msgid ""
 "Do not send a message to yourself; just say it to yourself quietly instead."
@@ -531,13 +396,10 @@ 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.
 #. TRANS: Client error displayed trying to delete a status with an invalid ID.
-#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:108
-#: actions/apistatusesdestroy.php:121
 msgid "No status found with that ID."
 msgstr "Fann ingen status med den ID-en."
 
 #. TRANS: Client error displayed when trying to mark a notice favourite that already is a favourite.
-#: actions/apifavoritecreate.php:120
 #, fuzzy
 msgid "This status is already a favorite."
 msgstr "Denne notisen er alt ein favoritt!"
@@ -545,107 +407,90 @@ msgstr "Denne notisen er alt ein favoritt!"
 #. TRANS: Client error displayed when marking a notice as favourite fails.
 #. TRANS: Server error displayed when trying to mark a notice as favorite fails in the database.
 #. TRANS: Error message text shown when a favorite could not be set.
-#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:306
 msgid "Could not create favorite."
 msgstr "Kunne ikkje lagre favoritt."
 
 #. TRANS: Client error displayed when trying to remove a favourite that was not a favourite.
-#: actions/apifavoritedestroy.php:122
 #, fuzzy
 msgid "That status is not a favorite."
 msgstr "Denne notisen er ikkje ein favoritt!"
 
 #. TRANS: Client error displayed when removing a favourite has failed.
 #. TRANS: Server error displayed when removing a favorite from the database fails.
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:90
 msgid "Could not delete favorite."
 msgstr "Kunne ikkje slette favoritt."
 
 #. TRANS: Client error displayed when trying follow who's profile could not be found.
-#: actions/apifriendshipscreate.php:109
 msgid "Could not follow user: profile not found."
 msgstr "Kan ikkje fylgja brukar: %s er allereie på lista di."
 
 #. TRANS: Client error displayed when trying to follow a user that's already being followed.
 #. TRANS: %s is the nickname of the user that is already being followed.
-#: actions/apifriendshipscreate.php:120
 #, php-format
 msgid "Could not follow user: %s is already on your list."
 msgstr "Kan ikkje fylgja brukar: %s er allereie på lista di."
 
 #. TRANS: Client error displayed when trying to unfollow a user that cannot be found.
-#: actions/apifriendshipsdestroy.php:109
 msgid "Could not unfollow user: User not found."
 msgstr "Kan ikkje fylgja brukar: %s er allereie på lista di."
 
 #. TRANS: Client error displayed when trying to unfollow self.
-#: actions/apifriendshipsdestroy.php:121
 #, fuzzy
 msgid "You cannot unfollow yourself."
 msgstr "Kan ikkje oppdatera brukar."
 
 #. TRANS: Client error displayed when supplying invalid parameters to an API call checking if a friendship exists.
-#: actions/apifriendshipsexists.php:88
 #, fuzzy
 msgid "Two valid IDs or nick names must be supplied."
 msgstr "To brukar IDer eller kallenamn er naudsynte."
 
 #. TRANS: Client error displayed when a source user could not be determined showing friendship.
-#: actions/apifriendshipsshow.php:131
 msgid "Could not determine source user."
 msgstr "Kan ikkje oppdatera brukar."
 
 #. TRANS: Client error displayed when a target user could not be determined showing friendship.
-#: actions/apifriendshipsshow.php:140
 msgid "Could not find target user."
 msgstr "Kan ikkje oppdatera brukar."
 
 #. TRANS: Client error trying to create a group with a nickname this is already in use.
+#. TRANS: API validation exception thrown when nickname is already used.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:156 actions/apigroupprofileupdate.php:255
-#: actions/editgroup.php:191 actions/newgroup.php:137
-#: actions/profilesettings.php:274 actions/register.php:199
 msgid "Nickname already in use. Try another one."
 msgstr "Kallenamnet er allereie i bruk. Prøv eit anna."
 
 #. TRANS: Client error in form for group creation.
+#. TRANS: API validation exception thrown when nickname does not validate.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:164 actions/apigroupprofileupdate.php:259
-#: actions/editgroup.php:195 actions/newgroup.php:141
-#: actions/profilesettings.php:244 actions/register.php:201
 msgid "Not a valid nickname."
 msgstr "Ikkje eit gyldig brukarnamn."
 
 #. TRANS: Client error in form for group creation.
+#. TRANS: API validation exception thrown when homepage URL does not validate.
 #. TRANS: Validation error shown when providing an invalid homepage URL in the "Edit application" form.
 #. TRANS: Group edit form validation error.
 #. TRANS: Validation error shown when providing an invalid homepage URL in the "New application" form.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:181 actions/apigroupprofileupdate.php:277
-#: actions/editapplication.php:235 actions/editgroup.php:202
-#: actions/newapplication.php:221 actions/newgroup.php:148
-#: actions/profilesettings.php:249 actions/register.php:208
 msgid "Homepage is not a valid URL."
 msgstr "Heimesida er ikkje ei gyldig internettadresse."
 
 #. TRANS: Client error in form for group creation.
+#. TRANS: API validation exception thrown when full name does not validate.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:191 actions/editgroup.php:206
-#: actions/newgroup.php:152 actions/profilesettings.php:253
-#: actions/register.php:211
 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "Ditt fulle namn er for langt (maksimalt 255 teikn)."
 
 #. TRANS: Client error shown when providing too long a description during group creation.
 #. TRANS: %d is the maximum number of allowed characters.
+#. TRANS: API validation exception thrown when description does not validate.
+#. TRANS: %d is the maximum description length and used for plural.
 #. TRANS: Validation error shown when providing too long a description in the "Edit application" form.
 #. TRANS: %d is the maximum number of allowed characters.
 #. TRANS: Group edit form validation error.
@@ -653,9 +498,6 @@ msgstr "Ditt fulle namn er for langt (maksimalt 255 teikn)."
 #. TRANS: %d is the maximum number of characters for the description.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed characters.
-#: actions/apigroupcreate.php:201 actions/editapplication.php:202
-#: actions/editgroup.php:211 actions/newapplication.php:182
-#: actions/newgroup.php:157
 #, fuzzy, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."
@@ -663,24 +505,22 @@ msgstr[0] "Plassering er for lang (maksimalt 255 teikn)."
 msgstr[1] "Plassering er for lang (maksimalt 255 teikn)."
 
 #. TRANS: Client error shown when providing too long a location during group creation.
+#. TRANS: API validation exception thrown when location does not validate.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:215 actions/editgroup.php:218
-#: actions/newgroup.php:164 actions/profilesettings.php:266
-#: actions/register.php:220
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
 msgstr "Plassering er for lang (maksimalt 255 teikn)."
 
 #. TRANS: Client error shown when providing too many aliases during group creation.
 #. TRANS: %d is the maximum number of allowed aliases.
+#. TRANS: API validation exception thrown when aliases do not validate.
+#. TRANS: %d is the maximum number of aliases and used for plural.
 #. TRANS: Group edit form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.
-#: actions/apigroupcreate.php:236 actions/editgroup.php:231
-#: actions/newgroup.php:177
 #, php-format
 msgid "Too many aliases! Maximum %d allowed."
 msgid_plural "Too many aliases! Maximum %d allowed."
@@ -689,25 +529,24 @@ msgstr[1] ""
 
 #. TRANS: Client error shown when providing an invalid alias during group creation.
 #. TRANS: %s is the invalid alias.
-#: actions/apigroupcreate.php:253
+#. TRANS: API validation exception thrown when aliases does not validate.
+#. TRANS: %s is the invalid alias.
 #, fuzzy, php-format
 msgid "Invalid alias: \"%s\"."
 msgstr "Ugyldig merkelapp: %s"
 
 #. TRANS: Client error displayed when trying to use an alias during group creation that is already in use.
 #. TRANS: %s is the alias that is already in use.
+#. TRANS: API validation exception thrown when aliases is already used.
+#. TRANS: %s is the already used alias.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error. %s is the already used alias.
-#: actions/apigroupcreate.php:264 actions/apigroupprofileupdate.php:351
-#: actions/editgroup.php:246 actions/newgroup.php:193
 #, fuzzy, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "Kallenamnet er allereie i bruk. Prøv eit anna."
 
 #. TRANS: Client error displayed when trying to use an alias during group creation that is the same as the group's nickname.
 #. TRANS: Group edit form validation error.
-#: actions/apigroupcreate.php:278 actions/apigroupprofileupdate.php:359
-#: actions/editgroup.php:253
 msgid "Alias can't be the same as nickname."
 msgstr ""
 
@@ -715,19 +554,15 @@ msgstr ""
 #. TRANS: Client error displayed when trying to join a group that does not exist.
 #. TRANS: Client error displayed when trying to leave a group that does not exist.
 #. TRANS: Client error displayed trying to show group membership on a non-existing group.
+#. TRANS: Client error displayed when not providing a group or an invalid group.
 #. TRANS: Client error displayed when trying to show a group that could not be found.
 #. TRANS: Client error displayed requesting most recent notices to a group for a non-existing group.
-#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
-#: actions/apigroupleave.php:104 actions/apigroupmembership.php:71
-#: actions/apigroupprofileupdate.php:113 actions/apigroupshow.php:81
-#: actions/apitimelinegroup.php:89
 msgid "Group not found."
 msgstr "Finst ikkje."
 
 #. TRANS: Server error displayed when trying to join a group the user is already a member of.
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:345
 #, fuzzy
 msgid "You are already a member of that group."
 msgstr "Du er allereie medlem av den gruppa"
@@ -735,7 +570,6 @@ msgstr "Du er allereie medlem av den gruppa"
 #. TRANS: Server error displayed when trying to join a group the user is blocked from joining.
 #. 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.
-#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:350
 msgid "You have been blocked from that group by the admin."
 msgstr ""
 
@@ -743,13 +577,11 @@ msgstr ""
 #. TRANS: %1$s is the joining user's nickname, $2$s is the group nickname for which the join failed.
 #. TRANS: Message given having failed to add a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:136 actions/joingroup.php:139 lib/command.php:362
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "Kunne ikkje bli med i gruppa."
 
 #. TRANS: Server error displayed when trying to leave a group the user is not a member of.
-#: actions/apigroupleave.php:115
 #, fuzzy
 msgid "You are not a member of this group."
 msgstr "Du er ikkje medlem av den gruppa."
@@ -758,118 +590,80 @@ msgstr "Du er ikkje medlem av den gruppa."
 #. TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
 #. TRANS: Message given having failed to remove a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupleave.php:127 actions/leavegroup.php:133
-#: lib/command.php:410
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
 msgstr "Kunne ikkje laga gruppa."
 
 #. TRANS: Used as title in check for group membership. %s is a user name.
-#: actions/apigrouplist.php:94
 #, fuzzy, php-format
 msgid "%s's groups"
 msgstr "%s grupper"
 
 #. TRANS: Used as subtitle in check for group membership. %1$s is a user name, %2$s is the site name.
-#: actions/apigrouplist.php:104
 #, fuzzy, php-format
 msgid "%1$s groups %2$s is a member of."
 msgstr "Grupper %s er medlem av"
 
 #. TRANS: Message is used as a title when listing the lastest 20 groups. %s is a site name.
 #. TRANS: Message is used as a page title. %s is a nick name.
-#: actions/apigrouplistall.php:88 actions/usergroups.php:63
 #, php-format
 msgid "%s groups"
 msgstr "%s grupper"
 
 #. TRANS: Message is used as a subtitle when listing the lastest 20 groups. %s is a site name.
-#: actions/apigrouplistall.php:93
 #, fuzzy, php-format
 msgid "groups on %s"
 msgstr "Gruppe handlingar"
 
+#. TRANS: Client error displayed when trying to edit a group without being an admin.
 #. TRANS: Client error displayed trying to edit a group while not being a group admin.
 #. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
 #. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
-#: actions/apigroupprofileupdate.php:118 actions/editgroup.php:110
-#: actions/editgroup.php:176 actions/groupdesignsettings.php:109
-#: actions/grouplogo.php:111
 msgid "You must be an admin to edit the group."
 msgstr "Du må være logga inn for å lage ei gruppe."
 
+#. TRANS: Server error displayed when group update fails.
 #. TRANS: Server error displayed when editing a group fails.
-#: actions/apigroupprofileupdate.php:171 actions/editgroup.php:274
 msgid "Could not update group."
 msgstr "Kann ikkje oppdatera gruppa."
 
+#. TRANS: Server error displayed when adding group aliases fails.
 #. TRANS: Server error displayed when group aliases could not be added.
 #. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/apigroupprofileupdate.php:194 actions/editgroup.php:281
-#: classes/User_group.php:540
 #, fuzzy
 msgid "Could not create aliases."
 msgstr "Kunne ikkje lagre favoritt."
 
+#. TRANS: API validation exception thrown when nickname does not validate.
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: actions/apigroupprofileupdate.php:249 lib/nickname.php:165
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr "Kallenamn må berre ha små bokstavar og nummer, ingen mellomrom."
 
-#: actions/apigroupprofileupdate.php:286
-#, fuzzy
-msgid "Full name is too long (max 255 chars)."
-msgstr "Ditt fulle namn er for langt (maksimalt 255 teikn)."
-
-#: actions/apigroupprofileupdate.php:296
-#, fuzzy, php-format
-msgid "description is too long (max %d chars)."
-msgstr "Plassering er for lang (maksimalt 255 teikn)."
-
-#: actions/apigroupprofileupdate.php:307
-#, fuzzy
-msgid "Location is too long (max 255 chars)."
-msgstr "Plassering er for lang (maksimalt 255 teikn)."
-
-#: actions/apigroupprofileupdate.php:326
-#, php-format
-msgid "Too many aliases! Maximum %d."
+#. TRANS: API validation exception thrown when alias is the same as nickname.
+#. TRANS: Group create form validation error.
+msgid "Alias cannot be the same as nickname."
 msgstr ""
 
-#. TRANS: Group edit form validation error.
-#. TRANS: Group create form validation error.
-#. TRANS: %s is the invalid alias.
-#: actions/apigroupprofileupdate.php:342 actions/editgroup.php:241
-#: actions/newgroup.php:188
-#, fuzzy, php-format
-msgid "Invalid alias: \"%s\""
-msgstr "Ugyldig merkelapp: %s"
-
 #. TRANS: Client error displayed when uploading a media file has failed.
-#: actions/apimediaupload.php:101
 #, fuzzy
 msgid "Upload failed."
 msgstr "Last opp fil"
 
 #. TRANS: Client error given from the OAuth API when the request token or verifier is invalid.
-#: actions/apioauthaccesstoken.php:102
 #, fuzzy
 msgid "Invalid request token or verifier."
 msgstr "Ugyldig notisinnhald"
 
 #. TRANS: Client error given when no oauth_token was passed to the OAuth API.
-#: actions/apioauthauthorize.php:107
 msgid "No oauth_token parameter provided."
 msgstr ""
 
 #. TRANS: Client error given when an invalid request token was passed to the OAuth API.
-#: actions/apioauthauthorize.php:115 actions/apioauthauthorize.php:129
 #, fuzzy
 msgid "Invalid request token."
 msgstr "Ugyldig storleik."
 
 #. TRANS: Client error given when an invalid request token was passed to the OAuth API.
-#: actions/apioauthauthorize.php:121
 #, fuzzy
 msgid "Request token already authorized."
 msgstr "Du tingar ikkje oppdateringar til den profilen."
@@ -880,32 +674,15 @@ msgstr "Du tingar ikkje oppdateringar til den profilen."
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
 #. TRANS: Client error displayed when the session token is not okay.
-#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:75
-#: actions/emailsettings.php:292 actions/favor.php:75 actions/geocode.php:55
-#: actions/groupblock.php:65 actions/grouplogo.php:321
-#: actions/groupunblock.php:65 actions/imsettings.php:241
-#: actions/invite.php:60 actions/makeadmin.php:66 actions/newmessage.php:135
-#: actions/newnotice.php:105 actions/nudge.php:80
-#: actions/oauthappssettings.php:162 actions/oauthconnectionssettings.php:135
-#: actions/passwordsettings.php:137 actions/pluginenable.php:87
-#: actions/profilesettings.php:218 actions/recoverpassword.php:383
-#: actions/register.php:157 actions/remotesubscribe.php:76
-#: actions/repeat.php:82 actions/smssettings.php:249 actions/subedit.php:40
-#: actions/subscribe.php:87 actions/tagother.php:145
-#: actions/unsubscribe.php:69 actions/urlsettings.php:171
-#: actions/userauthorization.php:53 lib/designsettings.php:122
 msgid "There was a problem with your session token. Try again, please."
 msgstr "Der var eit problem med sesjonen din. Vennlegst prøv på nytt."
 
 #. TRANS: Form validation error given when an invalid username and/or password was passed to the OAuth API.
-#: actions/apioauthauthorize.php:168
 #, fuzzy
 msgid "Invalid nickname / password!"
 msgstr "Ugyldig brukarnamn eller passord."
 
 #. TRANS: Server error displayed when a database action fails.
-#: actions/apioauthauthorize.php:217
 #, fuzzy
 msgid "Database error inserting oauth_token_association."
 msgstr "databasefeil ved innsetjing av skigardmerkelapp (#merkelapp): %s"
@@ -922,28 +699,19 @@ msgstr "databasefeil ved innsetjing av skigardmerkelapp (#merkelapp): %s"
 #. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
 #. TRANS: Message given submitting a form with an unknown action in SMS settings.
 #. TRANS: Unknown form validation error in design settings form.
-#: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
-#: actions/designadminpanel.php:100 actions/editapplication.php:144
-#: actions/emailsettings.php:311 actions/grouplogo.php:332
-#: actions/imsettings.php:256 actions/newapplication.php:124
-#: actions/oauthconnectionssettings.php:144 actions/recoverpassword.php:46
-#: actions/smssettings.php:270 lib/designsettings.php:133
 msgid "Unexpected form submission."
 msgstr "Uventa skjemasending."
 
 #. TRANS: Title for a page where a user can confirm/deny account access by an external application.
-#: actions/apioauthauthorize.php:387
 msgid "An application would like to connect to your account"
 msgstr ""
 
 #. TRANS: Fieldset legend.
-#: actions/apioauthauthorize.php:404
 msgid "Allow or deny access"
 msgstr ""
 
 #. TRANS: User notification of external application requesting account access.
 #. TRANS: %3$s is the access type requested (read-write or read-only), %4$s is the StatusNet sitename.
-#: actions/apioauthauthorize.php:425
 #, php-format
 msgid ""
 "An application would like the ability to <strong>%3$s</strong> your %4$s "
@@ -954,7 +722,6 @@ msgstr ""
 #. TRANS: User notification of external application requesting account access.
 #. TRANS: %1$s is the application name requesting access, %2$s is the organisation behind the application,
 #. TRANS: %3$s is the access type requested, %4$s is the StatusNet sitename.
-#: actions/apioauthauthorize.php:433
 #, php-format
 msgid ""
 "The application <strong>%1$s</strong> by <strong>%2$s</strong> would like "
@@ -963,23 +730,19 @@ msgid ""
 msgstr ""
 
 #. TRANS: Fieldset legend.
-#: actions/apioauthauthorize.php:455
 #, fuzzy
 msgctxt "LEGEND"
 msgid "Account"
 msgstr "Konto"
 
 #. TRANS: Field label on OAuth API authorisation form.
+#. TRANS: Field label on login page.
 #. TRANS: Field label in form for profile settings.
-#: actions/apioauthauthorize.php:459 actions/login.php:225
-#: actions/profilesettings.php:107 actions/register.php:411
-#: actions/userauthorization.php:145 lib/groupeditform.php:145
 msgid "Nickname"
 msgstr "Kallenamn"
 
 #. TRANS: Field label on OAuth API authorisation form.
-#: actions/apioauthauthorize.php:463 actions/login.php:228
-#: actions/register.php:415 lib/settingsnav.php:87
+#. TRANS: Field label on login page.
 msgid "Password"
 msgstr "Passord"
 
@@ -989,47 +752,38 @@ msgstr "Passord"
 #. TRANS: Button label to cancel an IM address confirmation procedure.
 #. TRANS: Button label to cancel a SMS address confirmation procedure.
 #. TRANS: Button label in the "Edit application" form.
-#: actions/apioauthauthorize.php:478 actions/emailsettings.php:125
-#: actions/imsettings.php:136 actions/smssettings.php:132
-#: lib/applicationeditform.php:351
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Cancel"
 msgstr "Avbryt"
 
 #. TRANS: Button text that when clicked will allow access to an account by an external application.
-#: actions/apioauthauthorize.php:485
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Allow"
 msgstr "Alle"
 
 #. TRANS: Form instructions.
-#: actions/apioauthauthorize.php:502
 msgid "Authorize access to your account information."
 msgstr ""
 
 #. TRANS: Header for user notification after revoking OAuth access to an application.
-#: actions/apioauthauthorize.php:594
 #, fuzzy
 msgid "Authorization canceled."
 msgstr "Ingen stadfestingskode."
 
 #. TRANS: User notification after revoking OAuth access to an application.
 #. TRANS: %s is an OAuth token.
-#: actions/apioauthauthorize.php:598
 #, php-format
 msgid "The request token %s has been revoked."
 msgstr ""
 
 #. TRANS: Title of the page notifying the user that an anonymous client application was successfully authorized to access the user's account with OAuth.
-#: actions/apioauthauthorize.php:621
 #, fuzzy
 msgid "You have successfully authorized the application"
 msgstr "Du tingar ikkje oppdateringar til den profilen."
 
 #. TRANS: Message notifying the user that an anonymous client application was successfully authorized to access the user's account with OAuth.
-#: actions/apioauthauthorize.php:625
 msgid ""
 "Please return to the application and enter the following security code to "
 "complete the process."
@@ -1037,14 +791,12 @@ msgstr ""
 
 #. TRANS: Title of the page notifying the user that the client application was successfully authorized to access the user's account with OAuth.
 #. TRANS: %s is the authorised application name.
-#: actions/apioauthauthorize.php:632
 #, fuzzy, php-format
 msgid "You have successfully authorized %s"
 msgstr "Du tingar ikkje oppdateringar til den profilen."
 
 #. TRANS: Message notifying the user that the client application was successfully authorized to access the user's account with OAuth.
 #. TRANS: %s is the authorised application name.
-#: actions/apioauthauthorize.php:639
 #, php-format
 msgid ""
 "Please return to %s and enter the following security code to complete the "
@@ -1053,12 +805,10 @@ msgstr ""
 
 #. TRANS: Client error displayed trying to delete a status not using POST or DELETE.
 #. TRANS: POST and DELETE should not be translated.
-#: actions/apistatusesdestroy.php:111
 msgid "This method requires a POST or DELETE."
 msgstr "Dette krev anten ein POST eller DELETE."
 
 #. TRANS: Client error displayed trying to delete a status of another user.
-#: actions/apistatusesdestroy.php:136
 msgid "You may not delete another user's status."
 msgstr "Du kan ikkje sletta statusen til ein annan brukar."
 
@@ -1066,22 +816,17 @@ msgstr "Du kan ikkje sletta statusen til ein annan brukar."
 #. TRANS: Client error displayed trying to display redents of a non-exiting notice.
 #. TRANS: Client exception thrown when referencing a non-existing notice.
 #. TRANS: Error message displayed trying to delete a non-existing notice.
-#: actions/apistatusesretweet.php:74 actions/apistatusesretweets.php:70
-#: actions/atompubshowfavorite.php:82 actions/deletenotice.php:61
-#: actions/shownotice.php:92
 msgid "No such notice."
 msgstr "Denne notisen finst ikkje."
 
 #. TRANS: Client error displayed trying to repeat an own notice through the API.
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:549
 #, fuzzy
 msgid "Cannot repeat your own notice."
 msgstr "Kan ikkje slå på notifikasjon."
 
 #. TRANS: Client error displayed trying to re-repeat a notice through the API.
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:92 lib/command.php:555
 msgid "Already repeated that notice."
 msgstr "Kan ikkje sletta notisen."
 
@@ -1091,60 +836,46 @@ msgstr "Kan ikkje sletta notisen."
 #. TRANS: Client exception thrown when using an unsupported HTTP method.
 #. TRANS: Client error shown when using a non-supported HTTP method.
 #. TRANS: Client exception thrown when using an unsupported HTTP method.
-#: actions/apistatusesshow.php:118 actions/atompubfavoritefeed.php:103
-#: actions/atompubmembershipfeed.php:105 actions/atompubshowfavorite.php:117
-#: actions/atompubshowmembership.php:116
-#: actions/atompubshowsubscription.php:122
-#: actions/atompubsubscriptionfeed.php:109
 #, fuzzy
 msgid "HTTP method not supported."
 msgstr "Fann ikkje API-metode."
 
 #. TRANS: Exception thrown requesting an unsupported notice output format.
 #. TRANS: %s is the requested output format.
-#: actions/apistatusesshow.php:144
 #, fuzzy, php-format
 msgid "Unsupported format: %s."
 msgstr "Støttar ikkje bileteformatet."
 
 #. TRANS: Client error displayed requesting a deleted status.
-#: actions/apistatusesshow.php:155
 #, fuzzy
 msgid "Status deleted."
 msgstr "Lasta opp brukarbilete."
 
 #. TRANS: Client error displayed requesting a status with an invalid ID.
-#: actions/apistatusesshow.php:162
 msgid "No status with that ID found."
 msgstr "Fann ingen status med den ID-en."
 
 #. TRANS: Client error displayed when trying to delete a notice not using the Atom format.
-#: actions/apistatusesshow.php:227
 msgid "Can only delete using the Atom format."
 msgstr ""
 
 #. TRANS: Client error displayed when a user has no rights to delete notices of other users.
 #. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
-#: actions/apistatusesshow.php:235 actions/deletenotice.php:78
 #, fuzzy
 msgid "Cannot delete this notice."
 msgstr "Kan ikkje sletta notisen."
 
 #. TRANS: Confirmation of notice deletion in API. %d is the ID (number) of the deleted notice.
-#: actions/apistatusesshow.php:249
 #, fuzzy, php-format
 msgid "Deleted notice %d"
 msgstr "Slett notis"
 
 #. TRANS: Client error displayed when the parameter "status" is missing.
-#: actions/apistatusesupdate.php:221
 msgid "Client must provide a 'status' parameter with a value."
 msgstr ""
 
 #. TRANS: Client error displayed when the parameter "status" is missing.
 #. TRANS: %d is the maximum number of character for a notice.
-#: actions/apistatusesupdate.php:244 actions/newnotice.php:161
-#: lib/mailhandler.php:60
 #, fuzzy, php-format
 msgid "That's too long. Maximum notice size is %d character."
 msgid_plural "That's too long. Maximum notice size is %d characters."
@@ -1152,14 +883,12 @@ msgstr[0] "Du kan lasta opp ein logo for gruppa."
 msgstr[1] "Du kan lasta opp ein logo for gruppa."
 
 #. TRANS: Client error displayed when replying to a non-existing notice.
-#: actions/apistatusesupdate.php:284
 #, fuzzy
 msgid "Parent notice not found."
 msgstr "Fann ikkje API-metode."
 
 #. TRANS: Client error displayed exceeding the maximum notice length.
 #. TRANS: %d is the maximum lenth for a notice.
-#: actions/apistatusesupdate.php:308 actions/newnotice.php:184
 #, php-format
 msgid "Maximum notice size is %d character, including attachment URL."
 msgid_plural "Maximum notice size is %d characters, including attachment URL."
@@ -1168,14 +897,12 @@ msgstr[1] ""
 
 #. TRANS: Client error displayed when requesting profiles of followers in an unsupported format.
 #. TRANS: Client error displayed when requesting IDs of followers in an unsupported format.
-#: actions/apisubscriptions.php:228 actions/apisubscriptions.php:258
 #, fuzzy
 msgid "Unsupported format."
 msgstr "Støttar ikkje bileteformatet."
 
 #. TRANS: Title for timeline of most recent favourite notices by a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname.
-#: actions/apitimelinefavorites.php:108
 #, php-format
 msgid "%1$s / Favorites from %2$s"
 msgstr "%1$s sin status på %2$s"
@@ -1183,14 +910,12 @@ msgstr "%1$s sin status på %2$s"
 #. TRANS: Subtitle for timeline of most recent favourite notices by a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user's full name,
 #. TRANS: %3$s is a user nickname.
-#: actions/apitimelinefavorites.php:120
 #, fuzzy, php-format
 msgid "%1$s updates favorited by %2$s / %3$s."
 msgstr "%1$s oppdateringar som svarar på oppdateringar frå %2$s / %3$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.
-#: actions/apitimelinementions.php:115
 #, php-format
 msgid "%1$s / Updates mentioning %2$s"
 msgstr "%1$s sin status på %2$s"
@@ -1198,49 +923,41 @@ msgstr "%1$s sin status på %2$s"
 #. TRANS: Subtitle for timeline of most recent mentions of a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname,
 #. TRANS: %3$s is a user's full name.
-#: actions/apitimelinementions.php:131
 #, php-format
 msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr "%1$s oppdateringar som svarar på oppdateringar frå %2$s / %3$s."
 
 #. TRANS: Title for site timeline. %s is the StatusNet sitename.
 #. TRANS: Public RSS feed title. %s is the StatusNet site name.
-#: actions/apitimelinepublic.php:193 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "%s offentleg tidsline"
 
 #. TRANS: Subtitle for site timeline. %s is the StatusNet sitename.
-#: actions/apitimelinepublic.php:199
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "%s oppdateringar frå alle saman!"
 
 #. TRANS: Server error displayed calling unimplemented API method for 'retweeted by me'.
-#: actions/apitimelineretweetedbyme.php:71
 #, fuzzy
 msgid "Unimplemented."
 msgstr "Kommando ikkje implementert."
 
 #. TRANS: Title for Atom feed "repeated to me". %s is the user nickname.
-#: actions/apitimelineretweetedtome.php:96
 #, fuzzy, php-format
 msgid "Repeated to %s"
 msgstr "Svar til %s"
 
-#: actions/apitimelineretweetedtome.php:98
 #, fuzzy, php-format
 msgid "%1$s notices that were to repeated to %2$s / %3$s."
 msgstr "%1$s oppdateringar som svarar på oppdateringar frå %2$s / %3$s."
 
 #. TRANS: Title of list of repeated notices of the logged in user.
 #. TRANS: %s is the nickname of the logged in user.
-#: actions/apitimelineretweetsofme.php:98
 #, fuzzy, php-format
 msgid "Repeats of %s"
 msgstr "Svar til %s"
 
-#: actions/apitimelineretweetsofme.php:104
 #, fuzzy, php-format
 msgid "%1$s notices that %2$s / %3$s has repeated."
 msgstr ""
@@ -1250,182 +967,149 @@ msgstr ""
 #. TRANS: %s is the tag.
 #. TRANS: Title for first page of notices with tags.
 #. TRANS: %s is the tag.
-#: actions/apitimelinetag.php:101 actions/tag.php:69
 #, php-format
 msgid "Notices tagged with %s"
 msgstr "Notisar merka med %s"
 
 #. TRANS: Subtitle for timeline with lastest notices with a given tag.
 #. TRANS: %1$s is the tag, $2$s is the StatusNet sitename.
-#: actions/apitimelinetag.php:105 actions/tagrss.php:65
 #, fuzzy, php-format
 msgid "Updates tagged with %1$s on %2$s!"
 msgstr "Oppdateringar frå %1$s på %2$s!"
 
 #. TRANS: Client error displayed trying to add a notice to another user's timeline.
-#: actions/apitimelineuser.php:308
 #, fuzzy
 msgid "Only the user can add to their own timeline."
 msgstr "Kun brukaren kan lese sine eigne meldingar."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:315
 msgid "Only accept AtomPub for Atom feeds."
 msgstr ""
 
 #. TRANS: Client error displayed attempting to post an empty API notice.
-#: actions/apitimelineuser.php:322
 msgid "Atom post must not be empty."
 msgstr ""
 
 #. TRANS: Client error displayed attempting to post an API that is not well-formed XML.
-#: actions/apitimelineuser.php:328
 msgid "Atom post must be well-formed XML."
 msgstr ""
 
 #. TRANS: Client error displayed when not using an Atom entry.
-#: actions/apitimelineuser.php:334 actions/atompubfavoritefeed.php:228
-#: actions/atompubmembershipfeed.php:230
-#: actions/atompubsubscriptionfeed.php:236
 msgid "Atom post must be an Atom entry."
 msgstr ""
 
 #. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
-#: actions/apitimelineuser.php:345
 msgid "Can only handle POST activities."
 msgstr ""
 
 #. TRANS: Client error displayed when using an unsupported activity object type.
 #. TRANS: %s is the unsupported activity object type.
-#: actions/apitimelineuser.php:356
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
 #. TRANS: %d is the notice ID (number).
-#: actions/apitimelineuser.php:390
 #, fuzzy, php-format
 msgid "No content for notice %d."
 msgstr "Søk i innhaldet av notisar"
 
 #. TRANS: Client error displayed when using another format than AtomPub.
 #. TRANS: %s is the notice URI.
-#: actions/apitimelineuser.php:419
 #, fuzzy, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "Fann ingen profil med den IDen."
 
 #. TRANS: Server error for unfinished API method showTrends.
-#: actions/apitrends.php:85
 msgid "API method under construction."
 msgstr "API-metoden er ikkje ferdig enno."
 
 #. TRANS: Client error displayed when requesting user information for a non-existing user.
-#: actions/apiuserprofileimage.php:80 actions/apiusershow.php:94
 msgid "User not found."
 msgstr "Fann ikkje API-metode."
 
 #. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
 #. TRANS: Client exception.
 #. TRANS: Client error displayed trying to subscribe to a non-existing profile.
-#: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
-#: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
-#: actions/subscribe.php:110
 #, fuzzy
 msgid "No such profile."
 msgstr "Denne notisen finst ikkje."
 
 #. TRANS: Subtitle for Atom favorites feed.
 #. TRANS: %1$s is a user nickname, %2$s is the StatusNet sitename.
-#: actions/atompubfavoritefeed.php:147
 #, fuzzy, php-format
 msgid "Notices %1$s has favorited on %2$s"
 msgstr "Oppdateringar frå %1$s og vener på %2$s!"
 
 #. TRANS: Client exception thrown when trying to set a favorite for another user.
 #. TRANS: Client exception thrown when trying to subscribe another user.
-#: actions/atompubfavoritefeed.php:217 actions/atompubsubscriptionfeed.php:225
 #, fuzzy
 msgid "Cannot add someone else's subscription."
 msgstr "Kan ikkje leggja til ny tinging."
 
 #. TRANS: Client exception thrown when trying use an incorrect activity verb for the Atom pub method.
-#: actions/atompubfavoritefeed.php:240
 #, fuzzy
 msgid "Can only handle favorite activities."
 msgstr "Søk i innhaldet av notisar"
 
 #. TRANS: Client exception thrown when trying favorite an object that is not a notice.
-#: actions/atompubfavoritefeed.php:250 actions/atompubmembershipfeed.php:250
 #, fuzzy
 msgid "Can only fave notices."
 msgstr "Søk i innhaldet av notisar"
 
 #. TRANS: Client exception thrown when trying favorite a notice without content.
-#: actions/atompubfavoritefeed.php:259
 #, fuzzy
 msgid "Unknown note."
 msgstr "Uventa handling."
 
 #. TRANS: Client exception thrown when trying favorite an already favorited notice.
-#: actions/atompubfavoritefeed.php:267
 #, fuzzy
 msgid "Already a favorite."
 msgstr "Legg til i favorittar"
 
 #. TRANS: Title for group membership feed.
 #. TRANS: %s is a username.
-#: actions/atompubmembershipfeed.php:144
 #, fuzzy, php-format
 msgid "%s group memberships"
 msgstr "%s medlemmar i gruppa"
 
 #. TRANS: Subtitle for group membership feed.
 #. TRANS: %1$s is a username, %2$s is the StatusNet sitename.
-#: actions/atompubmembershipfeed.php:149
 #, fuzzy, php-format
 msgid "Groups %1$s is a member of on %2$s"
 msgstr "Grupper %s er medlem av"
 
 #. TRANS: Client exception thrown when trying subscribe someone else to a group.
-#: actions/atompubmembershipfeed.php:219
 #, fuzzy
 msgid "Cannot add someone else's membership."
 msgstr "Kan ikkje leggja til ny tinging."
 
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#: actions/atompubmembershipfeed.php:242
 #, fuzzy
 msgid "Can only handle join activities."
 msgstr "Søk i innhaldet av notisar"
 
 #. TRANS: Client exception thrown when trying to subscribe to a non-existing group.
-#: actions/atompubmembershipfeed.php:259
 #, fuzzy
 msgid "Unknown group."
 msgstr "Uventa handling."
 
 #. TRANS: Client exception thrown when trying to subscribe to an already subscribed group.
-#: actions/atompubmembershipfeed.php:267
 #, fuzzy
 msgid "Already a member."
 msgstr "Alle medlemmar"
 
 #. TRANS: Client exception thrown when trying to subscribe to group while blocked from that group.
-#: actions/atompubmembershipfeed.php:275
 msgid "Blocked by admin."
 msgstr ""
 
 #. TRANS: Client exception thrown when referencing a non-existing favorite.
-#: actions/atompubshowfavorite.php:90
 #, fuzzy
 msgid "No such favorite."
 msgstr "Denne notisen finst ikkje."
 
 #. TRANS: Client exception thrown when trying to remove a favorite notice of another user.
-#: actions/atompubshowfavorite.php:151
 #, fuzzy
 msgid "Cannot delete someone else's favorite."
 msgstr "Kunne ikkje slette favoritt."
@@ -1452,93 +1136,68 @@ msgstr "Kunne ikkje slette favoritt."
 #. TRANS: Client error displayed when trying to join a non-existing group.
 #. TRANS: Client error displayed when trying to leave a non-local group.
 #. TRANS: Client error displayed when trying to leave a non-existing group.
+#. TRANS: Client error displayed when providing an invalid group ID on the Make Admin page.
 #. 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.
 #. TRANS: Command exception text shown when a group is requested that does not exist.
 #. TRANS: Error text shown when trying to leave a group that does not exist.
-#: actions/atompubshowmembership.php:81 actions/blockedfromgroup.php:81
-#: actions/blockedfromgroup.php:89 actions/deletegroup.php:87
-#: actions/deletegroup.php:100 actions/editgroup.php:102
-#: actions/foafgroup.php:46 actions/foafgroup.php:65 actions/foafgroup.php:73
-#: actions/groupblock.php:89 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:101 actions/grouplogo.php:103
-#: actions/groupmembers.php:84 actions/groupmembers.php:92
-#: actions/grouprss.php:97 actions/grouprss.php:105
-#: actions/groupunblock.php:89 actions/joingroup.php:82
-#: actions/joingroup.php:95 actions/leavegroup.php:82
-#: actions/leavegroup.php:95 actions/makeadmin.php:86
-#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:392
 msgid "No such group."
 msgstr "Denne gruppa finst ikkje."
 
 #. TRANS: Client exception thrown when trying to show membership of a non-subscribed group
-#: actions/atompubshowmembership.php:91
 #, fuzzy
 msgid "Not a member."
 msgstr "Alle medlemmar"
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
-#: actions/atompubshowmembership.php:150
 #, fuzzy
 msgid "Cannot delete someone else's membership."
 msgstr "Kunne ikkje lagra abonnement."
 
 #. TRANS: Client exception thrown when trying to display a subscription for a non-existing profile ID.
 #. TRANS: %d is the non-existing profile ID number.
-#: actions/atompubshowsubscription.php:72
-#: actions/atompubshowsubscription.php:83
-#: actions/atompubsubscriptionfeed.php:74
 #, fuzzy, php-format
 msgid "No such profile id: %d."
 msgstr "Denne notisen finst ikkje."
 
 #. 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.
-#: actions/atompubshowsubscription.php:94
 #, fuzzy, php-format
 msgid "Profile %1$d not subscribed to profile %2$d."
 msgstr "Du tingar ikkje oppdateringar til den profilen."
 
 #. TRANS: Client exception thrown when trying to delete a subscription of another user.
-#: actions/atompubshowsubscription.php:157
 #, fuzzy
 msgid "Cannot delete someone else's subscription."
 msgstr "Kunne ikkje lagra abonnement."
 
 #. TRANS: Subtitle for Atom subscription feed.
 #. TRANS: %1$s is a user nickname, %s$s is the StatusNet sitename.
-#: actions/atompubsubscriptionfeed.php:153
 #, fuzzy, php-format
 msgid "People %1$s has subscribed to on %2$s"
 msgstr "Mennesker som tingar %s"
 
 #. TRANS: Client error displayed when not using the follow verb.
-#: actions/atompubsubscriptionfeed.php:248
 msgid "Can only handle Follow activities."
 msgstr ""
 
 #. TRANS: Client exception thrown when subscribing to an object that is not a person.
-#: actions/atompubsubscriptionfeed.php:256
 msgid "Can only follow people."
 msgstr ""
 
 #. TRANS: Client exception thrown when subscribing to a non-existing profile.
 #. TRANS: %s is the unknown profile ID.
-#: actions/atompubsubscriptionfeed.php:267
 #, fuzzy, php-format
 msgid "Unknown profile %s."
 msgstr "Ukjend fil type"
 
 #. TRANS: Client error displayed trying to subscribe to an already subscribed profile.
 #. TRANS: %s is the profile the user already has a subscription on.
-#: actions/atompubsubscriptionfeed.php:275
 #, fuzzy, php-format
 msgid "Already subscribed to %s."
 msgstr "Ikkje tinga."
 
 #. TRANS: Client error displayed trying to get a non-existing attachment.
-#: actions/attachment.php:73
 msgid "No such attachment."
 msgstr "Dette emneord finst ikkje."
 
@@ -1550,31 +1209,23 @@ msgstr "Dette emneord finst ikkje."
 #. TRANS: Client error displayed when trying to view group members without providing a group nickname.
 #. TRANS: Client error displayed when requesting a group RSS feed without providing a group nickname.
 #. TRANS: Client error displayed if no nickname argument was given requesting a group page.
-#: actions/avatarbynickname.php:60 actions/blockedfromgroup.php:73
-#: actions/editgroup.php:85 actions/groupdesignsettings.php:84
-#: actions/grouplogo.php:86 actions/groupmembers.php:76
-#: actions/grouprss.php:89 actions/showgroup.php:116
 msgid "No nickname."
 msgstr "Ingen kallenamn."
 
 #. TRANS: Client error displayed trying to get an avatar without providing an avatar size.
-#: actions/avatarbynickname.php:66
 msgid "No size."
 msgstr "Ingen storleik."
 
 #. TRANS: Client error displayed trying to get an avatar providing an invalid avatar size.
-#: actions/avatarbynickname.php:72
 msgid "Invalid size."
 msgstr "Ugyldig storleik."
 
 #. TRANS: Title for avatar upload page.
-#: actions/avatarsettings.php:66 lib/settingsnav.php:82
 msgid "Avatar"
 msgstr "Brukarbilete"
 
 #. TRANS: Instruction for avatar upload page.
 #. TRANS: %s is the maximum file size, for example "500b", "10kB" or "2MB".
-#: actions/avatarsettings.php:78
 #, php-format
 msgid "You can upload your personal avatar. The maximum file size is %s."
 msgstr "Du kan lasta opp ein logo for gruppa."
@@ -1583,17 +1234,12 @@ msgstr "Du kan lasta opp ein logo for gruppa."
 #. TRANS: Server error displayed coming across a request from a user without a profile.
 #. TRANS: Server error displayed when trying to authorise a remote subscription request
 #. TRANS: while the user has no profile.
-#: actions/avatarsettings.php:108 actions/avatarsettings.php:192
-#: actions/grouplogo.php:184 actions/remotesubscribe.php:190
-#: actions/userauthorization.php:75 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr "Brukaren har inga profil."
 
 #. TRANS: Avatar upload page form legend.
 #. TRANS: Avatar upload page crop form legend.
 #. TRANS: Legend for group logo settings fieldset.
-#: actions/avatarsettings.php:122 actions/avatarsettings.php:205
-#: actions/grouplogo.php:261
 msgid "Avatar settings"
 msgstr "Avatar-innstillingar"
 
@@ -1601,8 +1247,6 @@ msgstr "Avatar-innstillingar"
 #. TRANS: Header on avatar upload crop form for thumbnail of originally uploaded avatar (h2).
 #. TRANS: Uploaded original file in group logo form.
 #. TRANS: Header for originally uploaded file before a crop on the group logo page.
-#: actions/avatarsettings.php:131 actions/avatarsettings.php:214
-#: actions/grouplogo.php:207 actions/grouplogo.php:270
 msgid "Original"
 msgstr "Original"
 
@@ -1610,14 +1254,11 @@ msgstr "Original"
 #. TRANS: Header on avatar upload crop form for thumbnail of to be used rendition of uploaded avatar (h2).
 #. TRANS: Header for preview of to be displayed group logo.
 #. TRANS: Header for the cropped group logo on the group logo page.
-#: actions/avatarsettings.php:147 actions/avatarsettings.php:227
-#: actions/grouplogo.php:219 actions/grouplogo.php:283
 msgid "Preview"
 msgstr "Forhandsvis"
 
 #. TRANS: Button on avatar upload page to delete current avatar.
 #. TRANS: Button text for user account deletion.
-#: actions/avatarsettings.php:155 actions/deleteaccount.php:319
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Delete"
@@ -1625,72 +1266,60 @@ msgstr "Slett"
 
 #. TRANS: Button on avatar upload page to upload an avatar.
 #. TRANS: Submit button to confirm upload of a user backup file for account restore.
-#: actions/avatarsettings.php:173 actions/restoreaccount.php:369
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Upload"
 msgstr "Last opp"
 
 #. TRANS: Button on avatar upload crop form to confirm a selected crop as avatar.
-#: actions/avatarsettings.php:243
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Crop"
 msgstr "Skaler"
 
 #. TRANS: Validation error on avatar upload form when no file was uploaded.
-#: actions/avatarsettings.php:318
 #, fuzzy
 msgid "No file uploaded."
 msgstr "Ingen vald profil."
 
 #. TRANS: Avatar upload form instruction after uploading a file.
-#: actions/avatarsettings.php:345
 #, fuzzy
 msgid "Pick a square area of the image to be your avatar."
 msgstr "Velg eit utvalg av bildet som vil blir din avatar."
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
 #. TRANS: Server error displayed trying to crop an uploaded group logo that is no longer present.
-#: actions/avatarsettings.php:360 actions/grouplogo.php:391
 msgid "Lost our file data."
 msgstr "Fant ikkje igjen fil data."
 
 #. TRANS: Success message for having updated a user avatar.
-#: actions/avatarsettings.php:384
 msgid "Avatar updated."
 msgstr "Lasta opp brukarbilete."
 
 #. TRANS: Error displayed on the avatar upload page if the avatar could not be updated for an unknown reason.
-#: actions/avatarsettings.php:388
 msgid "Failed updating avatar."
 msgstr "Feil ved oppdatering av brukarbilete."
 
 #. TRANS: Success message for deleting a user avatar.
-#: actions/avatarsettings.php:412
 #, fuzzy
 msgid "Avatar deleted."
 msgstr "Lasta opp brukarbilete."
 
 #. TRANS: Title for backup account page.
 #. TRANS: Option in profile settings to create a backup of the account of the currently logged in user.
-#: actions/backupaccount.php:61 actions/profilesettings.php:468
 msgid "Backup account"
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to backup an account while not logged in.
-#: actions/backupaccount.php:79
 #, fuzzy
 msgid "Only logged-in users can backup their account."
 msgstr "Kun brukaren kan lese sine eigne meldingar."
 
 #. TRANS: Client exception thrown when trying to backup an account without having backup rights.
-#: actions/backupaccount.php:84
 msgid "You may not backup your account."
 msgstr ""
 
 #. TRANS: Information displayed on the backup account page.
-#: actions/backupaccount.php:227
 msgid ""
 "You can backup your account data in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format. This is an experimental feature and provides "
@@ -1700,30 +1329,25 @@ msgid ""
 msgstr ""
 
 #. TRANS: Submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:250
 msgctxt "BUTTON"
 msgid "Backup"
 msgstr ""
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:254
 msgid "Backup your account."
 msgstr ""
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
-#: actions/block.php:68
 msgid "You already blocked that user."
 msgstr "Du tingar allereie oppdatering frå desse brukarane:"
 
 #. TRANS: Title for block user page.
 #. TRANS: Legend for block user form.
 #. TRANS: Fieldset legend for block user from group form.
-#: actions/block.php:106 actions/block.php:136 actions/groupblock.php:165
 msgid "Block user"
 msgstr "Blokker brukaren"
 
 #. TRANS: Explanation of consequences when blocking a user on the block user page.
-#: actions/block.php:139
 msgid ""
 "Are you sure you want to block this user? Afterwards, they will be "
 "unsubscribed from you, unable to subscribe to you in the future, and you "
@@ -1736,15 +1360,11 @@ msgstr ""
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:154 actions/deleteapplication.php:157
-#: actions/deletegroup.php:220 actions/deletenotice.php:155
-#: actions/deleteuser.php:154 actions/groupblock.php:187
 msgctxt "BUTTON"
 msgid "No"
 msgstr "Merknad"
 
 #. TRANS: Submit button title for 'No' when blocking a user.
-#: actions/block.php:158
 #, fuzzy
 msgid "Do not block this user."
 msgstr "Lås opp brukaren"
@@ -1755,53 +1375,43 @@ msgstr "Lås opp brukaren"
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:161 actions/deleteapplication.php:164
-#: actions/deletegroup.php:227 actions/deletenotice.php:162
-#: actions/deleteuser.php:161 actions/groupblock.php:194
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Yes"
 msgstr "Jau"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:165
 #, fuzzy
 msgid "Block this user."
 msgstr "Blokkér denne brukaren"
 
 #. TRANS: Server error displayed when blocking a user fails.
-#: actions/block.php:189
 msgid "Failed to save block information."
 msgstr "Lagring av informasjon feila."
 
 #. TRANS: Title for first page with list of users blocked from a group.
 #. TRANS: %s is a group nickname.
-#: actions/blockedfromgroup.php:101
 #, fuzzy, php-format
 msgid "%s blocked profiles"
 msgstr "Brukarprofil"
 
 #. TRANS: Title for any but the first page with list of users blocked from a group.
 #. TRANS: %1$s is a group nickname, %2$d is a page number.
-#: actions/blockedfromgroup.php:106
 #, fuzzy, php-format
 msgid "%1$s blocked profiles, page %2$d"
 msgstr "%s med vener, side %d"
 
 #. TRANS: Instructions for list of users blocked from a group.
-#: actions/blockedfromgroup.php:122
 #, fuzzy
 msgid "A list of the users blocked from joining this group."
 msgstr "Ei liste over brukarane i denne gruppa."
 
 #. TRANS: Form legend for unblocking a user from a group.
-#: actions/blockedfromgroup.php:291
 #, fuzzy
 msgid "Unblock user from group"
 msgstr "De-blokkering av brukar feila."
 
 #. TRANS: Button text for unblocking a user from a group.
-#: actions/blockedfromgroup.php:323
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Unblock"
@@ -1809,131 +1419,105 @@ msgstr "Lås opp"
 
 #. TRANS: Tooltip for button for unblocking a user from a group.
 #. TRANS: Description of the form to unblock a user.
-#: actions/blockedfromgroup.php:327 lib/unblockform.php:78
 msgid "Unblock this user"
 msgstr "Lås opp brukaren"
 
 #. TRANS: Title for mini-posting window loaded from bookmarklet.
 #. TRANS: %s is the StatusNet site name.
-#: actions/bookmarklet.php:51
 #, php-format
 msgid "Post to %s"
 msgstr "Svar til %s"
 
 #. TRANS: Client error displayed when not providing a confirmation code in the contact address confirmation action.
-#: actions/confirmaddress.php:74
 msgid "No confirmation code."
 msgstr "Ingen stadfestingskode."
 
 #. TRANS: Client error displayed when providing a non-existing confirmation code in the contact address confirmation action.
-#: actions/confirmaddress.php:80
 msgid "Confirmation code not found."
 msgstr "Fann ikkje stadfestingskode."
 
 #. TRANS: Client error displayed when not providing a confirmation code for another user in the contact address confirmation action.
-#: actions/confirmaddress.php:86
 msgid "That confirmation code is not for you!"
 msgstr "Den godkjenningskoden er ikkje for deg!"
 
 #. TRANS: Server error for an unknown address type, which can be 'email', 'sms', or the name of an IM network (such as 'xmpp' or 'aim')
-#: actions/confirmaddress.php:94
-#, fuzzy, php-format
+#, php-format
 msgid "Unrecognized address type %s"
 msgstr "Ukjend adressetype %s"
 
 #. TRANS: Client error for an already confirmed email/jabber/sms address.
-#: actions/confirmaddress.php:103 actions/confirmaddress.php:136
 msgid "That address has already been confirmed."
 msgstr "Den addressa har alt blitt bekrefta."
 
-#: actions/confirmaddress.php:121 actions/imsettings.php:444
-#: actions/userdesignsettings.php:306
-#, fuzzy
 msgid "Couldn't update user."
 msgstr "Kan ikkje oppdatera brukar."
 
-#: actions/confirmaddress.php:144
 #, fuzzy
 msgid "Couldn't update user im preferences."
 msgstr "Kan ikkje oppdatera brukarinformajon."
 
-#: actions/confirmaddress.php:156
 #, fuzzy
 msgid "Couldn't insert user im preferences."
 msgstr "Kan ikkje leggja til ny tinging."
 
 #. TRANS: Server error displayed when an address confirmation code deletion from the
 #. TRANS: database fails in the contact address confirmation action.
-#: actions/confirmaddress.php:169
 #, fuzzy
 msgid "Could not delete address confirmation."
 msgstr "Kan ikkje sletta e-postgodkjenning."
 
 #. TRANS: Title for the contact address confirmation action.
-#: actions/confirmaddress.php:185
 msgid "Confirm address"
 msgstr "Godkjent epostadresse."
 
 #. TRANS: Success message for the contact address confirmation action.
 #. TRANS: %s can be 'email', 'jabber', or 'sms'.
-#: actions/confirmaddress.php:200
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "Addressa \"%s\" har blitt bekrefta for din konto."
 
 #. TRANS: Title for page with a conversion (multiple notices in context).
-#: actions/conversation.php:96
 #, fuzzy
 msgid "Conversation"
 msgstr "Stadfestingskode"
 
 #. TRANS: Header on conversation page. Hidden by default (h2).
 #. TRANS: Label for user statistics.
-#: actions/conversation.php:149 lib/noticelist.php:87
-#: lib/profileaction.php:246 lib/searchgroupnav.php:82
-#: lib/threadednoticelist.php:66
 msgid "Notices"
 msgstr "Notisar"
 
 #. TRANS: Client exception displayed trying to delete a user account while not logged in.
-#: actions/deleteaccount.php:71
 #, fuzzy
 msgid "Only logged-in users can delete their account."
 msgstr "Kun brukaren kan lese sine eigne meldingar."
 
 #. TRANS: Client exception displayed trying to delete a user account without have the rights to do that.
-#: actions/deleteaccount.php:77
 #, fuzzy
 msgid "You cannot delete your account."
 msgstr "Kan ikkje oppdatera brukar."
 
 #. TRANS: Confirmation text for user deletion. The user has to type this exactly the same, including punctuation.
-#: actions/deleteaccount.php:160 actions/deleteaccount.php:297
 msgid "I am sure."
 msgstr ""
 
 #. TRANS: Notification for user about the text that must be input to be able to delete a user account.
 #. TRANS: %s is the text that needs to be input.
-#: actions/deleteaccount.php:164
 #, php-format
 msgid "You must write \"%s\" exactly in the box."
 msgstr ""
 
 #. TRANS: Confirmation that a user account has been deleted.
-#: actions/deleteaccount.php:206
 #, fuzzy
 msgid "Account deleted."
 msgstr "Lasta opp brukarbilete."
 
 #. TRANS: Page title for page on which a user account can be deleted.
 #. TRANS: Option in profile settings to delete the account of the currently logged in user.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:476
 #, fuzzy
 msgid "Delete account"
 msgstr "Opprett ei ny gruppe"
 
 #. TRANS: Form text for user deletion form.
-#: actions/deleteaccount.php:279
 msgid ""
 "This will <strong>permanently delete</strong> your account data from this "
 "server."
@@ -1941,7 +1525,6 @@ msgstr ""
 
 #. TRANS: Additional form text for user deletion form shown if a user has account backup rights.
 #. TRANS: %s is a URL to the backup page.
-#: actions/deleteaccount.php:285
 #, php-format
 msgid ""
 "You are strongly advised to <a href=\"%s\">back up your data</a> before "
@@ -1950,58 +1533,45 @@ msgstr ""
 
 #. TRANS: Field label for delete account confirmation entry.
 #. TRANS: Field label for password reset form where the password has to be typed again.
-#: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:262 actions/register.php:419
 msgid "Confirm"
 msgstr "Godta"
 
 #. TRANS: Input title for the delete account field.
 #. TRANS: %s is the text that needs to be input.
-#: actions/deleteaccount.php:304
 #, fuzzy, php-format
 msgid "Enter \"%s\" to confirm that you want to delete your account."
 msgstr "Kan ikkje oppdatera brukar."
 
 #. TRANS: Button title for user account deletion.
-#: actions/deleteaccount.php:323
 #, fuzzy
 msgid "Permanently delete your account"
 msgstr "Kan ikkje oppdatera brukar."
 
 #. TRANS: Client error displayed trying to delete an application while not logged in.
-#: actions/deleteapplication.php:62
 msgid "You must be logged in to delete an application."
 msgstr "Du må være innlogga for å melde deg ut av ei gruppe."
 
 #. TRANS: Client error displayed trying to delete an application that does not exist.
-#: actions/deleteapplication.php:71
 msgid "Application not found."
 msgstr "Fann ikkje stadfestingskode."
 
 #. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
-#: actions/deleteapplication.php:79 actions/editapplication.php:78
-#: actions/showapplication.php:90
 #, fuzzy
 msgid "You are not the owner of this application."
 msgstr "Du er ikkje medlem av den gruppa."
 
 #. TRANS: Client error text when there is a problem with the session token.
-#: actions/deleteapplication.php:102 actions/editapplication.php:131
-#: actions/newapplication.php:112 actions/showapplication.php:113
-#: lib/action.php:1391
 msgid "There was a problem with your session token."
 msgstr "Det var eit problem med sesjons billetten din."
 
 #. TRANS: Title for delete application page.
 #. TRANS: Fieldset legend on delete application page.
-#: actions/deleteapplication.php:124 actions/deleteapplication.php:149
 #, fuzzy
 msgid "Delete application"
 msgstr "Denne notisen finst ikkje."
 
 #. TRANS: Confirmation text on delete application page.
-#: actions/deleteapplication.php:152
 msgid ""
 "Are you sure you want to delete this application? This will clear all data "
 "about the application from the database, including all existing user "
@@ -2009,19 +1579,16 @@ msgid ""
 msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting an application.
-#: actions/deleteapplication.php:161
 #, fuzzy
 msgid "Do not delete this application."
 msgstr "Kan ikkje sletta notisen."
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
-#: actions/deleteapplication.php:167
 #, fuzzy
 msgid "Delete this application."
 msgstr "Slett denne notisen"
 
 #. TRANS: Client error when trying to delete group while not logged in.
-#: actions/deletegroup.php:64
 #, fuzzy
 msgid "You must be logged in to delete a group."
 msgstr "Du må være innlogga for å melde deg ut av ei gruppe."
@@ -2029,41 +1596,34 @@ msgstr "Du må være innlogga for å melde deg ut av ei gruppe."
 #. TRANS: Client error when trying to delete a group without providing a nickname or ID for the group.
 #. TRANS: Client error displayed when trying to join a group without providing a group name or group ID.
 #. TRANS: Client error displayed when trying to leave a group without providing a group name or group ID.
-#: actions/deletegroup.php:94 actions/joingroup.php:89
-#: actions/leavegroup.php:89
 #, fuzzy
 msgid "No nickname or ID."
 msgstr "Ingen kallenamn."
 
 #. TRANS: Client error when trying to delete a group without having the rights to delete it.
-#: actions/deletegroup.php:107
 #, fuzzy
 msgid "You are not allowed to delete this group."
 msgstr "Du er ikkje medlem av den gruppa."
 
 #. TRANS: Server error displayed if a group could not be deleted.
 #. TRANS: %s is the name of the group that could not be deleted.
-#: actions/deletegroup.php:150
 #, fuzzy, php-format
 msgid "Could not delete group %s."
 msgstr "Kann ikkje oppdatera gruppa."
 
 #. TRANS: Message given after deleting a group.
 #. TRANS: %s is the deleted group's name.
-#: actions/deletegroup.php:159
 #, fuzzy, php-format
 msgid "Deleted group %s"
 msgstr "%1$s sin status på %2$s"
 
 #. TRANS: Title of delete group page.
 #. TRANS: Form legend for deleting a group.
-#: actions/deletegroup.php:176 actions/deletegroup.php:202
 #, fuzzy
 msgid "Delete group"
 msgstr "Slett"
 
 #. TRANS: Warning in form for deleleting a group.
-#: actions/deletegroup.php:206
 msgid ""
 "Are you sure you want to delete this group? This will clear all data about "
 "the group from the database, without a backup. Public posts to this group "
@@ -2071,13 +1631,11 @@ msgid ""
 msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting a group.
-#: actions/deletegroup.php:224
 #, fuzzy
 msgid "Do not delete this group."
 msgstr "Ikkje slett denne gruppa"
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
-#: actions/deletegroup.php:231
 #, fuzzy
 msgid "Delete this group."
 msgstr "Slett denne gruppa"
@@ -2088,22 +1646,18 @@ msgstr "Slett denne gruppa"
 #. TRANS: Client error displayed trying to block a user from a group while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying to log out when not logged in.
+#. TRANS: Client error displayed when trying to access the "make admin" page while not logged in.
+#. TRANS: Client error displayed trying to create a new direct message while not logged in.
+#. TRANS: Client error displayed trying to send a notice while not logged in.
+#. TRANS: Client error displayed trying to nudge a user without being logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
 #. TRANS: Client error displayed when trying to change user options while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
-#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:70
-#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
-#: actions/nudge.php:63 actions/pluginenable.php:97 actions/subedit.php:33
-#: actions/subscribe.php:98 actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:71 lib/profileformaction.php:63
-#: lib/settingsaction.php:72
 msgid "Not logged in."
 msgstr "Ikkje logga inn"
 
 #. TRANS: Instructions for deleting a notice.
-#: actions/deletenotice.php:110
 #, fuzzy
 msgid ""
 "You are about to permanently delete a notice. Once this is done, it cannot "
@@ -2114,159 +1668,131 @@ msgstr ""
 
 #. TRANS: Page title when deleting a notice.
 #. TRANS: Fieldset legend for the delete notice form.
-#: actions/deletenotice.php:117 actions/deletenotice.php:148
 msgid "Delete notice"
 msgstr "Slett notis"
 
 #. TRANS: Message for the delete notice form.
-#: actions/deletenotice.php:152
 msgid "Are you sure you want to delete this notice?"
 msgstr "Sikker på at du vil sletta notisen?"
 
 #. TRANS: Submit button title for 'No' when deleting a notice.
-#: actions/deletenotice.php:159
 #, fuzzy
 msgid "Do not delete this notice."
 msgstr "Kan ikkje sletta notisen."
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:166
 #, fuzzy
 msgid "Delete this notice."
 msgstr "Slett denne notisen"
 
 #. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
-#: actions/deleteuser.php:66
 #, fuzzy
 msgid "You cannot delete users."
 msgstr "Kan ikkje oppdatera brukar."
 
 #. TRANS: Client error displayed when trying to delete a non-local user.
-#: actions/deleteuser.php:74
 #, fuzzy
 msgid "You can only delete local users."
 msgstr "Du kan ikkje sletta statusen til ein annan brukar."
 
 #. TRANS: Title of delete user page.
-#: actions/deleteuser.php:110
 #, fuzzy
 msgctxt "TITLE"
 msgid "Delete user"
 msgstr "Slett"
 
 #. TRANS: Fieldset legend on delete user page.
-#: actions/deleteuser.php:134
 #, fuzzy
 msgid "Delete user"
 msgstr "Slett"
 
 #. TRANS: Information text to request if a user is certain that the described action has to be performed.
-#: actions/deleteuser.php:138
 msgid ""
 "Are you sure you want to delete this user? This will clear all data about "
 "the user from the database, without a backup."
 msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/deleteuser.php:158
 #, fuzzy
 msgid "Do not delete this user."
 msgstr "Ikkje slett denne gruppa"
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
-#: actions/deleteuser.php:165
 #, fuzzy
 msgid "Delete this user."
 msgstr "Slett denne notisen"
 
 #. TRANS: Message used as title for design settings for the site.
-#: actions/designadminpanel.php:60 lib/settingsnav.php:97
 msgid "Design"
 msgstr ""
 
 #. TRANS: Instructions for design adminsitration panel.
-#: actions/designadminpanel.php:71
 msgid "Design settings for this StatusNet site"
 msgstr ""
 
 #. TRANS: Client error displayed when a logo URL does is not valid.
-#: actions/designadminpanel.php:327
 #, fuzzy
 msgid "Invalid logo URL."
 msgstr "Ugyldig storleik."
 
 #. TRANS: Client error displayed when an SSL logo URL is invalid.
-#: actions/designadminpanel.php:333
 #, fuzzy
 msgid "Invalid SSL logo URL."
 msgstr "Ugyldig storleik."
 
 #. TRANS: Client error displayed when a theme is submitted through the form that is not in the theme list.
 #. TRANS: %s is the chosen unavailable theme.
-#: actions/designadminpanel.php:339
 #, fuzzy, php-format
 msgid "Theme not available: %s."
 msgstr "Denne sida er ikkje tilgjengleg i eit"
 
 #. TRANS: Fieldset legend for form to change logo.
-#: actions/designadminpanel.php:437
 msgid "Change logo"
 msgstr "Endra"
 
 #. TRANS: Field label for StatusNet site logo.
-#: actions/designadminpanel.php:444
 msgid "Site logo"
 msgstr "Statusmelding"
 
 #. TRANS: Field label for SSL StatusNet site logo.
-#: actions/designadminpanel.php:452
 msgid "SSL logo"
 msgstr "SSL-logo"
 
 #. TRANS: Fieldset legend for form change StatusNet site's theme.
-#: actions/designadminpanel.php:467
 #, fuzzy
 msgid "Change theme"
 msgstr "Endra"
 
 #. TRANS: Field label for dropdown to choose site theme.
-#: actions/designadminpanel.php:485
 #, fuzzy
 msgid "Site theme"
 msgstr "Statusmelding"
 
 #. TRANS: Title for field label for dropdown to choose site theme.
-#: actions/designadminpanel.php:487
 #, fuzzy
 msgid "Theme for the site."
 msgstr "Logg ut or sida"
 
 #. TRANS: Field label for uploading a cutom theme.
-#: actions/designadminpanel.php:494
 #, fuzzy
 msgid "Custom theme"
 msgstr "Statusmelding"
 
 #. TRANS: Form instructions for uploading a cutom StatusNet theme.
-#: actions/designadminpanel.php:499
 msgid "You can upload a custom StatusNet theme as a .ZIP archive."
 msgstr ""
 
 #. TRANS: Fieldset legend for theme background image.
-#: actions/designadminpanel.php:515
 msgid "Change background image"
 msgstr ""
 
 #. TRANS: Field label for background image on theme designer page.
 #. TRANS: Field label for background color selector.
 #. TRANS: Label on profile design page for setting a profile page background colour.
-#: actions/designadminpanel.php:525 actions/designadminpanel.php:609
-#: lib/designform.php:238
 msgid "Background"
 msgstr ""
 
 #. TRANS: Form guide for background image upload form on theme designer page.
-#: actions/designadminpanel.php:531
 #, fuzzy, php-format
 msgid ""
 "You can upload a background image for the site. The maximum file size is %1"
@@ -2274,211 +1800,176 @@ msgid ""
 msgstr "Du kan lasta opp ein logo for gruppa."
 
 #. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:558
 msgid "On"
 msgstr ""
 
 #. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:575
 msgid "Off"
 msgstr ""
 
 #. TRANS: Form guide for turning background image on or off on theme designer page.
 #. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
 #. TRANS: use of the uploaded profile image.
-#: actions/designadminpanel.php:577 lib/designform.php:214
 msgid "Turn background image on or off."
 msgstr ""
 
 #. TRANS: Checkbox label to title background image on theme designer page.
 #. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-#: actions/designadminpanel.php:583 lib/designform.php:220
 msgid "Tile background image"
 msgstr ""
 
 #. TRANS: Fieldset legend for theme colors.
-#: actions/designadminpanel.php:598
 #, fuzzy
 msgid "Change colors"
 msgstr "Endra passordet ditt"
 
 #. TRANS: Field label for content color selector.
 #. TRANS: Label on profile design page for setting a profile page content colour.
-#: actions/designadminpanel.php:623 lib/designform.php:252
 msgid "Content"
 msgstr "Innhald"
 
 #. TRANS: Field label for sidebar color selector.
 #. TRANS: Label on profile design page for setting a profile page sidebar colour.
-#: actions/designadminpanel.php:637 lib/designform.php:266
 #, fuzzy
 msgid "Sidebar"
 msgstr "Søk"
 
 #. TRANS: Field label for text color selector.
 #. TRANS: Label on profile design page for setting a profile page text colour.
-#: actions/designadminpanel.php:651 lib/designform.php:280
 msgid "Text"
 msgstr "Tekst"
 
 #. TRANS: Field label for link color selector.
 #. TRANS: Label on profile design page for setting a profile page links colour.
-#: actions/designadminpanel.php:665 lib/designform.php:294
 #, fuzzy
 msgid "Links"
 msgstr "Logg inn"
 
 #. TRANS: Fieldset legend for advanced theme design settings.
-#: actions/designadminpanel.php:691
 msgid "Advanced"
 msgstr ""
 
 #. TRANS: Field label for custom CSS.
-#: actions/designadminpanel.php:696
 msgid "Custom CSS"
 msgstr ""
 
 #. TRANS: Button text for resetting theme settings.
-#: actions/designadminpanel.php:718
 msgctxt "BUTTON"
 msgid "Use defaults"
 msgstr ""
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:720
 #, fuzzy
 msgid "Restore default designs."
 msgstr "Klarte ikkje å lagra Twitter-innstillingane dine!"
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:728
 msgid "Reset back to default."
 msgstr ""
 
 #. TRANS: Title for button for saving theme settings.
-#: actions/designadminpanel.php:736
 #, fuzzy
 msgid "Save design."
 msgstr "Profilinnstillingar"
 
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
-#: actions/disfavor.php:83
 msgid "This notice is not a favorite!"
 msgstr "Denne notisen er ikkje ein favoritt!"
 
 #. TRANS: Title for page on which favorites can be added.
-#: actions/disfavor.php:98
 msgid "Add to favorites"
 msgstr "Legg til i favorittar"
 
 #. TRANS: Client exception thrown when requesting a document from the documentation that does not exist.
 #. TRANS: %s is the non-existing document.
-#: actions/doc.php:155
 #, fuzzy, php-format
 msgid "No such document \"%s\"."
 msgstr "Denne notisen finst ikkje."
 
 #. TRANS: Title for "Edit application" form.
 #. TRANS: Form legend.
-#: actions/editapplication.php:54 lib/applicationeditform.php:129
 msgid "Edit application"
 msgstr ""
 
 #. TRANS: Client error displayed trying to edit an application while not logged in.
-#: actions/editapplication.php:66
 #, fuzzy
 msgid "You must be logged in to edit an application."
 msgstr "Du må være logga inn for å lage ei gruppe."
 
 #. TRANS: Client error displayed trying to edit an application that does not exist.
-#: actions/editapplication.php:83 actions/showapplication.php:83
 #, fuzzy
 msgid "No such application."
 msgstr "Denne notisen finst ikkje."
 
 #. TRANS: Instructions for "Edit application" form.
-#: actions/editapplication.php:167
 #, fuzzy
 msgid "Use this form to edit your application."
 msgstr "Bruk dette skjemaet for å redigere gruppa"
 
 #. TRANS: Validation error shown when not providing a name in the "Edit application" form.
 #. TRANS: Validation error shown when not providing a name in the "New application" form.
-#: actions/editapplication.php:184 actions/newapplication.php:164
 #, fuzzy
 msgid "Name is required."
 msgstr "Samme som passord over. Påkrevd."
 
 #. TRANS: Validation error shown when providing too long a name in the "Edit application" form.
 #. TRANS: Validation error shown when providing too long a name in the "New application" form.
-#: actions/editapplication.php:188 actions/newapplication.php:172
 msgid "Name is too long (maximum 255 characters)."
 msgstr "Namnet er for langt (maksimalt 255 teikn)."
 
 #. TRANS: Validation error shown when providing a name for an application that already exists in the "Edit application" form.
 #. TRANS: Validation error shown when providing a name for an application that already exists in the "New application" form.
-#: actions/editapplication.php:192 actions/newapplication.php:168
 #, fuzzy
 msgid "Name already in use. Try another one."
 msgstr "Kallenamnet er allereie i bruk. Prøv eit anna."
 
 #. TRANS: Validation error shown when not providing a description in the "Edit application" form.
 #. TRANS: Validation error shown when not providing a description in the "New application" form.
-#: actions/editapplication.php:196 actions/newapplication.php:176
 #, fuzzy
 msgid "Description is required."
 msgstr "Beskriving"
 
 #. TRANS: Validation error shown when providing too long a source URL in the "Edit application" form.
-#: actions/editapplication.php:209
 msgid "Source URL is too long."
 msgstr ""
 
 #. TRANS: Validation error shown when providing an invalid source URL in the "Edit application" form.
 #. TRANS: Validation error shown when providing an invalid source URL in the "New application" form.
-#: actions/editapplication.php:216 actions/newapplication.php:199
 #, fuzzy
 msgid "Source URL is not valid."
 msgstr "Heimesida er ikkje ei gyldig internettadresse."
 
 #. 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.
-#: actions/editapplication.php:220 actions/newapplication.php:203
 msgid "Organization is required."
 msgstr ""
 
 #. TRANS: Validation error shown when providing too long an arganisation name in the "Edit application" form.
-#: actions/editapplication.php:224 actions/newapplication.php:207
 #, fuzzy
 msgid "Organization is too long (maximum 255 characters)."
 msgstr "Plassering er for lang (maksimalt 255 teikn)."
 
 #. TRANS: Form validation error show when an organisation name has not been provided in the edit application form.
 #. TRANS: Form validation error show when an organisation name has not been provided in the new application form.
-#: actions/editapplication.php:228 actions/newapplication.php:211
 msgid "Organization homepage is required."
 msgstr ""
 
 #. TRANS: Validation error shown when providing too long a callback URL in the "Edit application" form.
 #. TRANS: Validation error shown when providing too long a callback URL in the "New application" form.
-#: actions/editapplication.php:239 actions/newapplication.php:225
 msgid "Callback is too long."
 msgstr ""
 
 #. TRANS: Validation error shown when providing an invalid callback URL in the "Edit application" form.
 #. TRANS: Validation error shown when providing an invalid callback URL in the "New application" form.
-#: actions/editapplication.php:247 actions/newapplication.php:235
 msgid "Callback URL is not valid."
 msgstr ""
 
 #. TRANS: Server error occuring when an application could not be updated from the "Edit application" form.
-#: actions/editapplication.php:284
 #, fuzzy
 msgid "Could not update application."
 msgstr "Kann ikkje oppdatera gruppa."
 
 #. TRANS: Title for form to edit a group. %s is a group nickname.
-#: actions/editgroup.php:55
 #, php-format
 msgid "Edit %s group"
 msgstr "Rediger %s gruppa"
@@ -2486,41 +1977,41 @@ msgstr "Rediger %s gruppa"
 #. TRANS: Client error displayed trying to edit a group while not logged in.
 #. TRANS: Client error displayed when trying to create a group while not logged in.
 #. TRANS: Client error displayed trying to create a group while not logged in.
-#: actions/editgroup.php:68 actions/grouplogo.php:69 actions/newgroup.php:65
 msgid "You must be logged in to create a group."
 msgstr "Du må være logga inn for å lage ei gruppe."
 
 #. TRANS: Form instructions for group edit form.
-#: actions/editgroup.php:161
 msgid "Use this form to edit the group."
 msgstr "Bruk dette skjemaet for å redigere gruppa"
 
+#. TRANS: Group edit form validation error.
+#. TRANS: Group create form validation error.
+#. TRANS: %s is the invalid alias.
+#, fuzzy, php-format
+msgid "Invalid alias: \"%s\""
+msgstr "Ugyldig merkelapp: %s"
+
 #. TRANS: Group edit form success message.
-#: actions/editgroup.php:301
 msgid "Options saved."
 msgstr "Lagra innstillingar."
 
 #. TRANS: Title for e-mail settings.
-#: actions/emailsettings.php:60
 msgid "Email settings"
 msgstr "Profilinnstillingar"
 
 #. TRANS: E-mail settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/emailsettings.php:74
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 msgstr "Styr korleis du får epost frå %%site.name%%."
 
 #. TRANS: Form legend for e-mail settings form.
 #. TRANS: Field label for e-mail address input in e-mail settings form.
-#: actions/emailsettings.php:104 actions/emailsettings.php:130
 #, fuzzy
 msgid "Email address"
 msgstr "Epostadresser"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:110
 msgid "Current confirmed email address."
 msgstr "Godkjent epostadresse."
 
@@ -2529,15 +2020,11 @@ msgstr "Godkjent epostadresse."
 #. TRANS: Button label to remove a confirmed IM address.
 #. TRANS: Button label to remove a confirmed SMS address.
 #. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
-#: actions/emailsettings.php:113 actions/emailsettings.php:180
-#: actions/imsettings.php:119 actions/smssettings.php:119
-#: actions/smssettings.php:175
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Gjenopprett"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:120
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -2550,15 +2037,12 @@ msgstr ""
 #. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
 #. TRANS: Any other domain may be owned by a legitimate person or
 #. TRANS: organization.
-#: actions/emailsettings.php:137
 msgid "Email address, like \"UserName@example.org\""
 msgstr "Epostadresse («brukarnamn@example.org»)"
 
 #. TRANS: Button label for adding an e-mail address in e-mail settings form.
 #. TRANS: Button label for adding an IM address in IM settings form.
 #. TRANS: Button label for adding a SMS phone number in SMS settings form.
-#: actions/emailsettings.php:141 actions/imsettings.php:147
-#: actions/smssettings.php:157
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Add"
@@ -2566,29 +2050,24 @@ msgstr "Legg til"
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:149 actions/smssettings.php:166
 msgid "Incoming email"
 msgstr "Innkomande epost"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:155
 msgid "I want to post notices by email."
 msgstr "Eg vil senda notisar med epost."
 
 #. TRANS: Form instructions for incoming e-mail form in e-mail settings.
 #. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
-#: actions/emailsettings.php:177 actions/smssettings.php:173
 msgid "Send email to this address to post new notices."
 msgstr "Send epost til denne addressa for å legge til nye notisar."
 
 #. TRANS: Instructions for incoming e-mail address input form, when an address has already been assigned.
 #. TRANS: Instructions for incoming SMS e-mail address input form.
-#: actions/emailsettings.php:186 actions/smssettings.php:181
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr "Vel ny epostadresse til å oppdatera med; fjerner den gamle."
 
 #. TRANS: Instructions for incoming e-mail address input form.
-#: actions/emailsettings.php:190
 msgid ""
 "To send notices via email, we need to create a unique email address for you "
 "on this server:"
@@ -2596,92 +2075,74 @@ msgstr ""
 
 #. TRANS: Button label for adding an e-mail address to send notices from.
 #. TRANS: Button label for adding an SMS e-mail address to send notices from.
-#: actions/emailsettings.php:196 actions/smssettings.php:184
 #, fuzzy
 msgctxt "BUTTON"
 msgid "New"
 msgstr "Ny"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:205
 msgid "Email preferences"
 msgstr "Epostadresser"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:213
 msgid "Send me notices of new subscriptions through email."
 msgstr "Send meg ein notis ved nye tingingar på epost."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:219
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr ""
 "Send meg ein epost når nokon legg til ein av mine notisar som favoritt."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:226
 msgid "Send me email when someone sends me a private message."
 msgstr "Send meg ein epost når nokon sender meg ei privat melding."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:232
 #, fuzzy
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr "Send meg ein epost når nokon sender meg ei privat melding."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:238
 msgid "Allow friends to nudge me and send me an email."
 msgstr "Tillat vennar å sende meg ein epost."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:244
 msgid "Publish a MicroID for my email address."
 msgstr "Publiser ein MicroID for epost addressa mi."
 
 #. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:362
 msgid "Email preferences saved."
 msgstr "Lagra brukarval."
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:381
 msgid "No email address."
 msgstr "Ingen epostadresse."
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:389
 #, fuzzy
 msgid "Cannot normalize that email address."
 msgstr "Klarar ikkje normalisera epostadressa"
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:394 actions/register.php:197
-#: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "Ikkje ei gyldig epostadresse."
 
 #. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:398
 msgid "That is already your email address."
 msgstr "Det er alt din epost addresse"
 
 #. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:402
 msgid "That email address already belongs to another user."
 msgstr "Den epost addressa er alt registrert hos ein annan brukar."
 
 #. TRANS: Server error thrown on database error adding e-mail confirmation code.
 #. TRANS: Server error thrown on database error adding Instant Messaging confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:419 actions/imsettings.php:362
-#: actions/smssettings.php:364
 #, fuzzy
 msgid "Could not insert confirmation code."
 msgstr "Kan ikkje leggja til godkjenningskode."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:426
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
@@ -2692,103 +2153,83 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling Instant Messaging address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:446 actions/imsettings.php:391
-#: actions/smssettings.php:398
 msgid "No pending confirmation to cancel."
 msgstr "Ingen ventande stadfesting å avbryta."
 
 #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:451
 #, fuzzy
 msgid "That is the wrong email address."
 msgstr "Det er feil lynmeldings addresse."
 
 #. TRANS: Server error thrown on database error canceling e-mail address confirmation.
 #. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
-#: actions/emailsettings.php:460 actions/smssettings.php:412
 #, fuzzy
 msgid "Could not delete email confirmation."
 msgstr "Kan ikkje sletta e-postgodkjenning."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:465
 msgid "Email confirmation cancelled."
 msgstr "Ingen ventande stadfesting å avbryta."
 
 #. TRANS: Message given trying to remove an e-mail address that is not
 #. TRANS: registered for the active user.
-#: actions/emailsettings.php:484
 msgid "That is not your email address."
 msgstr "Det er ikkje din epost addresse."
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:505
 msgid "The email address was removed."
 msgstr "Fjerna innkomande epostadresse."
 
 #. TRANS: Form validation error displayed when trying to remove an incoming e-mail address while no address has been set.
-#: actions/emailsettings.php:519 actions/smssettings.php:554
 msgid "No incoming email address."
 msgstr "Ingen innkomande epostadresse."
 
 #. 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.
-#: actions/emailsettings.php:531 actions/emailsettings.php:555
-#: actions/smssettings.php:565 actions/smssettings.php:590
 #, fuzzy
 msgid "Could not update user record."
 msgstr "Kan ikkje oppdatera brukarinformajon."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
 #. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:535 actions/smssettings.php:569
 msgid "Incoming email address removed."
 msgstr "Fjerna innkomande epostadresse."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
 #. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:559 actions/smssettings.php:594
 msgid "New incoming email address added."
 msgstr "La til ny innkomande epostadresse."
 
 #. TRANS: Client error displayed when trying to mark a notice as favorite that already is a favorite.
-#: actions/favor.php:80
 msgid "This notice is already a favorite!"
 msgstr "Denne notisen er alt ein favoritt!"
 
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
-#: actions/favor.php:95
 #, fuzzy
 msgid "Disfavor favorite."
 msgstr "Fjern favoritt"
 
 #. TRANS: Page title for first page of favorited notices.
 #. TRANS: Title for favourited notices section.
-#: actions/favorited.php:65 lib/popularnoticesection.php:62
-#: lib/publicgroupnav.php:93
 msgid "Popular notices"
 msgstr "Populære notisar"
 
 #. TRANS: Page title for all but first page of favorited notices.
 #. TRANS: %d is the page number being displayed.
-#: actions/favorited.php:69
 #, php-format
 msgid "Popular notices, page %d"
 msgstr "Populære notisar, side %d"
 
 #. TRANS: Description on page displaying favorited notices.
-#: actions/favorited.php:81
 msgid "The most popular notices on the site right now."
 msgstr "Viser dei mest populære notisane på sida akkurat no."
 
 #. TRANS: Text displayed instead of a list when a site does not yet have any favourited notices.
-#: actions/favorited.php:149
 msgid "Favorite notices appear on this page but no one has favorited one yet."
 msgstr ""
 
 #. TRANS: Additional text displayed instead of a list when a site does not yet have any favourited notices for logged in users.
-#: actions/favorited.php:153
 msgid ""
 "Be the first to add a notice to your favorites by clicking the fave button "
 "next to any notice you like."
@@ -2796,7 +2237,6 @@ msgstr ""
 
 #. TRANS: Additional text displayed instead of a list when a site does not yet have any favourited notices for not logged in users.
 #. TRANS: %%action.register%% is a registration link. "[link text](link)" is Mark Down. Do not change the formatting.
-#: actions/favorited.php:158
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to add a "
@@ -2807,194 +2247,159 @@ msgstr ""
 #. TRANS: %s is a user's nickname.
 #. TRANS: Title for first page of favourite notices of a user.
 #. TRANS: %s is the user for whom the favourite notices are displayed.
-#: actions/favoritesrss.php:111 actions/showfavorites.php:76
-#: lib/personalgroupnav.php:110
 #, php-format
 msgid "%s's favorite notices"
 msgstr "%s's favoritt meldingar"
 
 #. TRANS: Desciption of RSS feed with favourite notices of a user.
 #. TRANS: %1$s is a user's nickname, %2$s is the name of the StatusNet site.
-#: actions/favoritesrss.php:117
 #, fuzzy, php-format
 msgid "Updates favored by %1$s on %2$s!"
 msgstr "Oppdateringar frå %1$s på %2$s!"
 
 #. TRANS: Page title for first page of featured users.
 #. TRANS: Title for featured users section.
-#: actions/featured.php:69 lib/featureduserssection.php:87
-#: lib/publicgroupnav.php:89
 msgid "Featured users"
 msgstr "Profilerte folk"
 
 #. TRANS: Page title for all but first page of featured users.
 #. TRANS: %d is the page number being displayed.
-#: actions/featured.php:73
 #, php-format
 msgid "Featured users, page %d"
 msgstr "Profilerte folk, side %d"
 
 #. TRANS: Description on page displaying featured users.
-#: actions/featured.php:102
 #, fuzzy, php-format
 msgid "A selection of some great users on %s."
 msgstr "Eit utval av nokre av dei flotte folka på %s"
 
 #. TRANS: Client error displayed when no notice ID was given trying do display a file.
-#: actions/file.php:36
 msgid "No notice ID."
 msgstr "Denne notisen finst ikkje."
 
 #. TRANS: Client error displayed when an invalid notice ID was given trying do display a file.
-#: actions/file.php:41
 msgid "No notice."
 msgstr "Denne notisen finst ikkje."
 
 #. TRANS: Client error displayed when trying do display a file for a notice without a file attachement.
-#: actions/file.php:46
 #, fuzzy
 msgid "No attachments."
 msgstr "Slikt dokument finst ikkje."
 
 #. TRANS: Client error displayed when trying do display a file for a notice with file attachements
 #. TRANS: that could not be found.
-#: actions/file.php:58
 #, fuzzy
 msgid "No uploaded attachments."
 msgstr "Slikt dokument finst ikkje."
 
 #. TRANS: Client error displayed when subscribing to a remote profile and an unexpected response is received.
-#: actions/finishremotesubscribe.php:69
 msgid "Not expecting this response!"
 msgstr "Venta ikkje dette svaret!"
 
 #. TRANS: Client error displayed when subscribing to a remote profile that does not exist.
-#: actions/finishremotesubscribe.php:81
 #, fuzzy
 msgid "User being listened to does not exist."
 msgstr "Brukaren du lyttar til eksisterer ikkje."
 
 #. TRANS: Client error displayed when subscribing to a remote profile that is a local profile.
-#: actions/finishremotesubscribe.php:89 actions/remotesubscribe.php:58
 msgid "You can use the local subscription!"
 msgstr "Du kan nytta det lokale abonnementet!"
 
 #. TRANS: Client error displayed when subscribing to a remote profile that is blocked form subscribing to.
-#: actions/finishremotesubscribe.php:102
 msgid "That user has blocked you from subscribing."
 msgstr "Brukaren tillet deg ikkje å tinga meldingane sine."
 
 #. TRANS: Client error displayed when subscribing to a remote profile without providing an authorised token.
-#: actions/finishremotesubscribe.php:114
 msgid "You are not authorized."
 msgstr "Du tingar ikkje oppdateringar til den profilen."
 
 #. TRANS: Client error displayed when subscribing to a remote profile and conversion of the request token to access token fails.
-#: actions/finishremotesubscribe.php:118
 #, fuzzy
 msgid "Could not convert request token to access token."
 msgstr "Kan ikkje konvertera spyrjebillett til tilgongsbillett."
 
 #. TRANS: Client error displayed when subscribing to a remote profile fails because of an unsupported version of the OMB protocol.
-#: actions/finishremotesubscribe.php:124
 #, fuzzy
 msgid "Remote service uses unknown version of OMB protocol."
 msgstr "Ukjend versjon av OMB-protokollen."
 
 #. TRANS: Server error displayed when subscribing to a remote profile fails because the remote profile could not be updated.
-#: actions/finishremotesubscribe.php:145 lib/oauthstore.php:317
 #, fuzzy
 msgid "Error updating remote profile."
 msgstr "Feil ved oppdatering av ekstern profil"
 
 #. TRANS: Client error displayed when requesting a non-existent file.
-#: actions/getfile.php:77
 #, fuzzy
 msgid "No such file."
 msgstr "Denne notisen finst ikkje."
 
 #. TRANS: Client error displayed when requesting a file without having read access to it.
-#: actions/getfile.php:82
 #, fuzzy
 msgid "Cannot read file."
 msgstr "Mista fila vår."
 
 #. TRANS: Client error displayed when trying to assign an invalid role to a user.
-#: actions/grantrole.php:61 actions/revokerole.php:62
 #, fuzzy
 msgid "Invalid role."
 msgstr "Ugyldig storleik."
 
 #. TRANS: Client error displayed when trying to assign an reserved role to a user.
-#: actions/grantrole.php:66 actions/revokerole.php:66
 msgid "This role is reserved and cannot be set."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to assign a role to a user while not being allowed to set roles.
-#: actions/grantrole.php:76
 msgid "You cannot grant user roles on this site."
 msgstr "Du kan ikkje lengre legge inn notisar på denne sida."
 
 #. TRANS: Client error displayed when trying to assign a role to a user that already has that role.
-#: actions/grantrole.php:84
 msgid "User already has this role."
 msgstr "Brukaren har inga profil."
 
 #. TRANS: Client error displayed trying to block a user from a group while not specifying a to be blocked user profile.
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing a profile.
+#. TRANS: Client error displayed when not providing a profile ID on the Make Admin page.
 #. TRANS: Client error displayed trying a change a subscription without providing a profile.
 #. TRANS: Client error displayed when trying to change user options without specifying a user to work on.
-#: actions/groupblock.php:71 actions/groupunblock.php:71
-#: actions/makeadmin.php:71 actions/subedit.php:49
-#: lib/profileformaction.php:79
 msgid "No profile specified."
 msgstr "Ingen vald profil."
 
 #. TRANS: Client error displayed trying to block a user from a group while specifying a non-existing profile.
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing an existing profile.
+#. TRANS: Client error displayed when specifying an invalid profile ID on the Make Admin page.
 #. TRANS: Client error displayed trying a change a subscription for a non-existant profile ID.
 #. TRANS: Client error displayed when trying to change user options without specifying an existing user to work on.
-#: actions/groupblock.php:77 actions/groupunblock.php:77
-#: actions/makeadmin.php:76 actions/subedit.php:57 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:87
 msgid "No profile with that ID."
 msgstr "Fann ingen profil med den IDen."
 
 #. TRANS: Client error displayed trying to block a user from a group while not specifying a group to block a profile from.
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing a group.
-#: actions/groupblock.php:83 actions/groupunblock.php:83
-#: actions/makeadmin.php:81
+#. TRANS: Client error displayed when not providing a group ID on the Make Admin page.
 #, fuzzy
 msgid "No group specified."
 msgstr "Ingen vald profil."
 
 #. TRANS: Client error displayed trying to block a user from a group while not being an admin user.
-#: actions/groupblock.php:95
 msgid "Only an admin can block group members."
 msgstr ""
 
 #. TRANS: Client error displayed trying to block a user from a group while user is already blocked from the given group.
-#: actions/groupblock.php:100
 #, fuzzy
 msgid "User is already blocked from group."
 msgstr "Brukar har blokkert deg."
 
 #. TRANS: Client error displayed trying to block a user from a group while user is not a member of given group.
-#: actions/groupblock.php:106
 #, fuzzy
 msgid "User is not a member of group."
 msgstr "Du er ikkje medlem av den gruppa."
 
 #. TRANS: Title for block user from group page.
 #. TRANS: Form legend for form to block user from a group.
-#: actions/groupblock.php:141 actions/groupmembers.php:364
 #, fuzzy
 msgid "Block user from group"
 msgstr "Blokker brukaren"
 
 #. TRANS: Explanatory text for block user from group form before setting the block.
 #. TRANS: %1$s is that to be blocked user, %2$s is the group the user will be blocked from.
-#: actions/groupblock.php:169
 #, php-format
 msgid ""
 "Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They "
@@ -3003,160 +2408,133 @@ msgid ""
 msgstr ""
 
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
-#: actions/groupblock.php:191
 #, fuzzy
 msgid "Do not block this user from this group."
 msgstr "Ei liste over brukarane i denne gruppa."
 
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
-#: actions/groupblock.php:198
 #, fuzzy
 msgid "Block this user from this group."
 msgstr "Ei liste over brukarane i denne gruppa."
 
 #. TRANS: Server error displayed when trying to block a user from a group fails because of an application error.
-#: actions/groupblock.php:215
 msgid "Database error blocking user from group."
 msgstr ""
 
 #. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
 #. TRANS: Client error displayed trying to find a user by ID without providing an ID.
-#: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr "Nei Jabber-ID"
 
 #. TRANS: Client error displayed trying to change group design settings while not logged in.
-#: actions/groupdesignsettings.php:67
 #, fuzzy
 msgid "You must be logged in to edit a group."
 msgstr "Du må være logga inn for å lage ei gruppe."
 
 #. TRANS: Title group design settings page.
-#: actions/groupdesignsettings.php:146
 #, fuzzy
 msgid "Group design"
 msgstr "Grupper"
 
 #. TRANS: Instructions for group design settings page.
-#: actions/groupdesignsettings.php:157
 msgid ""
 "Customize the way your group looks with a background image and a colour "
 "palette of your choice."
 msgstr ""
 
 #. TRANS: Form validation error displayed when group design settings could not be updated because of an application issue.
-#: actions/groupdesignsettings.php:262
 #, fuzzy
 msgid "Unable to update your design settings."
 msgstr "Klarte ikkje å lagra Twitter-innstillingane dine!"
 
 #. TRANS: Form text to confirm saved group design settings.
-#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:239
 msgid "Design preferences saved."
 msgstr "Lagra brukarval."
 
 #. TRANS: Title for group logo settings page.
 #. TRANS: Group logo form legend.
-#: actions/grouplogo.php:144 actions/grouplogo.php:199
 msgid "Group logo"
 msgstr "Logo åt gruppa"
 
 #. TRANS: Instructions for group logo page.
 #. TRANS: %s is the maximum file size for that site.
-#: actions/grouplogo.php:156
 #, fuzzy, php-format
 msgid ""
 "You can upload a logo image for your group. The maximum file size is %s."
 msgstr "Du kan lasta opp ein logo for gruppa."
 
 #. TRANS: Submit button for uploading a group logo.
-#: actions/grouplogo.php:243
 msgid "Upload"
 msgstr "Last opp"
 
 #. TRANS: Button text for cropping an uploaded group logo.
-#: actions/grouplogo.php:299
 msgid "Crop"
 msgstr "Skaler"
 
 #. TRANS: Form instructions on the group logo page.
-#: actions/grouplogo.php:376
 #, fuzzy
 msgid "Pick a square area of the image to be the logo."
 msgstr "Velg eit utvalg av bildet som vil blir din avatar."
 
 #. TRANS: Form success message after updating a group logo.
-#: actions/grouplogo.php:411
 msgid "Logo updated."
 msgstr "Logo oppdatert."
 
 #. TRANS: Form failure message after failing to update a group logo.
-#: actions/grouplogo.php:414
 msgid "Failed updating logo."
 msgstr "Feil ved oppdatering av logo."
 
 #. TRANS: Title of the page showing group members.
 #. TRANS: %s is the name of the group.
-#: actions/groupmembers.php:104
 #, php-format
 msgid "%s group members"
 msgstr "%s medlemmar i gruppa"
 
 #. TRANS: Title of the page showing group members.
 #. TRANS: %1$s is the name of the group, %2$d is the page number of the members list.
-#: actions/groupmembers.php:109
 #, php-format
 msgid "%1$s group members, page %2$d"
 msgstr "%s medlemmar i gruppa"
 
 #. TRANS: Page notice for group members page.
-#: actions/groupmembers.php:125
 msgid "A list of the users in this group."
 msgstr "Ei liste over brukarane i denne gruppa."
 
 #. TRANS: Indicator in group members list that this user is a group administrator.
-#: actions/groupmembers.php:190 lib/action.php:581
 msgid "Admin"
 msgstr "Administrator"
 
 #. TRANS: Button text for the form that will block a user from a group.
-#: actions/groupmembers.php:397
 msgctxt "BUTTON"
 msgid "Block"
 msgstr ""
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:401
 msgctxt "TOOLTIP"
 msgid "Block this user"
 msgstr ""
 
 #. TRANS: Form legend for form to make a user a group admin.
-#: actions/groupmembers.php:488
 #, fuzzy
 msgid "Make user an admin of the group"
 msgstr "Du må være administrator for å redigere gruppa"
 
 #. TRANS: Button text for the form that will make a user administrator.
-#: actions/groupmembers.php:521
 msgctxt "BUTTON"
 msgid "Make Admin"
 msgstr ""
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:525
 msgctxt "TOOLTIP"
 msgid "Make this user an admin"
 msgstr ""
 
 #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
-#: actions/grouprss.php:141
 #, fuzzy, php-format
 msgid "Updates from members of %1$s on %2$s!"
 msgstr "Oppdateringar frå %1$s på %2$s!"
 
 #. TRANS: Title for first page of the groups list.
-#: actions/groups.php:62
 #, fuzzy
 msgctxt "TITLE"
 msgid "Groups"
@@ -3164,7 +2542,6 @@ msgstr "Grupper"
 
 #. TRANS: Title for all but the first page of the groups list.
 #. TRANS: %d is the page number.
-#: actions/groups.php:66
 #, fuzzy, php-format
 msgctxt "TITLE"
 msgid "Groups, page %d"
@@ -3173,7 +2550,6 @@ msgstr "Grupper, side %d"
 #. TRANS: Page notice of group list. %%%%site.name%%%% is the StatusNet site name,
 #. TRANS: %%%%action.groupsearch%%%% and %%%%action.newgroup%%%% are URLs. Do not change them.
 #. TRANS: This message contains Markdown links in the form [link text](link).
-#: actions/groups.php:95
 #, php-format
 msgid ""
 "%%%%site.name%%%% groups let you find and talk with people of similar "
@@ -3184,12 +2560,10 @@ msgid ""
 msgstr ""
 
 #. TRANS: Link to create a new group on the group list page.
-#: actions/groups.php:113 actions/usergroups.php:126 lib/groupeditform.php:115
 msgid "Create a new group"
 msgstr "Opprett ei ny gruppe"
 
 #. TRANS: Instructions for page where groups can be searched. %%site.name%% is the name of the StatusNet site.
-#: actions/groupsearch.php:53
 #, fuzzy, php-format
 msgid ""
 "Search for groups on %%site.name%% by their name, location, or description. "
@@ -3199,21 +2573,17 @@ msgstr ""
 "nøkkelord med mellomrom; dei må være minimum 3 bokstavar eller meir."
 
 #. TRANS: Title for page where groups can be searched.
-#: actions/groupsearch.php:60
 msgid "Group search"
 msgstr "Gruppesøk"
 
 #. TRANS: Text on page where groups can be searched if no results were found for a query.
 #. TRANS: Text for notice search results is the query had no results.
 #. TRANS: Message on the "People search" page where a query has no results.
-#: actions/groupsearch.php:82 actions/noticesearch.php:122
-#: actions/peoplesearch.php:87
 msgid "No results."
 msgstr "Resultat frå kommandoen"
 
 #. TRANS: Additional text on page where groups can be searched if no results were found for a query for a logged in user.
 #. TRANS: This message contains Markdown links in the form [link text](link).
-#: actions/groupsearch.php:87
 #, php-format
 msgid ""
 "If you cannot find the group you're looking for, you can [create it](%%"
@@ -3222,7 +2592,6 @@ msgstr ""
 
 #. TRANS: Additional text on page where groups can be searched if no results were found for a query for a not logged in user.
 #. TRANS: This message contains Markdown links in the form [link text](link).
-#: actions/groupsearch.php:92
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and [create the group](%%"
@@ -3230,31 +2599,26 @@ msgid ""
 msgstr ""
 
 #. TRANS: Client error displayed when trying to unblock a user from a group without being an administrator for the group.
-#: actions/groupunblock.php:95
 msgid "Only an admin can unblock group members."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to unblock a non-blocked user from a group.
-#: actions/groupunblock.php:100
 #, fuzzy
 msgid "User is not blocked from group."
 msgstr "Brukar har blokkert deg."
 
 #. TRANS: Server error displayed when unblocking a user from a group fails because of an unknown error.
 #. TRANS: Server error displayed when removing a user block.
-#: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "Feil ved fjerning av blokka."
 
 #. TRANS: Title for Instant Messaging settings.
-#: actions/imsettings.php:56
 msgid "IM settings"
 msgstr "Avatar-innstillingar"
 
 #. 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.
-#: actions/imsettings.php:69
 #, fuzzy, php-format
 msgid ""
 "You can send and receive notices through instant messaging [instant messages]"
@@ -3264,19 +2628,16 @@ msgstr ""
 "doc.im%%).  Set opp adressa og innstillingar under."
 
 #. TRANS: Message given in the IM settings if IM is not enabled on the site.
-#: actions/imsettings.php:90
 #, fuzzy
 msgid "IM is not available."
 msgstr "Denne sida er ikkje tilgjengleg i eit"
 
-#: actions/imsettings.php:116
 #, fuzzy, php-format
 msgid "Current confirmed %s address."
 msgstr "Godkjent epostadresse."
 
 #. TRANS: Form note in IM settings form.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:128
 #, fuzzy, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your %s account for a message "
@@ -3285,88 +2646,73 @@ msgstr ""
 "Venter på godkjenning. Sjekk din Jabber/GTalk-konto for ei melding med "
 "instruksjonar (la du %s til venelista di?)"
 
-#: actions/imsettings.php:140
 msgid "IM address"
 msgstr "Epostadresser"
 
-#: actions/imsettings.php:142
 #, php-format
 msgid "%s screenname."
 msgstr ""
 
 #. TRANS: Header for IM preferences form.
-#: actions/imsettings.php:163
 #, fuzzy
 msgid "IM Preferences"
 msgstr "Lagra brukarval."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:174
 #, fuzzy
 msgid "Send me notices"
 msgstr "Send ei melding"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:176
 #, fuzzy
 msgid "Post a notice when my status changes."
 msgstr "Legg til ein notis når min Jabber/GTalk status forandrar seg."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:178
 #, fuzzy
 msgid "Send me replies from people I'm not subscribed to."
 msgstr "Send meg svar via Jabber/GTalk fra folk eg ikkje abbonnerar på."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:181
 #, fuzzy
 msgid "Publish a MicroID"
 msgstr "Publiser ein MicroID for epost addressa mi."
 
 #. TRANS: Server error thrown on database error updating IM preferences.
-#: actions/imsettings.php:291
 #, fuzzy
 msgid "Couldn't update IM preferences."
 msgstr "Kan ikkje oppdatera brukar."
 
 #. TRANS: Confirmation message for successful IM preferences save.
 #. TRANS: Confirmation message after saving preferences.
-#: actions/imsettings.php:298 actions/urlsettings.php:244
 msgid "Preferences saved."
 msgstr "Lagra brukarval."
 
 #. TRANS: Message given saving IM address without having provided one.
-#: actions/imsettings.php:320
 #, fuzzy
 msgid "No screenname."
 msgstr "Ingen kallenamn."
 
-#: actions/imsettings.php:325
 #, fuzzy
 msgid "No transport."
 msgstr "Denne notisen finst ikkje."
 
 #. TRANS: Message given saving IM address that cannot be normalised.
-#: actions/imsettings.php:333
 #, fuzzy
 msgid "Cannot normalize that screenname"
 msgstr "Klarar ikkje normalisera Jabber-IDen"
 
 #. TRANS: Message given saving IM address that not valid.
-#: actions/imsettings.php:340
 #, fuzzy
 msgid "Not a valid screenname"
 msgstr "Ikkje eit gyldig brukarnamn."
 
 #. TRANS: Message given saving IM address that is already set for another user.
-#: actions/imsettings.php:344
 #, fuzzy
 msgid "Screenname already belongs to another user."
 msgstr "Jabber-ID tilhøyrer allereie ein annan brukar."
 
 #. TRANS: Message given saving valid IM address that is to be confirmed.
-#: actions/imsettings.php:369
 #, fuzzy
 msgid "A confirmation code was sent to the IM address you added."
 msgstr ""
@@ -3374,85 +2720,71 @@ msgstr ""
 "for å senda meldinger til deg."
 
 #. TRANS: Message given canceling IM address confirmation for the wrong IM address.
-#: actions/imsettings.php:396
 msgid "That is the wrong IM address."
 msgstr "Det er feil lynmeldings addresse."
 
 #. TRANS: Server error thrown on database error canceling IM address confirmation.
-#: actions/imsettings.php:405
 #, fuzzy
 msgid "Couldn't delete confirmation."
 msgstr "Kan ikkje sletta e-postgodkjenning."
 
 #. TRANS: Message given after successfully canceling IM address confirmation.
-#: actions/imsettings.php:410
 msgid "IM confirmation cancelled."
 msgstr "Ingen stadfestingskode."
 
 #. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.
-#: actions/imsettings.php:434
 #, fuzzy
 msgid "That is not your screenname."
 msgstr "Det er ikkje ditt telefonnummer"
 
 #. TRANS: Server error thrown on database error removing a registered IM address.
-#: actions/imsettings.php:443
 #, fuzzy
 msgid "Couldn't update user im prefs."
 msgstr "Kan ikkje oppdatera brukarinformajon."
 
 #. TRANS: Message given after successfully removing a registered Instant Messaging address.
-#: actions/imsettings.php:451
 msgid "The IM address was removed."
 msgstr "Fjerna innkomande epostadresse."
 
 #. TRANS: Title for all but the first page of the inbox page.
 #. TRANS: %1$s is the user's nickname, %2$s is the page number.
-#: actions/inbox.php:59
 #, fuzzy, php-format
 msgid "Inbox for %1$s - page %2$d"
 msgstr "Innboks for %s"
 
 #. TRANS: Title for the first page of the inbox page.
 #. TRANS: %s is the user's nickname.
-#: actions/inbox.php:64
 #, php-format
 msgid "Inbox for %s"
 msgstr "Innboks for %s"
 
 #. TRANS: Instructions for user inbox page.
-#: actions/inbox.php:106
 msgid "This is your inbox, which lists your incoming private messages."
 msgstr "Dette er innboksen for dine private meldingar."
 
 #. TRANS: Client error displayed when trying to sent invites while they have been disabled.
-#: actions/invite.php:41
 msgid "Invites have been disabled."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to sent invites while not logged in.
 #. TRANS: %s is the StatusNet site name.
-#: actions/invite.php:45
 #, php-format
 msgid "You must be logged in to invite other users to use %s."
 msgstr "Du må være logga inn for å bli med i ei gruppe."
 
 #. TRANS: Form validation message when providing an e-mail address that does not validate.
 #. TRANS: %s is an invalid e-mail address.
-#: actions/invite.php:78
 #, php-format
 msgid "Invalid email address: %s."
 msgstr "Ugyldig epostadresse: %s."
 
 #. TRANS: Page title when invitations have been sent.
-#: actions/invite.php:117
 #, fuzzy
 msgid "Invitations sent"
 msgstr "Invitasjon(er) sendt"
 
 #. TRANS: Page title when inviting potential users.
-#: actions/invite.php:120
 msgid "Invite new users"
 msgstr "Invitér nye brukarar"
 
@@ -3460,7 +2792,6 @@ msgstr "Invitér nye brukarar"
 #. TRANS: is already subscribed to one or more users with the given e-mail address(es).
 #. TRANS: Plural form is based on the number of reported already subscribed e-mail addresses.
 #. TRANS: Followed by a bullet list.
-#: actions/invite.php:140
 #, fuzzy
 msgid "You are already subscribed to this user:"
 msgid_plural "You are already subscribed to these users:"
@@ -3469,7 +2800,6 @@ msgstr[1] "Du tingar allereie oppdatering frå desse brukarane:"
 
 #. TRANS: Used as list item for already subscribed users (%1$s is nickname, %2$s is e-mail address).
 #. TRANS: Used as list item for already registered people (%1$s is nickname, %2$s is e-mail address).
-#: actions/invite.php:146 actions/invite.php:160
 #, php-format
 msgctxt "INVITE"
 msgid "%1$s (%2$s)"
@@ -3478,7 +2808,6 @@ msgstr "%1$s (%2$s)"
 #. TRANS: Message displayed inviting users to use a StatusNet site while the invited user
 #. TRANS: already uses a this StatusNet site. Plural form is based on the number of
 #. TRANS: reported already present people. Followed by a bullet list.
-#: actions/invite.php:154
 #, fuzzy
 msgid "This person is already a user and you were automatically subscribed:"
 msgid_plural ""
@@ -3491,7 +2820,6 @@ msgstr[1] ""
 #. TRANS: Message displayed inviting users to use a StatusNet site. Plural form is
 #. TRANS: based on the number of invitations sent. Followed by a bullet list of
 #. TRANS: e-mail addresses to which invitations were sent.
-#: actions/invite.php:168
 #, fuzzy
 msgid "Invitation sent to the following person:"
 msgid_plural "Invitations sent to the following people:"
@@ -3500,7 +2828,6 @@ msgstr[1] "Invitasjon(er) sendt til fylgjande folk:"
 
 #. TRANS: Generic message displayed after sending out one or more invitations to
 #. TRANS: people to join a StatusNet site.
-#: actions/invite.php:178
 msgid ""
 "You will be notified when your invitees accept the invitation and register "
 "on the site. Thanks for growing the community!"
@@ -3509,7 +2836,6 @@ msgstr ""
 "har registrert seg på sida. Takk for å bidra til fellesskapet her!"
 
 #. TRANS: Form instructions.
-#: actions/invite.php:191
 msgid ""
 "Use this form to invite your friends and colleagues to use this service."
 msgstr ""
@@ -3517,28 +2843,24 @@ msgstr ""
 "tenesta."
 
 #. TRANS: Field label for a list of e-mail addresses.
-#: actions/invite.php:218
 msgid "Email addresses"
 msgstr "Epostadresser"
 
 #. TRANS: Tooltip for field label for a list of e-mail addresses.
-#: actions/invite.php:221
 #, fuzzy
 msgid "Addresses of friends to invite (one per line)."
 msgstr "Venene sine adresser for invitasjon (ei per line)"
 
 #. TRANS: Field label for a personal message to send to invitees.
-#: actions/invite.php:225
 msgid "Personal message"
 msgstr "Personleg melding"
 
 #. TRANS: Tooltip for field label for a personal message to send to invitees.
-#: actions/invite.php:228
 msgid "Optionally add a personal message to the invitation."
 msgstr "Eventuelt legg til ei personleg melding til invitasjonen."
 
 #. TRANS: Send button for inviting friends
-#: actions/invite.php:232
+#. TRANS: Button text for sending notice.
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Send"
@@ -3547,7 +2869,6 @@ msgstr "Send"
 #. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral
 #. TRANS: singular 3rd-person pronoun in English. %1$s is the inviting user, $2$s is
 #. TRANS: the StatusNet sitename.
-#: actions/invite.php:264
 #, php-format
 msgid "%1$s has invited you to join them on %2$s"
 msgstr "%1$s har invitert deg til %2$s"
@@ -3557,7 +2878,6 @@ msgstr "%1$s har invitert deg til %2$s"
 #. TRANS: StatusNet sitename, %3$s is the site URL, %4$s is the personal message from the
 #. TRANS: inviting user, %s%5 a link to the timeline for the inviting user, %s$6 is a link
 #. TRANS: to register with the StatusNet site.
-#: actions/invite.php:271
 #, php-format
 msgid ""
 "%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -3610,184 +2930,179 @@ msgstr ""
 "Beste helsing, %2$s\n"
 
 #. TRANS: Client error displayed when trying to join a group while not logged in.
-#: actions/joingroup.php:59
 msgid "You must be logged in to join a group."
 msgstr "Du må være logga inn for å bli med i ei gruppe."
 
 #. TRANS: Title for join group page after joining.
-#: actions/joingroup.php:148
 #, fuzzy, php-format
 msgctxt "TITLE"
 msgid "%1$s joined group %2$s"
 msgstr "%s blei medlem av gruppe %s"
 
 #. TRANS: Client error displayed when trying to leave a group while not logged in.
-#: actions/leavegroup.php:59
 msgid "You must be logged in to leave a group."
 msgstr "Du må være innlogga for å melde deg ut av ei gruppe."
 
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
-#: actions/leavegroup.php:103 lib/command.php:398
 msgid "You are not a member of that group."
 msgstr "Du er ikkje medlem av den gruppa."
 
 #. TRANS: Title for leave group page after leaving.
-#: actions/leavegroup.php:142
 #, fuzzy, php-format
 msgctxt "TITLE"
 msgid "%1$s left group %2$s"
 msgstr "%1$s sin status på %2$s"
 
 #. TRANS: User admin panel title
-#: actions/licenseadminpanel.php:55
 msgctxt "TITLE"
 msgid "License"
 msgstr ""
 
-#: actions/licenseadminpanel.php:65
+#. TRANS: Form instructions for the site license admin panel.
 msgid "License for this StatusNet site"
 msgstr ""
 
-#: actions/licenseadminpanel.php:134
+#. TRANS: Client error displayed selecting an invalid license in the license admin panel.
 msgid "Invalid license selection."
 msgstr ""
 
-#: actions/licenseadminpanel.php:144
+#. TRANS: Client error displayed when not specifying an owner for the all rights reserved license in the license admin panel.
 msgid ""
 "You must specify the owner of the content when using the All Rights Reserved "
 "license."
 msgstr ""
 
-#: actions/licenseadminpanel.php:151
+#. TRANS: Client error displayed selecting a too long license title in the license admin panel.
 #, fuzzy
 msgid "Invalid license title. Maximum length is 255 characters."
 msgstr "Plassering er for lang (maksimalt 255 teikn)."
 
-#: actions/licenseadminpanel.php:163
+#. TRANS: Client error displayed specifying an invalid license URL in the license admin panel.
 msgid "Invalid license URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:166
+#. TRANS: Client error displayed specifying an invalid license image URL in the license admin panel.
 msgid "Invalid license image URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:174
+#. TRANS: Client error displayed specifying an invalid license URL in the license admin panel.
 msgid "License URL must be blank or a valid URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:182
+#. TRANS: Client error displayed specifying an invalid license image URL in the license admin panel.
 msgid "License image must be blank or valid URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:232
+#. TRANS: Form legend in the license admin panel.
 msgid "License selection"
 msgstr ""
 
-#: actions/licenseadminpanel.php:238
+#. TRANS: License option in the license admin panel.
 #, fuzzy
 msgid "Private"
 msgstr "Personvern"
 
-#: actions/licenseadminpanel.php:239
+#. TRANS: License option in the license admin panel.
 msgid "All Rights Reserved"
 msgstr ""
 
-#: actions/licenseadminpanel.php:240
+#. TRANS: License option in the license admin panel.
 msgid "Creative Commons"
 msgstr ""
 
-#: actions/licenseadminpanel.php:245
+#. TRANS: Dropdown field label in the license admin panel.
 msgid "Type"
 msgstr ""
 
-#: actions/licenseadminpanel.php:247
-msgid "Select license"
-msgstr ""
+#. TRANS: Dropdown field instructions in the license admin panel.
+#, fuzzy
+msgid "Select a license."
+msgstr "Velg ein tilbydar"
 
-#: actions/licenseadminpanel.php:261
+#. TRANS: Form legend in the license admin panel.
 msgid "License details"
 msgstr ""
 
-#: actions/licenseadminpanel.php:267
+#. TRANS: Field label in the license admin panel.
 msgid "Owner"
 msgstr ""
 
-#: actions/licenseadminpanel.php:268
+#. TRANS: Field title in the license admin panel.
 msgid "Name of the owner of the site's content (if applicable)."
 msgstr ""
 
-#: actions/licenseadminpanel.php:276
+#. TRANS: Field label in the license admin panel.
 msgid "License Title"
 msgstr ""
 
-#: actions/licenseadminpanel.php:277
+#. TRANS: Field title in the license admin panel.
 msgid "The title of the license."
 msgstr ""
 
-#: actions/licenseadminpanel.php:285
+#. TRANS: Field label in the license admin panel.
 msgid "License URL"
 msgstr ""
 
-#: actions/licenseadminpanel.php:286
+#. TRANS: Field title in the license admin panel.
 msgid "URL for more information about the license."
 msgstr ""
 
-#: actions/licenseadminpanel.php:293
+#. TRANS: Field label in the license admin panel.
 msgid "License Image URL"
 msgstr ""
 
-#: actions/licenseadminpanel.php:294
+#. TRANS: Field title in the license admin panel.
 msgid "URL for an image to display with the license."
 msgstr ""
 
-#. TRANS: Submit button title.
-#: actions/licenseadminpanel.php:311 actions/sessionsadminpanel.php:199
-#: actions/siteadminpanel.php:292 actions/snapshotadminpanel.php:245
-#: actions/tagother.php:133 lib/applicationeditform.php:357
-msgid "Save"
-msgstr "Lagra"
-
-#: actions/licenseadminpanel.php:311
-msgid "Save license settings"
-msgstr ""
+#. TRANS: Button title in the license admin panel.
+#, fuzzy
+msgid "Save license settings."
+msgstr "Avatar-innstillingar"
 
+#. TRANS: Client error displayed when trying to log in while already logged in.
 #. TRANS: Client error displayed trying to use "one time password login" when already logged in.
-#: actions/login.php:97 actions/otp.php:62 actions/register.php:130
 msgid "Already logged in."
 msgstr "Allereie logga inn."
 
-#: actions/login.php:125
+#. TRANS: Form validation error displayed when trying to log in with incorrect credentials.
 msgid "Incorrect username or password."
 msgstr "Feil brukarnamn eller passord."
 
+#. TRANS: Server error displayed when during login a server error occurs.
 #. TRANS: Server error displayed when a user object could not be created trying to login using "one time password login".
-#: actions/login.php:131 actions/otp.php:127
 #, fuzzy
 msgid "Error setting user. You are probably not authorized."
 msgstr "Ikkje autorisert."
 
-#: actions/login.php:185 actions/login.php:236 lib/action.php:598
+#. TRANS: Page title for login page.
 msgid "Login"
 msgstr "Logg inn"
 
-#: actions/login.php:222
+#. TRANS: Form legend on login page.
 msgid "Login to site"
 msgstr "Logg inn "
 
-#: actions/login.php:231 actions/register.php:469
+#. TRANS: Checkbox label label on login page.
 msgid "Remember me"
 msgstr "Hugs meg"
 
-#: actions/login.php:232 actions/register.php:471
+#. TRANS: Checkbox title on login page.
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "Logg inn automatisk i framtidi (ikkje for delte maskiner)."
 
-#: actions/login.php:241
+#. TRANS: Button text for log in on login page.
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Login"
+msgstr "Logg inn"
+
+#. TRANS: Link text for link to "reset password" on login page.
 msgid "Lost or forgotten password?"
 msgstr "Mista eller gløymd passord?"
 
-#: actions/login.php:259
+#. TRANS: Form instructions on login page before being able to change user settings.
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -3795,12 +3110,13 @@ msgstr ""
 "Skriv inn brukarnam og passord før du endrar innstillingar (av "
 "tryggleiksomsyn)."
 
-#: actions/login.php:263
+#. TRANS: Form instructions on login page.
 #, fuzzy
 msgid "Login with your username and password."
 msgstr "Log inn med brukarnamn og passord."
 
-#: actions/login.php:266
+#. TRANS: Form instructions on login page. This message contains Markdown links in the form [Link text](Link).
+#. TRANS: %%action.register%% is a link to the registration page.
 #, fuzzy, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -3809,135 +3125,130 @@ msgstr ""
 "%action.register%%) ein ny konto, eller prøv [OpenID](%%action.openidlogin%"
 "%)."
 
-#: actions/makeadmin.php:92
+#. TRANS: Client error displayed when trying to make another user admin on the Make Admin page while not an admin.
 msgid "Only an admin can make another user an admin."
 msgstr ""
 
-#: actions/makeadmin.php:96
+#. TRANS: Client error displayed when trying to make another user admin on the Make Admin page who already is admin.
+#. TRANS: %1$s is the user that is already admin, %2$s is the group user is already admin for.
 #, fuzzy, php-format
 msgid "%1$s is already an admin for group \"%2$s\"."
 msgstr "Brukar har blokkert deg."
 
-#: actions/makeadmin.php:133
+#. TRANS: Server error displayed when trying to make another user admin on the Make Admin page fails
+#. TRANS: because the group membership record could not be gotten.
+#. TRANS: %1$s is the to be admin user, %2$s is the group user should be admin for.
 #, fuzzy, php-format
 msgid "Can't get membership record for %1$s in group %2$s."
 msgstr "Kunne ikkje fjerne %s fra %s gruppa "
 
-#: actions/makeadmin.php:146
+#. TRANS: Server error displayed when trying to make another user admin on the Make Admin page fails
+#. TRANS: because the group adminship record coud not be saved properly.
+#. TRANS: %1$s is the to be admin user, %2$s is the group user is already admin for.
 #, fuzzy, php-format
 msgid "Can't make %1$s an admin for group %2$s."
 msgstr "Du må være administrator for å redigere gruppa"
 
-#: actions/microsummary.php:69
+#. TRANS: Client error displayed trying to make a micro summary without providing a status.
 #, fuzzy
 msgid "No current status."
 msgstr "Ingen status"
 
 #. TRANS: This is the title of the form for adding a new application.
-#: actions/newapplication.php:52
 #, fuzzy
 msgid "New application"
 msgstr "Denne notisen finst ikkje."
 
 #. TRANS: Client error displayed trying to add a new application while not logged in.
-#: actions/newapplication.php:64
 #, fuzzy
 msgid "You must be logged in to register an application."
 msgstr "Du må være logga inn for å lage ei gruppe."
 
 #. TRANS: Form instructions for registering a new application.
-#: actions/newapplication.php:147
 #, fuzzy
 msgid "Use this form to register a new application."
 msgstr "Bruk dette skjemaet for å lage ein ny gruppe."
 
 #. TRANS: Validation error shown when not providing a source URL in the "New application" form.
-#: actions/newapplication.php:189
 msgid "Source URL is required."
 msgstr ""
 
 #. TRANS: Server error displayed when an application could not be registered in the database through the "New application" form.
-#: actions/newapplication.php:279 actions/newapplication.php:289
 #, fuzzy
 msgid "Could not create application."
 msgstr "Kunne ikkje lagre favoritt."
 
 #. TRANS: Title for form to create a group.
-#: actions/newgroup.php:53
 msgid "New group"
 msgstr "Ny gruppe"
 
 #. TRANS: Client exception thrown when a user tries to create a group while banned.
-#: actions/newgroup.php:73 classes/User_group.php:485
 #, fuzzy
 msgid "You are not allowed to create groups on this site."
 msgstr "Du er ikkje medlem av den gruppa."
 
 #. TRANS: Form instructions for group create form.
-#: actions/newgroup.php:117
 msgid "Use this form to create a new group."
 msgstr "Bruk dette skjemaet for å lage ein ny gruppe."
 
-#. TRANS: Group create form validation error.
-#: actions/newgroup.php:200
-msgid "Alias cannot be the same as nickname."
-msgstr ""
-
-#: actions/newmessage.php:71 actions/newmessage.php:234
+#. TRANS: Page title for new direct message page.
+#. TRANS: Page title on page for sending a direct message.
 msgid "New message"
 msgstr "Ny melding"
 
-#. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
-#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:513
-msgid "You can't send a message to this user."
+#. TRANS: Client error displayed trying to send a direct message to a user while sender and
+#. TRANS: receiver are not subscribed to each other.
+#, fuzzy
+msgid "You cannot send a message to this user."
 msgstr "Du kan ikkje sende melding til denne brukaren."
 
+#. TRANS: Form validator error displayed trying to send a direct message without content.
+#. TRANS: Client error displayed trying to send a notice without content.
 #. TRANS: Command exception text shown when trying to send a direct message to another user without content.
 #. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
-#: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:490
-#: lib/command.php:593
 msgid "No content!"
 msgstr "Ingen innhald."
 
-#: actions/newmessage.php:161
+#. TRANS: Form validation error displayed trying to send a direct message without specifying a recipient.
 msgid "No recipient specified."
 msgstr "Ingen mottakar spesifisert."
 
+#. TRANS: Client error displayed trying to send a direct message to self.
 #. TRANS: Error text shown when trying to send a direct message to self.
-#: actions/newmessage.php:167 lib/command.php:517
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
 "Ikkje send ei melding til deg sjølv; berre sei det til deg sjølv stille og "
 "fredleg."
 
-#: actions/newmessage.php:184
+#. TRANS: Page title after sending a direct message.
 #, fuzzy
 msgid "Message sent"
 msgstr "Melding"
 
+#. TRANS: Confirmation text after sending a direct message.
+#. TRANS: %s is the direct message recipient.
 #. TRANS: Message given have sent a direct message to another user.
 #. TRANS: %s is the name of the other user.
-#: actions/newmessage.php:188 lib/command.php:525
 #, fuzzy, php-format
 msgid "Direct message to %s sent."
 msgstr "Direkte melding til %s sendt"
 
-#: actions/newmessage.php:213 actions/newnotice.php:264
+#. TRANS: Page title after an AJAX error occurred on the "send direct message" page.
+#. TRANS: Page title after an AJAX error occurs on the send notice page.
 msgid "Ajax Error"
 msgstr "Ajax feil"
 
-#: actions/newnotice.php:69
+#. TRANS: Page title for sending a new notice.
 msgid "New notice"
 msgstr "Ny notis"
 
-#: actions/newnotice.php:230
+#. TRANS: Page title after sending a notice.
 msgid "Notice posted"
 msgstr "Melding lagra"
 
 #. TRANS: Instructions for Notice search page.
 #. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/noticesearch.php:69
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -3947,20 +3258,17 @@ msgstr ""
 "dei må være minimum 3 bokstavar eller meir."
 
 #. TRANS: Title of the page where users can search for notices.
-#: actions/noticesearch.php:80
 msgid "Text search"
 msgstr "Tekstsøk"
 
 #. TRANS: Test in RSS notice search.
 #. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearch.php:95
 #, php-format
 msgid "Search results for \"%1$s\" on %2$s"
 msgstr "Melding fra %1$s på %2$s"
 
 #. TRANS: Text for logged in users making a query for notices without results.
 #. TRANS: This message contains a Markdown link.
-#: actions/noticesearch.php:128
 #, php-format
 msgid ""
 "Be the first to [post on this topic](%%%%action.newnotice%%%%?"
@@ -3969,7 +3277,6 @@ msgstr ""
 
 #. TRANS: Text for not logged in users making a query for notices without results.
 #. TRANS: This message contains Markdown links.
-#: actions/noticesearch.php:133
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and be the first to "
@@ -3977,19 +3284,17 @@ msgid ""
 msgstr ""
 
 #. TRANS: RSS notice search feed title. %s is the query.
-#: actions/noticesearchrss.php:95
 #, fuzzy, php-format
 msgid "Updates with \"%s\""
 msgstr "Oppdateringar frå %1$s på %2$s!"
 
 #. TRANS: RSS notice search feed description.
 #. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearchrss.php:99
 #, fuzzy, php-format
 msgid "Updates matching search term \"%1$s\" on %2$s."
 msgstr "Oppdateringar frå %1$s på %2$s!"
 
-#: actions/nudge.php:85
+#. TRANS: Client error displayed trying to nudge a user that cannot be nudged.
 #, fuzzy
 msgid ""
 "This user doesn't allow nudges or hasn't confirmed or set their email "
@@ -3998,62 +3303,53 @@ msgstr ""
 "Denne brukaren tillét ikkje å bli dytta, eller har ikkje stadfasta eller sat "
 "e-postadressa si enno."
 
-#: actions/nudge.php:94
+#. TRANS: Page title after sending a nudge.
 msgid "Nudge sent"
 msgstr "Dytta!"
 
-#: actions/nudge.php:97
+#. TRANS: Confirmation text after sending a nudge.
 msgid "Nudge sent!"
 msgstr "Dytta!"
 
 #. TRANS: Message displayed to an anonymous user trying to view OAuth application list.
-#: actions/oauthappssettings.php:57
 msgid "You must be logged in to list your applications."
 msgstr "Du må være logga inn for å bli med i ei gruppe."
 
 #. TRANS: Page title for OAuth applications
-#: actions/oauthappssettings.php:73
 #, fuzzy
 msgid "OAuth applications"
 msgstr "Andre val"
 
 #. TRANS: Page instructions for OAuth applications
-#: actions/oauthappssettings.php:85
 msgid "Applications you have registered"
 msgstr ""
 
 #. TRANS: Empty list message on page with OAuth applications.
-#: actions/oauthappssettings.php:138
 #, php-format
 msgid "You have not registered any applications yet."
 msgstr ""
 
 #. TRANS: Title for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:69
 msgid "Connected applications"
 msgstr ""
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:80
 msgid "The following connections exist for your account."
 msgstr ""
 
 #. TRANS: Client error when trying to revoke access for an application while not being a user of it.
-#: actions/oauthconnectionssettings.php:165
 #, fuzzy
 msgid "You are not a user of that application."
 msgstr "Du er ikkje medlem av den gruppa."
 
 #. TRANS: Client error when revoking access has failed for some reason.
 #. TRANS: %s is the application ID revoking access failed for.
-#: actions/oauthconnectionssettings.php:180
 #, fuzzy, php-format
 msgid "Unable to revoke access for application: %s."
 msgstr "Bruk dette skjemaet for å redigere gruppa"
 
 #. TRANS: Success message after revoking access for an application.
 #. TRANS: %1$s is the application name, %2$s is the first part of the user token.
-#: actions/oauthconnectionssettings.php:199
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -4061,478 +3357,395 @@ msgid ""
 msgstr ""
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:210
 msgid "You have not authorized any applications to use your account."
 msgstr ""
 
 #. TRANS: Note for developers in the OAuth connection settings form.
 #. TRANS: This message contains a Markdown link. Do not separate "](".
 #. TRANS: %s is the URL to the OAuth settings.
-#: actions/oauthconnectionssettings.php:230
 #, php-format
 msgid ""
 "Are you a developer? [Register an OAuth client application](%s) to use with "
 "this instance of StatusNet."
 msgstr ""
 
-#: actions/oembed.php:64
+#. TRANS: Server error displayed in oEmbed action when path not found.
+#. TRANS: %s is a path.
 #, fuzzy, php-format
 msgid "\"%s\" not found."
 msgstr "Fann ikkje API-metode."
 
-#: actions/oembed.php:76
+#. TRANS: Server error displayed in oEmbed action when notice not found.
+#. TRANS: %s is a notice.
 #, fuzzy, php-format
 msgid "Notice %s not found."
 msgstr "Fann ikkje API-metode."
 
-#: actions/oembed.php:80 actions/shownotice.php:100
+#. TRANS: Server error displayed in oEmbed action when notice has not profile.
 msgid "Notice has no profile."
 msgstr "Brukaren har inga profil."
 
-#: actions/oembed.php:83 actions/shownotice.php:172
+#. TRANS: oEmbed title. %1$s is the author name, %2$s is the creation date.
 #, php-format
 msgid "%1$s's status on %2$s"
 msgstr "%1$s sin status på %2$s"
 
-#: actions/oembed.php:95
+#. TRANS: Server error displayed in oEmbed action when attachment not found.
+#. TRANS: %d is an attachment ID.
 #, fuzzy, php-format
 msgid "Attachment %s not found."
 msgstr "Kunne ikkje finne mottakar."
 
-#: actions/oembed.php:136
+#. TRANS: Server error displayed in oEmbed request when a path is not supported.
+#. TRANS: %s is a path.
 #, php-format
 msgid "\"%s\" not supported for oembed requests."
 msgstr ""
 
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
-#: actions/oembed.php:168
 #, fuzzy, php-format
 msgid "Content type %s not supported."
 msgstr "Kopla til"
 
 #. TRANS: Error message displaying attachments. %s is the site's base URL.
-#: actions/oembed.php:172
 #, php-format
 msgid "Only %s URLs over plain HTTP please."
 msgstr ""
 
+#. TRANS: Server error displayed in oEmbed action when request specifies an unsupported data format.
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1207
-#: lib/apiaction.php:1234 lib/apiaction.php:1369
 msgid "Not a supported data format."
 msgstr "Ikkje eit støtta dataformat."
 
 #. TRANS: ShortName in the OpenSearch interface when trying to find users.
-#: actions/opensearch.php:64
 msgid "People Search"
 msgstr "Søk etter folk"
 
-#: actions/opensearch.php:68
+#. TRANS: ShortName in the OpenSearch interface when trying to find notices.
 msgid "Notice Search"
 msgstr "Notissøk"
 
 #. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
-#: actions/otp.php:70
 #, fuzzy
 msgid "No user ID specified."
 msgstr "Ingen vald profil."
 
 #. TRANS: Client error displayed trying to use "one time password login" without specifying a login token.
-#: actions/otp.php:86
 #, fuzzy
 msgid "No login token specified."
 msgstr "Ingen vald profil."
 
 #. TRANS: Client error displayed trying to use "one time password login" without requesting a login token.
-#: actions/otp.php:94
 msgid "No login token requested."
 msgstr "Ingen autoriserings-spørjing!"
 
 #. TRANS: Client error displayed trying to use "one time password login" while specifying an invalid login token.
-#: actions/otp.php:100
 #, fuzzy
 msgid "Invalid login token specified."
 msgstr "Ugyldig notisinnhald"
 
 #. TRANS: Client error displayed trying to use "one time password login" while specifying an expired login token.
-#: actions/otp.php:110
 #, fuzzy
 msgid "Login token expired."
 msgstr "Logg inn "
 
 #. TRANS: Title for outbox for any but the fist page.
 #. TRANS: %1$s is the user nickname, %2$d is the page number.
-#: actions/outbox.php:57
 #, fuzzy, php-format
 msgid "Outbox for %1$s - page %2$d"
 msgstr "Utboks for %s"
 
 #. TRANS: Title for first page of outbox.
-#: actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
 msgstr "Utboks for %s"
 
 #. TRANS: Instructions for outbox.
-#: actions/outbox.php:103
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr "Dette er din utboks som syner alle private meldingar du har sendt."
 
-#: actions/passwordsettings.php:58
 msgid "Change password"
 msgstr "Endra passord"
 
-#: actions/passwordsettings.php:69
 msgid "Change your password."
 msgstr "Endra passordet ditt"
 
 #. TRANS: Fieldset legend for password reset form.
-#: actions/passwordsettings.php:96 actions/recoverpassword.php:251
 msgid "Password change"
 msgstr "Endra passord"
 
-#: actions/passwordsettings.php:104
 msgid "Old password"
 msgstr "Gamalt passord"
 
 #. TRANS: Field label for password reset form.
-#: actions/passwordsettings.php:108 actions/recoverpassword.php:256
 msgid "New password"
 msgstr "Nytt passord"
 
-#: actions/passwordsettings.php:109 actions/register.php:416
 #, fuzzy
 msgid "6 or more characters."
 msgstr "6 eller fleire teikn"
 
 #. TRANS: Ttile for field label for password reset form where the password has to be typed again.
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:264
-#: actions/register.php:420
 #, fuzzy
 msgid "Same as password above."
 msgstr "Samme passord som over"
 
-#: actions/passwordsettings.php:117
 msgid "Change"
 msgstr "Endra"
 
-#: actions/passwordsettings.php:153 actions/register.php:223
 msgid "Password must be 6 or more characters."
 msgstr "Passord må være minst 6 teikn."
 
-#: actions/passwordsettings.php:156 actions/register.php:226
 msgid "Passwords don't match."
 msgstr "Passorda var ikkje like."
 
-#: actions/passwordsettings.php:164
 msgid "Incorrect old password"
 msgstr "Det gamle passordet stemmer ikkje"
 
-#: actions/passwordsettings.php:180
 msgid "Error saving user; invalid."
 msgstr "Feil ved lagring av brukar; fungerer ikkje."
 
 #. TRANS: Reset password form validation error message.
-#: actions/passwordsettings.php:185 actions/recoverpassword.php:418
 #, fuzzy
 msgid "Cannot save new password."
 msgstr "Klarar ikkje lagra nytt passord."
 
-#: actions/passwordsettings.php:191
 msgid "Password saved."
 msgstr "Lagra passord."
 
 #. TRANS: Title for Paths admin panel.
 #. TRANS: Menu item for site administration
-#: actions/pathsadminpanel.php:58 lib/adminpanelaction.php:371
 msgid "Paths"
 msgstr ""
 
 #. TRANS: Form instructions for Path admin panel.
-#: actions/pathsadminpanel.php:69
 msgid "Path and server settings for this StatusNet site"
 msgstr ""
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the directory that could not be read from.
-#: actions/pathsadminpanel.php:155
 #, fuzzy, php-format
 msgid "Theme directory not readable: %s."
 msgstr "Denne sida er ikkje tilgjengleg i eit"
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the avatar directory that could not be written to.
-#: actions/pathsadminpanel.php:163
 #, fuzzy, php-format
 msgid "Avatar directory not writable: %s."
 msgstr "Denne sida er ikkje tilgjengleg i eit"
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the background directory that could not be written to.
-#: actions/pathsadminpanel.php:171
 #, fuzzy, php-format
 msgid "Background directory not writable: %s."
 msgstr "Denne sida er ikkje tilgjengleg i eit"
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the locales directory that could not be read from.
-#: actions/pathsadminpanel.php:181
 #, fuzzy, php-format
 msgid "Locales directory not readable: %s."
 msgstr "Denne sida er ikkje tilgjengleg i eit"
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the SSL server URL that is too long.
-#: actions/pathsadminpanel.php:189
 msgid "Invalid SSL server. The maximum length is 255 characters."
 msgstr ""
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:235 actions/siteadminpanel.php:58
 #, fuzzy
 msgid "Site"
 msgstr "Invitér"
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:241 actions/pathsadminpanel.php:279
-#: actions/pathsadminpanel.php:370 actions/pathsadminpanel.php:425
 msgid "Server"
 msgstr "Tenar"
 
-#: actions/pathsadminpanel.php:242
 msgid "Site's server hostname."
 msgstr ""
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:248 actions/pathsadminpanel.php:288
-#: actions/pathsadminpanel.php:379 actions/pathsadminpanel.php:434
 msgid "Path"
 msgstr ""
 
-#: actions/pathsadminpanel.php:249
 #, fuzzy
 msgid "Site path."
 msgstr "Statusmelding"
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:255
 #, fuzzy
 msgid "Locale directory"
 msgstr "Lasta opp brukarbilete."
 
-#: actions/pathsadminpanel.php:256
 msgid "Directory path to locales."
 msgstr ""
 
 #. TRANS: Checkbox label in Paths admin panel.
-#: actions/pathsadminpanel.php:263
 msgid "Fancy URLs"
 msgstr ""
 
-#: actions/pathsadminpanel.php:265
 msgid "Use fancy (more readable and memorable) URLs?"
 msgstr ""
 
-#: actions/pathsadminpanel.php:272
 msgid "Theme"
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:281
 #, fuzzy
 msgid "Server for themes."
 msgstr "Logg ut or sida"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:290
 msgid "Web path to themes."
 msgstr ""
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:297 actions/pathsadminpanel.php:388
-#: actions/pathsadminpanel.php:443 actions/pathsadminpanel.php:495
 msgid "SSL server"
 msgstr "Tenar"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:299
 msgid "SSL server for themes (default: SSL server)."
 msgstr ""
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:306 actions/pathsadminpanel.php:397
-#: actions/pathsadminpanel.php:452
 #, fuzzy
 msgid "SSL path"
 msgstr "Statusmelding"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:308
 msgid "SSL path to themes (default: /theme/)."
 msgstr ""
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:315 actions/pathsadminpanel.php:406
-#: actions/pathsadminpanel.php:461
 #, fuzzy
 msgid "Directory"
 msgstr "Lasta opp brukarbilete."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:317
 msgid "Directory where themes are located."
 msgstr ""
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:326
 #, fuzzy
 msgid "Avatars"
 msgstr "Brukarbilete"
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:333
 #, fuzzy
 msgid "Avatar server"
 msgstr "Avatar-innstillingar"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:335
 #, fuzzy
 msgid "Server for avatars."
 msgstr "Logg ut or sida"
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:342
 #, fuzzy
 msgid "Avatar path"
 msgstr "Lasta opp brukarbilete."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:344
 #, fuzzy
 msgid "Web path to avatars."
 msgstr "Feil ved oppdatering av brukarbilete."
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:351
 #, fuzzy
 msgid "Avatar directory"
 msgstr "Lasta opp brukarbilete."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:353
 msgid "Directory where avatars are located."
 msgstr ""
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:364
 msgid "Backgrounds"
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:372
 #, fuzzy
 msgid "Server for backgrounds."
 msgstr "Logg ut or sida"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:381
 msgid "Web path to backgrounds."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:390
 msgid "Server for backgrounds on SSL pages."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:399
 msgid "Web path to backgrounds on SSL pages."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:408
 msgid "Directory where backgrounds are located."
 msgstr ""
 
 #. TRANS: Fieldset legens in Paths admin panel.
-#: actions/pathsadminpanel.php:419
 msgid "Attachments"
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:427
 #, fuzzy
 msgid "Server for attachments."
 msgstr "Logg ut or sida"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:436
 #, fuzzy
 msgid "Web path to attachments."
 msgstr "Slikt dokument finst ikkje."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:445
 #, fuzzy
 msgid "Server for attachments on SSL pages."
 msgstr "Logg ut or sida"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:454
 msgid "Web path to attachments on SSL pages."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:463
 msgid "Directory where attachments are located."
 msgstr ""
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:472
 #, fuzzy
 msgid "SSL"
 msgstr "SMS"
 
 #. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
-#: actions/pathsadminpanel.php:477 actions/snapshotadminpanel.php:202
 msgid "Never"
 msgstr "Tenar"
 
 #. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
-#: actions/pathsadminpanel.php:479
 #, fuzzy
 msgid "Sometimes"
 msgstr "Notisar"
 
 #. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
-#: actions/pathsadminpanel.php:481
 msgid "Always"
 msgstr ""
 
-#: actions/pathsadminpanel.php:485
 msgid "Use SSL"
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:487
 msgid "When to use SSL."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:497
 msgid "Server to direct SSL requests to."
 msgstr ""
 
 #. TRANS: Button title text to store form data in the Paths admin panel.
-#: actions/pathsadminpanel.php:514
 #, fuzzy
 msgid "Save paths"
 msgstr "Statusmelding"
 
 #. TRANS: Instructions for the "People search" page.
 #. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/peoplesearch.php:54
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
@@ -4542,57 +3755,46 @@ msgstr ""
 "nøkkelord med mellomrom; dei må være minimum 3 bokstavar eller meir."
 
 #. TRANS: Title of a page where users can search for other users.
-#: actions/peoplesearch.php:61
 msgid "People search"
 msgstr "Søk etter folk"
 
-#: actions/peopletag.php:68
 #, php-format
 msgid "Not a valid people tag: %s."
 msgstr "Ikkje ei gyldig epostadresse."
 
-#: actions/peopletag.php:142
 #, fuzzy, php-format
 msgid "Users self-tagged with %1$s - page %2$d"
 msgstr "Brukarar sjølv-merka med %s, side %d"
 
 #. TRANS: Page title for AJAX form return when a disabling a plugin.
-#: actions/plugindisable.php:69
 msgctxt "plugin"
 msgid "Disabled"
 msgstr ""
 
 #. TRANS: Client error displayed trying to perform any request method other than POST.
 #. TRANS: Do not translate POST.
-#: actions/pluginenable.php:78 actions/subscribe.php:77
 msgid "This action only accepts POST requests."
 msgstr ""
 
-#: actions/pluginenable.php:102
 #, fuzzy
 msgid "You cannot administer plugins."
 msgstr "Kan ikkje oppdatera brukar."
 
-#: actions/pluginenable.php:109
 #, fuzzy
 msgid "No such plugin."
 msgstr "Dette emneord finst ikkje."
 
 #. TRANS: Page title for AJAX form return when enabling a plugin.
-#: actions/pluginenable.php:159
 msgctxt "plugin"
 msgid "Enabled"
 msgstr ""
 
 #. TRANS: Tab and title for plugins admin panel.
 #. TRANS: Menu item for site administration
-#: actions/pluginsadminpanel.php:56 actions/version.php:191
-#: lib/adminpanelaction.php:411
 msgid "Plugins"
 msgstr ""
 
 #. TRANS: Instructions at top of plugin admin page.
-#: actions/pluginsadminpanel.php:68
 msgid ""
 "Additional plugins can be enabled and configured manually. See the <a href="
 "\"http://status.net/wiki/Plugins\">online plugin documentation</a> for more "
@@ -4600,32 +3802,26 @@ msgid ""
 msgstr ""
 
 #. TRANS: Admin form section header
-#: actions/pluginsadminpanel.php:84
 #, fuzzy
 msgid "Default plugins"
 msgstr "Foretrukke språk"
 
-#: actions/pluginsadminpanel.php:106
 msgid ""
 "All default plugins have been disabled from the site's configuration file."
 msgstr ""
 
-#: actions/postnotice.php:95
 msgid "Invalid notice content."
 msgstr "Ugyldig filnamn."
 
-#: actions/postnotice.php:101
 #, php-format
 msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’."
 msgstr ""
 
 #. TRANS: Page title for profile settings.
-#: actions/profilesettings.php:60
 msgid "Profile settings"
 msgstr "Profilinnstillingar"
 
 #. TRANS: Usage instructions for profile settings.
-#: actions/profilesettings.php:71
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
@@ -4633,32 +3829,25 @@ msgstr ""
 "deg."
 
 #. TRANS: Profile settings form legend.
-#: actions/profilesettings.php:99
 msgid "Profile information"
 msgstr "Profil informasjon"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:110 actions/register.php:412
 #, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr ""
 "1-64 små bokstavar eller tal, ingen punktum (og liknande) eller mellomrom"
 
 #. TRANS: Field label in form for profile settings.
-#: actions/profilesettings.php:114 actions/register.php:434
-#: lib/groupeditform.php:150
 msgid "Full name"
 msgstr "Fullt namn"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:119 actions/register.php:439
-#: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "Heimeside"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:122 actions/register.php:441
 #, fuzzy
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr "URL til heimesida di, bloggen din, eller ein profil på ei anna side."
@@ -4666,7 +3855,6 @@ msgstr "URL til heimesida di, bloggen din, eller ein profil på ei anna side."
 #. TRANS: Tooltip for field label in form for profile settings. Plural
 #. TRANS: is decided by the number of characters available for the
 #. TRANS: biography (%d).
-#: actions/profilesettings.php:130 actions/register.php:450
 #, fuzzy, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4674,42 +3862,32 @@ msgstr[0] "Skriv om deg og interessene dine med 140 teikn"
 msgstr[1] "Skriv om deg og interessene dine med 140 teikn"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:136 actions/register.php:455
 #, fuzzy
 msgid "Describe yourself and your interests"
 msgstr "Skildra deg sjølv og din"
 
 #. TRANS: Text area label in form for profile settings where users can provide.
 #. TRANS: their biography.
-#: actions/profilesettings.php:140 actions/register.php:457
 msgid "Bio"
 msgstr "Om meg"
 
 #. TRANS: Field label in form for profile settings.
-#: actions/profilesettings.php:146 actions/register.php:462
-#: lib/groupeditform.php:173
 msgid "Location"
 msgstr "Plassering"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:149
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Kvar er du, t.d. «By, Fylke (eller Region), Land»"
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:154
 msgid "Share my current location when posting notices"
 msgstr ""
 
 #. TRANS: Field label in form for profile settings.
-#: actions/profilesettings.php:162 actions/tagother.php:128
-#: actions/tagother.php:188 lib/subscriptionlist.php:104
-#: lib/subscriptionlist.php:106
 msgid "Tags"
 msgstr "Merkelappar"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:165
 #, fuzzy
 msgid ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- "
@@ -4719,28 +3897,23 @@ msgstr ""
 "mellomroms separert."
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:170
 msgid "Language"
 msgstr "Språk"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:172
 #, fuzzy
 msgid "Preferred language."
 msgstr "Foretrukke språk"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:182
 msgid "Timezone"
 msgstr "Tidssone"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:184
 msgid "What timezone are you normally in?"
 msgstr "Kva tidssone er du vanlegvis i?"
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:190
 #, fuzzy
 msgid ""
 "Automatically subscribe to whoever subscribes to me (best for non-humans)."
@@ -4750,7 +3923,6 @@ msgstr ""
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Plural form is used based on the maximum number of allowed
 #. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:259 actions/register.php:214
 #, fuzzy, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4758,105 +3930,86 @@ msgstr[0] "Plassering er for lang (maksimalt %d teikn)."
 msgstr[1] "Plassering er for lang (maksimalt %d teikn)."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:270 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr "Tidssone er ikkje valt."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:278
 #, fuzzy
 msgid "Language is too long (maximum 50 characters)."
 msgstr "Språk er for langt (maksimalt 50 teikn)."
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:292
 #, fuzzy, php-format
 msgid "Invalid tag: \"%s\"."
 msgstr "Ugyldig merkelapp: %s"
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:348
 #, fuzzy
 msgid "Could not update user for autosubscribe."
 msgstr "Kan ikkje oppdatera brukar for automatisk tinging."
 
 #. TRANS: Server error thrown when user profile location preference settings could not be updated.
-#: actions/profilesettings.php:406
 #, fuzzy
 msgid "Could not save location prefs."
 msgstr "Kan ikkje lagra merkelapp."
 
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:428 actions/tagother.php:179
 msgid "Could not save tags."
 msgstr "Kunne ikkje lagra emneord."
 
 #. TRANS: Confirmation shown when user profile settings are saved.
 #. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:437 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "Lagra innstillingar."
 
 #. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
 #. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:484 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "Opprett ei ny gruppe"
 
-#: actions/public.php:83
 #, php-format
 msgid "Beyond the page limit (%s)."
 msgstr ""
 
-#: actions/public.php:92
 msgid "Could not retrieve public stream."
 msgstr "Kan ikkje hente offentleg straum."
 
-#: actions/public.php:130
 #, php-format
 msgid "Public timeline, page %d"
 msgstr "Offentleg tidsline, side %d"
 
-#: actions/public.php:132 lib/publicgroupnav.php:79
 msgid "Public timeline"
 msgstr "Offentleg tidsline"
 
-#: actions/public.php:160
 #, fuzzy
 msgid "Public Stream Feed (RSS 1.0)"
 msgstr "Offentleg straum"
 
-#: actions/public.php:164
 #, fuzzy
 msgid "Public Stream Feed (RSS 2.0)"
 msgstr "Offentleg straum"
 
-#: actions/public.php:168
 #, fuzzy
 msgid "Public Stream Feed (Atom)"
 msgstr "Offentleg straum"
 
-#: actions/public.php:188
 #, php-format
 msgid ""
 "This is the public timeline for %%site.name%% but no one has posted anything "
 "yet."
 msgstr ""
 
-#: actions/public.php:191
 msgid "Be the first to post!"
 msgstr ""
 
-#: actions/public.php:195
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post!"
 msgstr ""
 
-#: actions/public.php:242
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -4865,7 +4018,6 @@ msgid ""
 "friends, family, and colleagues! ([Read more](%%doc.help%%))"
 msgstr ""
 
-#: actions/public.php:247
 #, fuzzy, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -4876,19 +4028,16 @@ msgstr ""
 "Micro-blogging)-teneste"
 
 #. TRANS: Public RSS feed description. %s is the StatusNet site name.
-#: actions/publicrss.php:106
 #, fuzzy, php-format
 msgid "%s updates from everyone."
 msgstr "%s oppdateringar frå alle saman!"
 
 #. TRANS: Title for public tag cloud.
-#: actions/publictagcloud.php:57
 msgid "Public tag cloud"
 msgstr "Offentleg emne sky"
 
 #. TRANS: Instructions (more used like an explanation/header).
 #. TRANS: %s is the StatusNet sitename.
-#: actions/publictagcloud.php:65
 #, fuzzy, php-format
 msgid "These are most popular recent tags on %s"
 msgstr "Dei mest populære emna på %s"
@@ -4896,14 +4045,12 @@ msgstr "Dei mest populære emna på %s"
 #. TRANS: This message contains a Markdown URL. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.
-#: actions/publictagcloud.php:74
 #, php-format
 msgid "No one has posted a notice with a [hashtag](%%doc.tags%%) yet."
 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.
-#: actions/publictagcloud.php:79
 msgid "Be the first to post one!"
 msgstr ""
 
@@ -4912,7 +4059,6 @@ msgstr ""
 #. TRANS: This message contains a Markdown URL. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.
-#: actions/publictagcloud.php:87
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post "
@@ -4920,42 +4066,34 @@ msgid ""
 msgstr ""
 
 #. TRANS: Client error displayed trying to recover password while already logged in.
-#: actions/recoverpassword.php:37
 msgid "You are already logged in!"
 msgstr "Du er allereie logga inn!"
 
 #. TRANS: Client error displayed when password recovery code is not correct.
-#: actions/recoverpassword.php:64
 msgid "No such recovery code."
 msgstr "Opprettingskoden finst ikkje."
 
 #. TRANS: Client error displayed when no proper password recovery code was submitted.
-#: actions/recoverpassword.php:69
 msgid "Not a recovery code."
 msgstr "Ikkje ei gjenopprettingskode."
 
 #. TRANS: Server error displayed trying to recover password without providing a user.
-#: actions/recoverpassword.php:77
 msgid "Recovery code for unknown user."
 msgstr "Hent fram passord for ukjend brukar."
 
 #. TRANS: Server error displayed removing a password recovery code from the database.
-#: actions/recoverpassword.php:91
 msgid "Error with confirmation code."
 msgstr "Feil med stadfestingskode."
 
 #. TRANS: Client error displayed trying to recover password with too old a recovery code.
-#: actions/recoverpassword.php:103
 msgid "This confirmation code is too old. Please start again."
 msgstr "Denne godkjenningskoden er for gammal. Vennligst start på nytt."
 
 #. TRANS: Server error displayed when updating a user's e-mail address in the database fails while recovering a password.
-#: actions/recoverpassword.php:118
 msgid "Could not update user with confirmed email address."
 msgstr "Kunne ikkje oppdatera brukar med stadfesta e-postadresse."
 
 #. TRANS: Page notice for password recovery page.
-#: actions/recoverpassword.php:160
 #, fuzzy
 msgid ""
 "If you have forgotten or lost your password, you can get a new one sent to "
@@ -4964,102 +4102,84 @@ msgstr ""
 "Instruksjonar for å få att passordet ditt er send til epostadressa som er "
 "lagra i kontoen din."
 
-#: actions/recoverpassword.php:167
 msgid "You have been identified. Enter a new password below."
 msgstr ""
 
 #. TRANS: Fieldset legend for password recovery page.
-#: actions/recoverpassword.php:198
 #, fuzzy
 msgid "Password recovery"
 msgstr "Passord opphenting etterspurt"
 
 #. TRANS: Field label on password recovery page.
-#: actions/recoverpassword.php:202
 #, fuzzy
 msgid "Nickname or email address"
 msgstr "Skriv inn kallenamn eller epostadresse."
 
 #. TRANS: Title for field label on password recovery page.
-#: actions/recoverpassword.php:205
 msgid "Your nickname on this server, or your registered email address."
 msgstr "Ditt kallenamn på denne servere, eller din registrerte epost addresse."
 
 #. TRANS: Field label on password recovery page.
-#: actions/recoverpassword.php:212
 msgid "Recover"
 msgstr "Gjenopprett"
 
 #. TRANS: Button text on password recovery page.
-#: actions/recoverpassword.php:214
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Recover"
 msgstr "Gjenopprett"
 
 #. TRANS: Title for password recovery page in password reset mode.
-#: actions/recoverpassword.php:223
 msgid "Reset password"
 msgstr "Tilbakestill passord"
 
 #. TRANS: Title for password recovery page in password recover mode.
-#: actions/recoverpassword.php:225
 msgid "Recover password"
 msgstr "Hent fram passord"
 
 #. TRANS: Title for password recovery page in email sent mode.
 #. TRANS: Subject for password recovery e-mail.
-#: actions/recoverpassword.php:227 actions/recoverpassword.php:366
 msgid "Password recovery requested"
 msgstr "Passord opphenting etterspurt"
 
 #. TRANS: Title for password recovery page in password saved mode.
-#: actions/recoverpassword.php:229
 #, fuzzy
 msgid "Password saved"
 msgstr "Lagra passord."
 
 #. TRANS: Title for password recovery page when an unknown action has been specified.
-#: actions/recoverpassword.php:232
 msgid "Unknown action"
 msgstr "Uventa handling."
 
 #. TRANS: Title for field label for password reset form.
-#: actions/recoverpassword.php:258
 #, fuzzy
 msgid "6 or more characters, and do not forget it!"
 msgstr "6 eller fleire teikn, og ikkje gløym dei."
 
 #. TRANS: Button text for password reset form.
 #. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: actions/recoverpassword.php:268 lib/designform.php:145
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Reset"
 msgstr "Avbryt"
 
 #. TRANS: Form instructions for password recovery form.
-#: actions/recoverpassword.php:278
 msgid "Enter a nickname or email address."
 msgstr "Skriv inn kallenamn eller epostadresse."
 
 #. TRANS: Information on password recovery form if no known username or e-mail address was specified.
-#: actions/recoverpassword.php:309
 msgid "No user with that email address or username."
 msgstr "Ingen brukar med den epostadressa eller det brukarnamnet."
 
 #. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
-#: actions/recoverpassword.php:327
 msgid "No registered email address for that user."
 msgstr "Ingen registrert epostadresse for den brukaren."
 
 #. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
-#: actions/recoverpassword.php:342
 msgid "Error saving address confirmation."
 msgstr "Feil med lagring av adressestadfesting."
 
 #. TRANS: User notification after an e-mail with instructions was sent from the password recovery form.
-#: actions/recoverpassword.php:370
 msgid ""
 "Instructions for recovering your password have been sent to the email "
 "address registered to your account."
@@ -5068,124 +4188,98 @@ msgstr ""
 "lagra i kontoen din."
 
 #. TRANS: Client error displayed when trying to reset as password without providing a user.
-#: actions/recoverpassword.php:391
 msgid "Unexpected password reset."
 msgstr "Uventa passordnullstilling."
 
 #. TRANS: Reset password form validation error message.
-#: actions/recoverpassword.php:400
 msgid "Password must be 6 characters or more."
 msgstr "Passord må vera 6 tekn eller meir."
 
 #. TRANS: Reset password form validation error message.
-#: actions/recoverpassword.php:405
 msgid "Password and confirmation do not match."
 msgstr "Passord og stadfesting stemmer ikkje."
 
 #. TRANS: Server error displayed when something does wrong with the user object during password reset.
-#: actions/recoverpassword.php:426 actions/register.php:241
 msgid "Error setting user."
 msgstr "Feil ved å setja brukar."
 
 #. TRANS: Success message for user after password reset.
-#: actions/recoverpassword.php:434
 msgid "New password successfully saved. You are now logged in."
 msgstr "Lagra det nye passordet. Du er logga inn."
 
-#: actions/redirecturl.php:70
 #, fuzzy
 msgid "No id parameter"
 msgstr "Manglar argumentet ID."
 
-#: actions/redirecturl.php:76
 #, fuzzy, php-format
 msgid "No such file \"%d\""
 msgstr "Denne notisen finst ikkje."
 
-#: actions/register.php:80 actions/register.php:181 actions/register.php:392
 msgid "Sorry, only invited people can register."
 msgstr "Beklage, men kun inviterte kan registrere seg."
 
-#: actions/register.php:87
 #, fuzzy
 msgid "Sorry, invalid invitation code."
 msgstr "Feil med stadfestingskode."
 
-#: actions/register.php:106
 msgid "Registration successful"
 msgstr "Registreringa gikk bra"
 
-#: actions/register.php:108 actions/register.php:490
 msgid "Register"
 msgstr "Registrér"
 
-#: actions/register.php:128
 msgid "Registration not allowed."
 msgstr "Registrering ikkje tillatt."
 
-#: actions/register.php:194
 #, fuzzy
 msgid "You cannot register if you don't agree to the license."
 msgstr "Du kan ikkje registrera deg om du ikkje godtek vilkåra i lisensen."
 
-#: actions/register.php:203
 msgid "Email address already exists."
 msgstr "Epostadressa finst allereie."
 
-#: actions/register.php:236 actions/register.php:258
 msgid "Invalid username or password."
 msgstr "Ugyldig brukarnamn eller passord."
 
-#: actions/register.php:333
 msgid ""
 "With this form you can create a new account. You can then post notices and "
 "link up to friends and colleagues."
 msgstr ""
 
-#: actions/register.php:424 actions/register.php:428
-#: actions/siteadminpanel.php:238 lib/settingsnav.php:92
 msgid "Email"
 msgstr "Epost"
 
-#: actions/register.php:425 actions/register.php:429
 #, fuzzy
 msgid "Used only for updates, announcements, and password recovery."
 msgstr ""
 "Blir berre brukt for uppdateringar, viktige meldingar og for gløymde passord"
 
-#: actions/register.php:436
 #, fuzzy
 msgid "Longer name, preferably your \"real\" name."
 msgstr "Lengre namn, fortrinnsvis ditt «ekte» namn"
 
-#: actions/register.php:464
 #, fuzzy
 msgid "Where you are, like \"City, State (or Region), Country\"."
 msgstr "Kvar er du, t.d. «By, Fylke (eller Region), Land»"
 
-#: actions/register.php:503
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
 msgstr ""
 
-#: actions/register.php:513
 #, php-format
 msgid "My text and files are copyright by %1$s."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:517
 msgid "My text and files remain under my own copyright."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:520
 msgid "All rights reserved."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:525
 #, fuzzy, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -5194,7 +4288,6 @@ msgstr ""
 " unnateke privatdata: passord, epostadresse, ljonmeldingsadresse og "
 "telefonnummer."
 
-#: actions/register.php:566
 #, fuzzy, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -5226,7 +4319,6 @@ msgstr ""
 "\n"
 "Takk for at du blei med, og vi håpar du vil lika tenesta!"
 
-#: actions/register.php:590
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5234,7 +4326,6 @@ msgstr ""
 "(Du mottek ein epost med instruksjonar på korleis du stadfester epostadressa "
 "di)"
 
-#: actions/remotesubscribe.php:97
 #, php-format
 msgid ""
 "To subscribe, you can [login](%%action.login%%), or [register](%%action."
@@ -5246,130 +4337,103 @@ msgstr ""
 "[kompatibel mikrobloggingside](%%doc.openmublog%%), kann du oppgje URLen til "
 "profilen under."
 
-#: actions/remotesubscribe.php:111
 msgid "Remote subscribe"
 msgstr "Eksternt abbonement"
 
-#: actions/remotesubscribe.php:123
 #, fuzzy
 msgid "Subscribe to a remote user"
 msgstr "Lagre tinging for brukar: %s"
 
-#: actions/remotesubscribe.php:128
 msgid "User nickname"
 msgstr "Brukaren sitt kallenamn"
 
-#: actions/remotesubscribe.php:129
 #, fuzzy
 msgid "Nickname of the user you want to follow."
 msgstr "Kallenamnet til brukaren du vil fylgja"
 
-#: actions/remotesubscribe.php:132
 msgid "Profile URL"
 msgstr "Profil-adresse"
 
-#: actions/remotesubscribe.php:133
 #, fuzzy
 msgid "URL of your profile on another compatible microblogging service."
 msgstr "URL til profilsida di på ei anna kompatibel mikrobloggingteneste."
 
 #. TRANS: Link text for link that will subscribe to a remote profile.
-#: actions/remotesubscribe.php:136 lib/subscribeform.php:139
-#: lib/userprofile.php:402
 msgid "Subscribe"
 msgstr "Ting"
 
-#: actions/remotesubscribe.php:158
 #, fuzzy
 msgid "Invalid profile URL (bad format)."
 msgstr "Ugyldig profil-nettadresse (feil format)"
 
-#: actions/remotesubscribe.php:167
 #, fuzzy
 msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
 msgstr "Ikkje ein brukande profil-netadresse (ingen YADIS-dokument)."
 
-#: actions/remotesubscribe.php:175
 #, fuzzy
 msgid "That is a local profile! Login to subscribe."
 msgstr "Det er ikkje ein lokal profil! Log inn for å tinge."
 
-#: actions/remotesubscribe.php:182
 #, fuzzy
 msgid "Could not get a request token."
 msgstr "Fekk ikkje spørjingsbillett (request token)."
 
-#: actions/repeat.php:56
 #, fuzzy
 msgid "Only logged-in users can repeat notices."
 msgstr "Kun brukaren kan lese sine eigne meldingar."
 
-#: actions/repeat.php:63 actions/repeat.php:70
 #, fuzzy
 msgid "No notice specified."
 msgstr "Ingen vald profil."
 
-#: actions/repeat.php:75
 #, fuzzy
 msgid "You cannot repeat your own notice."
 msgstr "Du kan ikkje registrera deg om du ikkje godtek vilkåra i lisensen."
 
-#: actions/repeat.php:89
 #, fuzzy
 msgid "You already repeated that notice."
 msgstr "Du har allereie blokkert denne brukaren."
 
-#: actions/repeat.php:112 lib/noticelist.php:697
 msgid "Repeated"
 msgstr "Framheva"
 
-#: actions/repeat.php:117
 #, fuzzy
 msgid "Repeated!"
 msgstr "Lag"
 
 #. TRANS: RSS reply feed title. %s is a user nickname.
-#: actions/replies.php:126 actions/repliesrss.php:68
-#: lib/personalgroupnav.php:105
 #, php-format
 msgid "Replies to %s"
 msgstr "Svar til %s"
 
-#: actions/replies.php:128
 #, php-format
 msgid "Replies to %1$s, page %2$d"
 msgstr "Svar til %s"
 
-#: actions/replies.php:145
 #, fuzzy, php-format
 msgid "Replies feed for %s (RSS 1.0)"
 msgstr "Notisstraum for %s"
 
-#: actions/replies.php:152
 #, fuzzy, php-format
 msgid "Replies feed for %s (RSS 2.0)"
 msgstr "Notisstraum for %s"
 
-#: actions/replies.php:159
 #, php-format
 msgid "Replies feed for %s (Atom)"
 msgstr "Notisstraum for %s"
 
-#: actions/replies.php:199
 #, php-format
 msgid ""
 "This is the timeline showing replies to %1$s but %2$s hasn't received a "
 "notice to them yet."
 msgstr ""
 
-#: actions/replies.php:204
 #, php-format
 msgid ""
 "You can engage other users in a conversation, subscribe to more people or "
 "[join groups](%%action.groups%%)."
 msgstr ""
 
-#: actions/replies.php:206
 #, php-format
 msgid ""
 "You can try to [nudge %1$s](../%2$s) or [post something to them](%%%%action."
@@ -5378,230 +4442,189 @@ msgstr ""
 
 #. TRANS: RSS reply feed description.
 #. TRANS: %1$s is a user nickname, %2$s is the StatusNet site name.
-#: actions/repliesrss.php:74
 #, fuzzy, php-format
 msgid "Replies to %1$s on %2$s."
 msgstr "Melding til %1$s på %2$s"
 
 #. TRANS: Client exception displayed when trying to restore an account while not logged in.
-#: actions/restoreaccount.php:78
 #, fuzzy
 msgid "Only logged-in users can restore their account."
 msgstr "Kun brukaren kan lese sine eigne meldingar."
 
 #. TRANS: Client exception displayed when trying to restore an account without having restore rights.
-#: actions/restoreaccount.php:83
 #, fuzzy
 msgid "You may not restore your account."
 msgstr "Du kan ikkje registrera deg om du ikkje godtek vilkåra i lisensen."
 
 #. TRANS: Client exception displayed trying to restore an account while something went wrong uploading a file.
 #. TRANS: Client exception. No file; probably just a non-AJAX submission.
-#: actions/restoreaccount.php:121 actions/restoreaccount.php:146
 #, fuzzy
 msgid "No uploaded file."
 msgstr "Last opp fil"
 
 #. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
-#: actions/restoreaccount.php:129 lib/mediafile.php:194
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
 msgstr ""
 
 #. TRANS: Client exception.
-#: actions/restoreaccount.php:135 lib/mediafile.php:200
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form."
 msgstr ""
 
 #. TRANS: Client exception.
-#: actions/restoreaccount.php:141 lib/mediafile.php:206
 msgid "The uploaded file was only partially uploaded."
 msgstr ""
 
 #. TRANS: Client exception thrown when a temporary folder is not present to store a file upload.
-#: actions/restoreaccount.php:150 lib/mediafile.php:214
 msgid "Missing a temporary folder."
 msgstr ""
 
 #. TRANS: Client exception thrown when writing to disk is not possible during a file upload operation.
-#: actions/restoreaccount.php:154 lib/mediafile.php:218
 msgid "Failed to write file to disk."
 msgstr ""
 
 #. TRANS: Client exception thrown when a file upload operation has been stopped by an extension.
-#: actions/restoreaccount.php:158 lib/mediafile.php:222
 msgid "File upload stopped by extension."
 msgstr ""
 
 #. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
 #. TRANS: Exception thrown when uploading an image fails for an unknown reason.
 #. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
-#: actions/restoreaccount.php:164 lib/imagefile.php:106 lib/mediafile.php:228
 msgid "System error uploading file."
 msgstr "Systemfeil ved opplasting av fil."
 
 #. TRANS: Client exception thrown when a feed is not an Atom feed.
-#: actions/restoreaccount.php:207
 #, fuzzy
 msgid "Not an Atom feed."
 msgstr "Alle medlemmar"
 
 #. TRANS: Success message when a feed has been restored.
-#: actions/restoreaccount.php:241
 msgid ""
 "Feed has been restored. Your old posts should now appear in search and your "
 "profile page."
 msgstr ""
 
 #. TRANS: Message when a feed restore is in progress.
-#: actions/restoreaccount.php:245
 msgid "Feed will be restored. Please wait a few minutes for results."
 msgstr ""
 
 #. TRANS: Form instructions for feed restore.
-#: actions/restoreaccount.php:342
 msgid ""
 "You can upload a backed-up stream in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format."
 msgstr ""
 
 #. TRANS: Title for submit button to confirm upload of a user backup file for account restore.
-#: actions/restoreaccount.php:373
 #, fuzzy
 msgid "Upload the file"
 msgstr "Last opp fil"
 
-#: actions/revokerole.php:75
 msgid "You cannot revoke user roles on this site."
 msgstr "Du kan ikkje lengre legge inn notisar på denne sida."
 
-#: actions/revokerole.php:82
 #, fuzzy
 msgid "User doesn't have this role."
 msgstr "Kan ikkje finne brukar"
 
-#: actions/rsd.php:142 actions/version.php:159
 msgid "StatusNet"
 msgstr "Statistikk"
 
-#: actions/sandbox.php:65 actions/unsandbox.php:65
 #, fuzzy
 msgid "You cannot sandbox users on this site."
 msgstr "Du kan ikkje sende melding til denne brukaren."
 
-#: actions/sandbox.php:72
 #, fuzzy
 msgid "User is already sandboxed."
 msgstr "Brukar har blokkert deg."
 
 #. TRANS: Menu item for site administration
-#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
-#: lib/adminpanelaction.php:379
 msgid "Sessions"
 msgstr ""
 
-#: actions/sessionsadminpanel.php:65
 msgid "Session settings for this StatusNet site"
 msgstr ""
 
-#: actions/sessionsadminpanel.php:175
 msgid "Handle sessions"
 msgstr ""
 
-#: actions/sessionsadminpanel.php:177
 msgid "Whether to handle sessions ourselves."
 msgstr ""
 
-#: actions/sessionsadminpanel.php:181
 msgid "Session debugging"
 msgstr ""
 
-#: actions/sessionsadminpanel.php:183
 msgid "Turn on debugging output for sessions."
 msgstr ""
 
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
+#. TRANS: Submit button title.
+msgid "Save"
+msgstr "Lagra"
+
 #, fuzzy
 msgid "Save site settings"
 msgstr "Avatar-innstillingar"
 
-#: actions/showapplication.php:78
 #, fuzzy
 msgid "You must be logged in to view an application."
 msgstr "Du må være innlogga for å melde deg ut av ei gruppe."
 
-#: actions/showapplication.php:151
 #, fuzzy
 msgid "Application profile"
 msgstr "Notisen har ingen profil"
 
-#: actions/showapplication.php:179
 #, php-format
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr ""
 
-#: actions/showapplication.php:189
 msgid "Application actions"
 msgstr ""
 
-#: actions/showapplication.php:212
 msgid "Reset key & secret"
 msgstr ""
 
 #. TRANS: Title of form for deleting a user.
-#: actions/showapplication.php:228 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:64 lib/noticelist.php:678
 msgid "Delete"
 msgstr "Slett"
 
-#: actions/showapplication.php:237
 msgid "Application info"
 msgstr ""
 
-#: actions/showapplication.php:255
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
 msgstr ""
 
-#: actions/showapplication.php:275
 #, fuzzy
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr "Sikker på at du vil sletta notisen?"
 
 #. TRANS: Title for all but the first page of favourite notices of a user.
 #. TRANS: %1$s is the user for whom the favourite notices are displayed, %2$d is the page number.
-#: actions/showfavorites.php:80
 #, fuzzy, php-format
 msgid "%1$s's favorite notices, page %2$d"
 msgstr "%s's favoritt meldingar"
 
 #. TRANS: Server error displayed when favourite notices could not be retrieved from the database.
-#: actions/showfavorites.php:134
 msgid "Could not retrieve favorite notices."
 msgstr "Kunne ikkje hente fram favorittane."
 
 #. TRANS: Feed link text. %s is a username.
-#: actions/showfavorites.php:172
 #, php-format
 msgid "Feed for favorites of %s (RSS 1.0)"
 msgstr "Straum for vener av %s"
 
 #. TRANS: Feed link text. %s is a username.
-#: actions/showfavorites.php:180
 #, php-format
 msgid "Feed for favorites of %s (RSS 2.0)"
 msgstr "Straum for vener av %s"
 
 #. TRANS: Feed link text. %s is a username.
-#: actions/showfavorites.php:188
 #, php-format
 msgid "Feed for favorites of %s (Atom)"
 msgstr "Straum for vener av %s"
 
 #. TRANS: Text displayed instead of favourite notices for the current logged in user that has no favourites.
-#: actions/showfavorites.php:209
 msgid ""
 "You haven't chosen any favorite notices yet. Click the fave button on "
 "notices you like to bookmark them for later or shed a spotlight on them."
@@ -5609,7 +4632,6 @@ msgstr ""
 
 #. TRANS: Text displayed instead of favourite notices for a user that has no favourites while logged in.
 #. TRANS: %s is a username.
-#: actions/showfavorites.php:213
 #, php-format
 msgid ""
 "%s hasn't added any favorite notices yet. Post something interesting they "
@@ -5619,7 +4641,6 @@ msgstr ""
 #. TRANS: Text displayed instead of favourite notices for a user that has no favourites while not logged in.
 #. TRANS: %s is a username, %%%%action.register%%%% is a link to the user registration page.
 #. TRANS: (link text)[link] is a Mark Down link.
-#: actions/showfavorites.php:220
 #, php-format
 msgid ""
 "%s hasn't added any favorite notices yet. Why not [register an account](%%%%"
@@ -5628,64 +4649,53 @@ msgid ""
 msgstr ""
 
 #. TRANS: Page notice for show favourites page.
-#: actions/showfavorites.php:251
 msgid "This is a way to share what you like."
 msgstr ""
 
 #. TRANS: Page title for first group page. %s is a group name.
-#: actions/showgroup.php:75
 #, php-format
 msgid "%s group"
 msgstr "%s gruppe"
 
 #. TRANS: Page title for any but first group page.
 #. TRANS: %1$s is a group name, $2$s is a page number.
-#: actions/showgroup.php:79
 #, php-format
 msgid "%1$s group, page %2$d"
 msgstr "Grupper, side %d"
 
 #. TRANS: Label for group description or group note (dt). Text hidden by default.
-#: actions/showgroup.php:266
 msgid "Note"
 msgstr "Merknad"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:277 lib/groupeditform.php:180
 msgid "Aliases"
 msgstr ""
 
 #. TRANS: Group actions header (h2). Text hidden by default.
-#: actions/showgroup.php:294
 msgid "Group actions"
 msgstr "Gruppe handlingar"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:338
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
 msgstr "Straum for vener av %s"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:345
 #, php-format
 msgid "Notice feed for %s group (RSS 2.0)"
 msgstr "Straum for vener av %s"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:352
 #, php-format
 msgid "Notice feed for %s group (Atom)"
 msgstr "Notisstraum for %s"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:358
 #, php-format
 msgid "FOAF for %s group"
 msgstr "Utboks for %s"
 
 #. TRANS: Header for mini list of group members on a group page (h2).
-#: actions/showgroup.php:395
 msgid "Members"
 msgstr "Medlemmar"
 
@@ -5693,30 +4703,23 @@ msgstr "Medlemmar"
 #. TRANS: Text for user subscription statistics if the user has no subscriptions.
 #. TRANS: Text for user subscriber statistics if user has no subscribers.
 #. TRANS: Text for user user group membership statistics if user is not a member of any group.
-#: actions/showgroup.php:401 lib/profileaction.php:137
-#: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
-#: lib/subscriptionlist.php:123 lib/tagcloudsection.php:71
 msgid "(None)"
 msgstr "(Ingen)"
 
 #. TRANS: Link to all group members from mini list of group members if group has more than n members.
-#: actions/showgroup.php:410
 msgid "All members"
 msgstr "Alle medlemmar"
 
 #. TRANS: Header for group statistics on a group page (h2).
 #. TRANS: H2 text for user statistics.
-#: actions/showgroup.php:441 lib/profileaction.php:205
 msgid "Statistics"
 msgstr "Statistikk"
 
-#: actions/showgroup.php:444
 msgctxt "LABEL"
 msgid "Created"
 msgstr "Oppretta"
 
 #. TRANS: Label for member count in statistics on group page.
-#: actions/showgroup.php:449
 msgctxt "LABEL"
 msgid "Members"
 msgstr "Medlemmar"
@@ -5725,7 +4728,6 @@ msgstr "Medlemmar"
 #. TRANS: **%s** is the group alias, %%%%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).
-#: actions/showgroup.php:464
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5738,7 +4740,6 @@ 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: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
-#: actions/showgroup.php:474
 #, fuzzy, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5750,101 +4751,85 @@ msgstr ""
 "wikipedia.org/wiki/Micro-blogging)-teneste"
 
 #. TRANS: Header for list of group administrators on a group page (h2).
-#: actions/showgroup.php:503
 #, fuzzy
 msgid "Admins"
 msgstr "Administrator"
 
 #. TRANS: Client error displayed requesting a single message that does not exist.
-#: actions/showmessage.php:76
 msgid "No such message."
 msgstr "Kan ikkje finne den meldinga."
 
 #. TRANS: Client error displayed requesting a single direct message the requesting user was not a party in.
-#: actions/showmessage.php:86
 msgid "Only the sender and recipient may read this message."
 msgstr "Kun sendaren og mottakaren kan lese denne meldinga."
 
 #. TRANS: Page title for single direct message display when viewing user is the sender.
 #. TRANS: %1$s is the addressed user's nickname, $2$s is a timestamp.
-#: actions/showmessage.php:105
 #, php-format
 msgid "Message to %1$s on %2$s"
 msgstr "Melding til %1$s på %2$s"
 
 #. TRANS: Page title for single message display.
 #. TRANS: %1$s is the sending user's nickname, $2$s is a timestamp.
-#: actions/showmessage.php:113
 #, php-format
 msgid "Message from %1$s on %2$s"
 msgstr "Melding fra %1$s på %2$s"
 
-#: actions/shownotice.php:90
 #, fuzzy
 msgid "Notice deleted."
 msgstr "Melding lagra"
 
 #. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
-#: actions/showstream.php:70
 #, fuzzy, php-format
 msgid "%1$s tagged %2$s"
 msgstr "Grupper, side %d"
 
 #. TRANS: Page title showing tagged notices in one user's stream.
 #. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
-#: actions/showstream.php:74
 #, fuzzy, php-format
 msgid "%1$s tagged %2$s, page %3$d"
 msgstr "Notisar merka med %s"
 
 #. TRANS: Extended page title showing tagged notices in one user's stream.
 #. TRANS: %1$s is the username, %2$d is the page number.
-#: actions/showstream.php:82
 #, php-format
 msgid "%1$s, page %2$d"
 msgstr "Grupper, side %d"
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %1$s is a user nickname, %2$s is a hashtag.
-#: actions/showstream.php:127
 #, php-format
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
 msgstr "Straum for vener av %s"
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.
-#: actions/showstream.php:136
 #, php-format
 msgid "Notice feed for %s (RSS 1.0)"
 msgstr "Straum for vener av %s"
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.
-#: actions/showstream.php:145
 #, php-format
 msgid "Notice feed for %s (RSS 2.0)"
 msgstr "Straum for vener av %s"
 
-#: actions/showstream.php:152
 #, fuzzy, php-format
 msgid "Notice feed for %s (Atom)"
 msgstr "Notisstraum for %s"
 
 #. TRANS: Title for link to notice feed. FOAF stands for Friend of a Friend.
 #. TRANS: More information at http://www.foaf-project.org. %s is a user nickname.
-#: actions/showstream.php:159
 #, fuzzy, php-format
 msgid "FOAF for %s"
 msgstr "Utboks for %s"
 
 #. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
-#: actions/showstream.php:205
 #, php-format
 msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr ""
 
 #. TRANS: Second sentence of empty list message for a stream for the user themselves.
-#: actions/showstream.php:211
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
@@ -5852,7 +4837,6 @@ msgstr ""
 
 #. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:215
 #, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
@@ -5861,7 +4845,6 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:258
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5872,7 +4855,6 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:265
 #, fuzzy, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5883,230 +4865,183 @@ msgstr ""
 "wikipedia.org/wiki/Micro-blogging)-teneste"
 
 #. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
-#: actions/showstream.php:322
 #, fuzzy, php-format
 msgid "Repeat of %s"
 msgstr "Svar til %s"
 
-#: actions/silence.php:65 actions/unsilence.php:65
 #, fuzzy
 msgid "You cannot silence users on this site."
 msgstr "Du kan ikkje sende melding til denne brukaren."
 
-#: actions/silence.php:72
 #, fuzzy
 msgid "User is already silenced."
 msgstr "Brukar har blokkert deg."
 
-#: actions/siteadminpanel.php:69
 msgid "Basic settings for this StatusNet site"
 msgstr ""
 
-#: actions/siteadminpanel.php:133
 msgid "Site name must have non-zero length."
 msgstr ""
 
-#: actions/siteadminpanel.php:141
 msgid "You must have a valid contact email address."
 msgstr "Ikkje ei gyldig epostadresse."
 
-#: actions/siteadminpanel.php:159
 #, php-format
 msgid "Unknown language \"%s\"."
 msgstr ""
 
-#: actions/siteadminpanel.php:165
 msgid "Minimum text limit is 0 (unlimited)."
 msgstr ""
 
-#: actions/siteadminpanel.php:171
 msgid "Dupe limit must be one or more seconds."
 msgstr ""
 
-#: actions/siteadminpanel.php:221
 msgid "General"
 msgstr ""
 
-#: actions/siteadminpanel.php:224
 #, fuzzy
 msgid "Site name"
 msgstr "Statusmelding"
 
-#: actions/siteadminpanel.php:225
 msgid "The name of your site, like \"Yourcompany Microblog\""
 msgstr ""
 
-#: actions/siteadminpanel.php:229
 msgid "Brought by"
 msgstr ""
 
-#: actions/siteadminpanel.php:230
 msgid "Text used for credits link in footer of each page"
 msgstr ""
 
-#: actions/siteadminpanel.php:234
 msgid "Brought by URL"
 msgstr ""
 
-#: actions/siteadminpanel.php:235
 msgid "URL used for credits link in footer of each page"
 msgstr ""
 
-#: actions/siteadminpanel.php:239
 #, fuzzy
 msgid "Contact email address for your site"
 msgstr "Ny epostadresse for å oppdatera %s"
 
-#: actions/siteadminpanel.php:245
 #, fuzzy
 msgid "Local"
 msgstr "Lokale syningar"
 
-#: actions/siteadminpanel.php:256
 msgid "Default timezone"
 msgstr ""
 
-#: actions/siteadminpanel.php:257
 msgid "Default timezone for the site; usually UTC."
 msgstr ""
 
-#: actions/siteadminpanel.php:262
 #, fuzzy
 msgid "Default language"
 msgstr "Foretrukke språk"
 
-#: actions/siteadminpanel.php:263
 msgid "Site language when autodetection from browser settings is not available"
 msgstr ""
 
-#: actions/siteadminpanel.php:271
 msgid "Limits"
 msgstr ""
 
-#: actions/siteadminpanel.php:274
 msgid "Text limit"
 msgstr ""
 
-#: actions/siteadminpanel.php:274
 msgid "Maximum number of characters for notices."
 msgstr ""
 
-#: actions/siteadminpanel.php:278
 msgid "Dupe limit"
 msgstr ""
 
-#: actions/siteadminpanel.php:278
 msgid "How long users must wait (in seconds) to post the same thing again."
 msgstr ""
 
 #. TRANS: Page title for site-wide notice tab in admin panel.
-#: actions/sitenoticeadminpanel.php:55
 #, fuzzy
 msgid "Site Notice"
 msgstr "Statusmelding"
 
 #. TRANS: Instructions for site-wide notice tab in admin panel.
-#: actions/sitenoticeadminpanel.php:66
 #, fuzzy
 msgid "Edit site-wide message"
 msgstr "Ny melding"
 
 #. TRANS: Server error displayed when saving a site-wide notice was impossible.
-#: actions/sitenoticeadminpanel.php:101
 #, fuzzy
 msgid "Unable to save site notice."
 msgstr "Klarte ikkje å lagra Twitter-innstillingane dine!"
 
 #. TRANS: Client error displayed when a site-wide notice was longer than allowed.
-#: actions/sitenoticeadminpanel.php:112
 msgid "Maximum length for the site-wide notice is 255 characters."
 msgstr ""
 
 #. TRANS: Label for site-wide notice text field in admin panel.
-#: actions/sitenoticeadminpanel.php:176
 #, fuzzy
 msgid "Site notice text"
 msgstr "Statusmelding"
 
 #. TRANS: Tooltip for site-wide notice text field in admin panel.
-#: actions/sitenoticeadminpanel.php:179
 msgid "Site-wide notice text (255 characters maximum; HTML allowed)"
 msgstr ""
 
 #. TRANS: Title for button to save site notice in admin panel.
-#: actions/sitenoticeadminpanel.php:201
 #, fuzzy
 msgid "Save site notice."
 msgstr "Statusmelding"
 
 #. TRANS: Title for SMS settings.
-#: actions/smssettings.php:56
 msgid "SMS settings"
 msgstr "Avatar-innstillingar"
 
 #. TRANS: SMS settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/smssettings.php:70
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr "Du kan motta SMS-meldingar gjennom e-post frå %%site.name%%."
 
 #. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
-#: actions/smssettings.php:92
 #, fuzzy
 msgid "SMS is not available."
 msgstr "Denne sida er ikkje tilgjengleg i eit"
 
 #. TRANS: Form legend for SMS settings form.
-#: actions/smssettings.php:106
 msgid "SMS address"
 msgstr "Epostadresser"
 
 #. TRANS: Form guide in SMS settings form.
-#: actions/smssettings.php:115
 msgid "Current confirmed SMS-enabled phone number."
 msgstr "Godkjent mobiltelefonnummer."
 
 #. TRANS: Form guide in IM settings form.
-#: actions/smssettings.php:128
 msgid "Awaiting confirmation on this phone number."
 msgstr "Ventar på godkjenning for dette telefonnummeret."
 
 #. TRANS: Field label for SMS address input in SMS settings form.
-#: actions/smssettings.php:137
 msgid "Confirmation code"
 msgstr "Stadfestingskode"
 
 #. TRANS: Form field instructions in SMS settings form.
-#: actions/smssettings.php:139
 msgid "Enter the code you received on your phone."
 msgstr "Skriv inn koden du fekk på telefonen."
 
 #. TRANS: Button label to confirm SMS confirmation code in SMS settings.
-#: actions/smssettings.php:143
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Confirm"
 msgstr "Godta"
 
 #. TRANS: Field label for SMS phone number input in SMS settings form.
-#: actions/smssettings.php:148
 msgid "SMS phone number"
 msgstr "Ingen telefonnummer."
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
-#: actions/smssettings.php:151
 #, fuzzy
 msgid "Phone number, no punctuation or spaces, with area code."
 msgstr "Telefonnummer, kun tall, med landskode"
 
 #. TRANS: Form legend for SMS preferences form.
-#: actions/smssettings.php:190
 msgid "SMS preferences"
 msgstr "Lagra brukarval."
 
 #. TRANS: Checkbox label in SMS preferences form.
-#: actions/smssettings.php:196
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
@@ -6115,33 +5050,27 @@ msgstr ""
 "min tilbydar."
 
 #. TRANS: Confirmation message for successful SMS preferences save.
-#: actions/smssettings.php:307
 #, fuzzy
 msgid "SMS preferences saved."
 msgstr "Lagra brukarval."
 
 #. TRANS: Message given saving SMS phone number without having provided one.
-#: actions/smssettings.php:329
 msgid "No phone number."
 msgstr "Ingen telefonnummer."
 
 #. TRANS: Message given saving SMS phone number without having selected a carrier.
-#: actions/smssettings.php:335
 msgid "No carrier selected."
 msgstr "Ingen mobiloperatør vald."
 
 #. TRANS: Message given saving SMS phone number that is already set.
-#: actions/smssettings.php:343
 msgid "That is already your phone number."
 msgstr "Det er alt ditt telefonnummer"
 
 #. TRANS: Message given saving SMS phone number that is already set for another user.
-#: actions/smssettings.php:347
 msgid "That phone number already belongs to another user."
 msgstr "Det telefonnummeret er alt registrert hos ein annan brukar."
 
 #. TRANS: Message given saving valid SMS phone number that is to be confirmed.
-#: actions/smssettings.php:375
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
 "for the code and instructions on how to use it."
@@ -6150,40 +5079,33 @@ msgstr ""
 "søppelpostboksen) for koden og veiledning på korleis du nyttar han."
 
 #. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
-#: actions/smssettings.php:403
 msgid "That is the wrong confirmation number."
 msgstr "Det er feil godkjennings nummer."
 
 #. TRANS: Message given after successfully canceling SMS phone number confirmation.
-#: actions/smssettings.php:417
 msgid "SMS confirmation cancelled."
 msgstr "SMS bekreftelse"
 
 #. TRANS: Message given trying to remove an SMS phone number that is not
 #. TRANS: registered for the active user.
-#: actions/smssettings.php:437
 msgid "That is not your phone number."
 msgstr "Det er ikkje ditt telefonnummer"
 
 #. TRANS: Message given after successfully removing a registered SMS phone number.
-#: actions/smssettings.php:459
 #, fuzzy
 msgid "The SMS phone number was removed."
 msgstr "SMS telefon nummer"
 
 #. TRANS: Label for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:498
 msgid "Mobile carrier"
 msgstr "Telefontilbydar"
 
 #. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:503
 msgid "Select a carrier"
 msgstr "Velg ein tilbydar"
 
 #. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
 #. TRANS: %s is an administrative contact's e-mail address.
-#: actions/smssettings.php:512
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -6193,121 +5115,96 @@ msgstr ""
 "aksepterer SMS-over-epost, men ikkje vistast her."
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
-#: actions/smssettings.php:534
 #, fuzzy
 msgid "No code entered."
 msgstr "Ingen innskriven kode"
 
 #. TRANS: Menu item for site administration
-#: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
-#: lib/adminpanelaction.php:395
 msgid "Snapshots"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:65
 msgid "Manage snapshot configuration"
 msgstr "Stadfesting av epostadresse"
 
-#: actions/snapshotadminpanel.php:127
 msgid "Invalid snapshot run value."
 msgstr ""
 
-#: actions/snapshotadminpanel.php:133
 msgid "Snapshot frequency must be a number."
 msgstr ""
 
-#: actions/snapshotadminpanel.php:144
 msgid "Invalid snapshot report URL."
 msgstr ""
 
-#: actions/snapshotadminpanel.php:200
 msgid "Randomly during web hit"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:201
 msgid "In a scheduled job"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:206
 msgid "Data snapshots"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:208
 msgid "When to send statistical data to status.net servers"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:217
 msgid "Frequency"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:218
 msgid "Snapshots will be sent once every N web hits"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:226
 msgid "Report URL"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:227
 msgid "Snapshots will be sent to this URL"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:248
 #, fuzzy
 msgid "Save snapshot settings"
 msgstr "Avatar-innstillingar"
 
 #. TRANS: Client error displayed trying a change a subscription for a non-subscribed profile.
-#: actions/subedit.php:75
 msgid "You are not subscribed to that profile."
 msgstr "Du tingar ikkje oppdateringar til den profilen."
 
 #. TRANS: Server error displayed when updating a subscription fails with a database error.
 #. TRANS: Exception thrown when a subscription could not be stored on the server.
-#: actions/subedit.php:89 classes/Subscription.php:141
 msgid "Could not save subscription."
 msgstr "Kunne ikkje lagra abonnement."
 
 #. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
-#: actions/subscribe.php:121
 #, fuzzy
 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
 msgstr "Du tingar ikkje oppdateringar til den profilen."
 
 #. TRANS: Page title when subscription succeeded.
-#: actions/subscribe.php:149
 msgid "Subscribed"
 msgstr "Abonnent"
 
 #. TRANS: Header for list of subscribers for a user (first page).
 #. TRANS: %s is the user's nickname.
-#: actions/subscribers.php:51
 #, php-format
 msgid "%s subscribers"
 msgstr "%s tingarar"
 
 #. TRANS: Header for list of subscribers for a user (not first page).
 #. TRANS: %1$s is the user's nickname, $2$d is the page number.
-#: actions/subscribers.php:55
 #, php-format
 msgid "%1$s subscribers, page %2$d"
 msgstr "%s tingarar"
 
 #. TRANS: Page notice for page with an overview of all subscribers
 #. TRANS: of the logged in user's own profile.
-#: actions/subscribers.php:68
 msgid "These are the people who listen to your notices."
 msgstr "Dette er folk som lyttar til dine notisar."
 
 #. TRANS: Page notice for page with an overview of all subscribers of a user other
 #. TRANS: than the logged in user. %s is the user nickname.
-#: actions/subscribers.php:74
 #, php-format
 msgid "These are the people who listen to %s's notices."
 msgstr "Dette er folk som lyttar til %s's notisar"
 
 #. TRANS: Subscriber list text when the logged in user has no subscribers.
-#: actions/subscribers.php:114
 msgid ""
 "You have no subscribers. Try subscribing to people you know and they might "
 "return the favor."
@@ -6315,7 +5212,6 @@ msgstr ""
 
 #. TRANS: Subscriber list text when looking at the subscribers for a of a user other
 #. TRANS: than the logged in user that has no subscribers. %s is the user nickname.
-#: actions/subscribers.php:118
 #, php-format
 msgid "%s has no subscribers. Want to be the first?"
 msgstr ""
@@ -6325,7 +5221,6 @@ msgstr ""
 #. TRANS: This message contains a Markdown URL. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.
-#: actions/subscribers.php:127
 #, php-format
 msgid ""
 "%s has no subscribers. Why not [register an account](%%%%action.register%%%"
@@ -6334,20 +5229,17 @@ msgstr ""
 
 #. TRANS: Header for subscriptions overview for a user (not first page).
 #. TRANS: %1$s is a user nickname, %2$d is the page number.
-#: actions/subscriptions.php:55
 #, php-format
 msgid "%1$s subscriptions, page %2$d"
 msgstr "%s tingarar"
 
 #. TRANS: Page notice for page with an overview of all subscriptions
 #. TRANS: of the logged in user's own profile.
-#: actions/subscriptions.php:68
 msgid "These are the people whose notices you listen to."
 msgstr "Dette er dei du lyttar til."
 
 #. TRANS: Page notice for page with an overview of all subscriptions of a user other
 #. TRANS: than the logged in user. %s is the user nickname.
-#: actions/subscriptions.php:74
 #, php-format
 msgid "These are the people whose notices %s listens to."
 msgstr "Dette er folka som %s tingar oppdateringar frå."
@@ -6356,7 +5248,6 @@ msgstr "Dette er folka som %s tingar oppdateringar frå."
 #. 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.
-#: actions/subscriptions.php:133
 #, php-format
 msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "
@@ -6370,70 +5261,56 @@ msgstr ""
 #. TRANS: than the logged in user that has no subscriptions. %s is the user nickname.
 #. TRANS: Subscription list text when looking at the subscriptions for a of a user that has none
 #. TRANS: as an anonymous user. %s is the user nickname.
-#: actions/subscriptions.php:141 actions/subscriptions.php:147
 #, php-format
 msgid "%s is not listening to anyone."
 msgstr "%1$s høyrer no på notisane dine på %2$s."
 
 #. TRANS: Atom feed title. %s is a profile nickname.
-#: actions/subscriptions.php:176
 #, fuzzy, php-format
 msgid "Subscription feed for %s (Atom)"
 msgstr "Notisstraum for %s"
 
 #. TRANS: Checkbox label for enabling Jabber messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:241 lib/settingsnav.php:110
-#, fuzzy
 msgid "IM"
 msgstr "Ljonmelding"
 
 #. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:256 lib/settingsnav.php:117
 msgid "SMS"
 msgstr "SMS"
 
 #. TRANS: Title for all but the first page of notices with tags.
 #. TRANS: %1$s is the tag, %2$d is the page number.
-#: actions/tag.php:73
 #, php-format
 msgid "Notices tagged with %1$s, page %2$d"
 msgstr "Notisar merka med %s"
 
-#: actions/tag.php:91
 #, php-format
 msgid "Notice feed for tag %s (RSS 1.0)"
 msgstr "Straum for vener av %s"
 
-#: actions/tag.php:97
 #, php-format
 msgid "Notice feed for tag %s (RSS 2.0)"
 msgstr "Straum for vener av %s"
 
-#: actions/tag.php:103
 #, fuzzy, php-format
 msgid "Notice feed for tag %s (Atom)"
 msgstr "Notisstraum for %s"
 
-#: actions/tagother.php:39
 #, fuzzy
 msgid "No ID argument."
 msgstr "Manglar argumentet ID."
 
-#: actions/tagother.php:65
 #, php-format
 msgid "Tag %s"
 msgstr "Merkelapp %s"
 
 #. TRANS: H2 for user profile information.
-#: actions/tagother.php:77 lib/userprofile.php:76
 msgid "User profile"
 msgstr "Brukarprofil"
 
-#: actions/tagother.php:120
 msgid "Tag user"
 msgstr "Merk brukar"
 
-#: actions/tagother.php:130
 msgid ""
 "Tags for this user (letters, numbers, -, ., and _), comma- or space- "
 "separated"
@@ -6441,232 +5318,187 @@ msgstr ""
 "Emneord for denne brukaren (bokstavar, tal, <kbd>-</kbd>, <kbd>.</kbd>, og "
 "<kbd>_</kbd>, separert med komma eller mellomrom"
 
-#: actions/tagother.php:157
 #, php-format
 msgid "Invalid tag: \"%s\""
 msgstr "Ugyldig merkelapp: %s"
 
-#: actions/tagother.php:172
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 "Du kan berre leggje til emneord på folk som du tingar notisar frå, eller som "
 "tingar notisar frå deg."
 
-#: actions/tagother.php:215
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
 "Bruk dette skjemaet for å leggje til emneord til dei som tingar notisar frå "
 "deg, eller som du tingar notisar frå."
 
-#: actions/tagrss.php:35
 msgid "No such tag."
 msgstr "Dette emneord finst ikkje."
 
 #. TRANS: Client error displayed when trying to unblock a non-blocked user.
-#: actions/unblock.php:59
 msgid "You haven't blocked that user."
 msgstr "Du tingar ikkje oppdateringar til den profilen."
 
-#: actions/unsandbox.php:72
 msgid "User is not sandboxed."
 msgstr "Brukaren har ikkje siste notis"
 
-#: actions/unsilence.php:72
 #, fuzzy
 msgid "User is not silenced."
 msgstr "Brukaren har inga profil."
 
-#: actions/unsubscribe.php:77
 msgid "No profile ID in request."
 msgstr "Fann ingen profil med den IDen."
 
-#: actions/unsubscribe.php:98
 msgid "Unsubscribed"
 msgstr "Fjerna tinging"
 
-#: actions/updateprofile.php:64
 #, php-format
 msgid ""
 "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
 msgstr ""
 
-#: actions/urlsettings.php:60
 #, fuzzy
 msgid "URL settings"
 msgstr "Avatar-innstillingar"
 
 #. TRANS: Instructions for tab "Other" in user profile settings.
-#: actions/urlsettings.php:72
 msgid "Manage various other options."
 msgstr "Velikehald andre innstillingar"
 
 #. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
 #. TRANS: user's profile settings. This message has one space at the beginning. Use your
 #. TRANS: language's word separator here if it has one (most likely a single space).
-#: actions/urlsettings.php:115
 msgid " (free service)"
 msgstr ""
 
-#: actions/urlsettings.php:121
 #, fuzzy
 msgid "[none]"
 msgstr "Ingen"
 
-#: actions/urlsettings.php:122
 msgid "[internal]"
 msgstr ""
 
 #. TRANS: Label for dropdown with URL shortener services.
-#: actions/urlsettings.php:130
 msgid "Shorten URLs with"
 msgstr ""
 
 #. TRANS: Tooltip for for dropdown with URL shortener services.
-#: actions/urlsettings.php:132
 msgid "Automatic shortening service to use."
 msgstr "Den automatisk forkortingstenesta du vil bruke"
 
-#: actions/urlsettings.php:138
 msgid "URL longer than"
 msgstr ""
 
-#: actions/urlsettings.php:141
 msgid "URLs longer than this will be shortened, 0 means always shorten."
 msgstr ""
 
-#: actions/urlsettings.php:145
 msgid "Text longer than"
 msgstr ""
 
-#: actions/urlsettings.php:148
 msgid ""
 "URLs in notices longer than this will be shortened, 0 means always shorten."
 msgstr ""
 
 #. TRANS: Form validation error for form "Other settings" in user profile.
-#: actions/urlsettings.php:180
 #, fuzzy
 msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr "Adressa til forkortingstenesta er for lang (maksimalt 50 teikn)."
 
-#: actions/urlsettings.php:187
 msgid "Invalid number for max url length."
 msgstr ""
 
-#: actions/urlsettings.php:193
 #, fuzzy
 msgid "Invalid number for max notice length."
 msgstr "Ugyldig filnamn."
 
-#: actions/urlsettings.php:238
 msgid "Error saving user URL shortening preferences."
 msgstr ""
 
 #. TRANS: User admin panel title
-#: actions/useradminpanel.php:58
 #, fuzzy
 msgctxt "TITLE"
 msgid "User"
 msgstr "Brukar"
 
 #. TRANS: Instruction for user admin panel.
-#: actions/useradminpanel.php:69
 msgid "User settings for this StatusNet site"
 msgstr ""
 
 #. TRANS: Form validation error in user admin panel when a non-numeric character limit was set.
-#: actions/useradminpanel.php:147
 msgid "Invalid bio limit. Must be numeric."
 msgstr ""
 
 #. TRANS: Form validation error in user admin panel when welcome text is too long.
-#: actions/useradminpanel.php:154
 msgid "Invalid welcome text. Maximum length is 255 characters."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to set a non-existing user as default subscription for new
 #. TRANS: users in user admin panel. %1$s is the invalid nickname.
-#: actions/useradminpanel.php:166
 #, php-format
 msgid "Invalid default subscripton: \"%1$s\" is not a user."
 msgstr ""
 
-#: actions/useradminpanel.php:215 lib/action.php:565 lib/settingsnav.php:77
-#: lib/subgroupnav.php:81
 msgid "Profile"
 msgstr "Profil"
 
 #. TRANS: Field label in user admin panel for setting the character limit for the bio field.
-#: actions/useradminpanel.php:220
 msgid "Bio Limit"
 msgstr ""
 
 #. TRANS: Tooltip in user admin panel for setting the character limit for the bio field.
-#: actions/useradminpanel.php:222
 msgid "Maximum length of a profile bio in characters."
 msgstr ""
 
 #. TRANS: Form legend in user admin panel.
-#: actions/useradminpanel.php:231
 #, fuzzy
 msgid "New users"
 msgstr "Invitér nye brukarar"
 
 #. TRANS: Field label in user admin panel for setting new user welcome text.
-#: actions/useradminpanel.php:236
 msgid "New user welcome"
 msgstr ""
 
 #. TRANS: Tooltip in user admin panel for setting new user welcome text.
-#: actions/useradminpanel.php:238
 #, fuzzy
 msgid "Welcome text for new users (maximum 255 characters)."
 msgstr "Ditt fulle namn er for langt (maksimalt 255 teikn)."
 
 #. TRANS: Field label in user admin panel for setting default subscription for new users.
-#: actions/useradminpanel.php:244
 #, fuzzy
 msgid "Default subscription"
 msgstr "Alle tingingar"
 
 #. TRANS: Tooltip in user admin panel for setting default subscription for new users.
-#: actions/useradminpanel.php:246
 #, fuzzy
 msgid "Automatically subscribe new users to this user."
 msgstr ""
 "Automatisk ting notisane til dei som tingar mine (best for ikkje-menneskje)"
 
 #. TRANS: Form legend in user admin panel.
-#: actions/useradminpanel.php:256
 #, fuzzy
 msgid "Invitations"
 msgstr "Invitasjon(er) sendt"
 
 #. TRANS: Field label for checkbox in user admin panel for allowing users to invite friend using site e-mail.
-#: actions/useradminpanel.php:262
 #, fuzzy
 msgid "Invitations enabled"
 msgstr "Invitasjon(er) sendt"
 
 #. TRANS: Tooltip for checkbox in user admin panel for allowing users to invite friend using site e-mail.
-#: actions/useradminpanel.php:265
 msgid "Whether to allow users to invite new users."
 msgstr ""
 
 #. TRANS: Title for button to save user settings in user admin panel.
-#: actions/useradminpanel.php:302
 #, fuzzy
 msgid "Save user settings."
 msgstr "Avatar-innstillingar"
 
 #. TRANS: Page title.
-#: actions/userauthorization.php:109
 msgid "Authorize subscription"
 msgstr "Autoriser tinging"
 
 #. TRANS: Page notice on "Auhtorize subscription" page.
-#: actions/userauthorization.php:115
 #, fuzzy
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
@@ -6677,42 +5509,35 @@ msgstr ""
 "brukaren sine notisar. Vist du ikkje har bedt om dette, klikk \"Avbryt\""
 
 #. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:200
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Accept"
 msgstr "Godta"
 
 #. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:202
 #, fuzzy
 msgid "Subscribe to this user."
 msgstr "Lagre tinging for brukar: %s"
 
 #. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:204
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Reject"
 msgstr "Avslå"
 
 #. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:206
 #, fuzzy
 msgid "Reject this subscription."
 msgstr "%s tingarar"
 
 #. TRANS: Client error displayed for an empty authorisation request.
-#: actions/userauthorization.php:219
 msgid "No authorization request!"
 msgstr "Ingen autoriserings-spørjing!"
 
 #. TRANS: Accept message header from Authorise subscription page.
-#: actions/userauthorization.php:242
 msgid "Subscription authorized"
 msgstr "Tinging autorisert"
 
-#: actions/userauthorization.php:245
 #, fuzzy
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
@@ -6724,11 +5549,9 @@ msgstr ""
 "gjennomførast. Ditt tingings teikn er: "
 
 #. TRANS: Reject message header from Authorise subscription page.
-#: actions/userauthorization.php:256
 msgid "Subscription rejected"
 msgstr "Tinging avvist"
 
-#: actions/userauthorization.php:259
 #, fuzzy
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
@@ -6740,35 +5563,30 @@ msgstr ""
 
 #. TRANS: Exception thrown when no valid user is found for an authorisation request.
 #. TRANS: %s is a listener URI.
-#: actions/userauthorization.php:296
 #, php-format
 msgid "Listener URI \"%s\" not found here."
 msgstr ""
 
 #. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
 #. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:303
 #, php-format
 msgid "Listenee URI \"%s\" is too long."
 msgstr ""
 
 #. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
 #. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:311
 #, php-format
 msgid "Listenee URI \"%s\" is a local user."
 msgstr ""
 
 #. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
 #. TRANS: %s is a profile URL.
-#: actions/userauthorization.php:329
 #, php-format
 msgid "Profile URL \"%s\" is for a local user."
 msgstr ""
 
 #. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
 #. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
-#: actions/userauthorization.php:339
 #, php-format
 msgid ""
 "Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
@@ -6777,77 +5595,63 @@ msgstr ""
 
 #. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
 #. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:349
 #, fuzzy, php-format
 msgid "Avatar URL \"%s\" is not valid."
 msgstr "Heimesida er ikkje ei gyldig internettadresse."
 
 #. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
 #. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:356
 #, fuzzy, php-format
 msgid "Cannot read avatar URL \"%s\"."
 msgstr "Kan ikkje lesa brukarbilete-URL «%s»"
 
 #. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
 #. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:363
 #, fuzzy, php-format
 msgid "Wrong image type for avatar URL \"%s\"."
 msgstr "Feil biletetype for '%s'"
 
 #. TRANS: Page title for profile design page.
-#: actions/userdesignsettings.php:74 lib/designsettings.php:61
 #, fuzzy
 msgid "Profile design"
 msgstr "Profilinnstillingar"
 
 #. TRANS: Instructions for profile design page.
-#: actions/userdesignsettings.php:84 lib/designsettings.php:72
 msgid ""
 "Customize the way your profile looks with a background image and a colour "
 "palette of your choice."
 msgstr ""
 
-#: actions/userdesignsettings.php:289
 msgid "Enjoy your hotdog!"
 msgstr ""
 
-#: actions/userdesignsettings.php:325
 #, fuzzy
 msgid "Design settings"
 msgstr "Avatar-innstillingar"
 
-#: actions/userdesignsettings.php:340
 #, fuzzy
 msgid "View profile designs"
 msgstr "Profilinnstillingar"
 
-#: actions/userdesignsettings.php:341
 msgid "Show or hide profile designs."
 msgstr ""
 
-#: actions/userdesignsettings.php:348
 msgid "Background file"
 msgstr ""
 
 #. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number.
-#: actions/usergroups.php:66
 #, php-format
 msgid "%1$s groups, page %2$d"
 msgstr "Grupper, side %d"
 
-#: actions/usergroups.php:132
 #, fuzzy
 msgid "Search for more groups"
 msgstr "Søk etter folk eller innhald"
 
-#: actions/usergroups.php:159
 #, fuzzy, php-format
 msgid "%s is not a member of any group."
 msgstr "Du er ikkje medlem av den gruppa."
 
-#: actions/usergroups.php:164
 #, php-format
 msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
 msgstr ""
@@ -6857,35 +5661,28 @@ msgstr ""
 #. TRANS: %1$s is a group name, %2$s is a site name.
 #. TRANS: Message is used as a subtitle in atom user notice feed.
 #. TRANS: %1$s is a user name, %2$s is a site name.
-#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:70
-#: lib/atomusernoticefeed.php:95
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr "Oppdateringar frå %1$s på %2$s!"
 
-#: actions/version.php:75
 #, fuzzy, php-format
 msgid "StatusNet %s"
 msgstr "Statistikk"
 
-#: actions/version.php:155
 #, php-format
 msgid ""
 "This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
 "Inc. and contributors."
 msgstr ""
 
-#: actions/version.php:163
 msgid "Contributors"
 msgstr ""
 
 #. TRANS: Menu item for site administration
-#: actions/version.php:167 lib/adminpanelaction.php:403
 #, fuzzy
 msgid "License"
 msgstr "lisens."
 
-#: actions/version.php:170
 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 "
@@ -6893,7 +5690,6 @@ msgid ""
 "any later version. "
 msgstr ""
 
-#: actions/version.php:176
 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 "
@@ -6901,7 +5697,6 @@ msgid ""
 "for more details. "
 msgstr ""
 
-#: actions/version.php:182
 #, php-format
 msgid ""
 "You should have received a copy of the GNU Affero General Public License "
@@ -6909,55 +5704,45 @@ msgid ""
 msgstr ""
 
 #. TRANS: Form input field label for application name.
-#: actions/version.php:197 lib/applicationeditform.php:190
 #, fuzzy
 msgid "Name"
 msgstr "Kallenamn"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:885
 #, fuzzy
 msgid "Version"
 msgstr "Personleg"
 
-#: actions/version.php:199
 msgid "Author(s)"
 msgstr ""
 
 #. TRANS: Form input field label.
-#: actions/version.php:200 lib/applicationeditform.php:208
-#: lib/groupeditform.php:168
 msgid "Description"
 msgstr "Beskriving"
 
 #. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:164
 msgid "Favor"
 msgstr "Tjeneste"
 
 #. TRANS: Ntofication given when a user marks a notice as favorite.
 #. TRANS: %1$s is a user nickname or full name, %2$s is a notice URI.
-#: classes/Fave.php:167
 #, fuzzy, php-format
 msgid "%1$s marked notice %2$s as a favorite."
 msgstr ""
 "Send meg ein epost når nokon legg til ein av mine notisar som favoritt."
 
 #. TRANS: Server exception thrown when a URL cannot be processed.
-#: classes/File.php:162
 #, php-format
 msgid "Cannot process URL '%s'"
 msgstr ""
 
 #. TRANS: Server exception thrown when... Robin thinks something is impossible!
-#: classes/File.php:194
 msgid "Robin thinks something is impossible."
 msgstr ""
 
 #. 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$s is used for plural.
-#: classes/File.php:210
 #, php-format
 msgid ""
 "No file may be larger than %1$d byte and the file you sent was %2$d bytes. "
@@ -6970,7 +5755,6 @@ msgstr[1] ""
 
 #. TRANS: Message given if an upload would exceed user quota.
 #. TRANS: %d (number) is the user quota in bytes and is used for plural.
-#: classes/File.php:223
 #, php-format
 msgid "A file this large would exceed your user quota of %d byte."
 msgid_plural "A file this large would exceed your user quota of %d bytes."
@@ -6979,7 +5763,6 @@ msgstr[1] ""
 
 #. TRANS: Message given id an upload would exceed a user's monthly quota.
 #. TRANS: $d (number) is the monthly user quota in bytes and is used for plural.
-#: classes/File.php:235
 #, php-format
 msgid "A file this large would exceed your monthly quota of %d byte."
 msgid_plural "A file this large would exceed your monthly quota of %d bytes."
@@ -6987,121 +5770,101 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Client exception thrown if a file upload does not have a valid name.
-#: classes/File.php:282 classes/File.php:297
 msgid "Invalid filename."
 msgstr "Ugyldig filnamn."
 
 #. TRANS: Exception thrown when joining a group fails.
-#: classes/Group_member.php:51
 #, fuzzy
 msgid "Group join failed."
 msgstr "Gruppe profil"
 
 #. TRANS: Exception thrown when trying to leave a group the user is not a member of.
-#: classes/Group_member.php:64
 #, fuzzy
 msgid "Not part of group."
 msgstr "Kann ikkje oppdatera gruppa."
 
 #. TRANS: Exception thrown when trying to leave a group fails.
-#: classes/Group_member.php:72
 #, fuzzy
 msgid "Group leave failed."
 msgstr "Gruppe profil"
 
 #. TRANS: Exception thrown providing an invalid profile ID.
 #. TRANS: %s is the invalid profile ID.
-#: classes/Group_member.php:85
 #, php-format
 msgid "Profile ID %s is invalid."
 msgstr ""
 
 #. TRANS: Exception thrown providing an invalid group ID.
 #. TRANS: %s is the invalid group ID.
-#: classes/Group_member.php:98
 #, fuzzy, php-format
 msgid "Group ID %s is invalid."
 msgstr "Feil ved lagring av brukar; fungerer ikkje."
 
 #. TRANS: Activity title.
-#: classes/Group_member.php:147 lib/joinform.php:114
 msgid "Join"
 msgstr "Bli med"
 
 #. TRANS: Success message for subscribe to group attempt through OStatus.
 #. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
-#: classes/Group_member.php:151
 #, php-format
 msgid "%1$s has joined group %2$s."
 msgstr ""
 
 #. TRANS: Server exception thrown when updating a local group fails.
-#: classes/Local_group.php:42
 #, fuzzy
 msgid "Could not update local group."
 msgstr "Kann ikkje oppdatera gruppa."
 
 #. TRANS: Exception thrown when trying creating a login token failed.
 #. TRANS: %s is the user nickname for which token creation failed.
-#: classes/Login_token.php:78
 #, fuzzy, php-format
 msgid "Could not create login token for %s"
 msgstr "Kunne ikkje lagre favoritt."
 
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
-#: classes/Memcached_DataObject.php:556
 msgid "No database name or DSN found anywhere."
 msgstr ""
 
 #. TRANS: Client exception thrown when a user tries to send a direct message while being banned from sending them.
-#: classes/Message.php:45
 #, fuzzy
 msgid "You are banned from sending direct messages."
 msgstr "Ein feil oppstod ved sending av direkte melding."
 
 #. TRANS: Message given when a message could not be stored on the server.
-#: classes/Message.php:69
 msgid "Could not insert message."
 msgstr "Kunne ikkje lagre melding."
 
 #. TRANS: Message given when a message could not be updated on the server.
-#: classes/Message.php:80
 msgid "Could not update message with new URI."
 msgstr "Kunne ikkje oppdatere melding med ny URI."
 
 #. TRANS: Server exception thrown when a user profile for a notice cannot be found.
 #. TRANS: %1$d is a profile ID (number), %2$d is a notice ID (number).
-#: classes/Notice.php:98
 #, php-format
 msgid "No such profile (%1$d) for notice (%2$d)."
 msgstr ""
 
 #. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:199
 #, php-format
 msgid "Database error inserting hashtag: %s"
 msgstr "Feil med innhenting av brukarbilete."
 
 #. TRANS: Client exception thrown if a notice contains too many characters.
-#: classes/Notice.php:279
 #, fuzzy
 msgid "Problem saving notice. Too long."
 msgstr "Eit problem oppstod ved lagring av notis."
 
 #. TRANS: Client exception thrown when trying to save a notice for an unknown user.
-#: classes/Notice.php:284
 msgid "Problem saving notice. Unknown user."
 msgstr "Feil ved lagring av notis.  Ukjend brukar."
 
 #. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
-#: classes/Notice.php:290
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 "For mange notisar for raskt; tek ei pause, og prøv igjen om eit par minutt."
 
 #. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
-#: classes/Notice.php:297
 #, fuzzy
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
@@ -7110,43 +5873,36 @@ msgstr ""
 "For mange notisar for raskt; tek ei pause, og prøv igjen om eit par minutt."
 
 #. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:305
 msgid "You are banned from posting notices on this site."
 msgstr "Du kan ikkje lengre legge inn notisar på denne sida."
 
 #. TRANS: Server exception thrown when a notice cannot be saved.
 #. TRANS: Server exception thrown when a notice cannot be updated.
-#: classes/Notice.php:372 classes/Notice.php:399
 msgid "Problem saving notice."
 msgstr "Eit problem oppstod ved lagring av notis."
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:929
 msgid "Bad type provided to saveKnownGroups."
 msgstr ""
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:1028
 #, fuzzy
 msgid "Problem saving group inbox."
 msgstr "Eit problem oppstod ved lagring av notis."
 
 #. TRANS: Server exception thrown when a reply cannot be saved.
 #. TRANS: %1$d is a notice ID, %2$d is the ID of the mentioned user.
-#: classes/Notice.php:1144
 #, fuzzy, php-format
 msgid "Could not save reply for %1$d, %2$d."
 msgstr "Kunne ikkje lagra abonnement."
 
 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1663
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
 
 #. TRANS: Full name of a profile or group followed by nickname in parens
-#: classes/Profile.php:172 classes/User_group.php:242
 #, fuzzy, php-format
 msgctxt "FANCYNAME"
 msgid "%1$s (%2$s)"
@@ -7154,269 +5910,214 @@ msgstr "%1$s (%2$s)"
 
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:779
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:788
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
 
 #. TRANS: Exception thrown when a right for a non-existing user profile is checked.
-#: classes/Remote_profile.php:54
 #, fuzzy
 msgid "Missing profile."
 msgstr "Brukaren har inga profil."
 
 #. TRANS: Exception thrown when a tag cannot be saved.
-#: classes/Status_network.php:338
 msgid "Unable to save tag."
 msgstr "Kunne ikkje lagra emneord."
 
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#: classes/Subscription.php:77 lib/oauthstore.php:482
 #, fuzzy
 msgid "You have been banned from subscribing."
 msgstr "Brukaren tillet deg ikkje å tinga meldingane sine."
 
 #. TRANS: Exception thrown when trying to subscribe while already subscribed.
-#: classes/Subscription.php:82
 #, fuzzy
 msgid "Already subscribed!"
 msgstr "Ikkje tinga."
 
 #. TRANS: Exception thrown when trying to subscribe to a user who has blocked the subscribing user.
-#: classes/Subscription.php:87
 msgid "User has blocked you."
 msgstr "Brukar har blokkert deg."
 
 #. TRANS: Exception thrown when trying to unsibscribe without a subscription.
-#: classes/Subscription.php:176
 #, fuzzy
 msgid "Not subscribed!"
 msgstr "Ikkje tinga."
 
 #. TRANS: Exception thrown when trying to unsubscribe a user from themselves.
-#: classes/Subscription.php:183
 msgid "Could not delete self-subscription."
 msgstr "Kunne ikkje lagra abonnement."
 
 #. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
-#: classes/Subscription.php:211
 msgid "Could not delete subscription OMB token."
 msgstr "Kunne ikkje lagra abonnement."
 
 #. TRANS: Exception thrown when a subscription could not be deleted on the server.
-#: classes/Subscription.php:223
 msgid "Could not delete subscription."
 msgstr "Kunne ikkje lagra abonnement."
 
 #. TRANS: Activity tile when subscribing to another person.
-#: classes/Subscription.php:265
 msgid "Follow"
 msgstr ""
 
 #. TRANS: Notification given when one person starts following another.
 #. TRANS: %1$s is the subscriber, %2$s is the subscribed.
-#: classes/Subscription.php:268
 #, fuzzy, php-format
 msgid "%1$s is now following %2$s."
 msgstr "%1$s høyrer no på notisane dine på %2$s."
 
 #. TRANS: Notice given on user registration.
 #. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:390
 #, fuzzy, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr "Melding til %1$s på %2$s"
 
 #. TRANS: Server exception.
-#: classes/User.php:923
 msgid "No single user defined for single-user mode."
 msgstr ""
 
 #. TRANS: Server exception.
-#: classes/User.php:927
 msgid "Single-user mode code called when not enabled."
 msgstr ""
 
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:522
 msgid "Could not create group."
 msgstr "Kunne ikkje laga gruppa."
 
 #. TRANS: Server exception thrown when updating a group URI failed.
-#: classes/User_group.php:532
 msgid "Could not set group URI."
 msgstr "Kunne ikkje laga gruppa."
 
 #. TRANS: Server exception thrown when setting group membership failed.
-#: classes/User_group.php:555
 msgid "Could not set group membership."
 msgstr "Kunne ikkje bli med i gruppa."
 
 #. TRANS: Server exception thrown when saving local group information failed.
-#: classes/User_group.php:570
 #, fuzzy
 msgid "Could not save local group info."
 msgstr "Kunne ikkje lagra abonnement."
 
 #. TRANS: Exception thrown when an account could not be located when it should be moved.
 #. TRANS: %s is the remote site.
-#: lib/accountmover.php:65
 #, fuzzy, php-format
 msgid "Cannot locate account %s."
 msgstr "Kan ikkje oppdatera brukar."
 
 #. TRANS: Exception thrown when a service document could not be located account move.
 #. TRANS: %s is the remote site.
-#: lib/accountmover.php:106
 #, php-format
 msgid "Cannot find XRD for %s."
 msgstr ""
 
 #. TRANS: Exception thrown when an account could not be located when it should be moved.
 #. TRANS: %s is the remote site.
-#: lib/accountmover.php:131
 #, php-format
 msgid "No AtomPub API service for %s."
 msgstr ""
 
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: lib/action.php:161
 #, fuzzy, php-format
 msgid "%1$s - %2$s"
 msgstr "%1$s (%2$s)"
 
 #. TRANS: Page title for a page without a title set.
-#: lib/action.php:177
 msgid "Untitled page"
 msgstr "Ingen tittel"
 
 #. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.
-#: lib/action.php:325
 msgctxt "TOOLTIP"
 msgid "Show more"
 msgstr ""
 
 #. TRANS: Inline reply form submit button: submits a reply comment.
-#: lib/action.php:328
 #, fuzzy
 msgctxt "BUTTON"
-msgid "Comment"
-msgstr "Innhald"
+msgid "Reply"
+msgstr "Svar"
 
 #. TRANS: Placeholder text for inline reply form. Clicking in this box will turn it into a mini notice form.
-#: lib/action.php:331
-msgid "Add a comment..."
+msgid "Write a reply..."
 msgstr ""
 
-#: lib/action.php:559 lib/personalgroupnav.php:99
-#, fuzzy
 msgid "Home"
 msgstr "Heimeside"
 
-#: lib/action.php:560
 #, fuzzy
 msgid "Friends timeline"
 msgstr "%s tidsline"
 
-#: lib/action.php:566
 #, fuzzy
 msgid "Your profile"
 msgstr "Gruppe profil"
 
-#: lib/action.php:570 lib/action.php:593 lib/publicgroupnav.php:78
 msgid "Public"
 msgstr "Offentleg"
 
-#: lib/action.php:571 lib/action.php:594
 #, fuzzy
 msgid "Everyone on this site"
 msgstr "Finn folk på denne sida"
 
-#: lib/action.php:575
-#, fuzzy
 msgid "Settings"
 msgstr "Avatar-innstillingar"
 
-#: lib/action.php:576
 #, fuzzy
 msgid "Change your personal settings"
 msgstr "Endra profilinnstillingane dine"
 
-#: lib/action.php:582
 #, fuzzy
 msgid "Site configuration"
 msgstr "SMS bekreftelse"
 
-#: lib/action.php:587
-#, fuzzy
 msgid "Logout"
 msgstr "Logo"
 
-#: lib/action.php:588
-#, fuzzy
 msgid "Logout from the site"
 msgstr "Logg inn "
 
-#: lib/action.php:599
-#, fuzzy
 msgid "Login to the site"
 msgstr "Logg inn "
 
-#: lib/action.php:606
-#, fuzzy
 msgid "Search"
 msgstr "Søk"
 
-#: lib/action.php:607
 #, fuzzy
 msgid "Search the site"
 msgstr "Søk"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:864
 msgid "Help"
 msgstr "Hjelp"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:867
 msgid "About"
 msgstr "Om"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:870
 msgid "FAQ"
 msgstr "OSS"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:875
 msgid "TOS"
 msgstr ""
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:879
 msgid "Privacy"
 msgstr "Personvern"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:882
 msgid "Source"
 msgstr "Kjeldekode"
 
 #. TRANS: Secondary navigation menu option leading to e-mail contact information on the
 #. TRANS: StatusNet site, where to report bugs, ...
-#: lib/action.php:889
 msgid "Contact"
 msgstr "Kontakt"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:892
 #, fuzzy
 msgid "Badge"
 msgstr "Dult"
@@ -7425,7 +6126,6 @@ msgstr "Dult"
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:921
 #, fuzzy, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7435,7 +6135,6 @@ msgstr ""
 "broughtbyurl%%). "
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:924
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** er ei mikrobloggingteneste."
@@ -7444,7 +6143,6 @@ msgstr "**%%site.name%%** er ei mikrobloggingteneste."
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:931
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7457,106 +6155,88 @@ msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:949
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:956
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:960
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:992
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1335
 msgid "After"
 msgstr "« Etter"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1345
 msgid "Before"
 msgstr "Før »"
 
 #. TRANS: Client exception thrown when a feed instance is a DOMDocument.
-#: lib/activity.php:125
 msgid "Expecting a root feed element but got a whole XML document."
 msgstr ""
 
 #. TRANS: Client exception thrown when using an unknown verb for the activity importer.
-#: lib/activityimporter.php:81
 #, fuzzy, php-format
 msgid "Unknown verb: \"%s\"."
 msgstr "Ukjend fil type"
 
 #. TRANS: Client exception thrown when trying to force a subscription for an untrusted user.
-#: lib/activityimporter.php:107
 msgid "Cannot force subscription for untrusted user."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to for a remote user to subscribe.
-#: lib/activityimporter.php:117
 #, fuzzy
 msgid "Cannot force remote user to subscribe."
 msgstr "Spesifer namnet til brukaren du vil tinge"
 
 #. TRANS: Client exception thrown when trying to subscribe to an unknown profile.
-#: lib/activityimporter.php:132
 #, fuzzy
 msgid "Unknown profile."
 msgstr "Ukjend fil type"
 
 #. TRANS: Client exception thrown when trying to import an event not related to the importing user.
-#: lib/activityimporter.php:138
 msgid "This activity seems unrelated to our user."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to join a remote group that is not a group.
-#: lib/activityimporter.php:154
 msgid "Remote profile is not a group!"
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to join a group the importing user is already a member of.
-#: lib/activityimporter.php:163
 #, fuzzy
 msgid "User is already a member of this group."
 msgstr "Du er allereie medlem av den gruppa"
 
 #. TRANS: Client exception thrown when trying to import a notice by another user.
 #. TRANS: %1$s is the source URI of the notice, %2$s is the URI of the author.
-#: lib/activityimporter.php:201
 #, php-format
 msgid "Already know about notice %1$s and  it has a different author %2$s."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to overwrite the author information for a non-trusted user during import.
-#: lib/activityimporter.php:207
 msgid "Not overwriting author info for non-trusted user."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to import a notice without content.
 #. TRANS: %s is the notice URI.
-#: lib/activityimporter.php:223
 #, fuzzy, php-format
 msgid "No content for notice %s."
 msgstr "Søk i innhaldet av notisar"
 
-#: lib/activitymover.php:84
 #, fuzzy, php-format
 msgid "No such user %s."
 msgstr "Brukaren finst ikkje."
@@ -7567,229 +6247,189 @@ msgstr "Brukaren finst ikkje."
 #. TRANS: %1$s is a URL, %2$s is the status, %s$s is the fail reason.
 #. TRANS: Exception thrown when post to collection fails with a status that is not handled.
 #. TRANS: %1$s is a URL, %2$s is the status, %s$s is the fail reason.
-#: lib/activitysink.php:163 lib/activitysink.php:167 lib/activitysink.php:172
 #, fuzzy, php-format
 msgctxt "URLSTATUSREASON"
 msgid "%1$s %2$s %3$s"
 msgstr "%1$s (%2$s)"
 
 #. TRANS: Client exception thrown when there is no source attribute.
-#: lib/activityutils.php:200
 msgid "Can't handle remote content yet."
 msgstr ""
 
 #. TRANS: Client exception thrown when there embedded XML content is found that cannot be processed yet.
-#: lib/activityutils.php:237
 msgid "Can't handle embedded XML content yet."
 msgstr ""
 
 #. TRANS: Client exception thrown when base64 encoded content is found that cannot be processed yet.
-#: lib/activityutils.php:242
 msgid "Can't handle embedded Base64 content yet."
 msgstr ""
 
 #. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights.
-#: lib/adminpanelaction.php:96
 #, fuzzy
 msgid "You cannot make changes to this site."
 msgstr "Du kan ikkje sende melding til denne brukaren."
 
 #. TRANS: Client error message throw when a certain panel's settings cannot be changed.
-#: lib/adminpanelaction.php:108
 #, fuzzy
 msgid "Changes to that panel are not allowed."
 msgstr "Registrering ikkje tillatt."
 
 #. TRANS: Client error message.
-#: lib/adminpanelaction.php:222
 #, fuzzy
 msgid "showForm() not implemented."
 msgstr "Kommando ikkje implementert."
 
 #. TRANS: Client error message
-#: lib/adminpanelaction.php:250
 #, fuzzy
 msgid "saveSettings() not implemented."
 msgstr "Kommando ikkje implementert."
 
 #. TRANS: Client error message thrown if design settings could not be deleted in
 #. TRANS: the admin panel Design.
-#: lib/adminpanelaction.php:274
 #, fuzzy
 msgid "Unable to delete design setting."
 msgstr "Klarte ikkje å lagra Twitter-innstillingane dine!"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:337
 #, fuzzy
 msgid "Basic site configuration"
 msgstr "Stadfesting av epostadresse"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:339
 #, fuzzy
 msgctxt "MENU"
 msgid "Site"
 msgstr "Invitér"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:345
 #, fuzzy
 msgid "Design configuration"
 msgstr "SMS bekreftelse"
 
 #. TRANS: Menu item for site administration
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/adminpanelaction.php:347 lib/groupnav.php:135
 #, fuzzy
 msgctxt "MENU"
 msgid "Design"
 msgstr "Personleg"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:353
 #, fuzzy
 msgid "User configuration"
 msgstr "SMS bekreftelse"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:110
 msgid "User"
 msgstr "Brukar"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:361
 #, fuzzy
 msgid "Access configuration"
 msgstr "SMS bekreftelse"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:369
 #, fuzzy
 msgid "Paths configuration"
 msgstr "SMS bekreftelse"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:377
 #, fuzzy
 msgid "Sessions configuration"
 msgstr "SMS bekreftelse"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:385
 #, fuzzy
 msgid "Edit site notice"
 msgstr "Statusmelding"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:387
 msgid "Site notice"
 msgstr "Statusmelding"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:393
 #, fuzzy
 msgid "Snapshots configuration"
 msgstr "SMS bekreftelse"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:401
 msgid "Set site license"
 msgstr ""
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:409
 #, fuzzy
 msgid "Plugins configuration"
 msgstr "SMS bekreftelse"
 
 #. TRANS: Client error 401.
-#: lib/apiauth.php:111
 msgid "API resource requires read-write access, but you only have read access."
 msgstr ""
 
 #. TRANS: OAuth exception thrown when no application is found for a given consumer key.
-#: lib/apiauth.php:177
 msgid "No application for that consumer key."
 msgstr ""
 
-#: lib/apiauth.php:202 lib/apiauth.php:284
 msgid "Not allowed to use API."
 msgstr ""
 
 #. TRANS: OAuth exception given when an incorrect access token was given for a user.
-#: lib/apiauth.php:225
 msgid "Bad access token."
 msgstr ""
 
 #. TRANS: OAuth exception given when no user was found for a given token (no token was found).
-#: lib/apiauth.php:230
 msgid "No user for that token."
 msgstr ""
 
 #. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel".
 #. TRANS: Client error thrown when authentication fails.
-#: lib/apiauth.php:272 lib/apiauth.php:302
 msgid "Could not authenticate you."
 msgstr ""
 
 #. TRANS: Server error displayed when trying to create an anynymous OAuth consumer.
-#: lib/apioauthstore.php:45
 #, fuzzy
 msgid "Could not create anonymous consumer."
 msgstr "Kunne ikkje lagre favoritt."
 
 #. TRANS: Server error displayed when trying to create an anynymous OAuth application.
-#: lib/apioauthstore.php:69
 #, fuzzy
 msgid "Could not create anonymous OAuth application."
 msgstr "Kunne ikkje lagre favoritt."
 
 #. TRANS: Exception thrown when no token association could be found.
-#: lib/apioauthstore.php:151
 msgid ""
 "Could not find a profile and application associated with the request token."
 msgstr ""
 
 #. TRANS: Exception thrown when no access token can be issued.
-#: lib/apioauthstore.php:209
 #, fuzzy
 msgid "Could not issue access token."
 msgstr "Kunne ikkje lagre melding."
 
-#: lib/apioauthstore.php:317
 #, fuzzy
 msgid "Database error inserting OAuth application user."
 msgstr "databasefeil ved innsetjing av skigardmerkelapp (#merkelapp): %s"
 
-#: lib/apioauthstore.php:345
 #, fuzzy
 msgid "Database error updating OAuth application user."
 msgstr "databasefeil ved innsetjing av skigardmerkelapp (#merkelapp): %s"
 
 #. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
-#: lib/apioauthstore.php:371
 msgid "Tried to revoke unknown token."
 msgstr ""
 
 #. TRANS: Exception thrown when an attempt is made to remove a revoked token.
-#: lib/apioauthstore.php:376
 msgid "Failed to delete revoked token."
 msgstr ""
 
 #. TRANS: Form input field label for application icon.
-#: lib/applicationeditform.php:177
 msgid "Icon"
 msgstr ""
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:182
 msgid "Icon for this application"
 msgstr ""
 
 #. TRANS: Form input field instructions.
 #. TRANS: %d is the number of available characters for the description.
-#: lib/applicationeditform.php:201
 #, fuzzy, php-format
 msgid "Describe your application in %d character"
 msgid_plural "Describe your application in %d characters"
@@ -7797,215 +6437,176 @@ msgstr[0] "Beskriv gruppa eller emnet med 140 teikn"
 msgstr[1] "Beskriv gruppa eller emnet med 140 teikn"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:205
 msgid "Describe your application"
 msgstr "Beskriving"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:216
 #, fuzzy
 msgid "URL of the homepage of this application"
 msgstr "URL til heimesida eller bloggen for gruppa eller emnet"
 
 #. TRANS: Form input field label.
-#: lib/applicationeditform.php:218
 #, fuzzy
 msgid "Source URL"
 msgstr "Kjeldekode"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:225
 msgid "Organization responsible for this application"
 msgstr ""
 
 #. TRANS: Form input field label.
-#: lib/applicationeditform.php:227
 #, fuzzy
 msgid "Organization"
 msgstr "Paginering"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:234
 #, fuzzy
 msgid "URL for the homepage of the organization"
 msgstr "URL til heimesida eller bloggen for gruppa eller emnet"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:243
 msgid "URL to redirect to after authentication"
 msgstr ""
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:271
 msgid "Browser"
 msgstr ""
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:288
 msgid "Desktop"
 msgstr ""
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:290
 msgid "Type of application, browser or desktop"
 msgstr ""
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:314
 msgid "Read-only"
 msgstr ""
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:334
 msgid "Read-write"
 msgstr ""
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:336
 msgid "Default access for this application: read-only, or read-write"
 msgstr ""
 
 #. TRANS: Submit button title.
-#: lib/applicationeditform.php:353
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: lib/applicationlist.php:247
 msgid " by "
 msgstr ""
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:260
 msgid "read-write"
 msgstr ""
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:262
 msgid "read-only"
 msgstr ""
 
 #. TRANS: Used in application list. %1$s is a modified date, %2$s is access type ("read-write" or "read-only")
-#: lib/applicationlist.php:268
 #, php-format
 msgid "Approved %1$s - \"%2$s\" access."
 msgstr ""
 
 #. TRANS: Access token in the application list.
 #. TRANS: %s are the first 7 characters of the access token.
-#: lib/applicationlist.php:282
 #, php-format
 msgid "Access token starting with: %s"
 msgstr ""
 
 #. TRANS: Button label
-#: lib/applicationlist.php:298
 msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "Gjenopprett"
 
-#: lib/atom10feed.php:113
 msgid "Author element must contain a name element."
 msgstr ""
 
 #. TRANS: Server exception thrown when using the method setActivitySubject() in the class Atom10Feed.
-#: lib/atom10feed.php:160
 #, fuzzy
 msgid "Do not use this method!"
 msgstr "Ikkje slett denne gruppa"
 
 #. TRANS: Title.
-#: lib/attachmentnoticesection.php:67
 msgid "Notices where this attachment appears"
 msgstr ""
 
 #. TRANS: Title.
-#: lib/attachmenttagcloudsection.php:48
 msgid "Tags for this attachment"
 msgstr ""
 
 #. TRANS: Exception thrown when a password change fails.
-#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:227
 #, fuzzy
 msgid "Password changing failed."
 msgstr "Endra passord"
 
 #. TRANS: Exception thrown when a password change attempt fails because it is not allowed.
-#: lib/authenticationplugin.php:238
 #, fuzzy
 msgid "Password changing is not allowed."
 msgstr "Endra passord"
 
 #. TRANS: Title for the form to block a user.
-#: lib/blockform.php:68
 msgid "Block"
 msgstr "Blokkér"
 
 #. TRANS: Description of the form to block a user.
-#: lib/blockform.php:79
 msgid "Block this user"
 msgstr "Blokkér denne brukaren"
 
 #. TRANS: Title for command results.
-#: lib/channel.php:104 lib/channel.php:125
 msgid "Command results"
 msgstr "Resultat frå kommandoen"
 
 #. TRANS: Title for command results.
-#: lib/channel.php:138
 #, fuzzy
 msgid "AJAX error"
 msgstr "Ajax feil"
 
 #. TRANS: E-mail subject when a command has completed.
-#: lib/channel.php:177 lib/mailhandler.php:143
 msgid "Command complete"
 msgstr "Kommandoen utførd"
 
 #. TRANS: E-mail subject when a command has failed.
-#: lib/channel.php:188
 msgid "Command failed"
 msgstr "Kommandoen feila"
 
 #. TRANS: Command exception text shown when a notice ID is requested that does not exist.
-#: lib/command.php:82 lib/command.php:106
 #, fuzzy
 msgid "Notice with that id does not exist."
 msgstr "Fann ingen profil med den IDen."
 
 #. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
 #. TRANS: Error text shown when a last user notice is requested and it does not exist.
-#: lib/command.php:99 lib/command.php:642
 #, fuzzy
 msgid "User has no last notice."
 msgstr "Brukaren har ikkje siste notis"
 
 #. TRANS: Message given requesting a profile for a non-existing user.
 #. TRANS: %s is the nickname of the user for which the profile could not be found.
-#: lib/command.php:128
 #, fuzzy, php-format
 msgid "Could not find a user with nickname %s."
 msgstr "Kan ikkje oppdatera brukar med stadfesta e-postadresse."
 
 #. TRANS: Message given getting a non-existing user.
 #. TRANS: %s is the nickname of the user that could not be found.
-#: lib/command.php:148
 #, php-format
 msgid "Could not find a local user with nickname %s."
 msgstr ""
 
 #. TRANS: Error text shown when an unimplemented command is given.
-#: lib/command.php:183
 msgid "Sorry, this command is not yet implemented."
 msgstr "Orsak, men kommandoen er ikkje laga enno."
 
 #. TRANS: Command exception text shown when a user tries to nudge themselves.
-#: lib/command.php:229
 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr ""
 
 #. TRANS: Message given having nudged another user.
 #. TRANS: %s is the nickname of the user that was nudged.
-#: lib/command.php:238
 #, fuzzy, php-format
 msgid "Nudge sent to %s."
 msgstr "Dytta!"
@@ -8014,7 +6615,6 @@ msgstr "Dytta!"
 #. TRANS: %1$s is the number of other user the user is subscribed to.
 #. TRANS: %2$s is the number of users that are subscribed to the user.
 #. TRANS: %3$s is the number of notices the user has sent.
-#: lib/command.php:268
 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"
@@ -8023,40 +6623,34 @@ msgid ""
 msgstr ""
 
 #. TRANS: Error message text shown when a favorite could not be set because it has already been favorited.
-#: lib/command.php:298
 #, fuzzy
 msgid "Could not create favorite: already favorited."
 msgstr "Kunne ikkje lagre favoritt."
 
 #. TRANS: Text shown when a notice has been marked as favourite successfully.
-#: lib/command.php:324
 msgid "Notice marked as fave."
 msgstr "Notis markert som favoritt."
 
 #. TRANS: Message given having added a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:369
 #, php-format
 msgid "%1$s joined group %2$s."
 msgstr ""
 
 #. TRANS: Message given having removed a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:417
 #, php-format
 msgid "%1$s left group %2$s."
 msgstr ""
 
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: lib/command.php:438
 #, fuzzy, php-format
 msgctxt "WHOIS"
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
 
 #. TRANS: Whois output. %s is the full name of the queried user.
-#: lib/command.php:442
 #, php-format
 msgid "Fullname: %s"
 msgstr "Fullt namn: %s"
@@ -8064,7 +6658,6 @@ msgstr "Fullt namn: %s"
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a location.
-#: lib/command.php:446 lib/mail.php:275
 #, php-format
 msgid "Location: %s"
 msgstr "Stad: %s"
@@ -8072,20 +6665,17 @@ msgstr "Stad: %s"
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a homepage.
-#: lib/command.php:450 lib/mail.php:279
 #, php-format
 msgid "Homepage: %s"
 msgstr "Heimeside: %s"
 
 #. TRANS: Whois output. %s is the bio information of the queried user.
-#: lib/command.php:454
 #, php-format
 msgid "About: %s"
 msgstr "Om: %s"
 
 #. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).
 #. TRANS: %s is a remote profile.
-#: lib/command.php:483
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
@@ -8094,33 +6684,32 @@ msgstr ""
 
 #. TRANS: Message given if content is too long. %1$sd is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:500
 #, fuzzy, php-format
 msgid "Message too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
 msgstr[0] "Melding for lang - maksimum 140 teikn, du skreiv %d"
 msgstr[1] "Melding for lang - maksimum 140 teikn, du skreiv %d"
 
+#. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
+msgid "You can't send a message to this user."
+msgstr "Du kan ikkje sende melding til denne brukaren."
+
 #. TRANS: Error text shown sending a direct message fails with an unknown reason.
-#: lib/command.php:528
 msgid "Error sending direct message."
 msgstr "Ein feil oppstod ved sending av direkte melding."
 
 #. TRANS: Message given having repeated a notice from another user.
 #. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:565
 #, fuzzy, php-format
 msgid "Notice from %s repeated."
 msgstr "Melding lagra"
 
 #. TRANS: Error text shown when repeating a notice fails with an unknown reason.
-#: lib/command.php:568
 msgid "Error repeating notice."
 msgstr "Feil ved å setja brukar."
 
 #. TRANS: Message given if content of a notice for a reply is too long. %1$d is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:603
 #, fuzzy, php-format
 msgid "Notice too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Notice too long - maximum is %1$d characters, you sent %2$d."
@@ -8129,97 +6718,81 @@ msgstr[1] "Melding for lang - maksimum 140 teikn, du skreiv %d"
 
 #. TRANS: Text shown having sent a reply to a notice successfully.
 #. TRANS: %s is the nickname of the user of the notice the reply was sent to.
-#: lib/command.php:616
 #, fuzzy, php-format
 msgid "Reply to %s sent."
 msgstr "Svar på denne notisen"
 
 #. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
-#: lib/command.php:619
 #, fuzzy
 msgid "Error saving notice."
 msgstr "Eit problem oppstod ved lagring av notis."
 
 #. TRANS: Error text shown when no username was provided when issuing a subscribe command.
-#: lib/command.php:666
 #, fuzzy
 msgid "Specify the name of the user to subscribe to."
 msgstr "Spesifer namnet til brukaren du vil tinge"
 
 #. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
-#: lib/command.php:675
 #, fuzzy
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "Du tingar ikkje oppdateringar til den profilen."
 
 #. TRANS: Text shown after having subscribed to another user successfully.
 #. TRANS: %s is the name of the user the subscription was requested for.
-#: lib/command.php:683
 #, php-format
 msgid "Subscribed to %s."
 msgstr ""
 
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.
-#: lib/command.php:704 lib/command.php:815
 #, fuzzy
 msgid "Specify the name of the user to unsubscribe from."
 msgstr "Spesifer namnet til brukar du vil fjerne tinging på"
 
 #. TRANS: Text shown after having unsubscribed from another user successfully.
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:715
 #, php-format
 msgid "Unsubscribed from %s."
 msgstr ""
 
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
-#: lib/command.php:735 lib/command.php:761
 msgid "Command not yet implemented."
 msgstr "Kommando ikkje implementert."
 
 #. TRANS: Text shown when issuing the command "off" successfully.
-#: lib/command.php:739
 msgid "Notification off."
 msgstr "Notifikasjon av."
 
 #. TRANS: Error text shown when the command "off" fails for an unknown reason.
-#: lib/command.php:742
 msgid "Can't turn off notification."
 msgstr "Kan ikkje skru av notifikasjon."
 
 #. TRANS: Text shown when issuing the command "on" successfully.
-#: lib/command.php:765
 msgid "Notification on."
 msgstr "Notifikasjon på."
 
 #. TRANS: Error text shown when the command "on" fails for an unknown reason.
-#: lib/command.php:768
 msgid "Can't turn on notification."
 msgstr "Kan ikkje slå på notifikasjon."
 
 #. TRANS: Error text shown when issuing the login command while login is disabled.
-#: lib/command.php:782
 msgid "Login command is disabled."
 msgstr ""
 
 #. TRANS: Text shown after issuing the login command successfully.
 #. TRANS: %s is a logon link..
-#: lib/command.php:795
 #, php-format
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
 
 #. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:824
 #, php-format
 msgid "Unsubscribed %s."
 msgstr ""
 
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
-#: lib/command.php:842
 #, fuzzy
 msgid "You are not subscribed to anyone."
 msgstr "Du tingar ikkje oppdateringar til den profilen."
@@ -8227,7 +6800,6 @@ msgstr "Du tingar ikkje oppdateringar til den profilen."
 #. TRANS: Text shown after requesting other users a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
-#: lib/command.php:847
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Du tingar allereie oppdatering frå desse brukarane:"
@@ -8235,7 +6807,6 @@ msgstr[1] "Du tingar allereie oppdatering frå desse brukarane:"
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user
 #. TRANS: (followers) without having any subscribers.
-#: lib/command.php:869
 #, fuzzy
 msgid "No one is subscribed to you."
 msgstr "Kan ikkje tinga andre til deg."
@@ -8243,7 +6814,6 @@ msgstr "Kan ikkje tinga andre til deg."
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
-#: lib/command.php:874
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Kan ikkje tinga andre til deg."
@@ -8251,7 +6821,6 @@ msgstr[1] "Kan ikkje tinga andre til deg."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to without having
 #. TRANS: any group subscriptions.
-#: lib/command.php:896
 #, fuzzy
 msgid "You are not a member of any groups."
 msgstr "Du er ikkje medlem av den gruppa."
@@ -8259,14 +6828,12 @@ msgstr "Du er ikkje medlem av den gruppa."
 #. TRANS: Text shown after requesting groups a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
-#: lib/command.php:901
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "Du er ikkje medlem av den gruppa."
 msgstr[1] "Du er ikkje medlem av den gruppa."
 
 #. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-#: lib/command.php:916
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -8309,122 +6876,101 @@ msgid ""
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:36
 #, fuzzy
 msgid "No configuration file found."
 msgstr "Ingen stadfestingskode."
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:39
 #, fuzzy
 msgid "I looked for configuration files in the following places:"
 msgstr "Invitasjon(er) sendt til fylgjande folk:"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:42
 msgid "You may wish to run the installer to fix this."
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:46
 #, fuzzy
 msgid "Go to the installer."
 msgstr "Logg inn or sida"
 
-#: lib/dberroraction.php:59
 msgid "Database error"
 msgstr ""
 
 #. TRANS: Description of form for deleting a user.
-#: lib/deleteuserform.php:75
 #, fuzzy
 msgid "Delete this user"
 msgstr "Slett denne notisen"
 
-#: lib/designform.php:114
 #, fuzzy
 msgid "Change design"
 msgstr "Profilinnstillingar"
 
 #. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: lib/designform.php:131
 #, fuzzy
 msgid "Change colours"
 msgstr "Endra passordet ditt"
 
 #. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: lib/designform.php:138
 msgid "Use defaults"
 msgstr ""
 
 #. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: lib/designform.php:140
 msgid "Restore default designs"
 msgstr ""
 
 #. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: lib/designform.php:148
 msgid "Reset back to default"
 msgstr ""
 
 #. TRANS: Label in form on profile design page.
 #. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
-#: lib/designform.php:158
 msgid "Upload file"
 msgstr "Last opp fil"
 
 #. TRANS: Instructions for form on profile design page.
-#: lib/designform.php:163
 #, fuzzy
 msgid ""
 "You can upload your personal background image. The maximum file size is 2Mb."
 msgstr "Du kan lasta opp ein logo for gruppa."
 
 #. TRANS: Radio button on profile design page that will enable use of the uploaded profile image.
-#: lib/designform.php:194
 msgctxt "RADIO"
 msgid "On"
 msgstr ""
 
 #. TRANS: Radio button on profile design page that will disable use of the uploaded profile image.
-#: lib/designform.php:211
 msgctxt "RADIO"
 msgid "Off"
 msgstr ""
 
 #. TRANS: Title for button on profile design page to save settings.
-#: lib/designform.php:322
 msgid "Save design"
 msgstr ""
 
 #. TRANS: Error message displayed if design settings could not be saved.
 #. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
-#: lib/designsettings.php:216 lib/designsettings.php:238
 #, fuzzy
 msgid "Couldn't update your design."
 msgstr "Kan ikkje oppdatera brukar."
 
 #. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
-#: lib/designsettings.php:244
 msgid "Design defaults restored."
 msgstr ""
 
 #. TRANS: Exception. %s is an ID.
-#: lib/discovery.php:153
 #, fuzzy, php-format
 msgid "Unable to find services for %s."
 msgstr "Bruk dette skjemaet for å redigere gruppa"
 
 #. TRANS: Form legend for removing the favourite status for a favourite notice.
 #. TRANS: Title for button text for removing the favourite status for a favourite notice.
-#: lib/disfavorform.php:108 lib/disfavorform.php:140
 msgid "Disfavor this notice"
 msgstr "Fjern favoriseringsmerket"
 
 #. TRANS: Button text for removing the favourite status for a favourite notice.
-#: lib/disfavorform.php:136
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Disfavor favorite"
@@ -8432,106 +6978,84 @@ msgstr "Fjern favoritt"
 
 #. TRANS: Form legend for adding the favourite status to a notice.
 #. TRANS: Title for button text for adding the favourite status to a notice.
-#: lib/favorform.php:108 lib/favorform.php:139
 msgid "Favor this notice"
 msgstr "Favoriser denne notisen"
 
 #. TRANS: Button text for adding the favourite status to a notice.
-#: lib/favorform.php:135
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Favor"
 msgstr "Tjeneste"
 
-#: lib/feed.php:84
 msgid "RSS 1.0"
 msgstr ""
 
-#: lib/feed.php:86
 msgid "RSS 2.0"
 msgstr ""
 
-#: lib/feed.php:88
 msgid "Atom"
 msgstr ""
 
-#: lib/feed.php:90
 msgid "FOAF"
 msgstr ""
 
-#: lib/feedimporter.php:75
 #, fuzzy
 msgid "Not an atom feed."
 msgstr "Alle medlemmar"
 
-#: lib/feedimporter.php:82
 msgid "No author in the feed."
 msgstr ""
 
-#: lib/feedimporter.php:89
 msgid "Can't import without a user."
 msgstr ""
 
 #. TRANS: Header for feed links (h2).
-#: lib/feedlist.php:66
 msgid "Feeds"
 msgstr ""
 
-#: lib/galleryaction.php:128
 msgid "All"
 msgstr "Alle"
 
-#: lib/galleryaction.php:136
 #, fuzzy
 msgid "Select tag to filter"
 msgstr "Velg ein tilbydar"
 
-#: lib/galleryaction.php:137
 msgid "Tag"
 msgstr "Merkelapp"
 
-#: lib/galleryaction.php:138
 msgid "Choose a tag to narrow list"
 msgstr "Velg ein merkelapp for å begrense lista"
 
-#: lib/galleryaction.php:140
 msgid "Go"
 msgstr "Gå"
 
-#: lib/grantroleform.php:91
 #, php-format
 msgid "Grant this user the \"%s\" role"
 msgstr ""
 
-#: lib/groupeditform.php:147
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr ""
 "1-64 små bokstavar eller tal, ingen punktum (og liknande) eller mellomrom"
 
-#: lib/groupeditform.php:156
 #, fuzzy
 msgid "URL of the homepage or blog of the group or topic."
 msgstr "URL til heimesida eller bloggen for gruppa eller emnet"
 
-#: lib/groupeditform.php:161
 #, fuzzy
 msgid "Describe the group or topic"
 msgstr "Beskriv gruppa eller emnet med 140 teikn"
 
-#: lib/groupeditform.php:163
 #, fuzzy, php-format
 msgid "Describe the group or topic in %d character or less"
 msgid_plural "Describe the group or topic in %d characters or less"
 msgstr[0] "Beskriv gruppa eller emnet med 140 teikn"
 msgstr[1] "Beskriv gruppa eller emnet med 140 teikn"
 
-#: lib/groupeditform.php:175
 #, fuzzy
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\"."
 msgstr "Kvar er du, t.d. «Stavanger, Rogaland, Noreg»"
 
-#: lib/groupeditform.php:183
 #, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -8543,49 +7067,42 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Menu item in the group navigation page.
-#: lib/groupnav.php:86
 msgctxt "MENU"
 msgid "Group"
 msgstr ""
 
 #. TRANS: Tooltip for menu item in the group navigation page.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:89
 #, php-format
 msgctxt "TOOLTIP"
 msgid "%s group"
 msgstr ""
 
 #. TRANS: Menu item in the group navigation page.
-#: lib/groupnav.php:95
 msgctxt "MENU"
 msgid "Members"
 msgstr ""
 
 #. TRANS: Tooltip for menu item in the group navigation page.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:98
 #, php-format
 msgctxt "TOOLTIP"
 msgid "%s group members"
 msgstr ""
 
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/groupnav.php:108
 msgctxt "MENU"
 msgid "Blocked"
 msgstr ""
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:111
 #, php-format
 msgctxt "TOOLTIP"
 msgid "%s blocked users"
 msgstr ""
 
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/groupnav.php:117
 #, fuzzy
 msgctxt "MENU"
 msgid "Admin"
@@ -8593,21 +7110,18 @@ msgstr "Administrator"
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:120
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Edit %s group properties"
 msgstr ""
 
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/groupnav.php:126
 msgctxt "MENU"
 msgid "Logo"
 msgstr ""
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:129
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Add or edit %s logo"
@@ -8615,69 +7129,57 @@ msgstr ""
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:138
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Add or edit %s design"
 msgstr ""
 
 #. TRANS: Title for groups with the most members section.
-#: lib/groupsbymemberssection.php:71
 msgid "Groups with most members"
 msgstr "Grupper med flest medlemmar"
 
 #. TRANS: Title for groups with the most posts section.
-#: lib/groupsbypostssection.php:71
 msgid "Groups with most posts"
 msgstr "Grupper med flest innlegg"
 
 #. TRANS: Title for group tag cloud section.
 #. TRANS: %s is a group name.
-#: lib/grouptagcloudsection.php:57
 #, php-format
 msgid "Tags in %s group's notices"
 msgstr "Merkelappar i %s gruppa sine notisar"
 
 #. TRANS: Client exception 406
-#: lib/htmloutputter.php:104
 msgid "This page is not available in a media type you accept"
 msgstr "Denne sida er ikkje tilgjengeleg i nokon mediatype du aksepterer."
 
 #. TRANS: Exception thrown when trying to upload an unsupported image file format.
-#: lib/imagefile.php:73
 msgid "Unsupported image file format."
 msgstr "Støttar ikkje bileteformatet."
 
 #. TRANS: Exception thrown when too large a file is uploaded.
 #. TRANS: %s is the maximum file size, for example "500b", "10kB" or "2MB".
-#: lib/imagefile.php:91
 #, fuzzy, php-format
 msgid "That file is too big. The maximum file size is %s."
 msgstr "Du kan lasta opp ein logo for gruppa."
 
 #. TRANS: Exception thrown when uploading an image and that action could not be completed.
-#: lib/imagefile.php:97
 msgid "Partial upload."
 msgstr "Hallvegs opplasta."
 
 #. TRANS: Exception thrown when uploading a file as image that is not an image or is a corrupt file.
-#: lib/imagefile.php:115
 msgid "Not an image or corrupt file."
 msgstr "Korrupt bilete."
 
 #. TRANS: Exception thrown during resize when image has been registered as present, but is no longer there.
-#: lib/imagefile.php:178
 msgid "Lost our file."
 msgstr "Mista fila vår."
 
 #. TRANS: Exception thrown when trying to resize an unknown file type.
 #. TRANS: Exception thrown when trying resize an unknown file type.
-#: lib/imagefile.php:216 lib/imagefile.php:257
 msgid "Unknown file type"
 msgstr "Ukjend fil type"
 
 #. TRANS: Number of megabytes. %d is the number.
-#: lib/imagefile.php:303
 #, php-format
 msgid "%dMB"
 msgid_plural "%dMB"
@@ -8685,7 +7187,6 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Number of kilobytes. %d is the number.
-#: lib/imagefile.php:307
 #, php-format
 msgid "%dkB"
 msgid_plural "%dkB"
@@ -8693,14 +7194,12 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Number of bytes. %d is the number.
-#: lib/imagefile.php:310
 #, php-format
 msgid "%dB"
 msgid_plural "%dB"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/implugin.php:262
 #, php-format
 msgid ""
 "User \"%s\" on %s has said that your %s screenname belongs to them. If "
@@ -8710,53 +7209,44 @@ msgid ""
 "message."
 msgstr ""
 
-#: lib/implugin.php:349
 #, php-format
 msgid "Unknown inbox source %d."
 msgstr ""
 
-#: lib/implugin.php:485
 #, fuzzy, php-format
 msgid "Message too long - maximum is %1$d characters, you sent %2$d."
 msgstr "Melding for lang - maksimum 140 teikn, du skreiv %d"
 
-#: lib/leaveform.php:114
 msgid "Leave"
 msgstr "Forlat"
 
 #. TRANS: Menu item for logging in to the StatusNet site.
-#: lib/logingroupnav.php:77
 #, fuzzy
 msgctxt "MENU"
 msgid "Login"
 msgstr "Logg inn"
 
 #. TRANS: Title for menu item for logging in to the StatusNet site.
-#: lib/logingroupnav.php:79
 msgid "Login with a username and password"
 msgstr "Log inn med brukarnamn og passord."
 
 #. TRANS: Menu item for registering with the StatusNet site.
-#: lib/logingroupnav.php:85
 #, fuzzy
 msgctxt "MENU"
 msgid "Register"
 msgstr "Registrér"
 
 #. TRANS: Title for menu item for registering with the StatusNet site.
-#: lib/logingroupnav.php:87
 msgid "Sign up for a new account"
 msgstr "Opprett ny konto"
 
 #. TRANS: Subject for address confirmation email.
-#: lib/mail.php:172
 msgid "Email address confirmation"
 msgstr "Stadfesting av epostadresse"
 
 #. TRANS: Body for address confirmation email.
 #. TRANS: %1$s is the addressed user's nickname, %2$s is the StatusNet sitename,
 #. TRANS: %3$s is the URL to confirm at.
-#: lib/mail.php:177
 #, php-format
 msgid ""
 "Hey, %1$s.\n"
@@ -8775,14 +7265,12 @@ msgstr ""
 
 #. TRANS: Subject of new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
-#: lib/mail.php:243
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1$s høyrer no på notisane dine på %2$s."
 
 #. TRANS: This is a paragraph in a new-subscriber e-mail.
 #. TRANS: %s is a URL where the subscriber can be reported as abusive.
-#: lib/mail.php:250
 #, php-format
 msgid ""
 "If you believe this account is being used abusively, you can block them from "
@@ -8794,7 +7282,6 @@ msgstr ""
 #. TRANS: %3$s is the subscriber's profile URL, %4$s is the subscriber's location (or empty)
 #. TRANS: %5$s is the subscriber's homepage URL (or empty), %6%s is the subscriber's bio (or empty)
 #. TRANS: %7$s is a link to the addressed user's e-mail settings.
-#: lib/mail.php:260
 #, fuzzy, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -8817,14 +7304,12 @@ msgstr ""
 
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is biographical information.
-#: lib/mail.php:283
 #, php-format
 msgid "Bio: %s"
 msgstr "Stad: %s"
 
 #. TRANS: Subject of notification mail for new posting email address.
 #. TRANS: %s is the StatusNet sitename.
-#: lib/mail.php:312
 #, php-format
 msgid "New email address for posting to %s"
 msgstr "Ny epostadresse for å oppdatera %s"
@@ -8832,7 +7317,6 @@ msgstr "Ny epostadresse for å oppdatera %s"
 #. TRANS: Body of notification mail for new posting email address.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is the e-mail address to send
 #. TRANS: to to post by e-mail, %3$s is a URL to more instructions.
-#: lib/mail.php:318
 #, fuzzy, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -8854,26 +7338,22 @@ msgstr ""
 
 #. TRANS: Subject line for SMS-by-email notification messages.
 #. TRANS: %s is the posting user's nickname.
-#: lib/mail.php:439
 #, php-format
 msgid "%s status"
 msgstr "%s status"
 
 #. TRANS: Subject line for SMS-by-email address confirmation message.
-#: lib/mail.php:465
 msgid "SMS confirmation"
 msgstr "SMS bekreftelse"
 
 #. TRANS: Main body heading for SMS-by-email address confirmation message.
 #. TRANS: %s is the addressed user's nickname.
-#: lib/mail.php:469
 #, fuzzy, php-format
 msgid "%s: confirm you own this phone number with this code:"
 msgstr "Ventar på godkjenning for dette telefonnummeret."
 
 #. TRANS: Subject for 'nudge' notification email.
 #. TRANS: %s is the nudging user.
-#: lib/mail.php:490
 #, fuzzy, php-format
 msgid "You have been nudged by %s"
 msgstr "Du har blitt dulta av %s"
@@ -8881,7 +7361,6 @@ msgstr "Du har blitt dulta av %s"
 #. TRANS: Body for 'nudge' notification email.
 #. TRANS: %1$s is the nuding user's long name, $2$s is the nudging user's nickname,
 #. TRANS: %3$s is a URL to post notices at, %4$s is the StatusNet sitename.
-#: lib/mail.php:497
 #, php-format
 msgid ""
 "%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -8899,7 +7378,6 @@ msgstr ""
 
 #. TRANS: Subject for direct-message notification email.
 #. TRANS: %s is the sending user's nickname.
-#: lib/mail.php:544
 #, php-format
 msgid "New private message from %s"
 msgstr "Ny privat melding fra %s"
@@ -8908,7 +7386,6 @@ msgstr "Ny privat melding fra %s"
 #. TRANS: %1$s is the sending user's long name, %2$s is the sending user's nickname,
 #. TRANS: %3$s is the message content, %4$s a URL to the message,
 #. TRANS: %5$s is the StatusNet sitename.
-#: lib/mail.php:552
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -8929,7 +7406,6 @@ msgstr ""
 
 #. TRANS: Subject for favorite notification e-mail.
 #. TRANS: %1$s is the adding user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:604
 #, fuzzy, php-format
 msgid "%1$s (@%2$s) added your notice as a favorite"
 msgstr ""
@@ -8940,7 +7416,6 @@ msgstr ""
 #. TRANS: %3$s is a URL to the faved notice, %4$s is the faved notice text,
 #. TRANS: %5$s is a URL to all faves of the adding user, %6$s is the StatusNet sitename,
 #. TRANS: %7$s is the adding user's nickname.
-#: lib/mail.php:611
 #, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -8962,7 +7437,6 @@ msgid ""
 msgstr ""
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:669
 #, php-format
 msgid ""
 "The full conversation can be read here:\n"
@@ -8972,7 +7446,6 @@ msgstr ""
 
 #. TRANS: E-mail subject for notice notification.
 #. TRANS: %1$s is the sending user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:677
 #, php-format
 msgid "%1$s (@%2$s) sent a notice to your attention"
 msgstr ""
@@ -8983,7 +7456,6 @@ msgstr ""
 #. TRANS: %5$s is a URL to the full conversion if it exists (otherwise empty),
 #. TRANS: %6$s is a URL to reply to the notice, %7$s is a URL to all @-replied for the addressed user,
 #. TRANS: %8$s is a URL to the addressed user's e-mail settings, %9$s is the sender's nickname.
-#: lib/mail.php:685
 #, php-format
 msgid ""
 "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -9010,63 +7482,51 @@ msgid ""
 "P.S. You can turn off these email notifications here: %8$s\n"
 msgstr ""
 
-#: lib/mailbox.php:87
 msgid "Only the user can read their own mailboxes."
 msgstr "Kun brukaren kan lese sine eigne meldingar."
 
-#: lib/mailbox.php:125
 msgid ""
 "You have no private messages. You can send private message to engage other "
 "users in conversation. People can send you messages for your eyes only."
 msgstr ""
 
-#: lib/mailhandler.php:37
 msgid "Could not parse message."
 msgstr "Kunne ikkje prosessera melding."
 
-#: lib/mailhandler.php:42
 msgid "Not a registered user."
 msgstr "Ikkje ein registrert brukar."
 
-#: lib/mailhandler.php:46
 msgid "Sorry, that is not your incoming email address."
 msgstr "Beklager, det er ikkje di inngåande epost addresse."
 
-#: lib/mailhandler.php:50
 msgid "Sorry, no incoming email allowed."
 msgstr "Beklager, inngåande epost er ikkje tillatt."
 
-#: lib/mailhandler.php:229
 #, fuzzy, php-format
 msgid "Unsupported message type: %s"
 msgstr "Støttar ikkje bileteformatet."
 
 #. TRANS: Client exception thrown when a database error was thrown during a file upload operation.
-#: lib/mediafile.php:102 lib/mediafile.php:174
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
 
 #. TRANS: Client exception thrown when a file upload operation would cause a user to exceed a set quota.
-#: lib/mediafile.php:238 lib/mediafile.php:281
 msgid "File exceeds user's quota."
 msgstr ""
 
 #. TRANS: Client exception thrown when a file upload operation fails because the file could
 #. TRANS: not be moved from the temporary folder to the permanent file location.
-#: lib/mediafile.php:258 lib/mediafile.php:300
 msgid "File could not be moved to destination directory."
 msgstr ""
 
 #. TRANS: Client exception thrown when a file upload operation has been stopped because the MIME
 #. TRANS: type of the uploaded file could not be determined.
-#: lib/mediafile.php:265 lib/mediafile.php:306
 msgid "Could not determine file's MIME type."
 msgstr "Kunne ikkje slette favoritt."
 
 #. TRANS: Client exception thrown trying to upload a forbidden MIME type.
 #. TRANS: %1$s is the file type that was denied, %2$s is the application part of
 #. TRANS: the MIME type that was denied.
-#: lib/mediafile.php:396
 #, php-format
 msgid ""
 "\"%1$s\" is not a supported file type on this server. Try using another %2$s "
@@ -9075,522 +7535,412 @@ msgstr ""
 
 #. TRANS: Client exception thrown trying to upload a forbidden MIME type.
 #. TRANS: %s is the file type that was denied.
-#: lib/mediafile.php:401
 #, php-format
 msgid "\"%s\" is not a supported file type on this server."
 msgstr ""
 
-#: lib/messageform.php:120
 msgid "Send a direct notice"
 msgstr "Send ei direkte melding"
 
 #. TRANS Label entry in drop-down selection box in direct-message inbox/outbox. This is the default entry in the drop-down box, doubling as instructions and a brake against accidental submissions with the first user in the list.
-#: lib/messageform.php:137
 #, fuzzy
 msgid "Select recipient:"
 msgstr "Velg ein tilbydar"
 
 #. TRANS Entry in drop-down selection box in direct-message inbox/outbox when no one is available to message.
-#: lib/messageform.php:150
 #, fuzzy
 msgid "No mutual subscribers."
 msgstr "Ikkje tinga."
 
-#: lib/messageform.php:153
 msgid "To"
 msgstr "Til"
 
-#: lib/messageform.php:184 lib/noticeform.php:236
 #, fuzzy
 msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr "Send"
 
-#: lib/messagelist.php:77
 #, fuzzy
 msgid "Messages"
 msgstr "Melding"
 
-#: lib/messagelistitem.php:123 lib/noticelist.php:527
 #, fuzzy
 msgid "from"
 msgstr " frå "
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:178
 msgid "Nickname cannot be empty."
 msgstr ""
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:191
 #, php-format
 msgid "Nickname cannot be more than %d character long."
 msgid_plural "Nickname cannot be more than %d characters long."
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/noticeform.php:160
+#. TRANS: Form legend for notice form.
 msgid "Send a notice"
 msgstr "Send ei melding"
 
-#: lib/noticeform.php:174
+#. TRANS: Title for notice label. %s is the user's nickname.
 #, php-format
 msgid "What's up, %s?"
 msgstr "Kva skjer, %s?"
 
-#: lib/noticeform.php:193
+#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr ""
 
-#: lib/noticeform.php:197
-msgid "Attach a file"
+#. TRANS: Title for input field to attach a file to a notice.
+msgid "Attach a file."
 msgstr ""
 
-#: lib/noticeform.php:212
+#. TRANS: Field label to add location to a notice.
 #, fuzzy
 msgid "Share my location"
 msgstr "Kan ikkje lagra merkelapp."
 
-#: lib/noticeform.php:215
+#. TRANS: Text to not share location for a notice in notice form.
 #, fuzzy
 msgid "Do not share my location"
 msgstr "Kan ikkje lagra merkelapp."
 
-#: lib/noticeform.php:216
+#. TRANS: Timeout error text for location retrieval in notice form.
 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
 "try again later"
 msgstr ""
 
 #. TRANS: Used in coordinates as abbreviation of north
-#: lib/noticelist.php:457
 #, fuzzy
 msgid "N"
 msgstr "Nei"
 
 #. TRANS: Used in coordinates as abbreviation of south
-#: lib/noticelist.php:459
 msgid "S"
 msgstr ""
 
 #. TRANS: Used in coordinates as abbreviation of east
-#: lib/noticelist.php:461
 msgid "E"
 msgstr ""
 
 #. TRANS: Used in coordinates as abbreviation of west
-#: lib/noticelist.php:463
 msgid "W"
 msgstr ""
 
-#: lib/noticelist.php:465
 #, php-format
 msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgstr ""
 
-#: lib/noticelist.php:474
 msgid "at"
 msgstr ""
 
-#: lib/noticelist.php:523
 msgid "web"
 msgstr ""
 
-#: lib/noticelist.php:589
 #, fuzzy
 msgid "in context"
 msgstr "Ingen innhald."
 
-#: lib/noticelist.php:624
 #, fuzzy
 msgid "Repeated by"
 msgstr "Lag"
 
-#: lib/noticelist.php:651
 msgid "Reply to this notice"
 msgstr "Svar på denne notisen"
 
-#: lib/noticelist.php:652
 msgid "Reply"
 msgstr "Svar"
 
-#: lib/noticelist.php:678
 msgid "Delete this notice"
 msgstr "Slett denne notisen"
 
-#: lib/noticelist.php:696
 #, fuzzy
 msgid "Notice repeated"
 msgstr "Melding lagra"
 
-#: lib/nudgeform.php:116
 msgid "Nudge this user"
 msgstr "Dult denne brukaren"
 
-#: lib/nudgeform.php:128
 msgid "Nudge"
 msgstr "Dult"
 
-#: lib/nudgeform.php:128
 msgid "Send a nudge to this user"
 msgstr "Send eit dult til denne brukaren"
 
-#: lib/oauthstore.php:294
 msgid "Error inserting new profile."
 msgstr ""
 
-#: lib/oauthstore.php:302
 msgid "Error inserting avatar."
 msgstr ""
 
-#: lib/oauthstore.php:322
 msgid "Error inserting remote profile."
 msgstr ""
 
 #. TRANS: Exception thrown when a notice is denied because it has been sent before.
-#: lib/oauthstore.php:362
 msgid "Duplicate notice."
 msgstr ""
 
-#: lib/oauthstore.php:507
 msgid "Couldn't insert new subscription."
 msgstr "Kan ikkje leggja til ny tinging."
 
-#: lib/personalgroupnav.php:104
-#, fuzzy
 msgid "Replies"
 msgstr "Svar"
 
-#: lib/personalgroupnav.php:109
-#, fuzzy
 msgid "Favorites"
 msgstr "Favorittar"
 
-#: lib/personalgroupnav.php:120
-#, fuzzy
 msgid "Inbox"
 msgstr "Innboks"
 
-#: lib/personalgroupnav.php:121
 msgid "Your incoming messages"
 msgstr "Dine innkomande meldinger"
 
-#: lib/personalgroupnav.php:125
-#, fuzzy
 msgid "Outbox"
 msgstr "Utboks"
 
-#: lib/personalgroupnav.php:126
 msgid "Your sent messages"
 msgstr "Dine sende meldingar"
 
 #. TRANS: Title for personal tag cloud section. %s is a user nickname.
-#: lib/personaltagcloudsection.php:56
 #, php-format
 msgid "Tags in %s's notices"
 msgstr "Merkelappar i %s sine notisar"
 
 #. TRANS: Displayed as version information for a plugin if no version information was found.
-#: lib/plugin.php:126
 #, fuzzy
 msgid "Unknown"
 msgstr "Uventa handling."
 
 #. TRANS: Plugin admin panel controls
-#: lib/plugindisableform.php:90
 msgctxt "plugin"
 msgid "Disable"
 msgstr ""
 
 #. TRANS: Plugin admin panel controls
-#: lib/pluginenableform.php:112
 msgctxt "plugin"
 msgid "Enable"
 msgstr ""
 
-#: lib/pluginlist.php:196
 msgctxt "plugin-description"
 msgid "(Plugin descriptions unavailable when disabled.)"
 msgstr ""
 
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:88
 msgid "Subscriptions"
 msgstr "Tingingar"
 
 #. TRANS: Text for user subscription statistics if user has more subscriptions than displayed.
-#: lib/profileaction.php:144
 msgid "All subscriptions"
 msgstr "Alle tingingar"
 
 #. TRANS: H2 text for user subscriber statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:96
 msgid "Subscribers"
 msgstr "Tingarar"
 
 #. TRANS: Text for user subscription statistics if user has more subscribers than displayed.
-#: lib/profileaction.php:181
 msgid "All subscribers"
 msgstr "Tingarar"
 
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:213
 #, fuzzy
 msgid "User ID"
 msgstr "Brukar"
 
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:219
 msgid "Member since"
 msgstr "Medlem sidan"
 
 #. TRANS: Label for user statistics.
 #. TRANS: H2 text for user group membership statistics.
-#: lib/profileaction.php:239 lib/profileaction.php:290
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:104
 msgid "Groups"
 msgstr "Grupper"
 
 #. TRANS: Label for user statistics.
 #. TRANS: Average count of posts made per day since account registration.
-#: lib/profileaction.php:253
 msgid "Daily average"
 msgstr ""
 
 #. TRANS: Text for user group membership statistics if user has more subscriptions than displayed.
-#: lib/profileaction.php:305
 msgid "All groups"
 msgstr "Alle gruppar"
 
 #. TRANS: Server error displayed when using an unimplemented method.
-#: lib/profileformaction.php:123
 msgid "Unimplemented method."
 msgstr ""
 
-#: lib/publicgroupnav.php:82
 msgid "User groups"
 msgstr "Brukar grupper"
 
-#: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
 msgid "Recent tags"
 msgstr "Nylege emneord"
 
-#: lib/publicgroupnav.php:88
 msgid "Featured"
 msgstr "Framheva"
 
-#: lib/publicgroupnav.php:92
 msgid "Popular"
 msgstr "Populære"
 
-#: lib/redirectingaction.php:95
 #, fuzzy
 msgid "No return-to arguments."
 msgstr "Manglar argumentet ID."
 
-#: lib/repeatform.php:107
 #, fuzzy
 msgid "Repeat this notice?"
 msgstr "Svar på denne notisen"
 
-#: lib/repeatform.php:132
 msgid "Yes"
 msgstr "Jau"
 
-#: lib/repeatform.php:132
 #, fuzzy
 msgid "Repeat this notice"
 msgstr "Svar på denne notisen"
 
-#: lib/revokeroleform.php:91
 #, fuzzy, php-format
 msgid "Revoke the \"%s\" role from this user"
 msgstr "Ei liste over brukarane i denne gruppa."
 
 #. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:1001
 #, fuzzy
 msgid "Page not found."
 msgstr "Fann ikkje API-metode."
 
-#: lib/sandboxform.php:67
 #, fuzzy
 msgid "Sandbox"
 msgstr "Innboks"
 
-#: lib/sandboxform.php:78
 #, fuzzy
 msgid "Sandbox this user"
 msgstr "Lås opp brukaren"
 
 #. TRANS: Fieldset legend for the search form.
-#: lib/searchaction.php:120
 #, fuzzy
 msgid "Search site"
 msgstr "Søk"
 
 #. TRANS: Used as a field label for the field where one or more keywords
 #. TRANS: for searching can be entered.
-#: lib/searchaction.php:128
 msgid "Keyword(s)"
 msgstr ""
 
 #. TRANS: Button text for searching site.
-#: lib/searchaction.php:130
 msgctxt "BUTTON"
 msgid "Search"
 msgstr ""
 
-#: lib/searchgroupnav.php:80
 msgid "People"
 msgstr "Folk"
 
-#: lib/searchgroupnav.php:81
 msgid "Find people on this site"
 msgstr "Finn folk på denne sida"
 
-#: lib/searchgroupnav.php:83
 msgid "Find content of notices"
 msgstr "Søk i innhaldet av notisar"
 
-#: lib/searchgroupnav.php:85
 msgid "Find groups on this site"
 msgstr "Finn grupper på denne sida"
 
-#: lib/section.php:89
 msgid "Untitled section"
 msgstr "Seksjon utan tittel"
 
-#: lib/section.php:106
 msgid "More..."
 msgstr ""
 
-#: lib/settingsnav.php:78
 msgid "Change your profile settings"
 msgstr "Endra profilinnstillingane dine"
 
-#: lib/settingsnav.php:83
 msgid "Upload an avatar"
 msgstr "Last opp ein avatar"
 
-#: lib/settingsnav.php:88
 msgid "Change your password"
 msgstr "Endra passordet ditt"
 
-#: lib/settingsnav.php:93
 msgid "Change email handling"
 msgstr "Endra eposthandtering"
 
-#: lib/settingsnav.php:98
 #, fuzzy
 msgid "Design your profile"
 msgstr "Brukarprofil"
 
-#: lib/settingsnav.php:102
 msgid "URL"
 msgstr "URL"
 
-#: lib/settingsnav.php:103
 msgid "URL shorteners"
 msgstr ""
 
-#: lib/settingsnav.php:111
 msgid "Updates by instant messenger (IM)"
 msgstr "Oppdateringar over direktemeldingar (IM)"
 
-#: lib/settingsnav.php:118
 msgid "Updates by SMS"
 msgstr "Oppdateringar over SMS"
 
-#: lib/settingsnav.php:123
 #, fuzzy
 msgid "Connections"
 msgstr "Kopla til"
 
-#: lib/settingsnav.php:124
 msgid "Authorized connected applications"
 msgstr ""
 
-#: lib/silenceform.php:67
 #, fuzzy
 msgid "Silence"
 msgstr "Statusmelding"
 
-#: lib/silenceform.php:78
 #, fuzzy
 msgid "Silence this user"
 msgstr "Blokkér denne brukaren"
 
-#: lib/subgroupnav.php:89
 #, php-format
 msgid "People %s subscribes to"
 msgstr "Mennesker %s tingar"
 
-#: lib/subgroupnav.php:97
 #, php-format
 msgid "People subscribed to %s"
 msgstr "Mennesker som tingar %s"
 
-#: lib/subgroupnav.php:105
 #, php-format
 msgid "Groups %s is a member of"
 msgstr "Grupper %s er medlem av"
 
-#: lib/subgroupnav.php:111
 msgid "Invite"
 msgstr "Invitér"
 
-#: lib/subgroupnav.php:112
 #, php-format
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Inviter vennar og kollega til å bli med deg på %s"
 
-#: lib/subscribeform.php:115 lib/subscribeform.php:139
 msgid "Subscribe to this user"
 msgstr "Lagre tinging for brukar: %s"
 
-#: lib/subscriberspeopleselftagcloudsection.php:48
-#: lib/subscriptionspeopleselftagcloudsection.php:48
 msgid "People Tagcloud as self-tagged"
 msgstr ""
 
-#: lib/subscriberspeopletagcloudsection.php:48
-#: lib/subscriptionspeopletagcloudsection.php:48
 msgid "People Tagcloud as tagged"
 msgstr ""
 
-#: lib/tagcloudsection.php:56
 msgid "None"
 msgstr "Ingen"
 
 #. TRANS: Server exception displayed if a theme name was invalid.
-#: lib/theme.php:74
 #, fuzzy
 msgid "Invalid theme name."
 msgstr "Ugyldig filnamn."
 
-#: lib/themeuploader.php:50
 msgid "This server cannot handle theme uploads without ZIP support."
 msgstr ""
 
-#: lib/themeuploader.php:58 lib/themeuploader.php:61
 msgid "The theme file is missing or the upload failed."
 msgstr ""
 
-#: lib/themeuploader.php:91 lib/themeuploader.php:102
-#: lib/themeuploader.php:279 lib/themeuploader.php:283
-#: lib/themeuploader.php:291 lib/themeuploader.php:298
 #, fuzzy
 msgid "Failed saving theme."
 msgstr "Feil ved oppdatering av brukarbilete."
 
-#: lib/themeuploader.php:147
 msgid "Invalid theme: bad directory structure."
 msgstr ""
 
-#: lib/themeuploader.php:166
 #, php-format
 msgid "Uploaded theme is too large; must be less than %d byte uncompressed."
 msgid_plural ""
@@ -9598,158 +7948,128 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/themeuploader.php:179
 msgid "Invalid theme archive: missing file css/display.css"
 msgstr ""
 
-#: lib/themeuploader.php:219
 msgid ""
 "Theme contains invalid file or folder name. Stick with ASCII letters, "
 "digits, underscore, and minus sign."
 msgstr ""
 
-#: lib/themeuploader.php:225
 msgid "Theme contains unsafe file extension names; may be unsafe."
 msgstr ""
 
-#: lib/themeuploader.php:242
 #, php-format
 msgid "Theme contains file of type '.%s', which is not allowed."
 msgstr ""
 
-#: lib/themeuploader.php:260
 msgid "Error opening theme archive."
 msgstr "Feil ved fjerning av blokka."
 
-#: lib/threadednoticelist.php:270
 #, php-format
-msgid "Show all %d comment"
-msgid_plural "Show all %d comments"
+msgid "Show %d reply"
+msgid_plural "Show all %d replies"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/topposterssection.php:74
 msgid "Top posters"
 msgstr "Med flest meldingar"
 
 #. TRANS: Title for the form to unblock a user.
-#: lib/unblockform.php:67
 #, fuzzy
 msgctxt "TITLE"
 msgid "Unblock"
 msgstr "Lås opp"
 
-#: lib/unsandboxform.php:69
 msgid "Unsandbox"
 msgstr ""
 
-#: lib/unsandboxform.php:80
 #, fuzzy
 msgid "Unsandbox this user"
 msgstr "Lås opp brukaren"
 
-#: lib/unsilenceform.php:67
 msgid "Unsilence"
 msgstr ""
 
-#: lib/unsilenceform.php:78
 #, fuzzy
 msgid "Unsilence this user"
 msgstr "Lås opp brukaren"
 
-#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
 msgid "Unsubscribe from this user"
 msgstr "Fjern tinging fra denne brukaren"
 
-#: lib/unsubscribeform.php:137
 msgid "Unsubscribe"
 msgstr "Fjern tinging"
 
 #. 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).
-#: lib/usernoprofileexception.php:60
 #, fuzzy, php-format
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "Brukaren har inga profil."
 
-#: lib/userprofile.php:116
 #, fuzzy
 msgid "Edit Avatar"
 msgstr "Brukarbilete"
 
 #. TRANS: H2 for user actions in a profile.
 #. TRANS: H2 for entity actions in a profile.
-#: lib/userprofile.php:216 lib/userprofile.php:232
 msgid "User actions"
 msgstr "Brukarverkty"
 
 #. TRANS: Text shown in user profile of not yet compeltely deleted users.
-#: lib/userprofile.php:220
 msgid "User deletion in progress..."
 msgstr ""
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:248
 #, fuzzy
 msgid "Edit profile settings"
 msgstr "Profilinnstillingar"
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:250
 msgid "Edit"
 msgstr ""
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:274
 msgid "Send a direct message to this user"
 msgstr "Send ei direktemelding til denne brukaren"
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:276
 msgid "Message"
 msgstr "Melding"
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:318
 msgid "Moderate"
 msgstr ""
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:357
 #, fuzzy
 msgid "User role"
 msgstr "Brukarprofil"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:360
 #, fuzzy
 msgctxt "role"
 msgid "Administrator"
 msgstr "Administrator"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:362
 msgctxt "role"
 msgid "Moderator"
 msgstr ""
 
-#: lib/util.php:321
 #, fuzzy
 msgid "Not allowed to log in."
 msgstr "Ikkje logga inn"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1337
 msgid "a few seconds ago"
 msgstr "eit par sekund sidan"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1340
 msgid "about a minute ago"
 msgstr "omtrent eitt minutt sidan"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1344
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
@@ -9757,12 +8077,10 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1347
 msgid "about an hour ago"
 msgstr "omtrent ein time sidan"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1351
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
@@ -9770,12 +8088,10 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1354
 msgid "about a day ago"
 msgstr "omtrent ein dag sidan"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1358
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
@@ -9783,12 +8099,10 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1361
 msgid "about a month ago"
 msgstr "omtrent ein månad sidan"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1365
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
@@ -9796,193 +8110,39 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1368
 msgid "about a year ago"
 msgstr "omtrent eitt år sidan"
 
 #. TRANS: Web color exception thrown when a hexadecimal color code does not validate.
 #. TRANS: %s is the provided (invalid) color code.
-#: lib/webcolor.php:81 lib/webcolor.php:121
 #, fuzzy, php-format
 msgid "%s is not a valid color! Use 3 or 6 hex characters."
 msgstr "Heimesida er ikkje ei gyldig internettadresse."
 
 #. TRANS: Exception.
-#: lib/xrd.php:63
 #, fuzzy
 msgid "Invalid XML."
 msgstr "Ugyldig storleik."
 
 #. TRANS: Exception.
-#: lib/xrd.php:68
 msgid "Invalid XML, missing XRD root."
 msgstr ""
 
 #. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
-#: scripts/restoreuser.php:62
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
 
-#, fuzzy
-#~ msgid "Could not generate feed for group - %s"
-#~ msgstr "Kann ikkje oppdatera gruppa."
+#~ msgid "Full name is too long (max 255 chars)."
+#~ msgstr "Ditt fulle namn er for langt (maksimalt 255 teikn)."
+
+#~ msgid "description is too long (max %d chars)."
+#~ msgstr "Plassering er for lang (maksimalt 255 teikn)."
+
+#~ msgid "Location is too long (max 255 chars)."
+#~ msgstr "Plassering er for lang (maksimalt 255 teikn)."
 
 #, fuzzy
-#~ msgid "Current confirmed Jabber/Google Talk address."
-#~ msgstr "Stadfesta Jabber/Gtalk-adresse."
-
-#, fuzzy
-#~ msgid ""
-#~ "Jabber or Google Talk address, like \"UserName@example.org\". First, make "
-#~ "sure to add %s to your buddy list in your IM client or on Google Talk."
-#~ msgstr ""
-#~ "Jabber- eller GTalk-adresse, døme «brukarnamn@example.org». Hugs å fyrst "
-#~ "leggja %s til venelista di i ljonmeldingsklienten din."
-
-#, fuzzy
-#~ msgid "Send me notices through Jabber/Google Talk."
-#~ msgstr "Send meg ein notis via Jabber/GTalk."
-
-#, fuzzy
-#~ msgid "Publish a MicroID for my Jabber/Google Talk address."
-#~ msgstr "Publiser ein MicroID for Jabber/GTalk addressene mine"
-
-#~ msgid "No Jabber ID."
-#~ msgstr "Nei Jabber-ID"
-
-#, fuzzy
-#~ msgid "Not a valid Jabber ID."
-#~ msgstr "Ikkje ein gyldig Jabber-ID"
-
-#~ msgid "That is already your Jabber ID."
-#~ msgstr "Det er alt din Jabber ID."
-
-#~ msgid "That is not your Jabber ID."
-#~ msgstr "Det er ikkje din Jabber ID."
-
-#~ msgid "Other settings"
-#~ msgstr "Avatar-innstillingar"
-
-#~ msgid "Tag cloud"
-#~ msgstr "Emne sky"
-
-#~ msgid "Jabber"
-#~ msgstr "Jabber"
-
-#~ msgid "Photo"
-#~ msgstr "Bilete"
-
-#~ msgid "Other options"
-#~ msgstr "Andre val"
-
-#~ msgid "Other"
-#~ msgstr "Anna"
-
-#~ msgid "Primary site navigation"
-#~ msgstr "Navigasjon for hovudsida"
-
-#, fuzzy
-#~ msgctxt "TOOLTIP"
-#~ msgid "Personal profile and friends timeline"
-#~ msgstr "Personleg profil og oversyn over vener"
-
-#, fuzzy
-#~ msgctxt "MENU"
-#~ msgid "Personal"
-#~ msgstr "Personleg"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Change your email, avatar, password, profile"
-#~ msgstr "Endra passordet ditt"
-
-#~ msgid "Account"
-#~ msgstr "Konto"
-
-#, fuzzy
-#~ msgctxt "TOOLTIP"
-#~ msgid "Connect to services"
-#~ msgstr "Klarte ikkje å omdirigera til tenaren: %s"
-
-#~ msgid "Connect"
-#~ msgstr "Kopla til"
-
-#, fuzzy
-#~ msgctxt "TOOLTIP"
-#~ msgid "Change site configuration"
-#~ msgstr "Navigasjon for hovudsida"
-
-#, fuzzy
-#~ msgctxt "TOOLTIP"
-#~ msgid "Invite friends and colleagues to join you on %s"
-#~ msgstr "Inviter vennar og kollega til å bli med deg på %s"
-
-#, fuzzy
-#~ msgctxt "MENU"
-#~ msgid "Invite"
-#~ msgstr "Invitér"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Create an account"
-#~ msgstr "Opprett ei ny gruppe"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Help me!"
-#~ msgstr "Hjelp"
-
-#~ msgctxt "MENU"
-#~ msgid "Help"
-#~ msgstr "Hjelp"
-
-#, fuzzy
-#~ msgctxt "TOOLTIP"
-#~ msgid "Search for people or text"
-#~ msgstr "Søk etter folk eller innhald"
-
-#~ msgid "Local views"
-#~ msgstr "Lokale syningar"
-
-#~ msgid "Page notice"
-#~ msgstr "Sidenotis"
-
-#~ msgid "Secondary site navigation"
-#~ msgstr "Andrenivås side navigasjon"
-
-#~ msgid "StatusNet software license"
-#~ msgstr "StatusNets programvarelisens"
-
-#, fuzzy
-#~ msgid "Site content license"
-#~ msgstr "StatusNets programvarelisens"
-
-#~ msgid "Pagination"
-#~ msgstr "Paginering"
-
-#~ msgid "Provider"
-#~ msgstr "Forhandsvis"
-
-#, fuzzy
-#~ msgctxt "MENU"
-#~ msgid "SMS"
-#~ msgstr "SMS"
-
-#~ msgid "Filter tags"
-#~ msgstr "Filtrer emneord"
-
-#~ msgid "Available characters"
-#~ msgstr "Tilgjenglege teikn"
-
-#, fuzzy
-#~ msgctxt "MENU"
-#~ msgid "Profile"
-#~ msgstr "Profil"
-
-#, fuzzy
-#~ msgid "Search help"
-#~ msgstr "Søk"
-
-#, fuzzy
-#~ msgid "Message too long. Maximum is %1$d character, you sent %2$d."
-#~ msgid_plural "Message too long. Maximum is %1$d characters, you sent %2$d."
-#~ msgstr[0] "Melding for lang - maksimum 140 teikn, du skreiv %d"
-#~ msgstr[1] "Melding for lang - maksimum 140 teikn, du skreiv %d"
+#~ msgctxt "BUTTON"
+#~ msgid "Comment"
+#~ msgstr "Innhald"
diff --git a/locale/pl/LC_MESSAGES/statusnet.po b/locale/pl/LC_MESSAGES/statusnet.po
index 5e533faecb..baea938057 100644
--- a/locale/pl/LC_MESSAGES/statusnet.po
+++ b/locale/pl/LC_MESSAGES/statusnet.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:23+0000\n"
-"PO-Revision-Date: 2011-03-03 17:26:21+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:34+0000\n"
 "Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
 "Language-Team: Polish <http://translatewiki.net/wiki/Portal:pl>\n"
 "MIME-Version: 1.0\n"
@@ -20,61 +20,51 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n == 1) ? 0 : ( (n%10 >= 2 && n%10 <= 4 && "
 "(n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pl\n"
 "X-Message-Group: #out-statusnet-core\n"
-"X-POT-Import-Date: 2011-02-25 23:49:23+0000\n"
+"X-POT-Import-Date: 2011-03-03 17:59:19+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
-#: actions/accessadminpanel.php:53 lib/adminpanelaction.php:363
 msgid "Access"
 msgstr "Dostęp"
 
 #. TRANS: Page notice.
-#: actions/accessadminpanel.php:64
 msgid "Site access settings"
 msgstr "Ustawienia dostępu witryny"
 
 #. TRANS: Form legend for registration form.
-#: actions/accessadminpanel.php:151
 msgid "Registration"
 msgstr "Rejestracja"
 
 #. TRANS: Checkbox instructions for admin setting "Private".
-#: actions/accessadminpanel.php:155
 msgid "Prohibit anonymous users (not logged in) from viewing site?"
 msgstr "Zabronić anonimowym użytkownikom (niezalogowanym) przeglądać witrynę?"
 
 #. TRANS: Checkbox label for prohibiting anonymous users from viewing site.
-#: actions/accessadminpanel.php:157
 msgctxt "LABEL"
 msgid "Private"
 msgstr "Prywatna"
 
 #. TRANS: Checkbox instructions for admin setting "Invite only".
-#: actions/accessadminpanel.php:164
 msgid "Make registration invitation only."
 msgstr "Rejestracja tylko za zaproszeniem."
 
 #. TRANS: Checkbox label for configuring site as invite only.
-#: actions/accessadminpanel.php:166
 msgid "Invite only"
 msgstr "Tylko zaproszeni"
 
 #. TRANS: Checkbox instructions for admin setting "Closed" (no new registrations).
-#: actions/accessadminpanel.php:173
 msgid "Disable new registrations."
 msgstr "Wyłączenie nowych rejestracji."
 
 #. TRANS: Checkbox label for disabling new user registrations.
-#: actions/accessadminpanel.php:175
 msgid "Closed"
 msgstr "Zamknięte"
 
 #. TRANS: Title for button to save access settings in site admin panel.
-#: actions/accessadminpanel.php:191
 msgid "Save access settings"
 msgstr "Zapisz ustawienia dostępu"
 
@@ -82,6 +72,7 @@ msgstr "Zapisz ustawienia dostępu"
 #. TRANS: Button text for saving theme settings.
 #. TRANS: Button label to save e-mail preferences.
 #. TRANS: Button label to save IM preferences.
+#. TRANS: Button text in the license admin panel.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
 #. TRANS: Button text for saving site notice in admin panel.
@@ -91,21 +82,12 @@ msgstr "Zapisz ustawienia dostępu"
 #. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
 #. TRANS: Button text on profile design page to save settings.
-#: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
-#: actions/emailsettings.php:251 actions/imsettings.php:199
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:198
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:204
-#: actions/subscriptions.php:261 actions/urlsettings.php:152
-#: actions/useradminpanel.php:298 lib/applicationeditform.php:355
-#: lib/designform.php:320 lib/groupeditform.php:201
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Zapisz"
 
 #. TRANS: Server error when page not found (404).
 #. TRANS: Server error when page not found (404)
-#: actions/all.php:68 actions/public.php:98 actions/replies.php:93
-#: actions/showfavorites.php:140 actions/tag.php:52
 msgid "No such page."
 msgstr "Nie ma takiej strony."
 
@@ -124,6 +106,7 @@ msgstr "Nie ma takiej strony."
 #. TRANS: Client error displayed when checking group membership for a non-existing user.
 #. TRANS: Client error displayed when trying to have a non-existing user join a group.
 #. TRANS: Client error displayed when trying to have a non-existing user leave a group.
+#. TRANS: Client error displayed when not providing a user or an invalid user.
 #. TRANS: Client error displayed when updating a status for a non-existing user.
 #. TRANS: Client error displayed when requesting a list of followers for a non-existing user.
 #. TRANS: Client error displayed when requesting most recent favourite notices by a user for a non-existing user.
@@ -136,6 +119,8 @@ msgstr "Nie ma takiej strony."
 #. 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.
 #. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
@@ -143,33 +128,10 @@ msgstr "Nie ma takiej strony."
 #. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when calling a profile action without specifying a user.
-#: actions/all.php:80 actions/allrss.php:69
-#: actions/apiaccountupdatedeliverydevice.php:110
-#: actions/apiaccountupdateprofile.php:103
-#: actions/apiaccountupdateprofilebackgroundimage.php:118
-#: actions/apiaccountupdateprofileimage.php:104 actions/apiatomservice.php:59
-#: actions/apiblockcreate.php:96 actions/apiblockdestroy.php:94
-#: actions/apidirectmessage.php:75 actions/apidirectmessagenew.php:72
-#: actions/apigroupcreate.php:111 actions/apigroupismember.php:89
-#: actions/apigroupjoin.php:98 actions/apigroupleave.php:98
-#: actions/apigrouplist.php:70 actions/apigroupprofileupdate.php:108
-#: actions/apistatusesupdate.php:230 actions/apisubscriptions.php:85
-#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:173
-#: actions/apitimelinehome.php:78 actions/apitimelinementions.php:77
-#: actions/apitimelineuser.php:79 actions/avatarbynickname.php:79
-#: actions/favoritesrss.php:72 actions/foaf.php:42 actions/foaf.php:61
-#: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116
-#: actions/otp.php:78 actions/remotesubscribe.php:144
-#: actions/remotesubscribe.php:153 actions/replies.php:73
-#: actions/repliesrss.php:38 actions/rsd.php:113 actions/showfavorites.php:106
-#: actions/userbyid.php:75 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/userxrd.php:59 actions/xrds.php:71 lib/command.php:509
-#: lib/galleryaction.php:59 lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Brak takiego użytkownika."
 
 #. TRANS: Page title. %1$s is user nickname, %2$d is page number
-#: actions/all.php:91
 #, php-format
 msgid "%1$s and friends, page %2$d"
 msgstr "%1$s i przyjaciele, strona %2$d"
@@ -178,33 +140,26 @@ msgstr "%1$s i przyjaciele, strona %2$d"
 #. TRANS: H1 text for page. %s is a user nickname.
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Timeline title for user and friends. %s is a user nickname.
-#: actions/all.php:94 actions/all.php:191 actions/allrss.php:117
-#: actions/apitimelinefriends.php:207 actions/apitimelinehome.php:113
-#: lib/personalgroupnav.php:100
 #, php-format
 msgid "%s and friends"
 msgstr "Użytkownik %s i przyjaciele"
 
 #. TRANS: %s is user nickname.
-#: actions/all.php:108
 #, php-format
 msgid "Feed for friends of %s (RSS 1.0)"
 msgstr "Kanał dla znajomych użytkownika %s (RSS 1.0)"
 
 #. TRANS: %s is user nickname.
-#: actions/all.php:117
 #, php-format
 msgid "Feed for friends of %s (RSS 2.0)"
 msgstr "Kanał dla znajomych użytkownika %s (RSS 2.0)"
 
 #. TRANS: %s is user nickname.
-#: actions/all.php:126
 #, php-format
 msgid "Feed for friends of %s (Atom)"
 msgstr "Kanał dla znajomych użytkownika %s (Atom)"
 
 #. TRANS: Empty list message. %s is a user nickname.
-#: actions/all.php:139
 #, php-format
 msgid ""
 "This is the timeline for %s and friends but no one has posted anything yet."
@@ -214,7 +169,6 @@ msgstr ""
 
 #. TRANS: Encouragement displayed on logged in user's empty timeline.
 #. TRANS: This message contains Markdown links. Keep "](" together.
-#: actions/all.php:146
 #, php-format
 msgid ""
 "Try subscribing to more people, [join a group](%%action.groups%%) or post "
@@ -225,7 +179,6 @@ msgstr ""
 
 #. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@".
 #. TRANS: This message contains Markdown links. Keep "](" together.
-#: actions/all.php:150
 #, php-format
 msgid ""
 "You can try to [nudge %1$s](../%2$s) from their profile or [post something "
@@ -238,7 +191,6 @@ msgstr ""
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
 #. TRANS: Second sentence of empty message for anonymous users. %s is a user nickname.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:221
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -248,14 +200,11 @@ msgstr ""
 "szturchniesz użytkownika %s lub wyślesz mu wpis."
 
 #. TRANS: H1 text for page when viewing a list for self.
-#: actions/all.php:188
 msgid "You and friends"
 msgstr "Ty i przyjaciele"
 
 #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
 #. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name.
-#: actions/allrss.php:122 actions/apitimelinefriends.php:213
-#: actions/apitimelinehome.php:119
 #, php-format
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr "Aktualizacje z %1$s i przyjaciół na %2$s."
@@ -274,55 +223,20 @@ msgstr "Aktualizacje z %1$s i przyjaciół na %2$s."
 #. TRANS: Client error displayed trying to execute an unknown API method checking group membership.
 #. TRANS: Client error displayed trying to execute an unknown API method listing the latest 20 groups.
 #. TRANS: Client error displayed trying to execute an unknown API method showing group membership.
+#. TRANS: Client error displayed when using an unsupported API format.
 #. TRANS: Client error displayed trying to execute an unknown API method showing a group.
 #. TRANS: Client error displayed trying to execute an unknown API method testing API connectivity.
 #. TRANS: Client error displayed trying to execute an unknown API method deleting a status.
 #. TRANS: Client error displayed when trying to handle an unknown API method.
-#: actions/apiaccountratelimitstatus.php:69
-#: actions/apiaccountupdatedeliverydevice.php:92
-#: actions/apiaccountupdateprofile.php:94
-#: actions/apiaccountupdateprofilebackgroundimage.php:92
-#: actions/apiaccountupdateprofilecolors.php:115
-#: actions/apiaccountverifycredentials.php:68 actions/apidirectmessage.php:157
-#: actions/apifavoritecreate.php:98 actions/apifavoritedestroy.php:98
-#: actions/apifriendshipscreate.php:99 actions/apifriendshipsdestroy.php:99
-#: actions/apifriendshipsshow.php:124 actions/apigroupcreate.php:138
-#: actions/apigroupismember.php:115 actions/apigroupjoin.php:151
-#: actions/apigroupleave.php:141 actions/apigrouplist.php:134
-#: actions/apigrouplistall.php:120 actions/apigroupmembership.php:105
-#: actions/apigroupprofileupdate.php:100 actions/apigroupprofileupdate.php:213
-#: actions/apigroupshow.php:114 actions/apihelptest.php:84
-#: actions/apistatusesdestroy.php:101 actions/apistatusesretweets.php:110
-#: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:139
-#: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
-#: actions/apitimelinefavorites.php:182 actions/apitimelinefriends.php:276
-#: actions/apitimelinegroup.php:148 actions/apitimelinehome.php:181
-#: actions/apitimelinementions.php:182 actions/apitimelinepublic.php:247
-#: actions/apitimelineretweetedtome.php:147
-#: actions/apitimelineretweetsofme.php:147 actions/apitimelinetag.php:165
-#: actions/apitimelineuser.php:217 actions/apiusershow.php:100
 msgid "API method not found."
 msgstr "Nie odnaleziono metody 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.
-#: actions/apiaccountupdatedeliverydevice.php:83
-#: actions/apiaccountupdateprofile.php:85
-#: actions/apiaccountupdateprofilebackgroundimage.php:83
-#: actions/apiaccountupdateprofilecolors.php:106
-#: actions/apiaccountupdateprofileimage.php:80 actions/apiblockcreate.php:87
-#: actions/apiblockdestroy.php:85 actions/apidirectmessagenew.php:107
-#: actions/apifavoritecreate.php:88 actions/apifavoritedestroy.php:88
-#: actions/apifriendshipscreate.php:89 actions/apifriendshipsdestroy.php:89
-#: actions/apigroupcreate.php:102 actions/apigroupjoin.php:89
-#: actions/apigroupleave.php:89 actions/apigroupprofileupdate.php:92
-#: actions/apimediaupload.php:66 actions/apistatusesretweet.php:63
-#: actions/apistatusesupdate.php:194
 msgid "This method requires a POST."
 msgstr "Ta metoda wymaga POST."
 
 #. TRANS: Client error displayed when no valid device parameter is provided for a user's delivery device setting.
-#: actions/apiaccountupdatedeliverydevice.php:103
 msgid ""
 "You must specify a parameter named 'device' with a value of one of: sms, im, "
 "none."
@@ -336,10 +250,6 @@ msgstr ""
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
-#: actions/apiaccountupdatedeliverydevice.php:136
-#: actions/emailsettings.php:353 actions/emailsettings.php:499
-#: actions/profilesettings.php:323 actions/smssettings.php:300
-#: actions/smssettings.php:453 actions/urlsettings.php:211
 msgid "Could not update user."
 msgstr "Nie można zaktualizować użytkownika."
 
@@ -352,32 +262,17 @@ msgstr "Nie można zaktualizować użytkownika."
 #. TRANS: Server error displayed when requesting Friends of a Friend feed for a user for which the profile could not be found.
 #. TRANS: Server error displayed when trying to get a user hCard for a user without a profile.
 #. TRANS: Server error displayed when calling a profile action while the specified user does not have a profile.
-#: actions/apiaccountupdateprofile.php:111
-#: actions/apiaccountupdateprofilebackgroundimage.php:199
-#: actions/apiaccountupdateprofilecolors.php:183
-#: actions/apiaccountupdateprofileimage.php:131
-#: actions/apiuserprofileimage.php:88 actions/apiusershow.php:108
-#: actions/avatarbynickname.php:85 actions/foaf.php:69 actions/hcard.php:75
-#: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
-#: lib/profileaction.php:85
 msgid "User has no profile."
 msgstr "Użytkownik nie posiada profilu."
 
 #. TRANS: Server error displayed if a user profile could not be saved.
 #. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:419
 msgid "Could not save profile."
 msgstr "Nie można zapisać profilu."
 
 #. TRANS: Client error displayed when the number of bytes in a POST request exceeds a limit.
 #. TRANS: %s is the number of bytes of the CONTENT_LENGTH.
 #. TRANS: Form validation error in design settings form. POST should remain untranslated.
-#: actions/apiaccountupdateprofilebackgroundimage.php:108
-#: actions/apiaccountupdateprofileimage.php:95 actions/apimediaupload.php:81
-#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
-#: actions/designadminpanel.php:120 actions/editapplication.php:121
-#: actions/newapplication.php:102 actions/newnotice.php:95
-#: lib/designsettings.php:110
 #, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s byte) due to its "
@@ -400,26 +295,15 @@ msgstr[2] ""
 #. TRANS: Client error displayed when a database error occurs inserting profile colours.
 #. TRANS: Client error displayed when a database error occurs updating profile colours.
 #. TRANS: Form validation error displayed when group design settings could not be saved because of an application issue.
-#: actions/apiaccountupdateprofilebackgroundimage.php:138
-#: actions/apiaccountupdateprofilebackgroundimage.php:149
-#: actions/apiaccountupdateprofilecolors.php:160
-#: actions/apiaccountupdateprofilecolors.php:171
-#: actions/groupdesignsettings.php:285 actions/groupdesignsettings.php:296
-#: actions/userdesignsettings.php:218 actions/userdesignsettings.php:228
-#: actions/userdesignsettings.php:270 actions/userdesignsettings.php:280
 msgid "Unable to save your design settings."
 msgstr "Nie można zapisać ustawień wyglądu."
 
 #. TRANS: Error displayed when updating design settings fails.
 #. TRANS: Client error displayed when a database error occurs updating profile colours.
-#: actions/apiaccountupdateprofilebackgroundimage.php:191
-#: actions/apiaccountupdateprofilecolors.php:139
-#: actions/userdesignsettings.php:196
 msgid "Could not update your design."
 msgstr "Nie można zaktualizować wyglądu."
 
 #. TRANS: Title for Atom feed.
-#: actions/apiatomservice.php:85
 msgctxt "ATOM"
 msgid "Main"
 msgstr "Główny"
@@ -428,9 +312,6 @@ msgstr "Główny"
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Title in atom group notice feed. %s is a group name.
 #. TRANS: Title in atom user notice feed. %s is a user name.
-#: actions/apiatomservice.php:93 actions/grouprss.php:138
-#: actions/userrss.php:94 lib/atomgroupnoticefeed.php:63
-#: lib/atomusernoticefeed.php:88
 #, php-format
 msgid "%s timeline"
 msgstr "Oś czasu użytkownika %s"
@@ -440,8 +321,6 @@ msgstr "Oś czasu użytkownika %s"
 #. TRANS: %s is a user nickname.
 #. TRANS: Header for subscriptions overview for a user (first page).
 #. TRANS: %s is a user nickname.
-#: actions/apiatomservice.php:104 actions/atompubsubscriptionfeed.php:148
-#: actions/subscriptions.php:51
 #, php-format
 msgid "%s subscriptions"
 msgstr "Subskrypcje użytkownika %s"
@@ -449,58 +328,48 @@ msgstr "Subskrypcje użytkownika %s"
 #. TRANS: Title for Atom feed with a user's favorite notices. %s is a user nickname.
 #. TRANS: Title for Atom favorites feed.
 #. TRANS: %s is a user nickname.
-#: actions/apiatomservice.php:115 actions/atompubfavoritefeed.php:142
 #, php-format
 msgid "%s favorites"
 msgstr "%s ulubionych"
 
 #. TRANS: Title for Atom feed with a user's memberships. %s is a user nickname.
-#: actions/apiatomservice.php:126
 #, php-format
 msgid "%s memberships"
 msgstr "%s członków"
 
 #. TRANS: Client error displayed when users try to block themselves.
-#: actions/apiblockcreate.php:105
 msgid "You cannot block yourself!"
 msgstr "Nie można zablokować siebie."
 
 #. TRANS: Server error displayed when blocking a user has failed.
-#: actions/apiblockcreate.php:127
 msgid "Block user failed."
 msgstr "Zablokowanie użytkownika nie powiodło się."
 
 #. TRANS: Server error displayed when unblocking a user has failed.
-#: actions/apiblockdestroy.php:113
 msgid "Unblock user failed."
 msgstr "Odblokowanie użytkownika nie powiodło się."
 
 #. TRANS: Title. %s is a user nickname.
-#: actions/apidirectmessage.php:88
 #, php-format
 msgid "Direct messages from %s"
 msgstr "Bezpośrednie wiadomości do użytkownika %s"
 
 #. TRANS: Subtitle. %s is a user nickname.
-#: actions/apidirectmessage.php:93
 #, php-format
 msgid "All the direct messages sent from %s"
 msgstr "Wszystkie bezpośrednie wiadomości wysłane od użytkownika %s"
 
 #. TRANS: Title. %s is a user nickname.
-#: actions/apidirectmessage.php:102
 #, php-format
 msgid "Direct messages to %s"
 msgstr "Bezpośrednia wiadomość do użytkownika %s"
 
 #. TRANS: Subtitle. %s is a user nickname.
-#: actions/apidirectmessage.php:107
 #, php-format
 msgid "All the direct messages sent to %s"
 msgstr "Wszystkie bezpośrednie wiadomości wysłane do użytkownika %s"
 
 #. TRANS: Client error displayed when no message text was submitted (406).
-#: actions/apidirectmessagenew.php:117
 msgid "No message text!"
 msgstr "Brak tekstu wiadomości."
 
@@ -508,7 +377,6 @@ msgstr "Brak tekstu wiadomości."
 #. TRANS: %d is the maximum number of characters for a message.
 #. TRANS: Form validation error displayed when message content is too long.
 #. TRANS: %d is the maximum number of characters for a message.
-#: actions/apidirectmessagenew.php:127 actions/newmessage.php:152
 #, php-format
 msgid "That's too long. Maximum message size is %d character."
 msgid_plural "That's too long. Maximum message size is %d characters."
@@ -517,12 +385,10 @@ msgstr[1] "Wiadomość jest za długa. Maksymalna długość wynosi %d znaki."
 msgstr[2] "Wiadomość jest za długa. Maksymalna długość wynosi %d znaków."
 
 #. TRANS: Client error displayed if a recipient user could not be found (403).
-#: actions/apidirectmessagenew.php:139
 msgid "Recipient user not found."
 msgstr "Nie odnaleziono odbiorcy."
 
 #. TRANS: Client error displayed trying to direct message another user who's not a friend (403).
-#: actions/apidirectmessagenew.php:144
 #, fuzzy
 msgid "Cannot send direct messages to users who aren't your friend."
 msgstr ""
@@ -530,7 +396,6 @@ msgstr ""
 "twoimi przyjaciółmi."
 
 #. TRANS: Client error displayed trying to direct message self (403).
-#: actions/apidirectmessagenew.php:154
 msgid ""
 "Do not send a message to yourself; just say it to yourself quietly instead."
 msgstr "Nie wysyłaj wiadomości do siebie, po prostu powiedz to sobie po cichu."
@@ -538,117 +403,97 @@ msgstr "Nie wysyłaj wiadomości do siebie, po prostu powiedz to sobie po cichu.
 #. 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.
 #. TRANS: Client error displayed trying to delete a status with an invalid ID.
-#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:108
-#: actions/apistatusesdestroy.php:121
 msgid "No status found with that ID."
 msgstr "Nie odnaleziono stanów z tym identyfikatorem."
 
 #. TRANS: Client error displayed when trying to mark a notice favourite that already is a favourite.
-#: actions/apifavoritecreate.php:120
 msgid "This status is already a favorite."
 msgstr "Ten stan jest już ulubiony."
 
 #. TRANS: Client error displayed when marking a notice as favourite fails.
 #. TRANS: Server error displayed when trying to mark a notice as favorite fails in the database.
 #. TRANS: Error message text shown when a favorite could not be set.
-#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:306
 msgid "Could not create favorite."
 msgstr "Nie można utworzyć ulubionego wpisu."
 
 #. TRANS: Client error displayed when trying to remove a favourite that was not a favourite.
-#: actions/apifavoritedestroy.php:122
 msgid "That status is not a favorite."
 msgstr "Ten stan nie jest ulubiony."
 
 #. TRANS: Client error displayed when removing a favourite has failed.
 #. TRANS: Server error displayed when removing a favorite from the database fails.
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:90
 msgid "Could not delete favorite."
 msgstr "Nie można usunąć ulubionego wpisu."
 
 #. TRANS: Client error displayed when trying follow who's profile could not be found.
-#: actions/apifriendshipscreate.php:109
 msgid "Could not follow user: profile not found."
 msgstr "Nie można obserwować użytkownika: nie odnaleziono profilu."
 
 #. TRANS: Client error displayed when trying to follow a user that's already being followed.
 #. TRANS: %s is the nickname of the user that is already being followed.
-#: actions/apifriendshipscreate.php:120
 #, php-format
 msgid "Could not follow user: %s is already on your list."
 msgstr "Nie można obserwować użytkownika: %s jest już na twojej liście."
 
 #. TRANS: Client error displayed when trying to unfollow a user that cannot be found.
-#: actions/apifriendshipsdestroy.php:109
 msgid "Could not unfollow user: User not found."
 msgstr ""
 "Nie można zrezygnować z obserwacji użytkownika: nie odnaleziono użytkownika."
 
 #. TRANS: Client error displayed when trying to unfollow self.
-#: actions/apifriendshipsdestroy.php:121
 msgid "You cannot unfollow yourself."
 msgstr "Nie można zrezygnować z obserwacji samego siebie."
 
 #. TRANS: Client error displayed when supplying invalid parameters to an API call checking if a friendship exists.
-#: actions/apifriendshipsexists.php:88
 msgid "Two valid IDs or nick names must be supplied."
 msgstr "Należy dostarczyć dwa prawidłowe identyfikatory lub pseudonimy."
 
 #. TRANS: Client error displayed when a source user could not be determined showing friendship.
-#: actions/apifriendshipsshow.php:131
 msgid "Could not determine source user."
 msgstr "Nie można określić użytkownika źródłowego."
 
 #. TRANS: Client error displayed when a target user could not be determined showing friendship.
-#: actions/apifriendshipsshow.php:140
 msgid "Could not find target user."
 msgstr "Nie można odnaleźć użytkownika docelowego."
 
 #. TRANS: Client error trying to create a group with a nickname this is already in use.
+#. TRANS: API validation exception thrown when nickname is already used.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:156 actions/apigroupprofileupdate.php:255
-#: actions/editgroup.php:191 actions/newgroup.php:137
-#: actions/profilesettings.php:274 actions/register.php:199
 msgid "Nickname already in use. Try another one."
 msgstr "Pseudonim jest już używany. Spróbuj innego."
 
 #. TRANS: Client error in form for group creation.
+#. TRANS: API validation exception thrown when nickname does not validate.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:164 actions/apigroupprofileupdate.php:259
-#: actions/editgroup.php:195 actions/newgroup.php:141
-#: actions/profilesettings.php:244 actions/register.php:201
 msgid "Not a valid nickname."
 msgstr "To nie jest prawidłowy pseudonim."
 
 #. TRANS: Client error in form for group creation.
+#. TRANS: API validation exception thrown when homepage URL does not validate.
 #. TRANS: Validation error shown when providing an invalid homepage URL in the "Edit application" form.
 #. TRANS: Group edit form validation error.
 #. TRANS: Validation error shown when providing an invalid homepage URL in the "New application" form.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:181 actions/apigroupprofileupdate.php:277
-#: actions/editapplication.php:235 actions/editgroup.php:202
-#: actions/newapplication.php:221 actions/newgroup.php:148
-#: actions/profilesettings.php:249 actions/register.php:208
 msgid "Homepage is not a valid URL."
 msgstr "Strona domowa nie jest prawidłowym adresem URL."
 
 #. TRANS: Client error in form for group creation.
+#. TRANS: API validation exception thrown when full name does not validate.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:191 actions/editgroup.php:206
-#: actions/newgroup.php:152 actions/profilesettings.php:253
-#: actions/register.php:211
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "Imię i nazwisko jest za długie (maksymalnie 255 znaków)."
 
 #. TRANS: Client error shown when providing too long a description during group creation.
 #. TRANS: %d is the maximum number of allowed characters.
+#. TRANS: API validation exception thrown when description does not validate.
+#. TRANS: %d is the maximum description length and used for plural.
 #. TRANS: Validation error shown when providing too long a description in the "Edit application" form.
 #. TRANS: %d is the maximum number of allowed characters.
 #. TRANS: Group edit form validation error.
@@ -656,9 +501,6 @@ msgstr "Imię i nazwisko jest za długie (maksymalnie 255 znaków)."
 #. TRANS: %d is the maximum number of characters for the description.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed characters.
-#: actions/apigroupcreate.php:201 actions/editapplication.php:202
-#: actions/editgroup.php:211 actions/newapplication.php:182
-#: actions/newgroup.php:157
 #, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."
@@ -667,23 +509,21 @@ msgstr[1] "Opis jest za długi (maksymalnie %d znaki)."
 msgstr[2] "Opis jest za długi (maksymalnie %d znaków)."
 
 #. TRANS: Client error shown when providing too long a location during group creation.
+#. TRANS: API validation exception thrown when location does not validate.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:215 actions/editgroup.php:218
-#: actions/newgroup.php:164 actions/profilesettings.php:266
-#: actions/register.php:220
 msgid "Location is too long (maximum 255 characters)."
 msgstr "Położenie jest za długie (maksymalnie 255 znaków)."
 
 #. TRANS: Client error shown when providing too many aliases during group creation.
 #. TRANS: %d is the maximum number of allowed aliases.
+#. TRANS: API validation exception thrown when aliases do not validate.
+#. TRANS: %d is the maximum number of aliases and used for plural.
 #. TRANS: Group edit form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.
-#: actions/apigroupcreate.php:236 actions/editgroup.php:231
-#: actions/newgroup.php:177
 #, php-format
 msgid "Too many aliases! Maximum %d allowed."
 msgid_plural "Too many aliases! Maximum %d allowed."
@@ -693,25 +533,24 @@ msgstr[2] "Za dużo aliasów. Maksymalnie dozwolone jest %d."
 
 #. TRANS: Client error shown when providing an invalid alias during group creation.
 #. TRANS: %s is the invalid alias.
-#: actions/apigroupcreate.php:253
+#. TRANS: API validation exception thrown when aliases does not validate.
+#. TRANS: %s is the invalid alias.
 #, php-format
 msgid "Invalid alias: \"%s\"."
 msgstr "Nieprawidłowy alias: \"%s\"."
 
 #. TRANS: Client error displayed when trying to use an alias during group creation that is already in use.
 #. TRANS: %s is the alias that is already in use.
+#. TRANS: API validation exception thrown when aliases is already used.
+#. TRANS: %s is the already used alias.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error. %s is the already used alias.
-#: actions/apigroupcreate.php:264 actions/apigroupprofileupdate.php:351
-#: actions/editgroup.php:246 actions/newgroup.php:193
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "Alias \"%s\" jest już używany. Spróbuj innego."
 
 #. TRANS: Client error displayed when trying to use an alias during group creation that is the same as the group's nickname.
 #. TRANS: Group edit form validation error.
-#: actions/apigroupcreate.php:278 actions/apigroupprofileupdate.php:359
-#: actions/editgroup.php:253
 msgid "Alias can't be the same as nickname."
 msgstr "Alias nie może być taki sam jak pseudonim."
 
@@ -719,26 +558,21 @@ msgstr "Alias nie może być taki sam jak pseudonim."
 #. TRANS: Client error displayed when trying to join a group that does not exist.
 #. TRANS: Client error displayed when trying to leave a group that does not exist.
 #. TRANS: Client error displayed trying to show group membership on a non-existing group.
+#. TRANS: Client error displayed when not providing a group or an invalid group.
 #. TRANS: Client error displayed when trying to show a group that could not be found.
 #. TRANS: Client error displayed requesting most recent notices to a group for a non-existing group.
-#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
-#: actions/apigroupleave.php:104 actions/apigroupmembership.php:71
-#: actions/apigroupprofileupdate.php:113 actions/apigroupshow.php:81
-#: actions/apitimelinegroup.php:89
 msgid "Group not found."
 msgstr "Nie odnaleziono grupy."
 
 #. TRANS: Server error displayed when trying to join a group the user is already a member of.
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:345
 msgid "You are already a member of that group."
 msgstr "Jesteś już członkiem tej grupy."
 
 #. TRANS: Server error displayed when trying to join a group the user is blocked from joining.
 #. 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.
-#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:350
 msgid "You have been blocked from that group by the admin."
 msgstr "Zostałeś zablokowany w tej grupie przez administratora."
 
@@ -746,13 +580,11 @@ msgstr "Zostałeś zablokowany w tej grupie przez administratora."
 #. TRANS: %1$s is the joining user's nickname, $2$s is the group nickname for which the join failed.
 #. TRANS: Message given having failed to add a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:136 actions/joingroup.php:139 lib/command.php:362
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "Nie można dołączyć użytkownika %1$s do grupy %2$s."
 
 #. TRANS: Server error displayed when trying to leave a group the user is not a member of.
-#: actions/apigroupleave.php:115
 msgid "You are not a member of this group."
 msgstr "Nie jesteś członkiem tej grupy."
 
@@ -760,114 +592,76 @@ msgstr "Nie jesteś członkiem tej grupy."
 #. TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
 #. TRANS: Message given having failed to remove a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupleave.php:127 actions/leavegroup.php:133
-#: lib/command.php:410
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
 msgstr "Nie można usunąć użytkownika %1$s z grupy %2$s."
 
 #. TRANS: Used as title in check for group membership. %s is a user name.
-#: actions/apigrouplist.php:94
 #, php-format
 msgid "%s's groups"
 msgstr "Grupy użytkownika %s"
 
 #. TRANS: Used as subtitle in check for group membership. %1$s is a user name, %2$s is the site name.
-#: actions/apigrouplist.php:104
 #, php-format
 msgid "%1$s groups %2$s is a member of."
 msgstr "%2$s jest członkiem grup %1$s."
 
 #. TRANS: Message is used as a title when listing the lastest 20 groups. %s is a site name.
 #. TRANS: Message is used as a page title. %s is a nick name.
-#: actions/apigrouplistall.php:88 actions/usergroups.php:63
 #, php-format
 msgid "%s groups"
 msgstr "Grupy %s"
 
 #. TRANS: Message is used as a subtitle when listing the lastest 20 groups. %s is a site name.
-#: actions/apigrouplistall.php:93
 #, php-format
 msgid "groups on %s"
 msgstr "grupy na %s"
 
+#. TRANS: Client error displayed when trying to edit a group without being an admin.
 #. TRANS: Client error displayed trying to edit a group while not being a group admin.
 #. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
 #. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
-#: actions/apigroupprofileupdate.php:118 actions/editgroup.php:110
-#: actions/editgroup.php:176 actions/groupdesignsettings.php:109
-#: actions/grouplogo.php:111
 msgid "You must be an admin to edit the group."
 msgstr "Musisz być administratorem, aby zmodyfikować grupę."
 
+#. TRANS: Server error displayed when group update fails.
 #. TRANS: Server error displayed when editing a group fails.
-#: actions/apigroupprofileupdate.php:171 actions/editgroup.php:274
 msgid "Could not update group."
 msgstr "Nie można zaktualizować grupy."
 
+#. TRANS: Server error displayed when adding group aliases fails.
 #. TRANS: Server error displayed when group aliases could not be added.
 #. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/apigroupprofileupdate.php:194 actions/editgroup.php:281
-#: classes/User_group.php:540
 msgid "Could not create aliases."
 msgstr "Nie można utworzyć aliasów."
 
+#. TRANS: API validation exception thrown when nickname does not validate.
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: actions/apigroupprofileupdate.php:249 lib/nickname.php:165
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr "Pseudonim może zawierać tylko małe litery i cyfry, bez spacji."
 
-#: actions/apigroupprofileupdate.php:286
-#, fuzzy
-msgid "Full name is too long (max 255 chars)."
-msgstr "Imię i nazwisko jest za długie (maksymalnie 255 znaków)."
-
-#: actions/apigroupprofileupdate.php:296
-#, fuzzy, php-format
-msgid "description is too long (max %d chars)."
-msgstr "Opis jest za długi (maksymalnie %d znak)."
-
-#: actions/apigroupprofileupdate.php:307
-#, fuzzy
-msgid "Location is too long (max 255 chars)."
-msgstr "Położenie jest za długie (maksymalnie 255 znaków)."
-
-#: actions/apigroupprofileupdate.php:326
-#, fuzzy, php-format
-msgid "Too many aliases! Maximum %d."
-msgstr "Za dużo aliasów. Maksymalnie dozwolony jest %d."
-
-#. TRANS: Group edit form validation error.
+#. TRANS: API validation exception thrown when alias is the same as nickname.
 #. TRANS: Group create form validation error.
-#. TRANS: %s is the invalid alias.
-#: actions/apigroupprofileupdate.php:342 actions/editgroup.php:241
-#: actions/newgroup.php:188
-#, php-format
-msgid "Invalid alias: \"%s\""
-msgstr "Nieprawidłowy alias: \"%s\""
+msgid "Alias cannot be the same as nickname."
+msgstr "Alias nie może być taki sam jak pseudonim."
 
 #. TRANS: Client error displayed when uploading a media file has failed.
-#: actions/apimediaupload.php:101
 msgid "Upload failed."
 msgstr "Wysłanie nie powiodło się."
 
 #. TRANS: Client error given from the OAuth API when the request token or verifier is invalid.
-#: actions/apioauthaccesstoken.php:102
 msgid "Invalid request token or verifier."
 msgstr "Nieprawidłowy token lub element sprawdzający żądania."
 
 #. TRANS: Client error given when no oauth_token was passed to the OAuth API.
-#: actions/apioauthauthorize.php:107
 msgid "No oauth_token parameter provided."
 msgstr "Nie podano parametru oauth_token."
 
 #. TRANS: Client error given when an invalid request token was passed to the OAuth API.
-#: actions/apioauthauthorize.php:115 actions/apioauthauthorize.php:129
 msgid "Invalid request token."
 msgstr "Nieprawidłowy token żądania."
 
 #. TRANS: Client error given when an invalid request token was passed to the OAuth API.
-#: actions/apioauthauthorize.php:121
 msgid "Request token already authorized."
 msgstr "Token żądania został już upoważniony."
 
@@ -877,31 +671,14 @@ msgstr "Token żądania został już upoważniony."
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
 #. TRANS: Client error displayed when the session token is not okay.
-#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:75
-#: actions/emailsettings.php:292 actions/favor.php:75 actions/geocode.php:55
-#: actions/groupblock.php:65 actions/grouplogo.php:321
-#: actions/groupunblock.php:65 actions/imsettings.php:241
-#: actions/invite.php:60 actions/makeadmin.php:66 actions/newmessage.php:135
-#: actions/newnotice.php:105 actions/nudge.php:80
-#: actions/oauthappssettings.php:162 actions/oauthconnectionssettings.php:135
-#: actions/passwordsettings.php:137 actions/pluginenable.php:87
-#: actions/profilesettings.php:218 actions/recoverpassword.php:383
-#: actions/register.php:157 actions/remotesubscribe.php:76
-#: actions/repeat.php:82 actions/smssettings.php:249 actions/subedit.php:40
-#: actions/subscribe.php:87 actions/tagother.php:145
-#: actions/unsubscribe.php:69 actions/urlsettings.php:171
-#: actions/userauthorization.php:53 lib/designsettings.php:122
 msgid "There was a problem with your session token. Try again, please."
 msgstr "Wystąpił problem z tokenem sesji. Spróbuj ponownie."
 
 #. TRANS: Form validation error given when an invalid username and/or password was passed to the OAuth API.
-#: actions/apioauthauthorize.php:168
 msgid "Invalid nickname / password!"
 msgstr "Nieprawidłowy pseudonim/hasło."
 
 #. TRANS: Server error displayed when a database action fails.
-#: actions/apioauthauthorize.php:217
 msgid "Database error inserting oauth_token_association."
 msgstr "Błąd bazy danych podczas wprowadzania oauth_token_association."
 
@@ -917,28 +694,19 @@ msgstr "Błąd bazy danych podczas wprowadzania oauth_token_association."
 #. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
 #. TRANS: Message given submitting a form with an unknown action in SMS settings.
 #. TRANS: Unknown form validation error in design settings form.
-#: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
-#: actions/designadminpanel.php:100 actions/editapplication.php:144
-#: actions/emailsettings.php:311 actions/grouplogo.php:332
-#: actions/imsettings.php:256 actions/newapplication.php:124
-#: actions/oauthconnectionssettings.php:144 actions/recoverpassword.php:46
-#: actions/smssettings.php:270 lib/designsettings.php:133
 msgid "Unexpected form submission."
 msgstr "Nieoczekiwane wysłanie formularza."
 
 #. TRANS: Title for a page where a user can confirm/deny account access by an external application.
-#: actions/apioauthauthorize.php:387
 msgid "An application would like to connect to your account"
 msgstr "Aplikacja chce połączyć się z kontem użytkownika"
 
 #. TRANS: Fieldset legend.
-#: actions/apioauthauthorize.php:404
 msgid "Allow or deny access"
 msgstr "Zezwolić czy odmówić dostęp"
 
 #. TRANS: User notification of external application requesting account access.
 #. TRANS: %3$s is the access type requested (read-write or read-only), %4$s is the StatusNet sitename.
-#: actions/apioauthauthorize.php:425
 #, php-format
 msgid ""
 "An application would like the ability to <strong>%3$s</strong> your %4$s "
@@ -952,7 +720,6 @@ msgstr ""
 #. TRANS: User notification of external application requesting account access.
 #. TRANS: %1$s is the application name requesting access, %2$s is the organisation behind the application,
 #. TRANS: %3$s is the access type requested, %4$s is the StatusNet sitename.
-#: actions/apioauthauthorize.php:433
 #, php-format
 msgid ""
 "The application <strong>%1$s</strong> by <strong>%2$s</strong> would like "
@@ -964,22 +731,18 @@ msgstr ""
 "$s powinien być udostępniany tylko zaufanym osobom trzecim."
 
 #. TRANS: Fieldset legend.
-#: actions/apioauthauthorize.php:455
 msgctxt "LEGEND"
 msgid "Account"
 msgstr "Konto"
 
 #. TRANS: Field label on OAuth API authorisation form.
+#. TRANS: Field label on login page.
 #. TRANS: Field label in form for profile settings.
-#: actions/apioauthauthorize.php:459 actions/login.php:225
-#: actions/profilesettings.php:107 actions/register.php:411
-#: actions/userauthorization.php:145 lib/groupeditform.php:145
 msgid "Nickname"
 msgstr "Pseudonim"
 
 #. TRANS: Field label on OAuth API authorisation form.
-#: actions/apioauthauthorize.php:463 actions/login.php:228
-#: actions/register.php:415 lib/settingsnav.php:87
+#. TRANS: Field label on login page.
 msgid "Password"
 msgstr "Hasło"
 
@@ -989,43 +752,34 @@ msgstr "Hasło"
 #. TRANS: Button label to cancel an IM address confirmation procedure.
 #. TRANS: Button label to cancel a SMS address confirmation procedure.
 #. TRANS: Button label in the "Edit application" form.
-#: actions/apioauthauthorize.php:478 actions/emailsettings.php:125
-#: actions/imsettings.php:136 actions/smssettings.php:132
-#: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Cancel"
 msgstr "Anuluj"
 
 #. TRANS: Button text that when clicked will allow access to an account by an external application.
-#: actions/apioauthauthorize.php:485
 msgctxt "BUTTON"
 msgid "Allow"
 msgstr "Zezwól"
 
 #. TRANS: Form instructions.
-#: actions/apioauthauthorize.php:502
 msgid "Authorize access to your account information."
 msgstr "Upoważnij dostęp do informacji konta."
 
 #. TRANS: Header for user notification after revoking OAuth access to an application.
-#: actions/apioauthauthorize.php:594
 msgid "Authorization canceled."
 msgstr "Anulowano upoważnienie."
 
 #. TRANS: User notification after revoking OAuth access to an application.
 #. TRANS: %s is an OAuth token.
-#: actions/apioauthauthorize.php:598
 #, php-format
 msgid "The request token %s has been revoked."
 msgstr "Token żądania %s został unieważniony."
 
 #. TRANS: Title of the page notifying the user that an anonymous client application was successfully authorized to access the user's account with OAuth.
-#: actions/apioauthauthorize.php:621
 msgid "You have successfully authorized the application"
 msgstr "Pomyślnie upoważniono aplikację"
 
 #. TRANS: Message notifying the user that an anonymous client application was successfully authorized to access the user's account with OAuth.
-#: actions/apioauthauthorize.php:625
 msgid ""
 "Please return to the application and enter the following security code to "
 "complete the process."
@@ -1035,14 +789,12 @@ msgstr ""
 
 #. TRANS: Title of the page notifying the user that the client application was successfully authorized to access the user's account with OAuth.
 #. TRANS: %s is the authorised application name.
-#: actions/apioauthauthorize.php:632
 #, php-format
 msgid "You have successfully authorized %s"
 msgstr "Pomyślnie upoważniono %s"
 
 #. TRANS: Message notifying the user that the client application was successfully authorized to access the user's account with OAuth.
 #. TRANS: %s is the authorised application name.
-#: actions/apioauthauthorize.php:639
 #, php-format
 msgid ""
 "Please return to %s and enter the following security code to complete the "
@@ -1053,12 +805,10 @@ msgstr ""
 
 #. TRANS: Client error displayed trying to delete a status not using POST or DELETE.
 #. TRANS: POST and DELETE should not be translated.
-#: actions/apistatusesdestroy.php:111
 msgid "This method requires a POST or DELETE."
 msgstr "Ta metoda wymaga POST lub DELETE."
 
 #. TRANS: Client error displayed trying to delete a status of another user.
-#: actions/apistatusesdestroy.php:136
 msgid "You may not delete another user's status."
 msgstr "Nie można usuwać stanów innych użytkowników."
 
@@ -1066,21 +816,16 @@ msgstr "Nie można usuwać stanów innych użytkowników."
 #. TRANS: Client error displayed trying to display redents of a non-exiting notice.
 #. TRANS: Client exception thrown when referencing a non-existing notice.
 #. TRANS: Error message displayed trying to delete a non-existing notice.
-#: actions/apistatusesretweet.php:74 actions/apistatusesretweets.php:70
-#: actions/atompubshowfavorite.php:82 actions/deletenotice.php:61
-#: actions/shownotice.php:92
 msgid "No such notice."
 msgstr "Nie ma takiego wpisu."
 
 #. TRANS: Client error displayed trying to repeat an own notice through the API.
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:549
 msgid "Cannot repeat your own notice."
 msgstr "Nie można powtórzyć własnego wpisu."
 
 #. TRANS: Client error displayed trying to re-repeat a notice through the API.
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:92 lib/command.php:555
 msgid "Already repeated that notice."
 msgstr "Już powtórzono ten wpis."
 
@@ -1090,57 +835,43 @@ msgstr "Już powtórzono ten wpis."
 #. TRANS: Client exception thrown when using an unsupported HTTP method.
 #. TRANS: Client error shown when using a non-supported HTTP method.
 #. TRANS: Client exception thrown when using an unsupported HTTP method.
-#: actions/apistatusesshow.php:118 actions/atompubfavoritefeed.php:103
-#: actions/atompubmembershipfeed.php:105 actions/atompubshowfavorite.php:117
-#: actions/atompubshowmembership.php:116
-#: actions/atompubshowsubscription.php:122
-#: actions/atompubsubscriptionfeed.php:109
 msgid "HTTP method not supported."
 msgstr "Metoda HTTP nie jest obsługiwana."
 
 #. TRANS: Exception thrown requesting an unsupported notice output format.
 #. TRANS: %s is the requested output format.
-#: actions/apistatusesshow.php:144
 #, fuzzy, php-format
 msgid "Unsupported format: %s."
 msgstr "Nieobsługiwany format: %s"
 
 #. TRANS: Client error displayed requesting a deleted status.
-#: actions/apistatusesshow.php:155
 msgid "Status deleted."
 msgstr "Usunięto stan."
 
 #. TRANS: Client error displayed requesting a status with an invalid ID.
-#: actions/apistatusesshow.php:162
 msgid "No status with that ID found."
 msgstr "Nie odnaleziono stanów z tym identyfikatorem."
 
 #. TRANS: Client error displayed when trying to delete a notice not using the Atom format.
-#: actions/apistatusesshow.php:227
 msgid "Can only delete using the Atom format."
 msgstr "Można usunąć tylko używając formatu Atom."
 
 #. TRANS: Client error displayed when a user has no rights to delete notices of other users.
 #. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
-#: actions/apistatusesshow.php:235 actions/deletenotice.php:78
 msgid "Cannot delete this notice."
 msgstr "Nie można usunąć tego wpisu."
 
 #. TRANS: Confirmation of notice deletion in API. %d is the ID (number) of the deleted notice.
-#: actions/apistatusesshow.php:249
 #, php-format
 msgid "Deleted notice %d"
 msgstr "Usunięto wpis %d"
 
 #. TRANS: Client error displayed when the parameter "status" is missing.
-#: actions/apistatusesupdate.php:221
 msgid "Client must provide a 'status' parameter with a value."
 msgstr "Klient musi dostarczać parametr \"stan\" z wartością."
 
 #. TRANS: Client error displayed when the parameter "status" is missing.
 #. TRANS: %d is the maximum number of character for a notice.
-#: actions/apistatusesupdate.php:244 actions/newnotice.php:161
-#: lib/mailhandler.php:60
 #, php-format
 msgid "That's too long. Maximum notice size is %d character."
 msgid_plural "That's too long. Maximum notice size is %d characters."
@@ -1149,13 +880,11 @@ msgstr[1] "Wpis jest za długi. Maksymalna długość wynosi %d znaki."
 msgstr[2] "Wpis jest za długi. Maksymalna długość wynosi %d znaków."
 
 #. TRANS: Client error displayed when replying to a non-existing notice.
-#: actions/apistatusesupdate.php:284
 msgid "Parent notice not found."
 msgstr "Nie odnaleziono wpisu nadrzędnego."
 
 #. TRANS: Client error displayed exceeding the maximum notice length.
 #. TRANS: %d is the maximum lenth for a notice.
-#: actions/apistatusesupdate.php:308 actions/newnotice.php:184
 #, php-format
 msgid "Maximum notice size is %d character, including attachment URL."
 msgid_plural "Maximum notice size is %d characters, including attachment URL."
@@ -1168,13 +897,11 @@ msgstr[2] ""
 
 #. TRANS: Client error displayed when requesting profiles of followers in an unsupported format.
 #. TRANS: Client error displayed when requesting IDs of followers in an unsupported format.
-#: actions/apisubscriptions.php:228 actions/apisubscriptions.php:258
 msgid "Unsupported format."
 msgstr "Nieobsługiwany format."
 
 #. TRANS: Title for timeline of most recent favourite notices by a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname.
-#: actions/apitimelinefavorites.php:108
 #, php-format
 msgid "%1$s / Favorites from %2$s"
 msgstr "%1$s/ulubione wpisy od %2$s"
@@ -1182,14 +909,12 @@ msgstr "%1$s/ulubione wpisy od %2$s"
 #. TRANS: Subtitle for timeline of most recent favourite notices by a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user's full name,
 #. TRANS: %3$s is a user nickname.
-#: actions/apitimelinefavorites.php:120
 #, php-format
 msgid "%1$s updates favorited by %2$s / %3$s."
 msgstr "Użytkownik %1$s aktualizuje ulubione według %2$s/%3$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.
-#: actions/apitimelinementions.php:115
 #, php-format
 msgid "%1$s / Updates mentioning %2$s"
 msgstr "%1$s/aktualizacje wspominające %2$s"
@@ -1197,48 +922,40 @@ msgstr "%1$s/aktualizacje wspominające %2$s"
 #. TRANS: Subtitle for timeline of most recent mentions of a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname,
 #. TRANS: %3$s is a user's full name.
-#: actions/apitimelinementions.php:131
 #, php-format
 msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr "%1$s aktualizuje tę odpowiedź na aktualizacje od %2$s/%3$s."
 
 #. TRANS: Title for site timeline. %s is the StatusNet sitename.
 #. TRANS: Public RSS feed title. %s is the StatusNet site name.
-#: actions/apitimelinepublic.php:193 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "Publiczna oś czasu użytkownika %s"
 
 #. TRANS: Subtitle for site timeline. %s is the StatusNet sitename.
-#: actions/apitimelinepublic.php:199
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "Użytkownik %s aktualizuje od każdego."
 
 #. TRANS: Server error displayed calling unimplemented API method for 'retweeted by me'.
-#: actions/apitimelineretweetedbyme.php:71
 msgid "Unimplemented."
 msgstr "Niezaimplementowane."
 
 #. TRANS: Title for Atom feed "repeated to me". %s is the user nickname.
-#: actions/apitimelineretweetedtome.php:96
 #, php-format
 msgid "Repeated to %s"
 msgstr "Powtórzone dla %s"
 
-#: actions/apitimelineretweetedtome.php:98
 #, fuzzy, php-format
 msgid "%1$s notices that were to repeated to %2$s / %3$s."
 msgstr "%1$s aktualizuje tę odpowiedź na aktualizacje od %2$s/%3$s."
 
 #. TRANS: Title of list of repeated notices of the logged in user.
 #. TRANS: %s is the nickname of the logged in user.
-#: actions/apitimelineretweetsofme.php:98
 #, php-format
 msgid "Repeats of %s"
 msgstr "Powtórzenia %s"
 
-#: actions/apitimelineretweetsofme.php:104
 #, fuzzy, php-format
 msgid "%1$s notices that %2$s / %3$s has repeated."
 msgstr "Użytkownik %1$s oznaczył wpis %2$s jako ulubiony."
@@ -1247,170 +964,137 @@ msgstr "Użytkownik %1$s oznaczył wpis %2$s jako ulubiony."
 #. TRANS: %s is the tag.
 #. TRANS: Title for first page of notices with tags.
 #. TRANS: %s is the tag.
-#: actions/apitimelinetag.php:101 actions/tag.php:69
 #, php-format
 msgid "Notices tagged with %s"
 msgstr "Wpisy ze znacznikiem %s"
 
 #. TRANS: Subtitle for timeline with lastest notices with a given tag.
 #. TRANS: %1$s is the tag, $2$s is the StatusNet sitename.
-#: actions/apitimelinetag.php:105 actions/tagrss.php:65
 #, php-format
 msgid "Updates tagged with %1$s on %2$s!"
 msgstr "Aktualizacje ze znacznikiem %1$s na %2$s."
 
 #. TRANS: Client error displayed trying to add a notice to another user's timeline.
-#: actions/apitimelineuser.php:308
 msgid "Only the user can add to their own timeline."
 msgstr "Tylko użytkownik może dodawać do swojej osi czasu."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:315
 msgid "Only accept AtomPub for Atom feeds."
 msgstr "Akceptowanie tylko AtomPub dla kanałów Atom."
 
 #. TRANS: Client error displayed attempting to post an empty API notice.
-#: actions/apitimelineuser.php:322
 msgid "Atom post must not be empty."
 msgstr "Wpis Atom nie może być pusty."
 
 #. TRANS: Client error displayed attempting to post an API that is not well-formed XML.
-#: actions/apitimelineuser.php:328
 msgid "Atom post must be well-formed XML."
 msgstr "Wpis Atom musi być poprawnie sformatowanym kodem XML."
 
 #. TRANS: Client error displayed when not using an Atom entry.
-#: actions/apitimelineuser.php:334 actions/atompubfavoritefeed.php:228
-#: actions/atompubmembershipfeed.php:230
-#: actions/atompubsubscriptionfeed.php:236
 msgid "Atom post must be an Atom entry."
 msgstr "Wpis Atom musi być wpisem Atom."
 
 #. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
-#: actions/apitimelineuser.php:345
 msgid "Can only handle POST activities."
 msgstr "Można obsługiwać tylko działania POST."
 
 #. TRANS: Client error displayed when using an unsupported activity object type.
 #. TRANS: %s is the unsupported activity object type.
-#: actions/apitimelineuser.php:356
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr "Nie można obsłużyć typu obiektu działania \"%s\"."
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
 #. TRANS: %d is the notice ID (number).
-#: actions/apitimelineuser.php:390
 #, php-format
 msgid "No content for notice %d."
 msgstr "Brak zawartości dla wpisu %d."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
 #. TRANS: %s is the notice URI.
-#: actions/apitimelineuser.php:419
 #, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "Wpis z adresem URI \"%s\" już istnieje."
 
 #. TRANS: Server error for unfinished API method showTrends.
-#: actions/apitrends.php:85
 msgid "API method under construction."
 msgstr "Metoda API jest w trakcie tworzenia."
 
 #. TRANS: Client error displayed when requesting user information for a non-existing user.
-#: actions/apiuserprofileimage.php:80 actions/apiusershow.php:94
 msgid "User not found."
 msgstr "Nie odnaleziono strony."
 
 #. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
 #. TRANS: Client exception.
 #. TRANS: Client error displayed trying to subscribe to a non-existing profile.
-#: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
-#: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
-#: actions/subscribe.php:110
 msgid "No such profile."
 msgstr "Nie ma takiego profilu."
 
 #. TRANS: Subtitle for Atom favorites feed.
 #. TRANS: %1$s is a user nickname, %2$s is the StatusNet sitename.
-#: actions/atompubfavoritefeed.php:147
 #, fuzzy, php-format
 msgid "Notices %1$s has favorited on %2$s"
 msgstr "Aktualizacje z %1$s i przyjaciół na %2$s."
 
 #. TRANS: Client exception thrown when trying to set a favorite for another user.
 #. TRANS: Client exception thrown when trying to subscribe another user.
-#: actions/atompubfavoritefeed.php:217 actions/atompubsubscriptionfeed.php:225
 msgid "Cannot add someone else's subscription."
 msgstr "Nie można dodać subskrypcji innej osoby."
 
 #. TRANS: Client exception thrown when trying use an incorrect activity verb for the Atom pub method.
-#: actions/atompubfavoritefeed.php:240
 msgid "Can only handle favorite activities."
 msgstr "Można obsługiwać tylko działania ulubionych."
 
 #. TRANS: Client exception thrown when trying favorite an object that is not a notice.
-#: actions/atompubfavoritefeed.php:250 actions/atompubmembershipfeed.php:250
 msgid "Can only fave notices."
 msgstr "Można tylko dodawać wpisy do ulubionych."
 
 #. TRANS: Client exception thrown when trying favorite a notice without content.
-#: actions/atompubfavoritefeed.php:259
 msgid "Unknown note."
 msgstr "Nieznany wpis."
 
 #. TRANS: Client exception thrown when trying favorite an already favorited notice.
-#: actions/atompubfavoritefeed.php:267
 msgid "Already a favorite."
 msgstr "Jest już ulubiony."
 
 #. TRANS: Title for group membership feed.
 #. TRANS: %s is a username.
-#: actions/atompubmembershipfeed.php:144
 #, php-format
 msgid "%s group memberships"
 msgstr "%s członków grupy"
 
 #. TRANS: Subtitle for group membership feed.
 #. TRANS: %1$s is a username, %2$s is the StatusNet sitename.
-#: actions/atompubmembershipfeed.php:149
 #, fuzzy, php-format
 msgid "Groups %1$s is a member of on %2$s"
 msgstr "Grupy %s są członkiem"
 
 #. TRANS: Client exception thrown when trying subscribe someone else to a group.
-#: actions/atompubmembershipfeed.php:219
 msgid "Cannot add someone else's membership."
 msgstr "Nie można dodać członkostwa innej osoby."
 
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#: actions/atompubmembershipfeed.php:242
 msgid "Can only handle join activities."
 msgstr "Można obsługiwać tylko działania dołączania."
 
 #. TRANS: Client exception thrown when trying to subscribe to a non-existing group.
-#: actions/atompubmembershipfeed.php:259
 msgid "Unknown group."
 msgstr "Nieznana grupa."
 
 #. TRANS: Client exception thrown when trying to subscribe to an already subscribed group.
-#: actions/atompubmembershipfeed.php:267
 msgid "Already a member."
 msgstr "Jest już członkiem."
 
 #. TRANS: Client exception thrown when trying to subscribe to group while blocked from that group.
-#: actions/atompubmembershipfeed.php:275
 msgid "Blocked by admin."
 msgstr "Zablokowane przez administratora."
 
 #. TRANS: Client exception thrown when referencing a non-existing favorite.
-#: actions/atompubshowfavorite.php:90
 msgid "No such favorite."
 msgstr "Nie ma takiego ulubionego wpisu."
 
 #. TRANS: Client exception thrown when trying to remove a favorite notice of another user.
-#: actions/atompubshowfavorite.php:151
 msgid "Cannot delete someone else's favorite."
 msgstr "Nie można usunąć ulubionego wpisu innej osoby."
 
@@ -1436,90 +1120,65 @@ msgstr "Nie można usunąć ulubionego wpisu innej osoby."
 #. TRANS: Client error displayed when trying to join a non-existing group.
 #. TRANS: Client error displayed when trying to leave a non-local group.
 #. TRANS: Client error displayed when trying to leave a non-existing group.
+#. TRANS: Client error displayed when providing an invalid group ID on the Make Admin page.
 #. 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.
 #. TRANS: Command exception text shown when a group is requested that does not exist.
 #. TRANS: Error text shown when trying to leave a group that does not exist.
-#: actions/atompubshowmembership.php:81 actions/blockedfromgroup.php:81
-#: actions/blockedfromgroup.php:89 actions/deletegroup.php:87
-#: actions/deletegroup.php:100 actions/editgroup.php:102
-#: actions/foafgroup.php:46 actions/foafgroup.php:65 actions/foafgroup.php:73
-#: actions/groupblock.php:89 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:101 actions/grouplogo.php:103
-#: actions/groupmembers.php:84 actions/groupmembers.php:92
-#: actions/grouprss.php:97 actions/grouprss.php:105
-#: actions/groupunblock.php:89 actions/joingroup.php:82
-#: actions/joingroup.php:95 actions/leavegroup.php:82
-#: actions/leavegroup.php:95 actions/makeadmin.php:86
-#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:392
 msgid "No such group."
 msgstr "Nie ma takiej grupy."
 
 #. TRANS: Client exception thrown when trying to show membership of a non-subscribed group
-#: actions/atompubshowmembership.php:91
 msgid "Not a member."
 msgstr "Nie jest członkiem."
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
-#: actions/atompubshowmembership.php:150
 msgid "Cannot delete someone else's membership."
 msgstr "Nie można usunąć członkostwa innej osoby."
 
 #. TRANS: Client exception thrown when trying to display a subscription for a non-existing profile ID.
 #. TRANS: %d is the non-existing profile ID number.
-#: actions/atompubshowsubscription.php:72
-#: actions/atompubshowsubscription.php:83
-#: actions/atompubsubscriptionfeed.php:74
 #, php-format
 msgid "No such profile id: %d."
 msgstr "Nie ma takiego identyfikatora profilu: %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.
-#: actions/atompubshowsubscription.php:94
 #, php-format
 msgid "Profile %1$d not subscribed to profile %2$d."
 msgstr "Profil %1$d nie jest subskrybowany do profilu %2$d."
 
 #. TRANS: Client exception thrown when trying to delete a subscription of another user.
-#: actions/atompubshowsubscription.php:157
 msgid "Cannot delete someone else's subscription."
 msgstr "Nie można usunąć subskrypcji innej osoby."
 
 #. TRANS: Subtitle for Atom subscription feed.
 #. TRANS: %1$s is a user nickname, %s$s is the StatusNet sitename.
-#: actions/atompubsubscriptionfeed.php:153
 #, fuzzy, php-format
 msgid "People %1$s has subscribed to on %2$s"
 msgstr "Osoby subskrybowane do %s"
 
 #. TRANS: Client error displayed when not using the follow verb.
-#: actions/atompubsubscriptionfeed.php:248
 msgid "Can only handle Follow activities."
 msgstr "Można obsługiwać tylko działania obserwowania."
 
 #. TRANS: Client exception thrown when subscribing to an object that is not a person.
-#: actions/atompubsubscriptionfeed.php:256
 msgid "Can only follow people."
 msgstr "Można obserwować tylko osoby."
 
 #. TRANS: Client exception thrown when subscribing to a non-existing profile.
 #. TRANS: %s is the unknown profile ID.
-#: actions/atompubsubscriptionfeed.php:267
 #, php-format
 msgid "Unknown profile %s."
 msgstr "Nieznany profil %s."
 
 #. TRANS: Client error displayed trying to subscribe to an already subscribed profile.
 #. TRANS: %s is the profile the user already has a subscription on.
-#: actions/atompubsubscriptionfeed.php:275
 #, php-format
 msgid "Already subscribed to %s."
 msgstr "%s jest już subskrybowane."
 
 #. TRANS: Client error displayed trying to get a non-existing attachment.
-#: actions/attachment.php:73
 msgid "No such attachment."
 msgstr "Nie ma takiego załącznika."
 
@@ -1531,31 +1190,23 @@ msgstr "Nie ma takiego załącznika."
 #. TRANS: Client error displayed when trying to view group members without providing a group nickname.
 #. TRANS: Client error displayed when requesting a group RSS feed without providing a group nickname.
 #. TRANS: Client error displayed if no nickname argument was given requesting a group page.
-#: actions/avatarbynickname.php:60 actions/blockedfromgroup.php:73
-#: actions/editgroup.php:85 actions/groupdesignsettings.php:84
-#: actions/grouplogo.php:86 actions/groupmembers.php:76
-#: actions/grouprss.php:89 actions/showgroup.php:116
 msgid "No nickname."
 msgstr "Brak pseudonimu."
 
 #. TRANS: Client error displayed trying to get an avatar without providing an avatar size.
-#: actions/avatarbynickname.php:66
 msgid "No size."
 msgstr "Brak rozmiaru."
 
 #. TRANS: Client error displayed trying to get an avatar providing an invalid avatar size.
-#: actions/avatarbynickname.php:72
 msgid "Invalid size."
 msgstr "Nieprawidłowy rozmiar."
 
 #. TRANS: Title for avatar upload page.
-#: actions/avatarsettings.php:66 lib/settingsnav.php:82
 msgid "Avatar"
 msgstr "Awatar"
 
 #. TRANS: Instruction for avatar upload page.
 #. TRANS: %s is the maximum file size, for example "500b", "10kB" or "2MB".
-#: actions/avatarsettings.php:78
 #, php-format
 msgid "You can upload your personal avatar. The maximum file size is %s."
 msgstr "Można wysłać osobisty awatar. Maksymalny rozmiar pliku to %s."
@@ -1564,17 +1215,12 @@ msgstr "Można wysłać osobisty awatar. Maksymalny rozmiar pliku to %s."
 #. TRANS: Server error displayed coming across a request from a user without a profile.
 #. TRANS: Server error displayed when trying to authorise a remote subscription request
 #. TRANS: while the user has no profile.
-#: actions/avatarsettings.php:108 actions/avatarsettings.php:192
-#: actions/grouplogo.php:184 actions/remotesubscribe.php:190
-#: actions/userauthorization.php:75 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr "Użytkownik bez odpowiadającego profilu."
 
 #. TRANS: Avatar upload page form legend.
 #. TRANS: Avatar upload page crop form legend.
 #. TRANS: Legend for group logo settings fieldset.
-#: actions/avatarsettings.php:122 actions/avatarsettings.php:205
-#: actions/grouplogo.php:261
 msgid "Avatar settings"
 msgstr "Ustawienia awatara"
 
@@ -1582,8 +1228,6 @@ msgstr "Ustawienia awatara"
 #. TRANS: Header on avatar upload crop form for thumbnail of originally uploaded avatar (h2).
 #. TRANS: Uploaded original file in group logo form.
 #. TRANS: Header for originally uploaded file before a crop on the group logo page.
-#: actions/avatarsettings.php:131 actions/avatarsettings.php:214
-#: actions/grouplogo.php:207 actions/grouplogo.php:270
 msgid "Original"
 msgstr "Oryginał"
 
@@ -1591,82 +1235,67 @@ msgstr "Oryginał"
 #. TRANS: Header on avatar upload crop form for thumbnail of to be used rendition of uploaded avatar (h2).
 #. TRANS: Header for preview of to be displayed group logo.
 #. TRANS: Header for the cropped group logo on the group logo page.
-#: actions/avatarsettings.php:147 actions/avatarsettings.php:227
-#: actions/grouplogo.php:219 actions/grouplogo.php:283
 msgid "Preview"
 msgstr "Podgląd"
 
 #. TRANS: Button on avatar upload page to delete current avatar.
 #. TRANS: Button text for user account deletion.
-#: actions/avatarsettings.php:155 actions/deleteaccount.php:319
 msgctxt "BUTTON"
 msgid "Delete"
 msgstr "Usuń"
 
 #. TRANS: Button on avatar upload page to upload an avatar.
 #. TRANS: Submit button to confirm upload of a user backup file for account restore.
-#: actions/avatarsettings.php:173 actions/restoreaccount.php:369
 msgctxt "BUTTON"
 msgid "Upload"
 msgstr "Wyślij"
 
 #. TRANS: Button on avatar upload crop form to confirm a selected crop as avatar.
-#: actions/avatarsettings.php:243
 msgctxt "BUTTON"
 msgid "Crop"
 msgstr "Przytnij"
 
 #. TRANS: Validation error on avatar upload form when no file was uploaded.
-#: actions/avatarsettings.php:318
 msgid "No file uploaded."
 msgstr "Nie wysłano pliku."
 
 #. TRANS: Avatar upload form instruction after uploading a file.
-#: actions/avatarsettings.php:345
 #, fuzzy
 msgid "Pick a square area of the image to be your avatar."
 msgstr "Wybierz kwadratowy obszar obrazu do awatara"
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
 #. TRANS: Server error displayed trying to crop an uploaded group logo that is no longer present.
-#: actions/avatarsettings.php:360 actions/grouplogo.php:391
 msgid "Lost our file data."
 msgstr "Utracono dane pliku."
 
 #. TRANS: Success message for having updated a user avatar.
-#: actions/avatarsettings.php:384
 msgid "Avatar updated."
 msgstr "Zaktualizowano awatar."
 
 #. TRANS: Error displayed on the avatar upload page if the avatar could not be updated for an unknown reason.
-#: actions/avatarsettings.php:388
 msgid "Failed updating avatar."
 msgstr "Zaktualizowanie awatara nie powiodło się."
 
 #. TRANS: Success message for deleting a user avatar.
-#: actions/avatarsettings.php:412
 msgid "Avatar deleted."
 msgstr "Usunięto awatar."
 
 #. TRANS: Title for backup account page.
 #. TRANS: Option in profile settings to create a backup of the account of the currently logged in user.
-#: actions/backupaccount.php:61 actions/profilesettings.php:468
 msgid "Backup account"
 msgstr "Wykonaj kopię zapasową konta"
 
 #. TRANS: Client exception thrown when trying to backup an account while not logged in.
-#: actions/backupaccount.php:79
 msgid "Only logged-in users can backup their account."
 msgstr ""
 "Tylko zalogowani użytkownicy mogą wykonywać kopie zapasowe swoich kont."
 
 #. TRANS: Client exception thrown when trying to backup an account without having backup rights.
-#: actions/backupaccount.php:84
 msgid "You may not backup your account."
 msgstr "Użytkownik nie może wykonać kopii zapasowej konta."
 
 #. TRANS: Information displayed on the backup account page.
-#: actions/backupaccount.php:227
 msgid ""
 "You can backup your account data in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format. This is an experimental feature and provides "
@@ -1682,31 +1311,26 @@ msgstr ""
 "bezpośrednie wiadomości."
 
 #. TRANS: Submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:250
 msgctxt "BUTTON"
 msgid "Backup"
 msgstr "Kopia zapasowa"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:254
 #, fuzzy
 msgid "Backup your account."
 msgstr "Wykonuje kopię zapasową konta"
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
-#: actions/block.php:68
 msgid "You already blocked that user."
 msgstr "Użytkownik jest już zablokowany."
 
 #. TRANS: Title for block user page.
 #. TRANS: Legend for block user form.
 #. TRANS: Fieldset legend for block user from group form.
-#: actions/block.php:106 actions/block.php:136 actions/groupblock.php:165
 msgid "Block user"
 msgstr "Zablokuj użytkownika"
 
 #. TRANS: Explanation of consequences when blocking a user on the block user page.
-#: actions/block.php:139
 msgid ""
 "Are you sure you want to block this user? Afterwards, they will be "
 "unsubscribed from you, unable to subscribe to you in the future, and you "
@@ -1722,15 +1346,11 @@ msgstr ""
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:154 actions/deleteapplication.php:157
-#: actions/deletegroup.php:220 actions/deletenotice.php:155
-#: actions/deleteuser.php:154 actions/groupblock.php:187
 msgctxt "BUTTON"
 msgid "No"
 msgstr "Nie"
 
 #. TRANS: Submit button title for 'No' when blocking a user.
-#: actions/block.php:158
 #, fuzzy
 msgid "Do not block this user."
 msgstr "Nie blokuj tego użytkownika"
@@ -1741,175 +1361,139 @@ msgstr "Nie blokuj tego użytkownika"
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:161 actions/deleteapplication.php:164
-#: actions/deletegroup.php:227 actions/deletenotice.php:162
-#: actions/deleteuser.php:161 actions/groupblock.php:194
 msgctxt "BUTTON"
 msgid "Yes"
 msgstr "Tak"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:165
 #, fuzzy
 msgid "Block this user."
 msgstr "Zablokuj tego użytkownika"
 
 #. TRANS: Server error displayed when blocking a user fails.
-#: actions/block.php:189
 msgid "Failed to save block information."
 msgstr "Zapisanie informacji o blokadzie nie powiodło się."
 
 #. TRANS: Title for first page with list of users blocked from a group.
 #. TRANS: %s is a group nickname.
-#: actions/blockedfromgroup.php:101
 #, php-format
 msgid "%s blocked profiles"
 msgstr "%s zablokowane profile"
 
 #. TRANS: Title for any but the first page with list of users blocked from a group.
 #. TRANS: %1$s is a group nickname, %2$d is a page number.
-#: actions/blockedfromgroup.php:106
 #, php-format
 msgid "%1$s blocked profiles, page %2$d"
 msgstr "%1$s zablokowane profile, strona %2$d"
 
 #. TRANS: Instructions for list of users blocked from a group.
-#: actions/blockedfromgroup.php:122
 msgid "A list of the users blocked from joining this group."
 msgstr "Lista użytkowników zablokowanych w tej grupie."
 
 #. TRANS: Form legend for unblocking a user from a group.
-#: actions/blockedfromgroup.php:291
 msgid "Unblock user from group"
 msgstr "Odblokuj użytkownika w tej grupie"
 
 #. TRANS: Button text for unblocking a user from a group.
-#: actions/blockedfromgroup.php:323
 msgctxt "BUTTON"
 msgid "Unblock"
 msgstr "Odblokuj"
 
 #. TRANS: Tooltip for button for unblocking a user from a group.
 #. TRANS: Description of the form to unblock a user.
-#: actions/blockedfromgroup.php:327 lib/unblockform.php:78
 msgid "Unblock this user"
 msgstr "Odblokuj tego użytkownika"
 
 #. TRANS: Title for mini-posting window loaded from bookmarklet.
 #. TRANS: %s is the StatusNet site name.
-#: actions/bookmarklet.php:51
 #, php-format
 msgid "Post to %s"
 msgstr "Wyślij do %s"
 
 #. TRANS: Client error displayed when not providing a confirmation code in the contact address confirmation action.
-#: actions/confirmaddress.php:74
 msgid "No confirmation code."
 msgstr "Brak kodu potwierdzającego."
 
 #. TRANS: Client error displayed when providing a non-existing confirmation code in the contact address confirmation action.
-#: actions/confirmaddress.php:80
 msgid "Confirmation code not found."
 msgstr "Nie odnaleziono kodu potwierdzającego."
 
 #. TRANS: Client error displayed when not providing a confirmation code for another user in the contact address confirmation action.
-#: actions/confirmaddress.php:86
 msgid "That confirmation code is not for you!"
 msgstr "Ten kod potwierdzający nie jest przeznaczony dla ciebie."
 
 #. TRANS: Server error for an unknown address type, which can be 'email', 'sms', or the name of an IM network (such as 'xmpp' or 'aim')
-#: actions/confirmaddress.php:94
-#, fuzzy, php-format
+#, php-format
 msgid "Unrecognized address type %s"
 msgstr "Nierozpoznany typ adresu %s."
 
 #. TRANS: Client error for an already confirmed email/jabber/sms address.
-#: actions/confirmaddress.php:103 actions/confirmaddress.php:136
 msgid "That address has already been confirmed."
 msgstr "Ten adres został już potwierdzony."
 
-#: actions/confirmaddress.php:121 actions/imsettings.php:444
-#: actions/userdesignsettings.php:306
-#, fuzzy
 msgid "Couldn't update user."
 msgstr "Nie można zaktualizować użytkownika."
 
-#: actions/confirmaddress.php:144
 #, fuzzy
 msgid "Couldn't update user im preferences."
 msgstr "Nie można zaktualizować wpisu użytkownika."
 
-#: actions/confirmaddress.php:156
 #, fuzzy
 msgid "Couldn't insert user im preferences."
 msgstr "Nie można wprowadzić nowej subskrypcji."
 
 #. TRANS: Server error displayed when an address confirmation code deletion from the
 #. TRANS: database fails in the contact address confirmation action.
-#: actions/confirmaddress.php:169
 msgid "Could not delete address confirmation."
 msgstr "Nie można usunąć potwierdzenia adresu."
 
 #. TRANS: Title for the contact address confirmation action.
-#: actions/confirmaddress.php:185
 msgid "Confirm address"
 msgstr "Potwierdź adres"
 
 #. TRANS: Success message for the contact address confirmation action.
 #. TRANS: %s can be 'email', 'jabber', or 'sms'.
-#: actions/confirmaddress.php:200
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "Adres \"%s\" został potwierdzony dla twojego konta."
 
 #. TRANS: Title for page with a conversion (multiple notices in context).
-#: actions/conversation.php:96
 msgid "Conversation"
 msgstr "Rozmowa"
 
 #. TRANS: Header on conversation page. Hidden by default (h2).
 #. TRANS: Label for user statistics.
-#: actions/conversation.php:149 lib/noticelist.php:87
-#: lib/profileaction.php:246 lib/searchgroupnav.php:82
-#: lib/threadednoticelist.php:66
 msgid "Notices"
 msgstr "Wpisy"
 
 #. TRANS: Client exception displayed trying to delete a user account while not logged in.
-#: actions/deleteaccount.php:71
 msgid "Only logged-in users can delete their account."
 msgstr "Tylko zalogowani użytkownicy mogą usuwać swoje konta."
 
 #. TRANS: Client exception displayed trying to delete a user account without have the rights to do that.
-#: actions/deleteaccount.php:77
 msgid "You cannot delete your account."
 msgstr "Użytkownik nie może usunąć konta."
 
 #. TRANS: Confirmation text for user deletion. The user has to type this exactly the same, including punctuation.
-#: actions/deleteaccount.php:160 actions/deleteaccount.php:297
 msgid "I am sure."
 msgstr "Jestem pewny."
 
 #. TRANS: Notification for user about the text that must be input to be able to delete a user account.
 #. TRANS: %s is the text that needs to be input.
-#: actions/deleteaccount.php:164
 #, php-format
 msgid "You must write \"%s\" exactly in the box."
 msgstr "Należy wpisać dokładnie \"%s\" w polu obok."
 
 #. TRANS: Confirmation that a user account has been deleted.
-#: actions/deleteaccount.php:206
 msgid "Account deleted."
 msgstr "Usunięto konto."
 
 #. TRANS: Page title for page on which a user account can be deleted.
 #. TRANS: Option in profile settings to delete the account of the currently logged in user.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:476
 msgid "Delete account"
 msgstr "Usuń konto"
 
 #. TRANS: Form text for user deletion form.
-#: actions/deleteaccount.php:279
 msgid ""
 "This will <strong>permanently delete</strong> your account data from this "
 "server."
@@ -1918,7 +1502,6 @@ msgstr ""
 
 #. TRANS: Additional form text for user deletion form shown if a user has account backup rights.
 #. TRANS: %s is a URL to the backup page.
-#: actions/deleteaccount.php:285
 #, php-format
 msgid ""
 "You are strongly advised to <a href=\"%s\">back up your data</a> before "
@@ -1929,55 +1512,42 @@ msgstr ""
 
 #. TRANS: Field label for delete account confirmation entry.
 #. TRANS: Field label for password reset form where the password has to be typed again.
-#: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:262 actions/register.php:419
 msgid "Confirm"
 msgstr "Potwierdź"
 
 #. TRANS: Input title for the delete account field.
 #. TRANS: %s is the text that needs to be input.
-#: actions/deleteaccount.php:304
 #, php-format
 msgid "Enter \"%s\" to confirm that you want to delete your account."
 msgstr "Proszę wpisać \"%s\", aby potwierdzić chęć usunięcia konta."
 
 #. TRANS: Button title for user account deletion.
-#: actions/deleteaccount.php:323
 msgid "Permanently delete your account"
 msgstr "Trwale usuwa konto"
 
 #. TRANS: Client error displayed trying to delete an application while not logged in.
-#: actions/deleteapplication.php:62
 msgid "You must be logged in to delete an application."
 msgstr "Musisz być zalogowany, aby usunąć aplikację."
 
 #. TRANS: Client error displayed trying to delete an application that does not exist.
-#: actions/deleteapplication.php:71
 msgid "Application not found."
 msgstr "Nie odnaleziono aplikacji."
 
 #. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
-#: actions/deleteapplication.php:79 actions/editapplication.php:78
-#: actions/showapplication.php:90
 msgid "You are not the owner of this application."
 msgstr "Nie jesteś właścicielem tej aplikacji."
 
 #. TRANS: Client error text when there is a problem with the session token.
-#: actions/deleteapplication.php:102 actions/editapplication.php:131
-#: actions/newapplication.php:112 actions/showapplication.php:113
-#: lib/action.php:1391
 msgid "There was a problem with your session token."
 msgstr "Wystąpił problem z tokenem sesji."
 
 #. TRANS: Title for delete application page.
 #. TRANS: Fieldset legend on delete application page.
-#: actions/deleteapplication.php:124 actions/deleteapplication.php:149
 msgid "Delete application"
 msgstr "Usuń aplikację"
 
 #. TRANS: Confirmation text on delete application page.
-#: actions/deleteapplication.php:152
 msgid ""
 "Are you sure you want to delete this application? This will clear all data "
 "about the application from the database, including all existing user "
@@ -1987,57 +1557,47 @@ msgstr ""
 "danych, w tym wszystkie istniejące połączenia użytkowników."
 
 #. TRANS: Submit button title for 'No' when deleting an application.
-#: actions/deleteapplication.php:161
 #, fuzzy
 msgid "Do not delete this application."
 msgstr "Nie usuwaj tej aplikacji"
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
-#: actions/deleteapplication.php:167
 #, fuzzy
 msgid "Delete this application."
 msgstr "Usuń tę aplikację"
 
 #. TRANS: Client error when trying to delete group while not logged in.
-#: actions/deletegroup.php:64
 msgid "You must be logged in to delete a group."
 msgstr "Musisz być zalogowany, aby usunąć grupę."
 
 #. TRANS: Client error when trying to delete a group without providing a nickname or ID for the group.
 #. TRANS: Client error displayed when trying to join a group without providing a group name or group ID.
 #. TRANS: Client error displayed when trying to leave a group without providing a group name or group ID.
-#: actions/deletegroup.php:94 actions/joingroup.php:89
-#: actions/leavegroup.php:89
 msgid "No nickname or ID."
 msgstr "Brak pseudonimu lub identyfikatora."
 
 #. TRANS: Client error when trying to delete a group without having the rights to delete it.
-#: actions/deletegroup.php:107
 msgid "You are not allowed to delete this group."
 msgstr "Brak uprawnienia do usunięcia tej grupy."
 
 #. TRANS: Server error displayed if a group could not be deleted.
 #. TRANS: %s is the name of the group that could not be deleted.
-#: actions/deletegroup.php:150
 #, php-format
 msgid "Could not delete group %s."
 msgstr "Nie można usunąć grupy %s."
 
 #. TRANS: Message given after deleting a group.
 #. TRANS: %s is the deleted group's name.
-#: actions/deletegroup.php:159
 #, php-format
 msgid "Deleted group %s"
 msgstr "Usunięto grupę %s"
 
 #. TRANS: Title of delete group page.
 #. TRANS: Form legend for deleting a group.
-#: actions/deletegroup.php:176 actions/deletegroup.php:202
 msgid "Delete group"
 msgstr "Usuń grupę"
 
 #. TRANS: Warning in form for deleleting a group.
-#: actions/deletegroup.php:206
 msgid ""
 "Are you sure you want to delete this group? This will clear all data about "
 "the group from the database, without a backup. Public posts to this group "
@@ -2048,13 +1608,11 @@ msgstr ""
 "widoczne na konkretnych osiach czasu."
 
 #. TRANS: Submit button title for 'No' when deleting a group.
-#: actions/deletegroup.php:224
 #, fuzzy
 msgid "Do not delete this group."
 msgstr "Nie usuwaj tej grupy"
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
-#: actions/deletegroup.php:231
 #, fuzzy
 msgid "Delete this group."
 msgstr "Usuń tę grupę"
@@ -2065,22 +1623,18 @@ msgstr "Usuń tę grupę"
 #. TRANS: Client error displayed trying to block a user from a group while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying to log out when not logged in.
+#. TRANS: Client error displayed when trying to access the "make admin" page while not logged in.
+#. TRANS: Client error displayed trying to create a new direct message while not logged in.
+#. TRANS: Client error displayed trying to send a notice while not logged in.
+#. TRANS: Client error displayed trying to nudge a user without being logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
 #. TRANS: Client error displayed when trying to change user options while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
-#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:70
-#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
-#: actions/nudge.php:63 actions/pluginenable.php:97 actions/subedit.php:33
-#: actions/subscribe.php:98 actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:71 lib/profileformaction.php:63
-#: lib/settingsaction.php:72
 msgid "Not logged in."
 msgstr "Niezalogowany."
 
 #. TRANS: Instructions for deleting a notice.
-#: actions/deletenotice.php:110
 msgid ""
 "You are about to permanently delete a notice. Once this is done, it cannot "
 "be undone."
@@ -2090,50 +1644,41 @@ msgstr ""
 
 #. TRANS: Page title when deleting a notice.
 #. TRANS: Fieldset legend for the delete notice form.
-#: actions/deletenotice.php:117 actions/deletenotice.php:148
 msgid "Delete notice"
 msgstr "Usuń wpis"
 
 #. TRANS: Message for the delete notice form.
-#: actions/deletenotice.php:152
 msgid "Are you sure you want to delete this notice?"
 msgstr "Jesteś pewien, że chcesz usunąć ten wpis?"
 
 #. TRANS: Submit button title for 'No' when deleting a notice.
-#: actions/deletenotice.php:159
 #, fuzzy
 msgid "Do not delete this notice."
 msgstr "Nie usuwaj tego wpisu"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:166
 #, fuzzy
 msgid "Delete this notice."
 msgstr "Usuń ten wpis"
 
 #. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
-#: actions/deleteuser.php:66
 msgid "You cannot delete users."
 msgstr "Nie można usuwać użytkowników."
 
 #. TRANS: Client error displayed when trying to delete a non-local user.
-#: actions/deleteuser.php:74
 msgid "You can only delete local users."
 msgstr "Nie można usuwać lokalnych użytkowników."
 
 #. TRANS: Title of delete user page.
-#: actions/deleteuser.php:110
 msgctxt "TITLE"
 msgid "Delete user"
 msgstr "Usuń użytkownika"
 
 #. TRANS: Fieldset legend on delete user page.
-#: actions/deleteuser.php:134
 msgid "Delete user"
 msgstr "Usuń użytkownika"
 
 #. TRANS: Information text to request if a user is certain that the described action has to be performed.
-#: actions/deleteuser.php:138
 msgid ""
 "Are you sure you want to delete this user? This will clear all data about "
 "the user from the database, without a backup."
@@ -2142,99 +1687,80 @@ msgstr ""
 "bazy danych, bez utworzenia kopii zapasowej."
 
 #. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/deleteuser.php:158
 #, fuzzy
 msgid "Do not delete this user."
 msgstr "Nie usuwaj tego użytkownika"
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
-#: actions/deleteuser.php:165
 #, fuzzy
 msgid "Delete this user."
 msgstr "Usuń tego użytkownika"
 
 #. TRANS: Message used as title for design settings for the site.
-#: actions/designadminpanel.php:60 lib/settingsnav.php:97
 msgid "Design"
 msgstr "Wygląd"
 
 #. TRANS: Instructions for design adminsitration panel.
-#: actions/designadminpanel.php:71
 msgid "Design settings for this StatusNet site"
 msgstr "Ustawienia wyglądu tej witryny StatusNet"
 
 #. TRANS: Client error displayed when a logo URL does is not valid.
-#: actions/designadminpanel.php:327
 msgid "Invalid logo URL."
 msgstr "Nieprawidłowy adres URL logo."
 
 #. TRANS: Client error displayed when an SSL logo URL is invalid.
-#: actions/designadminpanel.php:333
 msgid "Invalid SSL logo URL."
 msgstr "Nieprawidłowy adres URL logo SSL."
 
 #. TRANS: Client error displayed when a theme is submitted through the form that is not in the theme list.
 #. TRANS: %s is the chosen unavailable theme.
-#: actions/designadminpanel.php:339
 #, php-format
 msgid "Theme not available: %s."
 msgstr "Motyw nie jest dostępny: %s."
 
 #. TRANS: Fieldset legend for form to change logo.
-#: actions/designadminpanel.php:437
 msgid "Change logo"
 msgstr "Zmień logo"
 
 #. TRANS: Field label for StatusNet site logo.
-#: actions/designadminpanel.php:444
 msgid "Site logo"
 msgstr "Logo witryny"
 
 #. TRANS: Field label for SSL StatusNet site logo.
-#: actions/designadminpanel.php:452
 msgid "SSL logo"
 msgstr "Logo SSL"
 
 #. TRANS: Fieldset legend for form change StatusNet site's theme.
-#: actions/designadminpanel.php:467
 msgid "Change theme"
 msgstr "Zmień motyw"
 
 #. TRANS: Field label for dropdown to choose site theme.
-#: actions/designadminpanel.php:485
 msgid "Site theme"
 msgstr "Motyw witryny"
 
 #. TRANS: Title for field label for dropdown to choose site theme.
-#: actions/designadminpanel.php:487
 msgid "Theme for the site."
 msgstr "Motyw witryny."
 
 #. TRANS: Field label for uploading a cutom theme.
-#: actions/designadminpanel.php:494
 msgid "Custom theme"
 msgstr "Własny motyw"
 
 #. TRANS: Form instructions for uploading a cutom StatusNet theme.
-#: actions/designadminpanel.php:499
 msgid "You can upload a custom StatusNet theme as a .ZIP archive."
 msgstr "Można wysłać własny motyw witryny StatusNet jako archiwum zip."
 
 #. TRANS: Fieldset legend for theme background image.
-#: actions/designadminpanel.php:515
 msgid "Change background image"
 msgstr "Zmień obraz tła"
 
 #. TRANS: Field label for background image on theme designer page.
 #. TRANS: Field label for background color selector.
 #. TRANS: Label on profile design page for setting a profile page background colour.
-#: actions/designadminpanel.php:525 actions/designadminpanel.php:609
-#: lib/designform.php:238
 msgid "Background"
 msgstr "Tło"
 
 #. TRANS: Form guide for background image upload form on theme designer page.
-#: actions/designadminpanel.php:531
 #, php-format
 msgid ""
 "You can upload a background image for the site. The maximum file size is %1"
@@ -2242,200 +1768,165 @@ msgid ""
 msgstr "Można wysłać obraz tła dla witryny. Maksymalny rozmiar pliku to %1$s."
 
 #. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:558
 msgid "On"
 msgstr "Włączone"
 
 #. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:575
 msgid "Off"
 msgstr "Wyłączone"
 
 #. TRANS: Form guide for turning background image on or off on theme designer page.
 #. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
 #. TRANS: use of the uploaded profile image.
-#: actions/designadminpanel.php:577 lib/designform.php:214
 msgid "Turn background image on or off."
 msgstr "Włącz lub wyłącz obraz tła."
 
 #. TRANS: Checkbox label to title background image on theme designer page.
 #. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-#: actions/designadminpanel.php:583 lib/designform.php:220
 msgid "Tile background image"
 msgstr "Kafelkowy obraz tła"
 
 #. TRANS: Fieldset legend for theme colors.
-#: actions/designadminpanel.php:598
 msgid "Change colors"
 msgstr "Zmień kolory"
 
 #. TRANS: Field label for content color selector.
 #. TRANS: Label on profile design page for setting a profile page content colour.
-#: actions/designadminpanel.php:623 lib/designform.php:252
 msgid "Content"
 msgstr "Treść"
 
 #. TRANS: Field label for sidebar color selector.
 #. TRANS: Label on profile design page for setting a profile page sidebar colour.
-#: actions/designadminpanel.php:637 lib/designform.php:266
 msgid "Sidebar"
 msgstr "Panel boczny"
 
 #. TRANS: Field label for text color selector.
 #. TRANS: Label on profile design page for setting a profile page text colour.
-#: actions/designadminpanel.php:651 lib/designform.php:280
 msgid "Text"
 msgstr "Tekst"
 
 #. TRANS: Field label for link color selector.
 #. TRANS: Label on profile design page for setting a profile page links colour.
-#: actions/designadminpanel.php:665 lib/designform.php:294
 msgid "Links"
 msgstr "Odnośniki"
 
 #. TRANS: Fieldset legend for advanced theme design settings.
-#: actions/designadminpanel.php:691
 msgid "Advanced"
 msgstr "Zaawansowane"
 
 #. TRANS: Field label for custom CSS.
-#: actions/designadminpanel.php:696
 msgid "Custom CSS"
 msgstr "Własny plik CSS"
 
 #. TRANS: Button text for resetting theme settings.
-#: actions/designadminpanel.php:718
 msgctxt "BUTTON"
 msgid "Use defaults"
 msgstr "Użyj domyślne"
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:720
 #, fuzzy
 msgid "Restore default designs."
 msgstr "Przywróć domyślny wygląd"
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:728
 #, fuzzy
 msgid "Reset back to default."
 msgstr "Przywróć domyślne ustawienia"
 
 #. TRANS: Title for button for saving theme settings.
-#: actions/designadminpanel.php:736
 #, fuzzy
 msgid "Save design."
 msgstr "Zapisz wygląd"
 
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
-#: actions/disfavor.php:83
 msgid "This notice is not a favorite!"
 msgstr "Ten wpis nie jest ulubiony."
 
 #. TRANS: Title for page on which favorites can be added.
-#: actions/disfavor.php:98
 msgid "Add to favorites"
 msgstr "Dodaj do ulubionych"
 
 #. TRANS: Client exception thrown when requesting a document from the documentation that does not exist.
 #. TRANS: %s is the non-existing document.
-#: actions/doc.php:155
 #, php-format
 msgid "No such document \"%s\"."
 msgstr "Nie ma takiego dokumentu \\\"%s\\\"."
 
 #. TRANS: Title for "Edit application" form.
 #. TRANS: Form legend.
-#: actions/editapplication.php:54 lib/applicationeditform.php:129
 msgid "Edit application"
 msgstr "Zmodyfikuj aplikację"
 
 #. TRANS: Client error displayed trying to edit an application while not logged in.
-#: actions/editapplication.php:66
 msgid "You must be logged in to edit an application."
 msgstr "Musisz być zalogowany, aby zmodyfikować aplikację."
 
 #. TRANS: Client error displayed trying to edit an application that does not exist.
-#: actions/editapplication.php:83 actions/showapplication.php:83
 msgid "No such application."
 msgstr "Nie ma takiej aplikacji."
 
 #. TRANS: Instructions for "Edit application" form.
-#: actions/editapplication.php:167
 msgid "Use this form to edit your application."
 msgstr "Użyj tego formularza, aby zmodyfikować aplikację."
 
 #. TRANS: Validation error shown when not providing a name in the "Edit application" form.
 #. TRANS: Validation error shown when not providing a name in the "New application" form.
-#: actions/editapplication.php:184 actions/newapplication.php:164
 msgid "Name is required."
 msgstr "Nazwa jest wymagana."
 
 #. 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.
-#: actions/editapplication.php:188 actions/newapplication.php:172
 msgid "Name is too long (maximum 255 characters)."
 msgstr "Nazwa jest za długa (maksymalnie 255 znaków)."
 
 #. TRANS: Validation error shown when providing a name for an application that already exists in the "Edit application" form.
 #. TRANS: Validation error shown when providing a name for an application that already exists in the "New application" form.
-#: actions/editapplication.php:192 actions/newapplication.php:168
 msgid "Name already in use. Try another one."
 msgstr "Nazwa jest już używana. Spróbuj innej."
 
 #. TRANS: Validation error shown when not providing a description in the "Edit application" form.
 #. TRANS: Validation error shown when not providing a description in the "New application" form.
-#: actions/editapplication.php:196 actions/newapplication.php:176
 msgid "Description is required."
 msgstr "Opis jest wymagany."
 
 #. TRANS: Validation error shown when providing too long a source URL in the "Edit application" form.
-#: actions/editapplication.php:209
 msgid "Source URL is too long."
 msgstr "Źródłowy adres URL jest za długi."
 
 #. TRANS: Validation error shown when providing an invalid source URL in the "Edit application" form.
 #. TRANS: Validation error shown when providing an invalid source URL in the "New application" form.
-#: actions/editapplication.php:216 actions/newapplication.php:199
 msgid "Source URL is not valid."
 msgstr "Źródłowy adres URL jest nieprawidłowy."
 
 #. 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.
-#: actions/editapplication.php:220 actions/newapplication.php:203
 msgid "Organization is required."
 msgstr "Organizacja jest wymagana."
 
 #. TRANS: Validation error shown when providing too long an arganisation name in the "Edit application" form.
-#: actions/editapplication.php:224 actions/newapplication.php:207
 msgid "Organization is too long (maximum 255 characters)."
 msgstr "Organizacja jest za długa (maksymalnie 255 znaków)."
 
 #. TRANS: Form validation error show when an organisation name has not been provided in the edit application form.
 #. TRANS: Form validation error show when an organisation name has not been provided in the new application form.
-#: actions/editapplication.php:228 actions/newapplication.php:211
 msgid "Organization homepage is required."
 msgstr "Strona domowa organizacji jest wymagana."
 
 #. TRANS: Validation error shown when providing too long a callback URL in the "Edit application" form.
 #. TRANS: Validation error shown when providing too long a callback URL in the "New application" form.
-#: actions/editapplication.php:239 actions/newapplication.php:225
 msgid "Callback is too long."
 msgstr "Adres zwrotny jest za długi."
 
 #. TRANS: Validation error shown when providing an invalid callback URL in the "Edit application" form.
 #. TRANS: Validation error shown when providing an invalid callback URL in the "New application" form.
-#: actions/editapplication.php:247 actions/newapplication.php:235
 msgid "Callback URL is not valid."
 msgstr "Adres zwrotny URL jest nieprawidłowy."
 
 #. TRANS: Server error occuring when an application could not be updated from the "Edit application" form.
-#: actions/editapplication.php:284
 msgid "Could not update application."
 msgstr "Nie można zaktualizować aplikacji."
 
 #. TRANS: Title for form to edit a group. %s is a group nickname.
-#: actions/editgroup.php:55
 #, php-format
 msgid "Edit %s group"
 msgstr "Zmodyfikuj grupę %s"
@@ -2443,40 +1934,40 @@ msgstr "Zmodyfikuj grupę %s"
 #. TRANS: Client error displayed trying to edit a group while not logged in.
 #. TRANS: Client error displayed when trying to create a group while not logged in.
 #. TRANS: Client error displayed trying to create a group while not logged in.
-#: actions/editgroup.php:68 actions/grouplogo.php:69 actions/newgroup.php:65
 msgid "You must be logged in to create a group."
 msgstr "Musisz być zalogowany, aby utworzyć grupę."
 
 #. TRANS: Form instructions for group edit form.
-#: actions/editgroup.php:161
 msgid "Use this form to edit the group."
 msgstr "Użyj tego formularza, aby zmodyfikować grupę."
 
+#. TRANS: Group edit form validation error.
+#. TRANS: Group create form validation error.
+#. TRANS: %s is the invalid alias.
+#, php-format
+msgid "Invalid alias: \"%s\""
+msgstr "Nieprawidłowy alias: \"%s\""
+
 #. TRANS: Group edit form success message.
-#: actions/editgroup.php:301
 msgid "Options saved."
 msgstr "Zapisano opcje."
 
 #. TRANS: Title for e-mail settings.
-#: actions/emailsettings.php:60
 msgid "Email settings"
 msgstr "Ustawienia adresu e-mail"
 
 #. TRANS: E-mail settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/emailsettings.php:74
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 msgstr "Zarządzanie, jak otrzymywać wiadomości e-mail od %%site.name%%."
 
 #. TRANS: Form legend for e-mail settings form.
 #. TRANS: Field label for e-mail address input in e-mail settings form.
-#: actions/emailsettings.php:104 actions/emailsettings.php:130
 msgid "Email address"
 msgstr "Adres e-mail"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:110
 msgid "Current confirmed email address."
 msgstr "Obecnie potwierdzone adresy e-mail."
 
@@ -2485,15 +1976,11 @@ msgstr "Obecnie potwierdzone adresy e-mail."
 #. TRANS: Button label to remove a confirmed IM address.
 #. TRANS: Button label to remove a confirmed SMS address.
 #. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
-#: actions/emailsettings.php:113 actions/emailsettings.php:180
-#: actions/imsettings.php:119 actions/smssettings.php:119
-#: actions/smssettings.php:175
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Usuń"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:120
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -2507,44 +1994,36 @@ msgstr ""
 #. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
 #. TRANS: Any other domain may be owned by a legitimate person or
 #. TRANS: organization.
-#: actions/emailsettings.php:137
 msgid "Email address, like \"UserName@example.org\""
 msgstr "Adres e-mail, taki jak \"NazwaUżytkownika@example.org\""
 
 #. TRANS: Button label for adding an e-mail address in e-mail settings form.
 #. TRANS: Button label for adding an IM address in IM settings form.
 #. TRANS: Button label for adding a SMS phone number in SMS settings form.
-#: actions/emailsettings.php:141 actions/imsettings.php:147
-#: actions/smssettings.php:157
 msgctxt "BUTTON"
 msgid "Add"
 msgstr "Dodaj"
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:149 actions/smssettings.php:166
 msgid "Incoming email"
 msgstr "Wiadomości przychodzące"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:155
 msgid "I want to post notices by email."
 msgstr "Chcę wysyłać wpisy przez wiadomości e-mail."
 
 #. TRANS: Form instructions for incoming e-mail form in e-mail settings.
 #. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
-#: actions/emailsettings.php:177 actions/smssettings.php:173
 msgid "Send email to this address to post new notices."
 msgstr "Wyślij wiadomość e-mail na ten adres, aby wysyłać nowe wpisy."
 
 #. TRANS: Instructions for incoming e-mail address input form, when an address has already been assigned.
 #. TRANS: Instructions for incoming SMS e-mail address input form.
-#: actions/emailsettings.php:186 actions/smssettings.php:181
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr "Używaj nowego adresu e-mail do wysyłania; anuluj poprzedni."
 
 #. TRANS: Instructions for incoming e-mail address input form.
-#: actions/emailsettings.php:190
 msgid ""
 "To send notices via email, we need to create a unique email address for you "
 "on this server:"
@@ -2554,88 +2033,70 @@ msgstr ""
 
 #. TRANS: Button label for adding an e-mail address to send notices from.
 #. TRANS: Button label for adding an SMS e-mail address to send notices from.
-#: actions/emailsettings.php:196 actions/smssettings.php:184
 msgctxt "BUTTON"
 msgid "New"
 msgstr "Nowy"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:205
 msgid "Email preferences"
 msgstr "Preferencje e-mail"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:213
 msgid "Send me notices of new subscriptions through email."
 msgstr "Wyślij wpisy nowych subskrypcji przez e-mail."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:219
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr "Wyślij wiadomość e-mail, kiedy ktoś doda mój wpis jako ulubiony."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:226
 msgid "Send me email when someone sends me a private message."
 msgstr "Wyślij wiadomość e-mail, kiedy ktoś wyśle prywatną wiadomość."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:232
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr "Wyślij wiadomość e-mail, kiedy ktoś wyśle odpowiedź \"@\"."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:238
 msgid "Allow friends to nudge me and send me an email."
 msgstr "Pozwól przyjaciołom na szturchanie mnie i wyślij mi wiadomość e-mail."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:244
 msgid "Publish a MicroID for my email address."
 msgstr "Opublikuj MicroID adresu e-mail."
 
 #. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:362
 msgid "Email preferences saved."
 msgstr "Zapisano preferencje e-mail."
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:381
 msgid "No email address."
 msgstr "Brak adresu e-mail."
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:389
 #, fuzzy
 msgid "Cannot normalize that email address."
 msgstr "Nie można znormalizować tego adresu e-mail"
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:394 actions/register.php:197
-#: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "To nie jest prawidłowy adres e-mail."
 
 #. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:398
 msgid "That is already your email address."
 msgstr "Ten adres e-mail jest już twój."
 
 #. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:402
 msgid "That email address already belongs to another user."
 msgstr "Ten adres e-mail należy już do innego użytkownika."
 
 #. TRANS: Server error thrown on database error adding e-mail confirmation code.
 #. TRANS: Server error thrown on database error adding Instant Messaging confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:419 actions/imsettings.php:362
-#: actions/smssettings.php:364
 msgid "Could not insert confirmation code."
 msgstr "Nie można wprowadzić kodu potwierdzającego."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:426
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
@@ -2647,102 +2108,82 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling Instant Messaging address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:446 actions/imsettings.php:391
-#: actions/smssettings.php:398
 msgid "No pending confirmation to cancel."
 msgstr "Brak oczekujących potwierdzeń do anulowania."
 
 #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:451
 msgid "That is the wrong email address."
 msgstr "To jest błędny adres e-mail."
 
 #. TRANS: Server error thrown on database error canceling e-mail address confirmation.
 #. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
-#: actions/emailsettings.php:460 actions/smssettings.php:412
 msgid "Could not delete email confirmation."
 msgstr "Nie można usunąć potwierdzenia adresu e-mail."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:465
 msgid "Email confirmation cancelled."
 msgstr "Anulowano potwierdzenie e-mail."
 
 #. TRANS: Message given trying to remove an e-mail address that is not
 #. TRANS: registered for the active user.
-#: actions/emailsettings.php:484
 msgid "That is not your email address."
 msgstr "To nie jest twój adres e-mail."
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:505
 msgid "The email address was removed."
 msgstr "Adres e-mail został usunięty."
 
 #. TRANS: Form validation error displayed when trying to remove an incoming e-mail address while no address has been set.
-#: actions/emailsettings.php:519 actions/smssettings.php:554
 msgid "No incoming email address."
 msgstr "Brak przychodzącego adresu e-mail."
 
 #. 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.
-#: actions/emailsettings.php:531 actions/emailsettings.php:555
-#: actions/smssettings.php:565 actions/smssettings.php:590
 msgid "Could not update user record."
 msgstr "Nie można zaktualizować wpisu użytkownika."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
 #. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:535 actions/smssettings.php:569
 msgid "Incoming email address removed."
 msgstr "Usunięto przychodzący adres e-mail."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
 #. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:559 actions/smssettings.php:594
 msgid "New incoming email address added."
 msgstr "Dodano nowy przychodzący adres e-mail."
 
 #. TRANS: Client error displayed when trying to mark a notice as favorite that already is a favorite.
-#: actions/favor.php:80
 msgid "This notice is already a favorite!"
 msgstr "Ten wpis jest już ulubiony."
 
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
-#: actions/favor.php:95
 #, fuzzy
 msgid "Disfavor favorite."
 msgstr "Usuń wpis z ulubionych"
 
 #. TRANS: Page title for first page of favorited notices.
 #. TRANS: Title for favourited notices section.
-#: actions/favorited.php:65 lib/popularnoticesection.php:62
-#: lib/publicgroupnav.php:93
 msgid "Popular notices"
 msgstr "Popularne wpisy"
 
 #. TRANS: Page title for all but first page of favorited notices.
 #. TRANS: %d is the page number being displayed.
-#: actions/favorited.php:69
 #, php-format
 msgid "Popular notices, page %d"
 msgstr "Popularne wpisy, strona %d"
 
 #. TRANS: Description on page displaying favorited notices.
-#: actions/favorited.php:81
 msgid "The most popular notices on the site right now."
 msgstr "Najpopularniejsze wpisy na witrynie w te chwili."
 
 #. TRANS: Text displayed instead of a list when a site does not yet have any favourited notices.
-#: actions/favorited.php:149
 msgid "Favorite notices appear on this page but no one has favorited one yet."
 msgstr ""
 "Ulubione wpisy są widoczne na tej stronie, ale nikt nie oznaczył jeszcze "
 "żadnego jako ulubiony."
 
 #. TRANS: Additional text displayed instead of a list when a site does not yet have any favourited notices for logged in users.
-#: actions/favorited.php:153
 msgid ""
 "Be the first to add a notice to your favorites by clicking the fave button "
 "next to any notice you like."
@@ -2752,7 +2193,6 @@ msgstr ""
 
 #. TRANS: Additional text displayed instead of a list when a site does not yet have any favourited notices for not logged in users.
 #. TRANS: %%action.register%% is a registration link. "[link text](link)" is Mark Down. Do not change the formatting.
-#: actions/favorited.php:158
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to add a "
@@ -2765,181 +2205,146 @@ msgstr ""
 #. TRANS: %s is a user's nickname.
 #. TRANS: Title for first page of favourite notices of a user.
 #. TRANS: %s is the user for whom the favourite notices are displayed.
-#: actions/favoritesrss.php:111 actions/showfavorites.php:76
-#: lib/personalgroupnav.php:110
 #, php-format
 msgid "%s's favorite notices"
 msgstr "Ulubione wpisy użytkownika %s"
 
 #. TRANS: Desciption of RSS feed with favourite notices of a user.
 #. TRANS: %1$s is a user's nickname, %2$s is the name of the StatusNet site.
-#: actions/favoritesrss.php:117
 #, php-format
 msgid "Updates favored by %1$s on %2$s!"
 msgstr "Aktualizacje ulubione przez użytkownika %1$s na %2$s."
 
 #. TRANS: Page title for first page of featured users.
 #. TRANS: Title for featured users section.
-#: actions/featured.php:69 lib/featureduserssection.php:87
-#: lib/publicgroupnav.php:89
 msgid "Featured users"
 msgstr "Znani użytkownicy"
 
 #. TRANS: Page title for all but first page of featured users.
 #. TRANS: %d is the page number being displayed.
-#: actions/featured.php:73
 #, php-format
 msgid "Featured users, page %d"
 msgstr "Znani użytkownicy, strona %d"
 
 #. TRANS: Description on page displaying featured users.
-#: actions/featured.php:102
 #, fuzzy, php-format
 msgid "A selection of some great users on %s."
 msgstr "Wybór znanych użytkowników w serwisie %s"
 
 #. TRANS: Client error displayed when no notice ID was given trying do display a file.
-#: actions/file.php:36
 msgid "No notice ID."
 msgstr "Brak identyfikatora wpisu."
 
 #. TRANS: Client error displayed when an invalid notice ID was given trying do display a file.
-#: actions/file.php:41
 msgid "No notice."
 msgstr "Brak wpisu."
 
 #. TRANS: Client error displayed when trying do display a file for a notice without a file attachement.
-#: actions/file.php:46
 msgid "No attachments."
 msgstr "Brak załączników."
 
 #. TRANS: Client error displayed when trying do display a file for a notice with file attachements
 #. TRANS: that could not be found.
-#: actions/file.php:58
 msgid "No uploaded attachments."
 msgstr "Nie wysłano załączników."
 
 #. TRANS: Client error displayed when subscribing to a remote profile and an unexpected response is received.
-#: actions/finishremotesubscribe.php:69
 msgid "Not expecting this response!"
 msgstr "Nieoczekiwana odpowiedź."
 
 #. TRANS: Client error displayed when subscribing to a remote profile that does not exist.
-#: actions/finishremotesubscribe.php:81
 msgid "User being listened to does not exist."
 msgstr "Nasłuchiwany użytkownik nie istnieje."
 
 #. TRANS: Client error displayed when subscribing to a remote profile that is a local profile.
-#: actions/finishremotesubscribe.php:89 actions/remotesubscribe.php:58
 msgid "You can use the local subscription!"
 msgstr "Można używać lokalnej subskrypcji."
 
 #. TRANS: Client error displayed when subscribing to a remote profile that is blocked form subscribing to.
-#: actions/finishremotesubscribe.php:102
 msgid "That user has blocked you from subscribing."
 msgstr "Ten użytkownik zablokował cię z subskrypcji."
 
 #. TRANS: Client error displayed when subscribing to a remote profile without providing an authorised token.
-#: actions/finishremotesubscribe.php:114
 msgid "You are not authorized."
 msgstr "Brak upoważnienia."
 
 #. TRANS: Client error displayed when subscribing to a remote profile and conversion of the request token to access token fails.
-#: actions/finishremotesubscribe.php:118
 msgid "Could not convert request token to access token."
 msgstr "Nie można przekonwertować tokenów żądań na tokeny dostępu."
 
 #. TRANS: Client error displayed when subscribing to a remote profile fails because of an unsupported version of the OMB protocol.
-#: actions/finishremotesubscribe.php:124
 msgid "Remote service uses unknown version of OMB protocol."
 msgstr "Zdalna usługa używa nieznanej wersji protokołu OMB."
 
 #. TRANS: Server error displayed when subscribing to a remote profile fails because the remote profile could not be updated.
-#: actions/finishremotesubscribe.php:145 lib/oauthstore.php:317
 msgid "Error updating remote profile."
 msgstr "Błąd podczas aktualizowania zdalnego profilu."
 
 #. TRANS: Client error displayed when requesting a non-existent file.
-#: actions/getfile.php:77
 msgid "No such file."
 msgstr "Nie ma takiego pliku."
 
 #. TRANS: Client error displayed when requesting a file without having read access to it.
-#: actions/getfile.php:82
 msgid "Cannot read file."
 msgstr "Nie można odczytać pliku."
 
 #. TRANS: Client error displayed when trying to assign an invalid role to a user.
-#: actions/grantrole.php:61 actions/revokerole.php:62
 msgid "Invalid role."
 msgstr "Nieprawidłowa rola."
 
 #. TRANS: Client error displayed when trying to assign an reserved role to a user.
-#: actions/grantrole.php:66 actions/revokerole.php:66
 msgid "This role is reserved and cannot be set."
 msgstr "Ta rola jest zastrzeżona i nie może zostać ustawiona."
 
 #. TRANS: Client error displayed when trying to assign a role to a user while not being allowed to set roles.
-#: actions/grantrole.php:76
 msgid "You cannot grant user roles on this site."
 msgstr "Nie można udzielić rol użytkownikom na tej witrynie."
 
 #. TRANS: Client error displayed when trying to assign a role to a user that already has that role.
-#: actions/grantrole.php:84
 msgid "User already has this role."
 msgstr "Użytkownik ma już tę rolę."
 
 #. TRANS: Client error displayed trying to block a user from a group while not specifying a to be blocked user profile.
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing a profile.
+#. TRANS: Client error displayed when not providing a profile ID on the Make Admin page.
 #. TRANS: Client error displayed trying a change a subscription without providing a profile.
 #. TRANS: Client error displayed when trying to change user options without specifying a user to work on.
-#: actions/groupblock.php:71 actions/groupunblock.php:71
-#: actions/makeadmin.php:71 actions/subedit.php:49
-#: lib/profileformaction.php:79
 msgid "No profile specified."
 msgstr "Nie podano profilu."
 
 #. TRANS: Client error displayed trying to block a user from a group while specifying a non-existing profile.
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing an existing profile.
+#. TRANS: Client error displayed when specifying an invalid profile ID on the Make Admin page.
 #. TRANS: Client error displayed trying a change a subscription for a non-existant profile ID.
 #. TRANS: Client error displayed when trying to change user options without specifying an existing user to work on.
-#: actions/groupblock.php:77 actions/groupunblock.php:77
-#: actions/makeadmin.php:76 actions/subedit.php:57 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:87
 msgid "No profile with that ID."
 msgstr "Brak profilu o tym identyfikatorze."
 
 #. TRANS: Client error displayed trying to block a user from a group while not specifying a group to block a profile from.
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing a group.
-#: actions/groupblock.php:83 actions/groupunblock.php:83
-#: actions/makeadmin.php:81
+#. TRANS: Client error displayed when not providing a group ID on the Make Admin page.
 msgid "No group specified."
 msgstr "Nie podano grupy."
 
 #. TRANS: Client error displayed trying to block a user from a group while not being an admin user.
-#: actions/groupblock.php:95
 msgid "Only an admin can block group members."
 msgstr "Tylko administrator może blokować członków grupy."
 
 #. TRANS: Client error displayed trying to block a user from a group while user is already blocked from the given group.
-#: actions/groupblock.php:100
 msgid "User is already blocked from group."
 msgstr "Użytkownik został już zablokował w grupie."
 
 #. TRANS: Client error displayed trying to block a user from a group while user is not a member of given group.
-#: actions/groupblock.php:106
 msgid "User is not a member of group."
 msgstr "Użytkownik nie jest członkiem grupy."
 
 #. TRANS: Title for block user from group page.
 #. TRANS: Form legend for form to block user from a group.
-#: actions/groupblock.php:141 actions/groupmembers.php:364
 msgid "Block user from group"
 msgstr "Zablokuj użytkownika w grupie"
 
 #. TRANS: Explanatory text for block user from group form before setting the block.
 #. TRANS: %1$s is that to be blocked user, %2$s is the group the user will be blocked from.
-#: actions/groupblock.php:169
 #, php-format
 msgid ""
 "Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They "
@@ -2951,156 +2356,129 @@ msgstr ""
 "grupy w przyszłości."
 
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
-#: actions/groupblock.php:191
 #, fuzzy
 msgid "Do not block this user from this group."
 msgstr "Nie blokuj tego użytkownika w tej grupie"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
-#: actions/groupblock.php:198
 #, fuzzy
 msgid "Block this user from this group."
 msgstr "Zablokuj tego użytkownika w tej grupie"
 
 #. TRANS: Server error displayed when trying to block a user from a group fails because of an application error.
-#: actions/groupblock.php:215
 msgid "Database error blocking user from group."
 msgstr "Błąd bazy danych podczas blokowania użytkownika w grupie."
 
 #. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
 #. TRANS: Client error displayed trying to find a user by ID without providing an ID.
-#: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr "Brak identyfikatora."
 
 #. TRANS: Client error displayed trying to change group design settings while not logged in.
-#: actions/groupdesignsettings.php:67
 msgid "You must be logged in to edit a group."
 msgstr "Musisz być zalogowany, aby zmodyfikować grupę."
 
 #. TRANS: Title group design settings page.
-#: actions/groupdesignsettings.php:146
 msgid "Group design"
 msgstr "Wygląd grupy"
 
 #. TRANS: Instructions for group design settings page.
-#: actions/groupdesignsettings.php:157
 msgid ""
 "Customize the way your group looks with a background image and a colour "
 "palette of your choice."
 msgstr "Dostosuj wygląd grupy za pomocą wybranego obrazu tła i palety kolorów."
 
 #. TRANS: Form validation error displayed when group design settings could not be updated because of an application issue.
-#: actions/groupdesignsettings.php:262
 #, fuzzy
 msgid "Unable to update your design settings."
 msgstr "Nie można zapisać ustawień wyglądu."
 
 #. TRANS: Form text to confirm saved group design settings.
-#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:239
 msgid "Design preferences saved."
 msgstr "Zapisano preferencje wyglądu."
 
 #. TRANS: Title for group logo settings page.
 #. TRANS: Group logo form legend.
-#: actions/grouplogo.php:144 actions/grouplogo.php:199
 msgid "Group logo"
 msgstr "Logo grupy"
 
 #. TRANS: Instructions for group logo page.
 #. TRANS: %s is the maximum file size for that site.
-#: actions/grouplogo.php:156
 #, php-format
 msgid ""
 "You can upload a logo image for your group. The maximum file size is %s."
 msgstr "Można wysłać obraz logo grupy. Maksymalny rozmiar pliku to %s."
 
 #. TRANS: Submit button for uploading a group logo.
-#: actions/grouplogo.php:243
 msgid "Upload"
 msgstr "Wyślij"
 
 #. TRANS: Button text for cropping an uploaded group logo.
-#: actions/grouplogo.php:299
 msgid "Crop"
 msgstr "Przytnij"
 
 #. TRANS: Form instructions on the group logo page.
-#: actions/grouplogo.php:376
 msgid "Pick a square area of the image to be the logo."
 msgstr "Wybierz kwadratowy obszar obrazu, który będzie logo."
 
 #. TRANS: Form success message after updating a group logo.
-#: actions/grouplogo.php:411
 msgid "Logo updated."
 msgstr "Zaktualizowano logo."
 
 #. TRANS: Form failure message after failing to update a group logo.
-#: actions/grouplogo.php:414
 msgid "Failed updating logo."
 msgstr "Zaktualizowanie logo nie powiodło się."
 
 #. TRANS: Title of the page showing group members.
 #. TRANS: %s is the name of the group.
-#: actions/groupmembers.php:104
 #, php-format
 msgid "%s group members"
 msgstr "Członkowie grupy %s"
 
 #. TRANS: Title of the page showing group members.
 #. TRANS: %1$s is the name of the group, %2$d is the page number of the members list.
-#: actions/groupmembers.php:109
 #, php-format
 msgid "%1$s group members, page %2$d"
 msgstr "Członkowie grupy %1$s, strona %2$d"
 
 #. TRANS: Page notice for group members page.
-#: actions/groupmembers.php:125
 msgid "A list of the users in this group."
 msgstr "Lista użytkowników znajdujących się w tej grupie."
 
 #. TRANS: Indicator in group members list that this user is a group administrator.
-#: actions/groupmembers.php:190 lib/action.php:581
 msgid "Admin"
 msgstr "Administrator"
 
 #. TRANS: Button text for the form that will block a user from a group.
-#: actions/groupmembers.php:397
 msgctxt "BUTTON"
 msgid "Block"
 msgstr "Zablokuj"
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:401
 msgctxt "TOOLTIP"
 msgid "Block this user"
 msgstr "Zablokuj tego użytkownika"
 
 #. TRANS: Form legend for form to make a user a group admin.
-#: actions/groupmembers.php:488
 msgid "Make user an admin of the group"
 msgstr "Uczyń użytkownika administratorem grupy"
 
 #. TRANS: Button text for the form that will make a user administrator.
-#: actions/groupmembers.php:521
 msgctxt "BUTTON"
 msgid "Make Admin"
 msgstr "Uczyń administratorem"
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:525
 msgctxt "TOOLTIP"
 msgid "Make this user an admin"
 msgstr "Nadaje temu użytkownikowi uprawnienia administratora"
 
 #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
-#: actions/grouprss.php:141
 #, php-format
 msgid "Updates from members of %1$s on %2$s!"
 msgstr "Aktualizacje od członków %1$s na %2$s."
 
 #. TRANS: Title for first page of the groups list.
-#: actions/groups.php:62
 #, fuzzy
 msgctxt "TITLE"
 msgid "Groups"
@@ -3108,7 +2486,6 @@ msgstr "Grupy"
 
 #. TRANS: Title for all but the first page of the groups list.
 #. TRANS: %d is the page number.
-#: actions/groups.php:66
 #, fuzzy, php-format
 msgctxt "TITLE"
 msgid "Groups, page %d"
@@ -3117,7 +2494,6 @@ msgstr "Grupy, strona %d"
 #. TRANS: Page notice of group list. %%%%site.name%%%% is the StatusNet site name,
 #. TRANS: %%%%action.groupsearch%%%% and %%%%action.newgroup%%%% are URLs. Do not change them.
 #. TRANS: This message contains Markdown links in the form [link text](link).
-#: actions/groups.php:95
 #, fuzzy, php-format
 msgid ""
 "%%%%site.name%%%% groups let you find and talk with people of similar "
@@ -3133,12 +2509,10 @@ msgstr ""
 "[założyć własną.](%%%%action.newgroup%%%%)"
 
 #. TRANS: Link to create a new group on the group list page.
-#: actions/groups.php:113 actions/usergroups.php:126 lib/groupeditform.php:115
 msgid "Create a new group"
 msgstr "Utwórz nową grupę"
 
 #. TRANS: Instructions for page where groups can be searched. %%site.name%% is the name of the StatusNet site.
-#: actions/groupsearch.php:53
 #, php-format
 msgid ""
 "Search for groups on %%site.name%% by their name, location, or description. "
@@ -3148,21 +2522,17 @@ msgstr ""
 "Oddziel terminy spacjami; muszą mieć trzy znaki lub więcej."
 
 #. TRANS: Title for page where groups can be searched.
-#: actions/groupsearch.php:60
 msgid "Group search"
 msgstr "Wyszukaj grupę"
 
 #. TRANS: Text on page where groups can be searched if no results were found for a query.
 #. TRANS: Text for notice search results is the query had no results.
 #. TRANS: Message on the "People search" page where a query has no results.
-#: actions/groupsearch.php:82 actions/noticesearch.php:122
-#: actions/peoplesearch.php:87
 msgid "No results."
 msgstr "Brak wyników."
 
 #. TRANS: Additional text on page where groups can be searched if no results were found for a query for a logged in user.
 #. TRANS: This message contains Markdown links in the form [link text](link).
-#: actions/groupsearch.php:87
 #, fuzzy, php-format
 msgid ""
 "If you cannot find the group you're looking for, you can [create it](%%"
@@ -3173,7 +2543,6 @@ msgstr ""
 
 #. TRANS: Additional text on page where groups can be searched if no results were found for a query for a not logged in user.
 #. TRANS: This message contains Markdown links in the form [link text](link).
-#: actions/groupsearch.php:92
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and [create the group](%%"
@@ -3183,30 +2552,25 @@ msgstr ""
 "grupę](%%action.newgroup%%)."
 
 #. TRANS: Client error displayed when trying to unblock a user from a group without being an administrator for the group.
-#: actions/groupunblock.php:95
 msgid "Only an admin can unblock group members."
 msgstr "Tylko administrator może odblokowywać członków grupy."
 
 #. TRANS: Client error displayed when trying to unblock a non-blocked user from a group.
-#: actions/groupunblock.php:100
 msgid "User is not blocked from group."
 msgstr "Użytkownik nie został zablokowany w grupie."
 
 #. TRANS: Server error displayed when unblocking a user from a group fails because of an unknown error.
 #. TRANS: Server error displayed when removing a user block.
-#: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "Błąd podczas usuwania blokady."
 
 #. TRANS: Title for Instant Messaging settings.
-#: actions/imsettings.php:56
 msgid "IM settings"
 msgstr "Ustawienia komunikatora"
 
 #. 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.
-#: actions/imsettings.php:69
 #, fuzzy, php-format
 msgid ""
 "You can send and receive notices through instant messaging [instant messages]"
@@ -3216,18 +2580,15 @@ msgstr ""
 "Skonfiguruj adres i ustawienia poniżej."
 
 #. TRANS: Message given in the IM settings if IM is not enabled on the site.
-#: actions/imsettings.php:90
 msgid "IM is not available."
 msgstr "Komunikator nie jest dostępny."
 
-#: actions/imsettings.php:116
 #, fuzzy, php-format
 msgid "Current confirmed %s address."
 msgstr "Obecnie potwierdzone adresy e-mail."
 
 #. TRANS: Form note in IM settings form.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:128
 #, fuzzy, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your %s account for a message "
@@ -3237,89 +2598,74 @@ msgstr ""
 "czy otrzymałeś wiadomość z dalszymi instrukcjami (dodałeś %s do listy "
 "znajomych?)."
 
-#: actions/imsettings.php:140
 msgid "IM address"
 msgstr "Adres komunikatora"
 
-#: actions/imsettings.php:142
 #, php-format
 msgid "%s screenname."
 msgstr ""
 
 #. TRANS: Header for IM preferences form.
-#: actions/imsettings.php:163
 #, fuzzy
 msgid "IM Preferences"
 msgstr "Preferencje komunikatora"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:174
 #, fuzzy
 msgid "Send me notices"
 msgstr "Wyślij wpis"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:176
 #, fuzzy
 msgid "Post a notice when my status changes."
 msgstr "Wyślij wpis, kiedy zmieni się mój stan na Jabber/GTalk."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:178
 #, fuzzy
 msgid "Send me replies from people I'm not subscribed to."
 msgstr ""
 "Wyślij mi odpowiedzi przez Jabber/GTalk od osób, których nie subskrybuję."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:181
 #, fuzzy
 msgid "Publish a MicroID"
 msgstr "Opublikuj MicroID adresu e-mail."
 
 #. TRANS: Server error thrown on database error updating IM preferences.
-#: actions/imsettings.php:291
 #, fuzzy
 msgid "Couldn't update IM preferences."
 msgstr "Nie można zaktualizować użytkownika."
 
 #. TRANS: Confirmation message for successful IM preferences save.
 #. TRANS: Confirmation message after saving preferences.
-#: actions/imsettings.php:298 actions/urlsettings.php:244
 msgid "Preferences saved."
 msgstr "Zapisano preferencje."
 
 #. TRANS: Message given saving IM address without having provided one.
-#: actions/imsettings.php:320
 #, fuzzy
 msgid "No screenname."
 msgstr "Brak pseudonimu."
 
-#: actions/imsettings.php:325
 #, fuzzy
 msgid "No transport."
 msgstr "Brak wpisu."
 
 #. TRANS: Message given saving IM address that cannot be normalised.
-#: actions/imsettings.php:333
 #, fuzzy
 msgid "Cannot normalize that screenname"
 msgstr "Nie można znormalizować tego identyfikatora Jabbera"
 
 #. TRANS: Message given saving IM address that not valid.
-#: actions/imsettings.php:340
 #, fuzzy
 msgid "Not a valid screenname"
 msgstr "To nie jest prawidłowy pseudonim."
 
 #. TRANS: Message given saving IM address that is already set for another user.
-#: actions/imsettings.php:344
 #, fuzzy
 msgid "Screenname already belongs to another user."
 msgstr "Identyfikator Jabbera należy już do innego użytkownika."
 
 #. TRANS: Message given saving valid IM address that is to be confirmed.
-#: actions/imsettings.php:369
 #, fuzzy
 msgid "A confirmation code was sent to the IM address you added."
 msgstr ""
@@ -3327,67 +2673,56 @@ msgstr ""
 "zaakceptować otrzymywanie wiadomości od %s."
 
 #. TRANS: Message given canceling IM address confirmation for the wrong IM address.
-#: actions/imsettings.php:396
 msgid "That is the wrong IM address."
 msgstr "To jest błędny adres komunikatora."
 
 #. TRANS: Server error thrown on database error canceling IM address confirmation.
-#: actions/imsettings.php:405
 #, fuzzy
 msgid "Couldn't delete confirmation."
 msgstr "Nie można usunąć potwierdzenia komunikatora."
 
 #. TRANS: Message given after successfully canceling IM address confirmation.
-#: actions/imsettings.php:410
 msgid "IM confirmation cancelled."
 msgstr "Anulowano potwierdzenie komunikatora."
 
 #. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.
-#: actions/imsettings.php:434
 #, fuzzy
 msgid "That is not your screenname."
 msgstr "To nie jest twój numer telefonu."
 
 #. TRANS: Server error thrown on database error removing a registered IM address.
-#: actions/imsettings.php:443
 #, fuzzy
 msgid "Couldn't update user im prefs."
 msgstr "Nie można zaktualizować wpisu użytkownika."
 
 #. TRANS: Message given after successfully removing a registered Instant Messaging address.
-#: actions/imsettings.php:451
 msgid "The IM address was removed."
 msgstr "Adres komunikatora został usunięty."
 
 #. TRANS: Title for all but the first page of the inbox page.
 #. TRANS: %1$s is the user's nickname, %2$s is the page number.
-#: actions/inbox.php:59
 #, php-format
 msgid "Inbox for %1$s - page %2$d"
 msgstr "Odebrane wiadomości użytkownika %1$s - strona %2$d"
 
 #. TRANS: Title for the first page of the inbox page.
 #. TRANS: %s is the user's nickname.
-#: actions/inbox.php:64
 #, php-format
 msgid "Inbox for %s"
 msgstr "Odebrane wiadomości użytkownika %s"
 
 #. TRANS: Instructions for user inbox page.
-#: actions/inbox.php:106
 msgid "This is your inbox, which lists your incoming private messages."
 msgstr ""
 "To jest skrzynka odbiorcza, która wyświetla przychodzące wiadomości prywatne."
 
 #. TRANS: Client error displayed when trying to sent invites while they have been disabled.
-#: actions/invite.php:41
 msgid "Invites have been disabled."
 msgstr "Zaproszenia zostały wyłączone."
 
 #. TRANS: Client error displayed when trying to sent invites while not logged in.
 #. TRANS: %s is the StatusNet site name.
-#: actions/invite.php:45
 #, php-format
 msgid "You must be logged in to invite other users to use %s."
 msgstr ""
@@ -3395,18 +2730,15 @@ msgstr ""
 
 #. TRANS: Form validation message when providing an e-mail address that does not validate.
 #. TRANS: %s is an invalid e-mail address.
-#: actions/invite.php:78
 #, php-format
 msgid "Invalid email address: %s."
 msgstr "Nieprawidłowy adres e-mail: %s."
 
 #. TRANS: Page title when invitations have been sent.
-#: actions/invite.php:117
 msgid "Invitations sent"
 msgstr "Wysłano zaproszenia"
 
 #. TRANS: Page title when inviting potential users.
-#: actions/invite.php:120
 msgid "Invite new users"
 msgstr "Zaproś nowych użytkowników"
 
@@ -3414,7 +2746,6 @@ msgstr "Zaproś nowych użytkowników"
 #. TRANS: is already subscribed to one or more users with the given e-mail address(es).
 #. TRANS: Plural form is based on the number of reported already subscribed e-mail addresses.
 #. TRANS: Followed by a bullet list.
-#: actions/invite.php:140
 msgid "You are already subscribed to this user:"
 msgid_plural "You are already subscribed to these users:"
 msgstr[0] "Jesteś już subskrybowany do tego użytkownika:"
@@ -3423,7 +2754,6 @@ msgstr[2] "Jesteś już subskrybowany do tych użytkowników:"
 
 #. TRANS: Used as list item for already subscribed users (%1$s is nickname, %2$s is e-mail address).
 #. TRANS: Used as list item for already registered people (%1$s is nickname, %2$s is e-mail address).
-#: actions/invite.php:146 actions/invite.php:160
 #, php-format
 msgctxt "INVITE"
 msgid "%1$s (%2$s)"
@@ -3432,7 +2762,6 @@ msgstr "%1$s (%2$s)"
 #. TRANS: Message displayed inviting users to use a StatusNet site while the invited user
 #. TRANS: already uses a this StatusNet site. Plural form is based on the number of
 #. TRANS: reported already present people. Followed by a bullet list.
-#: actions/invite.php:154
 msgid "This person is already a user and you were automatically subscribed:"
 msgid_plural ""
 "These people are already users and you were automatically subscribed to them:"
@@ -3447,7 +2776,6 @@ msgstr[2] ""
 #. TRANS: Message displayed inviting users to use a StatusNet site. Plural form is
 #. TRANS: based on the number of invitations sent. Followed by a bullet list of
 #. TRANS: e-mail addresses to which invitations were sent.
-#: actions/invite.php:168
 msgid "Invitation sent to the following person:"
 msgid_plural "Invitations sent to the following people:"
 msgstr[0] "Wysłano zaproszenie do następującej osoby:"
@@ -3456,7 +2784,6 @@ msgstr[2] "Wysłano zaproszenia do następujących osób:"
 
 #. TRANS: Generic message displayed after sending out one or more invitations to
 #. TRANS: people to join a StatusNet site.
-#: actions/invite.php:178
 msgid ""
 "You will be notified when your invitees accept the invitation and register "
 "on the site. Thanks for growing the community!"
@@ -3465,7 +2792,6 @@ msgstr ""
 "się na witrynie. Dziękujemy za pomoc w zwiększaniu społeczności."
 
 #. TRANS: Form instructions.
-#: actions/invite.php:191
 msgid ""
 "Use this form to invite your friends and colleagues to use this service."
 msgstr ""
@@ -3473,28 +2799,24 @@ msgstr ""
 "usługi."
 
 #. TRANS: Field label for a list of e-mail addresses.
-#: actions/invite.php:218
 msgid "Email addresses"
 msgstr "Adresy e-mail"
 
 #. TRANS: Tooltip for field label for a list of e-mail addresses.
-#: actions/invite.php:221
 #, fuzzy
 msgid "Addresses of friends to invite (one per line)."
 msgstr "Adresy przyjaciół, których zapraszasz (jeden na wiersz)"
 
 #. TRANS: Field label for a personal message to send to invitees.
-#: actions/invite.php:225
 msgid "Personal message"
 msgstr "Osobista wiadomość"
 
 #. TRANS: Tooltip for field label for a personal message to send to invitees.
-#: actions/invite.php:228
 msgid "Optionally add a personal message to the invitation."
 msgstr "Opcjonalnie dodaj osobistą wiadomość do zaproszenia."
 
 #. TRANS: Send button for inviting friends
-#: actions/invite.php:232
+#. TRANS: Button text for sending notice.
 msgctxt "BUTTON"
 msgid "Send"
 msgstr "Wyślij"
@@ -3502,7 +2824,6 @@ msgstr "Wyślij"
 #. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral
 #. TRANS: singular 3rd-person pronoun in English. %1$s is the inviting user, $2$s is
 #. TRANS: the StatusNet sitename.
-#: actions/invite.php:264
 #, php-format
 msgid "%1$s has invited you to join them on %2$s"
 msgstr "%1$s zapraszają cię, abyś dołączył do nich w %2$s"
@@ -3512,7 +2833,6 @@ msgstr "%1$s zapraszają cię, abyś dołączył do nich w %2$s"
 #. TRANS: StatusNet sitename, %3$s is the site URL, %4$s is the personal message from the
 #. TRANS: inviting user, %s%5 a link to the timeline for the inviting user, %s$6 is a link
 #. TRANS: to register with the StatusNet site.
-#: actions/invite.php:271
 #, php-format
 msgid ""
 "%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -3570,50 +2890,44 @@ msgstr ""
 "Z poważaniem, %2$s\n"
 
 #. TRANS: Client error displayed when trying to join a group while not logged in.
-#: actions/joingroup.php:59
 msgid "You must be logged in to join a group."
 msgstr "Musisz być zalogowany, aby dołączyć do grupy."
 
 #. TRANS: Title for join group page after joining.
-#: actions/joingroup.php:148
 #, php-format
 msgctxt "TITLE"
 msgid "%1$s joined group %2$s"
 msgstr "Użytkownik %1$s dołączył do grupy %2$s"
 
 #. TRANS: Client error displayed when trying to leave a group while not logged in.
-#: actions/leavegroup.php:59
 msgid "You must be logged in to leave a group."
 msgstr "Musisz być zalogowany, aby opuścić grupę."
 
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
-#: actions/leavegroup.php:103 lib/command.php:398
 msgid "You are not a member of that group."
 msgstr "Nie jesteś członkiem tej grupy."
 
 #. TRANS: Title for leave group page after leaving.
-#: actions/leavegroup.php:142
 #, php-format
 msgctxt "TITLE"
 msgid "%1$s left group %2$s"
 msgstr "Użytkownik %1$s opuścił grupę %2$s"
 
 #. TRANS: User admin panel title
-#: actions/licenseadminpanel.php:55
 msgctxt "TITLE"
 msgid "License"
 msgstr "Licencja"
 
-#: actions/licenseadminpanel.php:65
+#. TRANS: Form instructions for the site license admin panel.
 msgid "License for this StatusNet site"
 msgstr "Licencja dla tej witryny StatusNet"
 
-#: actions/licenseadminpanel.php:134
+#. TRANS: Client error displayed selecting an invalid license in the license admin panel.
 msgid "Invalid license selection."
 msgstr "Nieprawidłowy wybór licencji."
 
-#: actions/licenseadminpanel.php:144
+#. TRANS: Client error displayed when not specifying an owner for the all rights reserved license in the license admin panel.
 msgid ""
 "You must specify the owner of the content when using the All Rights Reserved "
 "license."
@@ -3621,134 +2935,135 @@ msgstr ""
 "Należy podać właściciela treści podczas używania licencji \"Wszystkie prawa "
 "zastrzeżone\"."
 
-#: actions/licenseadminpanel.php:151
+#. TRANS: Client error displayed selecting a too long license title in the license admin panel.
 msgid "Invalid license title. Maximum length is 255 characters."
 msgstr "Nieprawidłowy tytuł licencji. Maksymalna długość to 255 znaków."
 
-#: actions/licenseadminpanel.php:163
+#. TRANS: Client error displayed specifying an invalid license URL in the license admin panel.
 msgid "Invalid license URL."
 msgstr "Nieprawidłowy adres URL licencji."
 
-#: actions/licenseadminpanel.php:166
+#. TRANS: Client error displayed specifying an invalid license image URL in the license admin panel.
 msgid "Invalid license image URL."
 msgstr "Nieprawidłowy adres URL obrazu licencji."
 
-#: actions/licenseadminpanel.php:174
+#. TRANS: Client error displayed specifying an invalid license URL in the license admin panel.
 msgid "License URL must be blank or a valid URL."
 msgstr "Adres URL licencji musi być pusty lub być prawidłowym adresem URL."
 
-#: actions/licenseadminpanel.php:182
+#. TRANS: Client error displayed specifying an invalid license image URL in the license admin panel.
 msgid "License image must be blank or valid URL."
 msgstr "Obraz licencji musi być pusty lub być prawidłowym adresem URL."
 
-#: actions/licenseadminpanel.php:232
+#. TRANS: Form legend in the license admin panel.
 msgid "License selection"
 msgstr "Wybór licencji"
 
-#: actions/licenseadminpanel.php:238
+#. TRANS: License option in the license admin panel.
 msgid "Private"
 msgstr "Prywatna"
 
-#: actions/licenseadminpanel.php:239
+#. TRANS: License option in the license admin panel.
 msgid "All Rights Reserved"
 msgstr "Wszystkie prawa zastrzeżone"
 
-#: actions/licenseadminpanel.php:240
+#. TRANS: License option in the license admin panel.
 msgid "Creative Commons"
 msgstr "Creative Commons"
 
-#: actions/licenseadminpanel.php:245
+#. TRANS: Dropdown field label in the license admin panel.
 msgid "Type"
 msgstr "Typ"
 
-#: actions/licenseadminpanel.php:247
-msgid "Select license"
+#. TRANS: Dropdown field instructions in the license admin panel.
+#, fuzzy
+msgid "Select a license."
 msgstr "Wybierz licencję"
 
-#: actions/licenseadminpanel.php:261
+#. TRANS: Form legend in the license admin panel.
 msgid "License details"
 msgstr "Szczegóły licencji"
 
-#: actions/licenseadminpanel.php:267
+#. TRANS: Field label in the license admin panel.
 msgid "Owner"
 msgstr "Właściciel"
 
-#: actions/licenseadminpanel.php:268
+#. TRANS: Field title in the license admin panel.
 msgid "Name of the owner of the site's content (if applicable)."
 msgstr "Nazwa właściciela treści witryny (jeśli dotyczy)."
 
-#: actions/licenseadminpanel.php:276
+#. TRANS: Field label in the license admin panel.
 msgid "License Title"
 msgstr "Tytuł licencji"
 
-#: actions/licenseadminpanel.php:277
+#. TRANS: Field title in the license admin panel.
 msgid "The title of the license."
 msgstr "Tytuł licencji."
 
-#: actions/licenseadminpanel.php:285
+#. TRANS: Field label in the license admin panel.
 msgid "License URL"
 msgstr "Adres URL licencji"
 
-#: actions/licenseadminpanel.php:286
+#. TRANS: Field title in the license admin panel.
 msgid "URL for more information about the license."
 msgstr "Adres URL dodatkowych informacji o licencji."
 
-#: actions/licenseadminpanel.php:293
+#. TRANS: Field label in the license admin panel.
 msgid "License Image URL"
 msgstr "Adres URL obrazu licencji"
 
-#: actions/licenseadminpanel.php:294
+#. TRANS: Field title in the license admin panel.
 msgid "URL for an image to display with the license."
 msgstr "Adres URL obrazu do wyświetlenia z licencją."
 
-#. TRANS: Submit button title.
-#: actions/licenseadminpanel.php:311 actions/sessionsadminpanel.php:199
-#: actions/siteadminpanel.php:292 actions/snapshotadminpanel.php:245
-#: actions/tagother.php:133 lib/applicationeditform.php:357
-msgid "Save"
-msgstr "Zapisz"
-
-#: actions/licenseadminpanel.php:311
-msgid "Save license settings"
+#. TRANS: Button title in the license admin panel.
+#, fuzzy
+msgid "Save license settings."
 msgstr "Zapisz ustawienia licencji"
 
+#. TRANS: Client error displayed when trying to log in while already logged in.
 #. TRANS: Client error displayed trying to use "one time password login" when already logged in.
-#: actions/login.php:97 actions/otp.php:62 actions/register.php:130
 msgid "Already logged in."
 msgstr "Jesteś już zalogowany."
 
-#: actions/login.php:125
+#. TRANS: Form validation error displayed when trying to log in with incorrect credentials.
 msgid "Incorrect username or password."
 msgstr "Niepoprawna nazwa użytkownika lub hasło."
 
+#. TRANS: Server error displayed when during login a server error occurs.
 #. TRANS: Server error displayed when a user object could not be created trying to login using "one time password login".
-#: actions/login.php:131 actions/otp.php:127
 msgid "Error setting user. You are probably not authorized."
 msgstr "Błąd podczas ustawiania użytkownika. Prawdopodobnie brak upoważnienia."
 
-#: actions/login.php:185 actions/login.php:236 lib/action.php:598
+#. TRANS: Page title for login page.
 msgid "Login"
 msgstr "Zaloguj się"
 
-#: actions/login.php:222
+#. TRANS: Form legend on login page.
 msgid "Login to site"
 msgstr "Zaloguj się na witrynie"
 
-#: actions/login.php:231 actions/register.php:469
+#. TRANS: Checkbox label label on login page.
 msgid "Remember me"
 msgstr "Zapamiętaj mnie"
 
-#: actions/login.php:232 actions/register.php:471
+#. TRANS: Checkbox title on login page.
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 "Automatyczne logowanie. Nie należy używać na komputerach używanych przez "
 "wiele osób."
 
-#: actions/login.php:241
+#. TRANS: Button text for log in on login page.
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Login"
+msgstr "Zaloguj się"
+
+#. TRANS: Link text for link to "reset password" on login page.
 msgid "Lost or forgotten password?"
 msgstr "Zgubione lub zapomniane hasło?"
 
-#: actions/login.php:259
+#. TRANS: Form instructions on login page before being able to change user settings.
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -3756,11 +3071,12 @@ msgstr ""
 "Z powodów bezpieczeństwa ponownie podaj nazwę użytkownika i hasło przed "
 "zmienianiem ustawień."
 
-#: actions/login.php:263
+#. TRANS: Form instructions on login page.
 msgid "Login with your username and password."
 msgstr "Logowanie za pomocą nazwy użytkownika i hasła."
 
-#: actions/login.php:266
+#. TRANS: Form instructions on login page. This message contains Markdown links in the form [Link text](Link).
+#. TRANS: %%action.register%% is a link to the registration page.
 #, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -3768,126 +3084,121 @@ msgstr ""
 "Nie masz jeszcze nazwy użytkownika? [Zarejestruj](%%action.register%%) nowe "
 "konto."
 
-#: actions/makeadmin.php:92
+#. TRANS: Client error displayed when trying to make another user admin on the Make Admin page while not an admin.
 msgid "Only an admin can make another user an admin."
 msgstr "Tylko administrator może uczynić innego użytkownika administratorem."
 
-#: actions/makeadmin.php:96
+#. TRANS: Client error displayed when trying to make another user admin on the Make Admin page who already is admin.
+#. TRANS: %1$s is the user that is already admin, %2$s is the group user is already admin for.
 #, php-format
 msgid "%1$s is already an admin for group \"%2$s\"."
 msgstr "Użytkownika %1$s jest już administratorem grupy \"%2$s\"."
 
-#: actions/makeadmin.php:133
+#. TRANS: Server error displayed when trying to make another user admin on the Make Admin page fails
+#. TRANS: because the group membership record could not be gotten.
+#. TRANS: %1$s is the to be admin user, %2$s is the group user should be admin for.
 #, php-format
 msgid "Can't get membership record for %1$s in group %2$s."
 msgstr "Nie można uzyskać wpisu członkostwa użytkownika %1$s w grupie %2$s."
 
-#: actions/makeadmin.php:146
+#. TRANS: Server error displayed when trying to make another user admin on the Make Admin page fails
+#. TRANS: because the group adminship record coud not be saved properly.
+#. TRANS: %1$s is the to be admin user, %2$s is the group user is already admin for.
 #, php-format
 msgid "Can't make %1$s an admin for group %2$s."
 msgstr "Nie można uczynić %1$s administratorem grupy %2$s."
 
-#: actions/microsummary.php:69
+#. TRANS: Client error displayed trying to make a micro summary without providing a status.
 msgid "No current status."
 msgstr "Brak obecnego stanu."
 
 #. TRANS: This is the title of the form for adding a new application.
-#: actions/newapplication.php:52
 msgid "New application"
 msgstr "Nowa aplikacja"
 
 #. TRANS: Client error displayed trying to add a new application while not logged in.
-#: actions/newapplication.php:64
 msgid "You must be logged in to register an application."
 msgstr "Musisz być zalogowany, aby zarejestrować aplikację."
 
 #. TRANS: Form instructions for registering a new application.
-#: actions/newapplication.php:147
 msgid "Use this form to register a new application."
 msgstr "Użyj tego formularza, aby zarejestrować aplikację."
 
 #. TRANS: Validation error shown when not providing a source URL in the "New application" form.
-#: actions/newapplication.php:189
 msgid "Source URL is required."
 msgstr "Źródłowy adres URL jest wymagany."
 
 #. TRANS: Server error displayed when an application could not be registered in the database through the "New application" form.
-#: actions/newapplication.php:279 actions/newapplication.php:289
 msgid "Could not create application."
 msgstr "Nie można utworzyć aplikacji."
 
 #. TRANS: Title for form to create a group.
-#: actions/newgroup.php:53
 msgid "New group"
 msgstr "Nowa grupa"
 
 #. TRANS: Client exception thrown when a user tries to create a group while banned.
-#: actions/newgroup.php:73 classes/User_group.php:485
 msgid "You are not allowed to create groups on this site."
 msgstr "Brak uprawnienia do tworzenia grup w tej witrynie."
 
 #. TRANS: Form instructions for group create form.
-#: actions/newgroup.php:117
 msgid "Use this form to create a new group."
 msgstr "Użyj tego formularza, aby utworzyć nową grupę."
 
-#. TRANS: Group create form validation error.
-#: actions/newgroup.php:200
-msgid "Alias cannot be the same as nickname."
-msgstr "Alias nie może być taki sam jak pseudonim."
-
-#: actions/newmessage.php:71 actions/newmessage.php:234
+#. TRANS: Page title for new direct message page.
+#. TRANS: Page title on page for sending a direct message.
 msgid "New message"
 msgstr "Nowa wiadomość"
 
-#. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
-#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:513
-msgid "You can't send a message to this user."
+#. TRANS: Client error displayed trying to send a direct message to a user while sender and
+#. TRANS: receiver are not subscribed to each other.
+#, fuzzy
+msgid "You cannot send a message to this user."
 msgstr "Nie można wysłać wiadomości do tego użytkownika."
 
+#. TRANS: Form validator error displayed trying to send a direct message without content.
+#. TRANS: Client error displayed trying to send a notice without content.
 #. TRANS: Command exception text shown when trying to send a direct message to another user without content.
 #. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
-#: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:490
-#: lib/command.php:593
 msgid "No content!"
 msgstr "Brak treści."
 
-#: actions/newmessage.php:161
+#. TRANS: Form validation error displayed trying to send a direct message without specifying a recipient.
 msgid "No recipient specified."
 msgstr "Nie podano odbiorcy."
 
+#. TRANS: Client error displayed trying to send a direct message to self.
 #. TRANS: Error text shown when trying to send a direct message to self.
-#: actions/newmessage.php:167 lib/command.php:517
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr "Nie wysyłaj wiadomości do siebie, po prostu powiedz to sobie po cichu."
 
-#: actions/newmessage.php:184
+#. TRANS: Page title after sending a direct message.
 msgid "Message sent"
 msgstr "Wysłano wiadomość"
 
+#. TRANS: Confirmation text after sending a direct message.
+#. TRANS: %s is the direct message recipient.
 #. TRANS: Message given have sent a direct message to another user.
 #. TRANS: %s is the name of the other user.
-#: actions/newmessage.php:188 lib/command.php:525
 #, php-format
 msgid "Direct message to %s sent."
 msgstr "Wysłano bezpośrednią wiadomość do użytkownika %s."
 
-#: actions/newmessage.php:213 actions/newnotice.php:264
+#. TRANS: Page title after an AJAX error occurred on the "send direct message" page.
+#. TRANS: Page title after an AJAX error occurs on the send notice page.
 msgid "Ajax Error"
 msgstr "Błąd AJAX"
 
-#: actions/newnotice.php:69
+#. TRANS: Page title for sending a new notice.
 msgid "New notice"
 msgstr "Nowy wpis"
 
-#: actions/newnotice.php:230
+#. TRANS: Page title after sending a notice.
 msgid "Notice posted"
 msgstr "Wysłano wpis"
 
 #. TRANS: Instructions for Notice search page.
 #. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/noticesearch.php:69
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -3897,20 +3208,17 @@ msgstr ""
 "terminy spacjami. Terminy muszą mieć trzy znaki lub więcej."
 
 #. TRANS: Title of the page where users can search for notices.
-#: actions/noticesearch.php:80
 msgid "Text search"
 msgstr "Wyszukiwanie tekstu"
 
 #. TRANS: Test in RSS notice search.
 #. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearch.php:95
 #, php-format
 msgid "Search results for \"%1$s\" on %2$s"
 msgstr "Wyniki wyszukiwania dla \"%1$s\" na %2$s"
 
 #. TRANS: Text for logged in users making a query for notices without results.
 #. TRANS: This message contains a Markdown link.
-#: actions/noticesearch.php:128
 #, php-format
 msgid ""
 "Be the first to [post on this topic](%%%%action.newnotice%%%%?"
@@ -3921,7 +3229,6 @@ msgstr ""
 
 #. TRANS: Text for not logged in users making a query for notices without results.
 #. TRANS: This message contains Markdown links.
-#: actions/noticesearch.php:133
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and be the first to "
@@ -3932,19 +3239,17 @@ msgstr ""
 "status_textarea=%s)."
 
 #. TRANS: RSS notice search feed title. %s is the query.
-#: actions/noticesearchrss.php:95
 #, php-format
 msgid "Updates with \"%s\""
 msgstr "Aktualizacje z \"%s\""
 
 #. TRANS: RSS notice search feed description.
 #. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearchrss.php:99
 #, fuzzy, php-format
 msgid "Updates matching search term \"%1$s\" on %2$s."
 msgstr "Aktualizacje pasujące do wyszukiwanego terminu \"%1$s\" na %2$s."
 
-#: actions/nudge.php:85
+#. TRANS: Client error displayed trying to nudge a user that cannot be nudged.
 msgid ""
 "This user doesn't allow nudges or hasn't confirmed or set their email "
 "address yet."
@@ -3952,60 +3257,51 @@ msgstr ""
 "Ten użytkownik nie pozwala na szturchnięcia albo nie potwierdził lub nie "
 "ustawił jeszcze swojego adresu e-mail."
 
-#: actions/nudge.php:94
+#. TRANS: Page title after sending a nudge.
 msgid "Nudge sent"
 msgstr "Wysłano szturchnięcie"
 
-#: actions/nudge.php:97
+#. TRANS: Confirmation text after sending a nudge.
 msgid "Nudge sent!"
 msgstr "Wysłano szturchnięcie."
 
 #. TRANS: Message displayed to an anonymous user trying to view OAuth application list.
-#: actions/oauthappssettings.php:57
 msgid "You must be logged in to list your applications."
 msgstr "Musisz być zalogowany, aby wyświetlić listę aplikacji."
 
 #. TRANS: Page title for OAuth applications
-#: actions/oauthappssettings.php:73
 msgid "OAuth applications"
 msgstr "Aplikacje OAuth"
 
 #. TRANS: Page instructions for OAuth applications
-#: actions/oauthappssettings.php:85
 msgid "Applications you have registered"
 msgstr "Zarejestrowane aplikacje"
 
 #. TRANS: Empty list message on page with OAuth applications.
-#: actions/oauthappssettings.php:138
 #, php-format
 msgid "You have not registered any applications yet."
 msgstr "Nie zarejestrowano jeszcze żadnych aplikacji."
 
 #. TRANS: Title for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:69
 msgid "Connected applications"
 msgstr "Połączone aplikacje"
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:80
 msgid "The following connections exist for your account."
 msgstr "Istnieją następujące połączenia dla konta."
 
 #. TRANS: Client error when trying to revoke access for an application while not being a user of it.
-#: actions/oauthconnectionssettings.php:165
 msgid "You are not a user of that application."
 msgstr "Nie jesteś użytkownikiem tej aplikacji."
 
 #. TRANS: Client error when revoking access has failed for some reason.
 #. TRANS: %s is the application ID revoking access failed for.
-#: actions/oauthconnectionssettings.php:180
 #, php-format
 msgid "Unable to revoke access for application: %s."
 msgstr "Nie można unieważnić dostępu dla aplikacji: %s."
 
 #. TRANS: Success message after revoking access for an application.
 #. TRANS: %1$s is the application name, %2$s is the first part of the user token.
-#: actions/oauthconnectionssettings.php:199
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -4015,14 +3311,12 @@ msgstr ""
 "$s."
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:210
 msgid "You have not authorized any applications to use your account."
 msgstr "Nie upoważniono żadnych aplikacji do używania konta."
 
 #. TRANS: Note for developers in the OAuth connection settings form.
 #. TRANS: This message contains a Markdown link. Do not separate "](".
 #. TRANS: %s is the URL to the OAuth settings.
-#: actions/oauthconnectionssettings.php:230
 #, php-format
 msgid ""
 "Are you a developer? [Register an OAuth client application](%s) to use with "
@@ -4031,440 +3325,359 @@ msgstr ""
 "Jesteś programistą? [Zarejestruj aplikację kliencką OAuth](%s) do użycia z "
 "tą witryną StatusNet."
 
-#: actions/oembed.php:64
+#. TRANS: Server error displayed in oEmbed action when path not found.
+#. TRANS: %s is a path.
 #, fuzzy, php-format
 msgid "\"%s\" not found."
 msgstr "Nie odnaleziono strony."
 
-#: actions/oembed.php:76
+#. TRANS: Server error displayed in oEmbed action when notice not found.
+#. TRANS: %s is a notice.
 #, fuzzy, php-format
 msgid "Notice %s not found."
 msgstr "Nie odnaleziono wpisu nadrzędnego."
 
-#: actions/oembed.php:80 actions/shownotice.php:100
+#. TRANS: Server error displayed in oEmbed action when notice has not profile.
 msgid "Notice has no profile."
 msgstr "Wpis nie posiada profilu."
 
-#: actions/oembed.php:83 actions/shownotice.php:172
+#. TRANS: oEmbed title. %1$s is the author name, %2$s is the creation date.
 #, php-format
 msgid "%1$s's status on %2$s"
 msgstr "Stan użytkownika %1$s na %2$s"
 
-#: actions/oembed.php:95
+#. TRANS: Server error displayed in oEmbed action when attachment not found.
+#. TRANS: %d is an attachment ID.
 #, fuzzy, php-format
 msgid "Attachment %s not found."
 msgstr "Nie odnaleziono odbiorcy."
 
-#: actions/oembed.php:136
+#. TRANS: Server error displayed in oEmbed request when a path is not supported.
+#. TRANS: %s is a path.
 #, php-format
 msgid "\"%s\" not supported for oembed requests."
 msgstr ""
 
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
-#: actions/oembed.php:168
 #, php-format
 msgid "Content type %s not supported."
 msgstr "Typ zawartości %s jest nieobsługiwany."
 
 #. TRANS: Error message displaying attachments. %s is the site's base URL.
-#: actions/oembed.php:172
 #, php-format
 msgid "Only %s URLs over plain HTTP please."
 msgstr "Dozwolone są tylko adresy URL %s przez zwykły protokół HTTP."
 
+#. TRANS: Server error displayed in oEmbed action when request specifies an unsupported data format.
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1207
-#: lib/apiaction.php:1234 lib/apiaction.php:1369
 msgid "Not a supported data format."
 msgstr "To nie jest obsługiwany format danych."
 
 #. TRANS: ShortName in the OpenSearch interface when trying to find users.
-#: actions/opensearch.php:64
 msgid "People Search"
 msgstr "Wyszukiwanie osób"
 
-#: actions/opensearch.php:68
+#. TRANS: ShortName in the OpenSearch interface when trying to find notices.
 msgid "Notice Search"
 msgstr "Wyszukiwanie wpisów"
 
 #. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
-#: actions/otp.php:70
 msgid "No user ID specified."
 msgstr "Nie podano identyfikatora użytkownika."
 
 #. TRANS: Client error displayed trying to use "one time password login" without specifying a login token.
-#: actions/otp.php:86
 msgid "No login token specified."
 msgstr "Nie podano tokenu logowania."
 
 #. TRANS: Client error displayed trying to use "one time password login" without requesting a login token.
-#: actions/otp.php:94
 msgid "No login token requested."
 msgstr "Nie zażądano tokenu logowania."
 
 #. TRANS: Client error displayed trying to use "one time password login" while specifying an invalid login token.
-#: actions/otp.php:100
 msgid "Invalid login token specified."
 msgstr "Podano nieprawidłowy token logowania."
 
 #. TRANS: Client error displayed trying to use "one time password login" while specifying an expired login token.
-#: actions/otp.php:110
 msgid "Login token expired."
 msgstr "Token logowania wygasł."
 
 #. TRANS: Title for outbox for any but the fist page.
 #. TRANS: %1$s is the user nickname, %2$d is the page number.
-#: actions/outbox.php:57
 #, php-format
 msgid "Outbox for %1$s - page %2$d"
 msgstr "Wysłane wiadomości użytkownika %1$s - strona %2$d"
 
 #. TRANS: Title for first page of outbox.
-#: actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
 msgstr "Wysłane wiadomości użytkownika %s"
 
 #. TRANS: Instructions for outbox.
-#: actions/outbox.php:103
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr "To są wiadomości wysłane, czyli prywatne wiadomości, które wysłałeś."
 
-#: actions/passwordsettings.php:58
 msgid "Change password"
 msgstr "Zmień hasło"
 
-#: actions/passwordsettings.php:69
 msgid "Change your password."
 msgstr "Zmień hasło."
 
 #. TRANS: Fieldset legend for password reset form.
-#: actions/passwordsettings.php:96 actions/recoverpassword.php:251
 msgid "Password change"
 msgstr "Zmiana hasła"
 
-#: actions/passwordsettings.php:104
 msgid "Old password"
 msgstr "Poprzednie hasło"
 
 #. TRANS: Field label for password reset form.
-#: actions/passwordsettings.php:108 actions/recoverpassword.php:256
 msgid "New password"
 msgstr "Nowe hasło"
 
-#: actions/passwordsettings.php:109 actions/register.php:416
 msgid "6 or more characters."
 msgstr "6 lub więcej znaków."
 
 #. TRANS: Ttile for field label for password reset form where the password has to be typed again.
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:264
-#: actions/register.php:420
 msgid "Same as password above."
 msgstr "Takie samo jak powyższe hasło."
 
-#: actions/passwordsettings.php:117
 msgid "Change"
 msgstr "Zmień"
 
-#: actions/passwordsettings.php:153 actions/register.php:223
 msgid "Password must be 6 or more characters."
 msgstr "Hasło musi mieć sześć lub więcej znaków."
 
-#: actions/passwordsettings.php:156 actions/register.php:226
 msgid "Passwords don't match."
 msgstr "Hasła nie pasują do siebie."
 
-#: actions/passwordsettings.php:164
 msgid "Incorrect old password"
 msgstr "Niepoprawne poprzednie hasło"
 
-#: actions/passwordsettings.php:180
 msgid "Error saving user; invalid."
 msgstr "Błąd podczas zapisywania użytkownika; nieprawidłowy."
 
 #. TRANS: Reset password form validation error message.
-#: actions/passwordsettings.php:185 actions/recoverpassword.php:418
 msgid "Cannot save new password."
 msgstr "Nie można zapisać nowego hasła."
 
-#: actions/passwordsettings.php:191
 msgid "Password saved."
 msgstr "Zapisano hasło."
 
 #. TRANS: Title for Paths admin panel.
 #. TRANS: Menu item for site administration
-#: actions/pathsadminpanel.php:58 lib/adminpanelaction.php:371
 msgid "Paths"
 msgstr "Ścieżki"
 
 #. TRANS: Form instructions for Path admin panel.
-#: actions/pathsadminpanel.php:69
 msgid "Path and server settings for this StatusNet site"
 msgstr "Ustawienia ścieżki i serwera dla tej witryny StatusNet"
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the directory that could not be read from.
-#: actions/pathsadminpanel.php:155
 #, php-format
 msgid "Theme directory not readable: %s."
 msgstr "Nie można odczytać katalogu motywu: %s."
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the avatar directory that could not be written to.
-#: actions/pathsadminpanel.php:163
 #, php-format
 msgid "Avatar directory not writable: %s."
 msgstr "Nie można zapisywać w katalogu awatarów: %s."
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the background directory that could not be written to.
-#: actions/pathsadminpanel.php:171
 #, php-format
 msgid "Background directory not writable: %s."
 msgstr "Nie można zapisywać w katalogu teł: %s."
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the locales directory that could not be read from.
-#: actions/pathsadminpanel.php:181
 #, php-format
 msgid "Locales directory not readable: %s."
 msgstr "Nie można odczytać katalogu lokalizacji: %s."
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the SSL server URL that is too long.
-#: actions/pathsadminpanel.php:189
 msgid "Invalid SSL server. The maximum length is 255 characters."
 msgstr "Nieprawidłowy serwer SSL. Maksymalna długość to 255 znaków."
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:235 actions/siteadminpanel.php:58
 msgid "Site"
 msgstr "Witryny"
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:241 actions/pathsadminpanel.php:279
-#: actions/pathsadminpanel.php:370 actions/pathsadminpanel.php:425
 msgid "Server"
 msgstr "Serwer"
 
-#: actions/pathsadminpanel.php:242
 msgid "Site's server hostname."
 msgstr "Nazwa komputera serwera strony."
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:248 actions/pathsadminpanel.php:288
-#: actions/pathsadminpanel.php:379 actions/pathsadminpanel.php:434
 msgid "Path"
 msgstr "Ścieżka"
 
-#: actions/pathsadminpanel.php:249
 msgid "Site path."
 msgstr "Ścieżka do witryny."
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:255
 msgid "Locale directory"
 msgstr "Katalog lokalizacji"
 
-#: actions/pathsadminpanel.php:256
 msgid "Directory path to locales."
 msgstr "Ścieżka do katalogu lokalizacji."
 
 #. TRANS: Checkbox label in Paths admin panel.
-#: actions/pathsadminpanel.php:263
 msgid "Fancy URLs"
 msgstr "Eleganckie adresu URL"
 
-#: actions/pathsadminpanel.php:265
 msgid "Use fancy (more readable and memorable) URLs?"
 msgstr ""
 "Używać eleganckich (bardziej czytelnych i łatwiejszych do zapamiętania) "
 "adresów URL?"
 
-#: actions/pathsadminpanel.php:272
 msgid "Theme"
 msgstr "Motyw"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:281
 msgid "Server for themes."
 msgstr "Serwer motywów."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:290
 msgid "Web path to themes."
 msgstr "Ścieżka WWW do motywów."
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:297 actions/pathsadminpanel.php:388
-#: actions/pathsadminpanel.php:443 actions/pathsadminpanel.php:495
 msgid "SSL server"
 msgstr "Serwer SSL"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:299
 msgid "SSL server for themes (default: SSL server)."
 msgstr "Serwer SSL dla motywów (domyślnie: serwer SSL)."
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:306 actions/pathsadminpanel.php:397
-#: actions/pathsadminpanel.php:452
 msgid "SSL path"
 msgstr "Ścieżka do SSL"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:308
 msgid "SSL path to themes (default: /theme/)."
 msgstr "Ścieżka SSL do motywów (domyślnie: /theme/)."
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:315 actions/pathsadminpanel.php:406
-#: actions/pathsadminpanel.php:461
 msgid "Directory"
 msgstr "Katalog"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:317
 msgid "Directory where themes are located."
 msgstr "Katalog, w którym położone są motywy."
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:326
 msgid "Avatars"
 msgstr "Awatary"
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:333
 msgid "Avatar server"
 msgstr "Serwer awatara"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:335
 msgid "Server for avatars."
 msgstr "Serwer awatarów."
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:342
 msgid "Avatar path"
 msgstr "Ścieżka do awatara"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:344
 msgid "Web path to avatars."
 msgstr "Ścieżka WWW do awatarów."
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:351
 msgid "Avatar directory"
 msgstr "Katalog awatara"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:353
 msgid "Directory where avatars are located."
 msgstr "Katalog, w którym położone są awatary."
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:364
 msgid "Backgrounds"
 msgstr "Tła"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:372
 msgid "Server for backgrounds."
 msgstr "Serwer teł."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:381
 msgid "Web path to backgrounds."
 msgstr "Ścieżka WWW do teł."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:390
 msgid "Server for backgrounds on SSL pages."
 msgstr "Serwer teł na stronach SSL."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:399
 msgid "Web path to backgrounds on SSL pages."
 msgstr "Ścieżka WWW do teł na stronach SSL."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:408
 msgid "Directory where backgrounds are located."
 msgstr "Katalog, w którym położone są tła."
 
 #. TRANS: Fieldset legens in Paths admin panel.
-#: actions/pathsadminpanel.php:419
 msgid "Attachments"
 msgstr "Załączniki"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:427
 msgid "Server for attachments."
 msgstr "Serwer załączników."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:436
 msgid "Web path to attachments."
 msgstr "Ścieżka WWW do załączników."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:445
 msgid "Server for attachments on SSL pages."
 msgstr "Serwer załączników na stronach SSL."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:454
 msgid "Web path to attachments on SSL pages."
 msgstr "Ścieżka WWW do załączników na stronach SSL."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:463
 msgid "Directory where attachments are located."
 msgstr "Katalog, w którym położone są załączniki."
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:472
 msgid "SSL"
 msgstr "SSL"
 
 #. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
-#: actions/pathsadminpanel.php:477 actions/snapshotadminpanel.php:202
 msgid "Never"
 msgstr "Nigdy"
 
 #. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
-#: actions/pathsadminpanel.php:479
 msgid "Sometimes"
 msgstr "Czasem"
 
 #. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
-#: actions/pathsadminpanel.php:481
 msgid "Always"
 msgstr "Zawsze"
 
-#: actions/pathsadminpanel.php:485
 msgid "Use SSL"
 msgstr "Użycie SSL"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:487
 msgid "When to use SSL."
 msgstr "Kiedy używać SSL."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:497
 msgid "Server to direct SSL requests to."
 msgstr "Serwer do przekierowywania żądań SSL."
 
 #. TRANS: Button title text to store form data in the Paths admin panel.
-#: actions/pathsadminpanel.php:514
 msgid "Save paths"
 msgstr "Ścieżki zapisu"
 
 #. TRANS: Instructions for the "People search" page.
 #. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/peoplesearch.php:54
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
@@ -4475,57 +3688,46 @@ msgstr ""
 "znaki lub więcej."
 
 #. TRANS: Title of a page where users can search for other users.
-#: actions/peoplesearch.php:61
 msgid "People search"
 msgstr "Wyszukiwanie osób"
 
-#: actions/peopletag.php:68
 #, php-format
 msgid "Not a valid people tag: %s."
 msgstr "Nieprawidłowy znacznik osób: %s."
 
-#: actions/peopletag.php:142
 #, php-format
 msgid "Users self-tagged with %1$s - page %2$d"
 msgstr "Użytkownicy używający znacznika %1$s - strona %2$d"
 
 #. TRANS: Page title for AJAX form return when a disabling a plugin.
-#: actions/plugindisable.php:69
 msgctxt "plugin"
 msgid "Disabled"
 msgstr ""
 
 #. TRANS: Client error displayed trying to perform any request method other than POST.
 #. TRANS: Do not translate POST.
-#: actions/pluginenable.php:78 actions/subscribe.php:77
 msgid "This action only accepts POST requests."
 msgstr "Ta czynność przyjmuje tylko żądania POST."
 
-#: actions/pluginenable.php:102
 #, fuzzy
 msgid "You cannot administer plugins."
 msgstr "Nie można usuwać użytkowników."
 
-#: actions/pluginenable.php:109
 #, fuzzy
 msgid "No such plugin."
 msgstr "Nie ma takiej strony."
 
 #. TRANS: Page title for AJAX form return when enabling a plugin.
-#: actions/pluginenable.php:159
 msgctxt "plugin"
 msgid "Enabled"
 msgstr ""
 
 #. TRANS: Tab and title for plugins admin panel.
 #. TRANS: Menu item for site administration
-#: actions/pluginsadminpanel.php:56 actions/version.php:191
-#: lib/adminpanelaction.php:411
 msgid "Plugins"
 msgstr "Wtyczki"
 
 #. TRANS: Instructions at top of plugin admin page.
-#: actions/pluginsadminpanel.php:68
 msgid ""
 "Additional plugins can be enabled and configured manually. See the <a href="
 "\"http://status.net/wiki/Plugins\">online plugin documentation</a> for more "
@@ -4533,32 +3735,26 @@ msgid ""
 msgstr ""
 
 #. TRANS: Admin form section header
-#: actions/pluginsadminpanel.php:84
 #, fuzzy
 msgid "Default plugins"
 msgstr "Domyślny język"
 
-#: actions/pluginsadminpanel.php:106
 msgid ""
 "All default plugins have been disabled from the site's configuration file."
 msgstr ""
 
-#: actions/postnotice.php:95
 msgid "Invalid notice content."
 msgstr "Nieprawidłowa treść wpisu."
 
-#: actions/postnotice.php:101
 #, php-format
 msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’."
 msgstr "Licencja wpisu \"%1$s\" nie jest zgodna z licencją witryny \"%2$s\"."
 
 #. TRANS: Page title for profile settings.
-#: actions/profilesettings.php:60
 msgid "Profile settings"
 msgstr "Ustawienia profilu"
 
 #. TRANS: Usage instructions for profile settings.
-#: actions/profilesettings.php:71
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
@@ -4566,37 +3762,29 @@ msgstr ""
 "lepiej cię poznać."
 
 #. TRANS: Profile settings form legend.
-#: actions/profilesettings.php:99
 msgid "Profile information"
 msgstr "Informacje o profilu"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:110 actions/register.php:412
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr "1-64 małe litery lub liczby, bez spacji i znaków przestankowych."
 
 #. TRANS: Field label in form for profile settings.
-#: actions/profilesettings.php:114 actions/register.php:434
-#: lib/groupeditform.php:150
 msgid "Full name"
 msgstr "Imię i nazwisko"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:119 actions/register.php:439
-#: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "Strona domowa"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:122 actions/register.php:441
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr "Adres URL strony domowej, bloga lub profilu na innej witrynie."
 
 #. TRANS: Tooltip for field label in form for profile settings. Plural
 #. TRANS: is decided by the number of characters available for the
 #. TRANS: biography (%d).
-#: actions/profilesettings.php:130 actions/register.php:450
 #, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4605,41 +3793,31 @@ msgstr[1] "Opisz siebie i swoje zainteresowania w %d znakach"
 msgstr[2] "Opisz siebie i swoje zainteresowania w %d znakach"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:136 actions/register.php:455
 msgid "Describe yourself and your interests"
 msgstr "Opisz się i swoje zainteresowania"
 
 #. TRANS: Text area label in form for profile settings where users can provide.
 #. TRANS: their biography.
-#: actions/profilesettings.php:140 actions/register.php:457
 msgid "Bio"
 msgstr "O mnie"
 
 #. TRANS: Field label in form for profile settings.
-#: actions/profilesettings.php:146 actions/register.php:462
-#: lib/groupeditform.php:173
 msgid "Location"
 msgstr "Położenie"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:149
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Gdzie jesteś, np. \"miasto, województwo (lub region), kraj\""
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:154
 msgid "Share my current location when posting notices"
 msgstr "Podziel się swoim obecnym położeniem podczas wysyłania wpisów"
 
 #. TRANS: Field label in form for profile settings.
-#: actions/profilesettings.php:162 actions/tagother.php:128
-#: actions/tagother.php:188 lib/subscriptionlist.php:104
-#: lib/subscriptionlist.php:106
 msgid "Tags"
 msgstr "Znaczniki"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:165
 #, fuzzy
 msgid ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- "
@@ -4649,28 +3827,23 @@ msgstr ""
 "spacjami"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:170
 msgid "Language"
 msgstr "Język"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:172
 #, fuzzy
 msgid "Preferred language."
 msgstr "Preferowany język"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:182
 msgid "Timezone"
 msgstr "Strefa czasowa"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:184
 msgid "What timezone are you normally in?"
 msgstr "W jakiej strefie czasowej zwykle się znajdujesz?"
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:190
 #, fuzzy
 msgid ""
 "Automatically subscribe to whoever subscribes to me (best for non-humans)."
@@ -4680,7 +3853,6 @@ msgstr ""
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Plural form is used based on the maximum number of allowed
 #. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:259 actions/register.php:214
 #, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4689,81 +3861,65 @@ msgstr[1] "Wpis \"O mnie\" jest za długi (maksymalnie %d znaki)."
 msgstr[2] "Wpis \"O mnie\" jest za długi (maksymalnie %d znaków)."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:270 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr "Nie wybrano strefy czasowej."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:278
 msgid "Language is too long (maximum 50 characters)."
 msgstr "Język jest za długi (maksymalnie 50 znaków)."
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:292
 #, fuzzy, php-format
 msgid "Invalid tag: \"%s\"."
 msgstr "Nieprawidłowy znacznik: \"%s\""
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:348
 msgid "Could not update user for autosubscribe."
 msgstr "Nie można zaktualizować użytkownika do automatycznej subskrypcji."
 
 #. TRANS: Server error thrown when user profile location preference settings could not be updated.
-#: actions/profilesettings.php:406
 msgid "Could not save location prefs."
 msgstr "Nie można zapisać preferencji położenia."
 
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:428 actions/tagother.php:179
 msgid "Could not save tags."
 msgstr "Nie można zapisać znaczników."
 
 #. TRANS: Confirmation shown when user profile settings are saved.
 #. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:437 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "Zapisano ustawienia."
 
 #. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
 #. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:484 actions/restoreaccount.php:60
 msgid "Restore account"
 msgstr "Przywróć konto"
 
-#: actions/public.php:83
 #, php-format
 msgid "Beyond the page limit (%s)."
 msgstr "Poza ograniczeniem strony (%s)."
 
-#: actions/public.php:92
 msgid "Could not retrieve public stream."
 msgstr "Nie można pobrać publicznego strumienia."
 
-#: actions/public.php:130
 #, php-format
 msgid "Public timeline, page %d"
 msgstr "Publiczna oś czasu, strona %d"
 
-#: actions/public.php:132 lib/publicgroupnav.php:79
 msgid "Public timeline"
 msgstr "Publiczna oś czasu"
 
-#: actions/public.php:160
 msgid "Public Stream Feed (RSS 1.0)"
 msgstr "Kanał publicznego strumienia (RSS 1.0)"
 
-#: actions/public.php:164
 msgid "Public Stream Feed (RSS 2.0)"
 msgstr "Kanał publicznego strumienia (RSS 2.0)"
 
-#: actions/public.php:168
 msgid "Public Stream Feed (Atom)"
 msgstr "Kanał publicznego strumienia (Atom)"
 
-#: actions/public.php:188
 #, php-format
 msgid ""
 "This is the public timeline for %%site.name%% but no one has posted anything "
@@ -4772,11 +3928,9 @@ msgstr ""
 "To jest publiczna oś czasu dla %%site.name%%, ale nikt jeszcze nic nie "
 "wysłał."
 
-#: actions/public.php:191
 msgid "Be the first to post!"
 msgstr "Zostań pierwszym, który coś wyśle."
 
-#: actions/public.php:195
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post!"
@@ -4784,7 +3938,6 @@ msgstr ""
 "Dlaczego nie [zarejestrujesz konta](%%action.register%%) i zostaniesz "
 "pierwszym, który coś wyśle."
 
-#: actions/public.php:242
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -4797,7 +3950,6 @@ msgstr ""
 "[Dołącz teraz](%%action.register%%), aby dzielić się wpisami o sobie z "
 "przyjaciółmi, rodziną i kolegami. ([Przeczytaj więcej](%%doc.help%%))"
 
-#: actions/public.php:247
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -4808,19 +3960,16 @@ msgstr ""
 "Mikroblog) oparta na wolnym narzędziu [StatusNet](http://status.net/)."
 
 #. TRANS: Public RSS feed description. %s is the StatusNet site name.
-#: actions/publicrss.php:106
 #, fuzzy, php-format
 msgid "%s updates from everyone."
 msgstr "Użytkownik %s aktualizuje od każdego."
 
 #. TRANS: Title for public tag cloud.
-#: actions/publictagcloud.php:57
 msgid "Public tag cloud"
 msgstr "Publiczna chmura znaczników"
 
 #. TRANS: Instructions (more used like an explanation/header).
 #. TRANS: %s is the StatusNet sitename.
-#: actions/publictagcloud.php:65
 #, php-format
 msgid "These are most popular recent tags on %s"
 msgstr "To są najpopularniejsze ostatnie znaczniki w witrynie %s"
@@ -4828,7 +3977,6 @@ msgstr "To są najpopularniejsze ostatnie znaczniki w witrynie %s"
 #. TRANS: This message contains a Markdown URL. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.
-#: actions/publictagcloud.php:74
 #, php-format
 msgid "No one has posted a notice with a [hashtag](%%doc.tags%%) yet."
 msgstr ""
@@ -4836,7 +3984,6 @@ 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.
-#: actions/publictagcloud.php:79
 msgid "Be the first to post one!"
 msgstr "Zostań pierwszym, który go wyśle."
 
@@ -4845,7 +3992,6 @@ msgstr "Zostań pierwszym, który go wyśle."
 #. TRANS: This message contains a Markdown URL. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.
-#: actions/publictagcloud.php:87
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post "
@@ -4855,42 +4001,34 @@ msgstr ""
 "pierwszym, który go wyśle."
 
 #. TRANS: Client error displayed trying to recover password while already logged in.
-#: actions/recoverpassword.php:37
 msgid "You are already logged in!"
 msgstr "Jesteś już zalogowany."
 
 #. TRANS: Client error displayed when password recovery code is not correct.
-#: actions/recoverpassword.php:64
 msgid "No such recovery code."
 msgstr "Nie ma takiego kodu przywracania."
 
 #. TRANS: Client error displayed when no proper password recovery code was submitted.
-#: actions/recoverpassword.php:69
 msgid "Not a recovery code."
 msgstr "To nie jest kod przywracania."
 
 #. TRANS: Server error displayed trying to recover password without providing a user.
-#: actions/recoverpassword.php:77
 msgid "Recovery code for unknown user."
 msgstr "Kod przywracania dla nieznanego użytkownika."
 
 #. TRANS: Server error displayed removing a password recovery code from the database.
-#: actions/recoverpassword.php:91
 msgid "Error with confirmation code."
 msgstr "Błąd kodu potwierdzającego."
 
 #. TRANS: Client error displayed trying to recover password with too old a recovery code.
-#: actions/recoverpassword.php:103
 msgid "This confirmation code is too old. Please start again."
 msgstr "Kod potwierdzający jest za stary. Rozpocznij ponownie."
 
 #. TRANS: Server error displayed when updating a user's e-mail address in the database fails while recovering a password.
-#: actions/recoverpassword.php:118
 msgid "Could not update user with confirmed email address."
 msgstr "Nie można zaktualizować użytkownika z potwierdzonym adresem e-mail."
 
 #. TRANS: Page notice for password recovery page.
-#: actions/recoverpassword.php:160
 msgid ""
 "If you have forgotten or lost your password, you can get a new one sent to "
 "the email address you have stored in your account."
@@ -4898,97 +4036,79 @@ msgstr ""
 "Jeśli zapomniano lub zgubiono swoje hasło, można otrzymać nowe, wysłane na "
 "adres e-mail przechowywany w koncie."
 
-#: actions/recoverpassword.php:167
 msgid "You have been identified. Enter a new password below."
 msgstr "Zostałeś zidentyfikowany. Podaj poniżej nowe hasło."
 
 #. TRANS: Fieldset legend for password recovery page.
-#: actions/recoverpassword.php:198
 msgid "Password recovery"
 msgstr "Przywrócenie hasła"
 
 #. TRANS: Field label on password recovery page.
-#: actions/recoverpassword.php:202
 msgid "Nickname or email address"
 msgstr "Pseudonim lub adres e-mail"
 
 #. TRANS: Title for field label on password recovery page.
-#: actions/recoverpassword.php:205
 msgid "Your nickname on this server, or your registered email address."
 msgstr "Pseudonim na tym serwerze lub zarejestrowany adres e-mail."
 
 #. TRANS: Field label on password recovery page.
-#: actions/recoverpassword.php:212
 msgid "Recover"
 msgstr "Przywróć"
 
 #. TRANS: Button text on password recovery page.
-#: actions/recoverpassword.php:214
 msgctxt "BUTTON"
 msgid "Recover"
 msgstr "Przywróć"
 
 #. TRANS: Title for password recovery page in password reset mode.
-#: actions/recoverpassword.php:223
 msgid "Reset password"
 msgstr "Przywróć hasło"
 
 #. TRANS: Title for password recovery page in password recover mode.
-#: actions/recoverpassword.php:225
 msgid "Recover password"
 msgstr "Przywróć hasło"
 
 #. TRANS: Title for password recovery page in email sent mode.
 #. TRANS: Subject for password recovery e-mail.
-#: actions/recoverpassword.php:227 actions/recoverpassword.php:366
 msgid "Password recovery requested"
 msgstr "Zażądano przywracania hasła"
 
 #. TRANS: Title for password recovery page in password saved mode.
-#: actions/recoverpassword.php:229
 #, fuzzy
 msgid "Password saved"
 msgstr "Zapisano hasło."
 
 #. TRANS: Title for password recovery page when an unknown action has been specified.
-#: actions/recoverpassword.php:232
 msgid "Unknown action"
 msgstr "Nieznane działanie"
 
 #. TRANS: Title for field label for password reset form.
-#: actions/recoverpassword.php:258
 msgid "6 or more characters, and do not forget it!"
 msgstr "6 lub więcej znaków, i nie zapomnij go."
 
 #. TRANS: Button text for password reset form.
 #. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: actions/recoverpassword.php:268 lib/designform.php:145
 msgctxt "BUTTON"
 msgid "Reset"
 msgstr "Przywróć"
 
 #. TRANS: Form instructions for password recovery form.
-#: actions/recoverpassword.php:278
 msgid "Enter a nickname or email address."
 msgstr "Podaj pseudonim lub adres e-mail."
 
 #. TRANS: Information on password recovery form if no known username or e-mail address was specified.
-#: actions/recoverpassword.php:309
 msgid "No user with that email address or username."
 msgstr "Brak użytkownika z tym adresem e-mail lub nazwą użytkownika."
 
 #. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
-#: actions/recoverpassword.php:327
 msgid "No registered email address for that user."
 msgstr "Brak zarejestrowanych adresów e-mail dla tego użytkownika."
 
 #. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
-#: actions/recoverpassword.php:342
 msgid "Error saving address confirmation."
 msgstr "Błąd podczas zapisywania potwierdzenia adresu."
 
 #. TRANS: User notification after an e-mail with instructions was sent from the password recovery form.
-#: actions/recoverpassword.php:370
 msgid ""
 "Instructions for recovering your password have been sent to the email "
 "address registered to your account."
@@ -4997,75 +4117,59 @@ msgstr ""
 "z twoim kontem."
 
 #. TRANS: Client error displayed when trying to reset as password without providing a user.
-#: actions/recoverpassword.php:391
 msgid "Unexpected password reset."
 msgstr "Nieoczekiwane przywrócenie hasła."
 
 #. TRANS: Reset password form validation error message.
-#: actions/recoverpassword.php:400
 msgid "Password must be 6 characters or more."
 msgstr "Hasło musi mieć sześć lub więcej znaków."
 
 #. TRANS: Reset password form validation error message.
-#: actions/recoverpassword.php:405
 msgid "Password and confirmation do not match."
 msgstr "Hasło i potwierdzenie nie pasują do siebie."
 
 #. TRANS: Server error displayed when something does wrong with the user object during password reset.
-#: actions/recoverpassword.php:426 actions/register.php:241
 msgid "Error setting user."
 msgstr "Błąd podczas ustawiania użytkownika."
 
 #. TRANS: Success message for user after password reset.
-#: actions/recoverpassword.php:434
 msgid "New password successfully saved. You are now logged in."
 msgstr "Pomyślnie zapisano nowe hasło. Jesteś teraz zalogowany."
 
-#: actions/redirecturl.php:70
 #, fuzzy
 msgid "No id parameter"
 msgstr "Brak parametru identyfikatora."
 
-#: actions/redirecturl.php:76
 #, fuzzy, php-format
 msgid "No such file \"%d\""
 msgstr "Nie ma takiego pliku."
 
-#: actions/register.php:80 actions/register.php:181 actions/register.php:392
 msgid "Sorry, only invited people can register."
 msgstr "Tylko zaproszone osoby mogą się rejestrować."
 
-#: actions/register.php:87
 msgid "Sorry, invalid invitation code."
 msgstr "Nieprawidłowy kod zaproszenia."
 
-#: actions/register.php:106
 msgid "Registration successful"
 msgstr "Rejestracja powiodła się"
 
-#: actions/register.php:108 actions/register.php:490
 msgid "Register"
 msgstr "Zarejestruj się"
 
-#: actions/register.php:128
 msgid "Registration not allowed."
 msgstr "Rejestracja nie jest dozwolona."
 
-#: actions/register.php:194
 #, fuzzy
 msgid "You cannot register if you don't agree to the license."
 msgstr ""
 "Nie można się zarejestrować, jeśli nie zgadzasz się z warunkami licencji."
 
-#: actions/register.php:203
 msgid "Email address already exists."
 msgstr "Adres e-mail już istnieje."
 
-#: actions/register.php:236 actions/register.php:258
 msgid "Invalid username or password."
 msgstr "Nieprawidłowa nazwa użytkownika lub hasło."
 
-#: actions/register.php:333
 #, fuzzy
 msgid ""
 "With this form you can create a new account. You can then post notices and "
@@ -5074,49 +4178,39 @@ msgstr ""
 "Za pomocą tego formularza można utworzyć nowe konto. Można wtedy wysyłać "
 "wpisy i połączyć się z przyjaciółmi i kolegami. "
 
-#: actions/register.php:424 actions/register.php:428
-#: actions/siteadminpanel.php:238 lib/settingsnav.php:92
 msgid "Email"
 msgstr "E-mail"
 
-#: actions/register.php:425 actions/register.php:429
 #, fuzzy
 msgid "Used only for updates, announcements, and password recovery."
 msgstr "Używane tylko do aktualizacji, ogłoszeń i przywracania hasła"
 
-#: actions/register.php:436
 #, fuzzy
 msgid "Longer name, preferably your \"real\" name."
 msgstr "Dłuższa nazwa, najlepiej twoje \"prawdziwe\" imię i nazwisko"
 
-#: actions/register.php:464
 #, fuzzy
 msgid "Where you are, like \"City, State (or Region), Country\"."
 msgstr "Gdzie jesteś, np. \"miasto, województwo (lub region), kraj\""
 
-#: actions/register.php:503
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
 msgstr "Rozumiem, że treść i dane %1$s są prywatne i poufne."
 
-#: actions/register.php:513
 #, php-format
 msgid "My text and files are copyright by %1$s."
 msgstr "Moje teksty i pliki są objęte prawami autorskimi %1$s."
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:517
 msgid "My text and files remain under my own copyright."
 msgstr "Moje teksty i pliki pozostają pod moimi prawami autorskimi."
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:520
 msgid "All rights reserved."
 msgstr "Wszystkie prawa zastrzeżone."
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:525
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -5125,7 +4219,6 @@ msgstr ""
 "Tekst i pliki są dostępne na warunkach licencji %s, poza tymi prywatnymi "
 "danymi: hasło, adres e-mail, adres komunikatora i numer telefonu."
 
-#: actions/register.php:566
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -5158,7 +4251,6 @@ msgstr ""
 "Dziękujemy za zarejestrowanie się i mamy nadzieję, że używanie tej usługi "
 "sprawi ci przyjemność."
 
-#: actions/register.php:590
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5166,7 +4258,6 @@ msgstr ""
 "(Powinieneś właśnie otrzymać wiadomość e-mail, zawierającą instrukcje "
 "potwierdzenia adresu e-mail)"
 
-#: actions/remotesubscribe.php:97
 #, php-format
 msgid ""
 "To subscribe, you can [login](%%action.login%%), or [register](%%action."
@@ -5178,109 +4269,84 @@ msgstr ""
 "witrynie mikroblogowania](%%doc.openmublog%%), podaj poniżej adres URL "
 "profilu."
 
-#: actions/remotesubscribe.php:111
 msgid "Remote subscribe"
 msgstr "Subskrybuj zdalnie"
 
-#: actions/remotesubscribe.php:123
 msgid "Subscribe to a remote user"
 msgstr "Subskrybuj zdalnego użytkownika"
 
-#: actions/remotesubscribe.php:128
 msgid "User nickname"
 msgstr "Pseudonim użytkownika"
 
-#: actions/remotesubscribe.php:129
 #, fuzzy
 msgid "Nickname of the user you want to follow."
 msgstr "Pseudonim użytkownika którego chcesz obserwować"
 
-#: actions/remotesubscribe.php:132
 msgid "Profile URL"
 msgstr "Adres URL profilu"
 
-#: actions/remotesubscribe.php:133
 #, fuzzy
 msgid "URL of your profile on another compatible microblogging service."
 msgstr "Adres URL profilu na innej, zgodnej usłudze mikroblogowania"
 
 #. TRANS: Link text for link that will subscribe to a remote profile.
-#: actions/remotesubscribe.php:136 lib/subscribeform.php:139
-#: lib/userprofile.php:402
 msgid "Subscribe"
 msgstr "Subskrybuj"
 
-#: actions/remotesubscribe.php:158
 #, fuzzy
 msgid "Invalid profile URL (bad format)."
 msgstr "Nieprawidłowy adres URL profilu (błędny format)"
 
-#: actions/remotesubscribe.php:167
 msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
 msgstr ""
 "Nieprawidłowy adres URL profilu (brak dokumentu YADIS lub określono "
 "nieprawidłowe XRDS)."
 
-#: actions/remotesubscribe.php:175
 msgid "That is a local profile! Login to subscribe."
 msgstr "To jest profil lokalny. Zaloguj się, aby subskrybować."
 
-#: actions/remotesubscribe.php:182
 msgid "Could not get a request token."
 msgstr "Nie można uzyskać tokenu żądana."
 
-#: actions/repeat.php:56
 msgid "Only logged-in users can repeat notices."
 msgstr "Tylko zalogowani użytkownicy mogą powtarzać wpisy."
 
-#: actions/repeat.php:63 actions/repeat.php:70
 msgid "No notice specified."
 msgstr "Nie podano wpisu."
 
-#: actions/repeat.php:75
 msgid "You cannot repeat your own notice."
 msgstr "Nie można powtórzyć własnego wpisu."
 
-#: actions/repeat.php:89
 msgid "You already repeated that notice."
 msgstr "Już powtórzono ten wpis."
 
-#: actions/repeat.php:112 lib/noticelist.php:697
 msgid "Repeated"
 msgstr "Powtórzono"
 
-#: actions/repeat.php:117
 msgid "Repeated!"
 msgstr "Powtórzono."
 
 #. TRANS: RSS reply feed title. %s is a user nickname.
-#: actions/replies.php:126 actions/repliesrss.php:68
-#: lib/personalgroupnav.php:105
 #, php-format
 msgid "Replies to %s"
 msgstr "Odpowiedzi na %s"
 
-#: actions/replies.php:128
 #, php-format
 msgid "Replies to %1$s, page %2$d"
 msgstr "odpowiedzi dla użytkownika %1$s, strona %2$s"
 
-#: actions/replies.php:145
 #, php-format
 msgid "Replies feed for %s (RSS 1.0)"
 msgstr "Kanał odpowiedzi dla użytkownika %s (RSS 1.0)"
 
-#: actions/replies.php:152
 #, php-format
 msgid "Replies feed for %s (RSS 2.0)"
 msgstr "Kanał odpowiedzi dla użytkownika %s (RSS 2.0)"
 
-#: actions/replies.php:159
 #, php-format
 msgid "Replies feed for %s (Atom)"
 msgstr "Kanał odpowiedzi dla użytkownika %s (Atom)"
 
-#: actions/replies.php:199
 #, php-format
 msgid ""
 "This is the timeline showing replies to %1$s but %2$s hasn't received a "
@@ -5289,7 +4355,6 @@ msgstr ""
 "To jest oś czasu wyświetlająca odpowiedzi na wpisy użytkownika %1$s, ale %2"
 "$s nie otrzymał jeszcze wpisów."
 
-#: actions/replies.php:204
 #, php-format
 msgid ""
 "You can engage other users in a conversation, subscribe to more people or "
@@ -5298,7 +4363,6 @@ msgstr ""
 "Można nawiązać rozmowę z innymi użytkownikami, subskrybować więcej osób lub "
 "[dołączyć do grup](%%action.groups%%)."
 
-#: actions/replies.php:206
 #, php-format
 msgid ""
 "You can try to [nudge %1$s](../%2$s) or [post something to them](%%%%action."
@@ -5309,34 +4373,28 @@ msgstr ""
 
 #. TRANS: RSS reply feed description.
 #. TRANS: %1$s is a user nickname, %2$s is the StatusNet site name.
-#: actions/repliesrss.php:74
 #, fuzzy, php-format
 msgid "Replies to %1$s on %2$s."
 msgstr "odpowiedzi dla użytkownika %1$s na %2$s."
 
 #. TRANS: Client exception displayed when trying to restore an account while not logged in.
-#: actions/restoreaccount.php:78
 msgid "Only logged-in users can restore their account."
 msgstr "Tylko zalogowani użytkownicy mogą przywracać swoje konta."
 
 #. TRANS: Client exception displayed when trying to restore an account without having restore rights.
-#: actions/restoreaccount.php:83
 msgid "You may not restore your account."
 msgstr "Użytkownik nie może przywrócić konta."
 
 #. TRANS: Client exception displayed trying to restore an account while something went wrong uploading a file.
 #. TRANS: Client exception. No file; probably just a non-AJAX submission.
-#: actions/restoreaccount.php:121 actions/restoreaccount.php:146
 msgid "No uploaded file."
 msgstr "Nie wysłano pliku."
 
 #. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
-#: actions/restoreaccount.php:129 lib/mediafile.php:194
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
 msgstr "Wysłany plik przekracza dyrektywę upload_max_filesize w php.ini."
 
 #. TRANS: Client exception.
-#: actions/restoreaccount.php:135 lib/mediafile.php:200
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form."
@@ -5344,39 +4402,32 @@ msgstr ""
 "Wysłany plik przekracza dyrektywę MAX_FILE_SIZE podaną w formularzu HTML."
 
 #. TRANS: Client exception.
-#: actions/restoreaccount.php:141 lib/mediafile.php:206
 msgid "The uploaded file was only partially uploaded."
 msgstr "Plik został tylko częściowo wysłany."
 
 #. TRANS: Client exception thrown when a temporary folder is not present to store a file upload.
-#: actions/restoreaccount.php:150 lib/mediafile.php:214
 msgid "Missing a temporary folder."
 msgstr "Brak katalogu tymczasowego."
 
 #. TRANS: Client exception thrown when writing to disk is not possible during a file upload operation.
-#: actions/restoreaccount.php:154 lib/mediafile.php:218
 msgid "Failed to write file to disk."
 msgstr "Zapisanie pliku na dysku nie powiodło się."
 
 #. TRANS: Client exception thrown when a file upload operation has been stopped by an extension.
-#: actions/restoreaccount.php:158 lib/mediafile.php:222
 msgid "File upload stopped by extension."
 msgstr "Wysłanie pliku zostało zatrzymane przez rozszerzenie."
 
 #. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
 #. TRANS: Exception thrown when uploading an image fails for an unknown reason.
 #. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
-#: actions/restoreaccount.php:164 lib/imagefile.php:106 lib/mediafile.php:228
 msgid "System error uploading file."
 msgstr "Błąd systemu podczas wysyłania pliku."
 
 #. TRANS: Client exception thrown when a feed is not an Atom feed.
-#: actions/restoreaccount.php:207
 msgid "Not an Atom feed."
 msgstr "Nie jest kanałem Atom."
 
 #. TRANS: Success message when a feed has been restored.
-#: actions/restoreaccount.php:241
 msgid ""
 "Feed has been restored. Your old posts should now appear in search and your "
 "profile page."
@@ -5385,12 +4436,10 @@ msgstr ""
 "wyszukiwania i na stronie profilu."
 
 #. TRANS: Message when a feed restore is in progress.
-#: actions/restoreaccount.php:245
 msgid "Feed will be restored. Please wait a few minutes for results."
 msgstr "Kanał zostanie przywrócony. Proszę poczekać kilka minut na wyniki."
 
 #. TRANS: Form instructions for feed restore.
-#: actions/restoreaccount.php:342
 msgid ""
 "You can upload a backed-up stream in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format."
@@ -5399,92 +4448,73 @@ msgstr ""
 "activitystrea.ms/\">Strumieni działalności</a>."
 
 #. TRANS: Title for submit button to confirm upload of a user backup file for account restore.
-#: actions/restoreaccount.php:373
 msgid "Upload the file"
 msgstr "Wyślij plik"
 
-#: actions/revokerole.php:75
 msgid "You cannot revoke user roles on this site."
 msgstr "Nie można unieważnić rol użytkowników na tej witrynie."
 
-#: actions/revokerole.php:82
 msgid "User doesn't have this role."
 msgstr "Użytkownik nie ma tej roli."
 
-#: actions/rsd.php:142 actions/version.php:159
 msgid "StatusNet"
 msgstr "StatusNet"
 
-#: actions/sandbox.php:65 actions/unsandbox.php:65
 msgid "You cannot sandbox users on this site."
 msgstr "Nie można ograniczać użytkowników na tej witrynie."
 
-#: actions/sandbox.php:72
 msgid "User is already sandboxed."
 msgstr "Użytkownik jest już ograniczony."
 
 #. TRANS: Menu item for site administration
-#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
-#: lib/adminpanelaction.php:379
 msgid "Sessions"
 msgstr "Sesje"
 
-#: actions/sessionsadminpanel.php:65
 msgid "Session settings for this StatusNet site"
 msgstr "Ustawienia sesji tej witryny StatusNet"
 
-#: actions/sessionsadminpanel.php:175
 msgid "Handle sessions"
 msgstr "Obsługa sesji"
 
-#: actions/sessionsadminpanel.php:177
 msgid "Whether to handle sessions ourselves."
 msgstr "Czy samodzielnie obsługiwać sesje."
 
-#: actions/sessionsadminpanel.php:181
 msgid "Session debugging"
 msgstr "Debugowanie sesji"
 
-#: actions/sessionsadminpanel.php:183
 msgid "Turn on debugging output for sessions."
 msgstr "Włącza wyjście debugowania dla sesji."
 
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
+#. TRANS: Submit button title.
+msgid "Save"
+msgstr "Zapisz"
+
 msgid "Save site settings"
 msgstr "Zapisz ustawienia witryny"
 
-#: actions/showapplication.php:78
 msgid "You must be logged in to view an application."
 msgstr "Musisz być zalogowany, aby wyświetlić aplikację."
 
-#: actions/showapplication.php:151
 msgid "Application profile"
 msgstr "Profil aplikacji"
 
-#: actions/showapplication.php:179
 #, php-format
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr "Utworzona przez %1$s - domyślny dostęp: %2$s - %3$d użytkowników"
 
-#: actions/showapplication.php:189
 msgid "Application actions"
 msgstr "Czynności aplikacji"
 
-#: actions/showapplication.php:212
 msgid "Reset key & secret"
 msgstr "Przywrócenie klucza i sekretu"
 
 #. TRANS: Title of form for deleting a user.
-#: actions/showapplication.php:228 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:64 lib/noticelist.php:678
 msgid "Delete"
 msgstr "Usuń"
 
-#: actions/showapplication.php:237
 msgid "Application info"
 msgstr "Informacje o aplikacji"
 
-#: actions/showapplication.php:255
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
@@ -5492,42 +4522,35 @@ msgstr ""
 "Uwaga: obsługiwane są podpisy HMAC-SHA1. Metoda podpisu w zwykłym tekście "
 "nie jest obsługiwana."
 
-#: actions/showapplication.php:275
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr "Jesteś pewien, że chcesz przywrócić klucz i sekret klienta?"
 
 #. TRANS: Title for all but the first page of favourite notices of a user.
 #. TRANS: %1$s is the user for whom the favourite notices are displayed, %2$d is the page number.
-#: actions/showfavorites.php:80
 #, php-format
 msgid "%1$s's favorite notices, page %2$d"
 msgstr "Ulubione wpisy użytkownika %1$s, strona %2$d"
 
 #. TRANS: Server error displayed when favourite notices could not be retrieved from the database.
-#: actions/showfavorites.php:134
 msgid "Could not retrieve favorite notices."
 msgstr "Nie można odebrać ulubionych wpisów."
 
 #. TRANS: Feed link text. %s is a username.
-#: actions/showfavorites.php:172
 #, php-format
 msgid "Feed for favorites of %s (RSS 1.0)"
 msgstr "Kanał dla ulubionych wpisów użytkownika %s (RSS 1.0)"
 
 #. TRANS: Feed link text. %s is a username.
-#: actions/showfavorites.php:180
 #, php-format
 msgid "Feed for favorites of %s (RSS 2.0)"
 msgstr "Kanał dla ulubionych wpisów użytkownika %s (RSS 2.0)"
 
 #. TRANS: Feed link text. %s is a username.
-#: actions/showfavorites.php:188
 #, php-format
 msgid "Feed for favorites of %s (Atom)"
 msgstr "Kanał dla ulubionych wpisów użytkownika %s (Atom)"
 
 #. TRANS: Text displayed instead of favourite notices for the current logged in user that has no favourites.
-#: actions/showfavorites.php:209
 msgid ""
 "You haven't chosen any favorite notices yet. Click the fave button on "
 "notices you like to bookmark them for later or shed a spotlight on them."
@@ -5538,7 +4561,6 @@ msgstr ""
 
 #. TRANS: Text displayed instead of favourite notices for a user that has no favourites while logged in.
 #. TRANS: %s is a username.
-#: actions/showfavorites.php:213
 #, php-format
 msgid ""
 "%s hasn't added any favorite notices yet. Post something interesting they "
@@ -5550,7 +4572,6 @@ msgstr ""
 #. TRANS: Text displayed instead of favourite notices for a user that has no favourites while not logged in.
 #. TRANS: %s is a username, %%%%action.register%%%% is a link to the user registration page.
 #. TRANS: (link text)[link] is a Mark Down link.
-#: actions/showfavorites.php:220
 #, php-format
 msgid ""
 "%s hasn't added any favorite notices yet. Why not [register an account](%%%%"
@@ -5562,64 +4583,53 @@ msgstr ""
 "interesującego, aby chcieli dodać to do swoich ulubionych. :)"
 
 #. TRANS: Page notice for show favourites page.
-#: actions/showfavorites.php:251
 msgid "This is a way to share what you like."
 msgstr "To jest sposób na współdzielenie tego, co chcesz."
 
 #. TRANS: Page title for first group page. %s is a group name.
-#: actions/showgroup.php:75
 #, php-format
 msgid "%s group"
 msgstr "Grupa %s"
 
 #. TRANS: Page title for any but first group page.
 #. TRANS: %1$s is a group name, $2$s is a page number.
-#: actions/showgroup.php:79
 #, php-format
 msgid "%1$s group, page %2$d"
 msgstr "Grupa %1$s, strona %2$d"
 
 #. TRANS: Label for group description or group note (dt). Text hidden by default.
-#: actions/showgroup.php:266
 msgid "Note"
 msgstr "Wpis"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:277 lib/groupeditform.php:180
 msgid "Aliases"
 msgstr "Aliasy"
 
 #. TRANS: Group actions header (h2). Text hidden by default.
-#: actions/showgroup.php:294
 msgid "Group actions"
 msgstr "Działania grupy"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:338
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
 msgstr "Kanał wpisów dla grupy %s (RSS 1.0)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:345
 #, php-format
 msgid "Notice feed for %s group (RSS 2.0)"
 msgstr "Kanał wpisów dla grupy %s (RSS 2.0)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:352
 #, php-format
 msgid "Notice feed for %s group (Atom)"
 msgstr "Kanał wpisów dla grupy %s (Atom)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:358
 #, php-format
 msgid "FOAF for %s group"
 msgstr "FOAF dla grupy %s"
 
 #. TRANS: Header for mini list of group members on a group page (h2).
-#: actions/showgroup.php:395
 msgid "Members"
 msgstr "Członkowie"
 
@@ -5627,30 +4637,23 @@ msgstr "Członkowie"
 #. TRANS: Text for user subscription statistics if the user has no subscriptions.
 #. TRANS: Text for user subscriber statistics if user has no subscribers.
 #. TRANS: Text for user user group membership statistics if user is not a member of any group.
-#: actions/showgroup.php:401 lib/profileaction.php:137
-#: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
-#: lib/subscriptionlist.php:123 lib/tagcloudsection.php:71
 msgid "(None)"
 msgstr "(Brak)"
 
 #. TRANS: Link to all group members from mini list of group members if group has more than n members.
-#: actions/showgroup.php:410
 msgid "All members"
 msgstr "Wszyscy członkowie"
 
 #. TRANS: Header for group statistics on a group page (h2).
 #. TRANS: H2 text for user statistics.
-#: actions/showgroup.php:441 lib/profileaction.php:205
 msgid "Statistics"
 msgstr "Statystyki"
 
-#: actions/showgroup.php:444
 msgctxt "LABEL"
 msgid "Created"
 msgstr "Utworzono"
 
 #. TRANS: Label for member count in statistics on group page.
-#: actions/showgroup.php:449
 msgctxt "LABEL"
 msgid "Members"
 msgstr "Członkowie"
@@ -5659,7 +4662,6 @@ msgstr "Członkowie"
 #. TRANS: **%s** is the group alias, %%%%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).
-#: actions/showgroup.php:464
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5678,7 +4680,6 @@ 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: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
-#: actions/showgroup.php:474
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5692,100 +4693,84 @@ msgstr ""
 "krótkimi wiadomościami o swoim życiu i zainteresowaniach. "
 
 #. TRANS: Header for list of group administrators on a group page (h2).
-#: actions/showgroup.php:503
 msgid "Admins"
 msgstr "Administratorzy"
 
 #. TRANS: Client error displayed requesting a single message that does not exist.
-#: actions/showmessage.php:76
 msgid "No such message."
 msgstr "Nie ma takiej wiadomości."
 
 #. TRANS: Client error displayed requesting a single direct message the requesting user was not a party in.
-#: actions/showmessage.php:86
 msgid "Only the sender and recipient may read this message."
 msgstr "Tylko nadawca i odbiorca mogą przeczytać tę wiadomość."
 
 #. TRANS: Page title for single direct message display when viewing user is the sender.
 #. TRANS: %1$s is the addressed user's nickname, $2$s is a timestamp.
-#: actions/showmessage.php:105
 #, php-format
 msgid "Message to %1$s on %2$s"
 msgstr "Wiadomość do użytkownika %1$s na %2$s"
 
 #. TRANS: Page title for single message display.
 #. TRANS: %1$s is the sending user's nickname, $2$s is a timestamp.
-#: actions/showmessage.php:113
 #, php-format
 msgid "Message from %1$s on %2$s"
 msgstr "Wiadomość od użytkownika %1$s na %2$s"
 
-#: actions/shownotice.php:90
 msgid "Notice deleted."
 msgstr "Usunięto wpis."
 
 #. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
-#: actions/showstream.php:70
 #, php-format
 msgid "%1$s tagged %2$s"
 msgstr "%1$s nadał etykietę %2$s"
 
 #. TRANS: Page title showing tagged notices in one user's stream.
 #. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
-#: actions/showstream.php:74
 #, php-format
 msgid "%1$s tagged %2$s, page %3$d"
 msgstr "%1$s nadał etykietę %2$s, strona %3$d"
 
 #. TRANS: Extended page title showing tagged notices in one user's stream.
 #. TRANS: %1$s is the username, %2$d is the page number.
-#: actions/showstream.php:82
 #, php-format
 msgid "%1$s, page %2$d"
 msgstr "%1$s, strona %2$d"
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %1$s is a user nickname, %2$s is a hashtag.
-#: actions/showstream.php:127
 #, php-format
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
 msgstr "Kanał wpisów dla %1$s ze znacznikiem %2$s (RSS 1.0)"
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.
-#: actions/showstream.php:136
 #, php-format
 msgid "Notice feed for %s (RSS 1.0)"
 msgstr "Kanał wpisów dla %s (RSS 1.0)"
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.
-#: actions/showstream.php:145
 #, php-format
 msgid "Notice feed for %s (RSS 2.0)"
 msgstr "Kanał wpisów dla %s (RSS 2.0)"
 
-#: actions/showstream.php:152
 #, php-format
 msgid "Notice feed for %s (Atom)"
 msgstr "Kanał wpisów dla %s (Atom)"
 
 #. TRANS: Title for link to notice feed. FOAF stands for Friend of a Friend.
 #. TRANS: More information at http://www.foaf-project.org. %s is a user nickname.
-#: actions/showstream.php:159
 #, php-format
 msgid "FOAF for %s"
 msgstr "FOAF dla %s"
 
 #. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
-#: actions/showstream.php:205
 #, php-format
 msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr ""
 "To jest oś czasu dla użytkownika %1$s, ale %1$s nie nic jeszcze nie wysłał."
 
 #. TRANS: Second sentence of empty list message for a stream for the user themselves.
-#: actions/showstream.php:211
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
@@ -5795,7 +4780,6 @@ msgstr ""
 
 #. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:215
 #, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
@@ -5806,7 +4790,6 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:258
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5822,7 +4805,6 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:265
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5834,223 +4816,176 @@ msgstr ""
 "(http://status.net/). "
 
 #. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
-#: actions/showstream.php:322
 #, php-format
 msgid "Repeat of %s"
 msgstr "Powtórzenia %s"
 
-#: actions/silence.php:65 actions/unsilence.php:65
 msgid "You cannot silence users on this site."
 msgstr "Nie można wyciszać użytkowników na tej witrynie."
 
-#: actions/silence.php:72
 msgid "User is already silenced."
 msgstr "Użytkownik jest już wyciszony."
 
-#: actions/siteadminpanel.php:69
 msgid "Basic settings for this StatusNet site"
 msgstr "Podstawowe ustawienia tej witryny StatusNet"
 
-#: actions/siteadminpanel.php:133
 msgid "Site name must have non-zero length."
 msgstr "Nazwa witryny nie może mieć zerową długość."
 
-#: actions/siteadminpanel.php:141
 msgid "You must have a valid contact email address."
 msgstr "Należy posiadać prawidłowy kontaktowy adres e-mail."
 
-#: actions/siteadminpanel.php:159
 #, php-format
 msgid "Unknown language \"%s\"."
 msgstr "Nieznany język \"%s\"."
 
-#: actions/siteadminpanel.php:165
 msgid "Minimum text limit is 0 (unlimited)."
 msgstr "Minimalne ograniczenie tekstu to 0 (bez ograniczenia)."
 
-#: actions/siteadminpanel.php:171
 msgid "Dupe limit must be one or more seconds."
 msgstr "Ograniczenie duplikatów musi wynosić jedną lub więcej sekund."
 
-#: actions/siteadminpanel.php:221
 msgid "General"
 msgstr "Ogólne"
 
-#: actions/siteadminpanel.php:224
 msgid "Site name"
 msgstr "Nazwa witryny"
 
-#: actions/siteadminpanel.php:225
 msgid "The name of your site, like \"Yourcompany Microblog\""
 msgstr "Nazwa strony, taka jak \"Mikroblog firmy X\""
 
-#: actions/siteadminpanel.php:229
 msgid "Brought by"
 msgstr "Dostarczane przez"
 
-#: actions/siteadminpanel.php:230
 msgid "Text used for credits link in footer of each page"
 msgstr "Tekst używany do odnośnika do zasług w stopce każdej strony"
 
-#: actions/siteadminpanel.php:234
 msgid "Brought by URL"
 msgstr "Adres URL \"Dostarczane przez\""
 
-#: actions/siteadminpanel.php:235
 msgid "URL used for credits link in footer of each page"
 msgstr "Adres URL używany do odnośnika do zasług w stopce każdej strony"
 
-#: actions/siteadminpanel.php:239
 msgid "Contact email address for your site"
 msgstr "Kontaktowy adres e-mail witryny"
 
-#: actions/siteadminpanel.php:245
 msgid "Local"
 msgstr "Lokalne"
 
-#: actions/siteadminpanel.php:256
 msgid "Default timezone"
 msgstr "Domyślna strefa czasowa"
 
-#: actions/siteadminpanel.php:257
 msgid "Default timezone for the site; usually UTC."
 msgstr "Domyśla strefa czasowa witryny, zwykle UTC."
 
-#: actions/siteadminpanel.php:262
 msgid "Default language"
 msgstr "Domyślny język"
 
-#: actions/siteadminpanel.php:263
 msgid "Site language when autodetection from browser settings is not available"
 msgstr ""
 "Język witryny, kiedy automatyczne wykrywanie z ustawień przeglądarki nie "
 "jest dostępne"
 
-#: actions/siteadminpanel.php:271
 msgid "Limits"
 msgstr "Ograniczenia"
 
-#: actions/siteadminpanel.php:274
 msgid "Text limit"
 msgstr "Ograniczenie tekstu"
 
-#: actions/siteadminpanel.php:274
 msgid "Maximum number of characters for notices."
 msgstr "Maksymalna liczba znaków wpisów."
 
-#: actions/siteadminpanel.php:278
 msgid "Dupe limit"
 msgstr "Ograniczenie duplikatów"
 
-#: actions/siteadminpanel.php:278
 msgid "How long users must wait (in seconds) to post the same thing again."
 msgstr ""
 "Ile czasu użytkownicy muszą czekać (w sekundach), aby ponownie wysłać to "
 "samo."
 
 #. TRANS: Page title for site-wide notice tab in admin panel.
-#: actions/sitenoticeadminpanel.php:55
 msgid "Site Notice"
 msgstr "Wpis witryny"
 
 #. TRANS: Instructions for site-wide notice tab in admin panel.
-#: actions/sitenoticeadminpanel.php:66
 msgid "Edit site-wide message"
 msgstr "Zmodyfikuj wiadomość witryny"
 
 #. TRANS: Server error displayed when saving a site-wide notice was impossible.
-#: actions/sitenoticeadminpanel.php:101
 msgid "Unable to save site notice."
 msgstr "Nie można zapisać wpisu witryny."
 
 #. TRANS: Client error displayed when a site-wide notice was longer than allowed.
-#: actions/sitenoticeadminpanel.php:112
 msgid "Maximum length for the site-wide notice is 255 characters."
 msgstr "Maksymalna długość wpisu witryny to 255 znaków."
 
 #. TRANS: Label for site-wide notice text field in admin panel.
-#: actions/sitenoticeadminpanel.php:176
 msgid "Site notice text"
 msgstr "Tekst wpisu witryny"
 
 #. TRANS: Tooltip for site-wide notice text field in admin panel.
-#: actions/sitenoticeadminpanel.php:179
 msgid "Site-wide notice text (255 characters maximum; HTML allowed)"
 msgstr ""
 "Tekst wpisu witryny (maksymalnie 255 znaków, można używać znaczników HTML)"
 
 #. TRANS: Title for button to save site notice in admin panel.
-#: actions/sitenoticeadminpanel.php:201
 #, fuzzy
 msgid "Save site notice."
 msgstr "Zapisz wpis witryny"
 
 #. TRANS: Title for SMS settings.
-#: actions/smssettings.php:56
 msgid "SMS settings"
 msgstr "Ustawienia SMS"
 
 #. TRANS: SMS settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/smssettings.php:70
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr "Można otrzymywać wiadomości SMS przez e-mail od %%site.name%%."
 
 #. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
-#: actions/smssettings.php:92
 msgid "SMS is not available."
 msgstr "Wiadomości SMS nie są dostępne."
 
 #. TRANS: Form legend for SMS settings form.
-#: actions/smssettings.php:106
 msgid "SMS address"
 msgstr "Adres SMS"
 
 #. TRANS: Form guide in SMS settings form.
-#: actions/smssettings.php:115
 msgid "Current confirmed SMS-enabled phone number."
 msgstr "Obecnie potwierdzone numery telefonów z włączoną usługą SMS."
 
 #. TRANS: Form guide in IM settings form.
-#: actions/smssettings.php:128
 msgid "Awaiting confirmation on this phone number."
 msgstr "Oczekiwanie na potwierdzenie tego numeru telefonu."
 
 #. TRANS: Field label for SMS address input in SMS settings form.
-#: actions/smssettings.php:137
 msgid "Confirmation code"
 msgstr "Kod potwierdzający"
 
 #. TRANS: Form field instructions in SMS settings form.
-#: actions/smssettings.php:139
 msgid "Enter the code you received on your phone."
 msgstr "Podaj kod, który otrzymałeś na telefonie."
 
 #. TRANS: Button label to confirm SMS confirmation code in SMS settings.
-#: actions/smssettings.php:143
 msgctxt "BUTTON"
 msgid "Confirm"
 msgstr "Potwierdź"
 
 #. TRANS: Field label for SMS phone number input in SMS settings form.
-#: actions/smssettings.php:148
 msgid "SMS phone number"
 msgstr "Numer telefonu SMS"
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
-#: actions/smssettings.php:151
 #, fuzzy
 msgid "Phone number, no punctuation or spaces, with area code."
 msgstr "Numer telefonu, bez znaków przestankowych i spacji, z kodem państwa"
 
 #. TRANS: Form legend for SMS preferences form.
-#: actions/smssettings.php:190
 msgid "SMS preferences"
 msgstr "Preferencje SMS"
 
 #. TRANS: Checkbox label in SMS preferences form.
-#: actions/smssettings.php:196
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
@@ -6059,32 +4994,26 @@ msgstr ""
 "swojego operatora."
 
 #. TRANS: Confirmation message for successful SMS preferences save.
-#: actions/smssettings.php:307
 msgid "SMS preferences saved."
 msgstr "Zapisano preferencje SMS."
 
 #. TRANS: Message given saving SMS phone number without having provided one.
-#: actions/smssettings.php:329
 msgid "No phone number."
 msgstr "Brak numeru telefonu."
 
 #. TRANS: Message given saving SMS phone number without having selected a carrier.
-#: actions/smssettings.php:335
 msgid "No carrier selected."
 msgstr "Nie wybrano operatora."
 
 #. TRANS: Message given saving SMS phone number that is already set.
-#: actions/smssettings.php:343
 msgid "That is already your phone number."
 msgstr "Ten numer telefonu jest już twój."
 
 #. TRANS: Message given saving SMS phone number that is already set for another user.
-#: actions/smssettings.php:347
 msgid "That phone number already belongs to another user."
 msgstr "Ten numer telefonu należy już do innego użytkownika."
 
 #. TRANS: Message given saving valid SMS phone number that is to be confirmed.
-#: actions/smssettings.php:375
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
 "for the code and instructions on how to use it."
@@ -6093,39 +5022,32 @@ msgstr ""
 "czy otrzymałeś kod i instrukcje jak go użyć."
 
 #. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
-#: actions/smssettings.php:403
 msgid "That is the wrong confirmation number."
 msgstr "To jest błędny numer potwierdzenia."
 
 #. TRANS: Message given after successfully canceling SMS phone number confirmation.
-#: actions/smssettings.php:417
 msgid "SMS confirmation cancelled."
 msgstr "Anulowano potwierdzenie SMS."
 
 #. TRANS: Message given trying to remove an SMS phone number that is not
 #. TRANS: registered for the active user.
-#: actions/smssettings.php:437
 msgid "That is not your phone number."
 msgstr "To nie jest twój numer telefonu."
 
 #. TRANS: Message given after successfully removing a registered SMS phone number.
-#: actions/smssettings.php:459
 msgid "The SMS phone number was removed."
 msgstr "Numer telefonu SMS został usunięty."
 
 #. TRANS: Label for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:498
 msgid "Mobile carrier"
 msgstr "Operator komórkowy"
 
 #. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:503
 msgid "Select a carrier"
 msgstr "Wybierz operatora"
 
 #. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
 #. TRANS: %s is an administrative contact's e-mail address.
-#: actions/smssettings.php:512
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -6136,121 +5058,96 @@ msgstr ""
 "e-mail na %s (w języku angielskim), aby nam o tym powiedzieć."
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
-#: actions/smssettings.php:534
 #, fuzzy
 msgid "No code entered."
 msgstr "Nie podano kodu"
 
 #. TRANS: Menu item for site administration
-#: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
-#: lib/adminpanelaction.php:395
 msgid "Snapshots"
 msgstr "Migawki"
 
-#: actions/snapshotadminpanel.php:65
 msgid "Manage snapshot configuration"
 msgstr "Zarządzaj konfiguracją migawki"
 
-#: actions/snapshotadminpanel.php:127
 msgid "Invalid snapshot run value."
 msgstr "Nieprawidłowa wartość wykonania migawki."
 
-#: actions/snapshotadminpanel.php:133
 msgid "Snapshot frequency must be a number."
 msgstr "Częstotliwość migawek musi być liczbą."
 
-#: actions/snapshotadminpanel.php:144
 msgid "Invalid snapshot report URL."
 msgstr "Nieprawidłowy adres URL zgłaszania migawek."
 
-#: actions/snapshotadminpanel.php:200
 msgid "Randomly during web hit"
 msgstr "Losowo podczas trafienia WWW"
 
-#: actions/snapshotadminpanel.php:201
 msgid "In a scheduled job"
 msgstr "Jako zaplanowane zadanie"
 
-#: actions/snapshotadminpanel.php:206
 msgid "Data snapshots"
 msgstr "Migawki danych"
 
-#: actions/snapshotadminpanel.php:208
 msgid "When to send statistical data to status.net servers"
 msgstr "Kiedy wysyłać dane statystyczne na serwery status.net"
 
-#: actions/snapshotadminpanel.php:217
 msgid "Frequency"
 msgstr "Częstotliwość"
 
-#: actions/snapshotadminpanel.php:218
 msgid "Snapshots will be sent once every N web hits"
 msgstr "Migawki będą wysyłane co N trafień WWW"
 
-#: actions/snapshotadminpanel.php:226
 msgid "Report URL"
 msgstr "Adres URL zgłaszania"
 
-#: actions/snapshotadminpanel.php:227
 msgid "Snapshots will be sent to this URL"
 msgstr "Migawki będą wysyłane na ten adres URL"
 
-#: actions/snapshotadminpanel.php:248
 msgid "Save snapshot settings"
 msgstr "Zapisz ustawienia migawki"
 
 #. TRANS: Client error displayed trying a change a subscription for a non-subscribed profile.
-#: actions/subedit.php:75
 msgid "You are not subscribed to that profile."
 msgstr "Nie jesteś subskrybowany do tego profilu."
 
 #. TRANS: Server error displayed when updating a subscription fails with a database error.
 #. TRANS: Exception thrown when a subscription could not be stored on the server.
-#: actions/subedit.php:89 classes/Subscription.php:141
 msgid "Could not save subscription."
 msgstr "Nie można zapisać subskrypcji."
 
 #. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
-#: actions/subscribe.php:121
 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
 msgstr ""
 "Nie można subskrybować zdalnego profilu profilu OMB 0.1 za pomocą tej "
 "czynności."
 
 #. TRANS: Page title when subscription succeeded.
-#: actions/subscribe.php:149
 msgid "Subscribed"
 msgstr "Subskrybowano"
 
 #. TRANS: Header for list of subscribers for a user (first page).
 #. TRANS: %s is the user's nickname.
-#: actions/subscribers.php:51
 #, php-format
 msgid "%s subscribers"
 msgstr "Subskrybenci użytkownika %s"
 
 #. TRANS: Header for list of subscribers for a user (not first page).
 #. TRANS: %1$s is the user's nickname, $2$d is the page number.
-#: actions/subscribers.php:55
 #, php-format
 msgid "%1$s subscribers, page %2$d"
 msgstr "Subskrybenci użytkownika %1$s, strona %2$d"
 
 #. TRANS: Page notice for page with an overview of all subscribers
 #. TRANS: of the logged in user's own profile.
-#: actions/subscribers.php:68
 msgid "These are the people who listen to your notices."
 msgstr "Osoby obserwujący twoje wpisy."
 
 #. TRANS: Page notice for page with an overview of all subscribers of a user other
 #. TRANS: than the logged in user. %s is the user nickname.
-#: actions/subscribers.php:74
 #, php-format
 msgid "These are the people who listen to %s's notices."
 msgstr "Osoby obserwujące wpisy użytkownika %s."
 
 #. TRANS: Subscriber list text when the logged in user has no subscribers.
-#: actions/subscribers.php:114
 msgid ""
 "You have no subscribers. Try subscribing to people you know and they might "
 "return the favor."
@@ -6260,7 +5157,6 @@ msgstr ""
 
 #. TRANS: Subscriber list text when looking at the subscribers for a of a user other
 #. TRANS: than the logged in user that has no subscribers. %s is the user nickname.
-#: actions/subscribers.php:118
 #, php-format
 msgid "%s has no subscribers. Want to be the first?"
 msgstr "Użytkownik %s nie posiada subskrybentów. Chcesz być pierwszym?"
@@ -6270,7 +5166,6 @@ msgstr "Użytkownik %s nie posiada subskrybentów. Chcesz być pierwszym?"
 #. TRANS: This message contains a Markdown URL. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.
-#: actions/subscribers.php:127
 #, php-format
 msgid ""
 "%s has no subscribers. Why not [register an account](%%%%action.register%%%"
@@ -6281,20 +5176,17 @@ msgstr ""
 
 #. TRANS: Header for subscriptions overview for a user (not first page).
 #. TRANS: %1$s is a user nickname, %2$d is the page number.
-#: actions/subscriptions.php:55
 #, php-format
 msgid "%1$s subscriptions, page %2$d"
 msgstr "Subskrypcje użytkownika %1$s, strona %2$d"
 
 #. TRANS: Page notice for page with an overview of all subscriptions
 #. TRANS: of the logged in user's own profile.
-#: actions/subscriptions.php:68
 msgid "These are the people whose notices you listen to."
 msgstr "Osoby, których wpisy obserwujesz."
 
 #. TRANS: Page notice for page with an overview of all subscriptions of a user other
 #. TRANS: than the logged in user. %s is the user nickname.
-#: actions/subscriptions.php:74
 #, php-format
 msgid "These are the people whose notices %s listens to."
 msgstr "Osoby, których wpisy obserwuje użytkownik %s."
@@ -6303,7 +5195,6 @@ msgstr "Osoby, których wpisy obserwuje użytkownik %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.
-#: actions/subscriptions.php:133
 #, php-format
 msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "
@@ -6323,69 +5214,55 @@ msgstr ""
 #. TRANS: than the logged in user that has no subscriptions. %s is the user nickname.
 #. TRANS: Subscription list text when looking at the subscriptions for a of a user that has none
 #. TRANS: as an anonymous user. %s is the user nickname.
-#: actions/subscriptions.php:141 actions/subscriptions.php:147
 #, php-format
 msgid "%s is not listening to anyone."
 msgstr "Użytkownik %s nie obserwuje nikogo."
 
 #. TRANS: Atom feed title. %s is a profile nickname.
-#: actions/subscriptions.php:176
 #, php-format
 msgid "Subscription feed for %s (Atom)"
 msgstr "Kanał subskrypcji dla %s (Atom)"
 
 #. TRANS: Checkbox label for enabling Jabber messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:241 lib/settingsnav.php:110
-#, fuzzy
 msgid "IM"
 msgstr "Komunikator"
 
 #. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:256 lib/settingsnav.php:117
 msgid "SMS"
 msgstr "SMS"
 
 #. TRANS: Title for all but the first page of notices with tags.
 #. TRANS: %1$s is the tag, %2$d is the page number.
-#: actions/tag.php:73
 #, php-format
 msgid "Notices tagged with %1$s, page %2$d"
 msgstr "Wpisy ze znacznikiem %1$s, strona %2$d"
 
-#: actions/tag.php:91
 #, php-format
 msgid "Notice feed for tag %s (RSS 1.0)"
 msgstr "Kanał wpisów dla znacznika %s (RSS 1.0)"
 
-#: actions/tag.php:97
 #, php-format
 msgid "Notice feed for tag %s (RSS 2.0)"
 msgstr "Kanał wpisów dla znacznika %s (RSS 2.0)"
 
-#: actions/tag.php:103
 #, php-format
 msgid "Notice feed for tag %s (Atom)"
 msgstr "Kanał wpisów dla znacznika %s (Atom)"
 
-#: actions/tagother.php:39
 msgid "No ID argument."
 msgstr "Brak parametru identyfikatora."
 
-#: actions/tagother.php:65
 #, php-format
 msgid "Tag %s"
 msgstr "Znacznik %s"
 
 #. TRANS: H2 for user profile information.
-#: actions/tagother.php:77 lib/userprofile.php:76
 msgid "User profile"
 msgstr "Profil użytkownika"
 
-#: actions/tagother.php:120
 msgid "Tag user"
 msgstr "Znacznik użytkownika"
 
-#: actions/tagother.php:130
 msgid ""
 "Tags for this user (letters, numbers, -, ., and _), comma- or space- "
 "separated"
@@ -6393,49 +5270,39 @@ msgstr ""
 "Znaczniki dla tego użytkownika (litery, liczby, -, . i _), oddzielone "
 "przecinkami lub spacjami"
 
-#: actions/tagother.php:157
 #, php-format
 msgid "Invalid tag: \"%s\""
 msgstr "Nieprawidłowy znacznik: \"%s\""
 
-#: actions/tagother.php:172
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 "Można nadawać znaczniki tylko osobom, których subskrybujesz lub którzy "
 "subskrybują ciebie."
 
-#: actions/tagother.php:215
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
 "Użyj tego formularza, aby dodać znaczniki subskrybentom lub subskrypcjom."
 
-#: actions/tagrss.php:35
 msgid "No such tag."
 msgstr "Nie ma takiego znacznika."
 
 #. TRANS: Client error displayed when trying to unblock a non-blocked user.
-#: actions/unblock.php:59
 msgid "You haven't blocked that user."
 msgstr "Ten użytkownik nie został zablokowany."
 
-#: actions/unsandbox.php:72
 msgid "User is not sandboxed."
 msgstr "Użytkownik nie jest ograniczony."
 
-#: actions/unsilence.php:72
 msgid "User is not silenced."
 msgstr "Użytkownik nie jest wyciszony."
 
-#: actions/unsubscribe.php:77
 msgid "No profile ID in request."
 msgstr "Brak identyfikatora profilu w żądaniu."
 
-#: actions/unsubscribe.php:98
 msgid "Unsubscribed"
 msgstr "Zrezygnowano z subskrypcji"
 
-#: actions/updateprofile.php:64
 #, php-format
 msgid ""
 "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
@@ -6443,173 +5310,138 @@ msgstr ""
 "Licencja nasłuchiwanego strumienia \"%1$s\" nie jest zgodna z licencją "
 "witryny \"%2$s\"."
 
-#: actions/urlsettings.php:60
 #, fuzzy
 msgid "URL settings"
 msgstr "Ustawienia komunikatora"
 
 #. TRANS: Instructions for tab "Other" in user profile settings.
-#: actions/urlsettings.php:72
 msgid "Manage various other options."
 msgstr "Zarządzaj różnymi innymi opcjami."
 
 #. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
 #. TRANS: user's profile settings. This message has one space at the beginning. Use your
 #. TRANS: language's word separator here if it has one (most likely a single space).
-#: actions/urlsettings.php:115
 msgid " (free service)"
 msgstr " (wolna usługa)"
 
-#: actions/urlsettings.php:121
 #, fuzzy
 msgid "[none]"
 msgstr "Brak"
 
-#: actions/urlsettings.php:122
 msgid "[internal]"
 msgstr ""
 
 #. TRANS: Label for dropdown with URL shortener services.
-#: actions/urlsettings.php:130
 msgid "Shorten URLs with"
 msgstr "Skracanie adresów URL za pomocą"
 
 #. TRANS: Tooltip for for dropdown with URL shortener services.
-#: actions/urlsettings.php:132
 msgid "Automatic shortening service to use."
 msgstr "Używana automatyczna usługa skracania."
 
-#: actions/urlsettings.php:138
 msgid "URL longer than"
 msgstr ""
 
-#: actions/urlsettings.php:141
 msgid "URLs longer than this will be shortened, 0 means always shorten."
 msgstr ""
 
-#: actions/urlsettings.php:145
 msgid "Text longer than"
 msgstr ""
 
-#: actions/urlsettings.php:148
 msgid ""
 "URLs in notices longer than this will be shortened, 0 means always shorten."
 msgstr ""
 
 #. TRANS: Form validation error for form "Other settings" in user profile.
-#: actions/urlsettings.php:180
 msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr "Adres URL usługi skracania jest za długi (maksymalnie 50 znaków)."
 
-#: actions/urlsettings.php:187
 msgid "Invalid number for max url length."
 msgstr ""
 
-#: actions/urlsettings.php:193
 #, fuzzy
 msgid "Invalid number for max notice length."
 msgstr "Nieprawidłowa treść wpisu."
 
-#: actions/urlsettings.php:238
 msgid "Error saving user URL shortening preferences."
 msgstr ""
 
 #. TRANS: User admin panel title
-#: actions/useradminpanel.php:58
 msgctxt "TITLE"
 msgid "User"
 msgstr "Użytkownik"
 
 #. TRANS: Instruction for user admin panel.
-#: actions/useradminpanel.php:69
 msgid "User settings for this StatusNet site"
 msgstr "Ustawienia użytkownika dla tej witryny StatusNet"
 
 #. TRANS: Form validation error in user admin panel when a non-numeric character limit was set.
-#: actions/useradminpanel.php:147
 msgid "Invalid bio limit. Must be numeric."
 msgstr "Nieprawidłowe ograniczenie informacji o sobie. Musi być liczbowa."
 
 #. TRANS: Form validation error in user admin panel when welcome text is too long.
-#: actions/useradminpanel.php:154
 msgid "Invalid welcome text. Maximum length is 255 characters."
 msgstr "Nieprawidłowy tekst powitania. Maksymalna długość to 255 znaków."
 
 #. TRANS: Client error displayed when trying to set a non-existing user as default subscription for new
 #. TRANS: users in user admin panel. %1$s is the invalid nickname.
-#: actions/useradminpanel.php:166
 #, fuzzy, php-format
 msgid "Invalid default subscripton: \"%1$s\" is not a user."
 msgstr "Nieprawidłowa domyślna subskrypcja: \"%1$s\" nie jest użytkownikiem."
 
-#: actions/useradminpanel.php:215 lib/action.php:565 lib/settingsnav.php:77
-#: lib/subgroupnav.php:81
 msgid "Profile"
 msgstr "Profil"
 
 #. TRANS: Field label in user admin panel for setting the character limit for the bio field.
-#: actions/useradminpanel.php:220
 msgid "Bio Limit"
 msgstr "Ograniczenie informacji o sobie"
 
 #. TRANS: Tooltip in user admin panel for setting the character limit for the bio field.
-#: actions/useradminpanel.php:222
 msgid "Maximum length of a profile bio in characters."
 msgstr "Maksymalna długość informacji o sobie jako liczba znaków."
 
 #. TRANS: Form legend in user admin panel.
-#: actions/useradminpanel.php:231
 msgid "New users"
 msgstr "Nowi użytkownicy"
 
 #. TRANS: Field label in user admin panel for setting new user welcome text.
-#: actions/useradminpanel.php:236
 msgid "New user welcome"
 msgstr "Powitanie nowego użytkownika"
 
 #. TRANS: Tooltip in user admin panel for setting new user welcome text.
-#: actions/useradminpanel.php:238
 msgid "Welcome text for new users (maximum 255 characters)."
 msgstr "Tekst powitania nowych użytkowników (maksymalnie 255 znaków)."
 
 #. TRANS: Field label in user admin panel for setting default subscription for new users.
-#: actions/useradminpanel.php:244
 msgid "Default subscription"
 msgstr "Domyślna subskrypcja"
 
 #. TRANS: Tooltip in user admin panel for setting default subscription for new users.
-#: actions/useradminpanel.php:246
 msgid "Automatically subscribe new users to this user."
 msgstr "Automatyczne subskrybowanie nowych użytkowników do tego użytkownika."
 
 #. TRANS: Form legend in user admin panel.
-#: actions/useradminpanel.php:256
 msgid "Invitations"
 msgstr "Zaproszenia"
 
 #. TRANS: Field label for checkbox in user admin panel for allowing users to invite friend using site e-mail.
-#: actions/useradminpanel.php:262
 msgid "Invitations enabled"
 msgstr "Zaproszenia są włączone"
 
 #. TRANS: Tooltip for checkbox in user admin panel for allowing users to invite friend using site e-mail.
-#: actions/useradminpanel.php:265
 msgid "Whether to allow users to invite new users."
 msgstr "Czy zezwolić użytkownikom zapraszanie nowych użytkowników."
 
 #. TRANS: Title for button to save user settings in user admin panel.
-#: actions/useradminpanel.php:302
 #, fuzzy
 msgid "Save user settings."
 msgstr "Zapisz ustawienia użytkownika"
 
 #. TRANS: Page title.
-#: actions/userauthorization.php:109
 msgid "Authorize subscription"
 msgstr "Upoważnij subskrypcję"
 
 #. TRANS: Page notice on "Auhtorize subscription" page.
-#: actions/userauthorization.php:115
 #, fuzzy
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
@@ -6621,42 +5453,35 @@ msgstr ""
 "naciśnij \"Odrzuć\"."
 
 #. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:200
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Accept"
 msgstr "Zaakceptuj"
 
 #. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:202
 #, fuzzy
 msgid "Subscribe to this user."
 msgstr "Subskrybuj tego użytkownika"
 
 #. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:204
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Reject"
 msgstr "Odrzuć"
 
 #. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:206
 #, fuzzy
 msgid "Reject this subscription."
 msgstr "Odrzuć tę subskrypcję"
 
 #. TRANS: Client error displayed for an empty authorisation request.
-#: actions/userauthorization.php:219
 msgid "No authorization request!"
 msgstr "Brak żądania upoważnienia."
 
 #. TRANS: Accept message header from Authorise subscription page.
-#: actions/userauthorization.php:242
 msgid "Subscription authorized"
 msgstr "Upoważniono subskrypcję"
 
-#: actions/userauthorization.php:245
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to authorize the "
@@ -6666,11 +5491,9 @@ msgstr ""
 "Sprawdź w instrukcjach witryny, jak upoważnić subskrypcję. Token subskrypcji:"
 
 #. TRANS: Reject message header from Authorise subscription page.
-#: actions/userauthorization.php:256
 msgid "Subscription rejected"
 msgstr "Odrzucono subskrypcję"
 
-#: actions/userauthorization.php:259
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to fully reject the "
@@ -6681,35 +5504,30 @@ msgstr ""
 
 #. TRANS: Exception thrown when no valid user is found for an authorisation request.
 #. TRANS: %s is a listener URI.
-#: actions/userauthorization.php:296
 #, fuzzy, php-format
 msgid "Listener URI \"%s\" not found here."
 msgstr "Adres URI nasłuchującego \"%s\" nie został tutaj odnaleziony."
 
 #. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
 #. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:303
 #, fuzzy, php-format
 msgid "Listenee URI \"%s\" is too long."
 msgstr "Adres URI nasłuchującego \"%s\" jest za długi."
 
 #. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
 #. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:311
 #, fuzzy, php-format
 msgid "Listenee URI \"%s\" is a local user."
 msgstr "Adres URI nasłuchującego \"%s\" jest lokalnym użytkownikiem."
 
 #. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
 #. TRANS: %s is a profile URL.
-#: actions/userauthorization.php:329
 #, fuzzy, php-format
 msgid "Profile URL \"%s\" is for a local user."
 msgstr "Adres URL profilu \"%s\" jest dla lokalnego użytkownika."
 
 #. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
 #. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
-#: actions/userauthorization.php:339
 #, fuzzy, php-format
 msgid ""
 "Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
@@ -6720,76 +5538,62 @@ msgstr ""
 
 #. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
 #. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:349
 #, fuzzy, php-format
 msgid "Avatar URL \"%s\" is not valid."
 msgstr "Adres URL \"%s\" jest nieprawidłowy."
 
 #. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
 #. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:356
 #, fuzzy, php-format
 msgid "Cannot read avatar URL \"%s\"."
 msgstr "Nie można odczytać adresu URL awatara \"%s\"."
 
 #. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
 #. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:363
 #, fuzzy, php-format
 msgid "Wrong image type for avatar URL \"%s\"."
 msgstr "Błędny typ obrazu dla adresu URL awatara \"%s\"."
 
 #. TRANS: Page title for profile design page.
-#: actions/userdesignsettings.php:74 lib/designsettings.php:61
 msgid "Profile design"
 msgstr "Wygląd profilu"
 
 #. TRANS: Instructions for profile design page.
-#: actions/userdesignsettings.php:84 lib/designsettings.php:72
 msgid ""
 "Customize the way your profile looks with a background image and a colour "
 "palette of your choice."
 msgstr ""
 "Dostosuj wygląd profilu za pomocą wybranego obrazu tła i palety kolorów."
 
-#: actions/userdesignsettings.php:289
 msgid "Enjoy your hotdog!"
 msgstr "Smacznego hot-doga."
 
-#: actions/userdesignsettings.php:325
 #, fuzzy
 msgid "Design settings"
 msgstr "Zapisz ustawienia witryny"
 
-#: actions/userdesignsettings.php:340
 msgid "View profile designs"
 msgstr "Wyświetl ustawienia wyglądu profilu"
 
-#: actions/userdesignsettings.php:341
 msgid "Show or hide profile designs."
 msgstr "Wyświetl lub ukryj ustawienia wyglądu profilu."
 
-#: actions/userdesignsettings.php:348
 #, fuzzy
 msgid "Background file"
 msgstr "Tło"
 
 #. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number.
-#: actions/usergroups.php:66
 #, php-format
 msgid "%1$s groups, page %2$d"
 msgstr "Grupy użytkownika %1$s, strona %2$d"
 
-#: actions/usergroups.php:132
 msgid "Search for more groups"
 msgstr "Wyszukaj więcej grup"
 
-#: actions/usergroups.php:159
 #, php-format
 msgid "%s is not a member of any group."
 msgstr "Użytkownik %s nie jest członkiem żadnej grupy."
 
-#: actions/usergroups.php:164
 #, php-format
 msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
 msgstr "Spróbuj [wyszukać grupy](%%action.groupsearch%%) i dołączyć do nich."
@@ -6799,18 +5603,14 @@ msgstr "Spróbuj [wyszukać grupy](%%action.groupsearch%%) i dołączyć do nich
 #. TRANS: %1$s is a group name, %2$s is a site name.
 #. TRANS: Message is used as a subtitle in atom user notice feed.
 #. TRANS: %1$s is a user name, %2$s is a site name.
-#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:70
-#: lib/atomusernoticefeed.php:95
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr "Aktualizacje z %1$s na %2$s."
 
-#: actions/version.php:75
 #, php-format
 msgid "StatusNet %s"
 msgstr "StatusNet %s"
 
-#: actions/version.php:155
 #, php-format
 msgid ""
 "This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
@@ -6819,16 +5619,13 @@ msgstr ""
 "Ta witryna korzysta z oprogramowania %1$s w wersji %2$s, Copyright 2008-2010 "
 "StatusNet, Inc. i współtwórcy."
 
-#: actions/version.php:163
 msgid "Contributors"
 msgstr "Współtwórcy"
 
 #. TRANS: Menu item for site administration
-#: actions/version.php:167 lib/adminpanelaction.php:403
 msgid "License"
 msgstr "Licencja"
 
-#: actions/version.php:170
 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 "
@@ -6840,7 +5637,6 @@ msgstr ""
 "wydanej przez Fundację Wolnego Oprogramowania (Free Software Foundation) - "
 "według wersji trzeciej tej Licencji lub którejś z późniejszych wersji. "
 
-#: actions/version.php:176
 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 "
@@ -6853,7 +5649,6 @@ msgstr ""
 "bliższych informacji należy zapoznać się z Powszechną Licencją Publiczną "
 "Affero GNU. "
 
-#: actions/version.php:182
 #, php-format
 msgid ""
 "You should have received a copy of the GNU Affero General Public License "
@@ -6864,52 +5659,42 @@ msgstr ""
 "License); jeśli nie - proszę odwiedzić stronę internetową %s."
 
 #. TRANS: Form input field label for application name.
-#: actions/version.php:197 lib/applicationeditform.php:190
 msgid "Name"
 msgstr "Nazwa"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:885
 msgid "Version"
 msgstr "Wersja"
 
-#: actions/version.php:199
 msgid "Author(s)"
 msgstr "Autorzy"
 
 #. TRANS: Form input field label.
-#: actions/version.php:200 lib/applicationeditform.php:208
-#: lib/groupeditform.php:168
 msgid "Description"
 msgstr "Opis"
 
 #. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:164
 msgid "Favor"
 msgstr "Dodaj do ulubionych"
 
 #. TRANS: Ntofication given when a user marks a notice as favorite.
 #. TRANS: %1$s is a user nickname or full name, %2$s is a notice URI.
-#: classes/Fave.php:167
 #, php-format
 msgid "%1$s marked notice %2$s as a favorite."
 msgstr "Użytkownik %1$s oznaczył wpis %2$s jako ulubiony."
 
 #. TRANS: Server exception thrown when a URL cannot be processed.
-#: classes/File.php:162
 #, php-format
 msgid "Cannot process URL '%s'"
 msgstr "Nie można przetworzyć adresu URL \"%s\""
 
 #. TRANS: Server exception thrown when... Robin thinks something is impossible!
-#: classes/File.php:194
 msgid "Robin thinks something is impossible."
 msgstr "Robin sądzi, że coś jest niemożliwe."
 
 #. 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$s is used for plural.
-#: classes/File.php:210
 #, php-format
 msgid ""
 "No file may be larger than %1$d byte and the file you sent was %2$d bytes. "
@@ -6929,7 +5714,6 @@ msgstr[2] ""
 
 #. TRANS: Message given if an upload would exceed user quota.
 #. TRANS: %d (number) is the user quota in bytes and is used for plural.
-#: classes/File.php:223
 #, php-format
 msgid "A file this large would exceed your user quota of %d byte."
 msgid_plural "A file this large would exceed your user quota of %d bytes."
@@ -6942,7 +5726,6 @@ msgstr[2] ""
 
 #. TRANS: Message given id an upload would exceed a user's monthly quota.
 #. TRANS: $d (number) is the monthly user quota in bytes and is used for plural.
-#: classes/File.php:235
 #, php-format
 msgid "A file this large would exceed your monthly quota of %d byte."
 msgid_plural "A file this large would exceed your monthly quota of %d bytes."
@@ -6957,108 +5740,89 @@ msgstr[2] ""
 "d bajtów."
 
 #. TRANS: Client exception thrown if a file upload does not have a valid name.
-#: classes/File.php:282 classes/File.php:297
 msgid "Invalid filename."
 msgstr "Nieprawidłowa nazwa pliku."
 
 #. TRANS: Exception thrown when joining a group fails.
-#: classes/Group_member.php:51
 msgid "Group join failed."
 msgstr "Dołączenie do grupy nie powiodło się."
 
 #. TRANS: Exception thrown when trying to leave a group the user is not a member of.
-#: classes/Group_member.php:64
 msgid "Not part of group."
 msgstr "Nie jest częścią grupy."
 
 #. TRANS: Exception thrown when trying to leave a group fails.
-#: classes/Group_member.php:72
 msgid "Group leave failed."
 msgstr "Opuszczenie grupy nie powiodło się."
 
 #. TRANS: Exception thrown providing an invalid profile ID.
 #. TRANS: %s is the invalid profile ID.
-#: classes/Group_member.php:85
 #, php-format
 msgid "Profile ID %s is invalid."
 msgstr "Identyfikator profilu %s jest nieprawidłowy."
 
 #. TRANS: Exception thrown providing an invalid group ID.
 #. TRANS: %s is the invalid group ID.
-#: classes/Group_member.php:98
 #, php-format
 msgid "Group ID %s is invalid."
 msgstr "Identyfikator grupy %s jest nieprawidłowy."
 
 #. TRANS: Activity title.
-#: classes/Group_member.php:147 lib/joinform.php:114
 msgid "Join"
 msgstr "Dołącz"
 
 #. TRANS: Success message for subscribe to group attempt through OStatus.
 #. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
-#: classes/Group_member.php:151
 #, php-format
 msgid "%1$s has joined group %2$s."
 msgstr "Użytkownik %1$s dołączył do grupy %2$s."
 
 #. TRANS: Server exception thrown when updating a local group fails.
-#: classes/Local_group.php:42
 msgid "Could not update local group."
 msgstr "Nie można zaktualizować lokalnej grupy."
 
 #. TRANS: Exception thrown when trying creating a login token failed.
 #. TRANS: %s is the user nickname for which token creation failed.
-#: classes/Login_token.php:78
 #, php-format
 msgid "Could not create login token for %s"
 msgstr "Nie można utworzyć tokenów loginów dla %s"
 
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
-#: classes/Memcached_DataObject.php:556
 msgid "No database name or DSN found anywhere."
 msgstr "Nigdzie nie odnaleziono nazwy lub DSN bazy danych."
 
 #. TRANS: Client exception thrown when a user tries to send a direct message while being banned from sending them.
-#: classes/Message.php:45
 msgid "You are banned from sending direct messages."
 msgstr "Zablokowano wysyłanie bezpośrednich wiadomości."
 
 #. TRANS: Message given when a message could not be stored on the server.
-#: classes/Message.php:69
 msgid "Could not insert message."
 msgstr "Nie można wprowadzić wiadomości."
 
 #. TRANS: Message given when a message could not be updated on the server.
-#: classes/Message.php:80
 msgid "Could not update message with new URI."
 msgstr "Nie można zaktualizować wiadomości za pomocą nowego adresu URL."
 
 #. TRANS: Server exception thrown when a user profile for a notice cannot be found.
 #. TRANS: %1$d is a profile ID (number), %2$d is a notice ID (number).
-#: classes/Notice.php:98
 #, php-format
 msgid "No such profile (%1$d) for notice (%2$d)."
 msgstr "Brak profilu (%1$d) dla wpisu (%2$d)."
 
 #. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:199
 #, php-format
 msgid "Database error inserting hashtag: %s"
 msgstr "Błąd bazy danych podczas wprowadzania znacznika mieszania: %s"
 
 #. TRANS: Client exception thrown if a notice contains too many characters.
-#: classes/Notice.php:279
 msgid "Problem saving notice. Too long."
 msgstr "Problem podczas zapisywania wpisu. Za długi."
 
 #. TRANS: Client exception thrown when trying to save a notice for an unknown user.
-#: classes/Notice.php:284
 msgid "Problem saving notice. Unknown user."
 msgstr "Problem podczas zapisywania wpisu. Nieznany użytkownik."
 
 #. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
-#: classes/Notice.php:290
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
@@ -7066,7 +5830,6 @@ msgstr ""
 "kilka minut."
 
 #. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
-#: classes/Notice.php:297
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
 "few minutes."
@@ -7075,42 +5838,35 @@ msgstr ""
 "wyślij ponownie za kilka minut."
 
 #. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:305
 msgid "You are banned from posting notices on this site."
 msgstr "Zabroniono ci wysyłania wpisów na tej witrynie."
 
 #. TRANS: Server exception thrown when a notice cannot be saved.
 #. TRANS: Server exception thrown when a notice cannot be updated.
-#: classes/Notice.php:372 classes/Notice.php:399
 msgid "Problem saving notice."
 msgstr "Problem podczas zapisywania wpisu."
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:929
 msgid "Bad type provided to saveKnownGroups."
 msgstr "Podano błędne dane do saveKnownGroups."
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:1028
 msgid "Problem saving group inbox."
 msgstr "Problem podczas zapisywania skrzynki odbiorczej grupy."
 
 #. TRANS: Server exception thrown when a reply cannot be saved.
 #. TRANS: %1$d is a notice ID, %2$d is the ID of the mentioned user.
-#: classes/Notice.php:1144
 #, php-format
 msgid "Could not save reply for %1$d, %2$d."
 msgstr "Nie można zapisać odpowiedzi na %1$d, %2$d."
 
 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1663
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
 
 #. TRANS: Full name of a profile or group followed by nickname in parens
-#: classes/Profile.php:172 classes/User_group.php:242
 #, php-format
 msgctxt "FANCYNAME"
 msgid "%1$s (%2$s)"
@@ -7118,266 +5874,210 @@ msgstr "%1$s (%2$s)"
 
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:779
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr "Nie można unieważnić roli \"\"%1$s\" użytkownika #%2$d; nie istnieje."
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:788
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
 "Nie można unieważnić roli \"%1$s\" użytkownika #%2$d; błąd bazy danych."
 
 #. TRANS: Exception thrown when a right for a non-existing user profile is checked.
-#: classes/Remote_profile.php:54
 msgid "Missing profile."
 msgstr "Brak profilu."
 
 #. TRANS: Exception thrown when a tag cannot be saved.
-#: classes/Status_network.php:338
 msgid "Unable to save tag."
 msgstr "Nie można zapisać etykiety."
 
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#: classes/Subscription.php:77 lib/oauthstore.php:482
 msgid "You have been banned from subscribing."
 msgstr "Zablokowano subskrybowanie."
 
 #. TRANS: Exception thrown when trying to subscribe while already subscribed.
-#: classes/Subscription.php:82
 msgid "Already subscribed!"
 msgstr "Już subskrybowane."
 
 #. TRANS: Exception thrown when trying to subscribe to a user who has blocked the subscribing user.
-#: classes/Subscription.php:87
 msgid "User has blocked you."
 msgstr "Użytkownik zablokował cię."
 
 #. TRANS: Exception thrown when trying to unsibscribe without a subscription.
-#: classes/Subscription.php:176
 msgid "Not subscribed!"
 msgstr "Niesubskrybowane."
 
 #. TRANS: Exception thrown when trying to unsubscribe a user from themselves.
-#: classes/Subscription.php:183
 msgid "Could not delete self-subscription."
 msgstr "Nie można usunąć autosubskrypcji."
 
 #. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
-#: classes/Subscription.php:211
 msgid "Could not delete subscription OMB token."
 msgstr "Nie można usunąć tokenu subskrypcji OMB."
 
 #. TRANS: Exception thrown when a subscription could not be deleted on the server.
-#: classes/Subscription.php:223
 msgid "Could not delete subscription."
 msgstr "Nie można usunąć subskrypcji."
 
 #. TRANS: Activity tile when subscribing to another person.
-#: classes/Subscription.php:265
 msgid "Follow"
 msgstr "Obserwuj"
 
 #. TRANS: Notification given when one person starts following another.
 #. TRANS: %1$s is the subscriber, %2$s is the subscribed.
-#: classes/Subscription.php:268
 #, php-format
 msgid "%1$s is now following %2$s."
 msgstr "Użytkownik %1$s obserwuje teraz %2$s."
 
 #. TRANS: Notice given on user registration.
 #. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:390
 #, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr "Witaj w %1$s, @%2$s."
 
 #. TRANS: Server exception.
-#: classes/User.php:923
 msgid "No single user defined for single-user mode."
 msgstr ""
 "Nie określono pojedynczego użytkownika dla trybu pojedynczego użytkownika."
 
 #. TRANS: Server exception.
-#: classes/User.php:927
 msgid "Single-user mode code called when not enabled."
 msgstr "Wywołano kod pojedynczego użytkownika, kiedy nie był włączony."
 
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:522
 msgid "Could not create group."
 msgstr "Nie można utworzyć grupy."
 
 #. TRANS: Server exception thrown when updating a group URI failed.
-#: classes/User_group.php:532
 msgid "Could not set group URI."
 msgstr "Nie można ustawić adresu URI grupy."
 
 #. TRANS: Server exception thrown when setting group membership failed.
-#: classes/User_group.php:555
 msgid "Could not set group membership."
 msgstr "Nie można ustawić członkostwa w grupie."
 
 #. TRANS: Server exception thrown when saving local group information failed.
-#: classes/User_group.php:570
 msgid "Could not save local group info."
 msgstr "Nie można zapisać informacji o lokalnej grupie."
 
 #. TRANS: Exception thrown when an account could not be located when it should be moved.
 #. TRANS: %s is the remote site.
-#: lib/accountmover.php:65
 #, php-format
 msgid "Cannot locate account %s."
 msgstr "Nie można ustalić położenia konta %s."
 
 #. TRANS: Exception thrown when a service document could not be located account move.
 #. TRANS: %s is the remote site.
-#: lib/accountmover.php:106
 #, php-format
 msgid "Cannot find XRD for %s."
 msgstr "Nie można odnaleźć XRD dla %s."
 
 #. TRANS: Exception thrown when an account could not be located when it should be moved.
 #. TRANS: %s is the remote site.
-#: lib/accountmover.php:131
 #, php-format
 msgid "No AtomPub API service for %s."
 msgstr "Brak API usługi AtomPub dla %s."
 
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: lib/action.php:161
 #, php-format
 msgid "%1$s - %2$s"
 msgstr "%1$s - %2$s"
 
 #. TRANS: Page title for a page without a title set.
-#: lib/action.php:177
 msgid "Untitled page"
 msgstr "Strona bez nazwy"
 
 #. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.
-#: lib/action.php:325
 msgctxt "TOOLTIP"
 msgid "Show more"
 msgstr "Wyświetl więcej"
 
 #. TRANS: Inline reply form submit button: submits a reply comment.
-#: lib/action.php:328
 #, fuzzy
 msgctxt "BUTTON"
-msgid "Comment"
-msgstr "Treść"
+msgid "Reply"
+msgstr "Odpowiedz"
 
 #. TRANS: Placeholder text for inline reply form. Clicking in this box will turn it into a mini notice form.
-#: lib/action.php:331
-msgid "Add a comment..."
+msgid "Write a reply..."
 msgstr ""
 
-#: lib/action.php:559 lib/personalgroupnav.php:99
-#, fuzzy
 msgid "Home"
 msgstr "Strona domowa"
 
-#: lib/action.php:560
 #, fuzzy
 msgid "Friends timeline"
 msgstr "Oś czasu użytkownika %s"
 
-#: lib/action.php:566
-#, fuzzy
 msgid "Your profile"
 msgstr "Profil grupy"
 
-#: lib/action.php:570 lib/action.php:593 lib/publicgroupnav.php:78
 msgid "Public"
 msgstr "Publiczny"
 
-#: lib/action.php:571 lib/action.php:594
 #, fuzzy
 msgid "Everyone on this site"
 msgstr "Znajdź osoby na tej witrynie"
 
-#: lib/action.php:575
-#, fuzzy
 msgid "Settings"
 msgstr "Ustawienia SMS"
 
-#: lib/action.php:576
 #, fuzzy
 msgid "Change your personal settings"
 msgstr "Zmień ustawienia profilu"
 
-#: lib/action.php:582
 #, fuzzy
 msgid "Site configuration"
 msgstr "Konfiguracja użytkownika"
 
-#: lib/action.php:587
-#, fuzzy
 msgid "Logout"
 msgstr "Wyloguj się"
 
-#: lib/action.php:588
-#, fuzzy
 msgid "Logout from the site"
 msgstr "Wyloguj się z witryny"
 
-#: lib/action.php:599
-#, fuzzy
 msgid "Login to the site"
 msgstr "Zaloguj się na witrynie"
 
-#: lib/action.php:606
-#, fuzzy
 msgid "Search"
 msgstr "Wyszukaj"
 
-#: lib/action.php:607
 #, fuzzy
 msgid "Search the site"
 msgstr "Przeszukaj witrynę"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:864
 msgid "Help"
 msgstr "Pomoc"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:867
 msgid "About"
 msgstr "O usłudze"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:870
 msgid "FAQ"
 msgstr "FAQ"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:875
 msgid "TOS"
 msgstr "TOS"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:879
 msgid "Privacy"
 msgstr "Prywatność"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:882
 msgid "Source"
 msgstr "Kod źródłowy"
 
 #. TRANS: Secondary navigation menu option leading to e-mail contact information on the
 #. TRANS: StatusNet site, where to report bugs, ...
-#: lib/action.php:889
 msgid "Contact"
 msgstr "Kontakt"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:892
 msgid "Badge"
 msgstr "Odznaka"
 
@@ -7385,7 +6085,6 @@ msgstr "Odznaka"
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:921
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7395,7 +6094,6 @@ msgstr ""
 "broughtby%%](%%site.broughtbyurl%%)."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:924
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** jest usługą mikroblogowania."
@@ -7404,7 +6102,6 @@ msgstr "**%%site.name%%** jest usługą mikroblogowania."
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:931
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7417,14 +6114,12 @@ msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:949
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr "Treść i dane %1$s są prywatne i poufne."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:956
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
@@ -7432,7 +6127,6 @@ msgstr ""
 "zastrzeżone."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:960
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 "Prawa autorskie do treści i danych są własnością współtwórców. Wszystkie "
@@ -7440,7 +6134,6 @@ msgstr ""
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:992
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
@@ -7449,78 +6142,64 @@ msgstr ""
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1335
 msgid "After"
 msgstr "Później"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1345
 msgid "Before"
 msgstr "Wcześniej"
 
 #. TRANS: Client exception thrown when a feed instance is a DOMDocument.
-#: lib/activity.php:125
 msgid "Expecting a root feed element but got a whole XML document."
 msgstr "Oczekiwano elementu kanału roota, ale otrzymano cały dokument XML."
 
 #. TRANS: Client exception thrown when using an unknown verb for the activity importer.
-#: lib/activityimporter.php:81
 #, php-format
 msgid "Unknown verb: \"%s\"."
 msgstr "Nieznany czasownik: \"%s\"."
 
 #. TRANS: Client exception thrown when trying to force a subscription for an untrusted user.
-#: lib/activityimporter.php:107
 msgid "Cannot force subscription for untrusted user."
 msgstr "Nie można wymusić subskrypcji niezaufanego użytkownika."
 
 #. TRANS: Client exception thrown when trying to for a remote user to subscribe.
-#: lib/activityimporter.php:117
 msgid "Cannot force remote user to subscribe."
 msgstr "Nie można wymusić subskrypcji na zdalnym użytkowniku."
 
 #. TRANS: Client exception thrown when trying to subscribe to an unknown profile.
-#: lib/activityimporter.php:132
 msgid "Unknown profile."
 msgstr "Nieznany profil."
 
 #. TRANS: Client exception thrown when trying to import an event not related to the importing user.
-#: lib/activityimporter.php:138
 msgid "This activity seems unrelated to our user."
 msgstr "To działanie wydaje się nie mieć związku z użytkownikiem."
 
 #. TRANS: Client exception thrown when trying to join a remote group that is not a group.
-#: lib/activityimporter.php:154
 msgid "Remote profile is not a group!"
 msgstr "Zdalny profil nie jest grupą."
 
 #. TRANS: Client exception thrown when trying to join a group the importing user is already a member of.
-#: lib/activityimporter.php:163
 msgid "User is already a member of this group."
 msgstr "Użytkownik jest już członkiem tej grupy."
 
 #. TRANS: Client exception thrown when trying to import a notice by another user.
 #. TRANS: %1$s is the source URI of the notice, %2$s is the URI of the author.
-#: lib/activityimporter.php:201
 #, php-format
 msgid "Already know about notice %1$s and  it has a different author %2$s."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to overwrite the author information for a non-trusted user during import.
-#: lib/activityimporter.php:207
 msgid "Not overwriting author info for non-trusted user."
 msgstr ""
 "Informacje o autorze dla niezaufanego użytkownika nie zostaną zastąpione."
 
 #. TRANS: Client exception thrown when trying to import a notice without content.
 #. TRANS: %s is the notice URI.
-#: lib/activityimporter.php:223
 #, php-format
 msgid "No content for notice %s."
 msgstr "Brak zawartości dla wpisu %s."
 
-#: lib/activitymover.php:84
 #, php-format
 msgid "No such user %s."
 msgstr "Brak użytkownika %s."
@@ -7531,211 +6210,171 @@ msgstr "Brak użytkownika %s."
 #. TRANS: %1$s is a URL, %2$s is the status, %s$s is the fail reason.
 #. TRANS: Exception thrown when post to collection fails with a status that is not handled.
 #. TRANS: %1$s is a URL, %2$s is the status, %s$s is the fail reason.
-#: lib/activitysink.php:163 lib/activitysink.php:167 lib/activitysink.php:172
 #, php-format
 msgctxt "URLSTATUSREASON"
 msgid "%1$s %2$s %3$s"
 msgstr "%1$s %2$s %3$s"
 
 #. TRANS: Client exception thrown when there is no source attribute.
-#: lib/activityutils.php:200
 msgid "Can't handle remote content yet."
 msgstr "Nie można jeszcze obsługiwać zdalnej treści."
 
 #. TRANS: Client exception thrown when there embedded XML content is found that cannot be processed yet.
-#: lib/activityutils.php:237
 msgid "Can't handle embedded XML content yet."
 msgstr "Nie można jeszcze obsługiwać zagnieżdżonej treści XML."
 
 #. TRANS: Client exception thrown when base64 encoded content is found that cannot be processed yet.
-#: lib/activityutils.php:242
 msgid "Can't handle embedded Base64 content yet."
 msgstr "Nie można jeszcze obsługiwać zagnieżdżonej treści Base64."
 
 #. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights.
-#: lib/adminpanelaction.php:96
 msgid "You cannot make changes to this site."
 msgstr "Nie można wprowadzić zmian witryny."
 
 #. TRANS: Client error message throw when a certain panel's settings cannot be changed.
-#: lib/adminpanelaction.php:108
 msgid "Changes to that panel are not allowed."
 msgstr "Zmiany w tym panelu nie są dozwolone."
 
 #. TRANS: Client error message.
-#: lib/adminpanelaction.php:222
 msgid "showForm() not implemented."
 msgstr "showForm() nie jest zaimplementowane."
 
 #. TRANS: Client error message
-#: lib/adminpanelaction.php:250
 msgid "saveSettings() not implemented."
 msgstr "saveSettings() nie jest zaimplementowane."
 
 #. TRANS: Client error message thrown if design settings could not be deleted in
 #. TRANS: the admin panel Design.
-#: lib/adminpanelaction.php:274
 msgid "Unable to delete design setting."
 msgstr "Nie można usunąć ustawienia wyglądu."
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:337
 msgid "Basic site configuration"
 msgstr "Podstawowa konfiguracja witryny"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:339
 msgctxt "MENU"
 msgid "Site"
 msgstr "Witryna"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:345
 msgid "Design configuration"
 msgstr "Konfiguracja wyglądu"
 
 #. TRANS: Menu item for site administration
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/adminpanelaction.php:347 lib/groupnav.php:135
 msgctxt "MENU"
 msgid "Design"
 msgstr "Wygląd"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:353
 msgid "User configuration"
 msgstr "Konfiguracja użytkownika"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:110
 msgid "User"
 msgstr "Użytkownik"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:361
 msgid "Access configuration"
 msgstr "Konfiguracja dostępu"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:369
 msgid "Paths configuration"
 msgstr "Konfiguracja ścieżek"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:377
 msgid "Sessions configuration"
 msgstr "Konfiguracja sesji"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:385
 msgid "Edit site notice"
 msgstr "Zmodyfikuj wpis witryny"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:387
 msgid "Site notice"
 msgstr "Wpis witryny"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:393
 msgid "Snapshots configuration"
 msgstr "Konfiguracja migawek"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:401
 msgid "Set site license"
 msgstr "Ustaw licencję witryny"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:409
 #, fuzzy
 msgid "Plugins configuration"
 msgstr "Konfiguracja ścieżek"
 
 #. TRANS: Client error 401.
-#: lib/apiauth.php:111
 msgid "API resource requires read-write access, but you only have read access."
 msgstr ""
 "Zasób API wymaga dostępu do zapisu i do odczytu, ale powiadasz dostęp tylko "
 "do odczytu."
 
 #. TRANS: OAuth exception thrown when no application is found for a given consumer key.
-#: lib/apiauth.php:177
 msgid "No application for that consumer key."
 msgstr "Brak aplikacji dla tego klucza klienta."
 
-#: lib/apiauth.php:202 lib/apiauth.php:284
 msgid "Not allowed to use API."
 msgstr ""
 
 #. TRANS: OAuth exception given when an incorrect access token was given for a user.
-#: lib/apiauth.php:225
 msgid "Bad access token."
 msgstr "Błędny token dostępu."
 
 #. TRANS: OAuth exception given when no user was found for a given token (no token was found).
-#: lib/apiauth.php:230
 msgid "No user for that token."
 msgstr "Brak użytkownika dla tego tokenu."
 
 #. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel".
 #. TRANS: Client error thrown when authentication fails.
-#: lib/apiauth.php:272 lib/apiauth.php:302
 msgid "Could not authenticate you."
 msgstr "Nie można uwierzytelnić."
 
 #. TRANS: Server error displayed when trying to create an anynymous OAuth consumer.
-#: lib/apioauthstore.php:45
 msgid "Could not create anonymous consumer."
 msgstr "Nie można utworzyć anonimowego klienta."
 
 #. TRANS: Server error displayed when trying to create an anynymous OAuth application.
-#: lib/apioauthstore.php:69
 msgid "Could not create anonymous OAuth application."
 msgstr "Nie można utworzyć anonimowej aplikacji OAuth."
 
 #. TRANS: Exception thrown when no token association could be found.
-#: lib/apioauthstore.php:151
 msgid ""
 "Could not find a profile and application associated with the request token."
 msgstr "Nie można odnaleźć profilu i aplikacji powiązanych z tokenem żądania."
 
 #. TRANS: Exception thrown when no access token can be issued.
-#: lib/apioauthstore.php:209
 msgid "Could not issue access token."
 msgstr "Nie można wywołać tokenu żądania."
 
-#: lib/apioauthstore.php:317
 msgid "Database error inserting OAuth application user."
 msgstr "Błąd bazy danych podczas wprowadzania użytkownika aplikacji OAuth."
 
-#: lib/apioauthstore.php:345
 msgid "Database error updating OAuth application user."
 msgstr "Błąd bazy danych podczas aktualizowania użytkownika aplikacji OAuth."
 
 #. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
-#: lib/apioauthstore.php:371
 msgid "Tried to revoke unknown token."
 msgstr "Spróbowano unieważnić nieznany token."
 
 #. TRANS: Exception thrown when an attempt is made to remove a revoked token.
-#: lib/apioauthstore.php:376
 msgid "Failed to delete revoked token."
 msgstr "Usunięcie unieważnionego tokenu nie powiodło się."
 
 #. TRANS: Form input field label for application icon.
-#: lib/applicationeditform.php:177
 msgid "Icon"
 msgstr "Ikona"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:182
 msgid "Icon for this application"
 msgstr "Ikona tej aplikacji"
 
 #. TRANS: Form input field instructions.
 #. TRANS: %d is the number of available characters for the description.
-#: lib/applicationeditform.php:201
 #, php-format
 msgid "Describe your application in %d character"
 msgid_plural "Describe your application in %d characters"
@@ -7744,206 +6383,167 @@ msgstr[1] "Opisz aplikację w %d znakach"
 msgstr[2] "Opisz aplikację w %d znakach"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:205
 msgid "Describe your application"
 msgstr "Opisz aplikację"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:216
 msgid "URL of the homepage of this application"
 msgstr "Adres URL strony domowej tej aplikacji"
 
 #. TRANS: Form input field label.
-#: lib/applicationeditform.php:218
 msgid "Source URL"
 msgstr "Źródłowy adres URL"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:225
 msgid "Organization responsible for this application"
 msgstr "Organizacja odpowiedzialna za tę aplikację"
 
 #. TRANS: Form input field label.
-#: lib/applicationeditform.php:227
 msgid "Organization"
 msgstr "Organizacja"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:234
 msgid "URL for the homepage of the organization"
 msgstr "Adres URL strony domowej organizacji"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:243
 msgid "URL to redirect to after authentication"
 msgstr "Adres URL do przekierowania po uwierzytelnieniu"
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:271
 msgid "Browser"
 msgstr "Przeglądarka"
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:288
 msgid "Desktop"
 msgstr "Pulpit"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:290
 msgid "Type of application, browser or desktop"
 msgstr "Typ aplikacji, przeglądarka lub pulpit"
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:314
 msgid "Read-only"
 msgstr "Tylko do odczytu"
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:334
 msgid "Read-write"
 msgstr "Odczyt i zapis"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:336
 msgid "Default access for this application: read-only, or read-write"
 msgstr ""
 "Domyślny dostęp do tej aplikacji: tylko do odczytu lub do odczytu i zapisu"
 
 #. TRANS: Submit button title.
-#: lib/applicationeditform.php:353
 msgid "Cancel"
 msgstr "Anuluj"
 
-#: lib/applicationlist.php:247
 msgid " by "
 msgstr " autorstwa "
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:260
 msgid "read-write"
 msgstr "odczyt i zapis"
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:262
 msgid "read-only"
 msgstr "tylko do odczytu"
 
 #. TRANS: Used in application list. %1$s is a modified date, %2$s is access type ("read-write" or "read-only")
-#: lib/applicationlist.php:268
 #, php-format
 msgid "Approved %1$s - \"%2$s\" access."
 msgstr "Zaakceptowano %1$s - dostęp \"%2$s\"."
 
 #. TRANS: Access token in the application list.
 #. TRANS: %s are the first 7 characters of the access token.
-#: lib/applicationlist.php:282
 #, php-format
 msgid "Access token starting with: %s"
 msgstr "Token dostępu rozpoczynający się od: %s"
 
 #. TRANS: Button label
-#: lib/applicationlist.php:298
 msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "Unieważnij"
 
-#: lib/atom10feed.php:113
 msgid "Author element must contain a name element."
 msgstr "Element \"author\" musi zawierać element \"name\"."
 
 #. TRANS: Server exception thrown when using the method setActivitySubject() in the class Atom10Feed.
-#: lib/atom10feed.php:160
 msgid "Do not use this method!"
 msgstr "Nie należy używać tej metody."
 
 #. TRANS: Title.
-#: lib/attachmentnoticesection.php:67
 msgid "Notices where this attachment appears"
 msgstr "Powiadamia, kiedy pojawia się ten załącznik"
 
 #. TRANS: Title.
-#: lib/attachmenttagcloudsection.php:48
 msgid "Tags for this attachment"
 msgstr "Znaczniki dla tego załącznika"
 
 #. TRANS: Exception thrown when a password change fails.
-#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:227
 msgid "Password changing failed."
 msgstr "Zmiana hasła nie powiodła się."
 
 #. TRANS: Exception thrown when a password change attempt fails because it is not allowed.
-#: lib/authenticationplugin.php:238
 msgid "Password changing is not allowed."
 msgstr "Zmiana hasła nie jest dozwolona."
 
 #. TRANS: Title for the form to block a user.
-#: lib/blockform.php:68
 msgid "Block"
 msgstr "Zablokuj"
 
 #. TRANS: Description of the form to block a user.
-#: lib/blockform.php:79
 msgid "Block this user"
 msgstr "Zablokuj tego użytkownika"
 
 #. TRANS: Title for command results.
-#: lib/channel.php:104 lib/channel.php:125
 msgid "Command results"
 msgstr "Wyniki polecenia"
 
 #. TRANS: Title for command results.
-#: lib/channel.php:138
 msgid "AJAX error"
 msgstr "Błąd AJAX"
 
 #. TRANS: E-mail subject when a command has completed.
-#: lib/channel.php:177 lib/mailhandler.php:143
 msgid "Command complete"
 msgstr "Zakończono polecenie"
 
 #. TRANS: E-mail subject when a command has failed.
-#: lib/channel.php:188
 msgid "Command failed"
 msgstr "Polecenie nie powiodło się"
 
 #. TRANS: Command exception text shown when a notice ID is requested that does not exist.
-#: lib/command.php:82 lib/command.php:106
 msgid "Notice with that id does not exist."
 msgstr "Wpis z tym identyfikatorem nie istnieje."
 
 #. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
 #. TRANS: Error text shown when a last user notice is requested and it does not exist.
-#: lib/command.php:99 lib/command.php:642
 msgid "User has no last notice."
 msgstr "Użytkownik nie posiada ostatniego wpisu."
 
 #. TRANS: Message given requesting a profile for a non-existing user.
 #. TRANS: %s is the nickname of the user for which the profile could not be found.
-#: lib/command.php:128
 #, php-format
 msgid "Could not find a user with nickname %s."
 msgstr "Nie można odnaleźć użytkownika z pseudonimem %s."
 
 #. TRANS: Message given getting a non-existing user.
 #. TRANS: %s is the nickname of the user that could not be found.
-#: lib/command.php:148
 #, php-format
 msgid "Could not find a local user with nickname %s."
 msgstr "Nie można odnaleźć lokalnego użytkownika o pseudonimie %s."
 
 #. TRANS: Error text shown when an unimplemented command is given.
-#: lib/command.php:183
 msgid "Sorry, this command is not yet implemented."
 msgstr "Te polecenie nie zostało jeszcze zaimplementowane."
 
 #. TRANS: Command exception text shown when a user tries to nudge themselves.
-#: lib/command.php:229
 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr "Szturchanie samego siebie nie ma zbyt wiele sensu."
 
 #. TRANS: Message given having nudged another user.
 #. TRANS: %s is the nickname of the user that was nudged.
-#: lib/command.php:238
 #, php-format
 msgid "Nudge sent to %s."
 msgstr "Wysłano szturchnięcie do użytkownika %s."
@@ -7952,7 +6552,6 @@ msgstr "Wysłano szturchnięcie do użytkownika %s."
 #. TRANS: %1$s is the number of other user the user is subscribed to.
 #. TRANS: %2$s is the number of users that are subscribed to the user.
 #. TRANS: %3$s is the number of notices the user has sent.
-#: lib/command.php:268
 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"
@@ -7964,40 +6563,34 @@ msgstr ""
 "Wpisy: %3$s"
 
 #. TRANS: Error message text shown when a favorite could not be set because it has already been favorited.
-#: lib/command.php:298
 #, fuzzy
 msgid "Could not create favorite: already favorited."
 msgstr "Nie można utworzyć ulubionego wpisu."
 
 #. TRANS: Text shown when a notice has been marked as favourite successfully.
-#: lib/command.php:324
 msgid "Notice marked as fave."
 msgstr "Zaznaczono wpis jako ulubiony."
 
 #. TRANS: Message given having added a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:369
 #, php-format
 msgid "%1$s joined group %2$s."
 msgstr "Użytkownik %1$s dołączył do grupy %2$s."
 
 #. TRANS: Message given having removed a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:417
 #, php-format
 msgid "%1$s left group %2$s."
 msgstr "Użytkownik %1$s opuścił grupę %2$s."
 
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: lib/command.php:438
 #, php-format
 msgctxt "WHOIS"
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
 
 #. TRANS: Whois output. %s is the full name of the queried user.
-#: lib/command.php:442
 #, php-format
 msgid "Fullname: %s"
 msgstr "Imię i nazwisko: %s"
@@ -8005,7 +6598,6 @@ msgstr "Imię i nazwisko: %s"
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a location.
-#: lib/command.php:446 lib/mail.php:275
 #, php-format
 msgid "Location: %s"
 msgstr "Położenie: %s"
@@ -8013,20 +6605,17 @@ msgstr "Położenie: %s"
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a homepage.
-#: lib/command.php:450 lib/mail.php:279
 #, php-format
 msgid "Homepage: %s"
 msgstr "Strona domowa: %s"
 
 #. TRANS: Whois output. %s is the bio information of the queried user.
-#: lib/command.php:454
 #, php-format
 msgid "About: %s"
 msgstr "O mnie: %s"
 
 #. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).
 #. TRANS: %s is a remote profile.
-#: lib/command.php:483
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
@@ -8037,7 +6626,6 @@ msgstr ""
 
 #. TRANS: Message given if content is too long. %1$sd is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:500
 #, php-format
 msgid "Message too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
@@ -8045,26 +6633,26 @@ msgstr[0] "Wiadomość jest za długa - maksymalnie %1$d znak, wysłano %2$d."
 msgstr[1] "Wiadomość jest za długa - maksymalnie %1$d znaki, wysłano %2$d."
 msgstr[2] "Wiadomość jest za długa - maksymalnie %1$d znaków, wysłano %2$d."
 
+#. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
+msgid "You can't send a message to this user."
+msgstr "Nie można wysłać wiadomości do tego użytkownika."
+
 #. TRANS: Error text shown sending a direct message fails with an unknown reason.
-#: lib/command.php:528
 msgid "Error sending direct message."
 msgstr "Błąd podczas wysyłania bezpośredniej wiadomości."
 
 #. TRANS: Message given having repeated a notice from another user.
 #. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:565
 #, php-format
 msgid "Notice from %s repeated."
 msgstr "Powtórzono wpis od użytkownika %s."
 
 #. TRANS: Error text shown when repeating a notice fails with an unknown reason.
-#: lib/command.php:568
 msgid "Error repeating notice."
 msgstr "Błąd podczas powtarzania wpisu."
 
 #. TRANS: Message given if content of a notice for a reply is too long. %1$d is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:603
 #, php-format
 msgid "Notice too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Notice too long - maximum is %1$d characters, you sent %2$d."
@@ -8074,80 +6662,66 @@ msgstr[2] "Wpis jest za długi - maksymalnie %1$d znaków, wysłano %2$d."
 
 #. TRANS: Text shown having sent a reply to a notice successfully.
 #. TRANS: %s is the nickname of the user of the notice the reply was sent to.
-#: lib/command.php:616
 #, php-format
 msgid "Reply to %s sent."
 msgstr "Wysłano odpowiedź do %s."
 
 #. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
-#: lib/command.php:619
 msgid "Error saving notice."
 msgstr "Błąd podczas zapisywania wpisu."
 
 #. TRANS: Error text shown when no username was provided when issuing a subscribe command.
-#: lib/command.php:666
 msgid "Specify the name of the user to subscribe to."
 msgstr "Podaj nazwę użytkownika do subskrybowania."
 
 #. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
-#: lib/command.php:675
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "Nie można subskrybować profili OMB za pomocą polecenia."
 
 #. TRANS: Text shown after having subscribed to another user successfully.
 #. TRANS: %s is the name of the user the subscription was requested for.
-#: lib/command.php:683
 #, php-format
 msgid "Subscribed to %s."
 msgstr "Subskrybowano użytkownika %s."
 
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.
-#: lib/command.php:704 lib/command.php:815
 msgid "Specify the name of the user to unsubscribe from."
 msgstr "Podaj nazwę użytkownika do usunięcia subskrypcji."
 
 #. TRANS: Text shown after having unsubscribed from another user successfully.
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:715
 #, php-format
 msgid "Unsubscribed from %s."
 msgstr "Usunięto subskrypcję użytkownika %s."
 
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
-#: lib/command.php:735 lib/command.php:761
 msgid "Command not yet implemented."
 msgstr "Nie zaimplementowano polecenia."
 
 #. TRANS: Text shown when issuing the command "off" successfully.
-#: lib/command.php:739
 msgid "Notification off."
 msgstr "Wyłączono powiadomienia."
 
 #. TRANS: Error text shown when the command "off" fails for an unknown reason.
-#: lib/command.php:742
 msgid "Can't turn off notification."
 msgstr "Nie można wyłączyć powiadomień."
 
 #. TRANS: Text shown when issuing the command "on" successfully.
-#: lib/command.php:765
 msgid "Notification on."
 msgstr "Włączono powiadomienia."
 
 #. TRANS: Error text shown when the command "on" fails for an unknown reason.
-#: lib/command.php:768
 msgid "Can't turn on notification."
 msgstr "Nie można włączyć powiadomień."
 
 #. TRANS: Error text shown when issuing the login command while login is disabled.
-#: lib/command.php:782
 msgid "Login command is disabled."
 msgstr "Polecenie logowania jest wyłączone."
 
 #. TRANS: Text shown after issuing the login command successfully.
 #. TRANS: %s is a logon link..
-#: lib/command.php:795
 #, php-format
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
@@ -8155,20 +6729,17 @@ msgstr ""
 
 #. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:824
 #, php-format
 msgid "Unsubscribed %s."
 msgstr "Usunięto subskrypcję użytkownika %s."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
-#: lib/command.php:842
 msgid "You are not subscribed to anyone."
 msgstr "Nie subskrybujesz nikogo."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
-#: lib/command.php:847
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Subskrybujesz tę osobę:"
@@ -8177,14 +6748,12 @@ msgstr[2] "Subskrybujesz te osoby:"
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user
 #. TRANS: (followers) without having any subscribers.
-#: lib/command.php:869
 msgid "No one is subscribed to you."
 msgstr "Nikt cię nie subskrybuje."
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
-#: lib/command.php:874
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Ta osoba cię subskrybuje:"
@@ -8193,14 +6762,12 @@ msgstr[2] "Te osoby cię subskrybują:"
 
 #. TRANS: Text shown after requesting groups a user is subscribed to without having
 #. TRANS: any group subscriptions.
-#: lib/command.php:896
 msgid "You are not a member of any groups."
 msgstr "Nie jesteś członkiem żadnej grupy."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
-#: lib/command.php:901
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "Jesteś członkiem tej grupy:"
@@ -8208,7 +6775,6 @@ msgstr[1] "Jesteś członkiem tych grup:"
 msgstr[2] "Jesteś członkiem tych grup:"
 
 #. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-#: lib/command.php:916
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -8291,116 +6857,94 @@ msgstr ""
 "tracking - jeszcze nie zaimplementowano\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:36
 msgid "No configuration file found."
 msgstr "Nie odnaleziono pliku konfiguracji."
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:39
 msgid "I looked for configuration files in the following places:"
 msgstr "Szukano plików konfiguracji w następujących miejscach:"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:42
 msgid "You may wish to run the installer to fix this."
 msgstr "Należy uruchomić instalator, aby to naprawić."
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:46
 msgid "Go to the installer."
 msgstr "Przejdź do instalatora."
 
-#: lib/dberroraction.php:59
 msgid "Database error"
 msgstr "Błąd bazy danych"
 
 #. TRANS: Description of form for deleting a user.
-#: lib/deleteuserform.php:75
 msgid "Delete this user"
 msgstr "Usuń tego użytkownika"
 
-#: lib/designform.php:114
 #, fuzzy
 msgid "Change design"
 msgstr "Zapisz wygląd"
 
 #. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: lib/designform.php:131
 msgid "Change colours"
 msgstr "Zmień kolory"
 
 #. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: lib/designform.php:138
 msgid "Use defaults"
 msgstr "Użycie domyślnych"
 
 #. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: lib/designform.php:140
 msgid "Restore default designs"
 msgstr "Przywróć domyślny wygląd"
 
 #. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: lib/designform.php:148
 msgid "Reset back to default"
 msgstr "Przywróć domyślne ustawienia"
 
 #. TRANS: Label in form on profile design page.
 #. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
-#: lib/designform.php:158
 msgid "Upload file"
 msgstr "Wyślij plik"
 
 #. TRANS: Instructions for form on profile design page.
-#: lib/designform.php:163
-#, fuzzy
 msgid ""
 "You can upload your personal background image. The maximum file size is 2Mb."
 msgstr "Można wysłać osobisty obraz tła. Maksymalny rozmiar pliku to 2 MB."
 
 #. TRANS: Radio button on profile design page that will enable use of the uploaded profile image.
-#: lib/designform.php:194
 msgctxt "RADIO"
 msgid "On"
 msgstr "Włączone"
 
 #. TRANS: Radio button on profile design page that will disable use of the uploaded profile image.
-#: lib/designform.php:211
 msgctxt "RADIO"
 msgid "Off"
 msgstr "Wyłączone"
 
 #. TRANS: Title for button on profile design page to save settings.
-#: lib/designform.php:322
 msgid "Save design"
 msgstr "Zapisz wygląd"
 
 #. TRANS: Error message displayed if design settings could not be saved.
 #. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
-#: lib/designsettings.php:216 lib/designsettings.php:238
 msgid "Couldn't update your design."
 msgstr "Nie można zaktualizować wyglądu."
 
 #. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
-#: lib/designsettings.php:244
 msgid "Design defaults restored."
 msgstr "Przywrócono domyślny wygląd."
 
 #. TRANS: Exception. %s is an ID.
-#: lib/discovery.php:153
 #, php-format
 msgid "Unable to find services for %s."
 msgstr "Nie można odnaleźć usług dla %s."
 
 #. TRANS: Form legend for removing the favourite status for a favourite notice.
 #. TRANS: Title for button text for removing the favourite status for a favourite notice.
-#: lib/disfavorform.php:108 lib/disfavorform.php:140
 msgid "Disfavor this notice"
 msgstr "Usuń ten wpis z ulubionych"
 
 #. TRANS: Button text for removing the favourite status for a favourite notice.
-#: lib/disfavorform.php:136
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Disfavor favorite"
@@ -8408,88 +6952,68 @@ msgstr "Usuń wpis z ulubionych"
 
 #. TRANS: Form legend for adding the favourite status to a notice.
 #. TRANS: Title for button text for adding the favourite status to a notice.
-#: lib/favorform.php:108 lib/favorform.php:139
 msgid "Favor this notice"
 msgstr "Dodaj ten wpis do ulubionych"
 
 #. TRANS: Button text for adding the favourite status to a notice.
-#: lib/favorform.php:135
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Favor"
 msgstr "Dodaj do ulubionych"
 
-#: lib/feed.php:84
 msgid "RSS 1.0"
 msgstr "RSS 1.0"
 
-#: lib/feed.php:86
 msgid "RSS 2.0"
 msgstr "RSS 2.0"
 
-#: lib/feed.php:88
 msgid "Atom"
 msgstr "Atom"
 
-#: lib/feed.php:90
 msgid "FOAF"
 msgstr "FOAF"
 
-#: lib/feedimporter.php:75
 msgid "Not an atom feed."
 msgstr "Nie jest kanałem Atom."
 
-#: lib/feedimporter.php:82
 msgid "No author in the feed."
 msgstr "Brak autora w kanale."
 
-#: lib/feedimporter.php:89
 msgid "Can't import without a user."
 msgstr "Nie można zaimportować bez użytkownika."
 
 #. TRANS: Header for feed links (h2).
-#: lib/feedlist.php:66
 msgid "Feeds"
 msgstr "Kanały"
 
-#: lib/galleryaction.php:128
 msgid "All"
 msgstr "Wszystko"
 
-#: lib/galleryaction.php:136
 msgid "Select tag to filter"
 msgstr "Wybierz znacznik do filtrowania"
 
-#: lib/galleryaction.php:137
 msgid "Tag"
 msgstr "Znacznik"
 
-#: lib/galleryaction.php:138
 msgid "Choose a tag to narrow list"
 msgstr "Wybierz znacznik do ograniczonej listy"
 
-#: lib/galleryaction.php:140
 msgid "Go"
 msgstr "Przejdź"
 
-#: lib/grantroleform.php:91
 #, php-format
 msgid "Grant this user the \"%s\" role"
 msgstr "Nadaj użytkownikowi rolę \"%s\""
 
-#: lib/groupeditform.php:147
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "1-64 małe litery lub liczby, bez spacji i znaków przestankowych."
 
-#: lib/groupeditform.php:156
 msgid "URL of the homepage or blog of the group or topic."
 msgstr "Adres URL strony domowej lub bloga grupy, albo temat."
 
-#: lib/groupeditform.php:161
 msgid "Describe the group or topic"
 msgstr "Opisz grupę lub temat"
 
-#: lib/groupeditform.php:163
 #, php-format
 msgid "Describe the group or topic in %d character or less"
 msgid_plural "Describe the group or topic in %d characters or less"
@@ -8497,14 +7021,12 @@ msgstr[0] "Opisz grupę lub temat w %d znaku"
 msgstr[1] "Opisz grupę lub temat w %d znakach"
 msgstr[2] "Opisz grupę lub temat w %d znakach"
 
-#: lib/groupeditform.php:175
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\"."
 msgstr ""
 "Położenie grupy, jeśli istnieje, np. \"miasto, województwo (lub region), kraj"
 "\"."
 
-#: lib/groupeditform.php:183
 #, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -8523,70 +7045,60 @@ msgstr[2] ""
 "%d."
 
 #. TRANS: Menu item in the group navigation page.
-#: lib/groupnav.php:86
 msgctxt "MENU"
 msgid "Group"
 msgstr "Grupa"
 
 #. TRANS: Tooltip for menu item in the group navigation page.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:89
 #, php-format
 msgctxt "TOOLTIP"
 msgid "%s group"
 msgstr "Grupa %s"
 
 #. TRANS: Menu item in the group navigation page.
-#: lib/groupnav.php:95
 msgctxt "MENU"
 msgid "Members"
 msgstr "Członkowie"
 
 #. TRANS: Tooltip for menu item in the group navigation page.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:98
 #, php-format
 msgctxt "TOOLTIP"
 msgid "%s group members"
 msgstr "Członkowie grupy %s"
 
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/groupnav.php:108
 msgctxt "MENU"
 msgid "Blocked"
 msgstr "Zablokowany"
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:111
 #, php-format
 msgctxt "TOOLTIP"
 msgid "%s blocked users"
 msgstr "%s zablokowanych użytkowników"
 
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "Administrator"
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:120
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Edit %s group properties"
 msgstr "Modyfikacja właściwości grupy %s"
 
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/groupnav.php:126
 msgctxt "MENU"
 msgid "Logo"
 msgstr "Logo"
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:129
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Add or edit %s logo"
@@ -8594,69 +7106,57 @@ msgstr "Dodanie lub modyfikacja loga grupy %s"
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:138
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Add or edit %s design"
 msgstr "Dodanie lub modyfikacja wyglądu grupy %s"
 
 #. TRANS: Title for groups with the most members section.
-#: lib/groupsbymemberssection.php:71
 msgid "Groups with most members"
 msgstr "Grupy z największą liczbą członków"
 
 #. TRANS: Title for groups with the most posts section.
-#: lib/groupsbypostssection.php:71
 msgid "Groups with most posts"
 msgstr "Grupy z największą ilością wpisów"
 
 #. TRANS: Title for group tag cloud section.
 #. TRANS: %s is a group name.
-#: lib/grouptagcloudsection.php:57
 #, php-format
 msgid "Tags in %s group's notices"
 msgstr "Znaczniki we wpisach grupy %s"
 
 #. TRANS: Client exception 406
-#: lib/htmloutputter.php:104
 msgid "This page is not available in a media type you accept"
 msgstr "Ta strona jest niedostępna dla akceptowanego typu medium"
 
 #. TRANS: Exception thrown when trying to upload an unsupported image file format.
-#: lib/imagefile.php:73
 msgid "Unsupported image file format."
 msgstr "Nieobsługiwany format pliku obrazu."
 
 #. TRANS: Exception thrown when too large a file is uploaded.
 #. TRANS: %s is the maximum file size, for example "500b", "10kB" or "2MB".
-#: lib/imagefile.php:91
 #, php-format
 msgid "That file is too big. The maximum file size is %s."
 msgstr "Ten plik jest za duży. Maksymalny rozmiar pliku to %s."
 
 #. TRANS: Exception thrown when uploading an image and that action could not be completed.
-#: lib/imagefile.php:97
 msgid "Partial upload."
 msgstr "Częściowo wysłano."
 
 #. TRANS: Exception thrown when uploading a file as image that is not an image or is a corrupt file.
-#: lib/imagefile.php:115
 msgid "Not an image or corrupt file."
 msgstr "To nie jest obraz lub lub plik jest uszkodzony."
 
 #. TRANS: Exception thrown during resize when image has been registered as present, but is no longer there.
-#: lib/imagefile.php:178
 msgid "Lost our file."
 msgstr "Utracono plik."
 
 #. TRANS: Exception thrown when trying to resize an unknown file type.
 #. TRANS: Exception thrown when trying resize an unknown file type.
-#: lib/imagefile.php:216 lib/imagefile.php:257
 msgid "Unknown file type"
 msgstr "Nieznany typ pliku"
 
 #. TRANS: Number of megabytes. %d is the number.
-#: lib/imagefile.php:303
 #, php-format
 msgid "%dMB"
 msgid_plural "%dMB"
@@ -8665,7 +7165,6 @@ msgstr[1] "%d MB"
 msgstr[2] "%d MB"
 
 #. TRANS: Number of kilobytes. %d is the number.
-#: lib/imagefile.php:307
 #, php-format
 msgid "%dkB"
 msgid_plural "%dkB"
@@ -8674,7 +7173,6 @@ msgstr[1] "%d KB"
 msgstr[2] "%d KB"
 
 #. TRANS: Number of bytes. %d is the number.
-#: lib/imagefile.php:310
 #, php-format
 msgid "%dB"
 msgid_plural "%dB"
@@ -8682,7 +7180,6 @@ msgstr[0] "%d B"
 msgstr[1] "%d B"
 msgstr[2] "%d B"
 
-#: lib/implugin.php:262
 #, php-format
 msgid ""
 "User \"%s\" on %s has said that your %s screenname belongs to them. If "
@@ -8692,51 +7189,42 @@ msgid ""
 "message."
 msgstr ""
 
-#: lib/implugin.php:349
 #, php-format
 msgid "Unknown inbox source %d."
 msgstr "Nieznane źródło skrzynki odbiorczej %d."
 
-#: lib/implugin.php:485
-#, fuzzy, php-format
+#, php-format
 msgid "Message too long - maximum is %1$d characters, you sent %2$d."
-msgstr "Wiadomość jest za długa - maksymalnie %1$d znak, wysłano %2$d."
+msgstr "Wiadomość jest za długa - maksymalnie %1$d znaków, wysłano %2$d."
 
-#: lib/leaveform.php:114
 msgid "Leave"
 msgstr "Opuść"
 
 #. TRANS: Menu item for logging in to the StatusNet site.
-#: lib/logingroupnav.php:77
 msgctxt "MENU"
 msgid "Login"
 msgstr "Zaloguj się"
 
 #. TRANS: Title for menu item for logging in to the StatusNet site.
-#: lib/logingroupnav.php:79
 msgid "Login with a username and password"
 msgstr "Zaloguj się za pomocą nazwy użytkownika i hasła"
 
 #. TRANS: Menu item for registering with the StatusNet site.
-#: lib/logingroupnav.php:85
 msgctxt "MENU"
 msgid "Register"
 msgstr "Zarejestruj się"
 
 #. TRANS: Title for menu item for registering with the StatusNet site.
-#: lib/logingroupnav.php:87
 msgid "Sign up for a new account"
 msgstr "Załóż nowe konto"
 
 #. TRANS: Subject for address confirmation email.
-#: lib/mail.php:172
 msgid "Email address confirmation"
 msgstr "Potwierdzenie adresu e-mail"
 
 #. TRANS: Body for address confirmation email.
 #. TRANS: %1$s is the addressed user's nickname, %2$s is the StatusNet sitename,
 #. TRANS: %3$s is the URL to confirm at.
-#: lib/mail.php:177
 #, php-format
 msgid ""
 "Hey, %1$s.\n"
@@ -8768,14 +7256,12 @@ msgstr ""
 
 #. TRANS: Subject of new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
-#: lib/mail.php:243
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "Użytkownik %1$s obserwuje teraz twoje wpisy na %2$s."
 
 #. TRANS: This is a paragraph in a new-subscriber e-mail.
 #. TRANS: %s is a URL where the subscriber can be reported as abusive.
-#: lib/mail.php:250
 #, php-format
 msgid ""
 "If you believe this account is being used abusively, you can block them from "
@@ -8790,7 +7276,6 @@ msgstr ""
 #. TRANS: %3$s is the subscriber's profile URL, %4$s is the subscriber's location (or empty)
 #. TRANS: %5$s is the subscriber's homepage URL (or empty), %6%s is the subscriber's bio (or empty)
 #. TRANS: %7$s is a link to the addressed user's e-mail settings.
-#: lib/mail.php:260
 #, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -8817,14 +7302,12 @@ msgstr ""
 
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is biographical information.
-#: lib/mail.php:283
 #, php-format
 msgid "Bio: %s"
 msgstr "O mnie: %s"
 
 #. TRANS: Subject of notification mail for new posting email address.
 #. TRANS: %s is the StatusNet sitename.
-#: lib/mail.php:312
 #, php-format
 msgid "New email address for posting to %s"
 msgstr "Nowy adres e-mail do wysyłania do %s"
@@ -8832,7 +7315,6 @@ msgstr "Nowy adres e-mail do wysyłania do %s"
 #. TRANS: Body of notification mail for new posting email address.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is the e-mail address to send
 #. TRANS: to to post by e-mail, %3$s is a URL to more instructions.
-#: lib/mail.php:318
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -8855,26 +7337,22 @@ msgstr ""
 
 #. TRANS: Subject line for SMS-by-email notification messages.
 #. TRANS: %s is the posting user's nickname.
-#: lib/mail.php:439
 #, php-format
 msgid "%s status"
 msgstr "Stan użytkownika %s"
 
 #. TRANS: Subject line for SMS-by-email address confirmation message.
-#: lib/mail.php:465
 msgid "SMS confirmation"
 msgstr "Potwierdzenie SMS"
 
 #. TRANS: Main body heading for SMS-by-email address confirmation message.
 #. TRANS: %s is the addressed user's nickname.
-#: lib/mail.php:469
 #, php-format
 msgid "%s: confirm you own this phone number with this code:"
 msgstr "%s: proszę potwierdzić własny numer telefonu za pomocą tego kodu:"
 
 #. TRANS: Subject for 'nudge' notification email.
 #. TRANS: %s is the nudging user.
-#: lib/mail.php:490
 #, php-format
 msgid "You have been nudged by %s"
 msgstr "Zostałeś szturchnięty przez użytkownika %s"
@@ -8882,7 +7360,6 @@ msgstr "Zostałeś szturchnięty przez użytkownika %s"
 #. TRANS: Body for 'nudge' notification email.
 #. TRANS: %1$s is the nuding user's long name, $2$s is the nudging user's nickname,
 #. TRANS: %3$s is a URL to post notices at, %4$s is the StatusNet sitename.
-#: lib/mail.php:497
 #, php-format
 msgid ""
 "%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -8911,7 +7388,6 @@ msgstr ""
 
 #. TRANS: Subject for direct-message notification email.
 #. TRANS: %s is the sending user's nickname.
-#: lib/mail.php:544
 #, php-format
 msgid "New private message from %s"
 msgstr "Nowa prywatna wiadomość od użytkownika %s"
@@ -8920,7 +7396,6 @@ msgstr "Nowa prywatna wiadomość od użytkownika %s"
 #. TRANS: %1$s is the sending user's long name, %2$s is the sending user's nickname,
 #. TRANS: %3$s is the message content, %4$s a URL to the message,
 #. TRANS: %5$s is the StatusNet sitename.
-#: lib/mail.php:552
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -8955,7 +7430,6 @@ msgstr ""
 
 #. TRANS: Subject for favorite notification e-mail.
 #. TRANS: %1$s is the adding user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:604
 #, php-format
 msgid "%1$s (@%2$s) added your notice as a favorite"
 msgstr "Użytkownik %1$s (@%2$s) dodał twój wpis jako ulubiony"
@@ -8965,7 +7439,6 @@ msgstr "Użytkownik %1$s (@%2$s) dodał twój wpis jako ulubiony"
 #. TRANS: %3$s is a URL to the faved notice, %4$s is the faved notice text,
 #. TRANS: %5$s is a URL to all faves of the adding user, %6$s is the StatusNet sitename,
 #. TRANS: %7$s is the adding user's nickname.
-#: lib/mail.php:611
 #, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -9004,7 +7477,6 @@ msgstr ""
 "%6$s\n"
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:669
 #, php-format
 msgid ""
 "The full conversation can be read here:\n"
@@ -9017,7 +7489,6 @@ msgstr ""
 
 #. TRANS: E-mail subject for notice notification.
 #. TRANS: %1$s is the sending user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:677
 #, php-format
 msgid "%1$s (@%2$s) sent a notice to your attention"
 msgstr "Użytkownik %1$s (@%2$s) wysłał wpis wymagający twojej uwagi"
@@ -9028,7 +7499,6 @@ msgstr "Użytkownik %1$s (@%2$s) wysłał wpis wymagający twojej uwagi"
 #. TRANS: %5$s is a URL to the full conversion if it exists (otherwise empty),
 #. TRANS: %6$s is a URL to reply to the notice, %7$s is a URL to all @-replied for the addressed user,
 #. TRANS: %8$s is a URL to the addressed user's e-mail settings, %9$s is the sender's nickname.
-#: lib/mail.php:685
 #, php-format
 msgid ""
 "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -9078,11 +7548,9 @@ msgstr ""
 "\n"
 "PS Można wyłączyć powiadomienia przez e-mail tutaj: %8$s\n"
 
-#: lib/mailbox.php:87
 msgid "Only the user can read their own mailboxes."
 msgstr "Tylko użytkownik może czytać swoje skrzynki pocztowe."
 
-#: lib/mailbox.php:125
 msgid ""
 "You have no private messages. You can send private message to engage other "
 "users in conversation. People can send you messages for your eyes only."
@@ -9091,53 +7559,43 @@ msgstr ""
 "rozmowę z innymi użytkownikami. Inni mogą wysyłać ci wiadomości tylko dla "
 "twoich oczu."
 
-#: lib/mailhandler.php:37
 msgid "Could not parse message."
 msgstr "Nie można przetworzyć wiadomości."
 
-#: lib/mailhandler.php:42
 msgid "Not a registered user."
 msgstr "To nie jest zarejestrowany użytkownik."
 
-#: lib/mailhandler.php:46
 msgid "Sorry, that is not your incoming email address."
 msgstr "To nie jest przychodzący adres e-mail."
 
-#: lib/mailhandler.php:50
 msgid "Sorry, no incoming email allowed."
 msgstr "Przychodzący e-mail nie jest dozwolony."
 
-#: lib/mailhandler.php:229
 #, php-format
 msgid "Unsupported message type: %s"
 msgstr "Nieobsługiwany typ wiadomości: %s"
 
 #. TRANS: Client exception thrown when a database error was thrown during a file upload operation.
-#: lib/mediafile.php:102 lib/mediafile.php:174
 msgid "There was a database error while saving your file. Please try again."
 msgstr "Wystąpił błąd bazy danych podczas zapisywania pliku. Spróbuj ponownie."
 
 #. TRANS: Client exception thrown when a file upload operation would cause a user to exceed a set quota.
-#: lib/mediafile.php:238 lib/mediafile.php:281
 msgid "File exceeds user's quota."
 msgstr "Plik przekracza przydział użytkownika."
 
 #. TRANS: Client exception thrown when a file upload operation fails because the file could
 #. TRANS: not be moved from the temporary folder to the permanent file location.
-#: lib/mediafile.php:258 lib/mediafile.php:300
 msgid "File could not be moved to destination directory."
 msgstr "Nie można przenieść pliku do katalogu docelowego."
 
 #. TRANS: Client exception thrown when a file upload operation has been stopped because the MIME
 #. TRANS: type of the uploaded file could not be determined.
-#: lib/mediafile.php:265 lib/mediafile.php:306
 msgid "Could not determine file's MIME type."
 msgstr "Nie można określić typu MIME pliku."
 
 #. TRANS: Client exception thrown trying to upload a forbidden MIME type.
 #. TRANS: %1$s is the file type that was denied, %2$s is the application part of
 #. TRANS: the MIME type that was denied.
-#: lib/mediafile.php:396
 #, php-format
 msgid ""
 "\"%1$s\" is not a supported file type on this server. Try using another %2$s "
@@ -9148,50 +7606,40 @@ msgstr ""
 
 #. TRANS: Client exception thrown trying to upload a forbidden MIME type.
 #. TRANS: %s is the file type that was denied.
-#: lib/mediafile.php:401
 #, php-format
 msgid "\"%s\" is not a supported file type on this server."
 msgstr "\"%s\" nie jest obsługiwanym typem pliku na tym serwerze."
 
-#: lib/messageform.php:120
 msgid "Send a direct notice"
 msgstr "Wyślij bezpośredni wpis"
 
 #. TRANS Label entry in drop-down selection box in direct-message inbox/outbox. This is the default entry in the drop-down box, doubling as instructions and a brake against accidental submissions with the first user in the list.
-#: lib/messageform.php:137
 msgid "Select recipient:"
 msgstr "Wybierz odbiorcę:"
 
 #. TRANS Entry in drop-down selection box in direct-message inbox/outbox when no one is available to message.
-#: lib/messageform.php:150
 msgid "No mutual subscribers."
 msgstr "Brak wzajemnych subskrybentów."
 
-#: lib/messageform.php:153
 msgid "To"
 msgstr "Do"
 
-#: lib/messageform.php:184 lib/noticeform.php:236
 msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr "Wyślij"
 
-#: lib/messagelist.php:77
 #, fuzzy
 msgid "Messages"
 msgstr "Wiadomość"
 
-#: lib/messagelistitem.php:123 lib/noticelist.php:527
 msgid "from"
 msgstr "z"
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:178
 msgid "Nickname cannot be empty."
 msgstr "Pseudonim nie może być pusty."
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:191
 #, php-format
 msgid "Nickname cannot be more than %d character long."
 msgid_plural "Nickname cannot be more than %d characters long."
@@ -9199,32 +7647,33 @@ msgstr[0] "Pseudonim nie może mieć więcej niż %d znak."
 msgstr[1] "Pseudonim nie może mieć więcej niż %d znaki."
 msgstr[2] "Pseudonim nie może mieć więcej niż %d znaków."
 
-#: lib/noticeform.php:160
+#. TRANS: Form legend for notice form.
 msgid "Send a notice"
 msgstr "Wyślij wpis"
 
-#: lib/noticeform.php:174
+#. TRANS: Title for notice label. %s is the user's nickname.
 #, php-format
 msgid "What's up, %s?"
 msgstr "Co słychać, %s?"
 
-#: lib/noticeform.php:193
+#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr "Załącz"
 
-#: lib/noticeform.php:197
-msgid "Attach a file"
+#. TRANS: Title for input field to attach a file to a notice.
+#, fuzzy
+msgid "Attach a file."
 msgstr "Załącz plik"
 
-#: lib/noticeform.php:212
+#. TRANS: Field label to add location to a notice.
 msgid "Share my location"
 msgstr "Ujawnij położenie"
 
-#: lib/noticeform.php:215
+#. TRANS: Text to not share location for a notice in notice form.
 msgid "Do not share my location"
 msgstr "Nie ujawniaj położenia"
 
-#: lib/noticeform.php:216
+#. TRANS: Timeout error text for location retrieval in notice form.
 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
 "try again later"
@@ -9233,417 +7682,316 @@ msgstr ""
 "ponownie później"
 
 #. TRANS: Used in coordinates as abbreviation of north
-#: lib/noticelist.php:457
 msgid "N"
 msgstr "Północ"
 
 #. TRANS: Used in coordinates as abbreviation of south
-#: lib/noticelist.php:459
 msgid "S"
 msgstr "Południe"
 
 #. TRANS: Used in coordinates as abbreviation of east
-#: lib/noticelist.php:461
 msgid "E"
 msgstr "Wschód"
 
 #. TRANS: Used in coordinates as abbreviation of west
-#: lib/noticelist.php:463
 msgid "W"
 msgstr "Zachód"
 
-#: lib/noticelist.php:465
 #, php-format
 msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 
-#: lib/noticelist.php:474
 msgid "at"
 msgstr "w"
 
-#: lib/noticelist.php:523
 msgid "web"
 msgstr "WWW"
 
-#: lib/noticelist.php:589
 msgid "in context"
 msgstr "w rozmowie"
 
-#: lib/noticelist.php:624
 msgid "Repeated by"
 msgstr "Powtórzone przez"
 
-#: lib/noticelist.php:651
 msgid "Reply to this notice"
 msgstr "Odpowiedz na ten wpis"
 
-#: lib/noticelist.php:652
 msgid "Reply"
 msgstr "Odpowiedz"
 
-#: lib/noticelist.php:678
 msgid "Delete this notice"
 msgstr "Usuń ten wpis"
 
-#: lib/noticelist.php:696
 msgid "Notice repeated"
 msgstr "Powtórzono wpis"
 
-#: lib/nudgeform.php:116
 msgid "Nudge this user"
 msgstr "Szturchnij tego użytkownika"
 
-#: lib/nudgeform.php:128
 msgid "Nudge"
 msgstr "Szturchnij"
 
-#: lib/nudgeform.php:128
 msgid "Send a nudge to this user"
 msgstr "Wyślij szturchnięcie do tego użytkownika"
 
-#: lib/oauthstore.php:294
 msgid "Error inserting new profile."
 msgstr "Błąd podczas wprowadzania nowego profilu."
 
-#: lib/oauthstore.php:302
 msgid "Error inserting avatar."
 msgstr "Błąd podczas wprowadzania awatara."
 
-#: lib/oauthstore.php:322
 msgid "Error inserting remote profile."
 msgstr "Błąd podczas wprowadzania zdalnego profilu."
 
 #. TRANS: Exception thrown when a notice is denied because it has been sent before.
-#: lib/oauthstore.php:362
 msgid "Duplicate notice."
 msgstr "Podwójny wpis."
 
-#: lib/oauthstore.php:507
 msgid "Couldn't insert new subscription."
 msgstr "Nie można wprowadzić nowej subskrypcji."
 
-#: lib/personalgroupnav.php:104
-#, fuzzy
 msgid "Replies"
 msgstr "Odpowiedzi"
 
-#: lib/personalgroupnav.php:109
-#, fuzzy
 msgid "Favorites"
 msgstr "Ulubione"
 
-#: lib/personalgroupnav.php:120
-#, fuzzy
 msgid "Inbox"
 msgstr "Odebrane"
 
-#: lib/personalgroupnav.php:121
 msgid "Your incoming messages"
 msgstr "Wiadomości przychodzące"
 
-#: lib/personalgroupnav.php:125
-#, fuzzy
 msgid "Outbox"
 msgstr "Wysłane"
 
-#: lib/personalgroupnav.php:126
 msgid "Your sent messages"
 msgstr "Wysłane wiadomości"
 
 #. TRANS: Title for personal tag cloud section. %s is a user nickname.
-#: lib/personaltagcloudsection.php:56
 #, php-format
 msgid "Tags in %s's notices"
 msgstr "Znaczniki we wpisach użytkownika %s"
 
 #. TRANS: Displayed as version information for a plugin if no version information was found.
-#: lib/plugin.php:126
 msgid "Unknown"
 msgstr "Nieznane"
 
 #. TRANS: Plugin admin panel controls
-#: lib/plugindisableform.php:90
 msgctxt "plugin"
 msgid "Disable"
 msgstr ""
 
 #. TRANS: Plugin admin panel controls
-#: lib/pluginenableform.php:112
 msgctxt "plugin"
 msgid "Enable"
 msgstr ""
 
-#: lib/pluginlist.php:196
 msgctxt "plugin-description"
 msgid "(Plugin descriptions unavailable when disabled.)"
 msgstr ""
 
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:88
 msgid "Subscriptions"
 msgstr "Subskrypcje"
 
 #. TRANS: Text for user subscription statistics if user has more subscriptions than displayed.
-#: lib/profileaction.php:144
 msgid "All subscriptions"
 msgstr "Wszystkie subskrypcje"
 
 #. TRANS: H2 text for user subscriber statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:96
 msgid "Subscribers"
 msgstr "Subskrybenci"
 
 #. TRANS: Text for user subscription statistics if user has more subscribers than displayed.
-#: lib/profileaction.php:181
 msgid "All subscribers"
 msgstr "Wszyscy subskrybenci"
 
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:213
 msgid "User ID"
 msgstr "Identyfikator użytkownika"
 
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:219
 msgid "Member since"
 msgstr "Członek od"
 
 #. TRANS: Label for user statistics.
 #. TRANS: H2 text for user group membership statistics.
-#: lib/profileaction.php:239 lib/profileaction.php:290
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:104
 msgid "Groups"
 msgstr "Grupy"
 
 #. TRANS: Label for user statistics.
 #. TRANS: Average count of posts made per day since account registration.
-#: lib/profileaction.php:253
 msgid "Daily average"
 msgstr "Dziennie średnio"
 
 #. TRANS: Text for user group membership statistics if user has more subscriptions than displayed.
-#: lib/profileaction.php:305
 msgid "All groups"
 msgstr "Wszystkie grupy"
 
 #. TRANS: Server error displayed when using an unimplemented method.
-#: lib/profileformaction.php:123
 msgid "Unimplemented method."
 msgstr "Niezaimplementowana metoda."
 
-#: lib/publicgroupnav.php:82
 msgid "User groups"
 msgstr "Grupy użytkowników"
 
-#: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
 msgid "Recent tags"
 msgstr "Ostatnie znaczniki"
 
-#: lib/publicgroupnav.php:88
 msgid "Featured"
 msgstr "Znane"
 
-#: lib/publicgroupnav.php:92
 msgid "Popular"
 msgstr "Popularne"
 
-#: lib/redirectingaction.php:95
 msgid "No return-to arguments."
 msgstr "Brak parametrów powrotu."
 
-#: lib/repeatform.php:107
 msgid "Repeat this notice?"
 msgstr "Powtórzyć ten wpis?"
 
-#: lib/repeatform.php:132
 msgid "Yes"
 msgstr "Tak"
 
-#: lib/repeatform.php:132
 msgid "Repeat this notice"
 msgstr "Powtórz ten wpis"
 
-#: lib/revokeroleform.php:91
 #, php-format
 msgid "Revoke the \"%s\" role from this user"
 msgstr "Unieważnij rolę \"%s\" tego użytkownika"
 
 #. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:1001
 msgid "Page not found."
 msgstr "Nie odnaleziono strony."
 
-#: lib/sandboxform.php:67
 msgid "Sandbox"
 msgstr "Ogranicz"
 
-#: lib/sandboxform.php:78
 msgid "Sandbox this user"
 msgstr "Ogranicz tego użytkownika"
 
 #. TRANS: Fieldset legend for the search form.
-#: lib/searchaction.php:120
 msgid "Search site"
 msgstr "Przeszukaj witrynę"
 
 #. TRANS: Used as a field label for the field where one or more keywords
 #. TRANS: for searching can be entered.
-#: lib/searchaction.php:128
 msgid "Keyword(s)"
 msgstr "Słowa kluczowe"
 
 #. TRANS: Button text for searching site.
-#: lib/searchaction.php:130
 msgctxt "BUTTON"
 msgid "Search"
 msgstr "Wyszukaj"
 
-#: lib/searchgroupnav.php:80
 msgid "People"
 msgstr "Osoby"
 
-#: lib/searchgroupnav.php:81
 msgid "Find people on this site"
 msgstr "Znajdź osoby na tej witrynie"
 
-#: lib/searchgroupnav.php:83
 msgid "Find content of notices"
 msgstr "Przeszukaj zawartość wpisów"
 
-#: lib/searchgroupnav.php:85
 msgid "Find groups on this site"
 msgstr "Znajdź grupy na tej witrynie"
 
-#: lib/section.php:89
 msgid "Untitled section"
 msgstr "Sekcja bez nazwy"
 
-#: lib/section.php:106
 msgid "More..."
 msgstr "Więcej..."
 
-#: lib/settingsnav.php:78
 msgid "Change your profile settings"
 msgstr "Zmień ustawienia profilu"
 
-#: lib/settingsnav.php:83
 msgid "Upload an avatar"
 msgstr "Wyślij awatar"
 
-#: lib/settingsnav.php:88
 msgid "Change your password"
 msgstr "Zmień hasło"
 
-#: lib/settingsnav.php:93
 msgid "Change email handling"
 msgstr "Zmień obsługę adresu e-mail"
 
-#: lib/settingsnav.php:98
 msgid "Design your profile"
 msgstr "Wygląd profilu"
 
-#: lib/settingsnav.php:102
 msgid "URL"
 msgstr "Adres URL"
 
-#: lib/settingsnav.php:103
 msgid "URL shorteners"
 msgstr ""
 
-#: lib/settingsnav.php:111
 msgid "Updates by instant messenger (IM)"
 msgstr "Aktualizacje przez komunikator"
 
-#: lib/settingsnav.php:118
 msgid "Updates by SMS"
 msgstr "Aktualizacje przez wiadomości SMS"
 
-#: lib/settingsnav.php:123
-#, fuzzy
 msgid "Connections"
 msgstr "Połączenia"
 
-#: lib/settingsnav.php:124
 msgid "Authorized connected applications"
 msgstr "Upoważnione połączone aplikacje"
 
-#: lib/silenceform.php:67
 msgid "Silence"
 msgstr "Wycisz"
 
-#: lib/silenceform.php:78
 msgid "Silence this user"
 msgstr "Wycisz tego użytkownika"
 
-#: lib/subgroupnav.php:89
 #, php-format
 msgid "People %s subscribes to"
 msgstr "Osoby %s subskrybowane do"
 
-#: lib/subgroupnav.php:97
 #, php-format
 msgid "People subscribed to %s"
 msgstr "Osoby subskrybowane do %s"
 
-#: lib/subgroupnav.php:105
 #, php-format
 msgid "Groups %s is a member of"
 msgstr "Grupy %s są członkiem"
 
-#: lib/subgroupnav.php:111
 msgid "Invite"
 msgstr "Zaproś"
 
-#: lib/subgroupnav.php:112
 #, php-format
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Zaproś przyjaciół i kolegów do dołączenia do ciebie na %s"
 
-#: lib/subscribeform.php:115 lib/subscribeform.php:139
 msgid "Subscribe to this user"
 msgstr "Subskrybuj tego użytkownika"
 
-#: lib/subscriberspeopleselftagcloudsection.php:48
-#: lib/subscriptionspeopleselftagcloudsection.php:48
 msgid "People Tagcloud as self-tagged"
 msgstr "Chmura znaczników osób, które same sobie nadały znaczniki"
 
-#: lib/subscriberspeopletagcloudsection.php:48
-#: lib/subscriptionspeopletagcloudsection.php:48
 msgid "People Tagcloud as tagged"
 msgstr "Chmura znaczników osób ze znacznikami"
 
-#: lib/tagcloudsection.php:56
 msgid "None"
 msgstr "Brak"
 
 #. TRANS: Server exception displayed if a theme name was invalid.
-#: lib/theme.php:74
 msgid "Invalid theme name."
 msgstr "Nieprawidłowa nazwa motywu."
 
-#: lib/themeuploader.php:50
 msgid "This server cannot handle theme uploads without ZIP support."
 msgstr ""
 "Ten serwer nie może obsługiwać wysyłania motywu bez obsługi archiwów zip."
 
-#: lib/themeuploader.php:58 lib/themeuploader.php:61
 msgid "The theme file is missing or the upload failed."
 msgstr "Brak pliku motywu lub wysłanie nie powiodło się."
 
-#: lib/themeuploader.php:91 lib/themeuploader.php:102
-#: lib/themeuploader.php:279 lib/themeuploader.php:283
-#: lib/themeuploader.php:291 lib/themeuploader.php:298
 msgid "Failed saving theme."
 msgstr "Zapisanie motywu nie powiodło się."
 
-#: lib/themeuploader.php:147
 msgid "Invalid theme: bad directory structure."
 msgstr "Nieprawidłowy motyw: błędna struktura katalogów."
 
-#: lib/themeuploader.php:166
 #, php-format
 msgid "Uploaded theme is too large; must be less than %d byte uncompressed."
 msgid_plural ""
@@ -9658,11 +8006,9 @@ msgstr[2] ""
 "Wysłany motyw jest za duży, musi być mniejszy niż %d bajtów po "
 "zdekompresowaniu."
 
-#: lib/themeuploader.php:179
 msgid "Invalid theme archive: missing file css/display.css"
 msgstr "Nieprawidłowe archiwum motywu: brak pliku css/display.css"
 
-#: lib/themeuploader.php:219
 msgid ""
 "Theme contains invalid file or folder name. Stick with ASCII letters, "
 "digits, underscore, and minus sign."
@@ -9670,144 +8016,116 @@ msgstr ""
 "Motyw zawiera nieprawidłowy plik lub nazwę katalogu. Należy używać tylko "
 "liter, cyfr, podkreślników i znaku minus z zestawu ASCII."
 
-#: lib/themeuploader.php:225
 msgid "Theme contains unsafe file extension names; may be unsafe."
 msgstr ""
 "Temat zawiera niebezpieczne rozszerzenie nazwy pliku, co może stanowić "
 "zagrożenie."
 
-#: lib/themeuploader.php:242
 #, php-format
 msgid "Theme contains file of type '.%s', which is not allowed."
 msgstr "Motyw zawiera plik typu \\\".%s\\\", który nie jest dozwolony."
 
-#: lib/themeuploader.php:260
 msgid "Error opening theme archive."
 msgstr "Błąd podczas otwierania archiwum motywu."
 
-#: lib/threadednoticelist.php:270
-#, php-format
-msgid "Show all %d comment"
-msgid_plural "Show all %d comments"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+#, fuzzy, php-format
+msgid "Show %d reply"
+msgid_plural "Show all %d replies"
+msgstr[0] "Wyświetl więcej"
+msgstr[1] "Wyświetl więcej"
+msgstr[2] "Wyświetl więcej"
 
-#: lib/topposterssection.php:74
 msgid "Top posters"
 msgstr "Najczęściej wysyłający wpisy"
 
 #. TRANS: Title for the form to unblock a user.
-#: lib/unblockform.php:67
 msgctxt "TITLE"
 msgid "Unblock"
 msgstr "Odblokowanie"
 
-#: lib/unsandboxform.php:69
 msgid "Unsandbox"
 msgstr "Usuń ograniczenie"
 
-#: lib/unsandboxform.php:80
 msgid "Unsandbox this user"
 msgstr "Usuń ograniczenie tego użytkownika"
 
-#: lib/unsilenceform.php:67
 msgid "Unsilence"
 msgstr "Usuń wyciszenie"
 
-#: lib/unsilenceform.php:78
 msgid "Unsilence this user"
 msgstr "Usuń wyciszenie tego użytkownika"
 
-#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
 msgid "Unsubscribe from this user"
 msgstr "Zrezygnuj z subskrypcji tego użytkownika"
 
-#: lib/unsubscribeform.php:137
 msgid "Unsubscribe"
 msgstr "Zrezygnuj z subskrypcji"
 
 #. 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).
-#: lib/usernoprofileexception.php:60
 #, php-format
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "Użytkownik%1$s (%2$d) nie posiada wpisu profilu."
 
-#: lib/userprofile.php:116
 msgid "Edit Avatar"
 msgstr "Zmodyfikuj awatar"
 
 #. TRANS: H2 for user actions in a profile.
 #. TRANS: H2 for entity actions in a profile.
-#: lib/userprofile.php:216 lib/userprofile.php:232
 msgid "User actions"
 msgstr "Czynności użytkownika"
 
 #. TRANS: Text shown in user profile of not yet compeltely deleted users.
-#: lib/userprofile.php:220
 msgid "User deletion in progress..."
 msgstr "Trwa usuwanie użytkownika..."
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:248
 msgid "Edit profile settings"
 msgstr "Zmodyfikuj ustawienia profilu"
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:250
 msgid "Edit"
 msgstr "Edycja"
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:274
 msgid "Send a direct message to this user"
 msgstr "Wyślij bezpośrednią wiadomość do tego użytkownika"
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:276
 msgid "Message"
 msgstr "Wiadomość"
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:318
 msgid "Moderate"
 msgstr "Moderuj"
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:357
 msgid "User role"
 msgstr "Rola użytkownika"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:360
 msgctxt "role"
 msgid "Administrator"
 msgstr "Administrator"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:362
 msgctxt "role"
 msgid "Moderator"
 msgstr "Moderator"
 
-#: lib/util.php:321
 #, fuzzy
 msgid "Not allowed to log in."
 msgstr "Niezalogowany."
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1337
 msgid "a few seconds ago"
 msgstr "kilka sekund temu"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1340
 msgid "about a minute ago"
 msgstr "około minutę temu"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1344
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
@@ -9816,12 +8134,10 @@ msgstr[1] "około %d minut temu"
 msgstr[2] "około %d minut temu"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1347
 msgid "about an hour ago"
 msgstr "około godzinę temu"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1351
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
@@ -9830,12 +8146,10 @@ msgstr[1] "około %d godzin temu"
 msgstr[2] "około %d godzin temu"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1354
 msgid "about a day ago"
 msgstr "blisko dzień temu"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1358
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
@@ -9844,12 +8158,10 @@ msgstr[1] "około %d dni temu"
 msgstr[2] "około %d dni temu"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1361
 msgid "about a month ago"
 msgstr "około miesiąc temu"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1365
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
@@ -9858,13 +8170,11 @@ msgstr[1] "około %d miesięcy temu"
 msgstr[2] "około %d miesięcy temu"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1368
 msgid "about a year ago"
 msgstr "około rok temu"
 
 #. TRANS: Web color exception thrown when a hexadecimal color code does not validate.
 #. TRANS: %s is the provided (invalid) color code.
-#: lib/webcolor.php:81 lib/webcolor.php:121
 #, php-format
 msgid "%s is not a valid color! Use 3 or 6 hex characters."
 msgstr ""
@@ -9872,195 +8182,31 @@ msgstr ""
 "szesnastkowych."
 
 #. TRANS: Exception.
-#: lib/xrd.php:63
 msgid "Invalid XML."
 msgstr "Nieprawidłowy kod XML."
 
 #. TRANS: Exception.
-#: lib/xrd.php:68
 msgid "Invalid XML, missing XRD root."
 msgstr "Nieprawidłowy kod XML, brak głównego XRD."
 
 #. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
-#: scripts/restoreuser.php:62
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr "Pobieranie kopii zapasowej z pliku \"%s\"."
 
-#~ msgid "Could not generate feed for group - %s"
-#~ msgstr "Nie można utworzyć kanału dla grupy - %s"
+#~ msgid "Full name is too long (max 255 chars)."
+#~ msgstr "Imię i nazwisko jest za długie (maksymalnie 255 znaków)."
+
+#~ msgid "description is too long (max %d chars)."
+#~ msgstr "Opis jest za długi (maksymalnie %d znak)."
+
+#~ msgid "Location is too long (max 255 chars)."
+#~ msgstr "Położenie jest za długie (maksymalnie 255 znaków)."
+
+#~ msgid "Too many aliases! Maximum %d."
+#~ msgstr "Za dużo aliasów. Maksymalnie dozwolony jest %d."
 
 #, fuzzy
-#~ msgid "Current confirmed Jabber/Google Talk address."
-#~ msgstr "Obecnie potwierdzone adresy Jabber/GTalk."
-
-#, fuzzy
-#~ msgid ""
-#~ "Jabber or Google Talk address, like \"UserName@example.org\". First, make "
-#~ "sure to add %s to your buddy list in your IM client or on Google Talk."
-#~ msgstr ""
-#~ "Adres Jabber lub GTalk, taki jak \"NazwaUżytkownika@example.org\". "
-#~ "Najpierw upewnij się, że dodałeś %s do listy znajomych w komunikatorze "
-#~ "lub na GTalk."
-
-#, fuzzy
-#~ msgid "Send me notices through Jabber/Google Talk."
-#~ msgstr "Wyślij mi wpisy przez Jabber/GTalk."
-
-#, fuzzy
-#~ msgid "Publish a MicroID for my Jabber/Google Talk address."
-#~ msgstr "Opublikuj MicroID adresu Jabber/GTalk."
-
-#~ msgid "No Jabber ID."
-#~ msgstr "Brak identyfikatora Jabbera."
-
-#, fuzzy
-#~ msgid "Not a valid Jabber ID."
-#~ msgstr "To nie jest prawidłowy identyfikator Jabbera"
-
-#~ msgid "That is already your Jabber ID."
-#~ msgstr "Ten identyfikator Jabbera jest już twój."
-
-#~ msgid "That is not your Jabber ID."
-#~ msgstr "To nie jest twój identyfikator Jabbera."
-
-#~ msgid "Other settings"
-#~ msgstr "Inne ustawienia"
-
-#~ msgid "Tag cloud"
-#~ msgstr "Chmura znaczników"
-
-#~ msgid "Consumer key"
-#~ msgstr "Klucz klienta"
-
-#~ msgid "Consumer secret"
-#~ msgstr "Sekret klienta"
-
-#~ msgid "Request token URL"
-#~ msgstr "Adres URL tokenu żądania"
-
-#~ msgid "Access token URL"
-#~ msgstr "Adres URL tokenu żądania"
-
-#~ msgid "Authorize URL"
-#~ msgstr "Adres URL upoważnienia"
-
-#~ msgid "Jabber"
-#~ msgstr "Jabber"
-
-#~ msgid "Photo"
-#~ msgstr "Zdjęcie"
-
-#~ msgid "Other options"
-#~ msgstr "Inne opcje"
-
-#~ msgid "Other"
-#~ msgstr "Inne"
-
-#~ msgid "Primary site navigation"
-#~ msgstr "Główna nawigacja witryny"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Personal profile and friends timeline"
-#~ msgstr "Profil osobisty i oś czasu przyjaciół"
-
-#~ msgctxt "MENU"
-#~ msgid "Personal"
-#~ msgstr "Osobiste"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Change your email, avatar, password, profile"
-#~ msgstr "Zmień adres e-mail, awatar, hasło, profil"
-
-#~ msgid "Account"
-#~ msgstr "Konto"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Connect to services"
-#~ msgstr "Połącz z serwisami"
-
-#~ msgid "Connect"
-#~ msgstr "Połącz"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Change site configuration"
-#~ msgstr "Zmień konfigurację witryny"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Invite friends and colleagues to join you on %s"
-#~ msgstr "Zaproś przyjaciół i kolegów do dołączenia do ciebie na %s"
-
-#~ msgctxt "MENU"
-#~ msgid "Invite"
-#~ msgstr "Zaproś"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Create an account"
-#~ msgstr "Utwórz konto"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Help me!"
-#~ msgstr "Pomóż mi."
-
-#~ msgctxt "MENU"
-#~ msgid "Help"
-#~ msgstr "Pomoc"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Search for people or text"
-#~ msgstr "Wyszukaj osoby lub tekst"
-
-#~ msgid "Local views"
-#~ msgstr "Lokalne widoki"
-
-#~ msgid "Page notice"
-#~ msgstr "Wpis strony"
-
-#~ msgid "Secondary site navigation"
-#~ msgstr "Druga nawigacja witryny"
-
-#~ msgid "StatusNet software license"
-#~ msgstr "Licencja oprogramowania StatusNet"
-
-#~ msgid "Site content license"
-#~ msgstr "Licencja zawartości witryny"
-
-#~ msgid "Pagination"
-#~ msgstr "Paginacja"
-
-#~ msgid "Author"
-#~ msgstr "Autor"
-
-#~ msgid "Provider"
-#~ msgstr "Dostawca"
-
-#~ msgctxt "MENU"
-#~ msgid "SMS"
-#~ msgstr "SMS"
-
-#~ msgid "Filter tags"
-#~ msgstr "Filtruj znaczniki"
-
-#~ msgid "[%s]"
-#~ msgstr "[%s]"
-
-#~ msgid "Available characters"
-#~ msgstr "Dostępne znaki"
-
-#, fuzzy
-#~ msgctxt "MENU"
-#~ msgid "Profile"
-#~ msgstr "Profil"
-
-#~ msgid "Search help"
-#~ msgstr "Przeszukaj pomoc"
-
-#~ msgid "Unknown user. Go to %s to add your address to your account"
-#~ msgstr ""
-#~ "Nieznany użytkownik. Proszę przejść na stronę %s i dodać adres do konta"
-
-#~ msgid "Message too long. Maximum is %1$d character, you sent %2$d."
-#~ msgid_plural "Message too long. Maximum is %1$d characters, you sent %2$d."
-#~ msgstr[0] "Wiadomość jest za długa. Maksymalnie %1$d znak, wysłano %2$d."
-#~ msgstr[1] "Wiadomość jest za długa. Maksymalnie %1$d znaki, wysłano %2$d."
-#~ msgstr[2] "Wiadomość jest za długa. Maksymalnie %1$d znaków, wysłano %2$d."
+#~ msgctxt "BUTTON"
+#~ msgid "Comment"
+#~ msgstr "Treść"
diff --git a/locale/pt/LC_MESSAGES/statusnet.po b/locale/pt/LC_MESSAGES/statusnet.po
index 9ef30c1357..5794a3272f 100644
--- a/locale/pt/LC_MESSAGES/statusnet.po
+++ b/locale/pt/LC_MESSAGES/statusnet.po
@@ -16,67 +16,57 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:23+0000\n"
-"PO-Revision-Date: 2011-03-03 17:26:22+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:35+0000\n"
 "Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-02-25 23:49:23+0000\n"
+"X-POT-Import-Date: 2011-03-03 17:59:19+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
-#: actions/accessadminpanel.php:53 lib/adminpanelaction.php:363
 msgid "Access"
 msgstr "Acesso"
 
 #. TRANS: Page notice.
-#: actions/accessadminpanel.php:64
 msgid "Site access settings"
 msgstr "Configurações de acesso ao site"
 
 #. TRANS: Form legend for registration form.
-#: actions/accessadminpanel.php:151
 msgid "Registration"
 msgstr "Registo"
 
 #. TRANS: Checkbox instructions for admin setting "Private".
-#: actions/accessadminpanel.php:155
 msgid "Prohibit anonymous users (not logged in) from viewing site?"
 msgstr "Proibir utilizadores anónimos (sem sessão iniciada) de ver o site?"
 
 #. TRANS: Checkbox label for prohibiting anonymous users from viewing site.
-#: actions/accessadminpanel.php:157
 msgctxt "LABEL"
 msgid "Private"
 msgstr "Privado"
 
 #. TRANS: Checkbox instructions for admin setting "Invite only".
-#: actions/accessadminpanel.php:164
 msgid "Make registration invitation only."
 msgstr "Permitir o registo só a convidados."
 
 #. TRANS: Checkbox label for configuring site as invite only.
-#: actions/accessadminpanel.php:166
 msgid "Invite only"
 msgstr "Só por convite"
 
 #. TRANS: Checkbox instructions for admin setting "Closed" (no new registrations).
-#: actions/accessadminpanel.php:173
 msgid "Disable new registrations."
 msgstr "Impossibilitar registos novos."
 
 #. TRANS: Checkbox label for disabling new user registrations.
-#: actions/accessadminpanel.php:175
 msgid "Closed"
 msgstr "Fechado"
 
 #. TRANS: Title for button to save access settings in site admin panel.
-#: actions/accessadminpanel.php:191
 msgid "Save access settings"
 msgstr "Gravar configurações de acesso"
 
@@ -84,6 +74,7 @@ msgstr "Gravar configurações de acesso"
 #. TRANS: Button text for saving theme settings.
 #. TRANS: Button label to save e-mail preferences.
 #. TRANS: Button label to save IM preferences.
+#. TRANS: Button text in the license admin panel.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
 #. TRANS: Button text for saving site notice in admin panel.
@@ -93,21 +84,12 @@ msgstr "Gravar configurações de acesso"
 #. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
 #. TRANS: Button text on profile design page to save settings.
-#: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
-#: actions/emailsettings.php:251 actions/imsettings.php:199
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:198
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:204
-#: actions/subscriptions.php:261 actions/urlsettings.php:152
-#: actions/useradminpanel.php:298 lib/applicationeditform.php:355
-#: lib/designform.php:320 lib/groupeditform.php:201
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Gravar"
 
 #. TRANS: Server error when page not found (404).
 #. TRANS: Server error when page not found (404)
-#: actions/all.php:68 actions/public.php:98 actions/replies.php:93
-#: actions/showfavorites.php:140 actions/tag.php:52
 msgid "No such page."
 msgstr "Página não foi encontrada."
 
@@ -126,6 +108,7 @@ msgstr "Página não foi encontrada."
 #. TRANS: Client error displayed when checking group membership for a non-existing user.
 #. TRANS: Client error displayed when trying to have a non-existing user join a group.
 #. TRANS: Client error displayed when trying to have a non-existing user leave a group.
+#. TRANS: Client error displayed when not providing a user or an invalid user.
 #. TRANS: Client error displayed when updating a status for a non-existing user.
 #. TRANS: Client error displayed when requesting a list of followers for a non-existing user.
 #. TRANS: Client error displayed when requesting most recent favourite notices by a user for a non-existing user.
@@ -138,6 +121,8 @@ msgstr "Página não foi encontrada."
 #. 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.
 #. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
@@ -145,33 +130,10 @@ msgstr "Página não foi encontrada."
 #. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when calling a profile action without specifying a user.
-#: actions/all.php:80 actions/allrss.php:69
-#: actions/apiaccountupdatedeliverydevice.php:110
-#: actions/apiaccountupdateprofile.php:103
-#: actions/apiaccountupdateprofilebackgroundimage.php:118
-#: actions/apiaccountupdateprofileimage.php:104 actions/apiatomservice.php:59
-#: actions/apiblockcreate.php:96 actions/apiblockdestroy.php:94
-#: actions/apidirectmessage.php:75 actions/apidirectmessagenew.php:72
-#: actions/apigroupcreate.php:111 actions/apigroupismember.php:89
-#: actions/apigroupjoin.php:98 actions/apigroupleave.php:98
-#: actions/apigrouplist.php:70 actions/apigroupprofileupdate.php:108
-#: actions/apistatusesupdate.php:230 actions/apisubscriptions.php:85
-#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:173
-#: actions/apitimelinehome.php:78 actions/apitimelinementions.php:77
-#: actions/apitimelineuser.php:79 actions/avatarbynickname.php:79
-#: actions/favoritesrss.php:72 actions/foaf.php:42 actions/foaf.php:61
-#: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116
-#: actions/otp.php:78 actions/remotesubscribe.php:144
-#: actions/remotesubscribe.php:153 actions/replies.php:73
-#: actions/repliesrss.php:38 actions/rsd.php:113 actions/showfavorites.php:106
-#: actions/userbyid.php:75 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/userxrd.php:59 actions/xrds.php:71 lib/command.php:509
-#: lib/galleryaction.php:59 lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Utilizador não foi encontrado."
 
 #. TRANS: Page title. %1$s is user nickname, %2$d is page number
-#: actions/all.php:91
 #, php-format
 msgid "%1$s and friends, page %2$d"
 msgstr "%1$s e amigos, página %2$d"
@@ -180,33 +142,26 @@ msgstr "%1$s e amigos, página %2$d"
 #. TRANS: H1 text for page. %s is a user nickname.
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Timeline title for user and friends. %s is a user nickname.
-#: actions/all.php:94 actions/all.php:191 actions/allrss.php:117
-#: actions/apitimelinefriends.php:207 actions/apitimelinehome.php:113
-#: lib/personalgroupnav.php:100
 #, php-format
 msgid "%s and friends"
 msgstr "%s e amigos"
 
 #. TRANS: %s is user nickname.
-#: actions/all.php:108
 #, php-format
 msgid "Feed for friends of %s (RSS 1.0)"
 msgstr "Fonte para os amigos de %s (RSS 1.0)"
 
 #. TRANS: %s is user nickname.
-#: actions/all.php:117
 #, php-format
 msgid "Feed for friends of %s (RSS 2.0)"
 msgstr "Fonte para os amigos de %s (RSS 2.0)"
 
 #. TRANS: %s is user nickname.
-#: actions/all.php:126
 #, php-format
 msgid "Feed for friends of %s (Atom)"
 msgstr "Fonte para os amigos de %s (Atom)"
 
 #. TRANS: Empty list message. %s is a user nickname.
-#: actions/all.php:139
 #, php-format
 msgid ""
 "This is the timeline for %s and friends but no one has posted anything yet."
@@ -215,7 +170,6 @@ msgstr ""
 
 #. TRANS: Encouragement displayed on logged in user's empty timeline.
 #. TRANS: This message contains Markdown links. Keep "](" together.
-#: actions/all.php:146
 #, php-format
 msgid ""
 "Try subscribing to more people, [join a group](%%action.groups%%) or post "
@@ -226,7 +180,6 @@ msgstr ""
 
 #. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@".
 #. TRANS: This message contains Markdown links. Keep "](" together.
-#: actions/all.php:150
 #, php-format
 msgid ""
 "You can try to [nudge %1$s](../%2$s) from their profile or [post something "
@@ -239,7 +192,6 @@ msgstr ""
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
 #. TRANS: Second sentence of empty message for anonymous users. %s is a user nickname.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:221
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -249,14 +201,11 @@ msgstr ""
 "%s ou endereçar-lhe uma nota."
 
 #. TRANS: H1 text for page when viewing a list for self.
-#: actions/all.php:188
 msgid "You and friends"
 msgstr "Você e seus amigos"
 
 #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
 #. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name.
-#: actions/allrss.php:122 actions/apitimelinefriends.php:213
-#: actions/apitimelinehome.php:119
 #, php-format
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr "Actualizações de %1$s e amigos no %2$s!"
@@ -275,55 +224,20 @@ msgstr "Actualizações de %1$s e amigos no %2$s!"
 #. TRANS: Client error displayed trying to execute an unknown API method checking group membership.
 #. TRANS: Client error displayed trying to execute an unknown API method listing the latest 20 groups.
 #. TRANS: Client error displayed trying to execute an unknown API method showing group membership.
+#. TRANS: Client error displayed when using an unsupported API format.
 #. TRANS: Client error displayed trying to execute an unknown API method showing a group.
 #. TRANS: Client error displayed trying to execute an unknown API method testing API connectivity.
 #. TRANS: Client error displayed trying to execute an unknown API method deleting a status.
 #. TRANS: Client error displayed when trying to handle an unknown API method.
-#: actions/apiaccountratelimitstatus.php:69
-#: actions/apiaccountupdatedeliverydevice.php:92
-#: actions/apiaccountupdateprofile.php:94
-#: actions/apiaccountupdateprofilebackgroundimage.php:92
-#: actions/apiaccountupdateprofilecolors.php:115
-#: actions/apiaccountverifycredentials.php:68 actions/apidirectmessage.php:157
-#: actions/apifavoritecreate.php:98 actions/apifavoritedestroy.php:98
-#: actions/apifriendshipscreate.php:99 actions/apifriendshipsdestroy.php:99
-#: actions/apifriendshipsshow.php:124 actions/apigroupcreate.php:138
-#: actions/apigroupismember.php:115 actions/apigroupjoin.php:151
-#: actions/apigroupleave.php:141 actions/apigrouplist.php:134
-#: actions/apigrouplistall.php:120 actions/apigroupmembership.php:105
-#: actions/apigroupprofileupdate.php:100 actions/apigroupprofileupdate.php:213
-#: actions/apigroupshow.php:114 actions/apihelptest.php:84
-#: actions/apistatusesdestroy.php:101 actions/apistatusesretweets.php:110
-#: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:139
-#: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
-#: actions/apitimelinefavorites.php:182 actions/apitimelinefriends.php:276
-#: actions/apitimelinegroup.php:148 actions/apitimelinehome.php:181
-#: actions/apitimelinementions.php:182 actions/apitimelinepublic.php:247
-#: actions/apitimelineretweetedtome.php:147
-#: actions/apitimelineretweetsofme.php:147 actions/apitimelinetag.php:165
-#: actions/apitimelineuser.php:217 actions/apiusershow.php:100
 msgid "API method not found."
 msgstr "Método da API não encontrado."
 
 #. 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.
-#: actions/apiaccountupdatedeliverydevice.php:83
-#: actions/apiaccountupdateprofile.php:85
-#: actions/apiaccountupdateprofilebackgroundimage.php:83
-#: actions/apiaccountupdateprofilecolors.php:106
-#: actions/apiaccountupdateprofileimage.php:80 actions/apiblockcreate.php:87
-#: actions/apiblockdestroy.php:85 actions/apidirectmessagenew.php:107
-#: actions/apifavoritecreate.php:88 actions/apifavoritedestroy.php:88
-#: actions/apifriendshipscreate.php:89 actions/apifriendshipsdestroy.php:89
-#: actions/apigroupcreate.php:102 actions/apigroupjoin.php:89
-#: actions/apigroupleave.php:89 actions/apigroupprofileupdate.php:92
-#: actions/apimediaupload.php:66 actions/apistatusesretweet.php:63
-#: actions/apistatusesupdate.php:194
 msgid "This method requires a POST."
 msgstr "Este método requer um POST."
 
 #. TRANS: Client error displayed when no valid device parameter is provided for a user's delivery device setting.
-#: actions/apiaccountupdatedeliverydevice.php:103
 msgid ""
 "You must specify a parameter named 'device' with a value of one of: sms, im, "
 "none."
@@ -337,10 +251,6 @@ msgstr ""
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
-#: actions/apiaccountupdatedeliverydevice.php:136
-#: actions/emailsettings.php:353 actions/emailsettings.php:499
-#: actions/profilesettings.php:323 actions/smssettings.php:300
-#: actions/smssettings.php:453 actions/urlsettings.php:211
 msgid "Could not update user."
 msgstr "Não foi possível actualizar o utilizador."
 
@@ -353,32 +263,17 @@ msgstr "Não foi possível actualizar o utilizador."
 #. TRANS: Server error displayed when requesting Friends of a Friend feed for a user for which the profile could not be found.
 #. TRANS: Server error displayed when trying to get a user hCard for a user without a profile.
 #. TRANS: Server error displayed when calling a profile action while the specified user does not have a profile.
-#: actions/apiaccountupdateprofile.php:111
-#: actions/apiaccountupdateprofilebackgroundimage.php:199
-#: actions/apiaccountupdateprofilecolors.php:183
-#: actions/apiaccountupdateprofileimage.php:131
-#: actions/apiuserprofileimage.php:88 actions/apiusershow.php:108
-#: actions/avatarbynickname.php:85 actions/foaf.php:69 actions/hcard.php:75
-#: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
-#: lib/profileaction.php:85
 msgid "User has no profile."
 msgstr "Utilizador não tem perfil."
 
 #. TRANS: Server error displayed if a user profile could not be saved.
 #. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:419
 msgid "Could not save profile."
 msgstr "Não foi possível gravar o perfil."
 
 #. TRANS: Client error displayed when the number of bytes in a POST request exceeds a limit.
 #. TRANS: %s is the number of bytes of the CONTENT_LENGTH.
 #. TRANS: Form validation error in design settings form. POST should remain untranslated.
-#: actions/apiaccountupdateprofilebackgroundimage.php:108
-#: actions/apiaccountupdateprofileimage.php:95 actions/apimediaupload.php:81
-#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
-#: actions/designadminpanel.php:120 actions/editapplication.php:121
-#: actions/newapplication.php:102 actions/newnotice.php:95
-#: lib/designsettings.php:110
 #, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s byte) due to its "
@@ -398,26 +293,15 @@ msgstr[1] ""
 #. TRANS: Client error displayed when a database error occurs inserting profile colours.
 #. TRANS: Client error displayed when a database error occurs updating profile colours.
 #. TRANS: Form validation error displayed when group design settings could not be saved because of an application issue.
-#: actions/apiaccountupdateprofilebackgroundimage.php:138
-#: actions/apiaccountupdateprofilebackgroundimage.php:149
-#: actions/apiaccountupdateprofilecolors.php:160
-#: actions/apiaccountupdateprofilecolors.php:171
-#: actions/groupdesignsettings.php:285 actions/groupdesignsettings.php:296
-#: actions/userdesignsettings.php:218 actions/userdesignsettings.php:228
-#: actions/userdesignsettings.php:270 actions/userdesignsettings.php:280
 msgid "Unable to save your design settings."
 msgstr "Não foi possível gravar as configurações do estilo."
 
 #. TRANS: Error displayed when updating design settings fails.
 #. TRANS: Client error displayed when a database error occurs updating profile colours.
-#: actions/apiaccountupdateprofilebackgroundimage.php:191
-#: actions/apiaccountupdateprofilecolors.php:139
-#: actions/userdesignsettings.php:196
 msgid "Could not update your design."
 msgstr "Não foi possível actualizar o seu estilo."
 
 #. TRANS: Title for Atom feed.
-#: actions/apiatomservice.php:85
 #, fuzzy
 msgctxt "ATOM"
 msgid "Main"
@@ -427,9 +311,6 @@ msgstr "Principal"
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Title in atom group notice feed. %s is a group name.
 #. TRANS: Title in atom user notice feed. %s is a user name.
-#: actions/apiatomservice.php:93 actions/grouprss.php:138
-#: actions/userrss.php:94 lib/atomgroupnoticefeed.php:63
-#: lib/atomusernoticefeed.php:88
 #, php-format
 msgid "%s timeline"
 msgstr "Notas de %s"
@@ -439,8 +320,6 @@ msgstr "Notas de %s"
 #. TRANS: %s is a user nickname.
 #. TRANS: Header for subscriptions overview for a user (first page).
 #. TRANS: %s is a user nickname.
-#: actions/apiatomservice.php:104 actions/atompubsubscriptionfeed.php:148
-#: actions/subscriptions.php:51
 #, php-format
 msgid "%s subscriptions"
 msgstr "Subscrições de %s"
@@ -448,58 +327,48 @@ msgstr "Subscrições de %s"
 #. TRANS: Title for Atom feed with a user's favorite notices. %s is a user nickname.
 #. TRANS: Title for Atom favorites feed.
 #. TRANS: %s is a user nickname.
-#: actions/apiatomservice.php:115 actions/atompubfavoritefeed.php:142
 #, php-format
 msgid "%s favorites"
 msgstr "Favoritas de %s"
 
 #. TRANS: Title for Atom feed with a user's memberships. %s is a user nickname.
-#: actions/apiatomservice.php:126
 #, fuzzy, php-format
 msgid "%s memberships"
 msgstr "Membros do grupo %s"
 
 #. TRANS: Client error displayed when users try to block themselves.
-#: actions/apiblockcreate.php:105
 msgid "You cannot block yourself!"
 msgstr "Os utilizadores não podem bloquear-se a si próprios!"
 
 #. TRANS: Server error displayed when blocking a user has failed.
-#: actions/apiblockcreate.php:127
 msgid "Block user failed."
 msgstr "Bloqueio do utilizador falhou."
 
 #. TRANS: Server error displayed when unblocking a user has failed.
-#: actions/apiblockdestroy.php:113
 msgid "Unblock user failed."
 msgstr "Desbloqueio do utilizador falhou."
 
 #. TRANS: Title. %s is a user nickname.
-#: actions/apidirectmessage.php:88
 #, php-format
 msgid "Direct messages from %s"
 msgstr "Mensagens directas de %s"
 
 #. TRANS: Subtitle. %s is a user nickname.
-#: actions/apidirectmessage.php:93
 #, php-format
 msgid "All the direct messages sent from %s"
 msgstr "Todas as mensagens directas enviadas por %s"
 
 #. TRANS: Title. %s is a user nickname.
-#: actions/apidirectmessage.php:102
 #, php-format
 msgid "Direct messages to %s"
 msgstr "Mensagens directas para %s"
 
 #. TRANS: Subtitle. %s is a user nickname.
-#: actions/apidirectmessage.php:107
 #, php-format
 msgid "All the direct messages sent to %s"
 msgstr "Todas as mensagens directas enviadas para %s"
 
 #. TRANS: Client error displayed when no message text was submitted (406).
-#: actions/apidirectmessagenew.php:117
 msgid "No message text!"
 msgstr "Mensagem não tem texto!"
 
@@ -507,7 +376,6 @@ msgstr "Mensagem não tem texto!"
 #. TRANS: %d is the maximum number of characters for a message.
 #. TRANS: Form validation error displayed when message content is too long.
 #. TRANS: %d is the maximum number of characters for a message.
-#: actions/apidirectmessagenew.php:127 actions/newmessage.php:152
 #, fuzzy, php-format
 msgid "That's too long. Maximum message size is %d character."
 msgid_plural "That's too long. Maximum message size is %d characters."
@@ -515,19 +383,16 @@ msgstr[0] "Demasiado longo. Tamanho máx. das mensagens é %d caracteres."
 msgstr[1] "Demasiado longo. Tamanho máx. das mensagens é %d caracteres."
 
 #. TRANS: Client error displayed if a recipient user could not be found (403).
-#: actions/apidirectmessagenew.php:139
 msgid "Recipient user not found."
 msgstr "Destinatário não encontrado."
 
 #. TRANS: Client error displayed trying to direct message another user who's not a friend (403).
-#: actions/apidirectmessagenew.php:144
 #, fuzzy
 msgid "Cannot send direct messages to users who aren't your friend."
 msgstr ""
 "Não pode enviar mensagens directas a utilizadores que não sejam amigos."
 
 #. TRANS: Client error displayed trying to direct message self (403).
-#: actions/apidirectmessagenew.php:154
 #, fuzzy
 msgid ""
 "Do not send a message to yourself; just say it to yourself quietly instead."
@@ -536,119 +401,99 @@ msgstr "Não auto-envie uma mensagem; basta lê-la baixinho a si próprio."
 #. 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.
 #. TRANS: Client error displayed trying to delete a status with an invalid ID.
-#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:108
-#: actions/apistatusesdestroy.php:121
 msgid "No status found with that ID."
 msgstr "Nenhum estado encontrado com esse ID."
 
 #. TRANS: Client error displayed when trying to mark a notice favourite that already is a favourite.
-#: actions/apifavoritecreate.php:120
 msgid "This status is already a favorite."
 msgstr "Este estado já é um favorito."
 
 #. TRANS: Client error displayed when marking a notice as favourite fails.
 #. TRANS: Server error displayed when trying to mark a notice as favorite fails in the database.
 #. TRANS: Error message text shown when a favorite could not be set.
-#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:306
 msgid "Could not create favorite."
 msgstr "Não foi possível criar o favorito."
 
 #. TRANS: Client error displayed when trying to remove a favourite that was not a favourite.
-#: actions/apifavoritedestroy.php:122
 msgid "That status is not a favorite."
 msgstr "Esse estado não é um favorito."
 
 #. TRANS: Client error displayed when removing a favourite has failed.
 #. TRANS: Server error displayed when removing a favorite from the database fails.
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:90
 msgid "Could not delete favorite."
 msgstr "Não foi possível eliminar o favorito."
 
 #. TRANS: Client error displayed when trying follow who's profile could not be found.
-#: actions/apifriendshipscreate.php:109
 msgid "Could not follow user: profile not found."
 msgstr "Não foi possível seguir o utilizador: o perfil não foi encontrado."
 
 #. TRANS: Client error displayed when trying to follow a user that's already being followed.
 #. TRANS: %s is the nickname of the user that is already being followed.
-#: actions/apifriendshipscreate.php:120
 #, php-format
 msgid "Could not follow user: %s is already on your list."
 msgstr "Não foi possível seguir utilizador: %s já está na sua lista."
 
 #. TRANS: Client error displayed when trying to unfollow a user that cannot be found.
-#: actions/apifriendshipsdestroy.php:109
 msgid "Could not unfollow user: User not found."
 msgstr ""
 "Não foi possível deixar de seguir utilizador: Utilizador não encontrado."
 
 #. TRANS: Client error displayed when trying to unfollow self.
-#: actions/apifriendshipsdestroy.php:121
 msgid "You cannot unfollow yourself."
 msgstr "Não pode deixar de seguir-se a si próprio."
 
 #. TRANS: Client error displayed when supplying invalid parameters to an API call checking if a friendship exists.
-#: actions/apifriendshipsexists.php:88
 #, fuzzy
 msgid "Two valid IDs or nick names must be supplied."
 msgstr "Têm de ser fornecidos dois IDs ou nomes de utilizador válidos."
 
 #. TRANS: Client error displayed when a source user could not be determined showing friendship.
-#: actions/apifriendshipsshow.php:131
 msgid "Could not determine source user."
 msgstr "Não foi possível determinar o utilizador de origem."
 
 #. TRANS: Client error displayed when a target user could not be determined showing friendship.
-#: actions/apifriendshipsshow.php:140
 msgid "Could not find target user."
 msgstr "Não foi possível encontrar o utilizador de destino."
 
 #. TRANS: Client error trying to create a group with a nickname this is already in use.
+#. TRANS: API validation exception thrown when nickname is already used.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:156 actions/apigroupprofileupdate.php:255
-#: actions/editgroup.php:191 actions/newgroup.php:137
-#: actions/profilesettings.php:274 actions/register.php:199
 msgid "Nickname already in use. Try another one."
 msgstr "Utilizador já é usado. Tente outro."
 
 #. TRANS: Client error in form for group creation.
+#. TRANS: API validation exception thrown when nickname does not validate.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:164 actions/apigroupprofileupdate.php:259
-#: actions/editgroup.php:195 actions/newgroup.php:141
-#: actions/profilesettings.php:244 actions/register.php:201
 msgid "Not a valid nickname."
 msgstr "Utilizador não é válido."
 
 #. TRANS: Client error in form for group creation.
+#. TRANS: API validation exception thrown when homepage URL does not validate.
 #. TRANS: Validation error shown when providing an invalid homepage URL in the "Edit application" form.
 #. TRANS: Group edit form validation error.
 #. TRANS: Validation error shown when providing an invalid homepage URL in the "New application" form.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:181 actions/apigroupprofileupdate.php:277
-#: actions/editapplication.php:235 actions/editgroup.php:202
-#: actions/newapplication.php:221 actions/newgroup.php:148
-#: actions/profilesettings.php:249 actions/register.php:208
 msgid "Homepage is not a valid URL."
 msgstr "Página de ínicio não é uma URL válida."
 
 #. TRANS: Client error in form for group creation.
+#. TRANS: API validation exception thrown when full name does not validate.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:191 actions/editgroup.php:206
-#: actions/newgroup.php:152 actions/profilesettings.php:253
-#: actions/register.php:211
 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "Nome completo demasiado longo (máx. 255 caracteres)."
 
 #. TRANS: Client error shown when providing too long a description during group creation.
 #. TRANS: %d is the maximum number of allowed characters.
+#. TRANS: API validation exception thrown when description does not validate.
+#. TRANS: %d is the maximum description length and used for plural.
 #. TRANS: Validation error shown when providing too long a description in the "Edit application" form.
 #. TRANS: %d is the maximum number of allowed characters.
 #. TRANS: Group edit form validation error.
@@ -656,9 +501,6 @@ msgstr "Nome completo demasiado longo (máx. 255 caracteres)."
 #. TRANS: %d is the maximum number of characters for the description.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed characters.
-#: actions/apigroupcreate.php:201 actions/editapplication.php:202
-#: actions/editgroup.php:211 actions/newapplication.php:182
-#: actions/newgroup.php:157
 #, fuzzy, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."
@@ -666,24 +508,22 @@ msgstr[0] "Descrição demasiado longa (máx. %d caracteres)."
 msgstr[1] "Descrição demasiado longa (máx. %d caracteres)."
 
 #. TRANS: Client error shown when providing too long a location during group creation.
+#. TRANS: API validation exception thrown when location does not validate.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:215 actions/editgroup.php:218
-#: actions/newgroup.php:164 actions/profilesettings.php:266
-#: actions/register.php:220
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
 msgstr "Localidade demasiado longa (máx. 255 caracteres)."
 
 #. TRANS: Client error shown when providing too many aliases during group creation.
 #. TRANS: %d is the maximum number of allowed aliases.
+#. TRANS: API validation exception thrown when aliases do not validate.
+#. TRANS: %d is the maximum number of aliases and used for plural.
 #. TRANS: Group edit form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.
-#: actions/apigroupcreate.php:236 actions/editgroup.php:231
-#: actions/newgroup.php:177
 #, fuzzy, php-format
 msgid "Too many aliases! Maximum %d allowed."
 msgid_plural "Too many aliases! Maximum %d allowed."
@@ -692,25 +532,24 @@ msgstr[1] "Demasiados nomes alternativos! Máx. %d."
 
 #. TRANS: Client error shown when providing an invalid alias during group creation.
 #. TRANS: %s is the invalid alias.
-#: actions/apigroupcreate.php:253
+#. TRANS: API validation exception thrown when aliases does not validate.
+#. TRANS: %s is the invalid alias.
 #, php-format
 msgid "Invalid alias: \"%s\"."
 msgstr "Nome alternativo inválido: \"%s\""
 
 #. TRANS: Client error displayed when trying to use an alias during group creation that is already in use.
 #. TRANS: %s is the alias that is already in use.
+#. TRANS: API validation exception thrown when aliases is already used.
+#. TRANS: %s is the already used alias.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error. %s is the already used alias.
-#: actions/apigroupcreate.php:264 actions/apigroupprofileupdate.php:351
-#: actions/editgroup.php:246 actions/newgroup.php:193
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "Nome alternativo \"%s\" já em uso. Tente outro."
 
 #. TRANS: Client error displayed when trying to use an alias during group creation that is the same as the group's nickname.
 #. TRANS: Group edit form validation error.
-#: actions/apigroupcreate.php:278 actions/apigroupprofileupdate.php:359
-#: actions/editgroup.php:253
 msgid "Alias can't be the same as nickname."
 msgstr "Um nome alternativo não pode ser igual ao nome do utilizador."
 
@@ -718,26 +557,21 @@ msgstr "Um nome alternativo não pode ser igual ao nome do utilizador."
 #. TRANS: Client error displayed when trying to join a group that does not exist.
 #. TRANS: Client error displayed when trying to leave a group that does not exist.
 #. TRANS: Client error displayed trying to show group membership on a non-existing group.
+#. TRANS: Client error displayed when not providing a group or an invalid group.
 #. TRANS: Client error displayed when trying to show a group that could not be found.
 #. TRANS: Client error displayed requesting most recent notices to a group for a non-existing group.
-#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
-#: actions/apigroupleave.php:104 actions/apigroupmembership.php:71
-#: actions/apigroupprofileupdate.php:113 actions/apigroupshow.php:81
-#: actions/apitimelinegroup.php:89
 msgid "Group not found."
 msgstr "Grupo não foi encontrado."
 
 #. TRANS: Server error displayed when trying to join a group the user is already a member of.
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:345
 msgid "You are already a member of that group."
 msgstr "Já é membro desse grupo."
 
 #. TRANS: Server error displayed when trying to join a group the user is blocked from joining.
 #. 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.
-#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:350
 msgid "You have been blocked from that group by the admin."
 msgstr "Foi bloqueado desse grupo pelo gestor."
 
@@ -745,13 +579,11 @@ msgstr "Foi bloqueado desse grupo pelo gestor."
 #. TRANS: %1$s is the joining user's nickname, $2$s is the group nickname for which the join failed.
 #. TRANS: Message given having failed to add a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:136 actions/joingroup.php:139 lib/command.php:362
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "Não foi possível adicionar %1$s ao grupo %2$s."
 
 #. TRANS: Server error displayed when trying to leave a group the user is not a member of.
-#: actions/apigroupleave.php:115
 msgid "You are not a member of this group."
 msgstr "Não é membro deste grupo."
 
@@ -759,116 +591,79 @@ msgstr "Não é membro deste grupo."
 #. TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
 #. TRANS: Message given having failed to remove a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupleave.php:127 actions/leavegroup.php:133
-#: lib/command.php:410
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
 msgstr "Não foi possível remover %1$s do grupo %2$s."
 
 #. TRANS: Used as title in check for group membership. %s is a user name.
-#: actions/apigrouplist.php:94
 #, php-format
 msgid "%s's groups"
 msgstr "Grupos de %s"
 
 #. TRANS: Used as subtitle in check for group membership. %1$s is a user name, %2$s is the site name.
-#: actions/apigrouplist.php:104
 #, php-format
 msgid "%1$s groups %2$s is a member of."
 msgstr "Grupos de %1$s de que %2$s é membro."
 
 #. TRANS: Message is used as a title when listing the lastest 20 groups. %s is a site name.
 #. TRANS: Message is used as a page title. %s is a nick name.
-#: actions/apigrouplistall.php:88 actions/usergroups.php:63
 #, php-format
 msgid "%s groups"
 msgstr "Grupos de %s"
 
 #. TRANS: Message is used as a subtitle when listing the lastest 20 groups. %s is a site name.
-#: actions/apigrouplistall.php:93
 #, php-format
 msgid "groups on %s"
 msgstr "Grupos em %s"
 
+#. TRANS: Client error displayed when trying to edit a group without being an admin.
 #. TRANS: Client error displayed trying to edit a group while not being a group admin.
 #. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
 #. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
-#: actions/apigroupprofileupdate.php:118 actions/editgroup.php:110
-#: actions/editgroup.php:176 actions/groupdesignsettings.php:109
-#: actions/grouplogo.php:111
 msgid "You must be an admin to edit the group."
 msgstr "Tem de ser administrador para editar o grupo."
 
+#. TRANS: Server error displayed when group update fails.
 #. TRANS: Server error displayed when editing a group fails.
-#: actions/apigroupprofileupdate.php:171 actions/editgroup.php:274
 msgid "Could not update group."
 msgstr "Não foi possível actualizar o grupo."
 
+#. TRANS: Server error displayed when adding group aliases fails.
 #. TRANS: Server error displayed when group aliases could not be added.
 #. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/apigroupprofileupdate.php:194 actions/editgroup.php:281
-#: classes/User_group.php:540
 msgid "Could not create aliases."
 msgstr "Não foi possível criar os nomes alternativos."
 
+#. TRANS: API validation exception thrown when nickname does not validate.
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: actions/apigroupprofileupdate.php:249 lib/nickname.php:165
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr "Utilizador só deve conter letras minúsculas e números. Sem espaços."
 
-#: actions/apigroupprofileupdate.php:286
-#, fuzzy
-msgid "Full name is too long (max 255 chars)."
-msgstr "Nome completo demasiado longo (máx. 255 caracteres)."
-
-#: actions/apigroupprofileupdate.php:296
-#, fuzzy, php-format
-msgid "description is too long (max %d chars)."
-msgstr "Descrição demasiado longa (máx. %d caracteres)."
-
-#: actions/apigroupprofileupdate.php:307
-#, fuzzy
-msgid "Location is too long (max 255 chars)."
-msgstr "Localidade demasiado longa (máx. 255 caracteres)."
-
-#: actions/apigroupprofileupdate.php:326
-#, fuzzy, php-format
-msgid "Too many aliases! Maximum %d."
-msgstr "Demasiados nomes alternativos! Máx. %d."
-
-#. TRANS: Group edit form validation error.
+#. TRANS: API validation exception thrown when alias is the same as nickname.
 #. TRANS: Group create form validation error.
-#. TRANS: %s is the invalid alias.
-#: actions/apigroupprofileupdate.php:342 actions/editgroup.php:241
-#: actions/newgroup.php:188
-#, php-format
-msgid "Invalid alias: \"%s\""
-msgstr "Nome alternativo inválido: \"%s\""
+#, fuzzy
+msgid "Alias cannot be the same as nickname."
+msgstr "Um nome alternativo não pode ser igual ao nome do utilizador."
 
 #. TRANS: Client error displayed when uploading a media file has failed.
-#: actions/apimediaupload.php:101
 msgid "Upload failed."
 msgstr "O upload falhou."
 
 #. TRANS: Client error given from the OAuth API when the request token or verifier is invalid.
-#: actions/apioauthaccesstoken.php:102
 #, fuzzy
 msgid "Invalid request token or verifier."
 msgstr "Chave de entrada especificada é inválida."
 
 #. TRANS: Client error given when no oauth_token was passed to the OAuth API.
-#: actions/apioauthauthorize.php:107
 msgid "No oauth_token parameter provided."
 msgstr "Não foi fornecido o parâmetro oauth_token."
 
 #. TRANS: Client error given when an invalid request token was passed to the OAuth API.
-#: actions/apioauthauthorize.php:115 actions/apioauthauthorize.php:129
 #, fuzzy
 msgid "Invalid request token."
 msgstr "Chave inválida."
 
 #. TRANS: Client error given when an invalid request token was passed to the OAuth API.
-#: actions/apioauthauthorize.php:121
 #, fuzzy
 msgid "Request token already authorized."
 msgstr "Não tem autorização."
@@ -879,31 +674,14 @@ msgstr "Não tem autorização."
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
 #. TRANS: Client error displayed when the session token is not okay.
-#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:75
-#: actions/emailsettings.php:292 actions/favor.php:75 actions/geocode.php:55
-#: actions/groupblock.php:65 actions/grouplogo.php:321
-#: actions/groupunblock.php:65 actions/imsettings.php:241
-#: actions/invite.php:60 actions/makeadmin.php:66 actions/newmessage.php:135
-#: actions/newnotice.php:105 actions/nudge.php:80
-#: actions/oauthappssettings.php:162 actions/oauthconnectionssettings.php:135
-#: actions/passwordsettings.php:137 actions/pluginenable.php:87
-#: actions/profilesettings.php:218 actions/recoverpassword.php:383
-#: actions/register.php:157 actions/remotesubscribe.php:76
-#: actions/repeat.php:82 actions/smssettings.php:249 actions/subedit.php:40
-#: actions/subscribe.php:87 actions/tagother.php:145
-#: actions/unsubscribe.php:69 actions/urlsettings.php:171
-#: actions/userauthorization.php:53 lib/designsettings.php:122
 msgid "There was a problem with your session token. Try again, please."
 msgstr "Ocorreu um problema com a sua sessão. Por favor, tente novamente."
 
 #. TRANS: Form validation error given when an invalid username and/or password was passed to the OAuth API.
-#: actions/apioauthauthorize.php:168
 msgid "Invalid nickname / password!"
 msgstr "Utilizador ou senha inválidos!"
 
 #. TRANS: Server error displayed when a database action fails.
-#: actions/apioauthauthorize.php:217
 #, fuzzy
 msgid "Database error inserting oauth_token_association."
 msgstr "Erro na base de dados ao inserir o utilizador da aplicação OAuth."
@@ -920,28 +698,19 @@ msgstr "Erro na base de dados ao inserir o utilizador da aplicação OAuth."
 #. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
 #. TRANS: Message given submitting a form with an unknown action in SMS settings.
 #. TRANS: Unknown form validation error in design settings form.
-#: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
-#: actions/designadminpanel.php:100 actions/editapplication.php:144
-#: actions/emailsettings.php:311 actions/grouplogo.php:332
-#: actions/imsettings.php:256 actions/newapplication.php:124
-#: actions/oauthconnectionssettings.php:144 actions/recoverpassword.php:46
-#: actions/smssettings.php:270 lib/designsettings.php:133
 msgid "Unexpected form submission."
 msgstr "Envio inesperado de formulário."
 
 #. TRANS: Title for a page where a user can confirm/deny account access by an external application.
-#: actions/apioauthauthorize.php:387
 msgid "An application would like to connect to your account"
 msgstr "Uma aplicação pretende ligar-se à sua conta"
 
 #. TRANS: Fieldset legend.
-#: actions/apioauthauthorize.php:404
 msgid "Allow or deny access"
 msgstr "Permitir ou negar acesso"
 
 #. TRANS: User notification of external application requesting account access.
 #. TRANS: %3$s is the access type requested (read-write or read-only), %4$s is the StatusNet sitename.
-#: actions/apioauthauthorize.php:425
 #, fuzzy, php-format
 msgid ""
 "An application would like the ability to <strong>%3$s</strong> your %4$s "
@@ -955,7 +724,6 @@ msgstr ""
 #. TRANS: User notification of external application requesting account access.
 #. TRANS: %1$s is the application name requesting access, %2$s is the organisation behind the application,
 #. TRANS: %3$s is the access type requested, %4$s is the StatusNet sitename.
-#: actions/apioauthauthorize.php:433
 #, php-format
 msgid ""
 "The application <strong>%1$s</strong> by <strong>%2$s</strong> would like "
@@ -967,23 +735,19 @@ msgstr ""
 "permitir acesso à sua conta %4$s a terceiros da sua confiança."
 
 #. TRANS: Fieldset legend.
-#: actions/apioauthauthorize.php:455
 #, fuzzy
 msgctxt "LEGEND"
 msgid "Account"
 msgstr "Conta"
 
 #. TRANS: Field label on OAuth API authorisation form.
+#. TRANS: Field label on login page.
 #. TRANS: Field label in form for profile settings.
-#: actions/apioauthauthorize.php:459 actions/login.php:225
-#: actions/profilesettings.php:107 actions/register.php:411
-#: actions/userauthorization.php:145 lib/groupeditform.php:145
 msgid "Nickname"
 msgstr "Utilizador"
 
 #. TRANS: Field label on OAuth API authorisation form.
-#: actions/apioauthauthorize.php:463 actions/login.php:228
-#: actions/register.php:415 lib/settingsnav.php:87
+#. TRANS: Field label on login page.
 msgid "Password"
 msgstr "Senha"
 
@@ -993,47 +757,38 @@ msgstr "Senha"
 #. TRANS: Button label to cancel an IM address confirmation procedure.
 #. TRANS: Button label to cancel a SMS address confirmation procedure.
 #. TRANS: Button label in the "Edit application" form.
-#: actions/apioauthauthorize.php:478 actions/emailsettings.php:125
-#: actions/imsettings.php:136 actions/smssettings.php:132
-#: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Cancel"
 msgstr "Cancelar"
 
 #. TRANS: Button text that when clicked will allow access to an account by an external application.
-#: actions/apioauthauthorize.php:485
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Allow"
 msgstr "Permitir"
 
 #. TRANS: Form instructions.
-#: actions/apioauthauthorize.php:502
 #, fuzzy
 msgid "Authorize access to your account information."
 msgstr "Permitir ou negar acesso à informação da sua conta."
 
 #. TRANS: Header for user notification after revoking OAuth access to an application.
-#: actions/apioauthauthorize.php:594
 #, fuzzy
 msgid "Authorization canceled."
 msgstr "Confirmação do mensageiro instantâneo cancelada."
 
 #. TRANS: User notification after revoking OAuth access to an application.
 #. TRANS: %s is an OAuth token.
-#: actions/apioauthauthorize.php:598
 #, fuzzy, php-format
 msgid "The request token %s has been revoked."
 msgstr "A chave de pedido %s foi negada e retirada."
 
 #. TRANS: Title of the page notifying the user that an anonymous client application was successfully authorized to access the user's account with OAuth.
-#: actions/apioauthauthorize.php:621
 #, fuzzy
 msgid "You have successfully authorized the application"
 msgstr "Não tem autorização."
 
 #. TRANS: Message notifying the user that an anonymous client application was successfully authorized to access the user's account with OAuth.
-#: actions/apioauthauthorize.php:625
 msgid ""
 "Please return to the application and enter the following security code to "
 "complete the process."
@@ -1041,14 +796,12 @@ msgstr ""
 
 #. TRANS: Title of the page notifying the user that the client application was successfully authorized to access the user's account with OAuth.
 #. TRANS: %s is the authorised application name.
-#: actions/apioauthauthorize.php:632
 #, fuzzy, php-format
 msgid "You have successfully authorized %s"
 msgstr "Não tem autorização."
 
 #. TRANS: Message notifying the user that the client application was successfully authorized to access the user's account with OAuth.
 #. TRANS: %s is the authorised application name.
-#: actions/apioauthauthorize.php:639
 #, php-format
 msgid ""
 "Please return to %s and enter the following security code to complete the "
@@ -1057,12 +810,10 @@ msgstr ""
 
 #. TRANS: Client error displayed trying to delete a status not using POST or DELETE.
 #. TRANS: POST and DELETE should not be translated.
-#: actions/apistatusesdestroy.php:111
 msgid "This method requires a POST or DELETE."
 msgstr "Este método requer um POST ou DELETE."
 
 #. TRANS: Client error displayed trying to delete a status of another user.
-#: actions/apistatusesdestroy.php:136
 msgid "You may not delete another user's status."
 msgstr "Não pode apagar o estado de outro utilizador."
 
@@ -1070,21 +821,16 @@ msgstr "Não pode apagar o estado de outro utilizador."
 #. TRANS: Client error displayed trying to display redents of a non-exiting notice.
 #. TRANS: Client exception thrown when referencing a non-existing notice.
 #. TRANS: Error message displayed trying to delete a non-existing notice.
-#: actions/apistatusesretweet.php:74 actions/apistatusesretweets.php:70
-#: actions/atompubshowfavorite.php:82 actions/deletenotice.php:61
-#: actions/shownotice.php:92
 msgid "No such notice."
 msgstr "Nota não foi encontrada."
 
 #. TRANS: Client error displayed trying to repeat an own notice through the API.
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:549
 msgid "Cannot repeat your own notice."
 msgstr "Não pode repetir a sua própria nota."
 
 #. TRANS: Client error displayed trying to re-repeat a notice through the API.
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:92 lib/command.php:555
 msgid "Already repeated that notice."
 msgstr "Já repetiu essa nota."
 
@@ -1094,59 +840,45 @@ msgstr "Já repetiu essa nota."
 #. TRANS: Client exception thrown when using an unsupported HTTP method.
 #. TRANS: Client error shown when using a non-supported HTTP method.
 #. TRANS: Client exception thrown when using an unsupported HTTP method.
-#: actions/apistatusesshow.php:118 actions/atompubfavoritefeed.php:103
-#: actions/atompubmembershipfeed.php:105 actions/atompubshowfavorite.php:117
-#: actions/atompubshowmembership.php:116
-#: actions/atompubshowsubscription.php:122
-#: actions/atompubsubscriptionfeed.php:109
 #, fuzzy
 msgid "HTTP method not supported."
 msgstr "Método da API não encontrado."
 
 #. TRANS: Exception thrown requesting an unsupported notice output format.
 #. TRANS: %s is the requested output format.
-#: actions/apistatusesshow.php:144
 #, fuzzy, php-format
 msgid "Unsupported format: %s."
 msgstr "Formato não suportado."
 
 #. TRANS: Client error displayed requesting a deleted status.
-#: actions/apistatusesshow.php:155
 msgid "Status deleted."
 msgstr "Estado apagado."
 
 #. TRANS: Client error displayed requesting a status with an invalid ID.
-#: actions/apistatusesshow.php:162
 msgid "No status with that ID found."
 msgstr "Não foi encontrado um estado com esse ID."
 
 #. TRANS: Client error displayed when trying to delete a notice not using the Atom format.
-#: actions/apistatusesshow.php:227
 msgid "Can only delete using the Atom format."
 msgstr ""
 
 #. TRANS: Client error displayed when a user has no rights to delete notices of other users.
 #. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
-#: actions/apistatusesshow.php:235 actions/deletenotice.php:78
 #, fuzzy
 msgid "Cannot delete this notice."
 msgstr "Nota não pode ser apagada."
 
 #. TRANS: Confirmation of notice deletion in API. %d is the ID (number) of the deleted notice.
-#: actions/apistatusesshow.php:249
 #, fuzzy, php-format
 msgid "Deleted notice %d"
 msgstr "Apagar nota"
 
 #. TRANS: Client error displayed when the parameter "status" is missing.
-#: actions/apistatusesupdate.php:221
 msgid "Client must provide a 'status' parameter with a value."
 msgstr "O cliente tem de fornecer um parâmetro 'status' com um valor."
 
 #. TRANS: Client error displayed when the parameter "status" is missing.
 #. TRANS: %d is the maximum number of character for a notice.
-#: actions/apistatusesupdate.php:244 actions/newnotice.php:161
-#: lib/mailhandler.php:60
 #, fuzzy, php-format
 msgid "That's too long. Maximum notice size is %d character."
 msgid_plural "That's too long. Maximum notice size is %d characters."
@@ -1154,14 +886,12 @@ msgstr[0] "Demasiado longo. Tamanho máx. das notas é %d caracteres."
 msgstr[1] "Demasiado longo. Tamanho máx. das notas é %d caracteres."
 
 #. TRANS: Client error displayed when replying to a non-existing notice.
-#: actions/apistatusesupdate.php:284
 #, fuzzy
 msgid "Parent notice not found."
 msgstr "Método da API não encontrado."
 
 #. TRANS: Client error displayed exceeding the maximum notice length.
 #. TRANS: %d is the maximum lenth for a notice.
-#: actions/apistatusesupdate.php:308 actions/newnotice.php:184
 #, fuzzy, php-format
 msgid "Maximum notice size is %d character, including attachment URL."
 msgid_plural "Maximum notice size is %d characters, including attachment URL."
@@ -1170,13 +900,11 @@ msgstr[1] "Tamanho máx. das notas é %d caracteres, incluindo a URL do anexo."
 
 #. TRANS: Client error displayed when requesting profiles of followers in an unsupported format.
 #. TRANS: Client error displayed when requesting IDs of followers in an unsupported format.
-#: actions/apisubscriptions.php:228 actions/apisubscriptions.php:258
 msgid "Unsupported format."
 msgstr "Formato não suportado."
 
 #. TRANS: Title for timeline of most recent favourite notices by a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname.
-#: actions/apitimelinefavorites.php:108
 #, php-format
 msgid "%1$s / Favorites from %2$s"
 msgstr "%1$s / Favoritas de %2$s"
@@ -1184,14 +912,12 @@ msgstr "%1$s / Favoritas de %2$s"
 #. TRANS: Subtitle for timeline of most recent favourite notices by a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user's full name,
 #. TRANS: %3$s is a user nickname.
-#: actions/apitimelinefavorites.php:120
 #, fuzzy, php-format
 msgid "%1$s updates favorited by %2$s / %3$s."
 msgstr "%1$s actualizações preferidas por %2$s / %2$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.
-#: actions/apitimelinementions.php:115
 #, php-format
 msgid "%1$s / Updates mentioning %2$s"
 msgstr "%1$s / Actualizações que mencionam %2$s"
@@ -1199,49 +925,41 @@ msgstr "%1$s / Actualizações que mencionam %2$s"
 #. TRANS: Subtitle for timeline of most recent mentions of a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname,
 #. TRANS: %3$s is a user's full name.
-#: actions/apitimelinementions.php:131
 #, php-format
 msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr "%1$s actualizações em resposta a actualizações de %2$s / %3$s."
 
 #. TRANS: Title for site timeline. %s is the StatusNet sitename.
 #. TRANS: Public RSS feed title. %s is the StatusNet site name.
-#: actions/apitimelinepublic.php:193 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "Notas públicas de %s"
 
 #. TRANS: Subtitle for site timeline. %s is the StatusNet sitename.
-#: actions/apitimelinepublic.php:199
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "%s actualizações de todos!"
 
 #. TRANS: Server error displayed calling unimplemented API method for 'retweeted by me'.
-#: actions/apitimelineretweetedbyme.php:71
 #, fuzzy
 msgid "Unimplemented."
 msgstr "Método não implementado."
 
 #. TRANS: Title for Atom feed "repeated to me". %s is the user nickname.
-#: actions/apitimelineretweetedtome.php:96
 #, php-format
 msgid "Repeated to %s"
 msgstr "Repetida para %s"
 
-#: actions/apitimelineretweetedtome.php:98
 #, fuzzy, php-format
 msgid "%1$s notices that were to repeated to %2$s / %3$s."
 msgstr "%1$s actualizações em resposta a actualizações de %2$s / %3$s."
 
 #. TRANS: Title of list of repeated notices of the logged in user.
 #. TRANS: %s is the nickname of the logged in user.
-#: actions/apitimelineretweetsofme.php:98
 #, php-format
 msgid "Repeats of %s"
 msgstr "Repetições de %s"
 
-#: actions/apitimelineretweetsofme.php:104
 #, fuzzy, php-format
 msgid "%1$s notices that %2$s / %3$s has repeated."
 msgstr "%s (@%s) adicionou a sua nota às favoritas."
@@ -1250,79 +968,64 @@ msgstr "%s (@%s) adicionou a sua nota às favoritas."
 #. TRANS: %s is the tag.
 #. TRANS: Title for first page of notices with tags.
 #. TRANS: %s is the tag.
-#: actions/apitimelinetag.php:101 actions/tag.php:69
 #, php-format
 msgid "Notices tagged with %s"
 msgstr "Notas categorizadas com %s"
 
 #. TRANS: Subtitle for timeline with lastest notices with a given tag.
 #. TRANS: %1$s is the tag, $2$s is the StatusNet sitename.
-#: actions/apitimelinetag.php:105 actions/tagrss.php:65
 #, php-format
 msgid "Updates tagged with %1$s on %2$s!"
 msgstr "Actualizações categorizadas com %1$s em %2$s!"
 
 #. TRANS: Client error displayed trying to add a notice to another user's timeline.
-#: actions/apitimelineuser.php:308
 #, fuzzy
 msgid "Only the user can add to their own timeline."
 msgstr "Só o próprio utilizador pode ler a sua caixa de correio."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:315
 msgid "Only accept AtomPub for Atom feeds."
 msgstr ""
 
 #. TRANS: Client error displayed attempting to post an empty API notice.
-#: actions/apitimelineuser.php:322
 msgid "Atom post must not be empty."
 msgstr ""
 
 #. TRANS: Client error displayed attempting to post an API that is not well-formed XML.
-#: actions/apitimelineuser.php:328
 msgid "Atom post must be well-formed XML."
 msgstr ""
 
 #. TRANS: Client error displayed when not using an Atom entry.
-#: actions/apitimelineuser.php:334 actions/atompubfavoritefeed.php:228
-#: actions/atompubmembershipfeed.php:230
-#: actions/atompubsubscriptionfeed.php:236
 msgid "Atom post must be an Atom entry."
 msgstr ""
 
 #. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
-#: actions/apitimelineuser.php:345
 msgid "Can only handle POST activities."
 msgstr ""
 
 #. TRANS: Client error displayed when using an unsupported activity object type.
 #. TRANS: %s is the unsupported activity object type.
-#: actions/apitimelineuser.php:356
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
 #. TRANS: %d is the notice ID (number).
-#: actions/apitimelineuser.php:390
 #, fuzzy, php-format
 msgid "No content for notice %d."
 msgstr "Procurar no conteúdo das notas"
 
 #. TRANS: Client error displayed when using another format than AtomPub.
 #. TRANS: %s is the notice URI.
-#: actions/apitimelineuser.php:419
 #, fuzzy, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "Não existe nenhuma nota com essa identificação."
 
 #. TRANS: Server error for unfinished API method showTrends.
-#: actions/apitrends.php:85
 msgid "API method under construction."
 msgstr "Método da API em desenvolvimento."
 
 #. TRANS: Client error displayed when requesting user information for a non-existing user.
-#: actions/apiuserprofileimage.php:80 actions/apiusershow.php:94
 #, fuzzy
 msgid "User not found."
 msgstr "Método da API não encontrado."
@@ -1330,102 +1033,84 @@ msgstr "Método da API não encontrado."
 #. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
 #. TRANS: Client exception.
 #. TRANS: Client error displayed trying to subscribe to a non-existing profile.
-#: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
-#: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
-#: actions/subscribe.php:110
 msgid "No such profile."
 msgstr "Perfil não foi encontrado."
 
 #. TRANS: Subtitle for Atom favorites feed.
 #. TRANS: %1$s is a user nickname, %2$s is the StatusNet sitename.
-#: actions/atompubfavoritefeed.php:147
 #, fuzzy, php-format
 msgid "Notices %1$s has favorited on %2$s"
 msgstr "Actualizações de %1$s e amigos no %2$s!"
 
 #. TRANS: Client exception thrown when trying to set a favorite for another user.
 #. TRANS: Client exception thrown when trying to subscribe another user.
-#: actions/atompubfavoritefeed.php:217 actions/atompubsubscriptionfeed.php:225
 #, fuzzy
 msgid "Cannot add someone else's subscription."
 msgstr "Não foi possível inserir nova subscrição."
 
 #. TRANS: Client exception thrown when trying use an incorrect activity verb for the Atom pub method.
-#: actions/atompubfavoritefeed.php:240
 #, fuzzy
 msgid "Can only handle favorite activities."
 msgstr "Procurar no conteúdo das notas"
 
 #. TRANS: Client exception thrown when trying favorite an object that is not a notice.
-#: actions/atompubfavoritefeed.php:250 actions/atompubmembershipfeed.php:250
 #, fuzzy
 msgid "Can only fave notices."
 msgstr "Procurar no conteúdo das notas"
 
 #. TRANS: Client exception thrown when trying favorite a notice without content.
-#: actions/atompubfavoritefeed.php:259
 #, fuzzy
 msgid "Unknown note."
 msgstr "Desconhecida"
 
 #. TRANS: Client exception thrown when trying favorite an already favorited notice.
-#: actions/atompubfavoritefeed.php:267
 #, fuzzy
 msgid "Already a favorite."
 msgstr "Adicionar às favoritas"
 
 #. TRANS: Title for group membership feed.
 #. TRANS: %s is a username.
-#: actions/atompubmembershipfeed.php:144
 #, fuzzy, php-format
 msgid "%s group memberships"
 msgstr "Membros do grupo %s"
 
 #. TRANS: Subtitle for group membership feed.
 #. TRANS: %1$s is a username, %2$s is the StatusNet sitename.
-#: actions/atompubmembershipfeed.php:149
 #, fuzzy, php-format
 msgid "Groups %1$s is a member of on %2$s"
 msgstr "Grupos de que %s é membro"
 
 #. TRANS: Client exception thrown when trying subscribe someone else to a group.
-#: actions/atompubmembershipfeed.php:219
 #, fuzzy
 msgid "Cannot add someone else's membership."
 msgstr "Não foi possível inserir nova subscrição."
 
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#: actions/atompubmembershipfeed.php:242
 #, fuzzy
 msgid "Can only handle join activities."
 msgstr "Procurar no conteúdo das notas"
 
 #. TRANS: Client exception thrown when trying to subscribe to a non-existing group.
-#: actions/atompubmembershipfeed.php:259
 #, fuzzy
 msgid "Unknown group."
 msgstr "Desconhecida"
 
 #. TRANS: Client exception thrown when trying to subscribe to an already subscribed group.
-#: actions/atompubmembershipfeed.php:267
 #, fuzzy
 msgid "Already a member."
 msgstr "Todos os membros"
 
 #. TRANS: Client exception thrown when trying to subscribe to group while blocked from that group.
-#: actions/atompubmembershipfeed.php:275
 msgid "Blocked by admin."
 msgstr ""
 
 #. TRANS: Client exception thrown when referencing a non-existing favorite.
-#: actions/atompubshowfavorite.php:90
 #, fuzzy
 msgid "No such favorite."
 msgstr "Ficheiro não foi encontrado."
 
 #. TRANS: Client exception thrown when trying to remove a favorite notice of another user.
-#: actions/atompubshowfavorite.php:151
 #, fuzzy
 msgid "Cannot delete someone else's favorite."
 msgstr "Não foi possível eliminar o favorito."
@@ -1452,93 +1137,68 @@ msgstr "Não foi possível eliminar o favorito."
 #. TRANS: Client error displayed when trying to join a non-existing group.
 #. TRANS: Client error displayed when trying to leave a non-local group.
 #. TRANS: Client error displayed when trying to leave a non-existing group.
+#. TRANS: Client error displayed when providing an invalid group ID on the Make Admin page.
 #. 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.
 #. TRANS: Command exception text shown when a group is requested that does not exist.
 #. TRANS: Error text shown when trying to leave a group that does not exist.
-#: actions/atompubshowmembership.php:81 actions/blockedfromgroup.php:81
-#: actions/blockedfromgroup.php:89 actions/deletegroup.php:87
-#: actions/deletegroup.php:100 actions/editgroup.php:102
-#: actions/foafgroup.php:46 actions/foafgroup.php:65 actions/foafgroup.php:73
-#: actions/groupblock.php:89 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:101 actions/grouplogo.php:103
-#: actions/groupmembers.php:84 actions/groupmembers.php:92
-#: actions/grouprss.php:97 actions/grouprss.php:105
-#: actions/groupunblock.php:89 actions/joingroup.php:82
-#: actions/joingroup.php:95 actions/leavegroup.php:82
-#: actions/leavegroup.php:95 actions/makeadmin.php:86
-#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:392
 msgid "No such group."
 msgstr "Grupo não foi encontrado."
 
 #. TRANS: Client exception thrown when trying to show membership of a non-subscribed group
-#: actions/atompubshowmembership.php:91
 #, fuzzy
 msgid "Not a member."
 msgstr "Todos os membros"
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
-#: actions/atompubshowmembership.php:150
 #, fuzzy
 msgid "Cannot delete someone else's membership."
 msgstr "Não foi possível apagar a auto-subscrição."
 
 #. TRANS: Client exception thrown when trying to display a subscription for a non-existing profile ID.
 #. TRANS: %d is the non-existing profile ID number.
-#: actions/atompubshowsubscription.php:72
-#: actions/atompubshowsubscription.php:83
-#: actions/atompubsubscriptionfeed.php:74
 #, fuzzy, php-format
 msgid "No such profile id: %d."
 msgstr "Perfil não foi encontrado."
 
 #. 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.
-#: actions/atompubshowsubscription.php:94
 #, fuzzy, php-format
 msgid "Profile %1$d not subscribed to profile %2$d."
 msgstr "Não subscreveu esse perfil."
 
 #. TRANS: Client exception thrown when trying to delete a subscription of another user.
-#: actions/atompubshowsubscription.php:157
 #, fuzzy
 msgid "Cannot delete someone else's subscription."
 msgstr "Não foi possível apagar a auto-subscrição."
 
 #. TRANS: Subtitle for Atom subscription feed.
 #. TRANS: %1$s is a user nickname, %s$s is the StatusNet sitename.
-#: actions/atompubsubscriptionfeed.php:153
 #, fuzzy, php-format
 msgid "People %1$s has subscribed to on %2$s"
 msgstr "Pessoas que subscrevem %s"
 
 #. TRANS: Client error displayed when not using the follow verb.
-#: actions/atompubsubscriptionfeed.php:248
 msgid "Can only handle Follow activities."
 msgstr ""
 
 #. TRANS: Client exception thrown when subscribing to an object that is not a person.
-#: actions/atompubsubscriptionfeed.php:256
 msgid "Can only follow people."
 msgstr ""
 
 #. TRANS: Client exception thrown when subscribing to a non-existing profile.
 #. TRANS: %s is the unknown profile ID.
-#: actions/atompubsubscriptionfeed.php:267
 #, fuzzy, php-format
 msgid "Unknown profile %s."
 msgstr "Tipo do ficheiro é desconhecido"
 
 #. TRANS: Client error displayed trying to subscribe to an already subscribed profile.
 #. TRANS: %s is the profile the user already has a subscription on.
-#: actions/atompubsubscriptionfeed.php:275
 #, fuzzy, php-format
 msgid "Already subscribed to %s."
 msgstr "Já subscrito!"
 
 #. TRANS: Client error displayed trying to get a non-existing attachment.
-#: actions/attachment.php:73
 msgid "No such attachment."
 msgstr "Anexo não foi encontrado."
 
@@ -1550,31 +1210,23 @@ msgstr "Anexo não foi encontrado."
 #. TRANS: Client error displayed when trying to view group members without providing a group nickname.
 #. TRANS: Client error displayed when requesting a group RSS feed without providing a group nickname.
 #. TRANS: Client error displayed if no nickname argument was given requesting a group page.
-#: actions/avatarbynickname.php:60 actions/blockedfromgroup.php:73
-#: actions/editgroup.php:85 actions/groupdesignsettings.php:84
-#: actions/grouplogo.php:86 actions/groupmembers.php:76
-#: actions/grouprss.php:89 actions/showgroup.php:116
 msgid "No nickname."
 msgstr "Nome de utilizador não definido."
 
 #. TRANS: Client error displayed trying to get an avatar without providing an avatar size.
-#: actions/avatarbynickname.php:66
 msgid "No size."
 msgstr "Tamanho não definido."
 
 #. TRANS: Client error displayed trying to get an avatar providing an invalid avatar size.
-#: actions/avatarbynickname.php:72
 msgid "Invalid size."
 msgstr "Tamanho inválido."
 
 #. TRANS: Title for avatar upload page.
-#: actions/avatarsettings.php:66 lib/settingsnav.php:82
 msgid "Avatar"
 msgstr "Avatar"
 
 #. TRANS: Instruction for avatar upload page.
 #. TRANS: %s is the maximum file size, for example "500b", "10kB" or "2MB".
-#: actions/avatarsettings.php:78
 #, php-format
 msgid "You can upload your personal avatar. The maximum file size is %s."
 msgstr "Pode carregar o seu avatar pessoal. O tamanho máximo do ficheiro é %s."
@@ -1583,17 +1235,12 @@ msgstr "Pode carregar o seu avatar pessoal. O tamanho máximo do ficheiro é %s.
 #. TRANS: Server error displayed coming across a request from a user without a profile.
 #. TRANS: Server error displayed when trying to authorise a remote subscription request
 #. TRANS: while the user has no profile.
-#: actions/avatarsettings.php:108 actions/avatarsettings.php:192
-#: actions/grouplogo.php:184 actions/remotesubscribe.php:190
-#: actions/userauthorization.php:75 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr "Utilizador sem perfil correspondente."
 
 #. TRANS: Avatar upload page form legend.
 #. TRANS: Avatar upload page crop form legend.
 #. TRANS: Legend for group logo settings fieldset.
-#: actions/avatarsettings.php:122 actions/avatarsettings.php:205
-#: actions/grouplogo.php:261
 msgid "Avatar settings"
 msgstr "Configurações do avatar"
 
@@ -1601,8 +1248,6 @@ msgstr "Configurações do avatar"
 #. TRANS: Header on avatar upload crop form for thumbnail of originally uploaded avatar (h2).
 #. TRANS: Uploaded original file in group logo form.
 #. TRANS: Header for originally uploaded file before a crop on the group logo page.
-#: actions/avatarsettings.php:131 actions/avatarsettings.php:214
-#: actions/grouplogo.php:207 actions/grouplogo.php:270
 msgid "Original"
 msgstr "Original"
 
@@ -1610,14 +1255,11 @@ msgstr "Original"
 #. TRANS: Header on avatar upload crop form for thumbnail of to be used rendition of uploaded avatar (h2).
 #. TRANS: Header for preview of to be displayed group logo.
 #. TRANS: Header for the cropped group logo on the group logo page.
-#: actions/avatarsettings.php:147 actions/avatarsettings.php:227
-#: actions/grouplogo.php:219 actions/grouplogo.php:283
 msgid "Preview"
 msgstr "Antevisão"
 
 #. TRANS: Button on avatar upload page to delete current avatar.
 #. TRANS: Button text for user account deletion.
-#: actions/avatarsettings.php:155 actions/deleteaccount.php:319
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Delete"
@@ -1625,70 +1267,58 @@ msgstr "Apagar"
 
 #. TRANS: Button on avatar upload page to upload an avatar.
 #. TRANS: Submit button to confirm upload of a user backup file for account restore.
-#: actions/avatarsettings.php:173 actions/restoreaccount.php:369
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Upload"
 msgstr "Carregar"
 
 #. TRANS: Button on avatar upload crop form to confirm a selected crop as avatar.
-#: actions/avatarsettings.php:243
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Crop"
 msgstr "Cortar"
 
 #. TRANS: Validation error on avatar upload form when no file was uploaded.
-#: actions/avatarsettings.php:318
 msgid "No file uploaded."
 msgstr "Não foi carregado nenhum ficheiro."
 
 #. TRANS: Avatar upload form instruction after uploading a file.
-#: actions/avatarsettings.php:345
 #, fuzzy
 msgid "Pick a square area of the image to be your avatar."
 msgstr "Escolha uma área quadrada da imagem para ser o seu avatar"
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
 #. TRANS: Server error displayed trying to crop an uploaded group logo that is no longer present.
-#: actions/avatarsettings.php:360 actions/grouplogo.php:391
 msgid "Lost our file data."
 msgstr "Perdi os dados do nosso ficheiro."
 
 #. TRANS: Success message for having updated a user avatar.
-#: actions/avatarsettings.php:384
 msgid "Avatar updated."
 msgstr "Avatar actualizado."
 
 #. TRANS: Error displayed on the avatar upload page if the avatar could not be updated for an unknown reason.
-#: actions/avatarsettings.php:388
 msgid "Failed updating avatar."
 msgstr "Falha ao actualizar avatar."
 
 #. TRANS: Success message for deleting a user avatar.
-#: actions/avatarsettings.php:412
 msgid "Avatar deleted."
 msgstr "Avatar apagado."
 
 #. TRANS: Title for backup account page.
 #. TRANS: Option in profile settings to create a backup of the account of the currently logged in user.
-#: actions/backupaccount.php:61 actions/profilesettings.php:468
 msgid "Backup account"
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to backup an account while not logged in.
-#: actions/backupaccount.php:79
 #, fuzzy
 msgid "Only logged-in users can backup their account."
 msgstr "Só utilizadores com sessão iniciada podem repetir notas."
 
 #. TRANS: Client exception thrown when trying to backup an account without having backup rights.
-#: actions/backupaccount.php:84
 msgid "You may not backup your account."
 msgstr ""
 
 #. TRANS: Information displayed on the backup account page.
-#: actions/backupaccount.php:227
 msgid ""
 "You can backup your account data in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format. This is an experimental feature and provides "
@@ -1698,31 +1328,26 @@ msgid ""
 msgstr ""
 
 #. TRANS: Submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:250
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Backup"
 msgstr "Fundo"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:254
 msgid "Backup your account."
 msgstr ""
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
-#: actions/block.php:68
 msgid "You already blocked that user."
 msgstr "Já bloqueou esse utilizador."
 
 #. TRANS: Title for block user page.
 #. TRANS: Legend for block user form.
 #. TRANS: Fieldset legend for block user from group form.
-#: actions/block.php:106 actions/block.php:136 actions/groupblock.php:165
 msgid "Block user"
 msgstr "Bloquear utilizador"
 
 #. TRANS: Explanation of consequences when blocking a user on the block user page.
-#: actions/block.php:139
 msgid ""
 "Are you sure you want to block this user? Afterwards, they will be "
 "unsubscribed from you, unable to subscribe to you in the future, and you "
@@ -1738,15 +1363,11 @@ msgstr ""
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:154 actions/deleteapplication.php:157
-#: actions/deletegroup.php:220 actions/deletenotice.php:155
-#: actions/deleteuser.php:154 actions/groupblock.php:187
 msgctxt "BUTTON"
 msgid "No"
 msgstr "Não"
 
 #. TRANS: Submit button title for 'No' when blocking a user.
-#: actions/block.php:158
 #, fuzzy
 msgid "Do not block this user."
 msgstr "Não bloquear este utilizador"
@@ -1757,50 +1378,40 @@ msgstr "Não bloquear este utilizador"
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:161 actions/deleteapplication.php:164
-#: actions/deletegroup.php:227 actions/deletenotice.php:162
-#: actions/deleteuser.php:161 actions/groupblock.php:194
 msgctxt "BUTTON"
 msgid "Yes"
 msgstr "Sim"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:165
 #, fuzzy
 msgid "Block this user."
 msgstr "Bloquear este utilizador"
 
 #. TRANS: Server error displayed when blocking a user fails.
-#: actions/block.php:189
 msgid "Failed to save block information."
 msgstr "Não foi possível gravar informação do bloqueio."
 
 #. TRANS: Title for first page with list of users blocked from a group.
 #. TRANS: %s is a group nickname.
-#: actions/blockedfromgroup.php:101
 #, php-format
 msgid "%s blocked profiles"
 msgstr "%s perfis bloqueados"
 
 #. TRANS: Title for any but the first page with list of users blocked from a group.
 #. TRANS: %1$s is a group nickname, %2$d is a page number.
-#: actions/blockedfromgroup.php:106
 #, php-format
 msgid "%1$s blocked profiles, page %2$d"
 msgstr "Perfis bloqueados de %1$s, página %2$d"
 
 #. TRANS: Instructions for list of users blocked from a group.
-#: actions/blockedfromgroup.php:122
 msgid "A list of the users blocked from joining this group."
 msgstr "Uma lista dos utilizadores com entrada bloqueada neste grupo."
 
 #. TRANS: Form legend for unblocking a user from a group.
-#: actions/blockedfromgroup.php:291
 msgid "Unblock user from group"
 msgstr "Desbloquear utilizador do grupo"
 
 #. TRANS: Button text for unblocking a user from a group.
-#: actions/blockedfromgroup.php:323
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Unblock"
@@ -1808,130 +1419,104 @@ msgstr "Desbloquear"
 
 #. TRANS: Tooltip for button for unblocking a user from a group.
 #. TRANS: Description of the form to unblock a user.
-#: actions/blockedfromgroup.php:327 lib/unblockform.php:78
 msgid "Unblock this user"
 msgstr "Desbloquear este utilizador"
 
 #. TRANS: Title for mini-posting window loaded from bookmarklet.
 #. TRANS: %s is the StatusNet site name.
-#: actions/bookmarklet.php:51
 #, php-format
 msgid "Post to %s"
 msgstr "Publicar em %s"
 
 #. TRANS: Client error displayed when not providing a confirmation code in the contact address confirmation action.
-#: actions/confirmaddress.php:74
 msgid "No confirmation code."
 msgstr "Sem código de confimação."
 
 #. TRANS: Client error displayed when providing a non-existing confirmation code in the contact address confirmation action.
-#: actions/confirmaddress.php:80
 msgid "Confirmation code not found."
 msgstr "Código de confirmação não encontrado"
 
 #. TRANS: Client error displayed when not providing a confirmation code for another user in the contact address confirmation action.
-#: actions/confirmaddress.php:86
 msgid "That confirmation code is not for you!"
 msgstr "Esse código de confirmação não é para si!"
 
 #. TRANS: Server error for an unknown address type, which can be 'email', 'sms', or the name of an IM network (such as 'xmpp' or 'aim')
-#: actions/confirmaddress.php:94
-#, fuzzy, php-format
+#, php-format
 msgid "Unrecognized address type %s"
-msgstr "Tipo do endereço %s não reconhecido."
+msgstr "Tipo do endereço %s não reconhecido"
 
 #. TRANS: Client error for an already confirmed email/jabber/sms address.
-#: actions/confirmaddress.php:103 actions/confirmaddress.php:136
 msgid "That address has already been confirmed."
 msgstr "Esse endereço já tinha sido confirmado."
 
-#: actions/confirmaddress.php:121 actions/imsettings.php:444
-#: actions/userdesignsettings.php:306
-#, fuzzy
 msgid "Couldn't update user."
 msgstr "Não foi possível actualizar o utilizador."
 
-#: actions/confirmaddress.php:144
 #, fuzzy
 msgid "Couldn't update user im preferences."
 msgstr "Não foi possível actualizar o registo do utilizador."
 
-#: actions/confirmaddress.php:156
 #, fuzzy
 msgid "Couldn't insert user im preferences."
 msgstr "Não foi possível inserir nova subscrição."
 
 #. TRANS: Server error displayed when an address confirmation code deletion from the
 #. TRANS: database fails in the contact address confirmation action.
-#: actions/confirmaddress.php:169
 #, fuzzy
 msgid "Could not delete address confirmation."
 msgstr "Não foi possível apagar a confirmação do mensageiro instantâneo."
 
 #. TRANS: Title for the contact address confirmation action.
-#: actions/confirmaddress.php:185
 msgid "Confirm address"
 msgstr "Confirmar endereço"
 
 #. TRANS: Success message for the contact address confirmation action.
 #. TRANS: %s can be 'email', 'jabber', or 'sms'.
-#: actions/confirmaddress.php:200
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "O endereço \"%s\" foi confirmado para a sua conta."
 
 #. TRANS: Title for page with a conversion (multiple notices in context).
-#: actions/conversation.php:96
 msgid "Conversation"
 msgstr "Conversação"
 
 #. TRANS: Header on conversation page. Hidden by default (h2).
 #. TRANS: Label for user statistics.
-#: actions/conversation.php:149 lib/noticelist.php:87
-#: lib/profileaction.php:246 lib/searchgroupnav.php:82
-#: lib/threadednoticelist.php:66
 msgid "Notices"
 msgstr "Notas"
 
 #. TRANS: Client exception displayed trying to delete a user account while not logged in.
-#: actions/deleteaccount.php:71
 #, fuzzy
 msgid "Only logged-in users can delete their account."
 msgstr "Só utilizadores com sessão iniciada podem repetir notas."
 
 #. TRANS: Client exception displayed trying to delete a user account without have the rights to do that.
-#: actions/deleteaccount.php:77
 #, fuzzy
 msgid "You cannot delete your account."
 msgstr "Não pode apagar utilizadores."
 
 #. TRANS: Confirmation text for user deletion. The user has to type this exactly the same, including punctuation.
-#: actions/deleteaccount.php:160 actions/deleteaccount.php:297
 msgid "I am sure."
 msgstr ""
 
 #. TRANS: Notification for user about the text that must be input to be able to delete a user account.
 #. TRANS: %s is the text that needs to be input.
-#: actions/deleteaccount.php:164
 #, php-format
 msgid "You must write \"%s\" exactly in the box."
 msgstr ""
 
 #. TRANS: Confirmation that a user account has been deleted.
-#: actions/deleteaccount.php:206
 #, fuzzy
 msgid "Account deleted."
 msgstr "Avatar apagado."
 
 #. TRANS: Page title for page on which a user account can be deleted.
 #. TRANS: Option in profile settings to delete the account of the currently logged in user.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:476
 #, fuzzy
 msgid "Delete account"
 msgstr "Criar uma conta"
 
 #. TRANS: Form text for user deletion form.
-#: actions/deleteaccount.php:279
 msgid ""
 "This will <strong>permanently delete</strong> your account data from this "
 "server."
@@ -1939,7 +1524,6 @@ msgstr ""
 
 #. TRANS: Additional form text for user deletion form shown if a user has account backup rights.
 #. TRANS: %s is a URL to the backup page.
-#: actions/deleteaccount.php:285
 #, php-format
 msgid ""
 "You are strongly advised to <a href=\"%s\">back up your data</a> before "
@@ -1948,56 +1532,43 @@ msgstr ""
 
 #. TRANS: Field label for delete account confirmation entry.
 #. TRANS: Field label for password reset form where the password has to be typed again.
-#: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:262 actions/register.php:419
 msgid "Confirm"
 msgstr "Confirmação"
 
 #. TRANS: Input title for the delete account field.
 #. TRANS: %s is the text that needs to be input.
-#: actions/deleteaccount.php:304
 #, fuzzy, php-format
 msgid "Enter \"%s\" to confirm that you want to delete your account."
 msgstr "Não pode apagar utilizadores."
 
 #. TRANS: Button title for user account deletion.
-#: actions/deleteaccount.php:323
 #, fuzzy
 msgid "Permanently delete your account"
 msgstr "Não pode apagar utilizadores."
 
 #. TRANS: Client error displayed trying to delete an application while not logged in.
-#: actions/deleteapplication.php:62
 msgid "You must be logged in to delete an application."
 msgstr "Tem de iniciar uma sessão para eliminar uma aplicação."
 
 #. TRANS: Client error displayed trying to delete an application that does not exist.
-#: actions/deleteapplication.php:71
 msgid "Application not found."
 msgstr "Aplicação não foi encontrada."
 
 #. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
-#: actions/deleteapplication.php:79 actions/editapplication.php:78
-#: actions/showapplication.php:90
 msgid "You are not the owner of this application."
 msgstr "Não é o proprietário desta aplicação."
 
 #. TRANS: Client error text when there is a problem with the session token.
-#: actions/deleteapplication.php:102 actions/editapplication.php:131
-#: actions/newapplication.php:112 actions/showapplication.php:113
-#: lib/action.php:1391
 msgid "There was a problem with your session token."
 msgstr "Ocorreu um problema com a sua sessão."
 
 #. TRANS: Title for delete application page.
 #. TRANS: Fieldset legend on delete application page.
-#: actions/deleteapplication.php:124 actions/deleteapplication.php:149
 msgid "Delete application"
 msgstr "Apagar aplicação"
 
 #. TRANS: Confirmation text on delete application page.
-#: actions/deleteapplication.php:152
 msgid ""
 "Are you sure you want to delete this application? This will clear all data "
 "about the application from the database, including all existing user "
@@ -2008,19 +1579,16 @@ msgstr ""
 "utilizadores em existência."
 
 #. TRANS: Submit button title for 'No' when deleting an application.
-#: actions/deleteapplication.php:161
 #, fuzzy
 msgid "Do not delete this application."
 msgstr "Não apagar esta aplicação"
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
-#: actions/deleteapplication.php:167
 #, fuzzy
 msgid "Delete this application."
 msgstr "Apagar esta aplicação"
 
 #. TRANS: Client error when trying to delete group while not logged in.
-#: actions/deletegroup.php:64
 #, fuzzy
 msgid "You must be logged in to delete a group."
 msgstr "Tem de iniciar uma sessão para deixar um grupo."
@@ -2028,40 +1596,33 @@ msgstr "Tem de iniciar uma sessão para deixar um grupo."
 #. TRANS: Client error when trying to delete a group without providing a nickname or ID for the group.
 #. TRANS: Client error displayed when trying to join a group without providing a group name or group ID.
 #. TRANS: Client error displayed when trying to leave a group without providing a group name or group ID.
-#: actions/deletegroup.php:94 actions/joingroup.php:89
-#: actions/leavegroup.php:89
 msgid "No nickname or ID."
 msgstr "Nenhum utilizador ou ID."
 
 #. TRANS: Client error when trying to delete a group without having the rights to delete it.
-#: actions/deletegroup.php:107
 #, fuzzy
 msgid "You are not allowed to delete this group."
 msgstr "Não é membro deste grupo."
 
 #. TRANS: Server error displayed if a group could not be deleted.
 #. TRANS: %s is the name of the group that could not be deleted.
-#: actions/deletegroup.php:150
 #, fuzzy, php-format
 msgid "Could not delete group %s."
 msgstr "Não foi possível actualizar o grupo."
 
 #. TRANS: Message given after deleting a group.
 #. TRANS: %s is the deleted group's name.
-#: actions/deletegroup.php:159
 #, fuzzy, php-format
 msgid "Deleted group %s"
 msgstr "%1$s deixou o grupo %2$s"
 
 #. TRANS: Title of delete group page.
 #. TRANS: Form legend for deleting a group.
-#: actions/deletegroup.php:176 actions/deletegroup.php:202
 #, fuzzy
 msgid "Delete group"
 msgstr "Apagar utilizador"
 
 #. TRANS: Warning in form for deleleting a group.
-#: actions/deletegroup.php:206
 #, fuzzy
 msgid ""
 "Are you sure you want to delete this group? This will clear all data about "
@@ -2072,13 +1633,11 @@ msgstr ""
 "utilizador serão eliminados da base de dados, sem haver cópias."
 
 #. TRANS: Submit button title for 'No' when deleting a group.
-#: actions/deletegroup.php:224
 #, fuzzy
 msgid "Do not delete this group."
 msgstr "Não apagar esta nota"
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
-#: actions/deletegroup.php:231
 #, fuzzy
 msgid "Delete this group."
 msgstr "Apagar este utilizador"
@@ -2089,22 +1648,18 @@ msgstr "Apagar este utilizador"
 #. TRANS: Client error displayed trying to block a user from a group while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying to log out when not logged in.
+#. TRANS: Client error displayed when trying to access the "make admin" page while not logged in.
+#. TRANS: Client error displayed trying to create a new direct message while not logged in.
+#. TRANS: Client error displayed trying to send a notice while not logged in.
+#. TRANS: Client error displayed trying to nudge a user without being logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
 #. TRANS: Client error displayed when trying to change user options while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
-#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:70
-#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
-#: actions/nudge.php:63 actions/pluginenable.php:97 actions/subedit.php:33
-#: actions/subscribe.php:98 actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:71 lib/profileformaction.php:63
-#: lib/settingsaction.php:72
 msgid "Not logged in."
 msgstr "Não iniciou sessão."
 
 #. TRANS: Instructions for deleting a notice.
-#: actions/deletenotice.php:110
 msgid ""
 "You are about to permanently delete a notice. Once this is done, it cannot "
 "be undone."
@@ -2114,51 +1669,42 @@ msgstr ""
 
 #. TRANS: Page title when deleting a notice.
 #. TRANS: Fieldset legend for the delete notice form.
-#: actions/deletenotice.php:117 actions/deletenotice.php:148
 msgid "Delete notice"
 msgstr "Apagar nota"
 
 #. TRANS: Message for the delete notice form.
-#: actions/deletenotice.php:152
 msgid "Are you sure you want to delete this notice?"
 msgstr "Tem a certeza de que quer apagar esta nota?"
 
 #. TRANS: Submit button title for 'No' when deleting a notice.
-#: actions/deletenotice.php:159
 #, fuzzy
 msgid "Do not delete this notice."
 msgstr "Não apagar esta nota"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:166
 #, fuzzy
 msgid "Delete this notice."
 msgstr "Apagar esta nota"
 
 #. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
-#: actions/deleteuser.php:66
 msgid "You cannot delete users."
 msgstr "Não pode apagar utilizadores."
 
 #. TRANS: Client error displayed when trying to delete a non-local user.
-#: actions/deleteuser.php:74
 msgid "You can only delete local users."
 msgstr "Só pode apagar utilizadores locais."
 
 #. TRANS: Title of delete user page.
-#: actions/deleteuser.php:110
 #, fuzzy
 msgctxt "TITLE"
 msgid "Delete user"
 msgstr "Apagar utilizador"
 
 #. TRANS: Fieldset legend on delete user page.
-#: actions/deleteuser.php:134
 msgid "Delete user"
 msgstr "Apagar utilizador"
 
 #. TRANS: Information text to request if a user is certain that the described action has to be performed.
-#: actions/deleteuser.php:138
 msgid ""
 "Are you sure you want to delete this user? This will clear all data about "
 "the user from the database, without a backup."
@@ -2167,103 +1713,84 @@ msgstr ""
 "utilizador serão eliminados da base de dados, sem haver cópias."
 
 #. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/deleteuser.php:158
 #, fuzzy
 msgid "Do not delete this user."
 msgstr "Não apagar esta nota"
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
-#: actions/deleteuser.php:165
 #, fuzzy
 msgid "Delete this user."
 msgstr "Apagar este utilizador"
 
 #. TRANS: Message used as title for design settings for the site.
-#: actions/designadminpanel.php:60 lib/settingsnav.php:97
 msgid "Design"
 msgstr "Estilo"
 
 #. TRANS: Instructions for design adminsitration panel.
-#: actions/designadminpanel.php:71
 msgid "Design settings for this StatusNet site"
 msgstr ""
 
 #. TRANS: Client error displayed when a logo URL does is not valid.
-#: actions/designadminpanel.php:327
 msgid "Invalid logo URL."
 msgstr "URL do logotipo inválida."
 
 #. TRANS: Client error displayed when an SSL logo URL is invalid.
-#: actions/designadminpanel.php:333
 #, fuzzy
 msgid "Invalid SSL logo URL."
 msgstr "URL do logotipo inválida."
 
 #. TRANS: Client error displayed when a theme is submitted through the form that is not in the theme list.
 #. TRANS: %s is the chosen unavailable theme.
-#: actions/designadminpanel.php:339
 #, php-format
 msgid "Theme not available: %s."
 msgstr "Tema não está disponível: %s."
 
 #. TRANS: Fieldset legend for form to change logo.
-#: actions/designadminpanel.php:437
 msgid "Change logo"
 msgstr "Alterar logotipo"
 
 #. TRANS: Field label for StatusNet site logo.
-#: actions/designadminpanel.php:444
 msgid "Site logo"
 msgstr "Logotipo do site"
 
 #. TRANS: Field label for SSL StatusNet site logo.
-#: actions/designadminpanel.php:452
 #, fuzzy
 msgid "SSL logo"
 msgstr "Logotipo do site"
 
 #. TRANS: Fieldset legend for form change StatusNet site's theme.
-#: actions/designadminpanel.php:467
 msgid "Change theme"
 msgstr "Alterar tema"
 
 #. TRANS: Field label for dropdown to choose site theme.
-#: actions/designadminpanel.php:485
 msgid "Site theme"
 msgstr "Tema do site"
 
 #. TRANS: Title for field label for dropdown to choose site theme.
-#: actions/designadminpanel.php:487
 msgid "Theme for the site."
 msgstr "O tema para o site."
 
 #. TRANS: Field label for uploading a cutom theme.
-#: actions/designadminpanel.php:494
 msgid "Custom theme"
 msgstr "Tema personalizado"
 
 #. TRANS: Form instructions for uploading a cutom StatusNet theme.
-#: actions/designadminpanel.php:499
 msgid "You can upload a custom StatusNet theme as a .ZIP archive."
 msgstr ""
 "Pode fazer o upload de um tema personalizado para o StatusNet, na forma de "
 "um arquivo .ZIP."
 
 #. TRANS: Fieldset legend for theme background image.
-#: actions/designadminpanel.php:515
 msgid "Change background image"
 msgstr "Alterar imagem de fundo"
 
 #. TRANS: Field label for background image on theme designer page.
 #. TRANS: Field label for background color selector.
 #. TRANS: Label on profile design page for setting a profile page background colour.
-#: actions/designadminpanel.php:525 actions/designadminpanel.php:609
-#: lib/designform.php:238
 msgid "Background"
 msgstr "Fundo"
 
 #. TRANS: Form guide for background image upload form on theme designer page.
-#: actions/designadminpanel.php:531
 #, php-format
 msgid ""
 "You can upload a background image for the site. The maximum file size is %1"
@@ -2273,204 +1800,169 @@ msgstr ""
 "é %1$s."
 
 #. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:558
 msgid "On"
 msgstr "Ligar"
 
 #. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:575
 msgid "Off"
 msgstr "Desligar"
 
 #. TRANS: Form guide for turning background image on or off on theme designer page.
 #. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
 #. TRANS: use of the uploaded profile image.
-#: actions/designadminpanel.php:577 lib/designform.php:214
 msgid "Turn background image on or off."
 msgstr "Ligar ou desligar a imagem de fundo."
 
 #. TRANS: Checkbox label to title background image on theme designer page.
 #. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-#: actions/designadminpanel.php:583 lib/designform.php:220
 msgid "Tile background image"
 msgstr "Repetir imagem de fundo em mosaico"
 
 #. TRANS: Fieldset legend for theme colors.
-#: actions/designadminpanel.php:598
 #, fuzzy
 msgid "Change colors"
 msgstr "Alterar cores"
 
 #. TRANS: Field label for content color selector.
 #. TRANS: Label on profile design page for setting a profile page content colour.
-#: actions/designadminpanel.php:623 lib/designform.php:252
 msgid "Content"
 msgstr "Conteúdo"
 
 #. TRANS: Field label for sidebar color selector.
 #. TRANS: Label on profile design page for setting a profile page sidebar colour.
-#: actions/designadminpanel.php:637 lib/designform.php:266
 msgid "Sidebar"
 msgstr "Barra"
 
 #. TRANS: Field label for text color selector.
 #. TRANS: Label on profile design page for setting a profile page text colour.
-#: actions/designadminpanel.php:651 lib/designform.php:280
 msgid "Text"
 msgstr "Texto"
 
 #. TRANS: Field label for link color selector.
 #. TRANS: Label on profile design page for setting a profile page links colour.
-#: actions/designadminpanel.php:665 lib/designform.php:294
 msgid "Links"
 msgstr "Links"
 
 #. TRANS: Fieldset legend for advanced theme design settings.
-#: actions/designadminpanel.php:691
 msgid "Advanced"
 msgstr "Avançado"
 
 #. TRANS: Field label for custom CSS.
-#: actions/designadminpanel.php:696
 msgid "Custom CSS"
 msgstr "CSS personalizado"
 
 #. TRANS: Button text for resetting theme settings.
-#: actions/designadminpanel.php:718
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Use defaults"
 msgstr "Usar predefinições"
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:720
 #, fuzzy
 msgid "Restore default designs."
 msgstr "Repor estilos predefinidos"
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:728
 #, fuzzy
 msgid "Reset back to default."
 msgstr "Repor predefinição"
 
 #. TRANS: Title for button for saving theme settings.
-#: actions/designadminpanel.php:736
 #, fuzzy
 msgid "Save design."
 msgstr "Gravar o estilo"
 
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
-#: actions/disfavor.php:83
 msgid "This notice is not a favorite!"
 msgstr "Esta nota não é uma favorita!"
 
 #. TRANS: Title for page on which favorites can be added.
-#: actions/disfavor.php:98
 msgid "Add to favorites"
 msgstr "Adicionar às favoritas"
 
 #. TRANS: Client exception thrown when requesting a document from the documentation that does not exist.
 #. TRANS: %s is the non-existing document.
-#: actions/doc.php:155
 #, fuzzy, php-format
 msgid "No such document \"%s\"."
 msgstr "Documento \"%s\" não foi encontrado"
 
 #. TRANS: Title for "Edit application" form.
 #. TRANS: Form legend.
-#: actions/editapplication.php:54 lib/applicationeditform.php:129
 msgid "Edit application"
 msgstr "Editar aplicação"
 
 #. TRANS: Client error displayed trying to edit an application while not logged in.
-#: actions/editapplication.php:66
 msgid "You must be logged in to edit an application."
 msgstr "Tem de iniciar uma sessão para editar uma aplicação."
 
 #. TRANS: Client error displayed trying to edit an application that does not exist.
-#: actions/editapplication.php:83 actions/showapplication.php:83
 msgid "No such application."
 msgstr "Aplicação não foi encontrada."
 
 #. TRANS: Instructions for "Edit application" form.
-#: actions/editapplication.php:167
 msgid "Use this form to edit your application."
 msgstr "Use este formulário para editar a sua aplicação."
 
 #. TRANS: Validation error shown when not providing a name in the "Edit application" form.
 #. TRANS: Validation error shown when not providing a name in the "New application" form.
-#: actions/editapplication.php:184 actions/newapplication.php:164
 msgid "Name is required."
 msgstr "Nome é obrigatório."
 
 #. 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.
-#: actions/editapplication.php:188 actions/newapplication.php:172
 #, fuzzy
 msgid "Name is too long (maximum 255 characters)."
 msgstr "Nome é demasiado longo (máx. 255 caracteres)."
 
 #. TRANS: Validation error shown when providing a name for an application that already exists in the "Edit application" form.
 #. TRANS: Validation error shown when providing a name for an application that already exists in the "New application" form.
-#: actions/editapplication.php:192 actions/newapplication.php:168
 msgid "Name already in use. Try another one."
 msgstr "Nome já é usado. Tente outro."
 
 #. TRANS: Validation error shown when not providing a description in the "Edit application" form.
 #. TRANS: Validation error shown when not providing a description in the "New application" form.
-#: actions/editapplication.php:196 actions/newapplication.php:176
 msgid "Description is required."
 msgstr "Descrição é obrigatória."
 
 #. TRANS: Validation error shown when providing too long a source URL in the "Edit application" form.
-#: actions/editapplication.php:209
 msgid "Source URL is too long."
 msgstr "URL de origem é demasiado longa."
 
 #. TRANS: Validation error shown when providing an invalid source URL in the "Edit application" form.
 #. TRANS: Validation error shown when providing an invalid source URL in the "New application" form.
-#: actions/editapplication.php:216 actions/newapplication.php:199
 msgid "Source URL is not valid."
 msgstr "A URL de origem é inválida."
 
 #. 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.
-#: actions/editapplication.php:220 actions/newapplication.php:203
 msgid "Organization is required."
 msgstr "Organização é obrigatória."
 
 #. TRANS: Validation error shown when providing too long an arganisation name in the "Edit application" form.
-#: actions/editapplication.php:224 actions/newapplication.php:207
 #, fuzzy
 msgid "Organization is too long (maximum 255 characters)."
 msgstr "Organização é demasiado longa (máx. 255 caracteres)."
 
 #. TRANS: Form validation error show when an organisation name has not been provided in the edit application form.
 #. TRANS: Form validation error show when an organisation name has not been provided in the new application form.
-#: actions/editapplication.php:228 actions/newapplication.php:211
 msgid "Organization homepage is required."
 msgstr "Página da organização é obrigatória."
 
 #. TRANS: Validation error shown when providing too long a callback URL in the "Edit application" form.
 #. TRANS: Validation error shown when providing too long a callback URL in the "New application" form.
-#: actions/editapplication.php:239 actions/newapplication.php:225
 msgid "Callback is too long."
 msgstr "Callback é demasiado longo."
 
 #. TRANS: Validation error shown when providing an invalid callback URL in the "Edit application" form.
 #. TRANS: Validation error shown when providing an invalid callback URL in the "New application" form.
-#: actions/editapplication.php:247 actions/newapplication.php:235
 msgid "Callback URL is not valid."
 msgstr "A URL de callback é inválida."
 
 #. TRANS: Server error occuring when an application could not be updated from the "Edit application" form.
-#: actions/editapplication.php:284
 msgid "Could not update application."
 msgstr "Não foi possível actualizar a aplicação."
 
 #. TRANS: Title for form to edit a group. %s is a group nickname.
-#: actions/editgroup.php:55
 #, php-format
 msgid "Edit %s group"
 msgstr "Editar grupo %s"
@@ -2478,40 +1970,40 @@ msgstr "Editar grupo %s"
 #. TRANS: Client error displayed trying to edit a group while not logged in.
 #. TRANS: Client error displayed when trying to create a group while not logged in.
 #. TRANS: Client error displayed trying to create a group while not logged in.
-#: actions/editgroup.php:68 actions/grouplogo.php:69 actions/newgroup.php:65
 msgid "You must be logged in to create a group."
 msgstr "Tem de iniciar uma sessão para criar o grupo."
 
 #. TRANS: Form instructions for group edit form.
-#: actions/editgroup.php:161
 msgid "Use this form to edit the group."
 msgstr "Use este formulário para editar o grupo."
 
+#. TRANS: Group edit form validation error.
+#. TRANS: Group create form validation error.
+#. TRANS: %s is the invalid alias.
+#, php-format
+msgid "Invalid alias: \"%s\""
+msgstr "Nome alternativo inválido: \"%s\""
+
 #. TRANS: Group edit form success message.
-#: actions/editgroup.php:301
 msgid "Options saved."
 msgstr "Opções gravadas."
 
 #. TRANS: Title for e-mail settings.
-#: actions/emailsettings.php:60
 msgid "Email settings"
 msgstr "Configurações do correio electrónico"
 
 #. TRANS: E-mail settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/emailsettings.php:74
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 msgstr "Defina como receberá mensagens electrónicas de %%site.name%%."
 
 #. TRANS: Form legend for e-mail settings form.
 #. TRANS: Field label for e-mail address input in e-mail settings form.
-#: actions/emailsettings.php:104 actions/emailsettings.php:130
 msgid "Email address"
 msgstr "Endereço de correio electrónico"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:110
 msgid "Current confirmed email address."
 msgstr "Endereço de correio já confirmado."
 
@@ -2520,15 +2012,11 @@ msgstr "Endereço de correio já confirmado."
 #. TRANS: Button label to remove a confirmed IM address.
 #. TRANS: Button label to remove a confirmed SMS address.
 #. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
-#: actions/emailsettings.php:113 actions/emailsettings.php:180
-#: actions/imsettings.php:119 actions/smssettings.php:119
-#: actions/smssettings.php:175
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Remover"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:120
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -2541,7 +2029,6 @@ msgstr ""
 #. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
 #. TRANS: Any other domain may be owned by a legitimate person or
 #. TRANS: organization.
-#: actions/emailsettings.php:137
 msgid "Email address, like \"UserName@example.org\""
 msgstr ""
 "Endereço de correio electrónico, por ex. \"nomedeutilizador@exemplo.pt\""
@@ -2549,37 +2036,30 @@ msgstr ""
 #. TRANS: Button label for adding an e-mail address in e-mail settings form.
 #. TRANS: Button label for adding an IM address in IM settings form.
 #. TRANS: Button label for adding a SMS phone number in SMS settings form.
-#: actions/emailsettings.php:141 actions/imsettings.php:147
-#: actions/smssettings.php:157
 msgctxt "BUTTON"
 msgid "Add"
 msgstr "Adicionar"
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:149 actions/smssettings.php:166
 msgid "Incoming email"
 msgstr "Correio recebido"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:155
 msgid "I want to post notices by email."
 msgstr "Quero publicar notas por correio electrónico."
 
 #. TRANS: Form instructions for incoming e-mail form in e-mail settings.
 #. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
-#: actions/emailsettings.php:177 actions/smssettings.php:173
 msgid "Send email to this address to post new notices."
 msgstr "Envie mensagens electrónicas para este endereço para publicar notas."
 
 #. TRANS: Instructions for incoming e-mail address input form, when an address has already been assigned.
 #. TRANS: Instructions for incoming SMS e-mail address input form.
-#: actions/emailsettings.php:186 actions/smssettings.php:181
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr "Crie um endereço electrónico novo para publicações; cancela o antigo."
 
 #. TRANS: Instructions for incoming e-mail address input form.
-#: actions/emailsettings.php:190
 msgid ""
 "To send notices via email, we need to create a unique email address for you "
 "on this server:"
@@ -2587,93 +2067,75 @@ msgstr ""
 
 #. TRANS: Button label for adding an e-mail address to send notices from.
 #. TRANS: Button label for adding an SMS e-mail address to send notices from.
-#: actions/emailsettings.php:196 actions/smssettings.php:184
 msgctxt "BUTTON"
 msgid "New"
 msgstr "Novo"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:205
 msgid "Email preferences"
 msgstr "Preferências de correio electrónico"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:213
 msgid "Send me notices of new subscriptions through email."
 msgstr "Enviem-me notificação electrónica das novas subscrições."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:219
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr ""
 "Enviem-me notificação electrónica quando uma nota minha é adicionada às "
 "favoritas."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:226
 msgid "Send me email when someone sends me a private message."
 msgstr ""
 "Enviem-me notificação electrónica quando me enviarem uma mensagem privada."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:232
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr ""
 "Enviem-me notificação electrónica quando me enviarem uma \"resposta-@\"."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:238
 msgid "Allow friends to nudge me and send me an email."
 msgstr "Permitir que amigos me toquem e enviem mensagens electrónicas."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:244
 msgid "Publish a MicroID for my email address."
 msgstr "Publicar um MicroID para o meu endereço electrónico."
 
 #. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:362
 msgid "Email preferences saved."
 msgstr "Preferências de correio electrónico foram gravadas."
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:381
 msgid "No email address."
 msgstr "Sem endereço de correio electrónico."
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:389
 #, fuzzy
 msgid "Cannot normalize that email address."
 msgstr "Não é possível normalizar esse endereço electrónico"
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:394 actions/register.php:197
-#: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "Correio electrónico é inválido."
 
 #. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:398
 msgid "That is already your email address."
 msgstr "Esse já é o seu endereço electrónico."
 
 #. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:402
 msgid "That email address already belongs to another user."
 msgstr "Esse endereço electrónico já pertence a outro utilizador."
 
 #. TRANS: Server error thrown on database error adding e-mail confirmation code.
 #. TRANS: Server error thrown on database error adding Instant Messaging confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:419 actions/imsettings.php:362
-#: actions/smssettings.php:364
 #, fuzzy
 msgid "Could not insert confirmation code."
 msgstr "Não foi possível inserir o código de confirmação."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:426
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
@@ -2685,103 +2147,83 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling Instant Messaging address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:446 actions/imsettings.php:391
-#: actions/smssettings.php:398
 msgid "No pending confirmation to cancel."
 msgstr "Nenhuma confirmação pendente para cancelar."
 
 #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:451
 msgid "That is the wrong email address."
 msgstr "Esse endereço de correio electrónico está errado."
 
 #. TRANS: Server error thrown on database error canceling e-mail address confirmation.
 #. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
-#: actions/emailsettings.php:460 actions/smssettings.php:412
 #, fuzzy
 msgid "Could not delete email confirmation."
 msgstr "Não foi possível apagar a confirmação do endereço electrónico."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:465
 msgid "Email confirmation cancelled."
 msgstr "Confirmação de correio electrónico cancelada."
 
 #. TRANS: Message given trying to remove an e-mail address that is not
 #. TRANS: registered for the active user.
-#: actions/emailsettings.php:484
 msgid "That is not your email address."
 msgstr "Esse não é o seu endereço electrónico."
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:505
 msgid "The email address was removed."
 msgstr "O endereço de correio electrónico foi removido."
 
 #. TRANS: Form validation error displayed when trying to remove an incoming e-mail address while no address has been set.
-#: actions/emailsettings.php:519 actions/smssettings.php:554
 msgid "No incoming email address."
 msgstr "Sem endereço electrónico de entrada."
 
 #. 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.
-#: actions/emailsettings.php:531 actions/emailsettings.php:555
-#: actions/smssettings.php:565 actions/smssettings.php:590
 #, fuzzy
 msgid "Could not update user record."
 msgstr "Não foi possível actualizar o registo do utilizador."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
 #. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:535 actions/smssettings.php:569
 msgid "Incoming email address removed."
 msgstr "Endereço electrónico de entrada foi removido."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
 #. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:559 actions/smssettings.php:594
 msgid "New incoming email address added."
 msgstr "Adicionado endereço electrónico de entrada novo."
 
 #. TRANS: Client error displayed when trying to mark a notice as favorite that already is a favorite.
-#: actions/favor.php:80
 msgid "This notice is already a favorite!"
 msgstr "Esta nota já é uma favorita!"
 
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
-#: actions/favor.php:95
 #, fuzzy
 msgid "Disfavor favorite."
 msgstr "Retirar das favoritas"
 
 #. TRANS: Page title for first page of favorited notices.
 #. TRANS: Title for favourited notices section.
-#: actions/favorited.php:65 lib/popularnoticesection.php:62
-#: lib/publicgroupnav.php:93
 msgid "Popular notices"
 msgstr "Notas populares"
 
 #. TRANS: Page title for all but first page of favorited notices.
 #. TRANS: %d is the page number being displayed.
-#: actions/favorited.php:69
 #, php-format
 msgid "Popular notices, page %d"
 msgstr "Notas populares, página %d"
 
 #. TRANS: Description on page displaying favorited notices.
-#: actions/favorited.php:81
 msgid "The most popular notices on the site right now."
 msgstr "As notas mais populares agora."
 
 #. TRANS: Text displayed instead of a list when a site does not yet have any favourited notices.
-#: actions/favorited.php:149
 msgid "Favorite notices appear on this page but no one has favorited one yet."
 msgstr ""
 "As notas favoritas aparecem nesta página, mas ninguém elegeu nenhuma ainda."
 
 #. TRANS: Additional text displayed instead of a list when a site does not yet have any favourited notices for logged in users.
-#: actions/favorited.php:153
 msgid ""
 "Be the first to add a notice to your favorites by clicking the fave button "
 "next to any notice you like."
@@ -2791,7 +2233,6 @@ msgstr ""
 
 #. TRANS: Additional text displayed instead of a list when a site does not yet have any favourited notices for not logged in users.
 #. TRANS: %%action.register%% is a registration link. "[link text](link)" is Mark Down. Do not change the formatting.
-#: actions/favorited.php:158
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to add a "
@@ -2804,181 +2245,146 @@ msgstr ""
 #. TRANS: %s is a user's nickname.
 #. TRANS: Title for first page of favourite notices of a user.
 #. TRANS: %s is the user for whom the favourite notices are displayed.
-#: actions/favoritesrss.php:111 actions/showfavorites.php:76
-#: lib/personalgroupnav.php:110
 #, php-format
 msgid "%s's favorite notices"
 msgstr "Notas favoritas de %s"
 
 #. TRANS: Desciption of RSS feed with favourite notices of a user.
 #. TRANS: %1$s is a user's nickname, %2$s is the name of the StatusNet site.
-#: actions/favoritesrss.php:117
 #, php-format
 msgid "Updates favored by %1$s on %2$s!"
 msgstr "Actualizações marcadas por %1$s em %2$s!"
 
 #. TRANS: Page title for first page of featured users.
 #. TRANS: Title for featured users section.
-#: actions/featured.php:69 lib/featureduserssection.php:87
-#: lib/publicgroupnav.php:89
 msgid "Featured users"
 msgstr "Utilizadores em destaque"
 
 #. TRANS: Page title for all but first page of featured users.
 #. TRANS: %d is the page number being displayed.
-#: actions/featured.php:73
 #, php-format
 msgid "Featured users, page %d"
 msgstr "utilizadores em destaque, página %d"
 
 #. TRANS: Description on page displaying featured users.
-#: actions/featured.php:102
 #, fuzzy, php-format
 msgid "A selection of some great users on %s."
 msgstr "Uma selecção dos melhores utilizadores no %s"
 
 #. TRANS: Client error displayed when no notice ID was given trying do display a file.
-#: actions/file.php:36
 msgid "No notice ID."
 msgstr "Sem identificação de nota."
 
 #. TRANS: Client error displayed when an invalid notice ID was given trying do display a file.
-#: actions/file.php:41
 msgid "No notice."
 msgstr "Sem nota."
 
 #. TRANS: Client error displayed when trying do display a file for a notice without a file attachement.
-#: actions/file.php:46
 msgid "No attachments."
 msgstr "Sem anexos."
 
 #. TRANS: Client error displayed when trying do display a file for a notice with file attachements
 #. TRANS: that could not be found.
-#: actions/file.php:58
 msgid "No uploaded attachments."
 msgstr "Sem anexos carregados."
 
 #. TRANS: Client error displayed when subscribing to a remote profile and an unexpected response is received.
-#: actions/finishremotesubscribe.php:69
 msgid "Not expecting this response!"
 msgstr "Não esperava esta resposta!"
 
 #. TRANS: Client error displayed when subscribing to a remote profile that does not exist.
-#: actions/finishremotesubscribe.php:81
 msgid "User being listened to does not exist."
 msgstr "O utilizador que está a escutar não existe."
 
 #. TRANS: Client error displayed when subscribing to a remote profile that is a local profile.
-#: actions/finishremotesubscribe.php:89 actions/remotesubscribe.php:58
 msgid "You can use the local subscription!"
 msgstr "Pode usar a subscrição local!"
 
 #. TRANS: Client error displayed when subscribing to a remote profile that is blocked form subscribing to.
-#: actions/finishremotesubscribe.php:102
 msgid "That user has blocked you from subscribing."
 msgstr "Esse utilizador bloqueou-o, impedindo que o subscreva."
 
 #. TRANS: Client error displayed when subscribing to a remote profile without providing an authorised token.
-#: actions/finishremotesubscribe.php:114
 msgid "You are not authorized."
 msgstr "Não tem autorização."
 
 #. TRANS: Client error displayed when subscribing to a remote profile and conversion of the request token to access token fails.
-#: actions/finishremotesubscribe.php:118
 msgid "Could not convert request token to access token."
 msgstr "Não foi possível converter a chave de pedido numa chave de acesso."
 
 #. TRANS: Client error displayed when subscribing to a remote profile fails because of an unsupported version of the OMB protocol.
-#: actions/finishremotesubscribe.php:124
 msgid "Remote service uses unknown version of OMB protocol."
 msgstr "Serviço remoto usa uma versão desconhecida do protocolo OMB."
 
 #. TRANS: Server error displayed when subscribing to a remote profile fails because the remote profile could not be updated.
-#: actions/finishremotesubscribe.php:145 lib/oauthstore.php:317
 msgid "Error updating remote profile."
 msgstr "Erro ao actualizar o perfil remoto."
 
 #. TRANS: Client error displayed when requesting a non-existent file.
-#: actions/getfile.php:77
 msgid "No such file."
 msgstr "Ficheiro não foi encontrado."
 
 #. TRANS: Client error displayed when requesting a file without having read access to it.
-#: actions/getfile.php:82
 msgid "Cannot read file."
 msgstr "Não foi possível ler o ficheiro."
 
 #. TRANS: Client error displayed when trying to assign an invalid role to a user.
-#: actions/grantrole.php:61 actions/revokerole.php:62
 msgid "Invalid role."
 msgstr "Função inválida."
 
 #. TRANS: Client error displayed when trying to assign an reserved role to a user.
-#: actions/grantrole.php:66 actions/revokerole.php:66
 msgid "This role is reserved and cannot be set."
 msgstr "Esta função está reservada e não pode ser activada."
 
 #. TRANS: Client error displayed when trying to assign a role to a user while not being allowed to set roles.
-#: actions/grantrole.php:76
 msgid "You cannot grant user roles on this site."
 msgstr "Não pode atribuir funções aos utilizadores neste site."
 
 #. TRANS: Client error displayed when trying to assign a role to a user that already has that role.
-#: actions/grantrole.php:84
 msgid "User already has this role."
 msgstr "O utilizador já tem esta função."
 
 #. TRANS: Client error displayed trying to block a user from a group while not specifying a to be blocked user profile.
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing a profile.
+#. TRANS: Client error displayed when not providing a profile ID on the Make Admin page.
 #. TRANS: Client error displayed trying a change a subscription without providing a profile.
 #. TRANS: Client error displayed when trying to change user options without specifying a user to work on.
-#: actions/groupblock.php:71 actions/groupunblock.php:71
-#: actions/makeadmin.php:71 actions/subedit.php:49
-#: lib/profileformaction.php:79
 msgid "No profile specified."
 msgstr "Não foi especificado um perfil."
 
 #. TRANS: Client error displayed trying to block a user from a group while specifying a non-existing profile.
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing an existing profile.
+#. TRANS: Client error displayed when specifying an invalid profile ID on the Make Admin page.
 #. TRANS: Client error displayed trying a change a subscription for a non-existant profile ID.
 #. TRANS: Client error displayed when trying to change user options without specifying an existing user to work on.
-#: actions/groupblock.php:77 actions/groupunblock.php:77
-#: actions/makeadmin.php:76 actions/subedit.php:57 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:87
 msgid "No profile with that ID."
 msgstr "Não foi encontrado um perfil com essa identificação."
 
 #. TRANS: Client error displayed trying to block a user from a group while not specifying a group to block a profile from.
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing a group.
-#: actions/groupblock.php:83 actions/groupunblock.php:83
-#: actions/makeadmin.php:81
+#. TRANS: Client error displayed when not providing a group ID on the Make Admin page.
 msgid "No group specified."
 msgstr "Não foi especificado um grupo."
 
 #. TRANS: Client error displayed trying to block a user from a group while not being an admin user.
-#: actions/groupblock.php:95
 msgid "Only an admin can block group members."
 msgstr "Só um gestor pode bloquear membros de um grupo."
 
 #. TRANS: Client error displayed trying to block a user from a group while user is already blocked from the given group.
-#: actions/groupblock.php:100
 msgid "User is already blocked from group."
 msgstr "Acesso do utilizador ao grupo já foi bloqueado."
 
 #. TRANS: Client error displayed trying to block a user from a group while user is not a member of given group.
-#: actions/groupblock.php:106
 msgid "User is not a member of group."
 msgstr "Utilizador não é membro do grupo."
 
 #. TRANS: Title for block user from group page.
 #. TRANS: Form legend for form to block user from a group.
-#: actions/groupblock.php:141 actions/groupmembers.php:364
 msgid "Block user from group"
 msgstr "Bloquear acesso do utilizador ao grupo"
 
 #. TRANS: Explanatory text for block user from group form before setting the block.
 #. TRANS: %1$s is that to be blocked user, %2$s is the group the user will be blocked from.
-#: actions/groupblock.php:169
 #, php-format
 msgid ""
 "Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They "
@@ -2990,40 +2396,33 @@ msgstr ""
 "impossibilitado de subscrever o grupo no futuro."
 
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
-#: actions/groupblock.php:191
 #, fuzzy
 msgid "Do not block this user from this group."
 msgstr "Não bloquear acesso deste utilizador a este grupo"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
-#: actions/groupblock.php:198
 #, fuzzy
 msgid "Block this user from this group."
 msgstr "Bloquear acesso deste utilizador a este grupo"
 
 #. TRANS: Server error displayed when trying to block a user from a group fails because of an application error.
-#: actions/groupblock.php:215
 msgid "Database error blocking user from group."
 msgstr "Erro na base de dados ao bloquear acesso do utilizador ao grupo."
 
 #. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
 #. TRANS: Client error displayed trying to find a user by ID without providing an ID.
-#: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr "Sem ID."
 
 #. TRANS: Client error displayed trying to change group design settings while not logged in.
-#: actions/groupdesignsettings.php:67
 msgid "You must be logged in to edit a group."
 msgstr "Tem de iniciar uma sessão para editar um grupo."
 
 #. TRANS: Title group design settings page.
-#: actions/groupdesignsettings.php:146
 msgid "Group design"
 msgstr "Estilo do grupo"
 
 #. TRANS: Instructions for group design settings page.
-#: actions/groupdesignsettings.php:157
 msgid ""
 "Customize the way your group looks with a background image and a colour "
 "palette of your choice."
@@ -3032,25 +2431,21 @@ msgstr ""
 "cores à sua escolha."
 
 #. TRANS: Form validation error displayed when group design settings could not be updated because of an application issue.
-#: actions/groupdesignsettings.php:262
 #, fuzzy
 msgid "Unable to update your design settings."
 msgstr "Não foi possível gravar as configurações do estilo."
 
 #. TRANS: Form text to confirm saved group design settings.
-#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:239
 msgid "Design preferences saved."
 msgstr "Preferências de estilo foram gravadas."
 
 #. TRANS: Title for group logo settings page.
 #. TRANS: Group logo form legend.
-#: actions/grouplogo.php:144 actions/grouplogo.php:199
 msgid "Group logo"
 msgstr "Logotipo do grupo"
 
 #. TRANS: Instructions for group logo page.
 #. TRANS: %s is the maximum file size for that site.
-#: actions/grouplogo.php:156
 #, php-format
 msgid ""
 "You can upload a logo image for your group. The maximum file size is %s."
@@ -3059,91 +2454,75 @@ msgstr ""
 "ficheiro é %s."
 
 #. TRANS: Submit button for uploading a group logo.
-#: actions/grouplogo.php:243
 msgid "Upload"
 msgstr "Carregar"
 
 #. TRANS: Button text for cropping an uploaded group logo.
-#: actions/grouplogo.php:299
 msgid "Crop"
 msgstr "Cortar"
 
 #. TRANS: Form instructions on the group logo page.
-#: actions/grouplogo.php:376
 msgid "Pick a square area of the image to be the logo."
 msgstr "Escolha uma área quadrada da imagem para ser o logotipo."
 
 #. TRANS: Form success message after updating a group logo.
-#: actions/grouplogo.php:411
 msgid "Logo updated."
 msgstr "Logotipo actualizado."
 
 #. TRANS: Form failure message after failing to update a group logo.
-#: actions/grouplogo.php:414
 msgid "Failed updating logo."
 msgstr "Não foi possível actualizar o logotipo."
 
 #. TRANS: Title of the page showing group members.
 #. TRANS: %s is the name of the group.
-#: actions/groupmembers.php:104
 #, php-format
 msgid "%s group members"
 msgstr "Membros do grupo %s"
 
 #. TRANS: Title of the page showing group members.
 #. TRANS: %1$s is the name of the group, %2$d is the page number of the members list.
-#: actions/groupmembers.php:109
 #, php-format
 msgid "%1$s group members, page %2$d"
 msgstr "Membros do grupo %1$s, página %2$d"
 
 #. TRANS: Page notice for group members page.
-#: actions/groupmembers.php:125
 msgid "A list of the users in this group."
 msgstr "Uma lista dos utilizadores neste grupo."
 
 #. TRANS: Indicator in group members list that this user is a group administrator.
-#: actions/groupmembers.php:190 lib/action.php:581
 msgid "Admin"
 msgstr "Gestor"
 
 #. TRANS: Button text for the form that will block a user from a group.
-#: actions/groupmembers.php:397
 msgctxt "BUTTON"
 msgid "Block"
 msgstr "Bloquear"
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:401
 msgctxt "TOOLTIP"
 msgid "Block this user"
 msgstr ""
 
 #. TRANS: Form legend for form to make a user a group admin.
-#: actions/groupmembers.php:488
 msgid "Make user an admin of the group"
 msgstr "Tornar utilizador o gestor do grupo"
 
 #. TRANS: Button text for the form that will make a user administrator.
-#: actions/groupmembers.php:521
 msgctxt "BUTTON"
 msgid "Make Admin"
 msgstr "Tornar Gestor"
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:525
 msgctxt "TOOLTIP"
 msgid "Make this user an admin"
 msgstr "Tornar este utilizador um gestor"
 
 #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
-#: actions/grouprss.php:141
 #, php-format
 msgid "Updates from members of %1$s on %2$s!"
 msgstr "Actualizações dos membros de %1$s em %2$s!"
 
 #. TRANS: Title for first page of the groups list.
-#: actions/groups.php:62
 #, fuzzy
 msgctxt "TITLE"
 msgid "Groups"
@@ -3151,7 +2530,6 @@ msgstr "Grupos"
 
 #. TRANS: Title for all but the first page of the groups list.
 #. TRANS: %d is the page number.
-#: actions/groups.php:66
 #, fuzzy, php-format
 msgctxt "TITLE"
 msgid "Groups, page %d"
@@ -3160,7 +2538,6 @@ msgstr "Grupos, página %d"
 #. TRANS: Page notice of group list. %%%%site.name%%%% is the StatusNet site name,
 #. TRANS: %%%%action.groupsearch%%%% and %%%%action.newgroup%%%% are URLs. Do not change them.
 #. TRANS: This message contains Markdown links in the form [link text](link).
-#: actions/groups.php:95
 #, fuzzy, php-format
 msgid ""
 "%%%%site.name%%%% groups let you find and talk with people of similar "
@@ -3176,12 +2553,10 @@ msgstr ""
 "groupsearch%%) ou [crie o seu!](%%action.newgroup%%)"
 
 #. TRANS: Link to create a new group on the group list page.
-#: actions/groups.php:113 actions/usergroups.php:126 lib/groupeditform.php:115
 msgid "Create a new group"
 msgstr "Criar um grupo novo"
 
 #. TRANS: Instructions for page where groups can be searched. %%site.name%% is the name of the StatusNet site.
-#: actions/groupsearch.php:53
 #, php-format
 msgid ""
 "Search for groups on %%site.name%% by their name, location, or description. "
@@ -3191,21 +2566,17 @@ msgstr ""
 "termos de busca devem ter 3 ou mais caracteres e estar separados por espaços."
 
 #. TRANS: Title for page where groups can be searched.
-#: actions/groupsearch.php:60
 msgid "Group search"
 msgstr "Pesquisa de grupos"
 
 #. TRANS: Text on page where groups can be searched if no results were found for a query.
 #. TRANS: Text for notice search results is the query had no results.
 #. TRANS: Message on the "People search" page where a query has no results.
-#: actions/groupsearch.php:82 actions/noticesearch.php:122
-#: actions/peoplesearch.php:87
 msgid "No results."
 msgstr "Sem resultados."
 
 #. TRANS: Additional text on page where groups can be searched if no results were found for a query for a logged in user.
 #. TRANS: This message contains Markdown links in the form [link text](link).
-#: actions/groupsearch.php:87
 #, fuzzy, php-format
 msgid ""
 "If you cannot find the group you're looking for, you can [create it](%%"
@@ -3216,7 +2587,6 @@ msgstr ""
 
 #. TRANS: Additional text on page where groups can be searched if no results were found for a query for a not logged in user.
 #. TRANS: This message contains Markdown links in the form [link text](link).
-#: actions/groupsearch.php:92
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and [create the group](%%"
@@ -3226,30 +2596,25 @@ msgstr ""
 "newgroup%%) você mesmo!"
 
 #. TRANS: Client error displayed when trying to unblock a user from a group without being an administrator for the group.
-#: actions/groupunblock.php:95
 msgid "Only an admin can unblock group members."
 msgstr "Só um gestor pode desbloquear membros de um grupo."
 
 #. TRANS: Client error displayed when trying to unblock a non-blocked user from a group.
-#: actions/groupunblock.php:100
 msgid "User is not blocked from group."
 msgstr "Acesso do utilizador ao grupo não foi bloqueado."
 
 #. TRANS: Server error displayed when unblocking a user from a group fails because of an unknown error.
 #. TRANS: Server error displayed when removing a user block.
-#: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "Erro ao remover o bloqueio."
 
 #. TRANS: Title for Instant Messaging settings.
-#: actions/imsettings.php:56
 msgid "IM settings"
 msgstr "Configurações do 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.
-#: actions/imsettings.php:69
 #, fuzzy, php-format
 msgid ""
 "You can send and receive notices through instant messaging [instant messages]"
@@ -3259,18 +2624,15 @@ msgstr ""
 "Jabber/GTalk. Configure o seu endereço e outras definições abaixo."
 
 #. TRANS: Message given in the IM settings if IM is not enabled on the site.
-#: actions/imsettings.php:90
 msgid "IM is not available."
 msgstr "MI não está disponível."
 
-#: actions/imsettings.php:116
 #, fuzzy, php-format
 msgid "Current confirmed %s address."
 msgstr "Endereço de correio já confirmado."
 
 #. TRANS: Form note in IM settings form.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:128
 #, fuzzy, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your %s account for a message "
@@ -3280,88 +2642,73 @@ msgstr ""
 "enviadas para a sua conta de Jabber/GTalk. (Adicionou %s à sua lista de "
 "amigos?)"
 
-#: actions/imsettings.php:140
 msgid "IM address"
 msgstr "Endereço IM"
 
-#: actions/imsettings.php:142
 #, php-format
 msgid "%s screenname."
 msgstr ""
 
 #. TRANS: Header for IM preferences form.
-#: actions/imsettings.php:163
 #, fuzzy
 msgid "IM Preferences"
 msgstr "Preferências de MI"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:174
 #, fuzzy
 msgid "Send me notices"
 msgstr "Enviar uma nota"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:176
 #, fuzzy
 msgid "Post a notice when my status changes."
 msgstr "Publicar uma nota quando o meu estado no Jabber/GTalk se altera."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:178
 #, fuzzy
 msgid "Send me replies from people I'm not subscribed to."
 msgstr "Enviar-me via Jabber/GTalk respostas de pessoas que não subscrevo."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:181
 #, fuzzy
 msgid "Publish a MicroID"
 msgstr "Publicar um MicroID para o meu endereço electrónico."
 
 #. TRANS: Server error thrown on database error updating IM preferences.
-#: actions/imsettings.php:291
 #, fuzzy
 msgid "Couldn't update IM preferences."
 msgstr "Não foi possível actualizar o utilizador."
 
 #. TRANS: Confirmation message for successful IM preferences save.
 #. TRANS: Confirmation message after saving preferences.
-#: actions/imsettings.php:298 actions/urlsettings.php:244
 msgid "Preferences saved."
 msgstr "Preferências gravadas."
 
 #. TRANS: Message given saving IM address without having provided one.
-#: actions/imsettings.php:320
 #, fuzzy
 msgid "No screenname."
 msgstr "Nome de utilizador não definido."
 
-#: actions/imsettings.php:325
 #, fuzzy
 msgid "No transport."
 msgstr "Sem nota."
 
 #. TRANS: Message given saving IM address that cannot be normalised.
-#: actions/imsettings.php:333
 #, fuzzy
 msgid "Cannot normalize that screenname"
 msgstr "Não é possível normalizar esse Jabber ID"
 
 #. TRANS: Message given saving IM address that not valid.
-#: actions/imsettings.php:340
 #, fuzzy
 msgid "Not a valid screenname"
 msgstr "Utilizador não é válido."
 
 #. TRANS: Message given saving IM address that is already set for another user.
-#: actions/imsettings.php:344
 #, fuzzy
 msgid "Screenname already belongs to another user."
 msgstr "O Jabber ID introduzido já pertence a outro utilizador."
 
 #. TRANS: Message given saving valid IM address that is to be confirmed.
-#: actions/imsettings.php:369
 #, fuzzy
 msgid "A confirmation code was sent to the IM address you added."
 msgstr ""
@@ -3369,68 +2716,57 @@ msgstr ""
 "aprovar que %s envie mensagens para si."
 
 #. TRANS: Message given canceling IM address confirmation for the wrong IM address.
-#: actions/imsettings.php:396
 msgid "That is the wrong IM address."
 msgstr "Esse endereço de mensagens instantâneas está errado."
 
 #. TRANS: Server error thrown on database error canceling IM address confirmation.
-#: actions/imsettings.php:405
 #, fuzzy
 msgid "Couldn't delete confirmation."
 msgstr "Não foi possível apagar a confirmação do mensageiro instantâneo."
 
 #. TRANS: Message given after successfully canceling IM address confirmation.
-#: actions/imsettings.php:410
 msgid "IM confirmation cancelled."
 msgstr "Confirmação do mensageiro instantâneo cancelada."
 
 #. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.
-#: actions/imsettings.php:434
 #, fuzzy
 msgid "That is not your screenname."
 msgstr "Esse número de telefone não é o seu."
 
 #. TRANS: Server error thrown on database error removing a registered IM address.
-#: actions/imsettings.php:443
 #, fuzzy
 msgid "Couldn't update user im prefs."
 msgstr "Não foi possível actualizar o registo do utilizador."
 
 #. TRANS: Message given after successfully removing a registered Instant Messaging address.
-#: actions/imsettings.php:451
 msgid "The IM address was removed."
 msgstr "O endereço do mensageiro instantâneo foi removido."
 
 #. TRANS: Title for all but the first page of the inbox page.
 #. TRANS: %1$s is the user's nickname, %2$s is the page number.
-#: actions/inbox.php:59
 #, php-format
 msgid "Inbox for %1$s - page %2$d"
 msgstr "Caixa de entrada de %s - página %2$d"
 
 #. TRANS: Title for the first page of the inbox page.
 #. TRANS: %s is the user's nickname.
-#: actions/inbox.php:64
 #, php-format
 msgid "Inbox for %s"
 msgstr "Caixa de entrada de %s"
 
 #. TRANS: Instructions for user inbox page.
-#: actions/inbox.php:106
 msgid "This is your inbox, which lists your incoming private messages."
 msgstr ""
 "Esta é a sua caixa de entrada, que apresenta as mensagens privadas que "
 "recebeu."
 
 #. TRANS: Client error displayed when trying to sent invites while they have been disabled.
-#: actions/invite.php:41
 msgid "Invites have been disabled."
 msgstr "Convites foram desabilitados."
 
 #. TRANS: Client error displayed when trying to sent invites while not logged in.
 #. TRANS: %s is the StatusNet site name.
-#: actions/invite.php:45
 #, php-format
 msgid "You must be logged in to invite other users to use %s."
 msgstr ""
@@ -3439,19 +2775,16 @@ msgstr ""
 
 #. TRANS: Form validation message when providing an e-mail address that does not validate.
 #. TRANS: %s is an invalid e-mail address.
-#: actions/invite.php:78
 #, fuzzy, php-format
 msgid "Invalid email address: %s."
 msgstr "Endereço electrónico inválido: %s"
 
 #. TRANS: Page title when invitations have been sent.
-#: actions/invite.php:117
 #, fuzzy
 msgid "Invitations sent"
 msgstr "Convite(s) enviado(s)"
 
 #. TRANS: Page title when inviting potential users.
-#: actions/invite.php:120
 msgid "Invite new users"
 msgstr "Convidar novos utilizadores"
 
@@ -3459,7 +2792,6 @@ msgstr "Convidar novos utilizadores"
 #. TRANS: is already subscribed to one or more users with the given e-mail address(es).
 #. TRANS: Plural form is based on the number of reported already subscribed e-mail addresses.
 #. TRANS: Followed by a bullet list.
-#: actions/invite.php:140
 #, fuzzy
 msgid "You are already subscribed to this user:"
 msgid_plural "You are already subscribed to these users:"
@@ -3468,7 +2800,6 @@ msgstr[1] "Já subscreveu estes utilizadores:"
 
 #. TRANS: Used as list item for already subscribed users (%1$s is nickname, %2$s is e-mail address).
 #. TRANS: Used as list item for already registered people (%1$s is nickname, %2$s is e-mail address).
-#: actions/invite.php:146 actions/invite.php:160
 #, fuzzy, php-format
 msgctxt "INVITE"
 msgid "%1$s (%2$s)"
@@ -3477,7 +2808,6 @@ msgstr "%1$s (%2$s)"
 #. TRANS: Message displayed inviting users to use a StatusNet site while the invited user
 #. TRANS: already uses a this StatusNet site. Plural form is based on the number of
 #. TRANS: reported already present people. Followed by a bullet list.
-#: actions/invite.php:154
 #, fuzzy
 msgid "This person is already a user and you were automatically subscribed:"
 msgid_plural ""
@@ -3490,7 +2820,6 @@ msgstr[1] ""
 #. TRANS: Message displayed inviting users to use a StatusNet site. Plural form is
 #. TRANS: based on the number of invitations sent. Followed by a bullet list of
 #. TRANS: e-mail addresses to which invitations were sent.
-#: actions/invite.php:168
 #, fuzzy
 msgid "Invitation sent to the following person:"
 msgid_plural "Invitations sent to the following people:"
@@ -3499,7 +2828,6 @@ msgstr[1] "Convite(s) enviado(s) para as seguintes pessoas:"
 
 #. TRANS: Generic message displayed after sending out one or more invitations to
 #. TRANS: people to join a StatusNet site.
-#: actions/invite.php:178
 msgid ""
 "You will be notified when your invitees accept the invitation and register "
 "on the site. Thanks for growing the community!"
@@ -3508,35 +2836,30 @@ msgstr ""
 "registarem no site. Obrigado por aumentar a comunidade!"
 
 #. TRANS: Form instructions.
-#: actions/invite.php:191
 msgid ""
 "Use this form to invite your friends and colleagues to use this service."
 msgstr ""
 "Use este formulário para convidar amigos e colegas a usar este serviço."
 
 #. TRANS: Field label for a list of e-mail addresses.
-#: actions/invite.php:218
 msgid "Email addresses"
 msgstr "Endereços de correio electrónico"
 
 #. TRANS: Tooltip for field label for a list of e-mail addresses.
-#: actions/invite.php:221
 #, fuzzy
 msgid "Addresses of friends to invite (one per line)."
 msgstr "Endereços dos amigos a convidar (um por linha)"
 
 #. TRANS: Field label for a personal message to send to invitees.
-#: actions/invite.php:225
 msgid "Personal message"
 msgstr "Mensagem pessoal"
 
 #. TRANS: Tooltip for field label for a personal message to send to invitees.
-#: actions/invite.php:228
 msgid "Optionally add a personal message to the invitation."
 msgstr "Pode optar por acrescentar uma mensagem pessoal ao convite"
 
 #. TRANS: Send button for inviting friends
-#: actions/invite.php:232
+#. TRANS: Button text for sending notice.
 msgctxt "BUTTON"
 msgid "Send"
 msgstr "Enviar"
@@ -3544,7 +2867,6 @@ msgstr "Enviar"
 #. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral
 #. TRANS: singular 3rd-person pronoun in English. %1$s is the inviting user, $2$s is
 #. TRANS: the StatusNet sitename.
-#: actions/invite.php:264
 #, php-format
 msgid "%1$s has invited you to join them on %2$s"
 msgstr "%1$s convidou-o a juntar-se a ele no %2$s"
@@ -3554,7 +2876,6 @@ msgstr "%1$s convidou-o a juntar-se a ele no %2$s"
 #. TRANS: StatusNet sitename, %3$s is the site URL, %4$s is the personal message from the
 #. TRANS: inviting user, %s%5 a link to the timeline for the inviting user, %s$6 is a link
 #. TRANS: to register with the StatusNet site.
-#: actions/invite.php:271
 #, php-format
 msgid ""
 "%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -3611,184 +2932,179 @@ msgstr ""
 "Sinceramente, %2$s\n"
 
 #. TRANS: Client error displayed when trying to join a group while not logged in.
-#: actions/joingroup.php:59
 msgid "You must be logged in to join a group."
 msgstr "Tem de iniciar uma sessão para se juntar a um grupo."
 
 #. TRANS: Title for join group page after joining.
-#: actions/joingroup.php:148
 #, fuzzy, php-format
 msgctxt "TITLE"
 msgid "%1$s joined group %2$s"
 msgstr "%1$s juntou-se ao grupo %2$s"
 
 #. TRANS: Client error displayed when trying to leave a group while not logged in.
-#: actions/leavegroup.php:59
 msgid "You must be logged in to leave a group."
 msgstr "Tem de iniciar uma sessão para deixar um grupo."
 
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
-#: actions/leavegroup.php:103 lib/command.php:398
 msgid "You are not a member of that group."
 msgstr "Não é um membro desse grupo."
 
 #. TRANS: Title for leave group page after leaving.
-#: actions/leavegroup.php:142
 #, fuzzy, php-format
 msgctxt "TITLE"
 msgid "%1$s left group %2$s"
 msgstr "%1$s deixou o grupo %2$s"
 
 #. TRANS: User admin panel title
-#: actions/licenseadminpanel.php:55
 msgctxt "TITLE"
 msgid "License"
 msgstr ""
 
-#: actions/licenseadminpanel.php:65
+#. TRANS: Form instructions for the site license admin panel.
 msgid "License for this StatusNet site"
 msgstr ""
 
-#: actions/licenseadminpanel.php:134
+#. TRANS: Client error displayed selecting an invalid license in the license admin panel.
 msgid "Invalid license selection."
 msgstr ""
 
-#: actions/licenseadminpanel.php:144
+#. TRANS: Client error displayed when not specifying an owner for the all rights reserved license in the license admin panel.
 msgid ""
 "You must specify the owner of the content when using the All Rights Reserved "
 "license."
 msgstr ""
 
-#: actions/licenseadminpanel.php:151
+#. TRANS: Client error displayed selecting a too long license title in the license admin panel.
 #, fuzzy
 msgid "Invalid license title. Maximum length is 255 characters."
 msgstr "Texto de boas-vindas inválido. Tamanho máx. é 255 caracteres."
 
-#: actions/licenseadminpanel.php:163
+#. TRANS: Client error displayed specifying an invalid license URL in the license admin panel.
 msgid "Invalid license URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:166
+#. TRANS: Client error displayed specifying an invalid license image URL in the license admin panel.
 msgid "Invalid license image URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:174
+#. TRANS: Client error displayed specifying an invalid license URL in the license admin panel.
 msgid "License URL must be blank or a valid URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:182
+#. TRANS: Client error displayed specifying an invalid license image URL in the license admin panel.
 msgid "License image must be blank or valid URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:232
+#. TRANS: Form legend in the license admin panel.
 msgid "License selection"
 msgstr ""
 
-#: actions/licenseadminpanel.php:238
+#. TRANS: License option in the license admin panel.
 msgid "Private"
 msgstr "Privado"
 
-#: actions/licenseadminpanel.php:239
+#. TRANS: License option in the license admin panel.
 msgid "All Rights Reserved"
 msgstr ""
 
-#: actions/licenseadminpanel.php:240
+#. TRANS: License option in the license admin panel.
 msgid "Creative Commons"
 msgstr ""
 
-#: actions/licenseadminpanel.php:245
+#. TRANS: Dropdown field label in the license admin panel.
 msgid "Type"
 msgstr ""
 
-#: actions/licenseadminpanel.php:247
-msgid "Select license"
-msgstr ""
+#. TRANS: Dropdown field instructions in the license admin panel.
+#, fuzzy
+msgid "Select a license."
+msgstr "Seleccione um operador"
 
-#: actions/licenseadminpanel.php:261
+#. TRANS: Form legend in the license admin panel.
 msgid "License details"
 msgstr ""
 
-#: actions/licenseadminpanel.php:267
+#. TRANS: Field label in the license admin panel.
 msgid "Owner"
 msgstr ""
 
-#: actions/licenseadminpanel.php:268
+#. TRANS: Field title in the license admin panel.
 msgid "Name of the owner of the site's content (if applicable)."
 msgstr ""
 
-#: actions/licenseadminpanel.php:276
+#. TRANS: Field label in the license admin panel.
 msgid "License Title"
 msgstr ""
 
-#: actions/licenseadminpanel.php:277
+#. TRANS: Field title in the license admin panel.
 msgid "The title of the license."
 msgstr ""
 
-#: actions/licenseadminpanel.php:285
+#. TRANS: Field label in the license admin panel.
 msgid "License URL"
 msgstr ""
 
-#: actions/licenseadminpanel.php:286
+#. TRANS: Field title in the license admin panel.
 msgid "URL for more information about the license."
 msgstr ""
 
-#: actions/licenseadminpanel.php:293
+#. TRANS: Field label in the license admin panel.
 msgid "License Image URL"
 msgstr ""
 
-#: actions/licenseadminpanel.php:294
+#. TRANS: Field title in the license admin panel.
 msgid "URL for an image to display with the license."
 msgstr ""
 
-#. TRANS: Submit button title.
-#: actions/licenseadminpanel.php:311 actions/sessionsadminpanel.php:199
-#: actions/siteadminpanel.php:292 actions/snapshotadminpanel.php:245
-#: actions/tagother.php:133 lib/applicationeditform.php:357
-msgid "Save"
-msgstr "Gravar"
-
-#: actions/licenseadminpanel.php:311
-msgid "Save license settings"
-msgstr ""
+#. TRANS: Button title in the license admin panel.
+#, fuzzy
+msgid "Save license settings."
+msgstr "Gravar configurações do site"
 
+#. TRANS: Client error displayed when trying to log in while already logged in.
 #. TRANS: Client error displayed trying to use "one time password login" when already logged in.
-#: actions/login.php:97 actions/otp.php:62 actions/register.php:130
 msgid "Already logged in."
 msgstr "Sessão já foi iniciada."
 
-#: actions/login.php:125
+#. TRANS: Form validation error displayed when trying to log in with incorrect credentials.
 msgid "Incorrect username or password."
 msgstr "Nome de utilizador ou senha incorrectos."
 
+#. TRANS: Server error displayed when during login a server error occurs.
 #. TRANS: Server error displayed when a user object could not be created trying to login using "one time password login".
-#: actions/login.php:131 actions/otp.php:127
 msgid "Error setting user. You are probably not authorized."
 msgstr "Erro ao preparar o utilizador. Provavelmente não está autorizado."
 
-#: actions/login.php:185 actions/login.php:236 lib/action.php:598
+#. TRANS: Page title for login page.
 msgid "Login"
 msgstr "Entrar"
 
-#: actions/login.php:222
+#. TRANS: Form legend on login page.
 msgid "Login to site"
 msgstr "Iniciar sessão no site"
 
-#: actions/login.php:231 actions/register.php:469
+#. TRANS: Checkbox label label on login page.
 msgid "Remember me"
 msgstr "Lembrar-me neste computador"
 
-#: actions/login.php:232 actions/register.php:471
+#. TRANS: Checkbox title on login page.
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 "De futuro, iniciar sessão automaticamente. Não usar em computadores "
 "partilhados!"
 
-#: actions/login.php:241
+#. TRANS: Button text for log in on login page.
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Login"
+msgstr "Entrar"
+
+#. TRANS: Link text for link to "reset password" on login page.
 msgid "Lost or forgotten password?"
 msgstr "Perdeu ou esqueceu-se da senha?"
 
-#: actions/login.php:259
+#. TRANS: Form instructions on login page before being able to change user settings.
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -3796,139 +3112,134 @@ msgstr ""
 "Por razões de segurança, por favor re-introduza o seu nome de utilizador e "
 "senha antes de alterar as configurações."
 
-#: actions/login.php:263
+#. TRANS: Form instructions on login page.
 msgid "Login with your username and password."
 msgstr "Iniciar sessão com um nome de utilizador e senha."
 
-#: actions/login.php:266
+#. TRANS: Form instructions on login page. This message contains Markdown links in the form [Link text](Link).
+#. TRANS: %%action.register%% is a link to the registration page.
 #, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
 msgstr "Ainda não está registado? [Registe](%%action.register%%) uma conta."
 
-#: actions/makeadmin.php:92
+#. TRANS: Client error displayed when trying to make another user admin on the Make Admin page while not an admin.
 msgid "Only an admin can make another user an admin."
 msgstr "Só um gestor pode tornar outro utilizador num gestor."
 
-#: actions/makeadmin.php:96
+#. TRANS: Client error displayed when trying to make another user admin on the Make Admin page who already is admin.
+#. TRANS: %1$s is the user that is already admin, %2$s is the group user is already admin for.
 #, php-format
 msgid "%1$s is already an admin for group \"%2$s\"."
 msgstr "%1$s já é um administrador do grupo \"%2$s\"."
 
-#: actions/makeadmin.php:133
+#. TRANS: Server error displayed when trying to make another user admin on the Make Admin page fails
+#. TRANS: because the group membership record could not be gotten.
+#. TRANS: %1$s is the to be admin user, %2$s is the group user should be admin for.
 #, php-format
 msgid "Can't get membership record for %1$s in group %2$s."
 msgstr "Não existe registo de %1$s ter entrado no grupo %2$s."
 
-#: actions/makeadmin.php:146
+#. TRANS: Server error displayed when trying to make another user admin on the Make Admin page fails
+#. TRANS: because the group adminship record coud not be saved properly.
+#. TRANS: %1$s is the to be admin user, %2$s is the group user is already admin for.
 #, php-format
 msgid "Can't make %1$s an admin for group %2$s."
 msgstr "Não é possível tornar %1$s administrador do grupo %2$s."
 
-#: actions/microsummary.php:69
+#. TRANS: Client error displayed trying to make a micro summary without providing a status.
 msgid "No current status."
 msgstr "Sem estado actual."
 
 #. TRANS: This is the title of the form for adding a new application.
-#: actions/newapplication.php:52
 #, fuzzy
 msgid "New application"
 msgstr "Aplicação Nova"
 
 #. TRANS: Client error displayed trying to add a new application while not logged in.
-#: actions/newapplication.php:64
 msgid "You must be logged in to register an application."
 msgstr "Tem de iniciar uma sessão para registar uma aplicação."
 
 #. TRANS: Form instructions for registering a new application.
-#: actions/newapplication.php:147
 msgid "Use this form to register a new application."
 msgstr "Use este formulário para registar uma nova aplicação."
 
 #. TRANS: Validation error shown when not providing a source URL in the "New application" form.
-#: actions/newapplication.php:189
 msgid "Source URL is required."
 msgstr "É necessária a URL de origem."
 
 #. TRANS: Server error displayed when an application could not be registered in the database through the "New application" form.
-#: actions/newapplication.php:279 actions/newapplication.php:289
 msgid "Could not create application."
 msgstr "Não foi possível criar a aplicação."
 
 #. TRANS: Title for form to create a group.
-#: actions/newgroup.php:53
 msgid "New group"
 msgstr "Grupo novo"
 
 #. TRANS: Client exception thrown when a user tries to create a group while banned.
-#: actions/newgroup.php:73 classes/User_group.php:485
 #, fuzzy
 msgid "You are not allowed to create groups on this site."
 msgstr "Não é membro deste grupo."
 
 #. TRANS: Form instructions for group create form.
-#: actions/newgroup.php:117
 msgid "Use this form to create a new group."
 msgstr "Use este formulário para criar um grupo novo."
 
-#. TRANS: Group create form validation error.
-#: actions/newgroup.php:200
-#, fuzzy
-msgid "Alias cannot be the same as nickname."
-msgstr "Um nome alternativo não pode ser igual ao nome do utilizador."
-
-#: actions/newmessage.php:71 actions/newmessage.php:234
+#. TRANS: Page title for new direct message page.
+#. TRANS: Page title on page for sending a direct message.
 msgid "New message"
 msgstr "Mensagem nova"
 
-#. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
-#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:513
-msgid "You can't send a message to this user."
+#. TRANS: Client error displayed trying to send a direct message to a user while sender and
+#. TRANS: receiver are not subscribed to each other.
+#, fuzzy
+msgid "You cannot send a message to this user."
 msgstr "Não pode enviar uma mensagem a este utilizador."
 
+#. TRANS: Form validator error displayed trying to send a direct message without content.
+#. TRANS: Client error displayed trying to send a notice without content.
 #. TRANS: Command exception text shown when trying to send a direct message to another user without content.
 #. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
-#: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:490
-#: lib/command.php:593
 msgid "No content!"
 msgstr "Sem conteúdo!"
 
-#: actions/newmessage.php:161
+#. TRANS: Form validation error displayed trying to send a direct message without specifying a recipient.
 msgid "No recipient specified."
 msgstr "Não especificou um destinatário."
 
+#. TRANS: Client error displayed trying to send a direct message to self.
 #. TRANS: Error text shown when trying to send a direct message to self.
-#: actions/newmessage.php:167 lib/command.php:517
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr "Não auto-envie uma mensagem; basta lê-la baixinho a si próprio."
 
-#: actions/newmessage.php:184
+#. TRANS: Page title after sending a direct message.
 msgid "Message sent"
 msgstr "Mensagem enviada"
 
+#. TRANS: Confirmation text after sending a direct message.
+#. TRANS: %s is the direct message recipient.
 #. TRANS: Message given have sent a direct message to another user.
 #. TRANS: %s is the name of the other user.
-#: actions/newmessage.php:188 lib/command.php:525
 #, php-format
 msgid "Direct message to %s sent."
 msgstr "Mensagem directa para %s foi enviada."
 
-#: actions/newmessage.php:213 actions/newnotice.php:264
+#. TRANS: Page title after an AJAX error occurred on the "send direct message" page.
+#. TRANS: Page title after an AJAX error occurs on the send notice page.
 msgid "Ajax Error"
 msgstr "Erro do Ajax"
 
-#: actions/newnotice.php:69
+#. TRANS: Page title for sending a new notice.
 msgid "New notice"
 msgstr "Nota nova"
 
-#: actions/newnotice.php:230
+#. TRANS: Page title after sending a notice.
 msgid "Notice posted"
 msgstr "Nota publicada"
 
 #. TRANS: Instructions for Notice search page.
 #. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/noticesearch.php:69
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -3938,20 +3249,17 @@ msgstr ""
 "busca devem ter 3 ou mais caracteres e estar separados por espaços."
 
 #. TRANS: Title of the page where users can search for notices.
-#: actions/noticesearch.php:80
 msgid "Text search"
 msgstr "Pesquisa de texto"
 
 #. TRANS: Test in RSS notice search.
 #. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearch.php:95
 #, php-format
 msgid "Search results for \"%1$s\" on %2$s"
 msgstr "Resultados da pesquisa de \"%1$s\" em %2$s"
 
 #. TRANS: Text for logged in users making a query for notices without results.
 #. TRANS: This message contains a Markdown link.
-#: actions/noticesearch.php:128
 #, php-format
 msgid ""
 "Be the first to [post on this topic](%%%%action.newnotice%%%%?"
@@ -3962,7 +3270,6 @@ msgstr ""
 
 #. TRANS: Text for not logged in users making a query for notices without results.
 #. TRANS: This message contains Markdown links.
-#: actions/noticesearch.php:133
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and be the first to "
@@ -3972,19 +3279,17 @@ msgstr ""
 "[publicar neste tópico](%%action.newnotice%%?status_textarea=%s)!"
 
 #. TRANS: RSS notice search feed title. %s is the query.
-#: actions/noticesearchrss.php:95
 #, php-format
 msgid "Updates with \"%s\""
 msgstr "Actualizações com \"%s\""
 
 #. TRANS: RSS notice search feed description.
 #. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearchrss.php:99
 #, fuzzy, php-format
 msgid "Updates matching search term \"%1$s\" on %2$s."
 msgstr "Actualizações que contêm o termo \"%1$s\" em %2$s!"
 
-#: actions/nudge.php:85
+#. TRANS: Client error displayed trying to nudge a user that cannot be nudged.
 #, fuzzy
 msgid ""
 "This user doesn't allow nudges or hasn't confirmed or set their email "
@@ -3993,60 +3298,51 @@ msgstr ""
 "Este utilizador não aceita toques ou ainda não confirmou ou forneceu um "
 "correio electrónico."
 
-#: actions/nudge.php:94
+#. TRANS: Page title after sending a nudge.
 msgid "Nudge sent"
 msgstr "Toque enviado"
 
-#: actions/nudge.php:97
+#. TRANS: Confirmation text after sending a nudge.
 msgid "Nudge sent!"
 msgstr "Toque enviado!"
 
 #. TRANS: Message displayed to an anonymous user trying to view OAuth application list.
-#: actions/oauthappssettings.php:57
 msgid "You must be logged in to list your applications."
 msgstr "Tem de iniciar uma sessão para listar as suas aplicações."
 
 #. TRANS: Page title for OAuth applications
-#: actions/oauthappssettings.php:73
 msgid "OAuth applications"
 msgstr "Aplicações OAuth"
 
 #. TRANS: Page instructions for OAuth applications
-#: actions/oauthappssettings.php:85
 msgid "Applications you have registered"
 msgstr "Aplicações que registou"
 
 #. TRANS: Empty list message on page with OAuth applications.
-#: actions/oauthappssettings.php:138
 #, php-format
 msgid "You have not registered any applications yet."
 msgstr "Ainda não registou nenhuma aplicação."
 
 #. TRANS: Title for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:69
 msgid "Connected applications"
 msgstr "Aplicações ligadas"
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:80
 msgid "The following connections exist for your account."
 msgstr ""
 
 #. TRANS: Client error when trying to revoke access for an application while not being a user of it.
-#: actions/oauthconnectionssettings.php:165
 msgid "You are not a user of that application."
 msgstr "Não é utilizador dessa aplicação."
 
 #. TRANS: Client error when revoking access has failed for some reason.
 #. TRANS: %s is the application ID revoking access failed for.
-#: actions/oauthconnectionssettings.php:180
 #, fuzzy, php-format
 msgid "Unable to revoke access for application: %s."
 msgstr "Não foi possível retirar acesso da aplicação: %s"
 
 #. TRANS: Success message after revoking access for an application.
 #. TRANS: %1$s is the application name, %2$s is the first part of the user token.
-#: actions/oauthconnectionssettings.php:199
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -4054,474 +3350,391 @@ msgid ""
 msgstr ""
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:210
 msgid "You have not authorized any applications to use your account."
 msgstr "Não permitiu que nenhuma aplicação use a sua conta."
 
 #. TRANS: Note for developers in the OAuth connection settings form.
 #. TRANS: This message contains a Markdown link. Do not separate "](".
 #. TRANS: %s is the URL to the OAuth settings.
-#: actions/oauthconnectionssettings.php:230
 #, php-format
 msgid ""
 "Are you a developer? [Register an OAuth client application](%s) to use with "
 "this instance of StatusNet."
 msgstr ""
 
-#: actions/oembed.php:64
+#. TRANS: Server error displayed in oEmbed action when path not found.
+#. TRANS: %s is a path.
 #, fuzzy, php-format
 msgid "\"%s\" not found."
 msgstr "Método da API não encontrado."
 
-#: actions/oembed.php:76
+#. TRANS: Server error displayed in oEmbed action when notice not found.
+#. TRANS: %s is a notice.
 #, fuzzy, php-format
 msgid "Notice %s not found."
 msgstr "Método da API não encontrado."
 
-#: actions/oembed.php:80 actions/shownotice.php:100
+#. TRANS: Server error displayed in oEmbed action when notice has not profile.
 msgid "Notice has no profile."
 msgstr "Nota não tem perfil."
 
-#: actions/oembed.php:83 actions/shownotice.php:172
+#. TRANS: oEmbed title. %1$s is the author name, %2$s is the creation date.
 #, php-format
 msgid "%1$s's status on %2$s"
 msgstr "Estado de %1$s em %2$s"
 
-#: actions/oembed.php:95
+#. TRANS: Server error displayed in oEmbed action when attachment not found.
+#. TRANS: %d is an attachment ID.
 #, fuzzy, php-format
 msgid "Attachment %s not found."
 msgstr "Destinatário não encontrado."
 
-#: actions/oembed.php:136
+#. TRANS: Server error displayed in oEmbed request when a path is not supported.
+#. TRANS: %s is a path.
 #, php-format
 msgid "\"%s\" not supported for oembed requests."
 msgstr ""
 
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
-#: actions/oembed.php:168
 #, php-format
 msgid "Content type %s not supported."
 msgstr "O tipo de conteúdo %s não é suportado."
 
 #. TRANS: Error message displaying attachments. %s is the site's base URL.
-#: actions/oembed.php:172
 #, php-format
 msgid "Only %s URLs over plain HTTP please."
 msgstr "Só URLs %s sobre HTTP simples, por favor."
 
+#. TRANS: Server error displayed in oEmbed action when request specifies an unsupported data format.
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1207
-#: lib/apiaction.php:1234 lib/apiaction.php:1369
 msgid "Not a supported data format."
 msgstr "Formato de dados não suportado."
 
 #. TRANS: ShortName in the OpenSearch interface when trying to find users.
-#: actions/opensearch.php:64
 msgid "People Search"
 msgstr "Pesquisa de Pessoas"
 
-#: actions/opensearch.php:68
+#. TRANS: ShortName in the OpenSearch interface when trying to find notices.
 msgid "Notice Search"
 msgstr "Pesquisa de Notas"
 
 #. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
-#: actions/otp.php:70
 msgid "No user ID specified."
 msgstr "Não foi especificado um ID de utilizador."
 
 #. TRANS: Client error displayed trying to use "one time password login" without specifying a login token.
-#: actions/otp.php:86
 msgid "No login token specified."
 msgstr "Chave de entrada não foi especificada."
 
 #. TRANS: Client error displayed trying to use "one time password login" without requesting a login token.
-#: actions/otp.php:94
 msgid "No login token requested."
 msgstr "Chave de entrada não foi pedida."
 
 #. TRANS: Client error displayed trying to use "one time password login" while specifying an invalid login token.
-#: actions/otp.php:100
 msgid "Invalid login token specified."
 msgstr "Chave de entrada especificada é inválida."
 
 #. TRANS: Client error displayed trying to use "one time password login" while specifying an expired login token.
-#: actions/otp.php:110
 msgid "Login token expired."
 msgstr "Chave de entrada expirou."
 
 #. TRANS: Title for outbox for any but the fist page.
 #. TRANS: %1$s is the user nickname, %2$d is the page number.
-#: actions/outbox.php:57
 #, php-format
 msgid "Outbox for %1$s - page %2$d"
 msgstr "Caixa de saída de %s - página %2$d"
 
 #. TRANS: Title for first page of outbox.
-#: actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
 msgstr "Caixa de saída de %s"
 
 #. TRANS: Instructions for outbox.
-#: actions/outbox.php:103
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr ""
 "Esta é a sua caixa de saída, que apresenta as mensagens privadas que enviou."
 
-#: actions/passwordsettings.php:58
 msgid "Change password"
 msgstr "Modificar senha"
 
-#: actions/passwordsettings.php:69
 msgid "Change your password."
 msgstr "Modificar a sua senha."
 
 #. TRANS: Fieldset legend for password reset form.
-#: actions/passwordsettings.php:96 actions/recoverpassword.php:251
 msgid "Password change"
 msgstr "Mudança da senha"
 
-#: actions/passwordsettings.php:104
 msgid "Old password"
 msgstr "Antiga"
 
 #. TRANS: Field label for password reset form.
-#: actions/passwordsettings.php:108 actions/recoverpassword.php:256
 msgid "New password"
 msgstr "Nova"
 
-#: actions/passwordsettings.php:109 actions/register.php:416
 #, fuzzy
 msgid "6 or more characters."
 msgstr "6 ou mais caracteres"
 
 #. TRANS: Ttile for field label for password reset form where the password has to be typed again.
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:264
-#: actions/register.php:420
 #, fuzzy
 msgid "Same as password above."
 msgstr "Repita a senha nova"
 
-#: actions/passwordsettings.php:117
 msgid "Change"
 msgstr "Modificar"
 
-#: actions/passwordsettings.php:153 actions/register.php:223
 msgid "Password must be 6 or more characters."
 msgstr "Senha tem de ter 6 ou mais caracteres."
 
-#: actions/passwordsettings.php:156 actions/register.php:226
 msgid "Passwords don't match."
 msgstr "Senhas não coincidem."
 
-#: actions/passwordsettings.php:164
 msgid "Incorrect old password"
 msgstr "Senha antiga incorrecta."
 
-#: actions/passwordsettings.php:180
 msgid "Error saving user; invalid."
 msgstr "Erro ao guardar utilizador; inválido."
 
 #. TRANS: Reset password form validation error message.
-#: actions/passwordsettings.php:185 actions/recoverpassword.php:418
 #, fuzzy
 msgid "Cannot save new password."
 msgstr "Não é possível guardar a nova senha."
 
-#: actions/passwordsettings.php:191
 msgid "Password saved."
 msgstr "Senha gravada."
 
 #. TRANS: Title for Paths admin panel.
 #. TRANS: Menu item for site administration
-#: actions/pathsadminpanel.php:58 lib/adminpanelaction.php:371
 msgid "Paths"
 msgstr "Localizações"
 
 #. TRANS: Form instructions for Path admin panel.
-#: actions/pathsadminpanel.php:69
 msgid "Path and server settings for this StatusNet site"
 msgstr ""
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the directory that could not be read from.
-#: actions/pathsadminpanel.php:155
 #, php-format
 msgid "Theme directory not readable: %s."
 msgstr "Sem acesso de leitura do directório do tema: %s."
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the avatar directory that could not be written to.
-#: actions/pathsadminpanel.php:163
 #, php-format
 msgid "Avatar directory not writable: %s."
 msgstr "Sem acesso de escrita no directório do avatar: %s."
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the background directory that could not be written to.
-#: actions/pathsadminpanel.php:171
 #, php-format
 msgid "Background directory not writable: %s."
 msgstr "Sem acesso de escrita no directório do fundo: %s."
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the locales directory that could not be read from.
-#: actions/pathsadminpanel.php:181
 #, php-format
 msgid "Locales directory not readable: %s."
 msgstr "Sem acesso de leitura ao directório das línguas: %s."
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the SSL server URL that is too long.
-#: actions/pathsadminpanel.php:189
 msgid "Invalid SSL server. The maximum length is 255 characters."
 msgstr "Servidor SSL inválido. O tamanho máximo é 255 caracteres."
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:235 actions/siteadminpanel.php:58
 msgid "Site"
 msgstr "Site"
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:241 actions/pathsadminpanel.php:279
-#: actions/pathsadminpanel.php:370 actions/pathsadminpanel.php:425
 msgid "Server"
 msgstr "Servidor"
 
-#: actions/pathsadminpanel.php:242
 msgid "Site's server hostname."
 msgstr "Nome do servidor do site."
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:248 actions/pathsadminpanel.php:288
-#: actions/pathsadminpanel.php:379 actions/pathsadminpanel.php:434
 msgid "Path"
 msgstr "Localização"
 
-#: actions/pathsadminpanel.php:249
 #, fuzzy
 msgid "Site path."
 msgstr "Localização do site"
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:255
 #, fuzzy
 msgid "Locale directory"
 msgstr "Directório do tema"
 
-#: actions/pathsadminpanel.php:256
 #, fuzzy
 msgid "Directory path to locales."
 msgstr "Localização do directório das línguas"
 
 #. TRANS: Checkbox label in Paths admin panel.
-#: actions/pathsadminpanel.php:263
 msgid "Fancy URLs"
 msgstr "URLs bonitas"
 
-#: actions/pathsadminpanel.php:265
 msgid "Use fancy (more readable and memorable) URLs?"
 msgstr "Usar URLs bonitas (mais legíveis e memoráveis)"
 
-#: actions/pathsadminpanel.php:272
 msgid "Theme"
 msgstr "Tema"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:281
 #, fuzzy
 msgid "Server for themes."
 msgstr "O tema para o site."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:290
 msgid "Web path to themes."
 msgstr ""
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:297 actions/pathsadminpanel.php:388
-#: actions/pathsadminpanel.php:443 actions/pathsadminpanel.php:495
 msgid "SSL server"
 msgstr "Servidor SSL"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:299
 msgid "SSL server for themes (default: SSL server)."
 msgstr ""
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:306 actions/pathsadminpanel.php:397
-#: actions/pathsadminpanel.php:452
 #, fuzzy
 msgid "SSL path"
 msgstr "Localização do site"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:308
 msgid "SSL path to themes (default: /theme/)."
 msgstr ""
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:315 actions/pathsadminpanel.php:406
-#: actions/pathsadminpanel.php:461
 #, fuzzy
 msgid "Directory"
 msgstr "Directório do tema"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:317
 #, fuzzy
 msgid "Directory where themes are located."
 msgstr "Localização do directório das línguas"
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:326
 msgid "Avatars"
 msgstr "Avatares"
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:333
 msgid "Avatar server"
 msgstr "Servidor do avatar"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:335
 #, fuzzy
 msgid "Server for avatars."
 msgstr "O tema para o site."
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:342
 msgid "Avatar path"
 msgstr "Localização do avatar"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:344
 #, fuzzy
 msgid "Web path to avatars."
 msgstr "Falha ao actualizar avatar."
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:351
 msgid "Avatar directory"
 msgstr "Directório do avatar"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:353
 #, fuzzy
 msgid "Directory where avatars are located."
 msgstr "Localização do directório das línguas"
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:364
 msgid "Backgrounds"
 msgstr "Fundos"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:372
 #, fuzzy
 msgid "Server for backgrounds."
 msgstr "O tema para o site."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:381
 msgid "Web path to backgrounds."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:390
 msgid "Server for backgrounds on SSL pages."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:399
 msgid "Web path to backgrounds on SSL pages."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:408
 #, fuzzy
 msgid "Directory where backgrounds are located."
 msgstr "Localização do directório das línguas"
 
 #. TRANS: Fieldset legens in Paths admin panel.
-#: actions/pathsadminpanel.php:419
 msgid "Attachments"
 msgstr "Anexos"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:427
 #, fuzzy
 msgid "Server for attachments."
 msgstr "O tema para o site."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:436
 #, fuzzy
 msgid "Web path to attachments."
 msgstr "Sem anexos."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:445
 #, fuzzy
 msgid "Server for attachments on SSL pages."
 msgstr "O tema para o site."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:454
 msgid "Web path to attachments on SSL pages."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:463
 #, fuzzy
 msgid "Directory where attachments are located."
 msgstr "Localização do directório das línguas"
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:472
 msgid "SSL"
 msgstr "SSL"
 
 #. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
-#: actions/pathsadminpanel.php:477 actions/snapshotadminpanel.php:202
 msgid "Never"
 msgstr "Nunca"
 
 #. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
-#: actions/pathsadminpanel.php:479
 msgid "Sometimes"
 msgstr "Às vezes"
 
 #. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
-#: actions/pathsadminpanel.php:481
 msgid "Always"
 msgstr "Sempre"
 
-#: actions/pathsadminpanel.php:485
 msgid "Use SSL"
 msgstr "Usar SSL"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:487
 #, fuzzy
 msgid "When to use SSL."
 msgstr "Quando usar SSL"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:497
 #, fuzzy
 msgid "Server to direct SSL requests to."
 msgstr "Servidor para onde encaminhar pedidos SSL"
 
 #. TRANS: Button title text to store form data in the Paths admin panel.
-#: actions/pathsadminpanel.php:514
 msgid "Save paths"
 msgstr "Gravar localizações"
 
 #. TRANS: Instructions for the "People search" page.
 #. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/peoplesearch.php:54
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
@@ -4532,57 +3745,46 @@ msgstr ""
 "separados por espaços."
 
 #. TRANS: Title of a page where users can search for other users.
-#: actions/peoplesearch.php:61
 msgid "People search"
 msgstr "Pesquisa de pessoas"
 
-#: actions/peopletag.php:68
 #, php-format
 msgid "Not a valid people tag: %s."
 msgstr "Categoria de pessoas inválida: %s."
 
-#: actions/peopletag.php:142
 #, php-format
 msgid "Users self-tagged with %1$s - page %2$d"
 msgstr "Utilizadores auto-categorizados com %1$s - página %2$d"
 
 #. TRANS: Page title for AJAX form return when a disabling a plugin.
-#: actions/plugindisable.php:69
 msgctxt "plugin"
 msgid "Disabled"
 msgstr ""
 
 #. TRANS: Client error displayed trying to perform any request method other than POST.
 #. TRANS: Do not translate POST.
-#: actions/pluginenable.php:78 actions/subscribe.php:77
 msgid "This action only accepts POST requests."
 msgstr "Esta operação só aceita pedidos POST."
 
-#: actions/pluginenable.php:102
 #, fuzzy
 msgid "You cannot administer plugins."
 msgstr "Não pode apagar utilizadores."
 
-#: actions/pluginenable.php:109
 #, fuzzy
 msgid "No such plugin."
 msgstr "Página não foi encontrada."
 
 #. TRANS: Page title for AJAX form return when enabling a plugin.
-#: actions/pluginenable.php:159
 msgctxt "plugin"
 msgid "Enabled"
 msgstr ""
 
 #. TRANS: Tab and title for plugins admin panel.
 #. TRANS: Menu item for site administration
-#: actions/pluginsadminpanel.php:56 actions/version.php:191
-#: lib/adminpanelaction.php:411
 msgid "Plugins"
 msgstr "Plugins"
 
 #. TRANS: Instructions at top of plugin admin page.
-#: actions/pluginsadminpanel.php:68
 msgid ""
 "Additional plugins can be enabled and configured manually. See the <a href="
 "\"http://status.net/wiki/Plugins\">online plugin documentation</a> for more "
@@ -4590,33 +3792,27 @@ msgid ""
 msgstr ""
 
 #. TRANS: Admin form section header
-#: actions/pluginsadminpanel.php:84
 #, fuzzy
 msgid "Default plugins"
 msgstr "Língua, por omissão"
 
-#: actions/pluginsadminpanel.php:106
 msgid ""
 "All default plugins have been disabled from the site's configuration file."
 msgstr ""
 
-#: actions/postnotice.php:95
 msgid "Invalid notice content."
 msgstr "Conteúdo da nota é inválido."
 
-#: actions/postnotice.php:101
 #, php-format
 msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’."
 msgstr ""
 "A licença ‘%1$s’ da nota não é compatível com a licença ‘%2$s’ do site."
 
 #. TRANS: Page title for profile settings.
-#: actions/profilesettings.php:60
 msgid "Profile settings"
 msgstr "Configurações do perfil"
 
 #. TRANS: Usage instructions for profile settings.
-#: actions/profilesettings.php:71
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
@@ -4624,31 +3820,24 @@ msgstr ""
 "saibam mais sobre si."
 
 #. TRANS: Profile settings form legend.
-#: actions/profilesettings.php:99
 msgid "Profile information"
 msgstr "Informação do perfil"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:110 actions/register.php:412
 #, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr "1-64 letras minúsculas ou números, sem pontuação ou espaços"
 
 #. TRANS: Field label in form for profile settings.
-#: actions/profilesettings.php:114 actions/register.php:434
-#: lib/groupeditform.php:150
 msgid "Full name"
 msgstr "Nome completo"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:119 actions/register.php:439
-#: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "Página pessoal"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:122 actions/register.php:441
 #, fuzzy
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr "URL da sua página pessoal, blogue ou perfil noutro site na internet"
@@ -4656,7 +3845,6 @@ msgstr "URL da sua página pessoal, blogue ou perfil noutro site na internet"
 #. TRANS: Tooltip for field label in form for profile settings. Plural
 #. TRANS: is decided by the number of characters available for the
 #. TRANS: biography (%d).
-#: actions/profilesettings.php:130 actions/register.php:450
 #, fuzzy, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4664,41 +3852,31 @@ msgstr[0] "Descreva-se e aos seus interesses (máx. 140 caracteres)"
 msgstr[1] "Descreva-se e aos seus interesses (máx. 140 caracteres)"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:136 actions/register.php:455
 msgid "Describe yourself and your interests"
 msgstr "Descreva-se e aos seus interesses"
 
 #. TRANS: Text area label in form for profile settings where users can provide.
 #. TRANS: their biography.
-#: actions/profilesettings.php:140 actions/register.php:457
 msgid "Bio"
 msgstr "Biografia"
 
 #. TRANS: Field label in form for profile settings.
-#: actions/profilesettings.php:146 actions/register.php:462
-#: lib/groupeditform.php:173
 msgid "Location"
 msgstr "Localidade"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:149
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Onde está, por ex. \"Cidade, Região, País\""
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:154
 msgid "Share my current location when posting notices"
 msgstr "Compartilhar a minha localização presente ao publicar notas"
 
 #. TRANS: Field label in form for profile settings.
-#: actions/profilesettings.php:162 actions/tagother.php:128
-#: actions/tagother.php:188 lib/subscriptionlist.php:104
-#: lib/subscriptionlist.php:106
 msgid "Tags"
 msgstr "Categorias"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:165
 #, fuzzy
 msgid ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- "
@@ -4708,28 +3886,23 @@ msgstr ""
 "espaços"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:170
 msgid "Language"
 msgstr "Língua"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:172
 #, fuzzy
 msgid "Preferred language."
 msgstr "Língua preferida"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:182
 msgid "Timezone"
 msgstr "Fuso horário"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:184
 msgid "What timezone are you normally in?"
 msgstr "Em que fuso horário se encontra normalmente?"
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:190
 #, fuzzy
 msgid ""
 "Automatically subscribe to whoever subscribes to me (best for non-humans)."
@@ -4738,7 +3911,6 @@ msgstr "Subscrever automaticamente quem me subscreva (óptimo para não-humanos)
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Plural form is used based on the maximum number of allowed
 #. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:259 actions/register.php:214
 #, fuzzy, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4746,85 +3918,69 @@ msgstr[0] "Biografia demasiado extensa (máx. %d caracteres)."
 msgstr[1] "Biografia demasiado extensa (máx. %d caracteres)."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:270 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr "Fuso horário não foi seleccionado."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:278
 #, fuzzy
 msgid "Language is too long (maximum 50 characters)."
 msgstr "Língua é demasiado extensa (máx. 50 caracteres)."
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:292
 #, fuzzy, php-format
 msgid "Invalid tag: \"%s\"."
 msgstr "Categoria inválida: \"%s\""
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:348
 #, fuzzy
 msgid "Could not update user for autosubscribe."
 msgstr "Não foi possível actualizar o utilizador para subscrição automática."
 
 #. TRANS: Server error thrown when user profile location preference settings could not be updated.
-#: actions/profilesettings.php:406
 #, fuzzy
 msgid "Could not save location prefs."
 msgstr "Não foi possível gravar as preferências de localização."
 
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:428 actions/tagother.php:179
 msgid "Could not save tags."
 msgstr "Não foi possível gravar as categorias."
 
 #. TRANS: Confirmation shown when user profile settings are saved.
 #. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:437 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "Configurações gravadas."
 
 #. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
 #. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:484 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "Criar uma conta"
 
-#: actions/public.php:83
 #, php-format
 msgid "Beyond the page limit (%s)."
 msgstr "Além do limite de página (%s)."
 
-#: actions/public.php:92
 msgid "Could not retrieve public stream."
 msgstr "Não foi possível importar as notas públicas."
 
-#: actions/public.php:130
 #, php-format
 msgid "Public timeline, page %d"
 msgstr "Notas públicas, página %d"
 
-#: actions/public.php:132 lib/publicgroupnav.php:79
 msgid "Public timeline"
 msgstr "Notas públicas"
 
-#: actions/public.php:160
 msgid "Public Stream Feed (RSS 1.0)"
 msgstr "Fonte de Notas Públicas (RSS 1.0)"
 
-#: actions/public.php:164
 msgid "Public Stream Feed (RSS 2.0)"
 msgstr "Fonte de Notas Públicas (RSS 2.0)"
 
-#: actions/public.php:168
 msgid "Public Stream Feed (Atom)"
 msgstr "Fonte de Notas Públicas (Atom)"
 
-#: actions/public.php:188
 #, php-format
 msgid ""
 "This is the public timeline for %%site.name%% but no one has posted anything "
@@ -4833,11 +3989,9 @@ msgstr ""
 "Estas são as notas públicas do site %%site.name%% mas ninguém publicou nada "
 "ainda."
 
-#: actions/public.php:191
 msgid "Be the first to post!"
 msgstr "Seja a primeira pessoa a publicar!"
 
-#: actions/public.php:195
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post!"
@@ -4845,7 +3999,6 @@ msgstr ""
 "Podia [registar uma conta](%%action.register%%) e ser a primeira pessoa a "
 "publicar!"
 
-#: actions/public.php:242
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -4858,7 +4011,6 @@ msgstr ""
 "[StatusNet](http://status.net/). [Registe-se agora](%%action.register%%) "
 "para partilhar notas sobre si, família e amigos! ([Saber mais](%%doc.help%%))"
 
-#: actions/public.php:247
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -4870,19 +4022,16 @@ msgstr ""
 "[StatusNet](http://status.net/)."
 
 #. TRANS: Public RSS feed description. %s is the StatusNet site name.
-#: actions/publicrss.php:106
 #, fuzzy, php-format
 msgid "%s updates from everyone."
 msgstr "%s actualizações de todos!"
 
 #. TRANS: Title for public tag cloud.
-#: actions/publictagcloud.php:57
 msgid "Public tag cloud"
 msgstr "Nuvem de categorias pública"
 
 #. TRANS: Instructions (more used like an explanation/header).
 #. TRANS: %s is the StatusNet sitename.
-#: actions/publictagcloud.php:65
 #, fuzzy, php-format
 msgid "These are most popular recent tags on %s"
 msgstr "Estas são as categorias recentes mais populares em %s "
@@ -4890,14 +4039,12 @@ msgstr "Estas são as categorias recentes mais populares em %s "
 #. TRANS: This message contains a Markdown URL. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.
-#: actions/publictagcloud.php:74
 #, php-format
 msgid "No one has posted a notice with a [hashtag](%%doc.tags%%) yet."
 msgstr "Ainda ninguém publicou uma nota com uma [categoria](%%doc.tags%%)."
 
 #. 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.
-#: actions/publictagcloud.php:79
 msgid "Be the first to post one!"
 msgstr "Seja a primeira pessoa a publicar uma!"
 
@@ -4906,7 +4053,6 @@ msgstr "Seja a primeira pessoa a publicar uma!"
 #. TRANS: This message contains a Markdown URL. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.
-#: actions/publictagcloud.php:87
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post "
@@ -4916,44 +4062,36 @@ msgstr ""
 "publicar uma!"
 
 #. TRANS: Client error displayed trying to recover password while already logged in.
-#: actions/recoverpassword.php:37
 msgid "You are already logged in!"
 msgstr "Já tem uma sessão iniciada!"
 
 #. TRANS: Client error displayed when password recovery code is not correct.
-#: actions/recoverpassword.php:64
 msgid "No such recovery code."
 msgstr "Código de recuperação não foi encontrado."
 
 #. TRANS: Client error displayed when no proper password recovery code was submitted.
-#: actions/recoverpassword.php:69
 msgid "Not a recovery code."
 msgstr "Não é um código de recuperação."
 
 #. TRANS: Server error displayed trying to recover password without providing a user.
-#: actions/recoverpassword.php:77
 msgid "Recovery code for unknown user."
 msgstr "Código de recuperação para um utilizador desconhecido."
 
 #. TRANS: Server error displayed removing a password recovery code from the database.
-#: actions/recoverpassword.php:91
 msgid "Error with confirmation code."
 msgstr "Erro no código de confirmação."
 
 #. TRANS: Client error displayed trying to recover password with too old a recovery code.
-#: actions/recoverpassword.php:103
 msgid "This confirmation code is too old. Please start again."
 msgstr "Este código de confirmação é demasiado antigo. Por favor, recomece."
 
 #. TRANS: Server error displayed when updating a user's e-mail address in the database fails while recovering a password.
-#: actions/recoverpassword.php:118
 msgid "Could not update user with confirmed email address."
 msgstr ""
 "Não foi possivel actualizar o utilizador com um correio electrónico "
 "confirmado."
 
 #. TRANS: Page notice for password recovery page.
-#: actions/recoverpassword.php:160
 msgid ""
 "If you have forgotten or lost your password, you can get a new one sent to "
 "the email address you have stored in your account."
@@ -4961,102 +4099,84 @@ msgstr ""
 "Se perdeu ou se esqueceu da sua senha, podemos enviar-lhe uma nova para o "
 "correio electrónico registado na sua conta."
 
-#: actions/recoverpassword.php:167
 msgid "You have been identified. Enter a new password below."
 msgstr "Identificação positiva. Introduza abaixo uma senha nova."
 
 #. TRANS: Fieldset legend for password recovery page.
-#: actions/recoverpassword.php:198
 msgid "Password recovery"
 msgstr "Recuperação da senha"
 
 #. TRANS: Field label on password recovery page.
-#: actions/recoverpassword.php:202
 msgid "Nickname or email address"
 msgstr "Utilizador ou endereço de correio electrónico"
 
 #. TRANS: Title for field label on password recovery page.
-#: actions/recoverpassword.php:205
 msgid "Your nickname on this server, or your registered email address."
 msgstr ""
 "O seu utilizador neste servidor, ou o seu correio electrónico registado."
 
 #. TRANS: Field label on password recovery page.
-#: actions/recoverpassword.php:212
 msgid "Recover"
 msgstr "Recuperar"
 
 #. TRANS: Button text on password recovery page.
-#: actions/recoverpassword.php:214
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Recover"
 msgstr "Recuperar"
 
 #. TRANS: Title for password recovery page in password reset mode.
-#: actions/recoverpassword.php:223
 msgid "Reset password"
 msgstr "Reiniciar senha"
 
 #. TRANS: Title for password recovery page in password recover mode.
-#: actions/recoverpassword.php:225
 msgid "Recover password"
 msgstr "Recuperar senha"
 
 #. TRANS: Title for password recovery page in email sent mode.
 #. TRANS: Subject for password recovery e-mail.
-#: actions/recoverpassword.php:227 actions/recoverpassword.php:366
 msgid "Password recovery requested"
 msgstr "Solicitada recuperação da senha"
 
 #. TRANS: Title for password recovery page in password saved mode.
-#: actions/recoverpassword.php:229
 #, fuzzy
 msgid "Password saved"
 msgstr "Senha gravada."
 
 #. TRANS: Title for password recovery page when an unknown action has been specified.
-#: actions/recoverpassword.php:232
 msgid "Unknown action"
 msgstr "Acção desconhecida"
 
 #. TRANS: Title for field label for password reset form.
-#: actions/recoverpassword.php:258
 #, fuzzy
 msgid "6 or more characters, and do not forget it!"
 msgstr "6 ou mais caracteres, e não a esqueça!"
 
 #. TRANS: Button text for password reset form.
 #. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: actions/recoverpassword.php:268 lib/designform.php:145
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Reset"
 msgstr "Reiniciar"
 
 #. TRANS: Form instructions for password recovery form.
-#: actions/recoverpassword.php:278
 msgid "Enter a nickname or email address."
 msgstr "Introduza um utilizador ou um endereço de correio electrónico."
 
 #. TRANS: Information on password recovery form if no known username or e-mail address was specified.
-#: actions/recoverpassword.php:309
 msgid "No user with that email address or username."
 msgstr ""
 "Não existe nenhum utilizador com esse correio electrónico nem com esse nome."
 
 #. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
-#: actions/recoverpassword.php:327
 msgid "No registered email address for that user."
 msgstr "Nenhum endereço de email registado para esse utilizador."
 
 #. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
-#: actions/recoverpassword.php:342
 msgid "Error saving address confirmation."
 msgstr "Erro ao guardar confirmação do endereço."
 
 #. TRANS: User notification after an e-mail with instructions was sent from the password recovery form.
-#: actions/recoverpassword.php:370
 msgid ""
 "Instructions for recovering your password have been sent to the email "
 "address registered to your account."
@@ -5065,75 +4185,59 @@ msgstr ""
 "electrónico registado na sua conta."
 
 #. TRANS: Client error displayed when trying to reset as password without providing a user.
-#: actions/recoverpassword.php:391
 msgid "Unexpected password reset."
 msgstr "Reinício inesperado da senha."
 
 #. TRANS: Reset password form validation error message.
-#: actions/recoverpassword.php:400
 #, fuzzy
 msgid "Password must be 6 characters or more."
 msgstr "Senha tem de ter 6 ou mais caracteres."
 
 #. TRANS: Reset password form validation error message.
-#: actions/recoverpassword.php:405
 msgid "Password and confirmation do not match."
 msgstr "A senha e a confirmação não coincidem."
 
 #. TRANS: Server error displayed when something does wrong with the user object during password reset.
-#: actions/recoverpassword.php:426 actions/register.php:241
 msgid "Error setting user."
 msgstr "Erro ao configurar utilizador."
 
 #. TRANS: Success message for user after password reset.
-#: actions/recoverpassword.php:434
 msgid "New password successfully saved. You are now logged in."
 msgstr "A senha nova foi gravada com sucesso. Iniciou uma sessão."
 
-#: actions/redirecturl.php:70
 #, fuzzy
 msgid "No id parameter"
 msgstr "Argumento de identificação (ID) em falta."
 
-#: actions/redirecturl.php:76
 #, fuzzy, php-format
 msgid "No such file \"%d\""
 msgstr "Ficheiro não foi encontrado."
 
-#: actions/register.php:80 actions/register.php:181 actions/register.php:392
 msgid "Sorry, only invited people can register."
 msgstr "Desculpe, só pessoas convidadas se podem registar."
 
-#: actions/register.php:87
 msgid "Sorry, invalid invitation code."
 msgstr "Desculpe, código de convite inválido."
 
-#: actions/register.php:106
 msgid "Registration successful"
 msgstr "Registo efectuado"
 
-#: actions/register.php:108 actions/register.php:490
 msgid "Register"
 msgstr "Registar"
 
-#: actions/register.php:128
 msgid "Registration not allowed."
 msgstr "Registo não é permitido."
 
-#: actions/register.php:194
 #, fuzzy
 msgid "You cannot register if you don't agree to the license."
 msgstr "Não se pode registar se não aceita a licença."
 
-#: actions/register.php:203
 msgid "Email address already exists."
 msgstr "Correio electrónico já existe."
 
-#: actions/register.php:236 actions/register.php:258
 msgid "Invalid username or password."
 msgstr "Nome de utilizador ou senha inválidos."
 
-#: actions/register.php:333
 #, fuzzy
 msgid ""
 "With this form you can create a new account. You can then post notices and "
@@ -5142,53 +4246,43 @@ msgstr ""
 "Com este formulário pode criar uma conta nova. Poderá então publicar notas e "
 "ligar-se a amigos e colegas. "
 
-#: actions/register.php:424 actions/register.php:428
-#: actions/siteadminpanel.php:238 lib/settingsnav.php:92
 msgid "Email"
 msgstr "Correio"
 
-#: actions/register.php:425 actions/register.php:429
 #, fuzzy
 msgid "Used only for updates, announcements, and password recovery."
 msgstr "Usado apenas para actualizações, anúncios e recuperação da senha"
 
-#: actions/register.php:436
 #, fuzzy
 msgid "Longer name, preferably your \"real\" name."
 msgstr "Nome mais longo, de preferência o seu nome \"verdadeiro\""
 
-#: actions/register.php:464
 #, fuzzy
 msgid "Where you are, like \"City, State (or Region), Country\"."
 msgstr "Onde está, por ex. \"Cidade, Região, País\""
 
-#: actions/register.php:503
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
 msgstr ""
 "Compreendo que o conteúdo e dados do site %1$s são privados e confidenciais."
 
-#: actions/register.php:513
 #, php-format
 msgid "My text and files are copyright by %1$s."
 msgstr ""
 "Os meus textos e ficheiros estão protegidos pelos direitos de autor de %1$s."
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:517
 msgid "My text and files remain under my own copyright."
 msgstr ""
 "Os meus textos e ficheiros permanecem protegidos pelos meus próprios "
 "direitos de autor."
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:520
 msgid "All rights reserved."
 msgstr "Todos os direitos reservados."
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:525
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -5198,7 +4292,6 @@ msgstr ""
 "estes dados privados: senha, endereço de correio electrónico, endereço de "
 "mensageiro instantâneo, número de telefone."
 
-#: actions/register.php:566
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -5231,7 +4324,6 @@ msgstr ""
 "\n"
 "Obrigado por se ter registado e esperamos que se divirta usando este serviço."
 
-#: actions/register.php:590
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5239,7 +4331,6 @@ msgstr ""
 "(Deverá receber uma mensagem electrónica dentro de momentos, com instruções "
 "para confirmar o seu endereço de correio electrónico.)"
 
-#: actions/remotesubscribe.php:97
 #, php-format
 msgid ""
 "To subscribe, you can [login](%%action.login%%), or [register](%%action."
@@ -5251,112 +4342,87 @@ msgstr ""
 "microblogues compatível](%%doc.openmublog%%), introduza abaixo a URL do seu "
 "perfil lá."
 
-#: actions/remotesubscribe.php:111
 msgid "Remote subscribe"
 msgstr "Subscrição remota"
 
-#: actions/remotesubscribe.php:123
 msgid "Subscribe to a remote user"
 msgstr "Subscrever um utilizador remoto"
 
-#: actions/remotesubscribe.php:128
 msgid "User nickname"
 msgstr "Nome do utilizador"
 
-#: actions/remotesubscribe.php:129
 #, fuzzy
 msgid "Nickname of the user you want to follow."
 msgstr "Nome do utilizador que pretende seguir"
 
-#: actions/remotesubscribe.php:132
 msgid "Profile URL"
 msgstr "URL do perfil"
 
-#: actions/remotesubscribe.php:133
 #, fuzzy
 msgid "URL of your profile on another compatible microblogging service."
 msgstr "URL do seu perfil noutro serviço de microblogues compatível"
 
 #. TRANS: Link text for link that will subscribe to a remote profile.
-#: actions/remotesubscribe.php:136 lib/subscribeform.php:139
-#: lib/userprofile.php:402
 msgid "Subscribe"
 msgstr "Subscrever"
 
-#: actions/remotesubscribe.php:158
 #, fuzzy
 msgid "Invalid profile URL (bad format)."
 msgstr "URL de perfil inválido (formato incorrecto)"
 
-#: actions/remotesubscribe.php:167
 msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
 msgstr ""
 "URL do perfil não é válida (não há um documento Yadis, ou foi definido um "
 "XRDS inválido)."
 
-#: actions/remotesubscribe.php:175
 #, fuzzy
 msgid "That is a local profile! Login to subscribe."
 msgstr "Esse perfil é local! Inicie uma sessão para o subscrever."
 
-#: actions/remotesubscribe.php:182
 #, fuzzy
 msgid "Could not get a request token."
 msgstr "Não foi possível obter uma chave de pedido."
 
-#: actions/repeat.php:56
 msgid "Only logged-in users can repeat notices."
 msgstr "Só utilizadores com sessão iniciada podem repetir notas."
 
-#: actions/repeat.php:63 actions/repeat.php:70
 msgid "No notice specified."
 msgstr "Nota não foi especificada."
 
-#: actions/repeat.php:75
 #, fuzzy
 msgid "You cannot repeat your own notice."
 msgstr "Não pode repetir a sua própria nota."
 
-#: actions/repeat.php:89
 msgid "You already repeated that notice."
 msgstr "Já repetiu essa nota."
 
-#: actions/repeat.php:112 lib/noticelist.php:697
 msgid "Repeated"
 msgstr "Repetida"
 
-#: actions/repeat.php:117
 msgid "Repeated!"
 msgstr "Repetida!"
 
 #. TRANS: RSS reply feed title. %s is a user nickname.
-#: actions/replies.php:126 actions/repliesrss.php:68
-#: lib/personalgroupnav.php:105
 #, php-format
 msgid "Replies to %s"
 msgstr "Respostas a %s"
 
-#: actions/replies.php:128
 #, php-format
 msgid "Replies to %1$s, page %2$d"
 msgstr "Respostas a %1$s, página %2$d"
 
-#: actions/replies.php:145
 #, php-format
 msgid "Replies feed for %s (RSS 1.0)"
 msgstr "Fonte de respostas a %s (RSS 1.0)"
 
-#: actions/replies.php:152
 #, php-format
 msgid "Replies feed for %s (RSS 2.0)"
 msgstr "Fonte de respostas a %s (RSS 2.0)"
 
-#: actions/replies.php:159
 #, php-format
 msgid "Replies feed for %s (Atom)"
 msgstr "Fonte de respostas a %s (Atom)"
 
-#: actions/replies.php:199
 #, php-format
 msgid ""
 "This is the timeline showing replies to %1$s but %2$s hasn't received a "
@@ -5364,7 +4430,6 @@ msgid ""
 msgstr ""
 "Estas são as respostas a %1$s, mas ainda nenhuma nota foi endereçada a %2$s."
 
-#: actions/replies.php:204
 #, php-format
 msgid ""
 "You can engage other users in a conversation, subscribe to more people or "
@@ -5373,7 +4438,6 @@ msgstr ""
 "Pode meter conversa com outros utilizadores, subscrever mais pessoas ou "
 "[juntar-se a grupos](%%action.groups%%)."
 
-#: actions/replies.php:206
 #, php-format
 msgid ""
 "You can try to [nudge %1$s](../%2$s) or [post something to them](%%%%action."
@@ -5384,37 +4448,31 @@ msgstr ""
 
 #. TRANS: RSS reply feed description.
 #. TRANS: %1$s is a user nickname, %2$s is the StatusNet site name.
-#: actions/repliesrss.php:74
 #, fuzzy, php-format
 msgid "Replies to %1$s on %2$s."
 msgstr "Respostas a %1$s em %2$s!"
 
 #. TRANS: Client exception displayed when trying to restore an account while not logged in.
-#: actions/restoreaccount.php:78
 #, fuzzy
 msgid "Only logged-in users can restore their account."
 msgstr "Só utilizadores com sessão iniciada podem repetir notas."
 
 #. TRANS: Client exception displayed when trying to restore an account without having restore rights.
-#: actions/restoreaccount.php:83
 #, fuzzy
 msgid "You may not restore your account."
 msgstr "Ainda não registou nenhuma aplicação."
 
 #. TRANS: Client exception displayed trying to restore an account while something went wrong uploading a file.
 #. TRANS: Client exception. No file; probably just a non-AJAX submission.
-#: actions/restoreaccount.php:121 actions/restoreaccount.php:146
 #, fuzzy
 msgid "No uploaded file."
 msgstr "Carregar ficheiro"
 
 #. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
-#: actions/restoreaccount.php:129 lib/mediafile.php:194
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
 msgstr "Ficheiro carregado excede a directiva upload_max_filesize no php.ini."
 
 #. TRANS: Client exception.
-#: actions/restoreaccount.php:135 lib/mediafile.php:200
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form."
@@ -5423,145 +4481,117 @@ msgstr ""
 "formulário HTML."
 
 #. TRANS: Client exception.
-#: actions/restoreaccount.php:141 lib/mediafile.php:206
 msgid "The uploaded file was only partially uploaded."
 msgstr "Ficheiro só foi parcialmente carregado."
 
 #. TRANS: Client exception thrown when a temporary folder is not present to store a file upload.
-#: actions/restoreaccount.php:150 lib/mediafile.php:214
 msgid "Missing a temporary folder."
 msgstr "Falta um directório temporário."
 
 #. TRANS: Client exception thrown when writing to disk is not possible during a file upload operation.
-#: actions/restoreaccount.php:154 lib/mediafile.php:218
 msgid "Failed to write file to disk."
 msgstr "Não foi possível gravar o ficheiro no disco."
 
 #. TRANS: Client exception thrown when a file upload operation has been stopped by an extension.
-#: actions/restoreaccount.php:158 lib/mediafile.php:222
 msgid "File upload stopped by extension."
 msgstr "Transferência do ficheiro interrompida pela extensão."
 
 #. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
 #. TRANS: Exception thrown when uploading an image fails for an unknown reason.
 #. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
-#: actions/restoreaccount.php:164 lib/imagefile.php:106 lib/mediafile.php:228
 msgid "System error uploading file."
 msgstr "Ocorreu um erro de sistema ao transferir o ficheiro."
 
 #. TRANS: Client exception thrown when a feed is not an Atom feed.
-#: actions/restoreaccount.php:207
 #, fuzzy
 msgid "Not an Atom feed."
 msgstr "Todos os membros"
 
 #. TRANS: Success message when a feed has been restored.
-#: actions/restoreaccount.php:241
 msgid ""
 "Feed has been restored. Your old posts should now appear in search and your "
 "profile page."
 msgstr ""
 
 #. TRANS: Message when a feed restore is in progress.
-#: actions/restoreaccount.php:245
 msgid "Feed will be restored. Please wait a few minutes for results."
 msgstr ""
 
 #. TRANS: Form instructions for feed restore.
-#: actions/restoreaccount.php:342
 msgid ""
 "You can upload a backed-up stream in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format."
 msgstr ""
 
 #. TRANS: Title for submit button to confirm upload of a user backup file for account restore.
-#: actions/restoreaccount.php:373
 #, fuzzy
 msgid "Upload the file"
 msgstr "Carregar ficheiro"
 
-#: actions/revokerole.php:75
 msgid "You cannot revoke user roles on this site."
 msgstr "Não pode retirar funções aos utilizadores neste site."
 
-#: actions/revokerole.php:82
 msgid "User doesn't have this role."
 msgstr "O utilizador não tem esta função."
 
-#: actions/rsd.php:142 actions/version.php:159
 msgid "StatusNet"
 msgstr "StatusNet"
 
-#: actions/sandbox.php:65 actions/unsandbox.php:65
 msgid "You cannot sandbox users on this site."
 msgstr "Não pode impedir notas públicas neste site."
 
-#: actions/sandbox.php:72
 msgid "User is already sandboxed."
 msgstr "Utilizador já está impedido de criar notas públicas."
 
 #. TRANS: Menu item for site administration
-#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
-#: lib/adminpanelaction.php:379
 msgid "Sessions"
 msgstr "Sessões"
 
-#: actions/sessionsadminpanel.php:65
 msgid "Session settings for this StatusNet site"
 msgstr ""
 
-#: actions/sessionsadminpanel.php:175
 msgid "Handle sessions"
 msgstr "Gerir sessões"
 
-#: actions/sessionsadminpanel.php:177
 msgid "Whether to handle sessions ourselves."
 msgstr "Se devemos gerir sessões nós próprios."
 
-#: actions/sessionsadminpanel.php:181
 msgid "Session debugging"
 msgstr "Depuração de sessões"
 
-#: actions/sessionsadminpanel.php:183
 msgid "Turn on debugging output for sessions."
 msgstr "Ligar a impressão de dados de depuração, para sessões."
 
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
+#. TRANS: Submit button title.
+msgid "Save"
+msgstr "Gravar"
+
 msgid "Save site settings"
 msgstr "Gravar configurações do site"
 
-#: actions/showapplication.php:78
 msgid "You must be logged in to view an application."
 msgstr "Tem de iniciar uma sessão para ver uma aplicação."
 
-#: actions/showapplication.php:151
 msgid "Application profile"
 msgstr "Perfil da aplicação"
 
-#: actions/showapplication.php:179
 #, php-format
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr "Criado por %1$s - acesso por omissão %2$s - %3$d utilizadores"
 
-#: actions/showapplication.php:189
 msgid "Application actions"
 msgstr "Operações da aplicação"
 
-#: actions/showapplication.php:212
 msgid "Reset key & secret"
 msgstr "Reiniciar chave e segredo"
 
 #. TRANS: Title of form for deleting a user.
-#: actions/showapplication.php:228 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:64 lib/noticelist.php:678
 msgid "Delete"
 msgstr "Apagar"
 
-#: actions/showapplication.php:237
 msgid "Application info"
 msgstr "Informação da aplicação"
 
-#: actions/showapplication.php:255
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
@@ -5569,43 +4599,36 @@ msgstr ""
 "Nota: Assinaturas HMAC-SHA1 são suportadas. O método de assinatura com texto "
 "simples não é suportado."
 
-#: actions/showapplication.php:275
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr ""
 "Tem a certeza de que quer reiniciar a sua chave e segredo de consumidor?"
 
 #. TRANS: Title for all but the first page of favourite notices of a user.
 #. TRANS: %1$s is the user for whom the favourite notices are displayed, %2$d is the page number.
-#: actions/showfavorites.php:80
 #, php-format
 msgid "%1$s's favorite notices, page %2$d"
 msgstr "Notas favoritas de %1$s, página %2$d"
 
 #. TRANS: Server error displayed when favourite notices could not be retrieved from the database.
-#: actions/showfavorites.php:134
 msgid "Could not retrieve favorite notices."
 msgstr "Não foi possível importar notas favoritas."
 
 #. TRANS: Feed link text. %s is a username.
-#: actions/showfavorites.php:172
 #, php-format
 msgid "Feed for favorites of %s (RSS 1.0)"
 msgstr "Fonte dos favoritos de %s (RSS 1.0)"
 
 #. TRANS: Feed link text. %s is a username.
-#: actions/showfavorites.php:180
 #, php-format
 msgid "Feed for favorites of %s (RSS 2.0)"
 msgstr "Fonte dos favoritos de %s (RSS 2.0)"
 
 #. TRANS: Feed link text. %s is a username.
-#: actions/showfavorites.php:188
 #, php-format
 msgid "Feed for favorites of %s (Atom)"
 msgstr "Fonte dos favoritos de %s (Atom)"
 
 #. TRANS: Text displayed instead of favourite notices for the current logged in user that has no favourites.
-#: actions/showfavorites.php:209
 msgid ""
 "You haven't chosen any favorite notices yet. Click the fave button on "
 "notices you like to bookmark them for later or shed a spotlight on them."
@@ -5616,7 +4639,6 @@ msgstr ""
 
 #. TRANS: Text displayed instead of favourite notices for a user that has no favourites while logged in.
 #. TRANS: %s is a username.
-#: actions/showfavorites.php:213
 #, php-format
 msgid ""
 "%s hasn't added any favorite notices yet. Post something interesting they "
@@ -5628,7 +4650,6 @@ msgstr ""
 #. TRANS: Text displayed instead of favourite notices for a user that has no favourites while not logged in.
 #. TRANS: %s is a username, %%%%action.register%%%% is a link to the user registration page.
 #. TRANS: (link text)[link] is a Mark Down link.
-#: actions/showfavorites.php:220
 #, php-format
 msgid ""
 "%s hasn't added any favorite notices yet. Why not [register an account](%%%%"
@@ -5640,64 +4661,53 @@ msgstr ""
 "este estado de coisas :)"
 
 #. TRANS: Page notice for show favourites page.
-#: actions/showfavorites.php:251
 msgid "This is a way to share what you like."
 msgstr "Esta é uma forma de partilhar aquilo de que gosta."
 
 #. TRANS: Page title for first group page. %s is a group name.
-#: actions/showgroup.php:75
 #, php-format
 msgid "%s group"
 msgstr "Grupo %s"
 
 #. TRANS: Page title for any but first group page.
 #. TRANS: %1$s is a group name, $2$s is a page number.
-#: actions/showgroup.php:79
 #, php-format
 msgid "%1$s group, page %2$d"
 msgstr "Grupo %1$s, página %2$d"
 
 #. TRANS: Label for group description or group note (dt). Text hidden by default.
-#: actions/showgroup.php:266
 msgid "Note"
 msgstr "Anotação"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:277 lib/groupeditform.php:180
 msgid "Aliases"
 msgstr "Nomes alternativos"
 
 #. TRANS: Group actions header (h2). Text hidden by default.
-#: actions/showgroup.php:294
 msgid "Group actions"
 msgstr "Acções do grupo"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:338
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
 msgstr "Fonte de notas do grupo %s (RSS 1.0)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:345
 #, php-format
 msgid "Notice feed for %s group (RSS 2.0)"
 msgstr "Fonte de notas do grupo %s (RSS 2.0)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:352
 #, php-format
 msgid "Notice feed for %s group (Atom)"
 msgstr "Fonte de notas do grupo %s (Atom)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:358
 #, php-format
 msgid "FOAF for %s group"
 msgstr "FOAF do grupo %s"
 
 #. TRANS: Header for mini list of group members on a group page (h2).
-#: actions/showgroup.php:395
 msgid "Members"
 msgstr "Membros"
 
@@ -5705,31 +4715,24 @@ msgstr "Membros"
 #. TRANS: Text for user subscription statistics if the user has no subscriptions.
 #. TRANS: Text for user subscriber statistics if user has no subscribers.
 #. TRANS: Text for user user group membership statistics if user is not a member of any group.
-#: actions/showgroup.php:401 lib/profileaction.php:137
-#: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
-#: lib/subscriptionlist.php:123 lib/tagcloudsection.php:71
 msgid "(None)"
 msgstr "(Nenhum)"
 
 #. TRANS: Link to all group members from mini list of group members if group has more than n members.
-#: actions/showgroup.php:410
 msgid "All members"
 msgstr "Todos os membros"
 
 #. TRANS: Header for group statistics on a group page (h2).
 #. TRANS: H2 text for user statistics.
-#: actions/showgroup.php:441 lib/profileaction.php:205
 msgid "Statistics"
 msgstr "Estatísticas"
 
-#: actions/showgroup.php:444
 #, fuzzy
 msgctxt "LABEL"
 msgid "Created"
 msgstr "Criado"
 
 #. TRANS: Label for member count in statistics on group page.
-#: actions/showgroup.php:449
 #, fuzzy
 msgctxt "LABEL"
 msgid "Members"
@@ -5739,7 +4742,6 @@ msgstr "Membros"
 #. TRANS: **%s** is the group alias, %%%%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).
-#: actions/showgroup.php:464
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5758,7 +4760,6 @@ 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: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
-#: actions/showgroup.php:474
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5772,99 +4773,83 @@ msgstr ""
 "grupo partilham mensagens curtas acerca das suas vidas e interesses. "
 
 #. TRANS: Header for list of group administrators on a group page (h2).
-#: actions/showgroup.php:503
 msgid "Admins"
 msgstr "Gestores"
 
 #. TRANS: Client error displayed requesting a single message that does not exist.
-#: actions/showmessage.php:76
 msgid "No such message."
 msgstr "Mensagem não foi encontrada."
 
 #. TRANS: Client error displayed requesting a single direct message the requesting user was not a party in.
-#: actions/showmessage.php:86
 msgid "Only the sender and recipient may read this message."
 msgstr "Só o remetente e o destinatário podem ler esta mensagem."
 
 #. TRANS: Page title for single direct message display when viewing user is the sender.
 #. TRANS: %1$s is the addressed user's nickname, $2$s is a timestamp.
-#: actions/showmessage.php:105
 #, php-format
 msgid "Message to %1$s on %2$s"
 msgstr "Mensagem para %1$s a %2$s"
 
 #. TRANS: Page title for single message display.
 #. TRANS: %1$s is the sending user's nickname, $2$s is a timestamp.
-#: actions/showmessage.php:113
 #, php-format
 msgid "Message from %1$s on %2$s"
 msgstr "Mensagem de %1$s a %2$s"
 
-#: actions/shownotice.php:90
 msgid "Notice deleted."
 msgstr "Avatar actualizado."
 
 #. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
-#: actions/showstream.php:70
 #, fuzzy, php-format
 msgid "%1$s tagged %2$s"
 msgstr "%1$s, página %2$d"
 
 #. TRANS: Page title showing tagged notices in one user's stream.
 #. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
-#: actions/showstream.php:74
 #, fuzzy, php-format
 msgid "%1$s tagged %2$s, page %3$d"
 msgstr "Notas categorizadas com %1$s, página %2$d"
 
 #. TRANS: Extended page title showing tagged notices in one user's stream.
 #. TRANS: %1$s is the username, %2$d is the page number.
-#: actions/showstream.php:82
 #, php-format
 msgid "%1$s, page %2$d"
 msgstr "%1$s, página %2$d"
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %1$s is a user nickname, %2$s is a hashtag.
-#: actions/showstream.php:127
 #, php-format
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
 msgstr "Fonte de notas de %1$s com a categoria %2$s (RSS 1.0)"
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.
-#: actions/showstream.php:136
 #, php-format
 msgid "Notice feed for %s (RSS 1.0)"
 msgstr "Fonte de notas para %s (RSS 1.0)"
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.
-#: actions/showstream.php:145
 #, php-format
 msgid "Notice feed for %s (RSS 2.0)"
 msgstr "Fonte de notas para %s (RSS 2.0)"
 
-#: actions/showstream.php:152
 #, php-format
 msgid "Notice feed for %s (Atom)"
 msgstr "Fonte de notas para %s (Atom)"
 
 #. TRANS: Title for link to notice feed. FOAF stands for Friend of a Friend.
 #. TRANS: More information at http://www.foaf-project.org. %s is a user nickname.
-#: actions/showstream.php:159
 #, php-format
 msgid "FOAF for %s"
 msgstr "FOAF para %s"
 
 #. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
-#: actions/showstream.php:205
 #, fuzzy, php-format
 msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr "Estas são as notas de %1$s, mas %2$s ainda não publicou nenhuma."
 
 #. TRANS: Second sentence of empty list message for a stream for the user themselves.
-#: actions/showstream.php:211
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
@@ -5874,7 +4859,6 @@ msgstr ""
 
 #. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:215
 #, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
@@ -5885,7 +4869,6 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:258
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5901,7 +4884,6 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:265
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5913,224 +4895,177 @@ msgstr ""
 "Software Livre [StatusNet](http://status.net/). "
 
 #. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
-#: actions/showstream.php:322
 #, php-format
 msgid "Repeat of %s"
 msgstr "Repetições de %s"
 
-#: actions/silence.php:65 actions/unsilence.php:65
 msgid "You cannot silence users on this site."
 msgstr "Não pode silenciar utilizadores neste site."
 
-#: actions/silence.php:72
 msgid "User is already silenced."
 msgstr "O utilizador já está silenciado."
 
-#: actions/siteadminpanel.php:69
 msgid "Basic settings for this StatusNet site"
 msgstr "Configurações básicas para este site StatusNet"
 
-#: actions/siteadminpanel.php:133
 msgid "Site name must have non-zero length."
 msgstr "Nome do site não pode ter comprimento zero."
 
-#: actions/siteadminpanel.php:141
 msgid "You must have a valid contact email address."
 msgstr "Tem de ter um endereço válido para o correio electrónico de contacto."
 
-#: actions/siteadminpanel.php:159
 #, php-format
 msgid "Unknown language \"%s\"."
 msgstr "Língua desconhecida \"%s\"."
 
-#: actions/siteadminpanel.php:165
 msgid "Minimum text limit is 0 (unlimited)."
 msgstr "O limite mínimo para o texto é 0 (sem limite)."
 
-#: actions/siteadminpanel.php:171
 msgid "Dupe limit must be one or more seconds."
 msgstr "O limite de duplicados tem de ser um ou mais segundos."
 
-#: actions/siteadminpanel.php:221
 msgid "General"
 msgstr "Geral"
 
-#: actions/siteadminpanel.php:224
 msgid "Site name"
 msgstr "Nome do site"
 
-#: actions/siteadminpanel.php:225
 msgid "The name of your site, like \"Yourcompany Microblog\""
 msgstr "O nome do seu site, por exemplo \"Microblogue NomeDaEmpresa\""
 
-#: actions/siteadminpanel.php:229
 msgid "Brought by"
 msgstr "Disponibilizado por"
 
-#: actions/siteadminpanel.php:230
 msgid "Text used for credits link in footer of each page"
 msgstr "Texto usado para a ligação de atribuição no rodapé de cada página"
 
-#: actions/siteadminpanel.php:234
 msgid "Brought by URL"
 msgstr "URL da atribuição"
 
-#: actions/siteadminpanel.php:235
 msgid "URL used for credits link in footer of each page"
 msgstr "URL usada para a ligação de atribuição no rodapé de cada página"
 
-#: actions/siteadminpanel.php:239
 msgid "Contact email address for your site"
 msgstr "Endereço de correio electrónico de contacto para o site"
 
-#: actions/siteadminpanel.php:245
 msgid "Local"
 msgstr "Local"
 
-#: actions/siteadminpanel.php:256
 msgid "Default timezone"
 msgstr "Fuso horário, por omissão"
 
-#: actions/siteadminpanel.php:257
 msgid "Default timezone for the site; usually UTC."
 msgstr "Fuso horário por omissão, para o site; normalmente, UTC."
 
-#: actions/siteadminpanel.php:262
 msgid "Default language"
 msgstr "Língua, por omissão"
 
-#: actions/siteadminpanel.php:263
 msgid "Site language when autodetection from browser settings is not available"
 msgstr ""
 "Língua do site quando a sua detecção na configuração do browser não é "
 "possível"
 
-#: actions/siteadminpanel.php:271
 msgid "Limits"
 msgstr "Limites"
 
-#: actions/siteadminpanel.php:274
 msgid "Text limit"
 msgstr "Limite de texto"
 
-#: actions/siteadminpanel.php:274
 msgid "Maximum number of characters for notices."
 msgstr "Número máximo de caracteres nas notas."
 
-#: actions/siteadminpanel.php:278
 msgid "Dupe limit"
 msgstr "Limite de duplicações"
 
-#: actions/siteadminpanel.php:278
 msgid "How long users must wait (in seconds) to post the same thing again."
 msgstr ""
 "Quanto tempo os utilizadores terão de esperar (em segundos) para publicar a "
 "mesma coisa outra vez."
 
 #. TRANS: Page title for site-wide notice tab in admin panel.
-#: actions/sitenoticeadminpanel.php:55
 msgid "Site Notice"
 msgstr "Aviso do Site"
 
 #. TRANS: Instructions for site-wide notice tab in admin panel.
-#: actions/sitenoticeadminpanel.php:66
 msgid "Edit site-wide message"
 msgstr "Editar mensagem do site"
 
 #. TRANS: Server error displayed when saving a site-wide notice was impossible.
-#: actions/sitenoticeadminpanel.php:101
 msgid "Unable to save site notice."
 msgstr "Não foi possível gravar o aviso do site."
 
 #. TRANS: Client error displayed when a site-wide notice was longer than allowed.
-#: actions/sitenoticeadminpanel.php:112
 #, fuzzy
 msgid "Maximum length for the site-wide notice is 255 characters."
 msgstr "Tamanho máximo do aviso do site é 255 caracteres."
 
 #. TRANS: Label for site-wide notice text field in admin panel.
-#: actions/sitenoticeadminpanel.php:176
 msgid "Site notice text"
 msgstr "Texto do aviso do site"
 
 #. TRANS: Tooltip for site-wide notice text field in admin panel.
-#: actions/sitenoticeadminpanel.php:179
 #, fuzzy
 msgid "Site-wide notice text (255 characters maximum; HTML allowed)"
 msgstr "Texto do aviso do site (máx. 255 caracteres; pode usar HTML)"
 
 #. TRANS: Title for button to save site notice in admin panel.
-#: actions/sitenoticeadminpanel.php:201
 #, fuzzy
 msgid "Save site notice."
 msgstr "Gravar aviso do site"
 
 #. TRANS: Title for SMS settings.
-#: actions/smssettings.php:56
 msgid "SMS settings"
 msgstr "Configurações de SMS"
 
 #. TRANS: SMS settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/smssettings.php:70
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr "Pode receber SMSs do site %%site.name%% por correio electrónico."
 
 #. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
-#: actions/smssettings.php:92
 msgid "SMS is not available."
 msgstr "SMS não está disponível."
 
 #. TRANS: Form legend for SMS settings form.
-#: actions/smssettings.php:106
 msgid "SMS address"
 msgstr "Endereço SMS"
 
 #. TRANS: Form guide in SMS settings form.
-#: actions/smssettings.php:115
 msgid "Current confirmed SMS-enabled phone number."
 msgstr "Número de telefone com serviço SMS activo já confirmado."
 
 #. TRANS: Form guide in IM settings form.
-#: actions/smssettings.php:128
 msgid "Awaiting confirmation on this phone number."
 msgstr "A aguardar confirmação deste número de telefone."
 
 #. TRANS: Field label for SMS address input in SMS settings form.
-#: actions/smssettings.php:137
 msgid "Confirmation code"
 msgstr "Código de confirmação"
 
 #. TRANS: Form field instructions in SMS settings form.
-#: actions/smssettings.php:139
 msgid "Enter the code you received on your phone."
 msgstr "Introduza o código que recebeu no seu telefone."
 
 #. TRANS: Button label to confirm SMS confirmation code in SMS settings.
-#: actions/smssettings.php:143
 msgctxt "BUTTON"
 msgid "Confirm"
 msgstr "Confirmar"
 
 #. TRANS: Field label for SMS phone number input in SMS settings form.
-#: actions/smssettings.php:148
 msgid "SMS phone number"
 msgstr "Número de telefone para SMS"
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
-#: actions/smssettings.php:151
 #, fuzzy
 msgid "Phone number, no punctuation or spaces, with area code."
 msgstr "Número de telefone, sem pontuação ou espaços, com código de área"
 
 #. TRANS: Form legend for SMS preferences form.
-#: actions/smssettings.php:190
 msgid "SMS preferences"
 msgstr "Preferências de SMS"
 
 #. TRANS: Checkbox label in SMS preferences form.
-#: actions/smssettings.php:196
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
@@ -6139,32 +5074,26 @@ msgstr ""
 "me montantes exorbitantes."
 
 #. TRANS: Confirmation message for successful SMS preferences save.
-#: actions/smssettings.php:307
 msgid "SMS preferences saved."
 msgstr "Preferências de SMS gravadas."
 
 #. TRANS: Message given saving SMS phone number without having provided one.
-#: actions/smssettings.php:329
 msgid "No phone number."
 msgstr "Nenhum número de telefone."
 
 #. TRANS: Message given saving SMS phone number without having selected a carrier.
-#: actions/smssettings.php:335
 msgid "No carrier selected."
 msgstr "Operador não foi seleccionado."
 
 #. TRANS: Message given saving SMS phone number that is already set.
-#: actions/smssettings.php:343
 msgid "That is already your phone number."
 msgstr "Esse já é o seu número de telefone."
 
 #. TRANS: Message given saving SMS phone number that is already set for another user.
-#: actions/smssettings.php:347
 msgid "That phone number already belongs to another user."
 msgstr "Esse número de telefone já pertence a outro utilizador."
 
 #. TRANS: Message given saving valid SMS phone number that is to be confirmed.
-#: actions/smssettings.php:375
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
 "for the code and instructions on how to use it."
@@ -6174,39 +5103,32 @@ msgstr ""
 "utilização."
 
 #. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
-#: actions/smssettings.php:403
 msgid "That is the wrong confirmation number."
 msgstr "Esse número de confirmação está errado."
 
 #. TRANS: Message given after successfully canceling SMS phone number confirmation.
-#: actions/smssettings.php:417
 msgid "SMS confirmation cancelled."
 msgstr "Confirmação de SMS cancelada."
 
 #. TRANS: Message given trying to remove an SMS phone number that is not
 #. TRANS: registered for the active user.
-#: actions/smssettings.php:437
 msgid "That is not your phone number."
 msgstr "Esse número de telefone não é o seu."
 
 #. TRANS: Message given after successfully removing a registered SMS phone number.
-#: actions/smssettings.php:459
 msgid "The SMS phone number was removed."
 msgstr "Número de telefone para SMS foi removido."
 
 #. TRANS: Label for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:498
 msgid "Mobile carrier"
 msgstr "Operador móvel"
 
 #. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:503
 msgid "Select a carrier"
 msgstr "Seleccione um operador"
 
 #. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
 #. TRANS: %s is an administrative contact's e-mail address.
-#: actions/smssettings.php:512
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -6217,119 +5139,94 @@ msgstr ""
 "para %s."
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
-#: actions/smssettings.php:534
 #, fuzzy
 msgid "No code entered."
 msgstr "Nenhum código introduzido"
 
 #. TRANS: Menu item for site administration
-#: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
-#: lib/adminpanelaction.php:395
 msgid "Snapshots"
 msgstr "Instantâneos"
 
-#: actions/snapshotadminpanel.php:65
 msgid "Manage snapshot configuration"
 msgstr "Alterar a configuração do instantâneo"
 
-#: actions/snapshotadminpanel.php:127
 msgid "Invalid snapshot run value."
 msgstr "Valor de criação do instantâneo é inválido."
 
-#: actions/snapshotadminpanel.php:133
 msgid "Snapshot frequency must be a number."
 msgstr "Frequência dos instantâneos estatísticos tem de ser um número."
 
-#: actions/snapshotadminpanel.php:144
 msgid "Invalid snapshot report URL."
 msgstr "URL para onde enviar instantâneos é inválida"
 
-#: actions/snapshotadminpanel.php:200
 msgid "Randomly during web hit"
 msgstr "Aleatoriamente, durante o acesso pela internet"
 
-#: actions/snapshotadminpanel.php:201
 msgid "In a scheduled job"
 msgstr "Num processo agendado"
 
-#: actions/snapshotadminpanel.php:206
 msgid "Data snapshots"
 msgstr "Instantâneos dos dados"
 
-#: actions/snapshotadminpanel.php:208
 msgid "When to send statistical data to status.net servers"
 msgstr "Quando enviar dados estatísticos para os servidores do status.net"
 
-#: actions/snapshotadminpanel.php:217
 msgid "Frequency"
 msgstr "Frequência"
 
-#: actions/snapshotadminpanel.php:218
 msgid "Snapshots will be sent once every N web hits"
 msgstr "Instantâneos serão enviados uma vez a cada N acessos da internet"
 
-#: actions/snapshotadminpanel.php:226
 msgid "Report URL"
 msgstr "URL para relatórios"
 
-#: actions/snapshotadminpanel.php:227
 msgid "Snapshots will be sent to this URL"
 msgstr "Instantâneos serão enviados para esta URL"
 
-#: actions/snapshotadminpanel.php:248
 msgid "Save snapshot settings"
 msgstr "Gravar configurações do instantâneo"
 
 #. TRANS: Client error displayed trying a change a subscription for a non-subscribed profile.
-#: actions/subedit.php:75
 msgid "You are not subscribed to that profile."
 msgstr "Não subscreveu esse perfil."
 
 #. TRANS: Server error displayed when updating a subscription fails with a database error.
 #. TRANS: Exception thrown when a subscription could not be stored on the server.
-#: actions/subedit.php:89 classes/Subscription.php:141
 msgid "Could not save subscription."
 msgstr "Não foi possível gravar a subscrição."
 
 #. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
-#: actions/subscribe.php:121
 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
 msgstr "Não pode subscrever um perfil remoto OMB 0.1 com esta operação."
 
 #. TRANS: Page title when subscription succeeded.
-#: actions/subscribe.php:149
 msgid "Subscribed"
 msgstr "Subscrito"
 
 #. TRANS: Header for list of subscribers for a user (first page).
 #. TRANS: %s is the user's nickname.
-#: actions/subscribers.php:51
 #, php-format
 msgid "%s subscribers"
 msgstr "Subscritores de %s"
 
 #. TRANS: Header for list of subscribers for a user (not first page).
 #. TRANS: %1$s is the user's nickname, $2$d is the page number.
-#: actions/subscribers.php:55
 #, php-format
 msgid "%1$s subscribers, page %2$d"
 msgstr "Subscritores de %1$s, página %2$d"
 
 #. TRANS: Page notice for page with an overview of all subscribers
 #. TRANS: of the logged in user's own profile.
-#: actions/subscribers.php:68
 msgid "These are the people who listen to your notices."
 msgstr "Estas são as pessoas que escutam as suas notas."
 
 #. TRANS: Page notice for page with an overview of all subscribers of a user other
 #. TRANS: than the logged in user. %s is the user nickname.
-#: actions/subscribers.php:74
 #, php-format
 msgid "These are the people who listen to %s's notices."
 msgstr "Estas são as pessoas que escutam as notas de %s."
 
 #. TRANS: Subscriber list text when the logged in user has no subscribers.
-#: actions/subscribers.php:114
 #, fuzzy
 msgid ""
 "You have no subscribers. Try subscribing to people you know and they might "
@@ -6340,7 +5237,6 @@ msgstr ""
 
 #. TRANS: Subscriber list text when looking at the subscribers for a of a user other
 #. TRANS: than the logged in user that has no subscribers. %s is the user nickname.
-#: actions/subscribers.php:118
 #, php-format
 msgid "%s has no subscribers. Want to be the first?"
 msgstr "%s não tem subscritores. Quer ser o primeiro?"
@@ -6350,7 +5246,6 @@ msgstr "%s não tem subscritores. Quer ser o primeiro?"
 #. TRANS: This message contains a Markdown URL. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.
-#: actions/subscribers.php:127
 #, php-format
 msgid ""
 "%s has no subscribers. Why not [register an account](%%%%action.register%%%"
@@ -6361,20 +5256,17 @@ msgstr ""
 
 #. TRANS: Header for subscriptions overview for a user (not first page).
 #. TRANS: %1$s is a user nickname, %2$d is the page number.
-#: actions/subscriptions.php:55
 #, php-format
 msgid "%1$s subscriptions, page %2$d"
 msgstr "Subscrições de %1$s, página %2$d"
 
 #. TRANS: Page notice for page with an overview of all subscriptions
 #. TRANS: of the logged in user's own profile.
-#: actions/subscriptions.php:68
 msgid "These are the people whose notices you listen to."
 msgstr "Estas são as pessoas cujas notas está a escutar."
 
 #. TRANS: Page notice for page with an overview of all subscriptions of a user other
 #. TRANS: than the logged in user. %s is the user nickname.
-#: actions/subscriptions.php:74
 #, php-format
 msgid "These are the people whose notices %s listens to."
 msgstr "Estas são as pessoas cujas notas %s está a escutar."
@@ -6383,7 +5275,6 @@ msgstr "Estas são as pessoas cujas notas %s está a escutar."
 #. 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.
-#: actions/subscriptions.php:133
 #, php-format
 msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "
@@ -6403,69 +5294,55 @@ msgstr ""
 #. TRANS: than the logged in user that has no subscriptions. %s is the user nickname.
 #. TRANS: Subscription list text when looking at the subscriptions for a of a user that has none
 #. TRANS: as an anonymous user. %s is the user nickname.
-#: actions/subscriptions.php:141 actions/subscriptions.php:147
 #, php-format
 msgid "%s is not listening to anyone."
 msgstr "%s não está a ouvir ninguém."
 
 #. TRANS: Atom feed title. %s is a profile nickname.
-#: actions/subscriptions.php:176
 #, fuzzy, php-format
 msgid "Subscription feed for %s (Atom)"
 msgstr "Fonte de notas para %s (Atom)"
 
 #. TRANS: Checkbox label for enabling Jabber messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:241 lib/settingsnav.php:110
-#, fuzzy
 msgid "IM"
 msgstr "MI"
 
 #. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:256 lib/settingsnav.php:117
 msgid "SMS"
 msgstr "SMS"
 
 #. TRANS: Title for all but the first page of notices with tags.
 #. TRANS: %1$s is the tag, %2$d is the page number.
-#: actions/tag.php:73
 #, php-format
 msgid "Notices tagged with %1$s, page %2$d"
 msgstr "Notas categorizadas com %1$s, página %2$d"
 
-#: actions/tag.php:91
 #, php-format
 msgid "Notice feed for tag %s (RSS 1.0)"
 msgstr "Fonte de notas para a categoria %s (RSS 1.0)"
 
-#: actions/tag.php:97
 #, php-format
 msgid "Notice feed for tag %s (RSS 2.0)"
 msgstr "Fonte de notas para a categoria %s (RSS 2.0)"
 
-#: actions/tag.php:103
 #, php-format
 msgid "Notice feed for tag %s (Atom)"
 msgstr "Fonte de notas para a categoria %s (Atom)"
 
-#: actions/tagother.php:39
 msgid "No ID argument."
 msgstr "Argumento de identificação (ID) em falta."
 
-#: actions/tagother.php:65
 #, php-format
 msgid "Tag %s"
 msgstr "Categoria %s"
 
 #. TRANS: H2 for user profile information.
-#: actions/tagother.php:77 lib/userprofile.php:76
 msgid "User profile"
 msgstr "Perfil"
 
-#: actions/tagother.php:120
 msgid "Tag user"
 msgstr "Categorizar utilizador"
 
-#: actions/tagother.php:130
 msgid ""
 "Tags for this user (letters, numbers, -, ., and _), comma- or space- "
 "separated"
@@ -6473,48 +5350,38 @@ msgstr ""
 "Categorias para este utilizador (letras, números, ., _), separadas por "
 "vírgulas ou espaços"
 
-#: actions/tagother.php:157
 #, php-format
 msgid "Invalid tag: \"%s\""
 msgstr "Categoria inválida: \"%s\""
 
-#: actions/tagother.php:172
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr "Só pode categorizar pessoas que subscreve ou os seus subscritores."
 
-#: actions/tagother.php:215
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
 "Use este formulário para categorizar os seus subscritores ou os que "
 "subscreve."
 
-#: actions/tagrss.php:35
 msgid "No such tag."
 msgstr "Categoria não foi encontrada."
 
 #. TRANS: Client error displayed when trying to unblock a non-blocked user.
-#: actions/unblock.php:59
 msgid "You haven't blocked that user."
 msgstr "Não bloqueou esse utilizador."
 
-#: actions/unsandbox.php:72
 msgid "User is not sandboxed."
 msgstr "Utilizador não está impedido de criar notas públicas."
 
-#: actions/unsilence.php:72
 msgid "User is not silenced."
 msgstr "Utilizador não está silenciado."
 
-#: actions/unsubscribe.php:77
 msgid "No profile ID in request."
 msgstr "O pedido não tem a identificação do perfil."
 
-#: actions/unsubscribe.php:98
 msgid "Unsubscribed"
 msgstr "Subscrição cancelada"
 
-#: actions/updateprofile.php:64
 #, php-format
 msgid ""
 "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
@@ -6522,176 +5389,141 @@ msgstr ""
 "Licença ‘%1$s’ da listenee stream não é compatível com a licença ‘%2$s’ do "
 "site."
 
-#: actions/urlsettings.php:60
 #, fuzzy
 msgid "URL settings"
 msgstr "Configurações do IM"
 
 #. TRANS: Instructions for tab "Other" in user profile settings.
-#: actions/urlsettings.php:72
 msgid "Manage various other options."
 msgstr "Gerir várias outras opções."
 
 #. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
 #. TRANS: user's profile settings. This message has one space at the beginning. Use your
 #. TRANS: language's word separator here if it has one (most likely a single space).
-#: actions/urlsettings.php:115
 msgid " (free service)"
 msgstr " (serviço livre)"
 
-#: actions/urlsettings.php:121
 #, fuzzy
 msgid "[none]"
 msgstr "Nenhum"
 
-#: actions/urlsettings.php:122
 msgid "[internal]"
 msgstr ""
 
 #. TRANS: Label for dropdown with URL shortener services.
-#: actions/urlsettings.php:130
 msgid "Shorten URLs with"
 msgstr "Encurtar URLs com"
 
 #. TRANS: Tooltip for for dropdown with URL shortener services.
-#: actions/urlsettings.php:132
 msgid "Automatic shortening service to use."
 msgstr "Serviço de encurtamento que será usado automaticamente"
 
-#: actions/urlsettings.php:138
 msgid "URL longer than"
 msgstr ""
 
-#: actions/urlsettings.php:141
 msgid "URLs longer than this will be shortened, 0 means always shorten."
 msgstr ""
 
-#: actions/urlsettings.php:145
 msgid "Text longer than"
 msgstr ""
 
-#: actions/urlsettings.php:148
 msgid ""
 "URLs in notices longer than this will be shortened, 0 means always shorten."
 msgstr ""
 
 #. TRANS: Form validation error for form "Other settings" in user profile.
-#: actions/urlsettings.php:180
 #, fuzzy
 msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr "Serviço de encurtamento de URLs demasiado extenso (máx. 50 caracteres)"
 
-#: actions/urlsettings.php:187
 msgid "Invalid number for max url length."
 msgstr ""
 
-#: actions/urlsettings.php:193
 #, fuzzy
 msgid "Invalid number for max notice length."
 msgstr "Conteúdo da nota é inválido."
 
-#: actions/urlsettings.php:238
 msgid "Error saving user URL shortening preferences."
 msgstr ""
 
 #. TRANS: User admin panel title
-#: actions/useradminpanel.php:58
 msgctxt "TITLE"
 msgid "User"
 msgstr "Utilizador"
 
 #. TRANS: Instruction for user admin panel.
-#: actions/useradminpanel.php:69
 msgid "User settings for this StatusNet site"
 msgstr ""
 
 #. TRANS: Form validation error in user admin panel when a non-numeric character limit was set.
-#: actions/useradminpanel.php:147
 msgid "Invalid bio limit. Must be numeric."
 msgstr "Limite da biografia inválido. Tem de ser numérico."
 
 #. TRANS: Form validation error in user admin panel when welcome text is too long.
-#: actions/useradminpanel.php:154
 #, fuzzy
 msgid "Invalid welcome text. Maximum length is 255 characters."
 msgstr "Texto de boas-vindas inválido. Tamanho máx. é 255 caracteres."
 
 #. TRANS: Client error displayed when trying to set a non-existing user as default subscription for new
 #. TRANS: users in user admin panel. %1$s is the invalid nickname.
-#: actions/useradminpanel.php:166
 #, fuzzy, php-format
 msgid "Invalid default subscripton: \"%1$s\" is not a user."
 msgstr "Subscrição predefinida é inválida: '%1$s' não é utilizador."
 
-#: actions/useradminpanel.php:215 lib/action.php:565 lib/settingsnav.php:77
-#: lib/subgroupnav.php:81
 msgid "Profile"
 msgstr "Perfil"
 
 #. TRANS: Field label in user admin panel for setting the character limit for the bio field.
-#: actions/useradminpanel.php:220
 msgid "Bio Limit"
 msgstr "Limite da Biografia"
 
 #. TRANS: Tooltip in user admin panel for setting the character limit for the bio field.
-#: actions/useradminpanel.php:222
 msgid "Maximum length of a profile bio in characters."
 msgstr "Tamanho máximo de uma biografia em caracteres."
 
 #. TRANS: Form legend in user admin panel.
-#: actions/useradminpanel.php:231
 msgid "New users"
 msgstr "Utilizadores novos"
 
 #. TRANS: Field label in user admin panel for setting new user welcome text.
-#: actions/useradminpanel.php:236
 msgid "New user welcome"
 msgstr "Boas-vindas a utilizadores novos"
 
 #. TRANS: Tooltip in user admin panel for setting new user welcome text.
-#: actions/useradminpanel.php:238
 #, fuzzy
 msgid "Welcome text for new users (maximum 255 characters)."
 msgstr "Texto de boas-vindas a utilizadores novos (máx. 255 caracteres)."
 
 #. TRANS: Field label in user admin panel for setting default subscription for new users.
-#: actions/useradminpanel.php:244
 msgid "Default subscription"
 msgstr "Subscrição predefinida"
 
 #. TRANS: Tooltip in user admin panel for setting default subscription for new users.
-#: actions/useradminpanel.php:246
 msgid "Automatically subscribe new users to this user."
 msgstr "Novos utilizadores subscrevem automaticamente este utilizador."
 
 #. TRANS: Form legend in user admin panel.
-#: actions/useradminpanel.php:256
 msgid "Invitations"
 msgstr "Convites"
 
 #. TRANS: Field label for checkbox in user admin panel for allowing users to invite friend using site e-mail.
-#: actions/useradminpanel.php:262
 msgid "Invitations enabled"
 msgstr "Convites habilitados"
 
 #. TRANS: Tooltip for checkbox in user admin panel for allowing users to invite friend using site e-mail.
-#: actions/useradminpanel.php:265
 msgid "Whether to allow users to invite new users."
 msgstr "Permitir, ou não, que utilizadores convidem utilizadores novos."
 
 #. TRANS: Title for button to save user settings in user admin panel.
-#: actions/useradminpanel.php:302
 #, fuzzy
 msgid "Save user settings."
 msgstr "Gravar configurações do site"
 
 #. TRANS: Page title.
-#: actions/userauthorization.php:109
 msgid "Authorize subscription"
 msgstr "Autorizar subscrição"
 
 #. TRANS: Page notice on "Auhtorize subscription" page.
-#: actions/userauthorization.php:115
 #, fuzzy
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
@@ -6703,42 +5535,35 @@ msgstr ""
 "as notas de alguém, simplesmente clique \"Rejeitar\"."
 
 #. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:200
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Accept"
 msgstr "Aceitar"
 
 #. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:202
 #, fuzzy
 msgid "Subscribe to this user."
 msgstr "Subscrever este utilizador"
 
 #. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:204
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Reject"
 msgstr "Rejeitar"
 
 #. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:206
 #, fuzzy
 msgid "Reject this subscription."
 msgstr "Rejeitar esta subscrição"
 
 #. TRANS: Client error displayed for an empty authorisation request.
-#: actions/userauthorization.php:219
 msgid "No authorization request!"
 msgstr "Não há pedido de autorização!"
 
 #. TRANS: Accept message header from Authorise subscription page.
-#: actions/userauthorization.php:242
 msgid "Subscription authorized"
 msgstr "Subscrição autorizada"
 
-#: actions/userauthorization.php:245
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to authorize the "
@@ -6749,11 +5574,9 @@ msgstr ""
 "sua chave de subscrição é:"
 
 #. TRANS: Reject message header from Authorise subscription page.
-#: actions/userauthorization.php:256
 msgid "Subscription rejected"
 msgstr "Subscrição rejeitada"
 
-#: actions/userauthorization.php:259
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to fully reject the "
@@ -6765,35 +5588,30 @@ msgstr ""
 
 #. TRANS: Exception thrown when no valid user is found for an authorisation request.
 #. TRANS: %s is a listener URI.
-#: actions/userauthorization.php:296
 #, fuzzy, php-format
 msgid "Listener URI \"%s\" not found here."
 msgstr "A listener URI ‘%s’ não foi encontrada aqui."
 
 #. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
 #. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:303
 #, fuzzy, php-format
 msgid "Listenee URI \"%s\" is too long."
 msgstr "URI do escutado ‘%s’ é demasiado longo."
 
 #. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
 #. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:311
 #, fuzzy, php-format
 msgid "Listenee URI \"%s\" is a local user."
 msgstr "URI do ouvido ‘%s’ é um utilizador local."
 
 #. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
 #. TRANS: %s is a profile URL.
-#: actions/userauthorization.php:329
 #, fuzzy, php-format
 msgid "Profile URL \"%s\" is for a local user."
 msgstr "A URL ‘%s’ do perfil é de um utilizador local."
 
 #. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
 #. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
-#: actions/userauthorization.php:339
 #, fuzzy, php-format
 msgid ""
 "Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
@@ -6804,32 +5622,27 @@ msgstr ""
 
 #. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
 #. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:349
 #, fuzzy, php-format
 msgid "Avatar URL \"%s\" is not valid."
 msgstr "A URL ‘%s’ do avatar é inválida."
 
 #. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
 #. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:356
 #, fuzzy, php-format
 msgid "Cannot read avatar URL \"%s\"."
 msgstr "Não é possível ler a URL do avatar ‘%s’."
 
 #. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
 #. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:363
 #, fuzzy, php-format
 msgid "Wrong image type for avatar URL \"%s\"."
 msgstr "Tipo de imagem incorrecto para o avatar da URL ‘%s’."
 
 #. TRANS: Page title for profile design page.
-#: actions/userdesignsettings.php:74 lib/designsettings.php:61
 msgid "Profile design"
 msgstr "Estilo do perfil"
 
 #. TRANS: Instructions for profile design page.
-#: actions/userdesignsettings.php:84 lib/designsettings.php:72
 msgid ""
 "Customize the way your profile looks with a background image and a colour "
 "palette of your choice."
@@ -6837,44 +5650,35 @@ msgstr ""
 "Personalize o estilo do seu perfil com uma imagem de fundo e uma paleta de "
 "cores à sua escolha."
 
-#: actions/userdesignsettings.php:289
 msgid "Enjoy your hotdog!"
 msgstr "Disfrute do seu cachorro-quente!"
 
-#: actions/userdesignsettings.php:325
 #, fuzzy
 msgid "Design settings"
 msgstr "Gravar configurações do site"
 
-#: actions/userdesignsettings.php:340
 msgid "View profile designs"
 msgstr "Ver estilos para o perfil"
 
-#: actions/userdesignsettings.php:341
 msgid "Show or hide profile designs."
 msgstr "Mostrar ou esconder estilos para o perfil."
 
-#: actions/userdesignsettings.php:348
 #, fuzzy
 msgid "Background file"
 msgstr "Fundo"
 
 #. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number.
-#: actions/usergroups.php:66
 #, php-format
 msgid "%1$s groups, page %2$d"
 msgstr "Grupos de %1$s, página %2$d"
 
-#: actions/usergroups.php:132
 msgid "Search for more groups"
 msgstr "Procurar mais grupos"
 
-#: actions/usergroups.php:159
 #, php-format
 msgid "%s is not a member of any group."
 msgstr "%s não é membro de nenhum grupo."
 
-#: actions/usergroups.php:164
 #, php-format
 msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
 msgstr "Tente [pesquisar grupos](%%action.groupsearch%%) e juntar-se a eles."
@@ -6884,18 +5688,14 @@ msgstr "Tente [pesquisar grupos](%%action.groupsearch%%) e juntar-se a eles."
 #. TRANS: %1$s is a group name, %2$s is a site name.
 #. TRANS: Message is used as a subtitle in atom user notice feed.
 #. TRANS: %1$s is a user name, %2$s is a site name.
-#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:70
-#: lib/atomusernoticefeed.php:95
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr "Actualizações de %1#s a %2$s!"
 
-#: actions/version.php:75
 #, php-format
 msgid "StatusNet %s"
 msgstr "StatusNet %s"
 
-#: actions/version.php:155
 #, php-format
 msgid ""
 "This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
@@ -6904,16 +5704,13 @@ msgstr ""
 "Este site utiliza o %1$s versão %2$s, (c) 2008-2010 StatusNet, Inc. e "
 "colaboradores."
 
-#: actions/version.php:163
 msgid "Contributors"
 msgstr "Colaboradores"
 
 #. TRANS: Menu item for site administration
-#: actions/version.php:167 lib/adminpanelaction.php:403
 msgid "License"
 msgstr "Licença"
 
-#: actions/version.php:170
 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 "
@@ -6925,7 +5722,6 @@ msgstr ""
 "Software Foundation, que na versão 3 da Licença, quer (por sua opção) "
 "qualquer versão posterior. "
 
-#: actions/version.php:176
 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 "
@@ -6936,7 +5732,6 @@ msgstr ""
 "QUALQUER GARANTIA. Consulte a GNU Affero General Public License para mais "
 "informações. "
 
-#: actions/version.php:182
 #, php-format
 msgid ""
 "You should have received a copy of the GNU Affero General Public License "
@@ -6946,52 +5741,42 @@ msgstr ""
 "General Public License. Se não a tiver recebido, consulte %s."
 
 #. TRANS: Form input field label for application name.
-#: actions/version.php:197 lib/applicationeditform.php:190
 msgid "Name"
 msgstr "Nome"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:885
 msgid "Version"
 msgstr "Versão"
 
-#: actions/version.php:199
 msgid "Author(s)"
 msgstr "Autores"
 
 #. TRANS: Form input field label.
-#: actions/version.php:200 lib/applicationeditform.php:208
-#: lib/groupeditform.php:168
 msgid "Description"
 msgstr "Descrição"
 
 #. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:164
 msgid "Favor"
 msgstr "Eleger como favorita"
 
 #. TRANS: Ntofication given when a user marks a notice as favorite.
 #. TRANS: %1$s is a user nickname or full name, %2$s is a notice URI.
-#: classes/Fave.php:167
 #, fuzzy, php-format
 msgid "%1$s marked notice %2$s as a favorite."
 msgstr "%s (@%s) adicionou a sua nota às favoritas."
 
 #. TRANS: Server exception thrown when a URL cannot be processed.
-#: classes/File.php:162
 #, php-format
 msgid "Cannot process URL '%s'"
 msgstr "Não é possível processar a URL '$s'"
 
 #. TRANS: Server exception thrown when... Robin thinks something is impossible!
-#: classes/File.php:194
 msgid "Robin thinks something is impossible."
 msgstr "o Robin acha que algo é impossível."
 
 #. 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$s is used for plural.
-#: classes/File.php:210
 #, fuzzy, php-format
 msgid ""
 "No file may be larger than %1$d byte and the file you sent was %2$d bytes. "
@@ -7008,7 +5793,6 @@ msgstr[1] ""
 
 #. TRANS: Message given if an upload would exceed user quota.
 #. TRANS: %d (number) is the user quota in bytes and is used for plural.
-#: classes/File.php:223
 #, fuzzy, php-format
 msgid "A file this large would exceed your user quota of %d byte."
 msgid_plural "A file this large would exceed your user quota of %d bytes."
@@ -7019,7 +5803,6 @@ msgstr[1] ""
 
 #. TRANS: Message given id an upload would exceed a user's monthly quota.
 #. TRANS: $d (number) is the monthly user quota in bytes and is used for plural.
-#: classes/File.php:235
 #, fuzzy, php-format
 msgid "A file this large would exceed your monthly quota of %d byte."
 msgid_plural "A file this large would exceed your monthly quota of %d bytes."
@@ -7029,108 +5812,89 @@ msgstr[1] ""
 "Um ficheiro desta dimensão excederia a sua quota mensal de %d bytes."
 
 #. TRANS: Client exception thrown if a file upload does not have a valid name.
-#: classes/File.php:282 classes/File.php:297
 msgid "Invalid filename."
 msgstr "Nome de ficheiro inválido."
 
 #. TRANS: Exception thrown when joining a group fails.
-#: classes/Group_member.php:51
 msgid "Group join failed."
 msgstr "Entrada no grupo falhou."
 
 #. TRANS: Exception thrown when trying to leave a group the user is not a member of.
-#: classes/Group_member.php:64
 msgid "Not part of group."
 msgstr "Não faz parte do grupo."
 
 #. TRANS: Exception thrown when trying to leave a group fails.
-#: classes/Group_member.php:72
 msgid "Group leave failed."
 msgstr "Saída do grupo falhou."
 
 #. TRANS: Exception thrown providing an invalid profile ID.
 #. TRANS: %s is the invalid profile ID.
-#: classes/Group_member.php:85
 #, php-format
 msgid "Profile ID %s is invalid."
 msgstr ""
 
 #. TRANS: Exception thrown providing an invalid group ID.
 #. TRANS: %s is the invalid group ID.
-#: classes/Group_member.php:98
 #, fuzzy, php-format
 msgid "Group ID %s is invalid."
 msgstr "Erro ao guardar utilizador; inválido."
 
 #. TRANS: Activity title.
-#: classes/Group_member.php:147 lib/joinform.php:114
 msgid "Join"
 msgstr "Juntar-me"
 
 #. TRANS: Success message for subscribe to group attempt through OStatus.
 #. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
-#: classes/Group_member.php:151
 #, php-format
 msgid "%1$s has joined group %2$s."
 msgstr ""
 
 #. TRANS: Server exception thrown when updating a local group fails.
-#: classes/Local_group.php:42
 msgid "Could not update local group."
 msgstr "Não foi possível actualizar o grupo local."
 
 #. TRANS: Exception thrown when trying creating a login token failed.
 #. TRANS: %s is the user nickname for which token creation failed.
-#: classes/Login_token.php:78
 #, php-format
 msgid "Could not create login token for %s"
 msgstr "Não foi possível criar a chave de entrada para %s"
 
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
-#: classes/Memcached_DataObject.php:556
 msgid "No database name or DSN found anywhere."
 msgstr "Não foi encontrado nenhum nome de base de dados ou DSN."
 
 #. TRANS: Client exception thrown when a user tries to send a direct message while being banned from sending them.
-#: classes/Message.php:45
 msgid "You are banned from sending direct messages."
 msgstr "Está proibido de enviar mensagens directas."
 
 #. TRANS: Message given when a message could not be stored on the server.
-#: classes/Message.php:69
 msgid "Could not insert message."
 msgstr "Não foi possível inserir a mensagem."
 
 #. TRANS: Message given when a message could not be updated on the server.
-#: classes/Message.php:80
 msgid "Could not update message with new URI."
 msgstr "Não foi possível actualizar a mensagem com a nova URI."
 
 #. TRANS: Server exception thrown when a user profile for a notice cannot be found.
 #. TRANS: %1$d is a profile ID (number), %2$d is a notice ID (number).
-#: classes/Notice.php:98
 #, php-format
 msgid "No such profile (%1$d) for notice (%2$d)."
 msgstr "Não existe o perfil (%1$d) para a nota (%2$d)."
 
 #. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:199
 #, php-format
 msgid "Database error inserting hashtag: %s"
 msgstr "Erro na base de dados ao inserir o elemento criptográfico: %s"
 
 #. TRANS: Client exception thrown if a notice contains too many characters.
-#: classes/Notice.php:279
 msgid "Problem saving notice. Too long."
 msgstr "Problema na gravação da nota. Demasiado longa."
 
 #. TRANS: Client exception thrown when trying to save a notice for an unknown user.
-#: classes/Notice.php:284
 msgid "Problem saving notice. Unknown user."
 msgstr "Problema na gravação da nota. Utilizador desconhecido."
 
 #. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
-#: classes/Notice.php:290
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
@@ -7138,7 +5902,6 @@ msgstr ""
 "alguns minutos."
 
 #. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
-#: classes/Notice.php:297
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
 "few minutes."
@@ -7147,43 +5910,36 @@ msgstr ""
 "publicar daqui a alguns minutos."
 
 #. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:305
 msgid "You are banned from posting notices on this site."
 msgstr "Está proibido de publicar notas neste site."
 
 #. TRANS: Server exception thrown when a notice cannot be saved.
 #. TRANS: Server exception thrown when a notice cannot be updated.
-#: classes/Notice.php:372 classes/Notice.php:399
 msgid "Problem saving notice."
 msgstr "Problema na gravação da nota."
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:929
 #, fuzzy
 msgid "Bad type provided to saveKnownGroups."
 msgstr "O tipo fornecido ao método saveKnownGroups é incorrecto"
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:1028
 msgid "Problem saving group inbox."
 msgstr "Problema na gravação da caixa de entrada do grupo."
 
 #. TRANS: Server exception thrown when a reply cannot be saved.
 #. TRANS: %1$d is a notice ID, %2$d is the ID of the mentioned user.
-#: classes/Notice.php:1144
 #, fuzzy, php-format
 msgid "Could not save reply for %1$d, %2$d."
 msgstr "Não foi possível gravar a informação do grupo local."
 
 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1663
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
 
 #. TRANS: Full name of a profile or group followed by nickname in parens
-#: classes/Profile.php:172 classes/User_group.php:242
 #, fuzzy, php-format
 msgctxt "FANCYNAME"
 msgid "%1$s (%2$s)"
@@ -7191,7 +5947,6 @@ msgstr "%1$s (%2$s)"
 
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:779
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
@@ -7199,7 +5954,6 @@ msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:788
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -7207,251 +5961,199 @@ msgstr ""
 "de dados."
 
 #. TRANS: Exception thrown when a right for a non-existing user profile is checked.
-#: classes/Remote_profile.php:54
 msgid "Missing profile."
 msgstr "Perfil não existe."
 
 #. TRANS: Exception thrown when a tag cannot be saved.
-#: classes/Status_network.php:338
 msgid "Unable to save tag."
 msgstr "Não foi possível gravar a categoria."
 
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#: classes/Subscription.php:77 lib/oauthstore.php:482
 msgid "You have been banned from subscribing."
 msgstr "Foi bloqueado de fazer subscrições"
 
 #. TRANS: Exception thrown when trying to subscribe while already subscribed.
-#: classes/Subscription.php:82
 msgid "Already subscribed!"
 msgstr "Já subscrito!"
 
 #. TRANS: Exception thrown when trying to subscribe to a user who has blocked the subscribing user.
-#: classes/Subscription.php:87
 msgid "User has blocked you."
 msgstr "O utilizador bloqueou-o."
 
 #. TRANS: Exception thrown when trying to unsibscribe without a subscription.
-#: classes/Subscription.php:176
 msgid "Not subscribed!"
 msgstr "Não subscrito!"
 
 #. TRANS: Exception thrown when trying to unsubscribe a user from themselves.
-#: classes/Subscription.php:183
 msgid "Could not delete self-subscription."
 msgstr "Não foi possível apagar a auto-subscrição."
 
 #. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
-#: classes/Subscription.php:211
 msgid "Could not delete subscription OMB token."
 msgstr "Não foi possível apagar a chave OMB da subscrição."
 
 #. TRANS: Exception thrown when a subscription could not be deleted on the server.
-#: classes/Subscription.php:223
 msgid "Could not delete subscription."
 msgstr "Não foi possível apagar a subscrição."
 
 #. TRANS: Activity tile when subscribing to another person.
-#: classes/Subscription.php:265
 msgid "Follow"
 msgstr ""
 
 #. TRANS: Notification given when one person starts following another.
 #. TRANS: %1$s is the subscriber, %2$s is the subscribed.
-#: classes/Subscription.php:268
 #, fuzzy, php-format
 msgid "%1$s is now following %2$s."
 msgstr "%1$s está agora a ouvir as suas notas em %2$s."
 
 #. TRANS: Notice given on user registration.
 #. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:390
 #, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr "%1$s dá-lhe as boas-vindas, @%2$s!"
 
 #. TRANS: Server exception.
-#: classes/User.php:923
 msgid "No single user defined for single-user mode."
 msgstr "Nenhum utilizador único definido para o modo de utilizador único."
 
 #. TRANS: Server exception.
-#: classes/User.php:927
 msgid "Single-user mode code called when not enabled."
 msgstr ""
 
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:522
 msgid "Could not create group."
 msgstr "Não foi possível criar o grupo."
 
 #. TRANS: Server exception thrown when updating a group URI failed.
-#: classes/User_group.php:532
 msgid "Could not set group URI."
 msgstr "Não foi possível configurar a URI do grupo."
 
 #. TRANS: Server exception thrown when setting group membership failed.
-#: classes/User_group.php:555
 msgid "Could not set group membership."
 msgstr "Não foi possível configurar membros do grupo."
 
 #. TRANS: Server exception thrown when saving local group information failed.
-#: classes/User_group.php:570
 msgid "Could not save local group info."
 msgstr "Não foi possível gravar a informação do grupo local."
 
 #. TRANS: Exception thrown when an account could not be located when it should be moved.
 #. TRANS: %s is the remote site.
-#: lib/accountmover.php:65
 #, fuzzy, php-format
 msgid "Cannot locate account %s."
 msgstr "Não pode apagar utilizadores."
 
 #. TRANS: Exception thrown when a service document could not be located account move.
 #. TRANS: %s is the remote site.
-#: lib/accountmover.php:106
 #, php-format
 msgid "Cannot find XRD for %s."
 msgstr ""
 
 #. TRANS: Exception thrown when an account could not be located when it should be moved.
 #. TRANS: %s is the remote site.
-#: lib/accountmover.php:131
 #, php-format
 msgid "No AtomPub API service for %s."
 msgstr ""
 
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: lib/action.php:161
 #, php-format
 msgid "%1$s - %2$s"
 msgstr "%1$s - %2$s"
 
 #. TRANS: Page title for a page without a title set.
-#: lib/action.php:177
 msgid "Untitled page"
 msgstr "Página sem título"
 
 #. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.
-#: lib/action.php:325
 msgctxt "TOOLTIP"
 msgid "Show more"
 msgstr ""
 
 #. TRANS: Inline reply form submit button: submits a reply comment.
-#: lib/action.php:328
 #, fuzzy
 msgctxt "BUTTON"
-msgid "Comment"
-msgstr "Conteúdo"
+msgid "Reply"
+msgstr "Responder"
 
 #. TRANS: Placeholder text for inline reply form. Clicking in this box will turn it into a mini notice form.
-#: lib/action.php:331
-msgid "Add a comment..."
+msgid "Write a reply..."
 msgstr ""
 
-#: lib/action.php:559 lib/personalgroupnav.php:99
-#, fuzzy
 msgid "Home"
 msgstr "Página pessoal"
 
-#: lib/action.php:560
 #, fuzzy
 msgid "Friends timeline"
 msgstr "Notas de %s"
 
-#: lib/action.php:566
 #, fuzzy
 msgid "Your profile"
 msgstr "Perfil do grupo"
 
-#: lib/action.php:570 lib/action.php:593 lib/publicgroupnav.php:78
 msgid "Public"
 msgstr "Público"
 
-#: lib/action.php:571 lib/action.php:594
 #, fuzzy
 msgid "Everyone on this site"
 msgstr "Procurar pessoas neste site"
 
-#: lib/action.php:575
 #, fuzzy
 msgid "Settings"
 msgstr "Configurações de SMS"
 
-#: lib/action.php:576
 #, fuzzy
 msgid "Change your personal settings"
 msgstr "Modificar as suas definições de perfil"
 
-#: lib/action.php:582
 #, fuzzy
 msgid "Site configuration"
 msgstr "Configuração do utilizador"
 
-#: lib/action.php:587
-#, fuzzy
 msgid "Logout"
 msgstr "Sair"
 
-#: lib/action.php:588
-#, fuzzy
 msgid "Logout from the site"
 msgstr "Terminar esta sessão"
 
-#: lib/action.php:599
-#, fuzzy
 msgid "Login to the site"
 msgstr "Iniciar uma sessão"
 
-#: lib/action.php:606
-#, fuzzy
 msgid "Search"
 msgstr "Pesquisa"
 
-#: lib/action.php:607
 #, fuzzy
 msgid "Search the site"
 msgstr "Pesquisar site"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:864
 msgid "Help"
 msgstr "Ajuda"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:867
 msgid "About"
 msgstr "Sobre"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:870
 msgid "FAQ"
 msgstr "FAQ"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:875
 msgid "TOS"
 msgstr "Termos"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:879
 msgid "Privacy"
 msgstr "Privacidade"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:882
 msgid "Source"
 msgstr "Código fonte"
 
 #. TRANS: Secondary navigation menu option leading to e-mail contact information on the
 #. TRANS: StatusNet site, where to report bugs, ...
-#: lib/action.php:889
 msgid "Contact"
 msgstr "Contacto"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:892
 msgid "Badge"
 msgstr "Emblema"
 
@@ -7459,7 +6161,6 @@ msgstr "Emblema"
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:921
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7469,7 +6170,6 @@ msgstr ""
 "broughtby%%](%%site.broughtbyurl%%)."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:924
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** é um serviço de microblogues."
@@ -7478,7 +6178,6 @@ msgstr "**%%site.name%%** é um serviço de microblogues."
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:931
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7491,14 +6190,12 @@ msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:949
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr "O conteúdo e dados do site %1$s são privados e confidenciais."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:956
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
@@ -7506,7 +6203,6 @@ msgstr ""
 "direitos reservados."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:960
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 "Direitos de autor sobre o conteúdo e dados detidos pelos contribuidores. "
@@ -7514,7 +6210,6 @@ msgstr ""
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:992
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
@@ -7523,82 +6218,68 @@ msgstr ""
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1335
 msgid "After"
 msgstr "Posteriores"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1345
 msgid "Before"
 msgstr "Anteriores"
 
 #. TRANS: Client exception thrown when a feed instance is a DOMDocument.
-#: lib/activity.php:125
 msgid "Expecting a root feed element but got a whole XML document."
 msgstr ""
 "Era esperado um elemento raiz da fonte, mas foi recebido um documento XML "
 "inteiro."
 
 #. TRANS: Client exception thrown when using an unknown verb for the activity importer.
-#: lib/activityimporter.php:81
 #, fuzzy, php-format
 msgid "Unknown verb: \"%s\"."
 msgstr "Língua desconhecida \"%s\"."
 
 #. TRANS: Client exception thrown when trying to force a subscription for an untrusted user.
-#: lib/activityimporter.php:107
 msgid "Cannot force subscription for untrusted user."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to for a remote user to subscribe.
-#: lib/activityimporter.php:117
 #, fuzzy
 msgid "Cannot force remote user to subscribe."
 msgstr "Introduza o nome do utilizador para subscrever."
 
 #. TRANS: Client exception thrown when trying to subscribe to an unknown profile.
-#: lib/activityimporter.php:132
 #, fuzzy
 msgid "Unknown profile."
 msgstr "Tipo do ficheiro é desconhecido"
 
 #. TRANS: Client exception thrown when trying to import an event not related to the importing user.
-#: lib/activityimporter.php:138
 msgid "This activity seems unrelated to our user."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to join a remote group that is not a group.
-#: lib/activityimporter.php:154
 msgid "Remote profile is not a group!"
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to join a group the importing user is already a member of.
-#: lib/activityimporter.php:163
 #, fuzzy
 msgid "User is already a member of this group."
 msgstr "Já é membro desse grupo."
 
 #. TRANS: Client exception thrown when trying to import a notice by another user.
 #. TRANS: %1$s is the source URI of the notice, %2$s is the URI of the author.
-#: lib/activityimporter.php:201
 #, php-format
 msgid "Already know about notice %1$s and  it has a different author %2$s."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to overwrite the author information for a non-trusted user during import.
-#: lib/activityimporter.php:207
 msgid "Not overwriting author info for non-trusted user."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to import a notice without content.
 #. TRANS: %s is the notice URI.
-#: lib/activityimporter.php:223
 #, fuzzy, php-format
 msgid "No content for notice %s."
 msgstr "Procurar no conteúdo das notas"
 
-#: lib/activitymover.php:84
 #, fuzzy, php-format
 msgid "No such user %s."
 msgstr "Utilizador não foi encontrado."
@@ -7609,213 +6290,173 @@ msgstr "Utilizador não foi encontrado."
 #. TRANS: %1$s is a URL, %2$s is the status, %s$s is the fail reason.
 #. TRANS: Exception thrown when post to collection fails with a status that is not handled.
 #. TRANS: %1$s is a URL, %2$s is the status, %s$s is the fail reason.
-#: lib/activitysink.php:163 lib/activitysink.php:167 lib/activitysink.php:172
 #, fuzzy, php-format
 msgctxt "URLSTATUSREASON"
 msgid "%1$s %2$s %3$s"
 msgstr "%1$s - %2$s"
 
 #. TRANS: Client exception thrown when there is no source attribute.
-#: lib/activityutils.php:200
 msgid "Can't handle remote content yet."
 msgstr "Ainda não é possível processar conteúdos remotos."
 
 #. TRANS: Client exception thrown when there embedded XML content is found that cannot be processed yet.
-#: lib/activityutils.php:237
 msgid "Can't handle embedded XML content yet."
 msgstr "Ainda não é possível processar conteúdo XML embutido."
 
 #. TRANS: Client exception thrown when base64 encoded content is found that cannot be processed yet.
-#: lib/activityutils.php:242
 msgid "Can't handle embedded Base64 content yet."
 msgstr "Ainda não é possível processar conteúdo Base64 embutido."
 
 #. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights.
-#: lib/adminpanelaction.php:96
 msgid "You cannot make changes to this site."
 msgstr "Não pode fazer alterações a este site."
 
 #. TRANS: Client error message throw when a certain panel's settings cannot be changed.
-#: lib/adminpanelaction.php:108
 msgid "Changes to that panel are not allowed."
 msgstr "Não são permitidas alterações a esse painel."
 
 #. TRANS: Client error message.
-#: lib/adminpanelaction.php:222
 msgid "showForm() not implemented."
 msgstr "showForm() não implementado."
 
 #. TRANS: Client error message
-#: lib/adminpanelaction.php:250
 msgid "saveSettings() not implemented."
 msgstr "saveSettings() não implementado."
 
 #. TRANS: Client error message thrown if design settings could not be deleted in
 #. TRANS: the admin panel Design.
-#: lib/adminpanelaction.php:274
 msgid "Unable to delete design setting."
 msgstr "Não foi possível apagar a configuração do estilo."
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:337
 msgid "Basic site configuration"
 msgstr "Configuração básica do site"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:339
 msgctxt "MENU"
 msgid "Site"
 msgstr "Site"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:345
 msgid "Design configuration"
 msgstr "Configuração do estilo"
 
 #. TRANS: Menu item for site administration
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/adminpanelaction.php:347 lib/groupnav.php:135
 msgctxt "MENU"
 msgid "Design"
 msgstr "Estilo"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:353
 msgid "User configuration"
 msgstr "Configuração do utilizador"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:110
 msgid "User"
 msgstr "Utilizador"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:361
 msgid "Access configuration"
 msgstr "Configuração de acesso"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:369
 msgid "Paths configuration"
 msgstr "Configuração das localizações"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:377
 msgid "Sessions configuration"
 msgstr "Configuração das sessões"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:385
 msgid "Edit site notice"
 msgstr "Editar aviso do site"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:387
 msgid "Site notice"
 msgstr "Aviso do site"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:393
 msgid "Snapshots configuration"
 msgstr "Configuração dos instântaneos"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:401
 msgid "Set site license"
 msgstr ""
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:409
 #, fuzzy
 msgid "Plugins configuration"
 msgstr "Configuração das localizações"
 
 #. TRANS: Client error 401.
-#: lib/apiauth.php:111
 msgid "API resource requires read-write access, but you only have read access."
 msgstr "API requer acesso de leitura e escrita, mas só tem acesso de leitura."
 
 #. TRANS: OAuth exception thrown when no application is found for a given consumer key.
-#: lib/apiauth.php:177
 msgid "No application for that consumer key."
 msgstr "Nenhuma aplicação para essa chave de consumidor."
 
-#: lib/apiauth.php:202 lib/apiauth.php:284
 msgid "Not allowed to use API."
 msgstr ""
 
 #. TRANS: OAuth exception given when an incorrect access token was given for a user.
-#: lib/apiauth.php:225
 msgid "Bad access token."
 msgstr "Código de acesso incorrecto."
 
 #. TRANS: OAuth exception given when no user was found for a given token (no token was found).
-#: lib/apiauth.php:230
 msgid "No user for that token."
 msgstr "Nenhum utilizador para esse código."
 
 #. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel".
 #. TRANS: Client error thrown when authentication fails.
-#: lib/apiauth.php:272 lib/apiauth.php:302
 msgid "Could not authenticate you."
 msgstr "Não foi possível autenticá-lo."
 
 #. TRANS: Server error displayed when trying to create an anynymous OAuth consumer.
-#: lib/apioauthstore.php:45
 #, fuzzy
 msgid "Could not create anonymous consumer."
 msgstr "Não foi possível criar os nomes alternativos."
 
 #. TRANS: Server error displayed when trying to create an anynymous OAuth application.
-#: lib/apioauthstore.php:69
 #, fuzzy
 msgid "Could not create anonymous OAuth application."
 msgstr "Não foi possível criar a aplicação."
 
 #. TRANS: Exception thrown when no token association could be found.
-#: lib/apioauthstore.php:151
 msgid ""
 "Could not find a profile and application associated with the request token."
 msgstr ""
 
 #. TRANS: Exception thrown when no access token can be issued.
-#: lib/apioauthstore.php:209
 #, fuzzy
 msgid "Could not issue access token."
 msgstr "Não foi possível inserir a mensagem."
 
-#: lib/apioauthstore.php:317
 msgid "Database error inserting OAuth application user."
 msgstr "Erro na base de dados ao inserir o utilizador da aplicação OAuth."
 
-#: lib/apioauthstore.php:345
 #, fuzzy
 msgid "Database error updating OAuth application user."
 msgstr "Erro na base de dados ao inserir o utilizador da aplicação OAuth."
 
 #. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
-#: lib/apioauthstore.php:371
 msgid "Tried to revoke unknown token."
 msgstr "Tentou revogar um código desconhecido."
 
 #. TRANS: Exception thrown when an attempt is made to remove a revoked token.
-#: lib/apioauthstore.php:376
 msgid "Failed to delete revoked token."
 msgstr "Falha ao eliminar código revogado."
 
 #. TRANS: Form input field label for application icon.
-#: lib/applicationeditform.php:177
 msgid "Icon"
 msgstr "Ícone"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:182
 msgid "Icon for this application"
 msgstr "Ícone para esta aplicação"
 
 #. TRANS: Form input field instructions.
 #. TRANS: %d is the number of available characters for the description.
-#: lib/applicationeditform.php:201
 #, fuzzy, php-format
 msgid "Describe your application in %d character"
 msgid_plural "Describe your application in %d characters"
@@ -7823,209 +6464,170 @@ msgstr[0] "Descreva a sua aplicação em %d caracteres"
 msgstr[1] "Descreva a sua aplicação em %d caracteres"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:205
 msgid "Describe your application"
 msgstr "Descreva a sua aplicação"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:216
 msgid "URL of the homepage of this application"
 msgstr "URL da página desta aplicação"
 
 #. TRANS: Form input field label.
-#: lib/applicationeditform.php:218
 msgid "Source URL"
 msgstr "URL de origem"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:225
 msgid "Organization responsible for this application"
 msgstr "Organização responsável por esta aplicação"
 
 #. TRANS: Form input field label.
-#: lib/applicationeditform.php:227
 msgid "Organization"
 msgstr "Organização"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:234
 msgid "URL for the homepage of the organization"
 msgstr "URL da página desta organização"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:243
 msgid "URL to redirect to after authentication"
 msgstr "URL para onde reencaminhar após autenticação"
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:271
 msgid "Browser"
 msgstr "Browser"
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:288
 msgid "Desktop"
 msgstr "Desktop"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:290
 msgid "Type of application, browser or desktop"
 msgstr "Tipo da aplicação, browser ou desktop"
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:314
 msgid "Read-only"
 msgstr "Leitura"
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:334
 msgid "Read-write"
 msgstr "Leitura e escrita"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:336
 msgid "Default access for this application: read-only, or read-write"
 msgstr "Acesso por omissão para esta aplicação: leitura ou leitura e escrita"
 
 #. TRANS: Submit button title.
-#: lib/applicationeditform.php:353
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: lib/applicationlist.php:247
 msgid " by "
 msgstr ""
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:260
 msgid "read-write"
 msgstr "leitura e escrita"
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:262
 msgid "read-only"
 msgstr "leitura"
 
 #. TRANS: Used in application list. %1$s is a modified date, %2$s is access type ("read-write" or "read-only")
-#: lib/applicationlist.php:268
 #, php-format
 msgid "Approved %1$s - \"%2$s\" access."
 msgstr "Aprovado a %1$s - acesso \"%2$s\"."
 
 #. TRANS: Access token in the application list.
 #. TRANS: %s are the first 7 characters of the access token.
-#: lib/applicationlist.php:282
 #, php-format
 msgid "Access token starting with: %s"
 msgstr ""
 
 #. TRANS: Button label
-#: lib/applicationlist.php:298
 msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "Retirar"
 
-#: lib/atom10feed.php:113
 msgid "Author element must contain a name element."
 msgstr ""
 
 #. TRANS: Server exception thrown when using the method setActivitySubject() in the class Atom10Feed.
-#: lib/atom10feed.php:160
 #, fuzzy
 msgid "Do not use this method!"
 msgstr "Não apagar esta nota"
 
 #. TRANS: Title.
-#: lib/attachmentnoticesection.php:67
 msgid "Notices where this attachment appears"
 msgstr "Notas em que este anexo aparece"
 
 #. TRANS: Title.
-#: lib/attachmenttagcloudsection.php:48
 msgid "Tags for this attachment"
 msgstr "Categorias para este anexo"
 
 #. TRANS: Exception thrown when a password change fails.
-#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:227
 #, fuzzy
 msgid "Password changing failed."
 msgstr "Não foi possível mudar a palavra-chave"
 
 #. TRANS: Exception thrown when a password change attempt fails because it is not allowed.
-#: lib/authenticationplugin.php:238
 #, fuzzy
 msgid "Password changing is not allowed."
 msgstr "Não é permitido mudar a palavra-chave"
 
 #. TRANS: Title for the form to block a user.
-#: lib/blockform.php:68
 msgid "Block"
 msgstr "Bloquear"
 
 #. TRANS: Description of the form to block a user.
-#: lib/blockform.php:79
 msgid "Block this user"
 msgstr "Bloquear este utilizador"
 
 #. TRANS: Title for command results.
-#: lib/channel.php:104 lib/channel.php:125
 msgid "Command results"
 msgstr "Resultados do comando"
 
 #. TRANS: Title for command results.
-#: lib/channel.php:138
 #, fuzzy
 msgid "AJAX error"
 msgstr "Erro do Ajax"
 
 #. TRANS: E-mail subject when a command has completed.
-#: lib/channel.php:177 lib/mailhandler.php:143
 msgid "Command complete"
 msgstr "Comando terminado"
 
 #. TRANS: E-mail subject when a command has failed.
-#: lib/channel.php:188
 msgid "Command failed"
 msgstr "Comando falhou"
 
 #. TRANS: Command exception text shown when a notice ID is requested that does not exist.
-#: lib/command.php:82 lib/command.php:106
 msgid "Notice with that id does not exist."
 msgstr "Não existe nenhuma nota com essa identificação."
 
 #. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
 #. TRANS: Error text shown when a last user notice is requested and it does not exist.
-#: lib/command.php:99 lib/command.php:642
 msgid "User has no last notice."
 msgstr "Utilizador não tem nenhuma última nota."
 
 #. TRANS: Message given requesting a profile for a non-existing user.
 #. TRANS: %s is the nickname of the user for which the profile could not be found.
-#: lib/command.php:128
 #, php-format
 msgid "Could not find a user with nickname %s."
 msgstr "Não foi encontrado um utilizador com o nome %s."
 
 #. TRANS: Message given getting a non-existing user.
 #. TRANS: %s is the nickname of the user that could not be found.
-#: lib/command.php:148
 #, php-format
 msgid "Could not find a local user with nickname %s."
 msgstr "Não foi encontrado nenhum utilizador local com o nome %s."
 
 #. TRANS: Error text shown when an unimplemented command is given.
-#: lib/command.php:183
 msgid "Sorry, this command is not yet implemented."
 msgstr "Desculpe, este comando ainda não foi implementado."
 
 #. TRANS: Command exception text shown when a user tries to nudge themselves.
-#: lib/command.php:229
 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr "Não faz muito sentido tocar-nos a nós mesmos!"
 
 #. TRANS: Message given having nudged another user.
 #. TRANS: %s is the nickname of the user that was nudged.
-#: lib/command.php:238
 #, php-format
 msgid "Nudge sent to %s."
 msgstr "Toque enviado para %s."
@@ -8034,7 +6636,6 @@ msgstr "Toque enviado para %s."
 #. TRANS: %1$s is the number of other user the user is subscribed to.
 #. TRANS: %2$s is the number of users that are subscribed to the user.
 #. TRANS: %3$s is the number of notices the user has sent.
-#: lib/command.php:268
 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"
@@ -8046,40 +6647,34 @@ msgstr ""
 "Notas: %3$s"
 
 #. TRANS: Error message text shown when a favorite could not be set because it has already been favorited.
-#: lib/command.php:298
 #, fuzzy
 msgid "Could not create favorite: already favorited."
 msgstr "Não foi possível criar o favorito."
 
 #. TRANS: Text shown when a notice has been marked as favourite successfully.
-#: lib/command.php:324
 msgid "Notice marked as fave."
 msgstr "Nota marcada como favorita."
 
 #. TRANS: Message given having added a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:369
 #, php-format
 msgid "%1$s joined group %2$s."
 msgstr "%1$s juntou-se ao grupo %2$s."
 
 #. TRANS: Message given having removed a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:417
 #, php-format
 msgid "%1$s left group %2$s."
 msgstr "%1$s deixou o grupo %2$s."
 
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: lib/command.php:438
 #, fuzzy, php-format
 msgctxt "WHOIS"
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
 
 #. TRANS: Whois output. %s is the full name of the queried user.
-#: lib/command.php:442
 #, php-format
 msgid "Fullname: %s"
 msgstr "Nome completo: %s"
@@ -8087,7 +6682,6 @@ msgstr "Nome completo: %s"
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a location.
-#: lib/command.php:446 lib/mail.php:275
 #, php-format
 msgid "Location: %s"
 msgstr "Localidade: %s"
@@ -8095,20 +6689,17 @@ msgstr "Localidade: %s"
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a homepage.
-#: lib/command.php:450 lib/mail.php:279
 #, php-format
 msgid "Homepage: %s"
 msgstr "Página pessoal: %s"
 
 #. TRANS: Whois output. %s is the bio information of the queried user.
-#: lib/command.php:454
 #, php-format
 msgid "About: %s"
 msgstr "Sobre: %s"
 
 #. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).
 #. TRANS: %s is a remote profile.
-#: lib/command.php:483
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
@@ -8119,33 +6710,32 @@ msgstr ""
 
 #. TRANS: Message given if content is too long. %1$sd is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:500
 #, fuzzy, php-format
 msgid "Message too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
 msgstr[0] "Mensagem demasiado extensa - máx. %1$d caracteres, enviou %2$d."
 msgstr[1] "Mensagem demasiado extensa - máx. %1$d caracteres, enviou %2$d."
 
+#. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
+msgid "You can't send a message to this user."
+msgstr "Não pode enviar uma mensagem a este utilizador."
+
 #. TRANS: Error text shown sending a direct message fails with an unknown reason.
-#: lib/command.php:528
 msgid "Error sending direct message."
 msgstr "Erro no envio da mensagem directa."
 
 #. TRANS: Message given having repeated a notice from another user.
 #. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:565
 #, php-format
 msgid "Notice from %s repeated."
 msgstr "Nota de %s repetida."
 
 #. TRANS: Error text shown when repeating a notice fails with an unknown reason.
-#: lib/command.php:568
 msgid "Error repeating notice."
 msgstr "Erro ao repetir nota."
 
 #. TRANS: Message given if content of a notice for a reply is too long. %1$d is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:603
 #, fuzzy, php-format
 msgid "Notice too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Notice too long - maximum is %1$d characters, you sent %2$d."
@@ -8154,100 +6744,83 @@ msgstr[1] "Nota demasiado extensa - máx. %1$d caracteres, enviou %2$d."
 
 #. TRANS: Text shown having sent a reply to a notice successfully.
 #. TRANS: %s is the nickname of the user of the notice the reply was sent to.
-#: lib/command.php:616
 #, php-format
 msgid "Reply to %s sent."
 msgstr "Resposta a %s enviada."
 
 #. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
-#: lib/command.php:619
 msgid "Error saving notice."
 msgstr "Erro ao gravar nota."
 
 #. TRANS: Error text shown when no username was provided when issuing a subscribe command.
-#: lib/command.php:666
 msgid "Specify the name of the user to subscribe to."
 msgstr "Introduza o nome do utilizador para subscrever."
 
 #. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
-#: lib/command.php:675
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "Não pode subscrever perfis OMB por comando."
 
 #. TRANS: Text shown after having subscribed to another user successfully.
 #. TRANS: %s is the name of the user the subscription was requested for.
-#: lib/command.php:683
 #, php-format
 msgid "Subscribed to %s."
 msgstr "Subscreveu %s."
 
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.
-#: lib/command.php:704 lib/command.php:815
 msgid "Specify the name of the user to unsubscribe from."
 msgstr "Introduza o nome do utilizador para deixar de subscrever."
 
 #. TRANS: Text shown after having unsubscribed from another user successfully.
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:715
 #, php-format
 msgid "Unsubscribed from %s."
 msgstr "Deixou de subscrever %s."
 
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
-#: lib/command.php:735 lib/command.php:761
 msgid "Command not yet implemented."
 msgstr "Comando ainda não implementado."
 
 #. TRANS: Text shown when issuing the command "off" successfully.
-#: lib/command.php:739
 msgid "Notification off."
 msgstr "Notificação desligada."
 
 #. TRANS: Error text shown when the command "off" fails for an unknown reason.
-#: lib/command.php:742
 msgid "Can't turn off notification."
 msgstr "Não foi possível desligar a notificação."
 
 #. TRANS: Text shown when issuing the command "on" successfully.
-#: lib/command.php:765
 msgid "Notification on."
 msgstr "Notificação ligada."
 
 #. TRANS: Error text shown when the command "on" fails for an unknown reason.
-#: lib/command.php:768
 msgid "Can't turn on notification."
 msgstr "Não foi possível ligar a notificação."
 
 #. TRANS: Error text shown when issuing the login command while login is disabled.
-#: lib/command.php:782
 msgid "Login command is disabled."
 msgstr "Comando para iniciar sessão foi desactivado."
 
 #. TRANS: Text shown after issuing the login command successfully.
 #. TRANS: %s is a logon link..
-#: lib/command.php:795
 #, php-format
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr "O link é utilizável uma única vez e só é válido durante 2 minutos: %s."
 
 #. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:824
 #, php-format
 msgid "Unsubscribed %s."
 msgstr "Subscrição de %s cancelada."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
-#: lib/command.php:842
 msgid "You are not subscribed to anyone."
 msgstr "Não subscreveu ninguém."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
-#: lib/command.php:847
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Subscreveu esta pessoa:"
@@ -8255,14 +6828,12 @@ msgstr[1] "Subscreveu estas pessoas:"
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user
 #. TRANS: (followers) without having any subscribers.
-#: lib/command.php:869
 msgid "No one is subscribed to you."
 msgstr "Ninguém subscreve as suas notas."
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
-#: lib/command.php:874
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Esta pessoa subscreve as suas notas:"
@@ -8270,21 +6841,18 @@ msgstr[1] "Estas pessoas subscrevem as suas notas:"
 
 #. TRANS: Text shown after requesting groups a user is subscribed to without having
 #. TRANS: any group subscriptions.
-#: lib/command.php:896
 msgid "You are not a member of any groups."
 msgstr "Não está em nenhum grupo."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
-#: lib/command.php:901
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "Está no grupo:"
 msgstr[1] "Está nos grupos:"
 
 #. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-#: lib/command.php:916
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -8365,122 +6933,100 @@ msgstr ""
 "tracking - ainda não implementado.\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:36
 #, fuzzy
 msgid "No configuration file found."
 msgstr "Ficheiro de configuração não encontrado. "
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:39
 #, fuzzy
 msgid "I looked for configuration files in the following places:"
 msgstr "Procurei ficheiros de configuração nos seguintes sítios: "
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:42
 msgid "You may wish to run the installer to fix this."
 msgstr "Talvez queira correr o instalador para resolver esta questão."
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:46
 msgid "Go to the installer."
 msgstr "Ir para o instalador."
 
-#: lib/dberroraction.php:59
 msgid "Database error"
 msgstr "Erro de base de dados"
 
 #. TRANS: Description of form for deleting a user.
-#: lib/deleteuserform.php:75
 msgid "Delete this user"
 msgstr "Apagar este utilizador"
 
-#: lib/designform.php:114
 #, fuzzy
 msgid "Change design"
 msgstr "Gravar o estilo"
 
 #. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: lib/designform.php:131
 msgid "Change colours"
 msgstr "Alterar cores"
 
 #. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: lib/designform.php:138
 msgid "Use defaults"
 msgstr "Usar predefinições"
 
 #. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: lib/designform.php:140
 msgid "Restore default designs"
 msgstr "Repor estilos predefinidos"
 
 #. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: lib/designform.php:148
 msgid "Reset back to default"
 msgstr "Repor predefinição"
 
 #. TRANS: Label in form on profile design page.
 #. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
-#: lib/designform.php:158
 msgid "Upload file"
 msgstr "Carregar ficheiro"
 
 #. TRANS: Instructions for form on profile design page.
-#: lib/designform.php:163
-#, fuzzy
 msgid ""
 "You can upload your personal background image. The maximum file size is 2Mb."
 msgstr ""
 "Pode carregar uma imagem de fundo pessoal. O tamanho máximo do ficheiro é "
-"2MB."
+"2Mb."
 
 #. TRANS: Radio button on profile design page that will enable use of the uploaded profile image.
-#: lib/designform.php:194
 #, fuzzy
 msgctxt "RADIO"
 msgid "On"
 msgstr "Ligar"
 
 #. TRANS: Radio button on profile design page that will disable use of the uploaded profile image.
-#: lib/designform.php:211
 #, fuzzy
 msgctxt "RADIO"
 msgid "Off"
 msgstr "Desligar"
 
 #. TRANS: Title for button on profile design page to save settings.
-#: lib/designform.php:322
 msgid "Save design"
 msgstr "Gravar o estilo"
 
 #. TRANS: Error message displayed if design settings could not be saved.
 #. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
-#: lib/designsettings.php:216 lib/designsettings.php:238
 msgid "Couldn't update your design."
 msgstr "Não foi possível actualizar o estilo."
 
 #. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
-#: lib/designsettings.php:244
 msgid "Design defaults restored."
 msgstr "Predefinições do estilo repostas"
 
 #. TRANS: Exception. %s is an ID.
-#: lib/discovery.php:153
 #, fuzzy, php-format
 msgid "Unable to find services for %s."
 msgstr "Não foi possível retirar acesso da aplicação: %s"
 
 #. TRANS: Form legend for removing the favourite status for a favourite notice.
 #. TRANS: Title for button text for removing the favourite status for a favourite notice.
-#: lib/disfavorform.php:108 lib/disfavorform.php:140
 msgid "Disfavor this notice"
 msgstr "Retirar esta nota das favoritas"
 
 #. TRANS: Button text for removing the favourite status for a favourite notice.
-#: lib/disfavorform.php:136
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Disfavor favorite"
@@ -8488,103 +7034,81 @@ msgstr "Retirar das favoritas"
 
 #. TRANS: Form legend for adding the favourite status to a notice.
 #. TRANS: Title for button text for adding the favourite status to a notice.
-#: lib/favorform.php:108 lib/favorform.php:139
 msgid "Favor this notice"
 msgstr "Eleger esta nota como favorita"
 
 #. TRANS: Button text for adding the favourite status to a notice.
-#: lib/favorform.php:135
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Favor"
 msgstr "Eleger como favorita"
 
-#: lib/feed.php:84
 msgid "RSS 1.0"
 msgstr "RSS 1.0"
 
-#: lib/feed.php:86
 msgid "RSS 2.0"
 msgstr "RSS 2.0"
 
-#: lib/feed.php:88
 msgid "Atom"
 msgstr "Atom"
 
-#: lib/feed.php:90
 msgid "FOAF"
 msgstr "FOAF"
 
-#: lib/feedimporter.php:75
 #, fuzzy
 msgid "Not an atom feed."
 msgstr "Todos os membros"
 
-#: lib/feedimporter.php:82
 msgid "No author in the feed."
 msgstr ""
 
-#: lib/feedimporter.php:89
 msgid "Can't import without a user."
 msgstr ""
 
 #. TRANS: Header for feed links (h2).
-#: lib/feedlist.php:66
 msgid "Feeds"
 msgstr ""
 
-#: lib/galleryaction.php:128
 msgid "All"
 msgstr "Todas"
 
-#: lib/galleryaction.php:136
 msgid "Select tag to filter"
 msgstr "Seleccione uma categoria para filtrar"
 
-#: lib/galleryaction.php:137
 msgid "Tag"
 msgstr "Categoria"
 
-#: lib/galleryaction.php:138
 msgid "Choose a tag to narrow list"
 msgstr "Escolha uma categoria para reduzir a lista"
 
-#: lib/galleryaction.php:140
 msgid "Go"
 msgstr "Prosseguir"
 
-#: lib/grantroleform.php:91
 #, php-format
 msgid "Grant this user the \"%s\" role"
 msgstr "Atribuir a este utilizador a função \"%s\""
 
-#: lib/groupeditform.php:147
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "1-64 letras minúsculas ou números, sem pontuação ou espaços"
 
-#: lib/groupeditform.php:156
 #, fuzzy
 msgid "URL of the homepage or blog of the group or topic."
 msgstr "URL da página ou do blogue, deste grupo ou assunto"
 
-#: lib/groupeditform.php:161
 msgid "Describe the group or topic"
 msgstr "Descreva o grupo ou assunto"
 
-#: lib/groupeditform.php:163
 #, fuzzy, php-format
 msgid "Describe the group or topic in %d character or less"
 msgid_plural "Describe the group or topic in %d characters or less"
 msgstr[0] "Descreva o grupo ou o assunto em %d caracteres"
 msgstr[1] "Descreva o grupo ou o assunto em %d caracteres"
 
-#: lib/groupeditform.php:175
 #, fuzzy
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\"."
 msgstr "Localidade do grupo, se aplicável, por ex. \"Cidade, Região, País\""
 
-#: lib/groupeditform.php:183
 #, fuzzy, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -8598,70 +7122,60 @@ msgstr[1] ""
 "Nomes adicionais para o grupo, separados por vírgulas ou espaços, máx. %d"
 
 #. TRANS: Menu item in the group navigation page.
-#: lib/groupnav.php:86
 msgctxt "MENU"
 msgid "Group"
 msgstr "Grupo"
 
 #. TRANS: Tooltip for menu item in the group navigation page.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:89
 #, php-format
 msgctxt "TOOLTIP"
 msgid "%s group"
 msgstr "Grupo %s"
 
 #. TRANS: Menu item in the group navigation page.
-#: lib/groupnav.php:95
 msgctxt "MENU"
 msgid "Members"
 msgstr "Membros"
 
 #. TRANS: Tooltip for menu item in the group navigation page.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:98
 #, php-format
 msgctxt "TOOLTIP"
 msgid "%s group members"
 msgstr "Membros do grupo %s"
 
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/groupnav.php:108
 msgctxt "MENU"
 msgid "Blocked"
 msgstr "Bloqueado"
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:111
 #, php-format
 msgctxt "TOOLTIP"
 msgid "%s blocked users"
 msgstr "Utilizadores bloqueados de %s"
 
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "Gestor"
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:120
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Edit %s group properties"
 msgstr "Editar propriedades do grupo %s"
 
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/groupnav.php:126
 msgctxt "MENU"
 msgid "Logo"
 msgstr "Logótipo"
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:129
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Add or edit %s logo"
@@ -8669,69 +7183,57 @@ msgstr "Adicionar ou editar o logótipo de %s"
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:138
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Add or edit %s design"
 msgstr "Adicionar ou editar o design de %s"
 
 #. TRANS: Title for groups with the most members section.
-#: lib/groupsbymemberssection.php:71
 msgid "Groups with most members"
 msgstr "Grupos com mais membros"
 
 #. TRANS: Title for groups with the most posts section.
-#: lib/groupsbypostssection.php:71
 msgid "Groups with most posts"
 msgstr "Grupos com mais notas"
 
 #. TRANS: Title for group tag cloud section.
 #. TRANS: %s is a group name.
-#: lib/grouptagcloudsection.php:57
 #, php-format
 msgid "Tags in %s group's notices"
 msgstr "Categorias nas notas do grupo %s"
 
 #. TRANS: Client exception 406
-#: lib/htmloutputter.php:104
 msgid "This page is not available in a media type you accept"
 msgstr "Esta página não está disponível num formato que você aceite"
 
 #. TRANS: Exception thrown when trying to upload an unsupported image file format.
-#: lib/imagefile.php:73
 msgid "Unsupported image file format."
 msgstr "Formato do ficheiro da imagem não é suportado."
 
 #. TRANS: Exception thrown when too large a file is uploaded.
 #. TRANS: %s is the maximum file size, for example "500b", "10kB" or "2MB".
-#: lib/imagefile.php:91
 #, php-format
 msgid "That file is too big. The maximum file size is %s."
 msgstr "Esse ficheiro é demasiado grande. O tamanho máximo de ficheiro é %s."
 
 #. TRANS: Exception thrown when uploading an image and that action could not be completed.
-#: lib/imagefile.php:97
 msgid "Partial upload."
 msgstr "Transferência parcial."
 
 #. TRANS: Exception thrown when uploading a file as image that is not an image or is a corrupt file.
-#: lib/imagefile.php:115
 msgid "Not an image or corrupt file."
 msgstr "Ficheiro não é uma imagem ou está corrompido."
 
 #. TRANS: Exception thrown during resize when image has been registered as present, but is no longer there.
-#: lib/imagefile.php:178
 msgid "Lost our file."
 msgstr "Perdi o nosso ficheiro."
 
 #. TRANS: Exception thrown when trying to resize an unknown file type.
 #. TRANS: Exception thrown when trying resize an unknown file type.
-#: lib/imagefile.php:216 lib/imagefile.php:257
 msgid "Unknown file type"
 msgstr "Tipo do ficheiro é desconhecido"
 
 #. TRANS: Number of megabytes. %d is the number.
-#: lib/imagefile.php:303
 #, fuzzy, php-format
 msgid "%dMB"
 msgid_plural "%dMB"
@@ -8739,7 +7241,6 @@ msgstr[0] "MB"
 msgstr[1] "MB"
 
 #. TRANS: Number of kilobytes. %d is the number.
-#: lib/imagefile.php:307
 #, fuzzy, php-format
 msgid "%dkB"
 msgid_plural "%dkB"
@@ -8747,14 +7248,12 @@ msgstr[0] "kB"
 msgstr[1] "kB"
 
 #. TRANS: Number of bytes. %d is the number.
-#: lib/imagefile.php:310
 #, php-format
 msgid "%dB"
 msgid_plural "%dB"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/implugin.php:262
 #, php-format
 msgid ""
 "User \"%s\" on %s has said that your %s screenname belongs to them. If "
@@ -8764,51 +7263,42 @@ msgid ""
 "message."
 msgstr ""
 
-#: lib/implugin.php:349
 #, php-format
 msgid "Unknown inbox source %d."
 msgstr "Origem da caixa de entrada desconhecida \"%s\"."
 
-#: lib/implugin.php:485
-#, fuzzy, php-format
+#, php-format
 msgid "Message too long - maximum is %1$d characters, you sent %2$d."
 msgstr "Mensagem demasiado extensa - máx. %1$d caracteres, enviou %2$d."
 
-#: lib/leaveform.php:114
 msgid "Leave"
 msgstr "Afastar-me"
 
 #. TRANS: Menu item for logging in to the StatusNet site.
-#: lib/logingroupnav.php:77
 msgctxt "MENU"
 msgid "Login"
 msgstr "Entrar"
 
 #. TRANS: Title for menu item for logging in to the StatusNet site.
-#: lib/logingroupnav.php:79
 msgid "Login with a username and password"
 msgstr "Iniciar sessão com um nome de utilizador e senha"
 
 #. TRANS: Menu item for registering with the StatusNet site.
-#: lib/logingroupnav.php:85
 msgctxt "MENU"
 msgid "Register"
 msgstr "Registar"
 
 #. TRANS: Title for menu item for registering with the StatusNet site.
-#: lib/logingroupnav.php:87
 msgid "Sign up for a new account"
 msgstr "Registar uma conta nova"
 
 #. TRANS: Subject for address confirmation email.
-#: lib/mail.php:172
 msgid "Email address confirmation"
 msgstr "Confirmação do endereço electrónico"
 
 #. TRANS: Body for address confirmation email.
 #. TRANS: %1$s is the addressed user's nickname, %2$s is the StatusNet sitename,
 #. TRANS: %3$s is the URL to confirm at.
-#: lib/mail.php:177
 #, fuzzy, php-format
 msgid ""
 "Hey, %1$s.\n"
@@ -8839,14 +7329,12 @@ msgstr ""
 
 #. TRANS: Subject of new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
-#: lib/mail.php:243
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1$s está agora a ouvir as suas notas em %2$s."
 
 #. TRANS: This is a paragraph in a new-subscriber e-mail.
 #. TRANS: %s is a URL where the subscriber can be reported as abusive.
-#: lib/mail.php:250
 #, php-format
 msgid ""
 "If you believe this account is being used abusively, you can block them from "
@@ -8861,7 +7349,6 @@ msgstr ""
 #. TRANS: %3$s is the subscriber's profile URL, %4$s is the subscriber's location (or empty)
 #. TRANS: %5$s is the subscriber's homepage URL (or empty), %6%s is the subscriber's bio (or empty)
 #. TRANS: %7$s is a link to the addressed user's e-mail settings.
-#: lib/mail.php:260
 #, fuzzy, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -8889,14 +7376,12 @@ msgstr ""
 
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is biographical information.
-#: lib/mail.php:283
 #, php-format
 msgid "Bio: %s"
 msgstr "Bio: %s"
 
 #. TRANS: Subject of notification mail for new posting email address.
 #. TRANS: %s is the StatusNet sitename.
-#: lib/mail.php:312
 #, php-format
 msgid "New email address for posting to %s"
 msgstr "Novo endereço electrónico para publicar no site %s"
@@ -8904,7 +7389,6 @@ msgstr "Novo endereço electrónico para publicar no site %s"
 #. TRANS: Body of notification mail for new posting email address.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is the e-mail address to send
 #. TRANS: to to post by e-mail, %3$s is a URL to more instructions.
-#: lib/mail.php:318
 #, fuzzy, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -8927,26 +7411,22 @@ msgstr ""
 
 #. TRANS: Subject line for SMS-by-email notification messages.
 #. TRANS: %s is the posting user's nickname.
-#: lib/mail.php:439
 #, php-format
 msgid "%s status"
 msgstr "Estado de %s"
 
 #. TRANS: Subject line for SMS-by-email address confirmation message.
-#: lib/mail.php:465
 msgid "SMS confirmation"
 msgstr "Confirmação SMS"
 
 #. TRANS: Main body heading for SMS-by-email address confirmation message.
 #. TRANS: %s is the addressed user's nickname.
-#: lib/mail.php:469
 #, php-format
 msgid "%s: confirm you own this phone number with this code:"
 msgstr "%s: confirme que este número de telefone é seu com este código:"
 
 #. TRANS: Subject for 'nudge' notification email.
 #. TRANS: %s is the nudging user.
-#: lib/mail.php:490
 #, fuzzy, php-format
 msgid "You have been nudged by %s"
 msgstr "%s envia-lhe um toque"
@@ -8954,7 +7434,6 @@ msgstr "%s envia-lhe um toque"
 #. TRANS: Body for 'nudge' notification email.
 #. TRANS: %1$s is the nuding user's long name, $2$s is the nudging user's nickname,
 #. TRANS: %3$s is a URL to post notices at, %4$s is the StatusNet sitename.
-#: lib/mail.php:497
 #, php-format
 msgid ""
 "%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -8983,7 +7462,6 @@ msgstr ""
 
 #. TRANS: Subject for direct-message notification email.
 #. TRANS: %s is the sending user's nickname.
-#: lib/mail.php:544
 #, php-format
 msgid "New private message from %s"
 msgstr "Nova mensagem privada de %s"
@@ -8992,7 +7470,6 @@ msgstr "Nova mensagem privada de %s"
 #. TRANS: %1$s is the sending user's long name, %2$s is the sending user's nickname,
 #. TRANS: %3$s is the message content, %4$s a URL to the message,
 #. TRANS: %5$s is the StatusNet sitename.
-#: lib/mail.php:552
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -9027,7 +7504,6 @@ msgstr ""
 
 #. TRANS: Subject for favorite notification e-mail.
 #. TRANS: %1$s is the adding user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:604
 #, fuzzy, php-format
 msgid "%1$s (@%2$s) added your notice as a favorite"
 msgstr "%s (@%s) adicionou a sua nota às favoritas."
@@ -9037,7 +7513,6 @@ msgstr "%s (@%s) adicionou a sua nota às favoritas."
 #. TRANS: %3$s is a URL to the faved notice, %4$s is the faved notice text,
 #. TRANS: %5$s is a URL to all faves of the adding user, %6$s is the StatusNet sitename,
 #. TRANS: %7$s is the adding user's nickname.
-#: lib/mail.php:611
 #, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -9075,7 +7550,6 @@ msgstr ""
 "%6$s\n"
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:669
 #, php-format
 msgid ""
 "The full conversation can be read here:\n"
@@ -9088,7 +7562,6 @@ msgstr ""
 
 #. TRANS: E-mail subject for notice notification.
 #. TRANS: %1$s is the sending user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:677
 #, fuzzy, php-format
 msgid "%1$s (@%2$s) sent a notice to your attention"
 msgstr "%s (@%s) enviou uma nota à sua atenção"
@@ -9099,7 +7572,6 @@ msgstr "%s (@%s) enviou uma nota à sua atenção"
 #. TRANS: %5$s is a URL to the full conversion if it exists (otherwise empty),
 #. TRANS: %6$s is a URL to reply to the notice, %7$s is a URL to all @-replied for the addressed user,
 #. TRANS: %8$s is a URL to the addressed user's e-mail settings, %9$s is the sender's nickname.
-#: lib/mail.php:685
 #, php-format
 msgid ""
 "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -9149,11 +7621,9 @@ msgstr ""
 "\n"
 "P.S. Pode desligar estas notificações electrónicas aqui: %8$s\n"
 
-#: lib/mailbox.php:87
 msgid "Only the user can read their own mailboxes."
 msgstr "Só o próprio utilizador pode ler a sua caixa de correio."
 
-#: lib/mailbox.php:125
 msgid ""
 "You have no private messages. You can send private message to engage other "
 "users in conversation. People can send you messages for your eyes only."
@@ -9162,55 +7632,45 @@ msgstr ""
 "conversa com outros utilizadores. Outros podem enviar-lhe mensagens, a que "
 "só você terá acesso."
 
-#: lib/mailhandler.php:37
 msgid "Could not parse message."
 msgstr "Não foi possível fazer a análise sintáctica da mensagem."
 
-#: lib/mailhandler.php:42
 msgid "Not a registered user."
 msgstr "Não é um utilizador registado."
 
-#: lib/mailhandler.php:46
 msgid "Sorry, that is not your incoming email address."
 msgstr "Desculpe, esse não é o seu endereço para receber correio electrónico."
 
-#: lib/mailhandler.php:50
 msgid "Sorry, no incoming email allowed."
 msgstr "Desculpe, não lhe é permitido receber correio electrónico."
 
-#: lib/mailhandler.php:229
 #, php-format
 msgid "Unsupported message type: %s"
 msgstr "Tipo de mensagem não suportado: %s"
 
 #. TRANS: Client exception thrown when a database error was thrown during a file upload operation.
-#: lib/mediafile.php:102 lib/mediafile.php:174
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
 "Ocorreu um erro na base de dados ao gravar o seu ficheiro. Por favor, tente "
 "novamente."
 
 #. TRANS: Client exception thrown when a file upload operation would cause a user to exceed a set quota.
-#: lib/mediafile.php:238 lib/mediafile.php:281
 msgid "File exceeds user's quota."
 msgstr "Ficheiro excede quota do utilizador."
 
 #. TRANS: Client exception thrown when a file upload operation fails because the file could
 #. TRANS: not be moved from the temporary folder to the permanent file location.
-#: lib/mediafile.php:258 lib/mediafile.php:300
 msgid "File could not be moved to destination directory."
 msgstr "Não foi possível mover o ficheiro para o directório de destino."
 
 #. TRANS: Client exception thrown when a file upload operation has been stopped because the MIME
 #. TRANS: type of the uploaded file could not be determined.
-#: lib/mediafile.php:265 lib/mediafile.php:306
 msgid "Could not determine file's MIME type."
 msgstr "Não foi possível determinar o tipo MIME do ficheiro."
 
 #. TRANS: Client exception thrown trying to upload a forbidden MIME type.
 #. TRANS: %1$s is the file type that was denied, %2$s is the application part of
 #. TRANS: the MIME type that was denied.
-#: lib/mediafile.php:396
 #, php-format
 msgid ""
 "\"%1$s\" is not a supported file type on this server. Try using another %2$s "
@@ -9221,84 +7681,75 @@ msgstr ""
 
 #. TRANS: Client exception thrown trying to upload a forbidden MIME type.
 #. TRANS: %s is the file type that was denied.
-#: lib/mediafile.php:401
 #, php-format
 msgid "\"%s\" is not a supported file type on this server."
 msgstr "\"%s\" não é um tipo de ficheiro suportado neste servidor."
 
-#: lib/messageform.php:120
 msgid "Send a direct notice"
 msgstr "Enviar uma nota directa"
 
 #. TRANS Label entry in drop-down selection box in direct-message inbox/outbox. This is the default entry in the drop-down box, doubling as instructions and a brake against accidental submissions with the first user in the list.
-#: lib/messageform.php:137
 #, fuzzy
 msgid "Select recipient:"
 msgstr "Seleccione um operador"
 
 #. TRANS Entry in drop-down selection box in direct-message inbox/outbox when no one is available to message.
-#: lib/messageform.php:150
 #, fuzzy
 msgid "No mutual subscribers."
 msgstr "Não subscrito!"
 
-#: lib/messageform.php:153
 msgid "To"
 msgstr "Para"
 
-#: lib/messageform.php:184 lib/noticeform.php:236
 msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr "Enviar"
 
-#: lib/messagelist.php:77
 #, fuzzy
 msgid "Messages"
 msgstr "Mensagem"
 
-#: lib/messagelistitem.php:123 lib/noticelist.php:527
 msgid "from"
 msgstr "a partir de"
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:178
 msgid "Nickname cannot be empty."
 msgstr ""
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:191
 #, php-format
 msgid "Nickname cannot be more than %d character long."
 msgid_plural "Nickname cannot be more than %d characters long."
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/noticeform.php:160
+#. TRANS: Form legend for notice form.
 msgid "Send a notice"
 msgstr "Enviar uma nota"
 
-#: lib/noticeform.php:174
+#. TRANS: Title for notice label. %s is the user's nickname.
 #, php-format
 msgid "What's up, %s?"
 msgstr "Novidades, %s?"
 
-#: lib/noticeform.php:193
+#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr "Anexar"
 
-#: lib/noticeform.php:197
-msgid "Attach a file"
+#. TRANS: Title for input field to attach a file to a notice.
+#, fuzzy
+msgid "Attach a file."
 msgstr "Anexar um ficheiro"
 
-#: lib/noticeform.php:212
+#. TRANS: Field label to add location to a notice.
 msgid "Share my location"
 msgstr "Partilhar a minha localização."
 
-#: lib/noticeform.php:215
+#. TRANS: Text to not share location for a notice in notice form.
 msgid "Do not share my location"
 msgstr "Não partilhar a minha localização"
 
-#: lib/noticeform.php:216
+#. TRANS: Timeout error text for location retrieval in notice form.
 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
 "try again later"
@@ -9307,419 +7758,318 @@ msgstr ""
 "tente novamente mais tarde"
 
 #. TRANS: Used in coordinates as abbreviation of north
-#: lib/noticelist.php:457
 msgid "N"
 msgstr "N"
 
 #. TRANS: Used in coordinates as abbreviation of south
-#: lib/noticelist.php:459
 msgid "S"
 msgstr "S"
 
 #. TRANS: Used in coordinates as abbreviation of east
-#: lib/noticelist.php:461
 msgid "E"
 msgstr "E"
 
 #. TRANS: Used in coordinates as abbreviation of west
-#: lib/noticelist.php:463
 msgid "W"
 msgstr "O"
 
-#: lib/noticelist.php:465
 #, php-format
 msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 
-#: lib/noticelist.php:474
 msgid "at"
 msgstr "coords."
 
-#: lib/noticelist.php:523
 msgid "web"
 msgstr "web"
 
-#: lib/noticelist.php:589
 msgid "in context"
 msgstr "no contexto"
 
-#: lib/noticelist.php:624
 msgid "Repeated by"
 msgstr "Repetida por"
 
-#: lib/noticelist.php:651
 msgid "Reply to this notice"
 msgstr "Responder a esta nota"
 
-#: lib/noticelist.php:652
 msgid "Reply"
 msgstr "Responder"
 
-#: lib/noticelist.php:678
 msgid "Delete this notice"
 msgstr "Apagar esta nota"
 
-#: lib/noticelist.php:696
 msgid "Notice repeated"
 msgstr "Nota repetida"
 
-#: lib/nudgeform.php:116
 msgid "Nudge this user"
 msgstr "Tocar este utilizador"
 
-#: lib/nudgeform.php:128
 msgid "Nudge"
 msgstr "Tocar"
 
-#: lib/nudgeform.php:128
 msgid "Send a nudge to this user"
 msgstr "Enviar toque a este utilizador"
 
-#: lib/oauthstore.php:294
 msgid "Error inserting new profile."
 msgstr "Erro ao inserir perfil novo."
 
-#: lib/oauthstore.php:302
 msgid "Error inserting avatar."
 msgstr "Erro ao inserir avatar."
 
-#: lib/oauthstore.php:322
 msgid "Error inserting remote profile."
 msgstr "Erro ao inserir perfil remoto."
 
 #. TRANS: Exception thrown when a notice is denied because it has been sent before.
-#: lib/oauthstore.php:362
 msgid "Duplicate notice."
 msgstr "Nota duplicada."
 
-#: lib/oauthstore.php:507
 msgid "Couldn't insert new subscription."
 msgstr "Não foi possível inserir nova subscrição."
 
-#: lib/personalgroupnav.php:104
-#, fuzzy
 msgid "Replies"
 msgstr "Respostas"
 
-#: lib/personalgroupnav.php:109
-#, fuzzy
 msgid "Favorites"
 msgstr "Favoritas"
 
-#: lib/personalgroupnav.php:120
-#, fuzzy
 msgid "Inbox"
 msgstr "Recebidas"
 
-#: lib/personalgroupnav.php:121
 msgid "Your incoming messages"
 msgstr "Mensagens recebidas"
 
-#: lib/personalgroupnav.php:125
-#, fuzzy
 msgid "Outbox"
 msgstr "Enviadas"
 
-#: lib/personalgroupnav.php:126
 msgid "Your sent messages"
 msgstr "Mensagens enviadas"
 
 #. TRANS: Title for personal tag cloud section. %s is a user nickname.
-#: lib/personaltagcloudsection.php:56
 #, php-format
 msgid "Tags in %s's notices"
 msgstr "Categorias nas notas de %s"
 
 #. TRANS: Displayed as version information for a plugin if no version information was found.
-#: lib/plugin.php:126
 msgid "Unknown"
 msgstr "Desconhecida"
 
 #. TRANS: Plugin admin panel controls
-#: lib/plugindisableform.php:90
 msgctxt "plugin"
 msgid "Disable"
 msgstr ""
 
 #. TRANS: Plugin admin panel controls
-#: lib/pluginenableform.php:112
 msgctxt "plugin"
 msgid "Enable"
 msgstr ""
 
-#: lib/pluginlist.php:196
 msgctxt "plugin-description"
 msgid "(Plugin descriptions unavailable when disabled.)"
 msgstr ""
 
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:88
 msgid "Subscriptions"
 msgstr "Subscrições"
 
 #. TRANS: Text for user subscription statistics if user has more subscriptions than displayed.
-#: lib/profileaction.php:144
 msgid "All subscriptions"
 msgstr "Todas as subscrições"
 
 #. TRANS: H2 text for user subscriber statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:96
 msgid "Subscribers"
 msgstr "Subscritores"
 
 #. TRANS: Text for user subscription statistics if user has more subscribers than displayed.
-#: lib/profileaction.php:181
 msgid "All subscribers"
 msgstr "Todos os subscritores"
 
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:213
 msgid "User ID"
 msgstr "Número de identificação"
 
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:219
 msgid "Member since"
 msgstr "Membro desde"
 
 #. TRANS: Label for user statistics.
 #. TRANS: H2 text for user group membership statistics.
-#: lib/profileaction.php:239 lib/profileaction.php:290
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:104
 msgid "Groups"
 msgstr "Grupos"
 
 #. TRANS: Label for user statistics.
 #. TRANS: Average count of posts made per day since account registration.
-#: lib/profileaction.php:253
 msgid "Daily average"
 msgstr "Média diária"
 
 #. TRANS: Text for user group membership statistics if user has more subscriptions than displayed.
-#: lib/profileaction.php:305
 msgid "All groups"
 msgstr "Todos os grupos"
 
 #. TRANS: Server error displayed when using an unimplemented method.
-#: lib/profileformaction.php:123
 msgid "Unimplemented method."
 msgstr "Método não implementado."
 
-#: lib/publicgroupnav.php:82
 msgid "User groups"
 msgstr "Grupos"
 
-#: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
 msgid "Recent tags"
 msgstr "Categorias recentes"
 
-#: lib/publicgroupnav.php:88
 msgid "Featured"
 msgstr "Destaques"
 
-#: lib/publicgroupnav.php:92
 msgid "Popular"
 msgstr "Populares"
 
-#: lib/redirectingaction.php:95
 msgid "No return-to arguments."
 msgstr "Sem argumentos return-to."
 
-#: lib/repeatform.php:107
 msgid "Repeat this notice?"
 msgstr "Repetir esta nota?"
 
-#: lib/repeatform.php:132
 msgid "Yes"
 msgstr "Sim"
 
-#: lib/repeatform.php:132
 msgid "Repeat this notice"
 msgstr "Repetir esta nota"
 
-#: lib/revokeroleform.php:91
 #, php-format
 msgid "Revoke the \"%s\" role from this user"
 msgstr "Retirar a função \"%s\" a este utilizador"
 
 #. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:1001
 #, fuzzy
 msgid "Page not found."
 msgstr "Método da API não encontrado."
 
-#: lib/sandboxform.php:67
 msgid "Sandbox"
 msgstr "Bloquear notas públicas"
 
-#: lib/sandboxform.php:78
 msgid "Sandbox this user"
 msgstr "Impedir que notas deste utilizador sejam públicas"
 
 #. TRANS: Fieldset legend for the search form.
-#: lib/searchaction.php:120
 msgid "Search site"
 msgstr "Pesquisar site"
 
 #. TRANS: Used as a field label for the field where one or more keywords
 #. TRANS: for searching can be entered.
-#: lib/searchaction.php:128
 msgid "Keyword(s)"
 msgstr "Categorias"
 
 #. TRANS: Button text for searching site.
-#: lib/searchaction.php:130
 msgctxt "BUTTON"
 msgid "Search"
 msgstr "Pesquisar"
 
-#: lib/searchgroupnav.php:80
 msgid "People"
 msgstr "Pessoas"
 
-#: lib/searchgroupnav.php:81
 msgid "Find people on this site"
 msgstr "Procurar pessoas neste site"
 
-#: lib/searchgroupnav.php:83
 msgid "Find content of notices"
 msgstr "Procurar no conteúdo das notas"
 
-#: lib/searchgroupnav.php:85
 msgid "Find groups on this site"
 msgstr "Procurar grupos neste site"
 
-#: lib/section.php:89
 msgid "Untitled section"
 msgstr "Secção sem título"
 
-#: lib/section.php:106
 msgid "More..."
 msgstr "Mais..."
 
-#: lib/settingsnav.php:78
 msgid "Change your profile settings"
 msgstr "Modificar as suas definições de perfil"
 
-#: lib/settingsnav.php:83
 msgid "Upload an avatar"
 msgstr "Carregar um avatar"
 
-#: lib/settingsnav.php:88
 msgid "Change your password"
 msgstr "Modificar a sua senha"
 
-#: lib/settingsnav.php:93
 msgid "Change email handling"
 msgstr "Alterar manuseamento de email"
 
-#: lib/settingsnav.php:98
 msgid "Design your profile"
 msgstr "Altere o estilo do seu perfil"
 
-#: lib/settingsnav.php:102
 msgid "URL"
 msgstr "URL"
 
-#: lib/settingsnav.php:103
 msgid "URL shorteners"
 msgstr ""
 
-#: lib/settingsnav.php:111
 msgid "Updates by instant messenger (IM)"
 msgstr "Actualizações por mensagem instantânea (MI)"
 
-#: lib/settingsnav.php:118
 msgid "Updates by SMS"
 msgstr "Actualizações por SMS"
 
-#: lib/settingsnav.php:123
-#, fuzzy
 msgid "Connections"
 msgstr "Ligações"
 
-#: lib/settingsnav.php:124
 msgid "Authorized connected applications"
 msgstr "Aplicações ligadas autorizadas"
 
-#: lib/silenceform.php:67
 msgid "Silence"
 msgstr "Silenciar"
 
-#: lib/silenceform.php:78
 msgid "Silence this user"
 msgstr "Silenciar este utilizador"
 
-#: lib/subgroupnav.php:89
 #, php-format
 msgid "People %s subscribes to"
 msgstr "Pessoas que %s subscreve"
 
-#: lib/subgroupnav.php:97
 #, php-format
 msgid "People subscribed to %s"
 msgstr "Pessoas que subscrevem %s"
 
-#: lib/subgroupnav.php:105
 #, php-format
 msgid "Groups %s is a member of"
 msgstr "Grupos de que %s é membro"
 
-#: lib/subgroupnav.php:111
 msgid "Invite"
 msgstr "Convidar"
 
-#: lib/subgroupnav.php:112
 #, php-format
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Convidar amigos e colegas para se juntarem a si em %s"
 
-#: lib/subscribeform.php:115 lib/subscribeform.php:139
 msgid "Subscribe to this user"
 msgstr "Subscrever este utilizador"
 
-#: lib/subscriberspeopleselftagcloudsection.php:48
-#: lib/subscriptionspeopleselftagcloudsection.php:48
 msgid "People Tagcloud as self-tagged"
 msgstr "Nuvem da auto-categorização das pessoas"
 
-#: lib/subscriberspeopletagcloudsection.php:48
-#: lib/subscriptionspeopletagcloudsection.php:48
 msgid "People Tagcloud as tagged"
 msgstr "Nuvem da sua categorização das pessoas"
 
-#: lib/tagcloudsection.php:56
 msgid "None"
 msgstr "Nenhum"
 
 #. TRANS: Server exception displayed if a theme name was invalid.
-#: lib/theme.php:74
 #, fuzzy
 msgid "Invalid theme name."
 msgstr "Nome de ficheiro inválido."
 
-#: lib/themeuploader.php:50
 msgid "This server cannot handle theme uploads without ZIP support."
 msgstr ""
 "Este servidor não pode processar uploads de temas sem suporte do formato ZIP."
 
-#: lib/themeuploader.php:58 lib/themeuploader.php:61
 msgid "The theme file is missing or the upload failed."
 msgstr "O ficheiro do tema não foi localizado ou o upload falhou."
 
-#: lib/themeuploader.php:91 lib/themeuploader.php:102
-#: lib/themeuploader.php:279 lib/themeuploader.php:283
-#: lib/themeuploader.php:291 lib/themeuploader.php:298
 msgid "Failed saving theme."
 msgstr "Não foi possível gravar o tema."
 
-#: lib/themeuploader.php:147
 msgid "Invalid theme: bad directory structure."
 msgstr "Tema inválido: estrutura de directórios incorrecta."
 
-#: lib/themeuploader.php:166
 #, fuzzy, php-format
 msgid "Uploaded theme is too large; must be less than %d byte uncompressed."
 msgid_plural ""
@@ -9731,11 +8081,9 @@ msgstr[1] ""
 "O tema carregado é demasiado grande; tem de ter menos de %d bytes "
 "descomprimido."
 
-#: lib/themeuploader.php:179
 msgid "Invalid theme archive: missing file css/display.css"
 msgstr "Arquivo do tema inválido: falta o ficheiro css/display.css"
 
-#: lib/themeuploader.php:219
 msgid ""
 "Theme contains invalid file or folder name. Stick with ASCII letters, "
 "digits, underscore, and minus sign."
@@ -9743,142 +8091,114 @@ msgstr ""
 "Tema contém um nome de ficheiro ou de directório inválido. Use somente "
 "letras ASCII, algarismos, sublinhados e o sinal de menos."
 
-#: lib/themeuploader.php:225
 msgid "Theme contains unsafe file extension names; may be unsafe."
 msgstr "O tema contém extensões de ficheiro inseguras; pode não ser seguro."
 
-#: lib/themeuploader.php:242
 #, php-format
 msgid "Theme contains file of type '.%s', which is not allowed."
 msgstr "Tema contém um ficheiro do tipo '.%s', o que não é permitido."
 
-#: lib/themeuploader.php:260
 msgid "Error opening theme archive."
 msgstr "Ocorreu um erro ao abrir o arquivo do tema."
 
-#: lib/threadednoticelist.php:270
 #, php-format
-msgid "Show all %d comment"
-msgid_plural "Show all %d comments"
+msgid "Show %d reply"
+msgid_plural "Show all %d replies"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/topposterssection.php:74
 msgid "Top posters"
 msgstr "Quem mais publica"
 
 #. TRANS: Title for the form to unblock a user.
-#: lib/unblockform.php:67
 #, fuzzy
 msgctxt "TITLE"
 msgid "Unblock"
 msgstr "Desbloquear"
 
-#: lib/unsandboxform.php:69
 msgid "Unsandbox"
 msgstr "Permitir notas públicas"
 
-#: lib/unsandboxform.php:80
 msgid "Unsandbox this user"
 msgstr "Permitir que notas deste utilizador sejam públicas"
 
-#: lib/unsilenceform.php:67
 msgid "Unsilence"
 msgstr "Dar-lhe voz"
 
-#: lib/unsilenceform.php:78
 msgid "Unsilence this user"
 msgstr "Permitir que este utilizador publique notas"
 
-#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
 msgid "Unsubscribe from this user"
 msgstr "Deixar de subscrever este utilizador"
 
-#: lib/unsubscribeform.php:137
 msgid "Unsubscribe"
 msgstr "Abandonar"
 
 #. 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).
-#: lib/usernoprofileexception.php:60
 #, fuzzy, php-format
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "Utilizador não tem perfil."
 
-#: lib/userprofile.php:116
 msgid "Edit Avatar"
 msgstr "Editar Avatar"
 
 #. TRANS: H2 for user actions in a profile.
 #. TRANS: H2 for entity actions in a profile.
-#: lib/userprofile.php:216 lib/userprofile.php:232
 msgid "User actions"
 msgstr "Acções do utilizador"
 
 #. TRANS: Text shown in user profile of not yet compeltely deleted users.
-#: lib/userprofile.php:220
 msgid "User deletion in progress..."
 msgstr "A apagar o utilizador..."
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:248
 msgid "Edit profile settings"
 msgstr "Editar configurações do perfil"
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:250
 msgid "Edit"
 msgstr "Editar"
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:274
 msgid "Send a direct message to this user"
 msgstr "Enviar mensagem directa a este utilizador"
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:276
 msgid "Message"
 msgstr "Mensagem"
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:318
 msgid "Moderate"
 msgstr "Moderar"
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:357
 msgid "User role"
 msgstr "Função"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:360
 msgctxt "role"
 msgid "Administrator"
 msgstr "Gestor"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:362
 msgctxt "role"
 msgid "Moderator"
 msgstr "Moderador"
 
-#: lib/util.php:321
 #, fuzzy
 msgid "Not allowed to log in."
 msgstr "Não iniciou sessão."
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1337
 msgid "a few seconds ago"
 msgstr "há alguns segundos"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1340
 msgid "about a minute ago"
 msgstr "há cerca de um minuto"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1344
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
@@ -9886,12 +8206,10 @@ msgstr[0] "há cerca de um minuto atrás"
 msgstr[1] "há cerca de %d minutos atrás"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1347
 msgid "about an hour ago"
 msgstr "há cerca de uma hora"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1351
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
@@ -9899,12 +8217,10 @@ msgstr[0] "há cerca de uma hora atrás"
 msgstr[1] "há cerca de %d horas atrás"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1354
 msgid "about a day ago"
 msgstr "há cerca de um dia"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1358
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
@@ -9912,12 +8228,10 @@ msgstr[0] "há cerca de um dia atrás"
 msgstr[1] "há cerca de %d dias atrás"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1361
 msgid "about a month ago"
 msgstr "há cerca de um mês"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1365
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
@@ -9925,206 +8239,42 @@ msgstr[0] "há cerca de um mês atrás"
 msgstr[1] "há cerca de %d meses atrás"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1368
 msgid "about a year ago"
 msgstr "há cerca de um ano"
 
 #. TRANS: Web color exception thrown when a hexadecimal color code does not validate.
 #. TRANS: %s is the provided (invalid) color code.
-#: lib/webcolor.php:81 lib/webcolor.php:121
 #, fuzzy, php-format
 msgid "%s is not a valid color! Use 3 or 6 hex characters."
 msgstr "%s não é uma cor válida! Use 3 ou 6 caracteres hexadecimais."
 
 #. TRANS: Exception.
-#: lib/xrd.php:63
 #, fuzzy
 msgid "Invalid XML."
 msgstr "Tamanho inválido."
 
 #. TRANS: Exception.
-#: lib/xrd.php:68
 msgid "Invalid XML, missing XRD root."
 msgstr ""
 
 #. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
-#: scripts/restoreuser.php:62
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
 
-#, fuzzy
-#~ msgid "Could not generate feed for group - %s"
-#~ msgstr "Não foi possível actualizar o grupo."
+#~ msgid "Full name is too long (max 255 chars)."
+#~ msgstr "Nome completo demasiado longo (máx. 255 caracteres)."
+
+#~ msgid "description is too long (max %d chars)."
+#~ msgstr "descrição é demasiada extensa (máx. %d caracteres)."
+
+#~ msgid "Location is too long (max 255 chars)."
+#~ msgstr "Localidade demasiado longa (máx. 255 caracteres)."
+
+#~ msgid "Too many aliases! Maximum %d."
+#~ msgstr "Demasiados nomes alternativos! Máx. %d."
 
 #, fuzzy
-#~ msgid "Current confirmed Jabber/Google Talk address."
-#~ msgstr "Endereço do Jabber/GTalk já confirmado."
-
-#, fuzzy
-#~ msgid ""
-#~ "Jabber or Google Talk address, like \"UserName@example.org\". First, make "
-#~ "sure to add %s to your buddy list in your IM client or on Google Talk."
-#~ msgstr ""
-#~ "Endereço Jabber ou GTalk, por exemplo \"NomeDeUtilizador@exemplo.pt\". "
-#~ "Primeiro, certifique-se de que adicionou %s à sua lista de amigos no "
-#~ "cliente MI ou no GTalk."
-
-#, fuzzy
-#~ msgid "Send me notices through Jabber/Google Talk."
-#~ msgstr "Enviar-me notas via Jabber/GTalk."
-
-#, fuzzy
-#~ msgid "Publish a MicroID for my Jabber/Google Talk address."
-#~ msgstr "Publicar um MicroID para o meu endereço Jabber/GTalk."
-
-#~ msgid "No Jabber ID."
-#~ msgstr "Não introduziu o Jabber ID."
-
-#, fuzzy
-#~ msgid "Not a valid Jabber ID."
-#~ msgstr "Jabber ID não é válido"
-
-#~ msgid "That is already your Jabber ID."
-#~ msgstr "Esse já é o seu Jabber ID."
-
-#~ msgid "That is not your Jabber ID."
-#~ msgstr "Esse não é o seu Jabber ID."
-
-#~ msgid "Other settings"
-#~ msgstr "Outras configurações"
-
-#~ msgid "Tag cloud"
-#~ msgstr "Nuvem de categorias"
-
-#~ msgid "Consumer key"
-#~ msgstr "Chave do consumidor"
-
-#~ msgid "Consumer secret"
-#~ msgstr "Segredo do consumidor"
-
-#~ msgid "Request token URL"
-#~ msgstr "URL da chave de pedido"
-
-#~ msgid "Access token URL"
-#~ msgstr "URL da chave de acesso"
-
-#~ msgid "Authorize URL"
-#~ msgstr "Autorizar URL"
-
-#~ msgid "Jabber"
-#~ msgstr "Jabber"
-
-#~ msgid "Photo"
-#~ msgstr "Foto"
-
-#~ msgid "Other options"
-#~ msgstr "Outras opções"
-
-#~ msgid "Other"
-#~ msgstr "Outras"
-
-#~ msgid "Primary site navigation"
-#~ msgstr "Navegação primária deste site"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Personal profile and friends timeline"
-#~ msgstr "Perfil pessoal e notas dos amigos"
-
-#~ msgctxt "MENU"
-#~ msgid "Personal"
-#~ msgstr "Pessoal"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Change your email, avatar, password, profile"
-#~ msgstr "Altere o seu endereço electrónico, avatar, senha, perfil"
-
-#~ msgid "Account"
-#~ msgstr "Conta"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Connect to services"
-#~ msgstr "Ligar aos serviços"
-
-#~ msgid "Connect"
-#~ msgstr "Ligar"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Change site configuration"
-#~ msgstr "Alterar a configuração do site"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Invite friends and colleagues to join you on %s"
-#~ msgstr "Convidar amigos e colegas para se juntarem a si em %s"
-
-#~ msgctxt "MENU"
-#~ msgid "Invite"
-#~ msgstr "Convidar"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Create an account"
-#~ msgstr "Criar uma conta"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Help me!"
-#~ msgstr "Ajudem-me!"
-
-#~ msgctxt "MENU"
-#~ msgid "Help"
-#~ msgstr "Ajuda"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Search for people or text"
-#~ msgstr "Procurar pessoas ou pesquisar texto"
-
-#~ msgid "Local views"
-#~ msgstr "Vistas locais"
-
-#~ msgid "Page notice"
-#~ msgstr "Aviso da página"
-
-#~ msgid "Secondary site navigation"
-#~ msgstr "Navegação secundária deste site"
-
-#~ msgid "StatusNet software license"
-#~ msgstr "Licença de software do StatusNet"
-
-#~ msgid "Site content license"
-#~ msgstr "Licença de conteúdos do site"
-
-#~ msgid "Pagination"
-#~ msgstr "Paginação"
-
-#~ msgid "Author"
-#~ msgstr "Autor"
-
-#~ msgid "Provider"
-#~ msgstr "Fornecedor"
-
-#, fuzzy
-#~ msgctxt "MENU"
-#~ msgid "SMS"
-#~ msgstr "SMS"
-
-#~ msgid "Filter tags"
-#~ msgstr "Filtrar categorias"
-
-#~ msgid "[%s]"
-#~ msgstr "[%s]"
-
-#~ msgid "Available characters"
-#~ msgstr "Caracteres disponíveis"
-
-#, fuzzy
-#~ msgctxt "MENU"
-#~ msgid "Profile"
-#~ msgstr "Perfil"
-
-#~ msgid "Search help"
-#~ msgstr "Pesquisar ajuda"
-
-#, fuzzy
-#~ msgid "Message too long. Maximum is %1$d character, you sent %2$d."
-#~ msgid_plural "Message too long. Maximum is %1$d characters, you sent %2$d."
-#~ msgstr[0] "Mensagem demasiado extensa - máx. %1$d caracteres, enviou %2$d."
-#~ msgstr[1] "Mensagem demasiado extensa - máx. %1$d caracteres, enviou %2$d."
+#~ msgctxt "BUTTON"
+#~ msgid "Comment"
+#~ msgstr "Conteúdo"
diff --git a/locale/pt_BR/LC_MESSAGES/statusnet.po b/locale/pt_BR/LC_MESSAGES/statusnet.po
index 5588f08fa7..d6d5363303 100644
--- a/locale/pt_BR/LC_MESSAGES/statusnet.po
+++ b/locale/pt_BR/LC_MESSAGES/statusnet.po
@@ -15,68 +15,58 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:23+0000\n"
-"PO-Revision-Date: 2011-03-03 17:26:24+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:36+0000\n"
 "Language-Team: Brazilian Portuguese <http://translatewiki.net/wiki/Portal:pt-"
 "br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt-br\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-POT-Import-Date: 2011-02-25 23:49:23+0000\n"
+"X-POT-Import-Date: 2011-03-03 17:59:19+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
-#: actions/accessadminpanel.php:53 lib/adminpanelaction.php:363
 msgid "Access"
 msgstr "Acesso"
 
 #. TRANS: Page notice.
-#: actions/accessadminpanel.php:64
 msgid "Site access settings"
 msgstr "Configurações de acesso ao site"
 
 #. TRANS: Form legend for registration form.
-#: actions/accessadminpanel.php:151
 msgid "Registration"
 msgstr "Registro"
 
 #. TRANS: Checkbox instructions for admin setting "Private".
-#: actions/accessadminpanel.php:155
 msgid "Prohibit anonymous users (not logged in) from viewing site?"
 msgstr "Impedir usuários anônimos (não autenticados) de visualizar o site?"
 
 #. TRANS: Checkbox label for prohibiting anonymous users from viewing site.
-#: actions/accessadminpanel.php:157
 msgctxt "LABEL"
 msgid "Private"
 msgstr "Privado"
 
 #. TRANS: Checkbox instructions for admin setting "Invite only".
-#: actions/accessadminpanel.php:164
 msgid "Make registration invitation only."
 msgstr "Cadastro liberado somente para convidados."
 
 #. TRANS: Checkbox label for configuring site as invite only.
-#: actions/accessadminpanel.php:166
 msgid "Invite only"
 msgstr "Somente convidados"
 
 #. TRANS: Checkbox instructions for admin setting "Closed" (no new registrations).
-#: actions/accessadminpanel.php:173
 msgid "Disable new registrations."
 msgstr "Desabilita novos registros."
 
 #. TRANS: Checkbox label for disabling new user registrations.
-#: actions/accessadminpanel.php:175
 msgid "Closed"
 msgstr "Fechado"
 
 #. TRANS: Title for button to save access settings in site admin panel.
-#: actions/accessadminpanel.php:191
 msgid "Save access settings"
 msgstr "Salvar as configurações de acesso"
 
@@ -84,6 +74,7 @@ msgstr "Salvar as configurações de acesso"
 #. TRANS: Button text for saving theme settings.
 #. TRANS: Button label to save e-mail preferences.
 #. TRANS: Button label to save IM preferences.
+#. TRANS: Button text in the license admin panel.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
 #. TRANS: Button text for saving site notice in admin panel.
@@ -93,21 +84,12 @@ msgstr "Salvar as configurações de acesso"
 #. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
 #. TRANS: Button text on profile design page to save settings.
-#: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
-#: actions/emailsettings.php:251 actions/imsettings.php:199
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:198
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:204
-#: actions/subscriptions.php:261 actions/urlsettings.php:152
-#: actions/useradminpanel.php:298 lib/applicationeditform.php:355
-#: lib/designform.php:320 lib/groupeditform.php:201
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Salvar"
 
 #. TRANS: Server error when page not found (404).
 #. TRANS: Server error when page not found (404)
-#: actions/all.php:68 actions/public.php:98 actions/replies.php:93
-#: actions/showfavorites.php:140 actions/tag.php:52
 msgid "No such page."
 msgstr "Esta página não existe."
 
@@ -126,6 +108,7 @@ msgstr "Esta página não existe."
 #. TRANS: Client error displayed when checking group membership for a non-existing user.
 #. TRANS: Client error displayed when trying to have a non-existing user join a group.
 #. TRANS: Client error displayed when trying to have a non-existing user leave a group.
+#. TRANS: Client error displayed when not providing a user or an invalid user.
 #. TRANS: Client error displayed when updating a status for a non-existing user.
 #. TRANS: Client error displayed when requesting a list of followers for a non-existing user.
 #. TRANS: Client error displayed when requesting most recent favourite notices by a user for a non-existing user.
@@ -138,6 +121,8 @@ msgstr "Esta página não existe."
 #. 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.
 #. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
@@ -145,33 +130,10 @@ msgstr "Esta página não existe."
 #. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when calling a profile action without specifying a user.
-#: actions/all.php:80 actions/allrss.php:69
-#: actions/apiaccountupdatedeliverydevice.php:110
-#: actions/apiaccountupdateprofile.php:103
-#: actions/apiaccountupdateprofilebackgroundimage.php:118
-#: actions/apiaccountupdateprofileimage.php:104 actions/apiatomservice.php:59
-#: actions/apiblockcreate.php:96 actions/apiblockdestroy.php:94
-#: actions/apidirectmessage.php:75 actions/apidirectmessagenew.php:72
-#: actions/apigroupcreate.php:111 actions/apigroupismember.php:89
-#: actions/apigroupjoin.php:98 actions/apigroupleave.php:98
-#: actions/apigrouplist.php:70 actions/apigroupprofileupdate.php:108
-#: actions/apistatusesupdate.php:230 actions/apisubscriptions.php:85
-#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:173
-#: actions/apitimelinehome.php:78 actions/apitimelinementions.php:77
-#: actions/apitimelineuser.php:79 actions/avatarbynickname.php:79
-#: actions/favoritesrss.php:72 actions/foaf.php:42 actions/foaf.php:61
-#: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116
-#: actions/otp.php:78 actions/remotesubscribe.php:144
-#: actions/remotesubscribe.php:153 actions/replies.php:73
-#: actions/repliesrss.php:38 actions/rsd.php:113 actions/showfavorites.php:106
-#: actions/userbyid.php:75 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/userxrd.php:59 actions/xrds.php:71 lib/command.php:509
-#: lib/galleryaction.php:59 lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Este usuário não existe."
 
 #. TRANS: Page title. %1$s is user nickname, %2$d is page number
-#: actions/all.php:91
 #, php-format
 msgid "%1$s and friends, page %2$d"
 msgstr "%1$s e amigos, pág. %2$d"
@@ -180,33 +142,26 @@ msgstr "%1$s e amigos, pág. %2$d"
 #. TRANS: H1 text for page. %s is a user nickname.
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Timeline title for user and friends. %s is a user nickname.
-#: actions/all.php:94 actions/all.php:191 actions/allrss.php:117
-#: actions/apitimelinefriends.php:207 actions/apitimelinehome.php:113
-#: lib/personalgroupnav.php:100
 #, php-format
 msgid "%s and friends"
 msgstr "%s e amigos"
 
 #. TRANS: %s is user nickname.
-#: actions/all.php:108
 #, php-format
 msgid "Feed for friends of %s (RSS 1.0)"
 msgstr "Fonte de mensagens dos amigos de %s (RSS 1.0)"
 
 #. TRANS: %s is user nickname.
-#: actions/all.php:117
 #, php-format
 msgid "Feed for friends of %s (RSS 2.0)"
 msgstr "Fonte de mensagens dos amigos de %s (RSS 2.0)"
 
 #. TRANS: %s is user nickname.
-#: actions/all.php:126
 #, php-format
 msgid "Feed for friends of %s (Atom)"
 msgstr "Fonte de mensagens dos amigos de %s (Atom)"
 
 #. TRANS: Empty list message. %s is a user nickname.
-#: actions/all.php:139
 #, php-format
 msgid ""
 "This is the timeline for %s and friends but no one has posted anything yet."
@@ -216,7 +171,6 @@ msgstr ""
 
 #. TRANS: Encouragement displayed on logged in user's empty timeline.
 #. TRANS: This message contains Markdown links. Keep "](" together.
-#: actions/all.php:146
 #, php-format
 msgid ""
 "Try subscribing to more people, [join a group](%%action.groups%%) or post "
@@ -227,7 +181,6 @@ msgstr ""
 
 #. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@".
 #. TRANS: This message contains Markdown links. Keep "](" together.
-#: actions/all.php:150
 #, php-format
 msgid ""
 "You can try to [nudge %1$s](../%2$s) from their profile or [post something "
@@ -240,7 +193,6 @@ msgstr ""
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
 #. TRANS: Second sentence of empty message for anonymous users. %s is a user nickname.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:221
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -250,14 +202,11 @@ msgstr ""
 "primeiro a publicar?"
 
 #. TRANS: H1 text for page when viewing a list for self.
-#: actions/all.php:188
 msgid "You and friends"
 msgstr "Você e amigos"
 
 #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
 #. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name.
-#: actions/allrss.php:122 actions/apitimelinefriends.php:213
-#: actions/apitimelinehome.php:119
 #, php-format
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr "Atualizações de %1$s e amigos no %2$s!"
@@ -276,55 +225,20 @@ msgstr "Atualizações de %1$s e amigos no %2$s!"
 #. TRANS: Client error displayed trying to execute an unknown API method checking group membership.
 #. TRANS: Client error displayed trying to execute an unknown API method listing the latest 20 groups.
 #. TRANS: Client error displayed trying to execute an unknown API method showing group membership.
+#. TRANS: Client error displayed when using an unsupported API format.
 #. TRANS: Client error displayed trying to execute an unknown API method showing a group.
 #. TRANS: Client error displayed trying to execute an unknown API method testing API connectivity.
 #. TRANS: Client error displayed trying to execute an unknown API method deleting a status.
 #. TRANS: Client error displayed when trying to handle an unknown API method.
-#: actions/apiaccountratelimitstatus.php:69
-#: actions/apiaccountupdatedeliverydevice.php:92
-#: actions/apiaccountupdateprofile.php:94
-#: actions/apiaccountupdateprofilebackgroundimage.php:92
-#: actions/apiaccountupdateprofilecolors.php:115
-#: actions/apiaccountverifycredentials.php:68 actions/apidirectmessage.php:157
-#: actions/apifavoritecreate.php:98 actions/apifavoritedestroy.php:98
-#: actions/apifriendshipscreate.php:99 actions/apifriendshipsdestroy.php:99
-#: actions/apifriendshipsshow.php:124 actions/apigroupcreate.php:138
-#: actions/apigroupismember.php:115 actions/apigroupjoin.php:151
-#: actions/apigroupleave.php:141 actions/apigrouplist.php:134
-#: actions/apigrouplistall.php:120 actions/apigroupmembership.php:105
-#: actions/apigroupprofileupdate.php:100 actions/apigroupprofileupdate.php:213
-#: actions/apigroupshow.php:114 actions/apihelptest.php:84
-#: actions/apistatusesdestroy.php:101 actions/apistatusesretweets.php:110
-#: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:139
-#: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
-#: actions/apitimelinefavorites.php:182 actions/apitimelinefriends.php:276
-#: actions/apitimelinegroup.php:148 actions/apitimelinehome.php:181
-#: actions/apitimelinementions.php:182 actions/apitimelinepublic.php:247
-#: actions/apitimelineretweetedtome.php:147
-#: actions/apitimelineretweetsofme.php:147 actions/apitimelinetag.php:165
-#: actions/apitimelineuser.php:217 actions/apiusershow.php:100
 msgid "API method not found."
 msgstr "O método da API não foi encontrado!"
 
 #. 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.
-#: actions/apiaccountupdatedeliverydevice.php:83
-#: actions/apiaccountupdateprofile.php:85
-#: actions/apiaccountupdateprofilebackgroundimage.php:83
-#: actions/apiaccountupdateprofilecolors.php:106
-#: actions/apiaccountupdateprofileimage.php:80 actions/apiblockcreate.php:87
-#: actions/apiblockdestroy.php:85 actions/apidirectmessagenew.php:107
-#: actions/apifavoritecreate.php:88 actions/apifavoritedestroy.php:88
-#: actions/apifriendshipscreate.php:89 actions/apifriendshipsdestroy.php:89
-#: actions/apigroupcreate.php:102 actions/apigroupjoin.php:89
-#: actions/apigroupleave.php:89 actions/apigroupprofileupdate.php:92
-#: actions/apimediaupload.php:66 actions/apistatusesretweet.php:63
-#: actions/apistatusesupdate.php:194
 msgid "This method requires a POST."
 msgstr "Este método requer um POST."
 
 #. TRANS: Client error displayed when no valid device parameter is provided for a user's delivery device setting.
-#: actions/apiaccountupdatedeliverydevice.php:103
 msgid ""
 "You must specify a parameter named 'device' with a value of one of: sms, im, "
 "none."
@@ -339,10 +253,6 @@ msgstr ""
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
-#: actions/apiaccountupdatedeliverydevice.php:136
-#: actions/emailsettings.php:353 actions/emailsettings.php:499
-#: actions/profilesettings.php:323 actions/smssettings.php:300
-#: actions/smssettings.php:453 actions/urlsettings.php:211
 msgid "Could not update user."
 msgstr "Não foi possível atualizar o usuário."
 
@@ -355,32 +265,17 @@ msgstr "Não foi possível atualizar o usuário."
 #. TRANS: Server error displayed when requesting Friends of a Friend feed for a user for which the profile could not be found.
 #. TRANS: Server error displayed when trying to get a user hCard for a user without a profile.
 #. TRANS: Server error displayed when calling a profile action while the specified user does not have a profile.
-#: actions/apiaccountupdateprofile.php:111
-#: actions/apiaccountupdateprofilebackgroundimage.php:199
-#: actions/apiaccountupdateprofilecolors.php:183
-#: actions/apiaccountupdateprofileimage.php:131
-#: actions/apiuserprofileimage.php:88 actions/apiusershow.php:108
-#: actions/avatarbynickname.php:85 actions/foaf.php:69 actions/hcard.php:75
-#: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
-#: lib/profileaction.php:85
 msgid "User has no profile."
 msgstr "O usuário não tem perfil."
 
 #. TRANS: Server error displayed if a user profile could not be saved.
 #. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:419
 msgid "Could not save profile."
 msgstr "Não foi possível salvar o perfil."
 
 #. TRANS: Client error displayed when the number of bytes in a POST request exceeds a limit.
 #. TRANS: %s is the number of bytes of the CONTENT_LENGTH.
 #. TRANS: Form validation error in design settings form. POST should remain untranslated.
-#: actions/apiaccountupdateprofilebackgroundimage.php:108
-#: actions/apiaccountupdateprofileimage.php:95 actions/apimediaupload.php:81
-#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
-#: actions/designadminpanel.php:120 actions/editapplication.php:121
-#: actions/newapplication.php:102 actions/newnotice.php:95
-#: lib/designsettings.php:110
 #, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s byte) due to its "
@@ -400,26 +295,15 @@ msgstr[1] ""
 #. TRANS: Client error displayed when a database error occurs inserting profile colours.
 #. TRANS: Client error displayed when a database error occurs updating profile colours.
 #. TRANS: Form validation error displayed when group design settings could not be saved because of an application issue.
-#: actions/apiaccountupdateprofilebackgroundimage.php:138
-#: actions/apiaccountupdateprofilebackgroundimage.php:149
-#: actions/apiaccountupdateprofilecolors.php:160
-#: actions/apiaccountupdateprofilecolors.php:171
-#: actions/groupdesignsettings.php:285 actions/groupdesignsettings.php:296
-#: actions/userdesignsettings.php:218 actions/userdesignsettings.php:228
-#: actions/userdesignsettings.php:270 actions/userdesignsettings.php:280
 msgid "Unable to save your design settings."
 msgstr "Não foi possível salvar suas configurações de aparência."
 
 #. TRANS: Error displayed when updating design settings fails.
 #. TRANS: Client error displayed when a database error occurs updating profile colours.
-#: actions/apiaccountupdateprofilebackgroundimage.php:191
-#: actions/apiaccountupdateprofilecolors.php:139
-#: actions/userdesignsettings.php:196
 msgid "Could not update your design."
 msgstr "Não foi possível atualizar a sua aparência."
 
 #. TRANS: Title for Atom feed.
-#: actions/apiatomservice.php:85
 msgctxt "ATOM"
 msgid "Main"
 msgstr "Principal"
@@ -428,9 +312,6 @@ msgstr "Principal"
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Title in atom group notice feed. %s is a group name.
 #. TRANS: Title in atom user notice feed. %s is a user name.
-#: actions/apiatomservice.php:93 actions/grouprss.php:138
-#: actions/userrss.php:94 lib/atomgroupnoticefeed.php:63
-#: lib/atomusernoticefeed.php:88
 #, php-format
 msgid "%s timeline"
 msgstr "Mensagens de %s"
@@ -440,8 +321,6 @@ msgstr "Mensagens de %s"
 #. TRANS: %s is a user nickname.
 #. TRANS: Header for subscriptions overview for a user (first page).
 #. TRANS: %s is a user nickname.
-#: actions/apiatomservice.php:104 actions/atompubsubscriptionfeed.php:148
-#: actions/subscriptions.php:51
 #, php-format
 msgid "%s subscriptions"
 msgstr "Assinaturas de %s"
@@ -449,58 +328,48 @@ msgstr "Assinaturas de %s"
 #. TRANS: Title for Atom feed with a user's favorite notices. %s is a user nickname.
 #. TRANS: Title for Atom favorites feed.
 #. TRANS: %s is a user nickname.
-#: actions/apiatomservice.php:115 actions/atompubfavoritefeed.php:142
 #, php-format
 msgid "%s favorites"
 msgstr "Favoritas de %s"
 
 #. TRANS: Title for Atom feed with a user's memberships. %s is a user nickname.
-#: actions/apiatomservice.php:126
 #, php-format
 msgid "%s memberships"
 msgstr "Associações de %s"
 
 #. TRANS: Client error displayed when users try to block themselves.
-#: actions/apiblockcreate.php:105
 msgid "You cannot block yourself!"
 msgstr "Você não pode bloquear a si mesmo!"
 
 #. TRANS: Server error displayed when blocking a user has failed.
-#: actions/apiblockcreate.php:127
 msgid "Block user failed."
 msgstr "Não foi possível bloquear o usuário."
 
 #. TRANS: Server error displayed when unblocking a user has failed.
-#: actions/apiblockdestroy.php:113
 msgid "Unblock user failed."
 msgstr "Não foi possível desbloquear o usuário."
 
 #. TRANS: Title. %s is a user nickname.
-#: actions/apidirectmessage.php:88
 #, php-format
 msgid "Direct messages from %s"
 msgstr "Mensagens diretas de %s"
 
 #. TRANS: Subtitle. %s is a user nickname.
-#: actions/apidirectmessage.php:93
 #, php-format
 msgid "All the direct messages sent from %s"
 msgstr "Todas as mensagens diretas enviadas por %s"
 
 #. TRANS: Title. %s is a user nickname.
-#: actions/apidirectmessage.php:102
 #, php-format
 msgid "Direct messages to %s"
 msgstr "Mensagens diretas para %s"
 
 #. TRANS: Subtitle. %s is a user nickname.
-#: actions/apidirectmessage.php:107
 #, php-format
 msgid "All the direct messages sent to %s"
 msgstr "Todas as mensagens diretas enviadas para %s"
 
 #. TRANS: Client error displayed when no message text was submitted (406).
-#: actions/apidirectmessagenew.php:117
 msgid "No message text!"
 msgstr "Nenhuma mensagem de texto!"
 
@@ -508,7 +377,6 @@ msgstr "Nenhuma mensagem de texto!"
 #. TRANS: %d is the maximum number of characters for a message.
 #. TRANS: Form validation error displayed when message content is too long.
 #. TRANS: %d is the maximum number of characters for a message.
-#: actions/apidirectmessagenew.php:127 actions/newmessage.php:152
 #, php-format
 msgid "That's too long. Maximum message size is %d character."
 msgid_plural "That's too long. Maximum message size is %d characters."
@@ -518,12 +386,10 @@ msgstr[1] ""
 "Isso é muito extenso. O tamanho máximo das mensagens é %d caracteres."
 
 #. TRANS: Client error displayed if a recipient user could not be found (403).
-#: actions/apidirectmessagenew.php:139
 msgid "Recipient user not found."
 msgstr "O usuário destinatário não foi encontrado."
 
 #. TRANS: Client error displayed trying to direct message another user who's not a friend (403).
-#: actions/apidirectmessagenew.php:144
 #, fuzzy
 msgid "Cannot send direct messages to users who aren't your friend."
 msgstr ""
@@ -531,7 +397,6 @@ msgstr ""
 "amigos."
 
 #. TRANS: Client error displayed trying to direct message self (403).
-#: actions/apidirectmessagenew.php:154
 msgid ""
 "Do not send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
@@ -541,116 +406,96 @@ 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.
 #. TRANS: Client error displayed trying to delete a status with an invalid ID.
-#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:108
-#: actions/apistatusesdestroy.php:121
 msgid "No status found with that ID."
 msgstr "Não foi encontrado nenhum status com esse ID."
 
 #. TRANS: Client error displayed when trying to mark a notice favourite that already is a favourite.
-#: actions/apifavoritecreate.php:120
 msgid "This status is already a favorite."
 msgstr "Esta mensagem já é favorita!"
 
 #. TRANS: Client error displayed when marking a notice as favourite fails.
 #. TRANS: Server error displayed when trying to mark a notice as favorite fails in the database.
 #. TRANS: Error message text shown when a favorite could not be set.
-#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:306
 msgid "Could not create favorite."
 msgstr "Não foi possível criar a favorita."
 
 #. TRANS: Client error displayed when trying to remove a favourite that was not a favourite.
-#: actions/apifavoritedestroy.php:122
 msgid "That status is not a favorite."
 msgstr "Essa mensagem não é favorita!"
 
 #. TRANS: Client error displayed when removing a favourite has failed.
 #. TRANS: Server error displayed when removing a favorite from the database fails.
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:90
 msgid "Could not delete favorite."
 msgstr "Não foi possível excluir a favorita."
 
 #. TRANS: Client error displayed when trying follow who's profile could not be found.
-#: actions/apifriendshipscreate.php:109
 msgid "Could not follow user: profile not found."
 msgstr "Não é possível deixar de seguir o usuário: Usuário não encontrado."
 
 #. TRANS: Client error displayed when trying to follow a user that's already being followed.
 #. TRANS: %s is the nickname of the user that is already being followed.
-#: actions/apifriendshipscreate.php:120
 #, php-format
 msgid "Could not follow user: %s is already on your list."
 msgstr "Não é possível seguir o usuário: %s já está na sua lista."
 
 #. TRANS: Client error displayed when trying to unfollow a user that cannot be found.
-#: actions/apifriendshipsdestroy.php:109
 msgid "Could not unfollow user: User not found."
 msgstr "Não é possível deixar de seguir o usuário: Usuário não encontrado."
 
 #. TRANS: Client error displayed when trying to unfollow self.
-#: actions/apifriendshipsdestroy.php:121
 msgid "You cannot unfollow yourself."
 msgstr "Você não pode deixar de seguir você mesmo!"
 
 #. TRANS: Client error displayed when supplying invalid parameters to an API call checking if a friendship exists.
-#: actions/apifriendshipsexists.php:88
 msgid "Two valid IDs or nick names must be supplied."
 msgstr "Devem ser fornecidos dois IDs ou nomes de usuários válidos."
 
 #. TRANS: Client error displayed when a source user could not be determined showing friendship.
-#: actions/apifriendshipsshow.php:131
 msgid "Could not determine source user."
 msgstr "Não foi possível determinar o usuário de origem."
 
 #. TRANS: Client error displayed when a target user could not be determined showing friendship.
-#: actions/apifriendshipsshow.php:140
 msgid "Could not find target user."
 msgstr "Não foi possível encontrar usuário de destino."
 
 #. TRANS: Client error trying to create a group with a nickname this is already in use.
+#. TRANS: API validation exception thrown when nickname is already used.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:156 actions/apigroupprofileupdate.php:255
-#: actions/editgroup.php:191 actions/newgroup.php:137
-#: actions/profilesettings.php:274 actions/register.php:199
 msgid "Nickname already in use. Try another one."
 msgstr "Esta identificação já está em uso. Tente outro."
 
 #. TRANS: Client error in form for group creation.
+#. TRANS: API validation exception thrown when nickname does not validate.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:164 actions/apigroupprofileupdate.php:259
-#: actions/editgroup.php:195 actions/newgroup.php:141
-#: actions/profilesettings.php:244 actions/register.php:201
 msgid "Not a valid nickname."
 msgstr "Não é uma identificação válida."
 
 #. TRANS: Client error in form for group creation.
+#. TRANS: API validation exception thrown when homepage URL does not validate.
 #. TRANS: Validation error shown when providing an invalid homepage URL in the "Edit application" form.
 #. TRANS: Group edit form validation error.
 #. TRANS: Validation error shown when providing an invalid homepage URL in the "New application" form.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:181 actions/apigroupprofileupdate.php:277
-#: actions/editapplication.php:235 actions/editgroup.php:202
-#: actions/newapplication.php:221 actions/newgroup.php:148
-#: actions/profilesettings.php:249 actions/register.php:208
 msgid "Homepage is not a valid URL."
 msgstr "A URL informada não é válida."
 
 #. TRANS: Client error in form for group creation.
+#. TRANS: API validation exception thrown when full name does not validate.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:191 actions/editgroup.php:206
-#: actions/newgroup.php:152 actions/profilesettings.php:253
-#: actions/register.php:211
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "O nome completo é muito extenso (máx. 255 caracteres)"
 
 #. TRANS: Client error shown when providing too long a description during group creation.
 #. TRANS: %d is the maximum number of allowed characters.
+#. TRANS: API validation exception thrown when description does not validate.
+#. TRANS: %d is the maximum description length and used for plural.
 #. TRANS: Validation error shown when providing too long a description in the "Edit application" form.
 #. TRANS: %d is the maximum number of allowed characters.
 #. TRANS: Group edit form validation error.
@@ -658,9 +503,6 @@ msgstr "O nome completo é muito extenso (máx. 255 caracteres)"
 #. TRANS: %d is the maximum number of characters for the description.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed characters.
-#: actions/apigroupcreate.php:201 actions/editapplication.php:202
-#: actions/editgroup.php:211 actions/newapplication.php:182
-#: actions/newgroup.php:157
 #, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."
@@ -668,23 +510,21 @@ msgstr[0] "A descrição é muito extensa (máximo %d caractere)."
 msgstr[1] "A descrição é muito extensa (máximo %d caracteres)."
 
 #. TRANS: Client error shown when providing too long a location during group creation.
+#. TRANS: API validation exception thrown when location does not validate.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:215 actions/editgroup.php:218
-#: actions/newgroup.php:164 actions/profilesettings.php:266
-#: actions/register.php:220
 msgid "Location is too long (maximum 255 characters)."
 msgstr "A localização é muito extensa (máx. 255 caracteres)."
 
 #. TRANS: Client error shown when providing too many aliases during group creation.
 #. TRANS: %d is the maximum number of allowed aliases.
+#. TRANS: API validation exception thrown when aliases do not validate.
+#. TRANS: %d is the maximum number of aliases and used for plural.
 #. TRANS: Group edit form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.
-#: actions/apigroupcreate.php:236 actions/editgroup.php:231
-#: actions/newgroup.php:177
 #, php-format
 msgid "Too many aliases! Maximum %d allowed."
 msgid_plural "Too many aliases! Maximum %d allowed."
@@ -693,25 +533,24 @@ msgstr[1] "Muitos apelidos! O máximo são %d."
 
 #. TRANS: Client error shown when providing an invalid alias during group creation.
 #. TRANS: %s is the invalid alias.
-#: actions/apigroupcreate.php:253
+#. TRANS: API validation exception thrown when aliases does not validate.
+#. TRANS: %s is the invalid alias.
 #, php-format
 msgid "Invalid alias: \"%s\"."
 msgstr "Apelido inválido: \"%s\"."
 
 #. TRANS: Client error displayed when trying to use an alias during group creation that is already in use.
 #. TRANS: %s is the alias that is already in use.
+#. TRANS: API validation exception thrown when aliases is already used.
+#. TRANS: %s is the already used alias.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error. %s is the already used alias.
-#: actions/apigroupcreate.php:264 actions/apigroupprofileupdate.php:351
-#: actions/editgroup.php:246 actions/newgroup.php:193
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "O apelido \"%s\" já está em uso. Tente outro."
 
 #. TRANS: Client error displayed when trying to use an alias during group creation that is the same as the group's nickname.
 #. TRANS: Group edit form validation error.
-#: actions/apigroupcreate.php:278 actions/apigroupprofileupdate.php:359
-#: actions/editgroup.php:253
 msgid "Alias can't be the same as nickname."
 msgstr "O apelido não pode ser igual à identificação."
 
@@ -719,26 +558,21 @@ msgstr "O apelido não pode ser igual à identificação."
 #. TRANS: Client error displayed when trying to join a group that does not exist.
 #. TRANS: Client error displayed when trying to leave a group that does not exist.
 #. TRANS: Client error displayed trying to show group membership on a non-existing group.
+#. TRANS: Client error displayed when not providing a group or an invalid group.
 #. TRANS: Client error displayed when trying to show a group that could not be found.
 #. TRANS: Client error displayed requesting most recent notices to a group for a non-existing group.
-#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
-#: actions/apigroupleave.php:104 actions/apigroupmembership.php:71
-#: actions/apigroupprofileupdate.php:113 actions/apigroupshow.php:81
-#: actions/apitimelinegroup.php:89
 msgid "Group not found."
 msgstr "O grupo não foi encontrado."
 
 #. TRANS: Server error displayed when trying to join a group the user is already a member of.
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:345
 msgid "You are already a member of that group."
 msgstr "Você já é membro desse grupo."
 
 #. TRANS: Server error displayed when trying to join a group the user is blocked from joining.
 #. 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.
-#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:350
 msgid "You have been blocked from that group by the admin."
 msgstr "O administrador desse grupo bloqueou sua inscrição."
 
@@ -746,13 +580,11 @@ msgstr "O administrador desse grupo bloqueou sua inscrição."
 #. TRANS: %1$s is the joining user's nickname, $2$s is the group nickname for which the join failed.
 #. TRANS: Message given having failed to add a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:136 actions/joingroup.php:139 lib/command.php:362
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "Não foi possível associar o usuário %1$s ao grupo %2$s."
 
 #. TRANS: Server error displayed when trying to leave a group the user is not a member of.
-#: actions/apigroupleave.php:115
 msgid "You are not a member of this group."
 msgstr "Você não é membro deste grupo."
 
@@ -760,116 +592,79 @@ msgstr "Você não é membro deste grupo."
 #. TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
 #. TRANS: Message given having failed to remove a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupleave.php:127 actions/leavegroup.php:133
-#: lib/command.php:410
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
 msgstr "Não foi possível remover o usuário %1$s do grupo %2$s."
 
 #. TRANS: Used as title in check for group membership. %s is a user name.
-#: actions/apigrouplist.php:94
 #, php-format
 msgid "%s's groups"
 msgstr "Grupos de %s"
 
 #. TRANS: Used as subtitle in check for group membership. %1$s is a user name, %2$s is the site name.
-#: actions/apigrouplist.php:104
 #, php-format
 msgid "%1$s groups %2$s is a member of."
 msgstr "Grupos de %1$s nos quais %2$s é membro."
 
 #. TRANS: Message is used as a title when listing the lastest 20 groups. %s is a site name.
 #. TRANS: Message is used as a page title. %s is a nick name.
-#: actions/apigrouplistall.php:88 actions/usergroups.php:63
 #, php-format
 msgid "%s groups"
 msgstr "Grupos de %s"
 
 #. TRANS: Message is used as a subtitle when listing the lastest 20 groups. %s is a site name.
-#: actions/apigrouplistall.php:93
 #, php-format
 msgid "groups on %s"
 msgstr "grupos no %s"
 
+#. TRANS: Client error displayed when trying to edit a group without being an admin.
 #. TRANS: Client error displayed trying to edit a group while not being a group admin.
 #. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
 #. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
-#: actions/apigroupprofileupdate.php:118 actions/editgroup.php:110
-#: actions/editgroup.php:176 actions/groupdesignsettings.php:109
-#: actions/grouplogo.php:111
 msgid "You must be an admin to edit the group."
 msgstr "Você deve ser um administrador para editar o grupo."
 
+#. TRANS: Server error displayed when group update fails.
 #. TRANS: Server error displayed when editing a group fails.
-#: actions/apigroupprofileupdate.php:171 actions/editgroup.php:274
 msgid "Could not update group."
 msgstr "Não foi possível atualizar o grupo."
 
+#. TRANS: Server error displayed when adding group aliases fails.
 #. TRANS: Server error displayed when group aliases could not be added.
 #. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/apigroupprofileupdate.php:194 actions/editgroup.php:281
-#: classes/User_group.php:540
 msgid "Could not create aliases."
 msgstr "Não foi possível criar os apelidos."
 
+#. TRANS: API validation exception thrown when nickname does not validate.
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: actions/apigroupprofileupdate.php:249 lib/nickname.php:165
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr ""
 "A identificação deve conter apenas letras minúsculas e números e não pode "
 "ter e espaços."
 
-#: actions/apigroupprofileupdate.php:286
-#, fuzzy
-msgid "Full name is too long (max 255 chars)."
-msgstr "O nome completo é muito extenso (máx. 255 caracteres)"
-
-#: actions/apigroupprofileupdate.php:296
-#, fuzzy, php-format
-msgid "description is too long (max %d chars)."
-msgstr "A descrição é muito extensa (máximo %d caractere)."
-
-#: actions/apigroupprofileupdate.php:307
-#, fuzzy
-msgid "Location is too long (max 255 chars)."
-msgstr "A localização é muito extensa (máx. 255 caracteres)."
-
-#: actions/apigroupprofileupdate.php:326
-#, fuzzy, php-format
-msgid "Too many aliases! Maximum %d."
-msgstr "Muitos apelidos! O máximo é %d."
-
-#. TRANS: Group edit form validation error.
+#. TRANS: API validation exception thrown when alias is the same as nickname.
 #. TRANS: Group create form validation error.
-#. TRANS: %s is the invalid alias.
-#: actions/apigroupprofileupdate.php:342 actions/editgroup.php:241
-#: actions/newgroup.php:188
-#, php-format
-msgid "Invalid alias: \"%s\""
-msgstr "Apelido inválido: \"%s\""
+#, fuzzy
+msgid "Alias cannot be the same as nickname."
+msgstr "O apelido não pode ser igual à identificação."
 
 #. TRANS: Client error displayed when uploading a media file has failed.
-#: actions/apimediaupload.php:101
 msgid "Upload failed."
 msgstr "O upload falhou."
 
 #. TRANS: Client error given from the OAuth API when the request token or verifier is invalid.
-#: actions/apioauthaccesstoken.php:102
 msgid "Invalid request token or verifier."
 msgstr "O token ou o verificador solicitado é inválido."
 
 #. TRANS: Client error given when no oauth_token was passed to the OAuth API.
-#: actions/apioauthauthorize.php:107
 msgid "No oauth_token parameter provided."
 msgstr "Não foi fornecido nenhum parâmetro oauth_token"
 
 #. TRANS: Client error given when an invalid request token was passed to the OAuth API.
-#: actions/apioauthauthorize.php:115 actions/apioauthauthorize.php:129
 msgid "Invalid request token."
 msgstr "O token solicitado é inválido."
 
 #. TRANS: Client error given when an invalid request token was passed to the OAuth API.
-#: actions/apioauthauthorize.php:121
 msgid "Request token already authorized."
 msgstr "O token solicitado já foi autorizado."
 
@@ -879,32 +674,15 @@ msgstr "O token solicitado já foi autorizado."
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
 #. TRANS: Client error displayed when the session token is not okay.
-#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:75
-#: actions/emailsettings.php:292 actions/favor.php:75 actions/geocode.php:55
-#: actions/groupblock.php:65 actions/grouplogo.php:321
-#: actions/groupunblock.php:65 actions/imsettings.php:241
-#: actions/invite.php:60 actions/makeadmin.php:66 actions/newmessage.php:135
-#: actions/newnotice.php:105 actions/nudge.php:80
-#: actions/oauthappssettings.php:162 actions/oauthconnectionssettings.php:135
-#: actions/passwordsettings.php:137 actions/pluginenable.php:87
-#: actions/profilesettings.php:218 actions/recoverpassword.php:383
-#: actions/register.php:157 actions/remotesubscribe.php:76
-#: actions/repeat.php:82 actions/smssettings.php:249 actions/subedit.php:40
-#: actions/subscribe.php:87 actions/tagother.php:145
-#: actions/unsubscribe.php:69 actions/urlsettings.php:171
-#: actions/userauthorization.php:53 lib/designsettings.php:122
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 "Ocorreu um problema com o seu token de sessão. Tente novamente, por favor."
 
 #. TRANS: Form validation error given when an invalid username and/or password was passed to the OAuth API.
-#: actions/apioauthauthorize.php:168
 msgid "Invalid nickname / password!"
 msgstr "Nome de usuário e/ou senha inválido(s)!"
 
 #. TRANS: Server error displayed when a database action fails.
-#: actions/apioauthauthorize.php:217
 msgid "Database error inserting oauth_token_association."
 msgstr "Erro no banco de dados durante a inserção de oauth_token_association."
 
@@ -920,28 +698,19 @@ msgstr "Erro no banco de dados durante a inserção de oauth_token_association."
 #. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
 #. TRANS: Message given submitting a form with an unknown action in SMS settings.
 #. TRANS: Unknown form validation error in design settings form.
-#: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
-#: actions/designadminpanel.php:100 actions/editapplication.php:144
-#: actions/emailsettings.php:311 actions/grouplogo.php:332
-#: actions/imsettings.php:256 actions/newapplication.php:124
-#: actions/oauthconnectionssettings.php:144 actions/recoverpassword.php:46
-#: actions/smssettings.php:270 lib/designsettings.php:133
 msgid "Unexpected form submission."
 msgstr "Submissão inesperada de formulário."
 
 #. TRANS: Title for a page where a user can confirm/deny account access by an external application.
-#: actions/apioauthauthorize.php:387
 msgid "An application would like to connect to your account"
 msgstr "Uma aplicação gostaria de se conectar à sua conta"
 
 #. TRANS: Fieldset legend.
-#: actions/apioauthauthorize.php:404
 msgid "Allow or deny access"
 msgstr "Permitir ou negar o acesso"
 
 #. TRANS: User notification of external application requesting account access.
 #. TRANS: %3$s is the access type requested (read-write or read-only), %4$s is the StatusNet sitename.
-#: actions/apioauthauthorize.php:425
 #, php-format
 msgid ""
 "An application would like the ability to <strong>%3$s</strong> your %4$s "
@@ -955,7 +724,6 @@ msgstr ""
 #. TRANS: User notification of external application requesting account access.
 #. TRANS: %1$s is the application name requesting access, %2$s is the organisation behind the application,
 #. TRANS: %3$s is the access type requested, %4$s is the StatusNet sitename.
-#: actions/apioauthauthorize.php:433
 #, php-format
 msgid ""
 "The application <strong>%1$s</strong> by <strong>%2$s</strong> would like "
@@ -968,22 +736,18 @@ msgstr ""
 "confia."
 
 #. TRANS: Fieldset legend.
-#: actions/apioauthauthorize.php:455
 msgctxt "LEGEND"
 msgid "Account"
 msgstr "Conta"
 
 #. TRANS: Field label on OAuth API authorisation form.
+#. TRANS: Field label on login page.
 #. TRANS: Field label in form for profile settings.
-#: actions/apioauthauthorize.php:459 actions/login.php:225
-#: actions/profilesettings.php:107 actions/register.php:411
-#: actions/userauthorization.php:145 lib/groupeditform.php:145
 msgid "Nickname"
 msgstr "Usuário"
 
 #. TRANS: Field label on OAuth API authorisation form.
-#: actions/apioauthauthorize.php:463 actions/login.php:228
-#: actions/register.php:415 lib/settingsnav.php:87
+#. TRANS: Field label on login page.
 msgid "Password"
 msgstr "Senha"
 
@@ -993,43 +757,34 @@ msgstr "Senha"
 #. TRANS: Button label to cancel an IM address confirmation procedure.
 #. TRANS: Button label to cancel a SMS address confirmation procedure.
 #. TRANS: Button label in the "Edit application" form.
-#: actions/apioauthauthorize.php:478 actions/emailsettings.php:125
-#: actions/imsettings.php:136 actions/smssettings.php:132
-#: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Cancel"
 msgstr "Cancelar"
 
 #. TRANS: Button text that when clicked will allow access to an account by an external application.
-#: actions/apioauthauthorize.php:485
 msgctxt "BUTTON"
 msgid "Allow"
 msgstr "Permitir"
 
 #. TRANS: Form instructions.
-#: actions/apioauthauthorize.php:502
 msgid "Authorize access to your account information."
 msgstr "Autoriza o acesso às informações da sua conta."
 
 #. TRANS: Header for user notification after revoking OAuth access to an application.
-#: actions/apioauthauthorize.php:594
 msgid "Authorization canceled."
 msgstr "A autorização foi cancelada."
 
 #. TRANS: User notification after revoking OAuth access to an application.
 #. TRANS: %s is an OAuth token.
-#: actions/apioauthauthorize.php:598
 #, php-format
 msgid "The request token %s has been revoked."
 msgstr "O token %s solicitado foi revogado."
 
 #. TRANS: Title of the page notifying the user that an anonymous client application was successfully authorized to access the user's account with OAuth.
-#: actions/apioauthauthorize.php:621
 msgid "You have successfully authorized the application"
 msgstr "A aplicação foi autorizada com sucesso"
 
 #. TRANS: Message notifying the user that an anonymous client application was successfully authorized to access the user's account with OAuth.
-#: actions/apioauthauthorize.php:625
 msgid ""
 "Please return to the application and enter the following security code to "
 "complete the process."
@@ -1039,14 +794,12 @@ msgstr ""
 
 #. TRANS: Title of the page notifying the user that the client application was successfully authorized to access the user's account with OAuth.
 #. TRANS: %s is the authorised application name.
-#: actions/apioauthauthorize.php:632
 #, php-format
 msgid "You have successfully authorized %s"
 msgstr "A aplicação %s foi autorizada com sucesso"
 
 #. TRANS: Message notifying the user that the client application was successfully authorized to access the user's account with OAuth.
 #. TRANS: %s is the authorised application name.
-#: actions/apioauthauthorize.php:639
 #, php-format
 msgid ""
 "Please return to %s and enter the following security code to complete the "
@@ -1057,12 +810,10 @@ msgstr ""
 
 #. TRANS: Client error displayed trying to delete a status not using POST or DELETE.
 #. TRANS: POST and DELETE should not be translated.
-#: actions/apistatusesdestroy.php:111
 msgid "This method requires a POST or DELETE."
 msgstr "Esse método requer um POST ou DELETE."
 
 #. TRANS: Client error displayed trying to delete a status of another user.
-#: actions/apistatusesdestroy.php:136
 msgid "You may not delete another user's status."
 msgstr "Você não pode excluir uma mensagem de outro usuário."
 
@@ -1070,21 +821,16 @@ msgstr "Você não pode excluir uma mensagem de outro usuário."
 #. TRANS: Client error displayed trying to display redents of a non-exiting notice.
 #. TRANS: Client exception thrown when referencing a non-existing notice.
 #. TRANS: Error message displayed trying to delete a non-existing notice.
-#: actions/apistatusesretweet.php:74 actions/apistatusesretweets.php:70
-#: actions/atompubshowfavorite.php:82 actions/deletenotice.php:61
-#: actions/shownotice.php:92
 msgid "No such notice."
 msgstr "Essa mensagem não existe."
 
 #. TRANS: Client error displayed trying to repeat an own notice through the API.
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:549
 msgid "Cannot repeat your own notice."
 msgstr "Você não pode repetir a sua própria mensagem."
 
 #. TRANS: Client error displayed trying to re-repeat a notice through the API.
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:92 lib/command.php:555
 msgid "Already repeated that notice."
 msgstr "Você já repetiu essa mensagem."
 
@@ -1094,57 +840,43 @@ msgstr "Você já repetiu essa mensagem."
 #. TRANS: Client exception thrown when using an unsupported HTTP method.
 #. TRANS: Client error shown when using a non-supported HTTP method.
 #. TRANS: Client exception thrown when using an unsupported HTTP method.
-#: actions/apistatusesshow.php:118 actions/atompubfavoritefeed.php:103
-#: actions/atompubmembershipfeed.php:105 actions/atompubshowfavorite.php:117
-#: actions/atompubshowmembership.php:116
-#: actions/atompubshowsubscription.php:122
-#: actions/atompubsubscriptionfeed.php:109
 msgid "HTTP method not supported."
 msgstr "O método HTTP não é suportado."
 
 #. TRANS: Exception thrown requesting an unsupported notice output format.
 #. TRANS: %s is the requested output format.
-#: actions/apistatusesshow.php:144
 #, fuzzy, php-format
 msgid "Unsupported format: %s."
 msgstr "Formato não suportado: %s"
 
 #. TRANS: Client error displayed requesting a deleted status.
-#: actions/apistatusesshow.php:155
 msgid "Status deleted."
 msgstr "A mensagem foi excluída."
 
 #. TRANS: Client error displayed requesting a status with an invalid ID.
-#: actions/apistatusesshow.php:162
 msgid "No status with that ID found."
 msgstr "Não foi encontrada nenhuma mensagem com esse ID."
 
 #. TRANS: Client error displayed when trying to delete a notice not using the Atom format.
-#: actions/apistatusesshow.php:227
 msgid "Can only delete using the Atom format."
 msgstr "Só é possível excluir usando o formato Atom."
 
 #. TRANS: Client error displayed when a user has no rights to delete notices of other users.
 #. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
-#: actions/apistatusesshow.php:235 actions/deletenotice.php:78
 msgid "Cannot delete this notice."
 msgstr "Não é possível excluir esta mensagem."
 
 #. TRANS: Confirmation of notice deletion in API. %d is the ID (number) of the deleted notice.
-#: actions/apistatusesshow.php:249
 #, php-format
 msgid "Deleted notice %d"
 msgstr "Mensagem excluída %d"
 
 #. TRANS: Client error displayed when the parameter "status" is missing.
-#: actions/apistatusesupdate.php:221
 msgid "Client must provide a 'status' parameter with a value."
 msgstr "O cliente tem de fornecer um parâmetro 'status' com um valor."
 
 #. TRANS: Client error displayed when the parameter "status" is missing.
 #. TRANS: %d is the maximum number of character for a notice.
-#: actions/apistatusesupdate.php:244 actions/newnotice.php:161
-#: lib/mailhandler.php:60
 #, php-format
 msgid "That's too long. Maximum notice size is %d character."
 msgid_plural "That's too long. Maximum notice size is %d characters."
@@ -1152,13 +884,11 @@ msgstr[0] "Está muito extenso. O tamanho máximo é de %d caractere."
 msgstr[1] "Está muito extenso. O tamanho máximo é de %d caracteres."
 
 #. TRANS: Client error displayed when replying to a non-existing notice.
-#: actions/apistatusesupdate.php:284
 msgid "Parent notice not found."
 msgstr "A mensagem pai não foi encontrada."
 
 #. TRANS: Client error displayed exceeding the maximum notice length.
 #. TRANS: %d is the maximum lenth for a notice.
-#: actions/apistatusesupdate.php:308 actions/newnotice.php:184
 #, php-format
 msgid "Maximum notice size is %d character, including attachment URL."
 msgid_plural "Maximum notice size is %d characters, including attachment URL."
@@ -1167,13 +897,11 @@ msgstr[1] "O tamanho máximo da mensagem é de %d caracteres"
 
 #. TRANS: Client error displayed when requesting profiles of followers in an unsupported format.
 #. TRANS: Client error displayed when requesting IDs of followers in an unsupported format.
-#: actions/apisubscriptions.php:228 actions/apisubscriptions.php:258
 msgid "Unsupported format."
 msgstr "Formato não suportado."
 
 #. TRANS: Title for timeline of most recent favourite notices by a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname.
-#: actions/apitimelinefavorites.php:108
 #, php-format
 msgid "%1$s / Favorites from %2$s"
 msgstr "%1$s / Favoritas de %2$s"
@@ -1181,14 +909,12 @@ msgstr "%1$s / Favoritas de %2$s"
 #. TRANS: Subtitle for timeline of most recent favourite notices by a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user's full name,
 #. TRANS: %3$s is a user nickname.
-#: actions/apitimelinefavorites.php:120
 #, php-format
 msgid "%1$s updates favorited by %2$s / %3$s."
 msgstr "Mensagens de %1$s marcadas como favoritas por %2$s / %3$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.
-#: actions/apitimelinementions.php:115
 #, php-format
 msgid "%1$s / Updates mentioning %2$s"
 msgstr "%1$s / Mensagens mencionando %2$s"
@@ -1196,48 +922,40 @@ msgstr "%1$s / Mensagens mencionando %2$s"
 #. TRANS: Subtitle for timeline of most recent mentions of a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname,
 #. TRANS: %3$s is a user's full name.
-#: actions/apitimelinementions.php:131
 #, php-format
 msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr "%1$s mensagens em resposta a mensagens de %2$s / %3$s."
 
 #. TRANS: Title for site timeline. %s is the StatusNet sitename.
 #. TRANS: Public RSS feed title. %s is the StatusNet site name.
-#: actions/apitimelinepublic.php:193 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "Mensagens públicas de %s"
 
 #. TRANS: Subtitle for site timeline. %s is the StatusNet sitename.
-#: actions/apitimelinepublic.php:199
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "%s mensagens de todo mundo!"
 
 #. TRANS: Server error displayed calling unimplemented API method for 'retweeted by me'.
-#: actions/apitimelineretweetedbyme.php:71
 msgid "Unimplemented."
 msgstr "Não implementado."
 
 #. TRANS: Title for Atom feed "repeated to me". %s is the user nickname.
-#: actions/apitimelineretweetedtome.php:96
 #, php-format
 msgid "Repeated to %s"
 msgstr "Repetida para %s"
 
-#: actions/apitimelineretweetedtome.php:98
 #, fuzzy, php-format
 msgid "%1$s notices that were to repeated to %2$s / %3$s."
 msgstr "%1$s mensagens em resposta a mensagens de %2$s / %3$s."
 
 #. TRANS: Title of list of repeated notices of the logged in user.
 #. TRANS: %s is the nickname of the logged in user.
-#: actions/apitimelineretweetsofme.php:98
 #, php-format
 msgid "Repeats of %s"
 msgstr "Repetições de %s"
 
-#: actions/apitimelineretweetsofme.php:104
 #, fuzzy, php-format
 msgid "%1$s notices that %2$s / %3$s has repeated."
 msgstr "%1$s marcou a mensagem %2$s como favorita."
@@ -1246,173 +964,140 @@ msgstr "%1$s marcou a mensagem %2$s como favorita."
 #. TRANS: %s is the tag.
 #. TRANS: Title for first page of notices with tags.
 #. TRANS: %s is the tag.
-#: actions/apitimelinetag.php:101 actions/tag.php:69
 #, php-format
 msgid "Notices tagged with %s"
 msgstr "Mensagens etiquetadas como %s"
 
 #. TRANS: Subtitle for timeline with lastest notices with a given tag.
 #. TRANS: %1$s is the tag, $2$s is the StatusNet sitename.
-#: actions/apitimelinetag.php:105 actions/tagrss.php:65
 #, php-format
 msgid "Updates tagged with %1$s on %2$s!"
 msgstr "Mensagens etiquetadas como %1$s no %2$s!"
 
 #. TRANS: Client error displayed trying to add a notice to another user's timeline.
-#: actions/apitimelineuser.php:308
 msgid "Only the user can add to their own timeline."
 msgstr "Somente o usuário pode adicionar à sua própria linha de tempo."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:315
 msgid "Only accept AtomPub for Atom feeds."
 msgstr "Só são aceitos AtomPub para fontes Atom."
 
 #. TRANS: Client error displayed attempting to post an empty API notice.
-#: actions/apitimelineuser.php:322
 msgid "Atom post must not be empty."
 msgstr "A publicação Atom não pode estar em branco."
 
 #. TRANS: Client error displayed attempting to post an API that is not well-formed XML.
-#: actions/apitimelineuser.php:328
 msgid "Atom post must be well-formed XML."
 msgstr "A publicação Atom deve ser um XML formatado corretamente."
 
 #. TRANS: Client error displayed when not using an Atom entry.
-#: actions/apitimelineuser.php:334 actions/atompubfavoritefeed.php:228
-#: actions/atompubmembershipfeed.php:230
-#: actions/atompubsubscriptionfeed.php:236
 msgid "Atom post must be an Atom entry."
 msgstr "A publicação Atom deve ser uma entrada Atom."
 
 #. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
-#: actions/apitimelineuser.php:345
 msgid "Can only handle POST activities."
 msgstr "Só é possível manipular atividades POST."
 
 #. TRANS: Client error displayed when using an unsupported activity object type.
 #. TRANS: %s is the unsupported activity object type.
-#: actions/apitimelineuser.php:356
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr "Não é possível manipular o tipo de objeto de atividade \"%s\"."
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
 #. TRANS: %d is the notice ID (number).
-#: actions/apitimelineuser.php:390
 #, php-format
 msgid "No content for notice %d."
 msgstr "Nenhum conteúdo para a mensagem %d."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
 #. TRANS: %s is the notice URI.
-#: actions/apitimelineuser.php:419
 #, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "Já existe uma mensagem com a URI \"%s\"."
 
 #. TRANS: Server error for unfinished API method showTrends.
-#: actions/apitrends.php:85
 msgid "API method under construction."
 msgstr "O método da API está em construção."
 
 #. TRANS: Client error displayed when requesting user information for a non-existing user.
-#: actions/apiuserprofileimage.php:80 actions/apiusershow.php:94
 msgid "User not found."
 msgstr "O método da API não foi encontrado!"
 
 #. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
 #. TRANS: Client exception.
 #. TRANS: Client error displayed trying to subscribe to a non-existing profile.
-#: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
-#: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
-#: actions/subscribe.php:110
 msgid "No such profile."
 msgstr "Este perfil não existe."
 
 #. TRANS: Subtitle for Atom favorites feed.
 #. TRANS: %1$s is a user nickname, %2$s is the StatusNet sitename.
-#: actions/atompubfavoritefeed.php:147
 #, php-format
 msgid "Notices %1$s has favorited on %2$s"
 msgstr "Mensagens que %1$s marcou como Favoritas em %2$s"
 
 #. TRANS: Client exception thrown when trying to set a favorite for another user.
 #. TRANS: Client exception thrown when trying to subscribe another user.
-#: actions/atompubfavoritefeed.php:217 actions/atompubsubscriptionfeed.php:225
 msgid "Cannot add someone else's subscription."
 msgstr "Não é possível adicionar a assinatura de outra pessoa."
 
 #. TRANS: Client exception thrown when trying use an incorrect activity verb for the Atom pub method.
-#: actions/atompubfavoritefeed.php:240
 #, fuzzy
 msgid "Can only handle favorite activities."
 msgstr "Só é possível manipular as atividades das Favoritas."
 
 #. TRANS: Client exception thrown when trying favorite an object that is not a notice.
-#: actions/atompubfavoritefeed.php:250 actions/atompubmembershipfeed.php:250
 msgid "Can only fave notices."
 msgstr "Só é possível tornar favoritas as mensagens."
 
 #. TRANS: Client exception thrown when trying favorite a notice without content.
-#: actions/atompubfavoritefeed.php:259
 msgid "Unknown note."
 msgstr "Mensagem desconhecida."
 
 #. TRANS: Client exception thrown when trying favorite an already favorited notice.
-#: actions/atompubfavoritefeed.php:267
 msgid "Already a favorite."
 msgstr "Já foi adicionada às Favoritas."
 
 #. TRANS: Title for group membership feed.
 #. TRANS: %s is a username.
-#: actions/atompubmembershipfeed.php:144
 #, php-format
 msgid "%s group memberships"
 msgstr "Membros do grupo %s"
 
 #. TRANS: Subtitle for group membership feed.
 #. TRANS: %1$s is a username, %2$s is the StatusNet sitename.
-#: actions/atompubmembershipfeed.php:149
 #, fuzzy, php-format
 msgid "Groups %1$s is a member of on %2$s"
 msgstr "Grupos dos quais %s é membro"
 
 #. TRANS: Client exception thrown when trying subscribe someone else to a group.
-#: actions/atompubmembershipfeed.php:219
 #, fuzzy
 msgid "Cannot add someone else's membership."
 msgstr "Não é possível adicionar a assinatura de outra pessoa"
 
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#: actions/atompubmembershipfeed.php:242
 #, fuzzy
 msgid "Can only handle join activities."
 msgstr "Só é possível manipular as atividades de associação."
 
 #. TRANS: Client exception thrown when trying to subscribe to a non-existing group.
-#: actions/atompubmembershipfeed.php:259
 msgid "Unknown group."
 msgstr "Grupo desconhecido."
 
 #. TRANS: Client exception thrown when trying to subscribe to an already subscribed group.
-#: actions/atompubmembershipfeed.php:267
 msgid "Already a member."
 msgstr "Já é um membro."
 
 #. TRANS: Client exception thrown when trying to subscribe to group while blocked from that group.
-#: actions/atompubmembershipfeed.php:275
 msgid "Blocked by admin."
 msgstr "Bloqueado pelo administrador."
 
 #. TRANS: Client exception thrown when referencing a non-existing favorite.
-#: actions/atompubshowfavorite.php:90
 msgid "No such favorite."
 msgstr "Essa Favorita não existe."
 
 #. TRANS: Client exception thrown when trying to remove a favorite notice of another user.
-#: actions/atompubshowfavorite.php:151
 #, fuzzy
 msgid "Cannot delete someone else's favorite."
 msgstr "Não é possível excluir a Favorita de outra pessoa"
@@ -1439,93 +1124,68 @@ msgstr "Não é possível excluir a Favorita de outra pessoa"
 #. TRANS: Client error displayed when trying to join a non-existing group.
 #. TRANS: Client error displayed when trying to leave a non-local group.
 #. TRANS: Client error displayed when trying to leave a non-existing group.
+#. TRANS: Client error displayed when providing an invalid group ID on the Make Admin page.
 #. 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.
 #. TRANS: Command exception text shown when a group is requested that does not exist.
 #. TRANS: Error text shown when trying to leave a group that does not exist.
-#: actions/atompubshowmembership.php:81 actions/blockedfromgroup.php:81
-#: actions/blockedfromgroup.php:89 actions/deletegroup.php:87
-#: actions/deletegroup.php:100 actions/editgroup.php:102
-#: actions/foafgroup.php:46 actions/foafgroup.php:65 actions/foafgroup.php:73
-#: actions/groupblock.php:89 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:101 actions/grouplogo.php:103
-#: actions/groupmembers.php:84 actions/groupmembers.php:92
-#: actions/grouprss.php:97 actions/grouprss.php:105
-#: actions/groupunblock.php:89 actions/joingroup.php:82
-#: actions/joingroup.php:95 actions/leavegroup.php:82
-#: actions/leavegroup.php:95 actions/makeadmin.php:86
-#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:392
 msgid "No such group."
 msgstr "Esse grupo não existe."
 
 #. TRANS: Client exception thrown when trying to show membership of a non-subscribed group
-#: actions/atompubshowmembership.php:91
 #, fuzzy
 msgid "Not a member."
 msgstr "Não é um membro"
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
-#: actions/atompubshowmembership.php:150
 #, fuzzy
 msgid "Cannot delete someone else's membership."
 msgstr "Não é possível excluir a assinatura de outra pessoa"
 
 #. TRANS: Client exception thrown when trying to display a subscription for a non-existing profile ID.
 #. TRANS: %d is the non-existing profile ID number.
-#: actions/atompubshowsubscription.php:72
-#: actions/atompubshowsubscription.php:83
-#: actions/atompubsubscriptionfeed.php:74
 #, fuzzy, php-format
 msgid "No such profile id: %d."
 msgstr "Este id de perfil não existe: %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.
-#: actions/atompubshowsubscription.php:94
 #, fuzzy, php-format
 msgid "Profile %1$d not subscribed to profile %2$d."
 msgstr "O perfil %1$d não assina o perfil %2$d"
 
 #. TRANS: Client exception thrown when trying to delete a subscription of another user.
-#: actions/atompubshowsubscription.php:157
 #, fuzzy
 msgid "Cannot delete someone else's subscription."
 msgstr "Não é possível excluir a assinatura de outra pessoa"
 
 #. TRANS: Subtitle for Atom subscription feed.
 #. TRANS: %1$s is a user nickname, %s$s is the StatusNet sitename.
-#: actions/atompubsubscriptionfeed.php:153
 #, fuzzy, php-format
 msgid "People %1$s has subscribed to on %2$s"
 msgstr "Assinantes de %s"
 
 #. TRANS: Client error displayed when not using the follow verb.
-#: actions/atompubsubscriptionfeed.php:248
 msgid "Can only handle Follow activities."
 msgstr "Só é possível manipular atividades de Assinatura."
 
 #. TRANS: Client exception thrown when subscribing to an object that is not a person.
-#: actions/atompubsubscriptionfeed.php:256
 msgid "Can only follow people."
 msgstr "Só é possível assinar pessoas."
 
 #. TRANS: Client exception thrown when subscribing to a non-existing profile.
 #. TRANS: %s is the unknown profile ID.
-#: actions/atompubsubscriptionfeed.php:267
 #, fuzzy, php-format
 msgid "Unknown profile %s."
 msgstr "Perfil desconhecido: %s"
 
 #. TRANS: Client error displayed trying to subscribe to an already subscribed profile.
 #. TRANS: %s is the profile the user already has a subscription on.
-#: actions/atompubsubscriptionfeed.php:275
 #, fuzzy, php-format
 msgid "Already subscribed to %s."
 msgstr "Já assinado!"
 
 #. TRANS: Client error displayed trying to get a non-existing attachment.
-#: actions/attachment.php:73
 msgid "No such attachment."
 msgstr "Este anexo não existe."
 
@@ -1537,31 +1197,23 @@ msgstr "Este anexo não existe."
 #. TRANS: Client error displayed when trying to view group members without providing a group nickname.
 #. TRANS: Client error displayed when requesting a group RSS feed without providing a group nickname.
 #. TRANS: Client error displayed if no nickname argument was given requesting a group page.
-#: actions/avatarbynickname.php:60 actions/blockedfromgroup.php:73
-#: actions/editgroup.php:85 actions/groupdesignsettings.php:84
-#: actions/grouplogo.php:86 actions/groupmembers.php:76
-#: actions/grouprss.php:89 actions/showgroup.php:116
 msgid "No nickname."
 msgstr "Nenhuma identificação."
 
 #. TRANS: Client error displayed trying to get an avatar without providing an avatar size.
-#: actions/avatarbynickname.php:66
 msgid "No size."
 msgstr "Sem tamanho definido."
 
 #. TRANS: Client error displayed trying to get an avatar providing an invalid avatar size.
-#: actions/avatarbynickname.php:72
 msgid "Invalid size."
 msgstr "Tamanho inválido."
 
 #. TRANS: Title for avatar upload page.
-#: actions/avatarsettings.php:66 lib/settingsnav.php:82
 msgid "Avatar"
 msgstr "Avatar"
 
 #. TRANS: Instruction for avatar upload page.
 #. TRANS: %s is the maximum file size, for example "500b", "10kB" or "2MB".
-#: actions/avatarsettings.php:78
 #, php-format
 msgid "You can upload your personal avatar. The maximum file size is %s."
 msgstr ""
@@ -1571,17 +1223,12 @@ msgstr ""
 #. TRANS: Server error displayed coming across a request from a user without a profile.
 #. TRANS: Server error displayed when trying to authorise a remote subscription request
 #. TRANS: while the user has no profile.
-#: actions/avatarsettings.php:108 actions/avatarsettings.php:192
-#: actions/grouplogo.php:184 actions/remotesubscribe.php:190
-#: actions/userauthorization.php:75 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr "Usuário sem um perfil correspondente"
 
 #. TRANS: Avatar upload page form legend.
 #. TRANS: Avatar upload page crop form legend.
 #. TRANS: Legend for group logo settings fieldset.
-#: actions/avatarsettings.php:122 actions/avatarsettings.php:205
-#: actions/grouplogo.php:261
 msgid "Avatar settings"
 msgstr "Configurações do avatar"
 
@@ -1589,8 +1236,6 @@ msgstr "Configurações do avatar"
 #. TRANS: Header on avatar upload crop form for thumbnail of originally uploaded avatar (h2).
 #. TRANS: Uploaded original file in group logo form.
 #. TRANS: Header for originally uploaded file before a crop on the group logo page.
-#: actions/avatarsettings.php:131 actions/avatarsettings.php:214
-#: actions/grouplogo.php:207 actions/grouplogo.php:270
 msgid "Original"
 msgstr "Original"
 
@@ -1598,81 +1243,66 @@ msgstr "Original"
 #. TRANS: Header on avatar upload crop form for thumbnail of to be used rendition of uploaded avatar (h2).
 #. TRANS: Header for preview of to be displayed group logo.
 #. TRANS: Header for the cropped group logo on the group logo page.
-#: actions/avatarsettings.php:147 actions/avatarsettings.php:227
-#: actions/grouplogo.php:219 actions/grouplogo.php:283
 msgid "Preview"
 msgstr "Pré-visualizar"
 
 #. TRANS: Button on avatar upload page to delete current avatar.
 #. TRANS: Button text for user account deletion.
-#: actions/avatarsettings.php:155 actions/deleteaccount.php:319
 msgctxt "BUTTON"
 msgid "Delete"
 msgstr "Excluir"
 
 #. TRANS: Button on avatar upload page to upload an avatar.
 #. TRANS: Submit button to confirm upload of a user backup file for account restore.
-#: actions/avatarsettings.php:173 actions/restoreaccount.php:369
 msgctxt "BUTTON"
 msgid "Upload"
 msgstr "Enviar"
 
 #. TRANS: Button on avatar upload crop form to confirm a selected crop as avatar.
-#: actions/avatarsettings.php:243
 msgctxt "BUTTON"
 msgid "Crop"
 msgstr "Cortar"
 
 #. TRANS: Validation error on avatar upload form when no file was uploaded.
-#: actions/avatarsettings.php:318
 msgid "No file uploaded."
 msgstr "Não foi enviado nenhum arquivo."
 
 #. TRANS: Avatar upload form instruction after uploading a file.
-#: actions/avatarsettings.php:345
 #, fuzzy
 msgid "Pick a square area of the image to be your avatar."
 msgstr "Selecione uma área quadrada da imagem para ser seu avatar"
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
 #. TRANS: Server error displayed trying to crop an uploaded group logo that is no longer present.
-#: actions/avatarsettings.php:360 actions/grouplogo.php:391
 msgid "Lost our file data."
 msgstr "Os dados do nosso arquivo foram perdidos."
 
 #. TRANS: Success message for having updated a user avatar.
-#: actions/avatarsettings.php:384
 msgid "Avatar updated."
 msgstr "O avatar foi atualizado."
 
 #. TRANS: Error displayed on the avatar upload page if the avatar could not be updated for an unknown reason.
-#: actions/avatarsettings.php:388
 msgid "Failed updating avatar."
 msgstr "Não foi possível atualizar o avatar."
 
 #. TRANS: Success message for deleting a user avatar.
-#: actions/avatarsettings.php:412
 msgid "Avatar deleted."
 msgstr "O avatar foi excluído."
 
 #. TRANS: Title for backup account page.
 #. TRANS: Option in profile settings to create a backup of the account of the currently logged in user.
-#: actions/backupaccount.php:61 actions/profilesettings.php:468
 msgid "Backup account"
 msgstr "Fazer backup da conta"
 
 #. TRANS: Client exception thrown when trying to backup an account while not logged in.
-#: actions/backupaccount.php:79
 msgid "Only logged-in users can backup their account."
 msgstr "Apenas usuários autenticados podem fazer backups de suas contas."
 
 #. TRANS: Client exception thrown when trying to backup an account without having backup rights.
-#: actions/backupaccount.php:84
 msgid "You may not backup your account."
 msgstr "Você não pode fazer backup da sua conta."
 
 #. TRANS: Information displayed on the backup account page.
-#: actions/backupaccount.php:227
 #, fuzzy
 msgid ""
 "You can backup your account data in <a href=\"http://activitystrea.ms/"
@@ -1688,32 +1318,27 @@ msgstr ""
 "disso, arquivos enviados e mensagens diretas também não entram no backup."
 
 #. TRANS: Submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:250
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Backup"
 msgstr "Fundo"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:254
 #, fuzzy
 msgid "Backup your account."
 msgstr "Fazer backup da conta"
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
-#: actions/block.php:68
 msgid "You already blocked that user."
 msgstr "Você já bloqueou esse usuário."
 
 #. TRANS: Title for block user page.
 #. TRANS: Legend for block user form.
 #. TRANS: Fieldset legend for block user from group form.
-#: actions/block.php:106 actions/block.php:136 actions/groupblock.php:165
 msgid "Block user"
 msgstr "Bloquear usuário"
 
 #. TRANS: Explanation of consequences when blocking a user on the block user page.
-#: actions/block.php:139
 msgid ""
 "Are you sure you want to block this user? Afterwards, they will be "
 "unsubscribed from you, unable to subscribe to you in the future, and you "
@@ -1730,15 +1355,11 @@ msgstr ""
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:154 actions/deleteapplication.php:157
-#: actions/deletegroup.php:220 actions/deletenotice.php:155
-#: actions/deleteuser.php:154 actions/groupblock.php:187
 msgctxt "BUTTON"
 msgid "No"
 msgstr "Não"
 
 #. TRANS: Submit button title for 'No' when blocking a user.
-#: actions/block.php:158
 #, fuzzy
 msgid "Do not block this user."
 msgstr "Não bloquear este usuário"
@@ -1749,179 +1370,143 @@ msgstr "Não bloquear este usuário"
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:161 actions/deleteapplication.php:164
-#: actions/deletegroup.php:227 actions/deletenotice.php:162
-#: actions/deleteuser.php:161 actions/groupblock.php:194
 msgctxt "BUTTON"
 msgid "Yes"
 msgstr "Sim"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:165
 #, fuzzy
 msgid "Block this user."
 msgstr "Bloquear este usuário"
 
 #. TRANS: Server error displayed when blocking a user fails.
-#: actions/block.php:189
 msgid "Failed to save block information."
 msgstr "Não foi possível salvar a informação de bloqueio."
 
 #. TRANS: Title for first page with list of users blocked from a group.
 #. TRANS: %s is a group nickname.
-#: actions/blockedfromgroup.php:101
 #, php-format
 msgid "%s blocked profiles"
 msgstr "Perfis bloqueados no %s"
 
 #. TRANS: Title for any but the first page with list of users blocked from a group.
 #. TRANS: %1$s is a group nickname, %2$d is a page number.
-#: actions/blockedfromgroup.php:106
 #, php-format
 msgid "%1$s blocked profiles, page %2$d"
 msgstr "Perfis bloqueados no %1$s, pág. %2$d"
 
 #. TRANS: Instructions for list of users blocked from a group.
-#: actions/blockedfromgroup.php:122
 msgid "A list of the users blocked from joining this group."
 msgstr "Uma lista dos usuários proibidos de se associarem a este grupo."
 
 #. TRANS: Form legend for unblocking a user from a group.
-#: actions/blockedfromgroup.php:291
 msgid "Unblock user from group"
 msgstr "Desbloquear o usuário do grupo"
 
 #. TRANS: Button text for unblocking a user from a group.
-#: actions/blockedfromgroup.php:323
 msgctxt "BUTTON"
 msgid "Unblock"
 msgstr "Desbloquear"
 
 #. TRANS: Tooltip for button for unblocking a user from a group.
 #. TRANS: Description of the form to unblock a user.
-#: actions/blockedfromgroup.php:327 lib/unblockform.php:78
 msgid "Unblock this user"
 msgstr "Desbloquear este usuário"
 
 #. TRANS: Title for mini-posting window loaded from bookmarklet.
 #. TRANS: %s is the StatusNet site name.
-#: actions/bookmarklet.php:51
 #, php-format
 msgid "Post to %s"
 msgstr "Publicar em %s"
 
 #. TRANS: Client error displayed when not providing a confirmation code in the contact address confirmation action.
-#: actions/confirmaddress.php:74
 msgid "No confirmation code."
 msgstr "Nenhum código de confirmação."
 
 #. TRANS: Client error displayed when providing a non-existing confirmation code in the contact address confirmation action.
-#: actions/confirmaddress.php:80
 msgid "Confirmation code not found."
 msgstr "O código de confirmação não foi encontrado."
 
 #. TRANS: Client error displayed when not providing a confirmation code for another user in the contact address confirmation action.
-#: actions/confirmaddress.php:86
 msgid "That confirmation code is not for you!"
 msgstr "Esse não é o seu código de confirmação!"
 
 #. TRANS: Server error for an unknown address type, which can be 'email', 'sms', or the name of an IM network (such as 'xmpp' or 'aim')
-#: actions/confirmaddress.php:94
-#, fuzzy, php-format
+#, php-format
 msgid "Unrecognized address type %s"
-msgstr "Tipo de endereço %s não reconhecido."
+msgstr "Tipo de endereço desconhecido %s"
 
 #. TRANS: Client error for an already confirmed email/jabber/sms address.
-#: actions/confirmaddress.php:103 actions/confirmaddress.php:136
 msgid "That address has already been confirmed."
 msgstr "Esse endereço já foi confirmado."
 
-#: actions/confirmaddress.php:121 actions/imsettings.php:444
-#: actions/userdesignsettings.php:306
-#, fuzzy
 msgid "Couldn't update user."
 msgstr "Não foi possível atualizar o usuário."
 
-#: actions/confirmaddress.php:144
 #, fuzzy
 msgid "Couldn't update user im preferences."
 msgstr "Não foi possível atualizar o registro do usuário."
 
-#: actions/confirmaddress.php:156
 #, fuzzy
 msgid "Couldn't insert user im preferences."
 msgstr "Não foi possível inserir a nova assinatura."
 
 #. TRANS: Server error displayed when an address confirmation code deletion from the
 #. TRANS: database fails in the contact address confirmation action.
-#: actions/confirmaddress.php:169
 msgid "Could not delete address confirmation."
 msgstr "Não foi possível excluir a confirmação do endereço."
 
 #. TRANS: Title for the contact address confirmation action.
-#: actions/confirmaddress.php:185
 msgid "Confirm address"
 msgstr "Confirme o endereço"
 
 #. TRANS: Success message for the contact address confirmation action.
 #. TRANS: %s can be 'email', 'jabber', or 'sms'.
-#: actions/confirmaddress.php:200
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "O endereço \"%s\" foi confirmado para sua conta."
 
 #. TRANS: Title for page with a conversion (multiple notices in context).
-#: actions/conversation.php:96
 msgid "Conversation"
 msgstr "Conversa"
 
 #. TRANS: Header on conversation page. Hidden by default (h2).
 #. TRANS: Label for user statistics.
-#: actions/conversation.php:149 lib/noticelist.php:87
-#: lib/profileaction.php:246 lib/searchgroupnav.php:82
-#: lib/threadednoticelist.php:66
 msgid "Notices"
 msgstr "Mensagens"
 
 #. TRANS: Client exception displayed trying to delete a user account while not logged in.
-#: actions/deleteaccount.php:71
 #, fuzzy
 msgid "Only logged-in users can delete their account."
 msgstr "Apenas usuários autenticados podem repetir mensagens."
 
 #. TRANS: Client exception displayed trying to delete a user account without have the rights to do that.
-#: actions/deleteaccount.php:77
 #, fuzzy
 msgid "You cannot delete your account."
 msgstr "Você não pode excluir usuários."
 
 #. TRANS: Confirmation text for user deletion. The user has to type this exactly the same, including punctuation.
-#: actions/deleteaccount.php:160 actions/deleteaccount.php:297
 msgid "I am sure."
 msgstr ""
 
 #. TRANS: Notification for user about the text that must be input to be able to delete a user account.
 #. TRANS: %s is the text that needs to be input.
-#: actions/deleteaccount.php:164
 #, php-format
 msgid "You must write \"%s\" exactly in the box."
 msgstr ""
 
 #. TRANS: Confirmation that a user account has been deleted.
-#: actions/deleteaccount.php:206
 #, fuzzy
 msgid "Account deleted."
 msgstr "O avatar foi excluído."
 
 #. TRANS: Page title for page on which a user account can be deleted.
 #. TRANS: Option in profile settings to delete the account of the currently logged in user.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:476
 #, fuzzy
 msgid "Delete account"
 msgstr "Criar uma conta"
 
 #. TRANS: Form text for user deletion form.
-#: actions/deleteaccount.php:279
 msgid ""
 "This will <strong>permanently delete</strong> your account data from this "
 "server."
@@ -1929,7 +1514,6 @@ msgstr ""
 
 #. TRANS: Additional form text for user deletion form shown if a user has account backup rights.
 #. TRANS: %s is a URL to the backup page.
-#: actions/deleteaccount.php:285
 #, php-format
 msgid ""
 "You are strongly advised to <a href=\"%s\">back up your data</a> before "
@@ -1938,56 +1522,43 @@ msgstr ""
 
 #. TRANS: Field label for delete account confirmation entry.
 #. TRANS: Field label for password reset form where the password has to be typed again.
-#: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:262 actions/register.php:419
 msgid "Confirm"
 msgstr "Confirmar"
 
 #. TRANS: Input title for the delete account field.
 #. TRANS: %s is the text that needs to be input.
-#: actions/deleteaccount.php:304
 #, fuzzy, php-format
 msgid "Enter \"%s\" to confirm that you want to delete your account."
 msgstr "Você não pode excluir usuários."
 
 #. TRANS: Button title for user account deletion.
-#: actions/deleteaccount.php:323
 #, fuzzy
 msgid "Permanently delete your account"
 msgstr "Você não pode excluir usuários."
 
 #. TRANS: Client error displayed trying to delete an application while not logged in.
-#: actions/deleteapplication.php:62
 msgid "You must be logged in to delete an application."
 msgstr "Você precisa estar autenticado para excluir uma aplicação."
 
 #. TRANS: Client error displayed trying to delete an application that does not exist.
-#: actions/deleteapplication.php:71
 msgid "Application not found."
 msgstr "A aplicação não foi encontrada."
 
 #. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
-#: actions/deleteapplication.php:79 actions/editapplication.php:78
-#: actions/showapplication.php:90
 msgid "You are not the owner of this application."
 msgstr "Você não é o dono desta aplicação."
 
 #. TRANS: Client error text when there is a problem with the session token.
-#: actions/deleteapplication.php:102 actions/editapplication.php:131
-#: actions/newapplication.php:112 actions/showapplication.php:113
-#: lib/action.php:1391
 msgid "There was a problem with your session token."
 msgstr "Ocorreu um problema com o seu token de sessão."
 
 #. TRANS: Title for delete application page.
 #. TRANS: Fieldset legend on delete application page.
-#: actions/deleteapplication.php:124 actions/deleteapplication.php:149
 msgid "Delete application"
 msgstr "Excluir a aplicação"
 
 #. TRANS: Confirmation text on delete application page.
-#: actions/deleteapplication.php:152
 msgid ""
 "Are you sure you want to delete this application? This will clear all data "
 "about the application from the database, including all existing user "
@@ -1998,57 +1569,47 @@ msgstr ""
 "com os usuários."
 
 #. TRANS: Submit button title for 'No' when deleting an application.
-#: actions/deleteapplication.php:161
 #, fuzzy
 msgid "Do not delete this application."
 msgstr "Não excluir esta aplicação"
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
-#: actions/deleteapplication.php:167
 #, fuzzy
 msgid "Delete this application."
 msgstr "Excluir esta aplicação"
 
 #. TRANS: Client error when trying to delete group while not logged in.
-#: actions/deletegroup.php:64
 msgid "You must be logged in to delete a group."
 msgstr "Você deve estar autenticado para excluir um grupo."
 
 #. TRANS: Client error when trying to delete a group without providing a nickname or ID for the group.
 #. TRANS: Client error displayed when trying to join a group without providing a group name or group ID.
 #. TRANS: Client error displayed when trying to leave a group without providing a group name or group ID.
-#: actions/deletegroup.php:94 actions/joingroup.php:89
-#: actions/leavegroup.php:89
 msgid "No nickname or ID."
 msgstr "Nenhum apelido ou identificação."
 
 #. TRANS: Client error when trying to delete a group without having the rights to delete it.
-#: actions/deletegroup.php:107
 msgid "You are not allowed to delete this group."
 msgstr "Você não tem permissão para excluir este grupo."
 
 #. TRANS: Server error displayed if a group could not be deleted.
 #. TRANS: %s is the name of the group that could not be deleted.
-#: actions/deletegroup.php:150
 #, php-format
 msgid "Could not delete group %s."
 msgstr "Não foi possível excluir o grupo %s."
 
 #. TRANS: Message given after deleting a group.
 #. TRANS: %s is the deleted group's name.
-#: actions/deletegroup.php:159
 #, php-format
 msgid "Deleted group %s"
 msgstr "O grupo %s foi excluído"
 
 #. TRANS: Title of delete group page.
 #. TRANS: Form legend for deleting a group.
-#: actions/deletegroup.php:176 actions/deletegroup.php:202
 msgid "Delete group"
 msgstr "Excluir o grupo"
 
 #. TRANS: Warning in form for deleleting a group.
-#: actions/deletegroup.php:206
 msgid ""
 "Are you sure you want to delete this group? This will clear all data about "
 "the group from the database, without a backup. Public posts to this group "
@@ -2059,13 +1620,11 @@ msgstr ""
 "para este grupo continuarão aparecendo nas linhas de tempo individuais."
 
 #. TRANS: Submit button title for 'No' when deleting a group.
-#: actions/deletegroup.php:224
 #, fuzzy
 msgid "Do not delete this group."
 msgstr "Não excluir este grupo"
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
-#: actions/deletegroup.php:231
 #, fuzzy
 msgid "Delete this group."
 msgstr "Excluir este grupo"
@@ -2076,22 +1635,18 @@ msgstr "Excluir este grupo"
 #. TRANS: Client error displayed trying to block a user from a group while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying to log out when not logged in.
+#. TRANS: Client error displayed when trying to access the "make admin" page while not logged in.
+#. TRANS: Client error displayed trying to create a new direct message while not logged in.
+#. TRANS: Client error displayed trying to send a notice while not logged in.
+#. TRANS: Client error displayed trying to nudge a user without being logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
 #. TRANS: Client error displayed when trying to change user options while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
-#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:70
-#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
-#: actions/nudge.php:63 actions/pluginenable.php:97 actions/subedit.php:33
-#: actions/subscribe.php:98 actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:71 lib/profileformaction.php:63
-#: lib/settingsaction.php:72
 msgid "Not logged in."
 msgstr "Você não está autenticado."
 
 #. TRANS: Instructions for deleting a notice.
-#: actions/deletenotice.php:110
 msgid ""
 "You are about to permanently delete a notice. Once this is done, it cannot "
 "be undone."
@@ -2101,51 +1656,42 @@ msgstr ""
 
 #. TRANS: Page title when deleting a notice.
 #. TRANS: Fieldset legend for the delete notice form.
-#: actions/deletenotice.php:117 actions/deletenotice.php:148
 msgid "Delete notice"
 msgstr "Excluir a mensagem"
 
 #. TRANS: Message for the delete notice form.
-#: actions/deletenotice.php:152
 msgid "Are you sure you want to delete this notice?"
 msgstr "Tem certeza que deseja excluir esta mensagem?"
 
 #. TRANS: Submit button title for 'No' when deleting a notice.
-#: actions/deletenotice.php:159
 #, fuzzy
 msgid "Do not delete this notice."
 msgstr "Não excluir esta mensagem."
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:166
 #, fuzzy
 msgid "Delete this notice."
 msgstr "Excluir esta mensagem"
 
 #. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
-#: actions/deleteuser.php:66
 msgid "You cannot delete users."
 msgstr "Você não pode excluir usuários."
 
 #. TRANS: Client error displayed when trying to delete a non-local user.
-#: actions/deleteuser.php:74
 msgid "You can only delete local users."
 msgstr "Você só pode excluir usuários locais."
 
 #. TRANS: Title of delete user page.
-#: actions/deleteuser.php:110
 #, fuzzy
 msgctxt "TITLE"
 msgid "Delete user"
 msgstr "Excluir usuário"
 
 #. TRANS: Fieldset legend on delete user page.
-#: actions/deleteuser.php:134
 msgid "Delete user"
 msgstr "Excluir usuário"
 
 #. TRANS: Information text to request if a user is certain that the described action has to be performed.
-#: actions/deleteuser.php:138
 msgid ""
 "Are you sure you want to delete this user? This will clear all data about "
 "the user from the database, without a backup."
@@ -2154,101 +1700,82 @@ msgstr ""
 "deste usuário do banco de dados, sem cópia de segurança."
 
 #. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/deleteuser.php:158
 #, fuzzy
 msgid "Do not delete this user."
 msgstr "Não excluir este grupo"
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
-#: actions/deleteuser.php:165
 #, fuzzy
 msgid "Delete this user."
 msgstr "Excluir este usuário"
 
 #. TRANS: Message used as title for design settings for the site.
-#: actions/designadminpanel.php:60 lib/settingsnav.php:97
 msgid "Design"
 msgstr "Aparência"
 
 #. TRANS: Instructions for design adminsitration panel.
-#: actions/designadminpanel.php:71
 msgid "Design settings for this StatusNet site"
 msgstr "Configurações da aparência deste site StatusNet."
 
 #. TRANS: Client error displayed when a logo URL does is not valid.
-#: actions/designadminpanel.php:327
 msgid "Invalid logo URL."
 msgstr "A URL da logo é inválida."
 
 #. TRANS: Client error displayed when an SSL logo URL is invalid.
-#: actions/designadminpanel.php:333
 msgid "Invalid SSL logo URL."
 msgstr "A URL da logo SSL é inválida."
 
 #. TRANS: Client error displayed when a theme is submitted through the form that is not in the theme list.
 #. TRANS: %s is the chosen unavailable theme.
-#: actions/designadminpanel.php:339
 #, php-format
 msgid "Theme not available: %s."
 msgstr "Tema não disponível: %s."
 
 #. TRANS: Fieldset legend for form to change logo.
-#: actions/designadminpanel.php:437
 msgid "Change logo"
 msgstr "Alterar a logo"
 
 #. TRANS: Field label for StatusNet site logo.
-#: actions/designadminpanel.php:444
 msgid "Site logo"
 msgstr "Logo do site"
 
 #. TRANS: Field label for SSL StatusNet site logo.
-#: actions/designadminpanel.php:452
 msgid "SSL logo"
 msgstr "Logo do SSL"
 
 #. TRANS: Fieldset legend for form change StatusNet site's theme.
-#: actions/designadminpanel.php:467
 msgid "Change theme"
 msgstr "Alterar o tema"
 
 #. TRANS: Field label for dropdown to choose site theme.
-#: actions/designadminpanel.php:485
 msgid "Site theme"
 msgstr "Tema do site"
 
 #. TRANS: Title for field label for dropdown to choose site theme.
-#: actions/designadminpanel.php:487
 msgid "Theme for the site."
 msgstr "Tema para o site."
 
 #. TRANS: Field label for uploading a cutom theme.
-#: actions/designadminpanel.php:494
 msgid "Custom theme"
 msgstr "Tema personalizado"
 
 #. TRANS: Form instructions for uploading a cutom StatusNet theme.
-#: actions/designadminpanel.php:499
 msgid "You can upload a custom StatusNet theme as a .ZIP archive."
 msgstr ""
 "Você pode enviar um tema personalizado para o StatusNet, na forma de um "
 "arquivo .zip."
 
 #. TRANS: Fieldset legend for theme background image.
-#: actions/designadminpanel.php:515
 msgid "Change background image"
 msgstr "Alterar imagem do fundo"
 
 #. TRANS: Field label for background image on theme designer page.
 #. TRANS: Field label for background color selector.
 #. TRANS: Label on profile design page for setting a profile page background colour.
-#: actions/designadminpanel.php:525 actions/designadminpanel.php:609
-#: lib/designform.php:238
 msgid "Background"
 msgstr "Fundo"
 
 #. TRANS: Form guide for background image upload form on theme designer page.
-#: actions/designadminpanel.php:531
 #, php-format
 msgid ""
 "You can upload a background image for the site. The maximum file size is %1"
@@ -2258,202 +1785,167 @@ msgstr ""
 "arquivo é de %1 $s."
 
 #. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:558
 msgid "On"
 msgstr "Ativado"
 
 #. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:575
 msgid "Off"
 msgstr "Desativado"
 
 #. TRANS: Form guide for turning background image on or off on theme designer page.
 #. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
 #. TRANS: use of the uploaded profile image.
-#: actions/designadminpanel.php:577 lib/designform.php:214
 msgid "Turn background image on or off."
 msgstr "Ativar/desativar a imagem de fundo."
 
 #. TRANS: Checkbox label to title background image on theme designer page.
 #. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-#: actions/designadminpanel.php:583 lib/designform.php:220
 msgid "Tile background image"
 msgstr "Ladrilhar a imagem de fundo"
 
 #. TRANS: Fieldset legend for theme colors.
-#: actions/designadminpanel.php:598
 #, fuzzy
 msgid "Change colors"
 msgstr "Alterar a cor"
 
 #. TRANS: Field label for content color selector.
 #. TRANS: Label on profile design page for setting a profile page content colour.
-#: actions/designadminpanel.php:623 lib/designform.php:252
 msgid "Content"
 msgstr "Conteúdo"
 
 #. TRANS: Field label for sidebar color selector.
 #. TRANS: Label on profile design page for setting a profile page sidebar colour.
-#: actions/designadminpanel.php:637 lib/designform.php:266
 msgid "Sidebar"
 msgstr "Barra lateral"
 
 #. TRANS: Field label for text color selector.
 #. TRANS: Label on profile design page for setting a profile page text colour.
-#: actions/designadminpanel.php:651 lib/designform.php:280
 msgid "Text"
 msgstr "Texto"
 
 #. TRANS: Field label for link color selector.
 #. TRANS: Label on profile design page for setting a profile page links colour.
-#: actions/designadminpanel.php:665 lib/designform.php:294
 msgid "Links"
 msgstr "Links"
 
 #. TRANS: Fieldset legend for advanced theme design settings.
-#: actions/designadminpanel.php:691
 msgid "Advanced"
 msgstr "Avançado"
 
 #. TRANS: Field label for custom CSS.
-#: actions/designadminpanel.php:696
 msgid "Custom CSS"
 msgstr "CSS personalizado"
 
 #. TRANS: Button text for resetting theme settings.
-#: actions/designadminpanel.php:718
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Use defaults"
 msgstr "Usar o padrão|"
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:720
 #, fuzzy
 msgid "Restore default designs."
 msgstr "Restaura a aparência padrão"
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:728
 #, fuzzy
 msgid "Reset back to default."
 msgstr "Restaura de volta ao padrão"
 
 #. TRANS: Title for button for saving theme settings.
-#: actions/designadminpanel.php:736
 #, fuzzy
 msgid "Save design."
 msgstr "Salvar a aparência"
 
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
-#: actions/disfavor.php:83
 msgid "This notice is not a favorite!"
 msgstr "Esta mensagem não é uma favorita!"
 
 #. TRANS: Title for page on which favorites can be added.
-#: actions/disfavor.php:98
 msgid "Add to favorites"
 msgstr "Adicionar às favoritas"
 
 #. TRANS: Client exception thrown when requesting a document from the documentation that does not exist.
 #. TRANS: %s is the non-existing document.
-#: actions/doc.php:155
 #, fuzzy, php-format
 msgid "No such document \"%s\"."
 msgstr "O documento \"%s\" não existe"
 
 #. TRANS: Title for "Edit application" form.
 #. TRANS: Form legend.
-#: actions/editapplication.php:54 lib/applicationeditform.php:129
 msgid "Edit application"
 msgstr "Editar a aplicação"
 
 #. TRANS: Client error displayed trying to edit an application while not logged in.
-#: actions/editapplication.php:66
 msgid "You must be logged in to edit an application."
 msgstr "Você precisa estar autenticado para editar uma aplicação."
 
 #. TRANS: Client error displayed trying to edit an application that does not exist.
-#: actions/editapplication.php:83 actions/showapplication.php:83
 msgid "No such application."
 msgstr "Essa aplicação não existe."
 
 #. TRANS: Instructions for "Edit application" form.
-#: actions/editapplication.php:167
 msgid "Use this form to edit your application."
 msgstr "Use este formulário para editar a sua aplicação."
 
 #. TRANS: Validation error shown when not providing a name in the "Edit application" form.
 #. TRANS: Validation error shown when not providing a name in the "New application" form.
-#: actions/editapplication.php:184 actions/newapplication.php:164
 msgid "Name is required."
 msgstr "O nome é obrigatório."
 
 #. 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.
-#: actions/editapplication.php:188 actions/newapplication.php:172
 msgid "Name is too long (maximum 255 characters)."
 msgstr "O nome é muito extenso (máx. 255 caracteres)."
 
 #. TRANS: Validation error shown when providing a name for an application that already exists in the "Edit application" form.
 #. TRANS: Validation error shown when providing a name for an application that already exists in the "New application" form.
-#: actions/editapplication.php:192 actions/newapplication.php:168
 msgid "Name already in use. Try another one."
 msgstr "Este nome já está em uso. Tente outro."
 
 #. TRANS: Validation error shown when not providing a description in the "Edit application" form.
 #. TRANS: Validation error shown when not providing a description in the "New application" form.
-#: actions/editapplication.php:196 actions/newapplication.php:176
 msgid "Description is required."
 msgstr "A descrição é obrigatória."
 
 #. TRANS: Validation error shown when providing too long a source URL in the "Edit application" form.
-#: actions/editapplication.php:209
 msgid "Source URL is too long."
 msgstr "A URL da fonte  é muito extensa."
 
 #. TRANS: Validation error shown when providing an invalid source URL in the "Edit application" form.
 #. TRANS: Validation error shown when providing an invalid source URL in the "New application" form.
-#: actions/editapplication.php:216 actions/newapplication.php:199
 msgid "Source URL is not valid."
 msgstr "A URL da fonte não é válida."
 
 #. 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.
-#: actions/editapplication.php:220 actions/newapplication.php:203
 msgid "Organization is required."
 msgstr "A organização é obrigatória."
 
 #. TRANS: Validation error shown when providing too long an arganisation name in the "Edit application" form.
-#: actions/editapplication.php:224 actions/newapplication.php:207
 msgid "Organization is too long (maximum 255 characters)."
 msgstr "A organização é muito extensa (máx. 255 caracteres)."
 
 #. TRANS: Form validation error show when an organisation name has not been provided in the edit application form.
 #. TRANS: Form validation error show when an organisation name has not been provided in the new application form.
-#: actions/editapplication.php:228 actions/newapplication.php:211
 msgid "Organization homepage is required."
 msgstr "O site da organização é obrigatório."
 
 #. TRANS: Validation error shown when providing too long a callback URL in the "Edit application" form.
 #. TRANS: Validation error shown when providing too long a callback URL in the "New application" form.
-#: actions/editapplication.php:239 actions/newapplication.php:225
 msgid "Callback is too long."
 msgstr "O retorno é muito extenso."
 
 #. TRANS: Validation error shown when providing an invalid callback URL in the "Edit application" form.
 #. TRANS: Validation error shown when providing an invalid callback URL in the "New application" form.
-#: actions/editapplication.php:247 actions/newapplication.php:235
 msgid "Callback URL is not valid."
 msgstr "A URL de retorno não é válida."
 
 #. TRANS: Server error occuring when an application could not be updated from the "Edit application" form.
-#: actions/editapplication.php:284
 msgid "Could not update application."
 msgstr "Não foi possível atualizar a aplicação."
 
 #. TRANS: Title for form to edit a group. %s is a group nickname.
-#: actions/editgroup.php:55
 #, php-format
 msgid "Edit %s group"
 msgstr "Editar o grupo %s"
@@ -2461,40 +1953,40 @@ msgstr "Editar o grupo %s"
 #. TRANS: Client error displayed trying to edit a group while not logged in.
 #. TRANS: Client error displayed when trying to create a group while not logged in.
 #. TRANS: Client error displayed trying to create a group while not logged in.
-#: actions/editgroup.php:68 actions/grouplogo.php:69 actions/newgroup.php:65
 msgid "You must be logged in to create a group."
 msgstr "Você deve estar autenticado para criar um grupo."
 
 #. TRANS: Form instructions for group edit form.
-#: actions/editgroup.php:161
 msgid "Use this form to edit the group."
 msgstr "Use esse formulário para editar o grupo."
 
+#. TRANS: Group edit form validation error.
+#. TRANS: Group create form validation error.
+#. TRANS: %s is the invalid alias.
+#, php-format
+msgid "Invalid alias: \"%s\""
+msgstr "Apelido inválido: \"%s\""
+
 #. TRANS: Group edit form success message.
-#: actions/editgroup.php:301
 msgid "Options saved."
 msgstr "As configurações foram salvas."
 
 #. TRANS: Title for e-mail settings.
-#: actions/emailsettings.php:60
 msgid "Email settings"
 msgstr "Configurações do e-mail"
 
 #. TRANS: E-mail settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/emailsettings.php:74
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 msgstr "Configure o recebimento de e-mails de %%site.name%%."
 
 #. TRANS: Form legend for e-mail settings form.
 #. TRANS: Field label for e-mail address input in e-mail settings form.
-#: actions/emailsettings.php:104 actions/emailsettings.php:130
 msgid "Email address"
 msgstr "Endereço de e-mail"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:110
 msgid "Current confirmed email address."
 msgstr "Endereço de e-mail já confirmado."
 
@@ -2503,15 +1995,11 @@ msgstr "Endereço de e-mail já confirmado."
 #. TRANS: Button label to remove a confirmed IM address.
 #. TRANS: Button label to remove a confirmed SMS address.
 #. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
-#: actions/emailsettings.php:113 actions/emailsettings.php:180
-#: actions/imsettings.php:119 actions/smssettings.php:119
-#: actions/smssettings.php:175
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Remover"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:120
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -2524,44 +2012,36 @@ msgstr ""
 #. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
 #. TRANS: Any other domain may be owned by a legitimate person or
 #. TRANS: organization.
-#: actions/emailsettings.php:137
 msgid "Email address, like \"UserName@example.org\""
 msgstr "Endereço de e-mail, ex: \"usuario@exemplo.org\""
 
 #. TRANS: Button label for adding an e-mail address in e-mail settings form.
 #. TRANS: Button label for adding an IM address in IM settings form.
 #. TRANS: Button label for adding a SMS phone number in SMS settings form.
-#: actions/emailsettings.php:141 actions/imsettings.php:147
-#: actions/smssettings.php:157
 msgctxt "BUTTON"
 msgid "Add"
 msgstr "Adicionar"
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:149 actions/smssettings.php:166
 msgid "Incoming email"
 msgstr "E-mail de recebimento"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:155
 msgid "I want to post notices by email."
 msgstr "Eu quero publicar mensagens por e-mail."
 
 #. TRANS: Form instructions for incoming e-mail form in e-mail settings.
 #. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
-#: actions/emailsettings.php:177 actions/smssettings.php:173
 msgid "Send email to this address to post new notices."
 msgstr "Envie e-mails para esse endereço para publicar novas mensagens."
 
 #. TRANS: Instructions for incoming e-mail address input form, when an address has already been assigned.
 #. TRANS: Instructions for incoming SMS e-mail address input form.
-#: actions/emailsettings.php:186 actions/smssettings.php:181
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr "Cria um novo endereço de e-mail para publicar e cancela o antigo."
 
 #. TRANS: Instructions for incoming e-mail address input form.
-#: actions/emailsettings.php:190
 msgid ""
 "To send notices via email, we need to create a unique email address for you "
 "on this server:"
@@ -2569,93 +2049,75 @@ msgstr ""
 
 #. TRANS: Button label for adding an e-mail address to send notices from.
 #. TRANS: Button label for adding an SMS e-mail address to send notices from.
-#: actions/emailsettings.php:196 actions/smssettings.php:184
 msgctxt "BUTTON"
 msgid "New"
 msgstr "Novo"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:205
 msgid "Email preferences"
 msgstr "Preferências de e-mail"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:213
 msgid "Send me notices of new subscriptions through email."
 msgstr "Envie-me notificações de novos assinantes por e-mail."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:219
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr ""
 "Envie-me um e-mail quando alguém adicionar alguma mensagem minha como "
 "favorita."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:226
 msgid "Send me email when someone sends me a private message."
 msgstr "Envie-me um e-mail quando alguém me mandar uma mensagem particular."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:232
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr ""
 "Envie-me um e-mail quando alguém mandar uma mensagem citando meu nome "
 "(\"@nome\")."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:238
 msgid "Allow friends to nudge me and send me an email."
 msgstr "Permita que meus amigos chamem minha atenção e enviem-me e-mails."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:244
 msgid "Publish a MicroID for my email address."
 msgstr "Publique um MicroID para meu endereço de e-mail."
 
 #. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:362
 msgid "Email preferences saved."
 msgstr "As configurações de e-mail foram salvas."
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:381
 msgid "No email address."
 msgstr "Nenhum endereço de e-mail."
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:389
 #, fuzzy
 msgid "Cannot normalize that email address."
 msgstr "Não foi possível normalizar este endereço de e-mail"
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:394 actions/register.php:197
-#: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "Não é um endereço de e-mail válido."
 
 #. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:398
 msgid "That is already your email address."
 msgstr "Esse já é seu endereço de e-mail."
 
 #. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:402
 msgid "That email address already belongs to another user."
 msgstr "Esse endereço de e-mail já pertence à outro usuário."
 
 #. TRANS: Server error thrown on database error adding e-mail confirmation code.
 #. TRANS: Server error thrown on database error adding Instant Messaging confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:419 actions/imsettings.php:362
-#: actions/smssettings.php:364
 #, fuzzy
 msgid "Could not insert confirmation code."
 msgstr "Não foi possível inserir o código de confirmação."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:426
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
@@ -2667,105 +2129,85 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling Instant Messaging address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:446 actions/imsettings.php:391
-#: actions/smssettings.php:398
 msgid "No pending confirmation to cancel."
 msgstr "Nenhuma confirmação pendente para cancelar."
 
 #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:451
 msgid "That is the wrong email address."
 msgstr "Esse é o endereço de e-mail errado."
 
 #. TRANS: Server error thrown on database error canceling e-mail address confirmation.
 #. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
-#: actions/emailsettings.php:460 actions/smssettings.php:412
 #, fuzzy
 msgid "Could not delete email confirmation."
 msgstr "Não foi possível excluir a confirmação de e-mail."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:465
 msgid "Email confirmation cancelled."
 msgstr "A confirmação por e-mail foi cancelada."
 
 #. TRANS: Message given trying to remove an e-mail address that is not
 #. TRANS: registered for the active user.
-#: actions/emailsettings.php:484
 msgid "That is not your email address."
 msgstr "Esse não é seu endereço de email."
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:505
 msgid "The email address was removed."
 msgstr "O endereço de e-mail foi removido."
 
 #. TRANS: Form validation error displayed when trying to remove an incoming e-mail address while no address has been set.
-#: actions/emailsettings.php:519 actions/smssettings.php:554
 msgid "No incoming email address."
 msgstr "Nenhum endereço de e-mail para recebimentos."
 
 #. 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.
-#: actions/emailsettings.php:531 actions/emailsettings.php:555
-#: actions/smssettings.php:565 actions/smssettings.php:590
 #, fuzzy
 msgid "Could not update user record."
 msgstr "Não foi possível atualizar o registro do usuário."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
 #. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:535 actions/smssettings.php:569
 msgid "Incoming email address removed."
 msgstr "O endereço de e-mail de recebimento foi removido."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
 #. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:559 actions/smssettings.php:594
 msgid "New incoming email address added."
 msgstr ""
 "Foi adicionado um novo endereço de e-mail para recebimento de mensagens."
 
 #. TRANS: Client error displayed when trying to mark a notice as favorite that already is a favorite.
-#: actions/favor.php:80
 msgid "This notice is already a favorite!"
 msgstr "Essa mensagem já é uma favorita!"
 
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
-#: actions/favor.php:95
 #, fuzzy
 msgid "Disfavor favorite."
 msgstr "Desmarcar a favorita"
 
 #. TRANS: Page title for first page of favorited notices.
 #. TRANS: Title for favourited notices section.
-#: actions/favorited.php:65 lib/popularnoticesection.php:62
-#: lib/publicgroupnav.php:93
 msgid "Popular notices"
 msgstr "Mensagens populares"
 
 #. TRANS: Page title for all but first page of favorited notices.
 #. TRANS: %d is the page number being displayed.
-#: actions/favorited.php:69
 #, php-format
 msgid "Popular notices, page %d"
 msgstr "Mensagens populares, pág. %d"
 
 #. TRANS: Description on page displaying favorited notices.
-#: actions/favorited.php:81
 msgid "The most popular notices on the site right now."
 msgstr "As etiquetas mais populares no site agora."
 
 #. TRANS: Text displayed instead of a list when a site does not yet have any favourited notices.
-#: actions/favorited.php:149
 msgid "Favorite notices appear on this page but no one has favorited one yet."
 msgstr ""
 "As mensagens favoritas aparecem nesta página, mas ninguém ainda marcou "
 "nenhuma como favorita."
 
 #. TRANS: Additional text displayed instead of a list when a site does not yet have any favourited notices for logged in users.
-#: actions/favorited.php:153
 msgid ""
 "Be the first to add a notice to your favorites by clicking the fave button "
 "next to any notice you like."
@@ -2775,7 +2217,6 @@ msgstr ""
 
 #. TRANS: Additional text displayed instead of a list when a site does not yet have any favourited notices for not logged in users.
 #. TRANS: %%action.register%% is a registration link. "[link text](link)" is Mark Down. Do not change the formatting.
-#: actions/favorited.php:158
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to add a "
@@ -2788,181 +2229,146 @@ msgstr ""
 #. TRANS: %s is a user's nickname.
 #. TRANS: Title for first page of favourite notices of a user.
 #. TRANS: %s is the user for whom the favourite notices are displayed.
-#: actions/favoritesrss.php:111 actions/showfavorites.php:76
-#: lib/personalgroupnav.php:110
 #, php-format
 msgid "%s's favorite notices"
 msgstr "Mensagens favoritas de %s"
 
 #. TRANS: Desciption of RSS feed with favourite notices of a user.
 #. TRANS: %1$s is a user's nickname, %2$s is the name of the StatusNet site.
-#: actions/favoritesrss.php:117
 #, php-format
 msgid "Updates favored by %1$s on %2$s!"
 msgstr "Mensagens favoritas de %1$s no %2$s!"
 
 #. TRANS: Page title for first page of featured users.
 #. TRANS: Title for featured users section.
-#: actions/featured.php:69 lib/featureduserssection.php:87
-#: lib/publicgroupnav.php:89
 msgid "Featured users"
 msgstr "Usuários em destaque"
 
 #. TRANS: Page title for all but first page of featured users.
 #. TRANS: %d is the page number being displayed.
-#: actions/featured.php:73
 #, php-format
 msgid "Featured users, page %d"
 msgstr "Usuários em destaque, pág. %d"
 
 #. TRANS: Description on page displaying featured users.
-#: actions/featured.php:102
 #, fuzzy, php-format
 msgid "A selection of some great users on %s."
 msgstr "Uma seleção de alguns grandes usuários no%s"
 
 #. TRANS: Client error displayed when no notice ID was given trying do display a file.
-#: actions/file.php:36
 msgid "No notice ID."
 msgstr "Sem ID da mensagem."
 
 #. TRANS: Client error displayed when an invalid notice ID was given trying do display a file.
-#: actions/file.php:41
 msgid "No notice."
 msgstr "Nenhuma mensagem."
 
 #. TRANS: Client error displayed when trying do display a file for a notice without a file attachement.
-#: actions/file.php:46
 msgid "No attachments."
 msgstr "Nenhum anexo."
 
 #. TRANS: Client error displayed when trying do display a file for a notice with file attachements
 #. TRANS: that could not be found.
-#: actions/file.php:58
 msgid "No uploaded attachments."
 msgstr "Nenhum anexo enviado."
 
 #. TRANS: Client error displayed when subscribing to a remote profile and an unexpected response is received.
-#: actions/finishremotesubscribe.php:69
 msgid "Not expecting this response!"
 msgstr "Não esperava por esta resposta!"
 
 #. TRANS: Client error displayed when subscribing to a remote profile that does not exist.
-#: actions/finishremotesubscribe.php:81
 msgid "User being listened to does not exist."
 msgstr "O usuário que está está sendo acompanhado não existe."
 
 #. TRANS: Client error displayed when subscribing to a remote profile that is a local profile.
-#: actions/finishremotesubscribe.php:89 actions/remotesubscribe.php:58
 msgid "You can use the local subscription!"
 msgstr "Você pode usar a assinatura local!"
 
 #. TRANS: Client error displayed when subscribing to a remote profile that is blocked form subscribing to.
-#: actions/finishremotesubscribe.php:102
 msgid "That user has blocked you from subscribing."
 msgstr "Esse usuário bloqueou o seu pedido de assinatura."
 
 #. TRANS: Client error displayed when subscribing to a remote profile without providing an authorised token.
-#: actions/finishremotesubscribe.php:114
 msgid "You are not authorized."
 msgstr "Você não está autorizado."
 
 #. TRANS: Client error displayed when subscribing to a remote profile and conversion of the request token to access token fails.
-#: actions/finishremotesubscribe.php:118
 msgid "Could not convert request token to access token."
 msgstr "Não foi possível converter o token de requisição para token de acesso."
 
 #. TRANS: Client error displayed when subscribing to a remote profile fails because of an unsupported version of the OMB protocol.
-#: actions/finishremotesubscribe.php:124
 msgid "Remote service uses unknown version of OMB protocol."
 msgstr "O serviço remoto usa uma versão desconhecida do protocolo OMB."
 
 #. TRANS: Server error displayed when subscribing to a remote profile fails because the remote profile could not be updated.
-#: actions/finishremotesubscribe.php:145 lib/oauthstore.php:317
 msgid "Error updating remote profile."
 msgstr "Ocorreu um erro durante a atualização do perfil remoto."
 
 #. TRANS: Client error displayed when requesting a non-existent file.
-#: actions/getfile.php:77
 msgid "No such file."
 msgstr "Esse arquivo não existe."
 
 #. TRANS: Client error displayed when requesting a file without having read access to it.
-#: actions/getfile.php:82
 msgid "Cannot read file."
 msgstr "Não foi possível ler o arquivo."
 
 #. TRANS: Client error displayed when trying to assign an invalid role to a user.
-#: actions/grantrole.php:61 actions/revokerole.php:62
 msgid "Invalid role."
 msgstr "Papel inválido."
 
 #. TRANS: Client error displayed when trying to assign an reserved role to a user.
-#: actions/grantrole.php:66 actions/revokerole.php:66
 msgid "This role is reserved and cannot be set."
 msgstr "Este papel está reservado e não pode ser definido."
 
 #. TRANS: Client error displayed when trying to assign a role to a user while not being allowed to set roles.
-#: actions/grantrole.php:76
 msgid "You cannot grant user roles on this site."
 msgstr "Você não pode definir papéis para os usuários neste site."
 
 #. TRANS: Client error displayed when trying to assign a role to a user that already has that role.
-#: actions/grantrole.php:84
 msgid "User already has this role."
 msgstr "O usuário já possui este papel."
 
 #. TRANS: Client error displayed trying to block a user from a group while not specifying a to be blocked user profile.
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing a profile.
+#. TRANS: Client error displayed when not providing a profile ID on the Make Admin page.
 #. TRANS: Client error displayed trying a change a subscription without providing a profile.
 #. TRANS: Client error displayed when trying to change user options without specifying a user to work on.
-#: actions/groupblock.php:71 actions/groupunblock.php:71
-#: actions/makeadmin.php:71 actions/subedit.php:49
-#: lib/profileformaction.php:79
 msgid "No profile specified."
 msgstr "Não foi especificado nenhum perfil."
 
 #. TRANS: Client error displayed trying to block a user from a group while specifying a non-existing profile.
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing an existing profile.
+#. TRANS: Client error displayed when specifying an invalid profile ID on the Make Admin page.
 #. TRANS: Client error displayed trying a change a subscription for a non-existant profile ID.
 #. TRANS: Client error displayed when trying to change user options without specifying an existing user to work on.
-#: actions/groupblock.php:77 actions/groupunblock.php:77
-#: actions/makeadmin.php:76 actions/subedit.php:57 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:87
 msgid "No profile with that ID."
 msgstr "Não foi encontrado nenhum perfil com esse ID."
 
 #. TRANS: Client error displayed trying to block a user from a group while not specifying a group to block a profile from.
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing a group.
-#: actions/groupblock.php:83 actions/groupunblock.php:83
-#: actions/makeadmin.php:81
+#. TRANS: Client error displayed when not providing a group ID on the Make Admin page.
 msgid "No group specified."
 msgstr "Não foi especificado nenhum grupo."
 
 #. TRANS: Client error displayed trying to block a user from a group while not being an admin user.
-#: actions/groupblock.php:95
 msgid "Only an admin can block group members."
 msgstr "Somente um administrador pode bloquear usuários no grupo."
 
 #. TRANS: Client error displayed trying to block a user from a group while user is already blocked from the given group.
-#: actions/groupblock.php:100
 msgid "User is already blocked from group."
 msgstr "O usuário já está bloqueado no grupo."
 
 #. TRANS: Client error displayed trying to block a user from a group while user is not a member of given group.
-#: actions/groupblock.php:106
 msgid "User is not a member of group."
 msgstr "O usuário não é um membro do grupo"
 
 #. TRANS: Title for block user from group page.
 #. TRANS: Form legend for form to block user from a group.
-#: actions/groupblock.php:141 actions/groupmembers.php:364
 msgid "Block user from group"
 msgstr "Bloquear o usuário no grupo"
 
 #. TRANS: Explanatory text for block user from group form before setting the block.
 #. TRANS: %1$s is that to be blocked user, %2$s is the group the user will be blocked from.
-#: actions/groupblock.php:169
 #, php-format
 msgid ""
 "Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They "
@@ -2974,41 +2380,34 @@ msgstr ""
 "futuramente."
 
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
-#: actions/groupblock.php:191
 #, fuzzy
 msgid "Do not block this user from this group."
 msgstr "Não bloquear este usuário neste grupo"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
-#: actions/groupblock.php:198
 #, fuzzy
 msgid "Block this user from this group."
 msgstr "Bloquear este usuário neste grupo"
 
 #. TRANS: Server error displayed when trying to block a user from a group fails because of an application error.
-#: actions/groupblock.php:215
 msgid "Database error blocking user from group."
 msgstr ""
 "Ocorreu um erro no banco de dados ao tentar bloquear o usuário no grupo."
 
 #. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
 #. TRANS: Client error displayed trying to find a user by ID without providing an ID.
-#: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr "Nenhuma ID."
 
 #. TRANS: Client error displayed trying to change group design settings while not logged in.
-#: actions/groupdesignsettings.php:67
 msgid "You must be logged in to edit a group."
 msgstr "Você precisa estar autenticado para editar um grupo."
 
 #. TRANS: Title group design settings page.
-#: actions/groupdesignsettings.php:146
 msgid "Group design"
 msgstr "Aparência do grupo"
 
 #. TRANS: Instructions for group design settings page.
-#: actions/groupdesignsettings.php:157
 msgid ""
 "Customize the way your group looks with a background image and a colour "
 "palette of your choice."
@@ -3017,25 +2416,21 @@ msgstr ""
 "cores à sua escolha."
 
 #. TRANS: Form validation error displayed when group design settings could not be updated because of an application issue.
-#: actions/groupdesignsettings.php:262
 #, fuzzy
 msgid "Unable to update your design settings."
 msgstr "Não foi possível salvar suas configurações de aparência."
 
 #. TRANS: Form text to confirm saved group design settings.
-#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:239
 msgid "Design preferences saved."
 msgstr "As configurações da aparência foram salvas."
 
 #. TRANS: Title for group logo settings page.
 #. TRANS: Group logo form legend.
-#: actions/grouplogo.php:144 actions/grouplogo.php:199
 msgid "Group logo"
 msgstr "Logo do grupo"
 
 #. TRANS: Instructions for group logo page.
 #. TRANS: %s is the maximum file size for that site.
-#: actions/grouplogo.php:156
 #, php-format
 msgid ""
 "You can upload a logo image for your group. The maximum file size is %s."
@@ -3044,91 +2439,75 @@ msgstr ""
 "arquivo é %s."
 
 #. TRANS: Submit button for uploading a group logo.
-#: actions/grouplogo.php:243
 msgid "Upload"
 msgstr "Enviar"
 
 #. TRANS: Button text for cropping an uploaded group logo.
-#: actions/grouplogo.php:299
 msgid "Crop"
 msgstr "Cortar"
 
 #. TRANS: Form instructions on the group logo page.
-#: actions/grouplogo.php:376
 msgid "Pick a square area of the image to be the logo."
 msgstr "Selecione uma área quadrada da imagem para definir a logo"
 
 #. TRANS: Form success message after updating a group logo.
-#: actions/grouplogo.php:411
 msgid "Logo updated."
 msgstr "A logo foi atualizada."
 
 #. TRANS: Form failure message after failing to update a group logo.
-#: actions/grouplogo.php:414
 msgid "Failed updating logo."
 msgstr "Não foi possível atualizar a logo."
 
 #. TRANS: Title of the page showing group members.
 #. TRANS: %s is the name of the group.
-#: actions/groupmembers.php:104
 #, php-format
 msgid "%s group members"
 msgstr "Membros do grupo %s"
 
 #. TRANS: Title of the page showing group members.
 #. TRANS: %1$s is the name of the group, %2$d is the page number of the members list.
-#: actions/groupmembers.php:109
 #, php-format
 msgid "%1$s group members, page %2$d"
 msgstr "Membros do grupo %1$s, pág. %2$d"
 
 #. TRANS: Page notice for group members page.
-#: actions/groupmembers.php:125
 msgid "A list of the users in this group."
 msgstr "Uma lista dos usuários deste grupo."
 
 #. TRANS: Indicator in group members list that this user is a group administrator.
-#: actions/groupmembers.php:190 lib/action.php:581
 msgid "Admin"
 msgstr "Admin"
 
 #. TRANS: Button text for the form that will block a user from a group.
-#: actions/groupmembers.php:397
 msgctxt "BUTTON"
 msgid "Block"
 msgstr "Bloquear"
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:401
 msgctxt "TOOLTIP"
 msgid "Block this user"
 msgstr "Bloquear este usuário"
 
 #. TRANS: Form legend for form to make a user a group admin.
-#: actions/groupmembers.php:488
 msgid "Make user an admin of the group"
 msgstr "Tornar o usuário um administrador do grupo"
 
 #. TRANS: Button text for the form that will make a user administrator.
-#: actions/groupmembers.php:521
 msgctxt "BUTTON"
 msgid "Make Admin"
 msgstr "Tornar administrador"
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:525
 msgctxt "TOOLTIP"
 msgid "Make this user an admin"
 msgstr "Torna este usuário um administrador"
 
 #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
-#: actions/grouprss.php:141
 #, php-format
 msgid "Updates from members of %1$s on %2$s!"
 msgstr "Atualizações dos membros de %1$s no %2$s!"
 
 #. TRANS: Title for first page of the groups list.
-#: actions/groups.php:62
 #, fuzzy
 msgctxt "TITLE"
 msgid "Groups"
@@ -3136,7 +2515,6 @@ msgstr "Grupos"
 
 #. TRANS: Title for all but the first page of the groups list.
 #. TRANS: %d is the page number.
-#: actions/groups.php:66
 #, fuzzy, php-format
 msgctxt "TITLE"
 msgid "Groups, page %d"
@@ -3145,7 +2523,6 @@ msgstr "Groupos, pág. %d"
 #. TRANS: Page notice of group list. %%%%site.name%%%% is the StatusNet site name,
 #. TRANS: %%%%action.groupsearch%%%% and %%%%action.newgroup%%%% are URLs. Do not change them.
 #. TRANS: This message contains Markdown links in the form [link text](link).
-#: actions/groups.php:95
 #, fuzzy, php-format
 msgid ""
 "%%%%site.name%%%% groups let you find and talk with people of similar "
@@ -3161,12 +2538,10 @@ msgstr ""
 "action.groupsearch%%%%) ou [criar o seu próprio!](%%%%action.newgroup%%%%)"
 
 #. TRANS: Link to create a new group on the group list page.
-#: actions/groups.php:113 actions/usergroups.php:126 lib/groupeditform.php:115
 msgid "Create a new group"
 msgstr "Criar um novo grupo"
 
 #. TRANS: Instructions for page where groups can be searched. %%site.name%% is the name of the StatusNet site.
-#: actions/groupsearch.php:53
 #, php-format
 msgid ""
 "Search for groups on %%site.name%% by their name, location, or description. "
@@ -3176,21 +2551,17 @@ msgstr ""
 "Separe os termos com espaços; eles devem ter 3 ou mais caracteres."
 
 #. TRANS: Title for page where groups can be searched.
-#: actions/groupsearch.php:60
 msgid "Group search"
 msgstr "Procurar grupos"
 
 #. TRANS: Text on page where groups can be searched if no results were found for a query.
 #. TRANS: Text for notice search results is the query had no results.
 #. TRANS: Message on the "People search" page where a query has no results.
-#: actions/groupsearch.php:82 actions/noticesearch.php:122
-#: actions/peoplesearch.php:87
 msgid "No results."
 msgstr "Nenhum resultado."
 
 #. TRANS: Additional text on page where groups can be searched if no results were found for a query for a logged in user.
 #. TRANS: This message contains Markdown links in the form [link text](link).
-#: actions/groupsearch.php:87
 #, fuzzy, php-format
 msgid ""
 "If you cannot find the group you're looking for, you can [create it](%%"
@@ -3201,7 +2572,6 @@ msgstr ""
 
 #. TRANS: Additional text on page where groups can be searched if no results were found for a query for a not logged in user.
 #. TRANS: This message contains Markdown links in the form [link text](link).
-#: actions/groupsearch.php:92
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and [create the group](%%"
@@ -3211,30 +2581,25 @@ msgstr ""
 "action.newgroup%%) você mesmo?"
 
 #. TRANS: Client error displayed when trying to unblock a user from a group without being an administrator for the group.
-#: actions/groupunblock.php:95
 msgid "Only an admin can unblock group members."
 msgstr "Somente um administrador pode desbloquear membros do grupo."
 
 #. TRANS: Client error displayed when trying to unblock a non-blocked user from a group.
-#: actions/groupunblock.php:100
 msgid "User is not blocked from group."
 msgstr "O usuário não está bloqueado no grupo."
 
 #. TRANS: Server error displayed when unblocking a user from a group fails because of an unknown error.
 #. TRANS: Server error displayed when removing a user block.
-#: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "Erro na remoção do bloqueio."
 
 #. TRANS: Title for Instant Messaging settings.
-#: actions/imsettings.php:56
 msgid "IM settings"
 msgstr "Configurações do MI"
 
 #. 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.
-#: actions/imsettings.php:69
 #, fuzzy, php-format
 msgid ""
 "You can send and receive notices through instant messaging [instant messages]"
@@ -3244,18 +2609,15 @@ msgstr ""
 "%doc.im%%) Jabber/GTalk. Configure seu endereço e opções abaixo."
 
 #. TRANS: Message given in the IM settings if IM is not enabled on the site.
-#: actions/imsettings.php:90
 msgid "IM is not available."
 msgstr "MI não está disponível"
 
-#: actions/imsettings.php:116
 #, fuzzy, php-format
 msgid "Current confirmed %s address."
 msgstr "Endereço de e-mail já confirmado."
 
 #. TRANS: Form note in IM settings form.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:128
 #, fuzzy, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your %s account for a message "
@@ -3265,35 +2627,29 @@ msgstr ""
 "GTalk por uma mensagem com mais instruções (Você adicionou %s à sua lista de "
 "contatos?)"
 
-#: actions/imsettings.php:140
 msgid "IM address"
 msgstr "Endereço do MI"
 
-#: actions/imsettings.php:142
 #, php-format
 msgid "%s screenname."
 msgstr ""
 
 #. TRANS: Header for IM preferences form.
-#: actions/imsettings.php:163
 #, fuzzy
 msgid "IM Preferences"
 msgstr "Preferências do mensageiro instantâneo"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:174
 #, fuzzy
 msgid "Send me notices"
 msgstr "Enviar uma mensagem"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:176
 #, fuzzy
 msgid "Post a notice when my status changes."
 msgstr "Publicar uma mensagem quando eu mudar de status no Jabber/GTalk."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:178
 #, fuzzy
 msgid "Send me replies from people I'm not subscribed to."
 msgstr ""
@@ -3301,54 +2657,45 @@ msgstr ""
 "GTalk."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:181
 #, fuzzy
 msgid "Publish a MicroID"
 msgstr "Publique um MicroID para meu endereço de e-mail."
 
 #. TRANS: Server error thrown on database error updating IM preferences.
-#: actions/imsettings.php:291
 #, fuzzy
 msgid "Couldn't update IM preferences."
 msgstr "Não foi possível atualizar o usuário."
 
 #. TRANS: Confirmation message for successful IM preferences save.
 #. TRANS: Confirmation message after saving preferences.
-#: actions/imsettings.php:298 actions/urlsettings.php:244
 msgid "Preferences saved."
 msgstr "As preferências foram salvas."
 
 #. TRANS: Message given saving IM address without having provided one.
-#: actions/imsettings.php:320
 #, fuzzy
 msgid "No screenname."
 msgstr "Nenhuma identificação."
 
-#: actions/imsettings.php:325
 #, fuzzy
 msgid "No transport."
 msgstr "Nenhuma mensagem."
 
 #. TRANS: Message given saving IM address that cannot be normalised.
-#: actions/imsettings.php:333
 #, fuzzy
 msgid "Cannot normalize that screenname"
 msgstr "Não foi possível normalizar essa ID do Jabber"
 
 #. TRANS: Message given saving IM address that not valid.
-#: actions/imsettings.php:340
 #, fuzzy
 msgid "Not a valid screenname"
 msgstr "Não é uma identificação válida."
 
 #. TRANS: Message given saving IM address that is already set for another user.
-#: actions/imsettings.php:344
 #, fuzzy
 msgid "Screenname already belongs to another user."
 msgstr "Esta ID do Jabber já pertence à outro usuário."
 
 #. TRANS: Message given saving valid IM address that is to be confirmed.
-#: actions/imsettings.php:369
 #, fuzzy
 msgid "A confirmation code was sent to the IM address you added."
 msgstr ""
@@ -3356,68 +2703,57 @@ msgstr ""
 "informou. Você deve permitir que %s envie mensagens para você."
 
 #. TRANS: Message given canceling IM address confirmation for the wrong IM address.
-#: actions/imsettings.php:396
 msgid "That is the wrong IM address."
 msgstr "Isso é um endereço de MI errado."
 
 #. TRANS: Server error thrown on database error canceling IM address confirmation.
-#: actions/imsettings.php:405
 #, fuzzy
 msgid "Couldn't delete confirmation."
 msgstr "Não foi possível excluir a confirmação do mensageiro instantâneo."
 
 #. TRANS: Message given after successfully canceling IM address confirmation.
-#: actions/imsettings.php:410
 msgid "IM confirmation cancelled."
 msgstr "A confirmação do mensageiro instantâneo foi cancelada."
 
 #. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.
-#: actions/imsettings.php:434
 #, fuzzy
 msgid "That is not your screenname."
 msgstr "Esse não é seu número de telefone."
 
 #. TRANS: Server error thrown on database error removing a registered IM address.
-#: actions/imsettings.php:443
 #, fuzzy
 msgid "Couldn't update user im prefs."
 msgstr "Não foi possível atualizar o registro do usuário."
 
 #. TRANS: Message given after successfully removing a registered Instant Messaging address.
-#: actions/imsettings.php:451
 msgid "The IM address was removed."
 msgstr "O endereço de mensageiro instantâneo foi removido."
 
 #. TRANS: Title for all but the first page of the inbox page.
 #. TRANS: %1$s is the user's nickname, %2$s is the page number.
-#: actions/inbox.php:59
 #, php-format
 msgid "Inbox for %1$s - page %2$d"
 msgstr "Recebidas por %s - pág. %2$d"
 
 #. TRANS: Title for the first page of the inbox page.
 #. TRANS: %s is the user's nickname.
-#: actions/inbox.php:64
 #, php-format
 msgid "Inbox for %s"
 msgstr "Recebidas por %s"
 
 #. TRANS: Instructions for user inbox page.
-#: actions/inbox.php:106
 msgid "This is your inbox, which lists your incoming private messages."
 msgstr ""
 "Essa é a sua caixa de mensagens recebidas, que lista as mensagens "
 "particulares que você recebeu."
 
 #. TRANS: Client error displayed when trying to sent invites while they have been disabled.
-#: actions/invite.php:41
 msgid "Invites have been disabled."
 msgstr "Os convites foram desabilitados."
 
 #. TRANS: Client error displayed when trying to sent invites while not logged in.
 #. TRANS: %s is the StatusNet site name.
-#: actions/invite.php:45
 #, php-format
 msgid "You must be logged in to invite other users to use %s."
 msgstr ""
@@ -3425,18 +2761,15 @@ msgstr ""
 
 #. TRANS: Form validation message when providing an e-mail address that does not validate.
 #. TRANS: %s is an invalid e-mail address.
-#: actions/invite.php:78
 #, php-format
 msgid "Invalid email address: %s."
 msgstr "Endereço de e-mail inválido: %s."
 
 #. TRANS: Page title when invitations have been sent.
-#: actions/invite.php:117
 msgid "Invitations sent"
 msgstr "Os convites foram enviados"
 
 #. TRANS: Page title when inviting potential users.
-#: actions/invite.php:120
 msgid "Invite new users"
 msgstr "Convidar novos usuários"
 
@@ -3444,7 +2777,6 @@ msgstr "Convidar novos usuários"
 #. TRANS: is already subscribed to one or more users with the given e-mail address(es).
 #. TRANS: Plural form is based on the number of reported already subscribed e-mail addresses.
 #. TRANS: Followed by a bullet list.
-#: actions/invite.php:140
 msgid "You are already subscribed to this user:"
 msgid_plural "You are already subscribed to these users:"
 msgstr[0] "Você já está assinando este usuário:"
@@ -3452,7 +2784,6 @@ msgstr[1] "Você já está assinando estes usuários:"
 
 #. TRANS: Used as list item for already subscribed users (%1$s is nickname, %2$s is e-mail address).
 #. TRANS: Used as list item for already registered people (%1$s is nickname, %2$s is e-mail address).
-#: actions/invite.php:146 actions/invite.php:160
 #, php-format
 msgctxt "INVITE"
 msgid "%1$s (%2$s)"
@@ -3461,7 +2792,6 @@ msgstr "%1$s (%2$s)"
 #. TRANS: Message displayed inviting users to use a StatusNet site while the invited user
 #. TRANS: already uses a this StatusNet site. Plural form is based on the number of
 #. TRANS: reported already present people. Followed by a bullet list.
-#: actions/invite.php:154
 msgid "This person is already a user and you were automatically subscribed:"
 msgid_plural ""
 "These people are already users and you were automatically subscribed to them:"
@@ -3471,7 +2801,6 @@ msgstr[1] "Estas pessoas já são usuárias e você as assinou automaticamente:"
 #. TRANS: Message displayed inviting users to use a StatusNet site. Plural form is
 #. TRANS: based on the number of invitations sent. Followed by a bullet list of
 #. TRANS: e-mail addresses to which invitations were sent.
-#: actions/invite.php:168
 msgid "Invitation sent to the following person:"
 msgid_plural "Invitations sent to the following people:"
 msgstr[0] "Convite enviado para a seguinte pessoa:"
@@ -3479,7 +2808,6 @@ msgstr[1] "Convites enviados para as seguintes pessoas:"
 
 #. TRANS: Generic message displayed after sending out one or more invitations to
 #. TRANS: people to join a StatusNet site.
-#: actions/invite.php:178
 msgid ""
 "You will be notified when your invitees accept the invitation and register "
 "on the site. Thanks for growing the community!"
@@ -3488,7 +2816,6 @@ msgstr ""
 "registrarem neste site. Obrigado por aumentar a comunidade!"
 
 #. TRANS: Form instructions.
-#: actions/invite.php:191
 msgid ""
 "Use this form to invite your friends and colleagues to use this service."
 msgstr ""
@@ -3496,28 +2823,24 @@ msgstr ""
 "serviço."
 
 #. TRANS: Field label for a list of e-mail addresses.
-#: actions/invite.php:218
 msgid "Email addresses"
 msgstr "Endereços de e-mail"
 
 #. TRANS: Tooltip for field label for a list of e-mail addresses.
-#: actions/invite.php:221
 #, fuzzy
 msgid "Addresses of friends to invite (one per line)."
 msgstr "Endereços dos seus amigos que serão convidados (um por linha)"
 
 #. TRANS: Field label for a personal message to send to invitees.
-#: actions/invite.php:225
 msgid "Personal message"
 msgstr "Mensagem pessoal"
 
 #. TRANS: Tooltip for field label for a personal message to send to invitees.
-#: actions/invite.php:228
 msgid "Optionally add a personal message to the invitation."
 msgstr "Você pode, opcionalmente, adicionar uma mensagem pessoal ao convite."
 
 #. TRANS: Send button for inviting friends
-#: actions/invite.php:232
+#. TRANS: Button text for sending notice.
 msgctxt "BUTTON"
 msgid "Send"
 msgstr "Enviar"
@@ -3525,7 +2848,6 @@ msgstr "Enviar"
 #. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral
 #. TRANS: singular 3rd-person pronoun in English. %1$s is the inviting user, $2$s is
 #. TRANS: the StatusNet sitename.
-#: actions/invite.php:264
 #, php-format
 msgid "%1$s has invited you to join them on %2$s"
 msgstr "%1$s convidou você para se juntar a %2$s"
@@ -3535,7 +2857,6 @@ msgstr "%1$s convidou você para se juntar a %2$s"
 #. TRANS: StatusNet sitename, %3$s is the site URL, %4$s is the personal message from the
 #. TRANS: inviting user, %s%5 a link to the timeline for the inviting user, %s$6 is a link
 #. TRANS: to register with the StatusNet site.
-#: actions/invite.php:271
 #, php-format
 msgid ""
 "%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -3593,50 +2914,44 @@ msgstr ""
 "Cordialmente, %2$s\n"
 
 #. TRANS: Client error displayed when trying to join a group while not logged in.
-#: actions/joingroup.php:59
 msgid "You must be logged in to join a group."
 msgstr "Você deve estar autenticado para se associar a um grupo."
 
 #. TRANS: Title for join group page after joining.
-#: actions/joingroup.php:148
 #, fuzzy, php-format
 msgctxt "TITLE"
 msgid "%1$s joined group %2$s"
 msgstr "%1$s associou-se ao grupo %2$s"
 
 #. TRANS: Client error displayed when trying to leave a group while not logged in.
-#: actions/leavegroup.php:59
 msgid "You must be logged in to leave a group."
 msgstr "Você deve estar autenticado para sair de um grupo."
 
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
-#: actions/leavegroup.php:103 lib/command.php:398
 msgid "You are not a member of that group."
 msgstr "Você não é um membro desse grupo."
 
 #. TRANS: Title for leave group page after leaving.
-#: actions/leavegroup.php:142
 #, fuzzy, php-format
 msgctxt "TITLE"
 msgid "%1$s left group %2$s"
 msgstr "%1$s deixou o grupo %2$s"
 
 #. TRANS: User admin panel title
-#: actions/licenseadminpanel.php:55
 msgctxt "TITLE"
 msgid "License"
 msgstr "Licença"
 
-#: actions/licenseadminpanel.php:65
+#. TRANS: Form instructions for the site license admin panel.
 msgid "License for this StatusNet site"
 msgstr "Licença para este site StatusNet"
 
-#: actions/licenseadminpanel.php:134
+#. TRANS: Client error displayed selecting an invalid license in the license admin panel.
 msgid "Invalid license selection."
 msgstr "Seleção inválida de licença."
 
-#: actions/licenseadminpanel.php:144
+#. TRANS: Client error displayed when not specifying an owner for the all rights reserved license in the license admin panel.
 msgid ""
 "You must specify the owner of the content when using the All Rights Reserved "
 "license."
@@ -3644,140 +2959,141 @@ msgstr ""
 "Você deve especificar o proprietário do conteúdo quando usar a licença Todos "
 "os Direitos Reservados."
 
-#: actions/licenseadminpanel.php:151
+#. TRANS: Client error displayed selecting a too long license title in the license admin panel.
 msgid "Invalid license title. Maximum length is 255 characters."
 msgstr ""
 "O título da licença é inválido. O comprimento máximo é de 255 caracteres."
 
-#: actions/licenseadminpanel.php:163
+#. TRANS: Client error displayed specifying an invalid license URL in the license admin panel.
 msgid "Invalid license URL."
 msgstr "A URL da licença é inválida."
 
-#: actions/licenseadminpanel.php:166
+#. TRANS: Client error displayed specifying an invalid license image URL in the license admin panel.
 msgid "Invalid license image URL."
 msgstr "A URL da imagem da licença é inválida."
 
-#: actions/licenseadminpanel.php:174
+#. TRANS: Client error displayed specifying an invalid license URL in the license admin panel.
 msgid "License URL must be blank or a valid URL."
 msgstr ""
 "O campo de URL da licença deve estar em branco ou então conter uma URL "
 "válida."
 
-#: actions/licenseadminpanel.php:182
+#. TRANS: Client error displayed specifying an invalid license image URL in the license admin panel.
 msgid "License image must be blank or valid URL."
 msgstr ""
 "O campo de iamgem da licença deve estar em branco ou então conter uma URL "
 "válida."
 
-#: actions/licenseadminpanel.php:232
+#. TRANS: Form legend in the license admin panel.
 msgid "License selection"
 msgstr "Seleção da licença"
 
-#: actions/licenseadminpanel.php:238
+#. TRANS: License option in the license admin panel.
 msgid "Private"
 msgstr "Particular"
 
-#: actions/licenseadminpanel.php:239
+#. TRANS: License option in the license admin panel.
 msgid "All Rights Reserved"
 msgstr "Todos os Direitos Reservados"
 
-#: actions/licenseadminpanel.php:240
+#. TRANS: License option in the license admin panel.
 msgid "Creative Commons"
 msgstr "Creative Commons"
 
-#: actions/licenseadminpanel.php:245
+#. TRANS: Dropdown field label in the license admin panel.
 msgid "Type"
 msgstr "Tipo"
 
-#: actions/licenseadminpanel.php:247
-msgid "Select license"
+#. TRANS: Dropdown field instructions in the license admin panel.
+#, fuzzy
+msgid "Select a license."
 msgstr "Selecione a licença"
 
-#: actions/licenseadminpanel.php:261
+#. TRANS: Form legend in the license admin panel.
 msgid "License details"
 msgstr "Detalhes da licença"
 
-#: actions/licenseadminpanel.php:267
+#. TRANS: Field label in the license admin panel.
 msgid "Owner"
 msgstr "Proprietário"
 
-#: actions/licenseadminpanel.php:268
+#. TRANS: Field title in the license admin panel.
 msgid "Name of the owner of the site's content (if applicable)."
 msgstr "Nome do proprietário do conteúdo do site (se aplicável)."
 
-#: actions/licenseadminpanel.php:276
+#. TRANS: Field label in the license admin panel.
 msgid "License Title"
 msgstr "Título da licença"
 
-#: actions/licenseadminpanel.php:277
+#. TRANS: Field title in the license admin panel.
 msgid "The title of the license."
 msgstr "O título da licença."
 
-#: actions/licenseadminpanel.php:285
+#. TRANS: Field label in the license admin panel.
 msgid "License URL"
 msgstr "URL da licença"
 
-#: actions/licenseadminpanel.php:286
+#. TRANS: Field title in the license admin panel.
 msgid "URL for more information about the license."
 msgstr "URL para obter mais informações sobre a licença."
 
-#: actions/licenseadminpanel.php:293
+#. TRANS: Field label in the license admin panel.
 msgid "License Image URL"
 msgstr "URL da imagem da licença"
 
-#: actions/licenseadminpanel.php:294
+#. TRANS: Field title in the license admin panel.
 msgid "URL for an image to display with the license."
 msgstr "URL de uma imagem a ser exibida com a licença."
 
-#. TRANS: Submit button title.
-#: actions/licenseadminpanel.php:311 actions/sessionsadminpanel.php:199
-#: actions/siteadminpanel.php:292 actions/snapshotadminpanel.php:245
-#: actions/tagother.php:133 lib/applicationeditform.php:357
-msgid "Save"
-msgstr "Salvar"
-
-#: actions/licenseadminpanel.php:311
-msgid "Save license settings"
+#. TRANS: Button title in the license admin panel.
+#, fuzzy
+msgid "Save license settings."
 msgstr "Salvar as configurações da licença"
 
+#. TRANS: Client error displayed when trying to log in while already logged in.
 #. TRANS: Client error displayed trying to use "one time password login" when already logged in.
-#: actions/login.php:97 actions/otp.php:62 actions/register.php:130
 msgid "Already logged in."
 msgstr "Já está autenticado."
 
-#: actions/login.php:125
+#. TRANS: Form validation error displayed when trying to log in with incorrect credentials.
 msgid "Incorrect username or password."
 msgstr "Nome de usuário e/ou senha incorreto(s)."
 
+#. TRANS: Server error displayed when during login a server error occurs.
 #. TRANS: Server error displayed when a user object could not be created trying to login using "one time password login".
-#: actions/login.php:131 actions/otp.php:127
 msgid "Error setting user. You are probably not authorized."
 msgstr ""
 "Erro na configuração do usuário. Você provavelmente não tem autorização."
 
-#: actions/login.php:185 actions/login.php:236 lib/action.php:598
+#. TRANS: Page title for login page.
 msgid "Login"
 msgstr "Entrar"
 
-#: actions/login.php:222
+#. TRANS: Form legend on login page.
 msgid "Login to site"
 msgstr "Autenticar-se no site"
 
-#: actions/login.php:231 actions/register.php:469
+#. TRANS: Checkbox label label on login page.
 msgid "Remember me"
 msgstr "Lembrar neste computador"
 
-#: actions/login.php:232 actions/register.php:471
+#. TRANS: Checkbox title on login page.
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 "Entra automaticamente da próxima vez, sem pedir a senha. Não use em "
 "computadores compartilhados!"
 
-#: actions/login.php:241
+#. TRANS: Button text for log in on login page.
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Login"
+msgstr "Entrar"
+
+#. TRANS: Link text for link to "reset password" on login page.
 msgid "Lost or forgotten password?"
 msgstr "Perdeu ou esqueceu sua senha?"
 
-#: actions/login.php:259
+#. TRANS: Form instructions on login page before being able to change user settings.
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -3785,143 +3101,138 @@ msgstr ""
 "Por razões de segurança, por favor, digite novamente seu nome de usuário e "
 "senha antes de alterar suas configurações."
 
-#: actions/login.php:263
+#. TRANS: Form instructions on login page.
 msgid "Login with your username and password."
 msgstr "Autentique-se com seu nome de usuário e senha."
 
-#: actions/login.php:266
+#. TRANS: Form instructions on login page. This message contains Markdown links in the form [Link text](Link).
+#. TRANS: %%action.register%% is a link to the registration page.
 #, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
 msgstr ""
 "Ainda não possui um usuário? [Registre](%%action.register%%) uma nova conta."
 
-#: actions/makeadmin.php:92
+#. TRANS: Client error displayed when trying to make another user admin on the Make Admin page while not an admin.
 msgid "Only an admin can make another user an admin."
 msgstr ""
 "Somente um administrador pode dar privilégios de administração para outro "
 "usuário."
 
-#: actions/makeadmin.php:96
+#. TRANS: Client error displayed when trying to make another user admin on the Make Admin page who already is admin.
+#. TRANS: %1$s is the user that is already admin, %2$s is the group user is already admin for.
 #, php-format
 msgid "%1$s is already an admin for group \"%2$s\"."
 msgstr "%1$s já é um administrador do grupo \"%2$s\"."
 
-#: actions/makeadmin.php:133
+#. TRANS: Server error displayed when trying to make another user admin on the Make Admin page fails
+#. TRANS: because the group membership record could not be gotten.
+#. TRANS: %1$s is the to be admin user, %2$s is the group user should be admin for.
 #, php-format
 msgid "Can't get membership record for %1$s in group %2$s."
 msgstr "Não foi possível obter o registro de membro de %1$s no grupo %2$s."
 
-#: actions/makeadmin.php:146
+#. TRANS: Server error displayed when trying to make another user admin on the Make Admin page fails
+#. TRANS: because the group adminship record coud not be saved properly.
+#. TRANS: %1$s is the to be admin user, %2$s is the group user is already admin for.
 #, php-format
 msgid "Can't make %1$s an admin for group %2$s."
 msgstr "Não foi possível tornar %1$s um administrador do grupo %2$s."
 
-#: actions/microsummary.php:69
+#. TRANS: Client error displayed trying to make a micro summary without providing a status.
 msgid "No current status."
 msgstr "Nenhuma mensagem atual."
 
 #. TRANS: This is the title of the form for adding a new application.
-#: actions/newapplication.php:52
 msgid "New application"
 msgstr "Nova aplicação"
 
 #. TRANS: Client error displayed trying to add a new application while not logged in.
-#: actions/newapplication.php:64
 msgid "You must be logged in to register an application."
 msgstr "Você deve estar autenticado para registrar uma aplicação."
 
 #. TRANS: Form instructions for registering a new application.
-#: actions/newapplication.php:147
 msgid "Use this form to register a new application."
 msgstr "Utilize este formulário para registrar uma nova aplicação."
 
 #. TRANS: Validation error shown when not providing a source URL in the "New application" form.
-#: actions/newapplication.php:189
 msgid "Source URL is required."
 msgstr "A URL da fonte é obrigatória."
 
 #. TRANS: Server error displayed when an application could not be registered in the database through the "New application" form.
-#: actions/newapplication.php:279 actions/newapplication.php:289
 msgid "Could not create application."
 msgstr "Não foi possível criar a aplicação."
 
 #. TRANS: Title for form to create a group.
-#: actions/newgroup.php:53
 msgid "New group"
 msgstr "Novo grupo"
 
 #. TRANS: Client exception thrown when a user tries to create a group while banned.
-#: actions/newgroup.php:73 classes/User_group.php:485
 #, fuzzy
 msgid "You are not allowed to create groups on this site."
 msgstr "Você não tem permissão para excluir este grupo."
 
 #. TRANS: Form instructions for group create form.
-#: actions/newgroup.php:117
 msgid "Use this form to create a new group."
 msgstr "Utilize este formulário para criar um novo grupo."
 
-#. TRANS: Group create form validation error.
-#: actions/newgroup.php:200
-#, fuzzy
-msgid "Alias cannot be the same as nickname."
-msgstr "O apelido não pode ser igual à identificação."
-
-#: actions/newmessage.php:71 actions/newmessage.php:234
+#. TRANS: Page title for new direct message page.
+#. TRANS: Page title on page for sending a direct message.
 msgid "New message"
 msgstr "Nova mensagem"
 
-#. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
-#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:513
-msgid "You can't send a message to this user."
+#. TRANS: Client error displayed trying to send a direct message to a user while sender and
+#. TRANS: receiver are not subscribed to each other.
+#, fuzzy
+msgid "You cannot send a message to this user."
 msgstr "Você não pode enviar mensagens para este usuário."
 
+#. TRANS: Form validator error displayed trying to send a direct message without content.
+#. TRANS: Client error displayed trying to send a notice without content.
 #. TRANS: Command exception text shown when trying to send a direct message to another user without content.
 #. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
-#: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:490
-#: lib/command.php:593
 msgid "No content!"
 msgstr "Nenhum conteúdo!"
 
-#: actions/newmessage.php:161
+#. TRANS: Form validation error displayed trying to send a direct message without specifying a recipient.
 msgid "No recipient specified."
 msgstr "Não foi especificado nenhum destinatário."
 
+#. TRANS: Client error displayed trying to send a direct message to self.
 #. TRANS: Error text shown when trying to send a direct message to self.
-#: actions/newmessage.php:167 lib/command.php:517
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
 "Não envie mensagens para você mesmo(a); ao invés disso, apenas diga-a para "
 "si, discretamente."
 
-#: actions/newmessage.php:184
+#. TRANS: Page title after sending a direct message.
 msgid "Message sent"
 msgstr "A mensagem foi enviada"
 
+#. TRANS: Confirmation text after sending a direct message.
+#. TRANS: %s is the direct message recipient.
 #. TRANS: Message given have sent a direct message to another user.
 #. TRANS: %s is the name of the other user.
-#: actions/newmessage.php:188 lib/command.php:525
 #, php-format
 msgid "Direct message to %s sent."
 msgstr "A mensagem direta para %s foi enviada."
 
-#: actions/newmessage.php:213 actions/newnotice.php:264
+#. TRANS: Page title after an AJAX error occurred on the "send direct message" page.
+#. TRANS: Page title after an AJAX error occurs on the send notice page.
 msgid "Ajax Error"
 msgstr "Erro no Ajax"
 
-#: actions/newnotice.php:69
+#. TRANS: Page title for sending a new notice.
 msgid "New notice"
 msgstr "Nova mensagem"
 
-#: actions/newnotice.php:230
+#. TRANS: Page title after sending a notice.
 msgid "Notice posted"
 msgstr "A mensagem foi publicada"
 
 #. TRANS: Instructions for Notice search page.
 #. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/noticesearch.php:69
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -3931,20 +3242,17 @@ msgstr ""
 "busca com espaços; eles devem ter 3 ou mais caracteres."
 
 #. TRANS: Title of the page where users can search for notices.
-#: actions/noticesearch.php:80
 msgid "Text search"
 msgstr "Procurar por texto"
 
 #. TRANS: Test in RSS notice search.
 #. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearch.php:95
 #, php-format
 msgid "Search results for \"%1$s\" on %2$s"
 msgstr "Resultados da procura para \"%1$s\" no %2$s"
 
 #. TRANS: Text for logged in users making a query for notices without results.
 #. TRANS: This message contains a Markdown link.
-#: actions/noticesearch.php:128
 #, php-format
 msgid ""
 "Be the first to [post on this topic](%%%%action.newnotice%%%%?"
@@ -3955,7 +3263,6 @@ msgstr ""
 
 #. TRANS: Text for not logged in users making a query for notices without results.
 #. TRANS: This message contains Markdown links.
-#: actions/noticesearch.php:133
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and be the first to "
@@ -3966,19 +3273,17 @@ msgstr ""
 "status_textarea=%s)?"
 
 #. TRANS: RSS notice search feed title. %s is the query.
-#: actions/noticesearchrss.php:95
 #, php-format
 msgid "Updates with \"%s\""
 msgstr "Mensagens com \"%s\""
 
 #. TRANS: RSS notice search feed description.
 #. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearchrss.php:99
 #, fuzzy, php-format
 msgid "Updates matching search term \"%1$s\" on %2$s."
 msgstr "Mensagens correspondentes aos termos \"%1$s\" no %2$s!"
 
-#: actions/nudge.php:85
+#. TRANS: Client error displayed trying to nudge a user that cannot be nudged.
 msgid ""
 "This user doesn't allow nudges or hasn't confirmed or set their email "
 "address yet."
@@ -3986,60 +3291,51 @@ msgstr ""
 "Esse usuário não permite receber chamados de atenção ou ainda não confirmou "
 "ou configurou seu e-mail."
 
-#: actions/nudge.php:94
+#. TRANS: Page title after sending a nudge.
 msgid "Nudge sent"
 msgstr "A chamada de atenção foi enviada"
 
-#: actions/nudge.php:97
+#. TRANS: Confirmation text after sending a nudge.
 msgid "Nudge sent!"
 msgstr "A chamada de atenção foi enviada!"
 
 #. TRANS: Message displayed to an anonymous user trying to view OAuth application list.
-#: actions/oauthappssettings.php:57
 msgid "You must be logged in to list your applications."
 msgstr "Você precisa estar autenticado para listar suas aplicações."
 
 #. TRANS: Page title for OAuth applications
-#: actions/oauthappssettings.php:73
 msgid "OAuth applications"
 msgstr "Aplicações OAuth"
 
 #. TRANS: Page instructions for OAuth applications
-#: actions/oauthappssettings.php:85
 msgid "Applications you have registered"
 msgstr "Aplicações que você registrou"
 
 #. TRANS: Empty list message on page with OAuth applications.
-#: actions/oauthappssettings.php:138
 #, php-format
 msgid "You have not registered any applications yet."
 msgstr "Você ainda não registrou nenhuma aplicação."
 
 #. TRANS: Title for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:69
 msgid "Connected applications"
 msgstr "Aplicações conectadas"
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:80
 msgid "The following connections exist for your account."
 msgstr "Existem as seguintes conexões para a sua conta."
 
 #. TRANS: Client error when trying to revoke access for an application while not being a user of it.
-#: actions/oauthconnectionssettings.php:165
 msgid "You are not a user of that application."
 msgstr "Você não é um usuário dessa aplicação."
 
 #. TRANS: Client error when revoking access has failed for some reason.
 #. TRANS: %s is the application ID revoking access failed for.
-#: actions/oauthconnectionssettings.php:180
 #, php-format
 msgid "Unable to revoke access for application: %s."
 msgstr "Não foi possível revogar o acesso para a aplicação: %s."
 
 #. TRANS: Success message after revoking access for an application.
 #. TRANS: %1$s is the application name, %2$s is the first part of the user token.
-#: actions/oauthconnectionssettings.php:199
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -4048,14 +3344,12 @@ msgstr ""
 "O acesso de %1$s e do token iniciado por %2$s foi revogado com sucesso."
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:210
 msgid "You have not authorized any applications to use your account."
 msgstr "Você não autorizou nenhuma aplicação a usar a sua conta."
 
 #. TRANS: Note for developers in the OAuth connection settings form.
 #. TRANS: This message contains a Markdown link. Do not separate "](".
 #. TRANS: %s is the URL to the OAuth settings.
-#: actions/oauthconnectionssettings.php:230
 #, php-format
 msgid ""
 "Are you a developer? [Register an OAuth client application](%s) to use with "
@@ -4064,444 +3358,363 @@ msgstr ""
 "Você é um desenvolvedor? [Registre uma aplicação cliente OAuth](%s) para "
 "usar com esta instância do StatusNet."
 
-#: actions/oembed.php:64
+#. TRANS: Server error displayed in oEmbed action when path not found.
+#. TRANS: %s is a path.
 #, fuzzy, php-format
 msgid "\"%s\" not found."
 msgstr "O método da API não foi encontrado!"
 
-#: actions/oembed.php:76
+#. TRANS: Server error displayed in oEmbed action when notice not found.
+#. TRANS: %s is a notice.
 #, fuzzy, php-format
 msgid "Notice %s not found."
 msgstr "A mensagem pai não foi encontrada."
 
-#: actions/oembed.php:80 actions/shownotice.php:100
+#. TRANS: Server error displayed in oEmbed action when notice has not profile.
 msgid "Notice has no profile."
 msgstr "A mensagem não está associada a nenhum perfil."
 
-#: actions/oembed.php:83 actions/shownotice.php:172
+#. TRANS: oEmbed title. %1$s is the author name, %2$s is the creation date.
 #, php-format
 msgid "%1$s's status on %2$s"
 msgstr "Mensagem de %1$s no %2$s"
 
-#: actions/oembed.php:95
+#. TRANS: Server error displayed in oEmbed action when attachment not found.
+#. TRANS: %d is an attachment ID.
 #, fuzzy, php-format
 msgid "Attachment %s not found."
 msgstr "O usuário destinatário não foi encontrado."
 
-#: actions/oembed.php:136
+#. TRANS: Server error displayed in oEmbed request when a path is not supported.
+#. TRANS: %s is a path.
 #, php-format
 msgid "\"%s\" not supported for oembed requests."
 msgstr ""
 
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
-#: actions/oembed.php:168
 #, php-format
 msgid "Content type %s not supported."
 msgstr "O tipo de conteúdo %s não é suportado."
 
 #. TRANS: Error message displaying attachments. %s is the site's base URL.
-#: actions/oembed.php:172
 #, php-format
 msgid "Only %s URLs over plain HTTP please."
 msgstr "Por favor, somente URLs %s sobre HTTP puro."
 
+#. TRANS: Server error displayed in oEmbed action when request specifies an unsupported data format.
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1207
-#: lib/apiaction.php:1234 lib/apiaction.php:1369
 msgid "Not a supported data format."
 msgstr "Não é um formato de dados suportado."
 
 #. TRANS: ShortName in the OpenSearch interface when trying to find users.
-#: actions/opensearch.php:64
 msgid "People Search"
 msgstr "Procurar pessoas"
 
-#: actions/opensearch.php:68
+#. TRANS: ShortName in the OpenSearch interface when trying to find notices.
 msgid "Notice Search"
 msgstr "Procurar mensagens"
 
 #. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
-#: actions/otp.php:70
 msgid "No user ID specified."
 msgstr "Não foi especificado nenhum ID de usuário."
 
 #. TRANS: Client error displayed trying to use "one time password login" without specifying a login token.
-#: actions/otp.php:86
 msgid "No login token specified."
 msgstr "Não foi especificado nenhum token de autenticação."
 
 #. TRANS: Client error displayed trying to use "one time password login" without requesting a login token.
-#: actions/otp.php:94
 msgid "No login token requested."
 msgstr "Não foi requerido nenhum token de autenticação."
 
 #. TRANS: Client error displayed trying to use "one time password login" while specifying an invalid login token.
-#: actions/otp.php:100
 msgid "Invalid login token specified."
 msgstr "O token de autenticação especificado é inválido."
 
 #. TRANS: Client error displayed trying to use "one time password login" while specifying an expired login token.
-#: actions/otp.php:110
 msgid "Login token expired."
 msgstr "O token de autenticação expirou."
 
 #. TRANS: Title for outbox for any but the fist page.
 #. TRANS: %1$s is the user nickname, %2$d is the page number.
-#: actions/outbox.php:57
 #, php-format
 msgid "Outbox for %1$s - page %2$d"
 msgstr "Enviadas por %s - pág. %2$d"
 
 #. TRANS: Title for first page of outbox.
-#: actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
 msgstr "Enviadas de %s"
 
 #. TRANS: Instructions for outbox.
-#: actions/outbox.php:103
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr ""
 "Essa é a sua caixa de mensagens enviadas, que lista as mensagens "
 "particulares que você enviou."
 
-#: actions/passwordsettings.php:58
 msgid "Change password"
 msgstr "Alterar a senha"
 
-#: actions/passwordsettings.php:69
 msgid "Change your password."
 msgstr "Altere a sua senha"
 
 #. TRANS: Fieldset legend for password reset form.
-#: actions/passwordsettings.php:96 actions/recoverpassword.php:251
 msgid "Password change"
 msgstr "Alterar a senha"
 
-#: actions/passwordsettings.php:104
 msgid "Old password"
 msgstr "Senha anterior"
 
 #. TRANS: Field label for password reset form.
-#: actions/passwordsettings.php:108 actions/recoverpassword.php:256
 msgid "New password"
 msgstr "Senha nova"
 
-#: actions/passwordsettings.php:109 actions/register.php:416
 #, fuzzy
 msgid "6 or more characters."
 msgstr "No mínimo 6 caracteres"
 
 #. TRANS: Ttile for field label for password reset form where the password has to be typed again.
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:264
-#: actions/register.php:420
 #, fuzzy
 msgid "Same as password above."
 msgstr "Igual à senha acima"
 
-#: actions/passwordsettings.php:117
 msgid "Change"
 msgstr "Alterar"
 
-#: actions/passwordsettings.php:153 actions/register.php:223
 msgid "Password must be 6 or more characters."
 msgstr "A senha deve ter, no mínimo, 6 caracteres."
 
-#: actions/passwordsettings.php:156 actions/register.php:226
 msgid "Passwords don't match."
 msgstr "As senhas não coincidem."
 
-#: actions/passwordsettings.php:164
 msgid "Incorrect old password"
 msgstr "A senha anterior está errada"
 
-#: actions/passwordsettings.php:180
 msgid "Error saving user; invalid."
 msgstr "Erro ao salvar usuário; inválido."
 
 #. TRANS: Reset password form validation error message.
-#: actions/passwordsettings.php:185 actions/recoverpassword.php:418
 #, fuzzy
 msgid "Cannot save new password."
 msgstr "Não é possível salvar a nova senha."
 
-#: actions/passwordsettings.php:191
 msgid "Password saved."
 msgstr "A senha foi salva."
 
 #. TRANS: Title for Paths admin panel.
 #. TRANS: Menu item for site administration
-#: actions/pathsadminpanel.php:58 lib/adminpanelaction.php:371
 msgid "Paths"
 msgstr "Caminhos"
 
 #. TRANS: Form instructions for Path admin panel.
-#: actions/pathsadminpanel.php:69
 msgid "Path and server settings for this StatusNet site"
 msgstr "Configurações do caminho e do servidor para este site StatusNet"
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the directory that could not be read from.
-#: actions/pathsadminpanel.php:155
 #, php-format
 msgid "Theme directory not readable: %s."
 msgstr "Sem permissão de leitura no diretório de temas: %s."
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the avatar directory that could not be written to.
-#: actions/pathsadminpanel.php:163
 #, php-format
 msgid "Avatar directory not writable: %s."
 msgstr "Sem permissão de escrita no diretório de avatares: %s."
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the background directory that could not be written to.
-#: actions/pathsadminpanel.php:171
 #, php-format
 msgid "Background directory not writable: %s."
 msgstr "Sem permissão de escrita no diretório de imagens de fundo: %s."
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the locales directory that could not be read from.
-#: actions/pathsadminpanel.php:181
 #, php-format
 msgid "Locales directory not readable: %s."
 msgstr "Sem permissão de leitura no diretório de locales: %s."
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the SSL server URL that is too long.
-#: actions/pathsadminpanel.php:189
 msgid "Invalid SSL server. The maximum length is 255 characters."
 msgstr ""
 "Servidor SSL inválido. O comprimento máximo deve ser de 255 caracteres."
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:235 actions/siteadminpanel.php:58
 msgid "Site"
 msgstr "Site"
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:241 actions/pathsadminpanel.php:279
-#: actions/pathsadminpanel.php:370 actions/pathsadminpanel.php:425
 msgid "Server"
 msgstr "Servidor"
 
-#: actions/pathsadminpanel.php:242
 msgid "Site's server hostname."
 msgstr "Nome de host do servidor do site."
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:248 actions/pathsadminpanel.php:288
-#: actions/pathsadminpanel.php:379 actions/pathsadminpanel.php:434
 msgid "Path"
 msgstr "Caminho"
 
-#: actions/pathsadminpanel.php:249
 msgid "Site path."
 msgstr "Caminho do site."
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:255
 msgid "Locale directory"
 msgstr "Diretório dos locales"
 
-#: actions/pathsadminpanel.php:256
 msgid "Directory path to locales."
 msgstr "Caminho do diretório de locales"
 
 #. TRANS: Checkbox label in Paths admin panel.
-#: actions/pathsadminpanel.php:263
 msgid "Fancy URLs"
 msgstr "URLs limpas"
 
-#: actions/pathsadminpanel.php:265
 msgid "Use fancy (more readable and memorable) URLs?"
 msgstr "Utilizar URLs limpas (mais legíveis e memorizáveis)?"
 
-#: actions/pathsadminpanel.php:272
 msgid "Theme"
 msgstr "Tema"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:281
 msgid "Server for themes."
 msgstr "Servidor para temas."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:290
 msgid "Web path to themes."
 msgstr "Caminho web para os temas."
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:297 actions/pathsadminpanel.php:388
-#: actions/pathsadminpanel.php:443 actions/pathsadminpanel.php:495
 msgid "SSL server"
 msgstr "Servidor SSL"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:299
 msgid "SSL server for themes (default: SSL server)."
 msgstr "Servidor SSL para os temas (padrão: servidor SSL)."
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:306 actions/pathsadminpanel.php:397
-#: actions/pathsadminpanel.php:452
 msgid "SSL path"
 msgstr "Caminho SSL"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:308
 msgid "SSL path to themes (default: /theme/)."
 msgstr "Caminho SSL para os temas (padrão: /theme/)."
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:315 actions/pathsadminpanel.php:406
-#: actions/pathsadminpanel.php:461
 msgid "Directory"
 msgstr "Diretório"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:317
 msgid "Directory where themes are located."
 msgstr "Diretório onde os temas estão localizados."
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:326
 msgid "Avatars"
 msgstr "Avatares"
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:333
 msgid "Avatar server"
 msgstr "Servidor de avatares"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:335
 msgid "Server for avatars."
 msgstr "Servidor para os avatares."
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:342
 msgid "Avatar path"
 msgstr "Caminho dos avatares"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:344
 msgid "Web path to avatars."
 msgstr "Caminho web para os avatares."
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:351
 msgid "Avatar directory"
 msgstr "Diretório dos avatares"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:353
 msgid "Directory where avatars are located."
 msgstr "Diretório onde os avatares estão localizados."
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:364
 msgid "Backgrounds"
 msgstr "Imagens de fundo"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:372
 msgid "Server for backgrounds."
 msgstr "Servidor para as imagens de fundo."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:381
 msgid "Web path to backgrounds."
 msgstr "Caminho web para os planos de fundo."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:390
 msgid "Server for backgrounds on SSL pages."
 msgstr "Servidor para planos de fundo nas páginas SSL."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:399
 msgid "Web path to backgrounds on SSL pages."
 msgstr "Caminho web para planos de fundo nas páginas SSL."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:408
 msgid "Directory where backgrounds are located."
 msgstr "Diretório onde os planos de fundo estão localizados."
 
 #. TRANS: Fieldset legens in Paths admin panel.
-#: actions/pathsadminpanel.php:419
 msgid "Attachments"
 msgstr "Anexos"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:427
 msgid "Server for attachments."
 msgstr "Servidor para anexos."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:436
 msgid "Web path to attachments."
 msgstr "Caminho web dos anexos."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:445
 msgid "Server for attachments on SSL pages."
 msgstr "Servidor para anexos nas páginas SSL."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:454
 msgid "Web path to attachments on SSL pages."
 msgstr "Caminho web para anexos nas páginas SSL."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:463
 msgid "Directory where attachments are located."
 msgstr "Diretório onde os anexos estão localizados."
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:472
 msgid "SSL"
 msgstr "SSL"
 
 #. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
-#: actions/pathsadminpanel.php:477 actions/snapshotadminpanel.php:202
 msgid "Never"
 msgstr "Nunca"
 
 #. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
-#: actions/pathsadminpanel.php:479
 msgid "Sometimes"
 msgstr "Algumas vezes"
 
 #. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
-#: actions/pathsadminpanel.php:481
 msgid "Always"
 msgstr "Sempre"
 
-#: actions/pathsadminpanel.php:485
 msgid "Use SSL"
 msgstr "Usar SSL"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:487
 msgid "When to use SSL."
 msgstr "Quando usar o SSL."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:497
 msgid "Server to direct SSL requests to."
 msgstr "Servidor para onde devem ser direcionadas as requisições SSL."
 
 #. TRANS: Button title text to store form data in the Paths admin panel.
-#: actions/pathsadminpanel.php:514
 msgid "Save paths"
 msgstr "Salvar caminhos"
 
 #. TRANS: Instructions for the "People search" page.
 #. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/peoplesearch.php:54
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
@@ -4511,57 +3724,46 @@ msgstr ""
 "Separe os termos da busca com espaços; eles devem ter 3 ou mais caracteres."
 
 #. TRANS: Title of a page where users can search for other users.
-#: actions/peoplesearch.php:61
 msgid "People search"
 msgstr "Procurar pessoas"
 
-#: actions/peopletag.php:68
 #, php-format
 msgid "Not a valid people tag: %s."
 msgstr "Não é uma etiqueta de pessoa válida: %s."
 
-#: actions/peopletag.php:142
 #, php-format
 msgid "Users self-tagged with %1$s - page %2$d"
 msgstr "Usuários auto-etiquetados com %1$s - pág. %2$d"
 
 #. TRANS: Page title for AJAX form return when a disabling a plugin.
-#: actions/plugindisable.php:69
 msgctxt "plugin"
 msgid "Disabled"
 msgstr ""
 
 #. TRANS: Client error displayed trying to perform any request method other than POST.
 #. TRANS: Do not translate POST.
-#: actions/pluginenable.php:78 actions/subscribe.php:77
 msgid "This action only accepts POST requests."
 msgstr "Esta ação aceita somente requisições POST."
 
-#: actions/pluginenable.php:102
 #, fuzzy
 msgid "You cannot administer plugins."
 msgstr "Você não pode excluir usuários."
 
-#: actions/pluginenable.php:109
 #, fuzzy
 msgid "No such plugin."
 msgstr "Esta página não existe."
 
 #. TRANS: Page title for AJAX form return when enabling a plugin.
-#: actions/pluginenable.php:159
 msgctxt "plugin"
 msgid "Enabled"
 msgstr ""
 
 #. TRANS: Tab and title for plugins admin panel.
 #. TRANS: Menu item for site administration
-#: actions/pluginsadminpanel.php:56 actions/version.php:191
-#: lib/adminpanelaction.php:411
 msgid "Plugins"
 msgstr "Plugins"
 
 #. TRANS: Instructions at top of plugin admin page.
-#: actions/pluginsadminpanel.php:68
 msgid ""
 "Additional plugins can be enabled and configured manually. See the <a href="
 "\"http://status.net/wiki/Plugins\">online plugin documentation</a> for more "
@@ -4569,33 +3771,27 @@ msgid ""
 msgstr ""
 
 #. TRANS: Admin form section header
-#: actions/pluginsadminpanel.php:84
 #, fuzzy
 msgid "Default plugins"
 msgstr "Idioma padrão"
 
-#: actions/pluginsadminpanel.php:106
 msgid ""
 "All default plugins have been disabled from the site's configuration file."
 msgstr ""
 
-#: actions/postnotice.php:95
 msgid "Invalid notice content."
 msgstr "O conteúdo da mensagem é inválido."
 
-#: actions/postnotice.php:101
 #, php-format
 msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’."
 msgstr ""
 "A licença ‘%1$s’ da mensagem não é compatível com a licença ‘%2$s’ do site."
 
 #. TRANS: Page title for profile settings.
-#: actions/profilesettings.php:60
 msgid "Profile settings"
 msgstr "Configurações do perfil"
 
 #. TRANS: Usage instructions for profile settings.
-#: actions/profilesettings.php:71
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
@@ -4603,37 +3799,29 @@ msgstr ""
 "saibam mais sobre você."
 
 #. TRANS: Profile settings form legend.
-#: actions/profilesettings.php:99
 msgid "Profile information"
 msgstr "Informações do perfil"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:110 actions/register.php:412
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr "1-64 letras minúsculas ou números, sem pontuações ou espaços."
 
 #. TRANS: Field label in form for profile settings.
-#: actions/profilesettings.php:114 actions/register.php:434
-#: lib/groupeditform.php:150
 msgid "Full name"
 msgstr "Nome completo"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:119 actions/register.php:439
-#: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "Site"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:122 actions/register.php:441
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr "URL do seu site, blog ou perfil em outro site."
 
 #. TRANS: Tooltip for field label in form for profile settings. Plural
 #. TRANS: is decided by the number of characters available for the
 #. TRANS: biography (%d).
-#: actions/profilesettings.php:130 actions/register.php:450
 #, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4641,41 +3829,31 @@ msgstr[0] "Descreva a si mesmo e os seus interesses em %d caractere"
 msgstr[1] "Descreva a si mesmo e os seus interesses em %d caracteres"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:136 actions/register.php:455
 msgid "Describe yourself and your interests"
 msgstr "Descreva a si mesmo e os seus interesses"
 
 #. TRANS: Text area label in form for profile settings where users can provide.
 #. TRANS: their biography.
-#: actions/profilesettings.php:140 actions/register.php:457
 msgid "Bio"
 msgstr "Descrição"
 
 #. TRANS: Field label in form for profile settings.
-#: actions/profilesettings.php:146 actions/register.php:462
-#: lib/groupeditform.php:173
 msgid "Location"
 msgstr "Localização"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:149
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Onde você está, ex: \"cidade, estado (ou região), país\""
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:154
 msgid "Share my current location when posting notices"
 msgstr "Compartilhe minha localização atual ao publicar mensagens"
 
 #. TRANS: Field label in form for profile settings.
-#: actions/profilesettings.php:162 actions/tagother.php:128
-#: actions/tagother.php:188 lib/subscriptionlist.php:104
-#: lib/subscriptionlist.php:106
 msgid "Tags"
 msgstr "Etiquetas"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:165
 #, fuzzy
 msgid ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- "
@@ -4685,28 +3863,23 @@ msgstr ""
 "espaços"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:170
 msgid "Language"
 msgstr "Idioma"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:172
 #, fuzzy
 msgid "Preferred language."
 msgstr "Idioma preferencial"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:182
 msgid "Timezone"
 msgstr "Fuso horário"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:184
 msgid "What timezone are you normally in?"
 msgstr "Em que fuso horário você normalmente está?"
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:190
 #, fuzzy
 msgid ""
 "Automatically subscribe to whoever subscribes to me (best for non-humans)."
@@ -4716,7 +3889,6 @@ msgstr ""
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Plural form is used based on the maximum number of allowed
 #. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:259 actions/register.php:214
 #, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4724,84 +3896,68 @@ msgstr[0] "A descrição é muito extensa (máximo %d caractere)."
 msgstr[1] "A descrição é muito extensa (máximo %d caracteres)."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:270 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr "O fuso horário não foi selecionado."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:278
 msgid "Language is too long (maximum 50 characters)."
 msgstr "O nome do idioma é muito extenso (máx. 50 caracteres)."
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:292
 #, fuzzy, php-format
 msgid "Invalid tag: \"%s\"."
 msgstr "Etiqueta inválida: \"%s\""
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:348
 #, fuzzy
 msgid "Could not update user for autosubscribe."
 msgstr "Não foi possível atualizar o usuário para assinar automaticamente."
 
 #. TRANS: Server error thrown when user profile location preference settings could not be updated.
-#: actions/profilesettings.php:406
 #, fuzzy
 msgid "Could not save location prefs."
 msgstr "Não foi possível salvar as preferências de localização."
 
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:428 actions/tagother.php:179
 msgid "Could not save tags."
 msgstr "Não foi possível salvar as etiquetas."
 
 #. TRANS: Confirmation shown when user profile settings are saved.
 #. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:437 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "As configurações foram salvas."
 
 #. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
 #. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:484 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "Criar uma conta"
 
-#: actions/public.php:83
 #, php-format
 msgid "Beyond the page limit (%s)."
 msgstr "Além do limite da página (%s)."
 
-#: actions/public.php:92
 msgid "Could not retrieve public stream."
 msgstr "Não foi possível recuperar o fluxo público."
 
-#: actions/public.php:130
 #, php-format
 msgid "Public timeline, page %d"
 msgstr "Mensagens públicas, pág. %d"
 
-#: actions/public.php:132 lib/publicgroupnav.php:79
 msgid "Public timeline"
 msgstr "Mensagens públicas"
 
-#: actions/public.php:160
 msgid "Public Stream Feed (RSS 1.0)"
 msgstr "Fonte de mensagens públicas (RSS 1.0)"
 
-#: actions/public.php:164
 msgid "Public Stream Feed (RSS 2.0)"
 msgstr "Fonte de mensagens públicas (RSS 2.0)"
 
-#: actions/public.php:168
 msgid "Public Stream Feed (Atom)"
 msgstr "Fonte de mensagens públicas (Atom)"
 
-#: actions/public.php:188
 #, php-format
 msgid ""
 "This is the public timeline for %%site.name%% but no one has posted anything "
@@ -4810,11 +3966,9 @@ msgstr ""
 "Esse é o fluxo de mensagens públicas de %%site.name%%, mas ninguém publicou "
 "nada ainda."
 
-#: actions/public.php:191
 msgid "Be the first to post!"
 msgstr "Seja o primeiro a publicar!"
 
-#: actions/public.php:195
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post!"
@@ -4822,7 +3976,6 @@ msgstr ""
 "Por que você não [registra uma conta](%%action.register%%) pra ser o "
 "primeiro a publicar?"
 
-#: actions/public.php:242
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -4835,7 +3988,6 @@ msgstr ""
 "[Cadastre-se agora](%%action.register%%) para compartilhar notícias sobre "
 "você com seus amigos, família e colegas! ([Saiba mais](%%doc.help%%))"
 
-#: actions/public.php:247
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -4846,19 +3998,16 @@ msgstr ""
 "Microblogging) baseado no software livre [StatusNet](http://status.net/)."
 
 #. TRANS: Public RSS feed description. %s is the StatusNet site name.
-#: actions/publicrss.php:106
 #, fuzzy, php-format
 msgid "%s updates from everyone."
 msgstr "%s mensagens de todo mundo!"
 
 #. TRANS: Title for public tag cloud.
-#: actions/publictagcloud.php:57
 msgid "Public tag cloud"
 msgstr "Nuvem de etiquetas públicas"
 
 #. TRANS: Instructions (more used like an explanation/header).
 #. TRANS: %s is the StatusNet sitename.
-#: actions/publictagcloud.php:65
 #, php-format
 msgid "These are most popular recent tags on %s"
 msgstr "Estas são as etiquetas recentes mais populares no %s"
@@ -4866,7 +4015,6 @@ msgstr "Estas são as etiquetas recentes mais populares no %s"
 #. TRANS: This message contains a Markdown URL. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.
-#: actions/publictagcloud.php:74
 #, php-format
 msgid "No one has posted a notice with a [hashtag](%%doc.tags%%) yet."
 msgstr ""
@@ -4874,7 +4022,6 @@ 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.
-#: actions/publictagcloud.php:79
 msgid "Be the first to post one!"
 msgstr "Seja o primeiro a publicar uma!"
 
@@ -4883,7 +4030,6 @@ msgstr "Seja o primeiro a publicar uma!"
 #. TRANS: This message contains a Markdown URL. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.
-#: actions/publictagcloud.php:87
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post "
@@ -4893,43 +4039,35 @@ msgstr ""
 "primeiro a publicar?"
 
 #. TRANS: Client error displayed trying to recover password while already logged in.
-#: actions/recoverpassword.php:37
 msgid "You are already logged in!"
 msgstr "Você já está autenticado!"
 
 #. TRANS: Client error displayed when password recovery code is not correct.
-#: actions/recoverpassword.php:64
 msgid "No such recovery code."
 msgstr "Esse código de recuperação não existe."
 
 #. TRANS: Client error displayed when no proper password recovery code was submitted.
-#: actions/recoverpassword.php:69
 msgid "Not a recovery code."
 msgstr "Não é um código de recuperação"
 
 #. TRANS: Server error displayed trying to recover password without providing a user.
-#: actions/recoverpassword.php:77
 msgid "Recovery code for unknown user."
 msgstr "Código de recuperação para usuário desconhecido."
 
 #. TRANS: Server error displayed removing a password recovery code from the database.
-#: actions/recoverpassword.php:91
 msgid "Error with confirmation code."
 msgstr "Erro com o código de confirmação."
 
 #. TRANS: Client error displayed trying to recover password with too old a recovery code.
-#: actions/recoverpassword.php:103
 msgid "This confirmation code is too old. Please start again."
 msgstr "Este código de confirmação é muito antigo. Por favor inicie novamente."
 
 #. TRANS: Server error displayed when updating a user's e-mail address in the database fails while recovering a password.
-#: actions/recoverpassword.php:118
 msgid "Could not update user with confirmed email address."
 msgstr ""
 "Não foi possível atualizar o usuário com o endereço de e-mail confirmado."
 
 #. TRANS: Page notice for password recovery page.
-#: actions/recoverpassword.php:160
 msgid ""
 "If you have forgotten or lost your password, you can get a new one sent to "
 "the email address you have stored in your account."
@@ -4937,102 +4075,84 @@ msgstr ""
 "Se você esqueceu ou perdeu a sua senha, você pode receber uma nova no "
 "endereço de e-mail que cadastrou na sua conta."
 
-#: actions/recoverpassword.php:167
 msgid "You have been identified. Enter a new password below."
 msgstr "Você foi identificado. Digite uma nova senha abaixo."
 
 #. TRANS: Fieldset legend for password recovery page.
-#: actions/recoverpassword.php:198
 msgid "Password recovery"
 msgstr "Recuperação de senha"
 
 #. TRANS: Field label on password recovery page.
-#: actions/recoverpassword.php:202
 msgid "Nickname or email address"
 msgstr "Identificação ou endereço de e-mail"
 
 #. TRANS: Title for field label on password recovery page.
-#: actions/recoverpassword.php:205
 msgid "Your nickname on this server, or your registered email address."
 msgstr "Sua identificação neste servidor, ou seu e-mail cadastrado."
 
 #. TRANS: Field label on password recovery page.
-#: actions/recoverpassword.php:212
 msgid "Recover"
 msgstr "Recuperar"
 
 #. TRANS: Button text on password recovery page.
-#: actions/recoverpassword.php:214
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Recover"
 msgstr "Recuperar"
 
 #. TRANS: Title for password recovery page in password reset mode.
-#: actions/recoverpassword.php:223
 msgid "Reset password"
 msgstr "Restaurar a senha"
 
 #. TRANS: Title for password recovery page in password recover mode.
-#: actions/recoverpassword.php:225
 msgid "Recover password"
 msgstr "Recuperar a senha"
 
 #. TRANS: Title for password recovery page in email sent mode.
 #. TRANS: Subject for password recovery e-mail.
-#: actions/recoverpassword.php:227 actions/recoverpassword.php:366
 msgid "Password recovery requested"
 msgstr "Foi solicitada a recuperação da senha"
 
 #. TRANS: Title for password recovery page in password saved mode.
-#: actions/recoverpassword.php:229
 #, fuzzy
 msgid "Password saved"
 msgstr "A senha foi salva."
 
 #. TRANS: Title for password recovery page when an unknown action has been specified.
-#: actions/recoverpassword.php:232
 msgid "Unknown action"
 msgstr "Ação desconhecida"
 
 #. TRANS: Title for field label for password reset form.
-#: actions/recoverpassword.php:258
 #, fuzzy
 msgid "6 or more characters, and do not forget it!"
 msgstr "No mínimo 6 caracteres. E não se esqueça dela!"
 
 #. TRANS: Button text for password reset form.
 #. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: actions/recoverpassword.php:268 lib/designform.php:145
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Reset"
 msgstr "Restaurar"
 
 #. TRANS: Form instructions for password recovery form.
-#: actions/recoverpassword.php:278
 msgid "Enter a nickname or email address."
 msgstr "Digite a identificação ou endereço de e-mail."
 
 #. TRANS: Information on password recovery form if no known username or e-mail address was specified.
-#: actions/recoverpassword.php:309
 msgid "No user with that email address or username."
 msgstr ""
 "Não foi encontrado nenhum usuário com essa identificação ou endereço de "
 "email."
 
 #. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
-#: actions/recoverpassword.php:327
 msgid "No registered email address for that user."
 msgstr "Nenhum endereço de e-mail registrado para esse usuário."
 
 #. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
-#: actions/recoverpassword.php:342
 msgid "Error saving address confirmation."
 msgstr "Erro ao salvar o endereço de confirmação."
 
 #. TRANS: User notification after an e-mail with instructions was sent from the password recovery form.
-#: actions/recoverpassword.php:370
 msgid ""
 "Instructions for recovering your password have been sent to the email "
 "address registered to your account."
@@ -5041,76 +4161,60 @@ msgstr ""
 "mail informado no seu cadastro."
 
 #. TRANS: Client error displayed when trying to reset as password without providing a user.
-#: actions/recoverpassword.php:391
 msgid "Unexpected password reset."
 msgstr "Restauração inesperada da senha."
 
 #. TRANS: Reset password form validation error message.
-#: actions/recoverpassword.php:400
 msgid "Password must be 6 characters or more."
 msgstr "A senha deve ter 6 ou mais caracteres."
 
 #. TRANS: Reset password form validation error message.
-#: actions/recoverpassword.php:405
 msgid "Password and confirmation do not match."
 msgstr "A senha e a confirmação não coincidem."
 
 #. TRANS: Server error displayed when something does wrong with the user object during password reset.
-#: actions/recoverpassword.php:426 actions/register.php:241
 msgid "Error setting user."
 msgstr "Erro na configuração do usuário."
 
 #. TRANS: Success message for user after password reset.
-#: actions/recoverpassword.php:434
 msgid "New password successfully saved. You are now logged in."
 msgstr ""
 "A nova senha foi salva com sucesso. A partir de agora você já está "
 "autenticado."
 
-#: actions/redirecturl.php:70
 #, fuzzy
 msgid "No id parameter"
 msgstr "Nenhum argumento de ID."
 
-#: actions/redirecturl.php:76
 #, fuzzy, php-format
 msgid "No such file \"%d\""
 msgstr "Esse arquivo não existe."
 
-#: actions/register.php:80 actions/register.php:181 actions/register.php:392
 msgid "Sorry, only invited people can register."
 msgstr "Desculpe, mas somente convidados podem se registrar."
 
-#: actions/register.php:87
 msgid "Sorry, invalid invitation code."
 msgstr "Desculpe, mas o código do convite é inválido."
 
-#: actions/register.php:106
 msgid "Registration successful"
 msgstr "Registro realizado com sucesso"
 
-#: actions/register.php:108 actions/register.php:490
 msgid "Register"
 msgstr "Registrar-se"
 
-#: actions/register.php:128
 msgid "Registration not allowed."
 msgstr "Não é permitido o registro."
 
-#: actions/register.php:194
 #, fuzzy
 msgid "You cannot register if you don't agree to the license."
 msgstr "Você não pode se registrar se não aceitar a licença."
 
-#: actions/register.php:203
 msgid "Email address already exists."
 msgstr "O endereço de e-mail já existe."
 
-#: actions/register.php:236 actions/register.php:258
 msgid "Invalid username or password."
 msgstr "Nome de usuário e/ou senha inválido(s)"
 
-#: actions/register.php:333
 #, fuzzy
 msgid ""
 "With this form you can create a new account. You can then post notices and "
@@ -5119,27 +4223,21 @@ msgstr ""
 "Através deste formulário você pode criar uma nova conta. A partir daí você "
 "pode publicar mensagens e se conectar a amigos e colegas. "
 
-#: actions/register.php:424 actions/register.php:428
-#: actions/siteadminpanel.php:238 lib/settingsnav.php:92
 msgid "Email"
 msgstr "E-mail"
 
-#: actions/register.php:425 actions/register.php:429
 #, fuzzy
 msgid "Used only for updates, announcements, and password recovery."
 msgstr "Usado apenas para atualizações, anúncios e recuperações de senha"
 
-#: actions/register.php:436
 #, fuzzy
 msgid "Longer name, preferably your \"real\" name."
 msgstr "Nome completo, de preferência seu nome \"real\""
 
-#: actions/register.php:464
 #, fuzzy
 msgid "Where you are, like \"City, State (or Region), Country\"."
 msgstr "Onde você está, ex: \"cidade, estado (ou região), país\""
 
-#: actions/register.php:503
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
@@ -5147,23 +4245,19 @@ msgstr ""
 "Eu entendo que o conteúdo e os dados de %1$s são particulares e "
 "confidenciais."
 
-#: actions/register.php:513
 #, php-format
 msgid "My text and files are copyright by %1$s."
 msgstr "Meus textos e arquivos estão licenciados sob a %1$s."
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:517
 msgid "My text and files remain under my own copyright."
 msgstr "Meus textos e arquivos permanecem sob meus próprios direitos autorais."
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:520
 msgid "All rights reserved."
 msgstr "Todos os direitos reservados."
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:525
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -5173,7 +4267,6 @@ msgstr ""
 "particulares: senha, endereço de e-mail, endereço do mensageiro instantâneo "
 "e número de telefone."
 
-#: actions/register.php:566
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -5206,7 +4299,6 @@ msgstr ""
 "\n"
 "Obrigado por se registrar e esperamos que você aproveite o serviço."
 
-#: actions/register.php:590
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5214,7 +4306,6 @@ msgstr ""
 "(Você receberá uma mensagem por e-mail a qualquer momento, com instruções "
 "sobre como confirmar seu endereço.)"
 
-#: actions/remotesubscribe.php:97
 #, php-format
 msgid ""
 "To subscribe, you can [login](%%action.login%%), or [register](%%action."
@@ -5226,111 +4317,86 @@ msgstr ""
 "microblog compatível](%%doc.openmublog%%), informe a URL do seu perfil "
 "abaixo."
 
-#: actions/remotesubscribe.php:111
 msgid "Remote subscribe"
 msgstr "Assinatura remota"
 
-#: actions/remotesubscribe.php:123
 msgid "Subscribe to a remote user"
 msgstr "Assinar um usuário remoto"
 
-#: actions/remotesubscribe.php:128
 msgid "User nickname"
 msgstr "Identificação do usuário"
 
-#: actions/remotesubscribe.php:129
 #, fuzzy
 msgid "Nickname of the user you want to follow."
 msgstr "Identificação do usuário que você quer seguir"
 
-#: actions/remotesubscribe.php:132
 msgid "Profile URL"
 msgstr "URL do perfil"
 
-#: actions/remotesubscribe.php:133
 #, fuzzy
 msgid "URL of your profile on another compatible microblogging service."
 msgstr "URL do seu perfil em outro serviço de microblog compatível"
 
 #. TRANS: Link text for link that will subscribe to a remote profile.
-#: actions/remotesubscribe.php:136 lib/subscribeform.php:139
-#: lib/userprofile.php:402
 msgid "Subscribe"
 msgstr "Assinar"
 
-#: actions/remotesubscribe.php:158
 #, fuzzy
 msgid "Invalid profile URL (bad format)."
 msgstr "A URL do perfil é inválida (formato inválido)"
 
-#: actions/remotesubscribe.php:167
 msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
 msgstr ""
 "Não é uma URL de perfil válida (nenhum documento YADIS ou XRDS inválido)."
 
-#: actions/remotesubscribe.php:175
 #, fuzzy
 msgid "That is a local profile! Login to subscribe."
 msgstr "Esse é um perfil local! Autentique-se para assinar."
 
-#: actions/remotesubscribe.php:182
 #, fuzzy
 msgid "Could not get a request token."
 msgstr "Não foi possível obter um token de requisição."
 
-#: actions/repeat.php:56
 msgid "Only logged-in users can repeat notices."
 msgstr "Apenas usuários autenticados podem repetir mensagens."
 
-#: actions/repeat.php:63 actions/repeat.php:70
 msgid "No notice specified."
 msgstr "Não foi especificada nenhuma mensagem."
 
-#: actions/repeat.php:75
 #, fuzzy
 msgid "You cannot repeat your own notice."
 msgstr "Você não pode repetir sua própria mensagem."
 
-#: actions/repeat.php:89
 msgid "You already repeated that notice."
 msgstr "Você já repetiu essa mensagem."
 
-#: actions/repeat.php:112 lib/noticelist.php:697
 msgid "Repeated"
 msgstr "Repetida"
 
-#: actions/repeat.php:117
 msgid "Repeated!"
 msgstr "Repetida!"
 
 #. TRANS: RSS reply feed title. %s is a user nickname.
-#: actions/replies.php:126 actions/repliesrss.php:68
-#: lib/personalgroupnav.php:105
 #, php-format
 msgid "Replies to %s"
 msgstr "Respostas para %s"
 
-#: actions/replies.php:128
 #, php-format
 msgid "Replies to %1$s, page %2$d"
 msgstr "Respostas para %1$s, pág. %2$d"
 
-#: actions/replies.php:145
 #, php-format
 msgid "Replies feed for %s (RSS 1.0)"
 msgstr "Fonte de respostas para %s (RSS 1.0)"
 
-#: actions/replies.php:152
 #, php-format
 msgid "Replies feed for %s (RSS 2.0)"
 msgstr "Fonte de respostas para %s (RSS 2.0)"
 
-#: actions/replies.php:159
 #, php-format
 msgid "Replies feed for %s (Atom)"
 msgstr "Fonte de respostas para %s (Atom)"
 
-#: actions/replies.php:199
 #, php-format
 msgid ""
 "This is the timeline showing replies to %1$s but %2$s hasn't received a "
@@ -5339,7 +4405,6 @@ msgstr ""
 "Este é o fluxo público de mensagens de %1$s, mas %2$s não publicou nada "
 "ainda."
 
-#: actions/replies.php:204
 #, php-format
 msgid ""
 "You can engage other users in a conversation, subscribe to more people or "
@@ -5348,7 +4413,6 @@ msgstr ""
 "Você pode envolver outros usuários na conversa. Pra isso, assine mais "
 "pessoas ou [associe-se a grupos](%%action.groups%%)."
 
-#: actions/replies.php:206
 #, php-format
 msgid ""
 "You can try to [nudge %1$s](../%2$s) or [post something to them](%%%%action."
@@ -5359,39 +4423,33 @@ msgstr ""
 
 #. TRANS: RSS reply feed description.
 #. TRANS: %1$s is a user nickname, %2$s is the StatusNet site name.
-#: actions/repliesrss.php:74
 #, fuzzy, php-format
 msgid "Replies to %1$s on %2$s."
 msgstr "Respostas para %1$s no %2$s"
 
 #. TRANS: Client exception displayed when trying to restore an account while not logged in.
-#: actions/restoreaccount.php:78
 #, fuzzy
 msgid "Only logged-in users can restore their account."
 msgstr "Apenas usuários autenticados podem repetir mensagens."
 
 #. TRANS: Client exception displayed when trying to restore an account without having restore rights.
-#: actions/restoreaccount.php:83
 #, fuzzy
 msgid "You may not restore your account."
 msgstr "Você ainda não registrou nenhuma aplicação."
 
 #. TRANS: Client exception displayed trying to restore an account while something went wrong uploading a file.
 #. TRANS: Client exception. No file; probably just a non-AJAX submission.
-#: actions/restoreaccount.php:121 actions/restoreaccount.php:146
 #, fuzzy
 msgid "No uploaded file."
 msgstr "Enviar arquivo"
 
 #. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
-#: actions/restoreaccount.php:129 lib/mediafile.php:194
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
 msgstr ""
 "O arquivo a ser enviado é maior do que o limite definido no parâmetro "
 "upload_max_filesize do php.ini."
 
 #. TRANS: Client exception.
-#: actions/restoreaccount.php:135 lib/mediafile.php:200
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form."
@@ -5400,145 +4458,117 @@ msgstr ""
 "MAX_FILE_SIZE do formulário HTML."
 
 #. TRANS: Client exception.
-#: actions/restoreaccount.php:141 lib/mediafile.php:206
 msgid "The uploaded file was only partially uploaded."
 msgstr "O arquivo foi apenas parcialmente enviado."
 
 #. TRANS: Client exception thrown when a temporary folder is not present to store a file upload.
-#: actions/restoreaccount.php:150 lib/mediafile.php:214
 msgid "Missing a temporary folder."
 msgstr "Falta uma pasta temporária."
 
 #. TRANS: Client exception thrown when writing to disk is not possible during a file upload operation.
-#: actions/restoreaccount.php:154 lib/mediafile.php:218
 msgid "Failed to write file to disk."
 msgstr "Erro ao salvar o arquivo no disco."
 
 #. TRANS: Client exception thrown when a file upload operation has been stopped by an extension.
-#: actions/restoreaccount.php:158 lib/mediafile.php:222
 msgid "File upload stopped by extension."
 msgstr "O arquivo a ser enviado foi barrado por causa de sua extensão."
 
 #. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
 #. TRANS: Exception thrown when uploading an image fails for an unknown reason.
 #. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
-#: actions/restoreaccount.php:164 lib/imagefile.php:106 lib/mediafile.php:228
 msgid "System error uploading file."
 msgstr "Erro no sistema durante o envio do arquivo."
 
 #. TRANS: Client exception thrown when a feed is not an Atom feed.
-#: actions/restoreaccount.php:207
 #, fuzzy
 msgid "Not an Atom feed."
 msgstr "Todos os membros"
 
 #. TRANS: Success message when a feed has been restored.
-#: actions/restoreaccount.php:241
 msgid ""
 "Feed has been restored. Your old posts should now appear in search and your "
 "profile page."
 msgstr ""
 
 #. TRANS: Message when a feed restore is in progress.
-#: actions/restoreaccount.php:245
 msgid "Feed will be restored. Please wait a few minutes for results."
 msgstr ""
 
 #. TRANS: Form instructions for feed restore.
-#: actions/restoreaccount.php:342
 msgid ""
 "You can upload a backed-up stream in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format."
 msgstr ""
 
 #. TRANS: Title for submit button to confirm upload of a user backup file for account restore.
-#: actions/restoreaccount.php:373
 #, fuzzy
 msgid "Upload the file"
 msgstr "Enviar arquivo"
 
-#: actions/revokerole.php:75
 msgid "You cannot revoke user roles on this site."
 msgstr "Não é possível revogar os papéis dos usuários neste site."
 
-#: actions/revokerole.php:82
 msgid "User doesn't have this role."
 msgstr "O usuário não possui este papel."
 
-#: actions/rsd.php:142 actions/version.php:159
 msgid "StatusNet"
 msgstr "StatusNet"
 
-#: actions/sandbox.php:65 actions/unsandbox.php:65
 msgid "You cannot sandbox users on this site."
 msgstr "Você não pode colocar usuários deste site em isolamento."
 
-#: actions/sandbox.php:72
 msgid "User is already sandboxed."
 msgstr "O usuário já está em isolamento."
 
 #. TRANS: Menu item for site administration
-#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
-#: lib/adminpanelaction.php:379
 msgid "Sessions"
 msgstr "Sessões"
 
-#: actions/sessionsadminpanel.php:65
 msgid "Session settings for this StatusNet site"
 msgstr "Configurações de sessão para este site StatusNet"
 
-#: actions/sessionsadminpanel.php:175
 msgid "Handle sessions"
 msgstr "Gerenciar sessões"
 
-#: actions/sessionsadminpanel.php:177
 msgid "Whether to handle sessions ourselves."
 msgstr "Define se as sessões terão gerenciamento próprio."
 
-#: actions/sessionsadminpanel.php:181
 msgid "Session debugging"
 msgstr "Depuração da sessão"
 
-#: actions/sessionsadminpanel.php:183
 msgid "Turn on debugging output for sessions."
 msgstr "Ativa a saída de depuração para as sessões."
 
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
+#. TRANS: Submit button title.
+msgid "Save"
+msgstr "Salvar"
+
 msgid "Save site settings"
 msgstr "Salvar as configurações do site"
 
-#: actions/showapplication.php:78
 msgid "You must be logged in to view an application."
 msgstr "Você deve estar autenticado para visualizar uma aplicação."
 
-#: actions/showapplication.php:151
 msgid "Application profile"
 msgstr "Perfil da aplicação"
 
-#: actions/showapplication.php:179
 #, php-format
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr "Criado por %1$s - acesso %2$s por padrão - %3$d usuários"
 
-#: actions/showapplication.php:189
 msgid "Application actions"
 msgstr "Ações da aplicação"
 
-#: actions/showapplication.php:212
 msgid "Reset key & secret"
 msgstr "Restaurar a chave e o segredo"
 
 #. TRANS: Title of form for deleting a user.
-#: actions/showapplication.php:228 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:64 lib/noticelist.php:678
 msgid "Delete"
 msgstr "Excluir"
 
-#: actions/showapplication.php:237
 msgid "Application info"
 msgstr "Informação da aplicação"
 
-#: actions/showapplication.php:255
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
@@ -5546,42 +4576,35 @@ msgstr ""
 "Nota: Nós suportamos assinaturas HMAC-SHA1. Nós não suportamos o método de "
 "assinatura em texto plano."
 
-#: actions/showapplication.php:275
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr "Tem certeza que deseja restaurar sua chave e segredo de consumidor?"
 
 #. TRANS: Title for all but the first page of favourite notices of a user.
 #. TRANS: %1$s is the user for whom the favourite notices are displayed, %2$d is the page number.
-#: actions/showfavorites.php:80
 #, php-format
 msgid "%1$s's favorite notices, page %2$d"
 msgstr "Mensagens favoritas de %1$s, pág. %2$d"
 
 #. TRANS: Server error displayed when favourite notices could not be retrieved from the database.
-#: actions/showfavorites.php:134
 msgid "Could not retrieve favorite notices."
 msgstr "Não foi possível recuperar as mensagens favoritas."
 
 #. TRANS: Feed link text. %s is a username.
-#: actions/showfavorites.php:172
 #, php-format
 msgid "Feed for favorites of %s (RSS 1.0)"
 msgstr "Fonte para favoritas de %s (RSS 1.0)"
 
 #. TRANS: Feed link text. %s is a username.
-#: actions/showfavorites.php:180
 #, php-format
 msgid "Feed for favorites of %s (RSS 2.0)"
 msgstr "Fonte para favoritas de %s (RSS 2.0)"
 
 #. TRANS: Feed link text. %s is a username.
-#: actions/showfavorites.php:188
 #, php-format
 msgid "Feed for favorites of %s (Atom)"
 msgstr "Fonte para favoritas de %s (Atom)"
 
 #. TRANS: Text displayed instead of favourite notices for the current logged in user that has no favourites.
-#: actions/showfavorites.php:209
 msgid ""
 "You haven't chosen any favorite notices yet. Click the fave button on "
 "notices you like to bookmark them for later or shed a spotlight on them."
@@ -5592,7 +4615,6 @@ msgstr ""
 
 #. TRANS: Text displayed instead of favourite notices for a user that has no favourites while logged in.
 #. TRANS: %s is a username.
-#: actions/showfavorites.php:213
 #, php-format
 msgid ""
 "%s hasn't added any favorite notices yet. Post something interesting they "
@@ -5604,7 +4626,6 @@ msgstr ""
 #. TRANS: Text displayed instead of favourite notices for a user that has no favourites while not logged in.
 #. TRANS: %s is a username, %%%%action.register%%%% is a link to the user registration page.
 #. TRANS: (link text)[link] is a Mark Down link.
-#: actions/showfavorites.php:220
 #, php-format
 msgid ""
 "%s hasn't added any favorite notices yet. Why not [register an account](%%%%"
@@ -5615,64 +4636,53 @@ msgstr ""
 "primeiro a adicionar uma mensagem aos favoritos?"
 
 #. TRANS: Page notice for show favourites page.
-#: actions/showfavorites.php:251
 msgid "This is a way to share what you like."
 msgstr "Esta é uma forma de compartilhar o que você gosta."
 
 #. TRANS: Page title for first group page. %s is a group name.
-#: actions/showgroup.php:75
 #, php-format
 msgid "%s group"
 msgstr "Grupo %s"
 
 #. TRANS: Page title for any but first group page.
 #. TRANS: %1$s is a group name, $2$s is a page number.
-#: actions/showgroup.php:79
 #, php-format
 msgid "%1$s group, page %2$d"
 msgstr "Grupo %1$s, pág. %2$d"
 
 #. TRANS: Label for group description or group note (dt). Text hidden by default.
-#: actions/showgroup.php:266
 msgid "Note"
 msgstr "Mensagem"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:277 lib/groupeditform.php:180
 msgid "Aliases"
 msgstr "Apelidos"
 
 #. TRANS: Group actions header (h2). Text hidden by default.
-#: actions/showgroup.php:294
 msgid "Group actions"
 msgstr "Ações do grupo"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:338
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
 msgstr "Fonte de mensagens do grupo %s (RSS 1.0)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:345
 #, php-format
 msgid "Notice feed for %s group (RSS 2.0)"
 msgstr "Fonte de mensagens do grupo %s (RSS 2.0)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:352
 #, php-format
 msgid "Notice feed for %s group (Atom)"
 msgstr "Fonte de mensagens do grupo %s (Atom)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:358
 #, php-format
 msgid "FOAF for %s group"
 msgstr "FOAF para o grupo %s"
 
 #. TRANS: Header for mini list of group members on a group page (h2).
-#: actions/showgroup.php:395
 msgid "Members"
 msgstr "Membros"
 
@@ -5680,30 +4690,23 @@ msgstr "Membros"
 #. TRANS: Text for user subscription statistics if the user has no subscriptions.
 #. TRANS: Text for user subscriber statistics if user has no subscribers.
 #. TRANS: Text for user user group membership statistics if user is not a member of any group.
-#: actions/showgroup.php:401 lib/profileaction.php:137
-#: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
-#: lib/subscriptionlist.php:123 lib/tagcloudsection.php:71
 msgid "(None)"
 msgstr "(Nenhum)"
 
 #. TRANS: Link to all group members from mini list of group members if group has more than n members.
-#: actions/showgroup.php:410
 msgid "All members"
 msgstr "Todos os membros"
 
 #. TRANS: Header for group statistics on a group page (h2).
 #. TRANS: H2 text for user statistics.
-#: actions/showgroup.php:441 lib/profileaction.php:205
 msgid "Statistics"
 msgstr "Estatísticas"
 
-#: actions/showgroup.php:444
 msgctxt "LABEL"
 msgid "Created"
 msgstr "Criado"
 
 #. TRANS: Label for member count in statistics on group page.
-#: actions/showgroup.php:449
 msgctxt "LABEL"
 msgid "Members"
 msgstr "Membros"
@@ -5712,7 +4715,6 @@ msgstr "Membros"
 #. TRANS: **%s** is the group alias, %%%%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).
-#: actions/showgroup.php:464
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5731,7 +4733,6 @@ 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: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
-#: actions/showgroup.php:474
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5745,93 +4746,78 @@ msgstr ""
 "sobre suas vidas e interesses. "
 
 #. TRANS: Header for list of group administrators on a group page (h2).
-#: actions/showgroup.php:503
 msgid "Admins"
 msgstr "Administradores"
 
 #. TRANS: Client error displayed requesting a single message that does not exist.
-#: actions/showmessage.php:76
 msgid "No such message."
 msgstr "Essa mensagem não existe."
 
 #. TRANS: Client error displayed requesting a single direct message the requesting user was not a party in.
-#: actions/showmessage.php:86
 msgid "Only the sender and recipient may read this message."
 msgstr "Apenas o remetente e o destinatário podem ler esta mensagem."
 
 #. TRANS: Page title for single direct message display when viewing user is the sender.
 #. TRANS: %1$s is the addressed user's nickname, $2$s is a timestamp.
-#: actions/showmessage.php:105
 #, php-format
 msgid "Message to %1$s on %2$s"
 msgstr "Mensagem para %1$s no %2$s"
 
 #. TRANS: Page title for single message display.
 #. TRANS: %1$s is the sending user's nickname, $2$s is a timestamp.
-#: actions/showmessage.php:113
 #, php-format
 msgid "Message from %1$s on %2$s"
 msgstr "Mensagem de %1$s no %2$s"
 
-#: actions/shownotice.php:90
 msgid "Notice deleted."
 msgstr "A mensagem excluída."
 
 #. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
-#: actions/showstream.php:70
 #, php-format
 msgid "%1$s tagged %2$s"
 msgstr "Mensagens de %1$s etiquetadas como %2$s"
 
 #. TRANS: Page title showing tagged notices in one user's stream.
 #. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
-#: actions/showstream.php:74
 #, php-format
 msgid "%1$s tagged %2$s, page %3$d"
 msgstr "Mensagens de %1$s etiquetadas como %2$s, pág. %3$d"
 
 #. TRANS: Extended page title showing tagged notices in one user's stream.
 #. TRANS: %1$s is the username, %2$d is the page number.
-#: actions/showstream.php:82
 #, php-format
 msgid "%1$s, page %2$d"
 msgstr "%1$s, pág. %2$d"
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %1$s is a user nickname, %2$s is a hashtag.
-#: actions/showstream.php:127
 #, php-format
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
 msgstr "Fonte de mensagens de %1$s etiquetada como %2$s (RSS 1.0)"
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.
-#: actions/showstream.php:136
 #, php-format
 msgid "Notice feed for %s (RSS 1.0)"
 msgstr "Fonte de mensagens de %s (RSS 1.0)"
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.
-#: actions/showstream.php:145
 #, php-format
 msgid "Notice feed for %s (RSS 2.0)"
 msgstr "Fonte de mensagens de %s (RSS 2.0)"
 
-#: actions/showstream.php:152
 #, php-format
 msgid "Notice feed for %s (Atom)"
 msgstr "Fonte de mensagens de %s (Atom)"
 
 #. TRANS: Title for link to notice feed. FOAF stands for Friend of a Friend.
 #. TRANS: More information at http://www.foaf-project.org. %s is a user nickname.
-#: actions/showstream.php:159
 #, php-format
 msgid "FOAF for %s"
 msgstr "FOAF de %s"
 
 #. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
-#: actions/showstream.php:205
 #, php-format
 msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr ""
@@ -5839,7 +4825,6 @@ msgstr ""
 "ainda."
 
 #. TRANS: Second sentence of empty list message for a stream for the user themselves.
-#: actions/showstream.php:211
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
@@ -5849,7 +4834,6 @@ msgstr ""
 
 #. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:215
 #, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
@@ -5860,7 +4844,6 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:258
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5876,7 +4859,6 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:265
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5888,223 +4870,176 @@ msgstr ""
 "(http://status.net/). "
 
 #. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
-#: actions/showstream.php:322
 #, php-format
 msgid "Repeat of %s"
 msgstr "Repetição de %s"
 
-#: actions/silence.php:65 actions/unsilence.php:65
 msgid "You cannot silence users on this site."
 msgstr "Você não pode silenciar os usuários neste site."
 
-#: actions/silence.php:72
 msgid "User is already silenced."
 msgstr "O usuário já está silenciado."
 
-#: actions/siteadminpanel.php:69
 msgid "Basic settings for this StatusNet site"
 msgstr "Configurações básicas para esta instância do StatusNet."
 
-#: actions/siteadminpanel.php:133
 msgid "Site name must have non-zero length."
 msgstr "Você deve digitar alguma coisa para o nome do site."
 
-#: actions/siteadminpanel.php:141
 msgid "You must have a valid contact email address."
 msgstr "Você deve ter um endereço de e-mail para contato válido."
 
-#: actions/siteadminpanel.php:159
 #, php-format
 msgid "Unknown language \"%s\"."
 msgstr "Idioma \"%s\" desconhecido."
 
-#: actions/siteadminpanel.php:165
 msgid "Minimum text limit is 0 (unlimited)."
 msgstr "O valor mínimo para o limite de texto é 0 (sem limites)."
 
-#: actions/siteadminpanel.php:171
 msgid "Dupe limit must be one or more seconds."
 msgstr "O limite de duplicatas deve ser de um ou mais segundos."
 
-#: actions/siteadminpanel.php:221
 msgid "General"
 msgstr "Geral"
 
-#: actions/siteadminpanel.php:224
 msgid "Site name"
 msgstr "Nome do site"
 
-#: actions/siteadminpanel.php:225
 msgid "The name of your site, like \"Yourcompany Microblog\""
 msgstr "O nome do seu site, por exemplo \"Microblog da Sua Empresa\""
 
-#: actions/siteadminpanel.php:229
 msgid "Brought by"
 msgstr "Disponibilizado por"
 
-#: actions/siteadminpanel.php:230
 msgid "Text used for credits link in footer of each page"
 msgstr "Texto utilizado para o link de créditos no rodapé de cada página"
 
-#: actions/siteadminpanel.php:234
 msgid "Brought by URL"
 msgstr "URL do disponibilizado por"
 
-#: actions/siteadminpanel.php:235
 msgid "URL used for credits link in footer of each page"
 msgstr "URL utilizada para o link de créditos no rodapé de cada página"
 
-#: actions/siteadminpanel.php:239
 msgid "Contact email address for your site"
 msgstr "Endereço de e-mail para contatos do seu site"
 
-#: actions/siteadminpanel.php:245
 msgid "Local"
 msgstr "Local"
 
-#: actions/siteadminpanel.php:256
 msgid "Default timezone"
 msgstr "Fuso horário padrão"
 
-#: actions/siteadminpanel.php:257
 msgid "Default timezone for the site; usually UTC."
 msgstr "Fuso horário padrão para o seu site; geralmente UTC."
 
-#: actions/siteadminpanel.php:262
 msgid "Default language"
 msgstr "Idioma padrão"
 
-#: actions/siteadminpanel.php:263
 msgid "Site language when autodetection from browser settings is not available"
 msgstr ""
 "Idioma do site quando as configurações de autodetecção a partir do navegador "
 "não estiverem disponíveis"
 
-#: actions/siteadminpanel.php:271
 msgid "Limits"
 msgstr "Limites"
 
-#: actions/siteadminpanel.php:274
 msgid "Text limit"
 msgstr "Limite do texto"
 
-#: actions/siteadminpanel.php:274
 msgid "Maximum number of characters for notices."
 msgstr "Número máximo de caracteres para as mensagens."
 
-#: actions/siteadminpanel.php:278
 msgid "Dupe limit"
 msgstr "Limite de duplicatas"
 
-#: actions/siteadminpanel.php:278
 msgid "How long users must wait (in seconds) to post the same thing again."
 msgstr ""
 "Quanto tempo (em segundos) os usuários devem esperar para publicar a mesma "
 "coisa novamente."
 
 #. TRANS: Page title for site-wide notice tab in admin panel.
-#: actions/sitenoticeadminpanel.php:55
 msgid "Site Notice"
 msgstr "Avisos do site"
 
 #. TRANS: Instructions for site-wide notice tab in admin panel.
-#: actions/sitenoticeadminpanel.php:66
 msgid "Edit site-wide message"
 msgstr "Editar os avisos do site (exibidos em todas as páginas)"
 
 #. TRANS: Server error displayed when saving a site-wide notice was impossible.
-#: actions/sitenoticeadminpanel.php:101
 msgid "Unable to save site notice."
 msgstr "Não foi possível salvar os avisos do site."
 
 #. TRANS: Client error displayed when a site-wide notice was longer than allowed.
-#: actions/sitenoticeadminpanel.php:112
 msgid "Maximum length for the site-wide notice is 255 characters."
 msgstr "O tamanho máximo para os avisos do site é de 255 caracteres.."
 
 #. TRANS: Label for site-wide notice text field in admin panel.
-#: actions/sitenoticeadminpanel.php:176
 msgid "Site notice text"
 msgstr "Texto dos avisos"
 
 #. TRANS: Tooltip for site-wide notice text field in admin panel.
-#: actions/sitenoticeadminpanel.php:179
 msgid "Site-wide notice text (255 characters maximum; HTML allowed)"
 msgstr ""
 "Texto dos aviso do site (no máximo 255 caracteres; é permitido o uso de HTML)"
 
 #. TRANS: Title for button to save site notice in admin panel.
-#: actions/sitenoticeadminpanel.php:201
 #, fuzzy
 msgid "Save site notice."
 msgstr "Salvar os avisos do site"
 
 #. TRANS: Title for SMS settings.
-#: actions/smssettings.php:56
 msgid "SMS settings"
 msgstr "Configuração do SMS"
 
 #. TRANS: SMS settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/smssettings.php:70
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr "Você pode receber mensagens SMS de %%site.name%% através do e-mail."
 
 #. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
-#: actions/smssettings.php:92
 msgid "SMS is not available."
 msgstr "SMS não está disponível."
 
 #. TRANS: Form legend for SMS settings form.
-#: actions/smssettings.php:106
 msgid "SMS address"
 msgstr "Endereço de SMS"
 
 #. TRANS: Form guide in SMS settings form.
-#: actions/smssettings.php:115
 msgid "Current confirmed SMS-enabled phone number."
 msgstr "Número de telefone já habilitado para receber SMS."
 
 #. TRANS: Form guide in IM settings form.
-#: actions/smssettings.php:128
 msgid "Awaiting confirmation on this phone number."
 msgstr "Aguardando a confirmação deste número de telefone."
 
 #. TRANS: Field label for SMS address input in SMS settings form.
-#: actions/smssettings.php:137
 msgid "Confirmation code"
 msgstr "Código de confirmação"
 
 #. TRANS: Form field instructions in SMS settings form.
-#: actions/smssettings.php:139
 msgid "Enter the code you received on your phone."
 msgstr "Informe o código que você recebeu no seu telefone."
 
 #. TRANS: Button label to confirm SMS confirmation code in SMS settings.
-#: actions/smssettings.php:143
 msgctxt "BUTTON"
 msgid "Confirm"
 msgstr "Confirmar"
 
 #. TRANS: Field label for SMS phone number input in SMS settings form.
-#: actions/smssettings.php:148
 msgid "SMS phone number"
 msgstr "Telefone para SMS"
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
-#: actions/smssettings.php:151
 #, fuzzy
 msgid "Phone number, no punctuation or spaces, with area code."
 msgstr "Número de telefone, sem pontuação ou espaços, com código de área"
 
 #. TRANS: Form legend for SMS preferences form.
-#: actions/smssettings.php:190
 msgid "SMS preferences"
 msgstr "Preferências do SMS"
 
 #. TRANS: Checkbox label in SMS preferences form.
-#: actions/smssettings.php:196
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
@@ -6113,32 +5048,26 @@ msgstr ""
 "exorbitantes da minha operadora."
 
 #. TRANS: Confirmation message for successful SMS preferences save.
-#: actions/smssettings.php:307
 msgid "SMS preferences saved."
 msgstr "As preferências do SMS foram salvas."
 
 #. TRANS: Message given saving SMS phone number without having provided one.
-#: actions/smssettings.php:329
 msgid "No phone number."
 msgstr "Nenhum número de telefone."
 
 #. TRANS: Message given saving SMS phone number without having selected a carrier.
-#: actions/smssettings.php:335
 msgid "No carrier selected."
 msgstr "Não foi selecionada nenhuma operadora."
 
 #. TRANS: Message given saving SMS phone number that is already set.
-#: actions/smssettings.php:343
 msgid "That is already your phone number."
 msgstr "Esse já é seu número de telefone."
 
 #. TRANS: Message given saving SMS phone number that is already set for another user.
-#: actions/smssettings.php:347
 msgid "That phone number already belongs to another user."
 msgstr "Esse número de telefone já pertence à outro usuário."
 
 #. TRANS: Message given saving valid SMS phone number that is to be confirmed.
-#: actions/smssettings.php:375
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
 "for the code and instructions on how to use it."
@@ -6147,39 +5076,32 @@ msgstr ""
 "informou. Verifique no seu telefone o código e instruções sobre como usá-lo."
 
 #. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
-#: actions/smssettings.php:403
 msgid "That is the wrong confirmation number."
 msgstr "Isso é um número de confirmação errado."
 
 #. TRANS: Message given after successfully canceling SMS phone number confirmation.
-#: actions/smssettings.php:417
 msgid "SMS confirmation cancelled."
 msgstr "A confirmação do SMS foi cancelada."
 
 #. TRANS: Message given trying to remove an SMS phone number that is not
 #. TRANS: registered for the active user.
-#: actions/smssettings.php:437
 msgid "That is not your phone number."
 msgstr "Esse não é seu número de telefone."
 
 #. TRANS: Message given after successfully removing a registered SMS phone number.
-#: actions/smssettings.php:459
 msgid "The SMS phone number was removed."
 msgstr "O número de telefone para SMS foi removido."
 
 #. TRANS: Label for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:498
 msgid "Mobile carrier"
 msgstr "Operadora de celular"
 
 #. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:503
 msgid "Select a carrier"
 msgstr "Selecione uma operadora"
 
 #. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
 #. TRANS: %s is an administrative contact's e-mail address.
-#: actions/smssettings.php:512
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -6189,119 +5111,94 @@ msgstr ""
 "e-mail que não está listada aqui, informe-nos enviando uma mensagem para %s."
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
-#: actions/smssettings.php:534
 #, fuzzy
 msgid "No code entered."
 msgstr "Não foi digitado nenhum código"
 
 #. TRANS: Menu item for site administration
-#: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
-#: lib/adminpanelaction.php:395
 msgid "Snapshots"
 msgstr "Estatísticas"
 
-#: actions/snapshotadminpanel.php:65
 msgid "Manage snapshot configuration"
 msgstr "Gerenciar as configurações das estatísticas"
 
-#: actions/snapshotadminpanel.php:127
 msgid "Invalid snapshot run value."
 msgstr "O valor de execução da obtenção das estatísticas é inválido."
 
-#: actions/snapshotadminpanel.php:133
 msgid "Snapshot frequency must be a number."
 msgstr "A frequência de geração de estatísticas deve ser um número."
 
-#: actions/snapshotadminpanel.php:144
 msgid "Invalid snapshot report URL."
 msgstr "A URL para o envio das estatísticas é inválida."
 
-#: actions/snapshotadminpanel.php:200
 msgid "Randomly during web hit"
 msgstr "Aleatoriamente durante as visitas ao site"
 
-#: actions/snapshotadminpanel.php:201
 msgid "In a scheduled job"
 msgstr "Em horários pré-definidos"
 
-#: actions/snapshotadminpanel.php:206
 msgid "Data snapshots"
 msgstr "Estatísticas dos dados"
 
-#: actions/snapshotadminpanel.php:208
 msgid "When to send statistical data to status.net servers"
 msgstr "Quando enviar dados estatísticos para os servidores status.net"
 
-#: actions/snapshotadminpanel.php:217
 msgid "Frequency"
 msgstr "Frequentemente"
 
-#: actions/snapshotadminpanel.php:218
 msgid "Snapshots will be sent once every N web hits"
 msgstr "As estatísticas serão enviadas uma vez a cada N usos da web"
 
-#: actions/snapshotadminpanel.php:226
 msgid "Report URL"
 msgstr "URL para envio"
 
-#: actions/snapshotadminpanel.php:227
 msgid "Snapshots will be sent to this URL"
 msgstr "As estatísticas serão enviadas para esta URL"
 
-#: actions/snapshotadminpanel.php:248
 msgid "Save snapshot settings"
 msgstr "Salvar as configurações de estatísticas"
 
 #. TRANS: Client error displayed trying a change a subscription for a non-subscribed profile.
-#: actions/subedit.php:75
 msgid "You are not subscribed to that profile."
 msgstr "Você não está assinando esse perfil."
 
 #. TRANS: Server error displayed when updating a subscription fails with a database error.
 #. TRANS: Exception thrown when a subscription could not be stored on the server.
-#: actions/subedit.php:89 classes/Subscription.php:141
 msgid "Could not save subscription."
 msgstr "Não foi possível salvar a assinatura."
 
 #. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
-#: actions/subscribe.php:121
 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
 msgstr "Não é possível assinar um perfil OMB 0.1 remoto com essa ação."
 
 #. TRANS: Page title when subscription succeeded.
-#: actions/subscribe.php:149
 msgid "Subscribed"
 msgstr "Assinado"
 
 #. TRANS: Header for list of subscribers for a user (first page).
 #. TRANS: %s is the user's nickname.
-#: actions/subscribers.php:51
 #, php-format
 msgid "%s subscribers"
 msgstr "Assinantes de %s"
 
 #. TRANS: Header for list of subscribers for a user (not first page).
 #. TRANS: %1$s is the user's nickname, $2$d is the page number.
-#: actions/subscribers.php:55
 #, php-format
 msgid "%1$s subscribers, page %2$d"
 msgstr "Assinantes de %1$s, pág. %2$d"
 
 #. TRANS: Page notice for page with an overview of all subscribers
 #. TRANS: of the logged in user's own profile.
-#: actions/subscribers.php:68
 msgid "These are the people who listen to your notices."
 msgstr "Estas são as pessoas que acompanham as suas mensagens."
 
 #. TRANS: Page notice for page with an overview of all subscribers of a user other
 #. TRANS: than the logged in user. %s is the user nickname.
-#: actions/subscribers.php:74
 #, php-format
 msgid "These are the people who listen to %s's notices."
 msgstr "Estas são as pessoas que acompanham as mensagens de %s."
 
 #. TRANS: Subscriber list text when the logged in user has no subscribers.
-#: actions/subscribers.php:114
 msgid ""
 "You have no subscribers. Try subscribing to people you know and they might "
 "return the favor."
@@ -6311,7 +5208,6 @@ msgstr ""
 
 #. TRANS: Subscriber list text when looking at the subscribers for a of a user other
 #. TRANS: than the logged in user that has no subscribers. %s is the user nickname.
-#: actions/subscribers.php:118
 #, php-format
 msgid "%s has no subscribers. Want to be the first?"
 msgstr "%s não possui nenhum assinante. Quer ser o(a) primeiro(a)?"
@@ -6321,7 +5217,6 @@ msgstr "%s não possui nenhum assinante. Quer ser o(a) primeiro(a)?"
 #. TRANS: This message contains a Markdown URL. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.
-#: actions/subscribers.php:127
 #, php-format
 msgid ""
 "%s has no subscribers. Why not [register an account](%%%%action.register%%%"
@@ -6332,20 +5227,17 @@ msgstr ""
 
 #. TRANS: Header for subscriptions overview for a user (not first page).
 #. TRANS: %1$s is a user nickname, %2$d is the page number.
-#: actions/subscriptions.php:55
 #, php-format
 msgid "%1$s subscriptions, page %2$d"
 msgstr "Assinaturas de %1$s, pág. %2$d"
 
 #. TRANS: Page notice for page with an overview of all subscriptions
 #. TRANS: of the logged in user's own profile.
-#: actions/subscriptions.php:68
 msgid "These are the people whose notices you listen to."
 msgstr "Estas são as pessoas cujas mensagens você acompanha."
 
 #. TRANS: Page notice for page with an overview of all subscriptions of a user other
 #. TRANS: than the logged in user. %s is the user nickname.
-#: actions/subscriptions.php:74
 #, php-format
 msgid "These are the people whose notices %s listens to."
 msgstr "Estas são as pessoas cujas mensagens %s acompanha."
@@ -6354,7 +5246,6 @@ msgstr "Estas são as pessoas cujas mensagens %s acompanha."
 #. 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.
-#: actions/subscriptions.php:133
 #, php-format
 msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "
@@ -6374,69 +5265,55 @@ msgstr ""
 #. TRANS: than the logged in user that has no subscriptions. %s is the user nickname.
 #. TRANS: Subscription list text when looking at the subscriptions for a of a user that has none
 #. TRANS: as an anonymous user. %s is the user nickname.
-#: actions/subscriptions.php:141 actions/subscriptions.php:147
 #, php-format
 msgid "%s is not listening to anyone."
 msgstr "%s não está acompanhando ninguém."
 
 #. TRANS: Atom feed title. %s is a profile nickname.
-#: actions/subscriptions.php:176
 #, fuzzy, php-format
 msgid "Subscription feed for %s (Atom)"
 msgstr "Fonte de mensagens de %s (Atom)"
 
 #. TRANS: Checkbox label for enabling Jabber messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:241 lib/settingsnav.php:110
-#, fuzzy
 msgid "IM"
 msgstr "MI"
 
 #. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:256 lib/settingsnav.php:117
 msgid "SMS"
 msgstr "SMS"
 
 #. TRANS: Title for all but the first page of notices with tags.
 #. TRANS: %1$s is the tag, %2$d is the page number.
-#: actions/tag.php:73
 #, php-format
 msgid "Notices tagged with %1$s, page %2$d"
 msgstr "Mensagens etiquetadas com %1$s, pág. %2$d"
 
-#: actions/tag.php:91
 #, php-format
 msgid "Notice feed for tag %s (RSS 1.0)"
 msgstr "Fonte de mensagens de %s (RSS 1.0)"
 
-#: actions/tag.php:97
 #, php-format
 msgid "Notice feed for tag %s (RSS 2.0)"
 msgstr "Fonte de mensagens de %s (RSS 2.0)"
 
-#: actions/tag.php:103
 #, php-format
 msgid "Notice feed for tag %s (Atom)"
 msgstr "Fonte de mensagens de %s (Atom)"
 
-#: actions/tagother.php:39
 msgid "No ID argument."
 msgstr "Nenhum argumento de ID."
 
-#: actions/tagother.php:65
 #, php-format
 msgid "Tag %s"
 msgstr "Etiqueta %s"
 
 #. TRANS: H2 for user profile information.
-#: actions/tagother.php:77 lib/userprofile.php:76
 msgid "User profile"
 msgstr "Perfil do usuário"
 
-#: actions/tagother.php:120
 msgid "Tag user"
 msgstr "Etiquetar o usuário"
 
-#: actions/tagother.php:130
 msgid ""
 "Tags for this user (letters, numbers, -, ., and _), comma- or space- "
 "separated"
@@ -6444,48 +5321,38 @@ msgstr ""
 "Etiquetas para este usuário (letras, números, -, ., e _), separadas por "
 "vírgulas ou espaços"
 
-#: actions/tagother.php:157
 #, php-format
 msgid "Invalid tag: \"%s\""
 msgstr "Etiqueta inválida: \"%s\""
 
-#: actions/tagother.php:172
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr "Você só pode etiquetar pessoas às quais assina ou que assinam você."
 
-#: actions/tagother.php:215
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
 "Use esse formulário para adicionar etiquetas aos seus assinantes ou "
 "assinados."
 
-#: actions/tagrss.php:35
 msgid "No such tag."
 msgstr "Esta etiqueta não existe."
 
 #. TRANS: Client error displayed when trying to unblock a non-blocked user.
-#: actions/unblock.php:59
 msgid "You haven't blocked that user."
 msgstr "Você não bloqueou esse usuário."
 
-#: actions/unsandbox.php:72
 msgid "User is not sandboxed."
 msgstr "O usuário não está em isolamento."
 
-#: actions/unsilence.php:72
 msgid "User is not silenced."
 msgstr "O usuário não está silenciado."
 
-#: actions/unsubscribe.php:77
 msgid "No profile ID in request."
 msgstr "A requisição não possui nenhuma ID de perfil."
 
-#: actions/unsubscribe.php:98
 msgid "Unsubscribed"
 msgstr "Cancelado"
 
-#: actions/updateprofile.php:64
 #, php-format
 msgid ""
 "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
@@ -6493,174 +5360,139 @@ msgstr ""
 "A licença '%1$s' do fluxo do usuário não é compatível com a licença '%2$s' "
 "do site."
 
-#: actions/urlsettings.php:60
 #, fuzzy
 msgid "URL settings"
 msgstr "Configurações do MI"
 
 #. TRANS: Instructions for tab "Other" in user profile settings.
-#: actions/urlsettings.php:72
 msgid "Manage various other options."
 msgstr "Gerencia várias outras opções."
 
 #. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
 #. TRANS: user's profile settings. This message has one space at the beginning. Use your
 #. TRANS: language's word separator here if it has one (most likely a single space).
-#: actions/urlsettings.php:115
 msgid " (free service)"
 msgstr " (serviço livre)"
 
-#: actions/urlsettings.php:121
 #, fuzzy
 msgid "[none]"
 msgstr "Nenhuma"
 
-#: actions/urlsettings.php:122
 msgid "[internal]"
 msgstr ""
 
 #. TRANS: Label for dropdown with URL shortener services.
-#: actions/urlsettings.php:130
 msgid "Shorten URLs with"
 msgstr "Encolher URLs com"
 
 #. TRANS: Tooltip for for dropdown with URL shortener services.
-#: actions/urlsettings.php:132
 msgid "Automatic shortening service to use."
 msgstr "Serviço de encolhimento automático a ser utilizado."
 
-#: actions/urlsettings.php:138
 msgid "URL longer than"
 msgstr ""
 
-#: actions/urlsettings.php:141
 msgid "URLs longer than this will be shortened, 0 means always shorten."
 msgstr ""
 
-#: actions/urlsettings.php:145
 msgid "Text longer than"
 msgstr ""
 
-#: actions/urlsettings.php:148
 msgid ""
 "URLs in notices longer than this will be shortened, 0 means always shorten."
 msgstr ""
 
 #. TRANS: Form validation error for form "Other settings" in user profile.
-#: actions/urlsettings.php:180
 msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr "O serviço de encolhimento de URL é muito extenso (máx. 50 caracteres)."
 
-#: actions/urlsettings.php:187
 msgid "Invalid number for max url length."
 msgstr ""
 
-#: actions/urlsettings.php:193
 #, fuzzy
 msgid "Invalid number for max notice length."
 msgstr "O conteúdo da mensagem é inválido."
 
-#: actions/urlsettings.php:238
 msgid "Error saving user URL shortening preferences."
 msgstr ""
 
 #. TRANS: User admin panel title
-#: actions/useradminpanel.php:58
 msgctxt "TITLE"
 msgid "User"
 msgstr "Usuário"
 
 #. TRANS: Instruction for user admin panel.
-#: actions/useradminpanel.php:69
 msgid "User settings for this StatusNet site"
 msgstr "Configurações de usuário para esse site StatusNet"
 
 #. TRANS: Form validation error in user admin panel when a non-numeric character limit was set.
-#: actions/useradminpanel.php:147
 msgid "Invalid bio limit. Must be numeric."
 msgstr "Limite da descrição inválido. Seu valor deve ser numérico."
 
 #. TRANS: Form validation error in user admin panel when welcome text is too long.
-#: actions/useradminpanel.php:154
 msgid "Invalid welcome text. Maximum length is 255 characters."
 msgstr ""
 "Mensagem de boas vindas inválida. O comprimento máximo é de 255 caracteres."
 
 #. TRANS: Client error displayed when trying to set a non-existing user as default subscription for new
 #. TRANS: users in user admin panel. %1$s is the invalid nickname.
-#: actions/useradminpanel.php:166
 #, fuzzy, php-format
 msgid "Invalid default subscripton: \"%1$s\" is not a user."
 msgstr "Assinatura padrão inválida: '%1$s' não é um usuário."
 
-#: actions/useradminpanel.php:215 lib/action.php:565 lib/settingsnav.php:77
-#: lib/subgroupnav.php:81
 msgid "Profile"
 msgstr "Perfil"
 
 #. TRANS: Field label in user admin panel for setting the character limit for the bio field.
-#: actions/useradminpanel.php:220
 msgid "Bio Limit"
 msgstr "Limite da descrição"
 
 #. TRANS: Tooltip in user admin panel for setting the character limit for the bio field.
-#: actions/useradminpanel.php:222
 msgid "Maximum length of a profile bio in characters."
 msgstr "Comprimento máximo da descrição do perfil, em caracteres."
 
 #. TRANS: Form legend in user admin panel.
-#: actions/useradminpanel.php:231
 msgid "New users"
 msgstr "Novos usuários"
 
 #. TRANS: Field label in user admin panel for setting new user welcome text.
-#: actions/useradminpanel.php:236
 msgid "New user welcome"
 msgstr "Boas vindas aos novos usuários"
 
 #. TRANS: Tooltip in user admin panel for setting new user welcome text.
-#: actions/useradminpanel.php:238
 msgid "Welcome text for new users (maximum 255 characters)."
 msgstr "Texto de boas vindas para os novos usuários (máx. 255 caracteres)."
 
 #. TRANS: Field label in user admin panel for setting default subscription for new users.
-#: actions/useradminpanel.php:244
 msgid "Default subscription"
 msgstr "Assinatura padrão"
 
 #. TRANS: Tooltip in user admin panel for setting default subscription for new users.
-#: actions/useradminpanel.php:246
 msgid "Automatically subscribe new users to this user."
 msgstr "Os novos usuários assinam esse usuário automaticamente."
 
 #. TRANS: Form legend in user admin panel.
-#: actions/useradminpanel.php:256
 msgid "Invitations"
 msgstr "Convites"
 
 #. TRANS: Field label for checkbox in user admin panel for allowing users to invite friend using site e-mail.
-#: actions/useradminpanel.php:262
 msgid "Invitations enabled"
 msgstr "Convites habilitados"
 
 #. TRANS: Tooltip for checkbox in user admin panel for allowing users to invite friend using site e-mail.
-#: actions/useradminpanel.php:265
 msgid "Whether to allow users to invite new users."
 msgstr "Define se os usuários podem ou não convidar novos usuários."
 
 #. TRANS: Title for button to save user settings in user admin panel.
-#: actions/useradminpanel.php:302
 #, fuzzy
 msgid "Save user settings."
 msgstr "Salvar as configurações de usuário"
 
 #. TRANS: Page title.
-#: actions/userauthorization.php:109
 msgid "Authorize subscription"
 msgstr "Autorizar a assinatura"
 
 #. TRANS: Page notice on "Auhtorize subscription" page.
-#: actions/userauthorization.php:115
 #, fuzzy
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
@@ -6672,42 +5504,35 @@ msgstr ""
 "alguém, clique em \"Recusar\"."
 
 #. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:200
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Accept"
 msgstr "Aceitar"
 
 #. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:202
 #, fuzzy
 msgid "Subscribe to this user."
 msgstr "Assinar este usuário"
 
 #. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:204
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Reject"
 msgstr "Recusar"
 
 #. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:206
 #, fuzzy
 msgid "Reject this subscription."
 msgstr "Recusar esta assinatura"
 
 #. TRANS: Client error displayed for an empty authorisation request.
-#: actions/userauthorization.php:219
 msgid "No authorization request!"
 msgstr "Nenhum pedido de autorização!"
 
 #. TRANS: Accept message header from Authorise subscription page.
-#: actions/userauthorization.php:242
 msgid "Subscription authorized"
 msgstr "A assinatura foi autorizada"
 
-#: actions/userauthorization.php:245
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to authorize the "
@@ -6718,11 +5543,9 @@ msgstr ""
 "assinatura. Seu token de assinatura é:"
 
 #. TRANS: Reject message header from Authorise subscription page.
-#: actions/userauthorization.php:256
 msgid "Subscription rejected"
 msgstr "A assinatura foi recusada"
 
-#: actions/userauthorization.php:259
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to fully reject the "
@@ -6734,35 +5557,30 @@ msgstr ""
 
 #. TRANS: Exception thrown when no valid user is found for an authorisation request.
 #. TRANS: %s is a listener URI.
-#: actions/userauthorization.php:296
 #, fuzzy, php-format
 msgid "Listener URI \"%s\" not found here."
 msgstr "A URI ‘%s’ do usuário não foi encontrada aqui."
 
 #. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
 #. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:303
 #, fuzzy, php-format
 msgid "Listenee URI \"%s\" is too long."
 msgstr "A URI ‘%s’ do usuário é muito extensa."
 
 #. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
 #. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:311
 #, fuzzy, php-format
 msgid "Listenee URI \"%s\" is a local user."
 msgstr "A URI ‘%s’ é de um usuário local."
 
 #. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
 #. TRANS: %s is a profile URL.
-#: actions/userauthorization.php:329
 #, fuzzy, php-format
 msgid "Profile URL \"%s\" is for a local user."
 msgstr "A URL ‘%s’ do perfil é de um usuário local."
 
 #. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
 #. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
-#: actions/userauthorization.php:339
 #, fuzzy, php-format
 msgid ""
 "Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
@@ -6773,32 +5591,27 @@ msgstr ""
 
 #. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
 #. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:349
 #, fuzzy, php-format
 msgid "Avatar URL \"%s\" is not valid."
 msgstr "A URL ‘%s’ do avatar não é válida."
 
 #. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
 #. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:356
 #, fuzzy, php-format
 msgid "Cannot read avatar URL \"%s\"."
 msgstr "Não é possível ler a URL '%s' do avatar."
 
 #. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
 #. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:363
 #, fuzzy, php-format
 msgid "Wrong image type for avatar URL \"%s\"."
 msgstr "Tipo de imagem errado para a URL '%s' do avatar."
 
 #. TRANS: Page title for profile design page.
-#: actions/userdesignsettings.php:74 lib/designsettings.php:61
 msgid "Profile design"
 msgstr "Aparência do perfil"
 
 #. TRANS: Instructions for profile design page.
-#: actions/userdesignsettings.php:84 lib/designsettings.php:72
 msgid ""
 "Customize the way your profile looks with a background image and a colour "
 "palette of your choice."
@@ -6806,44 +5619,35 @@ msgstr ""
 "Personalize a aparência do seu perfil, com uma imagem de fundo e uma paleta "
 "de cores da sua preferência."
 
-#: actions/userdesignsettings.php:289
 msgid "Enjoy your hotdog!"
 msgstr "Aproveite o seu cachorro-quente!"
 
-#: actions/userdesignsettings.php:325
 #, fuzzy
 msgid "Design settings"
 msgstr "Salvar as configurações do site"
 
-#: actions/userdesignsettings.php:340
 msgid "View profile designs"
 msgstr "Visualizar aparências do perfil"
 
-#: actions/userdesignsettings.php:341
 msgid "Show or hide profile designs."
 msgstr "Exibir ou esconder as aparências do perfil."
 
-#: actions/userdesignsettings.php:348
 #, fuzzy
 msgid "Background file"
 msgstr "Fundo"
 
 #. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number.
-#: actions/usergroups.php:66
 #, php-format
 msgid "%1$s groups, page %2$d"
 msgstr "Grupos de %1$s, pág. %2$d"
 
-#: actions/usergroups.php:132
 msgid "Search for more groups"
 msgstr "Procurar por outros grupos"
 
-#: actions/usergroups.php:159
 #, php-format
 msgid "%s is not a member of any group."
 msgstr "%s não é membro de nenhum grupo."
 
-#: actions/usergroups.php:164
 #, php-format
 msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
 msgstr ""
@@ -6855,18 +5659,14 @@ msgstr ""
 #. TRANS: %1$s is a group name, %2$s is a site name.
 #. TRANS: Message is used as a subtitle in atom user notice feed.
 #. TRANS: %1$s is a user name, %2$s is a site name.
-#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:70
-#: lib/atomusernoticefeed.php:95
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr "Mensagens de %1$s no %2$s!"
 
-#: actions/version.php:75
 #, php-format
 msgid "StatusNet %s"
 msgstr "StatusNet %s"
 
-#: actions/version.php:155
 #, php-format
 msgid ""
 "This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
@@ -6875,16 +5675,13 @@ msgstr ""
 "Este site funciona sobre %1$s versão %2$s, Copyright 2008-2010 StatusNet, "
 "Inc. e colaboradores."
 
-#: actions/version.php:163
 msgid "Contributors"
 msgstr "Colaboradores"
 
 #. TRANS: Menu item for site administration
-#: actions/version.php:167 lib/adminpanelaction.php:403
 msgid "License"
 msgstr "Licença"
 
-#: actions/version.php:170
 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 "
@@ -6896,7 +5693,6 @@ msgstr ""
 "Software Foundation, na versão 3 desta licença ou (caso deseje) qualquer "
 "versão posterior. "
 
-#: actions/version.php:176
 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 "
@@ -6908,7 +5704,6 @@ msgstr ""
 "ADEQUAÇÃO A UMA FINALIDADE ESPECÍFICA.  Verifique a GNU Affero General "
 "Public License para mais detalhes. "
 
-#: actions/version.php:182
 #, php-format
 msgid ""
 "You should have received a copy of the GNU Affero General Public License "
@@ -6918,52 +5713,42 @@ msgstr ""
 "este programa. Caso contrário, veja %s."
 
 #. TRANS: Form input field label for application name.
-#: actions/version.php:197 lib/applicationeditform.php:190
 msgid "Name"
 msgstr "Nome"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:885
 msgid "Version"
 msgstr "Versão"
 
-#: actions/version.php:199
 msgid "Author(s)"
 msgstr "Autor(es)"
 
 #. TRANS: Form input field label.
-#: actions/version.php:200 lib/applicationeditform.php:208
-#: lib/groupeditform.php:168
 msgid "Description"
 msgstr "Descrição"
 
 #. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:164
 msgid "Favor"
 msgstr "Tornar favorita"
 
 #. TRANS: Ntofication given when a user marks a notice as favorite.
 #. TRANS: %1$s is a user nickname or full name, %2$s is a notice URI.
-#: classes/Fave.php:167
 #, php-format
 msgid "%1$s marked notice %2$s as a favorite."
 msgstr "%1$s marcou a mensagem %2$s como favorita."
 
 #. TRANS: Server exception thrown when a URL cannot be processed.
-#: classes/File.php:162
 #, php-format
 msgid "Cannot process URL '%s'"
 msgstr "Não é possível processar a URL '$s'"
 
 #. TRANS: Server exception thrown when... Robin thinks something is impossible!
-#: classes/File.php:194
 msgid "Robin thinks something is impossible."
 msgstr "o Robin acha que algo é impossível."
 
 #. 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$s is used for plural.
-#: classes/File.php:210
 #, php-format
 msgid ""
 "No file may be larger than %1$d byte and the file you sent was %2$d bytes. "
@@ -6980,7 +5765,6 @@ msgstr[1] ""
 
 #. TRANS: Message given if an upload would exceed user quota.
 #. TRANS: %d (number) is the user quota in bytes and is used for plural.
-#: classes/File.php:223
 #, php-format
 msgid "A file this large would exceed your user quota of %d byte."
 msgid_plural "A file this large would exceed your user quota of %d bytes."
@@ -6989,7 +5773,6 @@ msgstr[1] "Um arquivo deste tamanho excederá a sua conta de %d bytes."
 
 #. TRANS: Message given id an upload would exceed a user's monthly quota.
 #. TRANS: $d (number) is the monthly user quota in bytes and is used for plural.
-#: classes/File.php:235
 #, fuzzy, php-format
 msgid "A file this large would exceed your monthly quota of %d byte."
 msgid_plural "A file this large would exceed your monthly quota of %d bytes."
@@ -6997,108 +5780,89 @@ msgstr[0] "Um arquivo deste tamanho excederá a sua conta mensal de %d bytes."
 msgstr[1] "Um arquivo deste tamanho excederá a sua conta mensal de %d bytes."
 
 #. TRANS: Client exception thrown if a file upload does not have a valid name.
-#: classes/File.php:282 classes/File.php:297
 msgid "Invalid filename."
 msgstr "Nome de arquivo inválido."
 
 #. TRANS: Exception thrown when joining a group fails.
-#: classes/Group_member.php:51
 msgid "Group join failed."
 msgstr "Não foi possível se unir ao grupo."
 
 #. TRANS: Exception thrown when trying to leave a group the user is not a member of.
-#: classes/Group_member.php:64
 msgid "Not part of group."
 msgstr "Não é parte de um grupo."
 
 #. TRANS: Exception thrown when trying to leave a group fails.
-#: classes/Group_member.php:72
 msgid "Group leave failed."
 msgstr "Não foi possível deixar o grupo."
 
 #. TRANS: Exception thrown providing an invalid profile ID.
 #. TRANS: %s is the invalid profile ID.
-#: classes/Group_member.php:85
 #, php-format
 msgid "Profile ID %s is invalid."
 msgstr ""
 
 #. TRANS: Exception thrown providing an invalid group ID.
 #. TRANS: %s is the invalid group ID.
-#: classes/Group_member.php:98
 #, fuzzy, php-format
 msgid "Group ID %s is invalid."
 msgstr "Erro ao salvar usuário; inválido."
 
 #. TRANS: Activity title.
-#: classes/Group_member.php:147 lib/joinform.php:114
 msgid "Join"
 msgstr "Entrar"
 
 #. TRANS: Success message for subscribe to group attempt through OStatus.
 #. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
-#: classes/Group_member.php:151
 #, php-format
 msgid "%1$s has joined group %2$s."
 msgstr ""
 
 #. TRANS: Server exception thrown when updating a local group fails.
-#: classes/Local_group.php:42
 msgid "Could not update local group."
 msgstr "Não foi possível atualizar o grupo local."
 
 #. TRANS: Exception thrown when trying creating a login token failed.
 #. TRANS: %s is the user nickname for which token creation failed.
-#: classes/Login_token.php:78
 #, php-format
 msgid "Could not create login token for %s"
 msgstr "Não foi possível criar o token de autenticação para %s"
 
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
-#: classes/Memcached_DataObject.php:556
 msgid "No database name or DSN found anywhere."
 msgstr "Não foi encontrado nenhum nome de base de dados ou DSN."
 
 #. TRANS: Client exception thrown when a user tries to send a direct message while being banned from sending them.
-#: classes/Message.php:45
 msgid "You are banned from sending direct messages."
 msgstr "Você está proibido de enviar mensagens diretas."
 
 #. TRANS: Message given when a message could not be stored on the server.
-#: classes/Message.php:69
 msgid "Could not insert message."
 msgstr "Não foi possível inserir a mensagem."
 
 #. TRANS: Message given when a message could not be updated on the server.
-#: classes/Message.php:80
 msgid "Could not update message with new URI."
 msgstr "Não foi possível atualizar a mensagem com a nova URI."
 
 #. TRANS: Server exception thrown when a user profile for a notice cannot be found.
 #. TRANS: %1$d is a profile ID (number), %2$d is a notice ID (number).
-#: classes/Notice.php:98
 #, php-format
 msgid "No such profile (%1$d) for notice (%2$d)."
 msgstr "Não existe o perfil (%1$d) para a nota (%2$d)."
 
 #. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:199
 #, php-format
 msgid "Database error inserting hashtag: %s"
 msgstr "Erro no banco de dados durante a inserção da hashtag: %s"
 
 #. TRANS: Client exception thrown if a notice contains too many characters.
-#: classes/Notice.php:279
 msgid "Problem saving notice. Too long."
 msgstr "Problema no salvamento da mensagem. Ela é muito extensa."
 
 #. TRANS: Client exception thrown when trying to save a notice for an unknown user.
-#: classes/Notice.php:284
 msgid "Problem saving notice. Unknown user."
 msgstr "Problema no salvamento da mensagem. Usuário desconhecido."
 
 #. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
-#: classes/Notice.php:290
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
@@ -7106,7 +5870,6 @@ msgstr ""
 "novamente daqui a alguns minutos."
 
 #. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
-#: classes/Notice.php:297
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
 "few minutes."
@@ -7115,43 +5878,36 @@ msgstr ""
 "publique novamente daqui a alguns minutos."
 
 #. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:305
 msgid "You are banned from posting notices on this site."
 msgstr "Você está proibido de publicar mensagens neste site."
 
 #. TRANS: Server exception thrown when a notice cannot be saved.
 #. TRANS: Server exception thrown when a notice cannot be updated.
-#: classes/Notice.php:372 classes/Notice.php:399
 msgid "Problem saving notice."
 msgstr "Problema no salvamento da mensagem."
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:929
 #, fuzzy
 msgid "Bad type provided to saveKnownGroups."
 msgstr "O tipo fornecido ao método saveKnownGroups é incorreto"
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:1028
 msgid "Problem saving group inbox."
 msgstr "Problema no salvamento das mensagens recebidas do grupo."
 
 #. TRANS: Server exception thrown when a reply cannot be saved.
 #. TRANS: %1$d is a notice ID, %2$d is the ID of the mentioned user.
-#: classes/Notice.php:1144
 #, fuzzy, php-format
 msgid "Could not save reply for %1$d, %2$d."
 msgstr "Não foi possível salvar a informação do grupo local."
 
 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1663
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
 
 #. TRANS: Full name of a profile or group followed by nickname in parens
-#: classes/Profile.php:172 classes/User_group.php:242
 #, fuzzy, php-format
 msgctxt "FANCYNAME"
 msgid "%1$s (%2$s)"
@@ -7159,14 +5915,12 @@ msgstr "%1$s (%2$s)"
 
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:779
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr "Não é possível revogar a função \"%1$s\" do usuário #%2$d; não existe."
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:788
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -7174,251 +5928,197 @@ msgstr ""
 "dados."
 
 #. TRANS: Exception thrown when a right for a non-existing user profile is checked.
-#: classes/Remote_profile.php:54
 msgid "Missing profile."
 msgstr "Perfil não existe."
 
 #. TRANS: Exception thrown when a tag cannot be saved.
-#: classes/Status_network.php:338
 msgid "Unable to save tag."
 msgstr "Não foi salvar gravar a categoria."
 
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#: classes/Subscription.php:77 lib/oauthstore.php:482
 msgid "You have been banned from subscribing."
 msgstr "Você está proibido de assinar."
 
 #. TRANS: Exception thrown when trying to subscribe while already subscribed.
-#: classes/Subscription.php:82
 msgid "Already subscribed!"
 msgstr "Já assinado!"
 
 #. TRANS: Exception thrown when trying to subscribe to a user who has blocked the subscribing user.
-#: classes/Subscription.php:87
 msgid "User has blocked you."
 msgstr "O usuário bloqueou você."
 
 #. TRANS: Exception thrown when trying to unsibscribe without a subscription.
-#: classes/Subscription.php:176
 msgid "Not subscribed!"
 msgstr "Não assinado!"
 
 #. TRANS: Exception thrown when trying to unsubscribe a user from themselves.
-#: classes/Subscription.php:183
 msgid "Could not delete self-subscription."
 msgstr "Não foi possível salvar a assinatura."
 
 #. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
-#: classes/Subscription.php:211
 msgid "Could not delete subscription OMB token."
 msgstr "Não foi possível salvar a assinatura."
 
 #. TRANS: Exception thrown when a subscription could not be deleted on the server.
-#: classes/Subscription.php:223
 msgid "Could not delete subscription."
 msgstr "Não foi possível salvar a assinatura."
 
 #. TRANS: Activity tile when subscribing to another person.
-#: classes/Subscription.php:265
 msgid "Follow"
 msgstr ""
 
 #. TRANS: Notification given when one person starts following another.
 #. TRANS: %1$s is the subscriber, %2$s is the subscribed.
-#: classes/Subscription.php:268
 #, fuzzy, php-format
 msgid "%1$s is now following %2$s."
 msgstr "%1$s agora está acompanhando suas mensagens no %2$s."
 
 #. TRANS: Notice given on user registration.
 #. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:390
 #, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr "Bem vindo(a) a %1$s, @%2$s!"
 
 #. TRANS: Server exception.
-#: classes/User.php:923
 msgid "No single user defined for single-user mode."
 msgstr "Nenhum usuário definido para o modo de usuário único."
 
 #. TRANS: Server exception.
-#: classes/User.php:927
 msgid "Single-user mode code called when not enabled."
 msgstr ""
 
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:522
 msgid "Could not create group."
 msgstr "Não foi possível criar o grupo."
 
 #. TRANS: Server exception thrown when updating a group URI failed.
-#: classes/User_group.php:532
 msgid "Could not set group URI."
 msgstr "Não foi possível definir a URI do grupo."
 
 #. TRANS: Server exception thrown when setting group membership failed.
-#: classes/User_group.php:555
 msgid "Could not set group membership."
 msgstr "Não foi possível configurar a associação ao grupo."
 
 #. TRANS: Server exception thrown when saving local group information failed.
-#: classes/User_group.php:570
 msgid "Could not save local group info."
 msgstr "Não foi possível salvar a informação do grupo local."
 
 #. TRANS: Exception thrown when an account could not be located when it should be moved.
 #. TRANS: %s is the remote site.
-#: lib/accountmover.php:65
 #, fuzzy, php-format
 msgid "Cannot locate account %s."
 msgstr "Você não pode excluir usuários."
 
 #. TRANS: Exception thrown when a service document could not be located account move.
 #. TRANS: %s is the remote site.
-#: lib/accountmover.php:106
 #, php-format
 msgid "Cannot find XRD for %s."
 msgstr ""
 
 #. TRANS: Exception thrown when an account could not be located when it should be moved.
 #. TRANS: %s is the remote site.
-#: lib/accountmover.php:131
 #, php-format
 msgid "No AtomPub API service for %s."
 msgstr ""
 
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: lib/action.php:161
 #, php-format
 msgid "%1$s - %2$s"
 msgstr "%1$s - %2$s"
 
 #. TRANS: Page title for a page without a title set.
-#: lib/action.php:177
 msgid "Untitled page"
 msgstr "Página sem título"
 
 #. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.
-#: lib/action.php:325
 msgctxt "TOOLTIP"
 msgid "Show more"
 msgstr ""
 
 #. TRANS: Inline reply form submit button: submits a reply comment.
-#: lib/action.php:328
 #, fuzzy
 msgctxt "BUTTON"
-msgid "Comment"
-msgstr "Conteúdo"
+msgid "Reply"
+msgstr "Responder"
 
 #. TRANS: Placeholder text for inline reply form. Clicking in this box will turn it into a mini notice form.
-#: lib/action.php:331
-msgid "Add a comment..."
+msgid "Write a reply..."
 msgstr ""
 
-#: lib/action.php:559 lib/personalgroupnav.php:99
-#, fuzzy
 msgid "Home"
 msgstr "Site"
 
-#: lib/action.php:560
 #, fuzzy
 msgid "Friends timeline"
 msgstr "Mensagens de %s"
 
-#: lib/action.php:566
-#, fuzzy
 msgid "Your profile"
 msgstr "Perfil do grupo"
 
-#: lib/action.php:570 lib/action.php:593 lib/publicgroupnav.php:78
 msgid "Public"
 msgstr "Público"
 
-#: lib/action.php:571 lib/action.php:594
 #, fuzzy
 msgid "Everyone on this site"
 msgstr "Encontre pessoas neste site"
 
-#: lib/action.php:575
-#, fuzzy
 msgid "Settings"
 msgstr "Configuração do SMS"
 
-#: lib/action.php:576
 #, fuzzy
 msgid "Change your personal settings"
 msgstr "Alterar as suas configurações de perfil"
 
-#: lib/action.php:582
 #, fuzzy
 msgid "Site configuration"
 msgstr "Configuração do usuário"
 
-#: lib/action.php:587
-#, fuzzy
 msgid "Logout"
 msgstr "Sair"
 
-#: lib/action.php:588
-#, fuzzy
 msgid "Logout from the site"
-msgstr "Sair do site"
+msgstr "Sai do site"
 
-#: lib/action.php:599
-#, fuzzy
 msgid "Login to the site"
 msgstr "Autentique-se no site"
 
-#: lib/action.php:606
-#, fuzzy
 msgid "Search"
 msgstr "Pesquisar"
 
-#: lib/action.php:607
 #, fuzzy
 msgid "Search the site"
 msgstr "Procurar no site"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:864
 msgid "Help"
 msgstr "Ajuda"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:867
 msgid "About"
 msgstr "Sobre"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:870
 msgid "FAQ"
 msgstr "FAQ"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:875
 msgid "TOS"
 msgstr "Termos de uso"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:879
 msgid "Privacy"
 msgstr "Privacidade"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:882
 msgid "Source"
 msgstr "Fonte"
 
 #. TRANS: Secondary navigation menu option leading to e-mail contact information on the
 #. TRANS: StatusNet site, where to report bugs, ...
-#: lib/action.php:889
 msgid "Contact"
 msgstr "Contato"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:892
 msgid "Badge"
 msgstr "Mini-aplicativo"
 
@@ -7426,7 +6126,6 @@ msgstr "Mini-aplicativo"
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:921
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7436,7 +6135,6 @@ msgstr ""
 "broughtby%%](%%site.broughtbyurl%%). "
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:924
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** é um serviço de microblog."
@@ -7445,7 +6143,6 @@ msgstr "**%%site.name%%** é um serviço de microblog."
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:931
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7458,20 +6155,17 @@ msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:949
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr "O conteúdo e os dados de %1$s são privados e confidenciais."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:956
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr "Conteúdo e dados licenciados sob %1$s. Todos os direitos reservados."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:960
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 "Conteúdo e dados licenciados pelos colaboradores. Todos os direitos "
@@ -7479,89 +6173,74 @@ msgstr ""
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:992
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr "Todo o conteúdo e dados de %1$s estão disponíveis sob a licença %2$s."
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1335
 msgid "After"
 msgstr "Próximo"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1345
 msgid "Before"
 msgstr "Anterior"
 
 #. TRANS: Client exception thrown when a feed instance is a DOMDocument.
-#: lib/activity.php:125
 msgid "Expecting a root feed element but got a whole XML document."
 msgstr ""
 "Era esperado um elemento raiz da fonte, mas foi obtido o documento XML "
 "inteiro."
 
 #. TRANS: Client exception thrown when using an unknown verb for the activity importer.
-#: lib/activityimporter.php:81
 #, fuzzy, php-format
 msgid "Unknown verb: \"%s\"."
 msgstr "Idioma \"%s\" desconhecido."
 
 #. TRANS: Client exception thrown when trying to force a subscription for an untrusted user.
-#: lib/activityimporter.php:107
 msgid "Cannot force subscription for untrusted user."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to for a remote user to subscribe.
-#: lib/activityimporter.php:117
 #, fuzzy
 msgid "Cannot force remote user to subscribe."
 msgstr "Especifique o nome do usuário que será assinado."
 
 #. TRANS: Client exception thrown when trying to subscribe to an unknown profile.
-#: lib/activityimporter.php:132
 #, fuzzy
 msgid "Unknown profile."
 msgstr "Tipo de arquivo desconhecido"
 
 #. TRANS: Client exception thrown when trying to import an event not related to the importing user.
-#: lib/activityimporter.php:138
 msgid "This activity seems unrelated to our user."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to join a remote group that is not a group.
-#: lib/activityimporter.php:154
 msgid "Remote profile is not a group!"
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to join a group the importing user is already a member of.
-#: lib/activityimporter.php:163
 #, fuzzy
 msgid "User is already a member of this group."
 msgstr "Você já é membro desse grupo."
 
 #. TRANS: Client exception thrown when trying to import a notice by another user.
 #. TRANS: %1$s is the source URI of the notice, %2$s is the URI of the author.
-#: lib/activityimporter.php:201
 #, php-format
 msgid "Already know about notice %1$s and  it has a different author %2$s."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to overwrite the author information for a non-trusted user during import.
-#: lib/activityimporter.php:207
 msgid "Not overwriting author info for non-trusted user."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to import a notice without content.
 #. TRANS: %s is the notice URI.
-#: lib/activityimporter.php:223
 #, fuzzy, php-format
 msgid "No content for notice %s."
 msgstr "Encontre conteúdo de mensagens"
 
-#: lib/activitymover.php:84
 #, fuzzy, php-format
 msgid "No such user %s."
 msgstr "Este usuário não existe."
@@ -7572,217 +6251,177 @@ msgstr "Este usuário não existe."
 #. TRANS: %1$s is a URL, %2$s is the status, %s$s is the fail reason.
 #. TRANS: Exception thrown when post to collection fails with a status that is not handled.
 #. TRANS: %1$s is a URL, %2$s is the status, %s$s is the fail reason.
-#: lib/activitysink.php:163 lib/activitysink.php:167 lib/activitysink.php:172
 #, fuzzy, php-format
 msgctxt "URLSTATUSREASON"
 msgid "%1$s %2$s %3$s"
 msgstr "%1$s - %2$s"
 
 #. TRANS: Client exception thrown when there is no source attribute.
-#: lib/activityutils.php:200
 msgid "Can't handle remote content yet."
 msgstr "Ainda não é possível manipular conteúdo remoto."
 
 #. TRANS: Client exception thrown when there embedded XML content is found that cannot be processed yet.
-#: lib/activityutils.php:237
 msgid "Can't handle embedded XML content yet."
 msgstr "Ainda não é possível manipular conteúdo XML incorporado."
 
 #. TRANS: Client exception thrown when base64 encoded content is found that cannot be processed yet.
-#: lib/activityutils.php:242
 msgid "Can't handle embedded Base64 content yet."
 msgstr "Ainda não é possível manipular conteúdo Base64."
 
 #. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights.
-#: lib/adminpanelaction.php:96
 msgid "You cannot make changes to this site."
 msgstr "Você não pode fazer alterações neste site."
 
 #. TRANS: Client error message throw when a certain panel's settings cannot be changed.
-#: lib/adminpanelaction.php:108
 msgid "Changes to that panel are not allowed."
 msgstr "Não são permitidas alterações a esse painel."
 
 #. TRANS: Client error message.
-#: lib/adminpanelaction.php:222
 msgid "showForm() not implemented."
 msgstr "showForm() não implementado."
 
 #. TRANS: Client error message
-#: lib/adminpanelaction.php:250
 msgid "saveSettings() not implemented."
 msgstr "saveSettings() não implementado."
 
 #. TRANS: Client error message thrown if design settings could not be deleted in
 #. TRANS: the admin panel Design.
-#: lib/adminpanelaction.php:274
 msgid "Unable to delete design setting."
 msgstr "Não foi possível excluir as configurações da aparência."
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:337
 msgid "Basic site configuration"
 msgstr "Configuração básica do site"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:339
 msgctxt "MENU"
 msgid "Site"
 msgstr "Site"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:345
 msgid "Design configuration"
 msgstr "Configuração da aparência"
 
 #. TRANS: Menu item for site administration
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/adminpanelaction.php:347 lib/groupnav.php:135
 msgctxt "MENU"
 msgid "Design"
 msgstr "Aparência"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:353
 msgid "User configuration"
 msgstr "Configuração do usuário"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:110
 msgid "User"
 msgstr "Usuário"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:361
 msgid "Access configuration"
 msgstr "Configuração do acesso"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:369
 msgid "Paths configuration"
 msgstr "Configuração dos caminhos"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:377
 msgid "Sessions configuration"
 msgstr "Configuração das sessões"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:385
 msgid "Edit site notice"
 msgstr "Editar os avisos do site"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:387
 msgid "Site notice"
 msgstr "Avisos do site"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:393
 msgid "Snapshots configuration"
 msgstr "Configurações das estatísticas"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:401
 msgid "Set site license"
 msgstr ""
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:409
 #, fuzzy
 msgid "Plugins configuration"
 msgstr "Configuração dos caminhos"
 
 #. TRANS: Client error 401.
-#: lib/apiauth.php:111
 msgid "API resource requires read-write access, but you only have read access."
 msgstr ""
 "Os recursos de API exigem acesso de leitura e escrita, mas você possui "
 "somente acesso de leitura."
 
 #. TRANS: OAuth exception thrown when no application is found for a given consumer key.
-#: lib/apiauth.php:177
 msgid "No application for that consumer key."
 msgstr "Não foi encontrado nenhuma aplicação para essa chave de consumidor."
 
-#: lib/apiauth.php:202 lib/apiauth.php:284
 msgid "Not allowed to use API."
 msgstr ""
 
 #. TRANS: OAuth exception given when an incorrect access token was given for a user.
-#: lib/apiauth.php:225
 msgid "Bad access token."
 msgstr "Token de acesso incorreto."
 
 #. TRANS: OAuth exception given when no user was found for a given token (no token was found).
-#: lib/apiauth.php:230
 msgid "No user for that token."
 msgstr "Nenhum usuário para esse código."
 
 #. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel".
 #. TRANS: Client error thrown when authentication fails.
-#: lib/apiauth.php:272 lib/apiauth.php:302
 msgid "Could not authenticate you."
 msgstr "Não foi possível autenticá-lo."
 
 #. TRANS: Server error displayed when trying to create an anynymous OAuth consumer.
-#: lib/apioauthstore.php:45
 #, fuzzy
 msgid "Could not create anonymous consumer."
 msgstr "Não foi possível criar os apelidos."
 
 #. TRANS: Server error displayed when trying to create an anynymous OAuth application.
-#: lib/apioauthstore.php:69
 #, fuzzy
 msgid "Could not create anonymous OAuth application."
 msgstr "Não foi possível criar a aplicação."
 
 #. TRANS: Exception thrown when no token association could be found.
-#: lib/apioauthstore.php:151
 msgid ""
 "Could not find a profile and application associated with the request token."
 msgstr ""
 
 #. TRANS: Exception thrown when no access token can be issued.
-#: lib/apioauthstore.php:209
 #, fuzzy
 msgid "Could not issue access token."
 msgstr "Não foi possível inserir a mensagem."
 
-#: lib/apioauthstore.php:317
 msgid "Database error inserting OAuth application user."
 msgstr ""
 "Erro no banco de dados durante a inserção do usuário da aplicativo OAuth."
 
-#: lib/apioauthstore.php:345
 #, fuzzy
 msgid "Database error updating OAuth application user."
 msgstr ""
 "Erro no banco de dados durante a inserção do usuário da aplicativo OAuth."
 
 #. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
-#: lib/apioauthstore.php:371
 msgid "Tried to revoke unknown token."
 msgstr "Tentou revogar um código desconhecido."
 
 #. TRANS: Exception thrown when an attempt is made to remove a revoked token.
-#: lib/apioauthstore.php:376
 msgid "Failed to delete revoked token."
 msgstr "Falha ao eliminar código revogado."
 
 #. TRANS: Form input field label for application icon.
-#: lib/applicationeditform.php:177
 msgid "Icon"
 msgstr "Ícone"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:182
 msgid "Icon for this application"
 msgstr "Ícone para esta aplicação"
 
 #. TRANS: Form input field instructions.
 #. TRANS: %d is the number of available characters for the description.
-#: lib/applicationeditform.php:201
 #, fuzzy, php-format
 msgid "Describe your application in %d character"
 msgid_plural "Describe your application in %d characters"
@@ -7790,211 +6429,172 @@ msgstr[0] "Descreva a sua aplicação em %d caracteres"
 msgstr[1] "Descreva a sua aplicação em %d caracteres"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:205
 msgid "Describe your application"
 msgstr "Descreva sua aplicação"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:216
 msgid "URL of the homepage of this application"
 msgstr "URL do site desta aplicação"
 
 #. TRANS: Form input field label.
-#: lib/applicationeditform.php:218
 msgid "Source URL"
 msgstr "URL da fonte"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:225
 msgid "Organization responsible for this application"
 msgstr "Organização responsável por esta aplicação"
 
 #. TRANS: Form input field label.
-#: lib/applicationeditform.php:227
 msgid "Organization"
 msgstr "Organização"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:234
 msgid "URL for the homepage of the organization"
 msgstr "URL para o site da organização"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:243
 msgid "URL to redirect to after authentication"
 msgstr "URL para o redirecionamento após a autenticação"
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:271
 msgid "Browser"
 msgstr "Navegador"
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:288
 msgid "Desktop"
 msgstr "Desktop"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:290
 msgid "Type of application, browser or desktop"
 msgstr "Tipo de aplicação: navegador ou desktop"
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:314
 msgid "Read-only"
 msgstr "Somente leitura"
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:334
 msgid "Read-write"
 msgstr "Leitura e escrita"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:336
 msgid "Default access for this application: read-only, or read-write"
 msgstr ""
 "Acesso padrão para esta aplicação: somente leitura ou leitura e escrita"
 
 #. TRANS: Submit button title.
-#: lib/applicationeditform.php:353
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: lib/applicationlist.php:247
 msgid " by "
 msgstr ""
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:260
 msgid "read-write"
 msgstr "leitura e escrita"
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:262
 msgid "read-only"
 msgstr "somente leitura"
 
 #. TRANS: Used in application list. %1$s is a modified date, %2$s is access type ("read-write" or "read-only")
-#: lib/applicationlist.php:268
 #, php-format
 msgid "Approved %1$s - \"%2$s\" access."
 msgstr "Aprovado em %1$s - acesso \"%2$s\"."
 
 #. TRANS: Access token in the application list.
 #. TRANS: %s are the first 7 characters of the access token.
-#: lib/applicationlist.php:282
 #, php-format
 msgid "Access token starting with: %s"
 msgstr ""
 
 #. TRANS: Button label
-#: lib/applicationlist.php:298
 msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "Revogar"
 
-#: lib/atom10feed.php:113
 msgid "Author element must contain a name element."
 msgstr ""
 
 #. TRANS: Server exception thrown when using the method setActivitySubject() in the class Atom10Feed.
-#: lib/atom10feed.php:160
 #, fuzzy
 msgid "Do not use this method!"
 msgstr "Não excluir este grupo"
 
 #. TRANS: Title.
-#: lib/attachmentnoticesection.php:67
 msgid "Notices where this attachment appears"
 msgstr "Mensagens onde este anexo aparece"
 
 #. TRANS: Title.
-#: lib/attachmenttagcloudsection.php:48
 msgid "Tags for this attachment"
 msgstr "Etiquetas para este anexo"
 
 #. TRANS: Exception thrown when a password change fails.
-#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:227
 #, fuzzy
 msgid "Password changing failed."
 msgstr "Não foi possível alterar a senha"
 
 #. TRANS: Exception thrown when a password change attempt fails because it is not allowed.
-#: lib/authenticationplugin.php:238
 #, fuzzy
 msgid "Password changing is not allowed."
 msgstr "Não é permitido alterar a senha"
 
 #. TRANS: Title for the form to block a user.
-#: lib/blockform.php:68
 msgid "Block"
 msgstr "Bloquear"
 
 #. TRANS: Description of the form to block a user.
-#: lib/blockform.php:79
 msgid "Block this user"
 msgstr "Bloquear este usuário"
 
 #. TRANS: Title for command results.
-#: lib/channel.php:104 lib/channel.php:125
 msgid "Command results"
 msgstr "Resultados do comando"
 
 #. TRANS: Title for command results.
-#: lib/channel.php:138
 #, fuzzy
 msgid "AJAX error"
 msgstr "Erro no Ajax"
 
 #. TRANS: E-mail subject when a command has completed.
-#: lib/channel.php:177 lib/mailhandler.php:143
 msgid "Command complete"
 msgstr "O comando foi completado"
 
 #. TRANS: E-mail subject when a command has failed.
-#: lib/channel.php:188
 msgid "Command failed"
 msgstr "O comando falhou"
 
 #. TRANS: Command exception text shown when a notice ID is requested that does not exist.
-#: lib/command.php:82 lib/command.php:106
 msgid "Notice with that id does not exist."
 msgstr "Não existe uma mensagem com essa id."
 
 #. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
 #. TRANS: Error text shown when a last user notice is requested and it does not exist.
-#: lib/command.php:99 lib/command.php:642
 msgid "User has no last notice."
 msgstr "O usuário não tem nenhuma \"última mensagem\"."
 
 #. TRANS: Message given requesting a profile for a non-existing user.
 #. TRANS: %s is the nickname of the user for which the profile could not be found.
-#: lib/command.php:128
 #, php-format
 msgid "Could not find a user with nickname %s."
 msgstr "Não foi possível encontrar nenhum usuário com a identificação %s."
 
 #. TRANS: Message given getting a non-existing user.
 #. TRANS: %s is the nickname of the user that could not be found.
-#: lib/command.php:148
 #, php-format
 msgid "Could not find a local user with nickname %s."
 msgstr ""
 "Não foi possível encontrar nenhum usuário local com a identificação %s."
 
 #. TRANS: Error text shown when an unimplemented command is given.
-#: lib/command.php:183
 msgid "Sorry, this command is not yet implemented."
 msgstr "Desculpe, mas esse comando ainda não foi implementado."
 
 #. TRANS: Command exception text shown when a user tries to nudge themselves.
-#: lib/command.php:229
 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr "Não faz muito sentido chamar a sua própria atenção!"
 
 #. TRANS: Message given having nudged another user.
 #. TRANS: %s is the nickname of the user that was nudged.
-#: lib/command.php:238
 #, php-format
 msgid "Nudge sent to %s."
 msgstr "Foi enviada a chamada de atenção para %s."
@@ -8003,7 +6603,6 @@ msgstr "Foi enviada a chamada de atenção para %s."
 #. TRANS: %1$s is the number of other user the user is subscribed to.
 #. TRANS: %2$s is the number of users that are subscribed to the user.
 #. TRANS: %3$s is the number of notices the user has sent.
-#: lib/command.php:268
 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"
@@ -8015,40 +6614,34 @@ msgstr ""
 "Mensagens: %3$s"
 
 #. TRANS: Error message text shown when a favorite could not be set because it has already been favorited.
-#: lib/command.php:298
 #, fuzzy
 msgid "Could not create favorite: already favorited."
 msgstr "Não foi possível criar a favorita."
 
 #. TRANS: Text shown when a notice has been marked as favourite successfully.
-#: lib/command.php:324
 msgid "Notice marked as fave."
 msgstr "Mensagem marcada como favorita."
 
 #. TRANS: Message given having added a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:369
 #, php-format
 msgid "%1$s joined group %2$s."
 msgstr "%1$s associou-se ao grupo %2$s."
 
 #. TRANS: Message given having removed a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:417
 #, php-format
 msgid "%1$s left group %2$s."
 msgstr "%1$s deixou o grupo %2$s."
 
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: lib/command.php:438
 #, fuzzy, php-format
 msgctxt "WHOIS"
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
 
 #. TRANS: Whois output. %s is the full name of the queried user.
-#: lib/command.php:442
 #, php-format
 msgid "Fullname: %s"
 msgstr "Nome completo: %s"
@@ -8056,7 +6649,6 @@ msgstr "Nome completo: %s"
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a location.
-#: lib/command.php:446 lib/mail.php:275
 #, php-format
 msgid "Location: %s"
 msgstr "Localização: %s"
@@ -8064,20 +6656,17 @@ msgstr "Localização: %s"
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a homepage.
-#: lib/command.php:450 lib/mail.php:279
 #, php-format
 msgid "Homepage: %s"
 msgstr "Site: %s"
 
 #. TRANS: Whois output. %s is the bio information of the queried user.
-#: lib/command.php:454
 #, php-format
 msgid "About: %s"
 msgstr "Sobre: %s"
 
 #. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).
 #. TRANS: %s is a remote profile.
-#: lib/command.php:483
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
@@ -8088,7 +6677,6 @@ msgstr ""
 
 #. TRANS: Message given if content is too long. %1$sd is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:500
 #, fuzzy, php-format
 msgid "Message too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
@@ -8097,26 +6685,26 @@ msgstr[0] ""
 msgstr[1] ""
 "A mensagem é muito extensa - o máximo são %1$d caracteres e você enviou %2$d."
 
+#. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
+msgid "You can't send a message to this user."
+msgstr "Você não pode enviar mensagens para este usuário."
+
 #. TRANS: Error text shown sending a direct message fails with an unknown reason.
-#: lib/command.php:528
 msgid "Error sending direct message."
 msgstr "Ocorreu um erro durante o envio da mensagem direta."
 
 #. TRANS: Message given having repeated a notice from another user.
 #. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:565
 #, php-format
 msgid "Notice from %s repeated."
 msgstr "A mensagem de %s foi repetida."
 
 #. TRANS: Error text shown when repeating a notice fails with an unknown reason.
-#: lib/command.php:568
 msgid "Error repeating notice."
 msgstr "Erro na repetição da mensagem."
 
 #. TRANS: Message given if content of a notice for a reply is too long. %1$d is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:603
 #, fuzzy, php-format
 msgid "Notice too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Notice too long - maximum is %1$d characters, you sent %2$d."
@@ -8127,80 +6715,66 @@ msgstr[1] ""
 
 #. TRANS: Text shown having sent a reply to a notice successfully.
 #. TRANS: %s is the nickname of the user of the notice the reply was sent to.
-#: lib/command.php:616
 #, php-format
 msgid "Reply to %s sent."
 msgstr "A resposta para %s foi enviada."
 
 #. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
-#: lib/command.php:619
 msgid "Error saving notice."
 msgstr "Erro no salvamento da mensagem."
 
 #. TRANS: Error text shown when no username was provided when issuing a subscribe command.
-#: lib/command.php:666
 msgid "Specify the name of the user to subscribe to."
 msgstr "Especifique o nome do usuário que será assinado."
 
 #. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
-#: lib/command.php:675
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "Não é possível assinar perfis OMB com comandos."
 
 #. TRANS: Text shown after having subscribed to another user successfully.
 #. TRANS: %s is the name of the user the subscription was requested for.
-#: lib/command.php:683
 #, php-format
 msgid "Subscribed to %s."
 msgstr "Foi efetuada a assinatura de $s."
 
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.
-#: lib/command.php:704 lib/command.php:815
 msgid "Specify the name of the user to unsubscribe from."
 msgstr "Especifique o nome do usuário cuja assinatura será cancelada."
 
 #. TRANS: Text shown after having unsubscribed from another user successfully.
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:715
 #, php-format
 msgid "Unsubscribed from %s."
 msgstr "Foi cancelada a assinatura de %s."
 
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
-#: lib/command.php:735 lib/command.php:761
 msgid "Command not yet implemented."
 msgstr "O comando não foi implementado ainda."
 
 #. TRANS: Text shown when issuing the command "off" successfully.
-#: lib/command.php:739
 msgid "Notification off."
 msgstr "Notificação desligada."
 
 #. TRANS: Error text shown when the command "off" fails for an unknown reason.
-#: lib/command.php:742
 msgid "Can't turn off notification."
 msgstr "Não é possível desligar a notificação."
 
 #. TRANS: Text shown when issuing the command "on" successfully.
-#: lib/command.php:765
 msgid "Notification on."
 msgstr "Notificação ligada."
 
 #. TRANS: Error text shown when the command "on" fails for an unknown reason.
-#: lib/command.php:768
 msgid "Can't turn on notification."
 msgstr "Não é possível ligar a notificação."
 
 #. TRANS: Error text shown when issuing the login command while login is disabled.
-#: lib/command.php:782
 msgid "Login command is disabled."
 msgstr "O comando para autenticação está desabilitado."
 
 #. TRANS: Text shown after issuing the login command successfully.
 #. TRANS: %s is a logon link..
-#: lib/command.php:795
 #, php-format
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
@@ -8209,20 +6783,17 @@ msgstr ""
 
 #. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:824
 #, php-format
 msgid "Unsubscribed %s."
 msgstr "Foi cancelada a assinatura de %s."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
-#: lib/command.php:842
 msgid "You are not subscribed to anyone."
 msgstr "Você não está assinando ninguém."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
-#: lib/command.php:847
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Você já está assinando esta pessoa:"
@@ -8230,14 +6801,12 @@ msgstr[1] "Você já está assinando estas pessoas:"
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user
 #. TRANS: (followers) without having any subscribers.
-#: lib/command.php:869
 msgid "No one is subscribed to you."
 msgstr "Ninguém o assinou ainda."
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
-#: lib/command.php:874
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Esta pessoa está assinando você:"
@@ -8245,21 +6814,18 @@ msgstr[1] "Estas pessoas estão assinando você:"
 
 #. TRANS: Text shown after requesting groups a user is subscribed to without having
 #. TRANS: any group subscriptions.
-#: lib/command.php:896
 msgid "You are not a member of any groups."
 msgstr "Você não é membro de nenhum grupo."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
-#: lib/command.php:901
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "Você é membro deste grupo:"
 msgstr[1] "Você é membro destes grupos:"
 
 #. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-#: lib/command.php:916
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -8341,71 +6907,58 @@ msgstr ""
 "tracking -  não implementado ainda\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:36
 #, fuzzy
 msgid "No configuration file found."
 msgstr "Não foi encontrado nenhum arquivo de configuração. "
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:39
 #, fuzzy
 msgid "I looked for configuration files in the following places:"
 msgstr "Eu procurei pelos arquivos de configuração nos seguintes lugares: "
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:42
 msgid "You may wish to run the installer to fix this."
 msgstr "Você pode querer executar o instalador para corrigir isto."
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:46
 msgid "Go to the installer."
 msgstr "Ir para o instalador."
 
-#: lib/dberroraction.php:59
 msgid "Database error"
 msgstr "Erro no banco de dados"
 
 #. TRANS: Description of form for deleting a user.
-#: lib/deleteuserform.php:75
 msgid "Delete this user"
 msgstr "Excluir este usuário"
 
-#: lib/designform.php:114
 #, fuzzy
 msgid "Change design"
 msgstr "Salvar a aparência"
 
 #. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: lib/designform.php:131
 msgid "Change colours"
 msgstr "Alterar a cor"
 
 #. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: lib/designform.php:138
 msgid "Use defaults"
 msgstr "Usar o padrão|"
 
 #. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: lib/designform.php:140
 msgid "Restore default designs"
 msgstr "Restaura a aparência padrão"
 
 #. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: lib/designform.php:148
 msgid "Reset back to default"
 msgstr "Restaura de volta ao padrão"
 
 #. TRANS: Label in form on profile design page.
 #. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
-#: lib/designform.php:158
 msgid "Upload file"
 msgstr "Enviar arquivo"
 
 #. TRANS: Instructions for form on profile design page.
-#: lib/designform.php:163
 #, fuzzy
 msgid ""
 "You can upload your personal background image. The maximum file size is 2Mb."
@@ -8413,49 +6966,41 @@ msgstr ""
 "Você pode enviar sua imagem de fundo. O tamanho máximo do arquivo é de 2Mb."
 
 #. TRANS: Radio button on profile design page that will enable use of the uploaded profile image.
-#: lib/designform.php:194
 #, fuzzy
 msgctxt "RADIO"
 msgid "On"
 msgstr "Ativado"
 
 #. TRANS: Radio button on profile design page that will disable use of the uploaded profile image.
-#: lib/designform.php:211
 #, fuzzy
 msgctxt "RADIO"
 msgid "Off"
 msgstr "Desativado"
 
 #. TRANS: Title for button on profile design page to save settings.
-#: lib/designform.php:322
 msgid "Save design"
 msgstr "Salvar a aparência"
 
 #. TRANS: Error message displayed if design settings could not be saved.
 #. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
-#: lib/designsettings.php:216 lib/designsettings.php:238
 msgid "Couldn't update your design."
 msgstr "Não foi possível atualizar a aparência."
 
 #. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
-#: lib/designsettings.php:244
 msgid "Design defaults restored."
 msgstr "A aparência padrão foi restaurada."
 
 #. TRANS: Exception. %s is an ID.
-#: lib/discovery.php:153
 #, fuzzy, php-format
 msgid "Unable to find services for %s."
 msgstr "Não foi possível revogar o acesso para a aplicação: %s."
 
 #. TRANS: Form legend for removing the favourite status for a favourite notice.
 #. TRANS: Title for button text for removing the favourite status for a favourite notice.
-#: lib/disfavorform.php:108 lib/disfavorform.php:140
 msgid "Disfavor this notice"
 msgstr "Excluir das favoritas"
 
 #. TRANS: Button text for removing the favourite status for a favourite notice.
-#: lib/disfavorform.php:136
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Disfavor favorite"
@@ -8463,97 +7008,76 @@ msgstr "Desmarcar a favorita"
 
 #. TRANS: Form legend for adding the favourite status to a notice.
 #. TRANS: Title for button text for adding the favourite status to a notice.
-#: lib/favorform.php:108 lib/favorform.php:139
 msgid "Favor this notice"
 msgstr "Acrescentar às favoritas"
 
 #. TRANS: Button text for adding the favourite status to a notice.
-#: lib/favorform.php:135
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Favor"
 msgstr "Tornar favorita"
 
-#: lib/feed.php:84
 msgid "RSS 1.0"
 msgstr "RSS 1.0"
 
-#: lib/feed.php:86
 msgid "RSS 2.0"
 msgstr "RSS 2.0"
 
-#: lib/feed.php:88
 msgid "Atom"
 msgstr "Atom"
 
-#: lib/feed.php:90
 msgid "FOAF"
 msgstr "FOAF"
 
-#: lib/feedimporter.php:75
 #, fuzzy
 msgid "Not an atom feed."
 msgstr "Todos os membros"
 
-#: lib/feedimporter.php:82
 msgid "No author in the feed."
 msgstr ""
 
-#: lib/feedimporter.php:89
 msgid "Can't import without a user."
 msgstr ""
 
 #. TRANS: Header for feed links (h2).
-#: lib/feedlist.php:66
 msgid "Feeds"
 msgstr ""
 
-#: lib/galleryaction.php:128
 msgid "All"
 msgstr "Todas"
 
-#: lib/galleryaction.php:136
 msgid "Select tag to filter"
 msgstr "Selecione a etiqueta para filtrar"
 
-#: lib/galleryaction.php:137
 msgid "Tag"
 msgstr "Etiqueta"
 
-#: lib/galleryaction.php:138
 msgid "Choose a tag to narrow list"
 msgstr "Selecione uma etiqueta para reduzir a lista"
 
-#: lib/galleryaction.php:140
 msgid "Go"
 msgstr "Ir"
 
-#: lib/grantroleform.php:91
 #, php-format
 msgid "Grant this user the \"%s\" role"
 msgstr "Associa o papel \"%s\" a este usuário"
 
-#: lib/groupeditform.php:147
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "1-64 letras minúsculas ou números, sem pontuações ou espaços."
 
-#: lib/groupeditform.php:156
 #, fuzzy
 msgid "URL of the homepage or blog of the group or topic."
 msgstr "URL para o site ou blog do grupo ou tópico"
 
-#: lib/groupeditform.php:161
 msgid "Describe the group or topic"
 msgstr "Descreva o grupo ou tópico"
 
-#: lib/groupeditform.php:163
 #, fuzzy, php-format
 msgid "Describe the group or topic in %d character or less"
 msgid_plural "Describe the group or topic in %d characters or less"
 msgstr[0] "Descreva o grupo ou tópico em %d caracteres."
 msgstr[1] "Descreva o grupo ou tópico em %d caracteres."
 
-#: lib/groupeditform.php:175
 #, fuzzy
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\"."
@@ -8561,7 +7085,6 @@ msgstr ""
 "Localização do grupo, caso tenha alguma, como \"cidade, estado (ou região), "
 "país\""
 
-#: lib/groupeditform.php:183
 #, fuzzy, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -8575,70 +7098,60 @@ msgstr[1] ""
 "Apelidos extras para o grupo, separado por vírgulas ou espaços, no máximo %d"
 
 #. TRANS: Menu item in the group navigation page.
-#: lib/groupnav.php:86
 msgctxt "MENU"
 msgid "Group"
 msgstr "Grupo"
 
 #. TRANS: Tooltip for menu item in the group navigation page.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:89
 #, php-format
 msgctxt "TOOLTIP"
 msgid "%s group"
 msgstr "Grupo %s"
 
 #. TRANS: Menu item in the group navigation page.
-#: lib/groupnav.php:95
 msgctxt "MENU"
 msgid "Members"
 msgstr "Membros"
 
 #. TRANS: Tooltip for menu item in the group navigation page.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:98
 #, php-format
 msgctxt "TOOLTIP"
 msgid "%s group members"
 msgstr "Membros do grupo %s"
 
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/groupnav.php:108
 msgctxt "MENU"
 msgid "Blocked"
 msgstr "Bloqueado"
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:111
 #, php-format
 msgctxt "TOOLTIP"
 msgid "%s blocked users"
 msgstr "Usuários bloqueados de %s"
 
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "Administrar"
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:120
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Edit %s group properties"
 msgstr "Editar propriedades do grupo %s"
 
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/groupnav.php:126
 msgctxt "MENU"
 msgid "Logo"
 msgstr "Logotipo"
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:129
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Add or edit %s logo"
@@ -8646,69 +7159,57 @@ msgstr "Adicionar ou editar o logotipo de %s"
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:138
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Add or edit %s design"
 msgstr "Adicionar ou editar a aparência de %s"
 
 #. TRANS: Title for groups with the most members section.
-#: lib/groupsbymemberssection.php:71
 msgid "Groups with most members"
 msgstr "Grupos com mais membros"
 
 #. TRANS: Title for groups with the most posts section.
-#: lib/groupsbypostssection.php:71
 msgid "Groups with most posts"
 msgstr "Grupos com mais mensagens"
 
 #. TRANS: Title for group tag cloud section.
 #. TRANS: %s is a group name.
-#: lib/grouptagcloudsection.php:57
 #, php-format
 msgid "Tags in %s group's notices"
 msgstr "Etiquetas nas mensagens do grupo %s"
 
 #. TRANS: Client exception 406
-#: lib/htmloutputter.php:104
 msgid "This page is not available in a media type you accept"
 msgstr "Esta página não está disponível em um tipo de mídia que você aceita"
 
 #. TRANS: Exception thrown when trying to upload an unsupported image file format.
-#: lib/imagefile.php:73
 msgid "Unsupported image file format."
 msgstr "Formato de imagem não suportado."
 
 #. TRANS: Exception thrown when too large a file is uploaded.
 #. TRANS: %s is the maximum file size, for example "500b", "10kB" or "2MB".
-#: lib/imagefile.php:91
 #, php-format
 msgid "That file is too big. The maximum file size is %s."
 msgstr "O arquivo é muito grande. O tamanho máximo é de %s."
 
 #. TRANS: Exception thrown when uploading an image and that action could not be completed.
-#: lib/imagefile.php:97
 msgid "Partial upload."
 msgstr "Envio parcial."
 
 #. TRANS: Exception thrown when uploading a file as image that is not an image or is a corrupt file.
-#: lib/imagefile.php:115
 msgid "Not an image or corrupt file."
 msgstr "Imagem inválida ou arquivo corrompido."
 
 #. TRANS: Exception thrown during resize when image has been registered as present, but is no longer there.
-#: lib/imagefile.php:178
 msgid "Lost our file."
 msgstr "Nosso arquivo foi perdido."
 
 #. TRANS: Exception thrown when trying to resize an unknown file type.
 #. TRANS: Exception thrown when trying resize an unknown file type.
-#: lib/imagefile.php:216 lib/imagefile.php:257
 msgid "Unknown file type"
 msgstr "Tipo de arquivo desconhecido"
 
 #. TRANS: Number of megabytes. %d is the number.
-#: lib/imagefile.php:303
 #, fuzzy, php-format
 msgid "%dMB"
 msgid_plural "%dMB"
@@ -8716,7 +7217,6 @@ msgstr[0] "Mb"
 msgstr[1] "Mb"
 
 #. TRANS: Number of kilobytes. %d is the number.
-#: lib/imagefile.php:307
 #, fuzzy, php-format
 msgid "%dkB"
 msgid_plural "%dkB"
@@ -8724,14 +7224,12 @@ msgstr[0] "Kb"
 msgstr[1] "Kb"
 
 #. TRANS: Number of bytes. %d is the number.
-#: lib/imagefile.php:310
 #, php-format
 msgid "%dB"
 msgid_plural "%dB"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/implugin.php:262
 #, php-format
 msgid ""
 "User \"%s\" on %s has said that your %s screenname belongs to them. If "
@@ -8741,52 +7239,43 @@ msgid ""
 "message."
 msgstr ""
 
-#: lib/implugin.php:349
 #, php-format
 msgid "Unknown inbox source %d."
 msgstr "Fonte da caixa de entrada desconhecida %d."
 
-#: lib/implugin.php:485
-#, fuzzy, php-format
+#, php-format
 msgid "Message too long - maximum is %1$d characters, you sent %2$d."
 msgstr ""
 "A mensagem é muito extensa - o máximo são %1$d caracteres e você enviou %2$d."
 
-#: lib/leaveform.php:114
 msgid "Leave"
 msgstr "Sair"
 
 #. TRANS: Menu item for logging in to the StatusNet site.
-#: lib/logingroupnav.php:77
 msgctxt "MENU"
 msgid "Login"
 msgstr "Entrar"
 
 #. TRANS: Title for menu item for logging in to the StatusNet site.
-#: lib/logingroupnav.php:79
 msgid "Login with a username and password"
 msgstr "Autentique-se com um nome de usuário e uma senha"
 
 #. TRANS: Menu item for registering with the StatusNet site.
-#: lib/logingroupnav.php:85
 msgctxt "MENU"
 msgid "Register"
 msgstr "Registrar-se"
 
 #. TRANS: Title for menu item for registering with the StatusNet site.
-#: lib/logingroupnav.php:87
 msgid "Sign up for a new account"
 msgstr "Cadastre-se para uma nova conta"
 
 #. TRANS: Subject for address confirmation email.
-#: lib/mail.php:172
 msgid "Email address confirmation"
 msgstr "Confirmação do endereço de e-mail"
 
 #. TRANS: Body for address confirmation email.
 #. TRANS: %1$s is the addressed user's nickname, %2$s is the StatusNet sitename,
 #. TRANS: %3$s is the URL to confirm at.
-#: lib/mail.php:177
 #, fuzzy, php-format
 msgid ""
 "Hey, %1$s.\n"
@@ -8817,14 +7306,12 @@ msgstr ""
 
 #. TRANS: Subject of new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
-#: lib/mail.php:243
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1$s agora está acompanhando suas mensagens no %2$s."
 
 #. TRANS: This is a paragraph in a new-subscriber e-mail.
 #. TRANS: %s is a URL where the subscriber can be reported as abusive.
-#: lib/mail.php:250
 #, php-format
 msgid ""
 "If you believe this account is being used abusively, you can block them from "
@@ -8839,7 +7326,6 @@ msgstr ""
 #. TRANS: %3$s is the subscriber's profile URL, %4$s is the subscriber's location (or empty)
 #. TRANS: %5$s is the subscriber's homepage URL (or empty), %6%s is the subscriber's bio (or empty)
 #. TRANS: %7$s is a link to the addressed user's e-mail settings.
-#: lib/mail.php:260
 #, fuzzy, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -8866,14 +7352,12 @@ msgstr ""
 
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is biographical information.
-#: lib/mail.php:283
 #, php-format
 msgid "Bio: %s"
 msgstr "Descrição: %s"
 
 #. TRANS: Subject of notification mail for new posting email address.
 #. TRANS: %s is the StatusNet sitename.
-#: lib/mail.php:312
 #, php-format
 msgid "New email address for posting to %s"
 msgstr "Novo endereço de e-mail para publicar no %s"
@@ -8881,7 +7365,6 @@ msgstr "Novo endereço de e-mail para publicar no %s"
 #. TRANS: Body of notification mail for new posting email address.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is the e-mail address to send
 #. TRANS: to to post by e-mail, %3$s is a URL to more instructions.
-#: lib/mail.php:318
 #, fuzzy, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -8904,19 +7387,16 @@ msgstr ""
 
 #. TRANS: Subject line for SMS-by-email notification messages.
 #. TRANS: %s is the posting user's nickname.
-#: lib/mail.php:439
 #, php-format
 msgid "%s status"
 msgstr "Mensagem de %s"
 
 #. TRANS: Subject line for SMS-by-email address confirmation message.
-#: lib/mail.php:465
 msgid "SMS confirmation"
 msgstr "Confirmação de SMS"
 
 #. TRANS: Main body heading for SMS-by-email address confirmation message.
 #. TRANS: %s is the addressed user's nickname.
-#: lib/mail.php:469
 #, php-format
 msgid "%s: confirm you own this phone number with this code:"
 msgstr ""
@@ -8925,7 +7405,6 @@ msgstr ""
 
 #. TRANS: Subject for 'nudge' notification email.
 #. TRANS: %s is the nudging user.
-#: lib/mail.php:490
 #, fuzzy, php-format
 msgid "You have been nudged by %s"
 msgstr "Você teve a atenção chamada por %s"
@@ -8933,7 +7412,6 @@ msgstr "Você teve a atenção chamada por %s"
 #. TRANS: Body for 'nudge' notification email.
 #. TRANS: %1$s is the nuding user's long name, $2$s is the nudging user's nickname,
 #. TRANS: %3$s is a URL to post notices at, %4$s is the StatusNet sitename.
-#: lib/mail.php:497
 #, php-format
 msgid ""
 "%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -8962,7 +7440,6 @@ msgstr ""
 
 #. TRANS: Subject for direct-message notification email.
 #. TRANS: %s is the sending user's nickname.
-#: lib/mail.php:544
 #, php-format
 msgid "New private message from %s"
 msgstr "Nova mensagem particular de %s"
@@ -8971,7 +7448,6 @@ msgstr "Nova mensagem particular de %s"
 #. TRANS: %1$s is the sending user's long name, %2$s is the sending user's nickname,
 #. TRANS: %3$s is the message content, %4$s a URL to the message,
 #. TRANS: %5$s is the StatusNet sitename.
-#: lib/mail.php:552
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -9006,7 +7482,6 @@ msgstr ""
 
 #. TRANS: Subject for favorite notification e-mail.
 #. TRANS: %1$s is the adding user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:604
 #, fuzzy, php-format
 msgid "%1$s (@%2$s) added your notice as a favorite"
 msgstr "%s (@%s) marcou sua mensagem como favorita"
@@ -9016,7 +7491,6 @@ msgstr "%s (@%s) marcou sua mensagem como favorita"
 #. TRANS: %3$s is a URL to the faved notice, %4$s is the faved notice text,
 #. TRANS: %5$s is a URL to all faves of the adding user, %6$s is the StatusNet sitename,
 #. TRANS: %7$s is the adding user's nickname.
-#: lib/mail.php:611
 #, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -9054,7 +7528,6 @@ msgstr ""
 "%6$s\n"
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:669
 #, php-format
 msgid ""
 "The full conversation can be read here:\n"
@@ -9067,7 +7540,6 @@ msgstr ""
 
 #. TRANS: E-mail subject for notice notification.
 #. TRANS: %1$s is the sending user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:677
 #, fuzzy, php-format
 msgid "%1$s (@%2$s) sent a notice to your attention"
 msgstr "%s (@%s) enviou uma mensagem citando você"
@@ -9078,7 +7550,6 @@ msgstr "%s (@%s) enviou uma mensagem citando você"
 #. TRANS: %5$s is a URL to the full conversion if it exists (otherwise empty),
 #. TRANS: %6$s is a URL to reply to the notice, %7$s is a URL to all @-replied for the addressed user,
 #. TRANS: %8$s is a URL to the addressed user's e-mail settings, %9$s is the sender's nickname.
-#: lib/mail.php:685
 #, php-format
 msgid ""
 "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -9128,11 +7599,9 @@ msgstr ""
 "\n"
 "P.S.: Você pode cancelar a notificações por e-mail aqui: %8$s\n"
 
-#: lib/mailbox.php:87
 msgid "Only the user can read their own mailboxes."
 msgstr "As caixas postais são legíveis somente pelo seu próprio usuário."
 
-#: lib/mailbox.php:125
 msgid ""
 "You have no private messages. You can send private message to engage other "
 "users in conversation. People can send you messages for your eyes only."
@@ -9141,55 +7610,45 @@ msgstr ""
 "privadas para envolver outras pessoas em uma conversa. Você também pode "
 "receber mensagens privadas."
 
-#: lib/mailhandler.php:37
 msgid "Could not parse message."
 msgstr "Não foi possível analisar a mensagem."
 
-#: lib/mailhandler.php:42
 msgid "Not a registered user."
 msgstr "Não é um usuário registrado."
 
-#: lib/mailhandler.php:46
 msgid "Sorry, that is not your incoming email address."
 msgstr "Desculpe-me, mas este não é seu endereço de e-mail para recebimento."
 
-#: lib/mailhandler.php:50
 msgid "Sorry, no incoming email allowed."
 msgstr "Desculpe-me, mas não é permitido o recebimento de e-mails."
 
-#: lib/mailhandler.php:229
 #, php-format
 msgid "Unsupported message type: %s"
 msgstr "Tipo de mensagem não suportado: %s"
 
 #. TRANS: Client exception thrown when a database error was thrown during a file upload operation.
-#: lib/mediafile.php:102 lib/mediafile.php:174
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
 "Ocorreu um erro no banco de dados durante o salvamento do seu arquivo. Por "
 "favor, tente novamente."
 
 #. TRANS: Client exception thrown when a file upload operation would cause a user to exceed a set quota.
-#: lib/mediafile.php:238 lib/mediafile.php:281
 msgid "File exceeds user's quota."
 msgstr "O arquivo excede a quota do usuário."
 
 #. TRANS: Client exception thrown when a file upload operation fails because the file could
 #. TRANS: not be moved from the temporary folder to the permanent file location.
-#: lib/mediafile.php:258 lib/mediafile.php:300
 msgid "File could not be moved to destination directory."
 msgstr "Não foi possível mover o arquivo para o diretório de destino."
 
 #. TRANS: Client exception thrown when a file upload operation has been stopped because the MIME
 #. TRANS: type of the uploaded file could not be determined.
-#: lib/mediafile.php:265 lib/mediafile.php:306
 msgid "Could not determine file's MIME type."
 msgstr "Não foi possível determinar o tipo MIME do arquivo."
 
 #. TRANS: Client exception thrown trying to upload a forbidden MIME type.
 #. TRANS: %1$s is the file type that was denied, %2$s is the application part of
 #. TRANS: the MIME type that was denied.
-#: lib/mediafile.php:396
 #, php-format
 msgid ""
 "\"%1$s\" is not a supported file type on this server. Try using another %2$s "
@@ -9200,84 +7659,75 @@ msgstr ""
 
 #. TRANS: Client exception thrown trying to upload a forbidden MIME type.
 #. TRANS: %s is the file type that was denied.
-#: lib/mediafile.php:401
 #, php-format
 msgid "\"%s\" is not a supported file type on this server."
 msgstr "\"%s\" não é um tipo de arquivo suportado neste servidor."
 
-#: lib/messageform.php:120
 msgid "Send a direct notice"
 msgstr "Enviar uma mensagem direta"
 
 #. TRANS Label entry in drop-down selection box in direct-message inbox/outbox. This is the default entry in the drop-down box, doubling as instructions and a brake against accidental submissions with the first user in the list.
-#: lib/messageform.php:137
 #, fuzzy
 msgid "Select recipient:"
 msgstr "Selecione uma operadora"
 
 #. TRANS Entry in drop-down selection box in direct-message inbox/outbox when no one is available to message.
-#: lib/messageform.php:150
 #, fuzzy
 msgid "No mutual subscribers."
 msgstr "Não assinado!"
 
-#: lib/messageform.php:153
 msgid "To"
 msgstr "Para"
 
-#: lib/messageform.php:184 lib/noticeform.php:236
 msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr "Enviar"
 
-#: lib/messagelist.php:77
 #, fuzzy
 msgid "Messages"
 msgstr "Mensagem"
 
-#: lib/messagelistitem.php:123 lib/noticelist.php:527
 msgid "from"
 msgstr "de"
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:178
 msgid "Nickname cannot be empty."
 msgstr ""
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:191
 #, php-format
 msgid "Nickname cannot be more than %d character long."
 msgid_plural "Nickname cannot be more than %d characters long."
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/noticeform.php:160
+#. TRANS: Form legend for notice form.
 msgid "Send a notice"
 msgstr "Enviar uma mensagem"
 
-#: lib/noticeform.php:174
+#. TRANS: Title for notice label. %s is the user's nickname.
 #, php-format
 msgid "What's up, %s?"
 msgstr "E aí, %s?"
 
-#: lib/noticeform.php:193
+#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr "Anexo"
 
-#: lib/noticeform.php:197
-msgid "Attach a file"
+#. TRANS: Title for input field to attach a file to a notice.
+#, fuzzy
+msgid "Attach a file."
 msgstr "Anexar um arquivo"
 
-#: lib/noticeform.php:212
+#. TRANS: Field label to add location to a notice.
 msgid "Share my location"
 msgstr "Divulgar minha localização"
 
-#: lib/noticeform.php:215
+#. TRANS: Text to not share location for a notice in notice form.
 msgid "Do not share my location"
 msgstr "Não divulgar minha localização"
 
-#: lib/noticeform.php:216
+#. TRANS: Timeout error text for location retrieval in notice form.
 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
 "try again later"
@@ -9286,419 +7736,318 @@ msgstr ""
 "esperado. Por favor, tente novamente mais tarde."
 
 #. TRANS: Used in coordinates as abbreviation of north
-#: lib/noticelist.php:457
 msgid "N"
 msgstr "N"
 
 #. TRANS: Used in coordinates as abbreviation of south
-#: lib/noticelist.php:459
 msgid "S"
 msgstr "S"
 
 #. TRANS: Used in coordinates as abbreviation of east
-#: lib/noticelist.php:461
 msgid "E"
 msgstr "L"
 
 #. TRANS: Used in coordinates as abbreviation of west
-#: lib/noticelist.php:463
 msgid "W"
 msgstr "O"
 
-#: lib/noticelist.php:465
 #, php-format
 msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 
-#: lib/noticelist.php:474
 msgid "at"
 msgstr "em"
 
-#: lib/noticelist.php:523
 msgid "web"
 msgstr "web"
 
-#: lib/noticelist.php:589
 msgid "in context"
 msgstr "no contexto"
 
-#: lib/noticelist.php:624
 msgid "Repeated by"
 msgstr "Repetida por"
 
-#: lib/noticelist.php:651
 msgid "Reply to this notice"
 msgstr "Responder a esta mensagem"
 
-#: lib/noticelist.php:652
 msgid "Reply"
 msgstr "Responder"
 
-#: lib/noticelist.php:678
 msgid "Delete this notice"
 msgstr "Excluir esta mensagem"
 
-#: lib/noticelist.php:696
 msgid "Notice repeated"
 msgstr "Mensagem repetida"
 
-#: lib/nudgeform.php:116
 msgid "Nudge this user"
 msgstr "Chamar a atenção deste usuário"
 
-#: lib/nudgeform.php:128
 msgid "Nudge"
 msgstr "Chamar a atenção"
 
-#: lib/nudgeform.php:128
 msgid "Send a nudge to this user"
 msgstr "Chame a atenção deste usuário"
 
-#: lib/oauthstore.php:294
 msgid "Error inserting new profile."
 msgstr "Erro ao inserir perfil novo."
 
-#: lib/oauthstore.php:302
 msgid "Error inserting avatar."
 msgstr "Erro ao inserir avatar."
 
-#: lib/oauthstore.php:322
 msgid "Error inserting remote profile."
 msgstr "Erro ao inserir perfil remoto."
 
 #. TRANS: Exception thrown when a notice is denied because it has been sent before.
-#: lib/oauthstore.php:362
 msgid "Duplicate notice."
 msgstr "Nota duplicada."
 
-#: lib/oauthstore.php:507
 msgid "Couldn't insert new subscription."
 msgstr "Não foi possível inserir a nova assinatura."
 
-#: lib/personalgroupnav.php:104
-#, fuzzy
 msgid "Replies"
 msgstr "Respostas"
 
-#: lib/personalgroupnav.php:109
-#, fuzzy
 msgid "Favorites"
 msgstr "Favoritos"
 
-#: lib/personalgroupnav.php:120
-#, fuzzy
 msgid "Inbox"
 msgstr "Recebidas"
 
-#: lib/personalgroupnav.php:121
 msgid "Your incoming messages"
 msgstr "Suas mensagens recebidas"
 
-#: lib/personalgroupnav.php:125
-#, fuzzy
 msgid "Outbox"
 msgstr "Enviadas"
 
-#: lib/personalgroupnav.php:126
 msgid "Your sent messages"
 msgstr "Suas mensagens enviadas"
 
 #. TRANS: Title for personal tag cloud section. %s is a user nickname.
-#: lib/personaltagcloudsection.php:56
 #, php-format
 msgid "Tags in %s's notices"
 msgstr "Etiquetas nas mensagens de %s"
 
 #. TRANS: Displayed as version information for a plugin if no version information was found.
-#: lib/plugin.php:126
 msgid "Unknown"
 msgstr "Desconhecido"
 
 #. TRANS: Plugin admin panel controls
-#: lib/plugindisableform.php:90
 msgctxt "plugin"
 msgid "Disable"
 msgstr ""
 
 #. TRANS: Plugin admin panel controls
-#: lib/pluginenableform.php:112
 msgctxt "plugin"
 msgid "Enable"
 msgstr ""
 
-#: lib/pluginlist.php:196
 msgctxt "plugin-description"
 msgid "(Plugin descriptions unavailable when disabled.)"
 msgstr ""
 
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:88
 msgid "Subscriptions"
 msgstr "Assinaturas"
 
 #. TRANS: Text for user subscription statistics if user has more subscriptions than displayed.
-#: lib/profileaction.php:144
 msgid "All subscriptions"
 msgstr "Todas as assinaturas"
 
 #. TRANS: H2 text for user subscriber statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:96
 msgid "Subscribers"
 msgstr "Assinantes"
 
 #. TRANS: Text for user subscription statistics if user has more subscribers than displayed.
-#: lib/profileaction.php:181
 msgid "All subscribers"
 msgstr "Todos os assinantes"
 
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:213
 msgid "User ID"
 msgstr "ID do usuário"
 
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:219
 msgid "Member since"
 msgstr "Membro desde"
 
 #. TRANS: Label for user statistics.
 #. TRANS: H2 text for user group membership statistics.
-#: lib/profileaction.php:239 lib/profileaction.php:290
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:104
 msgid "Groups"
 msgstr "Grupos"
 
 #. TRANS: Label for user statistics.
 #. TRANS: Average count of posts made per day since account registration.
-#: lib/profileaction.php:253
 msgid "Daily average"
 msgstr "Média diária"
 
 #. TRANS: Text for user group membership statistics if user has more subscriptions than displayed.
-#: lib/profileaction.php:305
 msgid "All groups"
 msgstr "Todos os grupos"
 
 #. TRANS: Server error displayed when using an unimplemented method.
-#: lib/profileformaction.php:123
 msgid "Unimplemented method."
 msgstr "Método não implementado."
 
-#: lib/publicgroupnav.php:82
 msgid "User groups"
 msgstr "Grupos de usuário"
 
-#: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
 msgid "Recent tags"
 msgstr "Etiquetas recentes"
 
-#: lib/publicgroupnav.php:88
 msgid "Featured"
 msgstr "Em destaque"
 
-#: lib/publicgroupnav.php:92
 msgid "Popular"
 msgstr "Popular"
 
-#: lib/redirectingaction.php:95
 msgid "No return-to arguments."
 msgstr "Sem argumentos return-to."
 
-#: lib/repeatform.php:107
 msgid "Repeat this notice?"
 msgstr "Repetir esta mensagem?"
 
-#: lib/repeatform.php:132
 msgid "Yes"
 msgstr "Sim"
 
-#: lib/repeatform.php:132
 msgid "Repeat this notice"
 msgstr "Repetir esta mensagem"
 
-#: lib/revokeroleform.php:91
 #, php-format
 msgid "Revoke the \"%s\" role from this user"
 msgstr "Revoga o papel \"%s\" deste usuário"
 
 #. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:1001
 #, fuzzy
 msgid "Page not found."
 msgstr "O método da API não foi encontrado!"
 
-#: lib/sandboxform.php:67
 msgid "Sandbox"
 msgstr "Isolamento"
 
-#: lib/sandboxform.php:78
 msgid "Sandbox this user"
 msgstr "Colocar este usuário em isolamento"
 
 #. TRANS: Fieldset legend for the search form.
-#: lib/searchaction.php:120
 msgid "Search site"
 msgstr "Procurar no site"
 
 #. TRANS: Used as a field label for the field where one or more keywords
 #. TRANS: for searching can be entered.
-#: lib/searchaction.php:128
 msgid "Keyword(s)"
 msgstr "Palavra(s)-chave"
 
 #. TRANS: Button text for searching site.
-#: lib/searchaction.php:130
 msgctxt "BUTTON"
 msgid "Search"
 msgstr "Pesquisar"
 
-#: lib/searchgroupnav.php:80
 msgid "People"
 msgstr "Pessoas"
 
-#: lib/searchgroupnav.php:81
 msgid "Find people on this site"
 msgstr "Encontre pessoas neste site"
 
-#: lib/searchgroupnav.php:83
 msgid "Find content of notices"
 msgstr "Encontre conteúdo de mensagens"
 
-#: lib/searchgroupnav.php:85
 msgid "Find groups on this site"
 msgstr "Encontre grupos neste site"
 
-#: lib/section.php:89
 msgid "Untitled section"
 msgstr "Seção sem título"
 
-#: lib/section.php:106
 msgid "More..."
 msgstr "Mais..."
 
-#: lib/settingsnav.php:78
 msgid "Change your profile settings"
 msgstr "Alterar as suas configurações de perfil"
 
-#: lib/settingsnav.php:83
 msgid "Upload an avatar"
 msgstr "Enviar um avatar"
 
-#: lib/settingsnav.php:88
 msgid "Change your password"
 msgstr "Alterar a sua senha"
 
-#: lib/settingsnav.php:93
 msgid "Change email handling"
 msgstr "Configurações de uso do e-mail"
 
-#: lib/settingsnav.php:98
 msgid "Design your profile"
 msgstr "Mude a aparência do seu perfil"
 
-#: lib/settingsnav.php:102
 msgid "URL"
 msgstr "Site"
 
-#: lib/settingsnav.php:103
 msgid "URL shorteners"
 msgstr ""
 
-#: lib/settingsnav.php:111
 msgid "Updates by instant messenger (IM)"
 msgstr "Atualizações via mensageiro instantâneo (MI)"
 
-#: lib/settingsnav.php:118
 msgid "Updates by SMS"
 msgstr "Atualizações via SMS"
 
-#: lib/settingsnav.php:123
-#, fuzzy
 msgid "Connections"
 msgstr "Conexões"
 
-#: lib/settingsnav.php:124
 msgid "Authorized connected applications"
 msgstr "Aplicações autorizadas conectadas"
 
-#: lib/silenceform.php:67
 msgid "Silence"
 msgstr "Silenciar"
 
-#: lib/silenceform.php:78
 msgid "Silence this user"
 msgstr "Silenciar este usuário"
 
-#: lib/subgroupnav.php:89
 #, php-format
 msgid "People %s subscribes to"
 msgstr "Assinaturas de %s"
 
-#: lib/subgroupnav.php:97
 #, php-format
 msgid "People subscribed to %s"
 msgstr "Assinantes de %s"
 
-#: lib/subgroupnav.php:105
 #, php-format
 msgid "Groups %s is a member of"
 msgstr "Grupos dos quais %s é membro"
 
-#: lib/subgroupnav.php:111
 msgid "Invite"
 msgstr "Convidar"
 
-#: lib/subgroupnav.php:112
 #, php-format
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Convide seus amigos e colegas para unir-se a você no %s"
 
-#: lib/subscribeform.php:115 lib/subscribeform.php:139
 msgid "Subscribe to this user"
 msgstr "Assinar este usuário"
 
-#: lib/subscriberspeopleselftagcloudsection.php:48
-#: lib/subscriptionspeopleselftagcloudsection.php:48
 msgid "People Tagcloud as self-tagged"
 msgstr "Nuvem de etiquetas pessoais definidas pelas próprios usuários"
 
-#: lib/subscriberspeopletagcloudsection.php:48
-#: lib/subscriptionspeopletagcloudsection.php:48
 msgid "People Tagcloud as tagged"
 msgstr "Nuvem de etiquetas pessoais definidas pelos outros usuário"
 
-#: lib/tagcloudsection.php:56
 msgid "None"
 msgstr "Nenhuma"
 
 #. TRANS: Server exception displayed if a theme name was invalid.
-#: lib/theme.php:74
 #, fuzzy
 msgid "Invalid theme name."
 msgstr "Nome de arquivo inválido."
 
-#: lib/themeuploader.php:50
 msgid "This server cannot handle theme uploads without ZIP support."
 msgstr ""
 "Este servidor não pode processar o envio de temas sem suporte ao formato ZIP."
 
-#: lib/themeuploader.php:58 lib/themeuploader.php:61
 msgid "The theme file is missing or the upload failed."
 msgstr "O arquivo do tema não foi localizado ou ocorreu uma erro no envio."
 
-#: lib/themeuploader.php:91 lib/themeuploader.php:102
-#: lib/themeuploader.php:279 lib/themeuploader.php:283
-#: lib/themeuploader.php:291 lib/themeuploader.php:298
 msgid "Failed saving theme."
 msgstr "Não foi possível salvar o tema."
 
-#: lib/themeuploader.php:147
 msgid "Invalid theme: bad directory structure."
 msgstr "Tema inválido: estrutura de diretórios incorreta."
 
-#: lib/themeuploader.php:166
 #, fuzzy, php-format
 msgid "Uploaded theme is too large; must be less than %d byte uncompressed."
 msgid_plural ""
@@ -9708,11 +8057,9 @@ msgstr[0] ""
 msgstr[1] ""
 "O tema enviado é muito grande; ele deve ter menos de %d bytes descomprimido."
 
-#: lib/themeuploader.php:179
 msgid "Invalid theme archive: missing file css/display.css"
 msgstr "Arquivo de tema inválido: está faltando o arquivo css/display.css"
 
-#: lib/themeuploader.php:219
 msgid ""
 "Theme contains invalid file or folder name. Stick with ASCII letters, "
 "digits, underscore, and minus sign."
@@ -9720,142 +8067,114 @@ msgstr ""
 "O tema contém um nome de arquivo ou de diretório inválido. Use somente "
 "caracteres ASCII, números e os sinais de sublinhado e hífen."
 
-#: lib/themeuploader.php:225
 msgid "Theme contains unsafe file extension names; may be unsafe."
 msgstr "O tema contém extensões de arquivo inseguras; pode não ser seguro."
 
-#: lib/themeuploader.php:242
 #, php-format
 msgid "Theme contains file of type '.%s', which is not allowed."
 msgstr "O tema contém um arquivo do tipo '.%s', que não é permitido."
 
-#: lib/themeuploader.php:260
 msgid "Error opening theme archive."
 msgstr "Ocorreu um erro ao abrir o arquivo do tema."
 
-#: lib/threadednoticelist.php:270
 #, php-format
-msgid "Show all %d comment"
-msgid_plural "Show all %d comments"
+msgid "Show %d reply"
+msgid_plural "Show all %d replies"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/topposterssection.php:74
 msgid "Top posters"
 msgstr "Quem mais publica"
 
 #. TRANS: Title for the form to unblock a user.
-#: lib/unblockform.php:67
 #, fuzzy
 msgctxt "TITLE"
 msgid "Unblock"
 msgstr "Desbloquear"
 
-#: lib/unsandboxform.php:69
 msgid "Unsandbox"
 msgstr "Tirar do isolamento"
 
-#: lib/unsandboxform.php:80
 msgid "Unsandbox this user"
 msgstr "Tirar este usuário do isolamento"
 
-#: lib/unsilenceform.php:67
 msgid "Unsilence"
 msgstr "Encerrar silenciamento"
 
-#: lib/unsilenceform.php:78
 msgid "Unsilence this user"
 msgstr "Encerrar o silenciamento deste usuário"
 
-#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
 msgid "Unsubscribe from this user"
 msgstr "Cancelar a assinatura deste usuário"
 
-#: lib/unsubscribeform.php:137
 msgid "Unsubscribe"
 msgstr "Cancelar"
 
 #. 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).
-#: lib/usernoprofileexception.php:60
 #, fuzzy, php-format
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "O usuário não tem perfil."
 
-#: lib/userprofile.php:116
 msgid "Edit Avatar"
 msgstr "Editar o avatar"
 
 #. TRANS: H2 for user actions in a profile.
 #. TRANS: H2 for entity actions in a profile.
-#: lib/userprofile.php:216 lib/userprofile.php:232
 msgid "User actions"
 msgstr "Ações do usuário"
 
 #. TRANS: Text shown in user profile of not yet compeltely deleted users.
-#: lib/userprofile.php:220
 msgid "User deletion in progress..."
 msgstr "Exclusão do usuário em andamento..."
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:248
 msgid "Edit profile settings"
 msgstr "Editar as configurações do perfil"
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:250
 msgid "Edit"
 msgstr "Editar"
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:274
 msgid "Send a direct message to this user"
 msgstr "Enviar uma mensagem para este usuário."
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:276
 msgid "Message"
 msgstr "Mensagem"
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:318
 msgid "Moderate"
 msgstr "Moderar"
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:357
 msgid "User role"
 msgstr "Papel do usuário"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:360
 msgctxt "role"
 msgid "Administrator"
 msgstr "Administrador"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:362
 msgctxt "role"
 msgid "Moderator"
 msgstr "Moderador"
 
-#: lib/util.php:321
 #, fuzzy
 msgid "Not allowed to log in."
 msgstr "Você não está autenticado."
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1337
 msgid "a few seconds ago"
 msgstr "alguns segundos atrás"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1340
 msgid "about a minute ago"
 msgstr "cerca de 1 minuto atrás"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1344
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
@@ -9863,12 +8182,10 @@ msgstr[0] "há cerca de um minuto atrás"
 msgstr[1] "há cerca de %d minutos atrás"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1347
 msgid "about an hour ago"
 msgstr "cerca de 1 hora atrás"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1351
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
@@ -9876,12 +8193,10 @@ msgstr[0] "há cerca de uma hora atrás"
 msgstr[1] "há cerca de %d horas atrás"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1354
 msgid "about a day ago"
 msgstr "cerca de 1 dia atrás"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1358
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
@@ -9889,12 +8204,10 @@ msgstr[0] "há cerca de um dia atrás"
 msgstr[1] "há cerca de %d dias atrás"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1361
 msgid "about a month ago"
 msgstr "cerca de 1 mês atrás"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1365
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
@@ -9902,209 +8215,42 @@ msgstr[0] "há cerca de um mês atrás"
 msgstr[1] "há cerca de %d meses atrás"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1368
 msgid "about a year ago"
 msgstr "cerca de 1 ano atrás"
 
 #. TRANS: Web color exception thrown when a hexadecimal color code does not validate.
 #. TRANS: %s is the provided (invalid) color code.
-#: lib/webcolor.php:81 lib/webcolor.php:121
 #, fuzzy, php-format
 msgid "%s is not a valid color! Use 3 or 6 hex characters."
 msgstr "%s não é uma cor válida! Utilize 3 ou 6 caracteres hexadecimais."
 
 #. TRANS: Exception.
-#: lib/xrd.php:63
 #, fuzzy
 msgid "Invalid XML."
 msgstr "Tamanho inválido."
 
 #. TRANS: Exception.
-#: lib/xrd.php:68
 msgid "Invalid XML, missing XRD root."
 msgstr ""
 
 #. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
-#: scripts/restoreuser.php:62
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
 
-#~ msgid "Could not generate feed for group - %s"
-#~ msgstr "Não foi possível gerar a fonte de notícias para o grupo - %s"
+#~ msgid "Full name is too long (max 255 chars)."
+#~ msgstr "Nome completo muito extenso (máx. 255 caracteres)"
+
+#~ msgid "description is too long (max %d chars)."
+#~ msgstr "descrição muito extensa (máximo %d caracteres)."
+
+#~ msgid "Location is too long (max 255 chars)."
+#~ msgstr "Localização muito extensa (máx. 255 caracteres)."
+
+#~ msgid "Too many aliases! Maximum %d."
+#~ msgstr "Muitos apelidos! O máximo são %d."
 
 #, fuzzy
-#~ msgid "Current confirmed Jabber/Google Talk address."
-#~ msgstr "Endereço de Jabber/GTalk já confirmado."
-
-#, fuzzy
-#~ msgid ""
-#~ "Jabber or Google Talk address, like \"UserName@example.org\". First, make "
-#~ "sure to add %s to your buddy list in your IM client or on Google Talk."
-#~ msgstr ""
-#~ "Endereço de Jabber ou GTalk, ex: \"usuario@exemplo.org\". Primeiro, "
-#~ "certifique-se de adicionar %s à sua lista de contatos em seu cliente de "
-#~ "MI ou no GTalk."
-
-#, fuzzy
-#~ msgid "Send me notices through Jabber/Google Talk."
-#~ msgstr "Envie-me mensagens via Jabber/GTalk."
-
-#, fuzzy
-#~ msgid "Publish a MicroID for my Jabber/Google Talk address."
-#~ msgstr "Publique um MicroID para meu endereço de Jabber/Gtalk."
-
-#~ msgid "No Jabber ID."
-#~ msgstr "Nenhuma ID de Jabber."
-
-#, fuzzy
-#~ msgid "Not a valid Jabber ID."
-#~ msgstr "Não é uma ID de Jabber válida"
-
-#~ msgid "That is already your Jabber ID."
-#~ msgstr "Essa já é sua ID do Jabber."
-
-#~ msgid "That is not your Jabber ID."
-#~ msgstr "Essa não é sua ID do Jabber."
-
-#~ msgid "Other settings"
-#~ msgstr "Outras configurações"
-
-#~ msgid "Tag cloud"
-#~ msgstr "Nuvem de etiquetas"
-
-#~ msgid "Consumer key"
-#~ msgstr "Chave do consumidor"
-
-#~ msgid "Consumer secret"
-#~ msgstr "Segredo do consumidor"
-
-#~ msgid "Request token URL"
-#~ msgstr "URL do token de requisição"
-
-#~ msgid "Access token URL"
-#~ msgstr "URL do token de acesso"
-
-#~ msgid "Authorize URL"
-#~ msgstr "Autorizar a URL"
-
-#~ msgid "Jabber"
-#~ msgstr "Jabber"
-
-#~ msgid "Photo"
-#~ msgstr "Imagem"
-
-#~ msgid "Other options"
-#~ msgstr "Outras opções"
-
-#~ msgid "Other"
-#~ msgstr "Outras"
-
-#~ msgid "Primary site navigation"
-#~ msgstr "Navegação primária no site"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Personal profile and friends timeline"
-#~ msgstr "Perfil pessoal e fluxo de mensagens dos amigos"
-
-#~ msgctxt "MENU"
-#~ msgid "Personal"
-#~ msgstr "Pessoal"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Change your email, avatar, password, profile"
-#~ msgstr "Altere seu e-mail, avatar, senha, perfil"
-
-#~ msgid "Account"
-#~ msgstr "Conta"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Connect to services"
-#~ msgstr "Conecte-se a outros serviços"
-
-#~ msgid "Connect"
-#~ msgstr "Conectar"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Change site configuration"
-#~ msgstr "Altere as configurações do site"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Invite friends and colleagues to join you on %s"
-#~ msgstr "Convide seus amigos e colegas para unir-se a você no %s"
-
-#~ msgctxt "MENU"
-#~ msgid "Invite"
-#~ msgstr "Convidar"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Create an account"
-#~ msgstr "Criar uma conta"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Help me!"
-#~ msgstr "Ajudem-me!"
-
-#~ msgctxt "MENU"
-#~ msgid "Help"
-#~ msgstr "Ajuda"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Search for people or text"
-#~ msgstr "Procure por pessoas ou textos"
-
-#~ msgid "Local views"
-#~ msgstr "Visualizações locais"
-
-#~ msgid "Page notice"
-#~ msgstr "Notícia da página"
-
-#~ msgid "Secondary site navigation"
-#~ msgstr "Navegação secundária no site"
-
-#~ msgid "StatusNet software license"
-#~ msgstr "Licença do software StatusNet"
-
-#~ msgid "Site content license"
-#~ msgstr "Licença do conteúdo do site"
-
-#~ msgid "Pagination"
-#~ msgstr "Paginação"
-
-#~ msgid "Author"
-#~ msgstr "Autor"
-
-#~ msgid "Provider"
-#~ msgstr "Operadora"
-
-#, fuzzy
-#~ msgctxt "MENU"
-#~ msgid "SMS"
-#~ msgstr "SMS"
-
-#~ msgid "Filter tags"
-#~ msgstr "Filtrar etiquetas"
-
-#~ msgid "[%s]"
-#~ msgstr "[%s]"
-
-#~ msgid "Available characters"
-#~ msgstr "Caracteres disponíveis"
-
-#, fuzzy
-#~ msgctxt "MENU"
-#~ msgid "Profile"
-#~ msgstr "Perfil"
-
-#~ msgid "Search help"
-#~ msgstr "Ajuda da procura"
-
-#, fuzzy
-#~ msgid "Message too long. Maximum is %1$d character, you sent %2$d."
-#~ msgid_plural "Message too long. Maximum is %1$d characters, you sent %2$d."
-#~ msgstr[0] ""
-#~ "A mensagem é muito extensa - o máximo são %1$d caracteres e você enviou %2"
-#~ "$d."
-#~ msgstr[1] ""
-#~ "A mensagem é muito extensa - o máximo são %1$d caracteres e você enviou %2"
-#~ "$d."
+#~ msgctxt "BUTTON"
+#~ msgid "Comment"
+#~ msgstr "Conteúdo"
diff --git a/locale/ru/LC_MESSAGES/statusnet.po b/locale/ru/LC_MESSAGES/statusnet.po
index 123b63eadd..f06b0313e5 100644
--- a/locale/ru/LC_MESSAGES/statusnet.po
+++ b/locale/ru/LC_MESSAGES/statusnet.po
@@ -18,69 +18,59 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:23+0000\n"
-"PO-Revision-Date: 2011-03-03 17:26:25+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:37+0000\n"
 "Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
-"X-POT-Import-Date: 2011-02-25 23:49:23+0000\n"
+"X-POT-Import-Date: 2011-03-03 17:59:19+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
-#: actions/accessadminpanel.php:53 lib/adminpanelaction.php:363
 msgid "Access"
 msgstr "Доступ"
 
 #. TRANS: Page notice.
-#: actions/accessadminpanel.php:64
 msgid "Site access settings"
 msgstr "Настройки доступа к сайту"
 
 #. TRANS: Form legend for registration form.
-#: actions/accessadminpanel.php:151
 msgid "Registration"
 msgstr "Регистрация"
 
 #. TRANS: Checkbox instructions for admin setting "Private".
-#: actions/accessadminpanel.php:155
 msgid "Prohibit anonymous users (not logged in) from viewing site?"
 msgstr ""
 "Запретить анонимным (не авторизовавшимся) пользователям просматривать сайт?"
 
 #. TRANS: Checkbox label for prohibiting anonymous users from viewing site.
-#: actions/accessadminpanel.php:157
 msgctxt "LABEL"
 msgid "Private"
 msgstr "Личное"
 
 #. TRANS: Checkbox instructions for admin setting "Invite only".
-#: actions/accessadminpanel.php:164
 msgid "Make registration invitation only."
 msgstr "Разрешить регистрацию только по приглашениям."
 
 #. TRANS: Checkbox label for configuring site as invite only.
-#: actions/accessadminpanel.php:166
 msgid "Invite only"
 msgstr "Только по приглашениям"
 
 #. TRANS: Checkbox instructions for admin setting "Closed" (no new registrations).
-#: actions/accessadminpanel.php:173
 msgid "Disable new registrations."
 msgstr "Отключить новые регистрации."
 
 #. TRANS: Checkbox label for disabling new user registrations.
-#: actions/accessadminpanel.php:175
 msgid "Closed"
 msgstr "Закрыта"
 
 #. TRANS: Title for button to save access settings in site admin panel.
-#: actions/accessadminpanel.php:191
 msgid "Save access settings"
 msgstr "Сохранить настройки доступа"
 
@@ -88,6 +78,7 @@ msgstr "Сохранить настройки доступа"
 #. TRANS: Button text for saving theme settings.
 #. TRANS: Button label to save e-mail preferences.
 #. TRANS: Button label to save IM preferences.
+#. TRANS: Button text in the license admin panel.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
 #. TRANS: Button text for saving site notice in admin panel.
@@ -97,21 +88,12 @@ msgstr "Сохранить настройки доступа"
 #. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
 #. TRANS: Button text on profile design page to save settings.
-#: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
-#: actions/emailsettings.php:251 actions/imsettings.php:199
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:198
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:204
-#: actions/subscriptions.php:261 actions/urlsettings.php:152
-#: actions/useradminpanel.php:298 lib/applicationeditform.php:355
-#: lib/designform.php:320 lib/groupeditform.php:201
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Сохранить"
 
 #. TRANS: Server error when page not found (404).
 #. TRANS: Server error when page not found (404)
-#: actions/all.php:68 actions/public.php:98 actions/replies.php:93
-#: actions/showfavorites.php:140 actions/tag.php:52
 msgid "No such page."
 msgstr "Нет такой страницы."
 
@@ -130,6 +112,7 @@ msgstr "Нет такой страницы."
 #. TRANS: Client error displayed when checking group membership for a non-existing user.
 #. TRANS: Client error displayed when trying to have a non-existing user join a group.
 #. TRANS: Client error displayed when trying to have a non-existing user leave a group.
+#. TRANS: Client error displayed when not providing a user or an invalid user.
 #. TRANS: Client error displayed when updating a status for a non-existing user.
 #. TRANS: Client error displayed when requesting a list of followers for a non-existing user.
 #. TRANS: Client error displayed when requesting most recent favourite notices by a user for a non-existing user.
@@ -142,6 +125,8 @@ msgstr "Нет такой страницы."
 #. 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.
 #. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
@@ -149,33 +134,10 @@ msgstr "Нет такой страницы."
 #. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when calling a profile action without specifying a user.
-#: actions/all.php:80 actions/allrss.php:69
-#: actions/apiaccountupdatedeliverydevice.php:110
-#: actions/apiaccountupdateprofile.php:103
-#: actions/apiaccountupdateprofilebackgroundimage.php:118
-#: actions/apiaccountupdateprofileimage.php:104 actions/apiatomservice.php:59
-#: actions/apiblockcreate.php:96 actions/apiblockdestroy.php:94
-#: actions/apidirectmessage.php:75 actions/apidirectmessagenew.php:72
-#: actions/apigroupcreate.php:111 actions/apigroupismember.php:89
-#: actions/apigroupjoin.php:98 actions/apigroupleave.php:98
-#: actions/apigrouplist.php:70 actions/apigroupprofileupdate.php:108
-#: actions/apistatusesupdate.php:230 actions/apisubscriptions.php:85
-#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:173
-#: actions/apitimelinehome.php:78 actions/apitimelinementions.php:77
-#: actions/apitimelineuser.php:79 actions/avatarbynickname.php:79
-#: actions/favoritesrss.php:72 actions/foaf.php:42 actions/foaf.php:61
-#: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116
-#: actions/otp.php:78 actions/remotesubscribe.php:144
-#: actions/remotesubscribe.php:153 actions/replies.php:73
-#: actions/repliesrss.php:38 actions/rsd.php:113 actions/showfavorites.php:106
-#: actions/userbyid.php:75 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/userxrd.php:59 actions/xrds.php:71 lib/command.php:509
-#: lib/galleryaction.php:59 lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Нет такого пользователя."
 
 #. TRANS: Page title. %1$s is user nickname, %2$d is page number
-#: actions/all.php:91
 #, php-format
 msgid "%1$s and friends, page %2$d"
 msgstr "%1$s и друзья, страница %2$d"
@@ -184,33 +146,26 @@ msgstr "%1$s и друзья, страница %2$d"
 #. TRANS: H1 text for page. %s is a user nickname.
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Timeline title for user and friends. %s is a user nickname.
-#: actions/all.php:94 actions/all.php:191 actions/allrss.php:117
-#: actions/apitimelinefriends.php:207 actions/apitimelinehome.php:113
-#: lib/personalgroupnav.php:100
 #, php-format
 msgid "%s and friends"
 msgstr "%s и друзья"
 
 #. TRANS: %s is user nickname.
-#: actions/all.php:108
 #, php-format
 msgid "Feed for friends of %s (RSS 1.0)"
 msgstr "Лента друзей %s (RSS 1.0)"
 
 #. TRANS: %s is user nickname.
-#: actions/all.php:117
 #, php-format
 msgid "Feed for friends of %s (RSS 2.0)"
 msgstr "Лента друзей %s (RSS 2.0)"
 
 #. TRANS: %s is user nickname.
-#: actions/all.php:126
 #, php-format
 msgid "Feed for friends of %s (Atom)"
 msgstr "Лента друзей %s (Atom)"
 
 #. TRANS: Empty list message. %s is a user nickname.
-#: actions/all.php:139
 #, php-format
 msgid ""
 "This is the timeline for %s and friends but no one has posted anything yet."
@@ -218,7 +173,6 @@ msgstr "Это лента %s и друзей, однако пока никто 
 
 #. TRANS: Encouragement displayed on logged in user's empty timeline.
 #. TRANS: This message contains Markdown links. Keep "](" together.
-#: actions/all.php:146
 #, php-format
 msgid ""
 "Try subscribing to more people, [join a group](%%action.groups%%) or post "
@@ -229,7 +183,6 @@ msgstr ""
 
 #. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@".
 #. TRANS: This message contains Markdown links. Keep "](" together.
-#: actions/all.php:150
 #, php-format
 msgid ""
 "You can try to [nudge %1$s](../%2$s) from their profile or [post something "
@@ -242,7 +195,6 @@ msgstr ""
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
 #. TRANS: Second sentence of empty message for anonymous users. %s is a user nickname.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:221
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -252,14 +204,11 @@ msgstr ""
 "«подтолкнуть» %s или оставить запись для них?"
 
 #. TRANS: H1 text for page when viewing a list for self.
-#: actions/all.php:188
 msgid "You and friends"
 msgstr "Вы и друзья"
 
 #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
 #. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name.
-#: actions/allrss.php:122 actions/apitimelinefriends.php:213
-#: actions/apitimelinehome.php:119
 #, php-format
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr "Обновлено от %1$s и его друзей на %2$s!"
@@ -278,55 +227,20 @@ msgstr "Обновлено от %1$s и его друзей на %2$s!"
 #. TRANS: Client error displayed trying to execute an unknown API method checking group membership.
 #. TRANS: Client error displayed trying to execute an unknown API method listing the latest 20 groups.
 #. TRANS: Client error displayed trying to execute an unknown API method showing group membership.
+#. TRANS: Client error displayed when using an unsupported API format.
 #. TRANS: Client error displayed trying to execute an unknown API method showing a group.
 #. TRANS: Client error displayed trying to execute an unknown API method testing API connectivity.
 #. TRANS: Client error displayed trying to execute an unknown API method deleting a status.
 #. TRANS: Client error displayed when trying to handle an unknown API method.
-#: actions/apiaccountratelimitstatus.php:69
-#: actions/apiaccountupdatedeliverydevice.php:92
-#: actions/apiaccountupdateprofile.php:94
-#: actions/apiaccountupdateprofilebackgroundimage.php:92
-#: actions/apiaccountupdateprofilecolors.php:115
-#: actions/apiaccountverifycredentials.php:68 actions/apidirectmessage.php:157
-#: actions/apifavoritecreate.php:98 actions/apifavoritedestroy.php:98
-#: actions/apifriendshipscreate.php:99 actions/apifriendshipsdestroy.php:99
-#: actions/apifriendshipsshow.php:124 actions/apigroupcreate.php:138
-#: actions/apigroupismember.php:115 actions/apigroupjoin.php:151
-#: actions/apigroupleave.php:141 actions/apigrouplist.php:134
-#: actions/apigrouplistall.php:120 actions/apigroupmembership.php:105
-#: actions/apigroupprofileupdate.php:100 actions/apigroupprofileupdate.php:213
-#: actions/apigroupshow.php:114 actions/apihelptest.php:84
-#: actions/apistatusesdestroy.php:101 actions/apistatusesretweets.php:110
-#: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:139
-#: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
-#: actions/apitimelinefavorites.php:182 actions/apitimelinefriends.php:276
-#: actions/apitimelinegroup.php:148 actions/apitimelinehome.php:181
-#: actions/apitimelinementions.php:182 actions/apitimelinepublic.php:247
-#: actions/apitimelineretweetedtome.php:147
-#: actions/apitimelineretweetsofme.php:147 actions/apitimelinetag.php:165
-#: actions/apitimelineuser.php:217 actions/apiusershow.php:100
 msgid "API method not found."
 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.
-#: actions/apiaccountupdatedeliverydevice.php:83
-#: actions/apiaccountupdateprofile.php:85
-#: actions/apiaccountupdateprofilebackgroundimage.php:83
-#: actions/apiaccountupdateprofilecolors.php:106
-#: actions/apiaccountupdateprofileimage.php:80 actions/apiblockcreate.php:87
-#: actions/apiblockdestroy.php:85 actions/apidirectmessagenew.php:107
-#: actions/apifavoritecreate.php:88 actions/apifavoritedestroy.php:88
-#: actions/apifriendshipscreate.php:89 actions/apifriendshipsdestroy.php:89
-#: actions/apigroupcreate.php:102 actions/apigroupjoin.php:89
-#: actions/apigroupleave.php:89 actions/apigroupprofileupdate.php:92
-#: actions/apimediaupload.php:66 actions/apistatusesretweet.php:63
-#: actions/apistatusesupdate.php:194
 msgid "This method requires a POST."
 msgstr "Этот метод требует POST."
 
 #. TRANS: Client error displayed when no valid device parameter is provided for a user's delivery device setting.
-#: actions/apiaccountupdatedeliverydevice.php:103
 msgid ""
 "You must specify a parameter named 'device' with a value of one of: sms, im, "
 "none."
@@ -341,10 +255,6 @@ msgstr ""
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
-#: actions/apiaccountupdatedeliverydevice.php:136
-#: actions/emailsettings.php:353 actions/emailsettings.php:499
-#: actions/profilesettings.php:323 actions/smssettings.php:300
-#: actions/smssettings.php:453 actions/urlsettings.php:211
 msgid "Could not update user."
 msgstr "Не удаётся обновить пользователя."
 
@@ -357,32 +267,17 @@ msgstr "Не удаётся обновить пользователя."
 #. TRANS: Server error displayed when requesting Friends of a Friend feed for a user for which the profile could not be found.
 #. TRANS: Server error displayed when trying to get a user hCard for a user without a profile.
 #. TRANS: Server error displayed when calling a profile action while the specified user does not have a profile.
-#: actions/apiaccountupdateprofile.php:111
-#: actions/apiaccountupdateprofilebackgroundimage.php:199
-#: actions/apiaccountupdateprofilecolors.php:183
-#: actions/apiaccountupdateprofileimage.php:131
-#: actions/apiuserprofileimage.php:88 actions/apiusershow.php:108
-#: actions/avatarbynickname.php:85 actions/foaf.php:69 actions/hcard.php:75
-#: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
-#: lib/profileaction.php:85
 msgid "User has no profile."
 msgstr "У пользователя нет профиля."
 
 #. TRANS: Server error displayed if a user profile could not be saved.
 #. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:419
 msgid "Could not save profile."
 msgstr "Не удаётся сохранить профиль."
 
 #. TRANS: Client error displayed when the number of bytes in a POST request exceeds a limit.
 #. TRANS: %s is the number of bytes of the CONTENT_LENGTH.
 #. TRANS: Form validation error in design settings form. POST should remain untranslated.
-#: actions/apiaccountupdateprofilebackgroundimage.php:108
-#: actions/apiaccountupdateprofileimage.php:95 actions/apimediaupload.php:81
-#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
-#: actions/designadminpanel.php:120 actions/editapplication.php:121
-#: actions/newapplication.php:102 actions/newnotice.php:95
-#: lib/designsettings.php:110
 #, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s byte) due to its "
@@ -405,26 +300,15 @@ msgstr[2] ""
 #. TRANS: Client error displayed when a database error occurs inserting profile colours.
 #. TRANS: Client error displayed when a database error occurs updating profile colours.
 #. TRANS: Form validation error displayed when group design settings could not be saved because of an application issue.
-#: actions/apiaccountupdateprofilebackgroundimage.php:138
-#: actions/apiaccountupdateprofilebackgroundimage.php:149
-#: actions/apiaccountupdateprofilecolors.php:160
-#: actions/apiaccountupdateprofilecolors.php:171
-#: actions/groupdesignsettings.php:285 actions/groupdesignsettings.php:296
-#: actions/userdesignsettings.php:218 actions/userdesignsettings.php:228
-#: actions/userdesignsettings.php:270 actions/userdesignsettings.php:280
 msgid "Unable to save your design settings."
 msgstr "Не удаётся сохранить ваши настройки оформления!"
 
 #. TRANS: Error displayed when updating design settings fails.
 #. TRANS: Client error displayed when a database error occurs updating profile colours.
-#: actions/apiaccountupdateprofilebackgroundimage.php:191
-#: actions/apiaccountupdateprofilecolors.php:139
-#: actions/userdesignsettings.php:196
 msgid "Could not update your design."
 msgstr "Не удаётся обновить ваше оформление."
 
 #. TRANS: Title for Atom feed.
-#: actions/apiatomservice.php:85
 msgctxt "ATOM"
 msgid "Main"
 msgstr "Главная"
@@ -433,9 +317,6 @@ msgstr "Главная"
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Title in atom group notice feed. %s is a group name.
 #. TRANS: Title in atom user notice feed. %s is a user name.
-#: actions/apiatomservice.php:93 actions/grouprss.php:138
-#: actions/userrss.php:94 lib/atomgroupnoticefeed.php:63
-#: lib/atomusernoticefeed.php:88
 #, php-format
 msgid "%s timeline"
 msgstr "Лента %s"
@@ -445,8 +326,6 @@ msgstr "Лента %s"
 #. TRANS: %s is a user nickname.
 #. TRANS: Header for subscriptions overview for a user (first page).
 #. TRANS: %s is a user nickname.
-#: actions/apiatomservice.php:104 actions/atompubsubscriptionfeed.php:148
-#: actions/subscriptions.php:51
 #, php-format
 msgid "%s subscriptions"
 msgstr "Подписки %s"
@@ -454,58 +333,48 @@ msgstr "Подписки %s"
 #. TRANS: Title for Atom feed with a user's favorite notices. %s is a user nickname.
 #. TRANS: Title for Atom favorites feed.
 #. TRANS: %s is a user nickname.
-#: actions/apiatomservice.php:115 actions/atompubfavoritefeed.php:142
 #, php-format
 msgid "%s favorites"
 msgstr "Любимые записи %s"
 
 #. TRANS: Title for Atom feed with a user's memberships. %s is a user nickname.
-#: actions/apiatomservice.php:126
 #, php-format
 msgid "%s memberships"
 msgstr "Участники группы %s"
 
 #. TRANS: Client error displayed when users try to block themselves.
-#: actions/apiblockcreate.php:105
 msgid "You cannot block yourself!"
 msgstr "Вы не можете заблокировать самого себя!"
 
 #. TRANS: Server error displayed when blocking a user has failed.
-#: actions/apiblockcreate.php:127
 msgid "Block user failed."
 msgstr "Неудача при блокировке пользователя."
 
 #. TRANS: Server error displayed when unblocking a user has failed.
-#: actions/apiblockdestroy.php:113
 msgid "Unblock user failed."
 msgstr "Неудача при разблокировке пользователя."
 
 #. TRANS: Title. %s is a user nickname.
-#: actions/apidirectmessage.php:88
 #, php-format
 msgid "Direct messages from %s"
 msgstr "Прямые сообщения от %s"
 
 #. TRANS: Subtitle. %s is a user nickname.
-#: actions/apidirectmessage.php:93
 #, php-format
 msgid "All the direct messages sent from %s"
 msgstr "Все прямые сообщения от %s"
 
 #. TRANS: Title. %s is a user nickname.
-#: actions/apidirectmessage.php:102
 #, php-format
 msgid "Direct messages to %s"
 msgstr "Прямые сообщения для %s"
 
 #. TRANS: Subtitle. %s is a user nickname.
-#: actions/apidirectmessage.php:107
 #, php-format
 msgid "All the direct messages sent to %s"
 msgstr "Все прямые сообщения посланные для %s"
 
 #. TRANS: Client error displayed when no message text was submitted (406).
-#: actions/apidirectmessagenew.php:117
 msgid "No message text!"
 msgstr "Отсутствует текст сообщения!"
 
@@ -513,7 +382,6 @@ msgstr "Отсутствует текст сообщения!"
 #. TRANS: %d is the maximum number of characters for a message.
 #. TRANS: Form validation error displayed when message content is too long.
 #. TRANS: %d is the maximum number of characters for a message.
-#: actions/apidirectmessagenew.php:127 actions/newmessage.php:152
 #, php-format
 msgid "That's too long. Maximum message size is %d character."
 msgid_plural "That's too long. Maximum message size is %d characters."
@@ -522,12 +390,10 @@ msgstr[1] "Слишком длинно. Максимальная длина со
 msgstr[2] "Слишком длинно. Максимальная длина сообщения — %d знаков."
 
 #. TRANS: Client error displayed if a recipient user could not be found (403).
-#: actions/apidirectmessagenew.php:139
 msgid "Recipient user not found."
 msgstr "Получатель не найден."
 
 #. TRANS: Client error displayed trying to direct message another user who's not a friend (403).
-#: actions/apidirectmessagenew.php:144
 #, fuzzy
 msgid "Cannot send direct messages to users who aren't your friend."
 msgstr ""
@@ -535,7 +401,6 @@ msgstr ""
 "Вашими друзьями."
 
 #. TRANS: Client error displayed trying to direct message self (403).
-#: actions/apidirectmessagenew.php:154
 msgid ""
 "Do not send a message to yourself; just say it to yourself quietly instead."
 msgstr "Не посылайте сообщения сами себе; просто потихоньку скажите это себе."
@@ -543,118 +408,98 @@ 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.
 #. TRANS: Client error displayed trying to delete a status with an invalid ID.
-#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:108
-#: actions/apistatusesdestroy.php:121
 msgid "No status found with that ID."
 msgstr "Нет статуса с таким ID."
 
 #. TRANS: Client error displayed when trying to mark a notice favourite that already is a favourite.
-#: actions/apifavoritecreate.php:120
 msgid "This status is already a favorite."
 msgstr "Этот статус уже входит в число любимых."
 
 #. TRANS: Client error displayed when marking a notice as favourite fails.
 #. TRANS: Server error displayed when trying to mark a notice as favorite fails in the database.
 #. TRANS: Error message text shown when a favorite could not be set.
-#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:306
 msgid "Could not create favorite."
 msgstr "Не удаётся создать любимую запись."
 
 #. TRANS: Client error displayed when trying to remove a favourite that was not a favourite.
-#: actions/apifavoritedestroy.php:122
 msgid "That status is not a favorite."
 msgstr "Этот статус не входит в число ваших любимых."
 
 #. TRANS: Client error displayed when removing a favourite has failed.
 #. TRANS: Server error displayed when removing a favorite from the database fails.
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:90
 msgid "Could not delete favorite."
 msgstr "Не удаётся удалить любимую запись."
 
 #. TRANS: Client error displayed when trying follow who's profile could not be found.
-#: actions/apifriendshipscreate.php:109
 msgid "Could not follow user: profile not found."
 msgstr "Не удаётся следовать за пользователем: профиль не найден."
 
 #. TRANS: Client error displayed when trying to follow a user that's already being followed.
 #. TRANS: %s is the nickname of the user that is already being followed.
-#: actions/apifriendshipscreate.php:120
 #, php-format
 msgid "Could not follow user: %s is already on your list."
 msgstr "Не удается включить %s в список поддержки, он уже в Вашем списке."
 
 #. TRANS: Client error displayed when trying to unfollow a user that cannot be found.
-#: actions/apifriendshipsdestroy.php:109
 msgid "Could not unfollow user: User not found."
 msgstr ""
 "Не удаётся следовать за пользователем, т. к. такого пользователя не "
 "существует."
 
 #. TRANS: Client error displayed when trying to unfollow self.
-#: actions/apifriendshipsdestroy.php:121
 msgid "You cannot unfollow yourself."
 msgstr "Вы не можете перестать следовать за собой."
 
 #. TRANS: Client error displayed when supplying invalid parameters to an API call checking if a friendship exists.
-#: actions/apifriendshipsexists.php:88
 msgid "Two valid IDs or nick names must be supplied."
 msgstr "Необходимо задать два корректных идентификатора или псевдонима."
 
 #. TRANS: Client error displayed when a source user could not be determined showing friendship.
-#: actions/apifriendshipsshow.php:131
 msgid "Could not determine source user."
 msgstr "Не удаётся определить исходного пользователя."
 
 #. TRANS: Client error displayed when a target user could not be determined showing friendship.
-#: actions/apifriendshipsshow.php:140
 msgid "Could not find target user."
 msgstr "Не удаётся найти целевого пользователя."
 
 #. TRANS: Client error trying to create a group with a nickname this is already in use.
+#. TRANS: API validation exception thrown when nickname is already used.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:156 actions/apigroupprofileupdate.php:255
-#: actions/editgroup.php:191 actions/newgroup.php:137
-#: actions/profilesettings.php:274 actions/register.php:199
 msgid "Nickname already in use. Try another one."
 msgstr "Такое имя уже используется. Попробуйте какое-нибудь другое."
 
 #. TRANS: Client error in form for group creation.
+#. TRANS: API validation exception thrown when nickname does not validate.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:164 actions/apigroupprofileupdate.php:259
-#: actions/editgroup.php:195 actions/newgroup.php:141
-#: actions/profilesettings.php:244 actions/register.php:201
 msgid "Not a valid nickname."
 msgstr "Неверное имя."
 
 #. TRANS: Client error in form for group creation.
+#. TRANS: API validation exception thrown when homepage URL does not validate.
 #. TRANS: Validation error shown when providing an invalid homepage URL in the "Edit application" form.
 #. TRANS: Group edit form validation error.
 #. TRANS: Validation error shown when providing an invalid homepage URL in the "New application" form.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:181 actions/apigroupprofileupdate.php:277
-#: actions/editapplication.php:235 actions/editgroup.php:202
-#: actions/newapplication.php:221 actions/newgroup.php:148
-#: actions/profilesettings.php:249 actions/register.php:208
 msgid "Homepage is not a valid URL."
 msgstr "URL Главной страницы неверен."
 
 #. TRANS: Client error in form for group creation.
+#. TRANS: API validation exception thrown when full name does not validate.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:191 actions/editgroup.php:206
-#: actions/newgroup.php:152 actions/profilesettings.php:253
-#: actions/register.php:211
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "Полное имя слишком длинное (максимум 255 символов)."
 
 #. TRANS: Client error shown when providing too long a description during group creation.
 #. TRANS: %d is the maximum number of allowed characters.
+#. TRANS: API validation exception thrown when description does not validate.
+#. TRANS: %d is the maximum description length and used for plural.
 #. TRANS: Validation error shown when providing too long a description in the "Edit application" form.
 #. TRANS: %d is the maximum number of allowed characters.
 #. TRANS: Group edit form validation error.
@@ -662,9 +507,6 @@ msgstr "Полное имя слишком длинное (максимум 255
 #. TRANS: %d is the maximum number of characters for the description.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed characters.
-#: actions/apigroupcreate.php:201 actions/editapplication.php:202
-#: actions/editgroup.php:211 actions/newapplication.php:182
-#: actions/newgroup.php:157
 #, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."
@@ -673,23 +515,21 @@ msgstr[1] "Слишком длинное описание (максимум %d 
 msgstr[2] "Слишком длинное описание (максимум %d символов)."
 
 #. TRANS: Client error shown when providing too long a location during group creation.
+#. TRANS: API validation exception thrown when location does not validate.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:215 actions/editgroup.php:218
-#: actions/newgroup.php:164 actions/profilesettings.php:266
-#: actions/register.php:220
 msgid "Location is too long (maximum 255 characters)."
 msgstr "Слишком длинное месторасположение (максимум 255 символов)."
 
 #. TRANS: Client error shown when providing too many aliases during group creation.
 #. TRANS: %d is the maximum number of allowed aliases.
+#. TRANS: API validation exception thrown when aliases do not validate.
+#. TRANS: %d is the maximum number of aliases and used for plural.
 #. TRANS: Group edit form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.
-#: actions/apigroupcreate.php:236 actions/editgroup.php:231
-#: actions/newgroup.php:177
 #, php-format
 msgid "Too many aliases! Maximum %d allowed."
 msgid_plural "Too many aliases! Maximum %d allowed."
@@ -699,25 +539,24 @@ msgstr[2] "Слишком много алиасов! Максимальное ч
 
 #. TRANS: Client error shown when providing an invalid alias during group creation.
 #. TRANS: %s is the invalid alias.
-#: actions/apigroupcreate.php:253
+#. TRANS: API validation exception thrown when aliases does not validate.
+#. TRANS: %s is the invalid alias.
 #, php-format
 msgid "Invalid alias: \"%s\"."
 msgstr "Ошибочный псевдоним: «%s»."
 
 #. TRANS: Client error displayed when trying to use an alias during group creation that is already in use.
 #. TRANS: %s is the alias that is already in use.
+#. TRANS: API validation exception thrown when aliases is already used.
+#. TRANS: %s is the already used alias.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error. %s is the already used alias.
-#: actions/apigroupcreate.php:264 actions/apigroupprofileupdate.php:351
-#: actions/editgroup.php:246 actions/newgroup.php:193
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "Алиас «%s» уже используется. Попробуйте какой-нибудь другой."
 
 #. TRANS: Client error displayed when trying to use an alias during group creation that is the same as the group's nickname.
 #. TRANS: Group edit form validation error.
-#: actions/apigroupcreate.php:278 actions/apigroupprofileupdate.php:359
-#: actions/editgroup.php:253
 msgid "Alias can't be the same as nickname."
 msgstr "Алиас не может совпадать с именем."
 
@@ -725,26 +564,21 @@ msgstr "Алиас не может совпадать с именем."
 #. TRANS: Client error displayed when trying to join a group that does not exist.
 #. TRANS: Client error displayed when trying to leave a group that does not exist.
 #. TRANS: Client error displayed trying to show group membership on a non-existing group.
+#. TRANS: Client error displayed when not providing a group or an invalid group.
 #. TRANS: Client error displayed when trying to show a group that could not be found.
 #. TRANS: Client error displayed requesting most recent notices to a group for a non-existing group.
-#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
-#: actions/apigroupleave.php:104 actions/apigroupmembership.php:71
-#: actions/apigroupprofileupdate.php:113 actions/apigroupshow.php:81
-#: actions/apitimelinegroup.php:89
 msgid "Group not found."
 msgstr "Группа не найдена."
 
 #. TRANS: Server error displayed when trying to join a group the user is already a member of.
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:345
 msgid "You are already a member of that group."
 msgstr "Вы уже являетесь членом этой группы."
 
 #. TRANS: Server error displayed when trying to join a group the user is blocked from joining.
 #. 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.
-#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:350
 msgid "You have been blocked from that group by the admin."
 msgstr "Вы заблокированы из этой группы администратором."
 
@@ -752,13 +586,11 @@ msgstr "Вы заблокированы из этой группы админи
 #. TRANS: %1$s is the joining user's nickname, $2$s is the group nickname for which the join failed.
 #. TRANS: Message given having failed to add a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:136 actions/joingroup.php:139 lib/command.php:362
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "Не удаётся присоединить пользователя %1$s к группе %2$s."
 
 #. TRANS: Server error displayed when trying to leave a group the user is not a member of.
-#: actions/apigroupleave.php:115
 msgid "You are not a member of this group."
 msgstr "Вы не являетесь членом этой группы."
 
@@ -766,115 +598,78 @@ msgstr "Вы не являетесь членом этой группы."
 #. TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
 #. TRANS: Message given having failed to remove a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupleave.php:127 actions/leavegroup.php:133
-#: lib/command.php:410
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
 msgstr "Не удаётся удалить пользователя %1$s из группы %2$s."
 
 #. TRANS: Used as title in check for group membership. %s is a user name.
-#: actions/apigrouplist.php:94
 #, php-format
 msgid "%s's groups"
 msgstr "Группы %s"
 
 #. TRANS: Used as subtitle in check for group membership. %1$s is a user name, %2$s is the site name.
-#: actions/apigrouplist.php:104
 #, php-format
 msgid "%1$s groups %2$s is a member of."
 msgstr "Группы %1$s, в которых состоит %2$s."
 
 #. TRANS: Message is used as a title when listing the lastest 20 groups. %s is a site name.
 #. TRANS: Message is used as a page title. %s is a nick name.
-#: actions/apigrouplistall.php:88 actions/usergroups.php:63
 #, php-format
 msgid "%s groups"
 msgstr "Группы %s"
 
 #. TRANS: Message is used as a subtitle when listing the lastest 20 groups. %s is a site name.
-#: actions/apigrouplistall.php:93
 #, php-format
 msgid "groups on %s"
 msgstr "группы на %s"
 
+#. TRANS: Client error displayed when trying to edit a group without being an admin.
 #. TRANS: Client error displayed trying to edit a group while not being a group admin.
 #. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
 #. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
-#: actions/apigroupprofileupdate.php:118 actions/editgroup.php:110
-#: actions/editgroup.php:176 actions/groupdesignsettings.php:109
-#: actions/grouplogo.php:111
 msgid "You must be an admin to edit the group."
 msgstr "Вы должны быть администратором, чтобы изменять информацию о группе."
 
+#. TRANS: Server error displayed when group update fails.
 #. TRANS: Server error displayed when editing a group fails.
-#: actions/apigroupprofileupdate.php:171 actions/editgroup.php:274
 msgid "Could not update group."
 msgstr "Не удаётся обновить информацию о группе."
 
+#. TRANS: Server error displayed when adding group aliases fails.
 #. TRANS: Server error displayed when group aliases could not be added.
 #. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/apigroupprofileupdate.php:194 actions/editgroup.php:281
-#: classes/User_group.php:540
 msgid "Could not create aliases."
 msgstr "Не удаётся создать алиасы."
 
+#. TRANS: API validation exception thrown when nickname does not validate.
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: actions/apigroupprofileupdate.php:249 lib/nickname.php:165
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr ""
 "Имя должно состоять только из прописных букв и цифр и не иметь пробелов."
 
-#: actions/apigroupprofileupdate.php:286
-#, fuzzy
-msgid "Full name is too long (max 255 chars)."
-msgstr "Полное имя слишком длинное (максимум 255 символов)."
-
-#: actions/apigroupprofileupdate.php:296
-#, fuzzy, php-format
-msgid "description is too long (max %d chars)."
-msgstr "Слишком длинное описание (максимум %d символ)."
-
-#: actions/apigroupprofileupdate.php:307
-#, fuzzy
-msgid "Location is too long (max 255 chars)."
-msgstr "Слишком длинное месторасположение (максимум 255 символов)."
-
-#: actions/apigroupprofileupdate.php:326
-#, fuzzy, php-format
-msgid "Too many aliases! Maximum %d."
-msgstr "Слишком много алиасов! Максимальное число — %d."
-
-#. TRANS: Group edit form validation error.
+#. TRANS: API validation exception thrown when alias is the same as nickname.
 #. TRANS: Group create form validation error.
-#. TRANS: %s is the invalid alias.
-#: actions/apigroupprofileupdate.php:342 actions/editgroup.php:241
-#: actions/newgroup.php:188
-#, php-format
-msgid "Invalid alias: \"%s\""
-msgstr "Неверный алиас: «%s»"
+#, fuzzy
+msgid "Alias cannot be the same as nickname."
+msgstr "Алиас не может совпадать с именем."
 
 #. TRANS: Client error displayed when uploading a media file has failed.
-#: actions/apimediaupload.php:101
 msgid "Upload failed."
 msgstr "Загрузка не удалась."
 
 #. TRANS: Client error given from the OAuth API when the request token or verifier is invalid.
-#: actions/apioauthaccesstoken.php:102
 msgid "Invalid request token or verifier."
 msgstr "Недопустимый ключ запроса или верификатор."
 
 #. TRANS: Client error given when no oauth_token was passed to the OAuth API.
-#: actions/apioauthauthorize.php:107
 msgid "No oauth_token parameter provided."
 msgstr "Не задан параметр oauth_token."
 
 #. TRANS: Client error given when an invalid request token was passed to the OAuth API.
-#: actions/apioauthauthorize.php:115 actions/apioauthauthorize.php:129
 msgid "Invalid request token."
 msgstr "Неправильный запрос токена."
 
 #. TRANS: Client error given when an invalid request token was passed to the OAuth API.
-#: actions/apioauthauthorize.php:121
 msgid "Request token already authorized."
 msgstr "Ключ запроса уже авторизован."
 
@@ -884,31 +679,14 @@ msgstr "Ключ запроса уже авторизован."
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
 #. TRANS: Client error displayed when the session token is not okay.
-#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:75
-#: actions/emailsettings.php:292 actions/favor.php:75 actions/geocode.php:55
-#: actions/groupblock.php:65 actions/grouplogo.php:321
-#: actions/groupunblock.php:65 actions/imsettings.php:241
-#: actions/invite.php:60 actions/makeadmin.php:66 actions/newmessage.php:135
-#: actions/newnotice.php:105 actions/nudge.php:80
-#: actions/oauthappssettings.php:162 actions/oauthconnectionssettings.php:135
-#: actions/passwordsettings.php:137 actions/pluginenable.php:87
-#: actions/profilesettings.php:218 actions/recoverpassword.php:383
-#: actions/register.php:157 actions/remotesubscribe.php:76
-#: actions/repeat.php:82 actions/smssettings.php:249 actions/subedit.php:40
-#: actions/subscribe.php:87 actions/tagother.php:145
-#: actions/unsubscribe.php:69 actions/urlsettings.php:171
-#: actions/userauthorization.php:53 lib/designsettings.php:122
 msgid "There was a problem with your session token. Try again, please."
 msgstr "Проблема с вашим ключом сессии. Пожалуйста, попробуйте ещё раз."
 
 #. TRANS: Form validation error given when an invalid username and/or password was passed to the OAuth API.
-#: actions/apioauthauthorize.php:168
 msgid "Invalid nickname / password!"
 msgstr "Неверное имя или пароль."
 
 #. TRANS: Server error displayed when a database action fails.
-#: actions/apioauthauthorize.php:217
 msgid "Database error inserting oauth_token_association."
 msgstr "Ошибка базы данных при вставке oauth_token_association."
 
@@ -924,28 +702,19 @@ msgstr "Ошибка базы данных при вставке oauth_token_ass
 #. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
 #. TRANS: Message given submitting a form with an unknown action in SMS settings.
 #. TRANS: Unknown form validation error in design settings form.
-#: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
-#: actions/designadminpanel.php:100 actions/editapplication.php:144
-#: actions/emailsettings.php:311 actions/grouplogo.php:332
-#: actions/imsettings.php:256 actions/newapplication.php:124
-#: actions/oauthconnectionssettings.php:144 actions/recoverpassword.php:46
-#: actions/smssettings.php:270 lib/designsettings.php:133
 msgid "Unexpected form submission."
 msgstr "Нетиповое подтверждение формы."
 
 #. TRANS: Title for a page where a user can confirm/deny account access by an external application.
-#: actions/apioauthauthorize.php:387
 msgid "An application would like to connect to your account"
 msgstr "Приложение хочет соединиться с вашей учётной записью"
 
 #. TRANS: Fieldset legend.
-#: actions/apioauthauthorize.php:404
 msgid "Allow or deny access"
 msgstr "Разрешить или запретить доступ"
 
 #. TRANS: User notification of external application requesting account access.
 #. TRANS: %3$s is the access type requested (read-write or read-only), %4$s is the StatusNet sitename.
-#: actions/apioauthauthorize.php:425
 #, php-format
 msgid ""
 "An application would like the ability to <strong>%3$s</strong> your %4$s "
@@ -959,7 +728,6 @@ msgstr ""
 #. TRANS: User notification of external application requesting account access.
 #. TRANS: %1$s is the application name requesting access, %2$s is the organisation behind the application,
 #. TRANS: %3$s is the access type requested, %4$s is the StatusNet sitename.
-#: actions/apioauthauthorize.php:433
 #, php-format
 msgid ""
 "The application <strong>%1$s</strong> by <strong>%2$s</strong> would like "
@@ -972,22 +740,18 @@ msgstr ""
 "сторонним приложениям, которым вы доверяете."
 
 #. TRANS: Fieldset legend.
-#: actions/apioauthauthorize.php:455
 msgctxt "LEGEND"
 msgid "Account"
 msgstr "Аккаунт"
 
 #. TRANS: Field label on OAuth API authorisation form.
+#. TRANS: Field label on login page.
 #. TRANS: Field label in form for profile settings.
-#: actions/apioauthauthorize.php:459 actions/login.php:225
-#: actions/profilesettings.php:107 actions/register.php:411
-#: actions/userauthorization.php:145 lib/groupeditform.php:145
 msgid "Nickname"
 msgstr "Имя"
 
 #. TRANS: Field label on OAuth API authorisation form.
-#: actions/apioauthauthorize.php:463 actions/login.php:228
-#: actions/register.php:415 lib/settingsnav.php:87
+#. TRANS: Field label on login page.
 msgid "Password"
 msgstr "Пароль"
 
@@ -997,43 +761,34 @@ msgstr "Пароль"
 #. TRANS: Button label to cancel an IM address confirmation procedure.
 #. TRANS: Button label to cancel a SMS address confirmation procedure.
 #. TRANS: Button label in the "Edit application" form.
-#: actions/apioauthauthorize.php:478 actions/emailsettings.php:125
-#: actions/imsettings.php:136 actions/smssettings.php:132
-#: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Cancel"
 msgstr "Отмена"
 
 #. TRANS: Button text that when clicked will allow access to an account by an external application.
-#: actions/apioauthauthorize.php:485
 msgctxt "BUTTON"
 msgid "Allow"
 msgstr "Разрешить"
 
 #. TRANS: Form instructions.
-#: actions/apioauthauthorize.php:502
 msgid "Authorize access to your account information."
 msgstr "Разрешить доступ к информации вашей учётной записи."
 
 #. TRANS: Header for user notification after revoking OAuth access to an application.
-#: actions/apioauthauthorize.php:594
 msgid "Authorization canceled."
 msgstr "Авторизация отменена."
 
 #. TRANS: User notification after revoking OAuth access to an application.
 #. TRANS: %s is an OAuth token.
-#: actions/apioauthauthorize.php:598
 #, php-format
 msgid "The request token %s has been revoked."
 msgstr "Ключ запроса %s отозван."
 
 #. TRANS: Title of the page notifying the user that an anonymous client application was successfully authorized to access the user's account with OAuth.
-#: actions/apioauthauthorize.php:621
 msgid "You have successfully authorized the application"
 msgstr "Приложение успешно авторизовано"
 
 #. TRANS: Message notifying the user that an anonymous client application was successfully authorized to access the user's account with OAuth.
-#: actions/apioauthauthorize.php:625
 msgid ""
 "Please return to the application and enter the following security code to "
 "complete the process."
@@ -1043,14 +798,12 @@ msgstr ""
 
 #. TRANS: Title of the page notifying the user that the client application was successfully authorized to access the user's account with OAuth.
 #. TRANS: %s is the authorised application name.
-#: actions/apioauthauthorize.php:632
 #, php-format
 msgid "You have successfully authorized %s"
 msgstr "Вы успешно авторизовали %s"
 
 #. TRANS: Message notifying the user that the client application was successfully authorized to access the user's account with OAuth.
 #. TRANS: %s is the authorised application name.
-#: actions/apioauthauthorize.php:639
 #, php-format
 msgid ""
 "Please return to %s and enter the following security code to complete the "
@@ -1061,12 +814,10 @@ msgstr ""
 
 #. TRANS: Client error displayed trying to delete a status not using POST or DELETE.
 #. TRANS: POST and DELETE should not be translated.
-#: actions/apistatusesdestroy.php:111
 msgid "This method requires a POST or DELETE."
 msgstr "Этот метод требует POST или DELETE."
 
 #. TRANS: Client error displayed trying to delete a status of another user.
-#: actions/apistatusesdestroy.php:136
 msgid "You may not delete another user's status."
 msgstr "Вы не можете удалять статус других пользователей."
 
@@ -1074,21 +825,16 @@ msgstr "Вы не можете удалять статус других поль
 #. TRANS: Client error displayed trying to display redents of a non-exiting notice.
 #. TRANS: Client exception thrown when referencing a non-existing notice.
 #. TRANS: Error message displayed trying to delete a non-existing notice.
-#: actions/apistatusesretweet.php:74 actions/apistatusesretweets.php:70
-#: actions/atompubshowfavorite.php:82 actions/deletenotice.php:61
-#: actions/shownotice.php:92
 msgid "No such notice."
 msgstr "Нет такой записи."
 
 #. TRANS: Client error displayed trying to repeat an own notice through the API.
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:549
 msgid "Cannot repeat your own notice."
 msgstr "Невозможно повторить собственную запись."
 
 #. TRANS: Client error displayed trying to re-repeat a notice through the API.
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:92 lib/command.php:555
 msgid "Already repeated that notice."
 msgstr "Запись уже повторена."
 
@@ -1098,57 +844,43 @@ msgstr "Запись уже повторена."
 #. TRANS: Client exception thrown when using an unsupported HTTP method.
 #. TRANS: Client error shown when using a non-supported HTTP method.
 #. TRANS: Client exception thrown when using an unsupported HTTP method.
-#: actions/apistatusesshow.php:118 actions/atompubfavoritefeed.php:103
-#: actions/atompubmembershipfeed.php:105 actions/atompubshowfavorite.php:117
-#: actions/atompubshowmembership.php:116
-#: actions/atompubshowsubscription.php:122
-#: actions/atompubsubscriptionfeed.php:109
 msgid "HTTP method not supported."
 msgstr "HTTP-метод не поддерживается."
 
 #. TRANS: Exception thrown requesting an unsupported notice output format.
 #. TRANS: %s is the requested output format.
-#: actions/apistatusesshow.php:144
 #, fuzzy, php-format
 msgid "Unsupported format: %s."
 msgstr "Неподдерживаемый формат: %s"
 
 #. TRANS: Client error displayed requesting a deleted status.
-#: actions/apistatusesshow.php:155
 msgid "Status deleted."
 msgstr "Статус удалён."
 
 #. TRANS: Client error displayed requesting a status with an invalid ID.
-#: actions/apistatusesshow.php:162
 msgid "No status with that ID found."
 msgstr "Не найдено статуса с таким ID."
 
 #. TRANS: Client error displayed when trying to delete a notice not using the Atom format.
-#: actions/apistatusesshow.php:227
 msgid "Can only delete using the Atom format."
 msgstr "Можно удалить только в формате Atom."
 
 #. TRANS: Client error displayed when a user has no rights to delete notices of other users.
 #. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
-#: actions/apistatusesshow.php:235 actions/deletenotice.php:78
 msgid "Cannot delete this notice."
 msgstr "Не удаётся удалить эту запись."
 
 #. TRANS: Confirmation of notice deletion in API. %d is the ID (number) of the deleted notice.
-#: actions/apistatusesshow.php:249
 #, php-format
 msgid "Deleted notice %d"
 msgstr "Запись %d удалена"
 
 #. TRANS: Client error displayed when the parameter "status" is missing.
-#: actions/apistatusesupdate.php:221
 msgid "Client must provide a 'status' parameter with a value."
 msgstr "Клиент должен предоставить параметр «status» со значением."
 
 #. TRANS: Client error displayed when the parameter "status" is missing.
 #. TRANS: %d is the maximum number of character for a notice.
-#: actions/apistatusesupdate.php:244 actions/newnotice.php:161
-#: lib/mailhandler.php:60
 #, php-format
 msgid "That's too long. Maximum notice size is %d character."
 msgid_plural "That's too long. Maximum notice size is %d characters."
@@ -1157,13 +889,11 @@ msgstr[1] "Слишком длинная запись. Максимальная
 msgstr[2] "Слишком длинная запись. Максимальная длина — %d знаков."
 
 #. TRANS: Client error displayed when replying to a non-existing notice.
-#: actions/apistatusesupdate.php:284
 msgid "Parent notice not found."
 msgstr "Родительская запись не найдена."
 
 #. TRANS: Client error displayed exceeding the maximum notice length.
 #. TRANS: %d is the maximum lenth for a notice.
-#: actions/apistatusesupdate.php:308 actions/newnotice.php:184
 #, php-format
 msgid "Maximum notice size is %d character, including attachment URL."
 msgid_plural "Maximum notice size is %d characters, including attachment URL."
@@ -1173,13 +903,11 @@ msgstr[2] "Максимальная длина записи — %d символ
 
 #. TRANS: Client error displayed when requesting profiles of followers in an unsupported format.
 #. TRANS: Client error displayed when requesting IDs of followers in an unsupported format.
-#: actions/apisubscriptions.php:228 actions/apisubscriptions.php:258
 msgid "Unsupported format."
 msgstr "Неподдерживаемый формат."
 
 #. TRANS: Title for timeline of most recent favourite notices by a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname.
-#: actions/apitimelinefavorites.php:108
 #, php-format
 msgid "%1$s / Favorites from %2$s"
 msgstr "%1$s / Любимое от %2$s"
@@ -1187,14 +915,12 @@ msgstr "%1$s / Любимое от %2$s"
 #. TRANS: Subtitle for timeline of most recent favourite notices by a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user's full name,
 #. TRANS: %3$s is a user nickname.
-#: actions/apitimelinefavorites.php:120
 #, php-format
 msgid "%1$s updates favorited by %2$s / %3$s."
 msgstr "Обновления %1$s, отмеченные как любимые %2$s / %3$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.
-#: actions/apitimelinementions.php:115
 #, php-format
 msgid "%1$s / Updates mentioning %2$s"
 msgstr "%1$s / Обновления, упоминающие %2$s"
@@ -1202,48 +928,40 @@ msgstr "%1$s / Обновления, упоминающие %2$s"
 #. TRANS: Subtitle for timeline of most recent mentions of a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname,
 #. TRANS: %3$s is a user's full name.
-#: actions/apitimelinementions.php:131
 #, php-format
 msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr "%1$s обновил этот ответ на сообщение: %2$s / %3$s."
 
 #. TRANS: Title for site timeline. %s is the StatusNet sitename.
 #. TRANS: Public RSS feed title. %s is the StatusNet site name.
-#: actions/apitimelinepublic.php:193 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "Общая лента %s"
 
 #. TRANS: Subtitle for site timeline. %s is the StatusNet sitename.
-#: actions/apitimelinepublic.php:199
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "Обновления %s от всех!"
 
 #. TRANS: Server error displayed calling unimplemented API method for 'retweeted by me'.
-#: actions/apitimelineretweetedbyme.php:71
 msgid "Unimplemented."
 msgstr "Нереализованный метод."
 
 #. TRANS: Title for Atom feed "repeated to me". %s is the user nickname.
-#: actions/apitimelineretweetedtome.php:96
 #, php-format
 msgid "Repeated to %s"
 msgstr "Повторено для %s"
 
-#: actions/apitimelineretweetedtome.php:98
 #, fuzzy, php-format
 msgid "%1$s notices that were to repeated to %2$s / %3$s."
 msgstr "%1$s обновил этот ответ на сообщение: %2$s / %3$s."
 
 #. TRANS: Title of list of repeated notices of the logged in user.
 #. TRANS: %s is the nickname of the logged in user.
-#: actions/apitimelineretweetsofme.php:98
 #, php-format
 msgid "Repeats of %s"
 msgstr "Повторы за %s"
 
-#: actions/apitimelineretweetsofme.php:104
 #, fuzzy, php-format
 msgid "%1$s notices that %2$s / %3$s has repeated."
 msgstr "%1$s добавил запись %2$s в число любимых."
@@ -1252,174 +970,141 @@ msgstr "%1$s добавил запись %2$s в число любимых."
 #. TRANS: %s is the tag.
 #. TRANS: Title for first page of notices with tags.
 #. TRANS: %s is the tag.
-#: actions/apitimelinetag.php:101 actions/tag.php:69
 #, php-format
 msgid "Notices tagged with %s"
 msgstr "Записи с тегом %s"
 
 #. TRANS: Subtitle for timeline with lastest notices with a given tag.
 #. TRANS: %1$s is the tag, $2$s is the StatusNet sitename.
-#: actions/apitimelinetag.php:105 actions/tagrss.php:65
 #, php-format
 msgid "Updates tagged with %1$s on %2$s!"
 msgstr "Обновления с тегом %1$s на %2$s!"
 
 #. TRANS: Client error displayed trying to add a notice to another user's timeline.
-#: actions/apitimelineuser.php:308
 msgid "Only the user can add to their own timeline."
 msgstr "Только пользователь может добавлять в свою ленту."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:315
 msgid "Only accept AtomPub for Atom feeds."
 msgstr "Принимать только AtomPub для каналов Atom."
 
 #. TRANS: Client error displayed attempting to post an empty API notice.
-#: actions/apitimelineuser.php:322
 msgid "Atom post must not be empty."
 msgstr "POST-запрос Atom не может быть пустым."
 
 #. TRANS: Client error displayed attempting to post an API that is not well-formed XML.
-#: actions/apitimelineuser.php:328
 msgid "Atom post must be well-formed XML."
 msgstr "POST-запрос Atom должен быть корректным документом XML."
 
 #. TRANS: Client error displayed when not using an Atom entry.
-#: actions/apitimelineuser.php:334 actions/atompubfavoritefeed.php:228
-#: actions/atompubmembershipfeed.php:230
-#: actions/atompubsubscriptionfeed.php:236
 msgid "Atom post must be an Atom entry."
 msgstr "POST-запрос Atom должен быть объектом Atom."
 
 #. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
-#: actions/apitimelineuser.php:345
 msgid "Can only handle POST activities."
 msgstr "Возможна обработка только POST-запросов."
 
 #. TRANS: Client error displayed when using an unsupported activity object type.
 #. TRANS: %s is the unsupported activity object type.
-#: actions/apitimelineuser.php:356
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr "Невозможно обработать действия объекта типа «%s»."
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
 #. TRANS: %d is the notice ID (number).
-#: actions/apitimelineuser.php:390
 #, php-format
 msgid "No content for notice %d."
 msgstr "Нет содержания для записи %d."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
 #. TRANS: %s is the notice URI.
-#: actions/apitimelineuser.php:419
 #, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "Запись с URI «%s» уже существует."
 
 #. TRANS: Server error for unfinished API method showTrends.
-#: actions/apitrends.php:85
 msgid "API method under construction."
 msgstr "Метод API реконструируется."
 
 #. TRANS: Client error displayed when requesting user information for a non-existing user.
-#: actions/apiuserprofileimage.php:80 actions/apiusershow.php:94
 msgid "User not found."
 msgstr "Метод API не найден."
 
 #. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
 #. TRANS: Client exception.
 #. TRANS: Client error displayed trying to subscribe to a non-existing profile.
-#: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
-#: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
-#: actions/subscribe.php:110
 msgid "No such profile."
 msgstr "Нет такого профиля."
 
 #. TRANS: Subtitle for Atom favorites feed.
 #. TRANS: %1$s is a user nickname, %2$s is the StatusNet sitename.
-#: actions/atompubfavoritefeed.php:147
 #, fuzzy, php-format
 msgid "Notices %1$s has favorited on %2$s"
 msgstr "Обновлено от %1$s и его друзей на %2$s!"
 
 #. TRANS: Client exception thrown when trying to set a favorite for another user.
 #. TRANS: Client exception thrown when trying to subscribe another user.
-#: actions/atompubfavoritefeed.php:217 actions/atompubsubscriptionfeed.php:225
 msgid "Cannot add someone else's subscription."
 msgstr "Не удаётся добавить подписку на другого пользователя."
 
 #. TRANS: Client exception thrown when trying use an incorrect activity verb for the Atom pub method.
-#: actions/atompubfavoritefeed.php:240
 msgid "Can only handle favorite activities."
 msgstr "Возможна обработка только действий с любимыми записями."
 
 #. TRANS: Client exception thrown when trying favorite an object that is not a notice.
-#: actions/atompubfavoritefeed.php:250 actions/atompubmembershipfeed.php:250
 msgid "Can only fave notices."
 msgstr "Возможно только добавление записей в число любимых."
 
 #. TRANS: Client exception thrown when trying favorite a notice without content.
-#: actions/atompubfavoritefeed.php:259
 msgid "Unknown note."
 msgstr "Неизвестная запись"
 
 #. TRANS: Client exception thrown when trying favorite an already favorited notice.
-#: actions/atompubfavoritefeed.php:267
 msgid "Already a favorite."
 msgstr "Запись уже в числе любимых."
 
 #. TRANS: Title for group membership feed.
 #. TRANS: %s is a username.
-#: actions/atompubmembershipfeed.php:144
 #, php-format
 msgid "%s group memberships"
 msgstr "Участники группы %s"
 
 #. TRANS: Subtitle for group membership feed.
 #. TRANS: %1$s is a username, %2$s is the StatusNet sitename.
-#: actions/atompubmembershipfeed.php:149
 #, fuzzy, php-format
 msgid "Groups %1$s is a member of on %2$s"
 msgstr "Группы, в которых состоит %s"
 
 #. TRANS: Client exception thrown when trying subscribe someone else to a group.
-#: actions/atompubmembershipfeed.php:219
 msgid "Cannot add someone else's membership."
 msgstr "Не удаётся добавить пользователя в группу."
 
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#: actions/atompubmembershipfeed.php:242
 #, fuzzy
 msgid "Can only handle join activities."
 msgstr "Возможна обработка только POST-запросов."
 
 #. TRANS: Client exception thrown when trying to subscribe to a non-existing group.
-#: actions/atompubmembershipfeed.php:259
 #, fuzzy
 msgid "Unknown group."
 msgstr "Неизвестно"
 
 #. TRANS: Client exception thrown when trying to subscribe to an already subscribed group.
-#: actions/atompubmembershipfeed.php:267
 #, fuzzy
 msgid "Already a member."
 msgstr "Все участники"
 
 #. TRANS: Client exception thrown when trying to subscribe to group while blocked from that group.
-#: actions/atompubmembershipfeed.php:275
 msgid "Blocked by admin."
 msgstr "Заблокировано администратором."
 
 #. TRANS: Client exception thrown when referencing a non-existing favorite.
-#: actions/atompubshowfavorite.php:90
 #, fuzzy
 msgid "No such favorite."
 msgstr "Нет такого файла."
 
 #. TRANS: Client exception thrown when trying to remove a favorite notice of another user.
-#: actions/atompubshowfavorite.php:151
 #, fuzzy
 msgid "Cannot delete someone else's favorite."
 msgstr "Не удаётся удалить любимую запись."
@@ -1446,94 +1131,69 @@ msgstr "Не удаётся удалить любимую запись."
 #. TRANS: Client error displayed when trying to join a non-existing group.
 #. TRANS: Client error displayed when trying to leave a non-local group.
 #. TRANS: Client error displayed when trying to leave a non-existing group.
+#. TRANS: Client error displayed when providing an invalid group ID on the Make Admin page.
 #. 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.
 #. TRANS: Command exception text shown when a group is requested that does not exist.
 #. TRANS: Error text shown when trying to leave a group that does not exist.
-#: actions/atompubshowmembership.php:81 actions/blockedfromgroup.php:81
-#: actions/blockedfromgroup.php:89 actions/deletegroup.php:87
-#: actions/deletegroup.php:100 actions/editgroup.php:102
-#: actions/foafgroup.php:46 actions/foafgroup.php:65 actions/foafgroup.php:73
-#: actions/groupblock.php:89 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:101 actions/grouplogo.php:103
-#: actions/groupmembers.php:84 actions/groupmembers.php:92
-#: actions/grouprss.php:97 actions/grouprss.php:105
-#: actions/groupunblock.php:89 actions/joingroup.php:82
-#: actions/joingroup.php:95 actions/leavegroup.php:82
-#: actions/leavegroup.php:95 actions/makeadmin.php:86
-#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:392
 msgid "No such group."
 msgstr "Нет такой группы."
 
 #. TRANS: Client exception thrown when trying to show membership of a non-subscribed group
-#: actions/atompubshowmembership.php:91
 #, fuzzy
 msgid "Not a member."
 msgstr "Все участники"
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
-#: actions/atompubshowmembership.php:150
 #, fuzzy
 msgid "Cannot delete someone else's membership."
 msgstr "Невозможно удалить подписку на самого себя."
 
 #. TRANS: Client exception thrown when trying to display a subscription for a non-existing profile ID.
 #. TRANS: %d is the non-existing profile ID number.
-#: actions/atompubshowsubscription.php:72
-#: actions/atompubshowsubscription.php:83
-#: actions/atompubsubscriptionfeed.php:74
 #, fuzzy, php-format
 msgid "No such profile id: %d."
 msgstr "Нет такого профиля."
 
 #. 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.
-#: actions/atompubshowsubscription.php:94
 #, fuzzy, php-format
 msgid "Profile %1$d not subscribed to profile %2$d."
 msgstr "Вы не подписаны на этот профиль."
 
 #. TRANS: Client exception thrown when trying to delete a subscription of another user.
-#: actions/atompubshowsubscription.php:157
 #, fuzzy
 msgid "Cannot delete someone else's subscription."
 msgstr "Невозможно удалить подписку на самого себя."
 
 #. TRANS: Subtitle for Atom subscription feed.
 #. TRANS: %1$s is a user nickname, %s$s is the StatusNet sitename.
-#: actions/atompubsubscriptionfeed.php:153
 #, fuzzy, php-format
 msgid "People %1$s has subscribed to on %2$s"
 msgstr "Люди подписанные на %s"
 
 #. TRANS: Client error displayed when not using the follow verb.
-#: actions/atompubsubscriptionfeed.php:248
 #, fuzzy
 msgid "Can only handle Follow activities."
 msgstr "Возможна обработка только POST-запросов."
 
 #. TRANS: Client exception thrown when subscribing to an object that is not a person.
-#: actions/atompubsubscriptionfeed.php:256
 msgid "Can only follow people."
 msgstr "Можно следить только за людьми."
 
 #. TRANS: Client exception thrown when subscribing to a non-existing profile.
 #. TRANS: %s is the unknown profile ID.
-#: actions/atompubsubscriptionfeed.php:267
 #, fuzzy, php-format
 msgid "Unknown profile %s."
 msgstr "Неподдерживаемый тип файла"
 
 #. TRANS: Client error displayed trying to subscribe to an already subscribed profile.
 #. TRANS: %s is the profile the user already has a subscription on.
-#: actions/atompubsubscriptionfeed.php:275
 #, fuzzy, php-format
 msgid "Already subscribed to %s."
 msgstr "Уже подписаны!"
 
 #. TRANS: Client error displayed trying to get a non-existing attachment.
-#: actions/attachment.php:73
 msgid "No such attachment."
 msgstr "Нет такого вложения."
 
@@ -1545,31 +1205,23 @@ msgstr "Нет такого вложения."
 #. TRANS: Client error displayed when trying to view group members without providing a group nickname.
 #. TRANS: Client error displayed when requesting a group RSS feed without providing a group nickname.
 #. TRANS: Client error displayed if no nickname argument was given requesting a group page.
-#: actions/avatarbynickname.php:60 actions/blockedfromgroup.php:73
-#: actions/editgroup.php:85 actions/groupdesignsettings.php:84
-#: actions/grouplogo.php:86 actions/groupmembers.php:76
-#: actions/grouprss.php:89 actions/showgroup.php:116
 msgid "No nickname."
 msgstr "Нет имени."
 
 #. TRANS: Client error displayed trying to get an avatar without providing an avatar size.
-#: actions/avatarbynickname.php:66
 msgid "No size."
 msgstr "Нет размера."
 
 #. TRANS: Client error displayed trying to get an avatar providing an invalid avatar size.
-#: actions/avatarbynickname.php:72
 msgid "Invalid size."
 msgstr "Неверный размер."
 
 #. TRANS: Title for avatar upload page.
-#: actions/avatarsettings.php:66 lib/settingsnav.php:82
 msgid "Avatar"
 msgstr "Аватар"
 
 #. TRANS: Instruction for avatar upload page.
 #. TRANS: %s is the maximum file size, for example "500b", "10kB" or "2MB".
-#: actions/avatarsettings.php:78
 #, php-format
 msgid "You can upload your personal avatar. The maximum file size is %s."
 msgstr ""
@@ -1579,17 +1231,12 @@ msgstr ""
 #. TRANS: Server error displayed coming across a request from a user without a profile.
 #. TRANS: Server error displayed when trying to authorise a remote subscription request
 #. TRANS: while the user has no profile.
-#: actions/avatarsettings.php:108 actions/avatarsettings.php:192
-#: actions/grouplogo.php:184 actions/remotesubscribe.php:190
-#: actions/userauthorization.php:75 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr "Пользователь без соответствующего профиля."
 
 #. TRANS: Avatar upload page form legend.
 #. TRANS: Avatar upload page crop form legend.
 #. TRANS: Legend for group logo settings fieldset.
-#: actions/avatarsettings.php:122 actions/avatarsettings.php:205
-#: actions/grouplogo.php:261
 msgid "Avatar settings"
 msgstr "Настройки аватары"
 
@@ -1597,8 +1244,6 @@ msgstr "Настройки аватары"
 #. TRANS: Header on avatar upload crop form for thumbnail of originally uploaded avatar (h2).
 #. TRANS: Uploaded original file in group logo form.
 #. TRANS: Header for originally uploaded file before a crop on the group logo page.
-#: actions/avatarsettings.php:131 actions/avatarsettings.php:214
-#: actions/grouplogo.php:207 actions/grouplogo.php:270
 msgid "Original"
 msgstr "Оригинал"
 
@@ -1606,82 +1251,67 @@ msgstr "Оригинал"
 #. TRANS: Header on avatar upload crop form for thumbnail of to be used rendition of uploaded avatar (h2).
 #. TRANS: Header for preview of to be displayed group logo.
 #. TRANS: Header for the cropped group logo on the group logo page.
-#: actions/avatarsettings.php:147 actions/avatarsettings.php:227
-#: actions/grouplogo.php:219 actions/grouplogo.php:283
 msgid "Preview"
 msgstr "Просмотр"
 
 #. TRANS: Button on avatar upload page to delete current avatar.
 #. TRANS: Button text for user account deletion.
-#: actions/avatarsettings.php:155 actions/deleteaccount.php:319
 msgctxt "BUTTON"
 msgid "Delete"
 msgstr "Удалить"
 
 #. TRANS: Button on avatar upload page to upload an avatar.
 #. TRANS: Submit button to confirm upload of a user backup file for account restore.
-#: actions/avatarsettings.php:173 actions/restoreaccount.php:369
 msgctxt "BUTTON"
 msgid "Upload"
 msgstr "Загрузить"
 
 #. TRANS: Button on avatar upload crop form to confirm a selected crop as avatar.
-#: actions/avatarsettings.php:243
 msgctxt "BUTTON"
 msgid "Crop"
 msgstr "Обрезать"
 
 #. TRANS: Validation error on avatar upload form when no file was uploaded.
-#: actions/avatarsettings.php:318
 msgid "No file uploaded."
 msgstr "Файл не загружен."
 
 #. TRANS: Avatar upload form instruction after uploading a file.
-#: actions/avatarsettings.php:345
 #, fuzzy
 msgid "Pick a square area of the image to be your avatar."
 msgstr "Подберите нужный квадратный участок для вашей аватары"
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
 #. TRANS: Server error displayed trying to crop an uploaded group logo that is no longer present.
-#: actions/avatarsettings.php:360 actions/grouplogo.php:391
 msgid "Lost our file data."
 msgstr "Потеряна информация о файле."
 
 #. TRANS: Success message for having updated a user avatar.
-#: actions/avatarsettings.php:384
 msgid "Avatar updated."
 msgstr "Аватар обновлён."
 
 #. TRANS: Error displayed on the avatar upload page if the avatar could not be updated for an unknown reason.
-#: actions/avatarsettings.php:388
 msgid "Failed updating avatar."
 msgstr "Неудача при обновлении аватары."
 
 #. TRANS: Success message for deleting a user avatar.
-#: actions/avatarsettings.php:412
 msgid "Avatar deleted."
 msgstr "Аватар удалён."
 
 #. TRANS: Title for backup account page.
 #. TRANS: Option in profile settings to create a backup of the account of the currently logged in user.
-#: actions/backupaccount.php:61 actions/profilesettings.php:468
 msgid "Backup account"
 msgstr "Резервное копирование учетной записи"
 
 #. TRANS: Client exception thrown when trying to backup an account while not logged in.
-#: actions/backupaccount.php:79
 #, fuzzy
 msgid "Only logged-in users can backup their account."
 msgstr "Повторять записи могут только вошедшие пользователи."
 
 #. TRANS: Client exception thrown when trying to backup an account without having backup rights.
-#: actions/backupaccount.php:84
 msgid "You may not backup your account."
 msgstr ""
 
 #. TRANS: Information displayed on the backup account page.
-#: actions/backupaccount.php:227
 msgid ""
 "You can backup your account data in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format. This is an experimental feature and provides "
@@ -1691,32 +1321,27 @@ msgid ""
 msgstr ""
 
 #. TRANS: Submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:250
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Backup"
 msgstr "Фон"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:254
 #, fuzzy
 msgid "Backup your account."
 msgstr "Резервное копирование учетной записи"
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
-#: actions/block.php:68
 msgid "You already blocked that user."
 msgstr "Вы уже заблокировали этого пользователя."
 
 #. TRANS: Title for block user page.
 #. TRANS: Legend for block user form.
 #. TRANS: Fieldset legend for block user from group form.
-#: actions/block.php:106 actions/block.php:136 actions/groupblock.php:165
 msgid "Block user"
 msgstr "Заблокировать пользователя."
 
 #. TRANS: Explanation of consequences when blocking a user on the block user page.
-#: actions/block.php:139
 msgid ""
 "Are you sure you want to block this user? Afterwards, they will be "
 "unsubscribed from you, unable to subscribe to you in the future, and you "
@@ -1732,15 +1357,11 @@ msgstr ""
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:154 actions/deleteapplication.php:157
-#: actions/deletegroup.php:220 actions/deletenotice.php:155
-#: actions/deleteuser.php:154 actions/groupblock.php:187
 msgctxt "BUTTON"
 msgid "No"
 msgstr "Нет"
 
 #. TRANS: Submit button title for 'No' when blocking a user.
-#: actions/block.php:158
 #, fuzzy
 msgid "Do not block this user."
 msgstr "Не блокировать этого пользователя"
@@ -1751,179 +1372,143 @@ msgstr "Не блокировать этого пользователя"
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:161 actions/deleteapplication.php:164
-#: actions/deletegroup.php:227 actions/deletenotice.php:162
-#: actions/deleteuser.php:161 actions/groupblock.php:194
 msgctxt "BUTTON"
 msgid "Yes"
 msgstr "Да"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:165
 #, fuzzy
 msgid "Block this user."
 msgstr "Заблокировать пользователя."
 
 #. TRANS: Server error displayed when blocking a user fails.
-#: actions/block.php:189
 msgid "Failed to save block information."
 msgstr "Не удаётся сохранить информацию о блокировании."
 
 #. TRANS: Title for first page with list of users blocked from a group.
 #. TRANS: %s is a group nickname.
-#: actions/blockedfromgroup.php:101
 #, php-format
 msgid "%s blocked profiles"
 msgstr "Заблокированные профили %s"
 
 #. TRANS: Title for any but the first page with list of users blocked from a group.
 #. TRANS: %1$s is a group nickname, %2$d is a page number.
-#: actions/blockedfromgroup.php:106
 #, php-format
 msgid "%1$s blocked profiles, page %2$d"
 msgstr "Заблокированные профили %1$s, страница %2$d"
 
 #. TRANS: Instructions for list of users blocked from a group.
-#: actions/blockedfromgroup.php:122
 msgid "A list of the users blocked from joining this group."
 msgstr "Список пользователей, заблокированных от присоединения к этой группе."
 
 #. TRANS: Form legend for unblocking a user from a group.
-#: actions/blockedfromgroup.php:291
 msgid "Unblock user from group"
 msgstr "Разблокировать пользователя в группе."
 
 #. TRANS: Button text for unblocking a user from a group.
-#: actions/blockedfromgroup.php:323
 msgctxt "BUTTON"
 msgid "Unblock"
 msgstr "Разблокировать"
 
 #. TRANS: Tooltip for button for unblocking a user from a group.
 #. TRANS: Description of the form to unblock a user.
-#: actions/blockedfromgroup.php:327 lib/unblockform.php:78
 msgid "Unblock this user"
 msgstr "Разблокировать пользователя."
 
 #. TRANS: Title for mini-posting window loaded from bookmarklet.
 #. TRANS: %s is the StatusNet site name.
-#: actions/bookmarklet.php:51
 #, php-format
 msgid "Post to %s"
 msgstr "Отправить в %s"
 
 #. TRANS: Client error displayed when not providing a confirmation code in the contact address confirmation action.
-#: actions/confirmaddress.php:74
 msgid "No confirmation code."
 msgstr "Нет кода подтверждения."
 
 #. TRANS: Client error displayed when providing a non-existing confirmation code in the contact address confirmation action.
-#: actions/confirmaddress.php:80
 msgid "Confirmation code not found."
 msgstr "Код подтверждения не найден."
 
 #. TRANS: Client error displayed when not providing a confirmation code for another user in the contact address confirmation action.
-#: actions/confirmaddress.php:86
 msgid "That confirmation code is not for you!"
 msgstr "Это не Ваш код подтверждения!"
 
 #. TRANS: Server error for an unknown address type, which can be 'email', 'sms', or the name of an IM network (such as 'xmpp' or 'aim')
-#: actions/confirmaddress.php:94
-#, fuzzy, php-format
+#, php-format
 msgid "Unrecognized address type %s"
 msgstr "Нераспознанный тип адреса %s."
 
 #. TRANS: Client error for an already confirmed email/jabber/sms address.
-#: actions/confirmaddress.php:103 actions/confirmaddress.php:136
 msgid "That address has already been confirmed."
 msgstr "Этот адрес уже подтверждён."
 
-#: actions/confirmaddress.php:121 actions/imsettings.php:444
-#: actions/userdesignsettings.php:306
-#, fuzzy
 msgid "Couldn't update user."
 msgstr "Не удаётся обновить пользователя."
 
-#: actions/confirmaddress.php:144
 #, fuzzy
 msgid "Couldn't update user im preferences."
 msgstr "Не удаётся обновить пользовательскую запись."
 
-#: actions/confirmaddress.php:156
 #, fuzzy
 msgid "Couldn't insert user im preferences."
 msgstr "Не удаётся вставить новую подписку."
 
 #. TRANS: Server error displayed when an address confirmation code deletion from the
 #. TRANS: database fails in the contact address confirmation action.
-#: actions/confirmaddress.php:169
 msgid "Could not delete address confirmation."
 msgstr "Не удаётся удалить подверждение адреса."
 
 #. TRANS: Title for the contact address confirmation action.
-#: actions/confirmaddress.php:185
 msgid "Confirm address"
 msgstr "Подтвердить адрес"
 
 #. TRANS: Success message for the contact address confirmation action.
 #. TRANS: %s can be 'email', 'jabber', or 'sms'.
-#: actions/confirmaddress.php:200
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "Адрес «%s» подтверждён для вашего аккаунта."
 
 #. TRANS: Title for page with a conversion (multiple notices in context).
-#: actions/conversation.php:96
 msgid "Conversation"
 msgstr "Дискуссия"
 
 #. TRANS: Header on conversation page. Hidden by default (h2).
 #. TRANS: Label for user statistics.
-#: actions/conversation.php:149 lib/noticelist.php:87
-#: lib/profileaction.php:246 lib/searchgroupnav.php:82
-#: lib/threadednoticelist.php:66
 msgid "Notices"
 msgstr "Записи"
 
 #. TRANS: Client exception displayed trying to delete a user account while not logged in.
-#: actions/deleteaccount.php:71
 #, fuzzy
 msgid "Only logged-in users can delete their account."
 msgstr "Повторять записи могут только вошедшие пользователи."
 
 #. TRANS: Client exception displayed trying to delete a user account without have the rights to do that.
-#: actions/deleteaccount.php:77
 #, fuzzy
 msgid "You cannot delete your account."
 msgstr "Вы не можете удалять пользователей."
 
 #. TRANS: Confirmation text for user deletion. The user has to type this exactly the same, including punctuation.
-#: actions/deleteaccount.php:160 actions/deleteaccount.php:297
 msgid "I am sure."
 msgstr "Я уверен."
 
 #. TRANS: Notification for user about the text that must be input to be able to delete a user account.
 #. TRANS: %s is the text that needs to be input.
-#: actions/deleteaccount.php:164
 #, php-format
 msgid "You must write \"%s\" exactly in the box."
 msgstr ""
 
 #. TRANS: Confirmation that a user account has been deleted.
-#: actions/deleteaccount.php:206
 #, fuzzy
 msgid "Account deleted."
 msgstr "Аватар удалён."
 
 #. TRANS: Page title for page on which a user account can be deleted.
 #. TRANS: Option in profile settings to delete the account of the currently logged in user.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:476
 #, fuzzy
 msgid "Delete account"
 msgstr "Создать новый аккаунт"
 
 #. TRANS: Form text for user deletion form.
-#: actions/deleteaccount.php:279
 msgid ""
 "This will <strong>permanently delete</strong> your account data from this "
 "server."
@@ -1931,7 +1516,6 @@ msgstr ""
 
 #. TRANS: Additional form text for user deletion form shown if a user has account backup rights.
 #. TRANS: %s is a URL to the backup page.
-#: actions/deleteaccount.php:285
 #, php-format
 msgid ""
 "You are strongly advised to <a href=\"%s\">back up your data</a> before "
@@ -1940,56 +1524,43 @@ msgstr ""
 
 #. TRANS: Field label for delete account confirmation entry.
 #. TRANS: Field label for password reset form where the password has to be typed again.
-#: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:262 actions/register.php:419
 msgid "Confirm"
 msgstr "Подтверждение"
 
 #. TRANS: Input title for the delete account field.
 #. TRANS: %s is the text that needs to be input.
-#: actions/deleteaccount.php:304
 #, fuzzy, php-format
 msgid "Enter \"%s\" to confirm that you want to delete your account."
 msgstr "Вы не можете удалять пользователей."
 
 #. TRANS: Button title for user account deletion.
-#: actions/deleteaccount.php:323
 #, fuzzy
 msgid "Permanently delete your account"
 msgstr "Вы не можете удалять пользователей."
 
 #. TRANS: Client error displayed trying to delete an application while not logged in.
-#: actions/deleteapplication.php:62
 msgid "You must be logged in to delete an application."
 msgstr "Вы должны войти в систему, чтобы удалить приложение."
 
 #. TRANS: Client error displayed trying to delete an application that does not exist.
-#: actions/deleteapplication.php:71
 msgid "Application not found."
 msgstr "Приложение не найдено."
 
 #. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
-#: actions/deleteapplication.php:79 actions/editapplication.php:78
-#: actions/showapplication.php:90
 msgid "You are not the owner of this application."
 msgstr "Вы не являетесь владельцем этого приложения."
 
 #. TRANS: Client error text when there is a problem with the session token.
-#: actions/deleteapplication.php:102 actions/editapplication.php:131
-#: actions/newapplication.php:112 actions/showapplication.php:113
-#: lib/action.php:1391
 msgid "There was a problem with your session token."
 msgstr "Проблема с вашим ключом сессии."
 
 #. TRANS: Title for delete application page.
 #. TRANS: Fieldset legend on delete application page.
-#: actions/deleteapplication.php:124 actions/deleteapplication.php:149
 msgid "Delete application"
 msgstr "Удалить приложение"
 
 #. TRANS: Confirmation text on delete application page.
-#: actions/deleteapplication.php:152
 msgid ""
 "Are you sure you want to delete this application? This will clear all data "
 "about the application from the database, including all existing user "
@@ -2000,57 +1571,47 @@ msgstr ""
 "пользователей."
 
 #. TRANS: Submit button title for 'No' when deleting an application.
-#: actions/deleteapplication.php:161
 #, fuzzy
 msgid "Do not delete this application."
 msgstr "Не удаляйте это приложение"
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
-#: actions/deleteapplication.php:167
 #, fuzzy
 msgid "Delete this application."
 msgstr "Удалить это приложение"
 
 #. TRANS: Client error when trying to delete group while not logged in.
-#: actions/deletegroup.php:64
 msgid "You must be logged in to delete a group."
 msgstr "Вы должны авторизоваться, чтобы удалить группу."
 
 #. TRANS: Client error when trying to delete a group without providing a nickname or ID for the group.
 #. TRANS: Client error displayed when trying to join a group without providing a group name or group ID.
 #. TRANS: Client error displayed when trying to leave a group without providing a group name or group ID.
-#: actions/deletegroup.php:94 actions/joingroup.php:89
-#: actions/leavegroup.php:89
 msgid "No nickname or ID."
 msgstr "Нет имени или ID."
 
 #. TRANS: Client error when trying to delete a group without having the rights to delete it.
-#: actions/deletegroup.php:107
 msgid "You are not allowed to delete this group."
 msgstr "Вы не можете удалить эту группу."
 
 #. TRANS: Server error displayed if a group could not be deleted.
 #. TRANS: %s is the name of the group that could not be deleted.
-#: actions/deletegroup.php:150
 #, php-format
 msgid "Could not delete group %s."
 msgstr "Не удаётся удалить группу %s."
 
 #. TRANS: Message given after deleting a group.
 #. TRANS: %s is the deleted group's name.
-#: actions/deletegroup.php:159
 #, php-format
 msgid "Deleted group %s"
 msgstr "Группа %s удалена"
 
 #. TRANS: Title of delete group page.
 #. TRANS: Form legend for deleting a group.
-#: actions/deletegroup.php:176 actions/deletegroup.php:202
 msgid "Delete group"
 msgstr "Удалить группу"
 
 #. TRANS: Warning in form for deleleting a group.
-#: actions/deletegroup.php:206
 msgid ""
 "Are you sure you want to delete this group? This will clear all data about "
 "the group from the database, without a backup. Public posts to this group "
@@ -2061,13 +1622,11 @@ msgstr ""
 "записи в этой группе по прежнему останутся в личных лентах."
 
 #. TRANS: Submit button title for 'No' when deleting a group.
-#: actions/deletegroup.php:224
 #, fuzzy
 msgid "Do not delete this group."
 msgstr "Не удаляйте эту группу"
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
-#: actions/deletegroup.php:231
 #, fuzzy
 msgid "Delete this group."
 msgstr "Удалить эту группу"
@@ -2078,22 +1637,18 @@ msgstr "Удалить эту группу"
 #. TRANS: Client error displayed trying to block a user from a group while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying to log out when not logged in.
+#. TRANS: Client error displayed when trying to access the "make admin" page while not logged in.
+#. TRANS: Client error displayed trying to create a new direct message while not logged in.
+#. TRANS: Client error displayed trying to send a notice while not logged in.
+#. TRANS: Client error displayed trying to nudge a user without being logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
 #. TRANS: Client error displayed when trying to change user options while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
-#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:70
-#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
-#: actions/nudge.php:63 actions/pluginenable.php:97 actions/subedit.php:33
-#: actions/subscribe.php:98 actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:71 lib/profileformaction.php:63
-#: lib/settingsaction.php:72
 msgid "Not logged in."
 msgstr "Не авторизован."
 
 #. TRANS: Instructions for deleting a notice.
-#: actions/deletenotice.php:110
 msgid ""
 "You are about to permanently delete a notice. Once this is done, it cannot "
 "be undone."
@@ -2103,51 +1658,42 @@ msgstr ""
 
 #. TRANS: Page title when deleting a notice.
 #. TRANS: Fieldset legend for the delete notice form.
-#: actions/deletenotice.php:117 actions/deletenotice.php:148
 msgid "Delete notice"
 msgstr "Удалить запись"
 
 #. TRANS: Message for the delete notice form.
-#: actions/deletenotice.php:152
 msgid "Are you sure you want to delete this notice?"
 msgstr "Вы уверены, что хотите удалить эту запись?"
 
 #. TRANS: Submit button title for 'No' when deleting a notice.
-#: actions/deletenotice.php:159
 #, fuzzy
 msgid "Do not delete this notice."
 msgstr "Не удалять эту запись"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:166
 #, fuzzy
 msgid "Delete this notice."
 msgstr "Удалить эту запись"
 
 #. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
-#: actions/deleteuser.php:66
 msgid "You cannot delete users."
 msgstr "Вы не можете удалять пользователей."
 
 #. TRANS: Client error displayed when trying to delete a non-local user.
-#: actions/deleteuser.php:74
 msgid "You can only delete local users."
 msgstr "Вы можете удалять только внутренних пользователей."
 
 #. TRANS: Title of delete user page.
-#: actions/deleteuser.php:110
 #, fuzzy
 msgctxt "TITLE"
 msgid "Delete user"
 msgstr "Удалить пользователя"
 
 #. TRANS: Fieldset legend on delete user page.
-#: actions/deleteuser.php:134
 msgid "Delete user"
 msgstr "Удалить пользователя"
 
 #. TRANS: Information text to request if a user is certain that the described action has to be performed.
-#: actions/deleteuser.php:138
 msgid ""
 "Are you sure you want to delete this user? This will clear all data about "
 "the user from the database, without a backup."
@@ -2156,99 +1702,80 @@ msgstr ""
 "всех данных о пользователе из базы данных без возможности восстановления."
 
 #. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/deleteuser.php:158
 #, fuzzy
 msgid "Do not delete this user."
 msgstr "Не удаляйте эту группу"
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
-#: actions/deleteuser.php:165
 #, fuzzy
 msgid "Delete this user."
 msgstr "Удалить этого пользователя"
 
 #. TRANS: Message used as title for design settings for the site.
-#: actions/designadminpanel.php:60 lib/settingsnav.php:97
 msgid "Design"
 msgstr "Оформление"
 
 #. TRANS: Instructions for design adminsitration panel.
-#: actions/designadminpanel.php:71
 msgid "Design settings for this StatusNet site"
 msgstr "Настройки оформления для этого сайта StatusNet"
 
 #. TRANS: Client error displayed when a logo URL does is not valid.
-#: actions/designadminpanel.php:327
 msgid "Invalid logo URL."
 msgstr "Неверный URL логотипа."
 
 #. TRANS: Client error displayed when an SSL logo URL is invalid.
-#: actions/designadminpanel.php:333
 msgid "Invalid SSL logo URL."
 msgstr "Неверный URL логотипа SSL."
 
 #. TRANS: Client error displayed when a theme is submitted through the form that is not in the theme list.
 #. TRANS: %s is the chosen unavailable theme.
-#: actions/designadminpanel.php:339
 #, php-format
 msgid "Theme not available: %s."
 msgstr "Тема не доступна: %s."
 
 #. TRANS: Fieldset legend for form to change logo.
-#: actions/designadminpanel.php:437
 msgid "Change logo"
 msgstr "Изменить логотип"
 
 #. TRANS: Field label for StatusNet site logo.
-#: actions/designadminpanel.php:444
 msgid "Site logo"
 msgstr "Логотип сайта"
 
 #. TRANS: Field label for SSL StatusNet site logo.
-#: actions/designadminpanel.php:452
 msgid "SSL logo"
 msgstr "Логотип SSL"
 
 #. TRANS: Fieldset legend for form change StatusNet site's theme.
-#: actions/designadminpanel.php:467
 msgid "Change theme"
 msgstr "Изменить тему"
 
 #. TRANS: Field label for dropdown to choose site theme.
-#: actions/designadminpanel.php:485
 msgid "Site theme"
 msgstr "Тема сайта"
 
 #. TRANS: Title for field label for dropdown to choose site theme.
-#: actions/designadminpanel.php:487
 msgid "Theme for the site."
 msgstr "Тема для сайта."
 
 #. TRANS: Field label for uploading a cutom theme.
-#: actions/designadminpanel.php:494
 msgid "Custom theme"
 msgstr "Особая тема"
 
 #. TRANS: Form instructions for uploading a cutom StatusNet theme.
-#: actions/designadminpanel.php:499
 msgid "You can upload a custom StatusNet theme as a .ZIP archive."
 msgstr "Вы можете загрузить особую тему StatusNet в виде ZIP-архива."
 
 #. TRANS: Fieldset legend for theme background image.
-#: actions/designadminpanel.php:515
 msgid "Change background image"
 msgstr "Изменение фонового изображения"
 
 #. TRANS: Field label for background image on theme designer page.
 #. TRANS: Field label for background color selector.
 #. TRANS: Label on profile design page for setting a profile page background colour.
-#: actions/designadminpanel.php:525 actions/designadminpanel.php:609
-#: lib/designform.php:238
 msgid "Background"
 msgstr "Фон"
 
 #. TRANS: Form guide for background image upload form on theme designer page.
-#: actions/designadminpanel.php:531
 #, php-format
 msgid ""
 "You can upload a background image for the site. The maximum file size is %1"
@@ -2258,202 +1785,167 @@ msgstr ""
 "составляет %1$s."
 
 #. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:558
 msgid "On"
 msgstr "Включить"
 
 #. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:575
 msgid "Off"
 msgstr "Отключить"
 
 #. TRANS: Form guide for turning background image on or off on theme designer page.
 #. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
 #. TRANS: use of the uploaded profile image.
-#: actions/designadminpanel.php:577 lib/designform.php:214
 msgid "Turn background image on or off."
 msgstr "Включить или отключить показ фонового изображения."
 
 #. TRANS: Checkbox label to title background image on theme designer page.
 #. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-#: actions/designadminpanel.php:583 lib/designform.php:220
 msgid "Tile background image"
 msgstr "Растянуть фоновое изображение"
 
 #. TRANS: Fieldset legend for theme colors.
-#: actions/designadminpanel.php:598
 #, fuzzy
 msgid "Change colors"
 msgstr "Изменение цветовой гаммы"
 
 #. TRANS: Field label for content color selector.
 #. TRANS: Label on profile design page for setting a profile page content colour.
-#: actions/designadminpanel.php:623 lib/designform.php:252
 msgid "Content"
 msgstr "Содержание"
 
 #. TRANS: Field label for sidebar color selector.
 #. TRANS: Label on profile design page for setting a profile page sidebar colour.
-#: actions/designadminpanel.php:637 lib/designform.php:266
 msgid "Sidebar"
 msgstr "Боковая панель"
 
 #. TRANS: Field label for text color selector.
 #. TRANS: Label on profile design page for setting a profile page text colour.
-#: actions/designadminpanel.php:651 lib/designform.php:280
 msgid "Text"
 msgstr "Текст"
 
 #. TRANS: Field label for link color selector.
 #. TRANS: Label on profile design page for setting a profile page links colour.
-#: actions/designadminpanel.php:665 lib/designform.php:294
 msgid "Links"
 msgstr "Ссылки"
 
 #. TRANS: Fieldset legend for advanced theme design settings.
-#: actions/designadminpanel.php:691
 msgid "Advanced"
 msgstr "Расширенный"
 
 #. TRANS: Field label for custom CSS.
-#: actions/designadminpanel.php:696
 msgid "Custom CSS"
 msgstr "Особый CSS"
 
 #. TRANS: Button text for resetting theme settings.
-#: actions/designadminpanel.php:718
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Use defaults"
 msgstr "Использовать значения по умолчанию"
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:720
 #, fuzzy
 msgid "Restore default designs."
 msgstr "Восстановить оформление по умолчанию"
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:728
 #, fuzzy
 msgid "Reset back to default."
 msgstr "Восстановить значения по умолчанию"
 
 #. TRANS: Title for button for saving theme settings.
-#: actions/designadminpanel.php:736
 #, fuzzy
 msgid "Save design."
 msgstr "Сохранить оформление"
 
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
-#: actions/disfavor.php:83
 msgid "This notice is not a favorite!"
 msgstr "Эта запись не входит в число ваших любимых записей!"
 
 #. TRANS: Title for page on which favorites can be added.
-#: actions/disfavor.php:98
 msgid "Add to favorites"
 msgstr "Добавить в любимые"
 
 #. TRANS: Client exception thrown when requesting a document from the documentation that does not exist.
 #. TRANS: %s is the non-existing document.
-#: actions/doc.php:155
 #, fuzzy, php-format
 msgid "No such document \"%s\"."
 msgstr "Нет такого документа «%s»"
 
 #. TRANS: Title for "Edit application" form.
 #. TRANS: Form legend.
-#: actions/editapplication.php:54 lib/applicationeditform.php:129
 msgid "Edit application"
 msgstr "Изменить приложение"
 
 #. TRANS: Client error displayed trying to edit an application while not logged in.
-#: actions/editapplication.php:66
 msgid "You must be logged in to edit an application."
 msgstr "Вы должны авторизоваться, чтобы изменить приложение."
 
 #. TRANS: Client error displayed trying to edit an application that does not exist.
-#: actions/editapplication.php:83 actions/showapplication.php:83
 msgid "No such application."
 msgstr "Нет такого приложения."
 
 #. TRANS: Instructions for "Edit application" form.
-#: actions/editapplication.php:167
 msgid "Use this form to edit your application."
 msgstr "Воспользуйтесь этой формой, чтобы изменить приложение."
 
 #. TRANS: Validation error shown when not providing a name in the "Edit application" form.
 #. TRANS: Validation error shown when not providing a name in the "New application" form.
-#: actions/editapplication.php:184 actions/newapplication.php:164
 msgid "Name is required."
 msgstr "Имя обязательно."
 
 #. 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.
-#: actions/editapplication.php:188 actions/newapplication.php:172
 msgid "Name is too long (maximum 255 characters)."
 msgstr "Слишком длинное имя (максимум 255 символов)."
 
 #. TRANS: Validation error shown when providing a name for an application that already exists in the "Edit application" form.
 #. TRANS: Validation error shown when providing a name for an application that already exists in the "New application" form.
-#: actions/editapplication.php:192 actions/newapplication.php:168
 msgid "Name already in use. Try another one."
 msgstr "Такое имя уже используется. Попробуйте какое-нибудь другое."
 
 #. TRANS: Validation error shown when not providing a description in the "Edit application" form.
 #. TRANS: Validation error shown when not providing a description in the "New application" form.
-#: actions/editapplication.php:196 actions/newapplication.php:176
 msgid "Description is required."
 msgstr "Описание обязательно."
 
 #. TRANS: Validation error shown when providing too long a source URL in the "Edit application" form.
-#: actions/editapplication.php:209
 msgid "Source URL is too long."
 msgstr "URL источника слишком длинный."
 
 #. TRANS: Validation error shown when providing an invalid source URL in the "Edit application" form.
 #. TRANS: Validation error shown when providing an invalid source URL in the "New application" form.
-#: actions/editapplication.php:216 actions/newapplication.php:199
 msgid "Source URL is not valid."
 msgstr "URL источника недействителен."
 
 #. 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.
-#: actions/editapplication.php:220 actions/newapplication.php:203
 msgid "Organization is required."
 msgstr "Организация обязательна."
 
 #. TRANS: Validation error shown when providing too long an arganisation name in the "Edit application" form.
-#: actions/editapplication.php:224 actions/newapplication.php:207
 msgid "Organization is too long (maximum 255 characters)."
 msgstr "Слишком длинное название организации (максимум 255 символов)."
 
 #. TRANS: Form validation error show when an organisation name has not been provided in the edit application form.
 #. TRANS: Form validation error show when an organisation name has not been provided in the new application form.
-#: actions/editapplication.php:228 actions/newapplication.php:211
 msgid "Organization homepage is required."
 msgstr "Домашняя страница организации обязательна."
 
 #. TRANS: Validation error shown when providing too long a callback URL in the "Edit application" form.
 #. TRANS: Validation error shown when providing too long a callback URL in the "New application" form.
-#: actions/editapplication.php:239 actions/newapplication.php:225
 msgid "Callback is too long."
 msgstr "Обратный вызов слишком длинный."
 
 #. TRANS: Validation error shown when providing an invalid callback URL in the "Edit application" form.
 #. TRANS: Validation error shown when providing an invalid callback URL in the "New application" form.
-#: actions/editapplication.php:247 actions/newapplication.php:235
 msgid "Callback URL is not valid."
 msgstr "URL-адрес обратного вызова недействителен."
 
 #. TRANS: Server error occuring when an application could not be updated from the "Edit application" form.
-#: actions/editapplication.php:284
 msgid "Could not update application."
 msgstr "Не удаётся обновить приложение."
 
 #. TRANS: Title for form to edit a group. %s is a group nickname.
-#: actions/editgroup.php:55
 #, php-format
 msgid "Edit %s group"
 msgstr "Изменить информацию о группе %s"
@@ -2461,40 +1953,40 @@ msgstr "Изменить информацию о группе %s"
 #. TRANS: Client error displayed trying to edit a group while not logged in.
 #. TRANS: Client error displayed when trying to create a group while not logged in.
 #. TRANS: Client error displayed trying to create a group while not logged in.
-#: actions/editgroup.php:68 actions/grouplogo.php:69 actions/newgroup.php:65
 msgid "You must be logged in to create a group."
 msgstr "Вы должны авторизоваться, чтобы создать новую группу."
 
 #. TRANS: Form instructions for group edit form.
-#: actions/editgroup.php:161
 msgid "Use this form to edit the group."
 msgstr "Заполните информацию о группе в следующие поля"
 
+#. TRANS: Group edit form validation error.
+#. TRANS: Group create form validation error.
+#. TRANS: %s is the invalid alias.
+#, php-format
+msgid "Invalid alias: \"%s\""
+msgstr "Неверный алиас: «%s»"
+
 #. TRANS: Group edit form success message.
-#: actions/editgroup.php:301
 msgid "Options saved."
 msgstr "Настройки сохранены."
 
 #. TRANS: Title for e-mail settings.
-#: actions/emailsettings.php:60
 msgid "Email settings"
 msgstr "Настройка почты"
 
 #. TRANS: E-mail settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/emailsettings.php:74
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 msgstr "Управление процессом получения электронной почты с %%site.name%%."
 
 #. TRANS: Form legend for e-mail settings form.
 #. TRANS: Field label for e-mail address input in e-mail settings form.
-#: actions/emailsettings.php:104 actions/emailsettings.php:130
 msgid "Email address"
 msgstr "Адрес эл. почты"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:110
 msgid "Current confirmed email address."
 msgstr "Подтверждённый в настоящее время электронный адрес."
 
@@ -2503,15 +1995,11 @@ msgstr "Подтверждённый в настоящее время элект
 #. TRANS: Button label to remove a confirmed IM address.
 #. TRANS: Button label to remove a confirmed SMS address.
 #. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
-#: actions/emailsettings.php:113 actions/emailsettings.php:180
-#: actions/imsettings.php:119 actions/smssettings.php:119
-#: actions/smssettings.php:175
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Удалить"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:120
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -2524,47 +2012,39 @@ msgstr ""
 #. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
 #. TRANS: Any other domain may be owned by a legitimate person or
 #. TRANS: organization.
-#: actions/emailsettings.php:137
 msgid "Email address, like \"UserName@example.org\""
 msgstr "Электронный адрес вида \"UserName@example.org\""
 
 #. TRANS: Button label for adding an e-mail address in e-mail settings form.
 #. TRANS: Button label for adding an IM address in IM settings form.
 #. TRANS: Button label for adding a SMS phone number in SMS settings form.
-#: actions/emailsettings.php:141 actions/imsettings.php:147
-#: actions/smssettings.php:157
 msgctxt "BUTTON"
 msgid "Add"
 msgstr "Добавить"
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:149 actions/smssettings.php:166
 msgid "Incoming email"
 msgstr "Входящий электронный адрес"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:155
 msgid "I want to post notices by email."
 msgstr "Я хочу отправлять записи по электронной почте."
 
 #. TRANS: Form instructions for incoming e-mail form in e-mail settings.
 #. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
-#: actions/emailsettings.php:177 actions/smssettings.php:173
 msgid "Send email to this address to post new notices."
 msgstr ""
 "Отправляйте электронные письма на этот адрес для отсылки новых записей."
 
 #. TRANS: Instructions for incoming e-mail address input form, when an address has already been assigned.
 #. TRANS: Instructions for incoming SMS e-mail address input form.
-#: actions/emailsettings.php:186 actions/smssettings.php:181
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr ""
 "Создаёт новый адрес электронной почты для отсылки сообщений; отменяет старый "
 "адрес."
 
 #. TRANS: Instructions for incoming e-mail address input form.
-#: actions/emailsettings.php:190
 msgid ""
 "To send notices via email, we need to create a unique email address for you "
 "on this server:"
@@ -2572,96 +2052,78 @@ msgstr ""
 
 #. TRANS: Button label for adding an e-mail address to send notices from.
 #. TRANS: Button label for adding an SMS e-mail address to send notices from.
-#: actions/emailsettings.php:196 actions/smssettings.php:184
 msgctxt "BUTTON"
 msgid "New"
 msgstr "Новый"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:205
 msgid "Email preferences"
 msgstr "Настройки эл. почты"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:213
 msgid "Send me notices of new subscriptions through email."
 msgstr "Уведомлять меня о новых подписчиках по почте."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:219
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr ""
 "Посылать мне сообщение по электронной почте, если кто-нибудь добавит мою "
 "запись в число любимых."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:226
 msgid "Send me email when someone sends me a private message."
 msgstr ""
 "Посылать мне сообщение по электронной почте, если кто-нибудь пошлёт мне "
 "приватное сообщение."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:232
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr ""
 "Посылать мне сообщение по электронной почте, если кто-нибудь пошлёт мне «@-"
 "ответ»."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:238
 msgid "Allow friends to nudge me and send me an email."
 msgstr ""
 "Разрешить друзьям «подталкивать» меня и посылать мне электронные сообщения."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:244
 msgid "Publish a MicroID for my email address."
 msgstr "Опубликовать MicroID для моего электронного адреса."
 
 #. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:362
 msgid "Email preferences saved."
 msgstr "Настройки эл. почты сохранены."
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:381
 msgid "No email address."
 msgstr "Нет электронного адреса."
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:389
 #, fuzzy
 msgid "Cannot normalize that email address."
 msgstr "Не удаётся стандартизировать этот электронный адрес"
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:394 actions/register.php:197
-#: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "Неверный электронный адрес."
 
 #. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:398
 msgid "That is already your email address."
 msgstr "Это уже Ваш электронный адрес."
 
 #. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:402
 msgid "That email address already belongs to another user."
 msgstr "Этот электронный адрес уже задействован другим пользователем."
 
 #. TRANS: Server error thrown on database error adding e-mail confirmation code.
 #. TRANS: Server error thrown on database error adding Instant Messaging confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:419 actions/imsettings.php:362
-#: actions/smssettings.php:364
 #, fuzzy
 msgid "Could not insert confirmation code."
 msgstr "Не удаётся вставить код подтверждения."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:426
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
@@ -2673,104 +2135,84 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling Instant Messaging address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:446 actions/imsettings.php:391
-#: actions/smssettings.php:398
 msgid "No pending confirmation to cancel."
 msgstr "Нет подтверждения отказа."
 
 #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:451
 msgid "That is the wrong email address."
 msgstr "Это неверный адрес эл. почты."
 
 #. TRANS: Server error thrown on database error canceling e-mail address confirmation.
 #. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
-#: actions/emailsettings.php:460 actions/smssettings.php:412
 #, fuzzy
 msgid "Could not delete email confirmation."
 msgstr "Не удаётся удалить подверждение по электронному адресу."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:465
 msgid "Email confirmation cancelled."
 msgstr "Подтверждение эл. почты отменено."
 
 #. TRANS: Message given trying to remove an e-mail address that is not
 #. TRANS: registered for the active user.
-#: actions/emailsettings.php:484
 msgid "That is not your email address."
 msgstr "Это не Ваш электронный адрес."
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:505
 msgid "The email address was removed."
 msgstr "Адрес эл. почты удалён."
 
 #. TRANS: Form validation error displayed when trying to remove an incoming e-mail address while no address has been set.
-#: actions/emailsettings.php:519 actions/smssettings.php:554
 msgid "No incoming email address."
 msgstr "Нет входящего электронного адреса."
 
 #. 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.
-#: actions/emailsettings.php:531 actions/emailsettings.php:555
-#: actions/smssettings.php:565 actions/smssettings.php:590
 #, fuzzy
 msgid "Could not update user record."
 msgstr "Не удаётся обновить пользовательскую запись."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
 #. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:535 actions/smssettings.php:569
 msgid "Incoming email address removed."
 msgstr "Входящий электронный адрес удалён."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
 #. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:559 actions/smssettings.php:594
 msgid "New incoming email address added."
 msgstr "Новый входящий электронный адрес добавлен."
 
 #. TRANS: Client error displayed when trying to mark a notice as favorite that already is a favorite.
-#: actions/favor.php:80
 msgid "This notice is already a favorite!"
 msgstr "Эта запись уже входит в число любимых!"
 
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
-#: actions/favor.php:95
 #, fuzzy
 msgid "Disfavor favorite."
 msgstr "Разлюбить"
 
 #. TRANS: Page title for first page of favorited notices.
 #. TRANS: Title for favourited notices section.
-#: actions/favorited.php:65 lib/popularnoticesection.php:62
-#: lib/publicgroupnav.php:93
 msgid "Popular notices"
 msgstr "Популярные записи"
 
 #. TRANS: Page title for all but first page of favorited notices.
 #. TRANS: %d is the page number being displayed.
-#: actions/favorited.php:69
 #, php-format
 msgid "Popular notices, page %d"
 msgstr "Популярные записи, страница %d"
 
 #. TRANS: Description on page displaying favorited notices.
-#: actions/favorited.php:81
 msgid "The most popular notices on the site right now."
 msgstr "Самые популярные записи на сайте на данный момент."
 
 #. TRANS: Text displayed instead of a list when a site does not yet have any favourited notices.
-#: actions/favorited.php:149
 msgid "Favorite notices appear on this page but no one has favorited one yet."
 msgstr ""
 "На этой странице появляются любимые записи, однако ни одна запись таковой "
 "пока не отмечена."
 
 #. TRANS: Additional text displayed instead of a list when a site does not yet have any favourited notices for logged in users.
-#: actions/favorited.php:153
 msgid ""
 "Be the first to add a notice to your favorites by clicking the fave button "
 "next to any notice you like."
@@ -2780,7 +2222,6 @@ msgstr ""
 
 #. TRANS: Additional text displayed instead of a list when a site does not yet have any favourited notices for not logged in users.
 #. TRANS: %%action.register%% is a registration link. "[link text](link)" is Mark Down. Do not change the formatting.
-#: actions/favorited.php:158
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to add a "
@@ -2793,181 +2234,146 @@ msgstr ""
 #. TRANS: %s is a user's nickname.
 #. TRANS: Title for first page of favourite notices of a user.
 #. TRANS: %s is the user for whom the favourite notices are displayed.
-#: actions/favoritesrss.php:111 actions/showfavorites.php:76
-#: lib/personalgroupnav.php:110
 #, php-format
 msgid "%s's favorite notices"
 msgstr "Любимые записи %s"
 
 #. TRANS: Desciption of RSS feed with favourite notices of a user.
 #. TRANS: %1$s is a user's nickname, %2$s is the name of the StatusNet site.
-#: actions/favoritesrss.php:117
 #, php-format
 msgid "Updates favored by %1$s on %2$s!"
 msgstr "Обновления, понравившиеся %1$s на %2$s!"
 
 #. TRANS: Page title for first page of featured users.
 #. TRANS: Title for featured users section.
-#: actions/featured.php:69 lib/featureduserssection.php:87
-#: lib/publicgroupnav.php:89
 msgid "Featured users"
 msgstr "Особые пользователи"
 
 #. TRANS: Page title for all but first page of featured users.
 #. TRANS: %d is the page number being displayed.
-#: actions/featured.php:73
 #, php-format
 msgid "Featured users, page %d"
 msgstr "Особые пользователи, страница %d"
 
 #. TRANS: Description on page displaying featured users.
-#: actions/featured.php:102
 #, fuzzy, php-format
 msgid "A selection of some great users on %s."
 msgstr "Некоторые из известных пользователей на %s"
 
 #. TRANS: Client error displayed when no notice ID was given trying do display a file.
-#: actions/file.php:36
 msgid "No notice ID."
 msgstr "Нет ID записи."
 
 #. TRANS: Client error displayed when an invalid notice ID was given trying do display a file.
-#: actions/file.php:41
 msgid "No notice."
 msgstr "Запись отсутствует."
 
 #. TRANS: Client error displayed when trying do display a file for a notice without a file attachement.
-#: actions/file.php:46
 msgid "No attachments."
 msgstr "Нет вложений."
 
 #. TRANS: Client error displayed when trying do display a file for a notice with file attachements
 #. TRANS: that could not be found.
-#: actions/file.php:58
 msgid "No uploaded attachments."
 msgstr "Нет загруженных вложений."
 
 #. TRANS: Client error displayed when subscribing to a remote profile and an unexpected response is received.
-#: actions/finishremotesubscribe.php:69
 msgid "Not expecting this response!"
 msgstr "Неожиданный ответ!"
 
 #. TRANS: Client error displayed when subscribing to a remote profile that does not exist.
-#: actions/finishremotesubscribe.php:81
 msgid "User being listened to does not exist."
 msgstr "Указанный пользователь не существует."
 
 #. TRANS: Client error displayed when subscribing to a remote profile that is a local profile.
-#: actions/finishremotesubscribe.php:89 actions/remotesubscribe.php:58
 msgid "You can use the local subscription!"
 msgstr "Вы можете использовать локальную подписку!"
 
 #. TRANS: Client error displayed when subscribing to a remote profile that is blocked form subscribing to.
-#: actions/finishremotesubscribe.php:102
 msgid "That user has blocked you from subscribing."
 msgstr "Этот пользователь заблокировал вас на его подписку."
 
 #. TRANS: Client error displayed when subscribing to a remote profile without providing an authorised token.
-#: actions/finishremotesubscribe.php:114
 msgid "You are not authorized."
 msgstr "Вы не авторизованы."
 
 #. TRANS: Client error displayed when subscribing to a remote profile and conversion of the request token to access token fails.
-#: actions/finishremotesubscribe.php:118
 msgid "Could not convert request token to access token."
 msgstr "Не удаётся преобразовать ключ запроса в ключ доступа."
 
 #. TRANS: Client error displayed when subscribing to a remote profile fails because of an unsupported version of the OMB protocol.
-#: actions/finishremotesubscribe.php:124
 msgid "Remote service uses unknown version of OMB protocol."
 msgstr "Удалённый сервис использует неизвестную версию протокола OMB."
 
 #. TRANS: Server error displayed when subscribing to a remote profile fails because the remote profile could not be updated.
-#: actions/finishremotesubscribe.php:145 lib/oauthstore.php:317
 msgid "Error updating remote profile."
 msgstr "Ошибка обновления удалённого профиля."
 
 #. TRANS: Client error displayed when requesting a non-existent file.
-#: actions/getfile.php:77
 msgid "No such file."
 msgstr "Нет такого файла."
 
 #. TRANS: Client error displayed when requesting a file without having read access to it.
-#: actions/getfile.php:82
 msgid "Cannot read file."
 msgstr "Не удалось прочесть файл."
 
 #. TRANS: Client error displayed when trying to assign an invalid role to a user.
-#: actions/grantrole.php:61 actions/revokerole.php:62
 msgid "Invalid role."
 msgstr "Неверная роль."
 
 #. TRANS: Client error displayed when trying to assign an reserved role to a user.
-#: actions/grantrole.php:66 actions/revokerole.php:66
 msgid "This role is reserved and cannot be set."
 msgstr "Эта роль зарезервирована и не может быть установлена."
 
 #. TRANS: Client error displayed when trying to assign a role to a user while not being allowed to set roles.
-#: actions/grantrole.php:76
 msgid "You cannot grant user roles on this site."
 msgstr "Вы не можете назначать пользователю роли на этом сайте."
 
 #. TRANS: Client error displayed when trying to assign a role to a user that already has that role.
-#: actions/grantrole.php:84
 msgid "User already has this role."
 msgstr "Пользователь уже имеет эту роль."
 
 #. TRANS: Client error displayed trying to block a user from a group while not specifying a to be blocked user profile.
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing a profile.
+#. TRANS: Client error displayed when not providing a profile ID on the Make Admin page.
 #. TRANS: Client error displayed trying a change a subscription without providing a profile.
 #. TRANS: Client error displayed when trying to change user options without specifying a user to work on.
-#: actions/groupblock.php:71 actions/groupunblock.php:71
-#: actions/makeadmin.php:71 actions/subedit.php:49
-#: lib/profileformaction.php:79
 msgid "No profile specified."
 msgstr "Профиль не определен."
 
 #. TRANS: Client error displayed trying to block a user from a group while specifying a non-existing profile.
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing an existing profile.
+#. TRANS: Client error displayed when specifying an invalid profile ID on the Make Admin page.
 #. TRANS: Client error displayed trying a change a subscription for a non-existant profile ID.
 #. TRANS: Client error displayed when trying to change user options without specifying an existing user to work on.
-#: actions/groupblock.php:77 actions/groupunblock.php:77
-#: actions/makeadmin.php:76 actions/subedit.php:57 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:87
 msgid "No profile with that ID."
 msgstr "Нет профиля с таким ID."
 
 #. TRANS: Client error displayed trying to block a user from a group while not specifying a group to block a profile from.
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing a group.
-#: actions/groupblock.php:83 actions/groupunblock.php:83
-#: actions/makeadmin.php:81
+#. TRANS: Client error displayed when not providing a group ID on the Make Admin page.
 msgid "No group specified."
 msgstr "Группа не определена."
 
 #. TRANS: Client error displayed trying to block a user from a group while not being an admin user.
-#: actions/groupblock.php:95
 msgid "Only an admin can block group members."
 msgstr "Только администратор может блокировать участников группы."
 
 #. TRANS: Client error displayed trying to block a user from a group while user is already blocked from the given group.
-#: actions/groupblock.php:100
 msgid "User is already blocked from group."
 msgstr "Пользователь уже заблокирован из группы."
 
 #. TRANS: Client error displayed trying to block a user from a group while user is not a member of given group.
-#: actions/groupblock.php:106
 msgid "User is not a member of group."
 msgstr "Пользователь не является членом этой группы."
 
 #. TRANS: Title for block user from group page.
 #. TRANS: Form legend for form to block user from a group.
-#: actions/groupblock.php:141 actions/groupmembers.php:364
 msgid "Block user from group"
 msgstr "Заблокировать пользователя из группы."
 
 #. TRANS: Explanatory text for block user from group form before setting the block.
 #. TRANS: %1$s is that to be blocked user, %2$s is the group the user will be blocked from.
-#: actions/groupblock.php:169
 #, php-format
 msgid ""
 "Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They "
@@ -2979,40 +2385,33 @@ msgstr ""
 "подписываться на группу в будущем."
 
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
-#: actions/groupblock.php:191
 #, fuzzy
 msgid "Do not block this user from this group."
 msgstr "Не блокировать этого пользователя из этой группы"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
-#: actions/groupblock.php:198
 #, fuzzy
 msgid "Block this user from this group."
 msgstr "Заблокировать этого пользователя из этой группы"
 
 #. TRANS: Server error displayed when trying to block a user from a group fails because of an application error.
-#: actions/groupblock.php:215
 msgid "Database error blocking user from group."
 msgstr "Ошибка базы данных при блокировании пользователя из группы."
 
 #. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
 #. TRANS: Client error displayed trying to find a user by ID without providing an ID.
-#: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr "Нет ID."
 
 #. TRANS: Client error displayed trying to change group design settings while not logged in.
-#: actions/groupdesignsettings.php:67
 msgid "You must be logged in to edit a group."
 msgstr "Вы должны авторизоваться, чтобы изменить группу."
 
 #. TRANS: Title group design settings page.
-#: actions/groupdesignsettings.php:146
 msgid "Group design"
 msgstr "Оформление группы"
 
 #. TRANS: Instructions for group design settings page.
-#: actions/groupdesignsettings.php:157
 msgid ""
 "Customize the way your group looks with a background image and a colour "
 "palette of your choice."
@@ -3021,25 +2420,21 @@ msgstr ""
 "на ваш выбор."
 
 #. TRANS: Form validation error displayed when group design settings could not be updated because of an application issue.
-#: actions/groupdesignsettings.php:262
 #, fuzzy
 msgid "Unable to update your design settings."
 msgstr "Не удаётся сохранить ваши настройки оформления!"
 
 #. TRANS: Form text to confirm saved group design settings.
-#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:239
 msgid "Design preferences saved."
 msgstr "Настройки оформления сохранены."
 
 #. TRANS: Title for group logo settings page.
 #. TRANS: Group logo form legend.
-#: actions/grouplogo.php:144 actions/grouplogo.php:199
 msgid "Group logo"
 msgstr "Логотип группы"
 
 #. TRANS: Instructions for group logo page.
 #. TRANS: %s is the maximum file size for that site.
-#: actions/grouplogo.php:156
 #, php-format
 msgid ""
 "You can upload a logo image for your group. The maximum file size is %s."
@@ -3048,91 +2443,75 @@ msgstr ""
 "составляет %s."
 
 #. TRANS: Submit button for uploading a group logo.
-#: actions/grouplogo.php:243
 msgid "Upload"
 msgstr "Загрузить"
 
 #. TRANS: Button text for cropping an uploaded group logo.
-#: actions/grouplogo.php:299
 msgid "Crop"
 msgstr "Обрезать"
 
 #. TRANS: Form instructions on the group logo page.
-#: actions/grouplogo.php:376
 msgid "Pick a square area of the image to be the logo."
 msgstr "Подберите нужный квадратный участок для вашего логотипа."
 
 #. TRANS: Form success message after updating a group logo.
-#: actions/grouplogo.php:411
 msgid "Logo updated."
 msgstr "Логотип обновлён."
 
 #. TRANS: Form failure message after failing to update a group logo.
-#: actions/grouplogo.php:414
 msgid "Failed updating logo."
 msgstr "Неудача при обновлении логотипа."
 
 #. TRANS: Title of the page showing group members.
 #. TRANS: %s is the name of the group.
-#: actions/groupmembers.php:104
 #, php-format
 msgid "%s group members"
 msgstr "Участники группы %s"
 
 #. TRANS: Title of the page showing group members.
 #. TRANS: %1$s is the name of the group, %2$d is the page number of the members list.
-#: actions/groupmembers.php:109
 #, php-format
 msgid "%1$s group members, page %2$d"
 msgstr "Участники группы %1$s, страница %2$d"
 
 #. TRANS: Page notice for group members page.
-#: actions/groupmembers.php:125
 msgid "A list of the users in this group."
 msgstr "Список пользователей, являющихся членами этой группы."
 
 #. TRANS: Indicator in group members list that this user is a group administrator.
-#: actions/groupmembers.php:190 lib/action.php:581
 msgid "Admin"
 msgstr "Настройки"
 
 #. TRANS: Button text for the form that will block a user from a group.
-#: actions/groupmembers.php:397
 msgctxt "BUTTON"
 msgid "Block"
 msgstr "Заблокировать"
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:401
 msgctxt "TOOLTIP"
 msgid "Block this user"
 msgstr "Заблокировать этого пользователя"
 
 #. TRANS: Form legend for form to make a user a group admin.
-#: actions/groupmembers.php:488
 msgid "Make user an admin of the group"
 msgstr "Сделать пользователя администратором группы"
 
 #. TRANS: Button text for the form that will make a user administrator.
-#: actions/groupmembers.php:521
 msgctxt "BUTTON"
 msgid "Make Admin"
 msgstr "Сделать администратором"
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:525
 msgctxt "TOOLTIP"
 msgid "Make this user an admin"
 msgstr "Сделать этого пользователя администратором"
 
 #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
-#: actions/grouprss.php:141
 #, php-format
 msgid "Updates from members of %1$s on %2$s!"
 msgstr "Обновления участников %1$s на %2$s!"
 
 #. TRANS: Title for first page of the groups list.
-#: actions/groups.php:62
 #, fuzzy
 msgctxt "TITLE"
 msgid "Groups"
@@ -3140,7 +2519,6 @@ msgstr "Группы"
 
 #. TRANS: Title for all but the first page of the groups list.
 #. TRANS: %d is the page number.
-#: actions/groups.php:66
 #, fuzzy, php-format
 msgctxt "TITLE"
 msgid "Groups, page %d"
@@ -3149,7 +2527,6 @@ msgstr "Группы, страница %d"
 #. TRANS: Page notice of group list. %%%%site.name%%%% is the StatusNet site name,
 #. TRANS: %%%%action.groupsearch%%%% and %%%%action.newgroup%%%% are URLs. Do not change them.
 #. TRANS: This message contains Markdown links in the form [link text](link).
-#: actions/groups.php:95
 #, fuzzy, php-format
 msgid ""
 "%%%%site.name%%%% groups let you find and talk with people of similar "
@@ -3165,12 +2542,10 @@ msgstr ""
 "%%%) или [создайте собственную](%%%%action.newgroup%%%%)!"
 
 #. TRANS: Link to create a new group on the group list page.
-#: actions/groups.php:113 actions/usergroups.php:126 lib/groupeditform.php:115
 msgid "Create a new group"
 msgstr "Создать новую группу"
 
 #. TRANS: Instructions for page where groups can be searched. %%site.name%% is the name of the StatusNet site.
-#: actions/groupsearch.php:53
 #, php-format
 msgid ""
 "Search for groups on %%site.name%% by their name, location, or description. "
@@ -3180,21 +2555,17 @@ msgstr ""
 "Разделяйте ключевые слова пробелами. Минимальная длина слова — 3 буквы."
 
 #. TRANS: Title for page where groups can be searched.
-#: actions/groupsearch.php:60
 msgid "Group search"
 msgstr "Поиск группы"
 
 #. TRANS: Text on page where groups can be searched if no results were found for a query.
 #. TRANS: Text for notice search results is the query had no results.
 #. TRANS: Message on the "People search" page where a query has no results.
-#: actions/groupsearch.php:82 actions/noticesearch.php:122
-#: actions/peoplesearch.php:87
 msgid "No results."
 msgstr "Нет результатов."
 
 #. TRANS: Additional text on page where groups can be searched if no results were found for a query for a logged in user.
 #. TRANS: This message contains Markdown links in the form [link text](link).
-#: actions/groupsearch.php:87
 #, fuzzy, php-format
 msgid ""
 "If you cannot find the group you're looking for, you can [create it](%%"
@@ -3205,7 +2576,6 @@ msgstr ""
 
 #. TRANS: Additional text on page where groups can be searched if no results were found for a query for a not logged in user.
 #. TRANS: This message contains Markdown links in the form [link text](link).
-#: actions/groupsearch.php:92
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and [create the group](%%"
@@ -3215,30 +2585,25 @@ msgstr ""
 "группу](%%action.newgroup%%) самому?"
 
 #. TRANS: Client error displayed when trying to unblock a user from a group without being an administrator for the group.
-#: actions/groupunblock.php:95
 msgid "Only an admin can unblock group members."
 msgstr "Только администратор может разблокировать участников группы."
 
 #. TRANS: Client error displayed when trying to unblock a non-blocked user from a group.
-#: actions/groupunblock.php:100
 msgid "User is not blocked from group."
 msgstr "Пользователь не заблокировал вас из группы."
 
 #. TRANS: Server error displayed when unblocking a user from a group fails because of an unknown error.
 #. TRANS: Server error displayed when removing a user block.
-#: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "Ошибка при удалении данного блока."
 
 #. TRANS: Title for Instant Messaging settings.
-#: actions/imsettings.php:56
 msgid "IM settings"
 msgstr "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.
-#: actions/imsettings.php:69
 #, fuzzy, php-format
 msgid ""
 "You can send and receive notices through instant messaging [instant messages]"
@@ -3248,18 +2613,15 @@ msgstr ""
 "(%%doc.im%%). Настройте ваш аккаунт и предпочтения ниже."
 
 #. TRANS: Message given in the IM settings if IM is not enabled on the site.
-#: actions/imsettings.php:90
 msgid "IM is not available."
 msgstr "IM не доступен."
 
-#: actions/imsettings.php:116
 #, fuzzy, php-format
 msgid "Current confirmed %s address."
 msgstr "Подтверждённый в настоящее время электронный адрес."
 
 #. TRANS: Form note in IM settings form.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:128
 #, fuzzy, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your %s account for a message "
@@ -3269,89 +2631,74 @@ msgstr ""
 "сообщения с дальнейшими инструкциями. (Вы включили %s в ваш список "
 "контактов?)"
 
-#: actions/imsettings.php:140
 msgid "IM address"
 msgstr "IM-адрес"
 
-#: actions/imsettings.php:142
 #, php-format
 msgid "%s screenname."
 msgstr ""
 
 #. TRANS: Header for IM preferences form.
-#: actions/imsettings.php:163
 #, fuzzy
 msgid "IM Preferences"
 msgstr "Настройки IM"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:174
 #, fuzzy
 msgid "Send me notices"
 msgstr "Послать запись"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:176
 #, fuzzy
 msgid "Post a notice when my status changes."
 msgstr "Публиковать запись, когда мой Jabber/GTalk - статус изменяется."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:178
 #, fuzzy
 msgid "Send me replies from people I'm not subscribed to."
 msgstr ""
 "Посылать мне реплики через Jabber/GTalk от людей, на которых я не подписан."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:181
 #, fuzzy
 msgid "Publish a MicroID"
 msgstr "Опубликовать MicroID для моего электронного адреса."
 
 #. TRANS: Server error thrown on database error updating IM preferences.
-#: actions/imsettings.php:291
 #, fuzzy
 msgid "Couldn't update IM preferences."
 msgstr "Не удаётся обновить пользователя."
 
 #. TRANS: Confirmation message for successful IM preferences save.
 #. TRANS: Confirmation message after saving preferences.
-#: actions/imsettings.php:298 actions/urlsettings.php:244
 msgid "Preferences saved."
 msgstr "Предпочтения сохранены."
 
 #. TRANS: Message given saving IM address without having provided one.
-#: actions/imsettings.php:320
 #, fuzzy
 msgid "No screenname."
 msgstr "Нет имени."
 
-#: actions/imsettings.php:325
 #, fuzzy
 msgid "No transport."
 msgstr "Запись отсутствует."
 
 #. TRANS: Message given saving IM address that cannot be normalised.
-#: actions/imsettings.php:333
 #, fuzzy
 msgid "Cannot normalize that screenname"
 msgstr "Не удаётся стандартизировать этот Jabber ID"
 
 #. TRANS: Message given saving IM address that not valid.
-#: actions/imsettings.php:340
 #, fuzzy
 msgid "Not a valid screenname"
 msgstr "Неверное имя."
 
 #. TRANS: Message given saving IM address that is already set for another user.
-#: actions/imsettings.php:344
 #, fuzzy
 msgid "Screenname already belongs to another user."
 msgstr "Этот Jabber ID уже используется другим пользователем."
 
 #. TRANS: Message given saving valid IM address that is to be confirmed.
-#: actions/imsettings.php:369
 #, fuzzy
 msgid "A confirmation code was sent to the IM address you added."
 msgstr ""
@@ -3359,68 +2706,57 @@ msgstr ""
 "%s для отправки вам сообщений."
 
 #. TRANS: Message given canceling IM address confirmation for the wrong IM address.
-#: actions/imsettings.php:396
 msgid "That is the wrong IM address."
 msgstr "Это неверный IM-адрес."
 
 #. TRANS: Server error thrown on database error canceling IM address confirmation.
-#: actions/imsettings.php:405
 #, fuzzy
 msgid "Couldn't delete confirmation."
 msgstr "Не удаётся удалить подверждение IM."
 
 #. TRANS: Message given after successfully canceling IM address confirmation.
-#: actions/imsettings.php:410
 msgid "IM confirmation cancelled."
 msgstr "Подтверждение IM отменено."
 
 #. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.
-#: actions/imsettings.php:434
 #, fuzzy
 msgid "That is not your screenname."
 msgstr "Это не Ваш номер телефона."
 
 #. TRANS: Server error thrown on database error removing a registered IM address.
-#: actions/imsettings.php:443
 #, fuzzy
 msgid "Couldn't update user im prefs."
 msgstr "Не удаётся обновить пользовательскую запись."
 
 #. TRANS: Message given after successfully removing a registered Instant Messaging address.
-#: actions/imsettings.php:451
 msgid "The IM address was removed."
 msgstr "Адрес IM удалён."
 
 #. TRANS: Title for all but the first page of the inbox page.
 #. TRANS: %1$s is the user's nickname, %2$s is the page number.
-#: actions/inbox.php:59
 #, php-format
 msgid "Inbox for %1$s - page %2$d"
 msgstr "Входящие для %1$s — страница %2$d"
 
 #. TRANS: Title for the first page of the inbox page.
 #. TRANS: %s is the user's nickname.
-#: actions/inbox.php:64
 #, php-format
 msgid "Inbox for %s"
 msgstr "Входящие для %s"
 
 #. TRANS: Instructions for user inbox page.
-#: actions/inbox.php:106
 msgid "This is your inbox, which lists your incoming private messages."
 msgstr ""
 "Это ваш ящик входящих сообщений, в котором хранятся поступившие личные "
 "сообщения."
 
 #. TRANS: Client error displayed when trying to sent invites while they have been disabled.
-#: actions/invite.php:41
 msgid "Invites have been disabled."
 msgstr "Приглашения отключены."
 
 #. TRANS: Client error displayed when trying to sent invites while not logged in.
 #. TRANS: %s is the StatusNet site name.
-#: actions/invite.php:45
 #, php-format
 msgid "You must be logged in to invite other users to use %s."
 msgstr ""
@@ -3429,18 +2765,15 @@ msgstr ""
 
 #. TRANS: Form validation message when providing an e-mail address that does not validate.
 #. TRANS: %s is an invalid e-mail address.
-#: actions/invite.php:78
 #, php-format
 msgid "Invalid email address: %s."
 msgstr "Неправильный адрес электронной почты: %s."
 
 #. TRANS: Page title when invitations have been sent.
-#: actions/invite.php:117
 msgid "Invitations sent"
 msgstr "Приглашения отправлены"
 
 #. TRANS: Page title when inviting potential users.
-#: actions/invite.php:120
 msgid "Invite new users"
 msgstr "Пригласить новых пользователей"
 
@@ -3448,7 +2781,6 @@ msgstr "Пригласить новых пользователей"
 #. TRANS: is already subscribed to one or more users with the given e-mail address(es).
 #. TRANS: Plural form is based on the number of reported already subscribed e-mail addresses.
 #. TRANS: Followed by a bullet list.
-#: actions/invite.php:140
 msgid "You are already subscribed to this user:"
 msgid_plural "You are already subscribed to these users:"
 msgstr[0] ""
@@ -3457,7 +2789,6 @@ msgstr[2] ""
 
 #. TRANS: Used as list item for already subscribed users (%1$s is nickname, %2$s is e-mail address).
 #. TRANS: Used as list item for already registered people (%1$s is nickname, %2$s is e-mail address).
-#: actions/invite.php:146 actions/invite.php:160
 #, php-format
 msgctxt "INVITE"
 msgid "%1$s (%2$s)"
@@ -3466,7 +2797,6 @@ msgstr "%1$s (%2$s)"
 #. TRANS: Message displayed inviting users to use a StatusNet site while the invited user
 #. TRANS: already uses a this StatusNet site. Plural form is based on the number of
 #. TRANS: reported already present people. Followed by a bullet list.
-#: actions/invite.php:154
 msgid "This person is already a user and you were automatically subscribed:"
 msgid_plural ""
 "These people are already users and you were automatically subscribed to them:"
@@ -3483,7 +2813,6 @@ msgstr[2] ""
 #. TRANS: Message displayed inviting users to use a StatusNet site. Plural form is
 #. TRANS: based on the number of invitations sent. Followed by a bullet list of
 #. TRANS: e-mail addresses to which invitations were sent.
-#: actions/invite.php:168
 msgid "Invitation sent to the following person:"
 msgid_plural "Invitations sent to the following people:"
 msgstr[0] "Приглашение отправлено следующему адресату:"
@@ -3492,7 +2821,6 @@ msgstr[2] ""
 
 #. TRANS: Generic message displayed after sending out one or more invitations to
 #. TRANS: people to join a StatusNet site.
-#: actions/invite.php:178
 msgid ""
 "You will be notified when your invitees accept the invitation and register "
 "on the site. Thanks for growing the community!"
@@ -3501,34 +2829,29 @@ msgstr ""
 "зарегистрируются на сайте. Спасибо за помощь в росте нашего сообщества!"
 
 #. TRANS: Form instructions.
-#: actions/invite.php:191
 msgid ""
 "Use this form to invite your friends and colleagues to use this service."
 msgstr "В этой форме вы можете пригласить друзей и коллег на этот сервис."
 
 #. TRANS: Field label for a list of e-mail addresses.
-#: actions/invite.php:218
 msgid "Email addresses"
 msgstr "Почтовый адрес"
 
 #. TRANS: Tooltip for field label for a list of e-mail addresses.
-#: actions/invite.php:221
 #, fuzzy
 msgid "Addresses of friends to invite (one per line)."
 msgstr "Адреса друзей, которых вы хотите пригласить (по одному на строчку)"
 
 #. TRANS: Field label for a personal message to send to invitees.
-#: actions/invite.php:225
 msgid "Personal message"
 msgstr "Личное сообщение"
 
 #. TRANS: Tooltip for field label for a personal message to send to invitees.
-#: actions/invite.php:228
 msgid "Optionally add a personal message to the invitation."
 msgstr "Можно добавить к приглашению личное сообщение."
 
 #. TRANS: Send button for inviting friends
-#: actions/invite.php:232
+#. TRANS: Button text for sending notice.
 msgctxt "BUTTON"
 msgid "Send"
 msgstr "Отправить"
@@ -3536,7 +2859,6 @@ msgstr "Отправить"
 #. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral
 #. TRANS: singular 3rd-person pronoun in English. %1$s is the inviting user, $2$s is
 #. TRANS: the StatusNet sitename.
-#: actions/invite.php:264
 #, php-format
 msgid "%1$s has invited you to join them on %2$s"
 msgstr "%1$s пригласил вас присоединиться к нему на %2$s"
@@ -3546,7 +2868,6 @@ msgstr "%1$s пригласил вас присоединиться к нему
 #. TRANS: StatusNet sitename, %3$s is the site URL, %4$s is the personal message from the
 #. TRANS: inviting user, %s%5 a link to the timeline for the inviting user, %s$6 is a link
 #. TRANS: to register with the StatusNet site.
-#: actions/invite.php:271
 #, php-format
 msgid ""
 "%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -3604,50 +2925,44 @@ msgstr ""
 "С уважением, %2$s\n"
 
 #. TRANS: Client error displayed when trying to join a group while not logged in.
-#: actions/joingroup.php:59
 msgid "You must be logged in to join a group."
 msgstr "Вы должны авторизоваться для вступления в группу."
 
 #. TRANS: Title for join group page after joining.
-#: actions/joingroup.php:148
 #, fuzzy, php-format
 msgctxt "TITLE"
 msgid "%1$s joined group %2$s"
 msgstr "%1$s вступил в группу %2$s"
 
 #. TRANS: Client error displayed when trying to leave a group while not logged in.
-#: actions/leavegroup.php:59
 msgid "You must be logged in to leave a group."
 msgstr "Вы должны авторизоваться, чтобы покинуть группу."
 
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
-#: actions/leavegroup.php:103 lib/command.php:398
 msgid "You are not a member of that group."
 msgstr "Вы не являетесь членом этой группы."
 
 #. TRANS: Title for leave group page after leaving.
-#: actions/leavegroup.php:142
 #, fuzzy, php-format
 msgctxt "TITLE"
 msgid "%1$s left group %2$s"
 msgstr "%1$s покинул группу %2$s"
 
 #. TRANS: User admin panel title
-#: actions/licenseadminpanel.php:55
 msgctxt "TITLE"
 msgid "License"
 msgstr "Лицензия"
 
-#: actions/licenseadminpanel.php:65
+#. TRANS: Form instructions for the site license admin panel.
 msgid "License for this StatusNet site"
 msgstr "Лицензия этого сайта StatusNet"
 
-#: actions/licenseadminpanel.php:134
+#. TRANS: Client error displayed selecting an invalid license in the license admin panel.
 msgid "Invalid license selection."
 msgstr "Неверный выбор лицензии."
 
-#: actions/licenseadminpanel.php:144
+#. TRANS: Client error displayed when not specifying an owner for the all rights reserved license in the license admin panel.
 msgid ""
 "You must specify the owner of the content when using the All Rights Reserved "
 "license."
@@ -3655,132 +2970,133 @@ msgstr ""
 "Вы должны указать владельца содержания при использовании лицензии «Все права "
 "защищены»."
 
-#: actions/licenseadminpanel.php:151
+#. TRANS: Client error displayed selecting a too long license title in the license admin panel.
 msgid "Invalid license title. Maximum length is 255 characters."
 msgstr "Неверное название лицензии. Максимальная длина 255 символов."
 
-#: actions/licenseadminpanel.php:163
+#. TRANS: Client error displayed specifying an invalid license URL in the license admin panel.
 msgid "Invalid license URL."
 msgstr "Неверный URL лицензии."
 
-#: actions/licenseadminpanel.php:166
+#. TRANS: Client error displayed specifying an invalid license image URL in the license admin panel.
 msgid "Invalid license image URL."
 msgstr "Неверный URL изображения лицензии."
 
-#: actions/licenseadminpanel.php:174
+#. TRANS: Client error displayed specifying an invalid license URL in the license admin panel.
 msgid "License URL must be blank or a valid URL."
 msgstr "URL лицензии должен быть пустым или действительным URL."
 
-#: actions/licenseadminpanel.php:182
+#. TRANS: Client error displayed specifying an invalid license image URL in the license admin panel.
 msgid "License image must be blank or valid URL."
 msgstr "Изображение лицензии должно быть пустым или действительным URL."
 
-#: actions/licenseadminpanel.php:232
+#. TRANS: Form legend in the license admin panel.
 msgid "License selection"
 msgstr "Выбор лицензии"
 
-#: actions/licenseadminpanel.php:238
+#. TRANS: License option in the license admin panel.
 msgid "Private"
 msgstr "Личное"
 
-#: actions/licenseadminpanel.php:239
+#. TRANS: License option in the license admin panel.
 msgid "All Rights Reserved"
 msgstr "Все права защищены"
 
-#: actions/licenseadminpanel.php:240
+#. TRANS: License option in the license admin panel.
 msgid "Creative Commons"
 msgstr "Creative Commons"
 
-#: actions/licenseadminpanel.php:245
+#. TRANS: Dropdown field label in the license admin panel.
 msgid "Type"
 msgstr "Тип"
 
-#: actions/licenseadminpanel.php:247
-msgid "Select license"
+#. TRANS: Dropdown field instructions in the license admin panel.
+#, fuzzy
+msgid "Select a license."
 msgstr "Выбор лицензии"
 
-#: actions/licenseadminpanel.php:261
+#. TRANS: Form legend in the license admin panel.
 msgid "License details"
 msgstr "Подробности лицензии"
 
-#: actions/licenseadminpanel.php:267
+#. TRANS: Field label in the license admin panel.
 msgid "Owner"
 msgstr "Владелец"
 
-#: actions/licenseadminpanel.php:268
+#. TRANS: Field title in the license admin panel.
 msgid "Name of the owner of the site's content (if applicable)."
 msgstr "Имя владельца содержимого сайта (если применимо)."
 
-#: actions/licenseadminpanel.php:276
+#. TRANS: Field label in the license admin panel.
 msgid "License Title"
 msgstr "Название лицензии"
 
-#: actions/licenseadminpanel.php:277
+#. TRANS: Field title in the license admin panel.
 msgid "The title of the license."
 msgstr "Название лицензии."
 
-#: actions/licenseadminpanel.php:285
+#. TRANS: Field label in the license admin panel.
 msgid "License URL"
 msgstr "URL-адрес лицензии"
 
-#: actions/licenseadminpanel.php:286
+#. TRANS: Field title in the license admin panel.
 msgid "URL for more information about the license."
 msgstr "URL-адрес для получения дополнительной информации о лицензии."
 
-#: actions/licenseadminpanel.php:293
+#. TRANS: Field label in the license admin panel.
 msgid "License Image URL"
 msgstr "URL изображения лицензии"
 
-#: actions/licenseadminpanel.php:294
+#. TRANS: Field title in the license admin panel.
 msgid "URL for an image to display with the license."
 msgstr "URL изображения, отображаемого вместе с лицензией."
 
-#. TRANS: Submit button title.
-#: actions/licenseadminpanel.php:311 actions/sessionsadminpanel.php:199
-#: actions/siteadminpanel.php:292 actions/snapshotadminpanel.php:245
-#: actions/tagother.php:133 lib/applicationeditform.php:357
-msgid "Save"
-msgstr "Сохранить"
-
-#: actions/licenseadminpanel.php:311
-msgid "Save license settings"
+#. TRANS: Button title in the license admin panel.
+#, fuzzy
+msgid "Save license settings."
 msgstr "Сохранить настройки лицензии"
 
+#. TRANS: Client error displayed when trying to log in while already logged in.
 #. TRANS: Client error displayed trying to use "one time password login" when already logged in.
-#: actions/login.php:97 actions/otp.php:62 actions/register.php:130
 msgid "Already logged in."
 msgstr "Вы уже авторизовались."
 
-#: actions/login.php:125
+#. TRANS: Form validation error displayed when trying to log in with incorrect credentials.
 msgid "Incorrect username or password."
 msgstr "Некорректное имя или пароль."
 
+#. TRANS: Server error displayed when during login a server error occurs.
 #. TRANS: Server error displayed when a user object could not be created trying to login using "one time password login".
-#: actions/login.php:131 actions/otp.php:127
 msgid "Error setting user. You are probably not authorized."
 msgstr "Ошибка установки пользователя. Вы, вероятно, не авторизованы."
 
-#: actions/login.php:185 actions/login.php:236 lib/action.php:598
+#. TRANS: Page title for login page.
 msgid "Login"
 msgstr "Вход"
 
-#: actions/login.php:222
+#. TRANS: Form legend on login page.
 msgid "Login to site"
 msgstr "Авторизоваться"
 
-#: actions/login.php:231 actions/register.php:469
+#. TRANS: Checkbox label label on login page.
 msgid "Remember me"
 msgstr "Запомнить меня"
 
-#: actions/login.php:232 actions/register.php:471
+#. TRANS: Checkbox title on login page.
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "Автоматическии входить в дальнейшем. Не для общедоступных компьютеров!"
 
-#: actions/login.php:241
+#. TRANS: Button text for log in on login page.
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Login"
+msgstr "Вход"
+
+#. TRANS: Link text for link to "reset password" on login page.
 msgid "Lost or forgotten password?"
 msgstr "Потеряли или забыли пароль?"
 
-#: actions/login.php:259
+#. TRANS: Form instructions on login page before being able to change user settings.
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -3788,11 +3104,12 @@ msgstr ""
 "По причинам сохранения безопасности введите имя и пароль ещё раз, прежде чем "
 "изменять Ваши установки."
 
-#: actions/login.php:263
+#. TRANS: Form instructions on login page.
 msgid "Login with your username and password."
 msgstr "Войти с вашим именем участника и паролем."
 
-#: actions/login.php:266
+#. TRANS: Form instructions on login page. This message contains Markdown links in the form [Link text](Link).
+#. TRANS: %%action.register%% is a link to the registration page.
 #, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -3800,129 +3117,123 @@ msgstr ""
 "У вас нет логина? [Зарегистрируйте](%%action.register%%) новую учётную "
 "запись."
 
-#: actions/makeadmin.php:92
+#. TRANS: Client error displayed when trying to make another user admin on the Make Admin page while not an admin.
 msgid "Only an admin can make another user an admin."
 msgstr ""
 "Только администратор может сделать другого пользователя администратором."
 
-#: actions/makeadmin.php:96
+#. TRANS: Client error displayed when trying to make another user admin on the Make Admin page who already is admin.
+#. TRANS: %1$s is the user that is already admin, %2$s is the group user is already admin for.
 #, php-format
 msgid "%1$s is already an admin for group \"%2$s\"."
 msgstr "%1$s уже является администратором группы «%2$s»."
 
-#: actions/makeadmin.php:133
+#. TRANS: Server error displayed when trying to make another user admin on the Make Admin page fails
+#. TRANS: because the group membership record could not be gotten.
+#. TRANS: %1$s is the to be admin user, %2$s is the group user should be admin for.
 #, php-format
 msgid "Can't get membership record for %1$s in group %2$s."
 msgstr "Не удаётся получить запись принадлежности для %1$s к группе %2$s."
 
-#: actions/makeadmin.php:146
+#. TRANS: Server error displayed when trying to make another user admin on the Make Admin page fails
+#. TRANS: because the group adminship record coud not be saved properly.
+#. TRANS: %1$s is the to be admin user, %2$s is the group user is already admin for.
 #, php-format
 msgid "Can't make %1$s an admin for group %2$s."
 msgstr "Невозможно сделать %1$s администратором группы %2$s."
 
-#: actions/microsummary.php:69
+#. TRANS: Client error displayed trying to make a micro summary without providing a status.
 msgid "No current status."
 msgstr "Нет текущего состояния."
 
 #. TRANS: This is the title of the form for adding a new application.
-#: actions/newapplication.php:52
 msgid "New application"
 msgstr "Новое приложение"
 
 #. TRANS: Client error displayed trying to add a new application while not logged in.
-#: actions/newapplication.php:64
 msgid "You must be logged in to register an application."
 msgstr "Вы должны авторизоваться, чтобы зарегистрировать приложение."
 
 #. TRANS: Form instructions for registering a new application.
-#: actions/newapplication.php:147
 msgid "Use this form to register a new application."
 msgstr "Используйте эту форму для создания нового приложения."
 
 #. TRANS: Validation error shown when not providing a source URL in the "New application" form.
-#: actions/newapplication.php:189
 msgid "Source URL is required."
 msgstr "URL источника обязателен."
 
 #. TRANS: Server error displayed when an application could not be registered in the database through the "New application" form.
-#: actions/newapplication.php:279 actions/newapplication.php:289
 msgid "Could not create application."
 msgstr "Не удаётся создать приложение."
 
 #. TRANS: Title for form to create a group.
-#: actions/newgroup.php:53
 msgid "New group"
 msgstr "Новая группа"
 
 #. TRANS: Client exception thrown when a user tries to create a group while banned.
-#: actions/newgroup.php:73 classes/User_group.php:485
 #, fuzzy
 msgid "You are not allowed to create groups on this site."
 msgstr "Вы не можете удалить эту группу."
 
 #. TRANS: Form instructions for group create form.
-#: actions/newgroup.php:117
 msgid "Use this form to create a new group."
 msgstr "Используйте эту форму для создания новой группы."
 
-#. TRANS: Group create form validation error.
-#: actions/newgroup.php:200
-#, fuzzy
-msgid "Alias cannot be the same as nickname."
-msgstr "Алиас не может совпадать с именем."
-
-#: actions/newmessage.php:71 actions/newmessage.php:234
+#. TRANS: Page title for new direct message page.
+#. TRANS: Page title on page for sending a direct message.
 msgid "New message"
 msgstr "Новое сообщение"
 
-#. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
-#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:513
-msgid "You can't send a message to this user."
+#. TRANS: Client error displayed trying to send a direct message to a user while sender and
+#. TRANS: receiver are not subscribed to each other.
+#, fuzzy
+msgid "You cannot send a message to this user."
 msgstr "Вы не можете послать сообщение этому пользователю."
 
+#. TRANS: Form validator error displayed trying to send a direct message without content.
+#. TRANS: Client error displayed trying to send a notice without content.
 #. TRANS: Command exception text shown when trying to send a direct message to another user without content.
 #. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
-#: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:490
-#: lib/command.php:593
 msgid "No content!"
 msgstr "Нет контента!"
 
-#: actions/newmessage.php:161
+#. TRANS: Form validation error displayed trying to send a direct message without specifying a recipient.
 msgid "No recipient specified."
 msgstr "Нет адресата."
 
+#. TRANS: Client error displayed trying to send a direct message to self.
 #. TRANS: Error text shown when trying to send a direct message to self.
-#: actions/newmessage.php:167 lib/command.php:517
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr "Не посылайте сообщения сами себе; просто потихоньку скажите это себе."
 
-#: actions/newmessage.php:184
+#. TRANS: Page title after sending a direct message.
 msgid "Message sent"
 msgstr "Сообщение отправлено"
 
+#. TRANS: Confirmation text after sending a direct message.
+#. TRANS: %s is the direct message recipient.
 #. TRANS: Message given have sent a direct message to another user.
 #. TRANS: %s is the name of the other user.
-#: actions/newmessage.php:188 lib/command.php:525
 #, php-format
 msgid "Direct message to %s sent."
 msgstr "Прямое сообщение для %s послано."
 
-#: actions/newmessage.php:213 actions/newnotice.php:264
+#. TRANS: Page title after an AJAX error occurred on the "send direct message" page.
+#. TRANS: Page title after an AJAX error occurs on the send notice page.
 msgid "Ajax Error"
 msgstr "Ошибка AJAX"
 
-#: actions/newnotice.php:69
+#. TRANS: Page title for sending a new notice.
 msgid "New notice"
 msgstr "Новая запись"
 
-#: actions/newnotice.php:230
+#. TRANS: Page title after sending a notice.
 msgid "Notice posted"
 msgstr "Запись опубликована"
 
 #. TRANS: Instructions for Notice search page.
 #. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/noticesearch.php:69
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -3932,20 +3243,17 @@ msgstr ""
 "ставьте пробелы. Минимальная длина слова — 3 буквы."
 
 #. TRANS: Title of the page where users can search for notices.
-#: actions/noticesearch.php:80
 msgid "Text search"
 msgstr "Поиск текста"
 
 #. TRANS: Test in RSS notice search.
 #. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearch.php:95
 #, php-format
 msgid "Search results for \"%1$s\" on %2$s"
 msgstr "Результаты поиска для «%1$s» на %2$s"
 
 #. TRANS: Text for logged in users making a query for notices without results.
 #. TRANS: This message contains a Markdown link.
-#: actions/noticesearch.php:128
 #, php-format
 msgid ""
 "Be the first to [post on this topic](%%%%action.newnotice%%%%?"
@@ -3956,7 +3264,6 @@ msgstr ""
 
 #. TRANS: Text for not logged in users making a query for notices without results.
 #. TRANS: This message contains Markdown links.
-#: actions/noticesearch.php:133
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and be the first to "
@@ -3966,19 +3273,17 @@ msgstr ""
 "первое [сообщение на эту тему](%%%%action.newnotice%%%%?status_textarea=%s)?"
 
 #. TRANS: RSS notice search feed title. %s is the query.
-#: actions/noticesearchrss.php:95
 #, php-format
 msgid "Updates with \"%s\""
 msgstr "Обновления с «$s»"
 
 #. TRANS: RSS notice search feed description.
 #. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearchrss.php:99
 #, fuzzy, php-format
 msgid "Updates matching search term \"%1$s\" on %2$s."
 msgstr "Все обновления, соответствующие поисковому запросу «%s»"
 
-#: actions/nudge.php:85
+#. TRANS: Client error displayed trying to nudge a user that cannot be nudged.
 msgid ""
 "This user doesn't allow nudges or hasn't confirmed or set their email "
 "address yet."
@@ -3986,60 +3291,51 @@ msgstr ""
 "Этот пользователь не разрешает «подталкивать» его или ещё не подтвердил или "
 "не указал свой email-адрес."
 
-#: actions/nudge.php:94
+#. TRANS: Page title after sending a nudge.
 msgid "Nudge sent"
 msgstr "«Подталкивание» послано"
 
-#: actions/nudge.php:97
+#. TRANS: Confirmation text after sending a nudge.
 msgid "Nudge sent!"
 msgstr "«Подталкивание» отправлено!"
 
 #. TRANS: Message displayed to an anonymous user trying to view OAuth application list.
-#: actions/oauthappssettings.php:57
 msgid "You must be logged in to list your applications."
 msgstr "Вы должны авторизоваться, чтобы просматривать свои приложения."
 
 #. TRANS: Page title for OAuth applications
-#: actions/oauthappssettings.php:73
 msgid "OAuth applications"
 msgstr "Приложения OAuth"
 
 #. TRANS: Page instructions for OAuth applications
-#: actions/oauthappssettings.php:85
 msgid "Applications you have registered"
 msgstr "Приложения, которые вы зарегистрировали"
 
 #. TRANS: Empty list message on page with OAuth applications.
-#: actions/oauthappssettings.php:138
 #, php-format
 msgid "You have not registered any applications yet."
 msgstr "Вы пока не зарегистрировали ни одного приложения."
 
 #. TRANS: Title for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:69
 msgid "Connected applications"
 msgstr "Подключённые приложения"
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:80
 msgid "The following connections exist for your account."
 msgstr "Следующие приложения подключены к вашей учётной записи."
 
 #. TRANS: Client error when trying to revoke access for an application while not being a user of it.
-#: actions/oauthconnectionssettings.php:165
 msgid "You are not a user of that application."
 msgstr "Вы не являетесь пользователем этого приложения."
 
 #. TRANS: Client error when revoking access has failed for some reason.
 #. TRANS: %s is the application ID revoking access failed for.
-#: actions/oauthconnectionssettings.php:180
 #, php-format
 msgid "Unable to revoke access for application: %s."
 msgstr "Не удаётся отозвать доступ для приложения: %s."
 
 #. TRANS: Success message after revoking access for an application.
 #. TRANS: %1$s is the application name, %2$s is the first part of the user token.
-#: actions/oauthconnectionssettings.php:199
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -4048,14 +3344,12 @@ msgstr ""
 "Доступ для %1$s и ключ доступа, начинающийся на %2$s, успешно отозваны."
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:210
 msgid "You have not authorized any applications to use your account."
 msgstr "Вы не разрешили приложениям использовать вашу учётную запись."
 
 #. TRANS: Note for developers in the OAuth connection settings form.
 #. TRANS: This message contains a Markdown link. Do not separate "](".
 #. TRANS: %s is the URL to the OAuth settings.
-#: actions/oauthconnectionssettings.php:230
 #, php-format
 msgid ""
 "Are you a developer? [Register an OAuth client application](%s) to use with "
@@ -4064,443 +3358,362 @@ msgstr ""
 "Вы разработчик? [Зарегистрируйте клиентское приложение OAuth](%s) для "
 "использования с этим сайтом StatusNet."
 
-#: actions/oembed.php:64
+#. TRANS: Server error displayed in oEmbed action when path not found.
+#. TRANS: %s is a path.
 #, fuzzy, php-format
 msgid "\"%s\" not found."
 msgstr "Метод API не найден."
 
-#: actions/oembed.php:76
+#. TRANS: Server error displayed in oEmbed action when notice not found.
+#. TRANS: %s is a notice.
 #, fuzzy, php-format
 msgid "Notice %s not found."
 msgstr "Родительская запись не найдена."
 
-#: actions/oembed.php:80 actions/shownotice.php:100
+#. TRANS: Server error displayed in oEmbed action when notice has not profile.
 msgid "Notice has no profile."
 msgstr "Уведомление не имеет профиля."
 
-#: actions/oembed.php:83 actions/shownotice.php:172
+#. TRANS: oEmbed title. %1$s is the author name, %2$s is the creation date.
 #, php-format
 msgid "%1$s's status on %2$s"
 msgstr "Статус %1$s на %2$s"
 
-#: actions/oembed.php:95
+#. TRANS: Server error displayed in oEmbed action when attachment not found.
+#. TRANS: %d is an attachment ID.
 #, fuzzy, php-format
 msgid "Attachment %s not found."
 msgstr "Получатель не найден."
 
-#: actions/oembed.php:136
+#. TRANS: Server error displayed in oEmbed request when a path is not supported.
+#. TRANS: %s is a path.
 #, php-format
 msgid "\"%s\" not supported for oembed requests."
 msgstr ""
 
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
-#: actions/oembed.php:168
 #, php-format
 msgid "Content type %s not supported."
 msgstr "Тип содержимого %s не поддерживается."
 
 #. TRANS: Error message displaying attachments. %s is the site's base URL.
-#: actions/oembed.php:172
 #, php-format
 msgid "Only %s URLs over plain HTTP please."
 msgstr "Только %s URL в простом HTTP, пожалуйста."
 
+#. TRANS: Server error displayed in oEmbed action when request specifies an unsupported data format.
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1207
-#: lib/apiaction.php:1234 lib/apiaction.php:1369
 msgid "Not a supported data format."
 msgstr "Неподдерживаемый формат данных."
 
 #. TRANS: ShortName in the OpenSearch interface when trying to find users.
-#: actions/opensearch.php:64
 msgid "People Search"
 msgstr "Поиск людей"
 
-#: actions/opensearch.php:68
+#. TRANS: ShortName in the OpenSearch interface when trying to find notices.
 msgid "Notice Search"
 msgstr "Поиск в записях"
 
 #. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
-#: actions/otp.php:70
 msgid "No user ID specified."
 msgstr "Не указан идентификатор пользователя."
 
 #. TRANS: Client error displayed trying to use "one time password login" without specifying a login token.
-#: actions/otp.php:86
 msgid "No login token specified."
 msgstr "Не указан ключ для входа."
 
 #. TRANS: Client error displayed trying to use "one time password login" without requesting a login token.
-#: actions/otp.php:94
 msgid "No login token requested."
 msgstr "Ключ для входа не был запрошен."
 
 #. TRANS: Client error displayed trying to use "one time password login" while specifying an invalid login token.
-#: actions/otp.php:100
 msgid "Invalid login token specified."
 msgstr "Задан неверный ключ для входа."
 
 #. TRANS: Client error displayed trying to use "one time password login" while specifying an expired login token.
-#: actions/otp.php:110
 msgid "Login token expired."
 msgstr "Срок действия ключа для входа истёк."
 
 #. TRANS: Title for outbox for any but the fist page.
 #. TRANS: %1$s is the user nickname, %2$d is the page number.
-#: actions/outbox.php:57
 #, php-format
 msgid "Outbox for %1$s - page %2$d"
 msgstr "Исходящие для %s — страница %2$d"
 
 #. TRANS: Title for first page of outbox.
-#: actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
 msgstr "Исходящие для %s"
 
 #. TRANS: Instructions for outbox.
-#: actions/outbox.php:103
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr ""
 "Это список исходящих писем, в котором перечислены отправленные вами личные "
 "сообщения."
 
-#: actions/passwordsettings.php:58
 msgid "Change password"
 msgstr "Изменение пароля"
 
-#: actions/passwordsettings.php:69
 msgid "Change your password."
 msgstr "Измените ваш пароль."
 
 #. TRANS: Fieldset legend for password reset form.
-#: actions/passwordsettings.php:96 actions/recoverpassword.php:251
 msgid "Password change"
 msgstr "Пароль сохранён."
 
-#: actions/passwordsettings.php:104
 msgid "Old password"
 msgstr "Старый пароль"
 
 #. TRANS: Field label for password reset form.
-#: actions/passwordsettings.php:108 actions/recoverpassword.php:256
 msgid "New password"
 msgstr "Новый пароль"
 
-#: actions/passwordsettings.php:109 actions/register.php:416
 #, fuzzy
 msgid "6 or more characters."
 msgstr "6 или больше знаков"
 
 #. TRANS: Ttile for field label for password reset form where the password has to be typed again.
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:264
-#: actions/register.php:420
 #, fuzzy
 msgid "Same as password above."
 msgstr "Тот же пароль, что и выше"
 
-#: actions/passwordsettings.php:117
 msgid "Change"
 msgstr "Изменить"
 
-#: actions/passwordsettings.php:153 actions/register.php:223
 msgid "Password must be 6 or more characters."
 msgstr "Пароль должен быть длиной не менее 6 символов."
 
-#: actions/passwordsettings.php:156 actions/register.php:226
 msgid "Passwords don't match."
 msgstr "Пароли не совпадают."
 
-#: actions/passwordsettings.php:164
 msgid "Incorrect old password"
 msgstr "Некорректный старый пароль"
 
-#: actions/passwordsettings.php:180
 msgid "Error saving user; invalid."
 msgstr "Ошибка сохранения пользователя; неверное имя."
 
 #. TRANS: Reset password form validation error message.
-#: actions/passwordsettings.php:185 actions/recoverpassword.php:418
 #, fuzzy
 msgid "Cannot save new password."
 msgstr "Не удаётся сохранить новый пароль."
 
-#: actions/passwordsettings.php:191
 msgid "Password saved."
 msgstr "Пароль сохранён."
 
 #. TRANS: Title for Paths admin panel.
 #. TRANS: Menu item for site administration
-#: actions/pathsadminpanel.php:58 lib/adminpanelaction.php:371
 msgid "Paths"
 msgstr "Пути"
 
 #. TRANS: Form instructions for Path admin panel.
-#: actions/pathsadminpanel.php:69
 msgid "Path and server settings for this StatusNet site"
 msgstr "Настройки пути и сервера для этого сайта StatusNet"
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the directory that could not be read from.
-#: actions/pathsadminpanel.php:155
 #, php-format
 msgid "Theme directory not readable: %s."
 msgstr "Директория тем не доступна для чтения: %s."
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the avatar directory that could not be written to.
-#: actions/pathsadminpanel.php:163
 #, php-format
 msgid "Avatar directory not writable: %s."
 msgstr "Директория аватар не доступна для записи: %s."
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the background directory that could not be written to.
-#: actions/pathsadminpanel.php:171
 #, php-format
 msgid "Background directory not writable: %s."
 msgstr "Директория фоновых изображений не доступна для записи: %s."
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the locales directory that could not be read from.
-#: actions/pathsadminpanel.php:181
 #, php-format
 msgid "Locales directory not readable: %s."
 msgstr "Директория локализаций не доступна для чтения: %s."
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the SSL server URL that is too long.
-#: actions/pathsadminpanel.php:189
 msgid "Invalid SSL server. The maximum length is 255 characters."
 msgstr "Неверный SSL-сервер. Максимальная длина составляет 255 символов."
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:235 actions/siteadminpanel.php:58
 msgid "Site"
 msgstr "Сайт"
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:241 actions/pathsadminpanel.php:279
-#: actions/pathsadminpanel.php:370 actions/pathsadminpanel.php:425
 msgid "Server"
 msgstr "Сервер"
 
-#: actions/pathsadminpanel.php:242
 msgid "Site's server hostname."
 msgstr "Имя хоста сервера сайта."
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:248 actions/pathsadminpanel.php:288
-#: actions/pathsadminpanel.php:379 actions/pathsadminpanel.php:434
 msgid "Path"
 msgstr "Путь"
 
-#: actions/pathsadminpanel.php:249
 msgid "Site path."
 msgstr "Путь к сайту."
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:255
 msgid "Locale directory"
 msgstr "Директория локализации"
 
-#: actions/pathsadminpanel.php:256
 msgid "Directory path to locales."
 msgstr "Путь к директории локализаций"
 
 #. TRANS: Checkbox label in Paths admin panel.
-#: actions/pathsadminpanel.php:263
 msgid "Fancy URLs"
 msgstr "Короткие URL"
 
-#: actions/pathsadminpanel.php:265
 msgid "Use fancy (more readable and memorable) URLs?"
 msgstr "Использовать ли короткие (более читаемые и запоминаемые) URL-адреса?"
 
-#: actions/pathsadminpanel.php:272
 msgid "Theme"
 msgstr "Тема"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:281
 msgid "Server for themes."
 msgstr "Сервер для тем."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:290
 msgid "Web path to themes."
 msgstr "Веб-путь к темам."
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:297 actions/pathsadminpanel.php:388
-#: actions/pathsadminpanel.php:443 actions/pathsadminpanel.php:495
 msgid "SSL server"
 msgstr "SSL-сервер"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:299
 msgid "SSL server for themes (default: SSL server)."
 msgstr "SSL-сервер для темы (по умолчанию: SSL-сервер)."
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:306 actions/pathsadminpanel.php:397
-#: actions/pathsadminpanel.php:452
 msgid "SSL path"
 msgstr "SSL-путь"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:308
 msgid "SSL path to themes (default: /theme/)."
 msgstr "SSL-путь к темам (по умолчанию: /theme/)."
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:315 actions/pathsadminpanel.php:406
-#: actions/pathsadminpanel.php:461
 msgid "Directory"
 msgstr "Директория"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:317
 msgid "Directory where themes are located."
 msgstr "Директория, в которой расположены темы."
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:326
 msgid "Avatars"
 msgstr "Аватары"
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:333
 msgid "Avatar server"
 msgstr "Сервер аватар"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:335
 msgid "Server for avatars."
 msgstr "Сервер для аватаров."
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:342
 msgid "Avatar path"
 msgstr "Путь к аватарам"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:344
 msgid "Web path to avatars."
 msgstr "Веб-путь к аватарам."
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:351
 msgid "Avatar directory"
 msgstr "Директория аватар"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:353
 msgid "Directory where avatars are located."
 msgstr "Директория, в которой расположены аватары."
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:364
 msgid "Backgrounds"
 msgstr "Фоновые изображения"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:372
 msgid "Server for backgrounds."
 msgstr "Сервер для фоновых изображений."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:381
 msgid "Web path to backgrounds."
 msgstr "Веб-путь к фоновым изображениям."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:390
 msgid "Server for backgrounds on SSL pages."
 msgstr "Сервер для фоновых изображений на страницах SSL."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:399
 msgid "Web path to backgrounds on SSL pages."
 msgstr "Веб-путь к фоновым изображениям для SSL-страниц."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:408
 msgid "Directory where backgrounds are located."
 msgstr "Директория, в которой расположены фоновые изображения."
 
 #. TRANS: Fieldset legens in Paths admin panel.
-#: actions/pathsadminpanel.php:419
 msgid "Attachments"
 msgstr "Вложения"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:427
 msgid "Server for attachments."
 msgstr "Сервер для вложений."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:436
 msgid "Web path to attachments."
 msgstr "Веб-путь к вложениям."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:445
 msgid "Server for attachments on SSL pages."
 msgstr "Сервер для вложений на SSL-страницах."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:454
 msgid "Web path to attachments on SSL pages."
 msgstr "Веб-путь к вложениям на SSL-страницах."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:463
 msgid "Directory where attachments are located."
 msgstr "Директория, в которой расположены вложения."
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:472
 msgid "SSL"
 msgstr "SSL"
 
 #. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
-#: actions/pathsadminpanel.php:477 actions/snapshotadminpanel.php:202
 msgid "Never"
 msgstr "Никогда"
 
 #. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
-#: actions/pathsadminpanel.php:479
 msgid "Sometimes"
 msgstr "Иногда"
 
 #. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
-#: actions/pathsadminpanel.php:481
 msgid "Always"
 msgstr "Всегда"
 
-#: actions/pathsadminpanel.php:485
 msgid "Use SSL"
 msgstr "Использовать SSL"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:487
 msgid "When to use SSL."
 msgstr "Когда использовать SSL."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:497
 msgid "Server to direct SSL requests to."
 msgstr "Сервер, которому направлять SSL-запросы."
 
 #. TRANS: Button title text to store form data in the Paths admin panel.
-#: actions/pathsadminpanel.php:514
 msgid "Save paths"
 msgstr "Сохранить пути"
 
 #. TRANS: Instructions for the "People search" page.
 #. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/peoplesearch.php:54
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
@@ -4510,57 +3723,46 @@ msgstr ""
 "Разделяйте ключевые слова пробелами. Минимальная длина слова — 3 буквы."
 
 #. TRANS: Title of a page where users can search for other users.
-#: actions/peoplesearch.php:61
 msgid "People search"
 msgstr "Поиск людей"
 
-#: actions/peopletag.php:68
 #, php-format
 msgid "Not a valid people tag: %s."
 msgstr "Неверный тег человека: %s."
 
-#: actions/peopletag.php:142
 #, php-format
 msgid "Users self-tagged with %1$s - page %2$d"
 msgstr "Пользователи, установившие себе тег %1$s — страница %2$d"
 
 #. TRANS: Page title for AJAX form return when a disabling a plugin.
-#: actions/plugindisable.php:69
 msgctxt "plugin"
 msgid "Disabled"
 msgstr ""
 
 #. TRANS: Client error displayed trying to perform any request method other than POST.
 #. TRANS: Do not translate POST.
-#: actions/pluginenable.php:78 actions/subscribe.php:77
 msgid "This action only accepts POST requests."
 msgstr "Это действие принимает только POST-запросы."
 
-#: actions/pluginenable.php:102
 #, fuzzy
 msgid "You cannot administer plugins."
 msgstr "Вы не можете удалять пользователей."
 
-#: actions/pluginenable.php:109
 #, fuzzy
 msgid "No such plugin."
 msgstr "Нет такой страницы."
 
 #. TRANS: Page title for AJAX form return when enabling a plugin.
-#: actions/pluginenable.php:159
 msgctxt "plugin"
 msgid "Enabled"
 msgstr ""
 
 #. TRANS: Tab and title for plugins admin panel.
 #. TRANS: Menu item for site administration
-#: actions/pluginsadminpanel.php:56 actions/version.php:191
-#: lib/adminpanelaction.php:411
 msgid "Plugins"
 msgstr "Плагины"
 
 #. TRANS: Instructions at top of plugin admin page.
-#: actions/pluginsadminpanel.php:68
 msgid ""
 "Additional plugins can be enabled and configured manually. See the <a href="
 "\"http://status.net/wiki/Plugins\">online plugin documentation</a> for more "
@@ -4568,32 +3770,26 @@ msgid ""
 msgstr ""
 
 #. TRANS: Admin form section header
-#: actions/pluginsadminpanel.php:84
 #, fuzzy
 msgid "Default plugins"
 msgstr "Язык по умолчанию"
 
-#: actions/pluginsadminpanel.php:106
 msgid ""
 "All default plugins have been disabled from the site's configuration file."
 msgstr ""
 
-#: actions/postnotice.php:95
 msgid "Invalid notice content."
 msgstr "Ошибочное содержание записи."
 
-#: actions/postnotice.php:101
 #, php-format
 msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’."
 msgstr "Лицензия записи «%1$s» не совместима с лицензией сайта «%2$s»."
 
 #. TRANS: Page title for profile settings.
-#: actions/profilesettings.php:60
 msgid "Profile settings"
 msgstr "Настройки профиля"
 
 #. TRANS: Usage instructions for profile settings.
-#: actions/profilesettings.php:71
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
@@ -4601,38 +3797,30 @@ msgstr ""
 "больше."
 
 #. TRANS: Profile settings form legend.
-#: actions/profilesettings.php:99
 msgid "Profile information"
 msgstr "Информация профиля"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:110 actions/register.php:412
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr ""
 "1-64 латинских строчных буквы или цифры, без знаков препинания и пробелов"
 
 #. TRANS: Field label in form for profile settings.
-#: actions/profilesettings.php:114 actions/register.php:434
-#: lib/groupeditform.php:150
 msgid "Full name"
 msgstr "Полное имя"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:119 actions/register.php:439
-#: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "Главная"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:122 actions/register.php:441
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr "Адрес вашей домашней страницы, блога или профиля на другом сайте."
 
 #. TRANS: Tooltip for field label in form for profile settings. Plural
 #. TRANS: is decided by the number of characters available for the
 #. TRANS: biography (%d).
-#: actions/profilesettings.php:130 actions/register.php:450
 #, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4641,41 +3829,31 @@ msgstr[1] "Опишите себя и свои увлечения при пом
 msgstr[2] "Опишите себя и свои увлечения при помощи %d символов"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:136 actions/register.php:455
 msgid "Describe yourself and your interests"
 msgstr "Опишите себя и свои интересы"
 
 #. TRANS: Text area label in form for profile settings where users can provide.
 #. TRANS: their biography.
-#: actions/profilesettings.php:140 actions/register.php:457
 msgid "Bio"
 msgstr "Биография"
 
 #. TRANS: Field label in form for profile settings.
-#: actions/profilesettings.php:146 actions/register.php:462
-#: lib/groupeditform.php:173
 msgid "Location"
 msgstr "Месторасположение"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:149
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Где вы находитесь, например «Город, область, страна»"
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:154
 msgid "Share my current location when posting notices"
 msgstr "Делиться своим текущим местоположением при отправке записей"
 
 #. TRANS: Field label in form for profile settings.
-#: actions/profilesettings.php:162 actions/tagother.php:128
-#: actions/tagother.php:188 lib/subscriptionlist.php:104
-#: lib/subscriptionlist.php:106
 msgid "Tags"
 msgstr "Теги"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:165
 #, fuzzy
 msgid ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- "
@@ -4685,28 +3863,23 @@ msgstr ""
 "пробелом"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:170
 msgid "Language"
 msgstr "Язык"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:172
 #, fuzzy
 msgid "Preferred language."
 msgstr "Предпочитаемый язык"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:182
 msgid "Timezone"
 msgstr "Часовой пояс"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:184
 msgid "What timezone are you normally in?"
 msgstr "В каком часовом поясе Вы обычно находитесь?"
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:190
 #, fuzzy
 msgid ""
 "Automatically subscribe to whoever subscribes to me (best for non-humans)."
@@ -4715,7 +3888,6 @@ msgstr "Автоматически подписываться на всех, к
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Plural form is used based on the maximum number of allowed
 #. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:259 actions/register.php:214
 #, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4724,95 +3896,77 @@ msgstr[1] "Слишком длинная биография (максимум %d
 msgstr[2] "Слишком длинная биография (максимум %d символов)."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:270 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr "Часовой пояс не выбран."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:278
 msgid "Language is too long (maximum 50 characters)."
 msgstr "Слишком длинный язык (максимум 50 символов)."
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:292
 #, fuzzy, php-format
 msgid "Invalid tag: \"%s\"."
 msgstr "Неверный тег: «%s»"
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:348
 #, fuzzy
 msgid "Could not update user for autosubscribe."
 msgstr "Не удаётся обновить пользователя для автоподписки."
 
 #. TRANS: Server error thrown when user profile location preference settings could not be updated.
-#: actions/profilesettings.php:406
 #, fuzzy
 msgid "Could not save location prefs."
 msgstr "Не удаётся сохранить настройки местоположения."
 
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:428 actions/tagother.php:179
 msgid "Could not save tags."
 msgstr "Не удаётся сохранить теги."
 
 #. TRANS: Confirmation shown when user profile settings are saved.
 #. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:437 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "Настройки сохранены."
 
 #. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
 #. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:484 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "Создать новый аккаунт"
 
-#: actions/public.php:83
 #, php-format
 msgid "Beyond the page limit (%s)."
 msgstr "Превышен предел страницы (%s)."
 
-#: actions/public.php:92
 msgid "Could not retrieve public stream."
 msgstr "Не удаётся вернуть публичный поток."
 
-#: actions/public.php:130
 #, php-format
 msgid "Public timeline, page %d"
 msgstr "Общая лента, страница %d"
 
-#: actions/public.php:132 lib/publicgroupnav.php:79
 msgid "Public timeline"
 msgstr "Общая лента"
 
-#: actions/public.php:160
 msgid "Public Stream Feed (RSS 1.0)"
 msgstr "Лента публичного потока (RSS 1.0)"
 
-#: actions/public.php:164
 msgid "Public Stream Feed (RSS 2.0)"
 msgstr "Лента публичного потока (RSS 2.0)"
 
-#: actions/public.php:168
 msgid "Public Stream Feed (Atom)"
 msgstr "Лента публичного потока (Atom)"
 
-#: actions/public.php:188
 #, php-format
 msgid ""
 "This is the public timeline for %%site.name%% but no one has posted anything "
 "yet."
 msgstr "Это общая лента %%site.name%%, однако пока никто ничего не отправил."
 
-#: actions/public.php:191
 msgid "Be the first to post!"
 msgstr "Создайте первую запись!"
 
-#: actions/public.php:195
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post!"
@@ -4820,7 +3974,6 @@ msgstr ""
 "Почему бы не [зарегистрироваться](%%action.register%%), чтобы стать первым "
 "отправителем?"
 
-#: actions/public.php:242
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -4834,7 +3987,6 @@ msgstr ""
 "register%%), чтобы держать в курсе своих  событий  поклонников, друзей, "
 "родственников и коллег! ([Читать далее](%%doc.help%%))"
 
-#: actions/public.php:247
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -4846,19 +3998,16 @@ msgstr ""
 "обеспечения [StatusNet](http://status.net/)."
 
 #. TRANS: Public RSS feed description. %s is the StatusNet site name.
-#: actions/publicrss.php:106
 #, fuzzy, php-format
 msgid "%s updates from everyone."
 msgstr "Обновления %s от всех!"
 
 #. TRANS: Title for public tag cloud.
-#: actions/publictagcloud.php:57
 msgid "Public tag cloud"
 msgstr "Общее облако тегов"
 
 #. TRANS: Instructions (more used like an explanation/header).
 #. TRANS: %s is the StatusNet sitename.
-#: actions/publictagcloud.php:65
 #, php-format
 msgid "These are most popular recent tags on %s"
 msgstr "Самые популярные недавние теги на %s"
@@ -4866,14 +4015,12 @@ msgstr "Самые популярные недавние теги на %s"
 #. TRANS: This message contains a Markdown URL. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.
-#: actions/publictagcloud.php:74
 #, php-format
 msgid "No one has posted a notice with a [hashtag](%%doc.tags%%) yet."
 msgstr "Пока никто на оставлял записей с [тегами](%%doc.tags%%)."
 
 #. 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.
-#: actions/publictagcloud.php:79
 msgid "Be the first to post one!"
 msgstr "Станьте первым отправителем!"
 
@@ -4882,7 +4029,6 @@ msgstr "Станьте первым отправителем!"
 #. TRANS: This message contains a Markdown URL. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.
-#: actions/publictagcloud.php:87
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post "
@@ -4892,42 +4038,34 @@ msgstr ""
 "первым?"
 
 #. TRANS: Client error displayed trying to recover password while already logged in.
-#: actions/recoverpassword.php:37
 msgid "You are already logged in!"
 msgstr "Вы уже авторизованы!"
 
 #. TRANS: Client error displayed when password recovery code is not correct.
-#: actions/recoverpassword.php:64
 msgid "No such recovery code."
 msgstr "Нет такого кода восстановления."
 
 #. TRANS: Client error displayed when no proper password recovery code was submitted.
-#: actions/recoverpassword.php:69
 msgid "Not a recovery code."
 msgstr "Нет кода восстановления."
 
 #. TRANS: Server error displayed trying to recover password without providing a user.
-#: actions/recoverpassword.php:77
 msgid "Recovery code for unknown user."
 msgstr "Код восстановления неизвестного пользователя."
 
 #. TRANS: Server error displayed removing a password recovery code from the database.
-#: actions/recoverpassword.php:91
 msgid "Error with confirmation code."
 msgstr "Ошибка, связанная с кодом подтверждения."
 
 #. TRANS: Client error displayed trying to recover password with too old a recovery code.
-#: actions/recoverpassword.php:103
 msgid "This confirmation code is too old. Please start again."
 msgstr "Код подтверждения слишком старый. Попробуйте ещё раз."
 
 #. TRANS: Server error displayed when updating a user's e-mail address in the database fails while recovering a password.
-#: actions/recoverpassword.php:118
 msgid "Could not update user with confirmed email address."
 msgstr "Не удаётся обновить пользователя с подтверждённым электронным адресом."
 
 #. TRANS: Page notice for password recovery page.
-#: actions/recoverpassword.php:160
 msgid ""
 "If you have forgotten or lost your password, you can get a new one sent to "
 "the email address you have stored in your account."
@@ -4935,99 +4073,81 @@ msgstr ""
 "Если вы забыли или потеряли свой пароль, вы можете запросить новый пароль на "
 "email-адрес вашей учётной записи."
 
-#: actions/recoverpassword.php:167
 msgid "You have been identified. Enter a new password below."
 msgstr "Вы опознаны системой. Введите новый пароль ниже."
 
 #. TRANS: Fieldset legend for password recovery page.
-#: actions/recoverpassword.php:198
 msgid "Password recovery"
 msgstr "Восстановление пароля"
 
 #. TRANS: Field label on password recovery page.
-#: actions/recoverpassword.php:202
 msgid "Nickname or email address"
 msgstr "Имя или email-адрес"
 
 #. TRANS: Title for field label on password recovery page.
-#: actions/recoverpassword.php:205
 msgid "Your nickname on this server, or your registered email address."
 msgstr "Ваше имя на этом сервере или электронный адрес регистрации."
 
 #. TRANS: Field label on password recovery page.
-#: actions/recoverpassword.php:212
 msgid "Recover"
 msgstr "Восстановление"
 
 #. TRANS: Button text on password recovery page.
-#: actions/recoverpassword.php:214
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Recover"
 msgstr "Восстановление"
 
 #. TRANS: Title for password recovery page in password reset mode.
-#: actions/recoverpassword.php:223
 msgid "Reset password"
 msgstr "Переустановить пароль"
 
 #. TRANS: Title for password recovery page in password recover mode.
-#: actions/recoverpassword.php:225
 msgid "Recover password"
 msgstr "Восстановление пароля"
 
 #. TRANS: Title for password recovery page in email sent mode.
 #. TRANS: Subject for password recovery e-mail.
-#: actions/recoverpassword.php:227 actions/recoverpassword.php:366
 msgid "Password recovery requested"
 msgstr "Запрошено восстановление пароля"
 
 #. TRANS: Title for password recovery page in password saved mode.
-#: actions/recoverpassword.php:229
 #, fuzzy
 msgid "Password saved"
 msgstr "Пароль сохранён."
 
 #. TRANS: Title for password recovery page when an unknown action has been specified.
-#: actions/recoverpassword.php:232
 msgid "Unknown action"
 msgstr "Неизвестное действие"
 
 #. TRANS: Title for field label for password reset form.
-#: actions/recoverpassword.php:258
 #, fuzzy
 msgid "6 or more characters, and do not forget it!"
 msgstr "6 или более символов, и не забывайте его!"
 
 #. TRANS: Button text for password reset form.
 #. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: actions/recoverpassword.php:268 lib/designform.php:145
 msgctxt "BUTTON"
 msgid "Reset"
 msgstr "Сбросить"
 
 #. TRANS: Form instructions for password recovery form.
-#: actions/recoverpassword.php:278
 msgid "Enter a nickname or email address."
 msgstr "Введите имя или электронный адрес."
 
 #. TRANS: Information on password recovery form if no known username or e-mail address was specified.
-#: actions/recoverpassword.php:309
 msgid "No user with that email address or username."
 msgstr "Нет пользователя с таким электронным адресом или именем."
 
 #. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
-#: actions/recoverpassword.php:327
 msgid "No registered email address for that user."
 msgstr "Нет зарегистрированных электронных адресов для этого пользователя."
 
 #. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
-#: actions/recoverpassword.php:342
 msgid "Error saving address confirmation."
 msgstr "Ошибка сохранения подтверждённого адреса."
 
 #. TRANS: User notification after an e-mail with instructions was sent from the password recovery form.
-#: actions/recoverpassword.php:370
 msgid ""
 "Instructions for recovering your password have been sent to the email "
 "address registered to your account."
@@ -5036,76 +4156,60 @@ msgstr ""
 "указали при регистрации вашего аккаунта."
 
 #. TRANS: Client error displayed when trying to reset as password without providing a user.
-#: actions/recoverpassword.php:391
 msgid "Unexpected password reset."
 msgstr "Нетиповая переустановка пароля."
 
 #. TRANS: Reset password form validation error message.
-#: actions/recoverpassword.php:400
 msgid "Password must be 6 characters or more."
 msgstr "Пароль должен быть длиной не менее 6 символов."
 
 #. TRANS: Reset password form validation error message.
-#: actions/recoverpassword.php:405
 msgid "Password and confirmation do not match."
 msgstr "Пароль и его подтверждение не совпадают."
 
 #. TRANS: Server error displayed when something does wrong with the user object during password reset.
-#: actions/recoverpassword.php:426 actions/register.php:241
 msgid "Error setting user."
 msgstr "Ошибка в установках пользователя."
 
 #. TRANS: Success message for user after password reset.
-#: actions/recoverpassword.php:434
 msgid "New password successfully saved. You are now logged in."
 msgstr "Новый пароль успешно сохранён. Вы авторизовались."
 
-#: actions/redirecturl.php:70
 #, fuzzy
 msgid "No id parameter"
 msgstr "Нет аргумента ID."
 
-#: actions/redirecturl.php:76
 #, fuzzy, php-format
 msgid "No such file \"%d\""
 msgstr "Нет такого файла."
 
-#: actions/register.php:80 actions/register.php:181 actions/register.php:392
 msgid "Sorry, only invited people can register."
 msgstr "Простите, регистрация только по приглашению."
 
-#: actions/register.php:87
 msgid "Sorry, invalid invitation code."
 msgstr "Извините, неверный пригласительный код."
 
-#: actions/register.php:106
 msgid "Registration successful"
 msgstr "Регистрация успешна!"
 
-#: actions/register.php:108 actions/register.php:490
 msgid "Register"
 msgstr "Регистрация"
 
-#: actions/register.php:128
 msgid "Registration not allowed."
 msgstr "Регистрация недопустима."
 
-#: actions/register.php:194
 #, fuzzy
 msgid "You cannot register if you don't agree to the license."
 msgstr ""
 "Вы не можете зарегистрироваться, если Вы не подтверждаете лицензионного "
 "соглашения."
 
-#: actions/register.php:203
 msgid "Email address already exists."
 msgstr "Такой электронный адрес уже задействован."
 
-#: actions/register.php:236 actions/register.php:258
 msgid "Invalid username or password."
 msgstr "Неверное имя или пароль."
 
-#: actions/register.php:333
 #, fuzzy
 msgid ""
 "With this form you can create a new account. You can then post notices and "
@@ -5115,27 +4219,21 @@ msgstr ""
 "получите возможность публиковать короткие сообщения и устанавливать связи с "
 "друзьями и коллегами. "
 
-#: actions/register.php:424 actions/register.php:428
-#: actions/siteadminpanel.php:238 lib/settingsnav.php:92
 msgid "Email"
 msgstr "Email"
 
-#: actions/register.php:425 actions/register.php:429
 #, fuzzy
 msgid "Used only for updates, announcements, and password recovery."
 msgstr "Нужна только для обновлений, осведомлений и восстановления пароля."
 
-#: actions/register.php:436
 #, fuzzy
 msgid "Longer name, preferably your \"real\" name."
 msgstr "Полное имя, предпочтительно Ваше настоящее имя"
 
-#: actions/register.php:464
 #, fuzzy
 msgid "Where you are, like \"City, State (or Region), Country\"."
 msgstr "Где вы находитесь, например «Город, область, страна»"
 
-#: actions/register.php:503
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
@@ -5143,23 +4241,19 @@ msgstr ""
 "Я понимаю, что содержание и данные %1$s являются частными и "
 "конфиденциальными."
 
-#: actions/register.php:513
 #, php-format
 msgid "My text and files are copyright by %1$s."
 msgstr "Авторским правом на мои тексты и файлы обладает %1$s."
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:517
 msgid "My text and files remain under my own copyright."
 msgstr "Авторские права на мои тексты и файлы остаются за мной."
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:520
 msgid "All rights reserved."
 msgstr "Все права защищены."
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:525
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -5168,7 +4262,6 @@ msgstr ""
 "Мои тексты и файлы доступны на условиях %s, за исключением следующей личной "
 "информации: пароля, почтового адреса, номера мессенджера и номера телефона."
 
-#: actions/register.php:566
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -5202,7 +4295,6 @@ msgstr ""
 "Спасибо за то, что присоединились к нам, надеемся, что вы получите "
 "удовольствие от использования данного сервиса!"
 
-#: actions/register.php:590
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5210,7 +4302,6 @@ msgstr ""
 "(Вы должный получить письмо с описанием того, как подтвердить свой "
 "электронный адрес.)"
 
-#: actions/remotesubscribe.php:97
 #, php-format
 msgid ""
 "To subscribe, you can [login](%%action.login%%), or [register](%%action."
@@ -5220,110 +4311,85 @@ msgstr ""
 "Чтобы подписаться, необходимо [авторизоваться](%%action.login%%) или "
 "[зарегистрировать](%%action.register%%) новый аккаунт."
 
-#: actions/remotesubscribe.php:111
 msgid "Remote subscribe"
 msgstr "Подписаться на пользователя"
 
-#: actions/remotesubscribe.php:123
 msgid "Subscribe to a remote user"
 msgstr "Подписаться на удалённого пользователя"
 
-#: actions/remotesubscribe.php:128
 msgid "User nickname"
 msgstr "Имя пользователя."
 
-#: actions/remotesubscribe.php:129
 #, fuzzy
 msgid "Nickname of the user you want to follow."
 msgstr "Имя пользователя, которому Вы хотите следовать"
 
-#: actions/remotesubscribe.php:132
 msgid "Profile URL"
 msgstr "URL профиля"
 
-#: actions/remotesubscribe.php:133
 #, fuzzy
 msgid "URL of your profile on another compatible microblogging service."
 msgstr "Адрес URL твоего профиля на другом подходящем сервисе микроблогинга"
 
 #. TRANS: Link text for link that will subscribe to a remote profile.
-#: actions/remotesubscribe.php:136 lib/subscribeform.php:139
-#: lib/userprofile.php:402
 msgid "Subscribe"
 msgstr "Подписаться"
 
-#: actions/remotesubscribe.php:158
 #, fuzzy
 msgid "Invalid profile URL (bad format)."
 msgstr "Неверный URL профиля (плохой формат)"
 
-#: actions/remotesubscribe.php:167
 msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
 msgstr "Неправильный URL-профиль (нет YADIS-документа, либо неверный XRDS)."
 
-#: actions/remotesubscribe.php:175
 #, fuzzy
 msgid "That is a local profile! Login to subscribe."
 msgstr "Это локальный профиль! Авторизуйтесь для подписки."
 
-#: actions/remotesubscribe.php:182
 #, fuzzy
 msgid "Could not get a request token."
 msgstr "Не удаётся получить получить ключ запроса."
 
-#: actions/repeat.php:56
 msgid "Only logged-in users can repeat notices."
 msgstr "Повторять записи могут только вошедшие пользователи."
 
-#: actions/repeat.php:63 actions/repeat.php:70
 msgid "No notice specified."
 msgstr "Не указана запись."
 
-#: actions/repeat.php:75
 #, fuzzy
 msgid "You cannot repeat your own notice."
 msgstr "Вы не можете повторить собственную запись."
 
-#: actions/repeat.php:89
 msgid "You already repeated that notice."
 msgstr "Вы уже повторили эту запись."
 
-#: actions/repeat.php:112 lib/noticelist.php:697
 msgid "Repeated"
 msgstr "Повторено"
 
-#: actions/repeat.php:117
 msgid "Repeated!"
 msgstr "Повторено!"
 
 #. TRANS: RSS reply feed title. %s is a user nickname.
-#: actions/replies.php:126 actions/repliesrss.php:68
-#: lib/personalgroupnav.php:105
 #, php-format
 msgid "Replies to %s"
 msgstr "Ответы для %s"
 
-#: actions/replies.php:128
 #, php-format
 msgid "Replies to %1$s, page %2$d"
 msgstr "Ответы для %1$s, страница %2$d"
 
-#: actions/replies.php:145
 #, php-format
 msgid "Replies feed for %s (RSS 1.0)"
 msgstr "Лента записей для %s (RSS 1.0)"
 
-#: actions/replies.php:152
 #, php-format
 msgid "Replies feed for %s (RSS 2.0)"
 msgstr "Лента записей для %s (RSS 2.0)"
 
-#: actions/replies.php:159
 #, php-format
 msgid "Replies feed for %s (Atom)"
 msgstr "Лента записей для %s (Atom)"
 
-#: actions/replies.php:199
 #, php-format
 msgid ""
 "This is the timeline showing replies to %1$s but %2$s hasn't received a "
@@ -5332,7 +4398,6 @@ msgstr ""
 "Эта лента содержит ответы  для %1$s, однако %2$s пока не получил уведомление "
 "о них."
 
-#: actions/replies.php:204
 #, php-format
 msgid ""
 "You can engage other users in a conversation, subscribe to more people or "
@@ -5341,7 +4406,6 @@ msgstr ""
 "Вы можете вовлечь других пользователей в разговор, подписавшись на большее "
 "число людей или [присоединившись к группам](%%action.groups%%)."
 
-#: actions/replies.php:206
 #, php-format
 msgid ""
 "You can try to [nudge %1$s](../%2$s) or [post something to them](%%%%action."
@@ -5352,37 +4416,31 @@ msgstr ""
 
 #. TRANS: RSS reply feed description.
 #. TRANS: %1$s is a user nickname, %2$s is the StatusNet site name.
-#: actions/repliesrss.php:74
 #, fuzzy, php-format
 msgid "Replies to %1$s on %2$s."
 msgstr "Ответы на записи %1$s на %2$s!"
 
 #. TRANS: Client exception displayed when trying to restore an account while not logged in.
-#: actions/restoreaccount.php:78
 #, fuzzy
 msgid "Only logged-in users can restore their account."
 msgstr "Повторять записи могут только вошедшие пользователи."
 
 #. TRANS: Client exception displayed when trying to restore an account without having restore rights.
-#: actions/restoreaccount.php:83
 #, fuzzy
 msgid "You may not restore your account."
 msgstr "Вы пока не зарегистрировали ни одного приложения."
 
 #. TRANS: Client exception displayed trying to restore an account while something went wrong uploading a file.
 #. TRANS: Client exception. No file; probably just a non-AJAX submission.
-#: actions/restoreaccount.php:121 actions/restoreaccount.php:146
 #, fuzzy
 msgid "No uploaded file."
 msgstr "Загрузить файл"
 
 #. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
-#: actions/restoreaccount.php:129 lib/mediafile.php:194
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
 msgstr "Загружаемый файл превышает директиву upload_max_filesize в php.ini."
 
 #. TRANS: Client exception.
-#: actions/restoreaccount.php:135 lib/mediafile.php:200
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form."
@@ -5390,146 +4448,118 @@ msgstr ""
 "Загружаемый файл превышает директиву MAX_FILE_SIZE, указанную в HTML-форме."
 
 #. TRANS: Client exception.
-#: actions/restoreaccount.php:141 lib/mediafile.php:206
 msgid "The uploaded file was only partially uploaded."
 msgstr "Загружаемый файл загружен только частично."
 
 #. TRANS: Client exception thrown when a temporary folder is not present to store a file upload.
-#: actions/restoreaccount.php:150 lib/mediafile.php:214
 msgid "Missing a temporary folder."
 msgstr "Отсутствует временной каталог."
 
 #. TRANS: Client exception thrown when writing to disk is not possible during a file upload operation.
-#: actions/restoreaccount.php:154 lib/mediafile.php:218
 msgid "Failed to write file to disk."
 msgstr "Не удаётся записать файл на диск."
 
 #. TRANS: Client exception thrown when a file upload operation has been stopped by an extension.
-#: actions/restoreaccount.php:158 lib/mediafile.php:222
 msgid "File upload stopped by extension."
 msgstr "Загрузка файла остановлена по расширению."
 
 #. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
 #. TRANS: Exception thrown when uploading an image fails for an unknown reason.
 #. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
-#: actions/restoreaccount.php:164 lib/imagefile.php:106 lib/mediafile.php:228
 msgid "System error uploading file."
 msgstr "Системная ошибка при загрузке файла."
 
 #. TRANS: Client exception thrown when a feed is not an Atom feed.
-#: actions/restoreaccount.php:207
 #, fuzzy
 msgid "Not an Atom feed."
 msgstr "Все участники"
 
 #. TRANS: Success message when a feed has been restored.
-#: actions/restoreaccount.php:241
 msgid ""
 "Feed has been restored. Your old posts should now appear in search and your "
 "profile page."
 msgstr ""
 
 #. TRANS: Message when a feed restore is in progress.
-#: actions/restoreaccount.php:245
 msgid "Feed will be restored. Please wait a few minutes for results."
 msgstr ""
 
 #. TRANS: Form instructions for feed restore.
-#: actions/restoreaccount.php:342
 msgid ""
 "You can upload a backed-up stream in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format."
 msgstr ""
 
 #. TRANS: Title for submit button to confirm upload of a user backup file for account restore.
-#: actions/restoreaccount.php:373
 #, fuzzy
 msgid "Upload the file"
 msgstr "Загрузить файл"
 
-#: actions/revokerole.php:75
 msgid "You cannot revoke user roles on this site."
 msgstr "Вы не можете снимать роли пользователей на этом сайте."
 
-#: actions/revokerole.php:82
 msgid "User doesn't have this role."
 msgstr "Пользователь не имеет этой роли."
 
-#: actions/rsd.php:142 actions/version.php:159
 msgid "StatusNet"
 msgstr "StatusNet"
 
-#: actions/sandbox.php:65 actions/unsandbox.php:65
 msgid "You cannot sandbox users on this site."
 msgstr ""
 "Вы не можете устанавливать режим песочницы для пользователей этого сайта."
 
-#: actions/sandbox.php:72
 msgid "User is already sandboxed."
 msgstr "Пользователь уже в режиме песочницы."
 
 #. TRANS: Menu item for site administration
-#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
-#: lib/adminpanelaction.php:379
 msgid "Sessions"
 msgstr "Сессии"
 
-#: actions/sessionsadminpanel.php:65
 msgid "Session settings for this StatusNet site"
 msgstr "Настройки сессии для этого сайта StatusNet"
 
-#: actions/sessionsadminpanel.php:175
 msgid "Handle sessions"
 msgstr "Управление сессиями"
 
-#: actions/sessionsadminpanel.php:177
 msgid "Whether to handle sessions ourselves."
 msgstr "Управлять ли сессиями самостоятельно."
 
-#: actions/sessionsadminpanel.php:181
 msgid "Session debugging"
 msgstr "Отладка сессий"
 
-#: actions/sessionsadminpanel.php:183
 msgid "Turn on debugging output for sessions."
 msgstr "Включить отладочный вывод для сессий."
 
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
+#. TRANS: Submit button title.
+msgid "Save"
+msgstr "Сохранить"
+
 msgid "Save site settings"
 msgstr "Сохранить настройки сайта"
 
-#: actions/showapplication.php:78
 msgid "You must be logged in to view an application."
 msgstr "Вы должны авторизоваться, чтобы просматривать приложения."
 
-#: actions/showapplication.php:151
 msgid "Application profile"
 msgstr "Профиль приложения"
 
-#: actions/showapplication.php:179
 #, php-format
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr "Создано %1$s — доступ по умолчанию: %2$s — %3$d польз."
 
-#: actions/showapplication.php:189
 msgid "Application actions"
 msgstr "Действия приложения"
 
-#: actions/showapplication.php:212
 msgid "Reset key & secret"
 msgstr "Сбросить ключ и секретную фразу"
 
 #. TRANS: Title of form for deleting a user.
-#: actions/showapplication.php:228 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:64 lib/noticelist.php:678
 msgid "Delete"
 msgstr "Удалить"
 
-#: actions/showapplication.php:237
 msgid "Application info"
 msgstr "Информация о приложении"
 
-#: actions/showapplication.php:255
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
@@ -5537,43 +4567,36 @@ msgstr ""
 "Примечание: Мы поддерживаем подписи HMAC-SHA1. Мы не поддерживаем метод "
 "подписи открытым текстом."
 
-#: actions/showapplication.php:275
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr ""
 "Вы уверены, что хотите сбросить ваш ключ потребителя и секретную фразу?"
 
 #. TRANS: Title for all but the first page of favourite notices of a user.
 #. TRANS: %1$s is the user for whom the favourite notices are displayed, %2$d is the page number.
-#: actions/showfavorites.php:80
 #, php-format
 msgid "%1$s's favorite notices, page %2$d"
 msgstr "Любимые записи %1$s, страница %2$d"
 
 #. TRANS: Server error displayed when favourite notices could not be retrieved from the database.
-#: actions/showfavorites.php:134
 msgid "Could not retrieve favorite notices."
 msgstr "Не удаётся восстановить любимые записи."
 
 #. TRANS: Feed link text. %s is a username.
-#: actions/showfavorites.php:172
 #, php-format
 msgid "Feed for favorites of %s (RSS 1.0)"
 msgstr "Лента друзей %s (RSS 1.0)"
 
 #. TRANS: Feed link text. %s is a username.
-#: actions/showfavorites.php:180
 #, php-format
 msgid "Feed for favorites of %s (RSS 2.0)"
 msgstr "Лента друзей %s (RSS 2.0)"
 
 #. TRANS: Feed link text. %s is a username.
-#: actions/showfavorites.php:188
 #, php-format
 msgid "Feed for favorites of %s (Atom)"
 msgstr "Лента друзей %s (Atom)"
 
 #. TRANS: Text displayed instead of favourite notices for the current logged in user that has no favourites.
-#: actions/showfavorites.php:209
 msgid ""
 "You haven't chosen any favorite notices yet. Click the fave button on "
 "notices you like to bookmark them for later or shed a spotlight on them."
@@ -5583,7 +4606,6 @@ msgstr ""
 
 #. TRANS: Text displayed instead of favourite notices for a user that has no favourites while logged in.
 #. TRANS: %s is a username.
-#: actions/showfavorites.php:213
 #, php-format
 msgid ""
 "%s hasn't added any favorite notices yet. Post something interesting they "
@@ -5595,7 +4617,6 @@ msgstr ""
 #. TRANS: Text displayed instead of favourite notices for a user that has no favourites while not logged in.
 #. TRANS: %s is a username, %%%%action.register%%%% is a link to the user registration page.
 #. TRANS: (link text)[link] is a Mark Down link.
-#: actions/showfavorites.php:220
 #, php-format
 msgid ""
 "%s hasn't added any favorite notices yet. Why not [register an account](%%%%"
@@ -5607,64 +4628,53 @@ msgstr ""
 "интересное, что понравилось бы этому пользователю? :)"
 
 #. TRANS: Page notice for show favourites page.
-#: actions/showfavorites.php:251
 msgid "This is a way to share what you like."
 msgstr "Это способ поделиться тем, что вам нравится."
 
 #. TRANS: Page title for first group page. %s is a group name.
-#: actions/showgroup.php:75
 #, php-format
 msgid "%s group"
 msgstr "Группа %s"
 
 #. TRANS: Page title for any but first group page.
 #. TRANS: %1$s is a group name, $2$s is a page number.
-#: actions/showgroup.php:79
 #, php-format
 msgid "%1$s group, page %2$d"
 msgstr "Группа %1$s, страница %2$d"
 
 #. TRANS: Label for group description or group note (dt). Text hidden by default.
-#: actions/showgroup.php:266
 msgid "Note"
 msgstr "Запись"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:277 lib/groupeditform.php:180
 msgid "Aliases"
 msgstr "Алиасы"
 
 #. TRANS: Group actions header (h2). Text hidden by default.
-#: actions/showgroup.php:294
 msgid "Group actions"
 msgstr "Действия группы"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:338
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
 msgstr "Лента записей группы %s (RSS 1.0)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:345
 #, php-format
 msgid "Notice feed for %s group (RSS 2.0)"
 msgstr "Лента записей группы %s (RSS 2.0)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:352
 #, php-format
 msgid "Notice feed for %s group (Atom)"
 msgstr "Лента записей группы %s (Atom)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:358
 #, php-format
 msgid "FOAF for %s group"
 msgstr "FOAF для группы %s"
 
 #. TRANS: Header for mini list of group members on a group page (h2).
-#: actions/showgroup.php:395
 msgid "Members"
 msgstr "Участники"
 
@@ -5672,30 +4682,23 @@ msgstr "Участники"
 #. TRANS: Text for user subscription statistics if the user has no subscriptions.
 #. TRANS: Text for user subscriber statistics if user has no subscribers.
 #. TRANS: Text for user user group membership statistics if user is not a member of any group.
-#: actions/showgroup.php:401 lib/profileaction.php:137
-#: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
-#: lib/subscriptionlist.php:123 lib/tagcloudsection.php:71
 msgid "(None)"
 msgstr "(пока ничего нет)"
 
 #. TRANS: Link to all group members from mini list of group members if group has more than n members.
-#: actions/showgroup.php:410
 msgid "All members"
 msgstr "Все участники"
 
 #. TRANS: Header for group statistics on a group page (h2).
 #. TRANS: H2 text for user statistics.
-#: actions/showgroup.php:441 lib/profileaction.php:205
 msgid "Statistics"
 msgstr "Статистика"
 
-#: actions/showgroup.php:444
 msgctxt "LABEL"
 msgid "Created"
 msgstr "Дата создания"
 
 #. TRANS: Label for member count in statistics on group page.
-#: actions/showgroup.php:449
 msgctxt "LABEL"
 msgid "Members"
 msgstr "Участники"
@@ -5704,7 +4707,6 @@ msgstr "Участники"
 #. TRANS: **%s** is the group alias, %%%%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).
-#: actions/showgroup.php:464
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5723,7 +4725,6 @@ 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: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
-#: actions/showgroup.php:474
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5737,99 +4738,83 @@ msgstr ""
 "короткими сообщениями о своей жизни и интересах. "
 
 #. TRANS: Header for list of group administrators on a group page (h2).
-#: actions/showgroup.php:503
 msgid "Admins"
 msgstr "Администраторы"
 
 #. TRANS: Client error displayed requesting a single message that does not exist.
-#: actions/showmessage.php:76
 msgid "No such message."
 msgstr "Нет такого сообщения."
 
 #. TRANS: Client error displayed requesting a single direct message the requesting user was not a party in.
-#: actions/showmessage.php:86
 msgid "Only the sender and recipient may read this message."
 msgstr "Только отправитель и получатель могут читать это сообщение."
 
 #. TRANS: Page title for single direct message display when viewing user is the sender.
 #. TRANS: %1$s is the addressed user's nickname, $2$s is a timestamp.
-#: actions/showmessage.php:105
 #, php-format
 msgid "Message to %1$s on %2$s"
 msgstr "Сообщение для %1$s на %2$s"
 
 #. TRANS: Page title for single message display.
 #. TRANS: %1$s is the sending user's nickname, $2$s is a timestamp.
-#: actions/showmessage.php:113
 #, php-format
 msgid "Message from %1$s on %2$s"
 msgstr "Сообщение от %1$s на %2$s"
 
-#: actions/shownotice.php:90
 msgid "Notice deleted."
 msgstr "Запись удалена."
 
 #. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
-#: actions/showstream.php:70
 #, php-format
 msgid "%1$s tagged %2$s"
 msgstr "%1$s с тегом %2$s"
 
 #. TRANS: Page title showing tagged notices in one user's stream.
 #. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
-#: actions/showstream.php:74
 #, php-format
 msgid "%1$s tagged %2$s, page %3$d"
 msgstr "%1$s с тегом %2$s, страница %3$d"
 
 #. TRANS: Extended page title showing tagged notices in one user's stream.
 #. TRANS: %1$s is the username, %2$d is the page number.
-#: actions/showstream.php:82
 #, php-format
 msgid "%1$s, page %2$d"
 msgstr "%1$s, страница %2$d"
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %1$s is a user nickname, %2$s is a hashtag.
-#: actions/showstream.php:127
 #, php-format
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
 msgstr "Лента записей %1$s с тегом %2$s (RSS 1.0)"
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.
-#: actions/showstream.php:136
 #, php-format
 msgid "Notice feed for %s (RSS 1.0)"
 msgstr "Лента записей для %s (RSS 1.0)"
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.
-#: actions/showstream.php:145
 #, php-format
 msgid "Notice feed for %s (RSS 2.0)"
 msgstr "Лента записей для %s (RSS 2.0)"
 
-#: actions/showstream.php:152
 #, php-format
 msgid "Notice feed for %s (Atom)"
 msgstr "Лента записей для %s (Atom)"
 
 #. TRANS: Title for link to notice feed. FOAF stands for Friend of a Friend.
 #. TRANS: More information at http://www.foaf-project.org. %s is a user nickname.
-#: actions/showstream.php:159
 #, php-format
 msgid "FOAF for %s"
 msgstr "FOAF для %s"
 
 #. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
-#: actions/showstream.php:205
 #, php-format
 msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr "Это лента %1$s, однако %1$s пока ничего не отправил."
 
 #. TRANS: Second sentence of empty list message for a stream for the user themselves.
-#: actions/showstream.php:211
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
@@ -5839,7 +4824,6 @@ msgstr ""
 
 #. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:215
 #, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
@@ -5850,7 +4834,6 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:258
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5867,7 +4850,6 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:265
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5880,224 +4862,177 @@ msgstr ""
 "net/). "
 
 #. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
-#: actions/showstream.php:322
 #, php-format
 msgid "Repeat of %s"
 msgstr "Повтор за %s"
 
-#: actions/silence.php:65 actions/unsilence.php:65
 msgid "You cannot silence users on this site."
 msgstr "Вы не можете заглушать пользователей на этом сайте."
 
-#: actions/silence.php:72
 msgid "User is already silenced."
 msgstr "Пользователь уже заглушён."
 
-#: actions/siteadminpanel.php:69
 msgid "Basic settings for this StatusNet site"
 msgstr "Основные настройки для этого сайта StatusNet"
 
-#: actions/siteadminpanel.php:133
 msgid "Site name must have non-zero length."
 msgstr "Имя сайта должно быть ненулевой длины."
 
-#: actions/siteadminpanel.php:141
 msgid "You must have a valid contact email address."
 msgstr "У вас должен быть действительный контактный email-адрес."
 
-#: actions/siteadminpanel.php:159
 #, php-format
 msgid "Unknown language \"%s\"."
 msgstr "Неизвестный язык «%s»."
 
-#: actions/siteadminpanel.php:165
 msgid "Minimum text limit is 0 (unlimited)."
 msgstr "Минимальное ограничение текста составляет 0 (без ограничений)."
 
-#: actions/siteadminpanel.php:171
 msgid "Dupe limit must be one or more seconds."
 msgstr "Ограничение дублирования должно составлять одну или более секунд."
 
-#: actions/siteadminpanel.php:221
 msgid "General"
 msgstr "Базовые"
 
-#: actions/siteadminpanel.php:224
 msgid "Site name"
 msgstr "Имя сайта"
 
-#: actions/siteadminpanel.php:225
 msgid "The name of your site, like \"Yourcompany Microblog\""
 msgstr "Имя вашего сайта, например, «Yourcompany Microblog»"
 
-#: actions/siteadminpanel.php:229
 msgid "Brought by"
 msgstr "Предоставлено"
 
-#: actions/siteadminpanel.php:230
 msgid "Text used for credits link in footer of each page"
 msgstr ""
 "Текст, используемый для указания авторов в нижнем колонтитуле каждой страницы"
 
-#: actions/siteadminpanel.php:234
 msgid "Brought by URL"
 msgstr "URL-адрес поставщика услуг"
 
-#: actions/siteadminpanel.php:235
 msgid "URL used for credits link in footer of each page"
 msgstr ""
 "URL, используемый для ссылки на авторов в нижнем колонтитуле каждой страницы"
 
-#: actions/siteadminpanel.php:239
 msgid "Contact email address for your site"
 msgstr "Контактный email-адрес для вашего сайта"
 
-#: actions/siteadminpanel.php:245
 msgid "Local"
 msgstr "Внутренние настройки"
 
-#: actions/siteadminpanel.php:256
 msgid "Default timezone"
 msgstr "Часовой пояс по умолчанию"
 
-#: actions/siteadminpanel.php:257
 msgid "Default timezone for the site; usually UTC."
 msgstr "Часовой пояс по умолчанию для сайта; обычно UTC."
 
-#: actions/siteadminpanel.php:262
 msgid "Default language"
 msgstr "Язык по умолчанию"
 
-#: actions/siteadminpanel.php:263
 msgid "Site language when autodetection from browser settings is not available"
 msgstr ""
 "Язык сайта в случае, если автоопределение из настроек браузера не сработало"
 
-#: actions/siteadminpanel.php:271
 msgid "Limits"
 msgstr "Границы"
 
-#: actions/siteadminpanel.php:274
 msgid "Text limit"
 msgstr "Границы текста"
 
-#: actions/siteadminpanel.php:274
 msgid "Maximum number of characters for notices."
 msgstr "Максимальное число символов для записей."
 
-#: actions/siteadminpanel.php:278
 msgid "Dupe limit"
 msgstr "Предел дубликатов"
 
-#: actions/siteadminpanel.php:278
 msgid "How long users must wait (in seconds) to post the same thing again."
 msgstr ""
 "Сколько нужно ждать пользователям (в секундах) для отправки того же ещё раз."
 
 #. TRANS: Page title for site-wide notice tab in admin panel.
-#: actions/sitenoticeadminpanel.php:55
 msgid "Site Notice"
 msgstr "Уведомление сайта"
 
 #. TRANS: Instructions for site-wide notice tab in admin panel.
-#: actions/sitenoticeadminpanel.php:66
 msgid "Edit site-wide message"
 msgstr "Изменить уведомление для всего сайта"
 
 #. TRANS: Server error displayed when saving a site-wide notice was impossible.
-#: actions/sitenoticeadminpanel.php:101
 msgid "Unable to save site notice."
 msgstr "Не удаётся сохранить уведомление сайта."
 
 #. TRANS: Client error displayed when a site-wide notice was longer than allowed.
-#: actions/sitenoticeadminpanel.php:112
 msgid "Maximum length for the site-wide notice is 255 characters."
 msgstr "Максимальная длина уведомления сайта составляет 255 символов."
 
 #. TRANS: Label for site-wide notice text field in admin panel.
-#: actions/sitenoticeadminpanel.php:176
 msgid "Site notice text"
 msgstr "Текст уведомления сайта"
 
 #. TRANS: Tooltip for site-wide notice text field in admin panel.
-#: actions/sitenoticeadminpanel.php:179
 msgid "Site-wide notice text (255 characters maximum; HTML allowed)"
 msgstr "Текст уведомления сайта (максимум 255 символов; допустим HTML)"
 
 #. TRANS: Title for button to save site notice in admin panel.
-#: actions/sitenoticeadminpanel.php:201
 #, fuzzy
 msgid "Save site notice."
 msgstr "Сохранить уведомление сайта"
 
 #. TRANS: Title for SMS settings.
-#: actions/smssettings.php:56
 msgid "SMS settings"
 msgstr "Установки СМС"
 
 #. TRANS: SMS settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/smssettings.php:70
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr ""
 "Вы можете отправлять СМС-сообщения по электронному адресу от %%site.name%%."
 
 #. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
-#: actions/smssettings.php:92
 msgid "SMS is not available."
 msgstr "Отправка СМС недоступна."
 
 #. TRANS: Form legend for SMS settings form.
-#: actions/smssettings.php:106
 msgid "SMS address"
 msgstr "SMS-адрес"
 
 #. TRANS: Form guide in SMS settings form.
-#: actions/smssettings.php:115
 msgid "Current confirmed SMS-enabled phone number."
 msgstr ""
 "Подтверждённый в настоящее время SMS-доступный номер мобильного телефона."
 
 #. TRANS: Form guide in IM settings form.
-#: actions/smssettings.php:128
 msgid "Awaiting confirmation on this phone number."
 msgstr "В ожидании подтверждения данного номера телефона."
 
 #. TRANS: Field label for SMS address input in SMS settings form.
-#: actions/smssettings.php:137
 msgid "Confirmation code"
 msgstr "Код подтверждения"
 
 #. TRANS: Form field instructions in SMS settings form.
-#: actions/smssettings.php:139
 msgid "Enter the code you received on your phone."
 msgstr "Введите код, который вы получили по телефону."
 
 #. TRANS: Button label to confirm SMS confirmation code in SMS settings.
-#: actions/smssettings.php:143
 msgctxt "BUTTON"
 msgid "Confirm"
 msgstr "Подтвердить"
 
 #. TRANS: Field label for SMS phone number input in SMS settings form.
-#: actions/smssettings.php:148
 msgid "SMS phone number"
 msgstr "Номер телефона для СМС"
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
-#: actions/smssettings.php:151
 #, fuzzy
 msgid "Phone number, no punctuation or spaces, with area code."
 msgstr "Номер телефона, без пробелов, с кодом зоны"
 
 #. TRANS: Form legend for SMS preferences form.
-#: actions/smssettings.php:190
 msgid "SMS preferences"
 msgstr "Настройки SMS"
 
 #. TRANS: Checkbox label in SMS preferences form.
-#: actions/smssettings.php:196
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
@@ -6106,32 +5041,26 @@ msgstr ""
 "по пересылке."
 
 #. TRANS: Confirmation message for successful SMS preferences save.
-#: actions/smssettings.php:307
 msgid "SMS preferences saved."
 msgstr "Настройки SMS сохранены."
 
 #. TRANS: Message given saving SMS phone number without having provided one.
-#: actions/smssettings.php:329
 msgid "No phone number."
 msgstr "Нет номера телефона."
 
 #. TRANS: Message given saving SMS phone number without having selected a carrier.
-#: actions/smssettings.php:335
 msgid "No carrier selected."
 msgstr "Провайдер не выбран."
 
 #. TRANS: Message given saving SMS phone number that is already set.
-#: actions/smssettings.php:343
 msgid "That is already your phone number."
 msgstr "Это уже ваш номер телефона."
 
 #. TRANS: Message given saving SMS phone number that is already set for another user.
-#: actions/smssettings.php:347
 msgid "That phone number already belongs to another user."
 msgstr "Этот телефонный номер уже задействован другим пользователем."
 
 #. TRANS: Message given saving valid SMS phone number that is to be confirmed.
-#: actions/smssettings.php:375
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
 "for the code and instructions on how to use it."
@@ -6140,39 +5069,32 @@ msgstr ""
 "телефон для нахождения этого кода и инструкций по его использованию."
 
 #. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
-#: actions/smssettings.php:403
 msgid "That is the wrong confirmation number."
 msgstr "Это неверный номер подтверждения."
 
 #. TRANS: Message given after successfully canceling SMS phone number confirmation.
-#: actions/smssettings.php:417
 msgid "SMS confirmation cancelled."
 msgstr "Подтверждение SMS отменено."
 
 #. TRANS: Message given trying to remove an SMS phone number that is not
 #. TRANS: registered for the active user.
-#: actions/smssettings.php:437
 msgid "That is not your phone number."
 msgstr "Это не Ваш номер телефона."
 
 #. TRANS: Message given after successfully removing a registered SMS phone number.
-#: actions/smssettings.php:459
 msgid "The SMS phone number was removed."
 msgstr "Номер SMS телефона удалён."
 
 #. TRANS: Label for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:498
 msgid "Mobile carrier"
 msgstr "Выбор провайдера"
 
 #. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:503
 msgid "Select a carrier"
 msgstr "Выбор провайдера"
 
 #. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
 #. TRANS: %s is an administrative contact's e-mail address.
-#: actions/smssettings.php:512
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -6183,121 +5105,96 @@ msgstr ""
 "то сообщите нам об этом по электронной почте %s."
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
-#: actions/smssettings.php:534
 #, fuzzy
 msgid "No code entered."
 msgstr "Код не введён"
 
 #. TRANS: Menu item for site administration
-#: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
-#: lib/adminpanelaction.php:395
 msgid "Snapshots"
 msgstr "Снимки"
 
-#: actions/snapshotadminpanel.php:65
 msgid "Manage snapshot configuration"
 msgstr "Управление снимками конфигурации"
 
-#: actions/snapshotadminpanel.php:127
 msgid "Invalid snapshot run value."
 msgstr "Неверное значение запуска снимка."
 
-#: actions/snapshotadminpanel.php:133
 msgid "Snapshot frequency must be a number."
 msgstr "Частота снимков должна быть числом."
 
-#: actions/snapshotadminpanel.php:144
 msgid "Invalid snapshot report URL."
 msgstr "Неверный URL отчёта снимка."
 
-#: actions/snapshotadminpanel.php:200
 msgid "Randomly during web hit"
 msgstr "При случайном веб-обращении"
 
-#: actions/snapshotadminpanel.php:201
 msgid "In a scheduled job"
 msgstr "По заданному графику"
 
-#: actions/snapshotadminpanel.php:206
 msgid "Data snapshots"
 msgstr "Снимки данных"
 
-#: actions/snapshotadminpanel.php:208
 msgid "When to send statistical data to status.net servers"
 msgstr "Когда отправлять статистические данные на сервера status.net"
 
-#: actions/snapshotadminpanel.php:217
 msgid "Frequency"
 msgstr "Частота"
 
-#: actions/snapshotadminpanel.php:218
 msgid "Snapshots will be sent once every N web hits"
 msgstr "Снимки будут отправляться каждые N посещений"
 
-#: actions/snapshotadminpanel.php:226
 msgid "Report URL"
 msgstr "URL отчёта"
 
-#: actions/snapshotadminpanel.php:227
 msgid "Snapshots will be sent to this URL"
 msgstr "Снимки будут отправляться по этому URL-адресу"
 
-#: actions/snapshotadminpanel.php:248
 msgid "Save snapshot settings"
 msgstr "Сохранить настройки снимка"
 
 #. TRANS: Client error displayed trying a change a subscription for a non-subscribed profile.
-#: actions/subedit.php:75
 msgid "You are not subscribed to that profile."
 msgstr "Вы не подписаны на этот профиль."
 
 #. TRANS: Server error displayed when updating a subscription fails with a database error.
 #. TRANS: Exception thrown when a subscription could not be stored on the server.
-#: actions/subedit.php:89 classes/Subscription.php:141
 msgid "Could not save subscription."
 msgstr "Не удаётся сохранить подписку."
 
 #. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
-#: actions/subscribe.php:121
 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
 msgstr ""
 "Вы не можете подписаться на удалённый профиль OMB 0.1 с помощью этого "
 "действия."
 
 #. TRANS: Page title when subscription succeeded.
-#: actions/subscribe.php:149
 msgid "Subscribed"
 msgstr "Подписано"
 
 #. TRANS: Header for list of subscribers for a user (first page).
 #. TRANS: %s is the user's nickname.
-#: actions/subscribers.php:51
 #, php-format
 msgid "%s subscribers"
 msgstr "Подписчики %s"
 
 #. TRANS: Header for list of subscribers for a user (not first page).
 #. TRANS: %1$s is the user's nickname, $2$d is the page number.
-#: actions/subscribers.php:55
 #, php-format
 msgid "%1$s subscribers, page %2$d"
 msgstr "Подписчики %1$s, страница %2$d"
 
 #. TRANS: Page notice for page with an overview of all subscribers
 #. TRANS: of the logged in user's own profile.
-#: actions/subscribers.php:68
 msgid "These are the people who listen to your notices."
 msgstr "Это пользователи, которые читают ваши записи."
 
 #. TRANS: Page notice for page with an overview of all subscribers of a user other
 #. TRANS: than the logged in user. %s is the user nickname.
-#: actions/subscribers.php:74
 #, php-format
 msgid "These are the people who listen to %s's notices."
 msgstr "Эти пользователи читают записи %s."
 
 #. TRANS: Subscriber list text when the logged in user has no subscribers.
-#: actions/subscribers.php:114
 msgid ""
 "You have no subscribers. Try subscribing to people you know and they might "
 "return the favor."
@@ -6307,7 +5204,6 @@ msgstr ""
 
 #. TRANS: Subscriber list text when looking at the subscribers for a of a user other
 #. TRANS: than the logged in user that has no subscribers. %s is the user nickname.
-#: actions/subscribers.php:118
 #, php-format
 msgid "%s has no subscribers. Want to be the first?"
 msgstr "У %s нет подписчиков. Хотите быть первым?"
@@ -6317,7 +5213,6 @@ msgstr "У %s нет подписчиков. Хотите быть первым?
 #. TRANS: This message contains a Markdown URL. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.
-#: actions/subscribers.php:127
 #, php-format
 msgid ""
 "%s has no subscribers. Why not [register an account](%%%%action.register%%%"
@@ -6328,20 +5223,17 @@ msgstr ""
 
 #. TRANS: Header for subscriptions overview for a user (not first page).
 #. TRANS: %1$s is a user nickname, %2$d is the page number.
-#: actions/subscriptions.php:55
 #, php-format
 msgid "%1$s subscriptions, page %2$d"
 msgstr "Подписки %1$s, страница %2$d"
 
 #. TRANS: Page notice for page with an overview of all subscriptions
 #. TRANS: of the logged in user's own profile.
-#: actions/subscriptions.php:68
 msgid "These are the people whose notices you listen to."
 msgstr "Это пользователи, записи которых вы читаете."
 
 #. TRANS: Page notice for page with an overview of all subscriptions of a user other
 #. TRANS: than the logged in user. %s is the user nickname.
-#: actions/subscriptions.php:74
 #, php-format
 msgid "These are the people whose notices %s listens to."
 msgstr "Это пользователи, записи которых читает %s."
@@ -6350,7 +5242,6 @@ msgstr "Это пользователи, записи которых читае
 #. 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.
-#: actions/subscriptions.php:133
 #, php-format
 msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "
@@ -6370,69 +5261,55 @@ msgstr ""
 #. TRANS: than the logged in user that has no subscriptions. %s is the user nickname.
 #. TRANS: Subscription list text when looking at the subscriptions for a of a user that has none
 #. TRANS: as an anonymous user. %s is the user nickname.
-#: actions/subscriptions.php:141 actions/subscriptions.php:147
 #, php-format
 msgid "%s is not listening to anyone."
 msgstr "%s не просматривает ничьи записи."
 
 #. TRANS: Atom feed title. %s is a profile nickname.
-#: actions/subscriptions.php:176
 #, fuzzy, php-format
 msgid "Subscription feed for %s (Atom)"
 msgstr "Лента записей для %s (Atom)"
 
 #. TRANS: Checkbox label for enabling Jabber messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:241 lib/settingsnav.php:110
-#, fuzzy
 msgid "IM"
 msgstr "IM"
 
 #. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:256 lib/settingsnav.php:117
 msgid "SMS"
 msgstr "СМС"
 
 #. TRANS: Title for all but the first page of notices with tags.
 #. TRANS: %1$s is the tag, %2$d is the page number.
-#: actions/tag.php:73
 #, php-format
 msgid "Notices tagged with %1$s, page %2$d"
 msgstr "Записи с тегом %1$s, страница %2$d"
 
-#: actions/tag.php:91
 #, php-format
 msgid "Notice feed for tag %s (RSS 1.0)"
 msgstr "Лента записей для тега %s (RSS 1.0)"
 
-#: actions/tag.php:97
 #, php-format
 msgid "Notice feed for tag %s (RSS 2.0)"
 msgstr "Лента записей для тега %s (RSS 2.0)"
 
-#: actions/tag.php:103
 #, php-format
 msgid "Notice feed for tag %s (Atom)"
 msgstr "Лента записей для тега %s (Atom)"
 
-#: actions/tagother.php:39
 msgid "No ID argument."
 msgstr "Нет аргумента ID."
 
-#: actions/tagother.php:65
 #, php-format
 msgid "Tag %s"
 msgstr "Теги %s"
 
 #. TRANS: H2 for user profile information.
-#: actions/tagother.php:77 lib/userprofile.php:76
 msgid "User profile"
 msgstr "Профиль пользователя"
 
-#: actions/tagother.php:120
 msgid "Tag user"
 msgstr "Теги для пользователя"
 
-#: actions/tagother.php:130
 msgid ""
 "Tags for this user (letters, numbers, -, ., and _), comma- or space- "
 "separated"
@@ -6440,223 +5317,178 @@ msgstr ""
 "Теги для этого пользователя (буквы, цифры, -, ., и _), разделённые запятой "
 "или пробелом"
 
-#: actions/tagother.php:157
 #, php-format
 msgid "Invalid tag: \"%s\""
 msgstr "Неверный тег: «%s»"
 
-#: actions/tagother.php:172
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 "Вы можете помечать тегами только пользователей, на которых подписаны или "
 "которые подписаны на Вас."
 
-#: actions/tagother.php:215
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
 "Используйте эту форму для добавления тегов Вашим подписчикам или подписантам."
 
-#: actions/tagrss.php:35
 msgid "No such tag."
 msgstr "Нет такого тега."
 
 #. TRANS: Client error displayed when trying to unblock a non-blocked user.
-#: actions/unblock.php:59
 msgid "You haven't blocked that user."
 msgstr "Вы не заблокировали этого пользователя."
 
-#: actions/unsandbox.php:72
 msgid "User is not sandboxed."
 msgstr "Для пользователя не установлен режим песочницы."
 
-#: actions/unsilence.php:72
 msgid "User is not silenced."
 msgstr "Пользователь не заглушён."
 
-#: actions/unsubscribe.php:77
 msgid "No profile ID in request."
 msgstr "Нет ID профиля в запросе."
 
-#: actions/unsubscribe.php:98
 msgid "Unsubscribed"
 msgstr "Отписано"
 
-#: actions/updateprofile.php:64
 #, php-format
 msgid ""
 "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
 msgstr ""
 "Лицензия просматриваемого потока «%1$s» несовместима с лицензией сайта «%2$s»."
 
-#: actions/urlsettings.php:60
 #, fuzzy
 msgid "URL settings"
 msgstr "IM-установки"
 
 #. TRANS: Instructions for tab "Other" in user profile settings.
-#: actions/urlsettings.php:72
 msgid "Manage various other options."
 msgstr "Управление другими опциями."
 
 #. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
 #. TRANS: user's profile settings. This message has one space at the beginning. Use your
 #. TRANS: language's word separator here if it has one (most likely a single space).
-#: actions/urlsettings.php:115
 msgid " (free service)"
 msgstr " (свободный сервис)"
 
-#: actions/urlsettings.php:121
 #, fuzzy
 msgid "[none]"
 msgstr "Нет тегов"
 
-#: actions/urlsettings.php:122
 msgid "[internal]"
 msgstr ""
 
 #. TRANS: Label for dropdown with URL shortener services.
-#: actions/urlsettings.php:130
 msgid "Shorten URLs with"
 msgstr "Сокращать URL с помощью"
 
 #. TRANS: Tooltip for for dropdown with URL shortener services.
-#: actions/urlsettings.php:132
 msgid "Automatic shortening service to use."
 msgstr "Автоматически использовать выбранный сервис"
 
-#: actions/urlsettings.php:138
 msgid "URL longer than"
 msgstr ""
 
-#: actions/urlsettings.php:141
 msgid "URLs longer than this will be shortened, 0 means always shorten."
 msgstr ""
 
-#: actions/urlsettings.php:145
 msgid "Text longer than"
 msgstr ""
 
-#: actions/urlsettings.php:148
 msgid ""
 "URLs in notices longer than this will be shortened, 0 means always shorten."
 msgstr ""
 
 #. TRANS: Form validation error for form "Other settings" in user profile.
-#: actions/urlsettings.php:180
 msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr "Сервис сокращения URL слишком длинный (максимум 50 символов)."
 
-#: actions/urlsettings.php:187
 msgid "Invalid number for max url length."
 msgstr ""
 
-#: actions/urlsettings.php:193
 #, fuzzy
 msgid "Invalid number for max notice length."
 msgstr "Ошибочное содержание записи."
 
-#: actions/urlsettings.php:238
 msgid "Error saving user URL shortening preferences."
 msgstr ""
 
 #. TRANS: User admin panel title
-#: actions/useradminpanel.php:58
 msgctxt "TITLE"
 msgid "User"
 msgstr "Пользователь"
 
 #. TRANS: Instruction for user admin panel.
-#: actions/useradminpanel.php:69
 msgid "User settings for this StatusNet site"
 msgstr "Пользовательские настройки для этого сайта StatusNet"
 
 #. TRANS: Form validation error in user admin panel when a non-numeric character limit was set.
-#: actions/useradminpanel.php:147
 msgid "Invalid bio limit. Must be numeric."
 msgstr "Неверное ограничение биографии. Должно быть числом."
 
 #. TRANS: Form validation error in user admin panel when welcome text is too long.
-#: actions/useradminpanel.php:154
 msgid "Invalid welcome text. Maximum length is 255 characters."
 msgstr ""
 "Неверный текст приветствия. Максимальная длина составляет 255 символов."
 
 #. TRANS: Client error displayed when trying to set a non-existing user as default subscription for new
 #. TRANS: users in user admin panel. %1$s is the invalid nickname.
-#: actions/useradminpanel.php:166
 #, fuzzy, php-format
 msgid "Invalid default subscripton: \"%1$s\" is not a user."
 msgstr "Неверная подписка по умолчанию: «%1$s» не является пользователем."
 
-#: actions/useradminpanel.php:215 lib/action.php:565 lib/settingsnav.php:77
-#: lib/subgroupnav.php:81
 msgid "Profile"
 msgstr "Профиль"
 
 #. TRANS: Field label in user admin panel for setting the character limit for the bio field.
-#: actions/useradminpanel.php:220
 msgid "Bio Limit"
 msgstr "Ограничение биографии"
 
 #. TRANS: Tooltip in user admin panel for setting the character limit for the bio field.
-#: actions/useradminpanel.php:222
 msgid "Maximum length of a profile bio in characters."
 msgstr "Максимальная длина биографии профиля в символах."
 
 #. TRANS: Form legend in user admin panel.
-#: actions/useradminpanel.php:231
 msgid "New users"
 msgstr "Новые пользователи"
 
 #. TRANS: Field label in user admin panel for setting new user welcome text.
-#: actions/useradminpanel.php:236
 msgid "New user welcome"
 msgstr "Приветствие новым пользователям"
 
 #. TRANS: Tooltip in user admin panel for setting new user welcome text.
-#: actions/useradminpanel.php:238
 msgid "Welcome text for new users (maximum 255 characters)."
 msgstr "Текст приветствия для новых пользователей (максимум 255 символов)."
 
 #. TRANS: Field label in user admin panel for setting default subscription for new users.
-#: actions/useradminpanel.php:244
 msgid "Default subscription"
 msgstr "Подписка по умолчанию"
 
 #. TRANS: Tooltip in user admin panel for setting default subscription for new users.
-#: actions/useradminpanel.php:246
 msgid "Automatically subscribe new users to this user."
 msgstr "Автоматически подписывать новых пользователей на этого пользователя."
 
 #. TRANS: Form legend in user admin panel.
-#: actions/useradminpanel.php:256
 msgid "Invitations"
 msgstr "Приглашения"
 
 #. TRANS: Field label for checkbox in user admin panel for allowing users to invite friend using site e-mail.
-#: actions/useradminpanel.php:262
 msgid "Invitations enabled"
 msgstr "Приглашения включены"
 
 #. TRANS: Tooltip for checkbox in user admin panel for allowing users to invite friend using site e-mail.
-#: actions/useradminpanel.php:265
 msgid "Whether to allow users to invite new users."
 msgstr "Разрешать ли пользователям приглашать новых пользователей."
 
 #. TRANS: Title for button to save user settings in user admin panel.
-#: actions/useradminpanel.php:302
 #, fuzzy
 msgid "Save user settings."
 msgstr "Сохранить пользовательские настройки"
 
 #. TRANS: Page title.
-#: actions/userauthorization.php:109
 msgid "Authorize subscription"
 msgstr "Авторизовать подписку"
 
 #. TRANS: Page notice on "Auhtorize subscription" page.
-#: actions/userauthorization.php:115
 #, fuzzy
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
@@ -6668,42 +5500,35 @@ msgstr ""
 "нажмите «Отказ»."
 
 #. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:200
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Accept"
 msgstr "Принять"
 
 #. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:202
 #, fuzzy
 msgid "Subscribe to this user."
 msgstr "Подписаться на этого пользователя"
 
 #. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:204
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Reject"
 msgstr "Отбросить"
 
 #. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:206
 #, fuzzy
 msgid "Reject this subscription."
 msgstr "Отвергнуть эту подписку"
 
 #. TRANS: Client error displayed for an empty authorisation request.
-#: actions/userauthorization.php:219
 msgid "No authorization request!"
 msgstr "Не авторизованный запрос!"
 
 #. TRANS: Accept message header from Authorise subscription page.
-#: actions/userauthorization.php:242
 msgid "Subscription authorized"
 msgstr "Подписка авторизована"
 
-#: actions/userauthorization.php:245
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to authorize the "
@@ -6713,11 +5538,9 @@ msgstr ""
 "о том, как авторизовать подписку. Ваш ключ подписки:"
 
 #. TRANS: Reject message header from Authorise subscription page.
-#: actions/userauthorization.php:256
 msgid "Subscription rejected"
 msgstr "Подписка отменена"
 
-#: actions/userauthorization.php:259
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to fully reject the "
@@ -6728,35 +5551,30 @@ msgstr ""
 
 #. TRANS: Exception thrown when no valid user is found for an authorisation request.
 #. TRANS: %s is a listener URI.
-#: actions/userauthorization.php:296
 #, fuzzy, php-format
 msgid "Listener URI \"%s\" not found here."
 msgstr "Смотрящий URI «%s» здесь не найден."
 
 #. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
 #. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:303
 #, fuzzy, php-format
 msgid "Listenee URI \"%s\" is too long."
 msgstr "Просматриваемый URI «%s» слишком длинный."
 
 #. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
 #. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:311
 #, fuzzy, php-format
 msgid "Listenee URI \"%s\" is a local user."
 msgstr "Просматриваемый URI «%s» — локальный пользователь."
 
 #. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
 #. TRANS: %s is a profile URL.
-#: actions/userauthorization.php:329
 #, fuzzy, php-format
 msgid "Profile URL \"%s\" is for a local user."
 msgstr "URL профиля «%s» предназначен только для локального пользователя."
 
 #. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
 #. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
-#: actions/userauthorization.php:339
 #, fuzzy, php-format
 msgid ""
 "Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
@@ -6766,32 +5584,27 @@ msgstr ""
 
 #. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
 #. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:349
 #, fuzzy, php-format
 msgid "Avatar URL \"%s\" is not valid."
 msgstr "URL аватары «%s» недействителен."
 
 #. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
 #. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:356
 #, fuzzy, php-format
 msgid "Cannot read avatar URL \"%s\"."
 msgstr "Не удаётся прочитать URL аватары «%s»"
 
 #. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
 #. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:363
 #, fuzzy, php-format
 msgid "Wrong image type for avatar URL \"%s\"."
 msgstr "Неверный тип изображения для URL аватары «%s»."
 
 #. TRANS: Page title for profile design page.
-#: actions/userdesignsettings.php:74 lib/designsettings.php:61
 msgid "Profile design"
 msgstr "Оформление профиля"
 
 #. TRANS: Instructions for profile design page.
-#: actions/userdesignsettings.php:84 lib/designsettings.php:72
 msgid ""
 "Customize the way your profile looks with a background image and a colour "
 "palette of your choice."
@@ -6799,44 +5612,35 @@ msgstr ""
 "Настройте внешний вид своего профиля, установив фоновое изображение и "
 "цветовую гамму на свой выбор."
 
-#: actions/userdesignsettings.php:289
 msgid "Enjoy your hotdog!"
 msgstr "Приятного аппетита!"
 
-#: actions/userdesignsettings.php:325
 #, fuzzy
 msgid "Design settings"
 msgstr "Сохранить настройки сайта"
 
-#: actions/userdesignsettings.php:340
 msgid "View profile designs"
 msgstr "Показать оформления профиля"
 
-#: actions/userdesignsettings.php:341
 msgid "Show or hide profile designs."
 msgstr "Показать или скрыть оформления профиля."
 
-#: actions/userdesignsettings.php:348
 #, fuzzy
 msgid "Background file"
 msgstr "Фон"
 
 #. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number.
-#: actions/usergroups.php:66
 #, php-format
 msgid "%1$s groups, page %2$d"
 msgstr "Группы %1$s, страница %2$d"
 
-#: actions/usergroups.php:132
 msgid "Search for more groups"
 msgstr "Искать другие группы"
 
-#: actions/usergroups.php:159
 #, php-format
 msgid "%s is not a member of any group."
 msgstr "%s не состоит ни в одной группе."
 
-#: actions/usergroups.php:164
 #, php-format
 msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
 msgstr ""
@@ -6847,18 +5651,14 @@ msgstr ""
 #. TRANS: %1$s is a group name, %2$s is a site name.
 #. TRANS: Message is used as a subtitle in atom user notice feed.
 #. TRANS: %1$s is a user name, %2$s is a site name.
-#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:70
-#: lib/atomusernoticefeed.php:95
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr "Обновлено от %1$s на %2$s!"
 
-#: actions/version.php:75
 #, php-format
 msgid "StatusNet %s"
 msgstr "StatusNet %s"
 
-#: actions/version.php:155
 #, php-format
 msgid ""
 "This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
@@ -6867,16 +5667,13 @@ msgstr ""
 "Этот сайт создан на основе %1$s версии %2$s, Copyright 2008-2010 StatusNet, "
 "Inc. и участники."
 
-#: actions/version.php:163
 msgid "Contributors"
 msgstr "Разработчики"
 
 #. TRANS: Menu item for site administration
-#: actions/version.php:167 lib/adminpanelaction.php:403
 msgid "License"
 msgstr "Лицензия"
 
-#: actions/version.php:170
 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 "
@@ -6888,7 +5685,6 @@ msgstr ""
 "License, опубликованной Free Software Foundation, либо под версией 3, либо "
 "(на выбор) под любой более поздней версией. "
 
-#: actions/version.php:176
 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 "
@@ -6900,7 +5696,6 @@ msgstr ""
 "или ПРИГОДНОСТИ ДЛЯ ЧАСТНОГО ИСПОЛЬЗОВАНИЯ. См. GNU Affero General Public "
 "License для более подробной информации. "
 
-#: actions/version.php:182
 #, php-format
 msgid ""
 "You should have received a copy of the GNU Affero General Public License "
@@ -6910,52 +5705,42 @@ msgstr ""
 "этой программой. Если нет, см. %s."
 
 #. TRANS: Form input field label for application name.
-#: actions/version.php:197 lib/applicationeditform.php:190
 msgid "Name"
 msgstr "Имя"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:885
 msgid "Version"
 msgstr "Версия"
 
-#: actions/version.php:199
 msgid "Author(s)"
 msgstr "Автор(ы)"
 
 #. TRANS: Form input field label.
-#: actions/version.php:200 lib/applicationeditform.php:208
-#: lib/groupeditform.php:168
 msgid "Description"
 msgstr "Описание"
 
 #. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:164
 msgid "Favor"
 msgstr "Пометить"
 
 #. TRANS: Ntofication given when a user marks a notice as favorite.
 #. TRANS: %1$s is a user nickname or full name, %2$s is a notice URI.
-#: classes/Fave.php:167
 #, php-format
 msgid "%1$s marked notice %2$s as a favorite."
 msgstr "%1$s добавил запись %2$s в число любимых."
 
 #. TRANS: Server exception thrown when a URL cannot be processed.
-#: classes/File.php:162
 #, php-format
 msgid "Cannot process URL '%s'"
 msgstr "Невозможно обработать URL «%s»"
 
 #. TRANS: Server exception thrown when... Robin thinks something is impossible!
-#: classes/File.php:194
 msgid "Robin thinks something is impossible."
 msgstr "Робин считает, что это невозможно."
 
 #. 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$s is used for plural.
-#: classes/File.php:210
 #, php-format
 msgid ""
 "No file may be larger than %1$d byte and the file you sent was %2$d bytes. "
@@ -6975,7 +5760,6 @@ msgstr[2] ""
 
 #. TRANS: Message given if an upload would exceed user quota.
 #. TRANS: %d (number) is the user quota in bytes and is used for plural.
-#: classes/File.php:223
 #, php-format
 msgid "A file this large would exceed your user quota of %d byte."
 msgid_plural "A file this large would exceed your user quota of %d bytes."
@@ -6986,7 +5770,6 @@ msgstr[2] "Файл такого размера превысит вашу пол
 
 #. TRANS: Message given id an upload would exceed a user's monthly quota.
 #. TRANS: $d (number) is the monthly user quota in bytes and is used for plural.
-#: classes/File.php:235
 #, php-format
 msgid "A file this large would exceed your monthly quota of %d byte."
 msgid_plural "A file this large would exceed your monthly quota of %d bytes."
@@ -6995,108 +5778,89 @@ msgstr[1] "Файл такого размера превысит вашу мес
 msgstr[2] "Файл такого размера превысит вашу месячную квоту в %d байт."
 
 #. TRANS: Client exception thrown if a file upload does not have a valid name.
-#: classes/File.php:282 classes/File.php:297
 msgid "Invalid filename."
 msgstr "Неверное имя файла."
 
 #. TRANS: Exception thrown when joining a group fails.
-#: classes/Group_member.php:51
 msgid "Group join failed."
 msgstr "Не удаётся присоединиться к группе."
 
 #. TRANS: Exception thrown when trying to leave a group the user is not a member of.
-#: classes/Group_member.php:64
 msgid "Not part of group."
 msgstr "Не является частью группы."
 
 #. TRANS: Exception thrown when trying to leave a group fails.
-#: classes/Group_member.php:72
 msgid "Group leave failed."
 msgstr "Не удаётся покинуть группу."
 
 #. TRANS: Exception thrown providing an invalid profile ID.
 #. TRANS: %s is the invalid profile ID.
-#: classes/Group_member.php:85
 #, php-format
 msgid "Profile ID %s is invalid."
 msgstr "Неверный идентификатор профиля %s."
 
 #. TRANS: Exception thrown providing an invalid group ID.
 #. TRANS: %s is the invalid group ID.
-#: classes/Group_member.php:98
 #, php-format
 msgid "Group ID %s is invalid."
 msgstr "Неверный идентификатор группы %s."
 
 #. TRANS: Activity title.
-#: classes/Group_member.php:147 lib/joinform.php:114
 msgid "Join"
 msgstr "Присоединиться"
 
 #. TRANS: Success message for subscribe to group attempt through OStatus.
 #. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
-#: classes/Group_member.php:151
 #, php-format
 msgid "%1$s has joined group %2$s."
 msgstr "%1$s присоединился к группе %2$s."
 
 #. TRANS: Server exception thrown when updating a local group fails.
-#: classes/Local_group.php:42
 msgid "Could not update local group."
 msgstr "Не удаётся обновить локальную группу."
 
 #. TRANS: Exception thrown when trying creating a login token failed.
 #. TRANS: %s is the user nickname for which token creation failed.
-#: classes/Login_token.php:78
 #, php-format
 msgid "Could not create login token for %s"
 msgstr "Не удаётся создать токен входа для %s"
 
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
-#: classes/Memcached_DataObject.php:556
 msgid "No database name or DSN found anywhere."
 msgstr "Имя базы данных или DSN не найдено."
 
 #. TRANS: Client exception thrown when a user tries to send a direct message while being banned from sending them.
-#: classes/Message.php:45
 msgid "You are banned from sending direct messages."
 msgstr "Вы заблокированы от отправки прямых сообщений."
 
 #. TRANS: Message given when a message could not be stored on the server.
-#: classes/Message.php:69
 msgid "Could not insert message."
 msgstr "Не удаётся вставить сообщение."
 
 #. TRANS: Message given when a message could not be updated on the server.
-#: classes/Message.php:80
 msgid "Could not update message with new URI."
 msgstr "Не удаётся обновить сообщение с новым URI."
 
 #. TRANS: Server exception thrown when a user profile for a notice cannot be found.
 #. TRANS: %1$d is a profile ID (number), %2$d is a notice ID (number).
-#: classes/Notice.php:98
 #, php-format
 msgid "No such profile (%1$d) for notice (%2$d)."
 msgstr "Нет такого профиля (%1$d) для записи (%2$d)."
 
 #. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:199
 #, php-format
 msgid "Database error inserting hashtag: %s"
 msgstr "Ошибка баз данных при вставке хеш-тегов: %s"
 
 #. TRANS: Client exception thrown if a notice contains too many characters.
-#: classes/Notice.php:279
 msgid "Problem saving notice. Too long."
 msgstr "Проблемы с сохранением записи. Слишком длинно."
 
 #. TRANS: Client exception thrown when trying to save a notice for an unknown user.
-#: classes/Notice.php:284
 msgid "Problem saving notice. Unknown user."
 msgstr "Проблема при сохранении записи. Неизвестный пользователь."
 
 #. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
-#: classes/Notice.php:290
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
@@ -7104,7 +5868,6 @@ msgstr ""
 "попробуйте вновь через пару минут."
 
 #. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
-#: classes/Notice.php:297
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
 "few minutes."
@@ -7113,42 +5876,35 @@ msgstr ""
 "и попробуйте вновь через пару минут."
 
 #. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:305
 msgid "You are banned from posting notices on this site."
 msgstr "Вам запрещено поститься на этом сайте (бан)"
 
 #. TRANS: Server exception thrown when a notice cannot be saved.
 #. TRANS: Server exception thrown when a notice cannot be updated.
-#: classes/Notice.php:372 classes/Notice.php:399
 msgid "Problem saving notice."
 msgstr "Проблемы с сохранением записи."
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:929
 msgid "Bad type provided to saveKnownGroups."
 msgstr "Для saveKnownGroups указан неверный тип."
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:1028
 msgid "Problem saving group inbox."
 msgstr "Проблемы с сохранением входящих сообщений группы."
 
 #. TRANS: Server exception thrown when a reply cannot be saved.
 #. TRANS: %1$d is a notice ID, %2$d is the ID of the mentioned user.
-#: classes/Notice.php:1144
 #, php-format
 msgid "Could not save reply for %1$d, %2$d."
 msgstr "Не удаётся сохранить ответ для %1$d, %2$d."
 
 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1663
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
 
 #. TRANS: Full name of a profile or group followed by nickname in parens
-#: classes/Profile.php:172 classes/User_group.php:242
 #, php-format
 msgctxt "FANCYNAME"
 msgid "%1$s (%2$s)"
@@ -7156,7 +5912,6 @@ msgstr "%1$s (%2$s)"
 
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:779
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
@@ -7165,258 +5920,204 @@ msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:788
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
 "Не удаётся отозвать право «%1$s» для пользователя #%2$d; ошибка базы данных."
 
 #. TRANS: Exception thrown when a right for a non-existing user profile is checked.
-#: classes/Remote_profile.php:54
 msgid "Missing profile."
 msgstr "Отсутствующий профиль."
 
 #. TRANS: Exception thrown when a tag cannot be saved.
-#: classes/Status_network.php:338
 msgid "Unable to save tag."
 msgstr "Не удаётся сохранить тег."
 
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#: classes/Subscription.php:77 lib/oauthstore.php:482
 msgid "You have been banned from subscribing."
 msgstr "Вы заблокированы от подписки."
 
 #. TRANS: Exception thrown when trying to subscribe while already subscribed.
-#: classes/Subscription.php:82
 msgid "Already subscribed!"
 msgstr "Уже подписаны!"
 
 #. TRANS: Exception thrown when trying to subscribe to a user who has blocked the subscribing user.
-#: classes/Subscription.php:87
 msgid "User has blocked you."
 msgstr "Пользователь заблокировал Вас."
 
 #. TRANS: Exception thrown when trying to unsibscribe without a subscription.
-#: classes/Subscription.php:176
 msgid "Not subscribed!"
 msgstr "Не подписаны!"
 
 #. TRANS: Exception thrown when trying to unsubscribe a user from themselves.
-#: classes/Subscription.php:183
 msgid "Could not delete self-subscription."
 msgstr "Невозможно удалить подписку на самого себя."
 
 #. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
-#: classes/Subscription.php:211
 msgid "Could not delete subscription OMB token."
 msgstr "Не удаётся удалить подписочный жетон OMB."
 
 #. TRANS: Exception thrown when a subscription could not be deleted on the server.
-#: classes/Subscription.php:223
 msgid "Could not delete subscription."
 msgstr "Не удаётся удалить подписку."
 
 #. TRANS: Activity tile when subscribing to another person.
-#: classes/Subscription.php:265
 msgid "Follow"
 msgstr "Следить"
 
 #. TRANS: Notification given when one person starts following another.
 #. TRANS: %1$s is the subscriber, %2$s is the subscribed.
-#: classes/Subscription.php:268
 #, php-format
 msgid "%1$s is now following %2$s."
 msgstr "%1$s теперь следит за %2$s."
 
 #. TRANS: Notice given on user registration.
 #. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:390
 #, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr "Добро пожаловать на %1$s, @%2$s!"
 
 #. TRANS: Server exception.
-#: classes/User.php:923
 msgid "No single user defined for single-user mode."
 msgstr "Ни задан пользователь для однопользовательского режима."
 
 #. TRANS: Server exception.
-#: classes/User.php:927
 msgid "Single-user mode code called when not enabled."
 msgstr "Вызов отключённого кода однопользовательского режима."
 
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:522
 msgid "Could not create group."
 msgstr "Не удаётся создать группу."
 
 #. TRANS: Server exception thrown when updating a group URI failed.
-#: classes/User_group.php:532
 msgid "Could not set group URI."
 msgstr "Не удаётся назначить URI группы."
 
 #. TRANS: Server exception thrown when setting group membership failed.
-#: classes/User_group.php:555
 msgid "Could not set group membership."
 msgstr "Не удаётся назначить членство в группе."
 
 #. TRANS: Server exception thrown when saving local group information failed.
-#: classes/User_group.php:570
 msgid "Could not save local group info."
 msgstr "Не удаётся сохранить информацию о локальной группе."
 
 #. TRANS: Exception thrown when an account could not be located when it should be moved.
 #. TRANS: %s is the remote site.
-#: lib/accountmover.php:65
 #, fuzzy, php-format
 msgid "Cannot locate account %s."
 msgstr "Вы не можете удалять пользователей."
 
 #. TRANS: Exception thrown when a service document could not be located account move.
 #. TRANS: %s is the remote site.
-#: lib/accountmover.php:106
 #, php-format
 msgid "Cannot find XRD for %s."
 msgstr ""
 
 #. TRANS: Exception thrown when an account could not be located when it should be moved.
 #. TRANS: %s is the remote site.
-#: lib/accountmover.php:131
 #, php-format
 msgid "No AtomPub API service for %s."
 msgstr ""
 
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: lib/action.php:161
 #, php-format
 msgid "%1$s - %2$s"
 msgstr "%1$s — %2$s"
 
 #. TRANS: Page title for a page without a title set.
-#: lib/action.php:177
 msgid "Untitled page"
 msgstr "Страница без названия"
 
 #. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.
-#: lib/action.php:325
 msgctxt "TOOLTIP"
 msgid "Show more"
 msgstr "Показать ещё"
 
 #. TRANS: Inline reply form submit button: submits a reply comment.
-#: lib/action.php:328
 #, fuzzy
 msgctxt "BUTTON"
-msgid "Comment"
-msgstr "Содержание"
+msgid "Reply"
+msgstr "Ответить"
 
 #. TRANS: Placeholder text for inline reply form. Clicking in this box will turn it into a mini notice form.
-#: lib/action.php:331
-msgid "Add a comment..."
+msgid "Write a reply..."
 msgstr ""
 
-#: lib/action.php:559 lib/personalgroupnav.php:99
-#, fuzzy
 msgid "Home"
 msgstr "Главная"
 
-#: lib/action.php:560
 #, fuzzy
 msgid "Friends timeline"
 msgstr "Лента %s"
 
-#: lib/action.php:566
 #, fuzzy
 msgid "Your profile"
 msgstr "Профиль группы"
 
-#: lib/action.php:570 lib/action.php:593 lib/publicgroupnav.php:78
 msgid "Public"
 msgstr "Общее"
 
-#: lib/action.php:571 lib/action.php:594
 #, fuzzy
 msgid "Everyone on this site"
 msgstr "Найти человека на этом сайте"
 
-#: lib/action.php:575
-#, fuzzy
 msgid "Settings"
 msgstr "Установки СМС"
 
-#: lib/action.php:576
 #, fuzzy
 msgid "Change your personal settings"
 msgstr "Изменить ваши настройки профиля"
 
-#: lib/action.php:582
 #, fuzzy
 msgid "Site configuration"
 msgstr "Конфигурация пользователя"
 
-#: lib/action.php:587
-#, fuzzy
 msgid "Logout"
 msgstr "Выход"
 
-#: lib/action.php:588
-#, fuzzy
 msgid "Logout from the site"
 msgstr "Выйти"
 
-#: lib/action.php:599
-#, fuzzy
 msgid "Login to the site"
 msgstr "Войти"
 
-#: lib/action.php:606
-#, fuzzy
 msgid "Search"
 msgstr "Поиск"
 
-#: lib/action.php:607
 #, fuzzy
 msgid "Search the site"
 msgstr "Поиск по сайту"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:864
 msgid "Help"
 msgstr "Помощь"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:867
 msgid "About"
 msgstr "О проекте"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:870
 msgid "FAQ"
 msgstr "ЧаВо"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:875
 msgid "TOS"
 msgstr "TOS"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:879
 msgid "Privacy"
 msgstr "Пользовательское соглашение"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:882
 msgid "Source"
 msgstr "Исходный код"
 
 #. TRANS: Secondary navigation menu option leading to e-mail contact information on the
 #. TRANS: StatusNet site, where to report bugs, ...
-#: lib/action.php:889
 msgid "Contact"
 msgstr "Контактная информация"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:892
 msgid "Badge"
 msgstr "Бедж"
 
@@ -7424,7 +6125,6 @@ msgstr "Бедж"
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:921
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7434,7 +6134,6 @@ msgstr ""
 "broughtby%%](%%site.broughtbyurl%%)."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:924
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** — сервис микроблогинга."
@@ -7443,7 +6142,6 @@ msgstr "**%%site.name%%** — сервис микроблогинга."
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:931
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7457,21 +6155,18 @@ msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:949
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr "Содержание и данные %1$s являются личными и конфиденциальными."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:956
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
 "Авторские права на содержание и данные принадлежат %1$s. Все права защищены."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:960
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 "Авторские права на содержание и данные принадлежат разработчикам. Все права "
@@ -7479,87 +6174,72 @@ msgstr ""
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:992
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr "Все материалы и данные %1$s доступны на условиях лицензии %2$s."
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1335
 msgid "After"
 msgstr "Сюда"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1345
 msgid "Before"
 msgstr "Туда"
 
 #. TRANS: Client exception thrown when a feed instance is a DOMDocument.
-#: lib/activity.php:125
 msgid "Expecting a root feed element but got a whole XML document."
 msgstr "Ожидался корневой элемент потока, а получен XML-документ целиком."
 
 #. TRANS: Client exception thrown when using an unknown verb for the activity importer.
-#: lib/activityimporter.php:81
 #, fuzzy, php-format
 msgid "Unknown verb: \"%s\"."
 msgstr "Неизвестный язык «%s»."
 
 #. TRANS: Client exception thrown when trying to force a subscription for an untrusted user.
-#: lib/activityimporter.php:107
 msgid "Cannot force subscription for untrusted user."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to for a remote user to subscribe.
-#: lib/activityimporter.php:117
 #, fuzzy
 msgid "Cannot force remote user to subscribe."
 msgstr "Укажите имя пользователя для подписки."
 
 #. TRANS: Client exception thrown when trying to subscribe to an unknown profile.
-#: lib/activityimporter.php:132
 #, fuzzy
 msgid "Unknown profile."
 msgstr "Неподдерживаемый тип файла"
 
 #. TRANS: Client exception thrown when trying to import an event not related to the importing user.
-#: lib/activityimporter.php:138
 msgid "This activity seems unrelated to our user."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to join a remote group that is not a group.
-#: lib/activityimporter.php:154
 msgid "Remote profile is not a group!"
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to join a group the importing user is already a member of.
-#: lib/activityimporter.php:163
 #, fuzzy
 msgid "User is already a member of this group."
 msgstr "Вы уже являетесь членом этой группы."
 
 #. TRANS: Client exception thrown when trying to import a notice by another user.
 #. TRANS: %1$s is the source URI of the notice, %2$s is the URI of the author.
-#: lib/activityimporter.php:201
 #, php-format
 msgid "Already know about notice %1$s and  it has a different author %2$s."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to overwrite the author information for a non-trusted user during import.
-#: lib/activityimporter.php:207
 msgid "Not overwriting author info for non-trusted user."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to import a notice without content.
 #. TRANS: %s is the notice URI.
-#: lib/activityimporter.php:223
 #, fuzzy, php-format
 msgid "No content for notice %s."
 msgstr "Найти запись по содержимому"
 
-#: lib/activitymover.php:84
 #, fuzzy, php-format
 msgid "No such user %s."
 msgstr "Нет такого пользователя."
@@ -7570,212 +6250,172 @@ msgstr "Нет такого пользователя."
 #. TRANS: %1$s is a URL, %2$s is the status, %s$s is the fail reason.
 #. TRANS: Exception thrown when post to collection fails with a status that is not handled.
 #. TRANS: %1$s is a URL, %2$s is the status, %s$s is the fail reason.
-#: lib/activitysink.php:163 lib/activitysink.php:167 lib/activitysink.php:172
 #, fuzzy, php-format
 msgctxt "URLSTATUSREASON"
 msgid "%1$s %2$s %3$s"
 msgstr "%1$s — %2$s"
 
 #. TRANS: Client exception thrown when there is no source attribute.
-#: lib/activityutils.php:200
 msgid "Can't handle remote content yet."
 msgstr "Пока ещё нельзя обрабатывать удалённое содержимое."
 
 #. TRANS: Client exception thrown when there embedded XML content is found that cannot be processed yet.
-#: lib/activityutils.php:237
 msgid "Can't handle embedded XML content yet."
 msgstr "Пока ещё нельзя обрабатывать встроенный XML."
 
 #. TRANS: Client exception thrown when base64 encoded content is found that cannot be processed yet.
-#: lib/activityutils.php:242
 msgid "Can't handle embedded Base64 content yet."
 msgstr "Пока ещё нельзя обрабатывать встроенное содержание Base64."
 
 #. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights.
-#: lib/adminpanelaction.php:96
 msgid "You cannot make changes to this site."
 msgstr "Вы не можете изменять этот сайт."
 
 #. TRANS: Client error message throw when a certain panel's settings cannot be changed.
-#: lib/adminpanelaction.php:108
 msgid "Changes to that panel are not allowed."
 msgstr "Изменения для этой панели недопустимы."
 
 #. TRANS: Client error message.
-#: lib/adminpanelaction.php:222
 msgid "showForm() not implemented."
 msgstr "showForm() не реализована."
 
 #. TRANS: Client error message
-#: lib/adminpanelaction.php:250
 msgid "saveSettings() not implemented."
 msgstr "saveSettings() не реализована."
 
 #. TRANS: Client error message thrown if design settings could not be deleted in
 #. TRANS: the admin panel Design.
-#: lib/adminpanelaction.php:274
 msgid "Unable to delete design setting."
 msgstr "Не удаётся удалить настройки оформления."
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:337
 msgid "Basic site configuration"
 msgstr "Основная конфигурация сайта"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:339
 msgctxt "MENU"
 msgid "Site"
 msgstr "Сайт"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:345
 msgid "Design configuration"
 msgstr "Конфигурация оформления"
 
 #. TRANS: Menu item for site administration
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/adminpanelaction.php:347 lib/groupnav.php:135
 msgctxt "MENU"
 msgid "Design"
 msgstr "Оформление"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:353
 msgid "User configuration"
 msgstr "Конфигурация пользователя"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:110
 msgid "User"
 msgstr "Пользователь"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:361
 msgid "Access configuration"
 msgstr "Конфигурация доступа"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:369
 msgid "Paths configuration"
 msgstr "Конфигурация путей"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:377
 msgid "Sessions configuration"
 msgstr "Конфигурация сессий"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:385
 msgid "Edit site notice"
 msgstr "Изменить уведомление сайта"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:387
 msgid "Site notice"
 msgstr "Уведомление сайта"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:393
 msgid "Snapshots configuration"
 msgstr "Конфигурация снимков"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:401
 msgid "Set site license"
 msgstr "Установить лицензию сайта"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:409
 #, fuzzy
 msgid "Plugins configuration"
 msgstr "Конфигурация путей"
 
 #. TRANS: Client error 401.
-#: lib/apiauth.php:111
 msgid "API resource requires read-write access, but you only have read access."
 msgstr ""
 "API ресурса требует доступ для чтения и записи, но у вас есть только доступ "
 "для чтения."
 
 #. TRANS: OAuth exception thrown when no application is found for a given consumer key.
-#: lib/apiauth.php:177
 msgid "No application for that consumer key."
 msgstr "Нет приложения для этого пользовательского ключа."
 
-#: lib/apiauth.php:202 lib/apiauth.php:284
 msgid "Not allowed to use API."
 msgstr ""
 
 #. TRANS: OAuth exception given when an incorrect access token was given for a user.
-#: lib/apiauth.php:225
 msgid "Bad access token."
 msgstr "Неверный ключ доступа."
 
 #. TRANS: OAuth exception given when no user was found for a given token (no token was found).
-#: lib/apiauth.php:230
 msgid "No user for that token."
 msgstr "Нет пользователя для этого ключа."
 
 #. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel".
 #. TRANS: Client error thrown when authentication fails.
-#: lib/apiauth.php:272 lib/apiauth.php:302
 msgid "Could not authenticate you."
 msgstr "Не удаётся произвести аутентификацию."
 
 #. TRANS: Server error displayed when trying to create an anynymous OAuth consumer.
-#: lib/apioauthstore.php:45
 msgid "Could not create anonymous consumer."
 msgstr "Не удаётся создать анонимного пользователя OAuth."
 
 #. TRANS: Server error displayed when trying to create an anynymous OAuth application.
-#: lib/apioauthstore.php:69
 msgid "Could not create anonymous OAuth application."
 msgstr "Не удаётся создать анонимное OAuth-приложение."
 
 #. TRANS: Exception thrown when no token association could be found.
-#: lib/apioauthstore.php:151
 msgid ""
 "Could not find a profile and application associated with the request token."
 msgstr "Не удаётся найти профиль и приложение, связанное с ключом запроса."
 
 #. TRANS: Exception thrown when no access token can be issued.
-#: lib/apioauthstore.php:209
 msgid "Could not issue access token."
 msgstr "Ошибка выдачи ключа доступа."
 
-#: lib/apioauthstore.php:317
 msgid "Database error inserting OAuth application user."
 msgstr "Ошибка базы данных при добавлении пользователя приложения OAuth."
 
-#: lib/apioauthstore.php:345
 #, fuzzy
 msgid "Database error updating OAuth application user."
 msgstr "Ошибка базы данных при добавлении пользователя приложения OAuth."
 
 #. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
-#: lib/apioauthstore.php:371
 msgid "Tried to revoke unknown token."
 msgstr "Попытка отменить неизвестный ключ."
 
 #. TRANS: Exception thrown when an attempt is made to remove a revoked token.
-#: lib/apioauthstore.php:376
 msgid "Failed to delete revoked token."
 msgstr "Не удаётся удалить аннулированный ключ."
 
 #. TRANS: Form input field label for application icon.
-#: lib/applicationeditform.php:177
 msgid "Icon"
 msgstr "Иконка"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:182
 msgid "Icon for this application"
 msgstr "Иконка для этого приложения"
 
 #. TRANS: Form input field instructions.
 #. TRANS: %d is the number of available characters for the description.
-#: lib/applicationeditform.php:201
 #, php-format
 msgid "Describe your application in %d character"
 msgid_plural "Describe your application in %d characters"
@@ -7784,208 +6424,169 @@ msgstr[1] "Опишите ваше приложение при помощи %d 
 msgstr[2] "Опишите ваше приложение при помощи %d символов"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:205
 msgid "Describe your application"
 msgstr "Опишите ваше приложение"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:216
 msgid "URL of the homepage of this application"
 msgstr "URL-адрес домашней страницы этого приложения"
 
 #. TRANS: Form input field label.
-#: lib/applicationeditform.php:218
 msgid "Source URL"
 msgstr "URL источника"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:225
 msgid "Organization responsible for this application"
 msgstr "Организация, ответственная за это приложение"
 
 #. TRANS: Form input field label.
-#: lib/applicationeditform.php:227
 msgid "Organization"
 msgstr "Организация"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:234
 msgid "URL for the homepage of the organization"
 msgstr "URL-адрес домашней страницы организации"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:243
 msgid "URL to redirect to after authentication"
 msgstr "URL для перенаправления после проверки подлинности"
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:271
 msgid "Browser"
 msgstr "Браузер"
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:288
 msgid "Desktop"
 msgstr "Операционная система"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:290
 msgid "Type of application, browser or desktop"
 msgstr "Среда выполнения приложения: браузер или операционная система"
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:314
 msgid "Read-only"
 msgstr "Только чтение"
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:334
 msgid "Read-write"
 msgstr "Чтение и запись"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:336
 msgid "Default access for this application: read-only, or read-write"
 msgstr ""
 "Доступ по умолчанию для этого приложения: только чтение или чтение и запись"
 
 #. TRANS: Submit button title.
-#: lib/applicationeditform.php:353
 msgid "Cancel"
 msgstr "Отменить"
 
-#: lib/applicationlist.php:247
 msgid " by "
 msgstr " от "
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:260
 msgid "read-write"
 msgstr "чтение/запись"
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:262
 msgid "read-only"
 msgstr "только чтение"
 
 #. TRANS: Used in application list. %1$s is a modified date, %2$s is access type ("read-write" or "read-only")
-#: lib/applicationlist.php:268
 #, php-format
 msgid "Approved %1$s - \"%2$s\" access."
 msgstr "Подтверждён доступ %1$s — «%2$s»."
 
 #. TRANS: Access token in the application list.
 #. TRANS: %s are the first 7 characters of the access token.
-#: lib/applicationlist.php:282
 #, php-format
 msgid "Access token starting with: %s"
 msgstr "Ключ доступа, начинающийся на %s"
 
 #. TRANS: Button label
-#: lib/applicationlist.php:298
 msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "Отозвать"
 
-#: lib/atom10feed.php:113
 #, fuzzy
 msgid "Author element must contain a name element."
 msgstr "Элемент author должен содержать элемент name."
 
 #. TRANS: Server exception thrown when using the method setActivitySubject() in the class Atom10Feed.
-#: lib/atom10feed.php:160
 #, fuzzy
 msgid "Do not use this method!"
 msgstr "Не удаляйте эту группу"
 
 #. TRANS: Title.
-#: lib/attachmentnoticesection.php:67
 msgid "Notices where this attachment appears"
 msgstr "Сообщает, где появляется это вложение"
 
 #. TRANS: Title.
-#: lib/attachmenttagcloudsection.php:48
 msgid "Tags for this attachment"
 msgstr "Теги для этого вложения"
 
 #. TRANS: Exception thrown when a password change fails.
-#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:227
 msgid "Password changing failed."
 msgstr "Изменение пароля не удалось."
 
 #. TRANS: Exception thrown when a password change attempt fails because it is not allowed.
-#: lib/authenticationplugin.php:238
 msgid "Password changing is not allowed."
 msgstr "Смена пароля не разрешена."
 
 #. TRANS: Title for the form to block a user.
-#: lib/blockform.php:68
 msgid "Block"
 msgstr "Блокировать"
 
 #. TRANS: Description of the form to block a user.
-#: lib/blockform.php:79
 msgid "Block this user"
 msgstr "Заблокировать пользователя."
 
 #. TRANS: Title for command results.
-#: lib/channel.php:104 lib/channel.php:125
 msgid "Command results"
 msgstr "Команда исполнена"
 
 #. TRANS: Title for command results.
-#: lib/channel.php:138
 msgid "AJAX error"
 msgstr "Ошибка AJAX"
 
 #. TRANS: E-mail subject when a command has completed.
-#: lib/channel.php:177 lib/mailhandler.php:143
 msgid "Command complete"
 msgstr "Команда завершена"
 
 #. TRANS: E-mail subject when a command has failed.
-#: lib/channel.php:188
 msgid "Command failed"
 msgstr "Команда неудачна"
 
 #. TRANS: Command exception text shown when a notice ID is requested that does not exist.
-#: lib/command.php:82 lib/command.php:106
 msgid "Notice with that id does not exist."
 msgstr "Записи с таким id не существует."
 
 #. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
 #. TRANS: Error text shown when a last user notice is requested and it does not exist.
-#: lib/command.php:99 lib/command.php:642
 msgid "User has no last notice."
 msgstr "У пользователя нет последней записи."
 
 #. TRANS: Message given requesting a profile for a non-existing user.
 #. TRANS: %s is the nickname of the user for which the profile could not be found.
-#: lib/command.php:128
 #, php-format
 msgid "Could not find a user with nickname %s."
 msgstr "Не удаётся найти пользователя с именем %s."
 
 #. TRANS: Message given getting a non-existing user.
 #. TRANS: %s is the nickname of the user that could not be found.
-#: lib/command.php:148
 #, php-format
 msgid "Could not find a local user with nickname %s."
 msgstr "Не удаётся найти локального пользователя с именем %s."
 
 #. TRANS: Error text shown when an unimplemented command is given.
-#: lib/command.php:183
 msgid "Sorry, this command is not yet implemented."
 msgstr "Простите, эта команда ещё не выполнена."
 
 #. TRANS: Command exception text shown when a user tries to nudge themselves.
-#: lib/command.php:229
 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr "Нет смысла «подталкивать» самого себя!"
 
 #. TRANS: Message given having nudged another user.
 #. TRANS: %s is the nickname of the user that was nudged.
-#: lib/command.php:238
 #, php-format
 msgid "Nudge sent to %s."
 msgstr "«Подталкивание» послано %s."
@@ -7994,7 +6595,6 @@ msgstr "«Подталкивание» послано %s."
 #. TRANS: %1$s is the number of other user the user is subscribed to.
 #. TRANS: %2$s is the number of users that are subscribed to the user.
 #. TRANS: %3$s is the number of notices the user has sent.
-#: lib/command.php:268
 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"
@@ -8006,40 +6606,34 @@ msgstr ""
 "Записей: %3$s"
 
 #. TRANS: Error message text shown when a favorite could not be set because it has already been favorited.
-#: lib/command.php:298
 #, fuzzy
 msgid "Could not create favorite: already favorited."
 msgstr "Не удаётся создать любимую запись."
 
 #. TRANS: Text shown when a notice has been marked as favourite successfully.
-#: lib/command.php:324
 msgid "Notice marked as fave."
 msgstr "Запись помечена как любимая."
 
 #. TRANS: Message given having added a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:369
 #, php-format
 msgid "%1$s joined group %2$s."
 msgstr "%1$s присоединился к группе %2$s."
 
 #. TRANS: Message given having removed a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:417
 #, php-format
 msgid "%1$s left group %2$s."
 msgstr "%1$s покинул группу %2$s."
 
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: lib/command.php:438
 #, php-format
 msgctxt "WHOIS"
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
 
 #. TRANS: Whois output. %s is the full name of the queried user.
-#: lib/command.php:442
 #, php-format
 msgid "Fullname: %s"
 msgstr "Полное имя: %s"
@@ -8047,7 +6641,6 @@ msgstr "Полное имя: %s"
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a location.
-#: lib/command.php:446 lib/mail.php:275
 #, php-format
 msgid "Location: %s"
 msgstr "Месторасположение: %s"
@@ -8055,20 +6648,17 @@ msgstr "Месторасположение: %s"
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a homepage.
-#: lib/command.php:450 lib/mail.php:279
 #, php-format
 msgid "Homepage: %s"
 msgstr "Домашняя страница: %s"
 
 #. TRANS: Whois output. %s is the bio information of the queried user.
-#: lib/command.php:454
 #, php-format
 msgid "About: %s"
 msgstr "О пользователе: %s"
 
 #. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).
 #. TRANS: %s is a remote profile.
-#: lib/command.php:483
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
@@ -8079,7 +6669,6 @@ msgstr ""
 
 #. TRANS: Message given if content is too long. %1$sd is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:500
 #, php-format
 msgid "Message too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
@@ -8090,26 +6679,26 @@ msgstr[1] ""
 msgstr[2] ""
 "Сообщение слишком длинное — не больше %1$d символов, вы отправили %2$d."
 
+#. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
+msgid "You can't send a message to this user."
+msgstr "Вы не можете послать сообщение этому пользователю."
+
 #. TRANS: Error text shown sending a direct message fails with an unknown reason.
-#: lib/command.php:528
 msgid "Error sending direct message."
 msgstr "Ошибка при отправке прямого сообщения."
 
 #. TRANS: Message given having repeated a notice from another user.
 #. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:565
 #, php-format
 msgid "Notice from %s repeated."
 msgstr "Запись %s повторена."
 
 #. TRANS: Error text shown when repeating a notice fails with an unknown reason.
-#: lib/command.php:568
 msgid "Error repeating notice."
 msgstr "Ошибка при повторении записи."
 
 #. TRANS: Message given if content of a notice for a reply is too long. %1$d is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:603
 #, php-format
 msgid "Notice too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Notice too long - maximum is %1$d characters, you sent %2$d."
@@ -8121,80 +6710,66 @@ msgstr[2] ""
 
 #. TRANS: Text shown having sent a reply to a notice successfully.
 #. TRANS: %s is the nickname of the user of the notice the reply was sent to.
-#: lib/command.php:616
 #, php-format
 msgid "Reply to %s sent."
 msgstr "Ответ %s отправлен."
 
 #. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
-#: lib/command.php:619
 msgid "Error saving notice."
 msgstr "Проблемы с сохранением записи."
 
 #. TRANS: Error text shown when no username was provided when issuing a subscribe command.
-#: lib/command.php:666
 msgid "Specify the name of the user to subscribe to."
 msgstr "Укажите имя пользователя для подписки."
 
 #. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
-#: lib/command.php:675
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "Невозможно подписаться командой на профили OMB."
 
 #. TRANS: Text shown after having subscribed to another user successfully.
 #. TRANS: %s is the name of the user the subscription was requested for.
-#: lib/command.php:683
 #, php-format
 msgid "Subscribed to %s."
 msgstr "Подписался на %s."
 
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.
-#: lib/command.php:704 lib/command.php:815
 msgid "Specify the name of the user to unsubscribe from."
 msgstr "Укажите имя пользователя для отмены подписки."
 
 #. TRANS: Text shown after having unsubscribed from another user successfully.
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:715
 #, php-format
 msgid "Unsubscribed from %s."
 msgstr "Отписаться от %s."
 
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
-#: lib/command.php:735 lib/command.php:761
 msgid "Command not yet implemented."
 msgstr "Команда ещё не выполнена."
 
 #. TRANS: Text shown when issuing the command "off" successfully.
-#: lib/command.php:739
 msgid "Notification off."
 msgstr "Оповещение отсутствует."
 
 #. TRANS: Error text shown when the command "off" fails for an unknown reason.
-#: lib/command.php:742
 msgid "Can't turn off notification."
 msgstr "Нет оповещения."
 
 #. TRANS: Text shown when issuing the command "on" successfully.
-#: lib/command.php:765
 msgid "Notification on."
 msgstr "Есть оповещение."
 
 #. TRANS: Error text shown when the command "on" fails for an unknown reason.
-#: lib/command.php:768
 msgid "Can't turn on notification."
 msgstr "Есть оповещение."
 
 #. TRANS: Error text shown when issuing the login command while login is disabled.
-#: lib/command.php:782
 msgid "Login command is disabled."
 msgstr "Команда входа отключена."
 
 #. TRANS: Text shown after issuing the login command successfully.
 #. TRANS: %s is a logon link..
-#: lib/command.php:795
 #, php-format
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
@@ -8203,20 +6778,17 @@ msgstr ""
 
 #. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:824
 #, php-format
 msgid "Unsubscribed %s."
 msgstr "Отписано %s."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
-#: lib/command.php:842
 msgid "You are not subscribed to anyone."
 msgstr "Вы ни на кого не подписаны."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
-#: lib/command.php:847
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Вы подписаны на этих людей:"
@@ -8225,14 +6797,12 @@ msgstr[2] "Вы подписаны на этих людей:"
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user
 #. TRANS: (followers) without having any subscribers.
-#: lib/command.php:869
 msgid "No one is subscribed to you."
 msgstr "Никто не подписан на вас."
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
-#: lib/command.php:874
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Эти люди подписались на вас:"
@@ -8241,14 +6811,12 @@ msgstr[2] "Эти люди подписались на вас:"
 
 #. TRANS: Text shown after requesting groups a user is subscribed to without having
 #. TRANS: any group subscriptions.
-#: lib/command.php:896
 msgid "You are not a member of any groups."
 msgstr "Вы не состоите ни в одной группе."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
-#: lib/command.php:901
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "Вы являетесь участником следующих групп:"
@@ -8256,7 +6824,6 @@ msgstr[1] "Вы являетесь участником следующих гр
 msgstr[2] "Вы являетесь участником следующих групп:"
 
 #. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-#: lib/command.php:916
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -8337,118 +6904,96 @@ msgstr ""
 "tracking — пока не реализовано.\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:36
 msgid "No configuration file found."
 msgstr "Конфигурационный файл не найден."
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:39
 msgid "I looked for configuration files in the following places:"
 msgstr "Конфигурационные файлы искались в следующих местах:"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:42
 msgid "You may wish to run the installer to fix this."
 msgstr "Возможно, вы решите запустить установщик для исправления этого."
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:46
 msgid "Go to the installer."
 msgstr "Перейти к установщику"
 
-#: lib/dberroraction.php:59
 msgid "Database error"
 msgstr "Ошибка базы данных"
 
 #. TRANS: Description of form for deleting a user.
-#: lib/deleteuserform.php:75
 msgid "Delete this user"
 msgstr "Удалить этого пользователя"
 
-#: lib/designform.php:114
 #, fuzzy
 msgid "Change design"
 msgstr "Сохранить оформление"
 
 #. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: lib/designform.php:131
 msgid "Change colours"
 msgstr "Изменение цветовой гаммы"
 
 #. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: lib/designform.php:138
 msgid "Use defaults"
 msgstr "Использовать значения по умолчанию"
 
 #. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: lib/designform.php:140
 msgid "Restore default designs"
 msgstr "Восстановить оформление по умолчанию"
 
 #. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: lib/designform.php:148
 msgid "Reset back to default"
 msgstr "Восстановить значения по умолчанию"
 
 #. TRANS: Label in form on profile design page.
 #. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
-#: lib/designform.php:158
 msgid "Upload file"
 msgstr "Загрузить файл"
 
 #. TRANS: Instructions for form on profile design page.
-#: lib/designform.php:163
-#, fuzzy
 msgid ""
 "You can upload your personal background image. The maximum file size is 2Mb."
 msgstr ""
 "Вы можете загрузить собственное фоновое изображение. Максимальный размер "
-"файла составляет 2МБ."
+"файла составляет 2Mb."
 
 #. TRANS: Radio button on profile design page that will enable use of the uploaded profile image.
-#: lib/designform.php:194
 msgctxt "RADIO"
 msgid "On"
 msgstr "Включено"
 
 #. TRANS: Radio button on profile design page that will disable use of the uploaded profile image.
-#: lib/designform.php:211
 msgctxt "RADIO"
 msgid "Off"
 msgstr "Выключено"
 
 #. TRANS: Title for button on profile design page to save settings.
-#: lib/designform.php:322
 msgid "Save design"
 msgstr "Сохранить оформление"
 
 #. TRANS: Error message displayed if design settings could not be saved.
 #. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
-#: lib/designsettings.php:216 lib/designsettings.php:238
 msgid "Couldn't update your design."
 msgstr "Не удаётся обновить ваше оформление."
 
 #. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
-#: lib/designsettings.php:244
 msgid "Design defaults restored."
 msgstr "Оформление по умолчанию восстановлено."
 
 #. TRANS: Exception. %s is an ID.
-#: lib/discovery.php:153
 #, fuzzy, php-format
 msgid "Unable to find services for %s."
 msgstr "Не удаётся отозвать доступ для приложения: %s."
 
 #. TRANS: Form legend for removing the favourite status for a favourite notice.
 #. TRANS: Title for button text for removing the favourite status for a favourite notice.
-#: lib/disfavorform.php:108 lib/disfavorform.php:140
 msgid "Disfavor this notice"
 msgstr "Мне не нравится эта запись"
 
 #. TRANS: Button text for removing the favourite status for a favourite notice.
-#: lib/disfavorform.php:136
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Disfavor favorite"
@@ -8456,89 +7001,69 @@ msgstr "Разлюбить"
 
 #. TRANS: Form legend for adding the favourite status to a notice.
 #. TRANS: Title for button text for adding the favourite status to a notice.
-#: lib/favorform.php:108 lib/favorform.php:139
 msgid "Favor this notice"
 msgstr "Мне нравится эта запись"
 
 #. TRANS: Button text for adding the favourite status to a notice.
-#: lib/favorform.php:135
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Favor"
 msgstr "Пометить"
 
-#: lib/feed.php:84
 msgid "RSS 1.0"
 msgstr "RSS 1.0"
 
-#: lib/feed.php:86
 msgid "RSS 2.0"
 msgstr "RSS 2.0"
 
-#: lib/feed.php:88
 msgid "Atom"
 msgstr "Atom"
 
-#: lib/feed.php:90
 msgid "FOAF"
 msgstr "FOAF"
 
-#: lib/feedimporter.php:75
 #, fuzzy
 msgid "Not an atom feed."
 msgstr "Все участники"
 
-#: lib/feedimporter.php:82
 msgid "No author in the feed."
 msgstr ""
 
-#: lib/feedimporter.php:89
 msgid "Can't import without a user."
 msgstr ""
 
 #. TRANS: Header for feed links (h2).
-#: lib/feedlist.php:66
 msgid "Feeds"
 msgstr "Каналы"
 
-#: lib/galleryaction.php:128
 msgid "All"
 msgstr "Все"
 
-#: lib/galleryaction.php:136
 msgid "Select tag to filter"
 msgstr "Выберите тег для фильтрации"
 
-#: lib/galleryaction.php:137
 msgid "Tag"
 msgstr "Теги"
 
-#: lib/galleryaction.php:138
 msgid "Choose a tag to narrow list"
 msgstr "Выберите тег из выпадающего списка"
 
-#: lib/galleryaction.php:140
 msgid "Go"
 msgstr "Перейти"
 
-#: lib/grantroleform.php:91
 #, php-format
 msgid "Grant this user the \"%s\" role"
 msgstr "Назначить этому пользователю роль «%s»"
 
-#: lib/groupeditform.php:147
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "1-64 латинских строчных буквы или цифры, без пробелов"
 
-#: lib/groupeditform.php:156
 msgid "URL of the homepage or blog of the group or topic."
 msgstr "Адрес домашней страницы или блога группы или темы."
 
-#: lib/groupeditform.php:161
 msgid "Describe the group or topic"
 msgstr "Опишите группу или тему"
 
-#: lib/groupeditform.php:163
 #, php-format
 msgid "Describe the group or topic in %d character or less"
 msgid_plural "Describe the group or topic in %d characters or less"
@@ -8546,14 +7071,12 @@ msgstr[0] "Опишите группу или тему, используя до
 msgstr[1] "Опишите группу или тему, используя до %d символов"
 msgstr[2] "Опишите группу или тему, используя до %d символов"
 
-#: lib/groupeditform.php:175
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\"."
 msgstr ""
 "Местонахождение группы, если есть, например «Город, область (или регион), "
 "страна»."
 
-#: lib/groupeditform.php:183
 #, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -8572,70 +7095,60 @@ msgstr[2] ""
 "d имён."
 
 #. TRANS: Menu item in the group navigation page.
-#: lib/groupnav.php:86
 msgctxt "MENU"
 msgid "Group"
 msgstr "Группа"
 
 #. TRANS: Tooltip for menu item in the group navigation page.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:89
 #, php-format
 msgctxt "TOOLTIP"
 msgid "%s group"
 msgstr "Группа %s"
 
 #. TRANS: Menu item in the group navigation page.
-#: lib/groupnav.php:95
 msgctxt "MENU"
 msgid "Members"
 msgstr "Участники"
 
 #. TRANS: Tooltip for menu item in the group navigation page.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:98
 #, php-format
 msgctxt "TOOLTIP"
 msgid "%s group members"
 msgstr "Участники группы %s"
 
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/groupnav.php:108
 msgctxt "MENU"
 msgid "Blocked"
 msgstr "Заблокированные"
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:111
 #, php-format
 msgctxt "TOOLTIP"
 msgid "%s blocked users"
 msgstr "Заблокированные пользователи %s"
 
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "Настройки"
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:120
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Edit %s group properties"
 msgstr "Редактировать свойства группы %s"
 
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/groupnav.php:126
 msgctxt "MENU"
 msgid "Logo"
 msgstr "Логотип"
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:129
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Add or edit %s logo"
@@ -8643,69 +7156,57 @@ msgstr "Добавить или изменить логотип группы %s"
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:138
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Add or edit %s design"
 msgstr "Добавить или изменить оформление %s"
 
 #. TRANS: Title for groups with the most members section.
-#: lib/groupsbymemberssection.php:71
 msgid "Groups with most members"
 msgstr "Группы с наибольшим количеством участников"
 
 #. TRANS: Title for groups with the most posts section.
-#: lib/groupsbypostssection.php:71
 msgid "Groups with most posts"
 msgstr "Группы с наибольшим количеством записей"
 
 #. TRANS: Title for group tag cloud section.
 #. TRANS: %s is a group name.
-#: lib/grouptagcloudsection.php:57
 #, php-format
 msgid "Tags in %s group's notices"
 msgstr "Теги записей группы %s"
 
 #. TRANS: Client exception 406
-#: lib/htmloutputter.php:104
 msgid "This page is not available in a media type you accept"
 msgstr "Страница недоступна для того типа, который Вы задействовали."
 
 #. TRANS: Exception thrown when trying to upload an unsupported image file format.
-#: lib/imagefile.php:73
 msgid "Unsupported image file format."
 msgstr "Неподдерживаемый формат файла изображения."
 
 #. TRANS: Exception thrown when too large a file is uploaded.
 #. TRANS: %s is the maximum file size, for example "500b", "10kB" or "2MB".
-#: lib/imagefile.php:91
 #, php-format
 msgid "That file is too big. The maximum file size is %s."
 msgstr "Этот файл слишком большой. Максимальный размер файла составляет %s."
 
 #. TRANS: Exception thrown when uploading an image and that action could not be completed.
-#: lib/imagefile.php:97
 msgid "Partial upload."
 msgstr "Частичная загрузка."
 
 #. TRANS: Exception thrown when uploading a file as image that is not an image or is a corrupt file.
-#: lib/imagefile.php:115
 msgid "Not an image or corrupt file."
 msgstr "Не является изображением или повреждённый файл."
 
 #. TRANS: Exception thrown during resize when image has been registered as present, but is no longer there.
-#: lib/imagefile.php:178
 msgid "Lost our file."
 msgstr "Потерян файл."
 
 #. TRANS: Exception thrown when trying to resize an unknown file type.
 #. TRANS: Exception thrown when trying resize an unknown file type.
-#: lib/imagefile.php:216 lib/imagefile.php:257
 msgid "Unknown file type"
 msgstr "Неподдерживаемый тип файла"
 
 #. TRANS: Number of megabytes. %d is the number.
-#: lib/imagefile.php:303
 #, php-format
 msgid "%dMB"
 msgid_plural "%dMB"
@@ -8714,7 +7215,6 @@ msgstr[1] "%dМБ"
 msgstr[2] "%dМБ"
 
 #. TRANS: Number of kilobytes. %d is the number.
-#: lib/imagefile.php:307
 #, php-format
 msgid "%dkB"
 msgid_plural "%dkB"
@@ -8723,7 +7223,6 @@ msgstr[1] "%dКБ"
 msgstr[2] "%dКБ"
 
 #. TRANS: Number of bytes. %d is the number.
-#: lib/imagefile.php:310
 #, php-format
 msgid "%dB"
 msgid_plural "%dB"
@@ -8731,7 +7230,6 @@ msgstr[0] "%dБ"
 msgstr[1] "%dБ"
 msgstr[2] ""
 
-#: lib/implugin.php:262
 #, php-format
 msgid ""
 "User \"%s\" on %s has said that your %s screenname belongs to them. If "
@@ -8741,51 +7239,43 @@ msgid ""
 "message."
 msgstr ""
 
-#: lib/implugin.php:349
 #, php-format
 msgid "Unknown inbox source %d."
 msgstr "Неизвестный источник входящих сообщений %d."
 
-#: lib/implugin.php:485
-#, fuzzy, php-format
+#, php-format
 msgid "Message too long - maximum is %1$d characters, you sent %2$d."
-msgstr "Сообщение слишком длинное — не больше %1$d символа, вы отправили %2$d."
+msgstr ""
+"Сообщение слишком длинное — не больше %1$d символов, вы отправили %2$d."
 
-#: lib/leaveform.php:114
 msgid "Leave"
 msgstr "Покинуть"
 
 #. TRANS: Menu item for logging in to the StatusNet site.
-#: lib/logingroupnav.php:77
 msgctxt "MENU"
 msgid "Login"
 msgstr "Вход"
 
 #. TRANS: Title for menu item for logging in to the StatusNet site.
-#: lib/logingroupnav.php:79
 msgid "Login with a username and password"
 msgstr "Войти с вашим ником и паролем."
 
 #. TRANS: Menu item for registering with the StatusNet site.
-#: lib/logingroupnav.php:85
 msgctxt "MENU"
 msgid "Register"
 msgstr "Регистрация"
 
 #. TRANS: Title for menu item for registering with the StatusNet site.
-#: lib/logingroupnav.php:87
 msgid "Sign up for a new account"
 msgstr "Создать новый аккаунт"
 
 #. TRANS: Subject for address confirmation email.
-#: lib/mail.php:172
 msgid "Email address confirmation"
 msgstr "Подтверждение электронного адреса"
 
 #. TRANS: Body for address confirmation email.
 #. TRANS: %1$s is the addressed user's nickname, %2$s is the StatusNet sitename,
 #. TRANS: %3$s is the URL to confirm at.
-#: lib/mail.php:177
 #, php-format
 msgid ""
 "Hey, %1$s.\n"
@@ -8817,14 +7307,12 @@ msgstr ""
 
 #. TRANS: Subject of new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
-#: lib/mail.php:243
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1$s теперь следит за вашими записями на %2$s."
 
 #. TRANS: This is a paragraph in a new-subscriber e-mail.
 #. TRANS: %s is a URL where the subscriber can be reported as abusive.
-#: lib/mail.php:250
 #, php-format
 msgid ""
 "If you believe this account is being used abusively, you can block them from "
@@ -8839,7 +7327,6 @@ msgstr ""
 #. TRANS: %3$s is the subscriber's profile URL, %4$s is the subscriber's location (or empty)
 #. TRANS: %5$s is the subscriber's homepage URL (or empty), %6%s is the subscriber's bio (or empty)
 #. TRANS: %7$s is a link to the addressed user's e-mail settings.
-#: lib/mail.php:260
 #, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -8866,14 +7353,12 @@ msgstr ""
 
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is biographical information.
-#: lib/mail.php:283
 #, php-format
 msgid "Bio: %s"
 msgstr "Биография: %s"
 
 #. TRANS: Subject of notification mail for new posting email address.
 #. TRANS: %s is the StatusNet sitename.
-#: lib/mail.php:312
 #, php-format
 msgid "New email address for posting to %s"
 msgstr "Новый электронный адрес для постинга %s"
@@ -8881,7 +7366,6 @@ msgstr "Новый электронный адрес для постинга %s"
 #. TRANS: Body of notification mail for new posting email address.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is the e-mail address to send
 #. TRANS: to to post by e-mail, %3$s is a URL to more instructions.
-#: lib/mail.php:318
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -8904,26 +7388,22 @@ msgstr ""
 
 #. TRANS: Subject line for SMS-by-email notification messages.
 #. TRANS: %s is the posting user's nickname.
-#: lib/mail.php:439
 #, php-format
 msgid "%s status"
 msgstr "%s статус"
 
 #. TRANS: Subject line for SMS-by-email address confirmation message.
-#: lib/mail.php:465
 msgid "SMS confirmation"
 msgstr "Подтверждение СМС"
 
 #. TRANS: Main body heading for SMS-by-email address confirmation message.
 #. TRANS: %s is the addressed user's nickname.
-#: lib/mail.php:469
 #, php-format
 msgid "%s: confirm you own this phone number with this code:"
 msgstr "%s. Подтвердите, что это ваш телефон, следующим кодом:"
 
 #. TRANS: Subject for 'nudge' notification email.
 #. TRANS: %s is the nudging user.
-#: lib/mail.php:490
 #, fuzzy, php-format
 msgid "You have been nudged by %s"
 msgstr "Вас «подтолкнул» пользователь %s"
@@ -8931,7 +7411,6 @@ msgstr "Вас «подтолкнул» пользователь %s"
 #. TRANS: Body for 'nudge' notification email.
 #. TRANS: %1$s is the nuding user's long name, $2$s is the nudging user's nickname,
 #. TRANS: %3$s is a URL to post notices at, %4$s is the StatusNet sitename.
-#: lib/mail.php:497
 #, php-format
 msgid ""
 "%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -8960,7 +7439,6 @@ msgstr ""
 
 #. TRANS: Subject for direct-message notification email.
 #. TRANS: %s is the sending user's nickname.
-#: lib/mail.php:544
 #, php-format
 msgid "New private message from %s"
 msgstr "Новое приватное сообщение от %s"
@@ -8969,7 +7447,6 @@ msgstr "Новое приватное сообщение от %s"
 #. TRANS: %1$s is the sending user's long name, %2$s is the sending user's nickname,
 #. TRANS: %3$s is the message content, %4$s a URL to the message,
 #. TRANS: %5$s is the StatusNet sitename.
-#: lib/mail.php:552
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -9004,7 +7481,6 @@ msgstr ""
 
 #. TRANS: Subject for favorite notification e-mail.
 #. TRANS: %1$s is the adding user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:604
 #, php-format
 msgid "%1$s (@%2$s) added your notice as a favorite"
 msgstr "%1$s (@%2$s) добавил вашу запись в число своих любимых"
@@ -9014,7 +7490,6 @@ msgstr "%1$s (@%2$s) добавил вашу запись в число свои
 #. TRANS: %3$s is a URL to the faved notice, %4$s is the faved notice text,
 #. TRANS: %5$s is a URL to all faves of the adding user, %6$s is the StatusNet sitename,
 #. TRANS: %7$s is the adding user's nickname.
-#: lib/mail.php:611
 #, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -9052,7 +7527,6 @@ msgstr ""
 "%6$s\n"
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:669
 #, php-format
 msgid ""
 "The full conversation can be read here:\n"
@@ -9065,7 +7539,6 @@ msgstr ""
 
 #. TRANS: E-mail subject for notice notification.
 #. TRANS: %1$s is the sending user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:677
 #, php-format
 msgid "%1$s (@%2$s) sent a notice to your attention"
 msgstr "%1$s (@%2$s) отправил запись для вашего внимания"
@@ -9076,7 +7549,6 @@ msgstr "%1$s (@%2$s) отправил запись для вашего вним
 #. TRANS: %5$s is a URL to the full conversion if it exists (otherwise empty),
 #. TRANS: %6$s is a URL to reply to the notice, %7$s is a URL to all @-replied for the addressed user,
 #. TRANS: %8$s is a URL to the addressed user's e-mail settings, %9$s is the sender's nickname.
-#: lib/mail.php:685
 #, php-format
 msgid ""
 "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -9125,11 +7597,9 @@ msgstr ""
 "\n"
 "PS Вы можете отключить эти уведомления по электронной почте здесь: %8$s\n"
 
-#: lib/mailbox.php:87
 msgid "Only the user can read their own mailboxes."
 msgstr "Только сам пользователь может читать собственный почтовый ящик."
 
-#: lib/mailbox.php:125
 msgid ""
 "You have no private messages. You can send private message to engage other "
 "users in conversation. People can send you messages for your eyes only."
@@ -9138,55 +7608,45 @@ msgstr ""
 "вовлечения других пользователей в разговор. Сообщения, получаемые от других "
 "людей, видите только вы."
 
-#: lib/mailhandler.php:37
 msgid "Could not parse message."
 msgstr "Сообщение не удаётся разобрать."
 
-#: lib/mailhandler.php:42
 msgid "Not a registered user."
 msgstr "Незарегистрированный пользователь."
 
-#: lib/mailhandler.php:46
 msgid "Sorry, that is not your incoming email address."
 msgstr "Простите, это не Ваш входящий электронный адрес."
 
-#: lib/mailhandler.php:50
 msgid "Sorry, no incoming email allowed."
 msgstr "Простите, входящих писем нет."
 
-#: lib/mailhandler.php:229
 #, php-format
 msgid "Unsupported message type: %s"
 msgstr "Неподдерживаемый формат файла изображения: %s"
 
 #. TRANS: Client exception thrown when a database error was thrown during a file upload operation.
-#: lib/mediafile.php:102 lib/mediafile.php:174
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
 "При сохранении вашего файла возникла ошибка базы данных. Пожалуйста, "
 "попробуйте ещё раз."
 
 #. TRANS: Client exception thrown when a file upload operation would cause a user to exceed a set quota.
-#: lib/mediafile.php:238 lib/mediafile.php:281
 msgid "File exceeds user's quota."
 msgstr "Файл превышает пользовательскую квоту."
 
 #. TRANS: Client exception thrown when a file upload operation fails because the file could
 #. TRANS: not be moved from the temporary folder to the permanent file location.
-#: lib/mediafile.php:258 lib/mediafile.php:300
 msgid "File could not be moved to destination directory."
 msgstr "Файл не может быть перемещён в целевую директорию."
 
 #. TRANS: Client exception thrown when a file upload operation has been stopped because the MIME
 #. TRANS: type of the uploaded file could not be determined.
-#: lib/mediafile.php:265 lib/mediafile.php:306
 msgid "Could not determine file's MIME type."
 msgstr "Не удаётся определить mime-тип файла."
 
 #. TRANS: Client exception thrown trying to upload a forbidden MIME type.
 #. TRANS: %1$s is the file type that was denied, %2$s is the application part of
 #. TRANS: the MIME type that was denied.
-#: lib/mediafile.php:396
 #, php-format
 msgid ""
 "\"%1$s\" is not a supported file type on this server. Try using another %2$s "
@@ -9197,50 +7657,40 @@ msgstr ""
 
 #. TRANS: Client exception thrown trying to upload a forbidden MIME type.
 #. TRANS: %s is the file type that was denied.
-#: lib/mediafile.php:401
 #, php-format
 msgid "\"%s\" is not a supported file type on this server."
 msgstr "Тип файла «%s» не поддерживается не этом сервере."
 
-#: lib/messageform.php:120
 msgid "Send a direct notice"
 msgstr "Послать прямую запись"
 
 #. TRANS Label entry in drop-down selection box in direct-message inbox/outbox. This is the default entry in the drop-down box, doubling as instructions and a brake against accidental submissions with the first user in the list.
-#: lib/messageform.php:137
 msgid "Select recipient:"
 msgstr "Выберите получателя:"
 
 #. TRANS Entry in drop-down selection box in direct-message inbox/outbox when no one is available to message.
-#: lib/messageform.php:150
 msgid "No mutual subscribers."
 msgstr "Нет взаимных подписчиков."
 
-#: lib/messageform.php:153
 msgid "To"
 msgstr "Для"
 
-#: lib/messageform.php:184 lib/noticeform.php:236
 msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr "Отправить"
 
-#: lib/messagelist.php:77
 #, fuzzy
 msgid "Messages"
 msgstr "Сообщение"
 
-#: lib/messagelistitem.php:123 lib/noticelist.php:527
 msgid "from"
 msgstr "от"
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:178
 msgid "Nickname cannot be empty."
 msgstr "Псевдоним не может быть пустым."
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:191
 #, php-format
 msgid "Nickname cannot be more than %d character long."
 msgid_plural "Nickname cannot be more than %d characters long."
@@ -9248,32 +7698,33 @@ msgstr[0] "Псевдоним не может быть длиннее %d сим
 msgstr[1] "Псевдоним не может быть длиннее %d символов."
 msgstr[2] "Псевдоним не может быть длиннее %d символов."
 
-#: lib/noticeform.php:160
+#. TRANS: Form legend for notice form.
 msgid "Send a notice"
 msgstr "Послать запись"
 
-#: lib/noticeform.php:174
+#. TRANS: Title for notice label. %s is the user's nickname.
 #, php-format
 msgid "What's up, %s?"
 msgstr "Что нового, %s?"
 
-#: lib/noticeform.php:193
+#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr "Прикрепить"
 
-#: lib/noticeform.php:197
-msgid "Attach a file"
+#. TRANS: Title for input field to attach a file to a notice.
+#, fuzzy
+msgid "Attach a file."
 msgstr "Прикрепить файл"
 
-#: lib/noticeform.php:212
+#. TRANS: Field label to add location to a notice.
 msgid "Share my location"
 msgstr "Поделиться своим местоположением."
 
-#: lib/noticeform.php:215
+#. TRANS: Text to not share location for a notice in notice form.
 msgid "Do not share my location"
 msgstr "Не публиковать своё местоположение"
 
-#: lib/noticeform.php:216
+#. TRANS: Timeout error text for location retrieval in notice form.
 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
 "try again later"
@@ -9282,416 +7733,315 @@ msgstr ""
 "времени, чем ожидалось; повторите попытку позже"
 
 #. TRANS: Used in coordinates as abbreviation of north
-#: lib/noticelist.php:457
 msgid "N"
 msgstr "с. ш."
 
 #. TRANS: Used in coordinates as abbreviation of south
-#: lib/noticelist.php:459
 msgid "S"
 msgstr "ю. ш."
 
 #. TRANS: Used in coordinates as abbreviation of east
-#: lib/noticelist.php:461
 msgid "E"
 msgstr "в. д."
 
 #. TRANS: Used in coordinates as abbreviation of west
-#: lib/noticelist.php:463
 msgid "W"
 msgstr "з. д."
 
-#: lib/noticelist.php:465
 #, php-format
 msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgstr "%1$u°%2$u'%3$u\" %4$s %5$u°%6$u'%7$u\" %8$s"
 
-#: lib/noticelist.php:474
 msgid "at"
 msgstr "из"
 
-#: lib/noticelist.php:523
 msgid "web"
 msgstr "web"
 
-#: lib/noticelist.php:589
 msgid "in context"
 msgstr "переписка"
 
-#: lib/noticelist.php:624
 msgid "Repeated by"
 msgstr "Повторено"
 
-#: lib/noticelist.php:651
 msgid "Reply to this notice"
 msgstr "Ответить на эту запись"
 
-#: lib/noticelist.php:652
 msgid "Reply"
 msgstr "Ответить"
 
-#: lib/noticelist.php:678
 msgid "Delete this notice"
 msgstr "Удалить эту запись"
 
-#: lib/noticelist.php:696
 msgid "Notice repeated"
 msgstr "Запись повторена"
 
-#: lib/nudgeform.php:116
 msgid "Nudge this user"
 msgstr "«Подтолкнуть» этого пользователя"
 
-#: lib/nudgeform.php:128
 msgid "Nudge"
 msgstr "«Подтолкнуть»"
 
-#: lib/nudgeform.php:128
 msgid "Send a nudge to this user"
 msgstr "«Подтолкнуть» этого пользователя"
 
-#: lib/oauthstore.php:294
 msgid "Error inserting new profile."
 msgstr "Ошибка размещения нового профиля."
 
-#: lib/oauthstore.php:302
 msgid "Error inserting avatar."
 msgstr "Ошибка размещения аватара."
 
-#: lib/oauthstore.php:322
 msgid "Error inserting remote profile."
 msgstr "Ошибка размещения удалённого профиля."
 
 #. TRANS: Exception thrown when a notice is denied because it has been sent before.
-#: lib/oauthstore.php:362
 msgid "Duplicate notice."
 msgstr "Дублирующаяся запись."
 
-#: lib/oauthstore.php:507
 msgid "Couldn't insert new subscription."
 msgstr "Не удаётся вставить новую подписку."
 
-#: lib/personalgroupnav.php:104
-#, fuzzy
 msgid "Replies"
 msgstr "Ответы"
 
-#: lib/personalgroupnav.php:109
-#, fuzzy
 msgid "Favorites"
 msgstr "Любимое"
 
-#: lib/personalgroupnav.php:120
-#, fuzzy
 msgid "Inbox"
 msgstr "Входящие"
 
-#: lib/personalgroupnav.php:121
 msgid "Your incoming messages"
 msgstr "Ваши входящие сообщения"
 
-#: lib/personalgroupnav.php:125
-#, fuzzy
 msgid "Outbox"
 msgstr "Исходящие"
 
-#: lib/personalgroupnav.php:126
 msgid "Your sent messages"
 msgstr "Ваши исходящие сообщения"
 
 #. TRANS: Title for personal tag cloud section. %s is a user nickname.
-#: lib/personaltagcloudsection.php:56
 #, php-format
 msgid "Tags in %s's notices"
 msgstr "Теги записей пользователя %s"
 
 #. TRANS: Displayed as version information for a plugin if no version information was found.
-#: lib/plugin.php:126
 msgid "Unknown"
 msgstr "Неизвестно"
 
 #. TRANS: Plugin admin panel controls
-#: lib/plugindisableform.php:90
 msgctxt "plugin"
 msgid "Disable"
 msgstr ""
 
 #. TRANS: Plugin admin panel controls
-#: lib/pluginenableform.php:112
 msgctxt "plugin"
 msgid "Enable"
 msgstr ""
 
-#: lib/pluginlist.php:196
 msgctxt "plugin-description"
 msgid "(Plugin descriptions unavailable when disabled.)"
 msgstr ""
 
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:88
 msgid "Subscriptions"
 msgstr "Подписки"
 
 #. TRANS: Text for user subscription statistics if user has more subscriptions than displayed.
-#: lib/profileaction.php:144
 msgid "All subscriptions"
 msgstr "Все подписки."
 
 #. TRANS: H2 text for user subscriber statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:96
 msgid "Subscribers"
 msgstr "Подписчики"
 
 #. TRANS: Text for user subscription statistics if user has more subscribers than displayed.
-#: lib/profileaction.php:181
 msgid "All subscribers"
 msgstr "Все подписчики"
 
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:213
 msgid "User ID"
 msgstr "ID пользователя"
 
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:219
 msgid "Member since"
 msgstr "Регистрация"
 
 #. TRANS: Label for user statistics.
 #. TRANS: H2 text for user group membership statistics.
-#: lib/profileaction.php:239 lib/profileaction.php:290
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:104
 msgid "Groups"
 msgstr "Группы"
 
 #. TRANS: Label for user statistics.
 #. TRANS: Average count of posts made per day since account registration.
-#: lib/profileaction.php:253
 msgid "Daily average"
 msgstr "Среднесуточная"
 
 #. TRANS: Text for user group membership statistics if user has more subscriptions than displayed.
-#: lib/profileaction.php:305
 msgid "All groups"
 msgstr "Все группы"
 
 #. TRANS: Server error displayed when using an unimplemented method.
-#: lib/profileformaction.php:123
 msgid "Unimplemented method."
 msgstr "Нереализованный метод."
 
-#: lib/publicgroupnav.php:82
 msgid "User groups"
 msgstr "Группы"
 
-#: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
 msgid "Recent tags"
 msgstr "Облако тегов"
 
-#: lib/publicgroupnav.php:88
 msgid "Featured"
 msgstr "Особые"
 
-#: lib/publicgroupnav.php:92
 msgid "Popular"
 msgstr "Популярное"
 
-#: lib/redirectingaction.php:95
 msgid "No return-to arguments."
 msgstr "Нет аргумента return-to."
 
-#: lib/repeatform.php:107
 msgid "Repeat this notice?"
 msgstr "Повторить эту запись?"
 
-#: lib/repeatform.php:132
 msgid "Yes"
 msgstr "Да"
 
-#: lib/repeatform.php:132
 msgid "Repeat this notice"
 msgstr "Повторить эту запись"
 
-#: lib/revokeroleform.php:91
 #, php-format
 msgid "Revoke the \"%s\" role from this user"
 msgstr "Отозвать у этого пользователя роль «%s»"
 
 #. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:1001
 msgid "Page not found."
 msgstr "Страница не найдена."
 
-#: lib/sandboxform.php:67
 msgid "Sandbox"
 msgstr "Песочница"
 
-#: lib/sandboxform.php:78
 msgid "Sandbox this user"
 msgstr "Установить режим песочницы для этого пользователя"
 
 #. TRANS: Fieldset legend for the search form.
-#: lib/searchaction.php:120
 msgid "Search site"
 msgstr "Поиск по сайту"
 
 #. TRANS: Used as a field label for the field where one or more keywords
 #. TRANS: for searching can be entered.
-#: lib/searchaction.php:128
 msgid "Keyword(s)"
 msgstr "Ключевые слова"
 
 #. TRANS: Button text for searching site.
-#: lib/searchaction.php:130
 msgctxt "BUTTON"
 msgid "Search"
 msgstr "Найти"
 
-#: lib/searchgroupnav.php:80
 msgid "People"
 msgstr "Люди"
 
-#: lib/searchgroupnav.php:81
 msgid "Find people on this site"
 msgstr "Найти человека на этом сайте"
 
-#: lib/searchgroupnav.php:83
 msgid "Find content of notices"
 msgstr "Найти запись по содержимому"
 
-#: lib/searchgroupnav.php:85
 msgid "Find groups on this site"
 msgstr "Найти группы на этом сайте"
 
-#: lib/section.php:89
 msgid "Untitled section"
 msgstr "Секция без названия"
 
-#: lib/section.php:106
 msgid "More..."
 msgstr "Далее…"
 
-#: lib/settingsnav.php:78
 msgid "Change your profile settings"
 msgstr "Изменить ваши настройки профиля"
 
-#: lib/settingsnav.php:83
 msgid "Upload an avatar"
 msgstr "Загрузить аватару"
 
-#: lib/settingsnav.php:88
 msgid "Change your password"
 msgstr "Измените свой пароль"
 
-#: lib/settingsnav.php:93
 msgid "Change email handling"
 msgstr "Изменить электронный адрес"
 
-#: lib/settingsnav.php:98
 msgid "Design your profile"
 msgstr "Оформить ваш профиль"
 
-#: lib/settingsnav.php:102
 msgid "URL"
 msgstr "URL"
 
-#: lib/settingsnav.php:103
 msgid "URL shorteners"
 msgstr ""
 
-#: lib/settingsnav.php:111
 msgid "Updates by instant messenger (IM)"
 msgstr "Обновлено по IM"
 
-#: lib/settingsnav.php:118
 msgid "Updates by SMS"
 msgstr "Обновления по СМС"
 
-#: lib/settingsnav.php:123
-#, fuzzy
 msgid "Connections"
 msgstr "Соединения"
 
-#: lib/settingsnav.php:124
 msgid "Authorized connected applications"
 msgstr "Авторизованные соединённые приложения"
 
-#: lib/silenceform.php:67
 msgid "Silence"
 msgstr "Заглушить"
 
-#: lib/silenceform.php:78
 msgid "Silence this user"
 msgstr "Заглушить этого пользователя."
 
-#: lib/subgroupnav.php:89
 #, php-format
 msgid "People %s subscribes to"
 msgstr "Люди на которых подписан %s"
 
-#: lib/subgroupnav.php:97
 #, php-format
 msgid "People subscribed to %s"
 msgstr "Люди подписанные на %s"
 
-#: lib/subgroupnav.php:105
 #, php-format
 msgid "Groups %s is a member of"
 msgstr "Группы, в которых состоит %s"
 
-#: lib/subgroupnav.php:111
 msgid "Invite"
 msgstr "Пригласить"
 
-#: lib/subgroupnav.php:112
 #, php-format
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Пригласите друзей и коллег стать такими же как вы участниками %s"
 
-#: lib/subscribeform.php:115 lib/subscribeform.php:139
 msgid "Subscribe to this user"
 msgstr "Подписаться на этого пользователя"
 
-#: lib/subscriberspeopleselftagcloudsection.php:48
-#: lib/subscriptionspeopleselftagcloudsection.php:48
 msgid "People Tagcloud as self-tagged"
 msgstr "Облако собственных тегов людей"
 
-#: lib/subscriberspeopletagcloudsection.php:48
-#: lib/subscriptionspeopletagcloudsection.php:48
 msgid "People Tagcloud as tagged"
 msgstr "Облако тегов людей"
 
-#: lib/tagcloudsection.php:56
 msgid "None"
 msgstr "Нет тегов"
 
 #. TRANS: Server exception displayed if a theme name was invalid.
-#: lib/theme.php:74
 msgid "Invalid theme name."
 msgstr "Неверное имя темы оформления."
 
-#: lib/themeuploader.php:50
 msgid "This server cannot handle theme uploads without ZIP support."
 msgstr "Этот сервер не может обработать загруженные темы без поддержки ZIP."
 
-#: lib/themeuploader.php:58 lib/themeuploader.php:61
 msgid "The theme file is missing or the upload failed."
 msgstr "Файл темы отсутствует или произошёл сбой при загрузке."
 
-#: lib/themeuploader.php:91 lib/themeuploader.php:102
-#: lib/themeuploader.php:279 lib/themeuploader.php:283
-#: lib/themeuploader.php:291 lib/themeuploader.php:298
 msgid "Failed saving theme."
 msgstr "Ошибка при сохранении темы."
 
-#: lib/themeuploader.php:147
 msgid "Invalid theme: bad directory structure."
 msgstr "Ошибочная тема. Плохая структура директорий."
 
-#: lib/themeuploader.php:166
 #, php-format
 msgid "Uploaded theme is too large; must be less than %d byte uncompressed."
 msgid_plural ""
@@ -9706,11 +8056,9 @@ msgstr[2] ""
 "Размер загруженной темы слишком велик, в распакованном виде она должна "
 "занимать не более %d байт."
 
-#: lib/themeuploader.php:179
 msgid "Invalid theme archive: missing file css/display.css"
 msgstr "Недопустимый архив: темы. Отсутствует файл css/display.css"
 
-#: lib/themeuploader.php:219
 msgid ""
 "Theme contains invalid file or folder name. Stick with ASCII letters, "
 "digits, underscore, and minus sign."
@@ -9718,142 +8066,114 @@ msgstr ""
 "Тема содержит недопустимое имя файла или папки. Допустимы буквы ASCII, "
 "цифры, подчеркивание и знак минуса."
 
-#: lib/themeuploader.php:225
 msgid "Theme contains unsafe file extension names; may be unsafe."
 msgstr "Тема содержит файлы с опасным расширением; это может быть небезопасно."
 
-#: lib/themeuploader.php:242
 #, php-format
 msgid "Theme contains file of type '.%s', which is not allowed."
 msgstr "Тема содержит файл недопустимого типа «.%s»."
 
-#: lib/themeuploader.php:260
 msgid "Error opening theme archive."
 msgstr "Ошибка открытия архива темы."
 
-#: lib/threadednoticelist.php:270
-#, php-format
-msgid "Show all %d comment"
-msgid_plural "Show all %d comments"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+#, fuzzy, php-format
+msgid "Show %d reply"
+msgid_plural "Show all %d replies"
+msgstr[0] "Показать ещё"
+msgstr[1] "Показать ещё"
+msgstr[2] "Показать ещё"
 
-#: lib/topposterssection.php:74
 msgid "Top posters"
 msgstr "Самые активные"
 
 #. TRANS: Title for the form to unblock a user.
-#: lib/unblockform.php:67
 msgctxt "TITLE"
 msgid "Unblock"
 msgstr "Разблокировать"
 
-#: lib/unsandboxform.php:69
 msgid "Unsandbox"
 msgstr "Снять режим песочницы"
 
-#: lib/unsandboxform.php:80
 msgid "Unsandbox this user"
 msgstr "Снять режим песочницы с этого пользователя."
 
-#: lib/unsilenceform.php:67
 msgid "Unsilence"
 msgstr "Снять заглушение"
 
-#: lib/unsilenceform.php:78
 msgid "Unsilence this user"
 msgstr "Снять заглушение с этого пользователя."
 
-#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
 msgid "Unsubscribe from this user"
 msgstr "Отписаться от этого пользователя"
 
-#: lib/unsubscribeform.php:137
 msgid "Unsubscribe"
 msgstr "Отписаться"
 
 #. 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).
-#: lib/usernoprofileexception.php:60
 #, php-format
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "У пользователя %1$s (%2$d) нет записи профиля."
 
-#: lib/userprofile.php:116
 msgid "Edit Avatar"
 msgstr "Изменить аватару"
 
 #. TRANS: H2 for user actions in a profile.
 #. TRANS: H2 for entity actions in a profile.
-#: lib/userprofile.php:216 lib/userprofile.php:232
 msgid "User actions"
 msgstr "Действия пользователя"
 
 #. TRANS: Text shown in user profile of not yet compeltely deleted users.
-#: lib/userprofile.php:220
 msgid "User deletion in progress..."
 msgstr "Идёт удаление пользователя…"
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:248
 msgid "Edit profile settings"
 msgstr "Изменение настроек профиля"
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:250
 msgid "Edit"
 msgstr "Редактировать"
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:274
 msgid "Send a direct message to this user"
 msgstr "Послать приватное сообщение этому пользователю."
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:276
 msgid "Message"
 msgstr "Сообщение"
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:318
 msgid "Moderate"
 msgstr "Модерировать"
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:357
 msgid "User role"
 msgstr "Роль пользователя"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:360
 msgctxt "role"
 msgid "Administrator"
 msgstr "Администратор"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:362
 msgctxt "role"
 msgid "Moderator"
 msgstr "Модератор"
 
-#: lib/util.php:321
 #, fuzzy
 msgid "Not allowed to log in."
 msgstr "Не авторизован."
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1337
 msgid "a few seconds ago"
 msgstr "пару секунд назад"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1340
 msgid "about a minute ago"
 msgstr "около минуты назад"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1344
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
@@ -9862,12 +8182,10 @@ msgstr[1] "около %d минут назад"
 msgstr[2] "около %d минут назад"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1347
 msgid "about an hour ago"
 msgstr "около часа назад"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1351
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
@@ -9876,12 +8194,10 @@ msgstr[1] "около %d часов назад"
 msgstr[2] "около %d часов назад"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1354
 msgid "about a day ago"
 msgstr "около дня назад"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1358
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
@@ -9890,12 +8206,10 @@ msgstr[1] "около %d дней назад"
 msgstr[2] "около %d дней назад"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1361
 msgid "about a month ago"
 msgstr "около месяца назад"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1365
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
@@ -9904,13 +8218,11 @@ msgstr[1] "около %d месяцев назад"
 msgstr[2] "около %d месяцев назад"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1368
 msgid "about a year ago"
 msgstr "около года назад"
 
 #. TRANS: Web color exception thrown when a hexadecimal color code does not validate.
 #. TRANS: %s is the provided (invalid) color code.
-#: lib/webcolor.php:81 lib/webcolor.php:121
 #, php-format
 msgid "%s is not a valid color! Use 3 or 6 hex characters."
 msgstr ""
@@ -9918,199 +8230,31 @@ msgstr ""
 "символов."
 
 #. TRANS: Exception.
-#: lib/xrd.php:63
 msgid "Invalid XML."
 msgstr "Неверный XML."
 
 #. TRANS: Exception.
-#: lib/xrd.php:68
 msgid "Invalid XML, missing XRD root."
 msgstr "Неверный XML, отсутствует корень XRD."
 
 #. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
-#: scripts/restoreuser.php:62
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr "Получение резервной копии из файла «%s»."
 
-#~ msgid "Could not generate feed for group - %s"
-#~ msgstr "Не удаётся сгенерировать информацию о группе: %s"
+#~ msgid "Full name is too long (max 255 chars)."
+#~ msgstr "Полное имя слишком длинное (максимум 255 символов)."
+
+#~ msgid "description is too long (max %d chars)."
+#~ msgstr "Слишком длинное описание (максимум %d символов)"
+
+#~ msgid "Location is too long (max 255 chars)."
+#~ msgstr "Слишком длинное месторасположение (максимум 255 символов)."
+
+#~ msgid "Too many aliases! Maximum %d."
+#~ msgstr "Слишком много алиасов! Максимальное число — %d."
 
 #, fuzzy
-#~ msgid "Current confirmed Jabber/Google Talk address."
-#~ msgstr "Подтверждённый в настоящее время Jabber/Gtalk - адрес."
-
-#, fuzzy
-#~ msgid ""
-#~ "Jabber or Google Talk address, like \"UserName@example.org\". First, make "
-#~ "sure to add %s to your buddy list in your IM client or on Google Talk."
-#~ msgstr ""
-#~ "Jabber или GTalk - адрес, типа \"UserName@example.org\". Первым делом "
-#~ "убедитесь, что добавили %s в список Ваших корреспондентов на Вашем IM-"
-#~ "мессенджере или в GTalk."
-
-#, fuzzy
-#~ msgid "Send me notices through Jabber/Google Talk."
-#~ msgstr "Посылать мне записи через Jabber/GTalk."
-
-#, fuzzy
-#~ msgid "Publish a MicroID for my Jabber/Google Talk address."
-#~ msgstr "Опубликовать MicroID для моего Jabber/GTalk - адреса."
-
-#~ msgid "No Jabber ID."
-#~ msgstr "Не Jabber ID."
-
-#, fuzzy
-#~ msgid "Not a valid Jabber ID."
-#~ msgstr "Неверный код Jabber ID"
-
-#~ msgid "That is already your Jabber ID."
-#~ msgstr "Это уже Ваш Jabber ID."
-
-#~ msgid "That is not your Jabber ID."
-#~ msgstr "Это не Ваш Jabber ID."
-
-#~ msgid "Other settings"
-#~ msgstr "Другие настройки"
-
-#~ msgid "Tag cloud"
-#~ msgstr "Облако тегов"
-
-#~ msgid "Consumer key"
-#~ msgstr "Потребительский ключ"
-
-#~ msgid "Consumer secret"
-#~ msgstr "Секретная фраза потребителя"
-
-#~ msgid "Request token URL"
-#~ msgstr "URL ключа запроса"
-
-#~ msgid "Access token URL"
-#~ msgstr "URL ключа доступа"
-
-#~ msgid "Authorize URL"
-#~ msgstr "URL авторизации"
-
-#~ msgid "Jabber"
-#~ msgstr "Jabber"
-
-#~ msgid "Photo"
-#~ msgstr "Фото"
-
-#~ msgid "Other options"
-#~ msgstr "Другие опции"
-
-#~ msgid "Other"
-#~ msgstr "Другое"
-
-#~ msgid "Primary site navigation"
-#~ msgstr "Главная навигация"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Personal profile and friends timeline"
-#~ msgstr "Личный профиль и лента друзей"
-
-#~ msgctxt "MENU"
-#~ msgid "Personal"
-#~ msgstr "Личное"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Change your email, avatar, password, profile"
-#~ msgstr "Изменить ваш email, аватар, пароль, профиль"
-
-#~ msgid "Account"
-#~ msgstr "Настройки"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Connect to services"
-#~ msgstr "Соединить с сервисами"
-
-#~ msgid "Connect"
-#~ msgstr "Соединить"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Change site configuration"
-#~ msgstr "Изменить конфигурацию сайта"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Invite friends and colleagues to join you on %s"
-#~ msgstr "Пригласите друзей и коллег стать такими же как Вы участниками %s"
-
-#~ msgctxt "MENU"
-#~ msgid "Invite"
-#~ msgstr "Пригласить"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Create an account"
-#~ msgstr "Создать новый аккаунт"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Help me!"
-#~ msgstr "Помощь"
-
-#~ msgctxt "MENU"
-#~ msgid "Help"
-#~ msgstr "Помощь"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Search for people or text"
-#~ msgstr "Искать людей или текст"
-
-#~ msgid "Local views"
-#~ msgstr "Локальные виды"
-
-#~ msgid "Page notice"
-#~ msgstr "Новая запись"
-
-#~ msgid "Secondary site navigation"
-#~ msgstr "Навигация по подпискам"
-
-#~ msgid "StatusNet software license"
-#~ msgstr "StatusNet лицензия"
-
-#~ msgid "Site content license"
-#~ msgstr "Лицензия содержимого сайта"
-
-#~ msgid "Pagination"
-#~ msgstr "Разбиение на страницы"
-
-#~ msgid "Author"
-#~ msgstr "Автор"
-
-#~ msgid "Provider"
-#~ msgstr "Сервис"
-
-#~ msgctxt "MENU"
-#~ msgid "SMS"
-#~ msgstr "SMS"
-
-#~ msgid "Filter tags"
-#~ msgstr "Фильтровать теги"
-
-#~ msgid "[%s]"
-#~ msgstr "[%s]"
-
-#~ msgid "Available characters"
-#~ msgstr "6 или больше знаков"
-
-#, fuzzy
-#~ msgctxt "MENU"
-#~ msgid "Profile"
-#~ msgstr "Профиль"
-
-#~ msgid "Search help"
-#~ msgstr "Справка по поиску"
-
-#~ msgid "Unknown user. Go to %s to add your address to your account"
-#~ msgstr ""
-#~ "Неизвестный пользователь. Перейдите на %s, чтобы добавить адрес для вашей "
-#~ "учётной записи"
-
-#~ msgid "Message too long. Maximum is %1$d character, you sent %2$d."
-#~ msgid_plural "Message too long. Maximum is %1$d characters, you sent %2$d."
-#~ msgstr[0] ""
-#~ "Сообщение слишком длинное — не больше %1$d символа, вы отправили %2$d."
-#~ msgstr[1] ""
-#~ "Сообщение слишком длинное — не больше %1$d символов, вы отправили %2$d."
-#~ msgstr[2] ""
-#~ "Сообщение слишком длинное — не больше %1$d символов, вы отправили %2$d."
+#~ msgctxt "BUTTON"
+#~ msgid "Comment"
+#~ msgstr "Содержание"
diff --git a/locale/statusnet.pot b/locale/statusnet.pot
index c995c35963..4f043edeb4 100644
--- a/locale/statusnet.pot
+++ b/locale/statusnet.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:23+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -73,6 +73,7 @@ msgstr ""
 #. TRANS: Button text for saving theme settings.
 #. TRANS: Button label to save e-mail preferences.
 #. TRANS: Button label to save IM preferences.
+#. TRANS: Button text in the license admin panel.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
 #. TRANS: Button text for saving site notice in admin panel.
@@ -84,11 +85,12 @@ msgstr ""
 #. TRANS: Button text on profile design page to save settings.
 #: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
 #: actions/emailsettings.php:251 actions/imsettings.php:199
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:198
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:204
-#: actions/subscriptions.php:261 actions/urlsettings.php:152
-#: actions/useradminpanel.php:298 lib/applicationeditform.php:355
-#: lib/designform.php:320 lib/groupeditform.php:201
+#: actions/licenseadminpanel.php:335 actions/pathsadminpanel.php:512
+#: actions/profilesettings.php:198 actions/sitenoticeadminpanel.php:197
+#: actions/smssettings.php:204 actions/subscriptions.php:261
+#: actions/urlsettings.php:152 actions/useradminpanel.php:298
+#: lib/applicationeditform.php:355 lib/designform.php:320
+#: lib/groupeditform.php:201
 msgctxt "BUTTON"
 msgid "Save"
 msgstr ""
@@ -115,6 +117,7 @@ msgstr ""
 #. TRANS: Client error displayed when checking group membership for a non-existing user.
 #. TRANS: Client error displayed when trying to have a non-existing user join a group.
 #. TRANS: Client error displayed when trying to have a non-existing user leave a group.
+#. TRANS: Client error displayed when not providing a user or an invalid user.
 #. TRANS: Client error displayed when updating a status for a non-existing user.
 #. TRANS: Client error displayed when requesting a list of followers for a non-existing user.
 #. TRANS: Client error displayed when requesting most recent favourite notices by a user for a non-existing user.
@@ -127,6 +130,8 @@ msgstr ""
 #. 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.
 #. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
@@ -143,13 +148,13 @@ msgstr ""
 #: actions/apidirectmessage.php:75 actions/apidirectmessagenew.php:72
 #: actions/apigroupcreate.php:111 actions/apigroupismember.php:89
 #: actions/apigroupjoin.php:98 actions/apigroupleave.php:98
-#: actions/apigrouplist.php:70 actions/apigroupprofileupdate.php:108
+#: actions/apigrouplist.php:70 actions/apigroupprofileupdate.php:106
 #: actions/apistatusesupdate.php:230 actions/apisubscriptions.php:85
 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:173
 #: actions/apitimelinehome.php:78 actions/apitimelinementions.php:77
 #: actions/apitimelineuser.php:79 actions/avatarbynickname.php:79
 #: actions/favoritesrss.php:72 actions/foaf.php:42 actions/foaf.php:61
-#: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116
+#: actions/hcard.php:67 actions/microsummary.php:63 actions/newmessage.php:119
 #: actions/otp.php:78 actions/remotesubscribe.php:144
 #: actions/remotesubscribe.php:153 actions/replies.php:73
 #: actions/repliesrss.php:38 actions/rsd.php:113 actions/showfavorites.php:106
@@ -257,6 +262,7 @@ msgstr ""
 #. TRANS: Client error displayed trying to execute an unknown API method checking group membership.
 #. TRANS: Client error displayed trying to execute an unknown API method listing the latest 20 groups.
 #. TRANS: Client error displayed trying to execute an unknown API method showing group membership.
+#. TRANS: Client error displayed when using an unsupported API format.
 #. TRANS: Client error displayed trying to execute an unknown API method showing a group.
 #. TRANS: Client error displayed trying to execute an unknown API method testing API connectivity.
 #. TRANS: Client error displayed trying to execute an unknown API method deleting a status.
@@ -273,7 +279,7 @@ msgstr ""
 #: actions/apigroupismember.php:115 actions/apigroupjoin.php:151
 #: actions/apigroupleave.php:141 actions/apigrouplist.php:134
 #: actions/apigrouplistall.php:120 actions/apigroupmembership.php:105
-#: actions/apigroupprofileupdate.php:100 actions/apigroupprofileupdate.php:213
+#: actions/apigroupprofileupdate.php:97 actions/apigroupprofileupdate.php:215
 #: actions/apigroupshow.php:114 actions/apihelptest.php:84
 #: actions/apistatusesdestroy.php:101 actions/apistatusesretweets.php:110
 #: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:139
@@ -298,7 +304,7 @@ msgstr ""
 #: actions/apifavoritecreate.php:88 actions/apifavoritedestroy.php:88
 #: actions/apifriendshipscreate.php:89 actions/apifriendshipsdestroy.php:89
 #: actions/apigroupcreate.php:102 actions/apigroupjoin.php:89
-#: actions/apigroupleave.php:89 actions/apigroupprofileupdate.php:92
+#: actions/apigroupleave.php:89 actions/apigroupprofileupdate.php:88
 #: actions/apimediaupload.php:66 actions/apistatusesretweet.php:63
 #: actions/apistatusesupdate.php:194
 msgid "This method requires a POST."
@@ -358,7 +364,7 @@ msgstr ""
 #: actions/apiaccountupdateprofileimage.php:95 actions/apimediaupload.php:81
 #: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
 #: actions/designadminpanel.php:120 actions/editapplication.php:121
-#: actions/newapplication.php:102 actions/newnotice.php:95
+#: actions/newapplication.php:102 actions/newnotice.php:94
 #: lib/designsettings.php:110
 #, php-format
 msgid ""
@@ -483,7 +489,7 @@ msgstr ""
 #. TRANS: %d is the maximum number of characters for a message.
 #. TRANS: Form validation error displayed when message content is too long.
 #. TRANS: %d is the maximum number of characters for a message.
-#: actions/apidirectmessagenew.php:127 actions/newmessage.php:152
+#: actions/apidirectmessagenew.php:127 actions/newmessage.php:158
 #, php-format
 msgid "That's too long. Maximum message size is %d character."
 msgid_plural "That's too long. Maximum message size is %d characters."
@@ -575,32 +581,35 @@ msgid "Could not find target user."
 msgstr ""
 
 #. TRANS: Client error trying to create a group with a nickname this is already in use.
+#. TRANS: API validation exception thrown when nickname is already used.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:156 actions/apigroupprofileupdate.php:255
+#: actions/apigroupcreate.php:156 actions/apigroupprofileupdate.php:256
 #: actions/editgroup.php:191 actions/newgroup.php:137
 #: actions/profilesettings.php:274 actions/register.php:199
 msgid "Nickname already in use. Try another one."
 msgstr ""
 
 #. TRANS: Client error in form for group creation.
+#. TRANS: API validation exception thrown when nickname does not validate.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:164 actions/apigroupprofileupdate.php:259
+#: actions/apigroupcreate.php:164 actions/apigroupprofileupdate.php:261
 #: actions/editgroup.php:195 actions/newgroup.php:141
 #: actions/profilesettings.php:244 actions/register.php:201
 msgid "Not a valid nickname."
 msgstr ""
 
 #. TRANS: Client error in form for group creation.
+#. TRANS: API validation exception thrown when homepage URL does not validate.
 #. TRANS: Validation error shown when providing an invalid homepage URL in the "Edit application" form.
 #. TRANS: Group edit form validation error.
 #. TRANS: Validation error shown when providing an invalid homepage URL in the "New application" form.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:181 actions/apigroupprofileupdate.php:277
+#: actions/apigroupcreate.php:181 actions/apigroupprofileupdate.php:280
 #: actions/editapplication.php:235 actions/editgroup.php:202
 #: actions/newapplication.php:221 actions/newgroup.php:148
 #: actions/profilesettings.php:249 actions/register.php:208
@@ -608,17 +617,20 @@ msgid "Homepage is not a valid URL."
 msgstr ""
 
 #. TRANS: Client error in form for group creation.
+#. TRANS: API validation exception thrown when full name does not validate.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:191 actions/editgroup.php:206
-#: actions/newgroup.php:152 actions/profilesettings.php:253
-#: actions/register.php:211
+#: actions/apigroupcreate.php:191 actions/apigroupprofileupdate.php:290
+#: actions/editgroup.php:206 actions/newgroup.php:152
+#: actions/profilesettings.php:253 actions/register.php:211
 msgid "Full name is too long (maximum 255 characters)."
 msgstr ""
 
 #. TRANS: Client error shown when providing too long a description during group creation.
 #. TRANS: %d is the maximum number of allowed characters.
+#. TRANS: API validation exception thrown when description does not validate.
+#. TRANS: %d is the maximum description length and used for plural.
 #. TRANS: Validation error shown when providing too long a description in the "Edit application" form.
 #. TRANS: %d is the maximum number of allowed characters.
 #. TRANS: Group edit form validation error.
@@ -626,9 +638,9 @@ msgstr ""
 #. TRANS: %d is the maximum number of characters for the description.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed characters.
-#: actions/apigroupcreate.php:201 actions/editapplication.php:202
-#: actions/editgroup.php:211 actions/newapplication.php:182
-#: actions/newgroup.php:157
+#: actions/apigroupcreate.php:201 actions/apigroupprofileupdate.php:300
+#: actions/editapplication.php:202 actions/editgroup.php:211
+#: actions/newapplication.php:182 actions/newgroup.php:157
 #, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."
@@ -636,23 +648,26 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Client error shown when providing too long a location during group creation.
+#. TRANS: API validation exception thrown when location does not validate.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:215 actions/editgroup.php:218
-#: actions/newgroup.php:164 actions/profilesettings.php:266
-#: actions/register.php:220
+#: actions/apigroupcreate.php:215 actions/apigroupprofileupdate.php:312
+#: actions/editgroup.php:218 actions/newgroup.php:164
+#: actions/profilesettings.php:266 actions/register.php:220
 msgid "Location is too long (maximum 255 characters)."
 msgstr ""
 
 #. TRANS: Client error shown when providing too many aliases during group creation.
 #. TRANS: %d is the maximum number of allowed aliases.
+#. TRANS: API validation exception thrown when aliases do not validate.
+#. TRANS: %d is the maximum number of aliases and used for plural.
 #. TRANS: Group edit form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.
-#: actions/apigroupcreate.php:236 actions/editgroup.php:231
-#: actions/newgroup.php:177
+#: actions/apigroupcreate.php:236 actions/apigroupprofileupdate.php:331
+#: actions/editgroup.php:231 actions/newgroup.php:177
 #, php-format
 msgid "Too many aliases! Maximum %d allowed."
 msgid_plural "Too many aliases! Maximum %d allowed."
@@ -661,16 +676,20 @@ msgstr[1] ""
 
 #. TRANS: Client error shown when providing an invalid alias during group creation.
 #. TRANS: %s is the invalid alias.
-#: actions/apigroupcreate.php:253
+#. TRANS: API validation exception thrown when aliases does not validate.
+#. TRANS: %s is the invalid alias.
+#: actions/apigroupcreate.php:253 actions/apigroupprofileupdate.php:349
 #, php-format
 msgid "Invalid alias: \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to use an alias during group creation that is already in use.
 #. TRANS: %s is the alias that is already in use.
+#. TRANS: API validation exception thrown when aliases is already used.
+#. TRANS: %s is the already used alias.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error. %s is the already used alias.
-#: actions/apigroupcreate.php:264 actions/apigroupprofileupdate.php:351
+#: actions/apigroupcreate.php:264 actions/apigroupprofileupdate.php:360
 #: actions/editgroup.php:246 actions/newgroup.php:193
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
@@ -678,8 +697,7 @@ msgstr ""
 
 #. TRANS: Client error displayed when trying to use an alias during group creation that is the same as the group's nickname.
 #. TRANS: Group edit form validation error.
-#: actions/apigroupcreate.php:278 actions/apigroupprofileupdate.php:359
-#: actions/editgroup.php:253
+#: actions/apigroupcreate.php:278 actions/editgroup.php:253
 msgid "Alias can't be the same as nickname."
 msgstr ""
 
@@ -687,11 +705,12 @@ msgstr ""
 #. TRANS: Client error displayed when trying to join a group that does not exist.
 #. TRANS: Client error displayed when trying to leave a group that does not exist.
 #. TRANS: Client error displayed trying to show group membership on a non-existing group.
+#. TRANS: Client error displayed when not providing a group or an invalid group.
 #. TRANS: Client error displayed when trying to show a group that could not be found.
 #. TRANS: Client error displayed requesting most recent notices to a group for a non-existing group.
 #: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
 #: actions/apigroupleave.php:104 actions/apigroupmembership.php:71
-#: actions/apigroupprofileupdate.php:113 actions/apigroupshow.php:81
+#: actions/apigroupprofileupdate.php:112 actions/apigroupshow.php:81
 #: actions/apitimelinegroup.php:89
 msgid "Group not found."
 msgstr ""
@@ -759,6 +778,7 @@ msgstr ""
 msgid "groups on %s"
 msgstr ""
 
+#. TRANS: Client error displayed when trying to edit a group without being an admin.
 #. TRANS: Client error displayed trying to edit a group while not being a group admin.
 #. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
 #. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
@@ -768,48 +788,30 @@ msgstr ""
 msgid "You must be an admin to edit the group."
 msgstr ""
 
+#. TRANS: Server error displayed when group update fails.
 #. TRANS: Server error displayed when editing a group fails.
-#: actions/apigroupprofileupdate.php:171 actions/editgroup.php:274
+#: actions/apigroupprofileupdate.php:172 actions/editgroup.php:274
 msgid "Could not update group."
 msgstr ""
 
+#. TRANS: Server error displayed when adding group aliases fails.
 #. TRANS: Server error displayed when group aliases could not be added.
 #. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/apigroupprofileupdate.php:194 actions/editgroup.php:281
+#: actions/apigroupprofileupdate.php:195 actions/editgroup.php:281
 #: classes/User_group.php:540
 msgid "Could not create aliases."
 msgstr ""
 
+#. TRANS: API validation exception thrown when nickname does not validate.
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: actions/apigroupprofileupdate.php:249 lib/nickname.php:165
+#: actions/apigroupprofileupdate.php:251 lib/nickname.php:165
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr ""
 
-#: actions/apigroupprofileupdate.php:286
-msgid "Full name is too long (max 255 chars)."
-msgstr ""
-
-#: actions/apigroupprofileupdate.php:296
-#, php-format
-msgid "description is too long (max %d chars)."
-msgstr ""
-
-#: actions/apigroupprofileupdate.php:307
-msgid "Location is too long (max 255 chars)."
-msgstr ""
-
-#: actions/apigroupprofileupdate.php:326
-#, php-format
-msgid "Too many aliases! Maximum %d."
-msgstr ""
-
-#. TRANS: Group edit form validation error.
+#. TRANS: API validation exception thrown when alias is the same as nickname.
 #. TRANS: Group create form validation error.
-#. TRANS: %s is the invalid alias.
-#: actions/apigroupprofileupdate.php:342 actions/editgroup.php:241
-#: actions/newgroup.php:188
-#, php-format
-msgid "Invalid alias: \"%s\""
+#: actions/apigroupprofileupdate.php:369 actions/newgroup.php:200
+msgid "Alias cannot be the same as nickname."
 msgstr ""
 
 #. TRANS: Client error displayed when uploading a media file has failed.
@@ -848,8 +850,8 @@ msgstr ""
 #: actions/emailsettings.php:292 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:65 actions/grouplogo.php:321
 #: actions/groupunblock.php:65 actions/imsettings.php:241
-#: actions/invite.php:60 actions/makeadmin.php:66 actions/newmessage.php:135
-#: actions/newnotice.php:105 actions/nudge.php:80
+#: actions/invite.php:60 actions/makeadmin.php:67 actions/newmessage.php:140
+#: actions/newnotice.php:104 actions/nudge.php:81
 #: actions/oauthappssettings.php:162 actions/oauthconnectionssettings.php:135
 #: actions/passwordsettings.php:137 actions/pluginenable.php:87
 #: actions/profilesettings.php:218 actions/recoverpassword.php:383
@@ -930,15 +932,17 @@ msgid "Account"
 msgstr ""
 
 #. TRANS: Field label on OAuth API authorisation form.
+#. TRANS: Field label on login page.
 #. TRANS: Field label in form for profile settings.
-#: actions/apioauthauthorize.php:459 actions/login.php:225
+#: actions/apioauthauthorize.php:459 actions/login.php:231
 #: actions/profilesettings.php:107 actions/register.php:411
 #: actions/userauthorization.php:145 lib/groupeditform.php:145
 msgid "Nickname"
 msgstr ""
 
 #. TRANS: Field label on OAuth API authorisation form.
-#: actions/apioauthauthorize.php:463 actions/login.php:228
+#. TRANS: Field label on login page.
+#: actions/apioauthauthorize.php:463 actions/login.php:235
 #: actions/register.php:415 lib/settingsnav.php:87
 msgid "Password"
 msgstr ""
@@ -1095,7 +1099,7 @@ msgstr ""
 
 #. TRANS: Client error displayed when the parameter "status" is missing.
 #. TRANS: %d is the maximum number of character for a notice.
-#: actions/apistatusesupdate.php:244 actions/newnotice.php:161
+#: actions/apistatusesupdate.php:244 actions/newnotice.php:160
 #: lib/mailhandler.php:60
 #, php-format
 msgid "That's too long. Maximum notice size is %d character."
@@ -1110,7 +1114,7 @@ msgstr ""
 
 #. TRANS: Client error displayed exceeding the maximum notice length.
 #. TRANS: %d is the maximum lenth for a notice.
-#: actions/apistatusesupdate.php:308 actions/newnotice.php:184
+#: actions/apistatusesupdate.php:308 actions/newnotice.php:183
 #, php-format
 msgid "Maximum notice size is %d character, including attachment URL."
 msgid_plural "Maximum notice size is %d characters, including attachment URL."
@@ -1387,6 +1391,7 @@ msgstr ""
 #. TRANS: Client error displayed when trying to join a non-existing group.
 #. TRANS: Client error displayed when trying to leave a non-local group.
 #. TRANS: Client error displayed when trying to leave a non-existing group.
+#. TRANS: Client error displayed when providing an invalid group ID on the Make Admin page.
 #. 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.
 #. TRANS: Command exception text shown when a group is requested that does not exist.
@@ -1401,7 +1406,7 @@ msgstr ""
 #: actions/grouprss.php:97 actions/grouprss.php:105
 #: actions/groupunblock.php:89 actions/joingroup.php:82
 #: actions/joingroup.php:95 actions/leavegroup.php:82
-#: actions/leavegroup.php:95 actions/makeadmin.php:86
+#: actions/leavegroup.php:95 actions/makeadmin.php:91
 #: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
 #: lib/command.php:392
 msgid "No such group."
@@ -1897,7 +1902,7 @@ msgstr ""
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
 #: actions/newapplication.php:112 actions/showapplication.php:113
-#: lib/action.php:1391
+#: lib/action.php:1397
 msgid "There was a problem with your session token."
 msgstr ""
 
@@ -1987,14 +1992,18 @@ msgstr ""
 #. TRANS: Client error displayed trying to block a user from a group while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying to log out when not logged in.
+#. TRANS: Client error displayed when trying to access the "make admin" page while not logged in.
+#. TRANS: Client error displayed trying to create a new direct message while not logged in.
+#. TRANS: Client error displayed trying to send a notice while not logged in.
+#. TRANS: Client error displayed trying to nudge a user without being logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
 #. TRANS: Client error displayed when trying to change user options while not logged in.
 #: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
-#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:70
-#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
-#: actions/nudge.php:63 actions/pluginenable.php:97 actions/subedit.php:33
+#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:69
+#: actions/makeadmin.php:62 actions/newmessage.php:89 actions/newnotice.php:87
+#: actions/nudge.php:64 actions/pluginenable.php:97 actions/subedit.php:33
 #: actions/subscribe.php:98 actions/tagother.php:33 actions/unsubscribe.php:52
 #: lib/adminpanelaction.php:71 lib/profileformaction.php:63
 #: lib/settingsaction.php:72
@@ -2363,6 +2372,14 @@ msgstr ""
 msgid "Use this form to edit the group."
 msgstr ""
 
+#. TRANS: Group edit form validation error.
+#. TRANS: Group create form validation error.
+#. TRANS: %s is the invalid alias.
+#: actions/editgroup.php:241 actions/newgroup.php:188
+#, php-format
+msgid "Invalid alias: \"%s\""
+msgstr ""
+
 #. TRANS: Group edit form success message.
 #: actions/editgroup.php:301
 msgid "Options saved."
@@ -2786,28 +2803,31 @@ msgstr ""
 
 #. TRANS: Client error displayed trying to block a user from a group while not specifying a to be blocked user profile.
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing a profile.
+#. TRANS: Client error displayed when not providing a profile ID on the Make Admin page.
 #. TRANS: Client error displayed trying a change a subscription without providing a profile.
 #. TRANS: Client error displayed when trying to change user options without specifying a user to work on.
 #: actions/groupblock.php:71 actions/groupunblock.php:71
-#: actions/makeadmin.php:71 actions/subedit.php:49
+#: actions/makeadmin.php:73 actions/subedit.php:49
 #: lib/profileformaction.php:79
 msgid "No profile specified."
 msgstr ""
 
 #. TRANS: Client error displayed trying to block a user from a group while specifying a non-existing profile.
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing an existing profile.
+#. TRANS: Client error displayed when specifying an invalid profile ID on the Make Admin page.
 #. TRANS: Client error displayed trying a change a subscription for a non-existant profile ID.
 #. TRANS: Client error displayed when trying to change user options without specifying an existing user to work on.
 #: actions/groupblock.php:77 actions/groupunblock.php:77
-#: actions/makeadmin.php:76 actions/subedit.php:57 actions/tagother.php:46
+#: actions/makeadmin.php:79 actions/subedit.php:57 actions/tagother.php:46
 #: actions/unsubscribe.php:84 lib/profileformaction.php:87
 msgid "No profile with that ID."
 msgstr ""
 
 #. TRANS: Client error displayed trying to block a user from a group while not specifying a group to block a profile from.
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing a group.
+#. TRANS: Client error displayed when not providing a group ID on the Make Admin page.
 #: actions/groupblock.php:83 actions/groupunblock.php:83
-#: actions/makeadmin.php:81
+#: actions/makeadmin.php:85
 msgid "No group specified."
 msgstr ""
 
@@ -2949,7 +2969,7 @@ msgid "A list of the users in this group."
 msgstr ""
 
 #. TRANS: Indicator in group members list that this user is a group administrator.
-#: actions/groupmembers.php:190 lib/action.php:581
+#: actions/groupmembers.php:190 lib/action.php:587
 msgid "Admin"
 msgstr ""
 
@@ -3334,7 +3354,8 @@ msgid "Optionally add a personal message to the invitation."
 msgstr ""
 
 #. TRANS: Send button for inviting friends
-#: actions/invite.php:232
+#. TRANS: Button text for sending notice.
+#: actions/invite.php:232 lib/noticeform.php:254
 msgctxt "BUTTON"
 msgid "Send"
 msgstr ""
@@ -3414,186 +3435,231 @@ msgid "%1$s left group %2$s"
 msgstr ""
 
 #. TRANS: User admin panel title
-#: actions/licenseadminpanel.php:55
+#: actions/licenseadminpanel.php:54
 msgctxt "TITLE"
 msgid "License"
 msgstr ""
 
+#. TRANS: Form instructions for the site license admin panel.
 #: actions/licenseadminpanel.php:65
 msgid "License for this StatusNet site"
 msgstr ""
 
-#: actions/licenseadminpanel.php:134
+#. TRANS: Client error displayed selecting an invalid license in the license admin panel.
+#: actions/licenseadminpanel.php:135
 msgid "Invalid license selection."
 msgstr ""
 
-#: actions/licenseadminpanel.php:144
+#. TRANS: Client error displayed when not specifying an owner for the all rights reserved license in the license admin panel.
+#: actions/licenseadminpanel.php:146
 msgid ""
 "You must specify the owner of the content when using the All Rights Reserved "
 "license."
 msgstr ""
 
-#: actions/licenseadminpanel.php:151
+#. TRANS: Client error displayed selecting a too long license title in the license admin panel.
+#: actions/licenseadminpanel.php:154
 msgid "Invalid license title. Maximum length is 255 characters."
 msgstr ""
 
-#: actions/licenseadminpanel.php:163
+#. TRANS: Client error displayed specifying an invalid license URL in the license admin panel.
+#: actions/licenseadminpanel.php:167
 msgid "Invalid license URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:166
+#. TRANS: Client error displayed specifying an invalid license image URL in the license admin panel.
+#: actions/licenseadminpanel.php:171
 msgid "Invalid license image URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:174
+#. TRANS: Client error displayed specifying an invalid license URL in the license admin panel.
+#: actions/licenseadminpanel.php:180
 msgid "License URL must be blank or a valid URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:182
+#. TRANS: Client error displayed specifying an invalid license image URL in the license admin panel.
+#: actions/licenseadminpanel.php:189
 msgid "License image must be blank or valid URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:232
+#. TRANS: Form legend in the license admin panel.
+#: actions/licenseadminpanel.php:240
 msgid "License selection"
 msgstr ""
 
-#: actions/licenseadminpanel.php:238
+#. TRANS: License option in the license admin panel.
+#: actions/licenseadminpanel.php:247
 msgid "Private"
 msgstr ""
 
-#: actions/licenseadminpanel.php:239
+#. TRANS: License option in the license admin panel.
+#: actions/licenseadminpanel.php:249
 msgid "All Rights Reserved"
 msgstr ""
 
-#: actions/licenseadminpanel.php:240
+#. TRANS: License option in the license admin panel.
+#: actions/licenseadminpanel.php:251
 msgid "Creative Commons"
 msgstr ""
 
-#: actions/licenseadminpanel.php:245
+#. TRANS: Dropdown field label in the license admin panel.
+#: actions/licenseadminpanel.php:257
 msgid "Type"
 msgstr ""
 
-#: actions/licenseadminpanel.php:247
-msgid "Select license"
+#. TRANS: Dropdown field instructions in the license admin panel.
+#: actions/licenseadminpanel.php:260
+msgid "Select a license."
 msgstr ""
 
-#: actions/licenseadminpanel.php:261
+#. TRANS: Form legend in the license admin panel.
+#: actions/licenseadminpanel.php:275
 msgid "License details"
 msgstr ""
 
-#: actions/licenseadminpanel.php:267
+#. TRANS: Field label in the license admin panel.
+#: actions/licenseadminpanel.php:282
 msgid "Owner"
 msgstr ""
 
-#: actions/licenseadminpanel.php:268
+#. TRANS: Field title in the license admin panel.
+#: actions/licenseadminpanel.php:284
 msgid "Name of the owner of the site's content (if applicable)."
 msgstr ""
 
-#: actions/licenseadminpanel.php:276
+#. TRANS: Field label in the license admin panel.
+#: actions/licenseadminpanel.php:293
 msgid "License Title"
 msgstr ""
 
-#: actions/licenseadminpanel.php:277
+#. TRANS: Field title in the license admin panel.
+#: actions/licenseadminpanel.php:295
 msgid "The title of the license."
 msgstr ""
 
-#: actions/licenseadminpanel.php:285
+#. TRANS: Field label in the license admin panel.
+#: actions/licenseadminpanel.php:304
 msgid "License URL"
 msgstr ""
 
-#: actions/licenseadminpanel.php:286
+#. TRANS: Field title in the license admin panel.
+#: actions/licenseadminpanel.php:306
 msgid "URL for more information about the license."
 msgstr ""
 
-#: actions/licenseadminpanel.php:293
+#. TRANS: Field label in the license admin panel.
+#: actions/licenseadminpanel.php:314
 msgid "License Image URL"
 msgstr ""
 
-#: actions/licenseadminpanel.php:294
+#. TRANS: Field title in the license admin panel.
+#: actions/licenseadminpanel.php:316
 msgid "URL for an image to display with the license."
 msgstr ""
 
-#. TRANS: Submit button title.
-#: actions/licenseadminpanel.php:311 actions/sessionsadminpanel.php:199
-#: actions/siteadminpanel.php:292 actions/snapshotadminpanel.php:245
-#: actions/tagother.php:133 lib/applicationeditform.php:357
-msgid "Save"
-msgstr ""
-
-#: actions/licenseadminpanel.php:311
-msgid "Save license settings"
+#. TRANS: Button title in the license admin panel.
+#: actions/licenseadminpanel.php:339
+msgid "Save license settings."
 msgstr ""
 
+#. TRANS: Client error displayed when trying to log in while already logged in.
 #. TRANS: Client error displayed trying to use "one time password login" when already logged in.
-#: actions/login.php:97 actions/otp.php:62 actions/register.php:130
+#: actions/login.php:98 actions/otp.php:62 actions/register.php:130
 msgid "Already logged in."
 msgstr ""
 
-#: actions/login.php:125
+#. TRANS: Form validation error displayed when trying to log in with incorrect credentials.
+#: actions/login.php:127
 msgid "Incorrect username or password."
 msgstr ""
 
+#. TRANS: Server error displayed when during login a server error occurs.
 #. TRANS: Server error displayed when a user object could not be created trying to login using "one time password login".
-#: actions/login.php:131 actions/otp.php:127
+#: actions/login.php:134 actions/otp.php:127
 msgid "Error setting user. You are probably not authorized."
 msgstr ""
 
-#: actions/login.php:185 actions/login.php:236 lib/action.php:598
+#. TRANS: Page title for login page.
+#: actions/login.php:189 lib/action.php:604
 msgid "Login"
 msgstr ""
 
-#: actions/login.php:222
+#. TRANS: Form legend on login page.
+#: actions/login.php:227
 msgid "Login to site"
 msgstr ""
 
-#: actions/login.php:231 actions/register.php:469
+#. TRANS: Checkbox label label on login page.
+#: actions/login.php:239 actions/register.php:469
 msgid "Remember me"
 msgstr ""
 
-#: actions/login.php:232 actions/register.php:471
+#. TRANS: Checkbox title on login page.
+#: actions/login.php:241 actions/register.php:471
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 
-#: actions/login.php:241
+#. TRANS: Button text for log in on login page.
+#: actions/login.php:246
+msgctxt "BUTTON"
+msgid "Login"
+msgstr ""
+
+#. TRANS: Link text for link to "reset password" on login page.
+#: actions/login.php:252
 msgid "Lost or forgotten password?"
 msgstr ""
 
-#: actions/login.php:259
+#. TRANS: Form instructions on login page before being able to change user settings.
+#: actions/login.php:271
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
 msgstr ""
 
-#: actions/login.php:263
+#. TRANS: Form instructions on login page.
+#: actions/login.php:276
 msgid "Login with your username and password."
 msgstr ""
 
-#: actions/login.php:266
+#. TRANS: Form instructions on login page. This message contains Markdown links in the form [Link text](Link).
+#. TRANS: %%action.register%% is a link to the registration page.
+#: actions/login.php:281
 #, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
 msgstr ""
 
-#: actions/makeadmin.php:92
+#. TRANS: Client error displayed when trying to make another user admin on the Make Admin page while not an admin.
+#: actions/makeadmin.php:98
 msgid "Only an admin can make another user an admin."
 msgstr ""
 
-#: actions/makeadmin.php:96
+#. TRANS: Client error displayed when trying to make another user admin on the Make Admin page who already is admin.
+#. TRANS: %1$s is the user that is already admin, %2$s is the group user is already admin for.
+#: actions/makeadmin.php:104
 #, php-format
 msgid "%1$s is already an admin for group \"%2$s\"."
 msgstr ""
 
-#: actions/makeadmin.php:133
+#. TRANS: Server error displayed when trying to make another user admin on the Make Admin page fails
+#. TRANS: because the group membership record could not be gotten.
+#. TRANS: %1$s is the to be admin user, %2$s is the group user should be admin for.
+#: actions/makeadmin.php:144
 #, php-format
 msgid "Can't get membership record for %1$s in group %2$s."
 msgstr ""
 
-#: actions/makeadmin.php:146
+#. TRANS: Server error displayed when trying to make another user admin on the Make Admin page fails
+#. TRANS: because the group adminship record coud not be saved properly.
+#. TRANS: %1$s is the to be admin user, %2$s is the group user is already admin for.
+#: actions/makeadmin.php:160
 #, php-format
 msgid "Can't make %1$s an admin for group %2$s."
 msgstr ""
 
-#: actions/microsummary.php:69
+#. TRANS: Client error displayed trying to make a micro summary without providing a status.
+#: actions/microsummary.php:71
 msgid "No current status."
 msgstr ""
 
@@ -3637,56 +3703,65 @@ msgstr ""
 msgid "Use this form to create a new group."
 msgstr ""
 
-#. TRANS: Group create form validation error.
-#: actions/newgroup.php:200
-msgid "Alias cannot be the same as nickname."
-msgstr ""
-
-#: actions/newmessage.php:71 actions/newmessage.php:234
+#. TRANS: Page title for new direct message page.
+#. TRANS: Page title on page for sending a direct message.
+#: actions/newmessage.php:72 actions/newmessage.php:249
 msgid "New message"
 msgstr ""
 
-#. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
-#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:513
-msgid "You can't send a message to this user."
+#. TRANS: Client error displayed trying to send a direct message to a user while sender and
+#. TRANS: receiver are not subscribed to each other.
+#: actions/newmessage.php:126 actions/newmessage.php:173
+msgid "You cannot send a message to this user."
 msgstr ""
 
+#. TRANS: Form validator error displayed trying to send a direct message without content.
+#. TRANS: Client error displayed trying to send a notice without content.
 #. TRANS: Command exception text shown when trying to send a direct message to another user without content.
 #. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
-#: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:490
+#: actions/newmessage.php:150 actions/newnotice.php:139 lib/command.php:490
 #: lib/command.php:593
 msgid "No content!"
 msgstr ""
 
-#: actions/newmessage.php:161
+#. TRANS: Form validation error displayed trying to send a direct message without specifying a recipient.
+#: actions/newmessage.php:168
 msgid "No recipient specified."
 msgstr ""
 
+#. TRANS: Client error displayed trying to send a direct message to self.
 #. TRANS: Error text shown when trying to send a direct message to self.
-#: actions/newmessage.php:167 lib/command.php:517
+#: actions/newmessage.php:177 lib/command.php:517
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
 
-#: actions/newmessage.php:184
+#. TRANS: Page title after sending a direct message.
+#: actions/newmessage.php:195
 msgid "Message sent"
 msgstr ""
 
+#. TRANS: Confirmation text after sending a direct message.
+#. TRANS: %s is the direct message recipient.
 #. TRANS: Message given have sent a direct message to another user.
 #. TRANS: %s is the name of the other user.
-#: actions/newmessage.php:188 lib/command.php:525
+#: actions/newmessage.php:201 lib/command.php:525
 #, php-format
 msgid "Direct message to %s sent."
 msgstr ""
 
-#: actions/newmessage.php:213 actions/newnotice.php:264
+#. TRANS: Page title after an AJAX error occurred on the "send direct message" page.
+#. TRANS: Page title after an AJAX error occurs on the send notice page.
+#: actions/newmessage.php:227 actions/newnotice.php:264
 msgid "Ajax Error"
 msgstr ""
 
-#: actions/newnotice.php:69
+#. TRANS: Page title for sending a new notice.
+#: actions/newnotice.php:67 actions/newnotice.php:285
 msgid "New notice"
 msgstr ""
 
+#. TRANS: Page title after sending a notice.
 #: actions/newnotice.php:230
 msgid "Notice posted"
 msgstr ""
@@ -3743,17 +3818,20 @@ msgstr ""
 msgid "Updates matching search term \"%1$s\" on %2$s."
 msgstr ""
 
-#: actions/nudge.php:85
+#. TRANS: Client error displayed trying to nudge a user that cannot be nudged.
+#: actions/nudge.php:87
 msgid ""
 "This user doesn't allow nudges or hasn't confirmed or set their email "
 "address yet."
 msgstr ""
 
-#: actions/nudge.php:94
+#. TRANS: Page title after sending a nudge.
+#: actions/nudge.php:97
 msgid "Nudge sent"
 msgstr ""
 
-#: actions/nudge.php:97
+#. TRANS: Confirmation text after sending a nudge.
+#: actions/nudge.php:101
 msgid "Nudge sent!"
 msgstr ""
 
@@ -3824,49 +3902,60 @@ msgid ""
 "this instance of StatusNet."
 msgstr ""
 
-#: actions/oembed.php:64
+#. TRANS: Server error displayed in oEmbed action when path not found.
+#. TRANS: %s is a path.
+#: actions/oembed.php:66
 #, php-format
 msgid "\"%s\" not found."
 msgstr ""
 
-#: actions/oembed.php:76
+#. TRANS: Server error displayed in oEmbed action when notice not found.
+#. TRANS: %s is a notice.
+#: actions/oembed.php:80
 #, php-format
 msgid "Notice %s not found."
 msgstr ""
 
-#: actions/oembed.php:80 actions/shownotice.php:100
+#. TRANS: Server error displayed in oEmbed action when notice has not profile.
+#: actions/oembed.php:85 actions/shownotice.php:100
 msgid "Notice has no profile."
 msgstr ""
 
-#: actions/oembed.php:83 actions/shownotice.php:172
+#. TRANS: oEmbed title. %1$s is the author name, %2$s is the creation date.
+#: actions/oembed.php:89 actions/shownotice.php:172
 #, php-format
 msgid "%1$s's status on %2$s"
 msgstr ""
 
-#: actions/oembed.php:95
+#. TRANS: Server error displayed in oEmbed action when attachment not found.
+#. TRANS: %d is an attachment ID.
+#: actions/oembed.php:103
 #, php-format
 msgid "Attachment %s not found."
 msgstr ""
 
-#: actions/oembed.php:136
+#. TRANS: Server error displayed in oEmbed request when a path is not supported.
+#. TRANS: %s is a path.
+#: actions/oembed.php:146
 #, php-format
 msgid "\"%s\" not supported for oembed requests."
 msgstr ""
 
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
-#: actions/oembed.php:168
+#: actions/oembed.php:178
 #, php-format
 msgid "Content type %s not supported."
 msgstr ""
 
 #. TRANS: Error message displaying attachments. %s is the site's base URL.
-#: actions/oembed.php:172
+#: actions/oembed.php:182
 #, php-format
 msgid "Only %s URLs over plain HTTP please."
 msgstr ""
 
+#. TRANS: Server error displayed in oEmbed action when request specifies an unsupported data format.
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1207
+#: actions/oembed.php:204 actions/oembed.php:224 lib/apiaction.php:1207
 #: lib/apiaction.php:1234 lib/apiaction.php:1369
 msgid "Not a supported data format."
 msgstr ""
@@ -3876,6 +3965,7 @@ msgstr ""
 msgid "People Search"
 msgstr ""
 
+#. TRANS: ShortName in the OpenSearch interface when trying to find notices.
 #: actions/opensearch.php:68
 msgid "Notice Search"
 msgstr ""
@@ -5159,6 +5249,13 @@ msgstr ""
 msgid "Turn on debugging output for sessions."
 msgstr ""
 
+#. TRANS: Submit button title.
+#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
+#: actions/snapshotadminpanel.php:245 actions/tagother.php:133
+#: lib/applicationeditform.php:357
+msgid "Save"
+msgstr ""
+
 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
 msgid "Save site settings"
 msgstr ""
@@ -6181,7 +6278,7 @@ msgstr ""
 msgid "Invalid default subscripton: \"%1$s\" is not a user."
 msgstr ""
 
-#: actions/useradminpanel.php:215 lib/action.php:565 lib/settingsnav.php:77
+#: actions/useradminpanel.php:215 lib/action.php:571 lib/settingsnav.php:77
 #: lib/subgroupnav.php:81
 msgid "Profile"
 msgstr ""
@@ -6476,7 +6573,7 @@ msgid "Name"
 msgstr ""
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:885
+#: actions/version.php:198 lib/action.php:891
 msgid "Version"
 msgstr ""
 
@@ -6842,112 +6939,112 @@ msgid "Untitled page"
 msgstr ""
 
 #. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.
-#: lib/action.php:325
+#: lib/action.php:331
 msgctxt "TOOLTIP"
 msgid "Show more"
 msgstr ""
 
 #. TRANS: Inline reply form submit button: submits a reply comment.
-#: lib/action.php:328
+#: lib/action.php:334
 msgctxt "BUTTON"
-msgid "Comment"
+msgid "Reply"
 msgstr ""
 
 #. TRANS: Placeholder text for inline reply form. Clicking in this box will turn it into a mini notice form.
-#: lib/action.php:331
-msgid "Add a comment..."
+#: lib/action.php:337
+msgid "Write a reply..."
 msgstr ""
 
-#: lib/action.php:559 lib/personalgroupnav.php:99
+#: lib/action.php:565 lib/personalgroupnav.php:99
 msgid "Home"
 msgstr ""
 
-#: lib/action.php:560
+#: lib/action.php:566
 msgid "Friends timeline"
 msgstr ""
 
-#: lib/action.php:566
+#: lib/action.php:572
 msgid "Your profile"
 msgstr ""
 
-#: lib/action.php:570 lib/action.php:593 lib/publicgroupnav.php:78
+#: lib/action.php:576 lib/action.php:599 lib/publicgroupnav.php:78
 msgid "Public"
 msgstr ""
 
-#: lib/action.php:571 lib/action.php:594
+#: lib/action.php:577 lib/action.php:600
 msgid "Everyone on this site"
 msgstr ""
 
-#: lib/action.php:575
+#: lib/action.php:581
 msgid "Settings"
 msgstr ""
 
-#: lib/action.php:576
+#: lib/action.php:582
 msgid "Change your personal settings"
 msgstr ""
 
-#: lib/action.php:582
+#: lib/action.php:588
 msgid "Site configuration"
 msgstr ""
 
-#: lib/action.php:587
+#: lib/action.php:593
 msgid "Logout"
 msgstr ""
 
-#: lib/action.php:588
+#: lib/action.php:594
 msgid "Logout from the site"
 msgstr ""
 
-#: lib/action.php:599
+#: lib/action.php:605
 msgid "Login to the site"
 msgstr ""
 
-#: lib/action.php:606
+#: lib/action.php:612
 msgid "Search"
 msgstr ""
 
-#: lib/action.php:607
+#: lib/action.php:613
 msgid "Search the site"
 msgstr ""
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:864
+#: lib/action.php:870
 msgid "Help"
 msgstr ""
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:867
+#: lib/action.php:873
 msgid "About"
 msgstr ""
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:870
+#: lib/action.php:876
 msgid "FAQ"
 msgstr ""
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:875
+#: lib/action.php:881
 msgid "TOS"
 msgstr ""
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:879
+#: lib/action.php:885
 msgid "Privacy"
 msgstr ""
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:882
+#: lib/action.php:888
 msgid "Source"
 msgstr ""
 
 #. TRANS: Secondary navigation menu option leading to e-mail contact information on the
 #. TRANS: StatusNet site, where to report bugs, ...
-#: lib/action.php:889
+#: lib/action.php:895
 msgid "Contact"
 msgstr ""
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:892
+#: lib/action.php:898
 msgid "Badge"
 msgstr ""
 
@@ -6955,7 +7052,7 @@ msgstr ""
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:921
+#: lib/action.php:927
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -6963,7 +7060,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:924
+#: lib/action.php:930
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr ""
@@ -6972,7 +7069,7 @@ msgstr ""
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:931
+#: lib/action.php:937
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -6982,39 +7079,39 @@ msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:949
+#: lib/action.php:955
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:956
+#: lib/action.php:962
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:960
+#: lib/action.php:966
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:992
+#: lib/action.php:998
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1335
+#: lib/action.php:1341
 msgid "After"
 msgstr ""
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1345
+#: lib/action.php:1351
 msgid "Before"
 msgstr ""
 
@@ -7591,6 +7688,11 @@ msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
 msgstr[0] ""
 msgstr[1] ""
 
+#. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
+#: lib/command.php:513
+msgid "You can't send a message to this user."
+msgstr ""
+
 #. TRANS: Error text shown sending a direct message fails with an unknown reason.
 #: lib/command.php:528
 msgid "Error sending direct message."
@@ -8548,7 +8650,7 @@ msgstr ""
 msgid "To"
 msgstr ""
 
-#: lib/messageform.php:184 lib/noticeform.php:236
+#: lib/messageform.php:183
 msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr ""
@@ -8574,32 +8676,39 @@ msgid_plural "Nickname cannot be more than %d characters long."
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/noticeform.php:160
+#. TRANS: Form legend for notice form.
+#: lib/noticeform.php:157
 msgid "Send a notice"
 msgstr ""
 
-#: lib/noticeform.php:174
+#. TRANS: Title for notice label. %s is the user's nickname.
+#: lib/noticeform.php:171
 #, php-format
 msgid "What's up, %s?"
 msgstr ""
 
-#: lib/noticeform.php:193
+#. TRANS: Input label in notice form for adding an attachment.
+#: lib/noticeform.php:190
 msgid "Attach"
 msgstr ""
 
-#: lib/noticeform.php:197
-msgid "Attach a file"
+#. TRANS: Title for input field to attach a file to a notice.
+#: lib/noticeform.php:195
+msgid "Attach a file."
 msgstr ""
 
-#: lib/noticeform.php:212
+#. TRANS: Field label to add location to a notice.
+#: lib/noticeform.php:224
 msgid "Share my location"
 msgstr ""
 
-#: lib/noticeform.php:215
+#. TRANS: Text to not share location for a notice in notice form.
+#: lib/noticeform.php:228
 msgid "Do not share my location"
 msgstr ""
 
-#: lib/noticeform.php:216
+#. TRANS: Timeout error text for location retrieval in notice form.
+#: lib/noticeform.php:230
 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
 "try again later"
@@ -9043,8 +9152,8 @@ msgstr ""
 
 #: lib/threadednoticelist.php:270
 #, php-format
-msgid "Show all %d comment"
-msgid_plural "Show all %d comments"
+msgid "Show %d reply"
+msgid_plural "Show all %d replies"
 msgstr[0] ""
 msgstr[1] ""
 
diff --git a/locale/sv/LC_MESSAGES/statusnet.po b/locale/sv/LC_MESSAGES/statusnet.po
index 83eeb283ab..90c09d93b6 100644
--- a/locale/sv/LC_MESSAGES/statusnet.po
+++ b/locale/sv/LC_MESSAGES/statusnet.po
@@ -13,68 +13,58 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:23+0000\n"
-"PO-Revision-Date: 2011-03-03 17:26:27+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:38+0000\n"
 "Language-Team: Swedish <http://translatewiki.net/wiki/Portal:sv>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: sv\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-02-25 23:49:23+0000\n"
+"X-POT-Import-Date: 2011-03-03 17:59:19+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
-#: actions/accessadminpanel.php:53 lib/adminpanelaction.php:363
 msgid "Access"
 msgstr "Åtkomst"
 
 #. TRANS: Page notice.
-#: actions/accessadminpanel.php:64
 msgid "Site access settings"
 msgstr "Inställningar för webbplatsåtkomst"
 
 #. TRANS: Form legend for registration form.
-#: actions/accessadminpanel.php:151
 msgid "Registration"
 msgstr "Registrering"
 
 #. TRANS: Checkbox instructions for admin setting "Private".
-#: actions/accessadminpanel.php:155
 msgid "Prohibit anonymous users (not logged in) from viewing site?"
 msgstr ""
 "Skall anonyma användare (inte inloggade) förhindras från att se webbplatsen?"
 
 #. TRANS: Checkbox label for prohibiting anonymous users from viewing site.
-#: actions/accessadminpanel.php:157
 msgctxt "LABEL"
 msgid "Private"
 msgstr "Privat"
 
 #. TRANS: Checkbox instructions for admin setting "Invite only".
-#: actions/accessadminpanel.php:164
 msgid "Make registration invitation only."
 msgstr "Gör så att registrering endast sker genom inbjudan."
 
 #. TRANS: Checkbox label for configuring site as invite only.
-#: actions/accessadminpanel.php:166
 msgid "Invite only"
 msgstr "Endast inbjudan"
 
 #. TRANS: Checkbox instructions for admin setting "Closed" (no new registrations).
-#: actions/accessadminpanel.php:173
 msgid "Disable new registrations."
 msgstr "Inaktivera nya registreringar."
 
 #. TRANS: Checkbox label for disabling new user registrations.
-#: actions/accessadminpanel.php:175
 msgid "Closed"
 msgstr "Stängd"
 
 #. TRANS: Title for button to save access settings in site admin panel.
-#: actions/accessadminpanel.php:191
 msgid "Save access settings"
 msgstr "Spara inställningar för åtkomst"
 
@@ -82,6 +72,7 @@ msgstr "Spara inställningar för åtkomst"
 #. TRANS: Button text for saving theme settings.
 #. TRANS: Button label to save e-mail preferences.
 #. TRANS: Button label to save IM preferences.
+#. TRANS: Button text in the license admin panel.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
 #. TRANS: Button text for saving site notice in admin panel.
@@ -91,21 +82,12 @@ msgstr "Spara inställningar för åtkomst"
 #. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
 #. TRANS: Button text on profile design page to save settings.
-#: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
-#: actions/emailsettings.php:251 actions/imsettings.php:199
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:198
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:204
-#: actions/subscriptions.php:261 actions/urlsettings.php:152
-#: actions/useradminpanel.php:298 lib/applicationeditform.php:355
-#: lib/designform.php:320 lib/groupeditform.php:201
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Spara"
 
 #. TRANS: Server error when page not found (404).
 #. TRANS: Server error when page not found (404)
-#: actions/all.php:68 actions/public.php:98 actions/replies.php:93
-#: actions/showfavorites.php:140 actions/tag.php:52
 msgid "No such page."
 msgstr "Ingen sådan sida"
 
@@ -124,6 +106,7 @@ msgstr "Ingen sådan sida"
 #. TRANS: Client error displayed when checking group membership for a non-existing user.
 #. TRANS: Client error displayed when trying to have a non-existing user join a group.
 #. TRANS: Client error displayed when trying to have a non-existing user leave a group.
+#. TRANS: Client error displayed when not providing a user or an invalid user.
 #. TRANS: Client error displayed when updating a status for a non-existing user.
 #. TRANS: Client error displayed when requesting a list of followers for a non-existing user.
 #. TRANS: Client error displayed when requesting most recent favourite notices by a user for a non-existing user.
@@ -136,6 +119,8 @@ msgstr "Ingen sådan sida"
 #. 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.
 #. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
@@ -143,33 +128,10 @@ msgstr "Ingen sådan sida"
 #. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when calling a profile action without specifying a user.
-#: actions/all.php:80 actions/allrss.php:69
-#: actions/apiaccountupdatedeliverydevice.php:110
-#: actions/apiaccountupdateprofile.php:103
-#: actions/apiaccountupdateprofilebackgroundimage.php:118
-#: actions/apiaccountupdateprofileimage.php:104 actions/apiatomservice.php:59
-#: actions/apiblockcreate.php:96 actions/apiblockdestroy.php:94
-#: actions/apidirectmessage.php:75 actions/apidirectmessagenew.php:72
-#: actions/apigroupcreate.php:111 actions/apigroupismember.php:89
-#: actions/apigroupjoin.php:98 actions/apigroupleave.php:98
-#: actions/apigrouplist.php:70 actions/apigroupprofileupdate.php:108
-#: actions/apistatusesupdate.php:230 actions/apisubscriptions.php:85
-#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:173
-#: actions/apitimelinehome.php:78 actions/apitimelinementions.php:77
-#: actions/apitimelineuser.php:79 actions/avatarbynickname.php:79
-#: actions/favoritesrss.php:72 actions/foaf.php:42 actions/foaf.php:61
-#: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116
-#: actions/otp.php:78 actions/remotesubscribe.php:144
-#: actions/remotesubscribe.php:153 actions/replies.php:73
-#: actions/repliesrss.php:38 actions/rsd.php:113 actions/showfavorites.php:106
-#: actions/userbyid.php:75 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/userxrd.php:59 actions/xrds.php:71 lib/command.php:509
-#: lib/galleryaction.php:59 lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Ingen sådan användare."
 
 #. TRANS: Page title. %1$s is user nickname, %2$d is page number
-#: actions/all.php:91
 #, php-format
 msgid "%1$s and friends, page %2$d"
 msgstr "%1$s och vänner, sida %2$d"
@@ -178,33 +140,26 @@ msgstr "%1$s och vänner, sida %2$d"
 #. TRANS: H1 text for page. %s is a user nickname.
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Timeline title for user and friends. %s is a user nickname.
-#: actions/all.php:94 actions/all.php:191 actions/allrss.php:117
-#: actions/apitimelinefriends.php:207 actions/apitimelinehome.php:113
-#: lib/personalgroupnav.php:100
 #, php-format
 msgid "%s and friends"
 msgstr "%s och vänner"
 
 #. TRANS: %s is user nickname.
-#: actions/all.php:108
 #, php-format
 msgid "Feed for friends of %s (RSS 1.0)"
 msgstr "Flöden för %ss vänner (RSS 1.0)"
 
 #. TRANS: %s is user nickname.
-#: actions/all.php:117
 #, php-format
 msgid "Feed for friends of %s (RSS 2.0)"
 msgstr "Flöden för %ss vänner (RSS 2.0)"
 
 #. TRANS: %s is user nickname.
-#: actions/all.php:126
 #, php-format
 msgid "Feed for friends of %s (Atom)"
 msgstr "Flöden för %ss vänner (Atom)"
 
 #. TRANS: Empty list message. %s is a user nickname.
-#: actions/all.php:139
 #, php-format
 msgid ""
 "This is the timeline for %s and friends but no one has posted anything yet."
@@ -212,7 +167,6 @@ msgstr "Detta är tidslinjen för %s och vänner, men ingen har skrivit något 
 
 #. TRANS: Encouragement displayed on logged in user's empty timeline.
 #. TRANS: This message contains Markdown links. Keep "](" together.
-#: actions/all.php:146
 #, php-format
 msgid ""
 "Try subscribing to more people, [join a group](%%action.groups%%) or post "
@@ -223,7 +177,6 @@ msgstr ""
 
 #. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@".
 #. TRANS: This message contains Markdown links. Keep "](" together.
-#: actions/all.php:150
 #, php-format
 msgid ""
 "You can try to [nudge %1$s](../%2$s) from their profile or [post something "
@@ -236,7 +189,6 @@ msgstr ""
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
 #. TRANS: Second sentence of empty message for anonymous users. %s is a user nickname.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:221
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -246,14 +198,11 @@ msgstr ""
 "posta en!"
 
 #. TRANS: H1 text for page when viewing a list for self.
-#: actions/all.php:188
 msgid "You and friends"
 msgstr "Du och vänner"
 
 #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
 #. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name.
-#: actions/allrss.php:122 actions/apitimelinefriends.php:213
-#: actions/apitimelinehome.php:119
 #, php-format
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr "Uppdateringar från %1$s och vänner på %2$s!"
@@ -272,55 +221,20 @@ msgstr "Uppdateringar från %1$s och vänner på %2$s!"
 #. TRANS: Client error displayed trying to execute an unknown API method checking group membership.
 #. TRANS: Client error displayed trying to execute an unknown API method listing the latest 20 groups.
 #. TRANS: Client error displayed trying to execute an unknown API method showing group membership.
+#. TRANS: Client error displayed when using an unsupported API format.
 #. TRANS: Client error displayed trying to execute an unknown API method showing a group.
 #. TRANS: Client error displayed trying to execute an unknown API method testing API connectivity.
 #. TRANS: Client error displayed trying to execute an unknown API method deleting a status.
 #. TRANS: Client error displayed when trying to handle an unknown API method.
-#: actions/apiaccountratelimitstatus.php:69
-#: actions/apiaccountupdatedeliverydevice.php:92
-#: actions/apiaccountupdateprofile.php:94
-#: actions/apiaccountupdateprofilebackgroundimage.php:92
-#: actions/apiaccountupdateprofilecolors.php:115
-#: actions/apiaccountverifycredentials.php:68 actions/apidirectmessage.php:157
-#: actions/apifavoritecreate.php:98 actions/apifavoritedestroy.php:98
-#: actions/apifriendshipscreate.php:99 actions/apifriendshipsdestroy.php:99
-#: actions/apifriendshipsshow.php:124 actions/apigroupcreate.php:138
-#: actions/apigroupismember.php:115 actions/apigroupjoin.php:151
-#: actions/apigroupleave.php:141 actions/apigrouplist.php:134
-#: actions/apigrouplistall.php:120 actions/apigroupmembership.php:105
-#: actions/apigroupprofileupdate.php:100 actions/apigroupprofileupdate.php:213
-#: actions/apigroupshow.php:114 actions/apihelptest.php:84
-#: actions/apistatusesdestroy.php:101 actions/apistatusesretweets.php:110
-#: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:139
-#: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
-#: actions/apitimelinefavorites.php:182 actions/apitimelinefriends.php:276
-#: actions/apitimelinegroup.php:148 actions/apitimelinehome.php:181
-#: actions/apitimelinementions.php:182 actions/apitimelinepublic.php:247
-#: actions/apitimelineretweetedtome.php:147
-#: actions/apitimelineretweetsofme.php:147 actions/apitimelinetag.php:165
-#: actions/apitimelineuser.php:217 actions/apiusershow.php:100
 msgid "API method not found."
 msgstr "API-metod hittades inte."
 
 #. 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.
-#: actions/apiaccountupdatedeliverydevice.php:83
-#: actions/apiaccountupdateprofile.php:85
-#: actions/apiaccountupdateprofilebackgroundimage.php:83
-#: actions/apiaccountupdateprofilecolors.php:106
-#: actions/apiaccountupdateprofileimage.php:80 actions/apiblockcreate.php:87
-#: actions/apiblockdestroy.php:85 actions/apidirectmessagenew.php:107
-#: actions/apifavoritecreate.php:88 actions/apifavoritedestroy.php:88
-#: actions/apifriendshipscreate.php:89 actions/apifriendshipsdestroy.php:89
-#: actions/apigroupcreate.php:102 actions/apigroupjoin.php:89
-#: actions/apigroupleave.php:89 actions/apigroupprofileupdate.php:92
-#: actions/apimediaupload.php:66 actions/apistatusesretweet.php:63
-#: actions/apistatusesupdate.php:194
 msgid "This method requires a POST."
 msgstr "Denna metod kräver en POST."
 
 #. TRANS: Client error displayed when no valid device parameter is provided for a user's delivery device setting.
-#: actions/apiaccountupdatedeliverydevice.php:103
 msgid ""
 "You must specify a parameter named 'device' with a value of one of: sms, im, "
 "none."
@@ -333,10 +247,6 @@ msgstr "Du måste ange ett värdet på parametern 'device': sms, im, none"
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
-#: actions/apiaccountupdatedeliverydevice.php:136
-#: actions/emailsettings.php:353 actions/emailsettings.php:499
-#: actions/profilesettings.php:323 actions/smssettings.php:300
-#: actions/smssettings.php:453 actions/urlsettings.php:211
 msgid "Could not update user."
 msgstr "Kunde inte uppdatera användare."
 
@@ -349,32 +259,17 @@ msgstr "Kunde inte uppdatera användare."
 #. TRANS: Server error displayed when requesting Friends of a Friend feed for a user for which the profile could not be found.
 #. TRANS: Server error displayed when trying to get a user hCard for a user without a profile.
 #. TRANS: Server error displayed when calling a profile action while the specified user does not have a profile.
-#: actions/apiaccountupdateprofile.php:111
-#: actions/apiaccountupdateprofilebackgroundimage.php:199
-#: actions/apiaccountupdateprofilecolors.php:183
-#: actions/apiaccountupdateprofileimage.php:131
-#: actions/apiuserprofileimage.php:88 actions/apiusershow.php:108
-#: actions/avatarbynickname.php:85 actions/foaf.php:69 actions/hcard.php:75
-#: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
-#: lib/profileaction.php:85
 msgid "User has no profile."
 msgstr "Användaren har ingen profil."
 
 #. TRANS: Server error displayed if a user profile could not be saved.
 #. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:419
 msgid "Could not save profile."
 msgstr "Kunde inte spara profil."
 
 #. TRANS: Client error displayed when the number of bytes in a POST request exceeds a limit.
 #. TRANS: %s is the number of bytes of the CONTENT_LENGTH.
 #. TRANS: Form validation error in design settings form. POST should remain untranslated.
-#: actions/apiaccountupdateprofilebackgroundimage.php:108
-#: actions/apiaccountupdateprofileimage.php:95 actions/apimediaupload.php:81
-#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
-#: actions/designadminpanel.php:120 actions/editapplication.php:121
-#: actions/newapplication.php:102 actions/newnotice.php:95
-#: lib/designsettings.php:110
 #, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s byte) due to its "
@@ -394,26 +289,15 @@ msgstr[1] ""
 #. TRANS: Client error displayed when a database error occurs inserting profile colours.
 #. TRANS: Client error displayed when a database error occurs updating profile colours.
 #. TRANS: Form validation error displayed when group design settings could not be saved because of an application issue.
-#: actions/apiaccountupdateprofilebackgroundimage.php:138
-#: actions/apiaccountupdateprofilebackgroundimage.php:149
-#: actions/apiaccountupdateprofilecolors.php:160
-#: actions/apiaccountupdateprofilecolors.php:171
-#: actions/groupdesignsettings.php:285 actions/groupdesignsettings.php:296
-#: actions/userdesignsettings.php:218 actions/userdesignsettings.php:228
-#: actions/userdesignsettings.php:270 actions/userdesignsettings.php:280
 msgid "Unable to save your design settings."
 msgstr "Kunde inte spara dina utseendeinställningar."
 
 #. TRANS: Error displayed when updating design settings fails.
 #. TRANS: Client error displayed when a database error occurs updating profile colours.
-#: actions/apiaccountupdateprofilebackgroundimage.php:191
-#: actions/apiaccountupdateprofilecolors.php:139
-#: actions/userdesignsettings.php:196
 msgid "Could not update your design."
 msgstr "Kunde inte uppdatera din profils utseende."
 
 #. TRANS: Title for Atom feed.
-#: actions/apiatomservice.php:85
 msgctxt "ATOM"
 msgid "Main"
 msgstr ""
@@ -422,9 +306,6 @@ msgstr ""
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Title in atom group notice feed. %s is a group name.
 #. TRANS: Title in atom user notice feed. %s is a user name.
-#: actions/apiatomservice.php:93 actions/grouprss.php:138
-#: actions/userrss.php:94 lib/atomgroupnoticefeed.php:63
-#: lib/atomusernoticefeed.php:88
 #, php-format
 msgid "%s timeline"
 msgstr "%s tidslinje"
@@ -434,8 +315,6 @@ msgstr "%s tidslinje"
 #. TRANS: %s is a user nickname.
 #. TRANS: Header for subscriptions overview for a user (first page).
 #. TRANS: %s is a user nickname.
-#: actions/apiatomservice.php:104 actions/atompubsubscriptionfeed.php:148
-#: actions/subscriptions.php:51
 #, php-format
 msgid "%s subscriptions"
 msgstr "%s prenumerationer"
@@ -443,58 +322,48 @@ msgstr "%s prenumerationer"
 #. TRANS: Title for Atom feed with a user's favorite notices. %s is a user nickname.
 #. TRANS: Title for Atom favorites feed.
 #. TRANS: %s is a user nickname.
-#: actions/apiatomservice.php:115 actions/atompubfavoritefeed.php:142
 #, php-format
 msgid "%s favorites"
 msgstr "%s favoriter"
 
 #. TRANS: Title for Atom feed with a user's memberships. %s is a user nickname.
-#: actions/apiatomservice.php:126
 #, fuzzy, php-format
 msgid "%s memberships"
 msgstr "%s gruppmedlemmar"
 
 #. TRANS: Client error displayed when users try to block themselves.
-#: actions/apiblockcreate.php:105
 msgid "You cannot block yourself!"
 msgstr "Du kan inte blockera dig själv!"
 
 #. TRANS: Server error displayed when blocking a user has failed.
-#: actions/apiblockcreate.php:127
 msgid "Block user failed."
 msgstr "Blockering av användare misslyckades."
 
 #. TRANS: Server error displayed when unblocking a user has failed.
-#: actions/apiblockdestroy.php:113
 msgid "Unblock user failed."
 msgstr "Hävning av blockering av användare misslyckades."
 
 #. TRANS: Title. %s is a user nickname.
-#: actions/apidirectmessage.php:88
 #, php-format
 msgid "Direct messages from %s"
 msgstr "Direktmeddelanden från %s"
 
 #. TRANS: Subtitle. %s is a user nickname.
-#: actions/apidirectmessage.php:93
 #, php-format
 msgid "All the direct messages sent from %s"
 msgstr "Alla direktmeddelanden skickade från %s"
 
 #. TRANS: Title. %s is a user nickname.
-#: actions/apidirectmessage.php:102
 #, php-format
 msgid "Direct messages to %s"
 msgstr "Direktmeddelande till %s"
 
 #. TRANS: Subtitle. %s is a user nickname.
-#: actions/apidirectmessage.php:107
 #, php-format
 msgid "All the direct messages sent to %s"
 msgstr "Alla direktmeddelanden skickade till %s"
 
 #. TRANS: Client error displayed when no message text was submitted (406).
-#: actions/apidirectmessagenew.php:117
 msgid "No message text!"
 msgstr "Ingen meddelandetext!"
 
@@ -502,7 +371,6 @@ msgstr "Ingen meddelandetext!"
 #. TRANS: %d is the maximum number of characters for a message.
 #. TRANS: Form validation error displayed when message content is too long.
 #. TRANS: %d is the maximum number of characters for a message.
-#: actions/apidirectmessagenew.php:127 actions/newmessage.php:152
 #, php-format
 msgid "That's too long. Maximum message size is %d character."
 msgid_plural "That's too long. Maximum message size is %d characters."
@@ -510,18 +378,15 @@ msgstr[0] "Detta är för långt. Maximal meddelandestorlek är %d tecken."
 msgstr[1] "Detta är för långt. Maximal meddelandestorlek är %d tecken."
 
 #. TRANS: Client error displayed if a recipient user could not be found (403).
-#: actions/apidirectmessagenew.php:139
 msgid "Recipient user not found."
 msgstr "Mottagare hittades inte."
 
 #. TRANS: Client error displayed trying to direct message another user who's not a friend (403).
-#: actions/apidirectmessagenew.php:144
 #, fuzzy
 msgid "Cannot send direct messages to users who aren't your friend."
 msgstr "Kan inte skicka direktmeddelanden till användare som inte är din vän."
 
 #. TRANS: Client error displayed trying to direct message self (403).
-#: actions/apidirectmessagenew.php:154
 msgid ""
 "Do not send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
@@ -531,117 +396,97 @@ 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.
 #. TRANS: Client error displayed trying to delete a status with an invalid ID.
-#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:108
-#: actions/apistatusesdestroy.php:121
 msgid "No status found with that ID."
 msgstr "Ingen status hittad med det ID:t."
 
 #. TRANS: Client error displayed when trying to mark a notice favourite that already is a favourite.
-#: actions/apifavoritecreate.php:120
 msgid "This status is already a favorite."
 msgstr "Denna status är redan en favorit."
 
 #. TRANS: Client error displayed when marking a notice as favourite fails.
 #. TRANS: Server error displayed when trying to mark a notice as favorite fails in the database.
 #. TRANS: Error message text shown when a favorite could not be set.
-#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:306
 msgid "Could not create favorite."
 msgstr "Kunde inte skapa favorit."
 
 #. TRANS: Client error displayed when trying to remove a favourite that was not a favourite.
-#: actions/apifavoritedestroy.php:122
 msgid "That status is not a favorite."
 msgstr "Denna status är inte en favorit."
 
 #. TRANS: Client error displayed when removing a favourite has failed.
 #. TRANS: Server error displayed when removing a favorite from the database fails.
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:90
 msgid "Could not delete favorite."
 msgstr "Kunde inte ta bort favoriten."
 
 #. TRANS: Client error displayed when trying follow who's profile could not be found.
-#: actions/apifriendshipscreate.php:109
 msgid "Could not follow user: profile not found."
 msgstr "Kunde inte sluta följa användaren: användaren hittades inte."
 
 #. TRANS: Client error displayed when trying to follow a user that's already being followed.
 #. TRANS: %s is the nickname of the user that is already being followed.
-#: actions/apifriendshipscreate.php:120
 #, php-format
 msgid "Could not follow user: %s is already on your list."
 msgstr "Kunde inte följa användare: %s finns redan i din lista."
 
 #. TRANS: Client error displayed when trying to unfollow a user that cannot be found.
-#: actions/apifriendshipsdestroy.php:109
 msgid "Could not unfollow user: User not found."
 msgstr "Kunde inte sluta följa användaren: användaren hittades inte."
 
 #. TRANS: Client error displayed when trying to unfollow self.
-#: actions/apifriendshipsdestroy.php:121
 msgid "You cannot unfollow yourself."
 msgstr "Du kan inte sluta följa dig själv."
 
 #. TRANS: Client error displayed when supplying invalid parameters to an API call checking if a friendship exists.
-#: actions/apifriendshipsexists.php:88
 #, fuzzy
 msgid "Two valid IDs or nick names must be supplied."
 msgstr "Två giltiga användar-ID:n eller screen_names måste tillhandahållas."
 
 #. TRANS: Client error displayed when a source user could not be determined showing friendship.
-#: actions/apifriendshipsshow.php:131
 msgid "Could not determine source user."
 msgstr "Kunde inte fastställa användare hos källan."
 
 #. TRANS: Client error displayed when a target user could not be determined showing friendship.
-#: actions/apifriendshipsshow.php:140
 msgid "Could not find target user."
 msgstr "Kunde inte hitta målanvändare."
 
 #. TRANS: Client error trying to create a group with a nickname this is already in use.
+#. TRANS: API validation exception thrown when nickname is already used.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:156 actions/apigroupprofileupdate.php:255
-#: actions/editgroup.php:191 actions/newgroup.php:137
-#: actions/profilesettings.php:274 actions/register.php:199
 msgid "Nickname already in use. Try another one."
 msgstr "Smeknamnet används redan. Försök med ett annat."
 
 #. TRANS: Client error in form for group creation.
+#. TRANS: API validation exception thrown when nickname does not validate.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:164 actions/apigroupprofileupdate.php:259
-#: actions/editgroup.php:195 actions/newgroup.php:141
-#: actions/profilesettings.php:244 actions/register.php:201
 msgid "Not a valid nickname."
 msgstr "Inte ett giltigt smeknamn."
 
 #. TRANS: Client error in form for group creation.
+#. TRANS: API validation exception thrown when homepage URL does not validate.
 #. TRANS: Validation error shown when providing an invalid homepage URL in the "Edit application" form.
 #. TRANS: Group edit form validation error.
 #. TRANS: Validation error shown when providing an invalid homepage URL in the "New application" form.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:181 actions/apigroupprofileupdate.php:277
-#: actions/editapplication.php:235 actions/editgroup.php:202
-#: actions/newapplication.php:221 actions/newgroup.php:148
-#: actions/profilesettings.php:249 actions/register.php:208
 msgid "Homepage is not a valid URL."
 msgstr "Hemsida är inte en giltig webbadress."
 
 #. TRANS: Client error in form for group creation.
+#. TRANS: API validation exception thrown when full name does not validate.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:191 actions/editgroup.php:206
-#: actions/newgroup.php:152 actions/profilesettings.php:253
-#: actions/register.php:211
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "Fullständigt namn är för långt (max 255 tecken)."
 
 #. TRANS: Client error shown when providing too long a description during group creation.
 #. TRANS: %d is the maximum number of allowed characters.
+#. TRANS: API validation exception thrown when description does not validate.
+#. TRANS: %d is the maximum description length and used for plural.
 #. TRANS: Validation error shown when providing too long a description in the "Edit application" form.
 #. TRANS: %d is the maximum number of allowed characters.
 #. TRANS: Group edit form validation error.
@@ -649,9 +494,6 @@ msgstr "Fullständigt namn är för långt (max 255 tecken)."
 #. TRANS: %d is the maximum number of characters for the description.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed characters.
-#: actions/apigroupcreate.php:201 actions/editapplication.php:202
-#: actions/editgroup.php:211 actions/newapplication.php:182
-#: actions/newgroup.php:157
 #, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."
@@ -659,23 +501,21 @@ msgstr[0] "Beskrivning är för lång (max %d tecken)."
 msgstr[1] "Beskrivning är för lång (max %d tecken)."
 
 #. TRANS: Client error shown when providing too long a location during group creation.
+#. TRANS: API validation exception thrown when location does not validate.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:215 actions/editgroup.php:218
-#: actions/newgroup.php:164 actions/profilesettings.php:266
-#: actions/register.php:220
 msgid "Location is too long (maximum 255 characters)."
 msgstr "Beskrivning av plats är för lång (max 255 tecken)."
 
 #. TRANS: Client error shown when providing too many aliases during group creation.
 #. TRANS: %d is the maximum number of allowed aliases.
+#. TRANS: API validation exception thrown when aliases do not validate.
+#. TRANS: %d is the maximum number of aliases and used for plural.
 #. TRANS: Group edit form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.
-#: actions/apigroupcreate.php:236 actions/editgroup.php:231
-#: actions/newgroup.php:177
 #, php-format
 msgid "Too many aliases! Maximum %d allowed."
 msgid_plural "Too many aliases! Maximum %d allowed."
@@ -684,25 +524,24 @@ msgstr[1] "För många alias! Högst %d tillåtna."
 
 #. TRANS: Client error shown when providing an invalid alias during group creation.
 #. TRANS: %s is the invalid alias.
-#: actions/apigroupcreate.php:253
+#. TRANS: API validation exception thrown when aliases does not validate.
+#. TRANS: %s is the invalid alias.
 #, php-format
 msgid "Invalid alias: \"%s\"."
 msgstr "Ogiltigt alias: \"%s\"."
 
 #. TRANS: Client error displayed when trying to use an alias during group creation that is already in use.
 #. TRANS: %s is the alias that is already in use.
+#. TRANS: API validation exception thrown when aliases is already used.
+#. TRANS: %s is the already used alias.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error. %s is the already used alias.
-#: actions/apigroupcreate.php:264 actions/apigroupprofileupdate.php:351
-#: actions/editgroup.php:246 actions/newgroup.php:193
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "Alias \"%s\" används redan. Försök med ett annat."
 
 #. TRANS: Client error displayed when trying to use an alias during group creation that is the same as the group's nickname.
 #. TRANS: Group edit form validation error.
-#: actions/apigroupcreate.php:278 actions/apigroupprofileupdate.php:359
-#: actions/editgroup.php:253
 msgid "Alias can't be the same as nickname."
 msgstr "Alias kan inte vara samma som smeknamn."
 
@@ -710,26 +549,21 @@ msgstr "Alias kan inte vara samma som smeknamn."
 #. TRANS: Client error displayed when trying to join a group that does not exist.
 #. TRANS: Client error displayed when trying to leave a group that does not exist.
 #. TRANS: Client error displayed trying to show group membership on a non-existing group.
+#. TRANS: Client error displayed when not providing a group or an invalid group.
 #. TRANS: Client error displayed when trying to show a group that could not be found.
 #. TRANS: Client error displayed requesting most recent notices to a group for a non-existing group.
-#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
-#: actions/apigroupleave.php:104 actions/apigroupmembership.php:71
-#: actions/apigroupprofileupdate.php:113 actions/apigroupshow.php:81
-#: actions/apitimelinegroup.php:89
 msgid "Group not found."
 msgstr "Grupp hittades inte."
 
 #. TRANS: Server error displayed when trying to join a group the user is already a member of.
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:345
 msgid "You are already a member of that group."
 msgstr "Du är redan en medlem i denna grupp."
 
 #. TRANS: Server error displayed when trying to join a group the user is blocked from joining.
 #. 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.
-#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:350
 msgid "You have been blocked from that group by the admin."
 msgstr "Du har blivit blockerad från denna grupp av administratören."
 
@@ -737,13 +571,11 @@ msgstr "Du har blivit blockerad från denna grupp av administratören."
 #. TRANS: %1$s is the joining user's nickname, $2$s is the group nickname for which the join failed.
 #. TRANS: Message given having failed to add a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:136 actions/joingroup.php:139 lib/command.php:362
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "Kunde inte ansluta användare %1$s till grupp %2$s."
 
 #. TRANS: Server error displayed when trying to leave a group the user is not a member of.
-#: actions/apigroupleave.php:115
 msgid "You are not a member of this group."
 msgstr "Du är inte en medlem i denna grupp."
 
@@ -751,115 +583,78 @@ msgstr "Du är inte en medlem i denna grupp."
 #. TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
 #. TRANS: Message given having failed to remove a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupleave.php:127 actions/leavegroup.php:133
-#: lib/command.php:410
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
 msgstr "Kunde inte ta bort användare %1$s från grupp %2$s."
 
 #. TRANS: Used as title in check for group membership. %s is a user name.
-#: actions/apigrouplist.php:94
 #, php-format
 msgid "%s's groups"
 msgstr "%ss grupper"
 
 #. TRANS: Used as subtitle in check for group membership. %1$s is a user name, %2$s is the site name.
-#: actions/apigrouplist.php:104
 #, php-format
 msgid "%1$s groups %2$s is a member of."
 msgstr "%1$s grupper %2$s är en medlem i."
 
 #. TRANS: Message is used as a title when listing the lastest 20 groups. %s is a site name.
 #. TRANS: Message is used as a page title. %s is a nick name.
-#: actions/apigrouplistall.php:88 actions/usergroups.php:63
 #, php-format
 msgid "%s groups"
 msgstr "%s grupper"
 
 #. TRANS: Message is used as a subtitle when listing the lastest 20 groups. %s is a site name.
-#: actions/apigrouplistall.php:93
 #, php-format
 msgid "groups on %s"
 msgstr "grupper på %s"
 
+#. TRANS: Client error displayed when trying to edit a group without being an admin.
 #. TRANS: Client error displayed trying to edit a group while not being a group admin.
 #. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
 #. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
-#: actions/apigroupprofileupdate.php:118 actions/editgroup.php:110
-#: actions/editgroup.php:176 actions/groupdesignsettings.php:109
-#: actions/grouplogo.php:111
 msgid "You must be an admin to edit the group."
 msgstr "Du måste vara en administratör för att redigera gruppen."
 
+#. TRANS: Server error displayed when group update fails.
 #. TRANS: Server error displayed when editing a group fails.
-#: actions/apigroupprofileupdate.php:171 actions/editgroup.php:274
 msgid "Could not update group."
 msgstr "Kunde inte uppdatera grupp."
 
+#. TRANS: Server error displayed when adding group aliases fails.
 #. TRANS: Server error displayed when group aliases could not be added.
 #. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/apigroupprofileupdate.php:194 actions/editgroup.php:281
-#: classes/User_group.php:540
 msgid "Could not create aliases."
 msgstr "Kunde inte skapa alias."
 
+#. TRANS: API validation exception thrown when nickname does not validate.
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: actions/apigroupprofileupdate.php:249 lib/nickname.php:165
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr ""
 "Smeknamnet får endast innehålla små bokstäver eller siffror, inga mellanslag."
 
-#: actions/apigroupprofileupdate.php:286
-#, fuzzy
-msgid "Full name is too long (max 255 chars)."
-msgstr "Fullständigt namn är för långt (max 255 tecken)."
-
-#: actions/apigroupprofileupdate.php:296
-#, fuzzy, php-format
-msgid "description is too long (max %d chars)."
-msgstr "Beskrivning är för lång (max %d tecken)."
-
-#: actions/apigroupprofileupdate.php:307
-#, fuzzy
-msgid "Location is too long (max 255 chars)."
-msgstr "Beskrivning av plats är för lång (max 255 tecken)."
-
-#: actions/apigroupprofileupdate.php:326
-#, fuzzy, php-format
-msgid "Too many aliases! Maximum %d."
-msgstr "För många alias! Högst %d tillåtet."
-
-#. TRANS: Group edit form validation error.
+#. TRANS: API validation exception thrown when alias is the same as nickname.
 #. TRANS: Group create form validation error.
-#. TRANS: %s is the invalid alias.
-#: actions/apigroupprofileupdate.php:342 actions/editgroup.php:241
-#: actions/newgroup.php:188
-#, php-format
-msgid "Invalid alias: \"%s\""
-msgstr "Ogiltigt alias: \"%s\""
+#, fuzzy
+msgid "Alias cannot be the same as nickname."
+msgstr "Alias kan inte vara samma som smeknamn."
 
 #. TRANS: Client error displayed when uploading a media file has failed.
-#: actions/apimediaupload.php:101
 msgid "Upload failed."
 msgstr "Uppladdning misslyckades."
 
 #. TRANS: Client error given from the OAuth API when the request token or verifier is invalid.
-#: actions/apioauthaccesstoken.php:102
 msgid "Invalid request token or verifier."
 msgstr "Ogiltig begäran-token eller verifierare."
 
 #. TRANS: Client error given when no oauth_token was passed to the OAuth API.
-#: actions/apioauthauthorize.php:107
 msgid "No oauth_token parameter provided."
 msgstr "Ingen oauth_token-parameter angiven."
 
 #. TRANS: Client error given when an invalid request token was passed to the OAuth API.
-#: actions/apioauthauthorize.php:115 actions/apioauthauthorize.php:129
 msgid "Invalid request token."
 msgstr "Ogiltig begäran-token."
 
 #. TRANS: Client error given when an invalid request token was passed to the OAuth API.
-#: actions/apioauthauthorize.php:121
 #, fuzzy
 msgid "Request token already authorized."
 msgstr "Begäran-token är redan auktoriserad."
@@ -870,31 +665,14 @@ msgstr "Begäran-token är redan auktoriserad."
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
 #. TRANS: Client error displayed when the session token is not okay.
-#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:75
-#: actions/emailsettings.php:292 actions/favor.php:75 actions/geocode.php:55
-#: actions/groupblock.php:65 actions/grouplogo.php:321
-#: actions/groupunblock.php:65 actions/imsettings.php:241
-#: actions/invite.php:60 actions/makeadmin.php:66 actions/newmessage.php:135
-#: actions/newnotice.php:105 actions/nudge.php:80
-#: actions/oauthappssettings.php:162 actions/oauthconnectionssettings.php:135
-#: actions/passwordsettings.php:137 actions/pluginenable.php:87
-#: actions/profilesettings.php:218 actions/recoverpassword.php:383
-#: actions/register.php:157 actions/remotesubscribe.php:76
-#: actions/repeat.php:82 actions/smssettings.php:249 actions/subedit.php:40
-#: actions/subscribe.php:87 actions/tagother.php:145
-#: actions/unsubscribe.php:69 actions/urlsettings.php:171
-#: actions/userauthorization.php:53 lib/designsettings.php:122
 msgid "There was a problem with your session token. Try again, please."
 msgstr "Det var ett problem med din sessions-token. Var vänlig försök igen."
 
 #. TRANS: Form validation error given when an invalid username and/or password was passed to the OAuth API.
-#: actions/apioauthauthorize.php:168
 msgid "Invalid nickname / password!"
 msgstr "Ogiltigt smeknamn / lösenord!"
 
 #. TRANS: Server error displayed when a database action fails.
-#: actions/apioauthauthorize.php:217
 #, fuzzy
 msgid "Database error inserting oauth_token_association."
 msgstr "Databasfel vid infogning av OAuth-applikationsanvändare."
@@ -911,28 +689,19 @@ msgstr "Databasfel vid infogning av OAuth-applikationsanvändare."
 #. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
 #. TRANS: Message given submitting a form with an unknown action in SMS settings.
 #. TRANS: Unknown form validation error in design settings form.
-#: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
-#: actions/designadminpanel.php:100 actions/editapplication.php:144
-#: actions/emailsettings.php:311 actions/grouplogo.php:332
-#: actions/imsettings.php:256 actions/newapplication.php:124
-#: actions/oauthconnectionssettings.php:144 actions/recoverpassword.php:46
-#: actions/smssettings.php:270 lib/designsettings.php:133
 msgid "Unexpected form submission."
 msgstr "Oväntat inskick av formulär."
 
 #. TRANS: Title for a page where a user can confirm/deny account access by an external application.
-#: actions/apioauthauthorize.php:387
 msgid "An application would like to connect to your account"
 msgstr "En applikation skulle vilja ansluta till ditt konto"
 
 #. TRANS: Fieldset legend.
-#: actions/apioauthauthorize.php:404
 msgid "Allow or deny access"
 msgstr "Tillåt eller neka åtkomst"
 
 #. TRANS: User notification of external application requesting account access.
 #. TRANS: %3$s is the access type requested (read-write or read-only), %4$s is the StatusNet sitename.
-#: actions/apioauthauthorize.php:425
 #, fuzzy, php-format
 msgid ""
 "An application would like the ability to <strong>%3$s</strong> your %4$s "
@@ -946,7 +715,6 @@ msgstr ""
 #. TRANS: User notification of external application requesting account access.
 #. TRANS: %1$s is the application name requesting access, %2$s is the organisation behind the application,
 #. TRANS: %3$s is the access type requested, %4$s is the StatusNet sitename.
-#: actions/apioauthauthorize.php:433
 #, php-format
 msgid ""
 "The application <strong>%1$s</strong> by <strong>%2$s</strong> would like "
@@ -958,22 +726,18 @@ msgstr ""
 "ge tillgång till ditt %4$s-konto till tredje-parter du litar på."
 
 #. TRANS: Fieldset legend.
-#: actions/apioauthauthorize.php:455
 msgctxt "LEGEND"
 msgid "Account"
 msgstr "Konto"
 
 #. TRANS: Field label on OAuth API authorisation form.
+#. TRANS: Field label on login page.
 #. TRANS: Field label in form for profile settings.
-#: actions/apioauthauthorize.php:459 actions/login.php:225
-#: actions/profilesettings.php:107 actions/register.php:411
-#: actions/userauthorization.php:145 lib/groupeditform.php:145
 msgid "Nickname"
 msgstr "Smeknamn"
 
 #. TRANS: Field label on OAuth API authorisation form.
-#: actions/apioauthauthorize.php:463 actions/login.php:228
-#: actions/register.php:415 lib/settingsnav.php:87
+#. TRANS: Field label on login page.
 msgid "Password"
 msgstr "Lösenord"
 
@@ -983,46 +747,37 @@ msgstr "Lösenord"
 #. TRANS: Button label to cancel an IM address confirmation procedure.
 #. TRANS: Button label to cancel a SMS address confirmation procedure.
 #. TRANS: Button label in the "Edit application" form.
-#: actions/apioauthauthorize.php:478 actions/emailsettings.php:125
-#: actions/imsettings.php:136 actions/smssettings.php:132
-#: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Cancel"
 msgstr "Avbryt"
 
 #. TRANS: Button text that when clicked will allow access to an account by an external application.
-#: actions/apioauthauthorize.php:485
 msgctxt "BUTTON"
 msgid "Allow"
 msgstr "Tillåt"
 
 #. TRANS: Form instructions.
-#: actions/apioauthauthorize.php:502
 #, fuzzy
 msgid "Authorize access to your account information."
 msgstr "Tillåt eller neka åtkomst till din kontoinformation."
 
 #. TRANS: Header for user notification after revoking OAuth access to an application.
-#: actions/apioauthauthorize.php:594
 #, fuzzy
 msgid "Authorization canceled."
 msgstr "Bekräftelse för snabbmeddelanden avbruten."
 
 #. TRANS: User notification after revoking OAuth access to an application.
 #. TRANS: %s is an OAuth token.
-#: actions/apioauthauthorize.php:598
 #, fuzzy, php-format
 msgid "The request token %s has been revoked."
 msgstr "Begäran-token %s har nekats och återkallats."
 
 #. TRANS: Title of the page notifying the user that an anonymous client application was successfully authorized to access the user's account with OAuth.
-#: actions/apioauthauthorize.php:621
 #, fuzzy
 msgid "You have successfully authorized the application"
 msgstr "Du har inte tillstånd."
 
 #. TRANS: Message notifying the user that an anonymous client application was successfully authorized to access the user's account with OAuth.
-#: actions/apioauthauthorize.php:625
 msgid ""
 "Please return to the application and enter the following security code to "
 "complete the process."
@@ -1030,14 +785,12 @@ msgstr ""
 
 #. TRANS: Title of the page notifying the user that the client application was successfully authorized to access the user's account with OAuth.
 #. TRANS: %s is the authorised application name.
-#: actions/apioauthauthorize.php:632
 #, fuzzy, php-format
 msgid "You have successfully authorized %s"
 msgstr "Du har inte tillstånd."
 
 #. TRANS: Message notifying the user that the client application was successfully authorized to access the user's account with OAuth.
 #. TRANS: %s is the authorised application name.
-#: actions/apioauthauthorize.php:639
 #, php-format
 msgid ""
 "Please return to %s and enter the following security code to complete the "
@@ -1046,12 +799,10 @@ msgstr ""
 
 #. TRANS: Client error displayed trying to delete a status not using POST or DELETE.
 #. TRANS: POST and DELETE should not be translated.
-#: actions/apistatusesdestroy.php:111
 msgid "This method requires a POST or DELETE."
 msgstr "Denna metod kräver en POST eller en DELETE."
 
 #. TRANS: Client error displayed trying to delete a status of another user.
-#: actions/apistatusesdestroy.php:136
 msgid "You may not delete another user's status."
 msgstr "Du kan inte ta bort en annan användares status."
 
@@ -1059,21 +810,16 @@ msgstr "Du kan inte ta bort en annan användares status."
 #. TRANS: Client error displayed trying to display redents of a non-exiting notice.
 #. TRANS: Client exception thrown when referencing a non-existing notice.
 #. TRANS: Error message displayed trying to delete a non-existing notice.
-#: actions/apistatusesretweet.php:74 actions/apistatusesretweets.php:70
-#: actions/atompubshowfavorite.php:82 actions/deletenotice.php:61
-#: actions/shownotice.php:92
 msgid "No such notice."
 msgstr "Ingen sådan notis."
 
 #. TRANS: Client error displayed trying to repeat an own notice through the API.
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:549
 msgid "Cannot repeat your own notice."
 msgstr "Kan inte upprepa din egen notis."
 
 #. TRANS: Client error displayed trying to re-repeat a notice through the API.
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:92 lib/command.php:555
 msgid "Already repeated that notice."
 msgstr "Redan upprepat denna notis."
 
@@ -1083,59 +829,45 @@ msgstr "Redan upprepat denna notis."
 #. TRANS: Client exception thrown when using an unsupported HTTP method.
 #. TRANS: Client error shown when using a non-supported HTTP method.
 #. TRANS: Client exception thrown when using an unsupported HTTP method.
-#: actions/apistatusesshow.php:118 actions/atompubfavoritefeed.php:103
-#: actions/atompubmembershipfeed.php:105 actions/atompubshowfavorite.php:117
-#: actions/atompubshowmembership.php:116
-#: actions/atompubshowsubscription.php:122
-#: actions/atompubsubscriptionfeed.php:109
 #, fuzzy
 msgid "HTTP method not supported."
 msgstr "API-metod hittades inte."
 
 #. TRANS: Exception thrown requesting an unsupported notice output format.
 #. TRANS: %s is the requested output format.
-#: actions/apistatusesshow.php:144
 #, fuzzy, php-format
 msgid "Unsupported format: %s."
 msgstr "Format som inte stödjs."
 
 #. TRANS: Client error displayed requesting a deleted status.
-#: actions/apistatusesshow.php:155
 msgid "Status deleted."
 msgstr "Status borttagen."
 
 #. TRANS: Client error displayed requesting a status with an invalid ID.
-#: actions/apistatusesshow.php:162
 msgid "No status with that ID found."
 msgstr "Ingen status med det ID:t hittades."
 
 #. TRANS: Client error displayed when trying to delete a notice not using the Atom format.
-#: actions/apistatusesshow.php:227
 msgid "Can only delete using the Atom format."
 msgstr ""
 
 #. TRANS: Client error displayed when a user has no rights to delete notices of other users.
 #. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
-#: actions/apistatusesshow.php:235 actions/deletenotice.php:78
 #, fuzzy
 msgid "Cannot delete this notice."
 msgstr "Kan inte ta bort denna notis."
 
 #. TRANS: Confirmation of notice deletion in API. %d is the ID (number) of the deleted notice.
-#: actions/apistatusesshow.php:249
 #, fuzzy, php-format
 msgid "Deleted notice %d"
 msgstr "Ta bort notis"
 
 #. TRANS: Client error displayed when the parameter "status" is missing.
-#: actions/apistatusesupdate.php:221
 msgid "Client must provide a 'status' parameter with a value."
 msgstr "Klient måste tillhandahålla en 'status'-parameter med ett värde."
 
 #. TRANS: Client error displayed when the parameter "status" is missing.
 #. TRANS: %d is the maximum number of character for a notice.
-#: actions/apistatusesupdate.php:244 actions/newnotice.php:161
-#: lib/mailhandler.php:60
 #, fuzzy, php-format
 msgid "That's too long. Maximum notice size is %d character."
 msgid_plural "That's too long. Maximum notice size is %d characters."
@@ -1143,14 +875,12 @@ msgstr[0] "Det är för långt. Maximal notisstorlek är %d tecken."
 msgstr[1] "Det är för långt. Maximal notisstorlek är %d tecken."
 
 #. TRANS: Client error displayed when replying to a non-existing notice.
-#: actions/apistatusesupdate.php:284
 #, fuzzy
 msgid "Parent notice not found."
 msgstr "API-metod hittades inte."
 
 #. TRANS: Client error displayed exceeding the maximum notice length.
 #. TRANS: %d is the maximum lenth for a notice.
-#: actions/apistatusesupdate.php:308 actions/newnotice.php:184
 #, fuzzy, php-format
 msgid "Maximum notice size is %d character, including attachment URL."
 msgid_plural "Maximum notice size is %d characters, including attachment URL."
@@ -1159,13 +889,11 @@ msgstr[1] "Maximal notisstorlek är %d tecken, inklusive webbadress för bilaga.
 
 #. TRANS: Client error displayed when requesting profiles of followers in an unsupported format.
 #. TRANS: Client error displayed when requesting IDs of followers in an unsupported format.
-#: actions/apisubscriptions.php:228 actions/apisubscriptions.php:258
 msgid "Unsupported format."
 msgstr "Format som inte stödjs."
 
 #. TRANS: Title for timeline of most recent favourite notices by a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname.
-#: actions/apitimelinefavorites.php:108
 #, php-format
 msgid "%1$s / Favorites from %2$s"
 msgstr "%1$s / Favoriter från %2$s"
@@ -1173,14 +901,12 @@ msgstr "%1$s / Favoriter från %2$s"
 #. TRANS: Subtitle for timeline of most recent favourite notices by a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user's full name,
 #. TRANS: %3$s is a user nickname.
-#: actions/apitimelinefavorites.php:120
 #, fuzzy, php-format
 msgid "%1$s updates favorited by %2$s / %3$s."
 msgstr "%1$s uppdateringar markerade som favorit av %2$s / %2$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.
-#: actions/apitimelinementions.php:115
 #, php-format
 msgid "%1$s / Updates mentioning %2$s"
 msgstr "%1$s / Uppdateringar som nämner %2$s"
@@ -1188,48 +914,40 @@ msgstr "%1$s / Uppdateringar som nämner %2$s"
 #. TRANS: Subtitle for timeline of most recent mentions of a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname,
 #. TRANS: %3$s is a user's full name.
-#: actions/apitimelinementions.php:131
 #, php-format
 msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr "%1$s uppdateringar med svar på uppdatering från %2$s / %3$s."
 
 #. TRANS: Title for site timeline. %s is the StatusNet sitename.
 #. TRANS: Public RSS feed title. %s is the StatusNet site name.
-#: actions/apitimelinepublic.php:193 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "%s publika tidslinje"
 
 #. TRANS: Subtitle for site timeline. %s is the StatusNet sitename.
-#: actions/apitimelinepublic.php:199
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "%s uppdateringar från alla!"
 
 #. TRANS: Server error displayed calling unimplemented API method for 'retweeted by me'.
-#: actions/apitimelineretweetedbyme.php:71
 msgid "Unimplemented."
 msgstr "Inte implementerad."
 
 #. TRANS: Title for Atom feed "repeated to me". %s is the user nickname.
-#: actions/apitimelineretweetedtome.php:96
 #, php-format
 msgid "Repeated to %s"
 msgstr "Upprepat till %s"
 
-#: actions/apitimelineretweetedtome.php:98
 #, fuzzy, php-format
 msgid "%1$s notices that were to repeated to %2$s / %3$s."
 msgstr "%1$s uppdateringar med svar på uppdatering från %2$s / %3$s."
 
 #. TRANS: Title of list of repeated notices of the logged in user.
 #. TRANS: %s is the nickname of the logged in user.
-#: actions/apitimelineretweetsofme.php:98
 #, php-format
 msgid "Repeats of %s"
 msgstr "Upprepningar av %s"
 
-#: actions/apitimelineretweetsofme.php:104
 #, fuzzy, php-format
 msgid "%1$s notices that %2$s / %3$s has repeated."
 msgstr "%s (@%s) lade till din notis som en favorit"
@@ -1238,181 +956,148 @@ msgstr "%s (@%s) lade till din notis som en favorit"
 #. TRANS: %s is the tag.
 #. TRANS: Title for first page of notices with tags.
 #. TRANS: %s is the tag.
-#: actions/apitimelinetag.php:101 actions/tag.php:69
 #, php-format
 msgid "Notices tagged with %s"
 msgstr "Notiser taggade med %s"
 
 #. TRANS: Subtitle for timeline with lastest notices with a given tag.
 #. TRANS: %1$s is the tag, $2$s is the StatusNet sitename.
-#: actions/apitimelinetag.php:105 actions/tagrss.php:65
 #, php-format
 msgid "Updates tagged with %1$s on %2$s!"
 msgstr "Uppdateringar taggade med %1$s på %2$s!"
 
 #. TRANS: Client error displayed trying to add a notice to another user's timeline.
-#: actions/apitimelineuser.php:308
 #, fuzzy
 msgid "Only the user can add to their own timeline."
 msgstr "Bara användaren kan läsa sina egna brevlådor."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:315
 msgid "Only accept AtomPub for Atom feeds."
 msgstr ""
 
 #. TRANS: Client error displayed attempting to post an empty API notice.
-#: actions/apitimelineuser.php:322
 msgid "Atom post must not be empty."
 msgstr ""
 
 #. TRANS: Client error displayed attempting to post an API that is not well-formed XML.
-#: actions/apitimelineuser.php:328
 msgid "Atom post must be well-formed XML."
 msgstr ""
 
 #. TRANS: Client error displayed when not using an Atom entry.
-#: actions/apitimelineuser.php:334 actions/atompubfavoritefeed.php:228
-#: actions/atompubmembershipfeed.php:230
-#: actions/atompubsubscriptionfeed.php:236
 msgid "Atom post must be an Atom entry."
 msgstr ""
 
 #. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
-#: actions/apitimelineuser.php:345
 msgid "Can only handle POST activities."
 msgstr ""
 
 #. TRANS: Client error displayed when using an unsupported activity object type.
 #. TRANS: %s is the unsupported activity object type.
-#: actions/apitimelineuser.php:356
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
 #. TRANS: %d is the notice ID (number).
-#: actions/apitimelineuser.php:390
 #, fuzzy, php-format
 msgid "No content for notice %d."
 msgstr "Hitta innehåll i notiser"
 
 #. TRANS: Client error displayed when using another format than AtomPub.
 #. TRANS: %s is the notice URI.
-#: actions/apitimelineuser.php:419
 #, fuzzy, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "Notis med den ID:n finns inte."
 
 #. TRANS: Server error for unfinished API method showTrends.
-#: actions/apitrends.php:85
 msgid "API method under construction."
 msgstr "API-metoden är under uppbyggnad."
 
 #. TRANS: Client error displayed when requesting user information for a non-existing user.
-#: actions/apiuserprofileimage.php:80 actions/apiusershow.php:94
 msgid "User not found."
 msgstr "API-metod hittades inte."
 
 #. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
 #. TRANS: Client exception.
 #. TRANS: Client error displayed trying to subscribe to a non-existing profile.
-#: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
-#: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
-#: actions/subscribe.php:110
 msgid "No such profile."
 msgstr "Ingen sådan profil."
 
 #. TRANS: Subtitle for Atom favorites feed.
 #. TRANS: %1$s is a user nickname, %2$s is the StatusNet sitename.
-#: actions/atompubfavoritefeed.php:147
 #, fuzzy, php-format
 msgid "Notices %1$s has favorited on %2$s"
 msgstr "Uppdateringar från %1$s och vänner på %2$s!"
 
 #. TRANS: Client exception thrown when trying to set a favorite for another user.
 #. TRANS: Client exception thrown when trying to subscribe another user.
-#: actions/atompubfavoritefeed.php:217 actions/atompubsubscriptionfeed.php:225
 #, fuzzy
 msgid "Cannot add someone else's subscription."
 msgstr "Kunde inte infoga ny prenumeration."
 
 #. TRANS: Client exception thrown when trying use an incorrect activity verb for the Atom pub method.
-#: actions/atompubfavoritefeed.php:240
 #, fuzzy
 msgid "Can only handle favorite activities."
 msgstr "Hitta innehåll i notiser"
 
 #. TRANS: Client exception thrown when trying favorite an object that is not a notice.
-#: actions/atompubfavoritefeed.php:250 actions/atompubmembershipfeed.php:250
 #, fuzzy
 msgid "Can only fave notices."
 msgstr "Hitta innehåll i notiser"
 
 #. TRANS: Client exception thrown when trying favorite a notice without content.
-#: actions/atompubfavoritefeed.php:259
 #, fuzzy
 msgid "Unknown note."
 msgstr "Okänd"
 
 #. TRANS: Client exception thrown when trying favorite an already favorited notice.
-#: actions/atompubfavoritefeed.php:267
 #, fuzzy
 msgid "Already a favorite."
 msgstr "Lägg till i favoriter"
 
 #. TRANS: Title for group membership feed.
 #. TRANS: %s is a username.
-#: actions/atompubmembershipfeed.php:144
 #, fuzzy, php-format
 msgid "%s group memberships"
 msgstr "%s gruppmedlemmar"
 
 #. TRANS: Subtitle for group membership feed.
 #. TRANS: %1$s is a username, %2$s is the StatusNet sitename.
-#: actions/atompubmembershipfeed.php:149
 #, fuzzy, php-format
 msgid "Groups %1$s is a member of on %2$s"
 msgstr "Grupper %s är en medlem i"
 
 #. TRANS: Client exception thrown when trying subscribe someone else to a group.
-#: actions/atompubmembershipfeed.php:219
 #, fuzzy
 msgid "Cannot add someone else's membership."
 msgstr "Kunde inte infoga ny prenumeration."
 
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#: actions/atompubmembershipfeed.php:242
 #, fuzzy
 msgid "Can only handle join activities."
 msgstr "Hitta innehåll i notiser"
 
 #. TRANS: Client exception thrown when trying to subscribe to a non-existing group.
-#: actions/atompubmembershipfeed.php:259
 #, fuzzy
 msgid "Unknown group."
 msgstr "Okänd"
 
 #. TRANS: Client exception thrown when trying to subscribe to an already subscribed group.
-#: actions/atompubmembershipfeed.php:267
 #, fuzzy
 msgid "Already a member."
 msgstr "Alla medlemmar"
 
 #. TRANS: Client exception thrown when trying to subscribe to group while blocked from that group.
-#: actions/atompubmembershipfeed.php:275
 msgid "Blocked by admin."
 msgstr ""
 
 #. TRANS: Client exception thrown when referencing a non-existing favorite.
-#: actions/atompubshowfavorite.php:90
 #, fuzzy
 msgid "No such favorite."
 msgstr "Ingen sådan fil."
 
 #. TRANS: Client exception thrown when trying to remove a favorite notice of another user.
-#: actions/atompubshowfavorite.php:151
 #, fuzzy
 msgid "Cannot delete someone else's favorite."
 msgstr "Kunde inte ta bort favoriten."
@@ -1439,93 +1124,68 @@ msgstr "Kunde inte ta bort favoriten."
 #. TRANS: Client error displayed when trying to join a non-existing group.
 #. TRANS: Client error displayed when trying to leave a non-local group.
 #. TRANS: Client error displayed when trying to leave a non-existing group.
+#. TRANS: Client error displayed when providing an invalid group ID on the Make Admin page.
 #. 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.
 #. TRANS: Command exception text shown when a group is requested that does not exist.
 #. TRANS: Error text shown when trying to leave a group that does not exist.
-#: actions/atompubshowmembership.php:81 actions/blockedfromgroup.php:81
-#: actions/blockedfromgroup.php:89 actions/deletegroup.php:87
-#: actions/deletegroup.php:100 actions/editgroup.php:102
-#: actions/foafgroup.php:46 actions/foafgroup.php:65 actions/foafgroup.php:73
-#: actions/groupblock.php:89 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:101 actions/grouplogo.php:103
-#: actions/groupmembers.php:84 actions/groupmembers.php:92
-#: actions/grouprss.php:97 actions/grouprss.php:105
-#: actions/groupunblock.php:89 actions/joingroup.php:82
-#: actions/joingroup.php:95 actions/leavegroup.php:82
-#: actions/leavegroup.php:95 actions/makeadmin.php:86
-#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:392
 msgid "No such group."
 msgstr "Ingen sådan grupp."
 
 #. TRANS: Client exception thrown when trying to show membership of a non-subscribed group
-#: actions/atompubshowmembership.php:91
 #, fuzzy
 msgid "Not a member."
 msgstr "Alla medlemmar"
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
-#: actions/atompubshowmembership.php:150
 #, fuzzy
 msgid "Cannot delete someone else's membership."
 msgstr "Kunde inte spara prenumeration."
 
 #. TRANS: Client exception thrown when trying to display a subscription for a non-existing profile ID.
 #. TRANS: %d is the non-existing profile ID number.
-#: actions/atompubshowsubscription.php:72
-#: actions/atompubshowsubscription.php:83
-#: actions/atompubsubscriptionfeed.php:74
 #, fuzzy, php-format
 msgid "No such profile id: %d."
 msgstr "Ingen sådan profil."
 
 #. 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.
-#: actions/atompubshowsubscription.php:94
 #, fuzzy, php-format
 msgid "Profile %1$d not subscribed to profile %2$d."
 msgstr "Du är inte prenumerat hos den profilen."
 
 #. TRANS: Client exception thrown when trying to delete a subscription of another user.
-#: actions/atompubshowsubscription.php:157
 #, fuzzy
 msgid "Cannot delete someone else's subscription."
 msgstr "Kunde inte spara prenumeration."
 
 #. TRANS: Subtitle for Atom subscription feed.
 #. TRANS: %1$s is a user nickname, %s$s is the StatusNet sitename.
-#: actions/atompubsubscriptionfeed.php:153
 #, fuzzy, php-format
 msgid "People %1$s has subscribed to on %2$s"
 msgstr "Personer som prenumererar på %s"
 
 #. TRANS: Client error displayed when not using the follow verb.
-#: actions/atompubsubscriptionfeed.php:248
 msgid "Can only handle Follow activities."
 msgstr ""
 
 #. TRANS: Client exception thrown when subscribing to an object that is not a person.
-#: actions/atompubsubscriptionfeed.php:256
 msgid "Can only follow people."
 msgstr ""
 
 #. TRANS: Client exception thrown when subscribing to a non-existing profile.
 #. TRANS: %s is the unknown profile ID.
-#: actions/atompubsubscriptionfeed.php:267
 #, fuzzy, php-format
 msgid "Unknown profile %s."
 msgstr "Okänd filtyp"
 
 #. TRANS: Client error displayed trying to subscribe to an already subscribed profile.
 #. TRANS: %s is the profile the user already has a subscription on.
-#: actions/atompubsubscriptionfeed.php:275
 #, fuzzy, php-format
 msgid "Already subscribed to %s."
 msgstr "Redan prenumerant!"
 
 #. TRANS: Client error displayed trying to get a non-existing attachment.
-#: actions/attachment.php:73
 msgid "No such attachment."
 msgstr "Ingen sådan bilaga."
 
@@ -1537,31 +1197,23 @@ msgstr "Ingen sådan bilaga."
 #. TRANS: Client error displayed when trying to view group members without providing a group nickname.
 #. TRANS: Client error displayed when requesting a group RSS feed without providing a group nickname.
 #. TRANS: Client error displayed if no nickname argument was given requesting a group page.
-#: actions/avatarbynickname.php:60 actions/blockedfromgroup.php:73
-#: actions/editgroup.php:85 actions/groupdesignsettings.php:84
-#: actions/grouplogo.php:86 actions/groupmembers.php:76
-#: actions/grouprss.php:89 actions/showgroup.php:116
 msgid "No nickname."
 msgstr "Inget smeknamn."
 
 #. TRANS: Client error displayed trying to get an avatar without providing an avatar size.
-#: actions/avatarbynickname.php:66
 msgid "No size."
 msgstr "Ingen storlek."
 
 #. TRANS: Client error displayed trying to get an avatar providing an invalid avatar size.
-#: actions/avatarbynickname.php:72
 msgid "Invalid size."
 msgstr "Ogiltig storlek."
 
 #. TRANS: Title for avatar upload page.
-#: actions/avatarsettings.php:66 lib/settingsnav.php:82
 msgid "Avatar"
 msgstr "Avatar"
 
 #. TRANS: Instruction for avatar upload page.
 #. TRANS: %s is the maximum file size, for example "500b", "10kB" or "2MB".
-#: actions/avatarsettings.php:78
 #, php-format
 msgid "You can upload your personal avatar. The maximum file size is %s."
 msgstr ""
@@ -1571,17 +1223,12 @@ msgstr ""
 #. TRANS: Server error displayed coming across a request from a user without a profile.
 #. TRANS: Server error displayed when trying to authorise a remote subscription request
 #. TRANS: while the user has no profile.
-#: actions/avatarsettings.php:108 actions/avatarsettings.php:192
-#: actions/grouplogo.php:184 actions/remotesubscribe.php:190
-#: actions/userauthorization.php:75 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr "Användare utan matchande profil."
 
 #. TRANS: Avatar upload page form legend.
 #. TRANS: Avatar upload page crop form legend.
 #. TRANS: Legend for group logo settings fieldset.
-#: actions/avatarsettings.php:122 actions/avatarsettings.php:205
-#: actions/grouplogo.php:261
 msgid "Avatar settings"
 msgstr "Avatarinställningar"
 
@@ -1589,8 +1236,6 @@ msgstr "Avatarinställningar"
 #. TRANS: Header on avatar upload crop form for thumbnail of originally uploaded avatar (h2).
 #. TRANS: Uploaded original file in group logo form.
 #. TRANS: Header for originally uploaded file before a crop on the group logo page.
-#: actions/avatarsettings.php:131 actions/avatarsettings.php:214
-#: actions/grouplogo.php:207 actions/grouplogo.php:270
 msgid "Original"
 msgstr "Orginal"
 
@@ -1598,82 +1243,67 @@ msgstr "Orginal"
 #. TRANS: Header on avatar upload crop form for thumbnail of to be used rendition of uploaded avatar (h2).
 #. TRANS: Header for preview of to be displayed group logo.
 #. TRANS: Header for the cropped group logo on the group logo page.
-#: actions/avatarsettings.php:147 actions/avatarsettings.php:227
-#: actions/grouplogo.php:219 actions/grouplogo.php:283
 msgid "Preview"
 msgstr "Förhandsgranska"
 
 #. TRANS: Button on avatar upload page to delete current avatar.
 #. TRANS: Button text for user account deletion.
-#: actions/avatarsettings.php:155 actions/deleteaccount.php:319
 msgctxt "BUTTON"
 msgid "Delete"
 msgstr "Ta bort"
 
 #. TRANS: Button on avatar upload page to upload an avatar.
 #. TRANS: Submit button to confirm upload of a user backup file for account restore.
-#: actions/avatarsettings.php:173 actions/restoreaccount.php:369
 msgctxt "BUTTON"
 msgid "Upload"
 msgstr "Ladda upp"
 
 #. TRANS: Button on avatar upload crop form to confirm a selected crop as avatar.
-#: actions/avatarsettings.php:243
 msgctxt "BUTTON"
 msgid "Crop"
 msgstr "Beskär"
 
 #. TRANS: Validation error on avatar upload form when no file was uploaded.
-#: actions/avatarsettings.php:318
 msgid "No file uploaded."
 msgstr "Ingen fil laddades upp."
 
 #. TRANS: Avatar upload form instruction after uploading a file.
-#: actions/avatarsettings.php:345
 #, fuzzy
 msgid "Pick a square area of the image to be your avatar."
 msgstr "Välj ett kvadratiskt område i bilden som din avatar"
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
 #. TRANS: Server error displayed trying to crop an uploaded group logo that is no longer present.
-#: actions/avatarsettings.php:360 actions/grouplogo.php:391
 msgid "Lost our file data."
 msgstr "Förlorade vår fildata."
 
 #. TRANS: Success message for having updated a user avatar.
-#: actions/avatarsettings.php:384
 msgid "Avatar updated."
 msgstr "Avatar uppdaterad."
 
 #. TRANS: Error displayed on the avatar upload page if the avatar could not be updated for an unknown reason.
-#: actions/avatarsettings.php:388
 msgid "Failed updating avatar."
 msgstr "Misslyckades uppdatera avatar."
 
 #. TRANS: Success message for deleting a user avatar.
-#: actions/avatarsettings.php:412
 msgid "Avatar deleted."
 msgstr "Avatar borttagen."
 
 #. TRANS: Title for backup account page.
 #. TRANS: Option in profile settings to create a backup of the account of the currently logged in user.
-#: actions/backupaccount.php:61 actions/profilesettings.php:468
 msgid "Backup account"
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to backup an account while not logged in.
-#: actions/backupaccount.php:79
 #, fuzzy
 msgid "Only logged-in users can backup their account."
 msgstr "Bara inloggade användaren kan upprepa notiser."
 
 #. TRANS: Client exception thrown when trying to backup an account without having backup rights.
-#: actions/backupaccount.php:84
 msgid "You may not backup your account."
 msgstr ""
 
 #. TRANS: Information displayed on the backup account page.
-#: actions/backupaccount.php:227
 msgid ""
 "You can backup your account data in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format. This is an experimental feature and provides "
@@ -1683,31 +1313,26 @@ msgid ""
 msgstr ""
 
 #. TRANS: Submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:250
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Backup"
 msgstr "Bakgrund"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:254
 msgid "Backup your account."
 msgstr ""
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
-#: actions/block.php:68
 msgid "You already blocked that user."
 msgstr "Du har redan blockerat denna användare."
 
 #. TRANS: Title for block user page.
 #. TRANS: Legend for block user form.
 #. TRANS: Fieldset legend for block user from group form.
-#: actions/block.php:106 actions/block.php:136 actions/groupblock.php:165
 msgid "Block user"
 msgstr "Blockera användare"
 
 #. TRANS: Explanation of consequences when blocking a user on the block user page.
-#: actions/block.php:139
 msgid ""
 "Are you sure you want to block this user? Afterwards, they will be "
 "unsubscribed from you, unable to subscribe to you in the future, and you "
@@ -1723,15 +1348,11 @@ msgstr ""
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:154 actions/deleteapplication.php:157
-#: actions/deletegroup.php:220 actions/deletenotice.php:155
-#: actions/deleteuser.php:154 actions/groupblock.php:187
 msgctxt "BUTTON"
 msgid "No"
 msgstr "Nej"
 
 #. TRANS: Submit button title for 'No' when blocking a user.
-#: actions/block.php:158
 #, fuzzy
 msgid "Do not block this user."
 msgstr "Blockera inte denna användare"
@@ -1742,180 +1363,144 @@ msgstr "Blockera inte denna användare"
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:161 actions/deleteapplication.php:164
-#: actions/deletegroup.php:227 actions/deletenotice.php:162
-#: actions/deleteuser.php:161 actions/groupblock.php:194
 msgctxt "BUTTON"
 msgid "Yes"
 msgstr "Ja"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:165
 #, fuzzy
 msgid "Block this user."
 msgstr "Blockera denna användare"
 
 #. TRANS: Server error displayed when blocking a user fails.
-#: actions/block.php:189
 msgid "Failed to save block information."
 msgstr "Misslyckades att spara blockeringsinformation."
 
 #. TRANS: Title for first page with list of users blocked from a group.
 #. TRANS: %s is a group nickname.
-#: actions/blockedfromgroup.php:101
 #, php-format
 msgid "%s blocked profiles"
 msgstr "%s blockerade profiler"
 
 #. TRANS: Title for any but the first page with list of users blocked from a group.
 #. TRANS: %1$s is a group nickname, %2$d is a page number.
-#: actions/blockedfromgroup.php:106
 #, php-format
 msgid "%1$s blocked profiles, page %2$d"
 msgstr "%1$s blockerade profiler, sida %2$d"
 
 #. TRANS: Instructions for list of users blocked from a group.
-#: actions/blockedfromgroup.php:122
 msgid "A list of the users blocked from joining this group."
 msgstr ""
 "En lista med de användare som blockerats från att gå med i denna grupp."
 
 #. TRANS: Form legend for unblocking a user from a group.
-#: actions/blockedfromgroup.php:291
 msgid "Unblock user from group"
 msgstr "Häv blockering av användare från grupp"
 
 #. TRANS: Button text for unblocking a user from a group.
-#: actions/blockedfromgroup.php:323
 msgctxt "BUTTON"
 msgid "Unblock"
 msgstr "Häv blockering"
 
 #. TRANS: Tooltip for button for unblocking a user from a group.
 #. TRANS: Description of the form to unblock a user.
-#: actions/blockedfromgroup.php:327 lib/unblockform.php:78
 msgid "Unblock this user"
 msgstr "Häv blockering av denna användare"
 
 #. TRANS: Title for mini-posting window loaded from bookmarklet.
 #. TRANS: %s is the StatusNet site name.
-#: actions/bookmarklet.php:51
 #, php-format
 msgid "Post to %s"
 msgstr "Posta till %s"
 
 #. TRANS: Client error displayed when not providing a confirmation code in the contact address confirmation action.
-#: actions/confirmaddress.php:74
 msgid "No confirmation code."
 msgstr "Ingen bekräftelsekod."
 
 #. TRANS: Client error displayed when providing a non-existing confirmation code in the contact address confirmation action.
-#: actions/confirmaddress.php:80
 msgid "Confirmation code not found."
 msgstr "Bekräftelsekod kunde inte hittas."
 
 #. TRANS: Client error displayed when not providing a confirmation code for another user in the contact address confirmation action.
-#: actions/confirmaddress.php:86
 msgid "That confirmation code is not for you!"
 msgstr "Denna bekräftelsekod är inte för dig!"
 
 #. TRANS: Server error for an unknown address type, which can be 'email', 'sms', or the name of an IM network (such as 'xmpp' or 'aim')
-#: actions/confirmaddress.php:94
-#, fuzzy, php-format
+#, php-format
 msgid "Unrecognized address type %s"
-msgstr "Adresstypen %s känns inte igen."
+msgstr "Adresstypen %s känns inte igen"
 
 #. TRANS: Client error for an already confirmed email/jabber/sms address.
-#: actions/confirmaddress.php:103 actions/confirmaddress.php:136
 msgid "That address has already been confirmed."
 msgstr "Denna adress har redan blivit bekräftad."
 
-#: actions/confirmaddress.php:121 actions/imsettings.php:444
-#: actions/userdesignsettings.php:306
-#, fuzzy
 msgid "Couldn't update user."
 msgstr "Kunde inte uppdatera användare."
 
-#: actions/confirmaddress.php:144
 #, fuzzy
 msgid "Couldn't update user im preferences."
 msgstr "Kunde inte uppdatera användaruppgift."
 
-#: actions/confirmaddress.php:156
 #, fuzzy
 msgid "Couldn't insert user im preferences."
 msgstr "Kunde inte infoga ny prenumeration."
 
 #. TRANS: Server error displayed when an address confirmation code deletion from the
 #. TRANS: database fails in the contact address confirmation action.
-#: actions/confirmaddress.php:169
 msgid "Could not delete address confirmation."
 msgstr "Kunde inte ta bort adressbekräftelse."
 
 #. TRANS: Title for the contact address confirmation action.
-#: actions/confirmaddress.php:185
 msgid "Confirm address"
 msgstr "Bekräfta adress"
 
 #. TRANS: Success message for the contact address confirmation action.
 #. TRANS: %s can be 'email', 'jabber', or 'sms'.
-#: actions/confirmaddress.php:200
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "Adressen \"%s\" har blivit bekräftad för ditt konto."
 
 #. TRANS: Title for page with a conversion (multiple notices in context).
-#: actions/conversation.php:96
 msgid "Conversation"
 msgstr "Konversationer"
 
 #. TRANS: Header on conversation page. Hidden by default (h2).
 #. TRANS: Label for user statistics.
-#: actions/conversation.php:149 lib/noticelist.php:87
-#: lib/profileaction.php:246 lib/searchgroupnav.php:82
-#: lib/threadednoticelist.php:66
 msgid "Notices"
 msgstr "Notiser"
 
 #. TRANS: Client exception displayed trying to delete a user account while not logged in.
-#: actions/deleteaccount.php:71
 #, fuzzy
 msgid "Only logged-in users can delete their account."
 msgstr "Bara inloggade användaren kan upprepa notiser."
 
 #. TRANS: Client exception displayed trying to delete a user account without have the rights to do that.
-#: actions/deleteaccount.php:77
 #, fuzzy
 msgid "You cannot delete your account."
 msgstr "Du kan inte ta bort användare."
 
 #. TRANS: Confirmation text for user deletion. The user has to type this exactly the same, including punctuation.
-#: actions/deleteaccount.php:160 actions/deleteaccount.php:297
 msgid "I am sure."
 msgstr ""
 
 #. TRANS: Notification for user about the text that must be input to be able to delete a user account.
 #. TRANS: %s is the text that needs to be input.
-#: actions/deleteaccount.php:164
 #, php-format
 msgid "You must write \"%s\" exactly in the box."
 msgstr ""
 
 #. TRANS: Confirmation that a user account has been deleted.
-#: actions/deleteaccount.php:206
 #, fuzzy
 msgid "Account deleted."
 msgstr "Avatar borttagen."
 
 #. TRANS: Page title for page on which a user account can be deleted.
 #. TRANS: Option in profile settings to delete the account of the currently logged in user.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:476
 #, fuzzy
 msgid "Delete account"
 msgstr "Skapa ett konto"
 
 #. TRANS: Form text for user deletion form.
-#: actions/deleteaccount.php:279
 msgid ""
 "This will <strong>permanently delete</strong> your account data from this "
 "server."
@@ -1923,7 +1508,6 @@ msgstr ""
 
 #. TRANS: Additional form text for user deletion form shown if a user has account backup rights.
 #. TRANS: %s is a URL to the backup page.
-#: actions/deleteaccount.php:285
 #, php-format
 msgid ""
 "You are strongly advised to <a href=\"%s\">back up your data</a> before "
@@ -1932,56 +1516,43 @@ msgstr ""
 
 #. TRANS: Field label for delete account confirmation entry.
 #. TRANS: Field label for password reset form where the password has to be typed again.
-#: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:262 actions/register.php:419
 msgid "Confirm"
 msgstr "Bekräfta"
 
 #. TRANS: Input title for the delete account field.
 #. TRANS: %s is the text that needs to be input.
-#: actions/deleteaccount.php:304
 #, fuzzy, php-format
 msgid "Enter \"%s\" to confirm that you want to delete your account."
 msgstr "Du kan inte ta bort användare."
 
 #. TRANS: Button title for user account deletion.
-#: actions/deleteaccount.php:323
 #, fuzzy
 msgid "Permanently delete your account"
 msgstr "Du kan inte ta bort användare."
 
 #. TRANS: Client error displayed trying to delete an application while not logged in.
-#: actions/deleteapplication.php:62
 msgid "You must be logged in to delete an application."
 msgstr "Du måste vara inloggad för att ta bort en applikation."
 
 #. TRANS: Client error displayed trying to delete an application that does not exist.
-#: actions/deleteapplication.php:71
 msgid "Application not found."
 msgstr "Applikation hittades inte."
 
 #. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
-#: actions/deleteapplication.php:79 actions/editapplication.php:78
-#: actions/showapplication.php:90
 msgid "You are not the owner of this application."
 msgstr "Du är inte ägaren av denna applikation."
 
 #. TRANS: Client error text when there is a problem with the session token.
-#: actions/deleteapplication.php:102 actions/editapplication.php:131
-#: actions/newapplication.php:112 actions/showapplication.php:113
-#: lib/action.php:1391
 msgid "There was a problem with your session token."
 msgstr "Det var ett problem med din sessions-token."
 
 #. TRANS: Title for delete application page.
 #. TRANS: Fieldset legend on delete application page.
-#: actions/deleteapplication.php:124 actions/deleteapplication.php:149
 msgid "Delete application"
 msgstr "Ta bort applikation"
 
 #. TRANS: Confirmation text on delete application page.
-#: actions/deleteapplication.php:152
 msgid ""
 "Are you sure you want to delete this application? This will clear all data "
 "about the application from the database, including all existing user "
@@ -1992,57 +1563,47 @@ msgstr ""
 "användaranslutningar."
 
 #. TRANS: Submit button title for 'No' when deleting an application.
-#: actions/deleteapplication.php:161
 #, fuzzy
 msgid "Do not delete this application."
 msgstr "Ta inte bort denna applikation"
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
-#: actions/deleteapplication.php:167
 #, fuzzy
 msgid "Delete this application."
 msgstr "Ta bort denna applikation"
 
 #. TRANS: Client error when trying to delete group while not logged in.
-#: actions/deletegroup.php:64
 msgid "You must be logged in to delete a group."
 msgstr "Du måste vara inloggad för att ta bort en grupp."
 
 #. TRANS: Client error when trying to delete a group without providing a nickname or ID for the group.
 #. TRANS: Client error displayed when trying to join a group without providing a group name or group ID.
 #. TRANS: Client error displayed when trying to leave a group without providing a group name or group ID.
-#: actions/deletegroup.php:94 actions/joingroup.php:89
-#: actions/leavegroup.php:89
 msgid "No nickname or ID."
 msgstr "Inget smeknamn eller ID."
 
 #. TRANS: Client error when trying to delete a group without having the rights to delete it.
-#: actions/deletegroup.php:107
 msgid "You are not allowed to delete this group."
 msgstr "Du får inte ta bort denna grupp."
 
 #. TRANS: Server error displayed if a group could not be deleted.
 #. TRANS: %s is the name of the group that could not be deleted.
-#: actions/deletegroup.php:150
 #, php-format
 msgid "Could not delete group %s."
 msgstr "Kunde inte ta bort grupp %s."
 
 #. TRANS: Message given after deleting a group.
 #. TRANS: %s is the deleted group's name.
-#: actions/deletegroup.php:159
 #, fuzzy, php-format
 msgid "Deleted group %s"
 msgstr "%1$s lämnade grupp %2$s"
 
 #. TRANS: Title of delete group page.
 #. TRANS: Form legend for deleting a group.
-#: actions/deletegroup.php:176 actions/deletegroup.php:202
 msgid "Delete group"
 msgstr "Ta bort grupp"
 
 #. TRANS: Warning in form for deleleting a group.
-#: actions/deletegroup.php:206
 #, fuzzy
 msgid ""
 "Are you sure you want to delete this group? This will clear all data about "
@@ -2053,13 +1614,11 @@ msgstr ""
 "gruppen från databasen, utan en säkerhetskopia. "
 
 #. TRANS: Submit button title for 'No' when deleting a group.
-#: actions/deletegroup.php:224
 #, fuzzy
 msgid "Do not delete this group."
 msgstr "Ta inte bort denna grupp"
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
-#: actions/deletegroup.php:231
 #, fuzzy
 msgid "Delete this group."
 msgstr "Ta bort denna grupp"
@@ -2070,22 +1629,18 @@ msgstr "Ta bort denna grupp"
 #. TRANS: Client error displayed trying to block a user from a group while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying to log out when not logged in.
+#. TRANS: Client error displayed when trying to access the "make admin" page while not logged in.
+#. TRANS: Client error displayed trying to create a new direct message while not logged in.
+#. TRANS: Client error displayed trying to send a notice while not logged in.
+#. TRANS: Client error displayed trying to nudge a user without being logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
 #. TRANS: Client error displayed when trying to change user options while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
-#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:70
-#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
-#: actions/nudge.php:63 actions/pluginenable.php:97 actions/subedit.php:33
-#: actions/subscribe.php:98 actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:71 lib/profileformaction.php:63
-#: lib/settingsaction.php:72
 msgid "Not logged in."
 msgstr "Inte inloggad."
 
 #. TRANS: Instructions for deleting a notice.
-#: actions/deletenotice.php:110
 msgid ""
 "You are about to permanently delete a notice. Once this is done, it cannot "
 "be undone."
@@ -2095,51 +1650,42 @@ msgstr ""
 
 #. TRANS: Page title when deleting a notice.
 #. TRANS: Fieldset legend for the delete notice form.
-#: actions/deletenotice.php:117 actions/deletenotice.php:148
 msgid "Delete notice"
 msgstr "Ta bort notis"
 
 #. TRANS: Message for the delete notice form.
-#: actions/deletenotice.php:152
 msgid "Are you sure you want to delete this notice?"
 msgstr "Är du säker på att du vill ta bort denna notis?"
 
 #. TRANS: Submit button title for 'No' when deleting a notice.
-#: actions/deletenotice.php:159
 #, fuzzy
 msgid "Do not delete this notice."
 msgstr "Ta inte bort denna notis"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:166
 #, fuzzy
 msgid "Delete this notice."
 msgstr "Ta bort denna notis"
 
 #. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
-#: actions/deleteuser.php:66
 msgid "You cannot delete users."
 msgstr "Du kan inte ta bort användare."
 
 #. TRANS: Client error displayed when trying to delete a non-local user.
-#: actions/deleteuser.php:74
 msgid "You can only delete local users."
 msgstr "Du kan bara ta bort lokala användare."
 
 #. TRANS: Title of delete user page.
-#: actions/deleteuser.php:110
 #, fuzzy
 msgctxt "TITLE"
 msgid "Delete user"
 msgstr "Ta bort användare"
 
 #. TRANS: Fieldset legend on delete user page.
-#: actions/deleteuser.php:134
 msgid "Delete user"
 msgstr "Ta bort användare"
 
 #. TRANS: Information text to request if a user is certain that the described action has to be performed.
-#: actions/deleteuser.php:138
 msgid ""
 "Are you sure you want to delete this user? This will clear all data about "
 "the user from the database, without a backup."
@@ -2148,99 +1694,80 @@ msgstr ""
 "data om användaren från databasen, utan en säkerhetskopia."
 
 #. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/deleteuser.php:158
 #, fuzzy
 msgid "Do not delete this user."
 msgstr "Ta inte bort denna grupp"
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
-#: actions/deleteuser.php:165
 #, fuzzy
 msgid "Delete this user."
 msgstr "Ta bort denna användare"
 
 #. TRANS: Message used as title for design settings for the site.
-#: actions/designadminpanel.php:60 lib/settingsnav.php:97
 msgid "Design"
 msgstr "Utseende"
 
 #. TRANS: Instructions for design adminsitration panel.
-#: actions/designadminpanel.php:71
 msgid "Design settings for this StatusNet site"
 msgstr ""
 
 #. TRANS: Client error displayed when a logo URL does is not valid.
-#: actions/designadminpanel.php:327
 msgid "Invalid logo URL."
 msgstr "Ogiltig webbadress för logtyp."
 
 #. TRANS: Client error displayed when an SSL logo URL is invalid.
-#: actions/designadminpanel.php:333
 msgid "Invalid SSL logo URL."
 msgstr "Ogiltig webbadress för SSL-logtyp."
 
 #. TRANS: Client error displayed when a theme is submitted through the form that is not in the theme list.
 #. TRANS: %s is the chosen unavailable theme.
-#: actions/designadminpanel.php:339
 #, php-format
 msgid "Theme not available: %s."
 msgstr "Tema inte tillgängligt: %s."
 
 #. TRANS: Fieldset legend for form to change logo.
-#: actions/designadminpanel.php:437
 msgid "Change logo"
 msgstr "Byt logotyp"
 
 #. TRANS: Field label for StatusNet site logo.
-#: actions/designadminpanel.php:444
 msgid "Site logo"
 msgstr "Webbplatslogotyp"
 
 #. TRANS: Field label for SSL StatusNet site logo.
-#: actions/designadminpanel.php:452
 msgid "SSL logo"
 msgstr "SSL-logotyp"
 
 #. TRANS: Fieldset legend for form change StatusNet site's theme.
-#: actions/designadminpanel.php:467
 msgid "Change theme"
 msgstr "Byt tema"
 
 #. TRANS: Field label for dropdown to choose site theme.
-#: actions/designadminpanel.php:485
 msgid "Site theme"
 msgstr "Webbplatstema"
 
 #. TRANS: Title for field label for dropdown to choose site theme.
-#: actions/designadminpanel.php:487
 msgid "Theme for the site."
 msgstr "Tema för webbplatsen."
 
 #. TRANS: Field label for uploading a cutom theme.
-#: actions/designadminpanel.php:494
 msgid "Custom theme"
 msgstr "Anpassat tema"
 
 #. TRANS: Form instructions for uploading a cutom StatusNet theme.
-#: actions/designadminpanel.php:499
 msgid "You can upload a custom StatusNet theme as a .ZIP archive."
 msgstr "Du kan ladda upp ett eget StatusNet-tema som ett .ZIP-arkiv."
 
 #. TRANS: Fieldset legend for theme background image.
-#: actions/designadminpanel.php:515
 msgid "Change background image"
 msgstr "Ändra bakgrundsbild"
 
 #. TRANS: Field label for background image on theme designer page.
 #. TRANS: Field label for background color selector.
 #. TRANS: Label on profile design page for setting a profile page background colour.
-#: actions/designadminpanel.php:525 actions/designadminpanel.php:609
-#: lib/designform.php:238
 msgid "Background"
 msgstr "Bakgrund"
 
 #. TRANS: Form guide for background image upload form on theme designer page.
-#: actions/designadminpanel.php:531
 #, php-format
 msgid ""
 "You can upload a background image for the site. The maximum file size is %1"
@@ -2250,202 +1777,167 @@ msgstr ""
 "filstorleken är %1$s."
 
 #. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:558
 msgid "On"
 msgstr "På"
 
 #. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:575
 msgid "Off"
 msgstr "Av"
 
 #. TRANS: Form guide for turning background image on or off on theme designer page.
 #. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
 #. TRANS: use of the uploaded profile image.
-#: actions/designadminpanel.php:577 lib/designform.php:214
 msgid "Turn background image on or off."
 msgstr "Sätt på eller stäng av bakgrundsbild."
 
 #. TRANS: Checkbox label to title background image on theme designer page.
 #. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-#: actions/designadminpanel.php:583 lib/designform.php:220
 msgid "Tile background image"
 msgstr "Upprepa bakgrundsbild"
 
 #. TRANS: Fieldset legend for theme colors.
-#: actions/designadminpanel.php:598
 #, fuzzy
 msgid "Change colors"
 msgstr "Byt färger"
 
 #. TRANS: Field label for content color selector.
 #. TRANS: Label on profile design page for setting a profile page content colour.
-#: actions/designadminpanel.php:623 lib/designform.php:252
 msgid "Content"
 msgstr "Innehåll"
 
 #. TRANS: Field label for sidebar color selector.
 #. TRANS: Label on profile design page for setting a profile page sidebar colour.
-#: actions/designadminpanel.php:637 lib/designform.php:266
 msgid "Sidebar"
 msgstr "Sidofält"
 
 #. TRANS: Field label for text color selector.
 #. TRANS: Label on profile design page for setting a profile page text colour.
-#: actions/designadminpanel.php:651 lib/designform.php:280
 msgid "Text"
 msgstr "Text"
 
 #. TRANS: Field label for link color selector.
 #. TRANS: Label on profile design page for setting a profile page links colour.
-#: actions/designadminpanel.php:665 lib/designform.php:294
 msgid "Links"
 msgstr "Länkar"
 
 #. TRANS: Fieldset legend for advanced theme design settings.
-#: actions/designadminpanel.php:691
 msgid "Advanced"
 msgstr "Avancerat"
 
 #. TRANS: Field label for custom CSS.
-#: actions/designadminpanel.php:696
 msgid "Custom CSS"
 msgstr "Anpassad CSS"
 
 #. TRANS: Button text for resetting theme settings.
-#: actions/designadminpanel.php:718
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Use defaults"
 msgstr "Använd standardvärden"
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:720
 #, fuzzy
 msgid "Restore default designs."
 msgstr "Återställ standardutseende"
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:728
 #, fuzzy
 msgid "Reset back to default."
 msgstr "Återställ till standardvärde"
 
 #. TRANS: Title for button for saving theme settings.
-#: actions/designadminpanel.php:736
 #, fuzzy
 msgid "Save design."
 msgstr "Spara utseende"
 
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
-#: actions/disfavor.php:83
 msgid "This notice is not a favorite!"
 msgstr "Denna notis är inte en favorit!"
 
 #. TRANS: Title for page on which favorites can be added.
-#: actions/disfavor.php:98
 msgid "Add to favorites"
 msgstr "Lägg till i favoriter"
 
 #. TRANS: Client exception thrown when requesting a document from the documentation that does not exist.
 #. TRANS: %s is the non-existing document.
-#: actions/doc.php:155
 #, fuzzy, php-format
 msgid "No such document \"%s\"."
 msgstr "Inget sådant dokument \"%s\""
 
 #. TRANS: Title for "Edit application" form.
 #. TRANS: Form legend.
-#: actions/editapplication.php:54 lib/applicationeditform.php:129
 msgid "Edit application"
 msgstr "Redigera applikation"
 
 #. TRANS: Client error displayed trying to edit an application while not logged in.
-#: actions/editapplication.php:66
 msgid "You must be logged in to edit an application."
 msgstr "Du måste vara inloggad för att redigera en applikation."
 
 #. TRANS: Client error displayed trying to edit an application that does not exist.
-#: actions/editapplication.php:83 actions/showapplication.php:83
 msgid "No such application."
 msgstr "Ingen sådan applikation."
 
 #. TRANS: Instructions for "Edit application" form.
-#: actions/editapplication.php:167
 msgid "Use this form to edit your application."
 msgstr "Använd detta formulär för att redigera din applikation."
 
 #. TRANS: Validation error shown when not providing a name in the "Edit application" form.
 #. TRANS: Validation error shown when not providing a name in the "New application" form.
-#: actions/editapplication.php:184 actions/newapplication.php:164
 msgid "Name is required."
 msgstr "Namn krävs."
 
 #. 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.
-#: actions/editapplication.php:188 actions/newapplication.php:172
 msgid "Name is too long (maximum 255 characters)."
 msgstr "Namnet är för långt (max 255 tecken)."
 
 #. TRANS: Validation error shown when providing a name for an application that already exists in the "Edit application" form.
 #. TRANS: Validation error shown when providing a name for an application that already exists in the "New application" form.
-#: actions/editapplication.php:192 actions/newapplication.php:168
 msgid "Name already in use. Try another one."
 msgstr "Namnet används redan. Prova ett annat."
 
 #. TRANS: Validation error shown when not providing a description in the "Edit application" form.
 #. TRANS: Validation error shown when not providing a description in the "New application" form.
-#: actions/editapplication.php:196 actions/newapplication.php:176
 msgid "Description is required."
 msgstr "Beskrivning krävs."
 
 #. TRANS: Validation error shown when providing too long a source URL in the "Edit application" form.
-#: actions/editapplication.php:209
 msgid "Source URL is too long."
 msgstr "Webbadress till källa är för lång."
 
 #. TRANS: Validation error shown when providing an invalid source URL in the "Edit application" form.
 #. TRANS: Validation error shown when providing an invalid source URL in the "New application" form.
-#: actions/editapplication.php:216 actions/newapplication.php:199
 msgid "Source URL is not valid."
 msgstr "Webbadress till källa är inte giltig."
 
 #. 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.
-#: actions/editapplication.php:220 actions/newapplication.php:203
 msgid "Organization is required."
 msgstr "Organisation krävs."
 
 #. TRANS: Validation error shown when providing too long an arganisation name in the "Edit application" form.
-#: actions/editapplication.php:224 actions/newapplication.php:207
 msgid "Organization is too long (maximum 255 characters)."
 msgstr "Organisation är för lång (max 255 tecken)."
 
 #. TRANS: Form validation error show when an organisation name has not been provided in the edit application form.
 #. TRANS: Form validation error show when an organisation name has not been provided in the new application form.
-#: actions/editapplication.php:228 actions/newapplication.php:211
 msgid "Organization homepage is required."
 msgstr "Hemsida för organisation krävs."
 
 #. TRANS: Validation error shown when providing too long a callback URL in the "Edit application" form.
 #. TRANS: Validation error shown when providing too long a callback URL in the "New application" form.
-#: actions/editapplication.php:239 actions/newapplication.php:225
 msgid "Callback is too long."
 msgstr "Anrop är för lång."
 
 #. TRANS: Validation error shown when providing an invalid callback URL in the "Edit application" form.
 #. TRANS: Validation error shown when providing an invalid callback URL in the "New application" form.
-#: actions/editapplication.php:247 actions/newapplication.php:235
 msgid "Callback URL is not valid."
 msgstr "Webbadress för anrop är inte giltig."
 
 #. TRANS: Server error occuring when an application could not be updated from the "Edit application" form.
-#: actions/editapplication.php:284
 msgid "Could not update application."
 msgstr "Kunde inte uppdatera applikation."
 
 #. TRANS: Title for form to edit a group. %s is a group nickname.
-#: actions/editgroup.php:55
 #, php-format
 msgid "Edit %s group"
 msgstr "Redigera %s grupp"
@@ -2453,40 +1945,40 @@ msgstr "Redigera %s grupp"
 #. TRANS: Client error displayed trying to edit a group while not logged in.
 #. TRANS: Client error displayed when trying to create a group while not logged in.
 #. TRANS: Client error displayed trying to create a group while not logged in.
-#: actions/editgroup.php:68 actions/grouplogo.php:69 actions/newgroup.php:65
 msgid "You must be logged in to create a group."
 msgstr "Du måste vara inloggad för att skapa en grupp."
 
 #. TRANS: Form instructions for group edit form.
-#: actions/editgroup.php:161
 msgid "Use this form to edit the group."
 msgstr "Använd detta formulär för att redigera gruppen."
 
+#. TRANS: Group edit form validation error.
+#. TRANS: Group create form validation error.
+#. TRANS: %s is the invalid alias.
+#, php-format
+msgid "Invalid alias: \"%s\""
+msgstr "Ogiltigt alias: \"%s\""
+
 #. TRANS: Group edit form success message.
-#: actions/editgroup.php:301
 msgid "Options saved."
 msgstr "Alternativ sparade."
 
 #. TRANS: Title for e-mail settings.
-#: actions/emailsettings.php:60
 msgid "Email settings"
 msgstr "E-postinställningar"
 
 #. TRANS: E-mail settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/emailsettings.php:74
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 msgstr "Hantera hur du får e-post från %%site.name%%"
 
 #. TRANS: Form legend for e-mail settings form.
 #. TRANS: Field label for e-mail address input in e-mail settings form.
-#: actions/emailsettings.php:104 actions/emailsettings.php:130
 msgid "Email address"
 msgstr "E-postadress"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:110
 msgid "Current confirmed email address."
 msgstr "Aktuell, bekräftad e-postadress."
 
@@ -2495,15 +1987,11 @@ msgstr "Aktuell, bekräftad e-postadress."
 #. TRANS: Button label to remove a confirmed IM address.
 #. TRANS: Button label to remove a confirmed SMS address.
 #. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
-#: actions/emailsettings.php:113 actions/emailsettings.php:180
-#: actions/imsettings.php:119 actions/smssettings.php:119
-#: actions/smssettings.php:175
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Ta bort"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:120
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -2516,45 +2004,37 @@ msgstr ""
 #. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
 #. TRANS: Any other domain may be owned by a legitimate person or
 #. TRANS: organization.
-#: actions/emailsettings.php:137
 msgid "Email address, like \"UserName@example.org\""
 msgstr "E-postadress, såsom \"användarnamn@example.org\""
 
 #. TRANS: Button label for adding an e-mail address in e-mail settings form.
 #. TRANS: Button label for adding an IM address in IM settings form.
 #. TRANS: Button label for adding a SMS phone number in SMS settings form.
-#: actions/emailsettings.php:141 actions/imsettings.php:147
-#: actions/smssettings.php:157
 msgctxt "BUTTON"
 msgid "Add"
 msgstr "Lägg till"
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:149 actions/smssettings.php:166
 msgid "Incoming email"
 msgstr "Inkommande e-post"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:155
 msgid "I want to post notices by email."
 msgstr "Jag vill posta notiser genom min e-post."
 
 #. TRANS: Form instructions for incoming e-mail form in e-mail settings.
 #. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
-#: actions/emailsettings.php:177 actions/smssettings.php:173
 msgid "Send email to this address to post new notices."
 msgstr "Skicka e-post till denna adress för att posta nya notiser."
 
 #. TRANS: Instructions for incoming e-mail address input form, when an address has already been assigned.
 #. TRANS: Instructions for incoming SMS e-mail address input form.
-#: actions/emailsettings.php:186 actions/smssettings.php:181
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr ""
 "Ange en ny e-postadress för att posta till; detta inaktiverar den gamla."
 
 #. TRANS: Instructions for incoming e-mail address input form.
-#: actions/emailsettings.php:190
 msgid ""
 "To send notices via email, we need to create a unique email address for you "
 "on this server:"
@@ -2562,89 +2042,71 @@ msgstr ""
 
 #. TRANS: Button label for adding an e-mail address to send notices from.
 #. TRANS: Button label for adding an SMS e-mail address to send notices from.
-#: actions/emailsettings.php:196 actions/smssettings.php:184
 msgctxt "BUTTON"
 msgid "New"
 msgstr "Ny"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:205
 msgid "Email preferences"
 msgstr "E-postinställningar"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:213
 msgid "Send me notices of new subscriptions through email."
 msgstr "Skicka notiser om nya prenumerationer till mig genom e-post."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:219
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr "Skicka mig e-post när någon lägger till min notis som en favorit."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:226
 msgid "Send me email when someone sends me a private message."
 msgstr "Skicka mig e-post när någon skickar mig ett privat meddelande."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:232
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr "Skicka mig e-post när någon skickar ett \"@-svar\"."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:238
 msgid "Allow friends to nudge me and send me an email."
 msgstr "Tillåt vänner att knuffa mig och skicka e-post till mig."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:244
 msgid "Publish a MicroID for my email address."
 msgstr "Publicera ett MicroID för min e-postadress."
 
 #. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:362
 msgid "Email preferences saved."
 msgstr "E-postinställningar sparade."
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:381
 msgid "No email address."
 msgstr "Ingen e-postadress."
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:389
 #, fuzzy
 msgid "Cannot normalize that email address."
 msgstr "Kan inte normalisera den e-postadressen"
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:394 actions/register.php:197
-#: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "Inte en giltig e-postadress."
 
 #. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:398
 msgid "That is already your email address."
 msgstr "Det är redan din e-postadress."
 
 #. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:402
 msgid "That email address already belongs to another user."
 msgstr "Den e-postadressen tillhör redan en annan användare."
 
 #. TRANS: Server error thrown on database error adding e-mail confirmation code.
 #. TRANS: Server error thrown on database error adding Instant Messaging confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:419 actions/imsettings.php:362
-#: actions/smssettings.php:364
 #, fuzzy
 msgid "Could not insert confirmation code."
 msgstr "Kunde inte infoga bekräftelsekod."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:426
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
@@ -2656,104 +2118,84 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling Instant Messaging address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:446 actions/imsettings.php:391
-#: actions/smssettings.php:398
 msgid "No pending confirmation to cancel."
 msgstr "Ingen väntande bekräftelse att avbryta."
 
 #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:451
 msgid "That is the wrong email address."
 msgstr "Detta är fel e-postadress."
 
 #. TRANS: Server error thrown on database error canceling e-mail address confirmation.
 #. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
-#: actions/emailsettings.php:460 actions/smssettings.php:412
 #, fuzzy
 msgid "Could not delete email confirmation."
 msgstr "Kunde inte ta bort e-postbekräftelse."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:465
 msgid "Email confirmation cancelled."
 msgstr "E-postbekräftelse avbruten."
 
 #. TRANS: Message given trying to remove an e-mail address that is not
 #. TRANS: registered for the active user.
-#: actions/emailsettings.php:484
 msgid "That is not your email address."
 msgstr "Det är inte din e-postadress."
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:505
 msgid "The email address was removed."
 msgstr "E-postadressen togs bort."
 
 #. TRANS: Form validation error displayed when trying to remove an incoming e-mail address while no address has been set.
-#: actions/emailsettings.php:519 actions/smssettings.php:554
 msgid "No incoming email address."
 msgstr "Ingen inkommande e-postadress."
 
 #. 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.
-#: actions/emailsettings.php:531 actions/emailsettings.php:555
-#: actions/smssettings.php:565 actions/smssettings.php:590
 #, fuzzy
 msgid "Could not update user record."
 msgstr "Kunde inte uppdatera användaruppgift."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
 #. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:535 actions/smssettings.php:569
 msgid "Incoming email address removed."
 msgstr "Inkommande e-postadress borttagen."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
 #. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:559 actions/smssettings.php:594
 msgid "New incoming email address added."
 msgstr "Ny inkommande e-postadress tillagd."
 
 #. TRANS: Client error displayed when trying to mark a notice as favorite that already is a favorite.
-#: actions/favor.php:80
 msgid "This notice is already a favorite!"
 msgstr "Denna notis är redan en favorit!"
 
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
-#: actions/favor.php:95
 #, fuzzy
 msgid "Disfavor favorite."
 msgstr "Ta bort märkning som favorit"
 
 #. TRANS: Page title for first page of favorited notices.
 #. TRANS: Title for favourited notices section.
-#: actions/favorited.php:65 lib/popularnoticesection.php:62
-#: lib/publicgroupnav.php:93
 msgid "Popular notices"
 msgstr "Populära notiser"
 
 #. TRANS: Page title for all but first page of favorited notices.
 #. TRANS: %d is the page number being displayed.
-#: actions/favorited.php:69
 #, php-format
 msgid "Popular notices, page %d"
 msgstr "Populära notiser, sida %d"
 
 #. TRANS: Description on page displaying favorited notices.
-#: actions/favorited.php:81
 msgid "The most popular notices on the site right now."
 msgstr "De mest populära notiserna på webbplatsen just nu."
 
 #. TRANS: Text displayed instead of a list when a site does not yet have any favourited notices.
-#: actions/favorited.php:149
 msgid "Favorite notices appear on this page but no one has favorited one yet."
 msgstr ""
 "Favoritnotiser kommer upp på denna sida, men ingen har markerat några "
 "favoriter än."
 
 #. TRANS: Additional text displayed instead of a list when a site does not yet have any favourited notices for logged in users.
-#: actions/favorited.php:153
 msgid ""
 "Be the first to add a notice to your favorites by clicking the fave button "
 "next to any notice you like."
@@ -2763,7 +2205,6 @@ msgstr ""
 
 #. TRANS: Additional text displayed instead of a list when a site does not yet have any favourited notices for not logged in users.
 #. TRANS: %%action.register%% is a registration link. "[link text](link)" is Mark Down. Do not change the formatting.
-#: actions/favorited.php:158
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to add a "
@@ -2776,181 +2217,146 @@ msgstr ""
 #. TRANS: %s is a user's nickname.
 #. TRANS: Title for first page of favourite notices of a user.
 #. TRANS: %s is the user for whom the favourite notices are displayed.
-#: actions/favoritesrss.php:111 actions/showfavorites.php:76
-#: lib/personalgroupnav.php:110
 #, php-format
 msgid "%s's favorite notices"
 msgstr "%ss favoritnotiser"
 
 #. TRANS: Desciption of RSS feed with favourite notices of a user.
 #. TRANS: %1$s is a user's nickname, %2$s is the name of the StatusNet site.
-#: actions/favoritesrss.php:117
 #, php-format
 msgid "Updates favored by %1$s on %2$s!"
 msgstr "Uppdateringar markerade som favorit av %1$s på %2$s!"
 
 #. TRANS: Page title for first page of featured users.
 #. TRANS: Title for featured users section.
-#: actions/featured.php:69 lib/featureduserssection.php:87
-#: lib/publicgroupnav.php:89
 msgid "Featured users"
 msgstr "Profilerade användare"
 
 #. TRANS: Page title for all but first page of featured users.
 #. TRANS: %d is the page number being displayed.
-#: actions/featured.php:73
 #, php-format
 msgid "Featured users, page %d"
 msgstr "Profilerade användare, sida %d"
 
 #. TRANS: Description on page displaying featured users.
-#: actions/featured.php:102
 #, fuzzy, php-format
 msgid "A selection of some great users on %s."
 msgstr "Ett urval av några av de stora användarna på %s"
 
 #. TRANS: Client error displayed when no notice ID was given trying do display a file.
-#: actions/file.php:36
 msgid "No notice ID."
 msgstr "Ingen notis-ID."
 
 #. TRANS: Client error displayed when an invalid notice ID was given trying do display a file.
-#: actions/file.php:41
 msgid "No notice."
 msgstr "Ingen notis."
 
 #. TRANS: Client error displayed when trying do display a file for a notice without a file attachement.
-#: actions/file.php:46
 msgid "No attachments."
 msgstr "Inga bilagor."
 
 #. TRANS: Client error displayed when trying do display a file for a notice with file attachements
 #. TRANS: that could not be found.
-#: actions/file.php:58
 msgid "No uploaded attachments."
 msgstr "Inga uppladdade bilagor."
 
 #. TRANS: Client error displayed when subscribing to a remote profile and an unexpected response is received.
-#: actions/finishremotesubscribe.php:69
 msgid "Not expecting this response!"
 msgstr "Väntade mig inte denna respons!"
 
 #. TRANS: Client error displayed when subscribing to a remote profile that does not exist.
-#: actions/finishremotesubscribe.php:81
 msgid "User being listened to does not exist."
 msgstr "Användaren som lyssnas på existerar inte."
 
 #. TRANS: Client error displayed when subscribing to a remote profile that is a local profile.
-#: actions/finishremotesubscribe.php:89 actions/remotesubscribe.php:58
 msgid "You can use the local subscription!"
 msgstr "Du kan använda den lokala prenumerationen!"
 
 #. TRANS: Client error displayed when subscribing to a remote profile that is blocked form subscribing to.
-#: actions/finishremotesubscribe.php:102
 msgid "That user has blocked you from subscribing."
 msgstr "Denna användaren har blockerat dig från att prenumerera."
 
 #. TRANS: Client error displayed when subscribing to a remote profile without providing an authorised token.
-#: actions/finishremotesubscribe.php:114
 msgid "You are not authorized."
 msgstr "Du har inte tillstånd."
 
 #. TRANS: Client error displayed when subscribing to a remote profile and conversion of the request token to access token fails.
-#: actions/finishremotesubscribe.php:118
 msgid "Could not convert request token to access token."
 msgstr "Kunde inte konvertera token för begäran till token för åtkomst."
 
 #. TRANS: Client error displayed when subscribing to a remote profile fails because of an unsupported version of the OMB protocol.
-#: actions/finishremotesubscribe.php:124
 msgid "Remote service uses unknown version of OMB protocol."
 msgstr "Fjärrtjänsten använder en okänd version av OMB-protokollet."
 
 #. TRANS: Server error displayed when subscribing to a remote profile fails because the remote profile could not be updated.
-#: actions/finishremotesubscribe.php:145 lib/oauthstore.php:317
 msgid "Error updating remote profile."
 msgstr "Fel vid uppdatering av fjärrprofil."
 
 #. TRANS: Client error displayed when requesting a non-existent file.
-#: actions/getfile.php:77
 msgid "No such file."
 msgstr "Ingen sådan fil."
 
 #. TRANS: Client error displayed when requesting a file without having read access to it.
-#: actions/getfile.php:82
 msgid "Cannot read file."
 msgstr "Kan inte läsa fil."
 
 #. TRANS: Client error displayed when trying to assign an invalid role to a user.
-#: actions/grantrole.php:61 actions/revokerole.php:62
 msgid "Invalid role."
 msgstr "Ogiltig roll."
 
 #. TRANS: Client error displayed when trying to assign an reserved role to a user.
-#: actions/grantrole.php:66 actions/revokerole.php:66
 msgid "This role is reserved and cannot be set."
 msgstr "Denna roll är reserverad och kan inte ställas in"
 
 #. TRANS: Client error displayed when trying to assign a role to a user while not being allowed to set roles.
-#: actions/grantrole.php:76
 msgid "You cannot grant user roles on this site."
 msgstr "Du kan inte bevilja användare roller på denna webbplats."
 
 #. TRANS: Client error displayed when trying to assign a role to a user that already has that role.
-#: actions/grantrole.php:84
 msgid "User already has this role."
 msgstr "Användaren har redan denna roll."
 
 #. TRANS: Client error displayed trying to block a user from a group while not specifying a to be blocked user profile.
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing a profile.
+#. TRANS: Client error displayed when not providing a profile ID on the Make Admin page.
 #. TRANS: Client error displayed trying a change a subscription without providing a profile.
 #. TRANS: Client error displayed when trying to change user options without specifying a user to work on.
-#: actions/groupblock.php:71 actions/groupunblock.php:71
-#: actions/makeadmin.php:71 actions/subedit.php:49
-#: lib/profileformaction.php:79
 msgid "No profile specified."
 msgstr "Ingen profil angiven."
 
 #. TRANS: Client error displayed trying to block a user from a group while specifying a non-existing profile.
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing an existing profile.
+#. TRANS: Client error displayed when specifying an invalid profile ID on the Make Admin page.
 #. TRANS: Client error displayed trying a change a subscription for a non-existant profile ID.
 #. TRANS: Client error displayed when trying to change user options without specifying an existing user to work on.
-#: actions/groupblock.php:77 actions/groupunblock.php:77
-#: actions/makeadmin.php:76 actions/subedit.php:57 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:87
 msgid "No profile with that ID."
 msgstr "Ingen profil med det ID:t."
 
 #. TRANS: Client error displayed trying to block a user from a group while not specifying a group to block a profile from.
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing a group.
-#: actions/groupblock.php:83 actions/groupunblock.php:83
-#: actions/makeadmin.php:81
+#. TRANS: Client error displayed when not providing a group ID on the Make Admin page.
 msgid "No group specified."
 msgstr "Ingen grupp angiven."
 
 #. TRANS: Client error displayed trying to block a user from a group while not being an admin user.
-#: actions/groupblock.php:95
 msgid "Only an admin can block group members."
 msgstr "Bara en administratör kan blockera gruppmedlemmar."
 
 #. TRANS: Client error displayed trying to block a user from a group while user is already blocked from the given group.
-#: actions/groupblock.php:100
 msgid "User is already blocked from group."
 msgstr "Användaren är redan blockerad från grupp."
 
 #. TRANS: Client error displayed trying to block a user from a group while user is not a member of given group.
-#: actions/groupblock.php:106
 msgid "User is not a member of group."
 msgstr "Användare är inte en gruppmedlem."
 
 #. TRANS: Title for block user from group page.
 #. TRANS: Form legend for form to block user from a group.
-#: actions/groupblock.php:141 actions/groupmembers.php:364
 msgid "Block user from group"
 msgstr "Blockera användare från grupp"
 
 #. TRANS: Explanatory text for block user from group form before setting the block.
 #. TRANS: %1$s is that to be blocked user, %2$s is the group the user will be blocked from.
-#: actions/groupblock.php:169
 #, php-format
 msgid ""
 "Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They "
@@ -2962,40 +2368,33 @@ msgstr ""
 "kunna prenumerera på gruppen i framtiden."
 
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
-#: actions/groupblock.php:191
 #, fuzzy
 msgid "Do not block this user from this group."
 msgstr "Blockera inte denna användare från denna grupp"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
-#: actions/groupblock.php:198
 #, fuzzy
 msgid "Block this user from this group."
 msgstr "Blockera denna användare från denna grupp"
 
 #. TRANS: Server error displayed when trying to block a user from a group fails because of an application error.
-#: actions/groupblock.php:215
 msgid "Database error blocking user from group."
 msgstr "Databasfel vid blockering av användare från grupp."
 
 #. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
 #. TRANS: Client error displayed trying to find a user by ID without providing an ID.
-#: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr "Ingen ID."
 
 #. TRANS: Client error displayed trying to change group design settings while not logged in.
-#: actions/groupdesignsettings.php:67
 msgid "You must be logged in to edit a group."
 msgstr "Du måste vara inloggad för att redigera en grupp."
 
 #. TRANS: Title group design settings page.
-#: actions/groupdesignsettings.php:146
 msgid "Group design"
 msgstr "Gruppens utseende"
 
 #. TRANS: Instructions for group design settings page.
-#: actions/groupdesignsettings.php:157
 msgid ""
 "Customize the way your group looks with a background image and a colour "
 "palette of your choice."
@@ -3003,25 +2402,21 @@ msgstr ""
 "Anpassa hur din grupp ser ut genom att välja bakgrundbild och färgpalett."
 
 #. TRANS: Form validation error displayed when group design settings could not be updated because of an application issue.
-#: actions/groupdesignsettings.php:262
 #, fuzzy
 msgid "Unable to update your design settings."
 msgstr "Kunde inte spara dina utseendeinställningar."
 
 #. TRANS: Form text to confirm saved group design settings.
-#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:239
 msgid "Design preferences saved."
 msgstr "Utseendeinställningar sparade."
 
 #. TRANS: Title for group logo settings page.
 #. TRANS: Group logo form legend.
-#: actions/grouplogo.php:144 actions/grouplogo.php:199
 msgid "Group logo"
 msgstr "Gruppens logotyp"
 
 #. TRANS: Instructions for group logo page.
 #. TRANS: %s is the maximum file size for that site.
-#: actions/grouplogo.php:156
 #, php-format
 msgid ""
 "You can upload a logo image for your group. The maximum file size is %s."
@@ -3030,98 +2425,81 @@ msgstr ""
 "s."
 
 #. TRANS: Submit button for uploading a group logo.
-#: actions/grouplogo.php:243
 msgid "Upload"
 msgstr "Ladda upp"
 
 #. TRANS: Button text for cropping an uploaded group logo.
-#: actions/grouplogo.php:299
 msgid "Crop"
 msgstr "Beskär"
 
 #. TRANS: Form instructions on the group logo page.
-#: actions/grouplogo.php:376
 msgid "Pick a square area of the image to be the logo."
 msgstr "Välj ett kvadratiskt område i bilden som logotyp"
 
 #. TRANS: Form success message after updating a group logo.
-#: actions/grouplogo.php:411
 msgid "Logo updated."
 msgstr "Logtyp uppdaterad."
 
 #. TRANS: Form failure message after failing to update a group logo.
-#: actions/grouplogo.php:414
 msgid "Failed updating logo."
 msgstr "Misslyckades uppdatera logtyp."
 
 #. TRANS: Title of the page showing group members.
 #. TRANS: %s is the name of the group.
-#: actions/groupmembers.php:104
 #, php-format
 msgid "%s group members"
 msgstr "%s gruppmedlemmar"
 
 #. TRANS: Title of the page showing group members.
 #. TRANS: %1$s is the name of the group, %2$d is the page number of the members list.
-#: actions/groupmembers.php:109
 #, php-format
 msgid "%1$s group members, page %2$d"
 msgstr "%1$s gruppmedlemmar, sida %2$d"
 
 #. TRANS: Page notice for group members page.
-#: actions/groupmembers.php:125
 msgid "A list of the users in this group."
 msgstr "En lista av användarna i denna grupp."
 
 #. TRANS: Indicator in group members list that this user is a group administrator.
-#: actions/groupmembers.php:190 lib/action.php:581
 msgid "Admin"
 msgstr "Administratör"
 
 #. TRANS: Button text for the form that will block a user from a group.
-#: actions/groupmembers.php:397
 msgctxt "BUTTON"
 msgid "Block"
 msgstr "Blockera"
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:401
 msgctxt "TOOLTIP"
 msgid "Block this user"
 msgstr "Blockera denna användare"
 
 #. TRANS: Form legend for form to make a user a group admin.
-#: actions/groupmembers.php:488
 msgid "Make user an admin of the group"
 msgstr "Gör användare till en administratör för gruppen"
 
 #. TRANS: Button text for the form that will make a user administrator.
-#: actions/groupmembers.php:521
 msgctxt "BUTTON"
 msgid "Make Admin"
 msgstr "Gör till administratör"
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:525
 msgctxt "TOOLTIP"
 msgid "Make this user an admin"
 msgstr "Gör denna användare till administratör"
 
 #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
-#: actions/grouprss.php:141
 #, php-format
 msgid "Updates from members of %1$s on %2$s!"
 msgstr "Uppdateringar från medlemmar i %1$s på %2$s!"
 
 #. TRANS: Title for first page of the groups list.
-#: actions/groups.php:62
 msgctxt "TITLE"
 msgid "Groups"
 msgstr "Grupper"
 
 #. TRANS: Title for all but the first page of the groups list.
 #. TRANS: %d is the page number.
-#: actions/groups.php:66
 #, fuzzy, php-format
 msgctxt "TITLE"
 msgid "Groups, page %d"
@@ -3130,7 +2508,6 @@ msgstr "Grupper, sida %d"
 #. TRANS: Page notice of group list. %%%%site.name%%%% is the StatusNet site name,
 #. TRANS: %%%%action.groupsearch%%%% and %%%%action.newgroup%%%% are URLs. Do not change them.
 #. TRANS: This message contains Markdown links in the form [link text](link).
-#: actions/groups.php:95
 #, fuzzy, php-format
 msgid ""
 "%%%%site.name%%%% groups let you find and talk with people of similar "
@@ -3146,12 +2523,10 @@ msgstr ""
 "%%%) eller [starta din egen!](%%%%action.newgroup%%%%)"
 
 #. TRANS: Link to create a new group on the group list page.
-#: actions/groups.php:113 actions/usergroups.php:126 lib/groupeditform.php:115
 msgid "Create a new group"
 msgstr "Skapa en ny grupp"
 
 #. TRANS: Instructions for page where groups can be searched. %%site.name%% is the name of the StatusNet site.
-#: actions/groupsearch.php:53
 #, php-format
 msgid ""
 "Search for groups on %%site.name%% by their name, location, or description. "
@@ -3162,21 +2537,17 @@ msgstr ""
 "tecken långa."
 
 #. TRANS: Title for page where groups can be searched.
-#: actions/groupsearch.php:60
 msgid "Group search"
 msgstr "Gruppsökning"
 
 #. TRANS: Text on page where groups can be searched if no results were found for a query.
 #. TRANS: Text for notice search results is the query had no results.
 #. TRANS: Message on the "People search" page where a query has no results.
-#: actions/groupsearch.php:82 actions/noticesearch.php:122
-#: actions/peoplesearch.php:87
 msgid "No results."
 msgstr "Inga resultat."
 
 #. TRANS: Additional text on page where groups can be searched if no results were found for a query for a logged in user.
 #. TRANS: This message contains Markdown links in the form [link text](link).
-#: actions/groupsearch.php:87
 #, fuzzy, php-format
 msgid ""
 "If you cannot find the group you're looking for, you can [create it](%%"
@@ -3187,7 +2558,6 @@ msgstr ""
 
 #. TRANS: Additional text on page where groups can be searched if no results were found for a query for a not logged in user.
 #. TRANS: This message contains Markdown links in the form [link text](link).
-#: actions/groupsearch.php:92
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and [create the group](%%"
@@ -3197,30 +2567,25 @@ msgstr ""
 "%action.newgroup%%) själv!"
 
 #. TRANS: Client error displayed when trying to unblock a user from a group without being an administrator for the group.
-#: actions/groupunblock.php:95
 msgid "Only an admin can unblock group members."
 msgstr "Bara en administratör kan häva blockering av gruppmedlemmar."
 
 #. TRANS: Client error displayed when trying to unblock a non-blocked user from a group.
-#: actions/groupunblock.php:100
 msgid "User is not blocked from group."
 msgstr "Användare är inte blockerad från grupp."
 
 #. TRANS: Server error displayed when unblocking a user from a group fails because of an unknown error.
 #. TRANS: Server error displayed when removing a user block.
-#: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "Fel vid hävning av blockering."
 
 #. TRANS: Title for Instant Messaging settings.
-#: actions/imsettings.php:56
 msgid "IM settings"
 msgstr "Inställningar för snabbmeddelanden"
 
 #. 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.
-#: actions/imsettings.php:69
 #, fuzzy, php-format
 msgid ""
 "You can send and receive notices through instant messaging [instant messages]"
@@ -3230,18 +2595,15 @@ msgstr ""
 "doc.im%%). Konfigurera din adress och dina inställningar nedan."
 
 #. TRANS: Message given in the IM settings if IM is not enabled on the site.
-#: actions/imsettings.php:90
 msgid "IM is not available."
 msgstr "IM är inte tillgänglig."
 
-#: actions/imsettings.php:116
 #, fuzzy, php-format
 msgid "Current confirmed %s address."
 msgstr "Aktuell, bekräftad e-postadress."
 
 #. TRANS: Form note in IM settings form.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:128
 #, fuzzy, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your %s account for a message "
@@ -3250,35 +2612,29 @@ msgstr ""
 "Väntar på bekräftelse för denna adress. Kontrollera ditt Jabber/GTalk-konto "
 "för vidare instruktioner. (La du till %s i din kompislista?)"
 
-#: actions/imsettings.php:140
 msgid "IM address"
 msgstr "Adress för snabbmeddelanden"
 
-#: actions/imsettings.php:142
 #, php-format
 msgid "%s screenname."
 msgstr ""
 
 #. TRANS: Header for IM preferences form.
-#: actions/imsettings.php:163
 #, fuzzy
 msgid "IM Preferences"
 msgstr "Inställningar för snabbmeddelanden"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:174
 #, fuzzy
 msgid "Send me notices"
 msgstr "Skicka en notis"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:176
 #, fuzzy
 msgid "Post a notice when my status changes."
 msgstr "Posta en notis när min Jabber/GTalk-status ändras."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:178
 #, fuzzy
 msgid "Send me replies from people I'm not subscribed to."
 msgstr ""
@@ -3286,54 +2642,45 @@ msgstr ""
 "prenumererar på."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:181
 #, fuzzy
 msgid "Publish a MicroID"
 msgstr "Publicera ett MicroID för min e-postadress."
 
 #. TRANS: Server error thrown on database error updating IM preferences.
-#: actions/imsettings.php:291
 #, fuzzy
 msgid "Couldn't update IM preferences."
 msgstr "Kunde inte uppdatera användare."
 
 #. TRANS: Confirmation message for successful IM preferences save.
 #. TRANS: Confirmation message after saving preferences.
-#: actions/imsettings.php:298 actions/urlsettings.php:244
 msgid "Preferences saved."
 msgstr "Inställningar sparade."
 
 #. TRANS: Message given saving IM address without having provided one.
-#: actions/imsettings.php:320
 #, fuzzy
 msgid "No screenname."
 msgstr "Inget smeknamn."
 
-#: actions/imsettings.php:325
 #, fuzzy
 msgid "No transport."
 msgstr "Ingen notis."
 
 #. TRANS: Message given saving IM address that cannot be normalised.
-#: actions/imsettings.php:333
 #, fuzzy
 msgid "Cannot normalize that screenname"
 msgstr "Kan inte normalisera detta Jabber-ID"
 
 #. TRANS: Message given saving IM address that not valid.
-#: actions/imsettings.php:340
 #, fuzzy
 msgid "Not a valid screenname"
 msgstr "Inte ett giltigt smeknamn."
 
 #. TRANS: Message given saving IM address that is already set for another user.
-#: actions/imsettings.php:344
 #, fuzzy
 msgid "Screenname already belongs to another user."
 msgstr "Jabber-ID:t tillhör redan en annan användare."
 
 #. TRANS: Message given saving valid IM address that is to be confirmed.
-#: actions/imsettings.php:369
 #, fuzzy
 msgid "A confirmation code was sent to the IM address you added."
 msgstr ""
@@ -3341,85 +2688,71 @@ msgstr ""
 "att %s får skicka meddelanden till dig."
 
 #. TRANS: Message given canceling IM address confirmation for the wrong IM address.
-#: actions/imsettings.php:396
 msgid "That is the wrong IM address."
 msgstr "Detta är fel IM-adress."
 
 #. TRANS: Server error thrown on database error canceling IM address confirmation.
-#: actions/imsettings.php:405
 #, fuzzy
 msgid "Couldn't delete confirmation."
 msgstr "Kunde inte ta bort bekräftelse för snabbmeddelanden."
 
 #. TRANS: Message given after successfully canceling IM address confirmation.
-#: actions/imsettings.php:410
 msgid "IM confirmation cancelled."
 msgstr "Bekräftelse för snabbmeddelanden avbruten."
 
 #. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.
-#: actions/imsettings.php:434
 #, fuzzy
 msgid "That is not your screenname."
 msgstr "Detta är inte ditt telefonnummer."
 
 #. TRANS: Server error thrown on database error removing a registered IM address.
-#: actions/imsettings.php:443
 #, fuzzy
 msgid "Couldn't update user im prefs."
 msgstr "Kunde inte uppdatera användaruppgift."
 
 #. TRANS: Message given after successfully removing a registered Instant Messaging address.
-#: actions/imsettings.php:451
 msgid "The IM address was removed."
 msgstr "Adressen för snabbmeddelanden togs bort."
 
 #. TRANS: Title for all but the first page of the inbox page.
 #. TRANS: %1$s is the user's nickname, %2$s is the page number.
-#: actions/inbox.php:59
 #, php-format
 msgid "Inbox for %1$s - page %2$d"
 msgstr "Inkorg för %1$s - sida %2$d"
 
 #. TRANS: Title for the first page of the inbox page.
 #. TRANS: %s is the user's nickname.
-#: actions/inbox.php:64
 #, php-format
 msgid "Inbox for %s"
 msgstr "Inkorg för %s"
 
 #. TRANS: Instructions for user inbox page.
-#: actions/inbox.php:106
 msgid "This is your inbox, which lists your incoming private messages."
 msgstr ""
 "Detta är din inkorg som innehåller dina inkommande privata meddelanden."
 
 #. TRANS: Client error displayed when trying to sent invites while they have been disabled.
-#: actions/invite.php:41
 msgid "Invites have been disabled."
 msgstr "Inbjudningar har blivit inaktiverade."
 
 #. TRANS: Client error displayed when trying to sent invites while not logged in.
 #. TRANS: %s is the StatusNet site name.
-#: actions/invite.php:45
 #, php-format
 msgid "You must be logged in to invite other users to use %s."
 msgstr "Du måste vara inloggad för att kunna bjuda in andra användare till %s."
 
 #. TRANS: Form validation message when providing an e-mail address that does not validate.
 #. TRANS: %s is an invalid e-mail address.
-#: actions/invite.php:78
 #, php-format
 msgid "Invalid email address: %s."
 msgstr "Ogiltig e-postadress: %s."
 
 #. TRANS: Page title when invitations have been sent.
-#: actions/invite.php:117
 msgid "Invitations sent"
 msgstr "Inbjudningar skickade"
 
 #. TRANS: Page title when inviting potential users.
-#: actions/invite.php:120
 msgid "Invite new users"
 msgstr "Bjud in nya användare"
 
@@ -3427,7 +2760,6 @@ msgstr "Bjud in nya användare"
 #. TRANS: is already subscribed to one or more users with the given e-mail address(es).
 #. TRANS: Plural form is based on the number of reported already subscribed e-mail addresses.
 #. TRANS: Followed by a bullet list.
-#: actions/invite.php:140
 msgid "You are already subscribed to this user:"
 msgid_plural "You are already subscribed to these users:"
 msgstr[0] "Du prenumererar redan på denna användare:"
@@ -3435,7 +2767,6 @@ msgstr[1] "Du prenumererar redan på dessa användare:"
 
 #. TRANS: Used as list item for already subscribed users (%1$s is nickname, %2$s is e-mail address).
 #. TRANS: Used as list item for already registered people (%1$s is nickname, %2$s is e-mail address).
-#: actions/invite.php:146 actions/invite.php:160
 #, php-format
 msgctxt "INVITE"
 msgid "%1$s (%2$s)"
@@ -3444,7 +2775,6 @@ msgstr "%1$s (%2$s)"
 #. TRANS: Message displayed inviting users to use a StatusNet site while the invited user
 #. TRANS: already uses a this StatusNet site. Plural form is based on the number of
 #. TRANS: reported already present people. Followed by a bullet list.
-#: actions/invite.php:154
 #, fuzzy
 msgid "This person is already a user and you were automatically subscribed:"
 msgid_plural ""
@@ -3459,7 +2789,6 @@ msgstr[1] ""
 #. TRANS: Message displayed inviting users to use a StatusNet site. Plural form is
 #. TRANS: based on the number of invitations sent. Followed by a bullet list of
 #. TRANS: e-mail addresses to which invitations were sent.
-#: actions/invite.php:168
 #, fuzzy
 msgid "Invitation sent to the following person:"
 msgid_plural "Invitations sent to the following people:"
@@ -3468,7 +2797,6 @@ msgstr[1] "Inbjudning(ar) har skickats till följande personer:"
 
 #. TRANS: Generic message displayed after sending out one or more invitations to
 #. TRANS: people to join a StatusNet site.
-#: actions/invite.php:178
 msgid ""
 "You will be notified when your invitees accept the invitation and register "
 "on the site. Thanks for growing the community!"
@@ -3477,7 +2805,6 @@ msgstr ""
 "registrerar sig. Tack för att du hjälper oss växa!"
 
 #. TRANS: Form instructions.
-#: actions/invite.php:191
 msgid ""
 "Use this form to invite your friends and colleagues to use this service."
 msgstr ""
@@ -3485,28 +2812,24 @@ msgstr ""
 "denna tjänst."
 
 #. TRANS: Field label for a list of e-mail addresses.
-#: actions/invite.php:218
 msgid "Email addresses"
 msgstr "E-postadresser"
 
 #. TRANS: Tooltip for field label for a list of e-mail addresses.
-#: actions/invite.php:221
 #, fuzzy
 msgid "Addresses of friends to invite (one per line)."
 msgstr "Adresser till vänner att bjuda in (en rad per adress)"
 
 #. TRANS: Field label for a personal message to send to invitees.
-#: actions/invite.php:225
 msgid "Personal message"
 msgstr "Personligt meddelande"
 
 #. TRANS: Tooltip for field label for a personal message to send to invitees.
-#: actions/invite.php:228
 msgid "Optionally add a personal message to the invitation."
 msgstr "Om du vill, skriv ett personligt meddelande till inbjudan."
 
 #. TRANS: Send button for inviting friends
-#: actions/invite.php:232
+#. TRANS: Button text for sending notice.
 msgctxt "BUTTON"
 msgid "Send"
 msgstr "Skicka"
@@ -3514,7 +2837,6 @@ msgstr "Skicka"
 #. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral
 #. TRANS: singular 3rd-person pronoun in English. %1$s is the inviting user, $2$s is
 #. TRANS: the StatusNet sitename.
-#: actions/invite.php:264
 #, php-format
 msgid "%1$s has invited you to join them on %2$s"
 msgstr "%1$s har bjudit in dig att gå med dem på %2$s"
@@ -3524,7 +2846,6 @@ msgstr "%1$s har bjudit in dig att gå med dem på %2$s"
 #. TRANS: StatusNet sitename, %3$s is the site URL, %4$s is the personal message from the
 #. TRANS: inviting user, %s%5 a link to the timeline for the inviting user, %s$6 is a link
 #. TRANS: to register with the StatusNet site.
-#: actions/invite.php:271
 #, php-format
 msgid ""
 "%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -3582,182 +2903,177 @@ msgstr ""
 "Vänliga hälsningar, %2$s\n"
 
 #. TRANS: Client error displayed when trying to join a group while not logged in.
-#: actions/joingroup.php:59
 msgid "You must be logged in to join a group."
 msgstr "Du måste vara inloggad för att kunna gå med i en grupp."
 
 #. TRANS: Title for join group page after joining.
-#: actions/joingroup.php:148
 #, fuzzy, php-format
 msgctxt "TITLE"
 msgid "%1$s joined group %2$s"
 msgstr "%1$s gick med i grupp %2$s"
 
 #. TRANS: Client error displayed when trying to leave a group while not logged in.
-#: actions/leavegroup.php:59
 msgid "You must be logged in to leave a group."
 msgstr "Du måste vara inloggad för att lämna en grupp."
 
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
-#: actions/leavegroup.php:103 lib/command.php:398
 msgid "You are not a member of that group."
 msgstr "Du är inte en medlem i den gruppen."
 
 #. TRANS: Title for leave group page after leaving.
-#: actions/leavegroup.php:142
 #, fuzzy, php-format
 msgctxt "TITLE"
 msgid "%1$s left group %2$s"
 msgstr "%1$s lämnade grupp %2$s"
 
 #. TRANS: User admin panel title
-#: actions/licenseadminpanel.php:55
 msgctxt "TITLE"
 msgid "License"
 msgstr "Licens"
 
-#: actions/licenseadminpanel.php:65
+#. TRANS: Form instructions for the site license admin panel.
 msgid "License for this StatusNet site"
 msgstr "Licens för denna StatusNet-webbplats"
 
-#: actions/licenseadminpanel.php:134
+#. TRANS: Client error displayed selecting an invalid license in the license admin panel.
 msgid "Invalid license selection."
 msgstr "Ogiltigt licensval."
 
-#: actions/licenseadminpanel.php:144
+#. TRANS: Client error displayed when not specifying an owner for the all rights reserved license in the license admin panel.
 msgid ""
 "You must specify the owner of the content when using the All Rights Reserved "
 "license."
 msgstr ""
 
-#: actions/licenseadminpanel.php:151
+#. TRANS: Client error displayed selecting a too long license title in the license admin panel.
 #, fuzzy
 msgid "Invalid license title. Maximum length is 255 characters."
 msgstr "Ogiltig välkomsttext. Maximal längd är 255 tecken."
 
-#: actions/licenseadminpanel.php:163
+#. TRANS: Client error displayed specifying an invalid license URL in the license admin panel.
 msgid "Invalid license URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:166
+#. TRANS: Client error displayed specifying an invalid license image URL in the license admin panel.
 msgid "Invalid license image URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:174
+#. TRANS: Client error displayed specifying an invalid license URL in the license admin panel.
 msgid "License URL must be blank or a valid URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:182
+#. TRANS: Client error displayed specifying an invalid license image URL in the license admin panel.
 msgid "License image must be blank or valid URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:232
+#. TRANS: Form legend in the license admin panel.
 msgid "License selection"
 msgstr ""
 
-#: actions/licenseadminpanel.php:238
+#. TRANS: License option in the license admin panel.
 msgid "Private"
 msgstr "Privat"
 
-#: actions/licenseadminpanel.php:239
+#. TRANS: License option in the license admin panel.
 msgid "All Rights Reserved"
 msgstr "Alla rättigheter reserverade"
 
-#: actions/licenseadminpanel.php:240
+#. TRANS: License option in the license admin panel.
 msgid "Creative Commons"
 msgstr ""
 
-#: actions/licenseadminpanel.php:245
+#. TRANS: Dropdown field label in the license admin panel.
 msgid "Type"
 msgstr "Typ"
 
-#: actions/licenseadminpanel.php:247
-msgid "Select license"
+#. TRANS: Dropdown field instructions in the license admin panel.
+#, fuzzy
+msgid "Select a license."
 msgstr "Välj licens"
 
-#: actions/licenseadminpanel.php:261
+#. TRANS: Form legend in the license admin panel.
 msgid "License details"
 msgstr "Licensdetaljer"
 
-#: actions/licenseadminpanel.php:267
+#. TRANS: Field label in the license admin panel.
 msgid "Owner"
 msgstr "Ägare"
 
-#: actions/licenseadminpanel.php:268
+#. TRANS: Field title in the license admin panel.
 msgid "Name of the owner of the site's content (if applicable)."
 msgstr ""
 
-#: actions/licenseadminpanel.php:276
+#. TRANS: Field label in the license admin panel.
 msgid "License Title"
 msgstr "Licenstitel"
 
-#: actions/licenseadminpanel.php:277
+#. TRANS: Field title in the license admin panel.
 msgid "The title of the license."
 msgstr "Titeln på licensen."
 
-#: actions/licenseadminpanel.php:285
+#. TRANS: Field label in the license admin panel.
 msgid "License URL"
 msgstr "Licens-URL"
 
-#: actions/licenseadminpanel.php:286
+#. TRANS: Field title in the license admin panel.
 msgid "URL for more information about the license."
 msgstr "URL för mer information om licensen."
 
-#: actions/licenseadminpanel.php:293
+#. TRANS: Field label in the license admin panel.
 msgid "License Image URL"
 msgstr ""
 
-#: actions/licenseadminpanel.php:294
+#. TRANS: Field title in the license admin panel.
 msgid "URL for an image to display with the license."
 msgstr ""
 
-#. TRANS: Submit button title.
-#: actions/licenseadminpanel.php:311 actions/sessionsadminpanel.php:199
-#: actions/siteadminpanel.php:292 actions/snapshotadminpanel.php:245
-#: actions/tagother.php:133 lib/applicationeditform.php:357
-msgid "Save"
-msgstr "Spara"
-
-#: actions/licenseadminpanel.php:311
-msgid "Save license settings"
+#. TRANS: Button title in the license admin panel.
+#, fuzzy
+msgid "Save license settings."
 msgstr "Spara licensinsällningar"
 
+#. TRANS: Client error displayed when trying to log in while already logged in.
 #. TRANS: Client error displayed trying to use "one time password login" when already logged in.
-#: actions/login.php:97 actions/otp.php:62 actions/register.php:130
 msgid "Already logged in."
 msgstr "Redan inloggad."
 
-#: actions/login.php:125
+#. TRANS: Form validation error displayed when trying to log in with incorrect credentials.
 msgid "Incorrect username or password."
 msgstr "Felaktigt användarnamn eller lösenord."
 
+#. TRANS: Server error displayed when during login a server error occurs.
 #. TRANS: Server error displayed when a user object could not be created trying to login using "one time password login".
-#: actions/login.php:131 actions/otp.php:127
 msgid "Error setting user. You are probably not authorized."
 msgstr "Fel vid inställning av användare. Du har sannolikt inte tillstånd."
 
-#: actions/login.php:185 actions/login.php:236 lib/action.php:598
+#. TRANS: Page title for login page.
 msgid "Login"
 msgstr "Logga in"
 
-#: actions/login.php:222
+#. TRANS: Form legend on login page.
 msgid "Login to site"
 msgstr "Logga in på webbplatsen"
 
-#: actions/login.php:231 actions/register.php:469
+#. TRANS: Checkbox label label on login page.
 msgid "Remember me"
 msgstr "Kom ihåg mig"
 
-#: actions/login.php:232 actions/register.php:471
+#. TRANS: Checkbox title on login page.
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "Logga in automatiskt i framtiden; inte för delade datorer!"
 
-#: actions/login.php:241
+#. TRANS: Button text for log in on login page.
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Login"
+msgstr "Logga in"
+
+#. TRANS: Link text for link to "reset password" on login page.
 msgid "Lost or forgotten password?"
 msgstr "Tappat bort eller glömt ditt lösenord?"
 
-#: actions/login.php:259
+#. TRANS: Form instructions on login page before being able to change user settings.
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -3765,11 +3081,12 @@ msgstr ""
 "Av säkerhetsskäl, var vänlig och skriv in ditt användarnamn och lösenord "
 "igen innan du ändrar dina inställningar."
 
-#: actions/login.php:263
+#. TRANS: Form instructions on login page.
 msgid "Login with your username and password."
 msgstr "Logga in med ditt användarnamn och lösenord."
 
-#: actions/login.php:266
+#. TRANS: Form instructions on login page. This message contains Markdown links in the form [Link text](Link).
+#. TRANS: %%action.register%% is a link to the registration page.
 #, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -3777,130 +3094,124 @@ msgstr ""
 "Har du inte ett användarnamn ännu? [Registrera](%%action.register%%) ett "
 "nytt konto."
 
-#: actions/makeadmin.php:92
+#. TRANS: Client error displayed when trying to make another user admin on the Make Admin page while not an admin.
 msgid "Only an admin can make another user an admin."
 msgstr "Bara en administratör kan göra en annan användare till administratör."
 
-#: actions/makeadmin.php:96
+#. TRANS: Client error displayed when trying to make another user admin on the Make Admin page who already is admin.
+#. TRANS: %1$s is the user that is already admin, %2$s is the group user is already admin for.
 #, php-format
 msgid "%1$s is already an admin for group \"%2$s\"."
 msgstr "%1$s är redan en administratör för grupp \"%2$s\"."
 
-#: actions/makeadmin.php:133
+#. TRANS: Server error displayed when trying to make another user admin on the Make Admin page fails
+#. TRANS: because the group membership record could not be gotten.
+#. TRANS: %1$s is the to be admin user, %2$s is the group user should be admin for.
 #, php-format
 msgid "Can't get membership record for %1$s in group %2$s."
 msgstr "Kan inte hämta uppgift om medlemskap för %1$s i grupp %2$s."
 
-#: actions/makeadmin.php:146
+#. TRANS: Server error displayed when trying to make another user admin on the Make Admin page fails
+#. TRANS: because the group adminship record coud not be saved properly.
+#. TRANS: %1$s is the to be admin user, %2$s is the group user is already admin for.
 #, php-format
 msgid "Can't make %1$s an admin for group %2$s."
 msgstr "Kan inte göra %1$s till en administratör för grupp %2$s."
 
-#: actions/microsummary.php:69
+#. TRANS: Client error displayed trying to make a micro summary without providing a status.
 msgid "No current status."
 msgstr "Ingen aktuell status."
 
 #. TRANS: This is the title of the form for adding a new application.
-#: actions/newapplication.php:52
 msgid "New application"
 msgstr "Ny applikation"
 
 #. TRANS: Client error displayed trying to add a new application while not logged in.
-#: actions/newapplication.php:64
 msgid "You must be logged in to register an application."
 msgstr "Du måste vara inloggad för att registrera en applikation."
 
 #. TRANS: Form instructions for registering a new application.
-#: actions/newapplication.php:147
 msgid "Use this form to register a new application."
 msgstr "Använd detta formulär för att registrera en ny applikation."
 
 #. TRANS: Validation error shown when not providing a source URL in the "New application" form.
-#: actions/newapplication.php:189
 msgid "Source URL is required."
 msgstr "Webbadress till källa krävs."
 
 #. TRANS: Server error displayed when an application could not be registered in the database through the "New application" form.
-#: actions/newapplication.php:279 actions/newapplication.php:289
 msgid "Could not create application."
 msgstr "Kunde inte skapa applikation."
 
 #. TRANS: Title for form to create a group.
-#: actions/newgroup.php:53
 msgid "New group"
 msgstr "Ny grupp"
 
 #. TRANS: Client exception thrown when a user tries to create a group while banned.
-#: actions/newgroup.php:73 classes/User_group.php:485
 #, fuzzy
 msgid "You are not allowed to create groups on this site."
 msgstr "Du får inte ta bort denna grupp."
 
 #. TRANS: Form instructions for group create form.
-#: actions/newgroup.php:117
 msgid "Use this form to create a new group."
 msgstr "Använd detta formulär för att skapa en ny grupp."
 
-#. TRANS: Group create form validation error.
-#: actions/newgroup.php:200
-#, fuzzy
-msgid "Alias cannot be the same as nickname."
-msgstr "Alias kan inte vara samma som smeknamn."
-
-#: actions/newmessage.php:71 actions/newmessage.php:234
+#. TRANS: Page title for new direct message page.
+#. TRANS: Page title on page for sending a direct message.
 msgid "New message"
 msgstr "Nytt meddelande"
 
-#. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
-#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:513
-msgid "You can't send a message to this user."
+#. TRANS: Client error displayed trying to send a direct message to a user while sender and
+#. TRANS: receiver are not subscribed to each other.
+#, fuzzy
+msgid "You cannot send a message to this user."
 msgstr "Du kan inte skicka ett meddelande till den användaren."
 
+#. TRANS: Form validator error displayed trying to send a direct message without content.
+#. TRANS: Client error displayed trying to send a notice without content.
 #. TRANS: Command exception text shown when trying to send a direct message to another user without content.
 #. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
-#: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:490
-#: lib/command.php:593
 msgid "No content!"
 msgstr "Inget innehåll!"
 
-#: actions/newmessage.php:161
+#. TRANS: Form validation error displayed trying to send a direct message without specifying a recipient.
 msgid "No recipient specified."
 msgstr "Ingen mottagare angiven."
 
+#. TRANS: Client error displayed trying to send a direct message to self.
 #. TRANS: Error text shown when trying to send a direct message to self.
-#: actions/newmessage.php:167 lib/command.php:517
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
 "Skicka inte meddelande till dig själv; viska lite tyst till dig själv "
 "istället."
 
-#: actions/newmessage.php:184
+#. TRANS: Page title after sending a direct message.
 msgid "Message sent"
 msgstr "Meddelande skickat"
 
+#. TRANS: Confirmation text after sending a direct message.
+#. TRANS: %s is the direct message recipient.
 #. TRANS: Message given have sent a direct message to another user.
 #. TRANS: %s is the name of the other user.
-#: actions/newmessage.php:188 lib/command.php:525
 #, php-format
 msgid "Direct message to %s sent."
 msgstr "Direktmeddelande till %s skickat."
 
-#: actions/newmessage.php:213 actions/newnotice.php:264
+#. TRANS: Page title after an AJAX error occurred on the "send direct message" page.
+#. TRANS: Page title after an AJAX error occurs on the send notice page.
 msgid "Ajax Error"
 msgstr "AJAX-fel"
 
-#: actions/newnotice.php:69
+#. TRANS: Page title for sending a new notice.
 msgid "New notice"
 msgstr "Ny notis"
 
-#: actions/newnotice.php:230
+#. TRANS: Page title after sending a notice.
 msgid "Notice posted"
 msgstr "Notis postad"
 
 #. TRANS: Instructions for Notice search page.
 #. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/noticesearch.php:69
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -3910,20 +3221,17 @@ msgstr ""
 "mellanslag; de måste vara minst tre tecken långa."
 
 #. TRANS: Title of the page where users can search for notices.
-#: actions/noticesearch.php:80
 msgid "Text search"
 msgstr "Textsökning"
 
 #. TRANS: Test in RSS notice search.
 #. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearch.php:95
 #, php-format
 msgid "Search results for \"%1$s\" on %2$s"
 msgstr "Sökresultat för \"%1$s\" på %2$s"
 
 #. TRANS: Text for logged in users making a query for notices without results.
 #. TRANS: This message contains a Markdown link.
-#: actions/noticesearch.php:128
 #, php-format
 msgid ""
 "Be the first to [post on this topic](%%%%action.newnotice%%%%?"
@@ -3934,7 +3242,6 @@ msgstr ""
 
 #. TRANS: Text for not logged in users making a query for notices without results.
 #. TRANS: This message contains Markdown links.
-#: actions/noticesearch.php:133
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and be the first to "
@@ -3944,19 +3251,17 @@ msgstr ""
 "med att [skriva i detta ämne](%%%%action.newnotice%%%%?status_textarea=%s)!"
 
 #. TRANS: RSS notice search feed title. %s is the query.
-#: actions/noticesearchrss.php:95
 #, php-format
 msgid "Updates with \"%s\""
 msgstr "Uppdateringar med \"%s\""
 
 #. TRANS: RSS notice search feed description.
 #. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearchrss.php:99
 #, fuzzy, php-format
 msgid "Updates matching search term \"%1$s\" on %2$s."
 msgstr "Uppdateringar som matchar söksträngen \"%1$s\" på %2$s!"
 
-#: actions/nudge.php:85
+#. TRANS: Client error displayed trying to nudge a user that cannot be nudged.
 #, fuzzy
 msgid ""
 "This user doesn't allow nudges or hasn't confirmed or set their email "
@@ -3965,60 +3270,51 @@ msgstr ""
 "Denna användare tillåter inte knuffar eller har inte bekräftat eller angett "
 "sin e-post än."
 
-#: actions/nudge.php:94
+#. TRANS: Page title after sending a nudge.
 msgid "Nudge sent"
 msgstr "Knuff sänd"
 
-#: actions/nudge.php:97
+#. TRANS: Confirmation text after sending a nudge.
 msgid "Nudge sent!"
 msgstr "Knuff sänd!"
 
 #. TRANS: Message displayed to an anonymous user trying to view OAuth application list.
-#: actions/oauthappssettings.php:57
 msgid "You must be logged in to list your applications."
 msgstr "Du måste vara inloggad för att lista dina applikationer."
 
 #. TRANS: Page title for OAuth applications
-#: actions/oauthappssettings.php:73
 msgid "OAuth applications"
 msgstr "OAuth-applikationer"
 
 #. TRANS: Page instructions for OAuth applications
-#: actions/oauthappssettings.php:85
 msgid "Applications you have registered"
 msgstr "Applikationer du har registrerat"
 
 #. TRANS: Empty list message on page with OAuth applications.
-#: actions/oauthappssettings.php:138
 #, php-format
 msgid "You have not registered any applications yet."
 msgstr "Du har inte registrerat några applikationer än."
 
 #. TRANS: Title for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:69
 msgid "Connected applications"
 msgstr "Anslutna applikationer"
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:80
 msgid "The following connections exist for your account."
 msgstr ""
 
 #. TRANS: Client error when trying to revoke access for an application while not being a user of it.
-#: actions/oauthconnectionssettings.php:165
 msgid "You are not a user of that application."
 msgstr "Du är inte en användare av den applikationen."
 
 #. TRANS: Client error when revoking access has failed for some reason.
 #. TRANS: %s is the application ID revoking access failed for.
-#: actions/oauthconnectionssettings.php:180
 #, php-format
 msgid "Unable to revoke access for application: %s."
 msgstr "Kunde inte återkalla åtkomst för applikation: %s."
 
 #. TRANS: Success message after revoking access for an application.
 #. TRANS: %1$s is the application name, %2$s is the first part of the user token.
-#: actions/oauthconnectionssettings.php:199
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -4026,466 +3322,383 @@ msgid ""
 msgstr ""
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:210
 msgid "You have not authorized any applications to use your account."
 msgstr "Du har inte tillåtit några applikationer att använda ditt konto."
 
 #. TRANS: Note for developers in the OAuth connection settings form.
 #. TRANS: This message contains a Markdown link. Do not separate "](".
 #. TRANS: %s is the URL to the OAuth settings.
-#: actions/oauthconnectionssettings.php:230
 #, php-format
 msgid ""
 "Are you a developer? [Register an OAuth client application](%s) to use with "
 "this instance of StatusNet."
 msgstr ""
 
-#: actions/oembed.php:64
+#. TRANS: Server error displayed in oEmbed action when path not found.
+#. TRANS: %s is a path.
 #, fuzzy, php-format
 msgid "\"%s\" not found."
 msgstr "API-metod hittades inte."
 
-#: actions/oembed.php:76
+#. TRANS: Server error displayed in oEmbed action when notice not found.
+#. TRANS: %s is a notice.
 #, fuzzy, php-format
 msgid "Notice %s not found."
 msgstr "API-metod hittades inte."
 
-#: actions/oembed.php:80 actions/shownotice.php:100
+#. TRANS: Server error displayed in oEmbed action when notice has not profile.
 msgid "Notice has no profile."
 msgstr "Notisen har ingen profil."
 
-#: actions/oembed.php:83 actions/shownotice.php:172
+#. TRANS: oEmbed title. %1$s is the author name, %2$s is the creation date.
 #, php-format
 msgid "%1$s's status on %2$s"
 msgstr "%1$ss status den %2$s"
 
-#: actions/oembed.php:95
+#. TRANS: Server error displayed in oEmbed action when attachment not found.
+#. TRANS: %d is an attachment ID.
 #, fuzzy, php-format
 msgid "Attachment %s not found."
 msgstr "Mottagare hittades inte."
 
-#: actions/oembed.php:136
+#. TRANS: Server error displayed in oEmbed request when a path is not supported.
+#. TRANS: %s is a path.
 #, php-format
 msgid "\"%s\" not supported for oembed requests."
 msgstr ""
 
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
-#: actions/oembed.php:168
 #, php-format
 msgid "Content type %s not supported."
 msgstr "Innehållstyp %s stödjs inte."
 
 #. TRANS: Error message displaying attachments. %s is the site's base URL.
-#: actions/oembed.php:172
 #, php-format
 msgid "Only %s URLs over plain HTTP please."
 msgstr "Endast %s-webbadresser över vanlig HTTP."
 
+#. TRANS: Server error displayed in oEmbed action when request specifies an unsupported data format.
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1207
-#: lib/apiaction.php:1234 lib/apiaction.php:1369
 msgid "Not a supported data format."
 msgstr "Ett dataformat som inte stödjs"
 
 #. TRANS: ShortName in the OpenSearch interface when trying to find users.
-#: actions/opensearch.php:64
 msgid "People Search"
 msgstr "Personsökning"
 
-#: actions/opensearch.php:68
+#. TRANS: ShortName in the OpenSearch interface when trying to find notices.
 msgid "Notice Search"
 msgstr "Notissökning"
 
 #. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
-#: actions/otp.php:70
 msgid "No user ID specified."
 msgstr "Ingen användar-ID angiven."
 
 #. TRANS: Client error displayed trying to use "one time password login" without specifying a login token.
-#: actions/otp.php:86
 msgid "No login token specified."
 msgstr "Ingen inloggnings-token angiven."
 
 #. TRANS: Client error displayed trying to use "one time password login" without requesting a login token.
-#: actions/otp.php:94
 msgid "No login token requested."
 msgstr "Ingen token för inloggning begärd."
 
 #. TRANS: Client error displayed trying to use "one time password login" while specifying an invalid login token.
-#: actions/otp.php:100
 msgid "Invalid login token specified."
 msgstr "Ogiltig inloggnings-token angiven."
 
 #. TRANS: Client error displayed trying to use "one time password login" while specifying an expired login token.
-#: actions/otp.php:110
 msgid "Login token expired."
 msgstr "Inloggnings-token förfallen."
 
 #. TRANS: Title for outbox for any but the fist page.
 #. TRANS: %1$s is the user nickname, %2$d is the page number.
-#: actions/outbox.php:57
 #, php-format
 msgid "Outbox for %1$s - page %2$d"
 msgstr "Utkorg för %1$s - sida %2$d"
 
 #. TRANS: Title for first page of outbox.
-#: actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
 msgstr "Utkorg för %s"
 
 #. TRANS: Instructions for outbox.
-#: actions/outbox.php:103
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr "Detta är din utkorg som innehåller privata meddelanden du har skickat."
 
-#: actions/passwordsettings.php:58
 msgid "Change password"
 msgstr "Byt lösenord"
 
-#: actions/passwordsettings.php:69
 msgid "Change your password."
 msgstr "Byt ditt lösenord."
 
 #. TRANS: Fieldset legend for password reset form.
-#: actions/passwordsettings.php:96 actions/recoverpassword.php:251
 msgid "Password change"
 msgstr "Byte av lösenord"
 
-#: actions/passwordsettings.php:104
 msgid "Old password"
 msgstr "Gammalt lösenord"
 
 #. TRANS: Field label for password reset form.
-#: actions/passwordsettings.php:108 actions/recoverpassword.php:256
 msgid "New password"
 msgstr "Nytt lösenord"
 
-#: actions/passwordsettings.php:109 actions/register.php:416
 #, fuzzy
 msgid "6 or more characters."
 msgstr "Minst 6 tecken"
 
 #. TRANS: Ttile for field label for password reset form where the password has to be typed again.
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:264
-#: actions/register.php:420
 #, fuzzy
 msgid "Same as password above."
 msgstr "Samma som lösenordet ovan"
 
-#: actions/passwordsettings.php:117
 msgid "Change"
 msgstr "Ändra"
 
-#: actions/passwordsettings.php:153 actions/register.php:223
 msgid "Password must be 6 or more characters."
 msgstr "Lösenordet måste vara minst 6 tecken."
 
-#: actions/passwordsettings.php:156 actions/register.php:226
 msgid "Passwords don't match."
 msgstr "Lösenorden matchar inte."
 
-#: actions/passwordsettings.php:164
 msgid "Incorrect old password"
 msgstr "Felaktigt gammalt lösenord"
 
-#: actions/passwordsettings.php:180
 msgid "Error saving user; invalid."
 msgstr "Fel vid sparande av användare; ogiltig."
 
 #. TRANS: Reset password form validation error message.
-#: actions/passwordsettings.php:185 actions/recoverpassword.php:418
 #, fuzzy
 msgid "Cannot save new password."
 msgstr "Kan inte spara nytt lösenord."
 
-#: actions/passwordsettings.php:191
 msgid "Password saved."
 msgstr "Lösenord sparat."
 
 #. TRANS: Title for Paths admin panel.
 #. TRANS: Menu item for site administration
-#: actions/pathsadminpanel.php:58 lib/adminpanelaction.php:371
 msgid "Paths"
 msgstr "Sökvägar"
 
 #. TRANS: Form instructions for Path admin panel.
-#: actions/pathsadminpanel.php:69
 msgid "Path and server settings for this StatusNet site"
 msgstr ""
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the directory that could not be read from.
-#: actions/pathsadminpanel.php:155
 #, php-format
 msgid "Theme directory not readable: %s."
 msgstr "Katalog med teman är inte läsbar: %s."
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the avatar directory that could not be written to.
-#: actions/pathsadminpanel.php:163
 #, php-format
 msgid "Avatar directory not writable: %s."
 msgstr "Katalog med avatarer är inte skrivbar: %s."
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the background directory that could not be written to.
-#: actions/pathsadminpanel.php:171
 #, php-format
 msgid "Background directory not writable: %s."
 msgstr "Katalog med bakgrunder är inte skrivbar: %s."
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the locales directory that could not be read from.
-#: actions/pathsadminpanel.php:181
 #, php-format
 msgid "Locales directory not readable: %s."
 msgstr "Katalog med lokaliseringfiler (locales) är inte läsbar. %s."
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the SSL server URL that is too long.
-#: actions/pathsadminpanel.php:189
 msgid "Invalid SSL server. The maximum length is 255 characters."
 msgstr "Ogiltigt SSL-servernamn. Den maximala längden är 255 tecken."
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:235 actions/siteadminpanel.php:58
 msgid "Site"
 msgstr "Webbplats"
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:241 actions/pathsadminpanel.php:279
-#: actions/pathsadminpanel.php:370 actions/pathsadminpanel.php:425
 msgid "Server"
 msgstr "Server"
 
-#: actions/pathsadminpanel.php:242
 msgid "Site's server hostname."
 msgstr "Värdnamn för webbplatsens server."
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:248 actions/pathsadminpanel.php:288
-#: actions/pathsadminpanel.php:379 actions/pathsadminpanel.php:434
 msgid "Path"
 msgstr "Sökväg"
 
-#: actions/pathsadminpanel.php:249
 msgid "Site path."
 msgstr "Sökväg till webbplats."
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:255
 msgid "Locale directory"
 msgstr "Katalog med lokaliseringsfiler (locales)"
 
-#: actions/pathsadminpanel.php:256
 msgid "Directory path to locales."
 msgstr "Katalogsökväg till lokaliseringfiler (locales)."
 
 #. TRANS: Checkbox label in Paths admin panel.
-#: actions/pathsadminpanel.php:263
 msgid "Fancy URLs"
 msgstr "Utsmyckade URL:er"
 
-#: actions/pathsadminpanel.php:265
 msgid "Use fancy (more readable and memorable) URLs?"
 msgstr ""
 "Skall utsmyckade URL:er användas (mer läsbara och lättare att komma ihåg)?"
 
-#: actions/pathsadminpanel.php:272
 msgid "Theme"
 msgstr "Teman"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:281
 msgid "Server for themes."
 msgstr "Server för teman."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:290
 msgid "Web path to themes."
 msgstr ""
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:297 actions/pathsadminpanel.php:388
-#: actions/pathsadminpanel.php:443 actions/pathsadminpanel.php:495
 msgid "SSL server"
 msgstr "SSL-server"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:299
 msgid "SSL server for themes (default: SSL server)."
 msgstr ""
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:306 actions/pathsadminpanel.php:397
-#: actions/pathsadminpanel.php:452
 #, fuzzy
 msgid "SSL path"
 msgstr "Sökväg till webbplats"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:308
 msgid "SSL path to themes (default: /theme/)."
 msgstr ""
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:315 actions/pathsadminpanel.php:406
-#: actions/pathsadminpanel.php:461
 msgid "Directory"
 msgstr "Katalog"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:317
 #, fuzzy
 msgid "Directory where themes are located."
 msgstr "Katalogsökväg till lokaliseringfiler (locales)"
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:326
 msgid "Avatars"
 msgstr "Avatarer"
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:333
 msgid "Avatar server"
 msgstr "Server med avatarer"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:335
 msgid "Server for avatars."
 msgstr "Server för avatarer."
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:342
 msgid "Avatar path"
 msgstr "Sökväg till avatarer"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:344
 #, fuzzy
 msgid "Web path to avatars."
 msgstr "Misslyckades uppdatera avatar."
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:351
 msgid "Avatar directory"
 msgstr "Katalog med avatarer"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:353
 #, fuzzy
 msgid "Directory where avatars are located."
 msgstr "Katalogsökväg till lokaliseringfiler (locales)"
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:364
 msgid "Backgrounds"
 msgstr "Bakgrunder"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:372
 #, fuzzy
 msgid "Server for backgrounds."
 msgstr "Tema för webbplatsen."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:381
 msgid "Web path to backgrounds."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:390
 msgid "Server for backgrounds on SSL pages."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:399
 msgid "Web path to backgrounds on SSL pages."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:408
 #, fuzzy
 msgid "Directory where backgrounds are located."
 msgstr "Katalogsökväg till lokaliseringfiler (locales)"
 
 #. TRANS: Fieldset legens in Paths admin panel.
-#: actions/pathsadminpanel.php:419
 msgid "Attachments"
 msgstr "Bilagor"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:427
 #, fuzzy
 msgid "Server for attachments."
 msgstr "Tema för webbplatsen."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:436
 #, fuzzy
 msgid "Web path to attachments."
 msgstr "Inga bilagor."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:445
 #, fuzzy
 msgid "Server for attachments on SSL pages."
 msgstr "Tema för webbplatsen."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:454
 msgid "Web path to attachments on SSL pages."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:463
 #, fuzzy
 msgid "Directory where attachments are located."
 msgstr "Katalogsökväg till lokaliseringfiler (locales)"
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:472
 msgid "SSL"
 msgstr "SSL"
 
 #. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
-#: actions/pathsadminpanel.php:477 actions/snapshotadminpanel.php:202
 msgid "Never"
 msgstr "Aldrig"
 
 #. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
-#: actions/pathsadminpanel.php:479
 msgid "Sometimes"
 msgstr "Ibland"
 
 #. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
-#: actions/pathsadminpanel.php:481
 msgid "Always"
 msgstr "Alltid"
 
-#: actions/pathsadminpanel.php:485
 msgid "Use SSL"
 msgstr "Använd SSL"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:487
 msgid "When to use SSL."
 msgstr "När SSL skall användas."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:497
 msgid "Server to direct SSL requests to."
 msgstr "Server att dirigera SSL-begäran till."
 
 #. TRANS: Button title text to store form data in the Paths admin panel.
-#: actions/pathsadminpanel.php:514
 msgid "Save paths"
 msgstr "Spara sökvägar"
 
 #. TRANS: Instructions for the "People search" page.
 #. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/peoplesearch.php:54
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
@@ -4495,57 +3708,46 @@ msgstr ""
 "Skilj söktermerna åt med mellanslag; de måste vara tre tecken långa."
 
 #. TRANS: Title of a page where users can search for other users.
-#: actions/peoplesearch.php:61
 msgid "People search"
 msgstr "Personsökning"
 
-#: actions/peopletag.php:68
 #, php-format
 msgid "Not a valid people tag: %s."
 msgstr "Inte en giltig persontagg: %s."
 
-#: actions/peopletag.php:142
 #, php-format
 msgid "Users self-tagged with %1$s - page %2$d"
 msgstr "Användare som taggat sig själv med %1$s - sida %2$d"
 
 #. TRANS: Page title for AJAX form return when a disabling a plugin.
-#: actions/plugindisable.php:69
 msgctxt "plugin"
 msgid "Disabled"
 msgstr ""
 
 #. TRANS: Client error displayed trying to perform any request method other than POST.
 #. TRANS: Do not translate POST.
-#: actions/pluginenable.php:78 actions/subscribe.php:77
 msgid "This action only accepts POST requests."
 msgstr "Denna åtgärd accepterar endast POST-begäran."
 
-#: actions/pluginenable.php:102
 #, fuzzy
 msgid "You cannot administer plugins."
 msgstr "Du kan inte ta bort användare."
 
-#: actions/pluginenable.php:109
 #, fuzzy
 msgid "No such plugin."
 msgstr "Ingen sådan sida"
 
 #. TRANS: Page title for AJAX form return when enabling a plugin.
-#: actions/pluginenable.php:159
 msgctxt "plugin"
 msgid "Enabled"
 msgstr ""
 
 #. TRANS: Tab and title for plugins admin panel.
 #. TRANS: Menu item for site administration
-#: actions/pluginsadminpanel.php:56 actions/version.php:191
-#: lib/adminpanelaction.php:411
 msgid "Plugins"
 msgstr "Insticksmoduler"
 
 #. TRANS: Instructions at top of plugin admin page.
-#: actions/pluginsadminpanel.php:68
 msgid ""
 "Additional plugins can be enabled and configured manually. See the <a href="
 "\"http://status.net/wiki/Plugins\">online plugin documentation</a> for more "
@@ -4553,32 +3755,26 @@ msgid ""
 msgstr ""
 
 #. TRANS: Admin form section header
-#: actions/pluginsadminpanel.php:84
 #, fuzzy
 msgid "Default plugins"
 msgstr "Standardspråk"
 
-#: actions/pluginsadminpanel.php:106
 msgid ""
 "All default plugins have been disabled from the site's configuration file."
 msgstr ""
 
-#: actions/postnotice.php:95
 msgid "Invalid notice content."
 msgstr "Ogiltigt notisinnehåll."
 
-#: actions/postnotice.php:101
 #, php-format
 msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’."
 msgstr "Licensen för notiser ‘%1$s’ är inte förenlig webbplatslicensen ‘%2$s’."
 
 #. TRANS: Page title for profile settings.
-#: actions/profilesettings.php:60
 msgid "Profile settings"
 msgstr "Profilinställningar"
 
 #. TRANS: Usage instructions for profile settings.
-#: actions/profilesettings.php:71
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
@@ -4586,31 +3782,24 @@ msgstr ""
 "dig."
 
 #. TRANS: Profile settings form legend.
-#: actions/profilesettings.php:99
 msgid "Profile information"
 msgstr "Profilinformation"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:110 actions/register.php:412
 #, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr "1-64 små bokstäver eller nummer, inga punkter eller mellanslag"
 
 #. TRANS: Field label in form for profile settings.
-#: actions/profilesettings.php:114 actions/register.php:434
-#: lib/groupeditform.php:150
 msgid "Full name"
 msgstr "Fullständigt namn"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:119 actions/register.php:439
-#: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "Hemsida"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:122 actions/register.php:441
 #, fuzzy
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr "URL till din hemsida, blogg eller profil på en annan webbplats."
@@ -4618,7 +3807,6 @@ msgstr "URL till din hemsida, blogg eller profil på en annan webbplats."
 #. TRANS: Tooltip for field label in form for profile settings. Plural
 #. TRANS: is decided by the number of characters available for the
 #. TRANS: biography (%d).
-#: actions/profilesettings.php:130 actions/register.php:450
 #, fuzzy, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4626,41 +3814,31 @@ msgstr[0] "Beskriv dig själv och dina intressen med högst 140 tecken"
 msgstr[1] "Beskriv dig själv och dina intressen med högst 140 tecken"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:136 actions/register.php:455
 msgid "Describe yourself and your interests"
 msgstr "Beskriv dig själv och dina intressen"
 
 #. TRANS: Text area label in form for profile settings where users can provide.
 #. TRANS: their biography.
-#: actions/profilesettings.php:140 actions/register.php:457
 msgid "Bio"
 msgstr "Biografi"
 
 #. TRANS: Field label in form for profile settings.
-#: actions/profilesettings.php:146 actions/register.php:462
-#: lib/groupeditform.php:173
 msgid "Location"
 msgstr "Plats"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:149
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Var du håller till, såsom \"Stad, Län, Land\""
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:154
 msgid "Share my current location when posting notices"
 msgstr "Dela min nuvarande plats när jag skickar notiser"
 
 #. TRANS: Field label in form for profile settings.
-#: actions/profilesettings.php:162 actions/tagother.php:128
-#: actions/tagother.php:188 lib/subscriptionlist.php:104
-#: lib/subscriptionlist.php:106
 msgid "Tags"
 msgstr "Taggar"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:165
 #, fuzzy
 msgid ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- "
@@ -4670,28 +3848,23 @@ msgstr ""
 "kommatecken eller mellanslag"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:170
 msgid "Language"
 msgstr "Språk"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:172
 #, fuzzy
 msgid "Preferred language."
 msgstr "Föredraget språk"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:182
 msgid "Timezone"
 msgstr "Tidszon"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:184
 msgid "What timezone are you normally in?"
 msgstr "I vilken tidszon befinner du dig normalt?"
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:190
 #, fuzzy
 msgid ""
 "Automatically subscribe to whoever subscribes to me (best for non-humans)."
@@ -4702,7 +3875,6 @@ msgstr ""
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Plural form is used based on the maximum number of allowed
 #. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:259 actions/register.php:214
 #, fuzzy, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4710,85 +3882,69 @@ msgstr[0] "Biografin är för lång (max %d tecken)."
 msgstr[1] "Biografin är för lång (max %d tecken)."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:270 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr "Tidszon inte valt."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:278
 #, fuzzy
 msgid "Language is too long (maximum 50 characters)."
 msgstr "Språknamn är för långt (max 50 tecken)."
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:292
 #, fuzzy, php-format
 msgid "Invalid tag: \"%s\"."
 msgstr "Ogiltig tagg: \"%s\""
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:348
 #, fuzzy
 msgid "Could not update user for autosubscribe."
 msgstr "Kunde inte uppdatera användaren för automatisk prenumeration."
 
 #. TRANS: Server error thrown when user profile location preference settings could not be updated.
-#: actions/profilesettings.php:406
 #, fuzzy
 msgid "Could not save location prefs."
 msgstr "Kunde inte spara platsinställningar."
 
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:428 actions/tagother.php:179
 msgid "Could not save tags."
 msgstr "Kunde inte spara taggar."
 
 #. TRANS: Confirmation shown when user profile settings are saved.
 #. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:437 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "Inställningar sparade."
 
 #. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
 #. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:484 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "Skapa ett konto"
 
-#: actions/public.php:83
 #, php-format
 msgid "Beyond the page limit (%s)."
 msgstr "Bortom sidbegränsningen (%s)."
 
-#: actions/public.php:92
 msgid "Could not retrieve public stream."
 msgstr "Kunde inte hämta publik ström."
 
-#: actions/public.php:130
 #, php-format
 msgid "Public timeline, page %d"
 msgstr "Publik tidslinje, sida %d"
 
-#: actions/public.php:132 lib/publicgroupnav.php:79
 msgid "Public timeline"
 msgstr "Publik tidslinje"
 
-#: actions/public.php:160
 msgid "Public Stream Feed (RSS 1.0)"
 msgstr "Publikt flöde av ström (RSS 1.0)"
 
-#: actions/public.php:164
 msgid "Public Stream Feed (RSS 2.0)"
 msgstr "Publikt flöde av ström (RSS 2.0)"
 
-#: actions/public.php:168
 msgid "Public Stream Feed (Atom)"
 msgstr "Publikt flöde av ström (Atom)"
 
-#: actions/public.php:188
 #, php-format
 msgid ""
 "This is the public timeline for %%site.name%% but no one has posted anything "
@@ -4797,11 +3953,9 @@ msgstr ""
 "Detta är den publika tidslinjen för %%site.name%% men ingen har postat något "
 "än."
 
-#: actions/public.php:191
 msgid "Be the first to post!"
 msgstr "Bli först att posta!"
 
-#: actions/public.php:195
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post!"
@@ -4809,7 +3963,6 @@ msgstr ""
 "Varför inte [registrera ett konto](%%action.register%%) och bli först att "
 "posta!"
 
-#: actions/public.php:242
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -4822,7 +3975,6 @@ msgstr ""
 "net/). [Gå med nu](%%action.register%%) för att dela notiser om dig själv "
 "med vänner, familj och kollegor! ([Läs mer](%%doc.help%%))"
 
-#: actions/public.php:247
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -4834,19 +3986,16 @@ msgstr ""
 "net/)."
 
 #. TRANS: Public RSS feed description. %s is the StatusNet site name.
-#: actions/publicrss.php:106
 #, fuzzy, php-format
 msgid "%s updates from everyone."
 msgstr "%s uppdateringar från alla!"
 
 #. TRANS: Title for public tag cloud.
-#: actions/publictagcloud.php:57
 msgid "Public tag cloud"
 msgstr "Publikt taggmoln"
 
 #. TRANS: Instructions (more used like an explanation/header).
 #. TRANS: %s is the StatusNet sitename.
-#: actions/publictagcloud.php:65
 #, fuzzy, php-format
 msgid "These are most popular recent tags on %s"
 msgstr "Dessa är de populäraste senaste taggarna på %s "
@@ -4854,14 +4003,12 @@ msgstr "Dessa är de populäraste senaste taggarna på %s "
 #. TRANS: This message contains a Markdown URL. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.
-#: actions/publictagcloud.php:74
 #, php-format
 msgid "No one has posted a notice with a [hashtag](%%doc.tags%%) yet."
 msgstr "Ingen har postat en notis med en [hashtagg](%%doc.tags%%) än."
 
 #. 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.
-#: actions/publictagcloud.php:79
 msgid "Be the first to post one!"
 msgstr "Bli först att posta en!"
 
@@ -4870,7 +4017,6 @@ msgstr "Bli först att posta en!"
 #. TRANS: This message contains a Markdown URL. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.
-#: actions/publictagcloud.php:87
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post "
@@ -4880,42 +4026,34 @@ msgstr ""
 "posta en!"
 
 #. TRANS: Client error displayed trying to recover password while already logged in.
-#: actions/recoverpassword.php:37
 msgid "You are already logged in!"
 msgstr "Du är redan inloggad!"
 
 #. TRANS: Client error displayed when password recovery code is not correct.
-#: actions/recoverpassword.php:64
 msgid "No such recovery code."
 msgstr "Ingen sådan återskapningskod."
 
 #. TRANS: Client error displayed when no proper password recovery code was submitted.
-#: actions/recoverpassword.php:69
 msgid "Not a recovery code."
 msgstr "Inte en återskapningskod."
 
 #. TRANS: Server error displayed trying to recover password without providing a user.
-#: actions/recoverpassword.php:77
 msgid "Recovery code for unknown user."
 msgstr "Återskapningskod för okänd användare."
 
 #. TRANS: Server error displayed removing a password recovery code from the database.
-#: actions/recoverpassword.php:91
 msgid "Error with confirmation code."
 msgstr "Fel med bekräftelsekod."
 
 #. TRANS: Client error displayed trying to recover password with too old a recovery code.
-#: actions/recoverpassword.php:103
 msgid "This confirmation code is too old. Please start again."
 msgstr "Denna bekräftelsekod är för gammal. Var vänlig börja om igen."
 
 #. TRANS: Server error displayed when updating a user's e-mail address in the database fails while recovering a password.
-#: actions/recoverpassword.php:118
 msgid "Could not update user with confirmed email address."
 msgstr "Kunde inte uppdatera användaren med bekräftad e-postadress."
 
 #. TRANS: Page notice for password recovery page.
-#: actions/recoverpassword.php:160
 msgid ""
 "If you have forgotten or lost your password, you can get a new one sent to "
 "the email address you have stored in your account."
@@ -4923,100 +4061,82 @@ msgstr ""
 "Om du har glömt eller förlorat ditt lösenord kan du få ett nytt skickat till "
 "den e-postadress du har sparat i ditt konto."
 
-#: actions/recoverpassword.php:167
 msgid "You have been identified. Enter a new password below."
 msgstr "Du har blivit identifierad. Ange ett nytt lösenord nedan."
 
 #. TRANS: Fieldset legend for password recovery page.
-#: actions/recoverpassword.php:198
 msgid "Password recovery"
 msgstr "Återskapande av lösenord"
 
 #. TRANS: Field label on password recovery page.
-#: actions/recoverpassword.php:202
 msgid "Nickname or email address"
 msgstr "Smeknamn eller e-postadress"
 
 #. TRANS: Title for field label on password recovery page.
-#: actions/recoverpassword.php:205
 msgid "Your nickname on this server, or your registered email address."
 msgstr ""
 "Ditt användarnamn på denna server, eller din registrerade e-postadress."
 
 #. TRANS: Field label on password recovery page.
-#: actions/recoverpassword.php:212
 msgid "Recover"
 msgstr "Återskapa"
 
 #. TRANS: Button text on password recovery page.
-#: actions/recoverpassword.php:214
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Recover"
 msgstr "Återskapa"
 
 #. TRANS: Title for password recovery page in password reset mode.
-#: actions/recoverpassword.php:223
 msgid "Reset password"
 msgstr "Återställ lösenord"
 
 #. TRANS: Title for password recovery page in password recover mode.
-#: actions/recoverpassword.php:225
 msgid "Recover password"
 msgstr "Återskapa lösenord"
 
 #. TRANS: Title for password recovery page in email sent mode.
 #. TRANS: Subject for password recovery e-mail.
-#: actions/recoverpassword.php:227 actions/recoverpassword.php:366
 msgid "Password recovery requested"
 msgstr "Återskapande av lösenord begärd"
 
 #. TRANS: Title for password recovery page in password saved mode.
-#: actions/recoverpassword.php:229
 #, fuzzy
 msgid "Password saved"
 msgstr "Lösenord sparat."
 
 #. TRANS: Title for password recovery page when an unknown action has been specified.
-#: actions/recoverpassword.php:232
 msgid "Unknown action"
 msgstr "Okänd funktion"
 
 #. TRANS: Title for field label for password reset form.
-#: actions/recoverpassword.php:258
 #, fuzzy
 msgid "6 or more characters, and do not forget it!"
 msgstr "Minst 6 tecken, och glöm inte bort det!"
 
 #. TRANS: Button text for password reset form.
 #. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: actions/recoverpassword.php:268 lib/designform.php:145
 msgctxt "BUTTON"
 msgid "Reset"
 msgstr "Återställ"
 
 #. TRANS: Form instructions for password recovery form.
-#: actions/recoverpassword.php:278
 msgid "Enter a nickname or email address."
 msgstr "Skriv in ett smeknamn eller en e-postadress."
 
 #. TRANS: Information on password recovery form if no known username or e-mail address was specified.
-#: actions/recoverpassword.php:309
 msgid "No user with that email address or username."
 msgstr "Ingen användare med den e-postadressen eller användarnamn."
 
 #. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
-#: actions/recoverpassword.php:327
 msgid "No registered email address for that user."
 msgstr "Ingen registrerad e-postadress för den användaren."
 
 #. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
-#: actions/recoverpassword.php:342
 msgid "Error saving address confirmation."
 msgstr "Fel vid sparande av adressbekräftelse."
 
 #. TRANS: User notification after an e-mail with instructions was sent from the password recovery form.
-#: actions/recoverpassword.php:370
 msgid ""
 "Instructions for recovering your password have been sent to the email "
 "address registered to your account."
@@ -5025,75 +4145,59 @@ msgstr ""
 "postadressen som är registrerat till ditt konto "
 
 #. TRANS: Client error displayed when trying to reset as password without providing a user.
-#: actions/recoverpassword.php:391
 msgid "Unexpected password reset."
 msgstr "Oväntad återställning av lösenord."
 
 #. TRANS: Reset password form validation error message.
-#: actions/recoverpassword.php:400
 #, fuzzy
 msgid "Password must be 6 characters or more."
 msgstr "Lösenordet måste vara minst 6 tecken."
 
 #. TRANS: Reset password form validation error message.
-#: actions/recoverpassword.php:405
 msgid "Password and confirmation do not match."
 msgstr "Lösenord och bekräftelse matchar inte."
 
 #. TRANS: Server error displayed when something does wrong with the user object during password reset.
-#: actions/recoverpassword.php:426 actions/register.php:241
 msgid "Error setting user."
 msgstr "Fel uppstog i användarens inställning"
 
 #. TRANS: Success message for user after password reset.
-#: actions/recoverpassword.php:434
 msgid "New password successfully saved. You are now logged in."
 msgstr "Nya lösenordet sparat. Du är nu inloggad."
 
-#: actions/redirecturl.php:70
 #, fuzzy
 msgid "No id parameter"
 msgstr "Inget ID-argument."
 
-#: actions/redirecturl.php:76
 #, fuzzy, php-format
 msgid "No such file \"%d\""
 msgstr "Ingen sådan fil."
 
-#: actions/register.php:80 actions/register.php:181 actions/register.php:392
 msgid "Sorry, only invited people can register."
 msgstr "Tyvärr, bara inbjudna personer kan registrera sig."
 
-#: actions/register.php:87
 msgid "Sorry, invalid invitation code."
 msgstr "Tyvärr, ogiltig inbjudningskod."
 
-#: actions/register.php:106
 msgid "Registration successful"
 msgstr "Registreringen genomförd"
 
-#: actions/register.php:108 actions/register.php:490
 msgid "Register"
 msgstr "Registrera"
 
-#: actions/register.php:128
 msgid "Registration not allowed."
 msgstr "Registrering inte tillåten."
 
-#: actions/register.php:194
 #, fuzzy
 msgid "You cannot register if you don't agree to the license."
 msgstr "Du kan inte registrera dig om du inte godkänner licensen."
 
-#: actions/register.php:203
 msgid "Email address already exists."
 msgstr "E-postadressen finns redan."
 
-#: actions/register.php:236 actions/register.php:258
 msgid "Invalid username or password."
 msgstr "Ogiltigt användarnamn eller lösenord."
 
-#: actions/register.php:333
 #, fuzzy
 msgid ""
 "With this form you can create a new account. You can then post notices and "
@@ -5102,52 +4206,42 @@ msgstr ""
 "Med detta formulär kan du skapa ett nytt konto. Du kan sedan posta notiser "
 "och ansluta till vänner och kollegor. "
 
-#: actions/register.php:424 actions/register.php:428
-#: actions/siteadminpanel.php:238 lib/settingsnav.php:92
 msgid "Email"
 msgstr "E-post"
 
-#: actions/register.php:425 actions/register.php:429
 #, fuzzy
 msgid "Used only for updates, announcements, and password recovery."
 msgstr ""
 "Används endast för uppdateringar, tillkännagivanden och återskapande av "
 "lösenord"
 
-#: actions/register.php:436
 #, fuzzy
 msgid "Longer name, preferably your \"real\" name."
 msgstr "Längre namn, förslagsvis ditt \"verkliga\" namn"
 
-#: actions/register.php:464
 #, fuzzy
 msgid "Where you are, like \"City, State (or Region), Country\"."
 msgstr "Var du håller till, såsom \"Stad, Län, Land\""
 
-#: actions/register.php:503
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
 msgstr ""
 "Jag förstår att innehåll och data av %1$s är privata och konfidentiella."
 
-#: actions/register.php:513
 #, php-format
 msgid "My text and files are copyright by %1$s."
 msgstr "Upphovsrätten till min text och mina filer innehas av %1$s."
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:517
 msgid "My text and files remain under my own copyright."
 msgstr "Upphovsrätten till min text och mina filer är fortsatt min."
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:520
 msgid "All rights reserved."
 msgstr "Alla rättigheter reserverade."
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:525
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -5156,7 +4250,6 @@ msgstr ""
 "Mina texter och filer är tillgängliga under %s med undantag av den här "
 "privata datan: lösenord, e-postadress, IM-adress, telefonnummer."
 
-#: actions/register.php:566
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -5189,7 +4282,6 @@ msgstr ""
 "Tack för att du anmält dig och vi hoppas att du kommer tycka om att använda "
 "denna tjänst."
 
-#: actions/register.php:590
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5197,7 +4289,6 @@ msgstr ""
 "(Du kommer få ett meddelande med e-post inom kort med instruktioner hur du "
 "bekräftar din e-postadress.)"
 
-#: actions/remotesubscribe.php:97
 #, php-format
 msgid ""
 "To subscribe, you can [login](%%action.login%%), or [register](%%action."
@@ -5209,119 +4300,93 @@ msgstr ""
 "[kompatibel mikrobloggwebbplats](%%doc.openmublog%%), fyll i din profils URL "
 "nedan."
 
-#: actions/remotesubscribe.php:111
 msgid "Remote subscribe"
 msgstr "Fjärrprenumerera"
 
-#: actions/remotesubscribe.php:123
 msgid "Subscribe to a remote user"
 msgstr "Prenumerera på en fjärranvändare"
 
-#: actions/remotesubscribe.php:128
 msgid "User nickname"
 msgstr "Användarens smeknamn"
 
-#: actions/remotesubscribe.php:129
 #, fuzzy
 msgid "Nickname of the user you want to follow."
 msgstr "Smeknamnet på användaren du vill följa"
 
-#: actions/remotesubscribe.php:132
 msgid "Profile URL"
 msgstr "Profil-URL"
 
-#: actions/remotesubscribe.php:133
 #, fuzzy
 msgid "URL of your profile on another compatible microblogging service."
 msgstr "URL till din profil på en annan kompatibel mikrobloggtjänst"
 
 #. TRANS: Link text for link that will subscribe to a remote profile.
-#: actions/remotesubscribe.php:136 lib/subscribeform.php:139
-#: lib/userprofile.php:402
 msgid "Subscribe"
 msgstr "Prenumerera"
 
-#: actions/remotesubscribe.php:158
 #, fuzzy
 msgid "Invalid profile URL (bad format)."
 msgstr "Ogiltig profil-URL (dåligt format)"
 
-#: actions/remotesubscribe.php:167
 msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
 msgstr ""
 "Inte en giltig profil-URL (inget YADIS-dokument eller ogiltig XRDS "
 "definerad)."
 
-#: actions/remotesubscribe.php:175
 #, fuzzy
 msgid "That is a local profile! Login to subscribe."
 msgstr "Det där är en lokal profil! Logga in för att prenumerera."
 
-#: actions/remotesubscribe.php:182
 #, fuzzy
 msgid "Could not get a request token."
 msgstr "Kunde inte få en token för begäran."
 
-#: actions/repeat.php:56
 msgid "Only logged-in users can repeat notices."
 msgstr "Bara inloggade användaren kan upprepa notiser."
 
-#: actions/repeat.php:63 actions/repeat.php:70
 msgid "No notice specified."
 msgstr "Ingen notis angiven."
 
-#: actions/repeat.php:75
 #, fuzzy
 msgid "You cannot repeat your own notice."
 msgstr "Du kan inte upprepa din egna notis."
 
-#: actions/repeat.php:89
 msgid "You already repeated that notice."
 msgstr "Du har redan upprepat denna notis."
 
-#: actions/repeat.php:112 lib/noticelist.php:697
 msgid "Repeated"
 msgstr "Upprepad"
 
-#: actions/repeat.php:117
 msgid "Repeated!"
 msgstr "Upprepad!"
 
 #. TRANS: RSS reply feed title. %s is a user nickname.
-#: actions/replies.php:126 actions/repliesrss.php:68
-#: lib/personalgroupnav.php:105
 #, php-format
 msgid "Replies to %s"
 msgstr "Svarat till %s"
 
-#: actions/replies.php:128
 #, php-format
 msgid "Replies to %1$s, page %2$d"
 msgstr "Svar till %1$s, sida %2$s"
 
-#: actions/replies.php:145
 #, php-format
 msgid "Replies feed for %s (RSS 1.0)"
 msgstr "Flöde med svar för %s (RSS 1.0)"
 
-#: actions/replies.php:152
 #, php-format
 msgid "Replies feed for %s (RSS 2.0)"
 msgstr "Flöde med svar för %s (RSS 2.0)"
 
-#: actions/replies.php:159
 #, php-format
 msgid "Replies feed for %s (Atom)"
 msgstr "Flöde med svar för %s (Atom)"
 
-#: actions/replies.php:199
 #, php-format
 msgid ""
 "This is the timeline showing replies to %1$s but %2$s hasn't received a "
 "notice to them yet."
 msgstr "Detta är tidslinjen för %1$s men %2$s har inte postat något än."
 
-#: actions/replies.php:204
 #, php-format
 msgid ""
 "You can engage other users in a conversation, subscribe to more people or "
@@ -5330,7 +4395,6 @@ msgstr ""
 "Du kan engagera andra användare i en konversation, prenumerera på fler "
 "personer eller [gå med i grupper](%%action.groups%%)."
 
-#: actions/replies.php:206
 #, php-format
 msgid ""
 "You can try to [nudge %1$s](../%2$s) or [post something to them](%%%%action."
@@ -5341,38 +4405,32 @@ msgstr ""
 
 #. TRANS: RSS reply feed description.
 #. TRANS: %1$s is a user nickname, %2$s is the StatusNet site name.
-#: actions/repliesrss.php:74
 #, fuzzy, php-format
 msgid "Replies to %1$s on %2$s."
 msgstr "Svar till %1$s på %2$s"
 
 #. TRANS: Client exception displayed when trying to restore an account while not logged in.
-#: actions/restoreaccount.php:78
 #, fuzzy
 msgid "Only logged-in users can restore their account."
 msgstr "Bara inloggade användaren kan upprepa notiser."
 
 #. TRANS: Client exception displayed when trying to restore an account without having restore rights.
-#: actions/restoreaccount.php:83
 #, fuzzy
 msgid "You may not restore your account."
 msgstr "Du har inte registrerat några applikationer än."
 
 #. TRANS: Client exception displayed trying to restore an account while something went wrong uploading a file.
 #. TRANS: Client exception. No file; probably just a non-AJAX submission.
-#: actions/restoreaccount.php:121 actions/restoreaccount.php:146
 #, fuzzy
 msgid "No uploaded file."
 msgstr "Ladda upp fil"
 
 #. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
-#: actions/restoreaccount.php:129 lib/mediafile.php:194
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
 msgstr ""
 "Den uppladdade filen överstiger upload_max_filesize-direktivet i php.ini."
 
 #. TRANS: Client exception.
-#: actions/restoreaccount.php:135 lib/mediafile.php:200
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form."
@@ -5381,145 +4439,117 @@ msgstr ""
 "HTML-formuläret."
 
 #. TRANS: Client exception.
-#: actions/restoreaccount.php:141 lib/mediafile.php:206
 msgid "The uploaded file was only partially uploaded."
 msgstr "Den uppladdade filen var bara delvis uppladdad."
 
 #. TRANS: Client exception thrown when a temporary folder is not present to store a file upload.
-#: actions/restoreaccount.php:150 lib/mediafile.php:214
 msgid "Missing a temporary folder."
 msgstr "Saknar en tillfällig mapp."
 
 #. TRANS: Client exception thrown when writing to disk is not possible during a file upload operation.
-#: actions/restoreaccount.php:154 lib/mediafile.php:218
 msgid "Failed to write file to disk."
 msgstr "Misslyckades att skriva fil till disk."
 
 #. TRANS: Client exception thrown when a file upload operation has been stopped by an extension.
-#: actions/restoreaccount.php:158 lib/mediafile.php:222
 msgid "File upload stopped by extension."
 msgstr "Filuppladdningen stoppad pga filändelse"
 
 #. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
 #. TRANS: Exception thrown when uploading an image fails for an unknown reason.
 #. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
-#: actions/restoreaccount.php:164 lib/imagefile.php:106 lib/mediafile.php:228
 msgid "System error uploading file."
 msgstr "Systemfel vid uppladdning av fil."
 
 #. TRANS: Client exception thrown when a feed is not an Atom feed.
-#: actions/restoreaccount.php:207
 #, fuzzy
 msgid "Not an Atom feed."
 msgstr "Alla medlemmar"
 
 #. TRANS: Success message when a feed has been restored.
-#: actions/restoreaccount.php:241
 msgid ""
 "Feed has been restored. Your old posts should now appear in search and your "
 "profile page."
 msgstr ""
 
 #. TRANS: Message when a feed restore is in progress.
-#: actions/restoreaccount.php:245
 msgid "Feed will be restored. Please wait a few minutes for results."
 msgstr ""
 
 #. TRANS: Form instructions for feed restore.
-#: actions/restoreaccount.php:342
 msgid ""
 "You can upload a backed-up stream in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format."
 msgstr ""
 
 #. TRANS: Title for submit button to confirm upload of a user backup file for account restore.
-#: actions/restoreaccount.php:373
 #, fuzzy
 msgid "Upload the file"
 msgstr "Ladda upp fil"
 
-#: actions/revokerole.php:75
 msgid "You cannot revoke user roles on this site."
 msgstr "Du kan inte återkalla användarroller på denna webbplats."
 
-#: actions/revokerole.php:82
 msgid "User doesn't have this role."
 msgstr "Användare har inte denna roll."
 
-#: actions/rsd.php:142 actions/version.php:159
 msgid "StatusNet"
 msgstr "StatusNet"
 
-#: actions/sandbox.php:65 actions/unsandbox.php:65
 msgid "You cannot sandbox users on this site."
 msgstr "Du kan inte flytta användare till sandlådan på denna webbplats."
 
-#: actions/sandbox.php:72
 msgid "User is already sandboxed."
 msgstr "Användare är redan flyttad till sandlådan."
 
 #. TRANS: Menu item for site administration
-#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
-#: lib/adminpanelaction.php:379
 msgid "Sessions"
 msgstr "Sessioner"
 
-#: actions/sessionsadminpanel.php:65
 msgid "Session settings for this StatusNet site"
 msgstr ""
 
-#: actions/sessionsadminpanel.php:175
 msgid "Handle sessions"
 msgstr "Hantera sessioner"
 
-#: actions/sessionsadminpanel.php:177
 msgid "Whether to handle sessions ourselves."
 msgstr "Hurvida sessioner skall hanteras av oss själva."
 
-#: actions/sessionsadminpanel.php:181
 msgid "Session debugging"
 msgstr "Sessionsfelsökning"
 
-#: actions/sessionsadminpanel.php:183
 msgid "Turn on debugging output for sessions."
 msgstr "Sätt på felsökningsutdata för sessioner."
 
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
+#. TRANS: Submit button title.
+msgid "Save"
+msgstr "Spara"
+
 msgid "Save site settings"
 msgstr "Spara webbplatsinställningar"
 
-#: actions/showapplication.php:78
 msgid "You must be logged in to view an application."
 msgstr "Du måste vara inloggad för att se en applikation."
 
-#: actions/showapplication.php:151
 msgid "Application profile"
 msgstr "Applikationsprofil"
 
-#: actions/showapplication.php:179
 #, php-format
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr "Skapad av %1$s - %2$s standardåtkomst - %3$d användare"
 
-#: actions/showapplication.php:189
 msgid "Application actions"
 msgstr "Åtgärder för applikation"
 
-#: actions/showapplication.php:212
 msgid "Reset key & secret"
 msgstr "Återställ nyckel & hemlighet"
 
 #. TRANS: Title of form for deleting a user.
-#: actions/showapplication.php:228 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:64 lib/noticelist.php:678
 msgid "Delete"
 msgstr "Ta bort"
 
-#: actions/showapplication.php:237
 msgid "Application info"
 msgstr "Information om applikation"
 
-#: actions/showapplication.php:255
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
@@ -5527,43 +4557,36 @@ msgstr ""
 "Notera: Vi stöjder HMAC-SHA1-signaturer. Vi stödjer inte metoden med "
 "klartextsignatur."
 
-#: actions/showapplication.php:275
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr ""
 "Är du säker på att du vill återställa din konsumentnyckel och -hemlighet?"
 
 #. TRANS: Title for all but the first page of favourite notices of a user.
 #. TRANS: %1$s is the user for whom the favourite notices are displayed, %2$d is the page number.
-#: actions/showfavorites.php:80
 #, php-format
 msgid "%1$s's favorite notices, page %2$d"
 msgstr "%1$ss favoritnotiser, sida %2$d"
 
 #. TRANS: Server error displayed when favourite notices could not be retrieved from the database.
-#: actions/showfavorites.php:134
 msgid "Could not retrieve favorite notices."
 msgstr "Kunde inte hämta favoritnotiser."
 
 #. TRANS: Feed link text. %s is a username.
-#: actions/showfavorites.php:172
 #, php-format
 msgid "Feed for favorites of %s (RSS 1.0)"
 msgstr "Flöde för %ss favoriter (RSS 1.0)"
 
 #. TRANS: Feed link text. %s is a username.
-#: actions/showfavorites.php:180
 #, php-format
 msgid "Feed for favorites of %s (RSS 2.0)"
 msgstr "Flöde för %ss favoriter (RSS 2.0)"
 
 #. TRANS: Feed link text. %s is a username.
-#: actions/showfavorites.php:188
 #, php-format
 msgid "Feed for favorites of %s (Atom)"
 msgstr "Flöde för %ss favoriter (Atom)"
 
 #. TRANS: Text displayed instead of favourite notices for the current logged in user that has no favourites.
-#: actions/showfavorites.php:209
 msgid ""
 "You haven't chosen any favorite notices yet. Click the fave button on "
 "notices you like to bookmark them for later or shed a spotlight on them."
@@ -5574,7 +4597,6 @@ msgstr ""
 
 #. TRANS: Text displayed instead of favourite notices for a user that has no favourites while logged in.
 #. TRANS: %s is a username.
-#: actions/showfavorites.php:213
 #, php-format
 msgid ""
 "%s hasn't added any favorite notices yet. Post something interesting they "
@@ -5586,7 +4608,6 @@ msgstr ""
 #. TRANS: Text displayed instead of favourite notices for a user that has no favourites while not logged in.
 #. TRANS: %s is a username, %%%%action.register%%%% is a link to the user registration page.
 #. TRANS: (link text)[link] is a Mark Down link.
-#: actions/showfavorites.php:220
 #, php-format
 msgid ""
 "%s hasn't added any favorite notices yet. Why not [register an account](%%%%"
@@ -5597,64 +4618,53 @@ msgstr ""
 "att lägga en notis till dina favoriter!"
 
 #. TRANS: Page notice for show favourites page.
-#: actions/showfavorites.php:251
 msgid "This is a way to share what you like."
 msgstr "Detta är ett sätt att dela med av det du gillar."
 
 #. TRANS: Page title for first group page. %s is a group name.
-#: actions/showgroup.php:75
 #, php-format
 msgid "%s group"
 msgstr "%s grupp"
 
 #. TRANS: Page title for any but first group page.
 #. TRANS: %1$s is a group name, $2$s is a page number.
-#: actions/showgroup.php:79
 #, php-format
 msgid "%1$s group, page %2$d"
 msgstr "%1$s grupp, sida %2$d"
 
 #. TRANS: Label for group description or group note (dt). Text hidden by default.
-#: actions/showgroup.php:266
 msgid "Note"
 msgstr "Notis"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:277 lib/groupeditform.php:180
 msgid "Aliases"
 msgstr "Alias"
 
 #. TRANS: Group actions header (h2). Text hidden by default.
-#: actions/showgroup.php:294
 msgid "Group actions"
 msgstr "Åtgärder för grupp"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:338
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
 msgstr "Flöde av notiser för %s grupp (RSS 1.0)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:345
 #, php-format
 msgid "Notice feed for %s group (RSS 2.0)"
 msgstr "Flöde av notiser för %s grupp (RSS 2.0)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:352
 #, php-format
 msgid "Notice feed for %s group (Atom)"
 msgstr "Flöde av notiser för %s grupp (Atom)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:358
 #, php-format
 msgid "FOAF for %s group"
 msgstr "FOAF för %s grupp"
 
 #. TRANS: Header for mini list of group members on a group page (h2).
-#: actions/showgroup.php:395
 msgid "Members"
 msgstr "Medlemmar"
 
@@ -5662,30 +4672,23 @@ msgstr "Medlemmar"
 #. TRANS: Text for user subscription statistics if the user has no subscriptions.
 #. TRANS: Text for user subscriber statistics if user has no subscribers.
 #. TRANS: Text for user user group membership statistics if user is not a member of any group.
-#: actions/showgroup.php:401 lib/profileaction.php:137
-#: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
-#: lib/subscriptionlist.php:123 lib/tagcloudsection.php:71
 msgid "(None)"
 msgstr "(Ingen)"
 
 #. TRANS: Link to all group members from mini list of group members if group has more than n members.
-#: actions/showgroup.php:410
 msgid "All members"
 msgstr "Alla medlemmar"
 
 #. TRANS: Header for group statistics on a group page (h2).
 #. TRANS: H2 text for user statistics.
-#: actions/showgroup.php:441 lib/profileaction.php:205
 msgid "Statistics"
 msgstr "Statistik"
 
-#: actions/showgroup.php:444
 msgctxt "LABEL"
 msgid "Created"
 msgstr "Skapad"
 
 #. TRANS: Label for member count in statistics on group page.
-#: actions/showgroup.php:449
 msgctxt "LABEL"
 msgid "Members"
 msgstr "Medlemmar"
@@ -5694,7 +4697,6 @@ msgstr "Medlemmar"
 #. TRANS: **%s** is the group alias, %%%%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).
-#: actions/showgroup.php:464
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5712,7 +4714,6 @@ 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: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
-#: actions/showgroup.php:474
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5726,99 +4727,83 @@ msgstr ""
 "sina liv och intressen. "
 
 #. TRANS: Header for list of group administrators on a group page (h2).
-#: actions/showgroup.php:503
 msgid "Admins"
 msgstr "Administratörer"
 
 #. TRANS: Client error displayed requesting a single message that does not exist.
-#: actions/showmessage.php:76
 msgid "No such message."
 msgstr "Inget sådant meddelande."
 
 #. TRANS: Client error displayed requesting a single direct message the requesting user was not a party in.
-#: actions/showmessage.php:86
 msgid "Only the sender and recipient may read this message."
 msgstr "Endast avsändaren och mottagaren kan läsa detta meddelande."
 
 #. TRANS: Page title for single direct message display when viewing user is the sender.
 #. TRANS: %1$s is the addressed user's nickname, $2$s is a timestamp.
-#: actions/showmessage.php:105
 #, php-format
 msgid "Message to %1$s on %2$s"
 msgstr "Meddelande till %1$s på %2$s"
 
 #. TRANS: Page title for single message display.
 #. TRANS: %1$s is the sending user's nickname, $2$s is a timestamp.
-#: actions/showmessage.php:113
 #, php-format
 msgid "Message from %1$s on %2$s"
 msgstr "Meddelande från %1$s på %2$s"
 
-#: actions/shownotice.php:90
 msgid "Notice deleted."
 msgstr "Notis borttagen."
 
 #. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
-#: actions/showstream.php:70
 #, fuzzy, php-format
 msgid "%1$s tagged %2$s"
 msgstr "%1$s taggade %2$d"
 
 #. TRANS: Page title showing tagged notices in one user's stream.
 #. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
-#: actions/showstream.php:74
 #, php-format
 msgid "%1$s tagged %2$s, page %3$d"
 msgstr "%1$s taggade %2$s, sida %3$d"
 
 #. TRANS: Extended page title showing tagged notices in one user's stream.
 #. TRANS: %1$s is the username, %2$d is the page number.
-#: actions/showstream.php:82
 #, php-format
 msgid "%1$s, page %2$d"
 msgstr "%1$s, sida %2$d"
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %1$s is a user nickname, %2$s is a hashtag.
-#: actions/showstream.php:127
 #, php-format
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
 msgstr "Flöde av notiser för %1$s taggade %2$s (RSS 1.0)"
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.
-#: actions/showstream.php:136
 #, php-format
 msgid "Notice feed for %s (RSS 1.0)"
 msgstr "Flöde av notiser för %s (RSS 1.0)"
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.
-#: actions/showstream.php:145
 #, php-format
 msgid "Notice feed for %s (RSS 2.0)"
 msgstr "Flöde av notiser för %s (RSS 2.0)"
 
-#: actions/showstream.php:152
 #, php-format
 msgid "Notice feed for %s (Atom)"
 msgstr "Flöde av notiser för %s (Atom)"
 
 #. TRANS: Title for link to notice feed. FOAF stands for Friend of a Friend.
 #. TRANS: More information at http://www.foaf-project.org. %s is a user nickname.
-#: actions/showstream.php:159
 #, php-format
 msgid "FOAF for %s"
 msgstr "FOAF för %s"
 
 #. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
-#: actions/showstream.php:205
 #, fuzzy, php-format
 msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr "Detta är tidslinjen för %1$s men %2$s har inte postat något än."
 
 #. TRANS: Second sentence of empty list message for a stream for the user themselves.
-#: actions/showstream.php:211
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
@@ -5828,7 +4813,6 @@ msgstr ""
 
 #. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:215
 #, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
@@ -5839,7 +4823,6 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:258
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5854,7 +4837,6 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:265
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5866,223 +4848,176 @@ msgstr ""
 "[StatusNet](http://status.net/). "
 
 #. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
-#: actions/showstream.php:322
 #, php-format
 msgid "Repeat of %s"
 msgstr "Upprepning av %s"
 
-#: actions/silence.php:65 actions/unsilence.php:65
 msgid "You cannot silence users on this site."
 msgstr "Du kan inte tysta ned användare på denna webbplats."
 
-#: actions/silence.php:72
 msgid "User is already silenced."
 msgstr "Användaren är redan nedtystad."
 
-#: actions/siteadminpanel.php:69
 msgid "Basic settings for this StatusNet site"
 msgstr "Grundinställningar för din StatusNet-webbplats"
 
-#: actions/siteadminpanel.php:133
 msgid "Site name must have non-zero length."
 msgstr "Webbplatsnamnet måste vara minst ett tecken långt."
 
-#: actions/siteadminpanel.php:141
 msgid "You must have a valid contact email address."
 msgstr "Du måste ha en giltig e-postadress."
 
-#: actions/siteadminpanel.php:159
 #, php-format
 msgid "Unknown language \"%s\"."
 msgstr "Okänt språk \"%s\"."
 
-#: actions/siteadminpanel.php:165
 msgid "Minimum text limit is 0 (unlimited)."
 msgstr "Minsta textbegränsning är 0 (obegränsat)."
 
-#: actions/siteadminpanel.php:171
 msgid "Dupe limit must be one or more seconds."
 msgstr "Duplikatgräns måste vara en eller fler sekuner."
 
-#: actions/siteadminpanel.php:221
 msgid "General"
 msgstr "Allmänt"
 
-#: actions/siteadminpanel.php:224
 msgid "Site name"
 msgstr "Webbplatsnamn"
 
-#: actions/siteadminpanel.php:225
 msgid "The name of your site, like \"Yourcompany Microblog\""
 msgstr "Namnet på din webbplats, t.ex.  \"Företagsnamn mikroblogg\""
 
-#: actions/siteadminpanel.php:229
 msgid "Brought by"
 msgstr "Tillhandahållen av"
 
-#: actions/siteadminpanel.php:230
 msgid "Text used for credits link in footer of each page"
 msgstr "Text som används för tillskrivningslänkar i sidfoten på varje sida."
 
-#: actions/siteadminpanel.php:234
 msgid "Brought by URL"
 msgstr "Tillhandahållen av URL"
 
-#: actions/siteadminpanel.php:235
 msgid "URL used for credits link in footer of each page"
 msgstr "URL som används för tillskrivningslänkar i sidfoten på varje sida"
 
-#: actions/siteadminpanel.php:239
 msgid "Contact email address for your site"
 msgstr "Kontakte-postadress för din webbplats"
 
-#: actions/siteadminpanel.php:245
 msgid "Local"
 msgstr "Lokal"
 
-#: actions/siteadminpanel.php:256
 msgid "Default timezone"
 msgstr "Standardtidszon"
 
-#: actions/siteadminpanel.php:257
 msgid "Default timezone for the site; usually UTC."
 msgstr "Standardtidzon för denna webbplats; vanligtvis UTC."
 
-#: actions/siteadminpanel.php:262
 msgid "Default language"
 msgstr "Standardspråk"
 
-#: actions/siteadminpanel.php:263
 msgid "Site language when autodetection from browser settings is not available"
 msgstr ""
 "Webbplatsspråk när automatisk identifiering av inställningar i webbläsaren "
 "inte är tillgänglig"
 
-#: actions/siteadminpanel.php:271
 msgid "Limits"
 msgstr "Begränsningar"
 
-#: actions/siteadminpanel.php:274
 msgid "Text limit"
 msgstr "Textbegränsning"
 
-#: actions/siteadminpanel.php:274
 msgid "Maximum number of characters for notices."
 msgstr "Maximala antalet tecken för notiser."
 
-#: actions/siteadminpanel.php:278
 msgid "Dupe limit"
 msgstr "Duplikatbegränsning"
 
-#: actions/siteadminpanel.php:278
 msgid "How long users must wait (in seconds) to post the same thing again."
 msgstr ""
 "Hur länge användare måste vänta (i sekunder) för att posta samma sak igen."
 
 #. TRANS: Page title for site-wide notice tab in admin panel.
-#: actions/sitenoticeadminpanel.php:55
 msgid "Site Notice"
 msgstr "Webbplatsnotis"
 
 #. TRANS: Instructions for site-wide notice tab in admin panel.
-#: actions/sitenoticeadminpanel.php:66
 msgid "Edit site-wide message"
 msgstr "Redigera webbplastsnotis"
 
 #. TRANS: Server error displayed when saving a site-wide notice was impossible.
-#: actions/sitenoticeadminpanel.php:101
 msgid "Unable to save site notice."
 msgstr "Kunde inte spara webbplatsnotis."
 
 #. TRANS: Client error displayed when a site-wide notice was longer than allowed.
-#: actions/sitenoticeadminpanel.php:112
 #, fuzzy
 msgid "Maximum length for the site-wide notice is 255 characters."
 msgstr "Maximal längd för webbplatsnotisen är 255 tecken."
 
 #. TRANS: Label for site-wide notice text field in admin panel.
-#: actions/sitenoticeadminpanel.php:176
 msgid "Site notice text"
 msgstr "Text för webbplatsnotis"
 
 #. TRANS: Tooltip for site-wide notice text field in admin panel.
-#: actions/sitenoticeadminpanel.php:179
 #, fuzzy
 msgid "Site-wide notice text (255 characters maximum; HTML allowed)"
 msgstr "Text för webbplatsnotis (max 255 tecken; HTML ok)"
 
 #. TRANS: Title for button to save site notice in admin panel.
-#: actions/sitenoticeadminpanel.php:201
 #, fuzzy
 msgid "Save site notice."
 msgstr "Spara webbplatsnotis"
 
 #. TRANS: Title for SMS settings.
-#: actions/smssettings.php:56
 msgid "SMS settings"
 msgstr "Inställningar för SMS"
 
 #. TRANS: SMS settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/smssettings.php:70
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr "Du kan ta emot SMS-meddelanden genom e-post från %%site.name%%."
 
 #. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
-#: actions/smssettings.php:92
 msgid "SMS is not available."
 msgstr "SMS är inte tillgängligt."
 
 #. TRANS: Form legend for SMS settings form.
-#: actions/smssettings.php:106
 msgid "SMS address"
 msgstr "SMS-adress"
 
 #. TRANS: Form guide in SMS settings form.
-#: actions/smssettings.php:115
 msgid "Current confirmed SMS-enabled phone number."
 msgstr "Nuvarande bekäftat telefonnummer för SMS."
 
 #. TRANS: Form guide in IM settings form.
-#: actions/smssettings.php:128
 msgid "Awaiting confirmation on this phone number."
 msgstr "Väntar bekräftelse för detta telefonnummer."
 
 #. TRANS: Field label for SMS address input in SMS settings form.
-#: actions/smssettings.php:137
 msgid "Confirmation code"
 msgstr "Bekräftelsekod"
 
 #. TRANS: Form field instructions in SMS settings form.
-#: actions/smssettings.php:139
 msgid "Enter the code you received on your phone."
 msgstr "Fyll i koden du mottog i din telefon."
 
 #. TRANS: Button label to confirm SMS confirmation code in SMS settings.
-#: actions/smssettings.php:143
 msgctxt "BUTTON"
 msgid "Confirm"
 msgstr "Bekräfta"
 
 #. TRANS: Field label for SMS phone number input in SMS settings form.
-#: actions/smssettings.php:148
 msgid "SMS phone number"
 msgstr "Telefonnummer för SMS"
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
-#: actions/smssettings.php:151
 #, fuzzy
 msgid "Phone number, no punctuation or spaces, with area code."
 msgstr "Telefonnummer, inga punkter eller mellanslag, med landskod"
 
 #. TRANS: Form legend for SMS preferences form.
-#: actions/smssettings.php:190
 msgid "SMS preferences"
 msgstr "SMS-inställningar"
 
 #. TRANS: Checkbox label in SMS preferences form.
-#: actions/smssettings.php:196
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
@@ -6091,32 +5026,26 @@ msgstr ""
 "debitera mig."
 
 #. TRANS: Confirmation message for successful SMS preferences save.
-#: actions/smssettings.php:307
 msgid "SMS preferences saved."
 msgstr "SMS-inställningar sparade."
 
 #. TRANS: Message given saving SMS phone number without having provided one.
-#: actions/smssettings.php:329
 msgid "No phone number."
 msgstr "Inget telefonnummer."
 
 #. TRANS: Message given saving SMS phone number without having selected a carrier.
-#: actions/smssettings.php:335
 msgid "No carrier selected."
 msgstr "Ingen operatör vald."
 
 #. TRANS: Message given saving SMS phone number that is already set.
-#: actions/smssettings.php:343
 msgid "That is already your phone number."
 msgstr "Detta är redan ditt telefonnummer."
 
 #. TRANS: Message given saving SMS phone number that is already set for another user.
-#: actions/smssettings.php:347
 msgid "That phone number already belongs to another user."
 msgstr "Detta telefonnumr tillhör redan en annan användare."
 
 #. TRANS: Message given saving valid SMS phone number that is to be confirmed.
-#: actions/smssettings.php:375
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
 "for the code and instructions on how to use it."
@@ -6125,39 +5054,32 @@ msgstr ""
 "din telefon för koden och instruktioner om hur du använder den."
 
 #. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
-#: actions/smssettings.php:403
 msgid "That is the wrong confirmation number."
 msgstr "Detta är fel bekräftelsenummer."
 
 #. TRANS: Message given after successfully canceling SMS phone number confirmation.
-#: actions/smssettings.php:417
 msgid "SMS confirmation cancelled."
 msgstr "SMS-bekräftelse avbruten."
 
 #. TRANS: Message given trying to remove an SMS phone number that is not
 #. TRANS: registered for the active user.
-#: actions/smssettings.php:437
 msgid "That is not your phone number."
 msgstr "Detta är inte ditt telefonnummer."
 
 #. TRANS: Message given after successfully removing a registered SMS phone number.
-#: actions/smssettings.php:459
 msgid "The SMS phone number was removed."
 msgstr "Telefonnummer för SMS togs bort."
 
 #. TRANS: Label for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:498
 msgid "Mobile carrier"
 msgstr "Mobiloperatör"
 
 #. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:503
 msgid "Select a carrier"
 msgstr "Välj en operatör"
 
 #. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
 #. TRANS: %s is an administrative contact's e-mail address.
-#: actions/smssettings.php:512
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -6168,119 +5090,94 @@ msgstr ""
 "på %s och berätta."
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
-#: actions/smssettings.php:534
 #, fuzzy
 msgid "No code entered."
 msgstr "Ingen kod ifylld"
 
 #. TRANS: Menu item for site administration
-#: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
-#: lib/adminpanelaction.php:395
 msgid "Snapshots"
 msgstr "Ögonblicksbilder"
 
-#: actions/snapshotadminpanel.php:65
 msgid "Manage snapshot configuration"
 msgstr "Hantera konfiguration för ögonblicksbild"
 
-#: actions/snapshotadminpanel.php:127
 msgid "Invalid snapshot run value."
 msgstr "Ogiltigt körvärde för ögonblicksbild."
 
-#: actions/snapshotadminpanel.php:133
 msgid "Snapshot frequency must be a number."
 msgstr "Frekvens för ögonblicksbilder måste vara ett nummer."
 
-#: actions/snapshotadminpanel.php:144
 msgid "Invalid snapshot report URL."
 msgstr "Ogiltig rapport-URL för ögonblicksbild"
 
-#: actions/snapshotadminpanel.php:200
 msgid "Randomly during web hit"
 msgstr "Slumpmässigt vid webbförfrågningar"
 
-#: actions/snapshotadminpanel.php:201
 msgid "In a scheduled job"
 msgstr "I ett schemalagt jobb"
 
-#: actions/snapshotadminpanel.php:206
 msgid "Data snapshots"
 msgstr "Ögonblicksbild av data"
 
-#: actions/snapshotadminpanel.php:208
 msgid "When to send statistical data to status.net servers"
 msgstr "När statistikdata skall skickas till status.net-servrar"
 
-#: actions/snapshotadminpanel.php:217
 msgid "Frequency"
 msgstr "Frekvens"
 
-#: actions/snapshotadminpanel.php:218
 msgid "Snapshots will be sent once every N web hits"
 msgstr "Ögonblicksbild kommer skickas var N:te webbträff"
 
-#: actions/snapshotadminpanel.php:226
 msgid "Report URL"
 msgstr "URL för rapport"
 
-#: actions/snapshotadminpanel.php:227
 msgid "Snapshots will be sent to this URL"
 msgstr "Ögonblicksbild kommer skickat till denna URL"
 
-#: actions/snapshotadminpanel.php:248
 msgid "Save snapshot settings"
 msgstr "Spara inställningar för ögonblicksbild"
 
 #. TRANS: Client error displayed trying a change a subscription for a non-subscribed profile.
-#: actions/subedit.php:75
 msgid "You are not subscribed to that profile."
 msgstr "Du är inte prenumerat hos den profilen."
 
 #. TRANS: Server error displayed when updating a subscription fails with a database error.
 #. TRANS: Exception thrown when a subscription could not be stored on the server.
-#: actions/subedit.php:89 classes/Subscription.php:141
 msgid "Could not save subscription."
 msgstr "Kunde inte spara prenumeration."
 
 #. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
-#: actions/subscribe.php:121
 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
 msgstr "Du kan inte prenumerera på en 0MB 0.1-fjärrprofil med denna åtgärd."
 
 #. TRANS: Page title when subscription succeeded.
-#: actions/subscribe.php:149
 msgid "Subscribed"
 msgstr "Prenumerant"
 
 #. TRANS: Header for list of subscribers for a user (first page).
 #. TRANS: %s is the user's nickname.
-#: actions/subscribers.php:51
 #, php-format
 msgid "%s subscribers"
 msgstr "%s prenumeranter"
 
 #. TRANS: Header for list of subscribers for a user (not first page).
 #. TRANS: %1$s is the user's nickname, $2$d is the page number.
-#: actions/subscribers.php:55
 #, php-format
 msgid "%1$s subscribers, page %2$d"
 msgstr "%1$s prenumeranter, sida %2$d"
 
 #. TRANS: Page notice for page with an overview of all subscribers
 #. TRANS: of the logged in user's own profile.
-#: actions/subscribers.php:68
 msgid "These are the people who listen to your notices."
 msgstr "Det är dessa personer som lyssnar på dina notiser."
 
 #. TRANS: Page notice for page with an overview of all subscribers of a user other
 #. TRANS: than the logged in user. %s is the user nickname.
-#: actions/subscribers.php:74
 #, php-format
 msgid "These are the people who listen to %s's notices."
 msgstr "Det är dessa personer som lyssnar på %ss notiser."
 
 #. TRANS: Subscriber list text when the logged in user has no subscribers.
-#: actions/subscribers.php:114
 #, fuzzy
 msgid ""
 "You have no subscribers. Try subscribing to people you know and they might "
@@ -6291,7 +5188,6 @@ msgstr ""
 
 #. TRANS: Subscriber list text when looking at the subscribers for a of a user other
 #. TRANS: than the logged in user that has no subscribers. %s is the user nickname.
-#: actions/subscribers.php:118
 #, php-format
 msgid "%s has no subscribers. Want to be the first?"
 msgstr "%s har inte några prenumeranter. Vill du bli först?"
@@ -6301,7 +5197,6 @@ msgstr "%s har inte några prenumeranter. Vill du bli först?"
 #. TRANS: This message contains a Markdown URL. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.
-#: actions/subscribers.php:127
 #, php-format
 msgid ""
 "%s has no subscribers. Why not [register an account](%%%%action.register%%%"
@@ -6312,20 +5207,17 @@ msgstr ""
 
 #. TRANS: Header for subscriptions overview for a user (not first page).
 #. TRANS: %1$s is a user nickname, %2$d is the page number.
-#: actions/subscriptions.php:55
 #, php-format
 msgid "%1$s subscriptions, page %2$d"
 msgstr "%1$s prenumerationer, sida %2$d"
 
 #. TRANS: Page notice for page with an overview of all subscriptions
 #. TRANS: of the logged in user's own profile.
-#: actions/subscriptions.php:68
 msgid "These are the people whose notices you listen to."
 msgstr "Det är dessa personer vars meddelanden du lyssnar på."
 
 #. TRANS: Page notice for page with an overview of all subscriptions of a user other
 #. TRANS: than the logged in user. %s is the user nickname.
-#: actions/subscriptions.php:74
 #, php-format
 msgid "These are the people whose notices %s listens to."
 msgstr "Det är dessa personer vars notiser %s lyssnar på."
@@ -6334,7 +5226,6 @@ msgstr "Det är dessa personer vars notiser %s lyssnar på."
 #. 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.
-#: actions/subscriptions.php:133
 #, php-format
 msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "
@@ -6354,69 +5245,55 @@ msgstr ""
 #. TRANS: than the logged in user that has no subscriptions. %s is the user nickname.
 #. TRANS: Subscription list text when looking at the subscriptions for a of a user that has none
 #. TRANS: as an anonymous user. %s is the user nickname.
-#: actions/subscriptions.php:141 actions/subscriptions.php:147
 #, php-format
 msgid "%s is not listening to anyone."
 msgstr "%s lyssnar inte på någon."
 
 #. TRANS: Atom feed title. %s is a profile nickname.
-#: actions/subscriptions.php:176
 #, fuzzy, php-format
 msgid "Subscription feed for %s (Atom)"
 msgstr "Flöde av notiser för %s (Atom)"
 
 #. TRANS: Checkbox label for enabling Jabber messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:241 lib/settingsnav.php:110
-#, fuzzy
 msgid "IM"
 msgstr "Snabbmeddelande"
 
 #. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:256 lib/settingsnav.php:117
 msgid "SMS"
 msgstr "SMS"
 
 #. TRANS: Title for all but the first page of notices with tags.
 #. TRANS: %1$s is the tag, %2$d is the page number.
-#: actions/tag.php:73
 #, php-format
 msgid "Notices tagged with %1$s, page %2$d"
 msgstr "Notiser taggade med %1$s, sida %2$d"
 
-#: actions/tag.php:91
 #, php-format
 msgid "Notice feed for tag %s (RSS 1.0)"
 msgstr "Flöde av notiser för tagg %s (RSS 1.0)"
 
-#: actions/tag.php:97
 #, php-format
 msgid "Notice feed for tag %s (RSS 2.0)"
 msgstr "Flöde av notiser för tagg %s (RSS 2.0)"
 
-#: actions/tag.php:103
 #, php-format
 msgid "Notice feed for tag %s (Atom)"
 msgstr "Flöde av notiser för tagg %s (Atom)"
 
-#: actions/tagother.php:39
 msgid "No ID argument."
 msgstr "Inget ID-argument."
 
-#: actions/tagother.php:65
 #, php-format
 msgid "Tag %s"
 msgstr "Tagg %s"
 
 #. TRANS: H2 for user profile information.
-#: actions/tagother.php:77 lib/userprofile.php:76
 msgid "User profile"
 msgstr "Användarprofil"
 
-#: actions/tagother.php:120
 msgid "Tag user"
 msgstr "Tagga användare"
 
-#: actions/tagother.php:130
 msgid ""
 "Tags for this user (letters, numbers, -, ., and _), comma- or space- "
 "separated"
@@ -6424,49 +5301,39 @@ msgstr ""
 "Taggar för denna användare (bokstäver, nummer, -, ., och _), separerade med "
 "kommatecken eller mellanslag"
 
-#: actions/tagother.php:157
 #, php-format
 msgid "Invalid tag: \"%s\""
 msgstr "Ogiltig tagg: \"%s\""
 
-#: actions/tagother.php:172
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 "Du kan bara tagga personer du prenumererar på eller som prenumererar på dig."
 
-#: actions/tagother.php:215
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
 "Använd detta formulär för att lägga till taggar till dina prenumeranter "
 "eller prenumerationer."
 
-#: actions/tagrss.php:35
 msgid "No such tag."
 msgstr "Ingen sådan tagg."
 
 #. TRANS: Client error displayed when trying to unblock a non-blocked user.
-#: actions/unblock.php:59
 msgid "You haven't blocked that user."
 msgstr "Du har inte blockerat denna användared."
 
-#: actions/unsandbox.php:72
 msgid "User is not sandboxed."
 msgstr "Användare är inte flyttad till sandlådan."
 
-#: actions/unsilence.php:72
 msgid "User is not silenced."
 msgstr "Användare är inte nedtystad."
 
-#: actions/unsubscribe.php:77
 msgid "No profile ID in request."
 msgstr "Ingen profil-ID i begäran."
 
-#: actions/unsubscribe.php:98
 msgid "Unsubscribed"
 msgstr "Prenumeration avslutad"
 
-#: actions/updateprofile.php:64
 #, php-format
 msgid ""
 "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
@@ -6474,178 +5341,143 @@ msgstr ""
 "Licensen för lyssnarströmmen '%1$s' är inte förenlig med webbplatslicensen '%"
 "2$s'."
 
-#: actions/urlsettings.php:60
 #, fuzzy
 msgid "URL settings"
 msgstr "Inställningar för snabbmeddelanden"
 
 #. TRANS: Instructions for tab "Other" in user profile settings.
-#: actions/urlsettings.php:72
 msgid "Manage various other options."
 msgstr "Hantera diverse andra alternativ."
 
 #. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
 #. TRANS: user's profile settings. This message has one space at the beginning. Use your
 #. TRANS: language's word separator here if it has one (most likely a single space).
-#: actions/urlsettings.php:115
 msgid " (free service)"
 msgstr " (fri tjänst)"
 
-#: actions/urlsettings.php:121
 #, fuzzy
 msgid "[none]"
 msgstr "Ingen"
 
-#: actions/urlsettings.php:122
 msgid "[internal]"
 msgstr ""
 
 #. TRANS: Label for dropdown with URL shortener services.
-#: actions/urlsettings.php:130
 msgid "Shorten URLs with"
 msgstr "Förkorta URL:er med"
 
 #. TRANS: Tooltip for for dropdown with URL shortener services.
-#: actions/urlsettings.php:132
 msgid "Automatic shortening service to use."
 msgstr "Automatiska förkortningstjänster att använda."
 
-#: actions/urlsettings.php:138
 msgid "URL longer than"
 msgstr ""
 
-#: actions/urlsettings.php:141
 msgid "URLs longer than this will be shortened, 0 means always shorten."
 msgstr ""
 
-#: actions/urlsettings.php:145
 msgid "Text longer than"
 msgstr ""
 
-#: actions/urlsettings.php:148
 msgid ""
 "URLs in notices longer than this will be shortened, 0 means always shorten."
 msgstr ""
 
 #. TRANS: Form validation error for form "Other settings" in user profile.
-#: actions/urlsettings.php:180
 #, fuzzy
 msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr "Namnet på URL-förkortningstjänsen är för långt (max 50 tecken)."
 
-#: actions/urlsettings.php:187
 msgid "Invalid number for max url length."
 msgstr ""
 
-#: actions/urlsettings.php:193
 #, fuzzy
 msgid "Invalid number for max notice length."
 msgstr "Ogiltigt notisinnehåll."
 
-#: actions/urlsettings.php:238
 msgid "Error saving user URL shortening preferences."
 msgstr ""
 
 #. TRANS: User admin panel title
-#: actions/useradminpanel.php:58
 msgctxt "TITLE"
 msgid "User"
 msgstr "Användare"
 
 #. TRANS: Instruction for user admin panel.
-#: actions/useradminpanel.php:69
 msgid "User settings for this StatusNet site"
 msgstr ""
 
 #. TRANS: Form validation error in user admin panel when a non-numeric character limit was set.
-#: actions/useradminpanel.php:147
 msgid "Invalid bio limit. Must be numeric."
 msgstr "Ogiltig begränsning av biografi. Måste vara numerisk."
 
 #. TRANS: Form validation error in user admin panel when welcome text is too long.
-#: actions/useradminpanel.php:154
 #, fuzzy
 msgid "Invalid welcome text. Maximum length is 255 characters."
 msgstr "Ogiltig välkomsttext. Maximal längd är 255 tecken."
 
 #. TRANS: Client error displayed when trying to set a non-existing user as default subscription for new
 #. TRANS: users in user admin panel. %1$s is the invalid nickname.
-#: actions/useradminpanel.php:166
 #, fuzzy, php-format
 msgid "Invalid default subscripton: \"%1$s\" is not a user."
 msgstr "Ogiltig standardprenumeration: '%1$s' är inte användare."
 
-#: actions/useradminpanel.php:215 lib/action.php:565 lib/settingsnav.php:77
-#: lib/subgroupnav.php:81
 msgid "Profile"
 msgstr "Profil"
 
 #. TRANS: Field label in user admin panel for setting the character limit for the bio field.
-#: actions/useradminpanel.php:220
 msgid "Bio Limit"
 msgstr "Begränsning av biografi"
 
 #. TRANS: Tooltip in user admin panel for setting the character limit for the bio field.
-#: actions/useradminpanel.php:222
 msgid "Maximum length of a profile bio in characters."
 msgstr "Maximal teckenlängd av profilbiografi."
 
 #. TRANS: Form legend in user admin panel.
-#: actions/useradminpanel.php:231
 msgid "New users"
 msgstr "Nya användare"
 
 #. TRANS: Field label in user admin panel for setting new user welcome text.
-#: actions/useradminpanel.php:236
 msgid "New user welcome"
 msgstr "Välkomnande av ny användare"
 
 #. TRANS: Tooltip in user admin panel for setting new user welcome text.
-#: actions/useradminpanel.php:238
 #, fuzzy
 msgid "Welcome text for new users (maximum 255 characters)."
 msgstr "Välkomsttext för nya användare (max 255 tecken)."
 
 #. TRANS: Field label in user admin panel for setting default subscription for new users.
-#: actions/useradminpanel.php:244
 msgid "Default subscription"
 msgstr "Standardprenumerationer"
 
 #. TRANS: Tooltip in user admin panel for setting default subscription for new users.
-#: actions/useradminpanel.php:246
 msgid "Automatically subscribe new users to this user."
 msgstr ""
 "Lägg automatiskt till en prenumeration på denna användare för alla nya "
 "användare."
 
 #. TRANS: Form legend in user admin panel.
-#: actions/useradminpanel.php:256
 msgid "Invitations"
 msgstr "Inbjudningar"
 
 #. TRANS: Field label for checkbox in user admin panel for allowing users to invite friend using site e-mail.
-#: actions/useradminpanel.php:262
 msgid "Invitations enabled"
 msgstr "Inbjudningar aktiverade"
 
 #. TRANS: Tooltip for checkbox in user admin panel for allowing users to invite friend using site e-mail.
-#: actions/useradminpanel.php:265
 msgid "Whether to allow users to invite new users."
 msgstr "Hurvida användare skall tillåtas bjuda in nya användare."
 
 #. TRANS: Title for button to save user settings in user admin panel.
-#: actions/useradminpanel.php:302
 #, fuzzy
 msgid "Save user settings."
 msgstr "Spara webbplatsinställningar"
 
 #. TRANS: Page title.
-#: actions/userauthorization.php:109
 msgid "Authorize subscription"
 msgstr "Godkänn prenumeration"
 
 #. TRANS: Page notice on "Auhtorize subscription" page.
-#: actions/userauthorization.php:115
 #, fuzzy
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
@@ -6657,42 +5489,35 @@ msgstr ""
 "på någons meddelanden, klicka på \"Avvisa\"."
 
 #. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:200
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Accept"
 msgstr "Acceptera"
 
 #. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:202
 #, fuzzy
 msgid "Subscribe to this user."
 msgstr "Prenumerera på denna användare"
 
 #. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:204
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Reject"
 msgstr "Avvisa"
 
 #. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:206
 #, fuzzy
 msgid "Reject this subscription."
 msgstr "Avvisa denna prenumeration"
 
 #. TRANS: Client error displayed for an empty authorisation request.
-#: actions/userauthorization.php:219
 msgid "No authorization request!"
 msgstr "Ingen begäran om godkännande!"
 
 #. TRANS: Accept message header from Authorise subscription page.
-#: actions/userauthorization.php:242
 msgid "Subscription authorized"
 msgstr "Prenumeration godkänd"
 
-#: actions/userauthorization.php:245
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to authorize the "
@@ -6703,11 +5528,9 @@ msgstr ""
 "prenumerations-token är:"
 
 #. TRANS: Reject message header from Authorise subscription page.
-#: actions/userauthorization.php:256
 msgid "Subscription rejected"
 msgstr "Prenumeration avvisad"
 
-#: actions/userauthorization.php:259
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to fully reject the "
@@ -6719,35 +5542,30 @@ msgstr ""
 
 #. TRANS: Exception thrown when no valid user is found for an authorisation request.
 #. TRANS: %s is a listener URI.
-#: actions/userauthorization.php:296
 #, fuzzy, php-format
 msgid "Listener URI \"%s\" not found here."
 msgstr "URI för lyssnare '%s' hittades inte här."
 
 #. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
 #. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:303
 #, fuzzy, php-format
 msgid "Listenee URI \"%s\" is too long."
 msgstr "Lyssnar-URI '%s' är för lång."
 
 #. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
 #. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:311
 #, fuzzy, php-format
 msgid "Listenee URI \"%s\" is a local user."
 msgstr "Lyssnar-URI '%s' är en lokal användare."
 
 #. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
 #. TRANS: %s is a profile URL.
-#: actions/userauthorization.php:329
 #, fuzzy, php-format
 msgid "Profile URL \"%s\" is for a local user."
 msgstr "Profil-URL ‘%s’ är för en lokal användare."
 
 #. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
 #. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
-#: actions/userauthorization.php:339
 #, fuzzy, php-format
 msgid ""
 "Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
@@ -6758,76 +5576,62 @@ msgstr ""
 
 #. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
 #. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:349
 #, fuzzy, php-format
 msgid "Avatar URL \"%s\" is not valid."
 msgstr "Avatar-URL ‘%s’ är inte giltig."
 
 #. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
 #. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:356
 #, fuzzy, php-format
 msgid "Cannot read avatar URL \"%s\"."
 msgstr "Kan inte läsa avatar-URL '%s'."
 
 #. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
 #. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:363
 #, fuzzy, php-format
 msgid "Wrong image type for avatar URL \"%s\"."
 msgstr "Fel bildtyp för avatar-URL '%s'."
 
 #. TRANS: Page title for profile design page.
-#: actions/userdesignsettings.php:74 lib/designsettings.php:61
 msgid "Profile design"
 msgstr "Profilutseende"
 
 #. TRANS: Instructions for profile design page.
-#: actions/userdesignsettings.php:84 lib/designsettings.php:72
 msgid ""
 "Customize the way your profile looks with a background image and a colour "
 "palette of your choice."
 msgstr ""
 "Anpassa hur din profil ser ut genom att välja bakgrundbild och färgpalett."
 
-#: actions/userdesignsettings.php:289
 msgid "Enjoy your hotdog!"
 msgstr "Smaklig måltid!"
 
-#: actions/userdesignsettings.php:325
 #, fuzzy
 msgid "Design settings"
 msgstr "Spara webbplatsinställningar"
 
-#: actions/userdesignsettings.php:340
 msgid "View profile designs"
 msgstr "Visa profilutseenden"
 
-#: actions/userdesignsettings.php:341
 msgid "Show or hide profile designs."
 msgstr "Visa eller göm profilutseenden."
 
-#: actions/userdesignsettings.php:348
 #, fuzzy
 msgid "Background file"
 msgstr "Bakgrund"
 
 #. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number.
-#: actions/usergroups.php:66
 #, php-format
 msgid "%1$s groups, page %2$d"
 msgstr "%1$s grupper, sida %2$d"
 
-#: actions/usergroups.php:132
 msgid "Search for more groups"
 msgstr "Sök efter fler grupper"
 
-#: actions/usergroups.php:159
 #, php-format
 msgid "%s is not a member of any group."
 msgstr "%s är inte en medlem i någon grupp."
 
-#: actions/usergroups.php:164
 #, php-format
 msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
 msgstr ""
@@ -6838,18 +5642,14 @@ msgstr ""
 #. TRANS: %1$s is a group name, %2$s is a site name.
 #. TRANS: Message is used as a subtitle in atom user notice feed.
 #. TRANS: %1$s is a user name, %2$s is a site name.
-#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:70
-#: lib/atomusernoticefeed.php:95
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr "Uppdateringar från %1$s på %2$s!"
 
-#: actions/version.php:75
 #, php-format
 msgid "StatusNet %s"
 msgstr "StatusNet %s"
 
-#: actions/version.php:155
 #, php-format
 msgid ""
 "This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
@@ -6858,16 +5658,13 @@ msgstr ""
 "Denna webbplats drivs med %1$s version %2$s, Copyright 2008-2010 StatusNet, "
 "Inc. och medarbetare."
 
-#: actions/version.php:163
 msgid "Contributors"
 msgstr "Medarbetare"
 
 #. TRANS: Menu item for site administration
-#: actions/version.php:167 lib/adminpanelaction.php:403
 msgid "License"
 msgstr "Licens"
 
-#: actions/version.php:170
 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 "
@@ -6879,7 +5676,6 @@ msgstr ""
 "Foundation, antingen version 3 av licensen, eller (utifrån ditt val) någon "
 "senare version. "
 
-#: actions/version.php:176
 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 "
@@ -6891,7 +5687,6 @@ msgstr ""
 "LÄMPLIGHET FÖR ETT SÄRSKILT ÄNDAMÅL. Se GNU Affero General Public License "
 "för mer information. "
 
-#: actions/version.php:182
 #, php-format
 msgid ""
 "You should have received a copy of the GNU Affero General Public License "
@@ -6901,52 +5696,42 @@ msgstr ""
 "detta program. Om inte, se %s."
 
 #. TRANS: Form input field label for application name.
-#: actions/version.php:197 lib/applicationeditform.php:190
 msgid "Name"
 msgstr "Namn"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:885
 msgid "Version"
 msgstr "Version"
 
-#: actions/version.php:199
 msgid "Author(s)"
 msgstr "Författare"
 
 #. TRANS: Form input field label.
-#: actions/version.php:200 lib/applicationeditform.php:208
-#: lib/groupeditform.php:168
 msgid "Description"
 msgstr "Beskrivning"
 
 #. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:164
 msgid "Favor"
 msgstr "Markera som favorit"
 
 #. TRANS: Ntofication given when a user marks a notice as favorite.
 #. TRANS: %1$s is a user nickname or full name, %2$s is a notice URI.
-#: classes/Fave.php:167
 #, fuzzy, php-format
 msgid "%1$s marked notice %2$s as a favorite."
 msgstr "%s (@%s) lade till din notis som en favorit"
 
 #. TRANS: Server exception thrown when a URL cannot be processed.
-#: classes/File.php:162
 #, php-format
 msgid "Cannot process URL '%s'"
 msgstr "Webbadressen '%s' kan inte bearbeta"
 
 #. TRANS: Server exception thrown when... Robin thinks something is impossible!
-#: classes/File.php:194
 msgid "Robin thinks something is impossible."
 msgstr "Robin tycker att något är omöjligt"
 
 #. 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$s is used for plural.
-#: classes/File.php:210
 #, fuzzy, php-format
 msgid ""
 "No file may be larger than %1$d byte and the file you sent was %2$d bytes. "
@@ -6963,7 +5748,6 @@ msgstr[1] ""
 
 #. TRANS: Message given if an upload would exceed user quota.
 #. TRANS: %d (number) is the user quota in bytes and is used for plural.
-#: classes/File.php:223
 #, fuzzy, php-format
 msgid "A file this large would exceed your user quota of %d byte."
 msgid_plural "A file this large would exceed your user quota of %d bytes."
@@ -6972,7 +5756,6 @@ msgstr[1] "En så här stor fil skulle överskrida din användarkvot på %d byte
 
 #. TRANS: Message given id an upload would exceed a user's monthly quota.
 #. TRANS: $d (number) is the monthly user quota in bytes and is used for plural.
-#: classes/File.php:235
 #, fuzzy, php-format
 msgid "A file this large would exceed your monthly quota of %d byte."
 msgid_plural "A file this large would exceed your monthly quota of %d bytes."
@@ -6982,108 +5765,89 @@ msgstr[1] ""
 "En sådan här stor fil skulle överskrida din månatliga kvot på %d byte."
 
 #. TRANS: Client exception thrown if a file upload does not have a valid name.
-#: classes/File.php:282 classes/File.php:297
 msgid "Invalid filename."
 msgstr "Ogiltigt filnamn."
 
 #. TRANS: Exception thrown when joining a group fails.
-#: classes/Group_member.php:51
 msgid "Group join failed."
 msgstr "Gruppanslutning misslyckades."
 
 #. TRANS: Exception thrown when trying to leave a group the user is not a member of.
-#: classes/Group_member.php:64
 msgid "Not part of group."
 msgstr "Inte med i grupp."
 
 #. TRANS: Exception thrown when trying to leave a group fails.
-#: classes/Group_member.php:72
 msgid "Group leave failed."
 msgstr "Grupputträde misslyckades."
 
 #. TRANS: Exception thrown providing an invalid profile ID.
 #. TRANS: %s is the invalid profile ID.
-#: classes/Group_member.php:85
 #, php-format
 msgid "Profile ID %s is invalid."
 msgstr ""
 
 #. TRANS: Exception thrown providing an invalid group ID.
 #. TRANS: %s is the invalid group ID.
-#: classes/Group_member.php:98
 #, fuzzy, php-format
 msgid "Group ID %s is invalid."
 msgstr "Fel vid sparande av användare; ogiltig."
 
 #. TRANS: Activity title.
-#: classes/Group_member.php:147 lib/joinform.php:114
 msgid "Join"
 msgstr "Gå med"
 
 #. TRANS: Success message for subscribe to group attempt through OStatus.
 #. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
-#: classes/Group_member.php:151
 #, php-format
 msgid "%1$s has joined group %2$s."
 msgstr ""
 
 #. TRANS: Server exception thrown when updating a local group fails.
-#: classes/Local_group.php:42
 msgid "Could not update local group."
 msgstr "Kunde inte uppdatera lokal grupp."
 
 #. TRANS: Exception thrown when trying creating a login token failed.
 #. TRANS: %s is the user nickname for which token creation failed.
-#: classes/Login_token.php:78
 #, php-format
 msgid "Could not create login token for %s"
 msgstr "Kunde inte skapa inloggnings-token för %s"
 
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
-#: classes/Memcached_DataObject.php:556
 msgid "No database name or DSN found anywhere."
 msgstr "Inget databasnamn eller DSN funnen någonstans."
 
 #. TRANS: Client exception thrown when a user tries to send a direct message while being banned from sending them.
-#: classes/Message.php:45
 msgid "You are banned from sending direct messages."
 msgstr "Du är utestängd från att skicka direktmeddelanden."
 
 #. TRANS: Message given when a message could not be stored on the server.
-#: classes/Message.php:69
 msgid "Could not insert message."
 msgstr "Kunde inte infoga meddelande."
 
 #. TRANS: Message given when a message could not be updated on the server.
-#: classes/Message.php:80
 msgid "Could not update message with new URI."
 msgstr "Kunde inte uppdatera meddelande med ny URI."
 
 #. TRANS: Server exception thrown when a user profile for a notice cannot be found.
 #. TRANS: %1$d is a profile ID (number), %2$d is a notice ID (number).
-#: classes/Notice.php:98
 #, php-format
 msgid "No such profile (%1$d) for notice (%2$d)."
 msgstr "Ingen sådan profil (%1$d) för notis (%2$d)."
 
 #. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:199
 #, php-format
 msgid "Database error inserting hashtag: %s"
 msgstr "Databasfel vid infogning av hashtag: %s"
 
 #. TRANS: Client exception thrown if a notice contains too many characters.
-#: classes/Notice.php:279
 msgid "Problem saving notice. Too long."
 msgstr "Problem vid sparande av notis. För långt."
 
 #. TRANS: Client exception thrown when trying to save a notice for an unknown user.
-#: classes/Notice.php:284
 msgid "Problem saving notice. Unknown user."
 msgstr "Problem vid sparande av notis. Okänd användare."
 
 #. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
-#: classes/Notice.php:290
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
@@ -7091,7 +5855,6 @@ msgstr ""
 "minuter."
 
 #. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
-#: classes/Notice.php:297
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
 "few minutes."
@@ -7100,43 +5863,36 @@ msgstr ""
 "om ett par minuter."
 
 #. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:305
 msgid "You are banned from posting notices on this site."
 msgstr "Du är utestängd från att posta notiser på denna webbplats."
 
 #. TRANS: Server exception thrown when a notice cannot be saved.
 #. TRANS: Server exception thrown when a notice cannot be updated.
-#: classes/Notice.php:372 classes/Notice.php:399
 msgid "Problem saving notice."
 msgstr "Problem med att spara notis."
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:929
 #, fuzzy
 msgid "Bad type provided to saveKnownGroups."
 msgstr "Dålig typ tillhandahållen saveKnownGroups"
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:1028
 msgid "Problem saving group inbox."
 msgstr "Problem med att spara gruppinkorg."
 
 #. TRANS: Server exception thrown when a reply cannot be saved.
 #. TRANS: %1$d is a notice ID, %2$d is the ID of the mentioned user.
-#: classes/Notice.php:1144
 #, fuzzy, php-format
 msgid "Could not save reply for %1$d, %2$d."
 msgstr "Kunde inte spara lokal gruppinformation."
 
 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1663
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
 
 #. TRANS: Full name of a profile or group followed by nickname in parens
-#: classes/Profile.php:172 classes/User_group.php:242
 #, php-format
 msgctxt "FANCYNAME"
 msgid "%1$s (%2$s)"
@@ -7144,264 +5900,208 @@ msgstr "%1$s (%2$s)"
 
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:779
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr "Kan inte återkalla roll \"%1$s\" för användare #%2$d; finns inte."
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:788
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr "Kan inte återkalla roll \"%1$s\" för användare #%2$d; databasfel."
 
 #. TRANS: Exception thrown when a right for a non-existing user profile is checked.
-#: classes/Remote_profile.php:54
 msgid "Missing profile."
 msgstr "Saknar profil."
 
 #. TRANS: Exception thrown when a tag cannot be saved.
-#: classes/Status_network.php:338
 msgid "Unable to save tag."
 msgstr "Kunde inte spara tagg."
 
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#: classes/Subscription.php:77 lib/oauthstore.php:482
 msgid "You have been banned from subscribing."
 msgstr "Du har blivit utestängd från att prenumerera."
 
 #. TRANS: Exception thrown when trying to subscribe while already subscribed.
-#: classes/Subscription.php:82
 msgid "Already subscribed!"
 msgstr "Redan prenumerant!"
 
 #. TRANS: Exception thrown when trying to subscribe to a user who has blocked the subscribing user.
-#: classes/Subscription.php:87
 msgid "User has blocked you."
 msgstr "Användaren har blockerat dig."
 
 #. TRANS: Exception thrown when trying to unsibscribe without a subscription.
-#: classes/Subscription.php:176
 msgid "Not subscribed!"
 msgstr "Inte prenumerant!"
 
 #. TRANS: Exception thrown when trying to unsubscribe a user from themselves.
-#: classes/Subscription.php:183
 msgid "Could not delete self-subscription."
 msgstr "Kunde inte spara prenumeration."
 
 #. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
-#: classes/Subscription.php:211
 msgid "Could not delete subscription OMB token."
 msgstr "Kunde inte spara prenumeration."
 
 #. TRANS: Exception thrown when a subscription could not be deleted on the server.
-#: classes/Subscription.php:223
 msgid "Could not delete subscription."
 msgstr "Kunde inte spara prenumeration."
 
 #. TRANS: Activity tile when subscribing to another person.
-#: classes/Subscription.php:265
 msgid "Follow"
 msgstr "Följ"
 
 #. TRANS: Notification given when one person starts following another.
 #. TRANS: %1$s is the subscriber, %2$s is the subscribed.
-#: classes/Subscription.php:268
 #, fuzzy, php-format
 msgid "%1$s is now following %2$s."
 msgstr "%1$s lyssnar nu på dina notiser på %2$s."
 
 #. TRANS: Notice given on user registration.
 #. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:390
 #, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr "Välkommen till %1$s, @%2$s!"
 
 #. TRANS: Server exception.
-#: classes/User.php:923
 msgid "No single user defined for single-user mode."
 msgstr "Ingen enskild användare definierad för enanvändarläge."
 
 #. TRANS: Server exception.
-#: classes/User.php:927
 msgid "Single-user mode code called when not enabled."
 msgstr ""
 
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:522
 msgid "Could not create group."
 msgstr "Kunde inte skapa grupp."
 
 #. TRANS: Server exception thrown when updating a group URI failed.
-#: classes/User_group.php:532
 msgid "Could not set group URI."
 msgstr "Kunde inte ställa in grupp-URI."
 
 #. TRANS: Server exception thrown when setting group membership failed.
-#: classes/User_group.php:555
 msgid "Could not set group membership."
 msgstr "Kunde inte ställa in gruppmedlemskap."
 
 #. TRANS: Server exception thrown when saving local group information failed.
-#: classes/User_group.php:570
 msgid "Could not save local group info."
 msgstr "Kunde inte spara lokal gruppinformation."
 
 #. TRANS: Exception thrown when an account could not be located when it should be moved.
 #. TRANS: %s is the remote site.
-#: lib/accountmover.php:65
 #, fuzzy, php-format
 msgid "Cannot locate account %s."
 msgstr "Du kan inte ta bort användare."
 
 #. TRANS: Exception thrown when a service document could not be located account move.
 #. TRANS: %s is the remote site.
-#: lib/accountmover.php:106
 #, php-format
 msgid "Cannot find XRD for %s."
 msgstr ""
 
 #. TRANS: Exception thrown when an account could not be located when it should be moved.
 #. TRANS: %s is the remote site.
-#: lib/accountmover.php:131
 #, php-format
 msgid "No AtomPub API service for %s."
 msgstr ""
 
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: lib/action.php:161
 #, php-format
 msgid "%1$s - %2$s"
 msgstr "%1$s - %2$s"
 
 #. TRANS: Page title for a page without a title set.
-#: lib/action.php:177
 msgid "Untitled page"
 msgstr "Namnlös sida"
 
 #. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.
-#: lib/action.php:325
 msgctxt "TOOLTIP"
 msgid "Show more"
 msgstr "Visa mer"
 
 #. TRANS: Inline reply form submit button: submits a reply comment.
-#: lib/action.php:328
 #, fuzzy
 msgctxt "BUTTON"
-msgid "Comment"
-msgstr "Innehåll"
+msgid "Reply"
+msgstr "Svara"
 
 #. TRANS: Placeholder text for inline reply form. Clicking in this box will turn it into a mini notice form.
-#: lib/action.php:331
-msgid "Add a comment..."
+msgid "Write a reply..."
 msgstr ""
 
-#: lib/action.php:559 lib/personalgroupnav.php:99
-#, fuzzy
 msgid "Home"
 msgstr "Hemsida"
 
-#: lib/action.php:560
 #, fuzzy
 msgid "Friends timeline"
 msgstr "%s tidslinje"
 
-#: lib/action.php:566
-#, fuzzy
 msgid "Your profile"
 msgstr "Grupprofil"
 
-#: lib/action.php:570 lib/action.php:593 lib/publicgroupnav.php:78
 msgid "Public"
 msgstr "Publikt"
 
-#: lib/action.php:571 lib/action.php:594
 #, fuzzy
 msgid "Everyone on this site"
 msgstr "Hitta personer på denna webbplats"
 
-#: lib/action.php:575
-#, fuzzy
 msgid "Settings"
 msgstr "Inställningar för SMS"
 
-#: lib/action.php:576
 #, fuzzy
 msgid "Change your personal settings"
 msgstr "Ändra dina profilinställningar"
 
-#: lib/action.php:582
 #, fuzzy
 msgid "Site configuration"
 msgstr "Konfiguration av användare"
 
-#: lib/action.php:587
-#, fuzzy
 msgid "Logout"
 msgstr "Logga ut"
 
-#: lib/action.php:588
-#, fuzzy
 msgid "Logout from the site"
 msgstr "Logga ut från webbplatsen"
 
-#: lib/action.php:599
-#, fuzzy
 msgid "Login to the site"
 msgstr "Logga in på webbplatsen"
 
-#: lib/action.php:606
-#, fuzzy
 msgid "Search"
 msgstr "Sök"
 
-#: lib/action.php:607
 #, fuzzy
 msgid "Search the site"
 msgstr "Sök webbplats"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:864
 msgid "Help"
 msgstr "Hjälp"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:867
 msgid "About"
 msgstr "Om"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:870
 msgid "FAQ"
 msgstr "Frågor & svar"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:875
 msgid "TOS"
 msgstr "Användarvillkor"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:879
 msgid "Privacy"
 msgstr "Sekretess"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:882
 msgid "Source"
 msgstr "Källa"
 
 #. TRANS: Secondary navigation menu option leading to e-mail contact information on the
 #. TRANS: StatusNet site, where to report bugs, ...
-#: lib/action.php:889
 msgid "Contact"
 msgstr "Kontakt"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:892
 msgid "Badge"
 msgstr "Emblem"
 
@@ -7409,7 +6109,6 @@ msgstr "Emblem"
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:921
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7419,7 +6118,6 @@ msgstr ""
 "%%](%%site.broughtbyurl%%)."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:924
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** är en mikrobloggtjänst."
@@ -7428,7 +6126,6 @@ msgstr "**%%site.name%%** är en mikrobloggtjänst."
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:931
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7441,107 +6138,89 @@ msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:949
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr "Innehåll och data av %1$s är privat och konfidensiell."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:956
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr "Innehåll och data copyright av %1$s. Alla rättigheter reserverade."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:960
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 "Innehåll och data copyright av medarbetare. Alla rättigheter reserverade."
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:992
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr "Innehåll och data på %1$s är tillgänglig under licensen %2$s."
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1335
 msgid "After"
 msgstr "Senare"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1345
 msgid "Before"
 msgstr "Tidigare"
 
 #. TRANS: Client exception thrown when a feed instance is a DOMDocument.
-#: lib/activity.php:125
 msgid "Expecting a root feed element but got a whole XML document."
 msgstr "Förväntade ett flödes rotelement, men fick ett helt XML-dokument."
 
 #. TRANS: Client exception thrown when using an unknown verb for the activity importer.
-#: lib/activityimporter.php:81
 #, fuzzy, php-format
 msgid "Unknown verb: \"%s\"."
 msgstr "Okänt språk \"%s\"."
 
 #. TRANS: Client exception thrown when trying to force a subscription for an untrusted user.
-#: lib/activityimporter.php:107
 msgid "Cannot force subscription for untrusted user."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to for a remote user to subscribe.
-#: lib/activityimporter.php:117
 #, fuzzy
 msgid "Cannot force remote user to subscribe."
 msgstr "Ange namnet på användaren att prenumerara på."
 
 #. TRANS: Client exception thrown when trying to subscribe to an unknown profile.
-#: lib/activityimporter.php:132
 #, fuzzy
 msgid "Unknown profile."
 msgstr "Okänd filtyp"
 
 #. TRANS: Client exception thrown when trying to import an event not related to the importing user.
-#: lib/activityimporter.php:138
 msgid "This activity seems unrelated to our user."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to join a remote group that is not a group.
-#: lib/activityimporter.php:154
 msgid "Remote profile is not a group!"
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to join a group the importing user is already a member of.
-#: lib/activityimporter.php:163
 #, fuzzy
 msgid "User is already a member of this group."
 msgstr "Du är redan en medlem i denna grupp."
 
 #. TRANS: Client exception thrown when trying to import a notice by another user.
 #. TRANS: %1$s is the source URI of the notice, %2$s is the URI of the author.
-#: lib/activityimporter.php:201
 #, php-format
 msgid "Already know about notice %1$s and  it has a different author %2$s."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to overwrite the author information for a non-trusted user during import.
-#: lib/activityimporter.php:207
 msgid "Not overwriting author info for non-trusted user."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to import a notice without content.
 #. TRANS: %s is the notice URI.
-#: lib/activityimporter.php:223
 #, fuzzy, php-format
 msgid "No content for notice %s."
 msgstr "Hitta innehåll i notiser"
 
-#: lib/activitymover.php:84
 #, fuzzy, php-format
 msgid "No such user %s."
 msgstr "Ingen sådan användare."
@@ -7552,214 +6231,174 @@ msgstr "Ingen sådan användare."
 #. TRANS: %1$s is a URL, %2$s is the status, %s$s is the fail reason.
 #. TRANS: Exception thrown when post to collection fails with a status that is not handled.
 #. TRANS: %1$s is a URL, %2$s is the status, %s$s is the fail reason.
-#: lib/activitysink.php:163 lib/activitysink.php:167 lib/activitysink.php:172
 #, fuzzy, php-format
 msgctxt "URLSTATUSREASON"
 msgid "%1$s %2$s %3$s"
 msgstr "%1$s - %2$s"
 
 #. TRANS: Client exception thrown when there is no source attribute.
-#: lib/activityutils.php:200
 msgid "Can't handle remote content yet."
 msgstr "Kan inte hantera fjärrinnehåll ännu."
 
 #. TRANS: Client exception thrown when there embedded XML content is found that cannot be processed yet.
-#: lib/activityutils.php:237
 msgid "Can't handle embedded XML content yet."
 msgstr "Kan inte hantera inbäddat XML-innehåll ännu."
 
 #. TRANS: Client exception thrown when base64 encoded content is found that cannot be processed yet.
-#: lib/activityutils.php:242
 msgid "Can't handle embedded Base64 content yet."
 msgstr "Kan inte hantera inbäddat Base64-innehåll ännu."
 
 #. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights.
-#: lib/adminpanelaction.php:96
 msgid "You cannot make changes to this site."
 msgstr "Du kan inte göra förändringar av denna webbplats."
 
 #. TRANS: Client error message throw when a certain panel's settings cannot be changed.
-#: lib/adminpanelaction.php:108
 msgid "Changes to that panel are not allowed."
 msgstr "Ändringar av den panelen tillåts inte."
 
 #. TRANS: Client error message.
-#: lib/adminpanelaction.php:222
 msgid "showForm() not implemented."
 msgstr "showForm() är inte implementerat."
 
 #. TRANS: Client error message
-#: lib/adminpanelaction.php:250
 msgid "saveSettings() not implemented."
 msgstr "saveSetting() är inte implementerat."
 
 #. TRANS: Client error message thrown if design settings could not be deleted in
 #. TRANS: the admin panel Design.
-#: lib/adminpanelaction.php:274
 msgid "Unable to delete design setting."
 msgstr "Kunde inte ta bort utseendeinställning."
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:337
 msgid "Basic site configuration"
 msgstr "Grundläggande webbplatskonfiguration"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:339
 msgctxt "MENU"
 msgid "Site"
 msgstr "Webbplats"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:345
 msgid "Design configuration"
 msgstr "Konfiguration av utseende"
 
 #. TRANS: Menu item for site administration
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/adminpanelaction.php:347 lib/groupnav.php:135
 msgctxt "MENU"
 msgid "Design"
 msgstr "Utseende"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:353
 msgid "User configuration"
 msgstr "Konfiguration av användare"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:110
 msgid "User"
 msgstr "Användare"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:361
 msgid "Access configuration"
 msgstr "Konfiguration av åtkomst"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:369
 msgid "Paths configuration"
 msgstr "Konfiguration av sökvägar"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:377
 msgid "Sessions configuration"
 msgstr "Konfiguration av sessioner"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:385
 msgid "Edit site notice"
 msgstr "Redigera webbplatsnotis"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:387
 msgid "Site notice"
 msgstr "Webbplatsnotis"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:393
 msgid "Snapshots configuration"
 msgstr "Konfiguration av ögonblicksbilder"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:401
 msgid "Set site license"
 msgstr "Ange webbplatslicens"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:409
 #, fuzzy
 msgid "Plugins configuration"
 msgstr "Konfiguration av sökvägar"
 
 #. TRANS: Client error 401.
-#: lib/apiauth.php:111
 msgid "API resource requires read-write access, but you only have read access."
 msgstr ""
 "API-resursen kräver läs- och skrivrättigheter, men du har bara läsrättighet."
 
 #. TRANS: OAuth exception thrown when no application is found for a given consumer key.
-#: lib/apiauth.php:177
 msgid "No application for that consumer key."
 msgstr ""
 
-#: lib/apiauth.php:202 lib/apiauth.php:284
 msgid "Not allowed to use API."
 msgstr ""
 
 #. TRANS: OAuth exception given when an incorrect access token was given for a user.
-#: lib/apiauth.php:225
 msgid "Bad access token."
 msgstr ""
 
 #. TRANS: OAuth exception given when no user was found for a given token (no token was found).
-#: lib/apiauth.php:230
 msgid "No user for that token."
 msgstr ""
 
 #. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel".
 #. TRANS: Client error thrown when authentication fails.
-#: lib/apiauth.php:272 lib/apiauth.php:302
 msgid "Could not authenticate you."
 msgstr ""
 
 #. TRANS: Server error displayed when trying to create an anynymous OAuth consumer.
-#: lib/apioauthstore.php:45
 #, fuzzy
 msgid "Could not create anonymous consumer."
 msgstr "Kunde inte skapa alias."
 
 #. TRANS: Server error displayed when trying to create an anynymous OAuth application.
-#: lib/apioauthstore.php:69
 #, fuzzy
 msgid "Could not create anonymous OAuth application."
 msgstr "Kunde inte skapa applikation."
 
 #. TRANS: Exception thrown when no token association could be found.
-#: lib/apioauthstore.php:151
 msgid ""
 "Could not find a profile and application associated with the request token."
 msgstr ""
 
 #. TRANS: Exception thrown when no access token can be issued.
-#: lib/apioauthstore.php:209
 #, fuzzy
 msgid "Could not issue access token."
 msgstr "Kunde inte infoga meddelande."
 
-#: lib/apioauthstore.php:317
 msgid "Database error inserting OAuth application user."
 msgstr "Databasfel vid infogning av OAuth-applikationsanvändare."
 
-#: lib/apioauthstore.php:345
 #, fuzzy
 msgid "Database error updating OAuth application user."
 msgstr "Databasfel vid infogning av OAuth-applikationsanvändare."
 
 #. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
-#: lib/apioauthstore.php:371
 msgid "Tried to revoke unknown token."
 msgstr ""
 
 #. TRANS: Exception thrown when an attempt is made to remove a revoked token.
-#: lib/apioauthstore.php:376
 msgid "Failed to delete revoked token."
 msgstr ""
 
 #. TRANS: Form input field label for application icon.
-#: lib/applicationeditform.php:177
 msgid "Icon"
 msgstr "Ikon"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:182
 msgid "Icon for this application"
 msgstr "Ikon för denna applikation"
 
 #. TRANS: Form input field instructions.
 #. TRANS: %d is the number of available characters for the description.
-#: lib/applicationeditform.php:201
 #, fuzzy, php-format
 msgid "Describe your application in %d character"
 msgid_plural "Describe your application in %d characters"
@@ -7767,207 +6406,168 @@ msgstr[0] "Beskriv din applikation med högst %d tecken"
 msgstr[1] "Beskriv din applikation med högst %d tecken"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:205
 msgid "Describe your application"
 msgstr "Beskriv din applikation"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:216
 msgid "URL of the homepage of this application"
 msgstr "URL till hemsidan för denna applikation"
 
 #. TRANS: Form input field label.
-#: lib/applicationeditform.php:218
 msgid "Source URL"
 msgstr "URL för källa"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:225
 msgid "Organization responsible for this application"
 msgstr "Organisation som ansvarar för denna applikation"
 
 #. TRANS: Form input field label.
-#: lib/applicationeditform.php:227
 msgid "Organization"
 msgstr "Organisation"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:234
 msgid "URL for the homepage of the organization"
 msgstr "URL till organisationens hemsidan"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:243
 msgid "URL to redirect to after authentication"
 msgstr "URL att omdirigera till efter autentisering"
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:271
 msgid "Browser"
 msgstr "Webbläsare"
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:288
 msgid "Desktop"
 msgstr "Skrivbord"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:290
 msgid "Type of application, browser or desktop"
 msgstr "Typ av applikation, webbläsare eller skrivbord"
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:314
 msgid "Read-only"
 msgstr "Skrivskyddad"
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:334
 msgid "Read-write"
 msgstr "Läs och skriv"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:336
 msgid "Default access for this application: read-only, or read-write"
 msgstr ""
 "Standardåtkomst för denna applikation: skrivskyddad, eller läs och skriv"
 
 #. TRANS: Submit button title.
-#: lib/applicationeditform.php:353
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: lib/applicationlist.php:247
 msgid " by "
 msgstr ""
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:260
 msgid "read-write"
 msgstr "läs och skriv"
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:262
 msgid "read-only"
 msgstr "skrivskyddad"
 
 #. TRANS: Used in application list. %1$s is a modified date, %2$s is access type ("read-write" or "read-only")
-#: lib/applicationlist.php:268
 #, php-format
 msgid "Approved %1$s - \"%2$s\" access."
 msgstr "Godkänd %1$s - \"%2$s\" åtkomst."
 
 #. TRANS: Access token in the application list.
 #. TRANS: %s are the first 7 characters of the access token.
-#: lib/applicationlist.php:282
 #, php-format
 msgid "Access token starting with: %s"
 msgstr ""
 
 #. TRANS: Button label
-#: lib/applicationlist.php:298
 msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "Återkalla"
 
-#: lib/atom10feed.php:113
 msgid "Author element must contain a name element."
 msgstr ""
 
 #. TRANS: Server exception thrown when using the method setActivitySubject() in the class Atom10Feed.
-#: lib/atom10feed.php:160
 #, fuzzy
 msgid "Do not use this method!"
 msgstr "Ta inte bort denna grupp"
 
 #. TRANS: Title.
-#: lib/attachmentnoticesection.php:67
 msgid "Notices where this attachment appears"
 msgstr "Notiser där denna bilaga förekommer"
 
 #. TRANS: Title.
-#: lib/attachmenttagcloudsection.php:48
 msgid "Tags for this attachment"
 msgstr "Taggar för denna billaga"
 
 #. TRANS: Exception thrown when a password change fails.
-#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:227
 msgid "Password changing failed."
 msgstr "Byte av lösenord misslyckades."
 
 #. TRANS: Exception thrown when a password change attempt fails because it is not allowed.
-#: lib/authenticationplugin.php:238
 msgid "Password changing is not allowed."
 msgstr "Byte av lösenord är inte tillåtet."
 
 #. TRANS: Title for the form to block a user.
-#: lib/blockform.php:68
 msgid "Block"
 msgstr "Blockera"
 
 #. TRANS: Description of the form to block a user.
-#: lib/blockform.php:79
 msgid "Block this user"
 msgstr "Blockera denna användare"
 
 #. TRANS: Title for command results.
-#: lib/channel.php:104 lib/channel.php:125
 msgid "Command results"
 msgstr "Resultat av kommando"
 
 #. TRANS: Title for command results.
-#: lib/channel.php:138
 msgid "AJAX error"
 msgstr "AJAX-fel"
 
 #. TRANS: E-mail subject when a command has completed.
-#: lib/channel.php:177 lib/mailhandler.php:143
 msgid "Command complete"
 msgstr "Kommando komplett"
 
 #. TRANS: E-mail subject when a command has failed.
-#: lib/channel.php:188
 msgid "Command failed"
 msgstr "Kommando misslyckades"
 
 #. TRANS: Command exception text shown when a notice ID is requested that does not exist.
-#: lib/command.php:82 lib/command.php:106
 msgid "Notice with that id does not exist."
 msgstr "Notis med den ID:n finns inte."
 
 #. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
 #. TRANS: Error text shown when a last user notice is requested and it does not exist.
-#: lib/command.php:99 lib/command.php:642
 msgid "User has no last notice."
 msgstr "Användare har ingen sista notis."
 
 #. TRANS: Message given requesting a profile for a non-existing user.
 #. TRANS: %s is the nickname of the user for which the profile could not be found.
-#: lib/command.php:128
 #, php-format
 msgid "Could not find a user with nickname %s."
 msgstr "Kunde inte hitta en användare med smeknamnet %s."
 
 #. TRANS: Message given getting a non-existing user.
 #. TRANS: %s is the nickname of the user that could not be found.
-#: lib/command.php:148
 #, php-format
 msgid "Could not find a local user with nickname %s."
 msgstr "Kunde inte hitta en lokal användare med smeknamnet %s."
 
 #. TRANS: Error text shown when an unimplemented command is given.
-#: lib/command.php:183
 msgid "Sorry, this command is not yet implemented."
 msgstr "Tyvärr, detta kommando är inte implementerat än."
 
 #. TRANS: Command exception text shown when a user tries to nudge themselves.
-#: lib/command.php:229
 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr "Det verkar inte vara särskilt meningsfullt att knuffa dig själv!"
 
 #. TRANS: Message given having nudged another user.
 #. TRANS: %s is the nickname of the user that was nudged.
-#: lib/command.php:238
 #, php-format
 msgid "Nudge sent to %s."
 msgstr "Knuff skickad till %s."
@@ -7976,7 +6576,6 @@ msgstr "Knuff skickad till %s."
 #. TRANS: %1$s is the number of other user the user is subscribed to.
 #. TRANS: %2$s is the number of users that are subscribed to the user.
 #. TRANS: %3$s is the number of notices the user has sent.
-#: lib/command.php:268
 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"
@@ -7988,40 +6587,34 @@ msgstr ""
 "Notiser: %3$s"
 
 #. TRANS: Error message text shown when a favorite could not be set because it has already been favorited.
-#: lib/command.php:298
 #, fuzzy
 msgid "Could not create favorite: already favorited."
 msgstr "Kunde inte skapa favorit."
 
 #. TRANS: Text shown when a notice has been marked as favourite successfully.
-#: lib/command.php:324
 msgid "Notice marked as fave."
 msgstr "Notis markerad som favorit."
 
 #. TRANS: Message given having added a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:369
 #, php-format
 msgid "%1$s joined group %2$s."
 msgstr "%1$s gick med i grupp %2$s."
 
 #. TRANS: Message given having removed a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:417
 #, php-format
 msgid "%1$s left group %2$s."
 msgstr "%1$s lämnade grupp %2$s."
 
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: lib/command.php:438
 #, php-format
 msgctxt "WHOIS"
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
 
 #. TRANS: Whois output. %s is the full name of the queried user.
-#: lib/command.php:442
 #, php-format
 msgid "Fullname: %s"
 msgstr "Fullständigt namn: %s"
@@ -8029,7 +6622,6 @@ msgstr "Fullständigt namn: %s"
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a location.
-#: lib/command.php:446 lib/mail.php:275
 #, php-format
 msgid "Location: %s"
 msgstr "Plats: %s"
@@ -8037,20 +6629,17 @@ msgstr "Plats: %s"
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a homepage.
-#: lib/command.php:450 lib/mail.php:279
 #, php-format
 msgid "Homepage: %s"
 msgstr "Hemsida: %s"
 
 #. TRANS: Whois output. %s is the bio information of the queried user.
-#: lib/command.php:454
 #, php-format
 msgid "About: %s"
 msgstr "Om: %s"
 
 #. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).
 #. TRANS: %s is a remote profile.
-#: lib/command.php:483
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
@@ -8061,33 +6650,32 @@ msgstr ""
 
 #. TRANS: Message given if content is too long. %1$sd is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:500
 #, fuzzy, php-format
 msgid "Message too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
 msgstr[0] "Meddelande för långt - maximum är %1$d tecken, du skickade %2$d."
 msgstr[1] "Meddelande för långt - maximum är %1$d tecken, du skickade %2$d."
 
+#. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
+msgid "You can't send a message to this user."
+msgstr "Du kan inte skicka ett meddelande till den användaren."
+
 #. TRANS: Error text shown sending a direct message fails with an unknown reason.
-#: lib/command.php:528
 msgid "Error sending direct message."
 msgstr "Fel vid sändning av direktmeddelande."
 
 #. TRANS: Message given having repeated a notice from another user.
 #. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:565
 #, php-format
 msgid "Notice from %s repeated."
 msgstr "Notis från %s upprepad."
 
 #. TRANS: Error text shown when repeating a notice fails with an unknown reason.
-#: lib/command.php:568
 msgid "Error repeating notice."
 msgstr "Fel vid upprepning av notis."
 
 #. TRANS: Message given if content of a notice for a reply is too long. %1$d is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:603
 #, fuzzy, php-format
 msgid "Notice too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Notice too long - maximum is %1$d characters, you sent %2$d."
@@ -8096,80 +6684,66 @@ msgstr[1] "Notis för långt - maximum är %1$d tecken, du skickade %2$d."
 
 #. TRANS: Text shown having sent a reply to a notice successfully.
 #. TRANS: %s is the nickname of the user of the notice the reply was sent to.
-#: lib/command.php:616
 #, php-format
 msgid "Reply to %s sent."
 msgstr "Svar på %s skickat."
 
 #. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
-#: lib/command.php:619
 msgid "Error saving notice."
 msgstr "Fel vid sparande av notis."
 
 #. TRANS: Error text shown when no username was provided when issuing a subscribe command.
-#: lib/command.php:666
 msgid "Specify the name of the user to subscribe to."
 msgstr "Ange namnet på användaren att prenumerara på."
 
 #. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
-#: lib/command.php:675
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "Kan inte prenumera på OMB-profiler via kommando."
 
 #. TRANS: Text shown after having subscribed to another user successfully.
 #. TRANS: %s is the name of the user the subscription was requested for.
-#: lib/command.php:683
 #, php-format
 msgid "Subscribed to %s."
 msgstr "Prenumererar på %s."
 
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.
-#: lib/command.php:704 lib/command.php:815
 msgid "Specify the name of the user to unsubscribe from."
 msgstr "Ange namnet på användaren att avsluta prenumeration på."
 
 #. TRANS: Text shown after having unsubscribed from another user successfully.
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:715
 #, php-format
 msgid "Unsubscribed from %s."
 msgstr "Prenumeration på %s avslutad."
 
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
-#: lib/command.php:735 lib/command.php:761
 msgid "Command not yet implemented."
 msgstr "Kommando inte implementerat än."
 
 #. TRANS: Text shown when issuing the command "off" successfully.
-#: lib/command.php:739
 msgid "Notification off."
 msgstr "Notifikation av."
 
 #. TRANS: Error text shown when the command "off" fails for an unknown reason.
-#: lib/command.php:742
 msgid "Can't turn off notification."
 msgstr "Kan inte sätta på notifikation."
 
 #. TRANS: Text shown when issuing the command "on" successfully.
-#: lib/command.php:765
 msgid "Notification on."
 msgstr "Notifikation på."
 
 #. TRANS: Error text shown when the command "on" fails for an unknown reason.
-#: lib/command.php:768
 msgid "Can't turn on notification."
 msgstr "Kan inte stänga av notifikation."
 
 #. TRANS: Error text shown when issuing the login command while login is disabled.
-#: lib/command.php:782
 msgid "Login command is disabled."
 msgstr "Inloggningskommando är inaktiverat."
 
 #. TRANS: Text shown after issuing the login command successfully.
 #. TRANS: %s is a logon link..
-#: lib/command.php:795
 #, php-format
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
@@ -8177,20 +6751,17 @@ msgstr ""
 
 #. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:824
 #, php-format
 msgid "Unsubscribed %s."
 msgstr "%ss prenumeration avslutad."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
-#: lib/command.php:842
 msgid "You are not subscribed to anyone."
 msgstr "Du prenumererar inte på någon."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
-#: lib/command.php:847
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Du prenumererar på denna person:"
@@ -8198,14 +6769,12 @@ msgstr[1] "Du prenumererar på dessa personer:"
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user
 #. TRANS: (followers) without having any subscribers.
-#: lib/command.php:869
 msgid "No one is subscribed to you."
 msgstr "Ingen prenumerar på dig."
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
-#: lib/command.php:874
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Denna person prenumererar på dig:"
@@ -8213,21 +6782,18 @@ msgstr[1] "Dessa personer prenumererar på dig:"
 
 #. TRANS: Text shown after requesting groups a user is subscribed to without having
 #. TRANS: any group subscriptions.
-#: lib/command.php:896
 msgid "You are not a member of any groups."
 msgstr "Du är inte medlem i några grupper."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
-#: lib/command.php:901
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "Du är en medlem i denna grupp:"
 msgstr[1] "Du är en medlem i dessa grupper:"
 
 #. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-#: lib/command.php:916
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -8308,71 +6874,58 @@ msgstr ""
 "tracking - inte implementerat än.\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:36
 #, fuzzy
 msgid "No configuration file found."
 msgstr "Ingen konfigurationsfil hittades. "
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:39
 #, fuzzy
 msgid "I looked for configuration files in the following places:"
 msgstr "Jag letade efter konfigurationsfiler på följande platser: "
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:42
 msgid "You may wish to run the installer to fix this."
 msgstr "Du kanske vill köra installeraren för att åtgärda detta."
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:46
 msgid "Go to the installer."
 msgstr "Gå till installeraren."
 
-#: lib/dberroraction.php:59
 msgid "Database error"
 msgstr "Databasfel"
 
 #. TRANS: Description of form for deleting a user.
-#: lib/deleteuserform.php:75
 msgid "Delete this user"
 msgstr "Ta bort denna användare"
 
-#: lib/designform.php:114
 #, fuzzy
 msgid "Change design"
 msgstr "Spara utseende"
 
 #. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: lib/designform.php:131
 msgid "Change colours"
 msgstr "Byt färger"
 
 #. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: lib/designform.php:138
 msgid "Use defaults"
 msgstr "Använd standardvärden"
 
 #. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: lib/designform.php:140
 msgid "Restore default designs"
 msgstr "Återställ standardutseende"
 
 #. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: lib/designform.php:148
 msgid "Reset back to default"
 msgstr "Återställ till standardvärde"
 
 #. TRANS: Label in form on profile design page.
 #. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
-#: lib/designform.php:158
 msgid "Upload file"
 msgstr "Ladda upp fil"
 
 #. TRANS: Instructions for form on profile design page.
-#: lib/designform.php:163
 #, fuzzy
 msgid ""
 "You can upload your personal background image. The maximum file size is 2Mb."
@@ -8381,47 +6934,39 @@ msgstr ""
 "2MB."
 
 #. TRANS: Radio button on profile design page that will enable use of the uploaded profile image.
-#: lib/designform.php:194
 msgctxt "RADIO"
 msgid "On"
 msgstr "På"
 
 #. TRANS: Radio button on profile design page that will disable use of the uploaded profile image.
-#: lib/designform.php:211
 msgctxt "RADIO"
 msgid "Off"
 msgstr "Av"
 
 #. TRANS: Title for button on profile design page to save settings.
-#: lib/designform.php:322
 msgid "Save design"
 msgstr "Spara utseende"
 
 #. TRANS: Error message displayed if design settings could not be saved.
 #. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
-#: lib/designsettings.php:216 lib/designsettings.php:238
 msgid "Couldn't update your design."
 msgstr "Kunde inte uppdatera dina utseendeinställningar."
 
 #. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
-#: lib/designsettings.php:244
 msgid "Design defaults restored."
 msgstr "Standardvärden för utseende återställda."
 
 #. TRANS: Exception. %s is an ID.
-#: lib/discovery.php:153
 #, fuzzy, php-format
 msgid "Unable to find services for %s."
 msgstr "Kunde inte återkalla åtkomst för applikation: %s."
 
 #. TRANS: Form legend for removing the favourite status for a favourite notice.
 #. TRANS: Title for button text for removing the favourite status for a favourite notice.
-#: lib/disfavorform.php:108 lib/disfavorform.php:140
 msgid "Disfavor this notice"
 msgstr "Avmarkera denna notis som favorit"
 
 #. TRANS: Button text for removing the favourite status for a favourite notice.
-#: lib/disfavorform.php:136
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Disfavor favorite"
@@ -8429,103 +6974,81 @@ msgstr "Ta bort märkning som favorit"
 
 #. TRANS: Form legend for adding the favourite status to a notice.
 #. TRANS: Title for button text for adding the favourite status to a notice.
-#: lib/favorform.php:108 lib/favorform.php:139
 msgid "Favor this notice"
 msgstr "Markera denna notis som favorit"
 
 #. TRANS: Button text for adding the favourite status to a notice.
-#: lib/favorform.php:135
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Favor"
 msgstr "Markera som favorit"
 
-#: lib/feed.php:84
 msgid "RSS 1.0"
 msgstr "RSS 1.0"
 
-#: lib/feed.php:86
 msgid "RSS 2.0"
 msgstr "RSS 2.0"
 
-#: lib/feed.php:88
 msgid "Atom"
 msgstr "Atom"
 
-#: lib/feed.php:90
 msgid "FOAF"
 msgstr "FOAF"
 
-#: lib/feedimporter.php:75
 #, fuzzy
 msgid "Not an atom feed."
 msgstr "Alla medlemmar"
 
-#: lib/feedimporter.php:82
 msgid "No author in the feed."
 msgstr ""
 
-#: lib/feedimporter.php:89
 msgid "Can't import without a user."
 msgstr ""
 
 #. TRANS: Header for feed links (h2).
-#: lib/feedlist.php:66
 msgid "Feeds"
 msgstr "Flöden"
 
-#: lib/galleryaction.php:128
 msgid "All"
 msgstr "Alla"
 
-#: lib/galleryaction.php:136
 msgid "Select tag to filter"
 msgstr "Välj tagg att filtrera"
 
-#: lib/galleryaction.php:137
 msgid "Tag"
 msgstr "Tagg"
 
-#: lib/galleryaction.php:138
 msgid "Choose a tag to narrow list"
 msgstr "Välj en tagg för att begränsa lista"
 
-#: lib/galleryaction.php:140
 msgid "Go"
 msgstr "Gå"
 
-#: lib/grantroleform.php:91
 #, php-format
 msgid "Grant this user the \"%s\" role"
 msgstr "Bevilja denna användare \"%s\"-rollen"
 
-#: lib/groupeditform.php:147
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "1-64 små bokstäver eller nummer, inga punkter eller mellanslag"
 
-#: lib/groupeditform.php:156
 #, fuzzy
 msgid "URL of the homepage or blog of the group or topic."
 msgstr "URL till gruppen eller ämnets hemsida eller blogg"
 
-#: lib/groupeditform.php:161
 msgid "Describe the group or topic"
 msgstr "Beskriv gruppen eller ämnet"
 
-#: lib/groupeditform.php:163
 #, fuzzy, php-format
 msgid "Describe the group or topic in %d character or less"
 msgid_plural "Describe the group or topic in %d characters or less"
 msgstr[0] "Beskriv gruppen eller ämnet med högst %d tecken"
 msgstr[1] "Beskriv gruppen eller ämnet med högst %d tecken"
 
-#: lib/groupeditform.php:175
 #, fuzzy
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\"."
 msgstr "Plats för gruppen, om den finns, såsom \"Stad, Län, Land\""
 
-#: lib/groupeditform.php:183
 #, fuzzy, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -8539,70 +7062,60 @@ msgstr[1] ""
 "Extra smeknamn för gruppen, komma- eller mellanslagsseparerade, max &d"
 
 #. TRANS: Menu item in the group navigation page.
-#: lib/groupnav.php:86
 msgctxt "MENU"
 msgid "Group"
 msgstr "Grupp"
 
 #. TRANS: Tooltip for menu item in the group navigation page.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:89
 #, php-format
 msgctxt "TOOLTIP"
 msgid "%s group"
 msgstr "%s grupp"
 
 #. TRANS: Menu item in the group navigation page.
-#: lib/groupnav.php:95
 msgctxt "MENU"
 msgid "Members"
 msgstr "Medlemmar"
 
 #. TRANS: Tooltip for menu item in the group navigation page.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:98
 #, php-format
 msgctxt "TOOLTIP"
 msgid "%s group members"
 msgstr "%s gruppmedlemmar"
 
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/groupnav.php:108
 msgctxt "MENU"
 msgid "Blocked"
 msgstr "Blockerade"
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:111
 #, php-format
 msgctxt "TOOLTIP"
 msgid "%s blocked users"
 msgstr "%s blockerade användare"
 
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "Administratör"
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:120
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Edit %s group properties"
 msgstr "Redigera %s gruppegenskaper"
 
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/groupnav.php:126
 msgctxt "MENU"
 msgid "Logo"
 msgstr "Logotyp"
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:129
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Add or edit %s logo"
@@ -8610,69 +7123,57 @@ msgstr "Lägg till eller redigera %s logotyp"
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:138
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Add or edit %s design"
 msgstr "Lägg till eller redigera %s utseende"
 
 #. TRANS: Title for groups with the most members section.
-#: lib/groupsbymemberssection.php:71
 msgid "Groups with most members"
 msgstr "Grupper med flest medlemmar"
 
 #. TRANS: Title for groups with the most posts section.
-#: lib/groupsbypostssection.php:71
 msgid "Groups with most posts"
 msgstr "Grupper med flest inlägg"
 
 #. TRANS: Title for group tag cloud section.
 #. TRANS: %s is a group name.
-#: lib/grouptagcloudsection.php:57
 #, php-format
 msgid "Tags in %s group's notices"
 msgstr "Taggar i %s grupps notiser"
 
 #. TRANS: Client exception 406
-#: lib/htmloutputter.php:104
 msgid "This page is not available in a media type you accept"
 msgstr "Denna sida är inte tillgänglig i den mediatyp du accepterat"
 
 #. TRANS: Exception thrown when trying to upload an unsupported image file format.
-#: lib/imagefile.php:73
 msgid "Unsupported image file format."
 msgstr "Bildfilens format stödjs inte."
 
 #. TRANS: Exception thrown when too large a file is uploaded.
 #. TRANS: %s is the maximum file size, for example "500b", "10kB" or "2MB".
-#: lib/imagefile.php:91
 #, php-format
 msgid "That file is too big. The maximum file size is %s."
 msgstr "Denna fil är för stor. Den maximala filstorleken är %s."
 
 #. TRANS: Exception thrown when uploading an image and that action could not be completed.
-#: lib/imagefile.php:97
 msgid "Partial upload."
 msgstr "Bitvis uppladdad."
 
 #. TRANS: Exception thrown when uploading a file as image that is not an image or is a corrupt file.
-#: lib/imagefile.php:115
 msgid "Not an image or corrupt file."
 msgstr "Inte en bildfil eller så är filen korrupt."
 
 #. TRANS: Exception thrown during resize when image has been registered as present, but is no longer there.
-#: lib/imagefile.php:178
 msgid "Lost our file."
 msgstr "Förlorade vår fil."
 
 #. TRANS: Exception thrown when trying to resize an unknown file type.
 #. TRANS: Exception thrown when trying resize an unknown file type.
-#: lib/imagefile.php:216 lib/imagefile.php:257
 msgid "Unknown file type"
 msgstr "Okänd filtyp"
 
 #. TRANS: Number of megabytes. %d is the number.
-#: lib/imagefile.php:303
 #, php-format
 msgid "%dMB"
 msgid_plural "%dMB"
@@ -8680,7 +7181,6 @@ msgstr[0] "%dMB"
 msgstr[1] "%dMB"
 
 #. TRANS: Number of kilobytes. %d is the number.
-#: lib/imagefile.php:307
 #, php-format
 msgid "%dkB"
 msgid_plural "%dkB"
@@ -8688,14 +7188,12 @@ msgstr[0] "%dkB"
 msgstr[1] "%dkB"
 
 #. TRANS: Number of bytes. %d is the number.
-#: lib/imagefile.php:310
 #, php-format
 msgid "%dB"
 msgid_plural "%dB"
 msgstr[0] "%dB"
 msgstr[1] "%dB"
 
-#: lib/implugin.php:262
 #, php-format
 msgid ""
 "User \"%s\" on %s has said that your %s screenname belongs to them. If "
@@ -8705,51 +7203,42 @@ msgid ""
 "message."
 msgstr ""
 
-#: lib/implugin.php:349
 #, php-format
 msgid "Unknown inbox source %d."
 msgstr "Okänd källa för inkorg %d."
 
-#: lib/implugin.php:485
-#, fuzzy, php-format
+#, php-format
 msgid "Message too long - maximum is %1$d characters, you sent %2$d."
 msgstr "Meddelande för långt - maximum är %1$d tecken, du skickade %2$d."
 
-#: lib/leaveform.php:114
 msgid "Leave"
 msgstr "Lämna"
 
 #. TRANS: Menu item for logging in to the StatusNet site.
-#: lib/logingroupnav.php:77
 msgctxt "MENU"
 msgid "Login"
 msgstr "Logga in"
 
 #. TRANS: Title for menu item for logging in to the StatusNet site.
-#: lib/logingroupnav.php:79
 msgid "Login with a username and password"
 msgstr "Logga in med ett användarnamn och lösenord"
 
 #. TRANS: Menu item for registering with the StatusNet site.
-#: lib/logingroupnav.php:85
 msgctxt "MENU"
 msgid "Register"
 msgstr "Registrera"
 
 #. TRANS: Title for menu item for registering with the StatusNet site.
-#: lib/logingroupnav.php:87
 msgid "Sign up for a new account"
 msgstr "Registrera dig för ett nytt konto"
 
 #. TRANS: Subject for address confirmation email.
-#: lib/mail.php:172
 msgid "Email address confirmation"
 msgstr "E-postadressbekräftelse"
 
 #. TRANS: Body for address confirmation email.
 #. TRANS: %1$s is the addressed user's nickname, %2$s is the StatusNet sitename,
 #. TRANS: %3$s is the URL to confirm at.
-#: lib/mail.php:177
 #, fuzzy, php-format
 msgid ""
 "Hey, %1$s.\n"
@@ -8780,14 +7269,12 @@ msgstr ""
 
 #. TRANS: Subject of new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
-#: lib/mail.php:243
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1$s lyssnar nu på dina notiser på %2$s."
 
 #. TRANS: This is a paragraph in a new-subscriber e-mail.
 #. TRANS: %s is a URL where the subscriber can be reported as abusive.
-#: lib/mail.php:250
 #, php-format
 msgid ""
 "If you believe this account is being used abusively, you can block them from "
@@ -8802,7 +7289,6 @@ msgstr ""
 #. TRANS: %3$s is the subscriber's profile URL, %4$s is the subscriber's location (or empty)
 #. TRANS: %5$s is the subscriber's homepage URL (or empty), %6%s is the subscriber's bio (or empty)
 #. TRANS: %7$s is a link to the addressed user's e-mail settings.
-#: lib/mail.php:260
 #, fuzzy, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -8829,14 +7315,12 @@ msgstr ""
 
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is biographical information.
-#: lib/mail.php:283
 #, php-format
 msgid "Bio: %s"
 msgstr "Biografi: %s"
 
 #. TRANS: Subject of notification mail for new posting email address.
 #. TRANS: %s is the StatusNet sitename.
-#: lib/mail.php:312
 #, php-format
 msgid "New email address for posting to %s"
 msgstr "Ny e-postadress för att skicka till %s"
@@ -8844,7 +7328,6 @@ msgstr "Ny e-postadress för att skicka till %s"
 #. TRANS: Body of notification mail for new posting email address.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is the e-mail address to send
 #. TRANS: to to post by e-mail, %3$s is a URL to more instructions.
-#: lib/mail.php:318
 #, fuzzy, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -8867,26 +7350,22 @@ msgstr ""
 
 #. TRANS: Subject line for SMS-by-email notification messages.
 #. TRANS: %s is the posting user's nickname.
-#: lib/mail.php:439
 #, php-format
 msgid "%s status"
 msgstr "%s status"
 
 #. TRANS: Subject line for SMS-by-email address confirmation message.
-#: lib/mail.php:465
 msgid "SMS confirmation"
 msgstr "SMS-bekräftelse"
 
 #. TRANS: Main body heading for SMS-by-email address confirmation message.
 #. TRANS: %s is the addressed user's nickname.
-#: lib/mail.php:469
 #, php-format
 msgid "%s: confirm you own this phone number with this code:"
 msgstr "%s: bekräfta detta telefonnummer med denna kod:"
 
 #. TRANS: Subject for 'nudge' notification email.
 #. TRANS: %s is the nudging user.
-#: lib/mail.php:490
 #, fuzzy, php-format
 msgid "You have been nudged by %s"
 msgstr "Du har blivit knuffad av %s"
@@ -8894,7 +7373,6 @@ msgstr "Du har blivit knuffad av %s"
 #. TRANS: Body for 'nudge' notification email.
 #. TRANS: %1$s is the nuding user's long name, $2$s is the nudging user's nickname,
 #. TRANS: %3$s is a URL to post notices at, %4$s is the StatusNet sitename.
-#: lib/mail.php:497
 #, php-format
 msgid ""
 "%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -8923,7 +7401,6 @@ msgstr ""
 
 #. TRANS: Subject for direct-message notification email.
 #. TRANS: %s is the sending user's nickname.
-#: lib/mail.php:544
 #, php-format
 msgid "New private message from %s"
 msgstr "Nytt privat meddelande från %s"
@@ -8932,7 +7409,6 @@ msgstr "Nytt privat meddelande från %s"
 #. TRANS: %1$s is the sending user's long name, %2$s is the sending user's nickname,
 #. TRANS: %3$s is the message content, %4$s a URL to the message,
 #. TRANS: %5$s is the StatusNet sitename.
-#: lib/mail.php:552
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -8967,7 +7443,6 @@ msgstr ""
 
 #. TRANS: Subject for favorite notification e-mail.
 #. TRANS: %1$s is the adding user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:604
 #, fuzzy, php-format
 msgid "%1$s (@%2$s) added your notice as a favorite"
 msgstr "%s (@%s) lade till din notis som en favorit"
@@ -8977,7 +7452,6 @@ msgstr "%s (@%s) lade till din notis som en favorit"
 #. TRANS: %3$s is a URL to the faved notice, %4$s is the faved notice text,
 #. TRANS: %5$s is a URL to all faves of the adding user, %6$s is the StatusNet sitename,
 #. TRANS: %7$s is the adding user's nickname.
-#: lib/mail.php:611
 #, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -9015,7 +7489,6 @@ msgstr ""
 "%6$s\n"
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:669
 #, php-format
 msgid ""
 "The full conversation can be read here:\n"
@@ -9028,7 +7501,6 @@ msgstr ""
 
 #. TRANS: E-mail subject for notice notification.
 #. TRANS: %1$s is the sending user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:677
 #, fuzzy, php-format
 msgid "%1$s (@%2$s) sent a notice to your attention"
 msgstr "%s (@%s) skickade en notis för din uppmärksamhet"
@@ -9039,7 +7511,6 @@ msgstr "%s (@%s) skickade en notis för din uppmärksamhet"
 #. TRANS: %5$s is a URL to the full conversion if it exists (otherwise empty),
 #. TRANS: %6$s is a URL to reply to the notice, %7$s is a URL to all @-replied for the addressed user,
 #. TRANS: %8$s is a URL to the addressed user's e-mail settings, %9$s is the sender's nickname.
-#: lib/mail.php:685
 #, php-format
 msgid ""
 "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -9088,11 +7559,9 @@ msgstr ""
 "\n"
 "P.S. Du kan stänga av dessa e-postnotifikationer här: %8$s\n"
 
-#: lib/mailbox.php:87
 msgid "Only the user can read their own mailboxes."
 msgstr "Bara användaren kan läsa sina egna brevlådor."
 
-#: lib/mailbox.php:125
 msgid ""
 "You have no private messages. You can send private message to engage other "
 "users in conversation. People can send you messages for your eyes only."
@@ -9101,54 +7570,44 @@ msgstr ""
 "engagera andra användare i konversationen. Folk kan skicka meddelanden till "
 "dig som bara du ser."
 
-#: lib/mailhandler.php:37
 msgid "Could not parse message."
 msgstr "Kunde inte tolka meddelande."
 
-#: lib/mailhandler.php:42
 msgid "Not a registered user."
 msgstr "Inte en registrerad användare."
 
-#: lib/mailhandler.php:46
 msgid "Sorry, that is not your incoming email address."
 msgstr "Tyvärr, det är inte din inkommande e-postadress."
 
-#: lib/mailhandler.php:50
 msgid "Sorry, no incoming email allowed."
 msgstr "Tyvärr, ingen inkommande e-post tillåts."
 
-#: lib/mailhandler.php:229
 #, php-format
 msgid "Unsupported message type: %s"
 msgstr "Formatet %s för meddelande stödjs inte."
 
 #. TRANS: Client exception thrown when a database error was thrown during a file upload operation.
-#: lib/mediafile.php:102 lib/mediafile.php:174
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
 "Det var ett databasfel vid sparandet av din profil. Var vänlig försök igen."
 
 #. TRANS: Client exception thrown when a file upload operation would cause a user to exceed a set quota.
-#: lib/mediafile.php:238 lib/mediafile.php:281
 msgid "File exceeds user's quota."
 msgstr "Fil överstiger användaren kvot."
 
 #. TRANS: Client exception thrown when a file upload operation fails because the file could
 #. TRANS: not be moved from the temporary folder to the permanent file location.
-#: lib/mediafile.php:258 lib/mediafile.php:300
 msgid "File could not be moved to destination directory."
 msgstr "Fil kunde inte flyttas till destinationskatalog."
 
 #. TRANS: Client exception thrown when a file upload operation has been stopped because the MIME
 #. TRANS: type of the uploaded file could not be determined.
-#: lib/mediafile.php:265 lib/mediafile.php:306
 msgid "Could not determine file's MIME type."
 msgstr "Kunde inte fastställa filens MIME-typ."
 
 #. TRANS: Client exception thrown trying to upload a forbidden MIME type.
 #. TRANS: %1$s is the file type that was denied, %2$s is the application part of
 #. TRANS: the MIME type that was denied.
-#: lib/mediafile.php:396
 #, php-format
 msgid ""
 "\"%1$s\" is not a supported file type on this server. Try using another %2$s "
@@ -9159,84 +7618,75 @@ msgstr ""
 
 #. TRANS: Client exception thrown trying to upload a forbidden MIME type.
 #. TRANS: %s is the file type that was denied.
-#: lib/mediafile.php:401
 #, php-format
 msgid "\"%s\" is not a supported file type on this server."
 msgstr "%s är en filtyp som saknar stöd på denna server."
 
-#: lib/messageform.php:120
 msgid "Send a direct notice"
 msgstr "Skicka en direktnotis"
 
 #. TRANS Label entry in drop-down selection box in direct-message inbox/outbox. This is the default entry in the drop-down box, doubling as instructions and a brake against accidental submissions with the first user in the list.
-#: lib/messageform.php:137
 #, fuzzy
 msgid "Select recipient:"
 msgstr "Välj licens"
 
 #. TRANS Entry in drop-down selection box in direct-message inbox/outbox when no one is available to message.
-#: lib/messageform.php:150
 #, fuzzy
 msgid "No mutual subscribers."
 msgstr "Inte prenumerant!"
 
-#: lib/messageform.php:153
 msgid "To"
 msgstr "Till"
 
-#: lib/messageform.php:184 lib/noticeform.php:236
 msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr "Skicka"
 
-#: lib/messagelist.php:77
 #, fuzzy
 msgid "Messages"
 msgstr "Meddelande"
 
-#: lib/messagelistitem.php:123 lib/noticelist.php:527
 msgid "from"
 msgstr "från"
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:178
 msgid "Nickname cannot be empty."
 msgstr ""
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:191
 #, php-format
 msgid "Nickname cannot be more than %d character long."
 msgid_plural "Nickname cannot be more than %d characters long."
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/noticeform.php:160
+#. TRANS: Form legend for notice form.
 msgid "Send a notice"
 msgstr "Skicka en notis"
 
-#: lib/noticeform.php:174
+#. TRANS: Title for notice label. %s is the user's nickname.
 #, php-format
 msgid "What's up, %s?"
 msgstr "Vad är på gång, %s?"
 
-#: lib/noticeform.php:193
+#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr "Bifoga"
 
-#: lib/noticeform.php:197
-msgid "Attach a file"
+#. TRANS: Title for input field to attach a file to a notice.
+#, fuzzy
+msgid "Attach a file."
 msgstr "Bifoga en fil"
 
-#: lib/noticeform.php:212
+#. TRANS: Field label to add location to a notice.
 msgid "Share my location"
 msgstr "Dela min plats"
 
-#: lib/noticeform.php:215
+#. TRANS: Text to not share location for a notice in notice form.
 msgid "Do not share my location"
 msgstr "Dela inte min plats"
 
-#: lib/noticeform.php:216
+#. TRANS: Timeout error text for location retrieval in notice form.
 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
 "try again later"
@@ -9245,418 +7695,317 @@ msgstr ""
 "god försök igen senare"
 
 #. TRANS: Used in coordinates as abbreviation of north
-#: lib/noticelist.php:457
 msgid "N"
 msgstr "N"
 
 #. TRANS: Used in coordinates as abbreviation of south
-#: lib/noticelist.php:459
 msgid "S"
 msgstr "S"
 
 #. TRANS: Used in coordinates as abbreviation of east
-#: lib/noticelist.php:461
 msgid "E"
 msgstr "Ö"
 
 #. TRANS: Used in coordinates as abbreviation of west
-#: lib/noticelist.php:463
 msgid "W"
 msgstr "V"
 
-#: lib/noticelist.php:465
 #, php-format
 msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 
-#: lib/noticelist.php:474
 msgid "at"
 msgstr "på"
 
-#: lib/noticelist.php:523
 msgid "web"
 msgstr "webb"
 
-#: lib/noticelist.php:589
 msgid "in context"
 msgstr "i sammanhang"
 
-#: lib/noticelist.php:624
 msgid "Repeated by"
 msgstr "Upprepad av"
 
-#: lib/noticelist.php:651
 msgid "Reply to this notice"
 msgstr "Svara på denna notis"
 
-#: lib/noticelist.php:652
 msgid "Reply"
 msgstr "Svara"
 
-#: lib/noticelist.php:678
 msgid "Delete this notice"
 msgstr "Ta bort denna notis"
 
-#: lib/noticelist.php:696
 msgid "Notice repeated"
 msgstr "Notis upprepad"
 
-#: lib/nudgeform.php:116
 msgid "Nudge this user"
 msgstr "Knuffa denna användare"
 
-#: lib/nudgeform.php:128
 msgid "Nudge"
 msgstr "Knuffa"
 
-#: lib/nudgeform.php:128
 msgid "Send a nudge to this user"
 msgstr "Skicka en knuff till denna användare"
 
-#: lib/oauthstore.php:294
 msgid "Error inserting new profile."
 msgstr "Fel vid infogning av ny profil."
 
-#: lib/oauthstore.php:302
 msgid "Error inserting avatar."
 msgstr "Fel vid infogning av avatar."
 
-#: lib/oauthstore.php:322
 msgid "Error inserting remote profile."
 msgstr "Fel vid infogning av fjärrprofil."
 
 #. TRANS: Exception thrown when a notice is denied because it has been sent before.
-#: lib/oauthstore.php:362
 msgid "Duplicate notice."
 msgstr "Duplicera notis."
 
-#: lib/oauthstore.php:507
 msgid "Couldn't insert new subscription."
 msgstr "Kunde inte infoga ny prenumeration."
 
-#: lib/personalgroupnav.php:104
-#, fuzzy
 msgid "Replies"
 msgstr "Svar"
 
-#: lib/personalgroupnav.php:109
-#, fuzzy
 msgid "Favorites"
 msgstr "Favoriter"
 
-#: lib/personalgroupnav.php:120
-#, fuzzy
 msgid "Inbox"
 msgstr "Inkorg"
 
-#: lib/personalgroupnav.php:121
 msgid "Your incoming messages"
 msgstr "Dina inkommande meddelanden"
 
-#: lib/personalgroupnav.php:125
-#, fuzzy
 msgid "Outbox"
 msgstr "Utkorg"
 
-#: lib/personalgroupnav.php:126
 msgid "Your sent messages"
 msgstr "Dina skickade meddelanden"
 
 #. TRANS: Title for personal tag cloud section. %s is a user nickname.
-#: lib/personaltagcloudsection.php:56
 #, php-format
 msgid "Tags in %s's notices"
 msgstr "Taggar i %ss notiser"
 
 #. TRANS: Displayed as version information for a plugin if no version information was found.
-#: lib/plugin.php:126
 msgid "Unknown"
 msgstr "Okänd"
 
 #. TRANS: Plugin admin panel controls
-#: lib/plugindisableform.php:90
 msgctxt "plugin"
 msgid "Disable"
 msgstr ""
 
 #. TRANS: Plugin admin panel controls
-#: lib/pluginenableform.php:112
 msgctxt "plugin"
 msgid "Enable"
 msgstr ""
 
-#: lib/pluginlist.php:196
 msgctxt "plugin-description"
 msgid "(Plugin descriptions unavailable when disabled.)"
 msgstr ""
 
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:88
 msgid "Subscriptions"
 msgstr "Prenumerationer"
 
 #. TRANS: Text for user subscription statistics if user has more subscriptions than displayed.
-#: lib/profileaction.php:144
 msgid "All subscriptions"
 msgstr "Alla prenumerationer"
 
 #. TRANS: H2 text for user subscriber statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:96
 msgid "Subscribers"
 msgstr "Prenumeranter"
 
 #. TRANS: Text for user subscription statistics if user has more subscribers than displayed.
-#: lib/profileaction.php:181
 msgid "All subscribers"
 msgstr "Alla prenumeranter"
 
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:213
 msgid "User ID"
 msgstr "Användar-ID"
 
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:219
 msgid "Member since"
 msgstr "Medlem sedan"
 
 #. TRANS: Label for user statistics.
 #. TRANS: H2 text for user group membership statistics.
-#: lib/profileaction.php:239 lib/profileaction.php:290
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:104
 msgid "Groups"
 msgstr "Grupper"
 
 #. TRANS: Label for user statistics.
 #. TRANS: Average count of posts made per day since account registration.
-#: lib/profileaction.php:253
 msgid "Daily average"
 msgstr "Dagligt genomsnitt"
 
 #. TRANS: Text for user group membership statistics if user has more subscriptions than displayed.
-#: lib/profileaction.php:305
 msgid "All groups"
 msgstr "Alla grupper"
 
 #. TRANS: Server error displayed when using an unimplemented method.
-#: lib/profileformaction.php:123
 msgid "Unimplemented method."
 msgstr "Inte implementerad metod."
 
-#: lib/publicgroupnav.php:82
 msgid "User groups"
 msgstr "Användargrupper"
 
-#: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
 msgid "Recent tags"
 msgstr "Senaste taggar"
 
-#: lib/publicgroupnav.php:88
 msgid "Featured"
 msgstr "Profilerade"
 
-#: lib/publicgroupnav.php:92
 msgid "Popular"
 msgstr "Populärt"
 
-#: lib/redirectingaction.php:95
 msgid "No return-to arguments."
 msgstr "Inga \"return-to\"-argument."
 
-#: lib/repeatform.php:107
 msgid "Repeat this notice?"
 msgstr "Upprepa denna notis?"
 
-#: lib/repeatform.php:132
 msgid "Yes"
 msgstr "Ja"
 
-#: lib/repeatform.php:132
 msgid "Repeat this notice"
 msgstr "Upprepa denna notis"
 
-#: lib/revokeroleform.php:91
 #, php-format
 msgid "Revoke the \"%s\" role from this user"
 msgstr "Återkalla rollen \"%s\" från denna användare"
 
 #. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:1001
 #, fuzzy
 msgid "Page not found."
 msgstr "API-metod hittades inte."
 
-#: lib/sandboxform.php:67
 msgid "Sandbox"
 msgstr "Flytta till sandlådan"
 
-#: lib/sandboxform.php:78
 msgid "Sandbox this user"
 msgstr "Flytta denna användare till sandlådan"
 
 #. TRANS: Fieldset legend for the search form.
-#: lib/searchaction.php:120
 msgid "Search site"
 msgstr "Sök webbplats"
 
 #. TRANS: Used as a field label for the field where one or more keywords
 #. TRANS: for searching can be entered.
-#: lib/searchaction.php:128
 msgid "Keyword(s)"
 msgstr "Nyckelord"
 
 #. TRANS: Button text for searching site.
-#: lib/searchaction.php:130
 msgctxt "BUTTON"
 msgid "Search"
 msgstr "Sök"
 
-#: lib/searchgroupnav.php:80
 msgid "People"
 msgstr "Personer"
 
-#: lib/searchgroupnav.php:81
 msgid "Find people on this site"
 msgstr "Hitta personer på denna webbplats"
 
-#: lib/searchgroupnav.php:83
 msgid "Find content of notices"
 msgstr "Hitta innehåll i notiser"
 
-#: lib/searchgroupnav.php:85
 msgid "Find groups on this site"
 msgstr "Hitta grupper på denna webbplats"
 
-#: lib/section.php:89
 msgid "Untitled section"
 msgstr "Namnlös sektion"
 
-#: lib/section.php:106
 msgid "More..."
 msgstr "Mer..."
 
-#: lib/settingsnav.php:78
 msgid "Change your profile settings"
 msgstr "Ändra dina profilinställningar"
 
-#: lib/settingsnav.php:83
 msgid "Upload an avatar"
 msgstr "Ladda upp en avatar"
 
-#: lib/settingsnav.php:88
 msgid "Change your password"
 msgstr "Ändra ditt lösenord"
 
-#: lib/settingsnav.php:93
 msgid "Change email handling"
 msgstr "Ändra e-posthantering"
 
-#: lib/settingsnav.php:98
 msgid "Design your profile"
 msgstr "Designa din profil"
 
-#: lib/settingsnav.php:102
 msgid "URL"
 msgstr "URL"
 
-#: lib/settingsnav.php:103
 msgid "URL shorteners"
 msgstr ""
 
-#: lib/settingsnav.php:111
 msgid "Updates by instant messenger (IM)"
 msgstr "Uppdateringar via snabbmeddelande (IM)"
 
-#: lib/settingsnav.php:118
 msgid "Updates by SMS"
 msgstr "Uppdateringar via SMS"
 
-#: lib/settingsnav.php:123
-#, fuzzy
 msgid "Connections"
 msgstr "Anslutningar"
 
-#: lib/settingsnav.php:124
 msgid "Authorized connected applications"
 msgstr "Tillåt anslutna applikationer"
 
-#: lib/silenceform.php:67
 msgid "Silence"
 msgstr "Tysta ned"
 
-#: lib/silenceform.php:78
 msgid "Silence this user"
 msgstr "Tysta ned denna användare"
 
-#: lib/subgroupnav.php:89
 #, php-format
 msgid "People %s subscribes to"
 msgstr "Personer %s prenumererar på"
 
-#: lib/subgroupnav.php:97
 #, php-format
 msgid "People subscribed to %s"
 msgstr "Personer som prenumererar på %s"
 
-#: lib/subgroupnav.php:105
 #, php-format
 msgid "Groups %s is a member of"
 msgstr "Grupper %s är en medlem i"
 
-#: lib/subgroupnav.php:111
 msgid "Invite"
 msgstr "Bjud in"
 
-#: lib/subgroupnav.php:112
 #, php-format
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Bjud in vänner och kollegor att gå med dig på %s"
 
-#: lib/subscribeform.php:115 lib/subscribeform.php:139
 msgid "Subscribe to this user"
 msgstr "Prenumerera på denna användare"
 
-#: lib/subscriberspeopleselftagcloudsection.php:48
-#: lib/subscriptionspeopleselftagcloudsection.php:48
 msgid "People Tagcloud as self-tagged"
 msgstr "Taggmoln för person, såsom taggat själv"
 
-#: lib/subscriberspeopletagcloudsection.php:48
-#: lib/subscriptionspeopletagcloudsection.php:48
 msgid "People Tagcloud as tagged"
 msgstr "Taggmoln för person, såsom taggats"
 
-#: lib/tagcloudsection.php:56
 msgid "None"
 msgstr "Ingen"
 
 #. TRANS: Server exception displayed if a theme name was invalid.
-#: lib/theme.php:74
 #, fuzzy
 msgid "Invalid theme name."
 msgstr "Ogiltigt filnamn."
 
-#: lib/themeuploader.php:50
 msgid "This server cannot handle theme uploads without ZIP support."
 msgstr "Denna server kan inte hantera temauppladdningar utan ZIP-stöd."
 
-#: lib/themeuploader.php:58 lib/themeuploader.php:61
 msgid "The theme file is missing or the upload failed."
 msgstr "Temafilen saknas eller uppladdningen misslyckades."
 
-#: lib/themeuploader.php:91 lib/themeuploader.php:102
-#: lib/themeuploader.php:279 lib/themeuploader.php:283
-#: lib/themeuploader.php:291 lib/themeuploader.php:298
 msgid "Failed saving theme."
 msgstr "Kunde inte spara tema."
 
-#: lib/themeuploader.php:147
 msgid "Invalid theme: bad directory structure."
 msgstr "Ogiltigt tema: dålig katalogstruktur."
 
-#: lib/themeuploader.php:166
 #, fuzzy, php-format
 msgid "Uploaded theme is too large; must be less than %d byte uncompressed."
 msgid_plural ""
@@ -9666,11 +8015,9 @@ msgstr[0] ""
 msgstr[1] ""
 "Uppladdat tema är för stort, måste vara mindre än %d byte okomprimerat."
 
-#: lib/themeuploader.php:179
 msgid "Invalid theme archive: missing file css/display.css"
 msgstr "Ogiltigt temaarkiv: filen css/display.css saknas"
 
-#: lib/themeuploader.php:219
 msgid ""
 "Theme contains invalid file or folder name. Stick with ASCII letters, "
 "digits, underscore, and minus sign."
@@ -9678,141 +8025,113 @@ msgstr ""
 "Tema innehåller ogiltigt fil- eller mappnamn. Använd bara ASCII-bokstäver, "
 "siffror, understreck och minustecken."
 
-#: lib/themeuploader.php:225
 msgid "Theme contains unsafe file extension names; may be unsafe."
 msgstr "Tema innehåller osäkra filtilläggsnamn; kan vara osäkert."
 
-#: lib/themeuploader.php:242
 #, php-format
 msgid "Theme contains file of type '.%s', which is not allowed."
 msgstr "Tema innehåller fil av typen '.%s', vilket inte är tillåtet."
 
-#: lib/themeuploader.php:260
 msgid "Error opening theme archive."
 msgstr "Fel vid öppning temaarkiv."
 
-#: lib/threadednoticelist.php:270
-#, php-format
-msgid "Show all %d comment"
-msgid_plural "Show all %d comments"
-msgstr[0] ""
-msgstr[1] ""
+#, fuzzy, php-format
+msgid "Show %d reply"
+msgid_plural "Show all %d replies"
+msgstr[0] "Visa mer"
+msgstr[1] "Visa mer"
 
-#: lib/topposterssection.php:74
 msgid "Top posters"
 msgstr "Toppostare"
 
 #. TRANS: Title for the form to unblock a user.
-#: lib/unblockform.php:67
 msgctxt "TITLE"
 msgid "Unblock"
 msgstr "Häv blockering"
 
-#: lib/unsandboxform.php:69
 msgid "Unsandbox"
 msgstr "Flytta från sandlådan"
 
-#: lib/unsandboxform.php:80
 msgid "Unsandbox this user"
 msgstr "Flytta denna användare från sandlådan"
 
-#: lib/unsilenceform.php:67
 msgid "Unsilence"
 msgstr "Häv nedtystning"
 
-#: lib/unsilenceform.php:78
 msgid "Unsilence this user"
 msgstr "Häv nedtystning av denna användare"
 
-#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
 msgid "Unsubscribe from this user"
 msgstr "Avsluta prenumerationen på denna användare"
 
-#: lib/unsubscribeform.php:137
 msgid "Unsubscribe"
 msgstr "Avsluta pren."
 
 #. 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).
-#: lib/usernoprofileexception.php:60
 #, fuzzy, php-format
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "Användaren har ingen profil."
 
-#: lib/userprofile.php:116
 msgid "Edit Avatar"
 msgstr "Redigera avatar"
 
 #. TRANS: H2 for user actions in a profile.
 #. TRANS: H2 for entity actions in a profile.
-#: lib/userprofile.php:216 lib/userprofile.php:232
 msgid "User actions"
 msgstr "Åtgärder för användare"
 
 #. TRANS: Text shown in user profile of not yet compeltely deleted users.
-#: lib/userprofile.php:220
 msgid "User deletion in progress..."
 msgstr "Borttagning av användare pågår..."
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:248
 msgid "Edit profile settings"
 msgstr "Redigera profilinställningar"
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:250
 msgid "Edit"
 msgstr "Redigera"
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:274
 msgid "Send a direct message to this user"
 msgstr "Skicka ett direktmeddelande till denna användare"
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:276
 msgid "Message"
 msgstr "Meddelande"
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:318
 msgid "Moderate"
 msgstr "Moderera"
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:357
 msgid "User role"
 msgstr "Användarroll"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:360
 msgctxt "role"
 msgid "Administrator"
 msgstr "Administratör"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:362
 msgctxt "role"
 msgid "Moderator"
 msgstr "Moderator"
 
-#: lib/util.php:321
 #, fuzzy
 msgid "Not allowed to log in."
 msgstr "Inte inloggad."
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1337
 msgid "a few seconds ago"
 msgstr "ett par sekunder sedan"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1340
 msgid "about a minute ago"
 msgstr "för nån minut sedan"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1344
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
@@ -9820,12 +8139,10 @@ msgstr[0] "för ungefär en minut sedan"
 msgstr[1] "för ungefär %d minuter sedan"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1347
 msgid "about an hour ago"
 msgstr "för en timma sedan"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1351
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
@@ -9833,12 +8150,10 @@ msgstr[0] "för ungefär en timma sedan"
 msgstr[1] "för ungefär %d timmar sedan"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1354
 msgid "about a day ago"
 msgstr "för en dag sedan"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1358
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
@@ -9846,12 +8161,10 @@ msgstr[0] "för ungefär en dag sedan"
 msgstr[1] "för ungefär %d dagar sedan"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1361
 msgid "about a month ago"
 msgstr "för en månad sedan"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1365
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
@@ -9859,203 +8172,42 @@ msgstr[0] "för ungefär en månad sedan"
 msgstr[1] "för ungefär %d månader sedan"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1368
 msgid "about a year ago"
 msgstr "för ett år sedan"
 
 #. TRANS: Web color exception thrown when a hexadecimal color code does not validate.
 #. TRANS: %s is the provided (invalid) color code.
-#: lib/webcolor.php:81 lib/webcolor.php:121
 #, fuzzy, php-format
 msgid "%s is not a valid color! Use 3 or 6 hex characters."
 msgstr "%s är inte en giltig färg! Använd 3 eller 6 hexadecimala tecken."
 
 #. TRANS: Exception.
-#: lib/xrd.php:63
 #, fuzzy
 msgid "Invalid XML."
 msgstr "Ogiltig storlek."
 
 #. TRANS: Exception.
-#: lib/xrd.php:68
 msgid "Invalid XML, missing XRD root."
 msgstr ""
 
 #. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
-#: scripts/restoreuser.php:62
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
 
-#~ msgid "Could not generate feed for group - %s"
-#~ msgstr "Kunde inte generera flöde för grupp - %s"
+#~ msgid "Full name is too long (max 255 chars)."
+#~ msgstr "Fullständigt namn är för långt (max 255 tecken)."
+
+#~ msgid "description is too long (max %d chars)."
+#~ msgstr "beskrivning är för lång (max %d tecken)."
+
+#~ msgid "Location is too long (max 255 chars)."
+#~ msgstr "Beskrivning av plats är för lång (max 255 tecken)."
+
+#~ msgid "Too many aliases! Maximum %d."
+#~ msgstr "För många alias! Maximum %d."
 
 #, fuzzy
-#~ msgid "Current confirmed Jabber/Google Talk address."
-#~ msgstr "Aktuell bekräftad Jabber/Gtalk-adress."
-
-#, fuzzy
-#~ msgid ""
-#~ "Jabber or Google Talk address, like \"UserName@example.org\". First, make "
-#~ "sure to add %s to your buddy list in your IM client or on Google Talk."
-#~ msgstr ""
-#~ "Jabber- eller GTalk-adress, som \"användarnamn@example.org\". Se först "
-#~ "till att lägga till %s i din kompislista i din IM-klient eller hos GTalk."
-
-#, fuzzy
-#~ msgid "Send me notices through Jabber/Google Talk."
-#~ msgstr "Skicka notiser till mig genom Jabber/GTalk."
-
-#, fuzzy
-#~ msgid "Publish a MicroID for my Jabber/Google Talk address."
-#~ msgstr "Publicera ett MicroID för min Jabber/GTalk-adress."
-
-#~ msgid "No Jabber ID."
-#~ msgstr "Inget Jabber-ID."
-
-#, fuzzy
-#~ msgid "Not a valid Jabber ID."
-#~ msgstr "Inte ett giltigt Jabber-ID"
-
-#~ msgid "That is already your Jabber ID."
-#~ msgstr "Detta är redan ditt Jabber-ID"
-
-#~ msgid "That is not your Jabber ID."
-#~ msgstr "Detta är inte ditt Jabber-ID."
-
-#~ msgid "Other settings"
-#~ msgstr "Övriga inställningar"
-
-#~ msgid "Tag cloud"
-#~ msgstr "Taggmoln"
-
-#~ msgid "Consumer key"
-#~ msgstr "Nyckel för konsument"
-
-#~ msgid "Consumer secret"
-#~ msgstr "Hemlighet för konsument"
-
-#~ msgid "Request token URL"
-#~ msgstr "URL för begäran-token"
-
-#~ msgid "Access token URL"
-#~ msgstr "URL för åtkomst-token"
-
-#~ msgid "Authorize URL"
-#~ msgstr "Tillåt URL"
-
-#~ msgid "Jabber"
-#~ msgstr "Jabber"
-
-#~ msgid "Photo"
-#~ msgstr "Foto"
-
-#~ msgid "Other options"
-#~ msgstr "Övriga alternativ"
-
-#~ msgid "Other"
-#~ msgstr "Övrigt"
-
-#~ msgid "Primary site navigation"
-#~ msgstr "Primär webbplatsnavigation"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Personal profile and friends timeline"
-#~ msgstr "Personlig profil och vänners tidslinje"
-
-#~ msgctxt "MENU"
-#~ msgid "Personal"
-#~ msgstr "Personligt"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Change your email, avatar, password, profile"
-#~ msgstr "Ändra din e-post, avatar, lösenord, profil"
-
-#~ msgid "Account"
-#~ msgstr "Konto"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Connect to services"
-#~ msgstr "Anslut till tjänster"
-
-#~ msgid "Connect"
-#~ msgstr "Anslut"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Change site configuration"
-#~ msgstr "Ändra webbplatskonfiguration"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Invite friends and colleagues to join you on %s"
-#~ msgstr "Bjud in vänner och kollegor att gå med dig på %s"
-
-#~ msgctxt "MENU"
-#~ msgid "Invite"
-#~ msgstr "Bjud in"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Create an account"
-#~ msgstr "Skapa ett konto"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Help me!"
-#~ msgstr "Hjälp mig!"
-
-#~ msgctxt "MENU"
-#~ msgid "Help"
-#~ msgstr "Hjälp"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Search for people or text"
-#~ msgstr "Sök efter personer eller text"
-
-#~ msgid "Local views"
-#~ msgstr "Lokala vyer"
-
-#~ msgid "Page notice"
-#~ msgstr "Sidnotis"
-
-#~ msgid "Secondary site navigation"
-#~ msgstr "Sekundär webbplatsnavigation"
-
-#~ msgid "StatusNet software license"
-#~ msgstr "Programvarulicens för StatusNet"
-
-#~ msgid "Site content license"
-#~ msgstr "Licens för webbplatsinnehåll"
-
-#~ msgid "Pagination"
-#~ msgstr "Numrering av sidor"
-
-#~ msgid "Author"
-#~ msgstr "Författare"
-
-#~ msgid "Provider"
-#~ msgstr "Tillhandahållare"
-
-#~ msgctxt "MENU"
-#~ msgid "SMS"
-#~ msgstr "SMS"
-
-#~ msgid "Filter tags"
-#~ msgstr "Filtrera taggar"
-
-#~ msgid "[%s]"
-#~ msgstr "[%s]"
-
-#~ msgid "Available characters"
-#~ msgstr "Tillgängliga tecken"
-
-#, fuzzy
-#~ msgctxt "MENU"
-#~ msgid "Profile"
-#~ msgstr "Profil"
-
-#~ msgid "Search help"
-#~ msgstr "Sök hjälp"
-
-#, fuzzy
-#~ msgid "Message too long. Maximum is %1$d character, you sent %2$d."
-#~ msgid_plural "Message too long. Maximum is %1$d characters, you sent %2$d."
-#~ msgstr[0] "Meddelande för långt - maximum är %1$d tecken, du skickade %2$d."
-#~ msgstr[1] "Meddelande för långt - maximum är %1$d tecken, du skickade %2$d."
+#~ msgctxt "BUTTON"
+#~ msgid "Comment"
+#~ msgstr "Innehåll"
diff --git a/locale/te/LC_MESSAGES/statusnet.po b/locale/te/LC_MESSAGES/statusnet.po
index eeb5234edf..e2c657b3a3 100644
--- a/locale/te/LC_MESSAGES/statusnet.po
+++ b/locale/te/LC_MESSAGES/statusnet.po
@@ -10,67 +10,57 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:23+0000\n"
-"PO-Revision-Date: 2011-03-03 17:26:28+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:39+0000\n"
 "Language-Team: Telugu <http://translatewiki.net/wiki/Portal:te>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: te\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-02-25 23:49:23+0000\n"
+"X-POT-Import-Date: 2011-03-03 17:59:19+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
-#: actions/accessadminpanel.php:53 lib/adminpanelaction.php:363
 msgid "Access"
 msgstr "అందుబాటు"
 
 #. TRANS: Page notice.
-#: actions/accessadminpanel.php:64
 msgid "Site access settings"
 msgstr "సైటు అందుబాటు అమరికలు"
 
 #. TRANS: Form legend for registration form.
-#: actions/accessadminpanel.php:151
 msgid "Registration"
 msgstr "నమోదు"
 
 #. TRANS: Checkbox instructions for admin setting "Private".
-#: actions/accessadminpanel.php:155
 msgid "Prohibit anonymous users (not logged in) from viewing site?"
 msgstr "అజ్ఞాత (ప్రవేశించని) వాడుకరులని సైటుని చూడకుండా నిషేధించాలా?"
 
 #. TRANS: Checkbox label for prohibiting anonymous users from viewing site.
-#: actions/accessadminpanel.php:157
 msgctxt "LABEL"
 msgid "Private"
 msgstr "అంతరంగికం"
 
 #. TRANS: Checkbox instructions for admin setting "Invite only".
-#: actions/accessadminpanel.php:164
 msgid "Make registration invitation only."
 msgstr "ఆహ్వానితులు మాత్రమే నమోదు అవ్వగలిగేలా చెయ్యి."
 
 #. TRANS: Checkbox label for configuring site as invite only.
-#: actions/accessadminpanel.php:166
 msgid "Invite only"
 msgstr "ఆహ్వానితులకు మాత్రమే"
 
 #. TRANS: Checkbox instructions for admin setting "Closed" (no new registrations).
-#: actions/accessadminpanel.php:173
 msgid "Disable new registrations."
 msgstr "కొత్త నమోదులను అచేతనంచేయి."
 
 #. TRANS: Checkbox label for disabling new user registrations.
-#: actions/accessadminpanel.php:175
 msgid "Closed"
 msgstr "మూసివేయబడింది"
 
 #. TRANS: Title for button to save access settings in site admin panel.
-#: actions/accessadminpanel.php:191
 msgid "Save access settings"
 msgstr "అందుబాటు అమరికలను భద్రపరచు"
 
@@ -78,6 +68,7 @@ msgstr "అందుబాటు అమరికలను భద్రపరచ
 #. TRANS: Button text for saving theme settings.
 #. TRANS: Button label to save e-mail preferences.
 #. TRANS: Button label to save IM preferences.
+#. TRANS: Button text in the license admin panel.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
 #. TRANS: Button text for saving site notice in admin panel.
@@ -87,21 +78,12 @@ msgstr "అందుబాటు అమరికలను భద్రపరచ
 #. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
 #. TRANS: Button text on profile design page to save settings.
-#: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
-#: actions/emailsettings.php:251 actions/imsettings.php:199
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:198
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:204
-#: actions/subscriptions.php:261 actions/urlsettings.php:152
-#: actions/useradminpanel.php:298 lib/applicationeditform.php:355
-#: lib/designform.php:320 lib/groupeditform.php:201
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "భద్రపరచు"
 
 #. TRANS: Server error when page not found (404).
 #. TRANS: Server error when page not found (404)
-#: actions/all.php:68 actions/public.php:98 actions/replies.php:93
-#: actions/showfavorites.php:140 actions/tag.php:52
 msgid "No such page."
 msgstr "అటువంటి పేజీ లేదు."
 
@@ -120,6 +102,7 @@ msgstr "అటువంటి పేజీ లేదు."
 #. TRANS: Client error displayed when checking group membership for a non-existing user.
 #. TRANS: Client error displayed when trying to have a non-existing user join a group.
 #. TRANS: Client error displayed when trying to have a non-existing user leave a group.
+#. TRANS: Client error displayed when not providing a user or an invalid user.
 #. TRANS: Client error displayed when updating a status for a non-existing user.
 #. TRANS: Client error displayed when requesting a list of followers for a non-existing user.
 #. TRANS: Client error displayed when requesting most recent favourite notices by a user for a non-existing user.
@@ -132,6 +115,8 @@ msgstr "అటువంటి పేజీ లేదు."
 #. 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.
 #. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
@@ -139,33 +124,10 @@ msgstr "అటువంటి పేజీ లేదు."
 #. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when calling a profile action without specifying a user.
-#: actions/all.php:80 actions/allrss.php:69
-#: actions/apiaccountupdatedeliverydevice.php:110
-#: actions/apiaccountupdateprofile.php:103
-#: actions/apiaccountupdateprofilebackgroundimage.php:118
-#: actions/apiaccountupdateprofileimage.php:104 actions/apiatomservice.php:59
-#: actions/apiblockcreate.php:96 actions/apiblockdestroy.php:94
-#: actions/apidirectmessage.php:75 actions/apidirectmessagenew.php:72
-#: actions/apigroupcreate.php:111 actions/apigroupismember.php:89
-#: actions/apigroupjoin.php:98 actions/apigroupleave.php:98
-#: actions/apigrouplist.php:70 actions/apigroupprofileupdate.php:108
-#: actions/apistatusesupdate.php:230 actions/apisubscriptions.php:85
-#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:173
-#: actions/apitimelinehome.php:78 actions/apitimelinementions.php:77
-#: actions/apitimelineuser.php:79 actions/avatarbynickname.php:79
-#: actions/favoritesrss.php:72 actions/foaf.php:42 actions/foaf.php:61
-#: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116
-#: actions/otp.php:78 actions/remotesubscribe.php:144
-#: actions/remotesubscribe.php:153 actions/replies.php:73
-#: actions/repliesrss.php:38 actions/rsd.php:113 actions/showfavorites.php:106
-#: actions/userbyid.php:75 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/userxrd.php:59 actions/xrds.php:71 lib/command.php:509
-#: lib/galleryaction.php:59 lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "అటువంటి వాడుకరి లేరు."
 
 #. TRANS: Page title. %1$s is user nickname, %2$d is page number
-#: actions/all.php:91
 #, php-format
 msgid "%1$s and friends, page %2$d"
 msgstr "%1$s మరియు మిత్రులు, పేజీ %2$d"
@@ -174,33 +136,26 @@ msgstr "%1$s మరియు మిత్రులు, పేజీ %2$d"
 #. TRANS: H1 text for page. %s is a user nickname.
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Timeline title for user and friends. %s is a user nickname.
-#: actions/all.php:94 actions/all.php:191 actions/allrss.php:117
-#: actions/apitimelinefriends.php:207 actions/apitimelinehome.php:113
-#: lib/personalgroupnav.php:100
 #, php-format
 msgid "%s and friends"
 msgstr "%s మరియు మిత్రులు"
 
 #. TRANS: %s is user nickname.
-#: actions/all.php:108
 #, php-format
 msgid "Feed for friends of %s (RSS 1.0)"
 msgstr "%s యొక్క మిత్రుల ఫీడు (RSS 1.0)"
 
 #. TRANS: %s is user nickname.
-#: actions/all.php:117
 #, php-format
 msgid "Feed for friends of %s (RSS 2.0)"
 msgstr "%s యొక్క మిత్రుల ఫీడు (RSS 2.0)"
 
 #. TRANS: %s is user nickname.
-#: actions/all.php:126
 #, php-format
 msgid "Feed for friends of %s (Atom)"
 msgstr "%s యొక్క మిత్రుల ఫీడు (ఆటమ్)"
 
 #. TRANS: Empty list message. %s is a user nickname.
-#: actions/all.php:139
 #, php-format
 msgid ""
 "This is the timeline for %s and friends but no one has posted anything yet."
@@ -208,7 +163,6 @@ msgstr "ఇది %s మరియు మిత్రుల కాలరేఖ 
 
 #. TRANS: Encouragement displayed on logged in user's empty timeline.
 #. TRANS: This message contains Markdown links. Keep "](" together.
-#: actions/all.php:146
 #, php-format
 msgid ""
 "Try subscribing to more people, [join a group](%%action.groups%%) or post "
@@ -217,7 +171,6 @@ msgstr "ఇతరులకి చందా చేరండి, [ఏదైనా
 
 #. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@".
 #. TRANS: This message contains Markdown links. Keep "](" together.
-#: actions/all.php:150
 #, php-format
 msgid ""
 "You can try to [nudge %1$s](../%2$s) from their profile or [post something "
@@ -230,7 +183,6 @@ msgstr ""
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
 #. TRANS: Second sentence of empty message for anonymous users. %s is a user nickname.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:221
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -239,14 +191,11 @@ msgstr ""
 "[ఒక ఖాతాని నమోదుచేసుకుని](%%%%action.register%%%%) %sని కదపండి లేదా వారికి ఒక టపాని పంపించండి!"
 
 #. TRANS: H1 text for page when viewing a list for self.
-#: actions/all.php:188
 msgid "You and friends"
 msgstr "మీరు మరియు మీ స్నేహితులు"
 
 #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
 #. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name.
-#: actions/allrss.php:122 actions/apitimelinefriends.php:213
-#: actions/apitimelinehome.php:119
 #, php-format
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr "%2$sలో %1$s మరియు స్నేహితుల నుండి తాజాకరణలు!"
@@ -265,55 +214,20 @@ msgstr "%2$sలో %1$s మరియు స్నేహితుల నుండ
 #. TRANS: Client error displayed trying to execute an unknown API method checking group membership.
 #. TRANS: Client error displayed trying to execute an unknown API method listing the latest 20 groups.
 #. TRANS: Client error displayed trying to execute an unknown API method showing group membership.
+#. TRANS: Client error displayed when using an unsupported API format.
 #. TRANS: Client error displayed trying to execute an unknown API method showing a group.
 #. TRANS: Client error displayed trying to execute an unknown API method testing API connectivity.
 #. TRANS: Client error displayed trying to execute an unknown API method deleting a status.
 #. TRANS: Client error displayed when trying to handle an unknown API method.
-#: actions/apiaccountratelimitstatus.php:69
-#: actions/apiaccountupdatedeliverydevice.php:92
-#: actions/apiaccountupdateprofile.php:94
-#: actions/apiaccountupdateprofilebackgroundimage.php:92
-#: actions/apiaccountupdateprofilecolors.php:115
-#: actions/apiaccountverifycredentials.php:68 actions/apidirectmessage.php:157
-#: actions/apifavoritecreate.php:98 actions/apifavoritedestroy.php:98
-#: actions/apifriendshipscreate.php:99 actions/apifriendshipsdestroy.php:99
-#: actions/apifriendshipsshow.php:124 actions/apigroupcreate.php:138
-#: actions/apigroupismember.php:115 actions/apigroupjoin.php:151
-#: actions/apigroupleave.php:141 actions/apigrouplist.php:134
-#: actions/apigrouplistall.php:120 actions/apigroupmembership.php:105
-#: actions/apigroupprofileupdate.php:100 actions/apigroupprofileupdate.php:213
-#: actions/apigroupshow.php:114 actions/apihelptest.php:84
-#: actions/apistatusesdestroy.php:101 actions/apistatusesretweets.php:110
-#: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:139
-#: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
-#: actions/apitimelinefavorites.php:182 actions/apitimelinefriends.php:276
-#: actions/apitimelinegroup.php:148 actions/apitimelinehome.php:181
-#: actions/apitimelinementions.php:182 actions/apitimelinepublic.php:247
-#: actions/apitimelineretweetedtome.php:147
-#: actions/apitimelineretweetsofme.php:147 actions/apitimelinetag.php:165
-#: actions/apitimelineuser.php:217 actions/apiusershow.php:100
 msgid "API method not found."
 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.
-#: actions/apiaccountupdatedeliverydevice.php:83
-#: actions/apiaccountupdateprofile.php:85
-#: actions/apiaccountupdateprofilebackgroundimage.php:83
-#: actions/apiaccountupdateprofilecolors.php:106
-#: actions/apiaccountupdateprofileimage.php:80 actions/apiblockcreate.php:87
-#: actions/apiblockdestroy.php:85 actions/apidirectmessagenew.php:107
-#: actions/apifavoritecreate.php:88 actions/apifavoritedestroy.php:88
-#: actions/apifriendshipscreate.php:89 actions/apifriendshipsdestroy.php:89
-#: actions/apigroupcreate.php:102 actions/apigroupjoin.php:89
-#: actions/apigroupleave.php:89 actions/apigroupprofileupdate.php:92
-#: actions/apimediaupload.php:66 actions/apistatusesretweet.php:63
-#: actions/apistatusesupdate.php:194
 msgid "This method requires a POST."
 msgstr ""
 
 #. TRANS: Client error displayed when no valid device parameter is provided for a user's delivery device setting.
-#: actions/apiaccountupdatedeliverydevice.php:103
 msgid ""
 "You must specify a parameter named 'device' with a value of one of: sms, im, "
 "none."
@@ -326,10 +240,6 @@ msgstr ""
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
-#: actions/apiaccountupdatedeliverydevice.php:136
-#: actions/emailsettings.php:353 actions/emailsettings.php:499
-#: actions/profilesettings.php:323 actions/smssettings.php:300
-#: actions/smssettings.php:453 actions/urlsettings.php:211
 msgid "Could not update user."
 msgstr "వాడుకరిని తాజాకరించలేకున్నాం."
 
@@ -342,20 +252,11 @@ msgstr "వాడుకరిని తాజాకరించలేకున
 #. TRANS: Server error displayed when requesting Friends of a Friend feed for a user for which the profile could not be found.
 #. TRANS: Server error displayed when trying to get a user hCard for a user without a profile.
 #. TRANS: Server error displayed when calling a profile action while the specified user does not have a profile.
-#: actions/apiaccountupdateprofile.php:111
-#: actions/apiaccountupdateprofilebackgroundimage.php:199
-#: actions/apiaccountupdateprofilecolors.php:183
-#: actions/apiaccountupdateprofileimage.php:131
-#: actions/apiuserprofileimage.php:88 actions/apiusershow.php:108
-#: actions/avatarbynickname.php:85 actions/foaf.php:69 actions/hcard.php:75
-#: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
-#: lib/profileaction.php:85
 msgid "User has no profile."
 msgstr "వాడుకరికి ప్రొఫైలు లేదు."
 
 #. TRANS: Server error displayed if a user profile could not be saved.
 #. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:419
 #, fuzzy
 msgid "Could not save profile."
 msgstr "ప్రొఫైలుని భద్రపరచలేకున్నాం."
@@ -363,12 +264,6 @@ msgstr "ప్రొఫైలుని భద్రపరచలేకున్
 #. TRANS: Client error displayed when the number of bytes in a POST request exceeds a limit.
 #. TRANS: %s is the number of bytes of the CONTENT_LENGTH.
 #. TRANS: Form validation error in design settings form. POST should remain untranslated.
-#: actions/apiaccountupdateprofilebackgroundimage.php:108
-#: actions/apiaccountupdateprofileimage.php:95 actions/apimediaupload.php:81
-#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
-#: actions/designadminpanel.php:120 actions/editapplication.php:121
-#: actions/newapplication.php:102 actions/newnotice.php:95
-#: lib/designsettings.php:110
 #, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s byte) due to its "
@@ -384,27 +279,16 @@ msgstr[1] ""
 #. TRANS: Client error displayed when a database error occurs inserting profile colours.
 #. TRANS: Client error displayed when a database error occurs updating profile colours.
 #. TRANS: Form validation error displayed when group design settings could not be saved because of an application issue.
-#: actions/apiaccountupdateprofilebackgroundimage.php:138
-#: actions/apiaccountupdateprofilebackgroundimage.php:149
-#: actions/apiaccountupdateprofilecolors.php:160
-#: actions/apiaccountupdateprofilecolors.php:171
-#: actions/groupdesignsettings.php:285 actions/groupdesignsettings.php:296
-#: actions/userdesignsettings.php:218 actions/userdesignsettings.php:228
-#: actions/userdesignsettings.php:270 actions/userdesignsettings.php:280
 msgid "Unable to save your design settings."
 msgstr "మీ రూపురేఖల అమరికలని భద్రపరచలేకున్నాం."
 
 #. TRANS: Error displayed when updating design settings fails.
 #. TRANS: Client error displayed when a database error occurs updating profile colours.
-#: actions/apiaccountupdateprofilebackgroundimage.php:191
-#: actions/apiaccountupdateprofilecolors.php:139
-#: actions/userdesignsettings.php:196
 #, fuzzy
 msgid "Could not update your design."
 msgstr "వాడుకరిని తాజాకరించలేకున్నాం."
 
 #. TRANS: Title for Atom feed.
-#: actions/apiatomservice.php:85
 msgctxt "ATOM"
 msgid "Main"
 msgstr "ప్రధాన"
@@ -413,9 +297,6 @@ msgstr "ప్రధాన"
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Title in atom group notice feed. %s is a group name.
 #. TRANS: Title in atom user notice feed. %s is a user name.
-#: actions/apiatomservice.php:93 actions/grouprss.php:138
-#: actions/userrss.php:94 lib/atomgroupnoticefeed.php:63
-#: lib/atomusernoticefeed.php:88
 #, php-format
 msgid "%s timeline"
 msgstr "%s కాలరేఖ"
@@ -425,8 +306,6 @@ msgstr "%s కాలరేఖ"
 #. TRANS: %s is a user nickname.
 #. TRANS: Header for subscriptions overview for a user (first page).
 #. TRANS: %s is a user nickname.
-#: actions/apiatomservice.php:104 actions/atompubsubscriptionfeed.php:148
-#: actions/subscriptions.php:51
 #, php-format
 msgid "%s subscriptions"
 msgstr "%s చందాలు"
@@ -434,59 +313,49 @@ msgstr "%s చందాలు"
 #. TRANS: Title for Atom feed with a user's favorite notices. %s is a user nickname.
 #. TRANS: Title for Atom favorites feed.
 #. TRANS: %s is a user nickname.
-#: actions/apiatomservice.php:115 actions/atompubfavoritefeed.php:142
 #, php-format
 msgid "%s favorites"
 msgstr "%s ఇష్టాంశాలు"
 
 #. TRANS: Title for Atom feed with a user's memberships. %s is a user nickname.
-#: actions/apiatomservice.php:126
 #, php-format
 msgid "%s memberships"
 msgstr "%s సభ్యత్వాలు"
 
 #. TRANS: Client error displayed when users try to block themselves.
-#: actions/apiblockcreate.php:105
 msgid "You cannot block yourself!"
 msgstr "మిమ్మల్ని మీరే నిరోధించుకోలేరు!"
 
 #. TRANS: Server error displayed when blocking a user has failed.
-#: actions/apiblockcreate.php:127
 msgid "Block user failed."
 msgstr "వాడుకరి నిరోధం విఫలమైంది."
 
 #. TRANS: Server error displayed when unblocking a user has failed.
-#: actions/apiblockdestroy.php:113
 #, fuzzy
 msgid "Unblock user failed."
 msgstr "వాడుకరి నిరోధం విఫలమైంది."
 
 #. TRANS: Title. %s is a user nickname.
-#: actions/apidirectmessage.php:88
 #, php-format
 msgid "Direct messages from %s"
 msgstr "%s నుండి నేరు సందేశాలు"
 
 #. TRANS: Subtitle. %s is a user nickname.
-#: actions/apidirectmessage.php:93
 #, php-format
 msgid "All the direct messages sent from %s"
 msgstr "%s నుండి పంపిన అన్ని నేరు సందేశాలు"
 
 #. TRANS: Title. %s is a user nickname.
-#: actions/apidirectmessage.php:102
 #, php-format
 msgid "Direct messages to %s"
 msgstr "%s కి నేరు సందేశాలు"
 
 #. TRANS: Subtitle. %s is a user nickname.
-#: actions/apidirectmessage.php:107
 #, php-format
 msgid "All the direct messages sent to %s"
 msgstr "%sకి పంపిన అన్ని నేరు సందేశాలు"
 
 #. TRANS: Client error displayed when no message text was submitted (406).
-#: actions/apidirectmessagenew.php:117
 msgid "No message text!"
 msgstr "సందేశపు పాఠ్యం లేదు!"
 
@@ -494,7 +363,6 @@ msgstr "సందేశపు పాఠ్యం లేదు!"
 #. TRANS: %d is the maximum number of characters for a message.
 #. TRANS: Form validation error displayed when message content is too long.
 #. TRANS: %d is the maximum number of characters for a message.
-#: actions/apidirectmessagenew.php:127 actions/newmessage.php:152
 #, fuzzy, php-format
 msgid "That's too long. Maximum message size is %d character."
 msgid_plural "That's too long. Maximum message size is %d characters."
@@ -502,17 +370,14 @@ msgstr[0] "చాలా పొడవుంది. గరిష్ఠ సంద
 msgstr[1] "చాలా పొడవుంది. గరిష్ఠ సందేశ పరిమాణం %d అక్షరాలు."
 
 #. TRANS: Client error displayed if a recipient user could not be found (403).
-#: actions/apidirectmessagenew.php:139
 msgid "Recipient user not found."
 msgstr "అందుకోవాల్సిన వాడుకరి కనబడలేదు."
 
 #. TRANS: Client error displayed trying to direct message another user who's not a friend (403).
-#: actions/apidirectmessagenew.php:144
 msgid "Cannot send direct messages to users who aren't your friend."
 msgstr "మీ స్నేహితులు కాని వాడుకరులకి నేరు సందేశాలు పంపించలేరు."
 
 #. TRANS: Client error displayed trying to direct message self (403).
-#: actions/apidirectmessagenew.php:154
 msgid ""
 "Do not send a message to yourself; just say it to yourself quietly instead."
 msgstr "మీకు మీరే సందేశాన్ని పంపుకోకండి; దాని బదులు మీ చెవిలో మీరే మెల్లగా చెప్పుకోండి."
@@ -520,116 +385,96 @@ 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.
 #. TRANS: Client error displayed trying to delete a status with an invalid ID.
-#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:108
-#: actions/apistatusesdestroy.php:121
 msgid "No status found with that ID."
 msgstr "ఆ IDతో ఏ నోటీసూ కనబడలేదు."
 
 #. TRANS: Client error displayed when trying to mark a notice favourite that already is a favourite.
-#: actions/apifavoritecreate.php:120
 msgid "This status is already a favorite."
 msgstr "ఈ నోటీసు ఇప్పటికే మీ ఇష్టాంశం."
 
 #. TRANS: Client error displayed when marking a notice as favourite fails.
 #. TRANS: Server error displayed when trying to mark a notice as favorite fails in the database.
 #. TRANS: Error message text shown when a favorite could not be set.
-#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:306
 msgid "Could not create favorite."
 msgstr "ఇష్టాంశాన్ని సృష్టించలేకపోయాం."
 
 #. TRANS: Client error displayed when trying to remove a favourite that was not a favourite.
-#: actions/apifavoritedestroy.php:122
 msgid "That status is not a favorite."
 msgstr "ఆ నోటీసు ఇష్టాంశం కాదు."
 
 #. TRANS: Client error displayed when removing a favourite has failed.
 #. TRANS: Server error displayed when removing a favorite from the database fails.
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:90
 msgid "Could not delete favorite."
 msgstr "ఇష్టాంశాన్ని తొలగించలేకపోయాం."
 
 #. TRANS: Client error displayed when trying follow who's profile could not be found.
-#: actions/apifriendshipscreate.php:109
 msgid "Could not follow user: profile not found."
 msgstr "వాడుకరిని అనుసరించలేకపోయాం: %s ఇప్పటికే మీ జాబితాలో ఉన్నారు."
 
 #. TRANS: Client error displayed when trying to follow a user that's already being followed.
 #. TRANS: %s is the nickname of the user that is already being followed.
-#: actions/apifriendshipscreate.php:120
 #, php-format
 msgid "Could not follow user: %s is already on your list."
 msgstr "వాడుకరిని అనుసరించలేకపోయాం: %s ఇప్పటికే మీ జాబితాలో ఉన్నారు."
 
 #. TRANS: Client error displayed when trying to unfollow a user that cannot be found.
-#: actions/apifriendshipsdestroy.php:109
 msgid "Could not unfollow user: User not found."
 msgstr "వాడుకరిని అనుసరించలేకపోయాం: %s ఇప్పటికే మీ జాబితాలో ఉన్నారు."
 
 #. TRANS: Client error displayed when trying to unfollow self.
-#: actions/apifriendshipsdestroy.php:121
 msgid "You cannot unfollow yourself."
 msgstr "మిమ్మల్ని మీరే అననుసరించలేరు."
 
 #. TRANS: Client error displayed when supplying invalid parameters to an API call checking if a friendship exists.
-#: actions/apifriendshipsexists.php:88
 msgid "Two valid IDs or nick names must be supplied."
 msgstr ""
 
 #. TRANS: Client error displayed when a source user could not be determined showing friendship.
-#: actions/apifriendshipsshow.php:131
 msgid "Could not determine source user."
 msgstr "లక్ష్యిత వాడుకరిని కనుగొనలేకపోయాం."
 
 #. TRANS: Client error displayed when a target user could not be determined showing friendship.
-#: actions/apifriendshipsshow.php:140
 msgid "Could not find target user."
 msgstr "లక్ష్యిత వాడుకరిని కనుగొనలేకపోయాం."
 
 #. TRANS: Client error trying to create a group with a nickname this is already in use.
+#. TRANS: API validation exception thrown when nickname is already used.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:156 actions/apigroupprofileupdate.php:255
-#: actions/editgroup.php:191 actions/newgroup.php:137
-#: actions/profilesettings.php:274 actions/register.php:199
 msgid "Nickname already in use. Try another one."
 msgstr "ఆ పేరుని ఇప్పటికే వాడుతున్నారు. మరోటి ప్రయత్నించండి."
 
 #. TRANS: Client error in form for group creation.
+#. TRANS: API validation exception thrown when nickname does not validate.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:164 actions/apigroupprofileupdate.php:259
-#: actions/editgroup.php:195 actions/newgroup.php:141
-#: actions/profilesettings.php:244 actions/register.php:201
 msgid "Not a valid nickname."
 msgstr "సరైన పేరు కాదు."
 
 #. TRANS: Client error in form for group creation.
+#. TRANS: API validation exception thrown when homepage URL does not validate.
 #. TRANS: Validation error shown when providing an invalid homepage URL in the "Edit application" form.
 #. TRANS: Group edit form validation error.
 #. TRANS: Validation error shown when providing an invalid homepage URL in the "New application" form.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:181 actions/apigroupprofileupdate.php:277
-#: actions/editapplication.php:235 actions/editgroup.php:202
-#: actions/newapplication.php:221 actions/newgroup.php:148
-#: actions/profilesettings.php:249 actions/register.php:208
 msgid "Homepage is not a valid URL."
 msgstr "హోమ్ పేజీ URL సరైనది కాదు."
 
 #. TRANS: Client error in form for group creation.
+#. TRANS: API validation exception thrown when full name does not validate.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:191 actions/editgroup.php:206
-#: actions/newgroup.php:152 actions/profilesettings.php:253
-#: actions/register.php:211
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "పూర్తి పేరు చాలా పెద్దగా ఉంది (గరిష్ఠం 255 అక్షరాలు)."
 
 #. TRANS: Client error shown when providing too long a description during group creation.
 #. TRANS: %d is the maximum number of allowed characters.
+#. TRANS: API validation exception thrown when description does not validate.
+#. TRANS: %d is the maximum description length and used for plural.
 #. TRANS: Validation error shown when providing too long a description in the "Edit application" form.
 #. TRANS: %d is the maximum number of allowed characters.
 #. TRANS: Group edit form validation error.
@@ -637,9 +482,6 @@ msgstr "పూర్తి పేరు చాలా పెద్దగా ఉ
 #. TRANS: %d is the maximum number of characters for the description.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed characters.
-#: actions/apigroupcreate.php:201 actions/editapplication.php:202
-#: actions/editgroup.php:211 actions/newapplication.php:182
-#: actions/newgroup.php:157
 #, fuzzy, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."
@@ -647,24 +489,22 @@ msgstr[0] "వివరణ చాలా పెద్దగా ఉంది (%d 
 msgstr[1] "వివరణ చాలా పెద్దగా ఉంది (%d అక్షరాలు గరిష్ఠం)."
 
 #. TRANS: Client error shown when providing too long a location during group creation.
+#. TRANS: API validation exception thrown when location does not validate.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:215 actions/editgroup.php:218
-#: actions/newgroup.php:164 actions/profilesettings.php:266
-#: actions/register.php:220
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
 msgstr "ప్రాంతం పేరు మరీ పెద్దగా ఉంది (255 అక్షరాలు గరిష్ఠం)."
 
 #. TRANS: Client error shown when providing too many aliases during group creation.
 #. TRANS: %d is the maximum number of allowed aliases.
+#. TRANS: API validation exception thrown when aliases do not validate.
+#. TRANS: %d is the maximum number of aliases and used for plural.
 #. TRANS: Group edit form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.
-#: actions/apigroupcreate.php:236 actions/editgroup.php:231
-#: actions/newgroup.php:177
 #, fuzzy, php-format
 msgid "Too many aliases! Maximum %d allowed."
 msgid_plural "Too many aliases! Maximum %d allowed."
@@ -673,25 +513,24 @@ msgstr[1] "చాలా మారుపేర్లు! %d గరిష్ఠం
 
 #. TRANS: Client error shown when providing an invalid alias during group creation.
 #. TRANS: %s is the invalid alias.
-#: actions/apigroupcreate.php:253
+#. TRANS: API validation exception thrown when aliases does not validate.
+#. TRANS: %s is the invalid alias.
 #, php-format
 msgid "Invalid alias: \"%s\"."
 msgstr "తప్పుడు మారుపేరు: \"%s\"."
 
 #. TRANS: Client error displayed when trying to use an alias during group creation that is already in use.
 #. TRANS: %s is the alias that is already in use.
+#. TRANS: API validation exception thrown when aliases is already used.
+#. TRANS: %s is the already used alias.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error. %s is the already used alias.
-#: actions/apigroupcreate.php:264 actions/apigroupprofileupdate.php:351
-#: actions/editgroup.php:246 actions/newgroup.php:193
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "\"%s\" అన్న మారుపేరుని ఇప్పటికే వాడుతున్నారు. మరొకటి ప్రయత్నించండి."
 
 #. TRANS: Client error displayed when trying to use an alias during group creation that is the same as the group's nickname.
 #. TRANS: Group edit form validation error.
-#: actions/apigroupcreate.php:278 actions/apigroupprofileupdate.php:359
-#: actions/editgroup.php:253
 msgid "Alias can't be the same as nickname."
 msgstr "మారుపేరు పేరుతో సమానంగా ఉండకూడదు."
 
@@ -699,26 +538,21 @@ msgstr "మారుపేరు పేరుతో సమానంగా ఉం
 #. TRANS: Client error displayed when trying to join a group that does not exist.
 #. TRANS: Client error displayed when trying to leave a group that does not exist.
 #. TRANS: Client error displayed trying to show group membership on a non-existing group.
+#. TRANS: Client error displayed when not providing a group or an invalid group.
 #. TRANS: Client error displayed when trying to show a group that could not be found.
 #. TRANS: Client error displayed requesting most recent notices to a group for a non-existing group.
-#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
-#: actions/apigroupleave.php:104 actions/apigroupmembership.php:71
-#: actions/apigroupprofileupdate.php:113 actions/apigroupshow.php:81
-#: actions/apitimelinegroup.php:89
 msgid "Group not found."
 msgstr "గుంపు దొరకలేదు."
 
 #. TRANS: Server error displayed when trying to join a group the user is already a member of.
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:345
 msgid "You are already a member of that group."
 msgstr "మీరు ఇప్పటికే ఆ గుంపులో సభ్యులు."
 
 #. TRANS: Server error displayed when trying to join a group the user is blocked from joining.
 #. 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.
-#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:350
 msgid "You have been blocked from that group by the admin."
 msgstr "నిర్వాహకులు ఆ గుంపు నుండి మిమ్మల్ని నిరోధించారు."
 
@@ -726,13 +560,11 @@ msgstr "నిర్వాహకులు ఆ గుంపు నుండి 
 #. TRANS: %1$s is the joining user's nickname, $2$s is the group nickname for which the join failed.
 #. TRANS: Message given having failed to add a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:136 actions/joingroup.php:139 lib/command.php:362
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "వాడుకరి %1$sని %2$s గుంపులో చేర్చలేకపోయాం"
 
 #. TRANS: Server error displayed when trying to leave a group the user is not a member of.
-#: actions/apigroupleave.php:115
 msgid "You are not a member of this group."
 msgstr "మీరు ఈ గుంపులో సభ్యులు కాదు."
 
@@ -740,116 +572,79 @@ msgstr "మీరు ఈ గుంపులో సభ్యులు కాద
 #. TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
 #. TRANS: Message given having failed to remove a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupleave.php:127 actions/leavegroup.php:133
-#: lib/command.php:410
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
 msgstr "వాడుకరి %1$sని %2$s గుంపు నుండి తొలగించలేకపోయాం."
 
 #. TRANS: Used as title in check for group membership. %s is a user name.
-#: actions/apigrouplist.php:94
 #, php-format
 msgid "%s's groups"
 msgstr "%s యొక్క గుంపులు"
 
 #. TRANS: Used as subtitle in check for group membership. %1$s is a user name, %2$s is the site name.
-#: actions/apigrouplist.php:104
 #, php-format
 msgid "%1$s groups %2$s is a member of."
 msgstr "%2$s సభ్యులుగా ఉన్న %2$s గుంపులు."
 
 #. TRANS: Message is used as a title when listing the lastest 20 groups. %s is a site name.
 #. TRANS: Message is used as a page title. %s is a nick name.
-#: actions/apigrouplistall.php:88 actions/usergroups.php:63
 #, php-format
 msgid "%s groups"
 msgstr "%s గుంపులు"
 
 #. TRANS: Message is used as a subtitle when listing the lastest 20 groups. %s is a site name.
-#: actions/apigrouplistall.php:93
 #, php-format
 msgid "groups on %s"
 msgstr "%s పై గుంపులు"
 
+#. TRANS: Client error displayed when trying to edit a group without being an admin.
 #. TRANS: Client error displayed trying to edit a group while not being a group admin.
 #. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
 #. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
-#: actions/apigroupprofileupdate.php:118 actions/editgroup.php:110
-#: actions/editgroup.php:176 actions/groupdesignsettings.php:109
-#: actions/grouplogo.php:111
 msgid "You must be an admin to edit the group."
 msgstr "గుంపుని మార్చడానికి మీరు నిర్వాహకులయి ఉండాలి."
 
+#. TRANS: Server error displayed when group update fails.
 #. TRANS: Server error displayed when editing a group fails.
-#: actions/apigroupprofileupdate.php:171 actions/editgroup.php:274
 msgid "Could not update group."
 msgstr "గుంపుని తాజాకరించలేకున్నాం."
 
+#. TRANS: Server error displayed when adding group aliases fails.
 #. TRANS: Server error displayed when group aliases could not be added.
 #. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/apigroupprofileupdate.php:194 actions/editgroup.php:281
-#: classes/User_group.php:540
 msgid "Could not create aliases."
 msgstr "మారుపేర్లని సృష్టించలేకపోయాం."
 
+#. TRANS: API validation exception thrown when nickname does not validate.
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: actions/apigroupprofileupdate.php:249 lib/nickname.php:165
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr "పేరులో చిన్నబడి అక్షరాలు మరియు అంకెలు మాత్రమే ఖాళీలు లేకుండా ఉండాలి."
 
-#: actions/apigroupprofileupdate.php:286
-#, fuzzy
-msgid "Full name is too long (max 255 chars)."
-msgstr "పూర్తి పేరు చాలా పెద్దగా ఉంది (గరిష్ఠం 255 అక్షరాలు)."
-
-#: actions/apigroupprofileupdate.php:296
-#, fuzzy, php-format
-msgid "description is too long (max %d chars)."
-msgstr "వివరణ చాలా పెద్దగా ఉంది (%d అక్షరాలు గరిష్ఠం)."
-
-#: actions/apigroupprofileupdate.php:307
-#, fuzzy
-msgid "Location is too long (max 255 chars)."
-msgstr "ప్రాంతం పేరు మరీ పెద్దగా ఉంది (255 అక్షరాలు గరిష్ఠం)."
-
-#: actions/apigroupprofileupdate.php:326
-#, fuzzy, php-format
-msgid "Too many aliases! Maximum %d."
-msgstr "చాలా మారుపేర్లు! %d గరిష్ఠం."
-
-#. TRANS: Group edit form validation error.
+#. TRANS: API validation exception thrown when alias is the same as nickname.
 #. TRANS: Group create form validation error.
-#. TRANS: %s is the invalid alias.
-#: actions/apigroupprofileupdate.php:342 actions/editgroup.php:241
-#: actions/newgroup.php:188
-#, php-format
-msgid "Invalid alias: \"%s\""
-msgstr "తప్పుడు మారుపేరు: \"%s\""
+#, fuzzy
+msgid "Alias cannot be the same as nickname."
+msgstr "మారుపేరు పేరుతో సమానంగా ఉండకూడదు."
 
 #. TRANS: Client error displayed when uploading a media file has failed.
-#: actions/apimediaupload.php:101
 msgid "Upload failed."
 msgstr "ఎక్కింపు విఫలమైంది."
 
 #. TRANS: Client error given from the OAuth API when the request token or verifier is invalid.
-#: actions/apioauthaccesstoken.php:102
 #, fuzzy
 msgid "Invalid request token or verifier."
 msgstr "సందేశపు విషయం సరైనది కాదు"
 
 #. TRANS: Client error given when no oauth_token was passed to the OAuth API.
-#: actions/apioauthauthorize.php:107
 msgid "No oauth_token parameter provided."
 msgstr ""
 
 #. TRANS: Client error given when an invalid request token was passed to the OAuth API.
-#: actions/apioauthauthorize.php:115 actions/apioauthauthorize.php:129
 #, fuzzy
 msgid "Invalid request token."
 msgstr "తప్పుడు పాత్ర."
 
 #. TRANS: Client error given when an invalid request token was passed to the OAuth API.
-#: actions/apioauthauthorize.php:121
 #, fuzzy
 msgid "Request token already authorized."
 msgstr "మీకు అధీకరణ లేదు."
@@ -860,31 +655,14 @@ msgstr "మీకు అధీకరణ లేదు."
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
 #. TRANS: Client error displayed when the session token is not okay.
-#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:75
-#: actions/emailsettings.php:292 actions/favor.php:75 actions/geocode.php:55
-#: actions/groupblock.php:65 actions/grouplogo.php:321
-#: actions/groupunblock.php:65 actions/imsettings.php:241
-#: actions/invite.php:60 actions/makeadmin.php:66 actions/newmessage.php:135
-#: actions/newnotice.php:105 actions/nudge.php:80
-#: actions/oauthappssettings.php:162 actions/oauthconnectionssettings.php:135
-#: actions/passwordsettings.php:137 actions/pluginenable.php:87
-#: actions/profilesettings.php:218 actions/recoverpassword.php:383
-#: actions/register.php:157 actions/remotesubscribe.php:76
-#: actions/repeat.php:82 actions/smssettings.php:249 actions/subedit.php:40
-#: actions/subscribe.php:87 actions/tagother.php:145
-#: actions/unsubscribe.php:69 actions/urlsettings.php:171
-#: actions/userauthorization.php:53 lib/designsettings.php:122
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 
 #. TRANS: Form validation error given when an invalid username and/or password was passed to the OAuth API.
-#: actions/apioauthauthorize.php:168
 msgid "Invalid nickname / password!"
 msgstr "తప్పుడు పేరు / సంకేతపదం!"
 
 #. TRANS: Server error displayed when a database action fails.
-#: actions/apioauthauthorize.php:217
 #, fuzzy
 msgid "Database error inserting oauth_token_association."
 msgstr "అవతారాన్ని పెట్టడంలో పొరపాటు"
@@ -901,28 +679,19 @@ msgstr "అవతారాన్ని పెట్టడంలో పొరప
 #. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
 #. TRANS: Message given submitting a form with an unknown action in SMS settings.
 #. TRANS: Unknown form validation error in design settings form.
-#: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
-#: actions/designadminpanel.php:100 actions/editapplication.php:144
-#: actions/emailsettings.php:311 actions/grouplogo.php:332
-#: actions/imsettings.php:256 actions/newapplication.php:124
-#: actions/oauthconnectionssettings.php:144 actions/recoverpassword.php:46
-#: actions/smssettings.php:270 lib/designsettings.php:133
 msgid "Unexpected form submission."
 msgstr ""
 
 #. TRANS: Title for a page where a user can confirm/deny account access by an external application.
-#: actions/apioauthauthorize.php:387
 msgid "An application would like to connect to your account"
 msgstr "ఒక ఉపకరణం మీ ఖాతాకి అనుసంధానమవ్వాలనుకుంటూంది."
 
 #. TRANS: Fieldset legend.
-#: actions/apioauthauthorize.php:404
 msgid "Allow or deny access"
 msgstr "అనుమతిని ఇవ్వండి లేదా తిరస్కరించండి"
 
 #. TRANS: User notification of external application requesting account access.
 #. TRANS: %3$s is the access type requested (read-write or read-only), %4$s is the StatusNet sitename.
-#: actions/apioauthauthorize.php:425
 #, php-format
 msgid ""
 "An application would like the ability to <strong>%3$s</strong> your %4$s "
@@ -933,7 +702,6 @@ msgstr ""
 #. TRANS: User notification of external application requesting account access.
 #. TRANS: %1$s is the application name requesting access, %2$s is the organisation behind the application,
 #. TRANS: %3$s is the access type requested, %4$s is the StatusNet sitename.
-#: actions/apioauthauthorize.php:433
 #, php-format
 msgid ""
 "The application <strong>%1$s</strong> by <strong>%2$s</strong> would like "
@@ -942,22 +710,18 @@ msgid ""
 msgstr ""
 
 #. TRANS: Fieldset legend.
-#: actions/apioauthauthorize.php:455
 msgctxt "LEGEND"
 msgid "Account"
 msgstr "ఖాతా"
 
 #. TRANS: Field label on OAuth API authorisation form.
+#. TRANS: Field label on login page.
 #. TRANS: Field label in form for profile settings.
-#: actions/apioauthauthorize.php:459 actions/login.php:225
-#: actions/profilesettings.php:107 actions/register.php:411
-#: actions/userauthorization.php:145 lib/groupeditform.php:145
 msgid "Nickname"
 msgstr "పేరు"
 
 #. TRANS: Field label on OAuth API authorisation form.
-#: actions/apioauthauthorize.php:463 actions/login.php:228
-#: actions/register.php:415 lib/settingsnav.php:87
+#. TRANS: Field label on login page.
 msgid "Password"
 msgstr "సంకేతపదం"
 
@@ -967,45 +731,36 @@ msgstr "సంకేతపదం"
 #. TRANS: Button label to cancel an IM address confirmation procedure.
 #. TRANS: Button label to cancel a SMS address confirmation procedure.
 #. TRANS: Button label in the "Edit application" form.
-#: actions/apioauthauthorize.php:478 actions/emailsettings.php:125
-#: actions/imsettings.php:136 actions/smssettings.php:132
-#: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Cancel"
 msgstr "రద్దుచేయి"
 
 #. TRANS: Button text that when clicked will allow access to an account by an external application.
-#: actions/apioauthauthorize.php:485
 msgctxt "BUTTON"
 msgid "Allow"
 msgstr "అనుమతించు"
 
 #. TRANS: Form instructions.
-#: actions/apioauthauthorize.php:502
 #, fuzzy
 msgid "Authorize access to your account information."
 msgstr "మీ ఖాతా సమాచారాన్ని సంప్రాపించడానికి అనుమతించండి లేదా నిరాకరించండి."
 
 #. TRANS: Header for user notification after revoking OAuth access to an application.
-#: actions/apioauthauthorize.php:594
 msgid "Authorization canceled."
 msgstr "అధీకరణ రద్దయింది."
 
 #. TRANS: User notification after revoking OAuth access to an application.
 #. TRANS: %s is an OAuth token.
-#: actions/apioauthauthorize.php:598
 #, php-format
 msgid "The request token %s has been revoked."
 msgstr ""
 
 #. TRANS: Title of the page notifying the user that an anonymous client application was successfully authorized to access the user's account with OAuth.
-#: actions/apioauthauthorize.php:621
 #, fuzzy
 msgid "You have successfully authorized the application"
 msgstr "మీకు అధీకరణ లేదు."
 
 #. TRANS: Message notifying the user that an anonymous client application was successfully authorized to access the user's account with OAuth.
-#: actions/apioauthauthorize.php:625
 msgid ""
 "Please return to the application and enter the following security code to "
 "complete the process."
@@ -1013,14 +768,12 @@ msgstr ""
 
 #. TRANS: Title of the page notifying the user that the client application was successfully authorized to access the user's account with OAuth.
 #. TRANS: %s is the authorised application name.
-#: actions/apioauthauthorize.php:632
 #, fuzzy, php-format
 msgid "You have successfully authorized %s"
 msgstr "మీకు అధీకరణ లేదు."
 
 #. TRANS: Message notifying the user that the client application was successfully authorized to access the user's account with OAuth.
 #. TRANS: %s is the authorised application name.
-#: actions/apioauthauthorize.php:639
 #, php-format
 msgid ""
 "Please return to %s and enter the following security code to complete the "
@@ -1029,12 +782,10 @@ msgstr ""
 
 #. TRANS: Client error displayed trying to delete a status not using POST or DELETE.
 #. TRANS: POST and DELETE should not be translated.
-#: actions/apistatusesdestroy.php:111
 msgid "This method requires a POST or DELETE."
 msgstr ""
 
 #. TRANS: Client error displayed trying to delete a status of another user.
-#: actions/apistatusesdestroy.php:136
 msgid "You may not delete another user's status."
 msgstr "ఇతర వాడుకరుల స్థితిని మీరు తొలగించలేరు."
 
@@ -1042,21 +793,16 @@ msgstr "ఇతర వాడుకరుల స్థితిని మీరు
 #. TRANS: Client error displayed trying to display redents of a non-exiting notice.
 #. TRANS: Client exception thrown when referencing a non-existing notice.
 #. TRANS: Error message displayed trying to delete a non-existing notice.
-#: actions/apistatusesretweet.php:74 actions/apistatusesretweets.php:70
-#: actions/atompubshowfavorite.php:82 actions/deletenotice.php:61
-#: actions/shownotice.php:92
 msgid "No such notice."
 msgstr "అటువంటి సందేశమేమీ లేదు."
 
 #. TRANS: Client error displayed trying to repeat an own notice through the API.
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:549
 msgid "Cannot repeat your own notice."
 msgstr "మీ నోటీసుని మీరే పునరావృతించలేరు."
 
 #. TRANS: Client error displayed trying to re-repeat a notice through the API.
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:92 lib/command.php:555
 msgid "Already repeated that notice."
 msgstr "ఇప్పటికే ఆ నోటీసుని పునరావృతించారు."
 
@@ -1066,58 +812,44 @@ msgstr "ఇప్పటికే ఆ నోటీసుని పునరావ
 #. TRANS: Client exception thrown when using an unsupported HTTP method.
 #. TRANS: Client error shown when using a non-supported HTTP method.
 #. TRANS: Client exception thrown when using an unsupported HTTP method.
-#: actions/apistatusesshow.php:118 actions/atompubfavoritefeed.php:103
-#: actions/atompubmembershipfeed.php:105 actions/atompubshowfavorite.php:117
-#: actions/atompubshowmembership.php:116
-#: actions/atompubshowsubscription.php:122
-#: actions/atompubsubscriptionfeed.php:109
 #, fuzzy
 msgid "HTTP method not supported."
 msgstr "నిర్ధారణ సంకేతం కనబడలేదు."
 
 #. TRANS: Exception thrown requesting an unsupported notice output format.
 #. TRANS: %s is the requested output format.
-#: actions/apistatusesshow.php:144
 #, fuzzy, php-format
 msgid "Unsupported format: %s."
 msgstr "%s కి నేరు సందేశాలు"
 
 #. TRANS: Client error displayed requesting a deleted status.
-#: actions/apistatusesshow.php:155
 msgid "Status deleted."
 msgstr "స్థితిని తొలగించాం."
 
 #. TRANS: Client error displayed requesting a status with an invalid ID.
-#: actions/apistatusesshow.php:162
 msgid "No status with that ID found."
 msgstr "ఆ IDతో ఏ నోటీసు కనబడలేదు."
 
 #. TRANS: Client error displayed when trying to delete a notice not using the Atom format.
-#: actions/apistatusesshow.php:227
 msgid "Can only delete using the Atom format."
 msgstr ""
 
 #. TRANS: Client error displayed when a user has no rights to delete notices of other users.
 #. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
-#: actions/apistatusesshow.php:235 actions/deletenotice.php:78
 msgid "Cannot delete this notice."
 msgstr "ఈ నోటీసుని తొలగించలేము."
 
 #. TRANS: Confirmation of notice deletion in API. %d is the ID (number) of the deleted notice.
-#: actions/apistatusesshow.php:249
 #, php-format
 msgid "Deleted notice %d"
 msgstr "%d నోటీసుని తొలగించాం"
 
 #. TRANS: Client error displayed when the parameter "status" is missing.
-#: actions/apistatusesupdate.php:221
 msgid "Client must provide a 'status' parameter with a value."
 msgstr ""
 
 #. TRANS: Client error displayed when the parameter "status" is missing.
 #. TRANS: %d is the maximum number of character for a notice.
-#: actions/apistatusesupdate.php:244 actions/newnotice.php:161
-#: lib/mailhandler.php:60
 #, fuzzy, php-format
 msgid "That's too long. Maximum notice size is %d character."
 msgid_plural "That's too long. Maximum notice size is %d characters."
@@ -1125,14 +857,12 @@ msgstr[0] "అది చాలా పొడవుంది. గరిష్ఠ 
 msgstr[1] "అది చాలా పొడవుంది. గరిష్ఠ నోటీసు పరిమాణం %d అక్షరాలు."
 
 #. TRANS: Client error displayed when replying to a non-existing notice.
-#: actions/apistatusesupdate.php:284
 #, fuzzy
 msgid "Parent notice not found."
 msgstr "నిర్ధారణ సంకేతం కనబడలేదు."
 
 #. TRANS: Client error displayed exceeding the maximum notice length.
 #. TRANS: %d is the maximum lenth for a notice.
-#: actions/apistatusesupdate.php:308 actions/newnotice.php:184
 #, fuzzy, php-format
 msgid "Maximum notice size is %d character, including attachment URL."
 msgid_plural "Maximum notice size is %d characters, including attachment URL."
@@ -1141,13 +871,11 @@ msgstr[1] "గరిష్ఠ నోటీసు పొడవు %d అక్ష
 
 #. TRANS: Client error displayed when requesting profiles of followers in an unsupported format.
 #. TRANS: Client error displayed when requesting IDs of followers in an unsupported format.
-#: actions/apisubscriptions.php:228 actions/apisubscriptions.php:258
 msgid "Unsupported format."
 msgstr ""
 
 #. TRANS: Title for timeline of most recent favourite notices by a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname.
-#: actions/apitimelinefavorites.php:108
 #, php-format
 msgid "%1$s / Favorites from %2$s"
 msgstr "%1$s / %2$s యొక్క ఇష్టాంశాలు"
@@ -1155,14 +883,12 @@ msgstr "%1$s / %2$s యొక్క ఇష్టాంశాలు"
 #. TRANS: Subtitle for timeline of most recent favourite notices by a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user's full name,
 #. TRANS: %3$s is a user nickname.
-#: actions/apitimelinefavorites.php:120
 #, fuzzy, php-format
 msgid "%1$s updates favorited by %2$s / %3$s."
 msgstr "%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.
-#: actions/apitimelinementions.php:115
 #, php-format
 msgid "%1$s / Updates mentioning %2$s"
 msgstr "%1$s / %2$sని పేర్కొన్న నోటీసులు"
@@ -1170,48 +896,40 @@ msgstr "%1$s / %2$sని పేర్కొన్న నోటీసులు"
 #. TRANS: Subtitle for timeline of most recent mentions of a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname,
 #. TRANS: %3$s is a user's full name.
-#: actions/apitimelinementions.php:131
 #, php-format
 msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr ""
 
 #. TRANS: Title for site timeline. %s is the StatusNet sitename.
 #. TRANS: Public RSS feed title. %s is the StatusNet site name.
-#: actions/apitimelinepublic.php:193 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "%s బహిరంగ కాలరేఖ"
 
 #. TRANS: Subtitle for site timeline. %s is the StatusNet sitename.
-#: actions/apitimelinepublic.php:199
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "అందరి నుండి %s తాజాకరణలు!"
 
 #. TRANS: Server error displayed calling unimplemented API method for 'retweeted by me'.
-#: actions/apitimelineretweetedbyme.php:71
 msgid "Unimplemented."
 msgstr "అమలుపరచబడలేదు."
 
 #. TRANS: Title for Atom feed "repeated to me". %s is the user nickname.
-#: actions/apitimelineretweetedtome.php:96
 #, php-format
 msgid "Repeated to %s"
 msgstr "%s యొక్క పునరావృతం"
 
-#: actions/apitimelineretweetedtome.php:98
 #, fuzzy, php-format
 msgid "%1$s notices that were to repeated to %2$s / %3$s."
 msgstr "%s యొక్క మైక్రోబ్లాగు"
 
 #. TRANS: Title of list of repeated notices of the logged in user.
 #. TRANS: %s is the nickname of the logged in user.
-#: actions/apitimelineretweetsofme.php:98
 #, php-format
 msgid "Repeats of %s"
 msgstr "%s యొక్క పునరావృతాలు"
 
-#: actions/apitimelineretweetsofme.php:104
 #, fuzzy, php-format
 msgid "%1$s notices that %2$s / %3$s has repeated."
 msgstr "%2$s నోటీసుని %1$s ఇష్టాంశంగా గుర్తించారు."
@@ -1220,181 +938,148 @@ msgstr "%2$s నోటీసుని %1$s ఇష్టాంశంగా గు
 #. TRANS: %s is the tag.
 #. TRANS: Title for first page of notices with tags.
 #. TRANS: %s is the tag.
-#: actions/apitimelinetag.php:101 actions/tag.php:69
 #, fuzzy, php-format
 msgid "Notices tagged with %s"
 msgstr "%2$sలో %1$s అనే ట్యాగుతో ఉన్న నోటీసులు!"
 
 #. TRANS: Subtitle for timeline with lastest notices with a given tag.
 #. TRANS: %1$s is the tag, $2$s is the StatusNet sitename.
-#: actions/apitimelinetag.php:105 actions/tagrss.php:65
 #, php-format
 msgid "Updates tagged with %1$s on %2$s!"
 msgstr "%2$sలో %1$s అనే ట్యాగుతో ఉన్న నోటీసులు!"
 
 #. TRANS: Client error displayed trying to add a notice to another user's timeline.
-#: actions/apitimelineuser.php:308
 msgid "Only the user can add to their own timeline."
 msgstr "ఆ వాడుకరి మాత్రమే వారి కాలరేఖలో చేర్చగలరు."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:315
 msgid "Only accept AtomPub for Atom feeds."
 msgstr ""
 
 #. TRANS: Client error displayed attempting to post an empty API notice.
-#: actions/apitimelineuser.php:322
 msgid "Atom post must not be empty."
 msgstr ""
 
 #. TRANS: Client error displayed attempting to post an API that is not well-formed XML.
-#: actions/apitimelineuser.php:328
 msgid "Atom post must be well-formed XML."
 msgstr ""
 
 #. TRANS: Client error displayed when not using an Atom entry.
-#: actions/apitimelineuser.php:334 actions/atompubfavoritefeed.php:228
-#: actions/atompubmembershipfeed.php:230
-#: actions/atompubsubscriptionfeed.php:236
 msgid "Atom post must be an Atom entry."
 msgstr ""
 
 #. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
-#: actions/apitimelineuser.php:345
 msgid "Can only handle POST activities."
 msgstr ""
 
 #. TRANS: Client error displayed when using an unsupported activity object type.
 #. TRANS: %s is the unsupported activity object type.
-#: actions/apitimelineuser.php:356
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
 #. TRANS: %d is the notice ID (number).
-#: actions/apitimelineuser.php:390
 #, fuzzy, php-format
 msgid "No content for notice %d."
 msgstr "మీ నోటీసుని మీరే పునరావృతించలేరు."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
 #. TRANS: %s is the notice URI.
-#: actions/apitimelineuser.php:419
 #, fuzzy, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "ఆ ఈమెయిలు చిరునామా లేదా వాడుకరిపేరుతో వాడుకరులెవరూ లేరు."
 
 #. TRANS: Server error for unfinished API method showTrends.
-#: actions/apitrends.php:85
 #, fuzzy
 msgid "API method under construction."
 msgstr "నిర్ధారణ సంకేతం కనబడలేదు."
 
 #. TRANS: Client error displayed when requesting user information for a non-existing user.
-#: actions/apiuserprofileimage.php:80 actions/apiusershow.php:94
 msgid "User not found."
 msgstr "వాడుకరి దొరకలేదు."
 
 #. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
 #. TRANS: Client exception.
 #. TRANS: Client error displayed trying to subscribe to a non-existing profile.
-#: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
-#: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
-#: actions/subscribe.php:110
 #, fuzzy
 msgid "No such profile."
 msgstr "అటువంటి ఫైలు లేదు."
 
 #. TRANS: Subtitle for Atom favorites feed.
 #. TRANS: %1$s is a user nickname, %2$s is the StatusNet sitename.
-#: actions/atompubfavoritefeed.php:147
 #, fuzzy, php-format
 msgid "Notices %1$s has favorited on %2$s"
 msgstr "%2$sలో %1$s మరియు స్నేహితుల నుండి తాజాకరణలు!"
 
 #. TRANS: Client exception thrown when trying to set a favorite for another user.
 #. TRANS: Client exception thrown when trying to subscribe another user.
-#: actions/atompubfavoritefeed.php:217 actions/atompubsubscriptionfeed.php:225
 #, fuzzy
 msgid "Cannot add someone else's subscription."
 msgstr "కొత్త చందాని చేర్చలేకపోయాం."
 
 #. TRANS: Client exception thrown when trying use an incorrect activity verb for the Atom pub method.
-#: actions/atompubfavoritefeed.php:240
 #, fuzzy
 msgid "Can only handle favorite activities."
 msgstr "సైటు గమనికని భద్రపరచు"
 
 #. TRANS: Client exception thrown when trying favorite an object that is not a notice.
-#: actions/atompubfavoritefeed.php:250 actions/atompubmembershipfeed.php:250
 #, fuzzy
 msgid "Can only fave notices."
 msgstr "సైటు గమనికని భద్రపరచు"
 
 #. TRANS: Client exception thrown when trying favorite a notice without content.
-#: actions/atompubfavoritefeed.php:259
 #, fuzzy
 msgid "Unknown note."
 msgstr "తెలియని చర్య"
 
 #. TRANS: Client exception thrown when trying favorite an already favorited notice.
-#: actions/atompubfavoritefeed.php:267
 #, fuzzy
 msgid "Already a favorite."
 msgstr "ఇష్టాంశాలకు చేర్చు"
 
 #. TRANS: Title for group membership feed.
 #. TRANS: %s is a username.
-#: actions/atompubmembershipfeed.php:144
 #, fuzzy, php-format
 msgid "%s group memberships"
 msgstr "%s గుంపు సభ్యులు"
 
 #. TRANS: Subtitle for group membership feed.
 #. TRANS: %1$s is a username, %2$s is the StatusNet sitename.
-#: actions/atompubmembershipfeed.php:149
 #, fuzzy, php-format
 msgid "Groups %1$s is a member of on %2$s"
 msgstr "%s సభ్యులుగా ఉన్న గుంపులు"
 
 #. TRANS: Client exception thrown when trying subscribe someone else to a group.
-#: actions/atompubmembershipfeed.php:219
 #, fuzzy
 msgid "Cannot add someone else's membership."
 msgstr "కొత్త చందాని చేర్చలేకపోయాం."
 
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#: actions/atompubmembershipfeed.php:242
 #, fuzzy
 msgid "Can only handle join activities."
 msgstr "సైటు గమనికని భద్రపరచు"
 
 #. TRANS: Client exception thrown when trying to subscribe to a non-existing group.
-#: actions/atompubmembershipfeed.php:259
 #, fuzzy
 msgid "Unknown group."
 msgstr "తెలియని చర్య"
 
 #. TRANS: Client exception thrown when trying to subscribe to an already subscribed group.
-#: actions/atompubmembershipfeed.php:267
 msgid "Already a member."
 msgstr "ఇప్పటికే సభ్యులు."
 
 #. TRANS: Client exception thrown when trying to subscribe to group while blocked from that group.
-#: actions/atompubmembershipfeed.php:275
 msgid "Blocked by admin."
 msgstr ""
 
 #. TRANS: Client exception thrown when referencing a non-existing favorite.
-#: actions/atompubshowfavorite.php:90
 #, fuzzy
 msgid "No such favorite."
 msgstr "అటువంటి ఫైలు లేదు."
 
 #. TRANS: Client exception thrown when trying to remove a favorite notice of another user.
-#: actions/atompubshowfavorite.php:151
 #, fuzzy
 msgid "Cannot delete someone else's favorite."
 msgstr "ఇష్టాంశాన్ని తొలగించలేకపోయాం."
@@ -1421,92 +1106,67 @@ msgstr "ఇష్టాంశాన్ని తొలగించలేకప
 #. TRANS: Client error displayed when trying to join a non-existing group.
 #. TRANS: Client error displayed when trying to leave a non-local group.
 #. TRANS: Client error displayed when trying to leave a non-existing group.
+#. TRANS: Client error displayed when providing an invalid group ID on the Make Admin page.
 #. 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.
 #. TRANS: Command exception text shown when a group is requested that does not exist.
 #. TRANS: Error text shown when trying to leave a group that does not exist.
-#: actions/atompubshowmembership.php:81 actions/blockedfromgroup.php:81
-#: actions/blockedfromgroup.php:89 actions/deletegroup.php:87
-#: actions/deletegroup.php:100 actions/editgroup.php:102
-#: actions/foafgroup.php:46 actions/foafgroup.php:65 actions/foafgroup.php:73
-#: actions/groupblock.php:89 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:101 actions/grouplogo.php:103
-#: actions/groupmembers.php:84 actions/groupmembers.php:92
-#: actions/grouprss.php:97 actions/grouprss.php:105
-#: actions/groupunblock.php:89 actions/joingroup.php:82
-#: actions/joingroup.php:95 actions/leavegroup.php:82
-#: actions/leavegroup.php:95 actions/makeadmin.php:86
-#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:392
 msgid "No such group."
 msgstr "అటువంటి గుంపు లేదు."
 
 #. TRANS: Client exception thrown when trying to show membership of a non-subscribed group
-#: actions/atompubshowmembership.php:91
 msgid "Not a member."
 msgstr "సభ్యులు కాదు."
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
-#: actions/atompubshowmembership.php:150
 #, fuzzy
 msgid "Cannot delete someone else's membership."
 msgstr "కొత్త చందాని చేర్చలేకపోయాం."
 
 #. TRANS: Client exception thrown when trying to display a subscription for a non-existing profile ID.
 #. TRANS: %d is the non-existing profile ID number.
-#: actions/atompubshowsubscription.php:72
-#: actions/atompubshowsubscription.php:83
-#: actions/atompubsubscriptionfeed.php:74
 #, fuzzy, php-format
 msgid "No such profile id: %d."
 msgstr "అటువంటి ఫైలు లేదు."
 
 #. 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.
-#: actions/atompubshowsubscription.php:94
 #, fuzzy, php-format
 msgid "Profile %1$d not subscribed to profile %2$d."
 msgstr "మీరు ఎవరికీ చందాచేరలేదు."
 
 #. TRANS: Client exception thrown when trying to delete a subscription of another user.
-#: actions/atompubshowsubscription.php:157
 #, fuzzy
 msgid "Cannot delete someone else's subscription."
 msgstr "కొత్త చందాని చేర్చలేకపోయాం."
 
 #. TRANS: Subtitle for Atom subscription feed.
 #. TRANS: %1$s is a user nickname, %s$s is the StatusNet sitename.
-#: actions/atompubsubscriptionfeed.php:153
 #, fuzzy, php-format
 msgid "People %1$s has subscribed to on %2$s"
 msgstr "%sకి చందాచేరిన వ్యక్తులు"
 
 #. TRANS: Client error displayed when not using the follow verb.
-#: actions/atompubsubscriptionfeed.php:248
 msgid "Can only handle Follow activities."
 msgstr ""
 
 #. TRANS: Client exception thrown when subscribing to an object that is not a person.
-#: actions/atompubsubscriptionfeed.php:256
 msgid "Can only follow people."
 msgstr ""
 
 #. TRANS: Client exception thrown when subscribing to a non-existing profile.
 #. TRANS: %s is the unknown profile ID.
-#: actions/atompubsubscriptionfeed.php:267
 #, fuzzy, php-format
 msgid "Unknown profile %s."
 msgstr "తెలియని ఫైలు రకం"
 
 #. TRANS: Client error displayed trying to subscribe to an already subscribed profile.
 #. TRANS: %s is the profile the user already has a subscription on.
-#: actions/atompubsubscriptionfeed.php:275
 #, php-format
 msgid "Already subscribed to %s."
 msgstr "ఇప్పటికే %sకి చందాచేరారు."
 
 #. TRANS: Client error displayed trying to get a non-existing attachment.
-#: actions/attachment.php:73
 msgid "No such attachment."
 msgstr "అటువంటి జోడింపు లేదు."
 
@@ -1518,31 +1178,23 @@ msgstr "అటువంటి జోడింపు లేదు."
 #. TRANS: Client error displayed when trying to view group members without providing a group nickname.
 #. TRANS: Client error displayed when requesting a group RSS feed without providing a group nickname.
 #. TRANS: Client error displayed if no nickname argument was given requesting a group page.
-#: actions/avatarbynickname.php:60 actions/blockedfromgroup.php:73
-#: actions/editgroup.php:85 actions/groupdesignsettings.php:84
-#: actions/grouplogo.php:86 actions/groupmembers.php:76
-#: actions/grouprss.php:89 actions/showgroup.php:116
 msgid "No nickname."
 msgstr "పేరు"
 
 #. TRANS: Client error displayed trying to get an avatar without providing an avatar size.
-#: actions/avatarbynickname.php:66
 msgid "No size."
 msgstr "పరిమాణం లేదు."
 
 #. TRANS: Client error displayed trying to get an avatar providing an invalid avatar size.
-#: actions/avatarbynickname.php:72
 msgid "Invalid size."
 msgstr "తప్పుడు పరిమాణం."
 
 #. TRANS: Title for avatar upload page.
-#: actions/avatarsettings.php:66 lib/settingsnav.php:82
 msgid "Avatar"
 msgstr "అవతారం"
 
 #. TRANS: Instruction for avatar upload page.
 #. TRANS: %s is the maximum file size, for example "500b", "10kB" or "2MB".
-#: actions/avatarsettings.php:78
 #, php-format
 msgid "You can upload your personal avatar. The maximum file size is %s."
 msgstr "మీ వ్యక్తిగత అవతారాన్ని మీరు ఎక్కించవచ్చు. గరిష్ఠ ఫైలు పరిమాణం %s."
@@ -1551,9 +1203,6 @@ msgstr "మీ వ్యక్తిగత అవతారాన్ని మీ
 #. TRANS: Server error displayed coming across a request from a user without a profile.
 #. TRANS: Server error displayed when trying to authorise a remote subscription request
 #. TRANS: while the user has no profile.
-#: actions/avatarsettings.php:108 actions/avatarsettings.php:192
-#: actions/grouplogo.php:184 actions/remotesubscribe.php:190
-#: actions/userauthorization.php:75 actions/userrss.php:108
 #, fuzzy
 msgid "User without matching profile."
 msgstr "వాడుకరికి ప్రొఫైలు లేదు."
@@ -1561,8 +1210,6 @@ msgstr "వాడుకరికి ప్రొఫైలు లేదు."
 #. TRANS: Avatar upload page form legend.
 #. TRANS: Avatar upload page crop form legend.
 #. TRANS: Legend for group logo settings fieldset.
-#: actions/avatarsettings.php:122 actions/avatarsettings.php:205
-#: actions/grouplogo.php:261
 msgid "Avatar settings"
 msgstr "అవతారపు అమరికలు"
 
@@ -1570,8 +1217,6 @@ msgstr "అవతారపు అమరికలు"
 #. TRANS: Header on avatar upload crop form for thumbnail of originally uploaded avatar (h2).
 #. TRANS: Uploaded original file in group logo form.
 #. TRANS: Header for originally uploaded file before a crop on the group logo page.
-#: actions/avatarsettings.php:131 actions/avatarsettings.php:214
-#: actions/grouplogo.php:207 actions/grouplogo.php:270
 msgid "Original"
 msgstr "అసలు"
 
@@ -1579,82 +1224,67 @@ msgstr "అసలు"
 #. TRANS: Header on avatar upload crop form for thumbnail of to be used rendition of uploaded avatar (h2).
 #. TRANS: Header for preview of to be displayed group logo.
 #. TRANS: Header for the cropped group logo on the group logo page.
-#: actions/avatarsettings.php:147 actions/avatarsettings.php:227
-#: actions/grouplogo.php:219 actions/grouplogo.php:283
 msgid "Preview"
 msgstr "మునుజూపు"
 
 #. TRANS: Button on avatar upload page to delete current avatar.
 #. TRANS: Button text for user account deletion.
-#: actions/avatarsettings.php:155 actions/deleteaccount.php:319
 msgctxt "BUTTON"
 msgid "Delete"
 msgstr "తొలగించు"
 
 #. TRANS: Button on avatar upload page to upload an avatar.
 #. TRANS: Submit button to confirm upload of a user backup file for account restore.
-#: actions/avatarsettings.php:173 actions/restoreaccount.php:369
 msgctxt "BUTTON"
 msgid "Upload"
 msgstr "ఎక్కించు"
 
 #. TRANS: Button on avatar upload crop form to confirm a selected crop as avatar.
-#: actions/avatarsettings.php:243
 msgctxt "BUTTON"
 msgid "Crop"
 msgstr "కత్తిరించు"
 
 #. TRANS: Validation error on avatar upload form when no file was uploaded.
-#: actions/avatarsettings.php:318
 msgid "No file uploaded."
 msgstr "ఏ దస్త్రమూ ఎక్కింపబడలేదు."
 
 #. TRANS: Avatar upload form instruction after uploading a file.
-#: actions/avatarsettings.php:345
 #, fuzzy
 msgid "Pick a square area of the image to be your avatar."
 msgstr "మీ అవతారానికి గానూ ఈ చిత్రం నుండి ఒక చతురస్రపు ప్రదేశాన్ని ఎంచుకోండి"
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
 #. TRANS: Server error displayed trying to crop an uploaded group logo that is no longer present.
-#: actions/avatarsettings.php:360 actions/grouplogo.php:391
 msgid "Lost our file data."
 msgstr ""
 
 #. TRANS: Success message for having updated a user avatar.
-#: actions/avatarsettings.php:384
 msgid "Avatar updated."
 msgstr "అవతారాన్ని తాజాకరించాం."
 
 #. TRANS: Error displayed on the avatar upload page if the avatar could not be updated for an unknown reason.
-#: actions/avatarsettings.php:388
 msgid "Failed updating avatar."
 msgstr "అవతారపు తాజాకరణ విఫలమైంది."
 
 #. TRANS: Success message for deleting a user avatar.
-#: actions/avatarsettings.php:412
 msgid "Avatar deleted."
 msgstr "అవతారాన్ని తొలగించాం."
 
 #. TRANS: Title for backup account page.
 #. TRANS: Option in profile settings to create a backup of the account of the currently logged in user.
-#: actions/backupaccount.php:61 actions/profilesettings.php:468
 msgid "Backup account"
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to backup an account while not logged in.
-#: actions/backupaccount.php:79
 #, fuzzy
 msgid "Only logged-in users can backup their account."
 msgstr "కేవలం ప్రవేశించిన వాడుకరులు మాత్రమే నోటీసులని పునరావృతించగలరు."
 
 #. TRANS: Client exception thrown when trying to backup an account without having backup rights.
-#: actions/backupaccount.php:84
 msgid "You may not backup your account."
 msgstr ""
 
 #. TRANS: Information displayed on the backup account page.
-#: actions/backupaccount.php:227
 msgid ""
 "You can backup your account data in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format. This is an experimental feature and provides "
@@ -1664,31 +1294,26 @@ msgid ""
 msgstr ""
 
 #. TRANS: Submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:250
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Backup"
 msgstr "నేపథ్యం"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:254
 msgid "Backup your account."
 msgstr ""
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
-#: actions/block.php:68
 msgid "You already blocked that user."
 msgstr "మీరు ఇప్పటికే ఆ వాడుకరిని నిరోధించారు."
 
 #. TRANS: Title for block user page.
 #. TRANS: Legend for block user form.
 #. TRANS: Fieldset legend for block user from group form.
-#: actions/block.php:106 actions/block.php:136 actions/groupblock.php:165
 msgid "Block user"
 msgstr "వాడుకరిని నిరోధించు"
 
 #. TRANS: Explanation of consequences when blocking a user on the block user page.
-#: actions/block.php:139
 msgid ""
 "Are you sure you want to block this user? Afterwards, they will be "
 "unsubscribed from you, unable to subscribe to you in the future, and you "
@@ -1703,15 +1328,11 @@ msgstr ""
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:154 actions/deleteapplication.php:157
-#: actions/deletegroup.php:220 actions/deletenotice.php:155
-#: actions/deleteuser.php:154 actions/groupblock.php:187
 msgctxt "BUTTON"
 msgid "No"
 msgstr "కాదు"
 
 #. TRANS: Submit button title for 'No' when blocking a user.
-#: actions/block.php:158
 #, fuzzy
 msgid "Do not block this user."
 msgstr "ఈ వాడుకరిని నిరోధించకు"
@@ -1722,49 +1343,39 @@ msgstr "ఈ వాడుకరిని నిరోధించకు"
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:161 actions/deleteapplication.php:164
-#: actions/deletegroup.php:227 actions/deletenotice.php:162
-#: actions/deleteuser.php:161 actions/groupblock.php:194
 msgctxt "BUTTON"
 msgid "Yes"
 msgstr "అవును"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:165
 msgid "Block this user."
 msgstr "ఈ వాడుకరిని నిరోధించండి."
 
 #. TRANS: Server error displayed when blocking a user fails.
-#: actions/block.php:189
 msgid "Failed to save block information."
 msgstr "నిరోధపు సమాచారాన్ని భద్రపరచడంలో విఫలమయ్యాం."
 
 #. TRANS: Title for first page with list of users blocked from a group.
 #. TRANS: %s is a group nickname.
-#: actions/blockedfromgroup.php:101
 #, php-format
 msgid "%s blocked profiles"
 msgstr "%s నిరోధిత వాడుకరులు"
 
 #. TRANS: Title for any but the first page with list of users blocked from a group.
 #. TRANS: %1$s is a group nickname, %2$d is a page number.
-#: actions/blockedfromgroup.php:106
 #, php-format
 msgid "%1$s blocked profiles, page %2$d"
 msgstr "%1$s మరియు మిత్రులు, పేజీ %2$d"
 
 #. TRANS: Instructions for list of users blocked from a group.
-#: actions/blockedfromgroup.php:122
 msgid "A list of the users blocked from joining this group."
 msgstr "ఈ గుంపు లోనికి చేరకుండా నిరోధించిన వాడుకరుల యొక్క జాబితా."
 
 #. TRANS: Form legend for unblocking a user from a group.
-#: actions/blockedfromgroup.php:291
 msgid "Unblock user from group"
 msgstr "వాడుకరిని గుంపు నుండి నిరోధించు"
 
 #. TRANS: Button text for unblocking a user from a group.
-#: actions/blockedfromgroup.php:323
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Unblock"
@@ -1772,128 +1383,102 @@ msgstr "నిరోధాన్ని ఎత్తివేయి"
 
 #. TRANS: Tooltip for button for unblocking a user from a group.
 #. TRANS: Description of the form to unblock a user.
-#: actions/blockedfromgroup.php:327 lib/unblockform.php:78
 msgid "Unblock this user"
 msgstr "ఈ వాడుకరిని నిరోధించు"
 
 #. TRANS: Title for mini-posting window loaded from bookmarklet.
 #. TRANS: %s is the StatusNet site name.
-#: actions/bookmarklet.php:51
 #, php-format
 msgid "Post to %s"
 msgstr "%sకి టపాచెయ్యి"
 
 #. TRANS: Client error displayed when not providing a confirmation code in the contact address confirmation action.
-#: actions/confirmaddress.php:74
 msgid "No confirmation code."
 msgstr "నిర్ధారణ సంకేతం లేదు."
 
 #. TRANS: Client error displayed when providing a non-existing confirmation code in the contact address confirmation action.
-#: actions/confirmaddress.php:80
 msgid "Confirmation code not found."
 msgstr "నిర్ధారణ సంకేతం కనబడలేదు."
 
 #. TRANS: Client error displayed when not providing a confirmation code for another user in the contact address confirmation action.
-#: actions/confirmaddress.php:86
 msgid "That confirmation code is not for you!"
 msgstr "ఆ నిర్ధారణా సంకేతం మీది కాదు!"
 
 #. TRANS: Server error for an unknown address type, which can be 'email', 'sms', or the name of an IM network (such as 'xmpp' or 'aim')
-#: actions/confirmaddress.php:94
-#, fuzzy, php-format
+#, php-format
 msgid "Unrecognized address type %s"
 msgstr "గుర్తుతెలియని చిరునామా రకం %s."
 
 #. TRANS: Client error for an already confirmed email/jabber/sms address.
-#: actions/confirmaddress.php:103 actions/confirmaddress.php:136
 msgid "That address has already been confirmed."
 msgstr "ఆ చిరునామా ఇప్పటికే నిర్ధారితమైంది."
 
-#: actions/confirmaddress.php:121 actions/imsettings.php:444
-#: actions/userdesignsettings.php:306
-#, fuzzy
 msgid "Couldn't update user."
 msgstr "వాడుకరిని తాజాకరించలేకున్నాం."
 
-#: actions/confirmaddress.php:144
 #, fuzzy
 msgid "Couldn't update user im preferences."
 msgstr "వాడుకరిని తాజాకరించలేకున్నాం."
 
-#: actions/confirmaddress.php:156
 #, fuzzy
 msgid "Couldn't insert user im preferences."
 msgstr "కొత్త చందాని చేర్చలేకపోయాం."
 
 #. TRANS: Server error displayed when an address confirmation code deletion from the
 #. TRANS: database fails in the contact address confirmation action.
-#: actions/confirmaddress.php:169
 #, fuzzy
 msgid "Could not delete address confirmation."
 msgstr "ఈమెయిల్ నిర్ధారణని తొలగించలేకున్నాం."
 
 #. TRANS: Title for the contact address confirmation action.
-#: actions/confirmaddress.php:185
 msgid "Confirm address"
 msgstr "చిరునామాని నిర్ధారించు"
 
 #. TRANS: Success message for the contact address confirmation action.
 #. TRANS: %s can be 'email', 'jabber', or 'sms'.
-#: actions/confirmaddress.php:200
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "\"%s\" అనే చిరునామా మీ ఖాతాకి నిర్ధారితమైంది."
 
 #. TRANS: Title for page with a conversion (multiple notices in context).
-#: actions/conversation.php:96
 msgid "Conversation"
 msgstr "సంభాషణ"
 
 #. TRANS: Header on conversation page. Hidden by default (h2).
 #. TRANS: Label for user statistics.
-#: actions/conversation.php:149 lib/noticelist.php:87
-#: lib/profileaction.php:246 lib/searchgroupnav.php:82
-#: lib/threadednoticelist.php:66
 msgid "Notices"
 msgstr "సందేశాలు"
 
 #. TRANS: Client exception displayed trying to delete a user account while not logged in.
-#: actions/deleteaccount.php:71
 #, fuzzy
 msgid "Only logged-in users can delete their account."
 msgstr "కేవలం ప్రవేశించిన వాడుకరులు మాత్రమే నోటీసులని పునరావృతించగలరు."
 
 #. TRANS: Client exception displayed trying to delete a user account without have the rights to do that.
-#: actions/deleteaccount.php:77
 msgid "You cannot delete your account."
 msgstr "మీ ఖాతాని మీరు తొలగించుకోలేరు."
 
 #. TRANS: Confirmation text for user deletion. The user has to type this exactly the same, including punctuation.
-#: actions/deleteaccount.php:160 actions/deleteaccount.php:297
 msgid "I am sure."
 msgstr ""
 
 #. TRANS: Notification for user about the text that must be input to be able to delete a user account.
 #. TRANS: %s is the text that needs to be input.
-#: actions/deleteaccount.php:164
 #, php-format
 msgid "You must write \"%s\" exactly in the box."
 msgstr "మీరు పెట్టెలో తప్పనిసరిగా \"%s\" అని వ్రాయాలి."
 
 #. TRANS: Confirmation that a user account has been deleted.
-#: actions/deleteaccount.php:206
 msgid "Account deleted."
 msgstr "ఖాతాని తొలగించాం."
 
 #. TRANS: Page title for page on which a user account can be deleted.
 #. TRANS: Option in profile settings to delete the account of the currently logged in user.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:476
 #, fuzzy
 msgid "Delete account"
 msgstr "ఖాతాని సృష్టించుకోండి"
 
 #. TRANS: Form text for user deletion form.
-#: actions/deleteaccount.php:279
 msgid ""
 "This will <strong>permanently delete</strong> your account data from this "
 "server."
@@ -1901,7 +1486,6 @@ msgstr ""
 
 #. TRANS: Additional form text for user deletion form shown if a user has account backup rights.
 #. TRANS: %s is a URL to the backup page.
-#: actions/deleteaccount.php:285
 #, php-format
 msgid ""
 "You are strongly advised to <a href=\"%s\">back up your data</a> before "
@@ -1910,56 +1494,42 @@ msgstr ""
 
 #. TRANS: Field label for delete account confirmation entry.
 #. TRANS: Field label for password reset form where the password has to be typed again.
-#: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:262 actions/register.php:419
 msgid "Confirm"
 msgstr "నిర్థారించు"
 
 #. TRANS: Input title for the delete account field.
 #. TRANS: %s is the text that needs to be input.
-#: actions/deleteaccount.php:304
 #, fuzzy, php-format
 msgid "Enter \"%s\" to confirm that you want to delete your account."
 msgstr "మీరు వాడుకరులని తొలగించలేరు."
 
 #. TRANS: Button title for user account deletion.
-#: actions/deleteaccount.php:323
-#, fuzzy
 msgid "Permanently delete your account"
-msgstr "మీరు వాడుకరులని తొలగించలేరు."
+msgstr "మీ ఖాతాని శాశ్వతంగా తొలగించుకోండి"
 
 #. TRANS: Client error displayed trying to delete an application while not logged in.
-#: actions/deleteapplication.php:62
 msgid "You must be logged in to delete an application."
 msgstr "ఉపకరణాలని తొలగించడానికి మీరు ప్రవేశించి ఉండాలి."
 
 #. TRANS: Client error displayed trying to delete an application that does not exist.
-#: actions/deleteapplication.php:71
 msgid "Application not found."
 msgstr "ఉపకరణం కనబడలేదు."
 
 #. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
-#: actions/deleteapplication.php:79 actions/editapplication.php:78
-#: actions/showapplication.php:90
 msgid "You are not the owner of this application."
 msgstr "మీరు ఈ ఉపకరణం యొక్క యజమాని కాదు."
 
 #. TRANS: Client error text when there is a problem with the session token.
-#: actions/deleteapplication.php:102 actions/editapplication.php:131
-#: actions/newapplication.php:112 actions/showapplication.php:113
-#: lib/action.php:1391
 msgid "There was a problem with your session token."
 msgstr ""
 
 #. TRANS: Title for delete application page.
 #. TRANS: Fieldset legend on delete application page.
-#: actions/deleteapplication.php:124 actions/deleteapplication.php:149
 msgid "Delete application"
 msgstr "ఉపకరణ తొలగింపు"
 
 #. TRANS: Confirmation text on delete application page.
-#: actions/deleteapplication.php:152
 msgid ""
 "Are you sure you want to delete this application? This will clear all data "
 "about the application from the database, including all existing user "
@@ -1969,57 +1539,47 @@ msgstr ""
 "వాడుకరుల అనుసంధానాలతో సహా, డాటాబేసు నుండి తొలగిస్తుంది."
 
 #. TRANS: Submit button title for 'No' when deleting an application.
-#: actions/deleteapplication.php:161
 #, fuzzy
 msgid "Do not delete this application."
 msgstr "ఈ ఉపకరణాన్ని తొలగించకు"
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
-#: actions/deleteapplication.php:167
 #, fuzzy
 msgid "Delete this application."
 msgstr "ఈ ఉపకరణాన్ని తొలగించు"
 
 #. TRANS: Client error when trying to delete group while not logged in.
-#: actions/deletegroup.php:64
 msgid "You must be logged in to delete a group."
 msgstr "గుంపుని తొలగించడానికి మీరు ప్రవేశించి ఉండాలి."
 
 #. TRANS: Client error when trying to delete a group without providing a nickname or ID for the group.
 #. TRANS: Client error displayed when trying to join a group without providing a group name or group ID.
 #. TRANS: Client error displayed when trying to leave a group without providing a group name or group ID.
-#: actions/deletegroup.php:94 actions/joingroup.php:89
-#: actions/leavegroup.php:89
 msgid "No nickname or ID."
 msgstr "Jabber ID లేదు."
 
 #. TRANS: Client error when trying to delete a group without having the rights to delete it.
-#: actions/deletegroup.php:107
 msgid "You are not allowed to delete this group."
 msgstr "ఈ గుంపును తొలగించడానికి మీకు అనుమతి లేదు."
 
 #. TRANS: Server error displayed if a group could not be deleted.
 #. TRANS: %s is the name of the group that could not be deleted.
-#: actions/deletegroup.php:150
 #, php-format
 msgid "Could not delete group %s."
 msgstr "%s గుంపుని తొలగించలేకున్నాం."
 
 #. TRANS: Message given after deleting a group.
 #. TRANS: %s is the deleted group's name.
-#: actions/deletegroup.php:159
 #, php-format
 msgid "Deleted group %s"
 msgstr "%s గుంపుని తొలగించాం"
 
 #. TRANS: Title of delete group page.
 #. TRANS: Form legend for deleting a group.
-#: actions/deletegroup.php:176 actions/deletegroup.php:202
 msgid "Delete group"
 msgstr "గుంపు తొలగింపు"
 
 #. TRANS: Warning in form for deleleting a group.
-#: actions/deletegroup.php:206
 #, fuzzy
 msgid ""
 "Are you sure you want to delete this group? This will clear all data about "
@@ -2030,13 +1590,11 @@ msgstr ""
 "వెనక్కి తేలేకుండా."
 
 #. TRANS: Submit button title for 'No' when deleting a group.
-#: actions/deletegroup.php:224
 #, fuzzy
 msgid "Do not delete this group."
 msgstr "ఈ గుంపును తొలగించకు"
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
-#: actions/deletegroup.php:231
 #, fuzzy
 msgid "Delete this group."
 msgstr "ఈ గుంపుని తొలగించు"
@@ -2047,22 +1605,18 @@ msgstr "ఈ గుంపుని తొలగించు"
 #. TRANS: Client error displayed trying to block a user from a group while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying to log out when not logged in.
+#. TRANS: Client error displayed when trying to access the "make admin" page while not logged in.
+#. TRANS: Client error displayed trying to create a new direct message while not logged in.
+#. TRANS: Client error displayed trying to send a notice while not logged in.
+#. TRANS: Client error displayed trying to nudge a user without being logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
 #. TRANS: Client error displayed when trying to change user options while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
-#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:70
-#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
-#: actions/nudge.php:63 actions/pluginenable.php:97 actions/subedit.php:33
-#: actions/subscribe.php:98 actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:71 lib/profileformaction.php:63
-#: lib/settingsaction.php:72
 msgid "Not logged in."
 msgstr "లోనికి ప్రవేశించలేదు."
 
 #. TRANS: Instructions for deleting a notice.
-#: actions/deletenotice.php:110
 msgid ""
 "You are about to permanently delete a notice. Once this is done, it cannot "
 "be undone."
@@ -2070,51 +1624,42 @@ msgstr "మీరు ఒక నోటీసుని శాశ్వతంగా
 
 #. TRANS: Page title when deleting a notice.
 #. TRANS: Fieldset legend for the delete notice form.
-#: actions/deletenotice.php:117 actions/deletenotice.php:148
 msgid "Delete notice"
 msgstr "నోటీసుని తొలగించు"
 
 #. TRANS: Message for the delete notice form.
-#: actions/deletenotice.php:152
 msgid "Are you sure you want to delete this notice?"
 msgstr "మీరు నిజంగానే ఈ నోటీసుని తొలగించాలనుకుంటున్నారా?"
 
 #. TRANS: Submit button title for 'No' when deleting a notice.
-#: actions/deletenotice.php:159
 #, fuzzy
 msgid "Do not delete this notice."
 msgstr "ఈ నోటీసుని తొలగించకు"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:166
 #, fuzzy
 msgid "Delete this notice."
 msgstr "ఈ నోటీసుని తొలగించు"
 
 #. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
-#: actions/deleteuser.php:66
 msgid "You cannot delete users."
 msgstr "మీరు వాడుకరులని తొలగించలేరు."
 
 #. TRANS: Client error displayed when trying to delete a non-local user.
-#: actions/deleteuser.php:74
 msgid "You can only delete local users."
 msgstr "మీరు స్థానిక వాడుకరులను మాత్రమే తొలగించగలరు."
 
 #. TRANS: Title of delete user page.
-#: actions/deleteuser.php:110
 #, fuzzy
 msgctxt "TITLE"
 msgid "Delete user"
 msgstr "వాడుకరిని తొలగించు"
 
 #. TRANS: Fieldset legend on delete user page.
-#: actions/deleteuser.php:134
 msgid "Delete user"
 msgstr "వాడుకరిని తొలగించు"
 
 #. TRANS: Information text to request if a user is certain that the described action has to be performed.
-#: actions/deleteuser.php:138
 msgid ""
 "Are you sure you want to delete this user? This will clear all data about "
 "the user from the database, without a backup."
@@ -2123,98 +1668,79 @@ msgstr ""
 "వెనక్కి తేలేకుండా."
 
 #. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/deleteuser.php:158
 msgid "Do not delete this user."
 msgstr "ఈ వాడుకరిని తొలగించకండి."
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
-#: actions/deleteuser.php:165
 msgid "Delete this user."
 msgstr "ఈ వాడుకరిని తొలగించండి."
 
 #. TRANS: Message used as title for design settings for the site.
-#: actions/designadminpanel.php:60 lib/settingsnav.php:97
 msgid "Design"
 msgstr "రూపురేఖలు"
 
 #. TRANS: Instructions for design adminsitration panel.
-#: actions/designadminpanel.php:71
 msgid "Design settings for this StatusNet site"
 msgstr ""
 
 #. TRANS: Client error displayed when a logo URL does is not valid.
-#: actions/designadminpanel.php:327
 msgid "Invalid logo URL."
 msgstr "చిహ్నపు URL చెల్లదు."
 
 #. TRANS: Client error displayed when an SSL logo URL is invalid.
-#: actions/designadminpanel.php:333
 msgid "Invalid SSL logo URL."
 msgstr "SSL చిహ్నపు URL చెల్లదు."
 
 #. TRANS: Client error displayed when a theme is submitted through the form that is not in the theme list.
 #. TRANS: %s is the chosen unavailable theme.
-#: actions/designadminpanel.php:339
 #, php-format
 msgid "Theme not available: %s."
 msgstr "అలంకారం అందుబాటులో లేదు: %s."
 
 #. TRANS: Fieldset legend for form to change logo.
-#: actions/designadminpanel.php:437
 msgid "Change logo"
 msgstr "చిహ్నాన్ని మార్చు"
 
 #. TRANS: Field label for StatusNet site logo.
-#: actions/designadminpanel.php:444
 msgid "Site logo"
 msgstr "సైటు చిహ్నం"
 
 #. TRANS: Field label for SSL StatusNet site logo.
-#: actions/designadminpanel.php:452
 msgid "SSL logo"
 msgstr "SSL చిహ్నం"
 
 #. TRANS: Fieldset legend for form change StatusNet site's theme.
-#: actions/designadminpanel.php:467
 msgid "Change theme"
 msgstr "అలంకారాన్ని మార్చు"
 
 #. TRANS: Field label for dropdown to choose site theme.
-#: actions/designadminpanel.php:485
 msgid "Site theme"
 msgstr "సైటు అలంకారం"
 
 #. TRANS: Title for field label for dropdown to choose site theme.
-#: actions/designadminpanel.php:487
 msgid "Theme for the site."
 msgstr "సైటుకి అలంకారం."
 
 #. TRANS: Field label for uploading a cutom theme.
-#: actions/designadminpanel.php:494
 #, fuzzy
 msgid "Custom theme"
 msgstr "సైటు అలంకారం"
 
 #. TRANS: Form instructions for uploading a cutom StatusNet theme.
-#: actions/designadminpanel.php:499
 msgid "You can upload a custom StatusNet theme as a .ZIP archive."
 msgstr ""
 
 #. TRANS: Fieldset legend for theme background image.
-#: actions/designadminpanel.php:515
 msgid "Change background image"
 msgstr "నేపథ్య చిత్రాన్ని మార్చు"
 
 #. TRANS: Field label for background image on theme designer page.
 #. TRANS: Field label for background color selector.
 #. TRANS: Label on profile design page for setting a profile page background colour.
-#: actions/designadminpanel.php:525 actions/designadminpanel.php:609
-#: lib/designform.php:238
 msgid "Background"
 msgstr "నేపథ్యం"
 
 #. TRANS: Form guide for background image upload form on theme designer page.
-#: actions/designadminpanel.php:531
 #, php-format
 msgid ""
 "You can upload a background image for the site. The maximum file size is %1"
@@ -2222,208 +1748,172 @@ msgid ""
 msgstr "సైటుకి మీరు నేపథ్యపు చిత్రాన్ని ఎక్కించవచ్చు. గరిష్ఠ ఫైలు పరిమాణం %1$s."
 
 #. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:558
 msgid "On"
 msgstr "ఆన్"
 
 #. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:575
 msgid "Off"
 msgstr "ఆఫ్"
 
 #. TRANS: Form guide for turning background image on or off on theme designer page.
 #. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
 #. TRANS: use of the uploaded profile image.
-#: actions/designadminpanel.php:577 lib/designform.php:214
 #, fuzzy
 msgid "Turn background image on or off."
 msgstr "నేపథ్య చిత్రాన్ని మార్చు"
 
 #. TRANS: Checkbox label to title background image on theme designer page.
 #. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-#: actions/designadminpanel.php:583 lib/designform.php:220
 #, fuzzy
 msgid "Tile background image"
 msgstr "నేపథ్య చిత్రాన్ని మార్చు"
 
 #. TRANS: Fieldset legend for theme colors.
-#: actions/designadminpanel.php:598
-#, fuzzy
 msgid "Change colors"
 msgstr "రంగులను మార్చు"
 
 #. TRANS: Field label for content color selector.
 #. TRANS: Label on profile design page for setting a profile page content colour.
-#: actions/designadminpanel.php:623 lib/designform.php:252
 msgid "Content"
 msgstr "విషయం"
 
 #. TRANS: Field label for sidebar color selector.
 #. TRANS: Label on profile design page for setting a profile page sidebar colour.
-#: actions/designadminpanel.php:637 lib/designform.php:266
 msgid "Sidebar"
 msgstr "పక్కపట్టీ"
 
 #. TRANS: Field label for text color selector.
 #. TRANS: Label on profile design page for setting a profile page text colour.
-#: actions/designadminpanel.php:651 lib/designform.php:280
 msgid "Text"
 msgstr "పాఠ్యం"
 
 #. TRANS: Field label for link color selector.
 #. TRANS: Label on profile design page for setting a profile page links colour.
-#: actions/designadminpanel.php:665 lib/designform.php:294
 msgid "Links"
 msgstr "లంకెలు"
 
 #. TRANS: Fieldset legend for advanced theme design settings.
-#: actions/designadminpanel.php:691
 msgid "Advanced"
 msgstr "ఉన్నత"
 
 #. TRANS: Field label for custom CSS.
-#: actions/designadminpanel.php:696
 msgid "Custom CSS"
 msgstr "ప్రత్యేక CSS"
 
 #. TRANS: Button text for resetting theme settings.
-#: actions/designadminpanel.php:718
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Use defaults"
 msgstr "అప్రమేయాలని ఉపయోగించు"
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:720
 #, fuzzy
 msgid "Restore default designs."
 msgstr "అప్రమేయాలని ఉపయోగించు"
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:728
 #, fuzzy
 msgid "Reset back to default."
 msgstr "అప్రమేయాలని ఉపయోగించు"
 
 #. TRANS: Title for button for saving theme settings.
-#: actions/designadminpanel.php:736
 #, fuzzy
 msgid "Save design."
 msgstr "రూపురేఖలని భద్రపరచు"
 
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
-#: actions/disfavor.php:83
 msgid "This notice is not a favorite!"
 msgstr "ఈ నోటీసు ఇష్టాంశం కాదు!"
 
 #. TRANS: Title for page on which favorites can be added.
-#: actions/disfavor.php:98
 msgid "Add to favorites"
 msgstr "ఇష్టాంశాలకు చేర్చు"
 
 #. TRANS: Client exception thrown when requesting a document from the documentation that does not exist.
 #. TRANS: %s is the non-existing document.
-#: actions/doc.php:155
 #, fuzzy, php-format
 msgid "No such document \"%s\"."
 msgstr "అటువంటి జోడింపు లేదు."
 
 #. TRANS: Title for "Edit application" form.
 #. TRANS: Form legend.
-#: actions/editapplication.php:54 lib/applicationeditform.php:129
 msgid "Edit application"
 msgstr "ఉపకరణాన్ని మార్చు"
 
 #. TRANS: Client error displayed trying to edit an application while not logged in.
-#: actions/editapplication.php:66
 msgid "You must be logged in to edit an application."
 msgstr "ఉపకరణాలని మార్చడానికి మీరు ప్రవేశించి ఉండాలి."
 
 #. TRANS: Client error displayed trying to edit an application that does not exist.
-#: actions/editapplication.php:83 actions/showapplication.php:83
 msgid "No such application."
 msgstr "అటువంటి ఉపకరణం లేదు."
 
 #. TRANS: Instructions for "Edit application" form.
-#: actions/editapplication.php:167
 msgid "Use this form to edit your application."
 msgstr "మీ ఉపకరణాన్ని మార్చడానికి ఈ ఫారాన్ని ఉపయోగించండి."
 
 #. TRANS: Validation error shown when not providing a name in the "Edit application" form.
 #. TRANS: Validation error shown when not providing a name in the "New application" form.
-#: actions/editapplication.php:184 actions/newapplication.php:164
 msgid "Name is required."
 msgstr "పేరు తప్పనిసరి."
 
 #. 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.
-#: actions/editapplication.php:188 actions/newapplication.php:172
 #, fuzzy
 msgid "Name is too long (maximum 255 characters)."
 msgstr "పేరు చాలా పెద్దగా ఉంది (గరిష్ఠంగా 255 అక్షరాలు)."
 
 #. TRANS: Validation error shown when providing a name for an application that already exists in the "Edit application" form.
 #. TRANS: Validation error shown when providing a name for an application that already exists in the "New application" form.
-#: actions/editapplication.php:192 actions/newapplication.php:168
 msgid "Name already in use. Try another one."
 msgstr "ఆ పేరుని ఇప్పటికే వాడుతున్నారు. మరోటి ప్రయత్నించండి."
 
 #. TRANS: Validation error shown when not providing a description in the "Edit application" form.
 #. TRANS: Validation error shown when not providing a description in the "New application" form.
-#: actions/editapplication.php:196 actions/newapplication.php:176
 msgid "Description is required."
 msgstr "వివరణ తప్పనిసరి."
 
 #. TRANS: Validation error shown when providing too long a source URL in the "Edit application" form.
-#: actions/editapplication.php:209
 msgid "Source URL is too long."
 msgstr ""
 
 #. TRANS: Validation error shown when providing an invalid source URL in the "Edit application" form.
 #. TRANS: Validation error shown when providing an invalid source URL in the "New application" form.
-#: actions/editapplication.php:216 actions/newapplication.php:199
 #, fuzzy
 msgid "Source URL is not valid."
 msgstr "హోమ్ పేజీ URL సరైనది కాదు."
 
 #. 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.
-#: actions/editapplication.php:220 actions/newapplication.php:203
 msgid "Organization is required."
 msgstr "సంస్థ తప్పనిసరి."
 
 #. TRANS: Validation error shown when providing too long an arganisation name in the "Edit application" form.
-#: actions/editapplication.php:224 actions/newapplication.php:207
 #, fuzzy
 msgid "Organization is too long (maximum 255 characters)."
 msgstr "సంస్థ పేరు మరీ పెద్దగా ఉంది (255 అక్షరాలు గరిష్ఠం)."
 
 #. TRANS: Form validation error show when an organisation name has not been provided in the edit application form.
 #. TRANS: Form validation error show when an organisation name has not been provided in the new application form.
-#: actions/editapplication.php:228 actions/newapplication.php:211
 #, fuzzy
 msgid "Organization homepage is required."
 msgstr "సంస్థ తప్పనిసరి."
 
 #. TRANS: Validation error shown when providing too long a callback URL in the "Edit application" form.
 #. TRANS: Validation error shown when providing too long a callback URL in the "New application" form.
-#: actions/editapplication.php:239 actions/newapplication.php:225
 msgid "Callback is too long."
 msgstr ""
 
 #. TRANS: Validation error shown when providing an invalid callback URL in the "Edit application" form.
 #. TRANS: Validation error shown when providing an invalid callback URL in the "New application" form.
-#: actions/editapplication.php:247 actions/newapplication.php:235
 msgid "Callback URL is not valid."
 msgstr ""
 
 #. TRANS: Server error occuring when an application could not be updated from the "Edit application" form.
-#: actions/editapplication.php:284
 msgid "Could not update application."
 msgstr "ఉపకరణాన్ని తాజాకరించలేకున్నాం."
 
 #. TRANS: Title for form to edit a group. %s is a group nickname.
-#: actions/editgroup.php:55
 #, php-format
 msgid "Edit %s group"
 msgstr "%s గుంపుని మార్చు"
@@ -2431,40 +1921,40 @@ msgstr "%s గుంపుని మార్చు"
 #. TRANS: Client error displayed trying to edit a group while not logged in.
 #. TRANS: Client error displayed when trying to create a group while not logged in.
 #. TRANS: Client error displayed trying to create a group while not logged in.
-#: actions/editgroup.php:68 actions/grouplogo.php:69 actions/newgroup.php:65
 msgid "You must be logged in to create a group."
 msgstr "గుంపుని సృష్టించడానికి మీరు లోనికి ప్రవేశించాలి."
 
 #. TRANS: Form instructions for group edit form.
-#: actions/editgroup.php:161
 msgid "Use this form to edit the group."
 msgstr "గుంపుని మార్చడానికి ఈ ఫారాన్ని ఉపయోగించండి."
 
+#. TRANS: Group edit form validation error.
+#. TRANS: Group create form validation error.
+#. TRANS: %s is the invalid alias.
+#, php-format
+msgid "Invalid alias: \"%s\""
+msgstr "తప్పుడు మారుపేరు: \"%s\""
+
 #. TRANS: Group edit form success message.
-#: actions/editgroup.php:301
 msgid "Options saved."
 msgstr "ఎంపికలు భద్రమయ్యాయి."
 
 #. TRANS: Title for e-mail settings.
-#: actions/emailsettings.php:60
 msgid "Email settings"
 msgstr "ఈమెయిల్ అమరికలు"
 
 #. TRANS: E-mail settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/emailsettings.php:74
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 msgstr "%%site.name%% నుండి మీకు ఎలా మెయిల్ వస్తూంతో సంభాళించుకోండి."
 
 #. TRANS: Form legend for e-mail settings form.
 #. TRANS: Field label for e-mail address input in e-mail settings form.
-#: actions/emailsettings.php:104 actions/emailsettings.php:130
 msgid "Email address"
 msgstr "ఈమెయిలు చిరునామా"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:110
 msgid "Current confirmed email address."
 msgstr "ప్రస్తుత నిర్ధారిత ఈమెయిలు చిరునామా."
 
@@ -2473,15 +1963,11 @@ msgstr "ప్రస్తుత నిర్ధారిత ఈమెయిల
 #. TRANS: Button label to remove a confirmed IM address.
 #. TRANS: Button label to remove a confirmed SMS address.
 #. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
-#: actions/emailsettings.php:113 actions/emailsettings.php:180
-#: actions/imsettings.php:119 actions/smssettings.php:119
-#: actions/smssettings.php:175
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "తొలగించు"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:120
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -2494,46 +1980,38 @@ msgstr ""
 #. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
 #. TRANS: Any other domain may be owned by a legitimate person or
 #. TRANS: organization.
-#: actions/emailsettings.php:137
 msgid "Email address, like \"UserName@example.org\""
 msgstr "ఈమెయిల్ చిరునామా, \"username@example.org\" వలె"
 
 #. TRANS: Button label for adding an e-mail address in e-mail settings form.
 #. TRANS: Button label for adding an IM address in IM settings form.
 #. TRANS: Button label for adding a SMS phone number in SMS settings form.
-#: actions/emailsettings.php:141 actions/imsettings.php:147
-#: actions/smssettings.php:157
 msgctxt "BUTTON"
 msgid "Add"
 msgstr "చేర్చు"
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:149 actions/smssettings.php:166
 msgid "Incoming email"
 msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:155
 msgid "I want to post notices by email."
 msgstr "నేను ఈమెయిలు ద్వారా నోటీసులు పంపాలనుకుంటున్నాను."
 
 #. TRANS: Form instructions for incoming e-mail form in e-mail settings.
 #. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
-#: actions/emailsettings.php:177 actions/smssettings.php:173
 #, fuzzy
 msgid "Send email to this address to post new notices."
 msgstr "%sకి నోటీసులు పంపించడానికి కొత్త ఈమెయిలు చిరునామా"
 
 #. TRANS: Instructions for incoming e-mail address input form, when an address has already been assigned.
 #. TRANS: Instructions for incoming SMS e-mail address input form.
-#: actions/emailsettings.php:186 actions/smssettings.php:181
 #, fuzzy
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr "%sకి నోటీసులు పంపించడానికి కొత్త ఈమెయిలు చిరునామా"
 
 #. TRANS: Instructions for incoming e-mail address input form.
-#: actions/emailsettings.php:190
 msgid ""
 "To send notices via email, we need to create a unique email address for you "
 "on this server:"
@@ -2541,90 +2019,72 @@ msgstr ""
 
 #. TRANS: Button label for adding an e-mail address to send notices from.
 #. TRANS: Button label for adding an SMS e-mail address to send notices from.
-#: actions/emailsettings.php:196 actions/smssettings.php:184
 msgctxt "BUTTON"
 msgid "New"
 msgstr "కొత్తది"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:205
 msgid "Email preferences"
 msgstr "ఈమెయిలు అభిరుచులు"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:213
 msgid "Send me notices of new subscriptions through email."
 msgstr "కొత్త చందాదార్లు చేరినప్పుడు నాకు ఈమెయిలు ద్వారా తెలియజేయి."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:219
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr "ఎవరైనా నా నోటీసుని ఇష్టాంశంగా చేర్చుకున్నపుడు నాకు ఈమెయిలు పంపించు."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:226
 msgid "Send me email when someone sends me a private message."
 msgstr "ఎవరైనా నాకు అంతరంగిక సందేశాన్ని పంపించినప్పుడు నాకు ఈమెయిలుని పంపించు"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:232
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr "ఎవరైనా నాకు \"@-స్పందన\"ని పంపినప్పుడు నాకు ఈమెయిలును పంపించు."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:238
 msgid "Allow friends to nudge me and send me an email."
 msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:244
 #, fuzzy
 msgid "Publish a MicroID for my email address."
 msgstr "అది మీ ఈమెయిలు చిరునామా కాదు."
 
 #. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:362
 msgid "Email preferences saved."
 msgstr "ఈమెయిలు అభిరుచులు భద్రమయ్యాయి."
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:381
 msgid "No email address."
 msgstr "ఈమెయిలు చిరునామా లేదు."
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:389
 #, fuzzy
 msgid "Cannot normalize that email address."
 msgstr "ప్రస్తుత నిర్ధారిత ఈమెయిలు చిరునామా."
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:394 actions/register.php:197
-#: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "సరైన ఈమెయిల్ చిరునామా కాదు:"
 
 #. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:398
 msgid "That is already your email address."
 msgstr "అది ఇప్పటికే మీ ఈమెయిల్ చిరునామా."
 
 #. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:402
 msgid "That email address already belongs to another user."
 msgstr "ఆ ఈమెయిల్ చిరునామా ఇప్పటేకే ఇతర వాడుకరికి సంబంధించినది."
 
 #. TRANS: Server error thrown on database error adding e-mail confirmation code.
 #. TRANS: Server error thrown on database error adding Instant Messaging confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:419 actions/imsettings.php:362
-#: actions/smssettings.php:364
 #, fuzzy
 msgid "Could not insert confirmation code."
 msgstr "నిర్ధారణ సంకేతాన్ని చేర్చలేకపోయాం."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:426
 #, fuzzy
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
@@ -2636,41 +2096,33 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling Instant Messaging address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:446 actions/imsettings.php:391
-#: actions/smssettings.php:398
 msgid "No pending confirmation to cancel."
 msgstr "రద్దుచేయడానికి వేచివున్న నిర్ధారణలేమీ లేవు."
 
 #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:451
 msgid "That is the wrong email address."
 msgstr "ఆ ఈమెయిలు చిరునామా సరైనది కాదు."
 
 #. TRANS: Server error thrown on database error canceling e-mail address confirmation.
 #. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
-#: actions/emailsettings.php:460 actions/smssettings.php:412
 #, fuzzy
 msgid "Could not delete email confirmation."
 msgstr "ఈమెయిల్ నిర్ధారణని తొలగించలేకున్నాం."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:465
 msgid "Email confirmation cancelled."
 msgstr "ఈమెయిలు నిర్ధారణ రద్దయింది."
 
 #. TRANS: Message given trying to remove an e-mail address that is not
 #. TRANS: registered for the active user.
-#: actions/emailsettings.php:484
 msgid "That is not your email address."
 msgstr "అది మీ ఈమెయిలు చిరునామా కాదు."
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:505
 msgid "The email address was removed."
 msgstr "ఆ ఈమెయిలు చిరునామాని తొలగించాం."
 
 #. TRANS: Form validation error displayed when trying to remove an incoming e-mail address while no address has been set.
-#: actions/emailsettings.php:519 actions/smssettings.php:554
 #, fuzzy
 msgid "No incoming email address."
 msgstr "ఈమెయిలు చిరునామా లేదు."
@@ -2678,62 +2130,50 @@ msgstr "ఈమెయిలు చిరునామా లేదు."
 #. 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.
-#: actions/emailsettings.php:531 actions/emailsettings.php:555
-#: actions/smssettings.php:565 actions/smssettings.php:590
 msgid "Could not update user record."
 msgstr "వాడుకరిని తాజాకరించలేకున్నాం."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
 #. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:535 actions/smssettings.php:569
 #, fuzzy
 msgid "Incoming email address removed."
 msgstr "ఆ ఈమెయిలు చిరునామాని తొలగించాం."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
 #. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:559 actions/smssettings.php:594
 #, fuzzy
 msgid "New incoming email address added."
 msgstr "ఈమెయిలు చిరునామా లేదు."
 
 #. TRANS: Client error displayed when trying to mark a notice as favorite that already is a favorite.
-#: actions/favor.php:80
 msgid "This notice is already a favorite!"
 msgstr "ఈ నోటీసు ఇప్పటికే మీ ఇష్టాంశం!"
 
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
-#: actions/favor.php:95
 #, fuzzy
 msgid "Disfavor favorite."
 msgstr "ఇష్టాంశాలకు చేర్చు"
 
 #. TRANS: Page title for first page of favorited notices.
 #. TRANS: Title for favourited notices section.
-#: actions/favorited.php:65 lib/popularnoticesection.php:62
-#: lib/publicgroupnav.php:93
 msgid "Popular notices"
 msgstr "ప్రాచుర్య నోటీసులు"
 
 #. TRANS: Page title for all but first page of favorited notices.
 #. TRANS: %d is the page number being displayed.
-#: actions/favorited.php:69
 #, php-format
 msgid "Popular notices, page %d"
 msgstr "ప్రాచుర్య నోటీసులు, పేజీ %d"
 
 #. TRANS: Description on page displaying favorited notices.
-#: actions/favorited.php:81
 msgid "The most popular notices on the site right now."
 msgstr "ప్రస్తుతం ఈ సైటులో అత్యంత ప్రాచుర్య నోటీసులు."
 
 #. TRANS: Text displayed instead of a list when a site does not yet have any favourited notices.
-#: actions/favorited.php:149
 msgid "Favorite notices appear on this page but no one has favorited one yet."
 msgstr ""
 
 #. TRANS: Additional text displayed instead of a list when a site does not yet have any favourited notices for logged in users.
-#: actions/favorited.php:153
 msgid ""
 "Be the first to add a notice to your favorites by clicking the fave button "
 "next to any notice you like."
@@ -2741,7 +2181,6 @@ msgstr ""
 
 #. TRANS: Additional text displayed instead of a list when a site does not yet have any favourited notices for not logged in users.
 #. TRANS: %%action.register%% is a registration link. "[link text](link)" is Mark Down. Do not change the formatting.
-#: actions/favorited.php:158
 #, fuzzy, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to add a "
@@ -2752,184 +2191,149 @@ msgstr "[ఒక ఖాతాని నమోదుచేసుకుని](%%ac
 #. TRANS: %s is a user's nickname.
 #. TRANS: Title for first page of favourite notices of a user.
 #. TRANS: %s is the user for whom the favourite notices are displayed.
-#: actions/favoritesrss.php:111 actions/showfavorites.php:76
-#: lib/personalgroupnav.php:110
 #, php-format
 msgid "%s's favorite notices"
 msgstr "%sకి ఇష్టమైన నోటీసులు"
 
 #. TRANS: Desciption of RSS feed with favourite notices of a user.
 #. TRANS: %1$s is a user's nickname, %2$s is the name of the StatusNet site.
-#: actions/favoritesrss.php:117
 #, php-format
 msgid "Updates favored by %1$s on %2$s!"
 msgstr "%2$sలో %1$s అనే ట్యాగుతో ఉన్న నోటీసులు!"
 
 #. TRANS: Page title for first page of featured users.
 #. TRANS: Title for featured users section.
-#: actions/featured.php:69 lib/featureduserssection.php:87
-#: lib/publicgroupnav.php:89
 msgid "Featured users"
 msgstr "విశేష వాడుకరులు"
 
 #. TRANS: Page title for all but first page of featured users.
 #. TRANS: %d is the page number being displayed.
-#: actions/featured.php:73
 #, php-format
 msgid "Featured users, page %d"
 msgstr "విశేష వాడుకరులు, పేజీ %d"
 
 #. TRANS: Description on page displaying featured users.
-#: actions/featured.php:102
 #, fuzzy, php-format
 msgid "A selection of some great users on %s."
 msgstr "%sలో కొందరు గొప్ప వాడుకరుల యొక్క ఎంపిక"
 
 #. TRANS: Client error displayed when no notice ID was given trying do display a file.
-#: actions/file.php:36
 msgid "No notice ID."
 msgstr "సందేశం లేదు."
 
 #. TRANS: Client error displayed when an invalid notice ID was given trying do display a file.
-#: actions/file.php:41
 msgid "No notice."
 msgstr "సందేశం లేదు."
 
 #. TRANS: Client error displayed when trying do display a file for a notice without a file attachement.
-#: actions/file.php:46
 msgid "No attachments."
 msgstr "జోడింపులు లేవు."
 
 #. TRANS: Client error displayed when trying do display a file for a notice with file attachements
 #. TRANS: that could not be found.
-#: actions/file.php:58
 msgid "No uploaded attachments."
 msgstr "ఎక్కించిన జోడింపులేమీ లేవు."
 
 #. TRANS: Client error displayed when subscribing to a remote profile and an unexpected response is received.
-#: actions/finishremotesubscribe.php:69
 msgid "Not expecting this response!"
 msgstr ""
 
 #. TRANS: Client error displayed when subscribing to a remote profile that does not exist.
-#: actions/finishremotesubscribe.php:81
 msgid "User being listened to does not exist."
 msgstr ""
 
 #. TRANS: Client error displayed when subscribing to a remote profile that is a local profile.
-#: actions/finishremotesubscribe.php:89 actions/remotesubscribe.php:58
 msgid "You can use the local subscription!"
 msgstr "మీరు స్థానిక చందాని ఉపయోగించవచ్చు!"
 
 #. TRANS: Client error displayed when subscribing to a remote profile that is blocked form subscribing to.
-#: actions/finishremotesubscribe.php:102
 msgid "That user has blocked you from subscribing."
 msgstr "ఆ వాడుకరి మిమ్మల్ని చందాచేరకుండా నిరోధించారు."
 
 #. TRANS: Client error displayed when subscribing to a remote profile without providing an authorised token.
-#: actions/finishremotesubscribe.php:114
 msgid "You are not authorized."
 msgstr "మీకు అధీకరణ లేదు."
 
 #. TRANS: Client error displayed when subscribing to a remote profile and conversion of the request token to access token fails.
-#: actions/finishremotesubscribe.php:118
 msgid "Could not convert request token to access token."
 msgstr ""
 
 #. TRANS: Client error displayed when subscribing to a remote profile fails because of an unsupported version of the OMB protocol.
-#: actions/finishremotesubscribe.php:124
 msgid "Remote service uses unknown version of OMB protocol."
 msgstr ""
 
 #. TRANS: Server error displayed when subscribing to a remote profile fails because the remote profile could not be updated.
-#: actions/finishremotesubscribe.php:145 lib/oauthstore.php:317
 #, fuzzy
 msgid "Error updating remote profile."
 msgstr "దూరపు ప్రొపైలుని తాజాకరించటంలో పొరపాటు"
 
 #. TRANS: Client error displayed when requesting a non-existent file.
-#: actions/getfile.php:77
 msgid "No such file."
 msgstr "అటువంటి ఫైలు లేదు."
 
 #. TRANS: Client error displayed when requesting a file without having read access to it.
-#: actions/getfile.php:82
 msgid "Cannot read file."
 msgstr "ఫైలుని చదవలేకపోతున్నాం."
 
 #. TRANS: Client error displayed when trying to assign an invalid role to a user.
-#: actions/grantrole.php:61 actions/revokerole.php:62
 msgid "Invalid role."
 msgstr "తప్పుడు పాత్ర."
 
 #. TRANS: Client error displayed when trying to assign an reserved role to a user.
-#: actions/grantrole.php:66 actions/revokerole.php:66
 msgid "This role is reserved and cannot be set."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to assign a role to a user while not being allowed to set roles.
-#: actions/grantrole.php:76
 msgid "You cannot grant user roles on this site."
 msgstr "ఈ సైటులో మీరు వాడుకరలకి పాత్రలను ఇవ్వలేరు."
 
 #. TRANS: Client error displayed when trying to assign a role to a user that already has that role.
-#: actions/grantrole.php:84
 msgid "User already has this role."
 msgstr "వాడుకరికి ఇప్పటికే ఈ పాత్ర ఉంది."
 
 #. TRANS: Client error displayed trying to block a user from a group while not specifying a to be blocked user profile.
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing a profile.
+#. TRANS: Client error displayed when not providing a profile ID on the Make Admin page.
 #. TRANS: Client error displayed trying a change a subscription without providing a profile.
 #. TRANS: Client error displayed when trying to change user options without specifying a user to work on.
-#: actions/groupblock.php:71 actions/groupunblock.php:71
-#: actions/makeadmin.php:71 actions/subedit.php:49
-#: lib/profileformaction.php:79
 #, fuzzy
 msgid "No profile specified."
 msgstr "గుంపు ఏమీ పేర్కొనలేదు."
 
 #. TRANS: Client error displayed trying to block a user from a group while specifying a non-existing profile.
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing an existing profile.
+#. TRANS: Client error displayed when specifying an invalid profile ID on the Make Admin page.
 #. TRANS: Client error displayed trying a change a subscription for a non-existant profile ID.
 #. TRANS: Client error displayed when trying to change user options without specifying an existing user to work on.
-#: actions/groupblock.php:77 actions/groupunblock.php:77
-#: actions/makeadmin.php:76 actions/subedit.php:57 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:87
 #, fuzzy
 msgid "No profile with that ID."
 msgstr "ఆ IDతో ఏ నోటీసూ కనబడలేదు."
 
 #. TRANS: Client error displayed trying to block a user from a group while not specifying a group to block a profile from.
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing a group.
-#: actions/groupblock.php:83 actions/groupunblock.php:83
-#: actions/makeadmin.php:81
+#. TRANS: Client error displayed when not providing a group ID on the Make Admin page.
 msgid "No group specified."
 msgstr "గుంపు ఏమీ పేర్కొనలేదు."
 
 #. TRANS: Client error displayed trying to block a user from a group while not being an admin user.
-#: actions/groupblock.php:95
 msgid "Only an admin can block group members."
 msgstr "నిర్వాహకులు మాత్రమే గుంపు సభ్యులను నిరోధించగలరు."
 
 #. TRANS: Client error displayed trying to block a user from a group while user is already blocked from the given group.
-#: actions/groupblock.php:100
 msgid "User is already blocked from group."
 msgstr "వాడుకరిని ఇప్పటికే గుంపునుండి నిరోధించారు."
 
 #. TRANS: Client error displayed trying to block a user from a group while user is not a member of given group.
-#: actions/groupblock.php:106
 msgid "User is not a member of group."
 msgstr "వాడుకరి ఈ గుంపులో సభ్యులు కాదు."
 
 #. TRANS: Title for block user from group page.
 #. TRANS: Form legend for form to block user from a group.
-#: actions/groupblock.php:141 actions/groupmembers.php:364
 msgid "Block user from group"
 msgstr "వాడుకరిని గుంపు నుండి నిరోధించు"
 
 #. TRANS: Explanatory text for block user from group form before setting the block.
 #. TRANS: %1$s is that to be blocked user, %2$s is the group the user will be blocked from.
-#: actions/groupblock.php:169
 #, php-format
 msgid ""
 "Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They "
@@ -2940,163 +2344,135 @@ msgstr ""
 "తొలగిస్తాం, ఇక భవిష్యత్తులో వారు గుంపులో ప్రచురించలేరు, మరియు గుంపుకి చందాచేరలేరు."
 
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
-#: actions/groupblock.php:191
 #, fuzzy
 msgid "Do not block this user from this group."
 msgstr "ఈ వాడుకరిని ఈ గుంపు నుండి నిరోధించకు"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
-#: actions/groupblock.php:198
 msgid "Block this user from this group."
 msgstr "ఈ వాడుకరిని ఈ గుంపునుండి నిరోధించండి."
 
 #. TRANS: Server error displayed when trying to block a user from a group fails because of an application error.
-#: actions/groupblock.php:215
 #, fuzzy
 msgid "Database error blocking user from group."
 msgstr "ఈ వాడుకరిని ఈ గుంపు నుండి నిరోధించకు"
 
 #. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
 #. TRANS: Client error displayed trying to find a user by ID without providing an ID.
-#: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr "ఐడీ లేదు."
 
 #. TRANS: Client error displayed trying to change group design settings while not logged in.
-#: actions/groupdesignsettings.php:67
 msgid "You must be logged in to edit a group."
 msgstr "గుంపుని మార్చడానికి మీరు ప్రవేశించి ఉండాలి."
 
 #. TRANS: Title group design settings page.
-#: actions/groupdesignsettings.php:146
 msgid "Group design"
 msgstr "గుంపు అలంకారం"
 
 #. TRANS: Instructions for group design settings page.
-#: actions/groupdesignsettings.php:157
 msgid ""
 "Customize the way your group looks with a background image and a colour "
 "palette of your choice."
 msgstr "నేపథ్య చిత్రం మరియు రంగుల ఎంపికతో మీ గుంపు ఎలా కనిపించాలో మలచుకోండి."
 
 #. TRANS: Form validation error displayed when group design settings could not be updated because of an application issue.
-#: actions/groupdesignsettings.php:262
 #, fuzzy
 msgid "Unable to update your design settings."
 msgstr "మీ రూపురేఖల అమరికలని భద్రపరచలేకున్నాం."
 
 #. TRANS: Form text to confirm saved group design settings.
-#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:239
 msgid "Design preferences saved."
 msgstr "ఈమెయిలు అభిరుచులు భద్రమయ్యాయి."
 
 #. TRANS: Title for group logo settings page.
 #. TRANS: Group logo form legend.
-#: actions/grouplogo.php:144 actions/grouplogo.php:199
 msgid "Group logo"
 msgstr "గుంపు చిహ్నం"
 
 #. TRANS: Instructions for group logo page.
 #. TRANS: %s is the maximum file size for that site.
-#: actions/grouplogo.php:156
 #, php-format
 msgid ""
 "You can upload a logo image for your group. The maximum file size is %s."
 msgstr "మీ గుంపుకి మీరు ఒక చిహ్నాన్ని ఎక్కించవచ్చు. ఆ ఫైలు యొక్క గరిష్ఠ పరిమాణం %s."
 
 #. TRANS: Submit button for uploading a group logo.
-#: actions/grouplogo.php:243
 msgid "Upload"
 msgstr "ఎగుమతించు"
 
 #. TRANS: Button text for cropping an uploaded group logo.
-#: actions/grouplogo.php:299
 msgid "Crop"
 msgstr "కత్తిరించు"
 
 #. TRANS: Form instructions on the group logo page.
-#: actions/grouplogo.php:376
 msgid "Pick a square area of the image to be the logo."
 msgstr "చిహ్నంగా ఉండాల్సిన చతురస్త్ర ప్రదేశాన్ని బొమ్మ నుండి ఎంచుకోండి."
 
 #. TRANS: Form success message after updating a group logo.
-#: actions/grouplogo.php:411
 msgid "Logo updated."
 msgstr "చిహ్నాన్ని తాజాకరించాం."
 
 #. TRANS: Form failure message after failing to update a group logo.
-#: actions/grouplogo.php:414
 msgid "Failed updating logo."
 msgstr "చిహ్నపు తాజాకరణ విఫలమైంది."
 
 #. TRANS: Title of the page showing group members.
 #. TRANS: %s is the name of the group.
-#: actions/groupmembers.php:104
 #, php-format
 msgid "%s group members"
 msgstr "%s గుంపు సభ్యులు"
 
 #. TRANS: Title of the page showing group members.
 #. TRANS: %1$s is the name of the group, %2$d is the page number of the members list.
-#: actions/groupmembers.php:109
 #, php-format
 msgid "%1$s group members, page %2$d"
 msgstr "%1$s గుంపు సభ్యులు, పేజీ %2$d"
 
 #. TRANS: Page notice for group members page.
-#: actions/groupmembers.php:125
 msgid "A list of the users in this group."
 msgstr "ఈ గుంపులో వాడుకరులు జాబితా."
 
 #. TRANS: Indicator in group members list that this user is a group administrator.
-#: actions/groupmembers.php:190 lib/action.php:581
 msgid "Admin"
 msgstr "నిర్వాహకులు"
 
 #. TRANS: Button text for the form that will block a user from a group.
-#: actions/groupmembers.php:397
 msgctxt "BUTTON"
 msgid "Block"
 msgstr "నిరోధించు"
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:401
 msgctxt "TOOLTIP"
 msgid "Block this user"
 msgstr "ఈ వాడుకరిని నిరోధించు"
 
 #. TRANS: Form legend for form to make a user a group admin.
-#: actions/groupmembers.php:488
 msgid "Make user an admin of the group"
 msgstr "వాడుకరిని గుంపుకి ఒక నిర్వాహకునిగా చేయి"
 
 #. TRANS: Button text for the form that will make a user administrator.
-#: actions/groupmembers.php:521
 msgctxt "BUTTON"
 msgid "Make Admin"
 msgstr ""
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:525
 msgctxt "TOOLTIP"
 msgid "Make this user an admin"
 msgstr ""
 
 #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
-#: actions/grouprss.php:141
 #, php-format
 msgid "Updates from members of %1$s on %2$s!"
 msgstr "%2$sలో %1$s మరియు స్నేహితుల నుండి తాజాకరణలు!"
 
 #. TRANS: Title for first page of the groups list.
-#: actions/groups.php:62
 msgctxt "TITLE"
 msgid "Groups"
 msgstr "గుంపులు"
 
 #. TRANS: Title for all but the first page of the groups list.
 #. TRANS: %d is the page number.
-#: actions/groups.php:66
 #, php-format
 msgctxt "TITLE"
 msgid "Groups, page %d"
@@ -3105,7 +2481,6 @@ msgstr "గుంపులు, పుట %d"
 #. TRANS: Page notice of group list. %%%%site.name%%%% is the StatusNet site name,
 #. TRANS: %%%%action.groupsearch%%%% and %%%%action.newgroup%%%% are URLs. Do not change them.
 #. TRANS: This message contains Markdown links in the form [link text](link).
-#: actions/groups.php:95
 #, fuzzy, php-format
 msgid ""
 "%%%%site.name%%%% groups let you find and talk with people of similar "
@@ -3120,12 +2495,10 @@ msgstr ""
 "%%action.groupsearch%%%%) లేదా [మీరే కొత్తది సృష్టించండి!](%%%%action.newgroup%%%%)"
 
 #. TRANS: Link to create a new group on the group list page.
-#: actions/groups.php:113 actions/usergroups.php:126 lib/groupeditform.php:115
 msgid "Create a new group"
 msgstr "కొత్త గుంపుని సృష్టించు"
 
 #. TRANS: Instructions for page where groups can be searched. %%site.name%% is the name of the StatusNet site.
-#: actions/groupsearch.php:53
 #, php-format
 msgid ""
 "Search for groups on %%site.name%% by their name, location, or description. "
@@ -3135,21 +2508,17 @@ msgstr ""
 "వేరుచేయండి; ఒక్కో పదంలో 3 లేదా అంతకంటే ఎక్కువ అక్షరాలు ఉండాలి."
 
 #. TRANS: Title for page where groups can be searched.
-#: actions/groupsearch.php:60
 msgid "Group search"
 msgstr "గుంపుల అన్వేషణ"
 
 #. TRANS: Text on page where groups can be searched if no results were found for a query.
 #. TRANS: Text for notice search results is the query had no results.
 #. TRANS: Message on the "People search" page where a query has no results.
-#: actions/groupsearch.php:82 actions/noticesearch.php:122
-#: actions/peoplesearch.php:87
 msgid "No results."
 msgstr "ఫలితాలేమీ లేవు."
 
 #. TRANS: Additional text on page where groups can be searched if no results were found for a query for a logged in user.
 #. TRANS: This message contains Markdown links in the form [link text](link).
-#: actions/groupsearch.php:87
 #, fuzzy, php-format
 msgid ""
 "If you cannot find the group you're looking for, you can [create it](%%"
@@ -3159,7 +2528,6 @@ msgstr ""
 
 #. TRANS: Additional text on page where groups can be searched if no results were found for a query for a not logged in user.
 #. TRANS: This message contains Markdown links in the form [link text](link).
-#: actions/groupsearch.php:92
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and [create the group](%%"
@@ -3169,30 +2537,25 @@ msgstr ""
 "action.newgroup%%)కూడదు!"
 
 #. TRANS: Client error displayed when trying to unblock a user from a group without being an administrator for the group.
-#: actions/groupunblock.php:95
 msgid "Only an admin can unblock group members."
 msgstr "నిర్వాహకులు మాత్రమే గుంపు సభ్యులపై నిరోధాన్ని ఎత్తివేయగలరు."
 
 #. TRANS: Client error displayed when trying to unblock a non-blocked user from a group.
-#: actions/groupunblock.php:100
 msgid "User is not blocked from group."
 msgstr "వాడుకరిని గుంపు నుండి నిరోధించలేదు."
 
 #. TRANS: Server error displayed when unblocking a user from a group fails because of an unknown error.
 #. TRANS: Server error displayed when removing a user block.
-#: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "నిరోధాన్ని తొలగించడంలో పొరపాటు."
 
 #. TRANS: Title for Instant Messaging settings.
-#: actions/imsettings.php:56
 msgid "IM settings"
 msgstr "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.
-#: actions/imsettings.php:69
 #, php-format
 msgid ""
 "You can send and receive notices through instant messaging [instant messages]"
@@ -3200,18 +2563,15 @@ msgid ""
 msgstr ""
 
 #. TRANS: Message given in the IM settings if IM is not enabled on the site.
-#: actions/imsettings.php:90
 msgid "IM is not available."
 msgstr "IM అందుబాటులో లేదు."
 
-#: actions/imsettings.php:116
 #, fuzzy, php-format
 msgid "Current confirmed %s address."
 msgstr "ప్రస్తుత నిర్ధారిత ఈమెయిలు చిరునామా."
 
 #. TRANS: Form note in IM settings form.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:128
 #, fuzzy, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your %s account for a message "
@@ -3220,169 +2580,140 @@ msgstr ""
 "ఈ చిరునామా నిర్ధారణకై వేచివున్నాం. తదుపరి సూచనలతో ఉన్న సందేశానికై మీ ఇన్‌బాక్స్‌లో (స్పామ్ బాక్సులో కూడా!) "
 "చూడండి."
 
-#: actions/imsettings.php:140
 msgid "IM address"
 msgstr "IM చిరునామా"
 
-#: actions/imsettings.php:142
 #, php-format
 msgid "%s screenname."
 msgstr ""
 
 #. TRANS: Header for IM preferences form.
-#: actions/imsettings.php:163
 #, fuzzy
 msgid "IM Preferences"
 msgstr "IM అభిరుచులు"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:174
 #, fuzzy
 msgid "Send me notices"
 msgstr "సైటు గమనిక"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:176
 msgid "Post a notice when my status changes."
 msgstr ""
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:178
 msgid "Send me replies from people I'm not subscribed to."
 msgstr ""
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:181
 #, fuzzy
 msgid "Publish a MicroID"
 msgstr "అది మీ ఈమెయిలు చిరునామా కాదు."
 
 #. TRANS: Server error thrown on database error updating IM preferences.
-#: actions/imsettings.php:291
 #, fuzzy
 msgid "Couldn't update IM preferences."
 msgstr "వాడుకరిని తాజాకరించలేకున్నాం."
 
 #. TRANS: Confirmation message for successful IM preferences save.
 #. TRANS: Confirmation message after saving preferences.
-#: actions/imsettings.php:298 actions/urlsettings.php:244
 msgid "Preferences saved."
 msgstr "అభిరుచులు భద్రమయ్యాయి."
 
 #. TRANS: Message given saving IM address without having provided one.
-#: actions/imsettings.php:320
 #, fuzzy
 msgid "No screenname."
 msgstr "పేరు"
 
-#: actions/imsettings.php:325
 #, fuzzy
 msgid "No transport."
 msgstr "సందేశం లేదు."
 
 #. TRANS: Message given saving IM address that cannot be normalised.
-#: actions/imsettings.php:333
 #, fuzzy
 msgid "Cannot normalize that screenname"
 msgstr "సరైన Jabber ఐడీ కాదు"
 
 #. TRANS: Message given saving IM address that not valid.
-#: actions/imsettings.php:340
 #, fuzzy
 msgid "Not a valid screenname"
 msgstr "సరైన పేరు కాదు."
 
 #. TRANS: Message given saving IM address that is already set for another user.
-#: actions/imsettings.php:344
 #, fuzzy
 msgid "Screenname already belongs to another user."
 msgstr "Jabber ID ఇప్పటికే వేరొకరికి ఉంది."
 
 #. TRANS: Message given saving valid IM address that is to be confirmed.
-#: actions/imsettings.php:369
 #, fuzzy
 msgid "A confirmation code was sent to the IM address you added."
 msgstr "ఆ నిర్ధారణా సంకేతం మీది కాదు!"
 
 #. TRANS: Message given canceling IM address confirmation for the wrong IM address.
-#: actions/imsettings.php:396
 msgid "That is the wrong IM address."
 msgstr "ఆ IM చిరునామా సరైనది కాదు."
 
 #. TRANS: Server error thrown on database error canceling IM address confirmation.
-#: actions/imsettings.php:405
 #, fuzzy
 msgid "Couldn't delete confirmation."
 msgstr "ఈమెయిల్ నిర్ధారణని తొలగించలేకున్నాం."
 
 #. TRANS: Message given after successfully canceling IM address confirmation.
-#: actions/imsettings.php:410
 msgid "IM confirmation cancelled."
 msgstr "IM నిర్ధారణ రద్దయింది."
 
 #. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.
-#: actions/imsettings.php:434
 #, fuzzy
 msgid "That is not your screenname."
 msgstr "అది మీ ఫోను నంబర్ కాదు."
 
 #. TRANS: Server error thrown on database error removing a registered IM address.
-#: actions/imsettings.php:443
 #, fuzzy
 msgid "Couldn't update user im prefs."
 msgstr "వాడుకరిని తాజాకరించలేకున్నాం."
 
 #. TRANS: Message given after successfully removing a registered Instant Messaging address.
-#: actions/imsettings.php:451
 msgid "The IM address was removed."
 msgstr "ఆ IM చిరునామాని తొలగించాం."
 
 #. TRANS: Title for all but the first page of the inbox page.
 #. TRANS: %1$s is the user's nickname, %2$s is the page number.
-#: actions/inbox.php:59
 #, php-format
 msgid "Inbox for %1$s - page %2$d"
 msgstr "%1$sకి వచ్చినవి - %2$dవ పేజీ"
 
 #. TRANS: Title for the first page of the inbox page.
 #. TRANS: %s is the user's nickname.
-#: actions/inbox.php:64
 #, php-format
 msgid "Inbox for %s"
 msgstr "%sకి వచ్చినవి"
 
 #. TRANS: Instructions for user inbox page.
-#: actions/inbox.php:106
 msgid "This is your inbox, which lists your incoming private messages."
 msgstr "ఇవి మీకు వచ్చిన అంతరంగిక సందేశాలు."
 
 #. TRANS: Client error displayed when trying to sent invites while they have been disabled.
-#: actions/invite.php:41
 msgid "Invites have been disabled."
 msgstr "ఆహ్వానాలని అచేతనం చేసారు."
 
 #. TRANS: Client error displayed when trying to sent invites while not logged in.
 #. TRANS: %s is the StatusNet site name.
-#: actions/invite.php:45
 #, php-format
 msgid "You must be logged in to invite other users to use %s."
 msgstr "sని ఉపయోగించమని ఇతర వాడుకరులని ఆహ్వానించడానికి మీరు ప్రవేశించి ఉండాలి."
 
 #. TRANS: Form validation message when providing an e-mail address that does not validate.
 #. TRANS: %s is an invalid e-mail address.
-#: actions/invite.php:78
 #, php-format
 msgid "Invalid email address: %s."
 msgstr "చెల్లని ఈమెయిలు చిరునామా: %s."
 
 #. TRANS: Page title when invitations have been sent.
-#: actions/invite.php:117
 msgid "Invitations sent"
 msgstr "ఆహ్వానాలని పంపించాం"
 
 #. TRANS: Page title when inviting potential users.
-#: actions/invite.php:120
 msgid "Invite new users"
 msgstr "కొత్త వాడుకరులని ఆహ్వానించండి"
 
@@ -3390,7 +2721,6 @@ msgstr "కొత్త వాడుకరులని ఆహ్వానిం
 #. TRANS: is already subscribed to one or more users with the given e-mail address(es).
 #. TRANS: Plural form is based on the number of reported already subscribed e-mail addresses.
 #. TRANS: Followed by a bullet list.
-#: actions/invite.php:140
 #, fuzzy
 msgid "You are already subscribed to this user:"
 msgid_plural "You are already subscribed to these users:"
@@ -3399,7 +2729,6 @@ msgstr[1] "మీరు ఇప్పటికే ఈ వాడుకరులక
 
 #. TRANS: Used as list item for already subscribed users (%1$s is nickname, %2$s is e-mail address).
 #. TRANS: Used as list item for already registered people (%1$s is nickname, %2$s is e-mail address).
-#: actions/invite.php:146 actions/invite.php:160
 #, php-format
 msgctxt "INVITE"
 msgid "%1$s (%2$s)"
@@ -3408,7 +2737,6 @@ msgstr "%1$s (%2$s)"
 #. TRANS: Message displayed inviting users to use a StatusNet site while the invited user
 #. TRANS: already uses a this StatusNet site. Plural form is based on the number of
 #. TRANS: reported already present people. Followed by a bullet list.
-#: actions/invite.php:154
 #, fuzzy
 msgid "This person is already a user and you were automatically subscribed:"
 msgid_plural ""
@@ -3419,7 +2747,6 @@ msgstr[1] "ఈ వ్యక్తులు ఇప్పటికే ఇక్క
 #. TRANS: Message displayed inviting users to use a StatusNet site. Plural form is
 #. TRANS: based on the number of invitations sent. Followed by a bullet list of
 #. TRANS: e-mail addresses to which invitations were sent.
-#: actions/invite.php:168
 msgid "Invitation sent to the following person:"
 msgid_plural "Invitations sent to the following people:"
 msgstr[0] "ఈ వ్యక్తికి ఆహ్వానాన్ని పంపించాం:"
@@ -3427,7 +2754,6 @@ msgstr[1] "ఈ వ్యక్తులకు ఆహ్వానాలని ప
 
 #. TRANS: Generic message displayed after sending out one or more invitations to
 #. TRANS: people to join a StatusNet site.
-#: actions/invite.php:178
 msgid ""
 "You will be notified when your invitees accept the invitation and register "
 "on the site. Thanks for growing the community!"
@@ -3436,34 +2762,29 @@ msgstr ""
 "పెంచుతున్నందుకు ధన్యవాదాలు!"
 
 #. TRANS: Form instructions.
-#: actions/invite.php:191
 msgid ""
 "Use this form to invite your friends and colleagues to use this service."
 msgstr "ఈ ఫారాన్ని ఉపయోగించి మీ స్నేహితులను మరియు సహోద్యోగులను ఈ సేవను వినియోగించుకోమని ఆహ్వానించండి."
 
 #. TRANS: Field label for a list of e-mail addresses.
-#: actions/invite.php:218
 msgid "Email addresses"
 msgstr "ఈమెయిలు చిరునామాలు"
 
 #. TRANS: Tooltip for field label for a list of e-mail addresses.
-#: actions/invite.php:221
 #, fuzzy
 msgid "Addresses of friends to invite (one per line)."
 msgstr "ఆహ్వానించాల్సిన మిత్రుల చిరునామాలు (లైనుకి ఒకటి చొప్పున)"
 
 #. TRANS: Field label for a personal message to send to invitees.
-#: actions/invite.php:225
 msgid "Personal message"
 msgstr "వ్యక్తిగత సందేశం"
 
 #. TRANS: Tooltip for field label for a personal message to send to invitees.
-#: actions/invite.php:228
 msgid "Optionally add a personal message to the invitation."
 msgstr "ఐచ్ఛికంగా ఆహ్వానానికి వ్యక్తిగత సందేశం చేర్చండి."
 
 #. TRANS: Send button for inviting friends
-#: actions/invite.php:232
+#. TRANS: Button text for sending notice.
 msgctxt "BUTTON"
 msgid "Send"
 msgstr "పంపించు"
@@ -3471,7 +2792,6 @@ msgstr "పంపించు"
 #. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral
 #. TRANS: singular 3rd-person pronoun in English. %1$s is the inviting user, $2$s is
 #. TRANS: the StatusNet sitename.
-#: actions/invite.php:264
 #, php-format
 msgid "%1$s has invited you to join them on %2$s"
 msgstr "%2$sలో చేరమని %1$s మిమ్మల్ని ఆహ్వానించారు"
@@ -3481,7 +2801,6 @@ msgstr "%2$sలో చేరమని %1$s మిమ్మల్ని ఆహ్
 #. TRANS: StatusNet sitename, %3$s is the site URL, %4$s is the personal message from the
 #. TRANS: inviting user, %s%5 a link to the timeline for the inviting user, %s$6 is a link
 #. TRANS: to register with the StatusNet site.
-#: actions/invite.php:271
 #, php-format
 msgid ""
 "%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -3536,321 +2855,311 @@ msgstr ""
 "వినమ్రతతో, %2$s\n"
 
 #. TRANS: Client error displayed when trying to join a group while not logged in.
-#: actions/joingroup.php:59
 msgid "You must be logged in to join a group."
 msgstr "గుంపుల్లో చేరడానికి మీరు ప్రవేశించి ఉండాలి."
 
 #. TRANS: Title for join group page after joining.
-#: actions/joingroup.php:148
 #, fuzzy, php-format
 msgctxt "TITLE"
 msgid "%1$s joined group %2$s"
 msgstr "%1$s %2$s గుంపులో చేరారు"
 
 #. TRANS: Client error displayed when trying to leave a group while not logged in.
-#: actions/leavegroup.php:59
 msgid "You must be logged in to leave a group."
 msgstr "గుంపుని వదిలివెళ్ళడానికి మీరు ప్రవేశించి ఉండాలి."
 
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
-#: actions/leavegroup.php:103 lib/command.php:398
 msgid "You are not a member of that group."
 msgstr "మీరు ఆ గుంపులో సభ్యులు కాదు."
 
 #. TRANS: Title for leave group page after leaving.
-#: actions/leavegroup.php:142
 #, fuzzy, php-format
 msgctxt "TITLE"
 msgid "%1$s left group %2$s"
 msgstr "%2$s గుంపు నుండి %1$s వైదొలిగారు"
 
 #. TRANS: User admin panel title
-#: actions/licenseadminpanel.php:55
 msgctxt "TITLE"
 msgid "License"
 msgstr "లైసెన్సు"
 
-#: actions/licenseadminpanel.php:65
+#. TRANS: Form instructions for the site license admin panel.
 msgid "License for this StatusNet site"
 msgstr ""
 
-#: actions/licenseadminpanel.php:134
+#. TRANS: Client error displayed selecting an invalid license in the license admin panel.
 msgid "Invalid license selection."
 msgstr ""
 
-#: actions/licenseadminpanel.php:144
+#. TRANS: Client error displayed when not specifying an owner for the all rights reserved license in the license admin panel.
 msgid ""
 "You must specify the owner of the content when using the All Rights Reserved "
 "license."
 msgstr ""
 
-#: actions/licenseadminpanel.php:151
+#. TRANS: Client error displayed selecting a too long license title in the license admin panel.
 #, fuzzy
 msgid "Invalid license title. Maximum length is 255 characters."
 msgstr "చెల్లని స్వాగత పాఠ్యం. గరిష్ఠ పొడవు 255 అక్షరాలు."
 
-#: actions/licenseadminpanel.php:163
+#. TRANS: Client error displayed specifying an invalid license URL in the license admin panel.
 msgid "Invalid license URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:166
+#. TRANS: Client error displayed specifying an invalid license image URL in the license admin panel.
 msgid "Invalid license image URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:174
+#. TRANS: Client error displayed specifying an invalid license URL in the license admin panel.
 msgid "License URL must be blank or a valid URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:182
+#. TRANS: Client error displayed specifying an invalid license image URL in the license admin panel.
 msgid "License image must be blank or valid URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:232
+#. TRANS: Form legend in the license admin panel.
 msgid "License selection"
 msgstr "లైసెన్సు ఎంపిక"
 
-#: actions/licenseadminpanel.php:238
+#. TRANS: License option in the license admin panel.
 msgid "Private"
 msgstr "అంతరంగికం"
 
-#: actions/licenseadminpanel.php:239
+#. TRANS: License option in the license admin panel.
 msgid "All Rights Reserved"
 msgstr ""
 
-#: actions/licenseadminpanel.php:240
+#. TRANS: License option in the license admin panel.
 msgid "Creative Commons"
 msgstr "క్రియేటివ్ కామన్స్"
 
-#: actions/licenseadminpanel.php:245
+#. TRANS: Dropdown field label in the license admin panel.
 msgid "Type"
 msgstr "రకం"
 
-#: actions/licenseadminpanel.php:247
-msgid "Select license"
+#. TRANS: Dropdown field instructions in the license admin panel.
+#, fuzzy
+msgid "Select a license."
 msgstr "లైసెన్సును ఎంచుకోండి"
 
-#: actions/licenseadminpanel.php:261
+#. TRANS: Form legend in the license admin panel.
 msgid "License details"
 msgstr "లైసెన్సు వివరాలు"
 
-#: actions/licenseadminpanel.php:267
+#. TRANS: Field label in the license admin panel.
 msgid "Owner"
 msgstr "యజమాని"
 
-#: actions/licenseadminpanel.php:268
+#. TRANS: Field title in the license admin panel.
 msgid "Name of the owner of the site's content (if applicable)."
 msgstr ""
 
-#: actions/licenseadminpanel.php:276
+#. TRANS: Field label in the license admin panel.
 msgid "License Title"
 msgstr ""
 
-#: actions/licenseadminpanel.php:277
+#. TRANS: Field title in the license admin panel.
 msgid "The title of the license."
 msgstr ""
 
-#: actions/licenseadminpanel.php:285
+#. TRANS: Field label in the license admin panel.
 msgid "License URL"
 msgstr ""
 
-#: actions/licenseadminpanel.php:286
+#. TRANS: Field title in the license admin panel.
 msgid "URL for more information about the license."
 msgstr ""
 
-#: actions/licenseadminpanel.php:293
+#. TRANS: Field label in the license admin panel.
 msgid "License Image URL"
 msgstr ""
 
-#: actions/licenseadminpanel.php:294
+#. TRANS: Field title in the license admin panel.
 msgid "URL for an image to display with the license."
 msgstr ""
 
-#. TRANS: Submit button title.
-#: actions/licenseadminpanel.php:311 actions/sessionsadminpanel.php:199
-#: actions/siteadminpanel.php:292 actions/snapshotadminpanel.php:245
-#: actions/tagother.php:133 lib/applicationeditform.php:357
-msgid "Save"
-msgstr "భద్రపరచు"
-
-#: actions/licenseadminpanel.php:311
-msgid "Save license settings"
+#. TRANS: Button title in the license admin panel.
+#, fuzzy
+msgid "Save license settings."
 msgstr "లైసెన్సు అమరికలను భద్రపరచు"
 
+#. TRANS: Client error displayed when trying to log in while already logged in.
 #. TRANS: Client error displayed trying to use "one time password login" when already logged in.
-#: actions/login.php:97 actions/otp.php:62 actions/register.php:130
 msgid "Already logged in."
 msgstr "ఇప్పటికే లోనికి ప్రవేశించారు."
 
-#: actions/login.php:125
+#. TRANS: Form validation error displayed when trying to log in with incorrect credentials.
 msgid "Incorrect username or password."
 msgstr "వాడుకరిపేరు లేదా సంకేతపదం తప్పు."
 
+#. TRANS: Server error displayed when during login a server error occurs.
 #. TRANS: Server error displayed when a user object could not be created trying to login using "one time password login".
-#: actions/login.php:131 actions/otp.php:127
 msgid "Error setting user. You are probably not authorized."
 msgstr "వాడుకరిని అమర్చడంలో పొరపాటు. బహుశా మీకు అధీకరణ లేకపోవచ్చు."
 
-#: actions/login.php:185 actions/login.php:236 lib/action.php:598
+#. TRANS: Page title for login page.
 msgid "Login"
 msgstr "ప్రవేశించండి"
 
-#: actions/login.php:222
+#. TRANS: Form legend on login page.
 msgid "Login to site"
 msgstr "సైటు లోనికి ప్రవేశించు"
 
-#: actions/login.php:231 actions/register.php:469
+#. TRANS: Checkbox label label on login page.
 msgid "Remember me"
 msgstr "నన్ను గుర్తుంచుకో"
 
-#: actions/login.php:232 actions/register.php:471
+#. TRANS: Checkbox title on login page.
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "భవిష్యత్తులో ఆటోమెటిగ్గా లోనికి ప్రవేశించు; బయటి కంప్యూర్ల కొరకు కాదు!"
 
-#: actions/login.php:241
+#. TRANS: Button text for log in on login page.
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Login"
+msgstr "ప్రవేశించండి"
+
+#. TRANS: Link text for link to "reset password" on login page.
 msgid "Lost or forgotten password?"
 msgstr "మీ సంకేతపదం మర్చిపోయారా?"
 
-#: actions/login.php:259
+#. TRANS: Form instructions on login page before being able to change user settings.
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
 msgstr ""
 "భద్రతా కారణాల దృష్ట్యా, అమరికలు మార్చే ముందు మీ వాడుకరి పేరుని మరియు సంకేతపదాన్ని మరోసారి ఇవ్వండి."
 
-#: actions/login.php:263
+#. TRANS: Form instructions on login page.
 msgid "Login with your username and password."
 msgstr "మీ వాడుకరిపేరు మరియు సంకేతపదాలతో ప్రవేశించండి."
 
-#: actions/login.php:266
+#. TRANS: Form instructions on login page. This message contains Markdown links in the form [Link text](Link).
+#. TRANS: %%action.register%% is a link to the registration page.
 #, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
 msgstr "మీకు ఇంకా వాడుకరిపేరు లేదా? కొత్త ఖాతాని [నమోదుచేసుకోండి](%%action.register%%)."
 
-#: actions/makeadmin.php:92
+#. TRANS: Client error displayed when trying to make another user admin on the Make Admin page while not an admin.
 msgid "Only an admin can make another user an admin."
 msgstr "నిర్వాహకులు మాత్రమే మరొక వాడుకరిని నిర్వాహకునిగా చేయగలరు."
 
-#: actions/makeadmin.php:96
+#. TRANS: Client error displayed when trying to make another user admin on the Make Admin page who already is admin.
+#. TRANS: %1$s is the user that is already admin, %2$s is the group user is already admin for.
 #, php-format
 msgid "%1$s is already an admin for group \"%2$s\"."
 msgstr "%1$s ఇప్పటికే \"%2$s\" గుంపు యొక్క ఒక నిర్వాకులు."
 
-#: actions/makeadmin.php:133
+#. TRANS: Server error displayed when trying to make another user admin on the Make Admin page fails
+#. TRANS: because the group membership record could not be gotten.
+#. TRANS: %1$s is the to be admin user, %2$s is the group user should be admin for.
 #, php-format
 msgid "Can't get membership record for %1$s in group %2$s."
 msgstr "%1$sని %2$s గుంపు యొక్క నిర్వాహకున్ని చేయలేకపోయాం."
 
-#: actions/makeadmin.php:146
+#. TRANS: Server error displayed when trying to make another user admin on the Make Admin page fails
+#. TRANS: because the group adminship record coud not be saved properly.
+#. TRANS: %1$s is the to be admin user, %2$s is the group user is already admin for.
 #, php-format
 msgid "Can't make %1$s an admin for group %2$s."
 msgstr "%1$sని %2$s గుంపు యొక్క నిర్వాహకున్ని చేయలేకపోయాం."
 
-#: actions/microsummary.php:69
+#. TRANS: Client error displayed trying to make a micro summary without providing a status.
 msgid "No current status."
 msgstr "ప్రస్తుత స్థితి ఏమీ లేదు."
 
 #. TRANS: This is the title of the form for adding a new application.
-#: actions/newapplication.php:52
 msgid "New application"
 msgstr "కొత్త ఉపకరణం"
 
 #. TRANS: Client error displayed trying to add a new application while not logged in.
-#: actions/newapplication.php:64
 msgid "You must be logged in to register an application."
 msgstr "ఉపకరణాలని నమోదుచేసుకోడానికి మీరు లోనికి ప్రవేశించి ఉండాలి."
 
 #. TRANS: Form instructions for registering a new application.
-#: actions/newapplication.php:147
 msgid "Use this form to register a new application."
 msgstr "కొత్త ఉపకరణాన్ని నమోదుచేసుకోడానికి ఈ ఫారాన్ని ఉపయోగించండి."
 
 #. TRANS: Validation error shown when not providing a source URL in the "New application" form.
-#: actions/newapplication.php:189
 #, fuzzy
 msgid "Source URL is required."
 msgstr "పేరు తప్పనిసరి."
 
 #. TRANS: Server error displayed when an application could not be registered in the database through the "New application" form.
-#: actions/newapplication.php:279 actions/newapplication.php:289
 msgid "Could not create application."
 msgstr "ఉపకరణాన్ని సృష్టించలేకపోయాం."
 
 #. TRANS: Title for form to create a group.
-#: actions/newgroup.php:53
 msgid "New group"
 msgstr "కొత్త గుంపు"
 
 #. TRANS: Client exception thrown when a user tries to create a group while banned.
-#: actions/newgroup.php:73 classes/User_group.php:485
 #, fuzzy
 msgid "You are not allowed to create groups on this site."
 msgstr "ఈ గుంపును తొలగించడానికి మీకు అనుమతి లేదు."
 
 #. TRANS: Form instructions for group create form.
-#: actions/newgroup.php:117
 msgid "Use this form to create a new group."
 msgstr "కొత్త గుంపుని సృష్టిండానికి ఈ ఫారాన్ని ఉపయోగించండి."
 
-#. TRANS: Group create form validation error.
-#: actions/newgroup.php:200
-#, fuzzy
-msgid "Alias cannot be the same as nickname."
-msgstr "మారుపేరు పేరుతో సమానంగా ఉండకూడదు."
-
-#: actions/newmessage.php:71 actions/newmessage.php:234
+#. TRANS: Page title for new direct message page.
+#. TRANS: Page title on page for sending a direct message.
 msgid "New message"
 msgstr "కొత్త సందేశం"
 
-#. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
-#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:513
-msgid "You can't send a message to this user."
+#. TRANS: Client error displayed trying to send a direct message to a user while sender and
+#. TRANS: receiver are not subscribed to each other.
+#, fuzzy
+msgid "You cannot send a message to this user."
 msgstr "ఈ వాడుకరికి మీరు సందేశాన్ని పంపించలేరు."
 
+#. TRANS: Form validator error displayed trying to send a direct message without content.
+#. TRANS: Client error displayed trying to send a notice without content.
 #. TRANS: Command exception text shown when trying to send a direct message to another user without content.
 #. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
-#: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:490
-#: lib/command.php:593
 msgid "No content!"
 msgstr "విషయం లేదు!"
 
-#: actions/newmessage.php:161
+#. TRANS: Form validation error displayed trying to send a direct message without specifying a recipient.
 msgid "No recipient specified."
 msgstr "ఎవరికి పంపించాలో పేర్కొనలేదు."
 
+#. TRANS: Client error displayed trying to send a direct message to self.
 #. TRANS: Error text shown when trying to send a direct message to self.
-#: actions/newmessage.php:167 lib/command.php:517
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr "మీకు మీరే సందేశాన్ని పంపుకోకండి; దాని బదులు మీలో మీరే మెల్లగా చెప్పుకోండి."
 
-#: actions/newmessage.php:184
+#. TRANS: Page title after sending a direct message.
 msgid "Message sent"
 msgstr "సందేశాన్ని పంపించాం"
 
+#. TRANS: Confirmation text after sending a direct message.
+#. TRANS: %s is the direct message recipient.
 #. TRANS: Message given have sent a direct message to another user.
 #. TRANS: %s is the name of the other user.
-#: actions/newmessage.php:188 lib/command.php:525
 #, php-format
 msgid "Direct message to %s sent."
 msgstr "%sకి నేరు సందేశాన్ని పంపించాం."
 
-#: actions/newmessage.php:213 actions/newnotice.php:264
+#. TRANS: Page title after an AJAX error occurred on the "send direct message" page.
+#. TRANS: Page title after an AJAX error occurs on the send notice page.
 msgid "Ajax Error"
 msgstr "అజాక్స్ పొరపాటు"
 
-#: actions/newnotice.php:69
+#. TRANS: Page title for sending a new notice.
 msgid "New notice"
 msgstr "కొత్త సందేశం"
 
-#: actions/newnotice.php:230
+#. TRANS: Page title after sending a notice.
 msgid "Notice posted"
 msgstr "నోటీసుని పునరావృతించారు"
 
 #. TRANS: Instructions for Notice search page.
 #. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/noticesearch.php:69
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -3860,20 +3169,17 @@ msgstr ""
 "అంతకంటే ఎక్కువ అక్షరాలు ఉండాలి."
 
 #. TRANS: Title of the page where users can search for notices.
-#: actions/noticesearch.php:80
 msgid "Text search"
 msgstr "పాఠ్య అన్వేషణ"
 
 #. TRANS: Test in RSS notice search.
 #. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearch.php:95
 #, php-format
 msgid "Search results for \"%1$s\" on %2$s"
 msgstr "%2$sలో \"%1$s\"కై అన్వేషణ ఫలితాలు"
 
 #. TRANS: Text for logged in users making a query for notices without results.
 #. TRANS: This message contains a Markdown link.
-#: actions/noticesearch.php:128
 #, php-format
 msgid ""
 "Be the first to [post on this topic](%%%%action.newnotice%%%%?"
@@ -3883,7 +3189,6 @@ msgstr ""
 
 #. TRANS: Text for not logged in users making a query for notices without results.
 #. TRANS: This message contains Markdown links.
-#: actions/noticesearch.php:133
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and be the first to "
@@ -3893,80 +3198,69 @@ msgstr ""
 "newnotice%%%%?status_textarea=%s) మొదటివారు ఎందుకుకాకూడదు!"
 
 #. TRANS: RSS notice search feed title. %s is the query.
-#: actions/noticesearchrss.php:95
 #, php-format
 msgid "Updates with \"%s\""
 msgstr "%2$sలో %1$s అనే ట్యాగుతో ఉన్న నోటీసులు!"
 
 #. TRANS: RSS notice search feed description.
 #. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearchrss.php:99
 #, fuzzy, php-format
 msgid "Updates matching search term \"%1$s\" on %2$s."
 msgstr "%2$sలో %1$s అనే ట్యాగుతో ఉన్న నోటీసులు!"
 
-#: actions/nudge.php:85
+#. TRANS: Client error displayed trying to nudge a user that cannot be nudged.
 msgid ""
 "This user doesn't allow nudges or hasn't confirmed or set their email "
 "address yet."
 msgstr ""
 
-#: actions/nudge.php:94
+#. TRANS: Page title after sending a nudge.
 #, fuzzy
 msgid "Nudge sent"
 msgstr "సందేశాన్ని పంపించాం"
 
-#: actions/nudge.php:97
+#. TRANS: Confirmation text after sending a nudge.
 #, fuzzy
 msgid "Nudge sent!"
 msgstr "సందేశాన్ని పంపించాం"
 
 #. TRANS: Message displayed to an anonymous user trying to view OAuth application list.
-#: actions/oauthappssettings.php:57
 msgid "You must be logged in to list your applications."
 msgstr "మీ ఉపకరణాలను చూడడానికి మీరు ప్రవేశించి ఉండాలి."
 
 #. TRANS: Page title for OAuth applications
-#: actions/oauthappssettings.php:73
 msgid "OAuth applications"
 msgstr "OAuth ఉపకరణాలు"
 
 #. TRANS: Page instructions for OAuth applications
-#: actions/oauthappssettings.php:85
 msgid "Applications you have registered"
 msgstr "మీరు నమోదు చేసివున్న ఉపకరణాలు"
 
 #. TRANS: Empty list message on page with OAuth applications.
-#: actions/oauthappssettings.php:138
 #, php-format
 msgid "You have not registered any applications yet."
 msgstr "మీరు ఇంకా ఏ ఉపకరణాన్నీ నమోదు చేసుకోలేదు."
 
 #. TRANS: Title for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:69
 msgid "Connected applications"
 msgstr "సంధానిత ఉపకరణాలు"
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:80
 msgid "The following connections exist for your account."
 msgstr ""
 
 #. TRANS: Client error when trying to revoke access for an application while not being a user of it.
-#: actions/oauthconnectionssettings.php:165
 msgid "You are not a user of that application."
 msgstr "మీరు ఆ ఉపకరణం యొక్క వాడుకరి కాదు."
 
 #. TRANS: Client error when revoking access has failed for some reason.
 #. TRANS: %s is the application ID revoking access failed for.
-#: actions/oauthconnectionssettings.php:180
 #, fuzzy, php-format
 msgid "Unable to revoke access for application: %s."
 msgstr "మీ ఉపకరణాన్ని మార్చడానికి ఈ ఫారాన్ని ఉపయోగించండి."
 
 #. TRANS: Success message after revoking access for an application.
 #. TRANS: %1$s is the application name, %2$s is the first part of the user token.
-#: actions/oauthconnectionssettings.php:199
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -3974,473 +3268,390 @@ msgid ""
 msgstr ""
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:210
 msgid "You have not authorized any applications to use your account."
 msgstr "మీ ఖాతాని ఉపయోగించుకోడానికి మీరు ఏ ఉపకరణాన్నీ అధీకరించలేదు."
 
 #. TRANS: Note for developers in the OAuth connection settings form.
 #. TRANS: This message contains a Markdown link. Do not separate "](".
 #. TRANS: %s is the URL to the OAuth settings.
-#: actions/oauthconnectionssettings.php:230
 #, php-format
 msgid ""
 "Are you a developer? [Register an OAuth client application](%s) to use with "
 "this instance of StatusNet."
 msgstr ""
 
-#: actions/oembed.php:64
+#. TRANS: Server error displayed in oEmbed action when path not found.
+#. TRANS: %s is a path.
 #, fuzzy, php-format
 msgid "\"%s\" not found."
 msgstr "వాడుకరి దొరకలేదు."
 
-#: actions/oembed.php:76
+#. TRANS: Server error displayed in oEmbed action when notice not found.
+#. TRANS: %s is a notice.
 #, fuzzy, php-format
 msgid "Notice %s not found."
 msgstr "నిర్ధారణ సంకేతం కనబడలేదు."
 
-#: actions/oembed.php:80 actions/shownotice.php:100
+#. TRANS: Server error displayed in oEmbed action when notice has not profile.
 msgid "Notice has no profile."
 msgstr "నోటీసుకి ప్రొఫైలు లేదు."
 
-#: actions/oembed.php:83 actions/shownotice.php:172
+#. TRANS: oEmbed title. %1$s is the author name, %2$s is the creation date.
 #, php-format
 msgid "%1$s's status on %2$s"
 msgstr "%2$sలో %1$s యొక్క స్థితి"
 
-#: actions/oembed.php:95
+#. TRANS: Server error displayed in oEmbed action when attachment not found.
+#. TRANS: %d is an attachment ID.
 #, fuzzy, php-format
 msgid "Attachment %s not found."
 msgstr "అందుకోవాల్సిన వాడుకరి కనబడలేదు."
 
-#: actions/oembed.php:136
+#. TRANS: Server error displayed in oEmbed request when a path is not supported.
+#. TRANS: %s is a path.
 #, php-format
 msgid "\"%s\" not supported for oembed requests."
 msgstr ""
 
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
-#: actions/oembed.php:168
 #, fuzzy, php-format
 msgid "Content type %s not supported."
 msgstr "విషయ రకం "
 
 #. TRANS: Error message displaying attachments. %s is the site's base URL.
-#: actions/oembed.php:172
 #, php-format
 msgid "Only %s URLs over plain HTTP please."
 msgstr ""
 
+#. TRANS: Server error displayed in oEmbed action when request specifies an unsupported data format.
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1207
-#: lib/apiaction.php:1234 lib/apiaction.php:1369
 msgid "Not a supported data format."
 msgstr ""
 
 #. TRANS: ShortName in the OpenSearch interface when trying to find users.
-#: actions/opensearch.php:64
 msgid "People Search"
 msgstr "ప్రజల అన్వేషణ"
 
-#: actions/opensearch.php:68
+#. TRANS: ShortName in the OpenSearch interface when trying to find notices.
 msgid "Notice Search"
 msgstr "నోటీసుల అన్వేషణ"
 
 #. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
-#: actions/otp.php:70
 msgid "No user ID specified."
 msgstr "గుంపు ఏమీ పేర్కొనలేదు."
 
 #. TRANS: Client error displayed trying to use "one time password login" without specifying a login token.
-#: actions/otp.php:86
 msgid "No login token specified."
 msgstr "గుంపు ఏమీ పేర్కొనలేదు."
 
 #. TRANS: Client error displayed trying to use "one time password login" without requesting a login token.
-#: actions/otp.php:94
 #, fuzzy
 msgid "No login token requested."
 msgstr "అధీకరణ అభ్యర్థన లేదు!"
 
 #. TRANS: Client error displayed trying to use "one time password login" while specifying an invalid login token.
-#: actions/otp.php:100
 #, fuzzy
 msgid "Invalid login token specified."
 msgstr "సందేశపు విషయం సరైనది కాదు"
 
 #. TRANS: Client error displayed trying to use "one time password login" while specifying an expired login token.
-#: actions/otp.php:110
 #, fuzzy
 msgid "Login token expired."
 msgstr "సైటు లోనికి ప్రవేశించు"
 
 #. TRANS: Title for outbox for any but the fist page.
 #. TRANS: %1$s is the user nickname, %2$d is the page number.
-#: actions/outbox.php:57
 #, fuzzy, php-format
 msgid "Outbox for %1$s - page %2$d"
 msgstr "%1$sకి వచ్చినవి - %2$dవ పేజీ"
 
 #. TRANS: Title for first page of outbox.
-#: actions/outbox.php:61
 #, fuzzy, php-format
 msgid "Outbox for %s"
 msgstr "%sకి వచ్చినవి"
 
 #. TRANS: Instructions for outbox.
-#: actions/outbox.php:103
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr "ఇవి మీరు పంపివున్న అంతరంగిక సందేశాలు."
 
-#: actions/passwordsettings.php:58
 msgid "Change password"
 msgstr "సంకేతపదం మార్చుకోండి"
 
-#: actions/passwordsettings.php:69
 msgid "Change your password."
 msgstr "మీ సంకేతపదం మార్చుకోండి."
 
 #. TRANS: Fieldset legend for password reset form.
-#: actions/passwordsettings.php:96 actions/recoverpassword.php:251
 msgid "Password change"
 msgstr "సంకేతపదం మార్పు"
 
-#: actions/passwordsettings.php:104
 msgid "Old password"
 msgstr "పాత సంకేతపదం"
 
 #. TRANS: Field label for password reset form.
-#: actions/passwordsettings.php:108 actions/recoverpassword.php:256
 msgid "New password"
 msgstr "కొత్త సంకేతపదం"
 
-#: actions/passwordsettings.php:109 actions/register.php:416
 msgid "6 or more characters."
 msgstr "6 లేదా అంతకంటే ఎక్కువ అక్షరాలు."
 
 #. TRANS: Ttile for field label for password reset form where the password has to be typed again.
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:264
-#: actions/register.php:420
 #, fuzzy
 msgid "Same as password above."
 msgstr "పై సంకేతపదం వలెనే"
 
-#: actions/passwordsettings.php:117
 msgid "Change"
 msgstr "మార్చు"
 
-#: actions/passwordsettings.php:153 actions/register.php:223
 msgid "Password must be 6 or more characters."
 msgstr "సంకేతపదం తప్పనిసరిగా 6 లేదా అంతకంటే ఎక్కువ అక్షరాలుండాలి."
 
-#: actions/passwordsettings.php:156 actions/register.php:226
 msgid "Passwords don't match."
 msgstr "సంకేతపదాలు సరిపోలలేదు."
 
-#: actions/passwordsettings.php:164
 msgid "Incorrect old password"
 msgstr "పాత సంకేతపదం తప్పు"
 
-#: actions/passwordsettings.php:180
 msgid "Error saving user; invalid."
 msgstr "వాడుకరిని భద్రపరచడంలో పొరపాటు: సరికాదు."
 
 #. TRANS: Reset password form validation error message.
-#: actions/passwordsettings.php:185 actions/recoverpassword.php:418
 #, fuzzy
 msgid "Cannot save new password."
 msgstr "కొత్త సంకేతపదాన్ని భద్రపరచలేము."
 
-#: actions/passwordsettings.php:191
 msgid "Password saved."
 msgstr "సంకేతపదం భద్రమయ్యింది."
 
 #. TRANS: Title for Paths admin panel.
 #. TRANS: Menu item for site administration
-#: actions/pathsadminpanel.php:58 lib/adminpanelaction.php:371
 msgid "Paths"
 msgstr "త్రోవలు"
 
 #. TRANS: Form instructions for Path admin panel.
-#: actions/pathsadminpanel.php:69
 msgid "Path and server settings for this StatusNet site"
 msgstr ""
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the directory that could not be read from.
-#: actions/pathsadminpanel.php:155
 #, php-format
 msgid "Theme directory not readable: %s."
 msgstr "అలంకారం అందుబాటులో లేదు: %s."
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the avatar directory that could not be written to.
-#: actions/pathsadminpanel.php:163
 #, php-format
 msgid "Avatar directory not writable: %s."
 msgstr "అవతారాల సంచయం"
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the background directory that could not be written to.
-#: actions/pathsadminpanel.php:171
 #, fuzzy, php-format
 msgid "Background directory not writable: %s."
 msgstr "నేపథ్యాల సంచయం"
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the locales directory that could not be read from.
-#: actions/pathsadminpanel.php:181
 #, fuzzy, php-format
 msgid "Locales directory not readable: %s."
 msgstr "హోమ్ పేజీ URL సరైనది కాదు."
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the SSL server URL that is too long.
-#: actions/pathsadminpanel.php:189
 #, fuzzy
 msgid "Invalid SSL server. The maximum length is 255 characters."
 msgstr "చెల్లని స్వాగత పాఠ్యం. గరిష్ఠ పొడవు 255 అక్షరాలు."
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:235 actions/siteadminpanel.php:58
 msgid "Site"
 msgstr "సైటు"
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:241 actions/pathsadminpanel.php:279
-#: actions/pathsadminpanel.php:370 actions/pathsadminpanel.php:425
 msgid "Server"
 msgstr "సేవకి"
 
-#: actions/pathsadminpanel.php:242
 msgid "Site's server hostname."
 msgstr ""
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:248 actions/pathsadminpanel.php:288
-#: actions/pathsadminpanel.php:379 actions/pathsadminpanel.php:434
 msgid "Path"
 msgstr "త్రోవ"
 
-#: actions/pathsadminpanel.php:249
 #, fuzzy
 msgid "Site path."
 msgstr "సైటు అలంకారం"
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:255
 #, fuzzy
 msgid "Locale directory"
 msgstr "అలంకార సంచయం"
 
-#: actions/pathsadminpanel.php:256
 msgid "Directory path to locales."
 msgstr ""
 
 #. TRANS: Checkbox label in Paths admin panel.
-#: actions/pathsadminpanel.php:263
 msgid "Fancy URLs"
 msgstr ""
 
-#: actions/pathsadminpanel.php:265
 msgid "Use fancy (more readable and memorable) URLs?"
 msgstr ""
 
-#: actions/pathsadminpanel.php:272
 msgid "Theme"
 msgstr "అలంకారం"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:281
 #, fuzzy
 msgid "Server for themes."
 msgstr "సైటుకి అలంకారం."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:290
 msgid "Web path to themes."
 msgstr ""
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:297 actions/pathsadminpanel.php:388
-#: actions/pathsadminpanel.php:443 actions/pathsadminpanel.php:495
 msgid "SSL server"
 msgstr "సేవకి"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:299
 msgid "SSL server for themes (default: SSL server)."
 msgstr ""
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:306 actions/pathsadminpanel.php:397
-#: actions/pathsadminpanel.php:452
 #, fuzzy
 msgid "SSL path"
 msgstr "సైటు అలంకారం"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:308
 msgid "SSL path to themes (default: /theme/)."
 msgstr ""
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:315 actions/pathsadminpanel.php:406
-#: actions/pathsadminpanel.php:461
 #, fuzzy
 msgid "Directory"
 msgstr "అలంకార సంచయం"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:317
 msgid "Directory where themes are located."
 msgstr ""
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:326
 msgid "Avatars"
 msgstr "అవతారాలు"
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:333
 msgid "Avatar server"
 msgstr "అవతారాల సేవకి"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:335
 #, fuzzy
 msgid "Server for avatars."
 msgstr "సైటుకి అలంకారం."
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:342
 #, fuzzy
 msgid "Avatar path"
 msgstr "అవతారాన్ని తాజాకరించాం."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:344
 #, fuzzy
 msgid "Web path to avatars."
 msgstr "అవతారపు తాజాకరణ విఫలమైంది."
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:351
 msgid "Avatar directory"
 msgstr "అవతారాల సంచయం"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:353
 msgid "Directory where avatars are located."
 msgstr ""
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:364
 msgid "Backgrounds"
 msgstr "నేపథ్యాలు"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:372
 #, fuzzy
 msgid "Server for backgrounds."
 msgstr "సైటుకి అలంకారం."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:381
 msgid "Web path to backgrounds."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:390
 msgid "Server for backgrounds on SSL pages."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:399
 msgid "Web path to backgrounds on SSL pages."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:408
 msgid "Directory where backgrounds are located."
 msgstr ""
 
 #. TRANS: Fieldset legens in Paths admin panel.
-#: actions/pathsadminpanel.php:419
 msgid "Attachments"
 msgstr "జోడింపులు"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:427
 #, fuzzy
 msgid "Server for attachments."
 msgstr "సైటుకి అలంకారం."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:436
 #, fuzzy
 msgid "Web path to attachments."
 msgstr "జోడింపులు లేవు."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:445
 #, fuzzy
 msgid "Server for attachments on SSL pages."
 msgstr "సైటుకి అలంకారం."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:454
 msgid "Web path to attachments on SSL pages."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:463
 msgid "Directory where attachments are located."
 msgstr ""
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:472
 #, fuzzy
 msgid "SSL"
 msgstr "SSLని ఉపయోగించు"
 
 #. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
-#: actions/pathsadminpanel.php:477 actions/snapshotadminpanel.php:202
 msgid "Never"
 msgstr "సేవకి"
 
 #. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
-#: actions/pathsadminpanel.php:479
 msgid "Sometimes"
 msgstr "కొన్నిసార్లు"
 
 #. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
-#: actions/pathsadminpanel.php:481
 msgid "Always"
 msgstr "ఎల్లప్పుడూ"
 
-#: actions/pathsadminpanel.php:485
 msgid "Use SSL"
 msgstr "SSLని ఉపయోగించు"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:487
 #, fuzzy
 msgid "When to use SSL."
 msgstr "SSLని ఎప్పుడు ఉపయోగించాలి"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:497
 msgid "Server to direct SSL requests to."
 msgstr ""
 
 #. TRANS: Button title text to store form data in the Paths admin panel.
-#: actions/pathsadminpanel.php:514
 #, fuzzy
 msgid "Save paths"
 msgstr "కొత్త సందేశం"
 
 #. TRANS: Instructions for the "People search" page.
 #. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/peoplesearch.php:54
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
@@ -4450,57 +3661,46 @@ msgstr ""
 "ఖాళీలతో వేరుచేయండి; ఒక్కో పదంలో 3 లేదా అంతకంటే ఎక్కువ అక్షరాలు ఉండాలి."
 
 #. TRANS: Title of a page where users can search for other users.
-#: actions/peoplesearch.php:61
 msgid "People search"
 msgstr "వ్యక్తుల అన్వేషణ"
 
-#: actions/peopletag.php:68
 #, fuzzy, php-format
 msgid "Not a valid people tag: %s."
 msgstr "సరైన ఈమెయిల్ చిరునామా కాదు:"
 
-#: actions/peopletag.php:142
 #, php-format
 msgid "Users self-tagged with %1$s - page %2$d"
 msgstr "%2$sలో %1$s అనే ట్యాగుతో ఉన్న నోటీసులు!"
 
 #. TRANS: Page title for AJAX form return when a disabling a plugin.
-#: actions/plugindisable.php:69
 msgctxt "plugin"
 msgid "Disabled"
 msgstr ""
 
 #. TRANS: Client error displayed trying to perform any request method other than POST.
 #. TRANS: Do not translate POST.
-#: actions/pluginenable.php:78 actions/subscribe.php:77
 msgid "This action only accepts POST requests."
 msgstr ""
 
-#: actions/pluginenable.php:102
 #, fuzzy
 msgid "You cannot administer plugins."
 msgstr "మీరు వాడుకరులని తొలగించలేరు."
 
-#: actions/pluginenable.php:109
 #, fuzzy
 msgid "No such plugin."
 msgstr "అటువంటి పేజీ లేదు."
 
 #. TRANS: Page title for AJAX form return when enabling a plugin.
-#: actions/pluginenable.php:159
 msgctxt "plugin"
 msgid "Enabled"
 msgstr ""
 
 #. TRANS: Tab and title for plugins admin panel.
 #. TRANS: Menu item for site administration
-#: actions/pluginsadminpanel.php:56 actions/version.php:191
-#: lib/adminpanelaction.php:411
 msgid "Plugins"
 msgstr "ప్లగిన్లు"
 
 #. TRANS: Instructions at top of plugin admin page.
-#: actions/pluginsadminpanel.php:68
 msgid ""
 "Additional plugins can be enabled and configured manually. See the <a href="
 "\"http://status.net/wiki/Plugins\">online plugin documentation</a> for more "
@@ -4508,32 +3708,26 @@ msgid ""
 msgstr ""
 
 #. TRANS: Admin form section header
-#: actions/pluginsadminpanel.php:84
 #, fuzzy
 msgid "Default plugins"
 msgstr "అప్రమేయ భాష"
 
-#: actions/pluginsadminpanel.php:106
 msgid ""
 "All default plugins have been disabled from the site's configuration file."
 msgstr ""
 
-#: actions/postnotice.php:95
 msgid "Invalid notice content."
 msgstr "తప్పుడు దస్త్రపుపేరు.."
 
-#: actions/postnotice.php:101
 #, php-format
 msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’."
 msgstr ""
 
 #. TRANS: Page title for profile settings.
-#: actions/profilesettings.php:60
 msgid "Profile settings"
 msgstr "ఫ్రొఫైలు అమరికలు"
 
 #. TRANS: Usage instructions for profile settings.
-#: actions/profilesettings.php:71
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
@@ -4541,31 +3735,24 @@ msgstr ""
 "తెలుసుకోగలుగుతారు."
 
 #. TRANS: Profile settings form legend.
-#: actions/profilesettings.php:99
 msgid "Profile information"
 msgstr "ప్రొఫైలు సమాచారం"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:110 actions/register.php:412
 #, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr "1-64 చిన్నబడి అక్షరాలు లేదా అంకెలు, విరామచిహ్నాలు మరియు ఖాళీలు తప్ప"
 
 #. TRANS: Field label in form for profile settings.
-#: actions/profilesettings.php:114 actions/register.php:434
-#: lib/groupeditform.php:150
 msgid "Full name"
 msgstr "పూర్తి పేరు"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:119 actions/register.php:439
-#: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "హోమ్ పేజీ"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:122 actions/register.php:441
 #, fuzzy
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr "మీ హోమ్ పేజీ, బ్లాగు, లేదా వేరే సేటులోని మీ ప్రొఫైలు యొక్క చిరునామా"
@@ -4573,7 +3760,6 @@ msgstr "మీ హోమ్ పేజీ, బ్లాగు, లేదా వ
 #. TRANS: Tooltip for field label in form for profile settings. Plural
 #. TRANS: is decided by the number of characters available for the
 #. TRANS: biography (%d).
-#: actions/profilesettings.php:130 actions/register.php:450
 #, fuzzy, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4581,68 +3767,53 @@ msgstr[0] "మీ గురించి మరియు మీ ఆసక్త
 msgstr[1] "మీ గురించి మరియు మీ ఆసక్తుల గురించి %d అక్షరాల్లో చెప్పండి"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:136 actions/register.php:455
 msgid "Describe yourself and your interests"
 msgstr "మీ గురించి మరియు మీ ఆసక్తుల గురించి చెప్పండి"
 
 #. TRANS: Text area label in form for profile settings where users can provide.
 #. TRANS: their biography.
-#: actions/profilesettings.php:140 actions/register.php:457
 msgid "Bio"
 msgstr "స్వపరిచయం"
 
 #. TRANS: Field label in form for profile settings.
-#: actions/profilesettings.php:146 actions/register.php:462
-#: lib/groupeditform.php:173
 msgid "Location"
 msgstr "ప్రాంతం"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:149
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "మీరు ఎక్కడ నుండి, \"నగరం, రాష్ట్రం (లేదా ప్రాంతం), దేశం\""
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:154
 msgid "Share my current location when posting notices"
 msgstr ""
 
 #. TRANS: Field label in form for profile settings.
-#: actions/profilesettings.php:162 actions/tagother.php:128
-#: actions/tagother.php:188 lib/subscriptionlist.php:104
-#: lib/subscriptionlist.php:106
 msgid "Tags"
 msgstr "ట్యాగులు"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:165
 msgid ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- "
 "separated."
 msgstr ""
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:170
 msgid "Language"
 msgstr "భాష"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:172
 msgid "Preferred language."
 msgstr "ప్రాధాన్యతా భాష."
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:182
 msgid "Timezone"
 msgstr "కాలమండలం"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:184
 msgid "What timezone are you normally in?"
 msgstr "మీరు సామాన్యంగా ఉండే కాలమండలం ఏది?"
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:190
 #, fuzzy
 msgid ""
 "Automatically subscribe to whoever subscribes to me (best for non-humans)."
@@ -4651,7 +3822,6 @@ msgstr "ఉపయోగించాల్సిన యాంత్రిక క
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Plural form is used based on the maximum number of allowed
 #. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:259 actions/register.php:214
 #, fuzzy, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4659,103 +3829,84 @@ msgstr[0] "స్వపరిచయం చాలా పెద్దగా ఉం
 msgstr[1] "స్వపరిచయం చాలా పెద్దగా ఉంది (%d అక్షరాలు గరిష్ఠం)."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:270 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr "కాలమండలాన్ని ఎంచుకోలేదు."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:278
 #, fuzzy
 msgid "Language is too long (maximum 50 characters)."
 msgstr "భాష మరీ పెద్దగా ఉంది (50 అక్షరాలు గరిష్ఠం)."
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:292
 #, fuzzy, php-format
 msgid "Invalid tag: \"%s\"."
 msgstr "తప్పుడు మారుపేరు: \"%s\""
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:348
 #, fuzzy
 msgid "Could not update user for autosubscribe."
 msgstr "వాడుకరిని తాజాకరించలేకున్నాం."
 
 #. TRANS: Server error thrown when user profile location preference settings could not be updated.
-#: actions/profilesettings.php:406
 #, fuzzy
 msgid "Could not save location prefs."
 msgstr "ట్యాగులని భద్రపరచలేకున్నాం."
 
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:428 actions/tagother.php:179
 msgid "Could not save tags."
 msgstr "ట్యాగులని భద్రపరచలేకపోయాం."
 
 #. TRANS: Confirmation shown when user profile settings are saved.
 #. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:437 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "అమరికలు భద్రమయ్యాయి."
 
 #. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
 #. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:484 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "ఖాతాని సృష్టించుకోండి"
 
-#: actions/public.php:83
 #, php-format
 msgid "Beyond the page limit (%s)."
 msgstr ""
 
-#: actions/public.php:92
 #, fuzzy
 msgid "Could not retrieve public stream."
 msgstr "మారుపేర్లని సృష్టించలేకపోయాం."
 
-#: actions/public.php:130
 #, php-format
 msgid "Public timeline, page %d"
 msgstr "ప్రజా కాలరేఖ, పేజీ %d"
 
-#: actions/public.php:132 lib/publicgroupnav.php:79
 msgid "Public timeline"
 msgstr "ప్రజా కాలరేఖ"
 
-#: actions/public.php:160
 msgid "Public Stream Feed (RSS 1.0)"
 msgstr "ప్రజా వాహిని ఫీడు (RSS 1.0)"
 
-#: actions/public.php:164
 msgid "Public Stream Feed (RSS 2.0)"
 msgstr "ప్రజా వాహిని ఫీడు (RSS 2.0)"
 
-#: actions/public.php:168
 msgid "Public Stream Feed (Atom)"
 msgstr "ప్రజా వాహిని ఫీడు (ఆటమ్)"
 
-#: actions/public.php:188
 #, fuzzy, php-format
 msgid ""
 "This is the public timeline for %%site.name%% but no one has posted anything "
 "yet."
 msgstr "ఇది %s మరియు మిత్రుల కాలరేఖ కానీ ఇంకా ఎవరూ ఏమీ రాయలేదు."
 
-#: actions/public.php:191
 msgid "Be the first to post!"
 msgstr ""
 
-#: actions/public.php:195
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post!"
 msgstr "[ఖాతా నమోదు చేసుకుని](%%action.register%%) మొదటగా వ్రాసేది మీరే ఎందుకు కాకూడదు!"
 
-#: actions/public.php:242
 #, fuzzy, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -4770,7 +3921,6 @@ msgstr ""
 "చాల వాటిలో భాగస్తులవ్వడానికి [ఇప్పుడే చేరండి](%%%%action.register%%%%)! ([మరింత చదవండి](%%%%"
 "doc.help%%%%))"
 
-#: actions/public.php:247
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -4781,19 +3931,16 @@ msgstr ""
 "ఆధారపడిన ఒక [మైక్రో-బ్లాగింగు](http://en.wikipedia.org/wiki/Micro-blogging) సేవ."
 
 #. TRANS: Public RSS feed description. %s is the StatusNet site name.
-#: actions/publicrss.php:106
 #, fuzzy, php-format
 msgid "%s updates from everyone."
 msgstr "అందరి నుండి %s తాజాకరణలు!"
 
 #. TRANS: Title for public tag cloud.
-#: actions/publictagcloud.php:57
 msgid "Public tag cloud"
 msgstr "ట్యాగు మేఘం"
 
 #. TRANS: Instructions (more used like an explanation/header).
 #. TRANS: %s is the StatusNet sitename.
-#: actions/publictagcloud.php:65
 #, php-format
 msgid "These are most popular recent tags on %s"
 msgstr ""
@@ -4801,14 +3948,12 @@ msgstr ""
 #. TRANS: This message contains a Markdown URL. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.
-#: actions/publictagcloud.php:74
 #, php-format
 msgid "No one has posted a notice with a [hashtag](%%doc.tags%%) yet."
 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.
-#: actions/publictagcloud.php:79
 msgid "Be the first to post one!"
 msgstr ""
 
@@ -4817,7 +3962,6 @@ msgstr ""
 #. TRANS: This message contains a Markdown URL. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.
-#: actions/publictagcloud.php:87
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post "
@@ -4825,271 +3969,219 @@ msgid ""
 msgstr "[ఒక ఖాతాని నమోదుచేసుకుని](%%action.register%%) మీరే మొదట వ్రాసేవారు ఎందుకు కాకూడదు!"
 
 #. TRANS: Client error displayed trying to recover password while already logged in.
-#: actions/recoverpassword.php:37
 msgid "You are already logged in!"
 msgstr "మీరు ఇప్పటికే లోనికి ప్రవేశించారు!"
 
 #. TRANS: Client error displayed when password recovery code is not correct.
-#: actions/recoverpassword.php:64
 #, fuzzy
 msgid "No such recovery code."
 msgstr "అటువంటి సందేశమేమీ లేదు."
 
 #. TRANS: Client error displayed when no proper password recovery code was submitted.
-#: actions/recoverpassword.php:69
 #, fuzzy
 msgid "Not a recovery code."
 msgstr "నమోదైన వాడుకరి కాదు."
 
 #. TRANS: Server error displayed trying to recover password without providing a user.
-#: actions/recoverpassword.php:77
 msgid "Recovery code for unknown user."
 msgstr ""
 
 #. TRANS: Server error displayed removing a password recovery code from the database.
-#: actions/recoverpassword.php:91
 msgid "Error with confirmation code."
 msgstr "నిర్ధారణ సంకేతంలో పొరపాటు."
 
 #. TRANS: Client error displayed trying to recover password with too old a recovery code.
-#: actions/recoverpassword.php:103
 msgid "This confirmation code is too old. Please start again."
 msgstr "ఈ నిర్ధారణ సంకేతం చాలా పాతది. మళ్ళీ మొదలుపెట్టండి."
 
 #. TRANS: Server error displayed when updating a user's e-mail address in the database fails while recovering a password.
-#: actions/recoverpassword.php:118
 msgid "Could not update user with confirmed email address."
 msgstr "నిర్ధారిత ఈమెయిలు చిరునామాతో వాడుకరిని తాజాకరించలేకపోయాం."
 
 #. TRANS: Page notice for password recovery page.
-#: actions/recoverpassword.php:160
 msgid ""
 "If you have forgotten or lost your password, you can get a new one sent to "
 "the email address you have stored in your account."
 msgstr ""
 "మీరు మీ సంకేతపదాన్ని మర్చిపోతే, మీ ఖాతాలో నమోదైన ఈమెయిలు చిరునామాకి కొత్త సంకేతపదం వచ్చేలా చేసుకోవచ్చు."
 
-#: actions/recoverpassword.php:167
 msgid "You have been identified. Enter a new password below."
 msgstr "మిమ్మల్ని గుర్తించాం. మీ కొత్త సంకేతపదాన్ని క్రింత ఇవ్వండి."
 
 #. TRANS: Fieldset legend for password recovery page.
-#: actions/recoverpassword.php:198
 #, fuzzy
 msgid "Password recovery"
 msgstr "సంకేతపదం మార్పు"
 
 #. TRANS: Field label on password recovery page.
-#: actions/recoverpassword.php:202
 msgid "Nickname or email address"
 msgstr "ముద్దుపేరు లేదా ఈమెయిలు చిరునామా"
 
 #. TRANS: Title for field label on password recovery page.
-#: actions/recoverpassword.php:205
 msgid "Your nickname on this server, or your registered email address."
 msgstr "ఈ సర్వరులో మీ పేరు, లేదా నమౌదైన మీ ఈమెయిల్ చిరునామా."
 
 #. TRANS: Field label on password recovery page.
-#: actions/recoverpassword.php:212
 #, fuzzy
 msgid "Recover"
 msgstr "తొలగించు"
 
 #. TRANS: Button text on password recovery page.
-#: actions/recoverpassword.php:214
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Recover"
 msgstr "తొలగించు"
 
 #. TRANS: Title for password recovery page in password reset mode.
-#: actions/recoverpassword.php:223
 #, fuzzy
 msgid "Reset password"
 msgstr "కొత్త సంకేతపదం"
 
 #. TRANS: Title for password recovery page in password recover mode.
-#: actions/recoverpassword.php:225
 #, fuzzy
 msgid "Recover password"
 msgstr "కొత్త సంకేతపదం"
 
 #. TRANS: Title for password recovery page in email sent mode.
 #. TRANS: Subject for password recovery e-mail.
-#: actions/recoverpassword.php:227 actions/recoverpassword.php:366
 msgid "Password recovery requested"
 msgstr ""
 
 #. TRANS: Title for password recovery page in password saved mode.
-#: actions/recoverpassword.php:229
 #, fuzzy
 msgid "Password saved"
 msgstr "సంకేతపదం భద్రమయ్యింది."
 
 #. TRANS: Title for password recovery page when an unknown action has been specified.
-#: actions/recoverpassword.php:232
 msgid "Unknown action"
 msgstr "తెలియని చర్య"
 
 #. TRANS: Title for field label for password reset form.
-#: actions/recoverpassword.php:258
 #, fuzzy
 msgid "6 or more characters, and do not forget it!"
 msgstr "6 లేదా అంతకంటే ఎక్కువ అక్షరాలు, మర్చిపోకండి!"
 
 #. TRANS: Button text for password reset form.
 #. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: actions/recoverpassword.php:268 lib/designform.php:145
 msgctxt "BUTTON"
 msgid "Reset"
 msgstr "రీసెట్"
 
 #. TRANS: Form instructions for password recovery form.
-#: actions/recoverpassword.php:278
 msgid "Enter a nickname or email address."
 msgstr "పేరు లేదా ఈమెయిల్ చిరునామా ఇవ్వండి."
 
 #. TRANS: Information on password recovery form if no known username or e-mail address was specified.
-#: actions/recoverpassword.php:309
 msgid "No user with that email address or username."
 msgstr "ఆ ఈమెయిలు చిరునామా లేదా వాడుకరిపేరుతో వాడుకరులెవరూ లేరు."
 
 #. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
-#: actions/recoverpassword.php:327
 msgid "No registered email address for that user."
 msgstr "ఈ వాడుకరికై నమోదైన ఈమెయిల్ చిరునామాలు ఏమీ లేవు."
 
 #. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
-#: actions/recoverpassword.php:342
 msgid "Error saving address confirmation."
 msgstr "చిరునామా నిర్ధారణని భద్రపరచడంలో పొరపాటు."
 
 #. TRANS: User notification after an e-mail with instructions was sent from the password recovery form.
-#: actions/recoverpassword.php:370
 msgid ""
 "Instructions for recovering your password have been sent to the email "
 "address registered to your account."
 msgstr "మీ సంకేతపదాన్ని తిరిగి పొందడానికై అవసరమైన సూచనలని మీ ఖాతాతో నమోదైన ఈమెయిల్ చిరునామాకి పంపించాం."
 
 #. TRANS: Client error displayed when trying to reset as password without providing a user.
-#: actions/recoverpassword.php:391
 msgid "Unexpected password reset."
 msgstr ""
 
 #. TRANS: Reset password form validation error message.
-#: actions/recoverpassword.php:400
 #, fuzzy
 msgid "Password must be 6 characters or more."
 msgstr "సంకేతపదం 6 లేదా అంతకంటే ఎక్కవ అక్షరాలుండాలి."
 
 #. TRANS: Reset password form validation error message.
-#: actions/recoverpassword.php:405
 msgid "Password and confirmation do not match."
 msgstr "సంకేతపదం మరియు నిర్ధారణ సరిపోలేదు."
 
 #. TRANS: Server error displayed when something does wrong with the user object during password reset.
-#: actions/recoverpassword.php:426 actions/register.php:241
 #, fuzzy
 msgid "Error setting user."
 msgstr "వాడుకరిని భద్రపరచడంలో పొరపాటు: సరికాదు."
 
 #. TRANS: Success message for user after password reset.
-#: actions/recoverpassword.php:434
 msgid "New password successfully saved. You are now logged in."
 msgstr "మీ కొత్త సంకేతపదం భద్రమైంది. మీరు ఇప్పుడు లోనికి ప్రవేశించారు."
 
-#: actions/redirecturl.php:70
 #, fuzzy
 msgid "No id parameter"
 msgstr "జోడింపులు లేవు."
 
-#: actions/redirecturl.php:76
 #, fuzzy, php-format
 msgid "No such file \"%d\""
 msgstr "అటువంటి ఫైలు లేదు."
 
-#: actions/register.php:80 actions/register.php:181 actions/register.php:392
 msgid "Sorry, only invited people can register."
 msgstr "క్షమించండి, ఆహ్వానితులు మాత్రమే నమోదుకాగలరు."
 
-#: actions/register.php:87
 msgid "Sorry, invalid invitation code."
 msgstr "క్షమించండి, తప్పు ఆహ్వాన సంకేతం."
 
-#: actions/register.php:106
 msgid "Registration successful"
 msgstr "నమోదు విజయవంతం"
 
-#: actions/register.php:108 actions/register.php:490
 msgid "Register"
 msgstr "నమోదు"
 
-#: actions/register.php:128
 msgid "Registration not allowed."
 msgstr "నమోదు అనుమతించబడదు."
 
-#: actions/register.php:194
 #, fuzzy
 msgid "You cannot register if you don't agree to the license."
 msgstr "ఈ లైసెన్సుకి అంగీకరించకపోతే మీరు నమోదుచేసుకోలేరు."
 
-#: actions/register.php:203
 msgid "Email address already exists."
 msgstr "ఈమెయిల్ చిరునామా ఇప్పటికే ఉంది."
 
-#: actions/register.php:236 actions/register.php:258
 msgid "Invalid username or password."
 msgstr "వాడుకరిపేరు లేదా సంకేతపదం తప్పు."
 
-#: actions/register.php:333
 msgid ""
 "With this form you can create a new account. You can then post notices and "
 "link up to friends and colleagues."
 msgstr ""
 
-#: actions/register.php:424 actions/register.php:428
-#: actions/siteadminpanel.php:238 lib/settingsnav.php:92
 msgid "Email"
 msgstr "ఈమెయిల్"
 
-#: actions/register.php:425 actions/register.php:429
 #, fuzzy
 msgid "Used only for updates, announcements, and password recovery."
 msgstr "తాజా విశేషాలు, ప్రకటనలు, మరియు సంకేతపదం పోయినప్పుడు మాత్రమే ఉపయోగిస్తాం."
 
-#: actions/register.php:436
 #, fuzzy
 msgid "Longer name, preferably your \"real\" name."
 msgstr "పొడుగాటి పేరు, మీ \"అసలు\" పేరైతే మంచిది"
 
-#: actions/register.php:464
 #, fuzzy
 msgid "Where you are, like \"City, State (or Region), Country\"."
 msgstr "మీరు ఎక్కడ నుండి, \"నగరం, రాష్ట్రం (లేదా ప్రాంతం), దేశం\""
 
-#: actions/register.php:503
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
 msgstr ""
 
-#: actions/register.php:513
 #, php-format
 msgid "My text and files are copyright by %1$s."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:517
 msgid "My text and files remain under my own copyright."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:520
 msgid "All rights reserved."
 msgstr "సర్వహక్కులూ సురక్షితం."
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:525
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -5098,7 +4190,6 @@ msgstr ""
 "నా పాఠ్యం మరియు దస్త్రాలు %s క్రింద లభ్యం, ఈ అంతరంగిక భోగట్టా తప్ప: సంకేతపదం, ఈమెయిల్ చిరునామా, IM "
 "చిరునామా, మరియు ఫోన్ నంబర్."
 
-#: actions/register.php:566
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -5129,7 +4220,6 @@ msgstr ""
 "\n"
 "నమోదుచేసుకున్నందుకు కృతజ్ఞతలు మరియు ఈ సేవని ఉపయోగిస్తూ మీరు ఆనందిస్తారని మేం ఆశిస్తున్నాం."
 
-#: actions/register.php:590
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5137,7 +4227,6 @@ msgstr ""
 "(మీ ఈమెయిలు చిరునామాని ఎలా నిర్ధారించాలో తెలిపే సూచనలతో ఒక సందేశం మీరు ఈమెయిలు ద్వారా మరి కొద్దిసేపట్లోనే "
 "అందుతుంది.)"
 
-#: actions/remotesubscribe.php:97
 #, php-format
 msgid ""
 "To subscribe, you can [login](%%action.login%%), or [register](%%action."
@@ -5148,117 +4237,91 @@ msgstr ""
 "action.register%%). ఒకవేళ మీకు ఇప్పటికే ఏదైనా [పొసగే మైక్రోబ్లాగింగు సైటులో](%%doc.openmublog%"
 "%) ఖాతా ఉంటే, మీ ప్రొఫైలు చిరునామాని క్రింద ఇవ్వండి."
 
-#: actions/remotesubscribe.php:111
 msgid "Remote subscribe"
 msgstr "సుదూర చందా"
 
-#: actions/remotesubscribe.php:123
 msgid "Subscribe to a remote user"
 msgstr "ఈ వాడుకరికి చందాచేరు"
 
-#: actions/remotesubscribe.php:128
 msgid "User nickname"
 msgstr "వాడుకరి పేరు"
 
-#: actions/remotesubscribe.php:129
 #, fuzzy
 msgid "Nickname of the user you want to follow."
 msgstr "మీరు అనుసరించాలనుకుంటున్న వాడుకరి యొక్క ముద్దుపేరు"
 
-#: actions/remotesubscribe.php:132
 msgid "Profile URL"
 msgstr "ప్రొఫైలు URL"
 
-#: actions/remotesubscribe.php:133
 msgid "URL of your profile on another compatible microblogging service."
 msgstr ""
 
 #. TRANS: Link text for link that will subscribe to a remote profile.
-#: actions/remotesubscribe.php:136 lib/subscribeform.php:139
-#: lib/userprofile.php:402
 msgid "Subscribe"
 msgstr "చందాచేరు"
 
-#: actions/remotesubscribe.php:158
 #, fuzzy
 msgid "Invalid profile URL (bad format)."
 msgstr "ప్రొపైల్ URL తప్పు (చెడు ఫార్మాట్)"
 
-#: actions/remotesubscribe.php:167
 msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
 msgstr ""
 
-#: actions/remotesubscribe.php:175
 #, fuzzy
 msgid "That is a local profile! Login to subscribe."
 msgstr "అది స్థానిక ప్రొఫైలు! చందాచేరడానికి ప్రవేశించండి."
 
-#: actions/remotesubscribe.php:182
 #, fuzzy
 msgid "Could not get a request token."
 msgstr "ట్యాగులని భద్రపరచలేకపోయాం."
 
-#: actions/repeat.php:56
 msgid "Only logged-in users can repeat notices."
 msgstr "కేవలం ప్రవేశించిన వాడుకరులు మాత్రమే నోటీసులని పునరావృతించగలరు."
 
-#: actions/repeat.php:63 actions/repeat.php:70
 msgid "No notice specified."
 msgstr "గుంపు ఏమీ పేర్కొనలేదు."
 
-#: actions/repeat.php:75
 #, fuzzy
 msgid "You cannot repeat your own notice."
 msgstr "మీ నోటీసుని మీరే పునరావృతించలేరు."
 
-#: actions/repeat.php:89
 msgid "You already repeated that notice."
 msgstr "మీరు ఇప్పటికే ఆ నోటీసుని పునరావృతించారు."
 
-#: actions/repeat.php:112 lib/noticelist.php:697
 #, fuzzy
 msgid "Repeated"
 msgstr "సృష్టితం"
 
-#: actions/repeat.php:117
 msgid "Repeated!"
 msgstr "పునరావృతించారు!"
 
 #. TRANS: RSS reply feed title. %s is a user nickname.
-#: actions/replies.php:126 actions/repliesrss.php:68
-#: lib/personalgroupnav.php:105
 #, php-format
 msgid "Replies to %s"
 msgstr "%sకి స్పందనలు"
 
-#: actions/replies.php:128
 #, php-format
 msgid "Replies to %1$s, page %2$d"
 msgstr "%1$sకి స్పందనలు, %2$dవ పేజీ"
 
-#: actions/replies.php:145
 #, php-format
 msgid "Replies feed for %s (RSS 1.0)"
 msgstr "%s కొరకు స్పందనల ఫీడు (RSS 1.0)"
 
-#: actions/replies.php:152
 #, php-format
 msgid "Replies feed for %s (RSS 2.0)"
 msgstr "%s కొరకు స్పందనల ఫీడు (RSS 2.0)"
 
-#: actions/replies.php:159
 #, php-format
 msgid "Replies feed for %s (Atom)"
 msgstr "%s కొరకు స్పందనల ఫీడు (ఆటమ్)"
 
-#: actions/replies.php:199
 #, php-format
 msgid ""
 "This is the timeline showing replies to %1$s but %2$s hasn't received a "
 "notice to them yet."
 msgstr "ఇది %1$s యొక్క కాలరేఖ కానీ %2$s ఇంకా ఏమీ రాయలేదు."
 
-#: actions/replies.php:204
 #, php-format
 msgid ""
 "You can engage other users in a conversation, subscribe to more people or "
@@ -5267,7 +4330,6 @@ msgstr ""
 "మీరు ఇతర వాడుకరులతో సంభాషించవచ్చు, మరింత మంది వ్యక్తులకు చందాచేరవచ్చు లేదా [గుంపులలో చేరవచ్చు]"
 "(%%action.groups%%)."
 
-#: actions/replies.php:206
 #, fuzzy, php-format
 msgid ""
 "You can try to [nudge %1$s](../%2$s) or [post something to them](%%%%action."
@@ -5277,228 +4339,187 @@ msgstr ""
 
 #. TRANS: RSS reply feed description.
 #. TRANS: %1$s is a user nickname, %2$s is the StatusNet site name.
-#: actions/repliesrss.php:74
 #, fuzzy, php-format
 msgid "Replies to %1$s on %2$s."
 msgstr "%2$sలో %1$sకి స్పందనలు!"
 
 #. TRANS: Client exception displayed when trying to restore an account while not logged in.
-#: actions/restoreaccount.php:78
 #, fuzzy
 msgid "Only logged-in users can restore their account."
 msgstr "కేవలం ప్రవేశించిన వాడుకరులు మాత్రమే నోటీసులని పునరావృతించగలరు."
 
 #. TRANS: Client exception displayed when trying to restore an account without having restore rights.
-#: actions/restoreaccount.php:83
 #, fuzzy
 msgid "You may not restore your account."
 msgstr "మీరు ఇంకా ఏ ఉపకరణాన్నీ నమోదు చేసుకోలేదు."
 
 #. TRANS: Client exception displayed trying to restore an account while something went wrong uploading a file.
 #. TRANS: Client exception. No file; probably just a non-AJAX submission.
-#: actions/restoreaccount.php:121 actions/restoreaccount.php:146
 #, fuzzy
 msgid "No uploaded file."
 msgstr "ఫైలుని ఎక్కించు"
 
 #. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
-#: actions/restoreaccount.php:129 lib/mediafile.php:194
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
 msgstr ""
 
 #. TRANS: Client exception.
-#: actions/restoreaccount.php:135 lib/mediafile.php:200
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form."
 msgstr ""
 
 #. TRANS: Client exception.
-#: actions/restoreaccount.php:141 lib/mediafile.php:206
 msgid "The uploaded file was only partially uploaded."
 msgstr "ఎక్కించిన ఫైలు కేవలం పాక్షికంగా మాత్రమే ఎక్కింది."
 
 #. TRANS: Client exception thrown when a temporary folder is not present to store a file upload.
-#: actions/restoreaccount.php:150 lib/mediafile.php:214
 msgid "Missing a temporary folder."
 msgstr "తాత్కాలిక సంచయం కనబడటంలేదు."
 
 #. TRANS: Client exception thrown when writing to disk is not possible during a file upload operation.
-#: actions/restoreaccount.php:154 lib/mediafile.php:218
 msgid "Failed to write file to disk."
 msgstr ""
 
 #. TRANS: Client exception thrown when a file upload operation has been stopped by an extension.
-#: actions/restoreaccount.php:158 lib/mediafile.php:222
 msgid "File upload stopped by extension."
 msgstr ""
 
 #. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
 #. TRANS: Exception thrown when uploading an image fails for an unknown reason.
 #. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
-#: actions/restoreaccount.php:164 lib/imagefile.php:106 lib/mediafile.php:228
 msgid "System error uploading file."
 msgstr ""
 
 #. TRANS: Client exception thrown when a feed is not an Atom feed.
-#: actions/restoreaccount.php:207
 #, fuzzy
 msgid "Not an Atom feed."
 msgstr "అందరు సభ్యులూ"
 
 #. TRANS: Success message when a feed has been restored.
-#: actions/restoreaccount.php:241
 msgid ""
 "Feed has been restored. Your old posts should now appear in search and your "
 "profile page."
 msgstr ""
 
 #. TRANS: Message when a feed restore is in progress.
-#: actions/restoreaccount.php:245
 msgid "Feed will be restored. Please wait a few minutes for results."
 msgstr ""
 
 #. TRANS: Form instructions for feed restore.
-#: actions/restoreaccount.php:342
 msgid ""
 "You can upload a backed-up stream in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format."
 msgstr ""
 
 #. TRANS: Title for submit button to confirm upload of a user backup file for account restore.
-#: actions/restoreaccount.php:373
 #, fuzzy
 msgid "Upload the file"
 msgstr "ఫైలుని ఎక్కించు"
 
-#: actions/revokerole.php:75
 msgid "You cannot revoke user roles on this site."
 msgstr "ఈ సైటులో మీరు వాడుకరలకి పాత్రలను ఇవ్వలేరు."
 
-#: actions/revokerole.php:82
 msgid "User doesn't have this role."
 msgstr "వాడుకరికి ఈ పాత్ర లేదు."
 
-#: actions/rsd.php:142 actions/version.php:159
 msgid "StatusNet"
 msgstr "స్టేటస్‌నెట్"
 
-#: actions/sandbox.php:65 actions/unsandbox.php:65
 msgid "You cannot sandbox users on this site."
 msgstr "ఈ సైటులో మీరు వాడుకరలకి పాత్రలను ఇవ్వలేరు."
 
-#: actions/sandbox.php:72
 #, fuzzy
 msgid "User is already sandboxed."
 msgstr "వాడుకరిని ఇప్పటికే గుంపునుండి నిరోధించారు."
 
 #. TRANS: Menu item for site administration
-#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
-#: lib/adminpanelaction.php:379
 #, fuzzy
 msgid "Sessions"
 msgstr "సంచిక"
 
-#: actions/sessionsadminpanel.php:65
 msgid "Session settings for this StatusNet site"
 msgstr ""
 
-#: actions/sessionsadminpanel.php:175
 msgid "Handle sessions"
 msgstr ""
 
-#: actions/sessionsadminpanel.php:177
 #, fuzzy
 msgid "Whether to handle sessions ourselves."
 msgstr "వాడుకరులను కొత్త వారిని ఆహ్వానించడానికి అనుమతించాలా వద్దా."
 
-#: actions/sessionsadminpanel.php:181
 msgid "Session debugging"
 msgstr ""
 
-#: actions/sessionsadminpanel.php:183
 msgid "Turn on debugging output for sessions."
 msgstr ""
 
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
+#. TRANS: Submit button title.
+msgid "Save"
+msgstr "భద్రపరచు"
+
 msgid "Save site settings"
 msgstr "సైటు అమరికలను భద్రపరచు"
 
-#: actions/showapplication.php:78
 msgid "You must be logged in to view an application."
 msgstr "ఉపకరణాలని చూడడానికి మీరు తప్పనిసరిగా ప్రవేశించి ఉండాలి."
 
-#: actions/showapplication.php:151
 msgid "Application profile"
 msgstr "ఉపకరణ ప్రవర"
 
-#: actions/showapplication.php:179
 #, php-format
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr "సృష్టించినది %1$s - అప్రమేయ అందుబాటు %2$s  - %3$d వాడుకరులు"
 
-#: actions/showapplication.php:189
 msgid "Application actions"
 msgstr "ఉపకరణ చర్యలు"
 
-#: actions/showapplication.php:212
 msgid "Reset key & secret"
 msgstr ""
 
 #. TRANS: Title of form for deleting a user.
-#: actions/showapplication.php:228 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:64 lib/noticelist.php:678
 msgid "Delete"
 msgstr "తొలగించు"
 
-#: actions/showapplication.php:237
 msgid "Application info"
 msgstr "ఉపకరణ సమాచారం"
 
-#: actions/showapplication.php:255
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
 msgstr ""
 
-#: actions/showapplication.php:275
 #, fuzzy
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr "మీరు నిజంగానే ఈ నోటీసుని తొలగించాలనుకుంటున్నారా?"
 
 #. TRANS: Title for all but the first page of favourite notices of a user.
 #. TRANS: %1$s is the user for whom the favourite notices are displayed, %2$d is the page number.
-#: actions/showfavorites.php:80
 #, php-format
 msgid "%1$s's favorite notices, page %2$d"
 msgstr "%1$sకి ఇష్టమైన నోటీసులు, పేజీ %2$d"
 
 #. TRANS: Server error displayed when favourite notices could not be retrieved from the database.
-#: actions/showfavorites.php:134
 #, fuzzy
 msgid "Could not retrieve favorite notices."
 msgstr "ఇష్టాంశాన్ని సృష్టించలేకపోయాం."
 
 #. TRANS: Feed link text. %s is a username.
-#: actions/showfavorites.php:172
 #, php-format
 msgid "Feed for favorites of %s (RSS 1.0)"
 msgstr "%s యొక్క ఇష్టాంశాల ఫీడు (RSS 2.0)"
 
 #. TRANS: Feed link text. %s is a username.
-#: actions/showfavorites.php:180
 #, php-format
 msgid "Feed for favorites of %s (RSS 2.0)"
 msgstr "%s యొక్క ఇష్టాంశాల ఫీడు (RSS 2.0)"
 
 #. TRANS: Feed link text. %s is a username.
-#: actions/showfavorites.php:188
 #, php-format
 msgid "Feed for favorites of %s (Atom)"
 msgstr "%s యొక్క ఇష్టాంశాల ఫీడు (ఆటమ్)"
 
 #. TRANS: Text displayed instead of favourite notices for the current logged in user that has no favourites.
-#: actions/showfavorites.php:209
 msgid ""
 "You haven't chosen any favorite notices yet. Click the fave button on "
 "notices you like to bookmark them for later or shed a spotlight on them."
@@ -5506,7 +4527,6 @@ msgstr ""
 
 #. TRANS: Text displayed instead of favourite notices for a user that has no favourites while logged in.
 #. TRANS: %s is a username.
-#: actions/showfavorites.php:213
 #, php-format
 msgid ""
 "%s hasn't added any favorite notices yet. Post something interesting they "
@@ -5516,7 +4536,6 @@ msgstr ""
 #. TRANS: Text displayed instead of favourite notices for a user that has no favourites while not logged in.
 #. TRANS: %s is a username, %%%%action.register%%%% is a link to the user registration page.
 #. TRANS: (link text)[link] is a Mark Down link.
-#: actions/showfavorites.php:220
 #, fuzzy, php-format
 msgid ""
 "%s hasn't added any favorite notices yet. Why not [register an account](%%%%"
@@ -5527,64 +4546,53 @@ msgstr ""
 "ఎందుకు మొదటి చందాదారు కాకూడదు?"
 
 #. TRANS: Page notice for show favourites page.
-#: actions/showfavorites.php:251
 msgid "This is a way to share what you like."
 msgstr "మీకు నచ్చినవి పంచుకోడానికి ఇదొక మార్గం."
 
 #. TRANS: Page title for first group page. %s is a group name.
-#: actions/showgroup.php:75
 #, php-format
 msgid "%s group"
 msgstr "%s గుంపు"
 
 #. TRANS: Page title for any but first group page.
 #. TRANS: %1$s is a group name, $2$s is a page number.
-#: actions/showgroup.php:79
 #, php-format
 msgid "%1$s group, page %2$d"
 msgstr "%1$s గుంపు , %2$dవ పేజీ"
 
 #. TRANS: Label for group description or group note (dt). Text hidden by default.
-#: actions/showgroup.php:266
 msgid "Note"
 msgstr "గమనిక"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:277 lib/groupeditform.php:180
 msgid "Aliases"
 msgstr "మారుపేర్లు"
 
 #. TRANS: Group actions header (h2). Text hidden by default.
-#: actions/showgroup.php:294
 msgid "Group actions"
 msgstr "గుంపు చర్యలు"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:338
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
 msgstr "%s కొరకు స్పందనల ఫీడు (RSS 1.0)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:345
 #, php-format
 msgid "Notice feed for %s group (RSS 2.0)"
 msgstr "%s కొరకు స్పందనల ఫీడు (RSS 2.0)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:352
 #, php-format
 msgid "Notice feed for %s group (Atom)"
 msgstr "%s కొరకు స్పందనల ఫీడు (ఆటమ్)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:358
 #, php-format
 msgid "FOAF for %s group"
 msgstr "%s గుంపు"
 
 #. TRANS: Header for mini list of group members on a group page (h2).
-#: actions/showgroup.php:395
 msgid "Members"
 msgstr "సభ్యులు"
 
@@ -5592,31 +4600,24 @@ msgstr "సభ్యులు"
 #. TRANS: Text for user subscription statistics if the user has no subscriptions.
 #. TRANS: Text for user subscriber statistics if user has no subscribers.
 #. TRANS: Text for user user group membership statistics if user is not a member of any group.
-#: actions/showgroup.php:401 lib/profileaction.php:137
-#: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
-#: lib/subscriptionlist.php:123 lib/tagcloudsection.php:71
 msgid "(None)"
 msgstr "(ఏమీలేదు)"
 
 #. TRANS: Link to all group members from mini list of group members if group has more than n members.
-#: actions/showgroup.php:410
 msgid "All members"
 msgstr "అందరు సభ్యులూ"
 
 #. TRANS: Header for group statistics on a group page (h2).
 #. TRANS: H2 text for user statistics.
-#: actions/showgroup.php:441 lib/profileaction.php:205
 msgid "Statistics"
 msgstr "గణాంకాలు"
 
-#: actions/showgroup.php:444
 #, fuzzy
 msgctxt "LABEL"
 msgid "Created"
 msgstr "సృష్టితం"
 
 #. TRANS: Label for member count in statistics on group page.
-#: actions/showgroup.php:449
 msgctxt "LABEL"
 msgid "Members"
 msgstr "సభ్యులు"
@@ -5625,7 +4626,6 @@ msgstr "సభ్యులు"
 #. TRANS: **%s** is the group alias, %%%%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).
-#: actions/showgroup.php:464
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5644,7 +4644,6 @@ 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: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
-#: actions/showgroup.php:474
 #, fuzzy, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5660,99 +4659,83 @@ msgstr ""
 "doc.help%%%%))"
 
 #. TRANS: Header for list of group administrators on a group page (h2).
-#: actions/showgroup.php:503
 msgid "Admins"
 msgstr "నిర్వాహకులు"
 
 #. TRANS: Client error displayed requesting a single message that does not exist.
-#: actions/showmessage.php:76
 msgid "No such message."
 msgstr "అటువంటి సందేశం లేదు."
 
 #. TRANS: Client error displayed requesting a single direct message the requesting user was not a party in.
-#: actions/showmessage.php:86
 msgid "Only the sender and recipient may read this message."
 msgstr "పంపినవారు మరియు అందుకున్నవారు మాత్రమే ఈ సందేశాన్ని చదవవచ్చు."
 
 #. TRANS: Page title for single direct message display when viewing user is the sender.
 #. TRANS: %1$s is the addressed user's nickname, $2$s is a timestamp.
-#: actions/showmessage.php:105
 #, fuzzy, php-format
 msgid "Message to %1$s on %2$s"
 msgstr "%2$sలో %1$sకి స్పందనలు!"
 
 #. TRANS: Page title for single message display.
 #. TRANS: %1$s is the sending user's nickname, $2$s is a timestamp.
-#: actions/showmessage.php:113
 #, fuzzy, php-format
 msgid "Message from %1$s on %2$s"
 msgstr "%2$sలో %1$sకి స్పందనలు!"
 
-#: actions/shownotice.php:90
 msgid "Notice deleted."
 msgstr "నోటీసుని తొలగించాం."
 
 #. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
-#: actions/showstream.php:70
 #, fuzzy, php-format
 msgid "%1$s tagged %2$s"
 msgstr "%1$s, %2$dవ పేజీ"
 
 #. TRANS: Page title showing tagged notices in one user's stream.
 #. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
-#: actions/showstream.php:74
 #, fuzzy, php-format
 msgid "%1$s tagged %2$s, page %3$d"
 msgstr "%2$sలో %1$s అనే ట్యాగుతో ఉన్న నోటీసులు!"
 
 #. TRANS: Extended page title showing tagged notices in one user's stream.
 #. TRANS: %1$s is the username, %2$d is the page number.
-#: actions/showstream.php:82
 #, php-format
 msgid "%1$s, page %2$d"
 msgstr "%1$s, %2$dవ పేజీ"
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %1$s is a user nickname, %2$s is a hashtag.
-#: actions/showstream.php:127
 #, php-format
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
 msgstr "%s కొరకు స్పందనల ఫీడు (RSS 1.0)"
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.
-#: actions/showstream.php:136
 #, php-format
 msgid "Notice feed for %s (RSS 1.0)"
 msgstr "%s కొరకు స్పందనల ఫీడు (RSS 1.0)"
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.
-#: actions/showstream.php:145
 #, php-format
 msgid "Notice feed for %s (RSS 2.0)"
 msgstr "%s కొరకు స్పందనల ఫీడు (RSS 2.0)"
 
-#: actions/showstream.php:152
 #, php-format
 msgid "Notice feed for %s (Atom)"
 msgstr "%s కొరకు స్పందనల ఫీడు (ఆటమ్)"
 
 #. TRANS: Title for link to notice feed. FOAF stands for Friend of a Friend.
 #. TRANS: More information at http://www.foaf-project.org. %s is a user nickname.
-#: actions/showstream.php:159
 #, fuzzy, php-format
 msgid "FOAF for %s"
 msgstr "%s గుంపు"
 
 #. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
-#: actions/showstream.php:205
 #, fuzzy, php-format
 msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr "ఇది %1$s యొక్క కాలరేఖ కానీ %2$s ఇంకా ఏమీ రాయలేదు."
 
 #. TRANS: Second sentence of empty list message for a stream for the user themselves.
-#: actions/showstream.php:211
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
@@ -5761,7 +4744,6 @@ msgstr ""
 
 #. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:215
 #, fuzzy, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
@@ -5771,7 +4753,6 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:258
 #, fuzzy, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5788,7 +4769,6 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:265
 #, fuzzy, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5799,260 +4779,207 @@ msgstr ""
 "ఆధారపడిన ఒక [మైక్రో-బ్లాగింగు](http://en.wikipedia.org/wiki/Micro-blogging) సేవ."
 
 #. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
-#: actions/showstream.php:322
 #, php-format
 msgid "Repeat of %s"
 msgstr "%s యొక్క పునరావృతం"
 
-#: actions/silence.php:65 actions/unsilence.php:65
 #, fuzzy
 msgid "You cannot silence users on this site."
 msgstr "ఈ సైటులో మీరు వాడుకరలకి పాత్రలను ఇవ్వలేరు."
 
-#: actions/silence.php:72
 #, fuzzy
 msgid "User is already silenced."
 msgstr "వాడుకరిని ఇప్పటికే గుంపునుండి నిరోధించారు."
 
-#: actions/siteadminpanel.php:69
 msgid "Basic settings for this StatusNet site"
 msgstr "ఈ స్టేటస్&zwnj;నెట్ సైటుకి ప్రాధమిక అమరికలు"
 
-#: actions/siteadminpanel.php:133
 msgid "Site name must have non-zero length."
 msgstr "సైటు పేరు తప్పనిసరిగా సున్నా కంటే ఎక్కువ పొడవుండాలి."
 
-#: actions/siteadminpanel.php:141
 msgid "You must have a valid contact email address."
 msgstr "మీకు సరైన సంప్రదింపు ఈమెయిలు చిరునామా ఉండాలి."
 
-#: actions/siteadminpanel.php:159
 #, php-format
 msgid "Unknown language \"%s\"."
 msgstr "గుర్తు తెలియని భాష \"%s\"."
 
-#: actions/siteadminpanel.php:165
 msgid "Minimum text limit is 0 (unlimited)."
 msgstr "కనిష్ఠ పాఠ్య పరిమితి 0 (అపరిమితం)."
 
-#: actions/siteadminpanel.php:171
 msgid "Dupe limit must be one or more seconds."
 msgstr ""
 
-#: actions/siteadminpanel.php:221
 msgid "General"
 msgstr "సాధారణ"
 
-#: actions/siteadminpanel.php:224
 msgid "Site name"
 msgstr "సైటు పేరు"
 
-#: actions/siteadminpanel.php:225
 msgid "The name of your site, like \"Yourcompany Microblog\""
 msgstr "మీ సైటు యొక్క పేరు, ఇలా \"మీకంపెనీ మైక్రోబ్లాగు\""
 
-#: actions/siteadminpanel.php:229
 msgid "Brought by"
 msgstr "అందిస్తున్నవారు"
 
-#: actions/siteadminpanel.php:230
 msgid "Text used for credits link in footer of each page"
 msgstr ""
 
-#: actions/siteadminpanel.php:234
 msgid "Brought by URL"
 msgstr "అందిస్తున్నవారి URL"
 
-#: actions/siteadminpanel.php:235
 msgid "URL used for credits link in footer of each page"
 msgstr ""
 
-#: actions/siteadminpanel.php:239
 msgid "Contact email address for your site"
 msgstr "మీ సైటుకి సంప్రదింపుల ఈమెయిల్ చిరునామా"
 
-#: actions/siteadminpanel.php:245
 msgid "Local"
 msgstr "స్థానిక"
 
-#: actions/siteadminpanel.php:256
 msgid "Default timezone"
 msgstr "అప్రమేయ కాలమండలం"
 
-#: actions/siteadminpanel.php:257
 msgid "Default timezone for the site; usually UTC."
 msgstr ""
 
-#: actions/siteadminpanel.php:262
 msgid "Default language"
 msgstr "అప్రమేయ భాష"
 
-#: actions/siteadminpanel.php:263
 msgid "Site language when autodetection from browser settings is not available"
 msgstr "విహారిణి అమరికల నుండి భాషని స్వయంచాలకంగా పొందలేకపోయినప్పుడు ఉపయోగించే సైటు భాష"
 
-#: actions/siteadminpanel.php:271
 msgid "Limits"
 msgstr "పరిమితులు"
 
-#: actions/siteadminpanel.php:274
 msgid "Text limit"
 msgstr "పాఠ్యపు పరిమితి"
 
-#: actions/siteadminpanel.php:274
 msgid "Maximum number of characters for notices."
 msgstr "సందేశాలలోని అక్షరాల గరిష్ఠ సంఖ్య."
 
-#: actions/siteadminpanel.php:278
 #, fuzzy
 msgid "Dupe limit"
 msgstr "పాఠ్యపు పరిమితి"
 
-#: actions/siteadminpanel.php:278
 msgid "How long users must wait (in seconds) to post the same thing again."
 msgstr "అదే విషయాన్ని మళ్ళీ టపా చేయడానికి వాడుకరులు ఎంత సమయం (క్షణాల్లో) వేచివుండాలి."
 
 #. TRANS: Page title for site-wide notice tab in admin panel.
-#: actions/sitenoticeadminpanel.php:55
 msgid "Site Notice"
 msgstr "సైటు గమనిక"
 
 #. TRANS: Instructions for site-wide notice tab in admin panel.
-#: actions/sitenoticeadminpanel.php:66
 #, fuzzy
 msgid "Edit site-wide message"
 msgstr "కొత్త సందేశం"
 
 #. TRANS: Server error displayed when saving a site-wide notice was impossible.
-#: actions/sitenoticeadminpanel.php:101
 msgid "Unable to save site notice."
 msgstr "సైటు గమనికని భద్రపరచు"
 
 #. TRANS: Client error displayed when a site-wide notice was longer than allowed.
-#: actions/sitenoticeadminpanel.php:112
 #, fuzzy
 msgid "Maximum length for the site-wide notice is 255 characters."
 msgstr "సైటు-వారీ నోటీసుకి గరిష్ఠ పొడవు 255 అక్షరాలు."
 
 #. TRANS: Label for site-wide notice text field in admin panel.
-#: actions/sitenoticeadminpanel.php:176
 msgid "Site notice text"
 msgstr "సైటు గమనిక పాఠ్యం"
 
 #. TRANS: Tooltip for site-wide notice text field in admin panel.
-#: actions/sitenoticeadminpanel.php:179
 #, fuzzy
 msgid "Site-wide notice text (255 characters maximum; HTML allowed)"
 msgstr "సైటు-వారీ నోటీసు పాఠ్యం (255 అక్షరాలు గరిష్ఠం; HTML పర్లేదు)"
 
 #. TRANS: Title for button to save site notice in admin panel.
-#: actions/sitenoticeadminpanel.php:201
 #, fuzzy
 msgid "Save site notice."
 msgstr "సైటు గమనికని భద్రపరచు"
 
 #. TRANS: Title for SMS settings.
-#: actions/smssettings.php:56
 msgid "SMS settings"
 msgstr "SMS అమరికలు"
 
 #. TRANS: SMS settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/smssettings.php:70
 #, fuzzy, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr "%%site.name%% నుండి మీకు ఎలా మెయిల్ వస్తూంతో సంభాళించుకోండి."
 
 #. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
-#: actions/smssettings.php:92
 msgid "SMS is not available."
 msgstr "IM అందుబాటులో లేదు."
 
 #. TRANS: Form legend for SMS settings form.
-#: actions/smssettings.php:106
 msgid "SMS address"
 msgstr "SMS చిరునామా"
 
 #. TRANS: Form guide in SMS settings form.
-#: actions/smssettings.php:115
 #, fuzzy
 msgid "Current confirmed SMS-enabled phone number."
 msgstr "ప్రస్తుత నిర్ధారిత ఈమెయిలు చిరునామా."
 
 #. TRANS: Form guide in IM settings form.
-#: actions/smssettings.php:128
 msgid "Awaiting confirmation on this phone number."
 msgstr "ఈ ఫోను నంబరు యొక్క నిర్ధారణకై వేచివుంది."
 
 #. TRANS: Field label for SMS address input in SMS settings form.
-#: actions/smssettings.php:137
 msgid "Confirmation code"
 msgstr "నిర్ధారణ సంకేతం"
 
 #. TRANS: Form field instructions in SMS settings form.
-#: actions/smssettings.php:139
 msgid "Enter the code you received on your phone."
 msgstr ""
 
 #. TRANS: Button label to confirm SMS confirmation code in SMS settings.
-#: actions/smssettings.php:143
 msgctxt "BUTTON"
 msgid "Confirm"
 msgstr "నిర్థారించు"
 
 #. TRANS: Field label for SMS phone number input in SMS settings form.
-#: actions/smssettings.php:148
 #, fuzzy
 msgid "SMS phone number"
 msgstr "ఫోను నెంబరు లేదు."
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
-#: actions/smssettings.php:151
 #, fuzzy
 msgid "Phone number, no punctuation or spaces, with area code."
 msgstr "1-64 చిన్నబడి అక్షరాలు లేదా అంకెలు, విరామ చిహ్నాలు లేదా ఖాళీలు లేకుండా. తప్పనిసరి."
 
 #. TRANS: Form legend for SMS preferences form.
-#: actions/smssettings.php:190
 msgid "SMS preferences"
 msgstr "SMS అభిరుచులు"
 
 #. TRANS: Checkbox label in SMS preferences form.
-#: actions/smssettings.php:196
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
 msgstr ""
 
 #. TRANS: Confirmation message for successful SMS preferences save.
-#: actions/smssettings.php:307
 #, fuzzy
 msgid "SMS preferences saved."
 msgstr "అభిరుచులు భద్రమయ్యాయి."
 
 #. TRANS: Message given saving SMS phone number without having provided one.
-#: actions/smssettings.php:329
 msgid "No phone number."
 msgstr "ఫోను నెంబరు లేదు."
 
 #. TRANS: Message given saving SMS phone number without having selected a carrier.
-#: actions/smssettings.php:335
 #, fuzzy
 msgid "No carrier selected."
 msgstr "నోటీసుని తొలగించాం."
 
 #. TRANS: Message given saving SMS phone number that is already set.
-#: actions/smssettings.php:343
 msgid "That is already your phone number."
 msgstr "ఇది ఇప్పటికే మీ ఫోను నెంబరు."
 
 #. TRANS: Message given saving SMS phone number that is already set for another user.
-#: actions/smssettings.php:347
 msgid "That phone number already belongs to another user."
 msgstr "ఆ ఫోను నంబరు ఇప్పటికే వేరే వాడుకరికి చెందినది."
 
 #. TRANS: Message given saving valid SMS phone number that is to be confirmed.
-#: actions/smssettings.php:375
 #, fuzzy
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
@@ -6060,39 +4987,32 @@ msgid ""
 msgstr "ఆ నిర్ధారణా సంకేతం మీది కాదు!"
 
 #. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
-#: actions/smssettings.php:403
 msgid "That is the wrong confirmation number."
 msgstr "అది తప్పుడు నిర్ధారణ సంఖ్య."
 
 #. TRANS: Message given after successfully canceling SMS phone number confirmation.
-#: actions/smssettings.php:417
 msgid "SMS confirmation cancelled."
 msgstr "IM నిర్ధారణ రద్దయింది."
 
 #. TRANS: Message given trying to remove an SMS phone number that is not
 #. TRANS: registered for the active user.
-#: actions/smssettings.php:437
 msgid "That is not your phone number."
 msgstr "అది మీ ఫోను నంబర్ కాదు."
 
 #. TRANS: Message given after successfully removing a registered SMS phone number.
-#: actions/smssettings.php:459
 msgid "The SMS phone number was removed."
 msgstr "ఆ IM చిరునామాని తొలగించాం."
 
 #. TRANS: Label for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:498
 msgid "Mobile carrier"
 msgstr ""
 
 #. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:503
 msgid "Select a carrier"
 msgstr ""
 
 #. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
 #. TRANS: %s is an administrative contact's e-mail address.
-#: actions/smssettings.php:512
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -6100,123 +5020,98 @@ msgid ""
 msgstr ""
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
-#: actions/smssettings.php:534
 #, fuzzy
 msgid "No code entered."
 msgstr "విషయం లేదు!"
 
 #. TRANS: Menu item for site administration
-#: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
-#: lib/adminpanelaction.php:395
 msgid "Snapshots"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:65
 msgid "Manage snapshot configuration"
 msgstr "సైటు స్వరూపణాన్ని మార్చండి"
 
-#: actions/snapshotadminpanel.php:127
 #, fuzzy
 msgid "Invalid snapshot run value."
 msgstr "తప్పుడు పాత్ర."
 
-#: actions/snapshotadminpanel.php:133
 msgid "Snapshot frequency must be a number."
 msgstr ""
 
-#: actions/snapshotadminpanel.php:144
 #, fuzzy
 msgid "Invalid snapshot report URL."
 msgstr "చిహ్నపు URL చెల్లదు."
 
-#: actions/snapshotadminpanel.php:200
 msgid "Randomly during web hit"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:201
 msgid "In a scheduled job"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:206
 msgid "Data snapshots"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:208
 msgid "When to send statistical data to status.net servers"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:217
 msgid "Frequency"
 msgstr "తరచుదనం"
 
-#: actions/snapshotadminpanel.php:218
 msgid "Snapshots will be sent once every N web hits"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:226
 msgid "Report URL"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:227
 msgid "Snapshots will be sent to this URL"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:248
 #, fuzzy
 msgid "Save snapshot settings"
 msgstr "సైటు అమరికలను భద్రపరచు"
 
 #. TRANS: Client error displayed trying a change a subscription for a non-subscribed profile.
-#: actions/subedit.php:75
 #, fuzzy
 msgid "You are not subscribed to that profile."
 msgstr "మీరు ఎవరికీ చందాచేరలేదు."
 
 #. TRANS: Server error displayed when updating a subscription fails with a database error.
 #. TRANS: Exception thrown when a subscription could not be stored on the server.
-#: actions/subedit.php:89 classes/Subscription.php:141
 msgid "Could not save subscription."
 msgstr "కొత్త చందాని చేర్చలేకపోయాం."
 
 #. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
-#: actions/subscribe.php:121
 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
 msgstr ""
 
 #. TRANS: Page title when subscription succeeded.
-#: actions/subscribe.php:149
 msgid "Subscribed"
 msgstr "చందాచేరారు"
 
 #. TRANS: Header for list of subscribers for a user (first page).
 #. TRANS: %s is the user's nickname.
-#: actions/subscribers.php:51
 #, php-format
 msgid "%s subscribers"
 msgstr "%s చందాదార్లు"
 
 #. TRANS: Header for list of subscribers for a user (not first page).
 #. TRANS: %1$s is the user's nickname, $2$d is the page number.
-#: actions/subscribers.php:55
 #, php-format
 msgid "%1$s subscribers, page %2$d"
 msgstr "%1$s చందాదార్లు, పేజీ %2$d"
 
 #. TRANS: Page notice for page with an overview of all subscribers
 #. TRANS: of the logged in user's own profile.
-#: actions/subscribers.php:68
 msgid "These are the people who listen to your notices."
 msgstr "వీళ్ళు మీ నోటీసులని వినే ప్రజలు."
 
 #. TRANS: Page notice for page with an overview of all subscribers of a user other
 #. TRANS: than the logged in user. %s is the user nickname.
-#: actions/subscribers.php:74
 #, php-format
 msgid "These are the people who listen to %s's notices."
 msgstr "వీళ్ళు %s యొక్క నోటీసులని వినే ప్రజలు."
 
 #. TRANS: Subscriber list text when the logged in user has no subscribers.
-#: actions/subscribers.php:114
 #, fuzzy
 msgid ""
 "You have no subscribers. Try subscribing to people you know and they might "
@@ -6226,7 +5121,6 @@ msgstr ""
 
 #. TRANS: Subscriber list text when looking at the subscribers for a of a user other
 #. TRANS: than the logged in user that has no subscribers. %s is the user nickname.
-#: actions/subscribers.php:118
 #, php-format
 msgid "%s has no subscribers. Want to be the first?"
 msgstr "%sకి చందాదార్లు ఎవరూ లేరు. మీరే మొదటివారు కావాలనుకుంటున్నారా?"
@@ -6236,7 +5130,6 @@ msgstr "%sకి చందాదార్లు ఎవరూ లేరు. మ
 #. TRANS: This message contains a Markdown URL. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.
-#: actions/subscribers.php:127
 #, php-format
 msgid ""
 "%s has no subscribers. Why not [register an account](%%%%action.register%%%"
@@ -6247,20 +5140,17 @@ msgstr ""
 
 #. TRANS: Header for subscriptions overview for a user (not first page).
 #. TRANS: %1$s is a user nickname, %2$d is the page number.
-#: actions/subscriptions.php:55
 #, php-format
 msgid "%1$s subscriptions, page %2$d"
 msgstr "%1$s చందాలు, పేజీ %2$d"
 
 #. TRANS: Page notice for page with an overview of all subscriptions
 #. TRANS: of the logged in user's own profile.
-#: actions/subscriptions.php:68
 msgid "These are the people whose notices you listen to."
 msgstr "మీరు ఈ వ్యక్తుల నోటీసులని వింటున్నారు."
 
 #. TRANS: Page notice for page with an overview of all subscriptions of a user other
 #. TRANS: than the logged in user. %s is the user nickname.
-#: actions/subscriptions.php:74
 #, php-format
 msgid "These are the people whose notices %s listens to."
 msgstr "%s వీరి నోటీసులని వింటున్నారు."
@@ -6269,7 +5159,6 @@ 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.
-#: actions/subscriptions.php:133
 #, php-format
 msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "
@@ -6283,292 +5172,234 @@ msgstr ""
 #. TRANS: than the logged in user that has no subscriptions. %s is the user nickname.
 #. TRANS: Subscription list text when looking at the subscriptions for a of a user that has none
 #. TRANS: as an anonymous user. %s is the user nickname.
-#: actions/subscriptions.php:141 actions/subscriptions.php:147
 #, php-format
 msgid "%s is not listening to anyone."
 msgstr "%s ప్రస్తుతం ఎవరినీ వినడంలేదు."
 
 #. TRANS: Atom feed title. %s is a profile nickname.
-#: actions/subscriptions.php:176
 #, fuzzy, php-format
 msgid "Subscription feed for %s (Atom)"
 msgstr "%s కొరకు స్పందనల ఫీడు (ఆటమ్)"
 
 #. TRANS: Checkbox label for enabling Jabber messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:241 lib/settingsnav.php:110
 msgid "IM"
 msgstr ""
 
 #. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:256 lib/settingsnav.php:117
 msgid "SMS"
 msgstr ""
 
 #. TRANS: Title for all but the first page of notices with tags.
 #. TRANS: %1$s is the tag, %2$d is the page number.
-#: actions/tag.php:73
 #, php-format
 msgid "Notices tagged with %1$s, page %2$d"
 msgstr "%2$sలో %1$s అనే ట్యాగుతో ఉన్న నోటీసులు!"
 
-#: actions/tag.php:91
 #, php-format
 msgid "Notice feed for tag %s (RSS 1.0)"
 msgstr "%s కొరకు స్పందనల ఫీడు (RSS 1.0)"
 
-#: actions/tag.php:97
 #, php-format
 msgid "Notice feed for tag %s (RSS 2.0)"
 msgstr "%s కొరకు స్పందనల ఫీడు (RSS 2.0)"
 
-#: actions/tag.php:103
 #, php-format
 msgid "Notice feed for tag %s (Atom)"
 msgstr "%s కొరకు స్పందనల ఫీడు (ఆటమ్)"
 
-#: actions/tagother.php:39
 msgid "No ID argument."
 msgstr "జోడింపులు లేవు."
 
-#: actions/tagother.php:65
 #, fuzzy, php-format
 msgid "Tag %s"
 msgstr "ట్యాగులు"
 
 #. TRANS: H2 for user profile information.
-#: actions/tagother.php:77 lib/userprofile.php:76
 msgid "User profile"
 msgstr "వాడుకరి ప్రొఫైలు"
 
-#: actions/tagother.php:120
 #, fuzzy
 msgid "Tag user"
 msgstr "ట్యాగులు"
 
-#: actions/tagother.php:130
 msgid ""
 "Tags for this user (letters, numbers, -, ., and _), comma- or space- "
 "separated"
 msgstr ""
 
-#: actions/tagother.php:157
 #, php-format
 msgid "Invalid tag: \"%s\""
 msgstr "తప్పుడు మారుపేరు: \"%s\""
 
-#: actions/tagother.php:172
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 
-#: actions/tagother.php:215
 #, fuzzy
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr "మీ ఉపకరణాన్ని మార్చడానికి ఈ ఫారాన్ని ఉపయోగించండి."
 
-#: actions/tagrss.php:35
 msgid "No such tag."
 msgstr "అటువంటి ట్యాగు లేదు."
 
 #. TRANS: Client error displayed when trying to unblock a non-blocked user.
-#: actions/unblock.php:59
 msgid "You haven't blocked that user."
 msgstr "మీరు ఆ వాడుకరిని నిరోధించలేదు."
 
-#: actions/unsandbox.php:72
 msgid "User is not sandboxed."
 msgstr "వాడుకరిని గుంపు నుండి నిరోధించలేదు."
 
-#: actions/unsilence.php:72
 #, fuzzy
 msgid "User is not silenced."
 msgstr "వాడుకరికి ప్రొఫైలు లేదు."
 
-#: actions/unsubscribe.php:77
 #, fuzzy
 msgid "No profile ID in request."
 msgstr "అధీకరణ అభ్యర్థన లేదు!"
 
-#: actions/unsubscribe.php:98
 msgid "Unsubscribed"
 msgstr "చందామాను"
 
-#: actions/updateprofile.php:64
 #, php-format
 msgid ""
 "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
 msgstr ""
 
-#: actions/urlsettings.php:60
 #, fuzzy
 msgid "URL settings"
 msgstr "IM అమరికలు"
 
 #. TRANS: Instructions for tab "Other" in user profile settings.
-#: actions/urlsettings.php:72
 msgid "Manage various other options."
 msgstr "వేరే ఇతర ఎంపికలని సంభాళించండి."
 
 #. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
 #. TRANS: user's profile settings. This message has one space at the beginning. Use your
 #. TRANS: language's word separator here if it has one (most likely a single space).
-#: actions/urlsettings.php:115
 msgid " (free service)"
 msgstr " (స్వేచ్ఛా సేవ)"
 
-#: actions/urlsettings.php:121
 #, fuzzy
 msgid "[none]"
 msgstr "ఏమీలేదు"
 
-#: actions/urlsettings.php:122
 msgid "[internal]"
-msgstr ""
+msgstr "[అంతర్గతం]"
 
 #. TRANS: Label for dropdown with URL shortener services.
-#: actions/urlsettings.php:130
 msgid "Shorten URLs with"
 msgstr "URL కుదింపు సేవ"
 
 #. TRANS: Tooltip for for dropdown with URL shortener services.
-#: actions/urlsettings.php:132
 msgid "Automatic shortening service to use."
 msgstr "ఉపయోగించాల్సిన యాంత్రిక కుదింపు సేవ."
 
-#: actions/urlsettings.php:138
 msgid "URL longer than"
 msgstr ""
 
-#: actions/urlsettings.php:141
 msgid "URLs longer than this will be shortened, 0 means always shorten."
 msgstr ""
 
-#: actions/urlsettings.php:145
 msgid "Text longer than"
 msgstr ""
 
-#: actions/urlsettings.php:148
 msgid ""
 "URLs in notices longer than this will be shortened, 0 means always shorten."
 msgstr ""
 
 #. TRANS: Form validation error for form "Other settings" in user profile.
-#: actions/urlsettings.php:180
 #, fuzzy
 msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr "URL కుదింపు సేవ మరీ పెద్దగా ఉంది (50 అక్షరాలు గరిష్ఠం)."
 
-#: actions/urlsettings.php:187
 msgid "Invalid number for max url length."
 msgstr ""
 
-#: actions/urlsettings.php:193
 #, fuzzy
 msgid "Invalid number for max notice length."
 msgstr "తప్పుడు దస్త్రపుపేరు.."
 
-#: actions/urlsettings.php:238
 msgid "Error saving user URL shortening preferences."
 msgstr ""
 
 #. TRANS: User admin panel title
-#: actions/useradminpanel.php:58
 msgctxt "TITLE"
 msgid "User"
 msgstr "వాడుకరి"
 
 #. TRANS: Instruction for user admin panel.
-#: actions/useradminpanel.php:69
 msgid "User settings for this StatusNet site"
 msgstr "ఈ స్టేటస్&zwnj;నెట్ సైటుకి వాడుకరి అమరికలు"
 
 #. TRANS: Form validation error in user admin panel when a non-numeric character limit was set.
-#: actions/useradminpanel.php:147
 msgid "Invalid bio limit. Must be numeric."
 msgstr ""
 
 #. TRANS: Form validation error in user admin panel when welcome text is too long.
-#: actions/useradminpanel.php:154
 msgid "Invalid welcome text. Maximum length is 255 characters."
 msgstr "చెల్లని స్వాగత పాఠ్యం. గరిష్ఠ పొడవు 255 అక్షరాలు."
 
 #. TRANS: Client error displayed when trying to set a non-existing user as default subscription for new
 #. TRANS: users in user admin panel. %1$s is the invalid nickname.
-#: actions/useradminpanel.php:166
 #, php-format
 msgid "Invalid default subscripton: \"%1$s\" is not a user."
 msgstr ""
 
-#: actions/useradminpanel.php:215 lib/action.php:565 lib/settingsnav.php:77
-#: lib/subgroupnav.php:81
 msgid "Profile"
 msgstr "ప్రొఫైలు"
 
 #. TRANS: Field label in user admin panel for setting the character limit for the bio field.
-#: actions/useradminpanel.php:220
 msgid "Bio Limit"
 msgstr "స్వపరిచయ పరిమితి"
 
 #. TRANS: Tooltip in user admin panel for setting the character limit for the bio field.
-#: actions/useradminpanel.php:222
 msgid "Maximum length of a profile bio in characters."
 msgstr "స్వపరిచయం యొక్క గరిష్ఠ పొడవు, అక్షరాలలో."
 
 #. TRANS: Form legend in user admin panel.
-#: actions/useradminpanel.php:231
 msgid "New users"
 msgstr "కొత్త వాడుకరులు"
 
 #. TRANS: Field label in user admin panel for setting new user welcome text.
-#: actions/useradminpanel.php:236
 msgid "New user welcome"
 msgstr "కొత్త వాడుకరి స్వాగతం"
 
 #. TRANS: Tooltip in user admin panel for setting new user welcome text.
-#: actions/useradminpanel.php:238
 #, fuzzy
 msgid "Welcome text for new users (maximum 255 characters)."
 msgstr "కొత్త వాడుకరులకై స్వాగత సందేశం (255 అక్షరాలు గరిష్ఠం)."
 
 #. TRANS: Field label in user admin panel for setting default subscription for new users.
-#: actions/useradminpanel.php:244
 msgid "Default subscription"
 msgstr "అప్రమేయ చందా"
 
 #. TRANS: Tooltip in user admin panel for setting default subscription for new users.
-#: actions/useradminpanel.php:246
 #, fuzzy
 msgid "Automatically subscribe new users to this user."
 msgstr "ఉపయోగించాల్సిన యాంత్రిక కుదింపు సేవ."
 
 #. TRANS: Form legend in user admin panel.
-#: actions/useradminpanel.php:256
 msgid "Invitations"
 msgstr "ఆహ్వానాలు"
 
 #. TRANS: Field label for checkbox in user admin panel for allowing users to invite friend using site e-mail.
-#: actions/useradminpanel.php:262
 msgid "Invitations enabled"
 msgstr "ఆహ్వానాలని చేతనంచేసాం"
 
 #. TRANS: Tooltip for checkbox in user admin panel for allowing users to invite friend using site e-mail.
-#: actions/useradminpanel.php:265
 msgid "Whether to allow users to invite new users."
 msgstr "వాడుకరులను కొత్త వారిని ఆహ్వానించడానికి అనుమతించాలా వద్దా."
 
 #. TRANS: Title for button to save user settings in user admin panel.
-#: actions/useradminpanel.php:302
 #, fuzzy
 msgid "Save user settings."
 msgstr "వాడుకరి అమరికలను భద్రపరచు"
 
 #. TRANS: Page title.
-#: actions/userauthorization.php:109
 msgid "Authorize subscription"
 msgstr "చందాని అధీకరించండి"
 
 #. TRANS: Page notice on "Auhtorize subscription" page.
-#: actions/userauthorization.php:115
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
 "user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
@@ -6576,38 +5407,31 @@ msgid ""
 msgstr ""
 
 #. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:200
 msgctxt "BUTTON"
 msgid "Accept"
 msgstr "అంగీకరించు"
 
 #. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:202
 msgid "Subscribe to this user."
 msgstr "ఈ వాడుకరికి చందాచేరండి."
 
 #. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:204
 msgctxt "BUTTON"
 msgid "Reject"
 msgstr "తిరస్కరించు"
 
 #. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:206
 msgid "Reject this subscription."
 msgstr "ఈ చందాని తిరస్కరించండి."
 
 #. TRANS: Client error displayed for an empty authorisation request.
-#: actions/userauthorization.php:219
 msgid "No authorization request!"
 msgstr "అధీకరణ అభ్యర్థన లేదు!"
 
 #. TRANS: Accept message header from Authorise subscription page.
-#: actions/userauthorization.php:242
 msgid "Subscription authorized"
 msgstr "చందాని అధీకరించారు"
 
-#: actions/userauthorization.php:245
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to authorize the "
@@ -6615,11 +5439,9 @@ msgid ""
 msgstr ""
 
 #. TRANS: Reject message header from Authorise subscription page.
-#: actions/userauthorization.php:256
 msgid "Subscription rejected"
 msgstr "చందాని తిరస్కరించారు."
 
-#: actions/userauthorization.php:259
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to fully reject the "
@@ -6628,35 +5450,30 @@ msgstr ""
 
 #. TRANS: Exception thrown when no valid user is found for an authorisation request.
 #. TRANS: %s is a listener URI.
-#: actions/userauthorization.php:296
 #, php-format
 msgid "Listener URI \"%s\" not found here."
 msgstr ""
 
 #. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
 #. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:303
 #, php-format
 msgid "Listenee URI \"%s\" is too long."
 msgstr ""
 
 #. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
 #. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:311
 #, php-format
 msgid "Listenee URI \"%s\" is a local user."
 msgstr ""
 
 #. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
 #. TRANS: %s is a profile URL.
-#: actions/userauthorization.php:329
 #, php-format
 msgid "Profile URL \"%s\" is for a local user."
 msgstr ""
 
 #. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
 #. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
-#: actions/userauthorization.php:339
 #, php-format
 msgid ""
 "Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
@@ -6665,77 +5482,63 @@ msgstr ""
 
 #. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
 #. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:349
 #, fuzzy, php-format
 msgid "Avatar URL \"%s\" is not valid."
 msgstr "హోమ్ పేజీ URL సరైనది కాదు."
 
 #. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
 #. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:356
 #, fuzzy, php-format
 msgid "Cannot read avatar URL \"%s\"."
 msgstr "'%s' అనే అవతారపు URL తప్పు"
 
 #. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
 #. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:363
 #, fuzzy, php-format
 msgid "Wrong image type for avatar URL \"%s\"."
 msgstr "'%s' కొరకు తప్పుడు బొమ్మ రకం"
 
 #. TRANS: Page title for profile design page.
-#: actions/userdesignsettings.php:74 lib/designsettings.php:61
 msgid "Profile design"
 msgstr "ఫ్రొఫైలు రూపురేఖలు"
 
 #. TRANS: Instructions for profile design page.
-#: actions/userdesignsettings.php:84 lib/designsettings.php:72
 #, fuzzy
 msgid ""
 "Customize the way your profile looks with a background image and a colour "
 "palette of your choice."
 msgstr "నేపథ్య చిత్రం మరియు రంగుల ఎంపికతో మీ గుంపు ఎలా కనిపించాలో మలచుకోండి."
 
-#: actions/userdesignsettings.php:289
 msgid "Enjoy your hotdog!"
 msgstr ""
 
-#: actions/userdesignsettings.php:325
 #, fuzzy
 msgid "Design settings"
 msgstr "సైటు అమరికలను భద్రపరచు"
 
-#: actions/userdesignsettings.php:340
 msgid "View profile designs"
 msgstr "ఫ్రొఫైలు రూపురేఖలు"
 
-#: actions/userdesignsettings.php:341
 #, fuzzy
 msgid "Show or hide profile designs."
 msgstr "ఫ్రొఫైలు రూపురేఖలు"
 
-#: actions/userdesignsettings.php:348
 #, fuzzy
 msgid "Background file"
 msgstr "నేపథ్యం"
 
 #. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number.
-#: actions/usergroups.php:66
 #, php-format
 msgid "%1$s groups, page %2$d"
 msgstr "%1$s గుంపులు, %2$dవ పేజీ"
 
-#: actions/usergroups.php:132
 msgid "Search for more groups"
 msgstr "మరిన్ని గుంపులకై వెతుకు"
 
-#: actions/usergroups.php:159
 #, php-format
 msgid "%s is not a member of any group."
 msgstr "%s ఏ గుంపు లోనూ సభ్యులు కాదు."
 
-#: actions/usergroups.php:164
 #, php-format
 msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
 msgstr "[గుంపులని వెతికి](%%action.groupsearch%%) వాటిలో చేరడానికి ప్రయత్నించండి."
@@ -6745,35 +5548,28 @@ msgstr "[గుంపులని వెతికి](%%action.groupsearch%%) 
 #. TRANS: %1$s is a group name, %2$s is a site name.
 #. TRANS: Message is used as a subtitle in atom user notice feed.
 #. TRANS: %1$s is a user name, %2$s is a site name.
-#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:70
-#: lib/atomusernoticefeed.php:95
 #, fuzzy, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr "%2$sలో %1$s మరియు స్నేహితుల నుండి తాజాకరణలు!"
 
-#: actions/version.php:75
 #, php-format
 msgid "StatusNet %s"
 msgstr "స్టేటస్‌నెట్ %s"
 
-#: actions/version.php:155
 #, php-format
 msgid ""
 "This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
 "Inc. and contributors."
 msgstr ""
 
-#: actions/version.php:163
 #, fuzzy
 msgid "Contributors"
 msgstr "అనుసంధానాలు"
 
 #. TRANS: Menu item for site administration
-#: actions/version.php:167 lib/adminpanelaction.php:403
 msgid "License"
 msgstr "లైసెన్సు"
 
-#: actions/version.php:170
 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 "
@@ -6781,7 +5577,6 @@ msgid ""
 "any later version. "
 msgstr ""
 
-#: actions/version.php:176
 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 "
@@ -6789,7 +5584,6 @@ msgid ""
 "for more details. "
 msgstr ""
 
-#: actions/version.php:182
 #, php-format
 msgid ""
 "You should have received a copy of the GNU Affero General Public License "
@@ -6797,52 +5591,42 @@ msgid ""
 msgstr ""
 
 #. TRANS: Form input field label for application name.
-#: actions/version.php:197 lib/applicationeditform.php:190
 msgid "Name"
 msgstr "పేరు"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:885
 msgid "Version"
 msgstr "సంచిక"
 
-#: actions/version.php:199
 msgid "Author(s)"
 msgstr "రచయిత(లు)"
 
 #. TRANS: Form input field label.
-#: actions/version.php:200 lib/applicationeditform.php:208
-#: lib/groupeditform.php:168
 msgid "Description"
 msgstr "వివరణ"
 
 #. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:164
 msgid "Favor"
 msgstr "ఇష్టపడు"
 
 #. TRANS: Ntofication given when a user marks a notice as favorite.
 #. TRANS: %1$s is a user nickname or full name, %2$s is a notice URI.
-#: classes/Fave.php:167
 #, php-format
 msgid "%1$s marked notice %2$s as a favorite."
 msgstr "%2$s నోటీసుని %1$s ఇష్టాంశంగా గుర్తించారు."
 
 #. TRANS: Server exception thrown when a URL cannot be processed.
-#: classes/File.php:162
 #, php-format
 msgid "Cannot process URL '%s'"
 msgstr ""
 
 #. TRANS: Server exception thrown when... Robin thinks something is impossible!
-#: classes/File.php:194
 msgid "Robin thinks something is impossible."
 msgstr ""
 
 #. 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$s is used for plural.
-#: classes/File.php:210
 #, php-format
 msgid ""
 "No file may be larger than %1$d byte and the file you sent was %2$d bytes. "
@@ -6855,7 +5639,6 @@ msgstr[1] ""
 
 #. TRANS: Message given if an upload would exceed user quota.
 #. TRANS: %d (number) is the user quota in bytes and is used for plural.
-#: classes/File.php:223
 #, php-format
 msgid "A file this large would exceed your user quota of %d byte."
 msgid_plural "A file this large would exceed your user quota of %d bytes."
@@ -6864,7 +5647,6 @@ msgstr[1] ""
 
 #. TRANS: Message given id an upload would exceed a user's monthly quota.
 #. TRANS: $d (number) is the monthly user quota in bytes and is used for plural.
-#: classes/File.php:235
 #, php-format
 msgid "A file this large would exceed your monthly quota of %d byte."
 msgid_plural "A file this large would exceed your monthly quota of %d bytes."
@@ -6872,116 +5654,96 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Client exception thrown if a file upload does not have a valid name.
-#: classes/File.php:282 classes/File.php:297
 msgid "Invalid filename."
 msgstr "తప్పుడు దస్త్రపుపేరు.."
 
 #. TRANS: Exception thrown when joining a group fails.
-#: classes/Group_member.php:51
 msgid "Group join failed."
 msgstr "గుంపులో చేరడం విఫలమైంది."
 
 #. TRANS: Exception thrown when trying to leave a group the user is not a member of.
-#: classes/Group_member.php:64
 msgid "Not part of group."
 msgstr "గుంపులో భాగం కాదు."
 
 #. TRANS: Exception thrown when trying to leave a group fails.
-#: classes/Group_member.php:72
 msgid "Group leave failed."
 msgstr "గుంపు నుండి వైదొలగడం విఫలమైంది."
 
 #. TRANS: Exception thrown providing an invalid profile ID.
 #. TRANS: %s is the invalid profile ID.
-#: classes/Group_member.php:85
 #, php-format
 msgid "Profile ID %s is invalid."
 msgstr ""
 
 #. TRANS: Exception thrown providing an invalid group ID.
 #. TRANS: %s is the invalid group ID.
-#: classes/Group_member.php:98
 #, fuzzy, php-format
 msgid "Group ID %s is invalid."
 msgstr "వాడుకరిని భద్రపరచడంలో పొరపాటు: సరికాదు."
 
 #. TRANS: Activity title.
-#: classes/Group_member.php:147 lib/joinform.php:114
 msgid "Join"
 msgstr "చేరు"
 
 #. TRANS: Success message for subscribe to group attempt through OStatus.
 #. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
-#: classes/Group_member.php:151
 #, php-format
 msgid "%1$s has joined group %2$s."
 msgstr ""
 
 #. TRANS: Server exception thrown when updating a local group fails.
-#: classes/Local_group.php:42
 msgid "Could not update local group."
 msgstr "స్థానిక గుంపుని తాజాకరించలేకున్నాం."
 
 #. TRANS: Exception thrown when trying creating a login token failed.
 #. TRANS: %s is the user nickname for which token creation failed.
-#: classes/Login_token.php:78
 #, fuzzy, php-format
 msgid "Could not create login token for %s"
 msgstr "మారుపేర్లని సృష్టించలేకపోయాం."
 
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
-#: classes/Memcached_DataObject.php:556
 msgid "No database name or DSN found anywhere."
 msgstr ""
 
 #. TRANS: Client exception thrown when a user tries to send a direct message while being banned from sending them.
-#: classes/Message.php:45
 msgid "You are banned from sending direct messages."
 msgstr "నేరుగా సందేశాలు పంపడం నుండి మిమ్మల్ని నిషేధించారు."
 
 #. TRANS: Message given when a message could not be stored on the server.
-#: classes/Message.php:69
 #, fuzzy
 msgid "Could not insert message."
 msgstr "ట్యాగులని భద్రపరచలేకపోయాం."
 
 #. TRANS: Message given when a message could not be updated on the server.
-#: classes/Message.php:80
 #, fuzzy
 msgid "Could not update message with new URI."
 msgstr "వాడుకరిని తాజాకరించలేకున్నాం."
 
 #. TRANS: Server exception thrown when a user profile for a notice cannot be found.
 #. TRANS: %1$d is a profile ID (number), %2$d is a notice ID (number).
-#: classes/Notice.php:98
 #, php-format
 msgid "No such profile (%1$d) for notice (%2$d)."
 msgstr ""
 
 #. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:199
 #, fuzzy, php-format
 msgid "Database error inserting hashtag: %s"
 msgstr "అవతారాన్ని పెట్టడంలో పొరపాటు"
 
 #. TRANS: Client exception thrown if a notice contains too many characters.
-#: classes/Notice.php:279
 msgid "Problem saving notice. Too long."
 msgstr "నోటీసుని భద్రపరచడంలో పొరపాటు. చాలా పొడవుగా ఉంది."
 
 #. TRANS: Client exception thrown when trying to save a notice for an unknown user.
-#: classes/Notice.php:284
 msgid "Problem saving notice. Unknown user."
 msgstr "నోటీసుని భద్రపరచడంలో పొరపాటు. గుర్తుతెలియని వాడుకరి."
 
 #. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
-#: classes/Notice.php:290
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr "చాలా ఎక్కువ నోటీసులు అంత వేగంగా; కాస్త ఊపిరి తీసుకుని మళ్ళీ కొన్ని నిమిషాల తర్వాత వ్రాయండి."
 
 #. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
-#: classes/Notice.php:297
 #, fuzzy
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
@@ -6989,43 +5751,36 @@ msgid ""
 msgstr "చాలా ఎక్కువ నోటీసులు అంత వేగంగా; కాస్త ఊపిరి తీసుకుని మళ్ళీ కొన్ని నిమిషాల తర్వాత వ్రాయండి."
 
 #. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:305
 msgid "You are banned from posting notices on this site."
 msgstr "ఈ సైటులో నోటీసులు రాయడం నుండి మిమ్మల్ని నిషేధించారు."
 
 #. TRANS: Server exception thrown when a notice cannot be saved.
 #. TRANS: Server exception thrown when a notice cannot be updated.
-#: classes/Notice.php:372 classes/Notice.php:399
 msgid "Problem saving notice."
 msgstr "సందేశాన్ని భద్రపరచడంలో పొరపాటు."
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:929
 msgid "Bad type provided to saveKnownGroups."
 msgstr ""
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:1028
 #, fuzzy
 msgid "Problem saving group inbox."
 msgstr "సందేశాన్ని భద్రపరచడంలో పొరపాటు."
 
 #. TRANS: Server exception thrown when a reply cannot be saved.
 #. TRANS: %1$d is a notice ID, %2$d is the ID of the mentioned user.
-#: classes/Notice.php:1144
 #, fuzzy, php-format
 msgid "Could not save reply for %1$d, %2$d."
 msgstr "స్థానిక గుంపుని తాజాకరించలేకున్నాం."
 
 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1663
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
 
 #. TRANS: Full name of a profile or group followed by nickname in parens
-#: classes/Profile.php:172 classes/User_group.php:242
 #, php-format
 msgctxt "FANCYNAME"
 msgid "%1$s (%2$s)"
@@ -7033,266 +5788,210 @@ msgstr "%1$s (%2$s)"
 
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:779
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:788
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
 
 #. TRANS: Exception thrown when a right for a non-existing user profile is checked.
-#: classes/Remote_profile.php:54
 #, fuzzy
 msgid "Missing profile."
 msgstr "వాడుకరికి ప్రొఫైలు లేదు."
 
 #. TRANS: Exception thrown when a tag cannot be saved.
-#: classes/Status_network.php:338
 msgid "Unable to save tag."
 msgstr "ట్యాగులని భద్రపరచలేకపోయాం."
 
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#: classes/Subscription.php:77 lib/oauthstore.php:482
 msgid "You have been banned from subscribing."
 msgstr "చందాచేరడం నుండి మిమ్మల్ని నిషేధించారు."
 
 #. TRANS: Exception thrown when trying to subscribe while already subscribed.
-#: classes/Subscription.php:82
 msgid "Already subscribed!"
 msgstr "ఇప్పటికే చందాచేరారు!"
 
 #. TRANS: Exception thrown when trying to subscribe to a user who has blocked the subscribing user.
-#: classes/Subscription.php:87
 msgid "User has blocked you."
 msgstr "వాడుకరి మిమ్మల్ని నిరోధించారు."
 
 #. TRANS: Exception thrown when trying to unsibscribe without a subscription.
-#: classes/Subscription.php:176
 #, fuzzy
 msgid "Not subscribed!"
 msgstr "చందాదార్లు"
 
 #. TRANS: Exception thrown when trying to unsubscribe a user from themselves.
-#: classes/Subscription.php:183
 msgid "Could not delete self-subscription."
 msgstr "కొత్త చందాని చేర్చలేకపోయాం."
 
 #. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
-#: classes/Subscription.php:211
 msgid "Could not delete subscription OMB token."
 msgstr "కొత్త చందాని చేర్చలేకపోయాం."
 
 #. TRANS: Exception thrown when a subscription could not be deleted on the server.
-#: classes/Subscription.php:223
 msgid "Could not delete subscription."
 msgstr "కొత్త చందాని చేర్చలేకపోయాం."
 
 #. TRANS: Activity tile when subscribing to another person.
-#: classes/Subscription.php:265
 msgid "Follow"
 msgstr "అనుసరించు"
 
 #. TRANS: Notification given when one person starts following another.
 #. TRANS: %1$s is the subscriber, %2$s is the subscribed.
-#: classes/Subscription.php:268
 #, fuzzy, php-format
 msgid "%1$s is now following %2$s."
 msgstr "%1$s ఇప్పుడు %2$sలో మీ నోటీసులని వింటున్నారు."
 
 #. TRANS: Notice given on user registration.
 #. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:390
 #, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr "@%2$s, %1$sకి స్వాగతం!"
 
 #. TRANS: Server exception.
-#: classes/User.php:923
 msgid "No single user defined for single-user mode."
 msgstr ""
 
 #. TRANS: Server exception.
-#: classes/User.php:927
 msgid "Single-user mode code called when not enabled."
 msgstr ""
 
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:522
 msgid "Could not create group."
 msgstr "గుంపుని సృష్టించలేకపోయాం."
 
 #. TRANS: Server exception thrown when updating a group URI failed.
-#: classes/User_group.php:532
 msgid "Could not set group URI."
 msgstr "గుంపుని సృష్టించలేకపోయాం."
 
 #. TRANS: Server exception thrown when setting group membership failed.
-#: classes/User_group.php:555
 msgid "Could not set group membership."
 msgstr "గుంపు సభ్యత్వాన్ని అమర్చలేకపోయాం."
 
 #. TRANS: Server exception thrown when saving local group information failed.
-#: classes/User_group.php:570
 msgid "Could not save local group info."
 msgstr "స్థానిక గుంపుని తాజాకరించలేకున్నాం."
 
 #. TRANS: Exception thrown when an account could not be located when it should be moved.
 #. TRANS: %s is the remote site.
-#: lib/accountmover.php:65
 #, fuzzy, php-format
 msgid "Cannot locate account %s."
 msgstr "మీరు వాడుకరులని తొలగించలేరు."
 
 #. TRANS: Exception thrown when a service document could not be located account move.
 #. TRANS: %s is the remote site.
-#: lib/accountmover.php:106
 #, php-format
 msgid "Cannot find XRD for %s."
 msgstr ""
 
 #. TRANS: Exception thrown when an account could not be located when it should be moved.
 #. TRANS: %s is the remote site.
-#: lib/accountmover.php:131
 #, php-format
 msgid "No AtomPub API service for %s."
 msgstr ""
 
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: lib/action.php:161
 #, php-format
 msgid "%1$s - %2$s"
 msgstr "%1$s - %2$s"
 
 #. TRANS: Page title for a page without a title set.
-#: lib/action.php:177
 msgid "Untitled page"
 msgstr "శీర్షికలేని పేజీ"
 
 #. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.
-#: lib/action.php:325
 msgctxt "TOOLTIP"
 msgid "Show more"
 msgstr "మరింత చూపించు"
 
 #. TRANS: Inline reply form submit button: submits a reply comment.
-#: lib/action.php:328
 #, fuzzy
 msgctxt "BUTTON"
-msgid "Comment"
-msgstr "విషయం"
+msgid "Reply"
+msgstr "స్పందించండి"
 
 #. TRANS: Placeholder text for inline reply form. Clicking in this box will turn it into a mini notice form.
-#: lib/action.php:331
-msgid "Add a comment..."
+msgid "Write a reply..."
 msgstr ""
 
-#: lib/action.php:559 lib/personalgroupnav.php:99
-#, fuzzy
 msgid "Home"
-msgstr "హోమ్ పేజీ"
+msgstr "ముంగిలి"
 
-#: lib/action.php:560
 #, fuzzy
 msgid "Friends timeline"
 msgstr "%s కాలరేఖ"
 
-#: lib/action.php:566
-#, fuzzy
 msgid "Your profile"
 msgstr "గుంపు ప్రొఫైలు"
 
-#: lib/action.php:570 lib/action.php:593 lib/publicgroupnav.php:78
 msgid "Public"
 msgstr "ప్రజా"
 
-#: lib/action.php:571 lib/action.php:594
 #, fuzzy
 msgid "Everyone on this site"
 msgstr "ఈ సైటులోని వ్యక్తులని కనుగొనండి"
 
-#: lib/action.php:575
-#, fuzzy
 msgid "Settings"
 msgstr "SMS అమరికలు"
 
-#: lib/action.php:576
 #, fuzzy
 msgid "Change your personal settings"
 msgstr "ఫ్రొఫైలు అమరికలని మార్చు"
 
-#: lib/action.php:582
 #, fuzzy
 msgid "Site configuration"
 msgstr "వాడుకరి స్వరూపణం"
 
-#: lib/action.php:587
-#, fuzzy
 msgid "Logout"
 msgstr "నిష్క్రమించు"
 
-#: lib/action.php:588
-#, fuzzy
 msgid "Logout from the site"
 msgstr "సైటు నుండి నిష్క్రమించు"
 
-#: lib/action.php:599
-#, fuzzy
 msgid "Login to the site"
-msgstr "సైటు లోనికి ప్రవేశించండి"
+msgstr "సైటులోని ప్రవేశించు"
 
-#: lib/action.php:606
-#, fuzzy
 msgid "Search"
 msgstr "వెతుకు"
 
-#: lib/action.php:607
 #, fuzzy
 msgid "Search the site"
 msgstr "సైటుని వెతుకు"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:864
 msgid "Help"
 msgstr "సహాయం"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:867
 msgid "About"
 msgstr "గురించి"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:870
 msgid "FAQ"
 msgstr "ప్రశ్నలు"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:875
 msgid "TOS"
 msgstr "సేవా నియమాలు"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:879
 msgid "Privacy"
 msgstr "అంతరంగికత"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:882
 msgid "Source"
 msgstr "మూలము"
 
 #. TRANS: Secondary navigation menu option leading to e-mail contact information on the
 #. TRANS: StatusNet site, where to report bugs, ...
-#: lib/action.php:889
 msgid "Contact"
 msgstr "సంప్రదించు"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:892
 msgid "Badge"
 msgstr "బాడ్జి"
 
@@ -7300,7 +5999,6 @@ msgstr "బాడ్జి"
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:921
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7310,7 +6008,6 @@ msgstr ""
 "అందిస్తున్న సూక్ష్మ బ్లాగింగు సేవ."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:924
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** అనేది మైక్రో బ్లాగింగు సదుపాయం."
@@ -7319,7 +6016,6 @@ msgstr "**%%site.name%%** అనేది మైక్రో బ్లాగి
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:931
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7332,105 +6028,87 @@ msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:949
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:956
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:960
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:992
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1335
 msgid "After"
 msgstr "తర్వాత"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1345
 msgid "Before"
 msgstr "ఇంతక్రితం"
 
 #. TRANS: Client exception thrown when a feed instance is a DOMDocument.
-#: lib/activity.php:125
 msgid "Expecting a root feed element but got a whole XML document."
 msgstr ""
 
 #. TRANS: Client exception thrown when using an unknown verb for the activity importer.
-#: lib/activityimporter.php:81
 #, fuzzy, php-format
 msgid "Unknown verb: \"%s\"."
 msgstr "గుర్తు తెలియని భాష \"%s\"."
 
 #. TRANS: Client exception thrown when trying to force a subscription for an untrusted user.
-#: lib/activityimporter.php:107
 msgid "Cannot force subscription for untrusted user."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to for a remote user to subscribe.
-#: lib/activityimporter.php:117
 #, fuzzy
 msgid "Cannot force remote user to subscribe."
 msgstr "ఏవరికి చందా చేరాలనుకుంటున్నారో ఆ వాడుకరి పేరుని ఇవ్వండి."
 
 #. TRANS: Client exception thrown when trying to subscribe to an unknown profile.
-#: lib/activityimporter.php:132
 msgid "Unknown profile."
 msgstr "తెలియని ప్రొఫైలు."
 
 #. TRANS: Client exception thrown when trying to import an event not related to the importing user.
-#: lib/activityimporter.php:138
 msgid "This activity seems unrelated to our user."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to join a remote group that is not a group.
-#: lib/activityimporter.php:154
 msgid "Remote profile is not a group!"
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to join a group the importing user is already a member of.
-#: lib/activityimporter.php:163
 #, fuzzy
 msgid "User is already a member of this group."
 msgstr "మీరు ఇప్పటికే ఆ గుంపులో సభ్యులు."
 
 #. TRANS: Client exception thrown when trying to import a notice by another user.
 #. TRANS: %1$s is the source URI of the notice, %2$s is the URI of the author.
-#: lib/activityimporter.php:201
 #, php-format
 msgid "Already know about notice %1$s and  it has a different author %2$s."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to overwrite the author information for a non-trusted user during import.
-#: lib/activityimporter.php:207
 msgid "Not overwriting author info for non-trusted user."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to import a notice without content.
 #. TRANS: %s is the notice URI.
-#: lib/activityimporter.php:223
 #, fuzzy, php-format
 msgid "No content for notice %s."
 msgstr "మీ నోటీసుని మీరే పునరావృతించలేరు."
 
-#: lib/activitymover.php:84
 #, fuzzy, php-format
 msgid "No such user %s."
 msgstr "అటువంటి వాడుకరి లేరు."
@@ -7441,217 +6119,177 @@ msgstr "అటువంటి వాడుకరి లేరు."
 #. TRANS: %1$s is a URL, %2$s is the status, %s$s is the fail reason.
 #. TRANS: Exception thrown when post to collection fails with a status that is not handled.
 #. TRANS: %1$s is a URL, %2$s is the status, %s$s is the fail reason.
-#: lib/activitysink.php:163 lib/activitysink.php:167 lib/activitysink.php:172
 #, fuzzy, php-format
 msgctxt "URLSTATUSREASON"
 msgid "%1$s %2$s %3$s"
 msgstr "%1$s - %2$s"
 
 #. TRANS: Client exception thrown when there is no source attribute.
-#: lib/activityutils.php:200
 msgid "Can't handle remote content yet."
 msgstr ""
 
 #. TRANS: Client exception thrown when there embedded XML content is found that cannot be processed yet.
-#: lib/activityutils.php:237
 msgid "Can't handle embedded XML content yet."
 msgstr ""
 
 #. TRANS: Client exception thrown when base64 encoded content is found that cannot be processed yet.
-#: lib/activityutils.php:242
 msgid "Can't handle embedded Base64 content yet."
 msgstr ""
 
 #. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights.
-#: lib/adminpanelaction.php:96
 msgid "You cannot make changes to this site."
 msgstr "ఈ సైటుకి మీరు మార్పులు చేయలేరు."
 
 #. TRANS: Client error message throw when a certain panel's settings cannot be changed.
-#: lib/adminpanelaction.php:108
 #, fuzzy
 msgid "Changes to that panel are not allowed."
 msgstr "నమోదు అనుమతించబడదు."
 
 #. TRANS: Client error message.
-#: lib/adminpanelaction.php:222
 msgid "showForm() not implemented."
 msgstr ""
 
 #. TRANS: Client error message
-#: lib/adminpanelaction.php:250
 msgid "saveSettings() not implemented."
 msgstr ""
 
 #. TRANS: Client error message thrown if design settings could not be deleted in
 #. TRANS: the admin panel Design.
-#: lib/adminpanelaction.php:274
 #, fuzzy
 msgid "Unable to delete design setting."
 msgstr "మీ రూపురేఖల అమరికలని భద్రపరచలేకున్నాం."
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:337
 msgid "Basic site configuration"
 msgstr "ప్రాథమిక సైటు స్వరూపణం"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:339
 msgctxt "MENU"
 msgid "Site"
 msgstr "సైటు"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:345
 msgid "Design configuration"
 msgstr "రూపకల్పన స్వరూపణం"
 
 #. TRANS: Menu item for site administration
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/adminpanelaction.php:347 lib/groupnav.php:135
 msgctxt "MENU"
 msgid "Design"
 msgstr "రూపురేఖలు"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:353
 msgid "User configuration"
 msgstr "వాడుకరి స్వరూపణం"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:110
 msgid "User"
 msgstr "వాడుకరి"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:361
 msgid "Access configuration"
 msgstr "రూపకల్పన స్వరూపణం"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:369
 msgid "Paths configuration"
 msgstr "వాడుకరి స్వరూపణం"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:377
 #, fuzzy
 msgid "Sessions configuration"
 msgstr "రూపకల్పన స్వరూపణం"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:385
 msgid "Edit site notice"
 msgstr "సైటు గమనికని భద్రపరచు"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:387
 msgid "Site notice"
 msgstr "సైటు గమనిక"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:393
 msgid "Snapshots configuration"
 msgstr "వాడుకరి స్వరూపణం"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:401
 msgid "Set site license"
 msgstr ""
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:409
 #, fuzzy
 msgid "Plugins configuration"
 msgstr "వాడుకరి స్వరూపణం"
 
 #. TRANS: Client error 401.
-#: lib/apiauth.php:111
 msgid "API resource requires read-write access, but you only have read access."
 msgstr ""
 
 #. TRANS: OAuth exception thrown when no application is found for a given consumer key.
-#: lib/apiauth.php:177
 msgid "No application for that consumer key."
 msgstr ""
 
-#: lib/apiauth.php:202 lib/apiauth.php:284
 msgid "Not allowed to use API."
 msgstr ""
 
 #. TRANS: OAuth exception given when an incorrect access token was given for a user.
-#: lib/apiauth.php:225
 msgid "Bad access token."
 msgstr ""
 
 #. TRANS: OAuth exception given when no user was found for a given token (no token was found).
-#: lib/apiauth.php:230
 msgid "No user for that token."
 msgstr ""
 
 #. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel".
 #. TRANS: Client error thrown when authentication fails.
-#: lib/apiauth.php:272 lib/apiauth.php:302
 msgid "Could not authenticate you."
 msgstr ""
 
 #. TRANS: Server error displayed when trying to create an anynymous OAuth consumer.
-#: lib/apioauthstore.php:45
 #, fuzzy
 msgid "Could not create anonymous consumer."
 msgstr "మారుపేర్లని సృష్టించలేకపోయాం."
 
 #. TRANS: Server error displayed when trying to create an anynymous OAuth application.
-#: lib/apioauthstore.php:69
 #, fuzzy
 msgid "Could not create anonymous OAuth application."
 msgstr "ఉపకరణాన్ని సృష్టించలేకపోయాం."
 
 #. TRANS: Exception thrown when no token association could be found.
-#: lib/apioauthstore.php:151
 msgid ""
 "Could not find a profile and application associated with the request token."
 msgstr ""
 
 #. TRANS: Exception thrown when no access token can be issued.
-#: lib/apioauthstore.php:209
 #, fuzzy
 msgid "Could not issue access token."
 msgstr "ట్యాగులని భద్రపరచలేకపోయాం."
 
-#: lib/apioauthstore.php:317
 #, fuzzy
 msgid "Database error inserting OAuth application user."
 msgstr "అవతారాన్ని పెట్టడంలో పొరపాటు"
 
-#: lib/apioauthstore.php:345
 #, fuzzy
 msgid "Database error updating OAuth application user."
 msgstr "అవతారాన్ని పెట్టడంలో పొరపాటు"
 
 #. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
-#: lib/apioauthstore.php:371
 msgid "Tried to revoke unknown token."
 msgstr ""
 
 #. TRANS: Exception thrown when an attempt is made to remove a revoked token.
-#: lib/apioauthstore.php:376
 msgid "Failed to delete revoked token."
 msgstr ""
 
 #. TRANS: Form input field label for application icon.
-#: lib/applicationeditform.php:177
 msgid "Icon"
 msgstr "ప్రతీకం"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:182
 msgid "Icon for this application"
 msgstr "ఈ ఉపకరణానికి ప్రతీకం"
 
 #. TRANS: Form input field instructions.
 #. TRANS: %d is the number of available characters for the description.
-#: lib/applicationeditform.php:201
 #, fuzzy, php-format
 msgid "Describe your application in %d character"
 msgid_plural "Describe your application in %d characters"
@@ -7659,213 +6297,174 @@ msgstr[0] "మీ ఉపకరణం గురించి %d అక్షరా
 msgstr[1] "మీ ఉపకరణం గురించి %d అక్షరాల్లో వివరించండి"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:205
 msgid "Describe your application"
 msgstr "మీ ఉపకరణాన్ని వివరించండి"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:216
 msgid "URL of the homepage of this application"
 msgstr "ఈ ఉపకరణం యొక్క హోమ్&zwnj;పేజీ చిరునామా"
 
 #. TRANS: Form input field label.
-#: lib/applicationeditform.php:218
 #, fuzzy
 msgid "Source URL"
 msgstr "మూలము"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:225
 msgid "Organization responsible for this application"
 msgstr "ఈ ఉపకరణానికి బాధ్యతాయుతమైన సంస్థ"
 
 #. TRANS: Form input field label.
-#: lib/applicationeditform.php:227
 msgid "Organization"
 msgstr "సంస్ధ"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:234
 msgid "URL for the homepage of the organization"
 msgstr "ఈ ఉపకరణం యొక్క హోమ్&zwnj;పేజీ చిరునామా"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:243
 msgid "URL to redirect to after authentication"
 msgstr ""
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:271
 msgid "Browser"
 msgstr "విహారిణి"
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:288
 msgid "Desktop"
 msgstr "మేజోపరి"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:290
 msgid "Type of application, browser or desktop"
 msgstr "ఉపకరణ రకం, విహారిణి లేదా మేజోపరి"
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:314
 msgid "Read-only"
 msgstr "చదవడం-మాత్రమే"
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:334
 msgid "Read-write"
 msgstr "చదవడం-వ్రాయడం"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:336
 msgid "Default access for this application: read-only, or read-write"
 msgstr ""
 
 #. TRANS: Submit button title.
-#: lib/applicationeditform.php:353
 msgid "Cancel"
 msgstr "రద్దుచేయి"
 
-#: lib/applicationlist.php:247
 msgid " by "
 msgstr ""
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:260
 msgid "read-write"
 msgstr "చదవడం-వ్రాయడం"
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:262
 msgid "read-only"
 msgstr "చదవడం-మాత్రమే"
 
 #. TRANS: Used in application list. %1$s is a modified date, %2$s is access type ("read-write" or "read-only")
-#: lib/applicationlist.php:268
 #, php-format
 msgid "Approved %1$s - \"%2$s\" access."
 msgstr ""
 
 #. TRANS: Access token in the application list.
 #. TRANS: %s are the first 7 characters of the access token.
-#: lib/applicationlist.php:282
 #, php-format
 msgid "Access token starting with: %s"
 msgstr ""
 
 #. TRANS: Button label
-#: lib/applicationlist.php:298
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "తొలగించు"
 
-#: lib/atom10feed.php:113
 msgid "Author element must contain a name element."
 msgstr ""
 
 #. TRANS: Server exception thrown when using the method setActivitySubject() in the class Atom10Feed.
-#: lib/atom10feed.php:160
 #, fuzzy
 msgid "Do not use this method!"
 msgstr "ఈ గుంపును తొలగించకు"
 
 #. TRANS: Title.
-#: lib/attachmentnoticesection.php:67
 msgid "Notices where this attachment appears"
 msgstr ""
 
 #. TRANS: Title.
-#: lib/attachmenttagcloudsection.php:48
 #, fuzzy
 msgid "Tags for this attachment"
 msgstr "అటువంటి జోడింపు లేదు."
 
 #. TRANS: Exception thrown when a password change fails.
-#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:227
 #, fuzzy
 msgid "Password changing failed."
 msgstr "సంకేతపదం మార్పు విఫలమైంది"
 
 #. TRANS: Exception thrown when a password change attempt fails because it is not allowed.
-#: lib/authenticationplugin.php:238
 msgid "Password changing is not allowed."
 msgstr "సంకేతపదం మార్పడానికి అనుమతి లేదు."
 
 #. TRANS: Title for the form to block a user.
-#: lib/blockform.php:68
 msgid "Block"
 msgstr "నిరోధించు"
 
 #. TRANS: Description of the form to block a user.
-#: lib/blockform.php:79
 msgid "Block this user"
 msgstr "ఈ వాడుకరిని నిరోధించు"
 
 #. TRANS: Title for command results.
-#: lib/channel.php:104 lib/channel.php:125
 msgid "Command results"
 msgstr "ఆదేశ ఫలితాలు"
 
 #. TRANS: Title for command results.
-#: lib/channel.php:138
 #, fuzzy
 msgid "AJAX error"
 msgstr "అజాక్స్ పొరపాటు"
 
 #. TRANS: E-mail subject when a command has completed.
-#: lib/channel.php:177 lib/mailhandler.php:143
 msgid "Command complete"
 msgstr "ఆదేశం పూర్తయ్యింది"
 
 #. TRANS: E-mail subject when a command has failed.
-#: lib/channel.php:188
 msgid "Command failed"
 msgstr "ఆదేశం విఫలమైంది"
 
 #. TRANS: Command exception text shown when a notice ID is requested that does not exist.
-#: lib/command.php:82 lib/command.php:106
 #, fuzzy
 msgid "Notice with that id does not exist."
 msgstr "ఆ ఈమెయిలు చిరునామా లేదా వాడుకరిపేరుతో వాడుకరులెవరూ లేరు."
 
 #. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
 #. TRANS: Error text shown when a last user notice is requested and it does not exist.
-#: lib/command.php:99 lib/command.php:642
 #, fuzzy
 msgid "User has no last notice."
 msgstr "వాడుకరికి ప్రొఫైలు లేదు."
 
 #. TRANS: Message given requesting a profile for a non-existing user.
 #. TRANS: %s is the nickname of the user for which the profile could not be found.
-#: lib/command.php:128
 #, fuzzy, php-format
 msgid "Could not find a user with nickname %s."
 msgstr "వాడుకరిని తాజాకరించలేకున్నాం."
 
 #. TRANS: Message given getting a non-existing user.
 #. TRANS: %s is the nickname of the user that could not be found.
-#: lib/command.php:148
 #, php-format
 msgid "Could not find a local user with nickname %s."
 msgstr ""
 
 #. TRANS: Error text shown when an unimplemented command is given.
-#: lib/command.php:183
 msgid "Sorry, this command is not yet implemented."
 msgstr "క్షమించండి, ఈ ఆదేశం ఇంకా అమలుపరచబడలేదు."
 
 #. TRANS: Command exception text shown when a user tries to nudge themselves.
-#: lib/command.php:229
 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr ""
 
 #. TRANS: Message given having nudged another user.
 #. TRANS: %s is the nickname of the user that was nudged.
-#: lib/command.php:238
 #, php-format
 msgid "Nudge sent to %s."
 msgstr ""
@@ -7874,7 +6473,6 @@ msgstr ""
 #. TRANS: %1$s is the number of other user the user is subscribed to.
 #. TRANS: %2$s is the number of users that are subscribed to the user.
 #. TRANS: %3$s is the number of notices the user has sent.
-#: lib/command.php:268
 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"
@@ -7886,40 +6484,34 @@ msgstr ""
 "నోటీసులు: %3$s"
 
 #. TRANS: Error message text shown when a favorite could not be set because it has already been favorited.
-#: lib/command.php:298
 #, fuzzy
 msgid "Could not create favorite: already favorited."
 msgstr "ఇష్టాంశాన్ని సృష్టించలేకపోయాం."
 
 #. TRANS: Text shown when a notice has been marked as favourite successfully.
-#: lib/command.php:324
 msgid "Notice marked as fave."
 msgstr "నోటీసుని ఇష్టాంశంగా గుర్తించాం."
 
 #. TRANS: Message given having added a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:369
 #, php-format
 msgid "%1$s joined group %2$s."
 msgstr "%1$s %2$s గుంపులో చేరారు."
 
 #. TRANS: Message given having removed a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:417
 #, php-format
 msgid "%1$s left group %2$s."
 msgstr "%2$s గుంపు నుండి %1$s వైదొలిగారు."
 
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: lib/command.php:438
 #, php-format
 msgctxt "WHOIS"
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
 
 #. TRANS: Whois output. %s is the full name of the queried user.
-#: lib/command.php:442
 #, php-format
 msgid "Fullname: %s"
 msgstr "పూర్తిపేరు: %s"
@@ -7927,7 +6519,6 @@ msgstr "పూర్తిపేరు: %s"
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a location.
-#: lib/command.php:446 lib/mail.php:275
 #, php-format
 msgid "Location: %s"
 msgstr "ప్రాంతం: %s"
@@ -7935,20 +6526,17 @@ msgstr "ప్రాంతం: %s"
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a homepage.
-#: lib/command.php:450 lib/mail.php:279
 #, php-format
 msgid "Homepage: %s"
 msgstr "హోంపేజీ: %s"
 
 #. TRANS: Whois output. %s is the bio information of the queried user.
-#: lib/command.php:454
 #, php-format
 msgid "About: %s"
 msgstr "గురించి: %s"
 
 #. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).
 #. TRANS: %s is a remote profile.
-#: lib/command.php:483
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
@@ -7957,34 +6545,33 @@ msgstr ""
 
 #. TRANS: Message given if content is too long. %1$sd is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:500
 #, fuzzy, php-format
 msgid "Message too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
 msgstr[0] "నోటిసు చాలా పొడవుగా ఉంది - %1$d అక్షరాలు గరిష్ఠం, మీరు %2$d పంపించారు."
 msgstr[1] "నోటిసు చాలా పొడవుగా ఉంది - %1$d అక్షరాలు గరిష్ఠం, మీరు %2$d పంపించారు."
 
+#. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
+msgid "You can't send a message to this user."
+msgstr "ఈ వాడుకరికి మీరు సందేశాన్ని పంపించలేరు."
+
 #. TRANS: Error text shown sending a direct message fails with an unknown reason.
-#: lib/command.php:528
 #, fuzzy
 msgid "Error sending direct message."
 msgstr "నేరుగా సందేశాలు పంపడం నుండి మిమ్మల్ని నిషేధించారు."
 
 #. TRANS: Message given having repeated a notice from another user.
 #. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:565
 #, fuzzy, php-format
 msgid "Notice from %s repeated."
 msgstr "సందేశాలు"
 
 #. TRANS: Error text shown when repeating a notice fails with an unknown reason.
-#: lib/command.php:568
 msgid "Error repeating notice."
 msgstr "నోటీసుని పునరావృతించడంలో పొరపాటు."
 
 #. TRANS: Message given if content of a notice for a reply is too long. %1$d is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:603
 #, fuzzy, php-format
 msgid "Notice too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Notice too long - maximum is %1$d characters, you sent %2$d."
@@ -7993,104 +6580,87 @@ msgstr[1] "నోటిసు చాలా పొడవుగా ఉంది -
 
 #. TRANS: Text shown having sent a reply to a notice successfully.
 #. TRANS: %s is the nickname of the user of the notice the reply was sent to.
-#: lib/command.php:616
 #, fuzzy, php-format
 msgid "Reply to %s sent."
 msgstr "%sకి స్పందనలు"
 
 #. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
-#: lib/command.php:619
 msgid "Error saving notice."
 msgstr "నోటీసుని భద్రపరచడంలో పొరపాటు."
 
 #. TRANS: Error text shown when no username was provided when issuing a subscribe command.
-#: lib/command.php:666
 msgid "Specify the name of the user to subscribe to."
 msgstr "ఏవరికి చందా చేరాలనుకుంటున్నారో ఆ వాడుకరి పేరుని ఇవ్వండి."
 
 #. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
-#: lib/command.php:675
 msgid "Can't subscribe to OMB profiles by command."
 msgstr ""
 
 #. TRANS: Text shown after having subscribed to another user successfully.
 #. TRANS: %s is the name of the user the subscription was requested for.
-#: lib/command.php:683
 #, php-format
 msgid "Subscribed to %s."
 msgstr "%sకి చందా చేరారు."
 
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.
-#: lib/command.php:704 lib/command.php:815
 msgid "Specify the name of the user to unsubscribe from."
 msgstr "ఎవరినుండైతే చందావిరమించాలనుకుంటున్నారో ఆ వాడుకరి పేరుని ఇవ్వండి."
 
 #. TRANS: Text shown after having unsubscribed from another user successfully.
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:715
 #, php-format
 msgid "Unsubscribed from %s."
 msgstr "%s నుండి చందా విరమించారు."
 
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
-#: lib/command.php:735 lib/command.php:761
 #, fuzzy
 msgid "Command not yet implemented."
 msgstr "క్షమించండి, ఈ ఆదేశం ఇంకా అమలుపరచబడలేదు."
 
 #. TRANS: Text shown when issuing the command "off" successfully.
-#: lib/command.php:739
 #, fuzzy
 msgid "Notification off."
 msgstr "నిర్ధారణ సంకేతం లేదు."
 
 #. TRANS: Error text shown when the command "off" fails for an unknown reason.
-#: lib/command.php:742
 msgid "Can't turn off notification."
 msgstr ""
 
 #. TRANS: Text shown when issuing the command "on" successfully.
-#: lib/command.php:765
 #, fuzzy
 msgid "Notification on."
 msgstr "నిర్ధారణ సంకేతం లేదు."
 
 #. TRANS: Error text shown when the command "on" fails for an unknown reason.
-#: lib/command.php:768
 #, fuzzy
 msgid "Can't turn on notification."
 msgstr "మీ నోటీసుని మీరే పునరావృతించలేరు."
 
 #. TRANS: Error text shown when issuing the login command while login is disabled.
-#: lib/command.php:782
 msgid "Login command is disabled."
 msgstr ""
 
 #. TRANS: Text shown after issuing the login command successfully.
 #. TRANS: %s is a logon link..
-#: lib/command.php:795
 #, php-format
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr "ఈ లంకెని ఒకేసారి ఉపయోగించగలరు మరియు అది 2 నిమిషాల వరకు మాత్రమే చెల్లుతుంది: %s."
 
 #. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:824
 #, php-format
 msgid "Unsubscribed %s."
 msgstr "%sని చందా విరమింపజేసారు."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
-#: lib/command.php:842
 msgid "You are not subscribed to anyone."
 msgstr "మీరు ఎవరికీ చందాచేరలేదు."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
-#: lib/command.php:847
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "%sకి స్పందనలు"
@@ -8098,14 +6668,12 @@ msgstr[1] "%sకి స్పందనలు"
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user
 #. TRANS: (followers) without having any subscribers.
-#: lib/command.php:869
 msgid "No one is subscribed to you."
 msgstr "మీకు చందాదార్లు ఎవరూ లేరు."
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
-#: lib/command.php:874
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "%sకి స్పందనలు"
@@ -8113,21 +6681,18 @@ msgstr[1] "%sకి స్పందనలు"
 
 #. TRANS: Text shown after requesting groups a user is subscribed to without having
 #. TRANS: any group subscriptions.
-#: lib/command.php:896
 msgid "You are not a member of any groups."
 msgstr "మీరు ఏ గుంపులోనూ సభ్యులు కాదు."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
-#: lib/command.php:901
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "మీరు ఇప్పటికే లోనికి ప్రవేశించారు!"
 msgstr[1] "మీరు ఇప్పటికే లోనికి ప్రవేశించారు!"
 
 #. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-#: lib/command.php:916
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -8170,122 +6735,100 @@ msgid ""
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:36
 #, fuzzy
 msgid "No configuration file found."
 msgstr "స్వరూపణపు దస్త్రమేమీ కనబడలేదు. "
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:39
 #, fuzzy
 msgid "I looked for configuration files in the following places:"
 msgstr "స్వరూపణపు దస్త్రాల కొరకు ఈ ప్రదేశాలతో చూసాం: "
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:42
 msgid "You may wish to run the installer to fix this."
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:46
 #, fuzzy
 msgid "Go to the installer."
 msgstr "సైటు లోనికి ప్రవేశించండి"
 
-#: lib/dberroraction.php:59
 msgid "Database error"
 msgstr ""
 
 #. TRANS: Description of form for deleting a user.
-#: lib/deleteuserform.php:75
 msgid "Delete this user"
 msgstr "ఈ వాడుకరిని తొలగించు"
 
-#: lib/designform.php:114
 #, fuzzy
 msgid "Change design"
 msgstr "రూపురేఖలని భద్రపరచు"
 
 #. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: lib/designform.php:131
 msgid "Change colours"
 msgstr "రంగులను మార్చు"
 
 #. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: lib/designform.php:138
 msgid "Use defaults"
 msgstr "అప్రమేయాలని ఉపయోగించు"
 
 #. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: lib/designform.php:140
 #, fuzzy
 msgid "Restore default designs"
 msgstr "అప్రమేయాలని ఉపయోగించు"
 
 #. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: lib/designform.php:148
 #, fuzzy
 msgid "Reset back to default"
 msgstr "అప్రమేయాలని ఉపయోగించు"
 
 #. TRANS: Label in form on profile design page.
 #. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
-#: lib/designform.php:158
 msgid "Upload file"
 msgstr "ఫైలుని ఎక్కించు"
 
 #. TRANS: Instructions for form on profile design page.
-#: lib/designform.php:163
-#, fuzzy
 msgid ""
 "You can upload your personal background image. The maximum file size is 2Mb."
-msgstr "మీ వ్యక్తిగత నేపథ్యపు చిత్రాన్ని మీరు ఎక్కించవచ్చు. గరిష్ఠ ఫైలు పరిమాణం 2మెబై."
+msgstr "మీ స్వంత నేపథ్యపు చిత్రాన్ని మీరు ఎక్కించవచ్చు. గరిష్ఠ ఫైలు పరిమాణం 2మెబై."
 
 #. TRANS: Radio button on profile design page that will enable use of the uploaded profile image.
-#: lib/designform.php:194
 msgctxt "RADIO"
 msgid "On"
 msgstr "ఆన్"
 
 #. TRANS: Radio button on profile design page that will disable use of the uploaded profile image.
-#: lib/designform.php:211
 msgctxt "RADIO"
 msgid "Off"
 msgstr "ఆఫ్"
 
 #. TRANS: Title for button on profile design page to save settings.
-#: lib/designform.php:322
 msgid "Save design"
 msgstr "రూపురేఖలని భద్రపరచు"
 
 #. TRANS: Error message displayed if design settings could not be saved.
 #. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
-#: lib/designsettings.php:216 lib/designsettings.php:238
 msgid "Couldn't update your design."
 msgstr "మీ రూపురేఖలని తాజాకరించలేకపోయాం."
 
 #. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
-#: lib/designsettings.php:244
 msgid "Design defaults restored."
 msgstr ""
 
 #. TRANS: Exception. %s is an ID.
-#: lib/discovery.php:153
 #, fuzzy, php-format
 msgid "Unable to find services for %s."
 msgstr "మీ ఉపకరణాన్ని మార్చడానికి ఈ ఫారాన్ని ఉపయోగించండి."
 
 #. TRANS: Form legend for removing the favourite status for a favourite notice.
 #. TRANS: Title for button text for removing the favourite status for a favourite notice.
-#: lib/disfavorform.php:108 lib/disfavorform.php:140
 #, fuzzy
 msgid "Disfavor this notice"
 msgstr "ఈ నోటీసుని తొలగించు"
 
 #. TRANS: Button text for removing the favourite status for a favourite notice.
-#: lib/disfavorform.php:136
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Disfavor favorite"
@@ -8293,104 +6836,82 @@ msgstr "ఇష్టాంశాలకు చేర్చు"
 
 #. TRANS: Form legend for adding the favourite status to a notice.
 #. TRANS: Title for button text for adding the favourite status to a notice.
-#: lib/favorform.php:108 lib/favorform.php:139
 msgid "Favor this notice"
 msgstr "ఈ నోటీసుని పునరావృతించు"
 
 #. TRANS: Button text for adding the favourite status to a notice.
-#: lib/favorform.php:135
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Favor"
 msgstr "ఇష్టపడు"
 
-#: lib/feed.php:84
 msgid "RSS 1.0"
 msgstr "RSS 1.0"
 
-#: lib/feed.php:86
 msgid "RSS 2.0"
 msgstr "RSS 2.0"
 
-#: lib/feed.php:88
 msgid "Atom"
 msgstr "ఆటమ్"
 
-#: lib/feed.php:90
 msgid "FOAF"
 msgstr ""
 
-#: lib/feedimporter.php:75
 #, fuzzy
 msgid "Not an atom feed."
 msgstr "అందరు సభ్యులూ"
 
-#: lib/feedimporter.php:82
 msgid "No author in the feed."
 msgstr ""
 
-#: lib/feedimporter.php:89
 msgid "Can't import without a user."
 msgstr ""
 
 #. TRANS: Header for feed links (h2).
-#: lib/feedlist.php:66
 msgid "Feeds"
 msgstr "ఫీడులు"
 
-#: lib/galleryaction.php:128
 msgid "All"
 msgstr "అన్నీ"
 
-#: lib/galleryaction.php:136
 msgid "Select tag to filter"
 msgstr ""
 
-#: lib/galleryaction.php:137
 #, fuzzy
 msgid "Tag"
 msgstr "ట్యాగులు"
 
-#: lib/galleryaction.php:138
 msgid "Choose a tag to narrow list"
 msgstr ""
 
-#: lib/galleryaction.php:140
 msgid "Go"
 msgstr "వెళ్ళు"
 
-#: lib/grantroleform.php:91
 #, php-format
 msgid "Grant this user the \"%s\" role"
 msgstr ""
 
-#: lib/groupeditform.php:147
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "1-64 చిన్నబడి అక్షరాలు లేదా అంకెలు, విరామచిహ్నాలు మరియు ఖాళీలు తప్ప"
 
-#: lib/groupeditform.php:156
 #, fuzzy
 msgid "URL of the homepage or blog of the group or topic."
 msgstr "ఈ ఉపకరణం యొక్క హోమ్&zwnj;పేజీ చిరునామా"
 
-#: lib/groupeditform.php:161
 msgid "Describe the group or topic"
 msgstr "గుంపుని లేదా విషయాన్ని వివరించండి"
 
-#: lib/groupeditform.php:163
 #, fuzzy, php-format
 msgid "Describe the group or topic in %d character or less"
 msgid_plural "Describe the group or topic in %d characters or less"
 msgstr[0] "గుంపు లేదా విషయాన్ని గురించి %d అక్షరాల్లో వివరించండి"
 msgstr[1] "గుంపు లేదా విషయాన్ని గురించి %d అక్షరాల్లో వివరించండి"
 
-#: lib/groupeditform.php:175
 #, fuzzy
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\"."
 msgstr "గుంపు యొక్క ప్రాంతం, ఉంటే, \"నగరం, రాష్ట్రం (లేదా ప్రాంతం), దేశం\""
 
-#: lib/groupeditform.php:183
 #, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -8402,70 +6923,60 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Menu item in the group navigation page.
-#: lib/groupnav.php:86
 msgctxt "MENU"
 msgid "Group"
 msgstr "సమూహం"
 
 #. TRANS: Tooltip for menu item in the group navigation page.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:89
 #, php-format
 msgctxt "TOOLTIP"
 msgid "%s group"
 msgstr "%s సమూహం"
 
 #. TRANS: Menu item in the group navigation page.
-#: lib/groupnav.php:95
 msgctxt "MENU"
 msgid "Members"
 msgstr "సభ్యులు"
 
 #. TRANS: Tooltip for menu item in the group navigation page.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:98
 #, php-format
 msgctxt "TOOLTIP"
 msgid "%s group members"
 msgstr "%s సమూహ సభ్యులు"
 
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/groupnav.php:108
 msgctxt "MENU"
 msgid "Blocked"
 msgstr ""
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:111
 #, php-format
 msgctxt "TOOLTIP"
 msgid "%s blocked users"
 msgstr "%s నుండి నిరోధించిన వాడుకరులు"
 
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "నిర్వాహకులు"
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:120
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Edit %s group properties"
 msgstr ""
 
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/groupnav.php:126
 msgctxt "MENU"
 msgid "Logo"
 msgstr "చిహ్నం"
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:129
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Add or edit %s logo"
@@ -8473,69 +6984,57 @@ msgstr ""
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:138
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Add or edit %s design"
 msgstr ""
 
 #. TRANS: Title for groups with the most members section.
-#: lib/groupsbymemberssection.php:71
 msgid "Groups with most members"
 msgstr "ఎక్కువమంది సభ్యులున్న గుంపులు"
 
 #. TRANS: Title for groups with the most posts section.
-#: lib/groupsbypostssection.php:71
 msgid "Groups with most posts"
 msgstr "ఎక్కువ టపాలున్న గుంపులు"
 
 #. TRANS: Title for group tag cloud section.
 #. TRANS: %s is a group name.
-#: lib/grouptagcloudsection.php:57
 #, fuzzy, php-format
 msgid "Tags in %s group's notices"
 msgstr "%s గుంపు లక్షణాలను మార్చు"
 
 #. TRANS: Client exception 406
-#: lib/htmloutputter.php:104
 msgid "This page is not available in a media type you accept"
 msgstr ""
 
 #. TRANS: Exception thrown when trying to upload an unsupported image file format.
-#: lib/imagefile.php:73
 msgid "Unsupported image file format."
 msgstr ""
 
 #. TRANS: Exception thrown when too large a file is uploaded.
 #. TRANS: %s is the maximum file size, for example "500b", "10kB" or "2MB".
-#: lib/imagefile.php:91
 #, php-format
 msgid "That file is too big. The maximum file size is %s."
 msgstr "ఆ దస్త్రం చాలా పెద్దగా ఉంది. గరిష్ఠ దస్త్రపు పరిమాణం %s అక్షరాలు."
 
 #. TRANS: Exception thrown when uploading an image and that action could not be completed.
-#: lib/imagefile.php:97
 msgid "Partial upload."
 msgstr "పాక్షిక ఎగుమతి."
 
 #. TRANS: Exception thrown when uploading a file as image that is not an image or is a corrupt file.
-#: lib/imagefile.php:115
 msgid "Not an image or corrupt file."
 msgstr "బొమ్మ కాదు లేదా పాడైపోయిన ఫైలు."
 
 #. TRANS: Exception thrown during resize when image has been registered as present, but is no longer there.
-#: lib/imagefile.php:178
 msgid "Lost our file."
 msgstr "అటువంటి ఫైలు లేదు."
 
 #. TRANS: Exception thrown when trying to resize an unknown file type.
 #. TRANS: Exception thrown when trying resize an unknown file type.
-#: lib/imagefile.php:216 lib/imagefile.php:257
 msgid "Unknown file type"
 msgstr "తెలియని ఫైలు రకం"
 
 #. TRANS: Number of megabytes. %d is the number.
-#: lib/imagefile.php:303
 #, php-format
 msgid "%dMB"
 msgid_plural "%dMB"
@@ -8543,7 +7042,6 @@ msgstr[0] "%dమెబై"
 msgstr[1] "%dమెబై"
 
 #. TRANS: Number of kilobytes. %d is the number.
-#: lib/imagefile.php:307
 #, php-format
 msgid "%dkB"
 msgid_plural "%dkB"
@@ -8551,14 +7049,12 @@ msgstr[0] "%dకిబై"
 msgstr[1] "%dకిబై"
 
 #. TRANS: Number of bytes. %d is the number.
-#: lib/imagefile.php:310
 #, php-format
 msgid "%dB"
 msgid_plural "%dB"
 msgstr[0] "%dబైటు"
 msgstr[1] "%dబైట్లు"
 
-#: lib/implugin.php:262
 #, php-format
 msgid ""
 "User \"%s\" on %s has said that your %s screenname belongs to them. If "
@@ -8568,51 +7064,42 @@ msgid ""
 "message."
 msgstr ""
 
-#: lib/implugin.php:349
 #, php-format
 msgid "Unknown inbox source %d."
 msgstr "గుర్తు తెలియని భాష \"%s\"."
 
-#: lib/implugin.php:485
-#, fuzzy, php-format
+#, php-format
 msgid "Message too long - maximum is %1$d characters, you sent %2$d."
 msgstr "నోటిసు చాలా పొడవుగా ఉంది - %1$d అక్షరాలు గరిష్ఠం, మీరు %2$d పంపించారు."
 
-#: lib/leaveform.php:114
 msgid "Leave"
 msgstr "వైదొలగు"
 
 #. TRANS: Menu item for logging in to the StatusNet site.
-#: lib/logingroupnav.php:77
 msgctxt "MENU"
 msgid "Login"
 msgstr "ప్రవేశించు"
 
 #. TRANS: Title for menu item for logging in to the StatusNet site.
-#: lib/logingroupnav.php:79
 msgid "Login with a username and password"
 msgstr "వాడుకరిపేరు మరియు సంకేతపదాలతో ప్రవేశించండి"
 
 #. TRANS: Menu item for registering with the StatusNet site.
-#: lib/logingroupnav.php:85
 msgctxt "MENU"
 msgid "Register"
 msgstr "నమోదు"
 
 #. TRANS: Title for menu item for registering with the StatusNet site.
-#: lib/logingroupnav.php:87
 msgid "Sign up for a new account"
 msgstr "కొత్త ఖాతా కొరకై నమోదుచేసుకోండి"
 
 #. TRANS: Subject for address confirmation email.
-#: lib/mail.php:172
 msgid "Email address confirmation"
 msgstr "ఈమెయిల్ చిరునామా నిర్ధారణ"
 
 #. TRANS: Body for address confirmation email.
 #. TRANS: %1$s is the addressed user's nickname, %2$s is the StatusNet sitename,
 #. TRANS: %3$s is the URL to confirm at.
-#: lib/mail.php:177
 #, fuzzy, php-format
 msgid ""
 "Hey, %1$s.\n"
@@ -8643,14 +7130,12 @@ msgstr ""
 
 #. TRANS: Subject of new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
-#: lib/mail.php:243
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1$s ఇప్పుడు %2$sలో మీ నోటీసులని వింటున్నారు."
 
 #. TRANS: This is a paragraph in a new-subscriber e-mail.
 #. TRANS: %s is a URL where the subscriber can be reported as abusive.
-#: lib/mail.php:250
 #, php-format
 msgid ""
 "If you believe this account is being used abusively, you can block them from "
@@ -8662,7 +7147,6 @@ msgstr ""
 #. TRANS: %3$s is the subscriber's profile URL, %4$s is the subscriber's location (or empty)
 #. TRANS: %5$s is the subscriber's homepage URL (or empty), %6%s is the subscriber's bio (or empty)
 #. TRANS: %7$s is a link to the addressed user's e-mail settings.
-#: lib/mail.php:260
 #, fuzzy, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -8689,14 +7173,12 @@ msgstr ""
 
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is biographical information.
-#: lib/mail.php:283
 #, php-format
 msgid "Bio: %s"
 msgstr "స్వపరిచయం: %s"
 
 #. TRANS: Subject of notification mail for new posting email address.
 #. TRANS: %s is the StatusNet sitename.
-#: lib/mail.php:312
 #, php-format
 msgid "New email address for posting to %s"
 msgstr "%sకి నోటీసులు పంపించడానికి కొత్త ఈమెయిలు చిరునామా"
@@ -8704,7 +7186,6 @@ msgstr "%sకి నోటీసులు పంపించడానికి 
 #. TRANS: Body of notification mail for new posting email address.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is the e-mail address to send
 #. TRANS: to to post by e-mail, %3$s is a URL to more instructions.
-#: lib/mail.php:318
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -8719,26 +7200,22 @@ msgstr ""
 
 #. TRANS: Subject line for SMS-by-email notification messages.
 #. TRANS: %s is the posting user's nickname.
-#: lib/mail.php:439
 #, php-format
 msgid "%s status"
 msgstr "%s స్థితి"
 
 #. TRANS: Subject line for SMS-by-email address confirmation message.
-#: lib/mail.php:465
 msgid "SMS confirmation"
 msgstr "SMS నిర్ధారణ"
 
 #. TRANS: Main body heading for SMS-by-email address confirmation message.
 #. TRANS: %s is the addressed user's nickname.
-#: lib/mail.php:469
 #, fuzzy, php-format
 msgid "%s: confirm you own this phone number with this code:"
 msgstr "ఈ ఫోను నంబరు యొక్క నిర్ధారణకై వేచివుంది."
 
 #. TRANS: Subject for 'nudge' notification email.
 #. TRANS: %s is the nudging user.
-#: lib/mail.php:490
 #, fuzzy, php-format
 msgid "You have been nudged by %s"
 msgstr "చందాచేరడం నుండి మిమ్మల్ని నిషేధించారు."
@@ -8746,7 +7223,6 @@ msgstr "చందాచేరడం నుండి మిమ్మల్ని
 #. TRANS: Body for 'nudge' notification email.
 #. TRANS: %1$s is the nuding user's long name, $2$s is the nudging user's nickname,
 #. TRANS: %3$s is a URL to post notices at, %4$s is the StatusNet sitename.
-#: lib/mail.php:497
 #, php-format
 msgid ""
 "%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -8775,7 +7251,6 @@ msgstr ""
 
 #. TRANS: Subject for direct-message notification email.
 #. TRANS: %s is the sending user's nickname.
-#: lib/mail.php:544
 #, php-format
 msgid "New private message from %s"
 msgstr "%s నుండి కొత్త అంతరంగిక సందేశం"
@@ -8784,7 +7259,6 @@ msgstr "%s నుండి కొత్త అంతరంగిక సందే
 #. TRANS: %1$s is the sending user's long name, %2$s is the sending user's nickname,
 #. TRANS: %3$s is the message content, %4$s a URL to the message,
 #. TRANS: %5$s is the StatusNet sitename.
-#: lib/mail.php:552
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -8819,7 +7293,6 @@ msgstr ""
 
 #. TRANS: Subject for favorite notification e-mail.
 #. TRANS: %1$s is the adding user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:604
 #, php-format
 msgid "%1$s (@%2$s) added your notice as a favorite"
 msgstr "%1$s (@%2$s) మీ నోటీసుని ఇష్టపడ్డారు"
@@ -8829,7 +7302,6 @@ msgstr "%1$s (@%2$s) మీ నోటీసుని ఇష్టపడ్డా
 #. TRANS: %3$s is a URL to the faved notice, %4$s is the faved notice text,
 #. TRANS: %5$s is a URL to all faves of the adding user, %6$s is the StatusNet sitename,
 #. TRANS: %7$s is the adding user's nickname.
-#: lib/mail.php:611
 #, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -8867,7 +7339,6 @@ msgstr ""
 "%6$s\n"
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:669
 #, php-format
 msgid ""
 "The full conversation can be read here:\n"
@@ -8880,7 +7351,6 @@ msgstr ""
 
 #. TRANS: E-mail subject for notice notification.
 #. TRANS: %1$s is the sending user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:677
 #, php-format
 msgid "%1$s (@%2$s) sent a notice to your attention"
 msgstr "%1$s (@%2$s) మీ దృష్టికి ఒక నోటిసుని పంపించారు"
@@ -8891,7 +7361,6 @@ msgstr "%1$s (@%2$s) మీ దృష్టికి ఒక నోటిసు
 #. TRANS: %5$s is a URL to the full conversion if it exists (otherwise empty),
 #. TRANS: %6$s is a URL to reply to the notice, %7$s is a URL to all @-replied for the addressed user,
 #. TRANS: %8$s is a URL to the addressed user's e-mail settings, %9$s is the sender's nickname.
-#: lib/mail.php:685
 #, php-format
 msgid ""
 "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -8940,11 +7409,9 @@ msgstr ""
 "\n"
 "తా.క. ఈ ఈమెయిలు గమనింపులని మీరు ఇక్కడ నిలిపివేసుకోవచ్చు: %8$s\n"
 
-#: lib/mailbox.php:87
 msgid "Only the user can read their own mailboxes."
 msgstr "ఎవరి తపాలాపెట్టెలను ఆ వాడుకరి మాత్రమే చదవలగరు."
 
-#: lib/mailbox.php:125
 msgid ""
 "You have no private messages. You can send private message to engage other "
 "users in conversation. People can send you messages for your eyes only."
@@ -8952,55 +7419,45 @@ msgstr ""
 "మీకు అంతరంగిక సందేశాలు లేవు. ఇతర వాడుకరులతో సంభాషణకై మీరు వారికి అంతరంగిక సందేశాలు "
 "పంపించవచ్చు. మీ కంటికి మాత్రమే కనబడేలా వారు మీకు సందేశాలు పంపవచ్చు."
 
-#: lib/mailhandler.php:37
 #, fuzzy
 msgid "Could not parse message."
 msgstr "వాడుకరిని తాజాకరించలేకున్నాం."
 
-#: lib/mailhandler.php:42
 msgid "Not a registered user."
 msgstr "నమోదైన వాడుకరి కాదు."
 
-#: lib/mailhandler.php:46
 msgid "Sorry, that is not your incoming email address."
 msgstr "క్షమించండి, అది మీ లోనికివచ్చు ఈమెయిలు చిరునామా కాదు."
 
-#: lib/mailhandler.php:50
 #, fuzzy
 msgid "Sorry, no incoming email allowed."
 msgstr "క్షమించండి, అది మీ లోనికివచ్చు ఈమెయిలు చిరునామా కాదు."
 
-#: lib/mailhandler.php:229
 #, fuzzy, php-format
 msgid "Unsupported message type: %s"
 msgstr "%s కి నేరు సందేశాలు"
 
 #. TRANS: Client exception thrown when a database error was thrown during a file upload operation.
-#: lib/mediafile.php:102 lib/mediafile.php:174
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
 
 #. TRANS: Client exception thrown when a file upload operation would cause a user to exceed a set quota.
-#: lib/mediafile.php:238 lib/mediafile.php:281
 msgid "File exceeds user's quota."
 msgstr ""
 
 #. TRANS: Client exception thrown when a file upload operation fails because the file could
 #. TRANS: not be moved from the temporary folder to the permanent file location.
-#: lib/mediafile.php:258 lib/mediafile.php:300
 msgid "File could not be moved to destination directory."
 msgstr ""
 
 #. TRANS: Client exception thrown when a file upload operation has been stopped because the MIME
 #. TRANS: type of the uploaded file could not be determined.
-#: lib/mediafile.php:265 lib/mediafile.php:306
 msgid "Could not determine file's MIME type."
 msgstr "ఇష్టాంశాన్ని తొలగించలేకపోయాం."
 
 #. TRANS: Client exception thrown trying to upload a forbidden MIME type.
 #. TRANS: %1$s is the file type that was denied, %2$s is the application part of
 #. TRANS: the MIME type that was denied.
-#: lib/mediafile.php:396
 #, php-format
 msgid ""
 "\"%1$s\" is not a supported file type on this server. Try using another %2$s "
@@ -9009,84 +7466,75 @@ msgstr ""
 
 #. TRANS: Client exception thrown trying to upload a forbidden MIME type.
 #. TRANS: %s is the file type that was denied.
-#: lib/mediafile.php:401
 #, php-format
 msgid "\"%s\" is not a supported file type on this server."
 msgstr ""
 
-#: lib/messageform.php:120
 #, fuzzy
 msgid "Send a direct notice"
 msgstr "సైటు గమనికని భద్రపరచు"
 
 #. TRANS Label entry in drop-down selection box in direct-message inbox/outbox. This is the default entry in the drop-down box, doubling as instructions and a brake against accidental submissions with the first user in the list.
-#: lib/messageform.php:137
 msgid "Select recipient:"
 msgstr ""
 
 #. TRANS Entry in drop-down selection box in direct-message inbox/outbox when no one is available to message.
-#: lib/messageform.php:150
 #, fuzzy
 msgid "No mutual subscribers."
 msgstr "చందాదార్లు"
 
-#: lib/messageform.php:153
 msgid "To"
 msgstr ""
 
-#: lib/messageform.php:184 lib/noticeform.php:236
 msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr "పంపించు"
 
-#: lib/messagelist.php:77
 #, fuzzy
 msgid "Messages"
 msgstr "సందేశం"
 
-#: lib/messagelistitem.php:123 lib/noticelist.php:527
 msgid "from"
 msgstr "నుండి"
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:178
 msgid "Nickname cannot be empty."
 msgstr ""
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:191
 #, php-format
 msgid "Nickname cannot be more than %d character long."
 msgid_plural "Nickname cannot be more than %d characters long."
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/noticeform.php:160
+#. TRANS: Form legend for notice form.
 msgid "Send a notice"
 msgstr "సైటు గమనిక"
 
-#: lib/noticeform.php:174
+#. TRANS: Title for notice label. %s is the user's nickname.
 #, php-format
 msgid "What's up, %s?"
 msgstr "%s, ఏమిటి సంగతులు?"
 
-#: lib/noticeform.php:193
+#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr "జోడించు"
 
-#: lib/noticeform.php:197
-msgid "Attach a file"
+#. TRANS: Title for input field to attach a file to a notice.
+#, fuzzy
+msgid "Attach a file."
 msgstr "ఒక ఫైలుని జోడించు"
 
-#: lib/noticeform.php:212
+#. TRANS: Field label to add location to a notice.
 msgid "Share my location"
 msgstr "నేనున్న ప్రాంతాన్ని బహిరంగపరచు"
 
-#: lib/noticeform.php:215
+#. TRANS: Text to not share location for a notice in notice form.
 msgid "Do not share my location"
 msgstr "నేనున్న ప్రాంతాన్ని బహిరంగపరచకు"
 
-#: lib/noticeform.php:216
+#. TRANS: Timeout error text for location retrieval in notice form.
 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
 "try again later"
@@ -9095,425 +7543,324 @@ msgstr ""
 "కాసేపాగి ప్రయత్నించండి"
 
 #. TRANS: Used in coordinates as abbreviation of north
-#: lib/noticelist.php:457
 msgid "N"
 msgstr "ఉ"
 
 #. TRANS: Used in coordinates as abbreviation of south
-#: lib/noticelist.php:459
 msgid "S"
 msgstr "ద"
 
 #. TRANS: Used in coordinates as abbreviation of east
-#: lib/noticelist.php:461
 msgid "E"
 msgstr "తూ"
 
 #. TRANS: Used in coordinates as abbreviation of west
-#: lib/noticelist.php:463
 msgid "W"
 msgstr "ప"
 
-#: lib/noticelist.php:465
 #, php-format
 msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 
-#: lib/noticelist.php:474
 msgid "at"
 msgstr "ప్రాంతం"
 
-#: lib/noticelist.php:523
 msgid "web"
 msgstr "జాలం"
 
-#: lib/noticelist.php:589
 msgid "in context"
 msgstr "సందర్భంలో"
 
-#: lib/noticelist.php:624
 msgid "Repeated by"
 msgstr "%s యొక్క పునరావృతం"
 
-#: lib/noticelist.php:651
 msgid "Reply to this notice"
 msgstr "ఈ నోటీసుపై స్పందించండి"
 
-#: lib/noticelist.php:652
 msgid "Reply"
 msgstr "స్పందించండి"
 
-#: lib/noticelist.php:678
 msgid "Delete this notice"
 msgstr "ఈ నోటీసుని తొలగించు"
 
-#: lib/noticelist.php:696
 msgid "Notice repeated"
 msgstr "నోటీసుని పునరావృతించారు"
 
-#: lib/nudgeform.php:116
 #, fuzzy
 msgid "Nudge this user"
 msgstr "ఈ వాడుకరిని తొలగించు"
 
-#: lib/nudgeform.php:128
 #, fuzzy
 msgid "Nudge"
 msgstr "బాడ్జి"
 
-#: lib/nudgeform.php:128
 #, fuzzy
 msgid "Send a nudge to this user"
 msgstr "ఈ వాడుకరికి ఒక నేరు సందేశాన్ని పంపించండి"
 
-#: lib/oauthstore.php:294
 msgid "Error inserting new profile."
 msgstr ""
 
-#: lib/oauthstore.php:302
 msgid "Error inserting avatar."
 msgstr ""
 
-#: lib/oauthstore.php:322
 msgid "Error inserting remote profile."
 msgstr ""
 
 #. TRANS: Exception thrown when a notice is denied because it has been sent before.
-#: lib/oauthstore.php:362
 msgid "Duplicate notice."
 msgstr ""
 
-#: lib/oauthstore.php:507
 msgid "Couldn't insert new subscription."
 msgstr "కొత్త చందాని చేర్చలేకపోయాం."
 
-#: lib/personalgroupnav.php:104
-#, fuzzy
 msgid "Replies"
 msgstr "స్పందనలు"
 
-#: lib/personalgroupnav.php:109
-#, fuzzy
 msgid "Favorites"
 msgstr "ఇష్టాంశాలు"
 
-#: lib/personalgroupnav.php:120
-#, fuzzy
 msgid "Inbox"
 msgstr "వచ్చినవి"
 
-#: lib/personalgroupnav.php:121
 msgid "Your incoming messages"
 msgstr "మీకు వచ్చిన సందేశాలు"
 
-#: lib/personalgroupnav.php:125
-#, fuzzy
 msgid "Outbox"
 msgstr "పంపినవి"
 
-#: lib/personalgroupnav.php:126
 msgid "Your sent messages"
 msgstr "మీరు పంపిన సందేశాలు"
 
 #. TRANS: Title for personal tag cloud section. %s is a user nickname.
-#: lib/personaltagcloudsection.php:56
 #, php-format
 msgid "Tags in %s's notices"
 msgstr ""
 
 #. TRANS: Displayed as version information for a plugin if no version information was found.
-#: lib/plugin.php:126
 #, fuzzy
 msgid "Unknown"
 msgstr "తెలియని చర్య"
 
 #. TRANS: Plugin admin panel controls
-#: lib/plugindisableform.php:90
 msgctxt "plugin"
 msgid "Disable"
 msgstr ""
 
 #. TRANS: Plugin admin panel controls
-#: lib/pluginenableform.php:112
 msgctxt "plugin"
 msgid "Enable"
 msgstr ""
 
-#: lib/pluginlist.php:196
 msgctxt "plugin-description"
 msgid "(Plugin descriptions unavailable when disabled.)"
 msgstr ""
 
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:88
 msgid "Subscriptions"
 msgstr "చందాలు"
 
 #. TRANS: Text for user subscription statistics if user has more subscriptions than displayed.
-#: lib/profileaction.php:144
 msgid "All subscriptions"
 msgstr "అన్ని చందాలు"
 
 #. TRANS: H2 text for user subscriber statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:96
 msgid "Subscribers"
 msgstr "చందాదార్లు"
 
 #. TRANS: Text for user subscription statistics if user has more subscribers than displayed.
-#: lib/profileaction.php:181
 msgid "All subscribers"
 msgstr "అందరు చందాదార్లు"
 
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:213
 msgid "User ID"
 msgstr "వాడుకరి ID"
 
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:219
 msgid "Member since"
 msgstr "సభ్యులైన తేదీ"
 
 #. TRANS: Label for user statistics.
 #. TRANS: H2 text for user group membership statistics.
-#: lib/profileaction.php:239 lib/profileaction.php:290
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:104
 msgid "Groups"
 msgstr "గుంపులు"
 
 #. TRANS: Label for user statistics.
 #. TRANS: Average count of posts made per day since account registration.
-#: lib/profileaction.php:253
 msgid "Daily average"
 msgstr "రోజువారీ సగటు"
 
 #. TRANS: Text for user group membership statistics if user has more subscriptions than displayed.
-#: lib/profileaction.php:305
 msgid "All groups"
 msgstr "అన్ని గుంపులు"
 
 #. TRANS: Server error displayed when using an unimplemented method.
-#: lib/profileformaction.php:123
 msgid "Unimplemented method."
 msgstr ""
 
-#: lib/publicgroupnav.php:82
 msgid "User groups"
 msgstr "వాడుకరి గుంపులు"
 
-#: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
 msgid "Recent tags"
 msgstr "ఇటీవలి ట్యాగులు"
 
-#: lib/publicgroupnav.php:88
 msgid "Featured"
 msgstr "విశేషం"
 
-#: lib/publicgroupnav.php:92
 msgid "Popular"
 msgstr "ప్రాచుర్యం"
 
-#: lib/redirectingaction.php:95
 msgid "No return-to arguments."
 msgstr "జోడింపులు లేవు."
 
-#: lib/repeatform.php:107
 msgid "Repeat this notice?"
 msgstr "ఈ నోటీసుని పునరావృతించాలా?"
 
-#: lib/repeatform.php:132
 msgid "Yes"
 msgstr "అవును"
 
-#: lib/repeatform.php:132
 msgid "Repeat this notice"
 msgstr "ఈ నోటీసుని పునరావృతించు"
 
-#: lib/revokeroleform.php:91
 #, fuzzy, php-format
 msgid "Revoke the \"%s\" role from this user"
 msgstr "ఈ గుంపునుండి ఈ వాడుకరిని నిరోధించు"
 
 #. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:1001
 #, fuzzy
 msgid "Page not found."
 msgstr "నిర్ధారణ సంకేతం కనబడలేదు."
 
-#: lib/sandboxform.php:67
 #, fuzzy
 msgid "Sandbox"
 msgstr "వచ్చినవి"
 
-#: lib/sandboxform.php:78
 msgid "Sandbox this user"
 msgstr "ఈ వాడుకరిని నిరోధించు"
 
 #. TRANS: Fieldset legend for the search form.
-#: lib/searchaction.php:120
 msgid "Search site"
 msgstr "సైటుని వెతుకు"
 
 #. TRANS: Used as a field label for the field where one or more keywords
 #. TRANS: for searching can be entered.
-#: lib/searchaction.php:128
 msgid "Keyword(s)"
 msgstr "కీపదము(లు)"
 
 #. TRANS: Button text for searching site.
-#: lib/searchaction.php:130
 msgctxt "BUTTON"
 msgid "Search"
 msgstr "వెతుకు"
 
-#: lib/searchgroupnav.php:80
 msgid "People"
 msgstr "ప్రజలు"
 
-#: lib/searchgroupnav.php:81
 msgid "Find people on this site"
 msgstr "ఈ సైటులోని వ్యక్తులని కనుగొనండి"
 
-#: lib/searchgroupnav.php:83
 msgid "Find content of notices"
 msgstr ""
 
-#: lib/searchgroupnav.php:85
 msgid "Find groups on this site"
 msgstr "ఈ సైటులోని గుంపులని కనుగొనండి"
 
-#: lib/section.php:89
 msgid "Untitled section"
 msgstr "శీర్షికలేని విభాగం"
 
-#: lib/section.php:106
 msgid "More..."
 msgstr "మరింత..."
 
-#: lib/settingsnav.php:78
 #, fuzzy
 msgid "Change your profile settings"
 msgstr "ఫ్రొఫైలు అమరికలని మార్చు"
 
-#: lib/settingsnav.php:83
 msgid "Upload an avatar"
 msgstr "ఒక అవతారాన్ని ఎక్కించండి"
 
-#: lib/settingsnav.php:88
 msgid "Change your password"
 msgstr "మీ సంకేతపదాన్ని మార్చుకోండి"
 
-#: lib/settingsnav.php:93
 msgid "Change email handling"
 msgstr ""
 
-#: lib/settingsnav.php:98
 msgid "Design your profile"
 msgstr "వాడుకరి ప్రొఫైలు"
 
-#: lib/settingsnav.php:102
 msgid "URL"
 msgstr ""
 
-#: lib/settingsnav.php:103
 msgid "URL shorteners"
 msgstr ""
 
-#: lib/settingsnav.php:111
 msgid "Updates by instant messenger (IM)"
 msgstr ""
 
-#: lib/settingsnav.php:118
 msgid "Updates by SMS"
 msgstr ""
 
-#: lib/settingsnav.php:123
-#, fuzzy
 msgid "Connections"
 msgstr "అనుసంధానాలు"
 
-#: lib/settingsnav.php:124
 msgid "Authorized connected applications"
 msgstr "అధీకృత అనుసంధాన ఉపకరణాలు"
 
-#: lib/silenceform.php:67
 msgid "Silence"
 msgstr "సైటు గమనిక"
 
-#: lib/silenceform.php:78
 msgid "Silence this user"
 msgstr "ఈ వాడుకరిని తొలగించు"
 
-#: lib/subgroupnav.php:89
 #, php-format
 msgid "People %s subscribes to"
 msgstr "%s చందాచేరిన వ్యక్తులు"
 
-#: lib/subgroupnav.php:97
 #, php-format
 msgid "People subscribed to %s"
 msgstr "%sకి చందాచేరిన వ్యక్తులు"
 
-#: lib/subgroupnav.php:105
 #, php-format
 msgid "Groups %s is a member of"
 msgstr "%s సభ్యులుగా ఉన్న గుంపులు"
 
-#: lib/subgroupnav.php:111
 msgid "Invite"
 msgstr "ఆహ్వానించు"
 
-#: lib/subgroupnav.php:112
 #, php-format
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "%sలో తోడుకై మీ స్నేహితులని మరియు సహోద్యోగులని ఆహ్వానించండి"
 
-#: lib/subscribeform.php:115 lib/subscribeform.php:139
 msgid "Subscribe to this user"
 msgstr "ఈ వాడుకరికి చందాచేరు"
 
-#: lib/subscriberspeopleselftagcloudsection.php:48
-#: lib/subscriptionspeopleselftagcloudsection.php:48
 msgid "People Tagcloud as self-tagged"
 msgstr ""
 
-#: lib/subscriberspeopletagcloudsection.php:48
-#: lib/subscriptionspeopletagcloudsection.php:48
 msgid "People Tagcloud as tagged"
 msgstr ""
 
-#: lib/tagcloudsection.php:56
 msgid "None"
 msgstr "ఏమీలేదు"
 
 #. TRANS: Server exception displayed if a theme name was invalid.
-#: lib/theme.php:74
 #, fuzzy
 msgid "Invalid theme name."
 msgstr "తప్పుడు దస్త్రపుపేరు.."
 
-#: lib/themeuploader.php:50
 msgid "This server cannot handle theme uploads without ZIP support."
 msgstr ""
 
-#: lib/themeuploader.php:58 lib/themeuploader.php:61
 msgid "The theme file is missing or the upload failed."
 msgstr ""
 
-#: lib/themeuploader.php:91 lib/themeuploader.php:102
-#: lib/themeuploader.php:279 lib/themeuploader.php:283
-#: lib/themeuploader.php:291 lib/themeuploader.php:298
 #, fuzzy
 msgid "Failed saving theme."
 msgstr "అవతారపు తాజాకరణ విఫలమైంది."
 
-#: lib/themeuploader.php:147
 msgid "Invalid theme: bad directory structure."
 msgstr ""
 
-#: lib/themeuploader.php:166
 #, php-format
 msgid "Uploaded theme is too large; must be less than %d byte uncompressed."
 msgid_plural ""
@@ -9521,152 +7868,122 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/themeuploader.php:179
 msgid "Invalid theme archive: missing file css/display.css"
 msgstr ""
 
-#: lib/themeuploader.php:219
 msgid ""
 "Theme contains invalid file or folder name. Stick with ASCII letters, "
 "digits, underscore, and minus sign."
 msgstr ""
 
-#: lib/themeuploader.php:225
 msgid "Theme contains unsafe file extension names; may be unsafe."
 msgstr ""
 
-#: lib/themeuploader.php:242
 #, php-format
 msgid "Theme contains file of type '.%s', which is not allowed."
 msgstr ""
 
-#: lib/themeuploader.php:260
 msgid "Error opening theme archive."
 msgstr "నిరోధాన్ని తొలగించడంలో పొరపాటు."
 
-#: lib/threadednoticelist.php:270
-#, php-format
-msgid "Show all %d comment"
-msgid_plural "Show all %d comments"
-msgstr[0] ""
-msgstr[1] ""
+#, fuzzy, php-format
+msgid "Show %d reply"
+msgid_plural "Show all %d replies"
+msgstr[0] "మరింత చూపించు"
+msgstr[1] "మరింత చూపించు"
 
-#: lib/topposterssection.php:74
 msgid "Top posters"
 msgstr ""
 
 #. TRANS: Title for the form to unblock a user.
-#: lib/unblockform.php:67
 msgctxt "TITLE"
 msgid "Unblock"
 msgstr "నిరోధపు ఎత్తివేత"
 
-#: lib/unsandboxform.php:69
 msgid "Unsandbox"
 msgstr ""
 
-#: lib/unsandboxform.php:80
 msgid "Unsandbox this user"
 msgstr "ఈ వాడుకరి నుండి చందామాను"
 
-#: lib/unsilenceform.php:67
 msgid "Unsilence"
 msgstr ""
 
-#: lib/unsilenceform.php:78
 msgid "Unsilence this user"
 msgstr "ఈ వాడుకరిని తొలగించు"
 
-#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
 msgid "Unsubscribe from this user"
 msgstr "ఈ వాడుకరి నుండి చందామాను"
 
-#: lib/unsubscribeform.php:137
 msgid "Unsubscribe"
 msgstr "చందామాను"
 
 #. 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).
-#: lib/usernoprofileexception.php:60
 #, fuzzy, php-format
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "వాడుకరికి ప్రొఫైలు లేదు."
 
-#: lib/userprofile.php:116
 msgid "Edit Avatar"
 msgstr "అవతారాన్ని మార్చు"
 
 #. TRANS: H2 for user actions in a profile.
 #. TRANS: H2 for entity actions in a profile.
-#: lib/userprofile.php:216 lib/userprofile.php:232
 msgid "User actions"
 msgstr "వాడుకరి చర్యలు"
 
 #. TRANS: Text shown in user profile of not yet compeltely deleted users.
-#: lib/userprofile.php:220
 msgid "User deletion in progress..."
 msgstr "వాడుకరి తొలగింపు కొనసాగుతూంది..."
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:248
 msgid "Edit profile settings"
 msgstr "ఫ్రొఫైలు అమరికలని మార్చు"
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:250
 msgid "Edit"
 msgstr "మార్చు"
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:274
 msgid "Send a direct message to this user"
 msgstr "ఈ వాడుకరికి ఒక నేరు సందేశాన్ని పంపించండి"
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:276
 msgid "Message"
 msgstr "సందేశం"
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:318
 #, fuzzy
 msgid "Moderate"
 msgstr "సమన్వయకర్త"
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:357
 msgid "User role"
 msgstr "వాడుకరి పాత్ర"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:360
 msgctxt "role"
 msgid "Administrator"
 msgstr "నిర్వాహకులు"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:362
 msgctxt "role"
 msgid "Moderator"
 msgstr "సమన్వయకర్త"
 
-#: lib/util.php:321
 #, fuzzy
 msgid "Not allowed to log in."
 msgstr "లోనికి ప్రవేశించలేదు."
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1337
 msgid "a few seconds ago"
 msgstr "కొన్ని క్షణాల క్రితం"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1340
 msgid "about a minute ago"
 msgstr "ఓ నిమిషం క్రితం"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1344
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
@@ -9674,12 +7991,10 @@ msgstr[0] "సుమారు ఒక నిమిషం క్రితం"
 msgstr[1] "సుమారు %d నిమిషాల క్రితం"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1347
 msgid "about an hour ago"
 msgstr "ఒక గంట క్రితం"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1351
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
@@ -9687,12 +8002,10 @@ msgstr[0] "సుమారు ఒక గంట క్రితం"
 msgstr[1] "సుమారు %d గంటల క్రితం"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1354
 msgid "about a day ago"
 msgstr "ఓ రోజు క్రితం"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1358
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
@@ -9700,12 +8013,10 @@ msgstr[0] "సుమారు ఒక రోజు క్రితం"
 msgstr[1] "సుమారు %d రోజుల క్రితం"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1361
 msgid "about a month ago"
 msgstr "ఓ నెల క్రితం"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1365
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
@@ -9713,176 +8024,44 @@ msgstr[0] "సుమారు ఒక నెల క్రితం"
 msgstr[1] "సుమారు %d నెలల క్రితం"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1368
 msgid "about a year ago"
 msgstr "ఒక సంవత్సరం క్రితం"
 
 #. TRANS: Web color exception thrown when a hexadecimal color code does not validate.
 #. TRANS: %s is the provided (invalid) color code.
-#: lib/webcolor.php:81 lib/webcolor.php:121
 #, fuzzy, php-format
 msgid "%s is not a valid color! Use 3 or 6 hex characters."
 msgstr "%s అనేది సరైన రంగు కాదు! 3 లేదా 6 హెక్స్ అక్షరాలను వాడండి."
 
 #. TRANS: Exception.
-#: lib/xrd.php:63
 #, fuzzy
 msgid "Invalid XML."
 msgstr "తప్పుడు పరిమాణం."
 
 #. TRANS: Exception.
-#: lib/xrd.php:68
 msgid "Invalid XML, missing XRD root."
 msgstr ""
 
 #. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
-#: scripts/restoreuser.php:62
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
 
-#, fuzzy
-#~ msgid "Could not generate feed for group - %s"
-#~ msgstr "గుంపుని తాజాకరించలేకున్నాం."
+#~ msgid "Full name is too long (max 255 chars)."
+#~ msgstr "పూర్తి పేరు చాలా పెద్దగా ఉంది (గరిష్ఠం 255 అక్షరాలు)."
 
-#, fuzzy
-#~ msgid "Current confirmed Jabber/Google Talk address."
-#~ msgstr "ప్రస్తుతం నిర్ధారించిన Jabber/GTalk చిరునామా"
+#~ msgid "description is too long (max %d chars)."
+#~ msgstr "వివరణ చాలా పెద్దదిగా ఉంది (140 అక్షరాలు గరిష్ఠం)."
 
-#, fuzzy
-#~ msgid "Publish a MicroID for my Jabber/Google Talk address."
-#~ msgstr "ప్రస్తుతం నిర్ధారించిన Jabber/GTalk చిరునామా"
+#~ msgid "Location is too long (max 255 chars)."
+#~ msgstr "ప్రాంతం పేరు మరీ పెద్దగా ఉంది (255 అక్షరాలు గరిష్ఠం)."
 
-#~ msgid "No Jabber ID."
-#~ msgstr "Jabber ID లేదు."
+#~ msgid "Too many aliases! Maximum %d."
+#~ msgstr "చాలా మారుపేర్లు! %d గరిష్ఠం."
 
-#, fuzzy
-#~ msgid "Not a valid Jabber ID."
-#~ msgstr "సరైన Jabber ఐడీ కాదు"
+#~ msgctxt "BUTTON"
+#~ msgid "Comment"
+#~ msgstr "వ్యాఖ్య"
 
-#~ msgid "That is already your Jabber ID."
-#~ msgstr "ఈ Jabber ID మీకు ఇప్పటికే ఉంది"
-
-#~ msgid "That is not your Jabber ID."
-#~ msgstr "ఇది మీ Jabber ID కాదు"
-
-#~ msgid "Other settings"
-#~ msgstr "ఇతర అమరికలు"
-
-#~ msgid "Tag cloud"
-#~ msgstr "ట్యాగు మేఘం"
-
-#, fuzzy
-#~ msgid "Authorize URL"
-#~ msgstr "రచయిత"
-
-#~ msgid "Jabber"
-#~ msgstr "జాబర్"
-
-#~ msgid "Photo"
-#~ msgstr "ఫొటో"
-
-#~ msgid "Other options"
-#~ msgstr "ఇతర ఎంపికలు"
-
-#~ msgid "Other"
-#~ msgstr "ఇతర"
-
-#~ msgid "Primary site navigation"
-#~ msgstr "ప్రాధమిక సైటు మార్గదర్శిని"
-
-#~ msgctxt "MENU"
-#~ msgid "Personal"
-#~ msgstr "వ్యక్తిగత"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Change your email, avatar, password, profile"
-#~ msgstr "మీ ఈమెయిలు, అవతారం, సంకేతపదం మరియు ప్రౌఫైళ్ళను మార్చుకోండి"
-
-#~ msgid "Account"
-#~ msgstr "ఖాతా"
-
-#, fuzzy
-#~ msgctxt "TOOLTIP"
-#~ msgid "Connect to services"
-#~ msgstr "అనుసంధానాలు"
-
-#~ msgid "Connect"
-#~ msgstr "అనుసంధానించు"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Change site configuration"
-#~ msgstr "సైటు స్వరూపణాన్ని మార్చండి"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Invite friends and colleagues to join you on %s"
-#~ msgstr "%sలో తోడుకై మీ స్నేహితులని మరియు సహోద్యోగులని ఆహ్వానించండి"
-
-#~ msgctxt "MENU"
-#~ msgid "Invite"
-#~ msgstr "ఆహ్వానించు"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Create an account"
-#~ msgstr "ఖాతాని సృష్టించుకోండి"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Help me!"
-#~ msgstr "సహాయం కావాలి!"
-
-#~ msgctxt "MENU"
-#~ msgid "Help"
-#~ msgstr "సహాయం"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Search for people or text"
-#~ msgstr "ప్రజలు లేదా పాఠ్యం కొరకు వెతకండి"
-
-#~ msgid "Local views"
-#~ msgstr "స్థానిక వీక్షణలు"
-
-#~ msgid "Page notice"
-#~ msgstr "పేజీ గమనిక"
-
-#~ msgid "Secondary site navigation"
-#~ msgstr "ద్వితీయ సైటు మార్గదర్శిని"
-
-#~ msgid "StatusNet software license"
-#~ msgstr "స్టేటస్‌నెట్ మృదూపకరణ లైసెన్సు"
-
-#~ msgid "Site content license"
-#~ msgstr "స్టేటస్‌నెట్ మృదూపకరణ లైసెన్సు"
-
-#~ msgid "Pagination"
-#~ msgstr "పేజీకరణ"
-
-#~ msgid "Author"
-#~ msgstr "రచయిత"
-
-#~ msgid "Provider"
-#~ msgstr "మునుజూపు"
-
-#, fuzzy
-#~ msgctxt "MENU"
-#~ msgid "SMS"
-#~ msgstr "SSLని ఉపయోగించు"
-
-#~ msgid "[%s]"
-#~ msgstr "[%s]"
-
-#~ msgid "Available characters"
-#~ msgstr "అందుబాటులో ఉన్న అక్షరాలు"
-
-#, fuzzy
-#~ msgctxt "MENU"
-#~ msgid "Profile"
-#~ msgstr "ప్రొఫైలు"
-
-#~ msgid "Search help"
-#~ msgstr "సహాయంలో వెతుకు"
-
-#, fuzzy
-#~ msgid "Message too long. Maximum is %1$d character, you sent %2$d."
-#~ msgid_plural "Message too long. Maximum is %1$d characters, you sent %2$d."
-#~ msgstr[0] "నోటిసు చాలా పొడవుగా ఉంది - %1$d అక్షరాలు గరిష్ఠం, మీరు %2$d పంపించారు."
-#~ msgstr[1] "నోటిసు చాలా పొడవుగా ఉంది - %1$d అక్షరాలు గరిష్ఠం, మీరు %2$d పంపించారు."
+#~ msgid "Add a comment..."
+#~ msgstr "ఒక వ్యాఖ్యని చేర్చండి..."
diff --git a/locale/tr/LC_MESSAGES/statusnet.po b/locale/tr/LC_MESSAGES/statusnet.po
index 2ab5760b11..95d467fcf1 100644
--- a/locale/tr/LC_MESSAGES/statusnet.po
+++ b/locale/tr/LC_MESSAGES/statusnet.po
@@ -12,68 +12,58 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:23+0000\n"
-"PO-Revision-Date: 2011-03-03 17:26:30+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:40+0000\n"
 "Language-Team: Turkish <http://translatewiki.net/wiki/Portal:tr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tr\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-POT-Import-Date: 2011-02-25 23:49:23+0000\n"
+"X-POT-Import-Date: 2011-03-03 17:59:19+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
-#: actions/accessadminpanel.php:53 lib/adminpanelaction.php:363
 msgid "Access"
 msgstr "Erişim"
 
 #. TRANS: Page notice.
-#: actions/accessadminpanel.php:64
 msgid "Site access settings"
 msgstr "Site erişim ayarları"
 
 #. TRANS: Form legend for registration form.
-#: actions/accessadminpanel.php:151
 msgid "Registration"
 msgstr "Kayıt"
 
 #. TRANS: Checkbox instructions for admin setting "Private".
-#: actions/accessadminpanel.php:155
 msgid "Prohibit anonymous users (not logged in) from viewing site?"
 msgstr ""
 "Anonim kullanıcıların (giriş yapmayanların) siteyi görmesi engellensin mi?"
 
 #. TRANS: Checkbox label for prohibiting anonymous users from viewing site.
-#: actions/accessadminpanel.php:157
 msgctxt "LABEL"
 msgid "Private"
 msgstr "Özel"
 
 #. TRANS: Checkbox instructions for admin setting "Invite only".
-#: actions/accessadminpanel.php:164
 msgid "Make registration invitation only."
 msgstr "Sadece kayıt daveti yap."
 
 #. TRANS: Checkbox label for configuring site as invite only.
-#: actions/accessadminpanel.php:166
 msgid "Invite only"
 msgstr "Sadece davet"
 
 #. TRANS: Checkbox instructions for admin setting "Closed" (no new registrations).
-#: actions/accessadminpanel.php:173
 msgid "Disable new registrations."
 msgstr "Yeni kayıtları devre dışı bırak."
 
 #. TRANS: Checkbox label for disabling new user registrations.
-#: actions/accessadminpanel.php:175
 msgid "Closed"
 msgstr "Kapalı"
 
 #. TRANS: Title for button to save access settings in site admin panel.
-#: actions/accessadminpanel.php:191
 msgid "Save access settings"
 msgstr "Erişim ayarlarını kaydet"
 
@@ -81,6 +71,7 @@ msgstr "Erişim ayarlarını kaydet"
 #. TRANS: Button text for saving theme settings.
 #. TRANS: Button label to save e-mail preferences.
 #. TRANS: Button label to save IM preferences.
+#. TRANS: Button text in the license admin panel.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
 #. TRANS: Button text for saving site notice in admin panel.
@@ -90,21 +81,12 @@ msgstr "Erişim ayarlarını kaydet"
 #. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
 #. TRANS: Button text on profile design page to save settings.
-#: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
-#: actions/emailsettings.php:251 actions/imsettings.php:199
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:198
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:204
-#: actions/subscriptions.php:261 actions/urlsettings.php:152
-#: actions/useradminpanel.php:298 lib/applicationeditform.php:355
-#: lib/designform.php:320 lib/groupeditform.php:201
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Kaydet"
 
 #. TRANS: Server error when page not found (404).
 #. TRANS: Server error when page not found (404)
-#: actions/all.php:68 actions/public.php:98 actions/replies.php:93
-#: actions/showfavorites.php:140 actions/tag.php:52
 msgid "No such page."
 msgstr "Böyle bir sayfa yok."
 
@@ -123,6 +105,7 @@ msgstr "Böyle bir sayfa yok."
 #. TRANS: Client error displayed when checking group membership for a non-existing user.
 #. TRANS: Client error displayed when trying to have a non-existing user join a group.
 #. TRANS: Client error displayed when trying to have a non-existing user leave a group.
+#. TRANS: Client error displayed when not providing a user or an invalid user.
 #. TRANS: Client error displayed when updating a status for a non-existing user.
 #. TRANS: Client error displayed when requesting a list of followers for a non-existing user.
 #. TRANS: Client error displayed when requesting most recent favourite notices by a user for a non-existing user.
@@ -135,6 +118,8 @@ msgstr "Böyle bir sayfa yok."
 #. 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.
 #. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
@@ -142,33 +127,10 @@ msgstr "Böyle bir sayfa yok."
 #. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when calling a profile action without specifying a user.
-#: actions/all.php:80 actions/allrss.php:69
-#: actions/apiaccountupdatedeliverydevice.php:110
-#: actions/apiaccountupdateprofile.php:103
-#: actions/apiaccountupdateprofilebackgroundimage.php:118
-#: actions/apiaccountupdateprofileimage.php:104 actions/apiatomservice.php:59
-#: actions/apiblockcreate.php:96 actions/apiblockdestroy.php:94
-#: actions/apidirectmessage.php:75 actions/apidirectmessagenew.php:72
-#: actions/apigroupcreate.php:111 actions/apigroupismember.php:89
-#: actions/apigroupjoin.php:98 actions/apigroupleave.php:98
-#: actions/apigrouplist.php:70 actions/apigroupprofileupdate.php:108
-#: actions/apistatusesupdate.php:230 actions/apisubscriptions.php:85
-#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:173
-#: actions/apitimelinehome.php:78 actions/apitimelinementions.php:77
-#: actions/apitimelineuser.php:79 actions/avatarbynickname.php:79
-#: actions/favoritesrss.php:72 actions/foaf.php:42 actions/foaf.php:61
-#: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116
-#: actions/otp.php:78 actions/remotesubscribe.php:144
-#: actions/remotesubscribe.php:153 actions/replies.php:73
-#: actions/repliesrss.php:38 actions/rsd.php:113 actions/showfavorites.php:106
-#: actions/userbyid.php:75 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/userxrd.php:59 actions/xrds.php:71 lib/command.php:509
-#: lib/galleryaction.php:59 lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Böyle bir kullanıcı yok."
 
 #. TRANS: Page title. %1$s is user nickname, %2$d is page number
-#: actions/all.php:91
 #, php-format
 msgid "%1$s and friends, page %2$d"
 msgstr "%1$s ve arkadaşları, sayfa %2$d"
@@ -177,33 +139,26 @@ msgstr "%1$s ve arkadaşları, sayfa %2$d"
 #. TRANS: H1 text for page. %s is a user nickname.
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Timeline title for user and friends. %s is a user nickname.
-#: actions/all.php:94 actions/all.php:191 actions/allrss.php:117
-#: actions/apitimelinefriends.php:207 actions/apitimelinehome.php:113
-#: lib/personalgroupnav.php:100
 #, php-format
 msgid "%s and friends"
 msgstr "%s ve arkadaşları"
 
 #. TRANS: %s is user nickname.
-#: actions/all.php:108
 #, php-format
 msgid "Feed for friends of %s (RSS 1.0)"
 msgstr "%s ve arkadaşları için besleme (RSS 1.0)"
 
 #. TRANS: %s is user nickname.
-#: actions/all.php:117
 #, php-format
 msgid "Feed for friends of %s (RSS 2.0)"
 msgstr "%s ve arkadaşları için besleme (RSS 2.0)"
 
 #. TRANS: %s is user nickname.
-#: actions/all.php:126
 #, php-format
 msgid "Feed for friends of %s (Atom)"
 msgstr "%s ve arkadaşları için besleme (Atom)"
 
 #. TRANS: Empty list message. %s is a user nickname.
-#: actions/all.php:139
 #, php-format
 msgid ""
 "This is the timeline for %s and friends but no one has posted anything yet."
@@ -213,7 +168,6 @@ msgstr ""
 
 #. TRANS: Encouragement displayed on logged in user's empty timeline.
 #. TRANS: This message contains Markdown links. Keep "](" together.
-#: actions/all.php:146
 #, php-format
 msgid ""
 "Try subscribing to more people, [join a group](%%action.groups%%) or post "
@@ -224,7 +178,6 @@ msgstr ""
 
 #. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@".
 #. TRANS: This message contains Markdown links. Keep "](" together.
-#: actions/all.php:150
 #, php-format
 msgid ""
 "You can try to [nudge %1$s](../%2$s) from their profile or [post something "
@@ -238,7 +191,6 @@ msgstr ""
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
 #. TRANS: Second sentence of empty message for anonymous users. %s is a user nickname.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:221
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -248,14 +200,11 @@ msgstr ""
 "kullanıcısını dürtmüyor veya onlara durum mesajı yazmıyorsunuz."
 
 #. TRANS: H1 text for page when viewing a list for self.
-#: actions/all.php:188
 msgid "You and friends"
 msgstr "Sen ve arkadaşların"
 
 #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
 #. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name.
-#: actions/allrss.php:122 actions/apitimelinefriends.php:213
-#: actions/apitimelinehome.php:119
 #, php-format
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr "%2$s üzerindeki %1$s ve arkadaşlarından güncellemeler!"
@@ -274,55 +223,20 @@ msgstr "%2$s üzerindeki %1$s ve arkadaşlarından güncellemeler!"
 #. TRANS: Client error displayed trying to execute an unknown API method checking group membership.
 #. TRANS: Client error displayed trying to execute an unknown API method listing the latest 20 groups.
 #. TRANS: Client error displayed trying to execute an unknown API method showing group membership.
+#. TRANS: Client error displayed when using an unsupported API format.
 #. TRANS: Client error displayed trying to execute an unknown API method showing a group.
 #. TRANS: Client error displayed trying to execute an unknown API method testing API connectivity.
 #. TRANS: Client error displayed trying to execute an unknown API method deleting a status.
 #. TRANS: Client error displayed when trying to handle an unknown API method.
-#: actions/apiaccountratelimitstatus.php:69
-#: actions/apiaccountupdatedeliverydevice.php:92
-#: actions/apiaccountupdateprofile.php:94
-#: actions/apiaccountupdateprofilebackgroundimage.php:92
-#: actions/apiaccountupdateprofilecolors.php:115
-#: actions/apiaccountverifycredentials.php:68 actions/apidirectmessage.php:157
-#: actions/apifavoritecreate.php:98 actions/apifavoritedestroy.php:98
-#: actions/apifriendshipscreate.php:99 actions/apifriendshipsdestroy.php:99
-#: actions/apifriendshipsshow.php:124 actions/apigroupcreate.php:138
-#: actions/apigroupismember.php:115 actions/apigroupjoin.php:151
-#: actions/apigroupleave.php:141 actions/apigrouplist.php:134
-#: actions/apigrouplistall.php:120 actions/apigroupmembership.php:105
-#: actions/apigroupprofileupdate.php:100 actions/apigroupprofileupdate.php:213
-#: actions/apigroupshow.php:114 actions/apihelptest.php:84
-#: actions/apistatusesdestroy.php:101 actions/apistatusesretweets.php:110
-#: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:139
-#: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
-#: actions/apitimelinefavorites.php:182 actions/apitimelinefriends.php:276
-#: actions/apitimelinegroup.php:148 actions/apitimelinehome.php:181
-#: actions/apitimelinementions.php:182 actions/apitimelinepublic.php:247
-#: actions/apitimelineretweetedtome.php:147
-#: actions/apitimelineretweetsofme.php:147 actions/apitimelinetag.php:165
-#: actions/apitimelineuser.php:217 actions/apiusershow.php:100
 msgid "API method not found."
 msgstr "UPA yöntemi bulunamadı."
 
 #. 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.
-#: actions/apiaccountupdatedeliverydevice.php:83
-#: actions/apiaccountupdateprofile.php:85
-#: actions/apiaccountupdateprofilebackgroundimage.php:83
-#: actions/apiaccountupdateprofilecolors.php:106
-#: actions/apiaccountupdateprofileimage.php:80 actions/apiblockcreate.php:87
-#: actions/apiblockdestroy.php:85 actions/apidirectmessagenew.php:107
-#: actions/apifavoritecreate.php:88 actions/apifavoritedestroy.php:88
-#: actions/apifriendshipscreate.php:89 actions/apifriendshipsdestroy.php:89
-#: actions/apigroupcreate.php:102 actions/apigroupjoin.php:89
-#: actions/apigroupleave.php:89 actions/apigroupprofileupdate.php:92
-#: actions/apimediaupload.php:66 actions/apistatusesretweet.php:63
-#: actions/apistatusesupdate.php:194
 msgid "This method requires a POST."
 msgstr "Bu yöntem bir POST gerektirir."
 
 #. TRANS: Client error displayed when no valid device parameter is provided for a user's delivery device setting.
-#: actions/apiaccountupdatedeliverydevice.php:103
 msgid ""
 "You must specify a parameter named 'device' with a value of one of: sms, im, "
 "none."
@@ -337,10 +251,6 @@ msgstr ""
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
-#: actions/apiaccountupdatedeliverydevice.php:136
-#: actions/emailsettings.php:353 actions/emailsettings.php:499
-#: actions/profilesettings.php:323 actions/smssettings.php:300
-#: actions/smssettings.php:453 actions/urlsettings.php:211
 msgid "Could not update user."
 msgstr "Kullanıcı güncellenemedi."
 
@@ -353,32 +263,17 @@ msgstr "Kullanıcı güncellenemedi."
 #. TRANS: Server error displayed when requesting Friends of a Friend feed for a user for which the profile could not be found.
 #. TRANS: Server error displayed when trying to get a user hCard for a user without a profile.
 #. TRANS: Server error displayed when calling a profile action while the specified user does not have a profile.
-#: actions/apiaccountupdateprofile.php:111
-#: actions/apiaccountupdateprofilebackgroundimage.php:199
-#: actions/apiaccountupdateprofilecolors.php:183
-#: actions/apiaccountupdateprofileimage.php:131
-#: actions/apiuserprofileimage.php:88 actions/apiusershow.php:108
-#: actions/avatarbynickname.php:85 actions/foaf.php:69 actions/hcard.php:75
-#: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
-#: lib/profileaction.php:85
 msgid "User has no profile."
 msgstr "Kullanıcının profili yok."
 
 #. TRANS: Server error displayed if a user profile could not be saved.
 #. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:419
 msgid "Could not save profile."
 msgstr "Profil kaydedilemedi."
 
 #. TRANS: Client error displayed when the number of bytes in a POST request exceeds a limit.
 #. TRANS: %s is the number of bytes of the CONTENT_LENGTH.
 #. TRANS: Form validation error in design settings form. POST should remain untranslated.
-#: actions/apiaccountupdateprofilebackgroundimage.php:108
-#: actions/apiaccountupdateprofileimage.php:95 actions/apimediaupload.php:81
-#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
-#: actions/designadminpanel.php:120 actions/editapplication.php:121
-#: actions/newapplication.php:102 actions/newnotice.php:95
-#: lib/designsettings.php:110
 #, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s byte) due to its "
@@ -395,26 +290,15 @@ msgstr[0] ""
 #. TRANS: Client error displayed when a database error occurs inserting profile colours.
 #. TRANS: Client error displayed when a database error occurs updating profile colours.
 #. TRANS: Form validation error displayed when group design settings could not be saved because of an application issue.
-#: actions/apiaccountupdateprofilebackgroundimage.php:138
-#: actions/apiaccountupdateprofilebackgroundimage.php:149
-#: actions/apiaccountupdateprofilecolors.php:160
-#: actions/apiaccountupdateprofilecolors.php:171
-#: actions/groupdesignsettings.php:285 actions/groupdesignsettings.php:296
-#: actions/userdesignsettings.php:218 actions/userdesignsettings.php:228
-#: actions/userdesignsettings.php:270 actions/userdesignsettings.php:280
 msgid "Unable to save your design settings."
 msgstr "Dizayn ayarlarınız kaydedilemedi."
 
 #. TRANS: Error displayed when updating design settings fails.
 #. TRANS: Client error displayed when a database error occurs updating profile colours.
-#: actions/apiaccountupdateprofilebackgroundimage.php:191
-#: actions/apiaccountupdateprofilecolors.php:139
-#: actions/userdesignsettings.php:196
 msgid "Could not update your design."
 msgstr "Tasarımınız güncellenemedi."
 
 #. TRANS: Title for Atom feed.
-#: actions/apiatomservice.php:85
 msgctxt "ATOM"
 msgid "Main"
 msgstr "Ana"
@@ -423,9 +307,6 @@ msgstr "Ana"
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Title in atom group notice feed. %s is a group name.
 #. TRANS: Title in atom user notice feed. %s is a user name.
-#: actions/apiatomservice.php:93 actions/grouprss.php:138
-#: actions/userrss.php:94 lib/atomgroupnoticefeed.php:63
-#: lib/atomusernoticefeed.php:88
 #, php-format
 msgid "%s timeline"
 msgstr "%s zaman çizelgesi"
@@ -435,8 +316,6 @@ msgstr "%s zaman çizelgesi"
 #. TRANS: %s is a user nickname.
 #. TRANS: Header for subscriptions overview for a user (first page).
 #. TRANS: %s is a user nickname.
-#: actions/apiatomservice.php:104 actions/atompubsubscriptionfeed.php:148
-#: actions/subscriptions.php:51
 #, php-format
 msgid "%s subscriptions"
 msgstr "%s abonelikleri"
@@ -444,58 +323,48 @@ msgstr "%s abonelikleri"
 #. TRANS: Title for Atom feed with a user's favorite notices. %s is a user nickname.
 #. TRANS: Title for Atom favorites feed.
 #. TRANS: %s is a user nickname.
-#: actions/apiatomservice.php:115 actions/atompubfavoritefeed.php:142
 #, php-format
 msgid "%s favorites"
 msgstr "%s favorileri"
 
 #. TRANS: Title for Atom feed with a user's memberships. %s is a user nickname.
-#: actions/apiatomservice.php:126
 #, php-format
 msgid "%s memberships"
 msgstr "%s üyelikleri"
 
 #. TRANS: Client error displayed when users try to block themselves.
-#: actions/apiblockcreate.php:105
 msgid "You cannot block yourself!"
 msgstr "Kendinizi engelleyemezsiniz!"
 
 #. TRANS: Server error displayed when blocking a user has failed.
-#: actions/apiblockcreate.php:127
 msgid "Block user failed."
 msgstr "Kullanıcıyı engelleme başarısız oldu."
 
 #. TRANS: Server error displayed when unblocking a user has failed.
-#: actions/apiblockdestroy.php:113
 msgid "Unblock user failed."
 msgstr "Kullanıcının engellemesini kaldırma başarısız oldu."
 
 #. TRANS: Title. %s is a user nickname.
-#: actions/apidirectmessage.php:88
 #, php-format
 msgid "Direct messages from %s"
 msgstr "%s kullanıcısından özel mesajlar"
 
 #. TRANS: Subtitle. %s is a user nickname.
-#: actions/apidirectmessage.php:93
 #, php-format
 msgid "All the direct messages sent from %s"
 msgstr "%s tarafından gönderilmiş tüm özel mesajlar"
 
 #. TRANS: Title. %s is a user nickname.
-#: actions/apidirectmessage.php:102
 #, php-format
 msgid "Direct messages to %s"
 msgstr "%s kullanıcısına özel mesaj"
 
 #. TRANS: Subtitle. %s is a user nickname.
-#: actions/apidirectmessage.php:107
 #, php-format
 msgid "All the direct messages sent to %s"
 msgstr "%s kullanıcısına gönderilmiş tüm özel mesajlar"
 
 #. TRANS: Client error displayed when no message text was submitted (406).
-#: actions/apidirectmessagenew.php:117
 msgid "No message text!"
 msgstr "Mesaj metni yok!"
 
@@ -503,25 +372,21 @@ msgstr "Mesaj metni yok!"
 #. TRANS: %d is the maximum number of characters for a message.
 #. TRANS: Form validation error displayed when message content is too long.
 #. TRANS: %d is the maximum number of characters for a message.
-#: actions/apidirectmessagenew.php:127 actions/newmessage.php:152
 #, php-format
 msgid "That's too long. Maximum message size is %d character."
 msgid_plural "That's too long. Maximum message size is %d characters."
 msgstr[0] "Bu çok uzun. En büyük ileti boyutu %d karakterdir."
 
 #. TRANS: Client error displayed if a recipient user could not be found (403).
-#: actions/apidirectmessagenew.php:139
 msgid "Recipient user not found."
 msgstr "Alıcı kullanıcı bulunamadı."
 
 #. TRANS: Client error displayed trying to direct message another user who's not a friend (403).
-#: actions/apidirectmessagenew.php:144
 #, fuzzy
 msgid "Cannot send direct messages to users who aren't your friend."
 msgstr "Arkadaşınız olmayan kullanıcılara özel mesaj gönderemezsiniz."
 
 #. TRANS: Client error displayed trying to direct message self (403).
-#: actions/apidirectmessagenew.php:154
 msgid ""
 "Do not send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
@@ -531,116 +396,96 @@ 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.
 #. TRANS: Client error displayed trying to delete a status with an invalid ID.
-#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:108
-#: actions/apistatusesdestroy.php:121
 msgid "No status found with that ID."
 msgstr "Bu ID'ye sahip durum mesajı bulunamadı."
 
 #. TRANS: Client error displayed when trying to mark a notice favourite that already is a favourite.
-#: actions/apifavoritecreate.php:120
 msgid "This status is already a favorite."
 msgstr "Bu durum mesajı zaten bir favori."
 
 #. TRANS: Client error displayed when marking a notice as favourite fails.
 #. TRANS: Server error displayed when trying to mark a notice as favorite fails in the database.
 #. TRANS: Error message text shown when a favorite could not be set.
-#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:306
 msgid "Could not create favorite."
 msgstr "Favori oluşturulamadı."
 
 #. TRANS: Client error displayed when trying to remove a favourite that was not a favourite.
-#: actions/apifavoritedestroy.php:122
 msgid "That status is not a favorite."
 msgstr "Bu durum mesajı bir favori değil."
 
 #. TRANS: Client error displayed when removing a favourite has failed.
 #. TRANS: Server error displayed when removing a favorite from the database fails.
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:90
 msgid "Could not delete favorite."
 msgstr "Favori silinemedi."
 
 #. TRANS: Client error displayed when trying follow who's profile could not be found.
-#: actions/apifriendshipscreate.php:109
 msgid "Could not follow user: profile not found."
 msgstr "Profil kaydedilemedi."
 
 #. TRANS: Client error displayed when trying to follow a user that's already being followed.
 #. TRANS: %s is the nickname of the user that is already being followed.
-#: actions/apifriendshipscreate.php:120
 #, php-format
 msgid "Could not follow user: %s is already on your list."
 msgstr "Kullanıcı izlenemiyor: %s zaten listenizde."
 
 #. TRANS: Client error displayed when trying to unfollow a user that cannot be found.
-#: actions/apifriendshipsdestroy.php:109
 msgid "Could not unfollow user: User not found."
 msgstr "Kullanıcı izlemesi bırakılamıyor: Kullanıcı bulunamadı."
 
 #. TRANS: Client error displayed when trying to unfollow self.
-#: actions/apifriendshipsdestroy.php:121
 msgid "You cannot unfollow yourself."
 msgstr "Kendinizi izlemeyi bırakamazsınız."
 
 #. TRANS: Client error displayed when supplying invalid parameters to an API call checking if a friendship exists.
-#: actions/apifriendshipsexists.php:88
 msgid "Two valid IDs or nick names must be supplied."
 msgstr "İki geçerli ID veya takma ad verilmelidir."
 
 #. TRANS: Client error displayed when a source user could not be determined showing friendship.
-#: actions/apifriendshipsshow.php:131
 msgid "Could not determine source user."
 msgstr "Kaynak kullanıcı belirlenemedi."
 
 #. TRANS: Client error displayed when a target user could not be determined showing friendship.
-#: actions/apifriendshipsshow.php:140
 msgid "Could not find target user."
 msgstr "Hedef kullanıcı bulunamadı."
 
 #. TRANS: Client error trying to create a group with a nickname this is already in use.
+#. TRANS: API validation exception thrown when nickname is already used.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:156 actions/apigroupprofileupdate.php:255
-#: actions/editgroup.php:191 actions/newgroup.php:137
-#: actions/profilesettings.php:274 actions/register.php:199
 msgid "Nickname already in use. Try another one."
 msgstr "Takma ad kullanımda. Başka bir tane deneyin."
 
 #. TRANS: Client error in form for group creation.
+#. TRANS: API validation exception thrown when nickname does not validate.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:164 actions/apigroupprofileupdate.php:259
-#: actions/editgroup.php:195 actions/newgroup.php:141
-#: actions/profilesettings.php:244 actions/register.php:201
 msgid "Not a valid nickname."
 msgstr "Geçersiz bir takma ad."
 
 #. TRANS: Client error in form for group creation.
+#. TRANS: API validation exception thrown when homepage URL does not validate.
 #. TRANS: Validation error shown when providing an invalid homepage URL in the "Edit application" form.
 #. TRANS: Group edit form validation error.
 #. TRANS: Validation error shown when providing an invalid homepage URL in the "New application" form.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:181 actions/apigroupprofileupdate.php:277
-#: actions/editapplication.php:235 actions/editgroup.php:202
-#: actions/newapplication.php:221 actions/newgroup.php:148
-#: actions/profilesettings.php:249 actions/register.php:208
 msgid "Homepage is not a valid URL."
 msgstr "Başlangıç sayfası adresi geçerli bir URL değil."
 
 #. TRANS: Client error in form for group creation.
+#. TRANS: API validation exception thrown when full name does not validate.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:191 actions/editgroup.php:206
-#: actions/newgroup.php:152 actions/profilesettings.php:253
-#: actions/register.php:211
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "Tam isim çok uzun (en fazla: 255 karakter)."
 
 #. TRANS: Client error shown when providing too long a description during group creation.
 #. TRANS: %d is the maximum number of allowed characters.
+#. TRANS: API validation exception thrown when description does not validate.
+#. TRANS: %d is the maximum description length and used for plural.
 #. TRANS: Validation error shown when providing too long a description in the "Edit application" form.
 #. TRANS: %d is the maximum number of allowed characters.
 #. TRANS: Group edit form validation error.
@@ -648,32 +493,27 @@ msgstr "Tam isim çok uzun (en fazla: 255 karakter)."
 #. TRANS: %d is the maximum number of characters for the description.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed characters.
-#: actions/apigroupcreate.php:201 actions/editapplication.php:202
-#: actions/editgroup.php:211 actions/newapplication.php:182
-#: actions/newgroup.php:157
 #, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."
 msgstr[0] "Tanım çok uzun (en fazla %d karakter)."
 
 #. TRANS: Client error shown when providing too long a location during group creation.
+#. TRANS: API validation exception thrown when location does not validate.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:215 actions/editgroup.php:218
-#: actions/newgroup.php:164 actions/profilesettings.php:266
-#: actions/register.php:220
 msgid "Location is too long (maximum 255 characters)."
 msgstr "Yer bilgisi çok uzun (en fazla 255 karakter)."
 
 #. TRANS: Client error shown when providing too many aliases during group creation.
 #. TRANS: %d is the maximum number of allowed aliases.
+#. TRANS: API validation exception thrown when aliases do not validate.
+#. TRANS: %d is the maximum number of aliases and used for plural.
 #. TRANS: Group edit form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.
-#: actions/apigroupcreate.php:236 actions/editgroup.php:231
-#: actions/newgroup.php:177
 #, php-format
 msgid "Too many aliases! Maximum %d allowed."
 msgid_plural "Too many aliases! Maximum %d allowed."
@@ -681,25 +521,24 @@ msgstr[0] "Çok fazla diğerisim! En fazla %d taneye izin veriliyor."
 
 #. TRANS: Client error shown when providing an invalid alias during group creation.
 #. TRANS: %s is the invalid alias.
-#: actions/apigroupcreate.php:253
+#. TRANS: API validation exception thrown when aliases does not validate.
+#. TRANS: %s is the invalid alias.
 #, php-format
 msgid "Invalid alias: \"%s\"."
 msgstr "Geçersiz büyüklük."
 
 #. TRANS: Client error displayed when trying to use an alias during group creation that is already in use.
 #. TRANS: %s is the alias that is already in use.
+#. TRANS: API validation exception thrown when aliases is already used.
+#. TRANS: %s is the already used alias.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error. %s is the already used alias.
-#: actions/apigroupcreate.php:264 actions/apigroupprofileupdate.php:351
-#: actions/editgroup.php:246 actions/newgroup.php:193
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "Diğerisim \"%s\" kullanımda. Başka bir tane deneyin."
 
 #. TRANS: Client error displayed when trying to use an alias during group creation that is the same as the group's nickname.
 #. TRANS: Group edit form validation error.
-#: actions/apigroupcreate.php:278 actions/apigroupprofileupdate.php:359
-#: actions/editgroup.php:253
 msgid "Alias can't be the same as nickname."
 msgstr "Diğerisim, kullanıcı adı ile aynı olamaz."
 
@@ -707,26 +546,21 @@ msgstr "Diğerisim, kullanıcı adı ile aynı olamaz."
 #. TRANS: Client error displayed when trying to join a group that does not exist.
 #. TRANS: Client error displayed when trying to leave a group that does not exist.
 #. TRANS: Client error displayed trying to show group membership on a non-existing group.
+#. TRANS: Client error displayed when not providing a group or an invalid group.
 #. TRANS: Client error displayed when trying to show a group that could not be found.
 #. TRANS: Client error displayed requesting most recent notices to a group for a non-existing group.
-#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
-#: actions/apigroupleave.php:104 actions/apigroupmembership.php:71
-#: actions/apigroupprofileupdate.php:113 actions/apigroupshow.php:81
-#: actions/apitimelinegroup.php:89
 msgid "Group not found."
 msgstr "Onay kodu bulunamadı."
 
 #. TRANS: Server error displayed when trying to join a group the user is already a member of.
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:345
 msgid "You are already a member of that group."
 msgstr "Bize o profili yollamadınız"
 
 #. TRANS: Server error displayed when trying to join a group the user is blocked from joining.
 #. 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.
-#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:350
 msgid "You have been blocked from that group by the admin."
 msgstr "Bu gruptan yönetici tarafından engellendiniz."
 
@@ -734,13 +568,11 @@ msgstr "Bu gruptan yönetici tarafından engellendiniz."
 #. TRANS: %1$s is the joining user's nickname, $2$s is the group nickname for which the join failed.
 #. TRANS: Message given having failed to add a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:136 actions/joingroup.php:139 lib/command.php:362
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "%1$s kullanıcısı, %2$s grubuna katılamadı."
 
 #. TRANS: Server error displayed when trying to leave a group the user is not a member of.
-#: actions/apigroupleave.php:115
 msgid "You are not a member of this group."
 msgstr "Bu grubun bir üyesi değilsiniz."
 
@@ -748,116 +580,79 @@ msgstr "Bu grubun bir üyesi değilsiniz."
 #. TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
 #. TRANS: Message given having failed to remove a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupleave.php:127 actions/leavegroup.php:133
-#: lib/command.php:410
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
 msgstr "%1$s kullanıcısı, %2$s grubundan silinemedi."
 
 #. TRANS: Used as title in check for group membership. %s is a user name.
-#: actions/apigrouplist.php:94
 #, php-format
 msgid "%s's groups"
 msgstr "%s kullanıcısının grupları"
 
 #. TRANS: Used as subtitle in check for group membership. %1$s is a user name, %2$s is the site name.
-#: actions/apigrouplist.php:104
 #, php-format
 msgid "%1$s groups %2$s is a member of."
 msgstr "%2$s kullanıcısının üye olduğu %1$s grupları."
 
 #. TRANS: Message is used as a title when listing the lastest 20 groups. %s is a site name.
 #. TRANS: Message is used as a page title. %s is a nick name.
-#: actions/apigrouplistall.php:88 actions/usergroups.php:63
 #, php-format
 msgid "%s groups"
 msgstr "%s grupları"
 
 #. TRANS: Message is used as a subtitle when listing the lastest 20 groups. %s is a site name.
-#: actions/apigrouplistall.php:93
 #, php-format
 msgid "groups on %s"
 msgstr "%s üzerindeki gruplar"
 
+#. TRANS: Client error displayed when trying to edit a group without being an admin.
 #. TRANS: Client error displayed trying to edit a group while not being a group admin.
 #. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
 #. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
-#: actions/apigroupprofileupdate.php:118 actions/editgroup.php:110
-#: actions/editgroup.php:176 actions/groupdesignsettings.php:109
-#: actions/grouplogo.php:111
 msgid "You must be an admin to edit the group."
 msgstr "Bir grubu düzenlemek için bir yönetici olmalısınız."
 
+#. TRANS: Server error displayed when group update fails.
 #. TRANS: Server error displayed when editing a group fails.
-#: actions/apigroupprofileupdate.php:171 actions/editgroup.php:274
 msgid "Could not update group."
 msgstr "Grup güncellenemedi."
 
+#. TRANS: Server error displayed when adding group aliases fails.
 #. TRANS: Server error displayed when group aliases could not be added.
 #. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/apigroupprofileupdate.php:194 actions/editgroup.php:281
-#: classes/User_group.php:540
 msgid "Could not create aliases."
 msgstr "Kullanıcı güncellenemedi."
 
+#. TRANS: API validation exception thrown when nickname does not validate.
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: actions/apigroupprofileupdate.php:249 lib/nickname.php:165
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr ""
 "Takma ad sadece küçük harflerden ve rakamlardan oluşabilir, boşluk "
 "kullanılamaz. "
 
-#: actions/apigroupprofileupdate.php:286
-#, fuzzy
-msgid "Full name is too long (max 255 chars)."
-msgstr "Tam isim çok uzun (en fazla: 255 karakter)."
-
-#: actions/apigroupprofileupdate.php:296
-#, fuzzy, php-format
-msgid "description is too long (max %d chars)."
-msgstr "Tanım çok uzun (en fazla %d karakter)."
-
-#: actions/apigroupprofileupdate.php:307
-#, fuzzy
-msgid "Location is too long (max 255 chars)."
-msgstr "Yer bilgisi çok uzun (en fazla 255 karakter)."
-
-#: actions/apigroupprofileupdate.php:326
-#, fuzzy, php-format
-msgid "Too many aliases! Maximum %d."
-msgstr "Çok fazla diğerisim! En fazla %d taneye izin veriliyor."
-
-#. TRANS: Group edit form validation error.
+#. TRANS: API validation exception thrown when alias is the same as nickname.
 #. TRANS: Group create form validation error.
-#. TRANS: %s is the invalid alias.
-#: actions/apigroupprofileupdate.php:342 actions/editgroup.php:241
-#: actions/newgroup.php:188
-#, fuzzy, php-format
-msgid "Invalid alias: \"%s\""
-msgstr "%s Geçersiz başlangıç sayfası"
+#, fuzzy
+msgid "Alias cannot be the same as nickname."
+msgstr "Diğerisim, kullanıcı adı ile aynı olamaz."
 
 #. TRANS: Client error displayed when uploading a media file has failed.
-#: actions/apimediaupload.php:101
 msgid "Upload failed."
 msgstr "Yükleme başarısız."
 
 #. TRANS: Client error given from the OAuth API when the request token or verifier is invalid.
-#: actions/apioauthaccesstoken.php:102
 msgid "Invalid request token or verifier."
 msgstr "Geçersiz istek belirteci veya sağlayıcı."
 
 #. TRANS: Client error given when no oauth_token was passed to the OAuth API.
-#: actions/apioauthauthorize.php:107
 msgid "No oauth_token parameter provided."
 msgstr "Hiçbir oauth_token parametresi sağlanmıyor."
 
 #. TRANS: Client error given when an invalid request token was passed to the OAuth API.
-#: actions/apioauthauthorize.php:115 actions/apioauthauthorize.php:129
 msgid "Invalid request token."
 msgstr "Geçersiz istek belirteci."
 
 #. TRANS: Client error given when an invalid request token was passed to the OAuth API.
-#: actions/apioauthauthorize.php:121
 msgid "Request token already authorized."
 msgstr "İstek belirteci zaten yetkili."
 
@@ -867,31 +662,14 @@ msgstr "İstek belirteci zaten yetkili."
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
 #. TRANS: Client error displayed when the session token is not okay.
-#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:75
-#: actions/emailsettings.php:292 actions/favor.php:75 actions/geocode.php:55
-#: actions/groupblock.php:65 actions/grouplogo.php:321
-#: actions/groupunblock.php:65 actions/imsettings.php:241
-#: actions/invite.php:60 actions/makeadmin.php:66 actions/newmessage.php:135
-#: actions/newnotice.php:105 actions/nudge.php:80
-#: actions/oauthappssettings.php:162 actions/oauthconnectionssettings.php:135
-#: actions/passwordsettings.php:137 actions/pluginenable.php:87
-#: actions/profilesettings.php:218 actions/recoverpassword.php:383
-#: actions/register.php:157 actions/remotesubscribe.php:76
-#: actions/repeat.php:82 actions/smssettings.php:249 actions/subedit.php:40
-#: actions/subscribe.php:87 actions/tagother.php:145
-#: actions/unsubscribe.php:69 actions/urlsettings.php:171
-#: actions/userauthorization.php:53 lib/designsettings.php:122
 msgid "There was a problem with your session token. Try again, please."
 msgstr "Oturum belirtecinizde bir sorun var. Lütfen, tekrar deneyin."
 
 #. TRANS: Form validation error given when an invalid username and/or password was passed to the OAuth API.
-#: actions/apioauthauthorize.php:168
 msgid "Invalid nickname / password!"
 msgstr "Geçersiz kullanıcı adı / parola!"
 
 #. TRANS: Server error displayed when a database action fails.
-#: actions/apioauthauthorize.php:217
 msgid "Database error inserting oauth_token_association."
 msgstr "oauth_token_association eklerken veritabanı hatası."
 
@@ -907,28 +685,19 @@ msgstr "oauth_token_association eklerken veritabanı hatası."
 #. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
 #. TRANS: Message given submitting a form with an unknown action in SMS settings.
 #. TRANS: Unknown form validation error in design settings form.
-#: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
-#: actions/designadminpanel.php:100 actions/editapplication.php:144
-#: actions/emailsettings.php:311 actions/grouplogo.php:332
-#: actions/imsettings.php:256 actions/newapplication.php:124
-#: actions/oauthconnectionssettings.php:144 actions/recoverpassword.php:46
-#: actions/smssettings.php:270 lib/designsettings.php:133
 msgid "Unexpected form submission."
 msgstr "Beklenmeğen form girdisi."
 
 #. TRANS: Title for a page where a user can confirm/deny account access by an external application.
-#: actions/apioauthauthorize.php:387
 msgid "An application would like to connect to your account"
 msgstr "Bir uygulama hesabınıza bağlanmak istiyor"
 
 #. TRANS: Fieldset legend.
-#: actions/apioauthauthorize.php:404
 msgid "Allow or deny access"
 msgstr "Erişime izin verin ya da erişimi engelleyin"
 
 #. TRANS: User notification of external application requesting account access.
 #. TRANS: %3$s is the access type requested (read-write or read-only), %4$s is the StatusNet sitename.
-#: actions/apioauthauthorize.php:425
 #, fuzzy, php-format
 msgid ""
 "An application would like the ability to <strong>%3$s</strong> your %4$s "
@@ -943,7 +712,6 @@ msgstr ""
 #. TRANS: User notification of external application requesting account access.
 #. TRANS: %1$s is the application name requesting access, %2$s is the organisation behind the application,
 #. TRANS: %3$s is the access type requested, %4$s is the StatusNet sitename.
-#: actions/apioauthauthorize.php:433
 #, php-format
 msgid ""
 "The application <strong>%1$s</strong> by <strong>%2$s</strong> would like "
@@ -956,22 +724,18 @@ msgstr ""
 "vermelisiniz."
 
 #. TRANS: Fieldset legend.
-#: actions/apioauthauthorize.php:455
 msgctxt "LEGEND"
 msgid "Account"
 msgstr "Hesap"
 
 #. TRANS: Field label on OAuth API authorisation form.
+#. TRANS: Field label on login page.
 #. TRANS: Field label in form for profile settings.
-#: actions/apioauthauthorize.php:459 actions/login.php:225
-#: actions/profilesettings.php:107 actions/register.php:411
-#: actions/userauthorization.php:145 lib/groupeditform.php:145
 msgid "Nickname"
 msgstr "Takma ad"
 
 #. TRANS: Field label on OAuth API authorisation form.
-#: actions/apioauthauthorize.php:463 actions/login.php:228
-#: actions/register.php:415 lib/settingsnav.php:87
+#. TRANS: Field label on login page.
 msgid "Password"
 msgstr "Parola"
 
@@ -981,43 +745,34 @@ msgstr "Parola"
 #. TRANS: Button label to cancel an IM address confirmation procedure.
 #. TRANS: Button label to cancel a SMS address confirmation procedure.
 #. TRANS: Button label in the "Edit application" form.
-#: actions/apioauthauthorize.php:478 actions/emailsettings.php:125
-#: actions/imsettings.php:136 actions/smssettings.php:132
-#: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Cancel"
 msgstr "İptal"
 
 #. TRANS: Button text that when clicked will allow access to an account by an external application.
-#: actions/apioauthauthorize.php:485
 msgctxt "BUTTON"
 msgid "Allow"
 msgstr "İzin Ver"
 
 #. TRANS: Form instructions.
-#: actions/apioauthauthorize.php:502
 msgid "Authorize access to your account information."
 msgstr "Hesap bilgilerinize erişim için izin verin."
 
 #. TRANS: Header for user notification after revoking OAuth access to an application.
-#: actions/apioauthauthorize.php:594
 msgid "Authorization canceled."
 msgstr "Yetkilendirme iptal edildi."
 
 #. TRANS: User notification after revoking OAuth access to an application.
 #. TRANS: %s is an OAuth token.
-#: actions/apioauthauthorize.php:598
 #, php-format
 msgid "The request token %s has been revoked."
 msgstr "İstek belirteci %s, iptal edildi."
 
 #. TRANS: Title of the page notifying the user that an anonymous client application was successfully authorized to access the user's account with OAuth.
-#: actions/apioauthauthorize.php:621
 msgid "You have successfully authorized the application"
 msgstr "Uygulamayı başarılı bir şekilde yetkilendirdiniz"
 
 #. TRANS: Message notifying the user that an anonymous client application was successfully authorized to access the user's account with OAuth.
-#: actions/apioauthauthorize.php:625
 msgid ""
 "Please return to the application and enter the following security code to "
 "complete the process."
@@ -1027,14 +782,12 @@ msgstr ""
 
 #. TRANS: Title of the page notifying the user that the client application was successfully authorized to access the user's account with OAuth.
 #. TRANS: %s is the authorised application name.
-#: actions/apioauthauthorize.php:632
 #, php-format
 msgid "You have successfully authorized %s"
 msgstr "Başarıyla %s uygulamasını yetkilendirdiniz"
 
 #. TRANS: Message notifying the user that the client application was successfully authorized to access the user's account with OAuth.
 #. TRANS: %s is the authorised application name.
-#: actions/apioauthauthorize.php:639
 #, php-format
 msgid ""
 "Please return to %s and enter the following security code to complete the "
@@ -1045,12 +798,10 @@ msgstr ""
 
 #. TRANS: Client error displayed trying to delete a status not using POST or DELETE.
 #. TRANS: POST and DELETE should not be translated.
-#: actions/apistatusesdestroy.php:111
 msgid "This method requires a POST or DELETE."
 msgstr " Bu yöntem bir POST veya DELETE gerektirir."
 
 #. TRANS: Client error displayed trying to delete a status of another user.
-#: actions/apistatusesdestroy.php:136
 msgid "You may not delete another user's status."
 msgstr "Başka bir kullanıcının durum mesajını silemezsiniz."
 
@@ -1058,21 +809,16 @@ msgstr "Başka bir kullanıcının durum mesajını silemezsiniz."
 #. TRANS: Client error displayed trying to display redents of a non-exiting notice.
 #. TRANS: Client exception thrown when referencing a non-existing notice.
 #. TRANS: Error message displayed trying to delete a non-existing notice.
-#: actions/apistatusesretweet.php:74 actions/apistatusesretweets.php:70
-#: actions/atompubshowfavorite.php:82 actions/deletenotice.php:61
-#: actions/shownotice.php:92
 msgid "No such notice."
 msgstr "Böyle bir durum mesajı yok."
 
 #. TRANS: Client error displayed trying to repeat an own notice through the API.
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:549
 msgid "Cannot repeat your own notice."
 msgstr "Kendi durum mesajınızı tekrarlayamazsınız."
 
 #. TRANS: Client error displayed trying to re-repeat a notice through the API.
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:92 lib/command.php:555
 msgid "Already repeated that notice."
 msgstr "Bu durum mesajı zaten tekrarlanmış."
 
@@ -1082,71 +828,55 @@ msgstr "Bu durum mesajı zaten tekrarlanmış."
 #. TRANS: Client exception thrown when using an unsupported HTTP method.
 #. TRANS: Client error shown when using a non-supported HTTP method.
 #. TRANS: Client exception thrown when using an unsupported HTTP method.
-#: actions/apistatusesshow.php:118 actions/atompubfavoritefeed.php:103
-#: actions/atompubmembershipfeed.php:105 actions/atompubshowfavorite.php:117
-#: actions/atompubshowmembership.php:116
-#: actions/atompubshowsubscription.php:122
-#: actions/atompubsubscriptionfeed.php:109
 msgid "HTTP method not supported."
 msgstr "HTTP yöntemi desteklenmiyor."
 
 #. TRANS: Exception thrown requesting an unsupported notice output format.
 #. TRANS: %s is the requested output format.
-#: actions/apistatusesshow.php:144
 #, fuzzy, php-format
 msgid "Unsupported format: %s."
 msgstr "Desteklenmeyen biçim: %s"
 
 #. TRANS: Client error displayed requesting a deleted status.
-#: actions/apistatusesshow.php:155
 msgid "Status deleted."
 msgstr "Durum silindi."
 
 #. TRANS: Client error displayed requesting a status with an invalid ID.
-#: actions/apistatusesshow.php:162
 msgid "No status with that ID found."
 msgstr "Bu ID'li bir durum mesajı bulunamadı."
 
 #. TRANS: Client error displayed when trying to delete a notice not using the Atom format.
-#: actions/apistatusesshow.php:227
 msgid "Can only delete using the Atom format."
 msgstr "Yalnızca Atom biçimi kullanılarak silinebilir."
 
 #. TRANS: Client error displayed when a user has no rights to delete notices of other users.
 #. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
-#: actions/apistatusesshow.php:235 actions/deletenotice.php:78
 #, fuzzy
 msgid "Cannot delete this notice."
 msgstr "Bu durum mesajı silinemiyor."
 
 #. TRANS: Confirmation of notice deletion in API. %d is the ID (number) of the deleted notice.
-#: actions/apistatusesshow.php:249
 #, php-format
 msgid "Deleted notice %d"
 msgstr "%d durum mesajını sil"
 
 #. TRANS: Client error displayed when the parameter "status" is missing.
-#: actions/apistatusesupdate.php:221
 msgid "Client must provide a 'status' parameter with a value."
 msgstr "İstemci, bir değere sahip 'status' parametresi sağlamalı."
 
 #. TRANS: Client error displayed when the parameter "status" is missing.
 #. TRANS: %d is the maximum number of character for a notice.
-#: actions/apistatusesupdate.php:244 actions/newnotice.php:161
-#: lib/mailhandler.php:60
 #, php-format
 msgid "That's too long. Maximum notice size is %d character."
 msgid_plural "That's too long. Maximum notice size is %d characters."
 msgstr[0] "Bu çok uzun. En büyük durum mesajı boyutu %d karakterdir."
 
 #. TRANS: Client error displayed when replying to a non-existing notice.
-#: actions/apistatusesupdate.php:284
 msgid "Parent notice not found."
 msgstr "Üst durum mesajı bulunamadı."
 
 #. TRANS: Client error displayed exceeding the maximum notice length.
 #. TRANS: %d is the maximum lenth for a notice.
-#: actions/apistatusesupdate.php:308 actions/newnotice.php:184
 #, php-format
 msgid "Maximum notice size is %d character, including attachment URL."
 msgid_plural "Maximum notice size is %d characters, including attachment URL."
@@ -1155,13 +885,11 @@ msgstr[0] ""
 
 #. TRANS: Client error displayed when requesting profiles of followers in an unsupported format.
 #. TRANS: Client error displayed when requesting IDs of followers in an unsupported format.
-#: actions/apisubscriptions.php:228 actions/apisubscriptions.php:258
 msgid "Unsupported format."
 msgstr "Desteklenmeyen biçim."
 
 #. TRANS: Title for timeline of most recent favourite notices by a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname.
-#: actions/apitimelinefavorites.php:108
 #, php-format
 msgid "%1$s / Favorites from %2$s"
 msgstr "%1$s / %2$s kullanıcısının favorileri"
@@ -1169,14 +897,12 @@ msgstr "%1$s / %2$s kullanıcısının favorileri"
 #. TRANS: Subtitle for timeline of most recent favourite notices by a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user's full name,
 #. TRANS: %3$s is a user nickname.
-#: actions/apitimelinefavorites.php:120
 #, php-format
 msgid "%1$s updates favorited by %2$s / %3$s."
 msgstr "%2$s / %3$s tarafından favorilere eklenen %1$s güncellemeleri."
 
 #. TRANS: Title for timeline of most recent mentions of a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname.
-#: actions/apitimelinementions.php:115
 #, fuzzy, php-format
 msgid "%1$s / Updates mentioning %2$s"
 msgstr "%1$s'in %2$s'deki durum mesajları "
@@ -1184,49 +910,41 @@ msgstr "%1$s'in %2$s'deki durum mesajları "
 #. TRANS: Subtitle for timeline of most recent mentions of a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname,
 #. TRANS: %3$s is a user's full name.
-#: actions/apitimelinementions.php:131
 #, php-format
 msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr ""
 
 #. TRANS: Title for site timeline. %s is the StatusNet sitename.
 #. TRANS: Public RSS feed title. %s is the StatusNet site name.
-#: actions/apitimelinepublic.php:193 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "%s genel zaman çizelgesi"
 
 #. TRANS: Subtitle for site timeline. %s is the StatusNet sitename.
-#: actions/apitimelinepublic.php:199
 #, php-format
 msgid "%s updates from everyone!"
 msgstr ""
 
 #. TRANS: Server error displayed calling unimplemented API method for 'retweeted by me'.
-#: actions/apitimelineretweetedbyme.php:71
 #, fuzzy
 msgid "Unimplemented."
 msgstr "showForm() gerçeklenmemiş."
 
 #. TRANS: Title for Atom feed "repeated to me". %s is the user nickname.
-#: actions/apitimelineretweetedtome.php:96
 #, fuzzy, php-format
 msgid "Repeated to %s"
 msgstr "%s için cevaplar"
 
-#: actions/apitimelineretweetedtome.php:98
 #, fuzzy, php-format
 msgid "%1$s notices that were to repeated to %2$s / %3$s."
 msgstr "%2$s / %3$s tarafından favorilere eklenen %1$s güncellemeleri."
 
 #. TRANS: Title of list of repeated notices of the logged in user.
 #. TRANS: %s is the nickname of the logged in user.
-#: actions/apitimelineretweetsofme.php:98
 #, fuzzy, php-format
 msgid "Repeats of %s"
 msgstr "%s için cevaplar"
 
-#: actions/apitimelineretweetsofme.php:104
 #, fuzzy, php-format
 msgid "%1$s notices that %2$s / %3$s has repeated."
 msgstr "%1$s %2$s'da durumunuzu takip ediyor"
@@ -1235,78 +953,63 @@ msgstr "%1$s %2$s'da durumunuzu takip ediyor"
 #. TRANS: %s is the tag.
 #. TRANS: Title for first page of notices with tags.
 #. TRANS: %s is the tag.
-#: actions/apitimelinetag.php:101 actions/tag.php:69
 #, php-format
 msgid "Notices tagged with %s"
 msgstr "%s ile etiketli durum mesajları"
 
 #. TRANS: Subtitle for timeline with lastest notices with a given tag.
 #. TRANS: %1$s is the tag, $2$s is the StatusNet sitename.
-#: actions/apitimelinetag.php:105 actions/tagrss.php:65
 #, fuzzy, php-format
 msgid "Updates tagged with %1$s on %2$s!"
 msgstr "%s adli kullanicinin durum mesajlari"
 
 #. TRANS: Client error displayed trying to add a notice to another user's timeline.
-#: actions/apitimelineuser.php:308
 msgid "Only the user can add to their own timeline."
 msgstr ""
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:315
 msgid "Only accept AtomPub for Atom feeds."
 msgstr ""
 
 #. TRANS: Client error displayed attempting to post an empty API notice.
-#: actions/apitimelineuser.php:322
 msgid "Atom post must not be empty."
 msgstr ""
 
 #. TRANS: Client error displayed attempting to post an API that is not well-formed XML.
-#: actions/apitimelineuser.php:328
 msgid "Atom post must be well-formed XML."
 msgstr ""
 
 #. TRANS: Client error displayed when not using an Atom entry.
-#: actions/apitimelineuser.php:334 actions/atompubfavoritefeed.php:228
-#: actions/atompubmembershipfeed.php:230
-#: actions/atompubsubscriptionfeed.php:236
 msgid "Atom post must be an Atom entry."
 msgstr ""
 
 #. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
-#: actions/apitimelineuser.php:345
 msgid "Can only handle POST activities."
 msgstr ""
 
 #. TRANS: Client error displayed when using an unsupported activity object type.
 #. TRANS: %s is the unsupported activity object type.
-#: actions/apitimelineuser.php:356
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
 #. TRANS: %d is the notice ID (number).
-#: actions/apitimelineuser.php:390
 #, fuzzy, php-format
 msgid "No content for notice %d."
 msgstr "Eğer lisansı kabul etmezseniz kayıt olamazsınız."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
 #. TRANS: %s is the notice URI.
-#: actions/apitimelineuser.php:419
 #, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr ""
 
 #. TRANS: Server error for unfinished API method showTrends.
-#: actions/apitrends.php:85
 msgid "API method under construction."
 msgstr "UPA metodu yapım aşamasında."
 
 #. TRANS: Client error displayed when requesting user information for a non-existing user.
-#: actions/apiuserprofileimage.php:80 actions/apiusershow.php:94
 #, fuzzy
 msgid "User not found."
 msgstr "Onay kodu bulunamadı."
@@ -1314,103 +1017,85 @@ msgstr "Onay kodu bulunamadı."
 #. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
 #. TRANS: Client exception.
 #. TRANS: Client error displayed trying to subscribe to a non-existing profile.
-#: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
-#: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
-#: actions/subscribe.php:110
 #, fuzzy
 msgid "No such profile."
 msgstr "Böyle bir durum mesajı yok."
 
 #. TRANS: Subtitle for Atom favorites feed.
 #. TRANS: %1$s is a user nickname, %2$s is the StatusNet sitename.
-#: actions/atompubfavoritefeed.php:147
 #, fuzzy, php-format
 msgid "Notices %1$s has favorited on %2$s"
 msgstr "%2$s üzerindeki %1$s ve arkadaşlarından güncellemeler!"
 
 #. TRANS: Client exception thrown when trying to set a favorite for another user.
 #. TRANS: Client exception thrown when trying to subscribe another user.
-#: actions/atompubfavoritefeed.php:217 actions/atompubsubscriptionfeed.php:225
 #, fuzzy
 msgid "Cannot add someone else's subscription."
 msgstr "Yeni abonelik eklenemedi."
 
 #. TRANS: Client exception thrown when trying use an incorrect activity verb for the Atom pub method.
-#: actions/atompubfavoritefeed.php:240
 #, fuzzy
 msgid "Can only handle favorite activities."
 msgstr "Durum mesajını kaydederken hata oluştu."
 
 #. TRANS: Client exception thrown when trying favorite an object that is not a notice.
-#: actions/atompubfavoritefeed.php:250 actions/atompubmembershipfeed.php:250
 #, fuzzy
 msgid "Can only fave notices."
 msgstr "Durum mesajını kaydederken hata oluştu."
 
 #. TRANS: Client exception thrown when trying favorite a notice without content.
-#: actions/atompubfavoritefeed.php:259
 #, fuzzy
 msgid "Unknown note."
 msgstr "Böyle bir durum mesajı yok."
 
 #. TRANS: Client exception thrown when trying favorite an already favorited notice.
-#: actions/atompubfavoritefeed.php:267
 #, fuzzy
 msgid "Already a favorite."
 msgstr "Favorilere ekle"
 
 #. TRANS: Title for group membership feed.
 #. TRANS: %s is a username.
-#: actions/atompubmembershipfeed.php:144
 #, fuzzy, php-format
 msgid "%s group memberships"
 msgstr "%s grup üyeleri"
 
 #. TRANS: Subtitle for group membership feed.
 #. TRANS: %1$s is a username, %2$s is the StatusNet sitename.
-#: actions/atompubmembershipfeed.php:149
 #, fuzzy, php-format
 msgid "Groups %1$s is a member of on %2$s"
 msgstr "%2$s kullanıcısının üye olduğu %1$s grupları."
 
 #. TRANS: Client exception thrown when trying subscribe someone else to a group.
-#: actions/atompubmembershipfeed.php:219
 #, fuzzy
 msgid "Cannot add someone else's membership."
 msgstr "Yeni abonelik eklenemedi."
 
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#: actions/atompubmembershipfeed.php:242
 #, fuzzy
 msgid "Can only handle join activities."
 msgstr "Durum mesajını kaydederken hata oluştu."
 
 #. TRANS: Client exception thrown when trying to subscribe to a non-existing group.
-#: actions/atompubmembershipfeed.php:259
 #, fuzzy
 msgid "Unknown group."
 msgstr "Yeni grup"
 
 #. TRANS: Client exception thrown when trying to subscribe to an already subscribed group.
-#: actions/atompubmembershipfeed.php:267
 #, fuzzy
 msgid "Already a member."
 msgstr "Tüm üyeler"
 
 #. TRANS: Client exception thrown when trying to subscribe to group while blocked from that group.
-#: actions/atompubmembershipfeed.php:275
 msgid "Blocked by admin."
 msgstr ""
 
 #. TRANS: Client exception thrown when referencing a non-existing favorite.
-#: actions/atompubshowfavorite.php:90
 #, fuzzy
 msgid "No such favorite."
 msgstr "Böyle bir dosya yok."
 
 #. TRANS: Client exception thrown when trying to remove a favorite notice of another user.
-#: actions/atompubshowfavorite.php:151
 #, fuzzy
 msgid "Cannot delete someone else's favorite."
 msgstr "Favori silinemedi."
@@ -1437,93 +1122,68 @@ msgstr "Favori silinemedi."
 #. TRANS: Client error displayed when trying to join a non-existing group.
 #. TRANS: Client error displayed when trying to leave a non-local group.
 #. TRANS: Client error displayed when trying to leave a non-existing group.
+#. TRANS: Client error displayed when providing an invalid group ID on the Make Admin page.
 #. 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.
 #. TRANS: Command exception text shown when a group is requested that does not exist.
 #. TRANS: Error text shown when trying to leave a group that does not exist.
-#: actions/atompubshowmembership.php:81 actions/blockedfromgroup.php:81
-#: actions/blockedfromgroup.php:89 actions/deletegroup.php:87
-#: actions/deletegroup.php:100 actions/editgroup.php:102
-#: actions/foafgroup.php:46 actions/foafgroup.php:65 actions/foafgroup.php:73
-#: actions/groupblock.php:89 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:101 actions/grouplogo.php:103
-#: actions/groupmembers.php:84 actions/groupmembers.php:92
-#: actions/grouprss.php:97 actions/grouprss.php:105
-#: actions/groupunblock.php:89 actions/joingroup.php:82
-#: actions/joingroup.php:95 actions/leavegroup.php:82
-#: actions/leavegroup.php:95 actions/makeadmin.php:86
-#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:392
 msgid "No such group."
 msgstr "Böyle bir kullanıcı yok."
 
 #. TRANS: Client exception thrown when trying to show membership of a non-subscribed group
-#: actions/atompubshowmembership.php:91
 #, fuzzy
 msgid "Not a member."
 msgstr "Tüm üyeler"
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
-#: actions/atompubshowmembership.php:150
 #, fuzzy
 msgid "Cannot delete someone else's membership."
 msgstr "Yeni abonelik eklenemedi."
 
 #. TRANS: Client exception thrown when trying to display a subscription for a non-existing profile ID.
 #. TRANS: %d is the non-existing profile ID number.
-#: actions/atompubshowsubscription.php:72
-#: actions/atompubshowsubscription.php:83
-#: actions/atompubsubscriptionfeed.php:74
 #, fuzzy, php-format
 msgid "No such profile id: %d."
 msgstr "Böyle bir durum mesajı yok."
 
 #. 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.
-#: actions/atompubshowsubscription.php:94
 #, fuzzy, php-format
 msgid "Profile %1$d not subscribed to profile %2$d."
 msgstr "Bize o profili yollamadınız"
 
 #. TRANS: Client exception thrown when trying to delete a subscription of another user.
-#: actions/atompubshowsubscription.php:157
 #, fuzzy
 msgid "Cannot delete someone else's subscription."
 msgstr "Yeni abonelik eklenemedi."
 
 #. TRANS: Subtitle for Atom subscription feed.
 #. TRANS: %1$s is a user nickname, %s$s is the StatusNet sitename.
-#: actions/atompubsubscriptionfeed.php:153
 #, fuzzy, php-format
 msgid "People %1$s has subscribed to on %2$s"
 msgstr "Uzaktan abonelik"
 
 #. TRANS: Client error displayed when not using the follow verb.
-#: actions/atompubsubscriptionfeed.php:248
 msgid "Can only handle Follow activities."
 msgstr ""
 
 #. TRANS: Client exception thrown when subscribing to an object that is not a person.
-#: actions/atompubsubscriptionfeed.php:256
 msgid "Can only follow people."
 msgstr ""
 
 #. TRANS: Client exception thrown when subscribing to a non-existing profile.
 #. TRANS: %s is the unknown profile ID.
-#: actions/atompubsubscriptionfeed.php:267
 #, fuzzy, php-format
 msgid "Unknown profile %s."
 msgstr "Kullanıcının profili yok."
 
 #. TRANS: Client error displayed trying to subscribe to an already subscribed profile.
 #. TRANS: %s is the profile the user already has a subscription on.
-#: actions/atompubsubscriptionfeed.php:275
 #, fuzzy, php-format
 msgid "Already subscribed to %s."
 msgstr "Zaten abone olunmuş!"
 
 #. TRANS: Client error displayed trying to get a non-existing attachment.
-#: actions/attachment.php:73
 msgid "No such attachment."
 msgstr "Böyle bir durum mesajı yok."
 
@@ -1535,31 +1195,23 @@ msgstr "Böyle bir durum mesajı yok."
 #. TRANS: Client error displayed when trying to view group members without providing a group nickname.
 #. TRANS: Client error displayed when requesting a group RSS feed without providing a group nickname.
 #. TRANS: Client error displayed if no nickname argument was given requesting a group page.
-#: actions/avatarbynickname.php:60 actions/blockedfromgroup.php:73
-#: actions/editgroup.php:85 actions/groupdesignsettings.php:84
-#: actions/grouplogo.php:86 actions/groupmembers.php:76
-#: actions/grouprss.php:89 actions/showgroup.php:116
 msgid "No nickname."
 msgstr "Takma ad yok"
 
 #. TRANS: Client error displayed trying to get an avatar without providing an avatar size.
-#: actions/avatarbynickname.php:66
 msgid "No size."
 msgstr "Boyut yok."
 
 #. TRANS: Client error displayed trying to get an avatar providing an invalid avatar size.
-#: actions/avatarbynickname.php:72
 msgid "Invalid size."
 msgstr "Geçersiz büyüklük."
 
 #. TRANS: Title for avatar upload page.
-#: actions/avatarsettings.php:66 lib/settingsnav.php:82
 msgid "Avatar"
 msgstr "Avatar"
 
 #. TRANS: Instruction for avatar upload page.
 #. TRANS: %s is the maximum file size, for example "500b", "10kB" or "2MB".
-#: actions/avatarsettings.php:78
 #, php-format
 msgid "You can upload your personal avatar. The maximum file size is %s."
 msgstr ""
@@ -1569,9 +1221,6 @@ msgstr ""
 #. TRANS: Server error displayed coming across a request from a user without a profile.
 #. TRANS: Server error displayed when trying to authorise a remote subscription request
 #. TRANS: while the user has no profile.
-#: actions/avatarsettings.php:108 actions/avatarsettings.php:192
-#: actions/grouplogo.php:184 actions/remotesubscribe.php:190
-#: actions/userauthorization.php:75 actions/userrss.php:108
 #, fuzzy
 msgid "User without matching profile."
 msgstr "Kullanıcının profili yok."
@@ -1579,8 +1228,6 @@ msgstr "Kullanıcının profili yok."
 #. TRANS: Avatar upload page form legend.
 #. TRANS: Avatar upload page crop form legend.
 #. TRANS: Legend for group logo settings fieldset.
-#: actions/avatarsettings.php:122 actions/avatarsettings.php:205
-#: actions/grouplogo.php:261
 msgid "Avatar settings"
 msgstr "Profil ayarları"
 
@@ -1588,8 +1235,6 @@ msgstr "Profil ayarları"
 #. TRANS: Header on avatar upload crop form for thumbnail of originally uploaded avatar (h2).
 #. TRANS: Uploaded original file in group logo form.
 #. TRANS: Header for originally uploaded file before a crop on the group logo page.
-#: actions/avatarsettings.php:131 actions/avatarsettings.php:214
-#: actions/grouplogo.php:207 actions/grouplogo.php:270
 msgid "Original"
 msgstr "Orijinal"
 
@@ -1597,82 +1242,67 @@ msgstr "Orijinal"
 #. TRANS: Header on avatar upload crop form for thumbnail of to be used rendition of uploaded avatar (h2).
 #. TRANS: Header for preview of to be displayed group logo.
 #. TRANS: Header for the cropped group logo on the group logo page.
-#: actions/avatarsettings.php:147 actions/avatarsettings.php:227
-#: actions/grouplogo.php:219 actions/grouplogo.php:283
 msgid "Preview"
 msgstr "Önizleme"
 
 #. TRANS: Button on avatar upload page to delete current avatar.
 #. TRANS: Button text for user account deletion.
-#: actions/avatarsettings.php:155 actions/deleteaccount.php:319
 msgctxt "BUTTON"
 msgid "Delete"
 msgstr "Sil"
 
 #. TRANS: Button on avatar upload page to upload an avatar.
 #. TRANS: Submit button to confirm upload of a user backup file for account restore.
-#: actions/avatarsettings.php:173 actions/restoreaccount.php:369
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Upload"
 msgstr "Yükle"
 
 #. TRANS: Button on avatar upload crop form to confirm a selected crop as avatar.
-#: actions/avatarsettings.php:243
 msgctxt "BUTTON"
 msgid "Crop"
 msgstr "Kırp"
 
 #. TRANS: Validation error on avatar upload form when no file was uploaded.
-#: actions/avatarsettings.php:318
 msgid "No file uploaded."
 msgstr "Hiçbir dosya yüklenmedi."
 
 #. TRANS: Avatar upload form instruction after uploading a file.
-#: actions/avatarsettings.php:345
 #, fuzzy
 msgid "Pick a square area of the image to be your avatar."
 msgstr "Resimden kullanıcı resminiz olacak bir kare alanı seçin"
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
 #. TRANS: Server error displayed trying to crop an uploaded group logo that is no longer present.
-#: actions/avatarsettings.php:360 actions/grouplogo.php:391
 msgid "Lost our file data."
 msgstr ""
 
 #. TRANS: Success message for having updated a user avatar.
-#: actions/avatarsettings.php:384
 msgid "Avatar updated."
 msgstr "Avatar güncellendi."
 
 #. TRANS: Error displayed on the avatar upload page if the avatar could not be updated for an unknown reason.
-#: actions/avatarsettings.php:388
 msgid "Failed updating avatar."
 msgstr "Avatar güncellemede hata."
 
 #. TRANS: Success message for deleting a user avatar.
-#: actions/avatarsettings.php:412
 msgid "Avatar deleted."
 msgstr "Kullanıcı resmi silindi."
 
 #. TRANS: Title for backup account page.
 #. TRANS: Option in profile settings to create a backup of the account of the currently logged in user.
-#: actions/backupaccount.php:61 actions/profilesettings.php:468
 msgid "Backup account"
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to backup an account while not logged in.
-#: actions/backupaccount.php:79
 msgid "Only logged-in users can backup their account."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to backup an account without having backup rights.
-#: actions/backupaccount.php:84
 msgid "You may not backup your account."
 msgstr ""
 
 #. TRANS: Information displayed on the backup account page.
-#: actions/backupaccount.php:227
 msgid ""
 "You can backup your account data in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format. This is an experimental feature and provides "
@@ -1682,31 +1312,26 @@ msgid ""
 msgstr ""
 
 #. TRANS: Submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:250
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Backup"
 msgstr "Arkaplan"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:254
 msgid "Backup your account."
 msgstr ""
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
-#: actions/block.php:68
 msgid "You already blocked that user."
 msgstr "Jabber ID başka bir kullanıcıya ait."
 
 #. TRANS: Title for block user page.
 #. TRANS: Legend for block user form.
 #. TRANS: Fieldset legend for block user from group form.
-#: actions/block.php:106 actions/block.php:136 actions/groupblock.php:165
 msgid "Block user"
 msgstr "Kullanıcıyı engelle"
 
 #. TRANS: Explanation of consequences when blocking a user on the block user page.
-#: actions/block.php:139
 msgid ""
 "Are you sure you want to block this user? Afterwards, they will be "
 "unsubscribed from you, unable to subscribe to you in the future, and you "
@@ -1723,15 +1348,11 @@ msgstr ""
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:154 actions/deleteapplication.php:157
-#: actions/deletegroup.php:220 actions/deletenotice.php:155
-#: actions/deleteuser.php:154 actions/groupblock.php:187
 msgctxt "BUTTON"
 msgid "No"
 msgstr "Hayır"
 
 #. TRANS: Submit button title for 'No' when blocking a user.
-#: actions/block.php:158
 #, fuzzy
 msgid "Do not block this user."
 msgstr "Bu kullanıcıyı engelleme"
@@ -1742,50 +1363,40 @@ msgstr "Bu kullanıcıyı engelleme"
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:161 actions/deleteapplication.php:164
-#: actions/deletegroup.php:227 actions/deletenotice.php:162
-#: actions/deleteuser.php:161 actions/groupblock.php:194
 msgctxt "BUTTON"
 msgid "Yes"
 msgstr "Evet"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:165
 #, fuzzy
 msgid "Block this user."
 msgstr "Bu kullanıcıyı engelle"
 
 #. TRANS: Server error displayed when blocking a user fails.
-#: actions/block.php:189
 msgid "Failed to save block information."
 msgstr "Engelleme bilgisinin kaydedilmesi başarısızlığa uğradı."
 
 #. TRANS: Title for first page with list of users blocked from a group.
 #. TRANS: %s is a group nickname.
-#: actions/blockedfromgroup.php:101
 #, php-format
 msgid "%s blocked profiles"
 msgstr "%s engellenmiş profil"
 
 #. TRANS: Title for any but the first page with list of users blocked from a group.
 #. TRANS: %1$s is a group nickname, %2$d is a page number.
-#: actions/blockedfromgroup.php:106
 #, fuzzy, php-format
 msgid "%1$s blocked profiles, page %2$d"
 msgstr "%s ve arkadaşları"
 
 #. TRANS: Instructions for list of users blocked from a group.
-#: actions/blockedfromgroup.php:122
 msgid "A list of the users blocked from joining this group."
 msgstr "Bu gruba katılması engellenmiş kullanıcıların bir listesi."
 
 #. TRANS: Form legend for unblocking a user from a group.
-#: actions/blockedfromgroup.php:291
 msgid "Unblock user from group"
 msgstr "Kullanıcının gruba üye olma engellemesini kaldır"
 
 #. TRANS: Button text for unblocking a user from a group.
-#: actions/blockedfromgroup.php:323
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Unblock"
@@ -1793,129 +1404,103 @@ msgstr "Engellemeyi Kaldır"
 
 #. TRANS: Tooltip for button for unblocking a user from a group.
 #. TRANS: Description of the form to unblock a user.
-#: actions/blockedfromgroup.php:327 lib/unblockform.php:78
 msgid "Unblock this user"
 msgstr "Bu kullanıcının engellemesini kaldır"
 
 #. TRANS: Title for mini-posting window loaded from bookmarklet.
 #. TRANS: %s is the StatusNet site name.
-#: actions/bookmarklet.php:51
 #, fuzzy, php-format
 msgid "Post to %s"
 msgstr "%s için cevaplar"
 
 #. TRANS: Client error displayed when not providing a confirmation code in the contact address confirmation action.
-#: actions/confirmaddress.php:74
 msgid "No confirmation code."
 msgstr "Onay kodu yok."
 
 #. TRANS: Client error displayed when providing a non-existing confirmation code in the contact address confirmation action.
-#: actions/confirmaddress.php:80
 msgid "Confirmation code not found."
 msgstr "Onay kodu bulunamadı."
 
 #. TRANS: Client error displayed when not providing a confirmation code for another user in the contact address confirmation action.
-#: actions/confirmaddress.php:86
 msgid "That confirmation code is not for you!"
 msgstr "O onay kodu sizin için değil!"
 
 #. TRANS: Server error for an unknown address type, which can be 'email', 'sms', or the name of an IM network (such as 'xmpp' or 'aim')
-#: actions/confirmaddress.php:94
-#, fuzzy, php-format
+#, php-format
 msgid "Unrecognized address type %s"
 msgstr "Tanınmayan adres türü %s."
 
 #. TRANS: Client error for an already confirmed email/jabber/sms address.
-#: actions/confirmaddress.php:103 actions/confirmaddress.php:136
 msgid "That address has already been confirmed."
 msgstr "O adres daha önce onaylanmış."
 
-#: actions/confirmaddress.php:121 actions/imsettings.php:444
-#: actions/userdesignsettings.php:306
-#, fuzzy
 msgid "Couldn't update user."
 msgstr "Kullanıcı güncellenemedi."
 
-#: actions/confirmaddress.php:144
 #, fuzzy
 msgid "Couldn't update user im preferences."
 msgstr "Kullanıcı kayıtları güncellenemedi."
 
-#: actions/confirmaddress.php:156
 #, fuzzy
 msgid "Couldn't insert user im preferences."
 msgstr "Yeni abonelik eklenemedi."
 
 #. TRANS: Server error displayed when an address confirmation code deletion from the
 #. TRANS: database fails in the contact address confirmation action.
-#: actions/confirmaddress.php:169
 #, fuzzy
 msgid "Could not delete address confirmation."
 msgstr "Eposta onayı silinemedi."
 
 #. TRANS: Title for the contact address confirmation action.
-#: actions/confirmaddress.php:185
 msgid "Confirm address"
 msgstr "Onayla"
 
 #. TRANS: Success message for the contact address confirmation action.
 #. TRANS: %s can be 'email', 'jabber', or 'sms'.
-#: actions/confirmaddress.php:200
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "\"%s\" adresi hesabınız için onaylandı."
 
 #. TRANS: Title for page with a conversion (multiple notices in context).
-#: actions/conversation.php:96
 msgid "Conversation"
 msgstr "Konuşma"
 
 #. TRANS: Header on conversation page. Hidden by default (h2).
 #. TRANS: Label for user statistics.
-#: actions/conversation.php:149 lib/noticelist.php:87
-#: lib/profileaction.php:246 lib/searchgroupnav.php:82
-#: lib/threadednoticelist.php:66
 msgid "Notices"
 msgstr "Durum mesajları"
 
 #. TRANS: Client exception displayed trying to delete a user account while not logged in.
-#: actions/deleteaccount.php:71
 msgid "Only logged-in users can delete their account."
 msgstr ""
 
 #. TRANS: Client exception displayed trying to delete a user account without have the rights to do that.
-#: actions/deleteaccount.php:77
 #, fuzzy
 msgid "You cannot delete your account."
 msgstr "Kullanıcıları silemezsiniz."
 
 #. TRANS: Confirmation text for user deletion. The user has to type this exactly the same, including punctuation.
-#: actions/deleteaccount.php:160 actions/deleteaccount.php:297
 msgid "I am sure."
 msgstr ""
 
 #. TRANS: Notification for user about the text that must be input to be able to delete a user account.
 #. TRANS: %s is the text that needs to be input.
-#: actions/deleteaccount.php:164
 #, php-format
 msgid "You must write \"%s\" exactly in the box."
 msgstr ""
 
 #. TRANS: Confirmation that a user account has been deleted.
-#: actions/deleteaccount.php:206
 #, fuzzy
 msgid "Account deleted."
 msgstr "Kullanıcı resmi silindi."
 
 #. TRANS: Page title for page on which a user account can be deleted.
 #. TRANS: Option in profile settings to delete the account of the currently logged in user.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:476
 #, fuzzy
 msgid "Delete account"
 msgstr "Bir hesap oluştur"
 
 #. TRANS: Form text for user deletion form.
-#: actions/deleteaccount.php:279
 msgid ""
 "This will <strong>permanently delete</strong> your account data from this "
 "server."
@@ -1923,7 +1508,6 @@ msgstr ""
 
 #. TRANS: Additional form text for user deletion form shown if a user has account backup rights.
 #. TRANS: %s is a URL to the backup page.
-#: actions/deleteaccount.php:285
 #, php-format
 msgid ""
 "You are strongly advised to <a href=\"%s\">back up your data</a> before "
@@ -1932,56 +1516,43 @@ msgstr ""
 
 #. TRANS: Field label for delete account confirmation entry.
 #. TRANS: Field label for password reset form where the password has to be typed again.
-#: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:262 actions/register.php:419
 msgid "Confirm"
 msgstr "Onayla"
 
 #. TRANS: Input title for the delete account field.
 #. TRANS: %s is the text that needs to be input.
-#: actions/deleteaccount.php:304
 #, fuzzy, php-format
 msgid "Enter \"%s\" to confirm that you want to delete your account."
 msgstr "Kullanıcıları silemezsiniz."
 
 #. TRANS: Button title for user account deletion.
-#: actions/deleteaccount.php:323
 #, fuzzy
 msgid "Permanently delete your account"
 msgstr "Kullanıcıları silemezsiniz."
 
 #. TRANS: Client error displayed trying to delete an application while not logged in.
-#: actions/deleteapplication.php:62
 msgid "You must be logged in to delete an application."
 msgstr "Bir uygulamayı silmek için giriş yapmış olmanız gerekir."
 
 #. TRANS: Client error displayed trying to delete an application that does not exist.
-#: actions/deleteapplication.php:71
 msgid "Application not found."
 msgstr "Onay kodu bulunamadı."
 
 #. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
-#: actions/deleteapplication.php:79 actions/editapplication.php:78
-#: actions/showapplication.php:90
 msgid "You are not the owner of this application."
 msgstr "Bu uygulamanın sahibi değilsiniz."
 
 #. TRANS: Client error text when there is a problem with the session token.
-#: actions/deleteapplication.php:102 actions/editapplication.php:131
-#: actions/newapplication.php:112 actions/showapplication.php:113
-#: lib/action.php:1391
 msgid "There was a problem with your session token."
 msgstr ""
 
 #. TRANS: Title for delete application page.
 #. TRANS: Fieldset legend on delete application page.
-#: actions/deleteapplication.php:124 actions/deleteapplication.php:149
 msgid "Delete application"
 msgstr "Uygulamayı sil"
 
 #. TRANS: Confirmation text on delete application page.
-#: actions/deleteapplication.php:152
 msgid ""
 "Are you sure you want to delete this application? This will clear all data "
 "about the application from the database, including all existing user "
@@ -1992,19 +1563,16 @@ msgstr ""
 "temizleyecektir."
 
 #. TRANS: Submit button title for 'No' when deleting an application.
-#: actions/deleteapplication.php:161
 #, fuzzy
 msgid "Do not delete this application."
 msgstr "Bu uygulamayı silme"
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
-#: actions/deleteapplication.php:167
 #, fuzzy
 msgid "Delete this application."
 msgstr "Bu uygulamayı sil"
 
 #. TRANS: Client error when trying to delete group while not logged in.
-#: actions/deletegroup.php:64
 #, fuzzy
 msgid "You must be logged in to delete a group."
 msgstr "Bir grup oluşturmak için giriş yapmış olmanız gerekir."
@@ -2012,41 +1580,34 @@ msgstr "Bir grup oluşturmak için giriş yapmış olmanız gerekir."
 #. TRANS: Client error when trying to delete a group without providing a nickname or ID for the group.
 #. TRANS: Client error displayed when trying to join a group without providing a group name or group ID.
 #. TRANS: Client error displayed when trying to leave a group without providing a group name or group ID.
-#: actions/deletegroup.php:94 actions/joingroup.php:89
-#: actions/leavegroup.php:89
 #, fuzzy
 msgid "No nickname or ID."
 msgstr "Takma ad yok"
 
 #. TRANS: Client error when trying to delete a group without having the rights to delete it.
-#: actions/deletegroup.php:107
 #, fuzzy
 msgid "You are not allowed to delete this group."
 msgstr "Bu grubun bir üyesi değilsiniz."
 
 #. TRANS: Server error displayed if a group could not be deleted.
 #. TRANS: %s is the name of the group that could not be deleted.
-#: actions/deletegroup.php:150
 #, fuzzy, php-format
 msgid "Could not delete group %s."
 msgstr "Grup güncellenemedi."
 
 #. TRANS: Message given after deleting a group.
 #. TRANS: %s is the deleted group's name.
-#: actions/deletegroup.php:159
 #, fuzzy, php-format
 msgid "Deleted group %s"
 msgstr "%1$s'in %2$s'deki durum mesajları "
 
 #. TRANS: Title of delete group page.
 #. TRANS: Form legend for deleting a group.
-#: actions/deletegroup.php:176 actions/deletegroup.php:202
 #, fuzzy
 msgid "Delete group"
 msgstr "Kullanıcıyı sil"
 
 #. TRANS: Warning in form for deleleting a group.
-#: actions/deletegroup.php:206
 #, fuzzy
 msgid ""
 "Are you sure you want to delete this group? This will clear all data about "
@@ -2057,13 +1618,11 @@ msgstr ""
 "kullanıcıya ait tüm verileri herhangi bir yedek olmaksızın temizleyecektir."
 
 #. TRANS: Submit button title for 'No' when deleting a group.
-#: actions/deletegroup.php:224
 #, fuzzy
 msgid "Do not delete this group."
 msgstr "Bu durum mesajını silme"
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
-#: actions/deletegroup.php:231
 #, fuzzy
 msgid "Delete this group."
 msgstr "Bu kullanıcıyı sil"
@@ -2074,22 +1633,18 @@ msgstr "Bu kullanıcıyı sil"
 #. TRANS: Client error displayed trying to block a user from a group while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying to log out when not logged in.
+#. TRANS: Client error displayed when trying to access the "make admin" page while not logged in.
+#. TRANS: Client error displayed trying to create a new direct message while not logged in.
+#. TRANS: Client error displayed trying to send a notice while not logged in.
+#. TRANS: Client error displayed trying to nudge a user without being logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
 #. TRANS: Client error displayed when trying to change user options while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
-#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:70
-#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
-#: actions/nudge.php:63 actions/pluginenable.php:97 actions/subedit.php:33
-#: actions/subscribe.php:98 actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:71 lib/profileformaction.php:63
-#: lib/settingsaction.php:72
 msgid "Not logged in."
 msgstr "Giriş yapılmadı."
 
 #. TRANS: Instructions for deleting a notice.
-#: actions/deletenotice.php:110
 msgid ""
 "You are about to permanently delete a notice. Once this is done, it cannot "
 "be undone."
@@ -2099,51 +1654,42 @@ msgstr ""
 
 #. TRANS: Page title when deleting a notice.
 #. TRANS: Fieldset legend for the delete notice form.
-#: actions/deletenotice.php:117 actions/deletenotice.php:148
 msgid "Delete notice"
 msgstr "Durum mesajını sil"
 
 #. TRANS: Message for the delete notice form.
-#: actions/deletenotice.php:152
 msgid "Are you sure you want to delete this notice?"
 msgstr "Bu durum mesajını silmek istediğinizden emin misiniz?"
 
 #. TRANS: Submit button title for 'No' when deleting a notice.
-#: actions/deletenotice.php:159
 #, fuzzy
 msgid "Do not delete this notice."
 msgstr "Bu durum mesajını silme"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:166
 #, fuzzy
 msgid "Delete this notice."
 msgstr "Bu durum mesajını sil"
 
 #. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
-#: actions/deleteuser.php:66
 msgid "You cannot delete users."
 msgstr "Kullanıcıları silemezsiniz."
 
 #. TRANS: Client error displayed when trying to delete a non-local user.
-#: actions/deleteuser.php:74
 msgid "You can only delete local users."
 msgstr "Sadece yerel kullanıcıları silebilirsiniz."
 
 #. TRANS: Title of delete user page.
-#: actions/deleteuser.php:110
 #, fuzzy
 msgctxt "TITLE"
 msgid "Delete user"
 msgstr "Kullanıcıyı sil"
 
 #. TRANS: Fieldset legend on delete user page.
-#: actions/deleteuser.php:134
 msgid "Delete user"
 msgstr "Kullanıcıyı sil"
 
 #. TRANS: Information text to request if a user is certain that the described action has to be performed.
-#: actions/deleteuser.php:138
 msgid ""
 "Are you sure you want to delete this user? This will clear all data about "
 "the user from the database, without a backup."
@@ -2152,100 +1698,81 @@ msgstr ""
 "kullanıcıya ait tüm verileri herhangi bir yedek olmaksızın temizleyecektir."
 
 #. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/deleteuser.php:158
 #, fuzzy
 msgid "Do not delete this user."
 msgstr "Bu durum mesajını silme"
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
-#: actions/deleteuser.php:165
 #, fuzzy
 msgid "Delete this user."
 msgstr "Bu kullanıcıyı sil"
 
 #. TRANS: Message used as title for design settings for the site.
-#: actions/designadminpanel.php:60 lib/settingsnav.php:97
 msgid "Design"
 msgstr "Dizayn"
 
 #. TRANS: Instructions for design adminsitration panel.
-#: actions/designadminpanel.php:71
 msgid "Design settings for this StatusNet site"
 msgstr ""
 
 #. TRANS: Client error displayed when a logo URL does is not valid.
-#: actions/designadminpanel.php:327
 msgid "Invalid logo URL."
 msgstr "Geçersiz logo bağlantısı."
 
 #. TRANS: Client error displayed when an SSL logo URL is invalid.
-#: actions/designadminpanel.php:333
 #, fuzzy
 msgid "Invalid SSL logo URL."
 msgstr "Geçersiz logo bağlantısı."
 
 #. TRANS: Client error displayed when a theme is submitted through the form that is not in the theme list.
 #. TRANS: %s is the chosen unavailable theme.
-#: actions/designadminpanel.php:339
 #, php-format
 msgid "Theme not available: %s."
 msgstr "Tema mevcut değil: %s"
 
 #. TRANS: Fieldset legend for form to change logo.
-#: actions/designadminpanel.php:437
 msgid "Change logo"
 msgstr "Değiştir"
 
 #. TRANS: Field label for StatusNet site logo.
-#: actions/designadminpanel.php:444
 msgid "Site logo"
 msgstr "Site logosu"
 
 #. TRANS: Field label for SSL StatusNet site logo.
-#: actions/designadminpanel.php:452
 msgid "SSL logo"
 msgstr "SSL logosu"
 
 #. TRANS: Fieldset legend for form change StatusNet site's theme.
-#: actions/designadminpanel.php:467
 msgid "Change theme"
 msgstr "Temayı değiştir"
 
 #. TRANS: Field label for dropdown to choose site theme.
-#: actions/designadminpanel.php:485
 msgid "Site theme"
 msgstr "Site teması"
 
 #. TRANS: Title for field label for dropdown to choose site theme.
-#: actions/designadminpanel.php:487
 msgid "Theme for the site."
 msgstr "Site için tema."
 
 #. TRANS: Field label for uploading a cutom theme.
-#: actions/designadminpanel.php:494
 msgid "Custom theme"
 msgstr "Özel tema"
 
 #. TRANS: Form instructions for uploading a cutom StatusNet theme.
-#: actions/designadminpanel.php:499
 msgid "You can upload a custom StatusNet theme as a .ZIP archive."
 msgstr "Özel bir StatusNet temasını .ZIP arşivi olarak yükleyebilirsiniz."
 
 #. TRANS: Fieldset legend for theme background image.
-#: actions/designadminpanel.php:515
 msgid "Change background image"
 msgstr "Arkaplan resmini değiştir"
 
 #. TRANS: Field label for background image on theme designer page.
 #. TRANS: Field label for background color selector.
 #. TRANS: Label on profile design page for setting a profile page background colour.
-#: actions/designadminpanel.php:525 actions/designadminpanel.php:609
-#: lib/designform.php:238
 msgid "Background"
 msgstr "Arkaplan"
 
 #. TRANS: Form guide for background image upload form on theme designer page.
-#: actions/designadminpanel.php:531
 #, php-format
 msgid ""
 "You can upload a background image for the site. The maximum file size is %1"
@@ -2255,204 +1782,169 @@ msgstr ""
 "$s'dir."
 
 #. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:558
 msgid "On"
 msgstr "Açık"
 
 #. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:575
 msgid "Off"
 msgstr "Kapalı"
 
 #. TRANS: Form guide for turning background image on or off on theme designer page.
 #. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
 #. TRANS: use of the uploaded profile image.
-#: actions/designadminpanel.php:577 lib/designform.php:214
 msgid "Turn background image on or off."
 msgstr "Arkaplan resmini açın ya da kapatın."
 
 #. TRANS: Checkbox label to title background image on theme designer page.
 #. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-#: actions/designadminpanel.php:583 lib/designform.php:220
 msgid "Tile background image"
 msgstr "Arkaplan resmini döşe"
 
 #. TRANS: Fieldset legend for theme colors.
-#: actions/designadminpanel.php:598
 #, fuzzy
 msgid "Change colors"
 msgstr "Renkleri değiştir"
 
 #. TRANS: Field label for content color selector.
 #. TRANS: Label on profile design page for setting a profile page content colour.
-#: actions/designadminpanel.php:623 lib/designform.php:252
 msgid "Content"
 msgstr "İçerik"
 
 #. TRANS: Field label for sidebar color selector.
 #. TRANS: Label on profile design page for setting a profile page sidebar colour.
-#: actions/designadminpanel.php:637 lib/designform.php:266
 msgid "Sidebar"
 msgstr "Kenar Çubuğu"
 
 #. TRANS: Field label for text color selector.
 #. TRANS: Label on profile design page for setting a profile page text colour.
-#: actions/designadminpanel.php:651 lib/designform.php:280
 msgid "Text"
 msgstr "Metin"
 
 #. TRANS: Field label for link color selector.
 #. TRANS: Label on profile design page for setting a profile page links colour.
-#: actions/designadminpanel.php:665 lib/designform.php:294
 msgid "Links"
 msgstr "Bağlantılar"
 
 #. TRANS: Fieldset legend for advanced theme design settings.
-#: actions/designadminpanel.php:691
 msgid "Advanced"
 msgstr "Gelişmiş"
 
 #. TRANS: Field label for custom CSS.
-#: actions/designadminpanel.php:696
 msgid "Custom CSS"
 msgstr "Özel CSS"
 
 #. TRANS: Button text for resetting theme settings.
-#: actions/designadminpanel.php:718
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Use defaults"
 msgstr "Öntanımlıları kullan"
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:720
 #, fuzzy
 msgid "Restore default designs."
 msgstr "Öntanımlıları kullan"
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:728
 #, fuzzy
 msgid "Reset back to default."
 msgstr "Öntanımlıya geri dön"
 
 #. TRANS: Title for button for saving theme settings.
-#: actions/designadminpanel.php:736
 #, fuzzy
 msgid "Save design."
 msgstr "Dizaynı kaydet"
 
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
-#: actions/disfavor.php:83
 msgid "This notice is not a favorite!"
 msgstr "Bu durum mesajı bir favori değil!"
 
 #. TRANS: Title for page on which favorites can be added.
-#: actions/disfavor.php:98
 msgid "Add to favorites"
 msgstr "Favorilere ekle"
 
 #. TRANS: Client exception thrown when requesting a document from the documentation that does not exist.
 #. TRANS: %s is the non-existing document.
-#: actions/doc.php:155
 #, fuzzy, php-format
 msgid "No such document \"%s\"."
 msgstr "Böyle bir durum mesajı yok."
 
 #. TRANS: Title for "Edit application" form.
 #. TRANS: Form legend.
-#: actions/editapplication.php:54 lib/applicationeditform.php:129
 msgid "Edit application"
 msgstr "Uygulamayı düzenle"
 
 #. TRANS: Client error displayed trying to edit an application while not logged in.
-#: actions/editapplication.php:66
 msgid "You must be logged in to edit an application."
 msgstr "Bir uygulamayı düzenlemek için giriş yapmış olmanız gerekir."
 
 #. TRANS: Client error displayed trying to edit an application that does not exist.
-#: actions/editapplication.php:83 actions/showapplication.php:83
 msgid "No such application."
 msgstr "Böyle bir uygulama yok."
 
 #. TRANS: Instructions for "Edit application" form.
-#: actions/editapplication.php:167
 msgid "Use this form to edit your application."
 msgstr "Uygulamayı düzenlemek için bu biçimi kullan."
 
 #. TRANS: Validation error shown when not providing a name in the "Edit application" form.
 #. TRANS: Validation error shown when not providing a name in the "New application" form.
-#: actions/editapplication.php:184 actions/newapplication.php:164
 msgid "Name is required."
 msgstr "İsim gereklidir."
 
 #. 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.
-#: actions/editapplication.php:188 actions/newapplication.php:172
 #, fuzzy
 msgid "Name is too long (maximum 255 characters)."
 msgstr "İsim çok uzun (maksimum: 255 karakter)."
 
 #. TRANS: Validation error shown when providing a name for an application that already exists in the "Edit application" form.
 #. TRANS: Validation error shown when providing a name for an application that already exists in the "New application" form.
-#: actions/editapplication.php:192 actions/newapplication.php:168
 msgid "Name already in use. Try another one."
 msgstr "İsim halihazırda kullanımda. Başka bir tane deneyin."
 
 #. TRANS: Validation error shown when not providing a description in the "Edit application" form.
 #. TRANS: Validation error shown when not providing a description in the "New application" form.
-#: actions/editapplication.php:196 actions/newapplication.php:176
 msgid "Description is required."
 msgstr "Abonelik reddedildi."
 
 #. TRANS: Validation error shown when providing too long a source URL in the "Edit application" form.
-#: actions/editapplication.php:209
 msgid "Source URL is too long."
 msgstr "Kaynak bağlantı çok uzun."
 
 #. TRANS: Validation error shown when providing an invalid source URL in the "Edit application" form.
 #. TRANS: Validation error shown when providing an invalid source URL in the "New application" form.
-#: actions/editapplication.php:216 actions/newapplication.php:199
 msgid "Source URL is not valid."
 msgstr "Kaynak bağlantı geçerli değil."
 
 #. 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.
-#: actions/editapplication.php:220 actions/newapplication.php:203
 msgid "Organization is required."
 msgstr "Organizasyon gereklidir."
 
 #. TRANS: Validation error shown when providing too long an arganisation name in the "Edit application" form.
-#: actions/editapplication.php:224 actions/newapplication.php:207
 #, fuzzy
 msgid "Organization is too long (maximum 255 characters)."
 msgstr "Organizasyon çok uzun (maksimum 255 karakter)."
 
 #. TRANS: Form validation error show when an organisation name has not been provided in the edit application form.
 #. TRANS: Form validation error show when an organisation name has not been provided in the new application form.
-#: actions/editapplication.php:228 actions/newapplication.php:211
 msgid "Organization homepage is required."
 msgstr "Organizasyon anasayfası gereklidir."
 
 #. TRANS: Validation error shown when providing too long a callback URL in the "Edit application" form.
 #. TRANS: Validation error shown when providing too long a callback URL in the "New application" form.
-#: actions/editapplication.php:239 actions/newapplication.php:225
 msgid "Callback is too long."
 msgstr ""
 
 #. TRANS: Validation error shown when providing an invalid callback URL in the "Edit application" form.
 #. TRANS: Validation error shown when providing an invalid callback URL in the "New application" form.
-#: actions/editapplication.php:247 actions/newapplication.php:235
 msgid "Callback URL is not valid."
 msgstr ""
 
 #. TRANS: Server error occuring when an application could not be updated from the "Edit application" form.
-#: actions/editapplication.php:284
 msgid "Could not update application."
 msgstr "Uygulama güncellenemedi."
 
 #. TRANS: Title for form to edit a group. %s is a group nickname.
-#: actions/editgroup.php:55
 #, php-format
 msgid "Edit %s group"
 msgstr "%s grubunu düzenle"
@@ -2460,40 +1952,40 @@ msgstr "%s grubunu düzenle"
 #. TRANS: Client error displayed trying to edit a group while not logged in.
 #. TRANS: Client error displayed when trying to create a group while not logged in.
 #. TRANS: Client error displayed trying to create a group while not logged in.
-#: actions/editgroup.php:68 actions/grouplogo.php:69 actions/newgroup.php:65
 msgid "You must be logged in to create a group."
 msgstr "Bir grup oluşturmak için giriş yapmış olmanız gerekir."
 
 #. TRANS: Form instructions for group edit form.
-#: actions/editgroup.php:161
 msgid "Use this form to edit the group."
 msgstr "Grubu düzenlemek için bu biçimi kullan."
 
+#. TRANS: Group edit form validation error.
+#. TRANS: Group create form validation error.
+#. TRANS: %s is the invalid alias.
+#, fuzzy, php-format
+msgid "Invalid alias: \"%s\""
+msgstr "%s Geçersiz başlangıç sayfası"
+
 #. TRANS: Group edit form success message.
-#: actions/editgroup.php:301
 msgid "Options saved."
 msgstr "Seçenekler kaydedildi."
 
 #. TRANS: Title for e-mail settings.
-#: actions/emailsettings.php:60
 msgid "Email settings"
 msgstr "E-posta ayarları"
 
 #. TRANS: E-mail settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/emailsettings.php:74
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 msgstr "%%site.name%%'dan nasıl e-posta alacağınızı yönetin."
 
 #. TRANS: Form legend for e-mail settings form.
 #. TRANS: Field label for e-mail address input in e-mail settings form.
-#: actions/emailsettings.php:104 actions/emailsettings.php:130
 msgid "Email address"
 msgstr "E-posta adresi"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:110
 msgid "Current confirmed email address."
 msgstr "Mevcut doğrulanmış e-posta adresi."
 
@@ -2502,15 +1994,11 @@ msgstr "Mevcut doğrulanmış e-posta adresi."
 #. TRANS: Button label to remove a confirmed IM address.
 #. TRANS: Button label to remove a confirmed SMS address.
 #. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
-#: actions/emailsettings.php:113 actions/emailsettings.php:180
-#: actions/imsettings.php:119 actions/smssettings.php:119
-#: actions/smssettings.php:175
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Geri al"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:120
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -2523,46 +2011,38 @@ msgstr ""
 #. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
 #. TRANS: Any other domain may be owned by a legitimate person or
 #. TRANS: organization.
-#: actions/emailsettings.php:137
 msgid "Email address, like \"UserName@example.org\""
 msgstr "\"kullanıcıadı@örnek.org\" benzeri bir e-posta adresi."
 
 #. TRANS: Button label for adding an e-mail address in e-mail settings form.
 #. TRANS: Button label for adding an IM address in IM settings form.
 #. TRANS: Button label for adding a SMS phone number in SMS settings form.
-#: actions/emailsettings.php:141 actions/imsettings.php:147
-#: actions/smssettings.php:157
 msgctxt "BUTTON"
 msgid "Add"
 msgstr "Ekle"
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:149 actions/smssettings.php:166
 msgid "Incoming email"
 msgstr "Gelen e-posta"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:155
 msgid "I want to post notices by email."
 msgstr ""
 
 #. TRANS: Form instructions for incoming e-mail form in e-mail settings.
 #. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
-#: actions/emailsettings.php:177 actions/smssettings.php:173
 msgid "Send email to this address to post new notices."
 msgstr "Yeni durum mesajları göndermek için bu adrese e-posta atın."
 
 #. TRANS: Instructions for incoming e-mail address input form, when an address has already been assigned.
 #. TRANS: Instructions for incoming SMS e-mail address input form.
-#: actions/emailsettings.php:186 actions/smssettings.php:181
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr ""
 "Gönderim yapmak için yeni bir e-posta adresi oluşturun; eskisi iptal "
 "olacaktır."
 
 #. TRANS: Instructions for incoming e-mail address input form.
-#: actions/emailsettings.php:190
 msgid ""
 "To send notices via email, we need to create a unique email address for you "
 "on this server:"
@@ -2570,79 +2050,64 @@ msgstr ""
 
 #. TRANS: Button label for adding an e-mail address to send notices from.
 #. TRANS: Button label for adding an SMS e-mail address to send notices from.
-#: actions/emailsettings.php:196 actions/smssettings.php:184
 msgctxt "BUTTON"
 msgid "New"
 msgstr "Yeni"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:205
 msgid "Email preferences"
 msgstr "E-posta tercihleri"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:213
 #, fuzzy
 msgid "Send me notices of new subscriptions through email."
 msgstr "Durum mesajlarını Jabber/GTalk üzerinden gönder."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:219
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr ""
 "Biri benim durum mesajımı favori olarak eklediğinde bana e-posta gönder."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:226
 msgid "Send me email when someone sends me a private message."
 msgstr "Birisi bana özel mesaj attığında bana e-posta gönder."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:232
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:238
 msgid "Allow friends to nudge me and send me an email."
 msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:244
 #, fuzzy
 msgid "Publish a MicroID for my email address."
 msgstr "Bir takma ad veya eposta adresi girin."
 
 #. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:362
 msgid "Email preferences saved."
 msgstr "E-posta tercihleri kaydedildi."
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:381
 #, fuzzy
 msgid "No email address."
 msgstr "Geçersiz bir eposta adresi."
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:389
 #, fuzzy
 msgid "Cannot normalize that email address."
 msgstr "Jabber işlemlerinde bir hata oluştu."
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:394 actions/register.php:197
-#: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "Geçersiz bir eposta adresi."
 
 #. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:398
 msgid "That is already your email address."
 msgstr "Bu zaten sizin e-posta adresiniz."
 
 #. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:402
 #, fuzzy
 msgid "That email address already belongs to another user."
 msgstr "Jabber ID başka bir kullanıcıya ait."
@@ -2650,14 +2115,11 @@ msgstr "Jabber ID başka bir kullanıcıya ait."
 #. TRANS: Server error thrown on database error adding e-mail confirmation code.
 #. TRANS: Server error thrown on database error adding Instant Messaging confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:419 actions/imsettings.php:362
-#: actions/smssettings.php:364
 #, fuzzy
 msgid "Could not insert confirmation code."
 msgstr "Onay kodu eklenemedi."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:426
 #, fuzzy
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
@@ -2669,41 +2131,33 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling Instant Messaging address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:446 actions/imsettings.php:391
-#: actions/smssettings.php:398
 msgid "No pending confirmation to cancel."
 msgstr "İptal etmek için beklenen onay yok."
 
 #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:451
 msgid "That is the wrong email address."
 msgstr "Bu yanlış e-posta adresi."
 
 #. TRANS: Server error thrown on database error canceling e-mail address confirmation.
 #. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
-#: actions/emailsettings.php:460 actions/smssettings.php:412
 #, fuzzy
 msgid "Could not delete email confirmation."
 msgstr "Eposta onayı silinemedi."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:465
 msgid "Email confirmation cancelled."
 msgstr "İptal etmek için beklenen onay yok."
 
 #. TRANS: Message given trying to remove an e-mail address that is not
 #. TRANS: registered for the active user.
-#: actions/emailsettings.php:484
 msgid "That is not your email address."
 msgstr "Bu sizin e-posta adresiniz değil."
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:505
 msgid "The email address was removed."
 msgstr "Eposta adresi zaten var."
 
 #. TRANS: Form validation error displayed when trying to remove an incoming e-mail address while no address has been set.
-#: actions/emailsettings.php:519 actions/smssettings.php:554
 #, fuzzy
 msgid "No incoming email address."
 msgstr "Geçersiz bir eposta adresi."
@@ -2711,63 +2165,51 @@ msgstr "Geçersiz bir eposta adresi."
 #. 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.
-#: actions/emailsettings.php:531 actions/emailsettings.php:555
-#: actions/smssettings.php:565 actions/smssettings.php:590
 #, fuzzy
 msgid "Could not update user record."
 msgstr "Kullanıcı kayıtları güncellenemedi."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
 #. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:535 actions/smssettings.php:569
 msgid "Incoming email address removed."
 msgstr "Gelen e-posta adresi silindi."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
 #. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:559 actions/smssettings.php:594
 msgid "New incoming email address added."
 msgstr "Yeni gelen e-posta adresi eklendi."
 
 #. TRANS: Client error displayed when trying to mark a notice as favorite that already is a favorite.
-#: actions/favor.php:80
 msgid "This notice is already a favorite!"
 msgstr "Bu durum mesajı zaten bir favori!"
 
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
-#: actions/favor.php:95
 #, fuzzy
 msgid "Disfavor favorite."
 msgstr "Favoriliğini kaldır"
 
 #. TRANS: Page title for first page of favorited notices.
 #. TRANS: Title for favourited notices section.
-#: actions/favorited.php:65 lib/popularnoticesection.php:62
-#: lib/publicgroupnav.php:93
 msgid "Popular notices"
 msgstr "Popüler durum mesajları"
 
 #. TRANS: Page title for all but first page of favorited notices.
 #. TRANS: %d is the page number being displayed.
-#: actions/favorited.php:69
 #, php-format
 msgid "Popular notices, page %d"
 msgstr "Popüler durum mesajları, sayfa %d"
 
 #. TRANS: Description on page displaying favorited notices.
-#: actions/favorited.php:81
 msgid "The most popular notices on the site right now."
 msgstr "Şu an sitedeki en popüler durum mesajları."
 
 #. TRANS: Text displayed instead of a list when a site does not yet have any favourited notices.
-#: actions/favorited.php:149
 msgid "Favorite notices appear on this page but no one has favorited one yet."
 msgstr ""
 "Favori durum mesajları bu sayfada görüntülenir ama daha hiç kimse favorilere "
 "eklememiş."
 
 #. TRANS: Additional text displayed instead of a list when a site does not yet have any favourited notices for logged in users.
-#: actions/favorited.php:153
 msgid ""
 "Be the first to add a notice to your favorites by clicking the fave button "
 "next to any notice you like."
@@ -2775,7 +2217,6 @@ msgstr ""
 
 #. TRANS: Additional text displayed instead of a list when a site does not yet have any favourited notices for not logged in users.
 #. TRANS: %%action.register%% is a registration link. "[link text](link)" is Mark Down. Do not change the formatting.
-#: actions/favorited.php:158
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to add a "
@@ -2786,186 +2227,151 @@ msgstr ""
 #. TRANS: %s is a user's nickname.
 #. TRANS: Title for first page of favourite notices of a user.
 #. TRANS: %s is the user for whom the favourite notices are displayed.
-#: actions/favoritesrss.php:111 actions/showfavorites.php:76
-#: lib/personalgroupnav.php:110
 #, php-format
 msgid "%s's favorite notices"
 msgstr "%s kullanıcısının favori durum mesajları"
 
 #. TRANS: Desciption of RSS feed with favourite notices of a user.
 #. TRANS: %1$s is a user's nickname, %2$s is the name of the StatusNet site.
-#: actions/favoritesrss.php:117
 #, fuzzy, php-format
 msgid "Updates favored by %1$s on %2$s!"
 msgstr "%s adli kullanicinin durum mesajlari"
 
 #. TRANS: Page title for first page of featured users.
 #. TRANS: Title for featured users section.
-#: actions/featured.php:69 lib/featureduserssection.php:87
-#: lib/publicgroupnav.php:89
 msgid "Featured users"
 msgstr "Öne çıkan kullanıcılar"
 
 #. TRANS: Page title for all but first page of featured users.
 #. TRANS: %d is the page number being displayed.
-#: actions/featured.php:73
 #, php-format
 msgid "Featured users, page %d"
 msgstr "Öne çıkan kullanıcılar, sayfa %d"
 
 #. TRANS: Description on page displaying featured users.
-#: actions/featured.php:102
 #, fuzzy, php-format
 msgid "A selection of some great users on %s."
 msgstr "%s üzerindeki harika kullanıcılardan bazılarının bir seçkisi"
 
 #. TRANS: Client error displayed when no notice ID was given trying do display a file.
-#: actions/file.php:36
 msgid "No notice ID."
 msgstr "Böyle bir durum mesajı yok."
 
 #. TRANS: Client error displayed when an invalid notice ID was given trying do display a file.
-#: actions/file.php:41
 msgid "No notice."
 msgstr "Böyle bir durum mesajı yok."
 
 #. TRANS: Client error displayed when trying do display a file for a notice without a file attachement.
-#: actions/file.php:46
 msgid "No attachments."
 msgstr "Ek yok."
 
 #. TRANS: Client error displayed when trying do display a file for a notice with file attachements
 #. TRANS: that could not be found.
-#: actions/file.php:58
 msgid "No uploaded attachments."
 msgstr "Yüklenmiş ek yok."
 
 #. TRANS: Client error displayed when subscribing to a remote profile and an unexpected response is received.
-#: actions/finishremotesubscribe.php:69
 msgid "Not expecting this response!"
 msgstr "Bu yanıt beklenmiyordu!"
 
 #. TRANS: Client error displayed when subscribing to a remote profile that does not exist.
-#: actions/finishremotesubscribe.php:81
 msgid "User being listened to does not exist."
 msgstr ""
 
 #. TRANS: Client error displayed when subscribing to a remote profile that is a local profile.
-#: actions/finishremotesubscribe.php:89 actions/remotesubscribe.php:58
 msgid "You can use the local subscription!"
 msgstr "Yerel aboneliği kullanabilirsiniz!"
 
 #. TRANS: Client error displayed when subscribing to a remote profile that is blocked form subscribing to.
-#: actions/finishremotesubscribe.php:102
 msgid "That user has blocked you from subscribing."
 msgstr ""
 
 #. TRANS: Client error displayed when subscribing to a remote profile without providing an authorised token.
-#: actions/finishremotesubscribe.php:114
 msgid "You are not authorized."
 msgstr "Takip talebine izin verildi"
 
 #. TRANS: Client error displayed when subscribing to a remote profile and conversion of the request token to access token fails.
-#: actions/finishremotesubscribe.php:118
 msgid "Could not convert request token to access token."
 msgstr ""
 
 #. TRANS: Client error displayed when subscribing to a remote profile fails because of an unsupported version of the OMB protocol.
-#: actions/finishremotesubscribe.php:124
 #, fuzzy
 msgid "Remote service uses unknown version of OMB protocol."
 msgstr "OMB protokolünün bilinmeğen sürümü."
 
 #. TRANS: Server error displayed when subscribing to a remote profile fails because the remote profile could not be updated.
-#: actions/finishremotesubscribe.php:145 lib/oauthstore.php:317
 #, fuzzy
 msgid "Error updating remote profile."
 msgstr "Uzaktaki profili güncellemede hata oluştu"
 
 #. TRANS: Client error displayed when requesting a non-existent file.
-#: actions/getfile.php:77
 msgid "No such file."
 msgstr "Böyle bir dosya yok."
 
 #. TRANS: Client error displayed when requesting a file without having read access to it.
-#: actions/getfile.php:82
 msgid "Cannot read file."
 msgstr "Profil kaydedilemedi."
 
 #. TRANS: Client error displayed when trying to assign an invalid role to a user.
-#: actions/grantrole.php:61 actions/revokerole.php:62
 #, fuzzy
 msgid "Invalid role."
 msgstr "Geçersiz büyüklük."
 
 #. TRANS: Client error displayed when trying to assign an reserved role to a user.
-#: actions/grantrole.php:66 actions/revokerole.php:66
 msgid "This role is reserved and cannot be set."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to assign a role to a user while not being allowed to set roles.
-#: actions/grantrole.php:76
 #, fuzzy
 msgid "You cannot grant user roles on this site."
 msgstr "Bize o profili yollamadınız"
 
 #. TRANS: Client error displayed when trying to assign a role to a user that already has that role.
-#: actions/grantrole.php:84
 #, fuzzy
 msgid "User already has this role."
 msgstr "Kullanıcının profili yok."
 
 #. TRANS: Client error displayed trying to block a user from a group while not specifying a to be blocked user profile.
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing a profile.
+#. TRANS: Client error displayed when not providing a profile ID on the Make Admin page.
 #. TRANS: Client error displayed trying a change a subscription without providing a profile.
 #. TRANS: Client error displayed when trying to change user options without specifying a user to work on.
-#: actions/groupblock.php:71 actions/groupunblock.php:71
-#: actions/makeadmin.php:71 actions/subedit.php:49
-#: lib/profileformaction.php:79
 msgid "No profile specified."
 msgstr "Hiçbir profil belirtilmedi."
 
 #. TRANS: Client error displayed trying to block a user from a group while specifying a non-existing profile.
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing an existing profile.
+#. TRANS: Client error displayed when specifying an invalid profile ID on the Make Admin page.
 #. TRANS: Client error displayed trying a change a subscription for a non-existant profile ID.
 #. TRANS: Client error displayed when trying to change user options without specifying an existing user to work on.
-#: actions/groupblock.php:77 actions/groupunblock.php:77
-#: actions/makeadmin.php:76 actions/subedit.php:57 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:87
 msgid "No profile with that ID."
 msgstr ""
 
 #. TRANS: Client error displayed trying to block a user from a group while not specifying a group to block a profile from.
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing a group.
-#: actions/groupblock.php:83 actions/groupunblock.php:83
-#: actions/makeadmin.php:81
+#. TRANS: Client error displayed when not providing a group ID on the Make Admin page.
 msgid "No group specified."
 msgstr "Hiçbir grup belirtilmedi."
 
 #. TRANS: Client error displayed trying to block a user from a group while not being an admin user.
-#: actions/groupblock.php:95
 msgid "Only an admin can block group members."
 msgstr "Sadece bir yönetici grup üyelerini engelleyebilir."
 
 #. TRANS: Client error displayed trying to block a user from a group while user is already blocked from the given group.
-#: actions/groupblock.php:100
 msgid "User is already blocked from group."
 msgstr "Kullanıcı zaten gruptan engellenmiş."
 
 #. TRANS: Client error displayed trying to block a user from a group while user is not a member of given group.
-#: actions/groupblock.php:106
 msgid "User is not a member of group."
 msgstr "Kullanıcı grubunun bir üyesi değil."
 
 #. TRANS: Title for block user from group page.
 #. TRANS: Form legend for form to block user from a group.
-#: actions/groupblock.php:141 actions/groupmembers.php:364
 msgid "Block user from group"
 msgstr "Kullanıcıyı gruptan engelle"
 
 #. TRANS: Explanatory text for block user from group form before setting the block.
 #. TRANS: %1$s is that to be blocked user, %2$s is the group the user will be blocked from.
-#: actions/groupblock.php:169
 #, php-format
 msgid ""
 "Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They "
@@ -2974,66 +2380,55 @@ msgid ""
 msgstr ""
 
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
-#: actions/groupblock.php:191
 #, fuzzy
 msgid "Do not block this user from this group."
 msgstr "Bu kullanıcıyı bu gruptan engellemeyin"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
-#: actions/groupblock.php:198
 #, fuzzy
 msgid "Block this user from this group."
 msgstr "Bu kullanıcıyı bu gruptan engelleyin"
 
 #. TRANS: Server error displayed when trying to block a user from a group fails because of an application error.
-#: actions/groupblock.php:215
 msgid "Database error blocking user from group."
 msgstr ""
 
 #. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
 #. TRANS: Client error displayed trying to find a user by ID without providing an ID.
-#: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr "JabberID yok."
 
 #. TRANS: Client error displayed trying to change group design settings while not logged in.
-#: actions/groupdesignsettings.php:67
 msgid "You must be logged in to edit a group."
 msgstr "Bir grubu düzenlemek için giriş yapmış olmanız gerekir."
 
 #. TRANS: Title group design settings page.
-#: actions/groupdesignsettings.php:146
 msgid "Group design"
 msgstr "Grup dizaynı"
 
 #. TRANS: Instructions for group design settings page.
-#: actions/groupdesignsettings.php:157
 msgid ""
 "Customize the way your group looks with a background image and a colour "
 "palette of your choice."
 msgstr ""
 
 #. TRANS: Form validation error displayed when group design settings could not be updated because of an application issue.
-#: actions/groupdesignsettings.php:262
 #, fuzzy
 msgid "Unable to update your design settings."
 msgstr "Dizayn ayarlarınız kaydedilemedi."
 
 #. TRANS: Form text to confirm saved group design settings.
-#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:239
 #, fuzzy
 msgid "Design preferences saved."
 msgstr "Tercihler kaydedildi."
 
 #. TRANS: Title for group logo settings page.
 #. TRANS: Group logo form legend.
-#: actions/grouplogo.php:144 actions/grouplogo.php:199
 msgid "Group logo"
 msgstr "Grup logosu"
 
 #. TRANS: Instructions for group logo page.
 #. TRANS: %s is the maximum file size for that site.
-#: actions/grouplogo.php:156
 #, fuzzy, php-format
 msgid ""
 "You can upload a logo image for your group. The maximum file size is %s."
@@ -3041,93 +2436,77 @@ msgstr ""
 "Ah, durumunuz biraz uzun kaçtı. Azami 180 karaktere sığdırmaya ne dersiniz?"
 
 #. TRANS: Submit button for uploading a group logo.
-#: actions/grouplogo.php:243
 msgid "Upload"
 msgstr "Yükle"
 
 #. TRANS: Button text for cropping an uploaded group logo.
-#: actions/grouplogo.php:299
 msgid "Crop"
 msgstr "Kırp"
 
 #. TRANS: Form instructions on the group logo page.
-#: actions/grouplogo.php:376
 msgid "Pick a square area of the image to be the logo."
 msgstr "Resimden logo olacak bir kare alanı seçin."
 
 #. TRANS: Form success message after updating a group logo.
-#: actions/grouplogo.php:411
 #, fuzzy
 msgid "Logo updated."
 msgstr "Avatar güncellendi."
 
 #. TRANS: Form failure message after failing to update a group logo.
-#: actions/grouplogo.php:414
 #, fuzzy
 msgid "Failed updating logo."
 msgstr "Avatar güncellemede hata."
 
 #. TRANS: Title of the page showing group members.
 #. TRANS: %s is the name of the group.
-#: actions/groupmembers.php:104
 #, php-format
 msgid "%s group members"
 msgstr "%s grup üyeleri"
 
 #. TRANS: Title of the page showing group members.
 #. TRANS: %1$s is the name of the group, %2$d is the page number of the members list.
-#: actions/groupmembers.php:109
 #, php-format
 msgid "%1$s group members, page %2$d"
 msgstr ""
 
 #. TRANS: Page notice for group members page.
-#: actions/groupmembers.php:125
 msgid "A list of the users in this group."
 msgstr "Bu gruptaki kullanıcıların listesi."
 
 #. TRANS: Indicator in group members list that this user is a group administrator.
-#: actions/groupmembers.php:190 lib/action.php:581
 msgid "Admin"
 msgstr "Yönetici"
 
 #. TRANS: Button text for the form that will block a user from a group.
-#: actions/groupmembers.php:397
 msgctxt "BUTTON"
 msgid "Block"
 msgstr "Engelle"
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:401
 msgctxt "TOOLTIP"
 msgid "Block this user"
 msgstr "Bu kullanıcıyı engelle"
 
 #. TRANS: Form legend for form to make a user a group admin.
-#: actions/groupmembers.php:488
 msgid "Make user an admin of the group"
 msgstr "Kullanıcıyı grubun bir yöneticisi yap"
 
 #. TRANS: Button text for the form that will make a user administrator.
-#: actions/groupmembers.php:521
 msgctxt "BUTTON"
 msgid "Make Admin"
 msgstr "Yönetici Yap"
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:525
 msgctxt "TOOLTIP"
 msgid "Make this user an admin"
 msgstr "Bu kullanıcıyı yönetici yap"
 
 #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
-#: actions/grouprss.php:141
 #, fuzzy, php-format
 msgid "Updates from members of %1$s on %2$s!"
 msgstr "%s adli kullanicinin durum mesajlari"
 
 #. TRANS: Title for first page of the groups list.
-#: actions/groups.php:62
 #, fuzzy
 msgctxt "TITLE"
 msgid "Groups"
@@ -3135,7 +2514,6 @@ msgstr "Gruplar"
 
 #. TRANS: Title for all but the first page of the groups list.
 #. TRANS: %d is the page number.
-#: actions/groups.php:66
 #, fuzzy, php-format
 msgctxt "TITLE"
 msgid "Groups, page %d"
@@ -3144,7 +2522,6 @@ msgstr "Bütün abonelikler"
 #. TRANS: Page notice of group list. %%%%site.name%%%% is the StatusNet site name,
 #. TRANS: %%%%action.groupsearch%%%% and %%%%action.newgroup%%%% are URLs. Do not change them.
 #. TRANS: This message contains Markdown links in the form [link text](link).
-#: actions/groups.php:95
 #, php-format
 msgid ""
 "%%%%site.name%%%% groups let you find and talk with people of similar "
@@ -3155,12 +2532,10 @@ msgid ""
 msgstr ""
 
 #. TRANS: Link to create a new group on the group list page.
-#: actions/groups.php:113 actions/usergroups.php:126 lib/groupeditform.php:115
 msgid "Create a new group"
 msgstr "Yeni bir grup oluştur"
 
 #. TRANS: Instructions for page where groups can be searched. %%site.name%% is the name of the StatusNet site.
-#: actions/groupsearch.php:53
 #, fuzzy, php-format
 msgid ""
 "Search for groups on %%site.name%% by their name, location, or description. "
@@ -3171,21 +2546,17 @@ msgstr ""
 "karakterden oluşmalı. "
 
 #. TRANS: Title for page where groups can be searched.
-#: actions/groupsearch.php:60
 msgid "Group search"
 msgstr "Grup arama"
 
 #. TRANS: Text on page where groups can be searched if no results were found for a query.
 #. TRANS: Text for notice search results is the query had no results.
 #. TRANS: Message on the "People search" page where a query has no results.
-#: actions/groupsearch.php:82 actions/noticesearch.php:122
-#: actions/peoplesearch.php:87
 msgid "No results."
 msgstr "Sonuç yok."
 
 #. TRANS: Additional text on page where groups can be searched if no results were found for a query for a logged in user.
 #. TRANS: This message contains Markdown links in the form [link text](link).
-#: actions/groupsearch.php:87
 #, php-format
 msgid ""
 "If you cannot find the group you're looking for, you can [create it](%%"
@@ -3194,7 +2565,6 @@ msgstr ""
 
 #. TRANS: Additional text on page where groups can be searched if no results were found for a query for a not logged in user.
 #. TRANS: This message contains Markdown links in the form [link text](link).
-#: actions/groupsearch.php:92
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and [create the group](%%"
@@ -3202,30 +2572,25 @@ msgid ""
 msgstr ""
 
 #. TRANS: Client error displayed when trying to unblock a user from a group without being an administrator for the group.
-#: actions/groupunblock.php:95
 msgid "Only an admin can unblock group members."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to unblock a non-blocked user from a group.
-#: actions/groupunblock.php:100
 msgid "User is not blocked from group."
 msgstr "Kullanıcı gruptan engellenmedi."
 
 #. TRANS: Server error displayed when unblocking a user from a group fails because of an unknown error.
 #. TRANS: Server error displayed when removing a user block.
-#: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "Engellemeyi kaldırırken hata."
 
 #. TRANS: Title for Instant Messaging settings.
-#: actions/imsettings.php:56
 msgid "IM settings"
 msgstr "Profil ayarları"
 
 #. 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.
-#: actions/imsettings.php:69
 #, fuzzy, php-format
 msgid ""
 "You can send and receive notices through instant messaging [instant messages]"
@@ -3235,18 +2600,15 @@ msgstr ""
 "ayarlarinizi aşağıda yapın."
 
 #. TRANS: Message given in the IM settings if IM is not enabled on the site.
-#: actions/imsettings.php:90
 msgid "IM is not available."
 msgstr "Anlık mesajlaşma mevcut değil."
 
-#: actions/imsettings.php:116
 #, fuzzy, php-format
 msgid "Current confirmed %s address."
 msgstr "Mevcut doğrulanmış e-posta adresi."
 
 #. TRANS: Form note in IM settings form.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:128
 #, fuzzy, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your %s account for a message "
@@ -3255,89 +2617,74 @@ msgstr ""
 "Bu adresten onay bekleniyor. Jabber/Google Talk hesabınızı ayrıntılı bilgi "
 "içeren mesajı almak için kontrol edin. (%s'u arkadaş listenize eklediniz mi?)"
 
-#: actions/imsettings.php:140
 msgid "IM address"
 msgstr "Anlık mesajlaşma adresi"
 
-#: actions/imsettings.php:142
 #, php-format
 msgid "%s screenname."
 msgstr ""
 
 #. TRANS: Header for IM preferences form.
-#: actions/imsettings.php:163
 #, fuzzy
 msgid "IM Preferences"
 msgstr "Tercihler kaydedildi."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:174
 #, fuzzy
 msgid "Send me notices"
 msgstr "Yeni durum mesajı"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:176
 #, fuzzy
 msgid "Post a notice when my status changes."
 msgstr ""
 "Jabber/GTalk durum mesajim değiştiğinde nedurum.com'da durumumu güncelle"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:178
 #, fuzzy
 msgid "Send me replies from people I'm not subscribed to."
 msgstr "Durum mesajlarını Jabber/GTalk üzerinden gönder."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:181
 #, fuzzy
 msgid "Publish a MicroID"
 msgstr "Bir takma ad veya eposta adresi girin."
 
 #. TRANS: Server error thrown on database error updating IM preferences.
-#: actions/imsettings.php:291
 #, fuzzy
 msgid "Couldn't update IM preferences."
 msgstr "Kullanıcı güncellenemedi."
 
 #. TRANS: Confirmation message for successful IM preferences save.
 #. TRANS: Confirmation message after saving preferences.
-#: actions/imsettings.php:298 actions/urlsettings.php:244
 msgid "Preferences saved."
 msgstr "Tercihler kaydedildi."
 
 #. TRANS: Message given saving IM address without having provided one.
-#: actions/imsettings.php:320
 #, fuzzy
 msgid "No screenname."
 msgstr "Takma ad yok"
 
-#: actions/imsettings.php:325
 #, fuzzy
 msgid "No transport."
 msgstr "Böyle bir durum mesajı yok."
 
 #. TRANS: Message given saving IM address that cannot be normalised.
-#: actions/imsettings.php:333
 #, fuzzy
 msgid "Cannot normalize that screenname"
 msgstr "Jabber işlemlerinde bir hata oluştu."
 
 #. TRANS: Message given saving IM address that not valid.
-#: actions/imsettings.php:340
 #, fuzzy
 msgid "Not a valid screenname"
 msgstr "Geçersiz bir takma ad."
 
 #. TRANS: Message given saving IM address that is already set for another user.
-#: actions/imsettings.php:344
 #, fuzzy
 msgid "Screenname already belongs to another user."
 msgstr "Jabber ID başka bir kullanıcıya ait."
 
 #. TRANS: Message given saving valid IM address that is to be confirmed.
-#: actions/imsettings.php:369
 #, fuzzy
 msgid "A confirmation code was sent to the IM address you added."
 msgstr ""
@@ -3345,86 +2692,72 @@ msgstr ""
 "mesaj yollanabilmesi için onaylamanız gerekmektedir."
 
 #. TRANS: Message given canceling IM address confirmation for the wrong IM address.
-#: actions/imsettings.php:396
 msgid "That is the wrong IM address."
 msgstr "Yanlış IM adresi."
 
 #. TRANS: Server error thrown on database error canceling IM address confirmation.
-#: actions/imsettings.php:405
 #, fuzzy
 msgid "Couldn't delete confirmation."
 msgstr "Eposta onayı silinemedi."
 
 #. TRANS: Message given after successfully canceling IM address confirmation.
-#: actions/imsettings.php:410
 msgid "IM confirmation cancelled."
 msgstr "Onay kodu yok."
 
 #. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.
-#: actions/imsettings.php:434
 #, fuzzy
 msgid "That is not your screenname."
 msgstr "Bu sizin Jabber ID'niz değil."
 
 #. TRANS: Server error thrown on database error removing a registered IM address.
-#: actions/imsettings.php:443
 #, fuzzy
 msgid "Couldn't update user im prefs."
 msgstr "Kullanıcı kayıtları güncellenemedi."
 
 #. TRANS: Message given after successfully removing a registered Instant Messaging address.
-#: actions/imsettings.php:451
 #, fuzzy
 msgid "The IM address was removed."
 msgstr "Bu adres kaldırılmıştı."
 
 #. TRANS: Title for all but the first page of the inbox page.
 #. TRANS: %1$s is the user's nickname, %2$s is the page number.
-#: actions/inbox.php:59
 #, php-format
 msgid "Inbox for %1$s - page %2$d"
 msgstr ""
 
 #. TRANS: Title for the first page of the inbox page.
 #. TRANS: %s is the user's nickname.
-#: actions/inbox.php:64
 #, php-format
 msgid "Inbox for %s"
 msgstr "%s için gelen kutusu"
 
 #. TRANS: Instructions for user inbox page.
-#: actions/inbox.php:106
 msgid "This is your inbox, which lists your incoming private messages."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to sent invites while they have been disabled.
-#: actions/invite.php:41
 msgid "Invites have been disabled."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to sent invites while not logged in.
 #. TRANS: %s is the StatusNet site name.
-#: actions/invite.php:45
 #, fuzzy, php-format
 msgid "You must be logged in to invite other users to use %s."
 msgstr "Kullanıcı güncellenemedi."
 
 #. TRANS: Form validation message when providing an e-mail address that does not validate.
 #. TRANS: %s is an invalid e-mail address.
-#: actions/invite.php:78
 #, fuzzy, php-format
 msgid "Invalid email address: %s."
 msgstr "Geçersiz bir eposta adresi."
 
 #. TRANS: Page title when invitations have been sent.
-#: actions/invite.php:117
 #, fuzzy
 msgid "Invitations sent"
 msgstr "Davet(iyeler) gönderildi"
 
 #. TRANS: Page title when inviting potential users.
-#: actions/invite.php:120
 msgid "Invite new users"
 msgstr "Yeni kullanıcıları davet et"
 
@@ -3432,7 +2765,6 @@ msgstr "Yeni kullanıcıları davet et"
 #. TRANS: is already subscribed to one or more users with the given e-mail address(es).
 #. TRANS: Plural form is based on the number of reported already subscribed e-mail addresses.
 #. TRANS: Followed by a bullet list.
-#: actions/invite.php:140
 #, fuzzy
 msgid "You are already subscribed to this user:"
 msgid_plural "You are already subscribed to these users:"
@@ -3440,7 +2772,6 @@ msgstr[0] "Bize o profili yollamadınız"
 
 #. TRANS: Used as list item for already subscribed users (%1$s is nickname, %2$s is e-mail address).
 #. TRANS: Used as list item for already registered people (%1$s is nickname, %2$s is e-mail address).
-#: actions/invite.php:146 actions/invite.php:160
 #, fuzzy, php-format
 msgctxt "INVITE"
 msgid "%1$s (%2$s)"
@@ -3449,7 +2780,6 @@ msgstr "%1$s'in %2$s'deki durum mesajları "
 #. TRANS: Message displayed inviting users to use a StatusNet site while the invited user
 #. TRANS: already uses a this StatusNet site. Plural form is based on the number of
 #. TRANS: reported already present people. Followed by a bullet list.
-#: actions/invite.php:154
 msgid "This person is already a user and you were automatically subscribed:"
 msgid_plural ""
 "These people are already users and you were automatically subscribed to them:"
@@ -3458,48 +2788,41 @@ msgstr[0] ""
 #. TRANS: Message displayed inviting users to use a StatusNet site. Plural form is
 #. TRANS: based on the number of invitations sent. Followed by a bullet list of
 #. TRANS: e-mail addresses to which invitations were sent.
-#: actions/invite.php:168
 msgid "Invitation sent to the following person:"
 msgid_plural "Invitations sent to the following people:"
 msgstr[0] ""
 
 #. TRANS: Generic message displayed after sending out one or more invitations to
 #. TRANS: people to join a StatusNet site.
-#: actions/invite.php:178
 msgid ""
 "You will be notified when your invitees accept the invitation and register "
 "on the site. Thanks for growing the community!"
 msgstr ""
 
 #. TRANS: Form instructions.
-#: actions/invite.php:191
 msgid ""
 "Use this form to invite your friends and colleagues to use this service."
 msgstr ""
 
 #. TRANS: Field label for a list of e-mail addresses.
-#: actions/invite.php:218
 #, fuzzy
 msgid "Email addresses"
 msgstr "Eposta adresi zaten var."
 
 #. TRANS: Tooltip for field label for a list of e-mail addresses.
-#: actions/invite.php:221
 msgid "Addresses of friends to invite (one per line)."
 msgstr ""
 
 #. TRANS: Field label for a personal message to send to invitees.
-#: actions/invite.php:225
 msgid "Personal message"
 msgstr "Kişisel mesaj"
 
 #. TRANS: Tooltip for field label for a personal message to send to invitees.
-#: actions/invite.php:228
 msgid "Optionally add a personal message to the invitation."
 msgstr ""
 
 #. TRANS: Send button for inviting friends
-#: actions/invite.php:232
+#. TRANS: Button text for sending notice.
 msgctxt "BUTTON"
 msgid "Send"
 msgstr "Gönder"
@@ -3507,7 +2830,6 @@ msgstr "Gönder"
 #. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral
 #. TRANS: singular 3rd-person pronoun in English. %1$s is the inviting user, $2$s is
 #. TRANS: the StatusNet sitename.
-#: actions/invite.php:264
 #, fuzzy, php-format
 msgid "%1$s has invited you to join them on %2$s"
 msgstr "%1$s %2$s'da durumunuzu takip ediyor"
@@ -3517,7 +2839,6 @@ msgstr "%1$s %2$s'da durumunuzu takip ediyor"
 #. TRANS: StatusNet sitename, %3$s is the site URL, %4$s is the personal message from the
 #. TRANS: inviting user, %s%5 a link to the timeline for the inviting user, %s$6 is a link
 #. TRANS: to register with the StatusNet site.
-#: actions/invite.php:271
 #, php-format
 msgid ""
 "%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -3549,185 +2870,180 @@ msgid ""
 msgstr ""
 
 #. TRANS: Client error displayed when trying to join a group while not logged in.
-#: actions/joingroup.php:59
 msgid "You must be logged in to join a group."
 msgstr "Gruba katılmak için giriş yapmalısınız."
 
 #. TRANS: Title for join group page after joining.
-#: actions/joingroup.php:148
 #, fuzzy, php-format
 msgctxt "TITLE"
 msgid "%1$s joined group %2$s"
 msgstr "%1$s'in %2$s'deki durum mesajları "
 
 #. TRANS: Client error displayed when trying to leave a group while not logged in.
-#: actions/leavegroup.php:59
 msgid "You must be logged in to leave a group."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
-#: actions/leavegroup.php:103 lib/command.php:398
 msgid "You are not a member of that group."
 msgstr "Bu grubun bir üyesi değilsiniz."
 
 #. TRANS: Title for leave group page after leaving.
-#: actions/leavegroup.php:142
 #, fuzzy, php-format
 msgctxt "TITLE"
 msgid "%1$s left group %2$s"
 msgstr "%1$s'in %2$s'deki durum mesajları "
 
 #. TRANS: User admin panel title
-#: actions/licenseadminpanel.php:55
 msgctxt "TITLE"
 msgid "License"
 msgstr "Lisans"
 
-#: actions/licenseadminpanel.php:65
+#. TRANS: Form instructions for the site license admin panel.
 msgid "License for this StatusNet site"
 msgstr "Bu StatusNet sitesi için lisans"
 
-#: actions/licenseadminpanel.php:134
+#. TRANS: Client error displayed selecting an invalid license in the license admin panel.
 msgid "Invalid license selection."
 msgstr "Geçersiz lisans seçimi."
 
-#: actions/licenseadminpanel.php:144
+#. TRANS: Client error displayed when not specifying an owner for the all rights reserved license in the license admin panel.
 msgid ""
 "You must specify the owner of the content when using the All Rights Reserved "
 "license."
 msgstr ""
 
-#: actions/licenseadminpanel.php:151
+#. TRANS: Client error displayed selecting a too long license title in the license admin panel.
 #, fuzzy
 msgid "Invalid license title. Maximum length is 255 characters."
 msgstr "Geçersiz lisans başlığı. En fazla uzunluk 255 karakterdir."
 
-#: actions/licenseadminpanel.php:163
+#. TRANS: Client error displayed specifying an invalid license URL in the license admin panel.
 msgid "Invalid license URL."
 msgstr "Geçersiz lisans bağlantısı."
 
-#: actions/licenseadminpanel.php:166
+#. TRANS: Client error displayed specifying an invalid license image URL in the license admin panel.
 msgid "Invalid license image URL."
 msgstr "Geçersiz lisans resmi bağlantısı."
 
-#: actions/licenseadminpanel.php:174
+#. TRANS: Client error displayed specifying an invalid license URL in the license admin panel.
 msgid "License URL must be blank or a valid URL."
 msgstr "Lisans bağlantısı boş veya geçerli bir tane olmalıdır."
 
-#: actions/licenseadminpanel.php:182
+#. TRANS: Client error displayed specifying an invalid license image URL in the license admin panel.
 msgid "License image must be blank or valid URL."
 msgstr "Lisans resmi boş veya geçerli bir tane olmalıdır."
 
-#: actions/licenseadminpanel.php:232
+#. TRANS: Form legend in the license admin panel.
 msgid "License selection"
 msgstr "Lisans seçimi"
 
-#: actions/licenseadminpanel.php:238
+#. TRANS: License option in the license admin panel.
 #, fuzzy
 msgid "Private"
 msgstr "Gizlilik"
 
-#: actions/licenseadminpanel.php:239
+#. TRANS: License option in the license admin panel.
 msgid "All Rights Reserved"
 msgstr "Tüm Hakları Saklıdır"
 
-#: actions/licenseadminpanel.php:240
+#. TRANS: License option in the license admin panel.
 msgid "Creative Commons"
 msgstr "Creative Commons"
 
-#: actions/licenseadminpanel.php:245
+#. TRANS: Dropdown field label in the license admin panel.
 msgid "Type"
 msgstr ""
 
-#: actions/licenseadminpanel.php:247
-msgid "Select license"
+#. TRANS: Dropdown field instructions in the license admin panel.
+#, fuzzy
+msgid "Select a license."
 msgstr "Lisans seç"
 
-#: actions/licenseadminpanel.php:261
+#. TRANS: Form legend in the license admin panel.
 msgid "License details"
 msgstr "Lisans ayrıntıları"
 
-#: actions/licenseadminpanel.php:267
+#. TRANS: Field label in the license admin panel.
 msgid "Owner"
 msgstr "Sahibi"
 
-#: actions/licenseadminpanel.php:268
+#. TRANS: Field title in the license admin panel.
 msgid "Name of the owner of the site's content (if applicable)."
 msgstr "site içeriğinin sahibinin ismi (eğer varsa)."
 
-#: actions/licenseadminpanel.php:276
+#. TRANS: Field label in the license admin panel.
 msgid "License Title"
 msgstr "Lisans Başlığı"
 
-#: actions/licenseadminpanel.php:277
+#. TRANS: Field title in the license admin panel.
 msgid "The title of the license."
 msgstr "Lisansın başlığı."
 
-#: actions/licenseadminpanel.php:285
+#. TRANS: Field label in the license admin panel.
 msgid "License URL"
 msgstr "Lisans Bağlantısı"
 
-#: actions/licenseadminpanel.php:286
+#. TRANS: Field title in the license admin panel.
 msgid "URL for more information about the license."
 msgstr "Lisans hakkında daha fazla bilgi için bağlantı."
 
-#: actions/licenseadminpanel.php:293
+#. TRANS: Field label in the license admin panel.
 msgid "License Image URL"
 msgstr "Lisans Resminin Bağlantısı"
 
-#: actions/licenseadminpanel.php:294
+#. TRANS: Field title in the license admin panel.
 msgid "URL for an image to display with the license."
 msgstr "Lisansla birlikte gösterilecek bir resim için bağlantı."
 
-#. TRANS: Submit button title.
-#: actions/licenseadminpanel.php:311 actions/sessionsadminpanel.php:199
-#: actions/siteadminpanel.php:292 actions/snapshotadminpanel.php:245
-#: actions/tagother.php:133 lib/applicationeditform.php:357
-msgid "Save"
-msgstr "Kaydet"
-
-#: actions/licenseadminpanel.php:311
-msgid "Save license settings"
+#. TRANS: Button title in the license admin panel.
+#, fuzzy
+msgid "Save license settings."
 msgstr "Lisans ayarlarını kaydet"
 
+#. TRANS: Client error displayed when trying to log in while already logged in.
 #. TRANS: Client error displayed trying to use "one time password login" when already logged in.
-#: actions/login.php:97 actions/otp.php:62 actions/register.php:130
 msgid "Already logged in."
 msgstr "Zaten giriş yapılmış."
 
-#: actions/login.php:125
+#. TRANS: Form validation error displayed when trying to log in with incorrect credentials.
 msgid "Incorrect username or password."
 msgstr "Yanlış kullanıcı adı veya parola."
 
+#. TRANS: Server error displayed when during login a server error occurs.
 #. TRANS: Server error displayed when a user object could not be created trying to login using "one time password login".
-#: actions/login.php:131 actions/otp.php:127
 #, fuzzy
 msgid "Error setting user. You are probably not authorized."
 msgstr "Yetkilendirilmemiş."
 
-#: actions/login.php:185 actions/login.php:236 lib/action.php:598
+#. TRANS: Page title for login page.
 msgid "Login"
 msgstr "Giriş"
 
-#: actions/login.php:222
+#. TRANS: Form legend on login page.
 msgid "Login to site"
 msgstr "Siteye giriş"
 
-#: actions/login.php:231 actions/register.php:469
+#. TRANS: Checkbox label label on login page.
 msgid "Remember me"
 msgstr "Beni hatırla"
 
-#: actions/login.php:232 actions/register.php:471
+#. TRANS: Checkbox title on login page.
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 "Gelecekte kendiliğinden giriş yap, paylaşılan bilgisayarlar için değildir!"
 
-#: actions/login.php:241
+#. TRANS: Button text for log in on login page.
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Login"
+msgstr "Giriş"
+
+#. TRANS: Link text for link to "reset password" on login page.
 msgid "Lost or forgotten password?"
 msgstr "Parolamı unuttum veya kaybettim"
 
-#: actions/login.php:259
+#. TRANS: Form instructions on login page before being able to change user settings.
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -3735,11 +3051,12 @@ msgstr ""
 "Güvenliğiniz için, ayarlarınızı değiştirmeden önce lütfen kullanıcı adınızı "
 "ve parolanızı tekrar giriniz."
 
-#: actions/login.php:263
+#. TRANS: Form instructions on login page.
 msgid "Login with your username and password."
 msgstr "Yanlış kullanıcı adı veya parola."
 
-#: actions/login.php:266
+#. TRANS: Form instructions on login page. This message contains Markdown links in the form [Link text](Link).
+#. TRANS: %%action.register%% is a link to the registration page.
 #, fuzzy, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -3748,131 +3065,124 @@ msgstr ""
 "duruyorsunuz, hemen bir [yeni hesap oluşturun](%%action.register%%) ya da "
 "[OpenID](%%action.openidlogin%%) ile giriş yapın."
 
-#: actions/makeadmin.php:92
+#. TRANS: Client error displayed when trying to make another user admin on the Make Admin page while not an admin.
 msgid "Only an admin can make another user an admin."
 msgstr "Sadece bir yönetici, başka bir kullanıcıyı yönetici yapabilir."
 
-#: actions/makeadmin.php:96
+#. TRANS: Client error displayed when trying to make another user admin on the Make Admin page who already is admin.
+#. TRANS: %1$s is the user that is already admin, %2$s is the group user is already admin for.
 #, fuzzy, php-format
 msgid "%1$s is already an admin for group \"%2$s\"."
 msgstr "Kullanıcının profili yok."
 
-#: actions/makeadmin.php:133
+#. TRANS: Server error displayed when trying to make another user admin on the Make Admin page fails
+#. TRANS: because the group membership record could not be gotten.
+#. TRANS: %1$s is the to be admin user, %2$s is the group user should be admin for.
 #, fuzzy, php-format
 msgid "Can't get membership record for %1$s in group %2$s."
 msgstr "OpenID formu yaratılamadı: %s"
 
-#: actions/makeadmin.php:146
+#. TRANS: Server error displayed when trying to make another user admin on the Make Admin page fails
+#. TRANS: because the group adminship record coud not be saved properly.
+#. TRANS: %1$s is the to be admin user, %2$s is the group user is already admin for.
 #, fuzzy, php-format
 msgid "Can't make %1$s an admin for group %2$s."
 msgstr "Kullanıcının profili yok."
 
-#: actions/microsummary.php:69
+#. TRANS: Client error displayed trying to make a micro summary without providing a status.
 #, fuzzy
 msgid "No current status."
 msgstr "Sonuç yok"
 
 #. TRANS: This is the title of the form for adding a new application.
-#: actions/newapplication.php:52
 #, fuzzy
 msgid "New application"
 msgstr "Yeni Uygulama"
 
 #. TRANS: Client error displayed trying to add a new application while not logged in.
-#: actions/newapplication.php:64
 msgid "You must be logged in to register an application."
 msgstr ""
 
 #. TRANS: Form instructions for registering a new application.
-#: actions/newapplication.php:147
 msgid "Use this form to register a new application."
 msgstr ""
 
 #. TRANS: Validation error shown when not providing a source URL in the "New application" form.
-#: actions/newapplication.php:189
 msgid "Source URL is required."
 msgstr ""
 
 #. TRANS: Server error displayed when an application could not be registered in the database through the "New application" form.
-#: actions/newapplication.php:279 actions/newapplication.php:289
 msgid "Could not create application."
 msgstr "Eposta onayı silinemedi."
 
 #. TRANS: Title for form to create a group.
-#: actions/newgroup.php:53
 msgid "New group"
 msgstr "Yeni grup"
 
 #. TRANS: Client exception thrown when a user tries to create a group while banned.
-#: actions/newgroup.php:73 classes/User_group.php:485
 #, fuzzy
 msgid "You are not allowed to create groups on this site."
 msgstr "Bu grubun bir üyesi değilsiniz."
 
 #. TRANS: Form instructions for group create form.
-#: actions/newgroup.php:117
 msgid "Use this form to create a new group."
 msgstr ""
 
-#. TRANS: Group create form validation error.
-#: actions/newgroup.php:200
-#, fuzzy
-msgid "Alias cannot be the same as nickname."
-msgstr "Diğerisim, kullanıcı adı ile aynı olamaz."
-
-#: actions/newmessage.php:71 actions/newmessage.php:234
+#. TRANS: Page title for new direct message page.
+#. TRANS: Page title on page for sending a direct message.
 msgid "New message"
 msgstr "Yeni mesaj"
 
-#. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
-#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:513
+#. TRANS: Client error displayed trying to send a direct message to a user while sender and
+#. TRANS: receiver are not subscribed to each other.
 #, fuzzy
-msgid "You can't send a message to this user."
+msgid "You cannot send a message to this user."
 msgstr "Bize o profili yollamadınız"
 
+#. TRANS: Form validator error displayed trying to send a direct message without content.
+#. TRANS: Client error displayed trying to send a notice without content.
 #. TRANS: Command exception text shown when trying to send a direct message to another user without content.
 #. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
-#: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:490
-#: lib/command.php:593
 msgid "No content!"
 msgstr "İçerik yok!"
 
-#: actions/newmessage.php:161
+#. TRANS: Form validation error displayed trying to send a direct message without specifying a recipient.
 msgid "No recipient specified."
 msgstr ""
 
+#. TRANS: Client error displayed trying to send a direct message to self.
 #. TRANS: Error text shown when trying to send a direct message to self.
-#: actions/newmessage.php:167 lib/command.php:517
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
 
-#: actions/newmessage.php:184
+#. TRANS: Page title after sending a direct message.
 msgid "Message sent"
 msgstr "Mesaj gönder"
 
+#. TRANS: Confirmation text after sending a direct message.
+#. TRANS: %s is the direct message recipient.
 #. TRANS: Message given have sent a direct message to another user.
 #. TRANS: %s is the name of the other user.
-#: actions/newmessage.php:188 lib/command.php:525
 #, php-format
 msgid "Direct message to %s sent."
 msgstr "%s kullanıcısına özel mesaj gönderildi."
 
-#: actions/newmessage.php:213 actions/newnotice.php:264
+#. TRANS: Page title after an AJAX error occurred on the "send direct message" page.
+#. TRANS: Page title after an AJAX error occurs on the send notice page.
 msgid "Ajax Error"
 msgstr "Ajax Hatası"
 
-#: actions/newnotice.php:69
+#. TRANS: Page title for sending a new notice.
 msgid "New notice"
 msgstr "Yeni durum mesajı"
 
-#: actions/newnotice.php:230
+#. TRANS: Page title after sending a notice.
 msgid "Notice posted"
 msgstr "Durum mesajı gönderildi"
 
 #. TRANS: Instructions for Notice search page.
 #. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/noticesearch.php:69
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -3882,20 +3192,17 @@ msgstr ""
 "boşluk ile ayırın. Anahtar kelime 3 veya daha fazla karakterden oluşmalı."
 
 #. TRANS: Title of the page where users can search for notices.
-#: actions/noticesearch.php:80
 msgid "Text search"
 msgstr "Metin arama"
 
 #. TRANS: Test in RSS notice search.
 #. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearch.php:95
 #, php-format
 msgid "Search results for \"%1$s\" on %2$s"
 msgstr "%2$s üzerindeki \"%1$s\" için arama sonuçları"
 
 #. TRANS: Text for logged in users making a query for notices without results.
 #. TRANS: This message contains a Markdown link.
-#: actions/noticesearch.php:128
 #, php-format
 msgid ""
 "Be the first to [post on this topic](%%%%action.newnotice%%%%?"
@@ -3904,7 +3211,6 @@ msgstr ""
 
 #. TRANS: Text for not logged in users making a query for notices without results.
 #. TRANS: This message contains Markdown links.
-#: actions/noticesearch.php:133
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and be the first to "
@@ -3912,78 +3218,67 @@ msgid ""
 msgstr ""
 
 #. TRANS: RSS notice search feed title. %s is the query.
-#: actions/noticesearchrss.php:95
 #, fuzzy, php-format
 msgid "Updates with \"%s\""
 msgstr "%s adli kullanicinin durum mesajlari"
 
 #. TRANS: RSS notice search feed description.
 #. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearchrss.php:99
 #, fuzzy, php-format
 msgid "Updates matching search term \"%1$s\" on %2$s."
 msgstr "\"%s\" kelimesinin geçtiği tüm güncellemeler"
 
-#: actions/nudge.php:85
+#. TRANS: Client error displayed trying to nudge a user that cannot be nudged.
 msgid ""
 "This user doesn't allow nudges or hasn't confirmed or set their email "
 "address yet."
 msgstr ""
 
-#: actions/nudge.php:94
+#. TRANS: Page title after sending a nudge.
 msgid "Nudge sent"
 msgstr ""
 
-#: actions/nudge.php:97
+#. TRANS: Confirmation text after sending a nudge.
 msgid "Nudge sent!"
 msgstr ""
 
 #. TRANS: Message displayed to an anonymous user trying to view OAuth application list.
-#: actions/oauthappssettings.php:57
 msgid "You must be logged in to list your applications."
 msgstr "Uygulamalarınızı listelemek için giriş yapmış olmanız gerekir."
 
 #. TRANS: Page title for OAuth applications
-#: actions/oauthappssettings.php:73
 msgid "OAuth applications"
 msgstr "OAuth uygulamaları"
 
 #. TRANS: Page instructions for OAuth applications
-#: actions/oauthappssettings.php:85
 msgid "Applications you have registered"
 msgstr "Kaydettiğiniz uygulamalar"
 
 #. TRANS: Empty list message on page with OAuth applications.
-#: actions/oauthappssettings.php:138
 #, php-format
 msgid "You have not registered any applications yet."
 msgstr ""
 
 #. TRANS: Title for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:69
 msgid "Connected applications"
 msgstr "Bağlı uygulamalar"
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:80
 msgid "The following connections exist for your account."
 msgstr ""
 
 #. TRANS: Client error when trying to revoke access for an application while not being a user of it.
-#: actions/oauthconnectionssettings.php:165
 msgid "You are not a user of that application."
 msgstr "Bu uygulamanın bir kullanıcısı değilsiniz."
 
 #. TRANS: Client error when revoking access has failed for some reason.
 #. TRANS: %s is the application ID revoking access failed for.
-#: actions/oauthconnectionssettings.php:180
 #, fuzzy, php-format
 msgid "Unable to revoke access for application: %s."
 msgstr "Uygulamayı düzenlemek için bu biçimi kullan."
 
 #. TRANS: Success message after revoking access for an application.
 #. TRANS: %1$s is the application name, %2$s is the first part of the user token.
-#: actions/oauthconnectionssettings.php:199
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -3991,475 +3286,392 @@ msgid ""
 msgstr ""
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:210
 msgid "You have not authorized any applications to use your account."
 msgstr ""
 
 #. TRANS: Note for developers in the OAuth connection settings form.
 #. TRANS: This message contains a Markdown link. Do not separate "](".
 #. TRANS: %s is the URL to the OAuth settings.
-#: actions/oauthconnectionssettings.php:230
 #, php-format
 msgid ""
 "Are you a developer? [Register an OAuth client application](%s) to use with "
 "this instance of StatusNet."
 msgstr ""
 
-#: actions/oembed.php:64
+#. TRANS: Server error displayed in oEmbed action when path not found.
+#. TRANS: %s is a path.
 #, fuzzy, php-format
 msgid "\"%s\" not found."
 msgstr "Onay kodu bulunamadı."
 
-#: actions/oembed.php:76
+#. TRANS: Server error displayed in oEmbed action when notice not found.
+#. TRANS: %s is a notice.
 #, fuzzy, php-format
 msgid "Notice %s not found."
 msgstr "Üst durum mesajı bulunamadı."
 
-#: actions/oembed.php:80 actions/shownotice.php:100
+#. TRANS: Server error displayed in oEmbed action when notice has not profile.
 msgid "Notice has no profile."
 msgstr "Kullanıcının profili yok."
 
-#: actions/oembed.php:83 actions/shownotice.php:172
+#. TRANS: oEmbed title. %1$s is the author name, %2$s is the creation date.
 #, php-format
 msgid "%1$s's status on %2$s"
 msgstr "%1$s'in %2$s'deki durum mesajları "
 
-#: actions/oembed.php:95
+#. TRANS: Server error displayed in oEmbed action when attachment not found.
+#. TRANS: %d is an attachment ID.
 #, fuzzy, php-format
 msgid "Attachment %s not found."
 msgstr "Alıcı kullanıcı bulunamadı."
 
-#: actions/oembed.php:136
+#. TRANS: Server error displayed in oEmbed request when a path is not supported.
+#. TRANS: %s is a path.
 #, php-format
 msgid "\"%s\" not supported for oembed requests."
 msgstr ""
 
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
-#: actions/oembed.php:168
 #, fuzzy, php-format
 msgid "Content type %s not supported."
 msgstr "Bağlan"
 
 #. TRANS: Error message displaying attachments. %s is the site's base URL.
-#: actions/oembed.php:172
 #, php-format
 msgid "Only %s URLs over plain HTTP please."
 msgstr ""
 
+#. TRANS: Server error displayed in oEmbed action when request specifies an unsupported data format.
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1207
-#: lib/apiaction.php:1234 lib/apiaction.php:1369
 msgid "Not a supported data format."
 msgstr "Desteklenen bir veri biçimi değil."
 
 #. TRANS: ShortName in the OpenSearch interface when trying to find users.
-#: actions/opensearch.php:64
 msgid "People Search"
 msgstr "Kişi Arama"
 
-#: actions/opensearch.php:68
+#. TRANS: ShortName in the OpenSearch interface when trying to find notices.
 msgid "Notice Search"
 msgstr "Durum Mesajı Arama"
 
 #. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
-#: actions/otp.php:70
 #, fuzzy
 msgid "No user ID specified."
 msgstr "Yeni durum mesajı"
 
 #. TRANS: Client error displayed trying to use "one time password login" without specifying a login token.
-#: actions/otp.php:86
 #, fuzzy
 msgid "No login token specified."
 msgstr "Yeni durum mesajı"
 
 #. TRANS: Client error displayed trying to use "one time password login" without requesting a login token.
-#: actions/otp.php:94
 #, fuzzy
 msgid "No login token requested."
 msgstr "Yetkilendirme isteği yok!"
 
 #. TRANS: Client error displayed trying to use "one time password login" while specifying an invalid login token.
-#: actions/otp.php:100
 #, fuzzy
 msgid "Invalid login token specified."
 msgstr "Geçersiz durum mesajı"
 
 #. TRANS: Client error displayed trying to use "one time password login" while specifying an expired login token.
-#: actions/otp.php:110
 msgid "Login token expired."
 msgstr ""
 
 #. TRANS: Title for outbox for any but the fist page.
 #. TRANS: %1$s is the user nickname, %2$d is the page number.
-#: actions/outbox.php:57
 #, php-format
 msgid "Outbox for %1$s - page %2$d"
 msgstr ""
 
 #. TRANS: Title for first page of outbox.
-#: actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
 msgstr ""
 
 #. TRANS: Instructions for outbox.
-#: actions/outbox.php:103
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr ""
 
-#: actions/passwordsettings.php:58
 msgid "Change password"
 msgstr "Parolayı değiştir"
 
-#: actions/passwordsettings.php:69
 msgid "Change your password."
 msgstr "Parolanızı değiştirin."
 
 #. TRANS: Fieldset legend for password reset form.
-#: actions/passwordsettings.php:96 actions/recoverpassword.php:251
 msgid "Password change"
 msgstr "Parola değiştirildi"
 
-#: actions/passwordsettings.php:104
 msgid "Old password"
 msgstr "Eski parola"
 
 #. TRANS: Field label for password reset form.
-#: actions/passwordsettings.php:108 actions/recoverpassword.php:256
 msgid "New password"
 msgstr "Yeni parola"
 
-#: actions/passwordsettings.php:109 actions/register.php:416
 #, fuzzy
 msgid "6 or more characters."
 msgstr "6 veya daha fazla karakter"
 
 #. TRANS: Ttile for field label for password reset form where the password has to be typed again.
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:264
-#: actions/register.php:420
 #, fuzzy
 msgid "Same as password above."
 msgstr "yukarıdaki parolanın aynısı"
 
-#: actions/passwordsettings.php:117
 msgid "Change"
 msgstr "Değiştir"
 
-#: actions/passwordsettings.php:153 actions/register.php:223
 msgid "Password must be 6 or more characters."
 msgstr "Parola 6 veya daha fazla karakterden oluşmalıdır."
 
-#: actions/passwordsettings.php:156 actions/register.php:226
 msgid "Passwords don't match."
 msgstr "Parolalar birbirini tutmuyor."
 
-#: actions/passwordsettings.php:164
 msgid "Incorrect old password"
 msgstr "Eski parola yanlış"
 
-#: actions/passwordsettings.php:180
 msgid "Error saving user; invalid."
 msgstr "Kullanıcıyı kaydetmede hata oluştu; geçersiz."
 
 #. TRANS: Reset password form validation error message.
-#: actions/passwordsettings.php:185 actions/recoverpassword.php:418
 #, fuzzy
 msgid "Cannot save new password."
 msgstr "Yeni parola kaydedilemedi."
 
-#: actions/passwordsettings.php:191
 msgid "Password saved."
 msgstr "Parola kaydedildi."
 
 #. TRANS: Title for Paths admin panel.
 #. TRANS: Menu item for site administration
-#: actions/pathsadminpanel.php:58 lib/adminpanelaction.php:371
 msgid "Paths"
 msgstr "Yollar"
 
 #. TRANS: Form instructions for Path admin panel.
-#: actions/pathsadminpanel.php:69
 msgid "Path and server settings for this StatusNet site"
 msgstr "Bu StatusNet sitesi için yol ve sunucu ayarları"
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the directory that could not be read from.
-#: actions/pathsadminpanel.php:155
 #, fuzzy, php-format
 msgid "Theme directory not readable: %s."
 msgstr "Bu sayfa kabul ettiğiniz ortam türünde kullanılabilir değil"
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the avatar directory that could not be written to.
-#: actions/pathsadminpanel.php:163
 #, fuzzy, php-format
 msgid "Avatar directory not writable: %s."
 msgstr "Bu sayfa kabul ettiğiniz ortam türünde kullanılabilir değil"
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the background directory that could not be written to.
-#: actions/pathsadminpanel.php:171
 #, fuzzy, php-format
 msgid "Background directory not writable: %s."
 msgstr "Bu sayfa kabul ettiğiniz ortam türünde kullanılabilir değil"
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the locales directory that could not be read from.
-#: actions/pathsadminpanel.php:181
 #, fuzzy, php-format
 msgid "Locales directory not readable: %s."
 msgstr "Bu sayfa kabul ettiğiniz ortam türünde kullanılabilir değil"
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the SSL server URL that is too long.
-#: actions/pathsadminpanel.php:189
 msgid "Invalid SSL server. The maximum length is 255 characters."
 msgstr ""
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:235 actions/siteadminpanel.php:58
 msgid "Site"
 msgstr "Site"
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:241 actions/pathsadminpanel.php:279
-#: actions/pathsadminpanel.php:370 actions/pathsadminpanel.php:425
 msgid "Server"
 msgstr "Sunucu"
 
-#: actions/pathsadminpanel.php:242
 msgid "Site's server hostname."
 msgstr ""
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:248 actions/pathsadminpanel.php:288
-#: actions/pathsadminpanel.php:379 actions/pathsadminpanel.php:434
 msgid "Path"
 msgstr "Yol"
 
-#: actions/pathsadminpanel.php:249
 #, fuzzy
 msgid "Site path."
 msgstr "Site yolu"
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:255
 #, fuzzy
 msgid "Locale directory"
 msgstr "Avatar güncellendi."
 
-#: actions/pathsadminpanel.php:256
 msgid "Directory path to locales."
 msgstr ""
 
 #. TRANS: Checkbox label in Paths admin panel.
-#: actions/pathsadminpanel.php:263
 msgid "Fancy URLs"
 msgstr ""
 
-#: actions/pathsadminpanel.php:265
 msgid "Use fancy (more readable and memorable) URLs?"
 msgstr ""
 
-#: actions/pathsadminpanel.php:272
 msgid "Theme"
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:281
 #, fuzzy
 msgid "Server for themes."
 msgstr "Site için tema."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:290
 msgid "Web path to themes."
 msgstr ""
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:297 actions/pathsadminpanel.php:388
-#: actions/pathsadminpanel.php:443 actions/pathsadminpanel.php:495
 msgid "SSL server"
 msgstr "Sunucu"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:299
 msgid "SSL server for themes (default: SSL server)."
 msgstr ""
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:306 actions/pathsadminpanel.php:397
-#: actions/pathsadminpanel.php:452
 #, fuzzy
 msgid "SSL path"
 msgstr "Site yolu"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:308
 msgid "SSL path to themes (default: /theme/)."
 msgstr ""
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:315 actions/pathsadminpanel.php:406
-#: actions/pathsadminpanel.php:461
 #, fuzzy
 msgid "Directory"
 msgstr "Avatar güncellendi."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:317
 msgid "Directory where themes are located."
 msgstr ""
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:326
 #, fuzzy
 msgid "Avatars"
 msgstr "Avatar"
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:333
 msgid "Avatar server"
 msgstr "Avatar"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:335
 #, fuzzy
 msgid "Server for avatars."
 msgstr "Site için tema."
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:342
 #, fuzzy
 msgid "Avatar path"
 msgstr "Avatar güncellendi."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:344
 #, fuzzy
 msgid "Web path to avatars."
 msgstr "Avatar güncellemede hata."
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:351
 #, fuzzy
 msgid "Avatar directory"
 msgstr "Avatar güncellendi."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:353
 msgid "Directory where avatars are located."
 msgstr ""
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:364
 msgid "Backgrounds"
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:372
 #, fuzzy
 msgid "Server for backgrounds."
 msgstr "Site için tema."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:381
 msgid "Web path to backgrounds."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:390
 msgid "Server for backgrounds on SSL pages."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:399
 msgid "Web path to backgrounds on SSL pages."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:408
 msgid "Directory where backgrounds are located."
 msgstr ""
 
 #. TRANS: Fieldset legens in Paths admin panel.
-#: actions/pathsadminpanel.php:419
 msgid "Attachments"
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:427
 #, fuzzy
 msgid "Server for attachments."
 msgstr "Site için tema."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:436
 #, fuzzy
 msgid "Web path to attachments."
 msgstr "Ek yok."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:445
 #, fuzzy
 msgid "Server for attachments on SSL pages."
 msgstr "Site için tema."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:454
 msgid "Web path to attachments on SSL pages."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:463
 msgid "Directory where attachments are located."
 msgstr ""
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:472
 msgid "SSL"
 msgstr ""
 
 #. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
-#: actions/pathsadminpanel.php:477 actions/snapshotadminpanel.php:202
 msgid "Never"
 msgstr "Sunucu"
 
 #. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
-#: actions/pathsadminpanel.php:479
 #, fuzzy
 msgid "Sometimes"
 msgstr "Durum mesajları"
 
 #. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
-#: actions/pathsadminpanel.php:481
 msgid "Always"
 msgstr ""
 
-#: actions/pathsadminpanel.php:485
 msgid "Use SSL"
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:487
 msgid "When to use SSL."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:497
 msgid "Server to direct SSL requests to."
 msgstr ""
 
 #. TRANS: Button title text to store form data in the Paths admin panel.
-#: actions/pathsadminpanel.php:514
 #, fuzzy
 msgid "Save paths"
 msgstr "Yeni durum mesajı"
 
 #. TRANS: Instructions for the "People search" page.
 #. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/peoplesearch.php:54
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
@@ -4470,57 +3682,46 @@ msgstr ""
 "karakterden oluşmalı. "
 
 #. TRANS: Title of a page where users can search for other users.
-#: actions/peoplesearch.php:61
 msgid "People search"
 msgstr "Kişi Arama"
 
-#: actions/peopletag.php:68
 #, fuzzy, php-format
 msgid "Not a valid people tag: %s."
 msgstr "Geçersiz bir eposta adresi."
 
-#: actions/peopletag.php:142
 #, fuzzy, php-format
 msgid "Users self-tagged with %1$s - page %2$d"
 msgstr "%s adli kullanicinin durum mesajlari"
 
 #. TRANS: Page title for AJAX form return when a disabling a plugin.
-#: actions/plugindisable.php:69
 msgctxt "plugin"
 msgid "Disabled"
 msgstr ""
 
 #. TRANS: Client error displayed trying to perform any request method other than POST.
 #. TRANS: Do not translate POST.
-#: actions/pluginenable.php:78 actions/subscribe.php:77
 msgid "This action only accepts POST requests."
 msgstr ""
 
-#: actions/pluginenable.php:102
 #, fuzzy
 msgid "You cannot administer plugins."
 msgstr "Kullanıcıları silemezsiniz."
 
-#: actions/pluginenable.php:109
 #, fuzzy
 msgid "No such plugin."
 msgstr "Böyle bir sayfa yok."
 
 #. TRANS: Page title for AJAX form return when enabling a plugin.
-#: actions/pluginenable.php:159
 msgctxt "plugin"
 msgid "Enabled"
 msgstr ""
 
 #. TRANS: Tab and title for plugins admin panel.
 #. TRANS: Menu item for site administration
-#: actions/pluginsadminpanel.php:56 actions/version.php:191
-#: lib/adminpanelaction.php:411
 msgid "Plugins"
 msgstr "Eklentiler"
 
 #. TRANS: Instructions at top of plugin admin page.
-#: actions/pluginsadminpanel.php:68
 msgid ""
 "Additional plugins can be enabled and configured manually. See the <a href="
 "\"http://status.net/wiki/Plugins\">online plugin documentation</a> for more "
@@ -4528,32 +3729,26 @@ msgid ""
 msgstr ""
 
 #. TRANS: Admin form section header
-#: actions/pluginsadminpanel.php:84
 #, fuzzy
 msgid "Default plugins"
 msgstr "Öntanımlı dil"
 
-#: actions/pluginsadminpanel.php:106
 msgid ""
 "All default plugins have been disabled from the site's configuration file."
 msgstr ""
 
-#: actions/postnotice.php:95
 msgid "Invalid notice content."
 msgstr "Geçersiz büyüklük."
 
-#: actions/postnotice.php:101
 #, php-format
 msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’."
 msgstr ""
 
 #. TRANS: Page title for profile settings.
-#: actions/profilesettings.php:60
 msgid "Profile settings"
 msgstr "Profil ayarları"
 
 #. TRANS: Usage instructions for profile settings.
-#: actions/profilesettings.php:71
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
@@ -4561,12 +3756,10 @@ msgstr ""
 "hakkınızda daha fazla bilgi sahibi olur."
 
 #. TRANS: Profile settings form legend.
-#: actions/profilesettings.php:99
 msgid "Profile information"
 msgstr "Profil ayarları"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:110 actions/register.php:412
 #, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr ""
@@ -4574,20 +3767,15 @@ msgstr ""
 "verilmez"
 
 #. TRANS: Field label in form for profile settings.
-#: actions/profilesettings.php:114 actions/register.php:434
-#: lib/groupeditform.php:150
 msgid "Full name"
 msgstr "Tam İsim"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:119 actions/register.php:439
-#: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "Başlangıç Sayfası"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:122 actions/register.php:441
 #, fuzzy
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr ""
@@ -4596,49 +3784,38 @@ msgstr ""
 #. TRANS: Tooltip for field label in form for profile settings. Plural
 #. TRANS: is decided by the number of characters available for the
 #. TRANS: biography (%d).
-#: actions/profilesettings.php:130 actions/register.php:450
 #, fuzzy, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
 msgstr[0] "Kendinizi ve ilgi alanlarınızı 140 karakter ile anlatın"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:136 actions/register.php:455
 #, fuzzy
 msgid "Describe yourself and your interests"
 msgstr "Kendinizi ve ilgi alanlarınızı 140 karakter ile anlatın"
 
 #. TRANS: Text area label in form for profile settings where users can provide.
 #. TRANS: their biography.
-#: actions/profilesettings.php:140 actions/register.php:457
 msgid "Bio"
 msgstr "Hakkında"
 
 #. TRANS: Field label in form for profile settings.
-#: actions/profilesettings.php:146 actions/register.php:462
-#: lib/groupeditform.php:173
 msgid "Location"
 msgstr "Yer"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:149
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Bulunduğunuz yer, \"Şehir, Eyalet (veya Bölge), Ülke\" gibi"
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:154
 msgid "Share my current location when posting notices"
 msgstr ""
 
 #. TRANS: Field label in form for profile settings.
-#: actions/profilesettings.php:162 actions/tagother.php:128
-#: actions/tagother.php:188 lib/subscriptionlist.php:104
-#: lib/subscriptionlist.php:106
 msgid "Tags"
 msgstr "Etiketler"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:165
 #, fuzzy
 msgid ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- "
@@ -4648,28 +3825,23 @@ msgstr ""
 "boşlukla ayırabilirsiniz"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:170
 msgid "Language"
 msgstr "Dil"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:172
 #, fuzzy
 msgid "Preferred language."
 msgstr "Tercih edilen dil"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:182
 msgid "Timezone"
 msgstr "Zaman dilimi"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:184
 msgid "What timezone are you normally in?"
 msgstr "Normalde hangi zaman dilimi içindesiniz?"
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:190
 #, fuzzy
 msgid ""
 "Automatically subscribe to whoever subscribes to me (best for non-humans)."
@@ -4678,113 +3850,93 @@ msgstr "Bana abone olan herkese abone yap (insan olmayanlar için en iyisi)"
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Plural form is used based on the maximum number of allowed
 #. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:259 actions/register.php:214
 #, fuzzy, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
 msgstr[0] "Yer bilgisi çok uzun (azm: %d karakter)."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:270 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr "Zaman dilimi seçilmedi."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:278
 #, fuzzy
 msgid "Language is too long (maximum 50 characters)."
 msgstr "Dil çok uzun (maksimum: 50 karakter)."
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:292
 #, fuzzy, php-format
 msgid "Invalid tag: \"%s\"."
 msgstr "Geçersiz büyüklük."
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:348
 #, fuzzy
 msgid "Could not update user for autosubscribe."
 msgstr "Kullanıcı güncellenemedi."
 
 #. TRANS: Server error thrown when user profile location preference settings could not be updated.
-#: actions/profilesettings.php:406
 #, fuzzy
 msgid "Could not save location prefs."
 msgstr "Profil kaydedilemedi."
 
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:428 actions/tagother.php:179
 msgid "Could not save tags."
 msgstr "Profil kaydedilemedi."
 
 #. TRANS: Confirmation shown when user profile settings are saved.
 #. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:437 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "Ayarlar kaydedildi."
 
 #. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
 #. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:484 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "Bir hesap oluştur"
 
-#: actions/public.php:83
 #, php-format
 msgid "Beyond the page limit (%s)."
 msgstr ""
 
-#: actions/public.php:92
 #, fuzzy
 msgid "Could not retrieve public stream."
 msgstr "Kullanıcı güncellenemedi."
 
-#: actions/public.php:130
 #, fuzzy, php-format
 msgid "Public timeline, page %d"
 msgstr "Genel zaman çizgisi"
 
-#: actions/public.php:132 lib/publicgroupnav.php:79
 msgid "Public timeline"
 msgstr "Genel zaman çizgisi"
 
-#: actions/public.php:160
 #, fuzzy
 msgid "Public Stream Feed (RSS 1.0)"
 msgstr "Genel Durum Akış RSS Beslemesi"
 
-#: actions/public.php:164
 #, fuzzy
 msgid "Public Stream Feed (RSS 2.0)"
 msgstr "Genel Durum Akış RSS Beslemesi"
 
-#: actions/public.php:168
 #, fuzzy
 msgid "Public Stream Feed (Atom)"
 msgstr "Genel Durum Akış RSS Beslemesi"
 
-#: actions/public.php:188
 #, php-format
 msgid ""
 "This is the public timeline for %%site.name%% but no one has posted anything "
 "yet."
 msgstr ""
 
-#: actions/public.php:191
 msgid "Be the first to post!"
 msgstr ""
 
-#: actions/public.php:195
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post!"
 msgstr ""
 
-#: actions/public.php:242
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -4793,7 +3945,6 @@ msgid ""
 "friends, family, and colleagues! ([Read more](%%doc.help%%))"
 msgstr ""
 
-#: actions/public.php:247
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -4802,20 +3953,17 @@ msgid ""
 msgstr ""
 
 #. TRANS: Public RSS feed description. %s is the StatusNet site name.
-#: actions/publicrss.php:106
 #, php-format
 msgid "%s updates from everyone."
 msgstr ""
 
 #. TRANS: Title for public tag cloud.
-#: actions/publictagcloud.php:57
 #, fuzzy
 msgid "Public tag cloud"
 msgstr "Genel Durum Akış RSS Beslemesi"
 
 #. TRANS: Instructions (more used like an explanation/header).
 #. TRANS: %s is the StatusNet sitename.
-#: actions/publictagcloud.php:65
 #, php-format
 msgid "These are most popular recent tags on %s"
 msgstr ""
@@ -4823,14 +3971,12 @@ msgstr ""
 #. TRANS: This message contains a Markdown URL. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.
-#: actions/publictagcloud.php:74
 #, php-format
 msgid "No one has posted a notice with a [hashtag](%%doc.tags%%) yet."
 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.
-#: actions/publictagcloud.php:79
 msgid "Be the first to post one!"
 msgstr ""
 
@@ -4839,7 +3985,6 @@ msgstr ""
 #. TRANS: This message contains a Markdown URL. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.
-#: actions/publictagcloud.php:87
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post "
@@ -4847,43 +3992,35 @@ msgid ""
 msgstr ""
 
 #. TRANS: Client error displayed trying to recover password while already logged in.
-#: actions/recoverpassword.php:37
 msgid "You are already logged in!"
 msgstr "Zaten giriş yapmış durumdasıznız!"
 
 #. TRANS: Client error displayed when password recovery code is not correct.
-#: actions/recoverpassword.php:64
 msgid "No such recovery code."
 msgstr "Böyle bir geri alma kodu yok."
 
 #. TRANS: Client error displayed when no proper password recovery code was submitted.
-#: actions/recoverpassword.php:69
 msgid "Not a recovery code."
 msgstr "Bir geri alma kodu değil."
 
 #. TRANS: Server error displayed trying to recover password without providing a user.
-#: actions/recoverpassword.php:77
 msgid "Recovery code for unknown user."
 msgstr "Bilinmeye kullanıcı için geri alma kodu"
 
 #. TRANS: Server error displayed removing a password recovery code from the database.
-#: actions/recoverpassword.php:91
 msgid "Error with confirmation code."
 msgstr "Onay kodu hatası."
 
 #. TRANS: Client error displayed trying to recover password with too old a recovery code.
-#: actions/recoverpassword.php:103
 msgid "This confirmation code is too old. Please start again."
 msgstr "Onay kodu çok eski. Lütfen tekrar başlayınız."
 
 #. TRANS: Server error displayed when updating a user's e-mail address in the database fails while recovering a password.
-#: actions/recoverpassword.php:118
 #, fuzzy
 msgid "Could not update user with confirmed email address."
 msgstr "Kullanıcı güncellenemedi."
 
 #. TRANS: Page notice for password recovery page.
-#: actions/recoverpassword.php:160
 #, fuzzy
 msgid ""
 "If you have forgotten or lost your password, you can get a new one sent to "
@@ -4892,103 +4029,85 @@ msgstr ""
 "Hesabınıza eklemiş olduğunuz eposta adresine parolanızı geri getirmek için "
 "gerekli olan talimatlar yollanmıştır."
 
-#: actions/recoverpassword.php:167
 msgid "You have been identified. Enter a new password below."
 msgstr ""
 
 #. TRANS: Fieldset legend for password recovery page.
-#: actions/recoverpassword.php:198
 #, fuzzy
 msgid "Password recovery"
 msgstr "Parola geri alma isteği"
 
 #. TRANS: Field label on password recovery page.
-#: actions/recoverpassword.php:202
 #, fuzzy
 msgid "Nickname or email address"
 msgstr "Bir takma ad veya eposta adresi girin."
 
 #. TRANS: Title for field label on password recovery page.
-#: actions/recoverpassword.php:205
 msgid "Your nickname on this server, or your registered email address."
 msgstr "Bu sunucudaki takma adınız  veya kaydedilmiş eposta adresiniz."
 
 #. TRANS: Field label on password recovery page.
-#: actions/recoverpassword.php:212
 msgid "Recover"
 msgstr "Geri al"
 
 #. TRANS: Button text on password recovery page.
-#: actions/recoverpassword.php:214
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Recover"
 msgstr "Geri al"
 
 #. TRANS: Title for password recovery page in password reset mode.
-#: actions/recoverpassword.php:223
 msgid "Reset password"
 msgstr "Parolayı sıfırla"
 
 #. TRANS: Title for password recovery page in password recover mode.
-#: actions/recoverpassword.php:225
 msgid "Recover password"
 msgstr "Parolanı geri al"
 
 #. TRANS: Title for password recovery page in email sent mode.
 #. TRANS: Subject for password recovery e-mail.
-#: actions/recoverpassword.php:227 actions/recoverpassword.php:366
 msgid "Password recovery requested"
 msgstr "Parola geri alma isteği"
 
 #. TRANS: Title for password recovery page in password saved mode.
-#: actions/recoverpassword.php:229
 #, fuzzy
 msgid "Password saved"
 msgstr "Parola kaydedildi."
 
 #. TRANS: Title for password recovery page when an unknown action has been specified.
-#: actions/recoverpassword.php:232
 msgid "Unknown action"
 msgstr ""
 
 #. TRANS: Title for field label for password reset form.
-#: actions/recoverpassword.php:258
 #, fuzzy
 msgid "6 or more characters, and do not forget it!"
 msgstr "Unutmayın, 6 veya daha fazla karakter"
 
 #. TRANS: Button text for password reset form.
 #. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: actions/recoverpassword.php:268 lib/designform.php:145
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Reset"
 msgstr "Sıfırla"
 
 #. TRANS: Form instructions for password recovery form.
-#: actions/recoverpassword.php:278
 msgid "Enter a nickname or email address."
 msgstr "Bir takma ad veya eposta adresi girin."
 
 #. TRANS: Information on password recovery form if no known username or e-mail address was specified.
-#: actions/recoverpassword.php:309
 #, fuzzy
 msgid "No user with that email address or username."
 msgstr "Kullanıcı için kaydedilmiş eposta adresi yok."
 
 #. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
-#: actions/recoverpassword.php:327
 msgid "No registered email address for that user."
 msgstr "Kullanıcı için kaydedilmiş eposta adresi yok."
 
 #. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
-#: actions/recoverpassword.php:342
 msgid "Error saving address confirmation."
 msgstr "Adres onayını kaydetmede hata."
 
 #. TRANS: User notification after an e-mail with instructions was sent from the password recovery form.
-#: actions/recoverpassword.php:370
 msgid ""
 "Instructions for recovering your password have been sent to the email "
 "address registered to your account."
@@ -4997,124 +4116,98 @@ msgstr ""
 "gerekli olan talimatlar yollanmıştır."
 
 #. TRANS: Client error displayed when trying to reset as password without providing a user.
-#: actions/recoverpassword.php:391
 msgid "Unexpected password reset."
 msgstr "Beklemeğen parola sıfırlaması."
 
 #. TRANS: Reset password form validation error message.
-#: actions/recoverpassword.php:400
 #, fuzzy
 msgid "Password must be 6 characters or more."
 msgstr "Parola 6 veya daha fazla karakterden oluşmalıdır."
 
 #. TRANS: Reset password form validation error message.
-#: actions/recoverpassword.php:405
 msgid "Password and confirmation do not match."
 msgstr "Parola ve onaylaması birbirini tutmuyor."
 
 #. TRANS: Server error displayed when something does wrong with the user object during password reset.
-#: actions/recoverpassword.php:426 actions/register.php:241
 msgid "Error setting user."
 msgstr "Kullanıcı ayarlamada hata oluştu."
 
 #. TRANS: Success message for user after password reset.
-#: actions/recoverpassword.php:434
 msgid "New password successfully saved. You are now logged in."
 msgstr "Yeni parola başarıyla kaydedildi. Şimdi giriş yaptınız."
 
-#: actions/redirecturl.php:70
 #, fuzzy
 msgid "No id parameter"
 msgstr "Böyle bir belge yok."
 
-#: actions/redirecturl.php:76
 #, fuzzy, php-format
 msgid "No such file \"%d\""
 msgstr "Böyle bir dosya yok."
 
-#: actions/register.php:80 actions/register.php:181 actions/register.php:392
 msgid "Sorry, only invited people can register."
 msgstr ""
 
-#: actions/register.php:87
 #, fuzzy
 msgid "Sorry, invalid invitation code."
 msgstr "Onay kodu hatası."
 
-#: actions/register.php:106
 msgid "Registration successful"
 msgstr "Kayıt başarılı"
 
-#: actions/register.php:108 actions/register.php:490
 msgid "Register"
 msgstr "Kayıt"
 
-#: actions/register.php:128
 msgid "Registration not allowed."
 msgstr "Kayıt yapılmasına izin verilmiyor."
 
-#: actions/register.php:194
 #, fuzzy
 msgid "You cannot register if you don't agree to the license."
 msgstr "Eğer lisansı kabul etmezseniz kayıt olamazsınız."
 
-#: actions/register.php:203
 msgid "Email address already exists."
 msgstr "Eposta adresi zaten var."
 
-#: actions/register.php:236 actions/register.php:258
 msgid "Invalid username or password."
 msgstr "Geçersiz kullanıcı adı veya parola."
 
-#: actions/register.php:333
 msgid ""
 "With this form you can create a new account. You can then post notices and "
 "link up to friends and colleagues."
 msgstr ""
 
-#: actions/register.php:424 actions/register.php:428
-#: actions/siteadminpanel.php:238 lib/settingsnav.php:92
 msgid "Email"
 msgstr "Eposta"
 
-#: actions/register.php:425 actions/register.php:429
 #, fuzzy
 msgid "Used only for updates, announcements, and password recovery."
 msgstr ""
 "Sadece sistem güncellemeleri, duyurular ve parola geri alma için kullanılır."
 
-#: actions/register.php:436
 msgid "Longer name, preferably your \"real\" name."
 msgstr ""
 
-#: actions/register.php:464
 #, fuzzy
 msgid "Where you are, like \"City, State (or Region), Country\"."
 msgstr "Bulunduğunuz yer, \"Şehir, Eyalet (veya Bölge), Ülke\" gibi"
 
-#: actions/register.php:503
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
 msgstr ""
 
-#: actions/register.php:513
 #, php-format
 msgid "My text and files are copyright by %1$s."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:517
 msgid "My text and files remain under my own copyright."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:520
 msgid "All rights reserved."
 msgstr "Tüm hakları saklıdır."
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:525
 #, fuzzy, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -5123,7 +4216,6 @@ msgstr ""
 "bu özel veriler haricinde: parola, eposta adresi, IM adresi, telefon "
 "numarası."
 
-#: actions/register.php:566
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -5142,13 +4234,11 @@ msgid ""
 "Thanks for signing up and we hope you enjoy using this service."
 msgstr ""
 
-#: actions/register.php:590
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
 msgstr ""
 
-#: actions/remotesubscribe.php:97
 #, php-format
 msgid ""
 "To subscribe, you can [login](%%action.login%%), or [register](%%action."
@@ -5156,127 +4246,100 @@ msgid ""
 "microblogging site](%%doc.openmublog%%),  enter your profile URL below."
 msgstr ""
 
-#: actions/remotesubscribe.php:111
 msgid "Remote subscribe"
 msgstr "Uzaktan abonelik"
 
-#: actions/remotesubscribe.php:123
 #, fuzzy
 msgid "Subscribe to a remote user"
 msgstr "Takip talebine izin verildi"
 
-#: actions/remotesubscribe.php:128
 msgid "User nickname"
 msgstr "Kullanıcı takma adı"
 
-#: actions/remotesubscribe.php:129
 #, fuzzy
 msgid "Nickname of the user you want to follow."
 msgstr "Takip etmek istediğiniz kullanıcının takma adı"
 
-#: actions/remotesubscribe.php:132
 msgid "Profile URL"
 msgstr "Profil Adresi"
 
-#: actions/remotesubscribe.php:133
 msgid "URL of your profile on another compatible microblogging service."
 msgstr ""
 
 #. TRANS: Link text for link that will subscribe to a remote profile.
-#: actions/remotesubscribe.php:136 lib/subscribeform.php:139
-#: lib/userprofile.php:402
 msgid "Subscribe"
 msgstr "Abone ol"
 
-#: actions/remotesubscribe.php:158
 #, fuzzy
 msgid "Invalid profile URL (bad format)."
 msgstr "Geçersiz dosya ismi."
 
-#: actions/remotesubscribe.php:167
 #, fuzzy
 msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
 msgstr "Geçersiz profil adresi (YADIS belgesi yok)."
 
-#: actions/remotesubscribe.php:175
 msgid "That is a local profile! Login to subscribe."
 msgstr ""
 
-#: actions/remotesubscribe.php:182
 #, fuzzy
 msgid "Could not get a request token."
 msgstr "Yeni abonelik eklenemedi."
 
-#: actions/repeat.php:56
 msgid "Only logged-in users can repeat notices."
 msgstr ""
 
-#: actions/repeat.php:63 actions/repeat.php:70
 #, fuzzy
 msgid "No notice specified."
 msgstr "Yeni durum mesajı"
 
-#: actions/repeat.php:75
 #, fuzzy
 msgid "You cannot repeat your own notice."
 msgstr "Eğer lisansı kabul etmezseniz kayıt olamazsınız."
 
-#: actions/repeat.php:89
 #, fuzzy
 msgid "You already repeated that notice."
 msgstr "Zaten giriş yapmış durumdasıznız!"
 
-#: actions/repeat.php:112 lib/noticelist.php:697
 msgid "Repeated"
 msgstr "Sıfırla"
 
-#: actions/repeat.php:117
 #, fuzzy
 msgid "Repeated!"
 msgstr "Yarat"
 
 #. TRANS: RSS reply feed title. %s is a user nickname.
-#: actions/replies.php:126 actions/repliesrss.php:68
-#: lib/personalgroupnav.php:105
 #, php-format
 msgid "Replies to %s"
 msgstr "%s için cevaplar"
 
-#: actions/replies.php:128
 #, fuzzy, php-format
 msgid "Replies to %1$s, page %2$d"
 msgstr "%s için cevaplar"
 
-#: actions/replies.php:145
 #, fuzzy, php-format
 msgid "Replies feed for %s (RSS 1.0)"
 msgstr "%s için durum RSS beslemesi"
 
-#: actions/replies.php:152
 #, fuzzy, php-format
 msgid "Replies feed for %s (RSS 2.0)"
 msgstr "%s için durum RSS beslemesi"
 
-#: actions/replies.php:159
 #, php-format
 msgid "Replies feed for %s (Atom)"
 msgstr "%s için cevaplar"
 
-#: actions/replies.php:199
 #, php-format
 msgid ""
 "This is the timeline showing replies to %1$s but %2$s hasn't received a "
 "notice to them yet."
 msgstr ""
 
-#: actions/replies.php:204
 #, php-format
 msgid ""
 "You can engage other users in a conversation, subscribe to more people or "
 "[join groups](%%action.groups%%)."
 msgstr ""
 
-#: actions/replies.php:206
 #, php-format
 msgid ""
 "You can try to [nudge %1$s](../%2$s) or [post something to them](%%%%action."
@@ -5285,228 +4348,187 @@ msgstr ""
 
 #. TRANS: RSS reply feed description.
 #. TRANS: %1$s is a user nickname, %2$s is the StatusNet site name.
-#: actions/repliesrss.php:74
 #, fuzzy, php-format
 msgid "Replies to %1$s on %2$s."
 msgstr "%s için cevaplar"
 
 #. TRANS: Client exception displayed when trying to restore an account while not logged in.
-#: actions/restoreaccount.php:78
 msgid "Only logged-in users can restore their account."
 msgstr ""
 
 #. TRANS: Client exception displayed when trying to restore an account without having restore rights.
-#: actions/restoreaccount.php:83
 #, fuzzy
 msgid "You may not restore your account."
 msgstr "Eğer lisansı kabul etmezseniz kayıt olamazsınız."
 
 #. TRANS: Client exception displayed trying to restore an account while something went wrong uploading a file.
 #. TRANS: Client exception. No file; probably just a non-AJAX submission.
-#: actions/restoreaccount.php:121 actions/restoreaccount.php:146
 #, fuzzy
 msgid "No uploaded file."
 msgstr "Yükle"
 
 #. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
-#: actions/restoreaccount.php:129 lib/mediafile.php:194
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
 msgstr ""
 
 #. TRANS: Client exception.
-#: actions/restoreaccount.php:135 lib/mediafile.php:200
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form."
 msgstr ""
 
 #. TRANS: Client exception.
-#: actions/restoreaccount.php:141 lib/mediafile.php:206
 msgid "The uploaded file was only partially uploaded."
 msgstr ""
 
 #. TRANS: Client exception thrown when a temporary folder is not present to store a file upload.
-#: actions/restoreaccount.php:150 lib/mediafile.php:214
 msgid "Missing a temporary folder."
 msgstr ""
 
 #. TRANS: Client exception thrown when writing to disk is not possible during a file upload operation.
-#: actions/restoreaccount.php:154 lib/mediafile.php:218
 msgid "Failed to write file to disk."
 msgstr ""
 
 #. TRANS: Client exception thrown when a file upload operation has been stopped by an extension.
-#: actions/restoreaccount.php:158 lib/mediafile.php:222
 msgid "File upload stopped by extension."
 msgstr ""
 
 #. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
 #. TRANS: Exception thrown when uploading an image fails for an unknown reason.
 #. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
-#: actions/restoreaccount.php:164 lib/imagefile.php:106 lib/mediafile.php:228
 msgid "System error uploading file."
 msgstr "Dosya yüklemede sistem hatası."
 
 #. TRANS: Client exception thrown when a feed is not an Atom feed.
-#: actions/restoreaccount.php:207
 #, fuzzy
 msgid "Not an Atom feed."
 msgstr "Tüm üyeler"
 
 #. TRANS: Success message when a feed has been restored.
-#: actions/restoreaccount.php:241
 msgid ""
 "Feed has been restored. Your old posts should now appear in search and your "
 "profile page."
 msgstr ""
 
 #. TRANS: Message when a feed restore is in progress.
-#: actions/restoreaccount.php:245
 msgid "Feed will be restored. Please wait a few minutes for results."
 msgstr ""
 
 #. TRANS: Form instructions for feed restore.
-#: actions/restoreaccount.php:342
 msgid ""
 "You can upload a backed-up stream in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format."
 msgstr ""
 
 #. TRANS: Title for submit button to confirm upload of a user backup file for account restore.
-#: actions/restoreaccount.php:373
 #, fuzzy
 msgid "Upload the file"
 msgstr "Yükle"
 
-#: actions/revokerole.php:75
 #, fuzzy
 msgid "You cannot revoke user roles on this site."
 msgstr "Bize o profili yollamadınız"
 
-#: actions/revokerole.php:82
 #, fuzzy
 msgid "User doesn't have this role."
 msgstr "Kullanıcının profili yok."
 
-#: actions/rsd.php:142 actions/version.php:159
 msgid "StatusNet"
 msgstr "İstatistikler"
 
-#: actions/sandbox.php:65 actions/unsandbox.php:65
 #, fuzzy
 msgid "You cannot sandbox users on this site."
 msgstr "Bize o profili yollamadınız"
 
-#: actions/sandbox.php:72
 #, fuzzy
 msgid "User is already sandboxed."
 msgstr "Kullanıcının profili yok."
 
 #. TRANS: Menu item for site administration
-#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
-#: lib/adminpanelaction.php:379
 msgid "Sessions"
 msgstr ""
 
-#: actions/sessionsadminpanel.php:65
 msgid "Session settings for this StatusNet site"
 msgstr ""
 
-#: actions/sessionsadminpanel.php:175
 msgid "Handle sessions"
 msgstr ""
 
-#: actions/sessionsadminpanel.php:177
 msgid "Whether to handle sessions ourselves."
 msgstr ""
 
-#: actions/sessionsadminpanel.php:181
 msgid "Session debugging"
 msgstr ""
 
-#: actions/sessionsadminpanel.php:183
 msgid "Turn on debugging output for sessions."
 msgstr ""
 
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
+#. TRANS: Submit button title.
+msgid "Save"
+msgstr "Kaydet"
+
 msgid "Save site settings"
 msgstr "Profil ayarları"
 
-#: actions/showapplication.php:78
 msgid "You must be logged in to view an application."
 msgstr ""
 
-#: actions/showapplication.php:151
 #, fuzzy
 msgid "Application profile"
 msgstr "Bu durum mesajının ait oldugu kullanıcı profili yok"
 
-#: actions/showapplication.php:179
 #, php-format
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr ""
 
-#: actions/showapplication.php:189
 msgid "Application actions"
 msgstr ""
 
-#: actions/showapplication.php:212
 msgid "Reset key & secret"
 msgstr ""
 
 #. TRANS: Title of form for deleting a user.
-#: actions/showapplication.php:228 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:64 lib/noticelist.php:678
 msgid "Delete"
 msgstr "Sil"
 
-#: actions/showapplication.php:237
 msgid "Application info"
 msgstr ""
 
-#: actions/showapplication.php:255
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
 msgstr ""
 
-#: actions/showapplication.php:275
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr ""
 
 #. TRANS: Title for all but the first page of favourite notices of a user.
 #. TRANS: %1$s is the user for whom the favourite notices are displayed, %2$d is the page number.
-#: actions/showfavorites.php:80
 #, fuzzy, php-format
 msgid "%1$s's favorite notices, page %2$d"
 msgstr "%s ve arkadaşları"
 
 #. TRANS: Server error displayed when favourite notices could not be retrieved from the database.
-#: actions/showfavorites.php:134
 #, fuzzy
 msgid "Could not retrieve favorite notices."
 msgstr "Profil kaydedilemedi."
 
 #. TRANS: Feed link text. %s is a username.
-#: actions/showfavorites.php:172
 #, fuzzy, php-format
 msgid "Feed for favorites of %s (RSS 1.0)"
 msgstr "%s için arkadaş güncellemeleri RSS beslemesi"
 
 #. TRANS: Feed link text. %s is a username.
-#: actions/showfavorites.php:180
 #, fuzzy, php-format
 msgid "Feed for favorites of %s (RSS 2.0)"
 msgstr "%s için arkadaş güncellemeleri RSS beslemesi"
 
 #. TRANS: Feed link text. %s is a username.
-#: actions/showfavorites.php:188
 #, fuzzy, php-format
 msgid "Feed for favorites of %s (Atom)"
 msgstr "%s için arkadaş güncellemeleri RSS beslemesi"
 
 #. TRANS: Text displayed instead of favourite notices for the current logged in user that has no favourites.
-#: actions/showfavorites.php:209
 msgid ""
 "You haven't chosen any favorite notices yet. Click the fave button on "
 "notices you like to bookmark them for later or shed a spotlight on them."
@@ -5514,7 +4536,6 @@ msgstr ""
 
 #. TRANS: Text displayed instead of favourite notices for a user that has no favourites while logged in.
 #. TRANS: %s is a username.
-#: actions/showfavorites.php:213
 #, php-format
 msgid ""
 "%s hasn't added any favorite notices yet. Post something interesting they "
@@ -5524,7 +4545,6 @@ msgstr ""
 #. TRANS: Text displayed instead of favourite notices for a user that has no favourites while not logged in.
 #. TRANS: %s is a username, %%%%action.register%%%% is a link to the user registration page.
 #. TRANS: (link text)[link] is a Mark Down link.
-#: actions/showfavorites.php:220
 #, php-format
 msgid ""
 "%s hasn't added any favorite notices yet. Why not [register an account](%%%%"
@@ -5533,64 +4553,53 @@ msgid ""
 msgstr ""
 
 #. TRANS: Page notice for show favourites page.
-#: actions/showfavorites.php:251
 msgid "This is a way to share what you like."
 msgstr ""
 
 #. TRANS: Page title for first group page. %s is a group name.
-#: actions/showgroup.php:75
 #, php-format
 msgid "%s group"
 msgstr ""
 
 #. TRANS: Page title for any but first group page.
 #. TRANS: %1$s is a group name, $2$s is a page number.
-#: actions/showgroup.php:79
 #, fuzzy, php-format
 msgid "%1$s group, page %2$d"
 msgstr "Bütün abonelikler"
 
 #. TRANS: Label for group description or group note (dt). Text hidden by default.
-#: actions/showgroup.php:266
 msgid "Note"
 msgstr "Not"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:277 lib/groupeditform.php:180
 msgid "Aliases"
 msgstr "Diğerisimler"
 
 #. TRANS: Group actions header (h2). Text hidden by default.
-#: actions/showgroup.php:294
 msgid "Group actions"
 msgstr ""
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:338
 #, fuzzy, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
 msgstr "%s için durum RSS beslemesi"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:345
 #, fuzzy, php-format
 msgid "Notice feed for %s group (RSS 2.0)"
 msgstr "%s için durum RSS beslemesi"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:352
 #, fuzzy, php-format
 msgid "Notice feed for %s group (Atom)"
 msgstr "%s için durum RSS beslemesi"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:358
 #, fuzzy, php-format
 msgid "FOAF for %s group"
 msgstr "%s için durum RSS beslemesi"
 
 #. TRANS: Header for mini list of group members on a group page (h2).
-#: actions/showgroup.php:395
 msgid "Members"
 msgstr "Üyeler"
 
@@ -5598,31 +4607,24 @@ msgstr "Üyeler"
 #. TRANS: Text for user subscription statistics if the user has no subscriptions.
 #. TRANS: Text for user subscriber statistics if user has no subscribers.
 #. TRANS: Text for user user group membership statistics if user is not a member of any group.
-#: actions/showgroup.php:401 lib/profileaction.php:137
-#: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
-#: lib/subscriptionlist.php:123 lib/tagcloudsection.php:71
 msgid "(None)"
 msgstr "(Yok)"
 
 #. TRANS: Link to all group members from mini list of group members if group has more than n members.
-#: actions/showgroup.php:410
 msgid "All members"
 msgstr "Tüm üyeler"
 
 #. TRANS: Header for group statistics on a group page (h2).
 #. TRANS: H2 text for user statistics.
-#: actions/showgroup.php:441 lib/profileaction.php:205
 msgid "Statistics"
 msgstr "İstatistikler"
 
-#: actions/showgroup.php:444
 #, fuzzy
 msgctxt "LABEL"
 msgid "Created"
 msgstr "Oluşturuldu"
 
 #. TRANS: Label for member count in statistics on group page.
-#: actions/showgroup.php:449
 #, fuzzy
 msgctxt "LABEL"
 msgid "Members"
@@ -5632,7 +4634,6 @@ msgstr "Üyeler"
 #. TRANS: **%s** is the group alias, %%%%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).
-#: actions/showgroup.php:464
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5645,7 +4646,6 @@ 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: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
-#: actions/showgroup.php:474
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5655,93 +4655,78 @@ msgid ""
 msgstr ""
 
 #. TRANS: Header for list of group administrators on a group page (h2).
-#: actions/showgroup.php:503
 msgid "Admins"
 msgstr "Yöneticiler"
 
 #. TRANS: Client error displayed requesting a single message that does not exist.
-#: actions/showmessage.php:76
 msgid "No such message."
 msgstr "Böyle bir mesaj yok."
 
 #. TRANS: Client error displayed requesting a single direct message the requesting user was not a party in.
-#: actions/showmessage.php:86
 msgid "Only the sender and recipient may read this message."
 msgstr ""
 
 #. TRANS: Page title for single direct message display when viewing user is the sender.
 #. TRANS: %1$s is the addressed user's nickname, $2$s is a timestamp.
-#: actions/showmessage.php:105
 #, php-format
 msgid "Message to %1$s on %2$s"
 msgstr ""
 
 #. TRANS: Page title for single message display.
 #. TRANS: %1$s is the sending user's nickname, $2$s is a timestamp.
-#: actions/showmessage.php:113
 #, php-format
 msgid "Message from %1$s on %2$s"
 msgstr ""
 
-#: actions/shownotice.php:90
 msgid "Notice deleted."
 msgstr "Durum mesajı silindi."
 
 #. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
-#: actions/showstream.php:70
 #, fuzzy, php-format
 msgid "%1$s tagged %2$s"
 msgstr "%s ve arkadaşları"
 
 #. TRANS: Page title showing tagged notices in one user's stream.
 #. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
-#: actions/showstream.php:74
 #, fuzzy, php-format
 msgid "%1$s tagged %2$s, page %3$d"
 msgstr "%s adli kullanicinin durum mesajlari"
 
 #. TRANS: Extended page title showing tagged notices in one user's stream.
 #. TRANS: %1$s is the username, %2$d is the page number.
-#: actions/showstream.php:82
 #, fuzzy, php-format
 msgid "%1$s, page %2$d"
 msgstr "%s ve arkadaşları"
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %1$s is a user nickname, %2$s is a hashtag.
-#: actions/showstream.php:127
 #, fuzzy, php-format
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
 msgstr "%s için durum RSS beslemesi"
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.
-#: actions/showstream.php:136
 #, fuzzy, php-format
 msgid "Notice feed for %s (RSS 1.0)"
 msgstr "%s için durum RSS beslemesi"
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.
-#: actions/showstream.php:145
 #, fuzzy, php-format
 msgid "Notice feed for %s (RSS 2.0)"
 msgstr "%s için durum RSS beslemesi"
 
-#: actions/showstream.php:152
 #, fuzzy, php-format
 msgid "Notice feed for %s (Atom)"
 msgstr "%s için durum RSS beslemesi"
 
 #. TRANS: Title for link to notice feed. FOAF stands for Friend of a Friend.
 #. TRANS: More information at http://www.foaf-project.org. %s is a user nickname.
-#: actions/showstream.php:159
 #, php-format
 msgid "FOAF for %s"
 msgstr ""
 
 #. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
-#: actions/showstream.php:205
 #, fuzzy, php-format
 msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr ""
@@ -5749,7 +4734,6 @@ msgstr ""
 "göndermemiş."
 
 #. TRANS: Second sentence of empty list message for a stream for the user themselves.
-#: actions/showstream.php:211
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
@@ -5757,7 +4741,6 @@ msgstr ""
 
 #. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:215
 #, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
@@ -5766,7 +4749,6 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:258
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5777,7 +4759,6 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:265
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5786,217 +4767,172 @@ msgid ""
 msgstr ""
 
 #. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
-#: actions/showstream.php:322
 #, fuzzy, php-format
 msgid "Repeat of %s"
 msgstr "%s için cevaplar"
 
-#: actions/silence.php:65 actions/unsilence.php:65
 msgid "You cannot silence users on this site."
 msgstr ""
 
-#: actions/silence.php:72
 #, fuzzy
 msgid "User is already silenced."
 msgstr "Kullanıcının profili yok."
 
-#: actions/siteadminpanel.php:69
 msgid "Basic settings for this StatusNet site"
 msgstr ""
 
-#: actions/siteadminpanel.php:133
 msgid "Site name must have non-zero length."
 msgstr ""
 
-#: actions/siteadminpanel.php:141
 #, fuzzy
 msgid "You must have a valid contact email address."
 msgstr "Geçersiz bir eposta adresi."
 
-#: actions/siteadminpanel.php:159
 #, php-format
 msgid "Unknown language \"%s\"."
 msgstr ""
 
-#: actions/siteadminpanel.php:165
 msgid "Minimum text limit is 0 (unlimited)."
 msgstr ""
 
-#: actions/siteadminpanel.php:171
 msgid "Dupe limit must be one or more seconds."
 msgstr ""
 
-#: actions/siteadminpanel.php:221
 msgid "General"
 msgstr "Genel"
 
-#: actions/siteadminpanel.php:224
 msgid "Site name"
 msgstr "Site ismi"
 
-#: actions/siteadminpanel.php:225
 msgid "The name of your site, like \"Yourcompany Microblog\""
 msgstr ""
 
-#: actions/siteadminpanel.php:229
 msgid "Brought by"
 msgstr ""
 
-#: actions/siteadminpanel.php:230
 msgid "Text used for credits link in footer of each page"
 msgstr ""
 
-#: actions/siteadminpanel.php:234
 msgid "Brought by URL"
 msgstr ""
 
-#: actions/siteadminpanel.php:235
 msgid "URL used for credits link in footer of each page"
 msgstr ""
 
-#: actions/siteadminpanel.php:239
 #, fuzzy
 msgid "Contact email address for your site"
 msgstr "Kullanıcı için kaydedilmiş eposta adresi yok."
 
-#: actions/siteadminpanel.php:245
 msgid "Local"
 msgstr "Yerel"
 
-#: actions/siteadminpanel.php:256
 msgid "Default timezone"
 msgstr "Öntanımlı saat dilimi"
 
-#: actions/siteadminpanel.php:257
 msgid "Default timezone for the site; usually UTC."
 msgstr ""
 
-#: actions/siteadminpanel.php:262
 msgid "Default language"
 msgstr "Öntanımlı dil"
 
-#: actions/siteadminpanel.php:263
 msgid "Site language when autodetection from browser settings is not available"
 msgstr ""
 
-#: actions/siteadminpanel.php:271
 msgid "Limits"
 msgstr ""
 
-#: actions/siteadminpanel.php:274
 msgid "Text limit"
 msgstr ""
 
-#: actions/siteadminpanel.php:274
 msgid "Maximum number of characters for notices."
 msgstr ""
 
-#: actions/siteadminpanel.php:278
 msgid "Dupe limit"
 msgstr ""
 
-#: actions/siteadminpanel.php:278
 msgid "How long users must wait (in seconds) to post the same thing again."
 msgstr ""
 
 #. TRANS: Page title for site-wide notice tab in admin panel.
-#: actions/sitenoticeadminpanel.php:55
 msgid "Site Notice"
 msgstr "Durum mesajları"
 
 #. TRANS: Instructions for site-wide notice tab in admin panel.
-#: actions/sitenoticeadminpanel.php:66
 msgid "Edit site-wide message"
 msgstr ""
 
 #. TRANS: Server error displayed when saving a site-wide notice was impossible.
-#: actions/sitenoticeadminpanel.php:101
 #, fuzzy
 msgid "Unable to save site notice."
 msgstr "Durum mesajını kaydederken hata oluştu."
 
 #. TRANS: Client error displayed when a site-wide notice was longer than allowed.
-#: actions/sitenoticeadminpanel.php:112
 #, fuzzy
 msgid "Maximum length for the site-wide notice is 255 characters."
 msgstr "Geçersiz lisans başlığı. En fazla uzunluk 255 karakterdir."
 
 #. TRANS: Label for site-wide notice text field in admin panel.
-#: actions/sitenoticeadminpanel.php:176
 #, fuzzy
 msgid "Site notice text"
 msgstr "Yeni durum mesajı"
 
 #. TRANS: Tooltip for site-wide notice text field in admin panel.
-#: actions/sitenoticeadminpanel.php:179
 msgid "Site-wide notice text (255 characters maximum; HTML allowed)"
 msgstr ""
 
 #. TRANS: Title for button to save site notice in admin panel.
-#: actions/sitenoticeadminpanel.php:201
 #, fuzzy
 msgid "Save site notice."
 msgstr "Yeni durum mesajı"
 
 #. TRANS: Title for SMS settings.
-#: actions/smssettings.php:56
 msgid "SMS settings"
 msgstr "Profil ayarları"
 
 #. TRANS: SMS settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/smssettings.php:70
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr ""
 
 #. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
-#: actions/smssettings.php:92
 #, fuzzy
 msgid "SMS is not available."
 msgstr "Bu sayfa kabul ettiğiniz ortam türünde kullanılabilir değil"
 
 #. TRANS: Form legend for SMS settings form.
-#: actions/smssettings.php:106
 #, fuzzy
 msgid "SMS address"
 msgstr "IM adresi"
 
 #. TRANS: Form guide in SMS settings form.
-#: actions/smssettings.php:115
 msgid "Current confirmed SMS-enabled phone number."
 msgstr ""
 
 #. TRANS: Form guide in IM settings form.
-#: actions/smssettings.php:128
 msgid "Awaiting confirmation on this phone number."
 msgstr ""
 
 #. TRANS: Field label for SMS address input in SMS settings form.
-#: actions/smssettings.php:137
 #, fuzzy
 msgid "Confirmation code"
 msgstr "Onay kodu yok."
 
 #. TRANS: Form field instructions in SMS settings form.
-#: actions/smssettings.php:139
 msgid "Enter the code you received on your phone."
 msgstr ""
 
 #. TRANS: Button label to confirm SMS confirmation code in SMS settings.
-#: actions/smssettings.php:143
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Confirm"
 msgstr "Onayla"
 
 #. TRANS: Field label for SMS phone number input in SMS settings form.
-#: actions/smssettings.php:148
 msgid "SMS phone number"
 msgstr ""
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
-#: actions/smssettings.php:151
 #, fuzzy
 msgid "Phone number, no punctuation or spaces, with area code."
 msgstr ""
@@ -6004,48 +4940,40 @@ msgstr ""
 "verilmez"
 
 #. TRANS: Form legend for SMS preferences form.
-#: actions/smssettings.php:190
 msgid "SMS preferences"
 msgstr "Tercihler kaydedildi."
 
 #. TRANS: Checkbox label in SMS preferences form.
-#: actions/smssettings.php:196
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
 msgstr ""
 
 #. TRANS: Confirmation message for successful SMS preferences save.
-#: actions/smssettings.php:307
 #, fuzzy
 msgid "SMS preferences saved."
 msgstr "Tercihler kaydedildi."
 
 #. TRANS: Message given saving SMS phone number without having provided one.
-#: actions/smssettings.php:329
 #, fuzzy
 msgid "No phone number."
 msgstr "Böyle bir kullanıcı yok."
 
 #. TRANS: Message given saving SMS phone number without having selected a carrier.
-#: actions/smssettings.php:335
 msgid "No carrier selected."
 msgstr ""
 
 #. TRANS: Message given saving SMS phone number that is already set.
-#: actions/smssettings.php:343
 #, fuzzy
 msgid "That is already your phone number."
 msgstr "Bu zaten sizin Jabber ID'niz."
 
 #. TRANS: Message given saving SMS phone number that is already set for another user.
-#: actions/smssettings.php:347
 #, fuzzy
 msgid "That phone number already belongs to another user."
 msgstr "Jabber ID başka bir kullanıcıya ait."
 
 #. TRANS: Message given saving valid SMS phone number that is to be confirmed.
-#: actions/smssettings.php:375
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
 "for the code and instructions on how to use it."
@@ -6054,42 +4982,35 @@ msgstr ""
 "mesaj yollanabilmesi için onaylamanız gerekmektedir."
 
 #. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
-#: actions/smssettings.php:403
 #, fuzzy
 msgid "That is the wrong confirmation number."
 msgstr "Yanlış IM adresi."
 
 #. TRANS: Message given after successfully canceling SMS phone number confirmation.
-#: actions/smssettings.php:417
 msgid "SMS confirmation cancelled."
 msgstr "Onay kodu yok."
 
 #. TRANS: Message given trying to remove an SMS phone number that is not
 #. TRANS: registered for the active user.
-#: actions/smssettings.php:437
 #, fuzzy
 msgid "That is not your phone number."
 msgstr "Bu sizin Jabber ID'niz değil."
 
 #. TRANS: Message given after successfully removing a registered SMS phone number.
-#: actions/smssettings.php:459
 #, fuzzy
 msgid "The SMS phone number was removed."
 msgstr "Bu adres kaldırılmıştı."
 
 #. TRANS: Label for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:498
 msgid "Mobile carrier"
 msgstr ""
 
 #. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:503
 msgid "Select a carrier"
 msgstr ""
 
 #. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
 #. TRANS: %s is an administrative contact's e-mail address.
-#: actions/smssettings.php:512
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -6097,123 +5018,98 @@ msgid ""
 msgstr ""
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
-#: actions/smssettings.php:534
 #, fuzzy
 msgid "No code entered."
 msgstr "İçerik yok!"
 
 #. TRANS: Menu item for site administration
-#: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
-#: lib/adminpanelaction.php:395
 msgid "Snapshots"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:65
 msgid "Manage snapshot configuration"
 msgstr "Eposta adresi onayı"
 
-#: actions/snapshotadminpanel.php:127
 msgid "Invalid snapshot run value."
 msgstr ""
 
-#: actions/snapshotadminpanel.php:133
 msgid "Snapshot frequency must be a number."
 msgstr ""
 
-#: actions/snapshotadminpanel.php:144
 msgid "Invalid snapshot report URL."
 msgstr ""
 
-#: actions/snapshotadminpanel.php:200
 msgid "Randomly during web hit"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:201
 msgid "In a scheduled job"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:206
 msgid "Data snapshots"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:208
 msgid "When to send statistical data to status.net servers"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:217
 msgid "Frequency"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:218
 msgid "Snapshots will be sent once every N web hits"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:226
 msgid "Report URL"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:227
 msgid "Snapshots will be sent to this URL"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:248
 #, fuzzy
 msgid "Save snapshot settings"
 msgstr "Ayarlar"
 
 #. TRANS: Client error displayed trying a change a subscription for a non-subscribed profile.
-#: actions/subedit.php:75
 #, fuzzy
 msgid "You are not subscribed to that profile."
 msgstr "Bize o profili yollamadınız"
 
 #. TRANS: Server error displayed when updating a subscription fails with a database error.
 #. TRANS: Exception thrown when a subscription could not be stored on the server.
-#: actions/subedit.php:89 classes/Subscription.php:141
 msgid "Could not save subscription."
 msgstr "Yeni abonelik eklenemedi."
 
 #. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
-#: actions/subscribe.php:121
 #, fuzzy
 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
 msgstr "Bize o profili yollamadınız"
 
 #. TRANS: Page title when subscription succeeded.
-#: actions/subscribe.php:149
 #, fuzzy
 msgid "Subscribed"
 msgstr "Abone ol"
 
 #. TRANS: Header for list of subscribers for a user (first page).
 #. TRANS: %s is the user's nickname.
-#: actions/subscribers.php:51
 #, fuzzy, php-format
 msgid "%s subscribers"
 msgstr "Abone olanlar"
 
 #. TRANS: Header for list of subscribers for a user (not first page).
 #. TRANS: %1$s is the user's nickname, $2$d is the page number.
-#: actions/subscribers.php:55
 #, fuzzy, php-format
 msgid "%1$s subscribers, page %2$d"
 msgstr "Bütün abonelikler"
 
 #. TRANS: Page notice for page with an overview of all subscribers
 #. TRANS: of the logged in user's own profile.
-#: actions/subscribers.php:68
 msgid "These are the people who listen to your notices."
 msgstr "Sizin durumunuzu takip edenler"
 
 #. TRANS: Page notice for page with an overview of all subscribers of a user other
 #. TRANS: than the logged in user. %s is the user nickname.
-#: actions/subscribers.php:74
 #, php-format
 msgid "These are the people who listen to %s's notices."
 msgstr "%s adlı kullanıcının durumunu takip edenler"
 
 #. TRANS: Subscriber list text when the logged in user has no subscribers.
-#: actions/subscribers.php:114
 msgid ""
 "You have no subscribers. Try subscribing to people you know and they might "
 "return the favor."
@@ -6221,7 +5117,6 @@ msgstr ""
 
 #. TRANS: Subscriber list text when looking at the subscribers for a of a user other
 #. TRANS: than the logged in user that has no subscribers. %s is the user nickname.
-#: actions/subscribers.php:118
 #, php-format
 msgid "%s has no subscribers. Want to be the first?"
 msgstr ""
@@ -6231,7 +5126,6 @@ msgstr ""
 #. TRANS: This message contains a Markdown URL. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.
-#: actions/subscribers.php:127
 #, php-format
 msgid ""
 "%s has no subscribers. Why not [register an account](%%%%action.register%%%"
@@ -6240,20 +5134,17 @@ msgstr ""
 
 #. TRANS: Header for subscriptions overview for a user (not first page).
 #. TRANS: %1$s is a user nickname, %2$d is the page number.
-#: actions/subscriptions.php:55
 #, fuzzy, php-format
 msgid "%1$s subscriptions, page %2$d"
 msgstr "Bütün abonelikler"
 
 #. TRANS: Page notice for page with an overview of all subscriptions
 #. TRANS: of the logged in user's own profile.
-#: actions/subscriptions.php:68
 msgid "These are the people whose notices you listen to."
 msgstr "Sizin durumlarını takip ettiğiniz kullanıcılar"
 
 #. TRANS: Page notice for page with an overview of all subscriptions of a user other
 #. TRANS: than the logged in user. %s is the user nickname.
-#: actions/subscriptions.php:74
 #, php-format
 msgid "These are the people whose notices %s listens to."
 msgstr "%s adlı kullanıcının durumlarını takip ettiği kullanıcılar"
@@ -6262,7 +5153,6 @@ msgstr "%s adlı kullanıcının durumlarını takip ettiği kullanıcılar"
 #. 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.
-#: actions/subscriptions.php:133
 #, php-format
 msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "
@@ -6276,297 +5166,239 @@ msgstr ""
 #. TRANS: than the logged in user that has no subscriptions. %s is the user nickname.
 #. TRANS: Subscription list text when looking at the subscriptions for a of a user that has none
 #. TRANS: as an anonymous user. %s is the user nickname.
-#: actions/subscriptions.php:141 actions/subscriptions.php:147
 #, fuzzy, php-format
 msgid "%s is not listening to anyone."
 msgstr "%1$s %2$s'da durumunuzu takip ediyor"
 
 #. TRANS: Atom feed title. %s is a profile nickname.
-#: actions/subscriptions.php:176
 #, fuzzy, php-format
 msgid "Subscription feed for %s (Atom)"
 msgstr "%s için durum RSS beslemesi"
 
 #. TRANS: Checkbox label for enabling Jabber messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:241 lib/settingsnav.php:110
 msgid "IM"
 msgstr ""
 
 #. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:256 lib/settingsnav.php:117
 msgid "SMS"
 msgstr ""
 
 #. TRANS: Title for all but the first page of notices with tags.
 #. TRANS: %1$s is the tag, %2$d is the page number.
-#: actions/tag.php:73
 #, fuzzy, php-format
 msgid "Notices tagged with %1$s, page %2$d"
 msgstr "%s adli kullanicinin durum mesajlari"
 
-#: actions/tag.php:91
 #, fuzzy, php-format
 msgid "Notice feed for tag %s (RSS 1.0)"
 msgstr "%s için durum RSS beslemesi"
 
-#: actions/tag.php:97
 #, fuzzy, php-format
 msgid "Notice feed for tag %s (RSS 2.0)"
 msgstr "%s için durum RSS beslemesi"
 
-#: actions/tag.php:103
 #, fuzzy, php-format
 msgid "Notice feed for tag %s (Atom)"
 msgstr "%s için durum RSS beslemesi"
 
-#: actions/tagother.php:39
 #, fuzzy
 msgid "No ID argument."
 msgstr "Böyle bir belge yok."
 
-#: actions/tagother.php:65
 #, php-format
 msgid "Tag %s"
 msgstr ""
 
 #. TRANS: H2 for user profile information.
-#: actions/tagother.php:77 lib/userprofile.php:76
 #, fuzzy
 msgid "User profile"
 msgstr "Kullanıcının profili yok."
 
-#: actions/tagother.php:120
 msgid "Tag user"
 msgstr "Kullanıcıyı etiketle"
 
-#: actions/tagother.php:130
 msgid ""
 "Tags for this user (letters, numbers, -, ., and _), comma- or space- "
 "separated"
 msgstr ""
 
-#: actions/tagother.php:157
 #, php-format
 msgid "Invalid tag: \"%s\""
 msgstr "Geçersiz büyüklük."
 
-#: actions/tagother.php:172
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 
-#: actions/tagother.php:215
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
 
-#: actions/tagrss.php:35
 msgid "No such tag."
 msgstr "Böyle bir etiket yok."
 
 #. TRANS: Client error displayed when trying to unblock a non-blocked user.
-#: actions/unblock.php:59
 #, fuzzy
 msgid "You haven't blocked that user."
 msgstr "Zaten giriş yapmış durumdasıznız!"
 
-#: actions/unsandbox.php:72
 #, fuzzy
 msgid "User is not sandboxed."
 msgstr "Kullanıcının profili yok."
 
-#: actions/unsilence.php:72
 #, fuzzy
 msgid "User is not silenced."
 msgstr "Kullanıcının profili yok."
 
-#: actions/unsubscribe.php:77
 #, fuzzy
 msgid "No profile ID in request."
 msgstr "Yetkilendirme isteği yok!"
 
-#: actions/unsubscribe.php:98
 #, fuzzy
 msgid "Unsubscribed"
 msgstr "Aboneliği sonlandır"
 
-#: actions/updateprofile.php:64
 #, php-format
 msgid ""
 "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
 msgstr ""
 
-#: actions/urlsettings.php:60
 #, fuzzy
 msgid "URL settings"
 msgstr "Profil ayarları"
 
 #. TRANS: Instructions for tab "Other" in user profile settings.
-#: actions/urlsettings.php:72
 msgid "Manage various other options."
 msgstr ""
 
 #. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
 #. TRANS: user's profile settings. This message has one space at the beginning. Use your
 #. TRANS: language's word separator here if it has one (most likely a single space).
-#: actions/urlsettings.php:115
 msgid " (free service)"
 msgstr ""
 
-#: actions/urlsettings.php:121
 msgid "[none]"
 msgstr ""
 
-#: actions/urlsettings.php:122
 msgid "[internal]"
 msgstr ""
 
 #. TRANS: Label for dropdown with URL shortener services.
-#: actions/urlsettings.php:130
 msgid "Shorten URLs with"
 msgstr "Bağlantıları şununla kısalt"
 
 #. TRANS: Tooltip for for dropdown with URL shortener services.
-#: actions/urlsettings.php:132
 msgid "Automatic shortening service to use."
 msgstr "Kullanılacak otomatik kısaltma servisi."
 
-#: actions/urlsettings.php:138
 msgid "URL longer than"
 msgstr ""
 
-#: actions/urlsettings.php:141
 msgid "URLs longer than this will be shortened, 0 means always shorten."
 msgstr ""
 
-#: actions/urlsettings.php:145
 msgid "Text longer than"
 msgstr ""
 
-#: actions/urlsettings.php:148
 msgid ""
 "URLs in notices longer than this will be shortened, 0 means always shorten."
 msgstr ""
 
 #. TRANS: Form validation error for form "Other settings" in user profile.
-#: actions/urlsettings.php:180
 #, fuzzy
 msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr "Yer bilgisi çok uzun (azm: 255 karakter)."
 
-#: actions/urlsettings.php:187
 msgid "Invalid number for max url length."
 msgstr ""
 
-#: actions/urlsettings.php:193
 #, fuzzy
 msgid "Invalid number for max notice length."
 msgstr "Geçersiz büyüklük."
 
-#: actions/urlsettings.php:238
 msgid "Error saving user URL shortening preferences."
 msgstr ""
 
 #. TRANS: User admin panel title
-#: actions/useradminpanel.php:58
 msgctxt "TITLE"
 msgid "User"
 msgstr ""
 
 #. TRANS: Instruction for user admin panel.
-#: actions/useradminpanel.php:69
 msgid "User settings for this StatusNet site"
 msgstr ""
 
 #. TRANS: Form validation error in user admin panel when a non-numeric character limit was set.
-#: actions/useradminpanel.php:147
 msgid "Invalid bio limit. Must be numeric."
 msgstr ""
 
 #. TRANS: Form validation error in user admin panel when welcome text is too long.
-#: actions/useradminpanel.php:154
 #, fuzzy
 msgid "Invalid welcome text. Maximum length is 255 characters."
 msgstr "Geçersiz lisans başlığı. En fazla uzunluk 255 karakterdir."
 
 #. TRANS: Client error displayed when trying to set a non-existing user as default subscription for new
 #. TRANS: users in user admin panel. %1$s is the invalid nickname.
-#: actions/useradminpanel.php:166
 #, php-format
 msgid "Invalid default subscripton: \"%1$s\" is not a user."
 msgstr ""
 
-#: actions/useradminpanel.php:215 lib/action.php:565 lib/settingsnav.php:77
-#: lib/subgroupnav.php:81
 msgid "Profile"
 msgstr "Profil"
 
 #. TRANS: Field label in user admin panel for setting the character limit for the bio field.
-#: actions/useradminpanel.php:220
 msgid "Bio Limit"
 msgstr ""
 
 #. TRANS: Tooltip in user admin panel for setting the character limit for the bio field.
-#: actions/useradminpanel.php:222
 msgid "Maximum length of a profile bio in characters."
 msgstr ""
 
 #. TRANS: Form legend in user admin panel.
-#: actions/useradminpanel.php:231
 msgid "New users"
 msgstr "Yeni kullanıcılar"
 
 #. TRANS: Field label in user admin panel for setting new user welcome text.
-#: actions/useradminpanel.php:236
 msgid "New user welcome"
 msgstr "Yeni kullanıcı karşılaması"
 
 #. TRANS: Tooltip in user admin panel for setting new user welcome text.
-#: actions/useradminpanel.php:238
 #, fuzzy
 msgid "Welcome text for new users (maximum 255 characters)."
 msgstr "Yeni kullanıcılar için hoşgeldiniz metni (En fazla 255 karakter)."
 
 #. TRANS: Field label in user admin panel for setting default subscription for new users.
-#: actions/useradminpanel.php:244
 #, fuzzy
 msgid "Default subscription"
 msgstr "Bütün abonelikler"
 
 #. TRANS: Tooltip in user admin panel for setting default subscription for new users.
-#: actions/useradminpanel.php:246
 #, fuzzy
 msgid "Automatically subscribe new users to this user."
 msgstr "Takip talebine izin verildi"
 
 #. TRANS: Form legend in user admin panel.
-#: actions/useradminpanel.php:256
 #, fuzzy
 msgid "Invitations"
 msgstr "Yer"
 
 #. TRANS: Field label for checkbox in user admin panel for allowing users to invite friend using site e-mail.
-#: actions/useradminpanel.php:262
 msgid "Invitations enabled"
 msgstr ""
 
 #. TRANS: Tooltip for checkbox in user admin panel for allowing users to invite friend using site e-mail.
-#: actions/useradminpanel.php:265
 msgid "Whether to allow users to invite new users."
 msgstr ""
 
 #. TRANS: Title for button to save user settings in user admin panel.
-#: actions/useradminpanel.php:302
 #, fuzzy
 msgid "Save user settings."
 msgstr "Profil ayarları"
 
 #. TRANS: Page title.
-#: actions/userauthorization.php:109
 msgid "Authorize subscription"
 msgstr "Takip isteğini onayla"
 
 #. TRANS: Page notice on "Auhtorize subscription" page.
-#: actions/userauthorization.php:115
 #, fuzzy
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
@@ -6578,42 +5410,35 @@ msgstr ""
 "bulunmadıysanız \"İptal\" tuşuna basın. "
 
 #. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:200
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Accept"
 msgstr "Kabul et"
 
 #. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:202
 #, fuzzy
 msgid "Subscribe to this user."
 msgstr "Bize o profili yollamadınız"
 
 #. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:204
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Reject"
 msgstr "Reddet"
 
 #. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:206
 #, fuzzy
 msgid "Reject this subscription."
 msgstr "Takip isteğini onayla"
 
 #. TRANS: Client error displayed for an empty authorisation request.
-#: actions/userauthorization.php:219
 msgid "No authorization request!"
 msgstr "Yetkilendirme isteği yok!"
 
 #. TRANS: Accept message header from Authorise subscription page.
-#: actions/userauthorization.php:242
 msgid "Subscription authorized"
 msgstr "Takip talebine izin verildi"
 
-#: actions/userauthorization.php:245
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to authorize the "
@@ -6621,11 +5446,9 @@ msgid ""
 msgstr ""
 
 #. TRANS: Reject message header from Authorise subscription page.
-#: actions/userauthorization.php:256
 msgid "Subscription rejected"
 msgstr "Abonelik reddedildi."
 
-#: actions/userauthorization.php:259
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to fully reject the "
@@ -6634,35 +5457,30 @@ msgstr ""
 
 #. TRANS: Exception thrown when no valid user is found for an authorisation request.
 #. TRANS: %s is a listener URI.
-#: actions/userauthorization.php:296
 #, php-format
 msgid "Listener URI \"%s\" not found here."
 msgstr ""
 
 #. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
 #. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:303
 #, fuzzy, php-format
 msgid "Listenee URI \"%s\" is too long."
 msgstr "Kaynak bağlantı çok uzun."
 
 #. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
 #. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:311
 #, php-format
 msgid "Listenee URI \"%s\" is a local user."
 msgstr ""
 
 #. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
 #. TRANS: %s is a profile URL.
-#: actions/userauthorization.php:329
 #, php-format
 msgid "Profile URL \"%s\" is for a local user."
 msgstr ""
 
 #. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
 #. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
-#: actions/userauthorization.php:339
 #, php-format
 msgid ""
 "Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
@@ -6671,76 +5489,62 @@ msgstr ""
 
 #. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
 #. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:349
 #, fuzzy, php-format
 msgid "Avatar URL \"%s\" is not valid."
 msgstr "Kaynak bağlantı geçerli değil."
 
 #. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
 #. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:356
 #, fuzzy, php-format
 msgid "Cannot read avatar URL \"%s\"."
 msgstr "Avatar URLi '%s' okunamıyor"
 
 #. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
 #. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:363
 #, fuzzy, php-format
 msgid "Wrong image type for avatar URL \"%s\"."
 msgstr "%s için yanlış resim türü"
 
 #. TRANS: Page title for profile design page.
-#: actions/userdesignsettings.php:74 lib/designsettings.php:61
 #, fuzzy
 msgid "Profile design"
 msgstr "Profil ayarları"
 
 #. TRANS: Instructions for profile design page.
-#: actions/userdesignsettings.php:84 lib/designsettings.php:72
 msgid ""
 "Customize the way your profile looks with a background image and a colour "
 "palette of your choice."
 msgstr ""
 
-#: actions/userdesignsettings.php:289
 msgid "Enjoy your hotdog!"
 msgstr ""
 
-#: actions/userdesignsettings.php:325
 #, fuzzy
 msgid "Design settings"
 msgstr "Profil ayarları"
 
-#: actions/userdesignsettings.php:340
 msgid "View profile designs"
 msgstr "Profil dizaynlarını görüntüle"
 
-#: actions/userdesignsettings.php:341
 msgid "Show or hide profile designs."
 msgstr ""
 
-#: actions/userdesignsettings.php:348
 #, fuzzy
 msgid "Background file"
 msgstr "Arkaplan"
 
 #. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number.
-#: actions/usergroups.php:66
 #, fuzzy, php-format
 msgid "%1$s groups, page %2$d"
 msgstr "Bütün abonelikler"
 
-#: actions/usergroups.php:132
 msgid "Search for more groups"
 msgstr ""
 
-#: actions/usergroups.php:159
 #, fuzzy, php-format
 msgid "%s is not a member of any group."
 msgstr "Bize o profili yollamadınız"
 
-#: actions/usergroups.php:164
 #, php-format
 msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
 msgstr ""
@@ -6750,34 +5554,27 @@ msgstr ""
 #. TRANS: %1$s is a group name, %2$s is a site name.
 #. TRANS: Message is used as a subtitle in atom user notice feed.
 #. TRANS: %1$s is a user name, %2$s is a site name.
-#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:70
-#: lib/atomusernoticefeed.php:95
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr ""
 
-#: actions/version.php:75
 #, php-format
 msgid "StatusNet %s"
 msgstr "StatusNet %s"
 
-#: actions/version.php:155
 #, php-format
 msgid ""
 "This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
 "Inc. and contributors."
 msgstr ""
 
-#: actions/version.php:163
 msgid "Contributors"
 msgstr ""
 
 #. TRANS: Menu item for site administration
-#: actions/version.php:167 lib/adminpanelaction.php:403
 msgid "License"
 msgstr "Lisans"
 
-#: actions/version.php:170
 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 "
@@ -6785,7 +5582,6 @@ msgid ""
 "any later version. "
 msgstr ""
 
-#: actions/version.php:176
 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 "
@@ -6793,7 +5589,6 @@ msgid ""
 "for more details. "
 msgstr ""
 
-#: actions/version.php:182
 #, php-format
 msgid ""
 "You should have received a copy of the GNU Affero General Public License "
@@ -6801,53 +5596,43 @@ msgid ""
 msgstr ""
 
 #. TRANS: Form input field label for application name.
-#: actions/version.php:197 lib/applicationeditform.php:190
 #, fuzzy
 msgid "Name"
 msgstr "Takma ad"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:885
 msgid "Version"
 msgstr "Sürüm"
 
-#: actions/version.php:199
 msgid "Author(s)"
 msgstr ""
 
 #. TRANS: Form input field label.
-#: actions/version.php:200 lib/applicationeditform.php:208
-#: lib/groupeditform.php:168
 msgid "Description"
 msgstr "Tanım"
 
 #. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:164
 msgid "Favor"
 msgstr ""
 
 #. TRANS: Ntofication given when a user marks a notice as favorite.
 #. TRANS: %1$s is a user nickname or full name, %2$s is a notice URI.
-#: classes/Fave.php:167
 #, fuzzy, php-format
 msgid "%1$s marked notice %2$s as a favorite."
 msgstr "%1$s %2$s'da durumunuzu takip ediyor"
 
 #. TRANS: Server exception thrown when a URL cannot be processed.
-#: classes/File.php:162
 #, php-format
 msgid "Cannot process URL '%s'"
 msgstr ""
 
 #. TRANS: Server exception thrown when... Robin thinks something is impossible!
-#: classes/File.php:194
 msgid "Robin thinks something is impossible."
 msgstr ""
 
 #. 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$s is used for plural.
-#: classes/File.php:210
 #, php-format
 msgid ""
 "No file may be larger than %1$d byte and the file you sent was %2$d bytes. "
@@ -6859,7 +5644,6 @@ msgstr[0] ""
 
 #. TRANS: Message given if an upload would exceed user quota.
 #. TRANS: %d (number) is the user quota in bytes and is used for plural.
-#: classes/File.php:223
 #, php-format
 msgid "A file this large would exceed your user quota of %d byte."
 msgid_plural "A file this large would exceed your user quota of %d bytes."
@@ -6867,171 +5651,143 @@ msgstr[0] ""
 
 #. TRANS: Message given id an upload would exceed a user's monthly quota.
 #. TRANS: $d (number) is the monthly user quota in bytes and is used for plural.
-#: classes/File.php:235
 #, php-format
 msgid "A file this large would exceed your monthly quota of %d byte."
 msgid_plural "A file this large would exceed your monthly quota of %d bytes."
 msgstr[0] ""
 
 #. TRANS: Client exception thrown if a file upload does not have a valid name.
-#: classes/File.php:282 classes/File.php:297
 msgid "Invalid filename."
 msgstr "Geçersiz dosya ismi."
 
 #. TRANS: Exception thrown when joining a group fails.
-#: classes/Group_member.php:51
 #, fuzzy
 msgid "Group join failed."
 msgstr "Böyle bir durum mesajı yok."
 
 #. TRANS: Exception thrown when trying to leave a group the user is not a member of.
-#: classes/Group_member.php:64
 #, fuzzy
 msgid "Not part of group."
 msgstr "Kullanıcı güncellenemedi."
 
 #. TRANS: Exception thrown when trying to leave a group fails.
-#: classes/Group_member.php:72
 #, fuzzy
 msgid "Group leave failed."
 msgstr "Böyle bir durum mesajı yok."
 
 #. TRANS: Exception thrown providing an invalid profile ID.
 #. TRANS: %s is the invalid profile ID.
-#: classes/Group_member.php:85
 #, php-format
 msgid "Profile ID %s is invalid."
 msgstr ""
 
 #. TRANS: Exception thrown providing an invalid group ID.
 #. TRANS: %s is the invalid group ID.
-#: classes/Group_member.php:98
 #, fuzzy, php-format
 msgid "Group ID %s is invalid."
 msgstr "Kullanıcıyı kaydetmede hata oluştu; geçersiz."
 
 #. TRANS: Activity title.
-#: classes/Group_member.php:147 lib/joinform.php:114
 #, fuzzy
 msgid "Join"
 msgstr "Giriş"
 
 #. TRANS: Success message for subscribe to group attempt through OStatus.
 #. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
-#: classes/Group_member.php:151
 #, php-format
 msgid "%1$s has joined group %2$s."
 msgstr ""
 
 #. TRANS: Server exception thrown when updating a local group fails.
-#: classes/Local_group.php:42
 #, fuzzy
 msgid "Could not update local group."
 msgstr "Kullanıcı güncellenemedi."
 
 #. TRANS: Exception thrown when trying creating a login token failed.
 #. TRANS: %s is the user nickname for which token creation failed.
-#: classes/Login_token.php:78
 #, fuzzy, php-format
 msgid "Could not create login token for %s"
 msgstr "Avatar bilgisi kaydedilemedi"
 
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
-#: classes/Memcached_DataObject.php:556
 msgid "No database name or DSN found anywhere."
 msgstr ""
 
 #. TRANS: Client exception thrown when a user tries to send a direct message while being banned from sending them.
-#: classes/Message.php:45
 msgid "You are banned from sending direct messages."
 msgstr ""
 
 #. TRANS: Message given when a message could not be stored on the server.
-#: classes/Message.php:69
 #, fuzzy
 msgid "Could not insert message."
 msgstr "Yeni abonelik eklenemedi."
 
 #. TRANS: Message given when a message could not be updated on the server.
-#: classes/Message.php:80
 #, fuzzy
 msgid "Could not update message with new URI."
 msgstr "Kullanıcı güncellenemedi."
 
 #. TRANS: Server exception thrown when a user profile for a notice cannot be found.
 #. TRANS: %1$d is a profile ID (number), %2$d is a notice ID (number).
-#: classes/Notice.php:98
 #, php-format
 msgid "No such profile (%1$d) for notice (%2$d)."
 msgstr ""
 
 #. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:199
 #, php-format
 msgid "Database error inserting hashtag: %s"
 msgstr "Avatar eklemede hata oluştu"
 
 #. TRANS: Client exception thrown if a notice contains too many characters.
-#: classes/Notice.php:279
 msgid "Problem saving notice. Too long."
 msgstr "Durum mesajını kaydederken hata oluştu. Çok uzun."
 
 #. TRANS: Client exception thrown when trying to save a notice for an unknown user.
-#: classes/Notice.php:284
 msgid "Problem saving notice. Unknown user."
 msgstr "Durum mesajını kaydederken hata oluştu. Bilinmeyen kullanıcı."
 
 #. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
-#: classes/Notice.php:290
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 
 #. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
-#: classes/Notice.php:297
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
 "few minutes."
 msgstr ""
 
 #. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:305
 msgid "You are banned from posting notices on this site."
 msgstr ""
 
 #. TRANS: Server exception thrown when a notice cannot be saved.
 #. TRANS: Server exception thrown when a notice cannot be updated.
-#: classes/Notice.php:372 classes/Notice.php:399
 msgid "Problem saving notice."
 msgstr "Durum mesajını kaydederken hata oluştu."
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:929
 msgid "Bad type provided to saveKnownGroups."
 msgstr ""
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:1028
 #, fuzzy
 msgid "Problem saving group inbox."
 msgstr "Durum mesajını kaydederken hata oluştu."
 
 #. TRANS: Server exception thrown when a reply cannot be saved.
 #. TRANS: %1$d is a notice ID, %2$d is the ID of the mentioned user.
-#: classes/Notice.php:1144
 #, fuzzy, php-format
 msgid "Could not save reply for %1$d, %2$d."
 msgstr "Profil kaydedilemedi."
 
 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1663
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr ""
 
 #. TRANS: Full name of a profile or group followed by nickname in parens
-#: classes/Profile.php:172 classes/User_group.php:242
 #, fuzzy, php-format
 msgctxt "FANCYNAME"
 msgid "%1$s (%2$s)"
@@ -7039,266 +5795,212 @@ msgstr "%1$s'in %2$s'deki durum mesajları "
 
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:779
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:788
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
 
 #. TRANS: Exception thrown when a right for a non-existing user profile is checked.
-#: classes/Remote_profile.php:54
 msgid "Missing profile."
 msgstr "Profil yok."
 
 #. TRANS: Exception thrown when a tag cannot be saved.
-#: classes/Status_network.php:338
 msgid "Unable to save tag."
 msgstr "Etiket kaydedilemedi."
 
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#: classes/Subscription.php:77 lib/oauthstore.php:482
 msgid "You have been banned from subscribing."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to subscribe while already subscribed.
-#: classes/Subscription.php:82
 msgid "Already subscribed!"
 msgstr "Zaten abone olunmuş!"
 
 #. TRANS: Exception thrown when trying to subscribe to a user who has blocked the subscribing user.
-#: classes/Subscription.php:87
 #, fuzzy
 msgid "User has blocked you."
 msgstr "Kullanıcının profili yok."
 
 #. TRANS: Exception thrown when trying to unsibscribe without a subscription.
-#: classes/Subscription.php:176
 #, fuzzy
 msgid "Not subscribed!"
 msgstr "Bu kullanıcıyı zaten takip etmiyorsunuz!"
 
 #. TRANS: Exception thrown when trying to unsubscribe a user from themselves.
-#: classes/Subscription.php:183
 msgid "Could not delete self-subscription."
 msgstr "Yeni abonelik eklenemedi."
 
 #. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
-#: classes/Subscription.php:211
 msgid "Could not delete subscription OMB token."
 msgstr "Yeni abonelik eklenemedi."
 
 #. TRANS: Exception thrown when a subscription could not be deleted on the server.
-#: classes/Subscription.php:223
 msgid "Could not delete subscription."
 msgstr "Yeni abonelik eklenemedi."
 
 #. TRANS: Activity tile when subscribing to another person.
-#: classes/Subscription.php:265
 msgid "Follow"
 msgstr ""
 
 #. TRANS: Notification given when one person starts following another.
 #. TRANS: %1$s is the subscriber, %2$s is the subscribed.
-#: classes/Subscription.php:268
 #, fuzzy, php-format
 msgid "%1$s is now following %2$s."
 msgstr "%1$s %2$s'da durumunuzu takip ediyor"
 
 #. TRANS: Notice given on user registration.
 #. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:390
 #, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr ""
 
 #. TRANS: Server exception.
-#: classes/User.php:923
 msgid "No single user defined for single-user mode."
 msgstr ""
 
 #. TRANS: Server exception.
-#: classes/User.php:927
 msgid "Single-user mode code called when not enabled."
 msgstr ""
 
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:522
 msgid "Could not create group."
 msgstr "Kullanıcı güncellenemedi."
 
 #. TRANS: Server exception thrown when updating a group URI failed.
-#: classes/User_group.php:532
 msgid "Could not set group URI."
 msgstr "Profil kaydedilemedi."
 
 #. TRANS: Server exception thrown when setting group membership failed.
-#: classes/User_group.php:555
 msgid "Could not set group membership."
 msgstr "Kullanıcı güncellenemedi."
 
 #. TRANS: Server exception thrown when saving local group information failed.
-#: classes/User_group.php:570
 msgid "Could not save local group info."
 msgstr "Profil kaydedilemedi."
 
 #. TRANS: Exception thrown when an account could not be located when it should be moved.
 #. TRANS: %s is the remote site.
-#: lib/accountmover.php:65
 #, fuzzy, php-format
 msgid "Cannot locate account %s."
 msgstr "Kullanıcıları silemezsiniz."
 
 #. TRANS: Exception thrown when a service document could not be located account move.
 #. TRANS: %s is the remote site.
-#: lib/accountmover.php:106
 #, php-format
 msgid "Cannot find XRD for %s."
 msgstr ""
 
 #. TRANS: Exception thrown when an account could not be located when it should be moved.
 #. TRANS: %s is the remote site.
-#: lib/accountmover.php:131
 #, php-format
 msgid "No AtomPub API service for %s."
 msgstr ""
 
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: lib/action.php:161
 #, fuzzy, php-format
 msgid "%1$s - %2$s"
 msgstr "%1$s'in %2$s'deki durum mesajları "
 
 #. TRANS: Page title for a page without a title set.
-#: lib/action.php:177
 msgid "Untitled page"
 msgstr "Başlıksız sayfa"
 
 #. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.
-#: lib/action.php:325
 msgctxt "TOOLTIP"
 msgid "Show more"
 msgstr ""
 
 #. TRANS: Inline reply form submit button: submits a reply comment.
-#: lib/action.php:328
 #, fuzzy
 msgctxt "BUTTON"
-msgid "Comment"
-msgstr "İçerik"
+msgid "Reply"
+msgstr "Cevaplar"
 
 #. TRANS: Placeholder text for inline reply form. Clicking in this box will turn it into a mini notice form.
-#: lib/action.php:331
-msgid "Add a comment..."
+msgid "Write a reply..."
 msgstr ""
 
-#: lib/action.php:559 lib/personalgroupnav.php:99
-#, fuzzy
 msgid "Home"
 msgstr "Başlangıç Sayfası"
 
-#: lib/action.php:560
 #, fuzzy
 msgid "Friends timeline"
 msgstr "%s zaman çizelgesi"
 
-#: lib/action.php:566
-#, fuzzy
 msgid "Your profile"
 msgstr "Kullanıcının profili yok."
 
-#: lib/action.php:570 lib/action.php:593 lib/publicgroupnav.php:78
 msgid "Public"
 msgstr "Genel"
 
-#: lib/action.php:571 lib/action.php:594
 #, fuzzy
 msgid "Everyone on this site"
 msgstr "Siteye giriş"
 
-#: lib/action.php:575
-#, fuzzy
 msgid "Settings"
 msgstr "Profil ayarları"
 
-#: lib/action.php:576
 #, fuzzy
 msgid "Change your personal settings"
 msgstr "Profil ayarlarınızı değiştirin"
 
-#: lib/action.php:582
 #, fuzzy
 msgid "Site configuration"
 msgstr "Onay kodu yok."
 
-#: lib/action.php:587
-#, fuzzy
 msgid "Logout"
 msgstr "Çıkış"
 
-#: lib/action.php:588
 #, fuzzy
 msgid "Logout from the site"
 msgstr "Siteye giriş"
 
-#: lib/action.php:599
 #, fuzzy
 msgid "Login to the site"
 msgstr "Siteye giriş"
 
-#: lib/action.php:606
-#, fuzzy
 msgid "Search"
 msgstr "Ara"
 
-#: lib/action.php:607
 #, fuzzy
 msgid "Search the site"
 msgstr "Ara"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:864
 msgid "Help"
 msgstr "Yardım"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:867
 msgid "About"
 msgstr "Hakkında"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:870
 msgid "FAQ"
 msgstr "SSS"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:875
 msgid "TOS"
 msgstr ""
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:879
 msgid "Privacy"
 msgstr "Gizlilik"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:882
 msgid "Source"
 msgstr "Kaynak"
 
 #. TRANS: Secondary navigation menu option leading to e-mail contact information on the
 #. TRANS: StatusNet site, where to report bugs, ...
-#: lib/action.php:889
 msgid "Contact"
 msgstr "İletişim"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:892
 msgid "Badge"
 msgstr ""
 
@@ -7306,7 +6008,6 @@ msgstr ""
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:921
 #, fuzzy, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7316,7 +6017,6 @@ msgstr ""
 "hazırlanan anında mesajlaşma ağıdır. "
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:924
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** bir aninda mesajlaşma sosyal ağıdır."
@@ -7325,7 +6025,6 @@ msgstr "**%%site.name%%** bir aninda mesajlaşma sosyal ağıdır."
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:931
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7338,106 +6037,88 @@ msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:949
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:956
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:960
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:992
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1335
 msgid "After"
 msgstr "Sonra"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1345
 msgid "Before"
 msgstr "Önce"
 
 #. TRANS: Client exception thrown when a feed instance is a DOMDocument.
-#: lib/activity.php:125
 msgid "Expecting a root feed element but got a whole XML document."
 msgstr ""
 
 #. TRANS: Client exception thrown when using an unknown verb for the activity importer.
-#: lib/activityimporter.php:81
 #, fuzzy, php-format
 msgid "Unknown verb: \"%s\"."
 msgstr "Kullanıcının profili yok."
 
 #. TRANS: Client exception thrown when trying to force a subscription for an untrusted user.
-#: lib/activityimporter.php:107
 msgid "Cannot force subscription for untrusted user."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to for a remote user to subscribe.
-#: lib/activityimporter.php:117
 #, fuzzy
 msgid "Cannot force remote user to subscribe."
 msgstr "Kullanıcı güncellenemedi."
 
 #. TRANS: Client exception thrown when trying to subscribe to an unknown profile.
-#: lib/activityimporter.php:132
 #, fuzzy
 msgid "Unknown profile."
 msgstr "Kullanıcının profili yok."
 
 #. TRANS: Client exception thrown when trying to import an event not related to the importing user.
-#: lib/activityimporter.php:138
 msgid "This activity seems unrelated to our user."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to join a remote group that is not a group.
-#: lib/activityimporter.php:154
 msgid "Remote profile is not a group!"
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to join a group the importing user is already a member of.
-#: lib/activityimporter.php:163
 #, fuzzy
 msgid "User is already a member of this group."
 msgstr "Bize o profili yollamadınız"
 
 #. TRANS: Client exception thrown when trying to import a notice by another user.
 #. TRANS: %1$s is the source URI of the notice, %2$s is the URI of the author.
-#: lib/activityimporter.php:201
 #, php-format
 msgid "Already know about notice %1$s and  it has a different author %2$s."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to overwrite the author information for a non-trusted user during import.
-#: lib/activityimporter.php:207
 msgid "Not overwriting author info for non-trusted user."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to import a notice without content.
 #. TRANS: %s is the notice URI.
-#: lib/activityimporter.php:223
 #, fuzzy, php-format
 msgid "No content for notice %s."
 msgstr "Eğer lisansı kabul etmezseniz kayıt olamazsınız."
 
-#: lib/activitymover.php:84
 #, fuzzy, php-format
 msgid "No such user %s."
 msgstr "Böyle bir kullanıcı yok."
@@ -7448,431 +6129,352 @@ msgstr "Böyle bir kullanıcı yok."
 #. TRANS: %1$s is a URL, %2$s is the status, %s$s is the fail reason.
 #. TRANS: Exception thrown when post to collection fails with a status that is not handled.
 #. TRANS: %1$s is a URL, %2$s is the status, %s$s is the fail reason.
-#: lib/activitysink.php:163 lib/activitysink.php:167 lib/activitysink.php:172
 #, fuzzy, php-format
 msgctxt "URLSTATUSREASON"
 msgid "%1$s %2$s %3$s"
 msgstr "%1$s'in %2$s'deki durum mesajları "
 
 #. TRANS: Client exception thrown when there is no source attribute.
-#: lib/activityutils.php:200
 msgid "Can't handle remote content yet."
 msgstr ""
 
 #. TRANS: Client exception thrown when there embedded XML content is found that cannot be processed yet.
-#: lib/activityutils.php:237
 msgid "Can't handle embedded XML content yet."
 msgstr ""
 
 #. TRANS: Client exception thrown when base64 encoded content is found that cannot be processed yet.
-#: lib/activityutils.php:242
 msgid "Can't handle embedded Base64 content yet."
 msgstr ""
 
 #. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights.
-#: lib/adminpanelaction.php:96
 msgid "You cannot make changes to this site."
 msgstr ""
 
 #. TRANS: Client error message throw when a certain panel's settings cannot be changed.
-#: lib/adminpanelaction.php:108
 msgid "Changes to that panel are not allowed."
 msgstr ""
 
 #. TRANS: Client error message.
-#: lib/adminpanelaction.php:222
 msgid "showForm() not implemented."
 msgstr "showForm() gerçeklenmemiş."
 
 #. TRANS: Client error message
-#: lib/adminpanelaction.php:250
 msgid "saveSettings() not implemented."
 msgstr "saveSettings() gerçeklenmemiş."
 
 #. TRANS: Client error message thrown if design settings could not be deleted in
 #. TRANS: the admin panel Design.
-#: lib/adminpanelaction.php:274
 msgid "Unable to delete design setting."
 msgstr "Dizayn ayarı silinemedi."
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:337
 msgid "Basic site configuration"
 msgstr "Temel site yapılandırması"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:339
 msgctxt "MENU"
 msgid "Site"
 msgstr "Site"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:345
 msgid "Design configuration"
 msgstr "Dizayn yapılandırması"
 
 #. TRANS: Menu item for site administration
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/adminpanelaction.php:347 lib/groupnav.php:135
 msgctxt "MENU"
 msgid "Design"
 msgstr "Dizayn"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:353
 msgid "User configuration"
 msgstr "Onay kodu yok."
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:110
 msgid "User"
 msgstr "Kullanıcı"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:361
 msgid "Access configuration"
 msgstr "Erişim yapılandırması"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:369
 msgid "Paths configuration"
 msgstr "Yol yapılandırması"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:377
 #, fuzzy
 msgid "Sessions configuration"
 msgstr "Eposta adresi onayı"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:385
 msgid "Edit site notice"
 msgstr "Site durum mesajını düzenle"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:387
 #, fuzzy
 msgid "Site notice"
 msgstr "Yeni durum mesajı"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:393
 #, fuzzy
 msgid "Snapshots configuration"
 msgstr "Eposta adresi onayı"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:401
 msgid "Set site license"
 msgstr ""
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:409
 #, fuzzy
 msgid "Plugins configuration"
 msgstr "Yol yapılandırması"
 
 #. TRANS: Client error 401.
-#: lib/apiauth.php:111
 msgid "API resource requires read-write access, but you only have read access."
 msgstr ""
 
 #. TRANS: OAuth exception thrown when no application is found for a given consumer key.
-#: lib/apiauth.php:177
 msgid "No application for that consumer key."
 msgstr ""
 
-#: lib/apiauth.php:202 lib/apiauth.php:284
 msgid "Not allowed to use API."
 msgstr ""
 
 #. TRANS: OAuth exception given when an incorrect access token was given for a user.
-#: lib/apiauth.php:225
 msgid "Bad access token."
 msgstr ""
 
 #. TRANS: OAuth exception given when no user was found for a given token (no token was found).
-#: lib/apiauth.php:230
 msgid "No user for that token."
 msgstr ""
 
 #. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel".
 #. TRANS: Client error thrown when authentication fails.
-#: lib/apiauth.php:272 lib/apiauth.php:302
 msgid "Could not authenticate you."
 msgstr ""
 
 #. TRANS: Server error displayed when trying to create an anynymous OAuth consumer.
-#: lib/apioauthstore.php:45
 #, fuzzy
 msgid "Could not create anonymous consumer."
 msgstr "Kullanıcı güncellenemedi."
 
 #. TRANS: Server error displayed when trying to create an anynymous OAuth application.
-#: lib/apioauthstore.php:69
 #, fuzzy
 msgid "Could not create anonymous OAuth application."
 msgstr "Eposta onayı silinemedi."
 
 #. TRANS: Exception thrown when no token association could be found.
-#: lib/apioauthstore.php:151
 msgid ""
 "Could not find a profile and application associated with the request token."
 msgstr ""
 
 #. TRANS: Exception thrown when no access token can be issued.
-#: lib/apioauthstore.php:209
 #, fuzzy
 msgid "Could not issue access token."
 msgstr "Yeni abonelik eklenemedi."
 
-#: lib/apioauthstore.php:317
 msgid "Database error inserting OAuth application user."
 msgstr "OAuth uygulama kullanıcısı eklerken veritabanı hatası."
 
-#: lib/apioauthstore.php:345
 #, fuzzy
 msgid "Database error updating OAuth application user."
 msgstr "OAuth uygulama kullanıcısı eklerken veritabanı hatası."
 
 #. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
-#: lib/apioauthstore.php:371
 msgid "Tried to revoke unknown token."
 msgstr ""
 
 #. TRANS: Exception thrown when an attempt is made to remove a revoked token.
-#: lib/apioauthstore.php:376
 msgid "Failed to delete revoked token."
 msgstr ""
 
 #. TRANS: Form input field label for application icon.
-#: lib/applicationeditform.php:177
 msgid "Icon"
 msgstr "Simge"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:182
 msgid "Icon for this application"
 msgstr "Bu uygulama için simge"
 
 #. TRANS: Form input field instructions.
 #. TRANS: %d is the number of available characters for the description.
-#: lib/applicationeditform.php:201
 #, fuzzy, php-format
 msgid "Describe your application in %d character"
 msgid_plural "Describe your application in %d characters"
 msgstr[0] "Kendinizi ve ilgi alanlarınızı 140 karakter ile anlatın"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:205
 #, fuzzy
 msgid "Describe your application"
 msgstr "Kendinizi ve ilgi alanlarınızı 140 karakter ile anlatın"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:216
 #, fuzzy
 msgid "URL of the homepage of this application"
 msgstr ""
 "Web Sitenizin, blogunuzun ya da varsa başka bir sitedeki profilinizin adresi"
 
 #. TRANS: Form input field label.
-#: lib/applicationeditform.php:218
 #, fuzzy
 msgid "Source URL"
 msgstr "Kaynak"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:225
 msgid "Organization responsible for this application"
 msgstr ""
 
 #. TRANS: Form input field label.
-#: lib/applicationeditform.php:227
 msgid "Organization"
 msgstr "Organizasyon"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:234
 #, fuzzy
 msgid "URL for the homepage of the organization"
 msgstr ""
 "Web Sitenizin, blogunuzun ya da varsa başka bir sitedeki profilinizin adresi"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:243
 msgid "URL to redirect to after authentication"
 msgstr ""
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:271
 msgid "Browser"
 msgstr "Tarayıcı"
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:288
 msgid "Desktop"
 msgstr "Masaüstü"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:290
 msgid "Type of application, browser or desktop"
 msgstr ""
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:314
 msgid "Read-only"
 msgstr ""
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:334
 msgid "Read-write"
 msgstr ""
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:336
 msgid "Default access for this application: read-only, or read-write"
 msgstr ""
 
 #. TRANS: Submit button title.
-#: lib/applicationeditform.php:353
 msgid "Cancel"
 msgstr "İptal et"
 
-#: lib/applicationlist.php:247
 msgid " by "
 msgstr ""
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:260
 msgid "read-write"
 msgstr ""
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:262
 msgid "read-only"
 msgstr ""
 
 #. TRANS: Used in application list. %1$s is a modified date, %2$s is access type ("read-write" or "read-only")
-#: lib/applicationlist.php:268
 #, php-format
 msgid "Approved %1$s - \"%2$s\" access."
 msgstr ""
 
 #. TRANS: Access token in the application list.
 #. TRANS: %s are the first 7 characters of the access token.
-#: lib/applicationlist.php:282
 #, php-format
 msgid "Access token starting with: %s"
 msgstr ""
 
 #. TRANS: Button label
-#: lib/applicationlist.php:298
 msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "Geri al"
 
-#: lib/atom10feed.php:113
 msgid "Author element must contain a name element."
 msgstr ""
 
 #. TRANS: Server exception thrown when using the method setActivitySubject() in the class Atom10Feed.
-#: lib/atom10feed.php:160
 #, fuzzy
 msgid "Do not use this method!"
 msgstr "Bu durum mesajını silme"
 
 #. TRANS: Title.
-#: lib/attachmentnoticesection.php:67
 msgid "Notices where this attachment appears"
 msgstr ""
 
 #. TRANS: Title.
-#: lib/attachmenttagcloudsection.php:48
 msgid "Tags for this attachment"
 msgstr ""
 
 #. TRANS: Exception thrown when a password change fails.
-#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:227
 #, fuzzy
 msgid "Password changing failed."
 msgstr "Parola kaydedildi."
 
 #. TRANS: Exception thrown when a password change attempt fails because it is not allowed.
-#: lib/authenticationplugin.php:238
 #, fuzzy
 msgid "Password changing is not allowed."
 msgstr "Parola kaydedildi."
 
 #. TRANS: Title for the form to block a user.
-#: lib/blockform.php:68
 msgid "Block"
 msgstr "Engelle"
 
 #. TRANS: Description of the form to block a user.
-#: lib/blockform.php:79
 msgid "Block this user"
 msgstr "Bu kullanıcıyı engelle"
 
 #. TRANS: Title for command results.
-#: lib/channel.php:104 lib/channel.php:125
 msgid "Command results"
 msgstr ""
 
 #. TRANS: Title for command results.
-#: lib/channel.php:138
 msgid "AJAX error"
 msgstr ""
 
 #. TRANS: E-mail subject when a command has completed.
-#: lib/channel.php:177 lib/mailhandler.php:143
 msgid "Command complete"
 msgstr ""
 
 #. TRANS: E-mail subject when a command has failed.
-#: lib/channel.php:188
 msgid "Command failed"
 msgstr ""
 
 #. TRANS: Command exception text shown when a notice ID is requested that does not exist.
-#: lib/command.php:82 lib/command.php:106
 msgid "Notice with that id does not exist."
 msgstr ""
 
 #. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
 #. TRANS: Error text shown when a last user notice is requested and it does not exist.
-#: lib/command.php:99 lib/command.php:642
 #, fuzzy
 msgid "User has no last notice."
 msgstr "Kullanıcının profili yok."
 
 #. TRANS: Message given requesting a profile for a non-existing user.
 #. TRANS: %s is the nickname of the user for which the profile could not be found.
-#: lib/command.php:128
 #, fuzzy, php-format
 msgid "Could not find a user with nickname %s."
 msgstr "Kullanıcı güncellenemedi."
 
 #. TRANS: Message given getting a non-existing user.
 #. TRANS: %s is the nickname of the user that could not be found.
-#: lib/command.php:148
 #, php-format
 msgid "Could not find a local user with nickname %s."
 msgstr ""
 
 #. TRANS: Error text shown when an unimplemented command is given.
-#: lib/command.php:183
 msgid "Sorry, this command is not yet implemented."
 msgstr ""
 
 #. TRANS: Command exception text shown when a user tries to nudge themselves.
-#: lib/command.php:229
 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr ""
 
 #. TRANS: Message given having nudged another user.
 #. TRANS: %s is the nickname of the user that was nudged.
-#: lib/command.php:238
 #, php-format
 msgid "Nudge sent to %s."
 msgstr ""
@@ -7881,7 +6483,6 @@ msgstr ""
 #. TRANS: %1$s is the number of other user the user is subscribed to.
 #. TRANS: %2$s is the number of users that are subscribed to the user.
 #. TRANS: %3$s is the number of notices the user has sent.
-#: lib/command.php:268
 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"
@@ -7890,40 +6491,34 @@ msgid ""
 msgstr ""
 
 #. TRANS: Error message text shown when a favorite could not be set because it has already been favorited.
-#: lib/command.php:298
 #, fuzzy
 msgid "Could not create favorite: already favorited."
 msgstr "Favori oluşturulamadı."
 
 #. TRANS: Text shown when a notice has been marked as favourite successfully.
-#: lib/command.php:324
 msgid "Notice marked as fave."
 msgstr ""
 
 #. TRANS: Message given having added a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:369
 #, php-format
 msgid "%1$s joined group %2$s."
 msgstr ""
 
 #. TRANS: Message given having removed a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:417
 #, php-format
 msgid "%1$s left group %2$s."
 msgstr ""
 
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: lib/command.php:438
 #, fuzzy, php-format
 msgctxt "WHOIS"
 msgid "%1$s (%2$s)"
 msgstr "%1$s'in %2$s'deki durum mesajları "
 
 #. TRANS: Whois output. %s is the full name of the queried user.
-#: lib/command.php:442
 #, php-format
 msgid "Fullname: %s"
 msgstr "Tam İsim: %s"
@@ -7931,7 +6526,6 @@ msgstr "Tam İsim: %s"
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a location.
-#: lib/command.php:446 lib/mail.php:275
 #, php-format
 msgid "Location: %s"
 msgstr "Yer: %s"
@@ -7939,20 +6533,17 @@ msgstr "Yer: %s"
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a homepage.
-#: lib/command.php:450 lib/mail.php:279
 #, fuzzy, php-format
 msgid "Homepage: %s"
 msgstr "Başlangıç Sayfası"
 
 #. TRANS: Whois output. %s is the bio information of the queried user.
-#: lib/command.php:454
 #, php-format
 msgid "About: %s"
 msgstr "Hakkında: %s"
 
 #. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).
 #. TRANS: %s is a remote profile.
-#: lib/command.php:483
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
@@ -7961,33 +6552,33 @@ msgstr ""
 
 #. TRANS: Message given if content is too long. %1$sd is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:500
 #, fuzzy, php-format
 msgid "Message too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
 msgstr[0] "Bu çok uzun. Maksimum durum mesajı boyutu %d karakterdir."
 
+#. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
+#, fuzzy
+msgid "You can't send a message to this user."
+msgstr "Bize o profili yollamadınız"
+
 #. TRANS: Error text shown sending a direct message fails with an unknown reason.
-#: lib/command.php:528
 #, fuzzy
 msgid "Error sending direct message."
 msgstr "Kullanıcı ayarlamada hata oluştu."
 
 #. TRANS: Message given having repeated a notice from another user.
 #. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:565
 #, fuzzy, php-format
 msgid "Notice from %s repeated."
 msgstr "Durum mesajları"
 
 #. TRANS: Error text shown when repeating a notice fails with an unknown reason.
-#: lib/command.php:568
 msgid "Error repeating notice."
 msgstr "Kullanıcı ayarlamada hata oluştu."
 
 #. TRANS: Message given if content of a notice for a reply is too long. %1$d is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:603
 #, fuzzy, php-format
 msgid "Notice too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Notice too long - maximum is %1$d characters, you sent %2$d."
@@ -7995,97 +6586,81 @@ msgstr[0] "Bu çok uzun. Maksimum durum mesajı boyutu %d karakterdir."
 
 #. TRANS: Text shown having sent a reply to a notice successfully.
 #. TRANS: %s is the nickname of the user of the notice the reply was sent to.
-#: lib/command.php:616
 #, fuzzy, php-format
 msgid "Reply to %s sent."
 msgstr "%s için cevaplar"
 
 #. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
-#: lib/command.php:619
 #, fuzzy
 msgid "Error saving notice."
 msgstr "Durum mesajını kaydederken hata oluştu."
 
 #. TRANS: Error text shown when no username was provided when issuing a subscribe command.
-#: lib/command.php:666
 msgid "Specify the name of the user to subscribe to."
 msgstr ""
 
 #. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
-#: lib/command.php:675
 #, fuzzy
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "Bize o profili yollamadınız"
 
 #. TRANS: Text shown after having subscribed to another user successfully.
 #. TRANS: %s is the name of the user the subscription was requested for.
-#: lib/command.php:683
 #, php-format
 msgid "Subscribed to %s."
 msgstr ""
 
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.
-#: lib/command.php:704 lib/command.php:815
 msgid "Specify the name of the user to unsubscribe from."
 msgstr ""
 
 #. TRANS: Text shown after having unsubscribed from another user successfully.
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:715
 #, php-format
 msgid "Unsubscribed from %s."
 msgstr ""
 
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
-#: lib/command.php:735 lib/command.php:761
 msgid "Command not yet implemented."
 msgstr ""
 
 #. TRANS: Text shown when issuing the command "off" successfully.
-#: lib/command.php:739
 #, fuzzy
 msgid "Notification off."
 msgstr "Onay kodu yok."
 
 #. TRANS: Error text shown when the command "off" fails for an unknown reason.
-#: lib/command.php:742
 msgid "Can't turn off notification."
 msgstr ""
 
 #. TRANS: Text shown when issuing the command "on" successfully.
-#: lib/command.php:765
 #, fuzzy
 msgid "Notification on."
 msgstr "Onay kodu yok."
 
 #. TRANS: Error text shown when the command "on" fails for an unknown reason.
-#: lib/command.php:768
 msgid "Can't turn on notification."
 msgstr ""
 
 #. TRANS: Error text shown when issuing the login command while login is disabled.
-#: lib/command.php:782
 msgid "Login command is disabled."
 msgstr ""
 
 #. TRANS: Text shown after issuing the login command successfully.
 #. TRANS: %s is a logon link..
-#: lib/command.php:795
 #, php-format
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
 
 #. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:824
 #, php-format
 msgid "Unsubscribed %s."
 msgstr ""
 
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
-#: lib/command.php:842
 #, fuzzy
 msgid "You are not subscribed to anyone."
 msgstr "Bize o profili yollamadınız"
@@ -8093,14 +6668,12 @@ msgstr "Bize o profili yollamadınız"
 #. TRANS: Text shown after requesting other users a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
-#: lib/command.php:847
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Bize o profili yollamadınız"
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user
 #. TRANS: (followers) without having any subscribers.
-#: lib/command.php:869
 #, fuzzy
 msgid "No one is subscribed to you."
 msgstr "Uzaktan abonelik"
@@ -8108,14 +6681,12 @@ msgstr "Uzaktan abonelik"
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
-#: lib/command.php:874
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Uzaktan abonelik"
 
 #. TRANS: Text shown after requesting groups a user is subscribed to without having
 #. TRANS: any group subscriptions.
-#: lib/command.php:896
 #, fuzzy
 msgid "You are not a member of any groups."
 msgstr "Bize o profili yollamadınız"
@@ -8123,13 +6694,11 @@ msgstr "Bize o profili yollamadınız"
 #. TRANS: Text shown after requesting groups a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
-#: lib/command.php:901
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "Bize o profili yollamadınız"
 
 #. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-#: lib/command.php:916
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -8172,71 +6741,58 @@ msgid ""
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:36
 #, fuzzy
 msgid "No configuration file found."
 msgstr "Onay kodu yok."
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:39
 msgid "I looked for configuration files in the following places:"
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:42
 msgid "You may wish to run the installer to fix this."
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:46
 msgid "Go to the installer."
 msgstr ""
 
-#: lib/dberroraction.php:59
 msgid "Database error"
 msgstr ""
 
 #. TRANS: Description of form for deleting a user.
-#: lib/deleteuserform.php:75
 msgid "Delete this user"
 msgstr "Bu kullanıcıyı sil"
 
-#: lib/designform.php:114
 #, fuzzy
 msgid "Change design"
 msgstr "Dizaynı kaydet"
 
 #. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: lib/designform.php:131
 msgid "Change colours"
 msgstr "Renkleri değiştir"
 
 #. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: lib/designform.php:138
 msgid "Use defaults"
 msgstr "Öntanımlıları kullan"
 
 #. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: lib/designform.php:140
 msgid "Restore default designs"
 msgstr ""
 
 #. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: lib/designform.php:148
 msgid "Reset back to default"
 msgstr "Öntanımlıya geri dön"
 
 #. TRANS: Label in form on profile design page.
 #. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
-#: lib/designform.php:158
 #, fuzzy
 msgid "Upload file"
 msgstr "Yükle"
 
 #. TRANS: Instructions for form on profile design page.
-#: lib/designform.php:163
 #, fuzzy
 msgid ""
 "You can upload your personal background image. The maximum file size is 2Mb."
@@ -8244,50 +6800,42 @@ msgstr ""
 "Ah, durumunuz biraz uzun kaçtı. Azami 180 karaktere sığdırmaya ne dersiniz?"
 
 #. TRANS: Radio button on profile design page that will enable use of the uploaded profile image.
-#: lib/designform.php:194
 #, fuzzy
 msgctxt "RADIO"
 msgid "On"
 msgstr "Açık"
 
 #. TRANS: Radio button on profile design page that will disable use of the uploaded profile image.
-#: lib/designform.php:211
 #, fuzzy
 msgctxt "RADIO"
 msgid "Off"
 msgstr "Kapalı"
 
 #. TRANS: Title for button on profile design page to save settings.
-#: lib/designform.php:322
 msgid "Save design"
 msgstr "Dizaynı kaydet"
 
 #. TRANS: Error message displayed if design settings could not be saved.
 #. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
-#: lib/designsettings.php:216 lib/designsettings.php:238
 #, fuzzy
 msgid "Couldn't update your design."
 msgstr "Kullanıcı güncellenemedi."
 
 #. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
-#: lib/designsettings.php:244
 msgid "Design defaults restored."
 msgstr ""
 
 #. TRANS: Exception. %s is an ID.
-#: lib/discovery.php:153
 #, fuzzy, php-format
 msgid "Unable to find services for %s."
 msgstr "Uygulamayı düzenlemek için bu biçimi kullan."
 
 #. TRANS: Form legend for removing the favourite status for a favourite notice.
 #. TRANS: Title for button text for removing the favourite status for a favourite notice.
-#: lib/disfavorform.php:108 lib/disfavorform.php:140
 msgid "Disfavor this notice"
 msgstr ""
 
 #. TRANS: Button text for removing the favourite status for a favourite notice.
-#: lib/disfavorform.php:136
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Disfavor favorite"
@@ -8295,106 +6843,84 @@ msgstr "Favoriliğini kaldır"
 
 #. TRANS: Form legend for adding the favourite status to a notice.
 #. TRANS: Title for button text for adding the favourite status to a notice.
-#: lib/favorform.php:108 lib/favorform.php:139
 #, fuzzy
 msgid "Favor this notice"
 msgstr "Böyle bir durum mesajı yok."
 
 #. TRANS: Button text for adding the favourite status to a notice.
-#: lib/favorform.php:135
 msgctxt "BUTTON"
 msgid "Favor"
 msgstr ""
 
-#: lib/feed.php:84
 msgid "RSS 1.0"
 msgstr "RSS 1.0"
 
-#: lib/feed.php:86
 msgid "RSS 2.0"
 msgstr "RSS 2.0"
 
-#: lib/feed.php:88
 msgid "Atom"
 msgstr "Atom"
 
-#: lib/feed.php:90
 msgid "FOAF"
 msgstr "FOAF"
 
-#: lib/feedimporter.php:75
 #, fuzzy
 msgid "Not an atom feed."
 msgstr "Tüm üyeler"
 
-#: lib/feedimporter.php:82
 msgid "No author in the feed."
 msgstr ""
 
-#: lib/feedimporter.php:89
 msgid "Can't import without a user."
 msgstr ""
 
 #. TRANS: Header for feed links (h2).
-#: lib/feedlist.php:66
 msgid "Feeds"
 msgstr ""
 
-#: lib/galleryaction.php:128
 msgid "All"
 msgstr ""
 
-#: lib/galleryaction.php:136
 msgid "Select tag to filter"
 msgstr ""
 
-#: lib/galleryaction.php:137
 msgid "Tag"
 msgstr ""
 
-#: lib/galleryaction.php:138
 msgid "Choose a tag to narrow list"
 msgstr ""
 
-#: lib/galleryaction.php:140
 msgid "Go"
 msgstr ""
 
-#: lib/grantroleform.php:91
 #, php-format
 msgid "Grant this user the \"%s\" role"
 msgstr ""
 
-#: lib/groupeditform.php:147
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr ""
 "1-64 küçük harf veya rakam, noktalama işaretlerine ve boşluklara izin "
 "verilmez"
 
-#: lib/groupeditform.php:156
 #, fuzzy
 msgid "URL of the homepage or blog of the group or topic."
 msgstr ""
 "Web Sitenizin, blogunuzun ya da varsa başka bir sitedeki profilinizin adresi"
 
-#: lib/groupeditform.php:161
 #, fuzzy
 msgid "Describe the group or topic"
 msgstr "Kendinizi ve ilgi alanlarınızı 140 karakter ile anlatın"
 
-#: lib/groupeditform.php:163
 #, fuzzy, php-format
 msgid "Describe the group or topic in %d character or less"
 msgid_plural "Describe the group or topic in %d characters or less"
 msgstr[0] "Kendinizi ve ilgi alanlarınızı 140 karakter ile anlatın"
 
-#: lib/groupeditform.php:175
 #, fuzzy
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\"."
 msgstr "Bulunduğunuz yer, \"Şehir, Eyalet (veya Bölge), Ülke\" gibi"
 
-#: lib/groupeditform.php:183
 #, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -8405,70 +6931,60 @@ msgid_plural ""
 msgstr[0] ""
 
 #. TRANS: Menu item in the group navigation page.
-#: lib/groupnav.php:86
 msgctxt "MENU"
 msgid "Group"
 msgstr ""
 
 #. TRANS: Tooltip for menu item in the group navigation page.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:89
 #, php-format
 msgctxt "TOOLTIP"
 msgid "%s group"
 msgstr ""
 
 #. TRANS: Menu item in the group navigation page.
-#: lib/groupnav.php:95
 msgctxt "MENU"
 msgid "Members"
 msgstr ""
 
 #. TRANS: Tooltip for menu item in the group navigation page.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:98
 #, php-format
 msgctxt "TOOLTIP"
 msgid "%s group members"
 msgstr ""
 
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/groupnav.php:108
 msgctxt "MENU"
 msgid "Blocked"
 msgstr ""
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:111
 #, php-format
 msgctxt "TOOLTIP"
 msgid "%s blocked users"
 msgstr ""
 
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "Yönetim"
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:120
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Edit %s group properties"
 msgstr ""
 
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/groupnav.php:126
 msgctxt "MENU"
 msgid "Logo"
 msgstr ""
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:129
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Add or edit %s logo"
@@ -8476,91 +6992,76 @@ msgstr ""
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:138
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Add or edit %s design"
 msgstr ""
 
 #. TRANS: Title for groups with the most members section.
-#: lib/groupsbymemberssection.php:71
 msgid "Groups with most members"
 msgstr ""
 
 #. TRANS: Title for groups with the most posts section.
-#: lib/groupsbypostssection.php:71
 msgid "Groups with most posts"
 msgstr ""
 
 #. TRANS: Title for group tag cloud section.
 #. TRANS: %s is a group name.
-#: lib/grouptagcloudsection.php:57
 #, php-format
 msgid "Tags in %s group's notices"
 msgstr ""
 
 #. TRANS: Client exception 406
-#: lib/htmloutputter.php:104
 msgid "This page is not available in a media type you accept"
 msgstr "Bu sayfa kabul ettiğiniz ortam türünde kullanılabilir değil"
 
 #. TRANS: Exception thrown when trying to upload an unsupported image file format.
-#: lib/imagefile.php:73
 msgid "Unsupported image file format."
 msgstr "Desteklenmeyen görüntü dosyası biçemi."
 
 #. TRANS: Exception thrown when too large a file is uploaded.
 #. TRANS: %s is the maximum file size, for example "500b", "10kB" or "2MB".
-#: lib/imagefile.php:91
 #, fuzzy, php-format
 msgid "That file is too big. The maximum file size is %s."
 msgstr ""
 "Ah, durumunuz biraz uzun kaçtı. Azami 180 karaktere sığdırmaya ne dersiniz?"
 
 #. TRANS: Exception thrown when uploading an image and that action could not be completed.
-#: lib/imagefile.php:97
 msgid "Partial upload."
 msgstr "Kısmi yükleme."
 
 #. TRANS: Exception thrown when uploading a file as image that is not an image or is a corrupt file.
-#: lib/imagefile.php:115
 msgid "Not an image or corrupt file."
 msgstr "Bu bir resim dosyası değil ya da dosyada hata var"
 
 #. TRANS: Exception thrown during resize when image has been registered as present, but is no longer there.
-#: lib/imagefile.php:178
 #, fuzzy
 msgid "Lost our file."
 msgstr "Böyle bir durum mesajı yok."
 
 #. TRANS: Exception thrown when trying to resize an unknown file type.
 #. TRANS: Exception thrown when trying resize an unknown file type.
-#: lib/imagefile.php:216 lib/imagefile.php:257
 msgid "Unknown file type"
 msgstr ""
 
 #. TRANS: Number of megabytes. %d is the number.
-#: lib/imagefile.php:303
 #, fuzzy, php-format
 msgid "%dMB"
 msgid_plural "%dMB"
 msgstr[0] "MB"
 
 #. TRANS: Number of kilobytes. %d is the number.
-#: lib/imagefile.php:307
 #, fuzzy, php-format
 msgid "%dkB"
 msgid_plural "%dkB"
 msgstr[0] "kB"
 
 #. TRANS: Number of bytes. %d is the number.
-#: lib/imagefile.php:310
 #, php-format
 msgid "%dB"
 msgid_plural "%dB"
 msgstr[0] ""
 
-#: lib/implugin.php:262
 #, php-format
 msgid ""
 "User \"%s\" on %s has said that your %s screenname belongs to them. If "
@@ -8570,54 +7071,45 @@ msgid ""
 "message."
 msgstr ""
 
-#: lib/implugin.php:349
 #, php-format
 msgid "Unknown inbox source %d."
 msgstr ""
 
-#: lib/implugin.php:485
 #, fuzzy, php-format
 msgid "Message too long - maximum is %1$d characters, you sent %2$d."
 msgstr "Bu çok uzun. Maksimum durum mesajı boyutu %d karakterdir."
 
-#: lib/leaveform.php:114
 #, fuzzy
 msgid "Leave"
 msgstr "Kaydet"
 
 #. TRANS: Menu item for logging in to the StatusNet site.
-#: lib/logingroupnav.php:77
 msgctxt "MENU"
 msgid "Login"
 msgstr "Giriş"
 
 #. TRANS: Title for menu item for logging in to the StatusNet site.
-#: lib/logingroupnav.php:79
 #, fuzzy
 msgid "Login with a username and password"
 msgstr "Geçersiz kullanıcı adı veya parola."
 
 #. TRANS: Menu item for registering with the StatusNet site.
-#: lib/logingroupnav.php:85
 msgctxt "MENU"
 msgid "Register"
 msgstr "Kayıt"
 
 #. TRANS: Title for menu item for registering with the StatusNet site.
-#: lib/logingroupnav.php:87
 #, fuzzy
 msgid "Sign up for a new account"
 msgstr "Yeni hesap oluştur"
 
 #. TRANS: Subject for address confirmation email.
-#: lib/mail.php:172
 msgid "Email address confirmation"
 msgstr "Eposta adresi onayı"
 
 #. TRANS: Body for address confirmation email.
 #. TRANS: %1$s is the addressed user's nickname, %2$s is the StatusNet sitename,
 #. TRANS: %3$s is the URL to confirm at.
-#: lib/mail.php:177
 #, php-format
 msgid ""
 "Hey, %1$s.\n"
@@ -8636,14 +7128,12 @@ msgstr ""
 
 #. TRANS: Subject of new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
-#: lib/mail.php:243
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1$s %2$s'da durumunuzu takip ediyor"
 
 #. TRANS: This is a paragraph in a new-subscriber e-mail.
 #. TRANS: %s is a URL where the subscriber can be reported as abusive.
-#: lib/mail.php:250
 #, php-format
 msgid ""
 "If you believe this account is being used abusively, you can block them from "
@@ -8655,7 +7145,6 @@ msgstr ""
 #. TRANS: %3$s is the subscriber's profile URL, %4$s is the subscriber's location (or empty)
 #. TRANS: %5$s is the subscriber's homepage URL (or empty), %6%s is the subscriber's bio (or empty)
 #. TRANS: %7$s is a link to the addressed user's e-mail settings.
-#: lib/mail.php:260
 #, fuzzy, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -8678,14 +7167,12 @@ msgstr ""
 
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is biographical information.
-#: lib/mail.php:283
 #, fuzzy, php-format
 msgid "Bio: %s"
 msgstr "Hakkında"
 
 #. TRANS: Subject of notification mail for new posting email address.
 #. TRANS: %s is the StatusNet sitename.
-#: lib/mail.php:312
 #, fuzzy, php-format
 msgid "New email address for posting to %s"
 msgstr "Kullanıcı için kaydedilmiş eposta adresi yok."
@@ -8693,7 +7180,6 @@ msgstr "Kullanıcı için kaydedilmiş eposta adresi yok."
 #. TRANS: Body of notification mail for new posting email address.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is the e-mail address to send
 #. TRANS: to to post by e-mail, %3$s is a URL to more instructions.
-#: lib/mail.php:318
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -8708,27 +7194,23 @@ msgstr ""
 
 #. TRANS: Subject line for SMS-by-email notification messages.
 #. TRANS: %s is the posting user's nickname.
-#: lib/mail.php:439
 #, php-format
 msgid "%s status"
 msgstr "%s durum"
 
 #. TRANS: Subject line for SMS-by-email address confirmation message.
-#: lib/mail.php:465
 #, fuzzy
 msgid "SMS confirmation"
 msgstr "Onay kodu yok."
 
 #. TRANS: Main body heading for SMS-by-email address confirmation message.
 #. TRANS: %s is the addressed user's nickname.
-#: lib/mail.php:469
 #, php-format
 msgid "%s: confirm you own this phone number with this code:"
 msgstr ""
 
 #. TRANS: Subject for 'nudge' notification email.
 #. TRANS: %s is the nudging user.
-#: lib/mail.php:490
 #, php-format
 msgid "You have been nudged by %s"
 msgstr ""
@@ -8736,7 +7218,6 @@ msgstr ""
 #. TRANS: Body for 'nudge' notification email.
 #. TRANS: %1$s is the nuding user's long name, $2$s is the nudging user's nickname,
 #. TRANS: %3$s is a URL to post notices at, %4$s is the StatusNet sitename.
-#: lib/mail.php:497
 #, php-format
 msgid ""
 "%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -8754,7 +7235,6 @@ msgstr ""
 
 #. TRANS: Subject for direct-message notification email.
 #. TRANS: %s is the sending user's nickname.
-#: lib/mail.php:544
 #, php-format
 msgid "New private message from %s"
 msgstr ""
@@ -8763,7 +7243,6 @@ msgstr ""
 #. TRANS: %1$s is the sending user's long name, %2$s is the sending user's nickname,
 #. TRANS: %3$s is the message content, %4$s a URL to the message,
 #. TRANS: %5$s is the StatusNet sitename.
-#: lib/mail.php:552
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -8784,7 +7263,6 @@ msgstr ""
 
 #. TRANS: Subject for favorite notification e-mail.
 #. TRANS: %1$s is the adding user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:604
 #, fuzzy, php-format
 msgid "%1$s (@%2$s) added your notice as a favorite"
 msgstr "%1$s %2$s'da durumunuzu takip ediyor"
@@ -8794,7 +7272,6 @@ msgstr "%1$s %2$s'da durumunuzu takip ediyor"
 #. TRANS: %3$s is a URL to the faved notice, %4$s is the faved notice text,
 #. TRANS: %5$s is a URL to all faves of the adding user, %6$s is the StatusNet sitename,
 #. TRANS: %7$s is the adding user's nickname.
-#: lib/mail.php:611
 #, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -8816,7 +7293,6 @@ msgid ""
 msgstr ""
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:669
 #, php-format
 msgid ""
 "The full conversation can be read here:\n"
@@ -8826,7 +7302,6 @@ msgstr ""
 
 #. TRANS: E-mail subject for notice notification.
 #. TRANS: %1$s is the sending user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:677
 #, php-format
 msgid "%1$s (@%2$s) sent a notice to your attention"
 msgstr ""
@@ -8837,7 +7312,6 @@ msgstr ""
 #. TRANS: %5$s is a URL to the full conversion if it exists (otherwise empty),
 #. TRANS: %6$s is a URL to reply to the notice, %7$s is a URL to all @-replied for the addressed user,
 #. TRANS: %8$s is a URL to the addressed user's e-mail settings, %9$s is the sender's nickname.
-#: lib/mail.php:685
 #, php-format
 msgid ""
 "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -8864,63 +7338,51 @@ msgid ""
 "P.S. You can turn off these email notifications here: %8$s\n"
 msgstr ""
 
-#: lib/mailbox.php:87
 msgid "Only the user can read their own mailboxes."
 msgstr ""
 
-#: lib/mailbox.php:125
 msgid ""
 "You have no private messages. You can send private message to engage other "
 "users in conversation. People can send you messages for your eyes only."
 msgstr ""
 
-#: lib/mailhandler.php:37
 msgid "Could not parse message."
 msgstr "Mesaj ayrıştırılamadı."
 
-#: lib/mailhandler.php:42
 msgid "Not a registered user."
 msgstr "Kayıtlı bir kullanıcı değil."
 
-#: lib/mailhandler.php:46
 msgid "Sorry, that is not your incoming email address."
 msgstr "Üzgünüz, bu sizin gelen e-posta adresiniz değil."
 
-#: lib/mailhandler.php:50
 msgid "Sorry, no incoming email allowed."
 msgstr ""
 
-#: lib/mailhandler.php:229
 #, php-format
 msgid "Unsupported message type: %s"
 msgstr "Desteklenmeyen mesaj türü: %s"
 
 #. TRANS: Client exception thrown when a database error was thrown during a file upload operation.
-#: lib/mediafile.php:102 lib/mediafile.php:174
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
 
 #. TRANS: Client exception thrown when a file upload operation would cause a user to exceed a set quota.
-#: lib/mediafile.php:238 lib/mediafile.php:281
 msgid "File exceeds user's quota."
 msgstr ""
 
 #. TRANS: Client exception thrown when a file upload operation fails because the file could
 #. TRANS: not be moved from the temporary folder to the permanent file location.
-#: lib/mediafile.php:258 lib/mediafile.php:300
 msgid "File could not be moved to destination directory."
 msgstr ""
 
 #. TRANS: Client exception thrown when a file upload operation has been stopped because the MIME
 #. TRANS: type of the uploaded file could not be determined.
-#: lib/mediafile.php:265 lib/mediafile.php:306
 msgid "Could not determine file's MIME type."
 msgstr "Dosyanın MIME türü belirlenemedi."
 
 #. TRANS: Client exception thrown trying to upload a forbidden MIME type.
 #. TRANS: %1$s is the file type that was denied, %2$s is the application part of
 #. TRANS: the MIME type that was denied.
-#: lib/mediafile.php:396
 #, php-format
 msgid ""
 "\"%1$s\" is not a supported file type on this server. Try using another %2$s "
@@ -8929,879 +7391,609 @@ msgstr ""
 
 #. TRANS: Client exception thrown trying to upload a forbidden MIME type.
 #. TRANS: %s is the file type that was denied.
-#: lib/mediafile.php:401
 #, php-format
 msgid "\"%s\" is not a supported file type on this server."
 msgstr ""
 
-#: lib/messageform.php:120
 msgid "Send a direct notice"
 msgstr ""
 
 #. TRANS Label entry in drop-down selection box in direct-message inbox/outbox. This is the default entry in the drop-down box, doubling as instructions and a brake against accidental submissions with the first user in the list.
-#: lib/messageform.php:137
 msgid "Select recipient:"
 msgstr "Alıcıyı seçin:"
 
 #. TRANS Entry in drop-down selection box in direct-message inbox/outbox when no one is available to message.
-#: lib/messageform.php:150
 #, fuzzy
 msgid "No mutual subscribers."
 msgstr "Bu kullanıcıyı zaten takip etmiyorsunuz!"
 
-#: lib/messageform.php:153
 msgid "To"
 msgstr ""
 
-#: lib/messageform.php:184 lib/noticeform.php:236
 #, fuzzy
 msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr "Gönder"
 
-#: lib/messagelist.php:77
 #, fuzzy
 msgid "Messages"
 msgstr "Mesaj gönder"
 
-#: lib/messagelistitem.php:123 lib/noticelist.php:527
 msgid "from"
 msgstr ""
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:178
 msgid "Nickname cannot be empty."
 msgstr ""
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:191
 #, php-format
 msgid "Nickname cannot be more than %d character long."
 msgid_plural "Nickname cannot be more than %d characters long."
 msgstr[0] ""
 
-#: lib/noticeform.php:160
+#. TRANS: Form legend for notice form.
 #, fuzzy
 msgid "Send a notice"
 msgstr "Yeni durum mesajı"
 
-#: lib/noticeform.php:174
+#. TRANS: Title for notice label. %s is the user's nickname.
 #, php-format
 msgid "What's up, %s?"
 msgstr "N'aber %s?"
 
-#: lib/noticeform.php:193
+#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr ""
 
-#: lib/noticeform.php:197
-msgid "Attach a file"
+#. TRANS: Title for input field to attach a file to a notice.
+msgid "Attach a file."
 msgstr ""
 
-#: lib/noticeform.php:212
+#. TRANS: Field label to add location to a notice.
 #, fuzzy
 msgid "Share my location"
 msgstr "Profil kaydedilemedi."
 
-#: lib/noticeform.php:215
+#. TRANS: Text to not share location for a notice in notice form.
 #, fuzzy
 msgid "Do not share my location"
 msgstr "Profil kaydedilemedi."
 
-#: lib/noticeform.php:216
+#. TRANS: Timeout error text for location retrieval in notice form.
 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
 "try again later"
 msgstr ""
 
 #. TRANS: Used in coordinates as abbreviation of north
-#: lib/noticelist.php:457
 msgid "N"
 msgstr "K"
 
 #. TRANS: Used in coordinates as abbreviation of south
-#: lib/noticelist.php:459
 msgid "S"
 msgstr "G"
 
 #. TRANS: Used in coordinates as abbreviation of east
-#: lib/noticelist.php:461
 msgid "E"
 msgstr "D"
 
 #. TRANS: Used in coordinates as abbreviation of west
-#: lib/noticelist.php:463
 msgid "W"
 msgstr "B"
 
-#: lib/noticelist.php:465
 #, php-format
 msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgstr ""
 
-#: lib/noticelist.php:474
 msgid "at"
 msgstr ""
 
-#: lib/noticelist.php:523
 msgid "web"
 msgstr ""
 
-#: lib/noticelist.php:589
 #, fuzzy
 msgid "in context"
 msgstr "İçerik yok!"
 
-#: lib/noticelist.php:624
 #, fuzzy
 msgid "Repeated by"
 msgstr "Yarat"
 
-#: lib/noticelist.php:651
 msgid "Reply to this notice"
 msgstr ""
 
-#: lib/noticelist.php:652
 msgid "Reply"
 msgstr "Cevaplar"
 
-#: lib/noticelist.php:678
 msgid "Delete this notice"
 msgstr "Bu durum mesajını sil"
 
-#: lib/noticelist.php:696
 #, fuzzy
 msgid "Notice repeated"
 msgstr "Durum mesajları"
 
-#: lib/nudgeform.php:116
 msgid "Nudge this user"
 msgstr ""
 
-#: lib/nudgeform.php:128
 msgid "Nudge"
 msgstr ""
 
-#: lib/nudgeform.php:128
 msgid "Send a nudge to this user"
 msgstr ""
 
-#: lib/oauthstore.php:294
 msgid "Error inserting new profile."
 msgstr ""
 
-#: lib/oauthstore.php:302
 msgid "Error inserting avatar."
 msgstr ""
 
-#: lib/oauthstore.php:322
 msgid "Error inserting remote profile."
 msgstr ""
 
 #. TRANS: Exception thrown when a notice is denied because it has been sent before.
-#: lib/oauthstore.php:362
 msgid "Duplicate notice."
 msgstr ""
 
-#: lib/oauthstore.php:507
 msgid "Couldn't insert new subscription."
 msgstr "Yeni abonelik eklenemedi."
 
-#: lib/personalgroupnav.php:104
-#, fuzzy
 msgid "Replies"
 msgstr "Cevaplar"
 
-#: lib/personalgroupnav.php:109
 #, fuzzy
 msgid "Favorites"
 msgstr "%s favorileri"
 
-#: lib/personalgroupnav.php:120
 msgid "Inbox"
 msgstr ""
 
-#: lib/personalgroupnav.php:121
 msgid "Your incoming messages"
 msgstr ""
 
-#: lib/personalgroupnav.php:125
 msgid "Outbox"
 msgstr ""
 
-#: lib/personalgroupnav.php:126
 msgid "Your sent messages"
 msgstr ""
 
 #. TRANS: Title for personal tag cloud section. %s is a user nickname.
-#: lib/personaltagcloudsection.php:56
 #, php-format
 msgid "Tags in %s's notices"
 msgstr ""
 
 #. TRANS: Displayed as version information for a plugin if no version information was found.
-#: lib/plugin.php:126
 msgid "Unknown"
 msgstr ""
 
 #. TRANS: Plugin admin panel controls
-#: lib/plugindisableform.php:90
 msgctxt "plugin"
 msgid "Disable"
 msgstr ""
 
 #. TRANS: Plugin admin panel controls
-#: lib/pluginenableform.php:112
 msgctxt "plugin"
 msgid "Enable"
 msgstr ""
 
-#: lib/pluginlist.php:196
 msgctxt "plugin-description"
 msgid "(Plugin descriptions unavailable when disabled.)"
 msgstr ""
 
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:88
 msgid "Subscriptions"
 msgstr "Abonelikler"
 
 #. TRANS: Text for user subscription statistics if user has more subscriptions than displayed.
-#: lib/profileaction.php:144
 msgid "All subscriptions"
 msgstr "Bütün abonelikler"
 
 #. TRANS: H2 text for user subscriber statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:96
 msgid "Subscribers"
 msgstr "Abone olanlar"
 
 #. TRANS: Text for user subscription statistics if user has more subscribers than displayed.
-#: lib/profileaction.php:181
 #, fuzzy
 msgid "All subscribers"
 msgstr "Abone olanlar"
 
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:213
 msgid "User ID"
 msgstr ""
 
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:219
 msgid "Member since"
 msgstr "Üyelik başlangıcı"
 
 #. TRANS: Label for user statistics.
 #. TRANS: H2 text for user group membership statistics.
-#: lib/profileaction.php:239 lib/profileaction.php:290
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:104
 msgid "Groups"
 msgstr "Gruplar"
 
 #. TRANS: Label for user statistics.
 #. TRANS: Average count of posts made per day since account registration.
-#: lib/profileaction.php:253
 msgid "Daily average"
 msgstr ""
 
 #. TRANS: Text for user group membership statistics if user has more subscriptions than displayed.
-#: lib/profileaction.php:305
 msgid "All groups"
 msgstr ""
 
 #. TRANS: Server error displayed when using an unimplemented method.
-#: lib/profileformaction.php:123
 msgid "Unimplemented method."
 msgstr ""
 
-#: lib/publicgroupnav.php:82
 msgid "User groups"
 msgstr ""
 
-#: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
 msgid "Recent tags"
 msgstr ""
 
-#: lib/publicgroupnav.php:88
 msgid "Featured"
 msgstr ""
 
-#: lib/publicgroupnav.php:92
 #, fuzzy
 msgid "Popular"
 msgstr "Kişi Arama"
 
-#: lib/redirectingaction.php:95
 #, fuzzy
 msgid "No return-to arguments."
 msgstr "Böyle bir belge yok."
 
-#: lib/repeatform.php:107
 #, fuzzy
 msgid "Repeat this notice?"
 msgstr "Böyle bir durum mesajı yok."
 
-#: lib/repeatform.php:132
 msgid "Yes"
 msgstr ""
 
-#: lib/repeatform.php:132
 #, fuzzy
 msgid "Repeat this notice"
 msgstr "Böyle bir durum mesajı yok."
 
-#: lib/revokeroleform.php:91
 #, fuzzy, php-format
 msgid "Revoke the \"%s\" role from this user"
 msgstr "Böyle bir kullanıcı yok."
 
 #. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:1001
 #, fuzzy
 msgid "Page not found."
 msgstr "Onay kodu bulunamadı."
 
-#: lib/sandboxform.php:67
 msgid "Sandbox"
 msgstr ""
 
-#: lib/sandboxform.php:78
 #, fuzzy
 msgid "Sandbox this user"
 msgstr "Böyle bir kullanıcı yok."
 
 #. TRANS: Fieldset legend for the search form.
-#: lib/searchaction.php:120
 #, fuzzy
 msgid "Search site"
 msgstr "Ara"
 
 #. TRANS: Used as a field label for the field where one or more keywords
 #. TRANS: for searching can be entered.
-#: lib/searchaction.php:128
 msgid "Keyword(s)"
 msgstr ""
 
 #. TRANS: Button text for searching site.
-#: lib/searchaction.php:130
 msgctxt "BUTTON"
 msgid "Search"
 msgstr ""
 
-#: lib/searchgroupnav.php:80
 #, fuzzy
 msgid "People"
 msgstr "Kişi Arama"
 
-#: lib/searchgroupnav.php:81
 msgid "Find people on this site"
 msgstr ""
 
-#: lib/searchgroupnav.php:83
 msgid "Find content of notices"
 msgstr ""
 
-#: lib/searchgroupnav.php:85
 msgid "Find groups on this site"
 msgstr ""
 
-#: lib/section.php:89
 msgid "Untitled section"
 msgstr ""
 
-#: lib/section.php:106
 msgid "More..."
 msgstr ""
 
-#: lib/settingsnav.php:78
 msgid "Change your profile settings"
 msgstr "Profil ayarlarınızı değiştirin"
 
-#: lib/settingsnav.php:83
 msgid "Upload an avatar"
 msgstr "Bir kullanıcı resmi yükle"
 
-#: lib/settingsnav.php:88
 msgid "Change your password"
 msgstr "Parolanızı değiştirin"
 
-#: lib/settingsnav.php:93
 msgid "Change email handling"
 msgstr ""
 
-#: lib/settingsnav.php:98
 msgid "Design your profile"
 msgstr "Profilinizi tasarlayın"
 
-#: lib/settingsnav.php:102
 msgid "URL"
 msgstr "Bağlantı"
 
-#: lib/settingsnav.php:103
 msgid "URL shorteners"
 msgstr ""
 
-#: lib/settingsnav.php:111
 msgid "Updates by instant messenger (IM)"
 msgstr ""
 
-#: lib/settingsnav.php:118
 msgid "Updates by SMS"
 msgstr ""
 
-#: lib/settingsnav.php:123
 #, fuzzy
 msgid "Connections"
 msgstr "Bağlan"
 
-#: lib/settingsnav.php:124
 msgid "Authorized connected applications"
 msgstr ""
 
-#: lib/silenceform.php:67
 #, fuzzy
 msgid "Silence"
 msgstr "Yeni durum mesajı"
 
-#: lib/silenceform.php:78
 #, fuzzy
 msgid "Silence this user"
 msgstr "Böyle bir kullanıcı yok."
 
-#: lib/subgroupnav.php:89
 #, fuzzy, php-format
 msgid "People %s subscribes to"
 msgstr "Uzaktan abonelik"
 
-#: lib/subgroupnav.php:97
 #, fuzzy, php-format
 msgid "People subscribed to %s"
 msgstr "Uzaktan abonelik"
 
-#: lib/subgroupnav.php:105
 #, php-format
 msgid "Groups %s is a member of"
 msgstr ""
 
-#: lib/subgroupnav.php:111
 msgid "Invite"
 msgstr ""
 
-#: lib/subgroupnav.php:112
 #, php-format
 msgid "Invite friends and colleagues to join you on %s"
 msgstr ""
 
-#: lib/subscribeform.php:115 lib/subscribeform.php:139
 msgid "Subscribe to this user"
 msgstr "Bize o profili yollamadınız"
 
-#: lib/subscriberspeopleselftagcloudsection.php:48
-#: lib/subscriptionspeopleselftagcloudsection.php:48
 msgid "People Tagcloud as self-tagged"
 msgstr ""
 
-#: lib/subscriberspeopletagcloudsection.php:48
-#: lib/subscriptionspeopletagcloudsection.php:48
 msgid "People Tagcloud as tagged"
 msgstr ""
 
-#: lib/tagcloudsection.php:56
 msgid "None"
 msgstr ""
 
 #. TRANS: Server exception displayed if a theme name was invalid.
-#: lib/theme.php:74
 #, fuzzy
 msgid "Invalid theme name."
 msgstr "Geçersiz dosya ismi."
 
-#: lib/themeuploader.php:50
 msgid "This server cannot handle theme uploads without ZIP support."
 msgstr ""
 
-#: lib/themeuploader.php:58 lib/themeuploader.php:61
 msgid "The theme file is missing or the upload failed."
 msgstr ""
 
-#: lib/themeuploader.php:91 lib/themeuploader.php:102
-#: lib/themeuploader.php:279 lib/themeuploader.php:283
-#: lib/themeuploader.php:291 lib/themeuploader.php:298
 #, fuzzy
 msgid "Failed saving theme."
 msgstr "Avatar güncellemede hata."
 
-#: lib/themeuploader.php:147
 msgid "Invalid theme: bad directory structure."
 msgstr ""
 
-#: lib/themeuploader.php:166
 #, php-format
 msgid "Uploaded theme is too large; must be less than %d byte uncompressed."
 msgid_plural ""
 "Uploaded theme is too large; must be less than %d bytes uncompressed."
 msgstr[0] ""
 
-#: lib/themeuploader.php:179
 msgid "Invalid theme archive: missing file css/display.css"
 msgstr ""
 
-#: lib/themeuploader.php:219
 msgid ""
 "Theme contains invalid file or folder name. Stick with ASCII letters, "
 "digits, underscore, and minus sign."
 msgstr ""
 
-#: lib/themeuploader.php:225
 msgid "Theme contains unsafe file extension names; may be unsafe."
 msgstr ""
 
-#: lib/themeuploader.php:242
 #, php-format
 msgid "Theme contains file of type '.%s', which is not allowed."
 msgstr ""
 
-#: lib/themeuploader.php:260
 #, fuzzy
 msgid "Error opening theme archive."
 msgstr "Uzaktaki profili güncellemede hata oluştu"
 
-#: lib/threadednoticelist.php:270
 #, php-format
-msgid "Show all %d comment"
-msgid_plural "Show all %d comments"
+msgid "Show %d reply"
+msgid_plural "Show all %d replies"
 msgstr[0] ""
 
-#: lib/topposterssection.php:74
 msgid "Top posters"
 msgstr ""
 
 #. TRANS: Title for the form to unblock a user.
-#: lib/unblockform.php:67
 #, fuzzy
 msgctxt "TITLE"
 msgid "Unblock"
 msgstr "Engellemeyi Kaldır"
 
-#: lib/unsandboxform.php:69
 msgid "Unsandbox"
 msgstr ""
 
-#: lib/unsandboxform.php:80
 #, fuzzy
 msgid "Unsandbox this user"
 msgstr "Böyle bir kullanıcı yok."
 
-#: lib/unsilenceform.php:67
 msgid "Unsilence"
 msgstr ""
 
-#: lib/unsilenceform.php:78
 #, fuzzy
 msgid "Unsilence this user"
 msgstr "Böyle bir kullanıcı yok."
 
-#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
 #, fuzzy
 msgid "Unsubscribe from this user"
 msgstr "Bize o profili yollamadınız"
 
-#: lib/unsubscribeform.php:137
 msgid "Unsubscribe"
 msgstr "Aboneliği sonlandır"
 
 #. 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).
-#: lib/usernoprofileexception.php:60
 #, fuzzy, php-format
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "Kullanıcının profili yok."
 
-#: lib/userprofile.php:116
 #, fuzzy
 msgid "Edit Avatar"
 msgstr "Avatar"
 
 #. TRANS: H2 for user actions in a profile.
 #. TRANS: H2 for entity actions in a profile.
-#: lib/userprofile.php:216 lib/userprofile.php:232
 msgid "User actions"
 msgstr ""
 
 #. TRANS: Text shown in user profile of not yet compeltely deleted users.
-#: lib/userprofile.php:220
 msgid "User deletion in progress..."
 msgstr ""
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:248
 #, fuzzy
 msgid "Edit profile settings"
 msgstr "Profil ayarları"
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:250
 msgid "Edit"
 msgstr ""
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:274
 msgid "Send a direct message to this user"
 msgstr ""
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:276
 msgid "Message"
 msgstr ""
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:318
 msgid "Moderate"
 msgstr ""
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:357
 #, fuzzy
 msgid "User role"
 msgstr "Kullanıcının profili yok."
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:360
 msgctxt "role"
 msgid "Administrator"
 msgstr ""
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:362
 msgctxt "role"
 msgid "Moderator"
 msgstr ""
 
-#: lib/util.php:321
 #, fuzzy
 msgid "Not allowed to log in."
 msgstr "Giriş yapılmadı."
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1337
 msgid "a few seconds ago"
 msgstr "birkaç saniye önce"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1340
 msgid "about a minute ago"
 msgstr "yaklaşık bir dakika önce"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1344
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
 msgstr[0] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1347
 msgid "about an hour ago"
 msgstr "yaklaşık bir saat önce"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1351
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
 msgstr[0] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1354
 msgid "about a day ago"
 msgstr "yaklaşık bir gün önce"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1358
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
 msgstr[0] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1361
 msgid "about a month ago"
 msgstr "yaklaşık bir ay önce"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1365
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
 msgstr[0] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1368
 msgid "about a year ago"
 msgstr "yaklaşık bir yıl önce"
 
 #. TRANS: Web color exception thrown when a hexadecimal color code does not validate.
 #. TRANS: %s is the provided (invalid) color code.
-#: lib/webcolor.php:81 lib/webcolor.php:121
 #, fuzzy, php-format
 msgid "%s is not a valid color! Use 3 or 6 hex characters."
 msgstr "Başlangıç sayfası adresi geçerli bir URL değil."
 
 #. TRANS: Exception.
-#: lib/xrd.php:63
 #, fuzzy
 msgid "Invalid XML."
 msgstr "Geçersiz büyüklük."
 
 #. TRANS: Exception.
-#: lib/xrd.php:68
 msgid "Invalid XML, missing XRD root."
 msgstr ""
 
 #. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
-#: scripts/restoreuser.php:62
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
 
-#~ msgid "Could not generate feed for group - %s"
-#~ msgstr "Grup - %s için besleme oluşturulamadı."
+#~ msgid "Full name is too long (max 255 chars)."
+#~ msgstr "Tam isim çok uzun (en fazla: 255 karakter)."
+
+#~ msgid "description is too long (max %d chars)."
+#~ msgstr "Tanım çok uzun (en fazla %d karakter)."
+
+#~ msgid "Location is too long (max 255 chars)."
+#~ msgstr "Yer bilgisi çok uzun (en fazla 255 karakter)."
+
+#~ msgid "Too many aliases! Maximum %d."
+#~ msgstr "Çok fazla diğerisim! En fazla %d."
 
 #, fuzzy
-#~ msgid "Current confirmed Jabber/Google Talk address."
-#~ msgstr "Onaylanmış Jabber/Gtalk adresi."
-
-#, fuzzy
-#~ msgid ""
-#~ "Jabber or Google Talk address, like \"UserName@example.org\". First, make "
-#~ "sure to add %s to your buddy list in your IM client or on Google Talk."
-#~ msgstr ""
-#~ "Jabber veya Gtalk adresi: \"KullaniciAdi@example.org\" gibi. Öncelikle %"
-#~ "s, IM istemcisi veya Gtalk arkadaşlar listenize eklenmiş olmalıdır."
-
-#, fuzzy
-#~ msgid "Send me notices through Jabber/Google Talk."
-#~ msgstr "Durum mesajlarını Jabber/GTalk üzerinden gönder."
-
-#, fuzzy
-#~ msgid "Publish a MicroID for my Jabber/Google Talk address."
-#~ msgstr "Onaylanmış Jabber/Gtalk adresi."
-
-#~ msgid "No Jabber ID."
-#~ msgstr "JabberID yok."
-
-#, fuzzy
-#~ msgid "Not a valid Jabber ID."
-#~ msgstr "Geçersiz bir Jabber ID"
-
-#~ msgid "That is already your Jabber ID."
-#~ msgstr "Bu zaten sizin Jabber ID'niz."
-
-#~ msgid "That is not your Jabber ID."
-#~ msgstr "Bu sizin Jabber ID'niz değil."
-
-#~ msgid "Other settings"
-#~ msgstr "Profil ayarları"
-
-#~ msgid "Jabber"
-#~ msgstr "Jabber"
-
-#~ msgid "Photo"
-#~ msgstr "Fotoğraf"
-
-#~ msgid "Other options"
-#~ msgstr "Diğer seçenekler"
-
-#~ msgid "Other"
-#~ msgstr "Diğer"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Personal profile and friends timeline"
-#~ msgstr "Kişisel profil ve arkadaşların zaman çizelgesi"
-
-#~ msgctxt "MENU"
-#~ msgid "Personal"
-#~ msgstr "Kişisel"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Change your email, avatar, password, profile"
-#~ msgstr ""
-#~ "E-postanızı, kullanıcı resminizi, parolanızı, profilinizi değiştirin"
-
-#~ msgid "Account"
-#~ msgstr "Hesap"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Connect to services"
-#~ msgstr "Servislere bağlan"
-
-#~ msgid "Connect"
-#~ msgstr "Bağlan"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Change site configuration"
-#~ msgstr "Site yapılandırmasını değiştir"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Invite friends and colleagues to join you on %s"
-#~ msgstr ""
-#~ "%s üzerinde size katılmaları için arkadaşlarınızı ve meslektaşlarınızı "
-#~ "davet edin"
-
-#~ msgctxt "MENU"
-#~ msgid "Invite"
-#~ msgstr "Davet et"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Create an account"
-#~ msgstr "Bir hesap oluştur"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Help me!"
-#~ msgstr "Bana yardım et!"
-
-#~ msgctxt "MENU"
-#~ msgid "Help"
-#~ msgstr "Yardım"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Search for people or text"
-#~ msgstr "Kişi ya da yazılar için arama yap"
-
-#, fuzzy
-#~ msgid "Page notice"
-#~ msgstr "Yeni durum mesajı"
-
-#, fuzzy
-#~ msgid "Secondary site navigation"
-#~ msgstr "Abonelikler"
-
-#~ msgid "StatusNet software license"
-#~ msgstr "StatusNet yazılım lisansı"
-
-#~ msgid "Site content license"
-#~ msgstr "Site içeriği lisansı"
-
-#~ msgid "Provider"
-#~ msgstr "Sağlayıcı"
-
-#, fuzzy
-#~ msgid "Available characters"
-#~ msgstr "6 veya daha fazla karakter"
-
-#, fuzzy
-#~ msgctxt "MENU"
-#~ msgid "Profile"
-#~ msgstr "Profil"
-
-#, fuzzy
-#~ msgid "Search help"
-#~ msgstr "Ara"
-
-#, fuzzy
-#~ msgid "Message too long. Maximum is %1$d character, you sent %2$d."
-#~ msgid_plural "Message too long. Maximum is %1$d characters, you sent %2$d."
-#~ msgstr[0] "Bu çok uzun. Maksimum durum mesajı boyutu %d karakterdir."
+#~ msgctxt "BUTTON"
+#~ msgid "Comment"
+#~ msgstr "İçerik"
diff --git a/locale/uk/LC_MESSAGES/statusnet.po b/locale/uk/LC_MESSAGES/statusnet.po
index e491d1d412..b830803af4 100644
--- a/locale/uk/LC_MESSAGES/statusnet.po
+++ b/locale/uk/LC_MESSAGES/statusnet.po
@@ -12,70 +12,60 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:23+0000\n"
-"PO-Revision-Date: 2011-03-03 17:26:31+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:41+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
-"X-POT-Import-Date: 2011-02-25 23:49:23+0000\n"
+"X-POT-Import-Date: 2011-03-03 17:59:19+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
-#: actions/accessadminpanel.php:53 lib/adminpanelaction.php:363
 msgid "Access"
 msgstr "Погодитись"
 
 #. TRANS: Page notice.
-#: actions/accessadminpanel.php:64
 msgid "Site access settings"
 msgstr "Параметри доступу на сайт"
 
 #. TRANS: Form legend for registration form.
-#: actions/accessadminpanel.php:151
 msgid "Registration"
 msgstr "Реєстрація"
 
 #. TRANS: Checkbox instructions for admin setting "Private".
-#: actions/accessadminpanel.php:155
 msgid "Prohibit anonymous users (not logged in) from viewing site?"
 msgstr ""
 "Заборонити анонімним відвідувачам (ті, що не увійшли до системи) переглядати "
 "сайт?"
 
 #. TRANS: Checkbox label for prohibiting anonymous users from viewing site.
-#: actions/accessadminpanel.php:157
 msgctxt "LABEL"
 msgid "Private"
 msgstr "Приватно"
 
 #. TRANS: Checkbox instructions for admin setting "Invite only".
-#: actions/accessadminpanel.php:164
 msgid "Make registration invitation only."
 msgstr "Зробити реєстрацію лише за запрошеннями."
 
 #. TRANS: Checkbox label for configuring site as invite only.
-#: actions/accessadminpanel.php:166
 msgid "Invite only"
 msgstr "Лише за запрошеннями"
 
 #. TRANS: Checkbox instructions for admin setting "Closed" (no new registrations).
-#: actions/accessadminpanel.php:173
 msgid "Disable new registrations."
 msgstr "Скасувати подальшу реєстрацію."
 
 #. TRANS: Checkbox label for disabling new user registrations.
-#: actions/accessadminpanel.php:175
 msgid "Closed"
 msgstr "Закрито"
 
 #. TRANS: Title for button to save access settings in site admin panel.
-#: actions/accessadminpanel.php:191
 msgid "Save access settings"
 msgstr "Зберегти параметри доступу"
 
@@ -83,6 +73,7 @@ msgstr "Зберегти параметри доступу"
 #. TRANS: Button text for saving theme settings.
 #. TRANS: Button label to save e-mail preferences.
 #. TRANS: Button label to save IM preferences.
+#. TRANS: Button text in the license admin panel.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
 #. TRANS: Button text for saving site notice in admin panel.
@@ -92,21 +83,12 @@ msgstr "Зберегти параметри доступу"
 #. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
 #. TRANS: Button text on profile design page to save settings.
-#: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
-#: actions/emailsettings.php:251 actions/imsettings.php:199
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:198
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:204
-#: actions/subscriptions.php:261 actions/urlsettings.php:152
-#: actions/useradminpanel.php:298 lib/applicationeditform.php:355
-#: lib/designform.php:320 lib/groupeditform.php:201
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Зберегти"
 
 #. TRANS: Server error when page not found (404).
 #. TRANS: Server error when page not found (404)
-#: actions/all.php:68 actions/public.php:98 actions/replies.php:93
-#: actions/showfavorites.php:140 actions/tag.php:52
 msgid "No such page."
 msgstr "Немає такої сторінки."
 
@@ -125,6 +107,7 @@ msgstr "Немає такої сторінки."
 #. TRANS: Client error displayed when checking group membership for a non-existing user.
 #. TRANS: Client error displayed when trying to have a non-existing user join a group.
 #. TRANS: Client error displayed when trying to have a non-existing user leave a group.
+#. TRANS: Client error displayed when not providing a user or an invalid user.
 #. TRANS: Client error displayed when updating a status for a non-existing user.
 #. TRANS: Client error displayed when requesting a list of followers for a non-existing user.
 #. TRANS: Client error displayed when requesting most recent favourite notices by a user for a non-existing user.
@@ -137,6 +120,8 @@ msgstr "Немає такої сторінки."
 #. 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.
 #. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
@@ -144,33 +129,10 @@ msgstr "Немає такої сторінки."
 #. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when calling a profile action without specifying a user.
-#: actions/all.php:80 actions/allrss.php:69
-#: actions/apiaccountupdatedeliverydevice.php:110
-#: actions/apiaccountupdateprofile.php:103
-#: actions/apiaccountupdateprofilebackgroundimage.php:118
-#: actions/apiaccountupdateprofileimage.php:104 actions/apiatomservice.php:59
-#: actions/apiblockcreate.php:96 actions/apiblockdestroy.php:94
-#: actions/apidirectmessage.php:75 actions/apidirectmessagenew.php:72
-#: actions/apigroupcreate.php:111 actions/apigroupismember.php:89
-#: actions/apigroupjoin.php:98 actions/apigroupleave.php:98
-#: actions/apigrouplist.php:70 actions/apigroupprofileupdate.php:108
-#: actions/apistatusesupdate.php:230 actions/apisubscriptions.php:85
-#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:173
-#: actions/apitimelinehome.php:78 actions/apitimelinementions.php:77
-#: actions/apitimelineuser.php:79 actions/avatarbynickname.php:79
-#: actions/favoritesrss.php:72 actions/foaf.php:42 actions/foaf.php:61
-#: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116
-#: actions/otp.php:78 actions/remotesubscribe.php:144
-#: actions/remotesubscribe.php:153 actions/replies.php:73
-#: actions/repliesrss.php:38 actions/rsd.php:113 actions/showfavorites.php:106
-#: actions/userbyid.php:75 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/userxrd.php:59 actions/xrds.php:71 lib/command.php:509
-#: lib/galleryaction.php:59 lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Такого користувача немає."
 
 #. TRANS: Page title. %1$s is user nickname, %2$d is page number
-#: actions/all.php:91
 #, php-format
 msgid "%1$s and friends, page %2$d"
 msgstr "%1$s та друзі, сторінка %2$d"
@@ -179,33 +141,26 @@ msgstr "%1$s та друзі, сторінка %2$d"
 #. TRANS: H1 text for page. %s is a user nickname.
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Timeline title for user and friends. %s is a user nickname.
-#: actions/all.php:94 actions/all.php:191 actions/allrss.php:117
-#: actions/apitimelinefriends.php:207 actions/apitimelinehome.php:113
-#: lib/personalgroupnav.php:100
 #, php-format
 msgid "%s and friends"
 msgstr "%s з друзями"
 
 #. TRANS: %s is user nickname.
-#: actions/all.php:108
 #, php-format
 msgid "Feed for friends of %s (RSS 1.0)"
 msgstr "Стрічка дописів для друзів %s (RSS 1.0)"
 
 #. TRANS: %s is user nickname.
-#: actions/all.php:117
 #, php-format
 msgid "Feed for friends of %s (RSS 2.0)"
 msgstr "Стрічка дописів для друзів %s (RSS 2.0)"
 
 #. TRANS: %s is user nickname.
-#: actions/all.php:126
 #, php-format
 msgid "Feed for friends of %s (Atom)"
 msgstr "Стрічка дописів для друзів %s (Atom)"
 
 #. TRANS: Empty list message. %s is a user nickname.
-#: actions/all.php:139
 #, php-format
 msgid ""
 "This is the timeline for %s and friends but no one has posted anything yet."
@@ -213,7 +168,6 @@ msgstr "Це стрічка дописів %s і друзів, але вона 
 
 #. TRANS: Encouragement displayed on logged in user's empty timeline.
 #. TRANS: This message contains Markdown links. Keep "](" together.
-#: actions/all.php:146
 #, php-format
 msgid ""
 "Try subscribing to more people, [join a group](%%action.groups%%) or post "
@@ -224,7 +178,6 @@ msgstr ""
 
 #. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@".
 #. TRANS: This message contains Markdown links. Keep "](" together.
-#: actions/all.php:150
 #, php-format
 msgid ""
 "You can try to [nudge %1$s](../%2$s) from their profile or [post something "
@@ -237,7 +190,6 @@ msgstr ""
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
 #. TRANS: Second sentence of empty message for anonymous users. %s is a user nickname.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:221
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -247,14 +199,11 @@ msgstr ""
 "«розштовхати» %s або щось йому написати."
 
 #. TRANS: H1 text for page when viewing a list for self.
-#: actions/all.php:188
 msgid "You and friends"
 msgstr "Ви з друзями"
 
 #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
 #. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name.
-#: actions/allrss.php:122 actions/apitimelinefriends.php:213
-#: actions/apitimelinehome.php:119
 #, php-format
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr "Оновлення від %1$s та друзів на %2$s!"
@@ -273,55 +222,20 @@ msgstr "Оновлення від %1$s та друзів на %2$s!"
 #. TRANS: Client error displayed trying to execute an unknown API method checking group membership.
 #. TRANS: Client error displayed trying to execute an unknown API method listing the latest 20 groups.
 #. TRANS: Client error displayed trying to execute an unknown API method showing group membership.
+#. TRANS: Client error displayed when using an unsupported API format.
 #. TRANS: Client error displayed trying to execute an unknown API method showing a group.
 #. TRANS: Client error displayed trying to execute an unknown API method testing API connectivity.
 #. TRANS: Client error displayed trying to execute an unknown API method deleting a status.
 #. TRANS: Client error displayed when trying to handle an unknown API method.
-#: actions/apiaccountratelimitstatus.php:69
-#: actions/apiaccountupdatedeliverydevice.php:92
-#: actions/apiaccountupdateprofile.php:94
-#: actions/apiaccountupdateprofilebackgroundimage.php:92
-#: actions/apiaccountupdateprofilecolors.php:115
-#: actions/apiaccountverifycredentials.php:68 actions/apidirectmessage.php:157
-#: actions/apifavoritecreate.php:98 actions/apifavoritedestroy.php:98
-#: actions/apifriendshipscreate.php:99 actions/apifriendshipsdestroy.php:99
-#: actions/apifriendshipsshow.php:124 actions/apigroupcreate.php:138
-#: actions/apigroupismember.php:115 actions/apigroupjoin.php:151
-#: actions/apigroupleave.php:141 actions/apigrouplist.php:134
-#: actions/apigrouplistall.php:120 actions/apigroupmembership.php:105
-#: actions/apigroupprofileupdate.php:100 actions/apigroupprofileupdate.php:213
-#: actions/apigroupshow.php:114 actions/apihelptest.php:84
-#: actions/apistatusesdestroy.php:101 actions/apistatusesretweets.php:110
-#: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:139
-#: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
-#: actions/apitimelinefavorites.php:182 actions/apitimelinefriends.php:276
-#: actions/apitimelinegroup.php:148 actions/apitimelinehome.php:181
-#: actions/apitimelinementions.php:182 actions/apitimelinepublic.php:247
-#: actions/apitimelineretweetedtome.php:147
-#: actions/apitimelineretweetsofme.php:147 actions/apitimelinetag.php:165
-#: actions/apitimelineuser.php:217 actions/apiusershow.php:100
 msgid "API method not found."
 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.
-#: actions/apiaccountupdatedeliverydevice.php:83
-#: actions/apiaccountupdateprofile.php:85
-#: actions/apiaccountupdateprofilebackgroundimage.php:83
-#: actions/apiaccountupdateprofilecolors.php:106
-#: actions/apiaccountupdateprofileimage.php:80 actions/apiblockcreate.php:87
-#: actions/apiblockdestroy.php:85 actions/apidirectmessagenew.php:107
-#: actions/apifavoritecreate.php:88 actions/apifavoritedestroy.php:88
-#: actions/apifriendshipscreate.php:89 actions/apifriendshipsdestroy.php:89
-#: actions/apigroupcreate.php:102 actions/apigroupjoin.php:89
-#: actions/apigroupleave.php:89 actions/apigroupprofileupdate.php:92
-#: actions/apimediaupload.php:66 actions/apistatusesretweet.php:63
-#: actions/apistatusesupdate.php:194
 msgid "This method requires a POST."
 msgstr "Цей метод потребує POST."
 
 #. TRANS: Client error displayed when no valid device parameter is provided for a user's delivery device setting.
-#: actions/apiaccountupdatedeliverydevice.php:103
 msgid ""
 "You must specify a parameter named 'device' with a value of one of: sms, im, "
 "none."
@@ -335,10 +249,6 @@ msgstr ""
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
-#: actions/apiaccountupdatedeliverydevice.php:136
-#: actions/emailsettings.php:353 actions/emailsettings.php:499
-#: actions/profilesettings.php:323 actions/smssettings.php:300
-#: actions/smssettings.php:453 actions/urlsettings.php:211
 msgid "Could not update user."
 msgstr "Не вдалося оновити користувача."
 
@@ -351,32 +261,17 @@ msgstr "Не вдалося оновити користувача."
 #. TRANS: Server error displayed when requesting Friends of a Friend feed for a user for which the profile could not be found.
 #. TRANS: Server error displayed when trying to get a user hCard for a user without a profile.
 #. TRANS: Server error displayed when calling a profile action while the specified user does not have a profile.
-#: actions/apiaccountupdateprofile.php:111
-#: actions/apiaccountupdateprofilebackgroundimage.php:199
-#: actions/apiaccountupdateprofilecolors.php:183
-#: actions/apiaccountupdateprofileimage.php:131
-#: actions/apiuserprofileimage.php:88 actions/apiusershow.php:108
-#: actions/avatarbynickname.php:85 actions/foaf.php:69 actions/hcard.php:75
-#: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
-#: lib/profileaction.php:85
 msgid "User has no profile."
 msgstr "Користувач не має профілю."
 
 #. TRANS: Server error displayed if a user profile could not be saved.
 #. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:419
 msgid "Could not save profile."
 msgstr "Не вдалося зберегти профіль."
 
 #. TRANS: Client error displayed when the number of bytes in a POST request exceeds a limit.
 #. TRANS: %s is the number of bytes of the CONTENT_LENGTH.
 #. TRANS: Form validation error in design settings form. POST should remain untranslated.
-#: actions/apiaccountupdateprofilebackgroundimage.php:108
-#: actions/apiaccountupdateprofileimage.php:95 actions/apimediaupload.php:81
-#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
-#: actions/designadminpanel.php:120 actions/editapplication.php:121
-#: actions/newapplication.php:102 actions/newnotice.php:95
-#: lib/designsettings.php:110
 #, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s byte) due to its "
@@ -399,26 +294,15 @@ msgstr[2] ""
 #. TRANS: Client error displayed when a database error occurs inserting profile colours.
 #. TRANS: Client error displayed when a database error occurs updating profile colours.
 #. TRANS: Form validation error displayed when group design settings could not be saved because of an application issue.
-#: actions/apiaccountupdateprofilebackgroundimage.php:138
-#: actions/apiaccountupdateprofilebackgroundimage.php:149
-#: actions/apiaccountupdateprofilecolors.php:160
-#: actions/apiaccountupdateprofilecolors.php:171
-#: actions/groupdesignsettings.php:285 actions/groupdesignsettings.php:296
-#: actions/userdesignsettings.php:218 actions/userdesignsettings.php:228
-#: actions/userdesignsettings.php:270 actions/userdesignsettings.php:280
 msgid "Unable to save your design settings."
 msgstr "Не маю можливості зберегти налаштування дизайну."
 
 #. TRANS: Error displayed when updating design settings fails.
 #. TRANS: Client error displayed when a database error occurs updating profile colours.
-#: actions/apiaccountupdateprofilebackgroundimage.php:191
-#: actions/apiaccountupdateprofilecolors.php:139
-#: actions/userdesignsettings.php:196
 msgid "Could not update your design."
 msgstr "Не вдалося оновити ваш дизайн."
 
 #. TRANS: Title for Atom feed.
-#: actions/apiatomservice.php:85
 msgctxt "ATOM"
 msgid "Main"
 msgstr "Головна"
@@ -427,9 +311,6 @@ msgstr "Головна"
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Title in atom group notice feed. %s is a group name.
 #. TRANS: Title in atom user notice feed. %s is a user name.
-#: actions/apiatomservice.php:93 actions/grouprss.php:138
-#: actions/userrss.php:94 lib/atomgroupnoticefeed.php:63
-#: lib/atomusernoticefeed.php:88
 #, php-format
 msgid "%s timeline"
 msgstr "%s стрічка"
@@ -439,8 +320,6 @@ msgstr "%s стрічка"
 #. TRANS: %s is a user nickname.
 #. TRANS: Header for subscriptions overview for a user (first page).
 #. TRANS: %s is a user nickname.
-#: actions/apiatomservice.php:104 actions/atompubsubscriptionfeed.php:148
-#: actions/subscriptions.php:51
 #, php-format
 msgid "%s subscriptions"
 msgstr "Підписки %s"
@@ -448,58 +327,48 @@ msgstr "Підписки %s"
 #. TRANS: Title for Atom feed with a user's favorite notices. %s is a user nickname.
 #. TRANS: Title for Atom favorites feed.
 #. TRANS: %s is a user nickname.
-#: actions/apiatomservice.php:115 actions/atompubfavoritefeed.php:142
 #, php-format
 msgid "%s favorites"
 msgstr "Обрані %s"
 
 #. TRANS: Title for Atom feed with a user's memberships. %s is a user nickname.
-#: actions/apiatomservice.php:126
 #, php-format
 msgid "%s memberships"
 msgstr "Учасники спільноти %s"
 
 #. TRANS: Client error displayed when users try to block themselves.
-#: actions/apiblockcreate.php:105
 msgid "You cannot block yourself!"
 msgstr "Ви не можете блокувати самого себе!"
 
 #. TRANS: Server error displayed when blocking a user has failed.
-#: actions/apiblockcreate.php:127
 msgid "Block user failed."
 msgstr "Спроба заблокувати користувача невдала."
 
 #. TRANS: Server error displayed when unblocking a user has failed.
-#: actions/apiblockdestroy.php:113
 msgid "Unblock user failed."
 msgstr "Спроба розблокувати користувача невдала."
 
 #. TRANS: Title. %s is a user nickname.
-#: actions/apidirectmessage.php:88
 #, php-format
 msgid "Direct messages from %s"
 msgstr "Прямі повідомлення від %s"
 
 #. TRANS: Subtitle. %s is a user nickname.
-#: actions/apidirectmessage.php:93
 #, php-format
 msgid "All the direct messages sent from %s"
 msgstr "Всі прямі повідомлення надіслані від %s"
 
 #. TRANS: Title. %s is a user nickname.
-#: actions/apidirectmessage.php:102
 #, php-format
 msgid "Direct messages to %s"
 msgstr "Пряме повідомлення до %s"
 
 #. TRANS: Subtitle. %s is a user nickname.
-#: actions/apidirectmessage.php:107
 #, php-format
 msgid "All the direct messages sent to %s"
 msgstr "Всі прямі повідомлення надіслані до %s"
 
 #. TRANS: Client error displayed when no message text was submitted (406).
-#: actions/apidirectmessagenew.php:117
 msgid "No message text!"
 msgstr "Повідомлення без тексту!"
 
@@ -507,7 +376,6 @@ msgstr "Повідомлення без тексту!"
 #. TRANS: %d is the maximum number of characters for a message.
 #. TRANS: Form validation error displayed when message content is too long.
 #. TRANS: %d is the maximum number of characters for a message.
-#: actions/apidirectmessagenew.php:127 actions/newmessage.php:152
 #, php-format
 msgid "That's too long. Maximum message size is %d character."
 msgid_plural "That's too long. Maximum message size is %d characters."
@@ -516,19 +384,16 @@ msgstr[1] "Надто довго. Максимальний розмір допи
 msgstr[2] "Надто довго. Максимальний розмір допису — %d знаків."
 
 #. TRANS: Client error displayed if a recipient user could not be found (403).
-#: actions/apidirectmessagenew.php:139
 msgid "Recipient user not found."
 msgstr "Отримувача не знайдено."
 
 #. TRANS: Client error displayed trying to direct message another user who's not a friend (403).
-#: actions/apidirectmessagenew.php:144
 msgid "Cannot send direct messages to users who aren't your friend."
 msgstr ""
 "Не вдається надіслати пряме повідомлення користувачеві, який не є вашим "
 "другом."
 
 #. TRANS: Client error displayed trying to direct message self (403).
-#: actions/apidirectmessagenew.php:154
 msgid ""
 "Do not send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
@@ -538,118 +403,98 @@ 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.
 #. TRANS: Client error displayed trying to delete a status with an invalid ID.
-#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:108
-#: actions/apistatusesdestroy.php:121
 msgid "No status found with that ID."
 msgstr "Жодних статусів з таким ID."
 
 #. TRANS: Client error displayed when trying to mark a notice favourite that already is a favourite.
-#: actions/apifavoritecreate.php:120
 msgid "This status is already a favorite."
 msgstr "Цей статус вже є обраним."
 
 #. TRANS: Client error displayed when marking a notice as favourite fails.
 #. TRANS: Server error displayed when trying to mark a notice as favorite fails in the database.
 #. TRANS: Error message text shown when a favorite could not be set.
-#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:306
 msgid "Could not create favorite."
 msgstr "Не можна позначити як обране."
 
 #. TRANS: Client error displayed when trying to remove a favourite that was not a favourite.
-#: actions/apifavoritedestroy.php:122
 msgid "That status is not a favorite."
 msgstr "Цей статус не є обраним."
 
 #. TRANS: Client error displayed when removing a favourite has failed.
 #. TRANS: Server error displayed when removing a favorite from the database fails.
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:90
 msgid "Could not delete favorite."
 msgstr "Не можна видалити зі списку обраних."
 
 #. TRANS: Client error displayed when trying follow who's profile could not be found.
-#: actions/apifriendshipscreate.php:109
 msgid "Could not follow user: profile not found."
 msgstr "Не вдалося додати користувача: користувача не знайдено."
 
 #. TRANS: Client error displayed when trying to follow a user that's already being followed.
 #. TRANS: %s is the nickname of the user that is already being followed.
-#: actions/apifriendshipscreate.php:120
 #, php-format
 msgid "Could not follow user: %s is already on your list."
 msgstr "Не вдалося додати користувача: %s вже присутній у вашому списку."
 
 #. TRANS: Client error displayed when trying to unfollow a user that cannot be found.
-#: actions/apifriendshipsdestroy.php:109
 msgid "Could not unfollow user: User not found."
 msgstr "Не вдалося відмінити підписку: користувача не знайдено."
 
 #. TRANS: Client error displayed when trying to unfollow self.
-#: actions/apifriendshipsdestroy.php:121
 msgid "You cannot unfollow yourself."
 msgstr "Ви не можете відписатись від самого себе."
 
 #. TRANS: Client error displayed when supplying invalid parameters to an API call checking if a friendship exists.
-#: actions/apifriendshipsexists.php:88
 msgid "Two valid IDs or nick names must be supplied."
 msgstr ""
 "Два чинних ID або двоє чинних імен користувачів (ніків) мають бути "
 "представлені."
 
 #. TRANS: Client error displayed when a source user could not be determined showing friendship.
-#: actions/apifriendshipsshow.php:131
 msgid "Could not determine source user."
 msgstr "Не вдалось встановити джерело користувача."
 
 #. TRANS: Client error displayed when a target user could not be determined showing friendship.
-#: actions/apifriendshipsshow.php:140
 msgid "Could not find target user."
 msgstr "Не вдалося знайти цільового користувача."
 
 #. TRANS: Client error trying to create a group with a nickname this is already in use.
+#. TRANS: API validation exception thrown when nickname is already used.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:156 actions/apigroupprofileupdate.php:255
-#: actions/editgroup.php:191 actions/newgroup.php:137
-#: actions/profilesettings.php:274 actions/register.php:199
 msgid "Nickname already in use. Try another one."
 msgstr "Це ім’я вже використовується. Спробуйте інше."
 
 #. TRANS: Client error in form for group creation.
+#. TRANS: API validation exception thrown when nickname does not validate.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:164 actions/apigroupprofileupdate.php:259
-#: actions/editgroup.php:195 actions/newgroup.php:141
-#: actions/profilesettings.php:244 actions/register.php:201
 msgid "Not a valid nickname."
 msgstr "Це недійсне ім’я користувача."
 
 #. TRANS: Client error in form for group creation.
+#. TRANS: API validation exception thrown when homepage URL does not validate.
 #. TRANS: Validation error shown when providing an invalid homepage URL in the "Edit application" form.
 #. TRANS: Group edit form validation error.
 #. TRANS: Validation error shown when providing an invalid homepage URL in the "New application" form.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:181 actions/apigroupprofileupdate.php:277
-#: actions/editapplication.php:235 actions/editgroup.php:202
-#: actions/newapplication.php:221 actions/newgroup.php:148
-#: actions/profilesettings.php:249 actions/register.php:208
 msgid "Homepage is not a valid URL."
 msgstr "Веб-сторінка має недійсну URL-адресу."
 
 #. TRANS: Client error in form for group creation.
+#. TRANS: API validation exception thrown when full name does not validate.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:191 actions/editgroup.php:206
-#: actions/newgroup.php:152 actions/profilesettings.php:253
-#: actions/register.php:211
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "Повне ім’я надто довге (не більше 255 символів)."
 
 #. TRANS: Client error shown when providing too long a description during group creation.
 #. TRANS: %d is the maximum number of allowed characters.
+#. TRANS: API validation exception thrown when description does not validate.
+#. TRANS: %d is the maximum description length and used for plural.
 #. TRANS: Validation error shown when providing too long a description in the "Edit application" form.
 #. TRANS: %d is the maximum number of allowed characters.
 #. TRANS: Group edit form validation error.
@@ -657,9 +502,6 @@ msgstr "Повне ім’я надто довге (не більше 255 сим
 #. TRANS: %d is the maximum number of characters for the description.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed characters.
-#: actions/apigroupcreate.php:201 actions/editapplication.php:202
-#: actions/editgroup.php:211 actions/newapplication.php:182
-#: actions/newgroup.php:157
 #, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."
@@ -668,23 +510,21 @@ msgstr[1] "Опис надто довгий (максимум — %d знакі
 msgstr[2] "Опис надто довгий (максимум — %d знаків)."
 
 #. TRANS: Client error shown when providing too long a location during group creation.
+#. TRANS: API validation exception thrown when location does not validate.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:215 actions/editgroup.php:218
-#: actions/newgroup.php:164 actions/profilesettings.php:266
-#: actions/register.php:220
 msgid "Location is too long (maximum 255 characters)."
 msgstr "Розташування надто довге (не більше 255 символів)."
 
 #. TRANS: Client error shown when providing too many aliases during group creation.
 #. TRANS: %d is the maximum number of allowed aliases.
+#. TRANS: API validation exception thrown when aliases do not validate.
+#. TRANS: %d is the maximum number of aliases and used for plural.
 #. TRANS: Group edit form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.
-#: actions/apigroupcreate.php:236 actions/editgroup.php:231
-#: actions/newgroup.php:177
 #, php-format
 msgid "Too many aliases! Maximum %d allowed."
 msgid_plural "Too many aliases! Maximum %d allowed."
@@ -694,25 +534,24 @@ msgstr[2] "Надто багато додаткових імен! Максиму
 
 #. TRANS: Client error shown when providing an invalid alias during group creation.
 #. TRANS: %s is the invalid alias.
-#: actions/apigroupcreate.php:253
+#. TRANS: API validation exception thrown when aliases does not validate.
+#. TRANS: %s is the invalid alias.
 #, php-format
 msgid "Invalid alias: \"%s\"."
 msgstr "Помилкове додаткове ім’я: «%s»."
 
 #. TRANS: Client error displayed when trying to use an alias during group creation that is already in use.
 #. TRANS: %s is the alias that is already in use.
+#. TRANS: API validation exception thrown when aliases is already used.
+#. TRANS: %s is the already used alias.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error. %s is the already used alias.
-#: actions/apigroupcreate.php:264 actions/apigroupprofileupdate.php:351
-#: actions/editgroup.php:246 actions/newgroup.php:193
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "Додаткове ім’я «%s» вже використовується. Спробуйте інше."
 
 #. TRANS: Client error displayed when trying to use an alias during group creation that is the same as the group's nickname.
 #. TRANS: Group edit form validation error.
-#: actions/apigroupcreate.php:278 actions/apigroupprofileupdate.php:359
-#: actions/editgroup.php:253
 msgid "Alias can't be the same as nickname."
 msgstr "Додаткове ім’я не може бути таким самим що й основне."
 
@@ -720,26 +559,21 @@ msgstr "Додаткове ім’я не може бути таким сами
 #. TRANS: Client error displayed when trying to join a group that does not exist.
 #. TRANS: Client error displayed when trying to leave a group that does not exist.
 #. TRANS: Client error displayed trying to show group membership on a non-existing group.
+#. TRANS: Client error displayed when not providing a group or an invalid group.
 #. TRANS: Client error displayed when trying to show a group that could not be found.
 #. TRANS: Client error displayed requesting most recent notices to a group for a non-existing group.
-#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
-#: actions/apigroupleave.php:104 actions/apigroupmembership.php:71
-#: actions/apigroupprofileupdate.php:113 actions/apigroupshow.php:81
-#: actions/apitimelinegroup.php:89
 msgid "Group not found."
 msgstr "Спільноту не знайдено."
 
 #. TRANS: Server error displayed when trying to join a group the user is already a member of.
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:345
 msgid "You are already a member of that group."
 msgstr "Ви вже стоїте у цій спільноти."
 
 #. TRANS: Server error displayed when trying to join a group the user is blocked from joining.
 #. 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.
-#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:350
 msgid "You have been blocked from that group by the admin."
 msgstr "Адміністратор спільноти заблокував ваш профіль."
 
@@ -747,13 +581,11 @@ msgstr "Адміністратор спільноти заблокував ва
 #. TRANS: %1$s is the joining user's nickname, $2$s is the group nickname for which the join failed.
 #. TRANS: Message given having failed to add a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:136 actions/joingroup.php:139 lib/command.php:362
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "Не вдалось долучити користувача %1$s до спільноти %2$s."
 
 #. TRANS: Server error displayed when trying to leave a group the user is not a member of.
-#: actions/apigroupleave.php:115
 msgid "You are not a member of this group."
 msgstr "Ви не стоїте у цій спільноті."
 
@@ -761,118 +593,80 @@ msgstr "Ви не стоїте у цій спільноті."
 #. TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
 #. TRANS: Message given having failed to remove a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupleave.php:127 actions/leavegroup.php:133
-#: lib/command.php:410
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
 msgstr "Не вдалось видалити користувача %1$s зі спільноти %2$s."
 
 #. TRANS: Used as title in check for group membership. %s is a user name.
-#: actions/apigrouplist.php:94
 #, php-format
 msgid "%s's groups"
 msgstr "Спільноти %s"
 
 #. TRANS: Used as subtitle in check for group membership. %1$s is a user name, %2$s is the site name.
-#: actions/apigrouplist.php:104
 #, php-format
 msgid "%1$s groups %2$s is a member of."
 msgstr "Спільноти на %1$s, до яких долучився %2$s."
 
 #. TRANS: Message is used as a title when listing the lastest 20 groups. %s is a site name.
 #. TRANS: Message is used as a page title. %s is a nick name.
-#: actions/apigrouplistall.php:88 actions/usergroups.php:63
 #, php-format
 msgid "%s groups"
 msgstr "Спільноти %s"
 
 #. TRANS: Message is used as a subtitle when listing the lastest 20 groups. %s is a site name.
-#: actions/apigrouplistall.php:93
 #, php-format
 msgid "groups on %s"
 msgstr "спільноти на %s"
 
+#. TRANS: Client error displayed when trying to edit a group without being an admin.
 #. TRANS: Client error displayed trying to edit a group while not being a group admin.
 #. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
 #. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
-#: actions/apigroupprofileupdate.php:118 actions/editgroup.php:110
-#: actions/editgroup.php:176 actions/groupdesignsettings.php:109
-#: actions/grouplogo.php:111
 msgid "You must be an admin to edit the group."
 msgstr ""
 "Ви маєте бути наділені правами адміністратора, аби відредагувати властивості "
 "даної спільноти."
 
+#. TRANS: Server error displayed when group update fails.
 #. TRANS: Server error displayed when editing a group fails.
-#: actions/apigroupprofileupdate.php:171 actions/editgroup.php:274
 msgid "Could not update group."
 msgstr "Не вдалося оновити спільноту."
 
+#. TRANS: Server error displayed when adding group aliases fails.
 #. TRANS: Server error displayed when group aliases could not be added.
 #. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/apigroupprofileupdate.php:194 actions/editgroup.php:281
-#: classes/User_group.php:540
 msgid "Could not create aliases."
 msgstr "Неможна призначити додаткові імена."
 
+#. TRANS: API validation exception thrown when nickname does not validate.
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: actions/apigroupprofileupdate.php:249 lib/nickname.php:165
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr ""
 "Ім’я користувача повинно складатись з літер нижнього регістру і цифр, ніяких "
 "інтервалів."
 
-#: actions/apigroupprofileupdate.php:286
-#, fuzzy
-msgid "Full name is too long (max 255 chars)."
-msgstr "Повне ім’я надто довге (не більше 255 символів)."
-
-#: actions/apigroupprofileupdate.php:296
-#, fuzzy, php-format
-msgid "description is too long (max %d chars)."
-msgstr "Опис надто довгий (максимум — %d знак)."
-
-#: actions/apigroupprofileupdate.php:307
-#, fuzzy
-msgid "Location is too long (max 255 chars)."
-msgstr "Розташування надто довге (не більше 255 символів)."
-
-#: actions/apigroupprofileupdate.php:326
-#, fuzzy, php-format
-msgid "Too many aliases! Maximum %d."
-msgstr "Надто багато додаткових імен! Максимум становить %d."
-
-#. TRANS: Group edit form validation error.
+#. TRANS: API validation exception thrown when alias is the same as nickname.
 #. TRANS: Group create form validation error.
-#. TRANS: %s is the invalid alias.
-#: actions/apigroupprofileupdate.php:342 actions/editgroup.php:241
-#: actions/newgroup.php:188
-#, php-format
-msgid "Invalid alias: \"%s\""
-msgstr "Помилкове додаткове ім’я: «%s»"
+msgid "Alias cannot be the same as nickname."
+msgstr "Додаткове ім’я не може збігатися з псевдонімом."
 
 #. TRANS: Client error displayed when uploading a media file has failed.
-#: actions/apimediaupload.php:101
 msgid "Upload failed."
 msgstr "Збій при завантаженні."
 
 #. TRANS: Client error given from the OAuth API when the request token or verifier is invalid.
-#: actions/apioauthaccesstoken.php:102
 msgid "Invalid request token or verifier."
 msgstr "Неправильний запит токену або його підтвердження."
 
 #. TRANS: Client error given when no oauth_token was passed to the OAuth API.
-#: actions/apioauthauthorize.php:107
 msgid "No oauth_token parameter provided."
 msgstr "Жодного параметру oauth_token не забезпечено."
 
 #. TRANS: Client error given when an invalid request token was passed to the OAuth API.
-#: actions/apioauthauthorize.php:115 actions/apioauthauthorize.php:129
 msgid "Invalid request token."
 msgstr "Неправильний запит токену."
 
 #. TRANS: Client error given when an invalid request token was passed to the OAuth API.
-#: actions/apioauthauthorize.php:121
 msgid "Request token already authorized."
 msgstr "Токен запиту вже авторизовано."
 
@@ -882,32 +676,15 @@ msgstr "Токен запиту вже авторизовано."
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
 #. TRANS: Client error displayed when the session token is not okay.
-#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:75
-#: actions/emailsettings.php:292 actions/favor.php:75 actions/geocode.php:55
-#: actions/groupblock.php:65 actions/grouplogo.php:321
-#: actions/groupunblock.php:65 actions/imsettings.php:241
-#: actions/invite.php:60 actions/makeadmin.php:66 actions/newmessage.php:135
-#: actions/newnotice.php:105 actions/nudge.php:80
-#: actions/oauthappssettings.php:162 actions/oauthconnectionssettings.php:135
-#: actions/passwordsettings.php:137 actions/pluginenable.php:87
-#: actions/profilesettings.php:218 actions/recoverpassword.php:383
-#: actions/register.php:157 actions/remotesubscribe.php:76
-#: actions/repeat.php:82 actions/smssettings.php:249 actions/subedit.php:40
-#: actions/subscribe.php:87 actions/tagother.php:145
-#: actions/unsubscribe.php:69 actions/urlsettings.php:171
-#: actions/userauthorization.php:53 lib/designsettings.php:122
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 "Виникли певні проблеми з токеном поточної сесії. Спробуйте знов, будь ласка."
 
 #. TRANS: Form validation error given when an invalid username and/or password was passed to the OAuth API.
-#: actions/apioauthauthorize.php:168
 msgid "Invalid nickname / password!"
 msgstr "Недійсне ім’я / пароль!"
 
 #. TRANS: Server error displayed when a database action fails.
-#: actions/apioauthauthorize.php:217
 msgid "Database error inserting oauth_token_association."
 msgstr "Помилка бази даних при додаванні параметру oauth_token_association."
 
@@ -923,28 +700,19 @@ msgstr "Помилка бази даних при додаванні парам
 #. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
 #. TRANS: Message given submitting a form with an unknown action in SMS settings.
 #. TRANS: Unknown form validation error in design settings form.
-#: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
-#: actions/designadminpanel.php:100 actions/editapplication.php:144
-#: actions/emailsettings.php:311 actions/grouplogo.php:332
-#: actions/imsettings.php:256 actions/newapplication.php:124
-#: actions/oauthconnectionssettings.php:144 actions/recoverpassword.php:46
-#: actions/smssettings.php:270 lib/designsettings.php:133
 msgid "Unexpected form submission."
 msgstr "Несподіване представлення форми."
 
 #. TRANS: Title for a page where a user can confirm/deny account access by an external application.
-#: actions/apioauthauthorize.php:387
 msgid "An application would like to connect to your account"
 msgstr "Запит на дозвіл під’єднатися до вашого облікового запису"
 
 #. TRANS: Fieldset legend.
-#: actions/apioauthauthorize.php:404
 msgid "Allow or deny access"
 msgstr "Дозволити або заборонити доступ"
 
 #. TRANS: User notification of external application requesting account access.
 #. TRANS: %3$s is the access type requested (read-write or read-only), %4$s is the StatusNet sitename.
-#: actions/apioauthauthorize.php:425
 #, php-format
 msgid ""
 "An application would like the ability to <strong>%3$s</strong> your %4$s "
@@ -958,7 +726,6 @@ msgstr ""
 #. TRANS: User notification of external application requesting account access.
 #. TRANS: %1$s is the application name requesting access, %2$s is the organisation behind the application,
 #. TRANS: %3$s is the access type requested, %4$s is the StatusNet sitename.
-#: actions/apioauthauthorize.php:433
 #, php-format
 msgid ""
 "The application <strong>%1$s</strong> by <strong>%2$s</strong> would like "
@@ -971,22 +738,18 @@ msgstr ""
 "довіряєте."
 
 #. TRANS: Fieldset legend.
-#: actions/apioauthauthorize.php:455
 msgctxt "LEGEND"
 msgid "Account"
 msgstr "Акаунт"
 
 #. TRANS: Field label on OAuth API authorisation form.
+#. TRANS: Field label on login page.
 #. TRANS: Field label in form for profile settings.
-#: actions/apioauthauthorize.php:459 actions/login.php:225
-#: actions/profilesettings.php:107 actions/register.php:411
-#: actions/userauthorization.php:145 lib/groupeditform.php:145
 msgid "Nickname"
 msgstr "Ім’я користувача"
 
 #. TRANS: Field label on OAuth API authorisation form.
-#: actions/apioauthauthorize.php:463 actions/login.php:228
-#: actions/register.php:415 lib/settingsnav.php:87
+#. TRANS: Field label on login page.
 msgid "Password"
 msgstr "Пароль"
 
@@ -996,43 +759,34 @@ msgstr "Пароль"
 #. TRANS: Button label to cancel an IM address confirmation procedure.
 #. TRANS: Button label to cancel a SMS address confirmation procedure.
 #. TRANS: Button label in the "Edit application" form.
-#: actions/apioauthauthorize.php:478 actions/emailsettings.php:125
-#: actions/imsettings.php:136 actions/smssettings.php:132
-#: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Cancel"
 msgstr "Скасувати"
 
 #. TRANS: Button text that when clicked will allow access to an account by an external application.
-#: actions/apioauthauthorize.php:485
 msgctxt "BUTTON"
 msgid "Allow"
 msgstr "Дозволити"
 
 #. TRANS: Form instructions.
-#: actions/apioauthauthorize.php:502
 msgid "Authorize access to your account information."
 msgstr "Дозвіл на доступ до вашого облікового запису."
 
 #. TRANS: Header for user notification after revoking OAuth access to an application.
-#: actions/apioauthauthorize.php:594
 msgid "Authorization canceled."
 msgstr "Авторизацію скасовано."
 
 #. TRANS: User notification after revoking OAuth access to an application.
 #. TRANS: %s is an OAuth token.
-#: actions/apioauthauthorize.php:598
 #, php-format
 msgid "The request token %s has been revoked."
 msgstr "Запит токену %s було скасовано."
 
 #. TRANS: Title of the page notifying the user that an anonymous client application was successfully authorized to access the user's account with OAuth.
-#: actions/apioauthauthorize.php:621
 msgid "You have successfully authorized the application"
 msgstr "Ви успішно авторизували додаток"
 
 #. TRANS: Message notifying the user that an anonymous client application was successfully authorized to access the user's account with OAuth.
-#: actions/apioauthauthorize.php:625
 msgid ""
 "Please return to the application and enter the following security code to "
 "complete the process."
@@ -1042,14 +796,12 @@ msgstr ""
 
 #. TRANS: Title of the page notifying the user that the client application was successfully authorized to access the user's account with OAuth.
 #. TRANS: %s is the authorised application name.
-#: actions/apioauthauthorize.php:632
 #, php-format
 msgid "You have successfully authorized %s"
 msgstr "Ви успішно авторизували додаток %s"
 
 #. TRANS: Message notifying the user that the client application was successfully authorized to access the user's account with OAuth.
 #. TRANS: %s is the authorised application name.
-#: actions/apioauthauthorize.php:639
 #, php-format
 msgid ""
 "Please return to %s and enter the following security code to complete the "
@@ -1060,12 +812,10 @@ msgstr ""
 
 #. TRANS: Client error displayed trying to delete a status not using POST or DELETE.
 #. TRANS: POST and DELETE should not be translated.
-#: actions/apistatusesdestroy.php:111
 msgid "This method requires a POST or DELETE."
 msgstr "Цей метод потребує або НАПИСАТИ, або ВИДАЛИТИ."
 
 #. TRANS: Client error displayed trying to delete a status of another user.
-#: actions/apistatusesdestroy.php:136
 msgid "You may not delete another user's status."
 msgstr "Ви не можете видалити статус іншого користувача."
 
@@ -1073,21 +823,16 @@ msgstr "Ви не можете видалити статус іншого кор
 #. TRANS: Client error displayed trying to display redents of a non-exiting notice.
 #. TRANS: Client exception thrown when referencing a non-existing notice.
 #. TRANS: Error message displayed trying to delete a non-existing notice.
-#: actions/apistatusesretweet.php:74 actions/apistatusesretweets.php:70
-#: actions/atompubshowfavorite.php:82 actions/deletenotice.php:61
-#: actions/shownotice.php:92
 msgid "No such notice."
 msgstr "Такого допису немає."
 
 #. TRANS: Client error displayed trying to repeat an own notice through the API.
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:549
 msgid "Cannot repeat your own notice."
 msgstr "Не можна повторювати власні дописи."
 
 #. TRANS: Client error displayed trying to re-repeat a notice through the API.
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:92 lib/command.php:555
 msgid "Already repeated that notice."
 msgstr "Цей допис вже повторено."
 
@@ -1097,57 +842,43 @@ msgstr "Цей допис вже повторено."
 #. TRANS: Client exception thrown when using an unsupported HTTP method.
 #. TRANS: Client error shown when using a non-supported HTTP method.
 #. TRANS: Client exception thrown when using an unsupported HTTP method.
-#: actions/apistatusesshow.php:118 actions/atompubfavoritefeed.php:103
-#: actions/atompubmembershipfeed.php:105 actions/atompubshowfavorite.php:117
-#: actions/atompubshowmembership.php:116
-#: actions/atompubshowsubscription.php:122
-#: actions/atompubsubscriptionfeed.php:109
 msgid "HTTP method not supported."
 msgstr "HTTP спосіб не підтримується."
 
 #. TRANS: Exception thrown requesting an unsupported notice output format.
 #. TRANS: %s is the requested output format.
-#: actions/apistatusesshow.php:144
 #, php-format
 msgid "Unsupported format: %s."
 msgstr "Формат, який не підтримується: %s."
 
 #. TRANS: Client error displayed requesting a deleted status.
-#: actions/apistatusesshow.php:155
 msgid "Status deleted."
 msgstr "Статус видалено."
 
 #. TRANS: Client error displayed requesting a status with an invalid ID.
-#: actions/apistatusesshow.php:162
 msgid "No status with that ID found."
 msgstr "Не знайдено жодних статусів з таким ID."
 
 #. TRANS: Client error displayed when trying to delete a notice not using the Atom format.
-#: actions/apistatusesshow.php:227
 msgid "Can only delete using the Atom format."
 msgstr "Можна видалити тільки у форматі Atom."
 
 #. TRANS: Client error displayed when a user has no rights to delete notices of other users.
 #. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
-#: actions/apistatusesshow.php:235 actions/deletenotice.php:78
 msgid "Cannot delete this notice."
 msgstr "Не вдається видалити цей допис."
 
 #. TRANS: Confirmation of notice deletion in API. %d is the ID (number) of the deleted notice.
-#: actions/apistatusesshow.php:249
 #, php-format
 msgid "Deleted notice %d"
 msgstr "Вилучене повідомлення %d"
 
 #. TRANS: Client error displayed when the parameter "status" is missing.
-#: actions/apistatusesupdate.php:221
 msgid "Client must provide a 'status' parameter with a value."
 msgstr "Клієнт мусить надати параметр «статус» зі значенням."
 
 #. TRANS: Client error displayed when the parameter "status" is missing.
 #. TRANS: %d is the maximum number of character for a notice.
-#: actions/apistatusesupdate.php:244 actions/newnotice.php:161
-#: lib/mailhandler.php:60
 #, php-format
 msgid "That's too long. Maximum notice size is %d character."
 msgid_plural "That's too long. Maximum notice size is %d characters."
@@ -1156,13 +887,11 @@ msgstr[1] "Надто довго. Максимальний розмір допи
 msgstr[2] "Надто довго. Максимальний розмір допису — %d знаків."
 
 #. TRANS: Client error displayed when replying to a non-existing notice.
-#: actions/apistatusesupdate.php:284
 msgid "Parent notice not found."
 msgstr "Початковий допис не знайдено."
 
 #. TRANS: Client error displayed exceeding the maximum notice length.
 #. TRANS: %d is the maximum lenth for a notice.
-#: actions/apistatusesupdate.php:308 actions/newnotice.php:184
 #, php-format
 msgid "Maximum notice size is %d character, including attachment URL."
 msgid_plural "Maximum notice size is %d characters, including attachment URL."
@@ -1178,13 +907,11 @@ msgstr[2] ""
 
 #. TRANS: Client error displayed when requesting profiles of followers in an unsupported format.
 #. TRANS: Client error displayed when requesting IDs of followers in an unsupported format.
-#: actions/apisubscriptions.php:228 actions/apisubscriptions.php:258
 msgid "Unsupported format."
 msgstr "Формат не підтримується."
 
 #. TRANS: Title for timeline of most recent favourite notices by a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname.
-#: actions/apitimelinefavorites.php:108
 #, php-format
 msgid "%1$s / Favorites from %2$s"
 msgstr "%1$s / Обрані від %2$s"
@@ -1192,14 +919,12 @@ msgstr "%1$s / Обрані від %2$s"
 #. TRANS: Subtitle for timeline of most recent favourite notices by a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user's full name,
 #. TRANS: %3$s is a user nickname.
-#: actions/apitimelinefavorites.php:120
 #, php-format
 msgid "%1$s updates favorited by %2$s / %3$s."
 msgstr "%1$s, оновлення обраних дописів %2$s / %3$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.
-#: actions/apitimelinementions.php:115
 #, php-format
 msgid "%1$s / Updates mentioning %2$s"
 msgstr "%1$s / Оновленні відповіді %2$s"
@@ -1207,48 +932,40 @@ msgstr "%1$s / Оновленні відповіді %2$s"
 #. TRANS: Subtitle for timeline of most recent mentions of a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname,
 #. TRANS: %3$s is a user's full name.
-#: actions/apitimelinementions.php:131
 #, php-format
 msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr "%1$s оновив цю відповідь на допис від %2$s / %3$s."
 
 #. TRANS: Title for site timeline. %s is the StatusNet sitename.
 #. TRANS: Public RSS feed title. %s is the StatusNet site name.
-#: actions/apitimelinepublic.php:193 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "%s загальна стрічка"
 
 #. TRANS: Subtitle for site timeline. %s is the StatusNet sitename.
-#: actions/apitimelinepublic.php:199
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "%s оновлення від усіх!"
 
 #. TRANS: Server error displayed calling unimplemented API method for 'retweeted by me'.
-#: actions/apitimelineretweetedbyme.php:71
 msgid "Unimplemented."
 msgstr "Метод не виконується."
 
 #. TRANS: Title for Atom feed "repeated to me". %s is the user nickname.
-#: actions/apitimelineretweetedtome.php:96
 #, php-format
 msgid "Repeated to %s"
 msgstr "Повторено для %s"
 
-#: actions/apitimelineretweetedtome.php:98
 #, fuzzy, php-format
 msgid "%1$s notices that were to repeated to %2$s / %3$s."
 msgstr "%1$s оновив цю відповідь на допис від %2$s / %3$s."
 
 #. TRANS: Title of list of repeated notices of the logged in user.
 #. TRANS: %s is the nickname of the logged in user.
-#: actions/apitimelineretweetsofme.php:98
 #, php-format
 msgid "Repeats of %s"
 msgstr "Повторення %s"
 
-#: actions/apitimelineretweetsofme.php:104
 #, fuzzy, php-format
 msgid "%1$s notices that %2$s / %3$s has repeated."
 msgstr "%1$s додав(ла) ваш допис %2$s до обраних."
@@ -1257,170 +974,137 @@ msgstr "%1$s додав(ла) ваш допис %2$s до обраних."
 #. TRANS: %s is the tag.
 #. TRANS: Title for first page of notices with tags.
 #. TRANS: %s is the tag.
-#: actions/apitimelinetag.php:101 actions/tag.php:69
 #, php-format
 msgid "Notices tagged with %s"
 msgstr "Дописи позначені з %s"
 
 #. TRANS: Subtitle for timeline with lastest notices with a given tag.
 #. TRANS: %1$s is the tag, $2$s is the StatusNet sitename.
-#: actions/apitimelinetag.php:105 actions/tagrss.php:65
 #, php-format
 msgid "Updates tagged with %1$s on %2$s!"
 msgstr "Оновлення позначені з %1$s на %2$s!"
 
 #. TRANS: Client error displayed trying to add a notice to another user's timeline.
-#: actions/apitimelineuser.php:308
 msgid "Only the user can add to their own timeline."
 msgstr "Користувач може робити доповнення тільки до своєї власної хронології."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:315
 msgid "Only accept AtomPub for Atom feeds."
 msgstr "Приймати лише AtomPub для веб-стрічок формату Atom."
 
 #. TRANS: Client error displayed attempting to post an empty API notice.
-#: actions/apitimelineuser.php:322
 msgid "Atom post must not be empty."
 msgstr "Запис Atom не повинен бути порожнім."
 
 #. TRANS: Client error displayed attempting to post an API that is not well-formed XML.
-#: actions/apitimelineuser.php:328
 msgid "Atom post must be well-formed XML."
 msgstr "Запис Atom має бути у правильно сформованому XML."
 
 #. TRANS: Client error displayed when not using an Atom entry.
-#: actions/apitimelineuser.php:334 actions/atompubfavoritefeed.php:228
-#: actions/atompubmembershipfeed.php:230
-#: actions/atompubsubscriptionfeed.php:236
 msgid "Atom post must be an Atom entry."
 msgstr "POST-запит Atom має бути записом формату Atom."
 
 #. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
-#: actions/apitimelineuser.php:345
 msgid "Can only handle POST activities."
 msgstr "Можливою є обробка лише POST-запитів."
 
 #. TRANS: Client error displayed when using an unsupported activity object type.
 #. TRANS: %s is the unsupported activity object type.
-#: actions/apitimelineuser.php:356
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr "Неможливо опрацювати дії об’єкта типу «%s»."
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
 #. TRANS: %d is the notice ID (number).
-#: actions/apitimelineuser.php:390
 #, php-format
 msgid "No content for notice %d."
 msgstr "Допис %d не має змісту."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
 #. TRANS: %s is the notice URI.
-#: actions/apitimelineuser.php:419
 #, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "Повідомлення з URI \"%s\" вже існує."
 
 #. TRANS: Server error for unfinished API method showTrends.
-#: actions/apitrends.php:85
 msgid "API method under construction."
 msgstr "API метод наразі знаходиться у розробці."
 
 #. TRANS: Client error displayed when requesting user information for a non-existing user.
-#: actions/apiuserprofileimage.php:80 actions/apiusershow.php:94
 msgid "User not found."
 msgstr "Сторінку не знайдено."
 
 #. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
 #. TRANS: Client exception.
 #. TRANS: Client error displayed trying to subscribe to a non-existing profile.
-#: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
-#: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
-#: actions/subscribe.php:110
 msgid "No such profile."
 msgstr "Немає такого профілю."
 
 #. TRANS: Subtitle for Atom favorites feed.
 #. TRANS: %1$s is a user nickname, %2$s is the StatusNet sitename.
-#: actions/atompubfavoritefeed.php:147
 #, php-format
 msgid "Notices %1$s has favorited on %2$s"
 msgstr "Дописи від %1$s, що їх було позначено як обрані на %2$s"
 
 #. TRANS: Client exception thrown when trying to set a favorite for another user.
 #. TRANS: Client exception thrown when trying to subscribe another user.
-#: actions/atompubfavoritefeed.php:217 actions/atompubsubscriptionfeed.php:225
 msgid "Cannot add someone else's subscription."
 msgstr "Не вдається додати чужу підписку."
 
 #. TRANS: Client exception thrown when trying use an incorrect activity verb for the Atom pub method.
-#: actions/atompubfavoritefeed.php:240
 msgid "Can only handle favorite activities."
 msgstr "Можливою є обробка лише стрічки обраних дописів."
 
 #. TRANS: Client exception thrown when trying favorite an object that is not a notice.
-#: actions/atompubfavoritefeed.php:250 actions/atompubmembershipfeed.php:250
 msgid "Can only fave notices."
 msgstr "Можна лише додавати дописи до обраних."
 
 #. TRANS: Client exception thrown when trying favorite a notice without content.
-#: actions/atompubfavoritefeed.php:259
 msgid "Unknown note."
 msgstr "Невідома примітка"
 
 #. TRANS: Client exception thrown when trying favorite an already favorited notice.
-#: actions/atompubfavoritefeed.php:267
 msgid "Already a favorite."
 msgstr "Вже у списку обраних."
 
 #. TRANS: Title for group membership feed.
 #. TRANS: %s is a username.
-#: actions/atompubmembershipfeed.php:144
 #, php-format
 msgid "%s group memberships"
 msgstr "Учасники спільноти %s"
 
 #. TRANS: Subtitle for group membership feed.
 #. TRANS: %1$s is a username, %2$s is the StatusNet sitename.
-#: actions/atompubmembershipfeed.php:149
 #, php-format
 msgid "Groups %1$s is a member of on %2$s"
 msgstr "Спільноти, до яких залучений %1$s на %2$s"
 
 #. TRANS: Client exception thrown when trying subscribe someone else to a group.
-#: actions/atompubmembershipfeed.php:219
 msgid "Cannot add someone else's membership."
 msgstr "Не вдається надати комусь членство."
 
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#: actions/atompubmembershipfeed.php:242
 msgid "Can only handle join activities."
 msgstr "Можливою є лише обробка POST-запитів."
 
 #. TRANS: Client exception thrown when trying to subscribe to a non-existing group.
-#: actions/atompubmembershipfeed.php:259
 msgid "Unknown group."
 msgstr "Невідома спільнота."
 
 #. TRANS: Client exception thrown when trying to subscribe to an already subscribed group.
-#: actions/atompubmembershipfeed.php:267
 msgid "Already a member."
 msgstr "Вже є учасником."
 
 #. TRANS: Client exception thrown when trying to subscribe to group while blocked from that group.
-#: actions/atompubmembershipfeed.php:275
 msgid "Blocked by admin."
 msgstr "Заблоковано адміністратором."
 
 #. TRANS: Client exception thrown when referencing a non-existing favorite.
-#: actions/atompubshowfavorite.php:90
 msgid "No such favorite."
 msgstr "Немає такого обраного допису."
 
 #. TRANS: Client exception thrown when trying to remove a favorite notice of another user.
-#: actions/atompubshowfavorite.php:151
 msgid "Cannot delete someone else's favorite."
 msgstr "Не вдається видалити допис з чужого списку обраних."
 
@@ -1446,90 +1130,65 @@ msgstr "Не вдається видалити допис з чужого спи
 #. TRANS: Client error displayed when trying to join a non-existing group.
 #. TRANS: Client error displayed when trying to leave a non-local group.
 #. TRANS: Client error displayed when trying to leave a non-existing group.
+#. TRANS: Client error displayed when providing an invalid group ID on the Make Admin page.
 #. 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.
 #. TRANS: Command exception text shown when a group is requested that does not exist.
 #. TRANS: Error text shown when trying to leave a group that does not exist.
-#: actions/atompubshowmembership.php:81 actions/blockedfromgroup.php:81
-#: actions/blockedfromgroup.php:89 actions/deletegroup.php:87
-#: actions/deletegroup.php:100 actions/editgroup.php:102
-#: actions/foafgroup.php:46 actions/foafgroup.php:65 actions/foafgroup.php:73
-#: actions/groupblock.php:89 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:101 actions/grouplogo.php:103
-#: actions/groupmembers.php:84 actions/groupmembers.php:92
-#: actions/grouprss.php:97 actions/grouprss.php:105
-#: actions/groupunblock.php:89 actions/joingroup.php:82
-#: actions/joingroup.php:95 actions/leavegroup.php:82
-#: actions/leavegroup.php:95 actions/makeadmin.php:86
-#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:392
 msgid "No such group."
 msgstr "Такої спільноти не існує."
 
 #. TRANS: Client exception thrown when trying to show membership of a non-subscribed group
-#: actions/atompubshowmembership.php:91
 msgid "Not a member."
 msgstr "Не є учасником."
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
-#: actions/atompubshowmembership.php:150
 msgid "Cannot delete someone else's membership."
 msgstr "Неможливо позбавити когось членства."
 
 #. TRANS: Client exception thrown when trying to display a subscription for a non-existing profile ID.
 #. TRANS: %d is the non-existing profile ID number.
-#: actions/atompubshowsubscription.php:72
-#: actions/atompubshowsubscription.php:83
-#: actions/atompubsubscriptionfeed.php:74
 #, php-format
 msgid "No such profile id: %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.
-#: actions/atompubshowsubscription.php:94
 #, php-format
 msgid "Profile %1$d not subscribed to profile %2$d."
 msgstr "Профіль %1$d не є підписаним до профілю %2$d."
 
 #. TRANS: Client exception thrown when trying to delete a subscription of another user.
-#: actions/atompubshowsubscription.php:157
 msgid "Cannot delete someone else's subscription."
 msgstr "Не вдається видалити чужу підписку."
 
 #. TRANS: Subtitle for Atom subscription feed.
 #. TRANS: %1$s is a user nickname, %s$s is the StatusNet sitename.
-#: actions/atompubsubscriptionfeed.php:153
 #, php-format
 msgid "People %1$s has subscribed to on %2$s"
 msgstr "Люди, до яких підписаний %1$s на %2$s"
 
 #. TRANS: Client error displayed when not using the follow verb.
-#: actions/atompubsubscriptionfeed.php:248
 msgid "Can only handle Follow activities."
 msgstr "Можливою є обробка активності лише щодо підписок."
 
 #. TRANS: Client exception thrown when subscribing to an object that is not a person.
-#: actions/atompubsubscriptionfeed.php:256
 msgid "Can only follow people."
 msgstr "Можливе лише слідування людьми."
 
 #. TRANS: Client exception thrown when subscribing to a non-existing profile.
 #. TRANS: %s is the unknown profile ID.
-#: actions/atompubsubscriptionfeed.php:267
 #, php-format
 msgid "Unknown profile %s."
 msgstr "Невідомий профіль %s."
 
 #. TRANS: Client error displayed trying to subscribe to an already subscribed profile.
 #. TRANS: %s is the profile the user already has a subscription on.
-#: actions/atompubsubscriptionfeed.php:275
 #, php-format
 msgid "Already subscribed to %s."
 msgstr "Вже підписаний до %s."
 
 #. TRANS: Client error displayed trying to get a non-existing attachment.
-#: actions/attachment.php:73
 msgid "No such attachment."
 msgstr "Такого вкладення немає."
 
@@ -1541,31 +1200,23 @@ msgstr "Такого вкладення немає."
 #. TRANS: Client error displayed when trying to view group members without providing a group nickname.
 #. TRANS: Client error displayed when requesting a group RSS feed without providing a group nickname.
 #. TRANS: Client error displayed if no nickname argument was given requesting a group page.
-#: actions/avatarbynickname.php:60 actions/blockedfromgroup.php:73
-#: actions/editgroup.php:85 actions/groupdesignsettings.php:84
-#: actions/grouplogo.php:86 actions/groupmembers.php:76
-#: actions/grouprss.php:89 actions/showgroup.php:116
 msgid "No nickname."
 msgstr "Немає імені."
 
 #. TRANS: Client error displayed trying to get an avatar without providing an avatar size.
-#: actions/avatarbynickname.php:66
 msgid "No size."
 msgstr "Немає розміру."
 
 #. TRANS: Client error displayed trying to get an avatar providing an invalid avatar size.
-#: actions/avatarbynickname.php:72
 msgid "Invalid size."
 msgstr "Недійсний розмір."
 
 #. TRANS: Title for avatar upload page.
-#: actions/avatarsettings.php:66 lib/settingsnav.php:82
 msgid "Avatar"
 msgstr "Аватара"
 
 #. TRANS: Instruction for avatar upload page.
 #. TRANS: %s is the maximum file size, for example "500b", "10kB" or "2MB".
-#: actions/avatarsettings.php:78
 #, php-format
 msgid "You can upload your personal avatar. The maximum file size is %s."
 msgstr "Ви можете завантажити аватару. Максимальний розмір %s."
@@ -1574,17 +1225,12 @@ msgstr "Ви можете завантажити аватару. Максима
 #. TRANS: Server error displayed coming across a request from a user without a profile.
 #. TRANS: Server error displayed when trying to authorise a remote subscription request
 #. TRANS: while the user has no profile.
-#: actions/avatarsettings.php:108 actions/avatarsettings.php:192
-#: actions/grouplogo.php:184 actions/remotesubscribe.php:190
-#: actions/userauthorization.php:75 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr "Користувач без відповідного профілю."
 
 #. TRANS: Avatar upload page form legend.
 #. TRANS: Avatar upload page crop form legend.
 #. TRANS: Legend for group logo settings fieldset.
-#: actions/avatarsettings.php:122 actions/avatarsettings.php:205
-#: actions/grouplogo.php:261
 msgid "Avatar settings"
 msgstr "Налаштування аватари"
 
@@ -1592,8 +1238,6 @@ msgstr "Налаштування аватари"
 #. TRANS: Header on avatar upload crop form for thumbnail of originally uploaded avatar (h2).
 #. TRANS: Uploaded original file in group logo form.
 #. TRANS: Header for originally uploaded file before a crop on the group logo page.
-#: actions/avatarsettings.php:131 actions/avatarsettings.php:214
-#: actions/grouplogo.php:207 actions/grouplogo.php:270
 msgid "Original"
 msgstr "Оригінал"
 
@@ -1601,82 +1245,67 @@ msgstr "Оригінал"
 #. TRANS: Header on avatar upload crop form for thumbnail of to be used rendition of uploaded avatar (h2).
 #. TRANS: Header for preview of to be displayed group logo.
 #. TRANS: Header for the cropped group logo on the group logo page.
-#: actions/avatarsettings.php:147 actions/avatarsettings.php:227
-#: actions/grouplogo.php:219 actions/grouplogo.php:283
 msgid "Preview"
 msgstr "Перегляд"
 
 #. TRANS: Button on avatar upload page to delete current avatar.
 #. TRANS: Button text for user account deletion.
-#: actions/avatarsettings.php:155 actions/deleteaccount.php:319
 msgctxt "BUTTON"
 msgid "Delete"
 msgstr "Видалити"
 
 #. TRANS: Button on avatar upload page to upload an avatar.
 #. TRANS: Submit button to confirm upload of a user backup file for account restore.
-#: actions/avatarsettings.php:173 actions/restoreaccount.php:369
 msgctxt "BUTTON"
 msgid "Upload"
 msgstr "Завантажити"
 
 #. TRANS: Button on avatar upload crop form to confirm a selected crop as avatar.
-#: actions/avatarsettings.php:243
 msgctxt "BUTTON"
 msgid "Crop"
 msgstr "Втяти"
 
 #. TRANS: Validation error on avatar upload form when no file was uploaded.
-#: actions/avatarsettings.php:318
 msgid "No file uploaded."
 msgstr "Жодного файлу не завантажено."
 
 #. TRANS: Avatar upload form instruction after uploading a file.
-#: actions/avatarsettings.php:345
 msgid "Pick a square area of the image to be your avatar."
 msgstr "Оберіть квадратну ділянку зображення, яка й буде вашою аватаркою."
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
 #. TRANS: Server error displayed trying to crop an uploaded group logo that is no longer present.
-#: actions/avatarsettings.php:360 actions/grouplogo.php:391
 msgid "Lost our file data."
 msgstr "Дані вашого файлу загублено."
 
 #. TRANS: Success message for having updated a user avatar.
-#: actions/avatarsettings.php:384
 msgid "Avatar updated."
 msgstr "Аватару оновлено."
 
 #. TRANS: Error displayed on the avatar upload page if the avatar could not be updated for an unknown reason.
-#: actions/avatarsettings.php:388
 msgid "Failed updating avatar."
 msgstr "Оновлення аватари невдале."
 
 #. TRANS: Success message for deleting a user avatar.
-#: actions/avatarsettings.php:412
 msgid "Avatar deleted."
 msgstr "Аватару видалено."
 
 #. TRANS: Title for backup account page.
 #. TRANS: Option in profile settings to create a backup of the account of the currently logged in user.
-#: actions/backupaccount.php:61 actions/profilesettings.php:468
 msgid "Backup account"
 msgstr "Резерв. копія"
 
 #. TRANS: Client exception thrown when trying to backup an account while not logged in.
-#: actions/backupaccount.php:79
 msgid "Only logged-in users can backup their account."
 msgstr ""
 "Лише користувачі, що знаходяться у системі, можуть зробити резервну копію "
 "свого акаунту."
 
 #. TRANS: Client exception thrown when trying to backup an account without having backup rights.
-#: actions/backupaccount.php:84
 msgid "You may not backup your account."
 msgstr "Ви не можете створити резервну копію свого акаунту."
 
 #. TRANS: Information displayed on the backup account page.
-#: actions/backupaccount.php:227
 msgid ""
 "You can backup your account data in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format. This is an experimental feature and provides "
@@ -1692,30 +1321,25 @@ msgstr ""
 "не долучаються до резервного файлу."
 
 #. TRANS: Submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:250
 msgctxt "BUTTON"
 msgid "Backup"
 msgstr "Резерв. копія"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:254
 msgid "Backup your account."
 msgstr "Резервне копіювання вашого облікового запису."
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
-#: actions/block.php:68
 msgid "You already blocked that user."
 msgstr "Цього користувача вже заблоковано."
 
 #. TRANS: Title for block user page.
 #. TRANS: Legend for block user form.
 #. TRANS: Fieldset legend for block user from group form.
-#: actions/block.php:106 actions/block.php:136 actions/groupblock.php:165
 msgid "Block user"
 msgstr "Блокувати користувача"
 
 #. TRANS: Explanation of consequences when blocking a user on the block user page.
-#: actions/block.php:139
 msgid ""
 "Are you sure you want to block this user? Afterwards, they will be "
 "unsubscribed from you, unable to subscribe to you in the future, and you "
@@ -1731,15 +1355,11 @@ msgstr ""
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:154 actions/deleteapplication.php:157
-#: actions/deletegroup.php:220 actions/deletenotice.php:155
-#: actions/deleteuser.php:154 actions/groupblock.php:187
 msgctxt "BUTTON"
 msgid "No"
 msgstr "Ні"
 
 #. TRANS: Submit button title for 'No' when blocking a user.
-#: actions/block.php:158
 msgid "Do not block this user."
 msgstr "Не блокувати цього користувача."
 
@@ -1749,175 +1369,139 @@ msgstr "Не блокувати цього користувача."
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:161 actions/deleteapplication.php:164
-#: actions/deletegroup.php:227 actions/deletenotice.php:162
-#: actions/deleteuser.php:161 actions/groupblock.php:194
 msgctxt "BUTTON"
 msgid "Yes"
 msgstr "Так"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:165
 msgid "Block this user."
 msgstr "Блокувати користувача."
 
 #. TRANS: Server error displayed when blocking a user fails.
-#: actions/block.php:189
 msgid "Failed to save block information."
 msgstr "Збереження інформації про блокування завершилось невдачею."
 
 #. TRANS: Title for first page with list of users blocked from a group.
 #. TRANS: %s is a group nickname.
-#: actions/blockedfromgroup.php:101
 #, php-format
 msgid "%s blocked profiles"
 msgstr "Заблоковані профілі %s"
 
 #. TRANS: Title for any but the first page with list of users blocked from a group.
 #. TRANS: %1$s is a group nickname, %2$d is a page number.
-#: actions/blockedfromgroup.php:106
 #, php-format
 msgid "%1$s blocked profiles, page %2$d"
 msgstr "Заблоковані профілі %1$s, сторінка %2$d"
 
 #. TRANS: Instructions for list of users blocked from a group.
-#: actions/blockedfromgroup.php:122
 msgid "A list of the users blocked from joining this group."
 msgstr "Список користувачів, котрих заблоковано в цій спільноті."
 
 #. TRANS: Form legend for unblocking a user from a group.
-#: actions/blockedfromgroup.php:291
 msgid "Unblock user from group"
 msgstr "Розблокувати користувача"
 
 #. TRANS: Button text for unblocking a user from a group.
-#: actions/blockedfromgroup.php:323
 msgctxt "BUTTON"
 msgid "Unblock"
 msgstr "Розблокувати"
 
 #. TRANS: Tooltip for button for unblocking a user from a group.
 #. TRANS: Description of the form to unblock a user.
-#: actions/blockedfromgroup.php:327 lib/unblockform.php:78
 msgid "Unblock this user"
 msgstr "Розблокувати цього користувача"
 
 #. TRANS: Title for mini-posting window loaded from bookmarklet.
 #. TRANS: %s is the StatusNet site name.
-#: actions/bookmarklet.php:51
 #, php-format
 msgid "Post to %s"
 msgstr "Опублікувати в %s"
 
 #. TRANS: Client error displayed when not providing a confirmation code in the contact address confirmation action.
-#: actions/confirmaddress.php:74
 msgid "No confirmation code."
 msgstr "Немає коду підтвердження."
 
 #. TRANS: Client error displayed when providing a non-existing confirmation code in the contact address confirmation action.
-#: actions/confirmaddress.php:80
 msgid "Confirmation code not found."
 msgstr "Код підтвердження не знайдено."
 
 #. TRANS: Client error displayed when not providing a confirmation code for another user in the contact address confirmation action.
-#: actions/confirmaddress.php:86
 msgid "That confirmation code is not for you!"
 msgstr "Цей код підтвердження не для вас!"
 
 #. TRANS: Server error for an unknown address type, which can be 'email', 'sms', or the name of an IM network (such as 'xmpp' or 'aim')
-#: actions/confirmaddress.php:94
-#, fuzzy, php-format
+#, php-format
 msgid "Unrecognized address type %s"
-msgstr "Невизначений тип адреси %s."
+msgstr "Невизначений тип адреси %s"
 
 #. TRANS: Client error for an already confirmed email/jabber/sms address.
-#: actions/confirmaddress.php:103 actions/confirmaddress.php:136
 msgid "That address has already been confirmed."
 msgstr "Цю адресу вже підтверджено."
 
-#: actions/confirmaddress.php:121 actions/imsettings.php:444
-#: actions/userdesignsettings.php:306
-#, fuzzy
 msgid "Couldn't update user."
 msgstr "Не вдалося оновити користувача."
 
-#: actions/confirmaddress.php:144
 #, fuzzy
 msgid "Couldn't update user im preferences."
 msgstr "Не вдалося оновити запис користувача."
 
-#: actions/confirmaddress.php:156
 #, fuzzy
 msgid "Couldn't insert user im preferences."
 msgstr "Не вдалося додати нову підписку."
 
 #. TRANS: Server error displayed when an address confirmation code deletion from the
 #. TRANS: database fails in the contact address confirmation action.
-#: actions/confirmaddress.php:169
 msgid "Could not delete address confirmation."
 msgstr "Не вдалося видалити адресу підтвердження."
 
 #. TRANS: Title for the contact address confirmation action.
-#: actions/confirmaddress.php:185
 msgid "Confirm address"
 msgstr "Підтвердити адресу"
 
 #. TRANS: Success message for the contact address confirmation action.
 #. TRANS: %s can be 'email', 'jabber', or 'sms'.
-#: actions/confirmaddress.php:200
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "Адресу «%s» підтверджено для вашого акаунту."
 
 #. TRANS: Title for page with a conversion (multiple notices in context).
-#: actions/conversation.php:96
 msgid "Conversation"
 msgstr "Розмова"
 
 #. TRANS: Header on conversation page. Hidden by default (h2).
 #. TRANS: Label for user statistics.
-#: actions/conversation.php:149 lib/noticelist.php:87
-#: lib/profileaction.php:246 lib/searchgroupnav.php:82
-#: lib/threadednoticelist.php:66
 msgid "Notices"
 msgstr "Дописи"
 
 #. TRANS: Client exception displayed trying to delete a user account while not logged in.
-#: actions/deleteaccount.php:71
 msgid "Only logged-in users can delete their account."
 msgstr ""
 "Лише користувачі, що знаходяться у системі, можуть видаляти свої акаунти."
 
 #. TRANS: Client exception displayed trying to delete a user account without have the rights to do that.
-#: actions/deleteaccount.php:77
 msgid "You cannot delete your account."
 msgstr "Ви не можете видалити свій акаунт."
 
 #. TRANS: Confirmation text for user deletion. The user has to type this exactly the same, including punctuation.
-#: actions/deleteaccount.php:160 actions/deleteaccount.php:297
 msgid "I am sure."
 msgstr "Безсумнівно."
 
 #. TRANS: Notification for user about the text that must be input to be able to delete a user account.
 #. TRANS: %s is the text that needs to be input.
-#: actions/deleteaccount.php:164
 #, php-format
 msgid "You must write \"%s\" exactly in the box."
 msgstr "Ви мусите написати «%s» саме у цьому віконці."
 
 #. TRANS: Confirmation that a user account has been deleted.
-#: actions/deleteaccount.php:206
 msgid "Account deleted."
 msgstr "Акаунт видалено."
 
 #. TRANS: Page title for page on which a user account can be deleted.
 #. TRANS: Option in profile settings to delete the account of the currently logged in user.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:476
 msgid "Delete account"
 msgstr "Видалити акаунт"
 
 #. TRANS: Form text for user deletion form.
-#: actions/deleteaccount.php:279
 msgid ""
 "This will <strong>permanently delete</strong> your account data from this "
 "server."
@@ -1927,7 +1511,6 @@ msgstr ""
 
 #. TRANS: Additional form text for user deletion form shown if a user has account backup rights.
 #. TRANS: %s is a URL to the backup page.
-#: actions/deleteaccount.php:285
 #, php-format
 msgid ""
 "You are strongly advised to <a href=\"%s\">back up your data</a> before "
@@ -1938,55 +1521,42 @@ msgstr ""
 
 #. TRANS: Field label for delete account confirmation entry.
 #. TRANS: Field label for password reset form where the password has to be typed again.
-#: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:262 actions/register.php:419
 msgid "Confirm"
 msgstr "Підтвердити"
 
 #. TRANS: Input title for the delete account field.
 #. TRANS: %s is the text that needs to be input.
-#: actions/deleteaccount.php:304
 #, php-format
 msgid "Enter \"%s\" to confirm that you want to delete your account."
 msgstr "Введіть «%s», тим самим підтверджуючи свою згоду на видалення акаунту."
 
 #. TRANS: Button title for user account deletion.
-#: actions/deleteaccount.php:323
 msgid "Permanently delete your account"
 msgstr "Остаточне і негайне видалення акаунту"
 
 #. TRANS: Client error displayed trying to delete an application while not logged in.
-#: actions/deleteapplication.php:62
 msgid "You must be logged in to delete an application."
 msgstr "Ви маєте спочатку увійти, аби мати змогу видалити додаток."
 
 #. TRANS: Client error displayed trying to delete an application that does not exist.
-#: actions/deleteapplication.php:71
 msgid "Application not found."
 msgstr "Додаток не виявлено."
 
 #. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
-#: actions/deleteapplication.php:79 actions/editapplication.php:78
-#: actions/showapplication.php:90
 msgid "You are not the owner of this application."
 msgstr "Ви не є власником цього додатку."
 
 #. TRANS: Client error text when there is a problem with the session token.
-#: actions/deleteapplication.php:102 actions/editapplication.php:131
-#: actions/newapplication.php:112 actions/showapplication.php:113
-#: lib/action.php:1391
 msgid "There was a problem with your session token."
 msgstr "Виникли певні проблеми з токеном поточної сесії."
 
 #. TRANS: Title for delete application page.
 #. TRANS: Fieldset legend on delete application page.
-#: actions/deleteapplication.php:124 actions/deleteapplication.php:149
 msgid "Delete application"
 msgstr "Видалити додаток"
 
 #. TRANS: Confirmation text on delete application page.
-#: actions/deleteapplication.php:152
 msgid ""
 "Are you sure you want to delete this application? This will clear all data "
 "about the application from the database, including all existing user "
@@ -1997,55 +1567,45 @@ msgstr ""
 "додатку користувачів."
 
 #. TRANS: Submit button title for 'No' when deleting an application.
-#: actions/deleteapplication.php:161
 msgid "Do not delete this application."
 msgstr "Не видаляти цей додаток."
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
-#: actions/deleteapplication.php:167
 msgid "Delete this application."
 msgstr "Видалити додаток."
 
 #. TRANS: Client error when trying to delete group while not logged in.
-#: actions/deletegroup.php:64
 msgid "You must be logged in to delete a group."
 msgstr "Ви повинні спочатку увійти на сайт, аби видалити спільноту."
 
 #. TRANS: Client error when trying to delete a group without providing a nickname or ID for the group.
 #. TRANS: Client error displayed when trying to join a group without providing a group name or group ID.
 #. TRANS: Client error displayed when trying to leave a group without providing a group name or group ID.
-#: actions/deletegroup.php:94 actions/joingroup.php:89
-#: actions/leavegroup.php:89
 msgid "No nickname or ID."
 msgstr "Немає імені або ІД."
 
 #. TRANS: Client error when trying to delete a group without having the rights to delete it.
-#: actions/deletegroup.php:107
 msgid "You are not allowed to delete this group."
 msgstr "Вам не дозволено видаляти цю спільноту."
 
 #. TRANS: Server error displayed if a group could not be deleted.
 #. TRANS: %s is the name of the group that could not be deleted.
-#: actions/deletegroup.php:150
 #, php-format
 msgid "Could not delete group %s."
 msgstr "Не вдалося видалити спільноту %s."
 
 #. TRANS: Message given after deleting a group.
 #. TRANS: %s is the deleted group's name.
-#: actions/deletegroup.php:159
 #, php-format
 msgid "Deleted group %s"
 msgstr "Спільноту %s видалено"
 
 #. TRANS: Title of delete group page.
 #. TRANS: Form legend for deleting a group.
-#: actions/deletegroup.php:176 actions/deletegroup.php:202
 msgid "Delete group"
 msgstr "Видалити спільноту"
 
 #. TRANS: Warning in form for deleleting a group.
-#: actions/deletegroup.php:206
 msgid ""
 "Are you sure you want to delete this group? This will clear all data about "
 "the group from the database, without a backup. Public posts to this group "
@@ -2056,12 +1616,10 @@ msgstr ""
 "спільноти залишаться у стрічках дописів колишніх членів спільноти."
 
 #. TRANS: Submit button title for 'No' when deleting a group.
-#: actions/deletegroup.php:224
 msgid "Do not delete this group."
 msgstr "Не видаляти цю спільноту."
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
-#: actions/deletegroup.php:231
 msgid "Delete this group."
 msgstr "Видалити спільноту."
 
@@ -2071,22 +1629,18 @@ msgstr "Видалити спільноту."
 #. TRANS: Client error displayed trying to block a user from a group while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying to log out when not logged in.
+#. TRANS: Client error displayed when trying to access the "make admin" page while not logged in.
+#. TRANS: Client error displayed trying to create a new direct message while not logged in.
+#. TRANS: Client error displayed trying to send a notice while not logged in.
+#. TRANS: Client error displayed trying to nudge a user without being logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
 #. TRANS: Client error displayed when trying to change user options while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
-#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:70
-#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
-#: actions/nudge.php:63 actions/pluginenable.php:97 actions/subedit.php:33
-#: actions/subscribe.php:98 actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:71 lib/profileformaction.php:63
-#: lib/settingsaction.php:72
 msgid "Not logged in."
 msgstr "Не увійшли."
 
 #. TRANS: Instructions for deleting a notice.
-#: actions/deletenotice.php:110
 msgid ""
 "You are about to permanently delete a notice. Once this is done, it cannot "
 "be undone."
@@ -2094,48 +1648,39 @@ msgstr "Ви видаляєте допис назавжди. Ця дія є не
 
 #. TRANS: Page title when deleting a notice.
 #. TRANS: Fieldset legend for the delete notice form.
-#: actions/deletenotice.php:117 actions/deletenotice.php:148
 msgid "Delete notice"
 msgstr "Видалити допис"
 
 #. TRANS: Message for the delete notice form.
-#: actions/deletenotice.php:152
 msgid "Are you sure you want to delete this notice?"
 msgstr "Ви впевненні, що бажаєте видалити цей допис?"
 
 #. TRANS: Submit button title for 'No' when deleting a notice.
-#: actions/deletenotice.php:159
 msgid "Do not delete this notice."
 msgstr "Не видаляти цей допис."
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:166
 msgid "Delete this notice."
 msgstr "Видалити допис."
 
 #. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
-#: actions/deleteuser.php:66
 msgid "You cannot delete users."
 msgstr "Ви не можете видаляти користувачів."
 
 #. TRANS: Client error displayed when trying to delete a non-local user.
-#: actions/deleteuser.php:74
 msgid "You can only delete local users."
 msgstr "Ви можете видаляти лише локальних користувачів."
 
 #. TRANS: Title of delete user page.
-#: actions/deleteuser.php:110
 msgctxt "TITLE"
 msgid "Delete user"
 msgstr "Видалити користувача"
 
 #. TRANS: Fieldset legend on delete user page.
-#: actions/deleteuser.php:134
 msgid "Delete user"
 msgstr "Видалити користувача"
 
 #. TRANS: Information text to request if a user is certain that the described action has to be performed.
-#: actions/deleteuser.php:138
 msgid ""
 "Are you sure you want to delete this user? This will clear all data about "
 "the user from the database, without a backup."
@@ -2144,97 +1689,78 @@ msgstr ""
 "можливості відновлення."
 
 #. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/deleteuser.php:158
 msgid "Do not delete this user."
 msgstr "Не видаляти цього користувача."
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
-#: actions/deleteuser.php:165
 msgid "Delete this user."
 msgstr "Видалити цього користувача."
 
 #. TRANS: Message used as title for design settings for the site.
-#: actions/designadminpanel.php:60 lib/settingsnav.php:97
 msgid "Design"
 msgstr "Дизайн"
 
 #. TRANS: Instructions for design adminsitration panel.
-#: actions/designadminpanel.php:71
 msgid "Design settings for this StatusNet site"
 msgstr "Налаштування дизайну для цього сайту StatusNet"
 
 #. TRANS: Client error displayed when a logo URL does is not valid.
-#: actions/designadminpanel.php:327
 msgid "Invalid logo URL."
 msgstr "Помилкова URL-адреса логотипу."
 
 #. TRANS: Client error displayed when an SSL logo URL is invalid.
-#: actions/designadminpanel.php:333
 msgid "Invalid SSL logo URL."
 msgstr "Невірний SSL або URL-адреса логотипу."
 
 #. TRANS: Client error displayed when a theme is submitted through the form that is not in the theme list.
 #. TRANS: %s is the chosen unavailable theme.
-#: actions/designadminpanel.php:339
 #, php-format
 msgid "Theme not available: %s."
 msgstr "Тема недоступна: %s."
 
 #. TRANS: Fieldset legend for form to change logo.
-#: actions/designadminpanel.php:437
 msgid "Change logo"
 msgstr "Змінити логотип"
 
 #. TRANS: Field label for StatusNet site logo.
-#: actions/designadminpanel.php:444
 msgid "Site logo"
 msgstr "Логотип сайту"
 
 #. TRANS: Field label for SSL StatusNet site logo.
-#: actions/designadminpanel.php:452
 msgid "SSL logo"
 msgstr "Логотип сайту з SSL"
 
 #. TRANS: Fieldset legend for form change StatusNet site's theme.
-#: actions/designadminpanel.php:467
 msgid "Change theme"
 msgstr "Змінити тему"
 
 #. TRANS: Field label for dropdown to choose site theme.
-#: actions/designadminpanel.php:485
 msgid "Site theme"
 msgstr "Тема сайту"
 
 #. TRANS: Title for field label for dropdown to choose site theme.
-#: actions/designadminpanel.php:487
 msgid "Theme for the site."
 msgstr "Тема для цього сайту."
 
 #. TRANS: Field label for uploading a cutom theme.
-#: actions/designadminpanel.php:494
 msgid "Custom theme"
 msgstr "Своя тема"
 
 #. TRANS: Form instructions for uploading a cutom StatusNet theme.
-#: actions/designadminpanel.php:499
 msgid "You can upload a custom StatusNet theme as a .ZIP archive."
 msgstr "Ви можете завантажити свою тему для сайту StatusNet як .ZIP архів."
 
 #. TRANS: Fieldset legend for theme background image.
-#: actions/designadminpanel.php:515
 msgid "Change background image"
 msgstr "Змінити фонове зображення"
 
 #. TRANS: Field label for background image on theme designer page.
 #. TRANS: Field label for background color selector.
 #. TRANS: Label on profile design page for setting a profile page background colour.
-#: actions/designadminpanel.php:525 actions/designadminpanel.php:609
-#: lib/designform.php:238
 msgid "Background"
 msgstr "Фон"
 
 #. TRANS: Form guide for background image upload form on theme designer page.
-#: actions/designadminpanel.php:531
 #, php-format
 msgid ""
 "You can upload a background image for the site. The maximum file size is %1"
@@ -2244,197 +1770,162 @@ msgstr ""
 "%1$s."
 
 #. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:558
 msgid "On"
 msgstr "Увімк."
 
 #. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:575
 msgid "Off"
 msgstr "Вимк."
 
 #. TRANS: Form guide for turning background image on or off on theme designer page.
 #. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
 #. TRANS: use of the uploaded profile image.
-#: actions/designadminpanel.php:577 lib/designform.php:214
 msgid "Turn background image on or off."
 msgstr "Увімкнути або вимкнути фонове зображення."
 
 #. TRANS: Checkbox label to title background image on theme designer page.
 #. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-#: actions/designadminpanel.php:583 lib/designform.php:220
 msgid "Tile background image"
 msgstr "Замостити фон"
 
 #. TRANS: Fieldset legend for theme colors.
-#: actions/designadminpanel.php:598
 msgid "Change colors"
 msgstr "Змінити кольори"
 
 #. TRANS: Field label for content color selector.
 #. TRANS: Label on profile design page for setting a profile page content colour.
-#: actions/designadminpanel.php:623 lib/designform.php:252
 msgid "Content"
 msgstr "Зміст"
 
 #. TRANS: Field label for sidebar color selector.
 #. TRANS: Label on profile design page for setting a profile page sidebar colour.
-#: actions/designadminpanel.php:637 lib/designform.php:266
 msgid "Sidebar"
 msgstr "Сайдбар"
 
 #. TRANS: Field label for text color selector.
 #. TRANS: Label on profile design page for setting a profile page text colour.
-#: actions/designadminpanel.php:651 lib/designform.php:280
 msgid "Text"
 msgstr "Текст"
 
 #. TRANS: Field label for link color selector.
 #. TRANS: Label on profile design page for setting a profile page links colour.
-#: actions/designadminpanel.php:665 lib/designform.php:294
 msgid "Links"
 msgstr "Посилання"
 
 #. TRANS: Fieldset legend for advanced theme design settings.
-#: actions/designadminpanel.php:691
 msgid "Advanced"
 msgstr "Додатково"
 
 #. TRANS: Field label for custom CSS.
-#: actions/designadminpanel.php:696
 msgid "Custom CSS"
 msgstr "Свій CSS"
 
 #. TRANS: Button text for resetting theme settings.
-#: actions/designadminpanel.php:718
 msgctxt "BUTTON"
 msgid "Use defaults"
 msgstr "За замовч."
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:720
 msgid "Restore default designs."
 msgstr "Відновити стандартні установки."
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:728
 msgid "Reset back to default."
 msgstr "Повернутись до стандартних налаштувань."
 
 #. TRANS: Title for button for saving theme settings.
-#: actions/designadminpanel.php:736
 msgid "Save design."
 msgstr "Зберегти дизайн."
 
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
-#: actions/disfavor.php:83
 msgid "This notice is not a favorite!"
 msgstr "Цей допис не є обраним!"
 
 #. TRANS: Title for page on which favorites can be added.
-#: actions/disfavor.php:98
 msgid "Add to favorites"
 msgstr "Додати до обраних"
 
 #. TRANS: Client exception thrown when requesting a document from the documentation that does not exist.
 #. TRANS: %s is the non-existing document.
-#: actions/doc.php:155
 #, php-format
 msgid "No such document \"%s\"."
 msgstr "Немає такого документа «%s»."
 
 #. TRANS: Title for "Edit application" form.
 #. TRANS: Form legend.
-#: actions/editapplication.php:54 lib/applicationeditform.php:129
 msgid "Edit application"
 msgstr "Керувати додатками"
 
 #. TRANS: Client error displayed trying to edit an application while not logged in.
-#: actions/editapplication.php:66
 msgid "You must be logged in to edit an application."
 msgstr "Ви маєте спочатку увійти, аби мати змогу керувати додатком."
 
 #. TRANS: Client error displayed trying to edit an application that does not exist.
-#: actions/editapplication.php:83 actions/showapplication.php:83
 msgid "No such application."
 msgstr "Такого додатку немає."
 
 #. TRANS: Instructions for "Edit application" form.
-#: actions/editapplication.php:167
 msgid "Use this form to edit your application."
 msgstr "Скористайтесь цією формою, щоб відредагувати додаток."
 
 #. TRANS: Validation error shown when not providing a name in the "Edit application" form.
 #. TRANS: Validation error shown when not providing a name in the "New application" form.
-#: actions/editapplication.php:184 actions/newapplication.php:164
 msgid "Name is required."
 msgstr "Потрібне ім’я."
 
 #. 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.
-#: actions/editapplication.php:188 actions/newapplication.php:172
 msgid "Name is too long (maximum 255 characters)."
 msgstr "Ім’я надто довге (не більше 255 знаків)."
 
 #. TRANS: Validation error shown when providing a name for an application that already exists in the "Edit application" form.
 #. TRANS: Validation error shown when providing a name for an application that already exists in the "New application" form.
-#: actions/editapplication.php:192 actions/newapplication.php:168
 msgid "Name already in use. Try another one."
 msgstr "Це ім’я вже використовується. Спробуйте інше."
 
 #. TRANS: Validation error shown when not providing a description in the "Edit application" form.
 #. TRANS: Validation error shown when not providing a description in the "New application" form.
-#: actions/editapplication.php:196 actions/newapplication.php:176
 msgid "Description is required."
 msgstr "Потрібен опис."
 
 #. TRANS: Validation error shown when providing too long a source URL in the "Edit application" form.
-#: actions/editapplication.php:209
 msgid "Source URL is too long."
 msgstr "URL-адреса надто довга."
 
 #. TRANS: Validation error shown when providing an invalid source URL in the "Edit application" form.
 #. TRANS: Validation error shown when providing an invalid source URL in the "New application" form.
-#: actions/editapplication.php:216 actions/newapplication.php:199
 msgid "Source URL is not valid."
 msgstr "URL-адреса не є дійсною."
 
 #. 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.
-#: actions/editapplication.php:220 actions/newapplication.php:203
 msgid "Organization is required."
 msgstr "Потрібна організація."
 
 #. TRANS: Validation error shown when providing too long an arganisation name in the "Edit application" form.
-#: actions/editapplication.php:224 actions/newapplication.php:207
 msgid "Organization is too long (maximum 255 characters)."
 msgstr "Назва організації надто довга (не більше 255 знаків)."
 
 #. TRANS: Form validation error show when an organisation name has not been provided in the edit application form.
 #. TRANS: Form validation error show when an organisation name has not been provided in the new application form.
-#: actions/editapplication.php:228 actions/newapplication.php:211
 msgid "Organization homepage is required."
 msgstr "Потрібна домашня сторінка організації."
 
 #. TRANS: Validation error shown when providing too long a callback URL in the "Edit application" form.
 #. TRANS: Validation error shown when providing too long a callback URL in the "New application" form.
-#: actions/editapplication.php:239 actions/newapplication.php:225
 msgid "Callback is too long."
 msgstr "Форма зворотнього дзвінка надто довга."
 
 #. TRANS: Validation error shown when providing an invalid callback URL in the "Edit application" form.
 #. TRANS: Validation error shown when providing an invalid callback URL in the "New application" form.
-#: actions/editapplication.php:247 actions/newapplication.php:235
 msgid "Callback URL is not valid."
 msgstr "URL-адреса для зворотнього дзвінка не є дійсною."
 
 #. TRANS: Server error occuring when an application could not be updated from the "Edit application" form.
-#: actions/editapplication.php:284
 msgid "Could not update application."
 msgstr "Не вдалося оновити додаток."
 
 #. TRANS: Title for form to edit a group. %s is a group nickname.
-#: actions/editgroup.php:55
 #, php-format
 msgid "Edit %s group"
 msgstr "Змінити властивості спільноти %s"
@@ -2442,40 +1933,40 @@ msgstr "Змінити властивості спільноти %s"
 #. TRANS: Client error displayed trying to edit a group while not logged in.
 #. TRANS: Client error displayed when trying to create a group while not logged in.
 #. TRANS: Client error displayed trying to create a group while not logged in.
-#: actions/editgroup.php:68 actions/grouplogo.php:69 actions/newgroup.php:65
 msgid "You must be logged in to create a group."
 msgstr "Ви маєте спочатку увійти, аби мати змогу започаткувати спільноту."
 
 #. TRANS: Form instructions for group edit form.
-#: actions/editgroup.php:161
 msgid "Use this form to edit the group."
 msgstr "Скористайтесь цією формою, щоб відредагувати властивості спільноти."
 
+#. TRANS: Group edit form validation error.
+#. TRANS: Group create form validation error.
+#. TRANS: %s is the invalid alias.
+#, php-format
+msgid "Invalid alias: \"%s\""
+msgstr "Помилкове додаткове ім’я: «%s»"
+
 #. TRANS: Group edit form success message.
-#: actions/editgroup.php:301
 msgid "Options saved."
 msgstr "Опції збережено."
 
 #. TRANS: Title for e-mail settings.
-#: actions/emailsettings.php:60
 msgid "Email settings"
 msgstr "Налаштування пошти"
 
 #. TRANS: E-mail settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/emailsettings.php:74
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 msgstr "Зазначте, як саме ви бажаєте отримувати листи з %%site.name%%."
 
 #. TRANS: Form legend for e-mail settings form.
 #. TRANS: Field label for e-mail address input in e-mail settings form.
-#: actions/emailsettings.php:104 actions/emailsettings.php:130
 msgid "Email address"
 msgstr "Електронна адреса"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:110
 msgid "Current confirmed email address."
 msgstr "Поточна підтверджена поштова адреса."
 
@@ -2484,15 +1975,11 @@ msgstr "Поточна підтверджена поштова адреса."
 #. TRANS: Button label to remove a confirmed IM address.
 #. TRANS: Button label to remove a confirmed SMS address.
 #. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
-#: actions/emailsettings.php:113 actions/emailsettings.php:180
-#: actions/imsettings.php:119 actions/smssettings.php:119
-#: actions/smssettings.php:175
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Видалити"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:120
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -2505,44 +1992,36 @@ msgstr ""
 #. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
 #. TRANS: Any other domain may be owned by a legitimate person or
 #. TRANS: organization.
-#: actions/emailsettings.php:137
 msgid "Email address, like \"UserName@example.org\""
 msgstr "Електронна адреса, на зразок «UserName@example.org»"
 
 #. TRANS: Button label for adding an e-mail address in e-mail settings form.
 #. TRANS: Button label for adding an IM address in IM settings form.
 #. TRANS: Button label for adding a SMS phone number in SMS settings form.
-#: actions/emailsettings.php:141 actions/imsettings.php:147
-#: actions/smssettings.php:157
 msgctxt "BUTTON"
 msgid "Add"
 msgstr "Додати"
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:149 actions/smssettings.php:166
 msgid "Incoming email"
 msgstr "Вхідна пошта"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:155
 msgid "I want to post notices by email."
 msgstr "Я хочу надсилати дописи поштою."
 
 #. TRANS: Form instructions for incoming e-mail form in e-mail settings.
 #. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
-#: actions/emailsettings.php:177 actions/smssettings.php:173
 msgid "Send email to this address to post new notices."
 msgstr "Надсилайте дописи на цю адресу і їх буде опубліковано на сайті."
 
 #. TRANS: Instructions for incoming e-mail address input form, when an address has already been assigned.
 #. TRANS: Instructions for incoming SMS e-mail address input form.
-#: actions/emailsettings.php:186 actions/smssettings.php:181
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr "Створити нову адресу для надсилання повідомлень; видалити стару."
 
 #. TRANS: Instructions for incoming e-mail address input form.
-#: actions/emailsettings.php:190
 msgid ""
 "To send notices via email, we need to create a unique email address for you "
 "on this server:"
@@ -2552,87 +2031,69 @@ msgstr ""
 
 #. TRANS: Button label for adding an e-mail address to send notices from.
 #. TRANS: Button label for adding an SMS e-mail address to send notices from.
-#: actions/emailsettings.php:196 actions/smssettings.php:184
 msgctxt "BUTTON"
 msgid "New"
 msgstr "Нове"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:205
 msgid "Email preferences"
 msgstr "Преференції ел. пошти"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:213
 msgid "Send me notices of new subscriptions through email."
 msgstr "Поівдомляти мене поштою про нові підписки."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:219
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr "Надсилати мені листа, коли хтось додає мій допис до списку обраних."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:226
 msgid "Send me email when someone sends me a private message."
 msgstr "Надсилати мені листа, коли хтось має приватне повідомлення для мене."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:232
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr "Надсилати мені листа, коли на мій допис з’являється «@-відповідь»."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:238
 msgid "Allow friends to nudge me and send me an email."
 msgstr "Дозволити друзям «розштовхати» мене, надіславши мені листа."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:244
 msgid "Publish a MicroID for my email address."
 msgstr "Позначати міткою MicroID мою електронну адресу."
 
 #. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:362
 msgid "Email preferences saved."
 msgstr "Преференції пошти збережно."
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:381
 msgid "No email address."
 msgstr "Немає електронної адреси."
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:389
 msgid "Cannot normalize that email address."
 msgstr "Не можна полагодити цю поштову адресу."
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:394 actions/register.php:197
-#: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "Це недійсна електронна адреса."
 
 #. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:398
 msgid "That is already your email address."
 msgstr "Це і є вашою адресою."
 
 #. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:402
 msgid "That email address already belongs to another user."
 msgstr "Ця електронна адреса належить іншому користувачу."
 
 #. TRANS: Server error thrown on database error adding e-mail confirmation code.
 #. TRANS: Server error thrown on database error adding Instant Messaging confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:419 actions/imsettings.php:362
-#: actions/smssettings.php:364
 msgid "Could not insert confirmation code."
 msgstr "Не вдалося додати код підтвердження."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:426
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
@@ -2644,99 +2105,79 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling Instant Messaging address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:446 actions/imsettings.php:391
-#: actions/smssettings.php:398
 msgid "No pending confirmation to cancel."
 msgstr "Не очікується підтвердження для скасування."
 
 #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:451
 msgid "That is the wrong email address."
 msgstr "Це помилкова адреса електронної пошти."
 
 #. TRANS: Server error thrown on database error canceling e-mail address confirmation.
 #. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
-#: actions/emailsettings.php:460 actions/smssettings.php:412
 msgid "Could not delete email confirmation."
 msgstr "Не вдається видалити підтвердження електронної адреси."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:465
 msgid "Email confirmation cancelled."
 msgstr "Підтвердження електронної пошти скасовано."
 
 #. TRANS: Message given trying to remove an e-mail address that is not
 #. TRANS: registered for the active user.
-#: actions/emailsettings.php:484
 msgid "That is not your email address."
 msgstr "Це не є вашою адресою."
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:505
 msgid "The email address was removed."
 msgstr "Адреса була видалена."
 
 #. TRANS: Form validation error displayed when trying to remove an incoming e-mail address while no address has been set.
-#: actions/emailsettings.php:519 actions/smssettings.php:554
 msgid "No incoming email address."
 msgstr "Немає адреси для вхідної пошти."
 
 #. 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.
-#: actions/emailsettings.php:531 actions/emailsettings.php:555
-#: actions/smssettings.php:565 actions/smssettings.php:590
 msgid "Could not update user record."
 msgstr "Не вдалося оновити запис користувача."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
 #. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:535 actions/smssettings.php:569
 msgid "Incoming email address removed."
 msgstr "Адресу вхідної пошти видалено."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
 #. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:559 actions/smssettings.php:594
 msgid "New incoming email address added."
 msgstr "Нову адресу для вхідних повідомлень додано."
 
 #. TRANS: Client error displayed when trying to mark a notice as favorite that already is a favorite.
-#: actions/favor.php:80
 msgid "This notice is already a favorite!"
 msgstr "Цей допис вже є обраним!"
 
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
-#: actions/favor.php:95
 msgid "Disfavor favorite."
 msgstr "Видалити з обраних."
 
 #. TRANS: Page title for first page of favorited notices.
 #. TRANS: Title for favourited notices section.
-#: actions/favorited.php:65 lib/popularnoticesection.php:62
-#: lib/publicgroupnav.php:93
 msgid "Popular notices"
 msgstr "Популярні дописи"
 
 #. TRANS: Page title for all but first page of favorited notices.
 #. TRANS: %d is the page number being displayed.
-#: actions/favorited.php:69
 #, php-format
 msgid "Popular notices, page %d"
 msgstr "Популярні дописи, сторінка %d"
 
 #. TRANS: Description on page displaying favorited notices.
-#: actions/favorited.php:81
 msgid "The most popular notices on the site right now."
 msgstr "Представлено найбільш популярні дописи на сайті."
 
 #. TRANS: Text displayed instead of a list when a site does not yet have any favourited notices.
-#: actions/favorited.php:149
 msgid "Favorite notices appear on this page but no one has favorited one yet."
 msgstr "Тут мають бути обрані дописи, але ще ніхто нічого не додав до обраних."
 
 #. TRANS: Additional text displayed instead of a list when a site does not yet have any favourited notices for logged in users.
-#: actions/favorited.php:153
 msgid ""
 "Be the first to add a notice to your favorites by clicking the fave button "
 "next to any notice you like."
@@ -2746,7 +2187,6 @@ msgstr ""
 
 #. TRANS: Additional text displayed instead of a list when a site does not yet have any favourited notices for not logged in users.
 #. TRANS: %%action.register%% is a registration link. "[link text](link)" is Mark Down. Do not change the formatting.
-#: actions/favorited.php:158
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to add a "
@@ -2759,181 +2199,146 @@ msgstr ""
 #. TRANS: %s is a user's nickname.
 #. TRANS: Title for first page of favourite notices of a user.
 #. TRANS: %s is the user for whom the favourite notices are displayed.
-#: actions/favoritesrss.php:111 actions/showfavorites.php:76
-#: lib/personalgroupnav.php:110
 #, php-format
 msgid "%s's favorite notices"
 msgstr "Обрані дописи %s"
 
 #. TRANS: Desciption of RSS feed with favourite notices of a user.
 #. TRANS: %1$s is a user's nickname, %2$s is the name of the StatusNet site.
-#: actions/favoritesrss.php:117
 #, php-format
 msgid "Updates favored by %1$s on %2$s!"
 msgstr "Оновлення обраних дописів %1$s на %2$s!"
 
 #. TRANS: Page title for first page of featured users.
 #. TRANS: Title for featured users section.
-#: actions/featured.php:69 lib/featureduserssection.php:87
-#: lib/publicgroupnav.php:89
 msgid "Featured users"
 msgstr "Користувачі варті уваги"
 
 #. TRANS: Page title for all but first page of featured users.
 #. TRANS: %d is the page number being displayed.
-#: actions/featured.php:73
 #, php-format
 msgid "Featured users, page %d"
 msgstr "Користувачі варті уваги, сторінка %d"
 
 #. TRANS: Description on page displaying featured users.
-#: actions/featured.php:102
 #, php-format
 msgid "A selection of some great users on %s."
 msgstr "Список деяких видатних користувачів на %s."
 
 #. TRANS: Client error displayed when no notice ID was given trying do display a file.
-#: actions/file.php:36
 msgid "No notice ID."
 msgstr "Немає ID допису."
 
 #. TRANS: Client error displayed when an invalid notice ID was given trying do display a file.
-#: actions/file.php:41
 msgid "No notice."
 msgstr "Немає допису."
 
 #. TRANS: Client error displayed when trying do display a file for a notice without a file attachement.
-#: actions/file.php:46
 msgid "No attachments."
 msgstr "Немає вкладень."
 
 #. TRANS: Client error displayed when trying do display a file for a notice with file attachements
 #. TRANS: that could not be found.
-#: actions/file.php:58
 msgid "No uploaded attachments."
 msgstr "Немає завантажених вкладень."
 
 #. TRANS: Client error displayed when subscribing to a remote profile and an unexpected response is received.
-#: actions/finishremotesubscribe.php:69
 msgid "Not expecting this response!"
 msgstr "Ця відповідь не очікується!"
 
 #. TRANS: Client error displayed when subscribing to a remote profile that does not exist.
-#: actions/finishremotesubscribe.php:81
 msgid "User being listened to does not exist."
 msgstr "Користувача, який слідкував за вашими повідомленнями, більше не існує."
 
 #. TRANS: Client error displayed when subscribing to a remote profile that is a local profile.
-#: actions/finishremotesubscribe.php:89 actions/remotesubscribe.php:58
 msgid "You can use the local subscription!"
 msgstr "Ви можете користуватись локальними підписками!"
 
 #. TRANS: Client error displayed when subscribing to a remote profile that is blocked form subscribing to.
-#: actions/finishremotesubscribe.php:102
 msgid "That user has blocked you from subscribing."
 msgstr "Цей користувач позбавив вас можливості підписатись до нього."
 
 #. TRANS: Client error displayed when subscribing to a remote profile without providing an authorised token.
-#: actions/finishremotesubscribe.php:114
 msgid "You are not authorized."
 msgstr "Не авторизовано."
 
 #. TRANS: Client error displayed when subscribing to a remote profile and conversion of the request token to access token fails.
-#: actions/finishremotesubscribe.php:118
 msgid "Could not convert request token to access token."
 msgstr "Не вдалося перетворити токени запиту на токени звернення."
 
 #. TRANS: Client error displayed when subscribing to a remote profile fails because of an unsupported version of the OMB protocol.
-#: actions/finishremotesubscribe.php:124
 msgid "Remote service uses unknown version of OMB protocol."
 msgstr "Невідома версія протоколу OMB."
 
 #. TRANS: Server error displayed when subscribing to a remote profile fails because the remote profile could not be updated.
-#: actions/finishremotesubscribe.php:145 lib/oauthstore.php:317
 msgid "Error updating remote profile."
 msgstr "Помилка при оновленні віддаленого профілю."
 
 #. TRANS: Client error displayed when requesting a non-existent file.
-#: actions/getfile.php:77
 msgid "No such file."
 msgstr "Такого файлу немає."
 
 #. TRANS: Client error displayed when requesting a file without having read access to it.
-#: actions/getfile.php:82
 msgid "Cannot read file."
 msgstr "Не можу прочитати файл."
 
 #. TRANS: Client error displayed when trying to assign an invalid role to a user.
-#: actions/grantrole.php:61 actions/revokerole.php:62
 msgid "Invalid role."
 msgstr "Невірна роль."
 
 #. TRANS: Client error displayed when trying to assign an reserved role to a user.
-#: actions/grantrole.php:66 actions/revokerole.php:66
 msgid "This role is reserved and cannot be set."
 msgstr "Цю роль вже зарезервовано і не може бути встановлено."
 
 #. TRANS: Client error displayed when trying to assign a role to a user while not being allowed to set roles.
-#: actions/grantrole.php:76
 msgid "You cannot grant user roles on this site."
 msgstr "Ви не можете надавати користувачеві жодних ролей на цьому сайті."
 
 #. TRANS: Client error displayed when trying to assign a role to a user that already has that role.
-#: actions/grantrole.php:84
 msgid "User already has this role."
 msgstr "Користувач вже має цю роль."
 
 #. TRANS: Client error displayed trying to block a user from a group while not specifying a to be blocked user profile.
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing a profile.
+#. TRANS: Client error displayed when not providing a profile ID on the Make Admin page.
 #. TRANS: Client error displayed trying a change a subscription without providing a profile.
 #. TRANS: Client error displayed when trying to change user options without specifying a user to work on.
-#: actions/groupblock.php:71 actions/groupunblock.php:71
-#: actions/makeadmin.php:71 actions/subedit.php:49
-#: lib/profileformaction.php:79
 msgid "No profile specified."
 msgstr "Не визначено жодного профілю."
 
 #. TRANS: Client error displayed trying to block a user from a group while specifying a non-existing profile.
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing an existing profile.
+#. TRANS: Client error displayed when specifying an invalid profile ID on the Make Admin page.
 #. TRANS: Client error displayed trying a change a subscription for a non-existant profile ID.
 #. TRANS: Client error displayed when trying to change user options without specifying an existing user to work on.
-#: actions/groupblock.php:77 actions/groupunblock.php:77
-#: actions/makeadmin.php:76 actions/subedit.php:57 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:87
 msgid "No profile with that ID."
 msgstr "Не визначено профілю з таким ID."
 
 #. TRANS: Client error displayed trying to block a user from a group while not specifying a group to block a profile from.
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing a group.
-#: actions/groupblock.php:83 actions/groupunblock.php:83
-#: actions/makeadmin.php:81
+#. TRANS: Client error displayed when not providing a group ID on the Make Admin page.
 msgid "No group specified."
 msgstr "Спільноту не визначено."
 
 #. TRANS: Client error displayed trying to block a user from a group while not being an admin user.
-#: actions/groupblock.php:95
 msgid "Only an admin can block group members."
 msgstr "Лише адміністратор спільноти має змогу блокувати користувачів."
 
 #. TRANS: Client error displayed trying to block a user from a group while user is already blocked from the given group.
-#: actions/groupblock.php:100
 msgid "User is already blocked from group."
 msgstr "Користувача заблоковано в цій спільноті."
 
 #. TRANS: Client error displayed trying to block a user from a group while user is not a member of given group.
-#: actions/groupblock.php:106
 msgid "User is not a member of group."
 msgstr "Користувач не є учасником спільноти."
 
 #. TRANS: Title for block user from group page.
 #. TRANS: Form legend for form to block user from a group.
-#: actions/groupblock.php:141 actions/groupmembers.php:364
 msgid "Block user from group"
 msgstr "Блокувати користувача у цій спільноті"
 
 #. TRANS: Explanatory text for block user from group form before setting the block.
 #. TRANS: %1$s is that to be blocked user, %2$s is the group the user will be blocked from.
-#: actions/groupblock.php:169
 #, php-format
 msgid ""
 "Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They "
@@ -2945,39 +2350,32 @@ msgstr ""
 "спільноти знов."
 
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
-#: actions/groupblock.php:191
 msgid "Do not block this user from this group."
 msgstr "Не блокувати цього користувача у цій спільноті."
 
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
-#: actions/groupblock.php:198
 msgid "Block this user from this group."
 msgstr "Заблокувати цього користувача у цій спільноті."
 
 #. TRANS: Server error displayed when trying to block a user from a group fails because of an application error.
-#: actions/groupblock.php:215
 msgid "Database error blocking user from group."
 msgstr "Виникла помилка при блокуванні користувача в цій спільноті."
 
 #. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
 #. TRANS: Client error displayed trying to find a user by ID without providing an ID.
-#: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr "Немає ID."
 
 #. TRANS: Client error displayed trying to change group design settings while not logged in.
-#: actions/groupdesignsettings.php:67
 msgid "You must be logged in to edit a group."
 msgstr ""
 "Ви маєте спочатку увійти, аби мати змогу відредагувати властивості спільноти."
 
 #. TRANS: Title group design settings page.
-#: actions/groupdesignsettings.php:146
 msgid "Group design"
 msgstr "Дизайн спільноти"
 
 #. TRANS: Instructions for group design settings page.
-#: actions/groupdesignsettings.php:157
 msgid ""
 "Customize the way your group looks with a background image and a colour "
 "palette of your choice."
@@ -2986,24 +2384,20 @@ msgstr ""
 "кольори на свій смак."
 
 #. TRANS: Form validation error displayed when group design settings could not be updated because of an application issue.
-#: actions/groupdesignsettings.php:262
 msgid "Unable to update your design settings."
 msgstr "Не вдалося оновити налаштування дизайну."
 
 #. TRANS: Form text to confirm saved group design settings.
-#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:239
 msgid "Design preferences saved."
 msgstr "Преференції дизайну збережно."
 
 #. TRANS: Title for group logo settings page.
 #. TRANS: Group logo form legend.
-#: actions/grouplogo.php:144 actions/grouplogo.php:199
 msgid "Group logo"
 msgstr "Логотип спільноти"
 
 #. TRANS: Instructions for group logo page.
 #. TRANS: %s is the maximum file size for that site.
-#: actions/grouplogo.php:156
 #, php-format
 msgid ""
 "You can upload a logo image for your group. The maximum file size is %s."
@@ -3012,98 +2406,81 @@ msgstr ""
 "розмір файлу становить %s."
 
 #. TRANS: Submit button for uploading a group logo.
-#: actions/grouplogo.php:243
 msgid "Upload"
 msgstr "Завантажити"
 
 #. TRANS: Button text for cropping an uploaded group logo.
-#: actions/grouplogo.php:299
 msgid "Crop"
 msgstr "Втяти"
 
 #. TRANS: Form instructions on the group logo page.
-#: actions/grouplogo.php:376
 msgid "Pick a square area of the image to be the logo."
 msgstr "Оберіть квадратну ділянку зображення, яка й буде логотипом спільноти."
 
 #. TRANS: Form success message after updating a group logo.
-#: actions/grouplogo.php:411
 msgid "Logo updated."
 msgstr "Логотип оновлено."
 
 #. TRANS: Form failure message after failing to update a group logo.
-#: actions/grouplogo.php:414
 msgid "Failed updating logo."
 msgstr "Оновлення логотипу завершилось невдачею."
 
 #. TRANS: Title of the page showing group members.
 #. TRANS: %s is the name of the group.
-#: actions/groupmembers.php:104
 #, php-format
 msgid "%s group members"
 msgstr "Учасники спільноти %s"
 
 #. TRANS: Title of the page showing group members.
 #. TRANS: %1$s is the name of the group, %2$d is the page number of the members list.
-#: actions/groupmembers.php:109
 #, php-format
 msgid "%1$s group members, page %2$d"
 msgstr "Учасники спільноти %1$s, сторінка %2$d"
 
 #. TRANS: Page notice for group members page.
-#: actions/groupmembers.php:125
 msgid "A list of the users in this group."
 msgstr "Список учасників цієї спільноти."
 
 #. TRANS: Indicator in group members list that this user is a group administrator.
-#: actions/groupmembers.php:190 lib/action.php:581
 msgid "Admin"
 msgstr "Адмін"
 
 #. TRANS: Button text for the form that will block a user from a group.
-#: actions/groupmembers.php:397
 msgctxt "BUTTON"
 msgid "Block"
 msgstr "Блок"
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:401
 msgctxt "TOOLTIP"
 msgid "Block this user"
 msgstr "Блокувати користувача"
 
 #. TRANS: Form legend for form to make a user a group admin.
-#: actions/groupmembers.php:488
 msgid "Make user an admin of the group"
 msgstr "Надати користувачеві права адміністратора"
 
 #. TRANS: Button text for the form that will make a user administrator.
-#: actions/groupmembers.php:521
 msgctxt "BUTTON"
 msgid "Make Admin"
 msgstr "Зробити адміном"
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:525
 msgctxt "TOOLTIP"
 msgid "Make this user an admin"
 msgstr "Надати цьому користувачеві права адміністратора"
 
 #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
-#: actions/grouprss.php:141
 #, php-format
 msgid "Updates from members of %1$s on %2$s!"
 msgstr "Оновлення членів %1$s на %2$s!"
 
 #. TRANS: Title for first page of the groups list.
-#: actions/groups.php:62
 msgctxt "TITLE"
 msgid "Groups"
 msgstr "Спільноти"
 
 #. TRANS: Title for all but the first page of the groups list.
 #. TRANS: %d is the page number.
-#: actions/groups.php:66
 #, php-format
 msgctxt "TITLE"
 msgid "Groups, page %d"
@@ -3112,7 +2489,6 @@ msgstr "Спільноти, сторінка %d"
 #. TRANS: Page notice of group list. %%%%site.name%%%% is the StatusNet site name,
 #. TRANS: %%%%action.groupsearch%%%% and %%%%action.newgroup%%%% are URLs. Do not change them.
 #. TRANS: This message contains Markdown links in the form [link text](link).
-#: actions/groups.php:95
 #, php-format
 msgid ""
 "%%%%site.name%%%% groups let you find and talk with people of similar "
@@ -3128,12 +2504,10 @@ msgstr ""
 "%%action.groupsearch%%%%) або [створіть власну!](%%%%action.newgroup%%%%)"
 
 #. TRANS: Link to create a new group on the group list page.
-#: actions/groups.php:113 actions/usergroups.php:126 lib/groupeditform.php:115
 msgid "Create a new group"
 msgstr "Створити нову спільноту"
 
 #. TRANS: Instructions for page where groups can be searched. %%site.name%% is the name of the StatusNet site.
-#: actions/groupsearch.php:53
 #, php-format
 msgid ""
 "Search for groups on %%site.name%% by their name, location, or description. "
@@ -3144,21 +2518,17 @@ msgstr ""
 "або більше."
 
 #. TRANS: Title for page where groups can be searched.
-#: actions/groupsearch.php:60
 msgid "Group search"
 msgstr "Пошук спільнот"
 
 #. TRANS: Text on page where groups can be searched if no results were found for a query.
 #. TRANS: Text for notice search results is the query had no results.
 #. TRANS: Message on the "People search" page where a query has no results.
-#: actions/groupsearch.php:82 actions/noticesearch.php:122
-#: actions/peoplesearch.php:87
 msgid "No results."
 msgstr "Немає результатів."
 
 #. TRANS: Additional text on page where groups can be searched if no results were found for a query for a logged in user.
 #. TRANS: This message contains Markdown links in the form [link text](link).
-#: actions/groupsearch.php:87
 #, php-format
 msgid ""
 "If you cannot find the group you're looking for, you can [create it](%%"
@@ -3169,7 +2539,6 @@ msgstr ""
 
 #. TRANS: Additional text on page where groups can be searched if no results were found for a query for a not logged in user.
 #. TRANS: This message contains Markdown links in the form [link text](link).
-#: actions/groupsearch.php:92
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and [create the group](%%"
@@ -3179,30 +2548,25 @@ msgstr ""
 "action.newgroup%%) свою власну спільноту!"
 
 #. TRANS: Client error displayed when trying to unblock a user from a group without being an administrator for the group.
-#: actions/groupunblock.php:95
 msgid "Only an admin can unblock group members."
 msgstr "Лише адміністратори можуть розблокувати учасників спільноти."
 
 #. TRANS: Client error displayed when trying to unblock a non-blocked user from a group.
-#: actions/groupunblock.php:100
 msgid "User is not blocked from group."
 msgstr "Користувача не блоковано."
 
 #. TRANS: Server error displayed when unblocking a user from a group fails because of an unknown error.
 #. TRANS: Server error displayed when removing a user block.
-#: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "Помилка при розблокуванні."
 
 #. TRANS: Title for Instant Messaging settings.
-#: actions/imsettings.php:56
 msgid "IM settings"
 msgstr "Налаштування ІМ"
 
 #. 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.
-#: actions/imsettings.php:69
 #, fuzzy, php-format
 msgid ""
 "You can send and receive notices through instant messaging [instant messages]"
@@ -3213,18 +2577,15 @@ msgstr ""
 "нижче."
 
 #. TRANS: Message given in the IM settings if IM is not enabled on the site.
-#: actions/imsettings.php:90
 msgid "IM is not available."
 msgstr "ІМ недоступний"
 
-#: actions/imsettings.php:116
 #, fuzzy, php-format
 msgid "Current confirmed %s address."
 msgstr "Поточна підтверджена поштова адреса."
 
 #. TRANS: Form note in IM settings form.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:128
 #, fuzzy, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your %s account for a message "
@@ -3234,36 +2595,30 @@ msgstr ""
 "акаунт, туди має надійти повідомлення з подальшими інструкціями. (Ви додали %"
 "s до вашого списку контактів?)"
 
-#: actions/imsettings.php:140
 msgid "IM address"
 msgstr "ІМ-адреса"
 
-#: actions/imsettings.php:142
 #, php-format
 msgid "%s screenname."
 msgstr ""
 
 #. TRANS: Header for IM preferences form.
-#: actions/imsettings.php:163
 #, fuzzy
 msgid "IM Preferences"
 msgstr "Преференції ІМ"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:174
 #, fuzzy
 msgid "Send me notices"
 msgstr "Надіслати допис"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:176
 #, fuzzy
 msgid "Post a notice when my status changes."
 msgstr ""
 "Надсилати дописи на сайт, коли мій статус Jabber/Google Talk змінюється."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:178
 #, fuzzy
 msgid "Send me replies from people I'm not subscribed to."
 msgstr ""
@@ -3271,54 +2626,45 @@ msgstr ""
 "підписаний."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:181
 #, fuzzy
 msgid "Publish a MicroID"
 msgstr "Позначати міткою MicroID мою електронну адресу."
 
 #. TRANS: Server error thrown on database error updating IM preferences.
-#: actions/imsettings.php:291
 #, fuzzy
 msgid "Couldn't update IM preferences."
 msgstr "Не вдалося оновити користувача."
 
 #. TRANS: Confirmation message for successful IM preferences save.
 #. TRANS: Confirmation message after saving preferences.
-#: actions/imsettings.php:298 actions/urlsettings.php:244
 msgid "Preferences saved."
 msgstr "Преференції збережно."
 
 #. TRANS: Message given saving IM address without having provided one.
-#: actions/imsettings.php:320
 #, fuzzy
 msgid "No screenname."
 msgstr "Немає імені."
 
-#: actions/imsettings.php:325
 #, fuzzy
 msgid "No transport."
 msgstr "Немає допису."
 
 #. TRANS: Message given saving IM address that cannot be normalised.
-#: actions/imsettings.php:333
 #, fuzzy
 msgid "Cannot normalize that screenname"
 msgstr "Не можна полагодити цей Jabber ID."
 
 #. TRANS: Message given saving IM address that not valid.
-#: actions/imsettings.php:340
 #, fuzzy
 msgid "Not a valid screenname"
 msgstr "Це недійсне ім’я користувача."
 
 #. TRANS: Message given saving IM address that is already set for another user.
-#: actions/imsettings.php:344
 #, fuzzy
 msgid "Screenname already belongs to another user."
 msgstr "Jabber ID вже належить іншому користувачу."
 
 #. TRANS: Message given saving valid IM address that is to be confirmed.
-#: actions/imsettings.php:369
 #, fuzzy
 msgid "A confirmation code was sent to the IM address you added."
 msgstr ""
@@ -3326,85 +2672,71 @@ msgstr ""
 "повинні затвердити %s для відправлення вам повідомлень."
 
 #. TRANS: Message given canceling IM address confirmation for the wrong IM address.
-#: actions/imsettings.php:396
 msgid "That is the wrong IM address."
 msgstr "Це помилкова адреса IM."
 
 #. TRANS: Server error thrown on database error canceling IM address confirmation.
-#: actions/imsettings.php:405
 #, fuzzy
 msgid "Couldn't delete confirmation."
 msgstr "Не вдалося видалити підтвердження ІМ-адреси."
 
 #. TRANS: Message given after successfully canceling IM address confirmation.
-#: actions/imsettings.php:410
 msgid "IM confirmation cancelled."
 msgstr "Підтвердження ІМ скасовано."
 
 #. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.
-#: actions/imsettings.php:434
 #, fuzzy
 msgid "That is not your screenname."
 msgstr "Це не ваш телефонний номер."
 
 #. TRANS: Server error thrown on database error removing a registered IM address.
-#: actions/imsettings.php:443
 #, fuzzy
 msgid "Couldn't update user im prefs."
 msgstr "Не вдалося оновити запис користувача."
 
 #. TRANS: Message given after successfully removing a registered Instant Messaging address.
-#: actions/imsettings.php:451
 msgid "The IM address was removed."
 msgstr "Адреса ІМ була видалена."
 
 #. TRANS: Title for all but the first page of the inbox page.
 #. TRANS: %1$s is the user's nickname, %2$s is the page number.
-#: actions/inbox.php:59
 #, php-format
 msgid "Inbox for %1$s - page %2$d"
 msgstr "Вхідні для %1$s — сторінка %2$d"
 
 #. TRANS: Title for the first page of the inbox page.
 #. TRANS: %s is the user's nickname.
-#: actions/inbox.php:64
 #, php-format
 msgid "Inbox for %s"
 msgstr "Вхідні для %s"
 
 #. TRANS: Instructions for user inbox page.
-#: actions/inbox.php:106
 msgid "This is your inbox, which lists your incoming private messages."
 msgstr ""
 "Це ваші вхідні повідомлення, тут містяться повідомлення надіслані приватно."
 
 #. TRANS: Client error displayed when trying to sent invites while they have been disabled.
-#: actions/invite.php:41
 msgid "Invites have been disabled."
 msgstr "Запрошення були скасовані."
 
 #. TRANS: Client error displayed when trying to sent invites while not logged in.
 #. TRANS: %s is the StatusNet site name.
-#: actions/invite.php:45
 #, php-format
 msgid "You must be logged in to invite other users to use %s."
 msgstr "Ви маєте спочатку увійти, аби мати змогу запросити когось до %s."
 
 #. TRANS: Form validation message when providing an e-mail address that does not validate.
 #. TRANS: %s is an invalid e-mail address.
-#: actions/invite.php:78
 #, php-format
 msgid "Invalid email address: %s."
 msgstr "Неправильна електронна адреса: %s."
 
 #. TRANS: Page title when invitations have been sent.
-#: actions/invite.php:117
 msgid "Invitations sent"
 msgstr "Запрошення надіслано"
 
 #. TRANS: Page title when inviting potential users.
-#: actions/invite.php:120
 msgid "Invite new users"
 msgstr "Запросити нових користувачів"
 
@@ -3412,7 +2744,6 @@ msgstr "Запросити нових користувачів"
 #. TRANS: is already subscribed to one or more users with the given e-mail address(es).
 #. TRANS: Plural form is based on the number of reported already subscribed e-mail addresses.
 #. TRANS: Followed by a bullet list.
-#: actions/invite.php:140
 msgid "You are already subscribed to this user:"
 msgid_plural "You are already subscribed to these users:"
 msgstr[0] "Ви вже підписані до цього користувача:"
@@ -3421,7 +2752,6 @@ msgstr[2] "Ви вже підписані до цих користувачів:"
 
 #. TRANS: Used as list item for already subscribed users (%1$s is nickname, %2$s is e-mail address).
 #. TRANS: Used as list item for already registered people (%1$s is nickname, %2$s is e-mail address).
-#: actions/invite.php:146 actions/invite.php:160
 #, php-format
 msgctxt "INVITE"
 msgid "%1$s (%2$s)"
@@ -3430,7 +2760,6 @@ msgstr "%1$s (%2$s)"
 #. TRANS: Message displayed inviting users to use a StatusNet site while the invited user
 #. TRANS: already uses a this StatusNet site. Plural form is based on the number of
 #. TRANS: reported already present people. Followed by a bullet list.
-#: actions/invite.php:154
 msgid "This person is already a user and you were automatically subscribed:"
 msgid_plural ""
 "These people are already users and you were automatically subscribed to them:"
@@ -3444,7 +2773,6 @@ msgstr[2] ""
 #. TRANS: Message displayed inviting users to use a StatusNet site. Plural form is
 #. TRANS: based on the number of invitations sent. Followed by a bullet list of
 #. TRANS: e-mail addresses to which invitations were sent.
-#: actions/invite.php:168
 msgid "Invitation sent to the following person:"
 msgid_plural "Invitations sent to the following people:"
 msgstr[0] "Запрошення було надіслано наступній особі:"
@@ -3453,7 +2781,6 @@ msgstr[2] "Запрошення були надіслані наступним 
 
 #. TRANS: Generic message displayed after sending out one or more invitations to
 #. TRANS: people to join a StatusNet site.
-#: actions/invite.php:178
 msgid ""
 "You will be notified when your invitees accept the invitation and register "
 "on the site. Thanks for growing the community!"
@@ -3462,7 +2789,6 @@ msgstr ""
 "і зареєструються на сайті. Дякуємо, що сприяєте формуванню спільноти!"
 
 #. TRANS: Form instructions.
-#: actions/invite.php:191
 msgid ""
 "Use this form to invite your friends and colleagues to use this service."
 msgstr ""
@@ -3470,28 +2796,24 @@ msgstr ""
 "сервісу."
 
 #. TRANS: Field label for a list of e-mail addresses.
-#: actions/invite.php:218
 msgid "Email addresses"
 msgstr "Електронні адреси"
 
 #. TRANS: Tooltip for field label for a list of e-mail addresses.
-#: actions/invite.php:221
 msgid "Addresses of friends to invite (one per line)."
 msgstr ""
 "Адреси друзів, куди надсилатимуться запрошення (кожна адреса окремим рядком)."
 
 #. TRANS: Field label for a personal message to send to invitees.
-#: actions/invite.php:225
 msgid "Personal message"
 msgstr "Особисті повідомлення"
 
 #. TRANS: Tooltip for field label for a personal message to send to invitees.
-#: actions/invite.php:228
 msgid "Optionally add a personal message to the invitation."
 msgstr "Можна додати персональне повідомлення до запрошення (опціонально)."
 
 #. TRANS: Send button for inviting friends
-#: actions/invite.php:232
+#. TRANS: Button text for sending notice.
 msgctxt "BUTTON"
 msgid "Send"
 msgstr "Надіслати"
@@ -3499,7 +2821,6 @@ msgstr "Надіслати"
 #. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral
 #. TRANS: singular 3rd-person pronoun in English. %1$s is the inviting user, $2$s is
 #. TRANS: the StatusNet sitename.
-#: actions/invite.php:264
 #, php-format
 msgid "%1$s has invited you to join them on %2$s"
 msgstr "%1$s запросив(ла) вас приєднатися до нього(неї) на %2$s"
@@ -3509,7 +2830,6 @@ msgstr "%1$s запросив(ла) вас приєднатися до ньог
 #. TRANS: StatusNet sitename, %3$s is the site URL, %4$s is the personal message from the
 #. TRANS: inviting user, %s%5 a link to the timeline for the inviting user, %s$6 is a link
 #. TRANS: to register with the StatusNet site.
-#: actions/invite.php:271
 #, php-format
 msgid ""
 "%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -3568,50 +2888,44 @@ msgstr ""
 "Щиро ваші, %2$s\n"
 
 #. TRANS: Client error displayed when trying to join a group while not logged in.
-#: actions/joingroup.php:59
 msgid "You must be logged in to join a group."
 msgstr "Ви повинні спочатку увійти на сайт, аби долучитися до спільноти."
 
 #. TRANS: Title for join group page after joining.
-#: actions/joingroup.php:148
 #, php-format
 msgctxt "TITLE"
 msgid "%1$s joined group %2$s"
 msgstr "%1$s приєднався до спільноти %2$s"
 
 #. TRANS: Client error displayed when trying to leave a group while not logged in.
-#: actions/leavegroup.php:59
 msgid "You must be logged in to leave a group."
 msgstr "Ви повинні спочатку увійти на сайт, аби залишити спільноту."
 
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
-#: actions/leavegroup.php:103 lib/command.php:398
 msgid "You are not a member of that group."
 msgstr "Ви не є учасником цієї спільноти."
 
 #. TRANS: Title for leave group page after leaving.
-#: actions/leavegroup.php:142
 #, php-format
 msgctxt "TITLE"
 msgid "%1$s left group %2$s"
 msgstr "%1$s залишив спільноту %2$s"
 
 #. TRANS: User admin panel title
-#: actions/licenseadminpanel.php:55
 msgctxt "TITLE"
 msgid "License"
 msgstr "Ліцензія"
 
-#: actions/licenseadminpanel.php:65
+#. TRANS: Form instructions for the site license admin panel.
 msgid "License for this StatusNet site"
 msgstr "Ліцензія для цього сайту StatusNet"
 
-#: actions/licenseadminpanel.php:134
+#. TRANS: Client error displayed selecting an invalid license in the license admin panel.
 msgid "Invalid license selection."
 msgstr "Невірний вибір ліцензії."
 
-#: actions/licenseadminpanel.php:144
+#. TRANS: Client error displayed when not specifying an owner for the all rights reserved license in the license admin panel.
 msgid ""
 "You must specify the owner of the content when using the All Rights Reserved "
 "license."
@@ -3619,134 +2933,135 @@ msgstr ""
 "Ви повинні зазначити власника змісту повідомлень, якщо збираєтесь "
 "використовувати варіант «Всі права захищені»."
 
-#: actions/licenseadminpanel.php:151
+#. TRANS: Client error displayed selecting a too long license title in the license admin panel.
 msgid "Invalid license title. Maximum length is 255 characters."
 msgstr "Помилкова назва ліцензії. Максимальна довжина — 255 символів."
 
-#: actions/licenseadminpanel.php:163
+#. TRANS: Client error displayed specifying an invalid license URL in the license admin panel.
 msgid "Invalid license URL."
 msgstr "Помилкова URL-адреса ліцензії."
 
-#: actions/licenseadminpanel.php:166
+#. TRANS: Client error displayed specifying an invalid license image URL in the license admin panel.
 msgid "Invalid license image URL."
 msgstr "Помилкова URL-адреса логотипу ліцензії."
 
-#: actions/licenseadminpanel.php:174
+#. TRANS: Client error displayed specifying an invalid license URL in the license admin panel.
 msgid "License URL must be blank or a valid URL."
 msgstr "Адреса ліцензії має бути порожньою або містити коректний URL."
 
-#: actions/licenseadminpanel.php:182
+#. TRANS: Client error displayed specifying an invalid license image URL in the license admin panel.
 msgid "License image must be blank or valid URL."
 msgstr "Адреса логотипу ліцензії має бути порожньою або містити коректний URL."
 
-#: actions/licenseadminpanel.php:232
+#. TRANS: Form legend in the license admin panel.
 msgid "License selection"
 msgstr "Вибір ліцензії"
 
-#: actions/licenseadminpanel.php:238
+#. TRANS: License option in the license admin panel.
 msgid "Private"
 msgstr "Приватно"
 
-#: actions/licenseadminpanel.php:239
+#. TRANS: License option in the license admin panel.
 msgid "All Rights Reserved"
 msgstr "Всі права захищені."
 
-#: actions/licenseadminpanel.php:240
+#. TRANS: License option in the license admin panel.
 msgid "Creative Commons"
 msgstr "Кріейтів Комонс"
 
-#: actions/licenseadminpanel.php:245
+#. TRANS: Dropdown field label in the license admin panel.
 msgid "Type"
 msgstr "Тип"
 
-#: actions/licenseadminpanel.php:247
-msgid "Select license"
+#. TRANS: Dropdown field instructions in the license admin panel.
+#, fuzzy
+msgid "Select a license."
 msgstr "Оберіть ліцензію"
 
-#: actions/licenseadminpanel.php:261
+#. TRANS: Form legend in the license admin panel.
 msgid "License details"
 msgstr "Подробиці ліцензії"
 
-#: actions/licenseadminpanel.php:267
+#. TRANS: Field label in the license admin panel.
 msgid "Owner"
 msgstr "Власник"
 
-#: actions/licenseadminpanel.php:268
+#. TRANS: Field title in the license admin panel.
 msgid "Name of the owner of the site's content (if applicable)."
 msgstr "Ім’я власника усього змісту на сайті (якщо він є)."
 
-#: actions/licenseadminpanel.php:276
+#. TRANS: Field label in the license admin panel.
 msgid "License Title"
 msgstr "Назва ліцензії"
 
-#: actions/licenseadminpanel.php:277
+#. TRANS: Field title in the license admin panel.
 msgid "The title of the license."
 msgstr "Назва ліцензії."
 
-#: actions/licenseadminpanel.php:285
+#. TRANS: Field label in the license admin panel.
 msgid "License URL"
 msgstr "URL-адреса ліцензії"
 
-#: actions/licenseadminpanel.php:286
+#. TRANS: Field title in the license admin panel.
 msgid "URL for more information about the license."
 msgstr "URL-адреса додаткової інформації щодо ліцензії."
 
-#: actions/licenseadminpanel.php:293
+#. TRANS: Field label in the license admin panel.
 msgid "License Image URL"
 msgstr "URL-адреса логотипу ліцензії"
 
-#: actions/licenseadminpanel.php:294
+#. TRANS: Field title in the license admin panel.
 msgid "URL for an image to display with the license."
 msgstr "URL-адреса зображення (логотипу) для показу поруч з ліцензією"
 
-#. TRANS: Submit button title.
-#: actions/licenseadminpanel.php:311 actions/sessionsadminpanel.php:199
-#: actions/siteadminpanel.php:292 actions/snapshotadminpanel.php:245
-#: actions/tagother.php:133 lib/applicationeditform.php:357
-msgid "Save"
-msgstr "Зберегти"
-
-#: actions/licenseadminpanel.php:311
-msgid "Save license settings"
+#. TRANS: Button title in the license admin panel.
+#, fuzzy
+msgid "Save license settings."
 msgstr "Зберегти налаштування ліцензії"
 
+#. TRANS: Client error displayed when trying to log in while already logged in.
 #. TRANS: Client error displayed trying to use "one time password login" when already logged in.
-#: actions/login.php:97 actions/otp.php:62 actions/register.php:130
 msgid "Already logged in."
 msgstr "Тепер ви увійшли."
 
-#: actions/login.php:125
+#. TRANS: Form validation error displayed when trying to log in with incorrect credentials.
 msgid "Incorrect username or password."
 msgstr "Неточне ім’я або пароль."
 
+#. TRANS: Server error displayed when during login a server error occurs.
 #. TRANS: Server error displayed when a user object could not be created trying to login using "one time password login".
-#: actions/login.php:131 actions/otp.php:127
 msgid "Error setting user. You are probably not authorized."
 msgstr "Помилка. Можливо, ви не авторизовані."
 
-#: actions/login.php:185 actions/login.php:236 lib/action.php:598
+#. TRANS: Page title for login page.
 msgid "Login"
 msgstr "Увійти"
 
-#: actions/login.php:222
+#. TRANS: Form legend on login page.
 msgid "Login to site"
 msgstr "Вхід на сайт"
 
-#: actions/login.php:231 actions/register.php:469
+#. TRANS: Checkbox label label on login page.
 msgid "Remember me"
 msgstr "Пам’ятати мене"
 
-#: actions/login.php:232 actions/register.php:471
+#. TRANS: Checkbox title on login page.
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 "Автоматично входити у майбутньому; не для комп’ютерів загального "
 "користування!"
 
-#: actions/login.php:241
+#. TRANS: Button text for log in on login page.
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Login"
+msgstr "Увійти"
+
+#. TRANS: Link text for link to "reset password" on login page.
 msgid "Lost or forgotten password?"
 msgstr "Загубили або забули пароль?"
 
-#: actions/login.php:259
+#. TRANS: Form instructions on login page before being able to change user settings.
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -3754,11 +3069,12 @@ msgstr ""
 "З міркувань безпеки, будь ласка, введіть ще раз ім’я та пароль, перед тим як "
 "змінювати налаштування."
 
-#: actions/login.php:263
+#. TRANS: Form instructions on login page.
 msgid "Login with your username and password."
 msgstr "Увійти використовуючи ім’я та пароль."
 
-#: actions/login.php:266
+#. TRANS: Form instructions on login page. This message contains Markdown links in the form [Link text](Link).
+#. TRANS: %%action.register%% is a link to the registration page.
 #, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -3766,130 +3082,125 @@ msgstr ""
 "Ще не маєте імені користувача? [Зареєструвати](%%action.register%%) новий "
 "акаунт."
 
-#: actions/makeadmin.php:92
+#. TRANS: Client error displayed when trying to make another user admin on the Make Admin page while not an admin.
 msgid "Only an admin can make another user an admin."
 msgstr ""
 "Лише користувач з правами адміністратора може призначати інших "
 "адміністраторів спільноти."
 
-#: actions/makeadmin.php:96
+#. TRANS: Client error displayed when trying to make another user admin on the Make Admin page who already is admin.
+#. TRANS: %1$s is the user that is already admin, %2$s is the group user is already admin for.
 #, php-format
 msgid "%1$s is already an admin for group \"%2$s\"."
 msgstr "%1$s вже є адміністратором спільноти «%2$s»."
 
-#: actions/makeadmin.php:133
+#. TRANS: Server error displayed when trying to make another user admin on the Make Admin page fails
+#. TRANS: because the group membership record could not be gotten.
+#. TRANS: %1$s is the to be admin user, %2$s is the group user should be admin for.
 #, php-format
 msgid "Can't get membership record for %1$s in group %2$s."
 msgstr ""
 "Не можна отримати запис для %1$s щодо його перебування у спільноті %2$s."
 
-#: actions/makeadmin.php:146
+#. TRANS: Server error displayed when trying to make another user admin on the Make Admin page fails
+#. TRANS: because the group adminship record coud not be saved properly.
+#. TRANS: %1$s is the to be admin user, %2$s is the group user is already admin for.
 #, php-format
 msgid "Can't make %1$s an admin for group %2$s."
 msgstr "Не можна надати %1$s права адміністратора у спільноті %2$s."
 
-#: actions/microsummary.php:69
+#. TRANS: Client error displayed trying to make a micro summary without providing a status.
 msgid "No current status."
 msgstr "Жодного поточного статусу."
 
 #. TRANS: This is the title of the form for adding a new application.
-#: actions/newapplication.php:52
 msgid "New application"
 msgstr "Новий додаток"
 
 #. TRANS: Client error displayed trying to add a new application while not logged in.
-#: actions/newapplication.php:64
 msgid "You must be logged in to register an application."
 msgstr "Ви маєте спочатку увійти, аби мати змогу зареєструвати додаток."
 
 #. TRANS: Form instructions for registering a new application.
-#: actions/newapplication.php:147
 msgid "Use this form to register a new application."
 msgstr "Скористайтесь цією формою, щоб зареєструвати новий додаток."
 
 #. TRANS: Validation error shown when not providing a source URL in the "New application" form.
-#: actions/newapplication.php:189
 msgid "Source URL is required."
 msgstr "Потрібна URL-адреса."
 
 #. TRANS: Server error displayed when an application could not be registered in the database through the "New application" form.
-#: actions/newapplication.php:279 actions/newapplication.php:289
 msgid "Could not create application."
 msgstr "Не вдалося створити додаток."
 
 #. TRANS: Title for form to create a group.
-#: actions/newgroup.php:53
 msgid "New group"
 msgstr "Нова спільнота"
 
 #. TRANS: Client exception thrown when a user tries to create a group while banned.
-#: actions/newgroup.php:73 classes/User_group.php:485
 msgid "You are not allowed to create groups on this site."
 msgstr "Вам не дозволено створювати нові спільноті на цьому сайті."
 
 #. TRANS: Form instructions for group create form.
-#: actions/newgroup.php:117
 msgid "Use this form to create a new group."
 msgstr "Скористайтесь цією формою для створення нової спільноти."
 
-#. TRANS: Group create form validation error.
-#: actions/newgroup.php:200
-msgid "Alias cannot be the same as nickname."
-msgstr "Додаткове ім’я не може збігатися з псевдонімом."
-
-#: actions/newmessage.php:71 actions/newmessage.php:234
+#. TRANS: Page title for new direct message page.
+#. TRANS: Page title on page for sending a direct message.
 msgid "New message"
 msgstr "Нове повідомлення"
 
-#. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
-#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:513
-msgid "You can't send a message to this user."
+#. TRANS: Client error displayed trying to send a direct message to a user while sender and
+#. TRANS: receiver are not subscribed to each other.
+#, fuzzy
+msgid "You cannot send a message to this user."
 msgstr "Ви не можете надіслати повідомлення цьому користувачеві."
 
+#. TRANS: Form validator error displayed trying to send a direct message without content.
+#. TRANS: Client error displayed trying to send a notice without content.
 #. TRANS: Command exception text shown when trying to send a direct message to another user without content.
 #. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
-#: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:490
-#: lib/command.php:593
 msgid "No content!"
 msgstr "Немає змісту!"
 
-#: actions/newmessage.php:161
+#. TRANS: Form validation error displayed trying to send a direct message without specifying a recipient.
 msgid "No recipient specified."
 msgstr "Жодного отримувача не визначено."
 
+#. TRANS: Client error displayed trying to send a direct message to self.
 #. TRANS: Error text shown when trying to send a direct message to self.
-#: actions/newmessage.php:167 lib/command.php:517
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
 "Не надсилайте повідомлень самому собі; краще поговоріть із собою вголос."
 
-#: actions/newmessage.php:184
+#. TRANS: Page title after sending a direct message.
 msgid "Message sent"
 msgstr "Повідомлення надіслано"
 
+#. TRANS: Confirmation text after sending a direct message.
+#. TRANS: %s is the direct message recipient.
 #. TRANS: Message given have sent a direct message to another user.
 #. TRANS: %s is the name of the other user.
-#: actions/newmessage.php:188 lib/command.php:525
 #, php-format
 msgid "Direct message to %s sent."
 msgstr "Пряме повідомлення для %s надіслано."
 
-#: actions/newmessage.php:213 actions/newnotice.php:264
+#. TRANS: Page title after an AJAX error occurred on the "send direct message" page.
+#. TRANS: Page title after an AJAX error occurs on the send notice page.
 msgid "Ajax Error"
 msgstr "Помилка в Ajax"
 
-#: actions/newnotice.php:69
+#. TRANS: Page title for sending a new notice.
 msgid "New notice"
 msgstr "Новий допис"
 
-#: actions/newnotice.php:230
+#. TRANS: Page title after sending a notice.
 msgid "Notice posted"
 msgstr "Допис надіслано"
 
 #. TRANS: Instructions for Notice search page.
 #. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/noticesearch.php:69
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -3899,20 +3210,17 @@ msgstr ""
 "інтервалами; вони повинні складатись з 3 знаків або більше."
 
 #. TRANS: Title of the page where users can search for notices.
-#: actions/noticesearch.php:80
 msgid "Text search"
 msgstr "Пошук текстів"
 
 #. TRANS: Test in RSS notice search.
 #. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearch.php:95
 #, php-format
 msgid "Search results for \"%1$s\" on %2$s"
 msgstr "Результати пошуку «%1$s» на сайті %2$s"
 
 #. TRANS: Text for logged in users making a query for notices without results.
 #. TRANS: This message contains a Markdown link.
-#: actions/noticesearch.php:128
 #, php-format
 msgid ""
 "Be the first to [post on this topic](%%%%action.newnotice%%%%?"
@@ -3923,7 +3231,6 @@ msgstr ""
 
 #. TRANS: Text for not logged in users making a query for notices without results.
 #. TRANS: This message contains Markdown links.
-#: actions/noticesearch.php:133
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and be the first to "
@@ -3933,19 +3240,17 @@ msgstr ""
 "[допис до цього топіку](%%%%action.newnotice%%%%?status_textarea=%s)!"
 
 #. TRANS: RSS notice search feed title. %s is the query.
-#: actions/noticesearchrss.php:95
 #, php-format
 msgid "Updates with \"%s\""
 msgstr "Оновлення з «%s»"
 
 #. TRANS: RSS notice search feed description.
 #. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearchrss.php:99
 #, php-format
 msgid "Updates matching search term \"%1$s\" on %2$s."
 msgstr "Всі оновлення за збігом з «%1$s» на %2$s."
 
-#: actions/nudge.php:85
+#. TRANS: Client error displayed trying to nudge a user that cannot be nudged.
 msgid ""
 "This user doesn't allow nudges or hasn't confirmed or set their email "
 "address yet."
@@ -3953,60 +3258,51 @@ msgstr ""
 "Цей користувач не дозволив себе «розштовхувати», або не підтвердив чи не "
 "налаштував преференції електронної пошти."
 
-#: actions/nudge.php:94
+#. TRANS: Page title after sending a nudge.
 msgid "Nudge sent"
 msgstr "Спробу «розштовхати» зараховано"
 
-#: actions/nudge.php:97
+#. TRANS: Confirmation text after sending a nudge.
 msgid "Nudge sent!"
 msgstr "Спробу «розштовхати» зараховано!"
 
 #. TRANS: Message displayed to an anonymous user trying to view OAuth application list.
-#: actions/oauthappssettings.php:57
 msgid "You must be logged in to list your applications."
 msgstr "Ви повинні увійти, аби переглянути список ваших додатків."
 
 #. TRANS: Page title for OAuth applications
-#: actions/oauthappssettings.php:73
 msgid "OAuth applications"
 msgstr "Додатки OAuth"
 
 #. TRANS: Page instructions for OAuth applications
-#: actions/oauthappssettings.php:85
 msgid "Applications you have registered"
 msgstr "Додатки, які ви зареєстрували"
 
 #. TRANS: Empty list message on page with OAuth applications.
-#: actions/oauthappssettings.php:138
 #, php-format
 msgid "You have not registered any applications yet."
 msgstr "Поки що ви не зареєстрували жодних додатків."
 
 #. TRANS: Title for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:69
 msgid "Connected applications"
 msgstr "Під’єднані додатки"
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:80
 msgid "The following connections exist for your account."
 msgstr "Наступні з’єднання вже існують для вашого профілю."
 
 #. TRANS: Client error when trying to revoke access for an application while not being a user of it.
-#: actions/oauthconnectionssettings.php:165
 msgid "You are not a user of that application."
 msgstr "Ви не є користувачем даного додатку."
 
 #. TRANS: Client error when revoking access has failed for some reason.
 #. TRANS: %s is the application ID revoking access failed for.
-#: actions/oauthconnectionssettings.php:180
 #, php-format
 msgid "Unable to revoke access for application: %s."
 msgstr "Неможливо скасувати доступ для додатку: %s."
 
 #. TRANS: Success message after revoking access for an application.
 #. TRANS: %1$s is the application name, %2$s is the first part of the user token.
-#: actions/oauthconnectionssettings.php:199
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -4016,14 +3312,12 @@ msgstr ""
 "$s."
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:210
 msgid "You have not authorized any applications to use your account."
 msgstr "Ви не дозволили жодним додаткам використовувати ваш акаунт."
 
 #. TRANS: Note for developers in the OAuth connection settings form.
 #. TRANS: This message contains a Markdown link. Do not separate "](".
 #. TRANS: %s is the URL to the OAuth settings.
-#: actions/oauthconnectionssettings.php:230
 #, php-format
 msgid ""
 "Are you a developer? [Register an OAuth client application](%s) to use with "
@@ -4032,440 +3326,359 @@ msgstr ""
 "Ви — розробник? [Зареєструйте клієнтський додаток OAuth](%s) щоб "
 "користуватися ним на даному сайті StatusNet."
 
-#: actions/oembed.php:64
+#. TRANS: Server error displayed in oEmbed action when path not found.
+#. TRANS: %s is a path.
 #, php-format
 msgid "\"%s\" not found."
 msgstr "«%s» не знайдено."
 
-#: actions/oembed.php:76
+#. TRANS: Server error displayed in oEmbed action when notice not found.
+#. TRANS: %s is a notice.
 #, php-format
 msgid "Notice %s not found."
 msgstr "Допис %s не знайдено."
 
-#: actions/oembed.php:80 actions/shownotice.php:100
+#. TRANS: Server error displayed in oEmbed action when notice has not profile.
 msgid "Notice has no profile."
 msgstr "Допис не має профілю."
 
-#: actions/oembed.php:83 actions/shownotice.php:172
+#. TRANS: oEmbed title. %1$s is the author name, %2$s is the creation date.
 #, php-format
 msgid "%1$s's status on %2$s"
 msgstr "%1$s має статус на %2$s"
 
-#: actions/oembed.php:95
+#. TRANS: Server error displayed in oEmbed action when attachment not found.
+#. TRANS: %d is an attachment ID.
 #, php-format
 msgid "Attachment %s not found."
 msgstr "Вкладення %s не знайдено."
 
-#: actions/oembed.php:136
+#. TRANS: Server error displayed in oEmbed request when a path is not supported.
+#. TRANS: %s is a path.
 #, php-format
 msgid "\"%s\" not supported for oembed requests."
 msgstr "«%s» не підтримується для oembed-запитів."
 
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
-#: actions/oembed.php:168
 #, php-format
 msgid "Content type %s not supported."
 msgstr "Тип змісту %s не підтримується."
 
 #. TRANS: Error message displaying attachments. %s is the site's base URL.
-#: actions/oembed.php:172
 #, php-format
 msgid "Only %s URLs over plain HTTP please."
 msgstr "URL-адреса %s лише в простому HTTP, будь ласка."
 
+#. TRANS: Server error displayed in oEmbed action when request specifies an unsupported data format.
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1207
-#: lib/apiaction.php:1234 lib/apiaction.php:1369
 msgid "Not a supported data format."
 msgstr "Такий формат даних не підтримується."
 
 #. TRANS: ShortName in the OpenSearch interface when trying to find users.
-#: actions/opensearch.php:64
 msgid "People Search"
 msgstr "Пошук людей"
 
-#: actions/opensearch.php:68
+#. TRANS: ShortName in the OpenSearch interface when trying to find notices.
 msgid "Notice Search"
 msgstr "Пошук дописів"
 
 #. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
-#: actions/otp.php:70
 msgid "No user ID specified."
 msgstr "ID користувача не визначено."
 
 #. TRANS: Client error displayed trying to use "one time password login" without specifying a login token.
-#: actions/otp.php:86
 msgid "No login token specified."
 msgstr "Токен для входу не визначено."
 
 #. TRANS: Client error displayed trying to use "one time password login" without requesting a login token.
-#: actions/otp.php:94
 msgid "No login token requested."
 msgstr "Токен для входу у запиті відсутній."
 
 #. TRANS: Client error displayed trying to use "one time password login" while specifying an invalid login token.
-#: actions/otp.php:100
 msgid "Invalid login token specified."
 msgstr "Токен для входу визначено як неправильний."
 
 #. TRANS: Client error displayed trying to use "one time password login" while specifying an expired login token.
-#: actions/otp.php:110
 msgid "Login token expired."
 msgstr "Токен для входу втратив чинність."
 
 #. TRANS: Title for outbox for any but the fist page.
 #. TRANS: %1$s is the user nickname, %2$d is the page number.
-#: actions/outbox.php:57
 #, php-format
 msgid "Outbox for %1$s - page %2$d"
 msgstr "Вихідні для %1$s — сторінка %2$d"
 
 #. TRANS: Title for first page of outbox.
-#: actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
 msgstr "Вихідні для %s"
 
 #. TRANS: Instructions for outbox.
-#: actions/outbox.php:103
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr ""
 "Це ваші вихідні повідомлення, тут містяться повідомлення, які ви надіслали "
 "приватно."
 
-#: actions/passwordsettings.php:58
 msgid "Change password"
 msgstr "Змінити пароль"
 
-#: actions/passwordsettings.php:69
 msgid "Change your password."
 msgstr "Змінити пароль."
 
 #. TRANS: Fieldset legend for password reset form.
-#: actions/passwordsettings.php:96 actions/recoverpassword.php:251
 msgid "Password change"
 msgstr "Пароль замінено"
 
-#: actions/passwordsettings.php:104
 msgid "Old password"
 msgstr "Старий пароль"
 
 #. TRANS: Field label for password reset form.
-#: actions/passwordsettings.php:108 actions/recoverpassword.php:256
 msgid "New password"
 msgstr "Новий пароль"
 
-#: actions/passwordsettings.php:109 actions/register.php:416
 msgid "6 or more characters."
 msgstr "6 або більше знаків."
 
 #. TRANS: Ttile for field label for password reset form where the password has to be typed again.
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:264
-#: actions/register.php:420
 msgid "Same as password above."
 msgstr "Такий само, як і пароль вище."
 
-#: actions/passwordsettings.php:117
 msgid "Change"
 msgstr "Змінити"
 
-#: actions/passwordsettings.php:153 actions/register.php:223
 msgid "Password must be 6 or more characters."
 msgstr "Пароль має складатись з 6-ти або більше знаків."
 
-#: actions/passwordsettings.php:156 actions/register.php:226
 msgid "Passwords don't match."
 msgstr "Паролі не співпадають."
 
-#: actions/passwordsettings.php:164
 msgid "Incorrect old password"
 msgstr "Старий пароль є неточним"
 
-#: actions/passwordsettings.php:180
 msgid "Error saving user; invalid."
 msgstr "Помилка при збереженні користувача; недійсний."
 
 #. TRANS: Reset password form validation error message.
-#: actions/passwordsettings.php:185 actions/recoverpassword.php:418
 msgid "Cannot save new password."
 msgstr "Не вдається зберегти новий пароль."
 
-#: actions/passwordsettings.php:191
 msgid "Password saved."
 msgstr "Пароль збережено."
 
 #. TRANS: Title for Paths admin panel.
 #. TRANS: Menu item for site administration
-#: actions/pathsadminpanel.php:58 lib/adminpanelaction.php:371
 msgid "Paths"
 msgstr "Шлях"
 
 #. TRANS: Form instructions for Path admin panel.
-#: actions/pathsadminpanel.php:69
 msgid "Path and server settings for this StatusNet site"
 msgstr "Параметри серверу та шляху для даного сайту StatusNet"
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the directory that could not be read from.
-#: actions/pathsadminpanel.php:155
 #, php-format
 msgid "Theme directory not readable: %s."
 msgstr "Директорію теми не можна прочитати: %s."
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the avatar directory that could not be written to.
-#: actions/pathsadminpanel.php:163
 #, php-format
 msgid "Avatar directory not writable: %s."
 msgstr "Директорія аватарів не доступна для запису: %s."
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the background directory that could not be written to.
-#: actions/pathsadminpanel.php:171
 #, php-format
 msgid "Background directory not writable: %s."
 msgstr "Директорія фонових зображень не доступна для запису:% s."
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the locales directory that could not be read from.
-#: actions/pathsadminpanel.php:181
 #, php-format
 msgid "Locales directory not readable: %s."
 msgstr "Не можна прочитати директорію локалі: %s."
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the SSL server URL that is too long.
-#: actions/pathsadminpanel.php:189
 msgid "Invalid SSL server. The maximum length is 255 characters."
 msgstr "Помилковий SSL-сервер. Максимальна довжина 255 знаків."
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:235 actions/siteadminpanel.php:58
 msgid "Site"
 msgstr "Сайт"
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:241 actions/pathsadminpanel.php:279
-#: actions/pathsadminpanel.php:370 actions/pathsadminpanel.php:425
 msgid "Server"
 msgstr "Сервер"
 
-#: actions/pathsadminpanel.php:242
 msgid "Site's server hostname."
 msgstr "Ім’я хосту сервера на якому знаходиться сайт."
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:248 actions/pathsadminpanel.php:288
-#: actions/pathsadminpanel.php:379 actions/pathsadminpanel.php:434
 msgid "Path"
 msgstr "Шлях"
 
-#: actions/pathsadminpanel.php:249
 msgid "Site path."
 msgstr "Шлях до сайту."
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:255
 msgid "Locale directory"
 msgstr "Директорія локалі"
 
-#: actions/pathsadminpanel.php:256
 msgid "Directory path to locales."
 msgstr "Шлях до директорії локалей."
 
 #. TRANS: Checkbox label in Paths admin panel.
-#: actions/pathsadminpanel.php:263
 msgid "Fancy URLs"
 msgstr "Надзвичайні URL-адреси"
 
-#: actions/pathsadminpanel.php:265
 msgid "Use fancy (more readable and memorable) URLs?"
 msgstr "Використовувати надзвичайні (найбільш пам’ятні і визначні) URL-адреси?"
 
-#: actions/pathsadminpanel.php:272
 msgid "Theme"
 msgstr "Тема"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:281
 msgid "Server for themes."
 msgstr "Сервер для тем."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:290
 msgid "Web path to themes."
 msgstr "Шлях до тем."
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:297 actions/pathsadminpanel.php:388
-#: actions/pathsadminpanel.php:443 actions/pathsadminpanel.php:495
 msgid "SSL server"
 msgstr "SSL-сервер"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:299
 msgid "SSL server for themes (default: SSL server)."
 msgstr "SSL-сервер для тем (за замовчуванням: SSL-сервер)."
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:306 actions/pathsadminpanel.php:397
-#: actions/pathsadminpanel.php:452
 msgid "SSL path"
 msgstr "Шлях з SSL"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:308
 msgid "SSL path to themes (default: /theme/)."
 msgstr "SSL-шлях до тем (за замовчуванням: /theme/)."
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:315 actions/pathsadminpanel.php:406
-#: actions/pathsadminpanel.php:461
 msgid "Directory"
 msgstr "Директорія"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:317
 msgid "Directory where themes are located."
 msgstr "Директорія, в якій знаходяться теми."
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:326
 msgid "Avatars"
 msgstr "Аватари"
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:333
 msgid "Avatar server"
 msgstr "Сервер аватари"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:335
 msgid "Server for avatars."
 msgstr "Сервер для аватар."
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:342
 msgid "Avatar path"
 msgstr "Шлях до аватари"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:344
 msgid "Web path to avatars."
 msgstr "Шлях до аватар."
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:351
 msgid "Avatar directory"
 msgstr "Директорія аватари"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:353
 msgid "Directory where avatars are located."
 msgstr "Директорія, в якій знаходяться аватари."
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:364
 msgid "Backgrounds"
 msgstr "Фони"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:372
 msgid "Server for backgrounds."
 msgstr "Сервер для фонових зображень."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:381
 msgid "Web path to backgrounds."
 msgstr "Шлях до фонових зображень."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:390
 msgid "Server for backgrounds on SSL pages."
 msgstr "Сервер для фонових зображень на захищених SSL-сторінках."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:399
 msgid "Web path to backgrounds on SSL pages."
 msgstr "Шлях до фонових зображень на захищених SSL-сторінках."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:408
 msgid "Directory where backgrounds are located."
 msgstr "Директорія, в якій знаходяться фонові зображення."
 
 #. TRANS: Fieldset legens in Paths admin panel.
-#: actions/pathsadminpanel.php:419
 msgid "Attachments"
 msgstr "Вкладення"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:427
 msgid "Server for attachments."
 msgstr "Сервер для вкладень."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:436
 msgid "Web path to attachments."
 msgstr "Шлях до вкладень."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:445
 msgid "Server for attachments on SSL pages."
 msgstr "Сервер для вкладень на захищених SSL-сторінках."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:454
 msgid "Web path to attachments on SSL pages."
 msgstr "Шлях до вкладень на захищених SSL-сторінках."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:463
 msgid "Directory where attachments are located."
 msgstr "Директорія, в якій знаходяться вкладення."
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:472
 msgid "SSL"
 msgstr "SSL-шифрування"
 
 #. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
-#: actions/pathsadminpanel.php:477 actions/snapshotadminpanel.php:202
 msgid "Never"
 msgstr "Ніколи"
 
 #. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
-#: actions/pathsadminpanel.php:479
 msgid "Sometimes"
 msgstr "Іноді"
 
 #. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
-#: actions/pathsadminpanel.php:481
 msgid "Always"
 msgstr "Завжди"
 
-#: actions/pathsadminpanel.php:485
 msgid "Use SSL"
 msgstr "Використовувати SSL"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:487
 msgid "When to use SSL."
 msgstr "Коли використовувати SSL."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:497
 msgid "Server to direct SSL requests to."
 msgstr "Сервер на який направляти SSL-запити."
 
 #. TRANS: Button title text to store form data in the Paths admin panel.
-#: actions/pathsadminpanel.php:514
 msgid "Save paths"
 msgstr "Зберегти шляхи"
 
 #. TRANS: Instructions for the "People search" page.
 #. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/peoplesearch.php:54
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
@@ -4476,57 +3689,46 @@ msgstr ""
 "або більше."
 
 #. TRANS: Title of a page where users can search for other users.
-#: actions/peoplesearch.php:61
 msgid "People search"
 msgstr "Пошук людей"
 
-#: actions/peopletag.php:68
 #, php-format
 msgid "Not a valid people tag: %s."
 msgstr "Це недійсний особистий теґ: %s."
 
-#: actions/peopletag.php:142
 #, php-format
 msgid "Users self-tagged with %1$s - page %2$d"
 msgstr "Користувачі з особистим теґом «%1$s» — сторінка %2$d"
 
 #. TRANS: Page title for AJAX form return when a disabling a plugin.
-#: actions/plugindisable.php:69
 msgctxt "plugin"
 msgid "Disabled"
 msgstr ""
 
 #. TRANS: Client error displayed trying to perform any request method other than POST.
 #. TRANS: Do not translate POST.
-#: actions/pluginenable.php:78 actions/subscribe.php:77
 msgid "This action only accepts POST requests."
 msgstr "Ця дія приймає лише запити POST."
 
-#: actions/pluginenable.php:102
 #, fuzzy
 msgid "You cannot administer plugins."
 msgstr "Ви не можете видаляти користувачів."
 
-#: actions/pluginenable.php:109
 #, fuzzy
 msgid "No such plugin."
 msgstr "Немає такої сторінки."
 
 #. TRANS: Page title for AJAX form return when enabling a plugin.
-#: actions/pluginenable.php:159
 msgctxt "plugin"
 msgid "Enabled"
 msgstr ""
 
 #. TRANS: Tab and title for plugins admin panel.
 #. TRANS: Menu item for site administration
-#: actions/pluginsadminpanel.php:56 actions/version.php:191
-#: lib/adminpanelaction.php:411
 msgid "Plugins"
 msgstr "Додатки"
 
 #. TRANS: Instructions at top of plugin admin page.
-#: actions/pluginsadminpanel.php:68
 msgid ""
 "Additional plugins can be enabled and configured manually. See the <a href="
 "\"http://status.net/wiki/Plugins\">online plugin documentation</a> for more "
@@ -4534,69 +3736,55 @@ msgid ""
 msgstr ""
 
 #. TRANS: Admin form section header
-#: actions/pluginsadminpanel.php:84
 #, fuzzy
 msgid "Default plugins"
 msgstr "Мова за замовчуванням"
 
-#: actions/pluginsadminpanel.php:106
 msgid ""
 "All default plugins have been disabled from the site's configuration file."
 msgstr ""
 
-#: actions/postnotice.php:95
 msgid "Invalid notice content."
 msgstr "Недійсний зміст допису."
 
-#: actions/postnotice.php:101
 #, php-format
 msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’."
 msgstr "Ліцензія допису «%1$s» є несумісною з ліцензією сайту «%2$s»."
 
 #. TRANS: Page title for profile settings.
-#: actions/profilesettings.php:60
 msgid "Profile settings"
 msgstr "Налаштування профілю"
 
 #. TRANS: Usage instructions for profile settings.
-#: actions/profilesettings.php:71
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
 "Ви можете заповнити свій особистий профіль і люди знатимуть про вас більше."
 
 #. TRANS: Profile settings form legend.
-#: actions/profilesettings.php:99
 msgid "Profile information"
 msgstr "Інформація профілю"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:110 actions/register.php:412
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr "1-64 рядкових літер і цифр, ніякої пунктуації або інтервалів."
 
 #. TRANS: Field label in form for profile settings.
-#: actions/profilesettings.php:114 actions/register.php:434
-#: lib/groupeditform.php:150
 msgid "Full name"
 msgstr "Повне ім’я"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:119 actions/register.php:439
-#: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "Веб-сторінка"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:122 actions/register.php:441
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr "URL-адреса вашої веб-сторінки, блоґу, або профілю на іншому сайті."
 
 #. TRANS: Tooltip for field label in form for profile settings. Plural
 #. TRANS: is decided by the number of characters available for the
 #. TRANS: biography (%d).
-#: actions/profilesettings.php:130 actions/register.php:450
 #, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4605,41 +3793,31 @@ msgstr[1] "Опишіть себе та свої інтереси інтерес
 msgstr[2] "Опишіть себе та свої інтереси інтереси вкладаючись у %d символів"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:136 actions/register.php:455
 msgid "Describe yourself and your interests"
 msgstr "Опишіть себе та свої інтереси"
 
 #. TRANS: Text area label in form for profile settings where users can provide.
 #. TRANS: their biography.
-#: actions/profilesettings.php:140 actions/register.php:457
 msgid "Bio"
 msgstr "Про себе"
 
 #. TRANS: Field label in form for profile settings.
-#: actions/profilesettings.php:146 actions/register.php:462
-#: lib/groupeditform.php:173
 msgid "Location"
 msgstr "Розташування"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:149
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Де ви живете, на кшталт «Місто, область (регіон), країна»"
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:154
 msgid "Share my current location when posting notices"
 msgstr "Показувати моє місцезнаходження при надсиланні дописів"
 
 #. TRANS: Field label in form for profile settings.
-#: actions/profilesettings.php:162 actions/tagother.php:128
-#: actions/tagother.php:188 lib/subscriptionlist.php:104
-#: lib/subscriptionlist.php:106
 msgid "Tags"
 msgstr "Теґи"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:165
 msgid ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- "
 "separated."
@@ -4648,27 +3826,22 @@ msgstr ""
 "або пробілом."
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:170
 msgid "Language"
 msgstr "Мова"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:172
 msgid "Preferred language."
 msgstr "Мова, котрій надаєте перевагу."
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:182
 msgid "Timezone"
 msgstr "Часовий пояс"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:184
 msgid "What timezone are you normally in?"
 msgstr "За яким часовим поясом ви живете?"
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:190
 msgid ""
 "Automatically subscribe to whoever subscribes to me (best for non-humans)."
 msgstr ""
@@ -4677,7 +3850,6 @@ msgstr ""
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Plural form is used based on the maximum number of allowed
 #. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:259 actions/register.php:214
 #, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4686,81 +3858,65 @@ msgstr[1] "Біографія надто довга (не більше %d сим
 msgstr[2] "Біографія надто довга (не більше %d символів)."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:270 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr "Часовий пояс не обрано."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:278
 msgid "Language is too long (maximum 50 characters)."
 msgstr "Мова надто довга (не більше 50 символів)."
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:292
 #, php-format
 msgid "Invalid tag: \"%s\"."
 msgstr "Неприпустимий теґ: «%s»."
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:348
 msgid "Could not update user for autosubscribe."
 msgstr "Не вдалося оновити користувача для автопідписки."
 
 #. TRANS: Server error thrown when user profile location preference settings could not be updated.
-#: actions/profilesettings.php:406
 msgid "Could not save location prefs."
 msgstr "Не вдалося зберегти преференції розташування."
 
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:428 actions/tagother.php:179
 msgid "Could not save tags."
 msgstr "Не вдалося зберегти теґи."
 
 #. TRANS: Confirmation shown when user profile settings are saved.
 #. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:437 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "Налаштування збережено."
 
 #. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
 #. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:484 actions/restoreaccount.php:60
 msgid "Restore account"
 msgstr "Відновити акаунт"
 
-#: actions/public.php:83
 #, php-format
 msgid "Beyond the page limit (%s)."
 msgstr "Перевищено ліміт сторінки (%s)."
 
-#: actions/public.php:92
 msgid "Could not retrieve public stream."
 msgstr "Не вдається відновити загальну стрічку."
 
-#: actions/public.php:130
 #, php-format
 msgid "Public timeline, page %d"
 msgstr "Загальна стрічка, сторінка %d"
 
-#: actions/public.php:132 lib/publicgroupnav.php:79
 msgid "Public timeline"
 msgstr "Загальна стрічка"
 
-#: actions/public.php:160
 msgid "Public Stream Feed (RSS 1.0)"
 msgstr "Стрічка публічних дописів (RSS 1.0)"
 
-#: actions/public.php:164
 msgid "Public Stream Feed (RSS 2.0)"
 msgstr "Стрічка публічних дописів (RSS 2.0)"
 
-#: actions/public.php:168
 msgid "Public Stream Feed (Atom)"
 msgstr "Стрічка публічних дописів (Atom)"
 
-#: actions/public.php:188
 #, php-format
 msgid ""
 "This is the public timeline for %%site.name%% but no one has posted anything "
@@ -4768,11 +3924,9 @@ msgid ""
 msgstr ""
 "Це публічна стрічка дописів сайту %%site.name%%, але вона поки що порожня."
 
-#: actions/public.php:191
 msgid "Be the first to post!"
 msgstr "Станьте першим! Напишіть щось!"
 
-#: actions/public.php:195
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post!"
@@ -4780,7 +3934,6 @@ msgstr ""
 "Чому б не [зареєструватись](%%action.register%%) і не зробити свій перший "
 "допис!"
 
-#: actions/public.php:242
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -4794,7 +3947,6 @@ msgstr ""
 "розділити своє життя з друзями, родиною і колегами! ([Дізнатися більше](%%"
 "doc.help%%))"
 
-#: actions/public.php:247
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -4806,19 +3958,16 @@ msgstr ""
 "(http://status.net/)."
 
 #. TRANS: Public RSS feed description. %s is the StatusNet site name.
-#: actions/publicrss.php:106
 #, php-format
 msgid "%s updates from everyone."
 msgstr "Всі оновлення на %s."
 
 #. TRANS: Title for public tag cloud.
-#: actions/publictagcloud.php:57
 msgid "Public tag cloud"
 msgstr "Загальна хмарка теґів"
 
 #. TRANS: Instructions (more used like an explanation/header).
 #. TRANS: %s is the StatusNet sitename.
-#: actions/publictagcloud.php:65
 #, php-format
 msgid "These are most popular recent tags on %s"
 msgstr "Це найбільш популярні нові теґи на %s"
@@ -4826,14 +3975,12 @@ msgstr "Це найбільш популярні нові теґи на %s"
 #. TRANS: This message contains a Markdown URL. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.
-#: actions/publictagcloud.php:74
 #, php-format
 msgid "No one has posted a notice with a [hashtag](%%doc.tags%%) yet."
 msgstr "Поки що ніхто не використовував теґ [hashtag](%%doc.tags%%)."
 
 #. 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.
-#: actions/publictagcloud.php:79
 msgid "Be the first to post one!"
 msgstr "Станьте першим! Напишіть щось!"
 
@@ -4842,7 +3989,6 @@ msgstr "Станьте першим! Напишіть щось!"
 #. TRANS: This message contains a Markdown URL. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.
-#: actions/publictagcloud.php:87
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post "
@@ -4852,42 +3998,34 @@ msgstr ""
 "цікаве!"
 
 #. TRANS: Client error displayed trying to recover password while already logged in.
-#: actions/recoverpassword.php:37
 msgid "You are already logged in!"
 msgstr "Ви вже в системі!"
 
 #. TRANS: Client error displayed when password recovery code is not correct.
-#: actions/recoverpassword.php:64
 msgid "No such recovery code."
 msgstr "Немає такого коду відновлення."
 
 #. TRANS: Client error displayed when no proper password recovery code was submitted.
-#: actions/recoverpassword.php:69
 msgid "Not a recovery code."
 msgstr "Це не код відновлення."
 
 #. TRANS: Server error displayed trying to recover password without providing a user.
-#: actions/recoverpassword.php:77
 msgid "Recovery code for unknown user."
 msgstr "Код відновлення для невідомого користувача."
 
 #. TRANS: Server error displayed removing a password recovery code from the database.
-#: actions/recoverpassword.php:91
 msgid "Error with confirmation code."
 msgstr "Помилка з кодом підтвердження."
 
 #. TRANS: Client error displayed trying to recover password with too old a recovery code.
-#: actions/recoverpassword.php:103
 msgid "This confirmation code is too old. Please start again."
 msgstr "Цей код підтвердження застарілий. Будь ласка, розпочніть спочатку."
 
 #. TRANS: Server error displayed when updating a user's e-mail address in the database fails while recovering a password.
-#: actions/recoverpassword.php:118
 msgid "Could not update user with confirmed email address."
 msgstr "Не вдалося оновити користувача з підтвердженною електронною адресою."
 
 #. TRANS: Page notice for password recovery page.
-#: actions/recoverpassword.php:160
 msgid ""
 "If you have forgotten or lost your password, you can get a new one sent to "
 "the email address you have stored in your account."
@@ -4895,97 +4033,79 @@ msgstr ""
 "Якщо загубите або втратите свій пароль, його буде легко відновити за "
 "допомогою електронної адреси, яку ви зазначили у власному профілі."
 
-#: actions/recoverpassword.php:167
 msgid "You have been identified. Enter a new password below."
 msgstr "Ідентифікація успішна. Введіть новий пароль."
 
 #. TRANS: Fieldset legend for password recovery page.
-#: actions/recoverpassword.php:198
 msgid "Password recovery"
 msgstr "Відновлення паролю"
 
 #. TRANS: Field label on password recovery page.
-#: actions/recoverpassword.php:202
 msgid "Nickname or email address"
 msgstr "Ім’я користувача або поштова адреса"
 
 #. TRANS: Title for field label on password recovery page.
-#: actions/recoverpassword.php:205
 msgid "Your nickname on this server, or your registered email address."
 msgstr ""
 "Ваше ім’я користувача на цьому сервері, або зареєстрована електронна адреса."
 
 #. TRANS: Field label on password recovery page.
-#: actions/recoverpassword.php:212
 msgid "Recover"
 msgstr "Відновити"
 
 #. TRANS: Button text on password recovery page.
-#: actions/recoverpassword.php:214
 msgctxt "BUTTON"
 msgid "Recover"
 msgstr "Відновити"
 
 #. TRANS: Title for password recovery page in password reset mode.
-#: actions/recoverpassword.php:223
 msgid "Reset password"
 msgstr "Скинути пароль"
 
 #. TRANS: Title for password recovery page in password recover mode.
-#: actions/recoverpassword.php:225
 msgid "Recover password"
 msgstr "Відновити пароль"
 
 #. TRANS: Title for password recovery page in email sent mode.
 #. TRANS: Subject for password recovery e-mail.
-#: actions/recoverpassword.php:227 actions/recoverpassword.php:366
 msgid "Password recovery requested"
 msgstr "Запит на відновлення паролю відправлено"
 
 #. TRANS: Title for password recovery page in password saved mode.
-#: actions/recoverpassword.php:229
 msgid "Password saved"
 msgstr "Пароль збережено"
 
 #. TRANS: Title for password recovery page when an unknown action has been specified.
-#: actions/recoverpassword.php:232
 msgid "Unknown action"
 msgstr "Дія невідома"
 
 #. TRANS: Title for field label for password reset form.
-#: actions/recoverpassword.php:258
 msgid "6 or more characters, and do not forget it!"
 msgstr "6 або більше знаків, і не забудьте їх!"
 
 #. TRANS: Button text for password reset form.
 #. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: actions/recoverpassword.php:268 lib/designform.php:145
 msgctxt "BUTTON"
 msgid "Reset"
 msgstr "Скинути"
 
 #. TRANS: Form instructions for password recovery form.
-#: actions/recoverpassword.php:278
 msgid "Enter a nickname or email address."
 msgstr "Введіть ім’я або електронну адресу."
 
 #. TRANS: Information on password recovery form if no known username or e-mail address was specified.
-#: actions/recoverpassword.php:309
 msgid "No user with that email address or username."
 msgstr "Користувача з такою електронною адресою або ім’ям немає."
 
 #. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
-#: actions/recoverpassword.php:327
 msgid "No registered email address for that user."
 msgstr "Для цього користувача немає зареєстрованої електронної адреси."
 
 #. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
-#: actions/recoverpassword.php:342
 msgid "Error saving address confirmation."
 msgstr "Помилка при збереженні підтвердження адреси."
 
 #. TRANS: User notification after an e-mail with instructions was sent from the password recovery form.
-#: actions/recoverpassword.php:370
 msgid ""
 "Instructions for recovering your password have been sent to the email "
 "address registered to your account."
@@ -4994,74 +4114,58 @@ msgstr ""
 "вказали у налаштуваннях вашого профілю."
 
 #. TRANS: Client error displayed when trying to reset as password without providing a user.
-#: actions/recoverpassword.php:391
 msgid "Unexpected password reset."
 msgstr "Несподіване скидання паролю."
 
 #. TRANS: Reset password form validation error message.
-#: actions/recoverpassword.php:400
 msgid "Password must be 6 characters or more."
 msgstr "Пароль має складатись з 6-ти або більше знаків."
 
 #. TRANS: Reset password form validation error message.
-#: actions/recoverpassword.php:405
 msgid "Password and confirmation do not match."
 msgstr "Пароль та підтвердження не співпадають."
 
 #. TRANS: Server error displayed when something does wrong with the user object during password reset.
-#: actions/recoverpassword.php:426 actions/register.php:241
 msgid "Error setting user."
 msgstr "Помилка в налаштуваннях користувача."
 
 #. TRANS: Success message for user after password reset.
-#: actions/recoverpassword.php:434
 msgid "New password successfully saved. You are now logged in."
 msgstr "Новий пароль успішно збережено. Тепер ви увійшли."
 
-#: actions/redirecturl.php:70
 #, fuzzy
 msgid "No id parameter"
 msgstr "Немає ID аргументу."
 
-#: actions/redirecturl.php:76
 #, fuzzy, php-format
 msgid "No such file \"%d\""
 msgstr "Такого файлу немає."
 
-#: actions/register.php:80 actions/register.php:181 actions/register.php:392
 msgid "Sorry, only invited people can register."
 msgstr ""
 "Пробачте, але лише ті, кого було запрошено, мають змогу зареєструватись тут."
 
-#: actions/register.php:87
 msgid "Sorry, invalid invitation code."
 msgstr "Даруйте, помилка у коді запрошення."
 
-#: actions/register.php:106
 msgid "Registration successful"
 msgstr "Реєстрація успішна"
 
-#: actions/register.php:108 actions/register.php:490
 msgid "Register"
 msgstr "Реєстрація"
 
-#: actions/register.php:128
 msgid "Registration not allowed."
 msgstr "Реєстрацію не дозволено."
 
-#: actions/register.php:194
 msgid "You cannot register if you don't agree to the license."
 msgstr "Ви не можете зареєструватись, якщо не погодитесь з умовами ліцензії."
 
-#: actions/register.php:203
 msgid "Email address already exists."
 msgstr "Ця адреса вже використовується."
 
-#: actions/register.php:236 actions/register.php:258
 msgid "Invalid username or password."
 msgstr "Недійсне ім’я або пароль."
 
-#: actions/register.php:333
 msgid ""
 "With this form you can create a new account. You can then post notices and "
 "link up to friends and colleagues."
@@ -5069,46 +4173,36 @@ msgstr ""
 "Ця форма дозволить вам створити новий акаунт. Ви зможете робити дописи і "
 "будете в курсі справ ваших друзів та колег."
 
-#: actions/register.php:424 actions/register.php:428
-#: actions/siteadminpanel.php:238 lib/settingsnav.php:92
 msgid "Email"
 msgstr "Пошта"
 
-#: actions/register.php:425 actions/register.php:429
 msgid "Used only for updates, announcements, and password recovery."
 msgstr "Використовується лише для оновлень, оголошень та відновлення пароля."
 
-#: actions/register.php:436
 msgid "Longer name, preferably your \"real\" name."
 msgstr "Повне ім’я, бажано ваше справжнє ім’я."
 
-#: actions/register.php:464
 msgid "Where you are, like \"City, State (or Region), Country\"."
 msgstr "Де ви живете, на кшталт «Місто, область (регіон), країна»."
 
-#: actions/register.php:503
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
 msgstr "Я розумію, що зміст і дані %1$s є приватними і конфіденційними."
 
-#: actions/register.php:513
 #, php-format
 msgid "My text and files are copyright by %1$s."
 msgstr "Авторські права на мої тексти і файли належать %1$s."
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:517
 msgid "My text and files remain under my own copyright."
 msgstr "Авторські права на мої тексти і файли залишаються за мною."
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:520
 msgid "All rights reserved."
 msgstr "Всі права захищені."
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:525
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -5117,7 +4211,6 @@ msgstr ""
 "Мої дописи і файли доступні на умовах %s, окрім цих приватних даних: пароль, "
 "електронна адреса, адреса IM, телефонний номер."
 
-#: actions/register.php:566
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -5150,7 +4243,6 @@ msgstr ""
 "Дякуємо, що зареєструвались у нас, і, сподіваємось, вам сподобається наш "
 "сервіс."
 
-#: actions/register.php:590
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5158,7 +4250,6 @@ msgstr ""
 "(Ви маєте негайно отримати листа електронною поштою, в якому знаходитимуться "
 "інструкції щодо підтвердження вашої електронної адреси.)"
 
-#: actions/remotesubscribe.php:97
 #, php-format
 msgid ""
 "To subscribe, you can [login](%%action.login%%), or [register](%%action."
@@ -5169,105 +4260,80 @@ msgstr ""
 "action.register%%) новий  акаунт. Якщо ви вже маєте акаунт на [сумісному "
 "сайті](%%doc.openmublog%%), введіть URL-адресу вашого профілю нижче."
 
-#: actions/remotesubscribe.php:111
 msgid "Remote subscribe"
 msgstr "Віддалена підписка"
 
-#: actions/remotesubscribe.php:123
 msgid "Subscribe to a remote user"
 msgstr "Підписатись до віддаленого користувача"
 
-#: actions/remotesubscribe.php:128
 msgid "User nickname"
 msgstr "Ім’я користувача"
 
-#: actions/remotesubscribe.php:129
 msgid "Nickname of the user you want to follow."
 msgstr "Ім’я користувача, дописи якого ви хотіли б читати."
 
-#: actions/remotesubscribe.php:132
 msgid "Profile URL"
 msgstr "URL-адреса профілю"
 
-#: actions/remotesubscribe.php:133
 msgid "URL of your profile on another compatible microblogging service."
 msgstr "URL-адреса вашого профілю на іншому сумісному сервісі мікроблоґів."
 
 #. TRANS: Link text for link that will subscribe to a remote profile.
-#: actions/remotesubscribe.php:136 lib/subscribeform.php:139
-#: lib/userprofile.php:402
 msgid "Subscribe"
 msgstr "Підписатись"
 
-#: actions/remotesubscribe.php:158
 msgid "Invalid profile URL (bad format)."
 msgstr "Неприпустима URL-адреса профілю (неправильний формат)."
 
-#: actions/remotesubscribe.php:167
 msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
 msgstr ""
 "Неправильна URL-адреса профілю (немає документа YADIS, або помилковий XRDS)."
 
-#: actions/remotesubscribe.php:175
 msgid "That is a local profile! Login to subscribe."
 msgstr "Це локальний профіль! Увійдіть, щоб підписатись."
 
-#: actions/remotesubscribe.php:182
 msgid "Could not get a request token."
 msgstr "Не вдалося отримати токен запиту."
 
-#: actions/repeat.php:56
 msgid "Only logged-in users can repeat notices."
 msgstr "Лише користувачі, що знаходяться у системі, можуть повторювати дописи."
 
-#: actions/repeat.php:63 actions/repeat.php:70
 msgid "No notice specified."
 msgstr "Зазначеного допису немає."
 
-#: actions/repeat.php:75
 msgid "You cannot repeat your own notice."
 msgstr "Ви не можете повторювати власні дописи."
 
-#: actions/repeat.php:89
 msgid "You already repeated that notice."
 msgstr "Ви вже повторили цей допис."
 
-#: actions/repeat.php:112 lib/noticelist.php:697
 msgid "Repeated"
 msgstr "Повторено"
 
-#: actions/repeat.php:117
 msgid "Repeated!"
 msgstr "Повторено!"
 
 #. TRANS: RSS reply feed title. %s is a user nickname.
-#: actions/replies.php:126 actions/repliesrss.php:68
-#: lib/personalgroupnav.php:105
 #, php-format
 msgid "Replies to %s"
 msgstr "Відповіді до %s"
 
-#: actions/replies.php:128
 #, php-format
 msgid "Replies to %1$s, page %2$d"
 msgstr "Відповіді до %1$s, сторінка %2$d"
 
-#: actions/replies.php:145
 #, php-format
 msgid "Replies feed for %s (RSS 1.0)"
 msgstr "Стрічка відповідей до %s (RSS 1.0)"
 
-#: actions/replies.php:152
 #, php-format
 msgid "Replies feed for %s (RSS 2.0)"
 msgstr "Стрічка відповідей до %s (RSS 2.0)"
 
-#: actions/replies.php:159
 #, php-format
 msgid "Replies feed for %s (Atom)"
 msgstr "Стрічка відповідей до %s (Atom)"
 
-#: actions/replies.php:199
 #, php-format
 msgid ""
 "This is the timeline showing replies to %1$s but %2$s hasn't received a "
@@ -5276,7 +4342,6 @@ msgstr ""
 "Ця стрічка дописів містить відповіді для %1$s, але %2$s поки що нічого не "
 "отримав у відповідь."
 
-#: actions/replies.php:204
 #, php-format
 msgid ""
 "You can engage other users in a conversation, subscribe to more people or "
@@ -5285,7 +4350,6 @@ msgstr ""
 "Ви можете долучити інших користувачів до спілкування, підписавшись до "
 "більшої кількості людей або [приєднавшись до спільноти](%%action.groups%%)."
 
-#: actions/replies.php:206
 #, php-format
 msgid ""
 "You can try to [nudge %1$s](../%2$s) or [post something to them](%%%%action."
@@ -5296,35 +4360,29 @@ msgstr ""
 
 #. TRANS: RSS reply feed description.
 #. TRANS: %1$s is a user nickname, %2$s is the StatusNet site name.
-#: actions/repliesrss.php:74
 #, php-format
 msgid "Replies to %1$s on %2$s."
 msgstr "Відповіді до %1$s на %2$s."
 
 #. TRANS: Client exception displayed when trying to restore an account while not logged in.
-#: actions/restoreaccount.php:78
 msgid "Only logged-in users can restore their account."
 msgstr ""
 "Лише користувачі, що знаходяться у системі, можуть відновлювати свої акаунти."
 
 #. TRANS: Client exception displayed when trying to restore an account without having restore rights.
-#: actions/restoreaccount.php:83
 msgid "You may not restore your account."
 msgstr "Ви не можете відновити свій акаунт."
 
 #. TRANS: Client exception displayed trying to restore an account while something went wrong uploading a file.
 #. TRANS: Client exception. No file; probably just a non-AJAX submission.
-#: actions/restoreaccount.php:121 actions/restoreaccount.php:146
 msgid "No uploaded file."
 msgstr "Немає завантажених файлів"
 
 #. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
-#: actions/restoreaccount.php:129 lib/mediafile.php:194
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
 msgstr "Завантажений файл перевищив UPLOAD_MAX_FILESIZE вказаний у php.ini."
 
 #. TRANS: Client exception.
-#: actions/restoreaccount.php:135 lib/mediafile.php:200
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form."
@@ -5333,39 +4391,32 @@ msgstr ""
 "HTML."
 
 #. TRANS: Client exception.
-#: actions/restoreaccount.php:141 lib/mediafile.php:206
 msgid "The uploaded file was only partially uploaded."
 msgstr "Файл було завантажено частково."
 
 #. TRANS: Client exception thrown when a temporary folder is not present to store a file upload.
-#: actions/restoreaccount.php:150 lib/mediafile.php:214
 msgid "Missing a temporary folder."
 msgstr "Загублено тимчасову теку."
 
 #. TRANS: Client exception thrown when writing to disk is not possible during a file upload operation.
-#: actions/restoreaccount.php:154 lib/mediafile.php:218
 msgid "Failed to write file to disk."
 msgstr "Запис файлу на диск скасовано."
 
 #. TRANS: Client exception thrown when a file upload operation has been stopped by an extension.
-#: actions/restoreaccount.php:158 lib/mediafile.php:222
 msgid "File upload stopped by extension."
 msgstr "Завантаження файлу зупинено розширенням."
 
 #. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
 #. TRANS: Exception thrown when uploading an image fails for an unknown reason.
 #. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
-#: actions/restoreaccount.php:164 lib/imagefile.php:106 lib/mediafile.php:228
 msgid "System error uploading file."
 msgstr "Система відповіла помилкою при завантаженні цього файла."
 
 #. TRANS: Client exception thrown when a feed is not an Atom feed.
-#: actions/restoreaccount.php:207
 msgid "Not an Atom feed."
 msgstr "Ця стрічка не у форматі Atom."
 
 #. TRANS: Success message when a feed has been restored.
-#: actions/restoreaccount.php:241
 msgid ""
 "Feed has been restored. Your old posts should now appear in search and your "
 "profile page."
@@ -5374,13 +4425,11 @@ msgstr ""
 "сторінці вашого профілю, а також у результатах пошуку."
 
 #. TRANS: Message when a feed restore is in progress.
-#: actions/restoreaccount.php:245
 msgid "Feed will be restored. Please wait a few minutes for results."
 msgstr ""
 "Веб-стрічку невдовзі буде відновлено. Зачекайте, будь ласка, декілька хвилин."
 
 #. TRANS: Form instructions for feed restore.
-#: actions/restoreaccount.php:342
 msgid ""
 "You can upload a backed-up stream in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format."
@@ -5389,92 +4438,73 @@ msgstr ""
 "activitystrea.ms/\">Activity Streams</a>."
 
 #. TRANS: Title for submit button to confirm upload of a user backup file for account restore.
-#: actions/restoreaccount.php:373
 msgid "Upload the file"
 msgstr "Завантажити файл"
 
-#: actions/revokerole.php:75
 msgid "You cannot revoke user roles on this site."
 msgstr "Ви не можете позбавляти користувачів ролей на цьому сайті."
 
-#: actions/revokerole.php:82
 msgid "User doesn't have this role."
 msgstr "Користувач не має цієї ролі."
 
-#: actions/rsd.php:142 actions/version.php:159
 msgid "StatusNet"
 msgstr "StatusNet"
 
-#: actions/sandbox.php:65 actions/unsandbox.php:65
 msgid "You cannot sandbox users on this site."
 msgstr "Ви не можете нікого ізолювати на цьому сайті."
 
-#: actions/sandbox.php:72
 msgid "User is already sandboxed."
 msgstr "Користувача ізольовано доки набереться уму-розуму."
 
 #. TRANS: Menu item for site administration
-#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
-#: lib/adminpanelaction.php:379
 msgid "Sessions"
 msgstr "Сесії"
 
-#: actions/sessionsadminpanel.php:65
 msgid "Session settings for this StatusNet site"
 msgstr "Налаштування сесії для даного сайту StatusNet"
 
-#: actions/sessionsadminpanel.php:175
 msgid "Handle sessions"
 msgstr "Сесії обробки даних"
 
-#: actions/sessionsadminpanel.php:177
 msgid "Whether to handle sessions ourselves."
 msgstr "Обробка даних сесій самостійно."
 
-#: actions/sessionsadminpanel.php:181
 msgid "Session debugging"
 msgstr "Сесія наладки"
 
-#: actions/sessionsadminpanel.php:183
 msgid "Turn on debugging output for sessions."
 msgstr "Виводити дані сесії наладки."
 
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
+#. TRANS: Submit button title.
+msgid "Save"
+msgstr "Зберегти"
+
 msgid "Save site settings"
 msgstr "Зберегти налаштування сайту"
 
-#: actions/showapplication.php:78
 msgid "You must be logged in to view an application."
 msgstr "Ви повинні спочатку увійти, аби переглянути додаток."
 
-#: actions/showapplication.php:151
 msgid "Application profile"
 msgstr "Профіль додатку"
 
-#: actions/showapplication.php:179
 #, php-format
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr "Створено %1$s — %2$s доступ за замовч. — %3$d користувачів"
 
-#: actions/showapplication.php:189
 msgid "Application actions"
 msgstr "Можливості додатку"
 
-#: actions/showapplication.php:212
 msgid "Reset key & secret"
 msgstr "Призначити новий ключ і таємне слово"
 
 #. TRANS: Title of form for deleting a user.
-#: actions/showapplication.php:228 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:64 lib/noticelist.php:678
 msgid "Delete"
 msgstr "Видалити"
 
-#: actions/showapplication.php:237
 msgid "Application info"
 msgstr "Інфо додатку"
 
-#: actions/showapplication.php:255
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
@@ -5482,42 +4512,35 @@ msgstr ""
 "До уваги: Всі підписи шифруються за методом HMAC-SHA1. Ми не підтримуємо "
 "шифрування підписів відкритим текстом."
 
-#: actions/showapplication.php:275
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr "Ви впевнені, що бажаєте скинути ваш ключ споживача і секретний код?"
 
 #. TRANS: Title for all but the first page of favourite notices of a user.
 #. TRANS: %1$s is the user for whom the favourite notices are displayed, %2$d is the page number.
-#: actions/showfavorites.php:80
 #, php-format
 msgid "%1$s's favorite notices, page %2$d"
 msgstr "Обрані дописи %1$s, сторінка %2$d"
 
 #. TRANS: Server error displayed when favourite notices could not be retrieved from the database.
-#: actions/showfavorites.php:134
 msgid "Could not retrieve favorite notices."
 msgstr "Не можна відновити обрані дописи."
 
 #. TRANS: Feed link text. %s is a username.
-#: actions/showfavorites.php:172
 #, php-format
 msgid "Feed for favorites of %s (RSS 1.0)"
 msgstr "Стрічка обраних дописів %s (RSS 1.0)"
 
 #. TRANS: Feed link text. %s is a username.
-#: actions/showfavorites.php:180
 #, php-format
 msgid "Feed for favorites of %s (RSS 2.0)"
 msgstr "Стрічка обраних дописів %s (RSS 2.0)"
 
 #. TRANS: Feed link text. %s is a username.
-#: actions/showfavorites.php:188
 #, php-format
 msgid "Feed for favorites of %s (Atom)"
 msgstr "Стрічка обраних дописів %s (Atom)"
 
 #. TRANS: Text displayed instead of favourite notices for the current logged in user that has no favourites.
-#: actions/showfavorites.php:209
 msgid ""
 "You haven't chosen any favorite notices yet. Click the fave button on "
 "notices you like to bookmark them for later or shed a spotlight on them."
@@ -5528,7 +4551,6 @@ msgstr ""
 
 #. TRANS: Text displayed instead of favourite notices for a user that has no favourites while logged in.
 #. TRANS: %s is a username.
-#: actions/showfavorites.php:213
 #, php-format
 msgid ""
 "%s hasn't added any favorite notices yet. Post something interesting they "
@@ -5540,7 +4562,6 @@ msgstr ""
 #. TRANS: Text displayed instead of favourite notices for a user that has no favourites while not logged in.
 #. TRANS: %s is a username, %%%%action.register%%%% is a link to the user registration page.
 #. TRANS: (link text)[link] is a Mark Down link.
-#: actions/showfavorites.php:220
 #, php-format
 msgid ""
 "%s hasn't added any favorite notices yet. Why not [register an account](%%%%"
@@ -5552,64 +4573,53 @@ msgstr ""
 "користувачеві :)"
 
 #. TRANS: Page notice for show favourites page.
-#: actions/showfavorites.php:251
 msgid "This is a way to share what you like."
 msgstr "Це спосіб поділитись з усіма тим, що вам подобається."
 
 #. TRANS: Page title for first group page. %s is a group name.
-#: actions/showgroup.php:75
 #, php-format
 msgid "%s group"
 msgstr "Спільнота %s"
 
 #. TRANS: Page title for any but first group page.
 #. TRANS: %1$s is a group name, $2$s is a page number.
-#: actions/showgroup.php:79
 #, php-format
 msgid "%1$s group, page %2$d"
 msgstr "Спільнота %1$s, сторінка %2$d"
 
 #. TRANS: Label for group description or group note (dt). Text hidden by default.
-#: actions/showgroup.php:266
 msgid "Note"
 msgstr "Зауваження"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:277 lib/groupeditform.php:180
 msgid "Aliases"
 msgstr "Додаткові імена"
 
 #. TRANS: Group actions header (h2). Text hidden by default.
-#: actions/showgroup.php:294
 msgid "Group actions"
 msgstr "Дії спільноти"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:338
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
 msgstr "Стрічка дописів спільноти %s (RSS 1.0)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:345
 #, php-format
 msgid "Notice feed for %s group (RSS 2.0)"
 msgstr "Стрічка дописів спільноти %s (RSS 2.0)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:352
 #, php-format
 msgid "Notice feed for %s group (Atom)"
 msgstr "Стрічка дописів спільноти %s (Atom)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:358
 #, php-format
 msgid "FOAF for %s group"
 msgstr "FOAF спільноти %s"
 
 #. TRANS: Header for mini list of group members on a group page (h2).
-#: actions/showgroup.php:395
 msgid "Members"
 msgstr "Учасники"
 
@@ -5617,30 +4627,23 @@ msgstr "Учасники"
 #. TRANS: Text for user subscription statistics if the user has no subscriptions.
 #. TRANS: Text for user subscriber statistics if user has no subscribers.
 #. TRANS: Text for user user group membership statistics if user is not a member of any group.
-#: actions/showgroup.php:401 lib/profileaction.php:137
-#: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
-#: lib/subscriptionlist.php:123 lib/tagcloudsection.php:71
 msgid "(None)"
 msgstr "(Пусто)"
 
 #. TRANS: Link to all group members from mini list of group members if group has more than n members.
-#: actions/showgroup.php:410
 msgid "All members"
 msgstr "Всі учасники"
 
 #. TRANS: Header for group statistics on a group page (h2).
 #. TRANS: H2 text for user statistics.
-#: actions/showgroup.php:441 lib/profileaction.php:205
 msgid "Statistics"
 msgstr "Статистика"
 
-#: actions/showgroup.php:444
 msgctxt "LABEL"
 msgid "Created"
 msgstr "Створено"
 
 #. TRANS: Label for member count in statistics on group page.
-#: actions/showgroup.php:449
 msgctxt "LABEL"
 msgid "Members"
 msgstr "Учасники"
@@ -5649,7 +4652,6 @@ msgstr "Учасники"
 #. TRANS: **%s** is the group alias, %%%%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).
-#: actions/showgroup.php:464
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5668,7 +4670,6 @@ 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: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
-#: actions/showgroup.php:474
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5682,99 +4683,83 @@ msgstr ""
 "спільноти роблять короткі дописи про своє життя та інтереси. "
 
 #. TRANS: Header for list of group administrators on a group page (h2).
-#: actions/showgroup.php:503
 msgid "Admins"
 msgstr "Адміни"
 
 #. TRANS: Client error displayed requesting a single message that does not exist.
-#: actions/showmessage.php:76
 msgid "No such message."
 msgstr "Немає такого повідомлення."
 
 #. TRANS: Client error displayed requesting a single direct message the requesting user was not a party in.
-#: actions/showmessage.php:86
 msgid "Only the sender and recipient may read this message."
 msgstr "Лише відправник та отримувач мають можливість читати це повідомлення."
 
 #. TRANS: Page title for single direct message display when viewing user is the sender.
 #. TRANS: %1$s is the addressed user's nickname, $2$s is a timestamp.
-#: actions/showmessage.php:105
 #, php-format
 msgid "Message to %1$s on %2$s"
 msgstr "Повідомлення до %1$s на %2$s"
 
 #. TRANS: Page title for single message display.
 #. TRANS: %1$s is the sending user's nickname, $2$s is a timestamp.
-#: actions/showmessage.php:113
 #, php-format
 msgid "Message from %1$s on %2$s"
 msgstr "Повідомлення від %1$s на %2$s"
 
-#: actions/shownotice.php:90
 msgid "Notice deleted."
 msgstr "Допис видалено."
 
 #. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
-#: actions/showstream.php:70
 #, php-format
 msgid "%1$s tagged %2$s"
 msgstr "Дописи %1$s позначені теґом %2$s"
 
 #. TRANS: Page title showing tagged notices in one user's stream.
 #. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
-#: actions/showstream.php:74
 #, php-format
 msgid "%1$s tagged %2$s, page %3$d"
 msgstr "Дописи %1$s позначені теґом %2$s, сторінка %3$d"
 
 #. TRANS: Extended page title showing tagged notices in one user's stream.
 #. TRANS: %1$s is the username, %2$d is the page number.
-#: actions/showstream.php:82
 #, php-format
 msgid "%1$s, page %2$d"
 msgstr "%1$s, сторінка %2$d"
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %1$s is a user nickname, %2$s is a hashtag.
-#: actions/showstream.php:127
 #, php-format
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
 msgstr "Стрічка дописів %1$s з теґом «%2$s» (RSS 1.0)"
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.
-#: actions/showstream.php:136
 #, php-format
 msgid "Notice feed for %s (RSS 1.0)"
 msgstr "Стрічка дописів для %s (RSS 1.0)"
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.
-#: actions/showstream.php:145
 #, php-format
 msgid "Notice feed for %s (RSS 2.0)"
 msgstr "Стрічка дописів для %s (RSS 2.0)"
 
-#: actions/showstream.php:152
 #, php-format
 msgid "Notice feed for %s (Atom)"
 msgstr "Стрічка дописів для %s (Atom)"
 
 #. TRANS: Title for link to notice feed. FOAF stands for Friend of a Friend.
 #. TRANS: More information at http://www.foaf-project.org. %s is a user nickname.
-#: actions/showstream.php:159
 #, php-format
 msgid "FOAF for %s"
 msgstr "FOAF для %s"
 
 #. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
-#: actions/showstream.php:205
 #, php-format
 msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr "Це стрічка дописів %1$s, але %1$s ще нічого не написав."
 
 #. TRANS: Second sentence of empty list message for a stream for the user themselves.
-#: actions/showstream.php:211
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
@@ -5784,7 +4769,6 @@ msgstr ""
 
 #. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:215
 #, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
@@ -5795,7 +4779,6 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:258
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5811,7 +4794,6 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:265
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5823,223 +4805,176 @@ msgstr ""
 "програмному забезпеченні [StatusNet](http://status.net/). "
 
 #. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
-#: actions/showstream.php:322
 #, php-format
 msgid "Repeat of %s"
 msgstr "Повторення за %s"
 
-#: actions/silence.php:65 actions/unsilence.php:65
 msgid "You cannot silence users on this site."
 msgstr "Ви не можете позбавляти користувачів права голосу на цьому сайті."
 
-#: actions/silence.php:72
 msgid "User is already silenced."
 msgstr "Користувачу наразі заклеїли рота скотчем."
 
-#: actions/siteadminpanel.php:69
 msgid "Basic settings for this StatusNet site"
 msgstr "Основні налаштування цього сайту StatusNet"
 
-#: actions/siteadminpanel.php:133
 msgid "Site name must have non-zero length."
 msgstr "Ім’я сайту не може бути порожнім."
 
-#: actions/siteadminpanel.php:141
 msgid "You must have a valid contact email address."
 msgstr "Електронна адреса має бути чинною."
 
-#: actions/siteadminpanel.php:159
 #, php-format
 msgid "Unknown language \"%s\"."
 msgstr "Невідома мова «%s»."
 
-#: actions/siteadminpanel.php:165
 msgid "Minimum text limit is 0 (unlimited)."
 msgstr "Ліміт текстових повідомлень становить 0 (необмежено)."
 
-#: actions/siteadminpanel.php:171
 msgid "Dupe limit must be one or more seconds."
 msgstr ""
 "Обмеження часу при повторному надісланні того самого повідомлення має "
 "становити одну і більше секунд."
 
-#: actions/siteadminpanel.php:221
 msgid "General"
 msgstr "Основні"
 
-#: actions/siteadminpanel.php:224
 msgid "Site name"
 msgstr "Назва сайту"
 
-#: actions/siteadminpanel.php:225
 msgid "The name of your site, like \"Yourcompany Microblog\""
 msgstr "Назва сайту, щось на зразок «Мікроблоґи компанії...»"
 
-#: actions/siteadminpanel.php:229
 msgid "Brought by"
 msgstr "Надано"
 
-#: actions/siteadminpanel.php:230
 msgid "Text used for credits link in footer of each page"
 msgstr "Текст використаний для посілань кредитів унизу кожної сторінки"
 
-#: actions/siteadminpanel.php:234
 msgid "Brought by URL"
 msgstr "Наданий URL"
 
-#: actions/siteadminpanel.php:235
 msgid "URL used for credits link in footer of each page"
 msgstr "URL використаний для посілань кредитів унизу кожної сторінки"
 
-#: actions/siteadminpanel.php:239
 msgid "Contact email address for your site"
 msgstr "Контактна електронна адреса для вашого сайту"
 
-#: actions/siteadminpanel.php:245
 msgid "Local"
 msgstr "Локаль"
 
-#: actions/siteadminpanel.php:256
 msgid "Default timezone"
 msgstr "Часовий пояс за замовчуванням"
 
-#: actions/siteadminpanel.php:257
 msgid "Default timezone for the site; usually UTC."
 msgstr "Часовий пояс за замовчуванням для сайту; зазвичай UTC."
 
-#: actions/siteadminpanel.php:262
 msgid "Default language"
 msgstr "Мова за замовчуванням"
 
-#: actions/siteadminpanel.php:263
 msgid "Site language when autodetection from browser settings is not available"
 msgstr ""
 "Мова сайту на випадок, коли автовизначення мови за настройками браузера не "
 "доступно"
 
-#: actions/siteadminpanel.php:271
 msgid "Limits"
 msgstr "Обмеження"
 
-#: actions/siteadminpanel.php:274
 msgid "Text limit"
 msgstr "Текстові обмеження"
 
-#: actions/siteadminpanel.php:274
 msgid "Maximum number of characters for notices."
 msgstr "Максимальна кількість знаків у дописі (0 — необмежено)."
 
-#: actions/siteadminpanel.php:278
 msgid "Dupe limit"
 msgstr "Часове обмеження"
 
-#: actions/siteadminpanel.php:278
 msgid "How long users must wait (in seconds) to post the same thing again."
 msgstr ""
 "Як довго користувачі мають зачекати (в секундах) аби надіслати той самий "
 "допис ще раз."
 
 #. TRANS: Page title for site-wide notice tab in admin panel.
-#: actions/sitenoticeadminpanel.php:55
 msgid "Site Notice"
 msgstr "Повідомлення сайту"
 
 #. TRANS: Instructions for site-wide notice tab in admin panel.
-#: actions/sitenoticeadminpanel.php:66
 msgid "Edit site-wide message"
 msgstr "Змінити повідомлення сайту"
 
 #. TRANS: Server error displayed when saving a site-wide notice was impossible.
-#: actions/sitenoticeadminpanel.php:101
 msgid "Unable to save site notice."
 msgstr "Не вдається зберегти повідомлення сайту."
 
 #. TRANS: Client error displayed when a site-wide notice was longer than allowed.
-#: actions/sitenoticeadminpanel.php:112
 msgid "Maximum length for the site-wide notice is 255 characters."
 msgstr "Максимальна довжина повідомлення сайту становить 255 символів."
 
 #. TRANS: Label for site-wide notice text field in admin panel.
-#: actions/sitenoticeadminpanel.php:176
 msgid "Site notice text"
 msgstr "Текст повідомлення"
 
 #. TRANS: Tooltip for site-wide notice text field in admin panel.
-#: actions/sitenoticeadminpanel.php:179
 msgid "Site-wide notice text (255 characters maximum; HTML allowed)"
 msgstr ""
 "Текст повідомлення сайту (255 символів максимум; деякий HTML дозволено)"
 
 #. TRANS: Title for button to save site notice in admin panel.
-#: actions/sitenoticeadminpanel.php:201
 msgid "Save site notice."
 msgstr "Зберегти повідомлення сайту."
 
 #. TRANS: Title for SMS settings.
-#: actions/smssettings.php:56
 msgid "SMS settings"
 msgstr "Налаштування СМС"
 
 #. TRANS: SMS settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/smssettings.php:70
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr "Ви можете отримувати СМС через електронну пошту від %%site.name%%."
 
 #. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
-#: actions/smssettings.php:92
 msgid "SMS is not available."
 msgstr "СМС недоступно."
 
 #. TRANS: Form legend for SMS settings form.
-#: actions/smssettings.php:106
 msgid "SMS address"
 msgstr "SMS-адреса"
 
 #. TRANS: Form guide in SMS settings form.
-#: actions/smssettings.php:115
 msgid "Current confirmed SMS-enabled phone number."
 msgstr "Поточний підтверджений телефонний номер."
 
 #. TRANS: Form guide in IM settings form.
-#: actions/smssettings.php:128
 msgid "Awaiting confirmation on this phone number."
 msgstr "Очікування підтвердження телефонного номера."
 
 #. TRANS: Field label for SMS address input in SMS settings form.
-#: actions/smssettings.php:137
 msgid "Confirmation code"
 msgstr "Код підтвердження"
 
 #. TRANS: Form field instructions in SMS settings form.
-#: actions/smssettings.php:139
 msgid "Enter the code you received on your phone."
 msgstr "Введіть код, який ви отримали телефоном."
 
 #. TRANS: Button label to confirm SMS confirmation code in SMS settings.
-#: actions/smssettings.php:143
 msgctxt "BUTTON"
 msgid "Confirm"
 msgstr "Підтвердити"
 
 #. TRANS: Field label for SMS phone number input in SMS settings form.
-#: actions/smssettings.php:148
 msgid "SMS phone number"
 msgstr "Телефонний номер"
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
-#: actions/smssettings.php:151
 msgid "Phone number, no punctuation or spaces, with area code."
 msgstr "Телефонний номер та регіональний код, ніякої пунктуації чи інтервалів."
 
 #. TRANS: Form legend for SMS preferences form.
-#: actions/smssettings.php:190
 msgid "SMS preferences"
 msgstr "Преференції SMS"
 
 #. TRANS: Checkbox label in SMS preferences form.
-#: actions/smssettings.php:196
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
@@ -6048,32 +4983,26 @@ msgstr ""
 "витрати від мого мобільного оператора."
 
 #. TRANS: Confirmation message for successful SMS preferences save.
-#: actions/smssettings.php:307
 msgid "SMS preferences saved."
 msgstr "Преференції SMS збережено."
 
 #. TRANS: Message given saving SMS phone number without having provided one.
-#: actions/smssettings.php:329
 msgid "No phone number."
 msgstr "Немає телефонного номера."
 
 #. TRANS: Message given saving SMS phone number without having selected a carrier.
-#: actions/smssettings.php:335
 msgid "No carrier selected."
 msgstr "Оператора не обрано."
 
 #. TRANS: Message given saving SMS phone number that is already set.
-#: actions/smssettings.php:343
 msgid "That is already your phone number."
 msgstr "Це і є ваш телефонний номер."
 
 #. TRANS: Message given saving SMS phone number that is already set for another user.
-#: actions/smssettings.php:347
 msgid "That phone number already belongs to another user."
 msgstr "Цей телефонний номер належить іншому користувачу."
 
 #. TRANS: Message given saving valid SMS phone number that is to be confirmed.
-#: actions/smssettings.php:375
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
 "for the code and instructions on how to use it."
@@ -6082,39 +5011,32 @@ msgstr ""
 "Перевірте вхідні повідомлення, там має бути код та подальші інструкції."
 
 #. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
-#: actions/smssettings.php:403
 msgid "That is the wrong confirmation number."
 msgstr "Це помилковий код підтвердження."
 
 #. TRANS: Message given after successfully canceling SMS phone number confirmation.
-#: actions/smssettings.php:417
 msgid "SMS confirmation cancelled."
 msgstr "Підтвердження SMS скасовано."
 
 #. TRANS: Message given trying to remove an SMS phone number that is not
 #. TRANS: registered for the active user.
-#: actions/smssettings.php:437
 msgid "That is not your phone number."
 msgstr "Це не ваш телефонний номер."
 
 #. TRANS: Message given after successfully removing a registered SMS phone number.
-#: actions/smssettings.php:459
 msgid "The SMS phone number was removed."
 msgstr "Телефонний номер для SMS був видалений."
 
 #. TRANS: Label for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:498
 msgid "Mobile carrier"
 msgstr "Мобільний оператор"
 
 #. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:503
 msgid "Select a carrier"
 msgstr "Оберіть оператора"
 
 #. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
 #. TRANS: %s is an administrative contact's e-mail address.
-#: actions/smssettings.php:512
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -6125,118 +5047,93 @@ msgstr ""
 "на %s і ми внесемо його до списку."
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
-#: actions/smssettings.php:534
 msgid "No code entered."
 msgstr "Код не введено."
 
 #. TRANS: Menu item for site administration
-#: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
-#: lib/adminpanelaction.php:395
 msgid "Snapshots"
 msgstr "Снепшоти"
 
-#: actions/snapshotadminpanel.php:65
 msgid "Manage snapshot configuration"
 msgstr "Керування конфігурацією знімку"
 
-#: actions/snapshotadminpanel.php:127
 msgid "Invalid snapshot run value."
 msgstr "Помилкове значення снепшоту."
 
-#: actions/snapshotadminpanel.php:133
 msgid "Snapshot frequency must be a number."
 msgstr "Частота повторення снепшотів має містити цифру."
 
-#: actions/snapshotadminpanel.php:144
 msgid "Invalid snapshot report URL."
 msgstr "Помилковий снепшот URL."
 
-#: actions/snapshotadminpanel.php:200
 msgid "Randomly during web hit"
 msgstr "Випадково під час веб-звернення"
 
-#: actions/snapshotadminpanel.php:201
 msgid "In a scheduled job"
 msgstr "Згідно плану робіт"
 
-#: actions/snapshotadminpanel.php:206
 msgid "Data snapshots"
 msgstr "Снепшоти даних"
 
-#: actions/snapshotadminpanel.php:208
 msgid "When to send statistical data to status.net servers"
 msgstr "Коли надсилати статистичні дані до серверів status.net"
 
-#: actions/snapshotadminpanel.php:217
 msgid "Frequency"
 msgstr "Частота"
 
-#: actions/snapshotadminpanel.php:218
 msgid "Snapshots will be sent once every N web hits"
 msgstr "Снепшоти надсилатимуться раз на N веб-хітів"
 
-#: actions/snapshotadminpanel.php:226
 msgid "Report URL"
 msgstr "Звітня URL-адреса"
 
-#: actions/snapshotadminpanel.php:227
 msgid "Snapshots will be sent to this URL"
 msgstr "Снепшоти надсилатимуться на цю URL-адресу"
 
-#: actions/snapshotadminpanel.php:248
 msgid "Save snapshot settings"
 msgstr "Зберегти налаштування знімку"
 
 #. TRANS: Client error displayed trying a change a subscription for a non-subscribed profile.
-#: actions/subedit.php:75
 msgid "You are not subscribed to that profile."
 msgstr "Ви не підписані до цього профілю."
 
 #. TRANS: Server error displayed when updating a subscription fails with a database error.
 #. TRANS: Exception thrown when a subscription could not be stored on the server.
-#: actions/subedit.php:89 classes/Subscription.php:141
 msgid "Could not save subscription."
 msgstr "Не вдалося зберегти підписку."
 
 #. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
-#: actions/subscribe.php:121
 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
 msgstr "Цією дією ви не зможете підписатися до віддаленого профілю OMB 0.1."
 
 #. TRANS: Page title when subscription succeeded.
-#: actions/subscribe.php:149
 msgid "Subscribed"
 msgstr "Підписані"
 
 #. TRANS: Header for list of subscribers for a user (first page).
 #. TRANS: %s is the user's nickname.
-#: actions/subscribers.php:51
 #, php-format
 msgid "%s subscribers"
 msgstr "Підписані до %s"
 
 #. TRANS: Header for list of subscribers for a user (not first page).
 #. TRANS: %1$s is the user's nickname, $2$d is the page number.
-#: actions/subscribers.php:55
 #, php-format
 msgid "%1$s subscribers, page %2$d"
 msgstr "Підписані до %1$s, сторінка %2$d"
 
 #. TRANS: Page notice for page with an overview of all subscribers
 #. TRANS: of the logged in user's own profile.
-#: actions/subscribers.php:68
 msgid "These are the people who listen to your notices."
 msgstr "Тут представлені ті, хто слідкує за вашими дописами."
 
 #. TRANS: Page notice for page with an overview of all subscribers of a user other
 #. TRANS: than the logged in user. %s is the user nickname.
-#: actions/subscribers.php:74
 #, php-format
 msgid "These are the people who listen to %s's notices."
 msgstr "Тут представлені ті, хто слідкує за дописами від %s."
 
 #. TRANS: Subscriber list text when the logged in user has no subscribers.
-#: actions/subscribers.php:114
 msgid ""
 "You have no subscribers. Try subscribing to people you know and they might "
 "return the favor."
@@ -6246,7 +5143,6 @@ msgstr ""
 
 #. TRANS: Subscriber list text when looking at the subscribers for a of a user other
 #. TRANS: than the logged in user that has no subscribers. %s is the user nickname.
-#: actions/subscribers.php:118
 #, php-format
 msgid "%s has no subscribers. Want to be the first?"
 msgstr "%s ще не має читачів. Будете першим?"
@@ -6256,7 +5152,6 @@ msgstr "%s ще не має читачів. Будете першим?"
 #. TRANS: This message contains a Markdown URL. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.
-#: actions/subscribers.php:127
 #, php-format
 msgid ""
 "%s has no subscribers. Why not [register an account](%%%%action.register%%%"
@@ -6267,20 +5162,17 @@ msgstr ""
 
 #. TRANS: Header for subscriptions overview for a user (not first page).
 #. TRANS: %1$s is a user nickname, %2$d is the page number.
-#: actions/subscriptions.php:55
 #, php-format
 msgid "%1$s subscriptions, page %2$d"
 msgstr "Підписки %1$s, сторінка %2$d"
 
 #. TRANS: Page notice for page with an overview of all subscriptions
 #. TRANS: of the logged in user's own profile.
-#: actions/subscriptions.php:68
 msgid "These are the people whose notices you listen to."
 msgstr "Тут представлені ті, за чиїми дописами ви слідкуєте."
 
 #. TRANS: Page notice for page with an overview of all subscriptions of a user other
 #. TRANS: than the logged in user. %s is the user nickname.
-#: actions/subscriptions.php:74
 #, php-format
 msgid "These are the people whose notices %s listens to."
 msgstr "Тут представлені ті, за чиїми дописами слідкує %s."
@@ -6289,7 +5181,6 @@ msgstr "Тут представлені ті, за чиїми дописами 
 #. 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.
-#: actions/subscriptions.php:133
 #, php-format
 msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "
@@ -6309,69 +5200,55 @@ msgstr ""
 #. TRANS: than the logged in user that has no subscriptions. %s is the user nickname.
 #. TRANS: Subscription list text when looking at the subscriptions for a of a user that has none
 #. TRANS: as an anonymous user. %s is the user nickname.
-#: actions/subscriptions.php:141 actions/subscriptions.php:147
 #, php-format
 msgid "%s is not listening to anyone."
 msgstr "%s не відслідковує нічого"
 
 #. TRANS: Atom feed title. %s is a profile nickname.
-#: actions/subscriptions.php:176
 #, php-format
 msgid "Subscription feed for %s (Atom)"
 msgstr "Стрічка підписок %s (Atom)"
 
 #. TRANS: Checkbox label for enabling Jabber messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:241 lib/settingsnav.php:110
-#, fuzzy
 msgid "IM"
 msgstr "ІМ"
 
 #. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:256 lib/settingsnav.php:117
 msgid "SMS"
 msgstr "СМС"
 
 #. TRANS: Title for all but the first page of notices with tags.
 #. TRANS: %1$s is the tag, %2$d is the page number.
-#: actions/tag.php:73
 #, php-format
 msgid "Notices tagged with %1$s, page %2$d"
 msgstr "Дописи з теґом %1$s, сторінка %2$d"
 
-#: actions/tag.php:91
 #, php-format
 msgid "Notice feed for tag %s (RSS 1.0)"
 msgstr "Стрічка дописів для теґу %s (RSS 1.0)"
 
-#: actions/tag.php:97
 #, php-format
 msgid "Notice feed for tag %s (RSS 2.0)"
 msgstr "Стрічка дописів для теґу %s (RSS 2.0)"
 
-#: actions/tag.php:103
 #, php-format
 msgid "Notice feed for tag %s (Atom)"
 msgstr "Стрічка дописів для теґу %s (Atom)"
 
-#: actions/tagother.php:39
 msgid "No ID argument."
 msgstr "Немає ID аргументу."
 
-#: actions/tagother.php:65
 #, php-format
 msgid "Tag %s"
 msgstr "Позначити %s"
 
 #. TRANS: H2 for user profile information.
-#: actions/tagother.php:77 lib/userprofile.php:76
 msgid "User profile"
 msgstr "Профіль користувача."
 
-#: actions/tagother.php:120
 msgid "Tag user"
 msgstr "Позначити користувача"
 
-#: actions/tagother.php:130
 msgid ""
 "Tags for this user (letters, numbers, -, ., and _), comma- or space- "
 "separated"
@@ -6379,220 +5256,175 @@ msgstr ""
 "Позначити користувача теґами (літери, цифри, -, . та _), відокремлюючи кожен "
 "комою або пробілом"
 
-#: actions/tagother.php:157
 #, php-format
 msgid "Invalid tag: \"%s\""
 msgstr "Недійсний теґ: «%s»"
 
-#: actions/tagother.php:172
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 "Ви маєте можливість позначати теґами тих, до кого ви підписані, а також тих, "
 "хто є підписаним до вас."
 
-#: actions/tagother.php:215
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr "Скористайтесь цією формою, щоб додати теґи своїм підпискам та читачам."
 
-#: actions/tagrss.php:35
 msgid "No such tag."
 msgstr "Такого теґу немає."
 
 #. TRANS: Client error displayed when trying to unblock a non-blocked user.
-#: actions/unblock.php:59
 msgid "You haven't blocked that user."
 msgstr "Цього користувача блокувати неможливо."
 
-#: actions/unsandbox.php:72
 msgid "User is not sandboxed."
 msgstr "Користувач не у пісочниці."
 
-#: actions/unsilence.php:72
 msgid "User is not silenced."
 msgstr "Користувач поки що має право голосу."
 
-#: actions/unsubscribe.php:77
 msgid "No profile ID in request."
 msgstr "У запиті відсутній ID профілю."
 
-#: actions/unsubscribe.php:98
 msgid "Unsubscribed"
 msgstr "Відписано"
 
-#: actions/updateprofile.php:64
 #, php-format
 msgid ""
 "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
 msgstr "Ліцензія «%1$s» не відповідає ліцензії сайту «%2$s»."
 
-#: actions/urlsettings.php:60
 #, fuzzy
 msgid "URL settings"
 msgstr "Налаштування ІМ"
 
 #. TRANS: Instructions for tab "Other" in user profile settings.
-#: actions/urlsettings.php:72
 msgid "Manage various other options."
 msgstr "Керування деякими іншими опціями."
 
 #. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
 #. TRANS: user's profile settings. This message has one space at the beginning. Use your
 #. TRANS: language's word separator here if it has one (most likely a single space).
-#: actions/urlsettings.php:115
 msgid " (free service)"
 msgstr " (вільний сервіс)"
 
-#: actions/urlsettings.php:121
 #, fuzzy
 msgid "[none]"
 msgstr "Пусто"
 
-#: actions/urlsettings.php:122
 msgid "[internal]"
 msgstr ""
 
 #. TRANS: Label for dropdown with URL shortener services.
-#: actions/urlsettings.php:130
 msgid "Shorten URLs with"
 msgstr "Скорочення URL"
 
 #. TRANS: Tooltip for for dropdown with URL shortener services.
-#: actions/urlsettings.php:132
 msgid "Automatic shortening service to use."
 msgstr "Доступні сервіси."
 
-#: actions/urlsettings.php:138
 msgid "URL longer than"
 msgstr ""
 
-#: actions/urlsettings.php:141
 msgid "URLs longer than this will be shortened, 0 means always shorten."
 msgstr ""
 
-#: actions/urlsettings.php:145
 msgid "Text longer than"
 msgstr ""
 
-#: actions/urlsettings.php:148
 msgid ""
 "URLs in notices longer than this will be shortened, 0 means always shorten."
 msgstr ""
 
 #. TRANS: Form validation error for form "Other settings" in user profile.
-#: actions/urlsettings.php:180
 msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr "Сервіс скорочення URL-адрес надто довгий (50 символів максимум)."
 
-#: actions/urlsettings.php:187
 msgid "Invalid number for max url length."
 msgstr ""
 
-#: actions/urlsettings.php:193
 #, fuzzy
 msgid "Invalid number for max notice length."
 msgstr "Недійсний зміст допису."
 
-#: actions/urlsettings.php:238
 msgid "Error saving user URL shortening preferences."
 msgstr ""
 
 #. TRANS: User admin panel title
-#: actions/useradminpanel.php:58
 msgctxt "TITLE"
 msgid "User"
 msgstr "Користувач"
 
 #. TRANS: Instruction for user admin panel.
-#: actions/useradminpanel.php:69
 msgid "User settings for this StatusNet site"
 msgstr "Налаштування користувача даного сайту StatusNet"
 
 #. TRANS: Form validation error in user admin panel when a non-numeric character limit was set.
-#: actions/useradminpanel.php:147
 msgid "Invalid bio limit. Must be numeric."
 msgstr "Помилкове обмеження біо. Це мають бути цифри."
 
 #. TRANS: Form validation error in user admin panel when welcome text is too long.
-#: actions/useradminpanel.php:154
 msgid "Invalid welcome text. Maximum length is 255 characters."
 msgstr "Помилковий текст привітання. Максимальна довжина — 255 символів."
 
 #. TRANS: Client error displayed when trying to set a non-existing user as default subscription for new
 #. TRANS: users in user admin panel. %1$s is the invalid nickname.
-#: actions/useradminpanel.php:166
 #, php-format
 msgid "Invalid default subscripton: \"%1$s\" is not a user."
 msgstr "Помилкова підписка за замовчуванням: «%1$s» не є користувачем."
 
-#: actions/useradminpanel.php:215 lib/action.php:565 lib/settingsnav.php:77
-#: lib/subgroupnav.php:81
 msgid "Profile"
 msgstr "Профіль"
 
 #. TRANS: Field label in user admin panel for setting the character limit for the bio field.
-#: actions/useradminpanel.php:220
 msgid "Bio Limit"
 msgstr "Обмеження біо"
 
 #. TRANS: Tooltip in user admin panel for setting the character limit for the bio field.
-#: actions/useradminpanel.php:222
 msgid "Maximum length of a profile bio in characters."
 msgstr "Максимальна довжина біо користувача в знаках."
 
 #. TRANS: Form legend in user admin panel.
-#: actions/useradminpanel.php:231
 msgid "New users"
 msgstr "Нові користувачі"
 
 #. TRANS: Field label in user admin panel for setting new user welcome text.
-#: actions/useradminpanel.php:236
 msgid "New user welcome"
 msgstr "Привітання нового користувача"
 
 #. TRANS: Tooltip in user admin panel for setting new user welcome text.
-#: actions/useradminpanel.php:238
 msgid "Welcome text for new users (maximum 255 characters)."
 msgstr "Текст привітання нових користувачів (не більше 255 символів)."
 
 #. TRANS: Field label in user admin panel for setting default subscription for new users.
-#: actions/useradminpanel.php:244
 msgid "Default subscription"
 msgstr "Підписка за замовчуванням"
 
 #. TRANS: Tooltip in user admin panel for setting default subscription for new users.
-#: actions/useradminpanel.php:246
 msgid "Automatically subscribe new users to this user."
 msgstr "Автоматично підписувати нових користувачів до цього користувача."
 
 #. TRANS: Form legend in user admin panel.
-#: actions/useradminpanel.php:256
 msgid "Invitations"
 msgstr "Запрошення"
 
 #. TRANS: Field label for checkbox in user admin panel for allowing users to invite friend using site e-mail.
-#: actions/useradminpanel.php:262
 msgid "Invitations enabled"
 msgstr "Запрошення скасовано"
 
 #. TRANS: Tooltip for checkbox in user admin panel for allowing users to invite friend using site e-mail.
-#: actions/useradminpanel.php:265
 msgid "Whether to allow users to invite new users."
 msgstr ""
 "В той чи інший спосіб дозволити користувачам вітати нових користувачів."
 
 #. TRANS: Title for button to save user settings in user admin panel.
-#: actions/useradminpanel.php:302
 msgid "Save user settings."
 msgstr "Зберегти налаштування користувача."
 
 #. TRANS: Page title.
-#: actions/userauthorization.php:109
 msgid "Authorize subscription"
 msgstr "Авторизувати підписку"
 
 #. TRANS: Page notice on "Auhtorize subscription" page.
-#: actions/userauthorization.php:115
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
 "user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
@@ -6603,38 +5435,31 @@ msgstr ""
 "підписуватись, то просто натисніть «Відмінити»."
 
 #. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:200
 msgctxt "BUTTON"
 msgid "Accept"
 msgstr "Погодитись"
 
 #. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:202
 msgid "Subscribe to this user."
 msgstr "Підписатися до цього користувача."
 
 #. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:204
 msgctxt "BUTTON"
 msgid "Reject"
 msgstr "Відхилити"
 
 #. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:206
 msgid "Reject this subscription."
 msgstr "Відхилити підписку."
 
 #. TRANS: Client error displayed for an empty authorisation request.
-#: actions/userauthorization.php:219
 msgid "No authorization request!"
 msgstr "Немає запиту на авторизацію!"
 
 #. TRANS: Accept message header from Authorise subscription page.
-#: actions/userauthorization.php:242
 msgid "Subscription authorized"
 msgstr "Підписку авторизовано"
 
-#: actions/userauthorization.php:245
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to authorize the "
@@ -6645,11 +5470,9 @@ msgstr ""
 "авторизувати підписку. Ваш підписний токен:"
 
 #. TRANS: Reject message header from Authorise subscription page.
-#: actions/userauthorization.php:256
 msgid "Subscription rejected"
 msgstr "Підписку скинуто"
 
-#: actions/userauthorization.php:259
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to fully reject the "
@@ -6661,35 +5484,30 @@ msgstr ""
 
 #. TRANS: Exception thrown when no valid user is found for an authorisation request.
 #. TRANS: %s is a listener URI.
-#: actions/userauthorization.php:296
 #, php-format
 msgid "Listener URI \"%s\" not found here."
 msgstr "URI слухача «%s» тут не знайдено."
 
 #. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
 #. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:303
 #, php-format
 msgid "Listenee URI \"%s\" is too long."
 msgstr "URI слухача «%s» задовге."
 
 #. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
 #. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:311
 #, php-format
 msgid "Listenee URI \"%s\" is a local user."
 msgstr "URI слухача «%s» — це локальний користувач."
 
 #. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
 #. TRANS: %s is a profile URL.
-#: actions/userauthorization.php:329
 #, php-format
 msgid "Profile URL \"%s\" is for a local user."
 msgstr "URL-адреса профілю «%s» для локального користувача."
 
 #. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
 #. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
-#: actions/userauthorization.php:339
 #, php-format
 msgid ""
 "Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
@@ -6698,32 +5516,27 @@ msgstr "Ліцензія потоку «%1$s» є несумісною з ліц
 
 #. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
 #. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:349
 #, php-format
 msgid "Avatar URL \"%s\" is not valid."
 msgstr "URL-адреса аватари «%s» не є дійсною."
 
 #. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
 #. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:356
 #, php-format
 msgid "Cannot read avatar URL \"%s\"."
 msgstr "Не вдалося прочитати URL аватари «%s»."
 
 #. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
 #. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:363
 #, php-format
 msgid "Wrong image type for avatar URL \"%s\"."
 msgstr "Неправильний тип зображення для URL аватари «%s»."
 
 #. TRANS: Page title for profile design page.
-#: actions/userdesignsettings.php:74 lib/designsettings.php:61
 msgid "Profile design"
 msgstr "Дизайн профілю"
 
 #. TRANS: Instructions for profile design page.
-#: actions/userdesignsettings.php:84 lib/designsettings.php:72
 msgid ""
 "Customize the way your profile looks with a background image and a colour "
 "palette of your choice."
@@ -6731,44 +5544,35 @@ msgstr ""
 "Налаштуйте вигляд сторінки свого профілю, використовуючи фонове зображення і "
 "кольори на свій смак."
 
-#: actions/userdesignsettings.php:289
 msgid "Enjoy your hotdog!"
 msgstr "Поласуйте бутербродом!"
 
-#: actions/userdesignsettings.php:325
 #, fuzzy
 msgid "Design settings"
 msgstr "Зберегти налаштування сайту"
 
-#: actions/userdesignsettings.php:340
 msgid "View profile designs"
 msgstr "Переглядати дизайн користувачів"
 
-#: actions/userdesignsettings.php:341
 msgid "Show or hide profile designs."
 msgstr "Показувати або приховувати дизайни сторінок окремих користувачів."
 
-#: actions/userdesignsettings.php:348
 #, fuzzy
 msgid "Background file"
 msgstr "Фон"
 
 #. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number.
-#: actions/usergroups.php:66
 #, php-format
 msgid "%1$s groups, page %2$d"
 msgstr "Спільноти %1$s, сторінка %2$d"
 
-#: actions/usergroups.php:132
 msgid "Search for more groups"
 msgstr "Пошук інших спільнот"
 
-#: actions/usergroups.php:159
 #, php-format
 msgid "%s is not a member of any group."
 msgstr "%s не є учасником жодної спільноти."
 
-#: actions/usergroups.php:164
 #, php-format
 msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
 msgstr ""
@@ -6780,18 +5584,14 @@ msgstr ""
 #. TRANS: %1$s is a group name, %2$s is a site name.
 #. TRANS: Message is used as a subtitle in atom user notice feed.
 #. TRANS: %1$s is a user name, %2$s is a site name.
-#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:70
-#: lib/atomusernoticefeed.php:95
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr "Оновлення від %1$s на %2$s!"
 
-#: actions/version.php:75
 #, php-format
 msgid "StatusNet %s"
 msgstr "StatusNet %s"
 
-#: actions/version.php:155
 #, php-format
 msgid ""
 "This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
@@ -6800,16 +5600,13 @@ msgstr ""
 "Цей сайт працює на %1$s, версія %2$s. Авторські права 2008-2010 StatusNet, "
 "Inc. і розробники."
 
-#: actions/version.php:163
 msgid "Contributors"
 msgstr "Розробники"
 
 #. TRANS: Menu item for site administration
-#: actions/version.php:167 lib/adminpanelaction.php:403
 msgid "License"
 msgstr "Ліцензія"
 
-#: actions/version.php:170
 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 "
@@ -6821,7 +5618,6 @@ msgstr ""
 "їх було опубліковано Free Software Foundation, 3-тя версія ліцензії або (на "
 "ваш розсуд) будь-яка подальша версія. "
 
-#: actions/version.php:176
 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 "
@@ -6833,7 +5629,6 @@ msgstr ""
 "ПРИДАТНОСТІ ДЛЯ ДОСЯГНЕННЯ ПЕВНОЇ МЕТИ. Щодо більш детальних роз’яснень, "
 "ознайомтесь з умовами GNU Affero General Public License. "
 
-#: actions/version.php:182
 #, php-format
 msgid ""
 "You should have received a copy of the GNU Affero General Public License "
@@ -6843,52 +5638,42 @@ msgstr ""
 "General Public License. Якщо ні, перейдіть на %s."
 
 #. TRANS: Form input field label for application name.
-#: actions/version.php:197 lib/applicationeditform.php:190
 msgid "Name"
 msgstr "Ім’я"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:885
 msgid "Version"
 msgstr "Версія"
 
-#: actions/version.php:199
 msgid "Author(s)"
 msgstr "Автор(и)"
 
 #. TRANS: Form input field label.
-#: actions/version.php:200 lib/applicationeditform.php:208
-#: lib/groupeditform.php:168
 msgid "Description"
 msgstr "Опис"
 
 #. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:164
 msgid "Favor"
 msgstr "Обрати"
 
 #. TRANS: Ntofication given when a user marks a notice as favorite.
 #. TRANS: %1$s is a user nickname or full name, %2$s is a notice URI.
-#: classes/Fave.php:167
 #, php-format
 msgid "%1$s marked notice %2$s as a favorite."
 msgstr "%1$s додав(ла) ваш допис %2$s до обраних."
 
 #. TRANS: Server exception thrown when a URL cannot be processed.
-#: classes/File.php:162
 #, php-format
 msgid "Cannot process URL '%s'"
 msgstr "Неможливо обробити URL «%s»"
 
 #. TRANS: Server exception thrown when... Robin thinks something is impossible!
-#: classes/File.php:194
 msgid "Robin thinks something is impossible."
 msgstr "Робін вважає, що це неможливо."
 
 #. 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$s is used for plural.
-#: classes/File.php:210
 #, php-format
 msgid ""
 "No file may be larger than %1$d byte and the file you sent was %2$d bytes. "
@@ -6908,7 +5693,6 @@ msgstr[2] ""
 
 #. TRANS: Message given if an upload would exceed user quota.
 #. TRANS: %d (number) is the user quota in bytes and is used for plural.
-#: classes/File.php:223
 #, php-format
 msgid "A file this large would exceed your user quota of %d byte."
 msgid_plural "A file this large would exceed your user quota of %d bytes."
@@ -6918,7 +5702,6 @@ msgstr[2] "Розміри цього файлу перевищують вашу
 
 #. TRANS: Message given id an upload would exceed a user's monthly quota.
 #. TRANS: $d (number) is the monthly user quota in bytes and is used for plural.
-#: classes/File.php:235
 #, php-format
 msgid "A file this large would exceed your monthly quota of %d byte."
 msgid_plural "A file this large would exceed your monthly quota of %d bytes."
@@ -6927,108 +5710,89 @@ msgstr[1] "Розміри цього файлу перевищують вашу
 msgstr[2] "Розміри цього файлу перевищують вашу місячну квоту у %d байтів."
 
 #. TRANS: Client exception thrown if a file upload does not have a valid name.
-#: classes/File.php:282 classes/File.php:297
 msgid "Invalid filename."
 msgstr "Невірне ім’я файлу."
 
 #. TRANS: Exception thrown when joining a group fails.
-#: classes/Group_member.php:51
 msgid "Group join failed."
 msgstr "Не вдалося приєднатися до спільноти."
 
 #. TRANS: Exception thrown when trying to leave a group the user is not a member of.
-#: classes/Group_member.php:64
 msgid "Not part of group."
 msgstr "Не є частиною спільноти."
 
 #. TRANS: Exception thrown when trying to leave a group fails.
-#: classes/Group_member.php:72
 msgid "Group leave failed."
 msgstr "Не вдалося залишити спільноту."
 
 #. TRANS: Exception thrown providing an invalid profile ID.
 #. TRANS: %s is the invalid profile ID.
-#: classes/Group_member.php:85
 #, php-format
 msgid "Profile ID %s is invalid."
 msgstr "Ід. номер профілю %s не є дійсним."
 
 #. TRANS: Exception thrown providing an invalid group ID.
 #. TRANS: %s is the invalid group ID.
-#: classes/Group_member.php:98
 #, php-format
 msgid "Group ID %s is invalid."
 msgstr "Ідентифікатор спільноти %s є недійсним."
 
 #. TRANS: Activity title.
-#: classes/Group_member.php:147 lib/joinform.php:114
 msgid "Join"
 msgstr "Приєднатись"
 
 #. TRANS: Success message for subscribe to group attempt through OStatus.
 #. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
-#: classes/Group_member.php:151
 #, php-format
 msgid "%1$s has joined group %2$s."
 msgstr "%1$s долучився до спільноти %2$s."
 
 #. TRANS: Server exception thrown when updating a local group fails.
-#: classes/Local_group.php:42
 msgid "Could not update local group."
 msgstr "Не вдається оновити локальну спільноту."
 
 #. TRANS: Exception thrown when trying creating a login token failed.
 #. TRANS: %s is the user nickname for which token creation failed.
-#: classes/Login_token.php:78
 #, php-format
 msgid "Could not create login token for %s"
 msgstr "Не вдалося створити токен входу для %s"
 
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
-#: classes/Memcached_DataObject.php:556
 msgid "No database name or DSN found anywhere."
 msgstr "Немає імені бази даних або DSN ніде не знайдено"
 
 #. TRANS: Client exception thrown when a user tries to send a direct message while being banned from sending them.
-#: classes/Message.php:45
 msgid "You are banned from sending direct messages."
 msgstr "Вам заборонено надсилати прямі повідомлення."
 
 #. TRANS: Message given when a message could not be stored on the server.
-#: classes/Message.php:69
 msgid "Could not insert message."
 msgstr "Не можна долучити повідомлення."
 
 #. TRANS: Message given when a message could not be updated on the server.
-#: classes/Message.php:80
 msgid "Could not update message with new URI."
 msgstr "Не можна оновити повідомлення з новим URI."
 
 #. TRANS: Server exception thrown when a user profile for a notice cannot be found.
 #. TRANS: %1$d is a profile ID (number), %2$d is a notice ID (number).
-#: classes/Notice.php:98
 #, php-format
 msgid "No such profile (%1$d) for notice (%2$d)."
 msgstr "Немає такого профілю (%1$d) для повідомлення (%2$d)."
 
 #. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:199
 #, php-format
 msgid "Database error inserting hashtag: %s"
 msgstr "Помилка бази даних при додаванні хеш-теґу: %s"
 
 #. TRANS: Client exception thrown if a notice contains too many characters.
-#: classes/Notice.php:279
 msgid "Problem saving notice. Too long."
 msgstr "Проблема при збереженні допису. Надто довге."
 
 #. TRANS: Client exception thrown when trying to save a notice for an unknown user.
-#: classes/Notice.php:284
 msgid "Problem saving notice. Unknown user."
 msgstr "Проблема при збереженні допису. Невідомий користувач."
 
 #. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
-#: classes/Notice.php:290
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
@@ -7036,7 +5800,6 @@ msgstr ""
 "повертайтесь за кілька хвилин."
 
 #. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
-#: classes/Notice.php:297
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
 "few minutes."
@@ -7045,42 +5808,35 @@ msgstr ""
 "повертайтесь за кілька хвилин."
 
 #. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:305
 msgid "You are banned from posting notices on this site."
 msgstr "Вам заборонено надсилати дописи до цього сайту."
 
 #. TRANS: Server exception thrown when a notice cannot be saved.
 #. TRANS: Server exception thrown when a notice cannot be updated.
-#: classes/Notice.php:372 classes/Notice.php:399
 msgid "Problem saving notice."
 msgstr "Проблема при збереженні допису."
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:929
 msgid "Bad type provided to saveKnownGroups."
 msgstr "Вказано невірний тип для saveKnownGroups."
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:1028
 msgid "Problem saving group inbox."
 msgstr "Проблема при збереженні вхідних дописів спільноти."
 
 #. TRANS: Server exception thrown when a reply cannot be saved.
 #. TRANS: %1$d is a notice ID, %2$d is the ID of the mentioned user.
-#: classes/Notice.php:1144
 #, php-format
 msgid "Could not save reply for %1$d, %2$d."
 msgstr "Не вдалося зберегти відповідь для %1$d, %2$d."
 
 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1663
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
 
 #. TRANS: Full name of a profile or group followed by nickname in parens
-#: classes/Profile.php:172 classes/User_group.php:242
 #, php-format
 msgctxt "FANCYNAME"
 msgid "%1$s (%2$s)"
@@ -7088,265 +5844,209 @@ msgstr "%1$s (%2$s)"
 
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:779
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr "Не вдалося скасувати роль «%s» для користувача #%2$s; не існує."
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:788
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
 "Не вдалося скасувати роль «%1$s» для користувача #%2$s; помилка бази даних."
 
 #. TRANS: Exception thrown when a right for a non-existing user profile is checked.
-#: classes/Remote_profile.php:54
 msgid "Missing profile."
 msgstr "Загублений профіль."
 
 #. TRANS: Exception thrown when a tag cannot be saved.
-#: classes/Status_network.php:338
 msgid "Unable to save tag."
 msgstr "Не вдається зберегти теґ."
 
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#: classes/Subscription.php:77 lib/oauthstore.php:482
 msgid "You have been banned from subscribing."
 msgstr "Вас позбавлено можливості підписатись."
 
 #. TRANS: Exception thrown when trying to subscribe while already subscribed.
-#: classes/Subscription.php:82
 msgid "Already subscribed!"
 msgstr "Вже підписаний!"
 
 #. TRANS: Exception thrown when trying to subscribe to a user who has blocked the subscribing user.
-#: classes/Subscription.php:87
 msgid "User has blocked you."
 msgstr "Користувач заблокував вас."
 
 #. TRANS: Exception thrown when trying to unsibscribe without a subscription.
-#: classes/Subscription.php:176
 msgid "Not subscribed!"
 msgstr "Не підписано!"
 
 #. TRANS: Exception thrown when trying to unsubscribe a user from themselves.
-#: classes/Subscription.php:183
 msgid "Could not delete self-subscription."
 msgstr "Не можу видалити самопідписку."
 
 #. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
-#: classes/Subscription.php:211
 msgid "Could not delete subscription OMB token."
 msgstr "Не вдається видалити токен підписки OMB."
 
 #. TRANS: Exception thrown when a subscription could not be deleted on the server.
-#: classes/Subscription.php:223
 msgid "Could not delete subscription."
 msgstr "Не вдалося видалити підписку."
 
 #. TRANS: Activity tile when subscribing to another person.
-#: classes/Subscription.php:265
 msgid "Follow"
 msgstr "Слідкувати"
 
 #. TRANS: Notification given when one person starts following another.
 #. TRANS: %1$s is the subscriber, %2$s is the subscribed.
-#: classes/Subscription.php:268
 #, php-format
 msgid "%1$s is now following %2$s."
 msgstr "%1$s тепер слідкує за %2$s."
 
 #. TRANS: Notice given on user registration.
 #. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:390
 #, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr "Вітаємо на %1$s, @%2$s!"
 
 #. TRANS: Server exception.
-#: classes/User.php:923
 msgid "No single user defined for single-user mode."
 msgstr "Користувача для однокористувацького режиму не визначено."
 
 #. TRANS: Server exception.
-#: classes/User.php:927
 msgid "Single-user mode code called when not enabled."
 msgstr "Код для однокористувацького режиму називається, коли не ввімкнуто."
 
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:522
 msgid "Could not create group."
 msgstr "Не вдалося створити нову спільноту."
 
 #. TRANS: Server exception thrown when updating a group URI failed.
-#: classes/User_group.php:532
 msgid "Could not set group URI."
 msgstr "Не вдалося встановити URI спільноти."
 
 #. TRANS: Server exception thrown when setting group membership failed.
-#: classes/User_group.php:555
 msgid "Could not set group membership."
 msgstr "Не вдалося встановити членство."
 
 #. TRANS: Server exception thrown when saving local group information failed.
-#: classes/User_group.php:570
 msgid "Could not save local group info."
 msgstr "Не вдалося зберегти інформацію про локальну спільноту."
 
 #. TRANS: Exception thrown when an account could not be located when it should be moved.
 #. TRANS: %s is the remote site.
-#: lib/accountmover.php:65
 #, php-format
 msgid "Cannot locate account %s."
 msgstr "Не вдається знайти акаунт %s."
 
 #. TRANS: Exception thrown when a service document could not be located account move.
 #. TRANS: %s is the remote site.
-#: lib/accountmover.php:106
 #, php-format
 msgid "Cannot find XRD for %s."
 msgstr "Не вдається знайти XRD для %s."
 
 #. TRANS: Exception thrown when an account could not be located when it should be moved.
 #. TRANS: %s is the remote site.
-#: lib/accountmover.php:131
 #, php-format
 msgid "No AtomPub API service for %s."
 msgstr "Немає послуги AtomPub API для %s."
 
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: lib/action.php:161
 #, php-format
 msgid "%1$s - %2$s"
 msgstr "%1$s — %2$s"
 
 #. TRANS: Page title for a page without a title set.
-#: lib/action.php:177
 msgid "Untitled page"
 msgstr "Сторінка без заголовку"
 
 #. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.
-#: lib/action.php:325
 msgctxt "TOOLTIP"
 msgid "Show more"
 msgstr "Розгорнути"
 
 #. TRANS: Inline reply form submit button: submits a reply comment.
-#: lib/action.php:328
 #, fuzzy
 msgctxt "BUTTON"
-msgid "Comment"
-msgstr "Зміст"
+msgid "Reply"
+msgstr "Відповісти"
 
 #. TRANS: Placeholder text for inline reply form. Clicking in this box will turn it into a mini notice form.
-#: lib/action.php:331
-msgid "Add a comment..."
+msgid "Write a reply..."
 msgstr ""
 
-#: lib/action.php:559 lib/personalgroupnav.php:99
-#, fuzzy
 msgid "Home"
 msgstr "Веб-сторінка"
 
-#: lib/action.php:560
 #, fuzzy
 msgid "Friends timeline"
 msgstr "%s стрічка"
 
-#: lib/action.php:566
-#, fuzzy
 msgid "Your profile"
 msgstr "Профіль спільноти"
 
-#: lib/action.php:570 lib/action.php:593 lib/publicgroupnav.php:78
 msgid "Public"
 msgstr "Загал"
 
-#: lib/action.php:571 lib/action.php:594
 #, fuzzy
 msgid "Everyone on this site"
 msgstr "Пошук людей на цьому сайті"
 
-#: lib/action.php:575
-#, fuzzy
 msgid "Settings"
 msgstr "Налаштування СМС"
 
-#: lib/action.php:576
 #, fuzzy
 msgid "Change your personal settings"
 msgstr "Змінити налаштування профілю"
 
-#: lib/action.php:582
 #, fuzzy
 msgid "Site configuration"
 msgstr "Конфігурація користувача"
 
-#: lib/action.php:587
-#, fuzzy
 msgid "Logout"
 msgstr "Вийти"
 
-#: lib/action.php:588
-#, fuzzy
 msgid "Logout from the site"
 msgstr "Вийти з сайту"
 
-#: lib/action.php:599
-#, fuzzy
 msgid "Login to the site"
 msgstr "Увійти на сайт"
 
-#: lib/action.php:606
-#, fuzzy
 msgid "Search"
 msgstr "Пошук"
 
-#: lib/action.php:607
 #, fuzzy
 msgid "Search the site"
 msgstr "Пошук"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:864
 msgid "Help"
 msgstr "Допомога"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:867
 msgid "About"
 msgstr "Про"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:870
 msgid "FAQ"
 msgstr "ЧаП"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:875
 msgid "TOS"
 msgstr "Умови"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:879
 msgid "Privacy"
 msgstr "Приватність"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:882
 msgid "Source"
 msgstr "Джерело"
 
 #. TRANS: Secondary navigation menu option leading to e-mail contact information on the
 #. TRANS: StatusNet site, where to report bugs, ...
-#: lib/action.php:889
 msgid "Contact"
 msgstr "Контакт"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:892
 msgid "Badge"
 msgstr "Бедж"
 
@@ -7354,7 +6054,6 @@ msgstr "Бедж"
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:921
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7364,7 +6063,6 @@ msgstr ""
 "site.broughtbyurl%%)."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:924
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** — це сервіс мікроблоґів."
@@ -7373,7 +6071,6 @@ msgstr "**%%site.name%%** — це сервіс мікроблоґів."
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:931
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7386,106 +6083,88 @@ msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:949
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr "Зміст і дані %1$s є приватними і конфіденційними."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:956
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr "Авторські права на зміст і дані належать %1$s. Всі права захищено."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:960
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 "Авторські права на зміст і дані належать розробникам. Всі права захищено."
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:992
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr "Весь зміст і дані %1$s доступні на умовах ліцензії %2$s."
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1335
 msgid "After"
 msgstr "Вперед"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1345
 msgid "Before"
 msgstr "Назад"
 
 #. TRANS: Client exception thrown when a feed instance is a DOMDocument.
-#: lib/activity.php:125
 msgid "Expecting a root feed element but got a whole XML document."
 msgstr ""
 "В очікуванні кореневого елементу веб-стрічки, отримали цілий документ XML."
 
 #. TRANS: Client exception thrown when using an unknown verb for the activity importer.
-#: lib/activityimporter.php:81
 #, php-format
 msgid "Unknown verb: \"%s\"."
 msgstr "Невідоме дієслово: «%s»."
 
 #. TRANS: Client exception thrown when trying to force a subscription for an untrusted user.
-#: lib/activityimporter.php:107
 msgid "Cannot force subscription for untrusted user."
 msgstr "Примусова підписка ненадійних користувачів є неможливою."
 
 #. TRANS: Client exception thrown when trying to for a remote user to subscribe.
-#: lib/activityimporter.php:117
 msgid "Cannot force remote user to subscribe."
 msgstr "Примусова підписка віддалених користувачів є неможливою."
 
 #. TRANS: Client exception thrown when trying to subscribe to an unknown profile.
-#: lib/activityimporter.php:132
 msgid "Unknown profile."
 msgstr "Невідомий профіль."
 
 #. TRANS: Client exception thrown when trying to import an event not related to the importing user.
-#: lib/activityimporter.php:138
 msgid "This activity seems unrelated to our user."
 msgstr "Ця активність, здається, не пов’язана з нашим користувачем."
 
 #. TRANS: Client exception thrown when trying to join a remote group that is not a group.
-#: lib/activityimporter.php:154
 msgid "Remote profile is not a group!"
 msgstr "Віддалений профіль не є спільнотою!"
 
 #. TRANS: Client exception thrown when trying to join a group the importing user is already a member of.
-#: lib/activityimporter.php:163
 msgid "User is already a member of this group."
 msgstr "Користувач вже є учасником цієї спільноти."
 
 #. TRANS: Client exception thrown when trying to import a notice by another user.
 #. TRANS: %1$s is the source URI of the notice, %2$s is the URI of the author.
-#: lib/activityimporter.php:201
 #, php-format
 msgid "Already know about notice %1$s and  it has a different author %2$s."
 msgstr "Вже відомо про допис %1$s, який належить іншому авторові %2$s."
 
 #. TRANS: Client exception thrown when trying to overwrite the author information for a non-trusted user during import.
-#: lib/activityimporter.php:207
 msgid "Not overwriting author info for non-trusted user."
 msgstr ""
 "Не можу перезаписати інформацію щодо авторства для  ненадійного користувача."
 
 #. TRANS: Client exception thrown when trying to import a notice without content.
 #. TRANS: %s is the notice URI.
-#: lib/activityimporter.php:223
 #, php-format
 msgid "No content for notice %s."
 msgstr "Допис %s не має змісту."
 
-#: lib/activitymover.php:84
 #, php-format
 msgid "No such user %s."
 msgstr "Користувача %s немає."
@@ -7496,211 +6175,171 @@ msgstr "Користувача %s немає."
 #. TRANS: %1$s is a URL, %2$s is the status, %s$s is the fail reason.
 #. TRANS: Exception thrown when post to collection fails with a status that is not handled.
 #. TRANS: %1$s is a URL, %2$s is the status, %s$s is the fail reason.
-#: lib/activitysink.php:163 lib/activitysink.php:167 lib/activitysink.php:172
 #, php-format
 msgctxt "URLSTATUSREASON"
 msgid "%1$s %2$s %3$s"
 msgstr "%1$s %2$s %3$s"
 
 #. TRANS: Client exception thrown when there is no source attribute.
-#: lib/activityutils.php:200
 msgid "Can't handle remote content yet."
 msgstr "Поки що не можу обробити віддалений контент."
 
 #. TRANS: Client exception thrown when there embedded XML content is found that cannot be processed yet.
-#: lib/activityutils.php:237
 msgid "Can't handle embedded XML content yet."
 msgstr "Поки що не можу обробити вбудований XML контент."
 
 #. TRANS: Client exception thrown when base64 encoded content is found that cannot be processed yet.
-#: lib/activityutils.php:242
 msgid "Can't handle embedded Base64 content yet."
 msgstr "Поки що не можу обробити вбудований контент Base64."
 
 #. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights.
-#: lib/adminpanelaction.php:96
 msgid "You cannot make changes to this site."
 msgstr "Ви не можете щось змінювати на цьому сайті."
 
 #. TRANS: Client error message throw when a certain panel's settings cannot be changed.
-#: lib/adminpanelaction.php:108
 msgid "Changes to that panel are not allowed."
 msgstr "Для цієї панелі зміни не припустимі."
 
 #. TRANS: Client error message.
-#: lib/adminpanelaction.php:222
 msgid "showForm() not implemented."
 msgstr "showForm() не виконано."
 
 #. TRANS: Client error message
-#: lib/adminpanelaction.php:250
 msgid "saveSettings() not implemented."
 msgstr "saveSettings() не виконано."
 
 #. TRANS: Client error message thrown if design settings could not be deleted in
 #. TRANS: the admin panel Design.
-#: lib/adminpanelaction.php:274
 msgid "Unable to delete design setting."
 msgstr "Немає можливості видалити налаштування дизайну."
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:337
 msgid "Basic site configuration"
 msgstr "Основна конфігурація сайту"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:339
 msgctxt "MENU"
 msgid "Site"
 msgstr "Сайт"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:345
 msgid "Design configuration"
 msgstr "Конфігурація дизайну"
 
 #. TRANS: Menu item for site administration
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/adminpanelaction.php:347 lib/groupnav.php:135
 msgctxt "MENU"
 msgid "Design"
 msgstr "Дизайн"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:353
 msgid "User configuration"
 msgstr "Конфігурація користувача"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:110
 msgid "User"
 msgstr "Користувач"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:361
 msgid "Access configuration"
 msgstr "Прийняти конфігурацію"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:369
 msgid "Paths configuration"
 msgstr "Конфігурація шляху"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:377
 msgid "Sessions configuration"
 msgstr "Конфігурація сесій"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:385
 msgid "Edit site notice"
 msgstr "Редагувати повідомлення сайту"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:387
 msgid "Site notice"
 msgstr "Об’яви на сайті"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:393
 msgid "Snapshots configuration"
 msgstr "Конфігурація знімків"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:401
 msgid "Set site license"
 msgstr "Зазначте ліцензію сайту"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:409
 #, fuzzy
 msgid "Plugins configuration"
 msgstr "Конфігурація шляху"
 
 #. TRANS: Client error 401.
-#: lib/apiauth.php:111
 msgid "API resource requires read-write access, but you only have read access."
 msgstr ""
 "API-ресурс вимагає дозвіл типу «читання-запис», але у вас є лише доступ для "
 "читання."
 
 #. TRANS: OAuth exception thrown when no application is found for a given consumer key.
-#: lib/apiauth.php:177
 msgid "No application for that consumer key."
 msgstr "Немає додатків для даного споживчого ключа."
 
-#: lib/apiauth.php:202 lib/apiauth.php:284
 msgid "Not allowed to use API."
 msgstr "Не дозволяється використовувати API."
 
 #. TRANS: OAuth exception given when an incorrect access token was given for a user.
-#: lib/apiauth.php:225
 msgid "Bad access token."
 msgstr "Токен погодження невірний."
 
 #. TRANS: OAuth exception given when no user was found for a given token (no token was found).
-#: lib/apiauth.php:230
 msgid "No user for that token."
 msgstr "Немає користувача для цього токену."
 
 #. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel".
 #. TRANS: Client error thrown when authentication fails.
-#: lib/apiauth.php:272 lib/apiauth.php:302
 msgid "Could not authenticate you."
 msgstr "Не вдалося автентифікувати вас."
 
 #. TRANS: Server error displayed when trying to create an anynymous OAuth consumer.
-#: lib/apioauthstore.php:45
 msgid "Could not create anonymous consumer."
 msgstr "Не вдалося створити анонімного споживача."
 
 #. TRANS: Server error displayed when trying to create an anynymous OAuth application.
-#: lib/apioauthstore.php:69
 msgid "Could not create anonymous OAuth application."
 msgstr "Не вдалося створити анонімний додаток OAuth."
 
 #. TRANS: Exception thrown when no token association could be found.
-#: lib/apioauthstore.php:151
 msgid ""
 "Could not find a profile and application associated with the request token."
 msgstr "Не вдалося знайти профіль і додаток, пов’язаний з токеном запиту."
 
 #. TRANS: Exception thrown when no access token can be issued.
-#: lib/apioauthstore.php:209
 msgid "Could not issue access token."
 msgstr "Не вдалося видати токен доступу."
 
-#: lib/apioauthstore.php:317
 msgid "Database error inserting OAuth application user."
 msgstr "Помилка бази даних при додаванні користувача OAuth-додатку."
 
-#: lib/apioauthstore.php:345
 msgid "Database error updating OAuth application user."
 msgstr "Помилка бази даних при додаванні користувача OAuth-додатку."
 
 #. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
-#: lib/apioauthstore.php:371
 msgid "Tried to revoke unknown token."
 msgstr "Спроба скасувати невідомий токен."
 
 #. TRANS: Exception thrown when an attempt is made to remove a revoked token.
-#: lib/apioauthstore.php:376
 msgid "Failed to delete revoked token."
 msgstr "Не вдалося видалити скасований токен."
 
 #. TRANS: Form input field label for application icon.
-#: lib/applicationeditform.php:177
 msgid "Icon"
 msgstr "Іконка"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:182
 msgid "Icon for this application"
 msgstr "Іконка для цього додатку"
 
 #. TRANS: Form input field instructions.
 #. TRANS: %d is the number of available characters for the description.
-#: lib/applicationeditform.php:201
 #, php-format
 msgid "Describe your application in %d character"
 msgid_plural "Describe your application in %d characters"
@@ -7709,206 +6348,167 @@ msgstr[1] "Опишіть ваш додаток, вкладаючись у %d з
 msgstr[2] "Опишіть ваш додаток, вкладаючись у %d знаків"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:205
 msgid "Describe your application"
 msgstr "Опишіть ваш додаток"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:216
 msgid "URL of the homepage of this application"
 msgstr "URL-адреса веб-сторінки цього додатку"
 
 #. TRANS: Form input field label.
-#: lib/applicationeditform.php:218
 msgid "Source URL"
 msgstr "URL-адреса"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:225
 msgid "Organization responsible for this application"
 msgstr "Організація, відповідальна за цей додаток"
 
 #. TRANS: Form input field label.
-#: lib/applicationeditform.php:227
 msgid "Organization"
 msgstr "Організація"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:234
 msgid "URL for the homepage of the organization"
 msgstr "URL-адреса веб-сторінки організації"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:243
 msgid "URL to redirect to after authentication"
 msgstr "URL-адреса, на яку перенаправляти після автентифікації"
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:271
 msgid "Browser"
 msgstr "Браузер"
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:288
 msgid "Desktop"
 msgstr "Десктоп"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:290
 msgid "Type of application, browser or desktop"
 msgstr "Тип додатку, браузер або десктоп"
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:314
 msgid "Read-only"
 msgstr "Лише читання"
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:334
 msgid "Read-write"
 msgstr "Читати-писати"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:336
 msgid "Default access for this application: read-only, or read-write"
 msgstr ""
 "Дозвіл за замовчуванням для цього додатку: лише читання або читати-писати"
 
 #. TRANS: Submit button title.
-#: lib/applicationeditform.php:353
 msgid "Cancel"
 msgstr "Скасувати"
 
-#: lib/applicationlist.php:247
 msgid " by "
 msgstr " від  "
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:260
 msgid "read-write"
 msgstr "читання/запис"
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:262
 msgid "read-only"
 msgstr "лише читання"
 
 #. TRANS: Used in application list. %1$s is a modified date, %2$s is access type ("read-write" or "read-only")
-#: lib/applicationlist.php:268
 #, php-format
 msgid "Approved %1$s - \"%2$s\" access."
 msgstr "Підтверджено доступ %1$s — «%2$s»."
 
 #. TRANS: Access token in the application list.
 #. TRANS: %s are the first 7 characters of the access token.
-#: lib/applicationlist.php:282
 #, php-format
 msgid "Access token starting with: %s"
 msgstr "Токен доступу починається з:  %s"
 
 #. TRANS: Button label
-#: lib/applicationlist.php:298
 msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "Відкликати"
 
-#: lib/atom10feed.php:113
 msgid "Author element must contain a name element."
 msgstr "Елемент author повинен містити елемент name."
 
 #. TRANS: Server exception thrown when using the method setActivitySubject() in the class Atom10Feed.
-#: lib/atom10feed.php:160
 msgid "Do not use this method!"
 msgstr "Не видаляти цей метод!"
 
 #. TRANS: Title.
-#: lib/attachmentnoticesection.php:67
 msgid "Notices where this attachment appears"
 msgstr "Дописи, до яких прикріплено це вкладення"
 
 #. TRANS: Title.
-#: lib/attachmenttagcloudsection.php:48
 msgid "Tags for this attachment"
 msgstr "Теґи для цього вкладення"
 
 #. TRANS: Exception thrown when a password change fails.
-#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:227
 msgid "Password changing failed."
 msgstr "Не вдалося змінити пароль."
 
 #. TRANS: Exception thrown when a password change attempt fails because it is not allowed.
-#: lib/authenticationplugin.php:238
 msgid "Password changing is not allowed."
 msgstr "Змінювати пароль не дозволено."
 
 #. TRANS: Title for the form to block a user.
-#: lib/blockform.php:68
 msgid "Block"
 msgstr "Блок"
 
 #. TRANS: Description of the form to block a user.
-#: lib/blockform.php:79
 msgid "Block this user"
 msgstr "Блокувати користувача"
 
 #. TRANS: Title for command results.
-#: lib/channel.php:104 lib/channel.php:125
 msgid "Command results"
 msgstr "Результати команди"
 
 #. TRANS: Title for command results.
-#: lib/channel.php:138
 msgid "AJAX error"
 msgstr "Помилка AJAX"
 
 #. TRANS: E-mail subject when a command has completed.
-#: lib/channel.php:177 lib/mailhandler.php:143
 msgid "Command complete"
 msgstr "Команду виконано"
 
 #. TRANS: E-mail subject when a command has failed.
-#: lib/channel.php:188
 msgid "Command failed"
 msgstr "Команду не виконано"
 
 #. TRANS: Command exception text shown when a notice ID is requested that does not exist.
-#: lib/command.php:82 lib/command.php:106
 msgid "Notice with that id does not exist."
 msgstr "Допису з таким id не існує."
 
 #. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
 #. TRANS: Error text shown when a last user notice is requested and it does not exist.
-#: lib/command.php:99 lib/command.php:642
 msgid "User has no last notice."
 msgstr "Користувач не має останнього допису."
 
 #. TRANS: Message given requesting a profile for a non-existing user.
 #. TRANS: %s is the nickname of the user for which the profile could not be found.
-#: lib/command.php:128
 #, php-format
 msgid "Could not find a user with nickname %s."
 msgstr "Не вдалося знайти користувача з ім’ям %s."
 
 #. TRANS: Message given getting a non-existing user.
 #. TRANS: %s is the nickname of the user that could not be found.
-#: lib/command.php:148
 #, php-format
 msgid "Could not find a local user with nickname %s."
 msgstr "Користувача з нікнеймом %s на даному сайті не знайдено."
 
 #. TRANS: Error text shown when an unimplemented command is given.
-#: lib/command.php:183
 msgid "Sorry, this command is not yet implemented."
 msgstr "Даруйте, але виконання команди ще не завершено."
 
 #. TRANS: Command exception text shown when a user tries to nudge themselves.
-#: lib/command.php:229
 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr "Гадаємо, користі від «розштовхування» самого себе небагато, чи не так?!"
 
 #. TRANS: Message given having nudged another user.
 #. TRANS: %s is the nickname of the user that was nudged.
-#: lib/command.php:238
 #, php-format
 msgid "Nudge sent to %s."
 msgstr "Спробу «розштовхати» %s зараховано."
@@ -7917,7 +6517,6 @@ msgstr "Спробу «розштовхати» %s зараховано."
 #. TRANS: %1$s is the number of other user the user is subscribed to.
 #. TRANS: %2$s is the number of users that are subscribed to the user.
 #. TRANS: %3$s is the number of notices the user has sent.
-#: lib/command.php:268
 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"
@@ -7929,40 +6528,34 @@ msgstr ""
 "Дописи: %3$s"
 
 #. TRANS: Error message text shown when a favorite could not be set because it has already been favorited.
-#: lib/command.php:298
 #, fuzzy
 msgid "Could not create favorite: already favorited."
 msgstr "Не можна позначити як обране."
 
 #. TRANS: Text shown when a notice has been marked as favourite successfully.
-#: lib/command.php:324
 msgid "Notice marked as fave."
 msgstr "Допис позначено як обраний."
 
 #. TRANS: Message given having added a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:369
 #, php-format
 msgid "%1$s joined group %2$s."
 msgstr "%1$s приєднався до спільноти %2$s."
 
 #. TRANS: Message given having removed a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:417
 #, php-format
 msgid "%1$s left group %2$s."
 msgstr "%1$s залишив спільноту %2$s."
 
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: lib/command.php:438
 #, php-format
 msgctxt "WHOIS"
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
 
 #. TRANS: Whois output. %s is the full name of the queried user.
-#: lib/command.php:442
 #, php-format
 msgid "Fullname: %s"
 msgstr "Повне ім’я: %s"
@@ -7970,7 +6563,6 @@ msgstr "Повне ім’я: %s"
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a location.
-#: lib/command.php:446 lib/mail.php:275
 #, php-format
 msgid "Location: %s"
 msgstr "Розташування: %s"
@@ -7978,20 +6570,17 @@ msgstr "Розташування: %s"
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a homepage.
-#: lib/command.php:450 lib/mail.php:279
 #, php-format
 msgid "Homepage: %s"
 msgstr "Веб-сторінка: %s"
 
 #. TRANS: Whois output. %s is the bio information of the queried user.
-#: lib/command.php:454
 #, php-format
 msgid "About: %s"
 msgstr "Про мене: %s"
 
 #. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).
 #. TRANS: %s is a remote profile.
-#: lib/command.php:483
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
@@ -8002,7 +6591,6 @@ msgstr ""
 
 #. TRANS: Message given if content is too long. %1$sd is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:500
 #, php-format
 msgid "Message too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
@@ -8016,26 +6604,26 @@ msgstr[2] ""
 "Повідомлення надто довге, максимум становить %1$d символів, натомість ви "
 "надсилаєте %2$d."
 
+#. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
+msgid "You can't send a message to this user."
+msgstr "Ви не можете надіслати повідомлення цьому користувачеві."
+
 #. TRANS: Error text shown sending a direct message fails with an unknown reason.
-#: lib/command.php:528
 msgid "Error sending direct message."
 msgstr "Помилка при відправці прямого повідомлення."
 
 #. TRANS: Message given having repeated a notice from another user.
 #. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:565
 #, php-format
 msgid "Notice from %s repeated."
 msgstr "Допису від %s вторували."
 
 #. TRANS: Error text shown when repeating a notice fails with an unknown reason.
-#: lib/command.php:568
 msgid "Error repeating notice."
 msgstr "Помилка при повторенні допису."
 
 #. TRANS: Message given if content of a notice for a reply is too long. %1$d is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:603
 #, php-format
 msgid "Notice too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Notice too long - maximum is %1$d characters, you sent %2$d."
@@ -8048,80 +6636,66 @@ msgstr[2] ""
 
 #. TRANS: Text shown having sent a reply to a notice successfully.
 #. TRANS: %s is the nickname of the user of the notice the reply was sent to.
-#: lib/command.php:616
 #, php-format
 msgid "Reply to %s sent."
 msgstr "Відповідь для %s надіслано."
 
 #. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
-#: lib/command.php:619
 msgid "Error saving notice."
 msgstr "Проблема при збереженні допису."
 
 #. TRANS: Error text shown when no username was provided when issuing a subscribe command.
-#: lib/command.php:666
 msgid "Specify the name of the user to subscribe to."
 msgstr "Зазначте ім’я користувача, до якого бажаєте підписатись."
 
 #. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
-#: lib/command.php:675
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "Не можу підписатись до  профілю OMB за командою."
 
 #. TRANS: Text shown after having subscribed to another user successfully.
 #. TRANS: %s is the name of the user the subscription was requested for.
-#: lib/command.php:683
 #, php-format
 msgid "Subscribed to %s."
 msgstr "Тепер ви підписані на дописи %s."
 
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.
-#: lib/command.php:704 lib/command.php:815
 msgid "Specify the name of the user to unsubscribe from."
 msgstr "Зазначте ім’я користувача, від якого бажаєте відписатись."
 
 #. TRANS: Text shown after having unsubscribed from another user successfully.
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:715
 #, php-format
 msgid "Unsubscribed from %s."
 msgstr "Підписку на дописи від %s скасовано."
 
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
-#: lib/command.php:735 lib/command.php:761
 msgid "Command not yet implemented."
 msgstr "Виконання команди ще не завершено."
 
 #. TRANS: Text shown when issuing the command "off" successfully.
-#: lib/command.php:739
 msgid "Notification off."
 msgstr "Сповіщення вимкнуто."
 
 #. TRANS: Error text shown when the command "off" fails for an unknown reason.
-#: lib/command.php:742
 msgid "Can't turn off notification."
 msgstr "Не можна вимкнути сповіщення."
 
 #. TRANS: Text shown when issuing the command "on" successfully.
-#: lib/command.php:765
 msgid "Notification on."
 msgstr "Сповіщення увімкнуто."
 
 #. TRANS: Error text shown when the command "on" fails for an unknown reason.
-#: lib/command.php:768
 msgid "Can't turn on notification."
 msgstr "Не можна увімкнути сповіщення."
 
 #. TRANS: Error text shown when issuing the login command while login is disabled.
-#: lib/command.php:782
 msgid "Login command is disabled."
 msgstr "Команду входу відключено."
 
 #. TRANS: Text shown after issuing the login command successfully.
 #. TRANS: %s is a logon link..
-#: lib/command.php:795
 #, php-format
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
@@ -8129,20 +6703,17 @@ msgstr ""
 
 #. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:824
 #, php-format
 msgid "Unsubscribed %s."
 msgstr "Підписку %s скасовано."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
-#: lib/command.php:842
 msgid "You are not subscribed to anyone."
 msgstr "Ви не маєте жодних підписок."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
-#: lib/command.php:847
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Ви підписані до цієї особи:"
@@ -8151,14 +6722,12 @@ msgstr[2] "Ви підписані до цих людей:"
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user
 #. TRANS: (followers) without having any subscribers.
-#: lib/command.php:869
 msgid "No one is subscribed to you."
 msgstr "Ніхто до вас не підписаний."
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
-#: lib/command.php:874
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Ця особа є підписаною до вас:"
@@ -8167,14 +6736,12 @@ msgstr[2] "Ці люди підписані до вас:"
 
 #. TRANS: Text shown after requesting groups a user is subscribed to without having
 #. TRANS: any group subscriptions.
-#: lib/command.php:896
 msgid "You are not a member of any groups."
 msgstr "Ви не залучені до жодної спільноти."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
-#: lib/command.php:901
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "Ви є учасником спільноти:"
@@ -8182,7 +6749,6 @@ msgstr[1] "Ви є учасником таких спільнот:"
 msgstr[2] "Ви є учасником таких спільнот:"
 
 #. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-#: lib/command.php:916
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -8260,206 +6826,163 @@ msgstr ""
 "tracking — наразі не виконується\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:36
 msgid "No configuration file found."
 msgstr "Файл конфігурації не знайдено."
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:39
 msgid "I looked for configuration files in the following places:"
 msgstr "Пошук файлів конфігурації проводився тут:"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:42
 msgid "You may wish to run the installer to fix this."
 msgstr "Запустіть файл інсталяції, аби полагодити це."
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:46
 msgid "Go to the installer."
 msgstr "Іти до файлу інсталяції."
 
-#: lib/dberroraction.php:59
 msgid "Database error"
 msgstr "Помилка бази даних"
 
 #. TRANS: Description of form for deleting a user.
-#: lib/deleteuserform.php:75
 msgid "Delete this user"
 msgstr "Видалити цього користувача"
 
-#: lib/designform.php:114
 #, fuzzy
 msgid "Change design"
 msgstr "Зберегти дизайн"
 
 #. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: lib/designform.php:131
 msgid "Change colours"
 msgstr "Змінити кольори"
 
 #. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: lib/designform.php:138
 msgid "Use defaults"
 msgstr "За замовч."
 
 #. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: lib/designform.php:140
 msgid "Restore default designs"
 msgstr "Оновити налаштування за замовчуванням"
 
 #. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: lib/designform.php:148
 msgid "Reset back to default"
 msgstr "Повернутись до початкових налаштувань"
 
 #. TRANS: Label in form on profile design page.
 #. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
-#: lib/designform.php:158
 msgid "Upload file"
 msgstr "Завантажити файл"
 
 #. TRANS: Instructions for form on profile design page.
-#: lib/designform.php:163
-#, fuzzy
 msgid ""
 "You can upload your personal background image. The maximum file size is 2Mb."
 msgstr ""
-"Ви можете завантажити власне фонове зображення. Максимальний розмір файлу "
-"становить 2Мб."
+"Ви можете завантажити власне фонове зображення. Максимум становить 2Мб."
 
 #. TRANS: Radio button on profile design page that will enable use of the uploaded profile image.
-#: lib/designform.php:194
 msgctxt "RADIO"
 msgid "On"
 msgstr "Увімк."
 
 #. TRANS: Radio button on profile design page that will disable use of the uploaded profile image.
-#: lib/designform.php:211
 msgctxt "RADIO"
 msgid "Off"
 msgstr "Вимк."
 
 #. TRANS: Title for button on profile design page to save settings.
-#: lib/designform.php:322
 msgid "Save design"
 msgstr "Зберегти дизайн"
 
 #. TRANS: Error message displayed if design settings could not be saved.
 #. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
-#: lib/designsettings.php:216 lib/designsettings.php:238
 msgid "Couldn't update your design."
 msgstr "Не вдалося оновити дизайн."
 
 #. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
-#: lib/designsettings.php:244
 msgid "Design defaults restored."
 msgstr "Дизайн за замовчуванням відновлено."
 
 #. TRANS: Exception. %s is an ID.
-#: lib/discovery.php:153
 #, php-format
 msgid "Unable to find services for %s."
 msgstr "Не вдається знайти послуги для %s."
 
 #. TRANS: Form legend for removing the favourite status for a favourite notice.
 #. TRANS: Title for button text for removing the favourite status for a favourite notice.
-#: lib/disfavorform.php:108 lib/disfavorform.php:140
 msgid "Disfavor this notice"
 msgstr "Видалити з обраних"
 
 #. TRANS: Button text for removing the favourite status for a favourite notice.
-#: lib/disfavorform.php:136
 msgctxt "BUTTON"
 msgid "Disfavor favorite"
 msgstr "Видалити з обраних"
 
 #. TRANS: Form legend for adding the favourite status to a notice.
 #. TRANS: Title for button text for adding the favourite status to a notice.
-#: lib/favorform.php:108 lib/favorform.php:139
 msgid "Favor this notice"
 msgstr "Позначити як обране"
 
 #. TRANS: Button text for adding the favourite status to a notice.
-#: lib/favorform.php:135
 msgctxt "BUTTON"
 msgid "Favor"
 msgstr "Обрати"
 
-#: lib/feed.php:84
 msgid "RSS 1.0"
 msgstr "RSS 1.0"
 
-#: lib/feed.php:86
 msgid "RSS 2.0"
 msgstr "RSS 2.0"
 
-#: lib/feed.php:88
 msgid "Atom"
 msgstr "Atom"
 
-#: lib/feed.php:90
 msgid "FOAF"
 msgstr "FOAF"
 
-#: lib/feedimporter.php:75
 msgid "Not an atom feed."
 msgstr "Не є стрічкою у форматі Atom."
 
-#: lib/feedimporter.php:82
 msgid "No author in the feed."
 msgstr "Немає автора в цій стрічці."
 
-#: lib/feedimporter.php:89
 msgid "Can't import without a user."
 msgstr "Неможливо імпортувати без користувача."
 
 #. TRANS: Header for feed links (h2).
-#: lib/feedlist.php:66
 msgid "Feeds"
 msgstr "Веб-стрічки"
 
-#: lib/galleryaction.php:128
 msgid "All"
 msgstr "Всі"
 
-#: lib/galleryaction.php:136
 msgid "Select tag to filter"
 msgstr "Оберіть фільтр теґів"
 
-#: lib/galleryaction.php:137
 msgid "Tag"
 msgstr "Теґ"
 
-#: lib/galleryaction.php:138
 msgid "Choose a tag to narrow list"
 msgstr "Оберіть теґ до звуженого списку"
 
-#: lib/galleryaction.php:140
 msgid "Go"
 msgstr "Вперед"
 
-#: lib/grantroleform.php:91
 #, php-format
 msgid "Grant this user the \"%s\" role"
 msgstr "Надати цьому користувачеві роль «%s»"
 
-#: lib/groupeditform.php:147
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr ""
 "1-64 літери нижнього регістру і цифри, ніякої пунктуації або інтервалів"
 
-#: lib/groupeditform.php:156
 msgid "URL of the homepage or blog of the group or topic."
 msgstr "URL-адреса веб-сторінки або тематичного блоґу спільноти"
 
-#: lib/groupeditform.php:161
 msgid "Describe the group or topic"
 msgstr "Опишіть спільноту або тему"
 
-#: lib/groupeditform.php:163
 #, php-format
 msgid "Describe the group or topic in %d character or less"
 msgid_plural "Describe the group or topic in %d characters or less"
@@ -8467,13 +6990,11 @@ msgstr[0] "Опишіть спільноту або тему, вкладаючи
 msgstr[1] "Опишіть спільноту або тему, вкладаючись у %d знаків"
 msgstr[2] "Опишіть спільноту або тему, вкладаючись у %d знаків"
 
-#: lib/groupeditform.php:175
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\"."
 msgstr ""
 "Розташування спільноти, на кшталт «Місто, область (або регіон), країна»."
 
-#: lib/groupeditform.php:183
 #, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -8492,70 +7013,60 @@ msgstr[2] ""
 "— %d імен."
 
 #. TRANS: Menu item in the group navigation page.
-#: lib/groupnav.php:86
 msgctxt "MENU"
 msgid "Group"
 msgstr "Спільнота"
 
 #. TRANS: Tooltip for menu item in the group navigation page.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:89
 #, php-format
 msgctxt "TOOLTIP"
 msgid "%s group"
 msgstr "Спільнота %s"
 
 #. TRANS: Menu item in the group navigation page.
-#: lib/groupnav.php:95
 msgctxt "MENU"
 msgid "Members"
 msgstr "Учасники"
 
 #. TRANS: Tooltip for menu item in the group navigation page.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:98
 #, php-format
 msgctxt "TOOLTIP"
 msgid "%s group members"
 msgstr "Учасники спільноти %s"
 
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/groupnav.php:108
 msgctxt "MENU"
 msgid "Blocked"
 msgstr "Заблоковані"
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:111
 #, php-format
 msgctxt "TOOLTIP"
 msgid "%s blocked users"
 msgstr "Заблоковані користувачі %s"
 
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "Адмін"
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:120
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Edit %s group properties"
 msgstr "Редагувати властивості спільноти %s"
 
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/groupnav.php:126
 msgctxt "MENU"
 msgid "Logo"
 msgstr "Логотип"
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:129
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Add or edit %s logo"
@@ -8563,69 +7074,57 @@ msgstr "Додати або редагувати логотип %s"
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:138
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Add or edit %s design"
 msgstr "Додати або редагувати дизайн %s"
 
 #. TRANS: Title for groups with the most members section.
-#: lib/groupsbymemberssection.php:71
 msgid "Groups with most members"
 msgstr "Спільноти з найбільшою кількістю учасників"
 
 #. TRANS: Title for groups with the most posts section.
-#: lib/groupsbypostssection.php:71
 msgid "Groups with most posts"
 msgstr "Спільноти з найбільшою кількістю дописів"
 
 #. TRANS: Title for group tag cloud section.
 #. TRANS: %s is a group name.
-#: lib/grouptagcloudsection.php:57
 #, php-format
 msgid "Tags in %s group's notices"
 msgstr "Теґи у дописах спільноти %s"
 
 #. TRANS: Client exception 406
-#: lib/htmloutputter.php:104
 msgid "This page is not available in a media type you accept"
 msgstr "Ця сторінка не доступна для того типу медіа, з яким ви погодились"
 
 #. TRANS: Exception thrown when trying to upload an unsupported image file format.
-#: lib/imagefile.php:73
 msgid "Unsupported image file format."
 msgstr "Формат зображення не підтримується."
 
 #. TRANS: Exception thrown when too large a file is uploaded.
 #. TRANS: %s is the maximum file size, for example "500b", "10kB" or "2MB".
-#: lib/imagefile.php:91
 #, php-format
 msgid "That file is too big. The maximum file size is %s."
 msgstr "Цей файл завеликий. Максимальний розмір %s."
 
 #. TRANS: Exception thrown when uploading an image and that action could not be completed.
-#: lib/imagefile.php:97
 msgid "Partial upload."
 msgstr "Часткове завантаження."
 
 #. TRANS: Exception thrown when uploading a file as image that is not an image or is a corrupt file.
-#: lib/imagefile.php:115
 msgid "Not an image or corrupt file."
 msgstr "Це не зображення, або файл зіпсовано."
 
 #. TRANS: Exception thrown during resize when image has been registered as present, but is no longer there.
-#: lib/imagefile.php:178
 msgid "Lost our file."
 msgstr "Файл втрачено."
 
 #. TRANS: Exception thrown when trying to resize an unknown file type.
 #. TRANS: Exception thrown when trying resize an unknown file type.
-#: lib/imagefile.php:216 lib/imagefile.php:257
 msgid "Unknown file type"
 msgstr "Тип файлу не підтримується"
 
 #. TRANS: Number of megabytes. %d is the number.
-#: lib/imagefile.php:303
 #, php-format
 msgid "%dMB"
 msgid_plural "%dMB"
@@ -8634,7 +7133,6 @@ msgstr[1] "%d Мб"
 msgstr[2] "%d Мб"
 
 #. TRANS: Number of kilobytes. %d is the number.
-#: lib/imagefile.php:307
 #, php-format
 msgid "%dkB"
 msgid_plural "%dkB"
@@ -8643,7 +7141,6 @@ msgstr[1] "%d кб"
 msgstr[2] "%d кб"
 
 #. TRANS: Number of bytes. %d is the number.
-#: lib/imagefile.php:310
 #, php-format
 msgid "%dB"
 msgid_plural "%dB"
@@ -8651,7 +7148,6 @@ msgstr[0] "%d б"
 msgstr[1] "%d б"
 msgstr[2] "%d б"
 
-#: lib/implugin.php:262
 #, php-format
 msgid ""
 "User \"%s\" on %s has said that your %s screenname belongs to them. If "
@@ -8661,53 +7157,44 @@ msgid ""
 "message."
 msgstr ""
 
-#: lib/implugin.php:349
 #, php-format
 msgid "Unknown inbox source %d."
 msgstr "Невідоме джерело вхідного повідомлення %d."
 
-#: lib/implugin.php:485
-#, fuzzy, php-format
+#, php-format
 msgid "Message too long - maximum is %1$d characters, you sent %2$d."
 msgstr ""
-"Повідомлення надто довге, максимум становить %1$d символ, натомість ви "
+"Повідомлення надто довге, максимум становить %1$d символів, натомість ви "
 "надсилаєте %2$d."
 
-#: lib/leaveform.php:114
 msgid "Leave"
 msgstr "Залишити"
 
 #. TRANS: Menu item for logging in to the StatusNet site.
-#: lib/logingroupnav.php:77
 msgctxt "MENU"
 msgid "Login"
 msgstr "Увійти"
 
 #. TRANS: Title for menu item for logging in to the StatusNet site.
-#: lib/logingroupnav.php:79
 msgid "Login with a username and password"
 msgstr "Увійти використовуючи ім’я та пароль"
 
 #. TRANS: Menu item for registering with the StatusNet site.
-#: lib/logingroupnav.php:85
 msgctxt "MENU"
 msgid "Register"
 msgstr "Реєстрація"
 
 #. TRANS: Title for menu item for registering with the StatusNet site.
-#: lib/logingroupnav.php:87
 msgid "Sign up for a new account"
 msgstr "Зареєструвати новий акаунт"
 
 #. TRANS: Subject for address confirmation email.
-#: lib/mail.php:172
 msgid "Email address confirmation"
 msgstr "Підтвердження електронної адреси"
 
 #. TRANS: Body for address confirmation email.
 #. TRANS: %1$s is the addressed user's nickname, %2$s is the StatusNet sitename,
 #. TRANS: %3$s is the URL to confirm at.
-#: lib/mail.php:177
 #, php-format
 msgid ""
 "Hey, %1$s.\n"
@@ -8738,14 +7225,12 @@ msgstr ""
 
 #. TRANS: Subject of new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
-#: lib/mail.php:243
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1$s тепер слідкує за вашими дописами на %2$s."
 
 #. TRANS: This is a paragraph in a new-subscriber e-mail.
 #. TRANS: %s is a URL where the subscriber can be reported as abusive.
-#: lib/mail.php:250
 #, php-format
 msgid ""
 "If you believe this account is being used abusively, you can block them from "
@@ -8760,7 +7245,6 @@ msgstr ""
 #. TRANS: %3$s is the subscriber's profile URL, %4$s is the subscriber's location (or empty)
 #. TRANS: %5$s is the subscriber's homepage URL (or empty), %6%s is the subscriber's bio (or empty)
 #. TRANS: %7$s is a link to the addressed user's e-mail settings.
-#: lib/mail.php:260
 #, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -8787,14 +7271,12 @@ msgstr ""
 
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is biographical information.
-#: lib/mail.php:283
 #, php-format
 msgid "Bio: %s"
 msgstr "Про себе: %s"
 
 #. TRANS: Subject of notification mail for new posting email address.
 #. TRANS: %s is the StatusNet sitename.
-#: lib/mail.php:312
 #, php-format
 msgid "New email address for posting to %s"
 msgstr "Нова електронна адреса для надсилання повідомлень на %s"
@@ -8802,7 +7284,6 @@ msgstr "Нова електронна адреса для надсилання 
 #. TRANS: Body of notification mail for new posting email address.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is the e-mail address to send
 #. TRANS: to to post by e-mail, %3$s is a URL to more instructions.
-#: lib/mail.php:318
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -8825,19 +7306,16 @@ msgstr ""
 
 #. TRANS: Subject line for SMS-by-email notification messages.
 #. TRANS: %s is the posting user's nickname.
-#: lib/mail.php:439
 #, php-format
 msgid "%s status"
 msgstr "%s статус"
 
 #. TRANS: Subject line for SMS-by-email address confirmation message.
-#: lib/mail.php:465
 msgid "SMS confirmation"
 msgstr "Підтвердження СМС"
 
 #. TRANS: Main body heading for SMS-by-email address confirmation message.
 #. TRANS: %s is the addressed user's nickname.
-#: lib/mail.php:469
 #, php-format
 msgid "%s: confirm you own this phone number with this code:"
 msgstr ""
@@ -8846,7 +7324,6 @@ msgstr ""
 
 #. TRANS: Subject for 'nudge' notification email.
 #. TRANS: %s is the nudging user.
-#: lib/mail.php:490
 #, php-format
 msgid "You have been nudged by %s"
 msgstr "Вас спробував «розштовхати» %s"
@@ -8854,7 +7331,6 @@ msgstr "Вас спробував «розштовхати» %s"
 #. TRANS: Body for 'nudge' notification email.
 #. TRANS: %1$s is the nuding user's long name, $2$s is the nudging user's nickname,
 #. TRANS: %3$s is a URL to post notices at, %4$s is the StatusNet sitename.
-#: lib/mail.php:497
 #, php-format
 msgid ""
 "%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -8883,7 +7359,6 @@ msgstr ""
 
 #. TRANS: Subject for direct-message notification email.
 #. TRANS: %s is the sending user's nickname.
-#: lib/mail.php:544
 #, php-format
 msgid "New private message from %s"
 msgstr "Нове приватне повідомлення від %s"
@@ -8892,7 +7367,6 @@ msgstr "Нове приватне повідомлення від %s"
 #. TRANS: %1$s is the sending user's long name, %2$s is the sending user's nickname,
 #. TRANS: %3$s is the message content, %4$s a URL to the message,
 #. TRANS: %5$s is the StatusNet sitename.
-#: lib/mail.php:552
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -8927,7 +7401,6 @@ msgstr ""
 
 #. TRANS: Subject for favorite notification e-mail.
 #. TRANS: %1$s is the adding user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:604
 #, php-format
 msgid "%1$s (@%2$s) added your notice as a favorite"
 msgstr "%1$s (@%2$s) додав(ла) ваш допис обраних"
@@ -8937,7 +7410,6 @@ msgstr "%1$s (@%2$s) додав(ла) ваш допис обраних"
 #. TRANS: %3$s is a URL to the faved notice, %4$s is the faved notice text,
 #. TRANS: %5$s is a URL to all faves of the adding user, %6$s is the StatusNet sitename,
 #. TRANS: %7$s is the adding user's nickname.
-#: lib/mail.php:611
 #, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -8975,7 +7447,6 @@ msgstr ""
 "%6$s\n"
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:669
 #, php-format
 msgid ""
 "The full conversation can be read here:\n"
@@ -8988,7 +7459,6 @@ msgstr ""
 
 #. TRANS: E-mail subject for notice notification.
 #. TRANS: %1$s is the sending user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:677
 #, php-format
 msgid "%1$s (@%2$s) sent a notice to your attention"
 msgstr "%1$s (@%2$s) пропонує до вашої уваги наступний допис"
@@ -8999,7 +7469,6 @@ msgstr "%1$s (@%2$s) пропонує до вашої уваги наступн
 #. TRANS: %5$s is a URL to the full conversion if it exists (otherwise empty),
 #. TRANS: %6$s is a URL to reply to the notice, %7$s is a URL to all @-replied for the addressed user,
 #. TRANS: %8$s is a URL to the addressed user's e-mail settings, %9$s is the sender's nickname.
-#: lib/mail.php:685
 #, php-format
 msgid ""
 "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -9048,12 +7517,10 @@ msgstr ""
 "\n"
 "P.S. Ви можете вимкнути сповіщення електронною поштою тут: %8$s\n"
 
-#: lib/mailbox.php:87
 msgid "Only the user can read their own mailboxes."
 msgstr ""
 "Лише користувач має можливість переглядати свою власну поштову скриньку."
 
-#: lib/mailbox.php:125
 msgid ""
 "You have no private messages. You can send private message to engage other "
 "users in conversation. People can send you messages for your eyes only."
@@ -9062,54 +7529,44 @@ msgstr ""
 "повідомлення аби долучити користувачів до розмови. Такі повідомлення бачите "
 "лише ви."
 
-#: lib/mailhandler.php:37
 msgid "Could not parse message."
 msgstr "Не можна розібрати повідомлення."
 
-#: lib/mailhandler.php:42
 msgid "Not a registered user."
 msgstr "Це незареєстрований користувач."
 
-#: lib/mailhandler.php:46
 msgid "Sorry, that is not your incoming email address."
 msgstr "Вибачте, але це не є вашою електронною адресою для вхідної пошти."
 
-#: lib/mailhandler.php:50
 msgid "Sorry, no incoming email allowed."
 msgstr ""
 "Вибачте, але не затверджено жодної електронної адреси для вхідної пошти."
 
-#: lib/mailhandler.php:229
 #, php-format
 msgid "Unsupported message type: %s"
 msgstr "Формат повідомлення не підтримується: %s"
 
 #. TRANS: Client exception thrown when a database error was thrown during a file upload operation.
-#: lib/mediafile.php:102 lib/mediafile.php:174
 msgid "There was a database error while saving your file. Please try again."
 msgstr "Виникла помилка під час завантаження вашого файлу. Спробуйте ще."
 
 #. TRANS: Client exception thrown when a file upload operation would cause a user to exceed a set quota.
-#: lib/mediafile.php:238 lib/mediafile.php:281
 msgid "File exceeds user's quota."
 msgstr "Файл перевищив квоту користувача."
 
 #. TRANS: Client exception thrown when a file upload operation fails because the file could
 #. TRANS: not be moved from the temporary folder to the permanent file location.
-#: lib/mediafile.php:258 lib/mediafile.php:300
 msgid "File could not be moved to destination directory."
 msgstr "Файл не може бути переміщений у директорію призначення."
 
 #. TRANS: Client exception thrown when a file upload operation has been stopped because the MIME
 #. TRANS: type of the uploaded file could not be determined.
-#: lib/mediafile.php:265 lib/mediafile.php:306
 msgid "Could not determine file's MIME type."
 msgstr "Не вдається визначити MIME-тип файлу."
 
 #. TRANS: Client exception thrown trying to upload a forbidden MIME type.
 #. TRANS: %1$s is the file type that was denied, %2$s is the application part of
 #. TRANS: the MIME type that was denied.
-#: lib/mediafile.php:396
 #, php-format
 msgid ""
 "\"%1$s\" is not a supported file type on this server. Try using another %2$s "
@@ -9120,49 +7577,39 @@ msgstr ""
 
 #. TRANS: Client exception thrown trying to upload a forbidden MIME type.
 #. TRANS: %s is the file type that was denied.
-#: lib/mediafile.php:401
 #, php-format
 msgid "\"%s\" is not a supported file type on this server."
 msgstr "Тип файлів «%s» тепер не підтримується на даному сервері."
 
-#: lib/messageform.php:120
 msgid "Send a direct notice"
 msgstr "Надіслати прямий допис"
 
 #. TRANS Label entry in drop-down selection box in direct-message inbox/outbox. This is the default entry in the drop-down box, doubling as instructions and a brake against accidental submissions with the first user in the list.
-#: lib/messageform.php:137
 msgid "Select recipient:"
 msgstr "Оберіть одержувача:"
 
 #. TRANS Entry in drop-down selection box in direct-message inbox/outbox when no one is available to message.
-#: lib/messageform.php:150
 msgid "No mutual subscribers."
 msgstr "Немає відповідних абонентів."
 
-#: lib/messageform.php:153
 msgid "To"
 msgstr "До"
 
-#: lib/messageform.php:184 lib/noticeform.php:236
 msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr "Так"
 
-#: lib/messagelist.php:77
 msgid "Messages"
 msgstr "Повідомлення"
 
-#: lib/messagelistitem.php:123 lib/noticelist.php:527
 msgid "from"
 msgstr "з"
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:178
 msgid "Nickname cannot be empty."
 msgstr "Псевдонім не може бути порожнім."
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:191
 #, php-format
 msgid "Nickname cannot be more than %d character long."
 msgid_plural "Nickname cannot be more than %d characters long."
@@ -9170,32 +7617,33 @@ msgstr[0] "Псевдонім не може бути довшим за %d сим
 msgstr[1] "Псевдонім не може бути довшим за %d символів."
 msgstr[2] "Псевдонім не може бути довшим за %d символів."
 
-#: lib/noticeform.php:160
+#. TRANS: Form legend for notice form.
 msgid "Send a notice"
 msgstr "Надіслати допис"
 
-#: lib/noticeform.php:174
+#. TRANS: Title for notice label. %s is the user's nickname.
 #, php-format
 msgid "What's up, %s?"
 msgstr "Що нового, %s?"
 
-#: lib/noticeform.php:193
+#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr "Вкласти"
 
-#: lib/noticeform.php:197
-msgid "Attach a file"
+#. TRANS: Title for input field to attach a file to a notice.
+#, fuzzy
+msgid "Attach a file."
 msgstr "Вкласти файл"
 
-#: lib/noticeform.php:212
+#. TRANS: Field label to add location to a notice.
 msgid "Share my location"
 msgstr "Показувати місцезнаходження."
 
-#: lib/noticeform.php:215
+#. TRANS: Text to not share location for a notice in notice form.
 msgid "Do not share my location"
 msgstr "Приховувати моє місцезнаходження"
 
-#: lib/noticeform.php:216
+#. TRANS: Timeout error text for location retrieval in notice form.
 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
 "try again later"
@@ -9204,416 +7652,315 @@ msgstr ""
 "ніж очікувалось; будь ласка, спробуйте пізніше"
 
 #. TRANS: Used in coordinates as abbreviation of north
-#: lib/noticelist.php:457
 msgid "N"
 msgstr "Півн."
 
 #. TRANS: Used in coordinates as abbreviation of south
-#: lib/noticelist.php:459
 msgid "S"
 msgstr "Півд."
 
 #. TRANS: Used in coordinates as abbreviation of east
-#: lib/noticelist.php:461
 msgid "E"
 msgstr "Сх."
 
 #. TRANS: Used in coordinates as abbreviation of west
-#: lib/noticelist.php:463
 msgid "W"
 msgstr "Зах."
 
-#: lib/noticelist.php:465
 #, php-format
 msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 
-#: lib/noticelist.php:474
 msgid "at"
 msgstr "в"
 
-#: lib/noticelist.php:523
 msgid "web"
 msgstr "вебу"
 
-#: lib/noticelist.php:589
 msgid "in context"
 msgstr "у контексті"
 
-#: lib/noticelist.php:624
 msgid "Repeated by"
 msgstr "Повторено"
 
-#: lib/noticelist.php:651
 msgid "Reply to this notice"
 msgstr "Відповісти на цей допис"
 
-#: lib/noticelist.php:652
 msgid "Reply"
 msgstr "Відповісти"
 
-#: lib/noticelist.php:678
 msgid "Delete this notice"
 msgstr "Видалити допис"
 
-#: lib/noticelist.php:696
 msgid "Notice repeated"
 msgstr "Допис повторили"
 
-#: lib/nudgeform.php:116
 msgid "Nudge this user"
 msgstr "«Розштовхати» користувача"
 
-#: lib/nudgeform.php:128
 msgid "Nudge"
 msgstr "«Розштовхати»"
 
-#: lib/nudgeform.php:128
 msgid "Send a nudge to this user"
 msgstr "Спробувати «розштовхати» цього користувача"
 
-#: lib/oauthstore.php:294
 msgid "Error inserting new profile."
 msgstr "Помилка при додаванні нового профілю."
 
-#: lib/oauthstore.php:302
 msgid "Error inserting avatar."
 msgstr "Помилка при додаванні аватари."
 
-#: lib/oauthstore.php:322
 msgid "Error inserting remote profile."
 msgstr "Помилка при додаванні віддаленого профілю."
 
 #. TRANS: Exception thrown when a notice is denied because it has been sent before.
-#: lib/oauthstore.php:362
 msgid "Duplicate notice."
 msgstr "Дублікат допису."
 
-#: lib/oauthstore.php:507
 msgid "Couldn't insert new subscription."
 msgstr "Не вдалося додати нову підписку."
 
-#: lib/personalgroupnav.php:104
-#, fuzzy
 msgid "Replies"
 msgstr "Відповіді"
 
-#: lib/personalgroupnav.php:109
-#, fuzzy
 msgid "Favorites"
 msgstr "Обрані"
 
-#: lib/personalgroupnav.php:120
-#, fuzzy
 msgid "Inbox"
 msgstr "Вхідні"
 
-#: lib/personalgroupnav.php:121
 msgid "Your incoming messages"
 msgstr "Ваші вхідні повідомлення"
 
-#: lib/personalgroupnav.php:125
-#, fuzzy
 msgid "Outbox"
 msgstr "Вихідні"
 
-#: lib/personalgroupnav.php:126
 msgid "Your sent messages"
 msgstr "Надіслані вами повідомлення"
 
 #. TRANS: Title for personal tag cloud section. %s is a user nickname.
-#: lib/personaltagcloudsection.php:56
 #, php-format
 msgid "Tags in %s's notices"
 msgstr "Теґи у дописах %s"
 
 #. TRANS: Displayed as version information for a plugin if no version information was found.
-#: lib/plugin.php:126
 msgid "Unknown"
 msgstr "Невідомо"
 
 #. TRANS: Plugin admin panel controls
-#: lib/plugindisableform.php:90
 msgctxt "plugin"
 msgid "Disable"
 msgstr ""
 
 #. TRANS: Plugin admin panel controls
-#: lib/pluginenableform.php:112
 msgctxt "plugin"
 msgid "Enable"
 msgstr ""
 
-#: lib/pluginlist.php:196
 msgctxt "plugin-description"
 msgid "(Plugin descriptions unavailable when disabled.)"
 msgstr ""
 
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:88
 msgid "Subscriptions"
 msgstr "Підписки"
 
 #. TRANS: Text for user subscription statistics if user has more subscriptions than displayed.
-#: lib/profileaction.php:144
 msgid "All subscriptions"
 msgstr "Всі підписки"
 
 #. TRANS: H2 text for user subscriber statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:96
 msgid "Subscribers"
 msgstr "Підписані"
 
 #. TRANS: Text for user subscription statistics if user has more subscribers than displayed.
-#: lib/profileaction.php:181
 msgid "All subscribers"
 msgstr "Всі підписані"
 
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:213
 msgid "User ID"
 msgstr "Ід. номер"
 
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:219
 msgid "Member since"
 msgstr "Реєстрація"
 
 #. TRANS: Label for user statistics.
 #. TRANS: H2 text for user group membership statistics.
-#: lib/profileaction.php:239 lib/profileaction.php:290
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:104
 msgid "Groups"
 msgstr "Спільноти"
 
 #. TRANS: Label for user statistics.
 #. TRANS: Average count of posts made per day since account registration.
-#: lib/profileaction.php:253
 msgid "Daily average"
 msgstr "Щоденно"
 
 #. TRANS: Text for user group membership statistics if user has more subscriptions than displayed.
-#: lib/profileaction.php:305
 msgid "All groups"
 msgstr "Всі спільноти"
 
 #. TRANS: Server error displayed when using an unimplemented method.
-#: lib/profileformaction.php:123
 msgid "Unimplemented method."
 msgstr "Метод не виконується."
 
-#: lib/publicgroupnav.php:82
 msgid "User groups"
 msgstr "Спільноти"
 
-#: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
 msgid "Recent tags"
 msgstr "Нові теґи"
 
-#: lib/publicgroupnav.php:88
 msgid "Featured"
 msgstr "Постаті"
 
-#: lib/publicgroupnav.php:92
 msgid "Popular"
 msgstr "Популярне"
 
-#: lib/redirectingaction.php:95
 msgid "No return-to arguments."
 msgstr "Немає аргументів return-to."
 
-#: lib/repeatform.php:107
 msgid "Repeat this notice?"
 msgstr "Повторити цей допис?"
 
-#: lib/repeatform.php:132
 msgid "Yes"
 msgstr "Так"
 
-#: lib/repeatform.php:132
 msgid "Repeat this notice"
 msgstr "Повторити цей допис"
 
-#: lib/revokeroleform.php:91
 #, php-format
 msgid "Revoke the \"%s\" role from this user"
 msgstr "Відкликати роль «%s» для цього користувача"
 
 #. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:1001
 msgid "Page not found."
 msgstr "Сторінку не знайдено."
 
-#: lib/sandboxform.php:67
 msgid "Sandbox"
 msgstr "Пісочниця"
 
-#: lib/sandboxform.php:78
 msgid "Sandbox this user"
 msgstr "Ізолювати, відіслати користувача гратися у пісочниці"
 
 #. TRANS: Fieldset legend for the search form.
-#: lib/searchaction.php:120
 msgid "Search site"
 msgstr "Пошук"
 
 #. TRANS: Used as a field label for the field where one or more keywords
 #. TRANS: for searching can be entered.
-#: lib/searchaction.php:128
 msgid "Keyword(s)"
 msgstr "Ключові слова"
 
 #. TRANS: Button text for searching site.
-#: lib/searchaction.php:130
 msgctxt "BUTTON"
 msgid "Search"
 msgstr "Пошук"
 
-#: lib/searchgroupnav.php:80
 msgid "People"
 msgstr "Люди"
 
-#: lib/searchgroupnav.php:81
 msgid "Find people on this site"
 msgstr "Пошук людей на цьому сайті"
 
-#: lib/searchgroupnav.php:83
 msgid "Find content of notices"
 msgstr "Пошук дописів за змістом"
 
-#: lib/searchgroupnav.php:85
 msgid "Find groups on this site"
 msgstr "Пошук спільнот на цьому сайті"
 
-#: lib/section.php:89
 msgid "Untitled section"
 msgstr "Розділ без заголовку"
 
-#: lib/section.php:106
 msgid "More..."
 msgstr "Ще..."
 
-#: lib/settingsnav.php:78
 msgid "Change your profile settings"
 msgstr "Змінити налаштування профілю"
 
-#: lib/settingsnav.php:83
 msgid "Upload an avatar"
 msgstr "Завантаження аватари"
 
-#: lib/settingsnav.php:88
 msgid "Change your password"
 msgstr "Змінити пароль"
 
-#: lib/settingsnav.php:93
 msgid "Change email handling"
 msgstr "Змінити електронну адресу"
 
-#: lib/settingsnav.php:98
 msgid "Design your profile"
 msgstr "Дизайн вашого профілю"
 
-#: lib/settingsnav.php:102
 msgid "URL"
 msgstr "URL"
 
-#: lib/settingsnav.php:103
 msgid "URL shorteners"
 msgstr ""
 
-#: lib/settingsnav.php:111
 msgid "Updates by instant messenger (IM)"
 msgstr "Оновлення за допомогою служби миттєвих повідомлень (ІМ)"
 
-#: lib/settingsnav.php:118
 msgid "Updates by SMS"
 msgstr "Оновлення через СМС"
 
-#: lib/settingsnav.php:123
-#, fuzzy
 msgid "Connections"
 msgstr "З’єднання"
 
-#: lib/settingsnav.php:124
 msgid "Authorized connected applications"
 msgstr "Авторизовані під’єднані додатки"
 
-#: lib/silenceform.php:67
 msgid "Silence"
 msgstr "Нічичирк!"
 
-#: lib/silenceform.php:78
 msgid "Silence this user"
 msgstr "Змусити користувача замовкнути, відправити у забуття"
 
-#: lib/subgroupnav.php:89
 #, php-format
 msgid "People %s subscribes to"
 msgstr "%s підписався до наступних людей"
 
-#: lib/subgroupnav.php:97
 #, php-format
 msgid "People subscribed to %s"
 msgstr "Люди підписані до %s"
 
-#: lib/subgroupnav.php:105
 #, php-format
 msgid "Groups %s is a member of"
 msgstr "Спільноти, до яких залучений %s"
 
-#: lib/subgroupnav.php:111
 msgid "Invite"
 msgstr "Запросити"
 
-#: lib/subgroupnav.php:112
 #, php-format
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Запросіть друзів та колег приєднатись до вас на %s"
 
-#: lib/subscribeform.php:115 lib/subscribeform.php:139
 msgid "Subscribe to this user"
 msgstr "Підписатись до цього користувача"
 
-#: lib/subscriberspeopleselftagcloudsection.php:48
-#: lib/subscriptionspeopleselftagcloudsection.php:48
 msgid "People Tagcloud as self-tagged"
 msgstr "Хмарка теґів (позначки самих користувачів)"
 
-#: lib/subscriberspeopletagcloudsection.php:48
-#: lib/subscriptionspeopletagcloudsection.php:48
 msgid "People Tagcloud as tagged"
 msgstr "Хмарка теґів (якими ви позначили користувачів)"
 
-#: lib/tagcloudsection.php:56
 msgid "None"
 msgstr "Пусто"
 
 #. TRANS: Server exception displayed if a theme name was invalid.
-#: lib/theme.php:74
 msgid "Invalid theme name."
 msgstr "Невірне назва теми."
 
-#: lib/themeuploader.php:50
 msgid "This server cannot handle theme uploads without ZIP support."
 msgstr "Цей сервер не може опрацювати завантаження теми без підтримки ZIP."
 
-#: lib/themeuploader.php:58 lib/themeuploader.php:61
 msgid "The theme file is missing or the upload failed."
 msgstr "Файл теми відсутній, або стався збій при завантаженні."
 
-#: lib/themeuploader.php:91 lib/themeuploader.php:102
-#: lib/themeuploader.php:279 lib/themeuploader.php:283
-#: lib/themeuploader.php:291 lib/themeuploader.php:298
 msgid "Failed saving theme."
 msgstr "Помилка при збереженні теми."
 
-#: lib/themeuploader.php:147
 msgid "Invalid theme: bad directory structure."
 msgstr "Невірна тема: хибна структура каталогів."
 
-#: lib/themeuploader.php:166
 #, php-format
 msgid "Uploaded theme is too large; must be less than %d byte uncompressed."
 msgid_plural ""
@@ -9628,11 +7975,9 @@ msgstr[2] ""
 "Тема, що її було завантажено, надто велика; без компресії її розмір має "
 "становити менше ніж %d байтів."
 
-#: lib/themeuploader.php:179
 msgid "Invalid theme archive: missing file css/display.css"
 msgstr "В архіві з темою є помилка: відсутній файл css/display.css"
 
-#: lib/themeuploader.php:219
 msgid ""
 "Theme contains invalid file or folder name. Stick with ASCII letters, "
 "digits, underscore, and minus sign."
@@ -9640,143 +7985,115 @@ msgstr ""
 "Тема містить неприпустиме ім’я файлу або теки. Використовуйте літери "
 "стандарту ASCII, цифри, знаки підкреслення та мінусу."
 
-#: lib/themeuploader.php:225
 msgid "Theme contains unsafe file extension names; may be unsafe."
 msgstr ""
 "У темі містяться файли, що мають небезпечні розширення; це може виявитися "
 "небезпечним."
 
-#: lib/themeuploader.php:242
 #, php-format
 msgid "Theme contains file of type '.%s', which is not allowed."
 msgstr "Тема містить файл типу «.%s», який є неприпустимим."
 
-#: lib/themeuploader.php:260
 msgid "Error opening theme archive."
 msgstr "Помилка при відкритті архіву з темою."
 
-#: lib/threadednoticelist.php:270
-#, php-format
-msgid "Show all %d comment"
-msgid_plural "Show all %d comments"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+#, fuzzy, php-format
+msgid "Show %d reply"
+msgid_plural "Show all %d replies"
+msgstr[0] "Розгорнути"
+msgstr[1] "Розгорнути"
+msgstr[2] "Розгорнути"
 
-#: lib/topposterssection.php:74
 msgid "Top posters"
 msgstr "Топ-дописувачі"
 
 #. TRANS: Title for the form to unblock a user.
-#: lib/unblockform.php:67
 msgctxt "TITLE"
 msgid "Unblock"
 msgstr "Розблокувати"
 
-#: lib/unsandboxform.php:69
 msgid "Unsandbox"
 msgstr "Витягти з пісочниці"
 
-#: lib/unsandboxform.php:80
 msgid "Unsandbox this user"
 msgstr "Повернути користувача з пісочниці"
 
-#: lib/unsilenceform.php:67
 msgid "Unsilence"
 msgstr "Витягти кляп"
 
-#: lib/unsilenceform.php:78
 msgid "Unsilence this user"
 msgstr "Витягти кляп, дозволити базікати знов"
 
-#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
 msgid "Unsubscribe from this user"
 msgstr "Відписатись від цього користувача"
 
-#: lib/unsubscribeform.php:137
 msgid "Unsubscribe"
 msgstr "Відписатись"
 
 #. 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).
-#: lib/usernoprofileexception.php:60
 #, php-format
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "Користувач %1$s (%2$d) не має профілю."
 
-#: lib/userprofile.php:116
 msgid "Edit Avatar"
 msgstr "Аватара"
 
 #. TRANS: H2 for user actions in a profile.
 #. TRANS: H2 for entity actions in a profile.
-#: lib/userprofile.php:216 lib/userprofile.php:232
 msgid "User actions"
 msgstr "Діяльність користувача"
 
 #. TRANS: Text shown in user profile of not yet compeltely deleted users.
-#: lib/userprofile.php:220
 msgid "User deletion in progress..."
 msgstr "Видалення користувача у процесі..."
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:248
 msgid "Edit profile settings"
 msgstr "Налаштування профілю"
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:250
 msgid "Edit"
 msgstr "Правка"
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:274
 msgid "Send a direct message to this user"
 msgstr "Надіслати пряме повідомлення цьому користувачеві"
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:276
 msgid "Message"
 msgstr "Повідомлення"
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:318
 msgid "Moderate"
 msgstr "Модерувати"
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:357
 msgid "User role"
 msgstr "Роль користувача"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:360
 msgctxt "role"
 msgid "Administrator"
 msgstr "Адміністратор"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:362
 msgctxt "role"
 msgid "Moderator"
 msgstr "Модератор"
 
-#: lib/util.php:321
 msgid "Not allowed to log in."
 msgstr "Вхід до системи не дозволено."
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1337
 msgid "a few seconds ago"
 msgstr "мить тому"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1340
 msgid "about a minute ago"
 msgstr "хвилину тому"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1344
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
@@ -9785,12 +8102,10 @@ msgstr[1] "близько %d хвилин тому"
 msgstr[2] "близько %d хвилин тому"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1347
 msgid "about an hour ago"
 msgstr "годину тому"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1351
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
@@ -9799,12 +8114,10 @@ msgstr[1] "близько %d годин тому"
 msgstr[2] "близько %d годин тому"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1354
 msgid "about a day ago"
 msgstr "день тому"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1358
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
@@ -9813,12 +8126,10 @@ msgstr[1] "близько %d днів тому"
 msgstr[2] "близько %d днів тому"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1361
 msgid "about a month ago"
 msgstr "місяць тому"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1365
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
@@ -9827,207 +8138,41 @@ msgstr[1] "близько %d місяців тому"
 msgstr[2] "близько %d місяців тому"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1368
 msgid "about a year ago"
 msgstr "близько року тому"
 
 #. TRANS: Web color exception thrown when a hexadecimal color code does not validate.
 #. TRANS: %s is the provided (invalid) color code.
-#: lib/webcolor.php:81 lib/webcolor.php:121
 #, php-format
 msgid "%s is not a valid color! Use 3 or 6 hex characters."
 msgstr "%s є неприпустимим кольором! Використайте 3 або 6 знаків (HEX-формат)"
 
 #. TRANS: Exception.
-#: lib/xrd.php:63
 msgid "Invalid XML."
 msgstr "Непрацездатний XML."
 
 #. TRANS: Exception.
-#: lib/xrd.php:68
 msgid "Invalid XML, missing XRD root."
 msgstr "Неправильний XML, корінь XRD відсутній."
 
 #. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
-#: scripts/restoreuser.php:62
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr "Отримання резервної копії файлу «%s»."
 
-#~ msgid "Could not generate feed for group - %s"
-#~ msgstr "Не вдалося створити веб-стрічку для спільноти — %s"
+#~ msgid "Full name is too long (max 255 chars)."
+#~ msgstr "Повне ім’я задовге (255 знаків максимум)"
 
-#~ msgid "Current confirmed Jabber/Google Talk address."
-#~ msgstr "Поточна підтверджена адреса Jabber/Google Talk."
+#~ msgid "description is too long (max %d chars)."
+#~ msgstr "опис надто довгий (%d знаків максимум)."
 
-#~ msgid ""
-#~ "Jabber or Google Talk address, like \"UserName@example.org\". First, make "
-#~ "sure to add %s to your buddy list in your IM client or on Google Talk."
-#~ msgstr ""
-#~ "Jabber або Google Talk адреса, на зразок «username@example.org». Але "
-#~ "спершу переконайтеся, що додали %s до списку контактів в своєму IM-"
-#~ "клієнті або в Google Talk."
+#~ msgid "Location is too long (max 255 chars)."
+#~ msgstr "Розташування надто довге (255 знаків максимум)."
 
-#~ msgid "Send me notices through Jabber/Google Talk."
-#~ msgstr "Повідомляти мене через Jabber/Google Talk."
+#~ msgid "Too many aliases! Maximum %d."
+#~ msgstr "Забагато додаткових імен! Максимум становить %d."
 
-#~ msgid "Publish a MicroID for my Jabber/Google Talk address."
-#~ msgstr "Позначати міткою MicroID мою адресу Jabber/Google Talk."
-
-#~ msgid "No Jabber ID."
-#~ msgstr "Немає Jabber ID."
-
-#~ msgid "Not a valid Jabber ID."
-#~ msgstr "Це недійсний Jabber ID."
-
-#~ msgid "That is already your Jabber ID."
-#~ msgstr "Це і є ваш Jabber ID."
-
-#~ msgid "That is not your Jabber ID."
-#~ msgstr "Це не ваш Jabber ID."
-
-#~ msgid "Other settings"
-#~ msgstr "Інші опції"
-
-#~ msgid "Tag cloud"
-#~ msgstr "Хмарка теґів"
-
-#~ msgid "Consumer key"
-#~ msgstr "Ключ споживача"
-
-#~ msgid "Consumer secret"
-#~ msgstr "Таємно слово споживача"
-
-#~ msgid "Request token URL"
-#~ msgstr "URL-адреса токена запиту"
-
-#~ msgid "Access token URL"
-#~ msgstr "URL-адреса токена дозволу"
-
-#~ msgid "Authorize URL"
-#~ msgstr "Авторизувати URL-адресу"
-
-#~ msgid "Jabber"
-#~ msgstr "Jabber"
-
-#~ msgid "Photo"
-#~ msgstr "Фото"
-
-#~ msgid "Other options"
-#~ msgstr "Інші опції"
-
-#~ msgid "Other"
-#~ msgstr "Інше"
-
-#~ msgid "Primary site navigation"
-#~ msgstr "Відправна навігація по сайту"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Personal profile and friends timeline"
-#~ msgstr "Персональний профіль і стрічка друзів"
-
-#~ msgctxt "MENU"
-#~ msgid "Personal"
-#~ msgstr "Стрічка"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Change your email, avatar, password, profile"
-#~ msgstr "Змінити електронну адресу, аватару, пароль, профіль"
-
-#~ msgid "Account"
-#~ msgstr "Акаунт"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Connect to services"
-#~ msgstr "З’єднання з сервісами"
-
-#~ msgid "Connect"
-#~ msgstr "З’єднання"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Change site configuration"
-#~ msgstr "Змінити конфігурацію сайту"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Invite friends and colleagues to join you on %s"
-#~ msgstr "Запросіть друзів та колег приєднатись до вас на %s"
-
-#~ msgctxt "MENU"
-#~ msgid "Invite"
-#~ msgstr "Запросити"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Create an account"
-#~ msgstr "Створити новий акаунт"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Help me!"
-#~ msgstr "Допоможіть!"
-
-#~ msgctxt "MENU"
-#~ msgid "Help"
-#~ msgstr "Довідка"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Search for people or text"
-#~ msgstr "Пошук людей або текстів"
-
-#~ msgid "Local views"
-#~ msgstr "Огляд"
-
-#~ msgid "Page notice"
-#~ msgstr "Зауваження сторінки"
-
-#~ msgid "Secondary site navigation"
-#~ msgstr "Другорядна навігація по сайту"
-
-#~ msgid "StatusNet software license"
-#~ msgstr "Ліцензія програмного забезпечення StatusNet"
-
-#~ msgid "Site content license"
-#~ msgstr "Ліцензія змісту сайту"
-
-#~ msgid "Pagination"
-#~ msgstr "Нумерація сторінок"
-
-#~ msgid "Author"
-#~ msgstr "Автор"
-
-#~ msgid "Provider"
-#~ msgstr "Провайдер"
-
-#~ msgctxt "MENU"
-#~ msgid "SMS"
-#~ msgstr "СМС"
-
-#~ msgid "Filter tags"
-#~ msgstr "Фільтр для теґів"
-
-#~ msgid "[%s]"
-#~ msgstr "[%s]"
-
-#~ msgid "Available characters"
-#~ msgstr "Лишилось знаків"
-
-#~ msgctxt "MENU"
-#~ msgid "Profile"
-#~ msgstr "Профіль"
-
-#~ msgid "Search help"
-#~ msgstr "Пошук"
-
-#~ msgid "Unknown user. Go to %s to add your address to your account"
-#~ msgstr ""
-#~ "Невідомий користувач. Перейти до %s, аби додати свою адресу до акаунту."
-
-#~ msgid "Message too long. Maximum is %1$d character, you sent %2$d."
-#~ msgid_plural "Message too long. Maximum is %1$d characters, you sent %2$d."
-#~ msgstr[0] ""
-#~ "Повідомлення надто довге. Максимум становить %1$d символів, натомість ви "
-#~ "надсилаєте %2$d."
-#~ msgstr[1] ""
-#~ "Повідомлення надто довге. Максимум становить %1$d символів, натомість ви "
-#~ "надсилаєте %2$d."
-#~ msgstr[2] ""
-#~ "Повідомлення надто довге. Максимум становить %1$d символів, натомість ви "
-#~ "надсилаєте %2$d."
+#, fuzzy
+#~ msgctxt "BUTTON"
+#~ msgid "Comment"
+#~ msgstr "Зміст"
diff --git a/locale/zh_CN/LC_MESSAGES/statusnet.po b/locale/zh_CN/LC_MESSAGES/statusnet.po
index 6f74d5417a..c79258d3ca 100644
--- a/locale/zh_CN/LC_MESSAGES/statusnet.po
+++ b/locale/zh_CN/LC_MESSAGES/statusnet.po
@@ -15,68 +15,58 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:23+0000\n"
-"PO-Revision-Date: 2011-03-03 17:26:33+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:42+0000\n"
 "Language-Team: Simplified Chinese <http://translatewiki.net/wiki/Portal:zh-"
 "hans>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-POT-Import-Date: 2011-02-25 23:49:23+0000\n"
+"X-POT-Import-Date: 2011-03-03 17:59:19+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
-#: actions/accessadminpanel.php:53 lib/adminpanelaction.php:363
 msgid "Access"
 msgstr "访问"
 
 #. TRANS: Page notice.
-#: actions/accessadminpanel.php:64
 msgid "Site access settings"
 msgstr "网站访问设置"
 
 #. TRANS: Form legend for registration form.
-#: actions/accessadminpanel.php:151
 msgid "Registration"
 msgstr "注册"
 
 #. TRANS: Checkbox instructions for admin setting "Private".
-#: actions/accessadminpanel.php:155
 msgid "Prohibit anonymous users (not logged in) from viewing site?"
 msgstr "要禁止匿名用户（未登录）浏览网站吗？"
 
 #. TRANS: Checkbox label for prohibiting anonymous users from viewing site.
-#: actions/accessadminpanel.php:157
 msgctxt "LABEL"
 msgid "Private"
 msgstr "非公开"
 
 #. TRANS: Checkbox instructions for admin setting "Invite only".
-#: actions/accessadminpanel.php:164
 msgid "Make registration invitation only."
 msgstr "只允许邀请注册。"
 
 #. TRANS: Checkbox label for configuring site as invite only.
-#: actions/accessadminpanel.php:166
 msgid "Invite only"
 msgstr "邀请制"
 
 #. TRANS: Checkbox instructions for admin setting "Closed" (no new registrations).
-#: actions/accessadminpanel.php:173
 msgid "Disable new registrations."
 msgstr "禁止新用户注册。"
 
 #. TRANS: Checkbox label for disabling new user registrations.
-#: actions/accessadminpanel.php:175
 msgid "Closed"
 msgstr "封闭（不允许新用户注册）"
 
 #. TRANS: Title for button to save access settings in site admin panel.
-#: actions/accessadminpanel.php:191
 msgid "Save access settings"
 msgstr "保存访问设置"
 
@@ -84,6 +74,7 @@ msgstr "保存访问设置"
 #. TRANS: Button text for saving theme settings.
 #. TRANS: Button label to save e-mail preferences.
 #. TRANS: Button label to save IM preferences.
+#. TRANS: Button text in the license admin panel.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
 #. TRANS: Button text for saving site notice in admin panel.
@@ -93,21 +84,12 @@ msgstr "保存访问设置"
 #. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
 #. TRANS: Button text on profile design page to save settings.
-#: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
-#: actions/emailsettings.php:251 actions/imsettings.php:199
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:198
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:204
-#: actions/subscriptions.php:261 actions/urlsettings.php:152
-#: actions/useradminpanel.php:298 lib/applicationeditform.php:355
-#: lib/designform.php:320 lib/groupeditform.php:201
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "保存"
 
 #. TRANS: Server error when page not found (404).
 #. TRANS: Server error when page not found (404)
-#: actions/all.php:68 actions/public.php:98 actions/replies.php:93
-#: actions/showfavorites.php:140 actions/tag.php:52
 msgid "No such page."
 msgstr "没有这个页面。"
 
@@ -126,6 +108,7 @@ msgstr "没有这个页面。"
 #. TRANS: Client error displayed when checking group membership for a non-existing user.
 #. TRANS: Client error displayed when trying to have a non-existing user join a group.
 #. TRANS: Client error displayed when trying to have a non-existing user leave a group.
+#. TRANS: Client error displayed when not providing a user or an invalid user.
 #. TRANS: Client error displayed when updating a status for a non-existing user.
 #. TRANS: Client error displayed when requesting a list of followers for a non-existing user.
 #. TRANS: Client error displayed when requesting most recent favourite notices by a user for a non-existing user.
@@ -138,6 +121,8 @@ msgstr "没有这个页面。"
 #. 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.
 #. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
@@ -145,33 +130,10 @@ msgstr "没有这个页面。"
 #. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when calling a profile action without specifying a user.
-#: actions/all.php:80 actions/allrss.php:69
-#: actions/apiaccountupdatedeliverydevice.php:110
-#: actions/apiaccountupdateprofile.php:103
-#: actions/apiaccountupdateprofilebackgroundimage.php:118
-#: actions/apiaccountupdateprofileimage.php:104 actions/apiatomservice.php:59
-#: actions/apiblockcreate.php:96 actions/apiblockdestroy.php:94
-#: actions/apidirectmessage.php:75 actions/apidirectmessagenew.php:72
-#: actions/apigroupcreate.php:111 actions/apigroupismember.php:89
-#: actions/apigroupjoin.php:98 actions/apigroupleave.php:98
-#: actions/apigrouplist.php:70 actions/apigroupprofileupdate.php:108
-#: actions/apistatusesupdate.php:230 actions/apisubscriptions.php:85
-#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:173
-#: actions/apitimelinehome.php:78 actions/apitimelinementions.php:77
-#: actions/apitimelineuser.php:79 actions/avatarbynickname.php:79
-#: actions/favoritesrss.php:72 actions/foaf.php:42 actions/foaf.php:61
-#: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116
-#: actions/otp.php:78 actions/remotesubscribe.php:144
-#: actions/remotesubscribe.php:153 actions/replies.php:73
-#: actions/repliesrss.php:38 actions/rsd.php:113 actions/showfavorites.php:106
-#: actions/userbyid.php:75 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/userxrd.php:59 actions/xrds.php:71 lib/command.php:509
-#: lib/galleryaction.php:59 lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "没有这个用户。"
 
 #. TRANS: Page title. %1$s is user nickname, %2$d is page number
-#: actions/all.php:91
 #, php-format
 msgid "%1$s and friends, page %2$d"
 msgstr "%1$s 和好友，第%2$d页"
@@ -180,33 +142,26 @@ msgstr "%1$s 和好友，第%2$d页"
 #. TRANS: H1 text for page. %s is a user nickname.
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Timeline title for user and friends. %s is a user nickname.
-#: actions/all.php:94 actions/all.php:191 actions/allrss.php:117
-#: actions/apitimelinefriends.php:207 actions/apitimelinehome.php:113
-#: lib/personalgroupnav.php:100
 #, php-format
 msgid "%s and friends"
 msgstr "%s 和好友们"
 
 #. TRANS: %s is user nickname.
-#: actions/all.php:108
 #, php-format
 msgid "Feed for friends of %s (RSS 1.0)"
 msgstr "%s 好友的聚合(RSS 1.0)"
 
 #. TRANS: %s is user nickname.
-#: actions/all.php:117
 #, php-format
 msgid "Feed for friends of %s (RSS 2.0)"
 msgstr "%s 好友的聚合(RSS 2.0)"
 
 #. TRANS: %s is user nickname.
-#: actions/all.php:126
 #, php-format
 msgid "Feed for friends of %s (Atom)"
 msgstr "%s 好友的聚合(Atom)"
 
 #. TRANS: Empty list message. %s is a user nickname.
-#: actions/all.php:139
 #, php-format
 msgid ""
 "This is the timeline for %s and friends but no one has posted anything yet."
@@ -214,7 +169,6 @@ msgstr "这是 %s 和好友的时间线，但是没有任何人发布内容。"
 
 #. TRANS: Encouragement displayed on logged in user's empty timeline.
 #. TRANS: This message contains Markdown links. Keep "](" together.
-#: actions/all.php:146
 #, php-format
 msgid ""
 "Try subscribing to more people, [join a group](%%action.groups%%) or post "
@@ -224,7 +178,6 @@ msgstr ""
 
 #. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@".
 #. TRANS: This message contains Markdown links. Keep "](" together.
-#: actions/all.php:150
 #, php-format
 msgid ""
 "You can try to [nudge %1$s](../%2$s) from their profile or [post something "
@@ -237,7 +190,6 @@ msgstr ""
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
 #. TRANS: Second sentence of empty message for anonymous users. %s is a user nickname.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:221
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -246,14 +198,11 @@ msgstr ""
 "现在就[注册一个帐号](%%%%action.register%%%%)并呼叫或者发一条消息给%s。"
 
 #. TRANS: H1 text for page when viewing a list for self.
-#: actions/all.php:188
 msgid "You and friends"
 msgstr "你和好友们"
 
 #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
 #. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name.
-#: actions/allrss.php:122 actions/apitimelinefriends.php:213
-#: actions/apitimelinehome.php:119
 #, php-format
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr "%2$s上%1$s和好友们的更新！"
@@ -272,55 +221,20 @@ msgstr "%2$s上%1$s和好友们的更新！"
 #. TRANS: Client error displayed trying to execute an unknown API method checking group membership.
 #. TRANS: Client error displayed trying to execute an unknown API method listing the latest 20 groups.
 #. TRANS: Client error displayed trying to execute an unknown API method showing group membership.
+#. TRANS: Client error displayed when using an unsupported API format.
 #. TRANS: Client error displayed trying to execute an unknown API method showing a group.
 #. TRANS: Client error displayed trying to execute an unknown API method testing API connectivity.
 #. TRANS: Client error displayed trying to execute an unknown API method deleting a status.
 #. TRANS: Client error displayed when trying to handle an unknown API method.
-#: actions/apiaccountratelimitstatus.php:69
-#: actions/apiaccountupdatedeliverydevice.php:92
-#: actions/apiaccountupdateprofile.php:94
-#: actions/apiaccountupdateprofilebackgroundimage.php:92
-#: actions/apiaccountupdateprofilecolors.php:115
-#: actions/apiaccountverifycredentials.php:68 actions/apidirectmessage.php:157
-#: actions/apifavoritecreate.php:98 actions/apifavoritedestroy.php:98
-#: actions/apifriendshipscreate.php:99 actions/apifriendshipsdestroy.php:99
-#: actions/apifriendshipsshow.php:124 actions/apigroupcreate.php:138
-#: actions/apigroupismember.php:115 actions/apigroupjoin.php:151
-#: actions/apigroupleave.php:141 actions/apigrouplist.php:134
-#: actions/apigrouplistall.php:120 actions/apigroupmembership.php:105
-#: actions/apigroupprofileupdate.php:100 actions/apigroupprofileupdate.php:213
-#: actions/apigroupshow.php:114 actions/apihelptest.php:84
-#: actions/apistatusesdestroy.php:101 actions/apistatusesretweets.php:110
-#: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:139
-#: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
-#: actions/apitimelinefavorites.php:182 actions/apitimelinefriends.php:276
-#: actions/apitimelinegroup.php:148 actions/apitimelinehome.php:181
-#: actions/apitimelinementions.php:182 actions/apitimelinepublic.php:247
-#: actions/apitimelineretweetedtome.php:147
-#: actions/apitimelineretweetsofme.php:147 actions/apitimelinetag.php:165
-#: actions/apitimelineuser.php:217 actions/apiusershow.php:100
 msgid "API method not found."
 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.
-#: actions/apiaccountupdatedeliverydevice.php:83
-#: actions/apiaccountupdateprofile.php:85
-#: actions/apiaccountupdateprofilebackgroundimage.php:83
-#: actions/apiaccountupdateprofilecolors.php:106
-#: actions/apiaccountupdateprofileimage.php:80 actions/apiblockcreate.php:87
-#: actions/apiblockdestroy.php:85 actions/apidirectmessagenew.php:107
-#: actions/apifavoritecreate.php:88 actions/apifavoritedestroy.php:88
-#: actions/apifriendshipscreate.php:89 actions/apifriendshipsdestroy.php:89
-#: actions/apigroupcreate.php:102 actions/apigroupjoin.php:89
-#: actions/apigroupleave.php:89 actions/apigroupprofileupdate.php:92
-#: actions/apimediaupload.php:66 actions/apistatusesretweet.php:63
-#: actions/apistatusesupdate.php:194
 msgid "This method requires a POST."
 msgstr "此方法接受POST请求。"
 
 #. TRANS: Client error displayed when no valid device parameter is provided for a user's delivery device setting.
-#: actions/apiaccountupdatedeliverydevice.php:103
 msgid ""
 "You must specify a parameter named 'device' with a value of one of: sms, im, "
 "none."
@@ -334,10 +248,6 @@ msgstr ""
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
-#: actions/apiaccountupdatedeliverydevice.php:136
-#: actions/emailsettings.php:353 actions/emailsettings.php:499
-#: actions/profilesettings.php:323 actions/smssettings.php:300
-#: actions/smssettings.php:453 actions/urlsettings.php:211
 msgid "Could not update user."
 msgstr "无法更新用户。"
 
@@ -350,32 +260,17 @@ msgstr "无法更新用户。"
 #. TRANS: Server error displayed when requesting Friends of a Friend feed for a user for which the profile could not be found.
 #. TRANS: Server error displayed when trying to get a user hCard for a user without a profile.
 #. TRANS: Server error displayed when calling a profile action while the specified user does not have a profile.
-#: actions/apiaccountupdateprofile.php:111
-#: actions/apiaccountupdateprofilebackgroundimage.php:199
-#: actions/apiaccountupdateprofilecolors.php:183
-#: actions/apiaccountupdateprofileimage.php:131
-#: actions/apiuserprofileimage.php:88 actions/apiusershow.php:108
-#: actions/avatarbynickname.php:85 actions/foaf.php:69 actions/hcard.php:75
-#: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
-#: lib/profileaction.php:85
 msgid "User has no profile."
 msgstr "用户没有个人信息。"
 
 #. TRANS: Server error displayed if a user profile could not be saved.
 #. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:419
 msgid "Could not save profile."
 msgstr "无法保存个人信息。"
 
 #. TRANS: Client error displayed when the number of bytes in a POST request exceeds a limit.
 #. TRANS: %s is the number of bytes of the CONTENT_LENGTH.
 #. TRANS: Form validation error in design settings form. POST should remain untranslated.
-#: actions/apiaccountupdateprofilebackgroundimage.php:108
-#: actions/apiaccountupdateprofileimage.php:95 actions/apimediaupload.php:81
-#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
-#: actions/designadminpanel.php:120 actions/editapplication.php:121
-#: actions/newapplication.php:102 actions/newnotice.php:95
-#: lib/designsettings.php:110
 #, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s byte) due to its "
@@ -390,26 +285,15 @@ msgstr[0] "服务器当前的设置无法处理这么多的 POST 数据（%s byt
 #. TRANS: Client error displayed when a database error occurs inserting profile colours.
 #. TRANS: Client error displayed when a database error occurs updating profile colours.
 #. TRANS: Form validation error displayed when group design settings could not be saved because of an application issue.
-#: actions/apiaccountupdateprofilebackgroundimage.php:138
-#: actions/apiaccountupdateprofilebackgroundimage.php:149
-#: actions/apiaccountupdateprofilecolors.php:160
-#: actions/apiaccountupdateprofilecolors.php:171
-#: actions/groupdesignsettings.php:285 actions/groupdesignsettings.php:296
-#: actions/userdesignsettings.php:218 actions/userdesignsettings.php:228
-#: actions/userdesignsettings.php:270 actions/userdesignsettings.php:280
 msgid "Unable to save your design settings."
 msgstr "无法保存你的外观设置。"
 
 #. TRANS: Error displayed when updating design settings fails.
 #. TRANS: Client error displayed when a database error occurs updating profile colours.
-#: actions/apiaccountupdateprofilebackgroundimage.php:191
-#: actions/apiaccountupdateprofilecolors.php:139
-#: actions/userdesignsettings.php:196
 msgid "Could not update your design."
 msgstr "无法更新你的外观。"
 
 #. TRANS: Title for Atom feed.
-#: actions/apiatomservice.php:85
 msgctxt "ATOM"
 msgid "Main"
 msgstr "主要"
@@ -418,9 +302,6 @@ msgstr "主要"
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Title in atom group notice feed. %s is a group name.
 #. TRANS: Title in atom user notice feed. %s is a user name.
-#: actions/apiatomservice.php:93 actions/grouprss.php:138
-#: actions/userrss.php:94 lib/atomgroupnoticefeed.php:63
-#: lib/atomusernoticefeed.php:88
 #, php-format
 msgid "%s timeline"
 msgstr "%s的时间线"
@@ -430,8 +311,6 @@ msgstr "%s的时间线"
 #. TRANS: %s is a user nickname.
 #. TRANS: Header for subscriptions overview for a user (first page).
 #. TRANS: %s is a user nickname.
-#: actions/apiatomservice.php:104 actions/atompubsubscriptionfeed.php:148
-#: actions/subscriptions.php:51
 #, php-format
 msgid "%s subscriptions"
 msgstr "%s 关注的用户"
@@ -439,58 +318,48 @@ msgstr "%s 关注的用户"
 #. TRANS: Title for Atom feed with a user's favorite notices. %s is a user nickname.
 #. TRANS: Title for Atom favorites feed.
 #. TRANS: %s is a user nickname.
-#: actions/apiatomservice.php:115 actions/atompubfavoritefeed.php:142
 #, php-format
 msgid "%s favorites"
 msgstr "%s 收藏夹"
 
 #. TRANS: Title for Atom feed with a user's memberships. %s is a user nickname.
-#: actions/apiatomservice.php:126
 #, php-format
 msgid "%s memberships"
 msgstr "%s 的成员身份"
 
 #. TRANS: Client error displayed when users try to block themselves.
-#: actions/apiblockcreate.php:105
 msgid "You cannot block yourself!"
 msgstr "你不能屏蔽自己！"
 
 #. TRANS: Server error displayed when blocking a user has failed.
-#: actions/apiblockcreate.php:127
 msgid "Block user failed."
 msgstr "屏蔽用户失败。"
 
 #. TRANS: Server error displayed when unblocking a user has failed.
-#: actions/apiblockdestroy.php:113
 msgid "Unblock user failed."
 msgstr "取消屏蔽用户失败。"
 
 #. TRANS: Title. %s is a user nickname.
-#: actions/apidirectmessage.php:88
 #, php-format
 msgid "Direct messages from %s"
 msgstr "%s发来的私信"
 
 #. TRANS: Subtitle. %s is a user nickname.
-#: actions/apidirectmessage.php:93
 #, php-format
 msgid "All the direct messages sent from %s"
 msgstr "所有来自%s的私信"
 
 #. TRANS: Title. %s is a user nickname.
-#: actions/apidirectmessage.php:102
 #, php-format
 msgid "Direct messages to %s"
 msgstr "发给%s的私信"
 
 #. TRANS: Subtitle. %s is a user nickname.
-#: actions/apidirectmessage.php:107
 #, php-format
 msgid "All the direct messages sent to %s"
 msgstr "所有发给%s的私信"
 
 #. TRANS: Client error displayed when no message text was submitted (406).
-#: actions/apidirectmessagenew.php:117
 msgid "No message text!"
 msgstr "消息没有正文！"
 
@@ -498,24 +367,20 @@ msgstr "消息没有正文！"
 #. TRANS: %d is the maximum number of characters for a message.
 #. TRANS: Form validation error displayed when message content is too long.
 #. TRANS: %d is the maximum number of characters for a message.
-#: actions/apidirectmessagenew.php:127 actions/newmessage.php:152
 #, php-format
 msgid "That's too long. Maximum message size is %d character."
 msgid_plural "That's too long. Maximum message size is %d characters."
 msgstr[0] "太长了。最长的信息长度是%d个字符。"
 
 #. TRANS: Client error displayed if a recipient user could not be found (403).
-#: actions/apidirectmessagenew.php:139
 msgid "Recipient user not found."
 msgstr "未找到收件人。"
 
 #. TRANS: Client error displayed trying to direct message another user who's not a friend (403).
-#: actions/apidirectmessagenew.php:144
 msgid "Cannot send direct messages to users who aren't your friend."
 msgstr "不能将直接邮件发送到用户的不是你的朋友。"
 
 #. TRANS: Client error displayed trying to direct message self (403).
-#: actions/apidirectmessagenew.php:154
 msgid ""
 "Do not send a message to yourself; just say it to yourself quietly instead."
 msgstr "不要向自己发送消息；跟自己悄悄说就得了。"
@@ -523,116 +388,96 @@ 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.
 #. TRANS: Client error displayed trying to delete a status with an invalid ID.
-#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:108
-#: actions/apistatusesdestroy.php:121
 msgid "No status found with that ID."
 msgstr "没有找到此 ID 的消息。"
 
 #. TRANS: Client error displayed when trying to mark a notice favourite that already is a favourite.
-#: actions/apifavoritecreate.php:120
 msgid "This status is already a favorite."
 msgstr "已收藏过此消息。"
 
 #. TRANS: Client error displayed when marking a notice as favourite fails.
 #. TRANS: Server error displayed when trying to mark a notice as favorite fails in the database.
 #. TRANS: Error message text shown when a favorite could not be set.
-#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:306
 msgid "Could not create favorite."
 msgstr "无法创建收藏。"
 
 #. TRANS: Client error displayed when trying to remove a favourite that was not a favourite.
-#: actions/apifavoritedestroy.php:122
 msgid "That status is not a favorite."
 msgstr "此消息未被收藏。"
 
 #. TRANS: Client error displayed when removing a favourite has failed.
 #. TRANS: Server error displayed when removing a favorite from the database fails.
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:90
 msgid "Could not delete favorite."
 msgstr "无法删除收藏。"
 
 #. TRANS: Client error displayed when trying follow who's profile could not be found.
-#: actions/apifriendshipscreate.php:109
 msgid "Could not follow user: profile not found."
 msgstr "无法关注用户：未找到用户。"
 
 #. TRANS: Client error displayed when trying to follow a user that's already being followed.
 #. TRANS: %s is the nickname of the user that is already being followed.
-#: actions/apifriendshipscreate.php:120
 #, php-format
 msgid "Could not follow user: %s is already on your list."
 msgstr "无法关注用户：你已经关注了%s。"
 
 #. TRANS: Client error displayed when trying to unfollow a user that cannot be found.
-#: actions/apifriendshipsdestroy.php:109
 msgid "Could not unfollow user: User not found."
 msgstr "无法取消关注用户：未找到用户。"
 
 #. TRANS: Client error displayed when trying to unfollow self.
-#: actions/apifriendshipsdestroy.php:121
 msgid "You cannot unfollow yourself."
 msgstr "你不能取消关注自己。"
 
 #. TRANS: Client error displayed when supplying invalid parameters to an API call checking if a friendship exists.
-#: actions/apifriendshipsexists.php:88
 msgid "Two valid IDs or nick names must be supplied."
 msgstr "必须提供两个有效的 ID 或用户昵称。"
 
 #. TRANS: Client error displayed when a source user could not be determined showing friendship.
-#: actions/apifriendshipsshow.php:131
 msgid "Could not determine source user."
 msgstr "无法确定源用户。"
 
 #. TRANS: Client error displayed when a target user could not be determined showing friendship.
-#: actions/apifriendshipsshow.php:140
 msgid "Could not find target user."
 msgstr "无法找到目标用户。"
 
 #. TRANS: Client error trying to create a group with a nickname this is already in use.
+#. TRANS: API validation exception thrown when nickname is already used.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:156 actions/apigroupprofileupdate.php:255
-#: actions/editgroup.php:191 actions/newgroup.php:137
-#: actions/profilesettings.php:274 actions/register.php:199
 msgid "Nickname already in use. Try another one."
 msgstr "昵称已被使用，换一个吧。"
 
 #. TRANS: Client error in form for group creation.
+#. TRANS: API validation exception thrown when nickname does not validate.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:164 actions/apigroupprofileupdate.php:259
-#: actions/editgroup.php:195 actions/newgroup.php:141
-#: actions/profilesettings.php:244 actions/register.php:201
 msgid "Not a valid nickname."
 msgstr "不是有效的昵称。"
 
 #. TRANS: Client error in form for group creation.
+#. TRANS: API validation exception thrown when homepage URL does not validate.
 #. TRANS: Validation error shown when providing an invalid homepage URL in the "Edit application" form.
 #. TRANS: Group edit form validation error.
 #. TRANS: Validation error shown when providing an invalid homepage URL in the "New application" form.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:181 actions/apigroupprofileupdate.php:277
-#: actions/editapplication.php:235 actions/editgroup.php:202
-#: actions/newapplication.php:221 actions/newgroup.php:148
-#: actions/profilesettings.php:249 actions/register.php:208
 msgid "Homepage is not a valid URL."
 msgstr "主页的URL不正确。"
 
 #. TRANS: Client error in form for group creation.
+#. TRANS: API validation exception thrown when full name does not validate.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:191 actions/editgroup.php:206
-#: actions/newgroup.php:152 actions/profilesettings.php:253
-#: actions/register.php:211
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "全名过长(不能超过 255 个字符)。"
 
 #. TRANS: Client error shown when providing too long a description during group creation.
 #. TRANS: %d is the maximum number of allowed characters.
+#. TRANS: API validation exception thrown when description does not validate.
+#. TRANS: %d is the maximum description length and used for plural.
 #. TRANS: Validation error shown when providing too long a description in the "Edit application" form.
 #. TRANS: %d is the maximum number of allowed characters.
 #. TRANS: Group edit form validation error.
@@ -640,32 +485,27 @@ msgstr "全名过长(不能超过 255 个字符)。"
 #. TRANS: %d is the maximum number of characters for the description.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed characters.
-#: actions/apigroupcreate.php:201 actions/editapplication.php:202
-#: actions/editgroup.php:211 actions/newapplication.php:182
-#: actions/newgroup.php:157
 #, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."
 msgstr[0] "D描述过长(不能超过%d 个字符)。"
 
 #. TRANS: Client error shown when providing too long a location during group creation.
+#. TRANS: API validation exception thrown when location does not validate.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:215 actions/editgroup.php:218
-#: actions/newgroup.php:164 actions/profilesettings.php:266
-#: actions/register.php:220
 msgid "Location is too long (maximum 255 characters)."
 msgstr "位置过长(不能超过255个字符)。"
 
 #. TRANS: Client error shown when providing too many aliases during group creation.
 #. TRANS: %d is the maximum number of allowed aliases.
+#. TRANS: API validation exception thrown when aliases do not validate.
+#. TRANS: %d is the maximum number of aliases and used for plural.
 #. TRANS: Group edit form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.
-#: actions/apigroupcreate.php:236 actions/editgroup.php:231
-#: actions/newgroup.php:177
 #, php-format
 msgid "Too many aliases! Maximum %d allowed."
 msgid_plural "Too many aliases! Maximum %d allowed."
@@ -673,25 +513,24 @@ msgstr[0] "太多别名了！最多允许%d 个。"
 
 #. TRANS: Client error shown when providing an invalid alias during group creation.
 #. TRANS: %s is the invalid alias.
-#: actions/apigroupcreate.php:253
+#. TRANS: API validation exception thrown when aliases does not validate.
+#. TRANS: %s is the invalid alias.
 #, php-format
 msgid "Invalid alias: \"%s\"."
 msgstr "无效的别名：“%s”。"
 
 #. TRANS: Client error displayed when trying to use an alias during group creation that is already in use.
 #. TRANS: %s is the alias that is already in use.
+#. TRANS: API validation exception thrown when aliases is already used.
+#. TRANS: %s is the already used alias.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error. %s is the already used alias.
-#: actions/apigroupcreate.php:264 actions/apigroupprofileupdate.php:351
-#: actions/editgroup.php:246 actions/newgroup.php:193
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "%s这个别名已被使用，换一个吧。"
 
 #. TRANS: Client error displayed when trying to use an alias during group creation that is the same as the group's nickname.
 #. TRANS: Group edit form validation error.
-#: actions/apigroupcreate.php:278 actions/apigroupprofileupdate.php:359
-#: actions/editgroup.php:253
 msgid "Alias can't be the same as nickname."
 msgstr "别名不能和昵称相同。"
 
@@ -699,26 +538,21 @@ msgstr "别名不能和昵称相同。"
 #. TRANS: Client error displayed when trying to join a group that does not exist.
 #. TRANS: Client error displayed when trying to leave a group that does not exist.
 #. TRANS: Client error displayed trying to show group membership on a non-existing group.
+#. TRANS: Client error displayed when not providing a group or an invalid group.
 #. TRANS: Client error displayed when trying to show a group that could not be found.
 #. TRANS: Client error displayed requesting most recent notices to a group for a non-existing group.
-#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
-#: actions/apigroupleave.php:104 actions/apigroupmembership.php:71
-#: actions/apigroupprofileupdate.php:113 actions/apigroupshow.php:81
-#: actions/apitimelinegroup.php:89
 msgid "Group not found."
 msgstr "小组未找到。"
 
 #. TRANS: Server error displayed when trying to join a group the user is already a member of.
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:345
 msgid "You are already a member of that group."
 msgstr "你已经是该小组成员。"
 
 #. TRANS: Server error displayed when trying to join a group the user is blocked from joining.
 #. 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.
-#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:350
 msgid "You have been blocked from that group by the admin."
 msgstr "你已经被管理员从该小组中屏蔽。"
 
@@ -726,13 +560,11 @@ msgstr "你已经被管理员从该小组中屏蔽。"
 #. TRANS: %1$s is the joining user's nickname, $2$s is the group nickname for which the join failed.
 #. TRANS: Message given having failed to add a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:136 actions/joingroup.php:139 lib/command.php:362
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "无法把用户%1$s添加到%2$s小组"
 
 #. TRANS: Server error displayed when trying to leave a group the user is not a member of.
-#: actions/apigroupleave.php:115
 msgid "You are not a member of this group."
 msgstr "你不是该小组成员。"
 
@@ -740,114 +572,76 @@ msgstr "你不是该小组成员。"
 #. TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
 #. TRANS: Message given having failed to remove a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupleave.php:127 actions/leavegroup.php:133
-#: lib/command.php:410
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
 msgstr "无法把用户%1$s从%2$s小组删除"
 
 #. TRANS: Used as title in check for group membership. %s is a user name.
-#: actions/apigrouplist.php:94
 #, php-format
 msgid "%s's groups"
 msgstr "%s 的小组"
 
 #. TRANS: Used as subtitle in check for group membership. %1$s is a user name, %2$s is the site name.
-#: actions/apigrouplist.php:104
 #, php-format
 msgid "%1$s groups %2$s is a member of."
 msgstr "%1$s 的小组，%2$s 是小组成员。"
 
 #. TRANS: Message is used as a title when listing the lastest 20 groups. %s is a site name.
 #. TRANS: Message is used as a page title. %s is a nick name.
-#: actions/apigrouplistall.php:88 actions/usergroups.php:63
 #, php-format
 msgid "%s groups"
 msgstr "%s 的小组"
 
 #. TRANS: Message is used as a subtitle when listing the lastest 20 groups. %s is a site name.
-#: actions/apigrouplistall.php:93
 #, php-format
 msgid "groups on %s"
 msgstr "在%s上的小组"
 
+#. TRANS: Client error displayed when trying to edit a group without being an admin.
 #. TRANS: Client error displayed trying to edit a group while not being a group admin.
 #. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
 #. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
-#: actions/apigroupprofileupdate.php:118 actions/editgroup.php:110
-#: actions/editgroup.php:176 actions/groupdesignsettings.php:109
-#: actions/grouplogo.php:111
 msgid "You must be an admin to edit the group."
 msgstr "管理员才可以编辑小组。"
 
+#. TRANS: Server error displayed when group update fails.
 #. TRANS: Server error displayed when editing a group fails.
-#: actions/apigroupprofileupdate.php:171 actions/editgroup.php:274
 msgid "Could not update group."
 msgstr "无法更新小组"
 
+#. TRANS: Server error displayed when adding group aliases fails.
 #. TRANS: Server error displayed when group aliases could not be added.
 #. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/apigroupprofileupdate.php:194 actions/editgroup.php:281
-#: classes/User_group.php:540
 msgid "Could not create aliases."
 msgstr "无法创建别名。"
 
+#. TRANS: API validation exception thrown when nickname does not validate.
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: actions/apigroupprofileupdate.php:249 lib/nickname.php:165
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr "昵称只能使用小写字母和数字且不能使用空格。"
 
-#: actions/apigroupprofileupdate.php:286
-#, fuzzy
-msgid "Full name is too long (max 255 chars)."
-msgstr "全名过长(不能超过 255 个字符)。"
-
-#: actions/apigroupprofileupdate.php:296
-#, fuzzy, php-format
-msgid "description is too long (max %d chars)."
-msgstr "D描述过长(不能超过%d 个字符)。"
-
-#: actions/apigroupprofileupdate.php:307
-#, fuzzy
-msgid "Location is too long (max 255 chars)."
-msgstr "位置过长(不能超过255个字符)。"
-
-#: actions/apigroupprofileupdate.php:326
-#, fuzzy, php-format
-msgid "Too many aliases! Maximum %d."
-msgstr "太多别名了！最多允许%d 个。"
-
-#. TRANS: Group edit form validation error.
+#. TRANS: API validation exception thrown when alias is the same as nickname.
 #. TRANS: Group create form validation error.
-#. TRANS: %s is the invalid alias.
-#: actions/apigroupprofileupdate.php:342 actions/editgroup.php:241
-#: actions/newgroup.php:188
-#, php-format
-msgid "Invalid alias: \"%s\""
-msgstr "无效的别名：“%s”。"
+msgid "Alias cannot be the same as nickname."
+msgstr "别名不能昵称相同。"
 
 #. TRANS: Client error displayed when uploading a media file has failed.
-#: actions/apimediaupload.php:101
 msgid "Upload failed."
 msgstr "上传失败"
 
 #. TRANS: Client error given from the OAuth API when the request token or verifier is invalid.
-#: actions/apioauthaccesstoken.php:102
 msgid "Invalid request token or verifier."
 msgstr "无效的请求 token 或 verifier。"
 
 #. TRANS: Client error given when no oauth_token was passed to the OAuth API.
-#: actions/apioauthauthorize.php:107
 msgid "No oauth_token parameter provided."
 msgstr "没有提供 oauth_token 参数"
 
 #. TRANS: Client error given when an invalid request token was passed to the OAuth API.
-#: actions/apioauthauthorize.php:115 actions/apioauthauthorize.php:129
 msgid "Invalid request token."
 msgstr "无效的 token。"
 
 #. TRANS: Client error given when an invalid request token was passed to the OAuth API.
-#: actions/apioauthauthorize.php:121
 msgid "Request token already authorized."
 msgstr "请求 token 已被授权了。"
 
@@ -857,31 +651,14 @@ msgstr "请求 token 已被授权了。"
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
 #. TRANS: Client error displayed when the session token is not okay.
-#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:75
-#: actions/emailsettings.php:292 actions/favor.php:75 actions/geocode.php:55
-#: actions/groupblock.php:65 actions/grouplogo.php:321
-#: actions/groupunblock.php:65 actions/imsettings.php:241
-#: actions/invite.php:60 actions/makeadmin.php:66 actions/newmessage.php:135
-#: actions/newnotice.php:105 actions/nudge.php:80
-#: actions/oauthappssettings.php:162 actions/oauthconnectionssettings.php:135
-#: actions/passwordsettings.php:137 actions/pluginenable.php:87
-#: actions/profilesettings.php:218 actions/recoverpassword.php:383
-#: actions/register.php:157 actions/remotesubscribe.php:76
-#: actions/repeat.php:82 actions/smssettings.php:249 actions/subedit.php:40
-#: actions/subscribe.php:87 actions/tagother.php:145
-#: actions/unsubscribe.php:69 actions/urlsettings.php:171
-#: actions/userauthorization.php:53 lib/designsettings.php:122
 msgid "There was a problem with your session token. Try again, please."
 msgstr "你的 session 出现了一个问题，请重试。"
 
 #. TRANS: Form validation error given when an invalid username and/or password was passed to the OAuth API.
-#: actions/apioauthauthorize.php:168
 msgid "Invalid nickname / password!"
 msgstr "用户名或密码不正确。"
 
 #. TRANS: Server error displayed when a database action fails.
-#: actions/apioauthauthorize.php:217
 msgid "Database error inserting oauth_token_association."
 msgstr "插入 oauth_token_association 时数据库出错。"
 
@@ -897,28 +674,19 @@ msgstr "插入 oauth_token_association 时数据库出错。"
 #. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
 #. TRANS: Message given submitting a form with an unknown action in SMS settings.
 #. TRANS: Unknown form validation error in design settings form.
-#: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
-#: actions/designadminpanel.php:100 actions/editapplication.php:144
-#: actions/emailsettings.php:311 actions/grouplogo.php:332
-#: actions/imsettings.php:256 actions/newapplication.php:124
-#: actions/oauthconnectionssettings.php:144 actions/recoverpassword.php:46
-#: actions/smssettings.php:270 lib/designsettings.php:133
 msgid "Unexpected form submission."
 msgstr "未预料的表单提交。"
 
 #. TRANS: Title for a page where a user can confirm/deny account access by an external application.
-#: actions/apioauthauthorize.php:387
 msgid "An application would like to connect to your account"
 msgstr "一个应用想连接到你的账号"
 
 #. TRANS: Fieldset legend.
-#: actions/apioauthauthorize.php:404
 msgid "Allow or deny access"
 msgstr "允许或阻止访问"
 
 #. TRANS: User notification of external application requesting account access.
 #. TRANS: %3$s is the access type requested (read-write or read-only), %4$s is the StatusNet sitename.
-#: actions/apioauthauthorize.php:425
 #, php-format
 msgid ""
 "An application would like the ability to <strong>%3$s</strong> your %4$s "
@@ -931,7 +699,6 @@ msgstr ""
 #. TRANS: User notification of external application requesting account access.
 #. TRANS: %1$s is the application name requesting access, %2$s is the organisation behind the application,
 #. TRANS: %3$s is the access type requested, %4$s is the StatusNet sitename.
-#: actions/apioauthauthorize.php:433
 #, php-format
 msgid ""
 "The application <strong>%1$s</strong> by <strong>%2$s</strong> would like "
@@ -942,22 +709,18 @@ msgstr ""
 "strong>你的%4$s账户数据。你应该只允许你信任信任的第三方程序访问你的%4$s账户。"
 
 #. TRANS: Fieldset legend.
-#: actions/apioauthauthorize.php:455
 msgctxt "LEGEND"
 msgid "Account"
 msgstr "帐号"
 
 #. TRANS: Field label on OAuth API authorisation form.
+#. TRANS: Field label on login page.
 #. TRANS: Field label in form for profile settings.
-#: actions/apioauthauthorize.php:459 actions/login.php:225
-#: actions/profilesettings.php:107 actions/register.php:411
-#: actions/userauthorization.php:145 lib/groupeditform.php:145
 msgid "Nickname"
 msgstr "昵称"
 
 #. TRANS: Field label on OAuth API authorisation form.
-#: actions/apioauthauthorize.php:463 actions/login.php:228
-#: actions/register.php:415 lib/settingsnav.php:87
+#. TRANS: Field label on login page.
 msgid "Password"
 msgstr "密码"
 
@@ -967,43 +730,34 @@ msgstr "密码"
 #. TRANS: Button label to cancel an IM address confirmation procedure.
 #. TRANS: Button label to cancel a SMS address confirmation procedure.
 #. TRANS: Button label in the "Edit application" form.
-#: actions/apioauthauthorize.php:478 actions/emailsettings.php:125
-#: actions/imsettings.php:136 actions/smssettings.php:132
-#: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Cancel"
 msgstr "取消"
 
 #. TRANS: Button text that when clicked will allow access to an account by an external application.
-#: actions/apioauthauthorize.php:485
 msgctxt "BUTTON"
 msgid "Allow"
 msgstr "允许"
 
 #. TRANS: Form instructions.
-#: actions/apioauthauthorize.php:502
 msgid "Authorize access to your account information."
 msgstr "授权对你账号信息的访问。"
 
 #. TRANS: Header for user notification after revoking OAuth access to an application.
-#: actions/apioauthauthorize.php:594
 msgid "Authorization canceled."
 msgstr "授权已取消。"
 
 #. TRANS: User notification after revoking OAuth access to an application.
 #. TRANS: %s is an OAuth token.
-#: actions/apioauthauthorize.php:598
 #, php-format
 msgid "The request token %s has been revoked."
 msgstr "%s的 request token 已被取消。"
 
 #. TRANS: Title of the page notifying the user that an anonymous client application was successfully authorized to access the user's account with OAuth.
-#: actions/apioauthauthorize.php:621
 msgid "You have successfully authorized the application"
 msgstr "你成功授权了这个应用"
 
 #. TRANS: Message notifying the user that an anonymous client application was successfully authorized to access the user's account with OAuth.
-#: actions/apioauthauthorize.php:625
 msgid ""
 "Please return to the application and enter the following security code to "
 "complete the process."
@@ -1011,14 +765,12 @@ msgstr "请返回应用并输入下面的安全码完成此过程。"
 
 #. TRANS: Title of the page notifying the user that the client application was successfully authorized to access the user's account with OAuth.
 #. TRANS: %s is the authorised application name.
-#: actions/apioauthauthorize.php:632
 #, php-format
 msgid "You have successfully authorized %s"
 msgstr "你成功授权了%s。"
 
 #. TRANS: Message notifying the user that the client application was successfully authorized to access the user's account with OAuth.
 #. TRANS: %s is the authorised application name.
-#: actions/apioauthauthorize.php:639
 #, php-format
 msgid ""
 "Please return to %s and enter the following security code to complete the "
@@ -1027,12 +779,10 @@ msgstr "请返回 %s 并输入下面的安全码完成此过程。"
 
 #. TRANS: Client error displayed trying to delete a status not using POST or DELETE.
 #. TRANS: POST and DELETE should not be translated.
-#: actions/apistatusesdestroy.php:111
 msgid "This method requires a POST or DELETE."
 msgstr "此方法接受POST或DELETE请求。"
 
 #. TRANS: Client error displayed trying to delete a status of another user.
-#: actions/apistatusesdestroy.php:136
 msgid "You may not delete another user's status."
 msgstr "你不能删除其他用户的消息。"
 
@@ -1040,21 +790,16 @@ msgstr "你不能删除其他用户的消息。"
 #. TRANS: Client error displayed trying to display redents of a non-exiting notice.
 #. TRANS: Client exception thrown when referencing a non-existing notice.
 #. TRANS: Error message displayed trying to delete a non-existing notice.
-#: actions/apistatusesretweet.php:74 actions/apistatusesretweets.php:70
-#: actions/atompubshowfavorite.php:82 actions/deletenotice.php:61
-#: actions/shownotice.php:92
 msgid "No such notice."
 msgstr "没有这条消息。"
 
 #. TRANS: Client error displayed trying to repeat an own notice through the API.
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:549
 msgid "Cannot repeat your own notice."
 msgstr "不能转发你自己的消息。"
 
 #. TRANS: Client error displayed trying to re-repeat a notice through the API.
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:92 lib/command.php:555
 msgid "Already repeated that notice."
 msgstr "已转发了该消息。"
 
@@ -1064,70 +809,54 @@ msgstr "已转发了该消息。"
 #. TRANS: Client exception thrown when using an unsupported HTTP method.
 #. TRANS: Client error shown when using a non-supported HTTP method.
 #. TRANS: Client exception thrown when using an unsupported HTTP method.
-#: actions/apistatusesshow.php:118 actions/atompubfavoritefeed.php:103
-#: actions/atompubmembershipfeed.php:105 actions/atompubshowfavorite.php:117
-#: actions/atompubshowmembership.php:116
-#: actions/atompubshowsubscription.php:122
-#: actions/atompubsubscriptionfeed.php:109
 msgid "HTTP method not supported."
 msgstr "HTTP 方法不支持。"
 
 #. TRANS: Exception thrown requesting an unsupported notice output format.
 #. TRANS: %s is the requested output format.
-#: actions/apistatusesshow.php:144
 #, php-format
 msgid "Unsupported format: %s."
 msgstr "不支持的格式： %s。"
 
 #. TRANS: Client error displayed requesting a deleted status.
-#: actions/apistatusesshow.php:155
 msgid "Status deleted."
 msgstr "消息已删除。"
 
 #. TRANS: Client error displayed requesting a status with an invalid ID.
-#: actions/apistatusesshow.php:162
 msgid "No status with that ID found."
 msgstr "没有找到此 ID 的消息。"
 
 #. TRANS: Client error displayed when trying to delete a notice not using the Atom format.
-#: actions/apistatusesshow.php:227
 msgid "Can only delete using the Atom format."
 msgstr "只能使用 Atom 格式删除。"
 
 #. TRANS: Client error displayed when a user has no rights to delete notices of other users.
 #. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
-#: actions/apistatusesshow.php:235 actions/deletenotice.php:78
 msgid "Cannot delete this notice."
 msgstr "不能删除此通知。"
 
 #. TRANS: Confirmation of notice deletion in API. %d is the ID (number) of the deleted notice.
-#: actions/apistatusesshow.php:249
 #, php-format
 msgid "Deleted notice %d"
 msgstr "删除消息 %d"
 
 #. TRANS: Client error displayed when the parameter "status" is missing.
-#: actions/apistatusesupdate.php:221
 msgid "Client must provide a 'status' parameter with a value."
 msgstr "客户端必须提供一个包含内容的“状态”参数。"
 
 #. TRANS: Client error displayed when the parameter "status" is missing.
 #. TRANS: %d is the maximum number of character for a notice.
-#: actions/apistatusesupdate.php:244 actions/newnotice.php:161
-#: lib/mailhandler.php:60
 #, php-format
 msgid "That's too long. Maximum notice size is %d character."
 msgid_plural "That's too long. Maximum notice size is %d characters."
 msgstr[0] "太长了。最长的消息长度是%d个字符。"
 
 #. TRANS: Client error displayed when replying to a non-existing notice.
-#: actions/apistatusesupdate.php:284
 msgid "Parent notice not found."
 msgstr "没有找到父级的消息。"
 
 #. TRANS: Client error displayed exceeding the maximum notice length.
 #. TRANS: %d is the maximum lenth for a notice.
-#: actions/apistatusesupdate.php:308 actions/newnotice.php:184
 #, php-format
 msgid "Maximum notice size is %d character, including attachment URL."
 msgid_plural "Maximum notice size is %d characters, including attachment URL."
@@ -1135,13 +864,11 @@ msgstr[0] "每条消息最长%d字符，包括附件的链接 URL。"
 
 #. TRANS: Client error displayed when requesting profiles of followers in an unsupported format.
 #. TRANS: Client error displayed when requesting IDs of followers in an unsupported format.
-#: actions/apisubscriptions.php:228 actions/apisubscriptions.php:258
 msgid "Unsupported format."
 msgstr "不支持的格式。"
 
 #. TRANS: Title for timeline of most recent favourite notices by a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname.
-#: actions/apitimelinefavorites.php:108
 #, php-format
 msgid "%1$s / Favorites from %2$s"
 msgstr "%1$s / 来自 %2$s 的收藏"
@@ -1149,14 +876,12 @@ msgstr "%1$s / 来自 %2$s 的收藏"
 #. TRANS: Subtitle for timeline of most recent favourite notices by a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user's full name,
 #. TRANS: %3$s is a user nickname.
-#: actions/apitimelinefavorites.php:120
 #, php-format
 msgid "%1$s updates favorited by %2$s / %3$s."
 msgstr "%1$s上被%2$s（%3$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.
-#: actions/apitimelinementions.php:115
 #, php-format
 msgid "%1$s / Updates mentioning %2$s"
 msgstr "%1$s / 条消息提到了 %2$s"
@@ -1164,48 +889,40 @@ msgstr "%1$s / 条消息提到了 %2$s"
 #. TRANS: Subtitle for timeline of most recent mentions of a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname,
 #. TRANS: %3$s is a user's full name.
-#: actions/apitimelinementions.php:131
 #, php-format
 msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr " %1$s 条消息回复给来自 %2$s 的消息 / %3$s。"
 
 #. TRANS: Title for site timeline. %s is the StatusNet sitename.
 #. TRANS: Public RSS feed title. %s is the StatusNet site name.
-#: actions/apitimelinepublic.php:193 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "%s 公共时间线"
 
 #. TRANS: Subtitle for site timeline. %s is the StatusNet sitename.
-#: actions/apitimelinepublic.php:199
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "%s条来自所有人的消息！"
 
 #. TRANS: Server error displayed calling unimplemented API method for 'retweeted by me'.
-#: actions/apitimelineretweetedbyme.php:71
 msgid "Unimplemented."
 msgstr "未生效。"
 
 #. TRANS: Title for Atom feed "repeated to me". %s is the user nickname.
-#: actions/apitimelineretweetedtome.php:96
 #, php-format
 msgid "Repeated to %s"
 msgstr "转发给%s"
 
-#: actions/apitimelineretweetedtome.php:98
 #, fuzzy, php-format
 msgid "%1$s notices that were to repeated to %2$s / %3$s."
 msgstr " %1$s 条消息回复给来自 %2$s 的消息 / %3$s。"
 
 #. TRANS: Title of list of repeated notices of the logged in user.
 #. TRANS: %s is the nickname of the logged in user.
-#: actions/apitimelineretweetsofme.php:98
 #, php-format
 msgid "Repeats of %s"
 msgstr "%s 的转发"
 
-#: actions/apitimelineretweetsofme.php:104
 #, fuzzy, php-format
 msgid "%1$s notices that %2$s / %3$s has repeated."
 msgstr "%1$s 收藏了消息 %2$s 。"
@@ -1214,170 +931,137 @@ msgstr "%1$s 收藏了消息 %2$s 。"
 #. TRANS: %s is the tag.
 #. TRANS: Title for first page of notices with tags.
 #. TRANS: %s is the tag.
-#: actions/apitimelinetag.php:101 actions/tag.php:69
 #, php-format
 msgid "Notices tagged with %s"
 msgstr "带 %s 标签的消息"
 
 #. TRANS: Subtitle for timeline with lastest notices with a given tag.
 #. TRANS: %1$s is the tag, $2$s is the StatusNet sitename.
-#: actions/apitimelinetag.php:105 actions/tagrss.php:65
 #, php-format
 msgid "Updates tagged with %1$s on %2$s!"
 msgstr "%2$s 上有 %1$s 标签的消息！"
 
 #. TRANS: Client error displayed trying to add a notice to another user's timeline.
-#: actions/apitimelineuser.php:308
 msgid "Only the user can add to their own timeline."
 msgstr "只有该用户才能添加到他们的时间线。"
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:315
 msgid "Only accept AtomPub for Atom feeds."
 msgstr "只接受 AtomPub 原子饲料。"
 
 #. TRANS: Client error displayed attempting to post an empty API notice.
-#: actions/apitimelineuser.php:322
 msgid "Atom post must not be empty."
 msgstr "原子开机自检不能为空。"
 
 #. TRANS: Client error displayed attempting to post an API that is not well-formed XML.
-#: actions/apitimelineuser.php:328
 msgid "Atom post must be well-formed XML."
 msgstr "原子后必须是格式良好 XML。"
 
 #. TRANS: Client error displayed when not using an Atom entry.
-#: actions/apitimelineuser.php:334 actions/atompubfavoritefeed.php:228
-#: actions/atompubmembershipfeed.php:230
-#: actions/atompubsubscriptionfeed.php:236
 msgid "Atom post must be an Atom entry."
 msgstr "原子后必须是一个原子的条目。"
 
 #. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
-#: actions/apitimelineuser.php:345
 msgid "Can only handle POST activities."
 msgstr "只能处理开机自检活动。"
 
 #. TRANS: Client error displayed when using an unsupported activity object type.
 #. TRANS: %s is the unsupported activity object type.
-#: actions/apitimelineuser.php:356
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr "无法处理活动对象类型 %s。"
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
 #. TRANS: %d is the notice ID (number).
-#: actions/apitimelineuser.php:390
 #, php-format
 msgid "No content for notice %d."
 msgstr "没有通知 %d 的内容。"
 
 #. TRANS: Client error displayed when using another format than AtomPub.
 #. TRANS: %s is the notice URI.
-#: actions/apitimelineuser.php:419
 #, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "已存在使用 URI \"%s\" 的消息了。"
 
 #. TRANS: Server error for unfinished API method showTrends.
-#: actions/apitrends.php:85
 msgid "API method under construction."
 msgstr "API 方法尚未实现。"
 
 #. TRANS: Client error displayed when requesting user information for a non-existing user.
-#: actions/apiuserprofileimage.php:80 actions/apiusershow.php:94
 msgid "User not found."
 msgstr "API方法没有找到。"
 
 #. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
 #. TRANS: Client exception.
 #. TRANS: Client error displayed trying to subscribe to a non-existing profile.
-#: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
-#: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
-#: actions/subscribe.php:110
 msgid "No such profile."
 msgstr "没有这个文件。"
 
 #. TRANS: Subtitle for Atom favorites feed.
 #. TRANS: %1$s is a user nickname, %2$s is the StatusNet sitename.
-#: actions/atompubfavoritefeed.php:147
 #, php-format
 msgid "Notices %1$s has favorited on %2$s"
 msgstr "%1$s在%2$s上收藏的消息"
 
 #. TRANS: Client exception thrown when trying to set a favorite for another user.
 #. TRANS: Client exception thrown when trying to subscribe another user.
-#: actions/atompubfavoritefeed.php:217 actions/atompubsubscriptionfeed.php:225
 msgid "Cannot add someone else's subscription."
 msgstr "无法添加其他人的订阅。"
 
 #. TRANS: Client exception thrown when trying use an incorrect activity verb for the Atom pub method.
-#: actions/atompubfavoritefeed.php:240
 msgid "Can only handle favorite activities."
 msgstr "只能处理最喜欢的活动。"
 
 #. TRANS: Client exception thrown when trying favorite an object that is not a notice.
-#: actions/atompubfavoritefeed.php:250 actions/atompubmembershipfeed.php:250
 msgid "Can only fave notices."
 msgstr "可以只为心目中的绝对通知书。"
 
 #. TRANS: Client exception thrown when trying favorite a notice without content.
-#: actions/atompubfavoritefeed.php:259
 msgid "Unknown note."
 msgstr "未知的注意。"
 
 #. TRANS: Client exception thrown when trying favorite an already favorited notice.
-#: actions/atompubfavoritefeed.php:267
 msgid "Already a favorite."
 msgstr "已经是一种收藏。"
 
 #. TRANS: Title for group membership feed.
 #. TRANS: %s is a username.
-#: actions/atompubmembershipfeed.php:144
 #, php-format
 msgid "%s group memberships"
 msgstr "%s 组成员身份"
 
 #. TRANS: Subtitle for group membership feed.
 #. TRANS: %1$s is a username, %2$s is the StatusNet sitename.
-#: actions/atompubmembershipfeed.php:149
 #, php-format
 msgid "Groups %1$s is a member of on %2$s"
 msgstr "组 %1$s 是在 %2$s 上的成员"
 
 #. TRANS: Client exception thrown when trying subscribe someone else to a group.
-#: actions/atompubmembershipfeed.php:219
 msgid "Cannot add someone else's membership."
 msgstr "无法添加其他人的成员资格。"
 
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#: actions/atompubmembershipfeed.php:242
 msgid "Can only handle join activities."
 msgstr "只能处理加入活动。"
 
 #. TRANS: Client exception thrown when trying to subscribe to a non-existing group.
-#: actions/atompubmembershipfeed.php:259
 msgid "Unknown group."
 msgstr "未知的组。"
 
 #. TRANS: Client exception thrown when trying to subscribe to an already subscribed group.
-#: actions/atompubmembershipfeed.php:267
 msgid "Already a member."
 msgstr "已经是会员。"
 
 #. TRANS: Client exception thrown when trying to subscribe to group while blocked from that group.
-#: actions/atompubmembershipfeed.php:275
 msgid "Blocked by admin."
 msgstr "阻止的管理员。"
 
 #. TRANS: Client exception thrown when referencing a non-existing favorite.
-#: actions/atompubshowfavorite.php:90
 msgid "No such favorite."
 msgstr "没有这种喜欢。"
 
 #. TRANS: Client exception thrown when trying to remove a favorite notice of another user.
-#: actions/atompubshowfavorite.php:151
 msgid "Cannot delete someone else's favorite."
 msgstr "不能删除其他人的最爱。"
 
@@ -1403,90 +1087,65 @@ msgstr "不能删除其他人的最爱。"
 #. TRANS: Client error displayed when trying to join a non-existing group.
 #. TRANS: Client error displayed when trying to leave a non-local group.
 #. TRANS: Client error displayed when trying to leave a non-existing group.
+#. TRANS: Client error displayed when providing an invalid group ID on the Make Admin page.
 #. 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.
 #. TRANS: Command exception text shown when a group is requested that does not exist.
 #. TRANS: Error text shown when trying to leave a group that does not exist.
-#: actions/atompubshowmembership.php:81 actions/blockedfromgroup.php:81
-#: actions/blockedfromgroup.php:89 actions/deletegroup.php:87
-#: actions/deletegroup.php:100 actions/editgroup.php:102
-#: actions/foafgroup.php:46 actions/foafgroup.php:65 actions/foafgroup.php:73
-#: actions/groupblock.php:89 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:101 actions/grouplogo.php:103
-#: actions/groupmembers.php:84 actions/groupmembers.php:92
-#: actions/grouprss.php:97 actions/grouprss.php:105
-#: actions/groupunblock.php:89 actions/joingroup.php:82
-#: actions/joingroup.php:95 actions/leavegroup.php:82
-#: actions/leavegroup.php:95 actions/makeadmin.php:86
-#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:392
 msgid "No such group."
 msgstr "没有这个组。"
 
 #. TRANS: Client exception thrown when trying to show membership of a non-subscribed group
-#: actions/atompubshowmembership.php:91
 msgid "Not a member."
 msgstr "不是会员。"
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
-#: actions/atompubshowmembership.php:150
 msgid "Cannot delete someone else's membership."
 msgstr "不能删除其他人的成员资格。"
 
 #. TRANS: Client exception thrown when trying to display a subscription for a non-existing profile ID.
 #. TRANS: %d is the non-existing profile ID number.
-#: actions/atompubshowsubscription.php:72
-#: actions/atompubshowsubscription.php:83
-#: actions/atompubsubscriptionfeed.php:74
 #, php-format
 msgid "No such profile id: %d."
 msgstr "没有这种配置文件 id： %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.
-#: actions/atompubshowsubscription.php:94
 #, php-format
 msgid "Profile %1$d not subscribed to profile %2$d."
 msgstr "配置文件 %1$d 不订阅配置文件 %2$d。"
 
 #. TRANS: Client exception thrown when trying to delete a subscription of another user.
-#: actions/atompubshowsubscription.php:157
 msgid "Cannot delete someone else's subscription."
 msgstr "不能删除别人的订阅。"
 
 #. TRANS: Subtitle for Atom subscription feed.
 #. TRANS: %1$s is a user nickname, %s$s is the StatusNet sitename.
-#: actions/atompubsubscriptionfeed.php:153
 #, php-format
 msgid "People %1$s has subscribed to on %2$s"
 msgstr "人 %1$s 已经订阅的 %2$s"
 
 #. TRANS: Client error displayed when not using the follow verb.
-#: actions/atompubsubscriptionfeed.php:248
 msgid "Can only handle Follow activities."
 msgstr "只能处理后续活动。"
 
 #. TRANS: Client exception thrown when subscribing to an object that is not a person.
-#: actions/atompubsubscriptionfeed.php:256
 msgid "Can only follow people."
 msgstr "只能跟人。"
 
 #. TRANS: Client exception thrown when subscribing to a non-existing profile.
 #. TRANS: %s is the unknown profile ID.
-#: actions/atompubsubscriptionfeed.php:267
 #, php-format
 msgid "Unknown profile %s."
 msgstr "未知的配置文件 %s。"
 
 #. TRANS: Client error displayed trying to subscribe to an already subscribed profile.
 #. TRANS: %s is the profile the user already has a subscription on.
-#: actions/atompubsubscriptionfeed.php:275
 #, php-format
 msgid "Already subscribed to %s."
 msgstr "已经订阅了%s。"
 
 #. TRANS: Client error displayed trying to get a non-existing attachment.
-#: actions/attachment.php:73
 msgid "No such attachment."
 msgstr "没有这个附件。"
 
@@ -1498,31 +1157,23 @@ msgstr "没有这个附件。"
 #. TRANS: Client error displayed when trying to view group members without providing a group nickname.
 #. TRANS: Client error displayed when requesting a group RSS feed without providing a group nickname.
 #. TRANS: Client error displayed if no nickname argument was given requesting a group page.
-#: actions/avatarbynickname.php:60 actions/blockedfromgroup.php:73
-#: actions/editgroup.php:85 actions/groupdesignsettings.php:84
-#: actions/grouplogo.php:86 actions/groupmembers.php:76
-#: actions/grouprss.php:89 actions/showgroup.php:116
 msgid "No nickname."
 msgstr "没有昵称。"
 
 #. TRANS: Client error displayed trying to get an avatar without providing an avatar size.
-#: actions/avatarbynickname.php:66
 msgid "No size."
 msgstr "没有大小。"
 
 #. TRANS: Client error displayed trying to get an avatar providing an invalid avatar size.
-#: actions/avatarbynickname.php:72
 msgid "Invalid size."
 msgstr "大小不正确。"
 
 #. TRANS: Title for avatar upload page.
-#: actions/avatarsettings.php:66 lib/settingsnav.php:82
 msgid "Avatar"
 msgstr "头像"
 
 #. TRANS: Instruction for avatar upload page.
 #. TRANS: %s is the maximum file size, for example "500b", "10kB" or "2MB".
-#: actions/avatarsettings.php:78
 #, php-format
 msgid "You can upload your personal avatar. The maximum file size is %s."
 msgstr "你可以上传你的个人头像。文件大小限制在%s以下。"
@@ -1531,17 +1182,12 @@ msgstr "你可以上传你的个人头像。文件大小限制在%s以下。"
 #. TRANS: Server error displayed coming across a request from a user without a profile.
 #. TRANS: Server error displayed when trying to authorise a remote subscription request
 #. TRANS: while the user has no profile.
-#: actions/avatarsettings.php:108 actions/avatarsettings.php:192
-#: actions/grouplogo.php:184 actions/remotesubscribe.php:190
-#: actions/userauthorization.php:75 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr "用户没有相应个人信息。"
 
 #. TRANS: Avatar upload page form legend.
 #. TRANS: Avatar upload page crop form legend.
 #. TRANS: Legend for group logo settings fieldset.
-#: actions/avatarsettings.php:122 actions/avatarsettings.php:205
-#: actions/grouplogo.php:261
 msgid "Avatar settings"
 msgstr "头像设置"
 
@@ -1549,8 +1195,6 @@ msgstr "头像设置"
 #. TRANS: Header on avatar upload crop form for thumbnail of originally uploaded avatar (h2).
 #. TRANS: Uploaded original file in group logo form.
 #. TRANS: Header for originally uploaded file before a crop on the group logo page.
-#: actions/avatarsettings.php:131 actions/avatarsettings.php:214
-#: actions/grouplogo.php:207 actions/grouplogo.php:270
 msgid "Original"
 msgstr "原始"
 
@@ -1558,80 +1202,65 @@ msgstr "原始"
 #. TRANS: Header on avatar upload crop form for thumbnail of to be used rendition of uploaded avatar (h2).
 #. TRANS: Header for preview of to be displayed group logo.
 #. TRANS: Header for the cropped group logo on the group logo page.
-#: actions/avatarsettings.php:147 actions/avatarsettings.php:227
-#: actions/grouplogo.php:219 actions/grouplogo.php:283
 msgid "Preview"
 msgstr "预览"
 
 #. TRANS: Button on avatar upload page to delete current avatar.
 #. TRANS: Button text for user account deletion.
-#: actions/avatarsettings.php:155 actions/deleteaccount.php:319
 msgctxt "BUTTON"
 msgid "Delete"
 msgstr "删除"
 
 #. TRANS: Button on avatar upload page to upload an avatar.
 #. TRANS: Submit button to confirm upload of a user backup file for account restore.
-#: actions/avatarsettings.php:173 actions/restoreaccount.php:369
 msgctxt "BUTTON"
 msgid "Upload"
 msgstr "上传"
 
 #. TRANS: Button on avatar upload crop form to confirm a selected crop as avatar.
-#: actions/avatarsettings.php:243
 msgctxt "BUTTON"
 msgid "Crop"
 msgstr "剪裁"
 
 #. TRANS: Validation error on avatar upload form when no file was uploaded.
-#: actions/avatarsettings.php:318
 msgid "No file uploaded."
 msgstr "没有文件被上传。"
 
 #. TRANS: Avatar upload form instruction after uploading a file.
-#: actions/avatarsettings.php:345
 msgid "Pick a square area of the image to be your avatar."
 msgstr "选择一个方形的区域的图像为您的虚拟形象。"
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
 #. TRANS: Server error displayed trying to crop an uploaded group logo that is no longer present.
-#: actions/avatarsettings.php:360 actions/grouplogo.php:391
 msgid "Lost our file data."
 msgstr "文件数据丢失"
 
 #. TRANS: Success message for having updated a user avatar.
-#: actions/avatarsettings.php:384
 msgid "Avatar updated."
 msgstr "头像已更新。"
 
 #. TRANS: Error displayed on the avatar upload page if the avatar could not be updated for an unknown reason.
-#: actions/avatarsettings.php:388
 msgid "Failed updating avatar."
 msgstr "更新头像失败。"
 
 #. TRANS: Success message for deleting a user avatar.
-#: actions/avatarsettings.php:412
 msgid "Avatar deleted."
 msgstr "头像已删除。"
 
 #. TRANS: Title for backup account page.
 #. TRANS: Option in profile settings to create a backup of the account of the currently logged in user.
-#: actions/backupaccount.php:61 actions/profilesettings.php:468
 msgid "Backup account"
 msgstr "备份的帐户"
 
 #. TRANS: Client exception thrown when trying to backup an account while not logged in.
-#: actions/backupaccount.php:79
 msgid "Only logged-in users can backup their account."
 msgstr "只有已登录的用户可以备份他们的帐户。"
 
 #. TRANS: Client exception thrown when trying to backup an account without having backup rights.
-#: actions/backupaccount.php:84
 msgid "You may not backup your account."
 msgstr "您可能不会备份您的帐户。"
 
 #. TRANS: Information displayed on the backup account page.
-#: actions/backupaccount.php:227
 msgid ""
 "You can backup your account data in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format. This is an experimental feature and provides "
@@ -1644,30 +1273,25 @@ msgstr ""
 "不备份。此外上，传的文件和直接的消息不备份。"
 
 #. TRANS: Submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:250
 msgctxt "BUTTON"
 msgid "Backup"
 msgstr "备份"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
-#: actions/backupaccount.php:254
 msgid "Backup your account."
 msgstr "备份您的帐户。"
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
-#: actions/block.php:68
 msgid "You already blocked that user."
 msgstr "你已经屏蔽该用户。"
 
 #. TRANS: Title for block user page.
 #. TRANS: Legend for block user form.
 #. TRANS: Fieldset legend for block user from group form.
-#: actions/block.php:106 actions/block.php:136 actions/groupblock.php:165
 msgid "Block user"
 msgstr "屏蔽用户。"
 
 #. TRANS: Explanation of consequences when blocking a user on the block user page.
-#: actions/block.php:139
 msgid ""
 "Are you sure you want to block this user? Afterwards, they will be "
 "unsubscribed from you, unable to subscribe to you in the future, and you "
@@ -1682,15 +1306,11 @@ msgstr ""
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:154 actions/deleteapplication.php:157
-#: actions/deletegroup.php:220 actions/deletenotice.php:155
-#: actions/deleteuser.php:154 actions/groupblock.php:187
 msgctxt "BUTTON"
 msgid "No"
 msgstr "否"
 
 #. TRANS: Submit button title for 'No' when blocking a user.
-#: actions/block.php:158
 msgid "Do not block this user."
 msgstr "不要屏蔽这个用户"
 
@@ -1700,174 +1320,138 @@ msgstr "不要屏蔽这个用户"
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:161 actions/deleteapplication.php:164
-#: actions/deletegroup.php:227 actions/deletenotice.php:162
-#: actions/deleteuser.php:161 actions/groupblock.php:194
 msgctxt "BUTTON"
 msgid "Yes"
 msgstr "是"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:165
 msgid "Block this user."
 msgstr "屏蔽这个用户"
 
 #. TRANS: Server error displayed when blocking a user fails.
-#: actions/block.php:189
 msgid "Failed to save block information."
 msgstr "保存屏蔽信息失败。"
 
 #. TRANS: Title for first page with list of users blocked from a group.
 #. TRANS: %s is a group nickname.
-#: actions/blockedfromgroup.php:101
 #, php-format
 msgid "%s blocked profiles"
 msgstr "%s屏蔽的用户"
 
 #. TRANS: Title for any but the first page with list of users blocked from a group.
 #. TRANS: %1$s is a group nickname, %2$d is a page number.
-#: actions/blockedfromgroup.php:106
 #, php-format
 msgid "%1$s blocked profiles, page %2$d"
 msgstr "%1$s屏蔽的用户，第%2$d页"
 
 #. TRANS: Instructions for list of users blocked from a group.
-#: actions/blockedfromgroup.php:122
 msgid "A list of the users blocked from joining this group."
 msgstr "被屏蔽加入此小组的用户列表。"
 
 #. TRANS: Form legend for unblocking a user from a group.
-#: actions/blockedfromgroup.php:291
 msgid "Unblock user from group"
 msgstr "取消小组对用户的屏蔽。"
 
 #. TRANS: Button text for unblocking a user from a group.
-#: actions/blockedfromgroup.php:323
 msgctxt "BUTTON"
 msgid "Unblock"
 msgstr "取消屏蔽"
 
 #. TRANS: Tooltip for button for unblocking a user from a group.
 #. TRANS: Description of the form to unblock a user.
-#: actions/blockedfromgroup.php:327 lib/unblockform.php:78
 msgid "Unblock this user"
 msgstr "取消屏蔽这个用户。"
 
 #. TRANS: Title for mini-posting window loaded from bookmarklet.
 #. TRANS: %s is the StatusNet site name.
-#: actions/bookmarklet.php:51
 #, php-format
 msgid "Post to %s"
 msgstr "发布到 %s"
 
 #. TRANS: Client error displayed when not providing a confirmation code in the contact address confirmation action.
-#: actions/confirmaddress.php:74
 msgid "No confirmation code."
 msgstr "没有确认码"
 
 #. TRANS: Client error displayed when providing a non-existing confirmation code in the contact address confirmation action.
-#: actions/confirmaddress.php:80
 msgid "Confirmation code not found."
 msgstr "未找到确认码。"
 
 #. TRANS: Client error displayed when not providing a confirmation code for another user in the contact address confirmation action.
-#: actions/confirmaddress.php:86
 msgid "That confirmation code is not for you!"
 msgstr "此确认码不是你的！"
 
 #. TRANS: Server error for an unknown address type, which can be 'email', 'sms', or the name of an IM network (such as 'xmpp' or 'aim')
-#: actions/confirmaddress.php:94
-#, fuzzy, php-format
+#, php-format
 msgid "Unrecognized address type %s"
 msgstr "不可识别的地址类型%s。"
 
 #. TRANS: Client error for an already confirmed email/jabber/sms address.
-#: actions/confirmaddress.php:103 actions/confirmaddress.php:136
 msgid "That address has already been confirmed."
 msgstr "此地址已被确认过了。"
 
-#: actions/confirmaddress.php:121 actions/imsettings.php:444
-#: actions/userdesignsettings.php:306
-#, fuzzy
 msgid "Couldn't update user."
 msgstr "无法更新用户。"
 
-#: actions/confirmaddress.php:144
 #, fuzzy
 msgid "Couldn't update user im preferences."
 msgstr "无法更新用户记录。"
 
-#: actions/confirmaddress.php:156
 #, fuzzy
 msgid "Couldn't insert user im preferences."
 msgstr "无法添加新的关注。"
 
 #. TRANS: Server error displayed when an address confirmation code deletion from the
 #. TRANS: database fails in the contact address confirmation action.
-#: actions/confirmaddress.php:169
 msgid "Could not delete address confirmation."
 msgstr "无法删除地址确认码。"
 
 #. TRANS: Title for the contact address confirmation action.
-#: actions/confirmaddress.php:185
 msgid "Confirm address"
 msgstr "确认地址"
 
 #. TRANS: Success message for the contact address confirmation action.
 #. TRANS: %s can be 'email', 'jabber', or 'sms'.
-#: actions/confirmaddress.php:200
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "你账户的地址 \"%s\" 已被确认。"
 
 #. TRANS: Title for page with a conversion (multiple notices in context).
-#: actions/conversation.php:96
 msgid "Conversation"
 msgstr "对话"
 
 #. TRANS: Header on conversation page. Hidden by default (h2).
 #. TRANS: Label for user statistics.
-#: actions/conversation.php:149 lib/noticelist.php:87
-#: lib/profileaction.php:246 lib/searchgroupnav.php:82
-#: lib/threadednoticelist.php:66
 msgid "Notices"
 msgstr "消息"
 
 #. TRANS: Client exception displayed trying to delete a user account while not logged in.
-#: actions/deleteaccount.php:71
 msgid "Only logged-in users can delete their account."
 msgstr "只有已登录的用户可以删除他们的帐户。"
 
 #. TRANS: Client exception displayed trying to delete a user account without have the rights to do that.
-#: actions/deleteaccount.php:77
 msgid "You cannot delete your account."
 msgstr "您不能删除您的帐户。"
 
 #. TRANS: Confirmation text for user deletion. The user has to type this exactly the same, including punctuation.
-#: actions/deleteaccount.php:160 actions/deleteaccount.php:297
 msgid "I am sure."
 msgstr "我敢肯定。"
 
 #. TRANS: Notification for user about the text that must be input to be able to delete a user account.
 #. TRANS: %s is the text that needs to be input.
-#: actions/deleteaccount.php:164
 #, php-format
 msgid "You must write \"%s\" exactly in the box."
 msgstr "你必须在框中输入“%s”。"
 
 #. TRANS: Confirmation that a user account has been deleted.
-#: actions/deleteaccount.php:206
 msgid "Account deleted."
 msgstr "删除的帐户。"
 
 #. TRANS: Page title for page on which a user account can be deleted.
 #. TRANS: Option in profile settings to delete the account of the currently logged in user.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:476
 msgid "Delete account"
 msgstr "删除帐户"
 
 #. TRANS: Form text for user deletion form.
-#: actions/deleteaccount.php:279
 msgid ""
 "This will <strong>permanently delete</strong> your account data from this "
 "server."
@@ -1875,7 +1459,6 @@ msgstr "这将 <strong>永久删除</strong> 您的帐户数据从该服务器
 
 #. TRANS: Additional form text for user deletion form shown if a user has account backup rights.
 #. TRANS: %s is a URL to the backup page.
-#: actions/deleteaccount.php:285
 #, php-format
 msgid ""
 "You are strongly advised to <a href=\"%s\">back up your data</a> before "
@@ -1884,55 +1467,42 @@ msgstr "强烈建议您在删除前 <a href=\"%s\">备份您的数据</a>。"
 
 #. TRANS: Field label for delete account confirmation entry.
 #. TRANS: Field label for password reset form where the password has to be typed again.
-#: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:262 actions/register.php:419
 msgid "Confirm"
 msgstr "密码确认"
 
 #. TRANS: Input title for the delete account field.
 #. TRANS: %s is the text that needs to be input.
-#: actions/deleteaccount.php:304
 #, php-format
 msgid "Enter \"%s\" to confirm that you want to delete your account."
 msgstr "输入\"%s\"，以确认您要删除您的帐户。"
 
 #. TRANS: Button title for user account deletion.
-#: actions/deleteaccount.php:323
 msgid "Permanently delete your account"
 msgstr "永久删除您的帐户"
 
 #. TRANS: Client error displayed trying to delete an application while not logged in.
-#: actions/deleteapplication.php:62
 msgid "You must be logged in to delete an application."
 msgstr "你必须登录后才能删除应用。"
 
 #. TRANS: Client error displayed trying to delete an application that does not exist.
-#: actions/deleteapplication.php:71
 msgid "Application not found."
 msgstr "未找到应用。"
 
 #. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
-#: actions/deleteapplication.php:79 actions/editapplication.php:78
-#: actions/showapplication.php:90
 msgid "You are not the owner of this application."
 msgstr "你不是该应用的拥有者。"
 
 #. TRANS: Client error text when there is a problem with the session token.
-#: actions/deleteapplication.php:102 actions/editapplication.php:131
-#: actions/newapplication.php:112 actions/showapplication.php:113
-#: lib/action.php:1391
 msgid "There was a problem with your session token."
 msgstr "你的 session token 出现了问题。"
 
 #. TRANS: Title for delete application page.
 #. TRANS: Fieldset legend on delete application page.
-#: actions/deleteapplication.php:124 actions/deleteapplication.php:149
 msgid "Delete application"
 msgstr "删除应用"
 
 #. TRANS: Confirmation text on delete application page.
-#: actions/deleteapplication.php:152
 msgid ""
 "Are you sure you want to delete this application? This will clear all data "
 "about the application from the database, including all existing user "
@@ -1942,55 +1512,45 @@ msgstr ""
 "用户关联。"
 
 #. TRANS: Submit button title for 'No' when deleting an application.
-#: actions/deleteapplication.php:161
 msgid "Do not delete this application."
 msgstr "不要删除此应用程序。"
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
-#: actions/deleteapplication.php:167
 msgid "Delete this application."
 msgstr "删除此应用程序。"
 
 #. TRANS: Client error when trying to delete group while not logged in.
-#: actions/deletegroup.php:64
 msgid "You must be logged in to delete a group."
 msgstr "你必须登录才能删除小组。"
 
 #. TRANS: Client error when trying to delete a group without providing a nickname or ID for the group.
 #. TRANS: Client error displayed when trying to join a group without providing a group name or group ID.
 #. TRANS: Client error displayed when trying to leave a group without providing a group name or group ID.
-#: actions/deletegroup.php:94 actions/joingroup.php:89
-#: actions/leavegroup.php:89
 msgid "No nickname or ID."
 msgstr "没有昵称或 ID。"
 
 #. TRANS: Client error when trying to delete a group without having the rights to delete it.
-#: actions/deletegroup.php:107
 msgid "You are not allowed to delete this group."
 msgstr "你不能删除这个小组。"
 
 #. TRANS: Server error displayed if a group could not be deleted.
 #. TRANS: %s is the name of the group that could not be deleted.
-#: actions/deletegroup.php:150
 #, php-format
 msgid "Could not delete group %s."
 msgstr "无法删除%s小组。"
 
 #. TRANS: Message given after deleting a group.
 #. TRANS: %s is the deleted group's name.
-#: actions/deletegroup.php:159
 #, php-format
 msgid "Deleted group %s"
 msgstr "删除了%s小组"
 
 #. TRANS: Title of delete group page.
 #. TRANS: Form legend for deleting a group.
-#: actions/deletegroup.php:176 actions/deletegroup.php:202
 msgid "Delete group"
 msgstr "删除小组"
 
 #. TRANS: Warning in form for deleleting a group.
-#: actions/deletegroup.php:206
 msgid ""
 "Are you sure you want to delete this group? This will clear all data about "
 "the group from the database, without a backup. Public posts to this group "
@@ -2000,12 +1560,10 @@ msgstr ""
 "对这个小组公开的消息将仍在各自的时间线中保留。"
 
 #. TRANS: Submit button title for 'No' when deleting a group.
-#: actions/deletegroup.php:224
 msgid "Do not delete this group."
 msgstr "不要删除此组。"
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
-#: actions/deletegroup.php:231
 msgid "Delete this group."
 msgstr "删除此组。"
 
@@ -2015,22 +1573,18 @@ msgstr "删除此组。"
 #. TRANS: Client error displayed trying to block a user from a group while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying to log out when not logged in.
+#. TRANS: Client error displayed when trying to access the "make admin" page while not logged in.
+#. TRANS: Client error displayed trying to create a new direct message while not logged in.
+#. TRANS: Client error displayed trying to send a notice while not logged in.
+#. TRANS: Client error displayed trying to nudge a user without being logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
 #. TRANS: Client error displayed when trying to change user options while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
-#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:70
-#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
-#: actions/nudge.php:63 actions/pluginenable.php:97 actions/subedit.php:33
-#: actions/subscribe.php:98 actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:71 lib/profileformaction.php:63
-#: lib/settingsaction.php:72
 msgid "Not logged in."
 msgstr "未登录。"
 
 #. TRANS: Instructions for deleting a notice.
-#: actions/deletenotice.php:110
 msgid ""
 "You are about to permanently delete a notice. Once this is done, it cannot "
 "be undone."
@@ -2038,48 +1592,39 @@ msgstr "你即将永久删除一条消息，此操作无法撤销。"
 
 #. TRANS: Page title when deleting a notice.
 #. TRANS: Fieldset legend for the delete notice form.
-#: actions/deletenotice.php:117 actions/deletenotice.php:148
 msgid "Delete notice"
 msgstr "删除消息"
 
 #. TRANS: Message for the delete notice form.
-#: actions/deletenotice.php:152
 msgid "Are you sure you want to delete this notice?"
 msgstr "你确定要删除这条消息吗？"
 
 #. TRANS: Submit button title for 'No' when deleting a notice.
-#: actions/deletenotice.php:159
 msgid "Do not delete this notice."
 msgstr "不要删除此通知。"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:166
 msgid "Delete this notice."
 msgstr "删除此通知。"
 
 #. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
-#: actions/deleteuser.php:66
 msgid "You cannot delete users."
 msgstr "你不能删除用户。"
 
 #. TRANS: Client error displayed when trying to delete a non-local user.
-#: actions/deleteuser.php:74
 msgid "You can only delete local users."
 msgstr "你只能删除本地用户。"
 
 #. TRANS: Title of delete user page.
-#: actions/deleteuser.php:110
 msgctxt "TITLE"
 msgid "Delete user"
 msgstr "删除用户"
 
 #. TRANS: Fieldset legend on delete user page.
-#: actions/deleteuser.php:134
 msgid "Delete user"
 msgstr "删除用户"
 
 #. TRANS: Information text to request if a user is certain that the described action has to be performed.
-#: actions/deleteuser.php:138
 msgid ""
 "Are you sure you want to delete this user? This will clear all data about "
 "the user from the database, without a backup."
@@ -2087,97 +1632,78 @@ msgstr ""
 "你确定要删除这个用户吗？这将从数据库中清除有关这个用户的所有数据，没有备份。"
 
 #. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/deleteuser.php:158
 msgid "Do not delete this user."
 msgstr "请不要删除该用户。"
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
-#: actions/deleteuser.php:165
 msgid "Delete this user."
 msgstr "删除此用户。"
 
 #. TRANS: Message used as title for design settings for the site.
-#: actions/designadminpanel.php:60 lib/settingsnav.php:97
 msgid "Design"
 msgstr "外观"
 
 #. TRANS: Instructions for design adminsitration panel.
-#: actions/designadminpanel.php:71
 msgid "Design settings for this StatusNet site"
 msgstr "这个 StatusNet 网站的外观设置"
 
 #. TRANS: Client error displayed when a logo URL does is not valid.
-#: actions/designadminpanel.php:327
 msgid "Invalid logo URL."
 msgstr "无效的 logo URL。"
 
 #. TRANS: Client error displayed when an SSL logo URL is invalid.
-#: actions/designadminpanel.php:333
 msgid "Invalid SSL logo URL."
 msgstr "无效的 SSL logo URL。"
 
 #. TRANS: Client error displayed when a theme is submitted through the form that is not in the theme list.
 #. TRANS: %s is the chosen unavailable theme.
-#: actions/designadminpanel.php:339
 #, php-format
 msgid "Theme not available: %s."
 msgstr "主题不可用：%s。"
 
 #. TRANS: Fieldset legend for form to change logo.
-#: actions/designadminpanel.php:437
 msgid "Change logo"
 msgstr "更换 logo"
 
 #. TRANS: Field label for StatusNet site logo.
-#: actions/designadminpanel.php:444
 msgid "Site logo"
 msgstr "网站 logo"
 
 #. TRANS: Field label for SSL StatusNet site logo.
-#: actions/designadminpanel.php:452
 msgid "SSL logo"
 msgstr "网站 SSL logo"
 
 #. TRANS: Fieldset legend for form change StatusNet site's theme.
-#: actions/designadminpanel.php:467
 msgid "Change theme"
 msgstr "更换主题"
 
 #. TRANS: Field label for dropdown to choose site theme.
-#: actions/designadminpanel.php:485
 msgid "Site theme"
 msgstr "网站主题"
 
 #. TRANS: Title for field label for dropdown to choose site theme.
-#: actions/designadminpanel.php:487
 msgid "Theme for the site."
 msgstr "这个网站的主题。"
 
 #. TRANS: Field label for uploading a cutom theme.
-#: actions/designadminpanel.php:494
 msgid "Custom theme"
 msgstr "自定义主题"
 
 #. TRANS: Form instructions for uploading a cutom StatusNet theme.
-#: actions/designadminpanel.php:499
 msgid "You can upload a custom StatusNet theme as a .ZIP archive."
 msgstr "你可以上传一个 .ZIP 压缩文件作为一个自定义的 StatusNet 主题"
 
 #. TRANS: Fieldset legend for theme background image.
-#: actions/designadminpanel.php:515
 msgid "Change background image"
 msgstr "更换背景图像"
 
 #. TRANS: Field label for background image on theme designer page.
 #. TRANS: Field label for background color selector.
 #. TRANS: Label on profile design page for setting a profile page background colour.
-#: actions/designadminpanel.php:525 actions/designadminpanel.php:609
-#: lib/designform.php:238
 msgid "Background"
 msgstr "背景"
 
 #. TRANS: Form guide for background image upload form on theme designer page.
-#: actions/designadminpanel.php:531
 #, php-format
 msgid ""
 "You can upload a background image for the site. The maximum file size is %1"
@@ -2185,197 +1711,162 @@ msgid ""
 msgstr "你可以为网站上传一个背景图像。文件大小限制在%1$s以下。"
 
 #. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:558
 msgid "On"
 msgstr "打开"
 
 #. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:575
 msgid "Off"
 msgstr "关闭"
 
 #. TRANS: Form guide for turning background image on or off on theme designer page.
 #. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
 #. TRANS: use of the uploaded profile image.
-#: actions/designadminpanel.php:577 lib/designform.php:214
 msgid "Turn background image on or off."
 msgstr "打开或关闭背景图片"
 
 #. TRANS: Checkbox label to title background image on theme designer page.
 #. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-#: actions/designadminpanel.php:583 lib/designform.php:220
 msgid "Tile background image"
 msgstr "平铺背景图片"
 
 #. TRANS: Fieldset legend for theme colors.
-#: actions/designadminpanel.php:598
 msgid "Change colors"
 msgstr "更改颜色"
 
 #. TRANS: Field label for content color selector.
 #. TRANS: Label on profile design page for setting a profile page content colour.
-#: actions/designadminpanel.php:623 lib/designform.php:252
 msgid "Content"
 msgstr "内容"
 
 #. TRANS: Field label for sidebar color selector.
 #. TRANS: Label on profile design page for setting a profile page sidebar colour.
-#: actions/designadminpanel.php:637 lib/designform.php:266
 msgid "Sidebar"
 msgstr "边栏"
 
 #. TRANS: Field label for text color selector.
 #. TRANS: Label on profile design page for setting a profile page text colour.
-#: actions/designadminpanel.php:651 lib/designform.php:280
 msgid "Text"
 msgstr "文字"
 
 #. TRANS: Field label for link color selector.
 #. TRANS: Label on profile design page for setting a profile page links colour.
-#: actions/designadminpanel.php:665 lib/designform.php:294
 msgid "Links"
 msgstr "链接"
 
 #. TRANS: Fieldset legend for advanced theme design settings.
-#: actions/designadminpanel.php:691
 msgid "Advanced"
 msgstr "高级"
 
 #. TRANS: Field label for custom CSS.
-#: actions/designadminpanel.php:696
 msgid "Custom CSS"
 msgstr "自定义CSS"
 
 #. TRANS: Button text for resetting theme settings.
-#: actions/designadminpanel.php:718
 msgctxt "BUTTON"
 msgid "Use defaults"
 msgstr "使用默认值"
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:720
 msgid "Restore default designs."
 msgstr "还原默认设计。"
 
 #. TRANS: Title for button for resetting theme settings.
-#: actions/designadminpanel.php:728
 msgid "Reset back to default."
 msgstr "重置回默认值。"
 
 #. TRANS: Title for button for saving theme settings.
-#: actions/designadminpanel.php:736
 msgid "Save design."
 msgstr "保存设计。"
 
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
-#: actions/disfavor.php:83
 msgid "This notice is not a favorite!"
 msgstr "此消息未被收藏！"
 
 #. TRANS: Title for page on which favorites can be added.
-#: actions/disfavor.php:98
 msgid "Add to favorites"
 msgstr "加入收藏"
 
 #. TRANS: Client exception thrown when requesting a document from the documentation that does not exist.
 #. TRANS: %s is the non-existing document.
-#: actions/doc.php:155
 #, php-format
 msgid "No such document \"%s\"."
 msgstr "没有这样的文档\"%s\"。"
 
 #. TRANS: Title for "Edit application" form.
 #. TRANS: Form legend.
-#: actions/editapplication.php:54 lib/applicationeditform.php:129
 msgid "Edit application"
 msgstr "编辑应用"
 
 #. TRANS: Client error displayed trying to edit an application while not logged in.
-#: actions/editapplication.php:66
 msgid "You must be logged in to edit an application."
 msgstr "你必须登录后才能编辑应用。"
 
 #. TRANS: Client error displayed trying to edit an application that does not exist.
-#: actions/editapplication.php:83 actions/showapplication.php:83
 msgid "No such application."
 msgstr "没有这个应用。"
 
 #. TRANS: Instructions for "Edit application" form.
-#: actions/editapplication.php:167
 msgid "Use this form to edit your application."
 msgstr "通过此表单来编辑你的应用。"
 
 #. TRANS: Validation error shown when not providing a name in the "Edit application" form.
 #. TRANS: Validation error shown when not providing a name in the "New application" form.
-#: actions/editapplication.php:184 actions/newapplication.php:164
 msgid "Name is required."
 msgstr "名字为必填项。"
 
 #. 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.
-#: actions/editapplication.php:188 actions/newapplication.php:172
 msgid "Name is too long (maximum 255 characters)."
 msgstr "名称过长(不能超过255个字符)。"
 
 #. TRANS: Validation error shown when providing a name for an application that already exists in the "Edit application" form.
 #. TRANS: Validation error shown when providing a name for an application that already exists in the "New application" form.
-#: actions/editapplication.php:192 actions/newapplication.php:168
 msgid "Name already in use. Try another one."
 msgstr "名字已被使用，换一个吧。"
 
 #. TRANS: Validation error shown when not providing a description in the "Edit application" form.
 #. TRANS: Validation error shown when not providing a description in the "New application" form.
-#: actions/editapplication.php:196 actions/newapplication.php:176
 msgid "Description is required."
 msgstr "必须填写描述。"
 
 #. TRANS: Validation error shown when providing too long a source URL in the "Edit application" form.
-#: actions/editapplication.php:209
 msgid "Source URL is too long."
 msgstr "来源 URL 太长。"
 
 #. TRANS: Validation error shown when providing an invalid source URL in the "Edit application" form.
 #. TRANS: Validation error shown when providing an invalid source URL in the "New application" form.
-#: actions/editapplication.php:216 actions/newapplication.php:199
 msgid "Source URL is not valid."
 msgstr "来源 URL 无效。"
 
 #. 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.
-#: actions/editapplication.php:220 actions/newapplication.php:203
 msgid "Organization is required."
 msgstr "组织名称必填。"
 
 #. TRANS: Validation error shown when providing too long an arganisation name in the "Edit application" form.
-#: actions/editapplication.php:224 actions/newapplication.php:207
 msgid "Organization is too long (maximum 255 characters)."
 msgstr "组织名称过长（不能超过255个字符）。"
 
 #. TRANS: Form validation error show when an organisation name has not been provided in the edit application form.
 #. TRANS: Form validation error show when an organisation name has not been provided in the new application form.
-#: actions/editapplication.php:228 actions/newapplication.php:211
 msgid "Organization homepage is required."
 msgstr "组织首页必填。"
 
 #. TRANS: Validation error shown when providing too long a callback URL in the "Edit application" form.
 #. TRANS: Validation error shown when providing too long a callback URL in the "New application" form.
-#: actions/editapplication.php:239 actions/newapplication.php:225
 msgid "Callback is too long."
 msgstr "调回地址（callback）过长。"
 
 #. TRANS: Validation error shown when providing an invalid callback URL in the "Edit application" form.
 #. TRANS: Validation error shown when providing an invalid callback URL in the "New application" form.
-#: actions/editapplication.php:247 actions/newapplication.php:235
 msgid "Callback URL is not valid."
 msgstr "调回地址（Callback URL）无效。"
 
 #. TRANS: Server error occuring when an application could not be updated from the "Edit application" form.
-#: actions/editapplication.php:284
 msgid "Could not update application."
 msgstr "无法更新应用。"
 
 #. TRANS: Title for form to edit a group. %s is a group nickname.
-#: actions/editgroup.php:55
 #, php-format
 msgid "Edit %s group"
 msgstr "编辑 %s 小组"
@@ -2383,40 +1874,40 @@ msgstr "编辑 %s 小组"
 #. TRANS: Client error displayed trying to edit a group while not logged in.
 #. TRANS: Client error displayed when trying to create a group while not logged in.
 #. TRANS: Client error displayed trying to create a group while not logged in.
-#: actions/editgroup.php:68 actions/grouplogo.php:69 actions/newgroup.php:65
 msgid "You must be logged in to create a group."
 msgstr "你必须登录才能创建小组。"
 
 #. TRANS: Form instructions for group edit form.
-#: actions/editgroup.php:161
 msgid "Use this form to edit the group."
 msgstr "通过这个表单来编辑小组"
 
+#. TRANS: Group edit form validation error.
+#. TRANS: Group create form validation error.
+#. TRANS: %s is the invalid alias.
+#, php-format
+msgid "Invalid alias: \"%s\""
+msgstr "无效的别名：“%s”。"
+
 #. TRANS: Group edit form success message.
-#: actions/editgroup.php:301
 msgid "Options saved."
 msgstr "选项已保存。"
 
 #. TRANS: Title for e-mail settings.
-#: actions/emailsettings.php:60
 msgid "Email settings"
 msgstr "Email 设置"
 
 #. TRANS: E-mail settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/emailsettings.php:74
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 msgstr "设置你如何接受来自 %%site.name%% 的邮件。"
 
 #. TRANS: Form legend for e-mail settings form.
 #. TRANS: Field label for e-mail address input in e-mail settings form.
-#: actions/emailsettings.php:104 actions/emailsettings.php:130
 msgid "Email address"
 msgstr "电邮地址"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:110
 msgid "Current confirmed email address."
 msgstr "当前确认的电子邮件。"
 
@@ -2425,15 +1916,11 @@ msgstr "当前确认的电子邮件。"
 #. TRANS: Button label to remove a confirmed IM address.
 #. TRANS: Button label to remove a confirmed SMS address.
 #. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
-#: actions/emailsettings.php:113 actions/emailsettings.php:180
-#: actions/imsettings.php:119 actions/smssettings.php:119
-#: actions/smssettings.php:175
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "移除"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:120
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -2446,44 +1933,36 @@ msgstr ""
 #. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
 #. TRANS: Any other domain may be owned by a legitimate person or
 #. TRANS: organization.
-#: actions/emailsettings.php:137
 msgid "Email address, like \"UserName@example.org\""
 msgstr "电子邮件，类似 \"UserName@example.org\""
 
 #. TRANS: Button label for adding an e-mail address in e-mail settings form.
 #. TRANS: Button label for adding an IM address in IM settings form.
 #. TRANS: Button label for adding a SMS phone number in SMS settings form.
-#: actions/emailsettings.php:141 actions/imsettings.php:147
-#: actions/smssettings.php:157
 msgctxt "BUTTON"
 msgid "Add"
 msgstr "添加"
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:149 actions/smssettings.php:166
 msgid "Incoming email"
 msgstr "接收用 email"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:155
 msgid "I want to post notices by email."
 msgstr "我希望通过邮件发布信息。"
 
 #. TRANS: Form instructions for incoming e-mail form in e-mail settings.
 #. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
-#: actions/emailsettings.php:177 actions/smssettings.php:173
 msgid "Send email to this address to post new notices."
 msgstr "通过发送电子邮件到这个地址来发布新的消息。"
 
 #. TRANS: Instructions for incoming e-mail address input form, when an address has already been assigned.
 #. TRANS: Instructions for incoming SMS e-mail address input form.
-#: actions/emailsettings.php:186 actions/smssettings.php:181
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr "生成新的电子邮件地址用于发布消息；取消旧的。"
 
 #. TRANS: Instructions for incoming e-mail address input form.
-#: actions/emailsettings.php:190
 msgid ""
 "To send notices via email, we need to create a unique email address for you "
 "on this server:"
@@ -2492,87 +1971,69 @@ msgstr ""
 
 #. TRANS: Button label for adding an e-mail address to send notices from.
 #. TRANS: Button label for adding an SMS e-mail address to send notices from.
-#: actions/emailsettings.php:196 actions/smssettings.php:184
 msgctxt "BUTTON"
 msgid "New"
 msgstr "新增"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:205
 msgid "Email preferences"
 msgstr "Email 偏好"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:213
 msgid "Send me notices of new subscriptions through email."
 msgstr "将新的关注通过电子邮件发送给我。"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:219
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr "有人收藏我的消息时，发邮件通知我。"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:226
 msgid "Send me email when someone sends me a private message."
 msgstr "有人给我发送私信时，发邮件通知我。"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:232
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr "有人给我发送 @ 消息时，发邮件通知我。"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:238
 msgid "Allow friends to nudge me and send me an email."
 msgstr "允许朋友们呼叫我并给我发送邮件。"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:244
 msgid "Publish a MicroID for my email address."
 msgstr "公开电子邮件的 MicroID。"
 
 #. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:362
 msgid "Email preferences saved."
 msgstr "Email 偏好已保存。"
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:381
 msgid "No email address."
 msgstr "没有电子邮件地址。"
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:389
 msgid "Cannot normalize that email address."
 msgstr "无法识别此电子邮件。"
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:394 actions/register.php:197
-#: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "不是有效的电子邮件。"
 
 #. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:398
 msgid "That is already your email address."
 msgstr "你已登记此电子邮件。"
 
 #. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:402
 msgid "That email address already belongs to another user."
 msgstr "此电子邮件属于其他用户。"
 
 #. TRANS: Server error thrown on database error adding e-mail confirmation code.
 #. TRANS: Server error thrown on database error adding Instant Messaging confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:419 actions/imsettings.php:362
-#: actions/smssettings.php:364
 msgid "Could not insert confirmation code."
 msgstr "无法插入确认码。"
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:426
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
@@ -2583,99 +2044,79 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling Instant Messaging address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:446 actions/imsettings.php:391
-#: actions/smssettings.php:398
 msgid "No pending confirmation to cancel."
 msgstr "没有可以取消的确认。"
 
 #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:451
 msgid "That is the wrong email address."
 msgstr "这是错误的电子邮件地址。"
 
 #. TRANS: Server error thrown on database error canceling e-mail address confirmation.
 #. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
-#: actions/emailsettings.php:460 actions/smssettings.php:412
 msgid "Could not delete email confirmation."
 msgstr "无法删除电子邮件确认。"
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:465
 msgid "Email confirmation cancelled."
 msgstr "Email 确认已取消。"
 
 #. TRANS: Message given trying to remove an e-mail address that is not
 #. TRANS: registered for the active user.
-#: actions/emailsettings.php:484
 msgid "That is not your email address."
 msgstr "这个不是你的电子邮件地址。"
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:505
 msgid "The email address was removed."
 msgstr "电子邮件地址已被删除。"
 
 #. TRANS: Form validation error displayed when trying to remove an incoming e-mail address while no address has been set.
-#: actions/emailsettings.php:519 actions/smssettings.php:554
 msgid "No incoming email address."
 msgstr "没有发布用的电子邮件地址。"
 
 #. 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.
-#: actions/emailsettings.php:531 actions/emailsettings.php:555
-#: actions/smssettings.php:565 actions/smssettings.php:590
 msgid "Could not update user record."
 msgstr "无法更新用户记录。"
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
 #. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:535 actions/smssettings.php:569
 msgid "Incoming email address removed."
 msgstr "发布用的电子邮件被删除。"
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
 #. TRANS: Confirmation text after updating SMS settings.
-#: actions/emailsettings.php:559 actions/smssettings.php:594
 msgid "New incoming email address added."
 msgstr "已添加新的发布用的电子邮件地址。"
 
 #. TRANS: Client error displayed when trying to mark a notice as favorite that already is a favorite.
-#: actions/favor.php:80
 msgid "This notice is already a favorite!"
 msgstr "已收藏过此消息！"
 
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
-#: actions/favor.php:95
 msgid "Disfavor favorite."
 msgstr "不是赞成的最爱。"
 
 #. TRANS: Page title for first page of favorited notices.
 #. TRANS: Title for favourited notices section.
-#: actions/favorited.php:65 lib/popularnoticesection.php:62
-#: lib/publicgroupnav.php:93
 msgid "Popular notices"
 msgstr "最新被收藏的消息"
 
 #. TRANS: Page title for all but first page of favorited notices.
 #. TRANS: %d is the page number being displayed.
-#: actions/favorited.php:69
 #, php-format
 msgid "Popular notices, page %d"
 msgstr "最新被收藏的消息，第%d页"
 
 #. TRANS: Description on page displaying favorited notices.
-#: actions/favorited.php:81
 msgid "The most popular notices on the site right now."
 msgstr "目前网站上最新被收藏的消息。"
 
 #. TRANS: Text displayed instead of a list when a site does not yet have any favourited notices.
-#: actions/favorited.php:149
 msgid "Favorite notices appear on this page but no one has favorited one yet."
 msgstr "此页面展示收藏的消息，但还没有人收藏任何消息。"
 
 #. TRANS: Additional text displayed instead of a list when a site does not yet have any favourited notices for logged in users.
-#: actions/favorited.php:153
 msgid ""
 "Be the first to add a notice to your favorites by clicking the fave button "
 "next to any notice you like."
@@ -2683,7 +2124,6 @@ msgstr "通过点击任意消息下的收藏图标成为第一个给自己的收
 
 #. TRANS: Additional text displayed instead of a list when a site does not yet have any favourited notices for not logged in users.
 #. TRANS: %%action.register%% is a registration link. "[link text](link)" is Mark Down. Do not change the formatting.
-#: actions/favorited.php:158
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to add a "
@@ -2694,181 +2134,146 @@ msgstr "现在就[注册一个账户](%%action.register%%)并成为第一个添
 #. TRANS: %s is a user's nickname.
 #. TRANS: Title for first page of favourite notices of a user.
 #. TRANS: %s is the user for whom the favourite notices are displayed.
-#: actions/favoritesrss.php:111 actions/showfavorites.php:76
-#: lib/personalgroupnav.php:110
 #, php-format
 msgid "%s's favorite notices"
 msgstr "%s收藏的消息"
 
 #. TRANS: Desciption of RSS feed with favourite notices of a user.
 #. TRANS: %1$s is a user's nickname, %2$s is the name of the StatusNet site.
-#: actions/favoritesrss.php:117
 #, php-format
 msgid "Updates favored by %1$s on %2$s!"
 msgstr "%2$s 上被 %1$s 收藏的消息！"
 
 #. TRANS: Page title for first page of featured users.
 #. TRANS: Title for featured users section.
-#: actions/featured.php:69 lib/featureduserssection.php:87
-#: lib/publicgroupnav.php:89
 msgid "Featured users"
 msgstr "推荐用户"
 
 #. TRANS: Page title for all but first page of featured users.
 #. TRANS: %d is the page number being displayed.
-#: actions/featured.php:73
 #, php-format
 msgid "Featured users, page %d"
 msgstr "推荐用户，第 %d 页"
 
 #. TRANS: Description on page displaying featured users.
-#: actions/featured.php:102
 #, php-format
 msgid "A selection of some great users on %s."
 msgstr "%s上的一些优秀的用户摘选。"
 
 #. TRANS: Client error displayed when no notice ID was given trying do display a file.
-#: actions/file.php:36
 msgid "No notice ID."
 msgstr "没有消息 ID。"
 
 #. TRANS: Client error displayed when an invalid notice ID was given trying do display a file.
-#: actions/file.php:41
 msgid "No notice."
 msgstr "没有消息。"
 
 #. TRANS: Client error displayed when trying do display a file for a notice without a file attachement.
-#: actions/file.php:46
 msgid "No attachments."
 msgstr "没有附件。"
 
 #. TRANS: Client error displayed when trying do display a file for a notice with file attachements
 #. TRANS: that could not be found.
-#: actions/file.php:58
 msgid "No uploaded attachments."
 msgstr "没有已上传的附件。"
 
 #. TRANS: Client error displayed when subscribing to a remote profile and an unexpected response is received.
-#: actions/finishremotesubscribe.php:69
 msgid "Not expecting this response!"
 msgstr "未预料的响应！"
 
 #. TRANS: Client error displayed when subscribing to a remote profile that does not exist.
-#: actions/finishremotesubscribe.php:81
 msgid "User being listened to does not exist."
 msgstr "要查看的用户不存在。"
 
 #. TRANS: Client error displayed when subscribing to a remote profile that is a local profile.
-#: actions/finishremotesubscribe.php:89 actions/remotesubscribe.php:58
 msgid "You can use the local subscription!"
 msgstr "你可以使用本地关注！"
 
 #. TRANS: Client error displayed when subscribing to a remote profile that is blocked form subscribing to.
-#: actions/finishremotesubscribe.php:102
 msgid "That user has blocked you from subscribing."
 msgstr "该用户屏蔽了你，无法关注。"
 
 #. TRANS: Client error displayed when subscribing to a remote profile without providing an authorised token.
-#: actions/finishremotesubscribe.php:114
 msgid "You are not authorized."
 msgstr "你没有被授权。"
 
 #. TRANS: Client error displayed when subscribing to a remote profile and conversion of the request token to access token fails.
-#: actions/finishremotesubscribe.php:118
 msgid "Could not convert request token to access token."
 msgstr "无法将 request token 转换为 access token。"
 
 #. TRANS: Client error displayed when subscribing to a remote profile fails because of an unsupported version of the OMB protocol.
-#: actions/finishremotesubscribe.php:124
 msgid "Remote service uses unknown version of OMB protocol."
 msgstr "远程服务使用了未知版本的 OMB 协议。"
 
 #. TRANS: Server error displayed when subscribing to a remote profile fails because the remote profile could not be updated.
-#: actions/finishremotesubscribe.php:145 lib/oauthstore.php:317
 msgid "Error updating remote profile."
 msgstr "更新远程的个人信息时出错。"
 
 #. TRANS: Client error displayed when requesting a non-existent file.
-#: actions/getfile.php:77
 msgid "No such file."
 msgstr "没有这个文件。"
 
 #. TRANS: Client error displayed when requesting a file without having read access to it.
-#: actions/getfile.php:82
 msgid "Cannot read file."
 msgstr "无法读取文件。"
 
 #. TRANS: Client error displayed when trying to assign an invalid role to a user.
-#: actions/grantrole.php:61 actions/revokerole.php:62
 msgid "Invalid role."
 msgstr "无效的权限。"
 
 #. TRANS: Client error displayed when trying to assign an reserved role to a user.
-#: actions/grantrole.php:66 actions/revokerole.php:66
 msgid "This role is reserved and cannot be set."
 msgstr "此权限是保留的且不能被设置。"
 
 #. TRANS: Client error displayed when trying to assign a role to a user while not being allowed to set roles.
-#: actions/grantrole.php:76
 msgid "You cannot grant user roles on this site."
 msgstr "你不能在这个网站授予用户权限。"
 
 #. TRANS: Client error displayed when trying to assign a role to a user that already has that role.
-#: actions/grantrole.php:84
 msgid "User already has this role."
 msgstr "用户已有此权限。"
 
 #. TRANS: Client error displayed trying to block a user from a group while not specifying a to be blocked user profile.
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing a profile.
+#. TRANS: Client error displayed when not providing a profile ID on the Make Admin page.
 #. TRANS: Client error displayed trying a change a subscription without providing a profile.
 #. TRANS: Client error displayed when trying to change user options without specifying a user to work on.
-#: actions/groupblock.php:71 actions/groupunblock.php:71
-#: actions/makeadmin.php:71 actions/subedit.php:49
-#: lib/profileformaction.php:79
 msgid "No profile specified."
 msgstr "没有指定的用户。"
 
 #. TRANS: Client error displayed trying to block a user from a group while specifying a non-existing profile.
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing an existing profile.
+#. TRANS: Client error displayed when specifying an invalid profile ID on the Make Admin page.
 #. TRANS: Client error displayed trying a change a subscription for a non-existant profile ID.
 #. TRANS: Client error displayed when trying to change user options without specifying an existing user to work on.
-#: actions/groupblock.php:77 actions/groupunblock.php:77
-#: actions/makeadmin.php:76 actions/subedit.php:57 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:87
 msgid "No profile with that ID."
 msgstr "此 ID 没有用户。"
 
 #. TRANS: Client error displayed trying to block a user from a group while not specifying a group to block a profile from.
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing a group.
-#: actions/groupblock.php:83 actions/groupunblock.php:83
-#: actions/makeadmin.php:81
+#. TRANS: Client error displayed when not providing a group ID on the Make Admin page.
 msgid "No group specified."
 msgstr "没有指定小组。"
 
 #. TRANS: Client error displayed trying to block a user from a group while not being an admin user.
-#: actions/groupblock.php:95
 msgid "Only an admin can block group members."
 msgstr "只有管理员可以屏蔽小组成员。"
 
 #. TRANS: Client error displayed trying to block a user from a group while user is already blocked from the given group.
-#: actions/groupblock.php:100
 msgid "User is already blocked from group."
 msgstr "用户已经被小组屏蔽。"
 
 #. TRANS: Client error displayed trying to block a user from a group while user is not a member of given group.
-#: actions/groupblock.php:106
 msgid "User is not a member of group."
 msgstr "用户不是小组成员。"
 
 #. TRANS: Title for block user from group page.
 #. TRANS: Form legend for form to block user from a group.
-#: actions/groupblock.php:141 actions/groupmembers.php:364
 msgid "Block user from group"
 msgstr "从小组中屏蔽用户"
 
 #. TRANS: Explanatory text for block user from group form before setting the block.
 #. TRANS: %1$s is that to be blocked user, %2$s is the group the user will be blocked from.
-#: actions/groupblock.php:169
 #, php-format
 msgid ""
 "Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They "
@@ -2879,160 +2284,132 @@ msgstr ""
 "内发布消息或关注该小组。"
 
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
-#: actions/groupblock.php:191
 msgid "Do not block this user from this group."
 msgstr "不要在此小组屏蔽此用户。"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
-#: actions/groupblock.php:198
 msgid "Block this user from this group."
 msgstr "阻止此此组中的用户。"
 
 #. TRANS: Server error displayed when trying to block a user from a group fails because of an application error.
-#: actions/groupblock.php:215
 msgid "Database error blocking user from group."
 msgstr "在小组中屏蔽用户时数据库发生错误。"
 
 #. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
 #. TRANS: Client error displayed trying to find a user by ID without providing an ID.
-#: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr "没有 ID。"
 
 #. TRANS: Client error displayed trying to change group design settings while not logged in.
-#: actions/groupdesignsettings.php:67
 msgid "You must be logged in to edit a group."
 msgstr "你必须登录才能创建小组。"
 
 #. TRANS: Title group design settings page.
-#: actions/groupdesignsettings.php:146
 msgid "Group design"
 msgstr "小组页面外观。"
 
 #. TRANS: Instructions for group design settings page.
-#: actions/groupdesignsettings.php:157
 msgid ""
 "Customize the way your group looks with a background image and a colour "
 "palette of your choice."
 msgstr "通过背景图片和颜色板来自定义你的小组的外观。"
 
 #. TRANS: Form validation error displayed when group design settings could not be updated because of an application issue.
-#: actions/groupdesignsettings.php:262
 msgid "Unable to update your design settings."
 msgstr "无法更新你的外观设置。"
 
 #. TRANS: Form text to confirm saved group design settings.
-#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:239
 msgid "Design preferences saved."
 msgstr "外观偏好已保存。"
 
 #. TRANS: Title for group logo settings page.
 #. TRANS: Group logo form legend.
-#: actions/grouplogo.php:144 actions/grouplogo.php:199
 msgid "Group logo"
 msgstr "小组logo"
 
 #. TRANS: Instructions for group logo page.
 #. TRANS: %s is the maximum file size for that site.
-#: actions/grouplogo.php:156
 #, php-format
 msgid ""
 "You can upload a logo image for your group. The maximum file size is %s."
 msgstr "你可以给你的小组上传一个 logo。文件最大限制为%s。"
 
 #. TRANS: Submit button for uploading a group logo.
-#: actions/grouplogo.php:243
 msgid "Upload"
 msgstr "上传"
 
 #. TRANS: Button text for cropping an uploaded group logo.
-#: actions/grouplogo.php:299
 msgid "Crop"
 msgstr "剪裁"
 
 #. TRANS: Form instructions on the group logo page.
-#: actions/grouplogo.php:376
 msgid "Pick a square area of the image to be the logo."
 msgstr "请选择一块方形区域作为 logo。"
 
 #. TRANS: Form success message after updating a group logo.
-#: actions/grouplogo.php:411
 msgid "Logo updated."
 msgstr "logo已更新。"
 
 #. TRANS: Form failure message after failing to update a group logo.
-#: actions/grouplogo.php:414
 msgid "Failed updating logo."
 msgstr "更新 logo 失败。"
 
 #. TRANS: Title of the page showing group members.
 #. TRANS: %s is the name of the group.
-#: actions/groupmembers.php:104
 #, php-format
 msgid "%s group members"
 msgstr "%s 的小组成员"
 
 #. TRANS: Title of the page showing group members.
 #. TRANS: %1$s is the name of the group, %2$d is the page number of the members list.
-#: actions/groupmembers.php:109
 #, php-format
 msgid "%1$s group members, page %2$d"
 msgstr "%s 的小组成员，第%2$d页"
 
 #. TRANS: Page notice for group members page.
-#: actions/groupmembers.php:125
 msgid "A list of the users in this group."
 msgstr "该小组的成员列表。"
 
 #. TRANS: Indicator in group members list that this user is a group administrator.
-#: actions/groupmembers.php:190 lib/action.php:581
 msgid "Admin"
 msgstr "管理"
 
 #. TRANS: Button text for the form that will block a user from a group.
-#: actions/groupmembers.php:397
 msgctxt "BUTTON"
 msgid "Block"
 msgstr "屏蔽"
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:401
 msgctxt "TOOLTIP"
 msgid "Block this user"
 msgstr "屏蔽这个用户"
 
 #. TRANS: Form legend for form to make a user a group admin.
-#: actions/groupmembers.php:488
 msgid "Make user an admin of the group"
 msgstr "使用户成为小组的管理员"
 
 #. TRANS: Button text for the form that will make a user administrator.
-#: actions/groupmembers.php:521
 msgctxt "BUTTON"
 msgid "Make Admin"
 msgstr "设置管理员"
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:525
 msgctxt "TOOLTIP"
 msgid "Make this user an admin"
 msgstr "将这个用户设为管理员"
 
 #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
-#: actions/grouprss.php:141
 #, php-format
 msgid "Updates from members of %1$s on %2$s!"
 msgstr "在%2$s上%1$s小组组员的更新！"
 
 #. TRANS: Title for first page of the groups list.
-#: actions/groups.php:62
 msgctxt "TITLE"
 msgid "Groups"
 msgstr "小组"
 
 #. TRANS: Title for all but the first page of the groups list.
 #. TRANS: %d is the page number.
-#: actions/groups.php:66
 #, php-format
 msgctxt "TITLE"
 msgid "Groups, page %d"
@@ -3041,7 +2418,6 @@ msgstr "小组列表，第 %d 页"
 #. TRANS: Page notice of group list. %%%%site.name%%%% is the StatusNet site name,
 #. TRANS: %%%%action.groupsearch%%%% and %%%%action.newgroup%%%% are URLs. Do not change them.
 #. TRANS: This message contains Markdown links in the form [link text](link).
-#: actions/groups.php:95
 #, php-format
 msgid ""
 "%%%%site.name%%%% groups let you find and talk with people of similar "
@@ -3056,12 +2432,10 @@ msgstr ""
 "action.newgroup%%%%)！"
 
 #. TRANS: Link to create a new group on the group list page.
-#: actions/groups.php:113 actions/usergroups.php:126 lib/groupeditform.php:115
 msgid "Create a new group"
 msgstr "新建一个小组"
 
 #. TRANS: Instructions for page where groups can be searched. %%site.name%% is the name of the StatusNet site.
-#: actions/groupsearch.php:53
 #, php-format
 msgid ""
 "Search for groups on %%site.name%% by their name, location, or description. "
@@ -3071,21 +2445,17 @@ msgstr ""
 "词至少3个字符。"
 
 #. TRANS: Title for page where groups can be searched.
-#: actions/groupsearch.php:60
 msgid "Group search"
 msgstr "小组搜索"
 
 #. TRANS: Text on page where groups can be searched if no results were found for a query.
 #. TRANS: Text for notice search results is the query had no results.
 #. TRANS: Message on the "People search" page where a query has no results.
-#: actions/groupsearch.php:82 actions/noticesearch.php:122
-#: actions/peoplesearch.php:87
 msgid "No results."
 msgstr "没有查询结果。"
 
 #. TRANS: Additional text on page where groups can be searched if no results were found for a query for a logged in user.
 #. TRANS: This message contains Markdown links in the form [link text](link).
-#: actions/groupsearch.php:87
 #, php-format
 msgid ""
 "If you cannot find the group you're looking for, you can [create it](%%"
@@ -3094,7 +2464,6 @@ msgstr "如果你找不到想要的小组，你可以自己 [创建它](%%action
 
 #. TRANS: Additional text on page where groups can be searched if no results were found for a query for a not logged in user.
 #. TRANS: This message contains Markdown links in the form [link text](link).
-#: actions/groupsearch.php:92
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and [create the group](%%"
@@ -3104,30 +2473,25 @@ msgstr ""
 "%) ！"
 
 #. TRANS: Client error displayed when trying to unblock a user from a group without being an administrator for the group.
-#: actions/groupunblock.php:95
 msgid "Only an admin can unblock group members."
 msgstr "只有管理员可以取消屏蔽小组成员。"
 
 #. TRANS: Client error displayed when trying to unblock a non-blocked user from a group.
-#: actions/groupunblock.php:100
 msgid "User is not blocked from group."
 msgstr "用户未被小组屏蔽。"
 
 #. TRANS: Server error displayed when unblocking a user from a group fails because of an unknown error.
 #. TRANS: Server error displayed when removing a user block.
-#: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "取消屏蔽时出错。"
 
 #. TRANS: Title for Instant Messaging settings.
-#: actions/imsettings.php:56
 msgid "IM settings"
 msgstr "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.
-#: actions/imsettings.php:69
 #, fuzzy, php-format
 msgid ""
 "You can send and receive notices through instant messaging [instant messages]"
@@ -3137,18 +2501,15 @@ msgstr ""
 "们。"
 
 #. TRANS: Message given in the IM settings if IM is not enabled on the site.
-#: actions/imsettings.php:90
 msgid "IM is not available."
 msgstr "IM 不可用。"
 
-#: actions/imsettings.php:116
 #, fuzzy, php-format
 msgid "Current confirmed %s address."
 msgstr "当前确认的电子邮件。"
 
 #. TRANS: Form note in IM settings form.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:128
 #, fuzzy, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your %s account for a message "
@@ -3157,171 +2518,142 @@ msgstr ""
 "正在等待验证这个地址。请检查你的 Jabber/GTalk 帐户看有没有收到下一步的指示。"
 "（你添加 %s 为你的好友了吗？）"
 
-#: actions/imsettings.php:140
 msgid "IM address"
 msgstr "IM 地址"
 
-#: actions/imsettings.php:142
 #, php-format
 msgid "%s screenname."
 msgstr ""
 
 #. TRANS: Header for IM preferences form.
-#: actions/imsettings.php:163
 #, fuzzy
 msgid "IM Preferences"
 msgstr "IM 首选项已保存。"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:174
 #, fuzzy
 msgid "Send me notices"
 msgstr "发送一个通知"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:176
 #, fuzzy
 msgid "Post a notice when my status changes."
 msgstr "当我的 Jabber/Google Talk 状态消息改变时自动发布消息。"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:178
 #, fuzzy
 msgid "Send me replies from people I'm not subscribed to."
 msgstr "将我没有关注的用户给我的回复通过 Jabber/Google Talk 发送给我。"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:181
 #, fuzzy
 msgid "Publish a MicroID"
 msgstr "公开电子邮件的 MicroID。"
 
 #. TRANS: Server error thrown on database error updating IM preferences.
-#: actions/imsettings.php:291
 #, fuzzy
 msgid "Couldn't update IM preferences."
 msgstr "无法更新用户。"
 
 #. TRANS: Confirmation message for successful IM preferences save.
 #. TRANS: Confirmation message after saving preferences.
-#: actions/imsettings.php:298 actions/urlsettings.php:244
 msgid "Preferences saved."
 msgstr "首选项已保存。"
 
 #. TRANS: Message given saving IM address without having provided one.
-#: actions/imsettings.php:320
 #, fuzzy
 msgid "No screenname."
 msgstr "没有昵称。"
 
-#: actions/imsettings.php:325
 #, fuzzy
 msgid "No transport."
 msgstr "没有消息。"
 
 #. TRANS: Message given saving IM address that cannot be normalised.
-#: actions/imsettings.php:333
 #, fuzzy
 msgid "Cannot normalize that screenname"
 msgstr "无法识别此 Jabber ID。"
 
 #. TRANS: Message given saving IM address that not valid.
-#: actions/imsettings.php:340
 #, fuzzy
 msgid "Not a valid screenname"
 msgstr "不是有效的昵称。"
 
 #. TRANS: Message given saving IM address that is already set for another user.
-#: actions/imsettings.php:344
 #, fuzzy
 msgid "Screenname already belongs to another user."
 msgstr "Jabber ID 属于另一用户。"
 
 #. TRANS: Message given saving valid IM address that is to be confirmed.
-#: actions/imsettings.php:369
 #, fuzzy
 msgid "A confirmation code was sent to the IM address you added."
 msgstr "验证码已被发送到你新增的 IM 地址。你必须允许 %s 向你发送信息。"
 
 #. TRANS: Message given canceling IM address confirmation for the wrong IM address.
-#: actions/imsettings.php:396
 msgid "That is the wrong IM address."
 msgstr "IM 地址错误。"
 
 #. TRANS: Server error thrown on database error canceling IM address confirmation.
-#: actions/imsettings.php:405
 #, fuzzy
 msgid "Couldn't delete confirmation."
 msgstr "无法删除 IM 确认。"
 
 #. TRANS: Message given after successfully canceling IM address confirmation.
-#: actions/imsettings.php:410
 msgid "IM confirmation cancelled."
 msgstr "IM 确认已取消。"
 
 #. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.
-#: actions/imsettings.php:434
 #, fuzzy
 msgid "That is not your screenname."
 msgstr "这是他人的电话号码。"
 
 #. TRANS: Server error thrown on database error removing a registered IM address.
-#: actions/imsettings.php:443
 #, fuzzy
 msgid "Couldn't update user im prefs."
 msgstr "无法更新用户记录。"
 
 #. TRANS: Message given after successfully removing a registered Instant Messaging address.
-#: actions/imsettings.php:451
 msgid "The IM address was removed."
 msgstr "IM 地址已删除。"
 
 #. TRANS: Title for all but the first page of the inbox page.
 #. TRANS: %1$s is the user's nickname, %2$s is the page number.
-#: actions/inbox.php:59
 #, php-format
 msgid "Inbox for %1$s - page %2$d"
 msgstr "%1$s的收件箱 - 第%2$d页"
 
 #. TRANS: Title for the first page of the inbox page.
 #. TRANS: %s is the user's nickname.
-#: actions/inbox.php:64
 #, php-format
 msgid "Inbox for %s"
 msgstr "%s 的收件箱"
 
 #. TRANS: Instructions for user inbox page.
-#: actions/inbox.php:106
 msgid "This is your inbox, which lists your incoming private messages."
 msgstr "这是你的收件箱，包含发给你的私信。"
 
 #. TRANS: Client error displayed when trying to sent invites while they have been disabled.
-#: actions/invite.php:41
 msgid "Invites have been disabled."
 msgstr "邀请已被禁用。"
 
 #. TRANS: Client error displayed when trying to sent invites while not logged in.
 #. TRANS: %s is the StatusNet site name.
-#: actions/invite.php:45
 #, php-format
 msgid "You must be logged in to invite other users to use %s."
 msgstr "你必须登录才能邀请他人使用%s。"
 
 #. TRANS: Form validation message when providing an e-mail address that does not validate.
 #. TRANS: %s is an invalid e-mail address.
-#: actions/invite.php:78
 #, php-format
 msgid "Invalid email address: %s."
 msgstr "无效的电子邮件地址：%s"
 
 #. TRANS: Page title when invitations have been sent.
-#: actions/invite.php:117
 msgid "Invitations sent"
 msgstr "邀请已发送"
 
 #. TRANS: Page title when inviting potential users.
-#: actions/invite.php:120
 msgid "Invite new users"
 msgstr "邀请新用户"
 
@@ -3329,14 +2661,12 @@ msgstr "邀请新用户"
 #. TRANS: is already subscribed to one or more users with the given e-mail address(es).
 #. TRANS: Plural form is based on the number of reported already subscribed e-mail addresses.
 #. TRANS: Followed by a bullet list.
-#: actions/invite.php:140
 msgid "You are already subscribed to this user:"
 msgid_plural "You are already subscribed to these users:"
 msgstr[0] "你已经关注了这些用户："
 
 #. TRANS: Used as list item for already subscribed users (%1$s is nickname, %2$s is e-mail address).
 #. TRANS: Used as list item for already registered people (%1$s is nickname, %2$s is e-mail address).
-#: actions/invite.php:146 actions/invite.php:160
 #, php-format
 msgctxt "INVITE"
 msgid "%1$s (%2$s)"
@@ -3345,7 +2675,6 @@ msgstr "%1$s (%2$s)"
 #. TRANS: Message displayed inviting users to use a StatusNet site while the invited user
 #. TRANS: already uses a this StatusNet site. Plural form is based on the number of
 #. TRANS: reported already present people. Followed by a bullet list.
-#: actions/invite.php:154
 msgid "This person is already a user and you were automatically subscribed:"
 msgid_plural ""
 "These people are already users and you were automatically subscribed to them:"
@@ -3354,47 +2683,40 @@ msgstr[0] "这些人已经注册了用户，你已自动关注了他们:"
 #. TRANS: Message displayed inviting users to use a StatusNet site. Plural form is
 #. TRANS: based on the number of invitations sent. Followed by a bullet list of
 #. TRANS: e-mail addresses to which invitations were sent.
-#: actions/invite.php:168
 msgid "Invitation sent to the following person:"
 msgid_plural "Invitations sent to the following people:"
 msgstr[0] "邀请已发送给了这些人："
 
 #. TRANS: Generic message displayed after sending out one or more invitations to
 #. TRANS: people to join a StatusNet site.
-#: actions/invite.php:178
 msgid ""
 "You will be notified when your invitees accept the invitation and register "
 "on the site. Thanks for growing the community!"
 msgstr "如果其他人接受邀请并注册，你将得到通知。谢谢你推动了社区发展壮大！"
 
 #. TRANS: Form instructions.
-#: actions/invite.php:191
 msgid ""
 "Use this form to invite your friends and colleagues to use this service."
 msgstr "使用这个表单来邀请好友和同事加入。"
 
 #. TRANS: Field label for a list of e-mail addresses.
-#: actions/invite.php:218
 msgid "Email addresses"
 msgstr "电邮地址"
 
 #. TRANS: Tooltip for field label for a list of e-mail addresses.
-#: actions/invite.php:221
 msgid "Addresses of friends to invite (one per line)."
 msgstr "朋友邀请的地址（每行一个）。"
 
 #. TRANS: Field label for a personal message to send to invitees.
-#: actions/invite.php:225
 msgid "Personal message"
 msgstr "个人消息"
 
 #. TRANS: Tooltip for field label for a personal message to send to invitees.
-#: actions/invite.php:228
 msgid "Optionally add a personal message to the invitation."
 msgstr "在邀请中加几句话(可选)。"
 
 #. TRANS: Send button for inviting friends
-#: actions/invite.php:232
+#. TRANS: Button text for sending notice.
 msgctxt "BUTTON"
 msgid "Send"
 msgstr "发布"
@@ -3402,7 +2724,6 @@ msgstr "发布"
 #. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral
 #. TRANS: singular 3rd-person pronoun in English. %1$s is the inviting user, $2$s is
 #. TRANS: the StatusNet sitename.
-#: actions/invite.php:264
 #, php-format
 msgid "%1$s has invited you to join them on %2$s"
 msgstr "%1$s 邀请你加入 %2$s"
@@ -3412,7 +2733,6 @@ msgstr "%1$s 邀请你加入 %2$s"
 #. TRANS: StatusNet sitename, %3$s is the site URL, %4$s is the personal message from the
 #. TRANS: inviting user, %s%5 a link to the timeline for the inviting user, %s$6 is a link
 #. TRANS: to register with the StatusNet site.
-#: actions/invite.php:271
 #, php-format
 msgid ""
 "%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -3466,316 +2786,307 @@ msgstr ""
 "诚挚的感谢, %2$s\n"
 
 #. TRANS: Client error displayed when trying to join a group while not logged in.
-#: actions/joingroup.php:59
 msgid "You must be logged in to join a group."
 msgstr "你必须登录才能加入小组。"
 
 #. TRANS: Title for join group page after joining.
-#: actions/joingroup.php:148
 #, php-format
 msgctxt "TITLE"
 msgid "%1$s joined group %2$s"
 msgstr "%1$s 加入 %2$s 组"
 
 #. TRANS: Client error displayed when trying to leave a group while not logged in.
-#: actions/leavegroup.php:59
 msgid "You must be logged in to leave a group."
 msgstr "你必须登录才能离开小组。"
 
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
-#: actions/leavegroup.php:103 lib/command.php:398
 msgid "You are not a member of that group."
 msgstr "你不是该群小组成员。"
 
 #. TRANS: Title for leave group page after leaving.
-#: actions/leavegroup.php:142
 #, php-format
 msgctxt "TITLE"
 msgid "%1$s left group %2$s"
 msgstr "离开 %2$s 组的 %1$s"
 
 #. TRANS: User admin panel title
-#: actions/licenseadminpanel.php:55
 msgctxt "TITLE"
 msgid "License"
 msgstr "许可协议"
 
-#: actions/licenseadminpanel.php:65
+#. TRANS: Form instructions for the site license admin panel.
 msgid "License for this StatusNet site"
 msgstr "这个 StatusNet 网站的许可协议"
 
-#: actions/licenseadminpanel.php:134
+#. TRANS: Client error displayed selecting an invalid license in the license admin panel.
 msgid "Invalid license selection."
 msgstr "无效的许可协议选择。"
 
-#: actions/licenseadminpanel.php:144
+#. TRANS: Client error displayed when not specifying an owner for the all rights reserved license in the license admin panel.
 msgid ""
 "You must specify the owner of the content when using the All Rights Reserved "
 "license."
 msgstr "当使用版权所有的许可协议时，你必须指定内容的所有者。"
 
-#: actions/licenseadminpanel.php:151
+#. TRANS: Client error displayed selecting a too long license title in the license admin panel.
 msgid "Invalid license title. Maximum length is 255 characters."
 msgstr "无效的许可标题。最大长度255个字符。"
 
-#: actions/licenseadminpanel.php:163
+#. TRANS: Client error displayed specifying an invalid license URL in the license admin panel.
 msgid "Invalid license URL."
 msgstr "无效的许可协议 URL。"
 
-#: actions/licenseadminpanel.php:166
+#. TRANS: Client error displayed specifying an invalid license image URL in the license admin panel.
 msgid "Invalid license image URL."
 msgstr "无效的许可协议图片 URL。"
 
-#: actions/licenseadminpanel.php:174
+#. TRANS: Client error displayed specifying an invalid license URL in the license admin panel.
 msgid "License URL must be blank or a valid URL."
 msgstr "许可协议 URL 必须是个有效的 URL 或者为空。"
 
-#: actions/licenseadminpanel.php:182
+#. TRANS: Client error displayed specifying an invalid license image URL in the license admin panel.
 msgid "License image must be blank or valid URL."
 msgstr "许可协议图片 URL 必须是个有效的 URL 或者为空。"
 
-#: actions/licenseadminpanel.php:232
+#. TRANS: Form legend in the license admin panel.
 msgid "License selection"
 msgstr "许可协议选择"
 
-#: actions/licenseadminpanel.php:238
+#. TRANS: License option in the license admin panel.
 msgid "Private"
 msgstr "私有"
 
-#: actions/licenseadminpanel.php:239
+#. TRANS: License option in the license admin panel.
 msgid "All Rights Reserved"
 msgstr "版权所有"
 
-#: actions/licenseadminpanel.php:240
+#. TRANS: License option in the license admin panel.
 msgid "Creative Commons"
 msgstr "创作共用"
 
-#: actions/licenseadminpanel.php:245
+#. TRANS: Dropdown field label in the license admin panel.
 msgid "Type"
 msgstr "类型"
 
-#: actions/licenseadminpanel.php:247
-msgid "Select license"
+#. TRANS: Dropdown field instructions in the license admin panel.
+#, fuzzy
+msgid "Select a license."
 msgstr "选择许可协议"
 
-#: actions/licenseadminpanel.php:261
+#. TRANS: Form legend in the license admin panel.
 msgid "License details"
 msgstr "许可协议细节"
 
-#: actions/licenseadminpanel.php:267
+#. TRANS: Field label in the license admin panel.
 msgid "Owner"
 msgstr "所有者"
 
-#: actions/licenseadminpanel.php:268
+#. TRANS: Field title in the license admin panel.
 msgid "Name of the owner of the site's content (if applicable)."
 msgstr "这个网站内容的所有者姓名（如果适用）。"
 
-#: actions/licenseadminpanel.php:276
+#. TRANS: Field label in the license admin panel.
 msgid "License Title"
 msgstr "许可协议标题"
 
-#: actions/licenseadminpanel.php:277
+#. TRANS: Field title in the license admin panel.
 msgid "The title of the license."
 msgstr "许可协议的标题。"
 
-#: actions/licenseadminpanel.php:285
+#. TRANS: Field label in the license admin panel.
 msgid "License URL"
 msgstr "许可协议 URL"
 
-#: actions/licenseadminpanel.php:286
+#. TRANS: Field title in the license admin panel.
 msgid "URL for more information about the license."
 msgstr "更多许可协议信息的 URL。"
 
-#: actions/licenseadminpanel.php:293
+#. TRANS: Field label in the license admin panel.
 msgid "License Image URL"
 msgstr "许可协议图片 URL。"
 
-#: actions/licenseadminpanel.php:294
+#. TRANS: Field title in the license admin panel.
 msgid "URL for an image to display with the license."
 msgstr "与许可协议一起出现的图片 URL。"
 
-#. TRANS: Submit button title.
-#: actions/licenseadminpanel.php:311 actions/sessionsadminpanel.php:199
-#: actions/siteadminpanel.php:292 actions/snapshotadminpanel.php:245
-#: actions/tagother.php:133 lib/applicationeditform.php:357
-msgid "Save"
-msgstr "保存"
-
-#: actions/licenseadminpanel.php:311
-msgid "Save license settings"
+#. TRANS: Button title in the license admin panel.
+#, fuzzy
+msgid "Save license settings."
 msgstr "保存许可协议设置"
 
+#. TRANS: Client error displayed when trying to log in while already logged in.
 #. TRANS: Client error displayed trying to use "one time password login" when already logged in.
-#: actions/login.php:97 actions/otp.php:62 actions/register.php:130
 msgid "Already logged in."
 msgstr "已登录。"
 
-#: actions/login.php:125
+#. TRANS: Form validation error displayed when trying to log in with incorrect credentials.
 msgid "Incorrect username or password."
 msgstr "用户名或密码不正确。"
 
+#. TRANS: Server error displayed when during login a server error occurs.
 #. TRANS: Server error displayed when a user object could not be created trying to login using "one time password login".
-#: actions/login.php:131 actions/otp.php:127
 msgid "Error setting user. You are probably not authorized."
 msgstr "设置用户时出错。你可能没有被认证。"
 
-#: actions/login.php:185 actions/login.php:236 lib/action.php:598
+#. TRANS: Page title for login page.
 msgid "Login"
 msgstr "登录"
 
-#: actions/login.php:222
+#. TRANS: Form legend on login page.
 msgid "Login to site"
 msgstr "登录"
 
-#: actions/login.php:231 actions/register.php:469
+#. TRANS: Checkbox label label on login page.
 msgid "Remember me"
 msgstr "记住登录状态"
 
-#: actions/login.php:232 actions/register.php:471
+#. TRANS: Checkbox title on login page.
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "下次自动登录，请不要在公共电脑上使用此选项！"
 
-#: actions/login.php:241
+#. TRANS: Button text for log in on login page.
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Login"
+msgstr "登录"
+
+#. TRANS: Link text for link to "reset password" on login page.
 msgid "Lost or forgotten password?"
 msgstr "忘记了密码？"
 
-#: actions/login.php:259
+#. TRANS: Form instructions on login page before being able to change user settings.
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
 msgstr "由于安全原因，修改设置前需要输入用户名和密码。"
 
-#: actions/login.php:263
+#. TRANS: Form instructions on login page.
 msgid "Login with your username and password."
 msgstr "使用用户名和密码登录。"
 
-#: actions/login.php:266
+#. TRANS: Form instructions on login page. This message contains Markdown links in the form [Link text](Link).
+#. TRANS: %%action.register%% is a link to the registration page.
 #, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
 msgstr "没有帐号？[注册](%%action.register%%) 一个新帐号。"
 
-#: actions/makeadmin.php:92
+#. TRANS: Client error displayed when trying to make another user admin on the Make Admin page while not an admin.
 msgid "Only an admin can make another user an admin."
 msgstr "只有管理员可以让另一个用户成为管理员。"
 
-#: actions/makeadmin.php:96
+#. TRANS: Client error displayed when trying to make another user admin on the Make Admin page who already is admin.
+#. TRANS: %1$s is the user that is already admin, %2$s is the group user is already admin for.
 #, php-format
 msgid "%1$s is already an admin for group \"%2$s\"."
 msgstr "%1$s已经是\"%2$s\"小组的管理员了。"
 
-#: actions/makeadmin.php:133
+#. TRANS: Server error displayed when trying to make another user admin on the Make Admin page fails
+#. TRANS: because the group membership record could not be gotten.
+#. TRANS: %1$s is the to be admin user, %2$s is the group user should be admin for.
 #, php-format
 msgid "Can't get membership record for %1$s in group %2$s."
 msgstr "无法找到%1$s在%2$s小组的记录。"
 
-#: actions/makeadmin.php:146
+#. TRANS: Server error displayed when trying to make another user admin on the Make Admin page fails
+#. TRANS: because the group adminship record coud not be saved properly.
+#. TRANS: %1$s is the to be admin user, %2$s is the group user is already admin for.
 #, php-format
 msgid "Can't make %1$s an admin for group %2$s."
 msgstr "无法让%1$s成为%2$s小组的管理员。"
 
-#: actions/microsummary.php:69
+#. TRANS: Client error displayed trying to make a micro summary without providing a status.
 msgid "No current status."
 msgstr "没有当前消息。"
 
 #. TRANS: This is the title of the form for adding a new application.
-#: actions/newapplication.php:52
 msgid "New application"
 msgstr "新应用"
 
 #. TRANS: Client error displayed trying to add a new application while not logged in.
-#: actions/newapplication.php:64
 msgid "You must be logged in to register an application."
 msgstr "你必须登录才能登记你的应用。"
 
 #. TRANS: Form instructions for registering a new application.
-#: actions/newapplication.php:147
 msgid "Use this form to register a new application."
 msgstr "通过此表单登记一个新的应用。"
 
 #. TRANS: Validation error shown when not providing a source URL in the "New application" form.
-#: actions/newapplication.php:189
 msgid "Source URL is required."
 msgstr "Source URL 必填。"
 
 #. TRANS: Server error displayed when an application could not be registered in the database through the "New application" form.
-#: actions/newapplication.php:279 actions/newapplication.php:289
 msgid "Could not create application."
 msgstr "无法创建应用。"
 
 #. TRANS: Title for form to create a group.
-#: actions/newgroup.php:53
 msgid "New group"
 msgstr "新小组"
 
 #. TRANS: Client exception thrown when a user tries to create a group while banned.
-#: actions/newgroup.php:73 classes/User_group.php:485
 msgid "You are not allowed to create groups on this site."
 msgstr "您不被允许创建此站点上的小组。"
 
 #. TRANS: Form instructions for group create form.
-#: actions/newgroup.php:117
 msgid "Use this form to create a new group."
 msgstr "通过此表单创建小组。"
 
-#. TRANS: Group create form validation error.
-#: actions/newgroup.php:200
-msgid "Alias cannot be the same as nickname."
-msgstr "别名不能昵称相同。"
-
-#: actions/newmessage.php:71 actions/newmessage.php:234
+#. TRANS: Page title for new direct message page.
+#. TRANS: Page title on page for sending a direct message.
 msgid "New message"
 msgstr "新消息"
 
-#. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
-#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:513
-msgid "You can't send a message to this user."
+#. TRANS: Client error displayed trying to send a direct message to a user while sender and
+#. TRANS: receiver are not subscribed to each other.
+#, fuzzy
+msgid "You cannot send a message to this user."
 msgstr "无法向此用户发送消息。"
 
+#. TRANS: Form validator error displayed trying to send a direct message without content.
+#. TRANS: Client error displayed trying to send a notice without content.
 #. TRANS: Command exception text shown when trying to send a direct message to another user without content.
 #. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
-#: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:490
-#: lib/command.php:593
 msgid "No content!"
 msgstr "没有内容！"
 
-#: actions/newmessage.php:161
+#. TRANS: Form validation error displayed trying to send a direct message without specifying a recipient.
 msgid "No recipient specified."
 msgstr "没有收件人。"
 
+#. TRANS: Client error displayed trying to send a direct message to self.
 #. TRANS: Error text shown when trying to send a direct message to self.
-#: actions/newmessage.php:167 lib/command.php:517
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr "不要向自己发送消息；跟自己悄悄说就得了。"
 
-#: actions/newmessage.php:184
+#. TRANS: Page title after sending a direct message.
 msgid "Message sent"
 msgstr "消息已发送"
 
+#. TRANS: Confirmation text after sending a direct message.
+#. TRANS: %s is the direct message recipient.
 #. TRANS: Message given have sent a direct message to another user.
 #. TRANS: %s is the name of the other user.
-#: actions/newmessage.php:188 lib/command.php:525
 #, php-format
 msgid "Direct message to %s sent."
 msgstr "向%s发送私信成功。"
 
-#: actions/newmessage.php:213 actions/newnotice.php:264
+#. TRANS: Page title after an AJAX error occurred on the "send direct message" page.
+#. TRANS: Page title after an AJAX error occurs on the send notice page.
 msgid "Ajax Error"
 msgstr "Ajax错误"
 
-#: actions/newnotice.php:69
+#. TRANS: Page title for sending a new notice.
 msgid "New notice"
 msgstr "新消息"
 
-#: actions/newnotice.php:230
+#. TRANS: Page title after sending a notice.
 msgid "Notice posted"
 msgstr "消息已发布。"
 
 #. TRANS: Instructions for Notice search page.
 #. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/noticesearch.php:69
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -3785,20 +3096,17 @@ msgstr ""
 "格分隔。"
 
 #. TRANS: Title of the page where users can search for notices.
-#: actions/noticesearch.php:80
 msgid "Text search"
 msgstr "搜索消息"
 
 #. TRANS: Test in RSS notice search.
 #. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearch.php:95
 #, php-format
 msgid "Search results for \"%1$s\" on %2$s"
 msgstr "在%2$s上搜索\"%1$s\"的结果"
 
 #. TRANS: Text for logged in users making a query for notices without results.
 #. TRANS: This message contains a Markdown link.
-#: actions/noticesearch.php:128
 #, php-format
 msgid ""
 "Be the first to [post on this topic](%%%%action.newnotice%%%%?"
@@ -3809,7 +3117,6 @@ msgstr ""
 
 #. TRANS: Text for not logged in users making a query for notices without results.
 #. TRANS: This message contains Markdown links.
-#: actions/noticesearch.php:133
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and be the first to "
@@ -3819,78 +3126,67 @@ msgstr ""
 "人](%%%%action.newnotice%%%%?status_textarea=%s) ！"
 
 #. TRANS: RSS notice search feed title. %s is the query.
-#: actions/noticesearchrss.php:95
 #, php-format
 msgid "Updates with \"%s\""
 msgstr "\"%s\"的更新"
 
 #. TRANS: RSS notice search feed description.
 #. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#: actions/noticesearchrss.php:99
 #, fuzzy, php-format
 msgid "Updates matching search term \"%1$s\" on %2$s."
 msgstr "%2$s上符合搜索关键字\"%1$s\"的更新！"
 
-#: actions/nudge.php:85
+#. TRANS: Client error displayed trying to nudge a user that cannot be nudged.
 msgid ""
 "This user doesn't allow nudges or hasn't confirmed or set their email "
 "address yet."
 msgstr "该用户不允许对其呼叫或者还没有验证电子邮件地址。"
 
-#: actions/nudge.php:94
+#. TRANS: Page title after sending a nudge.
 msgid "Nudge sent"
 msgstr "呼叫已发出。"
 
-#: actions/nudge.php:97
+#. TRANS: Confirmation text after sending a nudge.
 msgid "Nudge sent!"
 msgstr "呼叫已发出！"
 
 #. TRANS: Message displayed to an anonymous user trying to view OAuth application list.
-#: actions/oauthappssettings.php:57
 msgid "You must be logged in to list your applications."
 msgstr "必须登录才能查看你的应用列表。"
 
 #. TRANS: Page title for OAuth applications
-#: actions/oauthappssettings.php:73
 msgid "OAuth applications"
 msgstr "OAuth 应用"
 
 #. TRANS: Page instructions for OAuth applications
-#: actions/oauthappssettings.php:85
 msgid "Applications you have registered"
 msgstr "你已经登记的程序。"
 
 #. TRANS: Empty list message on page with OAuth applications.
-#: actions/oauthappssettings.php:138
 #, php-format
 msgid "You have not registered any applications yet."
 msgstr "你还没登记任何程序。"
 
 #. TRANS: Title for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:69
 msgid "Connected applications"
 msgstr "关联的应用"
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:80
 msgid "The following connections exist for your account."
 msgstr "你的账号的关联。"
 
 #. TRANS: Client error when trying to revoke access for an application while not being a user of it.
-#: actions/oauthconnectionssettings.php:165
 msgid "You are not a user of that application."
 msgstr "你不是那个应用的用户。"
 
 #. TRANS: Client error when revoking access has failed for some reason.
 #. TRANS: %s is the application ID revoking access failed for.
-#: actions/oauthconnectionssettings.php:180
 #, php-format
 msgid "Unable to revoke access for application: %s."
 msgstr "不能取消%s应用的访问。"
 
 #. TRANS: Success message after revoking access for an application.
 #. TRANS: %1$s is the application name, %2$s is the first part of the user token.
-#: actions/oauthconnectionssettings.php:199
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -3898,14 +3194,12 @@ msgid ""
 msgstr "你已成功取消了%1$s的访问，access token 中前面的部分是 %2$s。"
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:210
 msgid "You have not authorized any applications to use your account."
 msgstr "你还没允许任何程序使用你的账户。"
 
 #. TRANS: Note for developers in the OAuth connection settings form.
 #. TRANS: This message contains a Markdown link. Do not separate "](".
 #. TRANS: %s is the URL to the OAuth settings.
-#: actions/oauthconnectionssettings.php:230
 #, php-format
 msgid ""
 "Are you a developer? [Register an OAuth client application](%s) to use with "
@@ -3913,438 +3207,357 @@ msgid ""
 msgstr ""
 "你是开发者么？[注册一个 OAuth 客户端应用](%s) 来使用这个 StatusNet 网站。"
 
-#: actions/oembed.php:64
+#. TRANS: Server error displayed in oEmbed action when path not found.
+#. TRANS: %s is a path.
 #, php-format
 msgid "\"%s\" not found."
 msgstr "找不到\"%s\"。"
 
-#: actions/oembed.php:76
+#. TRANS: Server error displayed in oEmbed action when notice not found.
+#. TRANS: %s is a notice.
 #, php-format
 msgid "Notice %s not found."
 msgstr "找不到 %s 的通知。"
 
-#: actions/oembed.php:80 actions/shownotice.php:100
+#. TRANS: Server error displayed in oEmbed action when notice has not profile.
 msgid "Notice has no profile."
 msgstr "消息没有对应用户。"
 
-#: actions/oembed.php:83 actions/shownotice.php:172
+#. TRANS: oEmbed title. %1$s is the author name, %2$s is the creation date.
 #, php-format
 msgid "%1$s's status on %2$s"
 msgstr "%1$s在%2$s时发的消息"
 
-#: actions/oembed.php:95
+#. TRANS: Server error displayed in oEmbed action when attachment not found.
+#. TRANS: %d is an attachment ID.
 #, php-format
 msgid "Attachment %s not found."
 msgstr "找不到 %s 的附件。"
 
-#: actions/oembed.php:136
+#. TRANS: Server error displayed in oEmbed request when a path is not supported.
+#. TRANS: %s is a path.
 #, php-format
 msgid "\"%s\" not supported for oembed requests."
 msgstr "\"%s\"不支持 oembed 的请求。"
 
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
-#: actions/oembed.php:168
 #, php-format
 msgid "Content type %s not supported."
 msgstr "%s内容类型不被支持。"
 
 #. TRANS: Error message displaying attachments. %s is the site's base URL.
-#: actions/oembed.php:172
 #, php-format
 msgid "Only %s URLs over plain HTTP please."
 msgstr "请只用HTTP明文的%sURLs的地址。"
 
+#. TRANS: Server error displayed in oEmbed action when request specifies an unsupported data format.
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1207
-#: lib/apiaction.php:1234 lib/apiaction.php:1369
 msgid "Not a supported data format."
 msgstr "不支持的数据格式。"
 
 #. TRANS: ShortName in the OpenSearch interface when trying to find users.
-#: actions/opensearch.php:64
 msgid "People Search"
 msgstr "搜索用户"
 
-#: actions/opensearch.php:68
+#. TRANS: ShortName in the OpenSearch interface when trying to find notices.
 msgid "Notice Search"
 msgstr "搜索消息"
 
 #. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
-#: actions/otp.php:70
 msgid "No user ID specified."
 msgstr "没用指定用户 ID。"
 
 #. TRANS: Client error displayed trying to use "one time password login" without specifying a login token.
-#: actions/otp.php:86
 msgid "No login token specified."
 msgstr "没有指定登录 token。"
 
 #. TRANS: Client error displayed trying to use "one time password login" without requesting a login token.
-#: actions/otp.php:94
 msgid "No login token requested."
 msgstr "没有请求的登录 token。"
 
 #. TRANS: Client error displayed trying to use "one time password login" while specifying an invalid login token.
-#: actions/otp.php:100
 msgid "Invalid login token specified."
 msgstr "指定的登录 token 无效。"
 
 #. TRANS: Client error displayed trying to use "one time password login" while specifying an expired login token.
-#: actions/otp.php:110
 msgid "Login token expired."
 msgstr "登录 token 已过期。"
 
 #. TRANS: Title for outbox for any but the fist page.
 #. TRANS: %1$s is the user nickname, %2$d is the page number.
-#: actions/outbox.php:57
 #, php-format
 msgid "Outbox for %1$s - page %2$d"
 msgstr "%1$s的发件箱 - 第%2$d页"
 
 #. TRANS: Title for first page of outbox.
-#: actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
 msgstr "%s 的发件箱"
 
 #. TRANS: Instructions for outbox.
-#: actions/outbox.php:103
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr "这是你的发件箱，包含你发送的私信。"
 
-#: actions/passwordsettings.php:58
 msgid "Change password"
 msgstr "修改密码"
 
-#: actions/passwordsettings.php:69
 msgid "Change your password."
 msgstr "修改你的密码"
 
 #. TRANS: Fieldset legend for password reset form.
-#: actions/passwordsettings.php:96 actions/recoverpassword.php:251
 msgid "Password change"
 msgstr "修改密码"
 
-#: actions/passwordsettings.php:104
 msgid "Old password"
 msgstr "旧密码"
 
 #. TRANS: Field label for password reset form.
-#: actions/passwordsettings.php:108 actions/recoverpassword.php:256
 msgid "New password"
 msgstr "新密码"
 
-#: actions/passwordsettings.php:109 actions/register.php:416
 msgid "6 or more characters."
 msgstr "6 个或更多字符"
 
 #. TRANS: Ttile for field label for password reset form where the password has to be typed again.
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:264
-#: actions/register.php:420
 msgid "Same as password above."
 msgstr "与上面相同的密码"
 
-#: actions/passwordsettings.php:117
 msgid "Change"
 msgstr "修改"
 
-#: actions/passwordsettings.php:153 actions/register.php:223
 msgid "Password must be 6 or more characters."
 msgstr "密码必须包含 6 个或更多字符。"
 
-#: actions/passwordsettings.php:156 actions/register.php:226
 msgid "Passwords don't match."
 msgstr "密码不匹配。"
 
-#: actions/passwordsettings.php:164
 msgid "Incorrect old password"
 msgstr "旧密码不正确"
 
-#: actions/passwordsettings.php:180
 msgid "Error saving user; invalid."
 msgstr "保存用户时出错；无效。"
 
 #. TRANS: Reset password form validation error message.
-#: actions/passwordsettings.php:185 actions/recoverpassword.php:418
 msgid "Cannot save new password."
 msgstr "无法保存新密码。"
 
-#: actions/passwordsettings.php:191
 msgid "Password saved."
 msgstr "密码已保存。"
 
 #. TRANS: Title for Paths admin panel.
 #. TRANS: Menu item for site administration
-#: actions/pathsadminpanel.php:58 lib/adminpanelaction.php:371
 msgid "Paths"
 msgstr "路径"
 
 #. TRANS: Form instructions for Path admin panel.
-#: actions/pathsadminpanel.php:69
 msgid "Path and server settings for this StatusNet site"
 msgstr "这个 StatusNet 网站的路径和服务器设置。"
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the directory that could not be read from.
-#: actions/pathsadminpanel.php:155
 #, php-format
 msgid "Theme directory not readable: %s."
 msgstr "主题目录无法读取：%s。"
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the avatar directory that could not be written to.
-#: actions/pathsadminpanel.php:163
 #, php-format
 msgid "Avatar directory not writable: %s."
 msgstr "头像目录无法写入：%s。"
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the background directory that could not be written to.
-#: actions/pathsadminpanel.php:171
 #, php-format
 msgid "Background directory not writable: %s."
 msgstr "背景目录无法写入：%s。"
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the locales directory that could not be read from.
-#: actions/pathsadminpanel.php:181
 #, php-format
 msgid "Locales directory not readable: %s."
 msgstr "本地化目录无法读取：%s。"
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the SSL server URL that is too long.
-#: actions/pathsadminpanel.php:189
 msgid "Invalid SSL server. The maximum length is 255 characters."
 msgstr "无效的 SSL 服务器。最大长度255个字符。"
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:235 actions/siteadminpanel.php:58
 msgid "Site"
 msgstr "网站"
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:241 actions/pathsadminpanel.php:279
-#: actions/pathsadminpanel.php:370 actions/pathsadminpanel.php:425
 msgid "Server"
 msgstr "服务器"
 
-#: actions/pathsadminpanel.php:242
 msgid "Site's server hostname."
 msgstr "网站的服务器主机名。"
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:248 actions/pathsadminpanel.php:288
-#: actions/pathsadminpanel.php:379 actions/pathsadminpanel.php:434
 msgid "Path"
 msgstr "路径"
 
-#: actions/pathsadminpanel.php:249
 msgid "Site path."
 msgstr "网站路径"
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:255
 msgid "Locale directory"
 msgstr "本地化目录"
 
-#: actions/pathsadminpanel.php:256
 msgid "Directory path to locales."
 msgstr "本地化文件的目录路径"
 
 #. TRANS: Checkbox label in Paths admin panel.
-#: actions/pathsadminpanel.php:263
 msgid "Fancy URLs"
 msgstr "优化 URLs"
 
-#: actions/pathsadminpanel.php:265
 msgid "Use fancy (more readable and memorable) URLs?"
 msgstr "使用优化的 URLs（更简洁易记）？"
 
-#: actions/pathsadminpanel.php:272
 msgid "Theme"
 msgstr "主题"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:281
 msgid "Server for themes."
 msgstr "主题服务器。"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:290
 msgid "Web path to themes."
 msgstr "主题的网站路径。"
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:297 actions/pathsadminpanel.php:388
-#: actions/pathsadminpanel.php:443 actions/pathsadminpanel.php:495
 msgid "SSL server"
 msgstr "SSL 服务器"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:299
 msgid "SSL server for themes (default: SSL server)."
 msgstr "SSL 主题服务器（默认：SSL 服务器）。"
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:306 actions/pathsadminpanel.php:397
-#: actions/pathsadminpanel.php:452
 msgid "SSL path"
 msgstr "SSL 路径"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:308
 msgid "SSL path to themes (default: /theme/)."
 msgstr "SSL 主题路径（默认：/theme/）。"
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:315 actions/pathsadminpanel.php:406
-#: actions/pathsadminpanel.php:461
 msgid "Directory"
 msgstr "目录"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:317
 msgid "Directory where themes are located."
 msgstr "主题文件的目录。"
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:326
 msgid "Avatars"
 msgstr "头像"
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:333
 msgid "Avatar server"
 msgstr "头像服务器"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:335
 msgid "Server for avatars."
 msgstr "头像服务器。"
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:342
 msgid "Avatar path"
 msgstr "头像路径"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:344
 msgid "Web path to avatars."
 msgstr "头像的网站路径。"
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:351
 msgid "Avatar directory"
 msgstr "头像目录"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:353
 msgid "Directory where avatars are located."
 msgstr "头像文件的目录。"
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:364
 msgid "Backgrounds"
 msgstr "背景"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:372
 msgid "Server for backgrounds."
 msgstr "背景服务器。"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:381
 msgid "Web path to backgrounds."
 msgstr "背景的网站路径。"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:390
 msgid "Server for backgrounds on SSL pages."
 msgstr "SSL 页面的背景服务器。"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:399
 msgid "Web path to backgrounds on SSL pages."
 msgstr "SSL 页面的背景网站路径。"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:408
 msgid "Directory where backgrounds are located."
 msgstr "背景文件的目录。"
 
 #. TRANS: Fieldset legens in Paths admin panel.
-#: actions/pathsadminpanel.php:419
 msgid "Attachments"
 msgstr "附件"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:427
 msgid "Server for attachments."
 msgstr "附件服务器。"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:436
 msgid "Web path to attachments."
 msgstr "附件的网站路径。"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:445
 msgid "Server for attachments on SSL pages."
 msgstr "SSL 页面的附件服务器。"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:454
 msgid "Web path to attachments on SSL pages."
 msgstr "SSL 页面的附件网站路径。"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:463
 msgid "Directory where attachments are located."
 msgstr "附件文件的目录。"
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:472
 msgid "SSL"
 msgstr "SSL"
 
 #. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
-#: actions/pathsadminpanel.php:477 actions/snapshotadminpanel.php:202
 msgid "Never"
 msgstr "从不"
 
 #. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
-#: actions/pathsadminpanel.php:479
 msgid "Sometimes"
 msgstr "有时"
 
 #. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
-#: actions/pathsadminpanel.php:481
 msgid "Always"
 msgstr "总是"
 
-#: actions/pathsadminpanel.php:485
 msgid "Use SSL"
 msgstr "使用 SSL"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:487
 msgid "When to use SSL."
 msgstr "什么时候使用 SSL"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:497
 msgid "Server to direct SSL requests to."
 msgstr "直接SSL请求的服务器"
 
 #. TRANS: Button title text to store form data in the Paths admin panel.
-#: actions/pathsadminpanel.php:514
 msgid "Save paths"
 msgstr "保存路径"
 
 #. TRANS: Instructions for the "People search" page.
 #. TRANS: %%site.name%% is the name of the StatusNet site.
-#: actions/peoplesearch.php:54
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
@@ -4354,57 +3567,46 @@ msgstr ""
 "个搜索条件用空格分隔。"
 
 #. TRANS: Title of a page where users can search for other users.
-#: actions/peoplesearch.php:61
 msgid "People search"
 msgstr "搜索用户"
 
-#: actions/peopletag.php:68
 #, php-format
 msgid "Not a valid people tag: %s."
 msgstr "不是有效的标签：%s。"
 
-#: actions/peopletag.php:142
 #, php-format
 msgid "Users self-tagged with %1$s - page %2$d"
 msgstr "用户自加标签%s - 第%d 页"
 
 #. TRANS: Page title for AJAX form return when a disabling a plugin.
-#: actions/plugindisable.php:69
 msgctxt "plugin"
 msgid "Disabled"
 msgstr ""
 
 #. TRANS: Client error displayed trying to perform any request method other than POST.
 #. TRANS: Do not translate POST.
-#: actions/pluginenable.php:78 actions/subscribe.php:77
 msgid "This action only accepts POST requests."
 msgstr "这个动作只接受 POST 请求"
 
-#: actions/pluginenable.php:102
 #, fuzzy
 msgid "You cannot administer plugins."
 msgstr "你不能删除用户。"
 
-#: actions/pluginenable.php:109
 #, fuzzy
 msgid "No such plugin."
 msgstr "没有这个页面。"
 
 #. TRANS: Page title for AJAX form return when enabling a plugin.
-#: actions/pluginenable.php:159
 msgctxt "plugin"
 msgid "Enabled"
 msgstr ""
 
 #. TRANS: Tab and title for plugins admin panel.
 #. TRANS: Menu item for site administration
-#: actions/pluginsadminpanel.php:56 actions/version.php:191
-#: lib/adminpanelaction.php:411
 msgid "Plugins"
 msgstr "插件"
 
 #. TRANS: Instructions at top of plugin admin page.
-#: actions/pluginsadminpanel.php:68
 msgid ""
 "Additional plugins can be enabled and configured manually. See the <a href="
 "\"http://status.net/wiki/Plugins\">online plugin documentation</a> for more "
@@ -4412,109 +3614,85 @@ msgid ""
 msgstr ""
 
 #. TRANS: Admin form section header
-#: actions/pluginsadminpanel.php:84
 #, fuzzy
 msgid "Default plugins"
 msgstr "默认语言"
 
-#: actions/pluginsadminpanel.php:106
 msgid ""
 "All default plugins have been disabled from the site's configuration file."
 msgstr ""
 
-#: actions/postnotice.php:95
 msgid "Invalid notice content."
 msgstr "无效的消息内容。"
 
-#: actions/postnotice.php:101
 #, php-format
 msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’."
 msgstr "消息许可证“%1$s”与这个网站的许可证“%2$s”不兼容。"
 
 #. TRANS: Page title for profile settings.
-#: actions/profilesettings.php:60
 msgid "Profile settings"
 msgstr "个人设置"
 
 #. TRANS: Usage instructions for profile settings.
-#: actions/profilesettings.php:71
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr "在这里更新个人信息，让大家对你了解得更多。"
 
 #. TRANS: Profile settings form legend.
-#: actions/profilesettings.php:99
 msgid "Profile information"
 msgstr "个人信息"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:110 actions/register.php:412
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr "1 到 64 个小写字母或数字，不包含标点或空格。"
 
 #. TRANS: Field label in form for profile settings.
-#: actions/profilesettings.php:114 actions/register.php:434
-#: lib/groupeditform.php:150
 msgid "Full name"
 msgstr "全名"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:119 actions/register.php:439
-#: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "主页"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:122 actions/register.php:441
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr "你的主页、博客或在其他网站的URL。"
 
 #. TRANS: Tooltip for field label in form for profile settings. Plural
 #. TRANS: is decided by the number of characters available for the
 #. TRANS: biography (%d).
-#: actions/profilesettings.php:130 actions/register.php:450
 #, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
 msgstr[0] "用不超过%d个字符描述你自己和你的兴趣"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:136 actions/register.php:455
 msgid "Describe yourself and your interests"
 msgstr "描述你自己和你的兴趣"
 
 #. TRANS: Text area label in form for profile settings where users can provide.
 #. TRANS: their biography.
-#: actions/profilesettings.php:140 actions/register.php:457
 msgid "Bio"
 msgstr "自述"
 
 #. TRANS: Field label in form for profile settings.
-#: actions/profilesettings.php:146 actions/register.php:462
-#: lib/groupeditform.php:173
 msgid "Location"
 msgstr "位置"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:149
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "你的地理位置，格式类似\"城市，省份，国家\""
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:154
 msgid "Share my current location when posting notices"
 msgstr "当发布消息时分享我的地理位置"
 
 #. TRANS: Field label in form for profile settings.
-#: actions/profilesettings.php:162 actions/tagother.php:128
-#: actions/tagother.php:188 lib/subscriptionlist.php:104
-#: lib/subscriptionlist.php:106
 msgid "Tags"
 msgstr "标签"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:165
 #, fuzzy
 msgid ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- "
@@ -4522,27 +3700,22 @@ msgid ""
 msgstr "你的标签 (字母、数字、“-”、“. ”和“ _”)， 以逗号或空格分隔"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:170
 msgid "Language"
 msgstr "语言"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:172
 msgid "Preferred language."
 msgstr "首选的语言。"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:182
 msgid "Timezone"
 msgstr "时区"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:184
 msgid "What timezone are you normally in?"
 msgstr "你一般处于哪个时区？"
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:190
 msgid ""
 "Automatically subscribe to whoever subscribes to me (best for non-humans)."
 msgstr "自动关注任何关注我的人（这个选项适合机器人）"
@@ -4550,105 +3723,85 @@ msgstr "自动关注任何关注我的人（这个选项适合机器人）"
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Plural form is used based on the maximum number of allowed
 #. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:259 actions/register.php:214
 #, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
 msgstr[0] "自述过长(不能超过%d个字符)。"
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:270 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr "未选择时区。"
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:278
 msgid "Language is too long (maximum 50 characters)."
 msgstr "语言过长(不能超过50个字符)。"
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:292
 #, php-format
 msgid "Invalid tag: \"%s\"."
 msgstr "无效的标记： %s。"
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:348
 msgid "Could not update user for autosubscribe."
 msgstr "无法更新用户的自动关注。"
 
 #. TRANS: Server error thrown when user profile location preference settings could not be updated.
-#: actions/profilesettings.php:406
 msgid "Could not save location prefs."
 msgstr "无法保存位置设置。"
 
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:428 actions/tagother.php:179
 msgid "Could not save tags."
 msgstr "无法保存标签。"
 
 #. TRANS: Confirmation shown when user profile settings are saved.
 #. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:437 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "设置已保存。"
 
 #. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
 #. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:484 actions/restoreaccount.php:60
 msgid "Restore account"
 msgstr "还原账户"
 
-#: actions/public.php:83
 #, php-format
 msgid "Beyond the page limit (%s)."
 msgstr "超出页面限制(%s)。"
 
-#: actions/public.php:92
 msgid "Could not retrieve public stream."
 msgstr "无法获取到公共的时间线。"
 
-#: actions/public.php:130
 #, php-format
 msgid "Public timeline, page %d"
 msgstr "公共时间线，第%d页"
 
-#: actions/public.php:132 lib/publicgroupnav.php:79
 msgid "Public timeline"
 msgstr "公共时间线"
 
-#: actions/public.php:160
 msgid "Public Stream Feed (RSS 1.0)"
 msgstr "公开的 RSS 聚合 (RSS 1.0)"
 
-#: actions/public.php:164
 msgid "Public Stream Feed (RSS 2.0)"
 msgstr "公开的 RSS 聚合 (RSS 2.0)"
 
-#: actions/public.php:168
 msgid "Public Stream Feed (Atom)"
 msgstr "公开的 RSS 聚合 (Atom)"
 
-#: actions/public.php:188
 #, php-format
 msgid ""
 "This is the public timeline for %%site.name%% but no one has posted anything "
 "yet."
 msgstr "这是%%site.name%%的公共时间线，但是还没有人发布任何内容。"
 
-#: actions/public.php:191
 msgid "Be the first to post!"
 msgstr "成为第一个发布消息的人！"
 
-#: actions/public.php:195
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post!"
 msgstr "现在就 [注册](%%action.register%%) 并成为第一个发布消息的人！"
 
-#: actions/public.php:242
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -4661,7 +3814,6 @@ msgstr ""
 "务。[现在加入](%%action.register%%) 并与你的朋友、家人和同事们一起分享你的消"
 "息。([查看更多](%%doc.help%%))"
 
-#: actions/public.php:247
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -4672,19 +3824,16 @@ msgstr ""
 "客](http://zh.wikipedia.org/zh-hans/%E5%BE%AE%E5%8D%9A%E5%AE%A2) 。"
 
 #. TRANS: Public RSS feed description. %s is the StatusNet site name.
-#: actions/publicrss.php:106
 #, fuzzy, php-format
 msgid "%s updates from everyone."
 msgstr "%s条来自所有人的消息！"
 
 #. TRANS: Title for public tag cloud.
-#: actions/publictagcloud.php:57
 msgid "Public tag cloud"
 msgstr "公开的标签云"
 
 #. TRANS: Instructions (more used like an explanation/header).
 #. TRANS: %s is the StatusNet sitename.
-#: actions/publictagcloud.php:65
 #, php-format
 msgid "These are most popular recent tags on %s"
 msgstr "这些是%s最近的流行的标签"
@@ -4692,14 +3841,12 @@ msgstr "这些是%s最近的流行的标签"
 #. TRANS: This message contains a Markdown URL. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.
-#: actions/publictagcloud.php:74
 #, php-format
 msgid "No one has posted a notice with a [hashtag](%%doc.tags%%) yet."
 msgstr "还没有人发布带[标签](%%doc.tags%%)的消息。"
 
 #. 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.
-#: actions/publictagcloud.php:79
 msgid "Be the first to post one!"
 msgstr "成为第一个发布消息的人！"
 
@@ -4708,7 +3855,6 @@ msgstr "成为第一个发布消息的人！"
 #. TRANS: This message contains a Markdown URL. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.
-#: actions/publictagcloud.php:87
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post "
@@ -4716,255 +3862,203 @@ msgid ""
 msgstr "现在就[注册](%%action.register%%)并发布第一个！"
 
 #. TRANS: Client error displayed trying to recover password while already logged in.
-#: actions/recoverpassword.php:37
 msgid "You are already logged in!"
 msgstr "你已经登录了！"
 
 #. TRANS: Client error displayed when password recovery code is not correct.
-#: actions/recoverpassword.php:64
 msgid "No such recovery code."
 msgstr "没有这个恢复码。"
 
 #. TRANS: Client error displayed when no proper password recovery code was submitted.
-#: actions/recoverpassword.php:69
 msgid "Not a recovery code."
 msgstr "不是恢复码。"
 
 #. TRANS: Server error displayed trying to recover password without providing a user.
-#: actions/recoverpassword.php:77
 msgid "Recovery code for unknown user."
 msgstr "未知用户的恢复码"
 
 #. TRANS: Server error displayed removing a password recovery code from the database.
-#: actions/recoverpassword.php:91
 msgid "Error with confirmation code."
 msgstr "验证码出错。"
 
 #. TRANS: Client error displayed trying to recover password with too old a recovery code.
-#: actions/recoverpassword.php:103
 msgid "This confirmation code is too old. Please start again."
 msgstr "验证码已过期，请重来。"
 
 #. TRANS: Server error displayed when updating a user's e-mail address in the database fails while recovering a password.
-#: actions/recoverpassword.php:118
 msgid "Could not update user with confirmed email address."
 msgstr "无法更新已确认的电子邮件。"
 
 #. TRANS: Page notice for password recovery page.
-#: actions/recoverpassword.php:160
 msgid ""
 "If you have forgotten or lost your password, you can get a new one sent to "
 "the email address you have stored in your account."
 msgstr "如果你忘记或丢失了密码，你可以发送一个新的密码到你之前设置的邮箱中。"
 
-#: actions/recoverpassword.php:167
 msgid "You have been identified. Enter a new password below."
 msgstr "你的身份已被验证，请在下面输入新的密码。"
 
 #. TRANS: Fieldset legend for password recovery page.
-#: actions/recoverpassword.php:198
 msgid "Password recovery"
 msgstr "恢复密码"
 
 #. TRANS: Field label on password recovery page.
-#: actions/recoverpassword.php:202
 msgid "Nickname or email address"
 msgstr "昵称或电子邮件"
 
 #. TRANS: Title for field label on password recovery page.
-#: actions/recoverpassword.php:205
 msgid "Your nickname on this server, or your registered email address."
 msgstr "你在此服务器的昵称，或登记的邮箱。"
 
 #. TRANS: Field label on password recovery page.
-#: actions/recoverpassword.php:212
 msgid "Recover"
 msgstr "恢复"
 
 #. TRANS: Button text on password recovery page.
-#: actions/recoverpassword.php:214
 msgctxt "BUTTON"
 msgid "Recover"
 msgstr "恢复"
 
 #. TRANS: Title for password recovery page in password reset mode.
-#: actions/recoverpassword.php:223
 msgid "Reset password"
 msgstr "重置密码"
 
 #. TRANS: Title for password recovery page in password recover mode.
-#: actions/recoverpassword.php:225
 msgid "Recover password"
 msgstr "恢复密码"
 
 #. TRANS: Title for password recovery page in email sent mode.
 #. TRANS: Subject for password recovery e-mail.
-#: actions/recoverpassword.php:227 actions/recoverpassword.php:366
 msgid "Password recovery requested"
 msgstr "已请求密码恢复"
 
 #. TRANS: Title for password recovery page in password saved mode.
-#: actions/recoverpassword.php:229
 msgid "Password saved"
 msgstr "密码已保存。"
 
 #. TRANS: Title for password recovery page when an unknown action has been specified.
-#: actions/recoverpassword.php:232
 msgid "Unknown action"
 msgstr "未知动作"
 
 #. TRANS: Title for field label for password reset form.
-#: actions/recoverpassword.php:258
 msgid "6 or more characters, and do not forget it!"
 msgstr "至少6个字符，还有，别忘记它！"
 
 #. TRANS: Button text for password reset form.
 #. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: actions/recoverpassword.php:268 lib/designform.php:145
 msgctxt "BUTTON"
 msgid "Reset"
 msgstr "重置"
 
 #. TRANS: Form instructions for password recovery form.
-#: actions/recoverpassword.php:278
 msgid "Enter a nickname or email address."
 msgstr "输入昵称或电子邮件。"
 
 #. TRANS: Information on password recovery form if no known username or e-mail address was specified.
-#: actions/recoverpassword.php:309
 msgid "No user with that email address or username."
 msgstr "没有拥有这个用户名或电子邮件的用户。"
 
 #. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
-#: actions/recoverpassword.php:327
 msgid "No registered email address for that user."
 msgstr "该用户没有登记电子邮件。"
 
 #. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
-#: actions/recoverpassword.php:342
 msgid "Error saving address confirmation."
 msgstr "保存地址确认时出错。"
 
 #. TRANS: User notification after an e-mail with instructions was sent from the password recovery form.
-#: actions/recoverpassword.php:370
 msgid ""
 "Instructions for recovering your password have been sent to the email "
 "address registered to your account."
 msgstr "恢复密码的说明已被发送到你登记的电子邮箱中。"
 
 #. TRANS: Client error displayed when trying to reset as password without providing a user.
-#: actions/recoverpassword.php:391
 msgid "Unexpected password reset."
 msgstr "未预料的密码重置。"
 
 #. TRANS: Reset password form validation error message.
-#: actions/recoverpassword.php:400
 msgid "Password must be 6 characters or more."
 msgstr "密码必须是 6 位或更多字符。"
 
 #. TRANS: Reset password form validation error message.
-#: actions/recoverpassword.php:405
 msgid "Password and confirmation do not match."
 msgstr "密码和确认密码不匹配。"
 
 #. TRANS: Server error displayed when something does wrong with the user object during password reset.
-#: actions/recoverpassword.php:426 actions/register.php:241
 msgid "Error setting user."
 msgstr "保存用户设置时出错。"
 
 #. TRANS: Success message for user after password reset.
-#: actions/recoverpassword.php:434
 msgid "New password successfully saved. You are now logged in."
 msgstr "新密码已保存，你现在已登录。"
 
-#: actions/redirecturl.php:70
 #, fuzzy
 msgid "No id parameter"
 msgstr "没有 ID 冲突。"
 
-#: actions/redirecturl.php:76
 #, fuzzy, php-format
 msgid "No such file \"%d\""
 msgstr "没有这个文件。"
 
-#: actions/register.php:80 actions/register.php:181 actions/register.php:392
 msgid "Sorry, only invited people can register."
 msgstr "对不起，只有被邀请的用户才能注册。"
 
-#: actions/register.php:87
 msgid "Sorry, invalid invitation code."
 msgstr "对不起，无效的邀请码。"
 
-#: actions/register.php:106
 msgid "Registration successful"
 msgstr "注册成功"
 
-#: actions/register.php:108 actions/register.php:490
 msgid "Register"
 msgstr "注册"
 
-#: actions/register.php:128
 msgid "Registration not allowed."
 msgstr "不允许注册。"
 
-#: actions/register.php:194
 msgid "You cannot register if you don't agree to the license."
 msgstr "如果您不同意该许可，您不能注册。"
 
-#: actions/register.php:203
 msgid "Email address already exists."
 msgstr "电子邮件地址已存在。"
 
-#: actions/register.php:236 actions/register.php:258
 msgid "Invalid username or password."
 msgstr "用户名或密码不正确。"
 
-#: actions/register.php:333
 msgid ""
 "With this form you can create a new account. You can then post notices and "
 "link up to friends and colleagues."
 msgstr "使用此窗体可以创建一个新的帐户。然后可以张贴告示及链接到的朋友和同事。"
 
-#: actions/register.php:424 actions/register.php:428
-#: actions/siteadminpanel.php:238 lib/settingsnav.php:92
 msgid "Email"
 msgstr "电子邮件"
 
-#: actions/register.php:425 actions/register.php:429
 msgid "Used only for updates, announcements, and password recovery."
 msgstr "仅用于更新、 公告及密码恢复。"
 
-#: actions/register.php:436
 msgid "Longer name, preferably your \"real\" name."
 msgstr "你最好是\"真正的\"的名字的长名称技术。"
 
-#: actions/register.php:464
 msgid "Where you are, like \"City, State (or Region), Country\"."
 msgstr "你在哪里，像\"城市、 国家（或地区）、国家\"。"
 
-#: actions/register.php:503
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
 msgstr "我明白%1$s的信息是私人且保密的。"
 
-#: actions/register.php:513
 #, php-format
 msgid "My text and files are copyright by %1$s."
 msgstr "我的文字和文件的版权归%1$s所有。"
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:517
 msgid "My text and files remain under my own copyright."
 msgstr "我的文字和文件的版权由我自己保留。"
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:520
 msgid "All rights reserved."
 msgstr "保留所有权利。"
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:525
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -4973,7 +4067,6 @@ msgstr ""
 "我的文字和文件在%s下提供，除了如下隐私内容：密码、电子邮件地址、IM 地址和电话"
 "号码。"
 
-#: actions/register.php:566
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -5003,13 +4096,11 @@ msgstr ""
 "\n"
 "感谢你的注册，希望你喜欢这个服务。"
 
-#: actions/register.php:590
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
 msgstr "(你将收到一封邮件，包含了如何确认邮件地址的说明。)"
 
-#: actions/remotesubscribe.php:97
 #, php-format
 msgid ""
 "To subscribe, you can [login](%%action.login%%), or [register](%%action."
@@ -5020,112 +4111,86 @@ msgstr ""
 "%) 一个新账户。如果你已经在另一个[兼容的微博客](%%doc.openmublog%%)有账户，请"
 "填入你的资料页 URL。"
 
-#: actions/remotesubscribe.php:111
 msgid "Remote subscribe"
 msgstr "远程关注"
 
-#: actions/remotesubscribe.php:123
 msgid "Subscribe to a remote user"
 msgstr "关注一个远程用户"
 
-#: actions/remotesubscribe.php:128
 msgid "User nickname"
 msgstr "昵称"
 
-#: actions/remotesubscribe.php:129
 msgid "Nickname of the user you want to follow."
 msgstr "您要执行的用户的别名。"
 
-#: actions/remotesubscribe.php:132
 msgid "Profile URL"
 msgstr "资料页 URL"
 
-#: actions/remotesubscribe.php:133
 msgid "URL of your profile on another compatible microblogging service."
 msgstr "另一种兼容的微博客服务配置文件的 URL。"
 
 #. TRANS: Link text for link that will subscribe to a remote profile.
-#: actions/remotesubscribe.php:136 lib/subscribeform.php:139
-#: lib/userprofile.php:402
 msgid "Subscribe"
 msgstr "关注"
 
-#: actions/remotesubscribe.php:158
 #, fuzzy
 msgid "Invalid profile URL (bad format)."
 msgstr "无效的用户 URL (格式错误)"
 
-#: actions/remotesubscribe.php:167
 msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
 msgstr "不是有效的资料页 URL (没有YADIS 文档或定义了无效的 XRDS)。"
 
-#: actions/remotesubscribe.php:175
 msgid "That is a local profile! Login to subscribe."
 msgstr "这是一个本地用户！请登录以关注。"
 
-#: actions/remotesubscribe.php:182
 msgid "Could not get a request token."
 msgstr "无法获得一个 request token。"
 
-#: actions/repeat.php:56
 msgid "Only logged-in users can repeat notices."
 msgstr "只有登录的用户才能重复发消息。"
 
-#: actions/repeat.php:63 actions/repeat.php:70
 msgid "No notice specified."
 msgstr "没有指定的消息。"
 
-#: actions/repeat.php:75
 msgid "You cannot repeat your own notice."
 msgstr "你不能重复自己的消息。"
 
-#: actions/repeat.php:89
 msgid "You already repeated that notice."
 msgstr "你已转发过了那个消息。"
 
-#: actions/repeat.php:112 lib/noticelist.php:697
 msgid "Repeated"
 msgstr "已转发"
 
-#: actions/repeat.php:117
 msgid "Repeated!"
 msgstr "已转发！"
 
 #. TRANS: RSS reply feed title. %s is a user nickname.
-#: actions/replies.php:126 actions/repliesrss.php:68
-#: lib/personalgroupnav.php:105
 #, php-format
 msgid "Replies to %s"
 msgstr "对 %s 的回复"
 
-#: actions/replies.php:128
 #, php-format
 msgid "Replies to %1$s, page %2$d"
 msgstr "对%s的回复，第%2$d页"
 
-#: actions/replies.php:145
 #, php-format
 msgid "Replies feed for %s (RSS 1.0)"
 msgstr "%s 的回复聚合 (RSS 1.0)"
 
-#: actions/replies.php:152
 #, php-format
 msgid "Replies feed for %s (RSS 2.0)"
 msgstr "%s 的回复聚合 (RSS 2.0)"
 
-#: actions/replies.php:159
 #, php-format
 msgid "Replies feed for %s (Atom)"
 msgstr "%s 的回复聚合 (Atom)"
 
-#: actions/replies.php:199
 #, php-format
 msgid ""
 "This is the timeline showing replies to %1$s but %2$s hasn't received a "
 "notice to them yet."
 msgstr "这里显示了所有发送@给%s的信息，但是%2$s还没有收到任何人的消息。"
 
-#: actions/replies.php:204
 #, php-format
 msgid ""
 "You can engage other users in a conversation, subscribe to more people or "
@@ -5133,7 +4198,6 @@ msgid ""
 msgstr ""
 "你可以让其他用户参与对话，关注更多的人或者 [加入小组](%%action.groups%%)。"
 
-#: actions/replies.php:206
 #, php-format
 msgid ""
 "You can try to [nudge %1$s](../%2$s) or [post something to them](%%%%action."
@@ -5144,85 +4208,70 @@ msgstr ""
 
 #. TRANS: RSS reply feed description.
 #. TRANS: %1$s is a user nickname, %2$s is the StatusNet site name.
-#: actions/repliesrss.php:74
 #, fuzzy, php-format
 msgid "Replies to %1$s on %2$s."
 msgstr "在%2$s上对%1$s的回复!"
 
 #. TRANS: Client exception displayed when trying to restore an account while not logged in.
-#: actions/restoreaccount.php:78
 msgid "Only logged-in users can restore their account."
 msgstr "只有登录的用户才能恢复帐号。"
 
 #. TRANS: Client exception displayed when trying to restore an account without having restore rights.
-#: actions/restoreaccount.php:83
 msgid "You may not restore your account."
 msgstr "您不能恢复您的帐户。"
 
 #. TRANS: Client exception displayed trying to restore an account while something went wrong uploading a file.
 #. TRANS: Client exception. No file; probably just a non-AJAX submission.
-#: actions/restoreaccount.php:121 actions/restoreaccount.php:146
 msgid "No uploaded file."
 msgstr "没有上传文件。"
 
 #. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
-#: actions/restoreaccount.php:129 lib/mediafile.php:194
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
 msgstr "上传文件大小超过了 php.ini 中 upload_max_filesize 的设置限制。"
 
 #. TRANS: Client exception.
-#: actions/restoreaccount.php:135 lib/mediafile.php:200
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form."
 msgstr "上传文件大小超过了 HTML 表单中 MAX_FILE_SIZE 的设置限制。"
 
 #. TRANS: Client exception.
-#: actions/restoreaccount.php:141 lib/mediafile.php:206
 msgid "The uploaded file was only partially uploaded."
 msgstr "上传的文件只有部分被上传。"
 
 #. TRANS: Client exception thrown when a temporary folder is not present to store a file upload.
-#: actions/restoreaccount.php:150 lib/mediafile.php:214
 msgid "Missing a temporary folder."
 msgstr "缺少一个临时文件夹。"
 
 #. TRANS: Client exception thrown when writing to disk is not possible during a file upload operation.
-#: actions/restoreaccount.php:154 lib/mediafile.php:218
 msgid "Failed to write file to disk."
 msgstr "写入磁盘失败。"
 
 #. TRANS: Client exception thrown when a file upload operation has been stopped by an extension.
-#: actions/restoreaccount.php:158 lib/mediafile.php:222
 msgid "File upload stopped by extension."
 msgstr "文件上传被扩展停止了。"
 
 #. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
 #. TRANS: Exception thrown when uploading an image fails for an unknown reason.
 #. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
-#: actions/restoreaccount.php:164 lib/imagefile.php:106 lib/mediafile.php:228
 msgid "System error uploading file."
 msgstr "上传文件时出错。"
 
 #. TRANS: Client exception thrown when a feed is not an Atom feed.
-#: actions/restoreaccount.php:207
 msgid "Not an Atom feed."
 msgstr "不是一个Atom源"
 
 #. TRANS: Success message when a feed has been restored.
-#: actions/restoreaccount.php:241
 msgid ""
 "Feed has been restored. Your old posts should now appear in search and your "
 "profile page."
 msgstr "订阅源已恢复。您以前的帖子现在应已显示在搜索和您的资料页里。"
 
 #. TRANS: Message when a feed restore is in progress.
-#: actions/restoreaccount.php:245
 msgid "Feed will be restored. Please wait a few minutes for results."
 msgstr "将还原订阅源。请等待几分钟。"
 
 #. TRANS: Form instructions for feed restore.
-#: actions/restoreaccount.php:342
 msgid ""
 "You can upload a backed-up stream in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format."
@@ -5231,133 +4280,107 @@ msgstr ""
 "备份的流"
 
 #. TRANS: Title for submit button to confirm upload of a user backup file for account restore.
-#: actions/restoreaccount.php:373
 msgid "Upload the file"
 msgstr "上传文件"
 
-#: actions/revokerole.php:75
 msgid "You cannot revoke user roles on this site."
 msgstr "你不能在这个网站移除用户角色。"
 
-#: actions/revokerole.php:82
 msgid "User doesn't have this role."
 msgstr "用户没有此权限。"
 
-#: actions/rsd.php:142 actions/version.php:159
 msgid "StatusNet"
 msgstr "StatusNet"
 
-#: actions/sandbox.php:65 actions/unsandbox.php:65
 msgid "You cannot sandbox users on this site."
 msgstr "你不能在这个网站授予用户权限。"
 
-#: actions/sandbox.php:72
 msgid "User is already sandboxed."
 msgstr "用于已经在沙盒中了。"
 
 #. TRANS: Menu item for site administration
-#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
-#: lib/adminpanelaction.php:379
 msgid "Sessions"
 msgstr "Sessions"
 
-#: actions/sessionsadminpanel.php:65
 msgid "Session settings for this StatusNet site"
 msgstr "这个 StatusNet 网站的 session 设置"
 
-#: actions/sessionsadminpanel.php:175
 msgid "Handle sessions"
 msgstr "管理 sessions"
 
-#: actions/sessionsadminpanel.php:177
 msgid "Whether to handle sessions ourselves."
 msgstr "是否自己处理sessions。"
 
-#: actions/sessionsadminpanel.php:181
 msgid "Session debugging"
 msgstr "Session 调试"
 
-#: actions/sessionsadminpanel.php:183
 msgid "Turn on debugging output for sessions."
 msgstr "打开 sessions 的调试输出。"
 
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
+#. TRANS: Submit button title.
+msgid "Save"
+msgstr "保存"
+
 msgid "Save site settings"
 msgstr "保存访问设置"
 
-#: actions/showapplication.php:78
 msgid "You must be logged in to view an application."
 msgstr "你必须登录才能创建小组。"
 
-#: actions/showapplication.php:151
 msgid "Application profile"
 msgstr "未找到应用。"
 
-#: actions/showapplication.php:179
 #, php-format
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr "由%1$s创建 - 默认访问权限%2$s - %3$d个用户"
 
-#: actions/showapplication.php:189
 msgid "Application actions"
 msgstr "应用程序动作"
 
-#: actions/showapplication.php:212
 msgid "Reset key & secret"
 msgstr "重置key和secret"
 
 #. TRANS: Title of form for deleting a user.
-#: actions/showapplication.php:228 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:64 lib/noticelist.php:678
 msgid "Delete"
 msgstr "删除"
 
-#: actions/showapplication.php:237
 msgid "Application info"
 msgstr "应用程序信息"
 
-#: actions/showapplication.php:255
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
 msgstr "提示：我们支持HMAC-SHA1签名。我们不支持明文的签名方法。"
 
-#: actions/showapplication.php:275
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr "你确定要重置你的consumer key和secret吗？"
 
 #. TRANS: Title for all but the first page of favourite notices of a user.
 #. TRANS: %1$s is the user for whom the favourite notices are displayed, %2$d is the page number.
-#: actions/showfavorites.php:80
 #, php-format
 msgid "%1$s's favorite notices, page %2$d"
 msgstr "%1$s收藏的消息，第%2$d页"
 
 #. TRANS: Server error displayed when favourite notices could not be retrieved from the database.
-#: actions/showfavorites.php:134
 msgid "Could not retrieve favorite notices."
 msgstr "无法获取收藏的消息。"
 
 #. TRANS: Feed link text. %s is a username.
-#: actions/showfavorites.php:172
 #, php-format
 msgid "Feed for favorites of %s (RSS 1.0)"
 msgstr "%s 好友的聚合"
 
 #. TRANS: Feed link text. %s is a username.
-#: actions/showfavorites.php:180
 #, php-format
 msgid "Feed for favorites of %s (RSS 2.0)"
 msgstr "%s 好友的聚合"
 
 #. TRANS: Feed link text. %s is a username.
-#: actions/showfavorites.php:188
 #, php-format
 msgid "Feed for favorites of %s (Atom)"
 msgstr "%s 好友的聚合"
 
 #. TRANS: Text displayed instead of favourite notices for the current logged in user that has no favourites.
-#: actions/showfavorites.php:209
 msgid ""
 "You haven't chosen any favorite notices yet. Click the fave button on "
 "notices you like to bookmark them for later or shed a spotlight on them."
@@ -5367,7 +4390,6 @@ msgstr ""
 
 #. TRANS: Text displayed instead of favourite notices for a user that has no favourites while logged in.
 #. TRANS: %s is a username.
-#: actions/showfavorites.php:213
 #, php-format
 msgid ""
 "%s hasn't added any favorite notices yet. Post something interesting they "
@@ -5377,7 +4399,6 @@ msgstr "%s还没有收藏任何的消息。发一些他/她可能会添加到收
 #. TRANS: Text displayed instead of favourite notices for a user that has no favourites while not logged in.
 #. TRANS: %s is a username, %%%%action.register%%%% is a link to the user registration page.
 #. TRANS: (link text)[link] is a Mark Down link.
-#: actions/showfavorites.php:220
 #, php-format
 msgid ""
 "%s hasn't added any favorite notices yet. Why not [register an account](%%%%"
@@ -5388,64 +4409,53 @@ msgstr ""
 "他/她可能会添加到收藏的有趣的消息吧 :)"
 
 #. TRANS: Page notice for show favourites page.
-#: actions/showfavorites.php:251
 msgid "This is a way to share what you like."
 msgstr "这是一种分享你喜欢的内容的方式。"
 
 #. TRANS: Page title for first group page. %s is a group name.
-#: actions/showgroup.php:75
 #, php-format
 msgid "%s group"
 msgstr "%s 小组"
 
 #. TRANS: Page title for any but first group page.
 #. TRANS: %1$s is a group name, $2$s is a page number.
-#: actions/showgroup.php:79
 #, php-format
 msgid "%1$s group, page %2$d"
 msgstr "%1$s小组，第%2$d页"
 
 #. TRANS: Label for group description or group note (dt). Text hidden by default.
-#: actions/showgroup.php:266
 msgid "Note"
 msgstr "注释"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:277 lib/groupeditform.php:180
 msgid "Aliases"
 msgstr "别名"
 
 #. TRANS: Group actions header (h2). Text hidden by default.
-#: actions/showgroup.php:294
 msgid "Group actions"
 msgstr "小组动作"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:338
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
 msgstr "%s小组的消息聚合 (RSS 1.0)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:345
 #, php-format
 msgid "Notice feed for %s group (RSS 2.0)"
 msgstr "%s小组的消息聚合 (RSS 2.0)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:352
 #, php-format
 msgid "Notice feed for %s group (Atom)"
 msgstr "%s小组的消息聚合 (Atom)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:358
 #, php-format
 msgid "FOAF for %s group"
 msgstr "%s 的发件箱"
 
 #. TRANS: Header for mini list of group members on a group page (h2).
-#: actions/showgroup.php:395
 msgid "Members"
 msgstr "小组成员"
 
@@ -5453,30 +4463,23 @@ msgstr "小组成员"
 #. TRANS: Text for user subscription statistics if the user has no subscriptions.
 #. TRANS: Text for user subscriber statistics if user has no subscribers.
 #. TRANS: Text for user user group membership statistics if user is not a member of any group.
-#: actions/showgroup.php:401 lib/profileaction.php:137
-#: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
-#: lib/subscriptionlist.php:123 lib/tagcloudsection.php:71
 msgid "(None)"
 msgstr "（无）"
 
 #. TRANS: Link to all group members from mini list of group members if group has more than n members.
-#: actions/showgroup.php:410
 msgid "All members"
 msgstr "所有成员"
 
 #. TRANS: Header for group statistics on a group page (h2).
 #. TRANS: H2 text for user statistics.
-#: actions/showgroup.php:441 lib/profileaction.php:205
 msgid "Statistics"
 msgstr "统计"
 
-#: actions/showgroup.php:444
 msgctxt "LABEL"
 msgid "Created"
 msgstr "已创建"
 
 #. TRANS: Label for member count in statistics on group page.
-#: actions/showgroup.php:449
 msgctxt "LABEL"
 msgid "Members"
 msgstr "成员"
@@ -5485,7 +4488,6 @@ msgstr "成员"
 #. TRANS: **%s** is the group alias, %%%%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).
-#: actions/showgroup.php:464
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5503,7 +4505,6 @@ 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: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
-#: actions/showgroup.php:474
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5517,99 +4518,83 @@ msgstr ""
 "趣的消息。"
 
 #. TRANS: Header for list of group administrators on a group page (h2).
-#: actions/showgroup.php:503
 msgid "Admins"
 msgstr "管理员"
 
 #. TRANS: Client error displayed requesting a single message that does not exist.
-#: actions/showmessage.php:76
 msgid "No such message."
 msgstr "未找到此消息。"
 
 #. TRANS: Client error displayed requesting a single direct message the requesting user was not a party in.
-#: actions/showmessage.php:86
 msgid "Only the sender and recipient may read this message."
 msgstr "只有发送和接受双方可以阅读此消息。"
 
 #. TRANS: Page title for single direct message display when viewing user is the sender.
 #. TRANS: %1$s is the addressed user's nickname, $2$s is a timestamp.
-#: actions/showmessage.php:105
 #, php-format
 msgid "Message to %1$s on %2$s"
 msgstr "发送给 %1$s 的 %2$s 消息"
 
 #. TRANS: Page title for single message display.
 #. TRANS: %1$s is the sending user's nickname, $2$s is a timestamp.
-#: actions/showmessage.php:113
 #, php-format
 msgid "Message from %1$s on %2$s"
 msgstr "来自 %1$s 的 %2$s 消息"
 
-#: actions/shownotice.php:90
 msgid "Notice deleted."
 msgstr "消息已删除"
 
 #. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
-#: actions/showstream.php:70
 #, php-format
 msgid "%1$s tagged %2$s"
 msgstr "%1$s 的标签 %2$s"
 
 #. TRANS: Page title showing tagged notices in one user's stream.
 #. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
-#: actions/showstream.php:74
 #, php-format
 msgid "%1$s tagged %2$s, page %3$d"
 msgstr "%1$s 的标签 %2$s，第%3$d页"
 
 #. TRANS: Extended page title showing tagged notices in one user's stream.
 #. TRANS: %1$s is the username, %2$d is the page number.
-#: actions/showstream.php:82
 #, php-format
 msgid "%1$s, page %2$d"
 msgstr "%1$s，第%2$d页"
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %1$s is a user nickname, %2$s is a hashtag.
-#: actions/showstream.php:127
 #, php-format
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
 msgstr "%1$s的有%2$s标签的消息聚合 (RSS 1.0)"
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.
-#: actions/showstream.php:136
 #, php-format
 msgid "Notice feed for %s (RSS 1.0)"
 msgstr "%s的消息聚合 (RSS 1.0)"
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.
-#: actions/showstream.php:145
 #, php-format
 msgid "Notice feed for %s (RSS 2.0)"
 msgstr "%s的消息聚合 (RSS 2.0)"
 
-#: actions/showstream.php:152
 #, php-format
 msgid "Notice feed for %s (Atom)"
 msgstr "%s的消息聚合 (Atom)"
 
 #. TRANS: Title for link to notice feed. FOAF stands for Friend of a Friend.
 #. TRANS: More information at http://www.foaf-project.org. %s is a user nickname.
-#: actions/showstream.php:159
 #, php-format
 msgid "FOAF for %s"
 msgstr "%s的FOAF"
 
 #. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
-#: actions/showstream.php:205
 #, php-format
 msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr "这是%1$s的时间线，但是%1$s还没有发布任何内容。"
 
 #. TRANS: Second sentence of empty list message for a stream for the user themselves.
-#: actions/showstream.php:211
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
@@ -5617,7 +4602,6 @@ msgstr "最近看到了什么有趣的消息了么？你还没有发布消息呢
 
 #. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:215
 #, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
@@ -5628,7 +4612,6 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:258
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5643,7 +4626,6 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:265
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5655,248 +4637,195 @@ msgstr ""
 "E5%BE%AE%E5%8D%9A%E5%AE%A2)。"
 
 #. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
-#: actions/showstream.php:322
 #, php-format
 msgid "Repeat of %s"
 msgstr "%s 的转发"
 
-#: actions/silence.php:65 actions/unsilence.php:65
 msgid "You cannot silence users on this site."
 msgstr "你不能在这个站点上将用户禁言。"
 
-#: actions/silence.php:72
 msgid "User is already silenced."
 msgstr "用户已经被禁言。"
 
-#: actions/siteadminpanel.php:69
 msgid "Basic settings for this StatusNet site"
 msgstr "这个 StatusNet 网站的基本设置"
 
-#: actions/siteadminpanel.php:133
 msgid "Site name must have non-zero length."
 msgstr "网站名称长度必须大于零。"
 
-#: actions/siteadminpanel.php:141
 msgid "You must have a valid contact email address."
 msgstr "你必须有一个有效的 email 地址。"
 
-#: actions/siteadminpanel.php:159
 #, php-format
 msgid "Unknown language \"%s\"."
 msgstr "未知的语言“%s”"
 
-#: actions/siteadminpanel.php:165
 msgid "Minimum text limit is 0 (unlimited)."
 msgstr "最短的文字限制为0（没有限制）。"
 
-#: actions/siteadminpanel.php:171
 msgid "Dupe limit must be one or more seconds."
 msgstr "防刷新限制至少要1秒或者更长。"
 
-#: actions/siteadminpanel.php:221
 msgid "General"
 msgstr "一般"
 
-#: actions/siteadminpanel.php:224
 msgid "Site name"
 msgstr "网站名称"
 
-#: actions/siteadminpanel.php:225
 msgid "The name of your site, like \"Yourcompany Microblog\""
 msgstr "你的网站名称，例如\\\"你公司网站的微博\\\""
 
-#: actions/siteadminpanel.php:229
 msgid "Brought by"
 msgstr "提供商"
 
-#: actions/siteadminpanel.php:230
 msgid "Text used for credits link in footer of each page"
 msgstr "用于每页页脚的 credits 链接文字"
 
-#: actions/siteadminpanel.php:234
 msgid "Brought by URL"
 msgstr "提供商 URL"
 
-#: actions/siteadminpanel.php:235
 msgid "URL used for credits link in footer of each page"
 msgstr "用于每页页脚的 credits URL"
 
-#: actions/siteadminpanel.php:239
 msgid "Contact email address for your site"
 msgstr "网站的联系我们电子邮件地址"
 
-#: actions/siteadminpanel.php:245
 msgid "Local"
 msgstr "本地"
 
-#: actions/siteadminpanel.php:256
 msgid "Default timezone"
 msgstr "默认时区"
 
-#: actions/siteadminpanel.php:257
 msgid "Default timezone for the site; usually UTC."
 msgstr "默认的网站时区；通常使用 UTC。"
 
-#: actions/siteadminpanel.php:262
 msgid "Default language"
 msgstr "默认语言"
 
-#: actions/siteadminpanel.php:263
 msgid "Site language when autodetection from browser settings is not available"
 msgstr "当从浏览器自动获取语言不可用时网站的语言"
 
-#: actions/siteadminpanel.php:271
 msgid "Limits"
 msgstr "限制"
 
-#: actions/siteadminpanel.php:274
 msgid "Text limit"
 msgstr "文字限制"
 
-#: actions/siteadminpanel.php:274
 msgid "Maximum number of characters for notices."
 msgstr "消息最长的字符数。"
 
-#: actions/siteadminpanel.php:278
 msgid "Dupe limit"
 msgstr "防刷新限制"
 
-#: actions/siteadminpanel.php:278
 msgid "How long users must wait (in seconds) to post the same thing again."
 msgstr "用户再次发布相同内容时需要等待的时间（秒）。"
 
 #. TRANS: Page title for site-wide notice tab in admin panel.
-#: actions/sitenoticeadminpanel.php:55
 msgid "Site Notice"
 msgstr "网站公告"
 
 #. TRANS: Instructions for site-wide notice tab in admin panel.
-#: actions/sitenoticeadminpanel.php:66
 msgid "Edit site-wide message"
 msgstr "编辑整个网站的公告"
 
 #. TRANS: Server error displayed when saving a site-wide notice was impossible.
-#: actions/sitenoticeadminpanel.php:101
 msgid "Unable to save site notice."
 msgstr "无法保存网站公告。"
 
 #. TRANS: Client error displayed when a site-wide notice was longer than allowed.
-#: actions/sitenoticeadminpanel.php:112
 msgid "Maximum length for the site-wide notice is 255 characters."
 msgstr "整个网站的公告最长限制为255字符。"
 
 #. TRANS: Label for site-wide notice text field in admin panel.
-#: actions/sitenoticeadminpanel.php:176
 msgid "Site notice text"
 msgstr "网站公告文字"
 
 #. TRANS: Tooltip for site-wide notice text field in admin panel.
-#: actions/sitenoticeadminpanel.php:179
 msgid "Site-wide notice text (255 characters maximum; HTML allowed)"
 msgstr "整个网站的公告文字（最长255字符；可使用HTML）"
 
 #. TRANS: Title for button to save site notice in admin panel.
-#: actions/sitenoticeadminpanel.php:201
 msgid "Save site notice."
 msgstr "保存网站公告。"
 
 #. TRANS: Title for SMS settings.
-#: actions/smssettings.php:56
 msgid "SMS settings"
 msgstr "SMS 设置"
 
 #. TRANS: SMS settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/smssettings.php:70
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr "你可以通过 %%site.name%% 的电子邮件接收SMS短信。"
 
 #. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
-#: actions/smssettings.php:92
 msgid "SMS is not available."
 msgstr "SMS 不可用。"
 
 #. TRANS: Form legend for SMS settings form.
-#: actions/smssettings.php:106
 msgid "SMS address"
 msgstr "SMS 地址"
 
 #. TRANS: Form guide in SMS settings form.
-#: actions/smssettings.php:115
 msgid "Current confirmed SMS-enabled phone number."
 msgstr "已确认的可以发送SMS短消息的电话号码。"
 
 #. TRANS: Form guide in IM settings form.
-#: actions/smssettings.php:128
 msgid "Awaiting confirmation on this phone number."
 msgstr "等待确认此电话号码。"
 
 #. TRANS: Field label for SMS address input in SMS settings form.
-#: actions/smssettings.php:137
 msgid "Confirmation code"
 msgstr "确认码"
 
 #. TRANS: Form field instructions in SMS settings form.
-#: actions/smssettings.php:139
 msgid "Enter the code you received on your phone."
 msgstr "输入手机收到的验证码。"
 
 #. TRANS: Button label to confirm SMS confirmation code in SMS settings.
-#: actions/smssettings.php:143
 msgctxt "BUTTON"
 msgid "Confirm"
 msgstr "确认"
 
 #. TRANS: Field label for SMS phone number input in SMS settings form.
-#: actions/smssettings.php:148
 msgid "SMS phone number"
 msgstr "SMS 电话号码"
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
-#: actions/smssettings.php:151
 msgid "Phone number, no punctuation or spaces, with area code."
 msgstr "电话号码、 没有标点或带区号的空格。"
 
 #. TRANS: Form legend for SMS preferences form.
-#: actions/smssettings.php:190
 msgid "SMS preferences"
 msgstr "SMS 偏好"
 
 #. TRANS: Checkbox label in SMS preferences form.
-#: actions/smssettings.php:196
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
 msgstr "通过SMS短信将消息发给我；我了解这样也许会给我带来不菲的开支。"
 
 #. TRANS: Confirmation message for successful SMS preferences save.
-#: actions/smssettings.php:307
 msgid "SMS preferences saved."
 msgstr "SMS设置已保存。"
 
 #. TRANS: Message given saving SMS phone number without having provided one.
-#: actions/smssettings.php:329
 msgid "No phone number."
 msgstr "没有电话号码。"
 
 #. TRANS: Message given saving SMS phone number without having selected a carrier.
-#: actions/smssettings.php:335
 msgid "No carrier selected."
 msgstr "未选择运营商。"
 
 #. TRANS: Message given saving SMS phone number that is already set.
-#: actions/smssettings.php:343
 msgid "That is already your phone number."
 msgstr "你已登记此电话号码。"
 
 #. TRANS: Message given saving SMS phone number that is already set for another user.
-#: actions/smssettings.php:347
 msgid "That phone number already belongs to another user."
 msgstr "这个电话号码属于另一个用户。"
 
 #. TRANS: Message given saving valid SMS phone number that is to be confirmed.
-#: actions/smssettings.php:375
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
 "for the code and instructions on how to use it."
@@ -5904,39 +4833,32 @@ msgstr ""
 "验证码已被发送到你新增的电话号码。请检查你的电话，找到验证码并按要求使用它。"
 
 #. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
-#: actions/smssettings.php:403
 msgid "That is the wrong confirmation number."
 msgstr "确认码错误。"
 
 #. TRANS: Message given after successfully canceling SMS phone number confirmation.
-#: actions/smssettings.php:417
 msgid "SMS confirmation cancelled."
 msgstr "SMS 验证已取消。"
 
 #. TRANS: Message given trying to remove an SMS phone number that is not
 #. TRANS: registered for the active user.
-#: actions/smssettings.php:437
 msgid "That is not your phone number."
 msgstr "这是他人的电话号码。"
 
 #. TRANS: Message given after successfully removing a registered SMS phone number.
-#: actions/smssettings.php:459
 msgid "The SMS phone number was removed."
 msgstr "SMS 电话号码已移除。"
 
 #. TRANS: Label for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:498
 msgid "Mobile carrier"
 msgstr "移动运营商"
 
 #. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:503
 msgid "Select a carrier"
 msgstr "选择运营商"
 
 #. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
 #. TRANS: %s is an administrative contact's e-mail address.
-#: actions/smssettings.php:512
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -5946,118 +4868,93 @@ msgstr ""
 "系 %s 以告知。"
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
-#: actions/smssettings.php:534
 msgid "No code entered."
 msgstr "没有输入的代码。"
 
 #. TRANS: Menu item for site administration
-#: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
-#: lib/adminpanelaction.php:395
 msgid "Snapshots"
 msgstr "快照"
 
-#: actions/snapshotadminpanel.php:65
 msgid "Manage snapshot configuration"
 msgstr "管理快照配置"
 
-#: actions/snapshotadminpanel.php:127
 msgid "Invalid snapshot run value."
 msgstr "无效的快照运行值。"
 
-#: actions/snapshotadminpanel.php:133
 msgid "Snapshot frequency must be a number."
 msgstr "快照频率必须是一个数字。"
 
-#: actions/snapshotadminpanel.php:144
 msgid "Invalid snapshot report URL."
 msgstr "无效的快照报告 URL。"
 
-#: actions/snapshotadminpanel.php:200
 msgid "Randomly during web hit"
 msgstr "被访问时随机"
 
-#: actions/snapshotadminpanel.php:201
 msgid "In a scheduled job"
 msgstr "按照计划的作业"
 
-#: actions/snapshotadminpanel.php:206
 msgid "Data snapshots"
 msgstr "数据快照"
 
-#: actions/snapshotadminpanel.php:208
 msgid "When to send statistical data to status.net servers"
 msgstr "什么时候将统计数据发送到 status.net 服务器"
 
-#: actions/snapshotadminpanel.php:217
 msgid "Frequency"
 msgstr "频率"
 
-#: actions/snapshotadminpanel.php:218
 msgid "Snapshots will be sent once every N web hits"
 msgstr "每第N次访问是发送快照"
 
-#: actions/snapshotadminpanel.php:226
 msgid "Report URL"
 msgstr "报告 URL"
 
-#: actions/snapshotadminpanel.php:227
 msgid "Snapshots will be sent to this URL"
 msgstr "快照将被发送到这个 URL"
 
-#: actions/snapshotadminpanel.php:248
 msgid "Save snapshot settings"
 msgstr "保存访问设置"
 
 #. TRANS: Client error displayed trying a change a subscription for a non-subscribed profile.
-#: actions/subedit.php:75
 msgid "You are not subscribed to that profile."
 msgstr "你没有关注这个用户"
 
 #. TRANS: Server error displayed when updating a subscription fails with a database error.
 #. TRANS: Exception thrown when a subscription could not be stored on the server.
-#: actions/subedit.php:89 classes/Subscription.php:141
 msgid "Could not save subscription."
 msgstr "无法保存关注。"
 
 #. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
-#: actions/subscribe.php:121
 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
 msgstr "你不能用这个操作关注一个 OMB 0.1 远程用户。"
 
 #. TRANS: Page title when subscription succeeded.
-#: actions/subscribe.php:149
 msgid "Subscribed"
 msgstr "已关注"
 
 #. TRANS: Header for list of subscribers for a user (first page).
 #. TRANS: %s is the user's nickname.
-#: actions/subscribers.php:51
 #, php-format
 msgid "%s subscribers"
 msgstr "%s的关注者"
 
 #. TRANS: Header for list of subscribers for a user (not first page).
 #. TRANS: %1$s is the user's nickname, $2$d is the page number.
-#: actions/subscribers.php:55
 #, php-format
 msgid "%1$s subscribers, page %2$d"
 msgstr "%1$s的关注者，第%2$d页"
 
 #. TRANS: Page notice for page with an overview of all subscribers
 #. TRANS: of the logged in user's own profile.
-#: actions/subscribers.php:68
 msgid "These are the people who listen to your notices."
 msgstr "这些用户关注了你的消息。"
 
 #. TRANS: Page notice for page with an overview of all subscribers of a user other
 #. TRANS: than the logged in user. %s is the user nickname.
-#: actions/subscribers.php:74
 #, php-format
 msgid "These are the people who listen to %s's notices."
 msgstr "这些用户关注了%s的消息。"
 
 #. TRANS: Subscriber list text when the logged in user has no subscribers.
-#: actions/subscribers.php:114
 msgid ""
 "You have no subscribers. Try subscribing to people you know and they might "
 "return the favor."
@@ -6065,7 +4962,6 @@ msgstr "还没有人关注你，尝试关注一些你认识的用户，他们或
 
 #. TRANS: Subscriber list text when looking at the subscribers for a of a user other
 #. TRANS: than the logged in user that has no subscribers. %s is the user nickname.
-#: actions/subscribers.php:118
 #, php-format
 msgid "%s has no subscribers. Want to be the first?"
 msgstr "还没有人关注%s，成为第一个关注者？"
@@ -6075,7 +4971,6 @@ msgstr "还没有人关注%s，成为第一个关注者？"
 #. TRANS: This message contains a Markdown URL. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.
-#: actions/subscribers.php:127
 #, php-format
 msgid ""
 "%s has no subscribers. Why not [register an account](%%%%action.register%%%"
@@ -6086,20 +4981,17 @@ msgstr ""
 
 #. TRANS: Header for subscriptions overview for a user (not first page).
 #. TRANS: %1$s is a user nickname, %2$d is the page number.
-#: actions/subscriptions.php:55
 #, php-format
 msgid "%1$s subscriptions, page %2$d"
 msgstr "%1$s 关注的用户，第%2$d页"
 
 #. TRANS: Page notice for page with an overview of all subscriptions
 #. TRANS: of the logged in user's own profile.
-#: actions/subscriptions.php:68
 msgid "These are the people whose notices you listen to."
 msgstr "这是你关注的用户。"
 
 #. TRANS: Page notice for page with an overview of all subscriptions of a user other
 #. TRANS: than the logged in user. %s is the user nickname.
-#: actions/subscriptions.php:74
 #, php-format
 msgid "These are the people whose notices %s listens to."
 msgstr "这是%s关注的用户。"
@@ -6108,7 +5000,6 @@ 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.
-#: actions/subscriptions.php:133
 #, php-format
 msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "
@@ -6126,286 +5017,227 @@ msgstr ""
 #. TRANS: than the logged in user that has no subscriptions. %s is the user nickname.
 #. TRANS: Subscription list text when looking at the subscriptions for a of a user that has none
 #. TRANS: as an anonymous user. %s is the user nickname.
-#: actions/subscriptions.php:141 actions/subscriptions.php:147
 #, php-format
 msgid "%s is not listening to anyone."
 msgstr "%s没有关注任何人。"
 
 #. TRANS: Atom feed title. %s is a profile nickname.
-#: actions/subscriptions.php:176
 #, php-format
 msgid "Subscription feed for %s (Atom)"
 msgstr "%s的订阅源 (Atom)"
 
 #. TRANS: Checkbox label for enabling Jabber messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:241 lib/settingsnav.php:110
-#, fuzzy
 msgid "IM"
 msgstr "即时通讯IM"
 
 #. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:256 lib/settingsnav.php:117
 msgid "SMS"
 msgstr "SMS"
 
 #. TRANS: Title for all but the first page of notices with tags.
 #. TRANS: %1$s is the tag, %2$d is the page number.
-#: actions/tag.php:73
 #, php-format
 msgid "Notices tagged with %1$s, page %2$d"
 msgstr "带%1$s标签的消息，第%2$d页"
 
-#: actions/tag.php:91
 #, php-format
 msgid "Notice feed for tag %s (RSS 1.0)"
 msgstr "%s标签的消息聚合 (RSS 1.0)"
 
-#: actions/tag.php:97
 #, php-format
 msgid "Notice feed for tag %s (RSS 2.0)"
 msgstr "%s标签的消息聚合 (RSS 2.0)"
 
-#: actions/tag.php:103
 #, php-format
 msgid "Notice feed for tag %s (Atom)"
 msgstr "%s标签的消息聚合 (Atom)"
 
-#: actions/tagother.php:39
 msgid "No ID argument."
 msgstr "没有 ID 冲突。"
 
-#: actions/tagother.php:65
 #, php-format
 msgid "Tag %s"
 msgstr "将%s加为标签"
 
 #. TRANS: H2 for user profile information.
-#: actions/tagother.php:77 lib/userprofile.php:76
 msgid "User profile"
 msgstr "用户页面"
 
-#: actions/tagother.php:120
 msgid "Tag user"
 msgstr "将用户加为标签"
 
-#: actions/tagother.php:130
 msgid ""
 "Tags for this user (letters, numbers, -, ., and _), comma- or space- "
 "separated"
 msgstr ""
 "给这个用户加注标签 (字母letters, 数字numbers, -, ., and _), 逗号或空格分隔"
 
-#: actions/tagother.php:157
 #, php-format
 msgid "Invalid tag: \"%s\""
 msgstr "无效的标签：\"%s\"。"
 
-#: actions/tagother.php:172
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr "你只能给你关注或关注你的人添加标签。"
 
-#: actions/tagother.php:215
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr "使用这个表单给你的关注者或你关注的用户添加标签。"
 
-#: actions/tagrss.php:35
 msgid "No such tag."
 msgstr "没有此标签。"
 
 #. TRANS: Client error displayed when trying to unblock a non-blocked user.
-#: actions/unblock.php:59
 msgid "You haven't blocked that user."
 msgstr "你未屏蔽该用户。"
 
-#: actions/unsandbox.php:72
 msgid "User is not sandboxed."
 msgstr "用户不在沙盒中。"
 
-#: actions/unsilence.php:72
 msgid "User is not silenced."
 msgstr "用户未被禁言。"
 
-#: actions/unsubscribe.php:77
 msgid "No profile ID in request."
 msgstr "请求不含资料页 ID。"
 
-#: actions/unsubscribe.php:98
 msgid "Unsubscribed"
 msgstr "已取消关注"
 
-#: actions/updateprofile.php:64
 #, php-format
 msgid ""
 "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
 msgstr "Listenee stream 许可证“‘%1$s” 与本网站的许可证 “%2$s”不兼容。"
 
-#: actions/urlsettings.php:60
 #, fuzzy
 msgid "URL settings"
 msgstr "IM 设置"
 
 #. TRANS: Instructions for tab "Other" in user profile settings.
-#: actions/urlsettings.php:72
 msgid "Manage various other options."
 msgstr "管理其他选项。"
 
 #. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
 #. TRANS: user's profile settings. This message has one space at the beginning. Use your
 #. TRANS: language's word separator here if it has one (most likely a single space).
-#: actions/urlsettings.php:115
 msgid " (free service)"
 msgstr "（免费服务）"
 
-#: actions/urlsettings.php:121
 #, fuzzy
 msgid "[none]"
 msgstr "无"
 
-#: actions/urlsettings.php:122
 msgid "[internal]"
 msgstr ""
 
 #. TRANS: Label for dropdown with URL shortener services.
-#: actions/urlsettings.php:130
 msgid "Shorten URLs with"
 msgstr "缩短 URL 使用"
 
 #. TRANS: Tooltip for for dropdown with URL shortener services.
-#: actions/urlsettings.php:132
 msgid "Automatic shortening service to use."
 msgstr "要使用的自动短网址服务。"
 
-#: actions/urlsettings.php:138
 msgid "URL longer than"
 msgstr ""
 
-#: actions/urlsettings.php:141
 msgid "URLs longer than this will be shortened, 0 means always shorten."
 msgstr ""
 
-#: actions/urlsettings.php:145
 msgid "Text longer than"
 msgstr ""
 
-#: actions/urlsettings.php:148
 msgid ""
 "URLs in notices longer than this will be shortened, 0 means always shorten."
 msgstr ""
 
 #. TRANS: Form validation error for form "Other settings" in user profile.
-#: actions/urlsettings.php:180
 msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr "短网址服务过长(不能超过50个字符)。"
 
-#: actions/urlsettings.php:187
 msgid "Invalid number for max url length."
 msgstr ""
 
-#: actions/urlsettings.php:193
 #, fuzzy
 msgid "Invalid number for max notice length."
 msgstr "无效的消息内容。"
 
-#: actions/urlsettings.php:238
 msgid "Error saving user URL shortening preferences."
 msgstr ""
 
 #. TRANS: User admin panel title
-#: actions/useradminpanel.php:58
 msgctxt "TITLE"
 msgid "User"
 msgstr "用户"
 
 #. TRANS: Instruction for user admin panel.
-#: actions/useradminpanel.php:69
 msgid "User settings for this StatusNet site"
 msgstr "这个 StatusNet 网站的用户设置"
 
 #. TRANS: Form validation error in user admin panel when a non-numeric character limit was set.
-#: actions/useradminpanel.php:147
 msgid "Invalid bio limit. Must be numeric."
 msgstr "无效的自述限制，必须为数字。"
 
 #. TRANS: Form validation error in user admin panel when welcome text is too long.
-#: actions/useradminpanel.php:154
 msgid "Invalid welcome text. Maximum length is 255 characters."
 msgstr "无效的欢迎文字。最大长度255个字符。"
 
 #. TRANS: Client error displayed when trying to set a non-existing user as default subscription for new
 #. TRANS: users in user admin panel. %1$s is the invalid nickname.
-#: actions/useradminpanel.php:166
 #, php-format
 msgid "Invalid default subscripton: \"%1$s\" is not a user."
 msgstr "无效的默认关注：“%1$s”不是一个用户。"
 
-#: actions/useradminpanel.php:215 lib/action.php:565 lib/settingsnav.php:77
-#: lib/subgroupnav.php:81
 msgid "Profile"
 msgstr "个人信息"
 
 #. TRANS: Field label in user admin panel for setting the character limit for the bio field.
-#: actions/useradminpanel.php:220
 msgid "Bio Limit"
 msgstr "自述限制"
 
 #. TRANS: Tooltip in user admin panel for setting the character limit for the bio field.
-#: actions/useradminpanel.php:222
 msgid "Maximum length of a profile bio in characters."
 msgstr "个人资料自述最长的字符数。"
 
 #. TRANS: Form legend in user admin panel.
-#: actions/useradminpanel.php:231
 msgid "New users"
 msgstr "新用户"
 
 #. TRANS: Field label in user admin panel for setting new user welcome text.
-#: actions/useradminpanel.php:236
 msgid "New user welcome"
 msgstr "新用户欢迎"
 
 #. TRANS: Tooltip in user admin panel for setting new user welcome text.
-#: actions/useradminpanel.php:238
 msgid "Welcome text for new users (maximum 255 characters)."
 msgstr "给新用户的欢迎文字(不能超过255个字符)。"
 
 #. TRANS: Field label in user admin panel for setting default subscription for new users.
-#: actions/useradminpanel.php:244
 msgid "Default subscription"
 msgstr "默认关注"
 
 #. TRANS: Tooltip in user admin panel for setting default subscription for new users.
-#: actions/useradminpanel.php:246
 msgid "Automatically subscribe new users to this user."
 msgstr "自动关注所有关注我的人 (这个选项适合机器人)"
 
 #. TRANS: Form legend in user admin panel.
-#: actions/useradminpanel.php:256
 msgid "Invitations"
 msgstr "邀请"
 
 #. TRANS: Field label for checkbox in user admin panel for allowing users to invite friend using site e-mail.
-#: actions/useradminpanel.php:262
 msgid "Invitations enabled"
 msgstr "邀请已启用"
 
 #. TRANS: Tooltip for checkbox in user admin panel for allowing users to invite friend using site e-mail.
-#: actions/useradminpanel.php:265
 msgid "Whether to allow users to invite new users."
 msgstr "是否允许用户发送注册邀请。"
 
 #. TRANS: Title for button to save user settings in user admin panel.
-#: actions/useradminpanel.php:302
 msgid "Save user settings."
 msgstr "保存用户设置。"
 
 #. TRANS: Page title.
-#: actions/userauthorization.php:109
 msgid "Authorize subscription"
 msgstr "授权关注"
 
 #. TRANS: Page notice on "Auhtorize subscription" page.
-#: actions/userauthorization.php:115
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
 "user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
@@ -6415,38 +5247,31 @@ msgstr ""
 "阅，请单击\"拒绝\"。"
 
 #. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:200
 msgctxt "BUTTON"
 msgid "Accept"
 msgstr "接受"
 
 #. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:202
 msgid "Subscribe to this user."
 msgstr "订阅此用户。"
 
 #. TRANS: Button text on Authorise Subscription page.
-#: actions/userauthorization.php:204
 msgctxt "BUTTON"
 msgid "Reject"
 msgstr "拒绝"
 
 #. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:206
 msgid "Reject this subscription."
 msgstr "拒绝此订阅。"
 
 #. TRANS: Client error displayed for an empty authorisation request.
-#: actions/userauthorization.php:219
 msgid "No authorization request!"
 msgstr "没有授权请求！"
 
 #. TRANS: Accept message header from Authorise subscription page.
-#: actions/userauthorization.php:242
 msgid "Subscription authorized"
 msgstr "已授权关注"
 
-#: actions/userauthorization.php:245
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to authorize the "
@@ -6456,11 +5281,9 @@ msgstr ""
 "token 是："
 
 #. TRANS: Reject message header from Authorise subscription page.
-#: actions/userauthorization.php:256
 msgid "Subscription rejected"
 msgstr "关注已拒绝"
 
-#: actions/userauthorization.php:259
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to fully reject the "
@@ -6469,35 +5292,30 @@ msgstr "关注已拒绝，但是没有回传 URL。请到网站查看如何完
 
 #. TRANS: Exception thrown when no valid user is found for an authorisation request.
 #. TRANS: %s is a listener URI.
-#: actions/userauthorization.php:296
 #, fuzzy, php-format
 msgid "Listener URI \"%s\" not found here."
 msgstr "Listener URI ‘%s’ 没有找到。"
 
 #. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
 #. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:303
 #, fuzzy, php-format
 msgid "Listenee URI \"%s\" is too long."
 msgstr "Listenee URI ‘%s’ 过长。"
 
 #. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
 #. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:311
 #, fuzzy, php-format
 msgid "Listenee URI \"%s\" is a local user."
 msgstr "Listenee URI ‘%s’ 是一个本地用户。"
 
 #. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
 #. TRANS: %s is a profile URL.
-#: actions/userauthorization.php:329
 #, fuzzy, php-format
 msgid "Profile URL \"%s\" is for a local user."
 msgstr "个人信息 URL “%s” 是为本地用户的。"
 
 #. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
 #. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
-#: actions/userauthorization.php:339
 #, fuzzy, php-format
 msgid ""
 "Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
@@ -6506,75 +5324,61 @@ msgstr "Listenee stream 许可证“‘%1$s” 与本网站的许可证 “%2$s
 
 #. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
 #. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:349
 #, fuzzy, php-format
 msgid "Avatar URL \"%s\" is not valid."
 msgstr "头像地址‘%s’无效。"
 
 #. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
 #. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:356
 #, fuzzy, php-format
 msgid "Cannot read avatar URL \"%s\"."
 msgstr "无法读取头像 URL '%s'。"
 
 #. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
 #. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:363
 #, fuzzy, php-format
 msgid "Wrong image type for avatar URL \"%s\"."
 msgstr "头像 URL ‘%s’ 图像格式错误。"
 
 #. TRANS: Page title for profile design page.
-#: actions/userdesignsettings.php:74 lib/designsettings.php:61
 msgid "Profile design"
 msgstr "个人页面外观"
 
 #. TRANS: Instructions for profile design page.
-#: actions/userdesignsettings.php:84 lib/designsettings.php:72
 msgid ""
 "Customize the way your profile looks with a background image and a colour "
 "palette of your choice."
 msgstr "通过背景图片和调色板自定义你的页面外观。"
 
-#: actions/userdesignsettings.php:289
 msgid "Enjoy your hotdog!"
 msgstr "享受你的成果吧！"
 
-#: actions/userdesignsettings.php:325
 #, fuzzy
 msgid "Design settings"
 msgstr "保存访问设置"
 
-#: actions/userdesignsettings.php:340
 msgid "View profile designs"
 msgstr "查看个人页面外观"
 
-#: actions/userdesignsettings.php:341
 msgid "Show or hide profile designs."
 msgstr "显示或隐藏个人页面外观。"
 
-#: actions/userdesignsettings.php:348
 #, fuzzy
 msgid "Background file"
 msgstr "背景"
 
 #. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number.
-#: actions/usergroups.php:66
 #, php-format
 msgid "%1$s groups, page %2$d"
 msgstr "%1$s的小组，第%2$d页"
 
-#: actions/usergroups.php:132
 msgid "Search for more groups"
 msgstr "搜索更多小组"
 
-#: actions/usergroups.php:159
 #, php-format
 msgid "%s is not a member of any group."
 msgstr "%s还未加入任何小组。"
 
-#: actions/usergroups.php:164
 #, php-format
 msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
 msgstr "试一下[搜索小组](%%action.groupsearch%%)并加入他们。"
@@ -6584,18 +5388,14 @@ msgstr "试一下[搜索小组](%%action.groupsearch%%)并加入他们。"
 #. TRANS: %1$s is a group name, %2$s is a site name.
 #. TRANS: Message is used as a subtitle in atom user notice feed.
 #. TRANS: %1$s is a user name, %2$s is a site name.
-#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:70
-#: lib/atomusernoticefeed.php:95
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr "%2$s 上 %1$s 的更新！"
 
-#: actions/version.php:75
 #, php-format
 msgid "StatusNet %s"
 msgstr "StatusNet %s"
 
-#: actions/version.php:155
 #, php-format
 msgid ""
 "This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
@@ -6603,16 +5403,13 @@ msgid ""
 msgstr ""
 "此网站使用%1$s版本%2$s，2008-2010 StatusNet, Inc. 和其他贡献者版权所有。"
 
-#: actions/version.php:163
 msgid "Contributors"
 msgstr "贡献者"
 
 #. TRANS: Menu item for site administration
-#: actions/version.php:167 lib/adminpanelaction.php:403
 msgid "License"
 msgstr "许可协议"
 
-#: actions/version.php:170
 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 "
@@ -6622,7 +5419,6 @@ msgstr ""
 "StatusNet 是一个免费软件，你可以在遵守自由软件基金会发布的 GNU Affero GPL 或"
 "第三版或以后的版本的情况下重新部署或者修改它，"
 
-#: actions/version.php:176
 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 "
@@ -6632,7 +5428,6 @@ msgstr ""
 "这个程序的发布是希望它可以有用，但没有任何的担保；也没有售后性或者符合其他特"
 "别目的的担保。查看 GNU Affero GPL 了解更多信息。"
 
-#: actions/version.php:182
 #, php-format
 msgid ""
 "You should have received a copy of the GNU Affero General Public License "
@@ -6640,52 +5435,42 @@ msgid ""
 msgstr "你应该在本程序中收到了一份 GNU Affero GPL 的副本，如果没有收到请看%s。"
 
 #. TRANS: Form input field label for application name.
-#: actions/version.php:197 lib/applicationeditform.php:190
 msgid "Name"
 msgstr "名称"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:885
 msgid "Version"
 msgstr "版本"
 
-#: actions/version.php:199
 msgid "Author(s)"
 msgstr "作者"
 
 #. TRANS: Form input field label.
-#: actions/version.php:200 lib/applicationeditform.php:208
-#: lib/groupeditform.php:168
 msgid "Description"
 msgstr "描述"
 
 #. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:164
 msgid "Favor"
 msgstr "收藏"
 
 #. TRANS: Ntofication given when a user marks a notice as favorite.
 #. TRANS: %1$s is a user nickname or full name, %2$s is a notice URI.
-#: classes/Fave.php:167
 #, php-format
 msgid "%1$s marked notice %2$s as a favorite."
 msgstr "%1$s 收藏了消息 %2$s 。"
 
 #. TRANS: Server exception thrown when a URL cannot be processed.
-#: classes/File.php:162
 #, php-format
 msgid "Cannot process URL '%s'"
 msgstr "不能处理 URL “%s”"
 
 #. TRANS: Server exception thrown when... Robin thinks something is impossible!
-#: classes/File.php:194
 msgid "Robin thinks something is impossible."
 msgstr "麦子认为卖烧麦是份很令人愉快的工作。"
 
 #. 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$s is used for plural.
-#: classes/File.php:210
 #, php-format
 msgid ""
 "No file may be larger than %1$d byte and the file you sent was %2$d bytes. "
@@ -6697,7 +5482,6 @@ msgstr[0] "文件不能大于%1$d字节，而你上传的文件是%2$d字节。
 
 #. TRANS: Message given if an upload would exceed user quota.
 #. TRANS: %d (number) is the user quota in bytes and is used for plural.
-#: classes/File.php:223
 #, php-format
 msgid "A file this large would exceed your user quota of %d byte."
 msgid_plural "A file this large would exceed your user quota of %d bytes."
@@ -6705,163 +5489,135 @@ msgstr[0] "这么大的文件会超过你%d字节的用户配额。"
 
 #. TRANS: Message given id an upload would exceed a user's monthly quota.
 #. TRANS: $d (number) is the monthly user quota in bytes and is used for plural.
-#: classes/File.php:235
 #, php-format
 msgid "A file this large would exceed your monthly quota of %d byte."
 msgid_plural "A file this large would exceed your monthly quota of %d bytes."
 msgstr[0] "这么大的文件会超过你%d字节的每月配额。"
 
 #. TRANS: Client exception thrown if a file upload does not have a valid name.
-#: classes/File.php:282 classes/File.php:297
 msgid "Invalid filename."
 msgstr "无效的文件名。"
 
 #. TRANS: Exception thrown when joining a group fails.
-#: classes/Group_member.php:51
 msgid "Group join failed."
 msgstr "加入小组失败。"
 
 #. TRANS: Exception thrown when trying to leave a group the user is not a member of.
-#: classes/Group_member.php:64
 msgid "Not part of group."
 msgstr "不是小组成员。"
 
 #. TRANS: Exception thrown when trying to leave a group fails.
-#: classes/Group_member.php:72
 msgid "Group leave failed."
 msgstr "离开小组失败。"
 
 #. TRANS: Exception thrown providing an invalid profile ID.
 #. TRANS: %s is the invalid profile ID.
-#: classes/Group_member.php:85
 #, php-format
 msgid "Profile ID %s is invalid."
 msgstr "无效的用户 ID %s。"
 
 #. TRANS: Exception thrown providing an invalid group ID.
 #. TRANS: %s is the invalid group ID.
-#: classes/Group_member.php:98
 #, php-format
 msgid "Group ID %s is invalid."
 msgstr "小组 ID %s 无效。"
 
 #. TRANS: Activity title.
-#: classes/Group_member.php:147 lib/joinform.php:114
 msgid "Join"
 msgstr "加入"
 
 #. TRANS: Success message for subscribe to group attempt through OStatus.
 #. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
-#: classes/Group_member.php:151
 #, php-format
 msgid "%1$s has joined group %2$s."
 msgstr "%1$s加入了%2$s小组。"
 
 #. TRANS: Server exception thrown when updating a local group fails.
-#: classes/Local_group.php:42
 msgid "Could not update local group."
 msgstr "无法更新本地小组。"
 
 #. TRANS: Exception thrown when trying creating a login token failed.
 #. TRANS: %s is the user nickname for which token creation failed.
-#: classes/Login_token.php:78
 #, php-format
 msgid "Could not create login token for %s"
 msgstr "无法创建别名。"
 
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
-#: classes/Memcached_DataObject.php:556
 msgid "No database name or DSN found anywhere."
 msgstr "没有找到数据库名称或者 DSN。"
 
 #. TRANS: Client exception thrown when a user tries to send a direct message while being banned from sending them.
-#: classes/Message.php:45
 msgid "You are banned from sending direct messages."
 msgstr "你被禁止发送私信。"
 
 #. TRANS: Message given when a message could not be stored on the server.
-#: classes/Message.php:69
 msgid "Could not insert message."
 msgstr "无法添加信息。"
 
 #. TRANS: Message given when a message could not be updated on the server.
-#: classes/Message.php:80
 msgid "Could not update message with new URI."
 msgstr "无法通过新的 URI 更新消息。"
 
 #. TRANS: Server exception thrown when a user profile for a notice cannot be found.
 #. TRANS: %1$d is a profile ID (number), %2$d is a notice ID (number).
-#: classes/Notice.php:98
 #, php-format
 msgid "No such profile (%1$d) for notice (%2$d)."
 msgstr "没有对于 消息 (%2$d) 的 个人信息页 (%1$d) 。"
 
 #. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:199
 #, php-format
 msgid "Database error inserting hashtag: %s"
 msgstr "插入标签时数据库出错：%s"
 
 #. TRANS: Client exception thrown if a notice contains too many characters.
-#: classes/Notice.php:279
 msgid "Problem saving notice. Too long."
 msgstr "保存消息时出错。太长。"
 
 #. TRANS: Client exception thrown when trying to save a notice for an unknown user.
-#: classes/Notice.php:284
 msgid "Problem saving notice. Unknown user."
 msgstr "保存消息时出错。未知用户。"
 
 #. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
-#: classes/Notice.php:290
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr "你在短时间里发布了过多的消息，请深呼吸，过几分钟再发消息。"
 
 #. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
-#: classes/Notice.php:297
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
 "few minutes."
 msgstr "你在短时间里发布了过多的重复消息，请深呼吸，过几分钟再发消息。"
 
 #. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:305
 msgid "You are banned from posting notices on this site."
 msgstr "在这个网站你被禁止发布消息。"
 
 #. TRANS: Server exception thrown when a notice cannot be saved.
 #. TRANS: Server exception thrown when a notice cannot be updated.
-#: classes/Notice.php:372 classes/Notice.php:399
 msgid "Problem saving notice."
 msgstr "保存消息时出错。"
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:929
 msgid "Bad type provided to saveKnownGroups."
 msgstr "对 saveKnownGroups 提供的类型无效。"
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:1028
 msgid "Problem saving group inbox."
 msgstr "保存小组收件箱时出错。"
 
 #. TRANS: Server exception thrown when a reply cannot be saved.
 #. TRANS: %1$d is a notice ID, %2$d is the ID of the mentioned user.
-#: classes/Notice.php:1144
 #, php-format
 msgid "Could not save reply for %1$d, %2$d."
 msgstr "无法保存回复，%1$d 对 %2$d。"
 
 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1663
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
 
 #. TRANS: Full name of a profile or group followed by nickname in parens
-#: classes/Profile.php:172 classes/User_group.php:242
 #, php-format
 msgctxt "FANCYNAME"
 msgid "%1$s (%2$s)"
@@ -6869,264 +5625,208 @@ msgstr "%1$s (%2$s)"
 
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:779
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr "无法取消用户#%2$d的\\\"%1$s\\\"权限，不存在。"
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:788
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr "无法取消用户#%2$d的\\\"%1$s\\\"权限，数据库错误。"
 
 #. TRANS: Exception thrown when a right for a non-existing user profile is checked.
-#: classes/Remote_profile.php:54
 msgid "Missing profile."
 msgstr "丢失的个人信息。"
 
 #. TRANS: Exception thrown when a tag cannot be saved.
-#: classes/Status_network.php:338
 msgid "Unable to save tag."
 msgstr "无法保存标签。"
 
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#: classes/Subscription.php:77 lib/oauthstore.php:482
 msgid "You have been banned from subscribing."
 msgstr "你被禁止添加关注。"
 
 #. TRANS: Exception thrown when trying to subscribe while already subscribed.
-#: classes/Subscription.php:82
 msgid "Already subscribed!"
 msgstr "已经关注了！"
 
 #. TRANS: Exception thrown when trying to subscribe to a user who has blocked the subscribing user.
-#: classes/Subscription.php:87
 msgid "User has blocked you."
 msgstr "用户将你屏蔽了。"
 
 #. TRANS: Exception thrown when trying to unsibscribe without a subscription.
-#: classes/Subscription.php:176
 msgid "Not subscribed!"
 msgstr "未关注！"
 
 #. TRANS: Exception thrown when trying to unsubscribe a user from themselves.
-#: classes/Subscription.php:183
 msgid "Could not delete self-subscription."
 msgstr "无法删除自我关注。"
 
 #. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
-#: classes/Subscription.php:211
 msgid "Could not delete subscription OMB token."
 msgstr "无法删除关注 OMB token。"
 
 #. TRANS: Exception thrown when a subscription could not be deleted on the server.
-#: classes/Subscription.php:223
 msgid "Could not delete subscription."
 msgstr "无法取消关注。"
 
 #. TRANS: Activity tile when subscribing to another person.
-#: classes/Subscription.php:265
 msgid "Follow"
 msgstr "关注"
 
 #. TRANS: Notification given when one person starts following another.
 #. TRANS: %1$s is the subscriber, %2$s is the subscribed.
-#: classes/Subscription.php:268
 #, php-format
 msgid "%1$s is now following %2$s."
 msgstr "%1$s 现在开始关注了 %2$s。"
 
 #. TRANS: Notice given on user registration.
 #. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:390
 #, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr "欢迎来到 %1$s，@%2$s！"
 
 #. TRANS: Server exception.
-#: classes/User.php:923
 msgid "No single user defined for single-user mode."
 msgstr "没有单独的用户被定义为单用户模式。"
 
 #. TRANS: Server exception.
-#: classes/User.php:927
 msgid "Single-user mode code called when not enabled."
 msgstr "没启用单用户模式的代码。"
 
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:522
 msgid "Could not create group."
 msgstr "无法创建小组。"
 
 #. TRANS: Server exception thrown when updating a group URI failed.
-#: classes/User_group.php:532
 msgid "Could not set group URI."
 msgstr "无法设置小组 URI。"
 
 #. TRANS: Server exception thrown when setting group membership failed.
-#: classes/User_group.php:555
 msgid "Could not set group membership."
 msgstr "无法设置小组成员。"
 
 #. TRANS: Server exception thrown when saving local group information failed.
-#: classes/User_group.php:570
 msgid "Could not save local group info."
 msgstr "无法保存本地小组信息。"
 
 #. TRANS: Exception thrown when an account could not be located when it should be moved.
 #. TRANS: %s is the remote site.
-#: lib/accountmover.php:65
 #, php-format
 msgid "Cannot locate account %s."
 msgstr "找不到帐户 %s。"
 
 #. TRANS: Exception thrown when a service document could not be located account move.
 #. TRANS: %s is the remote site.
-#: lib/accountmover.php:106
 #, php-format
 msgid "Cannot find XRD for %s."
 msgstr ""
 
 #. TRANS: Exception thrown when an account could not be located when it should be moved.
 #. TRANS: %s is the remote site.
-#: lib/accountmover.php:131
 #, php-format
 msgid "No AtomPub API service for %s."
 msgstr ""
 
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: lib/action.php:161
 #, php-format
 msgid "%1$s - %2$s"
 msgstr "%1$s - %2$s"
 
 #. TRANS: Page title for a page without a title set.
-#: lib/action.php:177
 msgid "Untitled page"
 msgstr "无标题页"
 
 #. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.
-#: lib/action.php:325
 msgctxt "TOOLTIP"
 msgid "Show more"
 msgstr "显示更多"
 
 #. TRANS: Inline reply form submit button: submits a reply comment.
-#: lib/action.php:328
 #, fuzzy
 msgctxt "BUTTON"
-msgid "Comment"
-msgstr "内容"
+msgid "Reply"
+msgstr "回复"
 
 #. TRANS: Placeholder text for inline reply form. Clicking in this box will turn it into a mini notice form.
-#: lib/action.php:331
-msgid "Add a comment..."
+msgid "Write a reply..."
 msgstr ""
 
-#: lib/action.php:559 lib/personalgroupnav.php:99
-#, fuzzy
 msgid "Home"
 msgstr "主页"
 
-#: lib/action.php:560
 #, fuzzy
 msgid "Friends timeline"
 msgstr "%s的时间线"
 
-#: lib/action.php:566
-#, fuzzy
 msgid "Your profile"
 msgstr "小组资料"
 
-#: lib/action.php:570 lib/action.php:593 lib/publicgroupnav.php:78
 msgid "Public"
 msgstr "公共"
 
-#: lib/action.php:571 lib/action.php:594
 #, fuzzy
 msgid "Everyone on this site"
 msgstr "搜索本站用户"
 
-#: lib/action.php:575
-#, fuzzy
 msgid "Settings"
 msgstr "SMS 设置"
 
-#: lib/action.php:576
 #, fuzzy
 msgid "Change your personal settings"
 msgstr "修改你的个人信息"
 
-#: lib/action.php:582
 #, fuzzy
 msgid "Site configuration"
 msgstr "用户配置"
 
-#: lib/action.php:587
-#, fuzzy
 msgid "Logout"
 msgstr "登出"
 
-#: lib/action.php:588
-#, fuzzy
 msgid "Logout from the site"
 msgstr "从网站登出"
 
-#: lib/action.php:599
-#, fuzzy
 msgid "Login to the site"
 msgstr "登录这个网站"
 
-#: lib/action.php:606
-#, fuzzy
 msgid "Search"
 msgstr "搜索"
 
-#: lib/action.php:607
 #, fuzzy
 msgid "Search the site"
 msgstr "搜索帮助"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:864
 msgid "Help"
 msgstr "帮助"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:867
 msgid "About"
 msgstr "关于"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:870
 msgid "FAQ"
 msgstr "FAQ"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:875
 msgid "TOS"
 msgstr "条款"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:879
 msgid "Privacy"
 msgstr "隐私"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:882
 msgid "Source"
 msgstr "源码"
 
 #. TRANS: Secondary navigation menu option leading to e-mail contact information on the
 #. TRANS: StatusNet site, where to report bugs, ...
-#: lib/action.php:889
 msgid "Contact"
 msgstr "联系"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:892
 msgid "Badge"
 msgstr "挂件"
 
@@ -7134,7 +5834,6 @@ msgstr "挂件"
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:921
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7144,7 +5843,6 @@ msgstr ""
 "broughtbyurl%%)。"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:924
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** 是一个微博客服务。"
@@ -7153,7 +5851,6 @@ msgstr "**%%site.name%%** 是一个微博客服务。"
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:931
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7165,103 +5862,85 @@ msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:949
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr "%1$s的内容和数据是私人且保密的。"
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:956
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr "内容和数据%1$s版权所有并保留所有权利。"
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:960
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr "内容和数据贡献者版权所有并保留所有权利。"
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:992
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr "所有%1$s的内容和数据在%2$s许可下有效。"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1335
 msgid "After"
 msgstr "之后"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1345
 msgid "Before"
 msgstr "之前"
 
 #. TRANS: Client exception thrown when a feed instance is a DOMDocument.
-#: lib/activity.php:125
 msgid "Expecting a root feed element but got a whole XML document."
 msgstr "只期待一个 root feed 元素但收到了整个的 XML 文档。"
 
 #. TRANS: Client exception thrown when using an unknown verb for the activity importer.
-#: lib/activityimporter.php:81
 #, php-format
 msgid "Unknown verb: \"%s\"."
 msgstr "未知的动词：“%s”"
 
 #. TRANS: Client exception thrown when trying to force a subscription for an untrusted user.
-#: lib/activityimporter.php:107
 msgid "Cannot force subscription for untrusted user."
 msgstr "不能强迫不受信任的用户订阅。"
 
 #. TRANS: Client exception thrown when trying to for a remote user to subscribe.
-#: lib/activityimporter.php:117
 msgid "Cannot force remote user to subscribe."
 msgstr "不能强制远程用户订阅。"
 
 #. TRANS: Client exception thrown when trying to subscribe to an unknown profile.
-#: lib/activityimporter.php:132
 msgid "Unknown profile."
 msgstr "未知的配置文件"
 
 #. TRANS: Client exception thrown when trying to import an event not related to the importing user.
-#: lib/activityimporter.php:138
 msgid "This activity seems unrelated to our user."
 msgstr "这项活动似乎与我们的用户无关。"
 
 #. TRANS: Client exception thrown when trying to join a remote group that is not a group.
-#: lib/activityimporter.php:154
 msgid "Remote profile is not a group!"
 msgstr "远程配置文件不是一个组 ！"
 
 #. TRANS: Client exception thrown when trying to join a group the importing user is already a member of.
-#: lib/activityimporter.php:163
 msgid "User is already a member of this group."
 msgstr "用户已经是该小组成员。"
 
 #. TRANS: Client exception thrown when trying to import a notice by another user.
 #. TRANS: %1$s is the source URI of the notice, %2$s is the URI of the author.
-#: lib/activityimporter.php:201
 #, php-format
 msgid "Already know about notice %1$s and  it has a different author %2$s."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to overwrite the author information for a non-trusted user during import.
-#: lib/activityimporter.php:207
 msgid "Not overwriting author info for non-trusted user."
 msgstr "不受信任的用户的信息不被重写。"
 
 #. TRANS: Client exception thrown when trying to import a notice without content.
 #. TRANS: %s is the notice URI.
-#: lib/activityimporter.php:223
 #, php-format
 msgid "No content for notice %s."
 msgstr "通知 %s 没有内容。"
 
-#: lib/activitymover.php:84
 #, php-format
 msgid "No such user %s."
 msgstr "没有这样的用户 %s。"
@@ -7272,414 +5951,335 @@ msgstr "没有这样的用户 %s。"
 #. TRANS: %1$s is a URL, %2$s is the status, %s$s is the fail reason.
 #. TRANS: Exception thrown when post to collection fails with a status that is not handled.
 #. TRANS: %1$s is a URL, %2$s is the status, %s$s is the fail reason.
-#: lib/activitysink.php:163 lib/activitysink.php:167 lib/activitysink.php:172
 #, php-format
 msgctxt "URLSTATUSREASON"
 msgid "%1$s %2$s %3$s"
 msgstr "%1$s %2$s %3$s"
 
 #. TRANS: Client exception thrown when there is no source attribute.
-#: lib/activityutils.php:200
 msgid "Can't handle remote content yet."
 msgstr "还不能处理远程内容。"
 
 #. TRANS: Client exception thrown when there embedded XML content is found that cannot be processed yet.
-#: lib/activityutils.php:237
 msgid "Can't handle embedded XML content yet."
 msgstr "还不能处理嵌入式 XML 内容。"
 
 #. TRANS: Client exception thrown when base64 encoded content is found that cannot be processed yet.
-#: lib/activityutils.php:242
 msgid "Can't handle embedded Base64 content yet."
 msgstr "还不能处理嵌入式 Base64 内容。"
 
 #. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights.
-#: lib/adminpanelaction.php:96
 msgid "You cannot make changes to this site."
 msgstr "你不能在这个站点上修改。"
 
 #. TRANS: Client error message throw when a certain panel's settings cannot be changed.
-#: lib/adminpanelaction.php:108
 msgid "Changes to that panel are not allowed."
 msgstr "不允许对该面板进行修改。"
 
 #. TRANS: Client error message.
-#: lib/adminpanelaction.php:222
 msgid "showForm() not implemented."
 msgstr "showForm() 尚未实现。"
 
 #. TRANS: Client error message
-#: lib/adminpanelaction.php:250
 msgid "saveSettings() not implemented."
 msgstr "saveSettings() 尚未实现。"
 
 #. TRANS: Client error message thrown if design settings could not be deleted in
 #. TRANS: the admin panel Design.
-#: lib/adminpanelaction.php:274
 msgid "Unable to delete design setting."
 msgstr "无法删除外观设置。"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:337
 msgid "Basic site configuration"
 msgstr "基本网站配置"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:339
 msgctxt "MENU"
 msgid "Site"
 msgstr "网站"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:345
 msgid "Design configuration"
 msgstr "外观配置"
 
 #. TRANS: Menu item for site administration
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/adminpanelaction.php:347 lib/groupnav.php:135
 msgctxt "MENU"
 msgid "Design"
 msgstr "外观"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:353
 msgid "User configuration"
 msgstr "用户配置"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:110
 msgid "User"
 msgstr "用户"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:361
 msgid "Access configuration"
 msgstr "访问配置"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:369
 msgid "Paths configuration"
 msgstr "路径配置"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:377
 msgid "Sessions configuration"
 msgstr "会话配置"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:385
 msgid "Edit site notice"
 msgstr "编辑网站消息"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:387
 msgid "Site notice"
 msgstr "网站消息"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:393
 msgid "Snapshots configuration"
 msgstr "更改站点配置"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:401
 msgid "Set site license"
 msgstr "设置网站许可协议"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:409
 #, fuzzy
 msgid "Plugins configuration"
 msgstr "路径配置"
 
 #. TRANS: Client error 401.
-#: lib/apiauth.php:111
 msgid "API resource requires read-write access, but you only have read access."
 msgstr "API 资源需要读写的访问权限，但是你只有只读的权限。"
 
 #. TRANS: OAuth exception thrown when no application is found for a given consumer key.
-#: lib/apiauth.php:177
 msgid "No application for that consumer key."
 msgstr "没有应用使用这个 consumer key。"
 
-#: lib/apiauth.php:202 lib/apiauth.php:284
 msgid "Not allowed to use API."
 msgstr ""
 
 #. TRANS: OAuth exception given when an incorrect access token was given for a user.
-#: lib/apiauth.php:225
 msgid "Bad access token."
 msgstr "无效的 access token。"
 
 #. TRANS: OAuth exception given when no user was found for a given token (no token was found).
-#: lib/apiauth.php:230
 msgid "No user for that token."
 msgstr "没有用户使用这个 token。"
 
 #. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel".
 #. TRANS: Client error thrown when authentication fails.
-#: lib/apiauth.php:272 lib/apiauth.php:302
 msgid "Could not authenticate you."
 msgstr "无法验证你。"
 
 #. TRANS: Server error displayed when trying to create an anynymous OAuth consumer.
-#: lib/apioauthstore.php:45
 msgid "Could not create anonymous consumer."
 msgstr "无法创建匿名 consumer。"
 
 #. TRANS: Server error displayed when trying to create an anynymous OAuth application.
-#: lib/apioauthstore.php:69
 msgid "Could not create anonymous OAuth application."
 msgstr "无法创建匿名 OAuth 应用。"
 
 #. TRANS: Exception thrown when no token association could be found.
-#: lib/apioauthstore.php:151
 msgid ""
 "Could not find a profile and application associated with the request token."
 msgstr "无法找到请求 token 对应的用户和应用。"
 
 #. TRANS: Exception thrown when no access token can be issued.
-#: lib/apioauthstore.php:209
 msgid "Could not issue access token."
 msgstr "无法发行 access token。"
 
-#: lib/apioauthstore.php:317
 msgid "Database error inserting OAuth application user."
 msgstr "插入 OAuth 应用用户时数据库出错。"
 
-#: lib/apioauthstore.php:345
 msgid "Database error updating OAuth application user."
 msgstr "插入 OAuth 应用用户时数据库出错。"
 
 #. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
-#: lib/apioauthstore.php:371
 msgid "Tried to revoke unknown token."
 msgstr "尝试了取消未知的 token。"
 
 #. TRANS: Exception thrown when an attempt is made to remove a revoked token.
-#: lib/apioauthstore.php:376
 msgid "Failed to delete revoked token."
 msgstr "删除取消的 token 失败。"
 
 #. TRANS: Form input field label for application icon.
-#: lib/applicationeditform.php:177
 msgid "Icon"
 msgstr "图标"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:182
 msgid "Icon for this application"
 msgstr "该应用的图标"
 
 #. TRANS: Form input field instructions.
 #. TRANS: %d is the number of available characters for the description.
-#: lib/applicationeditform.php:201
 #, php-format
 msgid "Describe your application in %d character"
 msgid_plural "Describe your application in %d characters"
 msgstr[0] "用不超过%d个字符描述你的应用"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:205
 msgid "Describe your application"
 msgstr "描述你的应用"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:216
 msgid "URL of the homepage of this application"
 msgstr "这个应用的主页 URL"
 
 #. TRANS: Form input field label.
-#: lib/applicationeditform.php:218
 msgid "Source URL"
 msgstr "来源网址"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:225
 msgid "Organization responsible for this application"
 msgstr "该应用的负责组织"
 
 #. TRANS: Form input field label.
-#: lib/applicationeditform.php:227
 msgid "Organization"
 msgstr "组织名称必填。"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:234
 msgid "URL for the homepage of the organization"
 msgstr "这个组织的主页 URL"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:243
 msgid "URL to redirect to after authentication"
 msgstr "通过授权后转向的 URL"
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:271
 msgid "Browser"
 msgstr "浏览器"
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:288
 msgid "Desktop"
 msgstr "桌面"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:290
 msgid "Type of application, browser or desktop"
 msgstr "应用的类型，浏览器或桌面"
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:314
 msgid "Read-only"
 msgstr "只读"
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:334
 msgid "Read-write"
 msgstr "读写"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:336
 msgid "Default access for this application: read-only, or read-write"
 msgstr "该应用默认的访问权限：只读或读写"
 
 #. TRANS: Submit button title.
-#: lib/applicationeditform.php:353
 msgid "Cancel"
 msgstr "取消"
 
-#: lib/applicationlist.php:247
 msgid " by "
 msgstr " by "
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:260
 msgid "read-write"
 msgstr "读写"
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:262
 msgid "read-only"
 msgstr "只读"
 
 #. TRANS: Used in application list. %1$s is a modified date, %2$s is access type ("read-write" or "read-only")
-#: lib/applicationlist.php:268
 #, php-format
 msgid "Approved %1$s - \"%2$s\" access."
 msgstr "通过了%1$s - \"%2$s\"的访问权限。"
 
 #. TRANS: Access token in the application list.
 #. TRANS: %s are the first 7 characters of the access token.
-#: lib/applicationlist.php:282
 #, php-format
 msgid "Access token starting with: %s"
 msgstr "Access token 的开始：%s"
 
 #. TRANS: Button label
-#: lib/applicationlist.php:298
 msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "取消"
 
-#: lib/atom10feed.php:113
 msgid "Author element must contain a name element."
 msgstr "作者元素必须包含一个名称元素。"
 
 #. TRANS: Server exception thrown when using the method setActivitySubject() in the class Atom10Feed.
-#: lib/atom10feed.php:160
 msgid "Do not use this method!"
 msgstr "不要使用此方法 ！"
 
 #. TRANS: Title.
-#: lib/attachmentnoticesection.php:67
 msgid "Notices where this attachment appears"
 msgstr "出现这个附件的消息"
 
 #. TRANS: Title.
-#: lib/attachmenttagcloudsection.php:48
 msgid "Tags for this attachment"
 msgstr "此附件的标签"
 
 #. TRANS: Exception thrown when a password change fails.
-#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:227
 msgid "Password changing failed."
 msgstr "修改密码失败。"
 
 #. TRANS: Exception thrown when a password change attempt fails because it is not allowed.
-#: lib/authenticationplugin.php:238
 msgid "Password changing is not allowed."
 msgstr "不允许更改密码。"
 
 #. TRANS: Title for the form to block a user.
-#: lib/blockform.php:68
 msgid "Block"
 msgstr "屏蔽"
 
 #. TRANS: Description of the form to block a user.
-#: lib/blockform.php:79
 msgid "Block this user"
 msgstr "屏蔽这个用户"
 
 #. TRANS: Title for command results.
-#: lib/channel.php:104 lib/channel.php:125
 msgid "Command results"
 msgstr "执行结果"
 
 #. TRANS: Title for command results.
-#: lib/channel.php:138
 msgid "AJAX error"
 msgstr "AJAX 错误"
 
 #. TRANS: E-mail subject when a command has completed.
-#: lib/channel.php:177 lib/mailhandler.php:143
 msgid "Command complete"
 msgstr "执行完毕"
 
 #. TRANS: E-mail subject when a command has failed.
-#: lib/channel.php:188
 msgid "Command failed"
 msgstr "执行失败"
 
 #. TRANS: Command exception text shown when a notice ID is requested that does not exist.
-#: lib/command.php:82 lib/command.php:106
 msgid "Notice with that id does not exist."
 msgstr "没有此 id 的消息。"
 
 #. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
 #. TRANS: Error text shown when a last user notice is requested and it does not exist.
-#: lib/command.php:99 lib/command.php:642
 msgid "User has no last notice."
 msgstr "用户没有最后一条的消息。"
 
 #. TRANS: Message given requesting a profile for a non-existing user.
 #. TRANS: %s is the nickname of the user for which the profile could not be found.
-#: lib/command.php:128
 #, php-format
 msgid "Could not find a user with nickname %s."
 msgstr "无法找到昵称为 %s 的用户。"
 
 #. TRANS: Message given getting a non-existing user.
 #. TRANS: %s is the nickname of the user that could not be found.
-#: lib/command.php:148
 #, php-format
 msgid "Could not find a local user with nickname %s."
 msgstr "无法在本地找到昵称为%s的用户。"
 
 #. TRANS: Error text shown when an unimplemented command is given.
-#: lib/command.php:183
 msgid "Sorry, this command is not yet implemented."
 msgstr "对不起，这个命令还没有实现。"
 
 #. TRANS: Command exception text shown when a user tries to nudge themselves.
-#: lib/command.php:229
 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr "呼叫自己不太符合逻辑吧。"
 
 #. TRANS: Message given having nudged another user.
 #. TRANS: %s is the nickname of the user that was nudged.
-#: lib/command.php:238
 #, php-format
 msgid "Nudge sent to %s."
 msgstr "呼叫已发给 %s。"
@@ -7688,7 +6288,6 @@ msgstr "呼叫已发给 %s。"
 #. TRANS: %1$s is the number of other user the user is subscribed to.
 #. TRANS: %2$s is the number of users that are subscribed to the user.
 #. TRANS: %3$s is the number of notices the user has sent.
-#: lib/command.php:268
 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"
@@ -7700,40 +6299,34 @@ msgstr ""
 "消息数： %3$s"
 
 #. TRANS: Error message text shown when a favorite could not be set because it has already been favorited.
-#: lib/command.php:298
 #, fuzzy
 msgid "Could not create favorite: already favorited."
 msgstr "无法创建收藏。"
 
 #. TRANS: Text shown when a notice has been marked as favourite successfully.
-#: lib/command.php:324
 msgid "Notice marked as fave."
 msgstr "收藏了消息。"
 
 #. TRANS: Message given having added a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:369
 #, php-format
 msgid "%1$s joined group %2$s."
 msgstr "%1$s加入了%2$s小组。"
 
 #. TRANS: Message given having removed a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:417
 #, php-format
 msgid "%1$s left group %2$s."
 msgstr "%1$s离开了%2$s小组。"
 
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: lib/command.php:438
 #, php-format
 msgctxt "WHOIS"
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
 
 #. TRANS: Whois output. %s is the full name of the queried user.
-#: lib/command.php:442
 #, php-format
 msgid "Fullname: %s"
 msgstr "全名：%s"
@@ -7741,7 +6334,6 @@ msgstr "全名：%s"
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a location.
-#: lib/command.php:446 lib/mail.php:275
 #, php-format
 msgid "Location: %s"
 msgstr "位置：%s"
@@ -7749,20 +6341,17 @@ msgstr "位置：%s"
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is a homepage.
-#: lib/command.php:450 lib/mail.php:279
 #, php-format
 msgid "Homepage: %s"
 msgstr "主页：%s"
 
 #. TRANS: Whois output. %s is the bio information of the queried user.
-#: lib/command.php:454
 #, php-format
 msgid "About: %s"
 msgstr "关于：%s"
 
 #. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).
 #. TRANS: %s is a remote profile.
-#: lib/command.php:483
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
@@ -7771,32 +6360,31 @@ msgstr "%s是一个远程的用户；你只能给同一个服务器上的用户
 
 #. TRANS: Message given if content is too long. %1$sd is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:500
 #, php-format
 msgid "Message too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
 msgstr[0] "消息太长了 - 最大长度为%1$d字符，你发送的是%2$d字符。"
 
+#. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
+msgid "You can't send a message to this user."
+msgstr "无法向此用户发送消息。"
+
 #. TRANS: Error text shown sending a direct message fails with an unknown reason.
-#: lib/command.php:528
 msgid "Error sending direct message."
 msgstr "发送消息出错。"
 
 #. TRANS: Message given having repeated a notice from another user.
 #. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:565
 #, php-format
 msgid "Notice from %s repeated."
 msgstr "来自 %s 的消息已转发。"
 
 #. TRANS: Error text shown when repeating a notice fails with an unknown reason.
-#: lib/command.php:568
 msgid "Error repeating notice."
 msgstr "转发消息时出错。"
 
 #. TRANS: Message given if content of a notice for a reply is too long. %1$d is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:603
 #, php-format
 msgid "Notice too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Notice too long - maximum is %1$d characters, you sent %2$d."
@@ -7804,134 +6392,112 @@ msgstr[0] "消息过长 - 最长%1$d个字符，你发送的是%2$d。"
 
 #. TRANS: Text shown having sent a reply to a notice successfully.
 #. TRANS: %s is the nickname of the user of the notice the reply was sent to.
-#: lib/command.php:616
 #, php-format
 msgid "Reply to %s sent."
 msgstr "给 %s 的回复已发送。"
 
 #. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
-#: lib/command.php:619
 msgid "Error saving notice."
 msgstr "保存消息时出错。"
 
 #. TRANS: Error text shown when no username was provided when issuing a subscribe command.
-#: lib/command.php:666
 msgid "Specify the name of the user to subscribe to."
 msgstr "指定要关注的用户名。"
 
 #. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
-#: lib/command.php:675
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "无法通过命令行关注 OMB 用户。"
 
 #. TRANS: Text shown after having subscribed to another user successfully.
 #. TRANS: %s is the name of the user the subscription was requested for.
-#: lib/command.php:683
 #, php-format
 msgid "Subscribed to %s."
 msgstr "已关注%s。"
 
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.
-#: lib/command.php:704 lib/command.php:815
 msgid "Specify the name of the user to unsubscribe from."
 msgstr "指定要取消关注的用户名。"
 
 #. TRANS: Text shown after having unsubscribed from another user successfully.
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:715
 #, php-format
 msgid "Unsubscribed from %s."
 msgstr "取消关注%s。"
 
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
-#: lib/command.php:735 lib/command.php:761
 msgid "Command not yet implemented."
 msgstr "命令尚未实现。"
 
 #. TRANS: Text shown when issuing the command "off" successfully.
-#: lib/command.php:739
 msgid "Notification off."
 msgstr "通知已关闭。"
 
 #. TRANS: Error text shown when the command "off" fails for an unknown reason.
-#: lib/command.php:742
 msgid "Can't turn off notification."
 msgstr "无法关闭通知。"
 
 #. TRANS: Text shown when issuing the command "on" successfully.
-#: lib/command.php:765
 msgid "Notification on."
 msgstr "通知已开启。"
 
 #. TRANS: Error text shown when the command "on" fails for an unknown reason.
-#: lib/command.php:768
 msgid "Can't turn on notification."
 msgstr "无法开启通知。"
 
 #. TRANS: Error text shown when issuing the login command while login is disabled.
-#: lib/command.php:782
 msgid "Login command is disabled."
 msgstr "登录命令被禁用。"
 
 #. TRANS: Text shown after issuing the login command successfully.
 #. TRANS: %s is a logon link..
-#: lib/command.php:795
 #, php-format
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr "这个链接只能使用一次并且仅在2分钟内有效：%s。"
 
 #. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:824
 #, php-format
 msgid "Unsubscribed %s."
 msgstr "已取消关注%s。"
 
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
-#: lib/command.php:842
 msgid "You are not subscribed to anyone."
 msgstr "你没有关注任何人。"
 
 #. TRANS: Text shown after requesting other users a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
-#: lib/command.php:847
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "你已关注了这个用户："
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user
 #. TRANS: (followers) without having any subscribers.
-#: lib/command.php:869
 msgid "No one is subscribed to you."
 msgstr "没有人关注你。"
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
-#: lib/command.php:874
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "这个用户正在关注你："
 
 #. TRANS: Text shown after requesting groups a user is subscribed to without having
 #. TRANS: any group subscriptions.
-#: lib/command.php:896
 msgid "You are not a member of any groups."
 msgstr "你还未成为任何一个小组的成员。"
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
-#: lib/command.php:901
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "你是该小组成员："
 
 #. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-#: lib/command.php:916
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -8012,214 +6578,171 @@ msgstr ""
 "tracking - 尚未实现。\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:36
 msgid "No configuration file found."
 msgstr "没有找到配置文件。"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:39
 msgid "I looked for configuration files in the following places:"
 msgstr "我在以下位置查找了配置文件："
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:42
 msgid "You may wish to run the installer to fix this."
 msgstr "或许你想运行安装程序来解决这个问题。"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:46
 msgid "Go to the installer."
 msgstr "去安装程序。"
 
-#: lib/dberroraction.php:59
 msgid "Database error"
 msgstr "数据库错误"
 
 #. TRANS: Description of form for deleting a user.
-#: lib/deleteuserform.php:75
 msgid "Delete this user"
 msgstr "删除这个用户"
 
-#: lib/designform.php:114
 #, fuzzy
 msgid "Change design"
 msgstr "保存外观"
 
 #. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: lib/designform.php:131
 msgid "Change colours"
 msgstr "改变颜色"
 
 #. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: lib/designform.php:138
 msgid "Use defaults"
 msgstr "使用默认值"
 
 #. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: lib/designform.php:140
 msgid "Restore default designs"
 msgstr "恢复默认外观"
 
 #. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: lib/designform.php:148
 msgid "Reset back to default"
 msgstr "重置到默认"
 
 #. TRANS: Label in form on profile design page.
 #. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
-#: lib/designform.php:158
 msgid "Upload file"
 msgstr "上传文件"
 
 #. TRANS: Instructions for form on profile design page.
-#: lib/designform.php:163
 #, fuzzy
 msgid ""
 "You can upload your personal background image. The maximum file size is 2Mb."
 msgstr "你可以上传你的个人页面背景。文件最大 2MB。"
 
 #. TRANS: Radio button on profile design page that will enable use of the uploaded profile image.
-#: lib/designform.php:194
 msgctxt "RADIO"
 msgid "On"
 msgstr "打开"
 
 #. TRANS: Radio button on profile design page that will disable use of the uploaded profile image.
-#: lib/designform.php:211
 msgctxt "RADIO"
 msgid "Off"
 msgstr "关闭"
 
 #. TRANS: Title for button on profile design page to save settings.
-#: lib/designform.php:322
 msgid "Save design"
 msgstr "保存外观"
 
 #. TRANS: Error message displayed if design settings could not be saved.
 #. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
-#: lib/designsettings.php:216 lib/designsettings.php:238
 msgid "Couldn't update your design."
 msgstr "无法更新你的外观。"
 
 #. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
-#: lib/designsettings.php:244
 msgid "Design defaults restored."
 msgstr "默认外观已恢复。"
 
 #. TRANS: Exception. %s is an ID.
-#: lib/discovery.php:153
 #, php-format
 msgid "Unable to find services for %s."
 msgstr "无法找到 %s 的服务。"
 
 #. TRANS: Form legend for removing the favourite status for a favourite notice.
 #. TRANS: Title for button text for removing the favourite status for a favourite notice.
-#: lib/disfavorform.php:108 lib/disfavorform.php:140
 msgid "Disfavor this notice"
 msgstr "取消收藏这个消息"
 
 #. TRANS: Button text for removing the favourite status for a favourite notice.
-#: lib/disfavorform.php:136
 msgctxt "BUTTON"
 msgid "Disfavor favorite"
 msgstr "不赞成的最爱"
 
 #. TRANS: Form legend for adding the favourite status to a notice.
 #. TRANS: Title for button text for adding the favourite status to a notice.
-#: lib/favorform.php:108 lib/favorform.php:139
 msgid "Favor this notice"
 msgstr "收藏"
 
 #. TRANS: Button text for adding the favourite status to a notice.
-#: lib/favorform.php:135
 msgctxt "BUTTON"
 msgid "Favor"
 msgstr "请"
 
-#: lib/feed.php:84
 msgid "RSS 1.0"
 msgstr "RSS 1.0"
 
-#: lib/feed.php:86
 msgid "RSS 2.0"
 msgstr "RSS 2.0"
 
-#: lib/feed.php:88
 msgid "Atom"
 msgstr "Atom"
 
-#: lib/feed.php:90
 msgid "FOAF"
 msgstr "FOAF"
 
-#: lib/feedimporter.php:75
 msgid "Not an atom feed."
 msgstr "不是一个Atom源"
 
-#: lib/feedimporter.php:82
 msgid "No author in the feed."
 msgstr "没有在源中的作者。"
 
-#: lib/feedimporter.php:89
 msgid "Can't import without a user."
 msgstr "没有用户无法导入。"
 
 #. TRANS: Header for feed links (h2).
-#: lib/feedlist.php:66
 msgid "Feeds"
 msgstr "Feeds"
 
-#: lib/galleryaction.php:128
 msgid "All"
 msgstr "全部"
 
-#: lib/galleryaction.php:136
 msgid "Select tag to filter"
 msgstr "选择要过滤的标签"
 
-#: lib/galleryaction.php:137
 msgid "Tag"
 msgstr "标签"
 
-#: lib/galleryaction.php:138
 msgid "Choose a tag to narrow list"
 msgstr "选择标签缩小清单"
 
-#: lib/galleryaction.php:140
 msgid "Go"
 msgstr "执行"
 
-#: lib/grantroleform.php:91
 #, php-format
 msgid "Grant this user the \"%s\" role"
 msgstr "给这个用户添加\\\"%s\\\"权限"
 
-#: lib/groupeditform.php:147
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "1 到 64 个小写字母或数字，不包含标点或空格"
 
-#: lib/groupeditform.php:156
 msgid "URL of the homepage or blog of the group or topic."
 msgstr "这个小组或主题的主页或博客 URL。"
 
-#: lib/groupeditform.php:161
 msgid "Describe the group or topic"
 msgstr "小组或主题的描述"
 
-#: lib/groupeditform.php:163
 #, php-format
 msgid "Describe the group or topic in %d character or less"
 msgid_plural "Describe the group or topic in %d characters or less"
 msgstr[0] "用不超过%d个字符描述下这个小组或者主题"
 
-#: lib/groupeditform.php:175
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\"."
 msgstr "小组的地理位置，例如“国家、省份、城市”。"
 
-#: lib/groupeditform.php:183
 #, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -8230,70 +6753,60 @@ msgid_plural ""
 msgstr[0] "该小组额外的昵称，用逗号或者空格分隔开，最多%d个别名。"
 
 #. TRANS: Menu item in the group navigation page.
-#: lib/groupnav.php:86
 msgctxt "MENU"
 msgid "Group"
 msgstr "小组"
 
 #. TRANS: Tooltip for menu item in the group navigation page.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:89
 #, php-format
 msgctxt "TOOLTIP"
 msgid "%s group"
 msgstr "%s小组"
 
 #. TRANS: Menu item in the group navigation page.
-#: lib/groupnav.php:95
 msgctxt "MENU"
 msgid "Members"
 msgstr "组员"
 
 #. TRANS: Tooltip for menu item in the group navigation page.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:98
 #, php-format
 msgctxt "TOOLTIP"
 msgid "%s group members"
 msgstr "%s 小组成员"
 
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/groupnav.php:108
 msgctxt "MENU"
 msgid "Blocked"
 msgstr "屏蔽的用户"
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:111
 #, php-format
 msgctxt "TOOLTIP"
 msgid "%s blocked users"
 msgstr "%s 屏蔽的用户"
 
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "管理"
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:120
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Edit %s group properties"
 msgstr "编辑 %s 小组设置"
 
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/groupnav.php:126
 msgctxt "MENU"
 msgid "Logo"
 msgstr "Logo"
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:129
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Add or edit %s logo"
@@ -8301,89 +6814,74 @@ msgstr "添加或编辑 %s logo"
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:138
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Add or edit %s design"
 msgstr "添加或编辑 %s 外观"
 
 #. TRANS: Title for groups with the most members section.
-#: lib/groupsbymemberssection.php:71
 msgid "Groups with most members"
 msgstr "人气最旺的小组"
 
 #. TRANS: Title for groups with the most posts section.
-#: lib/groupsbypostssection.php:71
 msgid "Groups with most posts"
 msgstr "发布消息最多的小组"
 
 #. TRANS: Title for group tag cloud section.
 #. TRANS: %s is a group name.
-#: lib/grouptagcloudsection.php:57
 #, php-format
 msgid "Tags in %s group's notices"
 msgstr "这个组所发布的消息的标签"
 
 #. TRANS: Client exception 406
-#: lib/htmloutputter.php:104
 msgid "This page is not available in a media type you accept"
 msgstr "这个页面不提供你想要的媒体类型"
 
 #. TRANS: Exception thrown when trying to upload an unsupported image file format.
-#: lib/imagefile.php:73
 msgid "Unsupported image file format."
 msgstr "不支持这种图像格式。"
 
 #. TRANS: Exception thrown when too large a file is uploaded.
 #. TRANS: %s is the maximum file size, for example "500b", "10kB" or "2MB".
-#: lib/imagefile.php:91
 #, php-format
 msgid "That file is too big. The maximum file size is %s."
 msgstr "文件太大。文件大小限制在%s以下。"
 
 #. TRANS: Exception thrown when uploading an image and that action could not be completed.
-#: lib/imagefile.php:97
 msgid "Partial upload."
 msgstr "部分上传。"
 
 #. TRANS: Exception thrown when uploading a file as image that is not an image or is a corrupt file.
-#: lib/imagefile.php:115
 msgid "Not an image or corrupt file."
 msgstr "不是图片文件或文件已损坏。"
 
 #. TRANS: Exception thrown during resize when image has been registered as present, but is no longer there.
-#: lib/imagefile.php:178
 msgid "Lost our file."
 msgstr "文件数据丢失"
 
 #. TRANS: Exception thrown when trying to resize an unknown file type.
 #. TRANS: Exception thrown when trying resize an unknown file type.
-#: lib/imagefile.php:216 lib/imagefile.php:257
 msgid "Unknown file type"
 msgstr "未知文件类型"
 
 #. TRANS: Number of megabytes. %d is the number.
-#: lib/imagefile.php:303
 #, php-format
 msgid "%dMB"
 msgid_plural "%dMB"
 msgstr[0] "%dMB"
 
 #. TRANS: Number of kilobytes. %d is the number.
-#: lib/imagefile.php:307
 #, php-format
 msgid "%dkB"
 msgid_plural "%dkB"
 msgstr[0] "%dkB"
 
 #. TRANS: Number of bytes. %d is the number.
-#: lib/imagefile.php:310
 #, php-format
 msgid "%dB"
 msgid_plural "%dB"
 msgstr[0] "%dB"
 
-#: lib/implugin.php:262
 #, php-format
 msgid ""
 "User \"%s\" on %s has said that your %s screenname belongs to them. If "
@@ -8393,51 +6891,42 @@ msgid ""
 "message."
 msgstr ""
 
-#: lib/implugin.php:349
 #, php-format
 msgid "Unknown inbox source %d."
 msgstr "未知的收件箱来源%d。"
 
-#: lib/implugin.php:485
-#, fuzzy, php-format
+#, php-format
 msgid "Message too long - maximum is %1$d characters, you sent %2$d."
-msgstr "消息太长了 - 最大长度为%1$d字符，你发送的是%2$d字符。"
+msgstr "消息包含%2$d个字符，超出长度限制 - 不能超过%1$d个字符。"
 
-#: lib/leaveform.php:114
 msgid "Leave"
 msgstr "离开"
 
 #. TRANS: Menu item for logging in to the StatusNet site.
-#: lib/logingroupnav.php:77
 msgctxt "MENU"
 msgid "Login"
 msgstr "登录"
 
 #. TRANS: Title for menu item for logging in to the StatusNet site.
-#: lib/logingroupnav.php:79
 msgid "Login with a username and password"
 msgstr "用用户名和密码登录。"
 
 #. TRANS: Menu item for registering with the StatusNet site.
-#: lib/logingroupnav.php:85
 msgctxt "MENU"
 msgid "Register"
 msgstr "注册"
 
 #. TRANS: Title for menu item for registering with the StatusNet site.
-#: lib/logingroupnav.php:87
 msgid "Sign up for a new account"
 msgstr "注册一个新帐户"
 
 #. TRANS: Subject for address confirmation email.
-#: lib/mail.php:172
 msgid "Email address confirmation"
 msgstr "电子邮件地址确认"
 
 #. TRANS: Body for address confirmation email.
 #. TRANS: %1$s is the addressed user's nickname, %2$s is the StatusNet sitename,
 #. TRANS: %3$s is the URL to confirm at.
-#: lib/mail.php:177
 #, php-format
 msgid ""
 "Hey, %1$s.\n"
@@ -8468,14 +6957,12 @@ msgstr ""
 
 #. TRANS: Subject of new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
-#: lib/mail.php:243
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1$s 开始关注你在 %2$s 的消息。"
 
 #. TRANS: This is a paragraph in a new-subscriber e-mail.
 #. TRANS: %s is a URL where the subscriber can be reported as abusive.
-#: lib/mail.php:250
 #, php-format
 msgid ""
 "If you believe this account is being used abusively, you can block them from "
@@ -8489,7 +6976,6 @@ msgstr ""
 #. TRANS: %3$s is the subscriber's profile URL, %4$s is the subscriber's location (or empty)
 #. TRANS: %5$s is the subscriber's homepage URL (or empty), %6%s is the subscriber's bio (or empty)
 #. TRANS: %7$s is a link to the addressed user's e-mail settings.
-#: lib/mail.php:260
 #, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -8516,14 +7002,12 @@ msgstr ""
 
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is biographical information.
-#: lib/mail.php:283
 #, php-format
 msgid "Bio: %s"
 msgstr "自我介绍：%s"
 
 #. TRANS: Subject of notification mail for new posting email address.
 #. TRANS: %s is the StatusNet sitename.
-#: lib/mail.php:312
 #, php-format
 msgid "New email address for posting to %s"
 msgstr "新的电子邮件地址，用于发布 %s 信息"
@@ -8531,7 +7015,6 @@ msgstr "新的电子邮件地址，用于发布 %s 信息"
 #. TRANS: Body of notification mail for new posting email address.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is the e-mail address to send
 #. TRANS: to to post by e-mail, %3$s is a URL to more instructions.
-#: lib/mail.php:318
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -8555,26 +7038,22 @@ msgstr ""
 
 #. TRANS: Subject line for SMS-by-email notification messages.
 #. TRANS: %s is the posting user's nickname.
-#: lib/mail.php:439
 #, php-format
 msgid "%s status"
 msgstr "%s 状态"
 
 #. TRANS: Subject line for SMS-by-email address confirmation message.
-#: lib/mail.php:465
 msgid "SMS confirmation"
 msgstr "SMS 验证"
 
 #. TRANS: Main body heading for SMS-by-email address confirmation message.
 #. TRANS: %s is the addressed user's nickname.
-#: lib/mail.php:469
 #, php-format
 msgid "%s: confirm you own this phone number with this code:"
 msgstr "%s：通过此代码证明这是你的手机："
 
 #. TRANS: Subject for 'nudge' notification email.
 #. TRANS: %s is the nudging user.
-#: lib/mail.php:490
 #, php-format
 msgid "You have been nudged by %s"
 msgstr "您被 %s 已推动"
@@ -8582,7 +7061,6 @@ msgstr "您被 %s 已推动"
 #. TRANS: Body for 'nudge' notification email.
 #. TRANS: %1$s is the nuding user's long name, $2$s is the nudging user's nickname,
 #. TRANS: %3$s is a URL to post notices at, %4$s is the StatusNet sitename.
-#: lib/mail.php:497
 #, php-format
 msgid ""
 "%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -8610,7 +7088,6 @@ msgstr ""
 
 #. TRANS: Subject for direct-message notification email.
 #. TRANS: %s is the sending user's nickname.
-#: lib/mail.php:544
 #, php-format
 msgid "New private message from %s"
 msgstr "来自%s的私信"
@@ -8619,7 +7096,6 @@ msgstr "来自%s的私信"
 #. TRANS: %1$s is the sending user's long name, %2$s is the sending user's nickname,
 #. TRANS: %3$s is the message content, %4$s a URL to the message,
 #. TRANS: %5$s is the StatusNet sitename.
-#: lib/mail.php:552
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -8654,7 +7130,6 @@ msgstr ""
 
 #. TRANS: Subject for favorite notification e-mail.
 #. TRANS: %1$s is the adding user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:604
 #, php-format
 msgid "%1$s (@%2$s) added your notice as a favorite"
 msgstr "%1$s (@%2$s) 收藏了你的消息"
@@ -8664,7 +7139,6 @@ msgstr "%1$s (@%2$s) 收藏了你的消息"
 #. TRANS: %3$s is a URL to the faved notice, %4$s is the faved notice text,
 #. TRANS: %5$s is a URL to all faves of the adding user, %6$s is the StatusNet sitename,
 #. TRANS: %7$s is the adding user's nickname.
-#: lib/mail.php:611
 #, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -8702,7 +7176,6 @@ msgstr ""
 "%6$s\n"
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:669
 #, php-format
 msgid ""
 "The full conversation can be read here:\n"
@@ -8715,7 +7188,6 @@ msgstr ""
 
 #. TRANS: E-mail subject for notice notification.
 #. TRANS: %1$s is the sending user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:677
 #, php-format
 msgid "%1$s (@%2$s) sent a notice to your attention"
 msgstr "%1$s (@%2$s) 给你发送了一条消息"
@@ -8726,7 +7198,6 @@ msgstr "%1$s (@%2$s) 给你发送了一条消息"
 #. TRANS: %5$s is a URL to the full conversion if it exists (otherwise empty),
 #. TRANS: %6$s is a URL to reply to the notice, %7$s is a URL to all @-replied for the addressed user,
 #. TRANS: %8$s is a URL to the addressed user's e-mail settings, %9$s is the sender's nickname.
-#: lib/mail.php:685
 #, php-format
 msgid ""
 "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -8775,11 +7246,9 @@ msgstr ""
 "\n"
 "P.S. 你可以到这里关掉这些邮件提醒：%8$s\n"
 
-#: lib/mailbox.php:87
 msgid "Only the user can read their own mailboxes."
 msgstr "只有该用户才能查看自己的私信。"
 
-#: lib/mailbox.php:125
 msgid ""
 "You have no private messages. You can send private message to engage other "
 "users in conversation. People can send you messages for your eyes only."
@@ -8787,53 +7256,43 @@ msgstr ""
 "你没有任何私信。你可以试着发送私信给其他用户鼓励他们用私信和你交流。其他用户"
 "发给你你私信只有你看得到。"
 
-#: lib/mailhandler.php:37
 msgid "Could not parse message."
 msgstr "无法解析消息。"
 
-#: lib/mailhandler.php:42
 msgid "Not a registered user."
 msgstr "不是已注册用户。"
 
-#: lib/mailhandler.php:46
 msgid "Sorry, that is not your incoming email address."
 msgstr "抱歉，这个不是你的收信电子邮件地址。"
 
-#: lib/mailhandler.php:50
 msgid "Sorry, no incoming email allowed."
 msgstr "抱歉，现在不允许电子邮件发布。"
 
-#: lib/mailhandler.php:229
 #, php-format
 msgid "Unsupported message type: %s"
 msgstr "不支持的信息格式：%s"
 
 #. TRANS: Client exception thrown when a database error was thrown during a file upload operation.
-#: lib/mediafile.php:102 lib/mediafile.php:174
 msgid "There was a database error while saving your file. Please try again."
 msgstr "保存你的文件时数据库出现了一个错误。请重试。"
 
 #. TRANS: Client exception thrown when a file upload operation would cause a user to exceed a set quota.
-#: lib/mediafile.php:238 lib/mediafile.php:281
 msgid "File exceeds user's quota."
 msgstr "文件超过了用户的配额。"
 
 #. TRANS: Client exception thrown when a file upload operation fails because the file could
 #. TRANS: not be moved from the temporary folder to the permanent file location.
-#: lib/mediafile.php:258 lib/mediafile.php:300
 msgid "File could not be moved to destination directory."
 msgstr "文件不能被移动到目标目录。"
 
 #. TRANS: Client exception thrown when a file upload operation has been stopped because the MIME
 #. TRANS: type of the uploaded file could not be determined.
-#: lib/mediafile.php:265 lib/mediafile.php:306
 msgid "Could not determine file's MIME type."
 msgstr "无法判断文件的 MIME 类型。"
 
 #. TRANS: Client exception thrown trying to upload a forbidden MIME type.
 #. TRANS: %1$s is the file type that was denied, %2$s is the application part of
 #. TRANS: the MIME type that was denied.
-#: lib/mediafile.php:396
 #, php-format
 msgid ""
 "\"%1$s\" is not a supported file type on this server. Try using another %2$s "
@@ -8842,879 +7301,577 @@ msgstr "此服务器不支持 “%1$s” 的文件格式，试下使用其他的
 
 #. TRANS: Client exception thrown trying to upload a forbidden MIME type.
 #. TRANS: %s is the file type that was denied.
-#: lib/mediafile.php:401
 #, php-format
 msgid "\"%s\" is not a supported file type on this server."
 msgstr "这个服务器不支持 %s 的文件格式。"
 
-#: lib/messageform.php:120
 msgid "Send a direct notice"
 msgstr "发送一条私信"
 
 #. TRANS Label entry in drop-down selection box in direct-message inbox/outbox. This is the default entry in the drop-down box, doubling as instructions and a brake against accidental submissions with the first user in the list.
-#: lib/messageform.php:137
 msgid "Select recipient:"
 msgstr "选择收件人："
 
 #. TRANS Entry in drop-down selection box in direct-message inbox/outbox when no one is available to message.
-#: lib/messageform.php:150
 msgid "No mutual subscribers."
 msgstr "没有共同的关注者。"
 
-#: lib/messageform.php:153
 msgid "To"
 msgstr "到"
 
-#: lib/messageform.php:184 lib/noticeform.php:236
 msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr "发布"
 
-#: lib/messagelist.php:77
 msgid "Messages"
 msgstr "消息"
 
-#: lib/messagelistitem.php:123 lib/noticelist.php:527
 msgid "from"
 msgstr "通过"
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:178
 msgid "Nickname cannot be empty."
 msgstr "昵称不能为空。"
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:191
 #, php-format
 msgid "Nickname cannot be more than %d character long."
 msgid_plural "Nickname cannot be more than %d characters long."
 msgstr[0] "昵称长度不能超过%d字符。"
 
-#: lib/noticeform.php:160
+#. TRANS: Form legend for notice form.
 msgid "Send a notice"
 msgstr "发送一个通知"
 
-#: lib/noticeform.php:174
+#. TRANS: Title for notice label. %s is the user's nickname.
 #, php-format
 msgid "What's up, %s?"
 msgstr "%s，最近怎么样？"
 
-#: lib/noticeform.php:193
+#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr "附件"
 
-#: lib/noticeform.php:197
-msgid "Attach a file"
+#. TRANS: Title for input field to attach a file to a notice.
+#, fuzzy
+msgid "Attach a file."
 msgstr "添加一个文件附件"
 
-#: lib/noticeform.php:212
+#. TRANS: Field label to add location to a notice.
 msgid "Share my location"
 msgstr "分享我的地理位置。"
 
-#: lib/noticeform.php:215
+#. TRANS: Text to not share location for a notice in notice form.
 msgid "Do not share my location"
 msgstr "不要分享我的地理位置。"
 
-#: lib/noticeform.php:216
+#. TRANS: Timeout error text for location retrieval in notice form.
 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
 "try again later"
 msgstr "抱歉，获取你的地理位置时间过长，请稍候重试"
 
 #. TRANS: Used in coordinates as abbreviation of north
-#: lib/noticelist.php:457
 msgid "N"
 msgstr "N"
 
 #. TRANS: Used in coordinates as abbreviation of south
-#: lib/noticelist.php:459
 msgid "S"
 msgstr "S"
 
 #. TRANS: Used in coordinates as abbreviation of east
-#: lib/noticelist.php:461
 msgid "E"
 msgstr "E"
 
 #. TRANS: Used in coordinates as abbreviation of west
-#: lib/noticelist.php:463
 msgid "W"
 msgstr "W"
 
-#: lib/noticelist.php:465
 #, php-format
 msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 
-#: lib/noticelist.php:474
 msgid "at"
 msgstr "位于"
 
-#: lib/noticelist.php:523
 msgid "web"
 msgstr "网页"
 
-#: lib/noticelist.php:589
 msgid "in context"
 msgstr "查看对话"
 
-#: lib/noticelist.php:624
 msgid "Repeated by"
 msgstr "转发来自"
 
-#: lib/noticelist.php:651
 msgid "Reply to this notice"
 msgstr "回复"
 
-#: lib/noticelist.php:652
 msgid "Reply"
 msgstr "回复"
 
-#: lib/noticelist.php:678
 msgid "Delete this notice"
 msgstr "删除"
 
-#: lib/noticelist.php:696
 msgid "Notice repeated"
 msgstr "消息已转发"
 
-#: lib/nudgeform.php:116
 msgid "Nudge this user"
 msgstr "呼叫用户"
 
-#: lib/nudgeform.php:128
 msgid "Nudge"
 msgstr "呼叫"
 
-#: lib/nudgeform.php:128
 msgid "Send a nudge to this user"
 msgstr "呼叫这个用户"
 
-#: lib/oauthstore.php:294
 msgid "Error inserting new profile."
 msgstr "添加新个人信息出错。"
 
-#: lib/oauthstore.php:302
 msgid "Error inserting avatar."
 msgstr "添加头像出错。"
 
-#: lib/oauthstore.php:322
 msgid "Error inserting remote profile."
 msgstr "添加远程个人信息时出错。"
 
 #. TRANS: Exception thrown when a notice is denied because it has been sent before.
-#: lib/oauthstore.php:362
 msgid "Duplicate notice."
 msgstr "复制消息。"
 
-#: lib/oauthstore.php:507
 msgid "Couldn't insert new subscription."
 msgstr "无法添加新的关注。"
 
-#: lib/personalgroupnav.php:104
-#, fuzzy
 msgid "Replies"
 msgstr "答复"
 
-#: lib/personalgroupnav.php:109
-#, fuzzy
 msgid "Favorites"
 msgstr "收藏夹"
 
-#: lib/personalgroupnav.php:120
-#, fuzzy
 msgid "Inbox"
 msgstr "收件箱"
 
-#: lib/personalgroupnav.php:121
 msgid "Your incoming messages"
 msgstr "你收到的私信"
 
-#: lib/personalgroupnav.php:125
-#, fuzzy
 msgid "Outbox"
 msgstr "发件箱"
 
-#: lib/personalgroupnav.php:126
 msgid "Your sent messages"
 msgstr "你发送的私信"
 
 #. TRANS: Title for personal tag cloud section. %s is a user nickname.
-#: lib/personaltagcloudsection.php:56
 #, php-format
 msgid "Tags in %s's notices"
 msgstr "%s的消息中的标签"
 
 #. TRANS: Displayed as version information for a plugin if no version information was found.
-#: lib/plugin.php:126
 msgid "Unknown"
 msgstr "未知的"
 
 #. TRANS: Plugin admin panel controls
-#: lib/plugindisableform.php:90
 msgctxt "plugin"
 msgid "Disable"
 msgstr ""
 
 #. TRANS: Plugin admin panel controls
-#: lib/pluginenableform.php:112
 msgctxt "plugin"
 msgid "Enable"
 msgstr ""
 
-#: lib/pluginlist.php:196
 msgctxt "plugin-description"
 msgid "(Plugin descriptions unavailable when disabled.)"
 msgstr ""
 
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:88
 msgid "Subscriptions"
 msgstr "关注的"
 
 #. TRANS: Text for user subscription statistics if user has more subscriptions than displayed.
-#: lib/profileaction.php:144
 msgid "All subscriptions"
 msgstr "所有关注的"
 
 #. TRANS: H2 text for user subscriber statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:96
 msgid "Subscribers"
 msgstr "关注者"
 
 #. TRANS: Text for user subscription statistics if user has more subscribers than displayed.
-#: lib/profileaction.php:181
 msgid "All subscribers"
 msgstr "所有关注者"
 
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:213
 msgid "User ID"
 msgstr "用户 ID"
 
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:219
 msgid "Member since"
 msgstr "注册时间"
 
 #. TRANS: Label for user statistics.
 #. TRANS: H2 text for user group membership statistics.
-#: lib/profileaction.php:239 lib/profileaction.php:290
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:104
 msgid "Groups"
 msgstr "小组"
 
 #. TRANS: Label for user statistics.
 #. TRANS: Average count of posts made per day since account registration.
-#: lib/profileaction.php:253
 msgid "Daily average"
 msgstr "日均"
 
 #. TRANS: Text for user group membership statistics if user has more subscriptions than displayed.
-#: lib/profileaction.php:305
 msgid "All groups"
 msgstr "所有小组"
 
 #. TRANS: Server error displayed when using an unimplemented method.
-#: lib/profileformaction.php:123
 msgid "Unimplemented method."
 msgstr "未使用的方法。"
 
-#: lib/publicgroupnav.php:82
 msgid "User groups"
 msgstr "用户小组"
 
-#: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
 msgid "Recent tags"
 msgstr "最近标签"
 
-#: lib/publicgroupnav.php:88
 msgid "Featured"
 msgstr "推荐用户"
 
-#: lib/publicgroupnav.php:92
 msgid "Popular"
 msgstr "热门收藏"
 
-#: lib/redirectingaction.php:95
 msgid "No return-to arguments."
 msgstr "没有 return-to 冲突。"
 
-#: lib/repeatform.php:107
 msgid "Repeat this notice?"
 msgstr "转发这个消息？"
 
-#: lib/repeatform.php:132
 msgid "Yes"
 msgstr "是"
 
-#: lib/repeatform.php:132
 msgid "Repeat this notice"
 msgstr "转发"
 
-#: lib/revokeroleform.php:91
 #, php-format
 msgid "Revoke the \"%s\" role from this user"
 msgstr "取消这个用户的\"%s\"权限"
 
 #. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:1001
 msgid "Page not found."
 msgstr "没有找到页面。"
 
-#: lib/sandboxform.php:67
 msgid "Sandbox"
 msgstr "沙盒"
 
-#: lib/sandboxform.php:78
 msgid "Sandbox this user"
 msgstr "将这个用户放入沙盒。"
 
 #. TRANS: Fieldset legend for the search form.
-#: lib/searchaction.php:120
 msgid "Search site"
 msgstr "搜索帮助"
 
 #. TRANS: Used as a field label for the field where one or more keywords
 #. TRANS: for searching can be entered.
-#: lib/searchaction.php:128
 msgid "Keyword(s)"
 msgstr "关键词"
 
 #. TRANS: Button text for searching site.
-#: lib/searchaction.php:130
 msgctxt "BUTTON"
 msgid "Search"
 msgstr "搜索"
 
-#: lib/searchgroupnav.php:80
 msgid "People"
 msgstr "用户"
 
-#: lib/searchgroupnav.php:81
 msgid "Find people on this site"
 msgstr "搜索本站用户"
 
-#: lib/searchgroupnav.php:83
 msgid "Find content of notices"
 msgstr "搜索消息内容"
 
-#: lib/searchgroupnav.php:85
 msgid "Find groups on this site"
 msgstr "搜索本站小组"
 
-#: lib/section.php:89
 msgid "Untitled section"
 msgstr "无标题章节"
 
-#: lib/section.php:106
 msgid "More..."
 msgstr "更多..."
 
-#: lib/settingsnav.php:78
 msgid "Change your profile settings"
 msgstr "修改你的个人信息"
 
-#: lib/settingsnav.php:83
 msgid "Upload an avatar"
 msgstr "上传一个头像。"
 
-#: lib/settingsnav.php:88
 msgid "Change your password"
 msgstr "修改密码"
 
-#: lib/settingsnav.php:93
 msgid "Change email handling"
 msgstr "修改电子邮件"
 
-#: lib/settingsnav.php:98
 msgid "Design your profile"
 msgstr "设计你的个人页面外观"
 
-#: lib/settingsnav.php:102
 msgid "URL"
 msgstr "URL 互联网地址"
 
-#: lib/settingsnav.php:103
 msgid "URL shorteners"
 msgstr ""
 
-#: lib/settingsnav.php:111
 msgid "Updates by instant messenger (IM)"
 msgstr "使用即时通讯工具(IM)更新"
 
-#: lib/settingsnav.php:118
 msgid "Updates by SMS"
 msgstr "使用 SMS 更新"
 
-#: lib/settingsnav.php:123
-#, fuzzy
 msgid "Connections"
 msgstr "关联"
 
-#: lib/settingsnav.php:124
 msgid "Authorized connected applications"
 msgstr "被授权已连接的应用"
 
-#: lib/silenceform.php:67
 msgid "Silence"
 msgstr "禁言"
 
-#: lib/silenceform.php:78
 msgid "Silence this user"
 msgstr "将此用户禁言"
 
-#: lib/subgroupnav.php:89
 #, php-format
 msgid "People %s subscribes to"
 msgstr "%s关注的用户"
 
-#: lib/subgroupnav.php:97
 #, php-format
 msgid "People subscribed to %s"
 msgstr "关注了%s的用户"
 
-#: lib/subgroupnav.php:105
 #, php-format
 msgid "Groups %s is a member of"
 msgstr "%s 组是成员组成了"
 
-#: lib/subgroupnav.php:111
 msgid "Invite"
 msgstr "邀请"
 
-#: lib/subgroupnav.php:112
 #, php-format
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "邀请朋友和同事来%s一起和你交流"
 
-#: lib/subscribeform.php:115 lib/subscribeform.php:139
 msgid "Subscribe to this user"
 msgstr "关注这个用户"
 
-#: lib/subscriberspeopleselftagcloudsection.php:48
-#: lib/subscriptionspeopleselftagcloudsection.php:48
 msgid "People Tagcloud as self-tagged"
 msgstr "自己添加标签的用户标签云"
 
-#: lib/subscriberspeopletagcloudsection.php:48
-#: lib/subscriptionspeopletagcloudsection.php:48
 msgid "People Tagcloud as tagged"
 msgstr "被添加标签的用户标签云"
 
-#: lib/tagcloudsection.php:56
 msgid "None"
 msgstr "无"
 
 #. TRANS: Server exception displayed if a theme name was invalid.
-#: lib/theme.php:74
 msgid "Invalid theme name."
 msgstr "无效的主题名。"
 
-#: lib/themeuploader.php:50
 msgid "This server cannot handle theme uploads without ZIP support."
 msgstr "服务器不支持 ZIP，无法处理上传的主题。"
 
-#: lib/themeuploader.php:58 lib/themeuploader.php:61
 msgid "The theme file is missing or the upload failed."
 msgstr "主题文件丢失或上传失败。"
 
-#: lib/themeuploader.php:91 lib/themeuploader.php:102
-#: lib/themeuploader.php:279 lib/themeuploader.php:283
-#: lib/themeuploader.php:291 lib/themeuploader.php:298
 msgid "Failed saving theme."
 msgstr "保存主题失败"
 
-#: lib/themeuploader.php:147
 msgid "Invalid theme: bad directory structure."
 msgstr "无效的主题：目录结构损坏。"
 
-#: lib/themeuploader.php:166
 #, php-format
 msgid "Uploaded theme is too large; must be less than %d byte uncompressed."
 msgid_plural ""
 "Uploaded theme is too large; must be less than %d bytes uncompressed."
 msgstr[0] "上传的主题过大，解压后必须小于%d字节。"
 
-#: lib/themeuploader.php:179
 msgid "Invalid theme archive: missing file css/display.css"
 msgstr "无效的主题存档：css/display.css 文件丢失"
 
-#: lib/themeuploader.php:219
 msgid ""
 "Theme contains invalid file or folder name. Stick with ASCII letters, "
 "digits, underscore, and minus sign."
 msgstr ""
 "主题包含无效的文件或文件夹的名称。请只使用 ASCII 字母，数字，下划线和减号。"
 
-#: lib/themeuploader.php:225
 msgid "Theme contains unsafe file extension names; may be unsafe."
 msgstr "主题包含不安全的文件扩展名，可能有危险。"
 
-#: lib/themeuploader.php:242
 #, php-format
 msgid "Theme contains file of type '.%s', which is not allowed."
 msgstr "主题包含不允许的”.%s“格式文件。"
 
-#: lib/themeuploader.php:260
 msgid "Error opening theme archive."
 msgstr "打开主题文件时出错。"
 
-#: lib/threadednoticelist.php:270
-#, php-format
-msgid "Show all %d comment"
-msgid_plural "Show all %d comments"
-msgstr[0] ""
+#, fuzzy, php-format
+msgid "Show %d reply"
+msgid_plural "Show all %d replies"
+msgstr[0] "显示更多"
 
-#: lib/topposterssection.php:74
 msgid "Top posters"
 msgstr "灌水精英"
 
 #. TRANS: Title for the form to unblock a user.
-#: lib/unblockform.php:67
 msgctxt "TITLE"
 msgid "Unblock"
 msgstr "取消屏蔽"
 
-#: lib/unsandboxform.php:69
 msgid "Unsandbox"
 msgstr "移出沙盒"
 
-#: lib/unsandboxform.php:80
 msgid "Unsandbox this user"
 msgstr "将这个用户从沙盒中移出"
 
-#: lib/unsilenceform.php:67
 msgid "Unsilence"
 msgstr "取消禁言"
 
-#: lib/unsilenceform.php:78
 msgid "Unsilence this user"
 msgstr "取消对这个用户的禁言"
 
-#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
 msgid "Unsubscribe from this user"
 msgstr "取消关注这个用户"
 
-#: lib/unsubscribeform.php:137
 msgid "Unsubscribe"
 msgstr "取消关注"
 
 #. 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).
-#: lib/usernoprofileexception.php:60
 #, php-format
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "用户 %1$s (%2$d) 没有个人信息记录。"
 
-#: lib/userprofile.php:116
 msgid "Edit Avatar"
 msgstr "编辑头像"
 
 #. TRANS: H2 for user actions in a profile.
 #. TRANS: H2 for entity actions in a profile.
-#: lib/userprofile.php:216 lib/userprofile.php:232
 msgid "User actions"
 msgstr "用户动作"
 
 #. TRANS: Text shown in user profile of not yet compeltely deleted users.
-#: lib/userprofile.php:220
 msgid "User deletion in progress..."
 msgstr "用户删除处理中……"
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:248
 msgid "Edit profile settings"
 msgstr "编辑个人信息设置"
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:250
 msgid "Edit"
 msgstr "编辑"
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:274
 msgid "Send a direct message to this user"
 msgstr "给该用户发送私信"
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:276
 msgid "Message"
 msgstr "私信"
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:318
 msgid "Moderate"
 msgstr "审核"
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:357
 msgid "User role"
 msgstr "用户权限"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:360
 msgctxt "role"
 msgid "Administrator"
 msgstr "管理员"
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:362
 msgctxt "role"
 msgid "Moderator"
 msgstr "审核员"
 
-#: lib/util.php:321
 msgid "Not allowed to log in."
 msgstr "不允许登录。"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1337
 msgid "a few seconds ago"
 msgstr "几秒前"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1340
 msgid "about a minute ago"
 msgstr "约1分钟前"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1344
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
 msgstr[0] "约%d分钟前"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1347
 msgid "about an hour ago"
 msgstr "约1小时前"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1351
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
 msgstr[0] "约%d小时前"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1354
 msgid "about a day ago"
 msgstr "约1天前"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1358
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
 msgstr[0] "约%d天前"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1361
 msgid "about a month ago"
 msgstr "约1个月前"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1365
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
 msgstr[0] "约%d个月前"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1368
 msgid "about a year ago"
 msgstr "约1年前"
 
 #. TRANS: Web color exception thrown when a hexadecimal color code does not validate.
 #. TRANS: %s is the provided (invalid) color code.
-#: lib/webcolor.php:81 lib/webcolor.php:121
 #, php-format
 msgid "%s is not a valid color! Use 3 or 6 hex characters."
 msgstr "%s不是有效的颜色！应使用3或6个十六进制字符。"
 
 #. TRANS: Exception.
-#: lib/xrd.php:63
 msgid "Invalid XML."
 msgstr "无效的 XML。"
 
 #. TRANS: Exception.
-#: lib/xrd.php:68
 msgid "Invalid XML, missing XRD root."
 msgstr "不合法的XML, 缺少XRD根"
 
 #. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
-#: scripts/restoreuser.php:62
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr "从文件'%s'获取备份。"
 
-#~ msgid "Could not generate feed for group - %s"
-#~ msgstr "无法生成小组的 feed - %s"
+#~ msgid "Full name is too long (max 255 chars)."
+#~ msgstr "全名过长(不能超过 255 个字符)。"
 
-#~ msgid "Current confirmed Jabber/Google Talk address."
-#~ msgstr "当前已确认的Jabber/GTalk账号。"
+#~ msgid "description is too long (max %d chars)."
+#~ msgstr "描述过长(不能超过%d个字符)。"
 
-#~ msgid ""
-#~ "Jabber or Google Talk address, like \"UserName@example.org\". First, make "
-#~ "sure to add %s to your buddy list in your IM client or on Google Talk."
-#~ msgstr ""
-#~ "Jabber 或 Google Talk 地址，比如 \"UserName@example.org\"。首先，请确认你"
-#~ "已在 IM 聊天工具或 Google Talk 中将 %s 添加了好友。"
+#~ msgid "Location is too long (max 255 chars)."
+#~ msgstr "位置过长(不能超过255个字符)。"
 
-#~ msgid "Send me notices through Jabber/Google Talk."
-#~ msgstr "通过 Jabber/Google Talk 给我发送消息。"
+#~ msgid "Too many aliases! Maximum %d."
+#~ msgstr "太多别名了！最多%d 个。"
 
-#~ msgid "Publish a MicroID for my Jabber/Google Talk address."
-#~ msgstr "为我的 Jabber/Google Talk 地址发布一个 MicroID。"
-
-#~ msgid "No Jabber ID."
-#~ msgstr "没有 Jabber ID。"
-
-#~ msgid "Not a valid Jabber ID."
-#~ msgstr "不是有效的 Jabber ID。"
-
-#~ msgid "That is already your Jabber ID."
-#~ msgstr "这个已经是你的 Jabber 帐号了。"
-
-#~ msgid "That is not your Jabber ID."
-#~ msgstr "这不是你的 Jabber ID。"
-
-#~ msgid "Other settings"
-#~ msgstr "其他设置"
-
-#~ msgid "Tag cloud"
-#~ msgstr "标签云"
-
-#~ msgid "Consumer key"
-#~ msgstr "Consumer key"
-
-#~ msgid "Consumer secret"
-#~ msgstr "Consumer secret"
-
-#~ msgid "Request token URL"
-#~ msgstr "请求令牌URL"
-
-#~ msgid "Access token URL"
-#~ msgstr "访问令牌URL"
-
-#~ msgid "Authorize URL"
-#~ msgstr "授权URL"
-
-#~ msgid "Jabber"
-#~ msgstr "Jabber"
-
-#~ msgid "Photo"
-#~ msgstr "相片"
-
-#~ msgid "Other options"
-#~ msgstr "其他选项"
-
-#~ msgid "Other"
-#~ msgstr "其他"
-
-#~ msgid "Primary site navigation"
-#~ msgstr "主站导航"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Personal profile and friends timeline"
-#~ msgstr "个人资料及朋友的时间线"
-
-#~ msgctxt "MENU"
-#~ msgid "Personal"
-#~ msgstr "个人"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Change your email, avatar, password, profile"
-#~ msgstr "修改你的 email 地址、头像、密码、资料"
-
-#~ msgid "Account"
-#~ msgstr "帐号"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Connect to services"
-#~ msgstr "关联的服务"
-
-#~ msgid "Connect"
-#~ msgstr "关联"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Change site configuration"
-#~ msgstr "更改网站配置"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Invite friends and colleagues to join you on %s"
-#~ msgstr "邀请好友和同事加入%s。"
-
-#~ msgctxt "MENU"
-#~ msgid "Invite"
-#~ msgstr "邀请"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Create an account"
-#~ msgstr "创建一个账户"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Help me!"
-#~ msgstr "帮助我！"
-
-#~ msgctxt "MENU"
-#~ msgid "Help"
-#~ msgstr "帮助"
-
-#~ msgctxt "TOOLTIP"
-#~ msgid "Search for people or text"
-#~ msgstr "搜索人或文字"
-
-#~ msgid "Local views"
-#~ msgstr "本地显示"
-
-#~ msgid "Page notice"
-#~ msgstr "页面消息"
-
-#~ msgid "Secondary site navigation"
-#~ msgstr "副站导航"
-
-#~ msgid "StatusNet software license"
-#~ msgstr "StatusNet 软件许可证"
-
-#~ msgid "Site content license"
-#~ msgstr "网站内容许可协议"
-
-#~ msgid "Pagination"
-#~ msgstr "分页"
-
-#~ msgid "Author"
-#~ msgstr "作者"
-
-#~ msgid "Provider"
-#~ msgstr "提供者"
-
-#~ msgctxt "MENU"
-#~ msgid "SMS"
-#~ msgstr "SMS"
-
-#~ msgid "Filter tags"
-#~ msgstr "过滤标签"
-
-#~ msgid "[%s]"
-#~ msgstr "[%s]"
-
-#~ msgid "Available characters"
-#~ msgstr "可用的字符"
-
-#~ msgctxt "MENU"
-#~ msgid "Profile"
-#~ msgstr "配置文件"
-
-#~ msgid "Search help"
-#~ msgstr "搜索帮助"
-
-#~ msgid "Unknown user. Go to %s to add your address to your account"
-#~ msgstr "未知的用户。到 %s 添加你的账号的地址"
-
-#~ msgid "Message too long. Maximum is %1$d character, you sent %2$d."
-#~ msgid_plural "Message too long. Maximum is %1$d characters, you sent %2$d."
-#~ msgstr[0] "消息太长了，不能超过%1$d个字符，你发送的是%2$d。"
+#, fuzzy
+#~ msgctxt "BUTTON"
+#~ msgid "Comment"
+#~ msgstr "内容"
diff --git a/plugins/APC/locale/APC.pot b/plugins/APC/locale/APC.pot
index 46759518d8..2e41317245 100644
--- a/plugins/APC/locale/APC.pot
+++ b/plugins/APC/locale/APC.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/APC/locale/be-tarask/LC_MESSAGES/APC.po b/plugins/APC/locale/be-tarask/LC_MESSAGES/APC.po
index efc6b353c7..db620b6b73 100644
--- a/plugins/APC/locale/be-tarask/LC_MESSAGES/APC.po
+++ b/plugins/APC/locale/be-tarask/LC_MESSAGES/APC.po
@@ -9,20 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - APC\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:16+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:47+0000\n"
 "Language-Team: Belarusian (Taraškievica orthography) <http://translatewiki."
 "net/wiki/Portal:be-tarask>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:28+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:42:39+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: be-tarask\n"
 "X-Message-Group: #out-statusnet-plugin-apc\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: APCPlugin.php:115
 msgid ""
 "Use the <a href=\"http://pecl.php.net/package/apc\">APC</a> variable cache "
 "to cache query results."
diff --git a/plugins/APC/locale/br/LC_MESSAGES/APC.po b/plugins/APC/locale/br/LC_MESSAGES/APC.po
index 5323bcd24f..c6b3cea8e4 100644
--- a/plugins/APC/locale/br/LC_MESSAGES/APC.po
+++ b/plugins/APC/locale/br/LC_MESSAGES/APC.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - APC\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:16+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:47+0000\n"
 "Language-Team: Breton <http://translatewiki.net/wiki/Portal:br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:28+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:42:39+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-apc\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: APCPlugin.php:115
 msgid ""
 "Use the <a href=\"http://pecl.php.net/package/apc\">APC</a> variable cache "
 "to cache query results."
diff --git a/plugins/APC/locale/de/LC_MESSAGES/APC.po b/plugins/APC/locale/de/LC_MESSAGES/APC.po
index 8461a88ae3..a500da0159 100644
--- a/plugins/APC/locale/de/LC_MESSAGES/APC.po
+++ b/plugins/APC/locale/de/LC_MESSAGES/APC.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - APC\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-14 16:01+0000\n"
-"PO-Revision-Date: 2011-02-14 16:07:01+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:47+0000\n"
 "Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:19:19+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r82114); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:42:39+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-apc\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: APCPlugin.php:115
 msgid ""
 "Use the <a href=\"http://pecl.php.net/package/apc\">APC</a> variable cache "
 "to cache query results."
diff --git a/plugins/APC/locale/es/LC_MESSAGES/APC.po b/plugins/APC/locale/es/LC_MESSAGES/APC.po
index 8542aa3825..dba3272e0d 100644
--- a/plugins/APC/locale/es/LC_MESSAGES/APC.po
+++ b/plugins/APC/locale/es/LC_MESSAGES/APC.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - APC\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:16+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:48+0000\n"
 "Language-Team: Spanish <http://translatewiki.net/wiki/Portal:es>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:28+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:42:39+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-apc\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: APCPlugin.php:115
 msgid ""
 "Use the <a href=\"http://pecl.php.net/package/apc\">APC</a> variable cache "
 "to cache query results."
diff --git a/plugins/APC/locale/fr/LC_MESSAGES/APC.po b/plugins/APC/locale/fr/LC_MESSAGES/APC.po
index 8e7e7b1654..751d3cf38a 100644
--- a/plugins/APC/locale/fr/LC_MESSAGES/APC.po
+++ b/plugins/APC/locale/fr/LC_MESSAGES/APC.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - APC\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:16+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:48+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:28+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:42:39+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-apc\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: APCPlugin.php:115
 msgid ""
 "Use the <a href=\"http://pecl.php.net/package/apc\">APC</a> variable cache "
 "to cache query results."
diff --git a/plugins/APC/locale/gl/LC_MESSAGES/APC.po b/plugins/APC/locale/gl/LC_MESSAGES/APC.po
index d23ee59795..ab87a9f6b1 100644
--- a/plugins/APC/locale/gl/LC_MESSAGES/APC.po
+++ b/plugins/APC/locale/gl/LC_MESSAGES/APC.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - APC\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:16+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:48+0000\n"
 "Language-Team: Galician <http://translatewiki.net/wiki/Portal:gl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:28+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:42:39+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: gl\n"
 "X-Message-Group: #out-statusnet-plugin-apc\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: APCPlugin.php:115
 msgid ""
 "Use the <a href=\"http://pecl.php.net/package/apc\">APC</a> variable cache "
 "to cache query results."
diff --git a/plugins/APC/locale/he/LC_MESSAGES/APC.po b/plugins/APC/locale/he/LC_MESSAGES/APC.po
index ced1738a2e..66bf96a9ed 100644
--- a/plugins/APC/locale/he/LC_MESSAGES/APC.po
+++ b/plugins/APC/locale/he/LC_MESSAGES/APC.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - APC\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:16+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:48+0000\n"
 "Language-Team: Hebrew <http://translatewiki.net/wiki/Portal:he>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:28+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:42:39+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-plugin-apc\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: APCPlugin.php:115
 msgid ""
 "Use the <a href=\"http://pecl.php.net/package/apc\">APC</a> variable cache "
 "to cache query results."
diff --git a/plugins/APC/locale/ia/LC_MESSAGES/APC.po b/plugins/APC/locale/ia/LC_MESSAGES/APC.po
index cbdb37f563..037ed57552 100644
--- a/plugins/APC/locale/ia/LC_MESSAGES/APC.po
+++ b/plugins/APC/locale/ia/LC_MESSAGES/APC.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - APC\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:16+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:48+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:28+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:42:39+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-apc\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: APCPlugin.php:115
 msgid ""
 "Use the <a href=\"http://pecl.php.net/package/apc\">APC</a> variable cache "
 "to cache query results."
diff --git a/plugins/APC/locale/id/LC_MESSAGES/APC.po b/plugins/APC/locale/id/LC_MESSAGES/APC.po
index 7adc407f07..ce0a6abf38 100644
--- a/plugins/APC/locale/id/LC_MESSAGES/APC.po
+++ b/plugins/APC/locale/id/LC_MESSAGES/APC.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - APC\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:16+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:48+0000\n"
 "Language-Team: Indonesian <http://translatewiki.net/wiki/Portal:id>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:28+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:42:39+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: id\n"
 "X-Message-Group: #out-statusnet-plugin-apc\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: APCPlugin.php:115
 msgid ""
 "Use the <a href=\"http://pecl.php.net/package/apc\">APC</a> variable cache "
 "to cache query results."
diff --git a/plugins/APC/locale/mk/LC_MESSAGES/APC.po b/plugins/APC/locale/mk/LC_MESSAGES/APC.po
index 88636ac364..58fc1f94d7 100644
--- a/plugins/APC/locale/mk/LC_MESSAGES/APC.po
+++ b/plugins/APC/locale/mk/LC_MESSAGES/APC.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - APC\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:16+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:48+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:28+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:42:39+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-apc\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
 
-#: APCPlugin.php:115
 msgid ""
 "Use the <a href=\"http://pecl.php.net/package/apc\">APC</a> variable cache "
 "to cache query results."
diff --git a/plugins/APC/locale/nb/LC_MESSAGES/APC.po b/plugins/APC/locale/nb/LC_MESSAGES/APC.po
index 728079ab8b..d80b61328d 100644
--- a/plugins/APC/locale/nb/LC_MESSAGES/APC.po
+++ b/plugins/APC/locale/nb/LC_MESSAGES/APC.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - APC\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:16+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:48+0000\n"
 "Language-Team: Norwegian (bokmål)‬ <http://translatewiki.net/wiki/Portal:no>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:28+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:42:39+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: #out-statusnet-plugin-apc\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: APCPlugin.php:115
 msgid ""
 "Use the <a href=\"http://pecl.php.net/package/apc\">APC</a> variable cache "
 "to cache query results."
diff --git a/plugins/APC/locale/nl/LC_MESSAGES/APC.po b/plugins/APC/locale/nl/LC_MESSAGES/APC.po
index 6fd9d5097e..136264bf18 100644
--- a/plugins/APC/locale/nl/LC_MESSAGES/APC.po
+++ b/plugins/APC/locale/nl/LC_MESSAGES/APC.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - APC\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:16+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:48+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:28+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:42:39+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-apc\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: APCPlugin.php:115
 msgid ""
 "Use the <a href=\"http://pecl.php.net/package/apc\">APC</a> variable cache "
 "to cache query results."
diff --git a/plugins/APC/locale/pl/LC_MESSAGES/APC.po b/plugins/APC/locale/pl/LC_MESSAGES/APC.po
index ce4e3d775f..fe3e83e1e1 100644
--- a/plugins/APC/locale/pl/LC_MESSAGES/APC.po
+++ b/plugins/APC/locale/pl/LC_MESSAGES/APC.po
@@ -9,20 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - APC\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:16+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:48+0000\n"
 "Language-Team: Polish <http://translatewiki.net/wiki/Portal:pl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:28+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:42:39+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pl\n"
 "X-Message-Group: #out-statusnet-plugin-apc\n"
 "Plural-Forms: nplurals=3; plural=(n == 1) ? 0 : ( (n%10 >= 2 && n%10 <= 4 && "
 "(n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: APCPlugin.php:115
 msgid ""
 "Use the <a href=\"http://pecl.php.net/package/apc\">APC</a> variable cache "
 "to cache query results."
diff --git a/plugins/APC/locale/pt/LC_MESSAGES/APC.po b/plugins/APC/locale/pt/LC_MESSAGES/APC.po
index 272a40f285..6fcd7e5103 100644
--- a/plugins/APC/locale/pt/LC_MESSAGES/APC.po
+++ b/plugins/APC/locale/pt/LC_MESSAGES/APC.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - APC\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:16+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:48+0000\n"
 "Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:28+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:42:39+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-plugin-apc\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: APCPlugin.php:115
 msgid ""
 "Use the <a href=\"http://pecl.php.net/package/apc\">APC</a> variable cache "
 "to cache query results."
diff --git a/plugins/APC/locale/pt_BR/LC_MESSAGES/APC.po b/plugins/APC/locale/pt_BR/LC_MESSAGES/APC.po
index 820cc399e3..a64b9814a8 100644
--- a/plugins/APC/locale/pt_BR/LC_MESSAGES/APC.po
+++ b/plugins/APC/locale/pt_BR/LC_MESSAGES/APC.po
@@ -9,20 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - APC\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:16+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:48+0000\n"
 "Language-Team: Brazilian Portuguese <http://translatewiki.net/wiki/Portal:pt-"
 "br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:28+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:42:39+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt-br\n"
 "X-Message-Group: #out-statusnet-plugin-apc\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: APCPlugin.php:115
 msgid ""
 "Use the <a href=\"http://pecl.php.net/package/apc\">APC</a> variable cache "
 "to cache query results."
diff --git a/plugins/APC/locale/ru/LC_MESSAGES/APC.po b/plugins/APC/locale/ru/LC_MESSAGES/APC.po
index 22e138b3ab..3e01b66107 100644
--- a/plugins/APC/locale/ru/LC_MESSAGES/APC.po
+++ b/plugins/APC/locale/ru/LC_MESSAGES/APC.po
@@ -9,20 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - APC\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:16+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:48+0000\n"
 "Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:28+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:42:39+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-apc\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: APCPlugin.php:115
 msgid ""
 "Use the <a href=\"http://pecl.php.net/package/apc\">APC</a> variable cache "
 "to cache query results."
diff --git a/plugins/APC/locale/tl/LC_MESSAGES/APC.po b/plugins/APC/locale/tl/LC_MESSAGES/APC.po
index d4fd9a85f0..b6d5c3d744 100644
--- a/plugins/APC/locale/tl/LC_MESSAGES/APC.po
+++ b/plugins/APC/locale/tl/LC_MESSAGES/APC.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - APC\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:16+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:48+0000\n"
 "Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:28+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:42:39+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-apc\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: APCPlugin.php:115
 msgid ""
 "Use the <a href=\"http://pecl.php.net/package/apc\">APC</a> variable cache "
 "to cache query results."
diff --git a/plugins/APC/locale/uk/LC_MESSAGES/APC.po b/plugins/APC/locale/uk/LC_MESSAGES/APC.po
index e120089a3c..5fcf84c4fa 100644
--- a/plugins/APC/locale/uk/LC_MESSAGES/APC.po
+++ b/plugins/APC/locale/uk/LC_MESSAGES/APC.po
@@ -9,20 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - APC\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:16+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:48+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:28+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:42:39+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-apc\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: APCPlugin.php:115
 msgid ""
 "Use the <a href=\"http://pecl.php.net/package/apc\">APC</a> variable cache "
 "to cache query results."
diff --git a/plugins/APC/locale/zh_CN/LC_MESSAGES/APC.po b/plugins/APC/locale/zh_CN/LC_MESSAGES/APC.po
index de1063286a..aabf205c69 100644
--- a/plugins/APC/locale/zh_CN/LC_MESSAGES/APC.po
+++ b/plugins/APC/locale/zh_CN/LC_MESSAGES/APC.po
@@ -9,20 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - APC\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:16+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:48+0000\n"
 "Language-Team: Simplified Chinese <http://translatewiki.net/wiki/Portal:zh-"
 "hans>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:28+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:42:39+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-apc\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: APCPlugin.php:115
 msgid ""
 "Use the <a href=\"http://pecl.php.net/package/apc\">APC</a> variable cache "
 "to cache query results."
diff --git a/plugins/AccountManager/locale/AccountManager.pot b/plugins/AccountManager/locale/AccountManager.pot
index 5279a34d0f..5ed063a952 100644
--- a/plugins/AccountManager/locale/AccountManager.pot
+++ b/plugins/AccountManager/locale/AccountManager.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/AccountManager/locale/af/LC_MESSAGES/AccountManager.po b/plugins/AccountManager/locale/af/LC_MESSAGES/AccountManager.po
new file mode 100644
index 0000000000..c65a9b0a40
--- /dev/null
+++ b/plugins/AccountManager/locale/af/LC_MESSAGES/AccountManager.po
@@ -0,0 +1,26 @@
+# Translation of StatusNet - AccountManager to Afrikaans (Afrikaans)
+# Exported from translatewiki.net
+#
+# Author: Naudefj
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - AccountManager\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:43+0000\n"
+"Language-Team: Afrikaans <http://translatewiki.net/wiki/Portal:af>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-03-03 20:42:06+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: af\n"
+"X-Message-Group: #out-statusnet-plugin-accountmanager\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid ""
+"The Account Manager plugin implements the Account Manager specification."
+msgstr "Implementeer die \"Account Manager\"-spesifikasie."
diff --git a/plugins/AccountManager/locale/ia/LC_MESSAGES/AccountManager.po b/plugins/AccountManager/locale/ia/LC_MESSAGES/AccountManager.po
new file mode 100644
index 0000000000..ba6c74aad7
--- /dev/null
+++ b/plugins/AccountManager/locale/ia/LC_MESSAGES/AccountManager.po
@@ -0,0 +1,28 @@
+# Translation of StatusNet - AccountManager to Interlingua (Interlingua)
+# Exported from translatewiki.net
+#
+# Author: McDutchie
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - AccountManager\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:43+0000\n"
+"Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-03-03 20:42:06+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: ia\n"
+"X-Message-Group: #out-statusnet-plugin-accountmanager\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid ""
+"The Account Manager plugin implements the Account Manager specification."
+msgstr ""
+"Le plug-in Account Manager (gestion de contos) implementa le specification "
+"de Account Manager."
diff --git a/plugins/AccountManager/locale/mk/LC_MESSAGES/AccountManager.po b/plugins/AccountManager/locale/mk/LC_MESSAGES/AccountManager.po
new file mode 100644
index 0000000000..1080286991
--- /dev/null
+++ b/plugins/AccountManager/locale/mk/LC_MESSAGES/AccountManager.po
@@ -0,0 +1,26 @@
+# Translation of StatusNet - AccountManager to Macedonian (Македонски)
+# Exported from translatewiki.net
+#
+# Author: Bjankuloski06
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - AccountManager\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:43+0000\n"
+"Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-03-03 20:42:06+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: mk\n"
+"X-Message-Group: #out-statusnet-plugin-accountmanager\n"
+"Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
+
+msgid ""
+"The Account Manager plugin implements the Account Manager specification."
+msgstr "Приклучокот Account Manager дава можности за раководење со сметки."
diff --git a/plugins/AccountManager/locale/nl/LC_MESSAGES/AccountManager.po b/plugins/AccountManager/locale/nl/LC_MESSAGES/AccountManager.po
new file mode 100644
index 0000000000..cc7fc5a39b
--- /dev/null
+++ b/plugins/AccountManager/locale/nl/LC_MESSAGES/AccountManager.po
@@ -0,0 +1,26 @@
+# Translation of StatusNet - AccountManager to Dutch (Nederlands)
+# Exported from translatewiki.net
+#
+# Author: Siebrand
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - AccountManager\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:43+0000\n"
+"Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-03-03 20:42:06+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: nl\n"
+"X-Message-Group: #out-statusnet-plugin-accountmanager\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid ""
+"The Account Manager plugin implements the Account Manager specification."
+msgstr "Implementeert de Account Manager-specificatie."
diff --git a/plugins/Adsense/locale/Adsense.pot b/plugins/Adsense/locale/Adsense.pot
index 2889b534a7..3f98afb2ed 100644
--- a/plugins/Adsense/locale/Adsense.pot
+++ b/plugins/Adsense/locale/Adsense.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/Adsense/locale/be-tarask/LC_MESSAGES/Adsense.po b/plugins/Adsense/locale/be-tarask/LC_MESSAGES/Adsense.po
index 0e3bd0e0f7..77f2270714 100644
--- a/plugins/Adsense/locale/be-tarask/LC_MESSAGES/Adsense.po
+++ b/plugins/Adsense/locale/be-tarask/LC_MESSAGES/Adsense.po
@@ -10,94 +10,75 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Adsense\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:13+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:44+0000\n"
 "Language-Team: Belarusian (Taraškievica orthography) <http://translatewiki."
 "net/wiki/Portal:be-tarask>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-15 11:03:12+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:42:37+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: be-tarask\n"
 "X-Message-Group: #out-statusnet-plugin-adsense\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANS: Menu item title/tooltip
-#: AdsensePlugin.php:194
 msgid "AdSense configuration"
 msgstr "Устаноўкі AdSense"
 
 #. TRANS: Menu item for site administration
-#: AdsensePlugin.php:196
 msgid "AdSense"
 msgstr "AdSense"
 
-#: AdsensePlugin.php:209
 msgid "Plugin to add Google AdSense to StatusNet sites."
 msgstr "Дапаўненьне для даданьня Google AdSense на сайты StatusNet."
 
-#: adsenseadminpanel.php:52
 msgctxt "TITLE"
 msgid "AdSense"
 msgstr "AdSense"
 
-#: adsenseadminpanel.php:62
 msgid "AdSense settings for this StatusNet site"
 msgstr "Устаноўкі AdSense для гэтага сайта StatusNet"
 
-#: adsenseadminpanel.php:164
 msgid "Client ID"
 msgstr "Ідэнтыфікатар кліента"
 
-#: adsenseadminpanel.php:165
 msgid "Google client ID"
 msgstr "Ідэнтыфікатар кліента Google"
 
-#: adsenseadminpanel.php:170
 msgid "Ad script URL"
 msgstr "URL-адрас скрыпта рэклямы"
 
-#: adsenseadminpanel.php:171
 msgid "Script URL (advanced)"
 msgstr "URL-адрас скрыпта (палепшаная ўстаноўка)"
 
-#: adsenseadminpanel.php:176
 msgid "Medium rectangle"
 msgstr "Сярэдні прамавугольнік"
 
-#: adsenseadminpanel.php:177
 msgid "Medium rectangle slot code"
 msgstr "Слот-код сярэдняга прамавугольніка"
 
-#: adsenseadminpanel.php:182
 msgid "Rectangle"
 msgstr "Прамавугольнік"
 
-#: adsenseadminpanel.php:183
 msgid "Rectangle slot code"
 msgstr "Слот-код прамавугольніка"
 
-#: adsenseadminpanel.php:188
 msgid "Leaderboard"
 msgstr "Дошка гонару"
 
-#: adsenseadminpanel.php:189
 msgid "Leaderboard slot code"
 msgstr "Слот-код дошкі гонару"
 
-#: adsenseadminpanel.php:194
 msgid "Skyscraper"
 msgstr "Хмарачос"
 
-#: adsenseadminpanel.php:195
 msgid "Wide skyscraper slot code"
 msgstr "Слот-код хмарачосу"
 
-#: adsenseadminpanel.php:208
 msgid "Save"
 msgstr "Захаваць"
 
-#: adsenseadminpanel.php:208
 msgid "Save AdSense settings"
 msgstr "Захаваць устаноўкі AdSense"
diff --git a/plugins/Adsense/locale/br/LC_MESSAGES/Adsense.po b/plugins/Adsense/locale/br/LC_MESSAGES/Adsense.po
index d828b6fc13..67d0402eca 100644
--- a/plugins/Adsense/locale/br/LC_MESSAGES/Adsense.po
+++ b/plugins/Adsense/locale/br/LC_MESSAGES/Adsense.po
@@ -9,93 +9,74 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Adsense\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:13+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:44+0000\n"
 "Language-Team: Breton <http://translatewiki.net/wiki/Portal:br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-15 11:03:12+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:42:37+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-adsense\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. TRANS: Menu item title/tooltip
-#: AdsensePlugin.php:194
 msgid "AdSense configuration"
 msgstr "Kefluniadur AdSense"
 
 #. TRANS: Menu item for site administration
-#: AdsensePlugin.php:196
 msgid "AdSense"
 msgstr "AdSense"
 
-#: AdsensePlugin.php:209
 msgid "Plugin to add Google AdSense to StatusNet sites."
 msgstr "Plugin evit ouzhpennañ Google AdSense da lec'hiennoù StatusNet."
 
-#: adsenseadminpanel.php:52
 msgctxt "TITLE"
 msgid "AdSense"
 msgstr "AdSense"
 
-#: adsenseadminpanel.php:62
 msgid "AdSense settings for this StatusNet site"
 msgstr "Arventennoù Adsense evit al lec'hienn StatusNet-mañ."
 
-#: adsenseadminpanel.php:164
 msgid "Client ID"
 msgstr "ID an arval"
 
-#: adsenseadminpanel.php:165
 msgid "Google client ID"
 msgstr "ID an arval Google"
 
-#: adsenseadminpanel.php:170
 msgid "Ad script URL"
 msgstr "URL ar skript kemenn"
 
-#: adsenseadminpanel.php:171
 msgid "Script URL (advanced)"
 msgstr "URL ar skript (araokaet)"
 
-#: adsenseadminpanel.php:176
 msgid "Medium rectangle"
 msgstr "Skouergornek etre"
 
-#: adsenseadminpanel.php:177
 msgid "Medium rectangle slot code"
 msgstr "Kod lakaet en ur skouergornek etre"
 
-#: adsenseadminpanel.php:182
 msgid "Rectangle"
 msgstr "Skouergornek"
 
-#: adsenseadminpanel.php:183
 msgid "Rectangle slot code"
 msgstr "Kod lakaet er skouergornek"
 
-#: adsenseadminpanel.php:188
 msgid "Leaderboard"
 msgstr "Panell an urzhiadoù"
 
-#: adsenseadminpanel.php:189
 msgid "Leaderboard slot code"
 msgstr "Kod lakaet e panell an urzhiadoù"
 
-#: adsenseadminpanel.php:194
 msgid "Skyscraper"
 msgstr "Giton a-serzh"
 
-#: adsenseadminpanel.php:195
 msgid "Wide skyscraper slot code"
 msgstr "Kod lakaet en ur giton ledan a-serzh"
 
-#: adsenseadminpanel.php:208
 msgid "Save"
 msgstr "Enrollañ"
 
-#: adsenseadminpanel.php:208
 msgid "Save AdSense settings"
 msgstr "Enrollañ arventennoù AdSense"
diff --git a/plugins/Adsense/locale/de/LC_MESSAGES/Adsense.po b/plugins/Adsense/locale/de/LC_MESSAGES/Adsense.po
index 4a796eef40..e4c0029ef6 100644
--- a/plugins/Adsense/locale/de/LC_MESSAGES/Adsense.po
+++ b/plugins/Adsense/locale/de/LC_MESSAGES/Adsense.po
@@ -11,93 +11,74 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Adsense\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-14 16:01+0000\n"
-"PO-Revision-Date: 2011-02-14 16:06:55+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:44+0000\n"
 "Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:19:16+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r82114); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:42:37+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-adsense\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANS: Menu item title/tooltip
-#: AdsensePlugin.php:194
 msgid "AdSense configuration"
 msgstr "AdSense-Konfiguration"
 
 #. TRANS: Menu item for site administration
-#: AdsensePlugin.php:196
 msgid "AdSense"
 msgstr "AdSense"
 
-#: AdsensePlugin.php:209
 msgid "Plugin to add Google AdSense to StatusNet sites."
 msgstr "Plugin, das Google AdSense auf StatusNet-Websites hinzufügt."
 
-#: adsenseadminpanel.php:52
 msgctxt "TITLE"
 msgid "AdSense"
 msgstr "AdSense"
 
-#: adsenseadminpanel.php:62
 msgid "AdSense settings for this StatusNet site"
 msgstr "AdSense-Einstellungen dieser StatusNet-Website"
 
-#: adsenseadminpanel.php:164
 msgid "Client ID"
 msgstr "Client-ID"
 
-#: adsenseadminpanel.php:165
 msgid "Google client ID"
 msgstr "Google-Client-ID"
 
-#: adsenseadminpanel.php:170
 msgid "Ad script URL"
 msgstr "Skript-URL"
 
-#: adsenseadminpanel.php:171
 msgid "Script URL (advanced)"
 msgstr "Skript-URL (erweitert)"
 
-#: adsenseadminpanel.php:176
 msgid "Medium rectangle"
 msgstr ""
 
-#: adsenseadminpanel.php:177
 msgid "Medium rectangle slot code"
 msgstr ""
 
-#: adsenseadminpanel.php:182
 msgid "Rectangle"
 msgstr "Rechteck"
 
-#: adsenseadminpanel.php:183
 msgid "Rectangle slot code"
 msgstr ""
 
-#: adsenseadminpanel.php:188
 msgid "Leaderboard"
 msgstr ""
 
-#: adsenseadminpanel.php:189
 msgid "Leaderboard slot code"
 msgstr ""
 
-#: adsenseadminpanel.php:194
 msgid "Skyscraper"
 msgstr ""
 
-#: adsenseadminpanel.php:195
 msgid "Wide skyscraper slot code"
 msgstr ""
 
-#: adsenseadminpanel.php:208
 msgid "Save"
 msgstr "Speichern"
 
-#: adsenseadminpanel.php:208
 msgid "Save AdSense settings"
 msgstr "AdSense-Einstellungen speichern"
diff --git a/plugins/Adsense/locale/es/LC_MESSAGES/Adsense.po b/plugins/Adsense/locale/es/LC_MESSAGES/Adsense.po
index 090083bcef..f83a980b17 100644
--- a/plugins/Adsense/locale/es/LC_MESSAGES/Adsense.po
+++ b/plugins/Adsense/locale/es/LC_MESSAGES/Adsense.po
@@ -9,93 +9,74 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Adsense\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:13+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:44+0000\n"
 "Language-Team: Spanish <http://translatewiki.net/wiki/Portal:es>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-15 11:03:12+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:42:37+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-adsense\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANS: Menu item title/tooltip
-#: AdsensePlugin.php:194
 msgid "AdSense configuration"
 msgstr "Configuración de \"AdSense\""
 
 #. TRANS: Menu item for site administration
-#: AdsensePlugin.php:196
 msgid "AdSense"
 msgstr "AdSense"
 
-#: AdsensePlugin.php:209
 msgid "Plugin to add Google AdSense to StatusNet sites."
 msgstr "Extensión para añadir Google AdSense a sitios StatusNet."
 
-#: adsenseadminpanel.php:52
 msgctxt "TITLE"
 msgid "AdSense"
 msgstr "AdSense"
 
-#: adsenseadminpanel.php:62
 msgid "AdSense settings for this StatusNet site"
 msgstr "configuración de AdSense para este sitio StatusNet"
 
-#: adsenseadminpanel.php:164
 msgid "Client ID"
 msgstr "ID de cliente"
 
-#: adsenseadminpanel.php:165
 msgid "Google client ID"
 msgstr "ID de cliente de Google"
 
-#: adsenseadminpanel.php:170
 msgid "Ad script URL"
 msgstr "URL del script del anuncio"
 
-#: adsenseadminpanel.php:171
 msgid "Script URL (advanced)"
 msgstr "URL del script (avanzado)"
 
-#: adsenseadminpanel.php:176
 msgid "Medium rectangle"
 msgstr "Rectángulo mediano"
 
-#: adsenseadminpanel.php:177
 msgid "Medium rectangle slot code"
 msgstr "Código de espacio de rectángulo mediano"
 
-#: adsenseadminpanel.php:182
 msgid "Rectangle"
 msgstr "Rectángulo"
 
-#: adsenseadminpanel.php:183
 msgid "Rectangle slot code"
 msgstr "Código de espacio de rectángulo"
 
-#: adsenseadminpanel.php:188
 msgid "Leaderboard"
 msgstr "Clasificación"
 
-#: adsenseadminpanel.php:189
 msgid "Leaderboard slot code"
 msgstr "Código de espacio de clasificación"
 
-#: adsenseadminpanel.php:194
 msgid "Skyscraper"
 msgstr "Banderola rascacielos"
 
-#: adsenseadminpanel.php:195
 msgid "Wide skyscraper slot code"
 msgstr "Código de espacio de banderola rascacielos ancha"
 
-#: adsenseadminpanel.php:208
 msgid "Save"
 msgstr "Guardar"
 
-#: adsenseadminpanel.php:208
 msgid "Save AdSense settings"
 msgstr "Guardar la configuración de AdSense"
diff --git a/plugins/Adsense/locale/fr/LC_MESSAGES/Adsense.po b/plugins/Adsense/locale/fr/LC_MESSAGES/Adsense.po
index a27df2f7ba..cc7241789e 100644
--- a/plugins/Adsense/locale/fr/LC_MESSAGES/Adsense.po
+++ b/plugins/Adsense/locale/fr/LC_MESSAGES/Adsense.po
@@ -10,93 +10,74 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Adsense\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:13+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:44+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-15 11:03:12+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:42:37+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-adsense\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. TRANS: Menu item title/tooltip
-#: AdsensePlugin.php:194
 msgid "AdSense configuration"
 msgstr "Configuration d’AdSense"
 
 #. TRANS: Menu item for site administration
-#: AdsensePlugin.php:196
 msgid "AdSense"
 msgstr "AdSense"
 
-#: AdsensePlugin.php:209
 msgid "Plugin to add Google AdSense to StatusNet sites."
 msgstr "Greffon pour ajouter Google AdSense aux sites StatusNet."
 
-#: adsenseadminpanel.php:52
 msgctxt "TITLE"
 msgid "AdSense"
 msgstr "AdSense"
 
-#: adsenseadminpanel.php:62
 msgid "AdSense settings for this StatusNet site"
 msgstr "Paramètres Adsense pour ce site StatusNet"
 
-#: adsenseadminpanel.php:164
 msgid "Client ID"
 msgstr "Identifiant du client"
 
-#: adsenseadminpanel.php:165
 msgid "Google client ID"
 msgstr "ID client Google"
 
-#: adsenseadminpanel.php:170
 msgid "Ad script URL"
 msgstr "Adresse URL du script d’annonce"
 
-#: adsenseadminpanel.php:171
 msgid "Script URL (advanced)"
 msgstr "URL du script (avancé)"
 
-#: adsenseadminpanel.php:176
 msgid "Medium rectangle"
 msgstr "Rectangle moyen"
 
-#: adsenseadminpanel.php:177
 msgid "Medium rectangle slot code"
 msgstr "Code placé dans un rectangle moyen"
 
-#: adsenseadminpanel.php:182
 msgid "Rectangle"
 msgstr "Rectangle"
 
-#: adsenseadminpanel.php:183
 msgid "Rectangle slot code"
 msgstr "Codé placé dans le rectangle"
 
-#: adsenseadminpanel.php:188
 msgid "Leaderboard"
 msgstr "Panneau de commande"
 
-#: adsenseadminpanel.php:189
 msgid "Leaderboard slot code"
 msgstr "Code placé dans le panneau de commande"
 
-#: adsenseadminpanel.php:194
 msgid "Skyscraper"
 msgstr "Bannière verticale"
 
-#: adsenseadminpanel.php:195
 msgid "Wide skyscraper slot code"
 msgstr "Code placé dans une bannière verticale large"
 
-#: adsenseadminpanel.php:208
 msgid "Save"
 msgstr "Sauvegarder"
 
-#: adsenseadminpanel.php:208
 msgid "Save AdSense settings"
 msgstr "Sauvegarder les paramètres AdSense"
diff --git a/plugins/Adsense/locale/gl/LC_MESSAGES/Adsense.po b/plugins/Adsense/locale/gl/LC_MESSAGES/Adsense.po
index 89922e3e58..b37ace5585 100644
--- a/plugins/Adsense/locale/gl/LC_MESSAGES/Adsense.po
+++ b/plugins/Adsense/locale/gl/LC_MESSAGES/Adsense.po
@@ -9,93 +9,74 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Adsense\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:13+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:45+0000\n"
 "Language-Team: Galician <http://translatewiki.net/wiki/Portal:gl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-15 11:03:12+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:42:37+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: gl\n"
 "X-Message-Group: #out-statusnet-plugin-adsense\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANS: Menu item title/tooltip
-#: AdsensePlugin.php:194
 msgid "AdSense configuration"
 msgstr "Configuración de AdSense"
 
 #. TRANS: Menu item for site administration
-#: AdsensePlugin.php:196
 msgid "AdSense"
 msgstr "AdSense"
 
-#: AdsensePlugin.php:209
 msgid "Plugin to add Google AdSense to StatusNet sites."
 msgstr ""
 
-#: adsenseadminpanel.php:52
 msgctxt "TITLE"
 msgid "AdSense"
 msgstr "AdSense"
 
-#: adsenseadminpanel.php:62
 msgid "AdSense settings for this StatusNet site"
 msgstr "Configuración de AdSense para este sitio StatusNet."
 
-#: adsenseadminpanel.php:164
 msgid "Client ID"
 msgstr "Identificación do cliente"
 
-#: adsenseadminpanel.php:165
 msgid "Google client ID"
 msgstr "Identificación do cliente de Google"
 
-#: adsenseadminpanel.php:170
 msgid "Ad script URL"
 msgstr ""
 
-#: adsenseadminpanel.php:171
 msgid "Script URL (advanced)"
 msgstr ""
 
-#: adsenseadminpanel.php:176
 msgid "Medium rectangle"
 msgstr ""
 
-#: adsenseadminpanel.php:177
 msgid "Medium rectangle slot code"
 msgstr ""
 
-#: adsenseadminpanel.php:182
 msgid "Rectangle"
 msgstr "Rectángulo"
 
-#: adsenseadminpanel.php:183
 msgid "Rectangle slot code"
 msgstr ""
 
-#: adsenseadminpanel.php:188
 msgid "Leaderboard"
 msgstr "Taboleiro de logros"
 
-#: adsenseadminpanel.php:189
 msgid "Leaderboard slot code"
 msgstr ""
 
-#: adsenseadminpanel.php:194
 msgid "Skyscraper"
 msgstr "Rañaceos"
 
-#: adsenseadminpanel.php:195
 msgid "Wide skyscraper slot code"
 msgstr ""
 
-#: adsenseadminpanel.php:208
 msgid "Save"
 msgstr "Gardar"
 
-#: adsenseadminpanel.php:208
 msgid "Save AdSense settings"
 msgstr "Gardar a configuración de AdSense"
diff --git a/plugins/Adsense/locale/ia/LC_MESSAGES/Adsense.po b/plugins/Adsense/locale/ia/LC_MESSAGES/Adsense.po
index b6e28cbecb..8fdecba7e6 100644
--- a/plugins/Adsense/locale/ia/LC_MESSAGES/Adsense.po
+++ b/plugins/Adsense/locale/ia/LC_MESSAGES/Adsense.po
@@ -9,93 +9,74 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Adsense\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:13+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:45+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-15 11:03:12+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:42:37+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-adsense\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANS: Menu item title/tooltip
-#: AdsensePlugin.php:194
 msgid "AdSense configuration"
 msgstr "Configuration de AdSense"
 
 #. TRANS: Menu item for site administration
-#: AdsensePlugin.php:196
 msgid "AdSense"
 msgstr "AdSense"
 
-#: AdsensePlugin.php:209
 msgid "Plugin to add Google AdSense to StatusNet sites."
 msgstr "Plug-in pro adder Google AdSense a sitos StatusNet."
 
-#: adsenseadminpanel.php:52
 msgctxt "TITLE"
 msgid "AdSense"
 msgstr "AdSense"
 
-#: adsenseadminpanel.php:62
 msgid "AdSense settings for this StatusNet site"
 msgstr "Configuration de AdSense pro iste sito StatusNet"
 
-#: adsenseadminpanel.php:164
 msgid "Client ID"
 msgstr "ID de cliente"
 
-#: adsenseadminpanel.php:165
 msgid "Google client ID"
 msgstr "ID de cliente Google"
 
-#: adsenseadminpanel.php:170
 msgid "Ad script URL"
 msgstr "URL del script de publicitate"
 
-#: adsenseadminpanel.php:171
 msgid "Script URL (advanced)"
 msgstr "URL del script (avantiate)"
 
-#: adsenseadminpanel.php:176
 msgid "Medium rectangle"
 msgstr "Rectangulo medie"
 
-#: adsenseadminpanel.php:177
 msgid "Medium rectangle slot code"
 msgstr "Codice pro interstitio a rectangulo medie"
 
-#: adsenseadminpanel.php:182
 msgid "Rectangle"
 msgstr "Rectangulo"
 
-#: adsenseadminpanel.php:183
 msgid "Rectangle slot code"
 msgstr "Codice pro interstitio a rectangulo"
 
-#: adsenseadminpanel.php:188
 msgid "Leaderboard"
 msgstr "Bandiera large"
 
-#: adsenseadminpanel.php:189
 msgid "Leaderboard slot code"
 msgstr "Codice pro interstitio a bandiera large"
 
-#: adsenseadminpanel.php:194
 msgid "Skyscraper"
 msgstr "Grattacelo"
 
-#: adsenseadminpanel.php:195
 msgid "Wide skyscraper slot code"
 msgstr "Codice pro interstitio a grattacelo large"
 
-#: adsenseadminpanel.php:208
 msgid "Save"
 msgstr "Salveguardar"
 
-#: adsenseadminpanel.php:208
 msgid "Save AdSense settings"
 msgstr "Salveguardar configurationes de AdSense"
diff --git a/plugins/Adsense/locale/it/LC_MESSAGES/Adsense.po b/plugins/Adsense/locale/it/LC_MESSAGES/Adsense.po
index 4e24b45d5d..9425f68009 100644
--- a/plugins/Adsense/locale/it/LC_MESSAGES/Adsense.po
+++ b/plugins/Adsense/locale/it/LC_MESSAGES/Adsense.po
@@ -9,93 +9,74 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Adsense\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:13+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:45+0000\n"
 "Language-Team: Italian <http://translatewiki.net/wiki/Portal:it>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-15 11:03:12+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:42:37+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: it\n"
 "X-Message-Group: #out-statusnet-plugin-adsense\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANS: Menu item title/tooltip
-#: AdsensePlugin.php:194
 msgid "AdSense configuration"
 msgstr "Configurazione AdSene"
 
 #. TRANS: Menu item for site administration
-#: AdsensePlugin.php:196
 msgid "AdSense"
 msgstr "AdSense"
 
-#: AdsensePlugin.php:209
 msgid "Plugin to add Google AdSense to StatusNet sites."
 msgstr "Plugin per aggiungere Google AdSense ai siti StatusNet"
 
-#: adsenseadminpanel.php:52
 msgctxt "TITLE"
 msgid "AdSense"
 msgstr "AdSense"
 
-#: adsenseadminpanel.php:62
 msgid "AdSense settings for this StatusNet site"
 msgstr "Impostazioni AdSense per questo sito StatusNet"
 
-#: adsenseadminpanel.php:164
 msgid "Client ID"
 msgstr "ID client"
 
-#: adsenseadminpanel.php:165
 msgid "Google client ID"
 msgstr "ID client Google"
 
-#: adsenseadminpanel.php:170
 msgid "Ad script URL"
 msgstr "URL script Ad"
 
-#: adsenseadminpanel.php:171
 msgid "Script URL (advanced)"
 msgstr "URL script (avanzato)"
 
-#: adsenseadminpanel.php:176
 msgid "Medium rectangle"
 msgstr "Rettangolo medio"
 
-#: adsenseadminpanel.php:177
 msgid "Medium rectangle slot code"
 msgstr ""
 
-#: adsenseadminpanel.php:182
 msgid "Rectangle"
 msgstr "Rettangolo"
 
-#: adsenseadminpanel.php:183
 msgid "Rectangle slot code"
 msgstr ""
 
-#: adsenseadminpanel.php:188
 msgid "Leaderboard"
 msgstr ""
 
-#: adsenseadminpanel.php:189
 msgid "Leaderboard slot code"
 msgstr ""
 
-#: adsenseadminpanel.php:194
 msgid "Skyscraper"
 msgstr ""
 
-#: adsenseadminpanel.php:195
 msgid "Wide skyscraper slot code"
 msgstr ""
 
-#: adsenseadminpanel.php:208
 msgid "Save"
 msgstr ""
 
-#: adsenseadminpanel.php:208
 msgid "Save AdSense settings"
 msgstr ""
diff --git a/plugins/Adsense/locale/ka/LC_MESSAGES/Adsense.po b/plugins/Adsense/locale/ka/LC_MESSAGES/Adsense.po
index af27e31ea1..1a1bd1171f 100644
--- a/plugins/Adsense/locale/ka/LC_MESSAGES/Adsense.po
+++ b/plugins/Adsense/locale/ka/LC_MESSAGES/Adsense.po
@@ -9,93 +9,74 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Adsense\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:13+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:45+0000\n"
 "Language-Team: Georgian <http://translatewiki.net/wiki/Portal:ka>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-15 11:03:12+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:42:37+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ka\n"
 "X-Message-Group: #out-statusnet-plugin-adsense\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. TRANS: Menu item title/tooltip
-#: AdsensePlugin.php:194
 msgid "AdSense configuration"
 msgstr "AdSense კონფიგურაცია"
 
 #. TRANS: Menu item for site administration
-#: AdsensePlugin.php:196
 msgid "AdSense"
 msgstr "AdSense"
 
-#: AdsensePlugin.php:209
 msgid "Plugin to add Google AdSense to StatusNet sites."
 msgstr ""
 
-#: adsenseadminpanel.php:52
 msgctxt "TITLE"
 msgid "AdSense"
 msgstr "AdSense"
 
-#: adsenseadminpanel.php:62
 msgid "AdSense settings for this StatusNet site"
 msgstr "AdSense პარამეტრები ამ საიტისათვის."
 
-#: adsenseadminpanel.php:164
 msgid "Client ID"
 msgstr "კლიენტის ID"
 
-#: adsenseadminpanel.php:165
 msgid "Google client ID"
 msgstr "Google კლიენტის ID"
 
-#: adsenseadminpanel.php:170
 msgid "Ad script URL"
 msgstr "სარეკლამო სკრიპტის URL"
 
-#: adsenseadminpanel.php:171
 msgid "Script URL (advanced)"
 msgstr "სკრიპტის URL (გაფართოებული)"
 
-#: adsenseadminpanel.php:176
 msgid "Medium rectangle"
 msgstr "საშუალო მართკუთხედი"
 
-#: adsenseadminpanel.php:177
 msgid "Medium rectangle slot code"
 msgstr ""
 
-#: adsenseadminpanel.php:182
 msgid "Rectangle"
 msgstr "მართკუთხედი"
 
-#: adsenseadminpanel.php:183
 msgid "Rectangle slot code"
 msgstr ""
 
-#: adsenseadminpanel.php:188
 msgid "Leaderboard"
 msgstr ""
 
-#: adsenseadminpanel.php:189
 msgid "Leaderboard slot code"
 msgstr ""
 
-#: adsenseadminpanel.php:194
 msgid "Skyscraper"
 msgstr ""
 
-#: adsenseadminpanel.php:195
 msgid "Wide skyscraper slot code"
 msgstr ""
 
-#: adsenseadminpanel.php:208
 msgid "Save"
 msgstr ""
 
-#: adsenseadminpanel.php:208
 msgid "Save AdSense settings"
 msgstr ""
diff --git a/plugins/Adsense/locale/mk/LC_MESSAGES/Adsense.po b/plugins/Adsense/locale/mk/LC_MESSAGES/Adsense.po
index 3e27633f30..8d527f776b 100644
--- a/plugins/Adsense/locale/mk/LC_MESSAGES/Adsense.po
+++ b/plugins/Adsense/locale/mk/LC_MESSAGES/Adsense.po
@@ -9,93 +9,74 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Adsense\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:13+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:45+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-15 11:03:12+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:42:37+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-adsense\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
 
 #. TRANS: Menu item title/tooltip
-#: AdsensePlugin.php:194
 msgid "AdSense configuration"
 msgstr "Нагодувања на AdSense"
 
 #. TRANS: Menu item for site administration
-#: AdsensePlugin.php:196
 msgid "AdSense"
 msgstr "AdSense"
 
-#: AdsensePlugin.php:209
 msgid "Plugin to add Google AdSense to StatusNet sites."
 msgstr "Приклучок за додавање на Google AdSense во мреж. места со StatusNet."
 
-#: adsenseadminpanel.php:52
 msgctxt "TITLE"
 msgid "AdSense"
 msgstr "AdSense"
 
-#: adsenseadminpanel.php:62
 msgid "AdSense settings for this StatusNet site"
 msgstr "Поставки на AdSense за ова мрежно место со StatusNet"
 
-#: adsenseadminpanel.php:164
 msgid "Client ID"
 msgstr "ID на клиент"
 
-#: adsenseadminpanel.php:165
 msgid "Google client ID"
 msgstr "ID на Google-клиент"
 
-#: adsenseadminpanel.php:170
 msgid "Ad script URL"
 msgstr "URL на рекламната скрипта"
 
-#: adsenseadminpanel.php:171
 msgid "Script URL (advanced)"
 msgstr "URL на скриптата (напредно)"
 
-#: adsenseadminpanel.php:176
 msgid "Medium rectangle"
 msgstr "Среден правоаголник"
 
-#: adsenseadminpanel.php:177
 msgid "Medium rectangle slot code"
 msgstr "Код на жлебот на средниот правоаголник"
 
-#: adsenseadminpanel.php:182
 msgid "Rectangle"
 msgstr "Правоаголник"
 
-#: adsenseadminpanel.php:183
 msgid "Rectangle slot code"
 msgstr "Код на жлебот на правоаголникот"
 
-#: adsenseadminpanel.php:188
 msgid "Leaderboard"
 msgstr "Табла на предводници"
 
-#: adsenseadminpanel.php:189
 msgid "Leaderboard slot code"
 msgstr "Код на жлебот на таблата на предводници"
 
-#: adsenseadminpanel.php:194
 msgid "Skyscraper"
 msgstr "Облакодер"
 
-#: adsenseadminpanel.php:195
 msgid "Wide skyscraper slot code"
 msgstr "Код на жлебот на широкиот облакодер"
 
-#: adsenseadminpanel.php:208
 msgid "Save"
 msgstr "Зачувај"
 
-#: adsenseadminpanel.php:208
 msgid "Save AdSense settings"
 msgstr "Зачувај нагодувања на AdSense"
diff --git a/plugins/Adsense/locale/nl/LC_MESSAGES/Adsense.po b/plugins/Adsense/locale/nl/LC_MESSAGES/Adsense.po
index 0a5a62f4cf..bff3e25500 100644
--- a/plugins/Adsense/locale/nl/LC_MESSAGES/Adsense.po
+++ b/plugins/Adsense/locale/nl/LC_MESSAGES/Adsense.po
@@ -9,93 +9,74 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Adsense\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:13+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:45+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-15 11:03:12+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:42:37+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-adsense\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANS: Menu item title/tooltip
-#: AdsensePlugin.php:194
 msgid "AdSense configuration"
 msgstr "AdSense-instellingen"
 
 #. TRANS: Menu item for site administration
-#: AdsensePlugin.php:196
 msgid "AdSense"
 msgstr "AdSense"
 
-#: AdsensePlugin.php:209
 msgid "Plugin to add Google AdSense to StatusNet sites."
 msgstr "Plug-in om Google AdSense toe te voegen aan Statusnetsites."
 
-#: adsenseadminpanel.php:52
 msgctxt "TITLE"
 msgid "AdSense"
 msgstr "AdSense"
 
-#: adsenseadminpanel.php:62
 msgid "AdSense settings for this StatusNet site"
 msgstr "AdSense-instellingen voor deze StatusNet-website"
 
-#: adsenseadminpanel.php:164
 msgid "Client ID"
 msgstr "Client-ID"
 
-#: adsenseadminpanel.php:165
 msgid "Google client ID"
 msgstr "Google client-ID"
 
-#: adsenseadminpanel.php:170
 msgid "Ad script URL"
 msgstr "URL voor advertentiescript"
 
-#: adsenseadminpanel.php:171
 msgid "Script URL (advanced)"
 msgstr "URL voor script (gevorderd)"
 
-#: adsenseadminpanel.php:176
 msgid "Medium rectangle"
 msgstr "Middelgrote rechthoek"
 
-#: adsenseadminpanel.php:177
 msgid "Medium rectangle slot code"
 msgstr "Slotcode voor gemiddelde rechthoek"
 
-#: adsenseadminpanel.php:182
 msgid "Rectangle"
 msgstr "Rechthoek"
 
-#: adsenseadminpanel.php:183
 msgid "Rectangle slot code"
 msgstr "Slotcode voor rechthoek"
 
-#: adsenseadminpanel.php:188
 msgid "Leaderboard"
 msgstr "Breedbeeldbanner"
 
-#: adsenseadminpanel.php:189
 msgid "Leaderboard slot code"
 msgstr "Slotcode voor breedbeeldbanner"
 
-#: adsenseadminpanel.php:194
 msgid "Skyscraper"
 msgstr "Skyscraper"
 
-#: adsenseadminpanel.php:195
 msgid "Wide skyscraper slot code"
 msgstr "Slotcode voor brede skyscraper"
 
-#: adsenseadminpanel.php:208
 msgid "Save"
 msgstr "Opslaan"
 
-#: adsenseadminpanel.php:208
 msgid "Save AdSense settings"
 msgstr "AdSense-instellingen opslaan"
diff --git a/plugins/Adsense/locale/pt/LC_MESSAGES/Adsense.po b/plugins/Adsense/locale/pt/LC_MESSAGES/Adsense.po
index 9c882f885e..a2f3bbe768 100644
--- a/plugins/Adsense/locale/pt/LC_MESSAGES/Adsense.po
+++ b/plugins/Adsense/locale/pt/LC_MESSAGES/Adsense.po
@@ -9,93 +9,74 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Adsense\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:13+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:45+0000\n"
 "Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-15 11:03:12+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:42:37+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-plugin-adsense\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANS: Menu item title/tooltip
-#: AdsensePlugin.php:194
 msgid "AdSense configuration"
 msgstr "Configuração do AdSense"
 
 #. TRANS: Menu item for site administration
-#: AdsensePlugin.php:196
 msgid "AdSense"
 msgstr "AdSense"
 
-#: AdsensePlugin.php:209
 msgid "Plugin to add Google AdSense to StatusNet sites."
 msgstr "Plugin para adicionar Google AdSense aos sites StatusNet."
 
-#: adsenseadminpanel.php:52
 msgctxt "TITLE"
 msgid "AdSense"
 msgstr "AdSense"
 
-#: adsenseadminpanel.php:62
 msgid "AdSense settings for this StatusNet site"
 msgstr "Configurações do AdSense para este site StatusNet"
 
-#: adsenseadminpanel.php:164
 msgid "Client ID"
 msgstr "Identificação do cliente"
 
-#: adsenseadminpanel.php:165
 msgid "Google client ID"
 msgstr "ID de cliente Google"
 
-#: adsenseadminpanel.php:170
 msgid "Ad script URL"
 msgstr "URL do script do anúncio"
 
-#: adsenseadminpanel.php:171
 msgid "Script URL (advanced)"
 msgstr "URL do script (avançado)"
 
-#: adsenseadminpanel.php:176
 msgid "Medium rectangle"
 msgstr "Retângulo médio"
 
-#: adsenseadminpanel.php:177
 msgid "Medium rectangle slot code"
 msgstr ""
 
-#: adsenseadminpanel.php:182
 msgid "Rectangle"
 msgstr "Retângulo"
 
-#: adsenseadminpanel.php:183
 msgid "Rectangle slot code"
 msgstr ""
 
-#: adsenseadminpanel.php:188
 msgid "Leaderboard"
 msgstr ""
 
-#: adsenseadminpanel.php:189
 msgid "Leaderboard slot code"
 msgstr ""
 
-#: adsenseadminpanel.php:194
 msgid "Skyscraper"
 msgstr ""
 
-#: adsenseadminpanel.php:195
 msgid "Wide skyscraper slot code"
 msgstr ""
 
-#: adsenseadminpanel.php:208
 msgid "Save"
 msgstr "Gravar"
 
-#: adsenseadminpanel.php:208
 msgid "Save AdSense settings"
 msgstr "Gravar as configurações do AdSense"
diff --git a/plugins/Adsense/locale/pt_BR/LC_MESSAGES/Adsense.po b/plugins/Adsense/locale/pt_BR/LC_MESSAGES/Adsense.po
index b631e40d8b..2a2231a7d8 100644
--- a/plugins/Adsense/locale/pt_BR/LC_MESSAGES/Adsense.po
+++ b/plugins/Adsense/locale/pt_BR/LC_MESSAGES/Adsense.po
@@ -10,94 +10,75 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Adsense\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:13+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:45+0000\n"
 "Language-Team: Brazilian Portuguese <http://translatewiki.net/wiki/Portal:pt-"
 "br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-15 11:03:12+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:42:37+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt-br\n"
 "X-Message-Group: #out-statusnet-plugin-adsense\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. TRANS: Menu item title/tooltip
-#: AdsensePlugin.php:194
 msgid "AdSense configuration"
 msgstr "Configuração do AdSense"
 
 #. TRANS: Menu item for site administration
-#: AdsensePlugin.php:196
 msgid "AdSense"
 msgstr "AdSense"
 
-#: AdsensePlugin.php:209
 msgid "Plugin to add Google AdSense to StatusNet sites."
 msgstr "Plugin para adicionar Google AdSense aos sites StatusNet."
 
-#: adsenseadminpanel.php:52
 msgctxt "TITLE"
 msgid "AdSense"
 msgstr "AdSense"
 
-#: adsenseadminpanel.php:62
 msgid "AdSense settings for this StatusNet site"
 msgstr "Configurações do AdSense para este site StatusNet"
 
-#: adsenseadminpanel.php:164
 msgid "Client ID"
 msgstr "Identificação do cliente"
 
-#: adsenseadminpanel.php:165
 msgid "Google client ID"
 msgstr "ID de cliente Google"
 
-#: adsenseadminpanel.php:170
 msgid "Ad script URL"
 msgstr "URL do script do anúncio"
 
-#: adsenseadminpanel.php:171
 msgid "Script URL (advanced)"
 msgstr "URL do script (avançado)"
 
-#: adsenseadminpanel.php:176
 msgid "Medium rectangle"
 msgstr "Retângulo médio"
 
-#: adsenseadminpanel.php:177
 msgid "Medium rectangle slot code"
 msgstr "Código colocado dentro de um retângulo médio."
 
-#: adsenseadminpanel.php:182
 msgid "Rectangle"
 msgstr "Retângulo"
 
-#: adsenseadminpanel.php:183
 msgid "Rectangle slot code"
 msgstr "Código colocado dentro de um retângulo."
 
-#: adsenseadminpanel.php:188
 msgid "Leaderboard"
 msgstr "Classificação"
 
-#: adsenseadminpanel.php:189
 msgid "Leaderboard slot code"
 msgstr ""
 
-#: adsenseadminpanel.php:194
 msgid "Skyscraper"
 msgstr ""
 
-#: adsenseadminpanel.php:195
 msgid "Wide skyscraper slot code"
 msgstr ""
 
-#: adsenseadminpanel.php:208
 msgid "Save"
 msgstr "Salvar"
 
-#: adsenseadminpanel.php:208
 msgid "Save AdSense settings"
 msgstr "Salvar as configurações do AdSense"
diff --git a/plugins/Adsense/locale/ru/LC_MESSAGES/Adsense.po b/plugins/Adsense/locale/ru/LC_MESSAGES/Adsense.po
index cd13346eed..52c13d94df 100644
--- a/plugins/Adsense/locale/ru/LC_MESSAGES/Adsense.po
+++ b/plugins/Adsense/locale/ru/LC_MESSAGES/Adsense.po
@@ -10,13 +10,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Adsense\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:14+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:45+0000\n"
 "Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-15 11:03:12+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:42:37+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-adsense\n"
@@ -24,80 +24,61 @@ msgstr ""
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
 #. TRANS: Menu item title/tooltip
-#: AdsensePlugin.php:194
 msgid "AdSense configuration"
 msgstr "Конфигурация AdSense"
 
 #. TRANS: Menu item for site administration
-#: AdsensePlugin.php:196
 msgid "AdSense"
 msgstr "AdSense"
 
-#: AdsensePlugin.php:209
 msgid "Plugin to add Google AdSense to StatusNet sites."
 msgstr "Плагин для добавления Google AdSense на сайты StatusNet."
 
-#: adsenseadminpanel.php:52
 msgctxt "TITLE"
 msgid "AdSense"
 msgstr "AdSense"
 
-#: adsenseadminpanel.php:62
 msgid "AdSense settings for this StatusNet site"
 msgstr "Настройки AdSense для этого сайта StatusNet"
 
-#: adsenseadminpanel.php:164
 msgid "Client ID"
 msgstr "ID клиента"
 
-#: adsenseadminpanel.php:165
 msgid "Google client ID"
 msgstr "ID клиента Google"
 
-#: adsenseadminpanel.php:170
 msgid "Ad script URL"
 msgstr "URL-адрес скрипта рекламы"
 
-#: adsenseadminpanel.php:171
 msgid "Script URL (advanced)"
 msgstr "URL-адрес скрипта (расширенная настройка)"
 
-#: adsenseadminpanel.php:176
 msgid "Medium rectangle"
 msgstr "Средний прямоугольник"
 
-#: adsenseadminpanel.php:177
 msgid "Medium rectangle slot code"
 msgstr "Слот-код среднего прямоугольника"
 
-#: adsenseadminpanel.php:182
 msgid "Rectangle"
 msgstr "Прямоугольник"
 
-#: adsenseadminpanel.php:183
 msgid "Rectangle slot code"
 msgstr "Слот-код прямоугольника"
 
-#: adsenseadminpanel.php:188
 msgid "Leaderboard"
 msgstr "Доска лидеров"
 
-#: adsenseadminpanel.php:189
 msgid "Leaderboard slot code"
 msgstr "Слот-код доски лидеров"
 
-#: adsenseadminpanel.php:194
 msgid "Skyscraper"
 msgstr "Небоскреб"
 
-#: adsenseadminpanel.php:195
 msgid "Wide skyscraper slot code"
 msgstr "Слот-код широкого небоскреба"
 
-#: adsenseadminpanel.php:208
 msgid "Save"
 msgstr "Сохранить"
 
-#: adsenseadminpanel.php:208
 msgid "Save AdSense settings"
 msgstr "Сохранить настройки AdSense"
diff --git a/plugins/Adsense/locale/sv/LC_MESSAGES/Adsense.po b/plugins/Adsense/locale/sv/LC_MESSAGES/Adsense.po
index 3f801f9389..5e41cb06d7 100644
--- a/plugins/Adsense/locale/sv/LC_MESSAGES/Adsense.po
+++ b/plugins/Adsense/locale/sv/LC_MESSAGES/Adsense.po
@@ -9,93 +9,74 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Adsense\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:14+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:45+0000\n"
 "Language-Team: Swedish <http://translatewiki.net/wiki/Portal:sv>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-15 11:03:12+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:42:37+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: sv\n"
 "X-Message-Group: #out-statusnet-plugin-adsense\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANS: Menu item title/tooltip
-#: AdsensePlugin.php:194
 msgid "AdSense configuration"
 msgstr "Konfiguration av AdSense"
 
 #. TRANS: Menu item for site administration
-#: AdsensePlugin.php:196
 msgid "AdSense"
 msgstr "AdSense"
 
-#: AdsensePlugin.php:209
 msgid "Plugin to add Google AdSense to StatusNet sites."
 msgstr ""
 
-#: adsenseadminpanel.php:52
 msgctxt "TITLE"
 msgid "AdSense"
 msgstr "AdSense"
 
-#: adsenseadminpanel.php:62
 msgid "AdSense settings for this StatusNet site"
 msgstr "AdSense-inställningar för denna StatusNet-webbplats"
 
-#: adsenseadminpanel.php:164
 msgid "Client ID"
 msgstr "Klient-ID"
 
-#: adsenseadminpanel.php:165
 msgid "Google client ID"
 msgstr "Google klient-ID"
 
-#: adsenseadminpanel.php:170
 msgid "Ad script URL"
 msgstr ""
 
-#: adsenseadminpanel.php:171
 msgid "Script URL (advanced)"
 msgstr ""
 
-#: adsenseadminpanel.php:176
 msgid "Medium rectangle"
 msgstr "Medium rektangel"
 
-#: adsenseadminpanel.php:177
 msgid "Medium rectangle slot code"
 msgstr ""
 
-#: adsenseadminpanel.php:182
 msgid "Rectangle"
 msgstr ""
 
-#: adsenseadminpanel.php:183
 msgid "Rectangle slot code"
 msgstr ""
 
-#: adsenseadminpanel.php:188
 msgid "Leaderboard"
 msgstr ""
 
-#: adsenseadminpanel.php:189
 msgid "Leaderboard slot code"
 msgstr ""
 
-#: adsenseadminpanel.php:194
 msgid "Skyscraper"
 msgstr ""
 
-#: adsenseadminpanel.php:195
 msgid "Wide skyscraper slot code"
 msgstr ""
 
-#: adsenseadminpanel.php:208
 msgid "Save"
 msgstr "Spara"
 
-#: adsenseadminpanel.php:208
 msgid "Save AdSense settings"
 msgstr "Spara inställningar för AdSense"
diff --git a/plugins/Adsense/locale/tl/LC_MESSAGES/Adsense.po b/plugins/Adsense/locale/tl/LC_MESSAGES/Adsense.po
index 796418a82d..34b3832124 100644
--- a/plugins/Adsense/locale/tl/LC_MESSAGES/Adsense.po
+++ b/plugins/Adsense/locale/tl/LC_MESSAGES/Adsense.po
@@ -9,94 +9,75 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Adsense\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:14+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:45+0000\n"
 "Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-15 11:03:12+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:42:37+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-adsense\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANS: Menu item title/tooltip
-#: AdsensePlugin.php:194
 msgid "AdSense configuration"
 msgstr "Pagkakaayos ng AdSense"
 
 #. TRANS: Menu item for site administration
-#: AdsensePlugin.php:196
 msgid "AdSense"
 msgstr "AdSense"
 
-#: AdsensePlugin.php:209
 msgid "Plugin to add Google AdSense to StatusNet sites."
 msgstr ""
 "Pampasak upang maidagdag ang AdSense ng Google sa mga sityo ng StatusNet."
 
-#: adsenseadminpanel.php:52
 msgctxt "TITLE"
 msgid "AdSense"
 msgstr "AdSense"
 
-#: adsenseadminpanel.php:62
 msgid "AdSense settings for this StatusNet site"
 msgstr "Mga katakdaan ng Adsense para sa sityong ito ng StatusNet"
 
-#: adsenseadminpanel.php:164
 msgid "Client ID"
 msgstr "ID ng kliyente"
 
-#: adsenseadminpanel.php:165
 msgid "Google client ID"
 msgstr "ID ng kliyente ng Google"
 
-#: adsenseadminpanel.php:170
 msgid "Ad script URL"
 msgstr "URL ng panitik ng anunsyo"
 
-#: adsenseadminpanel.php:171
 msgid "Script URL (advanced)"
 msgstr "URL ng panitik (mas masulong)"
 
-#: adsenseadminpanel.php:176
 msgid "Medium rectangle"
 msgstr "Hindi kalakihang parihaba"
 
-#: adsenseadminpanel.php:177
 msgid "Medium rectangle slot code"
 msgstr "Kodigo ng puwang ng hindi kalakihang parihaba"
 
-#: adsenseadminpanel.php:182
 msgid "Rectangle"
 msgstr "Parihaba"
 
-#: adsenseadminpanel.php:183
 msgid "Rectangle slot code"
 msgstr "Kodigo ng puwang ng parihaba"
 
-#: adsenseadminpanel.php:188
 msgid "Leaderboard"
 msgstr "Pangunahing-pisara"
 
-#: adsenseadminpanel.php:189
 msgid "Leaderboard slot code"
 msgstr "Kodigo ng puwang ng pangunahing-pisara"
 
-#: adsenseadminpanel.php:194
 msgid "Skyscraper"
 msgstr "Tukud-langit"
 
-#: adsenseadminpanel.php:195
 msgid "Wide skyscraper slot code"
 msgstr "Kodigo ng puwang ng maluwang na tukud-langit"
 
-#: adsenseadminpanel.php:208
 msgid "Save"
 msgstr "Sagipin"
 
-#: adsenseadminpanel.php:208
 msgid "Save AdSense settings"
 msgstr "Sagipin ang mga katakdaan ng AdSense"
diff --git a/plugins/Adsense/locale/uk/LC_MESSAGES/Adsense.po b/plugins/Adsense/locale/uk/LC_MESSAGES/Adsense.po
index 6c027b4ba7..e7c96a87b7 100644
--- a/plugins/Adsense/locale/uk/LC_MESSAGES/Adsense.po
+++ b/plugins/Adsense/locale/uk/LC_MESSAGES/Adsense.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Adsense\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:14+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:45+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-15 11:03:12+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:42:37+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-adsense\n"
@@ -23,80 +23,61 @@ msgstr ""
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
 #. TRANS: Menu item title/tooltip
-#: AdsensePlugin.php:194
 msgid "AdSense configuration"
 msgstr "Конфігурація AdSense"
 
 #. TRANS: Menu item for site administration
-#: AdsensePlugin.php:196
 msgid "AdSense"
 msgstr "AdSense"
 
-#: AdsensePlugin.php:209
 msgid "Plugin to add Google AdSense to StatusNet sites."
 msgstr "Додаток для відображення Google AdSense на сторінці сайту StatusNet."
 
-#: adsenseadminpanel.php:52
 msgctxt "TITLE"
 msgid "AdSense"
 msgstr "AdSense"
 
-#: adsenseadminpanel.php:62
 msgid "AdSense settings for this StatusNet site"
 msgstr "Налаштування AdSense на даному сайті StatusNet"
 
-#: adsenseadminpanel.php:164
 msgid "Client ID"
 msgstr "ІД клієнта"
 
-#: adsenseadminpanel.php:165
 msgid "Google client ID"
 msgstr "ІД клієнта Google"
 
-#: adsenseadminpanel.php:170
 msgid "Ad script URL"
 msgstr "Адреса скрипту AdSense"
 
-#: adsenseadminpanel.php:171
 msgid "Script URL (advanced)"
 msgstr "Адреса скрипту (розширена опція)"
 
-#: adsenseadminpanel.php:176
 msgid "Medium rectangle"
 msgstr "Середній прямокутник"
 
-#: adsenseadminpanel.php:177
 msgid "Medium rectangle slot code"
 msgstr "Слот-код середнього прямокутника"
 
-#: adsenseadminpanel.php:182
 msgid "Rectangle"
 msgstr "Прямокутник"
 
-#: adsenseadminpanel.php:183
 msgid "Rectangle slot code"
 msgstr "Слот-код прямокутника"
 
-#: adsenseadminpanel.php:188
 msgid "Leaderboard"
 msgstr "Банер"
 
-#: adsenseadminpanel.php:189
 msgid "Leaderboard slot code"
 msgstr "Слот-код банеру"
 
-#: adsenseadminpanel.php:194
 msgid "Skyscraper"
 msgstr "Хмарочос"
 
-#: adsenseadminpanel.php:195
 msgid "Wide skyscraper slot code"
 msgstr "Слот-код хмарочосу"
 
-#: adsenseadminpanel.php:208
 msgid "Save"
 msgstr "Зберегти"
 
-#: adsenseadminpanel.php:208
 msgid "Save AdSense settings"
 msgstr "Зберегти налаштування AdSense"
diff --git a/plugins/Adsense/locale/zh_CN/LC_MESSAGES/Adsense.po b/plugins/Adsense/locale/zh_CN/LC_MESSAGES/Adsense.po
index 820a9a8821..a5b52ec25d 100644
--- a/plugins/Adsense/locale/zh_CN/LC_MESSAGES/Adsense.po
+++ b/plugins/Adsense/locale/zh_CN/LC_MESSAGES/Adsense.po
@@ -10,94 +10,75 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Adsense\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:14+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:45+0000\n"
 "Language-Team: Simplified Chinese <http://translatewiki.net/wiki/Portal:zh-"
 "hans>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-15 11:03:12+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:42:37+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-adsense\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. TRANS: Menu item title/tooltip
-#: AdsensePlugin.php:194
 msgid "AdSense configuration"
 msgstr "AdSense配置"
 
 #. TRANS: Menu item for site administration
-#: AdsensePlugin.php:196
 msgid "AdSense"
 msgstr "AdSense"
 
-#: AdsensePlugin.php:209
 msgid "Plugin to add Google AdSense to StatusNet sites."
 msgstr "添加 Google AdSense 到 StatusNet 网站的插件。"
 
-#: adsenseadminpanel.php:52
 msgctxt "TITLE"
 msgid "AdSense"
 msgstr "AdSense"
 
-#: adsenseadminpanel.php:62
 msgid "AdSense settings for this StatusNet site"
 msgstr "这个 StatusNet 网站的 AdSense 设置"
 
-#: adsenseadminpanel.php:164
 msgid "Client ID"
 msgstr "客户ID"
 
-#: adsenseadminpanel.php:165
 msgid "Google client ID"
 msgstr "Google 发布商 ID（例如：pub-1234567890123456）"
 
-#: adsenseadminpanel.php:170
 msgid "Ad script URL"
 msgstr "广告脚本地址"
 
-#: adsenseadminpanel.php:171
 msgid "Script URL (advanced)"
 msgstr "高级脚本地址"
 
-#: adsenseadminpanel.php:176
 msgid "Medium rectangle"
 msgstr "中等矩形"
 
-#: adsenseadminpanel.php:177
 msgid "Medium rectangle slot code"
 msgstr "中等矩形广告代码（#ID）"
 
-#: adsenseadminpanel.php:182
 msgid "Rectangle"
 msgstr "小矩形"
 
-#: adsenseadminpanel.php:183
 msgid "Rectangle slot code"
 msgstr "小矩形广告代码（#ID）"
 
-#: adsenseadminpanel.php:188
 msgid "Leaderboard"
 msgstr "首页横幅"
 
-#: adsenseadminpanel.php:189
 msgid "Leaderboard slot code"
 msgstr "首页横幅广告代码（#ID）"
 
-#: adsenseadminpanel.php:194
 msgid "Skyscraper"
 msgstr "宽幅摩天大楼"
 
-#: adsenseadminpanel.php:195
 msgid "Wide skyscraper slot code"
 msgstr "宽幅摩天大楼广告代码（#ID）"
 
-#: adsenseadminpanel.php:208
 msgid "Save"
 msgstr "保存"
 
-#: adsenseadminpanel.php:208
 msgid "Save AdSense settings"
 msgstr "保存AdSense设置"
diff --git a/plugins/Aim/locale/Aim.pot b/plugins/Aim/locale/Aim.pot
index d90aa51c83..95928f7cea 100644
--- a/plugins/Aim/locale/Aim.pot
+++ b/plugins/Aim/locale/Aim.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/Aim/locale/af/LC_MESSAGES/Aim.po b/plugins/Aim/locale/af/LC_MESSAGES/Aim.po
new file mode 100644
index 0000000000..3178241212
--- /dev/null
+++ b/plugins/Aim/locale/af/LC_MESSAGES/Aim.po
@@ -0,0 +1,34 @@
+# Translation of StatusNet - Aim to Afrikaans (Afrikaans)
+# Exported from translatewiki.net
+#
+# Author: Naudefj
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Aim\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:45+0000\n"
+"Language-Team: Afrikaans <http://translatewiki.net/wiki/Portal:af>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-03-03 20:42:10+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: af\n"
+"X-Message-Group: #out-statusnet-plugin-aim\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "Send me a message to post a notice"
+msgstr "Stuur my 'n boodskap om 'n kennisgewing te pos"
+
+msgid "AIM"
+msgstr "AIM"
+
+msgid ""
+"The AIM plugin allows users to send and receive notices over the AIM network."
+msgstr ""
+"Die AIM-uitbreiding laat gebruikers toe om kennisgewings oor die AIM-netwerk "
+"te stuur en te ontvang."
diff --git a/plugins/Aim/locale/ia/LC_MESSAGES/Aim.po b/plugins/Aim/locale/ia/LC_MESSAGES/Aim.po
new file mode 100644
index 0000000000..165dadfde2
--- /dev/null
+++ b/plugins/Aim/locale/ia/LC_MESSAGES/Aim.po
@@ -0,0 +1,34 @@
+# Translation of StatusNet - Aim to Interlingua (Interlingua)
+# Exported from translatewiki.net
+#
+# Author: McDutchie
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Aim\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:46+0000\n"
+"Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-03-03 20:42:10+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: ia\n"
+"X-Message-Group: #out-statusnet-plugin-aim\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "Send me a message to post a notice"
+msgstr "Inviar me un message pro publicar un nota"
+
+msgid "AIM"
+msgstr "AIM"
+
+msgid ""
+"The AIM plugin allows users to send and receive notices over the AIM network."
+msgstr ""
+"Le plug-in de AIM permitte que usatores invia e recipe notas per le rete de "
+"AIM."
diff --git a/plugins/Aim/locale/mk/LC_MESSAGES/Aim.po b/plugins/Aim/locale/mk/LC_MESSAGES/Aim.po
new file mode 100644
index 0000000000..dd7d253034
--- /dev/null
+++ b/plugins/Aim/locale/mk/LC_MESSAGES/Aim.po
@@ -0,0 +1,34 @@
+# Translation of StatusNet - Aim to Macedonian (Македонски)
+# Exported from translatewiki.net
+#
+# Author: Bjankuloski06
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Aim\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:46+0000\n"
+"Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-03-03 20:42:10+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: mk\n"
+"X-Message-Group: #out-statusnet-plugin-aim\n"
+"Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
+
+msgid "Send me a message to post a notice"
+msgstr "Испрати ми порака за да објавам забелешка"
+
+msgid "AIM"
+msgstr "AIM"
+
+msgid ""
+"The AIM plugin allows users to send and receive notices over the AIM network."
+msgstr ""
+"Приклучокот AIM им овозможува на корисниците да испраќаат и примаат "
+"забелешки преку мрежата AIM."
diff --git a/plugins/Aim/locale/nl/LC_MESSAGES/Aim.po b/plugins/Aim/locale/nl/LC_MESSAGES/Aim.po
new file mode 100644
index 0000000000..51d07365e1
--- /dev/null
+++ b/plugins/Aim/locale/nl/LC_MESSAGES/Aim.po
@@ -0,0 +1,34 @@
+# Translation of StatusNet - Aim to Dutch (Nederlands)
+# Exported from translatewiki.net
+#
+# Author: Siebrand
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Aim\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:46+0000\n"
+"Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-03-03 20:42:10+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: nl\n"
+"X-Message-Group: #out-statusnet-plugin-aim\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "Send me a message to post a notice"
+msgstr "Mij een bericht sturen om een mededeling te verzenden"
+
+msgid "AIM"
+msgstr "AIM"
+
+msgid ""
+"The AIM plugin allows users to send and receive notices over the AIM network."
+msgstr ""
+"Maakt het mogelijk om mededelingen te zenden naar en ontvangen van een AIM-"
+"netwerk."
diff --git a/plugins/AnonymousFave/locale/AnonymousFave.pot b/plugins/AnonymousFave/locale/AnonymousFave.pot
index ec69c8950b..c443628c0e 100644
--- a/plugins/AnonymousFave/locale/AnonymousFave.pot
+++ b/plugins/AnonymousFave/locale/AnonymousFave.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,6 +16,46 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#. TRANS: Server exception.
+#. TRANS: %d is the notice ID (number).
+#: Fave_tally.php:155 Fave_tally.php:184
+#, php-format
+msgid "Couldn't update favorite tally for notice ID %d."
+msgstr ""
+
+#. TRANS: Server exception.
+#. TRANS: %d is the notice ID (number).
+#: Fave_tally.php:215
+#, php-format
+msgid "Couldn't create favorite tally for notice ID %d."
+msgstr ""
+
+#. TRANS: Client error.
+#: anondisfavor.php:61
+msgid ""
+"Could not disfavor notice! Please make sure your browser has cookies enabled."
+msgstr ""
+
+#. TRANS: Client error.
+#: anondisfavor.php:72 anonfavor.php:71
+msgid "There was a problem with your session token. Try again, please."
+msgstr ""
+
+#. TRANS: Client error.
+#: anondisfavor.php:82
+msgid "This notice is not a favorite!"
+msgstr ""
+
+#. TRANS: Server error.
+#: anondisfavor.php:91
+msgid "Could not delete favorite."
+msgstr ""
+
+#. TRANS: Title.
+#: anondisfavor.php:101
+msgid "Add to favorites"
+msgstr ""
+
 #. TRANS: Label for tally for number of times a notice was favored.
 #: AnonymousFavePlugin.php:207
 msgid "Favored"
@@ -37,11 +77,6 @@ msgid ""
 "Could not favor notice! Please make sure your browser has cookies enabled."
 msgstr ""
 
-#. TRANS: Client error.
-#: anonfavor.php:71 anondisfavor.php:72
-msgid "There was a problem with your session token. Try again, please."
-msgstr ""
-
 #. TRANS: Client error.
 #: anonfavor.php:78
 msgid "This notice is already a favorite!"
@@ -56,38 +91,3 @@ msgstr ""
 #: anonfavor.php:95
 msgid "Disfavor favorite"
 msgstr ""
-
-#. TRANS: Server exception.
-#. TRANS: %d is the notice ID (number).
-#: Fave_tally.php:155 Fave_tally.php:184
-#, php-format
-msgid "Couldn't update favorite tally for notice ID %d."
-msgstr ""
-
-#. TRANS: Server exception.
-#. TRANS: %d is the notice ID (number).
-#: Fave_tally.php:215
-#, php-format
-msgid "Couldn't create favorite tally for notice ID %d."
-msgstr ""
-
-#. TRANS: Client error.
-#: anondisfavor.php:61
-msgid ""
-"Could not disfavor notice! Please make sure your browser has cookies enabled."
-msgstr ""
-
-#. TRANS: Client error.
-#: anondisfavor.php:82
-msgid "This notice is not a favorite!"
-msgstr ""
-
-#. TRANS: Server error.
-#: anondisfavor.php:91
-msgid "Could not delete favorite."
-msgstr ""
-
-#. TRANS: Title.
-#: anondisfavor.php:101
-msgid "Add to favorites"
-msgstr ""
diff --git a/plugins/AnonymousFave/locale/be-tarask/LC_MESSAGES/AnonymousFave.po b/plugins/AnonymousFave/locale/be-tarask/LC_MESSAGES/AnonymousFave.po
index 8f992cc067..c6cd6ab3f9 100644
--- a/plugins/AnonymousFave/locale/be-tarask/LC_MESSAGES/AnonymousFave.po
+++ b/plugins/AnonymousFave/locale/be-tarask/LC_MESSAGES/AnonymousFave.po
@@ -10,78 +10,32 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - AnonymousFave\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:15+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:47+0000\n"
 "Language-Team: Belarusian (Taraškievica orthography) <http://translatewiki."
 "net/wiki/Portal:be-tarask>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:27+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:42:38+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: be-tarask\n"
 "X-Message-Group: #out-statusnet-plugin-anonymousfave\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. TRANS: Label for tally for number of times a notice was favored.
-#: AnonymousFavePlugin.php:207
-msgid "Favored"
-msgstr "Улюблёнае"
-
-#. TRANS: Server exception.
-#: AnonymousFavePlugin.php:240 AnonymousFavePlugin.php:251
-msgid "Couldn't create anonymous user session."
-msgstr "Немагчыма стварыць сэсію ананімнага карыстальніка."
-
-#. TRANS: Plugin description.
-#: AnonymousFavePlugin.php:326
-msgid "Allow anonymous users to favorite notices."
-msgstr "Дазволіць ананімным карыстальнікам дадаваць паведамленьні ў улюблёныя."
-
-#. TRANS: Client error.
-#: anonfavor.php:60
-msgid ""
-"Could not favor notice! Please make sure your browser has cookies enabled."
-msgstr ""
-"Немагчыма пазначыць паведамленьне як улюблёнае. Калі ласка, упэўніцеся ў "
-"тым, што ў Вашым браўзэры ўключаныя закладкі (cookie)."
-
-#. TRANS: Client error.
-#: anonfavor.php:71 anondisfavor.php:72
-msgid "There was a problem with your session token. Try again, please."
-msgstr "Узьнікла праблема з ключом Вашай сэсіі. Калі ласка, паспрабуйце зноў."
-
-#. TRANS: Client error.
-#: anonfavor.php:78
-msgid "This notice is already a favorite!"
-msgstr "Гэтае паведамленьне ўжо знаходзіцца ў ліку ўлюблёных!"
-
-#. TRANS: Server error.
-#: anonfavor.php:85
-msgid "Could not create favorite."
-msgstr "Немагчыма стварыць як улюблёны."
-
-#. TRANS: Title.
-#: anonfavor.php:95
-msgid "Disfavor favorite"
-msgstr "Выдаліць з улюблёных"
-
 #. TRANS: Server exception.
 #. TRANS: %d is the notice ID (number).
-#: Fave_tally.php:155 Fave_tally.php:184
 #, php-format
 msgid "Couldn't update favorite tally for notice ID %d."
 msgstr "Немагчыма абнавіць лічыльнік пазнакаў улюблёных для запісу %d."
 
 #. TRANS: Server exception.
 #. TRANS: %d is the notice ID (number).
-#: Fave_tally.php:215
 #, php-format
 msgid "Couldn't create favorite tally for notice ID %d."
 msgstr "Немагчыма стварыць лічыльнік пазнакаў улюлёных для паведамленьня %d."
 
 #. TRANS: Client error.
-#: anondisfavor.php:61
 msgid ""
 "Could not disfavor notice! Please make sure your browser has cookies enabled."
 msgstr ""
@@ -89,16 +43,48 @@ msgstr ""
 "упэўніцеся, што ў Вашым браўзэры дазволеныя закладкі (cookie)."
 
 #. TRANS: Client error.
-#: anondisfavor.php:82
+msgid "There was a problem with your session token. Try again, please."
+msgstr "Узьнікла праблема з ключом Вашай сэсіі. Калі ласка, паспрабуйце зноў."
+
+#. TRANS: Client error.
 msgid "This notice is not a favorite!"
 msgstr "Гэтае паведамленьне не зьяўляецца ўлюблёным!"
 
 #. TRANS: Server error.
-#: anondisfavor.php:91
 msgid "Could not delete favorite."
 msgstr "Немагчыма выдаліць са сьпісу ўлюблёных."
 
 #. TRANS: Title.
-#: anondisfavor.php:101
 msgid "Add to favorites"
 msgstr "Дадаць ва ўлюблёныя"
+
+#. TRANS: Label for tally for number of times a notice was favored.
+msgid "Favored"
+msgstr "Улюблёнае"
+
+#. TRANS: Server exception.
+msgid "Couldn't create anonymous user session."
+msgstr "Немагчыма стварыць сэсію ананімнага карыстальніка."
+
+#. TRANS: Plugin description.
+msgid "Allow anonymous users to favorite notices."
+msgstr "Дазволіць ананімным карыстальнікам дадаваць паведамленьні ў улюблёныя."
+
+#. TRANS: Client error.
+msgid ""
+"Could not favor notice! Please make sure your browser has cookies enabled."
+msgstr ""
+"Немагчыма пазначыць паведамленьне як улюблёнае. Калі ласка, упэўніцеся ў "
+"тым, што ў Вашым браўзэры ўключаныя закладкі (cookie)."
+
+#. TRANS: Client error.
+msgid "This notice is already a favorite!"
+msgstr "Гэтае паведамленьне ўжо знаходзіцца ў ліку ўлюблёных!"
+
+#. TRANS: Server error.
+msgid "Could not create favorite."
+msgstr "Немагчыма стварыць як улюблёны."
+
+#. TRANS: Title.
+msgid "Disfavor favorite"
+msgstr "Выдаліць з улюблёных"
diff --git a/plugins/AnonymousFave/locale/br/LC_MESSAGES/AnonymousFave.po b/plugins/AnonymousFave/locale/br/LC_MESSAGES/AnonymousFave.po
index c0540eb433..957160e337 100644
--- a/plugins/AnonymousFave/locale/br/LC_MESSAGES/AnonymousFave.po
+++ b/plugins/AnonymousFave/locale/br/LC_MESSAGES/AnonymousFave.po
@@ -9,77 +9,31 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - AnonymousFave\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:15+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:47+0000\n"
 "Language-Team: Breton <http://translatewiki.net/wiki/Portal:br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:27+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:42:38+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-anonymousfave\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#. TRANS: Label for tally for number of times a notice was favored.
-#: AnonymousFavePlugin.php:207
-msgid "Favored"
-msgstr "Karetañ"
-
-#. TRANS: Server exception.
-#: AnonymousFavePlugin.php:240 AnonymousFavePlugin.php:251
-msgid "Couldn't create anonymous user session."
-msgstr "Dibosupl eo krouiñ un dalc'h implijer dizanv."
-
-#. TRANS: Plugin description.
-#: AnonymousFavePlugin.php:326
-msgid "Allow anonymous users to favorite notices."
-msgstr "Aotreañ an implijerien dizanv da gavout gwelloc'h kemennoù."
-
-#. TRANS: Client error.
-#: anonfavor.php:60
-msgid ""
-"Could not favor notice! Please make sure your browser has cookies enabled."
-msgstr ""
-"Dibosupl eo merkañ ar c'hemenn-mañ evel pennroll ! Mar plij gwiriekait e "
-"tegemer ho urzhiataer an toupinoù."
-
-#. TRANS: Client error.
-#: anonfavor.php:71 anondisfavor.php:72
-msgid "There was a problem with your session token. Try again, please."
-msgstr "Ur gudenn 'zo bet gant ho jedaouer dalc'h. Mar plij adklaskit."
-
-#. TRANS: Client error.
-#: anonfavor.php:78
-msgid "This notice is already a favorite!"
-msgstr "Ouzhpennet eo bet ar c'hemenn-mañ d'ho pennrolloù dija !"
-
-#. TRANS: Server error.
-#: anonfavor.php:85
-msgid "Could not create favorite."
-msgstr "Diposupl eo krouiñ ar pennroll-mañ."
-
-#. TRANS: Title.
-#: anonfavor.php:95
-msgid "Disfavor favorite"
-msgstr "Tennañ ar pennroll"
-
 #. TRANS: Server exception.
 #. TRANS: %d is the notice ID (number).
-#: Fave_tally.php:155 Fave_tally.php:184
 #, php-format
 msgid "Couldn't update favorite tally for notice ID %d."
 msgstr "Dibosupl eo hizivaat ar skor penndibaboù evit ar c'hemenn %d."
 
 #. TRANS: Server exception.
 #. TRANS: %d is the notice ID (number).
-#: Fave_tally.php:215
 #, php-format
 msgid "Couldn't create favorite tally for notice ID %d."
 msgstr "Dibosupl eo krouiñ ar skor penndibaboù evit ar c'hemenn %d."
 
 #. TRANS: Client error.
-#: anondisfavor.php:61
 msgid ""
 "Could not disfavor notice! Please make sure your browser has cookies enabled."
 msgstr ""
@@ -87,16 +41,48 @@ msgstr ""
 "e tegemer ho urzhiataer an toupinoù."
 
 #. TRANS: Client error.
-#: anondisfavor.php:82
+msgid "There was a problem with your session token. Try again, please."
+msgstr "Ur gudenn 'zo bet gant ho jedaouer dalc'h. Mar plij adklaskit."
+
+#. TRANS: Client error.
 msgid "This notice is not a favorite!"
 msgstr "N'eo ket ar c'hemenn-mañ ur pennroll !"
 
 #. TRANS: Server error.
-#: anondisfavor.php:91
 msgid "Could not delete favorite."
 msgstr "Diposupl eo dilemel ar pennroll-mañ."
 
 #. TRANS: Title.
-#: anondisfavor.php:101
 msgid "Add to favorites"
 msgstr "Ouzhpennañ d'ar pennrolloù"
+
+#. TRANS: Label for tally for number of times a notice was favored.
+msgid "Favored"
+msgstr "Karetañ"
+
+#. TRANS: Server exception.
+msgid "Couldn't create anonymous user session."
+msgstr "Dibosupl eo krouiñ un dalc'h implijer dizanv."
+
+#. TRANS: Plugin description.
+msgid "Allow anonymous users to favorite notices."
+msgstr "Aotreañ an implijerien dizanv da gavout gwelloc'h kemennoù."
+
+#. TRANS: Client error.
+msgid ""
+"Could not favor notice! Please make sure your browser has cookies enabled."
+msgstr ""
+"Dibosupl eo merkañ ar c'hemenn-mañ evel pennroll ! Mar plij gwiriekait e "
+"tegemer ho urzhiataer an toupinoù."
+
+#. TRANS: Client error.
+msgid "This notice is already a favorite!"
+msgstr "Ouzhpennet eo bet ar c'hemenn-mañ d'ho pennrolloù dija !"
+
+#. TRANS: Server error.
+msgid "Could not create favorite."
+msgstr "Diposupl eo krouiñ ar pennroll-mañ."
+
+#. TRANS: Title.
+msgid "Disfavor favorite"
+msgstr "Tennañ ar pennroll"
diff --git a/plugins/AnonymousFave/locale/de/LC_MESSAGES/AnonymousFave.po b/plugins/AnonymousFave/locale/de/LC_MESSAGES/AnonymousFave.po
index f105adc3c8..698a859359 100644
--- a/plugins/AnonymousFave/locale/de/LC_MESSAGES/AnonymousFave.po
+++ b/plugins/AnonymousFave/locale/de/LC_MESSAGES/AnonymousFave.po
@@ -9,77 +9,31 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - AnonymousFave\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:15+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:47+0000\n"
 "Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:27+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:42:38+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-anonymousfave\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. TRANS: Label for tally for number of times a notice was favored.
-#: AnonymousFavePlugin.php:207
-msgid "Favored"
-msgstr "Favorisiert"
-
-#. TRANS: Server exception.
-#: AnonymousFavePlugin.php:240 AnonymousFavePlugin.php:251
-msgid "Couldn't create anonymous user session."
-msgstr "Konnte keine anonyme Benutzer-Sitzung erstellen."
-
-#. TRANS: Plugin description.
-#: AnonymousFavePlugin.php:326
-msgid "Allow anonymous users to favorite notices."
-msgstr "Ermöglicht anonymen Benutzern Nachrichten zu favorisieren."
-
-#. TRANS: Client error.
-#: anonfavor.php:60
-msgid ""
-"Could not favor notice! Please make sure your browser has cookies enabled."
-msgstr ""
-"Konnte Nachricht nicht favorisieren! Bitte stelle sicher, dass Cookies in "
-"deinem Browser aktiviert sind."
-
-#. TRANS: Client error.
-#: anonfavor.php:71 anondisfavor.php:72
-msgid "There was a problem with your session token. Try again, please."
-msgstr "Es gab ein Problem mit deinem Sitzungstoken. Bitte versuche es erneut."
-
-#. TRANS: Client error.
-#: anonfavor.php:78
-msgid "This notice is already a favorite!"
-msgstr "Diese Nachricht ist bereits ein Favorit!"
-
-#. TRANS: Server error.
-#: anonfavor.php:85
-msgid "Could not create favorite."
-msgstr "Konnte keinen Favoriten erstellen."
-
-#. TRANS: Title.
-#: anonfavor.php:95
-msgid "Disfavor favorite"
-msgstr "Aus Favoriten entfernen"
-
 #. TRANS: Server exception.
 #. TRANS: %d is the notice ID (number).
-#: Fave_tally.php:155 Fave_tally.php:184
 #, php-format
 msgid "Couldn't update favorite tally for notice ID %d."
 msgstr "Konnte Favoritenzähler der Nachrichten-ID %d nicht aktualisieren."
 
 #. TRANS: Server exception.
 #. TRANS: %d is the notice ID (number).
-#: Fave_tally.php:215
 #, php-format
 msgid "Couldn't create favorite tally for notice ID %d."
 msgstr "Konnte keinen Favoritenzähler der Nachrichten-ID %d erstellen."
 
 #. TRANS: Client error.
-#: anondisfavor.php:61
 msgid ""
 "Could not disfavor notice! Please make sure your browser has cookies enabled."
 msgstr ""
@@ -87,16 +41,48 @@ msgstr ""
 "dass Cookies in deinem Browser aktiviert sind."
 
 #. TRANS: Client error.
-#: anondisfavor.php:82
+msgid "There was a problem with your session token. Try again, please."
+msgstr "Es gab ein Problem mit deinem Sitzungstoken. Bitte versuche es erneut."
+
+#. TRANS: Client error.
 msgid "This notice is not a favorite!"
 msgstr "Diese Nachricht ist kein Favorit!"
 
 #. TRANS: Server error.
-#: anondisfavor.php:91
 msgid "Could not delete favorite."
 msgstr "Konnte Favoriten nicht löschen."
 
 #. TRANS: Title.
-#: anondisfavor.php:101
 msgid "Add to favorites"
 msgstr "Zu Favoriten hinzufügen"
+
+#. TRANS: Label for tally for number of times a notice was favored.
+msgid "Favored"
+msgstr "Favorisiert"
+
+#. TRANS: Server exception.
+msgid "Couldn't create anonymous user session."
+msgstr "Konnte keine anonyme Benutzer-Sitzung erstellen."
+
+#. TRANS: Plugin description.
+msgid "Allow anonymous users to favorite notices."
+msgstr "Ermöglicht anonymen Benutzern Nachrichten zu favorisieren."
+
+#. TRANS: Client error.
+msgid ""
+"Could not favor notice! Please make sure your browser has cookies enabled."
+msgstr ""
+"Konnte Nachricht nicht favorisieren! Bitte stelle sicher, dass Cookies in "
+"deinem Browser aktiviert sind."
+
+#. TRANS: Client error.
+msgid "This notice is already a favorite!"
+msgstr "Diese Nachricht ist bereits ein Favorit!"
+
+#. TRANS: Server error.
+msgid "Could not create favorite."
+msgstr "Konnte keinen Favoriten erstellen."
+
+#. TRANS: Title.
+msgid "Disfavor favorite"
+msgstr "Aus Favoriten entfernen"
diff --git a/plugins/AnonymousFave/locale/es/LC_MESSAGES/AnonymousFave.po b/plugins/AnonymousFave/locale/es/LC_MESSAGES/AnonymousFave.po
index 9dfe3737f5..f006a773f9 100644
--- a/plugins/AnonymousFave/locale/es/LC_MESSAGES/AnonymousFave.po
+++ b/plugins/AnonymousFave/locale/es/LC_MESSAGES/AnonymousFave.po
@@ -10,78 +10,31 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - AnonymousFave\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:15+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:47+0000\n"
 "Language-Team: Spanish <http://translatewiki.net/wiki/Portal:es>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:27+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:42:38+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-anonymousfave\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. TRANS: Label for tally for number of times a notice was favored.
-#: AnonymousFavePlugin.php:207
-msgid "Favored"
-msgstr "Favorito"
-
-#. TRANS: Server exception.
-#: AnonymousFavePlugin.php:240 AnonymousFavePlugin.php:251
-msgid "Couldn't create anonymous user session."
-msgstr "No se pudo crear sesión de usuario anónimo."
-
-#. TRANS: Plugin description.
-#: AnonymousFavePlugin.php:326
-msgid "Allow anonymous users to favorite notices."
-msgstr "Permitir a usuarios anónimos marcar mensajes como favoritos."
-
-#. TRANS: Client error.
-#: anonfavor.php:60
-msgid ""
-"Could not favor notice! Please make sure your browser has cookies enabled."
-msgstr ""
-"No fue posible marcar el mensaje como favorito. Por favor, asegúrate de que "
-"las cookies están habilitadas en tu navegador."
-
-#. TRANS: Client error.
-#: anonfavor.php:71 anondisfavor.php:72
-msgid "There was a problem with your session token. Try again, please."
-msgstr ""
-"Hubo un problema con tu token de sesión. Por favor, inténtalo de nuevo."
-
-#. TRANS: Client error.
-#: anonfavor.php:78
-msgid "This notice is already a favorite!"
-msgstr "¡Este mensaje ya está en favoritos!"
-
-#. TRANS: Server error.
-#: anonfavor.php:85
-msgid "Could not create favorite."
-msgstr "No se pudo crear favorito."
-
-#. TRANS: Title.
-#: anonfavor.php:95
-msgid "Disfavor favorite"
-msgstr "Eliminar de la lista de favoritos."
-
 #. TRANS: Server exception.
 #. TRANS: %d is the notice ID (number).
-#: Fave_tally.php:155 Fave_tally.php:184
 #, php-format
 msgid "Couldn't update favorite tally for notice ID %d."
 msgstr "No se pudo actualizar el la cuenta favorita para el mensaje de ID %d."
 
 #. TRANS: Server exception.
 #. TRANS: %d is the notice ID (number).
-#: Fave_tally.php:215
 #, php-format
 msgid "Couldn't create favorite tally for notice ID %d."
 msgstr "No se pudo crear una cuenta favorita para el mensaje de ID %d."
 
 #. TRANS: Client error.
-#: anondisfavor.php:61
 msgid ""
 "Could not disfavor notice! Please make sure your browser has cookies enabled."
 msgstr ""
@@ -89,16 +42,49 @@ msgstr ""
 "asegúrate de que las cookies estén habilitadas en tu navegador."
 
 #. TRANS: Client error.
-#: anondisfavor.php:82
+msgid "There was a problem with your session token. Try again, please."
+msgstr ""
+"Hubo un problema con tu token de sesión. Por favor, inténtalo de nuevo."
+
+#. TRANS: Client error.
 msgid "This notice is not a favorite!"
 msgstr "¡Este mensaje no es un favorito!"
 
 #. TRANS: Server error.
-#: anondisfavor.php:91
 msgid "Could not delete favorite."
 msgstr "No se pudo borrar el favorito."
 
 #. TRANS: Title.
-#: anondisfavor.php:101
 msgid "Add to favorites"
 msgstr "Añadir a favoritos"
+
+#. TRANS: Label for tally for number of times a notice was favored.
+msgid "Favored"
+msgstr "Favorito"
+
+#. TRANS: Server exception.
+msgid "Couldn't create anonymous user session."
+msgstr "No se pudo crear sesión de usuario anónimo."
+
+#. TRANS: Plugin description.
+msgid "Allow anonymous users to favorite notices."
+msgstr "Permitir a usuarios anónimos marcar mensajes como favoritos."
+
+#. TRANS: Client error.
+msgid ""
+"Could not favor notice! Please make sure your browser has cookies enabled."
+msgstr ""
+"No fue posible marcar el mensaje como favorito. Por favor, asegúrate de que "
+"las cookies están habilitadas en tu navegador."
+
+#. TRANS: Client error.
+msgid "This notice is already a favorite!"
+msgstr "¡Este mensaje ya está en favoritos!"
+
+#. TRANS: Server error.
+msgid "Could not create favorite."
+msgstr "No se pudo crear favorito."
+
+#. TRANS: Title.
+msgid "Disfavor favorite"
+msgstr "Eliminar de la lista de favoritos."
diff --git a/plugins/AnonymousFave/locale/fr/LC_MESSAGES/AnonymousFave.po b/plugins/AnonymousFave/locale/fr/LC_MESSAGES/AnonymousFave.po
index 576e6a6e93..f06938b63c 100644
--- a/plugins/AnonymousFave/locale/fr/LC_MESSAGES/AnonymousFave.po
+++ b/plugins/AnonymousFave/locale/fr/LC_MESSAGES/AnonymousFave.po
@@ -9,79 +9,31 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - AnonymousFave\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:15+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:47+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:27+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:42:38+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-anonymousfave\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#. TRANS: Label for tally for number of times a notice was favored.
-#: AnonymousFavePlugin.php:207
-msgid "Favored"
-msgstr "Préféré"
-
-#. TRANS: Server exception.
-#: AnonymousFavePlugin.php:240 AnonymousFavePlugin.php:251
-msgid "Couldn't create anonymous user session."
-msgstr "Impossible de créer une session d’utilisateur anonyme."
-
-#. TRANS: Plugin description.
-#: AnonymousFavePlugin.php:326
-msgid "Allow anonymous users to favorite notices."
-msgstr "Autoriser les utilisateurs anonymes à préférer des avis."
-
-#. TRANS: Client error.
-#: anonfavor.php:60
-msgid ""
-"Could not favor notice! Please make sure your browser has cookies enabled."
-msgstr ""
-"Impossible de marquer cet avis comme favori ! Veuillez vous assurer que "
-"votre navigateur accepte les cookies."
-
-#. TRANS: Client error.
-#: anonfavor.php:71 anondisfavor.php:72
-msgid "There was a problem with your session token. Try again, please."
-msgstr ""
-"Un problème est survenu avec votre jeton de session. Veuillez essayer à "
-"nouveau."
-
-#. TRANS: Client error.
-#: anonfavor.php:78
-msgid "This notice is already a favorite!"
-msgstr "Cet avis a déjà été ajouté à vos favoris !"
-
-#. TRANS: Server error.
-#: anonfavor.php:85
-msgid "Could not create favorite."
-msgstr "Impossible de créer le favori."
-
-#. TRANS: Title.
-#: anonfavor.php:95
-msgid "Disfavor favorite"
-msgstr "Retirer ce favori"
-
 #. TRANS: Server exception.
 #. TRANS: %d is the notice ID (number).
-#: Fave_tally.php:155 Fave_tally.php:184
 #, php-format
 msgid "Couldn't update favorite tally for notice ID %d."
 msgstr "Impossible de mettre à jour le score de préférence pour l’avis %d."
 
 #. TRANS: Server exception.
 #. TRANS: %d is the notice ID (number).
-#: Fave_tally.php:215
 #, php-format
 msgid "Couldn't create favorite tally for notice ID %d."
 msgstr "Impossible de créer le score de préférence pour l’avis %d."
 
 #. TRANS: Client error.
-#: anondisfavor.php:61
 msgid ""
 "Could not disfavor notice! Please make sure your browser has cookies enabled."
 msgstr ""
@@ -89,16 +41,50 @@ msgstr ""
 "votre navigateur accepte les cookies."
 
 #. TRANS: Client error.
-#: anondisfavor.php:82
+msgid "There was a problem with your session token. Try again, please."
+msgstr ""
+"Un problème est survenu avec votre jeton de session. Veuillez essayer à "
+"nouveau."
+
+#. TRANS: Client error.
 msgid "This notice is not a favorite!"
 msgstr "Cet avis n’est pas un favori !"
 
 #. TRANS: Server error.
-#: anondisfavor.php:91
 msgid "Could not delete favorite."
 msgstr "Impossible de supprimer le favori."
 
 #. TRANS: Title.
-#: anondisfavor.php:101
 msgid "Add to favorites"
 msgstr "Ajouter aux favoris"
+
+#. TRANS: Label for tally for number of times a notice was favored.
+msgid "Favored"
+msgstr "Préféré"
+
+#. TRANS: Server exception.
+msgid "Couldn't create anonymous user session."
+msgstr "Impossible de créer une session d’utilisateur anonyme."
+
+#. TRANS: Plugin description.
+msgid "Allow anonymous users to favorite notices."
+msgstr "Autoriser les utilisateurs anonymes à préférer des avis."
+
+#. TRANS: Client error.
+msgid ""
+"Could not favor notice! Please make sure your browser has cookies enabled."
+msgstr ""
+"Impossible de marquer cet avis comme favori ! Veuillez vous assurer que "
+"votre navigateur accepte les cookies."
+
+#. TRANS: Client error.
+msgid "This notice is already a favorite!"
+msgstr "Cet avis a déjà été ajouté à vos favoris !"
+
+#. TRANS: Server error.
+msgid "Could not create favorite."
+msgstr "Impossible de créer le favori."
+
+#. TRANS: Title.
+msgid "Disfavor favorite"
+msgstr "Retirer ce favori"
diff --git a/plugins/AnonymousFave/locale/gl/LC_MESSAGES/AnonymousFave.po b/plugins/AnonymousFave/locale/gl/LC_MESSAGES/AnonymousFave.po
index 3c15e819cf..68aa318e23 100644
--- a/plugins/AnonymousFave/locale/gl/LC_MESSAGES/AnonymousFave.po
+++ b/plugins/AnonymousFave/locale/gl/LC_MESSAGES/AnonymousFave.po
@@ -9,90 +9,76 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - AnonymousFave\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:15+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:47+0000\n"
 "Language-Team: Galician <http://translatewiki.net/wiki/Portal:gl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:27+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:42:38+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: gl\n"
 "X-Message-Group: #out-statusnet-plugin-anonymousfave\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. TRANS: Label for tally for number of times a notice was favored.
-#: AnonymousFavePlugin.php:207
-msgid "Favored"
-msgstr ""
-
-#. TRANS: Server exception.
-#: AnonymousFavePlugin.php:240 AnonymousFavePlugin.php:251
-msgid "Couldn't create anonymous user session."
-msgstr ""
-
-#. TRANS: Plugin description.
-#: AnonymousFavePlugin.php:326
-msgid "Allow anonymous users to favorite notices."
-msgstr ""
-
-#. TRANS: Client error.
-#: anonfavor.php:60
-msgid ""
-"Could not favor notice! Please make sure your browser has cookies enabled."
-msgstr ""
-
-#. TRANS: Client error.
-#: anonfavor.php:71 anondisfavor.php:72
-msgid "There was a problem with your session token. Try again, please."
-msgstr "Houbo un erro co seu pase. Inténteo de novo."
-
-#. TRANS: Client error.
-#: anonfavor.php:78
-msgid "This notice is already a favorite!"
-msgstr "A nota xa é unha das súas favoritas!"
-
-#. TRANS: Server error.
-#: anonfavor.php:85
-msgid "Could not create favorite."
-msgstr "Non se puido crear o favorito."
-
-#. TRANS: Title.
-#: anonfavor.php:95
-msgid "Disfavor favorite"
-msgstr "Desmarcar como favorita"
-
 #. TRANS: Server exception.
 #. TRANS: %d is the notice ID (number).
-#: Fave_tally.php:155 Fave_tally.php:184
 #, php-format
 msgid "Couldn't update favorite tally for notice ID %d."
 msgstr ""
 
 #. TRANS: Server exception.
 #. TRANS: %d is the notice ID (number).
-#: Fave_tally.php:215
 #, php-format
 msgid "Couldn't create favorite tally for notice ID %d."
 msgstr ""
 
 #. TRANS: Client error.
-#: anondisfavor.php:61
 msgid ""
 "Could not disfavor notice! Please make sure your browser has cookies enabled."
 msgstr ""
 
 #. TRANS: Client error.
-#: anondisfavor.php:82
+msgid "There was a problem with your session token. Try again, please."
+msgstr "Houbo un erro co seu pase. Inténteo de novo."
+
+#. TRANS: Client error.
 msgid "This notice is not a favorite!"
 msgstr "Esta nota non é unha das favoritas!"
 
 #. TRANS: Server error.
-#: anondisfavor.php:91
 msgid "Could not delete favorite."
 msgstr "Non se puido eliminar o favorito."
 
 #. TRANS: Title.
-#: anondisfavor.php:101
 msgid "Add to favorites"
 msgstr "Engadir aos favoritos"
+
+#. TRANS: Label for tally for number of times a notice was favored.
+msgid "Favored"
+msgstr ""
+
+#. TRANS: Server exception.
+msgid "Couldn't create anonymous user session."
+msgstr ""
+
+#. TRANS: Plugin description.
+msgid "Allow anonymous users to favorite notices."
+msgstr ""
+
+#. TRANS: Client error.
+msgid ""
+"Could not favor notice! Please make sure your browser has cookies enabled."
+msgstr ""
+
+#. TRANS: Client error.
+msgid "This notice is already a favorite!"
+msgstr "A nota xa é unha das súas favoritas!"
+
+#. TRANS: Server error.
+msgid "Could not create favorite."
+msgstr "Non se puido crear o favorito."
+
+#. TRANS: Title.
+msgid "Disfavor favorite"
+msgstr "Desmarcar como favorita"
diff --git a/plugins/AnonymousFave/locale/ia/LC_MESSAGES/AnonymousFave.po b/plugins/AnonymousFave/locale/ia/LC_MESSAGES/AnonymousFave.po
index 1fb662431c..0991454878 100644
--- a/plugins/AnonymousFave/locale/ia/LC_MESSAGES/AnonymousFave.po
+++ b/plugins/AnonymousFave/locale/ia/LC_MESSAGES/AnonymousFave.po
@@ -9,77 +9,31 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - AnonymousFave\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:15+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:47+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:27+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:42:38+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-anonymousfave\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. TRANS: Label for tally for number of times a notice was favored.
-#: AnonymousFavePlugin.php:207
-msgid "Favored"
-msgstr "Favorite"
-
-#. TRANS: Server exception.
-#: AnonymousFavePlugin.php:240 AnonymousFavePlugin.php:251
-msgid "Couldn't create anonymous user session."
-msgstr "Non poteva crear session de usator anonyme."
-
-#. TRANS: Plugin description.
-#: AnonymousFavePlugin.php:326
-msgid "Allow anonymous users to favorite notices."
-msgstr "Permitter a usatores anonyme de favorir notas."
-
-#. TRANS: Client error.
-#: anonfavor.php:60
-msgid ""
-"Could not favor notice! Please make sure your browser has cookies enabled."
-msgstr ""
-"Non poteva favorir le nota! Per favor assecura te que tu navigator ha le "
-"cookies activate."
-
-#. TRANS: Client error.
-#: anonfavor.php:71 anondisfavor.php:72
-msgid "There was a problem with your session token. Try again, please."
-msgstr "Occurreva un problema con le indicio de tu session. Per favor reproba."
-
-#. TRANS: Client error.
-#: anonfavor.php:78
-msgid "This notice is already a favorite!"
-msgstr "Iste nota es ja favorite!"
-
-#. TRANS: Server error.
-#: anonfavor.php:85
-msgid "Could not create favorite."
-msgstr "Non poteva crear le favorite."
-
-#. TRANS: Title.
-#: anonfavor.php:95
-msgid "Disfavor favorite"
-msgstr "Disfavorir favorite"
-
 #. TRANS: Server exception.
 #. TRANS: %d is the notice ID (number).
-#: Fave_tally.php:155 Fave_tally.php:184
 #, php-format
 msgid "Couldn't update favorite tally for notice ID %d."
 msgstr "Non poteva actualisar le numero de favorites pro le ID de nota %d."
 
 #. TRANS: Server exception.
 #. TRANS: %d is the notice ID (number).
-#: Fave_tally.php:215
 #, php-format
 msgid "Couldn't create favorite tally for notice ID %d."
 msgstr "Non poteva crear un numero de favorites pro le ID de nota %d."
 
 #. TRANS: Client error.
-#: anondisfavor.php:61
 msgid ""
 "Could not disfavor notice! Please make sure your browser has cookies enabled."
 msgstr ""
@@ -87,16 +41,48 @@ msgstr ""
 "cookies activate."
 
 #. TRANS: Client error.
-#: anondisfavor.php:82
+msgid "There was a problem with your session token. Try again, please."
+msgstr "Occurreva un problema con le indicio de tu session. Per favor reproba."
+
+#. TRANS: Client error.
 msgid "This notice is not a favorite!"
 msgstr "Iste nota non es favorite!"
 
 #. TRANS: Server error.
-#: anondisfavor.php:91
 msgid "Could not delete favorite."
 msgstr "Non poteva deler le favorite."
 
 #. TRANS: Title.
-#: anondisfavor.php:101
 msgid "Add to favorites"
 msgstr "Adder al favorites"
+
+#. TRANS: Label for tally for number of times a notice was favored.
+msgid "Favored"
+msgstr "Favorite"
+
+#. TRANS: Server exception.
+msgid "Couldn't create anonymous user session."
+msgstr "Non poteva crear session de usator anonyme."
+
+#. TRANS: Plugin description.
+msgid "Allow anonymous users to favorite notices."
+msgstr "Permitter a usatores anonyme de favorir notas."
+
+#. TRANS: Client error.
+msgid ""
+"Could not favor notice! Please make sure your browser has cookies enabled."
+msgstr ""
+"Non poteva favorir le nota! Per favor assecura te que tu navigator ha le "
+"cookies activate."
+
+#. TRANS: Client error.
+msgid "This notice is already a favorite!"
+msgstr "Iste nota es ja favorite!"
+
+#. TRANS: Server error.
+msgid "Could not create favorite."
+msgstr "Non poteva crear le favorite."
+
+#. TRANS: Title.
+msgid "Disfavor favorite"
+msgstr "Disfavorir favorite"
diff --git a/plugins/AnonymousFave/locale/mk/LC_MESSAGES/AnonymousFave.po b/plugins/AnonymousFave/locale/mk/LC_MESSAGES/AnonymousFave.po
index 851bbcf3a0..70006c77f7 100644
--- a/plugins/AnonymousFave/locale/mk/LC_MESSAGES/AnonymousFave.po
+++ b/plugins/AnonymousFave/locale/mk/LC_MESSAGES/AnonymousFave.po
@@ -9,77 +9,31 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - AnonymousFave\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:15+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:47+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:27+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:42:38+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-anonymousfave\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
 
-#. TRANS: Label for tally for number of times a notice was favored.
-#: AnonymousFavePlugin.php:207
-msgid "Favored"
-msgstr "Бендисано"
-
-#. TRANS: Server exception.
-#: AnonymousFavePlugin.php:240 AnonymousFavePlugin.php:251
-msgid "Couldn't create anonymous user session."
-msgstr "Не можев да создадам анонимна корисничка сесија."
-
-#. TRANS: Plugin description.
-#: AnonymousFavePlugin.php:326
-msgid "Allow anonymous users to favorite notices."
-msgstr "Дозволи анонимни корисници да бендисуваат забелешки."
-
-#. TRANS: Client error.
-#: anonfavor.php:60
-msgid ""
-"Could not favor notice! Please make sure your browser has cookies enabled."
-msgstr ""
-"Не можев да ја бендисам заблешката. Проверете дали имате овозможено колачиња "
-"во прелистувачот."
-
-#. TRANS: Client error.
-#: anonfavor.php:71 anondisfavor.php:72
-msgid "There was a problem with your session token. Try again, please."
-msgstr "Се појави проблем со жетонот на Вашата сесија. Обидете се подоцна."
-
-#. TRANS: Client error.
-#: anonfavor.php:78
-msgid "This notice is already a favorite!"
-msgstr "Веќе сте ја бендисале оваа забелешка!"
-
-#. TRANS: Server error.
-#: anonfavor.php:85
-msgid "Could not create favorite."
-msgstr "Не можев да создадам бендисана забелешка."
-
-#. TRANS: Title.
-#: anonfavor.php:95
-msgid "Disfavor favorite"
-msgstr "Одбендисај бендисана"
-
 #. TRANS: Server exception.
 #. TRANS: %d is the notice ID (number).
-#: Fave_tally.php:155 Fave_tally.php:184
 #, php-format
 msgid "Couldn't update favorite tally for notice ID %d."
 msgstr "Не можев да го поновам бројот на бендисувања за забелешката со ID %d."
 
 #. TRANS: Server exception.
 #. TRANS: %d is the notice ID (number).
-#: Fave_tally.php:215
 #, php-format
 msgid "Couldn't create favorite tally for notice ID %d."
 msgstr "Не можев создадам бројач на бендисувања за забелешката со ID %d."
 
 #. TRANS: Client error.
-#: anondisfavor.php:61
 msgid ""
 "Could not disfavor notice! Please make sure your browser has cookies enabled."
 msgstr ""
@@ -87,16 +41,48 @@ msgstr ""
 "колачиња во прелистувачот."
 
 #. TRANS: Client error.
-#: anondisfavor.php:82
+msgid "There was a problem with your session token. Try again, please."
+msgstr "Се појави проблем со жетонот на Вашата сесија. Обидете се подоцна."
+
+#. TRANS: Client error.
 msgid "This notice is not a favorite!"
 msgstr "Оваа забелешка не Ви е бендисана!"
 
 #. TRANS: Server error.
-#: anondisfavor.php:91
 msgid "Could not delete favorite."
 msgstr "Не можев да ја избришам бендисаната забелешка."
 
 #. TRANS: Title.
-#: anondisfavor.php:101
 msgid "Add to favorites"
 msgstr "Додај во бендисани"
+
+#. TRANS: Label for tally for number of times a notice was favored.
+msgid "Favored"
+msgstr "Бендисано"
+
+#. TRANS: Server exception.
+msgid "Couldn't create anonymous user session."
+msgstr "Не можев да создадам анонимна корисничка сесија."
+
+#. TRANS: Plugin description.
+msgid "Allow anonymous users to favorite notices."
+msgstr "Дозволи анонимни корисници да бендисуваат забелешки."
+
+#. TRANS: Client error.
+msgid ""
+"Could not favor notice! Please make sure your browser has cookies enabled."
+msgstr ""
+"Не можев да ја бендисам заблешката. Проверете дали имате овозможено колачиња "
+"во прелистувачот."
+
+#. TRANS: Client error.
+msgid "This notice is already a favorite!"
+msgstr "Веќе сте ја бендисале оваа забелешка!"
+
+#. TRANS: Server error.
+msgid "Could not create favorite."
+msgstr "Не можев да создадам бендисана забелешка."
+
+#. TRANS: Title.
+msgid "Disfavor favorite"
+msgstr "Одбендисај бендисана"
diff --git a/plugins/AnonymousFave/locale/nl/LC_MESSAGES/AnonymousFave.po b/plugins/AnonymousFave/locale/nl/LC_MESSAGES/AnonymousFave.po
index e98a66c527..f16ffd582b 100644
--- a/plugins/AnonymousFave/locale/nl/LC_MESSAGES/AnonymousFave.po
+++ b/plugins/AnonymousFave/locale/nl/LC_MESSAGES/AnonymousFave.po
@@ -10,66 +10,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - AnonymousFave\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:15+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:47+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:27+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:42:38+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-anonymousfave\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. TRANS: Label for tally for number of times a notice was favored.
-#: AnonymousFavePlugin.php:207
-msgid "Favored"
-msgstr "Als favoriet aangemerkt"
-
-#. TRANS: Server exception.
-#: AnonymousFavePlugin.php:240 AnonymousFavePlugin.php:251
-msgid "Couldn't create anonymous user session."
-msgstr "Het was niet mogelijk een anonieme gebruikerssessie aan te maken."
-
-#. TRANS: Plugin description.
-#: AnonymousFavePlugin.php:326
-msgid "Allow anonymous users to favorite notices."
-msgstr "Staat anonieme gebruikers toe mededelingen als favoriet aan te merken."
-
-#. TRANS: Client error.
-#: anonfavor.php:60
-msgid ""
-"Could not favor notice! Please make sure your browser has cookies enabled."
-msgstr ""
-"De mededeling kon niet als favoriet aangemerkt worden. Zorg dat uw browser "
-"het gebruik van cookies toestaat."
-
-#. TRANS: Client error.
-#: anonfavor.php:71 anondisfavor.php:72
-msgid "There was a problem with your session token. Try again, please."
-msgstr ""
-"Er is een probleem ontstaan met uw sessie. Probeer het nog een keer, "
-"alstublieft."
-
-#. TRANS: Client error.
-#: anonfavor.php:78
-msgid "This notice is already a favorite!"
-msgstr "Deze mededeling staat al in uw favorietenlijst."
-
-#. TRANS: Server error.
-#: anonfavor.php:85
-msgid "Could not create favorite."
-msgstr "Het was niet mogelijk een favoriet aan te maken."
-
-#. TRANS: Title.
-#: anonfavor.php:95
-msgid "Disfavor favorite"
-msgstr "Van favorietenlijst verwijderen"
-
 #. TRANS: Server exception.
 #. TRANS: %d is the notice ID (number).
-#: Fave_tally.php:155 Fave_tally.php:184
 #, php-format
 msgid "Couldn't update favorite tally for notice ID %d."
 msgstr ""
@@ -78,7 +32,6 @@ msgstr ""
 
 #. TRANS: Server exception.
 #. TRANS: %d is the notice ID (number).
-#: Fave_tally.php:215
 #, php-format
 msgid "Couldn't create favorite tally for notice ID %d."
 msgstr ""
@@ -86,7 +39,6 @@ msgstr ""
 "mededeling met ID %d."
 
 #. TRANS: Client error.
-#: anondisfavor.php:61
 msgid ""
 "Could not disfavor notice! Please make sure your browser has cookies enabled."
 msgstr ""
@@ -94,17 +46,51 @@ msgstr ""
 "het gebruik van cookies toestaat."
 
 #. TRANS: Client error.
-#: anondisfavor.php:82
+msgid "There was a problem with your session token. Try again, please."
+msgstr ""
+"Er is een probleem ontstaan met uw sessie. Probeer het nog een keer, "
+"alstublieft."
+
+#. TRANS: Client error.
 msgid "This notice is not a favorite!"
 msgstr "Deze mededeling staat niet op uw favorietenlijst."
 
 #. TRANS: Server error.
-#: anondisfavor.php:91
 msgid "Could not delete favorite."
 msgstr ""
 "Het was niet mogelijk deze mededeling van uw favorietenlijst te verwijderen."
 
 #. TRANS: Title.
-#: anondisfavor.php:101
 msgid "Add to favorites"
 msgstr "Aan favorieten toevoegen"
+
+#. TRANS: Label for tally for number of times a notice was favored.
+msgid "Favored"
+msgstr "Als favoriet aangemerkt"
+
+#. TRANS: Server exception.
+msgid "Couldn't create anonymous user session."
+msgstr "Het was niet mogelijk een anonieme gebruikerssessie aan te maken."
+
+#. TRANS: Plugin description.
+msgid "Allow anonymous users to favorite notices."
+msgstr "Staat anonieme gebruikers toe mededelingen als favoriet aan te merken."
+
+#. TRANS: Client error.
+msgid ""
+"Could not favor notice! Please make sure your browser has cookies enabled."
+msgstr ""
+"De mededeling kon niet als favoriet aangemerkt worden. Zorg dat uw browser "
+"het gebruik van cookies toestaat."
+
+#. TRANS: Client error.
+msgid "This notice is already a favorite!"
+msgstr "Deze mededeling staat al in uw favorietenlijst."
+
+#. TRANS: Server error.
+msgid "Could not create favorite."
+msgstr "Het was niet mogelijk een favoriet aan te maken."
+
+#. TRANS: Title.
+msgid "Disfavor favorite"
+msgstr "Van favorietenlijst verwijderen"
diff --git a/plugins/AnonymousFave/locale/pt/LC_MESSAGES/AnonymousFave.po b/plugins/AnonymousFave/locale/pt/LC_MESSAGES/AnonymousFave.po
index 83febad297..02dbf09616 100644
--- a/plugins/AnonymousFave/locale/pt/LC_MESSAGES/AnonymousFave.po
+++ b/plugins/AnonymousFave/locale/pt/LC_MESSAGES/AnonymousFave.po
@@ -9,35 +9,66 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - AnonymousFave\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:15+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:47+0000\n"
 "Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:27+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:42:38+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-plugin-anonymousfave\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Server exception.
+#. TRANS: %d is the notice ID (number).
+#, php-format
+msgid "Couldn't update favorite tally for notice ID %d."
+msgstr ""
+
+#. TRANS: Server exception.
+#. TRANS: %d is the notice ID (number).
+#, php-format
+msgid "Couldn't create favorite tally for notice ID %d."
+msgstr ""
+
+#. TRANS: Client error.
+msgid ""
+"Could not disfavor notice! Please make sure your browser has cookies enabled."
+msgstr ""
+
+#. TRANS: Client error.
+msgid "There was a problem with your session token. Try again, please."
+msgstr ""
+"Ocorreu um problema com seu identificador de sessão. Tente novamente, por "
+"favor."
+
+#. TRANS: Client error.
+msgid "This notice is not a favorite!"
+msgstr ""
+
+#. TRANS: Server error.
+msgid "Could not delete favorite."
+msgstr ""
+
+#. TRANS: Title.
+msgid "Add to favorites"
+msgstr ""
+
 #. TRANS: Label for tally for number of times a notice was favored.
-#: AnonymousFavePlugin.php:207
 msgid "Favored"
 msgstr "Marcada como favorita"
 
 #. TRANS: Server exception.
-#: AnonymousFavePlugin.php:240 AnonymousFavePlugin.php:251
 msgid "Couldn't create anonymous user session."
 msgstr "Não foi possível criar uma sessão de utilizador anónimo."
 
 #. TRANS: Plugin description.
-#: AnonymousFavePlugin.php:326
 msgid "Allow anonymous users to favorite notices."
 msgstr "Permitir a utilizadores anónimos marcar mensagens como favoritas."
 
 #. TRANS: Client error.
-#: anonfavor.php:60
 msgid ""
 "Could not favor notice! Please make sure your browser has cookies enabled."
 msgstr ""
@@ -45,58 +76,13 @@ msgstr ""
 "que os cookies estão ativados no seu navegador."
 
 #. TRANS: Client error.
-#: anonfavor.php:71 anondisfavor.php:72
-msgid "There was a problem with your session token. Try again, please."
-msgstr ""
-"Ocorreu um problema com seu identificador de sessão. Tente novamente, por "
-"favor."
-
-#. TRANS: Client error.
-#: anonfavor.php:78
 msgid "This notice is already a favorite!"
 msgstr "Esta mensagem já é uma das suas favoritas!"
 
 #. TRANS: Server error.
-#: anonfavor.php:85
 msgid "Could not create favorite."
 msgstr "Não foi possível criar o favorito."
 
 #. TRANS: Title.
-#: anonfavor.php:95
 msgid "Disfavor favorite"
 msgstr "Retirar das favoritas"
-
-#. TRANS: Server exception.
-#. TRANS: %d is the notice ID (number).
-#: Fave_tally.php:155 Fave_tally.php:184
-#, php-format
-msgid "Couldn't update favorite tally for notice ID %d."
-msgstr ""
-
-#. TRANS: Server exception.
-#. TRANS: %d is the notice ID (number).
-#: Fave_tally.php:215
-#, php-format
-msgid "Couldn't create favorite tally for notice ID %d."
-msgstr ""
-
-#. TRANS: Client error.
-#: anondisfavor.php:61
-msgid ""
-"Could not disfavor notice! Please make sure your browser has cookies enabled."
-msgstr ""
-
-#. TRANS: Client error.
-#: anondisfavor.php:82
-msgid "This notice is not a favorite!"
-msgstr ""
-
-#. TRANS: Server error.
-#: anondisfavor.php:91
-msgid "Could not delete favorite."
-msgstr ""
-
-#. TRANS: Title.
-#: anondisfavor.php:101
-msgid "Add to favorites"
-msgstr ""
diff --git a/plugins/AnonymousFave/locale/ru/LC_MESSAGES/AnonymousFave.po b/plugins/AnonymousFave/locale/ru/LC_MESSAGES/AnonymousFave.po
index 315f19a735..428886bdff 100644
--- a/plugins/AnonymousFave/locale/ru/LC_MESSAGES/AnonymousFave.po
+++ b/plugins/AnonymousFave/locale/ru/LC_MESSAGES/AnonymousFave.po
@@ -10,36 +10,65 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - AnonymousFave\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:15+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:47+0000\n"
 "Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:27+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:42:38+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-anonymousfave\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
+#. TRANS: Server exception.
+#. TRANS: %d is the notice ID (number).
+#, php-format
+msgid "Couldn't update favorite tally for notice ID %d."
+msgstr ""
+
+#. TRANS: Server exception.
+#. TRANS: %d is the notice ID (number).
+#, php-format
+msgid "Couldn't create favorite tally for notice ID %d."
+msgstr ""
+
+#. TRANS: Client error.
+msgid ""
+"Could not disfavor notice! Please make sure your browser has cookies enabled."
+msgstr ""
+
+#. TRANS: Client error.
+msgid "There was a problem with your session token. Try again, please."
+msgstr ""
+
+#. TRANS: Client error.
+msgid "This notice is not a favorite!"
+msgstr ""
+
+#. TRANS: Server error.
+msgid "Could not delete favorite."
+msgstr ""
+
+#. TRANS: Title.
+msgid "Add to favorites"
+msgstr "Добавить в избранное"
+
 #. TRANS: Label for tally for number of times a notice was favored.
-#: AnonymousFavePlugin.php:207
 msgid "Favored"
 msgstr "Понравилось"
 
 #. TRANS: Server exception.
-#: AnonymousFavePlugin.php:240 AnonymousFavePlugin.php:251
 msgid "Couldn't create anonymous user session."
 msgstr "Не удаётся создать сеанс анонимного пользователя."
 
 #. TRANS: Plugin description.
-#: AnonymousFavePlugin.php:326
 msgid "Allow anonymous users to favorite notices."
 msgstr "Позволяет анонимным пользователям добавлять записи в число любимых."
 
 #. TRANS: Client error.
-#: anonfavor.php:60
 msgid ""
 "Could not favor notice! Please make sure your browser has cookies enabled."
 msgstr ""
@@ -47,56 +76,13 @@ msgstr ""
 "включены в вашем браузере."
 
 #. TRANS: Client error.
-#: anonfavor.php:71 anondisfavor.php:72
-msgid "There was a problem with your session token. Try again, please."
-msgstr ""
-
-#. TRANS: Client error.
-#: anonfavor.php:78
 msgid "This notice is already a favorite!"
 msgstr ""
 
 #. TRANS: Server error.
-#: anonfavor.php:85
 msgid "Could not create favorite."
 msgstr ""
 
 #. TRANS: Title.
-#: anonfavor.php:95
 msgid "Disfavor favorite"
 msgstr ""
-
-#. TRANS: Server exception.
-#. TRANS: %d is the notice ID (number).
-#: Fave_tally.php:155 Fave_tally.php:184
-#, php-format
-msgid "Couldn't update favorite tally for notice ID %d."
-msgstr ""
-
-#. TRANS: Server exception.
-#. TRANS: %d is the notice ID (number).
-#: Fave_tally.php:215
-#, php-format
-msgid "Couldn't create favorite tally for notice ID %d."
-msgstr ""
-
-#. TRANS: Client error.
-#: anondisfavor.php:61
-msgid ""
-"Could not disfavor notice! Please make sure your browser has cookies enabled."
-msgstr ""
-
-#. TRANS: Client error.
-#: anondisfavor.php:82
-msgid "This notice is not a favorite!"
-msgstr ""
-
-#. TRANS: Server error.
-#: anondisfavor.php:91
-msgid "Could not delete favorite."
-msgstr ""
-
-#. TRANS: Title.
-#: anondisfavor.php:101
-msgid "Add to favorites"
-msgstr "Добавить в избранное"
diff --git a/plugins/AnonymousFave/locale/tl/LC_MESSAGES/AnonymousFave.po b/plugins/AnonymousFave/locale/tl/LC_MESSAGES/AnonymousFave.po
index 7ef2920cb0..9beb8b441d 100644
--- a/plugins/AnonymousFave/locale/tl/LC_MESSAGES/AnonymousFave.po
+++ b/plugins/AnonymousFave/locale/tl/LC_MESSAGES/AnonymousFave.po
@@ -9,66 +9,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - AnonymousFave\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:16+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:47+0000\n"
 "Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:27+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:42:38+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-anonymousfave\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. TRANS: Label for tally for number of times a notice was favored.
-#: AnonymousFavePlugin.php:207
-msgid "Favored"
-msgstr "Pinaboran"
-
-#. TRANS: Server exception.
-#: AnonymousFavePlugin.php:240 AnonymousFavePlugin.php:251
-msgid "Couldn't create anonymous user session."
-msgstr "Hindi malikha ang sesyon ng hindi nakikilalang tagagamit."
-
-#. TRANS: Plugin description.
-#: AnonymousFavePlugin.php:326
-msgid "Allow anonymous users to favorite notices."
-msgstr ""
-"Payagan ang hindi nakikilalang mga tagagamit sa paboritong mga pabatid."
-
-#. TRANS: Client error.
-#: anonfavor.php:60
-msgid ""
-"Could not favor notice! Please make sure your browser has cookies enabled."
-msgstr ""
-"Hindi maipaborito ang pabatid!  Pakitiyak na gumagana ang mga otap ng iyong "
-"pantingin-tingin."
-
-#. TRANS: Client error.
-#: anonfavor.php:71 anondisfavor.php:72
-msgid "There was a problem with your session token. Try again, please."
-msgstr ""
-"Nagkaroon ng isang suliranin sa iyong token ng sesyon.  Paki subukang muli."
-
-#. TRANS: Client error.
-#: anonfavor.php:78
-msgid "This notice is already a favorite!"
-msgstr "Isa nang paborito ang pabatid na ito!"
-
-#. TRANS: Server error.
-#: anonfavor.php:85
-msgid "Could not create favorite."
-msgstr "Hindi malikha ang paborito."
-
-#. TRANS: Title.
-#: anonfavor.php:95
-msgid "Disfavor favorite"
-msgstr "Huwag paboran ang paborito"
-
 #. TRANS: Server exception.
 #. TRANS: %d is the notice ID (number).
-#: Fave_tally.php:155 Fave_tally.php:184
 #, php-format
 msgid "Couldn't update favorite tally for notice ID %d."
 msgstr ""
@@ -76,14 +30,12 @@ msgstr ""
 
 #. TRANS: Server exception.
 #. TRANS: %d is the notice ID (number).
-#: Fave_tally.php:215
 #, php-format
 msgid "Couldn't create favorite tally for notice ID %d."
 msgstr ""
 "Hindi malikha ang talang-bilang ng paborito para sa ID na %d ng pabatid."
 
 #. TRANS: Client error.
-#: anondisfavor.php:61
 msgid ""
 "Could not disfavor notice! Please make sure your browser has cookies enabled."
 msgstr ""
@@ -91,16 +43,50 @@ msgstr ""
 "otap ng iyong pantingin-tingin."
 
 #. TRANS: Client error.
-#: anondisfavor.php:82
+msgid "There was a problem with your session token. Try again, please."
+msgstr ""
+"Nagkaroon ng isang suliranin sa iyong token ng sesyon.  Paki subukang muli."
+
+#. TRANS: Client error.
 msgid "This notice is not a favorite!"
 msgstr "Ang pabatid na ito ay hindi isang paborito!"
 
 #. TRANS: Server error.
-#: anondisfavor.php:91
 msgid "Could not delete favorite."
 msgstr "Hindi mabura ang paborito."
 
 #. TRANS: Title.
-#: anondisfavor.php:101
 msgid "Add to favorites"
 msgstr "Idagdag sa mga paborito"
+
+#. TRANS: Label for tally for number of times a notice was favored.
+msgid "Favored"
+msgstr "Pinaboran"
+
+#. TRANS: Server exception.
+msgid "Couldn't create anonymous user session."
+msgstr "Hindi malikha ang sesyon ng hindi nakikilalang tagagamit."
+
+#. TRANS: Plugin description.
+msgid "Allow anonymous users to favorite notices."
+msgstr ""
+"Payagan ang hindi nakikilalang mga tagagamit sa paboritong mga pabatid."
+
+#. TRANS: Client error.
+msgid ""
+"Could not favor notice! Please make sure your browser has cookies enabled."
+msgstr ""
+"Hindi maipaborito ang pabatid!  Pakitiyak na gumagana ang mga otap ng iyong "
+"pantingin-tingin."
+
+#. TRANS: Client error.
+msgid "This notice is already a favorite!"
+msgstr "Isa nang paborito ang pabatid na ito!"
+
+#. TRANS: Server error.
+msgid "Could not create favorite."
+msgstr "Hindi malikha ang paborito."
+
+#. TRANS: Title.
+msgid "Disfavor favorite"
+msgstr "Huwag paboran ang paborito"
diff --git a/plugins/AnonymousFave/locale/uk/LC_MESSAGES/AnonymousFave.po b/plugins/AnonymousFave/locale/uk/LC_MESSAGES/AnonymousFave.po
index db3953db33..0a23751fb0 100644
--- a/plugins/AnonymousFave/locale/uk/LC_MESSAGES/AnonymousFave.po
+++ b/plugins/AnonymousFave/locale/uk/LC_MESSAGES/AnonymousFave.po
@@ -9,65 +9,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - AnonymousFave\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:16+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:47+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:27+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:42:38+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-anonymousfave\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#. TRANS: Label for tally for number of times a notice was favored.
-#: AnonymousFavePlugin.php:207
-msgid "Favored"
-msgstr "Обране"
-
-#. TRANS: Server exception.
-#: AnonymousFavePlugin.php:240 AnonymousFavePlugin.php:251
-msgid "Couldn't create anonymous user session."
-msgstr "Не вдалося створити сесію анонімного користувача."
-
-#. TRANS: Plugin description.
-#: AnonymousFavePlugin.php:326
-msgid "Allow anonymous users to favorite notices."
-msgstr "Дозволити анонімнім користувачам позначати повідомлення як обрані."
-
-#. TRANS: Client error.
-#: anonfavor.php:60
-msgid ""
-"Could not favor notice! Please make sure your browser has cookies enabled."
-msgstr ""
-"Не вдалося позначити повідомлення як обране! Будь ласка, переконайтеся, що у "
-"вашому браузері увімкнено кукі."
-
-#. TRANS: Client error.
-#: anonfavor.php:71 anondisfavor.php:72
-msgid "There was a problem with your session token. Try again, please."
-msgstr "Виникли певні проблеми з токеном сесії. Спробуйте знов, будь ласка."
-
-#. TRANS: Client error.
-#: anonfavor.php:78
-msgid "This notice is already a favorite!"
-msgstr "Цей допис вже є обраним!"
-
-#. TRANS: Server error.
-#: anonfavor.php:85
-msgid "Could not create favorite."
-msgstr "Не вдалося позначити як обране."
-
-#. TRANS: Title.
-#: anonfavor.php:95
-msgid "Disfavor favorite"
-msgstr "Видалити з обраних"
-
 #. TRANS: Server exception.
 #. TRANS: %d is the notice ID (number).
-#: Fave_tally.php:155 Fave_tally.php:184
 #, php-format
 msgid "Couldn't update favorite tally for notice ID %d."
 msgstr ""
@@ -75,7 +31,6 @@ msgstr ""
 
 #. TRANS: Server exception.
 #. TRANS: %d is the notice ID (number).
-#: Fave_tally.php:215
 #, php-format
 msgid "Couldn't create favorite tally for notice ID %d."
 msgstr ""
@@ -83,7 +38,6 @@ msgstr ""
 "номером %d."
 
 #. TRANS: Client error.
-#: anondisfavor.php:61
 msgid ""
 "Could not disfavor notice! Please make sure your browser has cookies enabled."
 msgstr ""
@@ -91,16 +45,48 @@ msgstr ""
 "переконайтеся, що у вашому браузері увімкнено кукі."
 
 #. TRANS: Client error.
-#: anondisfavor.php:82
+msgid "There was a problem with your session token. Try again, please."
+msgstr "Виникли певні проблеми з токеном сесії. Спробуйте знов, будь ласка."
+
+#. TRANS: Client error.
 msgid "This notice is not a favorite!"
 msgstr "Цей допис не є обраним!"
 
 #. TRANS: Server error.
-#: anondisfavor.php:91
 msgid "Could not delete favorite."
 msgstr "Не можу видалити допис зі списку обраних."
 
 #. TRANS: Title.
-#: anondisfavor.php:101
 msgid "Add to favorites"
 msgstr "Додати до обраних"
+
+#. TRANS: Label for tally for number of times a notice was favored.
+msgid "Favored"
+msgstr "Обране"
+
+#. TRANS: Server exception.
+msgid "Couldn't create anonymous user session."
+msgstr "Не вдалося створити сесію анонімного користувача."
+
+#. TRANS: Plugin description.
+msgid "Allow anonymous users to favorite notices."
+msgstr "Дозволити анонімнім користувачам позначати повідомлення як обрані."
+
+#. TRANS: Client error.
+msgid ""
+"Could not favor notice! Please make sure your browser has cookies enabled."
+msgstr ""
+"Не вдалося позначити повідомлення як обране! Будь ласка, переконайтеся, що у "
+"вашому браузері увімкнено кукі."
+
+#. TRANS: Client error.
+msgid "This notice is already a favorite!"
+msgstr "Цей допис вже є обраним!"
+
+#. TRANS: Server error.
+msgid "Could not create favorite."
+msgstr "Не вдалося позначити як обране."
+
+#. TRANS: Title.
+msgid "Disfavor favorite"
+msgstr "Видалити з обраних"
diff --git a/plugins/AutoSandbox/locale/AutoSandbox.pot b/plugins/AutoSandbox/locale/AutoSandbox.pot
index 5f6b4905fa..71c1afd101 100644
--- a/plugins/AutoSandbox/locale/AutoSandbox.pot
+++ b/plugins/AutoSandbox/locale/AutoSandbox.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/AutoSandbox/locale/be-tarask/LC_MESSAGES/AutoSandbox.po b/plugins/AutoSandbox/locale/be-tarask/LC_MESSAGES/AutoSandbox.po
index 46c72f13ce..7abf0df5c6 100644
--- a/plugins/AutoSandbox/locale/be-tarask/LC_MESSAGES/AutoSandbox.po
+++ b/plugins/AutoSandbox/locale/be-tarask/LC_MESSAGES/AutoSandbox.po
@@ -9,24 +9,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - AutoSandbox\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:18+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:49+0000\n"
 "Language-Team: Belarusian (Taraškievica orthography) <http://translatewiki."
 "net/wiki/Portal:be-tarask>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:30+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:42:41+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: be-tarask\n"
 "X-Message-Group: #out-statusnet-plugin-autosandbox\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: AutoSandboxPlugin.php:66
 msgid "Automatically sandboxes newly registered members."
 msgstr "Аўтаматычна перасылае ў пясочніцу ўсіх новых карыстальнікаў."
 
-#: AutoSandboxPlugin.php:72
 msgid ""
 "Note you will initially be \"sandboxed\" so your posts will not appear in "
 "the public timeline."
@@ -35,7 +33,6 @@ msgstr ""
 "паведамленьні ня будуць паказвацца ў агульнай стужцы."
 
 #. TRANS: $contactlink is a clickable e-mailaddress.
-#: AutoSandboxPlugin.php:79
 msgid ""
 "Note you will initially be \"sandboxed\" so your posts will not appear in "
 "the public timeline. Send a message to $contactlink to speed up the "
diff --git a/plugins/AutoSandbox/locale/br/LC_MESSAGES/AutoSandbox.po b/plugins/AutoSandbox/locale/br/LC_MESSAGES/AutoSandbox.po
index 60b0b3be2d..d17170671b 100644
--- a/plugins/AutoSandbox/locale/br/LC_MESSAGES/AutoSandbox.po
+++ b/plugins/AutoSandbox/locale/br/LC_MESSAGES/AutoSandbox.po
@@ -9,23 +9,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - AutoSandbox\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:18+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:49+0000\n"
 "Language-Team: Breton <http://translatewiki.net/wiki/Portal:br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:30+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:42:41+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-autosandbox\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: AutoSandboxPlugin.php:66
 msgid "Automatically sandboxes newly registered members."
 msgstr "Lakaat a ra an implijerien nevez en ur poull-traezh ent emgefre."
 
-#: AutoSandboxPlugin.php:72
 msgid ""
 "Note you will initially be \"sandboxed\" so your posts will not appear in "
 "the public timeline."
@@ -34,7 +32,6 @@ msgstr ""
 "ne vo ket gwelet ho kemennadennoù en deiziataer foran."
 
 #. TRANS: $contactlink is a clickable e-mailaddress.
-#: AutoSandboxPlugin.php:79
 msgid ""
 "Note you will initially be \"sandboxed\" so your posts will not appear in "
 "the public timeline. Send a message to $contactlink to speed up the "
diff --git a/plugins/AutoSandbox/locale/de/LC_MESSAGES/AutoSandbox.po b/plugins/AutoSandbox/locale/de/LC_MESSAGES/AutoSandbox.po
index 31f32e7c47..cc1cb4d49a 100644
--- a/plugins/AutoSandbox/locale/de/LC_MESSAGES/AutoSandbox.po
+++ b/plugins/AutoSandbox/locale/de/LC_MESSAGES/AutoSandbox.po
@@ -9,23 +9,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - AutoSandbox\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:18+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:50+0000\n"
 "Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:30+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:42:41+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-autosandbox\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: AutoSandboxPlugin.php:66
 msgid "Automatically sandboxes newly registered members."
 msgstr "Neu registrierte Benutzer automatisch auf die Spielwiese setzen."
 
-#: AutoSandboxPlugin.php:72
 msgid ""
 "Note you will initially be \"sandboxed\" so your posts will not appear in "
 "the public timeline."
@@ -34,7 +32,6 @@ msgstr ""
 "Beiträge nicht in der öffentlichen Zeitleiste erscheinen."
 
 #. TRANS: $contactlink is a clickable e-mailaddress.
-#: AutoSandboxPlugin.php:79
 msgid ""
 "Note you will initially be \"sandboxed\" so your posts will not appear in "
 "the public timeline. Send a message to $contactlink to speed up the "
diff --git a/plugins/AutoSandbox/locale/es/LC_MESSAGES/AutoSandbox.po b/plugins/AutoSandbox/locale/es/LC_MESSAGES/AutoSandbox.po
index 9031a1be5e..5454a4a1e7 100644
--- a/plugins/AutoSandbox/locale/es/LC_MESSAGES/AutoSandbox.po
+++ b/plugins/AutoSandbox/locale/es/LC_MESSAGES/AutoSandbox.po
@@ -9,24 +9,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - AutoSandbox\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:18+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:50+0000\n"
 "Language-Team: Spanish <http://translatewiki.net/wiki/Portal:es>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:30+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:42:41+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-autosandbox\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: AutoSandboxPlugin.php:66
 msgid "Automatically sandboxes newly registered members."
 msgstr ""
 "Envía automáticamente a zona de pruebas a los usuarios recién registrados."
 
-#: AutoSandboxPlugin.php:72
 msgid ""
 "Note you will initially be \"sandboxed\" so your posts will not appear in "
 "the public timeline."
@@ -35,7 +33,6 @@ msgstr ""
 "tus mensajes no aparecerán en la línea temporal pública."
 
 #. TRANS: $contactlink is a clickable e-mailaddress.
-#: AutoSandboxPlugin.php:79
 msgid ""
 "Note you will initially be \"sandboxed\" so your posts will not appear in "
 "the public timeline. Send a message to $contactlink to speed up the "
diff --git a/plugins/AutoSandbox/locale/fr/LC_MESSAGES/AutoSandbox.po b/plugins/AutoSandbox/locale/fr/LC_MESSAGES/AutoSandbox.po
index 89846c4c2a..b5b727fe68 100644
--- a/plugins/AutoSandbox/locale/fr/LC_MESSAGES/AutoSandbox.po
+++ b/plugins/AutoSandbox/locale/fr/LC_MESSAGES/AutoSandbox.po
@@ -9,23 +9,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - AutoSandbox\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:18+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:50+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:30+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:42:41+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-autosandbox\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: AutoSandboxPlugin.php:66
 msgid "Automatically sandboxes newly registered members."
 msgstr "Place automatiquement les nouveaux membres dans une boîte à sable."
 
-#: AutoSandboxPlugin.php:72
 msgid ""
 "Note you will initially be \"sandboxed\" so your posts will not appear in "
 "the public timeline."
@@ -34,7 +32,6 @@ msgstr ""
 "signifie que vos messages n’apparaîtront pas dans le calendrier public."
 
 #. TRANS: $contactlink is a clickable e-mailaddress.
-#: AutoSandboxPlugin.php:79
 msgid ""
 "Note you will initially be \"sandboxed\" so your posts will not appear in "
 "the public timeline. Send a message to $contactlink to speed up the "
diff --git a/plugins/AutoSandbox/locale/ia/LC_MESSAGES/AutoSandbox.po b/plugins/AutoSandbox/locale/ia/LC_MESSAGES/AutoSandbox.po
index 3f508a43d1..0017320e7a 100644
--- a/plugins/AutoSandbox/locale/ia/LC_MESSAGES/AutoSandbox.po
+++ b/plugins/AutoSandbox/locale/ia/LC_MESSAGES/AutoSandbox.po
@@ -9,23 +9,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - AutoSandbox\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:18+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:50+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:30+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:42:41+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-autosandbox\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: AutoSandboxPlugin.php:66
 msgid "Automatically sandboxes newly registered members."
 msgstr "Automaticamente pone le membros novemente registrate in isolation."
 
-#: AutoSandboxPlugin.php:72
 msgid ""
 "Note you will initially be \"sandboxed\" so your posts will not appear in "
 "the public timeline."
@@ -34,7 +32,6 @@ msgstr ""
 "non apparera in le chronologia public."
 
 #. TRANS: $contactlink is a clickable e-mailaddress.
-#: AutoSandboxPlugin.php:79
 msgid ""
 "Note you will initially be \"sandboxed\" so your posts will not appear in "
 "the public timeline. Send a message to $contactlink to speed up the "
diff --git a/plugins/AutoSandbox/locale/mk/LC_MESSAGES/AutoSandbox.po b/plugins/AutoSandbox/locale/mk/LC_MESSAGES/AutoSandbox.po
index 7702a00175..a5004eb25f 100644
--- a/plugins/AutoSandbox/locale/mk/LC_MESSAGES/AutoSandbox.po
+++ b/plugins/AutoSandbox/locale/mk/LC_MESSAGES/AutoSandbox.po
@@ -9,23 +9,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - AutoSandbox\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:18+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:50+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:30+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:42:41+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-autosandbox\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
 
-#: AutoSandboxPlugin.php:66
 msgid "Automatically sandboxes newly registered members."
 msgstr "Автоматски става новорегистрираните членови во песочник."
 
-#: AutoSandboxPlugin.php:72
 msgid ""
 "Note you will initially be \"sandboxed\" so your posts will not appear in "
 "the public timeline."
@@ -34,7 +32,6 @@ msgstr ""
 "објави нема да фигурираат во јавната хронологија."
 
 #. TRANS: $contactlink is a clickable e-mailaddress.
-#: AutoSandboxPlugin.php:79
 msgid ""
 "Note you will initially be \"sandboxed\" so your posts will not appear in "
 "the public timeline. Send a message to $contactlink to speed up the "
diff --git a/plugins/AutoSandbox/locale/nl/LC_MESSAGES/AutoSandbox.po b/plugins/AutoSandbox/locale/nl/LC_MESSAGES/AutoSandbox.po
index 786ab20f37..4c3d5c0ec5 100644
--- a/plugins/AutoSandbox/locale/nl/LC_MESSAGES/AutoSandbox.po
+++ b/plugins/AutoSandbox/locale/nl/LC_MESSAGES/AutoSandbox.po
@@ -9,25 +9,23 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - AutoSandbox\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:18+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:50+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:30+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:42:41+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-autosandbox\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: AutoSandboxPlugin.php:66
 msgid "Automatically sandboxes newly registered members."
 msgstr ""
 "Voegt nieuwe gebruikers automatisch toe aan een groep met beperkte "
 "functionaliteit."
 
-#: AutoSandboxPlugin.php:72
 msgid ""
 "Note you will initially be \"sandboxed\" so your posts will not appear in "
 "the public timeline."
@@ -36,7 +34,6 @@ msgstr ""
 "mededelingen worden niet zichtbaar in de publieke tijdlijn."
 
 #. TRANS: $contactlink is a clickable e-mailaddress.
-#: AutoSandboxPlugin.php:79
 msgid ""
 "Note you will initially be \"sandboxed\" so your posts will not appear in "
 "the public timeline. Send a message to $contactlink to speed up the "
diff --git a/plugins/AutoSandbox/locale/ru/LC_MESSAGES/AutoSandbox.po b/plugins/AutoSandbox/locale/ru/LC_MESSAGES/AutoSandbox.po
index 4dcf7ea907..cba1a019b9 100644
--- a/plugins/AutoSandbox/locale/ru/LC_MESSAGES/AutoSandbox.po
+++ b/plugins/AutoSandbox/locale/ru/LC_MESSAGES/AutoSandbox.po
@@ -9,24 +9,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - AutoSandbox\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:18+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:50+0000\n"
 "Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:30+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:42:41+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-autosandbox\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: AutoSandboxPlugin.php:66
 msgid "Automatically sandboxes newly registered members."
 msgstr "Автоматически отсылает всех новых пользователей в «песочницу»."
 
-#: AutoSandboxPlugin.php:72
 msgid ""
 "Note you will initially be \"sandboxed\" so your posts will not appear in "
 "the public timeline."
@@ -35,7 +33,6 @@ msgstr ""
 "ваши сообщения не будут появляться в общей ленте."
 
 #. TRANS: $contactlink is a clickable e-mailaddress.
-#: AutoSandboxPlugin.php:79
 msgid ""
 "Note you will initially be \"sandboxed\" so your posts will not appear in "
 "the public timeline. Send a message to $contactlink to speed up the "
diff --git a/plugins/AutoSandbox/locale/tl/LC_MESSAGES/AutoSandbox.po b/plugins/AutoSandbox/locale/tl/LC_MESSAGES/AutoSandbox.po
index 36b523373b..daa2e7fdc3 100644
--- a/plugins/AutoSandbox/locale/tl/LC_MESSAGES/AutoSandbox.po
+++ b/plugins/AutoSandbox/locale/tl/LC_MESSAGES/AutoSandbox.po
@@ -9,23 +9,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - AutoSandbox\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:18+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:50+0000\n"
 "Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:30+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:42:41+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-autosandbox\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: AutoSandboxPlugin.php:66
 msgid "Automatically sandboxes newly registered members."
 msgstr "Kusang ikinakahon ng buhangin ang bagong nagpatalang mga kasapi."
 
-#: AutoSandboxPlugin.php:72
 msgid ""
 "Note you will initially be \"sandboxed\" so your posts will not appear in "
 "the public timeline."
@@ -34,7 +32,6 @@ msgstr ""
 "hindi lilitaw sa pangmadlang guhit ng panahon."
 
 #. TRANS: $contactlink is a clickable e-mailaddress.
-#: AutoSandboxPlugin.php:79
 msgid ""
 "Note you will initially be \"sandboxed\" so your posts will not appear in "
 "the public timeline. Send a message to $contactlink to speed up the "
diff --git a/plugins/AutoSandbox/locale/uk/LC_MESSAGES/AutoSandbox.po b/plugins/AutoSandbox/locale/uk/LC_MESSAGES/AutoSandbox.po
index c3ed36cabc..125d50d04a 100644
--- a/plugins/AutoSandbox/locale/uk/LC_MESSAGES/AutoSandbox.po
+++ b/plugins/AutoSandbox/locale/uk/LC_MESSAGES/AutoSandbox.po
@@ -9,24 +9,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - AutoSandbox\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:18+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:50+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:30+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:42:41+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-autosandbox\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: AutoSandboxPlugin.php:66
 msgid "Automatically sandboxes newly registered members."
 msgstr "Автоматично відсилати до «пісочниці» усіх нових користувачів."
 
-#: AutoSandboxPlugin.php:72
 msgid ""
 "Note you will initially be \"sandboxed\" so your posts will not appear in "
 "the public timeline."
@@ -35,7 +33,6 @@ msgstr ""
 "не з’являтимуться у загальній стрічці дописів."
 
 #. TRANS: $contactlink is a clickable e-mailaddress.
-#: AutoSandboxPlugin.php:79
 msgid ""
 "Note you will initially be \"sandboxed\" so your posts will not appear in "
 "the public timeline. Send a message to $contactlink to speed up the "
diff --git a/plugins/AutoSandbox/locale/zh_CN/LC_MESSAGES/AutoSandbox.po b/plugins/AutoSandbox/locale/zh_CN/LC_MESSAGES/AutoSandbox.po
index 0f81892f0c..cc074cce66 100644
--- a/plugins/AutoSandbox/locale/zh_CN/LC_MESSAGES/AutoSandbox.po
+++ b/plugins/AutoSandbox/locale/zh_CN/LC_MESSAGES/AutoSandbox.po
@@ -9,31 +9,28 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - AutoSandbox\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:18+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:50+0000\n"
 "Language-Team: Simplified Chinese <http://translatewiki.net/wiki/Portal:zh-"
 "hans>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:30+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:42:41+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-autosandbox\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: AutoSandboxPlugin.php:66
 msgid "Automatically sandboxes newly registered members."
 msgstr "自动将新注册用户添加至沙盒中。"
 
-#: AutoSandboxPlugin.php:72
 msgid ""
 "Note you will initially be \"sandboxed\" so your posts will not appear in "
 "the public timeline."
 msgstr "注意：最初你将被添加至“沙盒”中，你的消息将不会在公共的时间线上显示。"
 
 #. TRANS: $contactlink is a clickable e-mailaddress.
-#: AutoSandboxPlugin.php:79
 msgid ""
 "Note you will initially be \"sandboxed\" so your posts will not appear in "
 "the public timeline. Send a message to $contactlink to speed up the "
diff --git a/plugins/Autocomplete/locale/Autocomplete.pot b/plugins/Autocomplete/locale/Autocomplete.pot
index 165afc202e..cc028a1f72 100644
--- a/plugins/Autocomplete/locale/Autocomplete.pot
+++ b/plugins/Autocomplete/locale/Autocomplete.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/Autocomplete/locale/be-tarask/LC_MESSAGES/Autocomplete.po b/plugins/Autocomplete/locale/be-tarask/LC_MESSAGES/Autocomplete.po
index 33d297d9b4..b61814a569 100644
--- a/plugins/Autocomplete/locale/be-tarask/LC_MESSAGES/Autocomplete.po
+++ b/plugins/Autocomplete/locale/be-tarask/LC_MESSAGES/Autocomplete.po
@@ -9,20 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Autocomplete\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:17+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:48+0000\n"
 "Language-Team: Belarusian (Taraškievica orthography) <http://translatewiki."
 "net/wiki/Portal:be-tarask>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:42:40+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: be-tarask\n"
 "X-Message-Group: #out-statusnet-plugin-autocomplete\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: AutocompletePlugin.php:80
 msgid ""
 "The autocomplete plugin allows users to autocomplete screen names in @ "
 "replies. When an \"@\" is typed into the notice text area, an autocomplete "
diff --git a/plugins/Autocomplete/locale/br/LC_MESSAGES/Autocomplete.po b/plugins/Autocomplete/locale/br/LC_MESSAGES/Autocomplete.po
index 2cfd56e69e..0d8ea1d4a9 100644
--- a/plugins/Autocomplete/locale/br/LC_MESSAGES/Autocomplete.po
+++ b/plugins/Autocomplete/locale/br/LC_MESSAGES/Autocomplete.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Autocomplete\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:17+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:48+0000\n"
 "Language-Team: Breton <http://translatewiki.net/wiki/Portal:br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:42:40+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-autocomplete\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: AutocompletePlugin.php:80
 msgid ""
 "The autocomplete plugin allows users to autocomplete screen names in @ "
 "replies. When an \"@\" is typed into the notice text area, an autocomplete "
diff --git a/plugins/Autocomplete/locale/de/LC_MESSAGES/Autocomplete.po b/plugins/Autocomplete/locale/de/LC_MESSAGES/Autocomplete.po
index 86215a55fc..290612dcb2 100644
--- a/plugins/Autocomplete/locale/de/LC_MESSAGES/Autocomplete.po
+++ b/plugins/Autocomplete/locale/de/LC_MESSAGES/Autocomplete.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Autocomplete\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:17+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:48+0000\n"
 "Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:42:40+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-autocomplete\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: AutocompletePlugin.php:80
 msgid ""
 "The autocomplete plugin allows users to autocomplete screen names in @ "
 "replies. When an \"@\" is typed into the notice text area, an autocomplete "
diff --git a/plugins/Autocomplete/locale/es/LC_MESSAGES/Autocomplete.po b/plugins/Autocomplete/locale/es/LC_MESSAGES/Autocomplete.po
index 88007fc08c..ee1e7fb44c 100644
--- a/plugins/Autocomplete/locale/es/LC_MESSAGES/Autocomplete.po
+++ b/plugins/Autocomplete/locale/es/LC_MESSAGES/Autocomplete.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Autocomplete\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:17+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:48+0000\n"
 "Language-Team: Spanish <http://translatewiki.net/wiki/Portal:es>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:42:40+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-autocomplete\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: AutocompletePlugin.php:80
 msgid ""
 "The autocomplete plugin allows users to autocomplete screen names in @ "
 "replies. When an \"@\" is typed into the notice text area, an autocomplete "
diff --git a/plugins/Autocomplete/locale/fr/LC_MESSAGES/Autocomplete.po b/plugins/Autocomplete/locale/fr/LC_MESSAGES/Autocomplete.po
index 578e0d4648..cfa71c24b8 100644
--- a/plugins/Autocomplete/locale/fr/LC_MESSAGES/Autocomplete.po
+++ b/plugins/Autocomplete/locale/fr/LC_MESSAGES/Autocomplete.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Autocomplete\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:17+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:49+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:42:40+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-autocomplete\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: AutocompletePlugin.php:80
 msgid ""
 "The autocomplete plugin allows users to autocomplete screen names in @ "
 "replies. When an \"@\" is typed into the notice text area, an autocomplete "
diff --git a/plugins/Autocomplete/locale/he/LC_MESSAGES/Autocomplete.po b/plugins/Autocomplete/locale/he/LC_MESSAGES/Autocomplete.po
index 77988b0ad9..84bbe2c788 100644
--- a/plugins/Autocomplete/locale/he/LC_MESSAGES/Autocomplete.po
+++ b/plugins/Autocomplete/locale/he/LC_MESSAGES/Autocomplete.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Autocomplete\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:17+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:49+0000\n"
 "Language-Team: Hebrew <http://translatewiki.net/wiki/Portal:he>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:42:40+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-plugin-autocomplete\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: AutocompletePlugin.php:80
 msgid ""
 "The autocomplete plugin allows users to autocomplete screen names in @ "
 "replies. When an \"@\" is typed into the notice text area, an autocomplete "
diff --git a/plugins/Autocomplete/locale/ia/LC_MESSAGES/Autocomplete.po b/plugins/Autocomplete/locale/ia/LC_MESSAGES/Autocomplete.po
index 45bbd8e3d3..629d9f4243 100644
--- a/plugins/Autocomplete/locale/ia/LC_MESSAGES/Autocomplete.po
+++ b/plugins/Autocomplete/locale/ia/LC_MESSAGES/Autocomplete.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Autocomplete\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:17+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:49+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:42:40+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-autocomplete\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: AutocompletePlugin.php:80
 msgid ""
 "The autocomplete plugin allows users to autocomplete screen names in @ "
 "replies. When an \"@\" is typed into the notice text area, an autocomplete "
diff --git a/plugins/Autocomplete/locale/id/LC_MESSAGES/Autocomplete.po b/plugins/Autocomplete/locale/id/LC_MESSAGES/Autocomplete.po
index 9405e42543..9c2c9d36fd 100644
--- a/plugins/Autocomplete/locale/id/LC_MESSAGES/Autocomplete.po
+++ b/plugins/Autocomplete/locale/id/LC_MESSAGES/Autocomplete.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Autocomplete\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:17+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:49+0000\n"
 "Language-Team: Indonesian <http://translatewiki.net/wiki/Portal:id>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:42:40+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: id\n"
 "X-Message-Group: #out-statusnet-plugin-autocomplete\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: AutocompletePlugin.php:80
 msgid ""
 "The autocomplete plugin allows users to autocomplete screen names in @ "
 "replies. When an \"@\" is typed into the notice text area, an autocomplete "
diff --git a/plugins/Autocomplete/locale/ja/LC_MESSAGES/Autocomplete.po b/plugins/Autocomplete/locale/ja/LC_MESSAGES/Autocomplete.po
index fc277e2ff6..dd1e03a620 100644
--- a/plugins/Autocomplete/locale/ja/LC_MESSAGES/Autocomplete.po
+++ b/plugins/Autocomplete/locale/ja/LC_MESSAGES/Autocomplete.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Autocomplete\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:17+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:49+0000\n"
 "Language-Team: Japanese <http://translatewiki.net/wiki/Portal:ja>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:42:40+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ja\n"
 "X-Message-Group: #out-statusnet-plugin-autocomplete\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: AutocompletePlugin.php:80
 msgid ""
 "The autocomplete plugin allows users to autocomplete screen names in @ "
 "replies. When an \"@\" is typed into the notice text area, an autocomplete "
diff --git a/plugins/Autocomplete/locale/mk/LC_MESSAGES/Autocomplete.po b/plugins/Autocomplete/locale/mk/LC_MESSAGES/Autocomplete.po
index f601901584..d25bdfe7ee 100644
--- a/plugins/Autocomplete/locale/mk/LC_MESSAGES/Autocomplete.po
+++ b/plugins/Autocomplete/locale/mk/LC_MESSAGES/Autocomplete.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Autocomplete\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:17+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:49+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:42:40+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-autocomplete\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
 
-#: AutocompletePlugin.php:80
 msgid ""
 "The autocomplete plugin allows users to autocomplete screen names in @ "
 "replies. When an \"@\" is typed into the notice text area, an autocomplete "
diff --git a/plugins/Autocomplete/locale/nl/LC_MESSAGES/Autocomplete.po b/plugins/Autocomplete/locale/nl/LC_MESSAGES/Autocomplete.po
index 9f99c5ec8d..0185652446 100644
--- a/plugins/Autocomplete/locale/nl/LC_MESSAGES/Autocomplete.po
+++ b/plugins/Autocomplete/locale/nl/LC_MESSAGES/Autocomplete.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Autocomplete\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:17+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:49+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:42:40+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-autocomplete\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: AutocompletePlugin.php:80
 msgid ""
 "The autocomplete plugin allows users to autocomplete screen names in @ "
 "replies. When an \"@\" is typed into the notice text area, an autocomplete "
diff --git a/plugins/Autocomplete/locale/pt/LC_MESSAGES/Autocomplete.po b/plugins/Autocomplete/locale/pt/LC_MESSAGES/Autocomplete.po
index bdf3a471a5..f4af8614bd 100644
--- a/plugins/Autocomplete/locale/pt/LC_MESSAGES/Autocomplete.po
+++ b/plugins/Autocomplete/locale/pt/LC_MESSAGES/Autocomplete.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Autocomplete\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:17+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:49+0000\n"
 "Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:42:40+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-plugin-autocomplete\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: AutocompletePlugin.php:80
 msgid ""
 "The autocomplete plugin allows users to autocomplete screen names in @ "
 "replies. When an \"@\" is typed into the notice text area, an autocomplete "
diff --git a/plugins/Autocomplete/locale/pt_BR/LC_MESSAGES/Autocomplete.po b/plugins/Autocomplete/locale/pt_BR/LC_MESSAGES/Autocomplete.po
index 111b30afbb..881a596509 100644
--- a/plugins/Autocomplete/locale/pt_BR/LC_MESSAGES/Autocomplete.po
+++ b/plugins/Autocomplete/locale/pt_BR/LC_MESSAGES/Autocomplete.po
@@ -9,20 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Autocomplete\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:17+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:49+0000\n"
 "Language-Team: Brazilian Portuguese <http://translatewiki.net/wiki/Portal:pt-"
 "br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:42:40+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt-br\n"
 "X-Message-Group: #out-statusnet-plugin-autocomplete\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: AutocompletePlugin.php:80
 msgid ""
 "The autocomplete plugin allows users to autocomplete screen names in @ "
 "replies. When an \"@\" is typed into the notice text area, an autocomplete "
diff --git a/plugins/Autocomplete/locale/ru/LC_MESSAGES/Autocomplete.po b/plugins/Autocomplete/locale/ru/LC_MESSAGES/Autocomplete.po
index 0607f82323..ee63f2081b 100644
--- a/plugins/Autocomplete/locale/ru/LC_MESSAGES/Autocomplete.po
+++ b/plugins/Autocomplete/locale/ru/LC_MESSAGES/Autocomplete.po
@@ -9,20 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Autocomplete\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:17+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:49+0000\n"
 "Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:42:40+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-autocomplete\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: AutocompletePlugin.php:80
 msgid ""
 "The autocomplete plugin allows users to autocomplete screen names in @ "
 "replies. When an \"@\" is typed into the notice text area, an autocomplete "
diff --git a/plugins/Autocomplete/locale/tl/LC_MESSAGES/Autocomplete.po b/plugins/Autocomplete/locale/tl/LC_MESSAGES/Autocomplete.po
index 3e063c4959..4175a2579e 100644
--- a/plugins/Autocomplete/locale/tl/LC_MESSAGES/Autocomplete.po
+++ b/plugins/Autocomplete/locale/tl/LC_MESSAGES/Autocomplete.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Autocomplete\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:17+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:49+0000\n"
 "Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:42:40+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-autocomplete\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: AutocompletePlugin.php:80
 msgid ""
 "The autocomplete plugin allows users to autocomplete screen names in @ "
 "replies. When an \"@\" is typed into the notice text area, an autocomplete "
diff --git a/plugins/Autocomplete/locale/uk/LC_MESSAGES/Autocomplete.po b/plugins/Autocomplete/locale/uk/LC_MESSAGES/Autocomplete.po
index f08fe54789..0f16bf25d3 100644
--- a/plugins/Autocomplete/locale/uk/LC_MESSAGES/Autocomplete.po
+++ b/plugins/Autocomplete/locale/uk/LC_MESSAGES/Autocomplete.po
@@ -9,20 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Autocomplete\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:17+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:49+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:42:40+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-autocomplete\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: AutocompletePlugin.php:80
 msgid ""
 "The autocomplete plugin allows users to autocomplete screen names in @ "
 "replies. When an \"@\" is typed into the notice text area, an autocomplete "
diff --git a/plugins/Autocomplete/locale/zh_CN/LC_MESSAGES/Autocomplete.po b/plugins/Autocomplete/locale/zh_CN/LC_MESSAGES/Autocomplete.po
index 9580312bb8..af3b111b83 100644
--- a/plugins/Autocomplete/locale/zh_CN/LC_MESSAGES/Autocomplete.po
+++ b/plugins/Autocomplete/locale/zh_CN/LC_MESSAGES/Autocomplete.po
@@ -9,20 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Autocomplete\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:17+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:49+0000\n"
 "Language-Team: Simplified Chinese <http://translatewiki.net/wiki/Portal:zh-"
 "hans>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:42:40+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-autocomplete\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: AutocompletePlugin.php:80
 msgid ""
 "The autocomplete plugin allows users to autocomplete screen names in @ "
 "replies. When an \"@\" is typed into the notice text area, an autocomplete "
diff --git a/plugins/Awesomeness/locale/Awesomeness.pot b/plugins/Awesomeness/locale/Awesomeness.pot
index 8646f0e280..f06fbb3a08 100644
--- a/plugins/Awesomeness/locale/Awesomeness.pot
+++ b/plugins/Awesomeness/locale/Awesomeness.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/Awesomeness/locale/be-tarask/LC_MESSAGES/Awesomeness.po b/plugins/Awesomeness/locale/be-tarask/LC_MESSAGES/Awesomeness.po
index 7e475fe449..5338a5864d 100644
--- a/plugins/Awesomeness/locale/be-tarask/LC_MESSAGES/Awesomeness.po
+++ b/plugins/Awesomeness/locale/be-tarask/LC_MESSAGES/Awesomeness.po
@@ -9,20 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Awesomeness\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:18+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:50+0000\n"
 "Language-Team: Belarusian (Taraškievica orthography) <http://translatewiki."
 "net/wiki/Portal:be-tarask>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 23:54:39+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:42:49+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: be-tarask\n"
 "X-Message-Group: #out-statusnet-plugin-awesomeness\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: AwesomenessPlugin.php:56
 msgid ""
 "The Awesomeness plugin adds additional awesomeness to a StatusNet "
 "installation."
diff --git a/plugins/Awesomeness/locale/de/LC_MESSAGES/Awesomeness.po b/plugins/Awesomeness/locale/de/LC_MESSAGES/Awesomeness.po
index d7f419500d..97e4a1a765 100644
--- a/plugins/Awesomeness/locale/de/LC_MESSAGES/Awesomeness.po
+++ b/plugins/Awesomeness/locale/de/LC_MESSAGES/Awesomeness.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Awesomeness\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-14 16:01+0000\n"
-"PO-Revision-Date: 2011-02-14 16:07:08+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:50+0000\n"
 "Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:19:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r82114); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:42:49+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-awesomeness\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: AwesomenessPlugin.php:56
 msgid ""
 "The Awesomeness plugin adds additional awesomeness to a StatusNet "
 "installation."
diff --git a/plugins/Awesomeness/locale/fr/LC_MESSAGES/Awesomeness.po b/plugins/Awesomeness/locale/fr/LC_MESSAGES/Awesomeness.po
index 9b713aecce..882b522933 100644
--- a/plugins/Awesomeness/locale/fr/LC_MESSAGES/Awesomeness.po
+++ b/plugins/Awesomeness/locale/fr/LC_MESSAGES/Awesomeness.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Awesomeness\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:18+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:50+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 23:54:39+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:42:49+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-awesomeness\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: AwesomenessPlugin.php:56
 msgid ""
 "The Awesomeness plugin adds additional awesomeness to a StatusNet "
 "installation."
diff --git a/plugins/Awesomeness/locale/ia/LC_MESSAGES/Awesomeness.po b/plugins/Awesomeness/locale/ia/LC_MESSAGES/Awesomeness.po
index 1e907af3cf..e0e330e542 100644
--- a/plugins/Awesomeness/locale/ia/LC_MESSAGES/Awesomeness.po
+++ b/plugins/Awesomeness/locale/ia/LC_MESSAGES/Awesomeness.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Awesomeness\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:18+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:50+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 23:54:39+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:42:49+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-awesomeness\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: AwesomenessPlugin.php:56
 msgid ""
 "The Awesomeness plugin adds additional awesomeness to a StatusNet "
 "installation."
diff --git a/plugins/Awesomeness/locale/mk/LC_MESSAGES/Awesomeness.po b/plugins/Awesomeness/locale/mk/LC_MESSAGES/Awesomeness.po
index 934dd70ff1..256e7e3e50 100644
--- a/plugins/Awesomeness/locale/mk/LC_MESSAGES/Awesomeness.po
+++ b/plugins/Awesomeness/locale/mk/LC_MESSAGES/Awesomeness.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Awesomeness\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:18+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:50+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 23:54:39+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:42:49+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-awesomeness\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
 
-#: AwesomenessPlugin.php:56
 msgid ""
 "The Awesomeness plugin adds additional awesomeness to a StatusNet "
 "installation."
diff --git a/plugins/Awesomeness/locale/nl/LC_MESSAGES/Awesomeness.po b/plugins/Awesomeness/locale/nl/LC_MESSAGES/Awesomeness.po
index 0f06e24a90..fa18031f9e 100644
--- a/plugins/Awesomeness/locale/nl/LC_MESSAGES/Awesomeness.po
+++ b/plugins/Awesomeness/locale/nl/LC_MESSAGES/Awesomeness.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Awesomeness\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:19+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:50+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 23:54:39+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:42:49+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-awesomeness\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: AwesomenessPlugin.php:56
 msgid ""
 "The Awesomeness plugin adds additional awesomeness to a StatusNet "
 "installation."
diff --git a/plugins/Awesomeness/locale/pt/LC_MESSAGES/Awesomeness.po b/plugins/Awesomeness/locale/pt/LC_MESSAGES/Awesomeness.po
index faaa23a6b6..ceafbe63c2 100644
--- a/plugins/Awesomeness/locale/pt/LC_MESSAGES/Awesomeness.po
+++ b/plugins/Awesomeness/locale/pt/LC_MESSAGES/Awesomeness.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Awesomeness\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:26:39+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:50+0000\n"
 "Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-14 17:19:12+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:42:49+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-plugin-awesomeness\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: AwesomenessPlugin.php:56
 msgid ""
 "The Awesomeness plugin adds additional awesomeness to a StatusNet "
 "installation."
diff --git a/plugins/Awesomeness/locale/ru/LC_MESSAGES/Awesomeness.po b/plugins/Awesomeness/locale/ru/LC_MESSAGES/Awesomeness.po
index 3de520e8b0..0682efcb11 100644
--- a/plugins/Awesomeness/locale/ru/LC_MESSAGES/Awesomeness.po
+++ b/plugins/Awesomeness/locale/ru/LC_MESSAGES/Awesomeness.po
@@ -9,20 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Awesomeness\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:19+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:50+0000\n"
 "Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 23:54:39+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:42:49+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-awesomeness\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: AwesomenessPlugin.php:56
 msgid ""
 "The Awesomeness plugin adds additional awesomeness to a StatusNet "
 "installation."
diff --git a/plugins/Awesomeness/locale/uk/LC_MESSAGES/Awesomeness.po b/plugins/Awesomeness/locale/uk/LC_MESSAGES/Awesomeness.po
index 94cca550dc..35c50836a0 100644
--- a/plugins/Awesomeness/locale/uk/LC_MESSAGES/Awesomeness.po
+++ b/plugins/Awesomeness/locale/uk/LC_MESSAGES/Awesomeness.po
@@ -9,20 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Awesomeness\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:19+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:51+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 23:54:39+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:42:49+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-awesomeness\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: AwesomenessPlugin.php:56
 msgid ""
 "The Awesomeness plugin adds additional awesomeness to a StatusNet "
 "installation."
diff --git a/plugins/BitlyUrl/locale/BitlyUrl.pot b/plugins/BitlyUrl/locale/BitlyUrl.pot
index c19d44aeac..659c1d2428 100644
--- a/plugins/BitlyUrl/locale/BitlyUrl.pot
+++ b/plugins/BitlyUrl/locale/BitlyUrl.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,20 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: BitlyUrlPlugin.php:46
-msgid "You must specify a serviceUrl for bit.ly shortening."
-msgstr ""
-
-#: BitlyUrlPlugin.php:173
-#, php-format
-msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
-msgstr ""
-
-#: BitlyUrlPlugin.php:214
-msgid "bit.ly"
-msgstr ""
-
-#: BitlyUrlPlugin.php:215 bitlyadminpanelaction.php:54
+#: bitlyadminpanelaction.php:54 BitlyUrlPlugin.php:215
 msgid "bit.ly URL shortening"
 msgstr ""
 
@@ -71,3 +58,16 @@ msgstr ""
 #: bitlyadminpanelaction.php:236
 msgid "Save bit.ly settings"
 msgstr ""
+
+#: BitlyUrlPlugin.php:46
+msgid "You must specify a serviceUrl for bit.ly shortening."
+msgstr ""
+
+#: BitlyUrlPlugin.php:173
+#, php-format
+msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
+msgstr ""
+
+#: BitlyUrlPlugin.php:214
+msgid "bit.ly"
+msgstr ""
diff --git a/plugins/BitlyUrl/locale/be-tarask/LC_MESSAGES/BitlyUrl.po b/plugins/BitlyUrl/locale/be-tarask/LC_MESSAGES/BitlyUrl.po
index e588203795..26a1a7abb1 100644
--- a/plugins/BitlyUrl/locale/be-tarask/LC_MESSAGES/BitlyUrl.po
+++ b/plugins/BitlyUrl/locale/be-tarask/LC_MESSAGES/BitlyUrl.po
@@ -10,39 +10,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BitlyUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:26:40+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:51+0000\n"
 "Language-Team: Belarusian (Taraškievica orthography) <http://translatewiki."
 "net/wiki/Portal:be-tarask>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-17 11:29:48+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:42:52+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: be-tarask\n"
 "X-Message-Group: #out-statusnet-plugin-bitlyurl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: BitlyUrlPlugin.php:46
-msgid "You must specify a serviceUrl for bit.ly shortening."
-msgstr "Вам неабходна пазначыць serviceUrl для сэрвісу скарачэньняў bit.ly."
-
-#: BitlyUrlPlugin.php:173
-#, php-format
-msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
-msgstr ""
-"Выкарыстаньне сэрвісу скарачэньня URL-адрасоў <a href=\"http://%1$s/\">%1$s</"
-"a>."
-
-#: BitlyUrlPlugin.php:214
-msgid "bit.ly"
-msgstr "bit.ly"
-
-#: BitlyUrlPlugin.php:215 bitlyadminpanelaction.php:54
 msgid "bit.ly URL shortening"
 msgstr "Скарачэньне URL-адрасоў bit.ly"
 
-#: bitlyadminpanelaction.php:65
 msgid ""
 "URL shortening with bit.ly requires [a bit.ly account and API key](http://"
 "bit.ly/a/your_api_key). This verifies that this is an authorized account, "
@@ -53,38 +36,42 @@ msgstr ""
 "рахунак і дазволіць Вам выкарыстоўваць магчымасьці сачэньня bit.ly і "
 "нестандартныя дамэны."
 
-#: bitlyadminpanelaction.php:132
 msgid "Invalid login. Max length is 255 characters."
 msgstr "Няслушнае імя карыстальніка. Максымальная даўжыня 255 сымбаляў."
 
-#: bitlyadminpanelaction.php:138
 msgid "Invalid API key. Max length is 255 characters."
 msgstr "Няслушны API-ключ. Максымальная даўжыня 255 сымбаляў."
 
-#: bitlyadminpanelaction.php:191
 msgid "Credentials"
 msgstr "Упаўнаважаньні"
 
-#: bitlyadminpanelaction.php:199
 msgid "Leave these empty to use global default credentials."
 msgstr ""
 "Пакіньце гэтае поле пустым, каб выкарыстоўваць глябальнымі ўпаўнаважаньнямі "
 "па змоўчваньні."
 
-#: bitlyadminpanelaction.php:202
 msgid "If you leave these empty, bit.ly will be unavailable to users."
 msgstr ""
 "Калі Вы пакінеце гэтае поле пустым, bit.ly будзе недаступны для "
 "карыстальнікаў."
 
-#: bitlyadminpanelaction.php:209
 msgid "Login name"
 msgstr "Імя карыстальніка"
 
-#: bitlyadminpanelaction.php:218
 msgid "API key"
 msgstr "API-ключ"
 
-#: bitlyadminpanelaction.php:236
 msgid "Save bit.ly settings"
 msgstr "Захаваць устаноўкі bit.ly"
+
+msgid "You must specify a serviceUrl for bit.ly shortening."
+msgstr "Вам неабходна пазначыць serviceUrl для сэрвісу скарачэньняў bit.ly."
+
+#, php-format
+msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
+msgstr ""
+"Выкарыстаньне сэрвісу скарачэньня URL-адрасоў <a href=\"http://%1$s/\">%1$s</"
+"a>."
+
+msgid "bit.ly"
+msgstr "bit.ly"
diff --git a/plugins/BitlyUrl/locale/ca/LC_MESSAGES/BitlyUrl.po b/plugins/BitlyUrl/locale/ca/LC_MESSAGES/BitlyUrl.po
index ad79fdc4dc..0014205d02 100644
--- a/plugins/BitlyUrl/locale/ca/LC_MESSAGES/BitlyUrl.po
+++ b/plugins/BitlyUrl/locale/ca/LC_MESSAGES/BitlyUrl.po
@@ -9,37 +9,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BitlyUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:26:40+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:52+0000\n"
 "Language-Team: Catalan <http://translatewiki.net/wiki/Portal:ca>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-17 11:29:48+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:42:52+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ca\n"
 "X-Message-Group: #out-statusnet-plugin-bitlyurl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: BitlyUrlPlugin.php:46
-msgid "You must specify a serviceUrl for bit.ly shortening."
-msgstr "Heu d'especificar un URL de servei per a l'escurçament de bit.ly"
-
-#: BitlyUrlPlugin.php:173
-#, php-format
-msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
-msgstr ""
-"Fa servir el servei d'escurçament d'URL <a href=\"http://%1$s/\">%1$s</a>."
-
-#: BitlyUrlPlugin.php:214
-msgid "bit.ly"
-msgstr "bit.ly"
-
-#: BitlyUrlPlugin.php:215 bitlyadminpanelaction.php:54
 msgid "bit.ly URL shortening"
 msgstr "Escurçament d'URL bit.ly"
 
-#: bitlyadminpanelaction.php:65
 msgid ""
 "URL shortening with bit.ly requires [a bit.ly account and API key](http://"
 "bit.ly/a/your_api_key). This verifies that this is an authorized account, "
@@ -50,34 +34,37 @@ msgstr ""
 "permet fer servir les característiques de seguiment de bit.ly i els dominis "
 "personalitzats."
 
-#: bitlyadminpanelaction.php:132
 msgid "Invalid login. Max length is 255 characters."
 msgstr "Inici de sessió no vàlid. La longitud màxima és de 255 caràcters."
 
-#: bitlyadminpanelaction.php:138
 msgid "Invalid API key. Max length is 255 characters."
 msgstr "Clau API no vàlida. La longitud màxima és de 255 caràcters."
 
-#: bitlyadminpanelaction.php:191
 msgid "Credentials"
 msgstr "Credencials"
 
-#: bitlyadminpanelaction.php:199
 msgid "Leave these empty to use global default credentials."
 msgstr "Deixa-ho en blanc i fes servir les credencials per defecte globals."
 
-#: bitlyadminpanelaction.php:202
 msgid "If you leave these empty, bit.ly will be unavailable to users."
 msgstr "Si ho deixeu en blanc, el bit.ly no serà disponible per als usuaris."
 
-#: bitlyadminpanelaction.php:209
 msgid "Login name"
 msgstr "Nom de sessió"
 
-#: bitlyadminpanelaction.php:218
 msgid "API key"
 msgstr "Clau API"
 
-#: bitlyadminpanelaction.php:236
 msgid "Save bit.ly settings"
 msgstr "Desa els paràmetres de bit.ly"
+
+msgid "You must specify a serviceUrl for bit.ly shortening."
+msgstr "Heu d'especificar un URL de servei per a l'escurçament de bit.ly"
+
+#, php-format
+msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
+msgstr ""
+"Fa servir el servei d'escurçament d'URL <a href=\"http://%1$s/\">%1$s</a>."
+
+msgid "bit.ly"
+msgstr "bit.ly"
diff --git a/plugins/BitlyUrl/locale/de/LC_MESSAGES/BitlyUrl.po b/plugins/BitlyUrl/locale/de/LC_MESSAGES/BitlyUrl.po
index d4af3918d3..3518012249 100644
--- a/plugins/BitlyUrl/locale/de/LC_MESSAGES/BitlyUrl.po
+++ b/plugins/BitlyUrl/locale/de/LC_MESSAGES/BitlyUrl.po
@@ -10,36 +10,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BitlyUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:26:40+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:52+0000\n"
 "Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-17 11:29:48+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:42:52+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-bitlyurl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: BitlyUrlPlugin.php:46
-msgid "You must specify a serviceUrl for bit.ly shortening."
-msgstr "Du musst eine „serviceUrl“ zur bit.ly-URL-Kürzung angeben."
-
-#: BitlyUrlPlugin.php:173
-#, php-format
-msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
-msgstr "Benutzung des <a href=\"http://%1$s/\">%1$s</a>-URL-Kürzungsdienstes."
-
-#: BitlyUrlPlugin.php:214
-msgid "bit.ly"
-msgstr "bit.ly"
-
-#: BitlyUrlPlugin.php:215 bitlyadminpanelaction.php:54
 msgid "bit.ly URL shortening"
 msgstr "bit.ly-URL-Kürzung"
 
-#: bitlyadminpanelaction.php:65
 msgid ""
 "URL shortening with bit.ly requires [a bit.ly account and API key](http://"
 "bit.ly/a/your_api_key). This verifies that this is an authorized account, "
@@ -50,35 +35,37 @@ msgstr ""
 "Benutzerkonto ist und ermöglicht bit.lys Tracking-Funktionen und "
 "benutzerdefinierte Domains."
 
-#: bitlyadminpanelaction.php:132
 msgid "Invalid login. Max length is 255 characters."
 msgstr "Ungültige Anmeldung. Maximale Länge sind 255 Zeichen."
 
-#: bitlyadminpanelaction.php:138
 msgid "Invalid API key. Max length is 255 characters."
 msgstr "Ungültiger API-Schlüssel. Maximale Länge sind 255 Zeichen."
 
-#: bitlyadminpanelaction.php:191
 msgid "Credentials"
 msgstr "Anmeldeinformationen"
 
-#: bitlyadminpanelaction.php:199
 msgid "Leave these empty to use global default credentials."
 msgstr "Lass dies leer, um globale Standard-Anmeldeinformationen zu benutzen."
 
-#: bitlyadminpanelaction.php:202
 msgid "If you leave these empty, bit.ly will be unavailable to users."
 msgstr ""
 "Wenn du dies leer lässt, wird bit.ly nicht für Benutzer verfügbar sein."
 
-#: bitlyadminpanelaction.php:209
 msgid "Login name"
 msgstr "Benutzername"
 
-#: bitlyadminpanelaction.php:218
 msgid "API key"
 msgstr "API-Schlüssel"
 
-#: bitlyadminpanelaction.php:236
 msgid "Save bit.ly settings"
 msgstr "bit.ly-Einstellungen speichern"
+
+msgid "You must specify a serviceUrl for bit.ly shortening."
+msgstr "Du musst eine „serviceUrl“ zur bit.ly-URL-Kürzung angeben."
+
+#, php-format
+msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
+msgstr "Benutzung des <a href=\"http://%1$s/\">%1$s</a>-URL-Kürzungsdienstes."
+
+msgid "bit.ly"
+msgstr "bit.ly"
diff --git a/plugins/BitlyUrl/locale/fr/LC_MESSAGES/BitlyUrl.po b/plugins/BitlyUrl/locale/fr/LC_MESSAGES/BitlyUrl.po
index bf3d0abc56..5fa888cb69 100644
--- a/plugins/BitlyUrl/locale/fr/LC_MESSAGES/BitlyUrl.po
+++ b/plugins/BitlyUrl/locale/fr/LC_MESSAGES/BitlyUrl.po
@@ -9,38 +9,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BitlyUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:26:40+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:52+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-17 11:29:48+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:42:52+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-bitlyurl\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: BitlyUrlPlugin.php:46
-msgid "You must specify a serviceUrl for bit.ly shortening."
-msgstr "Vous devez spécifier un serviceUrl pour le raccourcissement bit.ly."
-
-#: BitlyUrlPlugin.php:173
-#, php-format
-msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
-msgstr ""
-"Utilise le service de raccourcissement d’URL <a href=\"http://%1$s/\">%1$s</"
-"a>."
-
-#: BitlyUrlPlugin.php:214
-msgid "bit.ly"
-msgstr "bit.ly"
-
-#: BitlyUrlPlugin.php:215 bitlyadminpanelaction.php:54
 msgid "bit.ly URL shortening"
 msgstr "Raccourcissement d’URL bit.ly"
 
-#: bitlyadminpanelaction.php:65
 msgid ""
 "URL shortening with bit.ly requires [a bit.ly account and API key](http://"
 "bit.ly/a/your_api_key). This verifies that this is an authorized account, "
@@ -51,37 +34,41 @@ msgstr ""
 "bien d’un compte autorisé et vous permet d’utiliser les fonctionnalités de "
 "suivi et les domaines personnalisés de bit.ly."
 
-#: bitlyadminpanelaction.php:132
 msgid "Invalid login. Max length is 255 characters."
 msgstr ""
 "Nom d’utilisateur invalide. La longueur maximale est de 255 caractères."
 
-#: bitlyadminpanelaction.php:138
 msgid "Invalid API key. Max length is 255 characters."
 msgstr "Clé d’API invalide. La longueur maximale est de 255 caractères."
 
-#: bitlyadminpanelaction.php:191
 msgid "Credentials"
 msgstr "Pouvoirs"
 
-#: bitlyadminpanelaction.php:199
 msgid "Leave these empty to use global default credentials."
 msgstr "Laissez ceci vide pour utiliser les pouvoirs globaux par défaut."
 
-#: bitlyadminpanelaction.php:202
 msgid "If you leave these empty, bit.ly will be unavailable to users."
 msgstr ""
 "Si vous laissez ceci vide, bit.ly ne sera pas disponible pour les "
 "utilisateurs."
 
-#: bitlyadminpanelaction.php:209
 msgid "Login name"
 msgstr "Nom d’utilisateur"
 
-#: bitlyadminpanelaction.php:218
 msgid "API key"
 msgstr "Clé API"
 
-#: bitlyadminpanelaction.php:236
 msgid "Save bit.ly settings"
 msgstr "Sauvegarder les paramètres bit.ly"
+
+msgid "You must specify a serviceUrl for bit.ly shortening."
+msgstr "Vous devez spécifier un serviceUrl pour le raccourcissement bit.ly."
+
+#, php-format
+msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
+msgstr ""
+"Utilise le service de raccourcissement d’URL <a href=\"http://%1$s/\">%1$s</"
+"a>."
+
+msgid "bit.ly"
+msgstr "bit.ly"
diff --git a/plugins/BitlyUrl/locale/gl/LC_MESSAGES/BitlyUrl.po b/plugins/BitlyUrl/locale/gl/LC_MESSAGES/BitlyUrl.po
index 80e9334c78..8867c23124 100644
--- a/plugins/BitlyUrl/locale/gl/LC_MESSAGES/BitlyUrl.po
+++ b/plugins/BitlyUrl/locale/gl/LC_MESSAGES/BitlyUrl.po
@@ -9,72 +9,59 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BitlyUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:26:40+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:52+0000\n"
 "Language-Team: Galician <http://translatewiki.net/wiki/Portal:gl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-17 11:29:48+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:42:52+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: gl\n"
 "X-Message-Group: #out-statusnet-plugin-bitlyurl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: BitlyUrlPlugin.php:46
-msgid "You must specify a serviceUrl for bit.ly shortening."
-msgstr ""
-
-#: BitlyUrlPlugin.php:173
-#, php-format
-msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
-msgstr ""
-"Emprega o servizo de abreviación de enderezos URL <a href=\"http://%1$s/\">%1"
-"$s</a>."
-
-#: BitlyUrlPlugin.php:214
-msgid "bit.ly"
-msgstr ""
-
-#: BitlyUrlPlugin.php:215 bitlyadminpanelaction.php:54
 msgid "bit.ly URL shortening"
 msgstr ""
 
-#: bitlyadminpanelaction.php:65
 msgid ""
 "URL shortening with bit.ly requires [a bit.ly account and API key](http://"
 "bit.ly/a/your_api_key). This verifies that this is an authorized account, "
 "and allow you to use bit.ly's tracking features and custom domains."
 msgstr ""
 
-#: bitlyadminpanelaction.php:132
 msgid "Invalid login. Max length is 255 characters."
 msgstr "Rexistro incorrecto. A extensión máxima é de 255 caracteres."
 
-#: bitlyadminpanelaction.php:138
 msgid "Invalid API key. Max length is 255 characters."
 msgstr "Clave API incorrecta. A extensión máxima é de 255 caracteres."
 
-#: bitlyadminpanelaction.php:191
 msgid "Credentials"
 msgstr ""
 
-#: bitlyadminpanelaction.php:199
 msgid "Leave these empty to use global default credentials."
 msgstr ""
 
-#: bitlyadminpanelaction.php:202
 msgid "If you leave these empty, bit.ly will be unavailable to users."
 msgstr ""
 
-#: bitlyadminpanelaction.php:209
 msgid "Login name"
 msgstr "Nome de usuario"
 
-#: bitlyadminpanelaction.php:218
 msgid "API key"
 msgstr ""
 
-#: bitlyadminpanelaction.php:236
 msgid "Save bit.ly settings"
 msgstr "Gardar a configuración bit.ly"
+
+msgid "You must specify a serviceUrl for bit.ly shortening."
+msgstr ""
+
+#, php-format
+msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
+msgstr ""
+"Emprega o servizo de abreviación de enderezos URL <a href=\"http://%1$s/\">%1"
+"$s</a>."
+
+msgid "bit.ly"
+msgstr ""
diff --git a/plugins/BitlyUrl/locale/ia/LC_MESSAGES/BitlyUrl.po b/plugins/BitlyUrl/locale/ia/LC_MESSAGES/BitlyUrl.po
index 976002a3e4..7847503e90 100644
--- a/plugins/BitlyUrl/locale/ia/LC_MESSAGES/BitlyUrl.po
+++ b/plugins/BitlyUrl/locale/ia/LC_MESSAGES/BitlyUrl.po
@@ -9,36 +9,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BitlyUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:26:40+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:52+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-17 11:29:48+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:42:52+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-bitlyurl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: BitlyUrlPlugin.php:46
-msgid "You must specify a serviceUrl for bit.ly shortening."
-msgstr "Tu debe specificar un serviceUrl pro accurtamento bit.ly."
-
-#: BitlyUrlPlugin.php:173
-#, php-format
-msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
-msgstr "Usa abbreviator de URL <a href=\"http://%1$s/\">%1$s</a>."
-
-#: BitlyUrlPlugin.php:214
-msgid "bit.ly"
-msgstr "bit.ly"
-
-#: BitlyUrlPlugin.php:215 bitlyadminpanelaction.php:54
 msgid "bit.ly URL shortening"
 msgstr "Accurtamento de URL con bit.ly"
 
-#: bitlyadminpanelaction.php:65
 msgid ""
 "URL shortening with bit.ly requires [a bit.ly account and API key](http://"
 "bit.ly/a/your_api_key). This verifies that this is an authorized account, "
@@ -49,35 +34,37 @@ msgstr ""
 "autorisate, e permitte usar le functionalitate de traciamento e dominios "
 "personalisate de bit.ly."
 
-#: bitlyadminpanelaction.php:132
 msgid "Invalid login. Max length is 255 characters."
 msgstr "Nomine de usator invalide. Longitude maximal es 255 characteres."
 
-#: bitlyadminpanelaction.php:138
 msgid "Invalid API key. Max length is 255 characters."
 msgstr "Clave API invalide. Longitude maximal es 255 characteres."
 
-#: bitlyadminpanelaction.php:191
 msgid "Credentials"
 msgstr "Datos de authentication"
 
-#: bitlyadminpanelaction.php:199
 msgid "Leave these empty to use global default credentials."
 msgstr ""
 "Lassa istes vacue pro usar le datos de authentication global predefinite."
 
-#: bitlyadminpanelaction.php:202
 msgid "If you leave these empty, bit.ly will be unavailable to users."
 msgstr "Si tu lassa istes vacue, bit.ly non essera disponibile al usatores."
 
-#: bitlyadminpanelaction.php:209
 msgid "Login name"
 msgstr "Nomine de conto"
 
-#: bitlyadminpanelaction.php:218
 msgid "API key"
 msgstr "Clave API"
 
-#: bitlyadminpanelaction.php:236
 msgid "Save bit.ly settings"
 msgstr "Salveguardar configurationes de bit.ly"
+
+msgid "You must specify a serviceUrl for bit.ly shortening."
+msgstr "Tu debe specificar un serviceUrl pro accurtamento bit.ly."
+
+#, php-format
+msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
+msgstr "Usa abbreviator de URL <a href=\"http://%1$s/\">%1$s</a>."
+
+msgid "bit.ly"
+msgstr "bit.ly"
diff --git a/plugins/BitlyUrl/locale/mk/LC_MESSAGES/BitlyUrl.po b/plugins/BitlyUrl/locale/mk/LC_MESSAGES/BitlyUrl.po
index 8d836a8213..a7f048d61e 100644
--- a/plugins/BitlyUrl/locale/mk/LC_MESSAGES/BitlyUrl.po
+++ b/plugins/BitlyUrl/locale/mk/LC_MESSAGES/BitlyUrl.po
@@ -9,38 +9,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BitlyUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:26:40+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:52+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-17 11:29:48+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:42:52+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-bitlyurl\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
 
-#: BitlyUrlPlugin.php:46
-msgid "You must specify a serviceUrl for bit.ly shortening."
-msgstr "Мора да наведете URL-адреса за скратување со bit.ly."
-
-#: BitlyUrlPlugin.php:173
-#, php-format
-msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
-msgstr ""
-"Користи <a href=\"http://%1$s/\">%1$s</a> - служба за скратување на URL-"
-"адреса."
-
-#: BitlyUrlPlugin.php:214
-msgid "bit.ly"
-msgstr "bit.ly"
-
-#: BitlyUrlPlugin.php:215 bitlyadminpanelaction.php:54
 msgid "bit.ly URL shortening"
 msgstr "Скратување на URL со bit.ly"
 
-#: bitlyadminpanelaction.php:65
 msgid ""
 "URL shortening with bit.ly requires [a bit.ly account and API key](http://"
 "bit.ly/a/your_api_key). This verifies that this is an authorized account, "
@@ -51,35 +34,39 @@ msgstr ""
 "сметка, и Ви овозможува да ги користите можностите за следење и "
 "прилагодување на домени што ги нуди bit.ly's."
 
-#: bitlyadminpanelaction.php:132
 msgid "Invalid login. Max length is 255 characters."
 msgstr "Неважечко корисничко име. Дозволени се највеќе 255 знаци."
 
-#: bitlyadminpanelaction.php:138
 msgid "Invalid API key. Max length is 255 characters."
 msgstr "Неважечки API-клуч. Дозволени се највеќе 255 знаци."
 
-#: bitlyadminpanelaction.php:191
 msgid "Credentials"
 msgstr "Уверенија"
 
-#: bitlyadminpanelaction.php:199
 msgid "Leave these empty to use global default credentials."
 msgstr ""
 "Оставете го ова празно за да го користите глобалното уверение по основно."
 
-#: bitlyadminpanelaction.php:202
 msgid "If you leave these empty, bit.ly will be unavailable to users."
 msgstr "Ако ова го оставите празно, bit.ly ќе биде недостапен за корисниците."
 
-#: bitlyadminpanelaction.php:209
 msgid "Login name"
 msgstr "Корисничко име"
 
-#: bitlyadminpanelaction.php:218
 msgid "API key"
 msgstr "API-клуч"
 
-#: bitlyadminpanelaction.php:236
 msgid "Save bit.ly settings"
 msgstr "Зачувај нагодувања на bit.ly"
+
+msgid "You must specify a serviceUrl for bit.ly shortening."
+msgstr "Мора да наведете URL-адреса за скратување со bit.ly."
+
+#, php-format
+msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
+msgstr ""
+"Користи <a href=\"http://%1$s/\">%1$s</a> - служба за скратување на URL-"
+"адреса."
+
+msgid "bit.ly"
+msgstr "bit.ly"
diff --git a/plugins/BitlyUrl/locale/nb/LC_MESSAGES/BitlyUrl.po b/plugins/BitlyUrl/locale/nb/LC_MESSAGES/BitlyUrl.po
index 91c9a2f708..d0b83e34d8 100644
--- a/plugins/BitlyUrl/locale/nb/LC_MESSAGES/BitlyUrl.po
+++ b/plugins/BitlyUrl/locale/nb/LC_MESSAGES/BitlyUrl.po
@@ -9,36 +9,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BitlyUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:26:41+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:52+0000\n"
 "Language-Team: Norwegian (bokmål)‬ <http://translatewiki.net/wiki/Portal:no>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-17 11:29:48+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:42:52+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: #out-statusnet-plugin-bitlyurl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: BitlyUrlPlugin.php:46
-msgid "You must specify a serviceUrl for bit.ly shortening."
-msgstr "Du må angi en serviceUrl for bit.ly-forkortelse."
-
-#: BitlyUrlPlugin.php:173
-#, php-format
-msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
-msgstr "Bruker URL-forkortertjenesten <a href=\"http://%1$s/\">%1$s</a>."
-
-#: BitlyUrlPlugin.php:214
-msgid "bit.ly"
-msgstr "bit.ly"
-
-#: BitlyUrlPlugin.php:215 bitlyadminpanelaction.php:54
 msgid "bit.ly URL shortening"
 msgstr "bit.ly URL-forkortelse"
 
-#: bitlyadminpanelaction.php:65
 msgid ""
 "URL shortening with bit.ly requires [a bit.ly account and API key](http://"
 "bit.ly/a/your_api_key). This verifies that this is an authorized account, "
@@ -48,34 +33,36 @@ msgstr ""
 "ly/a/your_api_key). Denne bekrefter at dette er en autorisert konto og "
 "tillater deg å bruke bit.lys sporingsfunksjoner og egendefinerte domener."
 
-#: bitlyadminpanelaction.php:132
 msgid "Invalid login. Max length is 255 characters."
 msgstr "Ugyldig pålogging. Maks lengde er 255 tegn."
 
-#: bitlyadminpanelaction.php:138
 msgid "Invalid API key. Max length is 255 characters."
 msgstr "Ugyldig API-nøkkel. Maks lengde er 255 tegn."
 
-#: bitlyadminpanelaction.php:191
 msgid "Credentials"
 msgstr "Attester"
 
-#: bitlyadminpanelaction.php:199
 msgid "Leave these empty to use global default credentials."
 msgstr "La disse være tomme for å bruke globale standardattester."
 
-#: bitlyadminpanelaction.php:202
 msgid "If you leave these empty, bit.ly will be unavailable to users."
 msgstr "Om du lar disse være tomme vil bit.ly være utilgjengelig for brukere."
 
-#: bitlyadminpanelaction.php:209
 msgid "Login name"
 msgstr "Innloggingsnavn"
 
-#: bitlyadminpanelaction.php:218
 msgid "API key"
 msgstr "API-nøkkel"
 
-#: bitlyadminpanelaction.php:236
 msgid "Save bit.ly settings"
 msgstr "Lagre bit.ly-innstillinger"
+
+msgid "You must specify a serviceUrl for bit.ly shortening."
+msgstr "Du må angi en serviceUrl for bit.ly-forkortelse."
+
+#, php-format
+msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
+msgstr "Bruker URL-forkortertjenesten <a href=\"http://%1$s/\">%1$s</a>."
+
+msgid "bit.ly"
+msgstr "bit.ly"
diff --git a/plugins/BitlyUrl/locale/nl/LC_MESSAGES/BitlyUrl.po b/plugins/BitlyUrl/locale/nl/LC_MESSAGES/BitlyUrl.po
index 82c0ce4e8d..3dc078b02e 100644
--- a/plugins/BitlyUrl/locale/nl/LC_MESSAGES/BitlyUrl.po
+++ b/plugins/BitlyUrl/locale/nl/LC_MESSAGES/BitlyUrl.po
@@ -9,38 +9,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BitlyUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:26:40+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:52+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-17 11:29:48+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:42:52+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-bitlyurl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: BitlyUrlPlugin.php:46
-msgid "You must specify a serviceUrl for bit.ly shortening."
-msgstr "U moet een serviceUrl opgeven om URL's in te korten via bit.ly."
-
-#: BitlyUrlPlugin.php:173
-#, php-format
-msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
-msgstr ""
-"Gebruikt de dienst <a href=\"http://%1$s/\">%1$s</a> om URL's korter te "
-"maken."
-
-#: BitlyUrlPlugin.php:214
-msgid "bit.ly"
-msgstr "bit.ly"
-
-#: BitlyUrlPlugin.php:215 bitlyadminpanelaction.php:54
 msgid "bit.ly URL shortening"
 msgstr "URL's inkorten via bit.ly"
 
-#: bitlyadminpanelaction.php:65
 msgid ""
 "URL shortening with bit.ly requires [a bit.ly account and API key](http://"
 "bit.ly/a/your_api_key). This verifies that this is an authorized account, "
@@ -49,36 +32,40 @@ msgstr ""
 "Het inkorten van URL's via bit.ly vereist een [account bij bit.ly en een API-"
 "sleutel](http://bit.ly/a/your_api_key)."
 
-#: bitlyadminpanelaction.php:132
 msgid "Invalid login. Max length is 255 characters."
 msgstr "Ongeldige aanmeldgegevens. De maximale lengte is 255 tekens."
 
-#: bitlyadminpanelaction.php:138
 msgid "Invalid API key. Max length is 255 characters."
 msgstr "De API-sleutel is ongeldig. De maximale lengte is 255 tekens."
 
-#: bitlyadminpanelaction.php:191
 msgid "Credentials"
 msgstr "Gebruikersgegevens"
 
-#: bitlyadminpanelaction.php:199
 msgid "Leave these empty to use global default credentials."
 msgstr "Laat deze leeg om globale standaard gebruikersgegevens te gebruiken."
 
-#: bitlyadminpanelaction.php:202
 msgid "If you leave these empty, bit.ly will be unavailable to users."
 msgstr ""
 "Als u deze velden oningevuld laat, is bit.ly niet beschikbaar voor "
 "gebruikers."
 
-#: bitlyadminpanelaction.php:209
 msgid "Login name"
 msgstr "Gebruikersnaam"
 
-#: bitlyadminpanelaction.php:218
 msgid "API key"
 msgstr "API-sleutel"
 
-#: bitlyadminpanelaction.php:236
 msgid "Save bit.ly settings"
 msgstr "bit.ly-instellingen opslaan"
+
+msgid "You must specify a serviceUrl for bit.ly shortening."
+msgstr "U moet een serviceUrl opgeven om URL's in te korten via bit.ly."
+
+#, php-format
+msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
+msgstr ""
+"Gebruikt de dienst <a href=\"http://%1$s/\">%1$s</a> om URL's korter te "
+"maken."
+
+msgid "bit.ly"
+msgstr "bit.ly"
diff --git a/plugins/BitlyUrl/locale/ru/LC_MESSAGES/BitlyUrl.po b/plugins/BitlyUrl/locale/ru/LC_MESSAGES/BitlyUrl.po
index a15ebf0b5e..372c51d75e 100644
--- a/plugins/BitlyUrl/locale/ru/LC_MESSAGES/BitlyUrl.po
+++ b/plugins/BitlyUrl/locale/ru/LC_MESSAGES/BitlyUrl.po
@@ -11,37 +11,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BitlyUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:26:41+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:52+0000\n"
 "Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-17 11:29:48+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:42:52+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-bitlyurl\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: BitlyUrlPlugin.php:46
-msgid "You must specify a serviceUrl for bit.ly shortening."
-msgstr "Вы должны указать serviceUrl для bit.ly сокращений."
-
-#: BitlyUrlPlugin.php:173
-#, php-format
-msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
-msgstr "Использование службы сокращения URL <a href=\"http://%1$s/\">%1$s</a>."
-
-#: BitlyUrlPlugin.php:214
-msgid "bit.ly"
-msgstr "bit.ly"
-
-#: BitlyUrlPlugin.php:215 bitlyadminpanelaction.php:54
 msgid "bit.ly URL shortening"
 msgstr "Сервис сокращения URL bit.ly"
 
-#: bitlyadminpanelaction.php:65
 msgid ""
 "URL shortening with bit.ly requires [a bit.ly account and API key](http://"
 "bit.ly/a/your_api_key). This verifies that this is an authorized account, "
@@ -52,37 +37,39 @@ msgstr ""
 "авторизована и позволяет использовать функции отслеживания bit.ly и "
 "настраивать домены."
 
-#: bitlyadminpanelaction.php:132
 msgid "Invalid login. Max length is 255 characters."
 msgstr "Неверное имя пользователя. Максимальная длина составляет 255 символов."
 
-#: bitlyadminpanelaction.php:138
 msgid "Invalid API key. Max length is 255 characters."
 msgstr "Неверный ключ API. Максимальная длина составляет 255 символов."
 
-#: bitlyadminpanelaction.php:191
 msgid "Credentials"
 msgstr "Полномочия"
 
-#: bitlyadminpanelaction.php:199
 msgid "Leave these empty to use global default credentials."
 msgstr ""
 "Оставьте это поле пустым для использования глобальных полномочий по "
 "умолчанию."
 
-#: bitlyadminpanelaction.php:202
 msgid "If you leave these empty, bit.ly will be unavailable to users."
 msgstr ""
 "Если оставить это поле пустым, bit.ly будет недоступен для пользователей."
 
-#: bitlyadminpanelaction.php:209
 msgid "Login name"
 msgstr "Имя учётной записи"
 
-#: bitlyadminpanelaction.php:218
 msgid "API key"
 msgstr "Ключ API"
 
-#: bitlyadminpanelaction.php:236
 msgid "Save bit.ly settings"
 msgstr "Сохранить настройки bit.ly"
+
+msgid "You must specify a serviceUrl for bit.ly shortening."
+msgstr "Вы должны указать serviceUrl для bit.ly сокращений."
+
+#, php-format
+msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
+msgstr "Использование службы сокращения URL <a href=\"http://%1$s/\">%1$s</a>."
+
+msgid "bit.ly"
+msgstr "bit.ly"
diff --git a/plugins/BitlyUrl/locale/uk/LC_MESSAGES/BitlyUrl.po b/plugins/BitlyUrl/locale/uk/LC_MESSAGES/BitlyUrl.po
index 99c8175228..94532a3372 100644
--- a/plugins/BitlyUrl/locale/uk/LC_MESSAGES/BitlyUrl.po
+++ b/plugins/BitlyUrl/locale/uk/LC_MESSAGES/BitlyUrl.po
@@ -9,39 +9,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BitlyUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:26:41+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:52+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-17 11:29:48+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:42:52+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-bitlyurl\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: BitlyUrlPlugin.php:46
-msgid "You must specify a serviceUrl for bit.ly shortening."
-msgstr ""
-"Ви мусите зазначити URL-адресу для сервісу скорочення URL-адрес bit.ly."
-
-#: BitlyUrlPlugin.php:173
-#, php-format
-msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
-msgstr ""
-"Використання <a href=\"http://%1$s/\">%1$s</a> для скорочення URL-адрес."
-
-#: BitlyUrlPlugin.php:214
-msgid "bit.ly"
-msgstr "bit.ly"
-
-#: BitlyUrlPlugin.php:215 bitlyadminpanelaction.php:54
 msgid "bit.ly URL shortening"
 msgstr "Скорочення URL-адрес bit.ly"
 
-#: bitlyadminpanelaction.php:65
 msgid ""
 "URL shortening with bit.ly requires [a bit.ly account and API key](http://"
 "bit.ly/a/your_api_key). This verifies that this is an authorized account, "
@@ -52,38 +35,42 @@ msgstr ""
 "авторизованим і дозволить користуватися функцією відстеження bit.ly, а також "
 "доменами користувачів."
 
-#: bitlyadminpanelaction.php:132
 msgid "Invalid login. Max length is 255 characters."
 msgstr "Невірний лоґін. Максимальна довжина — 255 символів."
 
-#: bitlyadminpanelaction.php:138
 msgid "Invalid API key. Max length is 255 characters."
 msgstr "Невірний API-ключ. Максимальна довжина — 255 символів."
 
-#: bitlyadminpanelaction.php:191
 msgid "Credentials"
 msgstr "Повноваження"
 
-#: bitlyadminpanelaction.php:199
 msgid "Leave these empty to use global default credentials."
 msgstr ""
 "Залиште це поле порожнім, щоб користуватися загальними повноваженнями за "
 "замовчуванням."
 
-#: bitlyadminpanelaction.php:202
 msgid "If you leave these empty, bit.ly will be unavailable to users."
 msgstr ""
 "Якщо ви залишите це поле порожнім, сервіс bit.ly стане недоступним для інших "
 "користувачів."
 
-#: bitlyadminpanelaction.php:209
 msgid "Login name"
 msgstr "Лоґін"
 
-#: bitlyadminpanelaction.php:218
 msgid "API key"
 msgstr "API-ключ"
 
-#: bitlyadminpanelaction.php:236
 msgid "Save bit.ly settings"
 msgstr "Зберегти налаштування bit.ly"
+
+msgid "You must specify a serviceUrl for bit.ly shortening."
+msgstr ""
+"Ви мусите зазначити URL-адресу для сервісу скорочення URL-адрес bit.ly."
+
+#, php-format
+msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
+msgstr ""
+"Використання <a href=\"http://%1$s/\">%1$s</a> для скорочення URL-адрес."
+
+msgid "bit.ly"
+msgstr "bit.ly"
diff --git a/plugins/Blacklist/locale/Blacklist.pot b/plugins/Blacklist/locale/Blacklist.pot
index 45c144818e..be74413662 100644
--- a/plugins/Blacklist/locale/Blacklist.pot
+++ b/plugins/Blacklist/locale/Blacklist.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/Blacklist/locale/be-tarask/LC_MESSAGES/Blacklist.po b/plugins/Blacklist/locale/be-tarask/LC_MESSAGES/Blacklist.po
index f3973e3e20..d53f19ec33 100644
--- a/plugins/Blacklist/locale/be-tarask/LC_MESSAGES/Blacklist.po
+++ b/plugins/Blacklist/locale/be-tarask/LC_MESSAGES/Blacklist.po
@@ -10,122 +10,101 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Blacklist\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:22+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:53+0000\n"
 "Language-Team: Belarusian (Taraškievica orthography) <http://translatewiki."
 "net/wiki/Portal:be-tarask>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:31+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:04+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: be-tarask\n"
 "X-Message-Group: #out-statusnet-plugin-blacklist\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANS: Validation failure for URL. %s is the URL.
-#: BlacklistPlugin.php:149
 #, php-format
 msgid "You may not register with homepage \"%s\"."
 msgstr "Вы ня можаце зарэгістравацца, падаўшы «%s» як хатнюю старонку."
 
 #. TRANS: Validation failure for nickname. %s is the nickname.
-#: BlacklistPlugin.php:160
 #, php-format
 msgid "You may not register with nickname \"%s\"."
 msgstr "Вы ня можаце зарэгістравацца з мянушкай «%s»."
 
 #. TRANS: Validation failure for URL. %s is the URL.
-#: BlacklistPlugin.php:185
 #, php-format
 msgid "You may not use homepage \"%s\"."
 msgstr "Вы ня можаце выкарыстоўваць хатнюю старонку «%s»."
 
 #. TRANS: Validation failure for nickname. %s is the nickname.
-#: BlacklistPlugin.php:196
 #, php-format
 msgid "You may not use nickname \"%s\"."
 msgstr "Вы ня можаце выкарыстоўваць мянушку «%s»."
 
 #. TRANS: Validation failure for URL. %s is the URL.
-#: BlacklistPlugin.php:239
 #, php-format
 msgid "You may not use URL \"%s\" in notices."
 msgstr "Вы ня можаце выкарыстоўваць URL-адрас «%s» у заўвагах."
 
-#: BlacklistPlugin.php:343
 msgid "Keeps a blacklist of forbidden nickname and URL patterns."
 msgstr "Захоўвае чорны сьпіс забароненых мянушак і шаблёнаў URL-адрасоў."
 
 #. TRANS: Menu item in admin panel.
-#: BlacklistPlugin.php:381
 msgctxt "MENU"
 msgid "Blacklist"
 msgstr "Чорны сьпіс"
 
 #. TRANS: Tooltip for menu item in admin panel.
-#: BlacklistPlugin.php:383
 msgctxt "TOOLTIP"
 msgid "Blacklist configuration"
 msgstr "Устаноўкі чорнага сьпісу"
 
 #. TRANS: Checkbox with text label in the delete user form.
-#: BlacklistPlugin.php:410
 msgid "Add this nickname pattern to blacklist"
 msgstr "Дадаць гэты шаблён мянушкі да чорнага сьпісу"
 
 #. TRANS: Checkbox with text label in the delete user form.
-#: BlacklistPlugin.php:420
 msgid "Add this homepage pattern to blacklist"
 msgstr "Дадаць гэты шаблён хатняй старонкі да чорнага сьпісу"
 
 #. TRANS: Exception thrown trying to post a notice while having set a blocked homepage URL. %s is the blocked URL.
 #. TRANS: Client exception thrown trying to subscribe to a person with a blocked homepage or site URL. %s is the blocked URL.
-#: BlacklistPlugin.php:499 BlacklistPlugin.php:534
 #, php-format
 msgid "Users from \"%s\" blocked."
 msgstr "Карыстальнік з «%s» заблякаваны."
 
 #. TRANS: Exception thrown trying to post a notice while having a blocked nickname. %s is the blocked nickname.
-#: BlacklistPlugin.php:510
 #, php-format
 msgid "Posts from nickname \"%s\" disallowed."
 msgstr "Паведамленьні ад карыстальніка «%s» забароненыя."
 
 #. TRANS: Client exception thrown trying to subscribe to a person with a blocked nickname. %s is the blocked nickname.
-#: BlacklistPlugin.php:545
 #, php-format
 msgid "Can't subscribe to nickname \"%s\"."
 msgstr "Немагчыма падпісацца на карыстальніка «%s»."
 
-#: blacklistadminpanel.php:52
 msgid "Blacklist"
 msgstr "Чорны сьпіс"
 
-#: blacklistadminpanel.php:62
 msgid "Blacklisted URLs and nicknames"
 msgstr "Чорны сьпіс URL-адрасоў і мянушак"
 
-#: blacklistadminpanel.php:174
 msgid "Nicknames"
 msgstr "Мянушкі"
 
-#: blacklistadminpanel.php:176
 msgid "Patterns of nicknames to block, one per line"
 msgstr "Шаблёны мянушак для блякаваньня, па аднаму на радок"
 
-#: blacklistadminpanel.php:182
 msgid "URLs"
 msgstr "URL-адрасы"
 
-#: blacklistadminpanel.php:184
 msgid "Patterns of URLs to block, one per line"
 msgstr "Шаблёны URL-адрасоў для блякаваньня, па аднаму на радок"
 
-#: blacklistadminpanel.php:198
 msgid "Save"
 msgstr "Захаваць"
 
-#: blacklistadminpanel.php:201
 msgid "Save site settings"
 msgstr "Захаваць устаноўкі сайта"
diff --git a/plugins/Blacklist/locale/br/LC_MESSAGES/Blacklist.po b/plugins/Blacklist/locale/br/LC_MESSAGES/Blacklist.po
index a2db3978ef..d5cc0e5a38 100644
--- a/plugins/Blacklist/locale/br/LC_MESSAGES/Blacklist.po
+++ b/plugins/Blacklist/locale/br/LC_MESSAGES/Blacklist.po
@@ -9,121 +9,100 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Blacklist\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:22+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:53+0000\n"
 "Language-Team: Breton <http://translatewiki.net/wiki/Portal:br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:31+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:04+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-blacklist\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. TRANS: Validation failure for URL. %s is the URL.
-#: BlacklistPlugin.php:149
 #, fuzzy, php-format
 msgid "You may not register with homepage \"%s\"."
 msgstr "Ne c'hellit ket en em enskrivañ gant ar bajenn degemer \"%s\"."
 
 #. TRANS: Validation failure for nickname. %s is the nickname.
-#: BlacklistPlugin.php:160
 #, php-format
 msgid "You may not register with nickname \"%s\"."
 msgstr "Ne c'hellit ket en em enskrivañ gant al lesanv \"%s\"."
 
 #. TRANS: Validation failure for URL. %s is the URL.
-#: BlacklistPlugin.php:185
 #, php-format
 msgid "You may not use homepage \"%s\"."
 msgstr "Ne c'hellit ket implij ar bajenn degemer \"%s\"."
 
 #. TRANS: Validation failure for nickname. %s is the nickname.
-#: BlacklistPlugin.php:196
 #, php-format
 msgid "You may not use nickname \"%s\"."
 msgstr "Ne c'hellit ket implij al lesanv \"%s\"."
 
 #. TRANS: Validation failure for URL. %s is the URL.
-#: BlacklistPlugin.php:239
 #, php-format
 msgid "You may not use URL \"%s\" in notices."
 msgstr "Ne c'hellit ket implij an URL \"%s\" en alioù."
 
-#: BlacklistPlugin.php:343
 msgid "Keeps a blacklist of forbidden nickname and URL patterns."
 msgstr ""
 
 #. TRANS: Menu item in admin panel.
-#: BlacklistPlugin.php:381
 msgctxt "MENU"
 msgid "Blacklist"
 msgstr "Roll zu"
 
 #. TRANS: Tooltip for menu item in admin panel.
-#: BlacklistPlugin.php:383
 msgctxt "TOOLTIP"
 msgid "Blacklist configuration"
 msgstr "Kefluniadur ar roll zu"
 
 #. TRANS: Checkbox with text label in the delete user form.
-#: BlacklistPlugin.php:410
 msgid "Add this nickname pattern to blacklist"
 msgstr ""
 
 #. TRANS: Checkbox with text label in the delete user form.
-#: BlacklistPlugin.php:420
 msgid "Add this homepage pattern to blacklist"
 msgstr ""
 
 #. TRANS: Exception thrown trying to post a notice while having set a blocked homepage URL. %s is the blocked URL.
 #. TRANS: Client exception thrown trying to subscribe to a person with a blocked homepage or site URL. %s is the blocked URL.
-#: BlacklistPlugin.php:499 BlacklistPlugin.php:534
 #, php-format
 msgid "Users from \"%s\" blocked."
 msgstr "Implijer \"%s\" stanket."
 
 #. TRANS: Exception thrown trying to post a notice while having a blocked nickname. %s is the blocked nickname.
-#: BlacklistPlugin.php:510
 #, php-format
 msgid "Posts from nickname \"%s\" disallowed."
 msgstr ""
 
 #. TRANS: Client exception thrown trying to subscribe to a person with a blocked nickname. %s is the blocked nickname.
-#: BlacklistPlugin.php:545
 #, php-format
 msgid "Can't subscribe to nickname \"%s\"."
 msgstr "Ne c'hellit ket en em enskrivañ gant al lesanv \"%s\"."
 
-#: blacklistadminpanel.php:52
 msgid "Blacklist"
 msgstr "Roll zu"
 
-#: blacklistadminpanel.php:62
 msgid "Blacklisted URLs and nicknames"
 msgstr ""
 
-#: blacklistadminpanel.php:174
 msgid "Nicknames"
 msgstr "Lesanvioù"
 
-#: blacklistadminpanel.php:176
 msgid "Patterns of nicknames to block, one per line"
 msgstr ""
 
-#: blacklistadminpanel.php:182
 msgid "URLs"
 msgstr "URLoù"
 
-#: blacklistadminpanel.php:184
 msgid "Patterns of URLs to block, one per line"
 msgstr ""
 
-#: blacklistadminpanel.php:198
 msgid "Save"
 msgstr "Enrollañ"
 
-#: blacklistadminpanel.php:201
 msgid "Save site settings"
 msgstr "Enrollañ arventennoù al lec'hienn"
diff --git a/plugins/Blacklist/locale/de/LC_MESSAGES/Blacklist.po b/plugins/Blacklist/locale/de/LC_MESSAGES/Blacklist.po
index 198ac0fec8..f0fb927034 100644
--- a/plugins/Blacklist/locale/de/LC_MESSAGES/Blacklist.po
+++ b/plugins/Blacklist/locale/de/LC_MESSAGES/Blacklist.po
@@ -9,121 +9,100 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Blacklist\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:22+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:54+0000\n"
 "Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:31+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:04+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-blacklist\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANS: Validation failure for URL. %s is the URL.
-#: BlacklistPlugin.php:149
 #, php-format
 msgid "You may not register with homepage \"%s\"."
 msgstr "Du darfst dich nicht mit der Homepage „%s“ anmelden."
 
 #. TRANS: Validation failure for nickname. %s is the nickname.
-#: BlacklistPlugin.php:160
 #, php-format
 msgid "You may not register with nickname \"%s\"."
 msgstr "Du darfst dich nicht mit den Benutzernamen „%s“ anmelden."
 
 #. TRANS: Validation failure for URL. %s is the URL.
-#: BlacklistPlugin.php:185
 #, php-format
 msgid "You may not use homepage \"%s\"."
 msgstr "Du darfst nicht die Homepage „%s“ benutzen."
 
 #. TRANS: Validation failure for nickname. %s is the nickname.
-#: BlacklistPlugin.php:196
 #, php-format
 msgid "You may not use nickname \"%s\"."
 msgstr "Du darfst nicht den Benutzernamen „%s“ benutzen."
 
 #. TRANS: Validation failure for URL. %s is the URL.
-#: BlacklistPlugin.php:239
 #, php-format
 msgid "You may not use URL \"%s\" in notices."
 msgstr "Du darfst nicht die URL „%s“ in Nachrichten verwenden."
 
-#: BlacklistPlugin.php:343
 msgid "Keeps a blacklist of forbidden nickname and URL patterns."
 msgstr "Hält eine schwarze Liste der verbotenen Benutzernamen und URL-Muster."
 
 #. TRANS: Menu item in admin panel.
-#: BlacklistPlugin.php:381
 msgctxt "MENU"
 msgid "Blacklist"
 msgstr "Schwarze Liste"
 
 #. TRANS: Tooltip for menu item in admin panel.
-#: BlacklistPlugin.php:383
 msgctxt "TOOLTIP"
 msgid "Blacklist configuration"
 msgstr "Konfiguration der schwarzen Liste"
 
 #. TRANS: Checkbox with text label in the delete user form.
-#: BlacklistPlugin.php:410
 msgid "Add this nickname pattern to blacklist"
 msgstr "Dieses Benutzernamen-Muster zur schwarzen Liste hinzufügen"
 
 #. TRANS: Checkbox with text label in the delete user form.
-#: BlacklistPlugin.php:420
 msgid "Add this homepage pattern to blacklist"
 msgstr "Dieses Homepage-Muster zur schwarzen Liste hinzufügen"
 
 #. TRANS: Exception thrown trying to post a notice while having set a blocked homepage URL. %s is the blocked URL.
 #. TRANS: Client exception thrown trying to subscribe to a person with a blocked homepage or site URL. %s is the blocked URL.
-#: BlacklistPlugin.php:499 BlacklistPlugin.php:534
 #, php-format
 msgid "Users from \"%s\" blocked."
 msgstr "Benutzer von „%s“ blockiert."
 
 #. TRANS: Exception thrown trying to post a notice while having a blocked nickname. %s is the blocked nickname.
-#: BlacklistPlugin.php:510
 #, php-format
 msgid "Posts from nickname \"%s\" disallowed."
 msgstr "Beiträge vom Benutzernamen „%s“ nicht erlaubt."
 
 #. TRANS: Client exception thrown trying to subscribe to a person with a blocked nickname. %s is the blocked nickname.
-#: BlacklistPlugin.php:545
 #, php-format
 msgid "Can't subscribe to nickname \"%s\"."
 msgstr "Kann Benutzernamen „%s“ nicht abonnieren."
 
-#: blacklistadminpanel.php:52
 msgid "Blacklist"
 msgstr "Schwarze Liste"
 
-#: blacklistadminpanel.php:62
 msgid "Blacklisted URLs and nicknames"
 msgstr "URLs und Benutzernamen auf der schwarzen Liste"
 
-#: blacklistadminpanel.php:174
 msgid "Nicknames"
 msgstr "Benutzernamen"
 
-#: blacklistadminpanel.php:176
 msgid "Patterns of nicknames to block, one per line"
 msgstr "Muster der zu blockierenden Benutzernamen, einer pro Zeile"
 
-#: blacklistadminpanel.php:182
 msgid "URLs"
 msgstr "URLs"
 
-#: blacklistadminpanel.php:184
 msgid "Patterns of URLs to block, one per line"
 msgstr "Muster der zu blockierenden URLS, eine pro Zeile"
 
-#: blacklistadminpanel.php:198
 msgid "Save"
 msgstr "Speichern"
 
-#: blacklistadminpanel.php:201
 msgid "Save site settings"
 msgstr "Website-Einstellungen speichern"
diff --git a/plugins/Blacklist/locale/es/LC_MESSAGES/Blacklist.po b/plugins/Blacklist/locale/es/LC_MESSAGES/Blacklist.po
index 33a8ddbe2f..6d9040a65f 100644
--- a/plugins/Blacklist/locale/es/LC_MESSAGES/Blacklist.po
+++ b/plugins/Blacklist/locale/es/LC_MESSAGES/Blacklist.po
@@ -10,124 +10,103 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Blacklist\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:22+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:54+0000\n"
 "Language-Team: Spanish <http://translatewiki.net/wiki/Portal:es>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:31+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:04+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-blacklist\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANS: Validation failure for URL. %s is the URL.
-#: BlacklistPlugin.php:149
 #, fuzzy, php-format
 msgid "You may not register with homepage \"%s\"."
 msgstr "No puedes registrarte con la página principal '%s'."
 
 #. TRANS: Validation failure for nickname. %s is the nickname.
-#: BlacklistPlugin.php:160
 #, fuzzy, php-format
 msgid "You may not register with nickname \"%s\"."
 msgstr "No puedes registrarte con el nombre de usuario '%s'."
 
 #. TRANS: Validation failure for URL. %s is the URL.
-#: BlacklistPlugin.php:185
 #, fuzzy, php-format
 msgid "You may not use homepage \"%s\"."
 msgstr "No puedes utilizar la página de inicio '%s'."
 
 #. TRANS: Validation failure for nickname. %s is the nickname.
-#: BlacklistPlugin.php:196
 #, fuzzy, php-format
 msgid "You may not use nickname \"%s\"."
 msgstr "No puedes utilizar el nombre de usuario '%s'."
 
 #. TRANS: Validation failure for URL. %s is the URL.
-#: BlacklistPlugin.php:239
 #, php-format
 msgid "You may not use URL \"%s\" in notices."
 msgstr "No puedes utilizar el URL \"%s\" en los mensajes."
 
-#: BlacklistPlugin.php:343
 msgid "Keeps a blacklist of forbidden nickname and URL patterns."
 msgstr ""
 "Mantiene una lista negra de patrones de nombres de usuario y URL prohibidos."
 
 #. TRANS: Menu item in admin panel.
-#: BlacklistPlugin.php:381
 #, fuzzy
 msgctxt "MENU"
 msgid "Blacklist"
 msgstr "Lista negra"
 
 #. TRANS: Tooltip for menu item in admin panel.
-#: BlacklistPlugin.php:383
 #, fuzzy
 msgctxt "TOOLTIP"
 msgid "Blacklist configuration"
 msgstr "Configuración de lista negra"
 
 #. TRANS: Checkbox with text label in the delete user form.
-#: BlacklistPlugin.php:410
 msgid "Add this nickname pattern to blacklist"
 msgstr "Añadir este patrón de nombre de usuario a la lista negra"
 
 #. TRANS: Checkbox with text label in the delete user form.
-#: BlacklistPlugin.php:420
 msgid "Add this homepage pattern to blacklist"
 msgstr "Añadir este patrón de página principal a la lista negra"
 
 #. TRANS: Exception thrown trying to post a notice while having set a blocked homepage URL. %s is the blocked URL.
 #. TRANS: Client exception thrown trying to subscribe to a person with a blocked homepage or site URL. %s is the blocked URL.
-#: BlacklistPlugin.php:499 BlacklistPlugin.php:534
 #, php-format
 msgid "Users from \"%s\" blocked."
 msgstr ""
 
 #. TRANS: Exception thrown trying to post a notice while having a blocked nickname. %s is the blocked nickname.
-#: BlacklistPlugin.php:510
 #, php-format
 msgid "Posts from nickname \"%s\" disallowed."
 msgstr ""
 
 #. TRANS: Client exception thrown trying to subscribe to a person with a blocked nickname. %s is the blocked nickname.
-#: BlacklistPlugin.php:545
 #, fuzzy, php-format
 msgid "Can't subscribe to nickname \"%s\"."
 msgstr "No puedes utilizar el nombre de usuario '%s'."
 
-#: blacklistadminpanel.php:52
 msgid "Blacklist"
 msgstr "Lista negra"
 
-#: blacklistadminpanel.php:62
 msgid "Blacklisted URLs and nicknames"
 msgstr "URL y nombres de usuario incluidos en la lista negra"
 
-#: blacklistadminpanel.php:174
 msgid "Nicknames"
 msgstr "Nombres de usuario"
 
-#: blacklistadminpanel.php:176
 msgid "Patterns of nicknames to block, one per line"
 msgstr "Patrones de nombres de usuario a bloquear, uno por línea"
 
-#: blacklistadminpanel.php:182
 msgid "URLs"
 msgstr "URLs"
 
-#: blacklistadminpanel.php:184
 msgid "Patterns of URLs to block, one per line"
 msgstr "Patrones de URL a bloquear, uno por línea"
 
-#: blacklistadminpanel.php:198
 msgid "Save"
 msgstr "Guardar"
 
-#: blacklistadminpanel.php:201
 msgid "Save site settings"
 msgstr "Guardar la configuración del sitio"
diff --git a/plugins/Blacklist/locale/fr/LC_MESSAGES/Blacklist.po b/plugins/Blacklist/locale/fr/LC_MESSAGES/Blacklist.po
index e133fc0320..91793efba2 100644
--- a/plugins/Blacklist/locale/fr/LC_MESSAGES/Blacklist.po
+++ b/plugins/Blacklist/locale/fr/LC_MESSAGES/Blacklist.po
@@ -10,121 +10,100 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Blacklist\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:22+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:54+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:31+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:04+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-blacklist\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. TRANS: Validation failure for URL. %s is the URL.
-#: BlacklistPlugin.php:149
 #, php-format
 msgid "You may not register with homepage \"%s\"."
 msgstr "Vous ne pouvez pas vous inscrire avec la page d’accueil « %s »."
 
 #. TRANS: Validation failure for nickname. %s is the nickname.
-#: BlacklistPlugin.php:160
 #, php-format
 msgid "You may not register with nickname \"%s\"."
 msgstr "Vous ne pouvez pas vous inscrire avec le pseudonyme « %s »."
 
 #. TRANS: Validation failure for URL. %s is the URL.
-#: BlacklistPlugin.php:185
 #, php-format
 msgid "You may not use homepage \"%s\"."
 msgstr "Vous ne pouvez pas utiliser la page d’accueil « %s »."
 
 #. TRANS: Validation failure for nickname. %s is the nickname.
-#: BlacklistPlugin.php:196
 #, php-format
 msgid "You may not use nickname \"%s\"."
 msgstr "Vous ne pouvez pas utiliser le pseudonyme « %s »."
 
 #. TRANS: Validation failure for URL. %s is the URL.
-#: BlacklistPlugin.php:239
 #, php-format
 msgid "You may not use URL \"%s\" in notices."
 msgstr "Vous ne pouvez pas utiliser l’URL « %s » dans les avis."
 
-#: BlacklistPlugin.php:343
 msgid "Keeps a blacklist of forbidden nickname and URL patterns."
 msgstr "Maintient une liste noire des pseudonymes et motifs d’URL interdits."
 
 #. TRANS: Menu item in admin panel.
-#: BlacklistPlugin.php:381
 msgctxt "MENU"
 msgid "Blacklist"
 msgstr "Liste noire"
 
 #. TRANS: Tooltip for menu item in admin panel.
-#: BlacklistPlugin.php:383
 msgctxt "TOOLTIP"
 msgid "Blacklist configuration"
 msgstr "Configuration de la liste noire"
 
 #. TRANS: Checkbox with text label in the delete user form.
-#: BlacklistPlugin.php:410
 msgid "Add this nickname pattern to blacklist"
 msgstr "Ajouter ce motif de pseudonymes à la liste noire"
 
 #. TRANS: Checkbox with text label in the delete user form.
-#: BlacklistPlugin.php:420
 msgid "Add this homepage pattern to blacklist"
 msgstr "Ajouter ce motif de pages d’accueil à la liste noire"
 
 #. TRANS: Exception thrown trying to post a notice while having set a blocked homepage URL. %s is the blocked URL.
 #. TRANS: Client exception thrown trying to subscribe to a person with a blocked homepage or site URL. %s is the blocked URL.
-#: BlacklistPlugin.php:499 BlacklistPlugin.php:534
 #, php-format
 msgid "Users from \"%s\" blocked."
 msgstr "Utilisateurs de « %s » bloqués."
 
 #. TRANS: Exception thrown trying to post a notice while having a blocked nickname. %s is the blocked nickname.
-#: BlacklistPlugin.php:510
 #, php-format
 msgid "Posts from nickname \"%s\" disallowed."
 msgstr "Messages de « %s » refusés."
 
 #. TRANS: Client exception thrown trying to subscribe to a person with a blocked nickname. %s is the blocked nickname.
-#: BlacklistPlugin.php:545
 #, php-format
 msgid "Can't subscribe to nickname \"%s\"."
 msgstr "Vous ne pouvez pas vous inscrire avec le pseudonyme « %s »."
 
-#: blacklistadminpanel.php:52
 msgid "Blacklist"
 msgstr "Liste noire"
 
-#: blacklistadminpanel.php:62
 msgid "Blacklisted URLs and nicknames"
 msgstr "Liste noire d’URL et de pseudonymes"
 
-#: blacklistadminpanel.php:174
 msgid "Nicknames"
 msgstr "Pseudonymes"
 
-#: blacklistadminpanel.php:176
 msgid "Patterns of nicknames to block, one per line"
 msgstr "Motifs de surnoms à bloquer, un par ligne"
 
-#: blacklistadminpanel.php:182
 msgid "URLs"
 msgstr "Adresses URL"
 
-#: blacklistadminpanel.php:184
 msgid "Patterns of URLs to block, one per line"
 msgstr "Motifs d’adresses URL à bloquer, un par ligne"
 
-#: blacklistadminpanel.php:198
 msgid "Save"
 msgstr "Sauvegarder"
 
-#: blacklistadminpanel.php:201
 msgid "Save site settings"
 msgstr "Sauvegarder les paramètres du site"
diff --git a/plugins/Blacklist/locale/ia/LC_MESSAGES/Blacklist.po b/plugins/Blacklist/locale/ia/LC_MESSAGES/Blacklist.po
index d25f6ab3d3..13acfb2adf 100644
--- a/plugins/Blacklist/locale/ia/LC_MESSAGES/Blacklist.po
+++ b/plugins/Blacklist/locale/ia/LC_MESSAGES/Blacklist.po
@@ -9,122 +9,101 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Blacklist\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:22+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:54+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:31+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:04+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-blacklist\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANS: Validation failure for URL. %s is the URL.
-#: BlacklistPlugin.php:149
 #, php-format
 msgid "You may not register with homepage \"%s\"."
 msgstr "Tu non pote registrar te con le pagina personal \"%s\"."
 
 #. TRANS: Validation failure for nickname. %s is the nickname.
-#: BlacklistPlugin.php:160
 #, php-format
 msgid "You may not register with nickname \"%s\"."
 msgstr "Tu non pote registrar te con le pseudonymo \"%s\"."
 
 #. TRANS: Validation failure for URL. %s is the URL.
-#: BlacklistPlugin.php:185
 #, php-format
 msgid "You may not use homepage \"%s\"."
 msgstr "Tu non pote usar le pagina personal \"%s\"."
 
 #. TRANS: Validation failure for nickname. %s is the nickname.
-#: BlacklistPlugin.php:196
 #, php-format
 msgid "You may not use nickname \"%s\"."
 msgstr "Tu non pote usar le pseudonymo \"%s\"."
 
 #. TRANS: Validation failure for URL. %s is the URL.
-#: BlacklistPlugin.php:239
 #, php-format
 msgid "You may not use URL \"%s\" in notices."
 msgstr "Tu non pote usar le URL \"%s\" in notas."
 
-#: BlacklistPlugin.php:343
 msgid "Keeps a blacklist of forbidden nickname and URL patterns."
 msgstr ""
 "Tene un lista nigre de pseudonymos e patronos de adresse URL prohibite."
 
 #. TRANS: Menu item in admin panel.
-#: BlacklistPlugin.php:381
 msgctxt "MENU"
 msgid "Blacklist"
 msgstr "Lista nigre"
 
 #. TRANS: Tooltip for menu item in admin panel.
-#: BlacklistPlugin.php:383
 msgctxt "TOOLTIP"
 msgid "Blacklist configuration"
 msgstr "Configuration del lista nigre"
 
 #. TRANS: Checkbox with text label in the delete user form.
-#: BlacklistPlugin.php:410
 msgid "Add this nickname pattern to blacklist"
 msgstr "Adder iste patrono de pseudonymo al lista nigre"
 
 #. TRANS: Checkbox with text label in the delete user form.
-#: BlacklistPlugin.php:420
 msgid "Add this homepage pattern to blacklist"
 msgstr "Adder iste patrono de pagina personal al lista nigre"
 
 #. TRANS: Exception thrown trying to post a notice while having set a blocked homepage URL. %s is the blocked URL.
 #. TRANS: Client exception thrown trying to subscribe to a person with a blocked homepage or site URL. %s is the blocked URL.
-#: BlacklistPlugin.php:499 BlacklistPlugin.php:534
 #, php-format
 msgid "Users from \"%s\" blocked."
 msgstr "Usatores de \"%s\" blocate."
 
 #. TRANS: Exception thrown trying to post a notice while having a blocked nickname. %s is the blocked nickname.
-#: BlacklistPlugin.php:510
 #, php-format
 msgid "Posts from nickname \"%s\" disallowed."
 msgstr "Notas del pseudonymo \"%s\" non permittite."
 
 #. TRANS: Client exception thrown trying to subscribe to a person with a blocked nickname. %s is the blocked nickname.
-#: BlacklistPlugin.php:545
 #, php-format
 msgid "Can't subscribe to nickname \"%s\"."
 msgstr "Non pote subscriber al pseudonymo \"%s\"."
 
-#: blacklistadminpanel.php:52
 msgid "Blacklist"
 msgstr "Lista nigre"
 
-#: blacklistadminpanel.php:62
 msgid "Blacklisted URLs and nicknames"
 msgstr "URLs e pseudonymos in lista nigre"
 
-#: blacklistadminpanel.php:174
 msgid "Nicknames"
 msgstr "Pseudonymos"
 
-#: blacklistadminpanel.php:176
 msgid "Patterns of nicknames to block, one per line"
 msgstr "Patronos de pseudonymos a blocar, un per linea"
 
-#: blacklistadminpanel.php:182
 msgid "URLs"
 msgstr "Adresses URL"
 
-#: blacklistadminpanel.php:184
 msgid "Patterns of URLs to block, one per line"
 msgstr "Patronos de adresses URL a blocar, un per linea"
 
-#: blacklistadminpanel.php:198
 msgid "Save"
 msgstr "Salveguardar"
 
-#: blacklistadminpanel.php:201
 msgid "Save site settings"
 msgstr "Salveguardar configurationes del sito"
diff --git a/plugins/Blacklist/locale/mk/LC_MESSAGES/Blacklist.po b/plugins/Blacklist/locale/mk/LC_MESSAGES/Blacklist.po
index 1d09847942..0ffea8aece 100644
--- a/plugins/Blacklist/locale/mk/LC_MESSAGES/Blacklist.po
+++ b/plugins/Blacklist/locale/mk/LC_MESSAGES/Blacklist.po
@@ -9,121 +9,100 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Blacklist\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:22+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:54+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:31+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:04+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-blacklist\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
 
 #. TRANS: Validation failure for URL. %s is the URL.
-#: BlacklistPlugin.php:149
 #, php-format
 msgid "You may not register with homepage \"%s\"."
 msgstr "Не можете да се регистрирате со домашната страница „%s“."
 
 #. TRANS: Validation failure for nickname. %s is the nickname.
-#: BlacklistPlugin.php:160
 #, php-format
 msgid "You may not register with nickname \"%s\"."
 msgstr "Не можете да се регистрирате со прекарот „%s“."
 
 #. TRANS: Validation failure for URL. %s is the URL.
-#: BlacklistPlugin.php:185
 #, php-format
 msgid "You may not use homepage \"%s\"."
 msgstr "Не можете да ја користите домашната страница „%s“."
 
 #. TRANS: Validation failure for nickname. %s is the nickname.
-#: BlacklistPlugin.php:196
 #, php-format
 msgid "You may not use nickname \"%s\"."
 msgstr "Не можете да го користите прекарот „%s“."
 
 #. TRANS: Validation failure for URL. %s is the URL.
-#: BlacklistPlugin.php:239
 #, php-format
 msgid "You may not use URL \"%s\" in notices."
 msgstr "Не можете да ја користите URL-адресата „%s“ во забелешки."
 
-#: BlacklistPlugin.php:343
 msgid "Keeps a blacklist of forbidden nickname and URL patterns."
 msgstr "Води црн список на забранети видови на прекари и URL-адреси."
 
 #. TRANS: Menu item in admin panel.
-#: BlacklistPlugin.php:381
 msgctxt "MENU"
 msgid "Blacklist"
 msgstr "Црн список"
 
 #. TRANS: Tooltip for menu item in admin panel.
-#: BlacklistPlugin.php:383
 msgctxt "TOOLTIP"
 msgid "Blacklist configuration"
 msgstr "Поставки за црниот список"
 
 #. TRANS: Checkbox with text label in the delete user form.
-#: BlacklistPlugin.php:410
 msgid "Add this nickname pattern to blacklist"
 msgstr "Додај го овој вид прекар во црниот список"
 
 #. TRANS: Checkbox with text label in the delete user form.
-#: BlacklistPlugin.php:420
 msgid "Add this homepage pattern to blacklist"
 msgstr "Додај го овој вид домашна страница  во црниот список"
 
 #. TRANS: Exception thrown trying to post a notice while having set a blocked homepage URL. %s is the blocked URL.
 #. TRANS: Client exception thrown trying to subscribe to a person with a blocked homepage or site URL. %s is the blocked URL.
-#: BlacklistPlugin.php:499 BlacklistPlugin.php:534
 #, php-format
 msgid "Users from \"%s\" blocked."
 msgstr "Корисниците од „%s“ се блокирани."
 
 #. TRANS: Exception thrown trying to post a notice while having a blocked nickname. %s is the blocked nickname.
-#: BlacklistPlugin.php:510
 #, php-format
 msgid "Posts from nickname \"%s\" disallowed."
 msgstr "Објавите од прекарот „%s“ не се дозволени."
 
 #. TRANS: Client exception thrown trying to subscribe to a person with a blocked nickname. %s is the blocked nickname.
-#: BlacklistPlugin.php:545
 #, php-format
 msgid "Can't subscribe to nickname \"%s\"."
 msgstr "Не можете да се претплатите на прекарот „%s“."
 
-#: blacklistadminpanel.php:52
 msgid "Blacklist"
 msgstr "Црн список"
 
-#: blacklistadminpanel.php:62
 msgid "Blacklisted URLs and nicknames"
 msgstr "URL-адреси и прекари на црниот список"
 
-#: blacklistadminpanel.php:174
 msgid "Nicknames"
 msgstr "Прекари"
 
-#: blacklistadminpanel.php:176
 msgid "Patterns of nicknames to block, one per line"
 msgstr "Видови прекари за блокирање, по еден во секој ред"
 
-#: blacklistadminpanel.php:182
 msgid "URLs"
 msgstr "URL-адреси"
 
-#: blacklistadminpanel.php:184
 msgid "Patterns of URLs to block, one per line"
 msgstr "Видови URL-адреси за блокирање, по една во секој ред"
 
-#: blacklistadminpanel.php:198
 msgid "Save"
 msgstr "Зачувај"
 
-#: blacklistadminpanel.php:201
 msgid "Save site settings"
 msgstr "Зачувај поставки на мреж. место"
diff --git a/plugins/Blacklist/locale/nl/LC_MESSAGES/Blacklist.po b/plugins/Blacklist/locale/nl/LC_MESSAGES/Blacklist.po
index af65981334..f63c9c67de 100644
--- a/plugins/Blacklist/locale/nl/LC_MESSAGES/Blacklist.po
+++ b/plugins/Blacklist/locale/nl/LC_MESSAGES/Blacklist.po
@@ -9,121 +9,100 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Blacklist\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:22+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:54+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:31+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:04+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-blacklist\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANS: Validation failure for URL. %s is the URL.
-#: BlacklistPlugin.php:149
 #, php-format
 msgid "You may not register with homepage \"%s\"."
 msgstr "U kunt niet registreren met \"%s\" als homepage."
 
 #. TRANS: Validation failure for nickname. %s is the nickname.
-#: BlacklistPlugin.php:160
 #, php-format
 msgid "You may not register with nickname \"%s\"."
 msgstr "U kunt niet registreren met \"%s\" als gebruikersnaam."
 
 #. TRANS: Validation failure for URL. %s is the URL.
-#: BlacklistPlugin.php:185
 #, php-format
 msgid "You may not use homepage \"%s\"."
 msgstr "U mag \"%s\" niet als homepage instellen."
 
 #. TRANS: Validation failure for nickname. %s is the nickname.
-#: BlacklistPlugin.php:196
 #, php-format
 msgid "You may not use nickname \"%s\"."
 msgstr "U mag \"%s\" niet als gebruikersnaam gebruiken."
 
 #. TRANS: Validation failure for URL. %s is the URL.
-#: BlacklistPlugin.php:239
 #, php-format
 msgid "You may not use URL \"%s\" in notices."
 msgstr "U mag de URL \"%s\" niet gebruiken in mededelingen."
 
-#: BlacklistPlugin.php:343
 msgid "Keeps a blacklist of forbidden nickname and URL patterns."
 msgstr "Houdt een lijst bij van verboden gebruikersnamen en URL-patronen."
 
 #. TRANS: Menu item in admin panel.
-#: BlacklistPlugin.php:381
 msgctxt "MENU"
 msgid "Blacklist"
 msgstr "Zwarte lijst"
 
 #. TRANS: Tooltip for menu item in admin panel.
-#: BlacklistPlugin.php:383
 msgctxt "TOOLTIP"
 msgid "Blacklist configuration"
 msgstr "Instellingen voor zwarte lijst"
 
 #. TRANS: Checkbox with text label in the delete user form.
-#: BlacklistPlugin.php:410
 msgid "Add this nickname pattern to blacklist"
 msgstr "Dit gebruikersnaampatroon aan de zwarte lijst toevoegen"
 
 #. TRANS: Checkbox with text label in the delete user form.
-#: BlacklistPlugin.php:420
 msgid "Add this homepage pattern to blacklist"
 msgstr "Dit homepagepatroon aan de zwarte lijst toevoegen"
 
 #. TRANS: Exception thrown trying to post a notice while having set a blocked homepage URL. %s is the blocked URL.
 #. TRANS: Client exception thrown trying to subscribe to a person with a blocked homepage or site URL. %s is the blocked URL.
-#: BlacklistPlugin.php:499 BlacklistPlugin.php:534
 #, php-format
 msgid "Users from \"%s\" blocked."
 msgstr "Gebruikers van \"%s\" zijn geblokkeerd."
 
 #. TRANS: Exception thrown trying to post a notice while having a blocked nickname. %s is the blocked nickname.
-#: BlacklistPlugin.php:510
 #, php-format
 msgid "Posts from nickname \"%s\" disallowed."
 msgstr "Gebruiker \"%s\" mag geen berichten plaatsen."
 
 #. TRANS: Client exception thrown trying to subscribe to a person with a blocked nickname. %s is the blocked nickname.
-#: BlacklistPlugin.php:545
 #, php-format
 msgid "Can't subscribe to nickname \"%s\"."
 msgstr "U kunt niet abonneren op de gebruiker \"%s\"."
 
-#: blacklistadminpanel.php:52
 msgid "Blacklist"
 msgstr "Zwarte lijst"
 
-#: blacklistadminpanel.php:62
 msgid "Blacklisted URLs and nicknames"
 msgstr "URL's en gebruikersnamen die op de zwarte lijst staan"
 
-#: blacklistadminpanel.php:174
 msgid "Nicknames"
 msgstr "Gebruikersnamen"
 
-#: blacklistadminpanel.php:176
 msgid "Patterns of nicknames to block, one per line"
 msgstr "Patronen van te blokkeren gebruikersnamen. Eén per regel."
 
-#: blacklistadminpanel.php:182
 msgid "URLs"
 msgstr "URL's"
 
-#: blacklistadminpanel.php:184
 msgid "Patterns of URLs to block, one per line"
 msgstr "Patronen van te blokkeren URL's. Eén per regel."
 
-#: blacklistadminpanel.php:198
 msgid "Save"
 msgstr "Opslaan"
 
-#: blacklistadminpanel.php:201
 msgid "Save site settings"
 msgstr "Websiteinstellingen opslaan"
diff --git a/plugins/Blacklist/locale/ru/LC_MESSAGES/Blacklist.po b/plugins/Blacklist/locale/ru/LC_MESSAGES/Blacklist.po
index 16acf45dd6..cb145266be 100644
--- a/plugins/Blacklist/locale/ru/LC_MESSAGES/Blacklist.po
+++ b/plugins/Blacklist/locale/ru/LC_MESSAGES/Blacklist.po
@@ -10,13 +10,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Blacklist\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:23+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:54+0000\n"
 "Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:31+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:04+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-blacklist\n"
@@ -24,109 +24,88 @@ msgstr ""
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
 #. TRANS: Validation failure for URL. %s is the URL.
-#: BlacklistPlugin.php:149
 #, php-format
 msgid "You may not register with homepage \"%s\"."
 msgstr "Вы не можете зарегистрироваться с домашней страницей «%s»."
 
 #. TRANS: Validation failure for nickname. %s is the nickname.
-#: BlacklistPlugin.php:160
 #, php-format
 msgid "You may not register with nickname \"%s\"."
 msgstr "Вы не можете зарегистрироваться с именем «%s»."
 
 #. TRANS: Validation failure for URL. %s is the URL.
-#: BlacklistPlugin.php:185
 #, php-format
 msgid "You may not use homepage \"%s\"."
 msgstr "Вы не можете использовать «%s» в качестве домашней страницы."
 
 #. TRANS: Validation failure for nickname. %s is the nickname.
-#: BlacklistPlugin.php:196
 #, php-format
 msgid "You may not use nickname \"%s\"."
 msgstr "Вы не можете использовать «%s» в качестве имени учётной записи."
 
 #. TRANS: Validation failure for URL. %s is the URL.
-#: BlacklistPlugin.php:239
 #, php-format
 msgid "You may not use URL \"%s\" in notices."
 msgstr "Вы не можете использовать URL-адрес «%s» в записях."
 
-#: BlacklistPlugin.php:343
 msgid "Keeps a blacklist of forbidden nickname and URL patterns."
 msgstr ""
 "Позволяет хранить чёрный список шаблонов имён пользователей и URL-адресов."
 
 #. TRANS: Menu item in admin panel.
-#: BlacklistPlugin.php:381
 msgctxt "MENU"
 msgid "Blacklist"
 msgstr "Чёрный список"
 
 #. TRANS: Tooltip for menu item in admin panel.
-#: BlacklistPlugin.php:383
 msgctxt "TOOLTIP"
 msgid "Blacklist configuration"
 msgstr "Конфигурация чёрного списка"
 
 #. TRANS: Checkbox with text label in the delete user form.
-#: BlacklistPlugin.php:410
 msgid "Add this nickname pattern to blacklist"
 msgstr "Добавить этот никнейм в чёрный список"
 
 #. TRANS: Checkbox with text label in the delete user form.
-#: BlacklistPlugin.php:420
 msgid "Add this homepage pattern to blacklist"
 msgstr "Добавить эту домашнюю страницу в чёрный список"
 
 #. TRANS: Exception thrown trying to post a notice while having set a blocked homepage URL. %s is the blocked URL.
 #. TRANS: Client exception thrown trying to subscribe to a person with a blocked homepage or site URL. %s is the blocked URL.
-#: BlacklistPlugin.php:499 BlacklistPlugin.php:534
 #, php-format
 msgid "Users from \"%s\" blocked."
 msgstr "Пользователи с «%s» заблокированы."
 
 #. TRANS: Exception thrown trying to post a notice while having a blocked nickname. %s is the blocked nickname.
-#: BlacklistPlugin.php:510
 #, php-format
 msgid "Posts from nickname \"%s\" disallowed."
 msgstr "Сообщения от имени «%s» не допускаются."
 
 #. TRANS: Client exception thrown trying to subscribe to a person with a blocked nickname. %s is the blocked nickname.
-#: BlacklistPlugin.php:545
 #, php-format
 msgid "Can't subscribe to nickname \"%s\"."
 msgstr "Нельзя подписаться на пользователя с именем «%s»."
 
-#: blacklistadminpanel.php:52
 msgid "Blacklist"
 msgstr "Чёрный список"
 
-#: blacklistadminpanel.php:62
 msgid "Blacklisted URLs and nicknames"
 msgstr "URL-адреса и имена пользователей в чёрном списке"
 
-#: blacklistadminpanel.php:174
 msgid "Nicknames"
 msgstr "Имена пользователей"
 
-#: blacklistadminpanel.php:176
 msgid "Patterns of nicknames to block, one per line"
 msgstr "Шаблоны имён пользователей для блокировки, по одному на строку"
 
-#: blacklistadminpanel.php:182
 msgid "URLs"
 msgstr "URL-адреса"
 
-#: blacklistadminpanel.php:184
 msgid "Patterns of URLs to block, one per line"
 msgstr "Шаблоны URL-адресов для блокировки, по одному на строку"
 
-#: blacklistadminpanel.php:198
 msgid "Save"
 msgstr "Сохранить"
 
-#: blacklistadminpanel.php:201
 msgid "Save site settings"
 msgstr "Сохранить настройки сайта"
diff --git a/plugins/Blacklist/locale/uk/LC_MESSAGES/Blacklist.po b/plugins/Blacklist/locale/uk/LC_MESSAGES/Blacklist.po
index 0e44648587..23f1d82290 100644
--- a/plugins/Blacklist/locale/uk/LC_MESSAGES/Blacklist.po
+++ b/plugins/Blacklist/locale/uk/LC_MESSAGES/Blacklist.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Blacklist\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:23+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:54+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:31+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:04+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-blacklist\n"
@@ -23,108 +23,87 @@ msgstr ""
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
 #. TRANS: Validation failure for URL. %s is the URL.
-#: BlacklistPlugin.php:149
 #, php-format
 msgid "You may not register with homepage \"%s\"."
 msgstr "Ви не можете зареєструватися, вказавши «%s» як веб-адресу."
 
 #. TRANS: Validation failure for nickname. %s is the nickname.
-#: BlacklistPlugin.php:160
 #, php-format
 msgid "You may not register with nickname \"%s\"."
 msgstr "Ви не можете зареєструватися, використавши нікнейм «%s»."
 
 #. TRANS: Validation failure for URL. %s is the URL.
-#: BlacklistPlugin.php:185
 #, php-format
 msgid "You may not use homepage \"%s\"."
 msgstr "Ви не можете використовувати веб-адресу «%s»."
 
 #. TRANS: Validation failure for nickname. %s is the nickname.
-#: BlacklistPlugin.php:196
 #, php-format
 msgid "You may not use nickname \"%s\"."
 msgstr "Ви не можете використовувати нікнейм «%s»."
 
 #. TRANS: Validation failure for URL. %s is the URL.
-#: BlacklistPlugin.php:239
 #, php-format
 msgid "You may not use URL \"%s\" in notices."
 msgstr "Ви не можете використовувати URL-адресу «%s» в своїх повідомленнях."
 
-#: BlacklistPlugin.php:343
 msgid "Keeps a blacklist of forbidden nickname and URL patterns."
 msgstr "Зберігає чорний список заборонених нікнеймів та URL-шаблонів."
 
 #. TRANS: Menu item in admin panel.
-#: BlacklistPlugin.php:381
 msgctxt "MENU"
 msgid "Blacklist"
 msgstr "Чорний список"
 
 #. TRANS: Tooltip for menu item in admin panel.
-#: BlacklistPlugin.php:383
 msgctxt "TOOLTIP"
 msgid "Blacklist configuration"
 msgstr "Конфігурація чорного списку"
 
 #. TRANS: Checkbox with text label in the delete user form.
-#: BlacklistPlugin.php:410
 msgid "Add this nickname pattern to blacklist"
 msgstr "Додати цей нікнейм до чорного списку"
 
 #. TRANS: Checkbox with text label in the delete user form.
-#: BlacklistPlugin.php:420
 msgid "Add this homepage pattern to blacklist"
 msgstr "Додати цей шаблон веб-адреси до чорного списку"
 
 #. TRANS: Exception thrown trying to post a notice while having set a blocked homepage URL. %s is the blocked URL.
 #. TRANS: Client exception thrown trying to subscribe to a person with a blocked homepage or site URL. %s is the blocked URL.
-#: BlacklistPlugin.php:499 BlacklistPlugin.php:534
 #, php-format
 msgid "Users from \"%s\" blocked."
 msgstr "Користувачів з «%s» заблоковано."
 
 #. TRANS: Exception thrown trying to post a notice while having a blocked nickname. %s is the blocked nickname.
-#: BlacklistPlugin.php:510
 #, php-format
 msgid "Posts from nickname \"%s\" disallowed."
 msgstr "Дописи від користувача «%s» заборонені."
 
 #. TRANS: Client exception thrown trying to subscribe to a person with a blocked nickname. %s is the blocked nickname.
-#: BlacklistPlugin.php:545
 #, php-format
 msgid "Can't subscribe to nickname \"%s\"."
 msgstr "Не можу підписатися до користувача «%s»."
 
-#: blacklistadminpanel.php:52
 msgid "Blacklist"
 msgstr "Чорний список"
 
-#: blacklistadminpanel.php:62
 msgid "Blacklisted URLs and nicknames"
 msgstr "URL-адреси і нікнеми, що містяться в чорному списку"
 
-#: blacklistadminpanel.php:174
 msgid "Nicknames"
 msgstr "Нікнейми"
 
-#: blacklistadminpanel.php:176
 msgid "Patterns of nicknames to block, one per line"
 msgstr "Шаблони нікнеймів, котрі будуть блокуватися (по одному на рядок)"
 
-#: blacklistadminpanel.php:182
 msgid "URLs"
 msgstr "URL-адреси"
 
-#: blacklistadminpanel.php:184
 msgid "Patterns of URLs to block, one per line"
 msgstr "Шаблони URL-адрес, котрі будуть блокуватися (по одному на рядок)"
 
-#: blacklistadminpanel.php:198
 msgid "Save"
 msgstr "Зберегти"
 
-#: blacklistadminpanel.php:201
 msgid "Save site settings"
 msgstr "Зберегти налаштування сайту"
diff --git a/plugins/Blacklist/locale/zh_CN/LC_MESSAGES/Blacklist.po b/plugins/Blacklist/locale/zh_CN/LC_MESSAGES/Blacklist.po
index dd07dc7d2a..9c21a6032c 100644
--- a/plugins/Blacklist/locale/zh_CN/LC_MESSAGES/Blacklist.po
+++ b/plugins/Blacklist/locale/zh_CN/LC_MESSAGES/Blacklist.po
@@ -10,122 +10,101 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Blacklist\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:23+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:54+0000\n"
 "Language-Team: Simplified Chinese <http://translatewiki.net/wiki/Portal:zh-"
 "hans>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:31+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:04+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-blacklist\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. TRANS: Validation failure for URL. %s is the URL.
-#: BlacklistPlugin.php:149
 #, php-format
 msgid "You may not register with homepage \"%s\"."
 msgstr "您不可以注册与主页\"%s\"。"
 
 #. TRANS: Validation failure for nickname. %s is the nickname.
-#: BlacklistPlugin.php:160
 #, php-format
 msgid "You may not register with nickname \"%s\"."
 msgstr "您不可以注册绰号\"%s\"。"
 
 #. TRANS: Validation failure for URL. %s is the URL.
-#: BlacklistPlugin.php:185
 #, php-format
 msgid "You may not use homepage \"%s\"."
 msgstr "您不可以使用 \"%s\" 当主页。"
 
 #. TRANS: Validation failure for nickname. %s is the nickname.
-#: BlacklistPlugin.php:196
 #, php-format
 msgid "You may not use nickname \"%s\"."
 msgstr "您不可以使用 \"%s\" 的昵称。"
 
 #. TRANS: Validation failure for URL. %s is the URL.
-#: BlacklistPlugin.php:239
 #, php-format
 msgid "You may not use URL \"%s\" in notices."
 msgstr "你不能在提醒中使用URL '%s'。"
 
-#: BlacklistPlugin.php:343
 msgid "Keeps a blacklist of forbidden nickname and URL patterns."
 msgstr "为被禁止的昵称和URL模板创建黑名单。"
 
 #. TRANS: Menu item in admin panel.
-#: BlacklistPlugin.php:381
 msgctxt "MENU"
 msgid "Blacklist"
 msgstr "黑名单"
 
 #. TRANS: Tooltip for menu item in admin panel.
-#: BlacklistPlugin.php:383
 msgctxt "TOOLTIP"
 msgid "Blacklist configuration"
 msgstr "黑名单配置"
 
 #. TRANS: Checkbox with text label in the delete user form.
-#: BlacklistPlugin.php:410
 msgid "Add this nickname pattern to blacklist"
 msgstr "向黑名单添加此昵称规则"
 
 #. TRANS: Checkbox with text label in the delete user form.
-#: BlacklistPlugin.php:420
 msgid "Add this homepage pattern to blacklist"
 msgstr "向黑名单添加此主页规则"
 
 #. TRANS: Exception thrown trying to post a notice while having set a blocked homepage URL. %s is the blocked URL.
 #. TRANS: Client exception thrown trying to subscribe to a person with a blocked homepage or site URL. %s is the blocked URL.
-#: BlacklistPlugin.php:499 BlacklistPlugin.php:534
 #, php-format
 msgid "Users from \"%s\" blocked."
 msgstr ""
 
 #. TRANS: Exception thrown trying to post a notice while having a blocked nickname. %s is the blocked nickname.
-#: BlacklistPlugin.php:510
 #, php-format
 msgid "Posts from nickname \"%s\" disallowed."
 msgstr ""
 
 #. TRANS: Client exception thrown trying to subscribe to a person with a blocked nickname. %s is the blocked nickname.
-#: BlacklistPlugin.php:545
 #, php-format
 msgid "Can't subscribe to nickname \"%s\"."
 msgstr "昵称\"%s\"无法订阅。"
 
-#: blacklistadminpanel.php:52
 msgid "Blacklist"
 msgstr "黑名单"
 
-#: blacklistadminpanel.php:62
 msgid "Blacklisted URLs and nicknames"
 msgstr "黑名单中的URL和昵称"
 
-#: blacklistadminpanel.php:174
 msgid "Nicknames"
 msgstr "昵称"
 
-#: blacklistadminpanel.php:176
 msgid "Patterns of nicknames to block, one per line"
 msgstr "禁止的昵称规则，每行一个"
 
-#: blacklistadminpanel.php:182
 msgid "URLs"
 msgstr "URL"
 
-#: blacklistadminpanel.php:184
 msgid "Patterns of URLs to block, one per line"
 msgstr "禁止的URL规则，每行一个"
 
-#: blacklistadminpanel.php:198
 msgid "Save"
 msgstr "保存"
 
-#: blacklistadminpanel.php:201
 msgid "Save site settings"
 msgstr "保存网站设置"
diff --git a/plugins/BlankAd/locale/BlankAd.pot b/plugins/BlankAd/locale/BlankAd.pot
index 843516d224..341a36ad88 100644
--- a/plugins/BlankAd/locale/BlankAd.pot
+++ b/plugins/BlankAd/locale/BlankAd.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/BlankAd/locale/be-tarask/LC_MESSAGES/BlankAd.po b/plugins/BlankAd/locale/be-tarask/LC_MESSAGES/BlankAd.po
index be70530da1..e87559a568 100644
--- a/plugins/BlankAd/locale/be-tarask/LC_MESSAGES/BlankAd.po
+++ b/plugins/BlankAd/locale/be-tarask/LC_MESSAGES/BlankAd.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BlankAd\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:23+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:54+0000\n"
 "Language-Team: Belarusian (Taraškievica orthography) <http://translatewiki."
 "net/wiki/Portal:be-tarask>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:32+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:05+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: be-tarask\n"
 "X-Message-Group: #out-statusnet-plugin-blankad\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: BlankAdPlugin.php:127
 msgid "Plugin for testing ad layout."
 msgstr "Дапаўненьне для праверкі рэклямных модуляў."
diff --git a/plugins/BlankAd/locale/br/LC_MESSAGES/BlankAd.po b/plugins/BlankAd/locale/br/LC_MESSAGES/BlankAd.po
index c09dd53471..d14514364a 100644
--- a/plugins/BlankAd/locale/br/LC_MESSAGES/BlankAd.po
+++ b/plugins/BlankAd/locale/br/LC_MESSAGES/BlankAd.po
@@ -9,18 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BlankAd\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:23+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:54+0000\n"
 "Language-Team: Breton <http://translatewiki.net/wiki/Portal:br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:32+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:05+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-blankad\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: BlankAdPlugin.php:127
 msgid "Plugin for testing ad layout."
 msgstr "Astenn da arnodiñ doare pajennaozañ ar bruderezh."
diff --git a/plugins/BlankAd/locale/de/LC_MESSAGES/BlankAd.po b/plugins/BlankAd/locale/de/LC_MESSAGES/BlankAd.po
index 6300b1fa2a..9bd3ca3e55 100644
--- a/plugins/BlankAd/locale/de/LC_MESSAGES/BlankAd.po
+++ b/plugins/BlankAd/locale/de/LC_MESSAGES/BlankAd.po
@@ -9,18 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BlankAd\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:23+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:54+0000\n"
 "Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:32+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:05+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-blankad\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: BlankAdPlugin.php:127
 msgid "Plugin for testing ad layout."
 msgstr "Plugin zum Testen von Werbungs-Layout."
diff --git a/plugins/BlankAd/locale/es/LC_MESSAGES/BlankAd.po b/plugins/BlankAd/locale/es/LC_MESSAGES/BlankAd.po
index ad69d2ba82..7877b5b0a4 100644
--- a/plugins/BlankAd/locale/es/LC_MESSAGES/BlankAd.po
+++ b/plugins/BlankAd/locale/es/LC_MESSAGES/BlankAd.po
@@ -9,18 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BlankAd\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:23+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:54+0000\n"
 "Language-Team: Spanish <http://translatewiki.net/wiki/Portal:es>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:32+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:05+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-blankad\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: BlankAdPlugin.php:127
 msgid "Plugin for testing ad layout."
 msgstr "Extensión para la probar la maquetación de publicidad."
diff --git a/plugins/BlankAd/locale/fr/LC_MESSAGES/BlankAd.po b/plugins/BlankAd/locale/fr/LC_MESSAGES/BlankAd.po
index 48cacac4d5..9f5e2a4ee2 100644
--- a/plugins/BlankAd/locale/fr/LC_MESSAGES/BlankAd.po
+++ b/plugins/BlankAd/locale/fr/LC_MESSAGES/BlankAd.po
@@ -9,18 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BlankAd\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:23+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:54+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:32+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:05+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-blankad\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: BlankAdPlugin.php:127
 msgid "Plugin for testing ad layout."
 msgstr "Extension pour tester la mise en forme des publicités."
diff --git a/plugins/BlankAd/locale/he/LC_MESSAGES/BlankAd.po b/plugins/BlankAd/locale/he/LC_MESSAGES/BlankAd.po
index e69d753211..95583b81ee 100644
--- a/plugins/BlankAd/locale/he/LC_MESSAGES/BlankAd.po
+++ b/plugins/BlankAd/locale/he/LC_MESSAGES/BlankAd.po
@@ -9,18 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BlankAd\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:23+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:54+0000\n"
 "Language-Team: Hebrew <http://translatewiki.net/wiki/Portal:he>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:32+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:05+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-plugin-blankad\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: BlankAdPlugin.php:127
 msgid "Plugin for testing ad layout."
 msgstr "תוסף לבדיקת פריסת הפרסומות."
diff --git a/plugins/BlankAd/locale/ia/LC_MESSAGES/BlankAd.po b/plugins/BlankAd/locale/ia/LC_MESSAGES/BlankAd.po
index ea42bb1501..a5b20bbe5b 100644
--- a/plugins/BlankAd/locale/ia/LC_MESSAGES/BlankAd.po
+++ b/plugins/BlankAd/locale/ia/LC_MESSAGES/BlankAd.po
@@ -9,18 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BlankAd\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:23+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:55+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:32+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:05+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-blankad\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: BlankAdPlugin.php:127
 msgid "Plugin for testing ad layout."
 msgstr "Plug-in pro essayar le lay-out de annuncios."
diff --git a/plugins/BlankAd/locale/mk/LC_MESSAGES/BlankAd.po b/plugins/BlankAd/locale/mk/LC_MESSAGES/BlankAd.po
index 2eb63b3ae6..34c47bca4d 100644
--- a/plugins/BlankAd/locale/mk/LC_MESSAGES/BlankAd.po
+++ b/plugins/BlankAd/locale/mk/LC_MESSAGES/BlankAd.po
@@ -9,18 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BlankAd\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:23+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:55+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:32+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:05+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-blankad\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
 
-#: BlankAdPlugin.php:127
 msgid "Plugin for testing ad layout."
 msgstr "Приклучок за испробување на распоредот на рекламите."
diff --git a/plugins/BlankAd/locale/nb/LC_MESSAGES/BlankAd.po b/plugins/BlankAd/locale/nb/LC_MESSAGES/BlankAd.po
index ff51d3f516..dd3545b58d 100644
--- a/plugins/BlankAd/locale/nb/LC_MESSAGES/BlankAd.po
+++ b/plugins/BlankAd/locale/nb/LC_MESSAGES/BlankAd.po
@@ -9,18 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BlankAd\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:23+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:55+0000\n"
 "Language-Team: Norwegian (bokmål)‬ <http://translatewiki.net/wiki/Portal:no>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:32+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:05+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: #out-statusnet-plugin-blankad\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: BlankAdPlugin.php:127
 msgid "Plugin for testing ad layout."
 msgstr "Utvidelse for å teste annonseplasseringer."
diff --git a/plugins/BlankAd/locale/nl/LC_MESSAGES/BlankAd.po b/plugins/BlankAd/locale/nl/LC_MESSAGES/BlankAd.po
index 886327a333..9f09bc068a 100644
--- a/plugins/BlankAd/locale/nl/LC_MESSAGES/BlankAd.po
+++ b/plugins/BlankAd/locale/nl/LC_MESSAGES/BlankAd.po
@@ -9,18 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BlankAd\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:23+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:55+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:32+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:05+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-blankad\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: BlankAdPlugin.php:127
 msgid "Plugin for testing ad layout."
 msgstr "Plug-in voor het testen van advertentielay-outs."
diff --git a/plugins/BlankAd/locale/pt/LC_MESSAGES/BlankAd.po b/plugins/BlankAd/locale/pt/LC_MESSAGES/BlankAd.po
index 438aacbad8..a1e7c670ac 100644
--- a/plugins/BlankAd/locale/pt/LC_MESSAGES/BlankAd.po
+++ b/plugins/BlankAd/locale/pt/LC_MESSAGES/BlankAd.po
@@ -9,18 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BlankAd\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:23+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:55+0000\n"
 "Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:32+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:05+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-plugin-blankad\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: BlankAdPlugin.php:127
 msgid "Plugin for testing ad layout."
 msgstr "Plugin para testar a disposição de anúncios."
diff --git a/plugins/BlankAd/locale/ru/LC_MESSAGES/BlankAd.po b/plugins/BlankAd/locale/ru/LC_MESSAGES/BlankAd.po
index 384acb20d3..c0fec84af2 100644
--- a/plugins/BlankAd/locale/ru/LC_MESSAGES/BlankAd.po
+++ b/plugins/BlankAd/locale/ru/LC_MESSAGES/BlankAd.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BlankAd\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:23+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:55+0000\n"
 "Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:32+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:05+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-blankad\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: BlankAdPlugin.php:127
 msgid "Plugin for testing ad layout."
 msgstr "Плагин для тестирования рекламных модулей."
diff --git a/plugins/BlankAd/locale/tl/LC_MESSAGES/BlankAd.po b/plugins/BlankAd/locale/tl/LC_MESSAGES/BlankAd.po
index 990004a659..eec342fc56 100644
--- a/plugins/BlankAd/locale/tl/LC_MESSAGES/BlankAd.po
+++ b/plugins/BlankAd/locale/tl/LC_MESSAGES/BlankAd.po
@@ -9,18 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BlankAd\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:23+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:55+0000\n"
 "Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:32+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:05+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-blankad\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: BlankAdPlugin.php:127
 msgid "Plugin for testing ad layout."
 msgstr "Pamasak para sa pagsubok ng pagkakalatag ng anunsyo."
diff --git a/plugins/BlankAd/locale/uk/LC_MESSAGES/BlankAd.po b/plugins/BlankAd/locale/uk/LC_MESSAGES/BlankAd.po
index 1c657fc02c..563f432c17 100644
--- a/plugins/BlankAd/locale/uk/LC_MESSAGES/BlankAd.po
+++ b/plugins/BlankAd/locale/uk/LC_MESSAGES/BlankAd.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BlankAd\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:23+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:55+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:32+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:05+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-blankad\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: BlankAdPlugin.php:127
 msgid "Plugin for testing ad layout."
 msgstr "Додаток для тестування рекламної схеми."
diff --git a/plugins/BlankAd/locale/zh_CN/LC_MESSAGES/BlankAd.po b/plugins/BlankAd/locale/zh_CN/LC_MESSAGES/BlankAd.po
index b07ce716e8..1ea1fccf4c 100644
--- a/plugins/BlankAd/locale/zh_CN/LC_MESSAGES/BlankAd.po
+++ b/plugins/BlankAd/locale/zh_CN/LC_MESSAGES/BlankAd.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BlankAd\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:23+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:55+0000\n"
 "Language-Team: Simplified Chinese <http://translatewiki.net/wiki/Portal:zh-"
 "hans>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:32+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:05+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-blankad\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: BlankAdPlugin.php:127
 msgid "Plugin for testing ad layout."
 msgstr "测试广告（ad）布局的插件。"
diff --git a/plugins/BlogspamNet/locale/BlogspamNet.pot b/plugins/BlogspamNet/locale/BlogspamNet.pot
index 382247613a..e2642b77b6 100644
--- a/plugins/BlogspamNet/locale/BlogspamNet.pot
+++ b/plugins/BlogspamNet/locale/BlogspamNet.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/BlogspamNet/locale/be-tarask/LC_MESSAGES/BlogspamNet.po b/plugins/BlogspamNet/locale/be-tarask/LC_MESSAGES/BlogspamNet.po
index 2b90a5e4cc..568813396b 100644
--- a/plugins/BlogspamNet/locale/be-tarask/LC_MESSAGES/BlogspamNet.po
+++ b/plugins/BlogspamNet/locale/be-tarask/LC_MESSAGES/BlogspamNet.po
@@ -9,20 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BlogspamNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:24+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:55+0000\n"
 "Language-Team: Belarusian (Taraškievica orthography) <http://translatewiki."
 "net/wiki/Portal:be-tarask>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:33+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:06+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: be-tarask\n"
 "X-Message-Group: #out-statusnet-plugin-blogspamnet\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: BlogspamNetPlugin.php:152
 msgid "Plugin to check submitted notices with blogspam.net."
 msgstr ""
 "Дапаўненьне для праверкі дасланых абвяшчэньняў з дапамогай blogspam.net."
diff --git a/plugins/BlogspamNet/locale/br/LC_MESSAGES/BlogspamNet.po b/plugins/BlogspamNet/locale/br/LC_MESSAGES/BlogspamNet.po
index fb7215c83f..1a458dfc03 100644
--- a/plugins/BlogspamNet/locale/br/LC_MESSAGES/BlogspamNet.po
+++ b/plugins/BlogspamNet/locale/br/LC_MESSAGES/BlogspamNet.po
@@ -9,18 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BlogspamNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:24+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:55+0000\n"
 "Language-Team: Breton <http://translatewiki.net/wiki/Portal:br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:33+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:06+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-blogspamnet\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: BlogspamNetPlugin.php:152
 msgid "Plugin to check submitted notices with blogspam.net."
 msgstr "Astenn evit gwiriañ gant blogspam.net ar c'hmennoù kaset."
diff --git a/plugins/BlogspamNet/locale/de/LC_MESSAGES/BlogspamNet.po b/plugins/BlogspamNet/locale/de/LC_MESSAGES/BlogspamNet.po
index c618d06ab9..efd1a9ab4c 100644
--- a/plugins/BlogspamNet/locale/de/LC_MESSAGES/BlogspamNet.po
+++ b/plugins/BlogspamNet/locale/de/LC_MESSAGES/BlogspamNet.po
@@ -9,18 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BlogspamNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:24+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:55+0000\n"
 "Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:33+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:06+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-blogspamnet\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: BlogspamNetPlugin.php:152
 msgid "Plugin to check submitted notices with blogspam.net."
 msgstr "Plugin zur Überprüfung von Nachrichten mit blogspam.net."
diff --git a/plugins/BlogspamNet/locale/es/LC_MESSAGES/BlogspamNet.po b/plugins/BlogspamNet/locale/es/LC_MESSAGES/BlogspamNet.po
index 1c7cf8c9f6..a7fc75703a 100644
--- a/plugins/BlogspamNet/locale/es/LC_MESSAGES/BlogspamNet.po
+++ b/plugins/BlogspamNet/locale/es/LC_MESSAGES/BlogspamNet.po
@@ -9,18 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BlogspamNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:24+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:55+0000\n"
 "Language-Team: Spanish <http://translatewiki.net/wiki/Portal:es>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:33+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:06+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-blogspamnet\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: BlogspamNetPlugin.php:152
 msgid "Plugin to check submitted notices with blogspam.net."
 msgstr "Extensión para revisar los mensajes enviados con blogspam.net."
diff --git a/plugins/BlogspamNet/locale/fr/LC_MESSAGES/BlogspamNet.po b/plugins/BlogspamNet/locale/fr/LC_MESSAGES/BlogspamNet.po
index 39e554dd2f..15a65f8635 100644
--- a/plugins/BlogspamNet/locale/fr/LC_MESSAGES/BlogspamNet.po
+++ b/plugins/BlogspamNet/locale/fr/LC_MESSAGES/BlogspamNet.po
@@ -9,18 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BlogspamNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:24+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:55+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:33+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:06+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-blogspamnet\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: BlogspamNetPlugin.php:152
 msgid "Plugin to check submitted notices with blogspam.net."
 msgstr "Extension pour vérifier avec blogspam.net les avis soumis."
diff --git a/plugins/BlogspamNet/locale/he/LC_MESSAGES/BlogspamNet.po b/plugins/BlogspamNet/locale/he/LC_MESSAGES/BlogspamNet.po
index 8901d07eec..227c2f2b25 100644
--- a/plugins/BlogspamNet/locale/he/LC_MESSAGES/BlogspamNet.po
+++ b/plugins/BlogspamNet/locale/he/LC_MESSAGES/BlogspamNet.po
@@ -9,18 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BlogspamNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:24+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:55+0000\n"
 "Language-Team: Hebrew <http://translatewiki.net/wiki/Portal:he>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:33+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:06+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-plugin-blogspamnet\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: BlogspamNetPlugin.php:152
 msgid "Plugin to check submitted notices with blogspam.net."
 msgstr "תוסף לבדיקת ההתרעות הנשלחות מול blogspam.net."
diff --git a/plugins/BlogspamNet/locale/ia/LC_MESSAGES/BlogspamNet.po b/plugins/BlogspamNet/locale/ia/LC_MESSAGES/BlogspamNet.po
index 306bbff149..c5bd2bcb13 100644
--- a/plugins/BlogspamNet/locale/ia/LC_MESSAGES/BlogspamNet.po
+++ b/plugins/BlogspamNet/locale/ia/LC_MESSAGES/BlogspamNet.po
@@ -9,18 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BlogspamNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:24+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:55+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:33+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:06+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-blogspamnet\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: BlogspamNetPlugin.php:152
 msgid "Plugin to check submitted notices with blogspam.net."
 msgstr "Plug-in pro verificar notas submittite contra blogspam.net."
diff --git a/plugins/BlogspamNet/locale/mk/LC_MESSAGES/BlogspamNet.po b/plugins/BlogspamNet/locale/mk/LC_MESSAGES/BlogspamNet.po
index 628ee0b50a..7c7cc1a7dd 100644
--- a/plugins/BlogspamNet/locale/mk/LC_MESSAGES/BlogspamNet.po
+++ b/plugins/BlogspamNet/locale/mk/LC_MESSAGES/BlogspamNet.po
@@ -9,18 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BlogspamNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:24+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:55+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:33+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:06+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-blogspamnet\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
 
-#: BlogspamNetPlugin.php:152
 msgid "Plugin to check submitted notices with blogspam.net."
 msgstr "Приклучок за проверка на поднесените забелешки со blogspam.net."
diff --git a/plugins/BlogspamNet/locale/nb/LC_MESSAGES/BlogspamNet.po b/plugins/BlogspamNet/locale/nb/LC_MESSAGES/BlogspamNet.po
index 4dac1e37fa..9fcfa17b2f 100644
--- a/plugins/BlogspamNet/locale/nb/LC_MESSAGES/BlogspamNet.po
+++ b/plugins/BlogspamNet/locale/nb/LC_MESSAGES/BlogspamNet.po
@@ -9,18 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BlogspamNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:24+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:56+0000\n"
 "Language-Team: Norwegian (bokmål)‬ <http://translatewiki.net/wiki/Portal:no>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:33+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:06+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: #out-statusnet-plugin-blogspamnet\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: BlogspamNetPlugin.php:152
 msgid "Plugin to check submitted notices with blogspam.net."
 msgstr "Utvidelse for å sjekke innsendte notiser med blogspam.net."
diff --git a/plugins/BlogspamNet/locale/nl/LC_MESSAGES/BlogspamNet.po b/plugins/BlogspamNet/locale/nl/LC_MESSAGES/BlogspamNet.po
index a57715a5ef..f77cc46f95 100644
--- a/plugins/BlogspamNet/locale/nl/LC_MESSAGES/BlogspamNet.po
+++ b/plugins/BlogspamNet/locale/nl/LC_MESSAGES/BlogspamNet.po
@@ -9,18 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BlogspamNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:24+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:56+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:33+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:06+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-blogspamnet\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: BlogspamNetPlugin.php:152
 msgid "Plugin to check submitted notices with blogspam.net."
 msgstr "Plug-in om mededelingen te controleren tegen blogspam.net."
diff --git a/plugins/BlogspamNet/locale/pt/LC_MESSAGES/BlogspamNet.po b/plugins/BlogspamNet/locale/pt/LC_MESSAGES/BlogspamNet.po
index ae1c3c7ac8..7dc91576d0 100644
--- a/plugins/BlogspamNet/locale/pt/LC_MESSAGES/BlogspamNet.po
+++ b/plugins/BlogspamNet/locale/pt/LC_MESSAGES/BlogspamNet.po
@@ -9,18 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BlogspamNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:24+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:56+0000\n"
 "Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:33+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:06+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-plugin-blogspamnet\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: BlogspamNetPlugin.php:152
 msgid "Plugin to check submitted notices with blogspam.net."
 msgstr "Plugin para verificar mensagens submetidas com o blogspam.net."
diff --git a/plugins/BlogspamNet/locale/ru/LC_MESSAGES/BlogspamNet.po b/plugins/BlogspamNet/locale/ru/LC_MESSAGES/BlogspamNet.po
index 6566d8268e..ba5b4720ec 100644
--- a/plugins/BlogspamNet/locale/ru/LC_MESSAGES/BlogspamNet.po
+++ b/plugins/BlogspamNet/locale/ru/LC_MESSAGES/BlogspamNet.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BlogspamNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:24+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:56+0000\n"
 "Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:33+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:06+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-blogspamnet\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: BlogspamNetPlugin.php:152
 msgid "Plugin to check submitted notices with blogspam.net."
 msgstr "Плагин для проверки отправленных сообщений с помощью blogspam.net."
diff --git a/plugins/BlogspamNet/locale/tl/LC_MESSAGES/BlogspamNet.po b/plugins/BlogspamNet/locale/tl/LC_MESSAGES/BlogspamNet.po
index 01f136e850..29635fd125 100644
--- a/plugins/BlogspamNet/locale/tl/LC_MESSAGES/BlogspamNet.po
+++ b/plugins/BlogspamNet/locale/tl/LC_MESSAGES/BlogspamNet.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BlogspamNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:24+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:56+0000\n"
 "Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:33+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:06+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-blogspamnet\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: BlogspamNetPlugin.php:152
 msgid "Plugin to check submitted notices with blogspam.net."
 msgstr ""
 "Pamasak upang masuri ang ipinasang mga pabatid sa pamamagitan ng blogspam."
diff --git a/plugins/BlogspamNet/locale/uk/LC_MESSAGES/BlogspamNet.po b/plugins/BlogspamNet/locale/uk/LC_MESSAGES/BlogspamNet.po
index 50114fe1ae..6436000198 100644
--- a/plugins/BlogspamNet/locale/uk/LC_MESSAGES/BlogspamNet.po
+++ b/plugins/BlogspamNet/locale/uk/LC_MESSAGES/BlogspamNet.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BlogspamNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:24+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:56+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:33+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:06+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-blogspamnet\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: BlogspamNetPlugin.php:152
 msgid "Plugin to check submitted notices with blogspam.net."
 msgstr "Додаток для перевірки вказаних повідомлень на blogspam.net."
diff --git a/plugins/BlogspamNet/locale/zh_CN/LC_MESSAGES/BlogspamNet.po b/plugins/BlogspamNet/locale/zh_CN/LC_MESSAGES/BlogspamNet.po
index 45690371cc..7644b082b0 100644
--- a/plugins/BlogspamNet/locale/zh_CN/LC_MESSAGES/BlogspamNet.po
+++ b/plugins/BlogspamNet/locale/zh_CN/LC_MESSAGES/BlogspamNet.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BlogspamNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:24+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:56+0000\n"
 "Language-Team: Simplified Chinese <http://translatewiki.net/wiki/Portal:zh-"
 "hans>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:33+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:06+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-blogspamnet\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: BlogspamNetPlugin.php:152
 msgid "Plugin to check submitted notices with blogspam.net."
 msgstr "通过 blogspam.net 检查发布的消息的插件。"
diff --git a/plugins/Bookmark/locale/Bookmark.pot b/plugins/Bookmark/locale/Bookmark.pot
index 92fc96912f..78fa302e1e 100644
--- a/plugins/Bookmark/locale/Bookmark.pot
+++ b/plugins/Bookmark/locale/Bookmark.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,9 +16,8 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: bookmarkform.php:162
-msgctxt "BUTTON"
-msgid "Save"
+#: BookmarkPlugin.php:458
+msgid "Simple extension for supporting bookmarks."
 msgstr ""
 
 #: importdelicious.php:340
@@ -26,6 +25,7 @@ msgctxt "BUTTON"
 msgid "Upload"
 msgstr ""
 
-#: BookmarkPlugin.php:458
-msgid "Simple extension for supporting bookmarks."
+#: bookmarkform.php:162
+msgctxt "BUTTON"
+msgid "Save"
 msgstr ""
diff --git a/plugins/Bookmark/locale/br/LC_MESSAGES/Bookmark.po b/plugins/Bookmark/locale/br/LC_MESSAGES/Bookmark.po
index c3d8053423..da0f636160 100644
--- a/plugins/Bookmark/locale/br/LC_MESSAGES/Bookmark.po
+++ b/plugins/Bookmark/locale/br/LC_MESSAGES/Bookmark.po
@@ -9,28 +9,25 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Bookmark\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-14 16:01+0000\n"
-"PO-Revision-Date: 2011-02-14 16:07:18+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:56+0000\n"
 "Language-Team: Breton <http://translatewiki.net/wiki/Portal:br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:19:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r82114); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:07+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-bookmark\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: bookmarkform.php:162
-msgctxt "BUTTON"
-msgid "Save"
-msgstr "Enrollañ"
+msgid "Simple extension for supporting bookmarks."
+msgstr ""
 
-#: importdelicious.php:340
 msgctxt "BUTTON"
 msgid "Upload"
 msgstr "Enporzhiañ"
 
-#: BookmarkPlugin.php:458
-msgid "Simple extension for supporting bookmarks."
-msgstr ""
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "Enrollañ"
diff --git a/plugins/Bookmark/locale/de/LC_MESSAGES/Bookmark.po b/plugins/Bookmark/locale/de/LC_MESSAGES/Bookmark.po
index bcf3268259..46a110b549 100644
--- a/plugins/Bookmark/locale/de/LC_MESSAGES/Bookmark.po
+++ b/plugins/Bookmark/locale/de/LC_MESSAGES/Bookmark.po
@@ -9,28 +9,25 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Bookmark\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-14 16:01+0000\n"
-"PO-Revision-Date: 2011-02-14 16:07:18+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:56+0000\n"
 "Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:19:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r82114); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:07+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-bookmark\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: bookmarkform.php:162
-msgctxt "BUTTON"
-msgid "Save"
-msgstr "Speichern"
+msgid "Simple extension for supporting bookmarks."
+msgstr "Einfache Erweiterung zur Unterstützung von Lesezeichen."
 
-#: importdelicious.php:340
 msgctxt "BUTTON"
 msgid "Upload"
 msgstr "Hochladen"
 
-#: BookmarkPlugin.php:458
-msgid "Simple extension for supporting bookmarks."
-msgstr "Einfache Erweiterung zur Unterstützung von Lesezeichen."
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "Speichern"
diff --git a/plugins/Bookmark/locale/fr/LC_MESSAGES/Bookmark.po b/plugins/Bookmark/locale/fr/LC_MESSAGES/Bookmark.po
index b63c065af0..1cf80a5740 100644
--- a/plugins/Bookmark/locale/fr/LC_MESSAGES/Bookmark.po
+++ b/plugins/Bookmark/locale/fr/LC_MESSAGES/Bookmark.po
@@ -9,28 +9,25 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Bookmark\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-14 16:01+0000\n"
-"PO-Revision-Date: 2011-02-14 16:07:18+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:56+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:19:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r82114); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:07+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-bookmark\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: bookmarkform.php:162
-msgctxt "BUTTON"
-msgid "Save"
-msgstr "Sauvegarder"
+msgid "Simple extension for supporting bookmarks."
+msgstr "Simple extension pour supporter les signets."
 
-#: importdelicious.php:340
 msgctxt "BUTTON"
 msgid "Upload"
 msgstr "Téléverser"
 
-#: BookmarkPlugin.php:458
-msgid "Simple extension for supporting bookmarks."
-msgstr "Simple extension pour supporter les signets."
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "Sauvegarder"
diff --git a/plugins/Bookmark/locale/ia/LC_MESSAGES/Bookmark.po b/plugins/Bookmark/locale/ia/LC_MESSAGES/Bookmark.po
index d652ab68c3..fa9f1940b1 100644
--- a/plugins/Bookmark/locale/ia/LC_MESSAGES/Bookmark.po
+++ b/plugins/Bookmark/locale/ia/LC_MESSAGES/Bookmark.po
@@ -9,28 +9,25 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Bookmark\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:25+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:56+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-20 20:16:15+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:07+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-bookmark\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: bookmarkform.php:162
-msgctxt "BUTTON"
-msgid "Save"
-msgstr "Salveguardar"
+msgid "Simple extension for supporting bookmarks."
+msgstr "Extension simple pro supportar marcapaginas."
 
-#: importdelicious.php:340
 msgctxt "BUTTON"
 msgid "Upload"
 msgstr "Incargar"
 
-#: BookmarkPlugin.php:458
-msgid "Simple extension for supporting bookmarks."
-msgstr "Extension simple pro supportar marcapaginas."
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "Salveguardar"
diff --git a/plugins/Bookmark/locale/mk/LC_MESSAGES/Bookmark.po b/plugins/Bookmark/locale/mk/LC_MESSAGES/Bookmark.po
index 207b348b6d..d589e32af7 100644
--- a/plugins/Bookmark/locale/mk/LC_MESSAGES/Bookmark.po
+++ b/plugins/Bookmark/locale/mk/LC_MESSAGES/Bookmark.po
@@ -9,28 +9,25 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Bookmark\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:25+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:56+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-20 20:16:15+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:07+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-bookmark\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
 
-#: bookmarkform.php:162
-msgctxt "BUTTON"
-msgid "Save"
-msgstr "Зачувај"
+msgid "Simple extension for supporting bookmarks."
+msgstr "Прост додаток за поддршка на обележувачи."
 
-#: importdelicious.php:340
 msgctxt "BUTTON"
 msgid "Upload"
 msgstr "Подигни"
 
-#: BookmarkPlugin.php:458
-msgid "Simple extension for supporting bookmarks."
-msgstr "Прост додаток за поддршка на обележувачи."
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "Зачувај"
diff --git a/plugins/Bookmark/locale/my/LC_MESSAGES/Bookmark.po b/plugins/Bookmark/locale/my/LC_MESSAGES/Bookmark.po
index 1b79ca620e..e452765aa8 100644
--- a/plugins/Bookmark/locale/my/LC_MESSAGES/Bookmark.po
+++ b/plugins/Bookmark/locale/my/LC_MESSAGES/Bookmark.po
@@ -9,28 +9,25 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Bookmark\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-14 16:01+0000\n"
-"PO-Revision-Date: 2011-02-14 16:07:18+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:57+0000\n"
 "Language-Team: Burmese <http://translatewiki.net/wiki/Portal:my>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:19:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r82114); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:07+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: my\n"
 "X-Message-Group: #out-statusnet-plugin-bookmark\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: bookmarkform.php:162
-msgctxt "BUTTON"
-msgid "Save"
-msgstr "သိမ်းရန်"
+msgid "Simple extension for supporting bookmarks."
+msgstr ""
 
-#: importdelicious.php:340
 msgctxt "BUTTON"
 msgid "Upload"
 msgstr "Upload တင်ရန်"
 
-#: BookmarkPlugin.php:458
-msgid "Simple extension for supporting bookmarks."
-msgstr ""
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "သိမ်းရန်"
diff --git a/plugins/Bookmark/locale/nl/LC_MESSAGES/Bookmark.po b/plugins/Bookmark/locale/nl/LC_MESSAGES/Bookmark.po
index 534a2f890a..a759a059b8 100644
--- a/plugins/Bookmark/locale/nl/LC_MESSAGES/Bookmark.po
+++ b/plugins/Bookmark/locale/nl/LC_MESSAGES/Bookmark.po
@@ -9,28 +9,25 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Bookmark\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:25+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:57+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-20 20:16:15+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:07+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-bookmark\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: bookmarkform.php:162
-msgctxt "BUTTON"
-msgid "Save"
-msgstr "Opslaan"
+msgid "Simple extension for supporting bookmarks."
+msgstr "Eenvoudige extensie voor de ondersteuning van bladwijzers."
 
-#: importdelicious.php:340
 msgctxt "BUTTON"
 msgid "Upload"
 msgstr "Uploaden"
 
-#: BookmarkPlugin.php:458
-msgid "Simple extension for supporting bookmarks."
-msgstr "Eenvoudige extensie voor de ondersteuning van bladwijzers."
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "Opslaan"
diff --git a/plugins/Bookmark/locale/ru/LC_MESSAGES/Bookmark.po b/plugins/Bookmark/locale/ru/LC_MESSAGES/Bookmark.po
index 9ae8031ea2..9962ee5ca5 100644
--- a/plugins/Bookmark/locale/ru/LC_MESSAGES/Bookmark.po
+++ b/plugins/Bookmark/locale/ru/LC_MESSAGES/Bookmark.po
@@ -9,29 +9,26 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Bookmark\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:25+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:57+0000\n"
 "Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-20 20:16:15+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:07+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-bookmark\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: bookmarkform.php:162
-msgctxt "BUTTON"
-msgid "Save"
-msgstr "Сохранить"
+msgid "Simple extension for supporting bookmarks."
+msgstr ""
 
-#: importdelicious.php:340
 msgctxt "BUTTON"
 msgid "Upload"
 msgstr "Загрузить"
 
-#: BookmarkPlugin.php:458
-msgid "Simple extension for supporting bookmarks."
-msgstr ""
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "Сохранить"
diff --git a/plugins/Bookmark/locale/te/LC_MESSAGES/Bookmark.po b/plugins/Bookmark/locale/te/LC_MESSAGES/Bookmark.po
new file mode 100644
index 0000000000..48065a1fc1
--- /dev/null
+++ b/plugins/Bookmark/locale/te/LC_MESSAGES/Bookmark.po
@@ -0,0 +1,33 @@
+# Translation of StatusNet - Bookmark to Telugu (తెలుగు)
+# Exported from translatewiki.net
+#
+# Author: Veeven
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Bookmark\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:57+0000\n"
+"Language-Team: Telugu <http://translatewiki.net/wiki/Portal:te>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-03-03 17:43:07+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: te\n"
+"X-Message-Group: #out-statusnet-plugin-bookmark\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "Simple extension for supporting bookmarks."
+msgstr ""
+
+msgctxt "BUTTON"
+msgid "Upload"
+msgstr "ఎక్కించు"
+
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "భద్రపరచు"
diff --git a/plugins/Bookmark/locale/uk/LC_MESSAGES/Bookmark.po b/plugins/Bookmark/locale/uk/LC_MESSAGES/Bookmark.po
index c59a2560a3..7eaa40faf2 100644
--- a/plugins/Bookmark/locale/uk/LC_MESSAGES/Bookmark.po
+++ b/plugins/Bookmark/locale/uk/LC_MESSAGES/Bookmark.po
@@ -9,29 +9,26 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Bookmark\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:25+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:57+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-20 20:16:15+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:07+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-bookmark\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: bookmarkform.php:162
-msgctxt "BUTTON"
-msgid "Save"
-msgstr "Зберегти"
+msgid "Simple extension for supporting bookmarks."
+msgstr "Простий додаток, що підтримує додавання закладок."
 
-#: importdelicious.php:340
 msgctxt "BUTTON"
 msgid "Upload"
 msgstr "Завантажити"
 
-#: BookmarkPlugin.php:458
-msgid "Simple extension for supporting bookmarks."
-msgstr "Простий додаток, що підтримує додавання закладок."
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "Зберегти"
diff --git a/plugins/Bookmark/locale/zh_CN/LC_MESSAGES/Bookmark.po b/plugins/Bookmark/locale/zh_CN/LC_MESSAGES/Bookmark.po
index 53e13c1d17..53bdbd96a8 100644
--- a/plugins/Bookmark/locale/zh_CN/LC_MESSAGES/Bookmark.po
+++ b/plugins/Bookmark/locale/zh_CN/LC_MESSAGES/Bookmark.po
@@ -9,29 +9,26 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Bookmark\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:25+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:57+0000\n"
 "Language-Team: Simplified Chinese <http://translatewiki.net/wiki/Portal:zh-"
 "hans>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-20 20:16:15+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:07+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-bookmark\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: bookmarkform.php:162
-msgctxt "BUTTON"
-msgid "Save"
-msgstr "保存"
+msgid "Simple extension for supporting bookmarks."
+msgstr "支持书签的简单扩展。"
 
-#: importdelicious.php:340
 msgctxt "BUTTON"
 msgid "Upload"
 msgstr "上载"
 
-#: BookmarkPlugin.php:458
-msgid "Simple extension for supporting bookmarks."
-msgstr "支持书签的简单扩展。"
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "保存"
diff --git a/plugins/CacheLog/locale/CacheLog.pot b/plugins/CacheLog/locale/CacheLog.pot
index 8e2071d9af..5fe8fad5a4 100644
--- a/plugins/CacheLog/locale/CacheLog.pot
+++ b/plugins/CacheLog/locale/CacheLog.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/CacheLog/locale/be-tarask/LC_MESSAGES/CacheLog.po b/plugins/CacheLog/locale/be-tarask/LC_MESSAGES/CacheLog.po
index cb4e53755d..76c75e2003 100644
--- a/plugins/CacheLog/locale/be-tarask/LC_MESSAGES/CacheLog.po
+++ b/plugins/CacheLog/locale/be-tarask/LC_MESSAGES/CacheLog.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - CacheLog\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:25+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:57+0000\n"
 "Language-Team: Belarusian (Taraškievica orthography) <http://translatewiki."
 "net/wiki/Portal:be-tarask>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:34+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:08+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: be-tarask\n"
 "X-Message-Group: #out-statusnet-plugin-cachelog\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: CacheLogPlugin.php:106
 msgid "Log reads and writes to the cache."
 msgstr "Журнал чытае і піша ў кэш."
diff --git a/plugins/CacheLog/locale/br/LC_MESSAGES/CacheLog.po b/plugins/CacheLog/locale/br/LC_MESSAGES/CacheLog.po
index cacfe9182d..45664927e6 100644
--- a/plugins/CacheLog/locale/br/LC_MESSAGES/CacheLog.po
+++ b/plugins/CacheLog/locale/br/LC_MESSAGES/CacheLog.po
@@ -9,18 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - CacheLog\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:25+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:57+0000\n"
 "Language-Team: Breton <http://translatewiki.net/wiki/Portal:br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:34+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:08+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-cachelog\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: CacheLogPlugin.php:106
 msgid "Log reads and writes to the cache."
 msgstr "Marilhañ a ra al lennadurioù hag ar skrivadurioù er grubuilh"
diff --git a/plugins/CacheLog/locale/es/LC_MESSAGES/CacheLog.po b/plugins/CacheLog/locale/es/LC_MESSAGES/CacheLog.po
index 9262533ed7..992562f245 100644
--- a/plugins/CacheLog/locale/es/LC_MESSAGES/CacheLog.po
+++ b/plugins/CacheLog/locale/es/LC_MESSAGES/CacheLog.po
@@ -9,18 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - CacheLog\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:25+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:57+0000\n"
 "Language-Team: Spanish <http://translatewiki.net/wiki/Portal:es>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:34+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:08+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-cachelog\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: CacheLogPlugin.php:106
 msgid "Log reads and writes to the cache."
 msgstr "Registra lecturas y escrituras en el caché"
diff --git a/plugins/CacheLog/locale/fr/LC_MESSAGES/CacheLog.po b/plugins/CacheLog/locale/fr/LC_MESSAGES/CacheLog.po
index a74360b5d5..210d51566d 100644
--- a/plugins/CacheLog/locale/fr/LC_MESSAGES/CacheLog.po
+++ b/plugins/CacheLog/locale/fr/LC_MESSAGES/CacheLog.po
@@ -9,18 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - CacheLog\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:25+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:57+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:34+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:08+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-cachelog\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: CacheLogPlugin.php:106
 msgid "Log reads and writes to the cache."
 msgstr "Lectures et écritures de journal en cache."
diff --git a/plugins/CacheLog/locale/he/LC_MESSAGES/CacheLog.po b/plugins/CacheLog/locale/he/LC_MESSAGES/CacheLog.po
index cfc34ed9c1..4dce3eb56b 100644
--- a/plugins/CacheLog/locale/he/LC_MESSAGES/CacheLog.po
+++ b/plugins/CacheLog/locale/he/LC_MESSAGES/CacheLog.po
@@ -9,18 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - CacheLog\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:25+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:57+0000\n"
 "Language-Team: Hebrew <http://translatewiki.net/wiki/Portal:he>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:34+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:08+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-plugin-cachelog\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: CacheLogPlugin.php:106
 msgid "Log reads and writes to the cache."
 msgstr "רישום הקריאות והכתיבות אל ומהמטמון."
diff --git a/plugins/CacheLog/locale/ia/LC_MESSAGES/CacheLog.po b/plugins/CacheLog/locale/ia/LC_MESSAGES/CacheLog.po
index d828e214b8..811e705d0f 100644
--- a/plugins/CacheLog/locale/ia/LC_MESSAGES/CacheLog.po
+++ b/plugins/CacheLog/locale/ia/LC_MESSAGES/CacheLog.po
@@ -9,18 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - CacheLog\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:25+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:57+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:34+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:08+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-cachelog\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: CacheLogPlugin.php:106
 msgid "Log reads and writes to the cache."
 msgstr "Registrar le lectura e scriptura al cache."
diff --git a/plugins/CacheLog/locale/mk/LC_MESSAGES/CacheLog.po b/plugins/CacheLog/locale/mk/LC_MESSAGES/CacheLog.po
index 56e454eee0..edfc096493 100644
--- a/plugins/CacheLog/locale/mk/LC_MESSAGES/CacheLog.po
+++ b/plugins/CacheLog/locale/mk/LC_MESSAGES/CacheLog.po
@@ -9,18 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - CacheLog\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:25+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:57+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:34+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:08+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-cachelog\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
 
-#: CacheLogPlugin.php:106
 msgid "Log reads and writes to the cache."
 msgstr "Евидентирај читања на и записи во кешот."
diff --git a/plugins/CacheLog/locale/nb/LC_MESSAGES/CacheLog.po b/plugins/CacheLog/locale/nb/LC_MESSAGES/CacheLog.po
index f690d3d669..46c3053bfc 100644
--- a/plugins/CacheLog/locale/nb/LC_MESSAGES/CacheLog.po
+++ b/plugins/CacheLog/locale/nb/LC_MESSAGES/CacheLog.po
@@ -9,18 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - CacheLog\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:26+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:57+0000\n"
 "Language-Team: Norwegian (bokmål)‬ <http://translatewiki.net/wiki/Portal:no>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:34+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:08+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: #out-statusnet-plugin-cachelog\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: CacheLogPlugin.php:106
 msgid "Log reads and writes to the cache."
 msgstr "Logg leser og skriver til hurtiglageret."
diff --git a/plugins/CacheLog/locale/nl/LC_MESSAGES/CacheLog.po b/plugins/CacheLog/locale/nl/LC_MESSAGES/CacheLog.po
index fc26a34891..ce9a1c9c71 100644
--- a/plugins/CacheLog/locale/nl/LC_MESSAGES/CacheLog.po
+++ b/plugins/CacheLog/locale/nl/LC_MESSAGES/CacheLog.po
@@ -9,18 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - CacheLog\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:26+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:57+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:34+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:08+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-cachelog\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: CacheLogPlugin.php:106
 msgid "Log reads and writes to the cache."
 msgstr "Lezen en schrijven naar de cache in het logboek opnemen."
diff --git a/plugins/CacheLog/locale/pt/LC_MESSAGES/CacheLog.po b/plugins/CacheLog/locale/pt/LC_MESSAGES/CacheLog.po
index 23e754b5fc..c61cb6d882 100644
--- a/plugins/CacheLog/locale/pt/LC_MESSAGES/CacheLog.po
+++ b/plugins/CacheLog/locale/pt/LC_MESSAGES/CacheLog.po
@@ -9,18 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - CacheLog\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:26+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:57+0000\n"
 "Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:34+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:08+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-plugin-cachelog\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: CacheLogPlugin.php:106
 msgid "Log reads and writes to the cache."
 msgstr "Regista leituras e escritas na cache."
diff --git a/plugins/CacheLog/locale/ru/LC_MESSAGES/CacheLog.po b/plugins/CacheLog/locale/ru/LC_MESSAGES/CacheLog.po
index 47af9cead6..7ee4d86f8e 100644
--- a/plugins/CacheLog/locale/ru/LC_MESSAGES/CacheLog.po
+++ b/plugins/CacheLog/locale/ru/LC_MESSAGES/CacheLog.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - CacheLog\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:26+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:57+0000\n"
 "Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:34+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:08+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-cachelog\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: CacheLogPlugin.php:106
 msgid "Log reads and writes to the cache."
 msgstr "Журнал читает и пишет в кеш."
diff --git a/plugins/CacheLog/locale/tl/LC_MESSAGES/CacheLog.po b/plugins/CacheLog/locale/tl/LC_MESSAGES/CacheLog.po
index d77257ee38..a64d5b0a4d 100644
--- a/plugins/CacheLog/locale/tl/LC_MESSAGES/CacheLog.po
+++ b/plugins/CacheLog/locale/tl/LC_MESSAGES/CacheLog.po
@@ -9,18 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - CacheLog\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:26+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:57+0000\n"
 "Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:34+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:08+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-cachelog\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: CacheLogPlugin.php:106
 msgid "Log reads and writes to the cache."
 msgstr "Ang tala ay nagbabasa at nagsusulat sa taguan."
diff --git a/plugins/CacheLog/locale/uk/LC_MESSAGES/CacheLog.po b/plugins/CacheLog/locale/uk/LC_MESSAGES/CacheLog.po
index 47a8ae5a5b..aa5f099f1c 100644
--- a/plugins/CacheLog/locale/uk/LC_MESSAGES/CacheLog.po
+++ b/plugins/CacheLog/locale/uk/LC_MESSAGES/CacheLog.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - CacheLog\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:26+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:58+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:34+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:08+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-cachelog\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: CacheLogPlugin.php:106
 msgid "Log reads and writes to the cache."
 msgstr "Лоґ переглядів та записів у кеші."
diff --git a/plugins/CacheLog/locale/zh_CN/LC_MESSAGES/CacheLog.po b/plugins/CacheLog/locale/zh_CN/LC_MESSAGES/CacheLog.po
index 55a132ebb4..6e30068ecb 100644
--- a/plugins/CacheLog/locale/zh_CN/LC_MESSAGES/CacheLog.po
+++ b/plugins/CacheLog/locale/zh_CN/LC_MESSAGES/CacheLog.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - CacheLog\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:26+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:58+0000\n"
 "Language-Team: Simplified Chinese <http://translatewiki.net/wiki/Portal:zh-"
 "hans>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:34+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:08+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-cachelog\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: CacheLogPlugin.php:106
 msgid "Log reads and writes to the cache."
 msgstr "将读写日志到缓存。"
diff --git a/plugins/CasAuthentication/locale/CasAuthentication.pot b/plugins/CasAuthentication/locale/CasAuthentication.pot
index 43917b6f1e..117ef07b41 100644
--- a/plugins/CasAuthentication/locale/CasAuthentication.pot
+++ b/plugins/CasAuthentication/locale/CasAuthentication.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/CasAuthentication/locale/be-tarask/LC_MESSAGES/CasAuthentication.po b/plugins/CasAuthentication/locale/be-tarask/LC_MESSAGES/CasAuthentication.po
index 9bd9997513..71c670e560 100644
--- a/plugins/CasAuthentication/locale/be-tarask/LC_MESSAGES/CasAuthentication.po
+++ b/plugins/CasAuthentication/locale/be-tarask/LC_MESSAGES/CasAuthentication.po
@@ -10,52 +10,45 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - CasAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:27+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:58+0000\n"
 "Language-Team: Belarusian (Taraškievica orthography) <http://translatewiki."
 "net/wiki/Portal:be-tarask>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:35+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:09+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: be-tarask\n"
 "X-Message-Group: #out-statusnet-plugin-casauthentication\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANS: Menu item. CAS is Central Authentication Service.
-#: CasAuthenticationPlugin.php:83
 msgid "CAS"
 msgstr "CAS"
 
 #. TRANS: Tooltip for menu item. CAS is Central Authentication Service.
-#: CasAuthenticationPlugin.php:85
 msgid "Login or register with CAS."
 msgstr "Увайсьці ці зарэгістравацца з CAS."
 
 #. TRANS: Invitation to users with a CAS account to log in using the service.
 #. TRANS: "[CAS login]" is a link description. (%%action.caslogin%%) is the URL.
 #. TRANS: These two elements may not be separated.
-#: CasAuthenticationPlugin.php:101
 #, php-format
 msgid "(Have an account with CAS? Try our [CAS login](%%action.caslogin%%)!)"
 msgstr ""
 "(Маеце рахунак з CAS? Паспрабуйце наш [уваход CAS](%%action.caslogin%%)!)"
 
-#: CasAuthenticationPlugin.php:128
 msgid "Specifying a server is required."
 msgstr "Неабходна пазначыць сэрвэр."
 
-#: CasAuthenticationPlugin.php:131
 msgid "Specifying a port is required."
 msgstr "Неабходна пазначыць порт."
 
-#: CasAuthenticationPlugin.php:134
 msgid "Specifying a path is required."
 msgstr "Неабходна пазначыць шлях."
 
 #. TRANS: Plugin description. CAS is Central Authentication Service.
-#: CasAuthenticationPlugin.php:154
 msgid ""
 "The CAS Authentication plugin allows for StatusNet to handle authentication "
 "through CAS (Central Authentication Service)."
@@ -63,14 +56,11 @@ msgstr ""
 "Дапаўненьне аўтэнтыфікацыі CAS дазваляе StatusNet апрацоўваць аўтэнтыфікацыю "
 "праз CAS (цэнтральны сэрвіс аўтэнтыфікацыі)."
 
-#: caslogin.php:28
 msgid "Already logged in."
 msgstr "Ужо ўвайшлі ў сыстэму."
 
-#: caslogin.php:39
 msgid "Incorrect username or password."
 msgstr "Няслушнае імя карыстальніка ці пароль."
 
-#: caslogin.php:45
 msgid "Error setting user. You are probably not authorized."
 msgstr "Памылка ўстаноўкі удзельніка. Верагодна Вы не аўтарызаваны."
diff --git a/plugins/CasAuthentication/locale/br/LC_MESSAGES/CasAuthentication.po b/plugins/CasAuthentication/locale/br/LC_MESSAGES/CasAuthentication.po
index 4b42f75b37..7771616938 100644
--- a/plugins/CasAuthentication/locale/br/LC_MESSAGES/CasAuthentication.po
+++ b/plugins/CasAuthentication/locale/br/LC_MESSAGES/CasAuthentication.po
@@ -9,66 +9,56 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - CasAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:27+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:58+0000\n"
 "Language-Team: Breton <http://translatewiki.net/wiki/Portal:br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:35+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:09+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-casauthentication\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. TRANS: Menu item. CAS is Central Authentication Service.
-#: CasAuthenticationPlugin.php:83
 msgid "CAS"
 msgstr "Servij dilesadur kreiz (SDK)"
 
 #. TRANS: Tooltip for menu item. CAS is Central Authentication Service.
-#: CasAuthenticationPlugin.php:85
 msgid "Login or register with CAS."
 msgstr "Kevreañ pe en em enskrivañ dre ar SDK."
 
 #. TRANS: Invitation to users with a CAS account to log in using the service.
 #. TRANS: "[CAS login]" is a link description. (%%action.caslogin%%) is the URL.
 #. TRANS: These two elements may not be separated.
-#: CasAuthenticationPlugin.php:101
 #, php-format
 msgid "(Have an account with CAS? Try our [CAS login](%%action.caslogin%%)!)"
 msgstr ""
 "(Hag ur gont diselaet SDK ho peus ? Amprouit hor [c'hevreadur SAC](%%action."
 "caslogin%%) !)"
 
-#: CasAuthenticationPlugin.php:128
 msgid "Specifying a server is required."
 msgstr "Ret eo spisaat ur servijer."
 
-#: CasAuthenticationPlugin.php:131
 msgid "Specifying a port is required."
 msgstr ""
 
-#: CasAuthenticationPlugin.php:134
 msgid "Specifying a path is required."
 msgstr ""
 
 #. TRANS: Plugin description. CAS is Central Authentication Service.
-#: CasAuthenticationPlugin.php:154
 msgid ""
 "The CAS Authentication plugin allows for StatusNet to handle authentication "
 "through CAS (Central Authentication Service)."
 msgstr ""
 
-#: caslogin.php:28
 msgid "Already logged in."
 msgstr "Kevreet oc'h dija."
 
-#: caslogin.php:39
 msgid "Incorrect username or password."
 msgstr "Anv implijer pe ger-tremen direizh."
 
-#: caslogin.php:45
 msgid "Error setting user. You are probably not authorized."
 msgstr ""
 "Ur fazi 'zo bet e-pad hizivadenn an implijer. Moarvat n'oc'h ket aotreet "
diff --git a/plugins/CasAuthentication/locale/de/LC_MESSAGES/CasAuthentication.po b/plugins/CasAuthentication/locale/de/LC_MESSAGES/CasAuthentication.po
index 179f95640e..c6282fbdae 100644
--- a/plugins/CasAuthentication/locale/de/LC_MESSAGES/CasAuthentication.po
+++ b/plugins/CasAuthentication/locale/de/LC_MESSAGES/CasAuthentication.po
@@ -10,51 +10,44 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - CasAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-14 16:01+0000\n"
-"PO-Revision-Date: 2011-02-14 16:07:22+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:58+0000\n"
 "Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:19:31+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r82114); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:09+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-casauthentication\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANS: Menu item. CAS is Central Authentication Service.
-#: CasAuthenticationPlugin.php:83
 msgid "CAS"
 msgstr "CAS"
 
 #. TRANS: Tooltip for menu item. CAS is Central Authentication Service.
-#: CasAuthenticationPlugin.php:85
 msgid "Login or register with CAS."
 msgstr "Anmelden oder mit CAS registrieren."
 
 #. TRANS: Invitation to users with a CAS account to log in using the service.
 #. TRANS: "[CAS login]" is a link description. (%%action.caslogin%%) is the URL.
 #. TRANS: These two elements may not be separated.
-#: CasAuthenticationPlugin.php:101
 #, php-format
 msgid "(Have an account with CAS? Try our [CAS login](%%action.caslogin%%)!)"
 msgstr ""
 "(Hast du ein CAS-Konto? Probiere unseren [CAS-Login](%%action.caslogin%%)!)"
 
-#: CasAuthenticationPlugin.php:128
 msgid "Specifying a server is required."
 msgstr "Es ist erforderlich, einen Server anzugeben."
 
-#: CasAuthenticationPlugin.php:131
 msgid "Specifying a port is required."
 msgstr "Es ist erforderlich, einen Port anzugeben."
 
-#: CasAuthenticationPlugin.php:134
 msgid "Specifying a path is required."
 msgstr "Es ist erforderlich, einen Pfad anzugeben."
 
 #. TRANS: Plugin description. CAS is Central Authentication Service.
-#: CasAuthenticationPlugin.php:154
 msgid ""
 "The CAS Authentication plugin allows for StatusNet to handle authentication "
 "through CAS (Central Authentication Service)."
@@ -62,15 +55,12 @@ msgstr ""
 "Das CAS-Authenfizierungs-Plugin erlaubt es StatusNet, die Authentifizierung "
 "über CAS (Central Authentication Service) abzuwickeln."
 
-#: caslogin.php:28
 msgid "Already logged in."
 msgstr "Bereits angemeldet."
 
-#: caslogin.php:39
 msgid "Incorrect username or password."
 msgstr "Benutzername oder Passwort falsch."
 
-#: caslogin.php:45
 msgid "Error setting user. You are probably not authorized."
 msgstr ""
 "Fehler beim Festlegen des Benutzers. Du bist wahrscheinlich nicht dazu "
diff --git a/plugins/CasAuthentication/locale/es/LC_MESSAGES/CasAuthentication.po b/plugins/CasAuthentication/locale/es/LC_MESSAGES/CasAuthentication.po
index 2f3630b6b7..546dec75f9 100644
--- a/plugins/CasAuthentication/locale/es/LC_MESSAGES/CasAuthentication.po
+++ b/plugins/CasAuthentication/locale/es/LC_MESSAGES/CasAuthentication.po
@@ -10,52 +10,45 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - CasAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:27+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:58+0000\n"
 "Language-Team: Spanish <http://translatewiki.net/wiki/Portal:es>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:35+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:09+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-casauthentication\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANS: Menu item. CAS is Central Authentication Service.
-#: CasAuthenticationPlugin.php:83
 msgid "CAS"
 msgstr "CAS"
 
 #. TRANS: Tooltip for menu item. CAS is Central Authentication Service.
-#: CasAuthenticationPlugin.php:85
 msgid "Login or register with CAS."
 msgstr "Inicia sesión o regístrate con CAS."
 
 #. TRANS: Invitation to users with a CAS account to log in using the service.
 #. TRANS: "[CAS login]" is a link description. (%%action.caslogin%%) is the URL.
 #. TRANS: These two elements may not be separated.
-#: CasAuthenticationPlugin.php:101
 #, php-format
 msgid "(Have an account with CAS? Try our [CAS login](%%action.caslogin%%)!)"
 msgstr ""
 "(¿Tienes una cuenta con CAS? Prueba nuestro [Inicio de usuario CAS](%%action."
 "caslogin%%)!)"
 
-#: CasAuthenticationPlugin.php:128
 msgid "Specifying a server is required."
 msgstr "Se requiere especificar un servidor."
 
-#: CasAuthenticationPlugin.php:131
 msgid "Specifying a port is required."
 msgstr "Se requiere especificar un servidor."
 
-#: CasAuthenticationPlugin.php:134
 msgid "Specifying a path is required."
 msgstr "Se requiere especificar una ruta."
 
 #. TRANS: Plugin description. CAS is Central Authentication Service.
-#: CasAuthenticationPlugin.php:154
 msgid ""
 "The CAS Authentication plugin allows for StatusNet to handle authentication "
 "through CAS (Central Authentication Service)."
@@ -63,14 +56,11 @@ msgstr ""
 "La extensión de Autenticación CAS permite a StatusNet manejar autenticación "
 "a través de CAS (Servicio de Autenticación Central)."
 
-#: caslogin.php:28
 msgid "Already logged in."
 msgstr "Ya has iniciado sesión"
 
-#: caslogin.php:39
 msgid "Incorrect username or password."
 msgstr "Nombre de usuario o contraseña incorrectos."
 
-#: caslogin.php:45
 msgid "Error setting user. You are probably not authorized."
 msgstr "Error al configurar el usuario. Posiblemente no tengas autorización."
diff --git a/plugins/CasAuthentication/locale/fr/LC_MESSAGES/CasAuthentication.po b/plugins/CasAuthentication/locale/fr/LC_MESSAGES/CasAuthentication.po
index 0f82c59828..b5301dc206 100644
--- a/plugins/CasAuthentication/locale/fr/LC_MESSAGES/CasAuthentication.po
+++ b/plugins/CasAuthentication/locale/fr/LC_MESSAGES/CasAuthentication.po
@@ -9,52 +9,45 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - CasAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:27+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:59+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:35+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:09+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-casauthentication\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. TRANS: Menu item. CAS is Central Authentication Service.
-#: CasAuthenticationPlugin.php:83
 msgid "CAS"
 msgstr "Service d’authentification central (SAC)"
 
 #. TRANS: Tooltip for menu item. CAS is Central Authentication Service.
-#: CasAuthenticationPlugin.php:85
 msgid "Login or register with CAS."
 msgstr "Se connecter ou s’inscrire via le SAC."
 
 #. TRANS: Invitation to users with a CAS account to log in using the service.
 #. TRANS: "[CAS login]" is a link description. (%%action.caslogin%%) is the URL.
 #. TRANS: These two elements may not be separated.
-#: CasAuthenticationPlugin.php:101
 #, php-format
 msgid "(Have an account with CAS? Try our [CAS login](%%action.caslogin%%)!)"
 msgstr ""
 "(Vous avez un compte authentifié SAC ? Essayez notre [connexion SAC](%%"
 "action.caslogin%%) !)"
 
-#: CasAuthenticationPlugin.php:128
 msgid "Specifying a server is required."
 msgstr "La spécification d’un serveur est nécessaire."
 
-#: CasAuthenticationPlugin.php:131
 msgid "Specifying a port is required."
 msgstr "La spécification d’un port est nécessaire."
 
-#: CasAuthenticationPlugin.php:134
 msgid "Specifying a path is required."
 msgstr "La spécification d’un chemin d’accès est nécessaire."
 
 #. TRANS: Plugin description. CAS is Central Authentication Service.
-#: CasAuthenticationPlugin.php:154
 msgid ""
 "The CAS Authentication plugin allows for StatusNet to handle authentication "
 "through CAS (Central Authentication Service)."
@@ -62,15 +55,12 @@ msgstr ""
 "Le greffon d’authentification SAC permet à StatusNet de gérer "
 "l’authentification par SAC (Service central d’authentification)."
 
-#: caslogin.php:28
 msgid "Already logged in."
 msgstr "Déjà connecté."
 
-#: caslogin.php:39
 msgid "Incorrect username or password."
 msgstr "Nom d’utilisateur ou mot de passe incorrect."
 
-#: caslogin.php:45
 msgid "Error setting user. You are probably not authorized."
 msgstr ""
 "Erreur lors de la définition de l’utilisateur. Vous n’êtes probablement pas "
diff --git a/plugins/CasAuthentication/locale/ia/LC_MESSAGES/CasAuthentication.po b/plugins/CasAuthentication/locale/ia/LC_MESSAGES/CasAuthentication.po
index 62d5980664..1806276dba 100644
--- a/plugins/CasAuthentication/locale/ia/LC_MESSAGES/CasAuthentication.po
+++ b/plugins/CasAuthentication/locale/ia/LC_MESSAGES/CasAuthentication.po
@@ -9,52 +9,45 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - CasAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:27+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:59+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:35+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:09+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-casauthentication\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANS: Menu item. CAS is Central Authentication Service.
-#: CasAuthenticationPlugin.php:83
 msgid "CAS"
 msgstr "CAS"
 
 #. TRANS: Tooltip for menu item. CAS is Central Authentication Service.
-#: CasAuthenticationPlugin.php:85
 msgid "Login or register with CAS."
 msgstr "Aperir session o crear conto via CAS."
 
 #. TRANS: Invitation to users with a CAS account to log in using the service.
 #. TRANS: "[CAS login]" is a link description. (%%action.caslogin%%) is the URL.
 #. TRANS: These two elements may not be separated.
-#: CasAuthenticationPlugin.php:101
 #, php-format
 msgid "(Have an account with CAS? Try our [CAS login](%%action.caslogin%%)!)"
 msgstr ""
 "(Tu ha un conto de CAS? Essaya nostre [authentication CAS](%%action.caslogin%"
 "%)!)"
 
-#: CasAuthenticationPlugin.php:128
 msgid "Specifying a server is required."
 msgstr "Specificar un servitor es necessari."
 
-#: CasAuthenticationPlugin.php:131
 msgid "Specifying a port is required."
 msgstr "Specificar un porto es necessari."
 
-#: CasAuthenticationPlugin.php:134
 msgid "Specifying a path is required."
 msgstr "Specificar un cammino es necessari."
 
 #. TRANS: Plugin description. CAS is Central Authentication Service.
-#: CasAuthenticationPlugin.php:154
 msgid ""
 "The CAS Authentication plugin allows for StatusNet to handle authentication "
 "through CAS (Central Authentication Service)."
@@ -63,15 +56,12 @@ msgstr ""
 "authentication via CAS (Central Authentication Service, servicio central de "
 "authentication)."
 
-#: caslogin.php:28
 msgid "Already logged in."
 msgstr "Tu es jam authenticate."
 
-#: caslogin.php:39
 msgid "Incorrect username or password."
 msgstr "Nomine de usator o contrasigno incorrecte."
 
-#: caslogin.php:45
 msgid "Error setting user. You are probably not authorized."
 msgstr ""
 "Error de acceder al conto de usator. Tu probabilemente non es autorisate."
diff --git a/plugins/CasAuthentication/locale/mk/LC_MESSAGES/CasAuthentication.po b/plugins/CasAuthentication/locale/mk/LC_MESSAGES/CasAuthentication.po
index ceb0cca7d6..27ffd0eeb4 100644
--- a/plugins/CasAuthentication/locale/mk/LC_MESSAGES/CasAuthentication.po
+++ b/plugins/CasAuthentication/locale/mk/LC_MESSAGES/CasAuthentication.po
@@ -9,52 +9,45 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - CasAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:27+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:59+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:35+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:09+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-casauthentication\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
 
 #. TRANS: Menu item. CAS is Central Authentication Service.
-#: CasAuthenticationPlugin.php:83
 msgid "CAS"
 msgstr "CAS"
 
 #. TRANS: Tooltip for menu item. CAS is Central Authentication Service.
-#: CasAuthenticationPlugin.php:85
 msgid "Login or register with CAS."
 msgstr "Најава или регистрација со CAS."
 
 #. TRANS: Invitation to users with a CAS account to log in using the service.
 #. TRANS: "[CAS login]" is a link description. (%%action.caslogin%%) is the URL.
 #. TRANS: These two elements may not be separated.
-#: CasAuthenticationPlugin.php:101
 #, php-format
 msgid "(Have an account with CAS? Try our [CAS login](%%action.caslogin%%)!)"
 msgstr ""
 "(Имате сметка на CAS? Пробајте ја нашата [најава со CAS](%%action.caslogin%"
 "%)!)"
 
-#: CasAuthenticationPlugin.php:128
 msgid "Specifying a server is required."
 msgstr "Мора да се назначи опслужувач."
 
-#: CasAuthenticationPlugin.php:131
 msgid "Specifying a port is required."
 msgstr "Мора да се назначи порта."
 
-#: CasAuthenticationPlugin.php:134
 msgid "Specifying a path is required."
 msgstr "Мора да се назначи патека."
 
 #. TRANS: Plugin description. CAS is Central Authentication Service.
-#: CasAuthenticationPlugin.php:154
 msgid ""
 "The CAS Authentication plugin allows for StatusNet to handle authentication "
 "through CAS (Central Authentication Service)."
@@ -63,14 +56,11 @@ msgstr ""
 "преку CAS (Central Authentication Service - „Служба за централно "
 "потврдување“)."
 
-#: caslogin.php:28
 msgid "Already logged in."
 msgstr "Веќе сте најавени."
 
-#: caslogin.php:39
 msgid "Incorrect username or password."
 msgstr "Мора да се назначи корисничко име и лозинка."
 
-#: caslogin.php:45
 msgid "Error setting user. You are probably not authorized."
 msgstr "Грешка при поставувањето на корисникот. Веројатно не сте потврдени."
diff --git a/plugins/CasAuthentication/locale/nl/LC_MESSAGES/CasAuthentication.po b/plugins/CasAuthentication/locale/nl/LC_MESSAGES/CasAuthentication.po
index 1f6e0b5786..f60f4e0029 100644
--- a/plugins/CasAuthentication/locale/nl/LC_MESSAGES/CasAuthentication.po
+++ b/plugins/CasAuthentication/locale/nl/LC_MESSAGES/CasAuthentication.po
@@ -9,51 +9,44 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - CasAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:27+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:59+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:35+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:09+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-casauthentication\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANS: Menu item. CAS is Central Authentication Service.
-#: CasAuthenticationPlugin.php:83
 msgid "CAS"
 msgstr "CAS"
 
 #. TRANS: Tooltip for menu item. CAS is Central Authentication Service.
-#: CasAuthenticationPlugin.php:85
 msgid "Login or register with CAS."
 msgstr "Aanmelden of registreren via CAS."
 
 #. TRANS: Invitation to users with a CAS account to log in using the service.
 #. TRANS: "[CAS login]" is a link description. (%%action.caslogin%%) is the URL.
 #. TRANS: These two elements may not be separated.
-#: CasAuthenticationPlugin.php:101
 #, php-format
 msgid "(Have an account with CAS? Try our [CAS login](%%action.caslogin%%)!)"
 msgstr ""
 "Hebt u een gebruiker met CAS? [Meld u dan aan met CAS](%%action.caslogin%%)!"
 
-#: CasAuthenticationPlugin.php:128
 msgid "Specifying a server is required."
 msgstr "Het aangeven van een server is vereist."
 
-#: CasAuthenticationPlugin.php:131
 msgid "Specifying a port is required."
 msgstr "Het aangeven van een poort is vereist."
 
-#: CasAuthenticationPlugin.php:134
 msgid "Specifying a path is required."
 msgstr "Het aangeven van een pad is vereist."
 
 #. TRANS: Plugin description. CAS is Central Authentication Service.
-#: CasAuthenticationPlugin.php:154
 msgid ""
 "The CAS Authentication plugin allows for StatusNet to handle authentication "
 "through CAS (Central Authentication Service)."
@@ -61,15 +54,12 @@ msgstr ""
 "De plugin CAS Authentication stelt StatusNet in staat authenticatie via CAS "
 "after handelen (Central Authentication Service)."
 
-#: caslogin.php:28
 msgid "Already logged in."
 msgstr "U bent al aangemeld."
 
-#: caslogin.php:39
 msgid "Incorrect username or password."
 msgstr "De gebruikersnaam of wachtwoord is onjuist."
 
-#: caslogin.php:45
 msgid "Error setting user. You are probably not authorized."
 msgstr ""
 "Er is een fout opgetreden bij het maken van de instellingen. U hebt "
diff --git a/plugins/CasAuthentication/locale/pt_BR/LC_MESSAGES/CasAuthentication.po b/plugins/CasAuthentication/locale/pt_BR/LC_MESSAGES/CasAuthentication.po
index 3f7a0e611b..387c0f5a97 100644
--- a/plugins/CasAuthentication/locale/pt_BR/LC_MESSAGES/CasAuthentication.po
+++ b/plugins/CasAuthentication/locale/pt_BR/LC_MESSAGES/CasAuthentication.po
@@ -9,65 +9,55 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - CasAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:27+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:59+0000\n"
 "Language-Team: Brazilian Portuguese <http://translatewiki.net/wiki/Portal:pt-"
 "br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:35+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:09+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt-br\n"
 "X-Message-Group: #out-statusnet-plugin-casauthentication\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. TRANS: Menu item. CAS is Central Authentication Service.
-#: CasAuthenticationPlugin.php:83
 msgid "CAS"
 msgstr ""
 
 #. TRANS: Tooltip for menu item. CAS is Central Authentication Service.
-#: CasAuthenticationPlugin.php:85
 msgid "Login or register with CAS."
 msgstr ""
 
 #. TRANS: Invitation to users with a CAS account to log in using the service.
 #. TRANS: "[CAS login]" is a link description. (%%action.caslogin%%) is the URL.
 #. TRANS: These two elements may not be separated.
-#: CasAuthenticationPlugin.php:101
 #, php-format
 msgid "(Have an account with CAS? Try our [CAS login](%%action.caslogin%%)!)"
 msgstr ""
 
-#: CasAuthenticationPlugin.php:128
 msgid "Specifying a server is required."
 msgstr "É necessário especificar um servidor."
 
-#: CasAuthenticationPlugin.php:131
 msgid "Specifying a port is required."
 msgstr "É necessário especificar uma porta."
 
-#: CasAuthenticationPlugin.php:134
 msgid "Specifying a path is required."
 msgstr ""
 
 #. TRANS: Plugin description. CAS is Central Authentication Service.
-#: CasAuthenticationPlugin.php:154
 msgid ""
 "The CAS Authentication plugin allows for StatusNet to handle authentication "
 "through CAS (Central Authentication Service)."
 msgstr ""
 
-#: caslogin.php:28
 msgid "Already logged in."
 msgstr "Já está autenticado."
 
-#: caslogin.php:39
 msgid "Incorrect username or password."
 msgstr "Nome de usuário e/ou senha incorreto(s)."
 
-#: caslogin.php:45
 msgid "Error setting user. You are probably not authorized."
 msgstr ""
 "Erro na configuração do usuário. Você provavelmente não tem autorização."
diff --git a/plugins/CasAuthentication/locale/ru/LC_MESSAGES/CasAuthentication.po b/plugins/CasAuthentication/locale/ru/LC_MESSAGES/CasAuthentication.po
index 699837455a..110f4d2213 100644
--- a/plugins/CasAuthentication/locale/ru/LC_MESSAGES/CasAuthentication.po
+++ b/plugins/CasAuthentication/locale/ru/LC_MESSAGES/CasAuthentication.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - CasAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:27+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:59+0000\n"
 "Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:35+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:09+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-casauthentication\n"
@@ -23,39 +23,32 @@ msgstr ""
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
 #. TRANS: Menu item. CAS is Central Authentication Service.
-#: CasAuthenticationPlugin.php:83
 msgid "CAS"
 msgstr "CAS"
 
 #. TRANS: Tooltip for menu item. CAS is Central Authentication Service.
-#: CasAuthenticationPlugin.php:85
 msgid "Login or register with CAS."
 msgstr "Войти или зарегистрироваться через CAS."
 
 #. TRANS: Invitation to users with a CAS account to log in using the service.
 #. TRANS: "[CAS login]" is a link description. (%%action.caslogin%%) is the URL.
 #. TRANS: These two elements may not be separated.
-#: CasAuthenticationPlugin.php:101
 #, php-format
 msgid "(Have an account with CAS? Try our [CAS login](%%action.caslogin%%)!)"
 msgstr ""
 "(Имеете учётную запись в CAS? Попробуйте [войти через него](%%action.caslogin"
 "%%)!)"
 
-#: CasAuthenticationPlugin.php:128
 msgid "Specifying a server is required."
 msgstr "Необходимо указать сервер."
 
-#: CasAuthenticationPlugin.php:131
 msgid "Specifying a port is required."
 msgstr "Необходимо указать порт."
 
-#: CasAuthenticationPlugin.php:134
 msgid "Specifying a path is required."
 msgstr "Необходимо указать путь."
 
 #. TRANS: Plugin description. CAS is Central Authentication Service.
-#: CasAuthenticationPlugin.php:154
 msgid ""
 "The CAS Authentication plugin allows for StatusNet to handle authentication "
 "through CAS (Central Authentication Service)."
@@ -64,14 +57,11 @@ msgstr ""
 "аутентификацию через CAS (централизованную службу аутентификации, англ. "
 "Central Authentication Service)."
 
-#: caslogin.php:28
 msgid "Already logged in."
 msgstr "Вы уже вошли."
 
-#: caslogin.php:39
 msgid "Incorrect username or password."
 msgstr "Неверное имя пользователя или пароль."
 
-#: caslogin.php:45
 msgid "Error setting user. You are probably not authorized."
 msgstr "Ошибка установки пользователя. Вы, вероятно, не авторизованы."
diff --git a/plugins/CasAuthentication/locale/uk/LC_MESSAGES/CasAuthentication.po b/plugins/CasAuthentication/locale/uk/LC_MESSAGES/CasAuthentication.po
index 899315d798..7808fb41f9 100644
--- a/plugins/CasAuthentication/locale/uk/LC_MESSAGES/CasAuthentication.po
+++ b/plugins/CasAuthentication/locale/uk/LC_MESSAGES/CasAuthentication.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - CasAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:27+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:59+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:35+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:09+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-casauthentication\n"
@@ -23,37 +23,30 @@ msgstr ""
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
 #. TRANS: Menu item. CAS is Central Authentication Service.
-#: CasAuthenticationPlugin.php:83
 msgid "CAS"
 msgstr "CAS"
 
 #. TRANS: Tooltip for menu item. CAS is Central Authentication Service.
-#: CasAuthenticationPlugin.php:85
 msgid "Login or register with CAS."
 msgstr "Увійти або зареєструватися з CAS."
 
 #. TRANS: Invitation to users with a CAS account to log in using the service.
 #. TRANS: "[CAS login]" is a link description. (%%action.caslogin%%) is the URL.
 #. TRANS: These two elements may not be separated.
-#: CasAuthenticationPlugin.php:101
 #, php-format
 msgid "(Have an account with CAS? Try our [CAS login](%%action.caslogin%%)!)"
 msgstr "Маєте акаунт CAS? Спробуйте наш [вхід CAS](%%action.caslogin%%)!)"
 
-#: CasAuthenticationPlugin.php:128
 msgid "Specifying a server is required."
 msgstr "Необхідно зазначити сервер."
 
-#: CasAuthenticationPlugin.php:131
 msgid "Specifying a port is required."
 msgstr "Необхідно зазначити порт."
 
-#: CasAuthenticationPlugin.php:134
 msgid "Specifying a path is required."
 msgstr "Необхідно зазначити шлях."
 
 #. TRANS: Plugin description. CAS is Central Authentication Service.
-#: CasAuthenticationPlugin.php:154
 msgid ""
 "The CAS Authentication plugin allows for StatusNet to handle authentication "
 "through CAS (Central Authentication Service)."
@@ -61,14 +54,11 @@ msgstr ""
 "Додаток автентифікації CAS дозволяє входити на сайт StatusNet за допомогою "
 "CAS (центрального сервісу автентифікації)."
 
-#: caslogin.php:28
 msgid "Already logged in."
 msgstr "Тепер ви увійшли."
 
-#: caslogin.php:39
 msgid "Incorrect username or password."
 msgstr "Неточне ім’я або пароль."
 
-#: caslogin.php:45
 msgid "Error setting user. You are probably not authorized."
 msgstr "Помилка налаштувань користувача. Можливо, ви не авторизовані."
diff --git a/plugins/CasAuthentication/locale/zh_CN/LC_MESSAGES/CasAuthentication.po b/plugins/CasAuthentication/locale/zh_CN/LC_MESSAGES/CasAuthentication.po
index 2f8d8bff5b..c0ca7fc832 100644
--- a/plugins/CasAuthentication/locale/zh_CN/LC_MESSAGES/CasAuthentication.po
+++ b/plugins/CasAuthentication/locale/zh_CN/LC_MESSAGES/CasAuthentication.po
@@ -9,65 +9,55 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - CasAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:27+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:59+0000\n"
 "Language-Team: Simplified Chinese <http://translatewiki.net/wiki/Portal:zh-"
 "hans>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:35+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:09+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-casauthentication\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. TRANS: Menu item. CAS is Central Authentication Service.
-#: CasAuthenticationPlugin.php:83
 msgid "CAS"
 msgstr "中央鉴权服务"
 
 #. TRANS: Tooltip for menu item. CAS is Central Authentication Service.
-#: CasAuthenticationPlugin.php:85
 msgid "Login or register with CAS."
 msgstr "登录或注册到中央鉴权服务"
 
 #. TRANS: Invitation to users with a CAS account to log in using the service.
 #. TRANS: "[CAS login]" is a link description. (%%action.caslogin%%) is the URL.
 #. TRANS: These two elements may not be separated.
-#: CasAuthenticationPlugin.php:101
 #, php-format
 msgid "(Have an account with CAS? Try our [CAS login](%%action.caslogin%%)!)"
 msgstr ""
 " (已有中央鉴权服务帐号？尝试使用 [中央鉴权登录](%%action.caslogin%%)！)"
 
-#: CasAuthenticationPlugin.php:128
 msgid "Specifying a server is required."
 msgstr "需要指定一个服务器"
 
-#: CasAuthenticationPlugin.php:131
 msgid "Specifying a port is required."
 msgstr "需要指定一个端口"
 
-#: CasAuthenticationPlugin.php:134
 msgid "Specifying a path is required."
 msgstr "需要指定一个路径"
 
 #. TRANS: Plugin description. CAS is Central Authentication Service.
-#: CasAuthenticationPlugin.php:154
 msgid ""
 "The CAS Authentication plugin allows for StatusNet to handle authentication "
 "through CAS (Central Authentication Service)."
 msgstr "中央鉴权插件可以使StatusNet使用中央鉴权服务进行登录鉴权。"
 
-#: caslogin.php:28
 msgid "Already logged in."
 msgstr "已登录。"
 
-#: caslogin.php:39
 msgid "Incorrect username or password."
 msgstr "用户名或密码错误"
 
-#: caslogin.php:45
 msgid "Error setting user. You are probably not authorized."
 msgstr "设置用户时出错。你可能没有通过鉴权。"
diff --git a/plugins/ClientSideShorten/locale/ClientSideShorten.pot b/plugins/ClientSideShorten/locale/ClientSideShorten.pot
index 336701917b..a8443d0131 100644
--- a/plugins/ClientSideShorten/locale/ClientSideShorten.pot
+++ b/plugins/ClientSideShorten/locale/ClientSideShorten.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/ClientSideShorten/locale/be-tarask/LC_MESSAGES/ClientSideShorten.po b/plugins/ClientSideShorten/locale/be-tarask/LC_MESSAGES/ClientSideShorten.po
index 82f8b9acf9..bf67748d92 100644
--- a/plugins/ClientSideShorten/locale/be-tarask/LC_MESSAGES/ClientSideShorten.po
+++ b/plugins/ClientSideShorten/locale/be-tarask/LC_MESSAGES/ClientSideShorten.po
@@ -9,20 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ClientSideShorten\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:26:48+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:59+0000\n"
 "Language-Team: Belarusian (Taraškievica orthography) <http://translatewiki."
 "net/wiki/Portal:be-tarask>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:19:34+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:35+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: be-tarask\n"
 "X-Message-Group: #out-statusnet-plugin-clientsideshorten\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ClientSideShortenPlugin.php:76
 msgid ""
 "ClientSideShorten causes the web interface's notice form to automatically "
 "shorten URLs as they entered, and before the notice is submitted."
@@ -30,6 +29,5 @@ msgstr ""
 "ClientSideShorten прымушае ўэб-інтэрфэйс аўтаматычна скарачаць URL-адрасы "
 "падчас уводу да таго, як паведамленьне будзе адпраўленае."
 
-#: shorten.php:55
 msgid "'text' argument must be specified."
 msgstr "Павінен быць пазначаны аргумэнт «text»."
diff --git a/plugins/ClientSideShorten/locale/br/LC_MESSAGES/ClientSideShorten.po b/plugins/ClientSideShorten/locale/br/LC_MESSAGES/ClientSideShorten.po
index 08688e2a37..6b68acdbd9 100644
--- a/plugins/ClientSideShorten/locale/br/LC_MESSAGES/ClientSideShorten.po
+++ b/plugins/ClientSideShorten/locale/br/LC_MESSAGES/ClientSideShorten.po
@@ -9,24 +9,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ClientSideShorten\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:26:48+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:59+0000\n"
 "Language-Team: Breton <http://translatewiki.net/wiki/Portal:br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:19:34+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:35+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-clientsideshorten\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ClientSideShortenPlugin.php:76
 msgid ""
 "ClientSideShorten causes the web interface's notice form to automatically "
 "shorten URLs as they entered, and before the notice is submitted."
 msgstr ""
 
-#: shorten.php:55
 msgid "'text' argument must be specified."
 msgstr "Spisaet e rank bezañ an arguzenn \"testenn\"."
diff --git a/plugins/ClientSideShorten/locale/de/LC_MESSAGES/ClientSideShorten.po b/plugins/ClientSideShorten/locale/de/LC_MESSAGES/ClientSideShorten.po
index 8a3b16ba4d..fbe6e1143f 100644
--- a/plugins/ClientSideShorten/locale/de/LC_MESSAGES/ClientSideShorten.po
+++ b/plugins/ClientSideShorten/locale/de/LC_MESSAGES/ClientSideShorten.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ClientSideShorten\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:26:48+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:59+0000\n"
 "Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:19:34+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:35+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-clientsideshorten\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ClientSideShortenPlugin.php:76
 msgid ""
 "ClientSideShorten causes the web interface's notice form to automatically "
 "shorten URLs as they entered, and before the notice is submitted."
@@ -29,6 +28,5 @@ msgstr ""
 "ClientSideShorten sorgt dafür, dass in die Nachrichtenbox eingegebene URLs "
 "sofort gekürzt werden, noch bevor die Nachricht gespeichert wird."
 
-#: shorten.php:55
 msgid "'text' argument must be specified."
 msgstr "Das „text“-Argument muss angegeben werden."
diff --git a/plugins/ClientSideShorten/locale/es/LC_MESSAGES/ClientSideShorten.po b/plugins/ClientSideShorten/locale/es/LC_MESSAGES/ClientSideShorten.po
index ffd4ea89e2..4de93f2197 100644
--- a/plugins/ClientSideShorten/locale/es/LC_MESSAGES/ClientSideShorten.po
+++ b/plugins/ClientSideShorten/locale/es/LC_MESSAGES/ClientSideShorten.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ClientSideShorten\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:26:48+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:36:59+0000\n"
 "Language-Team: Spanish <http://translatewiki.net/wiki/Portal:es>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:19:34+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:35+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-clientsideshorten\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ClientSideShortenPlugin.php:76
 msgid ""
 "ClientSideShorten causes the web interface's notice form to automatically "
 "shorten URLs as they entered, and before the notice is submitted."
@@ -30,6 +29,5 @@ msgstr ""
 "acorte las URL automáticamente conforme se introducen t antes de que se "
 "envíe el mensaje."
 
-#: shorten.php:55
 msgid "'text' argument must be specified."
 msgstr "Debe especificarse el argumento 'texto'."
diff --git a/plugins/ClientSideShorten/locale/fr/LC_MESSAGES/ClientSideShorten.po b/plugins/ClientSideShorten/locale/fr/LC_MESSAGES/ClientSideShorten.po
index e0bf8ce08a..f7b9e2eba0 100644
--- a/plugins/ClientSideShorten/locale/fr/LC_MESSAGES/ClientSideShorten.po
+++ b/plugins/ClientSideShorten/locale/fr/LC_MESSAGES/ClientSideShorten.po
@@ -10,19 +10,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ClientSideShorten\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:26:48+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:00+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:19:34+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:35+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-clientsideshorten\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ClientSideShortenPlugin.php:76
 msgid ""
 "ClientSideShorten causes the web interface's notice form to automatically "
 "shorten URLs as they entered, and before the notice is submitted."
@@ -31,6 +30,5 @@ msgstr ""
 "raccourcisse automatiquement les URL lorsqu’elles sont saisies, avant que "
 "l’avis ne soit soumis."
 
-#: shorten.php:55
 msgid "'text' argument must be specified."
 msgstr "L’argument « text » doit être spécifié."
diff --git a/plugins/ClientSideShorten/locale/he/LC_MESSAGES/ClientSideShorten.po b/plugins/ClientSideShorten/locale/he/LC_MESSAGES/ClientSideShorten.po
index c7a1d8c42e..09fb052a4e 100644
--- a/plugins/ClientSideShorten/locale/he/LC_MESSAGES/ClientSideShorten.po
+++ b/plugins/ClientSideShorten/locale/he/LC_MESSAGES/ClientSideShorten.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ClientSideShorten\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:26:48+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:00+0000\n"
 "Language-Team: Hebrew <http://translatewiki.net/wiki/Portal:he>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:19:34+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:35+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-plugin-clientsideshorten\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ClientSideShortenPlugin.php:76
 msgid ""
 "ClientSideShorten causes the web interface's notice form to automatically "
 "shorten URLs as they entered, and before the notice is submitted."
@@ -29,6 +28,5 @@ msgstr ""
 "התוסף ClientSideShorten (קיצור מצד הלקוח) גורם לטופס ההתרעה שבמנשק המשתמש "
 "לקצר אוטומטית כתובות כאשר הן מוזנות ולפני שההתרעה נשלחת."
 
-#: shorten.php:55
 msgid "'text' argument must be specified."
 msgstr "יש ציין את המשתנה 'text'"
diff --git a/plugins/ClientSideShorten/locale/ia/LC_MESSAGES/ClientSideShorten.po b/plugins/ClientSideShorten/locale/ia/LC_MESSAGES/ClientSideShorten.po
index 0a75887f5d..31a6aa5c82 100644
--- a/plugins/ClientSideShorten/locale/ia/LC_MESSAGES/ClientSideShorten.po
+++ b/plugins/ClientSideShorten/locale/ia/LC_MESSAGES/ClientSideShorten.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ClientSideShorten\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:26:48+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:00+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:19:34+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:35+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-clientsideshorten\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ClientSideShortenPlugin.php:76
 msgid ""
 "ClientSideShorten causes the web interface's notice form to automatically "
 "shorten URLs as they entered, and before the notice is submitted."
@@ -29,6 +28,5 @@ msgstr ""
 "ClientSideShorten causa que le formulario web pro entrar notas abbrevia "
 "automaticamente le adresses URL a lor entrata, e ante le submission del nota."
 
-#: shorten.php:55
 msgid "'text' argument must be specified."
 msgstr "Le parametro 'text' debe esser specificate."
diff --git a/plugins/ClientSideShorten/locale/id/LC_MESSAGES/ClientSideShorten.po b/plugins/ClientSideShorten/locale/id/LC_MESSAGES/ClientSideShorten.po
index 8c06a3167a..48bd844943 100644
--- a/plugins/ClientSideShorten/locale/id/LC_MESSAGES/ClientSideShorten.po
+++ b/plugins/ClientSideShorten/locale/id/LC_MESSAGES/ClientSideShorten.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ClientSideShorten\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:26:48+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:00+0000\n"
 "Language-Team: Indonesian <http://translatewiki.net/wiki/Portal:id>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:19:34+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:35+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: id\n"
 "X-Message-Group: #out-statusnet-plugin-clientsideshorten\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ClientSideShortenPlugin.php:76
 msgid ""
 "ClientSideShorten causes the web interface's notice form to automatically "
 "shorten URLs as they entered, and before the notice is submitted."
@@ -30,6 +29,5 @@ msgstr ""
 "memendekkan URL secara otomatis ketika dimasukkan, dan sebelum pemberitahuan "
 "dikirim."
 
-#: shorten.php:55
 msgid "'text' argument must be specified."
 msgstr "Argumen 'text' harus disebutkan."
diff --git a/plugins/ClientSideShorten/locale/mk/LC_MESSAGES/ClientSideShorten.po b/plugins/ClientSideShorten/locale/mk/LC_MESSAGES/ClientSideShorten.po
index 56a2aa77c9..361eaa942d 100644
--- a/plugins/ClientSideShorten/locale/mk/LC_MESSAGES/ClientSideShorten.po
+++ b/plugins/ClientSideShorten/locale/mk/LC_MESSAGES/ClientSideShorten.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ClientSideShorten\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:26:48+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:00+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:19:34+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:35+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-clientsideshorten\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
 
-#: ClientSideShortenPlugin.php:76
 msgid ""
 "ClientSideShorten causes the web interface's notice form to automatically "
 "shorten URLs as they entered, and before the notice is submitted."
@@ -30,6 +29,5 @@ msgstr ""
 "автоматски ги скратува URL-адресите при самото нивно внесување, и пред да се "
 "поднесе забелешката."
 
-#: shorten.php:55
 msgid "'text' argument must be specified."
 msgstr "Мора да се назначи аргументот „text“."
diff --git a/plugins/ClientSideShorten/locale/nb/LC_MESSAGES/ClientSideShorten.po b/plugins/ClientSideShorten/locale/nb/LC_MESSAGES/ClientSideShorten.po
index 3c458ea3e6..9f0f217532 100644
--- a/plugins/ClientSideShorten/locale/nb/LC_MESSAGES/ClientSideShorten.po
+++ b/plugins/ClientSideShorten/locale/nb/LC_MESSAGES/ClientSideShorten.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ClientSideShorten\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:26:48+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:00+0000\n"
 "Language-Team: Norwegian (bokmål)‬ <http://translatewiki.net/wiki/Portal:no>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:19:34+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:35+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: #out-statusnet-plugin-clientsideshorten\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ClientSideShortenPlugin.php:76
 msgid ""
 "ClientSideShorten causes the web interface's notice form to automatically "
 "shorten URLs as they entered, and before the notice is submitted."
@@ -29,6 +28,5 @@ msgstr ""
 "ClientSideShorten fører til at nettgrensesnittets notisskjema automatisk "
 "forkorter URL-er mens de skrives inn, og før notisen sendes inn."
 
-#: shorten.php:55
 msgid "'text' argument must be specified."
 msgstr "'text'-argument må spesifiseres."
diff --git a/plugins/ClientSideShorten/locale/nl/LC_MESSAGES/ClientSideShorten.po b/plugins/ClientSideShorten/locale/nl/LC_MESSAGES/ClientSideShorten.po
index 8e07250985..6af504c1c0 100644
--- a/plugins/ClientSideShorten/locale/nl/LC_MESSAGES/ClientSideShorten.po
+++ b/plugins/ClientSideShorten/locale/nl/LC_MESSAGES/ClientSideShorten.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ClientSideShorten\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:26:48+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:00+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:19:34+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:35+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-clientsideshorten\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ClientSideShortenPlugin.php:76
 msgid ""
 "ClientSideShorten causes the web interface's notice form to automatically "
 "shorten URLs as they entered, and before the notice is submitted."
@@ -30,6 +29,5 @@ msgstr ""
 "mededelingenformulier automatisch worden ingekort tijdens het invoeren en "
 "voordat de mededeling wordt opgeslagen."
 
-#: shorten.php:55
 msgid "'text' argument must be specified."
 msgstr "Het argument 'text' moet aangegeven worden."
diff --git a/plugins/ClientSideShorten/locale/ru/LC_MESSAGES/ClientSideShorten.po b/plugins/ClientSideShorten/locale/ru/LC_MESSAGES/ClientSideShorten.po
index e4f3be0d97..3deb9ab828 100644
--- a/plugins/ClientSideShorten/locale/ru/LC_MESSAGES/ClientSideShorten.po
+++ b/plugins/ClientSideShorten/locale/ru/LC_MESSAGES/ClientSideShorten.po
@@ -10,20 +10,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ClientSideShorten\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:26:48+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:00+0000\n"
 "Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:19:34+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:35+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-clientsideshorten\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: ClientSideShortenPlugin.php:76
 msgid ""
 "ClientSideShorten causes the web interface's notice form to automatically "
 "shorten URLs as they entered, and before the notice is submitted."
@@ -31,6 +30,5 @@ msgstr ""
 "Плагин ClientSideShorten производит автоматически сокращать URL-адреса при "
 "вводе в форму веб-интерфейса перед отправкой записи."
 
-#: shorten.php:55
 msgid "'text' argument must be specified."
 msgstr "Должен быть указан параметр «text»."
diff --git a/plugins/ClientSideShorten/locale/tl/LC_MESSAGES/ClientSideShorten.po b/plugins/ClientSideShorten/locale/tl/LC_MESSAGES/ClientSideShorten.po
index 928d92245b..479657c5e0 100644
--- a/plugins/ClientSideShorten/locale/tl/LC_MESSAGES/ClientSideShorten.po
+++ b/plugins/ClientSideShorten/locale/tl/LC_MESSAGES/ClientSideShorten.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ClientSideShorten\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:26:48+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:00+0000\n"
 "Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:19:34+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:35+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-clientsideshorten\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ClientSideShortenPlugin.php:76
 msgid ""
 "ClientSideShorten causes the web interface's notice form to automatically "
 "shorten URLs as they entered, and before the notice is submitted."
@@ -30,6 +29,5 @@ msgstr ""
 "mukha ng web na kusang paiksiin ang mga URL habang ipinapasok sila, at bago "
 "ipasa ang pabatid."
 
-#: shorten.php:55
 msgid "'text' argument must be specified."
 msgstr "dapat tukuyin ang argumento ng 'teksto'."
diff --git a/plugins/ClientSideShorten/locale/uk/LC_MESSAGES/ClientSideShorten.po b/plugins/ClientSideShorten/locale/uk/LC_MESSAGES/ClientSideShorten.po
index d9651bca90..66d489f8e7 100644
--- a/plugins/ClientSideShorten/locale/uk/LC_MESSAGES/ClientSideShorten.po
+++ b/plugins/ClientSideShorten/locale/uk/LC_MESSAGES/ClientSideShorten.po
@@ -10,20 +10,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ClientSideShorten\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:26:48+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:00+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:19:34+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:35+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-clientsideshorten\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: ClientSideShortenPlugin.php:76
 msgid ""
 "ClientSideShorten causes the web interface's notice form to automatically "
 "shorten URLs as they entered, and before the notice is submitted."
@@ -32,6 +31,5 @@ msgstr ""
 "при використанні веб-інтерфейсу для надсилання допису на сайт до того, як "
 "допис буде надіслано."
 
-#: shorten.php:55
 msgid "'text' argument must be specified."
 msgstr "Аргумент «text» має бути зазначено."
diff --git a/plugins/ClientSideShorten/locale/zh_CN/LC_MESSAGES/ClientSideShorten.po b/plugins/ClientSideShorten/locale/zh_CN/LC_MESSAGES/ClientSideShorten.po
index 2273d1dc42..4a78a98cd5 100644
--- a/plugins/ClientSideShorten/locale/zh_CN/LC_MESSAGES/ClientSideShorten.po
+++ b/plugins/ClientSideShorten/locale/zh_CN/LC_MESSAGES/ClientSideShorten.po
@@ -10,20 +10,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ClientSideShorten\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:26:48+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:00+0000\n"
 "Language-Team: Simplified Chinese <http://translatewiki.net/wiki/Portal:zh-"
 "hans>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:19:34+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:35+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-clientsideshorten\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ClientSideShortenPlugin.php:76
 msgid ""
 "ClientSideShorten causes the web interface's notice form to automatically "
 "shorten URLs as they entered, and before the notice is submitted."
@@ -31,6 +30,5 @@ msgstr ""
 "客户端短网址（ClientSideShorten ）将在消息发布前自动在网页界面下缩短输入的网"
 "址。"
 
-#: shorten.php:55
 msgid "'text' argument must be specified."
 msgstr "需要定义'text' 变量。"
diff --git a/plugins/Comet/locale/Comet.pot b/plugins/Comet/locale/Comet.pot
index dd36365090..83030afc2c 100644
--- a/plugins/Comet/locale/Comet.pot
+++ b/plugins/Comet/locale/Comet.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/Comet/locale/be-tarask/LC_MESSAGES/Comet.po b/plugins/Comet/locale/be-tarask/LC_MESSAGES/Comet.po
index cccc6e4faa..242c4970ee 100644
--- a/plugins/Comet/locale/be-tarask/LC_MESSAGES/Comet.po
+++ b/plugins/Comet/locale/be-tarask/LC_MESSAGES/Comet.po
@@ -9,20 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Comet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:28+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:00+0000\n"
 "Language-Team: Belarusian (Taraškievica orthography) <http://translatewiki."
 "net/wiki/Portal:be-tarask>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:37+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:11+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: be-tarask\n"
 "X-Message-Group: #out-statusnet-plugin-comet\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: CometPlugin.php:114
 msgid "Plugin to do \"real time\" updates using Comet/Bayeux."
 msgstr ""
 "Дапаўненьне для абнаўленьняў у «рэальным часе» з выкарыстаньнем Comet/Bayeux."
diff --git a/plugins/Comet/locale/br/LC_MESSAGES/Comet.po b/plugins/Comet/locale/br/LC_MESSAGES/Comet.po
index f242ae5210..c181729d3d 100644
--- a/plugins/Comet/locale/br/LC_MESSAGES/Comet.po
+++ b/plugins/Comet/locale/br/LC_MESSAGES/Comet.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Comet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:29+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:00+0000\n"
 "Language-Team: Breton <http://translatewiki.net/wiki/Portal:br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:37+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:11+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-comet\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: CometPlugin.php:114
 msgid "Plugin to do \"real time\" updates using Comet/Bayeux."
 msgstr ""
 "Un astenn evit ober hizivadennoù \"war ar prim\" en ur implijout Comet/"
diff --git a/plugins/Comet/locale/de/LC_MESSAGES/Comet.po b/plugins/Comet/locale/de/LC_MESSAGES/Comet.po
index 98c0a9db77..5cbff52f8c 100644
--- a/plugins/Comet/locale/de/LC_MESSAGES/Comet.po
+++ b/plugins/Comet/locale/de/LC_MESSAGES/Comet.po
@@ -9,18 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Comet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:29+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:00+0000\n"
 "Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:37+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:11+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-comet\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: CometPlugin.php:114
 msgid "Plugin to do \"real time\" updates using Comet/Bayeux."
 msgstr "Plugin für Echtzeit-Aktualisierungen mit Comet/Bayeux."
diff --git a/plugins/Comet/locale/es/LC_MESSAGES/Comet.po b/plugins/Comet/locale/es/LC_MESSAGES/Comet.po
index 929f5b03f9..b310c867c2 100644
--- a/plugins/Comet/locale/es/LC_MESSAGES/Comet.po
+++ b/plugins/Comet/locale/es/LC_MESSAGES/Comet.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Comet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:29+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:00+0000\n"
 "Language-Team: Spanish <http://translatewiki.net/wiki/Portal:es>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:37+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:11+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-comet\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: CometPlugin.php:114
 msgid "Plugin to do \"real time\" updates using Comet/Bayeux."
 msgstr ""
 "Extensión para hacer actualizaciones en \"tiempo real\" utilizando Comet/"
diff --git a/plugins/Comet/locale/fr/LC_MESSAGES/Comet.po b/plugins/Comet/locale/fr/LC_MESSAGES/Comet.po
index 2908ad46b0..3ae065b269 100644
--- a/plugins/Comet/locale/fr/LC_MESSAGES/Comet.po
+++ b/plugins/Comet/locale/fr/LC_MESSAGES/Comet.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Comet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:29+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:00+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:37+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:11+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-comet\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: CometPlugin.php:114
 msgid "Plugin to do \"real time\" updates using Comet/Bayeux."
 msgstr ""
 "Extension pour réaliser des mises à jour « en temps réel » en utilisant Comet/"
diff --git a/plugins/Comet/locale/he/LC_MESSAGES/Comet.po b/plugins/Comet/locale/he/LC_MESSAGES/Comet.po
index 0dd57f3968..254e29ee89 100644
--- a/plugins/Comet/locale/he/LC_MESSAGES/Comet.po
+++ b/plugins/Comet/locale/he/LC_MESSAGES/Comet.po
@@ -9,18 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Comet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:29+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:00+0000\n"
 "Language-Team: Hebrew <http://translatewiki.net/wiki/Portal:he>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:37+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:11+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-plugin-comet\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: CometPlugin.php:114
 msgid "Plugin to do \"real time\" updates using Comet/Bayeux."
 msgstr "תוסף לביצוע עדכונים \"בזמן אמת\" באמצעות Comet/Bayeux."
diff --git a/plugins/Comet/locale/ia/LC_MESSAGES/Comet.po b/plugins/Comet/locale/ia/LC_MESSAGES/Comet.po
index 459ac31af1..b2554302a1 100644
--- a/plugins/Comet/locale/ia/LC_MESSAGES/Comet.po
+++ b/plugins/Comet/locale/ia/LC_MESSAGES/Comet.po
@@ -9,18 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Comet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:29+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:00+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:37+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:11+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-comet\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: CometPlugin.php:114
 msgid "Plugin to do \"real time\" updates using Comet/Bayeux."
 msgstr "Plug-in pro facer actualisationes \"in directo\" usante Comet/Bayeux."
diff --git a/plugins/Comet/locale/id/LC_MESSAGES/Comet.po b/plugins/Comet/locale/id/LC_MESSAGES/Comet.po
index 8a4b05b516..bc8e35c45a 100644
--- a/plugins/Comet/locale/id/LC_MESSAGES/Comet.po
+++ b/plugins/Comet/locale/id/LC_MESSAGES/Comet.po
@@ -9,18 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Comet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:29+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:00+0000\n"
 "Language-Team: Indonesian <http://translatewiki.net/wiki/Portal:id>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:37+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:11+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: id\n"
 "X-Message-Group: #out-statusnet-plugin-comet\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: CometPlugin.php:114
 msgid "Plugin to do \"real time\" updates using Comet/Bayeux."
 msgstr "Pengaya untuk membuat pemutakhiran langsung menggunakan Comet/Bayeux."
diff --git a/plugins/Comet/locale/mk/LC_MESSAGES/Comet.po b/plugins/Comet/locale/mk/LC_MESSAGES/Comet.po
index a9f0c65c44..45e930397a 100644
--- a/plugins/Comet/locale/mk/LC_MESSAGES/Comet.po
+++ b/plugins/Comet/locale/mk/LC_MESSAGES/Comet.po
@@ -9,18 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Comet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:29+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:01+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:37+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:11+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-comet\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
 
-#: CometPlugin.php:114
 msgid "Plugin to do \"real time\" updates using Comet/Bayeux."
 msgstr "Приклучок за вршење на поднови „во живо“ со Comet/Bayeux."
diff --git a/plugins/Comet/locale/nb/LC_MESSAGES/Comet.po b/plugins/Comet/locale/nb/LC_MESSAGES/Comet.po
index bedc3aa0a2..3d399d61d1 100644
--- a/plugins/Comet/locale/nb/LC_MESSAGES/Comet.po
+++ b/plugins/Comet/locale/nb/LC_MESSAGES/Comet.po
@@ -9,18 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Comet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:29+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:01+0000\n"
 "Language-Team: Norwegian (bokmål)‬ <http://translatewiki.net/wiki/Portal:no>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:37+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:11+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: #out-statusnet-plugin-comet\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: CometPlugin.php:114
 msgid "Plugin to do \"real time\" updates using Comet/Bayeux."
 msgstr "Utvidelse for å gjøre «sanntids»-oppdateringer med Comet/Bayeux."
diff --git a/plugins/Comet/locale/nl/LC_MESSAGES/Comet.po b/plugins/Comet/locale/nl/LC_MESSAGES/Comet.po
index a12251fc8e..300b10939d 100644
--- a/plugins/Comet/locale/nl/LC_MESSAGES/Comet.po
+++ b/plugins/Comet/locale/nl/LC_MESSAGES/Comet.po
@@ -9,18 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Comet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:29+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:01+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:37+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:11+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-comet\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: CometPlugin.php:114
 msgid "Plugin to do \"real time\" updates using Comet/Bayeux."
 msgstr "Plug-in om \"real time\" updates te brengen via Comet/Bayeux."
diff --git a/plugins/Comet/locale/pt/LC_MESSAGES/Comet.po b/plugins/Comet/locale/pt/LC_MESSAGES/Comet.po
index 820e3b6bb0..517618ade8 100644
--- a/plugins/Comet/locale/pt/LC_MESSAGES/Comet.po
+++ b/plugins/Comet/locale/pt/LC_MESSAGES/Comet.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Comet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:29+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:01+0000\n"
 "Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:37+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:11+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-plugin-comet\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: CometPlugin.php:114
 msgid "Plugin to do \"real time\" updates using Comet/Bayeux."
 msgstr ""
 "Plugin para fazer actualizações em \"tempo real\" utilizando Comet/Bayeux."
diff --git a/plugins/Comet/locale/pt_BR/LC_MESSAGES/Comet.po b/plugins/Comet/locale/pt_BR/LC_MESSAGES/Comet.po
index 89273f4ffd..96785edc7c 100644
--- a/plugins/Comet/locale/pt_BR/LC_MESSAGES/Comet.po
+++ b/plugins/Comet/locale/pt_BR/LC_MESSAGES/Comet.po
@@ -9,20 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Comet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:29+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:01+0000\n"
 "Language-Team: Brazilian Portuguese <http://translatewiki.net/wiki/Portal:pt-"
 "br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:37+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:11+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt-br\n"
 "X-Message-Group: #out-statusnet-plugin-comet\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: CometPlugin.php:114
 msgid "Plugin to do \"real time\" updates using Comet/Bayeux."
 msgstr ""
 "Plugin para realizar atualizações em \"tempo real\" usando Comet/Bayeux."
diff --git a/plugins/Comet/locale/ru/LC_MESSAGES/Comet.po b/plugins/Comet/locale/ru/LC_MESSAGES/Comet.po
index b2b5891534..3861fea71f 100644
--- a/plugins/Comet/locale/ru/LC_MESSAGES/Comet.po
+++ b/plugins/Comet/locale/ru/LC_MESSAGES/Comet.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Comet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:29+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:01+0000\n"
 "Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:37+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:11+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-comet\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: CometPlugin.php:114
 msgid "Plugin to do \"real time\" updates using Comet/Bayeux."
 msgstr "Плагин для обновлений в «реальном времени» с помощью Comet/Bayeux."
diff --git a/plugins/Comet/locale/tl/LC_MESSAGES/Comet.po b/plugins/Comet/locale/tl/LC_MESSAGES/Comet.po
index 6bff8be738..8fbc093d60 100644
--- a/plugins/Comet/locale/tl/LC_MESSAGES/Comet.po
+++ b/plugins/Comet/locale/tl/LC_MESSAGES/Comet.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Comet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:29+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:01+0000\n"
 "Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:37+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:11+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-comet\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: CometPlugin.php:114
 msgid "Plugin to do \"real time\" updates using Comet/Bayeux."
 msgstr ""
 "Pamasak upang makagawa ng mga pagsasapanahong nasa \"tunay na panahon\" na "
diff --git a/plugins/Comet/locale/uk/LC_MESSAGES/Comet.po b/plugins/Comet/locale/uk/LC_MESSAGES/Comet.po
index 2a113239ea..48b2bc3e4b 100644
--- a/plugins/Comet/locale/uk/LC_MESSAGES/Comet.po
+++ b/plugins/Comet/locale/uk/LC_MESSAGES/Comet.po
@@ -9,20 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Comet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:29+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:01+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:37+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:11+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-comet\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: CometPlugin.php:114
 msgid "Plugin to do \"real time\" updates using Comet/Bayeux."
 msgstr ""
 "Додаток для оновлення стрічки у «реальному часі» використовуючи Comet/Bayeux."
diff --git a/plugins/Comet/locale/zh_CN/LC_MESSAGES/Comet.po b/plugins/Comet/locale/zh_CN/LC_MESSAGES/Comet.po
index 71ccffe3c1..1df6bf2023 100644
--- a/plugins/Comet/locale/zh_CN/LC_MESSAGES/Comet.po
+++ b/plugins/Comet/locale/zh_CN/LC_MESSAGES/Comet.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Comet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:29+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:01+0000\n"
 "Language-Team: Simplified Chinese <http://translatewiki.net/wiki/Portal:zh-"
 "hans>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:18:37+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:11+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-comet\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: CometPlugin.php:114
 msgid "Plugin to do \"real time\" updates using Comet/Bayeux."
 msgstr "通过 Comet/Bayeux 实现“实时更新”的插件。"
diff --git a/plugins/DirectionDetector/locale/DirectionDetector.pot b/plugins/DirectionDetector/locale/DirectionDetector.pot
index 9f7981a9ee..358d2d0ae1 100644
--- a/plugins/DirectionDetector/locale/DirectionDetector.pot
+++ b/plugins/DirectionDetector/locale/DirectionDetector.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/DirectionDetector/locale/be-tarask/LC_MESSAGES/DirectionDetector.po b/plugins/DirectionDetector/locale/be-tarask/LC_MESSAGES/DirectionDetector.po
index 074a8e1a34..a79cc057f2 100644
--- a/plugins/DirectionDetector/locale/be-tarask/LC_MESSAGES/DirectionDetector.po
+++ b/plugins/DirectionDetector/locale/be-tarask/LC_MESSAGES/DirectionDetector.po
@@ -9,20 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DirectionDetector\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:29+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:01+0000\n"
 "Language-Team: Belarusian (Taraškievica orthography) <http://translatewiki."
 "net/wiki/Portal:be-tarask>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:08+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:12+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: be-tarask\n"
 "X-Message-Group: #out-statusnet-plugin-directiondetector\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: DirectionDetectorPlugin.php:264
 msgid "Shows notices with right-to-left content in correct direction."
 msgstr ""
 "Паказвае паведамленьні са зьместам напісаньня справа налева ў слушным "
diff --git a/plugins/DirectionDetector/locale/br/LC_MESSAGES/DirectionDetector.po b/plugins/DirectionDetector/locale/br/LC_MESSAGES/DirectionDetector.po
index 3cfe745057..346c451ad2 100644
--- a/plugins/DirectionDetector/locale/br/LC_MESSAGES/DirectionDetector.po
+++ b/plugins/DirectionDetector/locale/br/LC_MESSAGES/DirectionDetector.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DirectionDetector\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:29+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:01+0000\n"
 "Language-Team: Breton <http://translatewiki.net/wiki/Portal:br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:08+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:12+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-directiondetector\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: DirectionDetectorPlugin.php:264
 msgid "Shows notices with right-to-left content in correct direction."
 msgstr ""
 "Diskwel a ra war an tu mat ar c'hemennoù enno testennoù skrivet a-zehou da "
diff --git a/plugins/DirectionDetector/locale/de/LC_MESSAGES/DirectionDetector.po b/plugins/DirectionDetector/locale/de/LC_MESSAGES/DirectionDetector.po
index 640d3c591a..7195282cae 100644
--- a/plugins/DirectionDetector/locale/de/LC_MESSAGES/DirectionDetector.po
+++ b/plugins/DirectionDetector/locale/de/LC_MESSAGES/DirectionDetector.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DirectionDetector\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:29+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:01+0000\n"
 "Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:08+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:12+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-directiondetector\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: DirectionDetectorPlugin.php:264
 msgid "Shows notices with right-to-left content in correct direction."
 msgstr ""
 "Zeigt Nachrichten mit Rechts-nach-Links-Inhalt in der korrekten Richtung an."
diff --git a/plugins/DirectionDetector/locale/es/LC_MESSAGES/DirectionDetector.po b/plugins/DirectionDetector/locale/es/LC_MESSAGES/DirectionDetector.po
index 23437008e6..d496074ebe 100644
--- a/plugins/DirectionDetector/locale/es/LC_MESSAGES/DirectionDetector.po
+++ b/plugins/DirectionDetector/locale/es/LC_MESSAGES/DirectionDetector.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DirectionDetector\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:29+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:01+0000\n"
 "Language-Team: Spanish <http://translatewiki.net/wiki/Portal:es>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:08+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:12+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-directiondetector\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: DirectionDetectorPlugin.php:264
 msgid "Shows notices with right-to-left content in correct direction."
 msgstr ""
 "Muestra los mensajes de contenido derecha-a-izquierda en la dirección "
diff --git a/plugins/DirectionDetector/locale/fr/LC_MESSAGES/DirectionDetector.po b/plugins/DirectionDetector/locale/fr/LC_MESSAGES/DirectionDetector.po
index 1fa1db84b8..55e1fe3b9f 100644
--- a/plugins/DirectionDetector/locale/fr/LC_MESSAGES/DirectionDetector.po
+++ b/plugins/DirectionDetector/locale/fr/LC_MESSAGES/DirectionDetector.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DirectionDetector\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:29+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:02+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:08+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:12+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-directiondetector\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: DirectionDetectorPlugin.php:264
 msgid "Shows notices with right-to-left content in correct direction."
 msgstr ""
 "Affiche dans les bon sens les avis contenant du texte écrit de droite à "
diff --git a/plugins/DirectionDetector/locale/he/LC_MESSAGES/DirectionDetector.po b/plugins/DirectionDetector/locale/he/LC_MESSAGES/DirectionDetector.po
index 6ef2038112..2d18f81416 100644
--- a/plugins/DirectionDetector/locale/he/LC_MESSAGES/DirectionDetector.po
+++ b/plugins/DirectionDetector/locale/he/LC_MESSAGES/DirectionDetector.po
@@ -9,18 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DirectionDetector\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:30+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:02+0000\n"
 "Language-Team: Hebrew <http://translatewiki.net/wiki/Portal:he>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:08+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:12+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-plugin-directiondetector\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: DirectionDetectorPlugin.php:264
 msgid "Shows notices with right-to-left content in correct direction."
 msgstr "הצגת הערות עם תוכן מימין לשמאל בכיוון הנכון."
diff --git a/plugins/DirectionDetector/locale/ia/LC_MESSAGES/DirectionDetector.po b/plugins/DirectionDetector/locale/ia/LC_MESSAGES/DirectionDetector.po
index 1017780903..1074b3d100 100644
--- a/plugins/DirectionDetector/locale/ia/LC_MESSAGES/DirectionDetector.po
+++ b/plugins/DirectionDetector/locale/ia/LC_MESSAGES/DirectionDetector.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DirectionDetector\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:30+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:02+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:08+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:12+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-directiondetector\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: DirectionDetectorPlugin.php:264
 msgid "Shows notices with right-to-left content in correct direction."
 msgstr ""
 "Monstra notas con scripto de dextra a sinistra in le direction correcte."
diff --git a/plugins/DirectionDetector/locale/id/LC_MESSAGES/DirectionDetector.po b/plugins/DirectionDetector/locale/id/LC_MESSAGES/DirectionDetector.po
index 1c98dd2305..31d9d6882a 100644
--- a/plugins/DirectionDetector/locale/id/LC_MESSAGES/DirectionDetector.po
+++ b/plugins/DirectionDetector/locale/id/LC_MESSAGES/DirectionDetector.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DirectionDetector\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:30+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:02+0000\n"
 "Language-Team: Indonesian <http://translatewiki.net/wiki/Portal:id>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:08+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:12+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: id\n"
 "X-Message-Group: #out-statusnet-plugin-directiondetector\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: DirectionDetectorPlugin.php:264
 msgid "Shows notices with right-to-left content in correct direction."
 msgstr ""
 "Menampilkan pemberitahuan dengan konten kanan-ke-kiri dalam arah yang tepat."
diff --git a/plugins/DirectionDetector/locale/ja/LC_MESSAGES/DirectionDetector.po b/plugins/DirectionDetector/locale/ja/LC_MESSAGES/DirectionDetector.po
index 691f93974e..ceab5e1e76 100644
--- a/plugins/DirectionDetector/locale/ja/LC_MESSAGES/DirectionDetector.po
+++ b/plugins/DirectionDetector/locale/ja/LC_MESSAGES/DirectionDetector.po
@@ -9,18 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DirectionDetector\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:30+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:02+0000\n"
 "Language-Team: Japanese <http://translatewiki.net/wiki/Portal:ja>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:08+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:12+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ja\n"
 "X-Message-Group: #out-statusnet-plugin-directiondetector\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: DirectionDetectorPlugin.php:264
 msgid "Shows notices with right-to-left content in correct direction."
 msgstr "正しい方向で右から左へ表示される内容の通知を表示する。"
diff --git a/plugins/DirectionDetector/locale/lb/LC_MESSAGES/DirectionDetector.po b/plugins/DirectionDetector/locale/lb/LC_MESSAGES/DirectionDetector.po
index 4e6143e015..a616718664 100644
--- a/plugins/DirectionDetector/locale/lb/LC_MESSAGES/DirectionDetector.po
+++ b/plugins/DirectionDetector/locale/lb/LC_MESSAGES/DirectionDetector.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DirectionDetector\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:30+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:02+0000\n"
 "Language-Team: Luxembourgish <http://translatewiki.net/wiki/Portal:lb>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:08+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:12+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: lb\n"
 "X-Message-Group: #out-statusnet-plugin-directiondetector\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: DirectionDetectorPlugin.php:264
 msgid "Shows notices with right-to-left content in correct direction."
 msgstr ""
 "Weist Matdeelungen mat Inhalt dee vu riets not lenks geschriwwen ass an där "
diff --git a/plugins/DirectionDetector/locale/mk/LC_MESSAGES/DirectionDetector.po b/plugins/DirectionDetector/locale/mk/LC_MESSAGES/DirectionDetector.po
index 54157492e8..2cab8b88bd 100644
--- a/plugins/DirectionDetector/locale/mk/LC_MESSAGES/DirectionDetector.po
+++ b/plugins/DirectionDetector/locale/mk/LC_MESSAGES/DirectionDetector.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DirectionDetector\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:30+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:02+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:08+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:12+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-directiondetector\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
 
-#: DirectionDetectorPlugin.php:264
 msgid "Shows notices with right-to-left content in correct direction."
 msgstr ""
 "Ги прикажува забелешките напишани на писма од десно на лево во исправната "
diff --git a/plugins/DirectionDetector/locale/nb/LC_MESSAGES/DirectionDetector.po b/plugins/DirectionDetector/locale/nb/LC_MESSAGES/DirectionDetector.po
index 4303c8622e..995f251ebf 100644
--- a/plugins/DirectionDetector/locale/nb/LC_MESSAGES/DirectionDetector.po
+++ b/plugins/DirectionDetector/locale/nb/LC_MESSAGES/DirectionDetector.po
@@ -9,18 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DirectionDetector\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:30+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:02+0000\n"
 "Language-Team: Norwegian (bokmål)‬ <http://translatewiki.net/wiki/Portal:no>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:08+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:12+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: #out-statusnet-plugin-directiondetector\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: DirectionDetectorPlugin.php:264
 msgid "Shows notices with right-to-left content in correct direction."
 msgstr "Viser notiser med høyre-til-venstre-innhold i riktig retning."
diff --git a/plugins/DirectionDetector/locale/nl/LC_MESSAGES/DirectionDetector.po b/plugins/DirectionDetector/locale/nl/LC_MESSAGES/DirectionDetector.po
index 77cfa1573b..c1e7a130f9 100644
--- a/plugins/DirectionDetector/locale/nl/LC_MESSAGES/DirectionDetector.po
+++ b/plugins/DirectionDetector/locale/nl/LC_MESSAGES/DirectionDetector.po
@@ -9,21 +9,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DirectionDetector\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:30+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:02+0000\n"
 "Last-Translator: Siebrand Mazeland <s.mazeland@xs4all.nl>\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-01-14 13:21:08+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:12+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-directiondetector\n"
 
-#: DirectionDetectorPlugin.php:264
 msgid "Shows notices with right-to-left content in correct direction."
 msgstr ""
 "Geeft mededelingen met inhoud in een van rechts naar links geschreven "
diff --git a/plugins/DirectionDetector/locale/pt/LC_MESSAGES/DirectionDetector.po b/plugins/DirectionDetector/locale/pt/LC_MESSAGES/DirectionDetector.po
index 276f5d6a79..99c7a1c724 100644
--- a/plugins/DirectionDetector/locale/pt/LC_MESSAGES/DirectionDetector.po
+++ b/plugins/DirectionDetector/locale/pt/LC_MESSAGES/DirectionDetector.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DirectionDetector\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:30+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:02+0000\n"
 "Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:08+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:12+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-plugin-directiondetector\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: DirectionDetectorPlugin.php:264
 msgid "Shows notices with right-to-left content in correct direction."
 msgstr ""
 "Mostra mensagens com conteúdo da direita para a esquerda na direcção "
diff --git a/plugins/DirectionDetector/locale/ru/LC_MESSAGES/DirectionDetector.po b/plugins/DirectionDetector/locale/ru/LC_MESSAGES/DirectionDetector.po
index a7a0d8a470..de3200bb4e 100644
--- a/plugins/DirectionDetector/locale/ru/LC_MESSAGES/DirectionDetector.po
+++ b/plugins/DirectionDetector/locale/ru/LC_MESSAGES/DirectionDetector.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DirectionDetector\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:30+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:02+0000\n"
 "Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:08+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:12+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-directiondetector\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: DirectionDetectorPlugin.php:264
 msgid "Shows notices with right-to-left content in correct direction."
 msgstr "Правильно показывает уведомления для системы письма справа налево."
diff --git a/plugins/DirectionDetector/locale/tl/LC_MESSAGES/DirectionDetector.po b/plugins/DirectionDetector/locale/tl/LC_MESSAGES/DirectionDetector.po
index e2de349799..3646597c64 100644
--- a/plugins/DirectionDetector/locale/tl/LC_MESSAGES/DirectionDetector.po
+++ b/plugins/DirectionDetector/locale/tl/LC_MESSAGES/DirectionDetector.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DirectionDetector\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:30+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:02+0000\n"
 "Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:08+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:12+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-directiondetector\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: DirectionDetectorPlugin.php:264
 msgid "Shows notices with right-to-left content in correct direction."
 msgstr ""
 "Nagpapakita ng mga pabatid na may nilalamang mula-kanan-pakaliwa sa tamang "
diff --git a/plugins/DirectionDetector/locale/uk/LC_MESSAGES/DirectionDetector.po b/plugins/DirectionDetector/locale/uk/LC_MESSAGES/DirectionDetector.po
index 7ad952e2e4..0bc43d6a23 100644
--- a/plugins/DirectionDetector/locale/uk/LC_MESSAGES/DirectionDetector.po
+++ b/plugins/DirectionDetector/locale/uk/LC_MESSAGES/DirectionDetector.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DirectionDetector\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:31+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:02+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:08+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:12+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-directiondetector\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: DirectionDetectorPlugin.php:264
 msgid "Shows notices with right-to-left content in correct direction."
 msgstr "Показує повідомлення із письмом справа наліво у правильному напрямі."
diff --git a/plugins/DirectionDetector/locale/zh_CN/LC_MESSAGES/DirectionDetector.po b/plugins/DirectionDetector/locale/zh_CN/LC_MESSAGES/DirectionDetector.po
index be7a64fa09..525af19fd3 100644
--- a/plugins/DirectionDetector/locale/zh_CN/LC_MESSAGES/DirectionDetector.po
+++ b/plugins/DirectionDetector/locale/zh_CN/LC_MESSAGES/DirectionDetector.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DirectionDetector\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:31+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:02+0000\n"
 "Language-Team: Simplified Chinese <http://translatewiki.net/wiki/Portal:zh-"
 "hans>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:08+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:12+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-directiondetector\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: DirectionDetectorPlugin.php:264
 msgid "Shows notices with right-to-left content in correct direction."
 msgstr "在内容方向为从右到左时，以相同的文字方向显示提醒。"
diff --git a/plugins/DiskCache/locale/DiskCache.pot b/plugins/DiskCache/locale/DiskCache.pot
index ca717a462d..d0ffd89257 100644
--- a/plugins/DiskCache/locale/DiskCache.pot
+++ b/plugins/DiskCache/locale/DiskCache.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/DiskCache/locale/be-tarask/LC_MESSAGES/DiskCache.po b/plugins/DiskCache/locale/be-tarask/LC_MESSAGES/DiskCache.po
index 50857ab9be..3824cef479 100644
--- a/plugins/DiskCache/locale/be-tarask/LC_MESSAGES/DiskCache.po
+++ b/plugins/DiskCache/locale/be-tarask/LC_MESSAGES/DiskCache.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DiskCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:32+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:02+0000\n"
 "Language-Team: Belarusian (Taraškievica orthography) <http://translatewiki."
 "net/wiki/Portal:be-tarask>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:09+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:13+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: be-tarask\n"
 "X-Message-Group: #out-statusnet-plugin-diskcache\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: DiskCachePlugin.php:175
 msgid "Plugin to implement cache interface with disk files."
 msgstr "Дапаўненьне для рэалізацыі інтэрфэйса кэшаваньня ў файлах на дыску."
diff --git a/plugins/DiskCache/locale/br/LC_MESSAGES/DiskCache.po b/plugins/DiskCache/locale/br/LC_MESSAGES/DiskCache.po
index 197a7c5052..68b7ba97ca 100644
--- a/plugins/DiskCache/locale/br/LC_MESSAGES/DiskCache.po
+++ b/plugins/DiskCache/locale/br/LC_MESSAGES/DiskCache.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DiskCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:32+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:02+0000\n"
 "Language-Team: Breton <http://translatewiki.net/wiki/Portal:br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:09+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:13+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-diskcache\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: DiskCachePlugin.php:175
 msgid "Plugin to implement cache interface with disk files."
 msgstr ""
 "Astenn evit emplementañ un etrefas krubuilh gant restroù eus ar bladenn"
diff --git a/plugins/DiskCache/locale/de/LC_MESSAGES/DiskCache.po b/plugins/DiskCache/locale/de/LC_MESSAGES/DiskCache.po
index d0803feb71..56856e4563 100644
--- a/plugins/DiskCache/locale/de/LC_MESSAGES/DiskCache.po
+++ b/plugins/DiskCache/locale/de/LC_MESSAGES/DiskCache.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DiskCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:32+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:02+0000\n"
 "Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:09+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:13+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-diskcache\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: DiskCachePlugin.php:175
 msgid "Plugin to implement cache interface with disk files."
 msgstr ""
 "Plugin zur Implementierung einer festplatten basierten Cache-Schnittstelle"
diff --git a/plugins/DiskCache/locale/es/LC_MESSAGES/DiskCache.po b/plugins/DiskCache/locale/es/LC_MESSAGES/DiskCache.po
index ba565453ea..18477fdfeb 100644
--- a/plugins/DiskCache/locale/es/LC_MESSAGES/DiskCache.po
+++ b/plugins/DiskCache/locale/es/LC_MESSAGES/DiskCache.po
@@ -9,18 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DiskCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:32+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:02+0000\n"
 "Language-Team: Spanish <http://translatewiki.net/wiki/Portal:es>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:09+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:13+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-diskcache\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: DiskCachePlugin.php:175
 msgid "Plugin to implement cache interface with disk files."
 msgstr "Extensión para implementar interfaz de caché con archivos de disco."
diff --git a/plugins/DiskCache/locale/fr/LC_MESSAGES/DiskCache.po b/plugins/DiskCache/locale/fr/LC_MESSAGES/DiskCache.po
index 34662b74a3..fcbae0f416 100644
--- a/plugins/DiskCache/locale/fr/LC_MESSAGES/DiskCache.po
+++ b/plugins/DiskCache/locale/fr/LC_MESSAGES/DiskCache.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DiskCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:32+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:02+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:09+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:13+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-diskcache\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: DiskCachePlugin.php:175
 msgid "Plugin to implement cache interface with disk files."
 msgstr ""
 "Extension pour mettre en œuvre une interface de mémoire tampon dans des "
diff --git a/plugins/DiskCache/locale/he/LC_MESSAGES/DiskCache.po b/plugins/DiskCache/locale/he/LC_MESSAGES/DiskCache.po
index 649f8754bd..fe7ad44596 100644
--- a/plugins/DiskCache/locale/he/LC_MESSAGES/DiskCache.po
+++ b/plugins/DiskCache/locale/he/LC_MESSAGES/DiskCache.po
@@ -9,18 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DiskCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:32+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:03+0000\n"
 "Language-Team: Hebrew <http://translatewiki.net/wiki/Portal:he>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:09+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:13+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-plugin-diskcache\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: DiskCachePlugin.php:175
 msgid "Plugin to implement cache interface with disk files."
 msgstr "תוסף להטמעת מנשק מטמון מול קבצים שבכונן."
diff --git a/plugins/DiskCache/locale/ia/LC_MESSAGES/DiskCache.po b/plugins/DiskCache/locale/ia/LC_MESSAGES/DiskCache.po
index c3106db284..944c39415b 100644
--- a/plugins/DiskCache/locale/ia/LC_MESSAGES/DiskCache.po
+++ b/plugins/DiskCache/locale/ia/LC_MESSAGES/DiskCache.po
@@ -9,18 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DiskCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:32+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:03+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:09+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:13+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-diskcache\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: DiskCachePlugin.php:175
 msgid "Plugin to implement cache interface with disk files."
 msgstr "Plug-in pro implementar un interfacie de cache con files sur disco."
diff --git a/plugins/DiskCache/locale/id/LC_MESSAGES/DiskCache.po b/plugins/DiskCache/locale/id/LC_MESSAGES/DiskCache.po
index e5353d57d1..83823bf945 100644
--- a/plugins/DiskCache/locale/id/LC_MESSAGES/DiskCache.po
+++ b/plugins/DiskCache/locale/id/LC_MESSAGES/DiskCache.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DiskCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:32+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:03+0000\n"
 "Language-Team: Indonesian <http://translatewiki.net/wiki/Portal:id>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:09+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:13+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: id\n"
 "X-Message-Group: #out-statusnet-plugin-diskcache\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: DiskCachePlugin.php:175
 msgid "Plugin to implement cache interface with disk files."
 msgstr ""
 "Pengaya untuk mengimplementasikan antarmuka singgahan dengan berkas cakram."
diff --git a/plugins/DiskCache/locale/mk/LC_MESSAGES/DiskCache.po b/plugins/DiskCache/locale/mk/LC_MESSAGES/DiskCache.po
index 84b1c65254..70077025bc 100644
--- a/plugins/DiskCache/locale/mk/LC_MESSAGES/DiskCache.po
+++ b/plugins/DiskCache/locale/mk/LC_MESSAGES/DiskCache.po
@@ -9,18 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DiskCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:32+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:03+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:09+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:13+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-diskcache\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
 
-#: DiskCachePlugin.php:175
 msgid "Plugin to implement cache interface with disk files."
 msgstr "Приклучок за примена на кеш-посредник со податотеки на дискот."
diff --git a/plugins/DiskCache/locale/nb/LC_MESSAGES/DiskCache.po b/plugins/DiskCache/locale/nb/LC_MESSAGES/DiskCache.po
index 5cbd3fbf55..d64e06cf1a 100644
--- a/plugins/DiskCache/locale/nb/LC_MESSAGES/DiskCache.po
+++ b/plugins/DiskCache/locale/nb/LC_MESSAGES/DiskCache.po
@@ -9,18 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DiskCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:32+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:03+0000\n"
 "Language-Team: Norwegian (bokmål)‬ <http://translatewiki.net/wiki/Portal:no>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:09+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:13+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: #out-statusnet-plugin-diskcache\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: DiskCachePlugin.php:175
 msgid "Plugin to implement cache interface with disk files."
 msgstr "Utvidelse for å implementere hurtiglagergrensesnitt med disk-filer."
diff --git a/plugins/DiskCache/locale/nl/LC_MESSAGES/DiskCache.po b/plugins/DiskCache/locale/nl/LC_MESSAGES/DiskCache.po
index 9dca1a007c..a68dbdd184 100644
--- a/plugins/DiskCache/locale/nl/LC_MESSAGES/DiskCache.po
+++ b/plugins/DiskCache/locale/nl/LC_MESSAGES/DiskCache.po
@@ -9,18 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DiskCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:32+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:03+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:09+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:13+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-diskcache\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: DiskCachePlugin.php:175
 msgid "Plugin to implement cache interface with disk files."
 msgstr "Plugin voor een cacheinterface met bestanden op schijf."
diff --git a/plugins/DiskCache/locale/pt/LC_MESSAGES/DiskCache.po b/plugins/DiskCache/locale/pt/LC_MESSAGES/DiskCache.po
index 1d0c605928..89e8ef0f14 100644
--- a/plugins/DiskCache/locale/pt/LC_MESSAGES/DiskCache.po
+++ b/plugins/DiskCache/locale/pt/LC_MESSAGES/DiskCache.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DiskCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:32+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:03+0000\n"
 "Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:09+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:13+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-plugin-diskcache\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: DiskCachePlugin.php:175
 msgid "Plugin to implement cache interface with disk files."
 msgstr ""
 "Plugin para implementar a interface entre a cache e os ficheiros em disco."
diff --git a/plugins/DiskCache/locale/pt_BR/LC_MESSAGES/DiskCache.po b/plugins/DiskCache/locale/pt_BR/LC_MESSAGES/DiskCache.po
index 80068f4e5f..fd577ab993 100644
--- a/plugins/DiskCache/locale/pt_BR/LC_MESSAGES/DiskCache.po
+++ b/plugins/DiskCache/locale/pt_BR/LC_MESSAGES/DiskCache.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DiskCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:32+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:03+0000\n"
 "Language-Team: Brazilian Portuguese <http://translatewiki.net/wiki/Portal:pt-"
 "br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:09+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:13+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt-br\n"
 "X-Message-Group: #out-statusnet-plugin-diskcache\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: DiskCachePlugin.php:175
 msgid "Plugin to implement cache interface with disk files."
 msgstr "Plugin para implementar interface de cache com arquivos de disco."
diff --git a/plugins/DiskCache/locale/ru/LC_MESSAGES/DiskCache.po b/plugins/DiskCache/locale/ru/LC_MESSAGES/DiskCache.po
index b4600862e3..a3999fb02c 100644
--- a/plugins/DiskCache/locale/ru/LC_MESSAGES/DiskCache.po
+++ b/plugins/DiskCache/locale/ru/LC_MESSAGES/DiskCache.po
@@ -9,20 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DiskCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:32+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:03+0000\n"
 "Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:09+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:13+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-diskcache\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: DiskCachePlugin.php:175
 msgid "Plugin to implement cache interface with disk files."
 msgstr ""
 "Плагин для реализации интерфейса кэширования с помощью файлов на диске."
diff --git a/plugins/DiskCache/locale/tl/LC_MESSAGES/DiskCache.po b/plugins/DiskCache/locale/tl/LC_MESSAGES/DiskCache.po
index 3ac7a4d86f..d7f45f4564 100644
--- a/plugins/DiskCache/locale/tl/LC_MESSAGES/DiskCache.po
+++ b/plugins/DiskCache/locale/tl/LC_MESSAGES/DiskCache.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DiskCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:32+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:03+0000\n"
 "Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:09+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:13+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-diskcache\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: DiskCachePlugin.php:175
 msgid "Plugin to implement cache interface with disk files."
 msgstr ""
 "Pampasak upang maipatupad ang ugnayang-mukha ng taguan na may mga talaksan "
diff --git a/plugins/DiskCache/locale/uk/LC_MESSAGES/DiskCache.po b/plugins/DiskCache/locale/uk/LC_MESSAGES/DiskCache.po
index 501818483f..347331a260 100644
--- a/plugins/DiskCache/locale/uk/LC_MESSAGES/DiskCache.po
+++ b/plugins/DiskCache/locale/uk/LC_MESSAGES/DiskCache.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DiskCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:32+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:03+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:09+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:13+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-diskcache\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: DiskCachePlugin.php:175
 msgid "Plugin to implement cache interface with disk files."
 msgstr "Додаток для збереження кешу інтерфейсу на дисках."
diff --git a/plugins/DiskCache/locale/zh_CN/LC_MESSAGES/DiskCache.po b/plugins/DiskCache/locale/zh_CN/LC_MESSAGES/DiskCache.po
index d17eccfaf1..b5764f54e9 100644
--- a/plugins/DiskCache/locale/zh_CN/LC_MESSAGES/DiskCache.po
+++ b/plugins/DiskCache/locale/zh_CN/LC_MESSAGES/DiskCache.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DiskCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:32+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:03+0000\n"
 "Language-Team: Simplified Chinese <http://translatewiki.net/wiki/Portal:zh-"
 "hans>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:09+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:13+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-diskcache\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: DiskCachePlugin.php:175
 msgid "Plugin to implement cache interface with disk files."
 msgstr "实现缓存与磁盘文件接口的插件。"
diff --git a/plugins/Disqus/locale/Disqus.pot b/plugins/Disqus/locale/Disqus.pot
index 5afc9546e1..ae09a31c43 100644
--- a/plugins/Disqus/locale/Disqus.pot
+++ b/plugins/Disqus/locale/Disqus.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/Disqus/locale/be-tarask/LC_MESSAGES/Disqus.po b/plugins/Disqus/locale/be-tarask/LC_MESSAGES/Disqus.po
index 6531d47d49..7a833f3110 100644
--- a/plugins/Disqus/locale/be-tarask/LC_MESSAGES/Disqus.po
+++ b/plugins/Disqus/locale/be-tarask/LC_MESSAGES/Disqus.po
@@ -10,21 +10,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Disqus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:32+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:03+0000\n"
 "Language-Team: Belarusian (Taraškievica orthography) <http://translatewiki."
 "net/wiki/Portal:be-tarask>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 23:54:48+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:16+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: be-tarask\n"
 "X-Message-Group: #out-statusnet-plugin-disqus\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANS: User notification that JavaScript is required for Disqus comment display.
-#: DisqusPlugin.php:143
 #, php-format
 msgid ""
 "Please enable JavaScript to view the [comments powered by Disqus](http://"
@@ -34,17 +33,14 @@ msgstr ""
 "disqus.com/?ref_noscript=%s)."
 
 #. TRANS: This message is followed by a Disqus logo. Alt text is "Disqus".
-#: DisqusPlugin.php:151
 msgid "Comments powered by "
 msgstr "Камэнтары працуюць з дапамогай "
 
 #. TRANS: Plugin supplied feature for Disqus comments to notices.
-#: DisqusPlugin.php:204
 msgid "Comments"
 msgstr "Камэнтары"
 
 #. TRANS: Plugin description.
-#: DisqusPlugin.php:245
 msgid ""
 "Use <a href=\"http://disqus.com/\">Disqus</a> to add commenting to notice "
 "pages."
diff --git a/plugins/Disqus/locale/br/LC_MESSAGES/Disqus.po b/plugins/Disqus/locale/br/LC_MESSAGES/Disqus.po
index cd0e5b75e0..011b0e5e39 100644
--- a/plugins/Disqus/locale/br/LC_MESSAGES/Disqus.po
+++ b/plugins/Disqus/locale/br/LC_MESSAGES/Disqus.po
@@ -9,20 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Disqus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:33+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:04+0000\n"
 "Language-Team: Breton <http://translatewiki.net/wiki/Portal:br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 23:54:48+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:16+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-disqus\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. TRANS: User notification that JavaScript is required for Disqus comment display.
-#: DisqusPlugin.php:143
 #, php-format
 msgid ""
 "Please enable JavaScript to view the [comments powered by Disqus](http://"
@@ -32,17 +31,14 @@ msgstr ""
 "Disqus] (http://disqus.com/?ref_noscript=%s)."
 
 #. TRANS: This message is followed by a Disqus logo. Alt text is "Disqus".
-#: DisqusPlugin.php:151
 msgid "Comments powered by "
 msgstr "Evezhiadennoù enlusket gant "
 
 #. TRANS: Plugin supplied feature for Disqus comments to notices.
-#: DisqusPlugin.php:204
 msgid "Comments"
 msgstr "Evezhiadennoù"
 
 #. TRANS: Plugin description.
-#: DisqusPlugin.php:245
 msgid ""
 "Use <a href=\"http://disqus.com/\">Disqus</a> to add commenting to notice "
 "pages."
diff --git a/plugins/Disqus/locale/de/LC_MESSAGES/Disqus.po b/plugins/Disqus/locale/de/LC_MESSAGES/Disqus.po
index 7536ce7eaf..1f4b01bfce 100644
--- a/plugins/Disqus/locale/de/LC_MESSAGES/Disqus.po
+++ b/plugins/Disqus/locale/de/LC_MESSAGES/Disqus.po
@@ -11,20 +11,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Disqus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-14 16:01+0000\n"
-"PO-Revision-Date: 2011-02-14 16:07:37+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:04+0000\n"
 "Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:19:39+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r82114); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:16+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-disqus\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANS: User notification that JavaScript is required for Disqus comment display.
-#: DisqusPlugin.php:143
 #, php-format
 msgid ""
 "Please enable JavaScript to view the [comments powered by Disqus](http://"
@@ -34,17 +33,14 @@ msgstr ""
 "(http://disqus.com/?ref_noscript=%s) anzuzeigen."
 
 #. TRANS: This message is followed by a Disqus logo. Alt text is "Disqus".
-#: DisqusPlugin.php:151
 msgid "Comments powered by "
 msgstr "Kommentare werden unterstützt durch "
 
 #. TRANS: Plugin supplied feature for Disqus comments to notices.
-#: DisqusPlugin.php:204
 msgid "Comments"
 msgstr "Kommentare"
 
 #. TRANS: Plugin description.
-#: DisqusPlugin.php:245
 msgid ""
 "Use <a href=\"http://disqus.com/\">Disqus</a> to add commenting to notice "
 "pages."
diff --git a/plugins/Disqus/locale/es/LC_MESSAGES/Disqus.po b/plugins/Disqus/locale/es/LC_MESSAGES/Disqus.po
index 2c22d93052..f787397afd 100644
--- a/plugins/Disqus/locale/es/LC_MESSAGES/Disqus.po
+++ b/plugins/Disqus/locale/es/LC_MESSAGES/Disqus.po
@@ -9,20 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Disqus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:33+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:04+0000\n"
 "Language-Team: Spanish <http://translatewiki.net/wiki/Portal:es>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 23:54:48+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:16+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-disqus\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANS: User notification that JavaScript is required for Disqus comment display.
-#: DisqusPlugin.php:143
 #, php-format
 msgid ""
 "Please enable JavaScript to view the [comments powered by Disqus](http://"
@@ -32,17 +31,14 @@ msgstr ""
 "Disqus](http://disqus.com/?ref_noscript=%s)."
 
 #. TRANS: This message is followed by a Disqus logo. Alt text is "Disqus".
-#: DisqusPlugin.php:151
 msgid "Comments powered by "
 msgstr "Comentarios con tecnología de "
 
 #. TRANS: Plugin supplied feature for Disqus comments to notices.
-#: DisqusPlugin.php:204
 msgid "Comments"
 msgstr "Comentarios"
 
 #. TRANS: Plugin description.
-#: DisqusPlugin.php:245
 msgid ""
 "Use <a href=\"http://disqus.com/\">Disqus</a> to add commenting to notice "
 "pages."
diff --git a/plugins/Disqus/locale/fr/LC_MESSAGES/Disqus.po b/plugins/Disqus/locale/fr/LC_MESSAGES/Disqus.po
index 29680fcf30..a5de05a955 100644
--- a/plugins/Disqus/locale/fr/LC_MESSAGES/Disqus.po
+++ b/plugins/Disqus/locale/fr/LC_MESSAGES/Disqus.po
@@ -10,20 +10,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Disqus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:33+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:04+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 23:54:48+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:16+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-disqus\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. TRANS: User notification that JavaScript is required for Disqus comment display.
-#: DisqusPlugin.php:143
 #, php-format
 msgid ""
 "Please enable JavaScript to view the [comments powered by Disqus](http://"
@@ -33,17 +32,14 @@ msgstr ""
 "Disqus] (http://disqus.com/?ref_noscript=%s)."
 
 #. TRANS: This message is followed by a Disqus logo. Alt text is "Disqus".
-#: DisqusPlugin.php:151
 msgid "Comments powered by "
 msgstr "Commentaires propulsés par "
 
 #. TRANS: Plugin supplied feature for Disqus comments to notices.
-#: DisqusPlugin.php:204
 msgid "Comments"
 msgstr "Commentaires"
 
 #. TRANS: Plugin description.
-#: DisqusPlugin.php:245
 msgid ""
 "Use <a href=\"http://disqus.com/\">Disqus</a> to add commenting to notice "
 "pages."
diff --git a/plugins/Disqus/locale/ia/LC_MESSAGES/Disqus.po b/plugins/Disqus/locale/ia/LC_MESSAGES/Disqus.po
index 78077586fa..a974b0621e 100644
--- a/plugins/Disqus/locale/ia/LC_MESSAGES/Disqus.po
+++ b/plugins/Disqus/locale/ia/LC_MESSAGES/Disqus.po
@@ -9,20 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Disqus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:33+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:04+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 23:54:48+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:16+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-disqus\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANS: User notification that JavaScript is required for Disqus comment display.
-#: DisqusPlugin.php:143
 #, php-format
 msgid ""
 "Please enable JavaScript to view the [comments powered by Disqus](http://"
@@ -32,17 +31,14 @@ msgstr ""
 "(http://disqus.com/?ref_noscript=%s)."
 
 #. TRANS: This message is followed by a Disqus logo. Alt text is "Disqus".
-#: DisqusPlugin.php:151
 msgid "Comments powered by "
 msgstr "Commentos actionate per "
 
 #. TRANS: Plugin supplied feature for Disqus comments to notices.
-#: DisqusPlugin.php:204
 msgid "Comments"
 msgstr "Commentos"
 
 #. TRANS: Plugin description.
-#: DisqusPlugin.php:245
 msgid ""
 "Use <a href=\"http://disqus.com/\">Disqus</a> to add commenting to notice "
 "pages."
diff --git a/plugins/Disqus/locale/mk/LC_MESSAGES/Disqus.po b/plugins/Disqus/locale/mk/LC_MESSAGES/Disqus.po
index d69f7ff15b..8c897df29f 100644
--- a/plugins/Disqus/locale/mk/LC_MESSAGES/Disqus.po
+++ b/plugins/Disqus/locale/mk/LC_MESSAGES/Disqus.po
@@ -9,20 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Disqus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:33+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:04+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 23:54:48+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:16+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-disqus\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
 
 #. TRANS: User notification that JavaScript is required for Disqus comment display.
-#: DisqusPlugin.php:143
 #, php-format
 msgid ""
 "Please enable JavaScript to view the [comments powered by Disqus](http://"
@@ -32,17 +31,14 @@ msgstr ""
 "овозможени од Disqus](http://disqus.com/?ref_noscript=%s)."
 
 #. TRANS: This message is followed by a Disqus logo. Alt text is "Disqus".
-#: DisqusPlugin.php:151
 msgid "Comments powered by "
 msgstr "Коментарите ги овозможува "
 
 #. TRANS: Plugin supplied feature for Disqus comments to notices.
-#: DisqusPlugin.php:204
 msgid "Comments"
 msgstr "Коментари"
 
 #. TRANS: Plugin description.
-#: DisqusPlugin.php:245
 msgid ""
 "Use <a href=\"http://disqus.com/\">Disqus</a> to add commenting to notice "
 "pages."
diff --git a/plugins/Disqus/locale/nb/LC_MESSAGES/Disqus.po b/plugins/Disqus/locale/nb/LC_MESSAGES/Disqus.po
index 99031aef35..f44adf09d5 100644
--- a/plugins/Disqus/locale/nb/LC_MESSAGES/Disqus.po
+++ b/plugins/Disqus/locale/nb/LC_MESSAGES/Disqus.po
@@ -9,20 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Disqus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:33+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:04+0000\n"
 "Language-Team: Norwegian (bokmål)‬ <http://translatewiki.net/wiki/Portal:no>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 23:54:48+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:16+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: #out-statusnet-plugin-disqus\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANS: User notification that JavaScript is required for Disqus comment display.
-#: DisqusPlugin.php:143
 #, php-format
 msgid ""
 "Please enable JavaScript to view the [comments powered by Disqus](http://"
@@ -32,17 +31,14 @@ msgstr ""
 "com/?ref_noscript=%s)."
 
 #. TRANS: This message is followed by a Disqus logo. Alt text is "Disqus".
-#: DisqusPlugin.php:151
 msgid "Comments powered by "
 msgstr "Kommentarer levert av "
 
 #. TRANS: Plugin supplied feature for Disqus comments to notices.
-#: DisqusPlugin.php:204
 msgid "Comments"
 msgstr "Kommentarer"
 
 #. TRANS: Plugin description.
-#: DisqusPlugin.php:245
 msgid ""
 "Use <a href=\"http://disqus.com/\">Disqus</a> to add commenting to notice "
 "pages."
diff --git a/plugins/Disqus/locale/nl/LC_MESSAGES/Disqus.po b/plugins/Disqus/locale/nl/LC_MESSAGES/Disqus.po
index c11bf2abc2..8bce6c27ca 100644
--- a/plugins/Disqus/locale/nl/LC_MESSAGES/Disqus.po
+++ b/plugins/Disqus/locale/nl/LC_MESSAGES/Disqus.po
@@ -9,20 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Disqus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:33+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:04+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 23:54:48+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:16+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-disqus\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANS: User notification that JavaScript is required for Disqus comment display.
-#: DisqusPlugin.php:143
 #, php-format
 msgid ""
 "Please enable JavaScript to view the [comments powered by Disqus](http://"
@@ -32,17 +31,14 @@ msgstr ""
 "ref_noscript=%s) te kunnen bekijken."
 
 #. TRANS: This message is followed by a Disqus logo. Alt text is "Disqus".
-#: DisqusPlugin.php:151
 msgid "Comments powered by "
 msgstr "Reacties powered by "
 
 #. TRANS: Plugin supplied feature for Disqus comments to notices.
-#: DisqusPlugin.php:204
 msgid "Comments"
 msgstr "Reacties"
 
 #. TRANS: Plugin description.
-#: DisqusPlugin.php:245
 msgid ""
 "Use <a href=\"http://disqus.com/\">Disqus</a> to add commenting to notice "
 "pages."
diff --git a/plugins/Disqus/locale/ru/LC_MESSAGES/Disqus.po b/plugins/Disqus/locale/ru/LC_MESSAGES/Disqus.po
index b57a60cbc3..06848dbcdf 100644
--- a/plugins/Disqus/locale/ru/LC_MESSAGES/Disqus.po
+++ b/plugins/Disqus/locale/ru/LC_MESSAGES/Disqus.po
@@ -10,13 +10,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Disqus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:33+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:04+0000\n"
 "Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 23:54:48+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:16+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-disqus\n"
@@ -24,7 +24,6 @@ msgstr ""
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
 #. TRANS: User notification that JavaScript is required for Disqus comment display.
-#: DisqusPlugin.php:143
 #, php-format
 msgid ""
 "Please enable JavaScript to view the [comments powered by Disqus](http://"
@@ -34,17 +33,14 @@ msgstr ""
 "помощью Disqus](http://disqus.com/?ref_noscript=%s)."
 
 #. TRANS: This message is followed by a Disqus logo. Alt text is "Disqus".
-#: DisqusPlugin.php:151
 msgid "Comments powered by "
 msgstr "Комментарии работают с помощью "
 
 #. TRANS: Plugin supplied feature for Disqus comments to notices.
-#: DisqusPlugin.php:204
 msgid "Comments"
 msgstr "Комментарии"
 
 #. TRANS: Plugin description.
-#: DisqusPlugin.php:245
 msgid ""
 "Use <a href=\"http://disqus.com/\">Disqus</a> to add commenting to notice "
 "pages."
diff --git a/plugins/Disqus/locale/tl/LC_MESSAGES/Disqus.po b/plugins/Disqus/locale/tl/LC_MESSAGES/Disqus.po
index 1ab9dd957f..a4b8bc01b6 100644
--- a/plugins/Disqus/locale/tl/LC_MESSAGES/Disqus.po
+++ b/plugins/Disqus/locale/tl/LC_MESSAGES/Disqus.po
@@ -9,20 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Disqus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:33+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:04+0000\n"
 "Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 23:54:48+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:16+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-disqus\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANS: User notification that JavaScript is required for Disqus comment display.
-#: DisqusPlugin.php:143
 #, php-format
 msgid ""
 "Please enable JavaScript to view the [comments powered by Disqus](http://"
@@ -32,17 +31,14 @@ msgstr ""
 "pinapatakbo ng Disqus](http://disqus.com/?ref_noscript=%s)."
 
 #. TRANS: This message is followed by a Disqus logo. Alt text is "Disqus".
-#: DisqusPlugin.php:151
 msgid "Comments powered by "
 msgstr "Mga puna na pinatatakbo ng "
 
 #. TRANS: Plugin supplied feature for Disqus comments to notices.
-#: DisqusPlugin.php:204
 msgid "Comments"
 msgstr "Mga puna"
 
 #. TRANS: Plugin description.
-#: DisqusPlugin.php:245
 msgid ""
 "Use <a href=\"http://disqus.com/\">Disqus</a> to add commenting to notice "
 "pages."
diff --git a/plugins/Disqus/locale/uk/LC_MESSAGES/Disqus.po b/plugins/Disqus/locale/uk/LC_MESSAGES/Disqus.po
index 09da349d51..b9db5d1251 100644
--- a/plugins/Disqus/locale/uk/LC_MESSAGES/Disqus.po
+++ b/plugins/Disqus/locale/uk/LC_MESSAGES/Disqus.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Disqus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:33+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:04+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 23:54:48+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:16+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-disqus\n"
@@ -23,7 +23,6 @@ msgstr ""
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
 #. TRANS: User notification that JavaScript is required for Disqus comment display.
-#: DisqusPlugin.php:143
 #, php-format
 msgid ""
 "Please enable JavaScript to view the [comments powered by Disqus](http://"
@@ -33,17 +32,14 @@ msgstr ""
 "disqus.com/?ref_noscript=%s)."
 
 #. TRANS: This message is followed by a Disqus logo. Alt text is "Disqus".
-#: DisqusPlugin.php:151
 msgid "Comments powered by "
 msgstr "Коментування можливе завдяки сервісу "
 
 #. TRANS: Plugin supplied feature for Disqus comments to notices.
-#: DisqusPlugin.php:204
 msgid "Comments"
 msgstr "Коментарі"
 
 #. TRANS: Plugin description.
-#: DisqusPlugin.php:245
 msgid ""
 "Use <a href=\"http://disqus.com/\">Disqus</a> to add commenting to notice "
 "pages."
diff --git a/plugins/Disqus/locale/zh_CN/LC_MESSAGES/Disqus.po b/plugins/Disqus/locale/zh_CN/LC_MESSAGES/Disqus.po
index 62cca07b04..9c8faf8624 100644
--- a/plugins/Disqus/locale/zh_CN/LC_MESSAGES/Disqus.po
+++ b/plugins/Disqus/locale/zh_CN/LC_MESSAGES/Disqus.po
@@ -9,21 +9,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Disqus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:33+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:04+0000\n"
 "Language-Team: Simplified Chinese <http://translatewiki.net/wiki/Portal:zh-"
 "hans>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 23:54:48+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:16+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-disqus\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. TRANS: User notification that JavaScript is required for Disqus comment display.
-#: DisqusPlugin.php:143
 #, php-format
 msgid ""
 "Please enable JavaScript to view the [comments powered by Disqus](http://"
@@ -33,17 +32,14 @@ msgstr ""
 "ref_noscript=%s)。"
 
 #. TRANS: This message is followed by a Disqus logo. Alt text is "Disqus".
-#: DisqusPlugin.php:151
 msgid "Comments powered by "
 msgstr "通过 Disqus 的评论"
 
 #. TRANS: Plugin supplied feature for Disqus comments to notices.
-#: DisqusPlugin.php:204
 msgid "Comments"
 msgstr "评论"
 
 #. TRANS: Plugin description.
-#: DisqusPlugin.php:245
 msgid ""
 "Use <a href=\"http://disqus.com/\">Disqus</a> to add commenting to notice "
 "pages."
diff --git a/plugins/Echo/locale/Echo.pot b/plugins/Echo/locale/Echo.pot
index 1420bdcd14..8e34960604 100644
--- a/plugins/Echo/locale/Echo.pot
+++ b/plugins/Echo/locale/Echo.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/Echo/locale/ar/LC_MESSAGES/Echo.po b/plugins/Echo/locale/ar/LC_MESSAGES/Echo.po
new file mode 100644
index 0000000000..14020ce257
--- /dev/null
+++ b/plugins/Echo/locale/ar/LC_MESSAGES/Echo.po
@@ -0,0 +1,31 @@
+# Translation of StatusNet - Echo to Arabic (العربية)
+# Exported from translatewiki.net
+#
+# Author: OsamaK
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Echo\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:04+0000\n"
+"Language-Team: Arabic <http://translatewiki.net/wiki/Portal:ar>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-03-03 17:43:17+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: ar\n"
+"X-Message-Group: #out-statusnet-plugin-echo\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"
+
+msgid ""
+"Use <a href=\"http://aboutecho.com/\">Echo</a> to add commenting to notice "
+"pages."
+msgstr ""
+"استخدم <a href=\"http://aboutecho.com/\">Echo</a> لإضافة تعليقات إلى صفحات "
+"الإشعارات."
diff --git a/plugins/Echo/locale/be-tarask/LC_MESSAGES/Echo.po b/plugins/Echo/locale/be-tarask/LC_MESSAGES/Echo.po
index 9b0286c72f..2cfdb14f04 100644
--- a/plugins/Echo/locale/be-tarask/LC_MESSAGES/Echo.po
+++ b/plugins/Echo/locale/be-tarask/LC_MESSAGES/Echo.po
@@ -9,20 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Echo\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:34+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:04+0000\n"
 "Language-Team: Belarusian (Taraškievica orthography) <http://translatewiki."
 "net/wiki/Portal:be-tarask>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:13+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:17+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: be-tarask\n"
 "X-Message-Group: #out-statusnet-plugin-echo\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: EchoPlugin.php:111
 msgid ""
 "Use <a href=\"http://aboutecho.com/\">Echo</a> to add commenting to notice "
 "pages."
diff --git a/plugins/Echo/locale/br/LC_MESSAGES/Echo.po b/plugins/Echo/locale/br/LC_MESSAGES/Echo.po
index 35874a59bb..9eb5818b5d 100644
--- a/plugins/Echo/locale/br/LC_MESSAGES/Echo.po
+++ b/plugins/Echo/locale/br/LC_MESSAGES/Echo.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Echo\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:34+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:04+0000\n"
 "Language-Team: Breton <http://translatewiki.net/wiki/Portal:br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:13+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:17+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-echo\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: EchoPlugin.php:111
 msgid ""
 "Use <a href=\"http://aboutecho.com/\">Echo</a> to add commenting to notice "
 "pages."
diff --git a/plugins/Echo/locale/de/LC_MESSAGES/Echo.po b/plugins/Echo/locale/de/LC_MESSAGES/Echo.po
index b7c73a089a..85c119e90b 100644
--- a/plugins/Echo/locale/de/LC_MESSAGES/Echo.po
+++ b/plugins/Echo/locale/de/LC_MESSAGES/Echo.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Echo\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:34+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:04+0000\n"
 "Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:13+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:17+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-echo\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: EchoPlugin.php:111
 msgid ""
 "Use <a href=\"http://aboutecho.com/\">Echo</a> to add commenting to notice "
 "pages."
diff --git a/plugins/Echo/locale/es/LC_MESSAGES/Echo.po b/plugins/Echo/locale/es/LC_MESSAGES/Echo.po
index 3e5fe6897d..73f097511b 100644
--- a/plugins/Echo/locale/es/LC_MESSAGES/Echo.po
+++ b/plugins/Echo/locale/es/LC_MESSAGES/Echo.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Echo\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:34+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:04+0000\n"
 "Language-Team: Spanish <http://translatewiki.net/wiki/Portal:es>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:13+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:17+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-echo\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: EchoPlugin.php:111
 msgid ""
 "Use <a href=\"http://aboutecho.com/\">Echo</a> to add commenting to notice "
 "pages."
diff --git a/plugins/Echo/locale/fi/LC_MESSAGES/Echo.po b/plugins/Echo/locale/fi/LC_MESSAGES/Echo.po
index 4ae306c8fc..4403c4b8cc 100644
--- a/plugins/Echo/locale/fi/LC_MESSAGES/Echo.po
+++ b/plugins/Echo/locale/fi/LC_MESSAGES/Echo.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Echo\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:34+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:04+0000\n"
 "Language-Team: Finnish <http://translatewiki.net/wiki/Portal:fi>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:13+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:17+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fi\n"
 "X-Message-Group: #out-statusnet-plugin-echo\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: EchoPlugin.php:111
 msgid ""
 "Use <a href=\"http://aboutecho.com/\">Echo</a> to add commenting to notice "
 "pages."
diff --git a/plugins/Echo/locale/fr/LC_MESSAGES/Echo.po b/plugins/Echo/locale/fr/LC_MESSAGES/Echo.po
index 1c0f65fd1e..0616a6302a 100644
--- a/plugins/Echo/locale/fr/LC_MESSAGES/Echo.po
+++ b/plugins/Echo/locale/fr/LC_MESSAGES/Echo.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Echo\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:34+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:05+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:13+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:17+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-echo\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: EchoPlugin.php:111
 msgid ""
 "Use <a href=\"http://aboutecho.com/\">Echo</a> to add commenting to notice "
 "pages."
diff --git a/plugins/Echo/locale/he/LC_MESSAGES/Echo.po b/plugins/Echo/locale/he/LC_MESSAGES/Echo.po
index 3d88eac780..b23ebaa191 100644
--- a/plugins/Echo/locale/he/LC_MESSAGES/Echo.po
+++ b/plugins/Echo/locale/he/LC_MESSAGES/Echo.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Echo\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:34+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:05+0000\n"
 "Language-Team: Hebrew <http://translatewiki.net/wiki/Portal:he>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:13+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:17+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-plugin-echo\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: EchoPlugin.php:111
 msgid ""
 "Use <a href=\"http://aboutecho.com/\">Echo</a> to add commenting to notice "
 "pages."
diff --git a/plugins/Echo/locale/ia/LC_MESSAGES/Echo.po b/plugins/Echo/locale/ia/LC_MESSAGES/Echo.po
index 1afbf311ab..555c8acf71 100644
--- a/plugins/Echo/locale/ia/LC_MESSAGES/Echo.po
+++ b/plugins/Echo/locale/ia/LC_MESSAGES/Echo.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Echo\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:34+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:05+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:13+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:17+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-echo\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: EchoPlugin.php:111
 msgid ""
 "Use <a href=\"http://aboutecho.com/\">Echo</a> to add commenting to notice "
 "pages."
diff --git a/plugins/Echo/locale/id/LC_MESSAGES/Echo.po b/plugins/Echo/locale/id/LC_MESSAGES/Echo.po
index 7c274cf71d..4b75345384 100644
--- a/plugins/Echo/locale/id/LC_MESSAGES/Echo.po
+++ b/plugins/Echo/locale/id/LC_MESSAGES/Echo.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Echo\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:34+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:05+0000\n"
 "Language-Team: Indonesian <http://translatewiki.net/wiki/Portal:id>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:13+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:17+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: id\n"
 "X-Message-Group: #out-statusnet-plugin-echo\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: EchoPlugin.php:111
 msgid ""
 "Use <a href=\"http://aboutecho.com/\">Echo</a> to add commenting to notice "
 "pages."
diff --git a/plugins/Echo/locale/lb/LC_MESSAGES/Echo.po b/plugins/Echo/locale/lb/LC_MESSAGES/Echo.po
index 7979b20751..322993d627 100644
--- a/plugins/Echo/locale/lb/LC_MESSAGES/Echo.po
+++ b/plugins/Echo/locale/lb/LC_MESSAGES/Echo.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Echo\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:34+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:05+0000\n"
 "Language-Team: Luxembourgish <http://translatewiki.net/wiki/Portal:lb>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:13+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:17+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: lb\n"
 "X-Message-Group: #out-statusnet-plugin-echo\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: EchoPlugin.php:111
 msgid ""
 "Use <a href=\"http://aboutecho.com/\">Echo</a> to add commenting to notice "
 "pages."
diff --git a/plugins/Echo/locale/mk/LC_MESSAGES/Echo.po b/plugins/Echo/locale/mk/LC_MESSAGES/Echo.po
index af94f9e79d..8d0354945f 100644
--- a/plugins/Echo/locale/mk/LC_MESSAGES/Echo.po
+++ b/plugins/Echo/locale/mk/LC_MESSAGES/Echo.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Echo\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:34+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:05+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:13+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:17+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-echo\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
 
-#: EchoPlugin.php:111
 msgid ""
 "Use <a href=\"http://aboutecho.com/\">Echo</a> to add commenting to notice "
 "pages."
diff --git a/plugins/Echo/locale/nb/LC_MESSAGES/Echo.po b/plugins/Echo/locale/nb/LC_MESSAGES/Echo.po
index 037605a911..a304f2d54b 100644
--- a/plugins/Echo/locale/nb/LC_MESSAGES/Echo.po
+++ b/plugins/Echo/locale/nb/LC_MESSAGES/Echo.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Echo\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:34+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:05+0000\n"
 "Language-Team: Norwegian (bokmål)‬ <http://translatewiki.net/wiki/Portal:no>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:13+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:17+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: #out-statusnet-plugin-echo\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: EchoPlugin.php:111
 msgid ""
 "Use <a href=\"http://aboutecho.com/\">Echo</a> to add commenting to notice "
 "pages."
diff --git a/plugins/Echo/locale/nl/LC_MESSAGES/Echo.po b/plugins/Echo/locale/nl/LC_MESSAGES/Echo.po
index 013bff2211..4e74423ec6 100644
--- a/plugins/Echo/locale/nl/LC_MESSAGES/Echo.po
+++ b/plugins/Echo/locale/nl/LC_MESSAGES/Echo.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Echo\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:34+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:05+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:13+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:17+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-echo\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: EchoPlugin.php:111
 msgid ""
 "Use <a href=\"http://aboutecho.com/\">Echo</a> to add commenting to notice "
 "pages."
diff --git a/plugins/Echo/locale/pt/LC_MESSAGES/Echo.po b/plugins/Echo/locale/pt/LC_MESSAGES/Echo.po
index 662655c2bc..50679508e0 100644
--- a/plugins/Echo/locale/pt/LC_MESSAGES/Echo.po
+++ b/plugins/Echo/locale/pt/LC_MESSAGES/Echo.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Echo\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:34+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:05+0000\n"
 "Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:13+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:17+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-plugin-echo\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: EchoPlugin.php:111
 msgid ""
 "Use <a href=\"http://aboutecho.com/\">Echo</a> to add commenting to notice "
 "pages."
diff --git a/plugins/Echo/locale/pt_BR/LC_MESSAGES/Echo.po b/plugins/Echo/locale/pt_BR/LC_MESSAGES/Echo.po
index e23e90436e..3298ad3022 100644
--- a/plugins/Echo/locale/pt_BR/LC_MESSAGES/Echo.po
+++ b/plugins/Echo/locale/pt_BR/LC_MESSAGES/Echo.po
@@ -9,20 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Echo\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:34+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:05+0000\n"
 "Language-Team: Brazilian Portuguese <http://translatewiki.net/wiki/Portal:pt-"
 "br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:13+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:17+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt-br\n"
 "X-Message-Group: #out-statusnet-plugin-echo\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: EchoPlugin.php:111
 msgid ""
 "Use <a href=\"http://aboutecho.com/\">Echo</a> to add commenting to notice "
 "pages."
diff --git a/plugins/Echo/locale/ru/LC_MESSAGES/Echo.po b/plugins/Echo/locale/ru/LC_MESSAGES/Echo.po
index d1e87f6fbd..c74eb7316e 100644
--- a/plugins/Echo/locale/ru/LC_MESSAGES/Echo.po
+++ b/plugins/Echo/locale/ru/LC_MESSAGES/Echo.po
@@ -9,20 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Echo\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:34+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:05+0000\n"
 "Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:13+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:17+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-echo\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: EchoPlugin.php:111
 msgid ""
 "Use <a href=\"http://aboutecho.com/\">Echo</a> to add commenting to notice "
 "pages."
diff --git a/plugins/Echo/locale/tl/LC_MESSAGES/Echo.po b/plugins/Echo/locale/tl/LC_MESSAGES/Echo.po
index 3622ff12e3..d60aa9bb31 100644
--- a/plugins/Echo/locale/tl/LC_MESSAGES/Echo.po
+++ b/plugins/Echo/locale/tl/LC_MESSAGES/Echo.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Echo\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:34+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:05+0000\n"
 "Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:13+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:17+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-echo\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: EchoPlugin.php:111
 msgid ""
 "Use <a href=\"http://aboutecho.com/\">Echo</a> to add commenting to notice "
 "pages."
diff --git a/plugins/Echo/locale/uk/LC_MESSAGES/Echo.po b/plugins/Echo/locale/uk/LC_MESSAGES/Echo.po
index f1d32b4f07..7a9e5506a7 100644
--- a/plugins/Echo/locale/uk/LC_MESSAGES/Echo.po
+++ b/plugins/Echo/locale/uk/LC_MESSAGES/Echo.po
@@ -9,20 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Echo\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:34+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:05+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:13+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:17+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-echo\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: EchoPlugin.php:111
 msgid ""
 "Use <a href=\"http://aboutecho.com/\">Echo</a> to add commenting to notice "
 "pages."
diff --git a/plugins/Echo/locale/zh_CN/LC_MESSAGES/Echo.po b/plugins/Echo/locale/zh_CN/LC_MESSAGES/Echo.po
index 744aa1bf19..8a7343eea0 100644
--- a/plugins/Echo/locale/zh_CN/LC_MESSAGES/Echo.po
+++ b/plugins/Echo/locale/zh_CN/LC_MESSAGES/Echo.po
@@ -9,20 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Echo\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:34+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:05+0000\n"
 "Language-Team: Simplified Chinese <http://translatewiki.net/wiki/Portal:zh-"
 "hans>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:13+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:17+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-echo\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: EchoPlugin.php:111
 msgid ""
 "Use <a href=\"http://aboutecho.com/\">Echo</a> to add commenting to notice "
 "pages."
diff --git a/plugins/EmailAuthentication/locale/EmailAuthentication.pot b/plugins/EmailAuthentication/locale/EmailAuthentication.pot
index 7e25e81da9..c965ce7561 100644
--- a/plugins/EmailAuthentication/locale/EmailAuthentication.pot
+++ b/plugins/EmailAuthentication/locale/EmailAuthentication.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/EmailAuthentication/locale/be-tarask/LC_MESSAGES/EmailAuthentication.po b/plugins/EmailAuthentication/locale/be-tarask/LC_MESSAGES/EmailAuthentication.po
index 0256140870..e4528051f8 100644
--- a/plugins/EmailAuthentication/locale/be-tarask/LC_MESSAGES/EmailAuthentication.po
+++ b/plugins/EmailAuthentication/locale/be-tarask/LC_MESSAGES/EmailAuthentication.po
@@ -9,20 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - EmailAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:34+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:05+0000\n"
 "Language-Team: Belarusian (Taraškievica orthography) <http://translatewiki."
 "net/wiki/Portal:be-tarask>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:13+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:18+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: be-tarask\n"
 "X-Message-Group: #out-statusnet-plugin-emailauthentication\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: EmailAuthenticationPlugin.php:60
 msgid ""
 "The Email Authentication plugin allows users to login using their email "
 "address."
diff --git a/plugins/EmailAuthentication/locale/br/LC_MESSAGES/EmailAuthentication.po b/plugins/EmailAuthentication/locale/br/LC_MESSAGES/EmailAuthentication.po
index 3d526443d3..ffad6dd158 100644
--- a/plugins/EmailAuthentication/locale/br/LC_MESSAGES/EmailAuthentication.po
+++ b/plugins/EmailAuthentication/locale/br/LC_MESSAGES/EmailAuthentication.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - EmailAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:34+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:06+0000\n"
 "Language-Team: Breton <http://translatewiki.net/wiki/Portal:br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:13+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:18+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-emailauthentication\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: EmailAuthenticationPlugin.php:60
 msgid ""
 "The Email Authentication plugin allows users to login using their email "
 "address."
diff --git a/plugins/EmailAuthentication/locale/ca/LC_MESSAGES/EmailAuthentication.po b/plugins/EmailAuthentication/locale/ca/LC_MESSAGES/EmailAuthentication.po
index 23077e5b75..bca3ed1c6c 100644
--- a/plugins/EmailAuthentication/locale/ca/LC_MESSAGES/EmailAuthentication.po
+++ b/plugins/EmailAuthentication/locale/ca/LC_MESSAGES/EmailAuthentication.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - EmailAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-17 10:25+0000\n"
-"PO-Revision-Date: 2011-02-17 10:28:10+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:06+0000\n"
 "Language-Team: Catalan <http://translatewiki.net/wiki/Portal:ca>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:24:10+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r82325); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:18+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ca\n"
 "X-Message-Group: #out-statusnet-plugin-emailauthentication\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: EmailAuthenticationPlugin.php:60
 msgid ""
 "The Email Authentication plugin allows users to login using their email "
 "address."
diff --git a/plugins/EmailAuthentication/locale/de/LC_MESSAGES/EmailAuthentication.po b/plugins/EmailAuthentication/locale/de/LC_MESSAGES/EmailAuthentication.po
index dd62e124ea..9572a05f31 100644
--- a/plugins/EmailAuthentication/locale/de/LC_MESSAGES/EmailAuthentication.po
+++ b/plugins/EmailAuthentication/locale/de/LC_MESSAGES/EmailAuthentication.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - EmailAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:34+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:06+0000\n"
 "Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:13+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:18+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-emailauthentication\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: EmailAuthenticationPlugin.php:60
 msgid ""
 "The Email Authentication plugin allows users to login using their email "
 "address."
diff --git a/plugins/EmailAuthentication/locale/es/LC_MESSAGES/EmailAuthentication.po b/plugins/EmailAuthentication/locale/es/LC_MESSAGES/EmailAuthentication.po
index 425b804a68..048f0781bf 100644
--- a/plugins/EmailAuthentication/locale/es/LC_MESSAGES/EmailAuthentication.po
+++ b/plugins/EmailAuthentication/locale/es/LC_MESSAGES/EmailAuthentication.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - EmailAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:34+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:06+0000\n"
 "Language-Team: Spanish <http://translatewiki.net/wiki/Portal:es>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:13+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:18+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-emailauthentication\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: EmailAuthenticationPlugin.php:60
 msgid ""
 "The Email Authentication plugin allows users to login using their email "
 "address."
diff --git a/plugins/EmailAuthentication/locale/fr/LC_MESSAGES/EmailAuthentication.po b/plugins/EmailAuthentication/locale/fr/LC_MESSAGES/EmailAuthentication.po
index 3d6c4290f3..3c5401d910 100644
--- a/plugins/EmailAuthentication/locale/fr/LC_MESSAGES/EmailAuthentication.po
+++ b/plugins/EmailAuthentication/locale/fr/LC_MESSAGES/EmailAuthentication.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - EmailAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:35+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:06+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:13+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:18+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-emailauthentication\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: EmailAuthenticationPlugin.php:60
 msgid ""
 "The Email Authentication plugin allows users to login using their email "
 "address."
diff --git a/plugins/EmailAuthentication/locale/he/LC_MESSAGES/EmailAuthentication.po b/plugins/EmailAuthentication/locale/he/LC_MESSAGES/EmailAuthentication.po
index feed7f788e..1fb5a96593 100644
--- a/plugins/EmailAuthentication/locale/he/LC_MESSAGES/EmailAuthentication.po
+++ b/plugins/EmailAuthentication/locale/he/LC_MESSAGES/EmailAuthentication.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - EmailAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:35+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:06+0000\n"
 "Language-Team: Hebrew <http://translatewiki.net/wiki/Portal:he>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:13+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:18+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-plugin-emailauthentication\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: EmailAuthenticationPlugin.php:60
 msgid ""
 "The Email Authentication plugin allows users to login using their email "
 "address."
diff --git a/plugins/EmailAuthentication/locale/ia/LC_MESSAGES/EmailAuthentication.po b/plugins/EmailAuthentication/locale/ia/LC_MESSAGES/EmailAuthentication.po
index cadab1a5b7..5ee44f42cc 100644
--- a/plugins/EmailAuthentication/locale/ia/LC_MESSAGES/EmailAuthentication.po
+++ b/plugins/EmailAuthentication/locale/ia/LC_MESSAGES/EmailAuthentication.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - EmailAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:35+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:06+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:13+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:18+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-emailauthentication\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: EmailAuthenticationPlugin.php:60
 msgid ""
 "The Email Authentication plugin allows users to login using their email "
 "address."
diff --git a/plugins/EmailAuthentication/locale/id/LC_MESSAGES/EmailAuthentication.po b/plugins/EmailAuthentication/locale/id/LC_MESSAGES/EmailAuthentication.po
index 9786664fbc..34d3a38d66 100644
--- a/plugins/EmailAuthentication/locale/id/LC_MESSAGES/EmailAuthentication.po
+++ b/plugins/EmailAuthentication/locale/id/LC_MESSAGES/EmailAuthentication.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - EmailAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:35+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:06+0000\n"
 "Language-Team: Indonesian <http://translatewiki.net/wiki/Portal:id>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:13+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:18+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: id\n"
 "X-Message-Group: #out-statusnet-plugin-emailauthentication\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: EmailAuthenticationPlugin.php:60
 msgid ""
 "The Email Authentication plugin allows users to login using their email "
 "address."
diff --git a/plugins/EmailAuthentication/locale/ja/LC_MESSAGES/EmailAuthentication.po b/plugins/EmailAuthentication/locale/ja/LC_MESSAGES/EmailAuthentication.po
index 36a72a33c5..2d9d557483 100644
--- a/plugins/EmailAuthentication/locale/ja/LC_MESSAGES/EmailAuthentication.po
+++ b/plugins/EmailAuthentication/locale/ja/LC_MESSAGES/EmailAuthentication.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - EmailAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:35+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:06+0000\n"
 "Language-Team: Japanese <http://translatewiki.net/wiki/Portal:ja>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:13+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:18+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ja\n"
 "X-Message-Group: #out-statusnet-plugin-emailauthentication\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: EmailAuthenticationPlugin.php:60
 msgid ""
 "The Email Authentication plugin allows users to login using their email "
 "address."
diff --git a/plugins/EmailAuthentication/locale/mk/LC_MESSAGES/EmailAuthentication.po b/plugins/EmailAuthentication/locale/mk/LC_MESSAGES/EmailAuthentication.po
index 3f5e4e2e65..414d1baa2e 100644
--- a/plugins/EmailAuthentication/locale/mk/LC_MESSAGES/EmailAuthentication.po
+++ b/plugins/EmailAuthentication/locale/mk/LC_MESSAGES/EmailAuthentication.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - EmailAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:35+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:06+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:13+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:18+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-emailauthentication\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
 
-#: EmailAuthenticationPlugin.php:60
 msgid ""
 "The Email Authentication plugin allows users to login using their email "
 "address."
diff --git a/plugins/EmailAuthentication/locale/nb/LC_MESSAGES/EmailAuthentication.po b/plugins/EmailAuthentication/locale/nb/LC_MESSAGES/EmailAuthentication.po
index f4f8bcea1b..9a27d31854 100644
--- a/plugins/EmailAuthentication/locale/nb/LC_MESSAGES/EmailAuthentication.po
+++ b/plugins/EmailAuthentication/locale/nb/LC_MESSAGES/EmailAuthentication.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - EmailAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:35+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:06+0000\n"
 "Language-Team: Norwegian (bokmål)‬ <http://translatewiki.net/wiki/Portal:no>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:13+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:18+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: #out-statusnet-plugin-emailauthentication\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: EmailAuthenticationPlugin.php:60
 msgid ""
 "The Email Authentication plugin allows users to login using their email "
 "address."
diff --git a/plugins/EmailAuthentication/locale/nl/LC_MESSAGES/EmailAuthentication.po b/plugins/EmailAuthentication/locale/nl/LC_MESSAGES/EmailAuthentication.po
index fe7d1e8436..9f4cf95dc8 100644
--- a/plugins/EmailAuthentication/locale/nl/LC_MESSAGES/EmailAuthentication.po
+++ b/plugins/EmailAuthentication/locale/nl/LC_MESSAGES/EmailAuthentication.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - EmailAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:35+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:06+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:13+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:18+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-emailauthentication\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: EmailAuthenticationPlugin.php:60
 msgid ""
 "The Email Authentication plugin allows users to login using their email "
 "address."
diff --git a/plugins/EmailAuthentication/locale/pt/LC_MESSAGES/EmailAuthentication.po b/plugins/EmailAuthentication/locale/pt/LC_MESSAGES/EmailAuthentication.po
index 3023024ab3..cb8eea12f8 100644
--- a/plugins/EmailAuthentication/locale/pt/LC_MESSAGES/EmailAuthentication.po
+++ b/plugins/EmailAuthentication/locale/pt/LC_MESSAGES/EmailAuthentication.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - EmailAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:35+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:06+0000\n"
 "Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:13+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:18+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-plugin-emailauthentication\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: EmailAuthenticationPlugin.php:60
 msgid ""
 "The Email Authentication plugin allows users to login using their email "
 "address."
diff --git a/plugins/EmailAuthentication/locale/pt_BR/LC_MESSAGES/EmailAuthentication.po b/plugins/EmailAuthentication/locale/pt_BR/LC_MESSAGES/EmailAuthentication.po
index dbb6c824f1..e7d9af162f 100644
--- a/plugins/EmailAuthentication/locale/pt_BR/LC_MESSAGES/EmailAuthentication.po
+++ b/plugins/EmailAuthentication/locale/pt_BR/LC_MESSAGES/EmailAuthentication.po
@@ -9,20 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - EmailAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:35+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:06+0000\n"
 "Language-Team: Brazilian Portuguese <http://translatewiki.net/wiki/Portal:pt-"
 "br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:13+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:18+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt-br\n"
 "X-Message-Group: #out-statusnet-plugin-emailauthentication\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: EmailAuthenticationPlugin.php:60
 msgid ""
 "The Email Authentication plugin allows users to login using their email "
 "address."
diff --git a/plugins/EmailAuthentication/locale/ru/LC_MESSAGES/EmailAuthentication.po b/plugins/EmailAuthentication/locale/ru/LC_MESSAGES/EmailAuthentication.po
index ad3e61a759..4897a9d854 100644
--- a/plugins/EmailAuthentication/locale/ru/LC_MESSAGES/EmailAuthentication.po
+++ b/plugins/EmailAuthentication/locale/ru/LC_MESSAGES/EmailAuthentication.po
@@ -9,20 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - EmailAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:35+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:06+0000\n"
 "Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:13+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:18+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-emailauthentication\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: EmailAuthenticationPlugin.php:60
 msgid ""
 "The Email Authentication plugin allows users to login using their email "
 "address."
diff --git a/plugins/EmailAuthentication/locale/tl/LC_MESSAGES/EmailAuthentication.po b/plugins/EmailAuthentication/locale/tl/LC_MESSAGES/EmailAuthentication.po
index 7b8fe15a74..2075142bc7 100644
--- a/plugins/EmailAuthentication/locale/tl/LC_MESSAGES/EmailAuthentication.po
+++ b/plugins/EmailAuthentication/locale/tl/LC_MESSAGES/EmailAuthentication.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - EmailAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:35+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:06+0000\n"
 "Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:13+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:18+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-emailauthentication\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: EmailAuthenticationPlugin.php:60
 msgid ""
 "The Email Authentication plugin allows users to login using their email "
 "address."
diff --git a/plugins/EmailAuthentication/locale/uk/LC_MESSAGES/EmailAuthentication.po b/plugins/EmailAuthentication/locale/uk/LC_MESSAGES/EmailAuthentication.po
index d1bd14edeb..49ab5354da 100644
--- a/plugins/EmailAuthentication/locale/uk/LC_MESSAGES/EmailAuthentication.po
+++ b/plugins/EmailAuthentication/locale/uk/LC_MESSAGES/EmailAuthentication.po
@@ -9,20 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - EmailAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:35+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:06+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:13+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:18+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-emailauthentication\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: EmailAuthenticationPlugin.php:60
 msgid ""
 "The Email Authentication plugin allows users to login using their email "
 "address."
diff --git a/plugins/EmailAuthentication/locale/zh_CN/LC_MESSAGES/EmailAuthentication.po b/plugins/EmailAuthentication/locale/zh_CN/LC_MESSAGES/EmailAuthentication.po
index 2396c38fdb..a8a3da2d99 100644
--- a/plugins/EmailAuthentication/locale/zh_CN/LC_MESSAGES/EmailAuthentication.po
+++ b/plugins/EmailAuthentication/locale/zh_CN/LC_MESSAGES/EmailAuthentication.po
@@ -9,20 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - EmailAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:35+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:06+0000\n"
 "Language-Team: Simplified Chinese <http://translatewiki.net/wiki/Portal:zh-"
 "hans>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:13+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:18+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-emailauthentication\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: EmailAuthenticationPlugin.php:60
 msgid ""
 "The Email Authentication plugin allows users to login using their email "
 "address."
diff --git a/plugins/EmailSummary/locale/EmailSummary.pot b/plugins/EmailSummary/locale/EmailSummary.pot
index b497ab88ba..40c2cbd1ab 100644
--- a/plugins/EmailSummary/locale/EmailSummary.pot
+++ b/plugins/EmailSummary/locale/EmailSummary.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/EmailSummary/locale/be-tarask/LC_MESSAGES/EmailSummary.po b/plugins/EmailSummary/locale/be-tarask/LC_MESSAGES/EmailSummary.po
index a6a3baca7e..c915b8e27f 100644
--- a/plugins/EmailSummary/locale/be-tarask/LC_MESSAGES/EmailSummary.po
+++ b/plugins/EmailSummary/locale/be-tarask/LC_MESSAGES/EmailSummary.po
@@ -9,20 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - EmailSummary\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:35+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:07+0000\n"
 "Language-Team: Belarusian (Taraškievica orthography) <http://translatewiki."
 "net/wiki/Portal:be-tarask>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:14+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:40+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: be-tarask\n"
 "X-Message-Group: #out-statusnet-plugin-emailsummary\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: EmailSummaryPlugin.php:120
 msgid "Send an email summary of the inbox to users."
 msgstr ""
 "Дасылае агляд уваходзячых паведамленьняў на электронную пошту карыстальніка."
diff --git a/plugins/EmailSummary/locale/br/LC_MESSAGES/EmailSummary.po b/plugins/EmailSummary/locale/br/LC_MESSAGES/EmailSummary.po
index 5f87f6812e..66fa19037a 100644
--- a/plugins/EmailSummary/locale/br/LC_MESSAGES/EmailSummary.po
+++ b/plugins/EmailSummary/locale/br/LC_MESSAGES/EmailSummary.po
@@ -9,18 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - EmailSummary\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:35+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:07+0000\n"
 "Language-Team: Breton <http://translatewiki.net/wiki/Portal:br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:14+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:40+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-emailsummary\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: EmailSummaryPlugin.php:120
 msgid "Send an email summary of the inbox to users."
 msgstr "Kas d'an implijerien, dre bostel, un diverrañ eus ar voest degemer."
diff --git a/plugins/EmailSummary/locale/ca/LC_MESSAGES/EmailSummary.po b/plugins/EmailSummary/locale/ca/LC_MESSAGES/EmailSummary.po
index 92a309b7f1..bde1ab5b61 100644
--- a/plugins/EmailSummary/locale/ca/LC_MESSAGES/EmailSummary.po
+++ b/plugins/EmailSummary/locale/ca/LC_MESSAGES/EmailSummary.po
@@ -9,18 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - EmailSummary\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-17 10:25+0000\n"
-"PO-Revision-Date: 2011-02-17 10:28:10+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:07+0000\n"
 "Language-Team: Catalan <http://translatewiki.net/wiki/Portal:ca>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-14 17:19:17+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r82325); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:40+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ca\n"
 "X-Message-Group: #out-statusnet-plugin-emailsummary\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: EmailSummaryPlugin.php:120
 msgid "Send an email summary of the inbox to users."
 msgstr "Envia un resum de correu a la safata d'entrada dels usuaris."
diff --git a/plugins/EmailSummary/locale/de/LC_MESSAGES/EmailSummary.po b/plugins/EmailSummary/locale/de/LC_MESSAGES/EmailSummary.po
index 089324c36a..25ac5a368d 100644
--- a/plugins/EmailSummary/locale/de/LC_MESSAGES/EmailSummary.po
+++ b/plugins/EmailSummary/locale/de/LC_MESSAGES/EmailSummary.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - EmailSummary\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-14 16:01+0000\n"
-"PO-Revision-Date: 2011-02-14 16:07:44+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:07+0000\n"
 "Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:24:11+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r82114); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:40+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-emailsummary\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: EmailSummaryPlugin.php:120
 msgid "Send an email summary of the inbox to users."
 msgstr ""
 "Eine E-Mail mit der Zusammenfassung des Posteingangs an die Nutzer senden."
diff --git a/plugins/EmailSummary/locale/fr/LC_MESSAGES/EmailSummary.po b/plugins/EmailSummary/locale/fr/LC_MESSAGES/EmailSummary.po
index 84ec9fa9d7..1a8a563cc2 100644
--- a/plugins/EmailSummary/locale/fr/LC_MESSAGES/EmailSummary.po
+++ b/plugins/EmailSummary/locale/fr/LC_MESSAGES/EmailSummary.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - EmailSummary\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:35+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:07+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:14+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:40+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-emailsummary\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: EmailSummaryPlugin.php:120
 msgid "Send an email summary of the inbox to users."
 msgstr ""
 "Envoyer un résumé de la boîte de réception par courrier électronique aux "
diff --git a/plugins/EmailSummary/locale/he/LC_MESSAGES/EmailSummary.po b/plugins/EmailSummary/locale/he/LC_MESSAGES/EmailSummary.po
index fb3452678a..c02544f6fd 100644
--- a/plugins/EmailSummary/locale/he/LC_MESSAGES/EmailSummary.po
+++ b/plugins/EmailSummary/locale/he/LC_MESSAGES/EmailSummary.po
@@ -9,18 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - EmailSummary\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:35+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:07+0000\n"
 "Language-Team: Hebrew <http://translatewiki.net/wiki/Portal:he>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:14+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:40+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-plugin-emailsummary\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: EmailSummaryPlugin.php:120
 msgid "Send an email summary of the inbox to users."
 msgstr "שליחת תקציר של תיבת הדואר הנכנס בדוא״ל למשתמשים."
diff --git a/plugins/EmailSummary/locale/ia/LC_MESSAGES/EmailSummary.po b/plugins/EmailSummary/locale/ia/LC_MESSAGES/EmailSummary.po
index ff043a5dc3..69896b1d8d 100644
--- a/plugins/EmailSummary/locale/ia/LC_MESSAGES/EmailSummary.po
+++ b/plugins/EmailSummary/locale/ia/LC_MESSAGES/EmailSummary.po
@@ -9,18 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - EmailSummary\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:35+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:07+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:14+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:40+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-emailsummary\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: EmailSummaryPlugin.php:120
 msgid "Send an email summary of the inbox to users."
 msgstr "Inviar in e-mail un summario del cassa de entrata al usatores."
diff --git a/plugins/EmailSummary/locale/id/LC_MESSAGES/EmailSummary.po b/plugins/EmailSummary/locale/id/LC_MESSAGES/EmailSummary.po
index d823958eb3..98ceb1d59a 100644
--- a/plugins/EmailSummary/locale/id/LC_MESSAGES/EmailSummary.po
+++ b/plugins/EmailSummary/locale/id/LC_MESSAGES/EmailSummary.po
@@ -9,18 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - EmailSummary\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:35+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:07+0000\n"
 "Language-Team: Indonesian <http://translatewiki.net/wiki/Portal:id>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:14+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:40+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: id\n"
 "X-Message-Group: #out-statusnet-plugin-emailsummary\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: EmailSummaryPlugin.php:120
 msgid "Send an email summary of the inbox to users."
 msgstr "Kirim surel ringkasan kotak masuk ke pengguna."
diff --git a/plugins/EmailSummary/locale/mk/LC_MESSAGES/EmailSummary.po b/plugins/EmailSummary/locale/mk/LC_MESSAGES/EmailSummary.po
index 6860b9db53..de2f911257 100644
--- a/plugins/EmailSummary/locale/mk/LC_MESSAGES/EmailSummary.po
+++ b/plugins/EmailSummary/locale/mk/LC_MESSAGES/EmailSummary.po
@@ -9,18 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - EmailSummary\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:35+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:07+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:14+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:40+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-emailsummary\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
 
-#: EmailSummaryPlugin.php:120
 msgid "Send an email summary of the inbox to users."
 msgstr "Испрати им на корисниците краток преглед на примената пошта."
diff --git a/plugins/EmailSummary/locale/nl/LC_MESSAGES/EmailSummary.po b/plugins/EmailSummary/locale/nl/LC_MESSAGES/EmailSummary.po
index b41fa5062a..0a8a0b83a1 100644
--- a/plugins/EmailSummary/locale/nl/LC_MESSAGES/EmailSummary.po
+++ b/plugins/EmailSummary/locale/nl/LC_MESSAGES/EmailSummary.po
@@ -9,18 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - EmailSummary\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:36+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:07+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:14+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:40+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-emailsummary\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: EmailSummaryPlugin.php:120
 msgid "Send an email summary of the inbox to users."
 msgstr "E-mailsamenvatting verzenden naar het Postvak IN van gebruikers."
diff --git a/plugins/EmailSummary/locale/pt/LC_MESSAGES/EmailSummary.po b/plugins/EmailSummary/locale/pt/LC_MESSAGES/EmailSummary.po
index 734d48d3f5..a6699867e7 100644
--- a/plugins/EmailSummary/locale/pt/LC_MESSAGES/EmailSummary.po
+++ b/plugins/EmailSummary/locale/pt/LC_MESSAGES/EmailSummary.po
@@ -9,18 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - EmailSummary\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 15:58+0000\n"
-"PO-Revision-Date: 2011-03-03 16:01:52+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:07+0000\n"
 "Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-17 11:29:53+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:40+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-plugin-emailsummary\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: EmailSummaryPlugin.php:120
 msgid "Send an email summary of the inbox to users."
 msgstr "Enviar por email um resumo da caixa de entrada aos utilizadores."
diff --git a/plugins/EmailSummary/locale/ru/LC_MESSAGES/EmailSummary.po b/plugins/EmailSummary/locale/ru/LC_MESSAGES/EmailSummary.po
index 672065b8d4..925a41d9bb 100644
--- a/plugins/EmailSummary/locale/ru/LC_MESSAGES/EmailSummary.po
+++ b/plugins/EmailSummary/locale/ru/LC_MESSAGES/EmailSummary.po
@@ -9,20 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - EmailSummary\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:36+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:07+0000\n"
 "Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:14+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:40+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-emailsummary\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: EmailSummaryPlugin.php:120
 msgid "Send an email summary of the inbox to users."
 msgstr ""
 "Отправляет обзор входящих сообщений на электронную почту пользователей."
diff --git a/plugins/EmailSummary/locale/uk/LC_MESSAGES/EmailSummary.po b/plugins/EmailSummary/locale/uk/LC_MESSAGES/EmailSummary.po
index c5db8cac34..47f6f32417 100644
--- a/plugins/EmailSummary/locale/uk/LC_MESSAGES/EmailSummary.po
+++ b/plugins/EmailSummary/locale/uk/LC_MESSAGES/EmailSummary.po
@@ -9,20 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - EmailSummary\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:36+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:07+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:14+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:40+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-emailsummary\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: EmailSummaryPlugin.php:120
 msgid "Send an email summary of the inbox to users."
 msgstr ""
 "Надсилає електронною поштою перелік вхідних приватних повідомлень, "
diff --git a/plugins/EmailSummary/locale/zh_CN/LC_MESSAGES/EmailSummary.po b/plugins/EmailSummary/locale/zh_CN/LC_MESSAGES/EmailSummary.po
index f63a1ff010..11fc6f2cff 100644
--- a/plugins/EmailSummary/locale/zh_CN/LC_MESSAGES/EmailSummary.po
+++ b/plugins/EmailSummary/locale/zh_CN/LC_MESSAGES/EmailSummary.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - EmailSummary\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:36+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:07+0000\n"
 "Language-Team: Simplified Chinese <http://translatewiki.net/wiki/Portal:zh-"
 "hans>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:14+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:40+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-emailsummary\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: EmailSummaryPlugin.php:120
 msgid "Send an email summary of the inbox to users."
 msgstr "发送到用户的收件箱的电子邮件综述。"
diff --git a/plugins/ExtendedProfile/locale/ExtendedProfile.pot b/plugins/ExtendedProfile/locale/ExtendedProfile.pot
index 0b53a88f8c..89a6880e24 100644
--- a/plugins/ExtendedProfile/locale/ExtendedProfile.pot
+++ b/plugins/ExtendedProfile/locale/ExtendedProfile.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,6 +16,19 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: ExtendedProfilePlugin.php:40
+msgid "UI extensions for additional profile fields."
+msgstr ""
+
+#. TRANS: Link description in user account settings menu.
+#: ExtendedProfilePlugin.php:108
+msgid "Details"
+msgstr ""
+
+#: ExtendedProfilePlugin.php:116
+msgid "More details..."
+msgstr ""
+
 #: extendedprofile.php:49 extendedprofile.php:103
 msgid "Personal"
 msgstr ""
@@ -88,19 +101,6 @@ msgstr ""
 msgid "Institution"
 msgstr ""
 
-#: ExtendedProfilePlugin.php:40
-msgid "UI extensions for additional profile fields."
-msgstr ""
-
-#. TRANS: Link description in user account settings menu.
-#: ExtendedProfilePlugin.php:108
-msgid "Details"
-msgstr ""
-
-#: ExtendedProfilePlugin.php:116
-msgid "More details..."
-msgstr ""
-
 #. TRANS: Link title for link on user profile.
 #: profiledetailaction.php:61
 msgid "Edit extended profile settings"
diff --git a/plugins/ExtendedProfile/locale/br/LC_MESSAGES/ExtendedProfile.po b/plugins/ExtendedProfile/locale/br/LC_MESSAGES/ExtendedProfile.po
new file mode 100644
index 0000000000..3d8743fc1f
--- /dev/null
+++ b/plugins/ExtendedProfile/locale/br/LC_MESSAGES/ExtendedProfile.po
@@ -0,0 +1,97 @@
+# Translation of StatusNet - ExtendedProfile to Breton (Brezhoneg)
+# Exported from translatewiki.net
+#
+# Author: Y-M D
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - ExtendedProfile\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:09+0000\n"
+"Language-Team: Breton <http://translatewiki.net/wiki/Portal:br>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-03-03 20:42:39+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: br\n"
+"X-Message-Group: #out-statusnet-plugin-extendedprofile\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+msgid "UI extensions for additional profile fields."
+msgstr ""
+
+#. TRANS: Link description in user account settings menu.
+msgid "Details"
+msgstr "Munudoù"
+
+msgid "More details..."
+msgstr "Muoic'h a vunudoù..."
+
+msgid "Personal"
+msgstr "Personel"
+
+msgid "Full name"
+msgstr "Anv klok"
+
+msgid "Title"
+msgstr "Titl"
+
+msgid "Manager"
+msgstr "Merour"
+
+msgid "Location"
+msgstr "Lec'hiadur"
+
+msgid "Bio"
+msgstr "Buhezskrid"
+
+msgid "Tags"
+msgstr "Balizennoù"
+
+msgid "Contact"
+msgstr "Darempred"
+
+msgid "Phone"
+msgstr "Pellgomz"
+
+msgid "IM"
+msgstr "IM"
+
+msgid "Websites"
+msgstr "Lec'hiennoù web"
+
+msgid "Birthday"
+msgstr "Deiz-ha-bloaz"
+
+msgid "Spouse's name"
+msgstr ""
+
+msgid "Kids' names"
+msgstr "Anv ar vugale"
+
+msgid "Work experience"
+msgstr "Skiant-prenet"
+
+msgid "Employer"
+msgstr ""
+
+msgid "Education"
+msgstr "Deskadurezh"
+
+msgid "Institution"
+msgstr "Ensavadur"
+
+#. TRANS: Link title for link on user profile.
+msgid "Edit extended profile settings"
+msgstr "Aozañ arventennoù ledanet ar profil"
+
+#. TRANS: Link text for link on user profile.
+msgid "Edit"
+msgstr "Aozañ"
+
+msgid "Extended profile settings"
+msgstr "Arventennoù ledanet ar profil"
diff --git a/plugins/ExtendedProfile/locale/ia/LC_MESSAGES/ExtendedProfile.po b/plugins/ExtendedProfile/locale/ia/LC_MESSAGES/ExtendedProfile.po
new file mode 100644
index 0000000000..6c1e781b7d
--- /dev/null
+++ b/plugins/ExtendedProfile/locale/ia/LC_MESSAGES/ExtendedProfile.po
@@ -0,0 +1,97 @@
+# Translation of StatusNet - ExtendedProfile to Interlingua (Interlingua)
+# Exported from translatewiki.net
+#
+# Author: McDutchie
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - ExtendedProfile\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:09+0000\n"
+"Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-03-03 20:42:39+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: ia\n"
+"X-Message-Group: #out-statusnet-plugin-extendedprofile\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "UI extensions for additional profile fields."
+msgstr "Extensiones del IU pro additional campos de profilo."
+
+#. TRANS: Link description in user account settings menu.
+msgid "Details"
+msgstr "Detalios"
+
+msgid "More details..."
+msgstr "Plus detalios..."
+
+msgid "Personal"
+msgstr "Personal"
+
+msgid "Full name"
+msgstr "Nomine complete"
+
+msgid "Title"
+msgstr "Titulo"
+
+msgid "Manager"
+msgstr "Gerente"
+
+msgid "Location"
+msgstr "Loco"
+
+msgid "Bio"
+msgstr "Bio"
+
+msgid "Tags"
+msgstr "Etiquettas"
+
+msgid "Contact"
+msgstr "Contacto"
+
+msgid "Phone"
+msgstr "Telephono"
+
+msgid "IM"
+msgstr "MI"
+
+msgid "Websites"
+msgstr "Sitos web"
+
+msgid "Birthday"
+msgstr "Anniversario"
+
+msgid "Spouse's name"
+msgstr "Nomine del sposo/-a"
+
+msgid "Kids' names"
+msgstr "Nomines del infantes"
+
+msgid "Work experience"
+msgstr "Experientia professional"
+
+msgid "Employer"
+msgstr "Empleator"
+
+msgid "Education"
+msgstr "Education"
+
+msgid "Institution"
+msgstr "Institution"
+
+#. TRANS: Link title for link on user profile.
+msgid "Edit extended profile settings"
+msgstr "Modificar configuration extendite del profilo"
+
+#. TRANS: Link text for link on user profile.
+msgid "Edit"
+msgstr "Modificar"
+
+msgid "Extended profile settings"
+msgstr "Configuration extendite del profilo"
diff --git a/plugins/ExtendedProfile/locale/mk/LC_MESSAGES/ExtendedProfile.po b/plugins/ExtendedProfile/locale/mk/LC_MESSAGES/ExtendedProfile.po
new file mode 100644
index 0000000000..15e6fb507a
--- /dev/null
+++ b/plugins/ExtendedProfile/locale/mk/LC_MESSAGES/ExtendedProfile.po
@@ -0,0 +1,97 @@
+# Translation of StatusNet - ExtendedProfile to Macedonian (Македонски)
+# Exported from translatewiki.net
+#
+# Author: Bjankuloski06
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - ExtendedProfile\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:09+0000\n"
+"Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-03-03 20:42:39+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: mk\n"
+"X-Message-Group: #out-statusnet-plugin-extendedprofile\n"
+"Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
+
+msgid "UI extensions for additional profile fields."
+msgstr "Посреднички дадатоци за дополнителни полиња во профилот."
+
+#. TRANS: Link description in user account settings menu.
+msgid "Details"
+msgstr "Подробности"
+
+msgid "More details..."
+msgstr "Поподробно..."
+
+msgid "Personal"
+msgstr "Лично"
+
+msgid "Full name"
+msgstr "Име и презиме"
+
+msgid "Title"
+msgstr "Звање"
+
+msgid "Manager"
+msgstr "Раководител"
+
+msgid "Location"
+msgstr "Место"
+
+msgid "Bio"
+msgstr "Био"
+
+msgid "Tags"
+msgstr "Ознаки"
+
+msgid "Contact"
+msgstr "Контакт"
+
+msgid "Phone"
+msgstr "Телефон"
+
+msgid "IM"
+msgstr "IM"
+
+msgid "Websites"
+msgstr "Мрежни места"
+
+msgid "Birthday"
+msgstr "Роденден"
+
+msgid "Spouse's name"
+msgstr "Име на сопружникот"
+
+msgid "Kids' names"
+msgstr "Имиња на децата"
+
+msgid "Work experience"
+msgstr "Работно искуство"
+
+msgid "Employer"
+msgstr "Работодавач"
+
+msgid "Education"
+msgstr "Образование"
+
+msgid "Institution"
+msgstr "Установа"
+
+#. TRANS: Link title for link on user profile.
+msgid "Edit extended profile settings"
+msgstr "Уреди проширени профилни нагодувања"
+
+#. TRANS: Link text for link on user profile.
+msgid "Edit"
+msgstr "Уреди"
+
+msgid "Extended profile settings"
+msgstr "Проширени профилни нагодувања"
diff --git a/plugins/ExtendedProfile/locale/nl/LC_MESSAGES/ExtendedProfile.po b/plugins/ExtendedProfile/locale/nl/LC_MESSAGES/ExtendedProfile.po
new file mode 100644
index 0000000000..5e34c2f79f
--- /dev/null
+++ b/plugins/ExtendedProfile/locale/nl/LC_MESSAGES/ExtendedProfile.po
@@ -0,0 +1,97 @@
+# Translation of StatusNet - ExtendedProfile to Dutch (Nederlands)
+# Exported from translatewiki.net
+#
+# Author: Siebrand
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - ExtendedProfile\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:09+0000\n"
+"Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-03-03 20:42:39+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: nl\n"
+"X-Message-Group: #out-statusnet-plugin-extendedprofile\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "UI extensions for additional profile fields."
+msgstr "UI-uitbreidingen voor extra profielvelden."
+
+#. TRANS: Link description in user account settings menu.
+msgid "Details"
+msgstr "Details"
+
+msgid "More details..."
+msgstr "Meer details..."
+
+msgid "Personal"
+msgstr "Persoonlijk"
+
+msgid "Full name"
+msgstr "Volledige naam"
+
+msgid "Title"
+msgstr "Titel"
+
+msgid "Manager"
+msgstr "Manager"
+
+msgid "Location"
+msgstr "Locatie"
+
+msgid "Bio"
+msgstr "Beschrijving"
+
+msgid "Tags"
+msgstr "Labels"
+
+msgid "Contact"
+msgstr "Contact"
+
+msgid "Phone"
+msgstr "Telefoonnummer"
+
+msgid "IM"
+msgstr "IM"
+
+msgid "Websites"
+msgstr "Websites"
+
+msgid "Birthday"
+msgstr "Geboortedatum"
+
+msgid "Spouse's name"
+msgstr "Naam partner:"
+
+msgid "Kids' names"
+msgstr "Namen van kinderen"
+
+msgid "Work experience"
+msgstr "Werkervaring"
+
+msgid "Employer"
+msgstr "Werkgever"
+
+msgid "Education"
+msgstr "Opleiding"
+
+msgid "Institution"
+msgstr "Instelling"
+
+#. TRANS: Link title for link on user profile.
+msgid "Edit extended profile settings"
+msgstr "Uitgebreide profielinstellingen bewerken"
+
+#. TRANS: Link text for link on user profile.
+msgid "Edit"
+msgstr "Bewerken"
+
+msgid "Extended profile settings"
+msgstr "Uitgebreide profielinstellingen"
diff --git a/plugins/FacebookBridge/locale/FacebookBridge.pot b/plugins/FacebookBridge/locale/FacebookBridge.pot
index 81d1aed082..cb0f39d4a0 100644
--- a/plugins/FacebookBridge/locale/FacebookBridge.pot
+++ b/plugins/FacebookBridge/locale/FacebookBridge.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,41 +16,132 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#. TRANS: Menu item.
-#. TRANS: Menu item tab.
-#: FacebookBridgePlugin.php:218 FacebookBridgePlugin.php:257
-#: FacebookBridgePlugin.php:298
-msgctxt "MENU"
+#: actions/facebooklogin.php:43
+msgid "Already logged in."
+msgstr ""
+
+#. TRANS: Instructions.
+#: actions/facebooklogin.php:52
+msgid "Login with your Facebook Account"
+msgstr ""
+
+#. TRANS: Page title.
+#: actions/facebooklogin.php:67
+msgid "Login with Facebook"
+msgstr ""
+
+#: actions/facebookadminpanel.php:52
 msgid "Facebook"
 msgstr ""
 
-#. TRANS: Tooltip for menu item "Facebook".
-#: FacebookBridgePlugin.php:220
-msgid "Login or register using Facebook"
+#: actions/facebookadminpanel.php:62
+msgid "Facebook integration settings"
 msgstr ""
 
-#. TRANS: Tooltip for menu item "Facebook".
-#: FacebookBridgePlugin.php:259
-msgid "Facebook integration configuration"
+#: actions/facebookadminpanel.php:123
+msgid "Invalid Facebook ID. Max length is 255 characters."
+msgstr ""
+
+#: actions/facebookadminpanel.php:129
+msgid "Invalid Facebook secret. Max length is 255 characters."
+msgstr ""
+
+#: actions/facebookadminpanel.php:178
+msgid "Facebook application settings"
+msgstr ""
+
+#: actions/facebookadminpanel.php:184
+msgid "Application ID"
+msgstr ""
+
+#: actions/facebookadminpanel.php:185
+msgid "ID of your Facebook application"
+msgstr ""
+
+#: actions/facebookadminpanel.php:193
+msgid "Secret"
+msgstr ""
+
+#: actions/facebookadminpanel.php:194
+msgid "Application secret"
+msgstr ""
+
+#: actions/facebookadminpanel.php:210
+msgid "Save"
+msgstr ""
+
+#: actions/facebookadminpanel.php:210
+msgid "Save Facebook settings"
+msgstr ""
+
+#: actions/facebooksettings.php:86 actions/facebookfinishlogin.php:141
+msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 
-#. TRANS: Tooltip for menu item "Facebook".
 #. TRANS: Page title for Facebook settings.
-#: FacebookBridgePlugin.php:300 actions/facebooksettings.php:105
+#. TRANS: Tooltip for menu item "Facebook".
+#: actions/facebooksettings.php:105 FacebookBridgePlugin.php:300
 msgid "Facebook settings"
 msgstr ""
 
-#: FacebookBridgePlugin.php:564
-msgid "A plugin for integrating StatusNet with Facebook."
+#: actions/facebooksettings.php:137
+msgid "Connected Facebook user"
 msgstr ""
 
-#: lib/facebookclient.php:786
-msgid "Your Facebook connection has been removed"
+#: actions/facebooksettings.php:164
+msgid "Publish my notices to Facebook."
 msgstr ""
 
-#: lib/facebookclient.php:845
+#: actions/facebooksettings.php:174
+msgid "Send \"@\" replies to Facebook."
+msgstr ""
+
+#. TRANS: Submit button to save synchronisation settings.
+#: actions/facebooksettings.php:183
+msgctxt "BUTTON"
+msgid "Save"
+msgstr ""
+
+#. TRANS: Legend.
+#: actions/facebooksettings.php:192
+msgid "Disconnect my account from Facebook"
+msgstr ""
+
+#: actions/facebooksettings.php:199
 #, php-format
-msgid "Contact the %s administrator to retrieve your account"
+msgid ""
+"Disconnecting your Faceboook would make it impossible to log in! Please [set "
+"a password](%s) first."
+msgstr ""
+
+#: actions/facebooksettings.php:213
+#, php-format
+msgid ""
+"Keep your %1$s account but disconnect from Facebook. You'll use your %1$s "
+"password to log in."
+msgstr ""
+
+#. TRANS: Submit button.
+#: actions/facebooksettings.php:220
+msgctxt "BUTTON"
+msgid "Disconnect"
+msgstr ""
+
+#: actions/facebooksettings.php:243
+msgid "There was a problem saving your sync preferences."
+msgstr ""
+
+#. TRANS: Confirmation that synchronisation settings have been saved into the system.
+#: actions/facebooksettings.php:246
+msgid "Sync preferences saved."
+msgstr ""
+
+#: actions/facebooksettings.php:260
+msgid "Couldn't delete link to Facebook."
+msgstr ""
+
+#: actions/facebooksettings.php:264
+msgid "You have disconnected from Facebook."
 msgstr ""
 
 #: actions/facebookfinishlogin.php:88
@@ -62,10 +153,6 @@ msgstr ""
 msgid "There is already a local account linked with that Facebook account."
 msgstr ""
 
-#: actions/facebookfinishlogin.php:141 actions/facebooksettings.php:86
-msgid "There was a problem with your session token. Try again, please."
-msgstr ""
-
 #: actions/facebookfinishlogin.php:150
 msgid "You can't register if you don't agree to the license."
 msgstr ""
@@ -176,120 +263,33 @@ msgstr ""
 msgid "Invalid username or password."
 msgstr ""
 
-#: actions/facebooklogin.php:43
-msgid "Already logged in."
-msgstr ""
-
-#. TRANS: Instructions.
-#: actions/facebooklogin.php:52
-msgid "Login with your Facebook Account"
-msgstr ""
-
-#. TRANS: Page title.
-#: actions/facebooklogin.php:67
-msgid "Login with Facebook"
-msgstr ""
-
-#: actions/facebookadminpanel.php:52
+#. TRANS: Menu item.
+#. TRANS: Menu item tab.
+#: FacebookBridgePlugin.php:218 FacebookBridgePlugin.php:257
+#: FacebookBridgePlugin.php:298
+msgctxt "MENU"
 msgid "Facebook"
 msgstr ""
 
-#: actions/facebookadminpanel.php:62
-msgid "Facebook integration settings"
+#. TRANS: Tooltip for menu item "Facebook".
+#: FacebookBridgePlugin.php:220
+msgid "Login or register using Facebook"
 msgstr ""
 
-#: actions/facebookadminpanel.php:123
-msgid "Invalid Facebook ID. Max length is 255 characters."
+#. TRANS: Tooltip for menu item "Facebook".
+#: FacebookBridgePlugin.php:259
+msgid "Facebook integration configuration"
 msgstr ""
 
-#: actions/facebookadminpanel.php:129
-msgid "Invalid Facebook secret. Max length is 255 characters."
+#: FacebookBridgePlugin.php:564
+msgid "A plugin for integrating StatusNet with Facebook."
 msgstr ""
 
-#: actions/facebookadminpanel.php:178
-msgid "Facebook application settings"
+#: lib/facebookclient.php:786
+msgid "Your Facebook connection has been removed"
 msgstr ""
 
-#: actions/facebookadminpanel.php:184
-msgid "Application ID"
-msgstr ""
-
-#: actions/facebookadminpanel.php:185
-msgid "ID of your Facebook application"
-msgstr ""
-
-#: actions/facebookadminpanel.php:193
-msgid "Secret"
-msgstr ""
-
-#: actions/facebookadminpanel.php:194
-msgid "Application secret"
-msgstr ""
-
-#: actions/facebookadminpanel.php:210
-msgid "Save"
-msgstr ""
-
-#: actions/facebookadminpanel.php:210
-msgid "Save Facebook settings"
-msgstr ""
-
-#: actions/facebooksettings.php:137
-msgid "Connected Facebook user"
-msgstr ""
-
-#: actions/facebooksettings.php:164
-msgid "Publish my notices to Facebook."
-msgstr ""
-
-#: actions/facebooksettings.php:174
-msgid "Send \"@\" replies to Facebook."
-msgstr ""
-
-#. TRANS: Submit button to save synchronisation settings.
-#: actions/facebooksettings.php:183
-msgctxt "BUTTON"
-msgid "Save"
-msgstr ""
-
-#. TRANS: Legend.
-#: actions/facebooksettings.php:192
-msgid "Disconnect my account from Facebook"
-msgstr ""
-
-#: actions/facebooksettings.php:199
+#: lib/facebookclient.php:845
 #, php-format
-msgid ""
-"Disconnecting your Faceboook would make it impossible to log in! Please [set "
-"a password](%s) first."
-msgstr ""
-
-#: actions/facebooksettings.php:213
-#, php-format
-msgid ""
-"Keep your %1$s account but disconnect from Facebook. You'll use your %1$s "
-"password to log in."
-msgstr ""
-
-#. TRANS: Submit button.
-#: actions/facebooksettings.php:220
-msgctxt "BUTTON"
-msgid "Disconnect"
-msgstr ""
-
-#: actions/facebooksettings.php:243
-msgid "There was a problem saving your sync preferences."
-msgstr ""
-
-#. TRANS: Confirmation that synchronisation settings have been saved into the system.
-#: actions/facebooksettings.php:246
-msgid "Sync preferences saved."
-msgstr ""
-
-#: actions/facebooksettings.php:260
-msgid "Couldn't delete link to Facebook."
-msgstr ""
-
-#: actions/facebooksettings.php:264
-msgid "You have disconnected from Facebook."
+msgid "Contact the %s administrator to retrieve your account"
 msgstr ""
diff --git a/plugins/FacebookBridge/locale/br/LC_MESSAGES/FacebookBridge.po b/plugins/FacebookBridge/locale/br/LC_MESSAGES/FacebookBridge.po
index 0cc05ab9a8..3aeeb2acac 100644
--- a/plugins/FacebookBridge/locale/br/LC_MESSAGES/FacebookBridge.po
+++ b/plugins/FacebookBridge/locale/br/LC_MESSAGES/FacebookBridge.po
@@ -9,79 +9,133 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - FacebookBridge\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 15:58+0000\n"
-"PO-Revision-Date: 2011-03-03 16:01:56+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:12+0000\n"
 "Language-Team: Breton <http://translatewiki.net/wiki/Portal:br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-25 23:44:49+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:42+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-facebookbridge\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#. TRANS: Menu item.
-#. TRANS: Menu item tab.
-#: FacebookBridgePlugin.php:218 FacebookBridgePlugin.php:257
-#: FacebookBridgePlugin.php:298
-msgctxt "MENU"
+msgid "Already logged in."
+msgstr "Kevreet oc'h dija."
+
+#. TRANS: Instructions.
+msgid "Login with your Facebook Account"
+msgstr "Kevreit gant ho kont Facebook"
+
+#. TRANS: Page title.
+msgid "Login with Facebook"
+msgstr "Kevreañ gant Facebook"
+
 msgid "Facebook"
 msgstr "Facebook"
 
-#. TRANS: Tooltip for menu item "Facebook".
-#: FacebookBridgePlugin.php:220
-msgid "Login or register using Facebook"
-msgstr "Kevreañ pe en em enskrivañ dre Facebook"
+msgid "Facebook integration settings"
+msgstr "Arventennoù enframmañ Facebook"
 
-#. TRANS: Tooltip for menu item "Facebook".
-#: FacebookBridgePlugin.php:259
-msgid "Facebook integration configuration"
+msgid "Invalid Facebook ID. Max length is 255 characters."
 msgstr ""
 
-#. TRANS: Tooltip for menu item "Facebook".
+msgid "Invalid Facebook secret. Max length is 255 characters."
+msgstr ""
+
+msgid "Facebook application settings"
+msgstr "Arventennoù poellad Facebook"
+
+msgid "Application ID"
+msgstr "ID ar poellad"
+
+msgid "ID of your Facebook application"
+msgstr "ID ho poellad Facebook"
+
+msgid "Secret"
+msgstr "Kuzh"
+
+msgid "Application secret"
+msgstr ""
+
+msgid "Save"
+msgstr "Enrollañ"
+
+msgid "Save Facebook settings"
+msgstr "Enrollañ arventennoù Facebook"
+
+msgid "There was a problem with your session token. Try again, please."
+msgstr "Ur gudenn 'zo bet gant ho jedaouer dalc'h. Mar plij adklaskit."
+
 #. TRANS: Page title for Facebook settings.
-#: FacebookBridgePlugin.php:300 actions/facebooksettings.php:105
+#. TRANS: Tooltip for menu item "Facebook".
 msgid "Facebook settings"
 msgstr "Arventennoù Facebook"
 
-#: FacebookBridgePlugin.php:564
-msgid "A plugin for integrating StatusNet with Facebook."
+msgid "Connected Facebook user"
+msgstr "Implijer Facebook kevreet"
+
+msgid "Publish my notices to Facebook."
 msgstr ""
 
-#: lib/facebookclient.php:786
-msgid "Your Facebook connection has been removed"
-msgstr ""
+msgid "Send \"@\" replies to Facebook."
+msgstr "Kas respontoù \"@\" da Facebook."
+
+#. TRANS: Submit button to save synchronisation settings.
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "Enrollañ"
+
+#. TRANS: Legend.
+msgid "Disconnect my account from Facebook"
+msgstr "Digevreañ ma c'hont deus Facebook"
 
-#: lib/facebookclient.php:845
 #, php-format
-msgid "Contact the %s administrator to retrieve your account"
+msgid ""
+"Disconnecting your Faceboook would make it impossible to log in! Please [set "
+"a password](%s) first."
 msgstr ""
 
-#: actions/facebookfinishlogin.php:88
+#, php-format
+msgid ""
+"Keep your %1$s account but disconnect from Facebook. You'll use your %1$s "
+"password to log in."
+msgstr ""
+
+#. TRANS: Submit button.
+msgctxt "BUTTON"
+msgid "Disconnect"
+msgstr "Digevrañ"
+
+msgid "There was a problem saving your sync preferences."
+msgstr ""
+
+#. TRANS: Confirmation that synchronisation settings have been saved into the system.
+msgid "Sync preferences saved."
+msgstr ""
+
+msgid "Couldn't delete link to Facebook."
+msgstr "N'eus ket bet gallet diverkañ al liamm war-du Facebook."
+
+msgid "You have disconnected from Facebook."
+msgstr "Digevreet ho peus deus Facebook."
+
 msgid ""
 "You must be logged into Facebook to register a local account using Facebook."
 msgstr ""
 
-#: actions/facebookfinishlogin.php:118
 msgid "There is already a local account linked with that Facebook account."
 msgstr "Un implijer lec'hel liammet d'ar gont Facebook-se a zo dija."
 
-#: actions/facebookfinishlogin.php:141 actions/facebooksettings.php:86
-msgid "There was a problem with your session token. Try again, please."
-msgstr "Ur gudenn 'zo bet gant ho jedaouer dalc'h. Mar plij adklaskit."
-
-#: actions/facebookfinishlogin.php:150
 msgid "You can't register if you don't agree to the license."
 msgstr ""
 "Rankout a rit bezañ a-du gant termenoù an aotre-implijout evit krouiñ ur "
 "gont."
 
-#: actions/facebookfinishlogin.php:167
 msgid "An unknown error has occured."
 msgstr "Ur gudenn dizanv a zo bet."
 
-#: actions/facebookfinishlogin.php:185
 #, php-format
 msgid ""
 "This is the first time you've logged into %s so we must connect your "
@@ -90,17 +144,14 @@ msgid ""
 msgstr ""
 
 #. TRANS: Page title.
-#: actions/facebookfinishlogin.php:195
 msgid "Facebook Setup"
 msgstr ""
 
 #. TRANS: Legend.
-#: actions/facebookfinishlogin.php:229
 msgid "Connection options"
 msgstr "Dibarzhioù kevreañ"
 
 #. TRANS: %s is the name of the license used by the user for their status updates.
-#: actions/facebookfinishlogin.php:239
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -108,195 +159,85 @@ msgid ""
 msgstr ""
 
 #. TRANS: Legend.
-#: actions/facebookfinishlogin.php:256
 msgid "Create new account"
 msgstr "Krouiñ ur gont nevez"
 
-#: actions/facebookfinishlogin.php:258
 msgid "Create a new user with this nickname."
 msgstr "Krouiñ un implijer nevez gant al lesanv-se."
 
 #. TRANS: Field label.
-#: actions/facebookfinishlogin.php:266
 msgid "New nickname"
 msgstr "Lesanv nevez"
 
-#: actions/facebookfinishlogin.php:268
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "1 da 64 lizherenn vihan pe sifr, hep poentaouiñ nag esaouenn"
 
 #. TRANS: Submit button.
-#: actions/facebookfinishlogin.php:276
 msgctxt "BUTTON"
 msgid "Create"
 msgstr "Krouiñ"
 
-#: actions/facebookfinishlogin.php:282
 msgid "Connect existing account"
 msgstr "Kevreañ d'ur gont a zo dioutañ"
 
-#: actions/facebookfinishlogin.php:284
 msgid ""
 "If you already have an account, login with your username and password to "
 "connect it to your Facebook."
 msgstr ""
 
 #. TRANS: Field label.
-#: actions/facebookfinishlogin.php:288
 msgid "Existing nickname"
 msgstr "Lesanv a zo dioutañ"
 
-#: actions/facebookfinishlogin.php:291
 msgid "Password"
 msgstr "Ger-tremen"
 
 #. TRANS: Submit button.
-#: actions/facebookfinishlogin.php:295
 msgctxt "BUTTON"
 msgid "Connect"
 msgstr "Kevreañ"
 
 #. TRANS: Client error trying to register with registrations not allowed.
 #. TRANS: Client error trying to register with registrations 'invite only'.
-#: actions/facebookfinishlogin.php:316 actions/facebookfinishlogin.php:326
 msgid "Registration not allowed."
 msgstr "N'eo ket aotreet krouiñ kontoù."
 
 #. TRANS: Client error trying to register with an invalid invitation code.
-#: actions/facebookfinishlogin.php:334
 msgid "Not a valid invitation code."
 msgstr "N'eo ket reizh ar c'hod pedadenn."
 
-#: actions/facebookfinishlogin.php:347
 msgid "Nickname not allowed."
 msgstr "Lesanv nann-aotreet."
 
-#: actions/facebookfinishlogin.php:352
 msgid "Nickname already in use. Try another one."
 msgstr "Implijet eo dija al lesanv-se. Klaskit unan all."
 
-#: actions/facebookfinishlogin.php:380 actions/facebookfinishlogin.php:519
 msgid "Error connecting user to Facebook."
 msgstr ""
 
-#: actions/facebookfinishlogin.php:482
 msgid "Invalid username or password."
 msgstr "Anv implijer pe ger-tremen direizh."
 
-#: actions/facebooklogin.php:43
-msgid "Already logged in."
-msgstr "Kevreet oc'h dija."
-
-#. TRANS: Instructions.
-#: actions/facebooklogin.php:52
-msgid "Login with your Facebook Account"
-msgstr "Kevreit gant ho kont Facebook"
-
-#. TRANS: Page title.
-#: actions/facebooklogin.php:67
-msgid "Login with Facebook"
-msgstr "Kevreañ gant Facebook"
-
-#: actions/facebookadminpanel.php:52
+#. TRANS: Menu item.
+#. TRANS: Menu item tab.
+msgctxt "MENU"
 msgid "Facebook"
 msgstr "Facebook"
 
-#: actions/facebookadminpanel.php:62
-msgid "Facebook integration settings"
-msgstr "Arventennoù enframmañ Facebook"
+#. TRANS: Tooltip for menu item "Facebook".
+msgid "Login or register using Facebook"
+msgstr "Kevreañ pe en em enskrivañ dre Facebook"
 
-#: actions/facebookadminpanel.php:123
-msgid "Invalid Facebook ID. Max length is 255 characters."
+#. TRANS: Tooltip for menu item "Facebook".
+msgid "Facebook integration configuration"
 msgstr ""
 
-#: actions/facebookadminpanel.php:129
-msgid "Invalid Facebook secret. Max length is 255 characters."
+msgid "A plugin for integrating StatusNet with Facebook."
 msgstr ""
 
-#: actions/facebookadminpanel.php:178
-msgid "Facebook application settings"
-msgstr "Arventennoù poellad Facebook"
-
-#: actions/facebookadminpanel.php:184
-msgid "Application ID"
-msgstr "ID ar poellad"
-
-#: actions/facebookadminpanel.php:185
-msgid "ID of your Facebook application"
-msgstr "ID ho poellad Facebook"
-
-#: actions/facebookadminpanel.php:193
-msgid "Secret"
-msgstr "Kuzh"
-
-#: actions/facebookadminpanel.php:194
-msgid "Application secret"
+msgid "Your Facebook connection has been removed"
 msgstr ""
 
-#: actions/facebookadminpanel.php:210
-msgid "Save"
-msgstr "Enrollañ"
-
-#: actions/facebookadminpanel.php:210
-msgid "Save Facebook settings"
-msgstr "Enrollañ arventennoù Facebook"
-
-#: actions/facebooksettings.php:137
-msgid "Connected Facebook user"
-msgstr "Implijer Facebook kevreet"
-
-#: actions/facebooksettings.php:164
-msgid "Publish my notices to Facebook."
-msgstr ""
-
-#: actions/facebooksettings.php:174
-msgid "Send \"@\" replies to Facebook."
-msgstr "Kas respontoù \"@\" da Facebook."
-
-#. TRANS: Submit button to save synchronisation settings.
-#: actions/facebooksettings.php:183
-msgctxt "BUTTON"
-msgid "Save"
-msgstr "Enrollañ"
-
-#. TRANS: Legend.
-#: actions/facebooksettings.php:192
-msgid "Disconnect my account from Facebook"
-msgstr "Digevreañ ma c'hont deus Facebook"
-
-#: actions/facebooksettings.php:199
 #, php-format
-msgid ""
-"Disconnecting your Faceboook would make it impossible to log in! Please [set "
-"a password](%s) first."
+msgid "Contact the %s administrator to retrieve your account"
 msgstr ""
-
-#: actions/facebooksettings.php:213
-#, php-format
-msgid ""
-"Keep your %1$s account but disconnect from Facebook. You'll use your %1$s "
-"password to log in."
-msgstr ""
-
-#. TRANS: Submit button.
-#: actions/facebooksettings.php:220
-msgctxt "BUTTON"
-msgid "Disconnect"
-msgstr "Digevrañ"
-
-#: actions/facebooksettings.php:243
-msgid "There was a problem saving your sync preferences."
-msgstr ""
-
-#. TRANS: Confirmation that synchronisation settings have been saved into the system.
-#: actions/facebooksettings.php:246
-msgid "Sync preferences saved."
-msgstr ""
-
-#: actions/facebooksettings.php:260
-msgid "Couldn't delete link to Facebook."
-msgstr "N'eus ket bet gallet diverkañ al liamm war-du Facebook."
-
-#: actions/facebooksettings.php:264
-msgid "You have disconnected from Facebook."
-msgstr "Digevreet ho peus deus Facebook."
diff --git a/plugins/FacebookBridge/locale/ca/LC_MESSAGES/FacebookBridge.po b/plugins/FacebookBridge/locale/ca/LC_MESSAGES/FacebookBridge.po
index 9e20aae44a..e80e0879e6 100644
--- a/plugins/FacebookBridge/locale/ca/LC_MESSAGES/FacebookBridge.po
+++ b/plugins/FacebookBridge/locale/ca/LC_MESSAGES/FacebookBridge.po
@@ -9,79 +9,139 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - FacebookBridge\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 15:58+0000\n"
-"PO-Revision-Date: 2011-03-03 16:01:56+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:12+0000\n"
 "Language-Team: Catalan <http://translatewiki.net/wiki/Portal:ca>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-25 23:44:49+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:42+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ca\n"
 "X-Message-Group: #out-statusnet-plugin-facebookbridge\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. TRANS: Menu item.
-#. TRANS: Menu item tab.
-#: FacebookBridgePlugin.php:218 FacebookBridgePlugin.php:257
-#: FacebookBridgePlugin.php:298
-msgctxt "MENU"
+msgid "Already logged in."
+msgstr "Ja heu iniciat una sessió."
+
+#. TRANS: Instructions.
+msgid "Login with your Facebook Account"
+msgstr "Inicieu una sessió amb el compte del Facebook"
+
+#. TRANS: Page title.
+msgid "Login with Facebook"
+msgstr "Inicia una sessió amb el Facebook"
+
 msgid "Facebook"
 msgstr "Facebook"
 
-#. TRANS: Tooltip for menu item "Facebook".
-#: FacebookBridgePlugin.php:220
-msgid "Login or register using Facebook"
-msgstr "Inicieu-hi una sessió o registreu-vos-hi des del Facebook"
+msgid "Facebook integration settings"
+msgstr "Paràmetres d'integració del Facebook"
 
-#. TRANS: Tooltip for menu item "Facebook".
-#: FacebookBridgePlugin.php:259
-msgid "Facebook integration configuration"
-msgstr "Configuració de la integració del Facebook"
+msgid "Invalid Facebook ID. Max length is 255 characters."
+msgstr "L'ID del Facebook no és vàlid. La longitud màxima són 255 caràcters."
+
+msgid "Invalid Facebook secret. Max length is 255 characters."
+msgstr ""
+"La clau secreta del Facebook no és vàlida. La longitud màxima són 255 "
+"caràcters."
+
+msgid "Facebook application settings"
+msgstr "Paràmetres d'aplicació del Facebook"
+
+msgid "Application ID"
+msgstr "ID de l'aplicació"
+
+msgid "ID of your Facebook application"
+msgstr "ID de la vostra aplicació de Facebook"
+
+msgid "Secret"
+msgstr "Clau secreta"
+
+msgid "Application secret"
+msgstr "Clau secreta de l'aplicació"
+
+msgid "Save"
+msgstr "Desa"
+
+msgid "Save Facebook settings"
+msgstr "Desa els paràmetres del Facebook"
+
+msgid "There was a problem with your session token. Try again, please."
+msgstr "S'ha produït un problema amb el testimoni de sessió. Proveu-ho de nou."
 
-#. TRANS: Tooltip for menu item "Facebook".
 #. TRANS: Page title for Facebook settings.
-#: FacebookBridgePlugin.php:300 actions/facebooksettings.php:105
+#. TRANS: Tooltip for menu item "Facebook".
 msgid "Facebook settings"
 msgstr "Paràmetres del Facebook"
 
-#: FacebookBridgePlugin.php:564
-msgid "A plugin for integrating StatusNet with Facebook."
-msgstr "Un connector per integrar l'StatusNet amb el Facebook"
+msgid "Connected Facebook user"
+msgstr "Usuari del Facebook connectat"
 
-#: lib/facebookclient.php:786
-msgid "Your Facebook connection has been removed"
-msgstr "S'ha eliminat la connexió amb el Facebook"
+msgid "Publish my notices to Facebook."
+msgstr "Publica els meus avisos al Facebook."
+
+msgid "Send \"@\" replies to Facebook."
+msgstr "Envia respostes amb «@» al Facebook."
+
+#. TRANS: Submit button to save synchronisation settings.
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "Desa"
+
+#. TRANS: Legend.
+msgid "Disconnect my account from Facebook"
+msgstr "Desconnecta el meu compte del Facebook"
 
-#: lib/facebookclient.php:845
 #, php-format
-msgid "Contact the %s administrator to retrieve your account"
-msgstr "Contacteu amb l'administrador de %s per recuperar el vostre compte"
+msgid ""
+"Disconnecting your Faceboook would make it impossible to log in! Please [set "
+"a password](%s) first."
+msgstr ""
+"En desconnectar el Facebook serà impossible que inicieu una sessió! [set a "
+"password](%s) primer."
+
+#, php-format
+msgid ""
+"Keep your %1$s account but disconnect from Facebook. You'll use your %1$s "
+"password to log in."
+msgstr ""
+"Mantingueu el vostre compte %1$s però desconnecteu-vos del Facebook. Fareu "
+"servir la vostra contrasenya de %1$s per iniciar una sessió."
+
+#. TRANS: Submit button.
+msgctxt "BUTTON"
+msgid "Disconnect"
+msgstr "Desconnecta"
+
+msgid "There was a problem saving your sync preferences."
+msgstr "S'ha produït un problema en desar les preferències de sincronització."
+
+#. TRANS: Confirmation that synchronisation settings have been saved into the system.
+msgid "Sync preferences saved."
+msgstr "S'han desat les preferències de sincronització."
+
+msgid "Couldn't delete link to Facebook."
+msgstr "No s'ha pogut eliminar l'enllaç al Facebook."
+
+msgid "You have disconnected from Facebook."
+msgstr "Us heu desconnectat del Facebook."
 
-#: actions/facebookfinishlogin.php:88
 msgid ""
 "You must be logged into Facebook to register a local account using Facebook."
 msgstr ""
 "Heu d'haver iniciat una sessió al Facebook per registrar un compte local "
 "fent servir el Facebook."
 
-#: actions/facebookfinishlogin.php:118
 msgid "There is already a local account linked with that Facebook account."
 msgstr "Ja hi ha un compte local enllaçat amb aquest compte del Facebook."
 
-#: actions/facebookfinishlogin.php:141 actions/facebooksettings.php:86
-msgid "There was a problem with your session token. Try again, please."
-msgstr "S'ha produït un problema amb el testimoni de sessió. Proveu-ho de nou."
-
-#: actions/facebookfinishlogin.php:150
 msgid "You can't register if you don't agree to the license."
 msgstr "No podeu registrar-vos-hi si no accepteu la llicència."
 
-#: actions/facebookfinishlogin.php:167
 msgid "An unknown error has occured."
 msgstr "S'ha produït un error desconegut."
 
-#: actions/facebookfinishlogin.php:185
 #, php-format
 msgid ""
 "This is the first time you've logged into %s so we must connect your "
@@ -93,17 +153,14 @@ msgstr ""
 "connectar-vos amb un compte ja existent."
 
 #. TRANS: Page title.
-#: actions/facebookfinishlogin.php:195
 msgid "Facebook Setup"
 msgstr "Configuració del Facebook"
 
 #. TRANS: Legend.
-#: actions/facebookfinishlogin.php:229
 msgid "Connection options"
 msgstr "Opcions de connexió"
 
 #. TRANS: %s is the name of the license used by the user for their status updates.
-#: actions/facebookfinishlogin.php:239
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -114,34 +171,27 @@ msgstr ""
 "telèfon."
 
 #. TRANS: Legend.
-#: actions/facebookfinishlogin.php:256
 msgid "Create new account"
 msgstr "Crea un compte nou"
 
-#: actions/facebookfinishlogin.php:258
 msgid "Create a new user with this nickname."
 msgstr "Crea un usuari nou amb aquest sobrenom"
 
 #. TRANS: Field label.
-#: actions/facebookfinishlogin.php:266
 msgid "New nickname"
 msgstr "Nou sobrenom"
 
-#: actions/facebookfinishlogin.php:268
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "1-64 lletres en minúscules o nombres, sense puntuacions o espais"
 
 #. TRANS: Submit button.
-#: actions/facebookfinishlogin.php:276
 msgctxt "BUTTON"
 msgid "Create"
 msgstr "Crea"
 
-#: actions/facebookfinishlogin.php:282
 msgid "Connect existing account"
 msgstr "Connecta el compte ja existent"
 
-#: actions/facebookfinishlogin.php:284
 msgid ""
 "If you already have an account, login with your username and password to "
 "connect it to your Facebook."
@@ -150,167 +200,58 @@ msgstr ""
 "contrasenya per connectar-lo al Facebook."
 
 #. TRANS: Field label.
-#: actions/facebookfinishlogin.php:288
 msgid "Existing nickname"
 msgstr "ja existeix el sobrenom"
 
-#: actions/facebookfinishlogin.php:291
 msgid "Password"
 msgstr "Contrasenya"
 
 #. TRANS: Submit button.
-#: actions/facebookfinishlogin.php:295
 msgctxt "BUTTON"
 msgid "Connect"
 msgstr "Connecta"
 
 #. TRANS: Client error trying to register with registrations not allowed.
 #. TRANS: Client error trying to register with registrations 'invite only'.
-#: actions/facebookfinishlogin.php:316 actions/facebookfinishlogin.php:326
 msgid "Registration not allowed."
 msgstr "El registre no està permès"
 
 #. TRANS: Client error trying to register with an invalid invitation code.
-#: actions/facebookfinishlogin.php:334
 msgid "Not a valid invitation code."
 msgstr "No és un codi d'invitació vàlid"
 
-#: actions/facebookfinishlogin.php:347
 msgid "Nickname not allowed."
 msgstr "No es permet el sobrenom."
 
-#: actions/facebookfinishlogin.php:352
 msgid "Nickname already in use. Try another one."
 msgstr "El sobrenom ja és en ús. Trieu-ne un altre."
 
-#: actions/facebookfinishlogin.php:380 actions/facebookfinishlogin.php:519
 msgid "Error connecting user to Facebook."
 msgstr "S'ha produït un error en connectar l'usuari al Facebook."
 
-#: actions/facebookfinishlogin.php:482
 msgid "Invalid username or password."
 msgstr "Nom d'usuari o contrasenya no vàlids"
 
-#: actions/facebooklogin.php:43
-msgid "Already logged in."
-msgstr "Ja heu iniciat una sessió."
-
-#. TRANS: Instructions.
-#: actions/facebooklogin.php:52
-msgid "Login with your Facebook Account"
-msgstr "Inicieu una sessió amb el compte del Facebook"
-
-#. TRANS: Page title.
-#: actions/facebooklogin.php:67
-msgid "Login with Facebook"
-msgstr "Inicia una sessió amb el Facebook"
-
-#: actions/facebookadminpanel.php:52
+#. TRANS: Menu item.
+#. TRANS: Menu item tab.
+msgctxt "MENU"
 msgid "Facebook"
 msgstr "Facebook"
 
-#: actions/facebookadminpanel.php:62
-msgid "Facebook integration settings"
-msgstr "Paràmetres d'integració del Facebook"
+#. TRANS: Tooltip for menu item "Facebook".
+msgid "Login or register using Facebook"
+msgstr "Inicieu-hi una sessió o registreu-vos-hi des del Facebook"
 
-#: actions/facebookadminpanel.php:123
-msgid "Invalid Facebook ID. Max length is 255 characters."
-msgstr "L'ID del Facebook no és vàlid. La longitud màxima són 255 caràcters."
+#. TRANS: Tooltip for menu item "Facebook".
+msgid "Facebook integration configuration"
+msgstr "Configuració de la integració del Facebook"
 
-#: actions/facebookadminpanel.php:129
-msgid "Invalid Facebook secret. Max length is 255 characters."
-msgstr ""
-"La clau secreta del Facebook no és vàlida. La longitud màxima són 255 "
-"caràcters."
+msgid "A plugin for integrating StatusNet with Facebook."
+msgstr "Un connector per integrar l'StatusNet amb el Facebook"
 
-#: actions/facebookadminpanel.php:178
-msgid "Facebook application settings"
-msgstr "Paràmetres d'aplicació del Facebook"
+msgid "Your Facebook connection has been removed"
+msgstr "S'ha eliminat la connexió amb el Facebook"
 
-#: actions/facebookadminpanel.php:184
-msgid "Application ID"
-msgstr "ID de l'aplicació"
-
-#: actions/facebookadminpanel.php:185
-msgid "ID of your Facebook application"
-msgstr "ID de la vostra aplicació de Facebook"
-
-#: actions/facebookadminpanel.php:193
-msgid "Secret"
-msgstr "Clau secreta"
-
-#: actions/facebookadminpanel.php:194
-msgid "Application secret"
-msgstr "Clau secreta de l'aplicació"
-
-#: actions/facebookadminpanel.php:210
-msgid "Save"
-msgstr "Desa"
-
-#: actions/facebookadminpanel.php:210
-msgid "Save Facebook settings"
-msgstr "Desa els paràmetres del Facebook"
-
-#: actions/facebooksettings.php:137
-msgid "Connected Facebook user"
-msgstr "Usuari del Facebook connectat"
-
-#: actions/facebooksettings.php:164
-msgid "Publish my notices to Facebook."
-msgstr "Publica els meus avisos al Facebook."
-
-#: actions/facebooksettings.php:174
-msgid "Send \"@\" replies to Facebook."
-msgstr "Envia respostes amb «@» al Facebook."
-
-#. TRANS: Submit button to save synchronisation settings.
-#: actions/facebooksettings.php:183
-msgctxt "BUTTON"
-msgid "Save"
-msgstr "Desa"
-
-#. TRANS: Legend.
-#: actions/facebooksettings.php:192
-msgid "Disconnect my account from Facebook"
-msgstr "Desconnecta el meu compte del Facebook"
-
-#: actions/facebooksettings.php:199
 #, php-format
-msgid ""
-"Disconnecting your Faceboook would make it impossible to log in! Please [set "
-"a password](%s) first."
-msgstr ""
-"En desconnectar el Facebook serà impossible que inicieu una sessió! [set a "
-"password](%s) primer."
-
-#: actions/facebooksettings.php:213
-#, php-format
-msgid ""
-"Keep your %1$s account but disconnect from Facebook. You'll use your %1$s "
-"password to log in."
-msgstr ""
-"Mantingueu el vostre compte %1$s però desconnecteu-vos del Facebook. Fareu "
-"servir la vostra contrasenya de %1$s per iniciar una sessió."
-
-#. TRANS: Submit button.
-#: actions/facebooksettings.php:220
-msgctxt "BUTTON"
-msgid "Disconnect"
-msgstr "Desconnecta"
-
-#: actions/facebooksettings.php:243
-msgid "There was a problem saving your sync preferences."
-msgstr "S'ha produït un problema en desar les preferències de sincronització."
-
-#. TRANS: Confirmation that synchronisation settings have been saved into the system.
-#: actions/facebooksettings.php:246
-msgid "Sync preferences saved."
-msgstr "S'han desat les preferències de sincronització."
-
-#: actions/facebooksettings.php:260
-msgid "Couldn't delete link to Facebook."
-msgstr "No s'ha pogut eliminar l'enllaç al Facebook."
-
-#: actions/facebooksettings.php:264
-msgid "You have disconnected from Facebook."
-msgstr "Us heu desconnectat del Facebook."
+msgid "Contact the %s administrator to retrieve your account"
+msgstr "Contacteu amb l'administrador de %s per recuperar el vostre compte"
diff --git a/plugins/FacebookBridge/locale/de/LC_MESSAGES/FacebookBridge.po b/plugins/FacebookBridge/locale/de/LC_MESSAGES/FacebookBridge.po
index c7aad4cac5..5d9069120b 100644
--- a/plugins/FacebookBridge/locale/de/LC_MESSAGES/FacebookBridge.po
+++ b/plugins/FacebookBridge/locale/de/LC_MESSAGES/FacebookBridge.po
@@ -9,82 +9,142 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - FacebookBridge\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 15:58+0000\n"
-"PO-Revision-Date: 2011-03-03 16:01:56+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:12+0000\n"
 "Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-25 23:44:49+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:42+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-facebookbridge\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. TRANS: Menu item.
-#. TRANS: Menu item tab.
-#: FacebookBridgePlugin.php:218 FacebookBridgePlugin.php:257
-#: FacebookBridgePlugin.php:298
-msgctxt "MENU"
+msgid "Already logged in."
+msgstr "Bereits angemeldet."
+
+#. TRANS: Instructions.
+msgid "Login with your Facebook Account"
+msgstr "Mit ihrem Facebook-Konto anmelden"
+
+#. TRANS: Page title.
+msgid "Login with Facebook"
+msgstr "Mit Facebook anmelden"
+
 msgid "Facebook"
 msgstr "Facebook"
 
-#. TRANS: Tooltip for menu item "Facebook".
-#: FacebookBridgePlugin.php:220
-msgid "Login or register using Facebook"
-msgstr "Über Facebook anmelden oder registrieren"
+msgid "Facebook integration settings"
+msgstr "Einstellungen der Facebook-Integration"
 
-#. TRANS: Tooltip for menu item "Facebook".
-#: FacebookBridgePlugin.php:259
-msgid "Facebook integration configuration"
-msgstr "Konfiguration der Facebook-Integration"
+msgid "Invalid Facebook ID. Max length is 255 characters."
+msgstr "Ungültige Facebook-ID. Die maximale Länge beträgt 255 Zeichen."
+
+msgid "Invalid Facebook secret. Max length is 255 characters."
+msgstr "Ungültiges Facebook-Geheimnis. Die maximale Länge beträgt 255 Zeichen."
+
+msgid "Facebook application settings"
+msgstr "Einstellungen der Facebook-Anwendung"
+
+msgid "Application ID"
+msgstr "Anwendungs-ID"
+
+msgid "ID of your Facebook application"
+msgstr "ID ihrer Facebook-Anwendung"
+
+msgid "Secret"
+msgstr "Geheimnis"
+
+msgid "Application secret"
+msgstr "Anwendungs-Geheimnis"
+
+msgid "Save"
+msgstr "Speichern"
+
+msgid "Save Facebook settings"
+msgstr "Facebook-Einstellungen speichern"
+
+msgid "There was a problem with your session token. Try again, please."
+msgstr "Es gab ein Problem mit deinem Sitzungstoken. Versuche es bitte erneut."
 
-#. TRANS: Tooltip for menu item "Facebook".
 #. TRANS: Page title for Facebook settings.
-#: FacebookBridgePlugin.php:300 actions/facebooksettings.php:105
+#. TRANS: Tooltip for menu item "Facebook".
 msgid "Facebook settings"
 msgstr "Facebook-Einstellungen"
 
-#: FacebookBridgePlugin.php:564
-msgid "A plugin for integrating StatusNet with Facebook."
-msgstr "Ein Plugin zur Integration von StatusNet mit Facebook."
+msgid "Connected Facebook user"
+msgstr "Verbundene Facebook-Benuter"
 
-#: lib/facebookclient.php:786
-msgid "Your Facebook connection has been removed"
-msgstr "Ihre Facebook-Verbindung wurde entfernt"
+msgid "Publish my notices to Facebook."
+msgstr "Meine Nachrichten auf Facebook veröffentlichen."
+
+msgid "Send \"@\" replies to Facebook."
+msgstr "\"@\"-Antworten zu Facebook senden."
+
+#. TRANS: Submit button to save synchronisation settings.
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "Speichern"
+
+#. TRANS: Legend.
+msgid "Disconnect my account from Facebook"
+msgstr "Mein Konto von Facebook trennen"
 
-#: lib/facebookclient.php:845
 #, php-format
-msgid "Contact the %s administrator to retrieve your account"
-msgstr "Kontaktiere den %s-Administrator um dein Konto zurück zu bekommen"
+msgid ""
+"Disconnecting your Faceboook would make it impossible to log in! Please [set "
+"a password](%s) first."
+msgstr ""
+"Die Trennung von Facebook würde es unmöglich machen, sich anzumelden! Bitte "
+"zuerst ein [Passwort setzen](%s)."
+
+#, php-format
+msgid ""
+"Keep your %1$s account but disconnect from Facebook. You'll use your %1$s "
+"password to log in."
+msgstr ""
+"Du behältst dein %1$s-Konto, trennst es aber von Facebook. Du wirst dein %1"
+"$s-Passwort benutzen, um dich anzumelden."
+
+#. TRANS: Submit button.
+msgctxt "BUTTON"
+msgid "Disconnect"
+msgstr "Trennen"
+
+msgid "There was a problem saving your sync preferences."
+msgstr ""
+"Es ist ein Problem beim Speichern ihrer Synchronisations-Einstellungen "
+"aufgetreten."
+
+#. TRANS: Confirmation that synchronisation settings have been saved into the system.
+msgid "Sync preferences saved."
+msgstr "Synchronisations-Einstellungen gespeichert."
+
+msgid "Couldn't delete link to Facebook."
+msgstr "Konnte die Verbindung zu Facebook nicht löschen."
+
+msgid "You have disconnected from Facebook."
+msgstr "Du bist nun nicht mehr mit Facebook verbunden."
 
-#: actions/facebookfinishlogin.php:88
 msgid ""
 "You must be logged into Facebook to register a local account using Facebook."
 msgstr ""
 "Du musst bei Facebook angemeldet sein, um ein lokales Konto mit Facebook zu "
 "registrieren."
 
-#: actions/facebookfinishlogin.php:118
 msgid "There is already a local account linked with that Facebook account."
 msgstr ""
 "Es gibt bereits ein lokales Konto, das mit diesem Facebook-Konto verbunden "
 "ist."
 
-#: actions/facebookfinishlogin.php:141 actions/facebooksettings.php:86
-msgid "There was a problem with your session token. Try again, please."
-msgstr "Es gab ein Problem mit deinem Sitzungstoken. Versuche es bitte erneut."
-
-#: actions/facebookfinishlogin.php:150
 msgid "You can't register if you don't agree to the license."
 msgstr ""
 "Du kannst dich nicht registrieren, falls du die Lizenz nicht akzeptierst."
 
-#: actions/facebookfinishlogin.php:167
 msgid "An unknown error has occured."
 msgstr "Ein unbekannter Fehler ist aufgetreten."
 
-#: actions/facebookfinishlogin.php:185
 #, php-format
 msgid ""
 "This is the first time you've logged into %s so we must connect your "
@@ -96,17 +156,14 @@ msgstr ""
 "lokales Konto erstellen, oder mit einem bestehenden verbinden."
 
 #. TRANS: Page title.
-#: actions/facebookfinishlogin.php:195
 msgid "Facebook Setup"
 msgstr "Facebook-Einrichtung"
 
 #. TRANS: Legend.
-#: actions/facebookfinishlogin.php:229
 msgid "Connection options"
 msgstr "Verbindungsoptionen"
 
 #. TRANS: %s is the name of the license used by the user for their status updates.
-#: actions/facebookfinishlogin.php:239
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -116,34 +173,27 @@ msgstr ""
 "verfügbar: Passwort, E-Mail-Adresse, IM-Adresse und Telefonnummer."
 
 #. TRANS: Legend.
-#: actions/facebookfinishlogin.php:256
 msgid "Create new account"
 msgstr "Neues Konto erstellen"
 
-#: actions/facebookfinishlogin.php:258
 msgid "Create a new user with this nickname."
 msgstr "Einen neuen Benutzer mit diesem Spitznamen erstellen."
 
 #. TRANS: Field label.
-#: actions/facebookfinishlogin.php:266
 msgid "New nickname"
 msgstr "Neuer Spitzname"
 
-#: actions/facebookfinishlogin.php:268
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "1–64 Kleinbuchstaben oder Zahlen, keine Satz- oder Leerzeichen"
 
 #. TRANS: Submit button.
-#: actions/facebookfinishlogin.php:276
 msgctxt "BUTTON"
 msgid "Create"
 msgstr "Erstellen"
 
-#: actions/facebookfinishlogin.php:282
 msgid "Connect existing account"
 msgstr "Verbinde vorhandenes Konto"
 
-#: actions/facebookfinishlogin.php:284
 msgid ""
 "If you already have an account, login with your username and password to "
 "connect it to your Facebook."
@@ -152,167 +202,58 @@ msgstr ""
 "Passwort an, um es mit deinem Facebook zu verbinden."
 
 #. TRANS: Field label.
-#: actions/facebookfinishlogin.php:288
 msgid "Existing nickname"
 msgstr "Vorhandener Spitzname"
 
-#: actions/facebookfinishlogin.php:291
 msgid "Password"
 msgstr "Passwort"
 
 #. TRANS: Submit button.
-#: actions/facebookfinishlogin.php:295
 msgctxt "BUTTON"
 msgid "Connect"
 msgstr "Verbinden"
 
 #. TRANS: Client error trying to register with registrations not allowed.
 #. TRANS: Client error trying to register with registrations 'invite only'.
-#: actions/facebookfinishlogin.php:316 actions/facebookfinishlogin.php:326
 msgid "Registration not allowed."
 msgstr "Registrierung nicht erlaubt."
 
 #. TRANS: Client error trying to register with an invalid invitation code.
-#: actions/facebookfinishlogin.php:334
 msgid "Not a valid invitation code."
 msgstr "Ungültiger Einladungs-Code."
 
-#: actions/facebookfinishlogin.php:347
 msgid "Nickname not allowed."
 msgstr "Spitzname nicht erlaubt."
 
-#: actions/facebookfinishlogin.php:352
 msgid "Nickname already in use. Try another one."
 msgstr "Spitzname bereits vergeben. Versuche einen anderen."
 
-#: actions/facebookfinishlogin.php:380 actions/facebookfinishlogin.php:519
 msgid "Error connecting user to Facebook."
 msgstr "Fehler bei der Verbindung des Benutzers zu Facebook."
 
-#: actions/facebookfinishlogin.php:482
 msgid "Invalid username or password."
 msgstr "Benutzername oder Kennwort ungültig."
 
-#: actions/facebooklogin.php:43
-msgid "Already logged in."
-msgstr "Bereits angemeldet."
-
-#. TRANS: Instructions.
-#: actions/facebooklogin.php:52
-msgid "Login with your Facebook Account"
-msgstr "Mit ihrem Facebook-Konto anmelden"
-
-#. TRANS: Page title.
-#: actions/facebooklogin.php:67
-msgid "Login with Facebook"
-msgstr "Mit Facebook anmelden"
-
-#: actions/facebookadminpanel.php:52
+#. TRANS: Menu item.
+#. TRANS: Menu item tab.
+msgctxt "MENU"
 msgid "Facebook"
 msgstr "Facebook"
 
-#: actions/facebookadminpanel.php:62
-msgid "Facebook integration settings"
-msgstr "Einstellungen der Facebook-Integration"
+#. TRANS: Tooltip for menu item "Facebook".
+msgid "Login or register using Facebook"
+msgstr "Über Facebook anmelden oder registrieren"
 
-#: actions/facebookadminpanel.php:123
-msgid "Invalid Facebook ID. Max length is 255 characters."
-msgstr "Ungültige Facebook-ID. Die maximale Länge beträgt 255 Zeichen."
+#. TRANS: Tooltip for menu item "Facebook".
+msgid "Facebook integration configuration"
+msgstr "Konfiguration der Facebook-Integration"
 
-#: actions/facebookadminpanel.php:129
-msgid "Invalid Facebook secret. Max length is 255 characters."
-msgstr "Ungültiges Facebook-Geheimnis. Die maximale Länge beträgt 255 Zeichen."
+msgid "A plugin for integrating StatusNet with Facebook."
+msgstr "Ein Plugin zur Integration von StatusNet mit Facebook."
 
-#: actions/facebookadminpanel.php:178
-msgid "Facebook application settings"
-msgstr "Einstellungen der Facebook-Anwendung"
+msgid "Your Facebook connection has been removed"
+msgstr "Ihre Facebook-Verbindung wurde entfernt"
 
-#: actions/facebookadminpanel.php:184
-msgid "Application ID"
-msgstr "Anwendungs-ID"
-
-#: actions/facebookadminpanel.php:185
-msgid "ID of your Facebook application"
-msgstr "ID ihrer Facebook-Anwendung"
-
-#: actions/facebookadminpanel.php:193
-msgid "Secret"
-msgstr "Geheimnis"
-
-#: actions/facebookadminpanel.php:194
-msgid "Application secret"
-msgstr "Anwendungs-Geheimnis"
-
-#: actions/facebookadminpanel.php:210
-msgid "Save"
-msgstr "Speichern"
-
-#: actions/facebookadminpanel.php:210
-msgid "Save Facebook settings"
-msgstr "Facebook-Einstellungen speichern"
-
-#: actions/facebooksettings.php:137
-msgid "Connected Facebook user"
-msgstr "Verbundene Facebook-Benuter"
-
-#: actions/facebooksettings.php:164
-msgid "Publish my notices to Facebook."
-msgstr "Meine Nachrichten auf Facebook veröffentlichen."
-
-#: actions/facebooksettings.php:174
-msgid "Send \"@\" replies to Facebook."
-msgstr "\"@\"-Antworten zu Facebook senden."
-
-#. TRANS: Submit button to save synchronisation settings.
-#: actions/facebooksettings.php:183
-msgctxt "BUTTON"
-msgid "Save"
-msgstr "Speichern"
-
-#. TRANS: Legend.
-#: actions/facebooksettings.php:192
-msgid "Disconnect my account from Facebook"
-msgstr "Mein Konto von Facebook trennen"
-
-#: actions/facebooksettings.php:199
 #, php-format
-msgid ""
-"Disconnecting your Faceboook would make it impossible to log in! Please [set "
-"a password](%s) first."
-msgstr ""
-"Die Trennung von Facebook würde es unmöglich machen, sich anzumelden! Bitte "
-"zuerst ein [Passwort setzen](%s)."
-
-#: actions/facebooksettings.php:213
-#, php-format
-msgid ""
-"Keep your %1$s account but disconnect from Facebook. You'll use your %1$s "
-"password to log in."
-msgstr ""
-"Du behältst dein %1$s-Konto, trennst es aber von Facebook. Du wirst dein %1"
-"$s-Passwort benutzen, um dich anzumelden."
-
-#. TRANS: Submit button.
-#: actions/facebooksettings.php:220
-msgctxt "BUTTON"
-msgid "Disconnect"
-msgstr "Trennen"
-
-#: actions/facebooksettings.php:243
-msgid "There was a problem saving your sync preferences."
-msgstr ""
-"Es ist ein Problem beim Speichern ihrer Synchronisations-Einstellungen "
-"aufgetreten."
-
-#. TRANS: Confirmation that synchronisation settings have been saved into the system.
-#: actions/facebooksettings.php:246
-msgid "Sync preferences saved."
-msgstr "Synchronisations-Einstellungen gespeichert."
-
-#: actions/facebooksettings.php:260
-msgid "Couldn't delete link to Facebook."
-msgstr "Konnte die Verbindung zu Facebook nicht löschen."
-
-#: actions/facebooksettings.php:264
-msgid "You have disconnected from Facebook."
-msgstr "Du bist nun nicht mehr mit Facebook verbunden."
+msgid "Contact the %s administrator to retrieve your account"
+msgstr "Kontaktiere den %s-Administrator um dein Konto zurück zu bekommen"
diff --git a/plugins/FacebookBridge/locale/ia/LC_MESSAGES/FacebookBridge.po b/plugins/FacebookBridge/locale/ia/LC_MESSAGES/FacebookBridge.po
index f48c2e8667..799cccdbdf 100644
--- a/plugins/FacebookBridge/locale/ia/LC_MESSAGES/FacebookBridge.po
+++ b/plugins/FacebookBridge/locale/ia/LC_MESSAGES/FacebookBridge.po
@@ -9,79 +9,139 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - FacebookBridge\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 15:58+0000\n"
-"PO-Revision-Date: 2011-03-03 16:01:56+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:12+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-25 23:44:49+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:42+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-facebookbridge\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. TRANS: Menu item.
-#. TRANS: Menu item tab.
-#: FacebookBridgePlugin.php:218 FacebookBridgePlugin.php:257
-#: FacebookBridgePlugin.php:298
-msgctxt "MENU"
+msgid "Already logged in."
+msgstr "Tu es jam authenticate."
+
+#. TRANS: Instructions.
+msgid "Login with your Facebook Account"
+msgstr "Aperir session con tu conto de Facebook"
+
+#. TRANS: Page title.
+msgid "Login with Facebook"
+msgstr "Aperir session con Facebook"
+
 msgid "Facebook"
 msgstr "Facebook"
 
-#. TRANS: Tooltip for menu item "Facebook".
-#: FacebookBridgePlugin.php:220
-msgid "Login or register using Facebook"
-msgstr "Aperir session o crear conto usante Facebook"
+msgid "Facebook integration settings"
+msgstr "Configurationes de integration de Facebook"
 
-#. TRANS: Tooltip for menu item "Facebook".
-#: FacebookBridgePlugin.php:259
-msgid "Facebook integration configuration"
-msgstr "Configuration del integration de Facebook"
+msgid "Invalid Facebook ID. Max length is 255 characters."
+msgstr "ID de Facebook invalide. Longitude maximal es 255 characteres."
+
+msgid "Invalid Facebook secret. Max length is 255 characters."
+msgstr "Secreto de Facebook invalide. Longitude maximal es 255 characteres."
+
+msgid "Facebook application settings"
+msgstr "Configurationes del application de Facebook"
+
+msgid "Application ID"
+msgstr "ID de application"
+
+msgid "ID of your Facebook application"
+msgstr "Le ID de tu application Facebook"
+
+msgid "Secret"
+msgstr "Secreto"
+
+msgid "Application secret"
+msgstr "Secreto de application"
+
+msgid "Save"
+msgstr "Salveguardar"
+
+msgid "Save Facebook settings"
+msgstr "Salveguardar configuration Facebook"
+
+msgid "There was a problem with your session token. Try again, please."
+msgstr "Occurreva un problema con le indicio de tu session. Per favor reproba."
 
-#. TRANS: Tooltip for menu item "Facebook".
 #. TRANS: Page title for Facebook settings.
-#: FacebookBridgePlugin.php:300 actions/facebooksettings.php:105
+#. TRANS: Tooltip for menu item "Facebook".
 msgid "Facebook settings"
 msgstr "Configuration de Facebook"
 
-#: FacebookBridgePlugin.php:564
-msgid "A plugin for integrating StatusNet with Facebook."
-msgstr "Un plug-in pro integrar StatusNet con Facebook."
+msgid "Connected Facebook user"
+msgstr "Usator de Facebook connectite"
 
-#: lib/facebookclient.php:786
-msgid "Your Facebook connection has been removed"
-msgstr "Tu connexion a Facebook ha essite removite"
+msgid "Publish my notices to Facebook."
+msgstr "Publicar mi notas in Facebook."
+
+msgid "Send \"@\" replies to Facebook."
+msgstr "Inviar responsas \"@\" a Facebook."
+
+#. TRANS: Submit button to save synchronisation settings.
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "Salveguardar"
+
+#. TRANS: Legend.
+msgid "Disconnect my account from Facebook"
+msgstr "Disconnecter mi conto ab Facebook"
 
-#: lib/facebookclient.php:845
 #, php-format
-msgid "Contact the %s administrator to retrieve your account"
-msgstr "Contacta le administrator de %s pro recuperar tu conto"
+msgid ""
+"Disconnecting your Faceboook would make it impossible to log in! Please [set "
+"a password](%s) first."
+msgstr ""
+"Per disconnecter tu Facebook, tu non plus poterea aperir session! Per favor "
+"[defini un contrasigno](%s) primo."
+
+#, php-format
+msgid ""
+"Keep your %1$s account but disconnect from Facebook. You'll use your %1$s "
+"password to log in."
+msgstr ""
+"Retene tu conto de %1$s ma disconnecte ab Facebook. Tu pote usar tu "
+"contrasigno de %1$s pro aperir session."
+
+#. TRANS: Submit button.
+msgctxt "BUTTON"
+msgid "Disconnect"
+msgstr "Disconnecter"
+
+msgid "There was a problem saving your sync preferences."
+msgstr ""
+"Occurreva un problema durante le salveguarda de tu preferentias de "
+"synchronisation."
+
+#. TRANS: Confirmation that synchronisation settings have been saved into the system.
+msgid "Sync preferences saved."
+msgstr "Preferentias de synchronisation salveguardate."
+
+msgid "Couldn't delete link to Facebook."
+msgstr "Non poteva deler le ligamine a Facebook."
+
+msgid "You have disconnected from Facebook."
+msgstr "Tu te ha disconnectite de Facebook."
 
-#: actions/facebookfinishlogin.php:88
 msgid ""
 "You must be logged into Facebook to register a local account using Facebook."
 msgstr ""
 "Tu debe aperir session in Facebook pro registrar un conto local usante "
 "Facebook."
 
-#: actions/facebookfinishlogin.php:118
 msgid "There is already a local account linked with that Facebook account."
 msgstr "Il ha jam un conto local ligate a iste conto de Facebook."
 
-#: actions/facebookfinishlogin.php:141 actions/facebooksettings.php:86
-msgid "There was a problem with your session token. Try again, please."
-msgstr "Occurreva un problema con le indicio de tu session. Per favor reproba."
-
-#: actions/facebookfinishlogin.php:150
 msgid "You can't register if you don't agree to the license."
 msgstr "Tu non pote crear un conto si tu non accepta le licentia."
 
-#: actions/facebookfinishlogin.php:167
 msgid "An unknown error has occured."
 msgstr "Un error incognite ha occurrite."
 
-#: actions/facebookfinishlogin.php:185
 #, php-format
 msgid ""
 "This is the first time you've logged into %s so we must connect your "
@@ -93,17 +153,14 @@ msgstr ""
 "connecter con un conto local existente."
 
 #. TRANS: Page title.
-#: actions/facebookfinishlogin.php:195
 msgid "Facebook Setup"
 msgstr "Configuration de Facebook"
 
 #. TRANS: Legend.
-#: actions/facebookfinishlogin.php:229
 msgid "Connection options"
 msgstr "Optiones de connexion"
 
 #. TRANS: %s is the name of the license used by the user for their status updates.
-#: actions/facebookfinishlogin.php:239
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -114,34 +171,27 @@ msgstr ""
 "telephono."
 
 #. TRANS: Legend.
-#: actions/facebookfinishlogin.php:256
 msgid "Create new account"
 msgstr "Crear nove conto"
 
-#: actions/facebookfinishlogin.php:258
 msgid "Create a new user with this nickname."
 msgstr "Crear un nove usator con iste pseudonymo."
 
 #. TRANS: Field label.
-#: actions/facebookfinishlogin.php:266
 msgid "New nickname"
 msgstr "Nove pseudonymo"
 
-#: actions/facebookfinishlogin.php:268
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "1-64 minusculas o numeros, sin punctuation o spatios"
 
 #. TRANS: Submit button.
-#: actions/facebookfinishlogin.php:276
 msgctxt "BUTTON"
 msgid "Create"
 msgstr "Crear"
 
-#: actions/facebookfinishlogin.php:282
 msgid "Connect existing account"
 msgstr "Connecter conto existente"
 
-#: actions/facebookfinishlogin.php:284
 msgid ""
 "If you already have an account, login with your username and password to "
 "connect it to your Facebook."
@@ -150,167 +200,58 @@ msgstr ""
 "pro connecter lo a tu Facebook."
 
 #. TRANS: Field label.
-#: actions/facebookfinishlogin.php:288
 msgid "Existing nickname"
 msgstr "Pseudonymo existente"
 
-#: actions/facebookfinishlogin.php:291
 msgid "Password"
 msgstr "Contrasigno"
 
 #. TRANS: Submit button.
-#: actions/facebookfinishlogin.php:295
 msgctxt "BUTTON"
 msgid "Connect"
 msgstr "Connecter"
 
 #. TRANS: Client error trying to register with registrations not allowed.
 #. TRANS: Client error trying to register with registrations 'invite only'.
-#: actions/facebookfinishlogin.php:316 actions/facebookfinishlogin.php:326
 msgid "Registration not allowed."
 msgstr "Creation de conto non permittite."
 
 #. TRANS: Client error trying to register with an invalid invitation code.
-#: actions/facebookfinishlogin.php:334
 msgid "Not a valid invitation code."
 msgstr "Le codice de invitation es invalide."
 
-#: actions/facebookfinishlogin.php:347
 msgid "Nickname not allowed."
 msgstr "Pseudonymo non permittite."
 
-#: actions/facebookfinishlogin.php:352
 msgid "Nickname already in use. Try another one."
 msgstr "Pseudonymo ja in uso. Proba un altere."
 
-#: actions/facebookfinishlogin.php:380 actions/facebookfinishlogin.php:519
 msgid "Error connecting user to Facebook."
 msgstr "Error durante le connexion del usator a Facebook."
 
-#: actions/facebookfinishlogin.php:482
 msgid "Invalid username or password."
 msgstr "Nomine de usator o contrasigno invalide."
 
-#: actions/facebooklogin.php:43
-msgid "Already logged in."
-msgstr "Tu es jam authenticate."
-
-#. TRANS: Instructions.
-#: actions/facebooklogin.php:52
-msgid "Login with your Facebook Account"
-msgstr "Aperir session con tu conto de Facebook"
-
-#. TRANS: Page title.
-#: actions/facebooklogin.php:67
-msgid "Login with Facebook"
-msgstr "Aperir session con Facebook"
-
-#: actions/facebookadminpanel.php:52
+#. TRANS: Menu item.
+#. TRANS: Menu item tab.
+msgctxt "MENU"
 msgid "Facebook"
 msgstr "Facebook"
 
-#: actions/facebookadminpanel.php:62
-msgid "Facebook integration settings"
-msgstr "Configurationes de integration de Facebook"
+#. TRANS: Tooltip for menu item "Facebook".
+msgid "Login or register using Facebook"
+msgstr "Aperir session o crear conto usante Facebook"
 
-#: actions/facebookadminpanel.php:123
-msgid "Invalid Facebook ID. Max length is 255 characters."
-msgstr "ID de Facebook invalide. Longitude maximal es 255 characteres."
+#. TRANS: Tooltip for menu item "Facebook".
+msgid "Facebook integration configuration"
+msgstr "Configuration del integration de Facebook"
 
-#: actions/facebookadminpanel.php:129
-msgid "Invalid Facebook secret. Max length is 255 characters."
-msgstr "Secreto de Facebook invalide. Longitude maximal es 255 characteres."
+msgid "A plugin for integrating StatusNet with Facebook."
+msgstr "Un plug-in pro integrar StatusNet con Facebook."
 
-#: actions/facebookadminpanel.php:178
-msgid "Facebook application settings"
-msgstr "Configurationes del application de Facebook"
+msgid "Your Facebook connection has been removed"
+msgstr "Tu connexion a Facebook ha essite removite"
 
-#: actions/facebookadminpanel.php:184
-msgid "Application ID"
-msgstr "ID de application"
-
-#: actions/facebookadminpanel.php:185
-msgid "ID of your Facebook application"
-msgstr "Le ID de tu application Facebook"
-
-#: actions/facebookadminpanel.php:193
-msgid "Secret"
-msgstr "Secreto"
-
-#: actions/facebookadminpanel.php:194
-msgid "Application secret"
-msgstr "Secreto de application"
-
-#: actions/facebookadminpanel.php:210
-msgid "Save"
-msgstr "Salveguardar"
-
-#: actions/facebookadminpanel.php:210
-msgid "Save Facebook settings"
-msgstr "Salveguardar configuration Facebook"
-
-#: actions/facebooksettings.php:137
-msgid "Connected Facebook user"
-msgstr "Usator de Facebook connectite"
-
-#: actions/facebooksettings.php:164
-msgid "Publish my notices to Facebook."
-msgstr "Publicar mi notas in Facebook."
-
-#: actions/facebooksettings.php:174
-msgid "Send \"@\" replies to Facebook."
-msgstr "Inviar responsas \"@\" a Facebook."
-
-#. TRANS: Submit button to save synchronisation settings.
-#: actions/facebooksettings.php:183
-msgctxt "BUTTON"
-msgid "Save"
-msgstr "Salveguardar"
-
-#. TRANS: Legend.
-#: actions/facebooksettings.php:192
-msgid "Disconnect my account from Facebook"
-msgstr "Disconnecter mi conto ab Facebook"
-
-#: actions/facebooksettings.php:199
 #, php-format
-msgid ""
-"Disconnecting your Faceboook would make it impossible to log in! Please [set "
-"a password](%s) first."
-msgstr ""
-"Per disconnecter tu Facebook, tu non plus poterea aperir session! Per favor "
-"[defini un contrasigno](%s) primo."
-
-#: actions/facebooksettings.php:213
-#, php-format
-msgid ""
-"Keep your %1$s account but disconnect from Facebook. You'll use your %1$s "
-"password to log in."
-msgstr ""
-"Retene tu conto de %1$s ma disconnecte ab Facebook. Tu pote usar tu "
-"contrasigno de %1$s pro aperir session."
-
-#. TRANS: Submit button.
-#: actions/facebooksettings.php:220
-msgctxt "BUTTON"
-msgid "Disconnect"
-msgstr "Disconnecter"
-
-#: actions/facebooksettings.php:243
-msgid "There was a problem saving your sync preferences."
-msgstr ""
-"Occurreva un problema durante le salveguarda de tu preferentias de "
-"synchronisation."
-
-#. TRANS: Confirmation that synchronisation settings have been saved into the system.
-#: actions/facebooksettings.php:246
-msgid "Sync preferences saved."
-msgstr "Preferentias de synchronisation salveguardate."
-
-#: actions/facebooksettings.php:260
-msgid "Couldn't delete link to Facebook."
-msgstr "Non poteva deler le ligamine a Facebook."
-
-#: actions/facebooksettings.php:264
-msgid "You have disconnected from Facebook."
-msgstr "Tu te ha disconnectite de Facebook."
+msgid "Contact the %s administrator to retrieve your account"
+msgstr "Contacta le administrator de %s pro recuperar tu conto"
diff --git a/plugins/FacebookBridge/locale/mk/LC_MESSAGES/FacebookBridge.po b/plugins/FacebookBridge/locale/mk/LC_MESSAGES/FacebookBridge.po
index 5ac9ae5a2e..54d3295781 100644
--- a/plugins/FacebookBridge/locale/mk/LC_MESSAGES/FacebookBridge.po
+++ b/plugins/FacebookBridge/locale/mk/LC_MESSAGES/FacebookBridge.po
@@ -9,79 +9,137 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - FacebookBridge\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 15:58+0000\n"
-"PO-Revision-Date: 2011-03-03 16:01:56+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:12+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-25 23:44:49+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:42+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-facebookbridge\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
 
-#. TRANS: Menu item.
-#. TRANS: Menu item tab.
-#: FacebookBridgePlugin.php:218 FacebookBridgePlugin.php:257
-#: FacebookBridgePlugin.php:298
-msgctxt "MENU"
+msgid "Already logged in."
+msgstr "Веќе сте најавени."
+
+#. TRANS: Instructions.
+msgid "Login with your Facebook Account"
+msgstr "Најава со Вашата сметка на Facebook"
+
+#. TRANS: Page title.
+msgid "Login with Facebook"
+msgstr "Најава со Facebook"
+
 msgid "Facebook"
 msgstr "Facebook"
 
-#. TRANS: Tooltip for menu item "Facebook".
-#: FacebookBridgePlugin.php:220
-msgid "Login or register using Facebook"
-msgstr "Најава или регистрација со Facebook"
-
-#. TRANS: Tooltip for menu item "Facebook".
-#: FacebookBridgePlugin.php:259
-msgid "Facebook integration configuration"
+msgid "Facebook integration settings"
 msgstr "Поставки за обединување со Facebook"
 
-#. TRANS: Tooltip for menu item "Facebook".
+msgid "Invalid Facebook ID. Max length is 255 characters."
+msgstr "Неважечка назнака (ID) за Facebook. Дозволени се највеќе 255 знаци."
+
+msgid "Invalid Facebook secret. Max length is 255 characters."
+msgstr "Неважечка тајна за Facebook. Дозволени се највеќе 255 знаци."
+
+msgid "Facebook application settings"
+msgstr "Поставки за програм за Facebook"
+
+msgid "Application ID"
+msgstr "Назнака (ID) на програмот"
+
+msgid "ID of your Facebook application"
+msgstr "Назнака (ID) на Вашиот програм за Facebook"
+
+msgid "Secret"
+msgstr "Тајна"
+
+msgid "Application secret"
+msgstr "Тајна за програмот"
+
+msgid "Save"
+msgstr "Зачувај"
+
+msgid "Save Facebook settings"
+msgstr "Зачувај поставки за Facebook"
+
+msgid "There was a problem with your session token. Try again, please."
+msgstr "Се поајви проблем со Вашиот сесиски жетон. Обидете се повторно."
+
 #. TRANS: Page title for Facebook settings.
-#: FacebookBridgePlugin.php:300 actions/facebooksettings.php:105
+#. TRANS: Tooltip for menu item "Facebook".
 msgid "Facebook settings"
 msgstr "Поставки за Facebook"
 
-#: FacebookBridgePlugin.php:564
-msgid "A plugin for integrating StatusNet with Facebook."
-msgstr "Приклучок за обединување на StatusNet со Facebook."
+msgid "Connected Facebook user"
+msgstr "Поврзан корисник на Facebook"
 
-#: lib/facebookclient.php:786
-msgid "Your Facebook connection has been removed"
-msgstr "Вашата врска со Facebook е отстранета"
+msgid "Publish my notices to Facebook."
+msgstr "Објавувај ми ги забелешките на Facebook."
+
+msgid "Send \"@\" replies to Facebook."
+msgstr "Испраќај „@“-одговори на Facebook."
+
+#. TRANS: Submit button to save synchronisation settings.
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "Зачувај"
+
+#. TRANS: Legend.
+msgid "Disconnect my account from Facebook"
+msgstr "Исклучи ми ја сметката од Facebook"
 
-#: lib/facebookclient.php:845
 #, php-format
-msgid "Contact the %s administrator to retrieve your account"
-msgstr "Контактирајте го администраторот на %s за да си ја повртатите сметката"
+msgid ""
+"Disconnecting your Faceboook would make it impossible to log in! Please [set "
+"a password](%s) first."
+msgstr ""
+"Ако ја исклучите сметката од Faceboook, тогаш нема да можете да се "
+"најавувате! Најпрвин [ставете лозинка](%s)."
+
+#, php-format
+msgid ""
+"Keep your %1$s account but disconnect from Facebook. You'll use your %1$s "
+"password to log in."
+msgstr ""
+"Задржете ја сметката на %1$s, но исклучете ја од Facebook. За најава ќе ја "
+"користите лозинката на 1%$s."
+
+#. TRANS: Submit button.
+msgctxt "BUTTON"
+msgid "Disconnect"
+msgstr "Исклучи"
+
+msgid "There was a problem saving your sync preferences."
+msgstr "Се појави проблем при зачувувањето на нагодувањата за усогласување."
+
+#. TRANS: Confirmation that synchronisation settings have been saved into the system.
+msgid "Sync preferences saved."
+msgstr "Нагодувањата за усогласување се зачувани."
+
+msgid "Couldn't delete link to Facebook."
+msgstr "Не можев да ја избришам врската со Facebook."
+
+msgid "You have disconnected from Facebook."
+msgstr "Сега сте исклучени од Facebook."
 
-#: actions/facebookfinishlogin.php:88
 msgid ""
 "You must be logged into Facebook to register a local account using Facebook."
 msgstr ""
 "За да регистрирате локална сметка користејќи Facebook, ќе мора да сте "
 "најавени на самиот Facebook."
 
-#: actions/facebookfinishlogin.php:118
 msgid "There is already a local account linked with that Facebook account."
 msgstr "Веќе постои локална сметка поврзана со тааа сметка на Facebook."
 
-#: actions/facebookfinishlogin.php:141 actions/facebooksettings.php:86
-msgid "There was a problem with your session token. Try again, please."
-msgstr "Се поајви проблем со Вашиот сесиски жетон. Обидете се повторно."
-
-#: actions/facebookfinishlogin.php:150
 msgid "You can't register if you don't agree to the license."
 msgstr "Не може да се регистрирате ако не ја прифаќате лиценцата."
 
-#: actions/facebookfinishlogin.php:167
 msgid "An unknown error has occured."
 msgstr "Се појави непозната грешка."
 
-#: actions/facebookfinishlogin.php:185
 #, php-format
 msgid ""
 "This is the first time you've logged into %s so we must connect your "
@@ -93,17 +151,14 @@ msgstr ""
 "локална сметка, или пак да се поврзете со постоечка сметка."
 
 #. TRANS: Page title.
-#: actions/facebookfinishlogin.php:195
 msgid "Facebook Setup"
 msgstr "Поставки за Facebook"
 
 #. TRANS: Legend.
-#: actions/facebookfinishlogin.php:229
 msgid "Connection options"
 msgstr "Нагодувања за врска"
 
 #. TRANS: %s is the name of the license used by the user for their status updates.
-#: actions/facebookfinishlogin.php:239
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -113,34 +168,27 @@ msgstr ""
 "податоци: лозинка, е-пошта, IM-адреса и телефонски број."
 
 #. TRANS: Legend.
-#: actions/facebookfinishlogin.php:256
 msgid "Create new account"
 msgstr "Создај нова сметка"
 
-#: actions/facebookfinishlogin.php:258
 msgid "Create a new user with this nickname."
 msgstr "Создај нов корисник со овој прекар."
 
 #. TRANS: Field label.
-#: actions/facebookfinishlogin.php:266
 msgid "New nickname"
 msgstr "Нов прекар"
 
-#: actions/facebookfinishlogin.php:268
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "1-64 мали букви и бројки, без интерпункциски знаци и празни места"
 
 #. TRANS: Submit button.
-#: actions/facebookfinishlogin.php:276
 msgctxt "BUTTON"
 msgid "Create"
 msgstr "Создај"
 
-#: actions/facebookfinishlogin.php:282
 msgid "Connect existing account"
 msgstr "Поврзи постоечка сметка"
 
-#: actions/facebookfinishlogin.php:284
 msgid ""
 "If you already have an account, login with your username and password to "
 "connect it to your Facebook."
@@ -149,165 +197,58 @@ msgstr ""
 "поврзете со профилот на Facebook."
 
 #. TRANS: Field label.
-#: actions/facebookfinishlogin.php:288
 msgid "Existing nickname"
 msgstr "Постоечки прекар"
 
-#: actions/facebookfinishlogin.php:291
 msgid "Password"
 msgstr "Лозинка"
 
 #. TRANS: Submit button.
-#: actions/facebookfinishlogin.php:295
 msgctxt "BUTTON"
 msgid "Connect"
 msgstr "Поврзи"
 
 #. TRANS: Client error trying to register with registrations not allowed.
 #. TRANS: Client error trying to register with registrations 'invite only'.
-#: actions/facebookfinishlogin.php:316 actions/facebookfinishlogin.php:326
 msgid "Registration not allowed."
 msgstr "Регистрирањето не е дозволено."
 
 #. TRANS: Client error trying to register with an invalid invitation code.
-#: actions/facebookfinishlogin.php:334
 msgid "Not a valid invitation code."
 msgstr "Ова не е важечки код за покана."
 
-#: actions/facebookfinishlogin.php:347
 msgid "Nickname not allowed."
 msgstr "Прекарот не е дозволен."
 
-#: actions/facebookfinishlogin.php:352
 msgid "Nickname already in use. Try another one."
 msgstr "Тој прекар е во употреба. Одберете друг."
 
-#: actions/facebookfinishlogin.php:380 actions/facebookfinishlogin.php:519
 msgid "Error connecting user to Facebook."
 msgstr "Грешка при поврзувањето на корисникот со Facebook."
 
-#: actions/facebookfinishlogin.php:482
 msgid "Invalid username or password."
 msgstr "Погрешно име или лозинка."
 
-#: actions/facebooklogin.php:43
-msgid "Already logged in."
-msgstr "Веќе сте најавени."
-
-#. TRANS: Instructions.
-#: actions/facebooklogin.php:52
-msgid "Login with your Facebook Account"
-msgstr "Најава со Вашата сметка на Facebook"
-
-#. TRANS: Page title.
-#: actions/facebooklogin.php:67
-msgid "Login with Facebook"
-msgstr "Најава со Facebook"
-
-#: actions/facebookadminpanel.php:52
+#. TRANS: Menu item.
+#. TRANS: Menu item tab.
+msgctxt "MENU"
 msgid "Facebook"
 msgstr "Facebook"
 
-#: actions/facebookadminpanel.php:62
-msgid "Facebook integration settings"
+#. TRANS: Tooltip for menu item "Facebook".
+msgid "Login or register using Facebook"
+msgstr "Најава или регистрација со Facebook"
+
+#. TRANS: Tooltip for menu item "Facebook".
+msgid "Facebook integration configuration"
 msgstr "Поставки за обединување со Facebook"
 
-#: actions/facebookadminpanel.php:123
-msgid "Invalid Facebook ID. Max length is 255 characters."
-msgstr "Неважечка назнака (ID) за Facebook. Дозволени се највеќе 255 знаци."
+msgid "A plugin for integrating StatusNet with Facebook."
+msgstr "Приклучок за обединување на StatusNet со Facebook."
 
-#: actions/facebookadminpanel.php:129
-msgid "Invalid Facebook secret. Max length is 255 characters."
-msgstr "Неважечка тајна за Facebook. Дозволени се највеќе 255 знаци."
+msgid "Your Facebook connection has been removed"
+msgstr "Вашата врска со Facebook е отстранета"
 
-#: actions/facebookadminpanel.php:178
-msgid "Facebook application settings"
-msgstr "Поставки за програм за Facebook"
-
-#: actions/facebookadminpanel.php:184
-msgid "Application ID"
-msgstr "Назнака (ID) на програмот"
-
-#: actions/facebookadminpanel.php:185
-msgid "ID of your Facebook application"
-msgstr "Назнака (ID) на Вашиот програм за Facebook"
-
-#: actions/facebookadminpanel.php:193
-msgid "Secret"
-msgstr "Тајна"
-
-#: actions/facebookadminpanel.php:194
-msgid "Application secret"
-msgstr "Тајна за програмот"
-
-#: actions/facebookadminpanel.php:210
-msgid "Save"
-msgstr "Зачувај"
-
-#: actions/facebookadminpanel.php:210
-msgid "Save Facebook settings"
-msgstr "Зачувај поставки за Facebook"
-
-#: actions/facebooksettings.php:137
-msgid "Connected Facebook user"
-msgstr "Поврзан корисник на Facebook"
-
-#: actions/facebooksettings.php:164
-msgid "Publish my notices to Facebook."
-msgstr "Објавувај ми ги забелешките на Facebook."
-
-#: actions/facebooksettings.php:174
-msgid "Send \"@\" replies to Facebook."
-msgstr "Испраќај „@“-одговори на Facebook."
-
-#. TRANS: Submit button to save synchronisation settings.
-#: actions/facebooksettings.php:183
-msgctxt "BUTTON"
-msgid "Save"
-msgstr "Зачувај"
-
-#. TRANS: Legend.
-#: actions/facebooksettings.php:192
-msgid "Disconnect my account from Facebook"
-msgstr "Исклучи ми ја сметката од Facebook"
-
-#: actions/facebooksettings.php:199
 #, php-format
-msgid ""
-"Disconnecting your Faceboook would make it impossible to log in! Please [set "
-"a password](%s) first."
-msgstr ""
-"Ако ја исклучите сметката од Faceboook, тогаш нема да можете да се "
-"најавувате! Најпрвин [ставете лозинка](%s)."
-
-#: actions/facebooksettings.php:213
-#, php-format
-msgid ""
-"Keep your %1$s account but disconnect from Facebook. You'll use your %1$s "
-"password to log in."
-msgstr ""
-"Задржете ја сметката на %1$s, но исклучете ја од Facebook. За најава ќе ја "
-"користите лозинката на 1%$s."
-
-#. TRANS: Submit button.
-#: actions/facebooksettings.php:220
-msgctxt "BUTTON"
-msgid "Disconnect"
-msgstr "Исклучи"
-
-#: actions/facebooksettings.php:243
-msgid "There was a problem saving your sync preferences."
-msgstr "Се појави проблем при зачувувањето на нагодувањата за усогласување."
-
-#. TRANS: Confirmation that synchronisation settings have been saved into the system.
-#: actions/facebooksettings.php:246
-msgid "Sync preferences saved."
-msgstr "Нагодувањата за усогласување се зачувани."
-
-#: actions/facebooksettings.php:260
-msgid "Couldn't delete link to Facebook."
-msgstr "Не можев да ја избришам врската со Facebook."
-
-#: actions/facebooksettings.php:264
-msgid "You have disconnected from Facebook."
-msgstr "Сега сте исклучени од Facebook."
+msgid "Contact the %s administrator to retrieve your account"
+msgstr "Контактирајте го администраторот на %s за да си ја повртатите сметката"
diff --git a/plugins/FacebookBridge/locale/nl/LC_MESSAGES/FacebookBridge.po b/plugins/FacebookBridge/locale/nl/LC_MESSAGES/FacebookBridge.po
index 946a153984..a128489303 100644
--- a/plugins/FacebookBridge/locale/nl/LC_MESSAGES/FacebookBridge.po
+++ b/plugins/FacebookBridge/locale/nl/LC_MESSAGES/FacebookBridge.po
@@ -9,83 +9,141 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - FacebookBridge\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 15:58+0000\n"
-"PO-Revision-Date: 2011-03-03 16:01:56+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:13+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-25 23:44:49+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:42+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-facebookbridge\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. TRANS: Menu item.
-#. TRANS: Menu item tab.
-#: FacebookBridgePlugin.php:218 FacebookBridgePlugin.php:257
-#: FacebookBridgePlugin.php:298
-msgctxt "MENU"
+msgid "Already logged in."
+msgstr "U bent al aangemeld."
+
+#. TRANS: Instructions.
+msgid "Login with your Facebook Account"
+msgstr "Aanmelden met uw Facebookgebruiker"
+
+#. TRANS: Page title.
+msgid "Login with Facebook"
+msgstr "Aanmelden met Facebook"
+
 msgid "Facebook"
 msgstr "Facebook"
 
-#. TRANS: Tooltip for menu item "Facebook".
-#: FacebookBridgePlugin.php:220
-msgid "Login or register using Facebook"
-msgstr "Aanmelden of registreren via Facebook"
+msgid "Facebook integration settings"
+msgstr "Instellingen voor Facebookkoppeling"
 
-#. TRANS: Tooltip for menu item "Facebook".
-#: FacebookBridgePlugin.php:259
-msgid "Facebook integration configuration"
-msgstr "Instellingen voor Facebookintegratie"
+msgid "Invalid Facebook ID. Max length is 255 characters."
+msgstr "Ongeldig Facebook-ID. De maximale lengte is 255 tekens."
+
+msgid "Invalid Facebook secret. Max length is 255 characters."
+msgstr "Ongeldig Facebookgeheim. De maximale lengte is 255 tekens."
+
+msgid "Facebook application settings"
+msgstr "Applicatieinstellingen voor Facebook"
+
+msgid "Application ID"
+msgstr "Applicatie-ID"
+
+msgid "ID of your Facebook application"
+msgstr "ID van uw Facebookapplicatie"
+
+msgid "Secret"
+msgstr "Geheim"
+
+msgid "Application secret"
+msgstr "Applicatiegeheim"
+
+msgid "Save"
+msgstr "Opslaan"
+
+msgid "Save Facebook settings"
+msgstr "Facebookinstellingen opslaan"
+
+msgid "There was a problem with your session token. Try again, please."
+msgstr ""
+"Er is een probleem ontstaan met uw sessie. Probeer het nog een keer, "
+"alstublieft."
 
-#. TRANS: Tooltip for menu item "Facebook".
 #. TRANS: Page title for Facebook settings.
-#: FacebookBridgePlugin.php:300 actions/facebooksettings.php:105
+#. TRANS: Tooltip for menu item "Facebook".
 msgid "Facebook settings"
 msgstr "Facebookinstellingen"
 
-#: FacebookBridgePlugin.php:564
-msgid "A plugin for integrating StatusNet with Facebook."
-msgstr "Een plug-in voor het integreren van StatusNet met Facebook."
+msgid "Connected Facebook user"
+msgstr "Gekoppelde Facebookgebruiker"
 
-#: lib/facebookclient.php:786
-msgid "Your Facebook connection has been removed"
-msgstr "Uw koppeling met Facebook is verwijderd"
+msgid "Publish my notices to Facebook."
+msgstr "Mijn mededelingen publiceren op Facebook."
+
+msgid "Send \"@\" replies to Facebook."
+msgstr "Antwoorden met \"@\" naar Facebook verzenden."
+
+#. TRANS: Submit button to save synchronisation settings.
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "Opslaan"
+
+#. TRANS: Legend.
+msgid "Disconnect my account from Facebook"
+msgstr "Mijn gebruiker loskoppelen van Facebook"
 
-#: lib/facebookclient.php:845
 #, php-format
-msgid "Contact the %s administrator to retrieve your account"
+msgid ""
+"Disconnecting your Faceboook would make it impossible to log in! Please [set "
+"a password](%s) first."
 msgstr ""
-"Neem contact op met de beheerder van %s om uw gebruikersgegevens te "
-"verkrijgen"
+"Door los te koppelen van Faceboook zou u niet meer kunnen aanmelden! [Stel "
+"eerst een wachtwoord in](%s)."
+
+#, php-format
+msgid ""
+"Keep your %1$s account but disconnect from Facebook. You'll use your %1$s "
+"password to log in."
+msgstr ""
+"Uw gebruiker bij %1$s behouden maar deze loskoppelen van Facebook. U kunt uw "
+"wachtwoord van %1$s gebruiken om aan te melden."
+
+#. TRANS: Submit button.
+msgctxt "BUTTON"
+msgid "Disconnect"
+msgstr "Loskoppelen"
+
+msgid "There was a problem saving your sync preferences."
+msgstr ""
+"Er is een fout opgetreden tijdens het opslaan van uw "
+"synchronisatievoorkeuren."
+
+#. TRANS: Confirmation that synchronisation settings have been saved into the system.
+msgid "Sync preferences saved."
+msgstr "Uw synchronisatievoorkeuren zijn opgeslagen."
+
+msgid "Couldn't delete link to Facebook."
+msgstr "Het was niet mogelijk de verwijzing naar Facebook te verwijderen."
+
+msgid "You have disconnected from Facebook."
+msgstr "U bent losgekoppeld van Facebook."
 
-#: actions/facebookfinishlogin.php:88
 msgid ""
 "You must be logged into Facebook to register a local account using Facebook."
 msgstr ""
 "U moet aangemeld zijn bij Facebook om een lokale gebruiker via Facebook te "
 "kunnen registreren."
 
-#: actions/facebookfinishlogin.php:118
 msgid "There is already a local account linked with that Facebook account."
 msgstr "Er is al een lokale gebruiker verbonden met deze Facebookgebruiker."
 
-#: actions/facebookfinishlogin.php:141 actions/facebooksettings.php:86
-msgid "There was a problem with your session token. Try again, please."
-msgstr ""
-"Er is een probleem ontstaan met uw sessie. Probeer het nog een keer, "
-"alstublieft."
-
-#: actions/facebookfinishlogin.php:150
 msgid "You can't register if you don't agree to the license."
 msgstr "U kunt zich niet registreren als u niet met de licentie akkoord gaat."
 
-#: actions/facebookfinishlogin.php:167
 msgid "An unknown error has occured."
 msgstr "Er is een onbekende fout opgetreden."
 
-#: actions/facebookfinishlogin.php:185
 #, php-format
 msgid ""
 "This is the first time you've logged into %s so we must connect your "
@@ -97,17 +155,14 @@ msgstr ""
 "gebruiker aanmaken of koppelen met een bestaande gebruiker als u die al hebt."
 
 #. TRANS: Page title.
-#: actions/facebookfinishlogin.php:195
 msgid "Facebook Setup"
 msgstr "Facebookinstellingen"
 
 #. TRANS: Legend.
-#: actions/facebookfinishlogin.php:229
 msgid "Connection options"
 msgstr "Koppelingsinstellingen"
 
 #. TRANS: %s is the name of the license used by the user for their status updates.
-#: actions/facebookfinishlogin.php:239
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -117,34 +172,27 @@ msgstr ""
 "privégegevens: wachtwoord, e-mailadres, IM-adres, telefoonnummer."
 
 #. TRANS: Legend.
-#: actions/facebookfinishlogin.php:256
 msgid "Create new account"
 msgstr "Nieuwe gebruiker aanmaken"
 
-#: actions/facebookfinishlogin.php:258
 msgid "Create a new user with this nickname."
 msgstr "Nieuwe gebruiker aanmaken met deze gebruikersnaam."
 
 #. TRANS: Field label.
-#: actions/facebookfinishlogin.php:266
 msgid "New nickname"
 msgstr "Nieuwe gebruikersnaam"
 
-#: actions/facebookfinishlogin.php:268
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "1-64 kleine letters of cijfers, geen leestekens of spaties"
 
 #. TRANS: Submit button.
-#: actions/facebookfinishlogin.php:276
 msgctxt "BUTTON"
 msgid "Create"
 msgstr "Aanmaken"
 
-#: actions/facebookfinishlogin.php:282
 msgid "Connect existing account"
 msgstr "Verbinden met een bestaande gebruiker"
 
-#: actions/facebookfinishlogin.php:284
 msgid ""
 "If you already have an account, login with your username and password to "
 "connect it to your Facebook."
@@ -153,168 +201,61 @@ msgstr ""
 "wachtwoord om deze daarna te koppelen met uw Facebookgebruiker."
 
 #. TRANS: Field label.
-#: actions/facebookfinishlogin.php:288
 msgid "Existing nickname"
 msgstr "Bestaande gebruikersnaam"
 
-#: actions/facebookfinishlogin.php:291
 msgid "Password"
 msgstr "Wachtwoord"
 
 #. TRANS: Submit button.
-#: actions/facebookfinishlogin.php:295
 msgctxt "BUTTON"
 msgid "Connect"
 msgstr "Koppelen"
 
 #. TRANS: Client error trying to register with registrations not allowed.
 #. TRANS: Client error trying to register with registrations 'invite only'.
-#: actions/facebookfinishlogin.php:316 actions/facebookfinishlogin.php:326
 msgid "Registration not allowed."
 msgstr "Registratie is niet toegestaan."
 
 #. TRANS: Client error trying to register with an invalid invitation code.
-#: actions/facebookfinishlogin.php:334
 msgid "Not a valid invitation code."
 msgstr "De uitnodigingscode is ongeldig."
 
-#: actions/facebookfinishlogin.php:347
 msgid "Nickname not allowed."
 msgstr "Gebruikersnaam niet toegestaan."
 
-#: actions/facebookfinishlogin.php:352
 msgid "Nickname already in use. Try another one."
 msgstr ""
 "De opgegeven gebruikersnaam is al in gebruik. Kies een andere gebruikersnaam."
 
-#: actions/facebookfinishlogin.php:380 actions/facebookfinishlogin.php:519
 msgid "Error connecting user to Facebook."
 msgstr "Fout bij het verbinden van de gebruiker met Facebook."
 
-#: actions/facebookfinishlogin.php:482
 msgid "Invalid username or password."
 msgstr "Ongeldige gebruikersnaam of wachtwoord."
 
-#: actions/facebooklogin.php:43
-msgid "Already logged in."
-msgstr "U bent al aangemeld."
-
-#. TRANS: Instructions.
-#: actions/facebooklogin.php:52
-msgid "Login with your Facebook Account"
-msgstr "Aanmelden met uw Facebookgebruiker"
-
-#. TRANS: Page title.
-#: actions/facebooklogin.php:67
-msgid "Login with Facebook"
-msgstr "Aanmelden met Facebook"
-
-#: actions/facebookadminpanel.php:52
+#. TRANS: Menu item.
+#. TRANS: Menu item tab.
+msgctxt "MENU"
 msgid "Facebook"
 msgstr "Facebook"
 
-#: actions/facebookadminpanel.php:62
-msgid "Facebook integration settings"
-msgstr "Instellingen voor Facebookkoppeling"
+#. TRANS: Tooltip for menu item "Facebook".
+msgid "Login or register using Facebook"
+msgstr "Aanmelden of registreren via Facebook"
 
-#: actions/facebookadminpanel.php:123
-msgid "Invalid Facebook ID. Max length is 255 characters."
-msgstr "Ongeldig Facebook-ID. De maximale lengte is 255 tekens."
+#. TRANS: Tooltip for menu item "Facebook".
+msgid "Facebook integration configuration"
+msgstr "Instellingen voor Facebookintegratie"
 
-#: actions/facebookadminpanel.php:129
-msgid "Invalid Facebook secret. Max length is 255 characters."
-msgstr "Ongeldig Facebookgeheim. De maximale lengte is 255 tekens."
+msgid "A plugin for integrating StatusNet with Facebook."
+msgstr "Een plug-in voor het integreren van StatusNet met Facebook."
 
-#: actions/facebookadminpanel.php:178
-msgid "Facebook application settings"
-msgstr "Applicatieinstellingen voor Facebook"
+msgid "Your Facebook connection has been removed"
+msgstr "Uw koppeling met Facebook is verwijderd"
 
-#: actions/facebookadminpanel.php:184
-msgid "Application ID"
-msgstr "Applicatie-ID"
-
-#: actions/facebookadminpanel.php:185
-msgid "ID of your Facebook application"
-msgstr "ID van uw Facebookapplicatie"
-
-#: actions/facebookadminpanel.php:193
-msgid "Secret"
-msgstr "Geheim"
-
-#: actions/facebookadminpanel.php:194
-msgid "Application secret"
-msgstr "Applicatiegeheim"
-
-#: actions/facebookadminpanel.php:210
-msgid "Save"
-msgstr "Opslaan"
-
-#: actions/facebookadminpanel.php:210
-msgid "Save Facebook settings"
-msgstr "Facebookinstellingen opslaan"
-
-#: actions/facebooksettings.php:137
-msgid "Connected Facebook user"
-msgstr "Gekoppelde Facebookgebruiker"
-
-#: actions/facebooksettings.php:164
-msgid "Publish my notices to Facebook."
-msgstr "Mijn mededelingen publiceren op Facebook."
-
-#: actions/facebooksettings.php:174
-msgid "Send \"@\" replies to Facebook."
-msgstr "Antwoorden met \"@\" naar Facebook verzenden."
-
-#. TRANS: Submit button to save synchronisation settings.
-#: actions/facebooksettings.php:183
-msgctxt "BUTTON"
-msgid "Save"
-msgstr "Opslaan"
-
-#. TRANS: Legend.
-#: actions/facebooksettings.php:192
-msgid "Disconnect my account from Facebook"
-msgstr "Mijn gebruiker loskoppelen van Facebook"
-
-#: actions/facebooksettings.php:199
 #, php-format
-msgid ""
-"Disconnecting your Faceboook would make it impossible to log in! Please [set "
-"a password](%s) first."
+msgid "Contact the %s administrator to retrieve your account"
 msgstr ""
-"Door los te koppelen van Faceboook zou u niet meer kunnen aanmelden! [Stel "
-"eerst een wachtwoord in](%s)."
-
-#: actions/facebooksettings.php:213
-#, php-format
-msgid ""
-"Keep your %1$s account but disconnect from Facebook. You'll use your %1$s "
-"password to log in."
-msgstr ""
-"Uw gebruiker bij %1$s behouden maar deze loskoppelen van Facebook. U kunt uw "
-"wachtwoord van %1$s gebruiken om aan te melden."
-
-#. TRANS: Submit button.
-#: actions/facebooksettings.php:220
-msgctxt "BUTTON"
-msgid "Disconnect"
-msgstr "Loskoppelen"
-
-#: actions/facebooksettings.php:243
-msgid "There was a problem saving your sync preferences."
-msgstr ""
-"Er is een fout opgetreden tijdens het opslaan van uw "
-"synchronisatievoorkeuren."
-
-#. TRANS: Confirmation that synchronisation settings have been saved into the system.
-#: actions/facebooksettings.php:246
-msgid "Sync preferences saved."
-msgstr "Uw synchronisatievoorkeuren zijn opgeslagen."
-
-#: actions/facebooksettings.php:260
-msgid "Couldn't delete link to Facebook."
-msgstr "Het was niet mogelijk de verwijzing naar Facebook te verwijderen."
-
-#: actions/facebooksettings.php:264
-msgid "You have disconnected from Facebook."
-msgstr "U bent losgekoppeld van Facebook."
+"Neem contact op met de beheerder van %s om uw gebruikersgegevens te "
+"verkrijgen"
diff --git a/plugins/FacebookBridge/locale/uk/LC_MESSAGES/FacebookBridge.po b/plugins/FacebookBridge/locale/uk/LC_MESSAGES/FacebookBridge.po
index 9b2c1c55f4..2b79809022 100644
--- a/plugins/FacebookBridge/locale/uk/LC_MESSAGES/FacebookBridge.po
+++ b/plugins/FacebookBridge/locale/uk/LC_MESSAGES/FacebookBridge.po
@@ -9,80 +9,139 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - FacebookBridge\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 15:58+0000\n"
-"PO-Revision-Date: 2011-03-03 16:01:56+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:13+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-25 23:44:49+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:42+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-facebookbridge\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#. TRANS: Menu item.
-#. TRANS: Menu item tab.
-#: FacebookBridgePlugin.php:218 FacebookBridgePlugin.php:257
-#: FacebookBridgePlugin.php:298
-msgctxt "MENU"
+msgid "Already logged in."
+msgstr "Ви вже увійшли."
+
+#. TRANS: Instructions.
+msgid "Login with your Facebook Account"
+msgstr "Увійти з акаунтом Facebook"
+
+#. TRANS: Page title.
+msgid "Login with Facebook"
+msgstr "Увійти з Facebook"
+
 msgid "Facebook"
 msgstr "Facebook"
 
-#. TRANS: Tooltip for menu item "Facebook".
-#: FacebookBridgePlugin.php:220
-msgid "Login or register using Facebook"
-msgstr "Увійти або зареєструватись з Facebook"
-
-#. TRANS: Tooltip for menu item "Facebook".
-#: FacebookBridgePlugin.php:259
-msgid "Facebook integration configuration"
+msgid "Facebook integration settings"
 msgstr "Налаштування інтеграції з Facebook"
 
-#. TRANS: Tooltip for menu item "Facebook".
+msgid "Invalid Facebook ID. Max length is 255 characters."
+msgstr ""
+"Неприпустимий ідентифікатор Facebook. Максимальна довжина — 255 символів."
+
+msgid "Invalid Facebook secret. Max length is 255 characters."
+msgstr "Помилковий секретний код Facebook. Максимальна довжина — 255 символів."
+
+msgid "Facebook application settings"
+msgstr "Налаштування додатку для Facebook"
+
+msgid "Application ID"
+msgstr "Ідентифікатор додатку"
+
+msgid "ID of your Facebook application"
+msgstr "Ідентифікатор вашого додатку Facebook"
+
+msgid "Secret"
+msgstr "Секретний код"
+
+msgid "Application secret"
+msgstr "Секретний код додатку"
+
+msgid "Save"
+msgstr "Зберегти"
+
+msgid "Save Facebook settings"
+msgstr "Зберегти налаштування Facebook"
+
+msgid "There was a problem with your session token. Try again, please."
+msgstr "Виникла проблема з вашим токеном сесії. Спробуйте пізніше, будь ласка."
+
 #. TRANS: Page title for Facebook settings.
-#: FacebookBridgePlugin.php:300 actions/facebooksettings.php:105
+#. TRANS: Tooltip for menu item "Facebook".
 msgid "Facebook settings"
 msgstr "Налаштування Facebook"
 
-#: FacebookBridgePlugin.php:564
-msgid "A plugin for integrating StatusNet with Facebook."
-msgstr "Додаток для інтеграції StatusNet з Facebook."
+msgid "Connected Facebook user"
+msgstr "Під’єднаний користувач Facebook"
 
-#: lib/facebookclient.php:786
-msgid "Your Facebook connection has been removed"
-msgstr "З’єднання з Facebook було видалено"
+msgid "Publish my notices to Facebook."
+msgstr "Публікувати мої дописи у Facebook."
+
+msgid "Send \"@\" replies to Facebook."
+msgstr "Надсилати «@» відповіді до Facebook."
+
+#. TRANS: Submit button to save synchronisation settings.
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "Зберегти"
+
+#. TRANS: Legend.
+msgid "Disconnect my account from Facebook"
+msgstr "Від’єднати мій акаунт від Facebook"
 
-#: lib/facebookclient.php:845
 #, php-format
-msgid "Contact the %s administrator to retrieve your account"
-msgstr "Зверніться до адміністратора %s, аби відновити свій обліковий запис"
+msgid ""
+"Disconnecting your Faceboook would make it impossible to log in! Please [set "
+"a password](%s) first."
+msgstr ""
+"Якщо від’єднати ваш акаунт від Faceboook зараз, то це унеможливить вхід до "
+"сервісу у майбутньому! Будь ласка, спочатку [встановіть пароль](%s)."
+
+#, php-format
+msgid ""
+"Keep your %1$s account but disconnect from Facebook. You'll use your %1$s "
+"password to log in."
+msgstr ""
+"Зберегти ваш акаунт %1$s, але від’єднати його від Facebook. Ви можете "
+"використовувати пароль від %1$s для входу на сайт."
+
+#. TRANS: Submit button.
+msgctxt "BUTTON"
+msgid "Disconnect"
+msgstr "Від’єднати"
+
+msgid "There was a problem saving your sync preferences."
+msgstr "Виникла проблема при збереженні параметрів синхронізації."
+
+#. TRANS: Confirmation that synchronisation settings have been saved into the system.
+msgid "Sync preferences saved."
+msgstr "Параметри синхронізації збережено."
+
+msgid "Couldn't delete link to Facebook."
+msgstr "Не можу видалити посилання на Facebook."
+
+msgid "You have disconnected from Facebook."
+msgstr "Ви від’єдналися від Facebook."
 
-#: actions/facebookfinishlogin.php:88
 msgid ""
 "You must be logged into Facebook to register a local account using Facebook."
 msgstr ""
 "Спочатку ви маєте увійти до Facebook, аби мати змогу зареєструвати акаунт на "
 "цьому сервісі за допомогою Facebook."
 
-#: actions/facebookfinishlogin.php:118
 msgid "There is already a local account linked with that Facebook account."
 msgstr "Один з тутешніх акаунтів вже прив’язаний до цього профілю у Facebook."
 
-#: actions/facebookfinishlogin.php:141 actions/facebooksettings.php:86
-msgid "There was a problem with your session token. Try again, please."
-msgstr "Виникла проблема з вашим токеном сесії. Спробуйте пізніше, будь ласка."
-
-#: actions/facebookfinishlogin.php:150
 msgid "You can't register if you don't agree to the license."
 msgstr "Ви не зможете зареєструватись, якщо не погодитесь з умовами ліцензії."
 
-#: actions/facebookfinishlogin.php:167
 msgid "An unknown error has occured."
 msgstr "Сталася невідома помилка."
 
-#: actions/facebookfinishlogin.php:185
 #, php-format
 msgid ""
 "This is the first time you've logged into %s so we must connect your "
@@ -94,17 +153,14 @@ msgstr ""
 "використати такий, що вже існує."
 
 #. TRANS: Page title.
-#: actions/facebookfinishlogin.php:195
 msgid "Facebook Setup"
 msgstr "Установки Facebook"
 
 #. TRANS: Legend.
-#: actions/facebookfinishlogin.php:229
 msgid "Connection options"
 msgstr "Опції з’єднання"
 
 #. TRANS: %s is the name of the license used by the user for their status updates.
-#: actions/facebookfinishlogin.php:239
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -114,35 +170,28 @@ msgstr ""
 "електронна адреса, адреса IM, телефонний номер."
 
 #. TRANS: Legend.
-#: actions/facebookfinishlogin.php:256
 msgid "Create new account"
 msgstr "Створити новий акаунт"
 
-#: actions/facebookfinishlogin.php:258
 msgid "Create a new user with this nickname."
 msgstr "Створити нового користувача з цим нікнеймом."
 
 #. TRANS: Field label.
-#: actions/facebookfinishlogin.php:266
 msgid "New nickname"
 msgstr "Новий псевдонім"
 
-#: actions/facebookfinishlogin.php:268
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr ""
 "1-64 літери нижнього регістру і цифри, ніякої пунктуації або інтервалів"
 
 #. TRANS: Submit button.
-#: actions/facebookfinishlogin.php:276
 msgctxt "BUTTON"
 msgid "Create"
 msgstr "Створити"
 
-#: actions/facebookfinishlogin.php:282
 msgid "Connect existing account"
 msgstr "Приєднати акаунт, який вже існує"
 
-#: actions/facebookfinishlogin.php:284
 msgid ""
 "If you already have an account, login with your username and password to "
 "connect it to your Facebook."
@@ -151,166 +200,58 @@ msgstr ""
 "приєднати їх до Facebook."
 
 #. TRANS: Field label.
-#: actions/facebookfinishlogin.php:288
 msgid "Existing nickname"
 msgstr "Нікнейм, який вже існує"
 
-#: actions/facebookfinishlogin.php:291
 msgid "Password"
 msgstr "Пароль"
 
 #. TRANS: Submit button.
-#: actions/facebookfinishlogin.php:295
 msgctxt "BUTTON"
 msgid "Connect"
 msgstr "Під’єднати"
 
 #. TRANS: Client error trying to register with registrations not allowed.
 #. TRANS: Client error trying to register with registrations 'invite only'.
-#: actions/facebookfinishlogin.php:316 actions/facebookfinishlogin.php:326
 msgid "Registration not allowed."
 msgstr "Реєстрацію не дозволено."
 
 #. TRANS: Client error trying to register with an invalid invitation code.
-#: actions/facebookfinishlogin.php:334
 msgid "Not a valid invitation code."
 msgstr "Це не дійсний код запрошення."
 
-#: actions/facebookfinishlogin.php:347
 msgid "Nickname not allowed."
 msgstr "Нікнейм не допускається."
 
-#: actions/facebookfinishlogin.php:352
 msgid "Nickname already in use. Try another one."
 msgstr "Це ім’я вже використовується. Спробуйте інше."
 
-#: actions/facebookfinishlogin.php:380 actions/facebookfinishlogin.php:519
 msgid "Error connecting user to Facebook."
 msgstr "Помилка при підключенні до Facebook."
 
-#: actions/facebookfinishlogin.php:482
 msgid "Invalid username or password."
 msgstr "Недійсне ім’я або пароль."
 
-#: actions/facebooklogin.php:43
-msgid "Already logged in."
-msgstr "Ви вже увійшли."
-
-#. TRANS: Instructions.
-#: actions/facebooklogin.php:52
-msgid "Login with your Facebook Account"
-msgstr "Увійти з акаунтом Facebook"
-
-#. TRANS: Page title.
-#: actions/facebooklogin.php:67
-msgid "Login with Facebook"
-msgstr "Увійти з Facebook"
-
-#: actions/facebookadminpanel.php:52
+#. TRANS: Menu item.
+#. TRANS: Menu item tab.
+msgctxt "MENU"
 msgid "Facebook"
 msgstr "Facebook"
 
-#: actions/facebookadminpanel.php:62
-msgid "Facebook integration settings"
+#. TRANS: Tooltip for menu item "Facebook".
+msgid "Login or register using Facebook"
+msgstr "Увійти або зареєструватись з Facebook"
+
+#. TRANS: Tooltip for menu item "Facebook".
+msgid "Facebook integration configuration"
 msgstr "Налаштування інтеграції з Facebook"
 
-#: actions/facebookadminpanel.php:123
-msgid "Invalid Facebook ID. Max length is 255 characters."
-msgstr ""
-"Неприпустимий ідентифікатор Facebook. Максимальна довжина — 255 символів."
+msgid "A plugin for integrating StatusNet with Facebook."
+msgstr "Додаток для інтеграції StatusNet з Facebook."
 
-#: actions/facebookadminpanel.php:129
-msgid "Invalid Facebook secret. Max length is 255 characters."
-msgstr "Помилковий секретний код Facebook. Максимальна довжина — 255 символів."
+msgid "Your Facebook connection has been removed"
+msgstr "З’єднання з Facebook було видалено"
 
-#: actions/facebookadminpanel.php:178
-msgid "Facebook application settings"
-msgstr "Налаштування додатку для Facebook"
-
-#: actions/facebookadminpanel.php:184
-msgid "Application ID"
-msgstr "Ідентифікатор додатку"
-
-#: actions/facebookadminpanel.php:185
-msgid "ID of your Facebook application"
-msgstr "Ідентифікатор вашого додатку Facebook"
-
-#: actions/facebookadminpanel.php:193
-msgid "Secret"
-msgstr "Секретний код"
-
-#: actions/facebookadminpanel.php:194
-msgid "Application secret"
-msgstr "Секретний код додатку"
-
-#: actions/facebookadminpanel.php:210
-msgid "Save"
-msgstr "Зберегти"
-
-#: actions/facebookadminpanel.php:210
-msgid "Save Facebook settings"
-msgstr "Зберегти налаштування Facebook"
-
-#: actions/facebooksettings.php:137
-msgid "Connected Facebook user"
-msgstr "Під’єднаний користувач Facebook"
-
-#: actions/facebooksettings.php:164
-msgid "Publish my notices to Facebook."
-msgstr "Публікувати мої дописи у Facebook."
-
-#: actions/facebooksettings.php:174
-msgid "Send \"@\" replies to Facebook."
-msgstr "Надсилати «@» відповіді до Facebook."
-
-#. TRANS: Submit button to save synchronisation settings.
-#: actions/facebooksettings.php:183
-msgctxt "BUTTON"
-msgid "Save"
-msgstr "Зберегти"
-
-#. TRANS: Legend.
-#: actions/facebooksettings.php:192
-msgid "Disconnect my account from Facebook"
-msgstr "Від’єднати мій акаунт від Facebook"
-
-#: actions/facebooksettings.php:199
 #, php-format
-msgid ""
-"Disconnecting your Faceboook would make it impossible to log in! Please [set "
-"a password](%s) first."
-msgstr ""
-"Якщо від’єднати ваш акаунт від Faceboook зараз, то це унеможливить вхід до "
-"сервісу у майбутньому! Будь ласка, спочатку [встановіть пароль](%s)."
-
-#: actions/facebooksettings.php:213
-#, php-format
-msgid ""
-"Keep your %1$s account but disconnect from Facebook. You'll use your %1$s "
-"password to log in."
-msgstr ""
-"Зберегти ваш акаунт %1$s, але від’єднати його від Facebook. Ви можете "
-"використовувати пароль від %1$s для входу на сайт."
-
-#. TRANS: Submit button.
-#: actions/facebooksettings.php:220
-msgctxt "BUTTON"
-msgid "Disconnect"
-msgstr "Від’єднати"
-
-#: actions/facebooksettings.php:243
-msgid "There was a problem saving your sync preferences."
-msgstr "Виникла проблема при збереженні параметрів синхронізації."
-
-#. TRANS: Confirmation that synchronisation settings have been saved into the system.
-#: actions/facebooksettings.php:246
-msgid "Sync preferences saved."
-msgstr "Параметри синхронізації збережено."
-
-#: actions/facebooksettings.php:260
-msgid "Couldn't delete link to Facebook."
-msgstr "Не можу видалити посилання на Facebook."
-
-#: actions/facebooksettings.php:264
-msgid "You have disconnected from Facebook."
-msgstr "Ви від’єдналися від Facebook."
+msgid "Contact the %s administrator to retrieve your account"
+msgstr "Зверніться до адміністратора %s, аби відновити свій обліковий запис"
diff --git a/plugins/FacebookBridge/locale/zh_CN/LC_MESSAGES/FacebookBridge.po b/plugins/FacebookBridge/locale/zh_CN/LC_MESSAGES/FacebookBridge.po
index 8efc229088..2d03c8677d 100644
--- a/plugins/FacebookBridge/locale/zh_CN/LC_MESSAGES/FacebookBridge.po
+++ b/plugins/FacebookBridge/locale/zh_CN/LC_MESSAGES/FacebookBridge.po
@@ -9,78 +9,132 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - FacebookBridge\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 15:58+0000\n"
-"PO-Revision-Date: 2011-03-03 16:01:57+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:13+0000\n"
 "Language-Team: Simplified Chinese <http://translatewiki.net/wiki/Portal:zh-"
 "hans>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-25 23:44:49+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:42+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-facebookbridge\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#. TRANS: Menu item.
-#. TRANS: Menu item tab.
-#: FacebookBridgePlugin.php:218 FacebookBridgePlugin.php:257
-#: FacebookBridgePlugin.php:298
-msgctxt "MENU"
+msgid "Already logged in."
+msgstr "已登录。"
+
+#. TRANS: Instructions.
+msgid "Login with your Facebook Account"
+msgstr "与您的 Facebook 帐户登录"
+
+#. TRANS: Page title.
+msgid "Login with Facebook"
+msgstr "使用 Facebook 登录"
+
 msgid "Facebook"
 msgstr "Facebook"
 
-#. TRANS: Tooltip for menu item "Facebook".
-#: FacebookBridgePlugin.php:220
-msgid "Login or register using Facebook"
-msgstr "登入或使用 Facebook 的注册"
+msgid "Facebook integration settings"
+msgstr "Facebook 集成设置"
 
-#. TRANS: Tooltip for menu item "Facebook".
-#: FacebookBridgePlugin.php:259
-msgid "Facebook integration configuration"
-msgstr "Facebook 整合配置"
+msgid "Invalid Facebook ID. Max length is 255 characters."
+msgstr "无效的 Facebook ID。最大长度为 255 个字符。"
+
+msgid "Invalid Facebook secret. Max length is 255 characters."
+msgstr "无效的 Facebook 秘密。最大长度为 255 个字符。"
+
+msgid "Facebook application settings"
+msgstr "Facebook 应用程序设置"
+
+msgid "Application ID"
+msgstr "应用程序 ID"
+
+msgid "ID of your Facebook application"
+msgstr "Facebook 应用程序的 ID"
+
+msgid "Secret"
+msgstr "秘密"
+
+msgid "Application secret"
+msgstr "应用程序的秘密"
+
+msgid "Save"
+msgstr "保存"
+
+msgid "Save Facebook settings"
+msgstr "保存的 Facebook 设置"
+
+msgid "There was a problem with your session token. Try again, please."
+msgstr "有一个与您的会话令牌的问题。请再次尝试。"
 
-#. TRANS: Tooltip for menu item "Facebook".
 #. TRANS: Page title for Facebook settings.
-#: FacebookBridgePlugin.php:300 actions/facebooksettings.php:105
+#. TRANS: Tooltip for menu item "Facebook".
 msgid "Facebook settings"
 msgstr "Facebook 的设置"
 
-#: FacebookBridgePlugin.php:564
-msgid "A plugin for integrating StatusNet with Facebook."
-msgstr "StatusNet 与结合 Facebook 的插件。"
+msgid "Connected Facebook user"
+msgstr "已连接的 Facebook 用户"
 
-#: lib/facebookclient.php:786
-msgid "Your Facebook connection has been removed"
-msgstr "Facebook 的连接已被删除"
+msgid "Publish my notices to Facebook."
+msgstr "将我的通知发布到 Facebook。"
+
+msgid "Send \"@\" replies to Facebook."
+msgstr "发送 \"@\" Facebook 的答复。"
+
+#. TRANS: Submit button to save synchronisation settings.
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "保存"
+
+#. TRANS: Legend.
+msgid "Disconnect my account from Facebook"
+msgstr "从 Facebook 拔下我的账户"
 
-#: lib/facebookclient.php:845
 #, php-format
-msgid "Contact the %s administrator to retrieve your account"
-msgstr "与 %s 管理员联系，以检索您的帐户"
+msgid ""
+"Disconnecting your Faceboook would make it impossible to log in! Please [set "
+"a password](%s) first."
+msgstr ""
+
+#, php-format
+msgid ""
+"Keep your %1$s account but disconnect from Facebook. You'll use your %1$s "
+"password to log in."
+msgstr ""
+
+#. TRANS: Submit button.
+msgctxt "BUTTON"
+msgid "Disconnect"
+msgstr ""
+
+msgid "There was a problem saving your sync preferences."
+msgstr ""
+
+#. TRANS: Confirmation that synchronisation settings have been saved into the system.
+msgid "Sync preferences saved."
+msgstr ""
+
+msgid "Couldn't delete link to Facebook."
+msgstr ""
+
+msgid "You have disconnected from Facebook."
+msgstr ""
 
-#: actions/facebookfinishlogin.php:88
 msgid ""
 "You must be logged into Facebook to register a local account using Facebook."
 msgstr "您必须登录到 Facebook 注册使用 Facebook 的本地帐户。"
 
-#: actions/facebookfinishlogin.php:118
 msgid "There is already a local account linked with that Facebook account."
 msgstr "已存在与该 Facebook 帐户相关的本地帐户。"
 
-#: actions/facebookfinishlogin.php:141 actions/facebooksettings.php:86
-msgid "There was a problem with your session token. Try again, please."
-msgstr "有一个与您的会话令牌的问题。请再次尝试。"
-
-#: actions/facebookfinishlogin.php:150
 msgid "You can't register if you don't agree to the license."
 msgstr "如果您不同意该许可，您不能注册。"
 
-#: actions/facebookfinishlogin.php:167
 msgid "An unknown error has occured."
 msgstr "出现了一个未知的错误。"
 
-#: actions/facebookfinishlogin.php:185
 #, php-format
 msgid ""
 "This is the first time you've logged into %s so we must connect your "
@@ -89,17 +143,14 @@ msgid ""
 msgstr ""
 
 #. TRANS: Page title.
-#: actions/facebookfinishlogin.php:195
 msgid "Facebook Setup"
 msgstr "Facebook 安装程序"
 
 #. TRANS: Legend.
-#: actions/facebookfinishlogin.php:229
 msgid "Connection options"
 msgstr "连接选项"
 
 #. TRANS: %s is the name of the license used by the user for their status updates.
-#: actions/facebookfinishlogin.php:239
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -107,195 +158,85 @@ msgid ""
 msgstr ""
 
 #. TRANS: Legend.
-#: actions/facebookfinishlogin.php:256
 msgid "Create new account"
 msgstr "创建新的帐户"
 
-#: actions/facebookfinishlogin.php:258
 msgid "Create a new user with this nickname."
 msgstr "此别名与创建新用户。"
 
 #. TRANS: Field label.
-#: actions/facebookfinishlogin.php:266
 msgid "New nickname"
 msgstr "新的昵称"
 
-#: actions/facebookfinishlogin.php:268
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "1-64 个小写字母或没有标点符号或空格的数字"
 
 #. TRANS: Submit button.
-#: actions/facebookfinishlogin.php:276
 msgctxt "BUTTON"
 msgid "Create"
 msgstr "创建"
 
-#: actions/facebookfinishlogin.php:282
 msgid "Connect existing account"
 msgstr "连接现有的帐户"
 
-#: actions/facebookfinishlogin.php:284
 msgid ""
 "If you already have an account, login with your username and password to "
 "connect it to your Facebook."
 msgstr "如果您已经有一个的帐户使用您的用户名和密码以连接到在 Facebook 的登录。"
 
 #. TRANS: Field label.
-#: actions/facebookfinishlogin.php:288
 msgid "Existing nickname"
 msgstr "现有的昵称"
 
-#: actions/facebookfinishlogin.php:291
 msgid "Password"
 msgstr "密码"
 
 #. TRANS: Submit button.
-#: actions/facebookfinishlogin.php:295
 msgctxt "BUTTON"
 msgid "Connect"
 msgstr "连接"
 
 #. TRANS: Client error trying to register with registrations not allowed.
 #. TRANS: Client error trying to register with registrations 'invite only'.
-#: actions/facebookfinishlogin.php:316 actions/facebookfinishlogin.php:326
 msgid "Registration not allowed."
 msgstr "不允许注册。"
 
 #. TRANS: Client error trying to register with an invalid invitation code.
-#: actions/facebookfinishlogin.php:334
 msgid "Not a valid invitation code."
 msgstr "不是一个有效的邀请代码。"
 
-#: actions/facebookfinishlogin.php:347
 msgid "Nickname not allowed."
 msgstr "不允许使用的昵称。"
 
-#: actions/facebookfinishlogin.php:352
 msgid "Nickname already in use. Try another one."
 msgstr "别名已在使用中。请尝试另一个。"
 
-#: actions/facebookfinishlogin.php:380 actions/facebookfinishlogin.php:519
 msgid "Error connecting user to Facebook."
 msgstr "Facebook 中连接用户时出错。"
 
-#: actions/facebookfinishlogin.php:482
 msgid "Invalid username or password."
 msgstr "无效的用户名或密码。"
 
-#: actions/facebooklogin.php:43
-msgid "Already logged in."
-msgstr "已登录。"
-
-#. TRANS: Instructions.
-#: actions/facebooklogin.php:52
-msgid "Login with your Facebook Account"
-msgstr "与您的 Facebook 帐户登录"
-
-#. TRANS: Page title.
-#: actions/facebooklogin.php:67
-msgid "Login with Facebook"
-msgstr "使用 Facebook 登录"
-
-#: actions/facebookadminpanel.php:52
+#. TRANS: Menu item.
+#. TRANS: Menu item tab.
+msgctxt "MENU"
 msgid "Facebook"
 msgstr "Facebook"
 
-#: actions/facebookadminpanel.php:62
-msgid "Facebook integration settings"
-msgstr "Facebook 集成设置"
+#. TRANS: Tooltip for menu item "Facebook".
+msgid "Login or register using Facebook"
+msgstr "登入或使用 Facebook 的注册"
 
-#: actions/facebookadminpanel.php:123
-msgid "Invalid Facebook ID. Max length is 255 characters."
-msgstr "无效的 Facebook ID。最大长度为 255 个字符。"
+#. TRANS: Tooltip for menu item "Facebook".
+msgid "Facebook integration configuration"
+msgstr "Facebook 整合配置"
 
-#: actions/facebookadminpanel.php:129
-msgid "Invalid Facebook secret. Max length is 255 characters."
-msgstr "无效的 Facebook 秘密。最大长度为 255 个字符。"
+msgid "A plugin for integrating StatusNet with Facebook."
+msgstr "StatusNet 与结合 Facebook 的插件。"
 
-#: actions/facebookadminpanel.php:178
-msgid "Facebook application settings"
-msgstr "Facebook 应用程序设置"
+msgid "Your Facebook connection has been removed"
+msgstr "Facebook 的连接已被删除"
 
-#: actions/facebookadminpanel.php:184
-msgid "Application ID"
-msgstr "应用程序 ID"
-
-#: actions/facebookadminpanel.php:185
-msgid "ID of your Facebook application"
-msgstr "Facebook 应用程序的 ID"
-
-#: actions/facebookadminpanel.php:193
-msgid "Secret"
-msgstr "秘密"
-
-#: actions/facebookadminpanel.php:194
-msgid "Application secret"
-msgstr "应用程序的秘密"
-
-#: actions/facebookadminpanel.php:210
-msgid "Save"
-msgstr "保存"
-
-#: actions/facebookadminpanel.php:210
-msgid "Save Facebook settings"
-msgstr "保存的 Facebook 设置"
-
-#: actions/facebooksettings.php:137
-msgid "Connected Facebook user"
-msgstr "已连接的 Facebook 用户"
-
-#: actions/facebooksettings.php:164
-msgid "Publish my notices to Facebook."
-msgstr "将我的通知发布到 Facebook。"
-
-#: actions/facebooksettings.php:174
-msgid "Send \"@\" replies to Facebook."
-msgstr "发送 \"@\" Facebook 的答复。"
-
-#. TRANS: Submit button to save synchronisation settings.
-#: actions/facebooksettings.php:183
-msgctxt "BUTTON"
-msgid "Save"
-msgstr "保存"
-
-#. TRANS: Legend.
-#: actions/facebooksettings.php:192
-msgid "Disconnect my account from Facebook"
-msgstr "从 Facebook 拔下我的账户"
-
-#: actions/facebooksettings.php:199
 #, php-format
-msgid ""
-"Disconnecting your Faceboook would make it impossible to log in! Please [set "
-"a password](%s) first."
-msgstr ""
-
-#: actions/facebooksettings.php:213
-#, php-format
-msgid ""
-"Keep your %1$s account but disconnect from Facebook. You'll use your %1$s "
-"password to log in."
-msgstr ""
-
-#. TRANS: Submit button.
-#: actions/facebooksettings.php:220
-msgctxt "BUTTON"
-msgid "Disconnect"
-msgstr ""
-
-#: actions/facebooksettings.php:243
-msgid "There was a problem saving your sync preferences."
-msgstr ""
-
-#. TRANS: Confirmation that synchronisation settings have been saved into the system.
-#: actions/facebooksettings.php:246
-msgid "Sync preferences saved."
-msgstr ""
-
-#: actions/facebooksettings.php:260
-msgid "Couldn't delete link to Facebook."
-msgstr ""
-
-#: actions/facebooksettings.php:264
-msgid "You have disconnected from Facebook."
-msgstr ""
+msgid "Contact the %s administrator to retrieve your account"
+msgstr "与 %s 管理员联系，以检索您的帐户"
diff --git a/plugins/FirePHP/locale/FirePHP.pot b/plugins/FirePHP/locale/FirePHP.pot
index 713e85bcf2..5e5dd0df7f 100644
--- a/plugins/FirePHP/locale/FirePHP.pot
+++ b/plugins/FirePHP/locale/FirePHP.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/FirePHP/locale/de/LC_MESSAGES/FirePHP.po b/plugins/FirePHP/locale/de/LC_MESSAGES/FirePHP.po
index 86af0d93bd..2ee7306078 100644
--- a/plugins/FirePHP/locale/de/LC_MESSAGES/FirePHP.po
+++ b/plugins/FirePHP/locale/de/LC_MESSAGES/FirePHP.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - FirePHP\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:49+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:13+0000\n"
 "Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:01+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:23+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-firephp\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: FirePHPPlugin.php:68
 msgid "The FirePHP plugin writes StatusNet's log output to FirePHP."
 msgstr ""
 "Das FirePHP-Plugin schreibt die Konsolenausgabe von StatusNet an FirePHP."
diff --git a/plugins/FirePHP/locale/es/LC_MESSAGES/FirePHP.po b/plugins/FirePHP/locale/es/LC_MESSAGES/FirePHP.po
index a8b51b5527..7f56312695 100644
--- a/plugins/FirePHP/locale/es/LC_MESSAGES/FirePHP.po
+++ b/plugins/FirePHP/locale/es/LC_MESSAGES/FirePHP.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - FirePHP\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:49+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:13+0000\n"
 "Language-Team: Spanish <http://translatewiki.net/wiki/Portal:es>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:01+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:23+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-firephp\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: FirePHPPlugin.php:68
 msgid "The FirePHP plugin writes StatusNet's log output to FirePHP."
 msgstr ""
 "La extensión FirePHP escribe la salida del registro de StatusNet en FirePHP."
diff --git a/plugins/FirePHP/locale/fi/LC_MESSAGES/FirePHP.po b/plugins/FirePHP/locale/fi/LC_MESSAGES/FirePHP.po
index 000eda4a1a..b501fea83d 100644
--- a/plugins/FirePHP/locale/fi/LC_MESSAGES/FirePHP.po
+++ b/plugins/FirePHP/locale/fi/LC_MESSAGES/FirePHP.po
@@ -9,18 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - FirePHP\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:49+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:13+0000\n"
 "Language-Team: Finnish <http://translatewiki.net/wiki/Portal:fi>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:01+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:23+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fi\n"
 "X-Message-Group: #out-statusnet-plugin-firephp\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: FirePHPPlugin.php:68
 msgid "The FirePHP plugin writes StatusNet's log output to FirePHP."
 msgstr "FirePHP-liitännäinen kirjoittaa StatusNetin tulosteen FirePHP:hen."
diff --git a/plugins/FirePHP/locale/fr/LC_MESSAGES/FirePHP.po b/plugins/FirePHP/locale/fr/LC_MESSAGES/FirePHP.po
index a25009fc54..0adfbd7e4e 100644
--- a/plugins/FirePHP/locale/fr/LC_MESSAGES/FirePHP.po
+++ b/plugins/FirePHP/locale/fr/LC_MESSAGES/FirePHP.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - FirePHP\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:49+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:13+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:01+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:23+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-firephp\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: FirePHPPlugin.php:68
 msgid "The FirePHP plugin writes StatusNet's log output to FirePHP."
 msgstr ""
 "L’extension FirePHP écrit la sortie du journal de StatusNet dans FirePHP."
diff --git a/plugins/FirePHP/locale/he/LC_MESSAGES/FirePHP.po b/plugins/FirePHP/locale/he/LC_MESSAGES/FirePHP.po
index f1effb7d93..068dd03189 100644
--- a/plugins/FirePHP/locale/he/LC_MESSAGES/FirePHP.po
+++ b/plugins/FirePHP/locale/he/LC_MESSAGES/FirePHP.po
@@ -9,18 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - FirePHP\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:49+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:13+0000\n"
 "Language-Team: Hebrew <http://translatewiki.net/wiki/Portal:he>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:01+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:23+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-plugin-firephp\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: FirePHPPlugin.php:68
 msgid "The FirePHP plugin writes StatusNet's log output to FirePHP."
 msgstr "התוסף FirePHP כותב את פלט הרישום של StatusNet ל־FirePHP."
diff --git a/plugins/FirePHP/locale/ia/LC_MESSAGES/FirePHP.po b/plugins/FirePHP/locale/ia/LC_MESSAGES/FirePHP.po
index 40d10846b1..119742514f 100644
--- a/plugins/FirePHP/locale/ia/LC_MESSAGES/FirePHP.po
+++ b/plugins/FirePHP/locale/ia/LC_MESSAGES/FirePHP.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - FirePHP\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:49+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:13+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:01+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:23+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-firephp\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: FirePHPPlugin.php:68
 msgid "The FirePHP plugin writes StatusNet's log output to FirePHP."
 msgstr ""
 "Le plug-in FirePHP transmitte le output del registro de StatusNet a FirePHP."
diff --git a/plugins/FirePHP/locale/id/LC_MESSAGES/FirePHP.po b/plugins/FirePHP/locale/id/LC_MESSAGES/FirePHP.po
index dd7cadc0ba..d531d24936 100644
--- a/plugins/FirePHP/locale/id/LC_MESSAGES/FirePHP.po
+++ b/plugins/FirePHP/locale/id/LC_MESSAGES/FirePHP.po
@@ -9,18 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - FirePHP\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:49+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:13+0000\n"
 "Language-Team: Indonesian <http://translatewiki.net/wiki/Portal:id>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:01+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:23+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: id\n"
 "X-Message-Group: #out-statusnet-plugin-firephp\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: FirePHPPlugin.php:68
 msgid "The FirePHP plugin writes StatusNet's log output to FirePHP."
 msgstr "Pengaya FirePHP menulis keluaran log StatusNet kepada FirePHP."
diff --git a/plugins/FirePHP/locale/ja/LC_MESSAGES/FirePHP.po b/plugins/FirePHP/locale/ja/LC_MESSAGES/FirePHP.po
index edb046fa38..68c376144b 100644
--- a/plugins/FirePHP/locale/ja/LC_MESSAGES/FirePHP.po
+++ b/plugins/FirePHP/locale/ja/LC_MESSAGES/FirePHP.po
@@ -9,18 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - FirePHP\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:49+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:13+0000\n"
 "Language-Team: Japanese <http://translatewiki.net/wiki/Portal:ja>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:01+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:23+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ja\n"
 "X-Message-Group: #out-statusnet-plugin-firephp\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: FirePHPPlugin.php:68
 msgid "The FirePHP plugin writes StatusNet's log output to FirePHP."
 msgstr "FirePHPプラグインは、StatusNetの記録出力を、FirePHPへ書き出します。"
diff --git a/plugins/FirePHP/locale/mk/LC_MESSAGES/FirePHP.po b/plugins/FirePHP/locale/mk/LC_MESSAGES/FirePHP.po
index 7f4bca2f51..f13a5aaff1 100644
--- a/plugins/FirePHP/locale/mk/LC_MESSAGES/FirePHP.po
+++ b/plugins/FirePHP/locale/mk/LC_MESSAGES/FirePHP.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - FirePHP\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:49+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:13+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:01+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:23+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-firephp\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
 
-#: FirePHPPlugin.php:68
 msgid "The FirePHP plugin writes StatusNet's log output to FirePHP."
 msgstr ""
 "Приклучокот FirePHP ги врши излезните записи во дневникот на StatusNet во "
diff --git a/plugins/FirePHP/locale/nb/LC_MESSAGES/FirePHP.po b/plugins/FirePHP/locale/nb/LC_MESSAGES/FirePHP.po
index 786b5da759..1d0304a32b 100644
--- a/plugins/FirePHP/locale/nb/LC_MESSAGES/FirePHP.po
+++ b/plugins/FirePHP/locale/nb/LC_MESSAGES/FirePHP.po
@@ -9,18 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - FirePHP\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:49+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:14+0000\n"
 "Language-Team: Norwegian (bokmål)‬ <http://translatewiki.net/wiki/Portal:no>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:01+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:23+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: #out-statusnet-plugin-firephp\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: FirePHPPlugin.php:68
 msgid "The FirePHP plugin writes StatusNet's log output to FirePHP."
 msgstr "Utvidelsen FirePHP skriver StatusNets logg-utdata til FirePHP."
diff --git a/plugins/FirePHP/locale/nl/LC_MESSAGES/FirePHP.po b/plugins/FirePHP/locale/nl/LC_MESSAGES/FirePHP.po
index 45187bb6d2..a97c54d2ba 100644
--- a/plugins/FirePHP/locale/nl/LC_MESSAGES/FirePHP.po
+++ b/plugins/FirePHP/locale/nl/LC_MESSAGES/FirePHP.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - FirePHP\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:49+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:14+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:01+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:23+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-firephp\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: FirePHPPlugin.php:68
 msgid "The FirePHP plugin writes StatusNet's log output to FirePHP."
 msgstr ""
 "De plug-in FirePHP schrijft de logboekuitvoer van StatusNet naar FirePHP."
diff --git a/plugins/FirePHP/locale/pt/LC_MESSAGES/FirePHP.po b/plugins/FirePHP/locale/pt/LC_MESSAGES/FirePHP.po
index c5310d86cc..0f53fc10f2 100644
--- a/plugins/FirePHP/locale/pt/LC_MESSAGES/FirePHP.po
+++ b/plugins/FirePHP/locale/pt/LC_MESSAGES/FirePHP.po
@@ -9,18 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - FirePHP\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:50+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:14+0000\n"
 "Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:01+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:23+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-plugin-firephp\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: FirePHPPlugin.php:68
 msgid "The FirePHP plugin writes StatusNet's log output to FirePHP."
 msgstr "O plugin FirePHP envia a saída do log do StatusNet para o FirePHP."
diff --git a/plugins/FirePHP/locale/ru/LC_MESSAGES/FirePHP.po b/plugins/FirePHP/locale/ru/LC_MESSAGES/FirePHP.po
index 452e73c027..b5a6572bc1 100644
--- a/plugins/FirePHP/locale/ru/LC_MESSAGES/FirePHP.po
+++ b/plugins/FirePHP/locale/ru/LC_MESSAGES/FirePHP.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - FirePHP\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:50+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:14+0000\n"
 "Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:01+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:23+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-firephp\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: FirePHPPlugin.php:68
 msgid "The FirePHP plugin writes StatusNet's log output to FirePHP."
 msgstr "Модуль FirePHP записывает вывод журнала StatusNet в FirePHP."
diff --git a/plugins/FirePHP/locale/tl/LC_MESSAGES/FirePHP.po b/plugins/FirePHP/locale/tl/LC_MESSAGES/FirePHP.po
index e3b7e3f539..a50c8fffed 100644
--- a/plugins/FirePHP/locale/tl/LC_MESSAGES/FirePHP.po
+++ b/plugins/FirePHP/locale/tl/LC_MESSAGES/FirePHP.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - FirePHP\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:50+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:14+0000\n"
 "Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:01+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:23+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-firephp\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: FirePHPPlugin.php:68
 msgid "The FirePHP plugin writes StatusNet's log output to FirePHP."
 msgstr ""
 "Ang pamasak na FirePHP ay nagsusulat ng tala ng paglalabas ng StatusNet sa "
diff --git a/plugins/FirePHP/locale/uk/LC_MESSAGES/FirePHP.po b/plugins/FirePHP/locale/uk/LC_MESSAGES/FirePHP.po
index c72512c3bf..9189324139 100644
--- a/plugins/FirePHP/locale/uk/LC_MESSAGES/FirePHP.po
+++ b/plugins/FirePHP/locale/uk/LC_MESSAGES/FirePHP.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - FirePHP\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:50+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:14+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:01+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:23+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-firephp\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: FirePHPPlugin.php:68
 msgid "The FirePHP plugin writes StatusNet's log output to FirePHP."
 msgstr "Додаток FirePHP записує лоґи StatusNet до FirePHP."
diff --git a/plugins/FirePHP/locale/zh_CN/LC_MESSAGES/FirePHP.po b/plugins/FirePHP/locale/zh_CN/LC_MESSAGES/FirePHP.po
index efe795f5e9..b4ffbcb802 100644
--- a/plugins/FirePHP/locale/zh_CN/LC_MESSAGES/FirePHP.po
+++ b/plugins/FirePHP/locale/zh_CN/LC_MESSAGES/FirePHP.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - FirePHP\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:50+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:14+0000\n"
 "Language-Team: Simplified Chinese <http://translatewiki.net/wiki/Portal:zh-"
 "hans>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:01+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:23+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-firephp\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: FirePHPPlugin.php:68
 msgid "The FirePHP plugin writes StatusNet's log output to FirePHP."
 msgstr "FirePHP 插件将 StatusNet 的日志输出到 FirePHP。"
diff --git a/plugins/FollowEveryone/locale/FollowEveryone.pot b/plugins/FollowEveryone/locale/FollowEveryone.pot
index 8c28a9a81d..bf9bee1845 100644
--- a/plugins/FollowEveryone/locale/FollowEveryone.pot
+++ b/plugins/FollowEveryone/locale/FollowEveryone.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/FollowEveryone/locale/de/LC_MESSAGES/FollowEveryone.po b/plugins/FollowEveryone/locale/de/LC_MESSAGES/FollowEveryone.po
index 748218dc88..6f19aeeddd 100644
--- a/plugins/FollowEveryone/locale/de/LC_MESSAGES/FollowEveryone.po
+++ b/plugins/FollowEveryone/locale/de/LC_MESSAGES/FollowEveryone.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - FollowEveryone\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:50+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:14+0000\n"
 "Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:01+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:46+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-followeveryone\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: FollowEveryonePlugin.php:203
 msgid "New users follow everyone at registration and are followed in return."
 msgstr ""
 "Neue Benutzer folgen jedem nach der Registrierung und werden im Gegenzug "
diff --git a/plugins/FollowEveryone/locale/fr/LC_MESSAGES/FollowEveryone.po b/plugins/FollowEveryone/locale/fr/LC_MESSAGES/FollowEveryone.po
index be1ed94220..310e193906 100644
--- a/plugins/FollowEveryone/locale/fr/LC_MESSAGES/FollowEveryone.po
+++ b/plugins/FollowEveryone/locale/fr/LC_MESSAGES/FollowEveryone.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - FollowEveryone\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:50+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:14+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:01+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:46+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-followeveryone\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: FollowEveryonePlugin.php:203
 msgid "New users follow everyone at registration and are followed in return."
 msgstr ""
 "Les nouveaux utilisateurs suivent tout le monde lors de l’inscription et "
diff --git a/plugins/FollowEveryone/locale/he/LC_MESSAGES/FollowEveryone.po b/plugins/FollowEveryone/locale/he/LC_MESSAGES/FollowEveryone.po
index 341e89921c..e0d1ecd013 100644
--- a/plugins/FollowEveryone/locale/he/LC_MESSAGES/FollowEveryone.po
+++ b/plugins/FollowEveryone/locale/he/LC_MESSAGES/FollowEveryone.po
@@ -9,18 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - FollowEveryone\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:50+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:14+0000\n"
 "Language-Team: Hebrew <http://translatewiki.net/wiki/Portal:he>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:01+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:46+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-plugin-followeveryone\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: FollowEveryonePlugin.php:203
 msgid "New users follow everyone at registration and are followed in return."
 msgstr "משתמשים חדשים עוקבים אחר כולם בעת הרישום ובתמורה עוקבים אחריהם."
diff --git a/plugins/FollowEveryone/locale/ia/LC_MESSAGES/FollowEveryone.po b/plugins/FollowEveryone/locale/ia/LC_MESSAGES/FollowEveryone.po
index 5125aecfb3..d4618b4083 100644
--- a/plugins/FollowEveryone/locale/ia/LC_MESSAGES/FollowEveryone.po
+++ b/plugins/FollowEveryone/locale/ia/LC_MESSAGES/FollowEveryone.po
@@ -9,18 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - FollowEveryone\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:50+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:14+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:01+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:46+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-followeveryone\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: FollowEveryonePlugin.php:203
 msgid "New users follow everyone at registration and are followed in return."
 msgstr "Nove usatores seque omnes al inscription e es sequite per omnes."
diff --git a/plugins/FollowEveryone/locale/mk/LC_MESSAGES/FollowEveryone.po b/plugins/FollowEveryone/locale/mk/LC_MESSAGES/FollowEveryone.po
index fc145c607b..7e4890a5c5 100644
--- a/plugins/FollowEveryone/locale/mk/LC_MESSAGES/FollowEveryone.po
+++ b/plugins/FollowEveryone/locale/mk/LC_MESSAGES/FollowEveryone.po
@@ -9,18 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - FollowEveryone\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:50+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:14+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:01+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:46+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-followeveryone\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
 
-#: FollowEveryonePlugin.php:203
 msgid "New users follow everyone at registration and are followed in return."
 msgstr "Новите корисници следат секого при регистрација и сите ги следат нив."
diff --git a/plugins/FollowEveryone/locale/nl/LC_MESSAGES/FollowEveryone.po b/plugins/FollowEveryone/locale/nl/LC_MESSAGES/FollowEveryone.po
index 07c1750dfb..f6ce21737a 100644
--- a/plugins/FollowEveryone/locale/nl/LC_MESSAGES/FollowEveryone.po
+++ b/plugins/FollowEveryone/locale/nl/LC_MESSAGES/FollowEveryone.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - FollowEveryone\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:50+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:14+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:01+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:46+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-followeveryone\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: FollowEveryonePlugin.php:203
 msgid "New users follow everyone at registration and are followed in return."
 msgstr ""
 "Nieuwe gebruikers volgen iedereen bij inschrijving en worden door iedereen "
diff --git a/plugins/FollowEveryone/locale/pt/LC_MESSAGES/FollowEveryone.po b/plugins/FollowEveryone/locale/pt/LC_MESSAGES/FollowEveryone.po
index 75069b07bf..a9f82122e3 100644
--- a/plugins/FollowEveryone/locale/pt/LC_MESSAGES/FollowEveryone.po
+++ b/plugins/FollowEveryone/locale/pt/LC_MESSAGES/FollowEveryone.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - FollowEveryone\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 15:58+0000\n"
-"PO-Revision-Date: 2011-03-03 16:01:58+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:14+0000\n"
 "Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:24:16+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:46+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-plugin-followeveryone\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: FollowEveryonePlugin.php:203
 msgid "New users follow everyone at registration and are followed in return."
 msgstr ""
 "Novos utilizadores seguem toda a gente no momento do registo e são seguidos "
diff --git a/plugins/FollowEveryone/locale/ru/LC_MESSAGES/FollowEveryone.po b/plugins/FollowEveryone/locale/ru/LC_MESSAGES/FollowEveryone.po
index d41661c045..b41360da0e 100644
--- a/plugins/FollowEveryone/locale/ru/LC_MESSAGES/FollowEveryone.po
+++ b/plugins/FollowEveryone/locale/ru/LC_MESSAGES/FollowEveryone.po
@@ -9,20 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - FollowEveryone\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:50+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:14+0000\n"
 "Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:01+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:46+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-followeveryone\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: FollowEveryonePlugin.php:203
 msgid "New users follow everyone at registration and are followed in return."
 msgstr ""
 "Новые пользователи следят за всеми при регистрации и получают обратное "
diff --git a/plugins/FollowEveryone/locale/uk/LC_MESSAGES/FollowEveryone.po b/plugins/FollowEveryone/locale/uk/LC_MESSAGES/FollowEveryone.po
index 251eac4393..e6a51d38e4 100644
--- a/plugins/FollowEveryone/locale/uk/LC_MESSAGES/FollowEveryone.po
+++ b/plugins/FollowEveryone/locale/uk/LC_MESSAGES/FollowEveryone.po
@@ -9,20 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - FollowEveryone\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:50+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:14+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:01+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:46+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-followeveryone\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: FollowEveryonePlugin.php:203
 msgid "New users follow everyone at registration and are followed in return."
 msgstr ""
 "Нові користувачі автоматично підписуються до всіх після реєстрації, а всі "
diff --git a/plugins/ForceGroup/locale/ForceGroup.pot b/plugins/ForceGroup/locale/ForceGroup.pot
index fcf34621c4..3ccaa31fad 100644
--- a/plugins/ForceGroup/locale/ForceGroup.pot
+++ b/plugins/ForceGroup/locale/ForceGroup.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/ForceGroup/locale/br/LC_MESSAGES/ForceGroup.po b/plugins/ForceGroup/locale/br/LC_MESSAGES/ForceGroup.po
index acc281006e..80f83a5135 100644
--- a/plugins/ForceGroup/locale/br/LC_MESSAGES/ForceGroup.po
+++ b/plugins/ForceGroup/locale/br/LC_MESSAGES/ForceGroup.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ForceGroup\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:50+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:15+0000\n"
 "Language-Team: Breton <http://translatewiki.net/wiki/Portal:br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:16+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:25+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-forcegroup\n"
@@ -23,13 +23,11 @@ msgstr ""
 
 #. TRANS: Server exception.
 #. TRANS: %1$s is a user nickname, %2$s is a group nickname.
-#: ForceGroupPlugin.php:78
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "Dibosupl eo stagañ an implijer %1$s d'ar strollad %2$s."
 
 #. TRANS: Plugin description.
-#: ForceGroupPlugin.php:104
 msgid ""
 "Allows forced group memberships and forces all notices to appear in groups "
 "that users were forced in."
diff --git a/plugins/ForceGroup/locale/de/LC_MESSAGES/ForceGroup.po b/plugins/ForceGroup/locale/de/LC_MESSAGES/ForceGroup.po
index 19a322d2e1..cf6f65cfc9 100644
--- a/plugins/ForceGroup/locale/de/LC_MESSAGES/ForceGroup.po
+++ b/plugins/ForceGroup/locale/de/LC_MESSAGES/ForceGroup.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ForceGroup\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:50+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:15+0000\n"
 "Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:16+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:25+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-forcegroup\n"
@@ -23,13 +23,11 @@ msgstr ""
 
 #. TRANS: Server exception.
 #. TRANS: %1$s is a user nickname, %2$s is a group nickname.
-#: ForceGroupPlugin.php:78
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "Konnte Benutzer %1$s nicht der Gruppe %2$s hinzufügen."
 
 #. TRANS: Plugin description.
-#: ForceGroupPlugin.php:104
 msgid ""
 "Allows forced group memberships and forces all notices to appear in groups "
 "that users were forced in."
diff --git a/plugins/ForceGroup/locale/es/LC_MESSAGES/ForceGroup.po b/plugins/ForceGroup/locale/es/LC_MESSAGES/ForceGroup.po
index 650934976f..611e62a686 100644
--- a/plugins/ForceGroup/locale/es/LC_MESSAGES/ForceGroup.po
+++ b/plugins/ForceGroup/locale/es/LC_MESSAGES/ForceGroup.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ForceGroup\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:50+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:15+0000\n"
 "Language-Team: Spanish <http://translatewiki.net/wiki/Portal:es>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:16+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:25+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-forcegroup\n"
@@ -23,13 +23,11 @@ msgstr ""
 
 #. TRANS: Server exception.
 #. TRANS: %1$s is a user nickname, %2$s is a group nickname.
-#: ForceGroupPlugin.php:78
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "No se pudo incluir al usuario %1$s en el grupo %2$s."
 
 #. TRANS: Plugin description.
-#: ForceGroupPlugin.php:104
 msgid ""
 "Allows forced group memberships and forces all notices to appear in groups "
 "that users were forced in."
diff --git a/plugins/ForceGroup/locale/fr/LC_MESSAGES/ForceGroup.po b/plugins/ForceGroup/locale/fr/LC_MESSAGES/ForceGroup.po
index cf71723e1d..80886d554f 100644
--- a/plugins/ForceGroup/locale/fr/LC_MESSAGES/ForceGroup.po
+++ b/plugins/ForceGroup/locale/fr/LC_MESSAGES/ForceGroup.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ForceGroup\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:51+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:15+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:16+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:25+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-forcegroup\n"
@@ -23,13 +23,11 @@ msgstr ""
 
 #. TRANS: Server exception.
 #. TRANS: %1$s is a user nickname, %2$s is a group nickname.
-#: ForceGroupPlugin.php:78
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "Impossible d’inscrire l’utilisateur %1$s au groupe %2$s."
 
 #. TRANS: Plugin description.
-#: ForceGroupPlugin.php:104
 msgid ""
 "Allows forced group memberships and forces all notices to appear in groups "
 "that users were forced in."
diff --git a/plugins/ForceGroup/locale/he/LC_MESSAGES/ForceGroup.po b/plugins/ForceGroup/locale/he/LC_MESSAGES/ForceGroup.po
index 3e89e54a97..995a19c1e1 100644
--- a/plugins/ForceGroup/locale/he/LC_MESSAGES/ForceGroup.po
+++ b/plugins/ForceGroup/locale/he/LC_MESSAGES/ForceGroup.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ForceGroup\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:51+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:15+0000\n"
 "Language-Team: Hebrew <http://translatewiki.net/wiki/Portal:he>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:16+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:25+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-plugin-forcegroup\n"
@@ -23,13 +23,11 @@ msgstr ""
 
 #. TRANS: Server exception.
 #. TRANS: %1$s is a user nickname, %2$s is a group nickname.
-#: ForceGroupPlugin.php:78
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "לא ניתן לצרף את המשתמש %1$s לקבוצה %2$s."
 
 #. TRANS: Plugin description.
-#: ForceGroupPlugin.php:104
 msgid ""
 "Allows forced group memberships and forces all notices to appear in groups "
 "that users were forced in."
diff --git a/plugins/ForceGroup/locale/ia/LC_MESSAGES/ForceGroup.po b/plugins/ForceGroup/locale/ia/LC_MESSAGES/ForceGroup.po
index ea61589d89..245b496fed 100644
--- a/plugins/ForceGroup/locale/ia/LC_MESSAGES/ForceGroup.po
+++ b/plugins/ForceGroup/locale/ia/LC_MESSAGES/ForceGroup.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ForceGroup\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:51+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:15+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:16+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:25+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-forcegroup\n"
@@ -23,13 +23,11 @@ msgstr ""
 
 #. TRANS: Server exception.
 #. TRANS: %1$s is a user nickname, %2$s is a group nickname.
-#: ForceGroupPlugin.php:78
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "Non poteva inscriber le usator %1$s in le gruppo %2$s."
 
 #. TRANS: Plugin description.
-#: ForceGroupPlugin.php:104
 msgid ""
 "Allows forced group memberships and forces all notices to appear in groups "
 "that users were forced in."
diff --git a/plugins/ForceGroup/locale/id/LC_MESSAGES/ForceGroup.po b/plugins/ForceGroup/locale/id/LC_MESSAGES/ForceGroup.po
index 569c21ca45..bc2b853d6c 100644
--- a/plugins/ForceGroup/locale/id/LC_MESSAGES/ForceGroup.po
+++ b/plugins/ForceGroup/locale/id/LC_MESSAGES/ForceGroup.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ForceGroup\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:51+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:15+0000\n"
 "Language-Team: Indonesian <http://translatewiki.net/wiki/Portal:id>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:16+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:25+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: id\n"
 "X-Message-Group: #out-statusnet-plugin-forcegroup\n"
@@ -23,13 +23,11 @@ msgstr ""
 
 #. TRANS: Server exception.
 #. TRANS: %1$s is a user nickname, %2$s is a group nickname.
-#: ForceGroupPlugin.php:78
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "Tidak dapat menggabungkan pengguna %1$s ke grup %2$s."
 
 #. TRANS: Plugin description.
-#: ForceGroupPlugin.php:104
 msgid ""
 "Allows forced group memberships and forces all notices to appear in groups "
 "that users were forced in."
diff --git a/plugins/ForceGroup/locale/mk/LC_MESSAGES/ForceGroup.po b/plugins/ForceGroup/locale/mk/LC_MESSAGES/ForceGroup.po
index 4225079250..7b94a424fc 100644
--- a/plugins/ForceGroup/locale/mk/LC_MESSAGES/ForceGroup.po
+++ b/plugins/ForceGroup/locale/mk/LC_MESSAGES/ForceGroup.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ForceGroup\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:51+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:15+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:16+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:25+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-forcegroup\n"
@@ -23,13 +23,11 @@ msgstr ""
 
 #. TRANS: Server exception.
 #. TRANS: %1$s is a user nickname, %2$s is a group nickname.
-#: ForceGroupPlugin.php:78
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "Не можев да го зачленам корисникот %1$s во групата %2$s."
 
 #. TRANS: Plugin description.
-#: ForceGroupPlugin.php:104
 msgid ""
 "Allows forced group memberships and forces all notices to appear in groups "
 "that users were forced in."
diff --git a/plugins/ForceGroup/locale/nl/LC_MESSAGES/ForceGroup.po b/plugins/ForceGroup/locale/nl/LC_MESSAGES/ForceGroup.po
index 9de4a3844f..ef3640f1e8 100644
--- a/plugins/ForceGroup/locale/nl/LC_MESSAGES/ForceGroup.po
+++ b/plugins/ForceGroup/locale/nl/LC_MESSAGES/ForceGroup.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ForceGroup\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:51+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:15+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:16+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:25+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-forcegroup\n"
@@ -23,13 +23,11 @@ msgstr ""
 
 #. TRANS: Server exception.
 #. TRANS: %1$s is a user nickname, %2$s is a group nickname.
-#: ForceGroupPlugin.php:78
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "Het was niet mogelijk gebruiker %1$s toe te voegen aan de groep %2$s."
 
 #. TRANS: Plugin description.
-#: ForceGroupPlugin.php:104
 msgid ""
 "Allows forced group memberships and forces all notices to appear in groups "
 "that users were forced in."
diff --git a/plugins/ForceGroup/locale/te/LC_MESSAGES/ForceGroup.po b/plugins/ForceGroup/locale/te/LC_MESSAGES/ForceGroup.po
index 4f1281b350..49c6c333ef 100644
--- a/plugins/ForceGroup/locale/te/LC_MESSAGES/ForceGroup.po
+++ b/plugins/ForceGroup/locale/te/LC_MESSAGES/ForceGroup.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ForceGroup\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:51+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:15+0000\n"
 "Language-Team: Telugu <http://translatewiki.net/wiki/Portal:te>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:16+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:25+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: te\n"
 "X-Message-Group: #out-statusnet-plugin-forcegroup\n"
@@ -23,13 +23,11 @@ msgstr ""
 
 #. TRANS: Server exception.
 #. TRANS: %1$s is a user nickname, %2$s is a group nickname.
-#: ForceGroupPlugin.php:78
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "వాడుకరి %1$sని %2$s గుంపులో చేర్చలేకపోయాం."
 
 #. TRANS: Plugin description.
-#: ForceGroupPlugin.php:104
 msgid ""
 "Allows forced group memberships and forces all notices to appear in groups "
 "that users were forced in."
diff --git a/plugins/ForceGroup/locale/tl/LC_MESSAGES/ForceGroup.po b/plugins/ForceGroup/locale/tl/LC_MESSAGES/ForceGroup.po
index 16baff766c..4fb1d5ea06 100644
--- a/plugins/ForceGroup/locale/tl/LC_MESSAGES/ForceGroup.po
+++ b/plugins/ForceGroup/locale/tl/LC_MESSAGES/ForceGroup.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ForceGroup\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:51+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:15+0000\n"
 "Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:16+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:25+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-forcegroup\n"
@@ -23,13 +23,11 @@ msgstr ""
 
 #. TRANS: Server exception.
 #. TRANS: %1$s is a user nickname, %2$s is a group nickname.
-#: ForceGroupPlugin.php:78
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "Hindi maisama ang tagagamit na %1$s sa pangkat na %2$s."
 
 #. TRANS: Plugin description.
-#: ForceGroupPlugin.php:104
 msgid ""
 "Allows forced group memberships and forces all notices to appear in groups "
 "that users were forced in."
diff --git a/plugins/ForceGroup/locale/uk/LC_MESSAGES/ForceGroup.po b/plugins/ForceGroup/locale/uk/LC_MESSAGES/ForceGroup.po
index dfe52d296e..7dbcf14aca 100644
--- a/plugins/ForceGroup/locale/uk/LC_MESSAGES/ForceGroup.po
+++ b/plugins/ForceGroup/locale/uk/LC_MESSAGES/ForceGroup.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ForceGroup\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:51+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:15+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:16+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:25+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-forcegroup\n"
@@ -24,13 +24,11 @@ msgstr ""
 
 #. TRANS: Server exception.
 #. TRANS: %1$s is a user nickname, %2$s is a group nickname.
-#: ForceGroupPlugin.php:78
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "Не вдалось долучити користувача %1$s до спільноти %2$s."
 
 #. TRANS: Plugin description.
-#: ForceGroupPlugin.php:104
 msgid ""
 "Allows forced group memberships and forces all notices to appear in groups "
 "that users were forced in."
diff --git a/plugins/GeoURL/locale/GeoURL.pot b/plugins/GeoURL/locale/GeoURL.pot
index 527de4471c..5cf3a971be 100644
--- a/plugins/GeoURL/locale/GeoURL.pot
+++ b/plugins/GeoURL/locale/GeoURL.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/GeoURL/locale/ca/LC_MESSAGES/GeoURL.po b/plugins/GeoURL/locale/ca/LC_MESSAGES/GeoURL.po
index 16b412d58e..f745941abf 100644
--- a/plugins/GeoURL/locale/ca/LC_MESSAGES/GeoURL.po
+++ b/plugins/GeoURL/locale/ca/LC_MESSAGES/GeoURL.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GeoURL\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:52+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:17+0000\n"
 "Language-Team: Catalan <http://translatewiki.net/wiki/Portal:ca>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:01+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:27+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ca\n"
 "X-Message-Group: #out-statusnet-plugin-geourl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: GeoURLPlugin.php:124
 msgid ""
 "Ping <a href=\"http://geourl.org/\">GeoURL</a> when new geolocation-enhanced "
 "notices are posted."
diff --git a/plugins/GeoURL/locale/de/LC_MESSAGES/GeoURL.po b/plugins/GeoURL/locale/de/LC_MESSAGES/GeoURL.po
index 5847def632..76c19044e4 100644
--- a/plugins/GeoURL/locale/de/LC_MESSAGES/GeoURL.po
+++ b/plugins/GeoURL/locale/de/LC_MESSAGES/GeoURL.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GeoURL\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:52+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:17+0000\n"
 "Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:01+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:27+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-geourl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: GeoURLPlugin.php:124
 msgid ""
 "Ping <a href=\"http://geourl.org/\">GeoURL</a> when new geolocation-enhanced "
 "notices are posted."
diff --git a/plugins/GeoURL/locale/eo/LC_MESSAGES/GeoURL.po b/plugins/GeoURL/locale/eo/LC_MESSAGES/GeoURL.po
index 6fb0e6eb60..ced9ded842 100644
--- a/plugins/GeoURL/locale/eo/LC_MESSAGES/GeoURL.po
+++ b/plugins/GeoURL/locale/eo/LC_MESSAGES/GeoURL.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GeoURL\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:52+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:17+0000\n"
 "Language-Team: Esperanto <http://translatewiki.net/wiki/Portal:eo>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:01+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:27+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: eo\n"
 "X-Message-Group: #out-statusnet-plugin-geourl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: GeoURLPlugin.php:124
 msgid ""
 "Ping <a href=\"http://geourl.org/\">GeoURL</a> when new geolocation-enhanced "
 "notices are posted."
diff --git a/plugins/GeoURL/locale/es/LC_MESSAGES/GeoURL.po b/plugins/GeoURL/locale/es/LC_MESSAGES/GeoURL.po
index a6f630d339..959c61e47a 100644
--- a/plugins/GeoURL/locale/es/LC_MESSAGES/GeoURL.po
+++ b/plugins/GeoURL/locale/es/LC_MESSAGES/GeoURL.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GeoURL\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:52+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:17+0000\n"
 "Language-Team: Spanish <http://translatewiki.net/wiki/Portal:es>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:01+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:27+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-geourl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: GeoURLPlugin.php:124
 msgid ""
 "Ping <a href=\"http://geourl.org/\">GeoURL</a> when new geolocation-enhanced "
 "notices are posted."
diff --git a/plugins/GeoURL/locale/fr/LC_MESSAGES/GeoURL.po b/plugins/GeoURL/locale/fr/LC_MESSAGES/GeoURL.po
index eaa0abc460..59c7beec6e 100644
--- a/plugins/GeoURL/locale/fr/LC_MESSAGES/GeoURL.po
+++ b/plugins/GeoURL/locale/fr/LC_MESSAGES/GeoURL.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GeoURL\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:52+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:17+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:01+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:27+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-geourl\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: GeoURLPlugin.php:124
 msgid ""
 "Ping <a href=\"http://geourl.org/\">GeoURL</a> when new geolocation-enhanced "
 "notices are posted."
diff --git a/plugins/GeoURL/locale/he/LC_MESSAGES/GeoURL.po b/plugins/GeoURL/locale/he/LC_MESSAGES/GeoURL.po
index b0bb3acfa4..f977f11558 100644
--- a/plugins/GeoURL/locale/he/LC_MESSAGES/GeoURL.po
+++ b/plugins/GeoURL/locale/he/LC_MESSAGES/GeoURL.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GeoURL\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:52+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:17+0000\n"
 "Language-Team: Hebrew <http://translatewiki.net/wiki/Portal:he>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:01+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:27+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-plugin-geourl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: GeoURLPlugin.php:124
 msgid ""
 "Ping <a href=\"http://geourl.org/\">GeoURL</a> when new geolocation-enhanced "
 "notices are posted."
diff --git a/plugins/GeoURL/locale/ia/LC_MESSAGES/GeoURL.po b/plugins/GeoURL/locale/ia/LC_MESSAGES/GeoURL.po
index 57a904ab2b..2ac968886b 100644
--- a/plugins/GeoURL/locale/ia/LC_MESSAGES/GeoURL.po
+++ b/plugins/GeoURL/locale/ia/LC_MESSAGES/GeoURL.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GeoURL\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:52+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:17+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:01+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:27+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-geourl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: GeoURLPlugin.php:124
 msgid ""
 "Ping <a href=\"http://geourl.org/\">GeoURL</a> when new geolocation-enhanced "
 "notices are posted."
diff --git a/plugins/GeoURL/locale/id/LC_MESSAGES/GeoURL.po b/plugins/GeoURL/locale/id/LC_MESSAGES/GeoURL.po
index 69df8b8087..8a32015150 100644
--- a/plugins/GeoURL/locale/id/LC_MESSAGES/GeoURL.po
+++ b/plugins/GeoURL/locale/id/LC_MESSAGES/GeoURL.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GeoURL\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:52+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:17+0000\n"
 "Language-Team: Indonesian <http://translatewiki.net/wiki/Portal:id>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:01+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:27+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: id\n"
 "X-Message-Group: #out-statusnet-plugin-geourl\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: GeoURLPlugin.php:124
 msgid ""
 "Ping <a href=\"http://geourl.org/\">GeoURL</a> when new geolocation-enhanced "
 "notices are posted."
diff --git a/plugins/GeoURL/locale/mk/LC_MESSAGES/GeoURL.po b/plugins/GeoURL/locale/mk/LC_MESSAGES/GeoURL.po
index 006471bac1..bb01d0acf0 100644
--- a/plugins/GeoURL/locale/mk/LC_MESSAGES/GeoURL.po
+++ b/plugins/GeoURL/locale/mk/LC_MESSAGES/GeoURL.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GeoURL\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:52+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:17+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:01+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:27+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-geourl\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
 
-#: GeoURLPlugin.php:124
 msgid ""
 "Ping <a href=\"http://geourl.org/\">GeoURL</a> when new geolocation-enhanced "
 "notices are posted."
diff --git a/plugins/GeoURL/locale/nb/LC_MESSAGES/GeoURL.po b/plugins/GeoURL/locale/nb/LC_MESSAGES/GeoURL.po
index 1a1f474390..a8b1e64bc9 100644
--- a/plugins/GeoURL/locale/nb/LC_MESSAGES/GeoURL.po
+++ b/plugins/GeoURL/locale/nb/LC_MESSAGES/GeoURL.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GeoURL\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:52+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:17+0000\n"
 "Language-Team: Norwegian (bokmål)‬ <http://translatewiki.net/wiki/Portal:no>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:01+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:27+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: #out-statusnet-plugin-geourl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: GeoURLPlugin.php:124
 msgid ""
 "Ping <a href=\"http://geourl.org/\">GeoURL</a> when new geolocation-enhanced "
 "notices are posted."
diff --git a/plugins/GeoURL/locale/nl/LC_MESSAGES/GeoURL.po b/plugins/GeoURL/locale/nl/LC_MESSAGES/GeoURL.po
index 02f4779761..3dc8023785 100644
--- a/plugins/GeoURL/locale/nl/LC_MESSAGES/GeoURL.po
+++ b/plugins/GeoURL/locale/nl/LC_MESSAGES/GeoURL.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GeoURL\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:52+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:17+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:01+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:27+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-geourl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: GeoURLPlugin.php:124
 msgid ""
 "Ping <a href=\"http://geourl.org/\">GeoURL</a> when new geolocation-enhanced "
 "notices are posted."
diff --git a/plugins/GeoURL/locale/pl/LC_MESSAGES/GeoURL.po b/plugins/GeoURL/locale/pl/LC_MESSAGES/GeoURL.po
index e05a9961be..5e0655e72b 100644
--- a/plugins/GeoURL/locale/pl/LC_MESSAGES/GeoURL.po
+++ b/plugins/GeoURL/locale/pl/LC_MESSAGES/GeoURL.po
@@ -9,20 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GeoURL\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:52+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:17+0000\n"
 "Language-Team: Polish <http://translatewiki.net/wiki/Portal:pl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:01+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:27+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pl\n"
 "X-Message-Group: #out-statusnet-plugin-geourl\n"
 "Plural-Forms: nplurals=3; plural=(n == 1) ? 0 : ( (n%10 >= 2 && n%10 <= 4 && "
 "(n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: GeoURLPlugin.php:124
 msgid ""
 "Ping <a href=\"http://geourl.org/\">GeoURL</a> when new geolocation-enhanced "
 "notices are posted."
diff --git a/plugins/GeoURL/locale/pt/LC_MESSAGES/GeoURL.po b/plugins/GeoURL/locale/pt/LC_MESSAGES/GeoURL.po
index f5bef19e91..b90b9f7769 100644
--- a/plugins/GeoURL/locale/pt/LC_MESSAGES/GeoURL.po
+++ b/plugins/GeoURL/locale/pt/LC_MESSAGES/GeoURL.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GeoURL\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:52+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:17+0000\n"
 "Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:01+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:27+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-plugin-geourl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: GeoURLPlugin.php:124
 msgid ""
 "Ping <a href=\"http://geourl.org/\">GeoURL</a> when new geolocation-enhanced "
 "notices are posted."
diff --git a/plugins/GeoURL/locale/ru/LC_MESSAGES/GeoURL.po b/plugins/GeoURL/locale/ru/LC_MESSAGES/GeoURL.po
index 00a9859aa2..30e591f7bf 100644
--- a/plugins/GeoURL/locale/ru/LC_MESSAGES/GeoURL.po
+++ b/plugins/GeoURL/locale/ru/LC_MESSAGES/GeoURL.po
@@ -9,20 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GeoURL\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:52+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:17+0000\n"
 "Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:01+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:27+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-geourl\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: GeoURLPlugin.php:124
 msgid ""
 "Ping <a href=\"http://geourl.org/\">GeoURL</a> when new geolocation-enhanced "
 "notices are posted."
diff --git a/plugins/GeoURL/locale/tl/LC_MESSAGES/GeoURL.po b/plugins/GeoURL/locale/tl/LC_MESSAGES/GeoURL.po
index 7b6f0c59c6..78e82ece92 100644
--- a/plugins/GeoURL/locale/tl/LC_MESSAGES/GeoURL.po
+++ b/plugins/GeoURL/locale/tl/LC_MESSAGES/GeoURL.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GeoURL\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:52+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:18+0000\n"
 "Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:01+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:27+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-geourl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: GeoURLPlugin.php:124
 msgid ""
 "Ping <a href=\"http://geourl.org/\">GeoURL</a> when new geolocation-enhanced "
 "notices are posted."
diff --git a/plugins/GeoURL/locale/uk/LC_MESSAGES/GeoURL.po b/plugins/GeoURL/locale/uk/LC_MESSAGES/GeoURL.po
index 03637387ba..b99c39cd5b 100644
--- a/plugins/GeoURL/locale/uk/LC_MESSAGES/GeoURL.po
+++ b/plugins/GeoURL/locale/uk/LC_MESSAGES/GeoURL.po
@@ -9,20 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GeoURL\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:52+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:18+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:01+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:27+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-geourl\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: GeoURLPlugin.php:124
 msgid ""
 "Ping <a href=\"http://geourl.org/\">GeoURL</a> when new geolocation-enhanced "
 "notices are posted."
diff --git a/plugins/Geonames/locale/Geonames.pot b/plugins/Geonames/locale/Geonames.pot
index 6fd405e371..9d5f9fd4a0 100644
--- a/plugins/Geonames/locale/Geonames.pot
+++ b/plugins/Geonames/locale/Geonames.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/Geonames/locale/br/LC_MESSAGES/Geonames.po b/plugins/Geonames/locale/br/LC_MESSAGES/Geonames.po
index a583480dd0..5311899638 100644
--- a/plugins/Geonames/locale/br/LC_MESSAGES/Geonames.po
+++ b/plugins/Geonames/locale/br/LC_MESSAGES/Geonames.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Geonames\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:51+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:16+0000\n"
 "Language-Team: Breton <http://translatewiki.net/wiki/Portal:br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:01+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:26+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-geonames\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: GeonamesPlugin.php:491
 msgid ""
 "Uses <a href=\"http://geonames.org/\">Geonames</a> service to get human-"
 "readable names for locations based on user-provided lat/long pairs."
diff --git a/plugins/Geonames/locale/ca/LC_MESSAGES/Geonames.po b/plugins/Geonames/locale/ca/LC_MESSAGES/Geonames.po
index bc3a892dfc..7806ec5dc4 100644
--- a/plugins/Geonames/locale/ca/LC_MESSAGES/Geonames.po
+++ b/plugins/Geonames/locale/ca/LC_MESSAGES/Geonames.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Geonames\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:51+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:16+0000\n"
 "Language-Team: Catalan <http://translatewiki.net/wiki/Portal:ca>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:01+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:26+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ca\n"
 "X-Message-Group: #out-statusnet-plugin-geonames\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: GeonamesPlugin.php:491
 msgid ""
 "Uses <a href=\"http://geonames.org/\">Geonames</a> service to get human-"
 "readable names for locations based on user-provided lat/long pairs."
diff --git a/plugins/Geonames/locale/de/LC_MESSAGES/Geonames.po b/plugins/Geonames/locale/de/LC_MESSAGES/Geonames.po
index 9e9ef9d7bb..1afb416ca9 100644
--- a/plugins/Geonames/locale/de/LC_MESSAGES/Geonames.po
+++ b/plugins/Geonames/locale/de/LC_MESSAGES/Geonames.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Geonames\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:51+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:16+0000\n"
 "Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:01+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:26+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-geonames\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: GeonamesPlugin.php:491
 msgid ""
 "Uses <a href=\"http://geonames.org/\">Geonames</a> service to get human-"
 "readable names for locations based on user-provided lat/long pairs."
diff --git a/plugins/Geonames/locale/eo/LC_MESSAGES/Geonames.po b/plugins/Geonames/locale/eo/LC_MESSAGES/Geonames.po
index fadf641665..37f8d73168 100644
--- a/plugins/Geonames/locale/eo/LC_MESSAGES/Geonames.po
+++ b/plugins/Geonames/locale/eo/LC_MESSAGES/Geonames.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Geonames\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:51+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:16+0000\n"
 "Language-Team: Esperanto <http://translatewiki.net/wiki/Portal:eo>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:01+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:26+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: eo\n"
 "X-Message-Group: #out-statusnet-plugin-geonames\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: GeonamesPlugin.php:491
 msgid ""
 "Uses <a href=\"http://geonames.org/\">Geonames</a> service to get human-"
 "readable names for locations based on user-provided lat/long pairs."
diff --git a/plugins/Geonames/locale/es/LC_MESSAGES/Geonames.po b/plugins/Geonames/locale/es/LC_MESSAGES/Geonames.po
index e02aa7107e..9154d8decf 100644
--- a/plugins/Geonames/locale/es/LC_MESSAGES/Geonames.po
+++ b/plugins/Geonames/locale/es/LC_MESSAGES/Geonames.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Geonames\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:51+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:16+0000\n"
 "Language-Team: Spanish <http://translatewiki.net/wiki/Portal:es>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:01+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:26+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-geonames\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: GeonamesPlugin.php:491
 msgid ""
 "Uses <a href=\"http://geonames.org/\">Geonames</a> service to get human-"
 "readable names for locations based on user-provided lat/long pairs."
diff --git a/plugins/Geonames/locale/fr/LC_MESSAGES/Geonames.po b/plugins/Geonames/locale/fr/LC_MESSAGES/Geonames.po
index 4a0a9d13d6..0507642622 100644
--- a/plugins/Geonames/locale/fr/LC_MESSAGES/Geonames.po
+++ b/plugins/Geonames/locale/fr/LC_MESSAGES/Geonames.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Geonames\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:51+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:16+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:01+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:26+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-geonames\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: GeonamesPlugin.php:491
 msgid ""
 "Uses <a href=\"http://geonames.org/\">Geonames</a> service to get human-"
 "readable names for locations based on user-provided lat/long pairs."
diff --git a/plugins/Geonames/locale/he/LC_MESSAGES/Geonames.po b/plugins/Geonames/locale/he/LC_MESSAGES/Geonames.po
index 2969a6e0a3..747d256b38 100644
--- a/plugins/Geonames/locale/he/LC_MESSAGES/Geonames.po
+++ b/plugins/Geonames/locale/he/LC_MESSAGES/Geonames.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Geonames\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:51+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:16+0000\n"
 "Language-Team: Hebrew <http://translatewiki.net/wiki/Portal:he>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:01+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:26+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-plugin-geonames\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: GeonamesPlugin.php:491
 msgid ""
 "Uses <a href=\"http://geonames.org/\">Geonames</a> service to get human-"
 "readable names for locations based on user-provided lat/long pairs."
diff --git a/plugins/Geonames/locale/ia/LC_MESSAGES/Geonames.po b/plugins/Geonames/locale/ia/LC_MESSAGES/Geonames.po
index b9c44c41ad..bf10e6f583 100644
--- a/plugins/Geonames/locale/ia/LC_MESSAGES/Geonames.po
+++ b/plugins/Geonames/locale/ia/LC_MESSAGES/Geonames.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Geonames\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:51+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:16+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:01+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:26+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-geonames\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: GeonamesPlugin.php:491
 msgid ""
 "Uses <a href=\"http://geonames.org/\">Geonames</a> service to get human-"
 "readable names for locations based on user-provided lat/long pairs."
diff --git a/plugins/Geonames/locale/id/LC_MESSAGES/Geonames.po b/plugins/Geonames/locale/id/LC_MESSAGES/Geonames.po
index bda147a85d..8399ddceb9 100644
--- a/plugins/Geonames/locale/id/LC_MESSAGES/Geonames.po
+++ b/plugins/Geonames/locale/id/LC_MESSAGES/Geonames.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Geonames\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:51+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:16+0000\n"
 "Language-Team: Indonesian <http://translatewiki.net/wiki/Portal:id>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:01+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:26+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: id\n"
 "X-Message-Group: #out-statusnet-plugin-geonames\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: GeonamesPlugin.php:491
 msgid ""
 "Uses <a href=\"http://geonames.org/\">Geonames</a> service to get human-"
 "readable names for locations based on user-provided lat/long pairs."
diff --git a/plugins/Geonames/locale/mk/LC_MESSAGES/Geonames.po b/plugins/Geonames/locale/mk/LC_MESSAGES/Geonames.po
index 420637de02..56dfde966a 100644
--- a/plugins/Geonames/locale/mk/LC_MESSAGES/Geonames.po
+++ b/plugins/Geonames/locale/mk/LC_MESSAGES/Geonames.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Geonames\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:51+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:16+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:01+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:26+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-geonames\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
 
-#: GeonamesPlugin.php:491
 msgid ""
 "Uses <a href=\"http://geonames.org/\">Geonames</a> service to get human-"
 "readable names for locations based on user-provided lat/long pairs."
diff --git a/plugins/Geonames/locale/nb/LC_MESSAGES/Geonames.po b/plugins/Geonames/locale/nb/LC_MESSAGES/Geonames.po
index 145e502912..fe8dc29f3f 100644
--- a/plugins/Geonames/locale/nb/LC_MESSAGES/Geonames.po
+++ b/plugins/Geonames/locale/nb/LC_MESSAGES/Geonames.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Geonames\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:51+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:16+0000\n"
 "Language-Team: Norwegian (bokmål)‬ <http://translatewiki.net/wiki/Portal:no>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:01+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:26+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: #out-statusnet-plugin-geonames\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: GeonamesPlugin.php:491
 msgid ""
 "Uses <a href=\"http://geonames.org/\">Geonames</a> service to get human-"
 "readable names for locations based on user-provided lat/long pairs."
diff --git a/plugins/Geonames/locale/nl/LC_MESSAGES/Geonames.po b/plugins/Geonames/locale/nl/LC_MESSAGES/Geonames.po
index bbfe0835f4..0dc5c54b05 100644
--- a/plugins/Geonames/locale/nl/LC_MESSAGES/Geonames.po
+++ b/plugins/Geonames/locale/nl/LC_MESSAGES/Geonames.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Geonames\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:51+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:16+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:01+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:26+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-geonames\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: GeonamesPlugin.php:491
 msgid ""
 "Uses <a href=\"http://geonames.org/\">Geonames</a> service to get human-"
 "readable names for locations based on user-provided lat/long pairs."
diff --git a/plugins/Geonames/locale/pt/LC_MESSAGES/Geonames.po b/plugins/Geonames/locale/pt/LC_MESSAGES/Geonames.po
index 68b0d3f1e5..39bc528746 100644
--- a/plugins/Geonames/locale/pt/LC_MESSAGES/Geonames.po
+++ b/plugins/Geonames/locale/pt/LC_MESSAGES/Geonames.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Geonames\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:51+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:16+0000\n"
 "Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:01+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:26+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-plugin-geonames\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: GeonamesPlugin.php:491
 msgid ""
 "Uses <a href=\"http://geonames.org/\">Geonames</a> service to get human-"
 "readable names for locations based on user-provided lat/long pairs."
diff --git a/plugins/Geonames/locale/pt_BR/LC_MESSAGES/Geonames.po b/plugins/Geonames/locale/pt_BR/LC_MESSAGES/Geonames.po
index e15ce94497..dcc6c80183 100644
--- a/plugins/Geonames/locale/pt_BR/LC_MESSAGES/Geonames.po
+++ b/plugins/Geonames/locale/pt_BR/LC_MESSAGES/Geonames.po
@@ -9,20 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Geonames\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:51+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:16+0000\n"
 "Language-Team: Brazilian Portuguese <http://translatewiki.net/wiki/Portal:pt-"
 "br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:01+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:26+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt-br\n"
 "X-Message-Group: #out-statusnet-plugin-geonames\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: GeonamesPlugin.php:491
 msgid ""
 "Uses <a href=\"http://geonames.org/\">Geonames</a> service to get human-"
 "readable names for locations based on user-provided lat/long pairs."
diff --git a/plugins/Geonames/locale/ru/LC_MESSAGES/Geonames.po b/plugins/Geonames/locale/ru/LC_MESSAGES/Geonames.po
index 12c97ed9ff..ea8d137870 100644
--- a/plugins/Geonames/locale/ru/LC_MESSAGES/Geonames.po
+++ b/plugins/Geonames/locale/ru/LC_MESSAGES/Geonames.po
@@ -9,20 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Geonames\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:51+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:16+0000\n"
 "Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:01+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:26+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-geonames\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: GeonamesPlugin.php:491
 msgid ""
 "Uses <a href=\"http://geonames.org/\">Geonames</a> service to get human-"
 "readable names for locations based on user-provided lat/long pairs."
diff --git a/plugins/Geonames/locale/tl/LC_MESSAGES/Geonames.po b/plugins/Geonames/locale/tl/LC_MESSAGES/Geonames.po
index f8ecace8fb..6109332fee 100644
--- a/plugins/Geonames/locale/tl/LC_MESSAGES/Geonames.po
+++ b/plugins/Geonames/locale/tl/LC_MESSAGES/Geonames.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Geonames\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:52+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:17+0000\n"
 "Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:01+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:26+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-geonames\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: GeonamesPlugin.php:491
 msgid ""
 "Uses <a href=\"http://geonames.org/\">Geonames</a> service to get human-"
 "readable names for locations based on user-provided lat/long pairs."
diff --git a/plugins/Geonames/locale/uk/LC_MESSAGES/Geonames.po b/plugins/Geonames/locale/uk/LC_MESSAGES/Geonames.po
index 33b50a8ce4..25b25eb9ac 100644
--- a/plugins/Geonames/locale/uk/LC_MESSAGES/Geonames.po
+++ b/plugins/Geonames/locale/uk/LC_MESSAGES/Geonames.po
@@ -9,20 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Geonames\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:52+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:17+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:01+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:26+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-geonames\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: GeonamesPlugin.php:491
 msgid ""
 "Uses <a href=\"http://geonames.org/\">Geonames</a> service to get human-"
 "readable names for locations based on user-provided lat/long pairs."
diff --git a/plugins/Geonames/locale/zh_CN/LC_MESSAGES/Geonames.po b/plugins/Geonames/locale/zh_CN/LC_MESSAGES/Geonames.po
index 90d26c8d2b..fcaca407ef 100644
--- a/plugins/Geonames/locale/zh_CN/LC_MESSAGES/Geonames.po
+++ b/plugins/Geonames/locale/zh_CN/LC_MESSAGES/Geonames.po
@@ -9,20 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Geonames\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:52+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:17+0000\n"
 "Language-Team: Simplified Chinese <http://translatewiki.net/wiki/Portal:zh-"
 "hans>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:01+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:43:26+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-geonames\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: GeonamesPlugin.php:491
 msgid ""
 "Uses <a href=\"http://geonames.org/\">Geonames</a> service to get human-"
 "readable names for locations based on user-provided lat/long pairs."
diff --git a/plugins/GoogleAnalytics/locale/GoogleAnalytics.pot b/plugins/GoogleAnalytics/locale/GoogleAnalytics.pot
index 267fe7d63f..b6fcec977e 100644
--- a/plugins/GoogleAnalytics/locale/GoogleAnalytics.pot
+++ b/plugins/GoogleAnalytics/locale/GoogleAnalytics.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/GoogleAnalytics/locale/br/LC_MESSAGES/GoogleAnalytics.po b/plugins/GoogleAnalytics/locale/br/LC_MESSAGES/GoogleAnalytics.po
index 1ac45542fc..2e5734609b 100644
--- a/plugins/GoogleAnalytics/locale/br/LC_MESSAGES/GoogleAnalytics.po
+++ b/plugins/GoogleAnalytics/locale/br/LC_MESSAGES/GoogleAnalytics.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GoogleAnalytics\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:52+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:18+0000\n"
 "Language-Team: Breton <http://translatewiki.net/wiki/Portal:br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:02+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:09+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-googleanalytics\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: GoogleAnalyticsPlugin.php:80
 msgid ""
 "Use <a href=\"http://www.google.com/analytics/\">Google Analytics</a> to "
 "track web access."
diff --git a/plugins/GoogleAnalytics/locale/de/LC_MESSAGES/GoogleAnalytics.po b/plugins/GoogleAnalytics/locale/de/LC_MESSAGES/GoogleAnalytics.po
index a32b72345b..4aea06ac9f 100644
--- a/plugins/GoogleAnalytics/locale/de/LC_MESSAGES/GoogleAnalytics.po
+++ b/plugins/GoogleAnalytics/locale/de/LC_MESSAGES/GoogleAnalytics.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GoogleAnalytics\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:53+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:18+0000\n"
 "Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:02+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:09+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-googleanalytics\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: GoogleAnalyticsPlugin.php:80
 msgid ""
 "Use <a href=\"http://www.google.com/analytics/\">Google Analytics</a> to "
 "track web access."
diff --git a/plugins/GoogleAnalytics/locale/es/LC_MESSAGES/GoogleAnalytics.po b/plugins/GoogleAnalytics/locale/es/LC_MESSAGES/GoogleAnalytics.po
index 297a6b4e8e..e491b156e9 100644
--- a/plugins/GoogleAnalytics/locale/es/LC_MESSAGES/GoogleAnalytics.po
+++ b/plugins/GoogleAnalytics/locale/es/LC_MESSAGES/GoogleAnalytics.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GoogleAnalytics\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:53+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:18+0000\n"
 "Language-Team: Spanish <http://translatewiki.net/wiki/Portal:es>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:02+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:09+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-googleanalytics\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: GoogleAnalyticsPlugin.php:80
 msgid ""
 "Use <a href=\"http://www.google.com/analytics/\">Google Analytics</a> to "
 "track web access."
diff --git a/plugins/GoogleAnalytics/locale/fr/LC_MESSAGES/GoogleAnalytics.po b/plugins/GoogleAnalytics/locale/fr/LC_MESSAGES/GoogleAnalytics.po
index 79a14ff2f8..0134ab9a00 100644
--- a/plugins/GoogleAnalytics/locale/fr/LC_MESSAGES/GoogleAnalytics.po
+++ b/plugins/GoogleAnalytics/locale/fr/LC_MESSAGES/GoogleAnalytics.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GoogleAnalytics\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:53+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:18+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:02+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:09+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-googleanalytics\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: GoogleAnalyticsPlugin.php:80
 msgid ""
 "Use <a href=\"http://www.google.com/analytics/\">Google Analytics</a> to "
 "track web access."
diff --git a/plugins/GoogleAnalytics/locale/he/LC_MESSAGES/GoogleAnalytics.po b/plugins/GoogleAnalytics/locale/he/LC_MESSAGES/GoogleAnalytics.po
index e5d0886d5c..1334b2fb66 100644
--- a/plugins/GoogleAnalytics/locale/he/LC_MESSAGES/GoogleAnalytics.po
+++ b/plugins/GoogleAnalytics/locale/he/LC_MESSAGES/GoogleAnalytics.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GoogleAnalytics\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:53+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:18+0000\n"
 "Language-Team: Hebrew <http://translatewiki.net/wiki/Portal:he>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:02+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:09+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-plugin-googleanalytics\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: GoogleAnalyticsPlugin.php:80
 msgid ""
 "Use <a href=\"http://www.google.com/analytics/\">Google Analytics</a> to "
 "track web access."
diff --git a/plugins/GoogleAnalytics/locale/ia/LC_MESSAGES/GoogleAnalytics.po b/plugins/GoogleAnalytics/locale/ia/LC_MESSAGES/GoogleAnalytics.po
index ec46bf631b..9c92253f27 100644
--- a/plugins/GoogleAnalytics/locale/ia/LC_MESSAGES/GoogleAnalytics.po
+++ b/plugins/GoogleAnalytics/locale/ia/LC_MESSAGES/GoogleAnalytics.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GoogleAnalytics\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:53+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:18+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:02+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:09+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-googleanalytics\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: GoogleAnalyticsPlugin.php:80
 msgid ""
 "Use <a href=\"http://www.google.com/analytics/\">Google Analytics</a> to "
 "track web access."
diff --git a/plugins/GoogleAnalytics/locale/id/LC_MESSAGES/GoogleAnalytics.po b/plugins/GoogleAnalytics/locale/id/LC_MESSAGES/GoogleAnalytics.po
index 250f6d5a9a..5eaf3a7df8 100644
--- a/plugins/GoogleAnalytics/locale/id/LC_MESSAGES/GoogleAnalytics.po
+++ b/plugins/GoogleAnalytics/locale/id/LC_MESSAGES/GoogleAnalytics.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GoogleAnalytics\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:53+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:18+0000\n"
 "Language-Team: Indonesian <http://translatewiki.net/wiki/Portal:id>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:02+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:09+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: id\n"
 "X-Message-Group: #out-statusnet-plugin-googleanalytics\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: GoogleAnalyticsPlugin.php:80
 msgid ""
 "Use <a href=\"http://www.google.com/analytics/\">Google Analytics</a> to "
 "track web access."
diff --git a/plugins/GoogleAnalytics/locale/mk/LC_MESSAGES/GoogleAnalytics.po b/plugins/GoogleAnalytics/locale/mk/LC_MESSAGES/GoogleAnalytics.po
index 5407a79833..3a9859af7d 100644
--- a/plugins/GoogleAnalytics/locale/mk/LC_MESSAGES/GoogleAnalytics.po
+++ b/plugins/GoogleAnalytics/locale/mk/LC_MESSAGES/GoogleAnalytics.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GoogleAnalytics\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:53+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:18+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:02+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:09+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-googleanalytics\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
 
-#: GoogleAnalyticsPlugin.php:80
 msgid ""
 "Use <a href=\"http://www.google.com/analytics/\">Google Analytics</a> to "
 "track web access."
diff --git a/plugins/GoogleAnalytics/locale/nb/LC_MESSAGES/GoogleAnalytics.po b/plugins/GoogleAnalytics/locale/nb/LC_MESSAGES/GoogleAnalytics.po
index c1444769a3..cf3ae99d64 100644
--- a/plugins/GoogleAnalytics/locale/nb/LC_MESSAGES/GoogleAnalytics.po
+++ b/plugins/GoogleAnalytics/locale/nb/LC_MESSAGES/GoogleAnalytics.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GoogleAnalytics\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:53+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:18+0000\n"
 "Language-Team: Norwegian (bokmål)‬ <http://translatewiki.net/wiki/Portal:no>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:02+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:09+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: #out-statusnet-plugin-googleanalytics\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: GoogleAnalyticsPlugin.php:80
 msgid ""
 "Use <a href=\"http://www.google.com/analytics/\">Google Analytics</a> to "
 "track web access."
diff --git a/plugins/GoogleAnalytics/locale/nl/LC_MESSAGES/GoogleAnalytics.po b/plugins/GoogleAnalytics/locale/nl/LC_MESSAGES/GoogleAnalytics.po
index aa1606f4ab..3de3747c90 100644
--- a/plugins/GoogleAnalytics/locale/nl/LC_MESSAGES/GoogleAnalytics.po
+++ b/plugins/GoogleAnalytics/locale/nl/LC_MESSAGES/GoogleAnalytics.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GoogleAnalytics\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:53+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:18+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:02+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:09+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-googleanalytics\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: GoogleAnalyticsPlugin.php:80
 msgid ""
 "Use <a href=\"http://www.google.com/analytics/\">Google Analytics</a> to "
 "track web access."
diff --git a/plugins/GoogleAnalytics/locale/pt/LC_MESSAGES/GoogleAnalytics.po b/plugins/GoogleAnalytics/locale/pt/LC_MESSAGES/GoogleAnalytics.po
index 769f8c76bb..89defec5d2 100644
--- a/plugins/GoogleAnalytics/locale/pt/LC_MESSAGES/GoogleAnalytics.po
+++ b/plugins/GoogleAnalytics/locale/pt/LC_MESSAGES/GoogleAnalytics.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GoogleAnalytics\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:53+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:18+0000\n"
 "Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:02+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:09+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-plugin-googleanalytics\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: GoogleAnalyticsPlugin.php:80
 msgid ""
 "Use <a href=\"http://www.google.com/analytics/\">Google Analytics</a> to "
 "track web access."
diff --git a/plugins/GoogleAnalytics/locale/pt_BR/LC_MESSAGES/GoogleAnalytics.po b/plugins/GoogleAnalytics/locale/pt_BR/LC_MESSAGES/GoogleAnalytics.po
index 0b695033bf..6f98bdb571 100644
--- a/plugins/GoogleAnalytics/locale/pt_BR/LC_MESSAGES/GoogleAnalytics.po
+++ b/plugins/GoogleAnalytics/locale/pt_BR/LC_MESSAGES/GoogleAnalytics.po
@@ -9,20 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GoogleAnalytics\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:53+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:18+0000\n"
 "Language-Team: Brazilian Portuguese <http://translatewiki.net/wiki/Portal:pt-"
 "br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:02+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:09+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt-br\n"
 "X-Message-Group: #out-statusnet-plugin-googleanalytics\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: GoogleAnalyticsPlugin.php:80
 msgid ""
 "Use <a href=\"http://www.google.com/analytics/\">Google Analytics</a> to "
 "track web access."
diff --git a/plugins/GoogleAnalytics/locale/ru/LC_MESSAGES/GoogleAnalytics.po b/plugins/GoogleAnalytics/locale/ru/LC_MESSAGES/GoogleAnalytics.po
index c7917b462a..ab2d1ea1d3 100644
--- a/plugins/GoogleAnalytics/locale/ru/LC_MESSAGES/GoogleAnalytics.po
+++ b/plugins/GoogleAnalytics/locale/ru/LC_MESSAGES/GoogleAnalytics.po
@@ -9,20 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GoogleAnalytics\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:53+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:18+0000\n"
 "Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:02+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:09+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-googleanalytics\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: GoogleAnalyticsPlugin.php:80
 msgid ""
 "Use <a href=\"http://www.google.com/analytics/\">Google Analytics</a> to "
 "track web access."
diff --git a/plugins/GoogleAnalytics/locale/tl/LC_MESSAGES/GoogleAnalytics.po b/plugins/GoogleAnalytics/locale/tl/LC_MESSAGES/GoogleAnalytics.po
index 57c71164d6..de33f8168a 100644
--- a/plugins/GoogleAnalytics/locale/tl/LC_MESSAGES/GoogleAnalytics.po
+++ b/plugins/GoogleAnalytics/locale/tl/LC_MESSAGES/GoogleAnalytics.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GoogleAnalytics\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:53+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:18+0000\n"
 "Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:02+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:09+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-googleanalytics\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: GoogleAnalyticsPlugin.php:80
 msgid ""
 "Use <a href=\"http://www.google.com/analytics/\">Google Analytics</a> to "
 "track web access."
diff --git a/plugins/GoogleAnalytics/locale/uk/LC_MESSAGES/GoogleAnalytics.po b/plugins/GoogleAnalytics/locale/uk/LC_MESSAGES/GoogleAnalytics.po
index 00044f23f6..ede1a3cfe5 100644
--- a/plugins/GoogleAnalytics/locale/uk/LC_MESSAGES/GoogleAnalytics.po
+++ b/plugins/GoogleAnalytics/locale/uk/LC_MESSAGES/GoogleAnalytics.po
@@ -9,20 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GoogleAnalytics\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:53+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:19+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:02+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:09+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-googleanalytics\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: GoogleAnalyticsPlugin.php:80
 msgid ""
 "Use <a href=\"http://www.google.com/analytics/\">Google Analytics</a> to "
 "track web access."
diff --git a/plugins/GoogleAnalytics/locale/zh_CN/LC_MESSAGES/GoogleAnalytics.po b/plugins/GoogleAnalytics/locale/zh_CN/LC_MESSAGES/GoogleAnalytics.po
index 0b35abde72..8f2a4ae981 100644
--- a/plugins/GoogleAnalytics/locale/zh_CN/LC_MESSAGES/GoogleAnalytics.po
+++ b/plugins/GoogleAnalytics/locale/zh_CN/LC_MESSAGES/GoogleAnalytics.po
@@ -9,20 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GoogleAnalytics\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:53+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:19+0000\n"
 "Language-Team: Simplified Chinese <http://translatewiki.net/wiki/Portal:zh-"
 "hans>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:02+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:09+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-googleanalytics\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: GoogleAnalyticsPlugin.php:80
 msgid ""
 "Use <a href=\"http://www.google.com/analytics/\">Google Analytics</a> to "
 "track web access."
diff --git a/plugins/Gravatar/locale/Gravatar.pot b/plugins/Gravatar/locale/Gravatar.pot
index 2df7c645a3..1c7a5ef9ee 100644
--- a/plugins/Gravatar/locale/Gravatar.pot
+++ b/plugins/Gravatar/locale/Gravatar.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/Gravatar/locale/ca/LC_MESSAGES/Gravatar.po b/plugins/Gravatar/locale/ca/LC_MESSAGES/Gravatar.po
index f9a9250686..d159e3d89b 100644
--- a/plugins/Gravatar/locale/ca/LC_MESSAGES/Gravatar.po
+++ b/plugins/Gravatar/locale/ca/LC_MESSAGES/Gravatar.po
@@ -9,64 +9,52 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Gravatar\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-17 10:25+0000\n"
-"PO-Revision-Date: 2011-02-17 10:28:24+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:19+0000\n"
 "Language-Team: Catalan <http://translatewiki.net/wiki/Portal:ca>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:24:27+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r82325); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:10+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ca\n"
 "X-Message-Group: #out-statusnet-plugin-gravatar\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: GravatarPlugin.php:60
 msgid "Set Gravatar"
 msgstr "Defineix un Gravatar"
 
-#: GravatarPlugin.php:63
 msgid "If you want to use your Gravatar image, click \"Add\"."
 msgstr "Si voleu utilitzar la vostra imatge del Gravatar, feu clic a «Afegeix»."
 
-#: GravatarPlugin.php:68
 msgid "Add"
 msgstr "Afegeix"
 
-#: GravatarPlugin.php:78
 msgid "Remove Gravatar"
 msgstr "Suprimeix el Gravatar"
 
-#: GravatarPlugin.php:81
 msgid "If you want to remove your Gravatar image, click \"Remove\"."
 msgstr ""
 "Si voleu suprimir la vostra imatge del Gravatar, feu clic a «Suprimeix»."
 
-#: GravatarPlugin.php:86
 msgid "Remove"
 msgstr "Suprimeix"
 
-#: GravatarPlugin.php:91
 msgid "To use a Gravatar first enter in an email address."
 msgstr "Per fer servir un Gravatar, primer introduïu una adreça electrònica."
 
-#: GravatarPlugin.php:140
 msgid "You do not have an email address set in your profile."
 msgstr "No teniu una adreça electrònica definida en el vostre perfil."
 
-#: GravatarPlugin.php:158
 msgid "Failed to save Gravatar to the database."
 msgstr "No s'ha pogut desar el Gravatar a la base de dades."
 
-#: GravatarPlugin.php:162
 msgid "Gravatar added."
 msgstr "S'ha afegit el Gravatar."
 
-#: GravatarPlugin.php:180
 msgid "Gravatar removed."
 msgstr "S'ha suprimit el Gravatar."
 
-#: GravatarPlugin.php:200
 msgid ""
 "The Gravatar plugin allows users to use their <a href=\"http://www.gravatar."
 "com/\">Gravatar</a> with StatusNet."
diff --git a/plugins/Gravatar/locale/de/LC_MESSAGES/Gravatar.po b/plugins/Gravatar/locale/de/LC_MESSAGES/Gravatar.po
index 8de6cd1264..ddd202a73d 100644
--- a/plugins/Gravatar/locale/de/LC_MESSAGES/Gravatar.po
+++ b/plugins/Gravatar/locale/de/LC_MESSAGES/Gravatar.po
@@ -10,63 +10,51 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Gravatar\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:54+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:19+0000\n"
 "Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-15 11:03:48+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:10+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-gravatar\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: GravatarPlugin.php:60
 msgid "Set Gravatar"
 msgstr "Gravatar einstellen"
 
-#: GravatarPlugin.php:63
 msgid "If you want to use your Gravatar image, click \"Add\"."
 msgstr "Falls du dein Gravatar-Bild verwenden willst, klicke auf „Hinzufügen“."
 
-#: GravatarPlugin.php:68
 msgid "Add"
 msgstr "Hinzufügen"
 
-#: GravatarPlugin.php:78
 msgid "Remove Gravatar"
 msgstr "Gravatar löschen"
 
-#: GravatarPlugin.php:81
 msgid "If you want to remove your Gravatar image, click \"Remove\"."
 msgstr "Falls du dein Gravatar-Bild entfernen willst, klicke auf „Entfernen“."
 
-#: GravatarPlugin.php:86
 msgid "Remove"
 msgstr "Entfernen"
 
-#: GravatarPlugin.php:91
 msgid "To use a Gravatar first enter in an email address."
 msgstr "Um einen Gravatar zu verwenden, gib zunächst eine E-Mail-Adresse ein."
 
-#: GravatarPlugin.php:140
 msgid "You do not have an email address set in your profile."
 msgstr "Du hast keine E-Mail-Adresse in deinem Profil eingetragen."
 
-#: GravatarPlugin.php:158
 msgid "Failed to save Gravatar to the database."
 msgstr "Konnte Gravatar nicht in der Datenbank speichern."
 
-#: GravatarPlugin.php:162
 msgid "Gravatar added."
 msgstr "Gravatar hinzugefügt."
 
-#: GravatarPlugin.php:180
 msgid "Gravatar removed."
 msgstr "Gravatar entfernt."
 
-#: GravatarPlugin.php:200
 msgid ""
 "The Gravatar plugin allows users to use their <a href=\"http://www.gravatar."
 "com/\">Gravatar</a> with StatusNet."
diff --git a/plugins/Gravatar/locale/es/LC_MESSAGES/Gravatar.po b/plugins/Gravatar/locale/es/LC_MESSAGES/Gravatar.po
index ff320eef77..657b83108b 100644
--- a/plugins/Gravatar/locale/es/LC_MESSAGES/Gravatar.po
+++ b/plugins/Gravatar/locale/es/LC_MESSAGES/Gravatar.po
@@ -10,66 +10,54 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Gravatar\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:54+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:20+0000\n"
 "Language-Team: Spanish <http://translatewiki.net/wiki/Portal:es>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-15 11:03:48+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:10+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-gravatar\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: GravatarPlugin.php:60
 msgid "Set Gravatar"
 msgstr "Definir un Gravatar"
 
-#: GravatarPlugin.php:63
 msgid "If you want to use your Gravatar image, click \"Add\"."
 msgstr "Si deseas utilizar tu imagen Gravatar, haz clic en \"Agregar\""
 
-#: GravatarPlugin.php:68
 msgid "Add"
 msgstr "Añadir"
 
-#: GravatarPlugin.php:78
 msgid "Remove Gravatar"
 msgstr "Eliminar el Gravatar"
 
-#: GravatarPlugin.php:81
 msgid "If you want to remove your Gravatar image, click \"Remove\"."
 msgstr "Si desesa eliminar tu imagen de Gravatar, haz clic en \"Eliminar\"."
 
-#: GravatarPlugin.php:86
 msgid "Remove"
 msgstr "Borrar"
 
-#: GravatarPlugin.php:91
 msgid "To use a Gravatar first enter in an email address."
 msgstr ""
 "Para utilizar un Gravatar, primero introduce una dirección de correo "
 "electrónico."
 
-#: GravatarPlugin.php:140
 msgid "You do not have an email address set in your profile."
 msgstr ""
 "No tienes una dirección de correo electrónico establecida en tu perfil."
 
-#: GravatarPlugin.php:158
 msgid "Failed to save Gravatar to the database."
 msgstr "Error al guardar Gravatar en la base de datos."
 
-#: GravatarPlugin.php:162
 msgid "Gravatar added."
 msgstr "Gravatar agregado."
 
-#: GravatarPlugin.php:180
 msgid "Gravatar removed."
 msgstr "Gravatar eliminado."
 
-#: GravatarPlugin.php:200
 msgid ""
 "The Gravatar plugin allows users to use their <a href=\"http://www.gravatar."
 "com/\">Gravatar</a> with StatusNet."
diff --git a/plugins/Gravatar/locale/fr/LC_MESSAGES/Gravatar.po b/plugins/Gravatar/locale/fr/LC_MESSAGES/Gravatar.po
index a21c7c145d..605caeb3d1 100644
--- a/plugins/Gravatar/locale/fr/LC_MESSAGES/Gravatar.po
+++ b/plugins/Gravatar/locale/fr/LC_MESSAGES/Gravatar.po
@@ -9,66 +9,54 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Gravatar\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:54+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:20+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-15 11:03:48+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:10+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-gravatar\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: GravatarPlugin.php:60
 msgid "Set Gravatar"
 msgstr "Définir un Gravatar"
 
-#: GravatarPlugin.php:63
 msgid "If you want to use your Gravatar image, click \"Add\"."
 msgstr ""
 "Si vous souhaitez utiliser votre image Gravatar, cliquez sur « Ajouter »."
 
-#: GravatarPlugin.php:68
 msgid "Add"
 msgstr "Ajouter"
 
-#: GravatarPlugin.php:78
 msgid "Remove Gravatar"
 msgstr "Supprimer le Gravatar"
 
-#: GravatarPlugin.php:81
 msgid "If you want to remove your Gravatar image, click \"Remove\"."
 msgstr ""
 "Si vous souhaitez supprimer votre image Gravatar, cliquez sur « Supprimer »."
 
-#: GravatarPlugin.php:86
 msgid "Remove"
 msgstr "Enlever"
 
-#: GravatarPlugin.php:91
 msgid "To use a Gravatar first enter in an email address."
 msgstr ""
 "Pour utiliser un Gravatar, veuillez d’abord saisir une adresse courriel."
 
-#: GravatarPlugin.php:140
 msgid "You do not have an email address set in your profile."
 msgstr "Vous n'avez pas d’adresse courriel définie dans votre profil."
 
-#: GravatarPlugin.php:158
 msgid "Failed to save Gravatar to the database."
 msgstr "Impossible de sauvegarder le Gravatar dans la base de données."
 
-#: GravatarPlugin.php:162
 msgid "Gravatar added."
 msgstr "Gravatar ajouté."
 
-#: GravatarPlugin.php:180
 msgid "Gravatar removed."
 msgstr "Gravatar supprimé."
 
-#: GravatarPlugin.php:200
 msgid ""
 "The Gravatar plugin allows users to use their <a href=\"http://www.gravatar."
 "com/\">Gravatar</a> with StatusNet."
diff --git a/plugins/Gravatar/locale/ia/LC_MESSAGES/Gravatar.po b/plugins/Gravatar/locale/ia/LC_MESSAGES/Gravatar.po
index f5cd7726f0..8480064ab3 100644
--- a/plugins/Gravatar/locale/ia/LC_MESSAGES/Gravatar.po
+++ b/plugins/Gravatar/locale/ia/LC_MESSAGES/Gravatar.po
@@ -9,63 +9,51 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Gravatar\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:54+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:20+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-15 11:03:48+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:10+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-gravatar\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: GravatarPlugin.php:60
 msgid "Set Gravatar"
 msgstr "Stabilir Gravatar"
 
-#: GravatarPlugin.php:63
 msgid "If you want to use your Gravatar image, click \"Add\"."
 msgstr "Si tu vole usar tu imagine Gravatar, clicca \"Adder\"."
 
-#: GravatarPlugin.php:68
 msgid "Add"
 msgstr "Adder"
 
-#: GravatarPlugin.php:78
 msgid "Remove Gravatar"
 msgstr "Remover Gravatar"
 
-#: GravatarPlugin.php:81
 msgid "If you want to remove your Gravatar image, click \"Remove\"."
 msgstr "Si tu vole remover tu imagine Gravatar, clicca \"Remover\"."
 
-#: GravatarPlugin.php:86
 msgid "Remove"
 msgstr "Remover"
 
-#: GravatarPlugin.php:91
 msgid "To use a Gravatar first enter in an email address."
 msgstr "Pro usar un Gravatar, entra primo un adresse de e-mail."
 
-#: GravatarPlugin.php:140
 msgid "You do not have an email address set in your profile."
 msgstr "Tu non ha un adresse de e-mail definite in tu profilo."
 
-#: GravatarPlugin.php:158
 msgid "Failed to save Gravatar to the database."
 msgstr "Falleva de salveguardar le Gravatar in le base de datos."
 
-#: GravatarPlugin.php:162
 msgid "Gravatar added."
 msgstr "Gravatar addite."
 
-#: GravatarPlugin.php:180
 msgid "Gravatar removed."
 msgstr "Gravatar removite."
 
-#: GravatarPlugin.php:200
 msgid ""
 "The Gravatar plugin allows users to use their <a href=\"http://www.gravatar."
 "com/\">Gravatar</a> with StatusNet."
diff --git a/plugins/Gravatar/locale/mk/LC_MESSAGES/Gravatar.po b/plugins/Gravatar/locale/mk/LC_MESSAGES/Gravatar.po
index 82c588136a..feb5302cf5 100644
--- a/plugins/Gravatar/locale/mk/LC_MESSAGES/Gravatar.po
+++ b/plugins/Gravatar/locale/mk/LC_MESSAGES/Gravatar.po
@@ -9,65 +9,53 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Gravatar\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:54+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:20+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-15 11:03:48+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:10+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-gravatar\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
 
-#: GravatarPlugin.php:60
 msgid "Set Gravatar"
 msgstr "Постави Gravatar"
 
-#: GravatarPlugin.php:63
 msgid "If you want to use your Gravatar image, click \"Add\"."
 msgstr ""
 "Ако сакате да ја користите Вашата слика од Gravatar, кликнете на „Додај“."
 
-#: GravatarPlugin.php:68
 msgid "Add"
 msgstr "Додај"
 
-#: GravatarPlugin.php:78
 msgid "Remove Gravatar"
 msgstr "Отстрани Gravatar"
 
-#: GravatarPlugin.php:81
 msgid "If you want to remove your Gravatar image, click \"Remove\"."
 msgstr ""
 "Ако сакате да ја отстраните Вашата слика од Gravatar, кликнете на „Отстрани“."
 
-#: GravatarPlugin.php:86
 msgid "Remove"
 msgstr "Отстрани"
 
-#: GravatarPlugin.php:91
 msgid "To use a Gravatar first enter in an email address."
 msgstr "За да користите Gravatar најпрвин внесете е-пошта."
 
-#: GravatarPlugin.php:140
 msgid "You do not have an email address set in your profile."
 msgstr "Во профилот немате назначено е-пошта."
 
-#: GravatarPlugin.php:158
 msgid "Failed to save Gravatar to the database."
 msgstr "Не успеав да го зачувам Gravatar-от во базата на податоци."
 
-#: GravatarPlugin.php:162
 msgid "Gravatar added."
 msgstr "Gravatar-от е додаден."
 
-#: GravatarPlugin.php:180
 msgid "Gravatar removed."
 msgstr "Gravatar-от е отстранет."
 
-#: GravatarPlugin.php:200
 msgid ""
 "The Gravatar plugin allows users to use their <a href=\"http://www.gravatar."
 "com/\">Gravatar</a> with StatusNet."
diff --git a/plugins/Gravatar/locale/nl/LC_MESSAGES/Gravatar.po b/plugins/Gravatar/locale/nl/LC_MESSAGES/Gravatar.po
index 2e64085d94..7698901c3a 100644
--- a/plugins/Gravatar/locale/nl/LC_MESSAGES/Gravatar.po
+++ b/plugins/Gravatar/locale/nl/LC_MESSAGES/Gravatar.po
@@ -9,64 +9,52 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Gravatar\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:54+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:20+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-15 11:03:48+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:10+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-gravatar\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: GravatarPlugin.php:60
 msgid "Set Gravatar"
 msgstr "Gravatar instellen"
 
-#: GravatarPlugin.php:63
 msgid "If you want to use your Gravatar image, click \"Add\"."
 msgstr "Klik \"Toevoegen\" om uw afbeelding van Gravatar te gebruiken."
 
-#: GravatarPlugin.php:68
 msgid "Add"
 msgstr "Toevoegen"
 
-#: GravatarPlugin.php:78
 msgid "Remove Gravatar"
 msgstr "Gravatar verwijderen"
 
-#: GravatarPlugin.php:81
 msgid "If you want to remove your Gravatar image, click \"Remove\"."
 msgstr ""
 "Klik \"Verwijderen\" om uw afbeelding van Gravatar niet langer te gebruiken."
 
-#: GravatarPlugin.php:86
 msgid "Remove"
 msgstr "Verwijderen"
 
-#: GravatarPlugin.php:91
 msgid "To use a Gravatar first enter in an email address."
 msgstr "Voer eerst een e-mailadres in om Gravatar te kunnen gebruiken."
 
-#: GravatarPlugin.php:140
 msgid "You do not have an email address set in your profile."
 msgstr "U hebt geen e-mailadres ingesteld in uw profiel."
 
-#: GravatarPlugin.php:158
 msgid "Failed to save Gravatar to the database."
 msgstr "Het was niet mogelijk de Gravatar in the database op te slaan."
 
-#: GravatarPlugin.php:162
 msgid "Gravatar added."
 msgstr "De Gravatar is toegevoegd."
 
-#: GravatarPlugin.php:180
 msgid "Gravatar removed."
 msgstr "De Gravatar is verwijderd."
 
-#: GravatarPlugin.php:200
 msgid ""
 "The Gravatar plugin allows users to use their <a href=\"http://www.gravatar."
 "com/\">Gravatar</a> with StatusNet."
diff --git a/plugins/Gravatar/locale/pl/LC_MESSAGES/Gravatar.po b/plugins/Gravatar/locale/pl/LC_MESSAGES/Gravatar.po
index 5f2f976d7f..184fb61514 100644
--- a/plugins/Gravatar/locale/pl/LC_MESSAGES/Gravatar.po
+++ b/plugins/Gravatar/locale/pl/LC_MESSAGES/Gravatar.po
@@ -9,64 +9,52 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Gravatar\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:54+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:20+0000\n"
 "Language-Team: Polish <http://translatewiki.net/wiki/Portal:pl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-15 11:03:48+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:10+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pl\n"
 "X-Message-Group: #out-statusnet-plugin-gravatar\n"
 "Plural-Forms: nplurals=3; plural=(n == 1) ? 0 : ( (n%10 >= 2 && n%10 <= 4 && "
 "(n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: GravatarPlugin.php:60
 msgid "Set Gravatar"
 msgstr "Ustaw Gravatar"
 
-#: GravatarPlugin.php:63
 msgid "If you want to use your Gravatar image, click \"Add\"."
 msgstr "Aby używać obrazu Gravatar, należy nacisnąć przycisk \"Dodaj\"."
 
-#: GravatarPlugin.php:68
 msgid "Add"
 msgstr "Dodaj"
 
-#: GravatarPlugin.php:78
 msgid "Remove Gravatar"
 msgstr "Usuń Gravatar"
 
-#: GravatarPlugin.php:81
 msgid "If you want to remove your Gravatar image, click \"Remove\"."
 msgstr "Aby usunąć obraz Gravatar, należy nacisnąć przycisk \"Usuń\"."
 
-#: GravatarPlugin.php:86
 msgid "Remove"
 msgstr "Usuń"
 
-#: GravatarPlugin.php:91
 msgid "To use a Gravatar first enter in an email address."
 msgstr "Aby użyć obrazu Gravatar, należy najpierw podać adres e-mail."
 
-#: GravatarPlugin.php:140
 msgid "You do not have an email address set in your profile."
 msgstr "Nie ustawiono adresu e-mail w profilu."
 
-#: GravatarPlugin.php:158
 msgid "Failed to save Gravatar to the database."
 msgstr "Zapisanie obrazu Gravatar w bzie danych nie powiodło się."
 
-#: GravatarPlugin.php:162
 msgid "Gravatar added."
 msgstr "Dodano obraz Gravatar."
 
-#: GravatarPlugin.php:180
 msgid "Gravatar removed."
 msgstr "Usunięto obraz Gravatar."
 
-#: GravatarPlugin.php:200
 msgid ""
 "The Gravatar plugin allows users to use their <a href=\"http://www.gravatar."
 "com/\">Gravatar</a> with StatusNet."
diff --git a/plugins/Gravatar/locale/pt/LC_MESSAGES/Gravatar.po b/plugins/Gravatar/locale/pt/LC_MESSAGES/Gravatar.po
index 26580c4a94..b20b474dba 100644
--- a/plugins/Gravatar/locale/pt/LC_MESSAGES/Gravatar.po
+++ b/plugins/Gravatar/locale/pt/LC_MESSAGES/Gravatar.po
@@ -9,63 +9,51 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Gravatar\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:54+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:20+0000\n"
 "Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-15 11:03:48+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:10+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-plugin-gravatar\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: GravatarPlugin.php:60
 msgid "Set Gravatar"
 msgstr "Definir Gravatar"
 
-#: GravatarPlugin.php:63
 msgid "If you want to use your Gravatar image, click \"Add\"."
 msgstr "Se desejar usar a sua imagem Gravatar, clique em \"Adicionar\"."
 
-#: GravatarPlugin.php:68
 msgid "Add"
 msgstr "Adicionar"
 
-#: GravatarPlugin.php:78
 msgid "Remove Gravatar"
 msgstr "Remover Gravatar"
 
-#: GravatarPlugin.php:81
 msgid "If you want to remove your Gravatar image, click \"Remove\"."
 msgstr "Se desejar remover a sua imagem Gravatar, clique em \"Remover\"."
 
-#: GravatarPlugin.php:86
 msgid "Remove"
 msgstr "Remover"
 
-#: GravatarPlugin.php:91
 msgid "To use a Gravatar first enter in an email address."
 msgstr "Para usar um Gravatar, primeiro introduza um endereço de email."
 
-#: GravatarPlugin.php:140
 msgid "You do not have an email address set in your profile."
 msgstr "Não definiu um endereço de email no seu perfil."
 
-#: GravatarPlugin.php:158
 msgid "Failed to save Gravatar to the database."
 msgstr "Erro ao guardar o Gravatar na base de dados."
 
-#: GravatarPlugin.php:162
 msgid "Gravatar added."
 msgstr "Gravatar adicionado."
 
-#: GravatarPlugin.php:180
 msgid "Gravatar removed."
 msgstr "Gravatar removido."
 
-#: GravatarPlugin.php:200
 msgid ""
 "The Gravatar plugin allows users to use their <a href=\"http://www.gravatar."
 "com/\">Gravatar</a> with StatusNet."
diff --git a/plugins/Gravatar/locale/tl/LC_MESSAGES/Gravatar.po b/plugins/Gravatar/locale/tl/LC_MESSAGES/Gravatar.po
index 6a612d743e..cdc5b782b3 100644
--- a/plugins/Gravatar/locale/tl/LC_MESSAGES/Gravatar.po
+++ b/plugins/Gravatar/locale/tl/LC_MESSAGES/Gravatar.po
@@ -9,67 +9,55 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Gravatar\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:54+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:20+0000\n"
 "Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-15 11:03:48+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:10+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-gravatar\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: GravatarPlugin.php:60
 msgid "Set Gravatar"
 msgstr "Itakda ang Gravatar"
 
-#: GravatarPlugin.php:63
 msgid "If you want to use your Gravatar image, click \"Add\"."
 msgstr ""
 "Kung nais mong gamitin ang iyong larawan ng Gravatar, pindutin ang \"Idagdag"
 "\"."
 
-#: GravatarPlugin.php:68
 msgid "Add"
 msgstr "Idagdag"
 
-#: GravatarPlugin.php:78
 msgid "Remove Gravatar"
 msgstr "Alisin ang Gravatar"
 
-#: GravatarPlugin.php:81
 msgid "If you want to remove your Gravatar image, click \"Remove\"."
 msgstr ""
 "Kung nais mong alisin ang larawan mo ng Gravatar, pindutin ang \"Alisin\"."
 
-#: GravatarPlugin.php:86
 msgid "Remove"
 msgstr "Alisin"
 
-#: GravatarPlugin.php:91
 msgid "To use a Gravatar first enter in an email address."
 msgstr ""
 "Upang gamitin ang isang Gravatar ipasok muna ang isang tirahan ng e-liham."
 
-#: GravatarPlugin.php:140
 msgid "You do not have an email address set in your profile."
 msgstr "Wala kang tirahan ng e-liham na nakatakda sa iyong balangkas."
 
-#: GravatarPlugin.php:158
 msgid "Failed to save Gravatar to the database."
 msgstr "Nabigong sagipin ang Gravatar sa iyong kalipunan ng dato."
 
-#: GravatarPlugin.php:162
 msgid "Gravatar added."
 msgstr "Idinagdag ang Gravatar."
 
-#: GravatarPlugin.php:180
 msgid "Gravatar removed."
 msgstr "Inalis ang Gravatar."
 
-#: GravatarPlugin.php:200
 msgid ""
 "The Gravatar plugin allows users to use their <a href=\"http://www.gravatar."
 "com/\">Gravatar</a> with StatusNet."
diff --git a/plugins/Gravatar/locale/uk/LC_MESSAGES/Gravatar.po b/plugins/Gravatar/locale/uk/LC_MESSAGES/Gravatar.po
index 9a624852ee..186df23eb1 100644
--- a/plugins/Gravatar/locale/uk/LC_MESSAGES/Gravatar.po
+++ b/plugins/Gravatar/locale/uk/LC_MESSAGES/Gravatar.po
@@ -9,65 +9,53 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Gravatar\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:54+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:20+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-15 11:03:48+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:10+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-gravatar\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: GravatarPlugin.php:60
 msgid "Set Gravatar"
 msgstr "Встановити Gravatar"
 
-#: GravatarPlugin.php:63
 msgid "If you want to use your Gravatar image, click \"Add\"."
 msgstr "Якщо ви бажаєте використовувати аватари Gravatar, тисніть «Додати»."
 
-#: GravatarPlugin.php:68
 msgid "Add"
 msgstr "Додати"
 
-#: GravatarPlugin.php:78
 msgid "Remove Gravatar"
 msgstr "Видалити Gravatar"
 
-#: GravatarPlugin.php:81
 msgid "If you want to remove your Gravatar image, click \"Remove\"."
 msgstr ""
 "Якщо ви бажаєте видалити свою аватару надану Gravatar, тисніть «Видалити»."
 
-#: GravatarPlugin.php:86
 msgid "Remove"
 msgstr "Видалити"
 
-#: GravatarPlugin.php:91
 msgid "To use a Gravatar first enter in an email address."
 msgstr "Щоб використовувати Gravatar, спершу введіть адресу електронної пошти."
 
-#: GravatarPlugin.php:140
 msgid "You do not have an email address set in your profile."
 msgstr "У вашому профілі не вказано жодної електронної адреси."
 
-#: GravatarPlugin.php:158
 msgid "Failed to save Gravatar to the database."
 msgstr "Не вдалося зберегти Gravatar до бази даних."
 
-#: GravatarPlugin.php:162
 msgid "Gravatar added."
 msgstr "Gravatar додано."
 
-#: GravatarPlugin.php:180
 msgid "Gravatar removed."
 msgstr "Gravatar вилучено."
 
-#: GravatarPlugin.php:200
 msgid ""
 "The Gravatar plugin allows users to use their <a href=\"http://www.gravatar."
 "com/\">Gravatar</a> with StatusNet."
diff --git a/plugins/Gravatar/locale/zh_CN/LC_MESSAGES/Gravatar.po b/plugins/Gravatar/locale/zh_CN/LC_MESSAGES/Gravatar.po
index 5c5c13bd7f..a62b903038 100644
--- a/plugins/Gravatar/locale/zh_CN/LC_MESSAGES/Gravatar.po
+++ b/plugins/Gravatar/locale/zh_CN/LC_MESSAGES/Gravatar.po
@@ -9,64 +9,52 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Gravatar\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:54+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:20+0000\n"
 "Language-Team: Simplified Chinese <http://translatewiki.net/wiki/Portal:zh-"
 "hans>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-15 11:03:48+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:10+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-gravatar\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: GravatarPlugin.php:60
 msgid "Set Gravatar"
 msgstr "设置 Gravatar"
 
-#: GravatarPlugin.php:63
 msgid "If you want to use your Gravatar image, click \"Add\"."
 msgstr "如果你想使用你的 Gravatar 图像，点击“添加”"
 
-#: GravatarPlugin.php:68
 msgid "Add"
 msgstr "添加"
 
-#: GravatarPlugin.php:78
 msgid "Remove Gravatar"
 msgstr "删除 Gravatar"
 
-#: GravatarPlugin.php:81
 msgid "If you want to remove your Gravatar image, click \"Remove\"."
 msgstr "如果你想删除你的 Gravatar 图像，点击“删除”。"
 
-#: GravatarPlugin.php:86
 msgid "Remove"
 msgstr "删除"
 
-#: GravatarPlugin.php:91
 msgid "To use a Gravatar first enter in an email address."
 msgstr "要使用 Gravatar 先要填写一个 email 地址。"
 
-#: GravatarPlugin.php:140
 msgid "You do not have an email address set in your profile."
 msgstr "你的账号没有设置 email 地址。"
 
-#: GravatarPlugin.php:158
 msgid "Failed to save Gravatar to the database."
 msgstr "将 Gravatar 保存到数据库失败。"
 
-#: GravatarPlugin.php:162
 msgid "Gravatar added."
 msgstr "Gravatar 已添加。"
 
-#: GravatarPlugin.php:180
 msgid "Gravatar removed."
 msgstr "Gravatar 已删除。"
 
-#: GravatarPlugin.php:200
 msgid ""
 "The Gravatar plugin allows users to use their <a href=\"http://www.gravatar."
 "com/\">Gravatar</a> with StatusNet."
diff --git a/plugins/GroupFavorited/locale/GroupFavorited.pot b/plugins/GroupFavorited/locale/GroupFavorited.pot
index 9de2b4bb8f..e31285c04e 100644
--- a/plugins/GroupFavorited/locale/GroupFavorited.pot
+++ b/plugins/GroupFavorited/locale/GroupFavorited.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,18 +16,6 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#. TRANS: %s is a group name.
-#: groupfavoritedaction.php:48
-#, php-format
-msgid "Popular posts in %s group"
-msgstr ""
-
-#. TRANS: %1$s is a group name, %2$s is a group number.
-#: groupfavoritedaction.php:51
-#, php-format
-msgid "Popular posts in %1$s group, page %2$d"
-msgstr ""
-
 #. TRANS: Menu item in the group navigation page.
 #: GroupFavoritedPlugin.php:72
 msgctxt "MENU"
@@ -46,3 +34,15 @@ msgstr ""
 #: GroupFavoritedPlugin.php:99
 msgid "This plugin adds a menu item for popular notices in groups."
 msgstr ""
+
+#. TRANS: %s is a group name.
+#: groupfavoritedaction.php:48
+#, php-format
+msgid "Popular posts in %s group"
+msgstr ""
+
+#. TRANS: %1$s is a group name, %2$s is a group number.
+#: groupfavoritedaction.php:51
+#, php-format
+msgid "Popular posts in %1$s group, page %2$d"
+msgstr ""
diff --git a/plugins/GroupFavorited/locale/br/LC_MESSAGES/GroupFavorited.po b/plugins/GroupFavorited/locale/br/LC_MESSAGES/GroupFavorited.po
index a3eb44910f..f334c83e2a 100644
--- a/plugins/GroupFavorited/locale/br/LC_MESSAGES/GroupFavorited.po
+++ b/plugins/GroupFavorited/locale/br/LC_MESSAGES/GroupFavorited.po
@@ -9,45 +9,40 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GroupFavorited\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:55+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:20+0000\n"
 "Language-Team: Breton <http://translatewiki.net/wiki/Portal:br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:02+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:10+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-groupfavorited\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#. TRANS: %s is a group name.
-#: groupfavoritedaction.php:48
-#, php-format
-msgid "Popular posts in %s group"
-msgstr ""
-
-#. TRANS: %1$s is a group name, %2$s is a group number.
-#: groupfavoritedaction.php:51
-#, php-format
-msgid "Popular posts in %1$s group, page %2$d"
-msgstr ""
-
 #. TRANS: Menu item in the group navigation page.
-#: GroupFavoritedPlugin.php:72
 msgctxt "MENU"
 msgid "Popular"
 msgstr "Poblek"
 
 #. TRANS: Tooltip for menu item in the group navigation page.
 #. TRANS: %s is the nickname of the group.
-#: GroupFavoritedPlugin.php:75
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Popular notices in %s group"
 msgstr "Kemennadennoù poblek er strollad %s"
 
 #. TRANS: Plugin description.
-#: GroupFavoritedPlugin.php:99
 msgid "This plugin adds a menu item for popular notices in groups."
 msgstr ""
+
+#. TRANS: %s is a group name.
+#, php-format
+msgid "Popular posts in %s group"
+msgstr ""
+
+#. TRANS: %1$s is a group name, %2$s is a group number.
+#, php-format
+msgid "Popular posts in %1$s group, page %2$d"
+msgstr ""
diff --git a/plugins/GroupFavorited/locale/ca/LC_MESSAGES/GroupFavorited.po b/plugins/GroupFavorited/locale/ca/LC_MESSAGES/GroupFavorited.po
index 1082980fa1..4dd28eb968 100644
--- a/plugins/GroupFavorited/locale/ca/LC_MESSAGES/GroupFavorited.po
+++ b/plugins/GroupFavorited/locale/ca/LC_MESSAGES/GroupFavorited.po
@@ -9,47 +9,42 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GroupFavorited\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-02 23:30+0000\n"
-"PO-Revision-Date: 2011-02-02 23:36:58+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:21+0000\n"
 "Language-Team: Catalan <http://translatewiki.net/wiki/Portal:ca>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:24:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81409); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:10+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ca\n"
 "X-Message-Group: #out-statusnet-plugin-groupfavorited\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. TRANS: %s is a group name.
-#: groupfavoritedaction.php:48
-#, php-format
-msgid "Popular posts in %s group"
-msgstr "Entrades populars al grup %s"
-
-#. TRANS: %1$s is a group name, %2$s is a group number.
-#: groupfavoritedaction.php:51
-#, php-format
-msgid "Popular posts in %1$s group, page %2$d"
-msgstr "Entrades populars al grup %1$s, pàgina %2$d"
-
 #. TRANS: Menu item in the group navigation page.
-#: GroupFavoritedPlugin.php:72
 msgctxt "MENU"
 msgid "Popular"
 msgstr "Populars"
 
 #. TRANS: Tooltip for menu item in the group navigation page.
 #. TRANS: %s is the nickname of the group.
-#: GroupFavoritedPlugin.php:75
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Popular notices in %s group"
 msgstr "Avisos populars al grup %s"
 
 #. TRANS: Plugin description.
-#: GroupFavoritedPlugin.php:99
 msgid "This plugin adds a menu item for popular notices in groups."
 msgstr ""
 "Aquest connector afegeix un element de menú amb els avisos popular dels "
 "grups."
+
+#. TRANS: %s is a group name.
+#, php-format
+msgid "Popular posts in %s group"
+msgstr "Entrades populars al grup %s"
+
+#. TRANS: %1$s is a group name, %2$s is a group number.
+#, php-format
+msgid "Popular posts in %1$s group, page %2$d"
+msgstr "Entrades populars al grup %1$s, pàgina %2$d"
diff --git a/plugins/GroupFavorited/locale/de/LC_MESSAGES/GroupFavorited.po b/plugins/GroupFavorited/locale/de/LC_MESSAGES/GroupFavorited.po
index d8ed19a16d..3a159e7178 100644
--- a/plugins/GroupFavorited/locale/de/LC_MESSAGES/GroupFavorited.po
+++ b/plugins/GroupFavorited/locale/de/LC_MESSAGES/GroupFavorited.po
@@ -10,47 +10,42 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GroupFavorited\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:55+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:21+0000\n"
 "Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:02+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:10+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-groupfavorited\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. TRANS: %s is a group name.
-#: groupfavoritedaction.php:48
-#, php-format
-msgid "Popular posts in %s group"
-msgstr "Beliebte Beiträge in der %s-Gruppe"
-
-#. TRANS: %1$s is a group name, %2$s is a group number.
-#: groupfavoritedaction.php:51
-#, php-format
-msgid "Popular posts in %1$s group, page %2$d"
-msgstr "Beliebte Beiträge in der %1$s-Gruppe, Seite %2$d"
-
 #. TRANS: Menu item in the group navigation page.
-#: GroupFavoritedPlugin.php:72
 msgctxt "MENU"
 msgid "Popular"
 msgstr "Beliebt"
 
 #. TRANS: Tooltip for menu item in the group navigation page.
 #. TRANS: %s is the nickname of the group.
-#: GroupFavoritedPlugin.php:75
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Popular notices in %s group"
 msgstr "Beliebte Nachrichten in der %s-Gruppe"
 
 #. TRANS: Plugin description.
-#: GroupFavoritedPlugin.php:99
 msgid "This plugin adds a menu item for popular notices in groups."
 msgstr ""
 "Dieses Plugin fügt einen Menüeintrag mit den beliebtesten Nachrichten einer "
 "Gruppen ein."
+
+#. TRANS: %s is a group name.
+#, php-format
+msgid "Popular posts in %s group"
+msgstr "Beliebte Beiträge in der %s-Gruppe"
+
+#. TRANS: %1$s is a group name, %2$s is a group number.
+#, php-format
+msgid "Popular posts in %1$s group, page %2$d"
+msgstr "Beliebte Beiträge in der %1$s-Gruppe, Seite %2$d"
diff --git a/plugins/GroupFavorited/locale/es/LC_MESSAGES/GroupFavorited.po b/plugins/GroupFavorited/locale/es/LC_MESSAGES/GroupFavorited.po
index 7d9e61f8bd..b66d146ebf 100644
--- a/plugins/GroupFavorited/locale/es/LC_MESSAGES/GroupFavorited.po
+++ b/plugins/GroupFavorited/locale/es/LC_MESSAGES/GroupFavorited.po
@@ -9,47 +9,42 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GroupFavorited\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:55+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:21+0000\n"
 "Language-Team: Spanish <http://translatewiki.net/wiki/Portal:es>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:02+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:10+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-groupfavorited\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. TRANS: %s is a group name.
-#: groupfavoritedaction.php:48
-#, php-format
-msgid "Popular posts in %s group"
-msgstr "Mensajes populares en el grupo %s"
-
-#. TRANS: %1$s is a group name, %2$s is a group number.
-#: groupfavoritedaction.php:51
-#, php-format
-msgid "Popular posts in %1$s group, page %2$d"
-msgstr "Mensajes populares en el grupo %1$s, página %2$d"
-
 #. TRANS: Menu item in the group navigation page.
-#: GroupFavoritedPlugin.php:72
 msgctxt "MENU"
 msgid "Popular"
 msgstr "Popular"
 
 #. TRANS: Tooltip for menu item in the group navigation page.
 #. TRANS: %s is the nickname of the group.
-#: GroupFavoritedPlugin.php:75
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Popular notices in %s group"
 msgstr "Mensajes populares en el grupo %s"
 
 #. TRANS: Plugin description.
-#: GroupFavoritedPlugin.php:99
 msgid "This plugin adds a menu item for popular notices in groups."
 msgstr ""
 "Esta extensión añade un elemento de menú para los mensajes populares en "
 "grupos."
+
+#. TRANS: %s is a group name.
+#, php-format
+msgid "Popular posts in %s group"
+msgstr "Mensajes populares en el grupo %s"
+
+#. TRANS: %1$s is a group name, %2$s is a group number.
+#, php-format
+msgid "Popular posts in %1$s group, page %2$d"
+msgstr "Mensajes populares en el grupo %1$s, página %2$d"
diff --git a/plugins/GroupFavorited/locale/fr/LC_MESSAGES/GroupFavorited.po b/plugins/GroupFavorited/locale/fr/LC_MESSAGES/GroupFavorited.po
index bc01545a00..7535de8eea 100644
--- a/plugins/GroupFavorited/locale/fr/LC_MESSAGES/GroupFavorited.po
+++ b/plugins/GroupFavorited/locale/fr/LC_MESSAGES/GroupFavorited.po
@@ -9,47 +9,42 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GroupFavorited\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:55+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:21+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:02+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:10+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-groupfavorited\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#. TRANS: %s is a group name.
-#: groupfavoritedaction.php:48
-#, php-format
-msgid "Popular posts in %s group"
-msgstr "Messages populaires dans le groupe %s"
-
-#. TRANS: %1$s is a group name, %2$s is a group number.
-#: groupfavoritedaction.php:51
-#, php-format
-msgid "Popular posts in %1$s group, page %2$d"
-msgstr "Messages populaires dans le groupe %1$s, page %2$d"
-
 #. TRANS: Menu item in the group navigation page.
-#: GroupFavoritedPlugin.php:72
 msgctxt "MENU"
 msgid "Popular"
 msgstr "Populaires"
 
 #. TRANS: Tooltip for menu item in the group navigation page.
 #. TRANS: %s is the nickname of the group.
-#: GroupFavoritedPlugin.php:75
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Popular notices in %s group"
 msgstr "Avis populaires dans le groupe %s"
 
 #. TRANS: Plugin description.
-#: GroupFavoritedPlugin.php:99
 msgid "This plugin adds a menu item for popular notices in groups."
 msgstr ""
 "Cette extension ajoute un élément de menu pour les messages populaires dans "
 "les groupes."
+
+#. TRANS: %s is a group name.
+#, php-format
+msgid "Popular posts in %s group"
+msgstr "Messages populaires dans le groupe %s"
+
+#. TRANS: %1$s is a group name, %2$s is a group number.
+#, php-format
+msgid "Popular posts in %1$s group, page %2$d"
+msgstr "Messages populaires dans le groupe %1$s, page %2$d"
diff --git a/plugins/GroupFavorited/locale/ia/LC_MESSAGES/GroupFavorited.po b/plugins/GroupFavorited/locale/ia/LC_MESSAGES/GroupFavorited.po
index b3f54d4695..e0e13377f5 100644
--- a/plugins/GroupFavorited/locale/ia/LC_MESSAGES/GroupFavorited.po
+++ b/plugins/GroupFavorited/locale/ia/LC_MESSAGES/GroupFavorited.po
@@ -9,45 +9,40 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GroupFavorited\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:55+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:21+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:02+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:10+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-groupfavorited\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. TRANS: %s is a group name.
-#: groupfavoritedaction.php:48
-#, php-format
-msgid "Popular posts in %s group"
-msgstr "Messages popular in gruppo %s"
-
-#. TRANS: %1$s is a group name, %2$s is a group number.
-#: groupfavoritedaction.php:51
-#, php-format
-msgid "Popular posts in %1$s group, page %2$d"
-msgstr "Messages popular in gruppo %1$s, pagina %2$d"
-
 #. TRANS: Menu item in the group navigation page.
-#: GroupFavoritedPlugin.php:72
 msgctxt "MENU"
 msgid "Popular"
 msgstr "Popular"
 
 #. TRANS: Tooltip for menu item in the group navigation page.
 #. TRANS: %s is the nickname of the group.
-#: GroupFavoritedPlugin.php:75
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Popular notices in %s group"
 msgstr "Notas popular in gruppo %s"
 
 #. TRANS: Plugin description.
-#: GroupFavoritedPlugin.php:99
 msgid "This plugin adds a menu item for popular notices in groups."
 msgstr "Iste plug-in adde un option de menu pro notas popular in gruppos."
+
+#. TRANS: %s is a group name.
+#, php-format
+msgid "Popular posts in %s group"
+msgstr "Messages popular in gruppo %s"
+
+#. TRANS: %1$s is a group name, %2$s is a group number.
+#, php-format
+msgid "Popular posts in %1$s group, page %2$d"
+msgstr "Messages popular in gruppo %1$s, pagina %2$d"
diff --git a/plugins/GroupFavorited/locale/mk/LC_MESSAGES/GroupFavorited.po b/plugins/GroupFavorited/locale/mk/LC_MESSAGES/GroupFavorited.po
index f735946532..5a397f7869 100644
--- a/plugins/GroupFavorited/locale/mk/LC_MESSAGES/GroupFavorited.po
+++ b/plugins/GroupFavorited/locale/mk/LC_MESSAGES/GroupFavorited.po
@@ -9,46 +9,41 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GroupFavorited\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:55+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:21+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:02+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:10+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-groupfavorited\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
 
-#. TRANS: %s is a group name.
-#: groupfavoritedaction.php:48
-#, php-format
-msgid "Popular posts in %s group"
-msgstr "Популарни објави во групата %s"
-
-#. TRANS: %1$s is a group name, %2$s is a group number.
-#: groupfavoritedaction.php:51
-#, php-format
-msgid "Popular posts in %1$s group, page %2$d"
-msgstr "Популарни објави во групата %1$s, страница %2$d"
-
 #. TRANS: Menu item in the group navigation page.
-#: GroupFavoritedPlugin.php:72
 msgctxt "MENU"
 msgid "Popular"
 msgstr "Популарни"
 
 #. TRANS: Tooltip for menu item in the group navigation page.
 #. TRANS: %s is the nickname of the group.
-#: GroupFavoritedPlugin.php:75
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Popular notices in %s group"
 msgstr "Популарни забелешки во групата %s"
 
 #. TRANS: Plugin description.
-#: GroupFavoritedPlugin.php:99
 msgid "This plugin adds a menu item for popular notices in groups."
 msgstr ""
 "Овој приклучок додава елемент во менито за популарни забелешки во групи."
+
+#. TRANS: %s is a group name.
+#, php-format
+msgid "Popular posts in %s group"
+msgstr "Популарни објави во групата %s"
+
+#. TRANS: %1$s is a group name, %2$s is a group number.
+#, php-format
+msgid "Popular posts in %1$s group, page %2$d"
+msgstr "Популарни објави во групата %1$s, страница %2$d"
diff --git a/plugins/GroupFavorited/locale/nl/LC_MESSAGES/GroupFavorited.po b/plugins/GroupFavorited/locale/nl/LC_MESSAGES/GroupFavorited.po
index bf61a342a4..a11987b0c8 100644
--- a/plugins/GroupFavorited/locale/nl/LC_MESSAGES/GroupFavorited.po
+++ b/plugins/GroupFavorited/locale/nl/LC_MESSAGES/GroupFavorited.po
@@ -10,46 +10,41 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GroupFavorited\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:55+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:21+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:02+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:10+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-groupfavorited\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. TRANS: %s is a group name.
-#: groupfavoritedaction.php:48
-#, php-format
-msgid "Popular posts in %s group"
-msgstr "Populaire berichten in de groep %s"
-
-#. TRANS: %1$s is a group name, %2$s is a group number.
-#: groupfavoritedaction.php:51
-#, php-format
-msgid "Popular posts in %1$s group, page %2$d"
-msgstr "Populaire berichten in de groep %1$s, pagina %2$d"
-
 #. TRANS: Menu item in the group navigation page.
-#: GroupFavoritedPlugin.php:72
 msgctxt "MENU"
 msgid "Popular"
 msgstr "Populair"
 
 #. TRANS: Tooltip for menu item in the group navigation page.
 #. TRANS: %s is the nickname of the group.
-#: GroupFavoritedPlugin.php:75
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Popular notices in %s group"
 msgstr "Populaire mededelingen in de groep %s"
 
 #. TRANS: Plugin description.
-#: GroupFavoritedPlugin.php:99
 msgid "This plugin adds a menu item for popular notices in groups."
 msgstr ""
 "Deze plug-in voegt een menukeuze toe voor populaire mededelingen in groepen."
+
+#. TRANS: %s is a group name.
+#, php-format
+msgid "Popular posts in %s group"
+msgstr "Populaire berichten in de groep %s"
+
+#. TRANS: %1$s is a group name, %2$s is a group number.
+#, php-format
+msgid "Popular posts in %1$s group, page %2$d"
+msgstr "Populaire berichten in de groep %1$s, pagina %2$d"
diff --git a/plugins/GroupFavorited/locale/ru/LC_MESSAGES/GroupFavorited.po b/plugins/GroupFavorited/locale/ru/LC_MESSAGES/GroupFavorited.po
index 819431844e..ed72c4e373 100644
--- a/plugins/GroupFavorited/locale/ru/LC_MESSAGES/GroupFavorited.po
+++ b/plugins/GroupFavorited/locale/ru/LC_MESSAGES/GroupFavorited.po
@@ -9,46 +9,41 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GroupFavorited\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:55+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:21+0000\n"
 "Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:02+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:10+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-groupfavorited\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#. TRANS: %s is a group name.
-#: groupfavoritedaction.php:48
-#, php-format
-msgid "Popular posts in %s group"
-msgstr "Популярные сообщения в группе %s"
-
-#. TRANS: %1$s is a group name, %2$s is a group number.
-#: groupfavoritedaction.php:51
-#, php-format
-msgid "Popular posts in %1$s group, page %2$d"
-msgstr ""
-
 #. TRANS: Menu item in the group navigation page.
-#: GroupFavoritedPlugin.php:72
 msgctxt "MENU"
 msgid "Popular"
 msgstr "Популярное"
 
 #. TRANS: Tooltip for menu item in the group navigation page.
 #. TRANS: %s is the nickname of the group.
-#: GroupFavoritedPlugin.php:75
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Popular notices in %s group"
 msgstr ""
 
 #. TRANS: Plugin description.
-#: GroupFavoritedPlugin.php:99
 msgid "This plugin adds a menu item for popular notices in groups."
 msgstr ""
+
+#. TRANS: %s is a group name.
+#, php-format
+msgid "Popular posts in %s group"
+msgstr "Популярные сообщения в группе %s"
+
+#. TRANS: %1$s is a group name, %2$s is a group number.
+#, php-format
+msgid "Popular posts in %1$s group, page %2$d"
+msgstr ""
diff --git a/plugins/GroupFavorited/locale/te/LC_MESSAGES/GroupFavorited.po b/plugins/GroupFavorited/locale/te/LC_MESSAGES/GroupFavorited.po
index e79be0edfd..d399035c3e 100644
--- a/plugins/GroupFavorited/locale/te/LC_MESSAGES/GroupFavorited.po
+++ b/plugins/GroupFavorited/locale/te/LC_MESSAGES/GroupFavorited.po
@@ -9,45 +9,40 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GroupFavorited\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:55+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:21+0000\n"
 "Language-Team: Telugu <http://translatewiki.net/wiki/Portal:te>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:02+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:10+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: te\n"
 "X-Message-Group: #out-statusnet-plugin-groupfavorited\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. TRANS: %s is a group name.
-#: groupfavoritedaction.php:48
-#, php-format
-msgid "Popular posts in %s group"
-msgstr "%s గుంపులో జనరంజకమైన టపాలు"
-
-#. TRANS: %1$s is a group name, %2$s is a group number.
-#: groupfavoritedaction.php:51
-#, php-format
-msgid "Popular posts in %1$s group, page %2$d"
-msgstr "%1$s గుంపులో జనరంజకమైన టపాలు, %2$dవ పుట"
-
 #. TRANS: Menu item in the group navigation page.
-#: GroupFavoritedPlugin.php:72
 msgctxt "MENU"
 msgid "Popular"
 msgstr "ప్రాచుర్యం"
 
 #. TRANS: Tooltip for menu item in the group navigation page.
 #. TRANS: %s is the nickname of the group.
-#: GroupFavoritedPlugin.php:75
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Popular notices in %s group"
 msgstr "%s గుంపులో జనరంజకమైన టపాలు"
 
 #. TRANS: Plugin description.
-#: GroupFavoritedPlugin.php:99
 msgid "This plugin adds a menu item for popular notices in groups."
 msgstr ""
+
+#. TRANS: %s is a group name.
+#, php-format
+msgid "Popular posts in %s group"
+msgstr "%s గుంపులో జనరంజకమైన టపాలు"
+
+#. TRANS: %1$s is a group name, %2$s is a group number.
+#, php-format
+msgid "Popular posts in %1$s group, page %2$d"
+msgstr "%1$s గుంపులో జనరంజకమైన టపాలు, %2$dవ పుట"
diff --git a/plugins/GroupFavorited/locale/tl/LC_MESSAGES/GroupFavorited.po b/plugins/GroupFavorited/locale/tl/LC_MESSAGES/GroupFavorited.po
index c549b51b3f..b6a70ddf53 100644
--- a/plugins/GroupFavorited/locale/tl/LC_MESSAGES/GroupFavorited.po
+++ b/plugins/GroupFavorited/locale/tl/LC_MESSAGES/GroupFavorited.po
@@ -9,47 +9,42 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GroupFavorited\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:55+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:21+0000\n"
 "Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:02+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:10+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-groupfavorited\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. TRANS: %s is a group name.
-#: groupfavoritedaction.php:48
-#, php-format
-msgid "Popular posts in %s group"
-msgstr "Tanyag na mga pagpapaskila sa loob ng pangkat na %s"
-
-#. TRANS: %1$s is a group name, %2$s is a group number.
-#: groupfavoritedaction.php:51
-#, php-format
-msgid "Popular posts in %1$s group, page %2$d"
-msgstr "Tanyag na mga pagpapaskila sa loob ng pangkat na %1$s, pahina %2$d"
-
 #. TRANS: Menu item in the group navigation page.
-#: GroupFavoritedPlugin.php:72
 msgctxt "MENU"
 msgid "Popular"
 msgstr "Tanyag"
 
 #. TRANS: Tooltip for menu item in the group navigation page.
 #. TRANS: %s is the nickname of the group.
-#: GroupFavoritedPlugin.php:75
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Popular notices in %s group"
 msgstr "Bantog na mga pabatid sa loob ng pangkat na %s"
 
 #. TRANS: Plugin description.
-#: GroupFavoritedPlugin.php:99
 msgid "This plugin adds a menu item for popular notices in groups."
 msgstr ""
 "Ang pampasak na ito ay nagdaragdag ng isang bagay ng menu para sa mga bantog "
 "na pabatid sa loob ng mga pangkat."
+
+#. TRANS: %s is a group name.
+#, php-format
+msgid "Popular posts in %s group"
+msgstr "Tanyag na mga pagpapaskila sa loob ng pangkat na %s"
+
+#. TRANS: %1$s is a group name, %2$s is a group number.
+#, php-format
+msgid "Popular posts in %1$s group, page %2$d"
+msgstr "Tanyag na mga pagpapaskila sa loob ng pangkat na %1$s, pahina %2$d"
diff --git a/plugins/GroupFavorited/locale/uk/LC_MESSAGES/GroupFavorited.po b/plugins/GroupFavorited/locale/uk/LC_MESSAGES/GroupFavorited.po
index f58e8ce248..ccaef77a6e 100644
--- a/plugins/GroupFavorited/locale/uk/LC_MESSAGES/GroupFavorited.po
+++ b/plugins/GroupFavorited/locale/uk/LC_MESSAGES/GroupFavorited.po
@@ -9,46 +9,41 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GroupFavorited\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:55+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:21+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:02+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:10+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-groupfavorited\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#. TRANS: %s is a group name.
-#: groupfavoritedaction.php:48
-#, php-format
-msgid "Popular posts in %s group"
-msgstr "Популярні повідомлення спільноти %s"
-
-#. TRANS: %1$s is a group name, %2$s is a group number.
-#: groupfavoritedaction.php:51
-#, php-format
-msgid "Popular posts in %1$s group, page %2$d"
-msgstr "Популярні повідомлення спільноти %1$s, сторінка %2$d"
-
 #. TRANS: Menu item in the group navigation page.
-#: GroupFavoritedPlugin.php:72
 msgctxt "MENU"
 msgid "Popular"
 msgstr "Популярні"
 
 #. TRANS: Tooltip for menu item in the group navigation page.
 #. TRANS: %s is the nickname of the group.
-#: GroupFavoritedPlugin.php:75
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Popular notices in %s group"
 msgstr "Популярні дописи спільноти %s"
 
 #. TRANS: Plugin description.
-#: GroupFavoritedPlugin.php:99
 msgid "This plugin adds a menu item for popular notices in groups."
 msgstr "Цей додаток долучає до меню пункт для популярних дописів у спільноті."
+
+#. TRANS: %s is a group name.
+#, php-format
+msgid "Popular posts in %s group"
+msgstr "Популярні повідомлення спільноти %s"
+
+#. TRANS: %1$s is a group name, %2$s is a group number.
+#, php-format
+msgid "Popular posts in %1$s group, page %2$d"
+msgstr "Популярні повідомлення спільноти %1$s, сторінка %2$d"
diff --git a/plugins/GroupPrivateMessage/locale/GroupPrivateMessage.pot b/plugins/GroupPrivateMessage/locale/GroupPrivateMessage.pot
index 8d5edc6c07..0db8730c5f 100644
--- a/plugins/GroupPrivateMessage/locale/GroupPrivateMessage.pot
+++ b/plugins/GroupPrivateMessage/locale/GroupPrivateMessage.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,24 +17,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: Group_message.php:137
-#, php-format
-msgid "That's too long. Maximum message size is %d character."
-msgid_plural "That's too long. Maximum message size is %d characters."
-msgstr[0] ""
-msgstr[1] ""
-
-#: groupinbox.php:125
-msgid "This group has not received any private messages."
-msgstr ""
-
-#. TRANS: Instructions for user inbox page.
-#: groupinbox.php:206
-msgid ""
-"This is the group inbox, which lists all incoming private messages for this "
-"group."
-msgstr ""
-
 #: GroupPrivateMessagePlugin.php:210
 msgid "Inbox"
 msgstr ""
@@ -47,7 +29,25 @@ msgstr ""
 msgid "Allow posting DMs to a group."
 msgstr ""
 
+#: groupinbox.php:125
+msgid "This group has not received any private messages."
+msgstr ""
+
+#. TRANS: Instructions for user inbox page.
+#: groupinbox.php:206
+msgid ""
+"This is the group inbox, which lists all incoming private messages for this "
+"group."
+msgstr ""
+
 #: groupmessageform.php:164
 msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr ""
+
+#: Group_message.php:137
+#, php-format
+msgid "That's too long. Maximum message size is %d character."
+msgid_plural "That's too long. Maximum message size is %d characters."
+msgstr[0] ""
+msgstr[1] ""
diff --git a/plugins/GroupPrivateMessage/locale/br/LC_MESSAGES/GroupPrivateMessage.po b/plugins/GroupPrivateMessage/locale/br/LC_MESSAGES/GroupPrivateMessage.po
index 9106bb8f9b..69bdacd909 100644
--- a/plugins/GroupPrivateMessage/locale/br/LC_MESSAGES/GroupPrivateMessage.po
+++ b/plugins/GroupPrivateMessage/locale/br/LC_MESSAGES/GroupPrivateMessage.po
@@ -9,19 +9,40 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GroupPrivateMessage\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-24 10:32+0000\n"
-"PO-Revision-Date: 2011-02-24 10:39:11+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:22+0000\n"
 "Language-Team: Breton <http://translatewiki.net/wiki/Portal:br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-17 11:34:54+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r82712); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:11+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-groupprivatemessage\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: Group_message.php:137
+msgid "Inbox"
+msgstr "Boest resev"
+
+msgid "Private messages for this group"
+msgstr "Kemennadennoù prevez evit a strollad-mañ"
+
+msgid "Allow posting DMs to a group."
+msgstr ""
+
+msgid "This group has not received any private messages."
+msgstr "N'eus bet kaset kemennadenn brevez ebet d'ar strollad-mañ."
+
+#. TRANS: Instructions for user inbox page.
+msgid ""
+"This is the group inbox, which lists all incoming private messages for this "
+"group."
+msgstr ""
+
+msgctxt "Send button for sending notice"
+msgid "Send"
+msgstr "Kas"
+
 #, php-format
 msgid "That's too long. Maximum message size is %d character."
 msgid_plural "That's too long. Maximum message size is %d characters."
@@ -31,31 +52,3 @@ msgstr[0] ""
 msgstr[1] ""
 "Re hir eo. %d eo an niver brasañ a arouezennoù a c'haller kaout en ur "
 "gemennadenn."
-
-#: groupinbox.php:125
-msgid "This group has not received any private messages."
-msgstr "N'eus bet kaset kemennadenn brevez ebet d'ar strollad-mañ."
-
-#. TRANS: Instructions for user inbox page.
-#: groupinbox.php:206
-msgid ""
-"This is the group inbox, which lists all incoming private messages for this "
-"group."
-msgstr ""
-
-#: GroupPrivateMessagePlugin.php:210
-msgid "Inbox"
-msgstr "Boest resev"
-
-#: GroupPrivateMessagePlugin.php:211
-msgid "Private messages for this group"
-msgstr "Kemennadennoù prevez evit a strollad-mañ"
-
-#: GroupPrivateMessagePlugin.php:502
-msgid "Allow posting DMs to a group."
-msgstr ""
-
-#: groupmessageform.php:164
-msgctxt "Send button for sending notice"
-msgid "Send"
-msgstr "Kas"
diff --git a/plugins/GroupPrivateMessage/locale/ia/LC_MESSAGES/GroupPrivateMessage.po b/plugins/GroupPrivateMessage/locale/ia/LC_MESSAGES/GroupPrivateMessage.po
index 15ac312231..5876ed0bb8 100644
--- a/plugins/GroupPrivateMessage/locale/ia/LC_MESSAGES/GroupPrivateMessage.po
+++ b/plugins/GroupPrivateMessage/locale/ia/LC_MESSAGES/GroupPrivateMessage.po
@@ -9,33 +9,31 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GroupPrivateMessage\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-24 10:32+0000\n"
-"PO-Revision-Date: 2011-02-24 10:39:11+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:22+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-17 11:34:54+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r82712); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:11+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-groupprivatemessage\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: Group_message.php:137
-#, php-format
-msgid "That's too long. Maximum message size is %d character."
-msgid_plural "That's too long. Maximum message size is %d characters."
-msgstr[0] ""
-"Isto es troppo longe. Le dimension maxime de messages es %d characteres."
-msgstr[1] ""
-"Isto es troppo longe. Le dimension maxime de messages es %d characteres."
+msgid "Inbox"
+msgstr "Cassa de entrata"
+
+msgid "Private messages for this group"
+msgstr "Messages private pro iste gruppo"
+
+msgid "Allow posting DMs to a group."
+msgstr "Permitter de inviar messages directe a un gruppo."
 
-#: groupinbox.php:125
 msgid "This group has not received any private messages."
 msgstr "Iste gruppo non ha recipite messages private."
 
 #. TRANS: Instructions for user inbox page.
-#: groupinbox.php:206
 msgid ""
 "This is the group inbox, which lists all incoming private messages for this "
 "group."
@@ -43,19 +41,14 @@ msgstr ""
 "Isto es le cassa de entrata del gruppo, que lista tote le messages private "
 "recipite pro iste gruppo."
 
-#: GroupPrivateMessagePlugin.php:210
-msgid "Inbox"
-msgstr "Cassa de entrata"
-
-#: GroupPrivateMessagePlugin.php:211
-msgid "Private messages for this group"
-msgstr "Messages private pro iste gruppo"
-
-#: GroupPrivateMessagePlugin.php:502
-msgid "Allow posting DMs to a group."
-msgstr "Permitter de inviar messages directe a un gruppo."
-
-#: groupmessageform.php:164
 msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr "Inviar"
+
+#, php-format
+msgid "That's too long. Maximum message size is %d character."
+msgid_plural "That's too long. Maximum message size is %d characters."
+msgstr[0] ""
+"Isto es troppo longe. Le dimension maxime de messages es %d characteres."
+msgstr[1] ""
+"Isto es troppo longe. Le dimension maxime de messages es %d characteres."
diff --git a/plugins/GroupPrivateMessage/locale/mk/LC_MESSAGES/GroupPrivateMessage.po b/plugins/GroupPrivateMessage/locale/mk/LC_MESSAGES/GroupPrivateMessage.po
index 78cb6b708c..62c5657115 100644
--- a/plugins/GroupPrivateMessage/locale/mk/LC_MESSAGES/GroupPrivateMessage.po
+++ b/plugins/GroupPrivateMessage/locale/mk/LC_MESSAGES/GroupPrivateMessage.po
@@ -9,31 +9,31 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GroupPrivateMessage\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-24 10:32+0000\n"
-"PO-Revision-Date: 2011-02-24 10:39:11+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:22+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-17 11:34:54+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r82712); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:11+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-groupprivatemessage\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
 
-#: Group_message.php:137
-#, php-format
-msgid "That's too long. Maximum message size is %d character."
-msgid_plural "That's too long. Maximum message size is %d characters."
-msgstr[0] "Ова е предолго. Дозволен е само %d знак."
-msgstr[1] "Ова е предолго. Дозволени се највеќе %d знаци."
+msgid "Inbox"
+msgstr "Примени"
+
+msgid "Private messages for this group"
+msgstr "Приватни пораки за групава"
+
+msgid "Allow posting DMs to a group."
+msgstr "Дозволи испраќање НП на група."
 
-#: groupinbox.php:125
 msgid "This group has not received any private messages."
 msgstr "Оваа група нема примено приватни пораки."
 
 #. TRANS: Instructions for user inbox page.
-#: groupinbox.php:206
 msgid ""
 "This is the group inbox, which lists all incoming private messages for this "
 "group."
@@ -41,19 +41,12 @@ msgstr ""
 "Ова се примените пораки на групата кајшто се заведуваат сите дојдовни "
 "приватни пораки за оваа група."
 
-#: GroupPrivateMessagePlugin.php:210
-msgid "Inbox"
-msgstr "Примени"
-
-#: GroupPrivateMessagePlugin.php:211
-msgid "Private messages for this group"
-msgstr "Приватни пораки за групава"
-
-#: GroupPrivateMessagePlugin.php:502
-msgid "Allow posting DMs to a group."
-msgstr "Дозволи испраќање НП на група."
-
-#: groupmessageform.php:164
 msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr "Испрати"
+
+#, php-format
+msgid "That's too long. Maximum message size is %d character."
+msgid_plural "That's too long. Maximum message size is %d characters."
+msgstr[0] "Ова е предолго. Дозволен е само %d знак."
+msgstr[1] "Ова е предолго. Дозволени се највеќе %d знаци."
diff --git a/plugins/GroupPrivateMessage/locale/nl/LC_MESSAGES/GroupPrivateMessage.po b/plugins/GroupPrivateMessage/locale/nl/LC_MESSAGES/GroupPrivateMessage.po
index 96cea800c0..150d4d0eb6 100644
--- a/plugins/GroupPrivateMessage/locale/nl/LC_MESSAGES/GroupPrivateMessage.po
+++ b/plugins/GroupPrivateMessage/locale/nl/LC_MESSAGES/GroupPrivateMessage.po
@@ -9,31 +9,31 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GroupPrivateMessage\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-24 10:32+0000\n"
-"PO-Revision-Date: 2011-02-24 10:39:11+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:22+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-17 11:34:54+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r82712); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:11+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-groupprivatemessage\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: Group_message.php:137
-#, php-format
-msgid "That's too long. Maximum message size is %d character."
-msgid_plural "That's too long. Maximum message size is %d characters."
-msgstr[0] "Dat is te lang. De maximale berichtlengte is %d teken."
-msgstr[1] "Dat is te lang. De maximale berichtlengte is %d tekens."
+msgid "Inbox"
+msgstr "Postvak IN"
+
+msgid "Private messages for this group"
+msgstr "Privéberichten voor deze groep"
+
+msgid "Allow posting DMs to a group."
+msgstr "Verzenden van Directe berichten naar een groep toestaan."
 
-#: groupinbox.php:125
 msgid "This group has not received any private messages."
 msgstr "Deze groep heeft geen privéberichten ontvangen."
 
 #. TRANS: Instructions for user inbox page.
-#: groupinbox.php:206
 msgid ""
 "This is the group inbox, which lists all incoming private messages for this "
 "group."
@@ -41,19 +41,12 @@ msgstr ""
 "Dit is het Postvak IN van de groep waarom alle inkomende privéberichten voor "
 "deze groep worden weergegeven."
 
-#: GroupPrivateMessagePlugin.php:210
-msgid "Inbox"
-msgstr "Postvak IN"
-
-#: GroupPrivateMessagePlugin.php:211
-msgid "Private messages for this group"
-msgstr "Privéberichten voor deze groep"
-
-#: GroupPrivateMessagePlugin.php:502
-msgid "Allow posting DMs to a group."
-msgstr "Verzenden van Directe berichten naar een groep toestaan."
-
-#: groupmessageform.php:164
 msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr "Verzenden"
+
+#, php-format
+msgid "That's too long. Maximum message size is %d character."
+msgid_plural "That's too long. Maximum message size is %d characters."
+msgstr[0] "Dat is te lang. De maximale berichtlengte is %d teken."
+msgstr[1] "Dat is te lang. De maximale berichtlengte is %d tekens."
diff --git a/plugins/GroupPrivateMessage/locale/sr-ec/LC_MESSAGES/GroupPrivateMessage.po b/plugins/GroupPrivateMessage/locale/sr-ec/LC_MESSAGES/GroupPrivateMessage.po
index e091754e2d..07cb23cdcf 100644
--- a/plugins/GroupPrivateMessage/locale/sr-ec/LC_MESSAGES/GroupPrivateMessage.po
+++ b/plugins/GroupPrivateMessage/locale/sr-ec/LC_MESSAGES/GroupPrivateMessage.po
@@ -9,50 +9,43 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GroupPrivateMessage\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-24 10:32+0000\n"
-"PO-Revision-Date: 2011-02-24 10:39:12+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:22+0000\n"
 "Language-Team: Serbian Cyrillic ekavian <http://translatewiki.net/wiki/"
 "Portal:sr-ec>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-17 11:34:54+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r82712); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:11+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: sr-ec\n"
 "X-Message-Group: #out-statusnet-plugin-groupprivatemessage\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: Group_message.php:137
-#, php-format
-msgid "That's too long. Maximum message size is %d character."
-msgid_plural "That's too long. Maximum message size is %d characters."
-msgstr[0] "%d знак"
-msgstr[1] "%d знака"
+msgid "Inbox"
+msgstr "Примљене"
+
+msgid "Private messages for this group"
+msgstr "Приватне поруке ове групе"
+
+msgid "Allow posting DMs to a group."
+msgstr ""
 
-#: groupinbox.php:125
 msgid "This group has not received any private messages."
 msgstr ""
 
 #. TRANS: Instructions for user inbox page.
-#: groupinbox.php:206
 msgid ""
 "This is the group inbox, which lists all incoming private messages for this "
 "group."
 msgstr ""
 
-#: GroupPrivateMessagePlugin.php:210
-msgid "Inbox"
-msgstr "Примљене"
-
-#: GroupPrivateMessagePlugin.php:211
-msgid "Private messages for this group"
-msgstr "Приватне поруке ове групе"
-
-#: GroupPrivateMessagePlugin.php:502
-msgid "Allow posting DMs to a group."
-msgstr ""
-
-#: groupmessageform.php:164
 msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr "Пошаљи"
+
+#, php-format
+msgid "That's too long. Maximum message size is %d character."
+msgid_plural "That's too long. Maximum message size is %d characters."
+msgstr[0] "%d знак"
+msgstr[1] "%d знака"
diff --git a/plugins/GroupPrivateMessage/locale/te/LC_MESSAGES/GroupPrivateMessage.po b/plugins/GroupPrivateMessage/locale/te/LC_MESSAGES/GroupPrivateMessage.po
index 6e979f826a..374912c52a 100644
--- a/plugins/GroupPrivateMessage/locale/te/LC_MESSAGES/GroupPrivateMessage.po
+++ b/plugins/GroupPrivateMessage/locale/te/LC_MESSAGES/GroupPrivateMessage.po
@@ -9,49 +9,42 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GroupPrivateMessage\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-24 10:32+0000\n"
-"PO-Revision-Date: 2011-02-24 10:39:12+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:22+0000\n"
 "Language-Team: Telugu <http://translatewiki.net/wiki/Portal:te>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-17 11:34:54+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r82712); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:11+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: te\n"
 "X-Message-Group: #out-statusnet-plugin-groupprivatemessage\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: Group_message.php:137
-#, php-format
-msgid "That's too long. Maximum message size is %d character."
-msgid_plural "That's too long. Maximum message size is %d characters."
-msgstr[0] ""
-msgstr[1] ""
+msgid "Inbox"
+msgstr ""
+
+msgid "Private messages for this group"
+msgstr "ఈ గుంపుకి వచ్చిన అంతరంగిక సందేశాలు"
+
+msgid "Allow posting DMs to a group."
+msgstr ""
 
-#: groupinbox.php:125
 msgid "This group has not received any private messages."
 msgstr "ఈ గుంపుకి అంతరంగిక సందేశాలేమీ అందలేదు."
 
 #. TRANS: Instructions for user inbox page.
-#: groupinbox.php:206
 msgid ""
 "This is the group inbox, which lists all incoming private messages for this "
 "group."
 msgstr ""
 
-#: GroupPrivateMessagePlugin.php:210
-msgid "Inbox"
-msgstr ""
-
-#: GroupPrivateMessagePlugin.php:211
-msgid "Private messages for this group"
-msgstr "ఈ గుంపుకి వచ్చిన అంతరంగిక సందేశాలు"
-
-#: GroupPrivateMessagePlugin.php:502
-msgid "Allow posting DMs to a group."
-msgstr ""
-
-#: groupmessageform.php:164
 msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr "పంపించు"
+
+#, php-format
+msgid "That's too long. Maximum message size is %d character."
+msgid_plural "That's too long. Maximum message size is %d characters."
+msgstr[0] ""
+msgstr[1] ""
diff --git a/plugins/GroupPrivateMessage/locale/uk/LC_MESSAGES/GroupPrivateMessage.po b/plugins/GroupPrivateMessage/locale/uk/LC_MESSAGES/GroupPrivateMessage.po
index f6a0ea5a4c..82520d2c4b 100644
--- a/plugins/GroupPrivateMessage/locale/uk/LC_MESSAGES/GroupPrivateMessage.po
+++ b/plugins/GroupPrivateMessage/locale/uk/LC_MESSAGES/GroupPrivateMessage.po
@@ -9,52 +9,45 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GroupPrivateMessage\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-24 10:32+0000\n"
-"PO-Revision-Date: 2011-02-24 10:39:12+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:22+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-17 11:34:54+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r82712); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:11+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-groupprivatemessage\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: Group_message.php:137
-#, php-format
-msgid "That's too long. Maximum message size is %d character."
-msgid_plural "That's too long. Maximum message size is %d characters."
-msgstr[0] "Допис надто довгий. Максимальна довжина повідомлення — %d символ."
-msgstr[1] "Допис надто довгий. Максимальна довжина повідомлення — %d символів."
-msgstr[2] "Допис надто довгий. Максимальна довжина повідомлення — %d символів."
+msgid "Inbox"
+msgstr "Вхідні"
+
+msgid "Private messages for this group"
+msgstr "Приватні повідомлення для цієї спільноти"
+
+msgid "Allow posting DMs to a group."
+msgstr "Дозволити надсилання «прямих» повідомлень до спільноти."
 
-#: groupinbox.php:125
 msgid "This group has not received any private messages."
 msgstr "До цієї спільноти не надходило ніяких приватних повідомлень."
 
 #. TRANS: Instructions for user inbox page.
-#: groupinbox.php:206
 msgid ""
 "This is the group inbox, which lists all incoming private messages for this "
 "group."
 msgstr ""
 "Тут містяться всі вхідні повідомлення цієї спільноти, надіслані приватно."
 
-#: GroupPrivateMessagePlugin.php:210
-msgid "Inbox"
-msgstr "Вхідні"
-
-#: GroupPrivateMessagePlugin.php:211
-msgid "Private messages for this group"
-msgstr "Приватні повідомлення для цієї спільноти"
-
-#: GroupPrivateMessagePlugin.php:502
-msgid "Allow posting DMs to a group."
-msgstr "Дозволити надсилання «прямих» повідомлень до спільноти."
-
-#: groupmessageform.php:164
 msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr "Надіслати"
+
+#, php-format
+msgid "That's too long. Maximum message size is %d character."
+msgid_plural "That's too long. Maximum message size is %d characters."
+msgstr[0] "Допис надто довгий. Максимальна довжина повідомлення — %d символ."
+msgstr[1] "Допис надто довгий. Максимальна довжина повідомлення — %d символів."
+msgstr[2] "Допис надто довгий. Максимальна довжина повідомлення — %d символів."
diff --git a/plugins/GroupPrivateMessage/locale/zh_CN/LC_MESSAGES/GroupPrivateMessage.po b/plugins/GroupPrivateMessage/locale/zh_CN/LC_MESSAGES/GroupPrivateMessage.po
index 0a110a769a..0c018d04a9 100644
--- a/plugins/GroupPrivateMessage/locale/zh_CN/LC_MESSAGES/GroupPrivateMessage.po
+++ b/plugins/GroupPrivateMessage/locale/zh_CN/LC_MESSAGES/GroupPrivateMessage.po
@@ -9,49 +9,42 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GroupPrivateMessage\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-24 10:32+0000\n"
-"PO-Revision-Date: 2011-02-24 10:39:12+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:22+0000\n"
 "Language-Team: Simplified Chinese <http://translatewiki.net/wiki/Portal:zh-"
 "hans>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-17 11:34:54+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r82712); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:11+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-groupprivatemessage\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: Group_message.php:137
-#, php-format
-msgid "That's too long. Maximum message size is %d character."
-msgid_plural "That's too long. Maximum message size is %d characters."
-msgstr[0] ""
+msgid "Inbox"
+msgstr "收件箱"
+
+msgid "Private messages for this group"
+msgstr "此组的私人消息"
+
+msgid "Allow posting DMs to a group."
+msgstr "允许向一组发布旅游景点管理系统。"
 
-#: groupinbox.php:125
 msgid "This group has not received any private messages."
 msgstr ""
 
 #. TRANS: Instructions for user inbox page.
-#: groupinbox.php:206
 msgid ""
 "This is the group inbox, which lists all incoming private messages for this "
 "group."
 msgstr ""
 
-#: GroupPrivateMessagePlugin.php:210
-msgid "Inbox"
-msgstr "收件箱"
-
-#: GroupPrivateMessagePlugin.php:211
-msgid "Private messages for this group"
-msgstr "此组的私人消息"
-
-#: GroupPrivateMessagePlugin.php:502
-msgid "Allow posting DMs to a group."
-msgstr "允许向一组发布旅游景点管理系统。"
-
-#: groupmessageform.php:164
 msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr "发送"
+
+#, php-format
+msgid "That's too long. Maximum message size is %d character."
+msgid_plural "That's too long. Maximum message size is %d characters."
+msgstr[0] ""
diff --git a/plugins/Imap/locale/Imap.pot b/plugins/Imap/locale/Imap.pot
index 1016c4068e..ebc931f836 100644
--- a/plugins/Imap/locale/Imap.pot
+++ b/plugins/Imap/locale/Imap.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/Imap/locale/br/LC_MESSAGES/Imap.po b/plugins/Imap/locale/br/LC_MESSAGES/Imap.po
index 41639dc314..6f96024680 100644
--- a/plugins/Imap/locale/br/LC_MESSAGES/Imap.po
+++ b/plugins/Imap/locale/br/LC_MESSAGES/Imap.po
@@ -9,45 +9,38 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Imap\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:56+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:23+0000\n"
 "Language-Team: Breton <http://translatewiki.net/wiki/Portal:br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:02+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:35+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-imap\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: imapmailhandler.php:30
 msgid "Error"
 msgstr "Fazi"
 
-#: imapmanager.php:51
 msgid ""
 "ImapManager should be created using its constructor, not the using the "
 "static get method."
 msgstr ""
 
-#: ImapPlugin.php:54
 msgid "A mailbox must be specified."
 msgstr "Ur boest lizhiri a rank bezañ spisaet."
 
-#: ImapPlugin.php:57
 msgid "A user must be specified."
 msgstr "Un anv-implijer a rank bezañ spisaet."
 
-#: ImapPlugin.php:60
 msgid "A password must be specified."
 msgstr "Ur ger-tremen a rank bezañ spisaet."
 
-#: ImapPlugin.php:63
 msgid "A poll_frequency must be specified."
 msgstr ""
 
-#: ImapPlugin.php:103
 msgid ""
 "The IMAP plugin allows for StatusNet to check a POP or IMAP mailbox for "
 "incoming mail containing user posts."
diff --git a/plugins/Imap/locale/de/LC_MESSAGES/Imap.po b/plugins/Imap/locale/de/LC_MESSAGES/Imap.po
index c0fba4194f..df44ca9f77 100644
--- a/plugins/Imap/locale/de/LC_MESSAGES/Imap.po
+++ b/plugins/Imap/locale/de/LC_MESSAGES/Imap.po
@@ -10,23 +10,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Imap\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-14 16:01+0000\n"
-"PO-Revision-Date: 2011-02-14 16:08:16+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:23+0000\n"
 "Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:24:04+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r82114); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:35+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-imap\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: imapmailhandler.php:30
 msgid "Error"
 msgstr "Fehler"
 
-#: imapmanager.php:51
 msgid ""
 "ImapManager should be created using its constructor, not the using the "
 "static get method."
@@ -34,23 +32,18 @@ msgstr ""
 "ImapManager sollte durch seinen Konstruktor erstellt werden, nicht durch die "
 "statische get-Methode."
 
-#: ImapPlugin.php:54
 msgid "A mailbox must be specified."
 msgstr "Ein Postfach muss angegeben werden."
 
-#: ImapPlugin.php:57
 msgid "A user must be specified."
 msgstr "Ein Benutzer muss angegeben werden."
 
-#: ImapPlugin.php:60
 msgid "A password must be specified."
 msgstr "Ein Passwort muss angegeben werden."
 
-#: ImapPlugin.php:63
 msgid "A poll_frequency must be specified."
 msgstr "Eine Abfragefrequenz muss angegeben werden."
 
-#: ImapPlugin.php:103
 msgid ""
 "The IMAP plugin allows for StatusNet to check a POP or IMAP mailbox for "
 "incoming mail containing user posts."
diff --git a/plugins/Imap/locale/fr/LC_MESSAGES/Imap.po b/plugins/Imap/locale/fr/LC_MESSAGES/Imap.po
index e93d934ede..329f5a371a 100644
--- a/plugins/Imap/locale/fr/LC_MESSAGES/Imap.po
+++ b/plugins/Imap/locale/fr/LC_MESSAGES/Imap.po
@@ -10,23 +10,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Imap\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:56+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:23+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:02+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:35+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-imap\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: imapmailhandler.php:30
 msgid "Error"
 msgstr "Erreur"
 
-#: imapmanager.php:51
 msgid ""
 "ImapManager should be created using its constructor, not the using the "
 "static get method."
@@ -34,23 +32,18 @@ msgstr ""
 "ImapManager devrait être instancié en utilisant son constructeur et non pas "
 "en utilisant la méthode statique « get »."
 
-#: ImapPlugin.php:54
 msgid "A mailbox must be specified."
 msgstr "Une boîte aux lettres doit être spécifiée."
 
-#: ImapPlugin.php:57
 msgid "A user must be specified."
 msgstr "Un nom d’utilisateur doit être spécifié."
 
-#: ImapPlugin.php:60
 msgid "A password must be specified."
 msgstr "Un mot de passe doit être spécifié."
 
-#: ImapPlugin.php:63
 msgid "A poll_frequency must be specified."
 msgstr "Une fréquence d’interrogation doit être spécifiée."
 
-#: ImapPlugin.php:103
 msgid ""
 "The IMAP plugin allows for StatusNet to check a POP or IMAP mailbox for "
 "incoming mail containing user posts."
diff --git a/plugins/Imap/locale/ia/LC_MESSAGES/Imap.po b/plugins/Imap/locale/ia/LC_MESSAGES/Imap.po
index d6640d0979..4097d2ff68 100644
--- a/plugins/Imap/locale/ia/LC_MESSAGES/Imap.po
+++ b/plugins/Imap/locale/ia/LC_MESSAGES/Imap.po
@@ -9,23 +9,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Imap\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:56+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:23+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:02+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:35+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-imap\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: imapmailhandler.php:30
 msgid "Error"
 msgstr "Error"
 
-#: imapmanager.php:51
 msgid ""
 "ImapManager should be created using its constructor, not the using the "
 "static get method."
@@ -33,23 +31,18 @@ msgstr ""
 "ImapManager debe esser create per medio de su constructor, non con le "
 "methodo \"get\" static."
 
-#: ImapPlugin.php:54
 msgid "A mailbox must be specified."
 msgstr "Un cassa postal debe esser specificate."
 
-#: ImapPlugin.php:57
 msgid "A user must be specified."
 msgstr "Un usator debe esser specificate."
 
-#: ImapPlugin.php:60
 msgid "A password must be specified."
 msgstr "Un contrasigno debe esser specificate."
 
-#: ImapPlugin.php:63
 msgid "A poll_frequency must be specified."
 msgstr "Un poll_frequency debe esser specificate."
 
-#: ImapPlugin.php:103
 msgid ""
 "The IMAP plugin allows for StatusNet to check a POP or IMAP mailbox for "
 "incoming mail containing user posts."
diff --git a/plugins/Imap/locale/mk/LC_MESSAGES/Imap.po b/plugins/Imap/locale/mk/LC_MESSAGES/Imap.po
index 894efff3d9..91c4af6d3e 100644
--- a/plugins/Imap/locale/mk/LC_MESSAGES/Imap.po
+++ b/plugins/Imap/locale/mk/LC_MESSAGES/Imap.po
@@ -9,23 +9,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Imap\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:56+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:23+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:02+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:35+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-imap\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
 
-#: imapmailhandler.php:30
 msgid "Error"
 msgstr "Грешка"
 
-#: imapmanager.php:51
 msgid ""
 "ImapManager should be created using its constructor, not the using the "
 "static get method."
@@ -33,23 +31,18 @@ msgstr ""
 "ImapManager треба да се создаде користејќи го неговиот конструктор, а не "
 "преку статичниот метод на негово добивање."
 
-#: ImapPlugin.php:54
 msgid "A mailbox must be specified."
 msgstr "Мора да назначите сандаче."
 
-#: ImapPlugin.php:57
 msgid "A user must be specified."
 msgstr "Мора да назначите корисник."
 
-#: ImapPlugin.php:60
 msgid "A password must be specified."
 msgstr "Мора да назначите лозинка."
 
-#: ImapPlugin.php:63
 msgid "A poll_frequency must be specified."
 msgstr "Мора да назначите poll_frequency."
 
-#: ImapPlugin.php:103
 msgid ""
 "The IMAP plugin allows for StatusNet to check a POP or IMAP mailbox for "
 "incoming mail containing user posts."
diff --git a/plugins/Imap/locale/nb/LC_MESSAGES/Imap.po b/plugins/Imap/locale/nb/LC_MESSAGES/Imap.po
index 4db7dd99a6..81f71197af 100644
--- a/plugins/Imap/locale/nb/LC_MESSAGES/Imap.po
+++ b/plugins/Imap/locale/nb/LC_MESSAGES/Imap.po
@@ -9,23 +9,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Imap\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:56+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:23+0000\n"
 "Language-Team: Norwegian (bokmål)‬ <http://translatewiki.net/wiki/Portal:no>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:02+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:35+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: #out-statusnet-plugin-imap\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: imapmailhandler.php:30
 msgid "Error"
 msgstr "Feil"
 
-#: imapmanager.php:51
 msgid ""
 "ImapManager should be created using its constructor, not the using the "
 "static get method."
@@ -33,23 +31,18 @@ msgstr ""
 "ImapManager bør opprettes ved å bruke dets konstruktør, ikke ved å bruke "
 "dets statiske get-metode."
 
-#: ImapPlugin.php:54
 msgid "A mailbox must be specified."
 msgstr "En postkasse må spesifiseres."
 
-#: ImapPlugin.php:57
 msgid "A user must be specified."
 msgstr "En bruker må spesifiseres."
 
-#: ImapPlugin.php:60
 msgid "A password must be specified."
 msgstr "Et passord må spesifiseres."
 
-#: ImapPlugin.php:63
 msgid "A poll_frequency must be specified."
 msgstr "En poll_frequency må spesifiseres."
 
-#: ImapPlugin.php:103
 msgid ""
 "The IMAP plugin allows for StatusNet to check a POP or IMAP mailbox for "
 "incoming mail containing user posts."
diff --git a/plugins/Imap/locale/nl/LC_MESSAGES/Imap.po b/plugins/Imap/locale/nl/LC_MESSAGES/Imap.po
index 0c1cb56d4d..59880e7c8a 100644
--- a/plugins/Imap/locale/nl/LC_MESSAGES/Imap.po
+++ b/plugins/Imap/locale/nl/LC_MESSAGES/Imap.po
@@ -9,23 +9,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Imap\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:56+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:23+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:02+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:35+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-imap\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: imapmailhandler.php:30
 msgid "Error"
 msgstr "Fout"
 
-#: imapmanager.php:51
 msgid ""
 "ImapManager should be created using its constructor, not the using the "
 "static get method."
@@ -33,23 +31,18 @@ msgstr ""
 "ImapManager moet aangemaakt worden via de constructor en niet met de "
 "statische methode get."
 
-#: ImapPlugin.php:54
 msgid "A mailbox must be specified."
 msgstr "Er moet een postbus opgegeven worden."
 
-#: ImapPlugin.php:57
 msgid "A user must be specified."
 msgstr "Er moet een gebruiker opgegeven worden."
 
-#: ImapPlugin.php:60
 msgid "A password must be specified."
 msgstr "Er moet een wachtwoord opgegeven worden."
 
-#: ImapPlugin.php:63
 msgid "A poll_frequency must be specified."
 msgstr "Er moet een poll_frequency opgegeven worden."
 
-#: ImapPlugin.php:103
 msgid ""
 "The IMAP plugin allows for StatusNet to check a POP or IMAP mailbox for "
 "incoming mail containing user posts."
diff --git a/plugins/Imap/locale/ru/LC_MESSAGES/Imap.po b/plugins/Imap/locale/ru/LC_MESSAGES/Imap.po
index 1d75e1321d..dc87f895ae 100644
--- a/plugins/Imap/locale/ru/LC_MESSAGES/Imap.po
+++ b/plugins/Imap/locale/ru/LC_MESSAGES/Imap.po
@@ -10,24 +10,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Imap\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:56+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:23+0000\n"
 "Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:02+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:35+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-imap\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: imapmailhandler.php:30
 msgid "Error"
 msgstr "Ошибка"
 
-#: imapmanager.php:51
 msgid ""
 "ImapManager should be created using its constructor, not the using the "
 "static get method."
@@ -35,23 +33,18 @@ msgstr ""
 "ImapManager должен быть создан с помощью конструктора, а не получен "
 "статическим методом."
 
-#: ImapPlugin.php:54
 msgid "A mailbox must be specified."
 msgstr "Должен быть указан почтовый ящик."
 
-#: ImapPlugin.php:57
 msgid "A user must be specified."
 msgstr "Должен быть указан пользователь."
 
-#: ImapPlugin.php:60
 msgid "A password must be specified."
 msgstr "Должен быть указан пароль."
 
-#: ImapPlugin.php:63
 msgid "A poll_frequency must be specified."
 msgstr "Периодичность проверки должна быть задана в poll_frequency."
 
-#: ImapPlugin.php:103
 msgid ""
 "The IMAP plugin allows for StatusNet to check a POP or IMAP mailbox for "
 "incoming mail containing user posts."
diff --git a/plugins/Imap/locale/tl/LC_MESSAGES/Imap.po b/plugins/Imap/locale/tl/LC_MESSAGES/Imap.po
index 9135e02965..0a249eb4ff 100644
--- a/plugins/Imap/locale/tl/LC_MESSAGES/Imap.po
+++ b/plugins/Imap/locale/tl/LC_MESSAGES/Imap.po
@@ -9,23 +9,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Imap\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:56+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:23+0000\n"
 "Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:02+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:35+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-imap\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: imapmailhandler.php:30
 msgid "Error"
 msgstr "Kamalian"
 
-#: imapmanager.php:51
 msgid ""
 "ImapManager should be created using its constructor, not the using the "
 "static get method."
@@ -33,23 +31,18 @@ msgstr ""
 "Dapat na likhain ang ImapManager sa pamamagitan ng pambuo nito, hindi sa "
 "paggamit ng paraang hindi gumagalaw ang  pagkuha."
 
-#: ImapPlugin.php:54
 msgid "A mailbox must be specified."
 msgstr "Dapat tukuyin ang isang kahon ng liham."
 
-#: ImapPlugin.php:57
 msgid "A user must be specified."
 msgstr "Dapat tukuyin ang isang tagagamit."
 
-#: ImapPlugin.php:60
 msgid "A password must be specified."
 msgstr "Dapat tukuyin ang isang hudyat."
 
-#: ImapPlugin.php:63
 msgid "A poll_frequency must be specified."
 msgstr "Dapat tukuyin ang isang kadalasan ng botohan."
 
-#: ImapPlugin.php:103
 msgid ""
 "The IMAP plugin allows for StatusNet to check a POP or IMAP mailbox for "
 "incoming mail containing user posts."
diff --git a/plugins/Imap/locale/uk/LC_MESSAGES/Imap.po b/plugins/Imap/locale/uk/LC_MESSAGES/Imap.po
index f27adcbd6b..e891ef1718 100644
--- a/plugins/Imap/locale/uk/LC_MESSAGES/Imap.po
+++ b/plugins/Imap/locale/uk/LC_MESSAGES/Imap.po
@@ -9,24 +9,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Imap\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:56+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:23+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:02+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:35+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-imap\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: imapmailhandler.php:30
 msgid "Error"
 msgstr "Помилка"
 
-#: imapmanager.php:51
 msgid ""
 "ImapManager should be created using its constructor, not the using the "
 "static get method."
@@ -34,23 +32,18 @@ msgstr ""
 "ImapManager має бути створений за допомогою конструктору, не статичним "
 "методом."
 
-#: ImapPlugin.php:54
 msgid "A mailbox must be specified."
 msgstr "Поштову скриньку має бути зазначено."
 
-#: ImapPlugin.php:57
 msgid "A user must be specified."
 msgstr "Користувача має бути зазначено."
 
-#: ImapPlugin.php:60
 msgid "A password must be specified."
 msgstr "Пароль має бути зазначено."
 
-#: ImapPlugin.php:63
 msgid "A poll_frequency must be specified."
 msgstr "Періодичність перевірки має бути зазначено."
 
-#: ImapPlugin.php:103
 msgid ""
 "The IMAP plugin allows for StatusNet to check a POP or IMAP mailbox for "
 "incoming mail containing user posts."
diff --git a/plugins/Imap/locale/zh_CN/LC_MESSAGES/Imap.po b/plugins/Imap/locale/zh_CN/LC_MESSAGES/Imap.po
index fdd1a2d316..ff49fc64df 100644
--- a/plugins/Imap/locale/zh_CN/LC_MESSAGES/Imap.po
+++ b/plugins/Imap/locale/zh_CN/LC_MESSAGES/Imap.po
@@ -10,46 +10,39 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Imap\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 15:58+0000\n"
-"PO-Revision-Date: 2011-03-03 16:02:04+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:23+0000\n"
 "Language-Team: Simplified Chinese <http://translatewiki.net/wiki/Portal:zh-"
 "hans>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-14 17:20:37+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:35+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-imap\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: imapmailhandler.php:30
 msgid "Error"
 msgstr "错误"
 
-#: imapmanager.php:51
 msgid ""
 "ImapManager should be created using its constructor, not the using the "
 "static get method."
 msgstr "ImapManager 应该使用它的生成器来创建，而不是使用固定的 get 方法。"
 
-#: ImapPlugin.php:54
 msgid "A mailbox must be specified."
 msgstr "必须指定一个邮箱。"
 
-#: ImapPlugin.php:57
 msgid "A user must be specified."
 msgstr "必须设定一个用户。"
 
-#: ImapPlugin.php:60
 msgid "A password must be specified."
 msgstr "必须设定一个密码。"
 
-#: ImapPlugin.php:63
 msgid "A poll_frequency must be specified."
 msgstr "必须设定一个抓取频率。"
 
-#: ImapPlugin.php:103
 msgid ""
 "The IMAP plugin allows for StatusNet to check a POP or IMAP mailbox for "
 "incoming mail containing user posts."
diff --git a/plugins/InProcessCache/locale/InProcessCache.pot b/plugins/InProcessCache/locale/InProcessCache.pot
index 61ebc8f3dc..f1d7b67203 100644
--- a/plugins/InProcessCache/locale/InProcessCache.pot
+++ b/plugins/InProcessCache/locale/InProcessCache.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/InProcessCache/locale/de/LC_MESSAGES/InProcessCache.po b/plugins/InProcessCache/locale/de/LC_MESSAGES/InProcessCache.po
index 6dec48a6f6..4474cc1a97 100644
--- a/plugins/InProcessCache/locale/de/LC_MESSAGES/InProcessCache.po
+++ b/plugins/InProcessCache/locale/de/LC_MESSAGES/InProcessCache.po
@@ -9,18 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - InProcessCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-14 16:01+0000\n"
-"PO-Revision-Date: 2011-02-14 16:08:19+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:24+0000\n"
 "Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:25:53+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r82114); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:40+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-inprocesscache\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: InProcessCachePlugin.php:188
 msgid "Additional in-process cache for plugins."
 msgstr "Zusätzlicher in-Prozess-Cache für Plugins."
diff --git a/plugins/InProcessCache/locale/fr/LC_MESSAGES/InProcessCache.po b/plugins/InProcessCache/locale/fr/LC_MESSAGES/InProcessCache.po
index eea101dea9..b25038c597 100644
--- a/plugins/InProcessCache/locale/fr/LC_MESSAGES/InProcessCache.po
+++ b/plugins/InProcessCache/locale/fr/LC_MESSAGES/InProcessCache.po
@@ -9,18 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - InProcessCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:57+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:24+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:16+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:40+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-inprocesscache\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: InProcessCachePlugin.php:188
 msgid "Additional in-process cache for plugins."
 msgstr "Ajout de cache servant au traitement interne pour les plugins"
diff --git a/plugins/InProcessCache/locale/ia/LC_MESSAGES/InProcessCache.po b/plugins/InProcessCache/locale/ia/LC_MESSAGES/InProcessCache.po
index aa79a12be4..ab40998b9b 100644
--- a/plugins/InProcessCache/locale/ia/LC_MESSAGES/InProcessCache.po
+++ b/plugins/InProcessCache/locale/ia/LC_MESSAGES/InProcessCache.po
@@ -9,18 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - InProcessCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:57+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:25+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:16+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:40+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-inprocesscache\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: InProcessCachePlugin.php:188
 msgid "Additional in-process cache for plugins."
 msgstr "Un cache in-processo additional pro plug-ins."
diff --git a/plugins/InProcessCache/locale/mk/LC_MESSAGES/InProcessCache.po b/plugins/InProcessCache/locale/mk/LC_MESSAGES/InProcessCache.po
index 778969e4ee..338b893329 100644
--- a/plugins/InProcessCache/locale/mk/LC_MESSAGES/InProcessCache.po
+++ b/plugins/InProcessCache/locale/mk/LC_MESSAGES/InProcessCache.po
@@ -9,18 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - InProcessCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:57+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:25+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:16+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:40+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-inprocesscache\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
 
-#: InProcessCachePlugin.php:188
 msgid "Additional in-process cache for plugins."
 msgstr "Дополнителни приклучоци за кеш во текот на работата."
diff --git a/plugins/InProcessCache/locale/nl/LC_MESSAGES/InProcessCache.po b/plugins/InProcessCache/locale/nl/LC_MESSAGES/InProcessCache.po
index e4088174b5..cd2a802666 100644
--- a/plugins/InProcessCache/locale/nl/LC_MESSAGES/InProcessCache.po
+++ b/plugins/InProcessCache/locale/nl/LC_MESSAGES/InProcessCache.po
@@ -9,18 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - InProcessCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:57+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:25+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:16+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:40+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-inprocesscache\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: InProcessCachePlugin.php:188
 msgid "Additional in-process cache for plugins."
 msgstr "Extra in-procescache voor plug-ins."
diff --git a/plugins/InProcessCache/locale/pt/LC_MESSAGES/InProcessCache.po b/plugins/InProcessCache/locale/pt/LC_MESSAGES/InProcessCache.po
index 04fa407dd0..5909a164bf 100644
--- a/plugins/InProcessCache/locale/pt/LC_MESSAGES/InProcessCache.po
+++ b/plugins/InProcessCache/locale/pt/LC_MESSAGES/InProcessCache.po
@@ -9,18 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - InProcessCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 15:58+0000\n"
-"PO-Revision-Date: 2011-03-03 16:02:05+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:25+0000\n"
 "Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-25 23:45:16+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:40+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-plugin-inprocesscache\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: InProcessCachePlugin.php:188
 msgid "Additional in-process cache for plugins."
 msgstr "Cache de processo adicional para plug-ins."
diff --git a/plugins/InProcessCache/locale/ru/LC_MESSAGES/InProcessCache.po b/plugins/InProcessCache/locale/ru/LC_MESSAGES/InProcessCache.po
index 0273a7bbc1..47f772b0b8 100644
--- a/plugins/InProcessCache/locale/ru/LC_MESSAGES/InProcessCache.po
+++ b/plugins/InProcessCache/locale/ru/LC_MESSAGES/InProcessCache.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - InProcessCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:57+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:25+0000\n"
 "Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:16+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:40+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-inprocesscache\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: InProcessCachePlugin.php:188
 msgid "Additional in-process cache for plugins."
 msgstr "Дополнительный внутрипроцессный кэш для плагинов."
diff --git a/plugins/InProcessCache/locale/uk/LC_MESSAGES/InProcessCache.po b/plugins/InProcessCache/locale/uk/LC_MESSAGES/InProcessCache.po
index 2b473301e7..853398c619 100644
--- a/plugins/InProcessCache/locale/uk/LC_MESSAGES/InProcessCache.po
+++ b/plugins/InProcessCache/locale/uk/LC_MESSAGES/InProcessCache.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - InProcessCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:57+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:25+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:16+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:40+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-inprocesscache\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: InProcessCachePlugin.php:188
 msgid "Additional in-process cache for plugins."
 msgstr "Додатковий «кеш-в-процесі» для додатків."
diff --git a/plugins/InProcessCache/locale/zh_CN/LC_MESSAGES/InProcessCache.po b/plugins/InProcessCache/locale/zh_CN/LC_MESSAGES/InProcessCache.po
index 1125503646..7617d0ba6a 100644
--- a/plugins/InProcessCache/locale/zh_CN/LC_MESSAGES/InProcessCache.po
+++ b/plugins/InProcessCache/locale/zh_CN/LC_MESSAGES/InProcessCache.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - InProcessCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-24 10:32+0000\n"
-"PO-Revision-Date: 2011-02-24 10:39:16+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:25+0000\n"
 "Language-Team: Simplified Chinese <http://translatewiki.net/wiki/Portal:zh-"
 "hans>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-14 17:20:40+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r82712); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:40+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-inprocesscache\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: InProcessCachePlugin.php:188
 msgid "Additional in-process cache for plugins."
 msgstr "其他过程中缓存的插件。"
diff --git a/plugins/InfiniteScroll/locale/InfiniteScroll.pot b/plugins/InfiniteScroll/locale/InfiniteScroll.pot
index dd061e17ef..2df90fb4f1 100644
--- a/plugins/InfiniteScroll/locale/InfiniteScroll.pot
+++ b/plugins/InfiniteScroll/locale/InfiniteScroll.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/InfiniteScroll/locale/de/LC_MESSAGES/InfiniteScroll.po b/plugins/InfiniteScroll/locale/de/LC_MESSAGES/InfiniteScroll.po
index ce957eda4e..d7bbe49ed5 100644
--- a/plugins/InfiniteScroll/locale/de/LC_MESSAGES/InfiniteScroll.po
+++ b/plugins/InfiniteScroll/locale/de/LC_MESSAGES/InfiniteScroll.po
@@ -10,19 +10,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - InfiniteScroll\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-14 16:01+0000\n"
-"PO-Revision-Date: 2011-02-14 16:08:18+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:23+0000\n"
 "Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:23:43+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r82114); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:13+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-infinitescroll\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: InfiniteScrollPlugin.php:54
 msgid ""
 "Infinite Scroll adds the following functionality to your StatusNet "
 "installation: When a user scrolls towards the bottom of the page, the next "
diff --git a/plugins/InfiniteScroll/locale/es/LC_MESSAGES/InfiniteScroll.po b/plugins/InfiniteScroll/locale/es/LC_MESSAGES/InfiniteScroll.po
index 2a1148bb20..5c0f65b030 100644
--- a/plugins/InfiniteScroll/locale/es/LC_MESSAGES/InfiniteScroll.po
+++ b/plugins/InfiniteScroll/locale/es/LC_MESSAGES/InfiniteScroll.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - InfiniteScroll\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:57+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:23+0000\n"
 "Language-Team: Spanish <http://translatewiki.net/wiki/Portal:es>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:02+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:13+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-infinitescroll\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: InfiniteScrollPlugin.php:54
 msgid ""
 "Infinite Scroll adds the following functionality to your StatusNet "
 "installation: When a user scrolls towards the bottom of the page, the next "
diff --git a/plugins/InfiniteScroll/locale/fr/LC_MESSAGES/InfiniteScroll.po b/plugins/InfiniteScroll/locale/fr/LC_MESSAGES/InfiniteScroll.po
index 9fabade039..14ca68a935 100644
--- a/plugins/InfiniteScroll/locale/fr/LC_MESSAGES/InfiniteScroll.po
+++ b/plugins/InfiniteScroll/locale/fr/LC_MESSAGES/InfiniteScroll.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - InfiniteScroll\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:57+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:24+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:02+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:13+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-infinitescroll\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: InfiniteScrollPlugin.php:54
 msgid ""
 "Infinite Scroll adds the following functionality to your StatusNet "
 "installation: When a user scrolls towards the bottom of the page, the next "
diff --git a/plugins/InfiniteScroll/locale/he/LC_MESSAGES/InfiniteScroll.po b/plugins/InfiniteScroll/locale/he/LC_MESSAGES/InfiniteScroll.po
index 4231fc6b20..8fbba4302c 100644
--- a/plugins/InfiniteScroll/locale/he/LC_MESSAGES/InfiniteScroll.po
+++ b/plugins/InfiniteScroll/locale/he/LC_MESSAGES/InfiniteScroll.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - InfiniteScroll\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:57+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:24+0000\n"
 "Language-Team: Hebrew <http://translatewiki.net/wiki/Portal:he>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:02+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:13+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-plugin-infinitescroll\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: InfiniteScrollPlugin.php:54
 msgid ""
 "Infinite Scroll adds the following functionality to your StatusNet "
 "installation: When a user scrolls towards the bottom of the page, the next "
diff --git a/plugins/InfiniteScroll/locale/ia/LC_MESSAGES/InfiniteScroll.po b/plugins/InfiniteScroll/locale/ia/LC_MESSAGES/InfiniteScroll.po
index 43a5a3bf45..4195a79e9d 100644
--- a/plugins/InfiniteScroll/locale/ia/LC_MESSAGES/InfiniteScroll.po
+++ b/plugins/InfiniteScroll/locale/ia/LC_MESSAGES/InfiniteScroll.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - InfiniteScroll\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:57+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:24+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:02+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:13+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-infinitescroll\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: InfiniteScrollPlugin.php:54
 msgid ""
 "Infinite Scroll adds the following functionality to your StatusNet "
 "installation: When a user scrolls towards the bottom of the page, the next "
diff --git a/plugins/InfiniteScroll/locale/id/LC_MESSAGES/InfiniteScroll.po b/plugins/InfiniteScroll/locale/id/LC_MESSAGES/InfiniteScroll.po
index efd538f2ef..f9a681d4eb 100644
--- a/plugins/InfiniteScroll/locale/id/LC_MESSAGES/InfiniteScroll.po
+++ b/plugins/InfiniteScroll/locale/id/LC_MESSAGES/InfiniteScroll.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - InfiniteScroll\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:57+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:24+0000\n"
 "Language-Team: Indonesian <http://translatewiki.net/wiki/Portal:id>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:02+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:13+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: id\n"
 "X-Message-Group: #out-statusnet-plugin-infinitescroll\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: InfiniteScrollPlugin.php:54
 msgid ""
 "Infinite Scroll adds the following functionality to your StatusNet "
 "installation: When a user scrolls towards the bottom of the page, the next "
diff --git a/plugins/InfiniteScroll/locale/ja/LC_MESSAGES/InfiniteScroll.po b/plugins/InfiniteScroll/locale/ja/LC_MESSAGES/InfiniteScroll.po
index 9a3215fcdd..c65056c85b 100644
--- a/plugins/InfiniteScroll/locale/ja/LC_MESSAGES/InfiniteScroll.po
+++ b/plugins/InfiniteScroll/locale/ja/LC_MESSAGES/InfiniteScroll.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - InfiniteScroll\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:57+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:24+0000\n"
 "Language-Team: Japanese <http://translatewiki.net/wiki/Portal:ja>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:02+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:13+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ja\n"
 "X-Message-Group: #out-statusnet-plugin-infinitescroll\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: InfiniteScrollPlugin.php:54
 msgid ""
 "Infinite Scroll adds the following functionality to your StatusNet "
 "installation: When a user scrolls towards the bottom of the page, the next "
diff --git a/plugins/InfiniteScroll/locale/mk/LC_MESSAGES/InfiniteScroll.po b/plugins/InfiniteScroll/locale/mk/LC_MESSAGES/InfiniteScroll.po
index 9cad8c5dbb..89f7b6d9df 100644
--- a/plugins/InfiniteScroll/locale/mk/LC_MESSAGES/InfiniteScroll.po
+++ b/plugins/InfiniteScroll/locale/mk/LC_MESSAGES/InfiniteScroll.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - InfiniteScroll\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:57+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:24+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:02+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:13+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-infinitescroll\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
 
-#: InfiniteScrollPlugin.php:54
 msgid ""
 "Infinite Scroll adds the following functionality to your StatusNet "
 "installation: When a user scrolls towards the bottom of the page, the next "
diff --git a/plugins/InfiniteScroll/locale/nb/LC_MESSAGES/InfiniteScroll.po b/plugins/InfiniteScroll/locale/nb/LC_MESSAGES/InfiniteScroll.po
index fb0f6d7aa8..2031a9c45d 100644
--- a/plugins/InfiniteScroll/locale/nb/LC_MESSAGES/InfiniteScroll.po
+++ b/plugins/InfiniteScroll/locale/nb/LC_MESSAGES/InfiniteScroll.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - InfiniteScroll\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:57+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:24+0000\n"
 "Language-Team: Norwegian (bokmål)‬ <http://translatewiki.net/wiki/Portal:no>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:02+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:13+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: #out-statusnet-plugin-infinitescroll\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: InfiniteScrollPlugin.php:54
 msgid ""
 "Infinite Scroll adds the following functionality to your StatusNet "
 "installation: When a user scrolls towards the bottom of the page, the next "
diff --git a/plugins/InfiniteScroll/locale/nl/LC_MESSAGES/InfiniteScroll.po b/plugins/InfiniteScroll/locale/nl/LC_MESSAGES/InfiniteScroll.po
index 574b53306b..3491cabe33 100644
--- a/plugins/InfiniteScroll/locale/nl/LC_MESSAGES/InfiniteScroll.po
+++ b/plugins/InfiniteScroll/locale/nl/LC_MESSAGES/InfiniteScroll.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - InfiniteScroll\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:57+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:24+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:02+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:13+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-infinitescroll\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: InfiniteScrollPlugin.php:54
 msgid ""
 "Infinite Scroll adds the following functionality to your StatusNet "
 "installation: When a user scrolls towards the bottom of the page, the next "
diff --git a/plugins/InfiniteScroll/locale/pt_BR/LC_MESSAGES/InfiniteScroll.po b/plugins/InfiniteScroll/locale/pt_BR/LC_MESSAGES/InfiniteScroll.po
index a356585d19..cd9af6f27c 100644
--- a/plugins/InfiniteScroll/locale/pt_BR/LC_MESSAGES/InfiniteScroll.po
+++ b/plugins/InfiniteScroll/locale/pt_BR/LC_MESSAGES/InfiniteScroll.po
@@ -9,20 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - InfiniteScroll\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:57+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:24+0000\n"
 "Language-Team: Brazilian Portuguese <http://translatewiki.net/wiki/Portal:pt-"
 "br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:02+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:13+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt-br\n"
 "X-Message-Group: #out-statusnet-plugin-infinitescroll\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: InfiniteScrollPlugin.php:54
 msgid ""
 "Infinite Scroll adds the following functionality to your StatusNet "
 "installation: When a user scrolls towards the bottom of the page, the next "
diff --git a/plugins/InfiniteScroll/locale/ru/LC_MESSAGES/InfiniteScroll.po b/plugins/InfiniteScroll/locale/ru/LC_MESSAGES/InfiniteScroll.po
index af62c79a04..9075f5dfe9 100644
--- a/plugins/InfiniteScroll/locale/ru/LC_MESSAGES/InfiniteScroll.po
+++ b/plugins/InfiniteScroll/locale/ru/LC_MESSAGES/InfiniteScroll.po
@@ -9,20 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - InfiniteScroll\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:57+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:24+0000\n"
 "Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:02+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:13+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-infinitescroll\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: InfiniteScrollPlugin.php:54
 msgid ""
 "Infinite Scroll adds the following functionality to your StatusNet "
 "installation: When a user scrolls towards the bottom of the page, the next "
diff --git a/plugins/InfiniteScroll/locale/tl/LC_MESSAGES/InfiniteScroll.po b/plugins/InfiniteScroll/locale/tl/LC_MESSAGES/InfiniteScroll.po
index 9952f5b715..2b4de8c4b5 100644
--- a/plugins/InfiniteScroll/locale/tl/LC_MESSAGES/InfiniteScroll.po
+++ b/plugins/InfiniteScroll/locale/tl/LC_MESSAGES/InfiniteScroll.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - InfiniteScroll\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:57+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:24+0000\n"
 "Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:02+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:13+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-infinitescroll\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: InfiniteScrollPlugin.php:54
 msgid ""
 "Infinite Scroll adds the following functionality to your StatusNet "
 "installation: When a user scrolls towards the bottom of the page, the next "
diff --git a/plugins/InfiniteScroll/locale/uk/LC_MESSAGES/InfiniteScroll.po b/plugins/InfiniteScroll/locale/uk/LC_MESSAGES/InfiniteScroll.po
index 1be2a37307..b8ab20e367 100644
--- a/plugins/InfiniteScroll/locale/uk/LC_MESSAGES/InfiniteScroll.po
+++ b/plugins/InfiniteScroll/locale/uk/LC_MESSAGES/InfiniteScroll.po
@@ -9,20 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - InfiniteScroll\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:57+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:24+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:02+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:13+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-infinitescroll\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: InfiniteScrollPlugin.php:54
 msgid ""
 "Infinite Scroll adds the following functionality to your StatusNet "
 "installation: When a user scrolls towards the bottom of the page, the next "
diff --git a/plugins/InfiniteScroll/locale/zh_CN/LC_MESSAGES/InfiniteScroll.po b/plugins/InfiniteScroll/locale/zh_CN/LC_MESSAGES/InfiniteScroll.po
index ac1812e0dd..02e3966588 100644
--- a/plugins/InfiniteScroll/locale/zh_CN/LC_MESSAGES/InfiniteScroll.po
+++ b/plugins/InfiniteScroll/locale/zh_CN/LC_MESSAGES/InfiniteScroll.po
@@ -9,20 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - InfiniteScroll\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:57+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:24+0000\n"
 "Language-Team: Simplified Chinese <http://translatewiki.net/wiki/Portal:zh-"
 "hans>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:02+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:13+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-infinitescroll\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: InfiniteScrollPlugin.php:54
 msgid ""
 "Infinite Scroll adds the following functionality to your StatusNet "
 "installation: When a user scrolls towards the bottom of the page, the next "
diff --git a/plugins/Irc/locale/Irc.pot b/plugins/Irc/locale/Irc.pot
index b1f3fc4692..f5aaae932b 100644
--- a/plugins/Irc/locale/Irc.pot
+++ b/plugins/Irc/locale/Irc.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,15 +16,6 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ircmanager.php:234
-msgid "Your nickname is not registered so IRC connectivity cannot be enabled"
-msgstr ""
-
-#: Irc_waiting_message.php:127
-#, php-format
-msgid "Could not increment attempts count for %d"
-msgstr ""
-
 #: IrcPlugin.php:79
 msgid "IRC"
 msgstr ""
@@ -33,3 +24,12 @@ msgstr ""
 msgid ""
 "The IRC plugin allows users to send and receive notices over an IRC network."
 msgstr ""
+
+#: Irc_waiting_message.php:127
+#, php-format
+msgid "Could not increment attempts count for %d"
+msgstr ""
+
+#: ircmanager.php:234
+msgid "Your nickname is not registered so IRC connectivity cannot be enabled"
+msgstr ""
diff --git a/plugins/Irc/locale/ia/LC_MESSAGES/Irc.po b/plugins/Irc/locale/ia/LC_MESSAGES/Irc.po
new file mode 100644
index 0000000000..ca0efe55d8
--- /dev/null
+++ b/plugins/Irc/locale/ia/LC_MESSAGES/Irc.po
@@ -0,0 +1,40 @@
+# Translation of StatusNet - Irc to Interlingua (Interlingua)
+# Exported from translatewiki.net
+#
+# Author: McDutchie
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Irc\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:25+0000\n"
+"Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-03-03 20:42:26+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: ia\n"
+"X-Message-Group: #out-statusnet-plugin-irc\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "IRC"
+msgstr "IRC"
+
+msgid ""
+"The IRC plugin allows users to send and receive notices over an IRC network."
+msgstr ""
+"Le plug-in de IRC permitte que usatores invia e recipe notas per un rete de "
+"IRC."
+
+#, php-format
+msgid "Could not increment attempts count for %d"
+msgstr "Non poteva incrementar le numero de tentativas pro %d"
+
+msgid "Your nickname is not registered so IRC connectivity cannot be enabled"
+msgstr ""
+"Tu pseudonymo non es registrate dunque le connexion a IRC non pote esser "
+"activate"
diff --git a/plugins/Irc/locale/mk/LC_MESSAGES/Irc.po b/plugins/Irc/locale/mk/LC_MESSAGES/Irc.po
new file mode 100644
index 0000000000..6f8295fada
--- /dev/null
+++ b/plugins/Irc/locale/mk/LC_MESSAGES/Irc.po
@@ -0,0 +1,40 @@
+# Translation of StatusNet - Irc to Macedonian (Македонски)
+# Exported from translatewiki.net
+#
+# Author: Bjankuloski06
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Irc\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:25+0000\n"
+"Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-03-03 20:42:26+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: mk\n"
+"X-Message-Group: #out-statusnet-plugin-irc\n"
+"Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
+
+msgid "IRC"
+msgstr "IRC"
+
+msgid ""
+"The IRC plugin allows users to send and receive notices over an IRC network."
+msgstr ""
+"Приклучокот за IRC им овозможува на корисниците да испраќаат и примаат "
+"забелешки преку мрежата на IRC."
+
+#, php-format
+msgid "Could not increment attempts count for %d"
+msgstr "Не можев да го дополнам бројот на обиди за %d"
+
+msgid "Your nickname is not registered so IRC connectivity cannot be enabled"
+msgstr ""
+"Вашиот прекар не е регистриран, па затоа не може да се овозможи поврзувањето "
+"со IRC"
diff --git a/plugins/Irc/locale/nl/LC_MESSAGES/Irc.po b/plugins/Irc/locale/nl/LC_MESSAGES/Irc.po
new file mode 100644
index 0000000000..734be980ca
--- /dev/null
+++ b/plugins/Irc/locale/nl/LC_MESSAGES/Irc.po
@@ -0,0 +1,40 @@
+# Translation of StatusNet - Irc to Dutch (Nederlands)
+# Exported from translatewiki.net
+#
+# Author: Siebrand
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Irc\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:25+0000\n"
+"Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-03-03 20:42:26+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: nl\n"
+"X-Message-Group: #out-statusnet-plugin-irc\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "IRC"
+msgstr "IRC"
+
+msgid ""
+"The IRC plugin allows users to send and receive notices over an IRC network."
+msgstr ""
+"Maakt het mogelijk om mededelingen te zenden naar en ontvangen van een IRC-"
+"netwerk."
+
+#, php-format
+msgid "Could not increment attempts count for %d"
+msgstr "Het was niet mogelijk om het aantal pogingen voor %d op te hogen"
+
+msgid "Your nickname is not registered so IRC connectivity cannot be enabled"
+msgstr ""
+"Uw gebruikersnaam is niet geregistreerd en daarom kan er geen koppeling met "
+"IRC worden gemaakt"
diff --git a/plugins/LdapAuthentication/locale/LdapAuthentication.pot b/plugins/LdapAuthentication/locale/LdapAuthentication.pot
index 31fc52825a..938d62a76e 100644
--- a/plugins/LdapAuthentication/locale/LdapAuthentication.pot
+++ b/plugins/LdapAuthentication/locale/LdapAuthentication.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/LdapAuthentication/locale/de/LC_MESSAGES/LdapAuthentication.po b/plugins/LdapAuthentication/locale/de/LC_MESSAGES/LdapAuthentication.po
index fdbde0055f..dd9feb95d1 100644
--- a/plugins/LdapAuthentication/locale/de/LC_MESSAGES/LdapAuthentication.po
+++ b/plugins/LdapAuthentication/locale/de/LC_MESSAGES/LdapAuthentication.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LdapAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-14 16:01+0000\n"
-"PO-Revision-Date: 2011-02-14 16:08:20+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:26+0000\n"
 "Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:25:28+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r82114); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:43+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-ldapauthentication\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: LdapAuthenticationPlugin.php:146
 msgid ""
 "The LDAP Authentication plugin allows for StatusNet to handle authentication "
 "through LDAP."
diff --git a/plugins/LdapAuthentication/locale/es/LC_MESSAGES/LdapAuthentication.po b/plugins/LdapAuthentication/locale/es/LC_MESSAGES/LdapAuthentication.po
index 0ea9f21654..40d0f842c7 100644
--- a/plugins/LdapAuthentication/locale/es/LC_MESSAGES/LdapAuthentication.po
+++ b/plugins/LdapAuthentication/locale/es/LC_MESSAGES/LdapAuthentication.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LdapAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:58+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:26+0000\n"
 "Language-Team: Spanish <http://translatewiki.net/wiki/Portal:es>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:02+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:43+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-ldapauthentication\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: LdapAuthenticationPlugin.php:146
 msgid ""
 "The LDAP Authentication plugin allows for StatusNet to handle authentication "
 "through LDAP."
diff --git a/plugins/LdapAuthentication/locale/fr/LC_MESSAGES/LdapAuthentication.po b/plugins/LdapAuthentication/locale/fr/LC_MESSAGES/LdapAuthentication.po
index feea1c39b0..cd8eb67279 100644
--- a/plugins/LdapAuthentication/locale/fr/LC_MESSAGES/LdapAuthentication.po
+++ b/plugins/LdapAuthentication/locale/fr/LC_MESSAGES/LdapAuthentication.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LdapAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:58+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:26+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:02+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:43+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-ldapauthentication\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: LdapAuthenticationPlugin.php:146
 msgid ""
 "The LDAP Authentication plugin allows for StatusNet to handle authentication "
 "through LDAP."
diff --git a/plugins/LdapAuthentication/locale/he/LC_MESSAGES/LdapAuthentication.po b/plugins/LdapAuthentication/locale/he/LC_MESSAGES/LdapAuthentication.po
index a61403c422..d1a730fceb 100644
--- a/plugins/LdapAuthentication/locale/he/LC_MESSAGES/LdapAuthentication.po
+++ b/plugins/LdapAuthentication/locale/he/LC_MESSAGES/LdapAuthentication.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LdapAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:58+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:26+0000\n"
 "Language-Team: Hebrew <http://translatewiki.net/wiki/Portal:he>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:02+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:43+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-plugin-ldapauthentication\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: LdapAuthenticationPlugin.php:146
 msgid ""
 "The LDAP Authentication plugin allows for StatusNet to handle authentication "
 "through LDAP."
diff --git a/plugins/LdapAuthentication/locale/ia/LC_MESSAGES/LdapAuthentication.po b/plugins/LdapAuthentication/locale/ia/LC_MESSAGES/LdapAuthentication.po
index 15dbc13a61..a62fd60ef3 100644
--- a/plugins/LdapAuthentication/locale/ia/LC_MESSAGES/LdapAuthentication.po
+++ b/plugins/LdapAuthentication/locale/ia/LC_MESSAGES/LdapAuthentication.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LdapAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:58+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:26+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:02+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:43+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-ldapauthentication\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: LdapAuthenticationPlugin.php:146
 msgid ""
 "The LDAP Authentication plugin allows for StatusNet to handle authentication "
 "through LDAP."
diff --git a/plugins/LdapAuthentication/locale/id/LC_MESSAGES/LdapAuthentication.po b/plugins/LdapAuthentication/locale/id/LC_MESSAGES/LdapAuthentication.po
index e979d49782..5aa07320e7 100644
--- a/plugins/LdapAuthentication/locale/id/LC_MESSAGES/LdapAuthentication.po
+++ b/plugins/LdapAuthentication/locale/id/LC_MESSAGES/LdapAuthentication.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LdapAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:58+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:26+0000\n"
 "Language-Team: Indonesian <http://translatewiki.net/wiki/Portal:id>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:02+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:43+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: id\n"
 "X-Message-Group: #out-statusnet-plugin-ldapauthentication\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: LdapAuthenticationPlugin.php:146
 msgid ""
 "The LDAP Authentication plugin allows for StatusNet to handle authentication "
 "through LDAP."
diff --git a/plugins/LdapAuthentication/locale/ja/LC_MESSAGES/LdapAuthentication.po b/plugins/LdapAuthentication/locale/ja/LC_MESSAGES/LdapAuthentication.po
index cffbe28884..7f8b1c7709 100644
--- a/plugins/LdapAuthentication/locale/ja/LC_MESSAGES/LdapAuthentication.po
+++ b/plugins/LdapAuthentication/locale/ja/LC_MESSAGES/LdapAuthentication.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LdapAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:58+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:26+0000\n"
 "Language-Team: Japanese <http://translatewiki.net/wiki/Portal:ja>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:02+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:43+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ja\n"
 "X-Message-Group: #out-statusnet-plugin-ldapauthentication\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: LdapAuthenticationPlugin.php:146
 msgid ""
 "The LDAP Authentication plugin allows for StatusNet to handle authentication "
 "through LDAP."
diff --git a/plugins/LdapAuthentication/locale/mk/LC_MESSAGES/LdapAuthentication.po b/plugins/LdapAuthentication/locale/mk/LC_MESSAGES/LdapAuthentication.po
index 16da13a065..eb56764489 100644
--- a/plugins/LdapAuthentication/locale/mk/LC_MESSAGES/LdapAuthentication.po
+++ b/plugins/LdapAuthentication/locale/mk/LC_MESSAGES/LdapAuthentication.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LdapAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:58+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:26+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:02+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:43+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-ldapauthentication\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
 
-#: LdapAuthenticationPlugin.php:146
 msgid ""
 "The LDAP Authentication plugin allows for StatusNet to handle authentication "
 "through LDAP."
diff --git a/plugins/LdapAuthentication/locale/nb/LC_MESSAGES/LdapAuthentication.po b/plugins/LdapAuthentication/locale/nb/LC_MESSAGES/LdapAuthentication.po
index 8789c39162..1b0b9df457 100644
--- a/plugins/LdapAuthentication/locale/nb/LC_MESSAGES/LdapAuthentication.po
+++ b/plugins/LdapAuthentication/locale/nb/LC_MESSAGES/LdapAuthentication.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LdapAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:58+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:26+0000\n"
 "Language-Team: Norwegian (bokmål)‬ <http://translatewiki.net/wiki/Portal:no>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:02+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:43+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: #out-statusnet-plugin-ldapauthentication\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: LdapAuthenticationPlugin.php:146
 msgid ""
 "The LDAP Authentication plugin allows for StatusNet to handle authentication "
 "through LDAP."
diff --git a/plugins/LdapAuthentication/locale/nl/LC_MESSAGES/LdapAuthentication.po b/plugins/LdapAuthentication/locale/nl/LC_MESSAGES/LdapAuthentication.po
index 25aeabd676..037a82ebe9 100644
--- a/plugins/LdapAuthentication/locale/nl/LC_MESSAGES/LdapAuthentication.po
+++ b/plugins/LdapAuthentication/locale/nl/LC_MESSAGES/LdapAuthentication.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LdapAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:58+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:26+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:02+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:43+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-ldapauthentication\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: LdapAuthenticationPlugin.php:146
 msgid ""
 "The LDAP Authentication plugin allows for StatusNet to handle authentication "
 "through LDAP."
diff --git a/plugins/LdapAuthentication/locale/pt/LC_MESSAGES/LdapAuthentication.po b/plugins/LdapAuthentication/locale/pt/LC_MESSAGES/LdapAuthentication.po
index 2ee261b700..d54dcfd7b5 100644
--- a/plugins/LdapAuthentication/locale/pt/LC_MESSAGES/LdapAuthentication.po
+++ b/plugins/LdapAuthentication/locale/pt/LC_MESSAGES/LdapAuthentication.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LdapAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 15:58+0000\n"
-"PO-Revision-Date: 2011-03-03 16:02:06+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:26+0000\n"
 "Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-14 17:20:41+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:43+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-plugin-ldapauthentication\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: LdapAuthenticationPlugin.php:146
 msgid ""
 "The LDAP Authentication plugin allows for StatusNet to handle authentication "
 "through LDAP."
diff --git a/plugins/LdapAuthentication/locale/pt_BR/LC_MESSAGES/LdapAuthentication.po b/plugins/LdapAuthentication/locale/pt_BR/LC_MESSAGES/LdapAuthentication.po
index babd630fb6..5148ad7b20 100644
--- a/plugins/LdapAuthentication/locale/pt_BR/LC_MESSAGES/LdapAuthentication.po
+++ b/plugins/LdapAuthentication/locale/pt_BR/LC_MESSAGES/LdapAuthentication.po
@@ -9,20 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LdapAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:58+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:26+0000\n"
 "Language-Team: Brazilian Portuguese <http://translatewiki.net/wiki/Portal:pt-"
 "br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:02+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:43+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt-br\n"
 "X-Message-Group: #out-statusnet-plugin-ldapauthentication\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: LdapAuthenticationPlugin.php:146
 msgid ""
 "The LDAP Authentication plugin allows for StatusNet to handle authentication "
 "through LDAP."
diff --git a/plugins/LdapAuthentication/locale/ru/LC_MESSAGES/LdapAuthentication.po b/plugins/LdapAuthentication/locale/ru/LC_MESSAGES/LdapAuthentication.po
index bf7f6b7fcb..601209cfe9 100644
--- a/plugins/LdapAuthentication/locale/ru/LC_MESSAGES/LdapAuthentication.po
+++ b/plugins/LdapAuthentication/locale/ru/LC_MESSAGES/LdapAuthentication.po
@@ -9,20 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LdapAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:58+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:26+0000\n"
 "Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:02+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:43+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-ldapauthentication\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: LdapAuthenticationPlugin.php:146
 msgid ""
 "The LDAP Authentication plugin allows for StatusNet to handle authentication "
 "through LDAP."
diff --git a/plugins/LdapAuthentication/locale/tl/LC_MESSAGES/LdapAuthentication.po b/plugins/LdapAuthentication/locale/tl/LC_MESSAGES/LdapAuthentication.po
index ae98fe2d10..5a27afa4e6 100644
--- a/plugins/LdapAuthentication/locale/tl/LC_MESSAGES/LdapAuthentication.po
+++ b/plugins/LdapAuthentication/locale/tl/LC_MESSAGES/LdapAuthentication.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LdapAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:58+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:26+0000\n"
 "Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:02+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:43+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-ldapauthentication\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: LdapAuthenticationPlugin.php:146
 msgid ""
 "The LDAP Authentication plugin allows for StatusNet to handle authentication "
 "through LDAP."
diff --git a/plugins/LdapAuthentication/locale/uk/LC_MESSAGES/LdapAuthentication.po b/plugins/LdapAuthentication/locale/uk/LC_MESSAGES/LdapAuthentication.po
index 0734ddca1f..1b1c31cecc 100644
--- a/plugins/LdapAuthentication/locale/uk/LC_MESSAGES/LdapAuthentication.po
+++ b/plugins/LdapAuthentication/locale/uk/LC_MESSAGES/LdapAuthentication.po
@@ -9,20 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LdapAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:58+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:26+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:02+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:43+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-ldapauthentication\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: LdapAuthenticationPlugin.php:146
 msgid ""
 "The LDAP Authentication plugin allows for StatusNet to handle authentication "
 "through LDAP."
diff --git a/plugins/LdapAuthentication/locale/zh_CN/LC_MESSAGES/LdapAuthentication.po b/plugins/LdapAuthentication/locale/zh_CN/LC_MESSAGES/LdapAuthentication.po
index 59d83e862e..3bda899f37 100644
--- a/plugins/LdapAuthentication/locale/zh_CN/LC_MESSAGES/LdapAuthentication.po
+++ b/plugins/LdapAuthentication/locale/zh_CN/LC_MESSAGES/LdapAuthentication.po
@@ -9,20 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LdapAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:58+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:26+0000\n"
 "Language-Team: Simplified Chinese <http://translatewiki.net/wiki/Portal:zh-"
 "hans>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:02+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:43+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-ldapauthentication\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: LdapAuthenticationPlugin.php:146
 msgid ""
 "The LDAP Authentication plugin allows for StatusNet to handle authentication "
 "through LDAP."
diff --git a/plugins/LdapAuthorization/locale/LdapAuthorization.pot b/plugins/LdapAuthorization/locale/LdapAuthorization.pot
index 8fd98d924f..2cf0f39126 100644
--- a/plugins/LdapAuthorization/locale/LdapAuthorization.pot
+++ b/plugins/LdapAuthorization/locale/LdapAuthorization.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/LdapAuthorization/locale/de/LC_MESSAGES/LdapAuthorization.po b/plugins/LdapAuthorization/locale/de/LC_MESSAGES/LdapAuthorization.po
index a1a8aa94a6..0988fbc2a1 100644
--- a/plugins/LdapAuthorization/locale/de/LC_MESSAGES/LdapAuthorization.po
+++ b/plugins/LdapAuthorization/locale/de/LC_MESSAGES/LdapAuthorization.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LdapAuthorization\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-14 16:01+0000\n"
-"PO-Revision-Date: 2011-02-14 16:08:22+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:27+0000\n"
 "Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:25:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r82114); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:45+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-ldapauthorization\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: LdapAuthorizationPlugin.php:124
 msgid ""
 "The LDAP Authorization plugin allows for StatusNet to handle authorization "
 "through LDAP."
diff --git a/plugins/LdapAuthorization/locale/es/LC_MESSAGES/LdapAuthorization.po b/plugins/LdapAuthorization/locale/es/LC_MESSAGES/LdapAuthorization.po
index 89291d4850..1e9cff080c 100644
--- a/plugins/LdapAuthorization/locale/es/LC_MESSAGES/LdapAuthorization.po
+++ b/plugins/LdapAuthorization/locale/es/LC_MESSAGES/LdapAuthorization.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LdapAuthorization\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:58+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:27+0000\n"
 "Language-Team: Spanish <http://translatewiki.net/wiki/Portal:es>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:03+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:45+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-ldapauthorization\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: LdapAuthorizationPlugin.php:124
 msgid ""
 "The LDAP Authorization plugin allows for StatusNet to handle authorization "
 "through LDAP."
diff --git a/plugins/LdapAuthorization/locale/fr/LC_MESSAGES/LdapAuthorization.po b/plugins/LdapAuthorization/locale/fr/LC_MESSAGES/LdapAuthorization.po
index 5978539751..6ae0944635 100644
--- a/plugins/LdapAuthorization/locale/fr/LC_MESSAGES/LdapAuthorization.po
+++ b/plugins/LdapAuthorization/locale/fr/LC_MESSAGES/LdapAuthorization.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LdapAuthorization\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:58+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:27+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:03+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:45+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-ldapauthorization\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: LdapAuthorizationPlugin.php:124
 msgid ""
 "The LDAP Authorization plugin allows for StatusNet to handle authorization "
 "through LDAP."
diff --git a/plugins/LdapAuthorization/locale/he/LC_MESSAGES/LdapAuthorization.po b/plugins/LdapAuthorization/locale/he/LC_MESSAGES/LdapAuthorization.po
index b38082789b..32f4e188f5 100644
--- a/plugins/LdapAuthorization/locale/he/LC_MESSAGES/LdapAuthorization.po
+++ b/plugins/LdapAuthorization/locale/he/LC_MESSAGES/LdapAuthorization.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LdapAuthorization\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:59+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:27+0000\n"
 "Language-Team: Hebrew <http://translatewiki.net/wiki/Portal:he>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:03+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:45+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-plugin-ldapauthorization\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: LdapAuthorizationPlugin.php:124
 msgid ""
 "The LDAP Authorization plugin allows for StatusNet to handle authorization "
 "through LDAP."
diff --git a/plugins/LdapAuthorization/locale/ia/LC_MESSAGES/LdapAuthorization.po b/plugins/LdapAuthorization/locale/ia/LC_MESSAGES/LdapAuthorization.po
index a92f3d8c9e..5cde55a52f 100644
--- a/plugins/LdapAuthorization/locale/ia/LC_MESSAGES/LdapAuthorization.po
+++ b/plugins/LdapAuthorization/locale/ia/LC_MESSAGES/LdapAuthorization.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LdapAuthorization\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:59+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:27+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:03+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:45+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-ldapauthorization\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: LdapAuthorizationPlugin.php:124
 msgid ""
 "The LDAP Authorization plugin allows for StatusNet to handle authorization "
 "through LDAP."
diff --git a/plugins/LdapAuthorization/locale/id/LC_MESSAGES/LdapAuthorization.po b/plugins/LdapAuthorization/locale/id/LC_MESSAGES/LdapAuthorization.po
index bab93bd87a..97c52c3f09 100644
--- a/plugins/LdapAuthorization/locale/id/LC_MESSAGES/LdapAuthorization.po
+++ b/plugins/LdapAuthorization/locale/id/LC_MESSAGES/LdapAuthorization.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LdapAuthorization\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:59+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:27+0000\n"
 "Language-Team: Indonesian <http://translatewiki.net/wiki/Portal:id>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:03+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:45+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: id\n"
 "X-Message-Group: #out-statusnet-plugin-ldapauthorization\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: LdapAuthorizationPlugin.php:124
 msgid ""
 "The LDAP Authorization plugin allows for StatusNet to handle authorization "
 "through LDAP."
diff --git a/plugins/LdapAuthorization/locale/mk/LC_MESSAGES/LdapAuthorization.po b/plugins/LdapAuthorization/locale/mk/LC_MESSAGES/LdapAuthorization.po
index 61e5707a61..e27c725ac6 100644
--- a/plugins/LdapAuthorization/locale/mk/LC_MESSAGES/LdapAuthorization.po
+++ b/plugins/LdapAuthorization/locale/mk/LC_MESSAGES/LdapAuthorization.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LdapAuthorization\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:59+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:27+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:03+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:45+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-ldapauthorization\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
 
-#: LdapAuthorizationPlugin.php:124
 msgid ""
 "The LDAP Authorization plugin allows for StatusNet to handle authorization "
 "through LDAP."
diff --git a/plugins/LdapAuthorization/locale/nb/LC_MESSAGES/LdapAuthorization.po b/plugins/LdapAuthorization/locale/nb/LC_MESSAGES/LdapAuthorization.po
index 3abbe4368f..a3ec25dfb4 100644
--- a/plugins/LdapAuthorization/locale/nb/LC_MESSAGES/LdapAuthorization.po
+++ b/plugins/LdapAuthorization/locale/nb/LC_MESSAGES/LdapAuthorization.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LdapAuthorization\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:59+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:27+0000\n"
 "Language-Team: Norwegian (bokmål)‬ <http://translatewiki.net/wiki/Portal:no>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:03+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:45+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: #out-statusnet-plugin-ldapauthorization\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: LdapAuthorizationPlugin.php:124
 msgid ""
 "The LDAP Authorization plugin allows for StatusNet to handle authorization "
 "through LDAP."
diff --git a/plugins/LdapAuthorization/locale/nl/LC_MESSAGES/LdapAuthorization.po b/plugins/LdapAuthorization/locale/nl/LC_MESSAGES/LdapAuthorization.po
index 36e916e961..dea317ec27 100644
--- a/plugins/LdapAuthorization/locale/nl/LC_MESSAGES/LdapAuthorization.po
+++ b/plugins/LdapAuthorization/locale/nl/LC_MESSAGES/LdapAuthorization.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LdapAuthorization\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:59+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:27+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:03+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:45+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-ldapauthorization\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: LdapAuthorizationPlugin.php:124
 msgid ""
 "The LDAP Authorization plugin allows for StatusNet to handle authorization "
 "through LDAP."
diff --git a/plugins/LdapAuthorization/locale/pt/LC_MESSAGES/LdapAuthorization.po b/plugins/LdapAuthorization/locale/pt/LC_MESSAGES/LdapAuthorization.po
index 414b497685..4694288eeb 100644
--- a/plugins/LdapAuthorization/locale/pt/LC_MESSAGES/LdapAuthorization.po
+++ b/plugins/LdapAuthorization/locale/pt/LC_MESSAGES/LdapAuthorization.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LdapAuthorization\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 15:58+0000\n"
-"PO-Revision-Date: 2011-03-03 16:02:07+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:27+0000\n"
 "Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-14 17:20:41+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:45+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-plugin-ldapauthorization\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: LdapAuthorizationPlugin.php:124
 msgid ""
 "The LDAP Authorization plugin allows for StatusNet to handle authorization "
 "through LDAP."
diff --git a/plugins/LdapAuthorization/locale/pt_BR/LC_MESSAGES/LdapAuthorization.po b/plugins/LdapAuthorization/locale/pt_BR/LC_MESSAGES/LdapAuthorization.po
index 20d4cf7792..d280f7c49e 100644
--- a/plugins/LdapAuthorization/locale/pt_BR/LC_MESSAGES/LdapAuthorization.po
+++ b/plugins/LdapAuthorization/locale/pt_BR/LC_MESSAGES/LdapAuthorization.po
@@ -9,20 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LdapAuthorization\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:59+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:27+0000\n"
 "Language-Team: Brazilian Portuguese <http://translatewiki.net/wiki/Portal:pt-"
 "br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:03+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:45+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt-br\n"
 "X-Message-Group: #out-statusnet-plugin-ldapauthorization\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: LdapAuthorizationPlugin.php:124
 msgid ""
 "The LDAP Authorization plugin allows for StatusNet to handle authorization "
 "through LDAP."
diff --git a/plugins/LdapAuthorization/locale/ru/LC_MESSAGES/LdapAuthorization.po b/plugins/LdapAuthorization/locale/ru/LC_MESSAGES/LdapAuthorization.po
index a6b363b492..d2f93c9b33 100644
--- a/plugins/LdapAuthorization/locale/ru/LC_MESSAGES/LdapAuthorization.po
+++ b/plugins/LdapAuthorization/locale/ru/LC_MESSAGES/LdapAuthorization.po
@@ -9,20 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LdapAuthorization\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:59+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:27+0000\n"
 "Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:03+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:45+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-ldapauthorization\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: LdapAuthorizationPlugin.php:124
 msgid ""
 "The LDAP Authorization plugin allows for StatusNet to handle authorization "
 "through LDAP."
diff --git a/plugins/LdapAuthorization/locale/tl/LC_MESSAGES/LdapAuthorization.po b/plugins/LdapAuthorization/locale/tl/LC_MESSAGES/LdapAuthorization.po
index 40aa5be011..a481b83c35 100644
--- a/plugins/LdapAuthorization/locale/tl/LC_MESSAGES/LdapAuthorization.po
+++ b/plugins/LdapAuthorization/locale/tl/LC_MESSAGES/LdapAuthorization.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LdapAuthorization\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:59+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:27+0000\n"
 "Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:03+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:45+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-ldapauthorization\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: LdapAuthorizationPlugin.php:124
 msgid ""
 "The LDAP Authorization plugin allows for StatusNet to handle authorization "
 "through LDAP."
diff --git a/plugins/LdapAuthorization/locale/uk/LC_MESSAGES/LdapAuthorization.po b/plugins/LdapAuthorization/locale/uk/LC_MESSAGES/LdapAuthorization.po
index de11c073e3..0d336aee67 100644
--- a/plugins/LdapAuthorization/locale/uk/LC_MESSAGES/LdapAuthorization.po
+++ b/plugins/LdapAuthorization/locale/uk/LC_MESSAGES/LdapAuthorization.po
@@ -9,20 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LdapAuthorization\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:59+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:27+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:03+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:45+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-ldapauthorization\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: LdapAuthorizationPlugin.php:124
 msgid ""
 "The LDAP Authorization plugin allows for StatusNet to handle authorization "
 "through LDAP."
diff --git a/plugins/LdapAuthorization/locale/zh_CN/LC_MESSAGES/LdapAuthorization.po b/plugins/LdapAuthorization/locale/zh_CN/LC_MESSAGES/LdapAuthorization.po
index 0b3b266453..60ca7a314e 100644
--- a/plugins/LdapAuthorization/locale/zh_CN/LC_MESSAGES/LdapAuthorization.po
+++ b/plugins/LdapAuthorization/locale/zh_CN/LC_MESSAGES/LdapAuthorization.po
@@ -9,20 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LdapAuthorization\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:59+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:27+0000\n"
 "Language-Team: Simplified Chinese <http://translatewiki.net/wiki/Portal:zh-"
 "hans>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:03+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:45+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-ldapauthorization\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: LdapAuthorizationPlugin.php:124
 msgid ""
 "The LDAP Authorization plugin allows for StatusNet to handle authorization "
 "through LDAP."
diff --git a/plugins/LilUrl/locale/LilUrl.pot b/plugins/LilUrl/locale/LilUrl.pot
index b1ca108736..038bc2c4e5 100644
--- a/plugins/LilUrl/locale/LilUrl.pot
+++ b/plugins/LilUrl/locale/LilUrl.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/LilUrl/locale/de/LC_MESSAGES/LilUrl.po b/plugins/LilUrl/locale/de/LC_MESSAGES/LilUrl.po
index 5d30766d11..31b6082d15 100644
--- a/plugins/LilUrl/locale/de/LC_MESSAGES/LilUrl.po
+++ b/plugins/LilUrl/locale/de/LC_MESSAGES/LilUrl.po
@@ -9,23 +9,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LilUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:13+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:27+0000\n"
 "Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:25:30+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:47+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-lilurl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: LilUrlPlugin.php:41
 msgid "A serviceUrl must be specified."
 msgstr "Eine „serviceUrl“ muss angegeben werden."
 
-#: LilUrlPlugin.php:66
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr "Benutzung des <a href=\"http://%1$s/\">%1$s</a>-URL-Kürzungsdienstes."
diff --git a/plugins/LilUrl/locale/fr/LC_MESSAGES/LilUrl.po b/plugins/LilUrl/locale/fr/LC_MESSAGES/LilUrl.po
index 2dea700619..312b1c7470 100644
--- a/plugins/LilUrl/locale/fr/LC_MESSAGES/LilUrl.po
+++ b/plugins/LilUrl/locale/fr/LC_MESSAGES/LilUrl.po
@@ -10,23 +10,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LilUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:13+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:27+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:25:30+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:47+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-lilurl\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: LilUrlPlugin.php:41
 msgid "A serviceUrl must be specified."
 msgstr "Une URL de service doit être spécifiée."
 
-#: LilUrlPlugin.php:66
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr ""
diff --git a/plugins/LilUrl/locale/he/LC_MESSAGES/LilUrl.po b/plugins/LilUrl/locale/he/LC_MESSAGES/LilUrl.po
index 0769c6406d..141bbfe186 100644
--- a/plugins/LilUrl/locale/he/LC_MESSAGES/LilUrl.po
+++ b/plugins/LilUrl/locale/he/LC_MESSAGES/LilUrl.po
@@ -9,23 +9,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LilUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:13+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:28+0000\n"
 "Language-Team: Hebrew <http://translatewiki.net/wiki/Portal:he>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:25:30+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:47+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-plugin-lilurl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: LilUrlPlugin.php:41
 msgid "A serviceUrl must be specified."
 msgstr "יש לציין serviceUrl (כתובת השירות)"
 
-#: LilUrlPlugin.php:66
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr "שימוש בשירות קיצור הכתובות <a href=\"http://%1$s/\">%1$s</a>."
diff --git a/plugins/LilUrl/locale/ia/LC_MESSAGES/LilUrl.po b/plugins/LilUrl/locale/ia/LC_MESSAGES/LilUrl.po
index ec4cf18c9f..701c2afbea 100644
--- a/plugins/LilUrl/locale/ia/LC_MESSAGES/LilUrl.po
+++ b/plugins/LilUrl/locale/ia/LC_MESSAGES/LilUrl.po
@@ -9,23 +9,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LilUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:13+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:28+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:25:30+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:47+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-lilurl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: LilUrlPlugin.php:41
 msgid "A serviceUrl must be specified."
 msgstr "Un serviceUrl debe esser specificate."
 
-#: LilUrlPlugin.php:66
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr ""
diff --git a/plugins/LilUrl/locale/id/LC_MESSAGES/LilUrl.po b/plugins/LilUrl/locale/id/LC_MESSAGES/LilUrl.po
index 2679dc0aaf..2c530b1559 100644
--- a/plugins/LilUrl/locale/id/LC_MESSAGES/LilUrl.po
+++ b/plugins/LilUrl/locale/id/LC_MESSAGES/LilUrl.po
@@ -9,23 +9,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LilUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:13+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:28+0000\n"
 "Language-Team: Indonesian <http://translatewiki.net/wiki/Portal:id>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:25:30+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:47+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: id\n"
 "X-Message-Group: #out-statusnet-plugin-lilurl\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: LilUrlPlugin.php:41
 msgid "A serviceUrl must be specified."
 msgstr "Sebuah serviceUrl harus disebutkan."
 
-#: LilUrlPlugin.php:66
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr "Menggunakan layanan pemendek URL <a href=\"http://%1$s/\">%1$s</a>."
diff --git a/plugins/LilUrl/locale/ja/LC_MESSAGES/LilUrl.po b/plugins/LilUrl/locale/ja/LC_MESSAGES/LilUrl.po
index a5e8e0bbd6..7a8d9a3ccf 100644
--- a/plugins/LilUrl/locale/ja/LC_MESSAGES/LilUrl.po
+++ b/plugins/LilUrl/locale/ja/LC_MESSAGES/LilUrl.po
@@ -9,23 +9,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LilUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:13+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:28+0000\n"
 "Language-Team: Japanese <http://translatewiki.net/wiki/Portal:ja>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:25:30+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:47+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ja\n"
 "X-Message-Group: #out-statusnet-plugin-lilurl\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: LilUrlPlugin.php:41
 msgid "A serviceUrl must be specified."
 msgstr ""
 
-#: LilUrlPlugin.php:66
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr "<a href=\"http://%1$s/\">%1$s</a>をURL短縮サービスとして利用する。"
diff --git a/plugins/LilUrl/locale/mk/LC_MESSAGES/LilUrl.po b/plugins/LilUrl/locale/mk/LC_MESSAGES/LilUrl.po
index 5467e751cd..407acd5500 100644
--- a/plugins/LilUrl/locale/mk/LC_MESSAGES/LilUrl.po
+++ b/plugins/LilUrl/locale/mk/LC_MESSAGES/LilUrl.po
@@ -9,23 +9,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LilUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:13+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:28+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:25:30+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:47+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-lilurl\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
 
-#: LilUrlPlugin.php:41
 msgid "A serviceUrl must be specified."
 msgstr "Мора да се назначи адреса на службата (serviceUrl)."
 
-#: LilUrlPlugin.php:66
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr ""
diff --git a/plugins/LilUrl/locale/nb/LC_MESSAGES/LilUrl.po b/plugins/LilUrl/locale/nb/LC_MESSAGES/LilUrl.po
index 7a7dd13a05..ad709098a8 100644
--- a/plugins/LilUrl/locale/nb/LC_MESSAGES/LilUrl.po
+++ b/plugins/LilUrl/locale/nb/LC_MESSAGES/LilUrl.po
@@ -9,23 +9,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LilUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:13+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:28+0000\n"
 "Language-Team: Norwegian (bokmål)‬ <http://translatewiki.net/wiki/Portal:no>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:25:30+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:47+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: #out-statusnet-plugin-lilurl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: LilUrlPlugin.php:41
 msgid "A serviceUrl must be specified."
 msgstr "En tjeneste-Url må spesifiseres."
 
-#: LilUrlPlugin.php:66
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr "Bruker URL-forkortertjenesten <a href=\"http://%1$s/\">%1$s</a>."
diff --git a/plugins/LilUrl/locale/nl/LC_MESSAGES/LilUrl.po b/plugins/LilUrl/locale/nl/LC_MESSAGES/LilUrl.po
index 917f751ae7..0893ef357c 100644
--- a/plugins/LilUrl/locale/nl/LC_MESSAGES/LilUrl.po
+++ b/plugins/LilUrl/locale/nl/LC_MESSAGES/LilUrl.po
@@ -9,23 +9,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LilUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:13+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:28+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:25:30+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:47+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-lilurl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: LilUrlPlugin.php:41
 msgid "A serviceUrl must be specified."
 msgstr "Er moet een serviceUrl opgegeven worden."
 
-#: LilUrlPlugin.php:66
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr ""
diff --git a/plugins/LilUrl/locale/ru/LC_MESSAGES/LilUrl.po b/plugins/LilUrl/locale/ru/LC_MESSAGES/LilUrl.po
index 1ff9526456..9e925f1538 100644
--- a/plugins/LilUrl/locale/ru/LC_MESSAGES/LilUrl.po
+++ b/plugins/LilUrl/locale/ru/LC_MESSAGES/LilUrl.po
@@ -9,24 +9,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LilUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:13+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:28+0000\n"
 "Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:25:30+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:47+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-lilurl\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: LilUrlPlugin.php:41
 msgid "A serviceUrl must be specified."
 msgstr "Должен быть указан URL-адрес сервису."
 
-#: LilUrlPlugin.php:66
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr "Использование службы сокращения URL <a href=\"http://%1$s/\">%1$s</a>."
diff --git a/plugins/LilUrl/locale/tl/LC_MESSAGES/LilUrl.po b/plugins/LilUrl/locale/tl/LC_MESSAGES/LilUrl.po
index 9e83bdab2c..6317f0da4a 100644
--- a/plugins/LilUrl/locale/tl/LC_MESSAGES/LilUrl.po
+++ b/plugins/LilUrl/locale/tl/LC_MESSAGES/LilUrl.po
@@ -9,23 +9,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LilUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:13+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:28+0000\n"
 "Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:25:30+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:47+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-lilurl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: LilUrlPlugin.php:41
 msgid "A serviceUrl must be specified."
 msgstr "Dapat tukuyin ang isang URL ng palingkuran."
 
-#: LilUrlPlugin.php:66
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr ""
diff --git a/plugins/LilUrl/locale/uk/LC_MESSAGES/LilUrl.po b/plugins/LilUrl/locale/uk/LC_MESSAGES/LilUrl.po
index e8e62d5d76..a901a87dec 100644
--- a/plugins/LilUrl/locale/uk/LC_MESSAGES/LilUrl.po
+++ b/plugins/LilUrl/locale/uk/LC_MESSAGES/LilUrl.po
@@ -9,24 +9,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LilUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:13+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:28+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:25:30+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:47+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-lilurl\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: LilUrlPlugin.php:41
 msgid "A serviceUrl must be specified."
 msgstr "URL-адресу сервісу має бути зазначено."
 
-#: LilUrlPlugin.php:66
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr ""
diff --git a/plugins/LilUrl/locale/zh_CN/LC_MESSAGES/LilUrl.po b/plugins/LilUrl/locale/zh_CN/LC_MESSAGES/LilUrl.po
index b4d003c866..66583536b0 100644
--- a/plugins/LilUrl/locale/zh_CN/LC_MESSAGES/LilUrl.po
+++ b/plugins/LilUrl/locale/zh_CN/LC_MESSAGES/LilUrl.po
@@ -9,24 +9,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LilUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:13+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:28+0000\n"
 "Language-Team: Simplified Chinese <http://translatewiki.net/wiki/Portal:zh-"
 "hans>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:25:30+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:47+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-lilurl\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: LilUrlPlugin.php:41
 msgid "A serviceUrl must be specified."
 msgstr "必须设置一个服务的地址 Url。"
 
-#: LilUrlPlugin.php:66
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr "使用 <a href=\"http://%1$s/\">%1$s</a> 短链接服务"
diff --git a/plugins/LinkPreview/locale/LinkPreview.pot b/plugins/LinkPreview/locale/LinkPreview.pot
index 42ab0e5a9a..1a4a5c2a7d 100644
--- a/plugins/LinkPreview/locale/LinkPreview.pot
+++ b/plugins/LinkPreview/locale/LinkPreview.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/LinkPreview/locale/de/LC_MESSAGES/LinkPreview.po b/plugins/LinkPreview/locale/de/LC_MESSAGES/LinkPreview.po
index 031e6f2216..482ac54a39 100644
--- a/plugins/LinkPreview/locale/de/LC_MESSAGES/LinkPreview.po
+++ b/plugins/LinkPreview/locale/de/LC_MESSAGES/LinkPreview.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LinkPreview\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-14 16:01+0000\n"
-"PO-Revision-Date: 2011-02-14 16:08:26+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:29+0000\n"
 "Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:25:33+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r82114); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:21+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-linkpreview\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: LinkPreviewPlugin.php:39
 msgid "UI extensions previewing thumbnails from links."
 msgstr ""
 "Benutzeroberflächenerweiterung, die es erlaubt, Vorschauen für Links "
diff --git a/plugins/LinkPreview/locale/fr/LC_MESSAGES/LinkPreview.po b/plugins/LinkPreview/locale/fr/LC_MESSAGES/LinkPreview.po
index e154ffd633..f02251f5b4 100644
--- a/plugins/LinkPreview/locale/fr/LC_MESSAGES/LinkPreview.po
+++ b/plugins/LinkPreview/locale/fr/LC_MESSAGES/LinkPreview.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LinkPreview\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:01+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:29+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:03+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:21+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-linkpreview\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: LinkPreviewPlugin.php:39
 msgid "UI extensions previewing thumbnails from links."
 msgstr ""
 "Extensions d’interface utilisateur pour prévisualiser des vignettes depuis "
diff --git a/plugins/LinkPreview/locale/he/LC_MESSAGES/LinkPreview.po b/plugins/LinkPreview/locale/he/LC_MESSAGES/LinkPreview.po
index 91fbff7c76..212a0b465d 100644
--- a/plugins/LinkPreview/locale/he/LC_MESSAGES/LinkPreview.po
+++ b/plugins/LinkPreview/locale/he/LC_MESSAGES/LinkPreview.po
@@ -9,18 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LinkPreview\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:01+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:29+0000\n"
 "Language-Team: Hebrew <http://translatewiki.net/wiki/Portal:he>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:03+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:21+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-plugin-linkpreview\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: LinkPreviewPlugin.php:39
 msgid "UI extensions previewing thumbnails from links."
 msgstr "הרחבות מנשק משתמש המאפשרות צפייה בתמונות ממוזערות של קישורים."
diff --git a/plugins/LinkPreview/locale/ia/LC_MESSAGES/LinkPreview.po b/plugins/LinkPreview/locale/ia/LC_MESSAGES/LinkPreview.po
index 81552639b4..4f437a6b95 100644
--- a/plugins/LinkPreview/locale/ia/LC_MESSAGES/LinkPreview.po
+++ b/plugins/LinkPreview/locale/ia/LC_MESSAGES/LinkPreview.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LinkPreview\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:01+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:29+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:03+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:21+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-linkpreview\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: LinkPreviewPlugin.php:39
 msgid "UI extensions previewing thumbnails from links."
 msgstr ""
 "Extensiones del interfacie de usator pro previsualisar miniaturas de "
diff --git a/plugins/LinkPreview/locale/mk/LC_MESSAGES/LinkPreview.po b/plugins/LinkPreview/locale/mk/LC_MESSAGES/LinkPreview.po
index 3cb7426afe..9f794792fb 100644
--- a/plugins/LinkPreview/locale/mk/LC_MESSAGES/LinkPreview.po
+++ b/plugins/LinkPreview/locale/mk/LC_MESSAGES/LinkPreview.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LinkPreview\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:01+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:29+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:03+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:21+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-linkpreview\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
 
-#: LinkPreviewPlugin.php:39
 msgid "UI extensions previewing thumbnails from links."
 msgstr ""
 "Додатоци за корисничкиот посредник што даваат преглед на минијатури од врски."
diff --git a/plugins/LinkPreview/locale/nl/LC_MESSAGES/LinkPreview.po b/plugins/LinkPreview/locale/nl/LC_MESSAGES/LinkPreview.po
index ca4f66cc4b..b73cee11b2 100644
--- a/plugins/LinkPreview/locale/nl/LC_MESSAGES/LinkPreview.po
+++ b/plugins/LinkPreview/locale/nl/LC_MESSAGES/LinkPreview.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LinkPreview\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:01+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:29+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:03+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:21+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-linkpreview\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: LinkPreviewPlugin.php:39
 msgid "UI extensions previewing thumbnails from links."
 msgstr ""
 "Gebruikersinterfaceuitbreiding voor het weergeven van miniaturen voor "
diff --git a/plugins/LinkPreview/locale/pt/LC_MESSAGES/LinkPreview.po b/plugins/LinkPreview/locale/pt/LC_MESSAGES/LinkPreview.po
index 643cae9dad..90ef44c472 100644
--- a/plugins/LinkPreview/locale/pt/LC_MESSAGES/LinkPreview.po
+++ b/plugins/LinkPreview/locale/pt/LC_MESSAGES/LinkPreview.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LinkPreview\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:01+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:29+0000\n"
 "Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:03+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:21+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-plugin-linkpreview\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: LinkPreviewPlugin.php:39
 msgid "UI extensions previewing thumbnails from links."
 msgstr ""
 "Extensões da interface, para antevisão de miniaturas a partir de links."
diff --git a/plugins/LinkPreview/locale/ru/LC_MESSAGES/LinkPreview.po b/plugins/LinkPreview/locale/ru/LC_MESSAGES/LinkPreview.po
index 1f6d551537..5e09589578 100644
--- a/plugins/LinkPreview/locale/ru/LC_MESSAGES/LinkPreview.po
+++ b/plugins/LinkPreview/locale/ru/LC_MESSAGES/LinkPreview.po
@@ -9,20 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LinkPreview\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:01+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:29+0000\n"
 "Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:03+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:21+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-linkpreview\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: LinkPreviewPlugin.php:39
 msgid "UI extensions previewing thumbnails from links."
 msgstr ""
 "Расширения пользовательского интерфейса для просмотр миниатюр из ссылок."
diff --git a/plugins/LinkPreview/locale/uk/LC_MESSAGES/LinkPreview.po b/plugins/LinkPreview/locale/uk/LC_MESSAGES/LinkPreview.po
index f92809dbd5..ffc1b5a249 100644
--- a/plugins/LinkPreview/locale/uk/LC_MESSAGES/LinkPreview.po
+++ b/plugins/LinkPreview/locale/uk/LC_MESSAGES/LinkPreview.po
@@ -9,20 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LinkPreview\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:01+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:29+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:03+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:21+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-linkpreview\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: LinkPreviewPlugin.php:39
 msgid "UI extensions previewing thumbnails from links."
 msgstr ""
 "Додаток до користувацького інтерфейсу для перегляду мініатюр з посилань."
diff --git a/plugins/LinkPreview/locale/zh_CN/LC_MESSAGES/LinkPreview.po b/plugins/LinkPreview/locale/zh_CN/LC_MESSAGES/LinkPreview.po
index 358d4f31d9..35bf7aa759 100644
--- a/plugins/LinkPreview/locale/zh_CN/LC_MESSAGES/LinkPreview.po
+++ b/plugins/LinkPreview/locale/zh_CN/LC_MESSAGES/LinkPreview.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LinkPreview\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-24 10:32+0000\n"
-"PO-Revision-Date: 2011-02-24 10:39:26+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:29+0000\n"
 "Language-Team: Simplified Chinese <http://translatewiki.net/wiki/Portal:zh-"
 "hans>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-14 17:20:43+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r82712); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:21+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-linkpreview\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: LinkPreviewPlugin.php:39
 msgid "UI extensions previewing thumbnails from links."
 msgstr "用户界面扩展的链接的缩略图预览。"
diff --git a/plugins/Linkback/locale/Linkback.pot b/plugins/Linkback/locale/Linkback.pot
index 6b0c4e7431..b64ec33f1b 100644
--- a/plugins/Linkback/locale/Linkback.pot
+++ b/plugins/Linkback/locale/Linkback.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/Linkback/locale/de/LC_MESSAGES/Linkback.po b/plugins/Linkback/locale/de/LC_MESSAGES/Linkback.po
index f188797c87..f2b6456c3f 100644
--- a/plugins/Linkback/locale/de/LC_MESSAGES/Linkback.po
+++ b/plugins/Linkback/locale/de/LC_MESSAGES/Linkback.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Linkback\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:00+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:28+0000\n"
 "Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:03+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:20+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-linkback\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: LinkbackPlugin.php:241
 msgid ""
 "Notify blog authors when their posts have been linked in microblog notices "
 "using <a href=\"http://www.hixie.ch/specs/pingback/pingback\">Pingback</a> "
diff --git a/plugins/Linkback/locale/es/LC_MESSAGES/Linkback.po b/plugins/Linkback/locale/es/LC_MESSAGES/Linkback.po
index 028b7bc802..4aebd6f35f 100644
--- a/plugins/Linkback/locale/es/LC_MESSAGES/Linkback.po
+++ b/plugins/Linkback/locale/es/LC_MESSAGES/Linkback.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Linkback\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:00+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:28+0000\n"
 "Language-Team: Spanish <http://translatewiki.net/wiki/Portal:es>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:03+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:20+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-linkback\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: LinkbackPlugin.php:241
 msgid ""
 "Notify blog authors when their posts have been linked in microblog notices "
 "using <a href=\"http://www.hixie.ch/specs/pingback/pingback\">Pingback</a> "
diff --git a/plugins/Linkback/locale/fr/LC_MESSAGES/Linkback.po b/plugins/Linkback/locale/fr/LC_MESSAGES/Linkback.po
index 6c230d60cc..cee54d7099 100644
--- a/plugins/Linkback/locale/fr/LC_MESSAGES/Linkback.po
+++ b/plugins/Linkback/locale/fr/LC_MESSAGES/Linkback.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Linkback\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:00+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:28+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:03+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:20+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-linkback\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: LinkbackPlugin.php:241
 msgid ""
 "Notify blog authors when their posts have been linked in microblog notices "
 "using <a href=\"http://www.hixie.ch/specs/pingback/pingback\">Pingback</a> "
diff --git a/plugins/Linkback/locale/he/LC_MESSAGES/Linkback.po b/plugins/Linkback/locale/he/LC_MESSAGES/Linkback.po
index 122a955bb5..6d377248c8 100644
--- a/plugins/Linkback/locale/he/LC_MESSAGES/Linkback.po
+++ b/plugins/Linkback/locale/he/LC_MESSAGES/Linkback.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Linkback\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:00+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:28+0000\n"
 "Language-Team: Hebrew <http://translatewiki.net/wiki/Portal:he>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:03+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:20+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-plugin-linkback\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: LinkbackPlugin.php:241
 msgid ""
 "Notify blog authors when their posts have been linked in microblog notices "
 "using <a href=\"http://www.hixie.ch/specs/pingback/pingback\">Pingback</a> "
diff --git a/plugins/Linkback/locale/ia/LC_MESSAGES/Linkback.po b/plugins/Linkback/locale/ia/LC_MESSAGES/Linkback.po
index 735c35afde..800db84159 100644
--- a/plugins/Linkback/locale/ia/LC_MESSAGES/Linkback.po
+++ b/plugins/Linkback/locale/ia/LC_MESSAGES/Linkback.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Linkback\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:00+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:28+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:03+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:20+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-linkback\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: LinkbackPlugin.php:241
 msgid ""
 "Notify blog authors when their posts have been linked in microblog notices "
 "using <a href=\"http://www.hixie.ch/specs/pingback/pingback\">Pingback</a> "
diff --git a/plugins/Linkback/locale/id/LC_MESSAGES/Linkback.po b/plugins/Linkback/locale/id/LC_MESSAGES/Linkback.po
index 9f8811f554..655420ad33 100644
--- a/plugins/Linkback/locale/id/LC_MESSAGES/Linkback.po
+++ b/plugins/Linkback/locale/id/LC_MESSAGES/Linkback.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Linkback\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:00+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:28+0000\n"
 "Language-Team: Indonesian <http://translatewiki.net/wiki/Portal:id>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:03+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:20+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: id\n"
 "X-Message-Group: #out-statusnet-plugin-linkback\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: LinkbackPlugin.php:241
 msgid ""
 "Notify blog authors when their posts have been linked in microblog notices "
 "using <a href=\"http://www.hixie.ch/specs/pingback/pingback\">Pingback</a> "
diff --git a/plugins/Linkback/locale/mk/LC_MESSAGES/Linkback.po b/plugins/Linkback/locale/mk/LC_MESSAGES/Linkback.po
index 95910f308d..fbd59f0518 100644
--- a/plugins/Linkback/locale/mk/LC_MESSAGES/Linkback.po
+++ b/plugins/Linkback/locale/mk/LC_MESSAGES/Linkback.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Linkback\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:00+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:28+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:03+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:20+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-linkback\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
 
-#: LinkbackPlugin.php:241
 msgid ""
 "Notify blog authors when their posts have been linked in microblog notices "
 "using <a href=\"http://www.hixie.ch/specs/pingback/pingback\">Pingback</a> "
diff --git a/plugins/Linkback/locale/nb/LC_MESSAGES/Linkback.po b/plugins/Linkback/locale/nb/LC_MESSAGES/Linkback.po
index 2fff69b6c6..43dba0bdea 100644
--- a/plugins/Linkback/locale/nb/LC_MESSAGES/Linkback.po
+++ b/plugins/Linkback/locale/nb/LC_MESSAGES/Linkback.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Linkback\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:00+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:29+0000\n"
 "Language-Team: Norwegian (bokmål)‬ <http://translatewiki.net/wiki/Portal:no>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:03+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:20+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: #out-statusnet-plugin-linkback\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: LinkbackPlugin.php:241
 msgid ""
 "Notify blog authors when their posts have been linked in microblog notices "
 "using <a href=\"http://www.hixie.ch/specs/pingback/pingback\">Pingback</a> "
diff --git a/plugins/Linkback/locale/nl/LC_MESSAGES/Linkback.po b/plugins/Linkback/locale/nl/LC_MESSAGES/Linkback.po
index 474970e261..1bdc16c5ac 100644
--- a/plugins/Linkback/locale/nl/LC_MESSAGES/Linkback.po
+++ b/plugins/Linkback/locale/nl/LC_MESSAGES/Linkback.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Linkback\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:00+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:29+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:03+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:20+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-linkback\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: LinkbackPlugin.php:241
 msgid ""
 "Notify blog authors when their posts have been linked in microblog notices "
 "using <a href=\"http://www.hixie.ch/specs/pingback/pingback\">Pingback</a> "
diff --git a/plugins/Linkback/locale/ru/LC_MESSAGES/Linkback.po b/plugins/Linkback/locale/ru/LC_MESSAGES/Linkback.po
index 81a6bbb2fc..63b9403f23 100644
--- a/plugins/Linkback/locale/ru/LC_MESSAGES/Linkback.po
+++ b/plugins/Linkback/locale/ru/LC_MESSAGES/Linkback.po
@@ -9,20 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Linkback\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:00+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:29+0000\n"
 "Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:03+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:20+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-linkback\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: LinkbackPlugin.php:241
 msgid ""
 "Notify blog authors when their posts have been linked in microblog notices "
 "using <a href=\"http://www.hixie.ch/specs/pingback/pingback\">Pingback</a> "
diff --git a/plugins/Linkback/locale/tl/LC_MESSAGES/Linkback.po b/plugins/Linkback/locale/tl/LC_MESSAGES/Linkback.po
index 4cac67a456..676f105d61 100644
--- a/plugins/Linkback/locale/tl/LC_MESSAGES/Linkback.po
+++ b/plugins/Linkback/locale/tl/LC_MESSAGES/Linkback.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Linkback\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:00+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:29+0000\n"
 "Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:03+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:20+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-linkback\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: LinkbackPlugin.php:241
 msgid ""
 "Notify blog authors when their posts have been linked in microblog notices "
 "using <a href=\"http://www.hixie.ch/specs/pingback/pingback\">Pingback</a> "
diff --git a/plugins/Linkback/locale/uk/LC_MESSAGES/Linkback.po b/plugins/Linkback/locale/uk/LC_MESSAGES/Linkback.po
index 8ef42ae880..0051b8d84a 100644
--- a/plugins/Linkback/locale/uk/LC_MESSAGES/Linkback.po
+++ b/plugins/Linkback/locale/uk/LC_MESSAGES/Linkback.po
@@ -9,20 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Linkback\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:00+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:29+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:03+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:20+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-linkback\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: LinkbackPlugin.php:241
 msgid ""
 "Notify blog authors when their posts have been linked in microblog notices "
 "using <a href=\"http://www.hixie.ch/specs/pingback/pingback\">Pingback</a> "
diff --git a/plugins/Linkback/locale/zh_CN/LC_MESSAGES/Linkback.po b/plugins/Linkback/locale/zh_CN/LC_MESSAGES/Linkback.po
index 64b067e680..2ad808b9c3 100644
--- a/plugins/Linkback/locale/zh_CN/LC_MESSAGES/Linkback.po
+++ b/plugins/Linkback/locale/zh_CN/LC_MESSAGES/Linkback.po
@@ -9,20 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Linkback\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:00+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:29+0000\n"
 "Language-Team: Simplified Chinese <http://translatewiki.net/wiki/Portal:zh-"
 "hans>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:03+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:20+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-linkback\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: LinkbackPlugin.php:241
 msgid ""
 "Notify blog authors when their posts have been linked in microblog notices "
 "using <a href=\"http://www.hixie.ch/specs/pingback/pingback\">Pingback</a> "
diff --git a/plugins/LogFilter/locale/LogFilter.pot b/plugins/LogFilter/locale/LogFilter.pot
index d794233fcf..9e5acf6c5f 100644
--- a/plugins/LogFilter/locale/LogFilter.pot
+++ b/plugins/LogFilter/locale/LogFilter.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/LogFilter/locale/de/LC_MESSAGES/LogFilter.po b/plugins/LogFilter/locale/de/LC_MESSAGES/LogFilter.po
index 71200d954f..15617aefc2 100644
--- a/plugins/LogFilter/locale/de/LC_MESSAGES/LogFilter.po
+++ b/plugins/LogFilter/locale/de/LC_MESSAGES/LogFilter.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LogFilter\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-14 16:01+0000\n"
-"PO-Revision-Date: 2011-02-14 16:08:27+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:30+0000\n"
 "Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:25:35+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r82114); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:21+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-logfilter\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: LogFilterPlugin.php:49
 msgid "Provides server-side setting to filter log output by type or keyword."
 msgstr ""
 "Stellt serverseitige Einstellungen zum Filtern der Log-Ausgabe nach Typ oder "
diff --git a/plugins/LogFilter/locale/fr/LC_MESSAGES/LogFilter.po b/plugins/LogFilter/locale/fr/LC_MESSAGES/LogFilter.po
index 64c566e2b2..1ce1403518 100644
--- a/plugins/LogFilter/locale/fr/LC_MESSAGES/LogFilter.po
+++ b/plugins/LogFilter/locale/fr/LC_MESSAGES/LogFilter.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LogFilter\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:02+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:30+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:03+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:21+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-logfilter\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: LogFilterPlugin.php:49
 msgid "Provides server-side setting to filter log output by type or keyword."
 msgstr ""
 "Fournit une configuration côté serveur pour filtrer la sortie du journal "
diff --git a/plugins/LogFilter/locale/he/LC_MESSAGES/LogFilter.po b/plugins/LogFilter/locale/he/LC_MESSAGES/LogFilter.po
index 03dc0c0309..58618978c4 100644
--- a/plugins/LogFilter/locale/he/LC_MESSAGES/LogFilter.po
+++ b/plugins/LogFilter/locale/he/LC_MESSAGES/LogFilter.po
@@ -9,18 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LogFilter\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:10+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:30+0000\n"
 "Language-Team: Hebrew <http://translatewiki.net/wiki/Portal:he>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:03+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:21+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-plugin-logfilter\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: LogFilterPlugin.php:49
 msgid "Provides server-side setting to filter log output by type or keyword."
 msgstr "אספקת הגדרות צד־שרת לסינון פלט לפי סוג או לפי מילת מפתח."
diff --git a/plugins/LogFilter/locale/ia/LC_MESSAGES/LogFilter.po b/plugins/LogFilter/locale/ia/LC_MESSAGES/LogFilter.po
index 75ed2aae37..4972b0947b 100644
--- a/plugins/LogFilter/locale/ia/LC_MESSAGES/LogFilter.po
+++ b/plugins/LogFilter/locale/ia/LC_MESSAGES/LogFilter.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LogFilter\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:16+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:30+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:03+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:21+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-logfilter\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: LogFilterPlugin.php:49
 msgid "Provides server-side setting to filter log output by type or keyword."
 msgstr ""
 "Forni un configuration al latere del servitor pro filtrar le producite "
diff --git a/plugins/LogFilter/locale/mk/LC_MESSAGES/LogFilter.po b/plugins/LogFilter/locale/mk/LC_MESSAGES/LogFilter.po
index 0c35346e9b..481cf201c4 100644
--- a/plugins/LogFilter/locale/mk/LC_MESSAGES/LogFilter.po
+++ b/plugins/LogFilter/locale/mk/LC_MESSAGES/LogFilter.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LogFilter\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:17+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:30+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:03+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:21+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-logfilter\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
 
-#: LogFilterPlugin.php:49
 msgid "Provides server-side setting to filter log output by type or keyword."
 msgstr ""
 "Овозможува поставка кај опслужувачот за филтрирање на дневничките изводи по "
diff --git a/plugins/LogFilter/locale/nl/LC_MESSAGES/LogFilter.po b/plugins/LogFilter/locale/nl/LC_MESSAGES/LogFilter.po
index a178425004..4852248537 100644
--- a/plugins/LogFilter/locale/nl/LC_MESSAGES/LogFilter.po
+++ b/plugins/LogFilter/locale/nl/LC_MESSAGES/LogFilter.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LogFilter\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:17+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:30+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:03+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:21+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-logfilter\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: LogFilterPlugin.php:49
 msgid "Provides server-side setting to filter log output by type or keyword."
 msgstr ""
 "Biedt serverinstellingen om logboekuitvoer te filteren op type of trefwoord."
diff --git a/plugins/LogFilter/locale/pt/LC_MESSAGES/LogFilter.po b/plugins/LogFilter/locale/pt/LC_MESSAGES/LogFilter.po
index 1141c85add..c57f1905fc 100644
--- a/plugins/LogFilter/locale/pt/LC_MESSAGES/LogFilter.po
+++ b/plugins/LogFilter/locale/pt/LC_MESSAGES/LogFilter.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LogFilter\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:17+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:30+0000\n"
 "Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:03+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:21+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-plugin-logfilter\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: LogFilterPlugin.php:49
 msgid "Provides server-side setting to filter log output by type or keyword."
 msgstr ""
 "Fornece uma configuração do lado do servidor para filtrar a saída do "
diff --git a/plugins/LogFilter/locale/ru/LC_MESSAGES/LogFilter.po b/plugins/LogFilter/locale/ru/LC_MESSAGES/LogFilter.po
index f0e7b9a458..4ab449e995 100644
--- a/plugins/LogFilter/locale/ru/LC_MESSAGES/LogFilter.po
+++ b/plugins/LogFilter/locale/ru/LC_MESSAGES/LogFilter.po
@@ -9,20 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LogFilter\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:17+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:30+0000\n"
 "Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:03+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:21+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-logfilter\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: LogFilterPlugin.php:49
 msgid "Provides server-side setting to filter log output by type or keyword."
 msgstr ""
 "Предоставляет серверный параметр для фильтрации выходных данных журнала по "
diff --git a/plugins/LogFilter/locale/uk/LC_MESSAGES/LogFilter.po b/plugins/LogFilter/locale/uk/LC_MESSAGES/LogFilter.po
index 4613976358..734023d7ef 100644
--- a/plugins/LogFilter/locale/uk/LC_MESSAGES/LogFilter.po
+++ b/plugins/LogFilter/locale/uk/LC_MESSAGES/LogFilter.po
@@ -9,20 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LogFilter\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:17+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:30+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:03+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:21+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-logfilter\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: LogFilterPlugin.php:49
 msgid "Provides server-side setting to filter log output by type or keyword."
 msgstr ""
 "Забезпечує на серверній стороні установки для фільтрації виводу журналу за "
diff --git a/plugins/LogFilter/locale/zh_CN/LC_MESSAGES/LogFilter.po b/plugins/LogFilter/locale/zh_CN/LC_MESSAGES/LogFilter.po
index ae15498ae9..d8951758fb 100644
--- a/plugins/LogFilter/locale/zh_CN/LC_MESSAGES/LogFilter.po
+++ b/plugins/LogFilter/locale/zh_CN/LC_MESSAGES/LogFilter.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LogFilter\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-24 10:32+0000\n"
-"PO-Revision-Date: 2011-02-24 10:39:29+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:30+0000\n"
 "Language-Team: Simplified Chinese <http://translatewiki.net/wiki/Portal:zh-"
 "hans>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-14 17:20:44+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r82712); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:21+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-logfilter\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: LogFilterPlugin.php:49
 msgid "Provides server-side setting to filter log output by type or keyword."
 msgstr "提供了服务器端设置筛选日志输出的类型或关键字。"
diff --git a/plugins/Mapstraction/locale/Mapstraction.pot b/plugins/Mapstraction/locale/Mapstraction.pot
index 0e9048529d..ce4439bf4e 100644
--- a/plugins/Mapstraction/locale/Mapstraction.pot
+++ b/plugins/Mapstraction/locale/Mapstraction.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -31,14 +31,6 @@ msgid ""
 "mapstraction.com/\">Mapstraction</a>."
 msgstr ""
 
-#: map.php:72
-msgid "No such user."
-msgstr ""
-
-#: map.php:79
-msgid "User has no profile."
-msgstr ""
-
 #. TRANS: Page title.
 #. TRANS: %s is a user nickname.
 #: allmap.php:69
@@ -53,6 +45,14 @@ msgstr ""
 msgid "%1$s friends map, page %2$d"
 msgstr ""
 
+#: map.php:72
+msgid "No such user."
+msgstr ""
+
+#: map.php:79
+msgid "User has no profile."
+msgstr ""
+
 #: usermap.php:68
 #, php-format
 msgid "%s map, page %d"
diff --git a/plugins/Mapstraction/locale/br/LC_MESSAGES/Mapstraction.po b/plugins/Mapstraction/locale/br/LC_MESSAGES/Mapstraction.po
index 99b0f7a9d2..d1499b4133 100644
--- a/plugins/Mapstraction/locale/br/LC_MESSAGES/Mapstraction.po
+++ b/plugins/Mapstraction/locale/br/LC_MESSAGES/Mapstraction.po
@@ -9,56 +9,48 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Mapstraction\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:18+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:31+0000\n"
 "Language-Team: Breton <http://translatewiki.net/wiki/Portal:br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:16+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:52+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-mapstraction\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: MapstractionPlugin.php:187
 msgid "Map"
 msgstr "Kartenn"
 
 #. TRANS: Clickable item to allow opening the map in full size.
-#: MapstractionPlugin.php:199
 msgid "Full size"
 msgstr ""
 
-#: MapstractionPlugin.php:211
 msgid ""
 "Show maps of users' and friends' notices with <a href=\"http://www."
 "mapstraction.com/\">Mapstraction</a>."
 msgstr ""
 
-#: map.php:72
-msgid "No such user."
-msgstr "N'eus ket eus an implijer-se."
-
-#: map.php:79
-msgid "User has no profile."
-msgstr "An implijer-mañ n'eus profil ebet dezhañ."
-
 #. TRANS: Page title.
 #. TRANS: %s is a user nickname.
-#: allmap.php:69
 #, php-format
 msgid "%s friends map"
 msgstr "Kartenn mignoned %s"
 
 #. TRANS: Page title.
 #. TRANS: %1$s is a user nickname, %2$d is a page number.
-#: allmap.php:75
 #, fuzzy, php-format
 msgid "%1$s friends map, page %2$d"
 msgstr "Kartenn mignoned %d, pajenn %d"
 
-#: usermap.php:68
+msgid "No such user."
+msgstr "N'eus ket eus an implijer-se."
+
+msgid "User has no profile."
+msgstr "An implijer-mañ n'eus profil ebet dezhañ."
+
 #, php-format
 msgid "%s map, page %d"
 msgstr "%s gartenn, pajenn %d"
diff --git a/plugins/Mapstraction/locale/de/LC_MESSAGES/Mapstraction.po b/plugins/Mapstraction/locale/de/LC_MESSAGES/Mapstraction.po
index a14b6a9826..7a145ee457 100644
--- a/plugins/Mapstraction/locale/de/LC_MESSAGES/Mapstraction.po
+++ b/plugins/Mapstraction/locale/de/LC_MESSAGES/Mapstraction.po
@@ -10,28 +10,25 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Mapstraction\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:19+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:31+0000\n"
 "Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:16+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:52+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-mapstraction\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: MapstractionPlugin.php:187
 msgid "Map"
 msgstr "Karte"
 
 #. TRANS: Clickable item to allow opening the map in full size.
-#: MapstractionPlugin.php:199
 msgid "Full size"
 msgstr "in voller Größe"
 
-#: MapstractionPlugin.php:211
 msgid ""
 "Show maps of users' and friends' notices with <a href=\"http://www."
 "mapstraction.com/\">Mapstraction</a>."
@@ -39,29 +36,24 @@ msgstr ""
 "Zeigt Karten mit Nachrichten von Freunden und Nutzern mit <a href=\"http://"
 "www.mapstraction.com/\">Mapstraction</a>."
 
-#: map.php:72
-msgid "No such user."
-msgstr "Unbekannter Benutzer."
-
-#: map.php:79
-msgid "User has no profile."
-msgstr "Benutzer hat kein Profil."
-
 #. TRANS: Page title.
 #. TRANS: %s is a user nickname.
-#: allmap.php:69
 #, php-format
 msgid "%s friends map"
 msgstr "Karte der Freunde von %s"
 
 #. TRANS: Page title.
 #. TRANS: %1$s is a user nickname, %2$d is a page number.
-#: allmap.php:75
 #, php-format
 msgid "%1$s friends map, page %2$d"
 msgstr "Karte der Freunde von %1$s, Seite %2$d"
 
-#: usermap.php:68
+msgid "No such user."
+msgstr "Unbekannter Benutzer."
+
+msgid "User has no profile."
+msgstr "Benutzer hat kein Profil."
+
 #, php-format
 msgid "%s map, page %d"
 msgstr "%s-Karte, Seite %d"
diff --git a/plugins/Mapstraction/locale/fi/LC_MESSAGES/Mapstraction.po b/plugins/Mapstraction/locale/fi/LC_MESSAGES/Mapstraction.po
index 348e53b80d..a76a74ed18 100644
--- a/plugins/Mapstraction/locale/fi/LC_MESSAGES/Mapstraction.po
+++ b/plugins/Mapstraction/locale/fi/LC_MESSAGES/Mapstraction.po
@@ -9,56 +9,48 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Mapstraction\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:19+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:31+0000\n"
 "Language-Team: Finnish <http://translatewiki.net/wiki/Portal:fi>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:16+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:52+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fi\n"
 "X-Message-Group: #out-statusnet-plugin-mapstraction\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: MapstractionPlugin.php:187
 msgid "Map"
 msgstr "Kartta"
 
 #. TRANS: Clickable item to allow opening the map in full size.
-#: MapstractionPlugin.php:199
 msgid "Full size"
 msgstr "Täysi koko"
 
-#: MapstractionPlugin.php:211
 msgid ""
 "Show maps of users' and friends' notices with <a href=\"http://www."
 "mapstraction.com/\">Mapstraction</a>."
 msgstr ""
 
-#: map.php:72
-msgid "No such user."
-msgstr "Käyttäjää ei ole."
-
-#: map.php:79
-msgid "User has no profile."
-msgstr "Käyttäjällä ei ole profiilia."
-
 #. TRANS: Page title.
 #. TRANS: %s is a user nickname.
-#: allmap.php:69
 #, php-format
 msgid "%s friends map"
 msgstr "Kartta käyttäjän %s ystävistä"
 
 #. TRANS: Page title.
 #. TRANS: %1$s is a user nickname, %2$d is a page number.
-#: allmap.php:75
 #, fuzzy, php-format
 msgid "%1$s friends map, page %2$d"
 msgstr "Kartta käyttäjän %s ystävistä"
 
-#: usermap.php:68
+msgid "No such user."
+msgstr "Käyttäjää ei ole."
+
+msgid "User has no profile."
+msgstr "Käyttäjällä ei ole profiilia."
+
 #, php-format
 msgid "%s map, page %d"
 msgstr ""
diff --git a/plugins/Mapstraction/locale/fr/LC_MESSAGES/Mapstraction.po b/plugins/Mapstraction/locale/fr/LC_MESSAGES/Mapstraction.po
index 3376665f7f..2ecbd86bd7 100644
--- a/plugins/Mapstraction/locale/fr/LC_MESSAGES/Mapstraction.po
+++ b/plugins/Mapstraction/locale/fr/LC_MESSAGES/Mapstraction.po
@@ -10,28 +10,25 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Mapstraction\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:19+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:31+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:16+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:52+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-mapstraction\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: MapstractionPlugin.php:187
 msgid "Map"
 msgstr "Cartographie"
 
 #. TRANS: Clickable item to allow opening the map in full size.
-#: MapstractionPlugin.php:199
 msgid "Full size"
 msgstr "Pleine taille"
 
-#: MapstractionPlugin.php:211
 msgid ""
 "Show maps of users' and friends' notices with <a href=\"http://www."
 "mapstraction.com/\">Mapstraction</a>."
@@ -39,29 +36,24 @@ msgstr ""
 "Affiche des cartes localisant les avis des utilisateurs et amis avec <a href="
 "\"http://www.mapstraction.com/\">Mapstraction</a>."
 
-#: map.php:72
-msgid "No such user."
-msgstr "Utilisateur inexistant."
-
-#: map.php:79
-msgid "User has no profile."
-msgstr "Aucun profil ne correspond à cet utilisateur."
-
 #. TRANS: Page title.
 #. TRANS: %s is a user nickname.
-#: allmap.php:69
 #, php-format
 msgid "%s friends map"
 msgstr "Carte des amis de %s"
 
 #. TRANS: Page title.
 #. TRANS: %1$s is a user nickname, %2$d is a page number.
-#: allmap.php:75
 #, php-format
 msgid "%1$s friends map, page %2$d"
 msgstr "Carte des amis de %1$s, page %2$d"
 
-#: usermap.php:68
+msgid "No such user."
+msgstr "Utilisateur inexistant."
+
+msgid "User has no profile."
+msgstr "Aucun profil ne correspond à cet utilisateur."
+
 #, php-format
 msgid "%s map, page %d"
 msgstr "Carte %s, page %d"
diff --git a/plugins/Mapstraction/locale/fur/LC_MESSAGES/Mapstraction.po b/plugins/Mapstraction/locale/fur/LC_MESSAGES/Mapstraction.po
index 41f14b0f18..ad9222522c 100644
--- a/plugins/Mapstraction/locale/fur/LC_MESSAGES/Mapstraction.po
+++ b/plugins/Mapstraction/locale/fur/LC_MESSAGES/Mapstraction.po
@@ -9,28 +9,25 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Mapstraction\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 15:58+0000\n"
-"PO-Revision-Date: 2011-03-03 16:02:11+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:31+0000\n"
 "Language-Team: Friulian <http://translatewiki.net/wiki/Portal:fur>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-03 00:37:38+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:52+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fur\n"
 "X-Message-Group: #out-statusnet-plugin-mapstraction\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: MapstractionPlugin.php:187
 msgid "Map"
 msgstr "Mape"
 
 #. TRANS: Clickable item to allow opening the map in full size.
-#: MapstractionPlugin.php:199
 msgid "Full size"
 msgstr "Dimension plene"
 
-#: MapstractionPlugin.php:211
 msgid ""
 "Show maps of users' and friends' notices with <a href=\"http://www."
 "mapstraction.com/\">Mapstraction</a>."
@@ -38,29 +35,24 @@ msgstr ""
 "Mostre lis mapis dai avîs dai utents e dai amis cun <a href=\"http://www."
 "mapstraction.com/\">Mapstraction</a>."
 
-#: map.php:72
-msgid "No such user."
-msgstr "Utent no cjatât."
-
-#: map.php:79
-msgid "User has no profile."
-msgstr "L'utent nol à un profîl."
-
 #. TRANS: Page title.
 #. TRANS: %s is a user nickname.
-#: allmap.php:69
 #, php-format
 msgid "%s friends map"
 msgstr "Mape dai amîs di %s"
 
 #. TRANS: Page title.
 #. TRANS: %1$s is a user nickname, %2$d is a page number.
-#: allmap.php:75
 #, php-format
 msgid "%1$s friends map, page %2$d"
 msgstr "Mape dai amîs di %1$s, pagjine %2$d"
 
-#: usermap.php:68
+msgid "No such user."
+msgstr "Utent no cjatât."
+
+msgid "User has no profile."
+msgstr "L'utent nol à un profîl."
+
 #, php-format
 msgid "%s map, page %d"
 msgstr "Mape di %s, pagjine %d"
diff --git a/plugins/Mapstraction/locale/gl/LC_MESSAGES/Mapstraction.po b/plugins/Mapstraction/locale/gl/LC_MESSAGES/Mapstraction.po
index 5bae4dff6a..e636aceae4 100644
--- a/plugins/Mapstraction/locale/gl/LC_MESSAGES/Mapstraction.po
+++ b/plugins/Mapstraction/locale/gl/LC_MESSAGES/Mapstraction.po
@@ -9,56 +9,48 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Mapstraction\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:19+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:31+0000\n"
 "Language-Team: Galician <http://translatewiki.net/wiki/Portal:gl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:16+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:52+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: gl\n"
 "X-Message-Group: #out-statusnet-plugin-mapstraction\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: MapstractionPlugin.php:187
 msgid "Map"
 msgstr "Mapa"
 
 #. TRANS: Clickable item to allow opening the map in full size.
-#: MapstractionPlugin.php:199
 msgid "Full size"
 msgstr "Tamaño completo"
 
-#: MapstractionPlugin.php:211
 msgid ""
 "Show maps of users' and friends' notices with <a href=\"http://www."
 "mapstraction.com/\">Mapstraction</a>."
 msgstr ""
 
-#: map.php:72
-msgid "No such user."
-msgstr "Non existe tal usuario."
-
-#: map.php:79
-msgid "User has no profile."
-msgstr "O usuario non ten perfil."
-
 #. TRANS: Page title.
 #. TRANS: %s is a user nickname.
-#: allmap.php:69
 #, php-format
 msgid "%s friends map"
 msgstr ""
 
 #. TRANS: Page title.
 #. TRANS: %1$s is a user nickname, %2$d is a page number.
-#: allmap.php:75
 #, php-format
 msgid "%1$s friends map, page %2$d"
 msgstr ""
 
-#: usermap.php:68
+msgid "No such user."
+msgstr "Non existe tal usuario."
+
+msgid "User has no profile."
+msgstr "O usuario non ten perfil."
+
 #, php-format
 msgid "%s map, page %d"
 msgstr ""
diff --git a/plugins/Mapstraction/locale/ia/LC_MESSAGES/Mapstraction.po b/plugins/Mapstraction/locale/ia/LC_MESSAGES/Mapstraction.po
index 28d978163f..db5f374365 100644
--- a/plugins/Mapstraction/locale/ia/LC_MESSAGES/Mapstraction.po
+++ b/plugins/Mapstraction/locale/ia/LC_MESSAGES/Mapstraction.po
@@ -9,28 +9,25 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Mapstraction\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:20+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:31+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:16+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:52+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-mapstraction\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: MapstractionPlugin.php:187
 msgid "Map"
 msgstr "Mappa"
 
 #. TRANS: Clickable item to allow opening the map in full size.
-#: MapstractionPlugin.php:199
 msgid "Full size"
 msgstr "Dimension complete"
 
-#: MapstractionPlugin.php:211
 msgid ""
 "Show maps of users' and friends' notices with <a href=\"http://www."
 "mapstraction.com/\">Mapstraction</a>."
@@ -38,29 +35,24 @@ msgstr ""
 "Monstra mappas de notas de usatores e amicos con <a href=\"http://www."
 "mapstraction.com/\">Mapstraction</a>."
 
-#: map.php:72
-msgid "No such user."
-msgstr "Iste usator non existe."
-
-#: map.php:79
-msgid "User has no profile."
-msgstr "Le usator non ha un profilo."
-
 #. TRANS: Page title.
 #. TRANS: %s is a user nickname.
-#: allmap.php:69
 #, php-format
 msgid "%s friends map"
 msgstr "Mappa del amicos de %s"
 
 #. TRANS: Page title.
 #. TRANS: %1$s is a user nickname, %2$d is a page number.
-#: allmap.php:75
 #, php-format
 msgid "%1$s friends map, page %2$d"
 msgstr "Mappa de amicos de %1$s, pagina %2$d"
 
-#: usermap.php:68
+msgid "No such user."
+msgstr "Iste usator non existe."
+
+msgid "User has no profile."
+msgstr "Le usator non ha un profilo."
+
 #, php-format
 msgid "%s map, page %d"
 msgstr "Mappa de %s, pagina %d"
diff --git a/plugins/Mapstraction/locale/mk/LC_MESSAGES/Mapstraction.po b/plugins/Mapstraction/locale/mk/LC_MESSAGES/Mapstraction.po
index afa0cf8cac..38fc34de65 100644
--- a/plugins/Mapstraction/locale/mk/LC_MESSAGES/Mapstraction.po
+++ b/plugins/Mapstraction/locale/mk/LC_MESSAGES/Mapstraction.po
@@ -9,28 +9,25 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Mapstraction\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:20+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:31+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:16+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:52+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-mapstraction\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
 
-#: MapstractionPlugin.php:187
 msgid "Map"
 msgstr "Карта"
 
 #. TRANS: Clickable item to allow opening the map in full size.
-#: MapstractionPlugin.php:199
 msgid "Full size"
 msgstr "Полна големина"
 
-#: MapstractionPlugin.php:211
 msgid ""
 "Show maps of users' and friends' notices with <a href=\"http://www."
 "mapstraction.com/\">Mapstraction</a>."
@@ -38,29 +35,24 @@ msgstr ""
 "Прикажувај карти со забелешките на корисниците и пријателите со <a href="
 "\"http://www.mapstraction.com/\">Mapstraction</a>"
 
-#: map.php:72
-msgid "No such user."
-msgstr "Нема таков корисник."
-
-#: map.php:79
-msgid "User has no profile."
-msgstr "Корисникот нема профил."
-
 #. TRANS: Page title.
 #. TRANS: %s is a user nickname.
-#: allmap.php:69
 #, php-format
 msgid "%s friends map"
 msgstr "Карта на пријатели на %s"
 
 #. TRANS: Page title.
 #. TRANS: %1$s is a user nickname, %2$d is a page number.
-#: allmap.php:75
 #, php-format
 msgid "%1$s friends map, page %2$d"
 msgstr "Карта на пријатели на %1$s, страница %2$d"
 
-#: usermap.php:68
+msgid "No such user."
+msgstr "Нема таков корисник."
+
+msgid "User has no profile."
+msgstr "Корисникот нема профил."
+
 #, php-format
 msgid "%s map, page %d"
 msgstr "Карта на %s, стр. %d"
diff --git a/plugins/Mapstraction/locale/nb/LC_MESSAGES/Mapstraction.po b/plugins/Mapstraction/locale/nb/LC_MESSAGES/Mapstraction.po
index 8aa1b702ac..eecd848f16 100644
--- a/plugins/Mapstraction/locale/nb/LC_MESSAGES/Mapstraction.po
+++ b/plugins/Mapstraction/locale/nb/LC_MESSAGES/Mapstraction.po
@@ -9,28 +9,25 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Mapstraction\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:20+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:31+0000\n"
 "Language-Team: Norwegian (bokmål)‬ <http://translatewiki.net/wiki/Portal:no>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:16+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:52+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: #out-statusnet-plugin-mapstraction\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: MapstractionPlugin.php:187
 msgid "Map"
 msgstr "Kart"
 
 #. TRANS: Clickable item to allow opening the map in full size.
-#: MapstractionPlugin.php:199
 msgid "Full size"
 msgstr "Full størrelse"
 
-#: MapstractionPlugin.php:211
 msgid ""
 "Show maps of users' and friends' notices with <a href=\"http://www."
 "mapstraction.com/\">Mapstraction</a>."
@@ -38,29 +35,24 @@ msgstr ""
 "Vis kart over brukeres og venners notiser med <a href=\"http://www."
 "mapstraction.com/\">Mapstraction</a>."
 
-#: map.php:72
-msgid "No such user."
-msgstr "Ingen slik bruker."
-
-#: map.php:79
-msgid "User has no profile."
-msgstr "Bruker har ingen profil."
-
 #. TRANS: Page title.
 #. TRANS: %s is a user nickname.
-#: allmap.php:69
 #, php-format
 msgid "%s friends map"
 msgstr "%s vennekart"
 
 #. TRANS: Page title.
 #. TRANS: %1$s is a user nickname, %2$d is a page number.
-#: allmap.php:75
 #, php-format
 msgid "%1$s friends map, page %2$d"
 msgstr "%1$s vennekart, side %2$d"
 
-#: usermap.php:68
+msgid "No such user."
+msgstr "Ingen slik bruker."
+
+msgid "User has no profile."
+msgstr "Bruker har ingen profil."
+
 #, php-format
 msgid "%s map, page %d"
 msgstr "%s kart, side %d"
diff --git a/plugins/Mapstraction/locale/nl/LC_MESSAGES/Mapstraction.po b/plugins/Mapstraction/locale/nl/LC_MESSAGES/Mapstraction.po
index 531ce086d7..e45007e68a 100644
--- a/plugins/Mapstraction/locale/nl/LC_MESSAGES/Mapstraction.po
+++ b/plugins/Mapstraction/locale/nl/LC_MESSAGES/Mapstraction.po
@@ -10,28 +10,25 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Mapstraction\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:20+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:31+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:16+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:52+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-mapstraction\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: MapstractionPlugin.php:187
 msgid "Map"
 msgstr "Kaart"
 
 #. TRANS: Clickable item to allow opening the map in full size.
-#: MapstractionPlugin.php:199
 msgid "Full size"
 msgstr "Groter"
 
-#: MapstractionPlugin.php:211
 msgid ""
 "Show maps of users' and friends' notices with <a href=\"http://www."
 "mapstraction.com/\">Mapstraction</a>."
@@ -39,29 +36,24 @@ msgstr ""
 "Geeft een kaart met de mededelingen van de gebruiker en vrienden weer met "
 "behulp van <a href=\"http://www.mapstraction.com/\">Mapstraction</a>."
 
-#: map.php:72
-msgid "No such user."
-msgstr "Deze gebruiker bestaat niet"
-
-#: map.php:79
-msgid "User has no profile."
-msgstr "Deze gebruiker heeft geen profiel."
-
 #. TRANS: Page title.
 #. TRANS: %s is a user nickname.
-#: allmap.php:69
 #, php-format
 msgid "%s friends map"
 msgstr "Kaart van %s en vrienden"
 
 #. TRANS: Page title.
 #. TRANS: %1$s is a user nickname, %2$d is a page number.
-#: allmap.php:75
 #, php-format
 msgid "%1$s friends map, page %2$d"
 msgstr "Kaart van vrienden van %1$s, pagina %2$d"
 
-#: usermap.php:68
+msgid "No such user."
+msgstr "Deze gebruiker bestaat niet"
+
+msgid "User has no profile."
+msgstr "Deze gebruiker heeft geen profiel."
+
 #, php-format
 msgid "%s map, page %d"
 msgstr "Kaart van %s, pagina %d"
diff --git a/plugins/Mapstraction/locale/ru/LC_MESSAGES/Mapstraction.po b/plugins/Mapstraction/locale/ru/LC_MESSAGES/Mapstraction.po
index 237778dd43..0b249e4f52 100644
--- a/plugins/Mapstraction/locale/ru/LC_MESSAGES/Mapstraction.po
+++ b/plugins/Mapstraction/locale/ru/LC_MESSAGES/Mapstraction.po
@@ -9,57 +9,49 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Mapstraction\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:20+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:31+0000\n"
 "Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:16+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:52+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-mapstraction\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: MapstractionPlugin.php:187
 msgid "Map"
 msgstr "Карта"
 
 #. TRANS: Clickable item to allow opening the map in full size.
-#: MapstractionPlugin.php:199
 msgid "Full size"
 msgstr "Полный размер"
 
-#: MapstractionPlugin.php:211
 msgid ""
 "Show maps of users' and friends' notices with <a href=\"http://www."
 "mapstraction.com/\">Mapstraction</a>."
 msgstr ""
 
-#: map.php:72
-msgid "No such user."
-msgstr "Нет такого пользователя."
-
-#: map.php:79
-msgid "User has no profile."
-msgstr "У пользователя нет профиля."
-
 #. TRANS: Page title.
 #. TRANS: %s is a user nickname.
-#: allmap.php:69
 #, php-format
 msgid "%s friends map"
 msgstr "Карта друзей: %s"
 
 #. TRANS: Page title.
 #. TRANS: %1$s is a user nickname, %2$d is a page number.
-#: allmap.php:75
 #, fuzzy, php-format
 msgid "%1$s friends map, page %2$d"
 msgstr "Карта друзей: %s"
 
-#: usermap.php:68
+msgid "No such user."
+msgstr "Нет такого пользователя."
+
+msgid "User has no profile."
+msgstr "У пользователя нет профиля."
+
 #, php-format
 msgid "%s map, page %d"
 msgstr ""
diff --git a/plugins/Mapstraction/locale/ta/LC_MESSAGES/Mapstraction.po b/plugins/Mapstraction/locale/ta/LC_MESSAGES/Mapstraction.po
index 8845678733..db4909d66a 100644
--- a/plugins/Mapstraction/locale/ta/LC_MESSAGES/Mapstraction.po
+++ b/plugins/Mapstraction/locale/ta/LC_MESSAGES/Mapstraction.po
@@ -9,56 +9,48 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Mapstraction\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:20+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:31+0000\n"
 "Language-Team: Tamil <http://translatewiki.net/wiki/Portal:ta>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:16+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:52+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ta\n"
 "X-Message-Group: #out-statusnet-plugin-mapstraction\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: MapstractionPlugin.php:187
 msgid "Map"
 msgstr "வரைபடம்"
 
 #. TRANS: Clickable item to allow opening the map in full size.
-#: MapstractionPlugin.php:199
 msgid "Full size"
 msgstr "முழு அளவு"
 
-#: MapstractionPlugin.php:211
 msgid ""
 "Show maps of users' and friends' notices with <a href=\"http://www."
 "mapstraction.com/\">Mapstraction</a>."
 msgstr ""
 
-#: map.php:72
-msgid "No such user."
-msgstr "அப்படியொரு பயனர் இல்லை."
-
-#: map.php:79
-msgid "User has no profile."
-msgstr ""
-
 #. TRANS: Page title.
 #. TRANS: %s is a user nickname.
-#: allmap.php:69
 #, php-format
 msgid "%s friends map"
 msgstr ""
 
 #. TRANS: Page title.
 #. TRANS: %1$s is a user nickname, %2$d is a page number.
-#: allmap.php:75
 #, php-format
 msgid "%1$s friends map, page %2$d"
 msgstr ""
 
-#: usermap.php:68
+msgid "No such user."
+msgstr "அப்படியொரு பயனர் இல்லை."
+
+msgid "User has no profile."
+msgstr ""
+
 #, php-format
 msgid "%s map, page %d"
 msgstr ""
diff --git a/plugins/Mapstraction/locale/te/LC_MESSAGES/Mapstraction.po b/plugins/Mapstraction/locale/te/LC_MESSAGES/Mapstraction.po
index c5e7433f4f..a256639fbd 100644
--- a/plugins/Mapstraction/locale/te/LC_MESSAGES/Mapstraction.po
+++ b/plugins/Mapstraction/locale/te/LC_MESSAGES/Mapstraction.po
@@ -9,56 +9,48 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Mapstraction\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-02 23:30+0000\n"
-"PO-Revision-Date: 2011-02-02 23:37:12+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:31+0000\n"
 "Language-Team: Telugu <http://translatewiki.net/wiki/Portal:te>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:25:36+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81409); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:52+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: te\n"
 "X-Message-Group: #out-statusnet-plugin-mapstraction\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: MapstractionPlugin.php:187
 msgid "Map"
 msgstr "పటం"
 
 #. TRANS: Clickable item to allow opening the map in full size.
-#: MapstractionPlugin.php:199
 msgid "Full size"
 msgstr "పూర్తి పరిమాణం"
 
-#: MapstractionPlugin.php:211
 msgid ""
 "Show maps of users' and friends' notices with <a href=\"http://www."
 "mapstraction.com/\">Mapstraction</a>."
 msgstr ""
 
-#: map.php:72
-msgid "No such user."
-msgstr ""
-
-#: map.php:79
-msgid "User has no profile."
-msgstr ""
-
 #. TRANS: Page title.
 #. TRANS: %s is a user nickname.
-#: allmap.php:69
 #, php-format
 msgid "%s friends map"
 msgstr "%s మిత్రుల పటం"
 
 #. TRANS: Page title.
 #. TRANS: %1$s is a user nickname, %2$d is a page number.
-#: allmap.php:75
 #, php-format
 msgid "%1$s friends map, page %2$d"
 msgstr ""
 
-#: usermap.php:68
+msgid "No such user."
+msgstr ""
+
+msgid "User has no profile."
+msgstr ""
+
 #, php-format
 msgid "%s map, page %d"
 msgstr "%s పటం, పుట %d"
diff --git a/plugins/Mapstraction/locale/tl/LC_MESSAGES/Mapstraction.po b/plugins/Mapstraction/locale/tl/LC_MESSAGES/Mapstraction.po
index bfa5204349..a857edee3d 100644
--- a/plugins/Mapstraction/locale/tl/LC_MESSAGES/Mapstraction.po
+++ b/plugins/Mapstraction/locale/tl/LC_MESSAGES/Mapstraction.po
@@ -9,28 +9,25 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Mapstraction\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:20+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:31+0000\n"
 "Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:16+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:52+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-mapstraction\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: MapstractionPlugin.php:187
 msgid "Map"
 msgstr "Mapa"
 
 #. TRANS: Clickable item to allow opening the map in full size.
-#: MapstractionPlugin.php:199
 msgid "Full size"
 msgstr "Buong sukat"
 
-#: MapstractionPlugin.php:211
 msgid ""
 "Show maps of users' and friends' notices with <a href=\"http://www."
 "mapstraction.com/\">Mapstraction</a>."
@@ -38,29 +35,24 @@ msgstr ""
 "Nagpapakita ng mga mapa ng mga pabatid ng mga tagagamit at ng mga kaibigan "
 "sa pamamagitan ng <a href=\"http://www.mapstraction.com/\">Mapstraction</a>."
 
-#: map.php:72
-msgid "No such user."
-msgstr "Walang ganyang tagagamit."
-
-#: map.php:79
-msgid "User has no profile."
-msgstr "Walang balangkas ang tagagamit."
-
 #. TRANS: Page title.
 #. TRANS: %s is a user nickname.
-#: allmap.php:69
 #, php-format
 msgid "%s friends map"
 msgstr "%s na mapa ng mga kaibigan"
 
 #. TRANS: Page title.
 #. TRANS: %1$s is a user nickname, %2$d is a page number.
-#: allmap.php:75
 #, php-format
 msgid "%1$s friends map, page %2$d"
 msgstr " %1$s mapa ng mga kaibigan, pahina %2$d"
 
-#: usermap.php:68
+msgid "No such user."
+msgstr "Walang ganyang tagagamit."
+
+msgid "User has no profile."
+msgstr "Walang balangkas ang tagagamit."
+
 #, php-format
 msgid "%s map, page %d"
 msgstr "%s na mapa, pahina %d"
diff --git a/plugins/Mapstraction/locale/uk/LC_MESSAGES/Mapstraction.po b/plugins/Mapstraction/locale/uk/LC_MESSAGES/Mapstraction.po
index d22236a9dc..add718ab10 100644
--- a/plugins/Mapstraction/locale/uk/LC_MESSAGES/Mapstraction.po
+++ b/plugins/Mapstraction/locale/uk/LC_MESSAGES/Mapstraction.po
@@ -9,29 +9,26 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Mapstraction\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:20+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:31+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:16+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:52+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-mapstraction\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: MapstractionPlugin.php:187
 msgid "Map"
 msgstr "Мапа"
 
 #. TRANS: Clickable item to allow opening the map in full size.
-#: MapstractionPlugin.php:199
 msgid "Full size"
 msgstr "Повний розмір"
 
-#: MapstractionPlugin.php:211
 msgid ""
 "Show maps of users' and friends' notices with <a href=\"http://www."
 "mapstraction.com/\">Mapstraction</a>."
@@ -39,29 +36,24 @@ msgstr ""
 "Показ мапи дописів користувачів і друзів за допомогою <a href=\"http://www."
 "mapstraction.com/\">Mapstraction</a>."
 
-#: map.php:72
-msgid "No such user."
-msgstr "Такого користувача немає."
-
-#: map.php:79
-msgid "User has no profile."
-msgstr "Користувач не має профілю."
-
 #. TRANS: Page title.
 #. TRANS: %s is a user nickname.
-#: allmap.php:69
 #, php-format
 msgid "%s friends map"
 msgstr "Мапа друзів %s."
 
 #. TRANS: Page title.
 #. TRANS: %1$s is a user nickname, %2$d is a page number.
-#: allmap.php:75
 #, php-format
 msgid "%1$s friends map, page %2$d"
 msgstr "Мапа друзів %1$s, сторінка %2$d"
 
-#: usermap.php:68
+msgid "No such user."
+msgstr "Такого користувача немає."
+
+msgid "User has no profile."
+msgstr "Користувач не має профілю."
+
 #, php-format
 msgid "%s map, page %d"
 msgstr "Мапа друзів %s, сторінка %d"
diff --git a/plugins/Mapstraction/locale/zh_CN/LC_MESSAGES/Mapstraction.po b/plugins/Mapstraction/locale/zh_CN/LC_MESSAGES/Mapstraction.po
index 074fa10366..8fdb491504 100644
--- a/plugins/Mapstraction/locale/zh_CN/LC_MESSAGES/Mapstraction.po
+++ b/plugins/Mapstraction/locale/zh_CN/LC_MESSAGES/Mapstraction.po
@@ -9,29 +9,26 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Mapstraction\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:20+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:32+0000\n"
 "Language-Team: Simplified Chinese <http://translatewiki.net/wiki/Portal:zh-"
 "hans>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:16+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:52+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-mapstraction\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: MapstractionPlugin.php:187
 msgid "Map"
 msgstr "地图"
 
 #. TRANS: Clickable item to allow opening the map in full size.
-#: MapstractionPlugin.php:199
 msgid "Full size"
 msgstr "完整尺寸"
 
-#: MapstractionPlugin.php:211
 msgid ""
 "Show maps of users' and friends' notices with <a href=\"http://www."
 "mapstraction.com/\">Mapstraction</a>."
@@ -39,29 +36,24 @@ msgstr ""
 "使用 <a href=\"http://www.mapstraction.com/\">Mapstraction</a> 显示用户和好友"
 "的消息地图。"
 
-#: map.php:72
-msgid "No such user."
-msgstr "没有这个用户。"
-
-#: map.php:79
-msgid "User has no profile."
-msgstr "用户没有个人信息。"
-
 #. TRANS: Page title.
 #. TRANS: %s is a user nickname.
-#: allmap.php:69
 #, php-format
 msgid "%s friends map"
 msgstr "%s 好友地图"
 
 #. TRANS: Page title.
 #. TRANS: %1$s is a user nickname, %2$d is a page number.
-#: allmap.php:75
 #, php-format
 msgid "%1$s friends map, page %2$d"
 msgstr "%1$s 好友地图，第 %2$d 页。"
 
-#: usermap.php:68
+msgid "No such user."
+msgstr "没有这个用户。"
+
+msgid "User has no profile."
+msgstr "用户没有个人信息。"
+
 #, php-format
 msgid "%s map, page %d"
 msgstr "%s 地图，第 %d 页"
diff --git a/plugins/Memcache/locale/Memcache.pot b/plugins/Memcache/locale/Memcache.pot
index e611af98b0..7c83fe8b3f 100644
--- a/plugins/Memcache/locale/Memcache.pot
+++ b/plugins/Memcache/locale/Memcache.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/Memcache/locale/de/LC_MESSAGES/Memcache.po b/plugins/Memcache/locale/de/LC_MESSAGES/Memcache.po
index acec4b3d4b..12dadcf6e5 100644
--- a/plugins/Memcache/locale/de/LC_MESSAGES/Memcache.po
+++ b/plugins/Memcache/locale/de/LC_MESSAGES/Memcache.po
@@ -10,19 +10,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Memcache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:20+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:32+0000\n"
 "Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:04+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:24+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-memcache\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: MemcachePlugin.php:246
 msgid ""
 "Use <a href=\"http://memcached.org/\">Memcached</a> to cache query results."
 msgstr ""
diff --git a/plugins/Memcache/locale/es/LC_MESSAGES/Memcache.po b/plugins/Memcache/locale/es/LC_MESSAGES/Memcache.po
index cc3ab1f5b6..e5b696f4d1 100644
--- a/plugins/Memcache/locale/es/LC_MESSAGES/Memcache.po
+++ b/plugins/Memcache/locale/es/LC_MESSAGES/Memcache.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Memcache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:21+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:32+0000\n"
 "Language-Team: Spanish <http://translatewiki.net/wiki/Portal:es>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:04+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:24+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-memcache\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: MemcachePlugin.php:246
 msgid ""
 "Use <a href=\"http://memcached.org/\">Memcached</a> to cache query results."
 msgstr ""
diff --git a/plugins/Memcache/locale/fr/LC_MESSAGES/Memcache.po b/plugins/Memcache/locale/fr/LC_MESSAGES/Memcache.po
index 67ce5b77dd..161c8e7ae5 100644
--- a/plugins/Memcache/locale/fr/LC_MESSAGES/Memcache.po
+++ b/plugins/Memcache/locale/fr/LC_MESSAGES/Memcache.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Memcache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:21+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:32+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:04+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:24+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-memcache\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: MemcachePlugin.php:246
 msgid ""
 "Use <a href=\"http://memcached.org/\">Memcached</a> to cache query results."
 msgstr ""
diff --git a/plugins/Memcache/locale/he/LC_MESSAGES/Memcache.po b/plugins/Memcache/locale/he/LC_MESSAGES/Memcache.po
index 579f2ba469..f02e0ad7c5 100644
--- a/plugins/Memcache/locale/he/LC_MESSAGES/Memcache.po
+++ b/plugins/Memcache/locale/he/LC_MESSAGES/Memcache.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Memcache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:21+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:32+0000\n"
 "Language-Team: Hebrew <http://translatewiki.net/wiki/Portal:he>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:04+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:24+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-plugin-memcache\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: MemcachePlugin.php:246
 msgid ""
 "Use <a href=\"http://memcached.org/\">Memcached</a> to cache query results."
 msgstr ""
diff --git a/plugins/Memcache/locale/ia/LC_MESSAGES/Memcache.po b/plugins/Memcache/locale/ia/LC_MESSAGES/Memcache.po
index 035ae7e454..82fd4aab47 100644
--- a/plugins/Memcache/locale/ia/LC_MESSAGES/Memcache.po
+++ b/plugins/Memcache/locale/ia/LC_MESSAGES/Memcache.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Memcache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:21+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:32+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:04+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:24+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-memcache\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: MemcachePlugin.php:246
 msgid ""
 "Use <a href=\"http://memcached.org/\">Memcached</a> to cache query results."
 msgstr ""
diff --git a/plugins/Memcache/locale/mk/LC_MESSAGES/Memcache.po b/plugins/Memcache/locale/mk/LC_MESSAGES/Memcache.po
index b41851eddb..723d61e205 100644
--- a/plugins/Memcache/locale/mk/LC_MESSAGES/Memcache.po
+++ b/plugins/Memcache/locale/mk/LC_MESSAGES/Memcache.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Memcache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:21+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:32+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:04+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:24+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-memcache\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
 
-#: MemcachePlugin.php:246
 msgid ""
 "Use <a href=\"http://memcached.org/\">Memcached</a> to cache query results."
 msgstr ""
diff --git a/plugins/Memcache/locale/nb/LC_MESSAGES/Memcache.po b/plugins/Memcache/locale/nb/LC_MESSAGES/Memcache.po
index 21e815b2dd..f99dccc854 100644
--- a/plugins/Memcache/locale/nb/LC_MESSAGES/Memcache.po
+++ b/plugins/Memcache/locale/nb/LC_MESSAGES/Memcache.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Memcache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:21+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:32+0000\n"
 "Language-Team: Norwegian (bokmål)‬ <http://translatewiki.net/wiki/Portal:no>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:04+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:24+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: #out-statusnet-plugin-memcache\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: MemcachePlugin.php:246
 msgid ""
 "Use <a href=\"http://memcached.org/\">Memcached</a> to cache query results."
 msgstr ""
diff --git a/plugins/Memcache/locale/nl/LC_MESSAGES/Memcache.po b/plugins/Memcache/locale/nl/LC_MESSAGES/Memcache.po
index b5868c7007..d1fe89dfd3 100644
--- a/plugins/Memcache/locale/nl/LC_MESSAGES/Memcache.po
+++ b/plugins/Memcache/locale/nl/LC_MESSAGES/Memcache.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Memcache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:21+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:32+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:04+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:24+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-memcache\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: MemcachePlugin.php:246
 msgid ""
 "Use <a href=\"http://memcached.org/\">Memcached</a> to cache query results."
 msgstr ""
diff --git a/plugins/Memcache/locale/pt/LC_MESSAGES/Memcache.po b/plugins/Memcache/locale/pt/LC_MESSAGES/Memcache.po
index fb378637b8..1bd77474d8 100644
--- a/plugins/Memcache/locale/pt/LC_MESSAGES/Memcache.po
+++ b/plugins/Memcache/locale/pt/LC_MESSAGES/Memcache.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Memcache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:21+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:32+0000\n"
 "Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:04+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:24+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-plugin-memcache\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: MemcachePlugin.php:246
 msgid ""
 "Use <a href=\"http://memcached.org/\">Memcached</a> to cache query results."
 msgstr ""
diff --git a/plugins/Memcache/locale/pt_BR/LC_MESSAGES/Memcache.po b/plugins/Memcache/locale/pt_BR/LC_MESSAGES/Memcache.po
index 8a74bc3c21..7ef16cb9a1 100644
--- a/plugins/Memcache/locale/pt_BR/LC_MESSAGES/Memcache.po
+++ b/plugins/Memcache/locale/pt_BR/LC_MESSAGES/Memcache.po
@@ -9,20 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Memcache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:21+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:32+0000\n"
 "Language-Team: Brazilian Portuguese <http://translatewiki.net/wiki/Portal:pt-"
 "br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:04+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:24+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt-br\n"
 "X-Message-Group: #out-statusnet-plugin-memcache\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: MemcachePlugin.php:246
 msgid ""
 "Use <a href=\"http://memcached.org/\">Memcached</a> to cache query results."
 msgstr ""
diff --git a/plugins/Memcache/locale/ru/LC_MESSAGES/Memcache.po b/plugins/Memcache/locale/ru/LC_MESSAGES/Memcache.po
index e53619bd59..eed24a2eb8 100644
--- a/plugins/Memcache/locale/ru/LC_MESSAGES/Memcache.po
+++ b/plugins/Memcache/locale/ru/LC_MESSAGES/Memcache.po
@@ -9,20 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Memcache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:21+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:32+0000\n"
 "Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:04+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:24+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-memcache\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: MemcachePlugin.php:246
 msgid ""
 "Use <a href=\"http://memcached.org/\">Memcached</a> to cache query results."
 msgstr ""
diff --git a/plugins/Memcache/locale/tl/LC_MESSAGES/Memcache.po b/plugins/Memcache/locale/tl/LC_MESSAGES/Memcache.po
index 5b06c9cd9c..0419efcb48 100644
--- a/plugins/Memcache/locale/tl/LC_MESSAGES/Memcache.po
+++ b/plugins/Memcache/locale/tl/LC_MESSAGES/Memcache.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Memcache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:21+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:32+0000\n"
 "Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:04+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:24+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-memcache\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: MemcachePlugin.php:246
 msgid ""
 "Use <a href=\"http://memcached.org/\">Memcached</a> to cache query results."
 msgstr ""
diff --git a/plugins/Memcache/locale/uk/LC_MESSAGES/Memcache.po b/plugins/Memcache/locale/uk/LC_MESSAGES/Memcache.po
index 23b98248ad..b566e303d0 100644
--- a/plugins/Memcache/locale/uk/LC_MESSAGES/Memcache.po
+++ b/plugins/Memcache/locale/uk/LC_MESSAGES/Memcache.po
@@ -9,20 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Memcache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:21+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:32+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:04+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:24+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-memcache\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: MemcachePlugin.php:246
 msgid ""
 "Use <a href=\"http://memcached.org/\">Memcached</a> to cache query results."
 msgstr ""
diff --git a/plugins/Memcache/locale/zh_CN/LC_MESSAGES/Memcache.po b/plugins/Memcache/locale/zh_CN/LC_MESSAGES/Memcache.po
index cedcc60b3a..bed7f68b7f 100644
--- a/plugins/Memcache/locale/zh_CN/LC_MESSAGES/Memcache.po
+++ b/plugins/Memcache/locale/zh_CN/LC_MESSAGES/Memcache.po
@@ -9,20 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Memcache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:22+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:32+0000\n"
 "Language-Team: Simplified Chinese <http://translatewiki.net/wiki/Portal:zh-"
 "hans>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:04+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:24+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-memcache\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: MemcachePlugin.php:246
 msgid ""
 "Use <a href=\"http://memcached.org/\">Memcached</a> to cache query results."
 msgstr "使用 <a href=\"http://memcached.org/\">Memcached</a> 来缓存查询结果。"
diff --git a/plugins/Memcached/locale/Memcached.pot b/plugins/Memcached/locale/Memcached.pot
index c72698a316..e73d8d2ab7 100644
--- a/plugins/Memcached/locale/Memcached.pot
+++ b/plugins/Memcached/locale/Memcached.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/Memcached/locale/de/LC_MESSAGES/Memcached.po b/plugins/Memcached/locale/de/LC_MESSAGES/Memcached.po
index ad70afdc07..4df75a69dc 100644
--- a/plugins/Memcached/locale/de/LC_MESSAGES/Memcached.po
+++ b/plugins/Memcached/locale/de/LC_MESSAGES/Memcached.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Memcached\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:22+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:33+0000\n"
 "Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:04+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:25+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-memcached\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: MemcachedPlugin.php:218
 msgid ""
 "Use <a href=\"http://memcached.org/\">Memcached</a> to cache query results."
 msgstr ""
diff --git a/plugins/Memcached/locale/es/LC_MESSAGES/Memcached.po b/plugins/Memcached/locale/es/LC_MESSAGES/Memcached.po
index 8f0e5d816a..89255da687 100644
--- a/plugins/Memcached/locale/es/LC_MESSAGES/Memcached.po
+++ b/plugins/Memcached/locale/es/LC_MESSAGES/Memcached.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Memcached\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:22+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:33+0000\n"
 "Language-Team: Spanish <http://translatewiki.net/wiki/Portal:es>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:04+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:25+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-memcached\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: MemcachedPlugin.php:218
 msgid ""
 "Use <a href=\"http://memcached.org/\">Memcached</a> to cache query results."
 msgstr ""
diff --git a/plugins/Memcached/locale/fr/LC_MESSAGES/Memcached.po b/plugins/Memcached/locale/fr/LC_MESSAGES/Memcached.po
index c1814b2b96..30396f24f2 100644
--- a/plugins/Memcached/locale/fr/LC_MESSAGES/Memcached.po
+++ b/plugins/Memcached/locale/fr/LC_MESSAGES/Memcached.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Memcached\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:22+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:33+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:04+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:25+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-memcached\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: MemcachedPlugin.php:218
 msgid ""
 "Use <a href=\"http://memcached.org/\">Memcached</a> to cache query results."
 msgstr ""
diff --git a/plugins/Memcached/locale/he/LC_MESSAGES/Memcached.po b/plugins/Memcached/locale/he/LC_MESSAGES/Memcached.po
index c40ec233e0..23e7f8bf7c 100644
--- a/plugins/Memcached/locale/he/LC_MESSAGES/Memcached.po
+++ b/plugins/Memcached/locale/he/LC_MESSAGES/Memcached.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Memcached\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:22+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:33+0000\n"
 "Language-Team: Hebrew <http://translatewiki.net/wiki/Portal:he>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:04+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:25+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-plugin-memcached\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: MemcachedPlugin.php:218
 msgid ""
 "Use <a href=\"http://memcached.org/\">Memcached</a> to cache query results."
 msgstr ""
diff --git a/plugins/Memcached/locale/ia/LC_MESSAGES/Memcached.po b/plugins/Memcached/locale/ia/LC_MESSAGES/Memcached.po
index c8fff4d8cb..84e8e38ab3 100644
--- a/plugins/Memcached/locale/ia/LC_MESSAGES/Memcached.po
+++ b/plugins/Memcached/locale/ia/LC_MESSAGES/Memcached.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Memcached\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:22+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:33+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:04+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:25+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-memcached\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: MemcachedPlugin.php:218
 msgid ""
 "Use <a href=\"http://memcached.org/\">Memcached</a> to cache query results."
 msgstr ""
diff --git a/plugins/Memcached/locale/id/LC_MESSAGES/Memcached.po b/plugins/Memcached/locale/id/LC_MESSAGES/Memcached.po
index bd2627a6ba..3826e837e9 100644
--- a/plugins/Memcached/locale/id/LC_MESSAGES/Memcached.po
+++ b/plugins/Memcached/locale/id/LC_MESSAGES/Memcached.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Memcached\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:22+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:33+0000\n"
 "Language-Team: Indonesian <http://translatewiki.net/wiki/Portal:id>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:04+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:25+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: id\n"
 "X-Message-Group: #out-statusnet-plugin-memcached\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: MemcachedPlugin.php:218
 msgid ""
 "Use <a href=\"http://memcached.org/\">Memcached</a> to cache query results."
 msgstr ""
diff --git a/plugins/Memcached/locale/ja/LC_MESSAGES/Memcached.po b/plugins/Memcached/locale/ja/LC_MESSAGES/Memcached.po
index f6f8182f89..64b2b1fe23 100644
--- a/plugins/Memcached/locale/ja/LC_MESSAGES/Memcached.po
+++ b/plugins/Memcached/locale/ja/LC_MESSAGES/Memcached.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Memcached\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:22+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:33+0000\n"
 "Language-Team: Japanese <http://translatewiki.net/wiki/Portal:ja>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:04+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:25+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ja\n"
 "X-Message-Group: #out-statusnet-plugin-memcached\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: MemcachedPlugin.php:218
 msgid ""
 "Use <a href=\"http://memcached.org/\">Memcached</a> to cache query results."
 msgstr ""
diff --git a/plugins/Memcached/locale/mk/LC_MESSAGES/Memcached.po b/plugins/Memcached/locale/mk/LC_MESSAGES/Memcached.po
index b4d4227ebc..48fca9bb92 100644
--- a/plugins/Memcached/locale/mk/LC_MESSAGES/Memcached.po
+++ b/plugins/Memcached/locale/mk/LC_MESSAGES/Memcached.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Memcached\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:22+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:33+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:04+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:25+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-memcached\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
 
-#: MemcachedPlugin.php:218
 msgid ""
 "Use <a href=\"http://memcached.org/\">Memcached</a> to cache query results."
 msgstr ""
diff --git a/plugins/Memcached/locale/nb/LC_MESSAGES/Memcached.po b/plugins/Memcached/locale/nb/LC_MESSAGES/Memcached.po
index e900bc4d3a..c6afb1fa10 100644
--- a/plugins/Memcached/locale/nb/LC_MESSAGES/Memcached.po
+++ b/plugins/Memcached/locale/nb/LC_MESSAGES/Memcached.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Memcached\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:23+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:33+0000\n"
 "Language-Team: Norwegian (bokmål)‬ <http://translatewiki.net/wiki/Portal:no>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:04+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:25+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: #out-statusnet-plugin-memcached\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: MemcachedPlugin.php:218
 msgid ""
 "Use <a href=\"http://memcached.org/\">Memcached</a> to cache query results."
 msgstr ""
diff --git a/plugins/Memcached/locale/nl/LC_MESSAGES/Memcached.po b/plugins/Memcached/locale/nl/LC_MESSAGES/Memcached.po
index e8074ad3df..bac91ab040 100644
--- a/plugins/Memcached/locale/nl/LC_MESSAGES/Memcached.po
+++ b/plugins/Memcached/locale/nl/LC_MESSAGES/Memcached.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Memcached\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:22+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:33+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:04+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:25+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-memcached\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: MemcachedPlugin.php:218
 msgid ""
 "Use <a href=\"http://memcached.org/\">Memcached</a> to cache query results."
 msgstr ""
diff --git a/plugins/Memcached/locale/pt/LC_MESSAGES/Memcached.po b/plugins/Memcached/locale/pt/LC_MESSAGES/Memcached.po
index f84ad7012d..93c2484474 100644
--- a/plugins/Memcached/locale/pt/LC_MESSAGES/Memcached.po
+++ b/plugins/Memcached/locale/pt/LC_MESSAGES/Memcached.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Memcached\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:23+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:33+0000\n"
 "Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:04+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:25+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-plugin-memcached\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: MemcachedPlugin.php:218
 msgid ""
 "Use <a href=\"http://memcached.org/\">Memcached</a> to cache query results."
 msgstr ""
diff --git a/plugins/Memcached/locale/ru/LC_MESSAGES/Memcached.po b/plugins/Memcached/locale/ru/LC_MESSAGES/Memcached.po
index 96b856badf..1dd67eabf7 100644
--- a/plugins/Memcached/locale/ru/LC_MESSAGES/Memcached.po
+++ b/plugins/Memcached/locale/ru/LC_MESSAGES/Memcached.po
@@ -9,20 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Memcached\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:23+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:33+0000\n"
 "Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:04+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:25+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-memcached\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: MemcachedPlugin.php:218
 msgid ""
 "Use <a href=\"http://memcached.org/\">Memcached</a> to cache query results."
 msgstr ""
diff --git a/plugins/Memcached/locale/tl/LC_MESSAGES/Memcached.po b/plugins/Memcached/locale/tl/LC_MESSAGES/Memcached.po
index 7593badbf7..bb11b46b9c 100644
--- a/plugins/Memcached/locale/tl/LC_MESSAGES/Memcached.po
+++ b/plugins/Memcached/locale/tl/LC_MESSAGES/Memcached.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Memcached\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:23+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:33+0000\n"
 "Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:04+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:25+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-memcached\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: MemcachedPlugin.php:218
 msgid ""
 "Use <a href=\"http://memcached.org/\">Memcached</a> to cache query results."
 msgstr ""
diff --git a/plugins/Memcached/locale/uk/LC_MESSAGES/Memcached.po b/plugins/Memcached/locale/uk/LC_MESSAGES/Memcached.po
index 0602f55dda..72cc6180d3 100644
--- a/plugins/Memcached/locale/uk/LC_MESSAGES/Memcached.po
+++ b/plugins/Memcached/locale/uk/LC_MESSAGES/Memcached.po
@@ -9,20 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Memcached\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:23+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:33+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:04+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:25+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-memcached\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: MemcachedPlugin.php:218
 msgid ""
 "Use <a href=\"http://memcached.org/\">Memcached</a> to cache query results."
 msgstr ""
diff --git a/plugins/Memcached/locale/zh_CN/LC_MESSAGES/Memcached.po b/plugins/Memcached/locale/zh_CN/LC_MESSAGES/Memcached.po
index 2abc094200..606b0bee68 100644
--- a/plugins/Memcached/locale/zh_CN/LC_MESSAGES/Memcached.po
+++ b/plugins/Memcached/locale/zh_CN/LC_MESSAGES/Memcached.po
@@ -9,20 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Memcached\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:23+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:33+0000\n"
 "Language-Team: Simplified Chinese <http://translatewiki.net/wiki/Portal:zh-"
 "hans>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:04+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:25+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-memcached\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: MemcachedPlugin.php:218
 msgid ""
 "Use <a href=\"http://memcached.org/\">Memcached</a> to cache query results."
 msgstr "使用 <a href=\"http://memcached.org/\">Memcached</a> 来缓存查询结果。"
diff --git a/plugins/Meteor/locale/Meteor.pot b/plugins/Meteor/locale/Meteor.pot
index 7a2db76ab0..9eafdf25c7 100644
--- a/plugins/Meteor/locale/Meteor.pot
+++ b/plugins/Meteor/locale/Meteor.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/Meteor/locale/de/LC_MESSAGES/Meteor.po b/plugins/Meteor/locale/de/LC_MESSAGES/Meteor.po
index d82006d399..b8fd791fc7 100644
--- a/plugins/Meteor/locale/de/LC_MESSAGES/Meteor.po
+++ b/plugins/Meteor/locale/de/LC_MESSAGES/Meteor.po
@@ -9,30 +9,27 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Meteor\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:23+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:34+0000\n"
 "Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:04+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:26+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-meteor\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANS: Exception. %1$s is the control server, %2$s is the control port.
-#: MeteorPlugin.php:115
 #, php-format
 msgid "Couldn't connect to %1$s on %2$s."
 msgstr "Konnte nicht mit %1$s auf %2$s verbinden."
 
 #. TRANS: Exception. %s is the Meteor message that could not be added.
-#: MeteorPlugin.php:128
 #, php-format
 msgid "Error adding meteor message \"%s\""
 msgstr "Fehler beim Hinzufügen der Meteor-Nachricht „%s“"
 
-#: MeteorPlugin.php:158
 msgid "Plugin to do \"real time\" updates using Comet/Bayeux."
 msgstr "Plugin für Echtzeit-Aktualisierungen mit Comet/Bayeux."
diff --git a/plugins/Meteor/locale/fr/LC_MESSAGES/Meteor.po b/plugins/Meteor/locale/fr/LC_MESSAGES/Meteor.po
index c5e2754c65..465f524002 100644
--- a/plugins/Meteor/locale/fr/LC_MESSAGES/Meteor.po
+++ b/plugins/Meteor/locale/fr/LC_MESSAGES/Meteor.po
@@ -9,31 +9,28 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Meteor\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:23+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:34+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:04+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:26+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-meteor\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. TRANS: Exception. %1$s is the control server, %2$s is the control port.
-#: MeteorPlugin.php:115
 #, php-format
 msgid "Couldn't connect to %1$s on %2$s."
 msgstr "Impossible de se connecter à %1$s sur le port %2$s."
 
 #. TRANS: Exception. %s is the Meteor message that could not be added.
-#: MeteorPlugin.php:128
 #, php-format
 msgid "Error adding meteor message \"%s\""
 msgstr "Erreur lors de l’ajout d'un message du message meteor « %s »"
 
-#: MeteorPlugin.php:158
 msgid "Plugin to do \"real time\" updates using Comet/Bayeux."
 msgstr ""
 "Extension pour réaliser des mises à jour « en temps réel » en utilisant Comet/"
diff --git a/plugins/Meteor/locale/ia/LC_MESSAGES/Meteor.po b/plugins/Meteor/locale/ia/LC_MESSAGES/Meteor.po
index 80423e2f5f..06617a8fc9 100644
--- a/plugins/Meteor/locale/ia/LC_MESSAGES/Meteor.po
+++ b/plugins/Meteor/locale/ia/LC_MESSAGES/Meteor.po
@@ -9,30 +9,27 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Meteor\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:23+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:34+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:04+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:26+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-meteor\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANS: Exception. %1$s is the control server, %2$s is the control port.
-#: MeteorPlugin.php:115
 #, php-format
 msgid "Couldn't connect to %1$s on %2$s."
 msgstr "Non poteva connecter a %1$s sur %2$s."
 
 #. TRANS: Exception. %s is the Meteor message that could not be added.
-#: MeteorPlugin.php:128
 #, php-format
 msgid "Error adding meteor message \"%s\""
 msgstr "Error durante le addition del message Meteor \"%s\""
 
-#: MeteorPlugin.php:158
 msgid "Plugin to do \"real time\" updates using Comet/Bayeux."
 msgstr "Plug-in pro facer actualisationes \"in directo\" usante Comet/Bayeux."
diff --git a/plugins/Meteor/locale/id/LC_MESSAGES/Meteor.po b/plugins/Meteor/locale/id/LC_MESSAGES/Meteor.po
index ce6b355405..2248ec1e08 100644
--- a/plugins/Meteor/locale/id/LC_MESSAGES/Meteor.po
+++ b/plugins/Meteor/locale/id/LC_MESSAGES/Meteor.po
@@ -9,30 +9,27 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Meteor\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:23+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:34+0000\n"
 "Language-Team: Indonesian <http://translatewiki.net/wiki/Portal:id>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:04+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:26+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: id\n"
 "X-Message-Group: #out-statusnet-plugin-meteor\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. TRANS: Exception. %1$s is the control server, %2$s is the control port.
-#: MeteorPlugin.php:115
 #, php-format
 msgid "Couldn't connect to %1$s on %2$s."
 msgstr "Tidak dapat terhubung ke %1$s di %2$s."
 
 #. TRANS: Exception. %s is the Meteor message that could not be added.
-#: MeteorPlugin.php:128
 #, php-format
 msgid "Error adding meteor message \"%s\""
 msgstr "Kesalahan menambahkan pesan meteor \"%s\""
 
-#: MeteorPlugin.php:158
 msgid "Plugin to do \"real time\" updates using Comet/Bayeux."
 msgstr "Pengaya untuk membuat pemutakhiran langsung menggunakan Comet/Bayeux."
diff --git a/plugins/Meteor/locale/mk/LC_MESSAGES/Meteor.po b/plugins/Meteor/locale/mk/LC_MESSAGES/Meteor.po
index 95975f55da..aad2cf3dfc 100644
--- a/plugins/Meteor/locale/mk/LC_MESSAGES/Meteor.po
+++ b/plugins/Meteor/locale/mk/LC_MESSAGES/Meteor.po
@@ -9,30 +9,27 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Meteor\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:23+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:34+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:04+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:26+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-meteor\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
 
 #. TRANS: Exception. %1$s is the control server, %2$s is the control port.
-#: MeteorPlugin.php:115
 #, php-format
 msgid "Couldn't connect to %1$s on %2$s."
 msgstr "Не можев да се поврзам со %1$s на %2$s."
 
 #. TRANS: Exception. %s is the Meteor message that could not be added.
-#: MeteorPlugin.php:128
 #, php-format
 msgid "Error adding meteor message \"%s\""
 msgstr "Грешка при додавање на Meteor-овата порака „%s“"
 
-#: MeteorPlugin.php:158
 msgid "Plugin to do \"real time\" updates using Comet/Bayeux."
 msgstr "Приклучок за вршење на поднови „во живо“ со Comet/Bayeux."
diff --git a/plugins/Meteor/locale/nb/LC_MESSAGES/Meteor.po b/plugins/Meteor/locale/nb/LC_MESSAGES/Meteor.po
index 16a0d02755..f6791e9010 100644
--- a/plugins/Meteor/locale/nb/LC_MESSAGES/Meteor.po
+++ b/plugins/Meteor/locale/nb/LC_MESSAGES/Meteor.po
@@ -9,30 +9,27 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Meteor\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:23+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:34+0000\n"
 "Language-Team: Norwegian (bokmål)‬ <http://translatewiki.net/wiki/Portal:no>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:04+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:26+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: #out-statusnet-plugin-meteor\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANS: Exception. %1$s is the control server, %2$s is the control port.
-#: MeteorPlugin.php:115
 #, php-format
 msgid "Couldn't connect to %1$s on %2$s."
 msgstr "Kunne ikke koble til %1$s på %2$s."
 
 #. TRANS: Exception. %s is the Meteor message that could not be added.
-#: MeteorPlugin.php:128
 #, php-format
 msgid "Error adding meteor message \"%s\""
 msgstr "Mislyktes å legge til meteormelding «%s»"
 
-#: MeteorPlugin.php:158
 msgid "Plugin to do \"real time\" updates using Comet/Bayeux."
 msgstr "Utvidelse for å gjøre «sanntids»-oppdateringer med Comet/Bayeux."
diff --git a/plugins/Meteor/locale/nl/LC_MESSAGES/Meteor.po b/plugins/Meteor/locale/nl/LC_MESSAGES/Meteor.po
index c9edc086a5..a4f0f1318b 100644
--- a/plugins/Meteor/locale/nl/LC_MESSAGES/Meteor.po
+++ b/plugins/Meteor/locale/nl/LC_MESSAGES/Meteor.po
@@ -9,30 +9,27 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Meteor\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:23+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:34+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:04+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:26+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-meteor\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANS: Exception. %1$s is the control server, %2$s is the control port.
-#: MeteorPlugin.php:115
 #, php-format
 msgid "Couldn't connect to %1$s on %2$s."
 msgstr "Het was niet mogelijk te verbinden met %1$s op %2$s."
 
 #. TRANS: Exception. %s is the Meteor message that could not be added.
-#: MeteorPlugin.php:128
 #, php-format
 msgid "Error adding meteor message \"%s\""
 msgstr "Fout bij het toevoegen van meteorbericht \"%s\""
 
-#: MeteorPlugin.php:158
 msgid "Plugin to do \"real time\" updates using Comet/Bayeux."
 msgstr "Plug-in voor het maken van \"real time\" updates via Comet/Bayeux."
diff --git a/plugins/Meteor/locale/tl/LC_MESSAGES/Meteor.po b/plugins/Meteor/locale/tl/LC_MESSAGES/Meteor.po
index db23c208ef..d63b871994 100644
--- a/plugins/Meteor/locale/tl/LC_MESSAGES/Meteor.po
+++ b/plugins/Meteor/locale/tl/LC_MESSAGES/Meteor.po
@@ -9,31 +9,28 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Meteor\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:24+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:34+0000\n"
 "Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:04+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:26+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-meteor\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANS: Exception. %1$s is the control server, %2$s is the control port.
-#: MeteorPlugin.php:115
 #, php-format
 msgid "Couldn't connect to %1$s on %2$s."
 msgstr "Hindi makaugnay sa %1$s sa %2$s."
 
 #. TRANS: Exception. %s is the Meteor message that could not be added.
-#: MeteorPlugin.php:128
 #, php-format
 msgid "Error adding meteor message \"%s\""
 msgstr "Kamalian sa pagdaragdag ng mensahe ng meteor na \"%s\""
 
-#: MeteorPlugin.php:158
 msgid "Plugin to do \"real time\" updates using Comet/Bayeux."
 msgstr ""
 "Pamasak upang makagawa ng mga pagsasapanahong nasa \"tunay na panahon\" na "
diff --git a/plugins/Meteor/locale/uk/LC_MESSAGES/Meteor.po b/plugins/Meteor/locale/uk/LC_MESSAGES/Meteor.po
index 56fc32503c..1d34f1f6e7 100644
--- a/plugins/Meteor/locale/uk/LC_MESSAGES/Meteor.po
+++ b/plugins/Meteor/locale/uk/LC_MESSAGES/Meteor.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Meteor\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:24+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:34+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:04+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:26+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-meteor\n"
@@ -23,18 +23,15 @@ msgstr ""
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
 #. TRANS: Exception. %1$s is the control server, %2$s is the control port.
-#: MeteorPlugin.php:115
 #, php-format
 msgid "Couldn't connect to %1$s on %2$s."
 msgstr "Не вдається підключитися до %1$s на %2$s."
 
 #. TRANS: Exception. %s is the Meteor message that could not be added.
-#: MeteorPlugin.php:128
 #, php-format
 msgid "Error adding meteor message \"%s\""
 msgstr "Помилка при додаванні швидкого повідомлення «%s»"
 
-#: MeteorPlugin.php:158
 msgid "Plugin to do \"real time\" updates using Comet/Bayeux."
 msgstr ""
 "Додаток для оновлення стрічки повідомлень у «реальному часі» використовуючи "
diff --git a/plugins/Meteor/locale/zh_CN/LC_MESSAGES/Meteor.po b/plugins/Meteor/locale/zh_CN/LC_MESSAGES/Meteor.po
index 0636a3e8f7..3ef283e09b 100644
--- a/plugins/Meteor/locale/zh_CN/LC_MESSAGES/Meteor.po
+++ b/plugins/Meteor/locale/zh_CN/LC_MESSAGES/Meteor.po
@@ -9,31 +9,28 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Meteor\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:24+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:34+0000\n"
 "Language-Team: Simplified Chinese <http://translatewiki.net/wiki/Portal:zh-"
 "hans>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:04+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:26+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-meteor\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. TRANS: Exception. %1$s is the control server, %2$s is the control port.
-#: MeteorPlugin.php:115
 #, php-format
 msgid "Couldn't connect to %1$s on %2$s."
 msgstr "无法连在 %2$s 端口连接到 %1$s。"
 
 #. TRANS: Exception. %s is the Meteor message that could not be added.
-#: MeteorPlugin.php:128
 #, php-format
 msgid "Error adding meteor message \"%s\""
 msgstr "添加 meteor 消息“%s”出错。"
 
-#: MeteorPlugin.php:158
 msgid "Plugin to do \"real time\" updates using Comet/Bayeux."
 msgstr "通过 Comet/Bayeux 实现“实时更新”的插件。"
diff --git a/plugins/Minify/locale/Minify.pot b/plugins/Minify/locale/Minify.pot
index 5c1b704a83..6fbcd8d896 100644
--- a/plugins/Minify/locale/Minify.pot
+++ b/plugins/Minify/locale/Minify.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,6 +16,12 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: MinifyPlugin.php:179
+msgid ""
+"The Minify plugin minifies StatusNet's CSS and JavaScript, removing "
+"whitespace and comments."
+msgstr ""
+
 #: minify.php:49
 msgid "The parameter \"f\" is not a valid path."
 msgstr ""
@@ -27,9 +33,3 @@ msgstr ""
 #: minify.php:111
 msgid "File type not supported."
 msgstr ""
-
-#: MinifyPlugin.php:179
-msgid ""
-"The Minify plugin minifies StatusNet's CSS and JavaScript, removing "
-"whitespace and comments."
-msgstr ""
diff --git a/plugins/Minify/locale/de/LC_MESSAGES/Minify.po b/plugins/Minify/locale/de/LC_MESSAGES/Minify.po
index aa604b1662..bd97981d72 100644
--- a/plugins/Minify/locale/de/LC_MESSAGES/Minify.po
+++ b/plugins/Minify/locale/de/LC_MESSAGES/Minify.po
@@ -9,34 +9,30 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Minify\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:24+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:35+0000\n"
 "Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:04+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:27+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-minify\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: minify.php:49
-msgid "The parameter \"f\" is not a valid path."
-msgstr "Der Parameter „f“ ist keine gültige Pfadangabe."
-
-#: minify.php:53
-msgid "The parameter \"f\" is required but missing."
-msgstr "Der Parameter „f“ ist erfordert, fehlt jedoch."
-
-#: minify.php:111
-msgid "File type not supported."
-msgstr "Dateityp nicht unterstützt."
-
-#: MinifyPlugin.php:179
 msgid ""
 "The Minify plugin minifies StatusNet's CSS and JavaScript, removing "
 "whitespace and comments."
 msgstr ""
 "Das Minify-Plugin minimiert das CSS und JavaScript von StatusNet durch "
 "Entfernen von Leerzeichen und Kommentaren."
+
+msgid "The parameter \"f\" is not a valid path."
+msgstr "Der Parameter „f“ ist keine gültige Pfadangabe."
+
+msgid "The parameter \"f\" is required but missing."
+msgstr "Der Parameter „f“ ist erfordert, fehlt jedoch."
+
+msgid "File type not supported."
+msgstr "Dateityp nicht unterstützt."
diff --git a/plugins/Minify/locale/fr/LC_MESSAGES/Minify.po b/plugins/Minify/locale/fr/LC_MESSAGES/Minify.po
index c3b03baa66..375dbf1e05 100644
--- a/plugins/Minify/locale/fr/LC_MESSAGES/Minify.po
+++ b/plugins/Minify/locale/fr/LC_MESSAGES/Minify.po
@@ -9,34 +9,30 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Minify\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:24+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:35+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:04+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:27+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-minify\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: minify.php:49
-msgid "The parameter \"f\" is not a valid path."
-msgstr "Le paramètre « f » ne contient pas un chemin valide."
-
-#: minify.php:53
-msgid "The parameter \"f\" is required but missing."
-msgstr "Le paramètre « f » est nécessaire mais absent."
-
-#: minify.php:111
-msgid "File type not supported."
-msgstr "Type de fichier non pris en charge."
-
-#: MinifyPlugin.php:179
 msgid ""
 "The Minify plugin minifies StatusNet's CSS and JavaScript, removing "
 "whitespace and comments."
 msgstr ""
 "Le greffon Minify minimise vos CSS et Javascript, en supprimant les espaces "
 "et les commentaires."
+
+msgid "The parameter \"f\" is not a valid path."
+msgstr "Le paramètre « f » ne contient pas un chemin valide."
+
+msgid "The parameter \"f\" is required but missing."
+msgstr "Le paramètre « f » est nécessaire mais absent."
+
+msgid "File type not supported."
+msgstr "Type de fichier non pris en charge."
diff --git a/plugins/Minify/locale/ia/LC_MESSAGES/Minify.po b/plugins/Minify/locale/ia/LC_MESSAGES/Minify.po
index 02338bc0a1..b2665d5dc5 100644
--- a/plugins/Minify/locale/ia/LC_MESSAGES/Minify.po
+++ b/plugins/Minify/locale/ia/LC_MESSAGES/Minify.po
@@ -9,34 +9,30 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Minify\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:24+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:35+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:04+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:27+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-minify\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: minify.php:49
-msgid "The parameter \"f\" is not a valid path."
-msgstr "Le parametro \"f\" non es un cammino valide."
-
-#: minify.php:53
-msgid "The parameter \"f\" is required but missing."
-msgstr "Le parametro \"f\" es necessari, ma manca."
-
-#: minify.php:111
-msgid "File type not supported."
-msgstr "Typo de file non supportate."
-
-#: MinifyPlugin.php:179
 msgid ""
 "The Minify plugin minifies StatusNet's CSS and JavaScript, removing "
 "whitespace and comments."
 msgstr ""
 "Le plug-in Minify minimisa le CSS e JavaScript de StatusNet, removente "
 "spatio blanc e commentos."
+
+msgid "The parameter \"f\" is not a valid path."
+msgstr "Le parametro \"f\" non es un cammino valide."
+
+msgid "The parameter \"f\" is required but missing."
+msgstr "Le parametro \"f\" es necessari, ma manca."
+
+msgid "File type not supported."
+msgstr "Typo de file non supportate."
diff --git a/plugins/Minify/locale/mk/LC_MESSAGES/Minify.po b/plugins/Minify/locale/mk/LC_MESSAGES/Minify.po
index 1bd0de380b..1f383a7195 100644
--- a/plugins/Minify/locale/mk/LC_MESSAGES/Minify.po
+++ b/plugins/Minify/locale/mk/LC_MESSAGES/Minify.po
@@ -9,34 +9,30 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Minify\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:24+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:35+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:04+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:27+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-minify\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
 
-#: minify.php:49
-msgid "The parameter \"f\" is not a valid path."
-msgstr "Параметарот „f“ не претставува важечка патека."
-
-#: minify.php:53
-msgid "The parameter \"f\" is required but missing."
-msgstr "Параметарот „f“ е задолжителен, но недостасува."
-
-#: minify.php:111
-msgid "File type not supported."
-msgstr "Овој топ на податотека не е поддржан."
-
-#: MinifyPlugin.php:179
 msgid ""
 "The Minify plugin minifies StatusNet's CSS and JavaScript, removing "
 "whitespace and comments."
 msgstr ""
 "Приклучокот Minify ги смалува CSS и JavaScript на StatusNet, отстранувајќи "
 "бели простори  и коментари."
+
+msgid "The parameter \"f\" is not a valid path."
+msgstr "Параметарот „f“ не претставува важечка патека."
+
+msgid "The parameter \"f\" is required but missing."
+msgstr "Параметарот „f“ е задолжителен, но недостасува."
+
+msgid "File type not supported."
+msgstr "Овој топ на податотека не е поддржан."
diff --git a/plugins/Minify/locale/nb/LC_MESSAGES/Minify.po b/plugins/Minify/locale/nb/LC_MESSAGES/Minify.po
index 437dba6420..fdf00d8f03 100644
--- a/plugins/Minify/locale/nb/LC_MESSAGES/Minify.po
+++ b/plugins/Minify/locale/nb/LC_MESSAGES/Minify.po
@@ -9,34 +9,30 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Minify\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:24+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:35+0000\n"
 "Language-Team: Norwegian (bokmål)‬ <http://translatewiki.net/wiki/Portal:no>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:04+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:27+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: #out-statusnet-plugin-minify\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: minify.php:49
-msgid "The parameter \"f\" is not a valid path."
-msgstr "Parameteren «f» er ikke en gyldig sti."
-
-#: minify.php:53
-msgid "The parameter \"f\" is required but missing."
-msgstr "Parameteren «f» er nødvendig, men mangler."
-
-#: minify.php:111
-msgid "File type not supported."
-msgstr "Filtype støttes ikke."
-
-#: MinifyPlugin.php:179
 msgid ""
 "The Minify plugin minifies StatusNet's CSS and JavaScript, removing "
 "whitespace and comments."
 msgstr ""
 "Utvidelsen Minify minimerer StatusNets CSS og JavaScript og fjerner "
 "mellomrom og kommentarer."
+
+msgid "The parameter \"f\" is not a valid path."
+msgstr "Parameteren «f» er ikke en gyldig sti."
+
+msgid "The parameter \"f\" is required but missing."
+msgstr "Parameteren «f» er nødvendig, men mangler."
+
+msgid "File type not supported."
+msgstr "Filtype støttes ikke."
diff --git a/plugins/Minify/locale/nl/LC_MESSAGES/Minify.po b/plugins/Minify/locale/nl/LC_MESSAGES/Minify.po
index 5ab3dfd3d1..4f6f3db2cf 100644
--- a/plugins/Minify/locale/nl/LC_MESSAGES/Minify.po
+++ b/plugins/Minify/locale/nl/LC_MESSAGES/Minify.po
@@ -9,34 +9,30 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Minify\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:24+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:35+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:04+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:27+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-minify\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: minify.php:49
-msgid "The parameter \"f\" is not a valid path."
-msgstr "De parameter \"f\" is geen geldig pad."
-
-#: minify.php:53
-msgid "The parameter \"f\" is required but missing."
-msgstr "De parameter \"f\" is vereist, maar ontbreekt."
-
-#: minify.php:111
-msgid "File type not supported."
-msgstr "Dit bestandstype wordt niet ondersteund"
-
-#: MinifyPlugin.php:179
 msgid ""
 "The Minify plugin minifies StatusNet's CSS and JavaScript, removing "
 "whitespace and comments."
 msgstr ""
 "De plug-in Minify maakt CSS en JavaScript kleiner door witruimte en "
 "opmerkingen te verwijderen."
+
+msgid "The parameter \"f\" is not a valid path."
+msgstr "De parameter \"f\" is geen geldig pad."
+
+msgid "The parameter \"f\" is required but missing."
+msgstr "De parameter \"f\" is vereist, maar ontbreekt."
+
+msgid "File type not supported."
+msgstr "Dit bestandstype wordt niet ondersteund"
diff --git a/plugins/Minify/locale/ru/LC_MESSAGES/Minify.po b/plugins/Minify/locale/ru/LC_MESSAGES/Minify.po
index 3808e78c2f..41e01e8a68 100644
--- a/plugins/Minify/locale/ru/LC_MESSAGES/Minify.po
+++ b/plugins/Minify/locale/ru/LC_MESSAGES/Minify.po
@@ -10,35 +10,31 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Minify\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:24+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:35+0000\n"
 "Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:04+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:27+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-minify\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: minify.php:49
-msgid "The parameter \"f\" is not a valid path."
-msgstr "Параметр «f» содержит неправильный путь."
-
-#: minify.php:53
-msgid "The parameter \"f\" is required but missing."
-msgstr "Требуется параметр «f», но он отсутствует."
-
-#: minify.php:111
-msgid "File type not supported."
-msgstr "Тип файла не поддерживается."
-
-#: MinifyPlugin.php:179
 msgid ""
 "The Minify plugin minifies StatusNet's CSS and JavaScript, removing "
 "whitespace and comments."
 msgstr ""
 "Плагин «Minify» сжимает CSS и JavaScript StatusNet'а, удаляя лишние пробелы и "
 "комментарии."
+
+msgid "The parameter \"f\" is not a valid path."
+msgstr "Параметр «f» содержит неправильный путь."
+
+msgid "The parameter \"f\" is required but missing."
+msgstr "Требуется параметр «f», но он отсутствует."
+
+msgid "File type not supported."
+msgstr "Тип файла не поддерживается."
diff --git a/plugins/Minify/locale/tl/LC_MESSAGES/Minify.po b/plugins/Minify/locale/tl/LC_MESSAGES/Minify.po
index 1d18e7c642..2334aed97f 100644
--- a/plugins/Minify/locale/tl/LC_MESSAGES/Minify.po
+++ b/plugins/Minify/locale/tl/LC_MESSAGES/Minify.po
@@ -9,34 +9,30 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Minify\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:24+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:35+0000\n"
 "Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:04+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:27+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-minify\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: minify.php:49
-msgid "The parameter \"f\" is not a valid path."
-msgstr "Ang parametrong \"f\" ay hindi isang tanggap na landas."
-
-#: minify.php:53
-msgid "The parameter \"f\" is required but missing."
-msgstr "Ang parametrong \"f\" ay kailangan ngunit nawawala."
-
-#: minify.php:111
-msgid "File type not supported."
-msgstr "Hindi tinatangkilik ang uri ng talaksan."
-
-#: MinifyPlugin.php:179
 msgid ""
 "The Minify plugin minifies StatusNet's CSS and JavaScript, removing "
 "whitespace and comments."
 msgstr ""
 "Ang pamasak na Minify ay nagpapaliit sa CSS at JavaScript ng StatusNet, na "
 "nagtatanggal ng puting puwang at mga puna."
+
+msgid "The parameter \"f\" is not a valid path."
+msgstr "Ang parametrong \"f\" ay hindi isang tanggap na landas."
+
+msgid "The parameter \"f\" is required but missing."
+msgstr "Ang parametrong \"f\" ay kailangan ngunit nawawala."
+
+msgid "File type not supported."
+msgstr "Hindi tinatangkilik ang uri ng talaksan."
diff --git a/plugins/Minify/locale/uk/LC_MESSAGES/Minify.po b/plugins/Minify/locale/uk/LC_MESSAGES/Minify.po
index 33b4bd8c0a..c02ca4860f 100644
--- a/plugins/Minify/locale/uk/LC_MESSAGES/Minify.po
+++ b/plugins/Minify/locale/uk/LC_MESSAGES/Minify.po
@@ -9,35 +9,31 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Minify\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:24+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:35+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:04+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:27+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-minify\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: minify.php:49
-msgid "The parameter \"f\" is not a valid path."
-msgstr "Параметр «f» не є правильним шляхом."
-
-#: minify.php:53
-msgid "The parameter \"f\" is required but missing."
-msgstr "Параметр «f» має бути зазначено, але він відсутній."
-
-#: minify.php:111
-msgid "File type not supported."
-msgstr "Тип файлу не підтримується."
-
-#: MinifyPlugin.php:179
 msgid ""
 "The Minify plugin minifies StatusNet's CSS and JavaScript, removing "
 "whitespace and comments."
 msgstr ""
 "Додаток Minify мінімізує CSS та JavaScript сайту StatusNet, усуваючи "
 "пропуски і коментарі."
+
+msgid "The parameter \"f\" is not a valid path."
+msgstr "Параметр «f» не є правильним шляхом."
+
+msgid "The parameter \"f\" is required but missing."
+msgstr "Параметр «f» має бути зазначено, але він відсутній."
+
+msgid "File type not supported."
+msgstr "Тип файлу не підтримується."
diff --git a/plugins/Minify/locale/zh_CN/LC_MESSAGES/Minify.po b/plugins/Minify/locale/zh_CN/LC_MESSAGES/Minify.po
index 5c3cecb22c..951639d6c7 100644
--- a/plugins/Minify/locale/zh_CN/LC_MESSAGES/Minify.po
+++ b/plugins/Minify/locale/zh_CN/LC_MESSAGES/Minify.po
@@ -9,33 +9,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Minify\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:25+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:35+0000\n"
 "Language-Team: Simplified Chinese <http://translatewiki.net/wiki/Portal:zh-"
 "hans>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:04+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:44:27+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-minify\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: minify.php:49
-msgid "The parameter \"f\" is not a valid path."
-msgstr "参数 \"f\" 不是个有效的路径。"
-
-#: minify.php:53
-msgid "The parameter \"f\" is required but missing."
-msgstr "需要参数 \"f\" 但是丢失了。"
-
-#: minify.php:111
-msgid "File type not supported."
-msgstr "文件类型不支持。"
-
-#: MinifyPlugin.php:179
 msgid ""
 "The Minify plugin minifies StatusNet's CSS and JavaScript, removing "
 "whitespace and comments."
 msgstr "Minify 插件通过删除空白和注释缩小 StatusNet 的 CSS 和 JavaScript。"
+
+msgid "The parameter \"f\" is not a valid path."
+msgstr "参数 \"f\" 不是个有效的路径。"
+
+msgid "The parameter \"f\" is required but missing."
+msgstr "需要参数 \"f\" 但是丢失了。"
+
+msgid "File type not supported."
+msgstr "文件类型不支持。"
diff --git a/plugins/MobileProfile/locale/MobileProfile.pot b/plugins/MobileProfile/locale/MobileProfile.pot
index 40d70f71f9..b0d185af0c 100644
--- a/plugins/MobileProfile/locale/MobileProfile.pot
+++ b/plugins/MobileProfile/locale/MobileProfile.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/MobileProfile/locale/br/LC_MESSAGES/MobileProfile.po b/plugins/MobileProfile/locale/br/LC_MESSAGES/MobileProfile.po
index 6a79108fee..47078f32fe 100644
--- a/plugins/MobileProfile/locale/br/LC_MESSAGES/MobileProfile.po
+++ b/plugins/MobileProfile/locale/br/LC_MESSAGES/MobileProfile.po
@@ -9,80 +9,64 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - MobileProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 15:58+0000\n"
-"PO-Revision-Date: 2011-03-03 16:02:16+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:36+0000\n"
 "Language-Team: Breton <http://translatewiki.net/wiki/Portal:br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-14 17:20:45+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:49:34+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-mobileprofile\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: MobileProfilePlugin.php:196
 msgid "This page is not available in a media type you accept."
 msgstr ""
 
-#: MobileProfilePlugin.php:313
 msgid "Home"
 msgstr "Degemer"
 
-#: MobileProfilePlugin.php:315
 msgid "Account"
 msgstr "Kont"
 
-#: MobileProfilePlugin.php:317
 msgid "Connect"
 msgstr "Kevreañ"
 
-#: MobileProfilePlugin.php:320
 msgid "Admin"
 msgstr "Merour"
 
-#: MobileProfilePlugin.php:320
 msgid "Change site configuration"
 msgstr "Kemmañ arventennoù al lec'hienn"
 
-#: MobileProfilePlugin.php:324
 msgid "Invite"
 msgstr "Pediñ"
 
-#: MobileProfilePlugin.php:327
 msgid "Logout"
 msgstr "Digevreañ"
 
-#: MobileProfilePlugin.php:331
 msgid "Register"
 msgstr "Marilhañ"
 
-#: MobileProfilePlugin.php:334
 msgid "Login"
 msgstr "Kevreañ"
 
-#: MobileProfilePlugin.php:338
 msgid "Search"
 msgstr "Klask"
 
-#: MobileProfilePlugin.php:365
 msgid "Attach"
 msgstr "Stagañ"
 
-#: MobileProfilePlugin.php:369
 msgid "Attach a file"
 msgstr "Stagañ ur restr"
 
 #. TRANS: Link to switch site layout from mobile to desktop mode. Appears at very bottom of page.
-#: MobileProfilePlugin.php:410
 msgid "Switch to desktop site layout."
 msgstr ""
 
 #. TRANS: Link to switch site layout from desktop to mobile mode. Appears at very bottom of page.
-#: MobileProfilePlugin.php:414
 msgid "Switch to mobile site layout."
 msgstr ""
 
-#: MobileProfilePlugin.php:451
 msgid "XHTML MobileProfile output for supporting user agents."
 msgstr ""
diff --git a/plugins/MobileProfile/locale/ce/LC_MESSAGES/MobileProfile.po b/plugins/MobileProfile/locale/ce/LC_MESSAGES/MobileProfile.po
index 157e5f58e5..561e65689e 100644
--- a/plugins/MobileProfile/locale/ce/LC_MESSAGES/MobileProfile.po
+++ b/plugins/MobileProfile/locale/ce/LC_MESSAGES/MobileProfile.po
@@ -9,80 +9,64 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - MobileProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 15:58+0000\n"
-"PO-Revision-Date: 2011-03-03 16:02:16+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:36+0000\n"
 "Language-Team: Chechen <http://translatewiki.net/wiki/Portal:ce>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-14 17:20:45+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:49:34+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ce\n"
 "X-Message-Group: #out-statusnet-plugin-mobileprofile\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: MobileProfilePlugin.php:196
 msgid "This page is not available in a media type you accept."
 msgstr "Агlо схьа ца гойту ишта тайпнара чун, ахьа лелош йолу."
 
-#: MobileProfilePlugin.php:313
 msgid "Home"
 msgstr "Цlехьа"
 
-#: MobileProfilePlugin.php:315
 msgid "Account"
 msgstr "Дlавазвалар"
 
-#: MobileProfilePlugin.php:317
 msgid "Connect"
 msgstr "Зlе тасар"
 
-#: MobileProfilePlugin.php:320
 msgid "Admin"
 msgstr "Адаманкуьйгалхо"
 
-#: MobileProfilePlugin.php:320
 msgid "Change site configuration"
 msgstr ""
 
-#: MobileProfilePlugin.php:324
 msgid "Invite"
 msgstr "Схьакхайкха"
 
-#: MobileProfilePlugin.php:327
 msgid "Logout"
 msgstr "Ара валар"
 
-#: MobileProfilePlugin.php:331
 msgid "Register"
 msgstr "Дlавазвалар"
 
-#: MobileProfilePlugin.php:334
 msgid "Login"
 msgstr "Вовзийта хьой"
 
-#: MobileProfilePlugin.php:338
 msgid "Search"
 msgstr "Лаха"
 
-#: MobileProfilePlugin.php:365
 msgid "Attach"
 msgstr "Тlечlагlде"
 
-#: MobileProfilePlugin.php:369
 msgid "Attach a file"
 msgstr "Тlечlагlйе хlума"
 
 #. TRANS: Link to switch site layout from mobile to desktop mode. Appears at very bottom of page.
-#: MobileProfilePlugin.php:410
 msgid "Switch to desktop site layout."
 msgstr ""
 
 #. TRANS: Link to switch site layout from desktop to mobile mode. Appears at very bottom of page.
-#: MobileProfilePlugin.php:414
 msgid "Switch to mobile site layout."
 msgstr ""
 
-#: MobileProfilePlugin.php:451
 msgid "XHTML MobileProfile output for supporting user agents."
 msgstr "XHTML MobileProfile арайокху иза лелочу декъашхошна аттон."
diff --git a/plugins/MobileProfile/locale/de/LC_MESSAGES/MobileProfile.po b/plugins/MobileProfile/locale/de/LC_MESSAGES/MobileProfile.po
index 511eb04f02..2bde78b4c0 100644
--- a/plugins/MobileProfile/locale/de/LC_MESSAGES/MobileProfile.po
+++ b/plugins/MobileProfile/locale/de/LC_MESSAGES/MobileProfile.po
@@ -9,80 +9,64 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - MobileProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 15:58+0000\n"
-"PO-Revision-Date: 2011-03-03 16:02:16+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:37+0000\n"
 "Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-14 17:20:45+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:49:34+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-mobileprofile\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: MobileProfilePlugin.php:196
 msgid "This page is not available in a media type you accept."
 msgstr "Diese Seite liegt in keinem von Ihnen akzeptierten Medientyp vor."
 
-#: MobileProfilePlugin.php:313
 msgid "Home"
 msgstr "Startseite"
 
-#: MobileProfilePlugin.php:315
 msgid "Account"
 msgstr "Konto"
 
-#: MobileProfilePlugin.php:317
 msgid "Connect"
 msgstr "Verbinden"
 
-#: MobileProfilePlugin.php:320
 msgid "Admin"
 msgstr "Administration"
 
-#: MobileProfilePlugin.php:320
 msgid "Change site configuration"
 msgstr "Seitenkonfiguration ändern"
 
-#: MobileProfilePlugin.php:324
 msgid "Invite"
 msgstr "Einladen"
 
-#: MobileProfilePlugin.php:327
 msgid "Logout"
 msgstr "Abmelden"
 
-#: MobileProfilePlugin.php:331
 msgid "Register"
 msgstr "Registrieren"
 
-#: MobileProfilePlugin.php:334
 msgid "Login"
 msgstr "Anmelden"
 
-#: MobileProfilePlugin.php:338
 msgid "Search"
 msgstr "Suche"
 
-#: MobileProfilePlugin.php:365
 msgid "Attach"
 msgstr "Anhängen"
 
-#: MobileProfilePlugin.php:369
 msgid "Attach a file"
 msgstr "Datei anhängen"
 
 #. TRANS: Link to switch site layout from mobile to desktop mode. Appears at very bottom of page.
-#: MobileProfilePlugin.php:410
 msgid "Switch to desktop site layout."
 msgstr ""
 
 #. TRANS: Link to switch site layout from desktop to mobile mode. Appears at very bottom of page.
-#: MobileProfilePlugin.php:414
 msgid "Switch to mobile site layout."
 msgstr ""
 
-#: MobileProfilePlugin.php:451
 msgid "XHTML MobileProfile output for supporting user agents."
 msgstr "XHTML-MobileProfile-Ausgabe zur Unterstützung von User-Agents."
diff --git a/plugins/MobileProfile/locale/fr/LC_MESSAGES/MobileProfile.po b/plugins/MobileProfile/locale/fr/LC_MESSAGES/MobileProfile.po
index a48a0edbf7..c1c56ecbc5 100644
--- a/plugins/MobileProfile/locale/fr/LC_MESSAGES/MobileProfile.po
+++ b/plugins/MobileProfile/locale/fr/LC_MESSAGES/MobileProfile.po
@@ -10,81 +10,65 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - MobileProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 15:58+0000\n"
-"PO-Revision-Date: 2011-03-03 16:02:16+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:37+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-14 17:20:45+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:49:34+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-mobileprofile\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: MobileProfilePlugin.php:196
 msgid "This page is not available in a media type you accept."
 msgstr ""
 "Cette page n’est pas disponible dans un des types de média que vous acceptez."
 
-#: MobileProfilePlugin.php:313
 msgid "Home"
 msgstr "Accueil"
 
-#: MobileProfilePlugin.php:315
 msgid "Account"
 msgstr "Compte"
 
-#: MobileProfilePlugin.php:317
 msgid "Connect"
 msgstr "Connexion"
 
-#: MobileProfilePlugin.php:320
 msgid "Admin"
 msgstr "Administrateur"
 
-#: MobileProfilePlugin.php:320
 msgid "Change site configuration"
 msgstr "Modifier la configuration du site"
 
-#: MobileProfilePlugin.php:324
 msgid "Invite"
 msgstr "Inviter"
 
-#: MobileProfilePlugin.php:327
 msgid "Logout"
 msgstr "Déconnexion"
 
-#: MobileProfilePlugin.php:331
 msgid "Register"
 msgstr "S’inscrire"
 
-#: MobileProfilePlugin.php:334
 msgid "Login"
 msgstr "Connexion"
 
-#: MobileProfilePlugin.php:338
 msgid "Search"
 msgstr "Rechercher"
 
-#: MobileProfilePlugin.php:365
 msgid "Attach"
 msgstr "Joindre"
 
-#: MobileProfilePlugin.php:369
 msgid "Attach a file"
 msgstr "Joindre un fichier"
 
 #. TRANS: Link to switch site layout from mobile to desktop mode. Appears at very bottom of page.
-#: MobileProfilePlugin.php:410
 msgid "Switch to desktop site layout."
 msgstr ""
 
 #. TRANS: Link to switch site layout from desktop to mobile mode. Appears at very bottom of page.
-#: MobileProfilePlugin.php:414
 msgid "Switch to mobile site layout."
 msgstr ""
 
-#: MobileProfilePlugin.php:451
 msgid "XHTML MobileProfile output for supporting user agents."
 msgstr "Sortie XHTML MobileProfile pour les navigateurs compatibles."
diff --git a/plugins/MobileProfile/locale/gl/LC_MESSAGES/MobileProfile.po b/plugins/MobileProfile/locale/gl/LC_MESSAGES/MobileProfile.po
index a16052b790..0a31777bea 100644
--- a/plugins/MobileProfile/locale/gl/LC_MESSAGES/MobileProfile.po
+++ b/plugins/MobileProfile/locale/gl/LC_MESSAGES/MobileProfile.po
@@ -9,80 +9,64 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - MobileProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 15:58+0000\n"
-"PO-Revision-Date: 2011-03-03 16:02:16+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:37+0000\n"
 "Language-Team: Galician <http://translatewiki.net/wiki/Portal:gl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-14 17:20:45+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:49:34+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: gl\n"
 "X-Message-Group: #out-statusnet-plugin-mobileprofile\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: MobileProfilePlugin.php:196
 msgid "This page is not available in a media type you accept."
 msgstr ""
 
-#: MobileProfilePlugin.php:313
 msgid "Home"
 msgstr "Inicio"
 
-#: MobileProfilePlugin.php:315
 msgid "Account"
 msgstr "Conta"
 
-#: MobileProfilePlugin.php:317
 msgid "Connect"
 msgstr "Conectar"
 
-#: MobileProfilePlugin.php:320
 msgid "Admin"
 msgstr "Administrador"
 
-#: MobileProfilePlugin.php:320
 msgid "Change site configuration"
 msgstr "Cambiar a configuración do sitio"
 
-#: MobileProfilePlugin.php:324
 msgid "Invite"
 msgstr "Convidar"
 
-#: MobileProfilePlugin.php:327
 msgid "Logout"
 msgstr "Saír"
 
-#: MobileProfilePlugin.php:331
 msgid "Register"
 msgstr "Rexistrarse"
 
-#: MobileProfilePlugin.php:334
 msgid "Login"
 msgstr "Rexistro"
 
-#: MobileProfilePlugin.php:338
 msgid "Search"
 msgstr "Procurar"
 
-#: MobileProfilePlugin.php:365
 msgid "Attach"
 msgstr "Anexar"
 
-#: MobileProfilePlugin.php:369
 msgid "Attach a file"
 msgstr "Anexar un ficheiro"
 
 #. TRANS: Link to switch site layout from mobile to desktop mode. Appears at very bottom of page.
-#: MobileProfilePlugin.php:410
 msgid "Switch to desktop site layout."
 msgstr ""
 
 #. TRANS: Link to switch site layout from desktop to mobile mode. Appears at very bottom of page.
-#: MobileProfilePlugin.php:414
 msgid "Switch to mobile site layout."
 msgstr ""
 
-#: MobileProfilePlugin.php:451
 msgid "XHTML MobileProfile output for supporting user agents."
 msgstr ""
diff --git a/plugins/MobileProfile/locale/ia/LC_MESSAGES/MobileProfile.po b/plugins/MobileProfile/locale/ia/LC_MESSAGES/MobileProfile.po
index 13e1f18e36..165b0fcbb9 100644
--- a/plugins/MobileProfile/locale/ia/LC_MESSAGES/MobileProfile.po
+++ b/plugins/MobileProfile/locale/ia/LC_MESSAGES/MobileProfile.po
@@ -9,81 +9,65 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - MobileProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 15:58+0000\n"
-"PO-Revision-Date: 2011-03-03 16:02:16+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:37+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-14 17:20:45+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:49:34+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-mobileprofile\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: MobileProfilePlugin.php:196
 msgid "This page is not available in a media type you accept."
 msgstr "Iste pagina non es disponibile in un formato que tu accepta."
 
-#: MobileProfilePlugin.php:313
 msgid "Home"
 msgstr "Initio"
 
-#: MobileProfilePlugin.php:315
 msgid "Account"
 msgstr "Conto"
 
-#: MobileProfilePlugin.php:317
 msgid "Connect"
 msgstr "Connecter"
 
-#: MobileProfilePlugin.php:320
 msgid "Admin"
 msgstr "Admin"
 
-#: MobileProfilePlugin.php:320
 msgid "Change site configuration"
 msgstr "Modificar le configuration del sito"
 
-#: MobileProfilePlugin.php:324
 msgid "Invite"
 msgstr "Invitar"
 
-#: MobileProfilePlugin.php:327
 msgid "Logout"
 msgstr "Clauder session"
 
-#: MobileProfilePlugin.php:331
 msgid "Register"
 msgstr "Crear conto"
 
-#: MobileProfilePlugin.php:334
 msgid "Login"
 msgstr "Aperir session"
 
-#: MobileProfilePlugin.php:338
 msgid "Search"
 msgstr "Cercar"
 
-#: MobileProfilePlugin.php:365
 msgid "Attach"
 msgstr "Annexar"
 
-#: MobileProfilePlugin.php:369
 msgid "Attach a file"
 msgstr "Annexar un file"
 
 #. TRANS: Link to switch site layout from mobile to desktop mode. Appears at very bottom of page.
-#: MobileProfilePlugin.php:410
 msgid "Switch to desktop site layout."
-msgstr ""
+msgstr "Cambiar al disposition de sito a scriptorio."
 
 #. TRANS: Link to switch site layout from desktop to mobile mode. Appears at very bottom of page.
-#: MobileProfilePlugin.php:414
 msgid "Switch to mobile site layout."
-msgstr ""
+msgstr "Cambiar al disposition de sito mobile."
 
-#: MobileProfilePlugin.php:451
 msgid "XHTML MobileProfile output for supporting user agents."
 msgstr ""
 "Production de XHTML MobileProfile pro le programmas de usator que lo "
diff --git a/plugins/MobileProfile/locale/mk/LC_MESSAGES/MobileProfile.po b/plugins/MobileProfile/locale/mk/LC_MESSAGES/MobileProfile.po
index 7e463a787c..bec435e9dd 100644
--- a/plugins/MobileProfile/locale/mk/LC_MESSAGES/MobileProfile.po
+++ b/plugins/MobileProfile/locale/mk/LC_MESSAGES/MobileProfile.po
@@ -9,80 +9,64 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - MobileProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 15:58+0000\n"
-"PO-Revision-Date: 2011-03-03 16:02:16+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:37+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-14 17:20:45+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:49:34+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-mobileprofile\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
 
-#: MobileProfilePlugin.php:196
 msgid "This page is not available in a media type you accept."
 msgstr "Страницава не е достапна во форматот кој Вие го прифаќате."
 
-#: MobileProfilePlugin.php:313
 msgid "Home"
 msgstr "Почетна"
 
-#: MobileProfilePlugin.php:315
 msgid "Account"
 msgstr "Сметка"
 
-#: MobileProfilePlugin.php:317
 msgid "Connect"
 msgstr "Поврзи се"
 
-#: MobileProfilePlugin.php:320
 msgid "Admin"
 msgstr "Администратор"
 
-#: MobileProfilePlugin.php:320
 msgid "Change site configuration"
 msgstr "Промена на поставките на мрежното место"
 
-#: MobileProfilePlugin.php:324
 msgid "Invite"
 msgstr "Покани"
 
-#: MobileProfilePlugin.php:327
 msgid "Logout"
 msgstr "Одјава"
 
-#: MobileProfilePlugin.php:331
 msgid "Register"
 msgstr "Регистрација"
 
-#: MobileProfilePlugin.php:334
 msgid "Login"
 msgstr "Најава"
 
-#: MobileProfilePlugin.php:338
 msgid "Search"
 msgstr "Пребарај"
 
-#: MobileProfilePlugin.php:365
 msgid "Attach"
 msgstr "Приложи"
 
-#: MobileProfilePlugin.php:369
 msgid "Attach a file"
 msgstr "Приложи податотека"
 
 #. TRANS: Link to switch site layout from mobile to desktop mode. Appears at very bottom of page.
-#: MobileProfilePlugin.php:410
 msgid "Switch to desktop site layout."
-msgstr ""
+msgstr "Префрли ме на столен распоред."
 
 #. TRANS: Link to switch site layout from desktop to mobile mode. Appears at very bottom of page.
-#: MobileProfilePlugin.php:414
 msgid "Switch to mobile site layout."
-msgstr ""
+msgstr "Префрли ме на мобилен распоред."
 
-#: MobileProfilePlugin.php:451
 msgid "XHTML MobileProfile output for supporting user agents."
 msgstr "Излез „XHTML MobileProfile“ за поддршка на кориснички агенти."
diff --git a/plugins/MobileProfile/locale/nb/LC_MESSAGES/MobileProfile.po b/plugins/MobileProfile/locale/nb/LC_MESSAGES/MobileProfile.po
index ea90e967ca..672bdcefa7 100644
--- a/plugins/MobileProfile/locale/nb/LC_MESSAGES/MobileProfile.po
+++ b/plugins/MobileProfile/locale/nb/LC_MESSAGES/MobileProfile.po
@@ -9,80 +9,64 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - MobileProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 15:58+0000\n"
-"PO-Revision-Date: 2011-03-03 16:02:16+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:37+0000\n"
 "Language-Team: Norwegian (bokmål)‬ <http://translatewiki.net/wiki/Portal:no>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-14 17:20:45+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:49:34+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: #out-statusnet-plugin-mobileprofile\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: MobileProfilePlugin.php:196
 msgid "This page is not available in a media type you accept."
 msgstr "Denne siden er ikke tilgjengelig i en mediatype du aksepterer."
 
-#: MobileProfilePlugin.php:313
 msgid "Home"
 msgstr "Hjem"
 
-#: MobileProfilePlugin.php:315
 msgid "Account"
 msgstr "Konto"
 
-#: MobileProfilePlugin.php:317
 msgid "Connect"
 msgstr "Koble til"
 
-#: MobileProfilePlugin.php:320
 msgid "Admin"
 msgstr "Admin"
 
-#: MobileProfilePlugin.php:320
 msgid "Change site configuration"
 msgstr "Endre nettstedskonfigurasjon"
 
-#: MobileProfilePlugin.php:324
 msgid "Invite"
 msgstr "Inviter"
 
-#: MobileProfilePlugin.php:327
 msgid "Logout"
 msgstr "Logg ut"
 
-#: MobileProfilePlugin.php:331
 msgid "Register"
 msgstr "Registrer"
 
-#: MobileProfilePlugin.php:334
 msgid "Login"
 msgstr "Logg inn"
 
-#: MobileProfilePlugin.php:338
 msgid "Search"
 msgstr "Søk"
 
-#: MobileProfilePlugin.php:365
 msgid "Attach"
 msgstr "Legg ved"
 
-#: MobileProfilePlugin.php:369
 msgid "Attach a file"
 msgstr "Legg ved en fil"
 
 #. TRANS: Link to switch site layout from mobile to desktop mode. Appears at very bottom of page.
-#: MobileProfilePlugin.php:410
 msgid "Switch to desktop site layout."
 msgstr ""
 
 #. TRANS: Link to switch site layout from desktop to mobile mode. Appears at very bottom of page.
-#: MobileProfilePlugin.php:414
 msgid "Switch to mobile site layout."
 msgstr ""
 
-#: MobileProfilePlugin.php:451
 msgid "XHTML MobileProfile output for supporting user agents."
 msgstr "XHTML MobileProfile-utdata for støttede brukeragenter."
diff --git a/plugins/MobileProfile/locale/nl/LC_MESSAGES/MobileProfile.po b/plugins/MobileProfile/locale/nl/LC_MESSAGES/MobileProfile.po
index 0887a8f63a..d1c710b5b7 100644
--- a/plugins/MobileProfile/locale/nl/LC_MESSAGES/MobileProfile.po
+++ b/plugins/MobileProfile/locale/nl/LC_MESSAGES/MobileProfile.po
@@ -10,81 +10,65 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - MobileProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 15:58+0000\n"
-"PO-Revision-Date: 2011-03-03 16:02:16+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:37+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-14 17:20:45+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:49:34+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-mobileprofile\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: MobileProfilePlugin.php:196
 msgid "This page is not available in a media type you accept."
 msgstr "Deze pagina is niet beschikbaar in een mediumtype dat u accepteert."
 
-#: MobileProfilePlugin.php:313
 msgid "Home"
 msgstr "Hoofdmenu"
 
-#: MobileProfilePlugin.php:315
 msgid "Account"
 msgstr "Gebruiker"
 
-#: MobileProfilePlugin.php:317
 msgid "Connect"
 msgstr "Koppelen"
 
-#: MobileProfilePlugin.php:320
 msgid "Admin"
 msgstr "Beheer"
 
-#: MobileProfilePlugin.php:320
 msgid "Change site configuration"
 msgstr "Websiteinstellingen wijzigen"
 
-#: MobileProfilePlugin.php:324
 msgid "Invite"
 msgstr "Uitnodigen"
 
-#: MobileProfilePlugin.php:327
 msgid "Logout"
 msgstr "Afmelden"
 
-#: MobileProfilePlugin.php:331
 msgid "Register"
 msgstr "Registreren"
 
-#: MobileProfilePlugin.php:334
 msgid "Login"
 msgstr "Aanmelden"
 
-#: MobileProfilePlugin.php:338
 msgid "Search"
 msgstr "Zoeken"
 
-#: MobileProfilePlugin.php:365
 msgid "Attach"
 msgstr "Toevoegen"
 
-#: MobileProfilePlugin.php:369
 msgid "Attach a file"
 msgstr "Bestand toevoegen"
 
 #. TRANS: Link to switch site layout from mobile to desktop mode. Appears at very bottom of page.
-#: MobileProfilePlugin.php:410
 msgid "Switch to desktop site layout."
-msgstr ""
+msgstr "Omschakelen naar de vormgeving van de desktopsite."
 
 #. TRANS: Link to switch site layout from desktop to mobile mode. Appears at very bottom of page.
-#: MobileProfilePlugin.php:414
 msgid "Switch to mobile site layout."
-msgstr ""
+msgstr "Omschakelen naar de vormgeving van de mobiele site."
 
-#: MobileProfilePlugin.php:451
 msgid "XHTML MobileProfile output for supporting user agents."
 msgstr ""
 "Uitvoer in MobileProfile XHTML voor de gebruikersprogramma's die dat "
diff --git a/plugins/MobileProfile/locale/ps/LC_MESSAGES/MobileProfile.po b/plugins/MobileProfile/locale/ps/LC_MESSAGES/MobileProfile.po
index 6122ae2385..2937184d51 100644
--- a/plugins/MobileProfile/locale/ps/LC_MESSAGES/MobileProfile.po
+++ b/plugins/MobileProfile/locale/ps/LC_MESSAGES/MobileProfile.po
@@ -9,80 +9,64 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - MobileProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 15:58+0000\n"
-"PO-Revision-Date: 2011-03-03 16:02:16+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:37+0000\n"
 "Language-Team: Pashto <http://translatewiki.net/wiki/Portal:ps>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-14 17:20:45+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:49:34+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ps\n"
 "X-Message-Group: #out-statusnet-plugin-mobileprofile\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: MobileProfilePlugin.php:196
 msgid "This page is not available in a media type you accept."
 msgstr ""
 
-#: MobileProfilePlugin.php:313
 msgid "Home"
 msgstr "کور"
 
-#: MobileProfilePlugin.php:315
 msgid "Account"
 msgstr "ګڼون"
 
-#: MobileProfilePlugin.php:317
 msgid "Connect"
 msgstr ""
 
-#: MobileProfilePlugin.php:320
 msgid "Admin"
 msgstr "پازوال"
 
-#: MobileProfilePlugin.php:320
 msgid "Change site configuration"
 msgstr ""
 
-#: MobileProfilePlugin.php:324
 msgid "Invite"
 msgstr ""
 
-#: MobileProfilePlugin.php:327
 msgid "Logout"
 msgstr "وتل"
 
-#: MobileProfilePlugin.php:331
 msgid "Register"
 msgstr "نومليکل"
 
-#: MobileProfilePlugin.php:334
 msgid "Login"
 msgstr "ننوتل"
 
-#: MobileProfilePlugin.php:338
 msgid "Search"
 msgstr "پلټل"
 
-#: MobileProfilePlugin.php:365
 msgid "Attach"
 msgstr ""
 
-#: MobileProfilePlugin.php:369
 msgid "Attach a file"
 msgstr ""
 
 #. TRANS: Link to switch site layout from mobile to desktop mode. Appears at very bottom of page.
-#: MobileProfilePlugin.php:410
 msgid "Switch to desktop site layout."
 msgstr ""
 
 #. TRANS: Link to switch site layout from desktop to mobile mode. Appears at very bottom of page.
-#: MobileProfilePlugin.php:414
 msgid "Switch to mobile site layout."
 msgstr ""
 
-#: MobileProfilePlugin.php:451
 msgid "XHTML MobileProfile output for supporting user agents."
 msgstr ""
diff --git a/plugins/MobileProfile/locale/ru/LC_MESSAGES/MobileProfile.po b/plugins/MobileProfile/locale/ru/LC_MESSAGES/MobileProfile.po
index f6c5dd2257..719ae00a59 100644
--- a/plugins/MobileProfile/locale/ru/LC_MESSAGES/MobileProfile.po
+++ b/plugins/MobileProfile/locale/ru/LC_MESSAGES/MobileProfile.po
@@ -10,81 +10,65 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - MobileProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 15:58+0000\n"
-"PO-Revision-Date: 2011-03-03 16:02:16+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:37+0000\n"
 "Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-14 17:20:45+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:49:34+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-mobileprofile\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: MobileProfilePlugin.php:196
 msgid "This page is not available in a media type you accept."
 msgstr "Страница недоступна для того типа, который вы задействовали."
 
-#: MobileProfilePlugin.php:313
 msgid "Home"
 msgstr "Домой"
 
-#: MobileProfilePlugin.php:315
 msgid "Account"
 msgstr "Аккаунт"
 
-#: MobileProfilePlugin.php:317
 msgid "Connect"
 msgstr "Подключиться"
 
-#: MobileProfilePlugin.php:320
 msgid "Admin"
 msgstr "Администратор"
 
-#: MobileProfilePlugin.php:320
 msgid "Change site configuration"
 msgstr "Изменить конфигурацию сайта"
 
-#: MobileProfilePlugin.php:324
 msgid "Invite"
 msgstr "Пригласить"
 
-#: MobileProfilePlugin.php:327
 msgid "Logout"
 msgstr "Выйти"
 
-#: MobileProfilePlugin.php:331
 msgid "Register"
 msgstr "Регистрация"
 
-#: MobileProfilePlugin.php:334
 msgid "Login"
 msgstr "Представиться"
 
-#: MobileProfilePlugin.php:338
 msgid "Search"
 msgstr "Поиск"
 
-#: MobileProfilePlugin.php:365
 msgid "Attach"
 msgstr "Прикрепить"
 
-#: MobileProfilePlugin.php:369
 msgid "Attach a file"
 msgstr "Прикрепить файл"
 
 #. TRANS: Link to switch site layout from mobile to desktop mode. Appears at very bottom of page.
-#: MobileProfilePlugin.php:410
 msgid "Switch to desktop site layout."
 msgstr ""
 
 #. TRANS: Link to switch site layout from desktop to mobile mode. Appears at very bottom of page.
-#: MobileProfilePlugin.php:414
 msgid "Switch to mobile site layout."
 msgstr ""
 
-#: MobileProfilePlugin.php:451
 msgid "XHTML MobileProfile output for supporting user agents."
 msgstr "XHTML MobileProfile вывод для поддерживаемых пользовательских агентов."
diff --git a/plugins/MobileProfile/locale/ta/LC_MESSAGES/MobileProfile.po b/plugins/MobileProfile/locale/ta/LC_MESSAGES/MobileProfile.po
index a19892a8d9..fe1b3e437f 100644
--- a/plugins/MobileProfile/locale/ta/LC_MESSAGES/MobileProfile.po
+++ b/plugins/MobileProfile/locale/ta/LC_MESSAGES/MobileProfile.po
@@ -9,80 +9,64 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - MobileProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 15:58+0000\n"
-"PO-Revision-Date: 2011-03-03 16:02:16+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:37+0000\n"
 "Language-Team: Tamil <http://translatewiki.net/wiki/Portal:ta>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-14 17:20:45+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:49:34+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ta\n"
 "X-Message-Group: #out-statusnet-plugin-mobileprofile\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: MobileProfilePlugin.php:196
 msgid "This page is not available in a media type you accept."
 msgstr ""
 
-#: MobileProfilePlugin.php:313
 msgid "Home"
 msgstr ""
 
-#: MobileProfilePlugin.php:315
 msgid "Account"
 msgstr "கணக்கு"
 
-#: MobileProfilePlugin.php:317
 msgid "Connect"
 msgstr "இணை"
 
-#: MobileProfilePlugin.php:320
 msgid "Admin"
 msgstr ""
 
-#: MobileProfilePlugin.php:320
 msgid "Change site configuration"
 msgstr ""
 
-#: MobileProfilePlugin.php:324
 msgid "Invite"
 msgstr ""
 
-#: MobileProfilePlugin.php:327
 msgid "Logout"
 msgstr "விடுபதிகை"
 
-#: MobileProfilePlugin.php:331
 msgid "Register"
 msgstr "பதிவு செய்"
 
-#: MobileProfilePlugin.php:334
 msgid "Login"
 msgstr "புகுபதிகை"
 
-#: MobileProfilePlugin.php:338
 msgid "Search"
 msgstr "தேடுக"
 
-#: MobileProfilePlugin.php:365
 msgid "Attach"
 msgstr "இணை"
 
-#: MobileProfilePlugin.php:369
 msgid "Attach a file"
 msgstr "ஒரு கோப்பை இணைக்கவும்"
 
 #. TRANS: Link to switch site layout from mobile to desktop mode. Appears at very bottom of page.
-#: MobileProfilePlugin.php:410
 msgid "Switch to desktop site layout."
 msgstr ""
 
 #. TRANS: Link to switch site layout from desktop to mobile mode. Appears at very bottom of page.
-#: MobileProfilePlugin.php:414
 msgid "Switch to mobile site layout."
 msgstr ""
 
-#: MobileProfilePlugin.php:451
 msgid "XHTML MobileProfile output for supporting user agents."
 msgstr ""
diff --git a/plugins/MobileProfile/locale/te/LC_MESSAGES/MobileProfile.po b/plugins/MobileProfile/locale/te/LC_MESSAGES/MobileProfile.po
index c2b871c7b2..435688ea72 100644
--- a/plugins/MobileProfile/locale/te/LC_MESSAGES/MobileProfile.po
+++ b/plugins/MobileProfile/locale/te/LC_MESSAGES/MobileProfile.po
@@ -9,80 +9,64 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - MobileProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 15:58+0000\n"
-"PO-Revision-Date: 2011-03-03 16:02:17+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:37+0000\n"
 "Language-Team: Telugu <http://translatewiki.net/wiki/Portal:te>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-14 17:20:45+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:49:34+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: te\n"
 "X-Message-Group: #out-statusnet-plugin-mobileprofile\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: MobileProfilePlugin.php:196
 msgid "This page is not available in a media type you accept."
 msgstr ""
 
-#: MobileProfilePlugin.php:313
 msgid "Home"
 msgstr "ముంగిలి"
 
-#: MobileProfilePlugin.php:315
 msgid "Account"
 msgstr "ఖాతా"
 
-#: MobileProfilePlugin.php:317
 msgid "Connect"
 msgstr ""
 
-#: MobileProfilePlugin.php:320
 msgid "Admin"
 msgstr ""
 
-#: MobileProfilePlugin.php:320
 msgid "Change site configuration"
 msgstr ""
 
-#: MobileProfilePlugin.php:324
 msgid "Invite"
 msgstr "ఆహ్వానించు"
 
-#: MobileProfilePlugin.php:327
 msgid "Logout"
 msgstr "నిష్క్రమించండి"
 
-#: MobileProfilePlugin.php:331
 msgid "Register"
 msgstr "నమోదవ్వండి"
 
-#: MobileProfilePlugin.php:334
 msgid "Login"
 msgstr "ప్రవేశించండి"
 
-#: MobileProfilePlugin.php:338
 msgid "Search"
 msgstr "వెతుకు"
 
-#: MobileProfilePlugin.php:365
 msgid "Attach"
 msgstr ""
 
-#: MobileProfilePlugin.php:369
 msgid "Attach a file"
 msgstr ""
 
 #. TRANS: Link to switch site layout from mobile to desktop mode. Appears at very bottom of page.
-#: MobileProfilePlugin.php:410
 msgid "Switch to desktop site layout."
 msgstr ""
 
 #. TRANS: Link to switch site layout from desktop to mobile mode. Appears at very bottom of page.
-#: MobileProfilePlugin.php:414
 msgid "Switch to mobile site layout."
 msgstr ""
 
-#: MobileProfilePlugin.php:451
 msgid "XHTML MobileProfile output for supporting user agents."
 msgstr ""
diff --git a/plugins/MobileProfile/locale/tl/LC_MESSAGES/MobileProfile.po b/plugins/MobileProfile/locale/tl/LC_MESSAGES/MobileProfile.po
index 1c7ab8af4f..5bd5570c98 100644
--- a/plugins/MobileProfile/locale/tl/LC_MESSAGES/MobileProfile.po
+++ b/plugins/MobileProfile/locale/tl/LC_MESSAGES/MobileProfile.po
@@ -9,81 +9,65 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - MobileProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 15:58+0000\n"
-"PO-Revision-Date: 2011-03-03 16:02:17+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:37+0000\n"
 "Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-14 17:20:45+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:49:34+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-mobileprofile\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: MobileProfilePlugin.php:196
 msgid "This page is not available in a media type you accept."
 msgstr "Ang pahinang ito ay hindi makukuha sa uri ng midya na tinanggap mo."
 
-#: MobileProfilePlugin.php:313
 msgid "Home"
 msgstr "Tahanan"
 
-#: MobileProfilePlugin.php:315
 msgid "Account"
 msgstr "Akawnt"
 
-#: MobileProfilePlugin.php:317
 msgid "Connect"
 msgstr "Umugnay"
 
-#: MobileProfilePlugin.php:320
 msgid "Admin"
 msgstr "Tagapangasiwa"
 
-#: MobileProfilePlugin.php:320
 msgid "Change site configuration"
 msgstr "Baguhin ang pagkakaayos ng sityo"
 
-#: MobileProfilePlugin.php:324
 msgid "Invite"
 msgstr "Anyayahan"
 
-#: MobileProfilePlugin.php:327
 msgid "Logout"
 msgstr "Umalis sa pagkakalagda"
 
-#: MobileProfilePlugin.php:331
 msgid "Register"
 msgstr "Magpatala"
 
-#: MobileProfilePlugin.php:334
 msgid "Login"
 msgstr "Lumagda"
 
-#: MobileProfilePlugin.php:338
 msgid "Search"
 msgstr "Humanap"
 
-#: MobileProfilePlugin.php:365
 msgid "Attach"
 msgstr "Ilakip"
 
-#: MobileProfilePlugin.php:369
 msgid "Attach a file"
 msgstr "Maglakip ng isang talaksan"
 
 #. TRANS: Link to switch site layout from mobile to desktop mode. Appears at very bottom of page.
-#: MobileProfilePlugin.php:410
 msgid "Switch to desktop site layout."
 msgstr ""
 
 #. TRANS: Link to switch site layout from desktop to mobile mode. Appears at very bottom of page.
-#: MobileProfilePlugin.php:414
 msgid "Switch to mobile site layout."
 msgstr ""
 
-#: MobileProfilePlugin.php:451
 msgid "XHTML MobileProfile output for supporting user agents."
 msgstr ""
 "Mga paglalabas na XHTML na MobileProfile para sa pagtataguyo ng mga ahente "
diff --git a/plugins/MobileProfile/locale/uk/LC_MESSAGES/MobileProfile.po b/plugins/MobileProfile/locale/uk/LC_MESSAGES/MobileProfile.po
index 8a1dd30b85..7f3c9d8a35 100644
--- a/plugins/MobileProfile/locale/uk/LC_MESSAGES/MobileProfile.po
+++ b/plugins/MobileProfile/locale/uk/LC_MESSAGES/MobileProfile.po
@@ -9,82 +9,66 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - MobileProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 15:58+0000\n"
-"PO-Revision-Date: 2011-03-03 16:02:17+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:37+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-14 17:20:45+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:49:34+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-mobileprofile\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: MobileProfilePlugin.php:196
 msgid "This page is not available in a media type you accept."
 msgstr "Ця сторінка не доступна для того типу медіа, з яким ви погодились."
 
-#: MobileProfilePlugin.php:313
 msgid "Home"
 msgstr "Дім"
 
-#: MobileProfilePlugin.php:315
 msgid "Account"
 msgstr "Акаунт"
 
-#: MobileProfilePlugin.php:317
 msgid "Connect"
 msgstr "З’єднання"
 
-#: MobileProfilePlugin.php:320
 msgid "Admin"
 msgstr "Адмін"
 
-#: MobileProfilePlugin.php:320
 msgid "Change site configuration"
 msgstr "Змінити конфігурацію сайту"
 
-#: MobileProfilePlugin.php:324
 msgid "Invite"
 msgstr "Запросити"
 
-#: MobileProfilePlugin.php:327
 msgid "Logout"
 msgstr "Вийти"
 
-#: MobileProfilePlugin.php:331
 msgid "Register"
 msgstr "Реєстрація"
 
-#: MobileProfilePlugin.php:334
 msgid "Login"
 msgstr "Увійти"
 
-#: MobileProfilePlugin.php:338
 msgid "Search"
 msgstr "Пошук"
 
-#: MobileProfilePlugin.php:365
 msgid "Attach"
 msgstr "Вкласти"
 
-#: MobileProfilePlugin.php:369
 msgid "Attach a file"
 msgstr "Вкласти файл"
 
 #. TRANS: Link to switch site layout from mobile to desktop mode. Appears at very bottom of page.
-#: MobileProfilePlugin.php:410
 msgid "Switch to desktop site layout."
 msgstr ""
 
 #. TRANS: Link to switch site layout from desktop to mobile mode. Appears at very bottom of page.
-#: MobileProfilePlugin.php:414
 msgid "Switch to mobile site layout."
 msgstr ""
 
-#: MobileProfilePlugin.php:451
 msgid "XHTML MobileProfile output for supporting user agents."
 msgstr ""
 "Додаток MobileProfile генерує XHTML прийнятний для мобільних пристроїв."
diff --git a/plugins/MobileProfile/locale/zh_CN/LC_MESSAGES/MobileProfile.po b/plugins/MobileProfile/locale/zh_CN/LC_MESSAGES/MobileProfile.po
index 5c6dd90c5a..f40ac93090 100644
--- a/plugins/MobileProfile/locale/zh_CN/LC_MESSAGES/MobileProfile.po
+++ b/plugins/MobileProfile/locale/zh_CN/LC_MESSAGES/MobileProfile.po
@@ -10,81 +10,65 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - MobileProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 15:58+0000\n"
-"PO-Revision-Date: 2011-03-03 16:02:17+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:37+0000\n"
 "Language-Team: Simplified Chinese <http://translatewiki.net/wiki/Portal:zh-"
 "hans>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-14 17:20:45+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:49:34+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-mobileprofile\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: MobileProfilePlugin.php:196
 msgid "This page is not available in a media type you accept."
 msgstr "此页不在您接受的媒体类型中可用。"
 
-#: MobileProfilePlugin.php:313
 msgid "Home"
 msgstr "首页"
 
-#: MobileProfilePlugin.php:315
 msgid "Account"
 msgstr "账号"
 
-#: MobileProfilePlugin.php:317
 msgid "Connect"
 msgstr "关联"
 
-#: MobileProfilePlugin.php:320
 msgid "Admin"
 msgstr "管理"
 
-#: MobileProfilePlugin.php:320
 msgid "Change site configuration"
 msgstr "更改网站配置"
 
-#: MobileProfilePlugin.php:324
 msgid "Invite"
 msgstr "邀请"
 
-#: MobileProfilePlugin.php:327
 msgid "Logout"
 msgstr "登出"
 
-#: MobileProfilePlugin.php:331
 msgid "Register"
 msgstr "注册"
 
-#: MobileProfilePlugin.php:334
 msgid "Login"
 msgstr "登录"
 
-#: MobileProfilePlugin.php:338
 msgid "Search"
 msgstr "搜索"
 
-#: MobileProfilePlugin.php:365
 msgid "Attach"
 msgstr "附件"
 
-#: MobileProfilePlugin.php:369
 msgid "Attach a file"
 msgstr "添加一个文件附件"
 
 #. TRANS: Link to switch site layout from mobile to desktop mode. Appears at very bottom of page.
-#: MobileProfilePlugin.php:410
 msgid "Switch to desktop site layout."
 msgstr ""
 
 #. TRANS: Link to switch site layout from desktop to mobile mode. Appears at very bottom of page.
-#: MobileProfilePlugin.php:414
 msgid "Switch to mobile site layout."
 msgstr ""
 
-#: MobileProfilePlugin.php:451
 msgid "XHTML MobileProfile output for supporting user agents."
 msgstr "XHTML MobileProfile 支持用户代理的输出。"
diff --git a/plugins/ModHelper/locale/ModHelper.pot b/plugins/ModHelper/locale/ModHelper.pot
index 4d7d2a8a81..d1a9aaa590 100644
--- a/plugins/ModHelper/locale/ModHelper.pot
+++ b/plugins/ModHelper/locale/ModHelper.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/ModHelper/locale/de/LC_MESSAGES/ModHelper.po b/plugins/ModHelper/locale/de/LC_MESSAGES/ModHelper.po
index 32123bf1c9..5a2c989119 100644
--- a/plugins/ModHelper/locale/de/LC_MESSAGES/ModHelper.po
+++ b/plugins/ModHelper/locale/de/LC_MESSAGES/ModHelper.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ModHelper\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-14 16:01+0000\n"
-"PO-Revision-Date: 2011-02-14 16:08:52+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:37+0000\n"
 "Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:25:42+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r82114); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:45:36+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-modhelper\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ModHelperPlugin.php:37
 msgid ""
 "Lets users who have been manually marked as \"modhelper\"s silence accounts."
 msgstr ""
diff --git a/plugins/ModHelper/locale/es/LC_MESSAGES/ModHelper.po b/plugins/ModHelper/locale/es/LC_MESSAGES/ModHelper.po
index 20b3f5c1cc..b78331212c 100644
--- a/plugins/ModHelper/locale/es/LC_MESSAGES/ModHelper.po
+++ b/plugins/ModHelper/locale/es/LC_MESSAGES/ModHelper.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ModHelper\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:27+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:38+0000\n"
 "Language-Team: Spanish <http://translatewiki.net/wiki/Portal:es>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:05+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:45:36+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-modhelper\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ModHelperPlugin.php:37
 msgid ""
 "Lets users who have been manually marked as \"modhelper\"s silence accounts."
 msgstr ""
diff --git a/plugins/ModHelper/locale/fr/LC_MESSAGES/ModHelper.po b/plugins/ModHelper/locale/fr/LC_MESSAGES/ModHelper.po
index 0d4db36a47..92cd881aa8 100644
--- a/plugins/ModHelper/locale/fr/LC_MESSAGES/ModHelper.po
+++ b/plugins/ModHelper/locale/fr/LC_MESSAGES/ModHelper.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ModHelper\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:27+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:38+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:05+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:45:36+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-modhelper\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ModHelperPlugin.php:37
 msgid ""
 "Lets users who have been manually marked as \"modhelper\"s silence accounts."
 msgstr ""
diff --git a/plugins/ModHelper/locale/he/LC_MESSAGES/ModHelper.po b/plugins/ModHelper/locale/he/LC_MESSAGES/ModHelper.po
index ae8b96a96b..dc2156d630 100644
--- a/plugins/ModHelper/locale/he/LC_MESSAGES/ModHelper.po
+++ b/plugins/ModHelper/locale/he/LC_MESSAGES/ModHelper.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ModHelper\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:27+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:38+0000\n"
 "Language-Team: Hebrew <http://translatewiki.net/wiki/Portal:he>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:05+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:45:36+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-plugin-modhelper\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ModHelperPlugin.php:37
 msgid ""
 "Lets users who have been manually marked as \"modhelper\"s silence accounts."
 msgstr "מתן האפשרות למשתמשים שסומנו כ־\"modhelper\" להשתיק חשבונות."
diff --git a/plugins/ModHelper/locale/ia/LC_MESSAGES/ModHelper.po b/plugins/ModHelper/locale/ia/LC_MESSAGES/ModHelper.po
index a442e68488..aa4f05d9ed 100644
--- a/plugins/ModHelper/locale/ia/LC_MESSAGES/ModHelper.po
+++ b/plugins/ModHelper/locale/ia/LC_MESSAGES/ModHelper.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ModHelper\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:27+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:38+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:05+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:45:36+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-modhelper\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ModHelperPlugin.php:37
 msgid ""
 "Lets users who have been manually marked as \"modhelper\"s silence accounts."
 msgstr ""
diff --git a/plugins/ModHelper/locale/mk/LC_MESSAGES/ModHelper.po b/plugins/ModHelper/locale/mk/LC_MESSAGES/ModHelper.po
index 44ffdcc600..d31d29e552 100644
--- a/plugins/ModHelper/locale/mk/LC_MESSAGES/ModHelper.po
+++ b/plugins/ModHelper/locale/mk/LC_MESSAGES/ModHelper.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ModHelper\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:27+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:38+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:05+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:45:36+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-modhelper\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
 
-#: ModHelperPlugin.php:37
 msgid ""
 "Lets users who have been manually marked as \"modhelper\"s silence accounts."
 msgstr ""
diff --git a/plugins/ModHelper/locale/nl/LC_MESSAGES/ModHelper.po b/plugins/ModHelper/locale/nl/LC_MESSAGES/ModHelper.po
index 2292dc30c0..fe61109b7c 100644
--- a/plugins/ModHelper/locale/nl/LC_MESSAGES/ModHelper.po
+++ b/plugins/ModHelper/locale/nl/LC_MESSAGES/ModHelper.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ModHelper\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:27+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:38+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:05+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:45:36+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-modhelper\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ModHelperPlugin.php:37
 msgid ""
 "Lets users who have been manually marked as \"modhelper\"s silence accounts."
 msgstr ""
diff --git a/plugins/ModHelper/locale/ru/LC_MESSAGES/ModHelper.po b/plugins/ModHelper/locale/ru/LC_MESSAGES/ModHelper.po
index fcc68f1a50..b02c3b58de 100644
--- a/plugins/ModHelper/locale/ru/LC_MESSAGES/ModHelper.po
+++ b/plugins/ModHelper/locale/ru/LC_MESSAGES/ModHelper.po
@@ -9,20 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ModHelper\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:27+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:38+0000\n"
 "Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:05+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:45:36+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-modhelper\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: ModHelperPlugin.php:37
 msgid ""
 "Lets users who have been manually marked as \"modhelper\"s silence accounts."
 msgstr ""
diff --git a/plugins/ModHelper/locale/uk/LC_MESSAGES/ModHelper.po b/plugins/ModHelper/locale/uk/LC_MESSAGES/ModHelper.po
index 194954dde7..cc0c15326e 100644
--- a/plugins/ModHelper/locale/uk/LC_MESSAGES/ModHelper.po
+++ b/plugins/ModHelper/locale/uk/LC_MESSAGES/ModHelper.po
@@ -9,20 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ModHelper\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:27+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:38+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:05+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:45:36+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-modhelper\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: ModHelperPlugin.php:37
 msgid ""
 "Lets users who have been manually marked as \"modhelper\"s silence accounts."
 msgstr ""
diff --git a/plugins/ModPlus/locale/ModPlus.pot b/plugins/ModPlus/locale/ModPlus.pot
index 4036032d37..649c8400b5 100644
--- a/plugins/ModPlus/locale/ModPlus.pot
+++ b/plugins/ModPlus/locale/ModPlus.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,14 +16,6 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ModPlusPlugin.php:39
-msgid "UI extensions for profile moderation actions."
-msgstr ""
-
-#: ModPlusPlugin.php:110
-msgid "Remote profile options..."
-msgstr ""
-
 #: remoteprofileaction.php:51
 #, php-format
 msgid "%s on %s"
@@ -41,3 +33,11 @@ msgid ""
 "Site moderators have silenced this profile, which prevents delivery of new "
 "messages to any users on this site."
 msgstr ""
+
+#: ModPlusPlugin.php:39
+msgid "UI extensions for profile moderation actions."
+msgstr ""
+
+#: ModPlusPlugin.php:110
+msgid "Remote profile options..."
+msgstr ""
diff --git a/plugins/ModPlus/locale/de/LC_MESSAGES/ModPlus.po b/plugins/ModPlus/locale/de/LC_MESSAGES/ModPlus.po
index 2e55da6617..fec90ad25a 100644
--- a/plugins/ModPlus/locale/de/LC_MESSAGES/ModPlus.po
+++ b/plugins/ModPlus/locale/de/LC_MESSAGES/ModPlus.po
@@ -9,32 +9,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ModPlus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-14 16:01+0000\n"
-"PO-Revision-Date: 2011-02-14 16:08:54+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:38+0000\n"
 "Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:25:43+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r82114); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:45:37+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-modplus\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ModPlusPlugin.php:39
-msgid "UI extensions for profile moderation actions."
-msgstr "Benutzerobeflächenerweiterungen zur Moderation von Profilen."
-
-#: ModPlusPlugin.php:110
-msgid "Remote profile options..."
-msgstr "Remoteprofil-Einstellungen…"
-
-#: remoteprofileaction.php:51
 #, php-format
 msgid "%s on %s"
 msgstr "%s auf %s"
 
-#: remoteprofileaction.php:62
 #, php-format
 msgid ""
 "This remote profile is registered on another site; see [%s's original "
@@ -43,10 +33,15 @@ msgstr ""
 "Dieses entfernte Profil ist auf einer anderen Seite registriert; siehe [%ss "
 "Original-Profilseite auf %s](%s)"
 
-#: remoteprofileaction.php:70
 msgid ""
 "Site moderators have silenced this profile, which prevents delivery of new "
 "messages to any users on this site."
 msgstr ""
 "Moderatoren haben dieses Profil stumm geschaltet, was die Zustellung neuer "
 "Nachrichten an andere Benutzer dieser Seite unterbindet."
+
+msgid "UI extensions for profile moderation actions."
+msgstr "Benutzerobeflächenerweiterungen zur Moderation von Profilen."
+
+msgid "Remote profile options..."
+msgstr "Remoteprofil-Einstellungen…"
diff --git a/plugins/ModPlus/locale/fr/LC_MESSAGES/ModPlus.po b/plugins/ModPlus/locale/fr/LC_MESSAGES/ModPlus.po
index 7233dd4635..c968a24e5d 100644
--- a/plugins/ModPlus/locale/fr/LC_MESSAGES/ModPlus.po
+++ b/plugins/ModPlus/locale/fr/LC_MESSAGES/ModPlus.po
@@ -10,34 +10,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ModPlus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:28+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:39+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:05+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:45:37+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-modplus\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ModPlusPlugin.php:39
-msgid "UI extensions for profile moderation actions."
-msgstr ""
-"Extensions d’interface utilisateur pour les actions de modération des "
-"profils."
-
-#: ModPlusPlugin.php:110
-msgid "Remote profile options..."
-msgstr "Options de profil distantes..."
-
-#: remoteprofileaction.php:51
 #, php-format
 msgid "%s on %s"
 msgstr "%s sur %s"
 
-#: remoteprofileaction.php:62
 #, php-format
 msgid ""
 "This remote profile is registered on another site; see [%s's original "
@@ -46,10 +34,17 @@ msgstr ""
 "Ce profil distant est enregistré sur un autre site ; voir [la page de profil "
 "originale de %s sur %s](%s)."
 
-#: remoteprofileaction.php:70
 msgid ""
 "Site moderators have silenced this profile, which prevents delivery of new "
 "messages to any users on this site."
 msgstr ""
 "Les modérateurs du site ont réduit ce profil au silence, ce qui empêche "
 "l’envoi de nouveaux messages aux utilisateurs de ce site."
+
+msgid "UI extensions for profile moderation actions."
+msgstr ""
+"Extensions d’interface utilisateur pour les actions de modération des "
+"profils."
+
+msgid "Remote profile options..."
+msgstr "Options de profil distantes..."
diff --git a/plugins/ModPlus/locale/ia/LC_MESSAGES/ModPlus.po b/plugins/ModPlus/locale/ia/LC_MESSAGES/ModPlus.po
index a3a0b59a4b..1d1ffe9c7c 100644
--- a/plugins/ModPlus/locale/ia/LC_MESSAGES/ModPlus.po
+++ b/plugins/ModPlus/locale/ia/LC_MESSAGES/ModPlus.po
@@ -9,33 +9,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ModPlus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:28+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:39+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:05+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:45:37+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-modplus\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ModPlusPlugin.php:39
-msgid "UI extensions for profile moderation actions."
-msgstr ""
-"Extensiones del interfacie de usator pro actiones de moderation de profilos."
-
-#: ModPlusPlugin.php:110
-msgid "Remote profile options..."
-msgstr "Optiones de profilo remote..."
-
-#: remoteprofileaction.php:51
 #, php-format
 msgid "%s on %s"
 msgstr "%s in %s"
 
-#: remoteprofileaction.php:62
 #, php-format
 msgid ""
 "This remote profile is registered on another site; see [%s's original "
@@ -44,10 +33,16 @@ msgstr ""
 "Iste profilo remote es registrate in un altere sito; vide [le pagina de "
 "profilo original de %s in %s](%s)."
 
-#: remoteprofileaction.php:70
 msgid ""
 "Site moderators have silenced this profile, which prevents delivery of new "
 "messages to any users on this site."
 msgstr ""
 "Le moderatores del sito ha silentiate iste profilo, impediente le livration "
 "de nove messages al usatores de iste sito."
+
+msgid "UI extensions for profile moderation actions."
+msgstr ""
+"Extensiones del interfacie de usator pro actiones de moderation de profilos."
+
+msgid "Remote profile options..."
+msgstr "Optiones de profilo remote..."
diff --git a/plugins/ModPlus/locale/mk/LC_MESSAGES/ModPlus.po b/plugins/ModPlus/locale/mk/LC_MESSAGES/ModPlus.po
index 4fe47e2b38..20a4e7b093 100644
--- a/plugins/ModPlus/locale/mk/LC_MESSAGES/ModPlus.po
+++ b/plugins/ModPlus/locale/mk/LC_MESSAGES/ModPlus.po
@@ -9,34 +9,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ModPlus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:28+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:39+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:05+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:45:37+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-modplus\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
 
-#: ModPlusPlugin.php:39
-msgid "UI extensions for profile moderation actions."
-msgstr ""
-"Додатоци за кориснички посредник наменети за постапки за административна "
-"контрола на профили."
-
-#: ModPlusPlugin.php:110
-msgid "Remote profile options..."
-msgstr "Нагодувања на далечински профил..."
-
-#: remoteprofileaction.php:51
 #, php-format
 msgid "%s on %s"
 msgstr "%s на %s"
 
-#: remoteprofileaction.php:62
 #, php-format
 msgid ""
 "This remote profile is registered on another site; see [%s's original "
@@ -45,10 +33,17 @@ msgstr ""
 "Овој далечински профил е регистриран на друго мреж. место. Погледајте ја [%"
 "s's изворната профилна страница на %s](%s)."
 
-#: remoteprofileaction.php:70
 msgid ""
 "Site moderators have silenced this profile, which prevents delivery of new "
 "messages to any users on this site."
 msgstr ""
 "Администраторите го замолчиле овој профил, што оневозможува праќање нови "
 "пораки на било кој корисник на мрежното место."
+
+msgid "UI extensions for profile moderation actions."
+msgstr ""
+"Додатоци за кориснички посредник наменети за постапки за административна "
+"контрола на профили."
+
+msgid "Remote profile options..."
+msgstr "Нагодувања на далечински профил..."
diff --git a/plugins/ModPlus/locale/nl/LC_MESSAGES/ModPlus.po b/plugins/ModPlus/locale/nl/LC_MESSAGES/ModPlus.po
index a977f185f4..2260ee3c27 100644
--- a/plugins/ModPlus/locale/nl/LC_MESSAGES/ModPlus.po
+++ b/plugins/ModPlus/locale/nl/LC_MESSAGES/ModPlus.po
@@ -10,34 +10,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ModPlus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:28+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:39+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:05+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:45:37+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-modplus\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ModPlusPlugin.php:39
-msgid "UI extensions for profile moderation actions."
-msgstr ""
-"Uitbreiding van de gebruikersinterface voor handelingen ten aanzien van "
-"profielmoderatie."
-
-#: ModPlusPlugin.php:110
-msgid "Remote profile options..."
-msgstr "Instellingen voor profiel op andere server..."
-
-#: remoteprofileaction.php:51
 #, php-format
 msgid "%s on %s"
 msgstr "%s op %s"
 
-#: remoteprofileaction.php:62
 #, php-format
 msgid ""
 "This remote profile is registered on another site; see [%s's original "
@@ -46,7 +34,6 @@ msgstr ""
 "Dit profiel op een andere server is geregistreerd bij een andere site. Zie "
 "[de originele profielpagina van %s op %s](%s)."
 
-#: remoteprofileaction.php:70
 msgid ""
 "Site moderators have silenced this profile, which prevents delivery of new "
 "messages to any users on this site."
@@ -54,3 +41,11 @@ msgstr ""
 "Moderatoren van de site hebben dit profiel het zwijgen opgelegd, waardoor "
 "het niet mogelijk is nieuwe berichten aan gebruikers van deze site te "
 "verzenden."
+
+msgid "UI extensions for profile moderation actions."
+msgstr ""
+"Uitbreiding van de gebruikersinterface voor handelingen ten aanzien van "
+"profielmoderatie."
+
+msgid "Remote profile options..."
+msgstr "Instellingen voor profiel op andere server..."
diff --git a/plugins/ModPlus/locale/uk/LC_MESSAGES/ModPlus.po b/plugins/ModPlus/locale/uk/LC_MESSAGES/ModPlus.po
index bb52aa38fc..f477a33ae0 100644
--- a/plugins/ModPlus/locale/uk/LC_MESSAGES/ModPlus.po
+++ b/plugins/ModPlus/locale/uk/LC_MESSAGES/ModPlus.po
@@ -9,33 +9,23 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ModPlus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:28+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:39+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:05+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:45:37+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-modplus\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: ModPlusPlugin.php:39
-msgid "UI extensions for profile moderation actions."
-msgstr "Розширення користувацького інтерфейсу для модерування профілю."
-
-#: ModPlusPlugin.php:110
-msgid "Remote profile options..."
-msgstr "Опції віддаленого профілю..."
-
-#: remoteprofileaction.php:51
 #, php-format
 msgid "%s on %s"
 msgstr "%s на %s"
 
-#: remoteprofileaction.php:62
 #, php-format
 msgid ""
 "This remote profile is registered on another site; see [%s's original "
@@ -44,10 +34,15 @@ msgstr ""
 "Це віддалений профіль, зареєстрований на іншому сайті; див. [справжній "
 "профіль %s на сайті %s](%s)."
 
-#: remoteprofileaction.php:70
 msgid ""
 "Site moderators have silenced this profile, which prevents delivery of new "
 "messages to any users on this site."
 msgstr ""
 "Модератори сайту позбавили права голосу даний профіль, що перешкоджає "
 "доставці нових повідомлень для всіх користувачів на цьому сайті."
+
+msgid "UI extensions for profile moderation actions."
+msgstr "Розширення користувацького інтерфейсу для модерування профілю."
+
+msgid "Remote profile options..."
+msgstr "Опції віддаленого профілю..."
diff --git a/plugins/Msn/locale/Msn.pot b/plugins/Msn/locale/Msn.pot
index a032d4759f..f1a275503d 100644
--- a/plugins/Msn/locale/Msn.pot
+++ b/plugins/Msn/locale/Msn.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/Msn/locale/br/LC_MESSAGES/Msn.po b/plugins/Msn/locale/br/LC_MESSAGES/Msn.po
new file mode 100644
index 0000000000..37105f82b6
--- /dev/null
+++ b/plugins/Msn/locale/br/LC_MESSAGES/Msn.po
@@ -0,0 +1,29 @@
+# Translation of StatusNet - Msn to Breton (Brezhoneg)
+# Exported from translatewiki.net
+#
+# Author: Y-M D
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Msn\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:39+0000\n"
+"Language-Team: Breton <http://translatewiki.net/wiki/Portal:br>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-03-03 20:42:25+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: br\n"
+"X-Message-Group: #out-statusnet-plugin-msn\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+msgid "MSN"
+msgstr "MSN"
+
+msgid ""
+"The MSN plugin allows users to send and receive notices over the MSN network."
+msgstr ""
diff --git a/plugins/Msn/locale/ia/LC_MESSAGES/Msn.po b/plugins/Msn/locale/ia/LC_MESSAGES/Msn.po
new file mode 100644
index 0000000000..92301bddd3
--- /dev/null
+++ b/plugins/Msn/locale/ia/LC_MESSAGES/Msn.po
@@ -0,0 +1,31 @@
+# Translation of StatusNet - Msn to Interlingua (Interlingua)
+# Exported from translatewiki.net
+#
+# Author: McDutchie
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Msn\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:39+0000\n"
+"Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-03-03 20:42:25+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: ia\n"
+"X-Message-Group: #out-statusnet-plugin-msn\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "MSN"
+msgstr "MSN"
+
+msgid ""
+"The MSN plugin allows users to send and receive notices over the MSN network."
+msgstr ""
+"Le plug-in de MSN permitte que usatores invia e recipe notas per le rete de "
+"MSN."
diff --git a/plugins/Msn/locale/mk/LC_MESSAGES/Msn.po b/plugins/Msn/locale/mk/LC_MESSAGES/Msn.po
new file mode 100644
index 0000000000..e615ffae62
--- /dev/null
+++ b/plugins/Msn/locale/mk/LC_MESSAGES/Msn.po
@@ -0,0 +1,31 @@
+# Translation of StatusNet - Msn to Macedonian (Македонски)
+# Exported from translatewiki.net
+#
+# Author: Bjankuloski06
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Msn\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:39+0000\n"
+"Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-03-03 20:42:25+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: mk\n"
+"X-Message-Group: #out-statusnet-plugin-msn\n"
+"Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
+
+msgid "MSN"
+msgstr "MSN"
+
+msgid ""
+"The MSN plugin allows users to send and receive notices over the MSN network."
+msgstr ""
+"Приклучокот за MSN им овозможува на корисниците да испраќаат и примаат "
+"забелешки преку мрежата на MSN."
diff --git a/plugins/Msn/locale/nl/LC_MESSAGES/Msn.po b/plugins/Msn/locale/nl/LC_MESSAGES/Msn.po
new file mode 100644
index 0000000000..6dfb925c98
--- /dev/null
+++ b/plugins/Msn/locale/nl/LC_MESSAGES/Msn.po
@@ -0,0 +1,31 @@
+# Translation of StatusNet - Msn to Dutch (Nederlands)
+# Exported from translatewiki.net
+#
+# Author: Siebrand
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Msn\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:39+0000\n"
+"Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-03-03 20:42:25+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: nl\n"
+"X-Message-Group: #out-statusnet-plugin-msn\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "MSN"
+msgstr "MSN"
+
+msgid ""
+"The MSN plugin allows users to send and receive notices over the MSN network."
+msgstr ""
+"Maakt het mogelijk om mededelingen te zenden naar en ontvangen van het MSN-"
+"netwerk."
diff --git a/plugins/NewMenu/locale/ar/LC_MESSAGES/NewMenu.po b/plugins/NewMenu/locale/ar/LC_MESSAGES/NewMenu.po
new file mode 100644
index 0000000000..004b244272
--- /dev/null
+++ b/plugins/NewMenu/locale/ar/LC_MESSAGES/NewMenu.po
@@ -0,0 +1,81 @@
+# Translation of StatusNet - NewMenu to Arabic (العربية)
+# Exported from translatewiki.net
+#
+# Author: OsamaK
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - NewMenu\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-03-06 01:37:41+0000\n"
+"Language-Team: Arabic <http://translatewiki.net/wiki/Portal:ar>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-03-03 17:45:38+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: ar\n"
+"X-Message-Group: #out-statusnet-plugin-newmenu\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"
+
+msgid "Home"
+msgstr ""
+
+msgid "Friends timeline"
+msgstr ""
+
+msgid "Profile"
+msgstr ""
+
+msgid "Your profile"
+msgstr ""
+
+msgid "Public"
+msgstr ""
+
+msgid "Everyone on this site"
+msgstr ""
+
+msgid "Settings"
+msgstr ""
+
+msgid "Change your personal settings"
+msgstr ""
+
+msgid "Admin"
+msgstr ""
+
+msgid "Site configuration"
+msgstr ""
+
+msgid "Logout"
+msgstr ""
+
+msgid "Logout from the site"
+msgstr ""
+
+msgid "Login"
+msgstr "ادخل"
+
+msgid "Login to the site"
+msgstr "ادخل الموقع"
+
+msgid "Search"
+msgstr "ابحث"
+
+msgid "Search the site"
+msgstr "ابحث في الموقع"
+
+msgid "IM"
+msgstr "المراسلة الفورية"
+
+msgid "SMS"
+msgstr "الرسائل القصيرة"
+
+msgid "A preview of the new menu layout in StatusNet 1.0."
+msgstr "معاينة لتخطيط القوائم الجديد في ستاتسنت 1.0."
diff --git a/plugins/NewMenu/locale/br/LC_MESSAGES/NewMenu.po b/plugins/NewMenu/locale/br/LC_MESSAGES/NewMenu.po
index 083cd48165..8b409c809c 100644
--- a/plugins/NewMenu/locale/br/LC_MESSAGES/NewMenu.po
+++ b/plugins/NewMenu/locale/br/LC_MESSAGES/NewMenu.po
@@ -9,90 +9,71 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - NewMenu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-14 16:01+0000\n"
-"PO-Revision-Date: 2011-02-14 16:08:58+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-03-06 01:37:41+0000\n"
 "Language-Team: Breton <http://translatewiki.net/wiki/Portal:br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-03 23:18:45+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r82114); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:45:38+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-newmenu\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: NewMenuPlugin.php:74
 msgid "Home"
 msgstr "Degemer"
 
-#: NewMenuPlugin.php:75
 msgid "Friends timeline"
 msgstr ""
 
-#: NewMenuPlugin.php:80
 msgid "Profile"
 msgstr "Profil"
 
-#: NewMenuPlugin.php:81
 msgid "Your profile"
 msgstr "Ho profil"
 
-#: NewMenuPlugin.php:85 NewMenuPlugin.php:108
 msgid "Public"
 msgstr "Foran"
 
-#: NewMenuPlugin.php:86 NewMenuPlugin.php:109
 msgid "Everyone on this site"
 msgstr ""
 
-#: NewMenuPlugin.php:90
 msgid "Settings"
-msgstr ""
+msgstr "Arventennoù"
 
-#: NewMenuPlugin.php:91
 msgid "Change your personal settings"
-msgstr ""
+msgstr "Kemmañ hoc'h arventennoù hiniennel"
 
-#: NewMenuPlugin.php:96
 msgid "Admin"
 msgstr "Merour"
 
-#: NewMenuPlugin.php:97
 msgid "Site configuration"
-msgstr ""
+msgstr "Kefluniadur al lec'hienn"
 
-#: NewMenuPlugin.php:102
 msgid "Logout"
 msgstr "Digevreañ"
 
-#: NewMenuPlugin.php:103
 msgid "Logout from the site"
-msgstr ""
+msgstr "Digevreañ diouzh al lec'hienn"
 
-#: NewMenuPlugin.php:113
 msgid "Login"
 msgstr "Kevreañ"
 
-#: NewMenuPlugin.php:114
 msgid "Login to the site"
-msgstr ""
+msgstr "Kevreañ d'al lec'hienn"
 
-#: NewMenuPlugin.php:121
 msgid "Search"
 msgstr "Klask"
 
-#: NewMenuPlugin.php:122
 msgid "Search the site"
-msgstr ""
+msgstr "Klask el lec'hienn"
 
-#: NewMenuPlugin.php:307
 msgid "IM"
-msgstr ""
+msgstr "IM"
 
-#: NewMenuPlugin.php:314
 msgid "SMS"
 msgstr "SMS"
 
-#: NewMenuPlugin.php:406
 msgid "A preview of the new menu layout in StatusNet 1.0."
 msgstr ""
diff --git a/plugins/NewMenu/locale/de/LC_MESSAGES/NewMenu.po b/plugins/NewMenu/locale/de/LC_MESSAGES/NewMenu.po
index 16bc9b5d8a..1e3b684996 100644
--- a/plugins/NewMenu/locale/de/LC_MESSAGES/NewMenu.po
+++ b/plugins/NewMenu/locale/de/LC_MESSAGES/NewMenu.po
@@ -9,90 +9,71 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - NewMenu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-14 16:01+0000\n"
-"PO-Revision-Date: 2011-02-14 16:08:58+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-03-06 01:37:41+0000\n"
 "Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-03 23:18:45+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r82114); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:45:38+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-newmenu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: NewMenuPlugin.php:74
 msgid "Home"
 msgstr "Startseite"
 
-#: NewMenuPlugin.php:75
 msgid "Friends timeline"
 msgstr "Zeitstrahl deiner Freunde"
 
-#: NewMenuPlugin.php:80
 msgid "Profile"
 msgstr "Profil"
 
-#: NewMenuPlugin.php:81
 msgid "Your profile"
 msgstr "Ihr Profil"
 
-#: NewMenuPlugin.php:85 NewMenuPlugin.php:108
 msgid "Public"
 msgstr "Öffentlich"
 
-#: NewMenuPlugin.php:86 NewMenuPlugin.php:109
 msgid "Everyone on this site"
 msgstr "Jeder auf dieser Seite"
 
-#: NewMenuPlugin.php:90
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: NewMenuPlugin.php:91
 msgid "Change your personal settings"
 msgstr "Persönliche Einstellungen ändern"
 
-#: NewMenuPlugin.php:96
 msgid "Admin"
 msgstr "Administrator"
 
-#: NewMenuPlugin.php:97
 msgid "Site configuration"
 msgstr "Seitenkonfiguration"
 
-#: NewMenuPlugin.php:102
 msgid "Logout"
 msgstr "Abmelden"
 
-#: NewMenuPlugin.php:103
 msgid "Logout from the site"
 msgstr "Von der Seite abmelden"
 
-#: NewMenuPlugin.php:113
 msgid "Login"
 msgstr "Anmelden"
 
-#: NewMenuPlugin.php:114
 msgid "Login to the site"
 msgstr "Auf der Seite anmelden"
 
-#: NewMenuPlugin.php:121
 msgid "Search"
 msgstr "Suche"
 
-#: NewMenuPlugin.php:122
 msgid "Search the site"
 msgstr "Seite durchsuchen"
 
-#: NewMenuPlugin.php:307
 msgid "IM"
 msgstr "IM"
 
-#: NewMenuPlugin.php:314
 msgid "SMS"
 msgstr "SMS"
 
-#: NewMenuPlugin.php:406
 msgid "A preview of the new menu layout in StatusNet 1.0."
 msgstr "Eine Vorschau auf das neue Menü-Layout in StatusNet 1.0."
diff --git a/plugins/NewMenu/locale/ia/LC_MESSAGES/NewMenu.po b/plugins/NewMenu/locale/ia/LC_MESSAGES/NewMenu.po
index 1c8a5ffee1..f1429179a3 100644
--- a/plugins/NewMenu/locale/ia/LC_MESSAGES/NewMenu.po
+++ b/plugins/NewMenu/locale/ia/LC_MESSAGES/NewMenu.po
@@ -10,89 +10,70 @@ msgstr ""
 "Project-Id-Version: StatusNet - NewMenu\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:30+0000\n"
+"PO-Revision-Date: 2011-03-06 01:37:41+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-20 20:16:04+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:45:38+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-newmenu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: NewMenuPlugin.php:74
 msgid "Home"
 msgstr "Initio"
 
-#: NewMenuPlugin.php:75
 msgid "Friends timeline"
 msgstr "Chronologia de amicos"
 
-#: NewMenuPlugin.php:80
 msgid "Profile"
 msgstr "Profilo"
 
-#: NewMenuPlugin.php:81
 msgid "Your profile"
 msgstr "Tu profilo"
 
-#: NewMenuPlugin.php:85 NewMenuPlugin.php:108
 msgid "Public"
 msgstr "Public"
 
-#: NewMenuPlugin.php:86 NewMenuPlugin.php:109
 msgid "Everyone on this site"
 msgstr "Omnes in iste sito"
 
-#: NewMenuPlugin.php:90
 msgid "Settings"
 msgstr "Configurationes"
 
-#: NewMenuPlugin.php:91
 msgid "Change your personal settings"
 msgstr "Cambiar tu optiones personal"
 
-#: NewMenuPlugin.php:96
 msgid "Admin"
 msgstr "Admin"
 
-#: NewMenuPlugin.php:97
 msgid "Site configuration"
 msgstr "Configuration del sito"
 
-#: NewMenuPlugin.php:102
 msgid "Logout"
 msgstr "Clauder session"
 
-#: NewMenuPlugin.php:103
 msgid "Logout from the site"
 msgstr "Terminar le session del sito"
 
-#: NewMenuPlugin.php:113
 msgid "Login"
 msgstr "Aperir session"
 
-#: NewMenuPlugin.php:114
 msgid "Login to the site"
 msgstr "Authenticar te a iste sito"
 
-#: NewMenuPlugin.php:121
 msgid "Search"
 msgstr "Recerca"
 
-#: NewMenuPlugin.php:122
 msgid "Search the site"
 msgstr "Cercar in le sito"
 
-#: NewMenuPlugin.php:307
 msgid "IM"
 msgstr "MI"
 
-#: NewMenuPlugin.php:314
 msgid "SMS"
 msgstr "SMS"
 
-#: NewMenuPlugin.php:406
 msgid "A preview of the new menu layout in StatusNet 1.0."
 msgstr "Un previsualisation del nove apparentia del menus in StatusNet 1.0."
diff --git a/plugins/NewMenu/locale/mk/LC_MESSAGES/NewMenu.po b/plugins/NewMenu/locale/mk/LC_MESSAGES/NewMenu.po
index 6c409201d0..759d0c3203 100644
--- a/plugins/NewMenu/locale/mk/LC_MESSAGES/NewMenu.po
+++ b/plugins/NewMenu/locale/mk/LC_MESSAGES/NewMenu.po
@@ -10,89 +10,70 @@ msgstr ""
 "Project-Id-Version: StatusNet - NewMenu\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:30+0000\n"
+"PO-Revision-Date: 2011-03-06 01:37:41+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-20 20:16:04+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:45:38+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-newmenu\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
 
-#: NewMenuPlugin.php:74
 msgid "Home"
 msgstr "Почетна"
 
-#: NewMenuPlugin.php:75
 msgid "Friends timeline"
 msgstr "Хронологија на пријатели"
 
-#: NewMenuPlugin.php:80
 msgid "Profile"
 msgstr "Профил"
 
-#: NewMenuPlugin.php:81
 msgid "Your profile"
 msgstr "Вашиот профил"
 
-#: NewMenuPlugin.php:85 NewMenuPlugin.php:108
 msgid "Public"
 msgstr "Јавно"
 
-#: NewMenuPlugin.php:86 NewMenuPlugin.php:109
 msgid "Everyone on this site"
 msgstr "Секој на мрежново место"
 
-#: NewMenuPlugin.php:90
 msgid "Settings"
 msgstr "Нагодувања"
 
-#: NewMenuPlugin.php:91
 msgid "Change your personal settings"
 msgstr "Промена на личните нагодувања"
 
-#: NewMenuPlugin.php:96
 msgid "Admin"
 msgstr "Админ"
 
-#: NewMenuPlugin.php:97
 msgid "Site configuration"
 msgstr "Поставки за мрежното место"
 
-#: NewMenuPlugin.php:102
 msgid "Logout"
 msgstr "Одјава"
 
-#: NewMenuPlugin.php:103
 msgid "Logout from the site"
 msgstr "Одјава од мрежното место"
 
-#: NewMenuPlugin.php:113
 msgid "Login"
 msgstr "Најава"
 
-#: NewMenuPlugin.php:114
 msgid "Login to the site"
 msgstr "Најава на мрежното место"
 
-#: NewMenuPlugin.php:121
 msgid "Search"
 msgstr "Пребарај"
 
-#: NewMenuPlugin.php:122
 msgid "Search the site"
 msgstr "Пребарување на мрежното место"
 
-#: NewMenuPlugin.php:307
 msgid "IM"
 msgstr "НП"
 
-#: NewMenuPlugin.php:314
 msgid "SMS"
 msgstr "СМС"
 
-#: NewMenuPlugin.php:406
 msgid "A preview of the new menu layout in StatusNet 1.0."
 msgstr "Преглед на новиот распоред на менито во StatusNet 1.0."
diff --git a/plugins/NewMenu/locale/nl/LC_MESSAGES/NewMenu.po b/plugins/NewMenu/locale/nl/LC_MESSAGES/NewMenu.po
index 0670ab301e..7d3c2fced0 100644
--- a/plugins/NewMenu/locale/nl/LC_MESSAGES/NewMenu.po
+++ b/plugins/NewMenu/locale/nl/LC_MESSAGES/NewMenu.po
@@ -10,89 +10,70 @@ msgstr ""
 "Project-Id-Version: StatusNet - NewMenu\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:30+0000\n"
+"PO-Revision-Date: 2011-03-06 01:37:41+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-20 20:16:04+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:45:38+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-newmenu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: NewMenuPlugin.php:74
 msgid "Home"
 msgstr "Hoofdmenu"
 
-#: NewMenuPlugin.php:75
 msgid "Friends timeline"
 msgstr "Tijdlijn van vrienden"
 
-#: NewMenuPlugin.php:80
 msgid "Profile"
 msgstr "Profiel"
 
-#: NewMenuPlugin.php:81
 msgid "Your profile"
 msgstr "Uw profiel"
 
-#: NewMenuPlugin.php:85 NewMenuPlugin.php:108
 msgid "Public"
 msgstr "Publiek"
 
-#: NewMenuPlugin.php:86 NewMenuPlugin.php:109
 msgid "Everyone on this site"
 msgstr "Iedereen binnen deze site"
 
-#: NewMenuPlugin.php:90
 msgid "Settings"
 msgstr "Instellingen"
 
-#: NewMenuPlugin.php:91
 msgid "Change your personal settings"
 msgstr "Uw persoonlijke instellingen wijzigen"
 
-#: NewMenuPlugin.php:96
 msgid "Admin"
 msgstr "Beheer"
 
-#: NewMenuPlugin.php:97
 msgid "Site configuration"
 msgstr "Siteinstellingen"
 
-#: NewMenuPlugin.php:102
 msgid "Logout"
 msgstr "Afmelden"
 
-#: NewMenuPlugin.php:103
 msgid "Logout from the site"
 msgstr "Afmelden van de site"
 
-#: NewMenuPlugin.php:113
 msgid "Login"
 msgstr "Aanmelden"
 
-#: NewMenuPlugin.php:114
 msgid "Login to the site"
 msgstr "Aanmelden bij deze site"
 
-#: NewMenuPlugin.php:121
 msgid "Search"
 msgstr "Zoeken"
 
-#: NewMenuPlugin.php:122
 msgid "Search the site"
 msgstr "De site doorzoeken"
 
-#: NewMenuPlugin.php:307
 msgid "IM"
 msgstr "IM"
 
-#: NewMenuPlugin.php:314
 msgid "SMS"
 msgstr "SMS"
 
-#: NewMenuPlugin.php:406
 msgid "A preview of the new menu layout in StatusNet 1.0."
 msgstr "Een voorproefje van het nieuwe uiterlijk in StatusNet 1.0."
diff --git a/plugins/NewMenu/locale/te/LC_MESSAGES/NewMenu.po b/plugins/NewMenu/locale/te/LC_MESSAGES/NewMenu.po
index fe7ede2ff7..75bb14b00e 100644
--- a/plugins/NewMenu/locale/te/LC_MESSAGES/NewMenu.po
+++ b/plugins/NewMenu/locale/te/LC_MESSAGES/NewMenu.po
@@ -9,90 +9,71 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - NewMenu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-02 23:30+0000\n"
-"PO-Revision-Date: 2011-02-02 23:37:26+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-03-06 01:37:41+0000\n"
 "Language-Team: Telugu <http://translatewiki.net/wiki/Portal:te>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:25:45+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81409); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:45:38+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: te\n"
 "X-Message-Group: #out-statusnet-plugin-newmenu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: NewMenuPlugin.php:74
 msgid "Home"
 msgstr "ముంగిలి"
 
-#: NewMenuPlugin.php:75
 msgid "Friends timeline"
 msgstr "మిత్రుల కాలరేఖ"
 
-#: NewMenuPlugin.php:80
 msgid "Profile"
 msgstr "ప్రొఫైలు"
 
-#: NewMenuPlugin.php:81
 msgid "Your profile"
 msgstr "మీ ప్రొఫైలు"
 
-#: NewMenuPlugin.php:85 NewMenuPlugin.php:108
 msgid "Public"
 msgstr "బహిరంగం"
 
-#: NewMenuPlugin.php:86 NewMenuPlugin.php:109
 msgid "Everyone on this site"
 msgstr "ఈ సైటులోని ప్రతీ ఒక్కరూ"
 
-#: NewMenuPlugin.php:90
 msgid "Settings"
 msgstr "అమరికలు"
 
-#: NewMenuPlugin.php:91
 msgid "Change your personal settings"
 msgstr "మీ వ్యక్తిగత అమరికలను మార్చుకోండి"
 
-#: NewMenuPlugin.php:96
 msgid "Admin"
 msgstr ""
 
-#: NewMenuPlugin.php:97
 msgid "Site configuration"
 msgstr "సైటు స్వరూపణం"
 
-#: NewMenuPlugin.php:102
 msgid "Logout"
 msgstr "నిష్క్రమించు"
 
-#: NewMenuPlugin.php:103
 msgid "Logout from the site"
 msgstr "సైటు నుండి నిష్క్రమించండి"
 
-#: NewMenuPlugin.php:113
 msgid "Login"
 msgstr ""
 
-#: NewMenuPlugin.php:114
 msgid "Login to the site"
 msgstr ""
 
-#: NewMenuPlugin.php:121
 msgid "Search"
 msgstr "వెతుకు"
 
-#: NewMenuPlugin.php:122
 msgid "Search the site"
 msgstr "సైటులో వెతకండి"
 
-#: NewMenuPlugin.php:307
 msgid "IM"
 msgstr ""
 
-#: NewMenuPlugin.php:314
 msgid "SMS"
 msgstr ""
 
-#: NewMenuPlugin.php:406
 msgid "A preview of the new menu layout in StatusNet 1.0."
 msgstr ""
diff --git a/plugins/NewMenu/locale/uk/LC_MESSAGES/NewMenu.po b/plugins/NewMenu/locale/uk/LC_MESSAGES/NewMenu.po
index 297e9820f9..beef07cbe0 100644
--- a/plugins/NewMenu/locale/uk/LC_MESSAGES/NewMenu.po
+++ b/plugins/NewMenu/locale/uk/LC_MESSAGES/NewMenu.po
@@ -10,90 +10,71 @@ msgstr ""
 "Project-Id-Version: StatusNet - NewMenu\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:30+0000\n"
+"PO-Revision-Date: 2011-03-06 01:37:41+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-20 20:16:04+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:45:38+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-newmenu\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: NewMenuPlugin.php:74
 msgid "Home"
 msgstr "Дім"
 
-#: NewMenuPlugin.php:75
 msgid "Friends timeline"
 msgstr "Стрічка друзів"
 
-#: NewMenuPlugin.php:80
 msgid "Profile"
 msgstr "Профіль"
 
-#: NewMenuPlugin.php:81
 msgid "Your profile"
 msgstr "Ваш профіль"
 
-#: NewMenuPlugin.php:85 NewMenuPlugin.php:108
 msgid "Public"
 msgstr "Загал"
 
-#: NewMenuPlugin.php:86 NewMenuPlugin.php:109
 msgid "Everyone on this site"
 msgstr "Всі на цьому сайті"
 
-#: NewMenuPlugin.php:90
 msgid "Settings"
 msgstr "Параметри"
 
-#: NewMenuPlugin.php:91
 msgid "Change your personal settings"
 msgstr "Змінити налаштування профілю"
 
-#: NewMenuPlugin.php:96
 msgid "Admin"
 msgstr "Адмін"
 
-#: NewMenuPlugin.php:97
 msgid "Site configuration"
 msgstr "Конфігурація сайту"
 
-#: NewMenuPlugin.php:102
 msgid "Logout"
 msgstr "Вийти"
 
-#: NewMenuPlugin.php:103
 msgid "Logout from the site"
 msgstr "Вийти з сайту"
 
-#: NewMenuPlugin.php:113
 msgid "Login"
 msgstr "Увійти"
 
-#: NewMenuPlugin.php:114
 msgid "Login to the site"
 msgstr "Увійти на сайт"
 
-#: NewMenuPlugin.php:121
 msgid "Search"
 msgstr "Пошук"
 
-#: NewMenuPlugin.php:122
 msgid "Search the site"
 msgstr "Пошук на сайті"
 
-#: NewMenuPlugin.php:307
 msgid "IM"
 msgstr "ІМ"
 
-#: NewMenuPlugin.php:314
 msgid "SMS"
 msgstr "СМС"
 
-#: NewMenuPlugin.php:406
 msgid "A preview of the new menu layout in StatusNet 1.0."
 msgstr "Попередній перегляд нового макета меню в StatusNet 1.0"
diff --git a/plugins/NewMenu/locale/zh_CN/LC_MESSAGES/NewMenu.po b/plugins/NewMenu/locale/zh_CN/LC_MESSAGES/NewMenu.po
index 8fe563a170..1cb5a9dc10 100644
--- a/plugins/NewMenu/locale/zh_CN/LC_MESSAGES/NewMenu.po
+++ b/plugins/NewMenu/locale/zh_CN/LC_MESSAGES/NewMenu.po
@@ -9,91 +9,72 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - NewMenu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-24 10:32+0000\n"
-"PO-Revision-Date: 2011-02-24 10:39:55+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-03-06 01:37:41+0000\n"
 "Language-Team: Simplified Chinese <http://translatewiki.net/wiki/Portal:zh-"
 "hans>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-14 17:21:59+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r82712); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:45:38+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-newmenu\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: NewMenuPlugin.php:74
 msgid "Home"
 msgstr "首页"
 
-#: NewMenuPlugin.php:75
 msgid "Friends timeline"
 msgstr "时间轴的朋友"
 
-#: NewMenuPlugin.php:80
 msgid "Profile"
 msgstr "配置文件"
 
-#: NewMenuPlugin.php:81
 msgid "Your profile"
 msgstr "您的配置文件"
 
-#: NewMenuPlugin.php:85 NewMenuPlugin.php:108
 msgid "Public"
 msgstr "市民"
 
-#: NewMenuPlugin.php:86 NewMenuPlugin.php:109
 msgid "Everyone on this site"
 msgstr "此站点上的每个人"
 
-#: NewMenuPlugin.php:90
 msgid "Settings"
 msgstr "设置"
 
-#: NewMenuPlugin.php:91
 msgid "Change your personal settings"
 msgstr "更改您的个人设置"
 
-#: NewMenuPlugin.php:96
 msgid "Admin"
 msgstr "管理员"
 
-#: NewMenuPlugin.php:97
 msgid "Site configuration"
 msgstr "网站配置"
 
-#: NewMenuPlugin.php:102
 msgid "Logout"
 msgstr "注销"
 
-#: NewMenuPlugin.php:103
 msgid "Logout from the site"
 msgstr "从网站登出"
 
-#: NewMenuPlugin.php:113
 msgid "Login"
 msgstr "登录"
 
-#: NewMenuPlugin.php:114
 msgid "Login to the site"
 msgstr "登录这个网站"
 
-#: NewMenuPlugin.php:121
 msgid "Search"
 msgstr "搜索"
 
-#: NewMenuPlugin.php:122
 msgid "Search the site"
 msgstr ""
 
-#: NewMenuPlugin.php:307
 msgid "IM"
 msgstr ""
 
-#: NewMenuPlugin.php:314
 msgid "SMS"
 msgstr ""
 
-#: NewMenuPlugin.php:406
 msgid "A preview of the new menu layout in StatusNet 1.0."
 msgstr ""
diff --git a/plugins/NoticeTitle/locale/NoticeTitle.pot b/plugins/NoticeTitle/locale/NoticeTitle.pot
index babb054ff8..14005b0ef6 100644
--- a/plugins/NoticeTitle/locale/NoticeTitle.pot
+++ b/plugins/NoticeTitle/locale/NoticeTitle.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/NoticeTitle/locale/ar/LC_MESSAGES/NoticeTitle.po b/plugins/NoticeTitle/locale/ar/LC_MESSAGES/NoticeTitle.po
index 574eaa808b..29c8ad8a71 100644
--- a/plugins/NoticeTitle/locale/ar/LC_MESSAGES/NoticeTitle.po
+++ b/plugins/NoticeTitle/locale/ar/LC_MESSAGES/NoticeTitle.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - NoticeTitle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:31+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:41+0000\n"
 "Language-Team: Arabic <http://translatewiki.net/wiki/Portal:ar>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:05+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:45:39+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ar\n"
 "X-Message-Group: #out-statusnet-plugin-noticetitle\n"
@@ -23,12 +23,10 @@ msgstr ""
 "2) ? 2 : ( (n%100 >= 3 && n%100 <= 10) ? 3 : ( (n%100 >= 11 && n%100 <= "
 "99) ? 4 : 5 ) ) ) );\n"
 
-#: NoticeTitlePlugin.php:132
 msgid "Adds optional titles to notices."
 msgstr "يضيف عناوين اختيارية إلى الإشعارات."
 
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: NoticeTitlePlugin.php:314
 #, php-format
 msgid "%1$s - %2$s"
 msgstr "%1$s - %2$s"
diff --git a/plugins/NoticeTitle/locale/br/LC_MESSAGES/NoticeTitle.po b/plugins/NoticeTitle/locale/br/LC_MESSAGES/NoticeTitle.po
index 7ae383144d..c642518cad 100644
--- a/plugins/NoticeTitle/locale/br/LC_MESSAGES/NoticeTitle.po
+++ b/plugins/NoticeTitle/locale/br/LC_MESSAGES/NoticeTitle.po
@@ -10,24 +10,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - NoticeTitle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:31+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:41+0000\n"
 "Language-Team: Breton <http://translatewiki.net/wiki/Portal:br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:05+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:45:39+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-noticetitle\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: NoticeTitlePlugin.php:132
 msgid "Adds optional titles to notices."
 msgstr "Ouzhpennañ a ra titloù diret d'ar c'hemennoù."
 
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: NoticeTitlePlugin.php:314
 #, php-format
 msgid "%1$s - %2$s"
 msgstr "%1$s - %2$s"
diff --git a/plugins/NoticeTitle/locale/de/LC_MESSAGES/NoticeTitle.po b/plugins/NoticeTitle/locale/de/LC_MESSAGES/NoticeTitle.po
index 8b2f97a0a2..9d873e4850 100644
--- a/plugins/NoticeTitle/locale/de/LC_MESSAGES/NoticeTitle.po
+++ b/plugins/NoticeTitle/locale/de/LC_MESSAGES/NoticeTitle.po
@@ -9,24 +9,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - NoticeTitle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:31+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:41+0000\n"
 "Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:05+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:45:39+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-noticetitle\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: NoticeTitlePlugin.php:132
 msgid "Adds optional titles to notices."
 msgstr "Fügt Nachrichten optionale Titel hinzu."
 
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: NoticeTitlePlugin.php:314
 #, php-format
 msgid "%1$s - %2$s"
 msgstr "%1$s – %2$s"
diff --git a/plugins/NoticeTitle/locale/fr/LC_MESSAGES/NoticeTitle.po b/plugins/NoticeTitle/locale/fr/LC_MESSAGES/NoticeTitle.po
index 6b725e4b3a..b7e3c6160f 100644
--- a/plugins/NoticeTitle/locale/fr/LC_MESSAGES/NoticeTitle.po
+++ b/plugins/NoticeTitle/locale/fr/LC_MESSAGES/NoticeTitle.po
@@ -9,24 +9,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - NoticeTitle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:31+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:41+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:05+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:45:39+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-noticetitle\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: NoticeTitlePlugin.php:132
 msgid "Adds optional titles to notices."
 msgstr "Ajoute des titres optionnels aux avis."
 
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: NoticeTitlePlugin.php:314
 #, php-format
 msgid "%1$s - %2$s"
 msgstr "%1$s — %2$s"
diff --git a/plugins/NoticeTitle/locale/he/LC_MESSAGES/NoticeTitle.po b/plugins/NoticeTitle/locale/he/LC_MESSAGES/NoticeTitle.po
index c1244362c1..3d58e557df 100644
--- a/plugins/NoticeTitle/locale/he/LC_MESSAGES/NoticeTitle.po
+++ b/plugins/NoticeTitle/locale/he/LC_MESSAGES/NoticeTitle.po
@@ -9,24 +9,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - NoticeTitle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:31+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:41+0000\n"
 "Language-Team: Hebrew <http://translatewiki.net/wiki/Portal:he>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:05+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:45:39+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-plugin-noticetitle\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: NoticeTitlePlugin.php:132
 msgid "Adds optional titles to notices."
 msgstr "הוספת כותרת (לא הכרחית) להתרעות."
 
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: NoticeTitlePlugin.php:314
 #, php-format
 msgid "%1$s - %2$s"
 msgstr "%1$s – %2$s"
diff --git a/plugins/NoticeTitle/locale/ia/LC_MESSAGES/NoticeTitle.po b/plugins/NoticeTitle/locale/ia/LC_MESSAGES/NoticeTitle.po
index 1d573eaa7b..4fee337b0e 100644
--- a/plugins/NoticeTitle/locale/ia/LC_MESSAGES/NoticeTitle.po
+++ b/plugins/NoticeTitle/locale/ia/LC_MESSAGES/NoticeTitle.po
@@ -9,24 +9,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - NoticeTitle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:31+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:41+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:05+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:45:39+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-noticetitle\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: NoticeTitlePlugin.php:132
 msgid "Adds optional titles to notices."
 msgstr "Adde optional titulos a notas."
 
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: NoticeTitlePlugin.php:314
 #, php-format
 msgid "%1$s - %2$s"
 msgstr "%1$s - %2$s"
diff --git a/plugins/NoticeTitle/locale/mk/LC_MESSAGES/NoticeTitle.po b/plugins/NoticeTitle/locale/mk/LC_MESSAGES/NoticeTitle.po
index 1ef0b05bff..5b258231a4 100644
--- a/plugins/NoticeTitle/locale/mk/LC_MESSAGES/NoticeTitle.po
+++ b/plugins/NoticeTitle/locale/mk/LC_MESSAGES/NoticeTitle.po
@@ -9,24 +9,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - NoticeTitle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:31+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:42+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:05+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:45:39+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-noticetitle\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
 
-#: NoticeTitlePlugin.php:132
 msgid "Adds optional titles to notices."
 msgstr "Додава наслови на забелешките (по избор)."
 
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: NoticeTitlePlugin.php:314
 #, php-format
 msgid "%1$s - %2$s"
 msgstr "%1$s - %2$s"
diff --git a/plugins/NoticeTitle/locale/nb/LC_MESSAGES/NoticeTitle.po b/plugins/NoticeTitle/locale/nb/LC_MESSAGES/NoticeTitle.po
index b3a2e5360c..55e7457a4f 100644
--- a/plugins/NoticeTitle/locale/nb/LC_MESSAGES/NoticeTitle.po
+++ b/plugins/NoticeTitle/locale/nb/LC_MESSAGES/NoticeTitle.po
@@ -9,24 +9,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - NoticeTitle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:31+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:42+0000\n"
 "Language-Team: Norwegian (bokmål)‬ <http://translatewiki.net/wiki/Portal:no>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:05+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:45:39+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: #out-statusnet-plugin-noticetitle\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: NoticeTitlePlugin.php:132
 msgid "Adds optional titles to notices."
 msgstr "Legger valgfrie titler til notiser."
 
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: NoticeTitlePlugin.php:314
 #, php-format
 msgid "%1$s - %2$s"
 msgstr "%1$s - %2$s"
diff --git a/plugins/NoticeTitle/locale/ne/LC_MESSAGES/NoticeTitle.po b/plugins/NoticeTitle/locale/ne/LC_MESSAGES/NoticeTitle.po
index eb4c85bdaf..d990804173 100644
--- a/plugins/NoticeTitle/locale/ne/LC_MESSAGES/NoticeTitle.po
+++ b/plugins/NoticeTitle/locale/ne/LC_MESSAGES/NoticeTitle.po
@@ -9,24 +9,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - NoticeTitle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:31+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:42+0000\n"
 "Language-Team: Nepali <http://translatewiki.net/wiki/Portal:ne>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:05+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:45:39+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ne\n"
 "X-Message-Group: #out-statusnet-plugin-noticetitle\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: NoticeTitlePlugin.php:132
 msgid "Adds optional titles to notices."
 msgstr "सूचनाकोलागि वैकल्पिक शीर्षकहरु जोड्छ"
 
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: NoticeTitlePlugin.php:314
 #, php-format
 msgid "%1$s - %2$s"
 msgstr "%1$s - %2$s"
diff --git a/plugins/NoticeTitle/locale/nl/LC_MESSAGES/NoticeTitle.po b/plugins/NoticeTitle/locale/nl/LC_MESSAGES/NoticeTitle.po
index 86d0ae00bb..84bea51473 100644
--- a/plugins/NoticeTitle/locale/nl/LC_MESSAGES/NoticeTitle.po
+++ b/plugins/NoticeTitle/locale/nl/LC_MESSAGES/NoticeTitle.po
@@ -9,24 +9,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - NoticeTitle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:31+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:42+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:05+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:45:39+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-noticetitle\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: NoticeTitlePlugin.php:132
 msgid "Adds optional titles to notices."
 msgstr "Voegt optioneel titels toe aan mededelingen."
 
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: NoticeTitlePlugin.php:314
 #, php-format
 msgid "%1$s - %2$s"
 msgstr "%1$s - %2$s"
diff --git a/plugins/NoticeTitle/locale/pl/LC_MESSAGES/NoticeTitle.po b/plugins/NoticeTitle/locale/pl/LC_MESSAGES/NoticeTitle.po
index 6645d10dd8..b88fea6016 100644
--- a/plugins/NoticeTitle/locale/pl/LC_MESSAGES/NoticeTitle.po
+++ b/plugins/NoticeTitle/locale/pl/LC_MESSAGES/NoticeTitle.po
@@ -9,25 +9,23 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - NoticeTitle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:31+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:42+0000\n"
 "Language-Team: Polish <http://translatewiki.net/wiki/Portal:pl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:05+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:45:39+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pl\n"
 "X-Message-Group: #out-statusnet-plugin-noticetitle\n"
 "Plural-Forms: nplurals=3; plural=(n == 1) ? 0 : ( (n%10 >= 2 && n%10 <= 4 && "
 "(n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: NoticeTitlePlugin.php:132
 msgid "Adds optional titles to notices."
 msgstr ""
 
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: NoticeTitlePlugin.php:314
 #, php-format
 msgid "%1$s - %2$s"
 msgstr "%1$s - %2$s"
diff --git a/plugins/NoticeTitle/locale/ru/LC_MESSAGES/NoticeTitle.po b/plugins/NoticeTitle/locale/ru/LC_MESSAGES/NoticeTitle.po
index 20dde0703d..14273aad0e 100644
--- a/plugins/NoticeTitle/locale/ru/LC_MESSAGES/NoticeTitle.po
+++ b/plugins/NoticeTitle/locale/ru/LC_MESSAGES/NoticeTitle.po
@@ -9,25 +9,23 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - NoticeTitle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:31+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:42+0000\n"
 "Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:05+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:45:39+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-noticetitle\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: NoticeTitlePlugin.php:132
 msgid "Adds optional titles to notices."
 msgstr "Добавляет необязательный заголовок для сообщений."
 
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: NoticeTitlePlugin.php:314
 #, php-format
 msgid "%1$s - %2$s"
 msgstr "%1$s — %2$s"
diff --git a/plugins/NoticeTitle/locale/te/LC_MESSAGES/NoticeTitle.po b/plugins/NoticeTitle/locale/te/LC_MESSAGES/NoticeTitle.po
index 3140493f65..0db49db683 100644
--- a/plugins/NoticeTitle/locale/te/LC_MESSAGES/NoticeTitle.po
+++ b/plugins/NoticeTitle/locale/te/LC_MESSAGES/NoticeTitle.po
@@ -9,24 +9,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - NoticeTitle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:32+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:42+0000\n"
 "Language-Team: Telugu <http://translatewiki.net/wiki/Portal:te>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:05+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:45:39+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: te\n"
 "X-Message-Group: #out-statusnet-plugin-noticetitle\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: NoticeTitlePlugin.php:132
 msgid "Adds optional titles to notices."
 msgstr ""
 
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: NoticeTitlePlugin.php:314
 #, php-format
 msgid "%1$s - %2$s"
 msgstr "%1$s - %2$s"
diff --git a/plugins/NoticeTitle/locale/tl/LC_MESSAGES/NoticeTitle.po b/plugins/NoticeTitle/locale/tl/LC_MESSAGES/NoticeTitle.po
index 91c19e793d..0f1fa862ed 100644
--- a/plugins/NoticeTitle/locale/tl/LC_MESSAGES/NoticeTitle.po
+++ b/plugins/NoticeTitle/locale/tl/LC_MESSAGES/NoticeTitle.po
@@ -9,24 +9,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - NoticeTitle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:32+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:42+0000\n"
 "Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:05+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:45:39+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-noticetitle\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: NoticeTitlePlugin.php:132
 msgid "Adds optional titles to notices."
 msgstr "Nagdaragdag ng maaaring wala na mga pamagat sa mga pabatid."
 
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: NoticeTitlePlugin.php:314
 #, php-format
 msgid "%1$s - %2$s"
 msgstr " %1$s - %2$s"
diff --git a/plugins/NoticeTitle/locale/uk/LC_MESSAGES/NoticeTitle.po b/plugins/NoticeTitle/locale/uk/LC_MESSAGES/NoticeTitle.po
index d8d7dc497e..9b4ebfa814 100644
--- a/plugins/NoticeTitle/locale/uk/LC_MESSAGES/NoticeTitle.po
+++ b/plugins/NoticeTitle/locale/uk/LC_MESSAGES/NoticeTitle.po
@@ -9,25 +9,23 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - NoticeTitle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:32+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:42+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:05+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:45:39+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-noticetitle\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: NoticeTitlePlugin.php:132
 msgid "Adds optional titles to notices."
 msgstr "Додавати до повідомлень необов’язкові заголовки."
 
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: NoticeTitlePlugin.php:314
 #, php-format
 msgid "%1$s - %2$s"
 msgstr "%1$s — %2$s"
diff --git a/plugins/NoticeTitle/locale/zh_CN/LC_MESSAGES/NoticeTitle.po b/plugins/NoticeTitle/locale/zh_CN/LC_MESSAGES/NoticeTitle.po
index 0a5f69783c..88b815b79e 100644
--- a/plugins/NoticeTitle/locale/zh_CN/LC_MESSAGES/NoticeTitle.po
+++ b/plugins/NoticeTitle/locale/zh_CN/LC_MESSAGES/NoticeTitle.po
@@ -9,25 +9,23 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - NoticeTitle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:32+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:42+0000\n"
 "Language-Team: Simplified Chinese <http://translatewiki.net/wiki/Portal:zh-"
 "hans>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:05+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:45:39+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-noticetitle\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: NoticeTitlePlugin.php:132
 msgid "Adds optional titles to notices."
 msgstr "为消息添加可选的标题。"
 
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: NoticeTitlePlugin.php:314
 #, php-format
 msgid "%1$s - %2$s"
 msgstr ""
diff --git a/plugins/OStatus/locale/OStatus.pot b/plugins/OStatus/locale/OStatus.pot
index ce414e189c..6766922f12 100644
--- a/plugins/OStatus/locale/OStatus.pot
+++ b/plugins/OStatus/locale/OStatus.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,6 +16,10 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: tests/gettext-speedtest.php:57
+msgid "Feeds"
+msgstr ""
+
 #. TRANS: Link description for link to subscribe to a remote user.
 #. TRANS: Link text for a user to subscribe to an OStatus user.
 #: OStatusPlugin.php:223 OStatusPlugin.php:933
@@ -111,6 +115,388 @@ msgid ""
 "org/\">OStatus</a>."
 msgstr ""
 
+#. TRANS: Client exception.
+#: actions/pushhub.php:70
+msgid "Publishing outside feeds not supported."
+msgstr ""
+
+#. TRANS: Client exception. %s is a mode.
+#: actions/pushhub.php:73
+#, php-format
+msgid "Unrecognized mode \"%s\"."
+msgstr ""
+
+#. TRANS: Client exception. %s is a topic.
+#: actions/pushhub.php:93
+#, php-format
+msgid ""
+"Unsupported hub.topic %s this hub only serves local user and group Atom "
+"feeds."
+msgstr ""
+
+#. TRANS: Client exception.
+#: actions/pushhub.php:99
+#, php-format
+msgid "Invalid hub.verify \"%s\". It must be sync or async."
+msgstr ""
+
+#. TRANS: Client exception.
+#: actions/pushhub.php:105
+#, php-format
+msgid "Invalid hub.lease \"%s\". It must be empty or positive integer."
+msgstr ""
+
+#. TRANS: Client exception.
+#: actions/pushhub.php:113
+#, php-format
+msgid "Invalid hub.secret \"%s\". It must be under 200 bytes."
+msgstr ""
+
+#. TRANS: Client exception.
+#: actions/pushhub.php:165
+#, php-format
+msgid "Invalid hub.topic \"%s\". User doesn't exist."
+msgstr ""
+
+#. TRANS: Client exception.
+#: actions/pushhub.php:174
+#, php-format
+msgid "Invalid hub.topic \"%s\". Group doesn't exist."
+msgstr ""
+
+#. TRANS: Client exception.
+#. TRANS: %1$s is this argument to the method this exception occurs in, %2$s is a URL.
+#: actions/pushhub.php:199
+#, php-format
+msgid "Invalid URL passed for %1$s: \"%2$s\""
+msgstr ""
+
+#: actions/pushcallback.php:50
+msgid "Empty or invalid feed id."
+msgstr ""
+
+#. TRANS: Server exception. %s is a feed ID.
+#: actions/pushcallback.php:56
+#, php-format
+msgid "Unknown PuSH feed id %s"
+msgstr ""
+
+#. TRANS: Client exception. %s is an invalid feed name.
+#: actions/pushcallback.php:96
+#, php-format
+msgid "Bad hub.topic feed \"%s\"."
+msgstr ""
+
+#. TRANS: Client exception. %1$s the invalid token, %2$s is the topic for which the invalid token was given.
+#: actions/pushcallback.php:101
+#, php-format
+msgid "Bad hub.verify_token %1$s for %2$s."
+msgstr ""
+
+#. TRANS: Client exception. %s is an invalid topic.
+#: actions/pushcallback.php:108
+#, php-format
+msgid "Unexpected subscribe request for %s."
+msgstr ""
+
+#. TRANS: Client exception. %s is an invalid topic.
+#: actions/pushcallback.php:113
+#, php-format
+msgid "Unexpected unsubscribe request for %s."
+msgstr ""
+
+#: actions/ownerxrd.php:39 actions/usersalmon.php:43
+msgid "No such user."
+msgstr ""
+
+#. TRANS: Field label for a field that takes an OStatus user address.
+#: actions/ostatussub.php:68
+msgid "Subscribe to"
+msgstr ""
+
+#. TRANS: Tooltip for field label "Subscribe to".
+#: actions/ostatussub.php:71
+msgid ""
+"OStatus user's address, like nickname@example.com or http://example.net/"
+"nickname"
+msgstr ""
+
+#. TRANS: Button text.
+#: actions/ostatussub.php:75 actions/ostatusgroup.php:86
+msgctxt "BUTTON"
+msgid "Continue"
+msgstr ""
+
+#. TRANS: Button text.
+#. TRANS: Tooltip for button "Join".
+#: actions/ostatussub.php:112
+msgctxt "BUTTON"
+msgid "Join this group"
+msgstr ""
+
+#. TRANS: Button text.
+#: actions/ostatussub.php:115
+msgctxt "BUTTON"
+msgid "Confirm"
+msgstr ""
+
+#. TRANS: Tooltip for button "Confirm".
+#: actions/ostatussub.php:117
+msgid "Subscribe to this user"
+msgstr ""
+
+#: actions/ostatussub.php:138
+msgid "You are already subscribed to this user."
+msgstr ""
+
+#. TRANS: Error text.
+#: actions/ostatussub.php:232 actions/ostatussub.php:239
+#: actions/ostatussub.php:264
+msgid ""
+"Sorry, we could not reach that address. Please make sure that the OStatus "
+"address is like nickname@example.com or http://example.net/nickname."
+msgstr ""
+
+#. TRANS: Error text.
+#: actions/ostatussub.php:243 actions/ostatussub.php:247
+#: actions/ostatussub.php:251 actions/ostatussub.php:255
+#: actions/ostatussub.php:259
+msgid ""
+"Sorry, we could not reach that feed. Please try that OStatus address again "
+"later."
+msgstr ""
+
+#. TRANS: OStatus remote subscription dialog error.
+#: actions/ostatussub.php:293
+msgid "Already subscribed!"
+msgstr ""
+
+#. TRANS: OStatus remote subscription dialog error.
+#: actions/ostatussub.php:298
+msgid "Remote subscription failed!"
+msgstr ""
+
+#: actions/ostatussub.php:345 actions/ostatusinit.php:64
+msgid "There was a problem with your session token. Try again, please."
+msgstr ""
+
+#. TRANS: Form title.
+#: actions/ostatussub.php:373 actions/ostatusinit.php:83
+msgid "Subscribe to user"
+msgstr ""
+
+#. TRANS: Page title for OStatus remote subscription form
+#: actions/ostatussub.php:393
+msgid "Confirm"
+msgstr ""
+
+#. TRANS: Instructions.
+#: actions/ostatussub.php:405
+msgid ""
+"You can subscribe to users from other supported sites. Paste their address "
+"or profile URI below:"
+msgstr ""
+
+#. TRANS: Field label.
+#: actions/ostatusgroup.php:78
+msgid "Join group"
+msgstr ""
+
+#. TRANS: Tooltip for field label "Join group".
+#: actions/ostatusgroup.php:81
+msgid "OStatus group's address, like http://example.net/group/nickname."
+msgstr ""
+
+#: actions/ostatusgroup.php:105
+msgid "You are already a member of this group."
+msgstr ""
+
+#. TRANS: OStatus remote group subscription dialog error.
+#: actions/ostatusgroup.php:140
+msgid "Already a member!"
+msgstr ""
+
+#. TRANS: OStatus remote group subscription dialog error.
+#: actions/ostatusgroup.php:151
+msgid "Remote group join failed!"
+msgstr ""
+
+#. TRANS: OStatus remote group subscription dialog error.
+#: actions/ostatusgroup.php:155
+msgid "Remote group join aborted!"
+msgstr ""
+
+#. TRANS: Page title for OStatus remote group join form
+#: actions/ostatusgroup.php:167
+msgid "Confirm joining remote group"
+msgstr ""
+
+#. TRANS: Instructions.
+#: actions/ostatusgroup.php:178
+msgid ""
+"You can subscribe to groups from other supported sites. Paste the group's "
+"profile URI below:"
+msgstr ""
+
+#. TRANS: Client error.
+#: actions/usersalmon.php:37 actions/groupsalmon.php:40
+msgid "No ID."
+msgstr ""
+
+#. TRANS: Client exception.
+#: actions/usersalmon.php:83
+msgid "In reply to unknown notice."
+msgstr ""
+
+#. TRANS: Client exception.
+#: actions/usersalmon.php:88
+msgid "In reply to a notice not by this user and not mentioning this user."
+msgstr ""
+
+#. TRANS: Client exception.
+#: actions/usersalmon.php:165
+msgid "Could not save new favorite."
+msgstr ""
+
+#. TRANS: Client exception.
+#: actions/usersalmon.php:197
+msgid "Can't favorite/unfavorite without an object."
+msgstr ""
+
+#. TRANS: Client exception.
+#: actions/usersalmon.php:209
+msgid "Can't handle that kind of object for liking/faving."
+msgstr ""
+
+#. TRANS: Client exception. %s is an object ID.
+#: actions/usersalmon.php:216
+#, php-format
+msgid "Notice with ID %s unknown."
+msgstr ""
+
+#. TRANS: Client exception. %1$s is a notice ID, %2$s is a user ID.
+#: actions/usersalmon.php:221
+#, php-format
+msgid "Notice with ID %1$s not posted by %2$s."
+msgstr ""
+
+#. TRANS: Client error.
+#: actions/groupsalmon.php:47
+msgid "No such group."
+msgstr ""
+
+#. TRANS: Client error.
+#: actions/groupsalmon.php:56
+msgid "Can't accept remote posts for a remote group."
+msgstr ""
+
+#. TRANS: Client error.
+#: actions/groupsalmon.php:130
+msgid "Can't read profile to set up group membership."
+msgstr ""
+
+#. TRANS: Client error.
+#: actions/groupsalmon.php:134 actions/groupsalmon.php:177
+msgid "Groups can't join groups."
+msgstr ""
+
+#: actions/groupsalmon.php:147
+msgid "You have been blocked from that group by the admin."
+msgstr ""
+
+#. TRANS: Server error. %1$s is a profile URI, %2$s is a group nickname.
+#: actions/groupsalmon.php:162
+#, php-format
+msgid "Could not join remote user %1$s to group %2$s."
+msgstr ""
+
+#: actions/groupsalmon.php:174
+msgid "Can't read profile to cancel group membership."
+msgstr ""
+
+#. TRANS: Server error. %1$s is a profile URI, %2$s is a group nickname.
+#: actions/groupsalmon.php:191
+#, php-format
+msgid "Could not remove remote user %1$s from group %2$s."
+msgstr ""
+
+#. TRANS: Client error.
+#: actions/ostatusinit.php:42
+msgid "You can use the local subscription!"
+msgstr ""
+
+#. TRANS: Form legend.
+#: actions/ostatusinit.php:98
+#, php-format
+msgid "Join group %s"
+msgstr ""
+
+#. TRANS: Button text.
+#: actions/ostatusinit.php:100
+msgctxt "BUTTON"
+msgid "Join"
+msgstr ""
+
+#. TRANS: Form legend.
+#: actions/ostatusinit.php:103
+#, php-format
+msgid "Subscribe to %s"
+msgstr ""
+
+#. TRANS: Button text.
+#: actions/ostatusinit.php:105
+msgctxt "BUTTON"
+msgid "Subscribe"
+msgstr ""
+
+#. TRANS: Field label.
+#: actions/ostatusinit.php:119
+msgid "Group nickname"
+msgstr ""
+
+#: actions/ostatusinit.php:120
+msgid "Nickname of the group you want to join."
+msgstr ""
+
+#. TRANS: Field label.
+#: actions/ostatusinit.php:123
+msgid "User nickname"
+msgstr ""
+
+#: actions/ostatusinit.php:124
+msgid "Nickname of the user you want to follow."
+msgstr ""
+
+#. TRANS: Field label.
+#: actions/ostatusinit.php:129
+msgid "Profile Account"
+msgstr ""
+
+#. TRANS: Tooltip for field label "Profile Account".
+#: actions/ostatusinit.php:131
+msgid "Your account id (e.g. user@identi.ca)."
+msgstr ""
+
+#. TRANS: Client error.
+#: actions/ostatusinit.php:153
+msgid "Must provide a remote profile."
+msgstr ""
+
+#. TRANS: Client error.
+#: actions/ostatusinit.php:165
+msgid "Couldn't look up OStatus account profile."
+msgstr ""
+
+#. TRANS: Client error.
+#: actions/ostatusinit.php:178
+msgid "Couldn't confirm remote profile address."
+msgstr ""
+
+#. TRANS: Page title.
+#: actions/ostatusinit.php:223
+msgid "OStatus Connect"
+msgstr ""
+
 #: classes/FeedSub.php:252
 msgid "Attempting to start PuSH subscription for feed with no hub."
 msgstr ""
@@ -267,6 +653,16 @@ msgstr ""
 msgid "Callback returned status: %1$s. Body: %2$s"
 msgstr ""
 
+#. TRANS: Exception.
+#: lib/magicenvelope.php:80
+msgid "Unable to locate signer public key."
+msgstr ""
+
+#. TRANS: Exception.
+#: lib/salmon.php:126
+msgid "Salmon invalid actor for signing."
+msgstr ""
+
 #. TRANS: Client error. POST is a HTTP command. It should not be translated.
 #: lib/salmonaction.php:43
 msgid "This method requires a POST."
@@ -336,399 +732,3 @@ msgstr ""
 #: lib/salmonaction.php:200
 msgid "Received a salmon slap from unidentified actor."
 msgstr ""
-
-#. TRANS: Exception.
-#: lib/magicenvelope.php:80
-msgid "Unable to locate signer public key."
-msgstr ""
-
-#. TRANS: Exception.
-#: lib/salmon.php:126
-msgid "Salmon invalid actor for signing."
-msgstr ""
-
-#: tests/gettext-speedtest.php:57
-msgid "Feeds"
-msgstr ""
-
-#. TRANS: Client exception.
-#: actions/pushhub.php:70
-msgid "Publishing outside feeds not supported."
-msgstr ""
-
-#. TRANS: Client exception. %s is a mode.
-#: actions/pushhub.php:73
-#, php-format
-msgid "Unrecognized mode \"%s\"."
-msgstr ""
-
-#. TRANS: Client exception. %s is a topic.
-#: actions/pushhub.php:93
-#, php-format
-msgid ""
-"Unsupported hub.topic %s this hub only serves local user and group Atom "
-"feeds."
-msgstr ""
-
-#. TRANS: Client exception.
-#: actions/pushhub.php:99
-#, php-format
-msgid "Invalid hub.verify \"%s\". It must be sync or async."
-msgstr ""
-
-#. TRANS: Client exception.
-#: actions/pushhub.php:105
-#, php-format
-msgid "Invalid hub.lease \"%s\". It must be empty or positive integer."
-msgstr ""
-
-#. TRANS: Client exception.
-#: actions/pushhub.php:113
-#, php-format
-msgid "Invalid hub.secret \"%s\". It must be under 200 bytes."
-msgstr ""
-
-#. TRANS: Client exception.
-#: actions/pushhub.php:165
-#, php-format
-msgid "Invalid hub.topic \"%s\". User doesn't exist."
-msgstr ""
-
-#. TRANS: Client exception.
-#: actions/pushhub.php:174
-#, php-format
-msgid "Invalid hub.topic \"%s\". Group doesn't exist."
-msgstr ""
-
-#. TRANS: Client exception.
-#. TRANS: %1$s is this argument to the method this exception occurs in, %2$s is a URL.
-#: actions/pushhub.php:199
-#, php-format
-msgid "Invalid URL passed for %1$s: \"%2$s\""
-msgstr ""
-
-#: actions/ownerxrd.php:39 actions/usersalmon.php:43
-msgid "No such user."
-msgstr ""
-
-#. TRANS: Client error.
-#: actions/usersalmon.php:37 actions/groupsalmon.php:40
-msgid "No ID."
-msgstr ""
-
-#. TRANS: Client exception.
-#: actions/usersalmon.php:83
-msgid "In reply to unknown notice."
-msgstr ""
-
-#. TRANS: Client exception.
-#: actions/usersalmon.php:88
-msgid "In reply to a notice not by this user and not mentioning this user."
-msgstr ""
-
-#. TRANS: Client exception.
-#: actions/usersalmon.php:165
-msgid "Could not save new favorite."
-msgstr ""
-
-#. TRANS: Client exception.
-#: actions/usersalmon.php:197
-msgid "Can't favorite/unfavorite without an object."
-msgstr ""
-
-#. TRANS: Client exception.
-#: actions/usersalmon.php:209
-msgid "Can't handle that kind of object for liking/faving."
-msgstr ""
-
-#. TRANS: Client exception. %s is an object ID.
-#: actions/usersalmon.php:216
-#, php-format
-msgid "Notice with ID %s unknown."
-msgstr ""
-
-#. TRANS: Client exception. %1$s is a notice ID, %2$s is a user ID.
-#: actions/usersalmon.php:221
-#, php-format
-msgid "Notice with ID %1$s not posted by %2$s."
-msgstr ""
-
-#. TRANS: Field label.
-#: actions/ostatusgroup.php:78
-msgid "Join group"
-msgstr ""
-
-#. TRANS: Tooltip for field label "Join group".
-#: actions/ostatusgroup.php:81
-msgid "OStatus group's address, like http://example.net/group/nickname."
-msgstr ""
-
-#. TRANS: Button text.
-#: actions/ostatusgroup.php:86 actions/ostatussub.php:75
-msgctxt "BUTTON"
-msgid "Continue"
-msgstr ""
-
-#: actions/ostatusgroup.php:105
-msgid "You are already a member of this group."
-msgstr ""
-
-#. TRANS: OStatus remote group subscription dialog error.
-#: actions/ostatusgroup.php:140
-msgid "Already a member!"
-msgstr ""
-
-#. TRANS: OStatus remote group subscription dialog error.
-#: actions/ostatusgroup.php:151
-msgid "Remote group join failed!"
-msgstr ""
-
-#. TRANS: OStatus remote group subscription dialog error.
-#: actions/ostatusgroup.php:155
-msgid "Remote group join aborted!"
-msgstr ""
-
-#. TRANS: Page title for OStatus remote group join form
-#: actions/ostatusgroup.php:167
-msgid "Confirm joining remote group"
-msgstr ""
-
-#. TRANS: Instructions.
-#: actions/ostatusgroup.php:178
-msgid ""
-"You can subscribe to groups from other supported sites. Paste the group's "
-"profile URI below:"
-msgstr ""
-
-#. TRANS: Client error.
-#: actions/groupsalmon.php:47
-msgid "No such group."
-msgstr ""
-
-#. TRANS: Client error.
-#: actions/groupsalmon.php:56
-msgid "Can't accept remote posts for a remote group."
-msgstr ""
-
-#. TRANS: Client error.
-#: actions/groupsalmon.php:130
-msgid "Can't read profile to set up group membership."
-msgstr ""
-
-#. TRANS: Client error.
-#: actions/groupsalmon.php:134 actions/groupsalmon.php:177
-msgid "Groups can't join groups."
-msgstr ""
-
-#: actions/groupsalmon.php:147
-msgid "You have been blocked from that group by the admin."
-msgstr ""
-
-#. TRANS: Server error. %1$s is a profile URI, %2$s is a group nickname.
-#: actions/groupsalmon.php:162
-#, php-format
-msgid "Could not join remote user %1$s to group %2$s."
-msgstr ""
-
-#: actions/groupsalmon.php:174
-msgid "Can't read profile to cancel group membership."
-msgstr ""
-
-#. TRANS: Server error. %1$s is a profile URI, %2$s is a group nickname.
-#: actions/groupsalmon.php:191
-#, php-format
-msgid "Could not remove remote user %1$s from group %2$s."
-msgstr ""
-
-#. TRANS: Field label for a field that takes an OStatus user address.
-#: actions/ostatussub.php:68
-msgid "Subscribe to"
-msgstr ""
-
-#. TRANS: Tooltip for field label "Subscribe to".
-#: actions/ostatussub.php:71
-msgid ""
-"OStatus user's address, like nickname@example.com or http://example.net/"
-"nickname"
-msgstr ""
-
-#. TRANS: Button text.
-#. TRANS: Tooltip for button "Join".
-#: actions/ostatussub.php:112
-msgctxt "BUTTON"
-msgid "Join this group"
-msgstr ""
-
-#. TRANS: Button text.
-#: actions/ostatussub.php:115
-msgctxt "BUTTON"
-msgid "Confirm"
-msgstr ""
-
-#. TRANS: Tooltip for button "Confirm".
-#: actions/ostatussub.php:117
-msgid "Subscribe to this user"
-msgstr ""
-
-#: actions/ostatussub.php:138
-msgid "You are already subscribed to this user."
-msgstr ""
-
-#. TRANS: Error text.
-#: actions/ostatussub.php:232 actions/ostatussub.php:239
-#: actions/ostatussub.php:264
-msgid ""
-"Sorry, we could not reach that address. Please make sure that the OStatus "
-"address is like nickname@example.com or http://example.net/nickname."
-msgstr ""
-
-#. TRANS: Error text.
-#: actions/ostatussub.php:243 actions/ostatussub.php:247
-#: actions/ostatussub.php:251 actions/ostatussub.php:255
-#: actions/ostatussub.php:259
-msgid ""
-"Sorry, we could not reach that feed. Please try that OStatus address again "
-"later."
-msgstr ""
-
-#. TRANS: OStatus remote subscription dialog error.
-#: actions/ostatussub.php:293
-msgid "Already subscribed!"
-msgstr ""
-
-#. TRANS: OStatus remote subscription dialog error.
-#: actions/ostatussub.php:298
-msgid "Remote subscription failed!"
-msgstr ""
-
-#: actions/ostatussub.php:345 actions/ostatusinit.php:64
-msgid "There was a problem with your session token. Try again, please."
-msgstr ""
-
-#. TRANS: Form title.
-#: actions/ostatussub.php:373 actions/ostatusinit.php:83
-msgid "Subscribe to user"
-msgstr ""
-
-#. TRANS: Page title for OStatus remote subscription form
-#: actions/ostatussub.php:393
-msgid "Confirm"
-msgstr ""
-
-#. TRANS: Instructions.
-#: actions/ostatussub.php:405
-msgid ""
-"You can subscribe to users from other supported sites. Paste their address "
-"or profile URI below:"
-msgstr ""
-
-#. TRANS: Client error.
-#: actions/ostatusinit.php:42
-msgid "You can use the local subscription!"
-msgstr ""
-
-#. TRANS: Form legend.
-#: actions/ostatusinit.php:98
-#, php-format
-msgid "Join group %s"
-msgstr ""
-
-#. TRANS: Button text.
-#: actions/ostatusinit.php:100
-msgctxt "BUTTON"
-msgid "Join"
-msgstr ""
-
-#. TRANS: Form legend.
-#: actions/ostatusinit.php:103
-#, php-format
-msgid "Subscribe to %s"
-msgstr ""
-
-#. TRANS: Button text.
-#: actions/ostatusinit.php:105
-msgctxt "BUTTON"
-msgid "Subscribe"
-msgstr ""
-
-#. TRANS: Field label.
-#: actions/ostatusinit.php:119
-msgid "Group nickname"
-msgstr ""
-
-#: actions/ostatusinit.php:120
-msgid "Nickname of the group you want to join."
-msgstr ""
-
-#. TRANS: Field label.
-#: actions/ostatusinit.php:123
-msgid "User nickname"
-msgstr ""
-
-#: actions/ostatusinit.php:124
-msgid "Nickname of the user you want to follow."
-msgstr ""
-
-#. TRANS: Field label.
-#: actions/ostatusinit.php:129
-msgid "Profile Account"
-msgstr ""
-
-#. TRANS: Tooltip for field label "Profile Account".
-#: actions/ostatusinit.php:131
-msgid "Your account id (e.g. user@identi.ca)."
-msgstr ""
-
-#. TRANS: Client error.
-#: actions/ostatusinit.php:153
-msgid "Must provide a remote profile."
-msgstr ""
-
-#. TRANS: Client error.
-#: actions/ostatusinit.php:165
-msgid "Couldn't look up OStatus account profile."
-msgstr ""
-
-#. TRANS: Client error.
-#: actions/ostatusinit.php:178
-msgid "Couldn't confirm remote profile address."
-msgstr ""
-
-#. TRANS: Page title.
-#: actions/ostatusinit.php:223
-msgid "OStatus Connect"
-msgstr ""
-
-#: actions/pushcallback.php:50
-msgid "Empty or invalid feed id."
-msgstr ""
-
-#. TRANS: Server exception. %s is a feed ID.
-#: actions/pushcallback.php:56
-#, php-format
-msgid "Unknown PuSH feed id %s"
-msgstr ""
-
-#. TRANS: Client exception. %s is an invalid feed name.
-#: actions/pushcallback.php:96
-#, php-format
-msgid "Bad hub.topic feed \"%s\"."
-msgstr ""
-
-#. TRANS: Client exception. %1$s the invalid token, %2$s is the topic for which the invalid token was given.
-#: actions/pushcallback.php:101
-#, php-format
-msgid "Bad hub.verify_token %1$s for %2$s."
-msgstr ""
-
-#. TRANS: Client exception. %s is an invalid topic.
-#: actions/pushcallback.php:108
-#, php-format
-msgid "Unexpected subscribe request for %s."
-msgstr ""
-
-#. TRANS: Client exception. %s is an invalid topic.
-#: actions/pushcallback.php:113
-#, php-format
-msgid "Unexpected unsubscribe request for %s."
-msgstr ""
diff --git a/plugins/OStatus/locale/de/LC_MESSAGES/OStatus.po b/plugins/OStatus/locale/de/LC_MESSAGES/OStatus.po
index 9566496f7e..22078974f4 100644
--- a/plugins/OStatus/locale/de/LC_MESSAGES/OStatus.po
+++ b/plugins/OStatus/locale/de/LC_MESSAGES/OStatus.po
@@ -10,108 +10,94 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OStatus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:45+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:59+0000\n"
 "Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-14 17:22:01+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:49:39+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-ostatus\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+msgid "Feeds"
+msgstr "Feeds"
+
 #. TRANS: Link description for link to subscribe to a remote user.
 #. TRANS: Link text for a user to subscribe to an OStatus user.
-#: OStatusPlugin.php:223 OStatusPlugin.php:933
 msgid "Subscribe"
 msgstr "Abonnieren"
 
 #. TRANS: Link description for link to join a remote group.
-#: OStatusPlugin.php:242 OStatusPlugin.php:651 actions/ostatussub.php:109
 msgid "Join"
 msgstr "Beitreten"
 
 #. TRANSLATE: %s is a domain.
-#: OStatusPlugin.php:455
 #, php-format
 msgid "Sent from %s via OStatus"
 msgstr "Gesendet von %s über OStatus"
 
 #. TRANS: Exception.
-#: OStatusPlugin.php:527
 msgid "Could not set up remote subscription."
 msgstr "Konnte Remote-Abonnement nicht einrichten."
 
-#: OStatusPlugin.php:601
 msgid "Unfollow"
 msgstr "Nicht mehr beachten"
 
 #. TRANS: Success message for unsubscribe from user attempt through OStatus.
 #. TRANS: %1$s is the unsubscriber's name, %2$s is the unsubscribed user's name.
-#: OStatusPlugin.php:604
 #, php-format
 msgid "%1$s stopped following %2$s."
 msgstr "%1$s folgt %2$s nicht mehr."
 
-#: OStatusPlugin.php:632
 msgid "Could not set up remote group membership."
 msgstr "Konnte Remotegruppenmitgliedschaft nicht einrichten."
 
 #. TRANS: Success message for subscribe to group attempt through OStatus.
 #. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
-#: OStatusPlugin.php:654
 #, php-format
 msgid "%1$s has joined group %2$s."
 msgstr "%1$s ist der Gruppe %2$s beigetreten"
 
 #. TRANS: Exception.
-#: OStatusPlugin.php:663
 msgid "Failed joining remote group."
 msgstr "Fehler beim Beitreten der Remotegruppe."
 
-#: OStatusPlugin.php:703
 msgid "Leave"
 msgstr "Verlassen"
 
 #. TRANS: Success message for unsubscribe from group attempt through OStatus.
 #. TRANS: %1$s is the member name, %2$s is the unsubscribed group's name.
-#: OStatusPlugin.php:706
 #, php-format
 msgid "%1$s has left group %2$s."
 msgstr "%1$s hat die Gruppe %2$s verlassen"
 
-#: OStatusPlugin.php:781
 msgid "Disfavor"
 msgstr ""
 
 #. TRANS: Success message for remove a favorite notice through OStatus.
 #. TRANS: %1$s is the unfavoring user's name, %2$s is URI to the no longer favored notice.
-#: OStatusPlugin.php:784
 #, php-format
 msgid "%1$s marked notice %2$s as no longer a favorite."
 msgstr "%1$s markierte Nachricht %2$s nicht mehr als Favorit."
 
 #. TRANS: Link text for link to remote subscribe.
-#: OStatusPlugin.php:860
 msgid "Remote"
 msgstr ""
 
 #. TRANS: Title for activity.
-#: OStatusPlugin.php:900
 msgid "Profile update"
 msgstr "Profil aktualisieren"
 
 #. TRANS: Ping text for remote profile update through OStatus.
 #. TRANS: %s is user that updated their profile.
-#: OStatusPlugin.php:903
 #, php-format
 msgid "%s has updated their profile page."
 msgstr "%s hat die Profil-Seite aktualisiert."
 
 #. TRANS: Plugin description.
-#: OStatusPlugin.php:948
 msgid ""
 "Follow people across social networks that implement <a href=\"http://ostatus."
 "org/\">OStatus</a>."
@@ -119,272 +105,16 @@ msgstr ""
 "Folge Leuten quer durch die sozialen Netzwerke, die <a href=\"http://ostatus."
 "org/\">OStatus</a> implementieren."
 
-#: classes/FeedSub.php:252
-msgid "Attempting to start PuSH subscription for feed with no hub."
-msgstr ""
-"Es wird versucht, ein PuSH-Abonnemont für einen Feed ohne Hub zu starten."
-
-#: classes/FeedSub.php:282
-msgid "Attempting to end PuSH subscription for feed with no hub."
-msgstr ""
-"Es wird versucht, ein PuSH-Abonnemont für einen Feed ohne Hub zu beenden."
-
-#. TRANS: Server exception. %s is a URI.
-#: classes/Ostatus_profile.php:154
-#, php-format
-msgid "Invalid ostatus_profile state: both group and profile IDs set for %s."
-msgstr ""
-"Ungültiger ostatus_profile-Zustand: Sowohl Gruppen- als auch Profil-ID für %"
-"s gesetzt."
-
-#. TRANS: Server exception. %s is a URI.
-#: classes/Ostatus_profile.php:157
-#, php-format
-msgid "Invalid ostatus_profile state: both group and profile IDs empty for %s."
-msgstr ""
-"Ungültiger ostatus_profile-Zustand: Sowohl Gruppen- als auch Profil-ID für %"
-"s sind leer."
-
-#. TRANS: Server exception.
-#. TRANS: %1$s is the method name the exception occured in, %2$s is the actor type.
-#: classes/Ostatus_profile.php:247
-#, php-format
-msgid "Invalid actor passed to %1$s: %2$s."
-msgstr "Ungültiger actor an %1$s übergeben: %2$s."
-
-#. TRANS: Server exception.
-#: classes/Ostatus_profile.php:341
-msgid ""
-"Invalid type passed to Ostatus_profile::notify. It must be XML string or "
-"Activity entry."
-msgstr ""
-"Ungültiger Typ an Ostatus_profile::notify übergeben. Es muss ein XML-String "
-"oder ein Activity-Eintrag sein."
-
-#. TRANS: Exception.
-#: classes/Ostatus_profile.php:372
-msgid "Unknown feed format."
-msgstr "Unbekanntes Feed-Format."
-
-#. TRANS: Exception.
-#: classes/Ostatus_profile.php:396
-msgid "RSS feed without a channel."
-msgstr "RSS-Feed ohne einen Kanal."
-
 #. TRANS: Client exception.
-#: classes/Ostatus_profile.php:442
-msgid "Can't handle that kind of post."
-msgstr "Kann diese Art von Post nicht verarbeiten."
-
-#. TRANS: Client exception. %s is a source URI.
-#: classes/Ostatus_profile.php:500
-#, php-format
-msgid "No content for notice %s."
-msgstr "Kein Inhalt für Nachricht %s."
-
-#. TRANS: Shown when a notice is longer than supported and/or when attachments are present. At runtime
-#. TRANS: this will usually be replaced with localised text from StatusNet core messages.
-#: classes/Ostatus_profile.php:535
-msgid "Show more"
-msgstr "Mehr anzeigen"
-
-#. TRANS: Exception. %s is a profile URL.
-#: classes/Ostatus_profile.php:728
-#, php-format
-msgid "Could not reach profile page %s."
-msgstr "Konnte Profilseite %s nicht erreichen."
-
-#. TRANS: Exception. %s is a URL.
-#: classes/Ostatus_profile.php:786
-#, php-format
-msgid "Could not find a feed URL for profile page %s."
-msgstr "Konnte keinen Feed-URL für die Profilseite %s finden."
-
-#. TRANS: Feed sub exception.
-#: classes/Ostatus_profile.php:885
-msgid "Can't find enough profile information to make a feed."
-msgstr ""
-"Kann nicht genug Profilinformationen finden, um einen Feed zu erstellen."
-
-#. TRANS: Server exception. %s is a URL.
-#: classes/Ostatus_profile.php:949
-#, php-format
-msgid "Invalid avatar URL %s."
-msgstr "Ungültiger Avatar-URL %s."
-
-#. TRANS: Server exception. %s is a URI.
-#: classes/Ostatus_profile.php:960
-#, php-format
-msgid "Tried to update avatar for unsaved remote profile %s."
-msgstr ""
-"Versuchte den Avatar für ein ungespeichertes Remoteprofil %s zu "
-"aktualisieren."
-
-#. TRANS: Server exception. %s is a URL.
-#: classes/Ostatus_profile.php:970
-#, php-format
-msgid "Unable to fetch avatar from %s."
-msgstr "Kann den Avatar von %s nicht abrufen."
-
-#. TRANS: Exception.
-#: classes/Ostatus_profile.php:1197
-msgid "Local user can't be referenced as remote."
-msgstr "Lokaler Benutzer kann nicht als remote verwiesen werden."
-
-#. TRANS: Exception.
-#: classes/Ostatus_profile.php:1202
-msgid "Local group can't be referenced as remote."
-msgstr "Lokale Gruppe kann nicht als remote verwiesen werden."
-
-#. TRANS: Server exception.
-#: classes/Ostatus_profile.php:1254 classes/Ostatus_profile.php:1265
-msgid "Can't save local profile."
-msgstr "Lokales Profil kann nicht gespeichert werden."
-
-#. TRANS: Server exception.
-#: classes/Ostatus_profile.php:1273
-msgid "Can't save OStatus profile."
-msgstr "OStatus-Profil kann nicht gespeichert werden."
-
-#. TRANS: Exception.
-#: classes/Ostatus_profile.php:1561 classes/Ostatus_profile.php:1589
-msgid "Not a valid webfinger address."
-msgstr "Ungültige Webfinger-Adresse."
-
-#. TRANS: Exception. %s is a webfinger address.
-#: classes/Ostatus_profile.php:1671
-#, php-format
-msgid "Couldn't save profile for \"%s\"."
-msgstr "Profil für „%s“ konnte nicht gespeichert werden."
-
-#. TRANS: Exception. %s is a webfinger address.
-#: classes/Ostatus_profile.php:1690
-#, php-format
-msgid "Couldn't save ostatus_profile for \"%s\"."
-msgstr "Ostatus_profile für „%s“ konnte nicht gespeichert werden."
-
-#. TRANS: Exception. %s is a webfinger address.
-#: classes/Ostatus_profile.php:1698
-#, php-format
-msgid "Couldn't find a valid profile for \"%s\"."
-msgstr "Es konnte kein gültiges Profil für „%s“ gefunden werden."
-
-#. TRANS: Server exception.
-#: classes/Ostatus_profile.php:1741
-msgid "Could not store HTML content of long post as file."
-msgstr ""
-"HTML-Inhalt eines langen Posts konnte nicht als Datei nicht gespeichert "
-"werden."
-
-#. TRANS: Client exception. %s is a HTTP status code.
-#: classes/HubSub.php:212
-#, php-format
-msgid "Hub subscriber verification returned HTTP %s."
-msgstr "Hub-Abonnenten-Überprüfung gab HTTP %s zurück."
-
-#. TRANS: Exception. %1$s is a response status code, %2$s is the body of the response.
-#: classes/HubSub.php:359
-#, php-format
-msgid "Callback returned status: %1$s. Body: %2$s"
-msgstr "Der Aufruf gab folgenden Status zurück: %1$s. Body: %2$s"
-
-#. TRANS: Client error. POST is a HTTP command. It should not be translated.
-#: lib/salmonaction.php:43
-msgid "This method requires a POST."
-msgstr "Diese Methode benötigt ein POST."
-
-#. TRANS: Client error. Do not translate "application/magic-envelope+xml"
-#: lib/salmonaction.php:48
-msgid "Salmon requires \"application/magic-envelope+xml\"."
-msgstr "Salmon erfordert „application/magic-envelope+xml“."
-
-#. TRANS: Client error.
-#: lib/salmonaction.php:58
-msgid "Salmon signature verification failed."
-msgstr "Salmon-Signaturpfüung fehlgeschlagen."
-
-#. TRANS: Client error.
-#: lib/salmonaction.php:70
-msgid "Salmon post must be an Atom entry."
-msgstr "Salmon-Post muss ein Atom-Eintrag sein."
-
-#. TRANS: Client exception.
-#: lib/salmonaction.php:120
-msgid "Unrecognized activity type."
-msgstr "Unbekannter Aktivitätstyp."
-
-#. TRANS: Client exception.
-#: lib/salmonaction.php:130
-msgid "This target doesn't understand posts."
-msgstr "Dieses Ziel versteht keine Posts."
-
-#. TRANS: Client exception.
-#: lib/salmonaction.php:136
-msgid "This target doesn't understand follows."
-msgstr "Dieses Ziel versteht keine Follows."
-
-#. TRANS: Client exception.
-#: lib/salmonaction.php:142
-msgid "This target doesn't understand unfollows."
-msgstr "Dieses Ziel versteht keine Unfollows."
-
-#. TRANS: Client exception.
-#: lib/salmonaction.php:148
-msgid "This target doesn't understand favorites."
-msgstr "Dieses Ziel versteht keine Favoriten."
-
-#. TRANS: Client exception.
-#: lib/salmonaction.php:154
-msgid "This target doesn't understand unfavorites."
-msgstr "Dieses Ziel versteht keine Unfavorites."
-
-#. TRANS: Client exception.
-#: lib/salmonaction.php:160
-msgid "This target doesn't understand share events."
-msgstr "Dieses Ziel versteht das Teilen von Events nicht."
-
-#. TRANS: Client exception.
-#: lib/salmonaction.php:166
-msgid "This target doesn't understand joins."
-msgstr "Dieses Ziel versteht keine Joins."
-
-#. TRANS: Client exception.
-#: lib/salmonaction.php:172
-msgid "This target doesn't understand leave events."
-msgstr "Dieses Ziel versteht das Verlassen von Events nicht."
-
-#. TRANS: Exception.
-#: lib/salmonaction.php:200
-msgid "Received a salmon slap from unidentified actor."
-msgstr "Einen Salmon-Slap von einem unidentifizierten Aktor empfangen."
-
-#. TRANS: Exception.
-#: lib/magicenvelope.php:80
-msgid "Unable to locate signer public key."
-msgstr "Konnte den öffentlichen Schlüssel des Unterzeichners nicht finden."
-
-#. TRANS: Exception.
-#: lib/salmon.php:126
-msgid "Salmon invalid actor for signing."
-msgstr ""
-
-#: tests/gettext-speedtest.php:57
-msgid "Feeds"
-msgstr "Feeds"
-
-#. TRANS: Client exception.
-#: actions/pushhub.php:70
 msgid "Publishing outside feeds not supported."
 msgstr "Veröffentlichung von äußeren Feeds nicht unterstützt."
 
 #. TRANS: Client exception. %s is a mode.
-#: actions/pushhub.php:73
 #, php-format
 msgid "Unrecognized mode \"%s\"."
 msgstr "Unbekannter Modus \"%s\"."
 
 #. TRANS: Client exception. %s is a topic.
-#: actions/pushhub.php:93
 #, php-format
 msgid ""
 "Unsupported hub.topic %s this hub only serves local user and group Atom "
@@ -394,188 +124,73 @@ msgstr ""
 "Benutzer und Gruppen zur verfügung."
 
 #. TRANS: Client exception.
-#: actions/pushhub.php:99
 #, php-format
 msgid "Invalid hub.verify \"%s\". It must be sync or async."
 msgstr "Ungültiger hub.verify „%s“. Es muss sync oder async sein."
 
 #. TRANS: Client exception.
-#: actions/pushhub.php:105
 #, php-format
 msgid "Invalid hub.lease \"%s\". It must be empty or positive integer."
 msgstr ""
 "Ungültiger hub.lease „%s“. Es muss eine leere oder positive Ganzzahl sein."
 
 #. TRANS: Client exception.
-#: actions/pushhub.php:113
 #, php-format
 msgid "Invalid hub.secret \"%s\". It must be under 200 bytes."
 msgstr "Ungültiges hub.secret „%s“. Es muss kleiner als 200 Bytes sein."
 
 #. TRANS: Client exception.
-#: actions/pushhub.php:165
 #, php-format
 msgid "Invalid hub.topic \"%s\". User doesn't exist."
 msgstr "Ungültiges hub.topic „%s“. Benutzer existiert nicht."
 
 #. TRANS: Client exception.
-#: actions/pushhub.php:174
 #, php-format
 msgid "Invalid hub.topic \"%s\". Group doesn't exist."
 msgstr "Ungültiges hub.topic „%s“. Gruppe existiert nicht."
 
 #. TRANS: Client exception.
 #. TRANS: %1$s is this argument to the method this exception occurs in, %2$s is a URL.
-#: actions/pushhub.php:199
 #, php-format
 msgid "Invalid URL passed for %1$s: \"%2$s\""
 msgstr "Ungültiger URL für %1$s übergeben: „%2$s“"
 
-#: actions/ownerxrd.php:39 actions/usersalmon.php:43
+msgid "Empty or invalid feed id."
+msgstr "Leere oder ungültige Feed-ID."
+
+#. TRANS: Server exception. %s is a feed ID.
+#, php-format
+msgid "Unknown PuSH feed id %s"
+msgstr "Unbekannte PuSH Feed-ID %s"
+
+#. TRANS: Client exception. %s is an invalid feed name.
+#, php-format
+msgid "Bad hub.topic feed \"%s\"."
+msgstr "Ungültiger hub.topic-Feed „%s“."
+
+#. TRANS: Client exception. %1$s the invalid token, %2$s is the topic for which the invalid token was given.
+#, php-format
+msgid "Bad hub.verify_token %1$s for %2$s."
+msgstr "Ungültiger hub.verify_token %1$s für %2$s."
+
+#. TRANS: Client exception. %s is an invalid topic.
+#, php-format
+msgid "Unexpected subscribe request for %s."
+msgstr "Unerwartete Deabonnement-Anfrage für %s."
+
+#. TRANS: Client exception. %s is an invalid topic.
+#, php-format
+msgid "Unexpected unsubscribe request for %s."
+msgstr "Unerwartete Deabonnement-Anfrage für %s."
+
 msgid "No such user."
 msgstr "Unbekannter Benutzer."
 
-#. TRANS: Client error.
-#: actions/usersalmon.php:37 actions/groupsalmon.php:40
-msgid "No ID."
-msgstr "Keine ID"
-
-#. TRANS: Client exception.
-#: actions/usersalmon.php:83
-msgid "In reply to unknown notice."
-msgstr "In der Antwort auf unbekannte Nachricht."
-
-#. TRANS: Client exception.
-#: actions/usersalmon.php:88
-msgid "In reply to a notice not by this user and not mentioning this user."
-msgstr ""
-"In einer Antowrt auf eine Nachricht, die nicht von diesem Benutzer stammt "
-"und diesen Benutzer nicht erwähnt."
-
-#. TRANS: Client exception.
-#: actions/usersalmon.php:165
-msgid "Could not save new favorite."
-msgstr "Neuer Favorit konnte nicht gespeichert werden."
-
-#. TRANS: Client exception.
-#: actions/usersalmon.php:197
-msgid "Can't favorite/unfavorite without an object."
-msgstr "Kann nicht ohne Objekt (ent)favorisieren."
-
-#. TRANS: Client exception.
-#: actions/usersalmon.php:209
-msgid "Can't handle that kind of object for liking/faving."
-msgstr "Kann diese Art von Objekt nicht für mögen/favorisieren verarbeiten."
-
-#. TRANS: Client exception. %s is an object ID.
-#: actions/usersalmon.php:216
-#, php-format
-msgid "Notice with ID %s unknown."
-msgstr "Nachricht mit ID %s unbekannt."
-
-#. TRANS: Client exception. %1$s is a notice ID, %2$s is a user ID.
-#: actions/usersalmon.php:221
-#, php-format
-msgid "Notice with ID %1$s not posted by %2$s."
-msgstr "Nachricht mit ID %1$s wurde nicht von %2$s geschrieben."
-
-#. TRANS: Field label.
-#: actions/ostatusgroup.php:78
-msgid "Join group"
-msgstr "Gruppe beitreten"
-
-#. TRANS: Tooltip for field label "Join group".
-#: actions/ostatusgroup.php:81
-msgid "OStatus group's address, like http://example.net/group/nickname."
-msgstr ""
-"OStatus-Adresse der Gruppe. Beispiel: http://example.net/group/nickname."
-
-#. TRANS: Button text.
-#: actions/ostatusgroup.php:86 actions/ostatussub.php:75
-msgctxt "BUTTON"
-msgid "Continue"
-msgstr "Weiter"
-
-#: actions/ostatusgroup.php:105
-msgid "You are already a member of this group."
-msgstr "Du bist bereits Mitglied dieser Gruppe."
-
-#. TRANS: OStatus remote group subscription dialog error.
-#: actions/ostatusgroup.php:140
-msgid "Already a member!"
-msgstr "Bereits Mitglied!"
-
-#. TRANS: OStatus remote group subscription dialog error.
-#: actions/ostatusgroup.php:151
-msgid "Remote group join failed!"
-msgstr "Beitritt in Remote-Gruppe fehlgeschlagen!"
-
-#. TRANS: OStatus remote group subscription dialog error.
-#: actions/ostatusgroup.php:155
-msgid "Remote group join aborted!"
-msgstr "Beitritt in Remote-Gruppe abgebrochen!"
-
-#. TRANS: Page title for OStatus remote group join form
-#: actions/ostatusgroup.php:167
-msgid "Confirm joining remote group"
-msgstr "Bestätige das Beitreten einer Remotegruppe"
-
-#. TRANS: Instructions.
-#: actions/ostatusgroup.php:178
-msgid ""
-"You can subscribe to groups from other supported sites. Paste the group's "
-"profile URI below:"
-msgstr ""
-"Du kannst Gruppen von anderen unterstützten Websites abonnieren. Füge die "
-"URI der Gruppe unten ein:"
-
-#. TRANS: Client error.
-#: actions/groupsalmon.php:47
-msgid "No such group."
-msgstr "Keine derartige Gruppe."
-
-#. TRANS: Client error.
-#: actions/groupsalmon.php:56
-msgid "Can't accept remote posts for a remote group."
-msgstr "Kann Remoteposts für Remotegruppen nicht akzeptieren."
-
-#. TRANS: Client error.
-#: actions/groupsalmon.php:130
-msgid "Can't read profile to set up group membership."
-msgstr "Kann Profil nicht lesen, um die Gruppenmitgliedschaft einzurichten."
-
-#. TRANS: Client error.
-#: actions/groupsalmon.php:134 actions/groupsalmon.php:177
-msgid "Groups can't join groups."
-msgstr "Gruppen können Remotegruppen nicht beitreten."
-
-#: actions/groupsalmon.php:147
-msgid "You have been blocked from that group by the admin."
-msgstr "Der Admin dieser Gruppe hat dich blockiert."
-
-#. TRANS: Server error. %1$s is a profile URI, %2$s is a group nickname.
-#: actions/groupsalmon.php:162
-#, php-format
-msgid "Could not join remote user %1$s to group %2$s."
-msgstr "Konnte Remotebenutzer %1$s nicht der Gruppe %2$s hinzufügen."
-
-#: actions/groupsalmon.php:174
-msgid "Can't read profile to cancel group membership."
-msgstr "Kann Profil nicht lesen, um die Gruppenmitgliedschaft zu kündigen."
-
-#. TRANS: Server error. %1$s is a profile URI, %2$s is a group nickname.
-#: actions/groupsalmon.php:191
-#, php-format
-msgid "Could not remove remote user %1$s from group %2$s."
-msgstr "Konnte Remotebenutzer %1$s nicht aus der Gruppe %2$s entfernen."
-
 #. TRANS: Field label for a field that takes an OStatus user address.
-#: actions/ostatussub.php:68
 msgid "Subscribe to"
 msgstr "Abonniere"
 
 #. TRANS: Tooltip for field label "Subscribe to".
-#: actions/ostatussub.php:71
 msgid ""
 "OStatus user's address, like nickname@example.com or http://example.net/"
 "nickname"
@@ -583,31 +198,30 @@ msgstr ""
 "Adresse des OStatus-Benutzers, wie nickname@example.com oder http://example."
 "net/nickname"
 
+#. TRANS: Button text.
+msgctxt "BUTTON"
+msgid "Continue"
+msgstr "Weiter"
+
 #. TRANS: Button text.
 #. TRANS: Tooltip for button "Join".
-#: actions/ostatussub.php:112
 msgctxt "BUTTON"
 msgid "Join this group"
 msgstr "Dieser Gruppe beitreten"
 
 #. TRANS: Button text.
-#: actions/ostatussub.php:115
 msgctxt "BUTTON"
 msgid "Confirm"
 msgstr "Bestätigen"
 
 #. TRANS: Tooltip for button "Confirm".
-#: actions/ostatussub.php:117
 msgid "Subscribe to this user"
 msgstr "Abonniere diesen Benutzer"
 
-#: actions/ostatussub.php:138
 msgid "You are already subscribed to this user."
 msgstr "Du hast diesen Benutzer bereits abonniert:"
 
 #. TRANS: Error text.
-#: actions/ostatussub.php:232 actions/ostatussub.php:239
-#: actions/ostatussub.php:264
 msgid ""
 "Sorry, we could not reach that address. Please make sure that the OStatus "
 "address is like nickname@example.com or http://example.net/nickname."
@@ -617,9 +231,6 @@ msgstr ""
 "http://example.net/nickname."
 
 #. TRANS: Error text.
-#: actions/ostatussub.php:243 actions/ostatussub.php:247
-#: actions/ostatussub.php:251 actions/ostatussub.php:255
-#: actions/ostatussub.php:259
 msgid ""
 "Sorry, we could not reach that feed. Please try that OStatus address again "
 "later."
@@ -628,31 +239,25 @@ msgstr ""
 "diese OStatus-Adresse später noch einmal."
 
 #. TRANS: OStatus remote subscription dialog error.
-#: actions/ostatussub.php:293
 msgid "Already subscribed!"
 msgstr "Bereits abonniert!"
 
 #. TRANS: OStatus remote subscription dialog error.
-#: actions/ostatussub.php:298
 msgid "Remote subscription failed!"
 msgstr "Remoteabonnement fehlgeschlagen!"
 
-#: actions/ostatussub.php:345 actions/ostatusinit.php:64
 msgid "There was a problem with your session token. Try again, please."
 msgstr "Es gab ein Problem mit deinem Sitzungstoken. Bitte versuche es erneut."
 
 #. TRANS: Form title.
-#: actions/ostatussub.php:373 actions/ostatusinit.php:83
 msgid "Subscribe to user"
 msgstr "Abonniere diesen Benutzer"
 
 #. TRANS: Page title for OStatus remote subscription form
-#: actions/ostatussub.php:393
 msgid "Confirm"
 msgstr "Bestätigen"
 
 #. TRANS: Instructions.
-#: actions/ostatussub.php:405
 msgid ""
 "You can subscribe to users from other supported sites. Paste their address "
 "or profile URI below:"
@@ -660,128 +265,373 @@ msgstr ""
 "Du kannst Benutzer von anderen unterstützten Websites abonnieren. Füge ihre "
 "Adresse oder Profil-URI unten ein:"
 
+#. TRANS: Field label.
+msgid "Join group"
+msgstr "Gruppe beitreten"
+
+#. TRANS: Tooltip for field label "Join group".
+msgid "OStatus group's address, like http://example.net/group/nickname."
+msgstr ""
+"OStatus-Adresse der Gruppe. Beispiel: http://example.net/group/nickname."
+
+msgid "You are already a member of this group."
+msgstr "Du bist bereits Mitglied dieser Gruppe."
+
+#. TRANS: OStatus remote group subscription dialog error.
+msgid "Already a member!"
+msgstr "Bereits Mitglied!"
+
+#. TRANS: OStatus remote group subscription dialog error.
+msgid "Remote group join failed!"
+msgstr "Beitritt in Remote-Gruppe fehlgeschlagen!"
+
+#. TRANS: OStatus remote group subscription dialog error.
+msgid "Remote group join aborted!"
+msgstr "Beitritt in Remote-Gruppe abgebrochen!"
+
+#. TRANS: Page title for OStatus remote group join form
+msgid "Confirm joining remote group"
+msgstr "Bestätige das Beitreten einer Remotegruppe"
+
+#. TRANS: Instructions.
+msgid ""
+"You can subscribe to groups from other supported sites. Paste the group's "
+"profile URI below:"
+msgstr ""
+"Du kannst Gruppen von anderen unterstützten Websites abonnieren. Füge die "
+"URI der Gruppe unten ein:"
+
+#. TRANS: Client error.
+msgid "No ID."
+msgstr "Keine ID"
+
+#. TRANS: Client exception.
+msgid "In reply to unknown notice."
+msgstr "In der Antwort auf unbekannte Nachricht."
+
+#. TRANS: Client exception.
+msgid "In reply to a notice not by this user and not mentioning this user."
+msgstr ""
+"In einer Antowrt auf eine Nachricht, die nicht von diesem Benutzer stammt "
+"und diesen Benutzer nicht erwähnt."
+
+#. TRANS: Client exception.
+msgid "Could not save new favorite."
+msgstr "Neuer Favorit konnte nicht gespeichert werden."
+
+#. TRANS: Client exception.
+msgid "Can't favorite/unfavorite without an object."
+msgstr "Kann nicht ohne Objekt (ent)favorisieren."
+
+#. TRANS: Client exception.
+msgid "Can't handle that kind of object for liking/faving."
+msgstr "Kann diese Art von Objekt nicht für mögen/favorisieren verarbeiten."
+
+#. TRANS: Client exception. %s is an object ID.
+#, php-format
+msgid "Notice with ID %s unknown."
+msgstr "Nachricht mit ID %s unbekannt."
+
+#. TRANS: Client exception. %1$s is a notice ID, %2$s is a user ID.
+#, php-format
+msgid "Notice with ID %1$s not posted by %2$s."
+msgstr "Nachricht mit ID %1$s wurde nicht von %2$s geschrieben."
+
+#. TRANS: Client error.
+msgid "No such group."
+msgstr "Keine derartige Gruppe."
+
+#. TRANS: Client error.
+msgid "Can't accept remote posts for a remote group."
+msgstr "Kann Remoteposts für Remotegruppen nicht akzeptieren."
+
+#. TRANS: Client error.
+msgid "Can't read profile to set up group membership."
+msgstr "Kann Profil nicht lesen, um die Gruppenmitgliedschaft einzurichten."
+
+#. TRANS: Client error.
+msgid "Groups can't join groups."
+msgstr "Gruppen können Remotegruppen nicht beitreten."
+
+msgid "You have been blocked from that group by the admin."
+msgstr "Der Admin dieser Gruppe hat dich blockiert."
+
+#. TRANS: Server error. %1$s is a profile URI, %2$s is a group nickname.
+#, php-format
+msgid "Could not join remote user %1$s to group %2$s."
+msgstr "Konnte Remotebenutzer %1$s nicht der Gruppe %2$s hinzufügen."
+
+msgid "Can't read profile to cancel group membership."
+msgstr "Kann Profil nicht lesen, um die Gruppenmitgliedschaft zu kündigen."
+
+#. TRANS: Server error. %1$s is a profile URI, %2$s is a group nickname.
+#, php-format
+msgid "Could not remove remote user %1$s from group %2$s."
+msgstr "Konnte Remotebenutzer %1$s nicht aus der Gruppe %2$s entfernen."
+
 #. TRANS: Client error.
-#: actions/ostatusinit.php:42
 msgid "You can use the local subscription!"
 msgstr "Du kannst ein lokales Abonnement erstellen!"
 
 #. TRANS: Form legend.
-#: actions/ostatusinit.php:98
 #, php-format
 msgid "Join group %s"
 msgstr "Gruppe %s beitreten"
 
 #. TRANS: Button text.
-#: actions/ostatusinit.php:100
 msgctxt "BUTTON"
 msgid "Join"
 msgstr "Beitreten"
 
 #. TRANS: Form legend.
-#: actions/ostatusinit.php:103
 #, php-format
 msgid "Subscribe to %s"
 msgstr "Abonniere %s"
 
 #. TRANS: Button text.
-#: actions/ostatusinit.php:105
 msgctxt "BUTTON"
 msgid "Subscribe"
 msgstr "Abonnieren"
 
 #. TRANS: Field label.
-#: actions/ostatusinit.php:119
 msgid "Group nickname"
 msgstr "Gruppe-Nickname"
 
-#: actions/ostatusinit.php:120
 msgid "Nickname of the group you want to join."
 msgstr "Spitzname der Gruppe, der Sie beitreten möchten."
 
 #. TRANS: Field label.
-#: actions/ostatusinit.php:123
 msgid "User nickname"
 msgstr "Benutzername"
 
-#: actions/ostatusinit.php:124
 msgid "Nickname of the user you want to follow."
 msgstr "Name des Benutzers, dem du folgen möchtest"
 
 #. TRANS: Field label.
-#: actions/ostatusinit.php:129
 msgid "Profile Account"
 msgstr "Profil-Konto"
 
 #. TRANS: Tooltip for field label "Profile Account".
-#: actions/ostatusinit.php:131
 msgid "Your account id (e.g. user@identi.ca)."
 msgstr "Deine Konto-ID (z.B. user@identi.ca)."
 
 #. TRANS: Client error.
-#: actions/ostatusinit.php:153
 msgid "Must provide a remote profile."
 msgstr "Du musst ein Remoteprofil angeben."
 
 #. TRANS: Client error.
-#: actions/ostatusinit.php:165
 msgid "Couldn't look up OStatus account profile."
 msgstr "Konnte OStatus-Konto-Profil nicht nachschauen."
 
 #. TRANS: Client error.
-#: actions/ostatusinit.php:178
 msgid "Couldn't confirm remote profile address."
 msgstr "Konnte Remoteprofiladresse nicht bestätigen."
 
 #. TRANS: Page title.
-#: actions/ostatusinit.php:223
 msgid "OStatus Connect"
 msgstr "OStatus-Verbindung"
 
-#: actions/pushcallback.php:50
-msgid "Empty or invalid feed id."
-msgstr "Leere oder ungültige Feed-ID."
+msgid "Attempting to start PuSH subscription for feed with no hub."
+msgstr ""
+"Es wird versucht, ein PuSH-Abonnemont für einen Feed ohne Hub zu starten."
 
-#. TRANS: Server exception. %s is a feed ID.
-#: actions/pushcallback.php:56
+msgid "Attempting to end PuSH subscription for feed with no hub."
+msgstr ""
+"Es wird versucht, ein PuSH-Abonnemont für einen Feed ohne Hub zu beenden."
+
+#. TRANS: Server exception. %s is a URI.
 #, php-format
-msgid "Unknown PuSH feed id %s"
-msgstr "Unbekannte PuSH Feed-ID %s"
+msgid "Invalid ostatus_profile state: both group and profile IDs set for %s."
+msgstr ""
+"Ungültiger ostatus_profile-Zustand: Sowohl Gruppen- als auch Profil-ID für %"
+"s gesetzt."
 
-#. TRANS: Client exception. %s is an invalid feed name.
-#: actions/pushcallback.php:96
+#. TRANS: Server exception. %s is a URI.
 #, php-format
-msgid "Bad hub.topic feed \"%s\"."
-msgstr "Ungültiger hub.topic-Feed „%s“."
+msgid "Invalid ostatus_profile state: both group and profile IDs empty for %s."
+msgstr ""
+"Ungültiger ostatus_profile-Zustand: Sowohl Gruppen- als auch Profil-ID für %"
+"s sind leer."
 
-#. TRANS: Client exception. %1$s the invalid token, %2$s is the topic for which the invalid token was given.
-#: actions/pushcallback.php:101
+#. TRANS: Server exception.
+#. TRANS: %1$s is the method name the exception occured in, %2$s is the actor type.
 #, php-format
-msgid "Bad hub.verify_token %1$s for %2$s."
-msgstr "Ungültiger hub.verify_token %1$s für %2$s."
+msgid "Invalid actor passed to %1$s: %2$s."
+msgstr "Ungültiger actor an %1$s übergeben: %2$s."
 
-#. TRANS: Client exception. %s is an invalid topic.
-#: actions/pushcallback.php:108
+#. TRANS: Server exception.
+msgid ""
+"Invalid type passed to Ostatus_profile::notify. It must be XML string or "
+"Activity entry."
+msgstr ""
+"Ungültiger Typ an Ostatus_profile::notify übergeben. Es muss ein XML-String "
+"oder ein Activity-Eintrag sein."
+
+#. TRANS: Exception.
+msgid "Unknown feed format."
+msgstr "Unbekanntes Feed-Format."
+
+#. TRANS: Exception.
+msgid "RSS feed without a channel."
+msgstr "RSS-Feed ohne einen Kanal."
+
+#. TRANS: Client exception.
+msgid "Can't handle that kind of post."
+msgstr "Kann diese Art von Post nicht verarbeiten."
+
+#. TRANS: Client exception. %s is a source URI.
 #, php-format
-msgid "Unexpected subscribe request for %s."
-msgstr "Unerwartete Deabonnement-Anfrage für %s."
+msgid "No content for notice %s."
+msgstr "Kein Inhalt für Nachricht %s."
 
-#. TRANS: Client exception. %s is an invalid topic.
-#: actions/pushcallback.php:113
+#. TRANS: Shown when a notice is longer than supported and/or when attachments are present. At runtime
+#. TRANS: this will usually be replaced with localised text from StatusNet core messages.
+msgid "Show more"
+msgstr "Mehr anzeigen"
+
+#. TRANS: Exception. %s is a profile URL.
 #, php-format
-msgid "Unexpected unsubscribe request for %s."
-msgstr "Unerwartete Deabonnement-Anfrage für %s."
+msgid "Could not reach profile page %s."
+msgstr "Konnte Profilseite %s nicht erreichen."
 
-#~ msgid "Photo"
-#~ msgstr "Foto"
+#. TRANS: Exception. %s is a URL.
+#, php-format
+msgid "Could not find a feed URL for profile page %s."
+msgstr "Konnte keinen Feed-URL für die Profilseite %s finden."
 
-#~ msgid "Nickname"
-#~ msgstr "Benutzername"
+#. TRANS: Feed sub exception.
+msgid "Can't find enough profile information to make a feed."
+msgstr ""
+"Kann nicht genug Profilinformationen finden, um einen Feed zu erstellen."
 
-#~ msgid "Location"
-#~ msgstr "Ort"
+#. TRANS: Server exception. %s is a URL.
+#, php-format
+msgid "Invalid avatar URL %s."
+msgstr "Ungültiger Avatar-URL %s."
 
-#~ msgid "URL"
-#~ msgstr "URL"
+#. TRANS: Server exception. %s is a URI.
+#, php-format
+msgid "Tried to update avatar for unsaved remote profile %s."
+msgstr ""
+"Versuchte den Avatar für ein ungespeichertes Remoteprofil %s zu "
+"aktualisieren."
 
-#~ msgid "Note"
-#~ msgstr "Notiz"
+#. TRANS: Server exception. %s is a URL.
+#, php-format
+msgid "Unable to fetch avatar from %s."
+msgstr "Kann den Avatar von %s nicht abrufen."
+
+#. TRANS: Exception.
+msgid "Local user can't be referenced as remote."
+msgstr "Lokaler Benutzer kann nicht als remote verwiesen werden."
+
+#. TRANS: Exception.
+msgid "Local group can't be referenced as remote."
+msgstr "Lokale Gruppe kann nicht als remote verwiesen werden."
+
+#. TRANS: Server exception.
+msgid "Can't save local profile."
+msgstr "Lokales Profil kann nicht gespeichert werden."
+
+#. TRANS: Server exception.
+msgid "Can't save OStatus profile."
+msgstr "OStatus-Profil kann nicht gespeichert werden."
+
+#. TRANS: Exception.
+msgid "Not a valid webfinger address."
+msgstr "Ungültige Webfinger-Adresse."
+
+#. TRANS: Exception. %s is a webfinger address.
+#, php-format
+msgid "Couldn't save profile for \"%s\"."
+msgstr "Profil für „%s“ konnte nicht gespeichert werden."
+
+#. TRANS: Exception. %s is a webfinger address.
+#, php-format
+msgid "Couldn't save ostatus_profile for \"%s\"."
+msgstr "Ostatus_profile für „%s“ konnte nicht gespeichert werden."
+
+#. TRANS: Exception. %s is a webfinger address.
+#, php-format
+msgid "Couldn't find a valid profile for \"%s\"."
+msgstr "Es konnte kein gültiges Profil für „%s“ gefunden werden."
+
+#. TRANS: Server exception.
+msgid "Could not store HTML content of long post as file."
+msgstr ""
+"HTML-Inhalt eines langen Posts konnte nicht als Datei nicht gespeichert "
+"werden."
+
+#. TRANS: Client exception. %s is a HTTP status code.
+#, php-format
+msgid "Hub subscriber verification returned HTTP %s."
+msgstr "Hub-Abonnenten-Überprüfung gab HTTP %s zurück."
+
+#. TRANS: Exception. %1$s is a response status code, %2$s is the body of the response.
+#, php-format
+msgid "Callback returned status: %1$s. Body: %2$s"
+msgstr "Der Aufruf gab folgenden Status zurück: %1$s. Body: %2$s"
+
+#. TRANS: Exception.
+msgid "Unable to locate signer public key."
+msgstr "Konnte den öffentlichen Schlüssel des Unterzeichners nicht finden."
+
+#. TRANS: Exception.
+msgid "Salmon invalid actor for signing."
+msgstr ""
+
+#. TRANS: Client error. POST is a HTTP command. It should not be translated.
+msgid "This method requires a POST."
+msgstr "Diese Methode benötigt ein POST."
+
+#. TRANS: Client error. Do not translate "application/magic-envelope+xml"
+msgid "Salmon requires \"application/magic-envelope+xml\"."
+msgstr "Salmon erfordert „application/magic-envelope+xml“."
+
+#. TRANS: Client error.
+msgid "Salmon signature verification failed."
+msgstr "Salmon-Signaturpfüung fehlgeschlagen."
+
+#. TRANS: Client error.
+msgid "Salmon post must be an Atom entry."
+msgstr "Salmon-Post muss ein Atom-Eintrag sein."
+
+#. TRANS: Client exception.
+msgid "Unrecognized activity type."
+msgstr "Unbekannter Aktivitätstyp."
+
+#. TRANS: Client exception.
+msgid "This target doesn't understand posts."
+msgstr "Dieses Ziel versteht keine Posts."
+
+#. TRANS: Client exception.
+msgid "This target doesn't understand follows."
+msgstr "Dieses Ziel versteht keine Follows."
+
+#. TRANS: Client exception.
+msgid "This target doesn't understand unfollows."
+msgstr "Dieses Ziel versteht keine Unfollows."
+
+#. TRANS: Client exception.
+msgid "This target doesn't understand favorites."
+msgstr "Dieses Ziel versteht keine Favoriten."
+
+#. TRANS: Client exception.
+msgid "This target doesn't understand unfavorites."
+msgstr "Dieses Ziel versteht keine Unfavorites."
+
+#. TRANS: Client exception.
+msgid "This target doesn't understand share events."
+msgstr "Dieses Ziel versteht das Teilen von Events nicht."
+
+#. TRANS: Client exception.
+msgid "This target doesn't understand joins."
+msgstr "Dieses Ziel versteht keine Joins."
+
+#. TRANS: Client exception.
+msgid "This target doesn't understand leave events."
+msgstr "Dieses Ziel versteht das Verlassen von Events nicht."
+
+#. TRANS: Exception.
+msgid "Received a salmon slap from unidentified actor."
+msgstr "Einen Salmon-Slap von einem unidentifizierten Aktor empfangen."
diff --git a/plugins/OStatus/locale/fr/LC_MESSAGES/OStatus.po b/plugins/OStatus/locale/fr/LC_MESSAGES/OStatus.po
index e47a6c0fa9..54b184eefc 100644
--- a/plugins/OStatus/locale/fr/LC_MESSAGES/OStatus.po
+++ b/plugins/OStatus/locale/fr/LC_MESSAGES/OStatus.po
@@ -11,108 +11,94 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OStatus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:45+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:59+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-14 17:22:01+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:49:39+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-ostatus\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+msgid "Feeds"
+msgstr "Flux d’informations"
+
 #. TRANS: Link description for link to subscribe to a remote user.
 #. TRANS: Link text for a user to subscribe to an OStatus user.
-#: OStatusPlugin.php:223 OStatusPlugin.php:933
 msgid "Subscribe"
 msgstr "S'abonner"
 
 #. TRANS: Link description for link to join a remote group.
-#: OStatusPlugin.php:242 OStatusPlugin.php:651 actions/ostatussub.php:109
 msgid "Join"
 msgstr "Rejoindre"
 
 #. TRANSLATE: %s is a domain.
-#: OStatusPlugin.php:455
 #, php-format
 msgid "Sent from %s via OStatus"
 msgstr "Envoyé depuis %s via OStatus"
 
 #. TRANS: Exception.
-#: OStatusPlugin.php:527
 msgid "Could not set up remote subscription."
 msgstr "Impossible de mettre en place l’abonnement distant."
 
-#: OStatusPlugin.php:601
 msgid "Unfollow"
 msgstr "Ne plus suivre"
 
 #. TRANS: Success message for unsubscribe from user attempt through OStatus.
 #. TRANS: %1$s is the unsubscriber's name, %2$s is the unsubscribed user's name.
-#: OStatusPlugin.php:604
 #, php-format
 msgid "%1$s stopped following %2$s."
 msgstr "%1$s a cessé de suivre %2$s."
 
-#: OStatusPlugin.php:632
 msgid "Could not set up remote group membership."
 msgstr "Impossible de mettre en place l’appartenance au groupe distant."
 
 #. TRANS: Success message for subscribe to group attempt through OStatus.
 #. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
-#: OStatusPlugin.php:654
 #, php-format
 msgid "%1$s has joined group %2$s."
 msgstr "%1$s a rejoint le groupe %2$s."
 
 #. TRANS: Exception.
-#: OStatusPlugin.php:663
 msgid "Failed joining remote group."
 msgstr "Échec lors de l’adhésion au groupe distant."
 
-#: OStatusPlugin.php:703
 msgid "Leave"
 msgstr "Sortir"
 
 #. TRANS: Success message for unsubscribe from group attempt through OStatus.
 #. TRANS: %1$s is the member name, %2$s is the unsubscribed group's name.
-#: OStatusPlugin.php:706
 #, php-format
 msgid "%1$s has left group %2$s."
 msgstr "%1$s a quitté le groupe %2$s."
 
-#: OStatusPlugin.php:781
 msgid "Disfavor"
 msgstr "Retirer des favoris"
 
 #. TRANS: Success message for remove a favorite notice through OStatus.
 #. TRANS: %1$s is the unfavoring user's name, %2$s is URI to the no longer favored notice.
-#: OStatusPlugin.php:784
 #, php-format
 msgid "%1$s marked notice %2$s as no longer a favorite."
 msgstr "%1$s a retiré l’avis %2$s de ses favoris."
 
 #. TRANS: Link text for link to remote subscribe.
-#: OStatusPlugin.php:860
 msgid "Remote"
 msgstr "À distance"
 
 #. TRANS: Title for activity.
-#: OStatusPlugin.php:900
 msgid "Profile update"
 msgstr "Mise à jour du profil"
 
 #. TRANS: Ping text for remote profile update through OStatus.
 #. TRANS: %s is user that updated their profile.
-#: OStatusPlugin.php:903
 #, php-format
 msgid "%s has updated their profile page."
 msgstr "%s a mis à jour sa page de profil."
 
 #. TRANS: Plugin description.
-#: OStatusPlugin.php:948
 msgid ""
 "Follow people across social networks that implement <a href=\"http://ostatus."
 "org/\">OStatus</a>."
@@ -120,278 +106,16 @@ msgstr ""
 "Suivez les personnes à travers les réseaux sociaux mettant en œuvre <a href="
 "\"http://ostatus.org/\">OStatus</a> ."
 
-#: classes/FeedSub.php:252
-msgid "Attempting to start PuSH subscription for feed with no hub."
-msgstr ""
-"Tente de démarrer l’inscription PuSH à un flux d’information sans "
-"concentrateur."
-
-#: classes/FeedSub.php:282
-msgid "Attempting to end PuSH subscription for feed with no hub."
-msgstr ""
-"Tente d’arrêter l’inscription PuSH à un flux d’information sans "
-"concentrateur."
-
-#. TRANS: Server exception. %s is a URI.
-#: classes/Ostatus_profile.php:154
-#, php-format
-msgid "Invalid ostatus_profile state: both group and profile IDs set for %s."
-msgstr ""
-"État invalide du profil OStatus : identifiants à la fois de groupe et de "
-"profil définis pour « %s »."
-
-#. TRANS: Server exception. %s is a URI.
-#: classes/Ostatus_profile.php:157
-#, php-format
-msgid "Invalid ostatus_profile state: both group and profile IDs empty for %s."
-msgstr ""
-"État invalide du profil OStatus : identifiants à la fois de groupe et de "
-"profil non renseignés pour « %s »."
-
-#. TRANS: Server exception.
-#. TRANS: %1$s is the method name the exception occured in, %2$s is the actor type.
-#: classes/Ostatus_profile.php:247
-#, php-format
-msgid "Invalid actor passed to %1$s: %2$s."
-msgstr "Type d’acteur invalide passé à la méthode « %1$s » : « %2$s »."
-
-#. TRANS: Server exception.
-#: classes/Ostatus_profile.php:341
-msgid ""
-"Invalid type passed to Ostatus_profile::notify. It must be XML string or "
-"Activity entry."
-msgstr ""
-"Type invalide passé à la méthode « Ostatus_profile::notify ». Ce doit être "
-"une chaîne XML ou une entrée « Activity »."
-
-#. TRANS: Exception.
-#: classes/Ostatus_profile.php:372
-msgid "Unknown feed format."
-msgstr "Format de flux d’information inconnu."
-
-#. TRANS: Exception.
-#: classes/Ostatus_profile.php:396
-msgid "RSS feed without a channel."
-msgstr "Flux RSS sans canal."
-
 #. TRANS: Client exception.
-#: classes/Ostatus_profile.php:442
-msgid "Can't handle that kind of post."
-msgstr "Impossible de gérer cette sorte de publication."
-
-#. TRANS: Client exception. %s is a source URI.
-#: classes/Ostatus_profile.php:500
-#, php-format
-msgid "No content for notice %s."
-msgstr "Aucun contenu dans l’avis « %s »."
-
-#. TRANS: Shown when a notice is longer than supported and/or when attachments are present. At runtime
-#. TRANS: this will usually be replaced with localised text from StatusNet core messages.
-#: classes/Ostatus_profile.php:535
-msgid "Show more"
-msgstr "Voir davantage"
-
-#. TRANS: Exception. %s is a profile URL.
-#: classes/Ostatus_profile.php:728
-#, php-format
-msgid "Could not reach profile page %s."
-msgstr "Impossible d’atteindre la page de profil « %s »."
-
-#. TRANS: Exception. %s is a URL.
-#: classes/Ostatus_profile.php:786
-#, php-format
-msgid "Could not find a feed URL for profile page %s."
-msgstr ""
-"Impossible de trouver une adresse URL de flux d’information pour la page de "
-"profil « %s »."
-
-#. TRANS: Feed sub exception.
-#: classes/Ostatus_profile.php:885
-msgid "Can't find enough profile information to make a feed."
-msgstr ""
-"Impossible de trouver assez d’informations de profil pour créer un flux "
-"d’information."
-
-#. TRANS: Server exception. %s is a URL.
-#: classes/Ostatus_profile.php:949
-#, php-format
-msgid "Invalid avatar URL %s."
-msgstr "Adresse URL d’avatar « %s » invalide."
-
-#. TRANS: Server exception. %s is a URI.
-#: classes/Ostatus_profile.php:960
-#, php-format
-msgid "Tried to update avatar for unsaved remote profile %s."
-msgstr ""
-"Tente de mettre à jour l’avatar associé au profil distant non sauvegardé « %s "
-"»."
-
-#. TRANS: Server exception. %s is a URL.
-#: classes/Ostatus_profile.php:970
-#, php-format
-msgid "Unable to fetch avatar from %s."
-msgstr "Impossible de récupérer l’avatar depuis « %s »."
-
-#. TRANS: Exception.
-#: classes/Ostatus_profile.php:1197
-msgid "Local user can't be referenced as remote."
-msgstr "L’utilisateur local ne peut être référencé comme distant."
-
-#. TRANS: Exception.
-#: classes/Ostatus_profile.php:1202
-msgid "Local group can't be referenced as remote."
-msgstr "Le groupe local ne peut être référencé comme distant."
-
-#. TRANS: Server exception.
-#: classes/Ostatus_profile.php:1254 classes/Ostatus_profile.php:1265
-msgid "Can't save local profile."
-msgstr "Impossible de sauvegarder le profil local."
-
-#. TRANS: Server exception.
-#: classes/Ostatus_profile.php:1273
-msgid "Can't save OStatus profile."
-msgstr "Impossible de sauvegarder le profil OStatus."
-
-#. TRANS: Exception.
-#: classes/Ostatus_profile.php:1561 classes/Ostatus_profile.php:1589
-msgid "Not a valid webfinger address."
-msgstr "Ce n’est pas une adresse « webfinger » valide."
-
-#. TRANS: Exception. %s is a webfinger address.
-#: classes/Ostatus_profile.php:1671
-#, php-format
-msgid "Couldn't save profile for \"%s\"."
-msgstr "Impossible de sauvegarder le profil pour « %s »."
-
-#. TRANS: Exception. %s is a webfinger address.
-#: classes/Ostatus_profile.php:1690
-#, php-format
-msgid "Couldn't save ostatus_profile for \"%s\"."
-msgstr "Impossible d’enregistrer le profil OStatus pour « %s »."
-
-#. TRANS: Exception. %s is a webfinger address.
-#: classes/Ostatus_profile.php:1698
-#, php-format
-msgid "Couldn't find a valid profile for \"%s\"."
-msgstr "Impossible de trouver un profil valide pour « %s »."
-
-#. TRANS: Server exception.
-#: classes/Ostatus_profile.php:1741
-msgid "Could not store HTML content of long post as file."
-msgstr ""
-"Impossible de stocker le contenu HTML d’une longue publication en un fichier."
-
-#. TRANS: Client exception. %s is a HTTP status code.
-#: classes/HubSub.php:212
-#, php-format
-msgid "Hub subscriber verification returned HTTP %s."
-msgstr ""
-"La vérification d’abonné sur le concentrateur a retourné le statut HTTP « %s "
-"»."
-
-#. TRANS: Exception. %1$s is a response status code, %2$s is the body of the response.
-#: classes/HubSub.php:359
-#, php-format
-msgid "Callback returned status: %1$s. Body: %2$s"
-msgstr "La routine de rappel a retourné le statut « %1$s ». Corps : %2$s"
-
-#. TRANS: Client error. POST is a HTTP command. It should not be translated.
-#: lib/salmonaction.php:43
-msgid "This method requires a POST."
-msgstr "Cette méthode nécessite une commande HTTP « POST »."
-
-#. TRANS: Client error. Do not translate "application/magic-envelope+xml"
-#: lib/salmonaction.php:48
-msgid "Salmon requires \"application/magic-envelope+xml\"."
-msgstr "Salmon exige le type « application/magic-envelope+xml »."
-
-#. TRANS: Client error.
-#: lib/salmonaction.php:58
-msgid "Salmon signature verification failed."
-msgstr "La vérification de signature Salmon a échoué."
-
-#. TRANS: Client error.
-#: lib/salmonaction.php:70
-msgid "Salmon post must be an Atom entry."
-msgstr "Une publication Salmon doit être une entrée « Atom »."
-
-#. TRANS: Client exception.
-#: lib/salmonaction.php:120
-msgid "Unrecognized activity type."
-msgstr "Type d’activité non reconnu."
-
-#. TRANS: Client exception.
-#: lib/salmonaction.php:130
-msgid "This target doesn't understand posts."
-msgstr "Cette cible ne reconnaît pas les publications."
-
-#. TRANS: Client exception.
-#: lib/salmonaction.php:136
-msgid "This target doesn't understand follows."
-msgstr "Cette cible ne reconnaît pas les indications de début de suivi."
-
-#. TRANS: Client exception.
-#: lib/salmonaction.php:142
-msgid "This target doesn't understand unfollows."
-msgstr "Cette cible ne reconnaît pas les indications de fin de suivi."
-
-#. TRANS: Client exception.
-#: lib/salmonaction.php:148
-msgid "This target doesn't understand favorites."
-msgstr "Cette cible ne reconnaît pas les indications de mise en favoris."
-
-#. TRANS: Client exception.
-#: lib/salmonaction.php:154
-msgid "This target doesn't understand unfavorites."
-msgstr "Cette cible ne reconnaît pas les indications de retrait des favoris."
-
-#. TRANS: Client exception.
-#: lib/salmonaction.php:160
-msgid "This target doesn't understand share events."
-msgstr "Cette cible ne reconnaît pas les évènements partagés."
-
-#. TRANS: Client exception.
-#: lib/salmonaction.php:166
-msgid "This target doesn't understand joins."
-msgstr "Cette cible ne reconnaît pas les indications d’adhésion."
-
-#. TRANS: Client exception.
-#: lib/salmonaction.php:172
-msgid "This target doesn't understand leave events."
-msgstr "Cette cible ne reconnaît pas les indications de retrait d’évènements."
-
-#. TRANS: Exception.
-#: lib/salmonaction.php:200
-msgid "Received a salmon slap from unidentified actor."
-msgstr "Réception d’une giffle Salmon d’un acteur non identifié."
-
-#. TRANS: Exception.
-#: lib/magicenvelope.php:80
-msgid "Unable to locate signer public key."
-msgstr "Impossible de trouver la clé publique du signataire."
-
-#. TRANS: Exception.
-#: lib/salmon.php:126
-msgid "Salmon invalid actor for signing."
-msgstr "Acteur Salmon invalide pour la signature."
-
-#: tests/gettext-speedtest.php:57
-msgid "Feeds"
-msgstr "Flux d’informations"
-
-#. TRANS: Client exception.
-#: actions/pushhub.php:70
 msgid "Publishing outside feeds not supported."
 msgstr "La publication des flux externes n’est pas supportée."
 
 #. TRANS: Client exception. %s is a mode.
-#: actions/pushhub.php:73
 #, php-format
 msgid "Unrecognized mode \"%s\"."
 msgstr "Mode « %s » non reconnu."
 
 #. TRANS: Client exception. %s is a topic.
-#: actions/pushhub.php:93
 #, php-format
 msgid ""
 "Unsupported hub.topic %s this hub only serves local user and group Atom "
@@ -401,7 +125,6 @@ msgstr ""
 "que les flux Atom d’utilisateurs et groupes locaux."
 
 #. TRANS: Client exception.
-#: actions/pushhub.php:99
 #, php-format
 msgid "Invalid hub.verify \"%s\". It must be sync or async."
 msgstr ""
@@ -409,7 +132,6 @@ msgstr ""
 "« async »."
 
 #. TRANS: Client exception.
-#: actions/pushhub.php:105
 #, php-format
 msgid "Invalid hub.lease \"%s\". It must be empty or positive integer."
 msgstr ""
@@ -417,7 +139,6 @@ msgstr ""
 "positif."
 
 #. TRANS: Client exception.
-#: actions/pushhub.php:113
 #, php-format
 msgid "Invalid hub.secret \"%s\". It must be under 200 bytes."
 msgstr ""
@@ -425,174 +146,60 @@ msgstr ""
 "octets."
 
 #. TRANS: Client exception.
-#: actions/pushhub.php:165
 #, php-format
 msgid "Invalid hub.topic \"%s\". User doesn't exist."
 msgstr ""
 "Le sujet de concentrateur « %s » est invalide. L’utilisateur n’existe pas."
 
 #. TRANS: Client exception.
-#: actions/pushhub.php:174
 #, php-format
 msgid "Invalid hub.topic \"%s\". Group doesn't exist."
 msgstr "Le sujet de concentrateur « %s » est invalide. Le groupe n’existe pas."
 
 #. TRANS: Client exception.
 #. TRANS: %1$s is this argument to the method this exception occurs in, %2$s is a URL.
-#: actions/pushhub.php:199
 #, php-format
 msgid "Invalid URL passed for %1$s: \"%2$s\""
 msgstr "URL invalide passée à la méthode « %1$s » : « %2$s »"
 
-#: actions/ownerxrd.php:39 actions/usersalmon.php:43
+msgid "Empty or invalid feed id."
+msgstr "Identifiant de flux vide ou invalide."
+
+#. TRANS: Server exception. %s is a feed ID.
+#, php-format
+msgid "Unknown PuSH feed id %s"
+msgstr "Identifiant de flux PuSH inconnu : « %s »"
+
+#. TRANS: Client exception. %s is an invalid feed name.
+#, php-format
+msgid "Bad hub.topic feed \"%s\"."
+msgstr "Flux de sujet de concentrateur incorrect : « %s »"
+
+#. TRANS: Client exception. %1$s the invalid token, %2$s is the topic for which the invalid token was given.
+#, php-format
+msgid "Bad hub.verify_token %1$s for %2$s."
+msgstr ""
+"Jeton de vérification de concentrateur incorrect « %1$s » pour le sujet « %2$s "
+"»."
+
+#. TRANS: Client exception. %s is an invalid topic.
+#, php-format
+msgid "Unexpected subscribe request for %s."
+msgstr "Demande d’abonnement inattendue pour le sujet invalide « %s »."
+
+#. TRANS: Client exception. %s is an invalid topic.
+#, php-format
+msgid "Unexpected unsubscribe request for %s."
+msgstr "Demande de désabonnement inattendue pour le sujet invalide « %s »."
+
 msgid "No such user."
 msgstr "Utilisateur inexistant."
 
-#. TRANS: Client error.
-#: actions/usersalmon.php:37 actions/groupsalmon.php:40
-msgid "No ID."
-msgstr "Aucun identifiant."
-
-#. TRANS: Client exception.
-#: actions/usersalmon.php:83
-msgid "In reply to unknown notice."
-msgstr "En réponse à l’avis inconnu."
-
-#. TRANS: Client exception.
-#: actions/usersalmon.php:88
-msgid "In reply to a notice not by this user and not mentioning this user."
-msgstr ""
-"En réponse à un avis non émis par cet utilisateur et ne mentionnant pas cet "
-"utilisateur."
-
-#. TRANS: Client exception.
-#: actions/usersalmon.php:165
-msgid "Could not save new favorite."
-msgstr "Impossible de sauvegarder le nouveau favori."
-
-#. TRANS: Client exception.
-#: actions/usersalmon.php:197
-msgid "Can't favorite/unfavorite without an object."
-msgstr "Impossible de mettre en favoris ou retirer des favoris sans un objet."
-
-#. TRANS: Client exception.
-#: actions/usersalmon.php:209
-msgid "Can't handle that kind of object for liking/faving."
-msgstr ""
-"Impossible de gérer ce genre d’objet parmi les sujets appréciés ou favoris."
-
-#. TRANS: Client exception. %s is an object ID.
-#: actions/usersalmon.php:216
-#, php-format
-msgid "Notice with ID %s unknown."
-msgstr "Avis d’identifiant « %s » inconnu."
-
-#. TRANS: Client exception. %1$s is a notice ID, %2$s is a user ID.
-#: actions/usersalmon.php:221
-#, php-format
-msgid "Notice with ID %1$s not posted by %2$s."
-msgstr "Avis d’identifiant « %1$s » non publié par %2$s."
-
-#. TRANS: Field label.
-#: actions/ostatusgroup.php:78
-msgid "Join group"
-msgstr "Rejoindre le groupe"
-
-#. TRANS: Tooltip for field label "Join group".
-#: actions/ostatusgroup.php:81
-msgid "OStatus group's address, like http://example.net/group/nickname."
-msgstr ""
-"Une adresse de groupe OStatus telle que « http://example.net/group/pseudonyme "
-"»."
-
-#. TRANS: Button text.
-#: actions/ostatusgroup.php:86 actions/ostatussub.php:75
-msgctxt "BUTTON"
-msgid "Continue"
-msgstr "Continuer"
-
-#: actions/ostatusgroup.php:105
-msgid "You are already a member of this group."
-msgstr "Vous êtes déjà membre de ce groupe."
-
-#. TRANS: OStatus remote group subscription dialog error.
-#: actions/ostatusgroup.php:140
-msgid "Already a member!"
-msgstr "Déjà membre !"
-
-#. TRANS: OStatus remote group subscription dialog error.
-#: actions/ostatusgroup.php:151
-msgid "Remote group join failed!"
-msgstr "L’adhésion au groupe distant a échoué !"
-
-#. TRANS: OStatus remote group subscription dialog error.
-#: actions/ostatusgroup.php:155
-msgid "Remote group join aborted!"
-msgstr "L’adhésion au groupe distant a été avortée !"
-
-#. TRANS: Page title for OStatus remote group join form
-#: actions/ostatusgroup.php:167
-msgid "Confirm joining remote group"
-msgstr "Confirmer l’adhésion au groupe distant"
-
-#. TRANS: Instructions.
-#: actions/ostatusgroup.php:178
-msgid ""
-"You can subscribe to groups from other supported sites. Paste the group's "
-"profile URI below:"
-msgstr ""
-"Vous pouvez souscrire aux groupes d’autres sites supportés. Collez l’adresse "
-"URI du profil du groupe ci-dessous :"
-
-#. TRANS: Client error.
-#: actions/groupsalmon.php:47
-msgid "No such group."
-msgstr "Groupe inexistant."
-
-#. TRANS: Client error.
-#: actions/groupsalmon.php:56
-msgid "Can't accept remote posts for a remote group."
-msgstr ""
-"Impossible d’accepter des envois distants de messages pour un groupe distant."
-
-#. TRANS: Client error.
-#: actions/groupsalmon.php:130
-msgid "Can't read profile to set up group membership."
-msgstr ""
-"Impossible de lire le profil pour mettre en place l’adhésion à un groupe."
-
-#. TRANS: Client error.
-#: actions/groupsalmon.php:134 actions/groupsalmon.php:177
-msgid "Groups can't join groups."
-msgstr "Les groupes ne peuvent pas adhérer à des groupes."
-
-#: actions/groupsalmon.php:147
-msgid "You have been blocked from that group by the admin."
-msgstr "Vous avez été bloqué de ce groupe par l’administrateur."
-
-#. TRANS: Server error. %1$s is a profile URI, %2$s is a group nickname.
-#: actions/groupsalmon.php:162
-#, php-format
-msgid "Could not join remote user %1$s to group %2$s."
-msgstr "Impossible d’inscrire l’utilisateur distant %1$s au groupe %2$s."
-
-#: actions/groupsalmon.php:174
-msgid "Can't read profile to cancel group membership."
-msgstr "Impossible de lire le profil pour annuler l’adhésion à un groupe."
-
-#. TRANS: Server error. %1$s is a profile URI, %2$s is a group nickname.
-#: actions/groupsalmon.php:191
-#, php-format
-msgid "Could not remove remote user %1$s from group %2$s."
-msgstr "Impossible de retirer l’utilisateur distant %1$s du groupe %2$s."
-
 #. TRANS: Field label for a field that takes an OStatus user address.
-#: actions/ostatussub.php:68
 msgid "Subscribe to"
 msgstr "S’abonner à"
 
 #. TRANS: Tooltip for field label "Subscribe to".
-#: actions/ostatussub.php:71
 msgid ""
 "OStatus user's address, like nickname@example.com or http://example.net/"
 "nickname"
@@ -600,31 +207,30 @@ msgstr ""
 "Adresse d’un utilisateur OStatus ou de sa page de profil, telle que "
 "pseudonyme@example.com ou http://example.net/pseudonyme"
 
+#. TRANS: Button text.
+msgctxt "BUTTON"
+msgid "Continue"
+msgstr "Continuer"
+
 #. TRANS: Button text.
 #. TRANS: Tooltip for button "Join".
-#: actions/ostatussub.php:112
 msgctxt "BUTTON"
 msgid "Join this group"
 msgstr "Rejoindre ce groupe"
 
 #. TRANS: Button text.
-#: actions/ostatussub.php:115
 msgctxt "BUTTON"
 msgid "Confirm"
 msgstr "Confirmer"
 
 #. TRANS: Tooltip for button "Confirm".
-#: actions/ostatussub.php:117
 msgid "Subscribe to this user"
 msgstr "S’abonner à cet utilisateur"
 
-#: actions/ostatussub.php:138
 msgid "You are already subscribed to this user."
 msgstr "Vous êtes déjà abonné à cet utilisateur."
 
 #. TRANS: Error text.
-#: actions/ostatussub.php:232 actions/ostatussub.php:239
-#: actions/ostatussub.php:264
 msgid ""
 "Sorry, we could not reach that address. Please make sure that the OStatus "
 "address is like nickname@example.com or http://example.net/nickname."
@@ -634,9 +240,6 @@ msgstr ""
 "forme pseudonyme@example.com ou http://example.net/pseudonyme."
 
 #. TRANS: Error text.
-#: actions/ostatussub.php:243 actions/ostatussub.php:247
-#: actions/ostatussub.php:251 actions/ostatussub.php:255
-#: actions/ostatussub.php:259
 msgid ""
 "Sorry, we could not reach that feed. Please try that OStatus address again "
 "later."
@@ -645,33 +248,27 @@ msgstr ""
 "cette adresse OStatus."
 
 #. TRANS: OStatus remote subscription dialog error.
-#: actions/ostatussub.php:293
 msgid "Already subscribed!"
 msgstr "Déjà abonné !"
 
 #. TRANS: OStatus remote subscription dialog error.
-#: actions/ostatussub.php:298
 msgid "Remote subscription failed!"
 msgstr "Ĺ’abonnement distant a échoué !"
 
-#: actions/ostatussub.php:345 actions/ostatusinit.php:64
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 "Un problème est survenu avec votre jeton de session. Veuillez essayer à "
 "nouveau."
 
 #. TRANS: Form title.
-#: actions/ostatussub.php:373 actions/ostatusinit.php:83
 msgid "Subscribe to user"
 msgstr "S’abonner à un utilisateur"
 
 #. TRANS: Page title for OStatus remote subscription form
-#: actions/ostatussub.php:393
 msgid "Confirm"
 msgstr "Confirmer"
 
 #. TRANS: Instructions.
-#: actions/ostatussub.php:405
 msgid ""
 "You can subscribe to users from other supported sites. Paste their address "
 "or profile URI below:"
@@ -679,130 +276,383 @@ msgstr ""
 "Vous pouvez vous abonner aux utilisateurs d’autres sites pris en charge. "
 "Collez leur adresse ou l’URI de leur profil ci-dessous :"
 
+#. TRANS: Field label.
+msgid "Join group"
+msgstr "Rejoindre le groupe"
+
+#. TRANS: Tooltip for field label "Join group".
+msgid "OStatus group's address, like http://example.net/group/nickname."
+msgstr ""
+"Une adresse de groupe OStatus telle que « http://example.net/group/pseudonyme "
+"»."
+
+msgid "You are already a member of this group."
+msgstr "Vous êtes déjà membre de ce groupe."
+
+#. TRANS: OStatus remote group subscription dialog error.
+msgid "Already a member!"
+msgstr "Déjà membre !"
+
+#. TRANS: OStatus remote group subscription dialog error.
+msgid "Remote group join failed!"
+msgstr "L’adhésion au groupe distant a échoué !"
+
+#. TRANS: OStatus remote group subscription dialog error.
+msgid "Remote group join aborted!"
+msgstr "L’adhésion au groupe distant a été avortée !"
+
+#. TRANS: Page title for OStatus remote group join form
+msgid "Confirm joining remote group"
+msgstr "Confirmer l’adhésion au groupe distant"
+
+#. TRANS: Instructions.
+msgid ""
+"You can subscribe to groups from other supported sites. Paste the group's "
+"profile URI below:"
+msgstr ""
+"Vous pouvez souscrire aux groupes d’autres sites supportés. Collez l’adresse "
+"URI du profil du groupe ci-dessous :"
+
+#. TRANS: Client error.
+msgid "No ID."
+msgstr "Aucun identifiant."
+
+#. TRANS: Client exception.
+msgid "In reply to unknown notice."
+msgstr "En réponse à l’avis inconnu."
+
+#. TRANS: Client exception.
+msgid "In reply to a notice not by this user and not mentioning this user."
+msgstr ""
+"En réponse à un avis non émis par cet utilisateur et ne mentionnant pas cet "
+"utilisateur."
+
+#. TRANS: Client exception.
+msgid "Could not save new favorite."
+msgstr "Impossible de sauvegarder le nouveau favori."
+
+#. TRANS: Client exception.
+msgid "Can't favorite/unfavorite without an object."
+msgstr "Impossible de mettre en favoris ou retirer des favoris sans un objet."
+
+#. TRANS: Client exception.
+msgid "Can't handle that kind of object for liking/faving."
+msgstr ""
+"Impossible de gérer ce genre d’objet parmi les sujets appréciés ou favoris."
+
+#. TRANS: Client exception. %s is an object ID.
+#, php-format
+msgid "Notice with ID %s unknown."
+msgstr "Avis d’identifiant « %s » inconnu."
+
+#. TRANS: Client exception. %1$s is a notice ID, %2$s is a user ID.
+#, php-format
+msgid "Notice with ID %1$s not posted by %2$s."
+msgstr "Avis d’identifiant « %1$s » non publié par %2$s."
+
+#. TRANS: Client error.
+msgid "No such group."
+msgstr "Groupe inexistant."
+
+#. TRANS: Client error.
+msgid "Can't accept remote posts for a remote group."
+msgstr ""
+"Impossible d’accepter des envois distants de messages pour un groupe distant."
+
+#. TRANS: Client error.
+msgid "Can't read profile to set up group membership."
+msgstr ""
+"Impossible de lire le profil pour mettre en place l’adhésion à un groupe."
+
+#. TRANS: Client error.
+msgid "Groups can't join groups."
+msgstr "Les groupes ne peuvent pas adhérer à des groupes."
+
+msgid "You have been blocked from that group by the admin."
+msgstr "Vous avez été bloqué de ce groupe par l’administrateur."
+
+#. TRANS: Server error. %1$s is a profile URI, %2$s is a group nickname.
+#, php-format
+msgid "Could not join remote user %1$s to group %2$s."
+msgstr "Impossible d’inscrire l’utilisateur distant %1$s au groupe %2$s."
+
+msgid "Can't read profile to cancel group membership."
+msgstr "Impossible de lire le profil pour annuler l’adhésion à un groupe."
+
+#. TRANS: Server error. %1$s is a profile URI, %2$s is a group nickname.
+#, php-format
+msgid "Could not remove remote user %1$s from group %2$s."
+msgstr "Impossible de retirer l’utilisateur distant %1$s du groupe %2$s."
+
 #. TRANS: Client error.
-#: actions/ostatusinit.php:42
 msgid "You can use the local subscription!"
 msgstr "Vous pouvez utiliser l’abonnement local !"
 
 #. TRANS: Form legend.
-#: actions/ostatusinit.php:98
 #, php-format
 msgid "Join group %s"
 msgstr "Rejoindre le groupe « %s »"
 
 #. TRANS: Button text.
-#: actions/ostatusinit.php:100
 msgctxt "BUTTON"
 msgid "Join"
 msgstr "Rejoindre"
 
 #. TRANS: Form legend.
-#: actions/ostatusinit.php:103
 #, php-format
 msgid "Subscribe to %s"
 msgstr "S’abonner à « %s »"
 
 #. TRANS: Button text.
-#: actions/ostatusinit.php:105
 msgctxt "BUTTON"
 msgid "Subscribe"
 msgstr "S’abonner"
 
 #. TRANS: Field label.
-#: actions/ostatusinit.php:119
 msgid "Group nickname"
 msgstr "Pseudonyme du groupe"
 
-#: actions/ostatusinit.php:120
 msgid "Nickname of the group you want to join."
 msgstr "Pseudonyme du groupe que vous voulez rejoindre."
 
 #. TRANS: Field label.
-#: actions/ostatusinit.php:123
 msgid "User nickname"
 msgstr "Pseudonyme de l’utilisateur"
 
-#: actions/ostatusinit.php:124
 msgid "Nickname of the user you want to follow."
 msgstr "Pseudonyme de l’utilisateur que vous voulez suivre."
 
 #. TRANS: Field label.
-#: actions/ostatusinit.php:129
 msgid "Profile Account"
 msgstr "Compte de profil"
 
 #. TRANS: Tooltip for field label "Profile Account".
-#: actions/ostatusinit.php:131
 msgid "Your account id (e.g. user@identi.ca)."
 msgstr "Votre identifiant de compte (utilisateur@identi.ca, par exemple)."
 
 #. TRANS: Client error.
-#: actions/ostatusinit.php:153
 msgid "Must provide a remote profile."
 msgstr "Vous devez fournir un profil distant."
 
 #. TRANS: Client error.
-#: actions/ostatusinit.php:165
 msgid "Couldn't look up OStatus account profile."
 msgstr "Impossible de consulter le profil de compte OStatus."
 
 #. TRANS: Client error.
-#: actions/ostatusinit.php:178
 msgid "Couldn't confirm remote profile address."
 msgstr "Impossible de confirmer l’adresse de profil distant."
 
 #. TRANS: Page title.
-#: actions/ostatusinit.php:223
 msgid "OStatus Connect"
 msgstr "Connexion OStatus"
 
-#: actions/pushcallback.php:50
-msgid "Empty or invalid feed id."
-msgstr "Identifiant de flux vide ou invalide."
-
-#. TRANS: Server exception. %s is a feed ID.
-#: actions/pushcallback.php:56
-#, php-format
-msgid "Unknown PuSH feed id %s"
-msgstr "Identifiant de flux PuSH inconnu : « %s »"
-
-#. TRANS: Client exception. %s is an invalid feed name.
-#: actions/pushcallback.php:96
-#, php-format
-msgid "Bad hub.topic feed \"%s\"."
-msgstr "Flux de sujet de concentrateur incorrect : « %s »"
-
-#. TRANS: Client exception. %1$s the invalid token, %2$s is the topic for which the invalid token was given.
-#: actions/pushcallback.php:101
-#, php-format
-msgid "Bad hub.verify_token %1$s for %2$s."
+msgid "Attempting to start PuSH subscription for feed with no hub."
 msgstr ""
-"Jeton de vérification de concentrateur incorrect « %1$s » pour le sujet « %2$s "
+"Tente de démarrer l’inscription PuSH à un flux d’information sans "
+"concentrateur."
+
+msgid "Attempting to end PuSH subscription for feed with no hub."
+msgstr ""
+"Tente d’arrêter l’inscription PuSH à un flux d’information sans "
+"concentrateur."
+
+#. TRANS: Server exception. %s is a URI.
+#, php-format
+msgid "Invalid ostatus_profile state: both group and profile IDs set for %s."
+msgstr ""
+"État invalide du profil OStatus : identifiants à la fois de groupe et de "
+"profil définis pour « %s »."
+
+#. TRANS: Server exception. %s is a URI.
+#, php-format
+msgid "Invalid ostatus_profile state: both group and profile IDs empty for %s."
+msgstr ""
+"État invalide du profil OStatus : identifiants à la fois de groupe et de "
+"profil non renseignés pour « %s »."
+
+#. TRANS: Server exception.
+#. TRANS: %1$s is the method name the exception occured in, %2$s is the actor type.
+#, php-format
+msgid "Invalid actor passed to %1$s: %2$s."
+msgstr "Type d’acteur invalide passé à la méthode « %1$s » : « %2$s »."
+
+#. TRANS: Server exception.
+msgid ""
+"Invalid type passed to Ostatus_profile::notify. It must be XML string or "
+"Activity entry."
+msgstr ""
+"Type invalide passé à la méthode « Ostatus_profile::notify ». Ce doit être "
+"une chaîne XML ou une entrée « Activity »."
+
+#. TRANS: Exception.
+msgid "Unknown feed format."
+msgstr "Format de flux d’information inconnu."
+
+#. TRANS: Exception.
+msgid "RSS feed without a channel."
+msgstr "Flux RSS sans canal."
+
+#. TRANS: Client exception.
+msgid "Can't handle that kind of post."
+msgstr "Impossible de gérer cette sorte de publication."
+
+#. TRANS: Client exception. %s is a source URI.
+#, php-format
+msgid "No content for notice %s."
+msgstr "Aucun contenu dans l’avis « %s »."
+
+#. TRANS: Shown when a notice is longer than supported and/or when attachments are present. At runtime
+#. TRANS: this will usually be replaced with localised text from StatusNet core messages.
+msgid "Show more"
+msgstr "Voir davantage"
+
+#. TRANS: Exception. %s is a profile URL.
+#, php-format
+msgid "Could not reach profile page %s."
+msgstr "Impossible d’atteindre la page de profil « %s »."
+
+#. TRANS: Exception. %s is a URL.
+#, php-format
+msgid "Could not find a feed URL for profile page %s."
+msgstr ""
+"Impossible de trouver une adresse URL de flux d’information pour la page de "
+"profil « %s »."
+
+#. TRANS: Feed sub exception.
+msgid "Can't find enough profile information to make a feed."
+msgstr ""
+"Impossible de trouver assez d’informations de profil pour créer un flux "
+"d’information."
+
+#. TRANS: Server exception. %s is a URL.
+#, php-format
+msgid "Invalid avatar URL %s."
+msgstr "Adresse URL d’avatar « %s » invalide."
+
+#. TRANS: Server exception. %s is a URI.
+#, php-format
+msgid "Tried to update avatar for unsaved remote profile %s."
+msgstr ""
+"Tente de mettre à jour l’avatar associé au profil distant non sauvegardé « %s "
 "»."
 
-#. TRANS: Client exception. %s is an invalid topic.
-#: actions/pushcallback.php:108
+#. TRANS: Server exception. %s is a URL.
 #, php-format
-msgid "Unexpected subscribe request for %s."
-msgstr "Demande d’abonnement inattendue pour le sujet invalide « %s »."
+msgid "Unable to fetch avatar from %s."
+msgstr "Impossible de récupérer l’avatar depuis « %s »."
 
-#. TRANS: Client exception. %s is an invalid topic.
-#: actions/pushcallback.php:113
+#. TRANS: Exception.
+msgid "Local user can't be referenced as remote."
+msgstr "L’utilisateur local ne peut être référencé comme distant."
+
+#. TRANS: Exception.
+msgid "Local group can't be referenced as remote."
+msgstr "Le groupe local ne peut être référencé comme distant."
+
+#. TRANS: Server exception.
+msgid "Can't save local profile."
+msgstr "Impossible de sauvegarder le profil local."
+
+#. TRANS: Server exception.
+msgid "Can't save OStatus profile."
+msgstr "Impossible de sauvegarder le profil OStatus."
+
+#. TRANS: Exception.
+msgid "Not a valid webfinger address."
+msgstr "Ce n’est pas une adresse « webfinger » valide."
+
+#. TRANS: Exception. %s is a webfinger address.
 #, php-format
-msgid "Unexpected unsubscribe request for %s."
-msgstr "Demande de désabonnement inattendue pour le sujet invalide « %s »."
+msgid "Couldn't save profile for \"%s\"."
+msgstr "Impossible de sauvegarder le profil pour « %s »."
 
-#~ msgid "Photo"
-#~ msgstr "Photo"
+#. TRANS: Exception. %s is a webfinger address.
+#, php-format
+msgid "Couldn't save ostatus_profile for \"%s\"."
+msgstr "Impossible d’enregistrer le profil OStatus pour « %s »."
 
-#~ msgid "Nickname"
-#~ msgstr "Pseudonyme"
+#. TRANS: Exception. %s is a webfinger address.
+#, php-format
+msgid "Couldn't find a valid profile for \"%s\"."
+msgstr "Impossible de trouver un profil valide pour « %s »."
 
-#~ msgid "Location"
-#~ msgstr "Emplacement"
+#. TRANS: Server exception.
+msgid "Could not store HTML content of long post as file."
+msgstr ""
+"Impossible de stocker le contenu HTML d’une longue publication en un fichier."
 
-#~ msgid "URL"
-#~ msgstr "Adresse URL"
+#. TRANS: Client exception. %s is a HTTP status code.
+#, php-format
+msgid "Hub subscriber verification returned HTTP %s."
+msgstr ""
+"La vérification d’abonné sur le concentrateur a retourné le statut HTTP « %s "
+"»."
 
-#~ msgid "Note"
-#~ msgstr "Note"
+#. TRANS: Exception. %1$s is a response status code, %2$s is the body of the response.
+#, php-format
+msgid "Callback returned status: %1$s. Body: %2$s"
+msgstr "La routine de rappel a retourné le statut « %1$s ». Corps : %2$s"
+
+#. TRANS: Exception.
+msgid "Unable to locate signer public key."
+msgstr "Impossible de trouver la clé publique du signataire."
+
+#. TRANS: Exception.
+msgid "Salmon invalid actor for signing."
+msgstr "Acteur Salmon invalide pour la signature."
+
+#. TRANS: Client error. POST is a HTTP command. It should not be translated.
+msgid "This method requires a POST."
+msgstr "Cette méthode nécessite une commande HTTP « POST »."
+
+#. TRANS: Client error. Do not translate "application/magic-envelope+xml"
+msgid "Salmon requires \"application/magic-envelope+xml\"."
+msgstr "Salmon exige le type « application/magic-envelope+xml »."
+
+#. TRANS: Client error.
+msgid "Salmon signature verification failed."
+msgstr "La vérification de signature Salmon a échoué."
+
+#. TRANS: Client error.
+msgid "Salmon post must be an Atom entry."
+msgstr "Une publication Salmon doit être une entrée « Atom »."
+
+#. TRANS: Client exception.
+msgid "Unrecognized activity type."
+msgstr "Type d’activité non reconnu."
+
+#. TRANS: Client exception.
+msgid "This target doesn't understand posts."
+msgstr "Cette cible ne reconnaît pas les publications."
+
+#. TRANS: Client exception.
+msgid "This target doesn't understand follows."
+msgstr "Cette cible ne reconnaît pas les indications de début de suivi."
+
+#. TRANS: Client exception.
+msgid "This target doesn't understand unfollows."
+msgstr "Cette cible ne reconnaît pas les indications de fin de suivi."
+
+#. TRANS: Client exception.
+msgid "This target doesn't understand favorites."
+msgstr "Cette cible ne reconnaît pas les indications de mise en favoris."
+
+#. TRANS: Client exception.
+msgid "This target doesn't understand unfavorites."
+msgstr "Cette cible ne reconnaît pas les indications de retrait des favoris."
+
+#. TRANS: Client exception.
+msgid "This target doesn't understand share events."
+msgstr "Cette cible ne reconnaît pas les évènements partagés."
+
+#. TRANS: Client exception.
+msgid "This target doesn't understand joins."
+msgstr "Cette cible ne reconnaît pas les indications d’adhésion."
+
+#. TRANS: Client exception.
+msgid "This target doesn't understand leave events."
+msgstr "Cette cible ne reconnaît pas les indications de retrait d’évènements."
+
+#. TRANS: Exception.
+msgid "Received a salmon slap from unidentified actor."
+msgstr "Réception d’une giffle Salmon d’un acteur non identifié."
diff --git a/plugins/OStatus/locale/ia/LC_MESSAGES/OStatus.po b/plugins/OStatus/locale/ia/LC_MESSAGES/OStatus.po
index ad166ccece..50afb92536 100644
--- a/plugins/OStatus/locale/ia/LC_MESSAGES/OStatus.po
+++ b/plugins/OStatus/locale/ia/LC_MESSAGES/OStatus.po
@@ -9,108 +9,94 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OStatus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:45+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:59+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-14 17:22:01+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:49:39+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-ostatus\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+msgid "Feeds"
+msgstr "Syndicationes"
+
 #. TRANS: Link description for link to subscribe to a remote user.
 #. TRANS: Link text for a user to subscribe to an OStatus user.
-#: OStatusPlugin.php:223 OStatusPlugin.php:933
 msgid "Subscribe"
 msgstr "Subscriber"
 
 #. TRANS: Link description for link to join a remote group.
-#: OStatusPlugin.php:242 OStatusPlugin.php:651 actions/ostatussub.php:109
 msgid "Join"
 msgstr "Inscriber"
 
 #. TRANSLATE: %s is a domain.
-#: OStatusPlugin.php:455
 #, php-format
 msgid "Sent from %s via OStatus"
 msgstr "Inviate de %s via OStatus"
 
 #. TRANS: Exception.
-#: OStatusPlugin.php:527
 msgid "Could not set up remote subscription."
 msgstr "Non poteva configurar le subscription remote."
 
-#: OStatusPlugin.php:601
 msgid "Unfollow"
 msgstr "Non plus sequer"
 
 #. TRANS: Success message for unsubscribe from user attempt through OStatus.
 #. TRANS: %1$s is the unsubscriber's name, %2$s is the unsubscribed user's name.
-#: OStatusPlugin.php:604
 #, php-format
 msgid "%1$s stopped following %2$s."
 msgstr "%1$s cessava de sequer %2$s."
 
-#: OStatusPlugin.php:632
 msgid "Could not set up remote group membership."
 msgstr "Non poteva configurar le membrato del gruppo remote."
 
 #. TRANS: Success message for subscribe to group attempt through OStatus.
 #. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
-#: OStatusPlugin.php:654
 #, php-format
 msgid "%1$s has joined group %2$s."
 msgstr "%1$s se ha jungite al gruppo %2$s."
 
 #. TRANS: Exception.
-#: OStatusPlugin.php:663
 msgid "Failed joining remote group."
 msgstr "Falleva de facer se membro del gruppo remote."
 
-#: OStatusPlugin.php:703
 msgid "Leave"
 msgstr "Quitar"
 
 #. TRANS: Success message for unsubscribe from group attempt through OStatus.
 #. TRANS: %1$s is the member name, %2$s is the unsubscribed group's name.
-#: OStatusPlugin.php:706
 #, php-format
 msgid "%1$s has left group %2$s."
 msgstr "%1$s ha quitate le gruppo %2$s."
 
-#: OStatusPlugin.php:781
 msgid "Disfavor"
 msgstr "Disfavorir"
 
 #. TRANS: Success message for remove a favorite notice through OStatus.
 #. TRANS: %1$s is the unfavoring user's name, %2$s is URI to the no longer favored notice.
-#: OStatusPlugin.php:784
 #, php-format
 msgid "%1$s marked notice %2$s as no longer a favorite."
 msgstr "%1$s marcava le nota %2$s como non plus favorite."
 
 #. TRANS: Link text for link to remote subscribe.
-#: OStatusPlugin.php:860
 msgid "Remote"
 msgstr "Remote"
 
 #. TRANS: Title for activity.
-#: OStatusPlugin.php:900
 msgid "Profile update"
 msgstr "Actualisation de profilo"
 
 #. TRANS: Ping text for remote profile update through OStatus.
 #. TRANS: %s is user that updated their profile.
-#: OStatusPlugin.php:903
 #, php-format
 msgid "%s has updated their profile page."
 msgstr "%s ha actualisate su pagina de profilo."
 
 #. TRANS: Plugin description.
-#: OStatusPlugin.php:948
 msgid ""
 "Follow people across social networks that implement <a href=\"http://ostatus."
 "org/\">OStatus</a>."
@@ -118,264 +104,16 @@ msgstr ""
 "Sequer personas trans retes social que implementa <a href=\"http://ostatus."
 "org/\">OStatus</a>."
 
-#: classes/FeedSub.php:252
-msgid "Attempting to start PuSH subscription for feed with no hub."
-msgstr "Tentativa de comenciar subscription PuSH pro syndication sin centro."
-
-#: classes/FeedSub.php:282
-msgid "Attempting to end PuSH subscription for feed with no hub."
-msgstr "Tentativa de terminar subscription PuSH pro syndication sin centro."
-
-#. TRANS: Server exception. %s is a URI.
-#: classes/Ostatus_profile.php:154
-#, php-format
-msgid "Invalid ostatus_profile state: both group and profile IDs set for %s."
-msgstr ""
-"Stato ostatus_profile invalide: IDs e de gruppo e de profilo definite pro %s."
-
-#. TRANS: Server exception. %s is a URI.
-#: classes/Ostatus_profile.php:157
-#, php-format
-msgid "Invalid ostatus_profile state: both group and profile IDs empty for %s."
-msgstr ""
-"Stato ostatus_profile invalide: IDs e de gruppo e de profilo vacue pro %s."
-
-#. TRANS: Server exception.
-#. TRANS: %1$s is the method name the exception occured in, %2$s is the actor type.
-#: classes/Ostatus_profile.php:247
-#, php-format
-msgid "Invalid actor passed to %1$s: %2$s."
-msgstr "Actor invalide passate a %1$s: %2$s."
-
-#. TRANS: Server exception.
-#: classes/Ostatus_profile.php:341
-msgid ""
-"Invalid type passed to Ostatus_profile::notify. It must be XML string or "
-"Activity entry."
-msgstr ""
-"Typo invalide passate a Ostatos_profile::notify. Illo debe esser catena XML "
-"o entrata Activity."
-
-#. TRANS: Exception.
-#: classes/Ostatus_profile.php:372
-msgid "Unknown feed format."
-msgstr "Formato de syndication incognite."
-
-#. TRANS: Exception.
-#: classes/Ostatus_profile.php:396
-msgid "RSS feed without a channel."
-msgstr "Syndication RSS sin canal."
-
 #. TRANS: Client exception.
-#: classes/Ostatus_profile.php:442
-msgid "Can't handle that kind of post."
-msgstr "Non pote tractar iste typo de message."
-
-#. TRANS: Client exception. %s is a source URI.
-#: classes/Ostatus_profile.php:500
-#, php-format
-msgid "No content for notice %s."
-msgstr "Nulle contento pro nota %s."
-
-#. TRANS: Shown when a notice is longer than supported and/or when attachments are present. At runtime
-#. TRANS: this will usually be replaced with localised text from StatusNet core messages.
-#: classes/Ostatus_profile.php:535
-msgid "Show more"
-msgstr "Monstrar plus"
-
-#. TRANS: Exception. %s is a profile URL.
-#: classes/Ostatus_profile.php:728
-#, php-format
-msgid "Could not reach profile page %s."
-msgstr "Non poteva attinger pagina de profilo %s."
-
-#. TRANS: Exception. %s is a URL.
-#: classes/Ostatus_profile.php:786
-#, php-format
-msgid "Could not find a feed URL for profile page %s."
-msgstr "Non poteva trovar un URL de syndication pro pagina de profilo %s."
-
-#. TRANS: Feed sub exception.
-#: classes/Ostatus_profile.php:885
-msgid "Can't find enough profile information to make a feed."
-msgstr ""
-"Non pote trovar satis de information de profilo pro facer un syndication."
-
-#. TRANS: Server exception. %s is a URL.
-#: classes/Ostatus_profile.php:949
-#, php-format
-msgid "Invalid avatar URL %s."
-msgstr "URL de avatar %s invalide."
-
-#. TRANS: Server exception. %s is a URI.
-#: classes/Ostatus_profile.php:960
-#, php-format
-msgid "Tried to update avatar for unsaved remote profile %s."
-msgstr "Tentava actualisar avatar pro profilo remote non salveguardate %s."
-
-#. TRANS: Server exception. %s is a URL.
-#: classes/Ostatus_profile.php:970
-#, php-format
-msgid "Unable to fetch avatar from %s."
-msgstr "Incapace de obtener avatar ab %s."
-
-#. TRANS: Exception.
-#: classes/Ostatus_profile.php:1197
-msgid "Local user can't be referenced as remote."
-msgstr "Usator local non pote esser referentiate como remote."
-
-#. TRANS: Exception.
-#: classes/Ostatus_profile.php:1202
-msgid "Local group can't be referenced as remote."
-msgstr "Gruppo local non pote esser referentiate como remote."
-
-#. TRANS: Server exception.
-#: classes/Ostatus_profile.php:1254 classes/Ostatus_profile.php:1265
-msgid "Can't save local profile."
-msgstr "Non pote salveguardar profilo local."
-
-#. TRANS: Server exception.
-#: classes/Ostatus_profile.php:1273
-msgid "Can't save OStatus profile."
-msgstr "Non pote salveguardar profilo OStatus."
-
-#. TRANS: Exception.
-#: classes/Ostatus_profile.php:1561 classes/Ostatus_profile.php:1589
-msgid "Not a valid webfinger address."
-msgstr "Adresse webfinger invalide."
-
-#. TRANS: Exception. %s is a webfinger address.
-#: classes/Ostatus_profile.php:1671
-#, php-format
-msgid "Couldn't save profile for \"%s\"."
-msgstr "Non poteva salveguardar profilo pro \"%s\"."
-
-#. TRANS: Exception. %s is a webfinger address.
-#: classes/Ostatus_profile.php:1690
-#, php-format
-msgid "Couldn't save ostatus_profile for \"%s\"."
-msgstr "Non poteva salveguardar osatus_profile pro %s."
-
-#. TRANS: Exception. %s is a webfinger address.
-#: classes/Ostatus_profile.php:1698
-#, php-format
-msgid "Couldn't find a valid profile for \"%s\"."
-msgstr "Non poteva trovar un profilo valide pro \"%s\"."
-
-#. TRANS: Server exception.
-#: classes/Ostatus_profile.php:1741
-msgid "Could not store HTML content of long post as file."
-msgstr "Non poteva immagazinar contento HTML de longe message como file."
-
-#. TRANS: Client exception. %s is a HTTP status code.
-#: classes/HubSub.php:212
-#, php-format
-msgid "Hub subscriber verification returned HTTP %s."
-msgstr "Verification de subscriptor de centro retornava HTTP %s."
-
-#. TRANS: Exception. %1$s is a response status code, %2$s is the body of the response.
-#: classes/HubSub.php:359
-#, php-format
-msgid "Callback returned status: %1$s. Body: %2$s"
-msgstr "Appello de retorno retornava stato: %1$s. Corpore: %2$s"
-
-#. TRANS: Client error. POST is a HTTP command. It should not be translated.
-#: lib/salmonaction.php:43
-msgid "This method requires a POST."
-msgstr "Iste methodo require un POST."
-
-#. TRANS: Client error. Do not translate "application/magic-envelope+xml"
-#: lib/salmonaction.php:48
-msgid "Salmon requires \"application/magic-envelope+xml\"."
-msgstr "Salmon require \"application/magic-envelope+xml\"."
-
-#. TRANS: Client error.
-#: lib/salmonaction.php:58
-msgid "Salmon signature verification failed."
-msgstr "Verification de signatura Salmon falleva."
-
-#. TRANS: Client error.
-#: lib/salmonaction.php:70
-msgid "Salmon post must be an Atom entry."
-msgstr "Message Salmon debe esser un entrata Atom."
-
-#. TRANS: Client exception.
-#: lib/salmonaction.php:120
-msgid "Unrecognized activity type."
-msgstr "Typo de activitate non recognoscite."
-
-#. TRANS: Client exception.
-#: lib/salmonaction.php:130
-msgid "This target doesn't understand posts."
-msgstr "Iste destination non comprende messages."
-
-#. TRANS: Client exception.
-#: lib/salmonaction.php:136
-msgid "This target doesn't understand follows."
-msgstr "Iste destination non comprende sequimentos."
-
-#. TRANS: Client exception.
-#: lib/salmonaction.php:142
-msgid "This target doesn't understand unfollows."
-msgstr "Iste destination non comprende cessationes de sequimento."
-
-#. TRANS: Client exception.
-#: lib/salmonaction.php:148
-msgid "This target doesn't understand favorites."
-msgstr "Iste destination non comprende le addition de favorites."
-
-#. TRANS: Client exception.
-#: lib/salmonaction.php:154
-msgid "This target doesn't understand unfavorites."
-msgstr "Iste destination non comprende le remotion de favorites."
-
-#. TRANS: Client exception.
-#: lib/salmonaction.php:160
-msgid "This target doesn't understand share events."
-msgstr "Iste destination non comprende eventos commun."
-
-#. TRANS: Client exception.
-#: lib/salmonaction.php:166
-msgid "This target doesn't understand joins."
-msgstr "Iste destination non comprende indicationes de adhesion."
-
-#. TRANS: Client exception.
-#: lib/salmonaction.php:172
-msgid "This target doesn't understand leave events."
-msgstr "Iste destination non comprende eventos de partita."
-
-#. TRANS: Exception.
-#: lib/salmonaction.php:200
-msgid "Received a salmon slap from unidentified actor."
-msgstr "Recipeva un claffo de salmon de un actor non identificate."
-
-#. TRANS: Exception.
-#: lib/magicenvelope.php:80
-msgid "Unable to locate signer public key."
-msgstr "Incapace de localisar le clave public del signator."
-
-#. TRANS: Exception.
-#: lib/salmon.php:126
-msgid "Salmon invalid actor for signing."
-msgstr "Salmon: actor invalide pro signar."
-
-#: tests/gettext-speedtest.php:57
-msgid "Feeds"
-msgstr "Syndicationes"
-
-#. TRANS: Client exception.
-#: actions/pushhub.php:70
 msgid "Publishing outside feeds not supported."
 msgstr "Le publication de syndicationes externe non es supportate."
 
 #. TRANS: Client exception. %s is a mode.
-#: actions/pushhub.php:73
 #, php-format
 msgid "Unrecognized mode \"%s\"."
 msgstr "Modo \"%s\" non recognoscite."
 
 #. TRANS: Client exception. %s is a topic.
-#: actions/pushhub.php:93
 #, php-format
 msgid ""
 "Unsupported hub.topic %s this hub only serves local user and group Atom "
@@ -385,188 +123,73 @@ msgstr ""
 "syndicationes Atom de usatores e gruppos local."
 
 #. TRANS: Client exception.
-#: actions/pushhub.php:99
 #, php-format
 msgid "Invalid hub.verify \"%s\". It must be sync or async."
 msgstr "Invalide hub.verify \"%s\". Debe esser sync o async."
 
 #. TRANS: Client exception.
-#: actions/pushhub.php:105
 #, php-format
 msgid "Invalid hub.lease \"%s\". It must be empty or positive integer."
 msgstr ""
 "Invalide hub.lease \"%s\". Debe esser vacue o un numero integre positive."
 
 #. TRANS: Client exception.
-#: actions/pushhub.php:113
 #, php-format
 msgid "Invalid hub.secret \"%s\". It must be under 200 bytes."
 msgstr "Invalide hub.secret \"%s\". Debe pesar minus de 200 bytes."
 
 #. TRANS: Client exception.
-#: actions/pushhub.php:165
 #, php-format
 msgid "Invalid hub.topic \"%s\". User doesn't exist."
 msgstr "Invalide hub.topic \"%s\". Usator non existe."
 
 #. TRANS: Client exception.
-#: actions/pushhub.php:174
 #, php-format
 msgid "Invalid hub.topic \"%s\". Group doesn't exist."
 msgstr "Invalide hub.topic \"%s\". Gruppo non existe."
 
 #. TRANS: Client exception.
 #. TRANS: %1$s is this argument to the method this exception occurs in, %2$s is a URL.
-#: actions/pushhub.php:199
 #, php-format
 msgid "Invalid URL passed for %1$s: \"%2$s\""
 msgstr "Invalide URL passate pro %1$s: \"%2$s\""
 
-#: actions/ownerxrd.php:39 actions/usersalmon.php:43
+msgid "Empty or invalid feed id."
+msgstr "ID de syndication vacue o invalide."
+
+#. TRANS: Server exception. %s is a feed ID.
+#, php-format
+msgid "Unknown PuSH feed id %s"
+msgstr "ID de syndication PuSH %s incognite"
+
+#. TRANS: Client exception. %s is an invalid feed name.
+#, php-format
+msgid "Bad hub.topic feed \"%s\"."
+msgstr "Syndication hub.topic \"%s\" incorrecte."
+
+#. TRANS: Client exception. %1$s the invalid token, %2$s is the topic for which the invalid token was given.
+#, php-format
+msgid "Bad hub.verify_token %1$s for %2$s."
+msgstr "Incorrecte hub.verify_token %1$s pro %2$s."
+
+#. TRANS: Client exception. %s is an invalid topic.
+#, php-format
+msgid "Unexpected subscribe request for %s."
+msgstr "Requesta de subscription inexpectate pro %s."
+
+#. TRANS: Client exception. %s is an invalid topic.
+#, php-format
+msgid "Unexpected unsubscribe request for %s."
+msgstr "Requesta de cancellation de subscription inexpectate pro %s."
+
 msgid "No such user."
 msgstr "Iste usator non existe."
 
-#. TRANS: Client error.
-#: actions/usersalmon.php:37 actions/groupsalmon.php:40
-msgid "No ID."
-msgstr "Nulle ID."
-
-#. TRANS: Client exception.
-#: actions/usersalmon.php:83
-msgid "In reply to unknown notice."
-msgstr "In responsa a un nota incognite."
-
-#. TRANS: Client exception.
-#: actions/usersalmon.php:88
-msgid "In reply to a notice not by this user and not mentioning this user."
-msgstr ""
-"In responsa a un nota non scribite per iste usator e que non mentiona iste "
-"usator."
-
-#. TRANS: Client exception.
-#: actions/usersalmon.php:165
-msgid "Could not save new favorite."
-msgstr "Non poteva salveguardar le nove favorite."
-
-#. TRANS: Client exception.
-#: actions/usersalmon.php:197
-msgid "Can't favorite/unfavorite without an object."
-msgstr "Non pote favorir/disfavorir sin objecto."
-
-#. TRANS: Client exception.
-#: actions/usersalmon.php:209
-msgid "Can't handle that kind of object for liking/faving."
-msgstr "Non pote manear iste typo de objecto pro appreciar/favorir."
-
-#. TRANS: Client exception. %s is an object ID.
-#: actions/usersalmon.php:216
-#, php-format
-msgid "Notice with ID %s unknown."
-msgstr "Nota con ID %s incognite."
-
-#. TRANS: Client exception. %1$s is a notice ID, %2$s is a user ID.
-#: actions/usersalmon.php:221
-#, php-format
-msgid "Notice with ID %1$s not posted by %2$s."
-msgstr "Nota con ID %1$s non publicate per %2$s."
-
-#. TRANS: Field label.
-#: actions/ostatusgroup.php:78
-msgid "Join group"
-msgstr "Adherer al gruppo"
-
-#. TRANS: Tooltip for field label "Join group".
-#: actions/ostatusgroup.php:81
-msgid "OStatus group's address, like http://example.net/group/nickname."
-msgstr ""
-"Un adresse de gruppo OStatus, como http://example.net/group/pseudonymo."
-
-#. TRANS: Button text.
-#: actions/ostatusgroup.php:86 actions/ostatussub.php:75
-msgctxt "BUTTON"
-msgid "Continue"
-msgstr "Continuar"
-
-#: actions/ostatusgroup.php:105
-msgid "You are already a member of this group."
-msgstr "Tu es ja membro de iste gruppo."
-
-#. TRANS: OStatus remote group subscription dialog error.
-#: actions/ostatusgroup.php:140
-msgid "Already a member!"
-msgstr "Ja membro!"
-
-#. TRANS: OStatus remote group subscription dialog error.
-#: actions/ostatusgroup.php:151
-msgid "Remote group join failed!"
-msgstr "Le adhesion al gruppo remote ha fallite!"
-
-#. TRANS: OStatus remote group subscription dialog error.
-#: actions/ostatusgroup.php:155
-msgid "Remote group join aborted!"
-msgstr "Le adhesion al gruppo remote ha essite abortate!"
-
-#. TRANS: Page title for OStatus remote group join form
-#: actions/ostatusgroup.php:167
-msgid "Confirm joining remote group"
-msgstr "Confirmar adhesion a gruppo remote"
-
-#. TRANS: Instructions.
-#: actions/ostatusgroup.php:178
-msgid ""
-"You can subscribe to groups from other supported sites. Paste the group's "
-"profile URI below:"
-msgstr ""
-"Tu pote subscriber a gruppos de altere sitos supportate. Colla le URI del "
-"profilo del gruppo hic infra:"
-
-#. TRANS: Client error.
-#: actions/groupsalmon.php:47
-msgid "No such group."
-msgstr "Gruppo non existe."
-
-#. TRANS: Client error.
-#: actions/groupsalmon.php:56
-msgid "Can't accept remote posts for a remote group."
-msgstr "Non pote acceptar messages remote pro un gruppo remote."
-
-#. TRANS: Client error.
-#: actions/groupsalmon.php:130
-msgid "Can't read profile to set up group membership."
-msgstr "Non pote leger profilo pro establir membrato de gruppo."
-
-#. TRANS: Client error.
-#: actions/groupsalmon.php:134 actions/groupsalmon.php:177
-msgid "Groups can't join groups."
-msgstr "Gruppos non pote adherer a gruppos."
-
-#: actions/groupsalmon.php:147
-msgid "You have been blocked from that group by the admin."
-msgstr "Le administrator te ha blocate de iste gruppo."
-
-#. TRANS: Server error. %1$s is a profile URI, %2$s is a group nickname.
-#: actions/groupsalmon.php:162
-#, php-format
-msgid "Could not join remote user %1$s to group %2$s."
-msgstr "Non poteva inscriber le usator remote %1$s in le gruppo %2$s."
-
-#: actions/groupsalmon.php:174
-msgid "Can't read profile to cancel group membership."
-msgstr "Non pote leger profilo pro cancellar membrato de gruppo."
-
-#. TRANS: Server error. %1$s is a profile URI, %2$s is a group nickname.
-#: actions/groupsalmon.php:191
-#, php-format
-msgid "Could not remove remote user %1$s from group %2$s."
-msgstr "Non poteva remover le usator remote %1$s del gruppo %2$s."
-
 #. TRANS: Field label for a field that takes an OStatus user address.
-#: actions/ostatussub.php:68
 msgid "Subscribe to"
 msgstr "Subscriber a"
 
 #. TRANS: Tooltip for field label "Subscribe to".
-#: actions/ostatussub.php:71
 msgid ""
 "OStatus user's address, like nickname@example.com or http://example.net/"
 "nickname"
@@ -574,31 +197,30 @@ msgstr ""
 "Le adresse de un usator OStatus, como pseudonymo@example.com o http://"
 "example.net/pseudonymo"
 
+#. TRANS: Button text.
+msgctxt "BUTTON"
+msgid "Continue"
+msgstr "Continuar"
+
 #. TRANS: Button text.
 #. TRANS: Tooltip for button "Join".
-#: actions/ostatussub.php:112
 msgctxt "BUTTON"
 msgid "Join this group"
 msgstr "Adherer a iste gruppo"
 
 #. TRANS: Button text.
-#: actions/ostatussub.php:115
 msgctxt "BUTTON"
 msgid "Confirm"
 msgstr "Confirmar"
 
 #. TRANS: Tooltip for button "Confirm".
-#: actions/ostatussub.php:117
 msgid "Subscribe to this user"
 msgstr "Subscriber a iste usator"
 
-#: actions/ostatussub.php:138
 msgid "You are already subscribed to this user."
 msgstr "Tu es ja subscribite a iste usator."
 
 #. TRANS: Error text.
-#: actions/ostatussub.php:232 actions/ostatussub.php:239
-#: actions/ostatussub.php:264
 msgid ""
 "Sorry, we could not reach that address. Please make sure that the OStatus "
 "address is like nickname@example.com or http://example.net/nickname."
@@ -608,9 +230,6 @@ msgstr ""
 "net/pseudonymo."
 
 #. TRANS: Error text.
-#: actions/ostatussub.php:243 actions/ostatussub.php:247
-#: actions/ostatussub.php:251 actions/ostatussub.php:255
-#: actions/ostatussub.php:259
 msgid ""
 "Sorry, we could not reach that feed. Please try that OStatus address again "
 "later."
@@ -619,31 +238,25 @@ msgstr ""
 "reproba iste adresse OStatus plus tarde."
 
 #. TRANS: OStatus remote subscription dialog error.
-#: actions/ostatussub.php:293
 msgid "Already subscribed!"
 msgstr "Ja subscribite!"
 
 #. TRANS: OStatus remote subscription dialog error.
-#: actions/ostatussub.php:298
 msgid "Remote subscription failed!"
 msgstr "Subscription remote fallite!"
 
-#: actions/ostatussub.php:345 actions/ostatusinit.php:64
 msgid "There was a problem with your session token. Try again, please."
 msgstr "Occurreva un problema con le indicio de tu session. Per favor reproba."
 
 #. TRANS: Form title.
-#: actions/ostatussub.php:373 actions/ostatusinit.php:83
 msgid "Subscribe to user"
 msgstr "Subscriber a usator"
 
 #. TRANS: Page title for OStatus remote subscription form
-#: actions/ostatussub.php:393
 msgid "Confirm"
 msgstr "Confirmar"
 
 #. TRANS: Instructions.
-#: actions/ostatussub.php:405
 msgid ""
 "You can subscribe to users from other supported sites. Paste their address "
 "or profile URI below:"
@@ -651,128 +264,365 @@ msgstr ""
 "Tu pote subscriber a usatores de altere sitos supportate. Colla su adresse o "
 "URI de profilo hic infra:"
 
+#. TRANS: Field label.
+msgid "Join group"
+msgstr "Adherer al gruppo"
+
+#. TRANS: Tooltip for field label "Join group".
+msgid "OStatus group's address, like http://example.net/group/nickname."
+msgstr ""
+"Un adresse de gruppo OStatus, como http://example.net/group/pseudonymo."
+
+msgid "You are already a member of this group."
+msgstr "Tu es ja membro de iste gruppo."
+
+#. TRANS: OStatus remote group subscription dialog error.
+msgid "Already a member!"
+msgstr "Ja membro!"
+
+#. TRANS: OStatus remote group subscription dialog error.
+msgid "Remote group join failed!"
+msgstr "Le adhesion al gruppo remote ha fallite!"
+
+#. TRANS: OStatus remote group subscription dialog error.
+msgid "Remote group join aborted!"
+msgstr "Le adhesion al gruppo remote ha essite abortate!"
+
+#. TRANS: Page title for OStatus remote group join form
+msgid "Confirm joining remote group"
+msgstr "Confirmar adhesion a gruppo remote"
+
+#. TRANS: Instructions.
+msgid ""
+"You can subscribe to groups from other supported sites. Paste the group's "
+"profile URI below:"
+msgstr ""
+"Tu pote subscriber a gruppos de altere sitos supportate. Colla le URI del "
+"profilo del gruppo hic infra:"
+
+#. TRANS: Client error.
+msgid "No ID."
+msgstr "Nulle ID."
+
+#. TRANS: Client exception.
+msgid "In reply to unknown notice."
+msgstr "In responsa a un nota incognite."
+
+#. TRANS: Client exception.
+msgid "In reply to a notice not by this user and not mentioning this user."
+msgstr ""
+"In responsa a un nota non scribite per iste usator e que non mentiona iste "
+"usator."
+
+#. TRANS: Client exception.
+msgid "Could not save new favorite."
+msgstr "Non poteva salveguardar le nove favorite."
+
+#. TRANS: Client exception.
+msgid "Can't favorite/unfavorite without an object."
+msgstr "Non pote favorir/disfavorir sin objecto."
+
+#. TRANS: Client exception.
+msgid "Can't handle that kind of object for liking/faving."
+msgstr "Non pote manear iste typo de objecto pro appreciar/favorir."
+
+#. TRANS: Client exception. %s is an object ID.
+#, php-format
+msgid "Notice with ID %s unknown."
+msgstr "Nota con ID %s incognite."
+
+#. TRANS: Client exception. %1$s is a notice ID, %2$s is a user ID.
+#, php-format
+msgid "Notice with ID %1$s not posted by %2$s."
+msgstr "Nota con ID %1$s non publicate per %2$s."
+
+#. TRANS: Client error.
+msgid "No such group."
+msgstr "Gruppo non existe."
+
+#. TRANS: Client error.
+msgid "Can't accept remote posts for a remote group."
+msgstr "Non pote acceptar messages remote pro un gruppo remote."
+
+#. TRANS: Client error.
+msgid "Can't read profile to set up group membership."
+msgstr "Non pote leger profilo pro establir membrato de gruppo."
+
+#. TRANS: Client error.
+msgid "Groups can't join groups."
+msgstr "Gruppos non pote adherer a gruppos."
+
+msgid "You have been blocked from that group by the admin."
+msgstr "Le administrator te ha blocate de iste gruppo."
+
+#. TRANS: Server error. %1$s is a profile URI, %2$s is a group nickname.
+#, php-format
+msgid "Could not join remote user %1$s to group %2$s."
+msgstr "Non poteva inscriber le usator remote %1$s in le gruppo %2$s."
+
+msgid "Can't read profile to cancel group membership."
+msgstr "Non pote leger profilo pro cancellar membrato de gruppo."
+
+#. TRANS: Server error. %1$s is a profile URI, %2$s is a group nickname.
+#, php-format
+msgid "Could not remove remote user %1$s from group %2$s."
+msgstr "Non poteva remover le usator remote %1$s del gruppo %2$s."
+
 #. TRANS: Client error.
-#: actions/ostatusinit.php:42
 msgid "You can use the local subscription!"
 msgstr "Tu pote usar le subscription local!"
 
 #. TRANS: Form legend.
-#: actions/ostatusinit.php:98
 #, php-format
 msgid "Join group %s"
 msgstr "Adherer al gruppo %s"
 
 #. TRANS: Button text.
-#: actions/ostatusinit.php:100
 msgctxt "BUTTON"
 msgid "Join"
 msgstr "Inscriber"
 
 #. TRANS: Form legend.
-#: actions/ostatusinit.php:103
 #, php-format
 msgid "Subscribe to %s"
 msgstr "Subscriber a %s"
 
 #. TRANS: Button text.
-#: actions/ostatusinit.php:105
 msgctxt "BUTTON"
 msgid "Subscribe"
 msgstr "Subscriber"
 
 #. TRANS: Field label.
-#: actions/ostatusinit.php:119
 msgid "Group nickname"
 msgstr "Pseudonymo del gruppo"
 
-#: actions/ostatusinit.php:120
 msgid "Nickname of the group you want to join."
 msgstr "Le pseudonymo del gruppo a que tu vole adherer."
 
 #. TRANS: Field label.
-#: actions/ostatusinit.php:123
 msgid "User nickname"
 msgstr "Pseudonymo del usator"
 
-#: actions/ostatusinit.php:124
 msgid "Nickname of the user you want to follow."
 msgstr "Le pseudonymo del usator que tu vole sequer."
 
 #. TRANS: Field label.
-#: actions/ostatusinit.php:129
 msgid "Profile Account"
 msgstr "Conto de profilo"
 
 #. TRANS: Tooltip for field label "Profile Account".
-#: actions/ostatusinit.php:131
 msgid "Your account id (e.g. user@identi.ca)."
 msgstr "Le ID de tu conto (p.ex. usator@identi.ca)."
 
 #. TRANS: Client error.
-#: actions/ostatusinit.php:153
 msgid "Must provide a remote profile."
 msgstr "Debe fornir un profilo remote."
 
 #. TRANS: Client error.
-#: actions/ostatusinit.php:165
 msgid "Couldn't look up OStatus account profile."
 msgstr "Non poteva cercar le profilo del conto OStatus."
 
 #. TRANS: Client error.
-#: actions/ostatusinit.php:178
 msgid "Couldn't confirm remote profile address."
 msgstr "Non poteva confirmar le adresse del profilo remote."
 
 #. TRANS: Page title.
-#: actions/ostatusinit.php:223
 msgid "OStatus Connect"
 msgstr "Connexion OStatus"
 
-#: actions/pushcallback.php:50
-msgid "Empty or invalid feed id."
-msgstr "ID de syndication vacue o invalide."
+msgid "Attempting to start PuSH subscription for feed with no hub."
+msgstr "Tentativa de comenciar subscription PuSH pro syndication sin centro."
 
-#. TRANS: Server exception. %s is a feed ID.
-#: actions/pushcallback.php:56
+msgid "Attempting to end PuSH subscription for feed with no hub."
+msgstr "Tentativa de terminar subscription PuSH pro syndication sin centro."
+
+#. TRANS: Server exception. %s is a URI.
 #, php-format
-msgid "Unknown PuSH feed id %s"
-msgstr "ID de syndication PuSH %s incognite"
+msgid "Invalid ostatus_profile state: both group and profile IDs set for %s."
+msgstr ""
+"Stato ostatus_profile invalide: IDs e de gruppo e de profilo definite pro %s."
 
-#. TRANS: Client exception. %s is an invalid feed name.
-#: actions/pushcallback.php:96
+#. TRANS: Server exception. %s is a URI.
 #, php-format
-msgid "Bad hub.topic feed \"%s\"."
-msgstr "Syndication hub.topic \"%s\" incorrecte."
+msgid "Invalid ostatus_profile state: both group and profile IDs empty for %s."
+msgstr ""
+"Stato ostatus_profile invalide: IDs e de gruppo e de profilo vacue pro %s."
 
-#. TRANS: Client exception. %1$s the invalid token, %2$s is the topic for which the invalid token was given.
-#: actions/pushcallback.php:101
+#. TRANS: Server exception.
+#. TRANS: %1$s is the method name the exception occured in, %2$s is the actor type.
 #, php-format
-msgid "Bad hub.verify_token %1$s for %2$s."
-msgstr "Incorrecte hub.verify_token %1$s pro %2$s."
+msgid "Invalid actor passed to %1$s: %2$s."
+msgstr "Actor invalide passate a %1$s: %2$s."
 
-#. TRANS: Client exception. %s is an invalid topic.
-#: actions/pushcallback.php:108
+#. TRANS: Server exception.
+msgid ""
+"Invalid type passed to Ostatus_profile::notify. It must be XML string or "
+"Activity entry."
+msgstr ""
+"Typo invalide passate a Ostatos_profile::notify. Illo debe esser catena XML "
+"o entrata Activity."
+
+#. TRANS: Exception.
+msgid "Unknown feed format."
+msgstr "Formato de syndication incognite."
+
+#. TRANS: Exception.
+msgid "RSS feed without a channel."
+msgstr "Syndication RSS sin canal."
+
+#. TRANS: Client exception.
+msgid "Can't handle that kind of post."
+msgstr "Non pote tractar iste typo de message."
+
+#. TRANS: Client exception. %s is a source URI.
 #, php-format
-msgid "Unexpected subscribe request for %s."
-msgstr "Requesta de subscription inexpectate pro %s."
+msgid "No content for notice %s."
+msgstr "Nulle contento pro nota %s."
 
-#. TRANS: Client exception. %s is an invalid topic.
-#: actions/pushcallback.php:113
+#. TRANS: Shown when a notice is longer than supported and/or when attachments are present. At runtime
+#. TRANS: this will usually be replaced with localised text from StatusNet core messages.
+msgid "Show more"
+msgstr "Monstrar plus"
+
+#. TRANS: Exception. %s is a profile URL.
 #, php-format
-msgid "Unexpected unsubscribe request for %s."
-msgstr "Requesta de cancellation de subscription inexpectate pro %s."
+msgid "Could not reach profile page %s."
+msgstr "Non poteva attinger pagina de profilo %s."
 
-#~ msgid "Photo"
-#~ msgstr "Photo"
+#. TRANS: Exception. %s is a URL.
+#, php-format
+msgid "Could not find a feed URL for profile page %s."
+msgstr "Non poteva trovar un URL de syndication pro pagina de profilo %s."
 
-#~ msgid "Nickname"
-#~ msgstr "Pseudonymo"
+#. TRANS: Feed sub exception.
+msgid "Can't find enough profile information to make a feed."
+msgstr ""
+"Non pote trovar satis de information de profilo pro facer un syndication."
 
-#~ msgid "Location"
-#~ msgstr "Loco"
+#. TRANS: Server exception. %s is a URL.
+#, php-format
+msgid "Invalid avatar URL %s."
+msgstr "URL de avatar %s invalide."
 
-#~ msgid "URL"
-#~ msgstr "URL"
+#. TRANS: Server exception. %s is a URI.
+#, php-format
+msgid "Tried to update avatar for unsaved remote profile %s."
+msgstr "Tentava actualisar avatar pro profilo remote non salveguardate %s."
 
-#~ msgid "Note"
-#~ msgstr "Nota"
+#. TRANS: Server exception. %s is a URL.
+#, php-format
+msgid "Unable to fetch avatar from %s."
+msgstr "Incapace de obtener avatar ab %s."
+
+#. TRANS: Exception.
+msgid "Local user can't be referenced as remote."
+msgstr "Usator local non pote esser referentiate como remote."
+
+#. TRANS: Exception.
+msgid "Local group can't be referenced as remote."
+msgstr "Gruppo local non pote esser referentiate como remote."
+
+#. TRANS: Server exception.
+msgid "Can't save local profile."
+msgstr "Non pote salveguardar profilo local."
+
+#. TRANS: Server exception.
+msgid "Can't save OStatus profile."
+msgstr "Non pote salveguardar profilo OStatus."
+
+#. TRANS: Exception.
+msgid "Not a valid webfinger address."
+msgstr "Adresse webfinger invalide."
+
+#. TRANS: Exception. %s is a webfinger address.
+#, php-format
+msgid "Couldn't save profile for \"%s\"."
+msgstr "Non poteva salveguardar profilo pro \"%s\"."
+
+#. TRANS: Exception. %s is a webfinger address.
+#, php-format
+msgid "Couldn't save ostatus_profile for \"%s\"."
+msgstr "Non poteva salveguardar osatus_profile pro %s."
+
+#. TRANS: Exception. %s is a webfinger address.
+#, php-format
+msgid "Couldn't find a valid profile for \"%s\"."
+msgstr "Non poteva trovar un profilo valide pro \"%s\"."
+
+#. TRANS: Server exception.
+msgid "Could not store HTML content of long post as file."
+msgstr "Non poteva immagazinar contento HTML de longe message como file."
+
+#. TRANS: Client exception. %s is a HTTP status code.
+#, php-format
+msgid "Hub subscriber verification returned HTTP %s."
+msgstr "Verification de subscriptor de centro retornava HTTP %s."
+
+#. TRANS: Exception. %1$s is a response status code, %2$s is the body of the response.
+#, php-format
+msgid "Callback returned status: %1$s. Body: %2$s"
+msgstr "Appello de retorno retornava stato: %1$s. Corpore: %2$s"
+
+#. TRANS: Exception.
+msgid "Unable to locate signer public key."
+msgstr "Incapace de localisar le clave public del signator."
+
+#. TRANS: Exception.
+msgid "Salmon invalid actor for signing."
+msgstr "Salmon: actor invalide pro signar."
+
+#. TRANS: Client error. POST is a HTTP command. It should not be translated.
+msgid "This method requires a POST."
+msgstr "Iste methodo require un POST."
+
+#. TRANS: Client error. Do not translate "application/magic-envelope+xml"
+msgid "Salmon requires \"application/magic-envelope+xml\"."
+msgstr "Salmon require \"application/magic-envelope+xml\"."
+
+#. TRANS: Client error.
+msgid "Salmon signature verification failed."
+msgstr "Verification de signatura Salmon falleva."
+
+#. TRANS: Client error.
+msgid "Salmon post must be an Atom entry."
+msgstr "Message Salmon debe esser un entrata Atom."
+
+#. TRANS: Client exception.
+msgid "Unrecognized activity type."
+msgstr "Typo de activitate non recognoscite."
+
+#. TRANS: Client exception.
+msgid "This target doesn't understand posts."
+msgstr "Iste destination non comprende messages."
+
+#. TRANS: Client exception.
+msgid "This target doesn't understand follows."
+msgstr "Iste destination non comprende sequimentos."
+
+#. TRANS: Client exception.
+msgid "This target doesn't understand unfollows."
+msgstr "Iste destination non comprende cessationes de sequimento."
+
+#. TRANS: Client exception.
+msgid "This target doesn't understand favorites."
+msgstr "Iste destination non comprende le addition de favorites."
+
+#. TRANS: Client exception.
+msgid "This target doesn't understand unfavorites."
+msgstr "Iste destination non comprende le remotion de favorites."
+
+#. TRANS: Client exception.
+msgid "This target doesn't understand share events."
+msgstr "Iste destination non comprende eventos commun."
+
+#. TRANS: Client exception.
+msgid "This target doesn't understand joins."
+msgstr "Iste destination non comprende indicationes de adhesion."
+
+#. TRANS: Client exception.
+msgid "This target doesn't understand leave events."
+msgstr "Iste destination non comprende eventos de partita."
+
+#. TRANS: Exception.
+msgid "Received a salmon slap from unidentified actor."
+msgstr "Recipeva un claffo de salmon de un actor non identificate."
diff --git a/plugins/OStatus/locale/mk/LC_MESSAGES/OStatus.po b/plugins/OStatus/locale/mk/LC_MESSAGES/OStatus.po
index 52cc874556..920be9012e 100644
--- a/plugins/OStatus/locale/mk/LC_MESSAGES/OStatus.po
+++ b/plugins/OStatus/locale/mk/LC_MESSAGES/OStatus.po
@@ -9,108 +9,94 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OStatus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:45+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:59+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-14 17:22:01+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:49:39+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-ostatus\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
 
+msgid "Feeds"
+msgstr "Канали"
+
 #. TRANS: Link description for link to subscribe to a remote user.
 #. TRANS: Link text for a user to subscribe to an OStatus user.
-#: OStatusPlugin.php:223 OStatusPlugin.php:933
 msgid "Subscribe"
 msgstr "Претплати се"
 
 #. TRANS: Link description for link to join a remote group.
-#: OStatusPlugin.php:242 OStatusPlugin.php:651 actions/ostatussub.php:109
 msgid "Join"
 msgstr "Зачлени се"
 
 #. TRANSLATE: %s is a domain.
-#: OStatusPlugin.php:455
 #, php-format
 msgid "Sent from %s via OStatus"
 msgstr "Испратено од %s преку OStatus"
 
 #. TRANS: Exception.
-#: OStatusPlugin.php:527
 msgid "Could not set up remote subscription."
 msgstr "Не можев да ја поставам далечинската претплата."
 
-#: OStatusPlugin.php:601
 msgid "Unfollow"
 msgstr "Престани со следење"
 
 #. TRANS: Success message for unsubscribe from user attempt through OStatus.
 #. TRANS: %1$s is the unsubscriber's name, %2$s is the unsubscribed user's name.
-#: OStatusPlugin.php:604
 #, php-format
 msgid "%1$s stopped following %2$s."
 msgstr "%1$s престана да го/ја следи %2$s."
 
-#: OStatusPlugin.php:632
 msgid "Could not set up remote group membership."
 msgstr "Не можев да го поставам членството во далечинската група."
 
 #. TRANS: Success message for subscribe to group attempt through OStatus.
 #. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
-#: OStatusPlugin.php:654
 #, php-format
 msgid "%1$s has joined group %2$s."
 msgstr "%1$s се зачлени во групата %2$s."
 
 #. TRANS: Exception.
-#: OStatusPlugin.php:663
 msgid "Failed joining remote group."
 msgstr "Не успеав да Ве зачленам во далечинската група."
 
-#: OStatusPlugin.php:703
 msgid "Leave"
 msgstr "Напушти"
 
 #. TRANS: Success message for unsubscribe from group attempt through OStatus.
 #. TRANS: %1$s is the member name, %2$s is the unsubscribed group's name.
-#: OStatusPlugin.php:706
 #, php-format
 msgid "%1$s has left group %2$s."
 msgstr "%1$s ја напушти групата %2$s."
 
-#: OStatusPlugin.php:781
 msgid "Disfavor"
 msgstr "Откажи бендисана"
 
 #. TRANS: Success message for remove a favorite notice through OStatus.
 #. TRANS: %1$s is the unfavoring user's name, %2$s is URI to the no longer favored notice.
-#: OStatusPlugin.php:784
 #, php-format
 msgid "%1$s marked notice %2$s as no longer a favorite."
 msgstr "%1$s повеќе не ја бендисува забелешката %2$s."
 
 #. TRANS: Link text for link to remote subscribe.
-#: OStatusPlugin.php:860
 msgid "Remote"
 msgstr "Далечински"
 
 #. TRANS: Title for activity.
-#: OStatusPlugin.php:900
 msgid "Profile update"
 msgstr "Поднова на профил"
 
 #. TRANS: Ping text for remote profile update through OStatus.
 #. TRANS: %s is user that updated their profile.
-#: OStatusPlugin.php:903
 #, php-format
 msgid "%s has updated their profile page."
 msgstr "%s ја поднови својата профилна страница."
 
 #. TRANS: Plugin description.
-#: OStatusPlugin.php:948
 msgid ""
 "Follow people across social networks that implement <a href=\"http://ostatus."
 "org/\">OStatus</a>."
@@ -118,268 +104,16 @@ msgstr ""
 "Следете луѓе низ разни друштвени мрежи што го применуваат <a href=\"http://"
 "ostatus.org/\">OStatus</a>."
 
-#: classes/FeedSub.php:252
-msgid "Attempting to start PuSH subscription for feed with no hub."
-msgstr "Се обидов да ја започнам PuSH-претплатата за канал без средиште."
-
-#: classes/FeedSub.php:282
-msgid "Attempting to end PuSH subscription for feed with no hub."
-msgstr ""
-"Се обидувам да ставам крај на PuSH-претплатата за емитување без средиште."
-
-#. TRANS: Server exception. %s is a URI.
-#: classes/Ostatus_profile.php:154
-#, php-format
-msgid "Invalid ostatus_profile state: both group and profile IDs set for %s."
-msgstr ""
-"Неважечка ostatus_profile-состојба: назнаките (ID) на групата и профилот се "
-"наместени за %s."
-
-#. TRANS: Server exception. %s is a URI.
-#: classes/Ostatus_profile.php:157
-#, php-format
-msgid "Invalid ostatus_profile state: both group and profile IDs empty for %s."
-msgstr ""
-"Неважечка ostatus_profile-состојба: назнаките (ID) за групата и профилот се "
-"празни за %s."
-
-#. TRANS: Server exception.
-#. TRANS: %1$s is the method name the exception occured in, %2$s is the actor type.
-#: classes/Ostatus_profile.php:247
-#, php-format
-msgid "Invalid actor passed to %1$s: %2$s."
-msgstr "На %1$s е пренесен неважечки учесник: %2$s."
-
-#. TRANS: Server exception.
-#: classes/Ostatus_profile.php:341
-msgid ""
-"Invalid type passed to Ostatus_profile::notify. It must be XML string or "
-"Activity entry."
-msgstr ""
-"На Ostatus_profile::notify е пренесен неважечки тип. Мора да биде XML-низа "
-"или ставка во Activity."
-
-#. TRANS: Exception.
-#: classes/Ostatus_profile.php:372
-msgid "Unknown feed format."
-msgstr "Непознат формат на каналско емитување."
-
-#. TRANS: Exception.
-#: classes/Ostatus_profile.php:396
-msgid "RSS feed without a channel."
-msgstr "RSS-емитување без канал."
-
 #. TRANS: Client exception.
-#: classes/Ostatus_profile.php:442
-msgid "Can't handle that kind of post."
-msgstr "Не можам да работам со таква објава."
-
-#. TRANS: Client exception. %s is a source URI.
-#: classes/Ostatus_profile.php:500
-#, php-format
-msgid "No content for notice %s."
-msgstr "Нема содржина за забелешката %s."
-
-#. TRANS: Shown when a notice is longer than supported and/or when attachments are present. At runtime
-#. TRANS: this will usually be replaced with localised text from StatusNet core messages.
-#: classes/Ostatus_profile.php:535
-msgid "Show more"
-msgstr "Повеќе"
-
-#. TRANS: Exception. %s is a profile URL.
-#: classes/Ostatus_profile.php:728
-#, php-format
-msgid "Could not reach profile page %s."
-msgstr "Не можев да ја добијам профилната страница %s."
-
-#. TRANS: Exception. %s is a URL.
-#: classes/Ostatus_profile.php:786
-#, php-format
-msgid "Could not find a feed URL for profile page %s."
-msgstr "Не можев да пронајдам каналска URL-адреса за профилната страница %s."
-
-#. TRANS: Feed sub exception.
-#: classes/Ostatus_profile.php:885
-msgid "Can't find enough profile information to make a feed."
-msgstr "Не можев да најдам доволно профилни податоци за да направам канал."
-
-#. TRANS: Server exception. %s is a URL.
-#: classes/Ostatus_profile.php:949
-#, php-format
-msgid "Invalid avatar URL %s."
-msgstr "Неважечка URL-адреса за аватарот: %s."
-
-#. TRANS: Server exception. %s is a URI.
-#: classes/Ostatus_profile.php:960
-#, php-format
-msgid "Tried to update avatar for unsaved remote profile %s."
-msgstr ""
-"Се обидов да го подновам аватарот за незачуваниот далечински профил %s."
-
-#. TRANS: Server exception. %s is a URL.
-#: classes/Ostatus_profile.php:970
-#, php-format
-msgid "Unable to fetch avatar from %s."
-msgstr "Не можам да го добијам аватарот од %s."
-
-#. TRANS: Exception.
-#: classes/Ostatus_profile.php:1197
-msgid "Local user can't be referenced as remote."
-msgstr "Локалниот корисник не може да се наведе како далечински."
-
-#. TRANS: Exception.
-#: classes/Ostatus_profile.php:1202
-msgid "Local group can't be referenced as remote."
-msgstr "Локалната група не може да се наведе како далечинска."
-
-#. TRANS: Server exception.
-#: classes/Ostatus_profile.php:1254 classes/Ostatus_profile.php:1265
-msgid "Can't save local profile."
-msgstr "Не можам да го зачувам локалниот профил."
-
-#. TRANS: Server exception.
-#: classes/Ostatus_profile.php:1273
-msgid "Can't save OStatus profile."
-msgstr "Не можам да го зачувам профилот од OStatus."
-
-#. TRANS: Exception.
-#: classes/Ostatus_profile.php:1561 classes/Ostatus_profile.php:1589
-msgid "Not a valid webfinger address."
-msgstr "Ова не е важечка Webfinger-адреса"
-
-#. TRANS: Exception. %s is a webfinger address.
-#: classes/Ostatus_profile.php:1671
-#, php-format
-msgid "Couldn't save profile for \"%s\"."
-msgstr "Не можам да го зачувам профилот за „%s“."
-
-#. TRANS: Exception. %s is a webfinger address.
-#: classes/Ostatus_profile.php:1690
-#, php-format
-msgid "Couldn't save ostatus_profile for \"%s\"."
-msgstr "Не можам да го зачувам ostatus_profile за „%s“."
-
-#. TRANS: Exception. %s is a webfinger address.
-#: classes/Ostatus_profile.php:1698
-#, php-format
-msgid "Couldn't find a valid profile for \"%s\"."
-msgstr "Не можев да пронајдам важечки профил за „%s“."
-
-#. TRANS: Server exception.
-#: classes/Ostatus_profile.php:1741
-msgid "Could not store HTML content of long post as file."
-msgstr ""
-"Не можам да ја складирам HTML-содржината на долгата објава како податотека."
-
-#. TRANS: Client exception. %s is a HTTP status code.
-#: classes/HubSub.php:212
-#, php-format
-msgid "Hub subscriber verification returned HTTP %s."
-msgstr "Потврдата на претплатникот на средиштето даде HTTP %s."
-
-#. TRANS: Exception. %1$s is a response status code, %2$s is the body of the response.
-#: classes/HubSub.php:359
-#, php-format
-msgid "Callback returned status: %1$s. Body: %2$s"
-msgstr "Повратниот повик даде статус: %1$s. Содржина: %2$s"
-
-#. TRANS: Client error. POST is a HTTP command. It should not be translated.
-#: lib/salmonaction.php:43
-msgid "This method requires a POST."
-msgstr "Овој метод бара POST."
-
-#. TRANS: Client error. Do not translate "application/magic-envelope+xml"
-#: lib/salmonaction.php:48
-msgid "Salmon requires \"application/magic-envelope+xml\"."
-msgstr "Salmon бара „програм/magic-envelope+xml“."
-
-#. TRANS: Client error.
-#: lib/salmonaction.php:58
-msgid "Salmon signature verification failed."
-msgstr "Salmon-овото потврдување на потпис не успеа."
-
-#. TRANS: Client error.
-#: lib/salmonaction.php:70
-msgid "Salmon post must be an Atom entry."
-msgstr "Salmon-овата објава мора да биде Atom-ова ставка."
-
-#. TRANS: Client exception.
-#: lib/salmonaction.php:120
-msgid "Unrecognized activity type."
-msgstr "Непризнаен вид на активност."
-
-#. TRANS: Client exception.
-#: lib/salmonaction.php:130
-msgid "This target doesn't understand posts."
-msgstr "Оваа цел не разбира објави."
-
-#. TRANS: Client exception.
-#: lib/salmonaction.php:136
-msgid "This target doesn't understand follows."
-msgstr "Оваа цел не разбира следења."
-
-#. TRANS: Client exception.
-#: lib/salmonaction.php:142
-msgid "This target doesn't understand unfollows."
-msgstr "Оваа цел не разбира прекини на следења."
-
-#. TRANS: Client exception.
-#: lib/salmonaction.php:148
-msgid "This target doesn't understand favorites."
-msgstr "Оваа цел не разбира бендисување на забелешки."
-
-#. TRANS: Client exception.
-#: lib/salmonaction.php:154
-msgid "This target doesn't understand unfavorites."
-msgstr "Оваа цел не разбира одбендисување на забелешки."
-
-#. TRANS: Client exception.
-#: lib/salmonaction.php:160
-msgid "This target doesn't understand share events."
-msgstr "Оваа цел не разбира споделување на настани."
-
-#. TRANS: Client exception.
-#: lib/salmonaction.php:166
-msgid "This target doesn't understand joins."
-msgstr "Оваа цел не разбира придружувања."
-
-#. TRANS: Client exception.
-#: lib/salmonaction.php:172
-msgid "This target doesn't understand leave events."
-msgstr "Оваа цел не разбира напуштање на настани."
-
-#. TRANS: Exception.
-#: lib/salmonaction.php:200
-msgid "Received a salmon slap from unidentified actor."
-msgstr "Примив Salmon-шамар од непознат учесник."
-
-#. TRANS: Exception.
-#: lib/magicenvelope.php:80
-msgid "Unable to locate signer public key."
-msgstr "Не можам да го пронајдам јавниот клуч на потписникот."
-
-#. TRANS: Exception.
-#: lib/salmon.php:126
-msgid "Salmon invalid actor for signing."
-msgstr "Ова е неважечки учесник во потпишувањето според Salmon."
-
-#: tests/gettext-speedtest.php:57
-msgid "Feeds"
-msgstr "Канали"
-
-#. TRANS: Client exception.
-#: actions/pushhub.php:70
 msgid "Publishing outside feeds not supported."
 msgstr "Објавувањето вон каналите не е поддржано."
 
 #. TRANS: Client exception. %s is a mode.
-#: actions/pushhub.php:73
 #, php-format
 msgid "Unrecognized mode \"%s\"."
 msgstr "Непрепознат режим „%s“."
 
 #. TRANS: Client exception. %s is a topic.
-#: actions/pushhub.php:93
 #, php-format
 msgid ""
 "Unsupported hub.topic %s this hub only serves local user and group Atom "
@@ -389,188 +123,72 @@ msgstr ""
 "локални корисници и групи."
 
 #. TRANS: Client exception.
-#: actions/pushhub.php:99
 #, php-format
 msgid "Invalid hub.verify \"%s\". It must be sync or async."
 msgstr "Неважечки hub.verify „%s“. Мора да биде sync или async."
 
 #. TRANS: Client exception.
-#: actions/pushhub.php:105
 #, php-format
 msgid "Invalid hub.lease \"%s\". It must be empty or positive integer."
 msgstr "Неважечки hub.lease „%s“. Мора да биде празно или позитивен цел број."
 
 #. TRANS: Client exception.
-#: actions/pushhub.php:113
 #, php-format
 msgid "Invalid hub.secret \"%s\". It must be under 200 bytes."
 msgstr "Неважечки hub.secret „%s“. Мора да биде под 200 бајти."
 
 #. TRANS: Client exception.
-#: actions/pushhub.php:165
 #, php-format
 msgid "Invalid hub.topic \"%s\". User doesn't exist."
 msgstr "Неважеки hub.topic „%s“. Корисникот не постои."
 
 #. TRANS: Client exception.
-#: actions/pushhub.php:174
 #, php-format
 msgid "Invalid hub.topic \"%s\". Group doesn't exist."
 msgstr "Неважечки hub.topic „%s“. Групата не постои."
 
 #. TRANS: Client exception.
 #. TRANS: %1$s is this argument to the method this exception occurs in, %2$s is a URL.
-#: actions/pushhub.php:199
 #, php-format
 msgid "Invalid URL passed for %1$s: \"%2$s\""
 msgstr "Добив неважечка URL-адреса за %1$s: „%2$s“"
 
-#: actions/ownerxrd.php:39 actions/usersalmon.php:43
+msgid "Empty or invalid feed id."
+msgstr "Празен или неважечки ID за канал"
+
+#. TRANS: Server exception. %s is a feed ID.
+#, php-format
+msgid "Unknown PuSH feed id %s"
+msgstr "Непознат ID %s за PuSH-канал"
+
+#. TRANS: Client exception. %s is an invalid feed name.
+#, php-format
+msgid "Bad hub.topic feed \"%s\"."
+msgstr "Лош hub.topic-канал „%s“."
+
+#. TRANS: Client exception. %1$s the invalid token, %2$s is the topic for which the invalid token was given.
+#, php-format
+msgid "Bad hub.verify_token %1$s for %2$s."
+msgstr "Лош hub.verify_token %1$s за %2$s."
+
+#. TRANS: Client exception. %s is an invalid topic.
+#, php-format
+msgid "Unexpected subscribe request for %s."
+msgstr "Неочекувано барање за претплата за %s."
+
+#. TRANS: Client exception. %s is an invalid topic.
+#, php-format
+msgid "Unexpected unsubscribe request for %s."
+msgstr "Неочекувано барање за отпишување од претплата за %s."
+
 msgid "No such user."
 msgstr "Нема таков корисник."
 
-#. TRANS: Client error.
-#: actions/usersalmon.php:37 actions/groupsalmon.php:40
-msgid "No ID."
-msgstr "Нема ID."
-
-#. TRANS: Client exception.
-#: actions/usersalmon.php:83
-msgid "In reply to unknown notice."
-msgstr "Како одговор на непозната забелешка."
-
-#. TRANS: Client exception.
-#: actions/usersalmon.php:88
-msgid "In reply to a notice not by this user and not mentioning this user."
-msgstr ""
-"Како одговор на забелешка која не е од овој корисник и не го споменува."
-
-#. TRANS: Client exception.
-#: actions/usersalmon.php:165
-msgid "Could not save new favorite."
-msgstr "Не можам да го зачувам новобендисаното."
-
-#. TRANS: Client exception.
-#: actions/usersalmon.php:197
-msgid "Can't favorite/unfavorite without an object."
-msgstr "Не можам да означам како бендисано или да тргнам бендисано без објект."
-
-#. TRANS: Client exception.
-#: actions/usersalmon.php:209
-msgid "Can't handle that kind of object for liking/faving."
-msgstr ""
-"Не можам да работам со таков објект за ставање врски/означување бендисани."
-
-#. TRANS: Client exception. %s is an object ID.
-#: actions/usersalmon.php:216
-#, php-format
-msgid "Notice with ID %s unknown."
-msgstr "Не ја распознавам забелешката со ID %s."
-
-#. TRANS: Client exception. %1$s is a notice ID, %2$s is a user ID.
-#: actions/usersalmon.php:221
-#, php-format
-msgid "Notice with ID %1$s not posted by %2$s."
-msgstr "Забелешката со ID %1$s не е објавена од %2$s."
-
-#. TRANS: Field label.
-#: actions/ostatusgroup.php:78
-msgid "Join group"
-msgstr "Зачлени се во групата"
-
-#. TRANS: Tooltip for field label "Join group".
-#: actions/ostatusgroup.php:81
-msgid "OStatus group's address, like http://example.net/group/nickname."
-msgstr ""
-"Адреса на групата на OStatus, како на пр. http://primer.net/group/prekar."
-
-#. TRANS: Button text.
-#: actions/ostatusgroup.php:86 actions/ostatussub.php:75
-msgctxt "BUTTON"
-msgid "Continue"
-msgstr "Продолжи"
-
-#: actions/ostatusgroup.php:105
-msgid "You are already a member of this group."
-msgstr "Веќе членувате во групава."
-
-#. TRANS: OStatus remote group subscription dialog error.
-#: actions/ostatusgroup.php:140
-msgid "Already a member!"
-msgstr "Веќе членувате!"
-
-#. TRANS: OStatus remote group subscription dialog error.
-#: actions/ostatusgroup.php:151
-msgid "Remote group join failed!"
-msgstr "Придружувањето на далечинската група не успеа!"
-
-#. TRANS: OStatus remote group subscription dialog error.
-#: actions/ostatusgroup.php:155
-msgid "Remote group join aborted!"
-msgstr "Придружувањето на далечинската група е откажано!"
-
-#. TRANS: Page title for OStatus remote group join form
-#: actions/ostatusgroup.php:167
-msgid "Confirm joining remote group"
-msgstr "Потврди придружување кон далечинска група."
-
-#. TRANS: Instructions.
-#: actions/ostatusgroup.php:178
-msgid ""
-"You can subscribe to groups from other supported sites. Paste the group's "
-"profile URI below:"
-msgstr ""
-"Можете да се претплаќате на групи од други поддржани мреж. места. Подолу "
-"залепете го URI-то на профилот на групата."
-
-#. TRANS: Client error.
-#: actions/groupsalmon.php:47
-msgid "No such group."
-msgstr "Нема таква група."
-
-#. TRANS: Client error.
-#: actions/groupsalmon.php:56
-msgid "Can't accept remote posts for a remote group."
-msgstr "Не можам да прифаќам далечински објави од далечинска група."
-
-#. TRANS: Client error.
-#: actions/groupsalmon.php:130
-msgid "Can't read profile to set up group membership."
-msgstr ""
-"Не можев да го прочитам профилот за да го поставам членството во групата."
-
-#. TRANS: Client error.
-#: actions/groupsalmon.php:134 actions/groupsalmon.php:177
-msgid "Groups can't join groups."
-msgstr "Во групите не можат да се зачленуваат групи."
-
-#: actions/groupsalmon.php:147
-msgid "You have been blocked from that group by the admin."
-msgstr "Блокирани сте на таа група од администратор."
-
-#. TRANS: Server error. %1$s is a profile URI, %2$s is a group nickname.
-#: actions/groupsalmon.php:162
-#, php-format
-msgid "Could not join remote user %1$s to group %2$s."
-msgstr "Не можев да го зачленам далечинскиот корисник %1$s во групата %2$s."
-
-#: actions/groupsalmon.php:174
-msgid "Can't read profile to cancel group membership."
-msgstr "Не можам да го прочитам профилот за откажам членство во групата."
-
-#. TRANS: Server error. %1$s is a profile URI, %2$s is a group nickname.
-#: actions/groupsalmon.php:191
-#, php-format
-msgid "Could not remove remote user %1$s from group %2$s."
-msgstr "Не можев да го отстранам далечинскиот корисник %1$s од групата %2$s."
-
 #. TRANS: Field label for a field that takes an OStatus user address.
-#: actions/ostatussub.php:68
 msgid "Subscribe to"
 msgstr "Претплати се"
 
 #. TRANS: Tooltip for field label "Subscribe to".
-#: actions/ostatussub.php:71
 msgid ""
 "OStatus user's address, like nickname@example.com or http://example.net/"
 "nickname"
@@ -578,31 +196,30 @@ msgstr ""
 "Адреса на корисникот на OStatus, како на пр. prekar@primer.com or http://"
 "primer.net/prekar"
 
+#. TRANS: Button text.
+msgctxt "BUTTON"
+msgid "Continue"
+msgstr "Продолжи"
+
 #. TRANS: Button text.
 #. TRANS: Tooltip for button "Join".
-#: actions/ostatussub.php:112
 msgctxt "BUTTON"
 msgid "Join this group"
 msgstr "Зачлени се во групава"
 
 #. TRANS: Button text.
-#: actions/ostatussub.php:115
 msgctxt "BUTTON"
 msgid "Confirm"
 msgstr "Потврди"
 
 #. TRANS: Tooltip for button "Confirm".
-#: actions/ostatussub.php:117
 msgid "Subscribe to this user"
 msgstr "Претплати се на корисников"
 
-#: actions/ostatussub.php:138
 msgid "You are already subscribed to this user."
 msgstr "Веќе сте претплатени на овој корисник."
 
 #. TRANS: Error text.
-#: actions/ostatussub.php:232 actions/ostatussub.php:239
-#: actions/ostatussub.php:264
 msgid ""
 "Sorry, we could not reach that address. Please make sure that the OStatus "
 "address is like nickname@example.com or http://example.net/nickname."
@@ -611,9 +228,6 @@ msgstr ""
 "OStatus е од типот prekar@primer.com или http://primer.net/prekar."
 
 #. TRANS: Error text.
-#: actions/ostatussub.php:243 actions/ostatussub.php:247
-#: actions/ostatussub.php:251 actions/ostatussub.php:255
-#: actions/ostatussub.php:259
 msgid ""
 "Sorry, we could not reach that feed. Please try that OStatus address again "
 "later."
@@ -622,31 +236,25 @@ msgstr ""
 "адреса подоцна."
 
 #. TRANS: OStatus remote subscription dialog error.
-#: actions/ostatussub.php:293
 msgid "Already subscribed!"
 msgstr "Веќе сте претплатени!"
 
 #. TRANS: OStatus remote subscription dialog error.
-#: actions/ostatussub.php:298
 msgid "Remote subscription failed!"
 msgstr "Далечинската претплата не успеа!"
 
-#: actions/ostatussub.php:345 actions/ostatusinit.php:64
 msgid "There was a problem with your session token. Try again, please."
 msgstr "Се појави проблем со жетонот на Вашата сесија. Обидете се повторно."
 
 #. TRANS: Form title.
-#: actions/ostatussub.php:373 actions/ostatusinit.php:83
 msgid "Subscribe to user"
 msgstr "Претплати се на корисник"
 
 #. TRANS: Page title for OStatus remote subscription form
-#: actions/ostatussub.php:393
 msgid "Confirm"
 msgstr "Потврди"
 
 #. TRANS: Instructions.
-#: actions/ostatussub.php:405
 msgid ""
 "You can subscribe to users from other supported sites. Paste their address "
 "or profile URI below:"
@@ -654,128 +262,370 @@ msgstr ""
 "Можете да се претплатите на корисници од други поддржани мрежни места. "
 "Ископирајте ја нивната адреса или профилно URI подолу:"
 
+#. TRANS: Field label.
+msgid "Join group"
+msgstr "Зачлени се во групата"
+
+#. TRANS: Tooltip for field label "Join group".
+msgid "OStatus group's address, like http://example.net/group/nickname."
+msgstr ""
+"Адреса на групата на OStatus, како на пр. http://primer.net/group/prekar."
+
+msgid "You are already a member of this group."
+msgstr "Веќе членувате во групава."
+
+#. TRANS: OStatus remote group subscription dialog error.
+msgid "Already a member!"
+msgstr "Веќе членувате!"
+
+#. TRANS: OStatus remote group subscription dialog error.
+msgid "Remote group join failed!"
+msgstr "Придружувањето на далечинската група не успеа!"
+
+#. TRANS: OStatus remote group subscription dialog error.
+msgid "Remote group join aborted!"
+msgstr "Придружувањето на далечинската група е откажано!"
+
+#. TRANS: Page title for OStatus remote group join form
+msgid "Confirm joining remote group"
+msgstr "Потврди придружување кон далечинска група."
+
+#. TRANS: Instructions.
+msgid ""
+"You can subscribe to groups from other supported sites. Paste the group's "
+"profile URI below:"
+msgstr ""
+"Можете да се претплаќате на групи од други поддржани мреж. места. Подолу "
+"залепете го URI-то на профилот на групата."
+
+#. TRANS: Client error.
+msgid "No ID."
+msgstr "Нема ID."
+
+#. TRANS: Client exception.
+msgid "In reply to unknown notice."
+msgstr "Како одговор на непозната забелешка."
+
+#. TRANS: Client exception.
+msgid "In reply to a notice not by this user and not mentioning this user."
+msgstr ""
+"Како одговор на забелешка која не е од овој корисник и не го споменува."
+
+#. TRANS: Client exception.
+msgid "Could not save new favorite."
+msgstr "Не можам да го зачувам новобендисаното."
+
+#. TRANS: Client exception.
+msgid "Can't favorite/unfavorite without an object."
+msgstr "Не можам да означам како бендисано или да тргнам бендисано без објект."
+
+#. TRANS: Client exception.
+msgid "Can't handle that kind of object for liking/faving."
+msgstr ""
+"Не можам да работам со таков објект за ставање врски/означување бендисани."
+
+#. TRANS: Client exception. %s is an object ID.
+#, php-format
+msgid "Notice with ID %s unknown."
+msgstr "Не ја распознавам забелешката со ID %s."
+
+#. TRANS: Client exception. %1$s is a notice ID, %2$s is a user ID.
+#, php-format
+msgid "Notice with ID %1$s not posted by %2$s."
+msgstr "Забелешката со ID %1$s не е објавена од %2$s."
+
+#. TRANS: Client error.
+msgid "No such group."
+msgstr "Нема таква група."
+
+#. TRANS: Client error.
+msgid "Can't accept remote posts for a remote group."
+msgstr "Не можам да прифаќам далечински објави од далечинска група."
+
+#. TRANS: Client error.
+msgid "Can't read profile to set up group membership."
+msgstr ""
+"Не можев да го прочитам профилот за да го поставам членството во групата."
+
+#. TRANS: Client error.
+msgid "Groups can't join groups."
+msgstr "Во групите не можат да се зачленуваат групи."
+
+msgid "You have been blocked from that group by the admin."
+msgstr "Блокирани сте на таа група од администратор."
+
+#. TRANS: Server error. %1$s is a profile URI, %2$s is a group nickname.
+#, php-format
+msgid "Could not join remote user %1$s to group %2$s."
+msgstr "Не можев да го зачленам далечинскиот корисник %1$s во групата %2$s."
+
+msgid "Can't read profile to cancel group membership."
+msgstr "Не можам да го прочитам профилот за откажам членство во групата."
+
+#. TRANS: Server error. %1$s is a profile URI, %2$s is a group nickname.
+#, php-format
+msgid "Could not remove remote user %1$s from group %2$s."
+msgstr "Не можев да го отстранам далечинскиот корисник %1$s од групата %2$s."
+
 #. TRANS: Client error.
-#: actions/ostatusinit.php:42
 msgid "You can use the local subscription!"
 msgstr "Можете да ја користите локалната претплата!"
 
 #. TRANS: Form legend.
-#: actions/ostatusinit.php:98
 #, php-format
 msgid "Join group %s"
 msgstr "Зачлени се во групата %s"
 
 #. TRANS: Button text.
-#: actions/ostatusinit.php:100
 msgctxt "BUTTON"
 msgid "Join"
 msgstr "Зачлени се"
 
 #. TRANS: Form legend.
-#: actions/ostatusinit.php:103
 #, php-format
 msgid "Subscribe to %s"
 msgstr "Претплати се на %s"
 
 #. TRANS: Button text.
-#: actions/ostatusinit.php:105
 msgctxt "BUTTON"
 msgid "Subscribe"
 msgstr "Претплати се"
 
 #. TRANS: Field label.
-#: actions/ostatusinit.php:119
 msgid "Group nickname"
 msgstr "Прекар на групата"
 
-#: actions/ostatusinit.php:120
 msgid "Nickname of the group you want to join."
 msgstr "Прекар на групата кајшто сакате да се зачлените."
 
 #. TRANS: Field label.
-#: actions/ostatusinit.php:123
 msgid "User nickname"
 msgstr "Прекар на корисникот"
 
-#: actions/ostatusinit.php:124
 msgid "Nickname of the user you want to follow."
 msgstr "Прекарот на корисникот што сакате да го следите."
 
 #. TRANS: Field label.
-#: actions/ostatusinit.php:129
 msgid "Profile Account"
 msgstr "Профилна сметка"
 
 #. TRANS: Tooltip for field label "Profile Account".
-#: actions/ostatusinit.php:131
 msgid "Your account id (e.g. user@identi.ca)."
 msgstr "Вашата назнака (ID) на сметката (на пр. korisnik@identi.ca)."
 
 #. TRANS: Client error.
-#: actions/ostatusinit.php:153
 msgid "Must provide a remote profile."
 msgstr "Мора да наведете далечински профил."
 
 #. TRANS: Client error.
-#: actions/ostatusinit.php:165
 msgid "Couldn't look up OStatus account profile."
 msgstr "Не можев да го проверам профилот на OStatus-сметката."
 
 #. TRANS: Client error.
-#: actions/ostatusinit.php:178
 msgid "Couldn't confirm remote profile address."
 msgstr "Не можев да ја потврдам адресата на далечинскиот профил."
 
 #. TRANS: Page title.
-#: actions/ostatusinit.php:223
 msgid "OStatus Connect"
 msgstr "OStatus - Поврзување"
 
-#: actions/pushcallback.php:50
-msgid "Empty or invalid feed id."
-msgstr "Празен или неважечки ID за канал"
+msgid "Attempting to start PuSH subscription for feed with no hub."
+msgstr "Се обидов да ја започнам PuSH-претплатата за канал без средиште."
 
-#. TRANS: Server exception. %s is a feed ID.
-#: actions/pushcallback.php:56
+msgid "Attempting to end PuSH subscription for feed with no hub."
+msgstr ""
+"Се обидувам да ставам крај на PuSH-претплатата за емитување без средиште."
+
+#. TRANS: Server exception. %s is a URI.
 #, php-format
-msgid "Unknown PuSH feed id %s"
-msgstr "Непознат ID %s за PuSH-канал"
+msgid "Invalid ostatus_profile state: both group and profile IDs set for %s."
+msgstr ""
+"Неважечка ostatus_profile-состојба: назнаките (ID) на групата и профилот се "
+"наместени за %s."
 
-#. TRANS: Client exception. %s is an invalid feed name.
-#: actions/pushcallback.php:96
+#. TRANS: Server exception. %s is a URI.
 #, php-format
-msgid "Bad hub.topic feed \"%s\"."
-msgstr "Лош hub.topic-канал „%s“."
+msgid "Invalid ostatus_profile state: both group and profile IDs empty for %s."
+msgstr ""
+"Неважечка ostatus_profile-состојба: назнаките (ID) за групата и профилот се "
+"празни за %s."
 
-#. TRANS: Client exception. %1$s the invalid token, %2$s is the topic for which the invalid token was given.
-#: actions/pushcallback.php:101
+#. TRANS: Server exception.
+#. TRANS: %1$s is the method name the exception occured in, %2$s is the actor type.
 #, php-format
-msgid "Bad hub.verify_token %1$s for %2$s."
-msgstr "Лош hub.verify_token %1$s за %2$s."
+msgid "Invalid actor passed to %1$s: %2$s."
+msgstr "На %1$s е пренесен неважечки учесник: %2$s."
 
-#. TRANS: Client exception. %s is an invalid topic.
-#: actions/pushcallback.php:108
+#. TRANS: Server exception.
+msgid ""
+"Invalid type passed to Ostatus_profile::notify. It must be XML string or "
+"Activity entry."
+msgstr ""
+"На Ostatus_profile::notify е пренесен неважечки тип. Мора да биде XML-низа "
+"или ставка во Activity."
+
+#. TRANS: Exception.
+msgid "Unknown feed format."
+msgstr "Непознат формат на каналско емитување."
+
+#. TRANS: Exception.
+msgid "RSS feed without a channel."
+msgstr "RSS-емитување без канал."
+
+#. TRANS: Client exception.
+msgid "Can't handle that kind of post."
+msgstr "Не можам да работам со таква објава."
+
+#. TRANS: Client exception. %s is a source URI.
 #, php-format
-msgid "Unexpected subscribe request for %s."
-msgstr "Неочекувано барање за претплата за %s."
+msgid "No content for notice %s."
+msgstr "Нема содржина за забелешката %s."
 
-#. TRANS: Client exception. %s is an invalid topic.
-#: actions/pushcallback.php:113
+#. TRANS: Shown when a notice is longer than supported and/or when attachments are present. At runtime
+#. TRANS: this will usually be replaced with localised text from StatusNet core messages.
+msgid "Show more"
+msgstr "Повеќе"
+
+#. TRANS: Exception. %s is a profile URL.
 #, php-format
-msgid "Unexpected unsubscribe request for %s."
-msgstr "Неочекувано барање за отпишување од претплата за %s."
+msgid "Could not reach profile page %s."
+msgstr "Не можев да ја добијам профилната страница %s."
 
-#~ msgid "Photo"
-#~ msgstr "Слика"
+#. TRANS: Exception. %s is a URL.
+#, php-format
+msgid "Could not find a feed URL for profile page %s."
+msgstr "Не можев да пронајдам каналска URL-адреса за профилната страница %s."
 
-#~ msgid "Nickname"
-#~ msgstr "Прекар"
+#. TRANS: Feed sub exception.
+msgid "Can't find enough profile information to make a feed."
+msgstr "Не можев да најдам доволно профилни податоци за да направам канал."
 
-#~ msgid "Location"
-#~ msgstr "Место"
+#. TRANS: Server exception. %s is a URL.
+#, php-format
+msgid "Invalid avatar URL %s."
+msgstr "Неважечка URL-адреса за аватарот: %s."
 
-#~ msgid "URL"
-#~ msgstr "URL-адереса"
+#. TRANS: Server exception. %s is a URI.
+#, php-format
+msgid "Tried to update avatar for unsaved remote profile %s."
+msgstr ""
+"Се обидов да го подновам аватарот за незачуваниот далечински профил %s."
 
-#~ msgid "Note"
-#~ msgstr "Белешка"
+#. TRANS: Server exception. %s is a URL.
+#, php-format
+msgid "Unable to fetch avatar from %s."
+msgstr "Не можам да го добијам аватарот од %s."
+
+#. TRANS: Exception.
+msgid "Local user can't be referenced as remote."
+msgstr "Локалниот корисник не може да се наведе како далечински."
+
+#. TRANS: Exception.
+msgid "Local group can't be referenced as remote."
+msgstr "Локалната група не може да се наведе како далечинска."
+
+#. TRANS: Server exception.
+msgid "Can't save local profile."
+msgstr "Не можам да го зачувам локалниот профил."
+
+#. TRANS: Server exception.
+msgid "Can't save OStatus profile."
+msgstr "Не можам да го зачувам профилот од OStatus."
+
+#. TRANS: Exception.
+msgid "Not a valid webfinger address."
+msgstr "Ова не е важечка Webfinger-адреса"
+
+#. TRANS: Exception. %s is a webfinger address.
+#, php-format
+msgid "Couldn't save profile for \"%s\"."
+msgstr "Не можам да го зачувам профилот за „%s“."
+
+#. TRANS: Exception. %s is a webfinger address.
+#, php-format
+msgid "Couldn't save ostatus_profile for \"%s\"."
+msgstr "Не можам да го зачувам ostatus_profile за „%s“."
+
+#. TRANS: Exception. %s is a webfinger address.
+#, php-format
+msgid "Couldn't find a valid profile for \"%s\"."
+msgstr "Не можев да пронајдам важечки профил за „%s“."
+
+#. TRANS: Server exception.
+msgid "Could not store HTML content of long post as file."
+msgstr ""
+"Не можам да ја складирам HTML-содржината на долгата објава како податотека."
+
+#. TRANS: Client exception. %s is a HTTP status code.
+#, php-format
+msgid "Hub subscriber verification returned HTTP %s."
+msgstr "Потврдата на претплатникот на средиштето даде HTTP %s."
+
+#. TRANS: Exception. %1$s is a response status code, %2$s is the body of the response.
+#, php-format
+msgid "Callback returned status: %1$s. Body: %2$s"
+msgstr "Повратниот повик даде статус: %1$s. Содржина: %2$s"
+
+#. TRANS: Exception.
+msgid "Unable to locate signer public key."
+msgstr "Не можам да го пронајдам јавниот клуч на потписникот."
+
+#. TRANS: Exception.
+msgid "Salmon invalid actor for signing."
+msgstr "Ова е неважечки учесник во потпишувањето според Salmon."
+
+#. TRANS: Client error. POST is a HTTP command. It should not be translated.
+msgid "This method requires a POST."
+msgstr "Овој метод бара POST."
+
+#. TRANS: Client error. Do not translate "application/magic-envelope+xml"
+msgid "Salmon requires \"application/magic-envelope+xml\"."
+msgstr "Salmon бара „програм/magic-envelope+xml“."
+
+#. TRANS: Client error.
+msgid "Salmon signature verification failed."
+msgstr "Salmon-овото потврдување на потпис не успеа."
+
+#. TRANS: Client error.
+msgid "Salmon post must be an Atom entry."
+msgstr "Salmon-овата објава мора да биде Atom-ова ставка."
+
+#. TRANS: Client exception.
+msgid "Unrecognized activity type."
+msgstr "Непризнаен вид на активност."
+
+#. TRANS: Client exception.
+msgid "This target doesn't understand posts."
+msgstr "Оваа цел не разбира објави."
+
+#. TRANS: Client exception.
+msgid "This target doesn't understand follows."
+msgstr "Оваа цел не разбира следења."
+
+#. TRANS: Client exception.
+msgid "This target doesn't understand unfollows."
+msgstr "Оваа цел не разбира прекини на следења."
+
+#. TRANS: Client exception.
+msgid "This target doesn't understand favorites."
+msgstr "Оваа цел не разбира бендисување на забелешки."
+
+#. TRANS: Client exception.
+msgid "This target doesn't understand unfavorites."
+msgstr "Оваа цел не разбира одбендисување на забелешки."
+
+#. TRANS: Client exception.
+msgid "This target doesn't understand share events."
+msgstr "Оваа цел не разбира споделување на настани."
+
+#. TRANS: Client exception.
+msgid "This target doesn't understand joins."
+msgstr "Оваа цел не разбира придружувања."
+
+#. TRANS: Client exception.
+msgid "This target doesn't understand leave events."
+msgstr "Оваа цел не разбира напуштање на настани."
+
+#. TRANS: Exception.
+msgid "Received a salmon slap from unidentified actor."
+msgstr "Примив Salmon-шамар од непознат учесник."
diff --git a/plugins/OStatus/locale/nl/LC_MESSAGES/OStatus.po b/plugins/OStatus/locale/nl/LC_MESSAGES/OStatus.po
index e8dae09893..38864d5c58 100644
--- a/plugins/OStatus/locale/nl/LC_MESSAGES/OStatus.po
+++ b/plugins/OStatus/locale/nl/LC_MESSAGES/OStatus.po
@@ -10,53 +10,49 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OStatus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:45+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:59+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-14 17:22:01+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:49:39+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-ostatus\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+msgid "Feeds"
+msgstr "Feeds"
+
 #. TRANS: Link description for link to subscribe to a remote user.
 #. TRANS: Link text for a user to subscribe to an OStatus user.
-#: OStatusPlugin.php:223 OStatusPlugin.php:933
 msgid "Subscribe"
 msgstr "Abonneren"
 
 #. TRANS: Link description for link to join a remote group.
-#: OStatusPlugin.php:242 OStatusPlugin.php:651 actions/ostatussub.php:109
 msgid "Join"
 msgstr "Toetreden"
 
 #. TRANSLATE: %s is a domain.
-#: OStatusPlugin.php:455
 #, php-format
 msgid "Sent from %s via OStatus"
 msgstr "Verzonden vanaf %s via OStatus"
 
 #. TRANS: Exception.
-#: OStatusPlugin.php:527
 msgid "Could not set up remote subscription."
 msgstr ""
 "Het was niet mogelijk het abonnement via een andere dienst in te stellen."
 
-#: OStatusPlugin.php:601
 msgid "Unfollow"
 msgstr "Niet langer volgen"
 
 #. TRANS: Success message for unsubscribe from user attempt through OStatus.
 #. TRANS: %1$s is the unsubscriber's name, %2$s is the unsubscribed user's name.
-#: OStatusPlugin.php:604
 #, php-format
 msgid "%1$s stopped following %2$s."
 msgstr "%1$s volgt %2$s niet langer."
 
-#: OStatusPlugin.php:632
 msgid "Could not set up remote group membership."
 msgstr ""
 "Het was niet mogelijk het groepslidmaatschap via een andere dienst in te "
@@ -64,58 +60,48 @@ msgstr ""
 
 #. TRANS: Success message for subscribe to group attempt through OStatus.
 #. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
-#: OStatusPlugin.php:654
 #, php-format
 msgid "%1$s has joined group %2$s."
 msgstr "%1$s is lid geworden van de groep %2$s."
 
 #. TRANS: Exception.
-#: OStatusPlugin.php:663
 msgid "Failed joining remote group."
 msgstr ""
 "Het was niet mogelijk toe te streden to de groep van een andere dienst."
 
-#: OStatusPlugin.php:703
 msgid "Leave"
 msgstr "Verlaten"
 
 #. TRANS: Success message for unsubscribe from group attempt through OStatus.
 #. TRANS: %1$s is the member name, %2$s is the unsubscribed group's name.
-#: OStatusPlugin.php:706
 #, php-format
 msgid "%1$s has left group %2$s."
 msgstr "%1$s heeft de groep %2$s verlaten"
 
-#: OStatusPlugin.php:781
 msgid "Disfavor"
 msgstr "Uit favorieten verwijderen"
 
 #. TRANS: Success message for remove a favorite notice through OStatus.
 #. TRANS: %1$s is the unfavoring user's name, %2$s is URI to the no longer favored notice.
-#: OStatusPlugin.php:784
 #, php-format
 msgid "%1$s marked notice %2$s as no longer a favorite."
 msgstr "%1$s heeft de mededeling %2$s als favoriet verwijderd."
 
 #. TRANS: Link text for link to remote subscribe.
-#: OStatusPlugin.php:860
 msgid "Remote"
 msgstr "Via andere dienst"
 
 #. TRANS: Title for activity.
-#: OStatusPlugin.php:900
 msgid "Profile update"
 msgstr "Profielupdate"
 
 #. TRANS: Ping text for remote profile update through OStatus.
 #. TRANS: %s is user that updated their profile.
-#: OStatusPlugin.php:903
 #, php-format
 msgid "%s has updated their profile page."
 msgstr "Het profiel van %s is bijgewerkt."
 
 #. TRANS: Plugin description.
-#: OStatusPlugin.php:948
 msgid ""
 "Follow people across social networks that implement <a href=\"http://ostatus."
 "org/\">OStatus</a>."
@@ -123,277 +109,16 @@ msgstr ""
 "Mensen volgen over sociale netwerken die gebruik maken van <a href=\"http://"
 "ostatus.org/\">OStatus</a>."
 
-#: classes/FeedSub.php:252
-msgid "Attempting to start PuSH subscription for feed with no hub."
-msgstr ""
-"Aan het proberen een PuSH-abonnement te krijgen op een feed zonder hub."
-
-#: classes/FeedSub.php:282
-msgid "Attempting to end PuSH subscription for feed with no hub."
-msgstr ""
-"Aan het proberen een PuSH-abonnement te verwijderen voor een feed zonder hub."
-
-#. TRANS: Server exception. %s is a URI.
-#: classes/Ostatus_profile.php:154
-#, php-format
-msgid "Invalid ostatus_profile state: both group and profile IDs set for %s."
-msgstr ""
-"Ongeldige ostatus_profile status: het ID voor zowel de groep als het profiel "
-"voor %s is ingesteld."
-
-#. TRANS: Server exception. %s is a URI.
-#: classes/Ostatus_profile.php:157
-#, php-format
-msgid "Invalid ostatus_profile state: both group and profile IDs empty for %s."
-msgstr ""
-"Ongeldige ostatus_profile status: het ID voor zowel de groep als het profiel "
-"voor %s is leeg."
-
-#. TRANS: Server exception.
-#. TRANS: %1$s is the method name the exception occured in, %2$s is the actor type.
-#: classes/Ostatus_profile.php:247
-#, php-format
-msgid "Invalid actor passed to %1$s: %2$s."
-msgstr "Ongeldige actor doorgegeven aan %1$s: %2$s."
-
-#. TRANS: Server exception.
-#: classes/Ostatus_profile.php:341
-msgid ""
-"Invalid type passed to Ostatus_profile::notify. It must be XML string or "
-"Activity entry."
-msgstr ""
-"Ongeldig type doorgegeven aan Ostatus_profile::notify. Het moet een XML-"
-"string of Activity zijn."
-
-#. TRANS: Exception.
-#: classes/Ostatus_profile.php:372
-msgid "Unknown feed format."
-msgstr "Onbekend feedformaat"
-
-#. TRANS: Exception.
-#: classes/Ostatus_profile.php:396
-msgid "RSS feed without a channel."
-msgstr "RSS-feed zonder kanaal."
-
 #. TRANS: Client exception.
-#: classes/Ostatus_profile.php:442
-msgid "Can't handle that kind of post."
-msgstr "Dat type post kan niet verwerkt worden."
-
-#. TRANS: Client exception. %s is a source URI.
-#: classes/Ostatus_profile.php:500
-#, php-format
-msgid "No content for notice %s."
-msgstr "Geen inhoud voor mededeling %s."
-
-#. TRANS: Shown when a notice is longer than supported and/or when attachments are present. At runtime
-#. TRANS: this will usually be replaced with localised text from StatusNet core messages.
-#: classes/Ostatus_profile.php:535
-msgid "Show more"
-msgstr "Meer weergeven"
-
-#. TRANS: Exception. %s is a profile URL.
-#: classes/Ostatus_profile.php:728
-#, php-format
-msgid "Could not reach profile page %s."
-msgstr "Het was niet mogelijk de profielpagina %s te bereiken."
-
-#. TRANS: Exception. %s is a URL.
-#: classes/Ostatus_profile.php:786
-#, php-format
-msgid "Could not find a feed URL for profile page %s."
-msgstr "Het was niet mogelijk de feed-URL voor de profielpagina %s te vinden."
-
-#. TRANS: Feed sub exception.
-#: classes/Ostatus_profile.php:885
-msgid "Can't find enough profile information to make a feed."
-msgstr ""
-"Het was niet mogelijk voldoende profielinformatie te vinden om een feed te "
-"maken."
-
-#. TRANS: Server exception. %s is a URL.
-#: classes/Ostatus_profile.php:949
-#, php-format
-msgid "Invalid avatar URL %s."
-msgstr "Ongeldige avatar-URL %s."
-
-#. TRANS: Server exception. %s is a URI.
-#: classes/Ostatus_profile.php:960
-#, php-format
-msgid "Tried to update avatar for unsaved remote profile %s."
-msgstr ""
-"Geprobeerd om een avatar bij te werken voor het niet opgeslagen profiel %s."
-
-#. TRANS: Server exception. %s is a URL.
-#: classes/Ostatus_profile.php:970
-#, php-format
-msgid "Unable to fetch avatar from %s."
-msgstr "Het was niet mogelijk de avatar op te halen van %s."
-
-#. TRANS: Exception.
-#: classes/Ostatus_profile.php:1197
-msgid "Local user can't be referenced as remote."
-msgstr ""
-"Naar een lokale gebruiker kan niet verwezen worden alsof die zich bij een "
-"andere dienst bevindt."
-
-#. TRANS: Exception.
-#: classes/Ostatus_profile.php:1202
-msgid "Local group can't be referenced as remote."
-msgstr ""
-"Naar een lokale groep kan niet verwezen worden alsof die zich bij een andere "
-"dienst bevindt."
-
-#. TRANS: Server exception.
-#: classes/Ostatus_profile.php:1254 classes/Ostatus_profile.php:1265
-msgid "Can't save local profile."
-msgstr "Het was niet mogelijk het lokale profiel op te slaan."
-
-#. TRANS: Server exception.
-#: classes/Ostatus_profile.php:1273
-msgid "Can't save OStatus profile."
-msgstr "Het was niet mogelijk het Ostatusprofiel op te slaan."
-
-#. TRANS: Exception.
-#: classes/Ostatus_profile.php:1561 classes/Ostatus_profile.php:1589
-msgid "Not a valid webfinger address."
-msgstr "Geen geldig webfingeradres."
-
-#. TRANS: Exception. %s is a webfinger address.
-#: classes/Ostatus_profile.php:1671
-#, php-format
-msgid "Couldn't save profile for \"%s\"."
-msgstr "Het was niet mogelijk het profiel voor \"%s\" op te slaan."
-
-#. TRANS: Exception. %s is a webfinger address.
-#: classes/Ostatus_profile.php:1690
-#, php-format
-msgid "Couldn't save ostatus_profile for \"%s\"."
-msgstr "Het was niet mogelijk het ostatus_profile voor \"%s\" op te slaan."
-
-#. TRANS: Exception. %s is a webfinger address.
-#: classes/Ostatus_profile.php:1698
-#, php-format
-msgid "Couldn't find a valid profile for \"%s\"."
-msgstr "Er is geen geldig profiel voor \"%s\" gevonden."
-
-#. TRANS: Server exception.
-#: classes/Ostatus_profile.php:1741
-msgid "Could not store HTML content of long post as file."
-msgstr ""
-"Het was niet mogelijk de HTML-inhoud van het lange bericht als bestand op te "
-"slaan."
-
-#. TRANS: Client exception. %s is a HTTP status code.
-#: classes/HubSub.php:212
-#, php-format
-msgid "Hub subscriber verification returned HTTP %s."
-msgstr "De controle voor de hubabonnee heeft een HTTP %s teruggegeven."
-
-#. TRANS: Exception. %1$s is a response status code, %2$s is the body of the response.
-#: classes/HubSub.php:359
-#, php-format
-msgid "Callback returned status: %1$s. Body: %2$s"
-msgstr "De callback heeft de status %1$s teruggegeven. Inhoud: %2$s."
-
-#. TRANS: Client error. POST is a HTTP command. It should not be translated.
-#: lib/salmonaction.php:43
-msgid "This method requires a POST."
-msgstr "Deze methode vereist een POST."
-
-#. TRANS: Client error. Do not translate "application/magic-envelope+xml"
-#: lib/salmonaction.php:48
-msgid "Salmon requires \"application/magic-envelope+xml\"."
-msgstr "Salmon vereist \"application/magic-envelope+xml\"."
-
-#. TRANS: Client error.
-#: lib/salmonaction.php:58
-msgid "Salmon signature verification failed."
-msgstr "De controle voor Salmon is mislukt."
-
-#. TRANS: Client error.
-#: lib/salmonaction.php:70
-msgid "Salmon post must be an Atom entry."
-msgstr "Een Salmonbericht moet in Atomopmaak gemaakt zijn."
-
-#. TRANS: Client exception.
-#: lib/salmonaction.php:120
-msgid "Unrecognized activity type."
-msgstr "Onbekend activiteitentype."
-
-#. TRANS: Client exception.
-#: lib/salmonaction.php:130
-msgid "This target doesn't understand posts."
-msgstr "Deze bestemming begrijpt berichten niet."
-
-#. TRANS: Client exception.
-#: lib/salmonaction.php:136
-msgid "This target doesn't understand follows."
-msgstr "Deze bestemming begrijpt volgen niet."
-
-#. TRANS: Client exception.
-#: lib/salmonaction.php:142
-msgid "This target doesn't understand unfollows."
-msgstr "Deze bestemming begrijpt niet langer volgen niet."
-
-#. TRANS: Client exception.
-#: lib/salmonaction.php:148
-msgid "This target doesn't understand favorites."
-msgstr "Deze bestemming begrijpt favorieten niet."
-
-#. TRANS: Client exception.
-#: lib/salmonaction.php:154
-msgid "This target doesn't understand unfavorites."
-msgstr "Deze bestemming begrijpt favorieten verwijderen niet."
-
-#. TRANS: Client exception.
-#: lib/salmonaction.php:160
-msgid "This target doesn't understand share events."
-msgstr "Deze bestemming begrijpt gebeurtenissen delen niet."
-
-#. TRANS: Client exception.
-#: lib/salmonaction.php:166
-msgid "This target doesn't understand joins."
-msgstr "Deze bestemming begrijpt lid worden niet."
-
-#. TRANS: Client exception.
-#: lib/salmonaction.php:172
-msgid "This target doesn't understand leave events."
-msgstr "Deze bestemming begrijpt uitschrijven van gebeurtenissen niet."
-
-#. TRANS: Exception.
-#: lib/salmonaction.php:200
-msgid "Received a salmon slap from unidentified actor."
-msgstr "Er is een Salmonslap ontvangen van een niet-geïdentificeerde actor."
-
-#. TRANS: Exception.
-#: lib/magicenvelope.php:80
-msgid "Unable to locate signer public key."
-msgstr ""
-"Het was niet mogelijk de publieke sleutel van de ondertekenaar te vinden."
-
-#. TRANS: Exception.
-#: lib/salmon.php:126
-msgid "Salmon invalid actor for signing."
-msgstr "Ongeldige actor voor het ondertekenen van Salmon."
-
-#: tests/gettext-speedtest.php:57
-msgid "Feeds"
-msgstr "Feeds"
-
-#. TRANS: Client exception.
-#: actions/pushhub.php:70
 msgid "Publishing outside feeds not supported."
 msgstr "Publiceren buiten feeds om wordt niet ondersteund."
 
 #. TRANS: Client exception. %s is a mode.
-#: actions/pushhub.php:73
 #, php-format
 msgid "Unrecognized mode \"%s\"."
 msgstr "Niet herkende modus \"%s\"."
 
 #. TRANS: Client exception. %s is a topic.
-#: actions/pushhub.php:93
 #, php-format
 msgid ""
 "Unsupported hub.topic %s this hub only serves local user and group Atom "
@@ -403,14 +128,12 @@ msgstr ""
 "lokale gebruikers en groepen."
 
 #. TRANS: Client exception.
-#: actions/pushhub.php:99
 #, php-format
 msgid "Invalid hub.verify \"%s\". It must be sync or async."
 msgstr ""
 "Ongeldige waarde voor hub.verify \"%s\". Het moet \"sync\" of \"async\" zijn."
 
 #. TRANS: Client exception.
-#: actions/pushhub.php:105
 #, php-format
 msgid "Invalid hub.lease \"%s\". It must be empty or positive integer."
 msgstr ""
@@ -418,186 +141,63 @@ msgstr ""
 "positief geheel getal."
 
 #. TRANS: Client exception.
-#: actions/pushhub.php:113
 #, php-format
 msgid "Invalid hub.secret \"%s\". It must be under 200 bytes."
 msgstr ""
 "Ongeldig hub.secret \"%s\". Het moet minder dan tweehonderd bytes bevatten."
 
 #. TRANS: Client exception.
-#: actions/pushhub.php:165
 #, php-format
 msgid "Invalid hub.topic \"%s\". User doesn't exist."
 msgstr "Ongeldig hub.topic \"%s\". De gebruiker bestaat niet."
 
 #. TRANS: Client exception.
-#: actions/pushhub.php:174
 #, php-format
 msgid "Invalid hub.topic \"%s\". Group doesn't exist."
 msgstr "Ongeldig hub.topic \"%s\". De groep bestaat niet."
 
 #. TRANS: Client exception.
 #. TRANS: %1$s is this argument to the method this exception occurs in, %2$s is a URL.
-#: actions/pushhub.php:199
 #, php-format
 msgid "Invalid URL passed for %1$s: \"%2$s\""
 msgstr "Er is een ongeldige URL doorgegeven voor %1$s: \"%2$s\""
 
-#: actions/ownerxrd.php:39 actions/usersalmon.php:43
+msgid "Empty or invalid feed id."
+msgstr "Het feed-ID is leeg of ongeldig."
+
+#. TRANS: Server exception. %s is a feed ID.
+#, php-format
+msgid "Unknown PuSH feed id %s"
+msgstr "Het PuSH feed-ID %s is onbekend"
+
+#. TRANS: Client exception. %s is an invalid feed name.
+#, php-format
+msgid "Bad hub.topic feed \"%s\"."
+msgstr "Ongeldige hub.topic feed \"%s\"."
+
+#. TRANS: Client exception. %1$s the invalid token, %2$s is the topic for which the invalid token was given.
+#, php-format
+msgid "Bad hub.verify_token %1$s for %2$s."
+msgstr "Ongeldig hub.verify_token %1$s voor %2$s."
+
+#. TRANS: Client exception. %s is an invalid topic.
+#, php-format
+msgid "Unexpected subscribe request for %s."
+msgstr "Onverwacht abonneringsverzoek voor %s."
+
+#. TRANS: Client exception. %s is an invalid topic.
+#, php-format
+msgid "Unexpected unsubscribe request for %s."
+msgstr "Onverwacht verzoek om abonnement op te hebben voor %s."
+
 msgid "No such user."
 msgstr "Onbekende gebruiker."
 
-#. TRANS: Client error.
-#: actions/usersalmon.php:37 actions/groupsalmon.php:40
-msgid "No ID."
-msgstr "Geen ID."
-
-#. TRANS: Client exception.
-#: actions/usersalmon.php:83
-msgid "In reply to unknown notice."
-msgstr "In antwoord op een onbekende mededeling."
-
-#. TRANS: Client exception.
-#: actions/usersalmon.php:88
-msgid "In reply to a notice not by this user and not mentioning this user."
-msgstr ""
-"In antwoord op een mededeling niet door deze gebruiker en niet over of aan "
-"deze gebruiker."
-
-#. TRANS: Client exception.
-#: actions/usersalmon.php:165
-msgid "Could not save new favorite."
-msgstr "Het was niet mogelijk de nieuwe favoriet op te slaan."
-
-#. TRANS: Client exception.
-#: actions/usersalmon.php:197
-msgid "Can't favorite/unfavorite without an object."
-msgstr ""
-"Het is niet mogelijk (niet langer) als favoriet te markeren zonder object."
-
-#. TRANS: Client exception.
-#: actions/usersalmon.php:209
-msgid "Can't handle that kind of object for liking/faving."
-msgstr ""
-"Dat object is niet beschikbaar voor (niet langer) als favoriet aanmerken."
-
-#. TRANS: Client exception. %s is an object ID.
-#: actions/usersalmon.php:216
-#, php-format
-msgid "Notice with ID %s unknown."
-msgstr "De mededeling met ID %s is onbekend."
-
-#. TRANS: Client exception. %1$s is a notice ID, %2$s is a user ID.
-#: actions/usersalmon.php:221
-#, php-format
-msgid "Notice with ID %1$s not posted by %2$s."
-msgstr "De mededeling met ID %1$s is niet geplaatst foor %2$s."
-
-#. TRANS: Field label.
-#: actions/ostatusgroup.php:78
-msgid "Join group"
-msgstr "Lid worden van groep"
-
-#. TRANS: Tooltip for field label "Join group".
-#: actions/ostatusgroup.php:81
-msgid "OStatus group's address, like http://example.net/group/nickname."
-msgstr ""
-"Het adres voor de OStatusgroep. Bijvoorbeeld; http://example.net/group/"
-"nickname."
-
-#. TRANS: Button text.
-#: actions/ostatusgroup.php:86 actions/ostatussub.php:75
-msgctxt "BUTTON"
-msgid "Continue"
-msgstr "Doorgaan"
-
-#: actions/ostatusgroup.php:105
-msgid "You are already a member of this group."
-msgstr "U bent al lid van deze groep."
-
-#. TRANS: OStatus remote group subscription dialog error.
-#: actions/ostatusgroup.php:140
-msgid "Already a member!"
-msgstr "U bent al lid!"
-
-#. TRANS: OStatus remote group subscription dialog error.
-#: actions/ostatusgroup.php:151
-msgid "Remote group join failed!"
-msgstr "Het verlaten van de groep bij een andere dienst is mislukt."
-
-#. TRANS: OStatus remote group subscription dialog error.
-#: actions/ostatusgroup.php:155
-msgid "Remote group join aborted!"
-msgstr "Het lid worden van de groep bij een andere dienst is afgebroken."
-
-#. TRANS: Page title for OStatus remote group join form
-#: actions/ostatusgroup.php:167
-msgid "Confirm joining remote group"
-msgstr "Lid worden van groep bij andere dienst"
-
-#. TRANS: Instructions.
-#: actions/ostatusgroup.php:178
-msgid ""
-"You can subscribe to groups from other supported sites. Paste the group's "
-"profile URI below:"
-msgstr ""
-"U kunt abonneren op groepen van andere ondersteunde sites. Plak hieronder de "
-"URI van het groepsprofiel:"
-
-#. TRANS: Client error.
-#: actions/groupsalmon.php:47
-msgid "No such group."
-msgstr "De opgegeven groep bestaat niet."
-
-#. TRANS: Client error.
-#: actions/groupsalmon.php:56
-msgid "Can't accept remote posts for a remote group."
-msgstr ""
-"Berichten van andere diensten voor groepen bij andere diensten worden niet "
-"geaccepteerd."
-
-#. TRANS: Client error.
-#: actions/groupsalmon.php:130
-msgid "Can't read profile to set up group membership."
-msgstr "Het profiel om lid te worden van een groep kon niet gelezen worden."
-
-#. TRANS: Client error.
-#: actions/groupsalmon.php:134 actions/groupsalmon.php:177
-msgid "Groups can't join groups."
-msgstr "Groepen kunnen geen lid worden van groepen."
-
-#: actions/groupsalmon.php:147
-msgid "You have been blocked from that group by the admin."
-msgstr "Een beheerder heeft ingesteld dat u geen lid mag worden van die groep."
-
-#. TRANS: Server error. %1$s is a profile URI, %2$s is a group nickname.
-#: actions/groupsalmon.php:162
-#, php-format
-msgid "Could not join remote user %1$s to group %2$s."
-msgstr ""
-"De gebruiker %1$s van een andere dienst kon niet lid worden van de groep %2"
-"$s."
-
-#: actions/groupsalmon.php:174
-msgid "Can't read profile to cancel group membership."
-msgstr ""
-"Het profiel om groepslidmaatschap te annuleren kon niet gelezen worden."
-
-#. TRANS: Server error. %1$s is a profile URI, %2$s is a group nickname.
-#: actions/groupsalmon.php:191
-#, php-format
-msgid "Could not remove remote user %1$s from group %2$s."
-msgstr ""
-"Het was niet mogelijk gebruiker %1$s van een andere dienst uit de groep %2$s "
-"te verwijderen."
-
 #. TRANS: Field label for a field that takes an OStatus user address.
-#: actions/ostatussub.php:68
 msgid "Subscribe to"
 msgstr "Abonneren op"
 
 #. TRANS: Tooltip for field label "Subscribe to".
-#: actions/ostatussub.php:71
 msgid ""
 "OStatus user's address, like nickname@example.com or http://example.net/"
 "nickname"
@@ -605,31 +205,30 @@ msgstr ""
 "Het OStatusadres van de gebruiker. Bijvoorbeeld nickname@example.com of "
 "http://example.net/nickname"
 
+#. TRANS: Button text.
+msgctxt "BUTTON"
+msgid "Continue"
+msgstr "Doorgaan"
+
 #. TRANS: Button text.
 #. TRANS: Tooltip for button "Join".
-#: actions/ostatussub.php:112
 msgctxt "BUTTON"
 msgid "Join this group"
 msgstr "Lid worden van deze groep"
 
 #. TRANS: Button text.
-#: actions/ostatussub.php:115
 msgctxt "BUTTON"
 msgid "Confirm"
 msgstr "Bevestigen"
 
 #. TRANS: Tooltip for button "Confirm".
-#: actions/ostatussub.php:117
 msgid "Subscribe to this user"
 msgstr "Abonneren op deze gebruiker"
 
-#: actions/ostatussub.php:138
 msgid "You are already subscribed to this user."
 msgstr "U bent al geabonneerd op deze gebruiker."
 
 #. TRANS: Error text.
-#: actions/ostatussub.php:232 actions/ostatussub.php:239
-#: actions/ostatussub.php:264
 msgid ""
 "Sorry, we could not reach that address. Please make sure that the OStatus "
 "address is like nickname@example.com or http://example.net/nickname."
@@ -638,9 +237,6 @@ msgstr ""
 "van gebruiker@example.com of http://example.net/gebruiker."
 
 #. TRANS: Error text.
-#: actions/ostatussub.php:243 actions/ostatussub.php:247
-#: actions/ostatussub.php:251 actions/ostatussub.php:255
-#: actions/ostatussub.php:259
 msgid ""
 "Sorry, we could not reach that feed. Please try that OStatus address again "
 "later."
@@ -648,33 +244,27 @@ msgstr ""
 "Die feed was niet te bereiken. Probeer dat OStatusadres later nog een keer."
 
 #. TRANS: OStatus remote subscription dialog error.
-#: actions/ostatussub.php:293
 msgid "Already subscribed!"
 msgstr "U bent al gebonneerd!"
 
 #. TRANS: OStatus remote subscription dialog error.
-#: actions/ostatussub.php:298
 msgid "Remote subscription failed!"
 msgstr "Abonneren via een andere dienst is mislukt!"
 
-#: actions/ostatussub.php:345 actions/ostatusinit.php:64
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 "Er is een probleem ontstaan met uw sessie. Probeer het nog een keer, "
 "alstublieft."
 
 #. TRANS: Form title.
-#: actions/ostatussub.php:373 actions/ostatusinit.php:83
 msgid "Subscribe to user"
 msgstr "Abonneren op gebruiker"
 
 #. TRANS: Page title for OStatus remote subscription form
-#: actions/ostatussub.php:393
 msgid "Confirm"
 msgstr "Bevestigen"
 
 #. TRANS: Instructions.
-#: actions/ostatussub.php:405
 msgid ""
 "You can subscribe to users from other supported sites. Paste their address "
 "or profile URI below:"
@@ -682,129 +272,389 @@ msgstr ""
 "U kunt abonneren op gebruikers van andere ondersteunde sites. Plak hun adres "
 "of profiel-URI hieronder:"
 
+#. TRANS: Field label.
+msgid "Join group"
+msgstr "Lid worden van groep"
+
+#. TRANS: Tooltip for field label "Join group".
+msgid "OStatus group's address, like http://example.net/group/nickname."
+msgstr ""
+"Het adres voor de OStatusgroep. Bijvoorbeeld; http://example.net/group/"
+"nickname."
+
+msgid "You are already a member of this group."
+msgstr "U bent al lid van deze groep."
+
+#. TRANS: OStatus remote group subscription dialog error.
+msgid "Already a member!"
+msgstr "U bent al lid!"
+
+#. TRANS: OStatus remote group subscription dialog error.
+msgid "Remote group join failed!"
+msgstr "Het verlaten van de groep bij een andere dienst is mislukt."
+
+#. TRANS: OStatus remote group subscription dialog error.
+msgid "Remote group join aborted!"
+msgstr "Het lid worden van de groep bij een andere dienst is afgebroken."
+
+#. TRANS: Page title for OStatus remote group join form
+msgid "Confirm joining remote group"
+msgstr "Lid worden van groep bij andere dienst"
+
+#. TRANS: Instructions.
+msgid ""
+"You can subscribe to groups from other supported sites. Paste the group's "
+"profile URI below:"
+msgstr ""
+"U kunt abonneren op groepen van andere ondersteunde sites. Plak hieronder de "
+"URI van het groepsprofiel:"
+
+#. TRANS: Client error.
+msgid "No ID."
+msgstr "Geen ID."
+
+#. TRANS: Client exception.
+msgid "In reply to unknown notice."
+msgstr "In antwoord op een onbekende mededeling."
+
+#. TRANS: Client exception.
+msgid "In reply to a notice not by this user and not mentioning this user."
+msgstr ""
+"In antwoord op een mededeling niet door deze gebruiker en niet over of aan "
+"deze gebruiker."
+
+#. TRANS: Client exception.
+msgid "Could not save new favorite."
+msgstr "Het was niet mogelijk de nieuwe favoriet op te slaan."
+
+#. TRANS: Client exception.
+msgid "Can't favorite/unfavorite without an object."
+msgstr ""
+"Het is niet mogelijk (niet langer) als favoriet te markeren zonder object."
+
+#. TRANS: Client exception.
+msgid "Can't handle that kind of object for liking/faving."
+msgstr ""
+"Dat object is niet beschikbaar voor (niet langer) als favoriet aanmerken."
+
+#. TRANS: Client exception. %s is an object ID.
+#, php-format
+msgid "Notice with ID %s unknown."
+msgstr "De mededeling met ID %s is onbekend."
+
+#. TRANS: Client exception. %1$s is a notice ID, %2$s is a user ID.
+#, php-format
+msgid "Notice with ID %1$s not posted by %2$s."
+msgstr "De mededeling met ID %1$s is niet geplaatst foor %2$s."
+
+#. TRANS: Client error.
+msgid "No such group."
+msgstr "De opgegeven groep bestaat niet."
+
+#. TRANS: Client error.
+msgid "Can't accept remote posts for a remote group."
+msgstr ""
+"Berichten van andere diensten voor groepen bij andere diensten worden niet "
+"geaccepteerd."
+
+#. TRANS: Client error.
+msgid "Can't read profile to set up group membership."
+msgstr "Het profiel om lid te worden van een groep kon niet gelezen worden."
+
+#. TRANS: Client error.
+msgid "Groups can't join groups."
+msgstr "Groepen kunnen geen lid worden van groepen."
+
+msgid "You have been blocked from that group by the admin."
+msgstr "Een beheerder heeft ingesteld dat u geen lid mag worden van die groep."
+
+#. TRANS: Server error. %1$s is a profile URI, %2$s is a group nickname.
+#, php-format
+msgid "Could not join remote user %1$s to group %2$s."
+msgstr ""
+"De gebruiker %1$s van een andere dienst kon niet lid worden van de groep %2"
+"$s."
+
+msgid "Can't read profile to cancel group membership."
+msgstr ""
+"Het profiel om groepslidmaatschap te annuleren kon niet gelezen worden."
+
+#. TRANS: Server error. %1$s is a profile URI, %2$s is a group nickname.
+#, php-format
+msgid "Could not remove remote user %1$s from group %2$s."
+msgstr ""
+"Het was niet mogelijk gebruiker %1$s van een andere dienst uit de groep %2$s "
+"te verwijderen."
+
 #. TRANS: Client error.
-#: actions/ostatusinit.php:42
 msgid "You can use the local subscription!"
 msgstr "U kunt het lokale abonnement gebruiken!"
 
 #. TRANS: Form legend.
-#: actions/ostatusinit.php:98
 #, php-format
 msgid "Join group %s"
 msgstr "Lid worden van de groep %s"
 
 #. TRANS: Button text.
-#: actions/ostatusinit.php:100
 msgctxt "BUTTON"
 msgid "Join"
 msgstr "Toetreden"
 
 #. TRANS: Form legend.
-#: actions/ostatusinit.php:103
 #, php-format
 msgid "Subscribe to %s"
 msgstr "Abonneren op %s"
 
 #. TRANS: Button text.
-#: actions/ostatusinit.php:105
 msgctxt "BUTTON"
 msgid "Subscribe"
 msgstr "Abonneren"
 
 #. TRANS: Field label.
-#: actions/ostatusinit.php:119
 msgid "Group nickname"
 msgstr "Korte groepsnaam"
 
-#: actions/ostatusinit.php:120
 msgid "Nickname of the group you want to join."
 msgstr "De naam van de groep die u wilt volgen."
 
 #. TRANS: Field label.
-#: actions/ostatusinit.php:123
 msgid "User nickname"
 msgstr "Gebruikersnaam"
 
-#: actions/ostatusinit.php:124
 msgid "Nickname of the user you want to follow."
 msgstr "Gebruikersnaam van de gebruiker waarop u wilt abonneren."
 
 #. TRANS: Field label.
-#: actions/ostatusinit.php:129
 msgid "Profile Account"
 msgstr "Gebruikersprofiel"
 
 #. TRANS: Tooltip for field label "Profile Account".
-#: actions/ostatusinit.php:131
 msgid "Your account id (e.g. user@identi.ca)."
 msgstr "Uw gebruikers-ID (bv. gebruiker@identi.ca)."
 
 #. TRANS: Client error.
-#: actions/ostatusinit.php:153
 msgid "Must provide a remote profile."
 msgstr "Er moet een profiel bij een andere dienst opgegeven worden."
 
 #. TRANS: Client error.
-#: actions/ostatusinit.php:165
 msgid "Couldn't look up OStatus account profile."
 msgstr "Het was niet mogelijk het OStatusgebruikersprofiel te vinden."
 
 #. TRANS: Client error.
-#: actions/ostatusinit.php:178
 msgid "Couldn't confirm remote profile address."
 msgstr ""
 "Het was niet mogelijk het profieladres bij de andere dienst te bevestigen."
 
 #. TRANS: Page title.
-#: actions/ostatusinit.php:223
 msgid "OStatus Connect"
 msgstr "OStatuskoppeling"
 
-#: actions/pushcallback.php:50
-msgid "Empty or invalid feed id."
-msgstr "Het feed-ID is leeg of ongeldig."
+msgid "Attempting to start PuSH subscription for feed with no hub."
+msgstr ""
+"Aan het proberen een PuSH-abonnement te krijgen op een feed zonder hub."
 
-#. TRANS: Server exception. %s is a feed ID.
-#: actions/pushcallback.php:56
+msgid "Attempting to end PuSH subscription for feed with no hub."
+msgstr ""
+"Aan het proberen een PuSH-abonnement te verwijderen voor een feed zonder hub."
+
+#. TRANS: Server exception. %s is a URI.
 #, php-format
-msgid "Unknown PuSH feed id %s"
-msgstr "Het PuSH feed-ID %s is onbekend"
+msgid "Invalid ostatus_profile state: both group and profile IDs set for %s."
+msgstr ""
+"Ongeldige ostatus_profile status: het ID voor zowel de groep als het profiel "
+"voor %s is ingesteld."
 
-#. TRANS: Client exception. %s is an invalid feed name.
-#: actions/pushcallback.php:96
+#. TRANS: Server exception. %s is a URI.
 #, php-format
-msgid "Bad hub.topic feed \"%s\"."
-msgstr "Ongeldige hub.topic feed \"%s\"."
+msgid "Invalid ostatus_profile state: both group and profile IDs empty for %s."
+msgstr ""
+"Ongeldige ostatus_profile status: het ID voor zowel de groep als het profiel "
+"voor %s is leeg."
 
-#. TRANS: Client exception. %1$s the invalid token, %2$s is the topic for which the invalid token was given.
-#: actions/pushcallback.php:101
+#. TRANS: Server exception.
+#. TRANS: %1$s is the method name the exception occured in, %2$s is the actor type.
 #, php-format
-msgid "Bad hub.verify_token %1$s for %2$s."
-msgstr "Ongeldig hub.verify_token %1$s voor %2$s."
+msgid "Invalid actor passed to %1$s: %2$s."
+msgstr "Ongeldige actor doorgegeven aan %1$s: %2$s."
 
-#. TRANS: Client exception. %s is an invalid topic.
-#: actions/pushcallback.php:108
+#. TRANS: Server exception.
+msgid ""
+"Invalid type passed to Ostatus_profile::notify. It must be XML string or "
+"Activity entry."
+msgstr ""
+"Ongeldig type doorgegeven aan Ostatus_profile::notify. Het moet een XML-"
+"string of Activity zijn."
+
+#. TRANS: Exception.
+msgid "Unknown feed format."
+msgstr "Onbekend feedformaat"
+
+#. TRANS: Exception.
+msgid "RSS feed without a channel."
+msgstr "RSS-feed zonder kanaal."
+
+#. TRANS: Client exception.
+msgid "Can't handle that kind of post."
+msgstr "Dat type post kan niet verwerkt worden."
+
+#. TRANS: Client exception. %s is a source URI.
 #, php-format
-msgid "Unexpected subscribe request for %s."
-msgstr "Onverwacht abonneringsverzoek voor %s."
+msgid "No content for notice %s."
+msgstr "Geen inhoud voor mededeling %s."
 
-#. TRANS: Client exception. %s is an invalid topic.
-#: actions/pushcallback.php:113
+#. TRANS: Shown when a notice is longer than supported and/or when attachments are present. At runtime
+#. TRANS: this will usually be replaced with localised text from StatusNet core messages.
+msgid "Show more"
+msgstr "Meer weergeven"
+
+#. TRANS: Exception. %s is a profile URL.
 #, php-format
-msgid "Unexpected unsubscribe request for %s."
-msgstr "Onverwacht verzoek om abonnement op te hebben voor %s."
+msgid "Could not reach profile page %s."
+msgstr "Het was niet mogelijk de profielpagina %s te bereiken."
 
-#~ msgid "Photo"
-#~ msgstr "Foto"
+#. TRANS: Exception. %s is a URL.
+#, php-format
+msgid "Could not find a feed URL for profile page %s."
+msgstr "Het was niet mogelijk de feed-URL voor de profielpagina %s te vinden."
 
-#~ msgid "Nickname"
-#~ msgstr "Gebruikersnaam"
+#. TRANS: Feed sub exception.
+msgid "Can't find enough profile information to make a feed."
+msgstr ""
+"Het was niet mogelijk voldoende profielinformatie te vinden om een feed te "
+"maken."
 
-#~ msgid "Location"
-#~ msgstr "Locatie"
+#. TRANS: Server exception. %s is a URL.
+#, php-format
+msgid "Invalid avatar URL %s."
+msgstr "Ongeldige avatar-URL %s."
 
-#~ msgid "URL"
-#~ msgstr "URL"
+#. TRANS: Server exception. %s is a URI.
+#, php-format
+msgid "Tried to update avatar for unsaved remote profile %s."
+msgstr ""
+"Geprobeerd om een avatar bij te werken voor het niet opgeslagen profiel %s."
 
-#~ msgid "Note"
-#~ msgstr "Opmerking"
+#. TRANS: Server exception. %s is a URL.
+#, php-format
+msgid "Unable to fetch avatar from %s."
+msgstr "Het was niet mogelijk de avatar op te halen van %s."
+
+#. TRANS: Exception.
+msgid "Local user can't be referenced as remote."
+msgstr ""
+"Naar een lokale gebruiker kan niet verwezen worden alsof die zich bij een "
+"andere dienst bevindt."
+
+#. TRANS: Exception.
+msgid "Local group can't be referenced as remote."
+msgstr ""
+"Naar een lokale groep kan niet verwezen worden alsof die zich bij een andere "
+"dienst bevindt."
+
+#. TRANS: Server exception.
+msgid "Can't save local profile."
+msgstr "Het was niet mogelijk het lokale profiel op te slaan."
+
+#. TRANS: Server exception.
+msgid "Can't save OStatus profile."
+msgstr "Het was niet mogelijk het Ostatusprofiel op te slaan."
+
+#. TRANS: Exception.
+msgid "Not a valid webfinger address."
+msgstr "Geen geldig webfingeradres."
+
+#. TRANS: Exception. %s is a webfinger address.
+#, php-format
+msgid "Couldn't save profile for \"%s\"."
+msgstr "Het was niet mogelijk het profiel voor \"%s\" op te slaan."
+
+#. TRANS: Exception. %s is a webfinger address.
+#, php-format
+msgid "Couldn't save ostatus_profile for \"%s\"."
+msgstr "Het was niet mogelijk het ostatus_profile voor \"%s\" op te slaan."
+
+#. TRANS: Exception. %s is a webfinger address.
+#, php-format
+msgid "Couldn't find a valid profile for \"%s\"."
+msgstr "Er is geen geldig profiel voor \"%s\" gevonden."
+
+#. TRANS: Server exception.
+msgid "Could not store HTML content of long post as file."
+msgstr ""
+"Het was niet mogelijk de HTML-inhoud van het lange bericht als bestand op te "
+"slaan."
+
+#. TRANS: Client exception. %s is a HTTP status code.
+#, php-format
+msgid "Hub subscriber verification returned HTTP %s."
+msgstr "De controle voor de hubabonnee heeft een HTTP %s teruggegeven."
+
+#. TRANS: Exception. %1$s is a response status code, %2$s is the body of the response.
+#, php-format
+msgid "Callback returned status: %1$s. Body: %2$s"
+msgstr "De callback heeft de status %1$s teruggegeven. Inhoud: %2$s."
+
+#. TRANS: Exception.
+msgid "Unable to locate signer public key."
+msgstr ""
+"Het was niet mogelijk de publieke sleutel van de ondertekenaar te vinden."
+
+#. TRANS: Exception.
+msgid "Salmon invalid actor for signing."
+msgstr "Ongeldige actor voor het ondertekenen van Salmon."
+
+#. TRANS: Client error. POST is a HTTP command. It should not be translated.
+msgid "This method requires a POST."
+msgstr "Deze methode vereist een POST."
+
+#. TRANS: Client error. Do not translate "application/magic-envelope+xml"
+msgid "Salmon requires \"application/magic-envelope+xml\"."
+msgstr "Salmon vereist \"application/magic-envelope+xml\"."
+
+#. TRANS: Client error.
+msgid "Salmon signature verification failed."
+msgstr "De controle voor Salmon is mislukt."
+
+#. TRANS: Client error.
+msgid "Salmon post must be an Atom entry."
+msgstr "Een Salmonbericht moet in Atomopmaak gemaakt zijn."
+
+#. TRANS: Client exception.
+msgid "Unrecognized activity type."
+msgstr "Onbekend activiteitentype."
+
+#. TRANS: Client exception.
+msgid "This target doesn't understand posts."
+msgstr "Deze bestemming begrijpt berichten niet."
+
+#. TRANS: Client exception.
+msgid "This target doesn't understand follows."
+msgstr "Deze bestemming begrijpt volgen niet."
+
+#. TRANS: Client exception.
+msgid "This target doesn't understand unfollows."
+msgstr "Deze bestemming begrijpt niet langer volgen niet."
+
+#. TRANS: Client exception.
+msgid "This target doesn't understand favorites."
+msgstr "Deze bestemming begrijpt favorieten niet."
+
+#. TRANS: Client exception.
+msgid "This target doesn't understand unfavorites."
+msgstr "Deze bestemming begrijpt favorieten verwijderen niet."
+
+#. TRANS: Client exception.
+msgid "This target doesn't understand share events."
+msgstr "Deze bestemming begrijpt gebeurtenissen delen niet."
+
+#. TRANS: Client exception.
+msgid "This target doesn't understand joins."
+msgstr "Deze bestemming begrijpt lid worden niet."
+
+#. TRANS: Client exception.
+msgid "This target doesn't understand leave events."
+msgstr "Deze bestemming begrijpt uitschrijven van gebeurtenissen niet."
+
+#. TRANS: Exception.
+msgid "Received a salmon slap from unidentified actor."
+msgstr "Er is een Salmonslap ontvangen van een niet-geïdentificeerde actor."
diff --git a/plugins/OStatus/locale/uk/LC_MESSAGES/OStatus.po b/plugins/OStatus/locale/uk/LC_MESSAGES/OStatus.po
index eb6534502f..568e4ae2a7 100644
--- a/plugins/OStatus/locale/uk/LC_MESSAGES/OStatus.po
+++ b/plugins/OStatus/locale/uk/LC_MESSAGES/OStatus.po
@@ -9,109 +9,95 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OStatus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:46+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:00+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-14 17:22:01+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:49:39+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-ostatus\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
+msgid "Feeds"
+msgstr "Веб-стрічки"
+
 #. TRANS: Link description for link to subscribe to a remote user.
 #. TRANS: Link text for a user to subscribe to an OStatus user.
-#: OStatusPlugin.php:223 OStatusPlugin.php:933
 msgid "Subscribe"
 msgstr "Підписатись"
 
 #. TRANS: Link description for link to join a remote group.
-#: OStatusPlugin.php:242 OStatusPlugin.php:651 actions/ostatussub.php:109
 msgid "Join"
 msgstr "Приєднатися"
 
 #. TRANSLATE: %s is a domain.
-#: OStatusPlugin.php:455
 #, php-format
 msgid "Sent from %s via OStatus"
 msgstr "Надіслано з %s через OStatus"
 
 #. TRANS: Exception.
-#: OStatusPlugin.php:527
 msgid "Could not set up remote subscription."
 msgstr "Не вдалося створити віддалену підписку."
 
-#: OStatusPlugin.php:601
 msgid "Unfollow"
 msgstr "Не читати"
 
 #. TRANS: Success message for unsubscribe from user attempt through OStatus.
 #. TRANS: %1$s is the unsubscriber's name, %2$s is the unsubscribed user's name.
-#: OStatusPlugin.php:604
 #, php-format
 msgid "%1$s stopped following %2$s."
 msgstr "%1$s припинив читати ваші дописи %2$s."
 
-#: OStatusPlugin.php:632
 msgid "Could not set up remote group membership."
 msgstr "Не вдалося приєднатися до віддаленої спільноти."
 
 #. TRANS: Success message for subscribe to group attempt through OStatus.
 #. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
-#: OStatusPlugin.php:654
 #, php-format
 msgid "%1$s has joined group %2$s."
 msgstr "%1$s приєднався до спільноти %2$s."
 
 #. TRANS: Exception.
-#: OStatusPlugin.php:663
 msgid "Failed joining remote group."
 msgstr "Помилка приєднання до віддаленої спільноти."
 
-#: OStatusPlugin.php:703
 msgid "Leave"
 msgstr "Залишити"
 
 #. TRANS: Success message for unsubscribe from group attempt through OStatus.
 #. TRANS: %1$s is the member name, %2$s is the unsubscribed group's name.
-#: OStatusPlugin.php:706
 #, php-format
 msgid "%1$s has left group %2$s."
 msgstr "%1$s залишив спільноту %2$s."
 
-#: OStatusPlugin.php:781
 msgid "Disfavor"
 msgstr "Не обраний"
 
 #. TRANS: Success message for remove a favorite notice through OStatus.
 #. TRANS: %1$s is the unfavoring user's name, %2$s is URI to the no longer favored notice.
-#: OStatusPlugin.php:784
 #, php-format
 msgid "%1$s marked notice %2$s as no longer a favorite."
 msgstr "%1$s позначив допис %2$s, як такий, що більше не є обраним."
 
 #. TRANS: Link text for link to remote subscribe.
-#: OStatusPlugin.php:860
 msgid "Remote"
 msgstr "Віддалено"
 
 #. TRANS: Title for activity.
-#: OStatusPlugin.php:900
 msgid "Profile update"
 msgstr "Оновлення профілю"
 
 #. TRANS: Ping text for remote profile update through OStatus.
 #. TRANS: %s is user that updated their profile.
-#: OStatusPlugin.php:903
 #, php-format
 msgid "%s has updated their profile page."
 msgstr "%s оновив сторінку свого профілю."
 
 #. TRANS: Plugin description.
-#: OStatusPlugin.php:948
 msgid ""
 "Follow people across social networks that implement <a href=\"http://ostatus."
 "org/\">OStatus</a>."
@@ -119,269 +105,16 @@ msgstr ""
 "Додає можливість слідкувати за дописами людей з інших мереж, які підтримують "
 "протокол <a href=\"http://ostatus.org/\">OStatus</a>."
 
-#: classes/FeedSub.php:252
-msgid "Attempting to start PuSH subscription for feed with no hub."
-msgstr ""
-"Спроба підписатися за допомогою PuSH до веб-стрічки, котра не має вузла."
-
-#: classes/FeedSub.php:282
-msgid "Attempting to end PuSH subscription for feed with no hub."
-msgstr ""
-"Спроба скасувати підписку за допомогою PuSH до веб-стрічки, котра не має "
-"вузла."
-
-#. TRANS: Server exception. %s is a URI.
-#: classes/Ostatus_profile.php:154
-#, php-format
-msgid "Invalid ostatus_profile state: both group and profile IDs set for %s."
-msgstr ""
-"Невірний стан параметру ostatus_profile: як групові, так і персональні "
-"ідентифікатори встановлено для %s."
-
-#. TRANS: Server exception. %s is a URI.
-#: classes/Ostatus_profile.php:157
-#, php-format
-msgid "Invalid ostatus_profile state: both group and profile IDs empty for %s."
-msgstr ""
-"Невірний стан параметру ostatus_profile: як групові, так і персональні "
-"ідентифікатори порожні для %s."
-
-#. TRANS: Server exception.
-#. TRANS: %1$s is the method name the exception occured in, %2$s is the actor type.
-#: classes/Ostatus_profile.php:247
-#, php-format
-msgid "Invalid actor passed to %1$s: %2$s."
-msgstr "До %1$s передано невірний об’єкт: %2$s."
-
-#. TRANS: Server exception.
-#: classes/Ostatus_profile.php:341
-msgid ""
-"Invalid type passed to Ostatus_profile::notify. It must be XML string or "
-"Activity entry."
-msgstr ""
-"До параметру Ostatus_profile::notify передано невірний тип. Це має бути або "
-"рядок у форматі XML, або запис активності."
-
-#. TRANS: Exception.
-#: classes/Ostatus_profile.php:372
-msgid "Unknown feed format."
-msgstr "Невідомий формат веб-стрічки."
-
-#. TRANS: Exception.
-#: classes/Ostatus_profile.php:396
-msgid "RSS feed without a channel."
-msgstr "RSS-стрічка не має каналу."
-
 #. TRANS: Client exception.
-#: classes/Ostatus_profile.php:442
-msgid "Can't handle that kind of post."
-msgstr "Не вдається обробити такий тип допису."
-
-#. TRANS: Client exception. %s is a source URI.
-#: classes/Ostatus_profile.php:500
-#, php-format
-msgid "No content for notice %s."
-msgstr "Допис %s не має змісту."
-
-#. TRANS: Shown when a notice is longer than supported and/or when attachments are present. At runtime
-#. TRANS: this will usually be replaced with localised text from StatusNet core messages.
-#: classes/Ostatus_profile.php:535
-msgid "Show more"
-msgstr "Розгорнути"
-
-#. TRANS: Exception. %s is a profile URL.
-#: classes/Ostatus_profile.php:728
-#, php-format
-msgid "Could not reach profile page %s."
-msgstr "Не вдалося досягти сторінки профілю %s."
-
-#. TRANS: Exception. %s is a URL.
-#: classes/Ostatus_profile.php:786
-#, php-format
-msgid "Could not find a feed URL for profile page %s."
-msgstr "Не вдалося знайти URL веб-стрічки для сторінки профілю %s."
-
-#. TRANS: Feed sub exception.
-#: classes/Ostatus_profile.php:885
-msgid "Can't find enough profile information to make a feed."
-msgstr ""
-"Не можу знайти достатньо інформації про профіль, аби сформувати веб-стрічку."
-
-#. TRANS: Server exception. %s is a URL.
-#: classes/Ostatus_profile.php:949
-#, php-format
-msgid "Invalid avatar URL %s."
-msgstr "Невірна URL-адреса аватари %s."
-
-#. TRANS: Server exception. %s is a URI.
-#: classes/Ostatus_profile.php:960
-#, php-format
-msgid "Tried to update avatar for unsaved remote profile %s."
-msgstr "Намагаюся оновити аватару для не збереженого віддаленого профілю %s."
-
-#. TRANS: Server exception. %s is a URL.
-#: classes/Ostatus_profile.php:970
-#, php-format
-msgid "Unable to fetch avatar from %s."
-msgstr "Неможливо завантажити аватару з %s."
-
-#. TRANS: Exception.
-#: classes/Ostatus_profile.php:1197
-msgid "Local user can't be referenced as remote."
-msgstr "Місцевий користувач не може бути зазначеним у якості віддаленого."
-
-#. TRANS: Exception.
-#: classes/Ostatus_profile.php:1202
-msgid "Local group can't be referenced as remote."
-msgstr "Локальну спільноту не можна зазначити у якості віддаленої."
-
-#. TRANS: Server exception.
-#: classes/Ostatus_profile.php:1254 classes/Ostatus_profile.php:1265
-msgid "Can't save local profile."
-msgstr "Не вдається зберегти місцевий профіль."
-
-#. TRANS: Server exception.
-#: classes/Ostatus_profile.php:1273
-msgid "Can't save OStatus profile."
-msgstr "Не вдається зберегти профіль OStatus."
-
-#. TRANS: Exception.
-#: classes/Ostatus_profile.php:1561 classes/Ostatus_profile.php:1589
-msgid "Not a valid webfinger address."
-msgstr "Це недійсна адреса для протоколу WebFinger."
-
-#. TRANS: Exception. %s is a webfinger address.
-#: classes/Ostatus_profile.php:1671
-#, php-format
-msgid "Couldn't save profile for \"%s\"."
-msgstr "Не можу зберегти профіль для «%s»."
-
-#. TRANS: Exception. %s is a webfinger address.
-#: classes/Ostatus_profile.php:1690
-#, php-format
-msgid "Couldn't save ostatus_profile for \"%s\"."
-msgstr "Не можу зберегти профіль OStatus для «%s»."
-
-#. TRANS: Exception. %s is a webfinger address.
-#: classes/Ostatus_profile.php:1698
-#, php-format
-msgid "Couldn't find a valid profile for \"%s\"."
-msgstr "не можу знайти відповідний й профіль для «%s»."
-
-#. TRANS: Server exception.
-#: classes/Ostatus_profile.php:1741
-msgid "Could not store HTML content of long post as file."
-msgstr "Не можу зберегти HTML місткого допису у якості файлу."
-
-#. TRANS: Client exception. %s is a HTTP status code.
-#: classes/HubSub.php:212
-#, php-format
-msgid "Hub subscriber verification returned HTTP %s."
-msgstr "Перевірка вузла підписки завершилася зі статусом HTTP %s."
-
-#. TRANS: Exception. %1$s is a response status code, %2$s is the body of the response.
-#: classes/HubSub.php:359
-#, php-format
-msgid "Callback returned status: %1$s. Body: %2$s"
-msgstr "Зворотній виклик повернуто зі статусом: %1$s. Зміст: %2$s"
-
-#. TRANS: Client error. POST is a HTTP command. It should not be translated.
-#: lib/salmonaction.php:43
-msgid "This method requires a POST."
-msgstr "Цей метод вимагає команди POST."
-
-#. TRANS: Client error. Do not translate "application/magic-envelope+xml"
-#: lib/salmonaction.php:48
-msgid "Salmon requires \"application/magic-envelope+xml\"."
-msgstr "Протокол Salmon вимагає \"application/magic-envelope+xml\"."
-
-#. TRANS: Client error.
-#: lib/salmonaction.php:58
-msgid "Salmon signature verification failed."
-msgstr "Перевірка підпису протоколу Salmon не вдалася."
-
-#. TRANS: Client error.
-#: lib/salmonaction.php:70
-msgid "Salmon post must be an Atom entry."
-msgstr "Дописи за протоколом Salmon мають бути у форматі Atom."
-
-#. TRANS: Client exception.
-#: lib/salmonaction.php:120
-msgid "Unrecognized activity type."
-msgstr "Невідомий тип діяльності."
-
-#. TRANS: Client exception.
-#: lib/salmonaction.php:130
-msgid "This target doesn't understand posts."
-msgstr "Ціль не розуміє, що таке «дописи»."
-
-#. TRANS: Client exception.
-#: lib/salmonaction.php:136
-msgid "This target doesn't understand follows."
-msgstr "Ціль не розуміє, що таке «слідувати»."
-
-#. TRANS: Client exception.
-#: lib/salmonaction.php:142
-msgid "This target doesn't understand unfollows."
-msgstr "Ціль не розуміє, що таке «не слідувати»."
-
-#. TRANS: Client exception.
-#: lib/salmonaction.php:148
-msgid "This target doesn't understand favorites."
-msgstr "Ціль не розуміє, що таке «додати до обраних»."
-
-#. TRANS: Client exception.
-#: lib/salmonaction.php:154
-msgid "This target doesn't understand unfavorites."
-msgstr "Ціль не розуміє, що таке «вилучити з обраних»."
-
-#. TRANS: Client exception.
-#: lib/salmonaction.php:160
-msgid "This target doesn't understand share events."
-msgstr "Ціль не розуміє, що таке «поділитися подією»."
-
-#. TRANS: Client exception.
-#: lib/salmonaction.php:166
-msgid "This target doesn't understand joins."
-msgstr "Ціль не розуміє, що таке «приєднатися»."
-
-#. TRANS: Client exception.
-#: lib/salmonaction.php:172
-msgid "This target doesn't understand leave events."
-msgstr "Ціль не розуміє, що таке «залишати подію»."
-
-#. TRANS: Exception.
-#: lib/salmonaction.php:200
-msgid "Received a salmon slap from unidentified actor."
-msgstr "Отримано ляпаса від невизначеного учасника за протоколом Salmon."
-
-#. TRANS: Exception.
-#: lib/magicenvelope.php:80
-msgid "Unable to locate signer public key."
-msgstr "Не вдалося знайти публічного ключа підписанта."
-
-#. TRANS: Exception.
-#: lib/salmon.php:126
-msgid "Salmon invalid actor for signing."
-msgstr "Недійсний учасник подій за протоколом Salmon для підписання."
-
-#: tests/gettext-speedtest.php:57
-msgid "Feeds"
-msgstr "Веб-стрічки"
-
-#. TRANS: Client exception.
-#: actions/pushhub.php:70
 msgid "Publishing outside feeds not supported."
 msgstr "Публікація змісту зовнішніх веб-стрічок не підтримується."
 
 #. TRANS: Client exception. %s is a mode.
-#: actions/pushhub.php:73
 #, php-format
 msgid "Unrecognized mode \"%s\"."
 msgstr "Невизначений режим «%s»."
 
 #. TRANS: Client exception. %s is a topic.
-#: actions/pushhub.php:93
 #, php-format
 msgid ""
 "Unsupported hub.topic %s this hub only serves local user and group Atom "
@@ -391,13 +124,11 @@ msgstr ""
 "користувачами та групою веб-стрічок у форматі Atom."
 
 #. TRANS: Client exception.
-#: actions/pushhub.php:99
 #, php-format
 msgid "Invalid hub.verify \"%s\". It must be sync or async."
 msgstr "hub.verify «%s» невірний. Він має бути синхронним або ж асинхронним."
 
 #. TRANS: Client exception.
-#: actions/pushhub.php:105
 #, php-format
 msgid "Invalid hub.lease \"%s\". It must be empty or positive integer."
 msgstr ""
@@ -405,182 +136,62 @@ msgstr ""
 "число."
 
 #. TRANS: Client exception.
-#: actions/pushhub.php:113
 #, php-format
 msgid "Invalid hub.secret \"%s\". It must be under 200 bytes."
 msgstr "hub.secret «%s» невірний. 200 байтів — не більше."
 
 #. TRANS: Client exception.
-#: actions/pushhub.php:165
 #, php-format
 msgid "Invalid hub.topic \"%s\". User doesn't exist."
 msgstr "hub.topic «%s» невірний. Користувача не існує."
 
 #. TRANS: Client exception.
-#: actions/pushhub.php:174
 #, php-format
 msgid "Invalid hub.topic \"%s\". Group doesn't exist."
 msgstr "hub.topic «%s» невірний. Спільноти не існує."
 
 #. TRANS: Client exception.
 #. TRANS: %1$s is this argument to the method this exception occurs in, %2$s is a URL.
-#: actions/pushhub.php:199
 #, php-format
 msgid "Invalid URL passed for %1$s: \"%2$s\""
 msgstr "Для %1$s передано невірний URL: «%2$s»"
 
-#: actions/ownerxrd.php:39 actions/usersalmon.php:43
+msgid "Empty or invalid feed id."
+msgstr "Порожній або недійсний ідентифікатор веб-стрічки."
+
+#. TRANS: Server exception. %s is a feed ID.
+#, php-format
+msgid "Unknown PuSH feed id %s"
+msgstr "Веб-стрічка за протоколом PuSH має невідомий ідентифікатор %s"
+
+#. TRANS: Client exception. %s is an invalid feed name.
+#, php-format
+msgid "Bad hub.topic feed \"%s\"."
+msgstr "hub.topic веб-стрічки «%s» неправильний."
+
+#. TRANS: Client exception. %1$s the invalid token, %2$s is the topic for which the invalid token was given.
+#, php-format
+msgid "Bad hub.verify_token %1$s for %2$s."
+msgstr "hub.verify_token %1$s для %2$s неправильний."
+
+#. TRANS: Client exception. %s is an invalid topic.
+#, php-format
+msgid "Unexpected subscribe request for %s."
+msgstr "Несподіваний запит підписки для %s."
+
+#. TRANS: Client exception. %s is an invalid topic.
+#, php-format
+msgid "Unexpected unsubscribe request for %s."
+msgstr "Несподіваний запит щодо скасування підписки для %s."
+
 msgid "No such user."
 msgstr "Такого користувача немає."
 
-#. TRANS: Client error.
-#: actions/usersalmon.php:37 actions/groupsalmon.php:40
-msgid "No ID."
-msgstr "Немає ідентифікатора."
-
-#. TRANS: Client exception.
-#: actions/usersalmon.php:83
-msgid "In reply to unknown notice."
-msgstr "У відповідь на невідомий допис."
-
-#. TRANS: Client exception.
-#: actions/usersalmon.php:88
-msgid "In reply to a notice not by this user and not mentioning this user."
-msgstr ""
-"У відповідь на допис іншого користувача, а даний користувач у ньому навіть "
-"не згадується."
-
-#. TRANS: Client exception.
-#: actions/usersalmon.php:165
-msgid "Could not save new favorite."
-msgstr "Не вдалося зберегти як новий обраний допис."
-
-#. TRANS: Client exception.
-#: actions/usersalmon.php:197
-msgid "Can't favorite/unfavorite without an object."
-msgstr ""
-"Неможливо додати до обраних або видалити зі списку обраних, якщо немає "
-"об’єкта."
-
-#. TRANS: Client exception.
-#: actions/usersalmon.php:209
-msgid "Can't handle that kind of object for liking/faving."
-msgstr ""
-"Не вдається обробити подібний об’єкт для додавання його до списку обраних."
-
-#. TRANS: Client exception. %s is an object ID.
-#: actions/usersalmon.php:216
-#, php-format
-msgid "Notice with ID %s unknown."
-msgstr "Допис з ідентифікатором %s є невідомим."
-
-#. TRANS: Client exception. %1$s is a notice ID, %2$s is a user ID.
-#: actions/usersalmon.php:221
-#, php-format
-msgid "Notice with ID %1$s not posted by %2$s."
-msgstr "Допис з ідентифікатором %1$s було надіслано не %2$s."
-
-#. TRANS: Field label.
-#: actions/ostatusgroup.php:78
-msgid "Join group"
-msgstr "Долучитися до спільноти"
-
-#. TRANS: Tooltip for field label "Join group".
-#: actions/ostatusgroup.php:81
-msgid "OStatus group's address, like http://example.net/group/nickname."
-msgstr ""
-"Адреса спільноти згідно протоколу OStatus, наприклад http://example.net/"
-"group/nickname."
-
-#. TRANS: Button text.
-#: actions/ostatusgroup.php:86 actions/ostatussub.php:75
-msgctxt "BUTTON"
-msgid "Continue"
-msgstr "Продовжити"
-
-#: actions/ostatusgroup.php:105
-msgid "You are already a member of this group."
-msgstr "Ви вже є учасником цієї спільноти."
-
-#. TRANS: OStatus remote group subscription dialog error.
-#: actions/ostatusgroup.php:140
-msgid "Already a member!"
-msgstr "Ви вже учасник!"
-
-#. TRANS: OStatus remote group subscription dialog error.
-#: actions/ostatusgroup.php:151
-msgid "Remote group join failed!"
-msgstr "Приєднатися до віддаленої спільноти не вдалося!"
-
-#. TRANS: OStatus remote group subscription dialog error.
-#: actions/ostatusgroup.php:155
-msgid "Remote group join aborted!"
-msgstr "Приєднання до віддаленої спільноти перервано!"
-
-#. TRANS: Page title for OStatus remote group join form
-#: actions/ostatusgroup.php:167
-msgid "Confirm joining remote group"
-msgstr "Підтвердження приєднання до віддаленої спільноти"
-
-#. TRANS: Instructions.
-#: actions/ostatusgroup.php:178
-msgid ""
-"You can subscribe to groups from other supported sites. Paste the group's "
-"profile URI below:"
-msgstr ""
-"Ви можете долучатися до спільнот на аналогічних сайтах. Просто вставте URI "
-"профілю спільноти тут:"
-
-#. TRANS: Client error.
-#: actions/groupsalmon.php:47
-msgid "No such group."
-msgstr "Такої спільноти немає."
-
-#. TRANS: Client error.
-#: actions/groupsalmon.php:56
-msgid "Can't accept remote posts for a remote group."
-msgstr "Не можу узгодити віддалену пересилку дописів до віддаленої спільноти."
-
-#. TRANS: Client error.
-#: actions/groupsalmon.php:130
-msgid "Can't read profile to set up group membership."
-msgstr "Не можу прочитати профіль, аби долучитися до спільноти."
-
-#. TRANS: Client error.
-#: actions/groupsalmon.php:134 actions/groupsalmon.php:177
-msgid "Groups can't join groups."
-msgstr "Спільноти ніяк не можуть приєднуватися до спільнот."
-
-#: actions/groupsalmon.php:147
-msgid "You have been blocked from that group by the admin."
-msgstr "Адміністратор спільноти заблокував ваш профіль."
-
-#. TRANS: Server error. %1$s is a profile URI, %2$s is a group nickname.
-#: actions/groupsalmon.php:162
-#, php-format
-msgid "Could not join remote user %1$s to group %2$s."
-msgstr ""
-"Віддаленому користувачеві %1$s не вдалося долучитися до спільноти %2$s."
-
-#: actions/groupsalmon.php:174
-msgid "Can't read profile to cancel group membership."
-msgstr ""
-"Не вдається прочитати профіль користувача, щоб скасувати його перебування у "
-"спільноті."
-
-#. TRANS: Server error. %1$s is a profile URI, %2$s is a group nickname.
-#: actions/groupsalmon.php:191
-#, php-format
-msgid "Could not remove remote user %1$s from group %2$s."
-msgstr "Не вдалось видалити віддаленого користувача %1$s зі спільноти %2$s."
-
 #. TRANS: Field label for a field that takes an OStatus user address.
-#: actions/ostatussub.php:68
 msgid "Subscribe to"
 msgstr "Підписатися"
 
 #. TRANS: Tooltip for field label "Subscribe to".
-#: actions/ostatussub.php:71
 msgid ""
 "OStatus user's address, like nickname@example.com or http://example.net/"
 "nickname"
@@ -588,31 +199,30 @@ msgstr ""
 "Адреса користувача згідно протоколу OStatus, щось на зразок nickname@example."
 "com або http://example.net/nickname"
 
+#. TRANS: Button text.
+msgctxt "BUTTON"
+msgid "Continue"
+msgstr "Продовжити"
+
 #. TRANS: Button text.
 #. TRANS: Tooltip for button "Join".
-#: actions/ostatussub.php:112
 msgctxt "BUTTON"
 msgid "Join this group"
 msgstr "Приєднатися до спільноти"
 
 #. TRANS: Button text.
-#: actions/ostatussub.php:115
 msgctxt "BUTTON"
 msgid "Confirm"
 msgstr "Підтвердити"
 
 #. TRANS: Tooltip for button "Confirm".
-#: actions/ostatussub.php:117
 msgid "Subscribe to this user"
 msgstr "Підписатись до цього користувача"
 
-#: actions/ostatussub.php:138
 msgid "You are already subscribed to this user."
 msgstr "Ви вже підписані до цього користувача."
 
 #. TRANS: Error text.
-#: actions/ostatussub.php:232 actions/ostatussub.php:239
-#: actions/ostatussub.php:264
 msgid ""
 "Sorry, we could not reach that address. Please make sure that the OStatus "
 "address is like nickname@example.com or http://example.net/nickname."
@@ -622,9 +232,6 @@ msgstr ""
 "nickname@example.com або ж http://example.net/nickname."
 
 #. TRANS: Error text.
-#: actions/ostatussub.php:243 actions/ostatussub.php:247
-#: actions/ostatussub.php:251 actions/ostatussub.php:255
-#: actions/ostatussub.php:259
 msgid ""
 "Sorry, we could not reach that feed. Please try that OStatus address again "
 "later."
@@ -633,31 +240,25 @@ msgstr ""
 "дану адресу ще раз пізніше."
 
 #. TRANS: OStatus remote subscription dialog error.
-#: actions/ostatussub.php:293
 msgid "Already subscribed!"
 msgstr "Вже підписаний!"
 
 #. TRANS: OStatus remote subscription dialog error.
-#: actions/ostatussub.php:298
 msgid "Remote subscription failed!"
 msgstr "Підписатися віддалено не вдалося!"
 
-#: actions/ostatussub.php:345 actions/ostatusinit.php:64
 msgid "There was a problem with your session token. Try again, please."
 msgstr "Виникли певні проблеми з токеном сесії. Спробуйте знов, будь ласка."
 
 #. TRANS: Form title.
-#: actions/ostatussub.php:373 actions/ostatusinit.php:83
 msgid "Subscribe to user"
 msgstr "Підписатися до користувача"
 
 #. TRANS: Page title for OStatus remote subscription form
-#: actions/ostatussub.php:393
 msgid "Confirm"
 msgstr "Підтвердити"
 
 #. TRANS: Instructions.
-#: actions/ostatussub.php:405
 msgid ""
 "You can subscribe to users from other supported sites. Paste their address "
 "or profile URI below:"
@@ -665,128 +266,377 @@ msgstr ""
 "Ви маєте можливість підписуватись до користувачів на аналогічних сайтах. "
 "Просто вставте їхні адреси або URI профілів тут:"
 
+#. TRANS: Field label.
+msgid "Join group"
+msgstr "Долучитися до спільноти"
+
+#. TRANS: Tooltip for field label "Join group".
+msgid "OStatus group's address, like http://example.net/group/nickname."
+msgstr ""
+"Адреса спільноти згідно протоколу OStatus, наприклад http://example.net/"
+"group/nickname."
+
+msgid "You are already a member of this group."
+msgstr "Ви вже є учасником цієї спільноти."
+
+#. TRANS: OStatus remote group subscription dialog error.
+msgid "Already a member!"
+msgstr "Ви вже учасник!"
+
+#. TRANS: OStatus remote group subscription dialog error.
+msgid "Remote group join failed!"
+msgstr "Приєднатися до віддаленої спільноти не вдалося!"
+
+#. TRANS: OStatus remote group subscription dialog error.
+msgid "Remote group join aborted!"
+msgstr "Приєднання до віддаленої спільноти перервано!"
+
+#. TRANS: Page title for OStatus remote group join form
+msgid "Confirm joining remote group"
+msgstr "Підтвердження приєднання до віддаленої спільноти"
+
+#. TRANS: Instructions.
+msgid ""
+"You can subscribe to groups from other supported sites. Paste the group's "
+"profile URI below:"
+msgstr ""
+"Ви можете долучатися до спільнот на аналогічних сайтах. Просто вставте URI "
+"профілю спільноти тут:"
+
+#. TRANS: Client error.
+msgid "No ID."
+msgstr "Немає ідентифікатора."
+
+#. TRANS: Client exception.
+msgid "In reply to unknown notice."
+msgstr "У відповідь на невідомий допис."
+
+#. TRANS: Client exception.
+msgid "In reply to a notice not by this user and not mentioning this user."
+msgstr ""
+"У відповідь на допис іншого користувача, а даний користувач у ньому навіть "
+"не згадується."
+
+#. TRANS: Client exception.
+msgid "Could not save new favorite."
+msgstr "Не вдалося зберегти як новий обраний допис."
+
+#. TRANS: Client exception.
+msgid "Can't favorite/unfavorite without an object."
+msgstr ""
+"Неможливо додати до обраних або видалити зі списку обраних, якщо немає "
+"об’єкта."
+
+#. TRANS: Client exception.
+msgid "Can't handle that kind of object for liking/faving."
+msgstr ""
+"Не вдається обробити подібний об’єкт для додавання його до списку обраних."
+
+#. TRANS: Client exception. %s is an object ID.
+#, php-format
+msgid "Notice with ID %s unknown."
+msgstr "Допис з ідентифікатором %s є невідомим."
+
+#. TRANS: Client exception. %1$s is a notice ID, %2$s is a user ID.
+#, php-format
+msgid "Notice with ID %1$s not posted by %2$s."
+msgstr "Допис з ідентифікатором %1$s було надіслано не %2$s."
+
+#. TRANS: Client error.
+msgid "No such group."
+msgstr "Такої спільноти немає."
+
+#. TRANS: Client error.
+msgid "Can't accept remote posts for a remote group."
+msgstr "Не можу узгодити віддалену пересилку дописів до віддаленої спільноти."
+
+#. TRANS: Client error.
+msgid "Can't read profile to set up group membership."
+msgstr "Не можу прочитати профіль, аби долучитися до спільноти."
+
+#. TRANS: Client error.
+msgid "Groups can't join groups."
+msgstr "Спільноти ніяк не можуть приєднуватися до спільнот."
+
+msgid "You have been blocked from that group by the admin."
+msgstr "Адміністратор спільноти заблокував ваш профіль."
+
+#. TRANS: Server error. %1$s is a profile URI, %2$s is a group nickname.
+#, php-format
+msgid "Could not join remote user %1$s to group %2$s."
+msgstr ""
+"Віддаленому користувачеві %1$s не вдалося долучитися до спільноти %2$s."
+
+msgid "Can't read profile to cancel group membership."
+msgstr ""
+"Не вдається прочитати профіль користувача, щоб скасувати його перебування у "
+"спільноті."
+
+#. TRANS: Server error. %1$s is a profile URI, %2$s is a group nickname.
+#, php-format
+msgid "Could not remove remote user %1$s from group %2$s."
+msgstr "Не вдалось видалити віддаленого користувача %1$s зі спільноти %2$s."
+
 #. TRANS: Client error.
-#: actions/ostatusinit.php:42
 msgid "You can use the local subscription!"
 msgstr "Ви можете користуватись локальними підписками!"
 
 #. TRANS: Form legend.
-#: actions/ostatusinit.php:98
 #, php-format
 msgid "Join group %s"
 msgstr "Приєднатися до спільноти %s"
 
 #. TRANS: Button text.
-#: actions/ostatusinit.php:100
 msgctxt "BUTTON"
 msgid "Join"
 msgstr "Приєднатися"
 
 #. TRANS: Form legend.
-#: actions/ostatusinit.php:103
 #, php-format
 msgid "Subscribe to %s"
 msgstr "Підписатися до %s"
 
 #. TRANS: Button text.
-#: actions/ostatusinit.php:105
 msgctxt "BUTTON"
 msgid "Subscribe"
 msgstr "Підписатись"
 
 #. TRANS: Field label.
-#: actions/ostatusinit.php:119
 msgid "Group nickname"
 msgstr "Назва спільноти"
 
-#: actions/ostatusinit.php:120
 msgid "Nickname of the group you want to join."
 msgstr "Назва спільноти, до якої ви хотіли б приєднатися."
 
 #. TRANS: Field label.
-#: actions/ostatusinit.php:123
 msgid "User nickname"
 msgstr "Ім’я користувача"
 
-#: actions/ostatusinit.php:124
 msgid "Nickname of the user you want to follow."
 msgstr "Ім’я користувача, дописи якого ви хотіли б читати."
 
 #. TRANS: Field label.
-#: actions/ostatusinit.php:129
 msgid "Profile Account"
 msgstr "Профіль акаунту"
 
 #. TRANS: Tooltip for field label "Profile Account".
-#: actions/ostatusinit.php:131
 msgid "Your account id (e.g. user@identi.ca)."
 msgstr "Ідентифікатор вашого акаунту (щось на зразок user@identi.ca)"
 
 #. TRANS: Client error.
-#: actions/ostatusinit.php:153
 msgid "Must provide a remote profile."
 msgstr "Мусите зазначити віддалений профіль."
 
 #. TRANS: Client error.
-#: actions/ostatusinit.php:165
 msgid "Couldn't look up OStatus account profile."
 msgstr "Не вдалося знайти профіль акаунту за протоколом OStatus."
 
 #. TRANS: Client error.
-#: actions/ostatusinit.php:178
 msgid "Couldn't confirm remote profile address."
 msgstr "Не вдалося підтвердити адресу віддаленого профілю."
 
 #. TRANS: Page title.
-#: actions/ostatusinit.php:223
 msgid "OStatus Connect"
 msgstr "З’єднання OStatus"
 
-#: actions/pushcallback.php:50
-msgid "Empty or invalid feed id."
-msgstr "Порожній або недійсний ідентифікатор веб-стрічки."
+msgid "Attempting to start PuSH subscription for feed with no hub."
+msgstr ""
+"Спроба підписатися за допомогою PuSH до веб-стрічки, котра не має вузла."
 
-#. TRANS: Server exception. %s is a feed ID.
-#: actions/pushcallback.php:56
+msgid "Attempting to end PuSH subscription for feed with no hub."
+msgstr ""
+"Спроба скасувати підписку за допомогою PuSH до веб-стрічки, котра не має "
+"вузла."
+
+#. TRANS: Server exception. %s is a URI.
 #, php-format
-msgid "Unknown PuSH feed id %s"
-msgstr "Веб-стрічка за протоколом PuSH має невідомий ідентифікатор %s"
+msgid "Invalid ostatus_profile state: both group and profile IDs set for %s."
+msgstr ""
+"Невірний стан параметру ostatus_profile: як групові, так і персональні "
+"ідентифікатори встановлено для %s."
 
-#. TRANS: Client exception. %s is an invalid feed name.
-#: actions/pushcallback.php:96
+#. TRANS: Server exception. %s is a URI.
 #, php-format
-msgid "Bad hub.topic feed \"%s\"."
-msgstr "hub.topic веб-стрічки «%s» неправильний."
+msgid "Invalid ostatus_profile state: both group and profile IDs empty for %s."
+msgstr ""
+"Невірний стан параметру ostatus_profile: як групові, так і персональні "
+"ідентифікатори порожні для %s."
 
-#. TRANS: Client exception. %1$s the invalid token, %2$s is the topic for which the invalid token was given.
-#: actions/pushcallback.php:101
+#. TRANS: Server exception.
+#. TRANS: %1$s is the method name the exception occured in, %2$s is the actor type.
 #, php-format
-msgid "Bad hub.verify_token %1$s for %2$s."
-msgstr "hub.verify_token %1$s для %2$s неправильний."
+msgid "Invalid actor passed to %1$s: %2$s."
+msgstr "До %1$s передано невірний об’єкт: %2$s."
 
-#. TRANS: Client exception. %s is an invalid topic.
-#: actions/pushcallback.php:108
+#. TRANS: Server exception.
+msgid ""
+"Invalid type passed to Ostatus_profile::notify. It must be XML string or "
+"Activity entry."
+msgstr ""
+"До параметру Ostatus_profile::notify передано невірний тип. Це має бути або "
+"рядок у форматі XML, або запис активності."
+
+#. TRANS: Exception.
+msgid "Unknown feed format."
+msgstr "Невідомий формат веб-стрічки."
+
+#. TRANS: Exception.
+msgid "RSS feed without a channel."
+msgstr "RSS-стрічка не має каналу."
+
+#. TRANS: Client exception.
+msgid "Can't handle that kind of post."
+msgstr "Не вдається обробити такий тип допису."
+
+#. TRANS: Client exception. %s is a source URI.
 #, php-format
-msgid "Unexpected subscribe request for %s."
-msgstr "Несподіваний запит підписки для %s."
+msgid "No content for notice %s."
+msgstr "Допис %s не має змісту."
 
-#. TRANS: Client exception. %s is an invalid topic.
-#: actions/pushcallback.php:113
+#. TRANS: Shown when a notice is longer than supported and/or when attachments are present. At runtime
+#. TRANS: this will usually be replaced with localised text from StatusNet core messages.
+msgid "Show more"
+msgstr "Розгорнути"
+
+#. TRANS: Exception. %s is a profile URL.
 #, php-format
-msgid "Unexpected unsubscribe request for %s."
-msgstr "Несподіваний запит щодо скасування підписки для %s."
+msgid "Could not reach profile page %s."
+msgstr "Не вдалося досягти сторінки профілю %s."
 
-#~ msgid "Photo"
-#~ msgstr "Фото"
+#. TRANS: Exception. %s is a URL.
+#, php-format
+msgid "Could not find a feed URL for profile page %s."
+msgstr "Не вдалося знайти URL веб-стрічки для сторінки профілю %s."
 
-#~ msgid "Nickname"
-#~ msgstr "Псевдонім"
+#. TRANS: Feed sub exception.
+msgid "Can't find enough profile information to make a feed."
+msgstr ""
+"Не можу знайти достатньо інформації про профіль, аби сформувати веб-стрічку."
 
-#~ msgid "Location"
-#~ msgstr "Розташування"
+#. TRANS: Server exception. %s is a URL.
+#, php-format
+msgid "Invalid avatar URL %s."
+msgstr "Невірна URL-адреса аватари %s."
 
-#~ msgid "URL"
-#~ msgstr "URL-адреса"
+#. TRANS: Server exception. %s is a URI.
+#, php-format
+msgid "Tried to update avatar for unsaved remote profile %s."
+msgstr "Намагаюся оновити аватару для не збереженого віддаленого профілю %s."
 
-#~ msgid "Note"
-#~ msgstr "Примітка"
+#. TRANS: Server exception. %s is a URL.
+#, php-format
+msgid "Unable to fetch avatar from %s."
+msgstr "Неможливо завантажити аватару з %s."
+
+#. TRANS: Exception.
+msgid "Local user can't be referenced as remote."
+msgstr "Місцевий користувач не може бути зазначеним у якості віддаленого."
+
+#. TRANS: Exception.
+msgid "Local group can't be referenced as remote."
+msgstr "Локальну спільноту не можна зазначити у якості віддаленої."
+
+#. TRANS: Server exception.
+msgid "Can't save local profile."
+msgstr "Не вдається зберегти місцевий профіль."
+
+#. TRANS: Server exception.
+msgid "Can't save OStatus profile."
+msgstr "Не вдається зберегти профіль OStatus."
+
+#. TRANS: Exception.
+msgid "Not a valid webfinger address."
+msgstr "Це недійсна адреса для протоколу WebFinger."
+
+#. TRANS: Exception. %s is a webfinger address.
+#, php-format
+msgid "Couldn't save profile for \"%s\"."
+msgstr "Не можу зберегти профіль для «%s»."
+
+#. TRANS: Exception. %s is a webfinger address.
+#, php-format
+msgid "Couldn't save ostatus_profile for \"%s\"."
+msgstr "Не можу зберегти профіль OStatus для «%s»."
+
+#. TRANS: Exception. %s is a webfinger address.
+#, php-format
+msgid "Couldn't find a valid profile for \"%s\"."
+msgstr "не можу знайти відповідний й профіль для «%s»."
+
+#. TRANS: Server exception.
+msgid "Could not store HTML content of long post as file."
+msgstr "Не можу зберегти HTML місткого допису у якості файлу."
+
+#. TRANS: Client exception. %s is a HTTP status code.
+#, php-format
+msgid "Hub subscriber verification returned HTTP %s."
+msgstr "Перевірка вузла підписки завершилася зі статусом HTTP %s."
+
+#. TRANS: Exception. %1$s is a response status code, %2$s is the body of the response.
+#, php-format
+msgid "Callback returned status: %1$s. Body: %2$s"
+msgstr "Зворотній виклик повернуто зі статусом: %1$s. Зміст: %2$s"
+
+#. TRANS: Exception.
+msgid "Unable to locate signer public key."
+msgstr "Не вдалося знайти публічного ключа підписанта."
+
+#. TRANS: Exception.
+msgid "Salmon invalid actor for signing."
+msgstr "Недійсний учасник подій за протоколом Salmon для підписання."
+
+#. TRANS: Client error. POST is a HTTP command. It should not be translated.
+msgid "This method requires a POST."
+msgstr "Цей метод вимагає команди POST."
+
+#. TRANS: Client error. Do not translate "application/magic-envelope+xml"
+msgid "Salmon requires \"application/magic-envelope+xml\"."
+msgstr "Протокол Salmon вимагає \"application/magic-envelope+xml\"."
+
+#. TRANS: Client error.
+msgid "Salmon signature verification failed."
+msgstr "Перевірка підпису протоколу Salmon не вдалася."
+
+#. TRANS: Client error.
+msgid "Salmon post must be an Atom entry."
+msgstr "Дописи за протоколом Salmon мають бути у форматі Atom."
+
+#. TRANS: Client exception.
+msgid "Unrecognized activity type."
+msgstr "Невідомий тип діяльності."
+
+#. TRANS: Client exception.
+msgid "This target doesn't understand posts."
+msgstr "Ціль не розуміє, що таке «дописи»."
+
+#. TRANS: Client exception.
+msgid "This target doesn't understand follows."
+msgstr "Ціль не розуміє, що таке «слідувати»."
+
+#. TRANS: Client exception.
+msgid "This target doesn't understand unfollows."
+msgstr "Ціль не розуміє, що таке «не слідувати»."
+
+#. TRANS: Client exception.
+msgid "This target doesn't understand favorites."
+msgstr "Ціль не розуміє, що таке «додати до обраних»."
+
+#. TRANS: Client exception.
+msgid "This target doesn't understand unfavorites."
+msgstr "Ціль не розуміє, що таке «вилучити з обраних»."
+
+#. TRANS: Client exception.
+msgid "This target doesn't understand share events."
+msgstr "Ціль не розуміє, що таке «поділитися подією»."
+
+#. TRANS: Client exception.
+msgid "This target doesn't understand joins."
+msgstr "Ціль не розуміє, що таке «приєднатися»."
+
+#. TRANS: Client exception.
+msgid "This target doesn't understand leave events."
+msgstr "Ціль не розуміє, що таке «залишати подію»."
+
+#. TRANS: Exception.
+msgid "Received a salmon slap from unidentified actor."
+msgstr "Отримано ляпаса від невизначеного учасника за протоколом Salmon."
diff --git a/plugins/OpenExternalLinkTarget/locale/OpenExternalLinkTarget.pot b/plugins/OpenExternalLinkTarget/locale/OpenExternalLinkTarget.pot
index ac02f79869..5a8e09eea5 100644
--- a/plugins/OpenExternalLinkTarget/locale/OpenExternalLinkTarget.pot
+++ b/plugins/OpenExternalLinkTarget/locale/OpenExternalLinkTarget.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/OpenExternalLinkTarget/locale/ar/LC_MESSAGES/OpenExternalLinkTarget.po b/plugins/OpenExternalLinkTarget/locale/ar/LC_MESSAGES/OpenExternalLinkTarget.po
new file mode 100644
index 0000000000..69a507d4a8
--- /dev/null
+++ b/plugins/OpenExternalLinkTarget/locale/ar/LC_MESSAGES/OpenExternalLinkTarget.po
@@ -0,0 +1,28 @@
+# Translation of StatusNet - OpenExternalLinkTarget to Arabic (العربية)
+# Exported from translatewiki.net
+#
+# Author: OsamaK
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - OpenExternalLinkTarget\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:42+0000\n"
+"Language-Team: Arabic <http://translatewiki.net/wiki/Portal:ar>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-03-03 17:45:59+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: ar\n"
+"X-Message-Group: #out-statusnet-plugin-openexternallinktarget\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"
+
+msgid "Opens external links (i.e. with rel=external) on a new window or tab."
+msgstr ""
+"افتح الوصلات الخارجية (التي لها rel=external) في نافذة جديدة أو لسان جديد."
diff --git a/plugins/OpenExternalLinkTarget/locale/de/LC_MESSAGES/OpenExternalLinkTarget.po b/plugins/OpenExternalLinkTarget/locale/de/LC_MESSAGES/OpenExternalLinkTarget.po
index 55db030eaa..5c7b851afc 100644
--- a/plugins/OpenExternalLinkTarget/locale/de/LC_MESSAGES/OpenExternalLinkTarget.po
+++ b/plugins/OpenExternalLinkTarget/locale/de/LC_MESSAGES/OpenExternalLinkTarget.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OpenExternalLinkTarget\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:32+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:42+0000\n"
 "Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:05+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:45:59+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-openexternallinktarget\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: OpenExternalLinkTargetPlugin.php:59
 msgid "Opens external links (i.e. with rel=external) on a new window or tab."
 msgstr ""
 "Öffnet externe Links (mit rel=external) in einem neuen Fenster oder Tab."
diff --git a/plugins/OpenExternalLinkTarget/locale/es/LC_MESSAGES/OpenExternalLinkTarget.po b/plugins/OpenExternalLinkTarget/locale/es/LC_MESSAGES/OpenExternalLinkTarget.po
index a11b3668e7..38ed8c6067 100644
--- a/plugins/OpenExternalLinkTarget/locale/es/LC_MESSAGES/OpenExternalLinkTarget.po
+++ b/plugins/OpenExternalLinkTarget/locale/es/LC_MESSAGES/OpenExternalLinkTarget.po
@@ -10,19 +10,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OpenExternalLinkTarget\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:32+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:42+0000\n"
 "Language-Team: Spanish <http://translatewiki.net/wiki/Portal:es>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:05+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:45:59+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-openexternallinktarget\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: OpenExternalLinkTargetPlugin.php:59
 msgid "Opens external links (i.e. with rel=external) on a new window or tab."
 msgstr ""
 "Abre enlaces externos (por ejemplo, con rel=external) en una nueva ventana o "
diff --git a/plugins/OpenExternalLinkTarget/locale/fr/LC_MESSAGES/OpenExternalLinkTarget.po b/plugins/OpenExternalLinkTarget/locale/fr/LC_MESSAGES/OpenExternalLinkTarget.po
index c3c83c50fb..1a06040c03 100644
--- a/plugins/OpenExternalLinkTarget/locale/fr/LC_MESSAGES/OpenExternalLinkTarget.po
+++ b/plugins/OpenExternalLinkTarget/locale/fr/LC_MESSAGES/OpenExternalLinkTarget.po
@@ -10,19 +10,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OpenExternalLinkTarget\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:32+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:42+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:05+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:45:59+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-openexternallinktarget\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: OpenExternalLinkTargetPlugin.php:59
 msgid "Opens external links (i.e. with rel=external) on a new window or tab."
 msgstr ""
 "Ouvre les liens externes (p. ex., avec rel=external) dans une nouvelle "
diff --git a/plugins/OpenExternalLinkTarget/locale/he/LC_MESSAGES/OpenExternalLinkTarget.po b/plugins/OpenExternalLinkTarget/locale/he/LC_MESSAGES/OpenExternalLinkTarget.po
index 158d5d62eb..f544c92be4 100644
--- a/plugins/OpenExternalLinkTarget/locale/he/LC_MESSAGES/OpenExternalLinkTarget.po
+++ b/plugins/OpenExternalLinkTarget/locale/he/LC_MESSAGES/OpenExternalLinkTarget.po
@@ -9,18 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OpenExternalLinkTarget\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:32+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:42+0000\n"
 "Language-Team: Hebrew <http://translatewiki.net/wiki/Portal:he>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:05+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:45:59+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-plugin-openexternallinktarget\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: OpenExternalLinkTargetPlugin.php:59
 msgid "Opens external links (i.e. with rel=external) on a new window or tab."
 msgstr "פתיחת קישורים חיצוניים (לדוגמה עם rel=external) בחלון או לשונית חדשים."
diff --git a/plugins/OpenExternalLinkTarget/locale/ia/LC_MESSAGES/OpenExternalLinkTarget.po b/plugins/OpenExternalLinkTarget/locale/ia/LC_MESSAGES/OpenExternalLinkTarget.po
index b5d1e4849d..5454fa7d05 100644
--- a/plugins/OpenExternalLinkTarget/locale/ia/LC_MESSAGES/OpenExternalLinkTarget.po
+++ b/plugins/OpenExternalLinkTarget/locale/ia/LC_MESSAGES/OpenExternalLinkTarget.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OpenExternalLinkTarget\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:32+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:42+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:05+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:45:59+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-openexternallinktarget\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: OpenExternalLinkTargetPlugin.php:59
 msgid "Opens external links (i.e. with rel=external) on a new window or tab."
 msgstr ""
 "Aperi ligamines externe (i.e. con rel=external) in un nove fenestra o scheda."
diff --git a/plugins/OpenExternalLinkTarget/locale/mk/LC_MESSAGES/OpenExternalLinkTarget.po b/plugins/OpenExternalLinkTarget/locale/mk/LC_MESSAGES/OpenExternalLinkTarget.po
index d39422388b..8f2c30eef0 100644
--- a/plugins/OpenExternalLinkTarget/locale/mk/LC_MESSAGES/OpenExternalLinkTarget.po
+++ b/plugins/OpenExternalLinkTarget/locale/mk/LC_MESSAGES/OpenExternalLinkTarget.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OpenExternalLinkTarget\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:33+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:42+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:05+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:45:59+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-openexternallinktarget\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
 
-#: OpenExternalLinkTargetPlugin.php:59
 msgid "Opens external links (i.e. with rel=external) on a new window or tab."
 msgstr ""
 "Отвора надворешни врски (т.е. со rel=external) во нов прозорец или јазиче."
diff --git a/plugins/OpenExternalLinkTarget/locale/nb/LC_MESSAGES/OpenExternalLinkTarget.po b/plugins/OpenExternalLinkTarget/locale/nb/LC_MESSAGES/OpenExternalLinkTarget.po
index 2c149e295e..82c681fe0a 100644
--- a/plugins/OpenExternalLinkTarget/locale/nb/LC_MESSAGES/OpenExternalLinkTarget.po
+++ b/plugins/OpenExternalLinkTarget/locale/nb/LC_MESSAGES/OpenExternalLinkTarget.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OpenExternalLinkTarget\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:33+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:42+0000\n"
 "Language-Team: Norwegian (bokmål)‬ <http://translatewiki.net/wiki/Portal:no>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:05+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:45:59+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: #out-statusnet-plugin-openexternallinktarget\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: OpenExternalLinkTargetPlugin.php:59
 msgid "Opens external links (i.e. with rel=external) on a new window or tab."
 msgstr ""
 "Åpner eksterne lenker (f.eks. med rel=external) i ett nytt vindu eller en ny "
diff --git a/plugins/OpenExternalLinkTarget/locale/nl/LC_MESSAGES/OpenExternalLinkTarget.po b/plugins/OpenExternalLinkTarget/locale/nl/LC_MESSAGES/OpenExternalLinkTarget.po
index fea899a168..e194bba3d3 100644
--- a/plugins/OpenExternalLinkTarget/locale/nl/LC_MESSAGES/OpenExternalLinkTarget.po
+++ b/plugins/OpenExternalLinkTarget/locale/nl/LC_MESSAGES/OpenExternalLinkTarget.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OpenExternalLinkTarget\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:33+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:42+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:05+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:45:59+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-openexternallinktarget\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: OpenExternalLinkTargetPlugin.php:59
 msgid "Opens external links (i.e. with rel=external) on a new window or tab."
 msgstr ""
 "Opent externe verwijzingen (met \"rel=external\") in een nieuw venster of "
diff --git a/plugins/OpenExternalLinkTarget/locale/pt/LC_MESSAGES/OpenExternalLinkTarget.po b/plugins/OpenExternalLinkTarget/locale/pt/LC_MESSAGES/OpenExternalLinkTarget.po
index 151a836374..468e934c1c 100644
--- a/plugins/OpenExternalLinkTarget/locale/pt/LC_MESSAGES/OpenExternalLinkTarget.po
+++ b/plugins/OpenExternalLinkTarget/locale/pt/LC_MESSAGES/OpenExternalLinkTarget.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OpenExternalLinkTarget\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 15:58+0000\n"
-"PO-Revision-Date: 2011-03-03 16:02:21+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:42+0000\n"
 "Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:25:48+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:45:59+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-plugin-openexternallinktarget\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: OpenExternalLinkTargetPlugin.php:59
 msgid "Opens external links (i.e. with rel=external) on a new window or tab."
 msgstr ""
 "Abre links externos (por exemplo, com rel=external) num novo separador ou "
diff --git a/plugins/OpenExternalLinkTarget/locale/ru/LC_MESSAGES/OpenExternalLinkTarget.po b/plugins/OpenExternalLinkTarget/locale/ru/LC_MESSAGES/OpenExternalLinkTarget.po
index 607f3a0d37..4219f47a2a 100644
--- a/plugins/OpenExternalLinkTarget/locale/ru/LC_MESSAGES/OpenExternalLinkTarget.po
+++ b/plugins/OpenExternalLinkTarget/locale/ru/LC_MESSAGES/OpenExternalLinkTarget.po
@@ -10,20 +10,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OpenExternalLinkTarget\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:33+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:42+0000\n"
 "Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:05+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:45:59+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-openexternallinktarget\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: OpenExternalLinkTargetPlugin.php:59
 msgid "Opens external links (i.e. with rel=external) on a new window or tab."
 msgstr ""
 "Открывать внешние ссылки (например, rel=external) в новом окне или вкладке."
diff --git a/plugins/OpenExternalLinkTarget/locale/uk/LC_MESSAGES/OpenExternalLinkTarget.po b/plugins/OpenExternalLinkTarget/locale/uk/LC_MESSAGES/OpenExternalLinkTarget.po
index c183a46511..d783a3d1c8 100644
--- a/plugins/OpenExternalLinkTarget/locale/uk/LC_MESSAGES/OpenExternalLinkTarget.po
+++ b/plugins/OpenExternalLinkTarget/locale/uk/LC_MESSAGES/OpenExternalLinkTarget.po
@@ -9,20 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OpenExternalLinkTarget\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:33+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:42+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:05+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:45:59+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-openexternallinktarget\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: OpenExternalLinkTargetPlugin.php:59
 msgid "Opens external links (i.e. with rel=external) on a new window or tab."
 msgstr ""
 "Відкривати зовнішні посилання (тобто з rel=external) у новому вікні або "
diff --git a/plugins/OpenExternalLinkTarget/locale/zh_CN/LC_MESSAGES/OpenExternalLinkTarget.po b/plugins/OpenExternalLinkTarget/locale/zh_CN/LC_MESSAGES/OpenExternalLinkTarget.po
index 2e1c33eb33..1cf86f63ea 100644
--- a/plugins/OpenExternalLinkTarget/locale/zh_CN/LC_MESSAGES/OpenExternalLinkTarget.po
+++ b/plugins/OpenExternalLinkTarget/locale/zh_CN/LC_MESSAGES/OpenExternalLinkTarget.po
@@ -10,19 +10,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OpenExternalLinkTarget\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:33+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:43+0000\n"
 "Language-Team: Simplified Chinese <http://translatewiki.net/wiki/Portal:zh-"
 "hans>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:05+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:45:59+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-openexternallinktarget\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: OpenExternalLinkTargetPlugin.php:59
 msgid "Opens external links (i.e. with rel=external) on a new window or tab."
 msgstr "打开外部链接 （即与 rel = 外部） 在一个新窗口或选项卡。"
diff --git a/plugins/OpenID/locale/OpenID.pot b/plugins/OpenID/locale/OpenID.pot
index fa404286e7..f89d30679f 100644
--- a/plugins/OpenID/locale/OpenID.pot
+++ b/plugins/OpenID/locale/OpenID.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,229 +16,28 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: openidsettings.php:58 openidadminpanel.php:65
-msgid "OpenID settings"
+#: openidtrust.php:52
+msgid "OpenID Identity Verification"
 msgstr ""
 
-#: openidsettings.php:69
+#: openidtrust.php:70
+msgid ""
+"This page should only be reached during OpenID processing, not directly."
+msgstr ""
+
+#: openidtrust.php:118
 #, php-format
 msgid ""
-"[OpenID](%%doc.openid%%) lets you log into many sites with the same user "
-"account. Manage your associated OpenIDs from here."
+"%s  has asked to verify your identity. Click Continue to verify your "
+"identity and login without creating a new password."
 msgstr ""
 
-#: openidsettings.php:100
-msgid "Add OpenID"
+#: openidtrust.php:136
+msgid "Continue"
 msgstr ""
 
-#: openidsettings.php:103
-msgid ""
-"If you want to add an OpenID to your account, enter it in the box below and "
-"click \"Add\"."
-msgstr ""
-
-#. TRANS: OpenID plugin logon form field label.
-#: openidsettings.php:108 OpenIDPlugin.php:703 openidlogin.php:152
-msgid "OpenID URL"
-msgstr ""
-
-#: openidsettings.php:118
-msgid "Add"
-msgstr ""
-
-#: openidsettings.php:130
-msgid "Remove OpenID"
-msgstr ""
-
-#: openidsettings.php:135
-msgid ""
-"Removing your only OpenID would make it impossible to log in! If you need to "
-"remove it, add another OpenID first."
-msgstr ""
-
-#: openidsettings.php:150
-msgid ""
-"You can remove an OpenID from your account by clicking the button marked "
-"\"Remove\"."
-msgstr ""
-
-#: openidsettings.php:173 openidsettings.php:214
-msgid "Remove"
-msgstr ""
-
-#: openidsettings.php:187
-msgid "OpenID Trusted Sites"
-msgstr ""
-
-#: openidsettings.php:190
-msgid ""
-"The following sites are allowed to access your identity and log you in. You "
-"can remove a site from this list to deny it access to your OpenID."
-msgstr ""
-
-#. TRANS: Message given when there is a problem with the user's session token.
-#: openidsettings.php:232 finishopenidlogin.php:42
-msgid "There was a problem with your session token. Try again, please."
-msgstr ""
-
-#: openidsettings.php:239
-msgid "Can't add new providers."
-msgstr ""
-
-#: openidsettings.php:252
-msgid "Something weird happened."
-msgstr ""
-
-#: openidsettings.php:276
-msgid "No such OpenID trustroot."
-msgstr ""
-
-#: openidsettings.php:280
-msgid "Trustroots removed"
-msgstr ""
-
-#: openidsettings.php:303
-msgid "No such OpenID."
-msgstr ""
-
-#: openidsettings.php:308
-msgid "That OpenID does not belong to you."
-msgstr ""
-
-#: openidsettings.php:312
-msgid "OpenID removed."
-msgstr ""
-
-#: openidadminpanel.php:54
-msgid "OpenID"
-msgstr ""
-
-#: openidadminpanel.php:147
-msgid "Invalid provider URL. Max length is 255 characters."
-msgstr ""
-
-#: openidadminpanel.php:153
-msgid "Invalid team name. Max length is 255 characters."
-msgstr ""
-
-#: openidadminpanel.php:210
-msgid "Trusted provider"
-msgstr ""
-
-#: openidadminpanel.php:212
-msgid ""
-"By default, users are allowed to authenticate with any OpenID provider. If "
-"you are using your own OpenID service for shared sign-in, you can restrict "
-"access to only your own users here."
-msgstr ""
-
-#: openidadminpanel.php:220
-msgid "Provider URL"
-msgstr ""
-
-#: openidadminpanel.php:221
-msgid ""
-"All OpenID logins will be sent to this URL; other providers may not be used."
-msgstr ""
-
-#: openidadminpanel.php:228
-msgid "Append a username to base URL"
-msgstr ""
-
-#: openidadminpanel.php:230
-msgid ""
-"Login form will show the base URL and prompt for a username to add at the "
-"end. Use when OpenID provider URL should be the profile page for individual "
-"users."
-msgstr ""
-
-#: openidadminpanel.php:238
-msgid "Required team"
-msgstr ""
-
-#: openidadminpanel.php:239
-msgid "Only allow logins from users in the given team (Launchpad extension)."
-msgstr ""
-
-#: openidadminpanel.php:251
-msgid "Options"
-msgstr ""
-
-#: openidadminpanel.php:258
-msgid "Enable OpenID-only mode"
-msgstr ""
-
-#: openidadminpanel.php:260
-msgid ""
-"Require all users to login via OpenID. Warning: disables password "
-"authentication for all users!"
-msgstr ""
-
-#: openidadminpanel.php:278
-msgid "Save OpenID settings"
-msgstr ""
-
-#. TRANS: OpenID plugin server error.
-#: openid.php:138
-msgid "Cannot instantiate OpenID consumer object."
-msgstr ""
-
-#. TRANS: OpenID plugin message. Given when an OpenID is not valid.
-#: openid.php:150
-msgid "Not a valid OpenID."
-msgstr ""
-
-#. TRANS: OpenID plugin server error. Given when the OpenID authentication request fails.
-#. TRANS: %s is the failure message.
-#: openid.php:155
-#, php-format
-msgid "OpenID failure: %s"
-msgstr ""
-
-#. TRANS: OpenID plugin server error. Given when the OpenID authentication request cannot be redirected.
-#. TRANS: %s is the failure message.
-#: openid.php:205
-#, php-format
-msgid "Could not redirect to server: %s"
-msgstr ""
-
-#. TRANS: OpenID plugin user instructions.
-#: openid.php:244
-msgid ""
-"This form should automatically submit itself. If not, click the submit "
-"button to go to your OpenID provider."
-msgstr ""
-
-#. TRANS: OpenID plugin server error.
-#: openid.php:280
-msgid "Error saving the profile."
-msgstr ""
-
-#. TRANS: OpenID plugin server error.
-#: openid.php:292
-msgid "Error saving the user."
-msgstr ""
-
-#. TRANS: OpenID plugin client exception (403).
-#: openid.php:322
-msgid "Unauthorized URL used for OpenID login."
-msgstr ""
-
-#. TRANS: Title
-#: openid.php:370
-msgid "OpenID Login Submission"
-msgstr ""
-
-#. TRANS: OpenID plugin message used while requesting authorization user's OpenID login provider.
-#: openid.php:381
-msgid "Requesting authorization from your login provider..."
-msgstr ""
-
-#. TRANS: OpenID plugin message. User instruction while requesting authorization user's OpenID login provider.
-#: openid.php:385
-msgid ""
-"If you are not redirected to your login provider in a few seconds, try "
-"pushing the button below."
+#: openidtrust.php:137
+msgid "Cancel"
 msgstr ""
 
 #. TRANS: Tooltip for main menu option "Login"
@@ -331,27 +130,26 @@ msgstr ""
 msgid "You will be sent to the provider's site for authentication."
 msgstr ""
 
+#. TRANS: OpenID plugin logon form field label.
+#: OpenIDPlugin.php:703 openidsettings.php:108 openidlogin.php:152
+msgid "OpenID URL"
+msgstr ""
+
 #. TRANS: OpenID plugin logon form field instructions.
 #: OpenIDPlugin.php:706 openidlogin.php:155
 msgid "Your OpenID URL"
 msgstr ""
 
-#. TRANS: OpenID plugin client error given trying to add an unauthorised OpenID to a user (403).
-#: openidserver.php:116
-#, php-format
-msgid "You are not authorized to use the identity %s."
-msgstr ""
-
-#. TRANS: OpenID plugin client error given when not getting a response for a given OpenID provider (500).
-#: openidserver.php:137
-msgid "Just an OpenID provider. Nothing to see here, move along..."
-msgstr ""
-
 #. TRANS: Client error message trying to log on with OpenID while already logged on.
 #: finishopenidlogin.php:37 openidlogin.php:33
 msgid "Already logged in."
 msgstr ""
 
+#. TRANS: Message given when there is a problem with the user's session token.
+#: finishopenidlogin.php:42 openidsettings.php:232
+msgid "There was a problem with your session token. Try again, please."
+msgstr ""
+
 #. TRANS: Message given if user does not agree with the site's license.
 #: finishopenidlogin.php:48
 msgid "You can't register if you don't agree to the license."
@@ -487,66 +285,140 @@ msgstr ""
 msgid "Error connecting user to OpenID."
 msgstr ""
 
-#. TRANS: OpenID plugin message. Rememberme logins have to reauthenticate before changing any profile settings.
-#. TRANS: "OpenID" is the display text for a link with URL "(%%doc.openid%%)".
-#: openidlogin.php:74
+#. TRANS: OpenID plugin server error.
+#: openid.php:138
+msgid "Cannot instantiate OpenID consumer object."
+msgstr ""
+
+#. TRANS: OpenID plugin message. Given when an OpenID is not valid.
+#: openid.php:150
+msgid "Not a valid OpenID."
+msgstr ""
+
+#. TRANS: OpenID plugin server error. Given when the OpenID authentication request fails.
+#. TRANS: %s is the failure message.
+#: openid.php:155
 #, php-format
-msgid ""
-"For security reasons, please re-login with your [OpenID](%%doc.openid%%) "
-"before changing your settings."
+msgid "OpenID failure: %s"
 msgstr ""
 
-#. TRANS: OpenID plugin message.
-#. TRANS: "OpenID" is the display text for a link with URL "(%%doc.openid%%)".
-#: openidlogin.php:80
+#. TRANS: OpenID plugin server error. Given when the OpenID authentication request cannot be redirected.
+#. TRANS: %s is the failure message.
+#: openid.php:205
 #, php-format
-msgid "Login with an [OpenID](%%doc.openid%%) account."
+msgid "Could not redirect to server: %s"
 msgstr ""
 
-#. TRANS: OpenID plugin message. Title.
-#. TRANS: Title after getting the status of the OpenID authorisation request.
-#: openidlogin.php:114 finishaddopenid.php:187
-msgid "OpenID Login"
-msgstr ""
-
-#. TRANS: OpenID plugin logon form checkbox label for setting to put the OpenID information in a cookie.
-#: openidlogin.php:160
-msgid "Remember me"
-msgstr ""
-
-#. TRANS: OpenID plugin logon form field instructions.
-#: openidlogin.php:162
-msgid "Automatically login in the future; not for shared computers!"
-msgstr ""
-
-#. TRANS: OpenID plugin logon form button label to start logon with the data provided in the logon form.
-#: openidlogin.php:167
-msgctxt "BUTTON"
-msgid "Login"
-msgstr ""
-
-#: openidtrust.php:52
-msgid "OpenID Identity Verification"
-msgstr ""
-
-#: openidtrust.php:70
+#. TRANS: OpenID plugin user instructions.
+#: openid.php:244
 msgid ""
-"This page should only be reached during OpenID processing, not directly."
+"This form should automatically submit itself. If not, click the submit "
+"button to go to your OpenID provider."
 msgstr ""
 
-#: openidtrust.php:118
-#, php-format
+#. TRANS: OpenID plugin server error.
+#: openid.php:280
+msgid "Error saving the profile."
+msgstr ""
+
+#. TRANS: OpenID plugin server error.
+#: openid.php:292
+msgid "Error saving the user."
+msgstr ""
+
+#. TRANS: OpenID plugin client exception (403).
+#: openid.php:322
+msgid "Unauthorized URL used for OpenID login."
+msgstr ""
+
+#. TRANS: Title
+#: openid.php:370
+msgid "OpenID Login Submission"
+msgstr ""
+
+#. TRANS: OpenID plugin message used while requesting authorization user's OpenID login provider.
+#: openid.php:381
+msgid "Requesting authorization from your login provider..."
+msgstr ""
+
+#. TRANS: OpenID plugin message. User instruction while requesting authorization user's OpenID login provider.
+#: openid.php:385
 msgid ""
-"%s  has asked to verify your identity. Click Continue to verify your "
-"identity and login without creating a new password."
+"If you are not redirected to your login provider in a few seconds, try "
+"pushing the button below."
 msgstr ""
 
-#: openidtrust.php:136
-msgid "Continue"
+#: openidadminpanel.php:54
+msgid "OpenID"
 msgstr ""
 
-#: openidtrust.php:137
-msgid "Cancel"
+#: openidadminpanel.php:65 openidsettings.php:58
+msgid "OpenID settings"
+msgstr ""
+
+#: openidadminpanel.php:147
+msgid "Invalid provider URL. Max length is 255 characters."
+msgstr ""
+
+#: openidadminpanel.php:153
+msgid "Invalid team name. Max length is 255 characters."
+msgstr ""
+
+#: openidadminpanel.php:210
+msgid "Trusted provider"
+msgstr ""
+
+#: openidadminpanel.php:212
+msgid ""
+"By default, users are allowed to authenticate with any OpenID provider. If "
+"you are using your own OpenID service for shared sign-in, you can restrict "
+"access to only your own users here."
+msgstr ""
+
+#: openidadminpanel.php:220
+msgid "Provider URL"
+msgstr ""
+
+#: openidadminpanel.php:221
+msgid ""
+"All OpenID logins will be sent to this URL; other providers may not be used."
+msgstr ""
+
+#: openidadminpanel.php:228
+msgid "Append a username to base URL"
+msgstr ""
+
+#: openidadminpanel.php:230
+msgid ""
+"Login form will show the base URL and prompt for a username to add at the "
+"end. Use when OpenID provider URL should be the profile page for individual "
+"users."
+msgstr ""
+
+#: openidadminpanel.php:238
+msgid "Required team"
+msgstr ""
+
+#: openidadminpanel.php:239
+msgid "Only allow logins from users in the given team (Launchpad extension)."
+msgstr ""
+
+#: openidadminpanel.php:251
+msgid "Options"
+msgstr ""
+
+#: openidadminpanel.php:258
+msgid "Enable OpenID-only mode"
+msgstr ""
+
+#: openidadminpanel.php:260
+msgid ""
+"Require all users to login via OpenID. Warning: disables password "
+"authentication for all users!"
+msgstr ""
+
+#: openidadminpanel.php:278
+msgid "Save OpenID settings"
 msgstr ""
 
 #. TRANS: Client error message
@@ -573,3 +445,131 @@ msgstr ""
 #: finishaddopenid.php:145
 msgid "Error updating profile"
 msgstr ""
+
+#. TRANS: Title after getting the status of the OpenID authorisation request.
+#. TRANS: OpenID plugin message. Title.
+#: finishaddopenid.php:187 openidlogin.php:114
+msgid "OpenID Login"
+msgstr ""
+
+#: openidsettings.php:69
+#, php-format
+msgid ""
+"[OpenID](%%doc.openid%%) lets you log into many sites with the same user "
+"account. Manage your associated OpenIDs from here."
+msgstr ""
+
+#: openidsettings.php:100
+msgid "Add OpenID"
+msgstr ""
+
+#: openidsettings.php:103
+msgid ""
+"If you want to add an OpenID to your account, enter it in the box below and "
+"click \"Add\"."
+msgstr ""
+
+#: openidsettings.php:118
+msgid "Add"
+msgstr ""
+
+#: openidsettings.php:130
+msgid "Remove OpenID"
+msgstr ""
+
+#: openidsettings.php:135
+msgid ""
+"Removing your only OpenID would make it impossible to log in! If you need to "
+"remove it, add another OpenID first."
+msgstr ""
+
+#: openidsettings.php:150
+msgid ""
+"You can remove an OpenID from your account by clicking the button marked "
+"\"Remove\"."
+msgstr ""
+
+#: openidsettings.php:173 openidsettings.php:214
+msgid "Remove"
+msgstr ""
+
+#: openidsettings.php:187
+msgid "OpenID Trusted Sites"
+msgstr ""
+
+#: openidsettings.php:190
+msgid ""
+"The following sites are allowed to access your identity and log you in. You "
+"can remove a site from this list to deny it access to your OpenID."
+msgstr ""
+
+#: openidsettings.php:239
+msgid "Can't add new providers."
+msgstr ""
+
+#: openidsettings.php:252
+msgid "Something weird happened."
+msgstr ""
+
+#: openidsettings.php:276
+msgid "No such OpenID trustroot."
+msgstr ""
+
+#: openidsettings.php:280
+msgid "Trustroots removed"
+msgstr ""
+
+#: openidsettings.php:303
+msgid "No such OpenID."
+msgstr ""
+
+#: openidsettings.php:308
+msgid "That OpenID does not belong to you."
+msgstr ""
+
+#: openidsettings.php:312
+msgid "OpenID removed."
+msgstr ""
+
+#. TRANS: OpenID plugin client error given trying to add an unauthorised OpenID to a user (403).
+#: openidserver.php:116
+#, php-format
+msgid "You are not authorized to use the identity %s."
+msgstr ""
+
+#. TRANS: OpenID plugin client error given when not getting a response for a given OpenID provider (500).
+#: openidserver.php:137
+msgid "Just an OpenID provider. Nothing to see here, move along..."
+msgstr ""
+
+#. TRANS: OpenID plugin message. Rememberme logins have to reauthenticate before changing any profile settings.
+#. TRANS: "OpenID" is the display text for a link with URL "(%%doc.openid%%)".
+#: openidlogin.php:74
+#, php-format
+msgid ""
+"For security reasons, please re-login with your [OpenID](%%doc.openid%%) "
+"before changing your settings."
+msgstr ""
+
+#. TRANS: OpenID plugin message.
+#. TRANS: "OpenID" is the display text for a link with URL "(%%doc.openid%%)".
+#: openidlogin.php:80
+#, php-format
+msgid "Login with an [OpenID](%%doc.openid%%) account."
+msgstr ""
+
+#. TRANS: OpenID plugin logon form checkbox label for setting to put the OpenID information in a cookie.
+#: openidlogin.php:160
+msgid "Remember me"
+msgstr ""
+
+#. TRANS: OpenID plugin logon form field instructions.
+#: openidlogin.php:162
+msgid "Automatically login in the future; not for shared computers!"
+msgstr ""
+
+#. TRANS: OpenID plugin logon form button label to start logon with the data provided in the logon form.
+#: openidlogin.php:167
+msgctxt "BUTTON"
+msgid "Login"
+msgstr ""
diff --git a/plugins/OpenID/locale/br/LC_MESSAGES/OpenID.po b/plugins/OpenID/locale/br/LC_MESSAGES/OpenID.po
index ba67bd35ba..e7581dcd08 100644
--- a/plugins/OpenID/locale/br/LC_MESSAGES/OpenID.po
+++ b/plugins/OpenID/locale/br/LC_MESSAGES/OpenID.po
@@ -9,275 +9,63 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OpenID\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:34+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:49+0000\n"
 "Language-Team: Breton <http://translatewiki.net/wiki/Portal:br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-14 17:22:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:46:02+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-openid\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: openidsettings.php:58 openidadminpanel.php:65
-msgid "OpenID settings"
-msgstr "Arventenn OpenID"
+msgid "OpenID Identity Verification"
+msgstr ""
+
+msgid ""
+"This page should only be reached during OpenID processing, not directly."
+msgstr ""
 
-#: openidsettings.php:69
 #, php-format
 msgid ""
-"[OpenID](%%doc.openid%%) lets you log into many sites with the same user "
-"account. Manage your associated OpenIDs from here."
+"%s  has asked to verify your identity. Click Continue to verify your "
+"identity and login without creating a new password."
 msgstr ""
 
-#: openidsettings.php:100
-msgid "Add OpenID"
-msgstr "Ouzhpennañ OpenID"
+msgid "Continue"
+msgstr "Kenderc'hel"
 
-#: openidsettings.php:103
-msgid ""
-"If you want to add an OpenID to your account, enter it in the box below and "
-"click \"Add\"."
-msgstr ""
-
-#. TRANS: OpenID plugin logon form field label.
-#: openidsettings.php:108 OpenIDPlugin.php:703 openidlogin.php:152
-msgid "OpenID URL"
-msgstr "URL OpenID"
-
-#: openidsettings.php:118
-msgid "Add"
-msgstr "Ouzhpennañ"
-
-#: openidsettings.php:130
-msgid "Remove OpenID"
-msgstr "Dilemel OpenID"
-
-#: openidsettings.php:135
-msgid ""
-"Removing your only OpenID would make it impossible to log in! If you need to "
-"remove it, add another OpenID first."
-msgstr ""
-
-#: openidsettings.php:150
-msgid ""
-"You can remove an OpenID from your account by clicking the button marked "
-"\"Remove\"."
-msgstr ""
-
-#: openidsettings.php:173 openidsettings.php:214
-msgid "Remove"
-msgstr "Dilemel"
-
-#: openidsettings.php:187
-msgid "OpenID Trusted Sites"
-msgstr ""
-
-#: openidsettings.php:190
-msgid ""
-"The following sites are allowed to access your identity and log you in. You "
-"can remove a site from this list to deny it access to your OpenID."
-msgstr ""
-
-#. TRANS: Message given when there is a problem with the user's session token.
-#: openidsettings.php:232 finishopenidlogin.php:42
-msgid "There was a problem with your session token. Try again, please."
-msgstr ""
-
-#: openidsettings.php:239
-msgid "Can't add new providers."
-msgstr "Dibosupl eo ouzhpennañ pourvezerien nevez."
-
-#: openidsettings.php:252
-msgid "Something weird happened."
-msgstr ""
-
-#: openidsettings.php:276
-msgid "No such OpenID trustroot."
-msgstr ""
-
-#: openidsettings.php:280
-msgid "Trustroots removed"
-msgstr ""
-
-#: openidsettings.php:303
-msgid "No such OpenID."
-msgstr "N'eus ket eus ar gont OpenID."
-
-#: openidsettings.php:308
-msgid "That OpenID does not belong to you."
-msgstr ""
-
-#: openidsettings.php:312
-msgid "OpenID removed."
-msgstr "Kont OpenID dilamet."
-
-#: openidadminpanel.php:54
-msgid "OpenID"
-msgstr "OpenID"
-
-#: openidadminpanel.php:147
-msgid "Invalid provider URL. Max length is 255 characters."
-msgstr ""
-
-#: openidadminpanel.php:153
-msgid "Invalid team name. Max length is 255 characters."
-msgstr ""
-
-#: openidadminpanel.php:210
-msgid "Trusted provider"
-msgstr ""
-
-#: openidadminpanel.php:212
-msgid ""
-"By default, users are allowed to authenticate with any OpenID provider. If "
-"you are using your own OpenID service for shared sign-in, you can restrict "
-"access to only your own users here."
-msgstr ""
-
-#: openidadminpanel.php:220
-msgid "Provider URL"
-msgstr ""
-
-#: openidadminpanel.php:221
-msgid ""
-"All OpenID logins will be sent to this URL; other providers may not be used."
-msgstr ""
-
-#: openidadminpanel.php:228
-msgid "Append a username to base URL"
-msgstr ""
-
-#: openidadminpanel.php:230
-msgid ""
-"Login form will show the base URL and prompt for a username to add at the "
-"end. Use when OpenID provider URL should be the profile page for individual "
-"users."
-msgstr ""
-
-#: openidadminpanel.php:238
-msgid "Required team"
-msgstr "Skipailh ret"
-
-#: openidadminpanel.php:239
-msgid "Only allow logins from users in the given team (Launchpad extension)."
-msgstr ""
-
-#: openidadminpanel.php:251
-msgid "Options"
-msgstr "Dibarzhioù"
-
-#: openidadminpanel.php:258
-msgid "Enable OpenID-only mode"
-msgstr ""
-
-#: openidadminpanel.php:260
-msgid ""
-"Require all users to login via OpenID. Warning: disables password "
-"authentication for all users!"
-msgstr ""
-
-#: openidadminpanel.php:278
-msgid "Save OpenID settings"
-msgstr ""
-
-#. TRANS: OpenID plugin server error.
-#: openid.php:138
-msgid "Cannot instantiate OpenID consumer object."
-msgstr ""
-
-#. TRANS: OpenID plugin message. Given when an OpenID is not valid.
-#: openid.php:150
-msgid "Not a valid OpenID."
-msgstr ""
-
-#. TRANS: OpenID plugin server error. Given when the OpenID authentication request fails.
-#. TRANS: %s is the failure message.
-#: openid.php:155
-#, php-format
-msgid "OpenID failure: %s"
-msgstr ""
-
-#. TRANS: OpenID plugin server error. Given when the OpenID authentication request cannot be redirected.
-#. TRANS: %s is the failure message.
-#: openid.php:205
-#, php-format
-msgid "Could not redirect to server: %s"
-msgstr ""
-
-#. TRANS: OpenID plugin user instructions.
-#: openid.php:244
-msgid ""
-"This form should automatically submit itself. If not, click the submit "
-"button to go to your OpenID provider."
-msgstr ""
-
-#. TRANS: OpenID plugin server error.
-#: openid.php:280
-msgid "Error saving the profile."
-msgstr "Ur fazi 'zo bet pa veze enrollet ar profil."
-
-#. TRANS: OpenID plugin server error.
-#: openid.php:292
-msgid "Error saving the user."
-msgstr "Ur fazi 'zo bet pa veze enrollet an implijer."
-
-#. TRANS: OpenID plugin client exception (403).
-#: openid.php:322
-msgid "Unauthorized URL used for OpenID login."
-msgstr ""
-
-#. TRANS: Title
-#: openid.php:370
-msgid "OpenID Login Submission"
-msgstr ""
-
-#. TRANS: OpenID plugin message used while requesting authorization user's OpenID login provider.
-#: openid.php:381
-msgid "Requesting authorization from your login provider..."
-msgstr ""
-
-#. TRANS: OpenID plugin message. User instruction while requesting authorization user's OpenID login provider.
-#: openid.php:385
-msgid ""
-"If you are not redirected to your login provider in a few seconds, try "
-"pushing the button below."
-msgstr ""
+msgid "Cancel"
+msgstr "Nullañ"
 
 #. TRANS: Tooltip for main menu option "Login"
-#: OpenIDPlugin.php:218
 msgctxt "TOOLTIP"
 msgid "Login to the site"
 msgstr "Kevreañ d'al lec'hienn"
 
 #. TRANS: Main menu option when not logged in to log in
-#: OpenIDPlugin.php:221
 msgctxt "MENU"
 msgid "Login"
 msgstr "Kevreañ"
 
 #. TRANS: Tooltip for main menu option "Help"
-#: OpenIDPlugin.php:226
 msgctxt "TOOLTIP"
 msgid "Help me!"
 msgstr "Sikour din !"
 
 #. TRANS: Main menu option for help on the StatusNet site
-#: OpenIDPlugin.php:229
 msgctxt "MENU"
 msgid "Help"
 msgstr "Skoazell"
 
 #. TRANS: Tooltip for main menu option "Search"
-#: OpenIDPlugin.php:235
 msgctxt "TOOLTIP"
 msgid "Search for people or text"
 msgstr "Klask tud pe un tamm testenn"
 
 #. TRANS: Main menu option when logged in or when the StatusNet instance is not private
-#: OpenIDPlugin.php:238
 msgctxt "MENU"
 msgid "Search"
 msgstr "Klask"
@@ -285,93 +73,75 @@ msgstr "Klask"
 #. TRANS: OpenID plugin menu item on site logon page.
 #. TRANS: OpenID plugin menu item on user settings page.
 #. TRANS: OpenID configuration menu item.
-#: OpenIDPlugin.php:295 OpenIDPlugin.php:331 OpenIDPlugin.php:605
 msgctxt "MENU"
 msgid "OpenID"
 msgstr "OpenID"
 
 #. TRANS: OpenID plugin tooltip for logon menu item.
-#: OpenIDPlugin.php:297
 msgid "Login or register with OpenID"
 msgstr ""
 
 #. TRANS: OpenID plugin tooltip for user settings menu item.
-#: OpenIDPlugin.php:333
 msgid "Add or remove OpenIDs"
 msgstr ""
 
 #. TRANS: Tooltip for OpenID configuration menu item.
-#: OpenIDPlugin.php:607
 msgid "OpenID configuration"
 msgstr "Kefluniadur OpenID"
 
 #. TRANS: OpenID plugin description.
-#: OpenIDPlugin.php:653
 msgid "Use <a href=\"http://openid.net/\">OpenID</a> to login to the site."
 msgstr ""
 
 #. TRANS: button label for OAuth authorization page when needing OpenID authentication first.
-#: OpenIDPlugin.php:663
 msgctxt "BUTTON"
 msgid "Continue"
 msgstr "Kenderc'hel"
 
 #. TRANS: OpenID plugin logon form legend.
-#: OpenIDPlugin.php:680 openidlogin.php:132
 msgid "OpenID login"
 msgstr ""
 
 #. TRANS: Field label.
-#: OpenIDPlugin.php:688 openidlogin.php:139
 msgid "OpenID provider"
 msgstr ""
 
 #. TRANS: Form guide.
-#: OpenIDPlugin.php:697 openidlogin.php:147
 msgid "Enter your username."
 msgstr "Ebarzhit hoc'h anv implijer"
 
 #. TRANS: Form guide.
-#: OpenIDPlugin.php:699 openidlogin.php:148
 msgid "You will be sent to the provider's site for authentication."
 msgstr ""
 
+#. TRANS: OpenID plugin logon form field label.
+msgid "OpenID URL"
+msgstr "URL OpenID"
+
 #. TRANS: OpenID plugin logon form field instructions.
-#: OpenIDPlugin.php:706 openidlogin.php:155
 msgid "Your OpenID URL"
 msgstr ""
 
-#. TRANS: OpenID plugin client error given trying to add an unauthorised OpenID to a user (403).
-#: openidserver.php:116
-#, php-format
-msgid "You are not authorized to use the identity %s."
-msgstr ""
-
-#. TRANS: OpenID plugin client error given when not getting a response for a given OpenID provider (500).
-#: openidserver.php:137
-msgid "Just an OpenID provider. Nothing to see here, move along..."
-msgstr ""
-
 #. TRANS: Client error message trying to log on with OpenID while already logged on.
-#: finishopenidlogin.php:37 openidlogin.php:33
 msgid "Already logged in."
 msgstr "Kevreet oc'h dija."
 
+#. TRANS: Message given when there is a problem with the user's session token.
+msgid "There was a problem with your session token. Try again, please."
+msgstr ""
+
 #. TRANS: Message given if user does not agree with the site's license.
-#: finishopenidlogin.php:48
 msgid "You can't register if you don't agree to the license."
 msgstr ""
 "Rankout a rit bezañ a-du gant termenoù an aotre-implijout evit krouiñ ur "
 "gont."
 
 #. TRANS: Messag given on an unknown error.
-#: finishopenidlogin.php:57
 msgid "An unknown error has occured."
 msgstr "Ur gudenn dizanv a zo bet."
 
 #. TRANS: Instructions given after a first successful logon using OpenID.
 #. TRANS: %s is the site name.
-#: finishopenidlogin.php:73
 #, php-format
 msgid ""
 "This is the first time you've logged into %s so we must connect your OpenID "
@@ -380,123 +150,305 @@ msgid ""
 msgstr ""
 
 #. TRANS: Title
-#: finishopenidlogin.php:80
 msgid "OpenID Account Setup"
 msgstr ""
 
-#: finishopenidlogin.php:117
 msgid "Create new account"
 msgstr "Krouiñ ur gont nevez"
 
-#: finishopenidlogin.php:119
 msgid "Create a new user with this nickname."
 msgstr "Krouiñ un implijer nevez gant al lesanv-se."
 
-#: finishopenidlogin.php:126
 msgid "New nickname"
 msgstr "Lesanv nevez"
 
-#: finishopenidlogin.php:128
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr ""
 
 #. TRANS: Button label in form in which to create a new user on the site for an OpenID.
-#: finishopenidlogin.php:162
 msgctxt "BUTTON"
 msgid "Create"
 msgstr "Krouiñ"
 
 #. TRANS: Used as form legend for form in which to connect an OpenID to an existing user on the site.
-#: finishopenidlogin.php:176
 msgid "Connect existing account"
 msgstr ""
 
 #. TRANS: User instructions for form in which to connect an OpenID to an existing user on the site.
-#: finishopenidlogin.php:179
 msgid ""
 "If you already have an account, login with your username and password to "
 "connect it to your OpenID."
 msgstr ""
 
 #. TRANS: Field label in form in which to connect an OpenID to an existing user on the site.
-#: finishopenidlogin.php:183
 msgid "Existing nickname"
 msgstr "Lesanv a zo dioutañ"
 
 #. TRANS: Field label in form in which to connect an OpenID to an existing user on the site.
-#: finishopenidlogin.php:187
 msgid "Password"
 msgstr "Ger-tremen"
 
 #. TRANS: Button label in form in which to connect an OpenID to an existing user on the site.
-#: finishopenidlogin.php:191
 msgctxt "BUTTON"
 msgid "Connect"
 msgstr "Kevreañ"
 
 #. TRANS: Status message in case the response from the OpenID provider is that the logon attempt was cancelled.
-#: finishopenidlogin.php:237 finishaddopenid.php:90
 msgid "OpenID authentication cancelled."
 msgstr ""
 
 #. TRANS: OpenID authentication failed; display the error message. %s is the error message.
 #. TRANS: OpenID authentication failed; display the error message.
 #. TRANS: %s is the error message.
-#: finishopenidlogin.php:241 finishaddopenid.php:95
 #, php-format
 msgid "OpenID authentication failed: %s"
 msgstr ""
 
-#: finishopenidlogin.php:261 finishaddopenid.php:111
 msgid ""
 "OpenID authentication aborted: you are not allowed to login to this site."
 msgstr ""
 
 #. TRANS: OpenID plugin message. No new user registration is allowed on the site.
 #. TRANS: OpenID plugin message. No new user registration is allowed on the site without an invitation code, and none was provided.
-#: finishopenidlogin.php:317 finishopenidlogin.php:327
 msgid "Registration not allowed."
 msgstr "N'eo ket aotreet krouiñ kontoù."
 
 #. TRANS: OpenID plugin message. No new user registration is allowed on the site without an invitation code, and the one provided was not valid.
-#: finishopenidlogin.php:335
 msgid "Not a valid invitation code."
 msgstr "N'eo ket reizh ar c'hod pedadenn."
 
 #. TRANS: OpenID plugin message. The entered new user name is blacklisted.
-#: finishopenidlogin.php:349
 msgid "Nickname not allowed."
 msgstr "Lesanv nann-aotreet."
 
 #. TRANS: OpenID plugin message. The entered new user name is already used.
-#: finishopenidlogin.php:355
 msgid "Nickname already in use. Try another one."
 msgstr "Implijet eo dija al lesanv-se. Klaskit unan all."
 
 #. TRANS: OpenID plugin server error. A stored OpenID cannot be retrieved.
 #. TRANS: OpenID plugin server error. A stored OpenID cannot be found.
-#: finishopenidlogin.php:363 finishopenidlogin.php:449
 msgid "Stored OpenID not found."
 msgstr ""
 
 #. TRANS: OpenID plugin server error.
-#: finishopenidlogin.php:373
 msgid "Creating new account for OpenID that already has a user."
 msgstr ""
 
 #. TRANS: OpenID plugin message.
-#: finishopenidlogin.php:437
 msgid "Invalid username or password."
 msgstr ""
 
 #. TRANS: OpenID plugin server error. The user or user profile could not be saved.
-#: finishopenidlogin.php:457
 msgid "Error connecting user to OpenID."
 msgstr ""
 
+#. TRANS: OpenID plugin server error.
+msgid "Cannot instantiate OpenID consumer object."
+msgstr ""
+
+#. TRANS: OpenID plugin message. Given when an OpenID is not valid.
+msgid "Not a valid OpenID."
+msgstr ""
+
+#. TRANS: OpenID plugin server error. Given when the OpenID authentication request fails.
+#. TRANS: %s is the failure message.
+#, php-format
+msgid "OpenID failure: %s"
+msgstr ""
+
+#. TRANS: OpenID plugin server error. Given when the OpenID authentication request cannot be redirected.
+#. TRANS: %s is the failure message.
+#, php-format
+msgid "Could not redirect to server: %s"
+msgstr ""
+
+#. TRANS: OpenID plugin user instructions.
+msgid ""
+"This form should automatically submit itself. If not, click the submit "
+"button to go to your OpenID provider."
+msgstr ""
+
+#. TRANS: OpenID plugin server error.
+msgid "Error saving the profile."
+msgstr "Ur fazi 'zo bet pa veze enrollet ar profil."
+
+#. TRANS: OpenID plugin server error.
+msgid "Error saving the user."
+msgstr "Ur fazi 'zo bet pa veze enrollet an implijer."
+
+#. TRANS: OpenID plugin client exception (403).
+msgid "Unauthorized URL used for OpenID login."
+msgstr ""
+
+#. TRANS: Title
+msgid "OpenID Login Submission"
+msgstr ""
+
+#. TRANS: OpenID plugin message used while requesting authorization user's OpenID login provider.
+msgid "Requesting authorization from your login provider..."
+msgstr ""
+
+#. TRANS: OpenID plugin message. User instruction while requesting authorization user's OpenID login provider.
+msgid ""
+"If you are not redirected to your login provider in a few seconds, try "
+"pushing the button below."
+msgstr ""
+
+msgid "OpenID"
+msgstr "OpenID"
+
+msgid "OpenID settings"
+msgstr "Arventenn OpenID"
+
+msgid "Invalid provider URL. Max length is 255 characters."
+msgstr ""
+
+msgid "Invalid team name. Max length is 255 characters."
+msgstr ""
+
+msgid "Trusted provider"
+msgstr ""
+
+msgid ""
+"By default, users are allowed to authenticate with any OpenID provider. If "
+"you are using your own OpenID service for shared sign-in, you can restrict "
+"access to only your own users here."
+msgstr ""
+
+msgid "Provider URL"
+msgstr ""
+
+msgid ""
+"All OpenID logins will be sent to this URL; other providers may not be used."
+msgstr ""
+
+msgid "Append a username to base URL"
+msgstr ""
+
+msgid ""
+"Login form will show the base URL and prompt for a username to add at the "
+"end. Use when OpenID provider URL should be the profile page for individual "
+"users."
+msgstr ""
+
+msgid "Required team"
+msgstr "Skipailh ret"
+
+msgid "Only allow logins from users in the given team (Launchpad extension)."
+msgstr ""
+
+msgid "Options"
+msgstr "Dibarzhioù"
+
+msgid "Enable OpenID-only mode"
+msgstr ""
+
+msgid ""
+"Require all users to login via OpenID. Warning: disables password "
+"authentication for all users!"
+msgstr ""
+
+msgid "Save OpenID settings"
+msgstr ""
+
+#. TRANS: Client error message
+msgid "Not logged in."
+msgstr "Nann-kevreet."
+
+#. TRANS: message in case a user tries to add an OpenID that is already connected to them.
+msgid "You already have this OpenID!"
+msgstr "Kevreet oc'h dija gant an OpenID-se !"
+
+#. TRANS: message in case a user tries to add an OpenID that is already used by another user.
+msgid "Someone else already has this OpenID."
+msgstr ""
+
+#. TRANS: message in case the OpenID object cannot be connected to the user.
+msgid "Error connecting user."
+msgstr ""
+
+#. TRANS: message in case the user or the user profile cannot be saved in StatusNet.
+msgid "Error updating profile"
+msgstr ""
+
+#. TRANS: Title after getting the status of the OpenID authorisation request.
+#. TRANS: OpenID plugin message. Title.
+msgid "OpenID Login"
+msgstr ""
+
+#, php-format
+msgid ""
+"[OpenID](%%doc.openid%%) lets you log into many sites with the same user "
+"account. Manage your associated OpenIDs from here."
+msgstr ""
+
+msgid "Add OpenID"
+msgstr "Ouzhpennañ OpenID"
+
+msgid ""
+"If you want to add an OpenID to your account, enter it in the box below and "
+"click \"Add\"."
+msgstr ""
+
+msgid "Add"
+msgstr "Ouzhpennañ"
+
+msgid "Remove OpenID"
+msgstr "Dilemel OpenID"
+
+msgid ""
+"Removing your only OpenID would make it impossible to log in! If you need to "
+"remove it, add another OpenID first."
+msgstr ""
+
+msgid ""
+"You can remove an OpenID from your account by clicking the button marked "
+"\"Remove\"."
+msgstr ""
+
+msgid "Remove"
+msgstr "Dilemel"
+
+msgid "OpenID Trusted Sites"
+msgstr ""
+
+msgid ""
+"The following sites are allowed to access your identity and log you in. You "
+"can remove a site from this list to deny it access to your OpenID."
+msgstr ""
+
+msgid "Can't add new providers."
+msgstr "Dibosupl eo ouzhpennañ pourvezerien nevez."
+
+msgid "Something weird happened."
+msgstr ""
+
+msgid "No such OpenID trustroot."
+msgstr ""
+
+msgid "Trustroots removed"
+msgstr ""
+
+msgid "No such OpenID."
+msgstr "N'eus ket eus ar gont OpenID."
+
+msgid "That OpenID does not belong to you."
+msgstr ""
+
+msgid "OpenID removed."
+msgstr "Kont OpenID dilamet."
+
+#. TRANS: OpenID plugin client error given trying to add an unauthorised OpenID to a user (403).
+#, php-format
+msgid "You are not authorized to use the identity %s."
+msgstr ""
+
+#. TRANS: OpenID plugin client error given when not getting a response for a given OpenID provider (500).
+msgid "Just an OpenID provider. Nothing to see here, move along..."
+msgstr ""
+
 #. TRANS: OpenID plugin message. Rememberme logins have to reauthenticate before changing any profile settings.
 #. TRANS: "OpenID" is the display text for a link with URL "(%%doc.openid%%)".
-#: openidlogin.php:74
 #, php-format
 msgid ""
 "For security reasons, please re-login with your [OpenID](%%doc.openid%%) "
@@ -505,78 +457,19 @@ msgstr ""
 
 #. TRANS: OpenID plugin message.
 #. TRANS: "OpenID" is the display text for a link with URL "(%%doc.openid%%)".
-#: openidlogin.php:80
 #, php-format
 msgid "Login with an [OpenID](%%doc.openid%%) account."
 msgstr "Kevreañ gant ur gont [OpenID](%%doc.openid%%)."
 
-#. TRANS: OpenID plugin message. Title.
-#. TRANS: Title after getting the status of the OpenID authorisation request.
-#: openidlogin.php:114 finishaddopenid.php:187
-msgid "OpenID Login"
-msgstr ""
-
 #. TRANS: OpenID plugin logon form checkbox label for setting to put the OpenID information in a cookie.
-#: openidlogin.php:160
 msgid "Remember me"
 msgstr "Derc'hel soñj ac'hanon"
 
 #. TRANS: OpenID plugin logon form field instructions.
-#: openidlogin.php:162
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 
 #. TRANS: OpenID plugin logon form button label to start logon with the data provided in the logon form.
-#: openidlogin.php:167
 msgctxt "BUTTON"
 msgid "Login"
 msgstr "Kevreañ"
-
-#: openidtrust.php:52
-msgid "OpenID Identity Verification"
-msgstr ""
-
-#: openidtrust.php:70
-msgid ""
-"This page should only be reached during OpenID processing, not directly."
-msgstr ""
-
-#: openidtrust.php:118
-#, php-format
-msgid ""
-"%s  has asked to verify your identity. Click Continue to verify your "
-"identity and login without creating a new password."
-msgstr ""
-
-#: openidtrust.php:136
-msgid "Continue"
-msgstr "Kenderc'hel"
-
-#: openidtrust.php:137
-msgid "Cancel"
-msgstr "Nullañ"
-
-#. TRANS: Client error message
-#: finishaddopenid.php:68
-msgid "Not logged in."
-msgstr "Nann-kevreet."
-
-#. TRANS: message in case a user tries to add an OpenID that is already connected to them.
-#: finishaddopenid.php:122
-msgid "You already have this OpenID!"
-msgstr "Kevreet oc'h dija gant an OpenID-se !"
-
-#. TRANS: message in case a user tries to add an OpenID that is already used by another user.
-#: finishaddopenid.php:125
-msgid "Someone else already has this OpenID."
-msgstr ""
-
-#. TRANS: message in case the OpenID object cannot be connected to the user.
-#: finishaddopenid.php:138
-msgid "Error connecting user."
-msgstr ""
-
-#. TRANS: message in case the user or the user profile cannot be saved in StatusNet.
-#: finishaddopenid.php:145
-msgid "Error updating profile"
-msgstr ""
diff --git a/plugins/OpenID/locale/ca/LC_MESSAGES/OpenID.po b/plugins/OpenID/locale/ca/LC_MESSAGES/OpenID.po
index d3e1ab1425..ebcb44cacc 100644
--- a/plugins/OpenID/locale/ca/LC_MESSAGES/OpenID.po
+++ b/plugins/OpenID/locale/ca/LC_MESSAGES/OpenID.po
@@ -9,293 +9,67 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OpenID\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:34+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:49+0000\n"
 "Language-Team: Catalan <http://translatewiki.net/wiki/Portal:ca>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-14 17:22:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:46:02+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ca\n"
 "X-Message-Group: #out-statusnet-plugin-openid\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: openidsettings.php:58 openidadminpanel.php:65
-msgid "OpenID settings"
-msgstr "Paràmetres de l'OpenID"
+msgid "OpenID Identity Verification"
+msgstr "Verificació de la identitat d'OpenID"
+
+msgid ""
+"This page should only be reached during OpenID processing, not directly."
+msgstr ""
+"Hauria d'arribar-se a aquesta pàgina només durant el processament de "
+"l'OpenID, no directament."
 
-#: openidsettings.php:69
 #, php-format
 msgid ""
-"[OpenID](%%doc.openid%%) lets you log into many sites with the same user "
-"account. Manage your associated OpenIDs from here."
+"%s  has asked to verify your identity. Click Continue to verify your "
+"identity and login without creating a new password."
 msgstr ""
-"[OpenID](%%doc.openid%%) us permet iniciar una sessió a molts llocs amb un "
-"mateix compte d'usuari. Gestioneu les vostres connexions OpenID associades "
-"des d'aquí."
+"%s  us ha demanat verificar la identitat. Feu clic a Continuar per verificar "
+"la vostra identitat i iniciar una sessió sense crear cap contrasenya nova."
 
-#: openidsettings.php:100
-msgid "Add OpenID"
-msgstr "Afegeix una connexió OpenID"
+msgid "Continue"
+msgstr "Continua"
 
-#: openidsettings.php:103
-msgid ""
-"If you want to add an OpenID to your account, enter it in the box below and "
-"click \"Add\"."
-msgstr ""
-"Si voleu afegir una connexió OpenID al vostre compte, introduïu-la en la "
-"caixa a continuació i feu clic a «Afegeix»."
-
-#. TRANS: OpenID plugin logon form field label.
-#: openidsettings.php:108 OpenIDPlugin.php:703 openidlogin.php:152
-msgid "OpenID URL"
-msgstr "URL de la connexió OpenID"
-
-#: openidsettings.php:118
-msgid "Add"
-msgstr "Afegeix"
-
-#: openidsettings.php:130
-msgid "Remove OpenID"
-msgstr "Suprimeix la connexió OpenID"
-
-#: openidsettings.php:135
-msgid ""
-"Removing your only OpenID would make it impossible to log in! If you need to "
-"remove it, add another OpenID first."
-msgstr ""
-"Si suprimiu la vostra única connexió OpenID, serà impossible que hi inicieu "
-"cap sessió. Si cal que la suprimiu, primer afegiu-ne una altra."
-
-#: openidsettings.php:150
-msgid ""
-"You can remove an OpenID from your account by clicking the button marked "
-"\"Remove\"."
-msgstr ""
-"Podeu suprimir una connexió OpenID del vostre compte si feu clic al botó "
-"marcat amb «Suprimeix»."
-
-#: openidsettings.php:173 openidsettings.php:214
-msgid "Remove"
-msgstr "Suprimeix"
-
-#: openidsettings.php:187
-msgid "OpenID Trusted Sites"
-msgstr "Llocs de confiança de l'OpenID"
-
-#: openidsettings.php:190
-msgid ""
-"The following sites are allowed to access your identity and log you in. You "
-"can remove a site from this list to deny it access to your OpenID."
-msgstr ""
-
-#. TRANS: Message given when there is a problem with the user's session token.
-#: openidsettings.php:232 finishopenidlogin.php:42
-msgid "There was a problem with your session token. Try again, please."
-msgstr ""
-"S'ha produït un problema amb el vostre testimoni de sessió. Proveu-ho de nou."
-
-#: openidsettings.php:239
-msgid "Can't add new providers."
-msgstr "No es poden afegir proveïdors nous."
-
-#: openidsettings.php:252
-msgid "Something weird happened."
-msgstr "Ha passat quelcom estrany."
-
-#: openidsettings.php:276
-msgid "No such OpenID trustroot."
-msgstr ""
-
-#: openidsettings.php:280
-msgid "Trustroots removed"
-msgstr ""
-
-#: openidsettings.php:303
-msgid "No such OpenID."
-msgstr "No existeix l'OpenID."
-
-#: openidsettings.php:308
-msgid "That OpenID does not belong to you."
-msgstr "Aquest OpenID no us pertany."
-
-#: openidsettings.php:312
-msgid "OpenID removed."
-msgstr "S'ha suprimit l'OpenID."
-
-#: openidadminpanel.php:54
-msgid "OpenID"
-msgstr "OpenID"
-
-#: openidadminpanel.php:147
-msgid "Invalid provider URL. Max length is 255 characters."
-msgstr ""
-
-#: openidadminpanel.php:153
-msgid "Invalid team name. Max length is 255 characters."
-msgstr ""
-
-#: openidadminpanel.php:210
-msgid "Trusted provider"
-msgstr "Proveïdor de confiança"
-
-#: openidadminpanel.php:212
-msgid ""
-"By default, users are allowed to authenticate with any OpenID provider. If "
-"you are using your own OpenID service for shared sign-in, you can restrict "
-"access to only your own users here."
-msgstr ""
-"Per defecte, els usuaris poden autenticar-se amb qualsevol proveïdor "
-"d'OpenID. Si feu servir el vostre servei d'OpenID propi per a sessions "
-"compartides, podeu restringir l'accés només als usuaris propis des d'aquí."
-
-#: openidadminpanel.php:220
-msgid "Provider URL"
-msgstr "URL del proveïdor"
-
-#: openidadminpanel.php:221
-msgid ""
-"All OpenID logins will be sent to this URL; other providers may not be used."
-msgstr ""
-
-#: openidadminpanel.php:228
-msgid "Append a username to base URL"
-msgstr ""
-
-#: openidadminpanel.php:230
-msgid ""
-"Login form will show the base URL and prompt for a username to add at the "
-"end. Use when OpenID provider URL should be the profile page for individual "
-"users."
-msgstr ""
-
-#: openidadminpanel.php:238
-msgid "Required team"
-msgstr "Equip necessari"
-
-#: openidadminpanel.php:239
-msgid "Only allow logins from users in the given team (Launchpad extension)."
-msgstr ""
-
-#: openidadminpanel.php:251
-msgid "Options"
-msgstr "Opcions"
-
-#: openidadminpanel.php:258
-msgid "Enable OpenID-only mode"
-msgstr ""
-
-#: openidadminpanel.php:260
-msgid ""
-"Require all users to login via OpenID. Warning: disables password "
-"authentication for all users!"
-msgstr ""
-
-#: openidadminpanel.php:278
-msgid "Save OpenID settings"
-msgstr "Desa els paràmetres de l'OpenID"
-
-#. TRANS: OpenID plugin server error.
-#: openid.php:138
-msgid "Cannot instantiate OpenID consumer object."
-msgstr ""
-
-#. TRANS: OpenID plugin message. Given when an OpenID is not valid.
-#: openid.php:150
-msgid "Not a valid OpenID."
-msgstr "No és un OpenID vàlid."
-
-#. TRANS: OpenID plugin server error. Given when the OpenID authentication request fails.
-#. TRANS: %s is the failure message.
-#: openid.php:155
-#, php-format
-msgid "OpenID failure: %s"
-msgstr "Fallada de l'OpenID: %s"
-
-#. TRANS: OpenID plugin server error. Given when the OpenID authentication request cannot be redirected.
-#. TRANS: %s is the failure message.
-#: openid.php:205
-#, php-format
-msgid "Could not redirect to server: %s"
-msgstr "No es pot redirigir al servidor: %s"
-
-#. TRANS: OpenID plugin user instructions.
-#: openid.php:244
-msgid ""
-"This form should automatically submit itself. If not, click the submit "
-"button to go to your OpenID provider."
-msgstr ""
-"Aquest formulari s'hauria de trametre automàticament per si mateix. Si no, "
-"feu clic al botó de tramesa per anar al vostre proveïdor OpenID."
-
-#. TRANS: OpenID plugin server error.
-#: openid.php:280
-msgid "Error saving the profile."
-msgstr "Error en desar el perfil."
-
-#. TRANS: OpenID plugin server error.
-#: openid.php:292
-msgid "Error saving the user."
-msgstr "Error en desar l'usuari."
-
-#. TRANS: OpenID plugin client exception (403).
-#: openid.php:322
-msgid "Unauthorized URL used for OpenID login."
-msgstr ""
-"S'ha fet servir un URL no autoritzat per a l'inici de sessió de l'OpenID."
-
-#. TRANS: Title
-#: openid.php:370
-msgid "OpenID Login Submission"
-msgstr "Tramesa d'inici de sessió d'OpenID"
-
-#. TRANS: OpenID plugin message used while requesting authorization user's OpenID login provider.
-#: openid.php:381
-msgid "Requesting authorization from your login provider..."
-msgstr "S'està sol·licitant autorització del vostre proveïdor de sessió..."
-
-#. TRANS: OpenID plugin message. User instruction while requesting authorization user's OpenID login provider.
-#: openid.php:385
-msgid ""
-"If you are not redirected to your login provider in a few seconds, try "
-"pushing the button below."
-msgstr ""
-"Si no se us redirigeix al vostre proveïdor de sessió en uns pocs segons, "
-"proveu de prémer el botó de sota."
+msgid "Cancel"
+msgstr "Cancel·la"
 
 #. TRANS: Tooltip for main menu option "Login"
-#: OpenIDPlugin.php:218
 msgctxt "TOOLTIP"
 msgid "Login to the site"
 msgstr "Inicia una sessió al lloc"
 
 #. TRANS: Main menu option when not logged in to log in
-#: OpenIDPlugin.php:221
 msgctxt "MENU"
 msgid "Login"
 msgstr "Inicia una sessió"
 
 #. TRANS: Tooltip for main menu option "Help"
-#: OpenIDPlugin.php:226
 msgctxt "TOOLTIP"
 msgid "Help me!"
 msgstr "Ajuda'm!"
 
 #. TRANS: Main menu option for help on the StatusNet site
-#: OpenIDPlugin.php:229
 msgctxt "MENU"
 msgid "Help"
 msgstr "Ajuda"
 
 #. TRANS: Tooltip for main menu option "Search"
-#: OpenIDPlugin.php:235
 msgctxt "TOOLTIP"
 msgid "Search for people or text"
 msgstr "Cerca gent o un text"
 
 #. TRANS: Main menu option when logged in or when the StatusNet instance is not private
-#: OpenIDPlugin.php:238
 msgctxt "MENU"
 msgid "Search"
 msgstr "Cerca"
@@ -303,92 +77,75 @@ msgstr "Cerca"
 #. TRANS: OpenID plugin menu item on site logon page.
 #. TRANS: OpenID plugin menu item on user settings page.
 #. TRANS: OpenID configuration menu item.
-#: OpenIDPlugin.php:295 OpenIDPlugin.php:331 OpenIDPlugin.php:605
 msgctxt "MENU"
 msgid "OpenID"
 msgstr "OpenID"
 
 #. TRANS: OpenID plugin tooltip for logon menu item.
-#: OpenIDPlugin.php:297
 msgid "Login or register with OpenID"
 msgstr "Inici de sessió o registre amb OpenID"
 
 #. TRANS: OpenID plugin tooltip for user settings menu item.
-#: OpenIDPlugin.php:333
 msgid "Add or remove OpenIDs"
 msgstr "Afegeix o suprimeix connexions OpenID"
 
 #. TRANS: Tooltip for OpenID configuration menu item.
-#: OpenIDPlugin.php:607
 msgid "OpenID configuration"
 msgstr "Configuració de l'OpenID"
 
 #. TRANS: OpenID plugin description.
-#: OpenIDPlugin.php:653
 msgid "Use <a href=\"http://openid.net/\">OpenID</a> to login to the site."
 msgstr ""
 "Fa servir <a href=\"http://openid.net/\">OpenID</a> per connectar-se al lloc."
 
 #. TRANS: button label for OAuth authorization page when needing OpenID authentication first.
-#: OpenIDPlugin.php:663
 msgctxt "BUTTON"
 msgid "Continue"
 msgstr "Continua"
 
 #. TRANS: OpenID plugin logon form legend.
-#: OpenIDPlugin.php:680 openidlogin.php:132
 msgid "OpenID login"
 msgstr "Inici de sessió amb OpenID"
 
 #. TRANS: Field label.
-#: OpenIDPlugin.php:688 openidlogin.php:139
 msgid "OpenID provider"
 msgstr "Proveïdor d'OpenID"
 
 #. TRANS: Form guide.
-#: OpenIDPlugin.php:697 openidlogin.php:147
 msgid "Enter your username."
 msgstr "Introduïu el vostre nom d'usuari."
 
 #. TRANS: Form guide.
-#: OpenIDPlugin.php:699 openidlogin.php:148
 msgid "You will be sent to the provider's site for authentication."
 msgstr "Se us portarà al lloc del proveïdor perquè us hi autentiqueu."
 
+#. TRANS: OpenID plugin logon form field label.
+msgid "OpenID URL"
+msgstr "URL de la connexió OpenID"
+
 #. TRANS: OpenID plugin logon form field instructions.
-#: OpenIDPlugin.php:706 openidlogin.php:155
 msgid "Your OpenID URL"
 msgstr "L'URL del vostre OpenID"
 
-#. TRANS: OpenID plugin client error given trying to add an unauthorised OpenID to a user (403).
-#: openidserver.php:116
-#, php-format
-msgid "You are not authorized to use the identity %s."
-msgstr "No esteu autoritzar a utilitzar la identitat %s."
-
-#. TRANS: OpenID plugin client error given when not getting a response for a given OpenID provider (500).
-#: openidserver.php:137
-msgid "Just an OpenID provider. Nothing to see here, move along..."
-msgstr "Només un proveïdor OpenID. Res per veure aquí, movem-nos-en…"
-
 #. TRANS: Client error message trying to log on with OpenID while already logged on.
-#: finishopenidlogin.php:37 openidlogin.php:33
 msgid "Already logged in."
 msgstr "Ja heu iniciat una sessió."
 
+#. TRANS: Message given when there is a problem with the user's session token.
+msgid "There was a problem with your session token. Try again, please."
+msgstr ""
+"S'ha produït un problema amb el vostre testimoni de sessió. Proveu-ho de nou."
+
 #. TRANS: Message given if user does not agree with the site's license.
-#: finishopenidlogin.php:48
 msgid "You can't register if you don't agree to the license."
 msgstr "No podeu registrar-vos-hi si no accepteu la llicència."
 
 #. TRANS: Messag given on an unknown error.
-#: finishopenidlogin.php:57
 msgid "An unknown error has occured."
 msgstr "S'ha produït un error desconegut."
 
 #. TRANS: Instructions given after a first successful logon using OpenID.
 #. TRANS: %s is the site name.
-#: finishopenidlogin.php:73
 #, php-format
 msgid ""
 "This is the first time you've logged into %s so we must connect your OpenID "
@@ -400,74 +157,60 @@ msgstr ""
 "connectar-vos-hi amb un compte ja existent si en teniu un."
 
 #. TRANS: Title
-#: finishopenidlogin.php:80
 msgid "OpenID Account Setup"
 msgstr "Configuració del compte OpenID"
 
-#: finishopenidlogin.php:117
 msgid "Create new account"
 msgstr "Crea un compte nou"
 
-#: finishopenidlogin.php:119
 msgid "Create a new user with this nickname."
 msgstr "Crea un usuari nou amb aquest sobrenom."
 
-#: finishopenidlogin.php:126
 msgid "New nickname"
 msgstr "Nou sobrenom"
 
-#: finishopenidlogin.php:128
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr ""
 
 #. TRANS: Button label in form in which to create a new user on the site for an OpenID.
-#: finishopenidlogin.php:162
 msgctxt "BUTTON"
 msgid "Create"
 msgstr "Crea"
 
 #. TRANS: Used as form legend for form in which to connect an OpenID to an existing user on the site.
-#: finishopenidlogin.php:176
 msgid "Connect existing account"
 msgstr "Connecta un compte ja existent"
 
 #. TRANS: User instructions for form in which to connect an OpenID to an existing user on the site.
-#: finishopenidlogin.php:179
 msgid ""
 "If you already have an account, login with your username and password to "
 "connect it to your OpenID."
 msgstr ""
 
 #. TRANS: Field label in form in which to connect an OpenID to an existing user on the site.
-#: finishopenidlogin.php:183
 msgid "Existing nickname"
 msgstr "Sobrenom ja existent"
 
 #. TRANS: Field label in form in which to connect an OpenID to an existing user on the site.
-#: finishopenidlogin.php:187
 msgid "Password"
 msgstr "Contrasenya"
 
 #. TRANS: Button label in form in which to connect an OpenID to an existing user on the site.
-#: finishopenidlogin.php:191
 msgctxt "BUTTON"
 msgid "Connect"
 msgstr "Connecta-hi"
 
 #. TRANS: Status message in case the response from the OpenID provider is that the logon attempt was cancelled.
-#: finishopenidlogin.php:237 finishaddopenid.php:90
 msgid "OpenID authentication cancelled."
 msgstr "S'ha cancel·lat l'autenticació OpenID."
 
 #. TRANS: OpenID authentication failed; display the error message. %s is the error message.
 #. TRANS: OpenID authentication failed; display the error message.
 #. TRANS: %s is the error message.
-#: finishopenidlogin.php:241 finishaddopenid.php:95
 #, php-format
 msgid "OpenID authentication failed: %s"
 msgstr "Ha fallat l'autenticació OpenID: %s"
 
-#: finishopenidlogin.php:261 finishaddopenid.php:111
 msgid ""
 "OpenID authentication aborted: you are not allowed to login to this site."
 msgstr ""
@@ -476,50 +219,263 @@ msgstr ""
 
 #. TRANS: OpenID plugin message. No new user registration is allowed on the site.
 #. TRANS: OpenID plugin message. No new user registration is allowed on the site without an invitation code, and none was provided.
-#: finishopenidlogin.php:317 finishopenidlogin.php:327
 msgid "Registration not allowed."
 msgstr "No es permet el registre."
 
 #. TRANS: OpenID plugin message. No new user registration is allowed on the site without an invitation code, and the one provided was not valid.
-#: finishopenidlogin.php:335
 msgid "Not a valid invitation code."
 msgstr "No és un codi d'invitació vàlid."
 
 #. TRANS: OpenID plugin message. The entered new user name is blacklisted.
-#: finishopenidlogin.php:349
 msgid "Nickname not allowed."
 msgstr "No es permet el sobrenom."
 
 #. TRANS: OpenID plugin message. The entered new user name is already used.
-#: finishopenidlogin.php:355
 msgid "Nickname already in use. Try another one."
 msgstr "El sobrenom ja és en ús. Proveu-ne un altre."
 
 #. TRANS: OpenID plugin server error. A stored OpenID cannot be retrieved.
 #. TRANS: OpenID plugin server error. A stored OpenID cannot be found.
-#: finishopenidlogin.php:363 finishopenidlogin.php:449
 msgid "Stored OpenID not found."
 msgstr "No s'ha trobat la connexió OpenID emmagatzemada."
 
 #. TRANS: OpenID plugin server error.
-#: finishopenidlogin.php:373
 msgid "Creating new account for OpenID that already has a user."
 msgstr ""
 "S'està creant un compte nou per a una connexió OpenID que ja té un usuari."
 
 #. TRANS: OpenID plugin message.
-#: finishopenidlogin.php:437
 msgid "Invalid username or password."
 msgstr "El nom d'usuari o la contrasenya no són vàlids."
 
 #. TRANS: OpenID plugin server error. The user or user profile could not be saved.
-#: finishopenidlogin.php:457
 msgid "Error connecting user to OpenID."
 msgstr "S'ha produït un error en connectar l'usuari amb la connexió OpenID."
 
+#. TRANS: OpenID plugin server error.
+msgid "Cannot instantiate OpenID consumer object."
+msgstr ""
+
+#. TRANS: OpenID plugin message. Given when an OpenID is not valid.
+msgid "Not a valid OpenID."
+msgstr "No és un OpenID vàlid."
+
+#. TRANS: OpenID plugin server error. Given when the OpenID authentication request fails.
+#. TRANS: %s is the failure message.
+#, php-format
+msgid "OpenID failure: %s"
+msgstr "Fallada de l'OpenID: %s"
+
+#. TRANS: OpenID plugin server error. Given when the OpenID authentication request cannot be redirected.
+#. TRANS: %s is the failure message.
+#, php-format
+msgid "Could not redirect to server: %s"
+msgstr "No es pot redirigir al servidor: %s"
+
+#. TRANS: OpenID plugin user instructions.
+msgid ""
+"This form should automatically submit itself. If not, click the submit "
+"button to go to your OpenID provider."
+msgstr ""
+"Aquest formulari s'hauria de trametre automàticament per si mateix. Si no, "
+"feu clic al botó de tramesa per anar al vostre proveïdor OpenID."
+
+#. TRANS: OpenID plugin server error.
+msgid "Error saving the profile."
+msgstr "Error en desar el perfil."
+
+#. TRANS: OpenID plugin server error.
+msgid "Error saving the user."
+msgstr "Error en desar l'usuari."
+
+#. TRANS: OpenID plugin client exception (403).
+msgid "Unauthorized URL used for OpenID login."
+msgstr ""
+"S'ha fet servir un URL no autoritzat per a l'inici de sessió de l'OpenID."
+
+#. TRANS: Title
+msgid "OpenID Login Submission"
+msgstr "Tramesa d'inici de sessió d'OpenID"
+
+#. TRANS: OpenID plugin message used while requesting authorization user's OpenID login provider.
+msgid "Requesting authorization from your login provider..."
+msgstr "S'està sol·licitant autorització del vostre proveïdor de sessió..."
+
+#. TRANS: OpenID plugin message. User instruction while requesting authorization user's OpenID login provider.
+msgid ""
+"If you are not redirected to your login provider in a few seconds, try "
+"pushing the button below."
+msgstr ""
+"Si no se us redirigeix al vostre proveïdor de sessió en uns pocs segons, "
+"proveu de prémer el botó de sota."
+
+msgid "OpenID"
+msgstr "OpenID"
+
+msgid "OpenID settings"
+msgstr "Paràmetres de l'OpenID"
+
+msgid "Invalid provider URL. Max length is 255 characters."
+msgstr ""
+
+msgid "Invalid team name. Max length is 255 characters."
+msgstr ""
+
+msgid "Trusted provider"
+msgstr "Proveïdor de confiança"
+
+msgid ""
+"By default, users are allowed to authenticate with any OpenID provider. If "
+"you are using your own OpenID service for shared sign-in, you can restrict "
+"access to only your own users here."
+msgstr ""
+"Per defecte, els usuaris poden autenticar-se amb qualsevol proveïdor "
+"d'OpenID. Si feu servir el vostre servei d'OpenID propi per a sessions "
+"compartides, podeu restringir l'accés només als usuaris propis des d'aquí."
+
+msgid "Provider URL"
+msgstr "URL del proveïdor"
+
+msgid ""
+"All OpenID logins will be sent to this URL; other providers may not be used."
+msgstr ""
+
+msgid "Append a username to base URL"
+msgstr ""
+
+msgid ""
+"Login form will show the base URL and prompt for a username to add at the "
+"end. Use when OpenID provider URL should be the profile page for individual "
+"users."
+msgstr ""
+
+msgid "Required team"
+msgstr "Equip necessari"
+
+msgid "Only allow logins from users in the given team (Launchpad extension)."
+msgstr ""
+
+msgid "Options"
+msgstr "Opcions"
+
+msgid "Enable OpenID-only mode"
+msgstr ""
+
+msgid ""
+"Require all users to login via OpenID. Warning: disables password "
+"authentication for all users!"
+msgstr ""
+
+msgid "Save OpenID settings"
+msgstr "Desa els paràmetres de l'OpenID"
+
+#. TRANS: Client error message
+msgid "Not logged in."
+msgstr "No s'ha iniciat una sessió."
+
+#. TRANS: message in case a user tries to add an OpenID that is already connected to them.
+msgid "You already have this OpenID!"
+msgstr "Ja teniu aquest OpenID!"
+
+#. TRANS: message in case a user tries to add an OpenID that is already used by another user.
+msgid "Someone else already has this OpenID."
+msgstr "Algú altre ja té aquest OpenID."
+
+#. TRANS: message in case the OpenID object cannot be connected to the user.
+msgid "Error connecting user."
+msgstr "S'ha produït un error en connectar l'usuari"
+
+#. TRANS: message in case the user or the user profile cannot be saved in StatusNet.
+msgid "Error updating profile"
+msgstr "S'ha produït un error en actualitzar el perfil"
+
+#. TRANS: Title after getting the status of the OpenID authorisation request.
+#. TRANS: OpenID plugin message. Title.
+msgid "OpenID Login"
+msgstr "Inici de sessió amb OpenID"
+
+#, php-format
+msgid ""
+"[OpenID](%%doc.openid%%) lets you log into many sites with the same user "
+"account. Manage your associated OpenIDs from here."
+msgstr ""
+"[OpenID](%%doc.openid%%) us permet iniciar una sessió a molts llocs amb un "
+"mateix compte d'usuari. Gestioneu les vostres connexions OpenID associades "
+"des d'aquí."
+
+msgid "Add OpenID"
+msgstr "Afegeix una connexió OpenID"
+
+msgid ""
+"If you want to add an OpenID to your account, enter it in the box below and "
+"click \"Add\"."
+msgstr ""
+"Si voleu afegir una connexió OpenID al vostre compte, introduïu-la en la "
+"caixa a continuació i feu clic a «Afegeix»."
+
+msgid "Add"
+msgstr "Afegeix"
+
+msgid "Remove OpenID"
+msgstr "Suprimeix la connexió OpenID"
+
+msgid ""
+"Removing your only OpenID would make it impossible to log in! If you need to "
+"remove it, add another OpenID first."
+msgstr ""
+"Si suprimiu la vostra única connexió OpenID, serà impossible que hi inicieu "
+"cap sessió. Si cal que la suprimiu, primer afegiu-ne una altra."
+
+msgid ""
+"You can remove an OpenID from your account by clicking the button marked "
+"\"Remove\"."
+msgstr ""
+"Podeu suprimir una connexió OpenID del vostre compte si feu clic al botó "
+"marcat amb «Suprimeix»."
+
+msgid "Remove"
+msgstr "Suprimeix"
+
+msgid "OpenID Trusted Sites"
+msgstr "Llocs de confiança de l'OpenID"
+
+msgid ""
+"The following sites are allowed to access your identity and log you in. You "
+"can remove a site from this list to deny it access to your OpenID."
+msgstr ""
+
+msgid "Can't add new providers."
+msgstr "No es poden afegir proveïdors nous."
+
+msgid "Something weird happened."
+msgstr "Ha passat quelcom estrany."
+
+msgid "No such OpenID trustroot."
+msgstr ""
+
+msgid "Trustroots removed"
+msgstr ""
+
+msgid "No such OpenID."
+msgstr "No existeix l'OpenID."
+
+msgid "That OpenID does not belong to you."
+msgstr "Aquest OpenID no us pertany."
+
+msgid "OpenID removed."
+msgstr "S'ha suprimit l'OpenID."
+
+#. TRANS: OpenID plugin client error given trying to add an unauthorised OpenID to a user (403).
+#, php-format
+msgid "You are not authorized to use the identity %s."
+msgstr "No esteu autoritzar a utilitzar la identitat %s."
+
+#. TRANS: OpenID plugin client error given when not getting a response for a given OpenID provider (500).
+msgid "Just an OpenID provider. Nothing to see here, move along..."
+msgstr "Només un proveïdor OpenID. Res per veure aquí, movem-nos-en…"
+
 #. TRANS: OpenID plugin message. Rememberme logins have to reauthenticate before changing any profile settings.
 #. TRANS: "OpenID" is the display text for a link with URL "(%%doc.openid%%)".
-#: openidlogin.php:74
 #, php-format
 msgid ""
 "For security reasons, please re-login with your [OpenID](%%doc.openid%%) "
@@ -530,84 +486,21 @@ msgstr ""
 
 #. TRANS: OpenID plugin message.
 #. TRANS: "OpenID" is the display text for a link with URL "(%%doc.openid%%)".
-#: openidlogin.php:80
 #, php-format
 msgid "Login with an [OpenID](%%doc.openid%%) account."
 msgstr "Inicia una sessió amb un compte [OpenID](%%doc.openid%%)."
 
-#. TRANS: OpenID plugin message. Title.
-#. TRANS: Title after getting the status of the OpenID authorisation request.
-#: openidlogin.php:114 finishaddopenid.php:187
-msgid "OpenID Login"
-msgstr "Inici de sessió amb OpenID"
-
 #. TRANS: OpenID plugin logon form checkbox label for setting to put the OpenID information in a cookie.
-#: openidlogin.php:160
 msgid "Remember me"
 msgstr "Recorda'm"
 
 #. TRANS: OpenID plugin logon form field instructions.
-#: openidlogin.php:162
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 "Inicia una sessió automàticament en el futur; no recomanable en ordinadors "
 "compartits!"
 
 #. TRANS: OpenID plugin logon form button label to start logon with the data provided in the logon form.
-#: openidlogin.php:167
 msgctxt "BUTTON"
 msgid "Login"
 msgstr "Inicia una sessió"
-
-#: openidtrust.php:52
-msgid "OpenID Identity Verification"
-msgstr "Verificació de la identitat d'OpenID"
-
-#: openidtrust.php:70
-msgid ""
-"This page should only be reached during OpenID processing, not directly."
-msgstr ""
-"Hauria d'arribar-se a aquesta pàgina només durant el processament de "
-"l'OpenID, no directament."
-
-#: openidtrust.php:118
-#, php-format
-msgid ""
-"%s  has asked to verify your identity. Click Continue to verify your "
-"identity and login without creating a new password."
-msgstr ""
-"%s  us ha demanat verificar la identitat. Feu clic a Continuar per verificar "
-"la vostra identitat i iniciar una sessió sense crear cap contrasenya nova."
-
-#: openidtrust.php:136
-msgid "Continue"
-msgstr "Continua"
-
-#: openidtrust.php:137
-msgid "Cancel"
-msgstr "Cancel·la"
-
-#. TRANS: Client error message
-#: finishaddopenid.php:68
-msgid "Not logged in."
-msgstr "No s'ha iniciat una sessió."
-
-#. TRANS: message in case a user tries to add an OpenID that is already connected to them.
-#: finishaddopenid.php:122
-msgid "You already have this OpenID!"
-msgstr "Ja teniu aquest OpenID!"
-
-#. TRANS: message in case a user tries to add an OpenID that is already used by another user.
-#: finishaddopenid.php:125
-msgid "Someone else already has this OpenID."
-msgstr "Algú altre ja té aquest OpenID."
-
-#. TRANS: message in case the OpenID object cannot be connected to the user.
-#: finishaddopenid.php:138
-msgid "Error connecting user."
-msgstr "S'ha produït un error en connectar l'usuari"
-
-#. TRANS: message in case the user or the user profile cannot be saved in StatusNet.
-#: finishaddopenid.php:145
-msgid "Error updating profile"
-msgstr "S'ha produït un error en actualitzar el perfil"
diff --git a/plugins/OpenID/locale/de/LC_MESSAGES/OpenID.po b/plugins/OpenID/locale/de/LC_MESSAGES/OpenID.po
index ef8fec98b1..f8a0612903 100644
--- a/plugins/OpenID/locale/de/LC_MESSAGES/OpenID.po
+++ b/plugins/OpenID/locale/de/LC_MESSAGES/OpenID.po
@@ -11,303 +11,68 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OpenID\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:34+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:49+0000\n"
 "Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-14 17:22:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:46:02+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-openid\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: openidsettings.php:58 openidadminpanel.php:65
-msgid "OpenID settings"
-msgstr "OpenID-Einstellungen"
+msgid "OpenID Identity Verification"
+msgstr "OpenID-Identitätsverifikation"
+
+msgid ""
+"This page should only be reached during OpenID processing, not directly."
+msgstr ""
+"Diese Seite sollte nur während der Abwicklung von OpenID erreicht werden, "
+"nicht direkt."
 
-#: openidsettings.php:69
 #, php-format
 msgid ""
-"[OpenID](%%doc.openid%%) lets you log into many sites with the same user "
-"account. Manage your associated OpenIDs from here."
+"%s  has asked to verify your identity. Click Continue to verify your "
+"identity and login without creating a new password."
 msgstr ""
-"[OpenID](%%doc.openid%%) erlaubt die, dich auf vielen Seiten mit dem selben "
-"Benutzerkonto anzumelden. Verwalte deine verknüpften OpenIDs von hier aus."
+"%s hat dich gebeten, deine Identität zu bestätigen. Klicke auf „Weiter“, um "
+"deine Identität zu bestätigen und dich anzumelden ohne ein neues Passwort zu "
+"erstellen."
 
-#: openidsettings.php:100
-msgid "Add OpenID"
-msgstr "OpenID hinzufügen"
+msgid "Continue"
+msgstr "Weiter"
 
-#: openidsettings.php:103
-msgid ""
-"If you want to add an OpenID to your account, enter it in the box below and "
-"click \"Add\"."
-msgstr ""
-"Falls du eine OpenID zu deinem Konto hinzufügen willst, trage sie in dem "
-"nachfolgenden Feld ein und klicke auf „Hinzufügen“."
-
-#. TRANS: OpenID plugin logon form field label.
-#: openidsettings.php:108 OpenIDPlugin.php:703 openidlogin.php:152
-msgid "OpenID URL"
-msgstr "OpenID-URL"
-
-#: openidsettings.php:118
-msgid "Add"
-msgstr "Hinzufügen"
-
-#: openidsettings.php:130
-msgid "Remove OpenID"
-msgstr "Entfernen der OpenID"
-
-#: openidsettings.php:135
-msgid ""
-"Removing your only OpenID would make it impossible to log in! If you need to "
-"remove it, add another OpenID first."
-msgstr ""
-"Das Entfernen der einzigen OpenID würde das Einloggen unmöglich machen! "
-"Falls du sie entfernen musst, füge zuerst eine andere hinzu."
-
-#: openidsettings.php:150
-msgid ""
-"You can remove an OpenID from your account by clicking the button marked "
-"\"Remove\"."
-msgstr ""
-"Du kannst eine OpenID von deinem Konto entfernen, indem du auf den Button "
-"„Entfernen“ klickst."
-
-#: openidsettings.php:173 openidsettings.php:214
-msgid "Remove"
-msgstr "Entfernen"
-
-#: openidsettings.php:187
-msgid "OpenID Trusted Sites"
-msgstr "Vertrauenswürdige OpenID-Seiten"
-
-#: openidsettings.php:190
-msgid ""
-"The following sites are allowed to access your identity and log you in. You "
-"can remove a site from this list to deny it access to your OpenID."
-msgstr ""
-"Den folgenden Seiten ist es erlaubt, deine Identität abzufragen und dich "
-"damit anzumelden. Du kannst eine Website aus dieser Liste entfernen, um ihr "
-"den Zugriff auf deine OpenID zu verweigern."
-
-#. TRANS: Message given when there is a problem with the user's session token.
-#: openidsettings.php:232 finishopenidlogin.php:42
-msgid "There was a problem with your session token. Try again, please."
-msgstr "Es gab ein Problem mit deinem Sitzungstoken. Bitte versuche es erneut."
-
-#: openidsettings.php:239
-msgid "Can't add new providers."
-msgstr "Kann keine neuen Provider hinzufügen"
-
-#: openidsettings.php:252
-msgid "Something weird happened."
-msgstr "Etwas Seltsames ist passiert."
-
-#: openidsettings.php:276
-msgid "No such OpenID trustroot."
-msgstr "Keine solche OpenID trustroot."
-
-#: openidsettings.php:280
-msgid "Trustroots removed"
-msgstr "Trustroots entfernt"
-
-#: openidsettings.php:303
-msgid "No such OpenID."
-msgstr "Keine solche OpenID."
-
-#: openidsettings.php:308
-msgid "That OpenID does not belong to you."
-msgstr "Diese OpenID gehört dir nicht."
-
-#: openidsettings.php:312
-msgid "OpenID removed."
-msgstr "OpenID entfernt."
-
-#: openidadminpanel.php:54
-msgid "OpenID"
-msgstr "OpenID"
-
-#: openidadminpanel.php:147
-msgid "Invalid provider URL. Max length is 255 characters."
-msgstr "Ungültige Provider-URL. Maximale Länge beträgt 255 Zeichen."
-
-#: openidadminpanel.php:153
-msgid "Invalid team name. Max length is 255 characters."
-msgstr "Ungültiger Teamnamen. Maximale Länge beträgt 255 Zeichen."
-
-#: openidadminpanel.php:210
-msgid "Trusted provider"
-msgstr "Vertrauenswürdiger Provider"
-
-#: openidadminpanel.php:212
-msgid ""
-"By default, users are allowed to authenticate with any OpenID provider. If "
-"you are using your own OpenID service for shared sign-in, you can restrict "
-"access to only your own users here."
-msgstr ""
-"Standardmäßig dürfen sich Benutzer mit jedem OpenID-Provider "
-"authentifizieren. Wenn du deinen eigenen OpenID-Servide benutzt, kannst du "
-"hier den Zugang auf deine eigenen Benutzer beschränken."
-
-#: openidadminpanel.php:220
-msgid "Provider URL"
-msgstr "Provider-URL"
-
-#: openidadminpanel.php:221
-msgid ""
-"All OpenID logins will be sent to this URL; other providers may not be used."
-msgstr ""
-"Alle OpenID-Anmeldungen werden an diese URL gesendet; andere Provider können "
-"nicht verwendet werden."
-
-#: openidadminpanel.php:228
-msgid "Append a username to base URL"
-msgstr "Einen Benutzernamen an die Basis-URL anfügen"
-
-#: openidadminpanel.php:230
-msgid ""
-"Login form will show the base URL and prompt for a username to add at the "
-"end. Use when OpenID provider URL should be the profile page for individual "
-"users."
-msgstr ""
-"Die Anmelde-Form wird eine Basis-URL anzeigen und um einen Benutzernamen am "
-"Ende bitten. Benutzer dass, wenn die OpenID-Provider-URL die Profilseite "
-"individueller Benutzer sein sollte."
-
-#: openidadminpanel.php:238
-msgid "Required team"
-msgstr "Erforderliche Mannschaft"
-
-#: openidadminpanel.php:239
-msgid "Only allow logins from users in the given team (Launchpad extension)."
-msgstr ""
-"Nur Anmeldungen von Benutzern aus der gegebenen Mannschaft erlauben "
-"(Launchpad-Erweiterung)."
-
-#: openidadminpanel.php:251
-msgid "Options"
-msgstr "Optionen"
-
-#: openidadminpanel.php:258
-msgid "Enable OpenID-only mode"
-msgstr "Nur-OpenID-Modus aktivieren"
-
-#: openidadminpanel.php:260
-msgid ""
-"Require all users to login via OpenID. Warning: disables password "
-"authentication for all users!"
-msgstr ""
-"Von allen Benutzern OpenID-Anmeldung verlangen. Warnung: deaktiviert "
-"Passwort-Authentifizierung aller Benutzer!"
-
-#: openidadminpanel.php:278
-msgid "Save OpenID settings"
-msgstr "OpenId-Einstellungen speichern"
-
-#. TRANS: OpenID plugin server error.
-#: openid.php:138
-msgid "Cannot instantiate OpenID consumer object."
-msgstr "OpenID-Consumer-Objekt kann nicht instanziiert werden."
-
-#. TRANS: OpenID plugin message. Given when an OpenID is not valid.
-#: openid.php:150
-msgid "Not a valid OpenID."
-msgstr "Keine gültige OpenID."
-
-#. TRANS: OpenID plugin server error. Given when the OpenID authentication request fails.
-#. TRANS: %s is the failure message.
-#: openid.php:155
-#, php-format
-msgid "OpenID failure: %s"
-msgstr "OpenId-Fehler: %s"
-
-#. TRANS: OpenID plugin server error. Given when the OpenID authentication request cannot be redirected.
-#. TRANS: %s is the failure message.
-#: openid.php:205
-#, php-format
-msgid "Could not redirect to server: %s"
-msgstr "Konnte keine Verbindung zum Server erstellen: %s"
-
-#. TRANS: OpenID plugin user instructions.
-#: openid.php:244
-msgid ""
-"This form should automatically submit itself. If not, click the submit "
-"button to go to your OpenID provider."
-msgstr ""
-"Dieses Formular sollte automatisch selbst abschicken. Wenn dies nicht der "
-"Fall ist, klicke auf die Schaltfläche Senden, um zu deinem OpenID Provider "
-"zu wechseln."
-
-#. TRANS: OpenID plugin server error.
-#: openid.php:280
-msgid "Error saving the profile."
-msgstr "Fehler beim Speichern des Profils."
-
-#. TRANS: OpenID plugin server error.
-#: openid.php:292
-msgid "Error saving the user."
-msgstr "Fehler beim Speichern des Benutzers."
-
-#. TRANS: OpenID plugin client exception (403).
-#: openid.php:322
-msgid "Unauthorized URL used for OpenID login."
-msgstr "Unauthorisierte URL für OpenID-Anmeldung benutzt."
-
-#. TRANS: Title
-#: openid.php:370
-msgid "OpenID Login Submission"
-msgstr ""
-
-#. TRANS: OpenID plugin message used while requesting authorization user's OpenID login provider.
-#: openid.php:381
-msgid "Requesting authorization from your login provider..."
-msgstr "Authorisierung von deinem Login-Provider wird angefragt …"
-
-#. TRANS: OpenID plugin message. User instruction while requesting authorization user's OpenID login provider.
-#: openid.php:385
-msgid ""
-"If you are not redirected to your login provider in a few seconds, try "
-"pushing the button below."
-msgstr ""
-"Wenn du nicht in wenigen Sekunden zu deinem Login-Provider weitergeleitet "
-"wirst, versuche den Button unten zu klicken."
+msgid "Cancel"
+msgstr "Abbrechen"
 
 #. TRANS: Tooltip for main menu option "Login"
-#: OpenIDPlugin.php:218
 msgctxt "TOOLTIP"
 msgid "Login to the site"
 msgstr "Auf der Seite anmelden"
 
 #. TRANS: Main menu option when not logged in to log in
-#: OpenIDPlugin.php:221
 msgctxt "MENU"
 msgid "Login"
 msgstr "Anmelden"
 
 #. TRANS: Tooltip for main menu option "Help"
-#: OpenIDPlugin.php:226
 msgctxt "TOOLTIP"
 msgid "Help me!"
 msgstr "Hilf mir!"
 
 #. TRANS: Main menu option for help on the StatusNet site
-#: OpenIDPlugin.php:229
 msgctxt "MENU"
 msgid "Help"
 msgstr "Hilfe"
 
 #. TRANS: Tooltip for main menu option "Search"
-#: OpenIDPlugin.php:235
 msgctxt "TOOLTIP"
 msgid "Search for people or text"
 msgstr "Suche nach Leuten oder Text"
 
 #. TRANS: Main menu option when logged in or when the StatusNet instance is not private
-#: OpenIDPlugin.php:238
 msgctxt "MENU"
 msgid "Search"
 msgstr "Suche"
@@ -315,96 +80,78 @@ msgstr "Suche"
 #. TRANS: OpenID plugin menu item on site logon page.
 #. TRANS: OpenID plugin menu item on user settings page.
 #. TRANS: OpenID configuration menu item.
-#: OpenIDPlugin.php:295 OpenIDPlugin.php:331 OpenIDPlugin.php:605
 msgctxt "MENU"
 msgid "OpenID"
 msgstr "OpenID"
 
 #. TRANS: OpenID plugin tooltip for logon menu item.
-#: OpenIDPlugin.php:297
 msgid "Login or register with OpenID"
 msgstr "Anmelden oder Registrieren per OpenID"
 
 #. TRANS: OpenID plugin tooltip for user settings menu item.
-#: OpenIDPlugin.php:333
 msgid "Add or remove OpenIDs"
 msgstr "Hinzufügen oder Entfernen von OpenIDs"
 
 #. TRANS: Tooltip for OpenID configuration menu item.
-#: OpenIDPlugin.php:607
 msgid "OpenID configuration"
 msgstr "OpenId-Konfiguration"
 
 #. TRANS: OpenID plugin description.
-#: OpenIDPlugin.php:653
 msgid "Use <a href=\"http://openid.net/\">OpenID</a> to login to the site."
 msgstr ""
 "Benutzung der <a href=\"http://openid.net/\">OpenID</a> zur Anmeldung auf "
 "der Seite"
 
 #. TRANS: button label for OAuth authorization page when needing OpenID authentication first.
-#: OpenIDPlugin.php:663
 msgctxt "BUTTON"
 msgid "Continue"
 msgstr "Weiter"
 
 #. TRANS: OpenID plugin logon form legend.
-#: OpenIDPlugin.php:680 openidlogin.php:132
 msgid "OpenID login"
 msgstr "OpenID-Benutzername"
 
 #. TRANS: Field label.
-#: OpenIDPlugin.php:688 openidlogin.php:139
 msgid "OpenID provider"
 msgstr "OpenID-Provider"
 
 #. TRANS: Form guide.
-#: OpenIDPlugin.php:697 openidlogin.php:147
 msgid "Enter your username."
 msgstr "Gib deinen Benutzernamen ein."
 
 #. TRANS: Form guide.
-#: OpenIDPlugin.php:699 openidlogin.php:148
 msgid "You will be sent to the provider's site for authentication."
 msgstr ""
 "Du wirst zur Authentifizierung auf die Seite ihres OpenID-Providers "
 "weitergeleitet werden."
 
+#. TRANS: OpenID plugin logon form field label.
+msgid "OpenID URL"
+msgstr "OpenID-URL"
+
 #. TRANS: OpenID plugin logon form field instructions.
-#: OpenIDPlugin.php:706 openidlogin.php:155
 msgid "Your OpenID URL"
 msgstr "Ihre OpenID URL"
 
-#. TRANS: OpenID plugin client error given trying to add an unauthorised OpenID to a user (403).
-#: openidserver.php:116
-#, php-format
-msgid "You are not authorized to use the identity %s."
-msgstr "Du bist nicht berechtigt, die Identität %s zu benutzen."
-
-#. TRANS: OpenID plugin client error given when not getting a response for a given OpenID provider (500).
-#: openidserver.php:137
-msgid "Just an OpenID provider. Nothing to see here, move along..."
-msgstr "Nur ein OpenID-Provider. Hier gibt es nichts zu sehen …"
-
 #. TRANS: Client error message trying to log on with OpenID while already logged on.
-#: finishopenidlogin.php:37 openidlogin.php:33
 msgid "Already logged in."
 msgstr "Bereits angemeldet."
 
+#. TRANS: Message given when there is a problem with the user's session token.
+msgid "There was a problem with your session token. Try again, please."
+msgstr "Es gab ein Problem mit deinem Sitzungstoken. Bitte versuche es erneut."
+
 #. TRANS: Message given if user does not agree with the site's license.
-#: finishopenidlogin.php:48
 msgid "You can't register if you don't agree to the license."
 msgstr ""
 "Du kannst dich nicht registrieren, wenn du die Lizenz nicht akzeptierst."
 
 #. TRANS: Messag given on an unknown error.
-#: finishopenidlogin.php:57
 msgid "An unknown error has occured."
 msgstr "Ein unbekannter Fehler ist aufgetreten."
 
 #. TRANS: Instructions given after a first successful logon using OpenID.
 #. TRANS: %s is the site name.
-#: finishopenidlogin.php:73
 #, php-format
 msgid ""
 "This is the first time you've logged into %s so we must connect your OpenID "
@@ -417,39 +164,31 @@ msgstr ""
 "Benutzerkonto verbinden."
 
 #. TRANS: Title
-#: finishopenidlogin.php:80
 msgid "OpenID Account Setup"
 msgstr "OpenID Konto-Setup"
 
-#: finishopenidlogin.php:117
 msgid "Create new account"
 msgstr "Neues Benutzerkonto erstellen"
 
-#: finishopenidlogin.php:119
 msgid "Create a new user with this nickname."
 msgstr "Neues Benutzerkonto mit diesem Benutzernamen erstellen."
 
-#: finishopenidlogin.php:126
 msgid "New nickname"
 msgstr "Neuer Benutzername"
 
-#: finishopenidlogin.php:128
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "1-64 Kleinbuchstaben oder Zahlen, keine Satz- oder Leerzeichen"
 
 #. TRANS: Button label in form in which to create a new user on the site for an OpenID.
-#: finishopenidlogin.php:162
 msgctxt "BUTTON"
 msgid "Create"
 msgstr "Erstellen"
 
 #. TRANS: Used as form legend for form in which to connect an OpenID to an existing user on the site.
-#: finishopenidlogin.php:176
 msgid "Connect existing account"
 msgstr "Bestehendes Benutzerkonto verbinden"
 
 #. TRANS: User instructions for form in which to connect an OpenID to an existing user on the site.
-#: finishopenidlogin.php:179
 msgid ""
 "If you already have an account, login with your username and password to "
 "connect it to your OpenID."
@@ -458,35 +197,29 @@ msgstr ""
 "und Passwort an, um ihn mit deiner OpenID zu verbinden."
 
 #. TRANS: Field label in form in which to connect an OpenID to an existing user on the site.
-#: finishopenidlogin.php:183
 msgid "Existing nickname"
 msgstr "Bestehender Benutzername"
 
 #. TRANS: Field label in form in which to connect an OpenID to an existing user on the site.
-#: finishopenidlogin.php:187
 msgid "Password"
 msgstr "Passwort"
 
 #. TRANS: Button label in form in which to connect an OpenID to an existing user on the site.
-#: finishopenidlogin.php:191
 msgctxt "BUTTON"
 msgid "Connect"
 msgstr "Verbinden"
 
 #. TRANS: Status message in case the response from the OpenID provider is that the logon attempt was cancelled.
-#: finishopenidlogin.php:237 finishaddopenid.php:90
 msgid "OpenID authentication cancelled."
 msgstr "OpenID-Authentifizierung abgebrochen."
 
 #. TRANS: OpenID authentication failed; display the error message. %s is the error message.
 #. TRANS: OpenID authentication failed; display the error message.
 #. TRANS: %s is the error message.
-#: finishopenidlogin.php:241 finishaddopenid.php:95
 #, php-format
 msgid "OpenID authentication failed: %s"
 msgstr "OpenID-Authentifizierung gescheitert: %s"
 
-#: finishopenidlogin.php:261 finishaddopenid.php:111
 msgid ""
 "OpenID authentication aborted: you are not allowed to login to this site."
 msgstr ""
@@ -495,49 +228,273 @@ msgstr ""
 
 #. TRANS: OpenID plugin message. No new user registration is allowed on the site.
 #. TRANS: OpenID plugin message. No new user registration is allowed on the site without an invitation code, and none was provided.
-#: finishopenidlogin.php:317 finishopenidlogin.php:327
 msgid "Registration not allowed."
 msgstr "Registrierung nicht erlaubt."
 
 #. TRANS: OpenID plugin message. No new user registration is allowed on the site without an invitation code, and the one provided was not valid.
-#: finishopenidlogin.php:335
 msgid "Not a valid invitation code."
 msgstr "Kein gültiger Einladungscode."
 
 #. TRANS: OpenID plugin message. The entered new user name is blacklisted.
-#: finishopenidlogin.php:349
 msgid "Nickname not allowed."
 msgstr "Benutzername nicht erlaubt."
 
 #. TRANS: OpenID plugin message. The entered new user name is already used.
-#: finishopenidlogin.php:355
 msgid "Nickname already in use. Try another one."
 msgstr "Benutzername wird bereits verwendet. Suche dir einen anderen aus."
 
 #. TRANS: OpenID plugin server error. A stored OpenID cannot be retrieved.
 #. TRANS: OpenID plugin server error. A stored OpenID cannot be found.
-#: finishopenidlogin.php:363 finishopenidlogin.php:449
 msgid "Stored OpenID not found."
 msgstr "Gespeicherte OpenID nicht gefunden."
 
 #. TRANS: OpenID plugin server error.
-#: finishopenidlogin.php:373
 msgid "Creating new account for OpenID that already has a user."
 msgstr ""
 
 #. TRANS: OpenID plugin message.
-#: finishopenidlogin.php:437
 msgid "Invalid username or password."
 msgstr "Benutzername oder Passwort falsch."
 
 #. TRANS: OpenID plugin server error. The user or user profile could not be saved.
-#: finishopenidlogin.php:457
 msgid "Error connecting user to OpenID."
 msgstr "Fehler bei der Verbindung des Benutzers mit OpenID."
 
+#. TRANS: OpenID plugin server error.
+msgid "Cannot instantiate OpenID consumer object."
+msgstr "OpenID-Consumer-Objekt kann nicht instanziiert werden."
+
+#. TRANS: OpenID plugin message. Given when an OpenID is not valid.
+msgid "Not a valid OpenID."
+msgstr "Keine gültige OpenID."
+
+#. TRANS: OpenID plugin server error. Given when the OpenID authentication request fails.
+#. TRANS: %s is the failure message.
+#, php-format
+msgid "OpenID failure: %s"
+msgstr "OpenId-Fehler: %s"
+
+#. TRANS: OpenID plugin server error. Given when the OpenID authentication request cannot be redirected.
+#. TRANS: %s is the failure message.
+#, php-format
+msgid "Could not redirect to server: %s"
+msgstr "Konnte keine Verbindung zum Server erstellen: %s"
+
+#. TRANS: OpenID plugin user instructions.
+msgid ""
+"This form should automatically submit itself. If not, click the submit "
+"button to go to your OpenID provider."
+msgstr ""
+"Dieses Formular sollte automatisch selbst abschicken. Wenn dies nicht der "
+"Fall ist, klicke auf die Schaltfläche Senden, um zu deinem OpenID Provider "
+"zu wechseln."
+
+#. TRANS: OpenID plugin server error.
+msgid "Error saving the profile."
+msgstr "Fehler beim Speichern des Profils."
+
+#. TRANS: OpenID plugin server error.
+msgid "Error saving the user."
+msgstr "Fehler beim Speichern des Benutzers."
+
+#. TRANS: OpenID plugin client exception (403).
+msgid "Unauthorized URL used for OpenID login."
+msgstr "Unauthorisierte URL für OpenID-Anmeldung benutzt."
+
+#. TRANS: Title
+msgid "OpenID Login Submission"
+msgstr ""
+
+#. TRANS: OpenID plugin message used while requesting authorization user's OpenID login provider.
+msgid "Requesting authorization from your login provider..."
+msgstr "Authorisierung von deinem Login-Provider wird angefragt …"
+
+#. TRANS: OpenID plugin message. User instruction while requesting authorization user's OpenID login provider.
+msgid ""
+"If you are not redirected to your login provider in a few seconds, try "
+"pushing the button below."
+msgstr ""
+"Wenn du nicht in wenigen Sekunden zu deinem Login-Provider weitergeleitet "
+"wirst, versuche den Button unten zu klicken."
+
+msgid "OpenID"
+msgstr "OpenID"
+
+msgid "OpenID settings"
+msgstr "OpenID-Einstellungen"
+
+msgid "Invalid provider URL. Max length is 255 characters."
+msgstr "Ungültige Provider-URL. Maximale Länge beträgt 255 Zeichen."
+
+msgid "Invalid team name. Max length is 255 characters."
+msgstr "Ungültiger Teamnamen. Maximale Länge beträgt 255 Zeichen."
+
+msgid "Trusted provider"
+msgstr "Vertrauenswürdiger Provider"
+
+msgid ""
+"By default, users are allowed to authenticate with any OpenID provider. If "
+"you are using your own OpenID service for shared sign-in, you can restrict "
+"access to only your own users here."
+msgstr ""
+"Standardmäßig dürfen sich Benutzer mit jedem OpenID-Provider "
+"authentifizieren. Wenn du deinen eigenen OpenID-Servide benutzt, kannst du "
+"hier den Zugang auf deine eigenen Benutzer beschränken."
+
+msgid "Provider URL"
+msgstr "Provider-URL"
+
+msgid ""
+"All OpenID logins will be sent to this URL; other providers may not be used."
+msgstr ""
+"Alle OpenID-Anmeldungen werden an diese URL gesendet; andere Provider können "
+"nicht verwendet werden."
+
+msgid "Append a username to base URL"
+msgstr "Einen Benutzernamen an die Basis-URL anfügen"
+
+msgid ""
+"Login form will show the base URL and prompt for a username to add at the "
+"end. Use when OpenID provider URL should be the profile page for individual "
+"users."
+msgstr ""
+"Die Anmelde-Form wird eine Basis-URL anzeigen und um einen Benutzernamen am "
+"Ende bitten. Benutzer dass, wenn die OpenID-Provider-URL die Profilseite "
+"individueller Benutzer sein sollte."
+
+msgid "Required team"
+msgstr "Erforderliche Mannschaft"
+
+msgid "Only allow logins from users in the given team (Launchpad extension)."
+msgstr ""
+"Nur Anmeldungen von Benutzern aus der gegebenen Mannschaft erlauben "
+"(Launchpad-Erweiterung)."
+
+msgid "Options"
+msgstr "Optionen"
+
+msgid "Enable OpenID-only mode"
+msgstr "Nur-OpenID-Modus aktivieren"
+
+msgid ""
+"Require all users to login via OpenID. Warning: disables password "
+"authentication for all users!"
+msgstr ""
+"Von allen Benutzern OpenID-Anmeldung verlangen. Warnung: deaktiviert "
+"Passwort-Authentifizierung aller Benutzer!"
+
+msgid "Save OpenID settings"
+msgstr "OpenId-Einstellungen speichern"
+
+#. TRANS: Client error message
+msgid "Not logged in."
+msgstr "Nicht angemeldet."
+
+#. TRANS: message in case a user tries to add an OpenID that is already connected to them.
+msgid "You already have this OpenID!"
+msgstr "Du hast bereits diese OpenID!"
+
+#. TRANS: message in case a user tries to add an OpenID that is already used by another user.
+msgid "Someone else already has this OpenID."
+msgstr "Jemand anders hat bereits diese Open-ID."
+
+#. TRANS: message in case the OpenID object cannot be connected to the user.
+msgid "Error connecting user."
+msgstr "Fehler beim Verbinden des Benutzers."
+
+#. TRANS: message in case the user or the user profile cannot be saved in StatusNet.
+msgid "Error updating profile"
+msgstr "Fehler beim Aktualisieren des Profils"
+
+#. TRANS: Title after getting the status of the OpenID authorisation request.
+#. TRANS: OpenID plugin message. Title.
+msgid "OpenID Login"
+msgstr "OpenID-Anmeldung"
+
+#, php-format
+msgid ""
+"[OpenID](%%doc.openid%%) lets you log into many sites with the same user "
+"account. Manage your associated OpenIDs from here."
+msgstr ""
+"[OpenID](%%doc.openid%%) erlaubt die, dich auf vielen Seiten mit dem selben "
+"Benutzerkonto anzumelden. Verwalte deine verknüpften OpenIDs von hier aus."
+
+msgid "Add OpenID"
+msgstr "OpenID hinzufügen"
+
+msgid ""
+"If you want to add an OpenID to your account, enter it in the box below and "
+"click \"Add\"."
+msgstr ""
+"Falls du eine OpenID zu deinem Konto hinzufügen willst, trage sie in dem "
+"nachfolgenden Feld ein und klicke auf „Hinzufügen“."
+
+msgid "Add"
+msgstr "Hinzufügen"
+
+msgid "Remove OpenID"
+msgstr "Entfernen der OpenID"
+
+msgid ""
+"Removing your only OpenID would make it impossible to log in! If you need to "
+"remove it, add another OpenID first."
+msgstr ""
+"Das Entfernen der einzigen OpenID würde das Einloggen unmöglich machen! "
+"Falls du sie entfernen musst, füge zuerst eine andere hinzu."
+
+msgid ""
+"You can remove an OpenID from your account by clicking the button marked "
+"\"Remove\"."
+msgstr ""
+"Du kannst eine OpenID von deinem Konto entfernen, indem du auf den Button "
+"„Entfernen“ klickst."
+
+msgid "Remove"
+msgstr "Entfernen"
+
+msgid "OpenID Trusted Sites"
+msgstr "Vertrauenswürdige OpenID-Seiten"
+
+msgid ""
+"The following sites are allowed to access your identity and log you in. You "
+"can remove a site from this list to deny it access to your OpenID."
+msgstr ""
+"Den folgenden Seiten ist es erlaubt, deine Identität abzufragen und dich "
+"damit anzumelden. Du kannst eine Website aus dieser Liste entfernen, um ihr "
+"den Zugriff auf deine OpenID zu verweigern."
+
+msgid "Can't add new providers."
+msgstr "Kann keine neuen Provider hinzufügen"
+
+msgid "Something weird happened."
+msgstr "Etwas Seltsames ist passiert."
+
+msgid "No such OpenID trustroot."
+msgstr "Keine solche OpenID trustroot."
+
+msgid "Trustroots removed"
+msgstr "Trustroots entfernt"
+
+msgid "No such OpenID."
+msgstr "Keine solche OpenID."
+
+msgid "That OpenID does not belong to you."
+msgstr "Diese OpenID gehört dir nicht."
+
+msgid "OpenID removed."
+msgstr "OpenID entfernt."
+
+#. TRANS: OpenID plugin client error given trying to add an unauthorised OpenID to a user (403).
+#, php-format
+msgid "You are not authorized to use the identity %s."
+msgstr "Du bist nicht berechtigt, die Identität %s zu benutzen."
+
+#. TRANS: OpenID plugin client error given when not getting a response for a given OpenID provider (500).
+msgid "Just an OpenID provider. Nothing to see here, move along..."
+msgstr "Nur ein OpenID-Provider. Hier gibt es nichts zu sehen …"
+
 #. TRANS: OpenID plugin message. Rememberme logins have to reauthenticate before changing any profile settings.
 #. TRANS: "OpenID" is the display text for a link with URL "(%%doc.openid%%)".
-#: openidlogin.php:74
 #, php-format
 msgid ""
 "For security reasons, please re-login with your [OpenID](%%doc.openid%%) "
@@ -548,83 +505,19 @@ msgstr ""
 
 #. TRANS: OpenID plugin message.
 #. TRANS: "OpenID" is the display text for a link with URL "(%%doc.openid%%)".
-#: openidlogin.php:80
 #, php-format
 msgid "Login with an [OpenID](%%doc.openid%%) account."
 msgstr "Mit einem [OpenID](%%doc.openid%%)-Benutzerkonto anmelden."
 
-#. TRANS: OpenID plugin message. Title.
-#. TRANS: Title after getting the status of the OpenID authorisation request.
-#: openidlogin.php:114 finishaddopenid.php:187
-msgid "OpenID Login"
-msgstr "OpenID-Anmeldung"
-
 #. TRANS: OpenID plugin logon form checkbox label for setting to put the OpenID information in a cookie.
-#: openidlogin.php:160
 msgid "Remember me"
 msgstr "Anmeldedaten merken"
 
 #. TRANS: OpenID plugin logon form field instructions.
-#: openidlogin.php:162
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "Automatisch anmelden; nicht bei gemeinsam genutzten PCs einsetzen!"
 
 #. TRANS: OpenID plugin logon form button label to start logon with the data provided in the logon form.
-#: openidlogin.php:167
 msgctxt "BUTTON"
 msgid "Login"
 msgstr "Anmelden"
-
-#: openidtrust.php:52
-msgid "OpenID Identity Verification"
-msgstr "OpenID-Identitätsverifikation"
-
-#: openidtrust.php:70
-msgid ""
-"This page should only be reached during OpenID processing, not directly."
-msgstr ""
-"Diese Seite sollte nur während der Abwicklung von OpenID erreicht werden, "
-"nicht direkt."
-
-#: openidtrust.php:118
-#, php-format
-msgid ""
-"%s  has asked to verify your identity. Click Continue to verify your "
-"identity and login without creating a new password."
-msgstr ""
-"%s hat dich gebeten, deine Identität zu bestätigen. Klicke auf „Weiter“, um "
-"deine Identität zu bestätigen und dich anzumelden ohne ein neues Passwort zu "
-"erstellen."
-
-#: openidtrust.php:136
-msgid "Continue"
-msgstr "Weiter"
-
-#: openidtrust.php:137
-msgid "Cancel"
-msgstr "Abbrechen"
-
-#. TRANS: Client error message
-#: finishaddopenid.php:68
-msgid "Not logged in."
-msgstr "Nicht angemeldet."
-
-#. TRANS: message in case a user tries to add an OpenID that is already connected to them.
-#: finishaddopenid.php:122
-msgid "You already have this OpenID!"
-msgstr "Du hast bereits diese OpenID!"
-
-#. TRANS: message in case a user tries to add an OpenID that is already used by another user.
-#: finishaddopenid.php:125
-msgid "Someone else already has this OpenID."
-msgstr "Jemand anders hat bereits diese Open-ID."
-
-#. TRANS: message in case the OpenID object cannot be connected to the user.
-#: finishaddopenid.php:138
-msgid "Error connecting user."
-msgstr "Fehler beim Verbinden des Benutzers."
-
-#. TRANS: message in case the user or the user profile cannot be saved in StatusNet.
-#: finishaddopenid.php:145
-msgid "Error updating profile"
-msgstr "Fehler beim Aktualisieren des Profils"
diff --git a/plugins/OpenID/locale/fr/LC_MESSAGES/OpenID.po b/plugins/OpenID/locale/fr/LC_MESSAGES/OpenID.po
index 2027710c29..c3e883e887 100644
--- a/plugins/OpenID/locale/fr/LC_MESSAGES/OpenID.po
+++ b/plugins/OpenID/locale/fr/LC_MESSAGES/OpenID.po
@@ -10,312 +10,68 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OpenID\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:34+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:49+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-14 17:22:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:46:02+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-openid\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: openidsettings.php:58 openidadminpanel.php:65
-msgid "OpenID settings"
-msgstr "Paramètres OpenID"
+msgid "OpenID Identity Verification"
+msgstr "Vérification d’identité OpenID"
+
+msgid ""
+"This page should only be reached during OpenID processing, not directly."
+msgstr ""
+"Cette page ne devrait être atteinte que durant un traitement OpenID, pas "
+"directement."
 
-#: openidsettings.php:69
 #, php-format
 msgid ""
-"[OpenID](%%doc.openid%%) lets you log into many sites with the same user "
-"account. Manage your associated OpenIDs from here."
+"%s  has asked to verify your identity. Click Continue to verify your "
+"identity and login without creating a new password."
 msgstr ""
-"[OpenID](%%doc.openid%%) vous permet de vous connecter à de nombreux sites "
-"avec le même compte utilisateur. Gérez à partir d’ici les identifiants "
-"OpenID associés à votre compte ici."
+"%s a demandé la vérification de votre identité. Veuillez cliquer sur « "
+"Continuer » pour vérifier votre identité et connectez-vous sans créer un "
+"nouveau mot de passe."
 
-#: openidsettings.php:100
-msgid "Add OpenID"
-msgstr "Ajouter OpenID"
+msgid "Continue"
+msgstr "Continuer"
 
-#: openidsettings.php:103
-msgid ""
-"If you want to add an OpenID to your account, enter it in the box below and "
-"click \"Add\"."
-msgstr ""
-"Si vous souhaitez ajouter un compte OpenID à votre compte, entrez-le dans la "
-"case ci-dessous et cliquez sur « Ajouter »."
-
-#. TRANS: OpenID plugin logon form field label.
-#: openidsettings.php:108 OpenIDPlugin.php:703 openidlogin.php:152
-msgid "OpenID URL"
-msgstr "Adresse URL OpenID"
-
-#: openidsettings.php:118
-msgid "Add"
-msgstr "Ajouter"
-
-#: openidsettings.php:130
-msgid "Remove OpenID"
-msgstr "Retirer OpenID"
-
-#: openidsettings.php:135
-msgid ""
-"Removing your only OpenID would make it impossible to log in! If you need to "
-"remove it, add another OpenID first."
-msgstr ""
-"Le retrait de votre unique compte OpenID ne vous permettrait plus de vous "
-"connecter ! Si vous avez besoin de l’enlever, ajouter d’abord un autre "
-"compte OpenID."
-
-#: openidsettings.php:150
-msgid ""
-"You can remove an OpenID from your account by clicking the button marked "
-"\"Remove\"."
-msgstr ""
-"Vous pouvez retirer un compte OpenID de votre compte en cliquant le bouton « "
-"Retirer »"
-
-#: openidsettings.php:173 openidsettings.php:214
-msgid "Remove"
-msgstr "Enlever"
-
-#: openidsettings.php:187
-msgid "OpenID Trusted Sites"
-msgstr "Sites de confiance OpenID"
-
-#: openidsettings.php:190
-msgid ""
-"The following sites are allowed to access your identity and log you in. You "
-"can remove a site from this list to deny it access to your OpenID."
-msgstr ""
-"Les sites suivants sont autorisés à accéder à votre identité et à vous "
-"connecter. Vous pouvez retirer un site de cette liste pour l’empêcher "
-"d’accéder à votre compte OpenID."
-
-#. TRANS: Message given when there is a problem with the user's session token.
-#: openidsettings.php:232 finishopenidlogin.php:42
-msgid "There was a problem with your session token. Try again, please."
-msgstr ""
-"Un problème est survenu avec votre jeton de session. Veuillez essayer à "
-"nouveau."
-
-#: openidsettings.php:239
-msgid "Can't add new providers."
-msgstr "Impossible d’ajouter de nouveaux fournisseurs."
-
-#: openidsettings.php:252
-msgid "Something weird happened."
-msgstr "Quelque chose de bizarre s’est passé."
-
-#: openidsettings.php:276
-msgid "No such OpenID trustroot."
-msgstr "Racine de confiance OpenID inexistante."
-
-#: openidsettings.php:280
-msgid "Trustroots removed"
-msgstr "Racines de confiance retirées"
-
-#: openidsettings.php:303
-msgid "No such OpenID."
-msgstr "Compte OpenID inexistant."
-
-#: openidsettings.php:308
-msgid "That OpenID does not belong to you."
-msgstr "Ce compte OpenID ne vous appartient pas."
-
-#: openidsettings.php:312
-msgid "OpenID removed."
-msgstr "Compte OpenID retiré."
-
-#: openidadminpanel.php:54
-msgid "OpenID"
-msgstr "OpenID"
-
-#: openidadminpanel.php:147
-msgid "Invalid provider URL. Max length is 255 characters."
-msgstr ""
-"Adresse URL du fournisseur invalide. La taille maximale est de 255 "
-"caractères."
-
-#: openidadminpanel.php:153
-msgid "Invalid team name. Max length is 255 characters."
-msgstr "Nom d’équipe invalide. La taille maximale est de 255 caractères."
-
-#: openidadminpanel.php:210
-msgid "Trusted provider"
-msgstr "Fournisseur de confiance"
-
-#: openidadminpanel.php:212
-msgid ""
-"By default, users are allowed to authenticate with any OpenID provider. If "
-"you are using your own OpenID service for shared sign-in, you can restrict "
-"access to only your own users here."
-msgstr ""
-"Par défaut, les utilisateurs sont autorisés à s’authentifier auprès de "
-"n’importe quel fournisseur OpenID. Si vous utilisez votre propre service "
-"OpenID pour l’inscription partagée, vous pouvez restreindre l’accès à vos "
-"seuls propres utilisateurs ici."
-
-#: openidadminpanel.php:220
-msgid "Provider URL"
-msgstr "Adresse URL du fournisseur"
-
-#: openidadminpanel.php:221
-msgid ""
-"All OpenID logins will be sent to this URL; other providers may not be used."
-msgstr ""
-"Toutes les connexions OpenID seront envoyées à cette adresse ; les autres "
-"fournisseurs ne peuvent être utilisés."
-
-#: openidadminpanel.php:228
-msgid "Append a username to base URL"
-msgstr "Ajouter un nom d’utilisateur à l’adresse URL de base"
-
-#: openidadminpanel.php:230
-msgid ""
-"Login form will show the base URL and prompt for a username to add at the "
-"end. Use when OpenID provider URL should be the profile page for individual "
-"users."
-msgstr ""
-"Le formulaire de connexion affichera l’adresse URL de base et demandera un "
-"nom d’utilisateur à ajouter à la fin. Utilisez cette option quand l’adresse "
-"URL du fournisseur OpenID devrait être la page de profil des utilisateurs "
-"individuels."
-
-#: openidadminpanel.php:238
-msgid "Required team"
-msgstr "Équipe exigée"
-
-#: openidadminpanel.php:239
-msgid "Only allow logins from users in the given team (Launchpad extension)."
-msgstr ""
-"Autoriser uniquement les connexions des utilisateurs membres de l’équipe "
-"donnée (extension Launchpad)."
-
-#: openidadminpanel.php:251
-msgid "Options"
-msgstr "Options"
-
-#: openidadminpanel.php:258
-msgid "Enable OpenID-only mode"
-msgstr "Activer le mode OpenID seul"
-
-#: openidadminpanel.php:260
-msgid ""
-"Require all users to login via OpenID. Warning: disables password "
-"authentication for all users!"
-msgstr ""
-"Exiger que tous les utilisateurs se connectent via OpenID. Avertissement : "
-"cela désactive l’authentification par mot de passe pour tous les "
-"utilisateurs !"
-
-#: openidadminpanel.php:278
-msgid "Save OpenID settings"
-msgstr "Sauvegarder les paramètres OpenID"
-
-#. TRANS: OpenID plugin server error.
-#: openid.php:138
-msgid "Cannot instantiate OpenID consumer object."
-msgstr "Impossible d’instancier l’objet client OpenID."
-
-#. TRANS: OpenID plugin message. Given when an OpenID is not valid.
-#: openid.php:150
-msgid "Not a valid OpenID."
-msgstr "Ce n’est pas un identifiant OpenID valide."
-
-#. TRANS: OpenID plugin server error. Given when the OpenID authentication request fails.
-#. TRANS: %s is the failure message.
-#: openid.php:155
-#, php-format
-msgid "OpenID failure: %s"
-msgstr "Échec d’OpenID : %s"
-
-#. TRANS: OpenID plugin server error. Given when the OpenID authentication request cannot be redirected.
-#. TRANS: %s is the failure message.
-#: openid.php:205
-#, php-format
-msgid "Could not redirect to server: %s"
-msgstr "Impossible de rediriger vers le serveur : %s"
-
-#. TRANS: OpenID plugin user instructions.
-#: openid.php:244
-msgid ""
-"This form should automatically submit itself. If not, click the submit "
-"button to go to your OpenID provider."
-msgstr ""
-"Ce formulaire devrait se soumettre automatiquement lui-même. Si ce n’est pas "
-"le cas, cliquez le bouton « Soumettre » en bas pour aller vers la page de "
-"votre fournisseur OpenID."
-
-#. TRANS: OpenID plugin server error.
-#: openid.php:280
-msgid "Error saving the profile."
-msgstr "Erreur lors de la sauvegarde du profil."
-
-#. TRANS: OpenID plugin server error.
-#: openid.php:292
-msgid "Error saving the user."
-msgstr "Erreur lors de la sauvegarde de l’utilisateur."
-
-#. TRANS: OpenID plugin client exception (403).
-#: openid.php:322
-msgid "Unauthorized URL used for OpenID login."
-msgstr "Adresse URL non autorisée utilisée pour la connexion OpenID."
-
-#. TRANS: Title
-#: openid.php:370
-msgid "OpenID Login Submission"
-msgstr "Soumission de la connexion OpenID"
-
-#. TRANS: OpenID plugin message used while requesting authorization user's OpenID login provider.
-#: openid.php:381
-msgid "Requesting authorization from your login provider..."
-msgstr "Demande d’autorisation auprès de votre fournisseur de connexion..."
-
-#. TRANS: OpenID plugin message. User instruction while requesting authorization user's OpenID login provider.
-#: openid.php:385
-msgid ""
-"If you are not redirected to your login provider in a few seconds, try "
-"pushing the button below."
-msgstr ""
-"Si vous n’êtes pas redirigé vers votre fournisseur de connexion dans "
-"quelques secondes, essayez en cliquant le bouton ci-dessous."
+msgid "Cancel"
+msgstr "Annuler"
 
 #. TRANS: Tooltip for main menu option "Login"
-#: OpenIDPlugin.php:218
 msgctxt "TOOLTIP"
 msgid "Login to the site"
 msgstr "Connexion au site"
 
 #. TRANS: Main menu option when not logged in to log in
-#: OpenIDPlugin.php:221
 msgctxt "MENU"
 msgid "Login"
 msgstr "Connexion"
 
 #. TRANS: Tooltip for main menu option "Help"
-#: OpenIDPlugin.php:226
 msgctxt "TOOLTIP"
 msgid "Help me!"
 msgstr "Aidez-moi !"
 
 #. TRANS: Main menu option for help on the StatusNet site
-#: OpenIDPlugin.php:229
 msgctxt "MENU"
 msgid "Help"
 msgstr "Aide"
 
 #. TRANS: Tooltip for main menu option "Search"
-#: OpenIDPlugin.php:235
 msgctxt "TOOLTIP"
 msgid "Search for people or text"
 msgstr "Rechercher des personnes ou du texte"
 
 #. TRANS: Main menu option when logged in or when the StatusNet instance is not private
-#: OpenIDPlugin.php:238
 msgctxt "MENU"
 msgid "Search"
 msgstr "Rechercher"
@@ -323,92 +79,76 @@ msgstr "Rechercher"
 #. TRANS: OpenID plugin menu item on site logon page.
 #. TRANS: OpenID plugin menu item on user settings page.
 #. TRANS: OpenID configuration menu item.
-#: OpenIDPlugin.php:295 OpenIDPlugin.php:331 OpenIDPlugin.php:605
 msgctxt "MENU"
 msgid "OpenID"
 msgstr "OpenID"
 
 #. TRANS: OpenID plugin tooltip for logon menu item.
-#: OpenIDPlugin.php:297
 msgid "Login or register with OpenID"
 msgstr "Se connecter ou s’inscrire avec OpenID"
 
 #. TRANS: OpenID plugin tooltip for user settings menu item.
-#: OpenIDPlugin.php:333
 msgid "Add or remove OpenIDs"
 msgstr "Ajouter ou retirer des identifiants OpenID"
 
 #. TRANS: Tooltip for OpenID configuration menu item.
-#: OpenIDPlugin.php:607
 msgid "OpenID configuration"
 msgstr "Configuration d’OpenID"
 
 #. TRANS: OpenID plugin description.
-#: OpenIDPlugin.php:653
 msgid "Use <a href=\"http://openid.net/\">OpenID</a> to login to the site."
 msgstr ""
 "Utiliser <a href=\"http://openid.net/\">OpenID</a> pour se connecter au site."
 
 #. TRANS: button label for OAuth authorization page when needing OpenID authentication first.
-#: OpenIDPlugin.php:663
 msgctxt "BUTTON"
 msgid "Continue"
 msgstr "Continuer"
 
 #. TRANS: OpenID plugin logon form legend.
-#: OpenIDPlugin.php:680 openidlogin.php:132
 msgid "OpenID login"
 msgstr "Connexion OpenID"
 
 #. TRANS: Field label.
-#: OpenIDPlugin.php:688 openidlogin.php:139
 msgid "OpenID provider"
 msgstr "Fournisseur OpenID"
 
 #. TRANS: Form guide.
-#: OpenIDPlugin.php:697 openidlogin.php:147
 msgid "Enter your username."
 msgstr "Entrez votre nom d’utilisateur."
 
 #. TRANS: Form guide.
-#: OpenIDPlugin.php:699 openidlogin.php:148
 msgid "You will be sent to the provider's site for authentication."
 msgstr "Vous serez envoyé sur le site du fournisseur pour l’authentification."
 
+#. TRANS: OpenID plugin logon form field label.
+msgid "OpenID URL"
+msgstr "Adresse URL OpenID"
+
 #. TRANS: OpenID plugin logon form field instructions.
-#: OpenIDPlugin.php:706 openidlogin.php:155
 msgid "Your OpenID URL"
 msgstr "Votre URL OpenID"
 
-#. TRANS: OpenID plugin client error given trying to add an unauthorised OpenID to a user (403).
-#: openidserver.php:116
-#, php-format
-msgid "You are not authorized to use the identity %s."
-msgstr "Vous n’êtes pas autorisé à utiliser l’identité « %s »."
-
-#. TRANS: OpenID plugin client error given when not getting a response for a given OpenID provider (500).
-#: openidserver.php:137
-msgid "Just an OpenID provider. Nothing to see here, move along..."
-msgstr "Juste un fournisseur OpenID. Rien à voir ici, passez votre chemin..."
-
 #. TRANS: Client error message trying to log on with OpenID while already logged on.
-#: finishopenidlogin.php:37 openidlogin.php:33
 msgid "Already logged in."
 msgstr "Déjà connecté."
 
+#. TRANS: Message given when there is a problem with the user's session token.
+msgid "There was a problem with your session token. Try again, please."
+msgstr ""
+"Un problème est survenu avec votre jeton de session. Veuillez essayer à "
+"nouveau."
+
 #. TRANS: Message given if user does not agree with the site's license.
-#: finishopenidlogin.php:48
 msgid "You can't register if you don't agree to the license."
 msgstr "Vous ne pouvez pas vous inscrire si vous n’acceptez pas la licence."
 
 #. TRANS: Messag given on an unknown error.
-#: finishopenidlogin.php:57
 msgid "An unknown error has occured."
 msgstr "Une erreur inconnue s’est produite."
 
 #. TRANS: Instructions given after a first successful logon using OpenID.
 #. TRANS: %s is the site name.
-#: finishopenidlogin.php:73
 #, php-format
 msgid ""
 "This is the first time you've logged into %s so we must connect your OpenID "
@@ -421,39 +161,31 @@ msgstr ""
 "en avez un."
 
 #. TRANS: Title
-#: finishopenidlogin.php:80
 msgid "OpenID Account Setup"
 msgstr "Configuration du compte OpenID"
 
-#: finishopenidlogin.php:117
 msgid "Create new account"
 msgstr "Créer un nouveau compte"
 
-#: finishopenidlogin.php:119
 msgid "Create a new user with this nickname."
 msgstr "Créer un nouvel utilisateur avec ce pseudonyme."
 
-#: finishopenidlogin.php:126
 msgid "New nickname"
 msgstr "Nouveau pseudonyme"
 
-#: finishopenidlogin.php:128
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "1 à 64 lettres minuscules ou chiffres, sans ponctuation ni espaces"
 
 #. TRANS: Button label in form in which to create a new user on the site for an OpenID.
-#: finishopenidlogin.php:162
 msgctxt "BUTTON"
 msgid "Create"
 msgstr "Créer"
 
 #. TRANS: Used as form legend for form in which to connect an OpenID to an existing user on the site.
-#: finishopenidlogin.php:176
 msgid "Connect existing account"
 msgstr "Se connecter à un compte existant"
 
 #. TRANS: User instructions for form in which to connect an OpenID to an existing user on the site.
-#: finishopenidlogin.php:179
 msgid ""
 "If you already have an account, login with your username and password to "
 "connect it to your OpenID."
@@ -462,35 +194,29 @@ msgstr ""
 "et mot de passe pour l’associer à votre compte OpenID."
 
 #. TRANS: Field label in form in which to connect an OpenID to an existing user on the site.
-#: finishopenidlogin.php:183
 msgid "Existing nickname"
 msgstr "Pseudonyme existant"
 
 #. TRANS: Field label in form in which to connect an OpenID to an existing user on the site.
-#: finishopenidlogin.php:187
 msgid "Password"
 msgstr "Mot de passe"
 
 #. TRANS: Button label in form in which to connect an OpenID to an existing user on the site.
-#: finishopenidlogin.php:191
 msgctxt "BUTTON"
 msgid "Connect"
 msgstr "Connexion"
 
 #. TRANS: Status message in case the response from the OpenID provider is that the logon attempt was cancelled.
-#: finishopenidlogin.php:237 finishaddopenid.php:90
 msgid "OpenID authentication cancelled."
 msgstr "Authentification OpenID annulée."
 
 #. TRANS: OpenID authentication failed; display the error message. %s is the error message.
 #. TRANS: OpenID authentication failed; display the error message.
 #. TRANS: %s is the error message.
-#: finishopenidlogin.php:241 finishaddopenid.php:95
 #, php-format
 msgid "OpenID authentication failed: %s"
 msgstr "L’authentification OpenID a échoué : %s"
 
-#: finishopenidlogin.php:261 finishaddopenid.php:111
 msgid ""
 "OpenID authentication aborted: you are not allowed to login to this site."
 msgstr ""
@@ -499,49 +225,280 @@ msgstr ""
 
 #. TRANS: OpenID plugin message. No new user registration is allowed on the site.
 #. TRANS: OpenID plugin message. No new user registration is allowed on the site without an invitation code, and none was provided.
-#: finishopenidlogin.php:317 finishopenidlogin.php:327
 msgid "Registration not allowed."
 msgstr "Inscription non autorisée."
 
 #. TRANS: OpenID plugin message. No new user registration is allowed on the site without an invitation code, and the one provided was not valid.
-#: finishopenidlogin.php:335
 msgid "Not a valid invitation code."
 msgstr "Le code d’invitation n’est pas valide."
 
 #. TRANS: OpenID plugin message. The entered new user name is blacklisted.
-#: finishopenidlogin.php:349
 msgid "Nickname not allowed."
 msgstr "Pseudonyme non autorisé."
 
 #. TRANS: OpenID plugin message. The entered new user name is already used.
-#: finishopenidlogin.php:355
 msgid "Nickname already in use. Try another one."
 msgstr "Pseudonyme déjà utilisé. Essayez-en un autre."
 
 #. TRANS: OpenID plugin server error. A stored OpenID cannot be retrieved.
 #. TRANS: OpenID plugin server error. A stored OpenID cannot be found.
-#: finishopenidlogin.php:363 finishopenidlogin.php:449
 msgid "Stored OpenID not found."
 msgstr "OpenID stocké non trouvé."
 
 #. TRANS: OpenID plugin server error.
-#: finishopenidlogin.php:373
 msgid "Creating new account for OpenID that already has a user."
 msgstr "Créer un nouveau compte pour OpenID qui a déjà un utilisateur."
 
 #. TRANS: OpenID plugin message.
-#: finishopenidlogin.php:437
 msgid "Invalid username or password."
 msgstr "Nom d’utilisateur ou mot de passe incorrect."
 
 #. TRANS: OpenID plugin server error. The user or user profile could not be saved.
-#: finishopenidlogin.php:457
 msgid "Error connecting user to OpenID."
 msgstr "Erreur de connexion de l’utilisateur à OpenID."
 
+#. TRANS: OpenID plugin server error.
+msgid "Cannot instantiate OpenID consumer object."
+msgstr "Impossible d’instancier l’objet client OpenID."
+
+#. TRANS: OpenID plugin message. Given when an OpenID is not valid.
+msgid "Not a valid OpenID."
+msgstr "Ce n’est pas un identifiant OpenID valide."
+
+#. TRANS: OpenID plugin server error. Given when the OpenID authentication request fails.
+#. TRANS: %s is the failure message.
+#, php-format
+msgid "OpenID failure: %s"
+msgstr "Échec d’OpenID : %s"
+
+#. TRANS: OpenID plugin server error. Given when the OpenID authentication request cannot be redirected.
+#. TRANS: %s is the failure message.
+#, php-format
+msgid "Could not redirect to server: %s"
+msgstr "Impossible de rediriger vers le serveur : %s"
+
+#. TRANS: OpenID plugin user instructions.
+msgid ""
+"This form should automatically submit itself. If not, click the submit "
+"button to go to your OpenID provider."
+msgstr ""
+"Ce formulaire devrait se soumettre automatiquement lui-même. Si ce n’est pas "
+"le cas, cliquez le bouton « Soumettre » en bas pour aller vers la page de "
+"votre fournisseur OpenID."
+
+#. TRANS: OpenID plugin server error.
+msgid "Error saving the profile."
+msgstr "Erreur lors de la sauvegarde du profil."
+
+#. TRANS: OpenID plugin server error.
+msgid "Error saving the user."
+msgstr "Erreur lors de la sauvegarde de l’utilisateur."
+
+#. TRANS: OpenID plugin client exception (403).
+msgid "Unauthorized URL used for OpenID login."
+msgstr "Adresse URL non autorisée utilisée pour la connexion OpenID."
+
+#. TRANS: Title
+msgid "OpenID Login Submission"
+msgstr "Soumission de la connexion OpenID"
+
+#. TRANS: OpenID plugin message used while requesting authorization user's OpenID login provider.
+msgid "Requesting authorization from your login provider..."
+msgstr "Demande d’autorisation auprès de votre fournisseur de connexion..."
+
+#. TRANS: OpenID plugin message. User instruction while requesting authorization user's OpenID login provider.
+msgid ""
+"If you are not redirected to your login provider in a few seconds, try "
+"pushing the button below."
+msgstr ""
+"Si vous n’êtes pas redirigé vers votre fournisseur de connexion dans "
+"quelques secondes, essayez en cliquant le bouton ci-dessous."
+
+msgid "OpenID"
+msgstr "OpenID"
+
+msgid "OpenID settings"
+msgstr "Paramètres OpenID"
+
+msgid "Invalid provider URL. Max length is 255 characters."
+msgstr ""
+"Adresse URL du fournisseur invalide. La taille maximale est de 255 "
+"caractères."
+
+msgid "Invalid team name. Max length is 255 characters."
+msgstr "Nom d’équipe invalide. La taille maximale est de 255 caractères."
+
+msgid "Trusted provider"
+msgstr "Fournisseur de confiance"
+
+msgid ""
+"By default, users are allowed to authenticate with any OpenID provider. If "
+"you are using your own OpenID service for shared sign-in, you can restrict "
+"access to only your own users here."
+msgstr ""
+"Par défaut, les utilisateurs sont autorisés à s’authentifier auprès de "
+"n’importe quel fournisseur OpenID. Si vous utilisez votre propre service "
+"OpenID pour l’inscription partagée, vous pouvez restreindre l’accès à vos "
+"seuls propres utilisateurs ici."
+
+msgid "Provider URL"
+msgstr "Adresse URL du fournisseur"
+
+msgid ""
+"All OpenID logins will be sent to this URL; other providers may not be used."
+msgstr ""
+"Toutes les connexions OpenID seront envoyées à cette adresse ; les autres "
+"fournisseurs ne peuvent être utilisés."
+
+msgid "Append a username to base URL"
+msgstr "Ajouter un nom d’utilisateur à l’adresse URL de base"
+
+msgid ""
+"Login form will show the base URL and prompt for a username to add at the "
+"end. Use when OpenID provider URL should be the profile page for individual "
+"users."
+msgstr ""
+"Le formulaire de connexion affichera l’adresse URL de base et demandera un "
+"nom d’utilisateur à ajouter à la fin. Utilisez cette option quand l’adresse "
+"URL du fournisseur OpenID devrait être la page de profil des utilisateurs "
+"individuels."
+
+msgid "Required team"
+msgstr "Équipe exigée"
+
+msgid "Only allow logins from users in the given team (Launchpad extension)."
+msgstr ""
+"Autoriser uniquement les connexions des utilisateurs membres de l’équipe "
+"donnée (extension Launchpad)."
+
+msgid "Options"
+msgstr "Options"
+
+msgid "Enable OpenID-only mode"
+msgstr "Activer le mode OpenID seul"
+
+msgid ""
+"Require all users to login via OpenID. Warning: disables password "
+"authentication for all users!"
+msgstr ""
+"Exiger que tous les utilisateurs se connectent via OpenID. Avertissement : "
+"cela désactive l’authentification par mot de passe pour tous les "
+"utilisateurs !"
+
+msgid "Save OpenID settings"
+msgstr "Sauvegarder les paramètres OpenID"
+
+#. TRANS: Client error message
+msgid "Not logged in."
+msgstr "Non connecté."
+
+#. TRANS: message in case a user tries to add an OpenID that is already connected to them.
+msgid "You already have this OpenID!"
+msgstr "Vous êtes déjà connecté avec cet OpenID !"
+
+#. TRANS: message in case a user tries to add an OpenID that is already used by another user.
+msgid "Someone else already has this OpenID."
+msgstr "Quelqu’un d’autre a déjà cet OpenID."
+
+#. TRANS: message in case the OpenID object cannot be connected to the user.
+msgid "Error connecting user."
+msgstr "Erreur lors de la connexion de l’utilisateur à OpenID."
+
+#. TRANS: message in case the user or the user profile cannot be saved in StatusNet.
+msgid "Error updating profile"
+msgstr "Erreur lors de la mise à jour du profil utilisateur"
+
+#. TRANS: Title after getting the status of the OpenID authorisation request.
+#. TRANS: OpenID plugin message. Title.
+msgid "OpenID Login"
+msgstr "Connexion OpenID"
+
+#, php-format
+msgid ""
+"[OpenID](%%doc.openid%%) lets you log into many sites with the same user "
+"account. Manage your associated OpenIDs from here."
+msgstr ""
+"[OpenID](%%doc.openid%%) vous permet de vous connecter à de nombreux sites "
+"avec le même compte utilisateur. Gérez à partir d’ici les identifiants "
+"OpenID associés à votre compte ici."
+
+msgid "Add OpenID"
+msgstr "Ajouter OpenID"
+
+msgid ""
+"If you want to add an OpenID to your account, enter it in the box below and "
+"click \"Add\"."
+msgstr ""
+"Si vous souhaitez ajouter un compte OpenID à votre compte, entrez-le dans la "
+"case ci-dessous et cliquez sur « Ajouter »."
+
+msgid "Add"
+msgstr "Ajouter"
+
+msgid "Remove OpenID"
+msgstr "Retirer OpenID"
+
+msgid ""
+"Removing your only OpenID would make it impossible to log in! If you need to "
+"remove it, add another OpenID first."
+msgstr ""
+"Le retrait de votre unique compte OpenID ne vous permettrait plus de vous "
+"connecter ! Si vous avez besoin de l’enlever, ajouter d’abord un autre "
+"compte OpenID."
+
+msgid ""
+"You can remove an OpenID from your account by clicking the button marked "
+"\"Remove\"."
+msgstr ""
+"Vous pouvez retirer un compte OpenID de votre compte en cliquant le bouton « "
+"Retirer »"
+
+msgid "Remove"
+msgstr "Enlever"
+
+msgid "OpenID Trusted Sites"
+msgstr "Sites de confiance OpenID"
+
+msgid ""
+"The following sites are allowed to access your identity and log you in. You "
+"can remove a site from this list to deny it access to your OpenID."
+msgstr ""
+"Les sites suivants sont autorisés à accéder à votre identité et à vous "
+"connecter. Vous pouvez retirer un site de cette liste pour l’empêcher "
+"d’accéder à votre compte OpenID."
+
+msgid "Can't add new providers."
+msgstr "Impossible d’ajouter de nouveaux fournisseurs."
+
+msgid "Something weird happened."
+msgstr "Quelque chose de bizarre s’est passé."
+
+msgid "No such OpenID trustroot."
+msgstr "Racine de confiance OpenID inexistante."
+
+msgid "Trustroots removed"
+msgstr "Racines de confiance retirées"
+
+msgid "No such OpenID."
+msgstr "Compte OpenID inexistant."
+
+msgid "That OpenID does not belong to you."
+msgstr "Ce compte OpenID ne vous appartient pas."
+
+msgid "OpenID removed."
+msgstr "Compte OpenID retiré."
+
+#. TRANS: OpenID plugin client error given trying to add an unauthorised OpenID to a user (403).
+#, php-format
+msgid "You are not authorized to use the identity %s."
+msgstr "Vous n’êtes pas autorisé à utiliser l’identité « %s »."
+
+#. TRANS: OpenID plugin client error given when not getting a response for a given OpenID provider (500).
+msgid "Just an OpenID provider. Nothing to see here, move along..."
+msgstr "Juste un fournisseur OpenID. Rien à voir ici, passez votre chemin..."
+
 #. TRANS: OpenID plugin message. Rememberme logins have to reauthenticate before changing any profile settings.
 #. TRANS: "OpenID" is the display text for a link with URL "(%%doc.openid%%)".
-#: openidlogin.php:74
 #, php-format
 msgid ""
 "For security reasons, please re-login with your [OpenID](%%doc.openid%%) "
@@ -552,85 +509,21 @@ msgstr ""
 
 #. TRANS: OpenID plugin message.
 #. TRANS: "OpenID" is the display text for a link with URL "(%%doc.openid%%)".
-#: openidlogin.php:80
 #, php-format
 msgid "Login with an [OpenID](%%doc.openid%%) account."
 msgstr "Connexion avec un compte [OpenID](%%doc.openid%%)."
 
-#. TRANS: OpenID plugin message. Title.
-#. TRANS: Title after getting the status of the OpenID authorisation request.
-#: openidlogin.php:114 finishaddopenid.php:187
-msgid "OpenID Login"
-msgstr "Connexion OpenID"
-
 #. TRANS: OpenID plugin logon form checkbox label for setting to put the OpenID information in a cookie.
-#: openidlogin.php:160
 msgid "Remember me"
 msgstr "Se souvenir de moi"
 
 #. TRANS: OpenID plugin logon form field instructions.
-#: openidlogin.php:162
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 "Me connecter automatiquement à l’avenir ; déconseillé sur les ordinateurs "
 "publics ou partagés !"
 
 #. TRANS: OpenID plugin logon form button label to start logon with the data provided in the logon form.
-#: openidlogin.php:167
 msgctxt "BUTTON"
 msgid "Login"
 msgstr "Connexion"
-
-#: openidtrust.php:52
-msgid "OpenID Identity Verification"
-msgstr "Vérification d’identité OpenID"
-
-#: openidtrust.php:70
-msgid ""
-"This page should only be reached during OpenID processing, not directly."
-msgstr ""
-"Cette page ne devrait être atteinte que durant un traitement OpenID, pas "
-"directement."
-
-#: openidtrust.php:118
-#, php-format
-msgid ""
-"%s  has asked to verify your identity. Click Continue to verify your "
-"identity and login without creating a new password."
-msgstr ""
-"%s a demandé la vérification de votre identité. Veuillez cliquer sur « "
-"Continuer » pour vérifier votre identité et connectez-vous sans créer un "
-"nouveau mot de passe."
-
-#: openidtrust.php:136
-msgid "Continue"
-msgstr "Continuer"
-
-#: openidtrust.php:137
-msgid "Cancel"
-msgstr "Annuler"
-
-#. TRANS: Client error message
-#: finishaddopenid.php:68
-msgid "Not logged in."
-msgstr "Non connecté."
-
-#. TRANS: message in case a user tries to add an OpenID that is already connected to them.
-#: finishaddopenid.php:122
-msgid "You already have this OpenID!"
-msgstr "Vous êtes déjà connecté avec cet OpenID !"
-
-#. TRANS: message in case a user tries to add an OpenID that is already used by another user.
-#: finishaddopenid.php:125
-msgid "Someone else already has this OpenID."
-msgstr "Quelqu’un d’autre a déjà cet OpenID."
-
-#. TRANS: message in case the OpenID object cannot be connected to the user.
-#: finishaddopenid.php:138
-msgid "Error connecting user."
-msgstr "Erreur lors de la connexion de l’utilisateur à OpenID."
-
-#. TRANS: message in case the user or the user profile cannot be saved in StatusNet.
-#: finishaddopenid.php:145
-msgid "Error updating profile"
-msgstr "Erreur lors de la mise à jour du profil utilisateur"
diff --git a/plugins/OpenID/locale/ia/LC_MESSAGES/OpenID.po b/plugins/OpenID/locale/ia/LC_MESSAGES/OpenID.po
index 91feba29e3..75e987747a 100644
--- a/plugins/OpenID/locale/ia/LC_MESSAGES/OpenID.po
+++ b/plugins/OpenID/locale/ia/LC_MESSAGES/OpenID.po
@@ -9,303 +9,67 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OpenID\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:34+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:49+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-14 17:22:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:46:02+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-openid\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: openidsettings.php:58 openidadminpanel.php:65
-msgid "OpenID settings"
-msgstr "Configuration OpenID"
+msgid "OpenID Identity Verification"
+msgstr "Verification de identitate via OpenID"
+
+msgid ""
+"This page should only be reached during OpenID processing, not directly."
+msgstr ""
+"Iste pagina debe esser attingite solmente durante le tractamento de un "
+"OpenID, non directemente."
 
-#: openidsettings.php:69
 #, php-format
 msgid ""
-"[OpenID](%%doc.openid%%) lets you log into many sites with the same user "
-"account. Manage your associated OpenIDs from here."
+"%s  has asked to verify your identity. Click Continue to verify your "
+"identity and login without creating a new password."
 msgstr ""
-"[OpenID](%%doc.openid%%) permitte authenticar te a multe sitos con le mesme "
-"conto de usator. Tu pote gerer hic tu OpenIDs associate."
+"%s  ha demandate de verificar tu identitate. Clicca super Continuar pro "
+"verificar tu identitate e aperir session sin crear un nove contrasigno."
 
-#: openidsettings.php:100
-msgid "Add OpenID"
-msgstr "Adder OpenID"
+msgid "Continue"
+msgstr "Continuar"
 
-#: openidsettings.php:103
-msgid ""
-"If you want to add an OpenID to your account, enter it in the box below and "
-"click \"Add\"."
-msgstr ""
-"Si tu vole adder un OpenID a tu conto, entra lo in le quadro hic infra e "
-"clicca \"Adder\"."
-
-#. TRANS: OpenID plugin logon form field label.
-#: openidsettings.php:108 OpenIDPlugin.php:703 openidlogin.php:152
-msgid "OpenID URL"
-msgstr "URL OpenID"
-
-#: openidsettings.php:118
-msgid "Add"
-msgstr "Adder"
-
-#: openidsettings.php:130
-msgid "Remove OpenID"
-msgstr "Remover OpenID"
-
-#: openidsettings.php:135
-msgid ""
-"Removing your only OpenID would make it impossible to log in! If you need to "
-"remove it, add another OpenID first."
-msgstr ""
-"Le remotion de tu sol OpenID renderea le apertura de session impossibile! Si "
-"tu debe remover lo, adde primo un altere OpenID."
-
-#: openidsettings.php:150
-msgid ""
-"You can remove an OpenID from your account by clicking the button marked "
-"\"Remove\"."
-msgstr ""
-"Tu pote remover un OpenID de tu conto per cliccar le button \"Remover\"."
-
-#: openidsettings.php:173 openidsettings.php:214
-msgid "Remove"
-msgstr "Remover"
-
-#: openidsettings.php:187
-msgid "OpenID Trusted Sites"
-msgstr "Sitos OpenID de confidentia"
-
-#: openidsettings.php:190
-msgid ""
-"The following sites are allowed to access your identity and log you in. You "
-"can remove a site from this list to deny it access to your OpenID."
-msgstr ""
-"Le sequente sitos ha le permission de acceder a tu identitate e de "
-"authenticar te. Tu pote remover un sito de iste lista pro negar a illo le "
-"accesso a tu OpenID."
-
-#. TRANS: Message given when there is a problem with the user's session token.
-#: openidsettings.php:232 finishopenidlogin.php:42
-msgid "There was a problem with your session token. Try again, please."
-msgstr "Occurreva un problema con le indicio de tu session. Per favor reproba."
-
-#: openidsettings.php:239
-msgid "Can't add new providers."
-msgstr "Non pote adder nove fornitores."
-
-#: openidsettings.php:252
-msgid "Something weird happened."
-msgstr "Qualcosa de bizarre occurreva."
-
-#: openidsettings.php:276
-msgid "No such OpenID trustroot."
-msgstr "Iste \"trustroot\" de OpenID non existe."
-
-#: openidsettings.php:280
-msgid "Trustroots removed"
-msgstr "\"Trustroots\" removite"
-
-#: openidsettings.php:303
-msgid "No such OpenID."
-msgstr "Iste OpenID non existe."
-
-#: openidsettings.php:308
-msgid "That OpenID does not belong to you."
-msgstr "Iste OpenID non appertine a te."
-
-#: openidsettings.php:312
-msgid "OpenID removed."
-msgstr "OpenID removite."
-
-#: openidadminpanel.php:54
-msgid "OpenID"
-msgstr "OpenID"
-
-#: openidadminpanel.php:147
-msgid "Invalid provider URL. Max length is 255 characters."
-msgstr "URL de fornitor invalide. Longitude maximal es 255 characteres."
-
-#: openidadminpanel.php:153
-msgid "Invalid team name. Max length is 255 characters."
-msgstr "Nomine de equipa invalide. Longitude maximal es 255 characteres."
-
-#: openidadminpanel.php:210
-msgid "Trusted provider"
-msgstr "Fornitor de confidentia"
-
-#: openidadminpanel.php:212
-msgid ""
-"By default, users are allowed to authenticate with any OpenID provider. If "
-"you are using your own OpenID service for shared sign-in, you can restrict "
-"access to only your own users here."
-msgstr ""
-"Per predefinition, le usatores ha le permission de authenitcar se con omne "
-"fornitor de OpenID. Si tu usa tu proprie servicio OpenID pro le "
-"authentication in commun, tu pote hic restringer le accesso a solmente tu "
-"proprie usatores."
-
-#: openidadminpanel.php:220
-msgid "Provider URL"
-msgstr "URL del fornitor"
-
-#: openidadminpanel.php:221
-msgid ""
-"All OpenID logins will be sent to this URL; other providers may not be used."
-msgstr ""
-"Tote le authenticationes de OpenID essera inviate a iste URL; altere "
-"fornitores non pote esser usate."
-
-#: openidadminpanel.php:228
-msgid "Append a username to base URL"
-msgstr "Adjunger un nomine de usator al URL de base"
-
-#: openidadminpanel.php:230
-msgid ""
-"Login form will show the base URL and prompt for a username to add at the "
-"end. Use when OpenID provider URL should be the profile page for individual "
-"users."
-msgstr ""
-"Le formulario de authentication monstrara le URL de base e demandara un "
-"nomine de usator a adder al fin. Usa isto si le URL de un fornitor de OpenID "
-"debe esser le pagina de profilo pro usatores individual."
-
-#: openidadminpanel.php:238
-msgid "Required team"
-msgstr "Equipa requirite"
-
-#: openidadminpanel.php:239
-msgid "Only allow logins from users in the given team (Launchpad extension)."
-msgstr ""
-"Permitter solmente le apertura de session ab usatores in le equipa "
-"specificate (extension de Launchpad)."
-
-#: openidadminpanel.php:251
-msgid "Options"
-msgstr "Optiones"
-
-#: openidadminpanel.php:258
-msgid "Enable OpenID-only mode"
-msgstr "Activar modo OpenID sol"
-
-#: openidadminpanel.php:260
-msgid ""
-"Require all users to login via OpenID. Warning: disables password "
-"authentication for all users!"
-msgstr ""
-"Requirer que tote le usatores aperi session via OpenID. Aviso: disactiva le "
-"authentication per contrasigno pro tote le usatores!"
-
-#: openidadminpanel.php:278
-msgid "Save OpenID settings"
-msgstr "Salveguardar configurationes de OpenID"
-
-#. TRANS: OpenID plugin server error.
-#: openid.php:138
-msgid "Cannot instantiate OpenID consumer object."
-msgstr "Non pote instantiar un objecto de consumitor OpenID."
-
-#. TRANS: OpenID plugin message. Given when an OpenID is not valid.
-#: openid.php:150
-msgid "Not a valid OpenID."
-msgstr "Non es un OpenID valide."
-
-#. TRANS: OpenID plugin server error. Given when the OpenID authentication request fails.
-#. TRANS: %s is the failure message.
-#: openid.php:155
-#, php-format
-msgid "OpenID failure: %s"
-msgstr "Fallimento de OpenID: %s"
-
-#. TRANS: OpenID plugin server error. Given when the OpenID authentication request cannot be redirected.
-#. TRANS: %s is the failure message.
-#: openid.php:205
-#, php-format
-msgid "Could not redirect to server: %s"
-msgstr "Non poteva rediriger al servitor: %s"
-
-#. TRANS: OpenID plugin user instructions.
-#: openid.php:244
-msgid ""
-"This form should automatically submit itself. If not, click the submit "
-"button to go to your OpenID provider."
-msgstr ""
-"Iste formulario deberea submitter se automaticamente. Si non, clicca super "
-"le button Submitter pro vader a tu fornitor de OpenID."
-
-#. TRANS: OpenID plugin server error.
-#: openid.php:280
-msgid "Error saving the profile."
-msgstr "Error durante le salveguarda del profilo."
-
-#. TRANS: OpenID plugin server error.
-#: openid.php:292
-msgid "Error saving the user."
-msgstr "Error durante le salveguarda del usator."
-
-#. TRANS: OpenID plugin client exception (403).
-#: openid.php:322
-msgid "Unauthorized URL used for OpenID login."
-msgstr ""
-"Un URL non autorisate ha essite usate pro le authentication via OpenID."
-
-#. TRANS: Title
-#: openid.php:370
-msgid "OpenID Login Submission"
-msgstr "Apertura de session via OpenID"
-
-#. TRANS: OpenID plugin message used while requesting authorization user's OpenID login provider.
-#: openid.php:381
-msgid "Requesting authorization from your login provider..."
-msgstr "Requesta autorisation de tu fornitor de authentication..."
-
-#. TRANS: OpenID plugin message. User instruction while requesting authorization user's OpenID login provider.
-#: openid.php:385
-msgid ""
-"If you are not redirected to your login provider in a few seconds, try "
-"pushing the button below."
-msgstr ""
-"Si tu non es redirigite a tu fornitor de authentication post pauc secundas, "
-"tenta pulsar le button hic infra."
+msgid "Cancel"
+msgstr "Cancellar"
 
 #. TRANS: Tooltip for main menu option "Login"
-#: OpenIDPlugin.php:218
 msgctxt "TOOLTIP"
 msgid "Login to the site"
 msgstr "Authenticar te a iste sito"
 
 #. TRANS: Main menu option when not logged in to log in
-#: OpenIDPlugin.php:221
 msgctxt "MENU"
 msgid "Login"
 msgstr "Aperir session"
 
 #. TRANS: Tooltip for main menu option "Help"
-#: OpenIDPlugin.php:226
 msgctxt "TOOLTIP"
 msgid "Help me!"
 msgstr "Adjuta me!"
 
 #. TRANS: Main menu option for help on the StatusNet site
-#: OpenIDPlugin.php:229
 msgctxt "MENU"
 msgid "Help"
 msgstr "Adjuta"
 
 #. TRANS: Tooltip for main menu option "Search"
-#: OpenIDPlugin.php:235
 msgctxt "TOOLTIP"
 msgid "Search for people or text"
 msgstr "Cercar personas o texto"
 
 #. TRANS: Main menu option when logged in or when the StatusNet instance is not private
-#: OpenIDPlugin.php:238
 msgctxt "MENU"
 msgid "Search"
 msgstr "Cercar"
@@ -313,93 +77,74 @@ msgstr "Cercar"
 #. TRANS: OpenID plugin menu item on site logon page.
 #. TRANS: OpenID plugin menu item on user settings page.
 #. TRANS: OpenID configuration menu item.
-#: OpenIDPlugin.php:295 OpenIDPlugin.php:331 OpenIDPlugin.php:605
 msgctxt "MENU"
 msgid "OpenID"
 msgstr "OpenID"
 
 #. TRANS: OpenID plugin tooltip for logon menu item.
-#: OpenIDPlugin.php:297
 msgid "Login or register with OpenID"
 msgstr "Aperir session o crear conto via OpenID"
 
 #. TRANS: OpenID plugin tooltip for user settings menu item.
-#: OpenIDPlugin.php:333
 msgid "Add or remove OpenIDs"
 msgstr "Adder o remover OpenIDs"
 
 #. TRANS: Tooltip for OpenID configuration menu item.
-#: OpenIDPlugin.php:607
 msgid "OpenID configuration"
 msgstr "Configuration de OpenID"
 
 #. TRANS: OpenID plugin description.
-#: OpenIDPlugin.php:653
 msgid "Use <a href=\"http://openid.net/\">OpenID</a> to login to the site."
 msgstr ""
 "Usar <a href=\"http://openid.net/\">OpenID</a> pro aperir session al sito."
 
 #. TRANS: button label for OAuth authorization page when needing OpenID authentication first.
-#: OpenIDPlugin.php:663
 msgctxt "BUTTON"
 msgid "Continue"
 msgstr "Continuar"
 
 #. TRANS: OpenID plugin logon form legend.
-#: OpenIDPlugin.php:680 openidlogin.php:132
 msgid "OpenID login"
 msgstr "Apertura de session via OpenID"
 
 #. TRANS: Field label.
-#: OpenIDPlugin.php:688 openidlogin.php:139
 msgid "OpenID provider"
 msgstr "Fornitor de OpenID"
 
 #. TRANS: Form guide.
-#: OpenIDPlugin.php:697 openidlogin.php:147
 msgid "Enter your username."
 msgstr "Entra tu nomine de usator."
 
 #. TRANS: Form guide.
-#: OpenIDPlugin.php:699 openidlogin.php:148
 msgid "You will be sent to the provider's site for authentication."
 msgstr "Tu essera inviate al sito del fornitor pro authentication."
 
+#. TRANS: OpenID plugin logon form field label.
+msgid "OpenID URL"
+msgstr "URL OpenID"
+
 #. TRANS: OpenID plugin logon form field instructions.
-#: OpenIDPlugin.php:706 openidlogin.php:155
 msgid "Your OpenID URL"
 msgstr "Tu URL de OpenID"
 
-#. TRANS: OpenID plugin client error given trying to add an unauthorised OpenID to a user (403).
-#: openidserver.php:116
-#, php-format
-msgid "You are not authorized to use the identity %s."
-msgstr "Tu non es autorisate a usar le identitate %s."
-
-#. TRANS: OpenID plugin client error given when not getting a response for a given OpenID provider (500).
-#: openidserver.php:137
-msgid "Just an OpenID provider. Nothing to see here, move along..."
-msgstr ""
-"Solmente un fornitor de OpenID. Nihil a vider hic, per favor continua..."
-
 #. TRANS: Client error message trying to log on with OpenID while already logged on.
-#: finishopenidlogin.php:37 openidlogin.php:33
 msgid "Already logged in."
 msgstr "Tu es jam authenticate."
 
+#. TRANS: Message given when there is a problem with the user's session token.
+msgid "There was a problem with your session token. Try again, please."
+msgstr "Occurreva un problema con le indicio de tu session. Per favor reproba."
+
 #. TRANS: Message given if user does not agree with the site's license.
-#: finishopenidlogin.php:48
 msgid "You can't register if you don't agree to the license."
 msgstr "Tu non pote crear un conto si tu non accepta le licentia."
 
 #. TRANS: Messag given on an unknown error.
-#: finishopenidlogin.php:57
 msgid "An unknown error has occured."
 msgstr "Un error incognite ha occurrite."
 
 #. TRANS: Instructions given after a first successful logon using OpenID.
 #. TRANS: %s is the site name.
-#: finishopenidlogin.php:73
 #, php-format
 msgid ""
 "This is the first time you've logged into %s so we must connect your OpenID "
@@ -411,39 +156,31 @@ msgstr ""
 "connecter con tu conto existente, si tu ha un."
 
 #. TRANS: Title
-#: finishopenidlogin.php:80
 msgid "OpenID Account Setup"
 msgstr "Configuration de conto OpenID"
 
-#: finishopenidlogin.php:117
 msgid "Create new account"
 msgstr "Crear nove conto"
 
-#: finishopenidlogin.php:119
 msgid "Create a new user with this nickname."
 msgstr "Crear un nove usator con iste pseudonymo."
 
-#: finishopenidlogin.php:126
 msgid "New nickname"
 msgstr "Nove pseudonymo"
 
-#: finishopenidlogin.php:128
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "1-64 minusculas o numeros, sin punctuation o spatios"
 
 #. TRANS: Button label in form in which to create a new user on the site for an OpenID.
-#: finishopenidlogin.php:162
 msgctxt "BUTTON"
 msgid "Create"
 msgstr "Crear"
 
 #. TRANS: Used as form legend for form in which to connect an OpenID to an existing user on the site.
-#: finishopenidlogin.php:176
 msgid "Connect existing account"
 msgstr "Connecter conto existente"
 
 #. TRANS: User instructions for form in which to connect an OpenID to an existing user on the site.
-#: finishopenidlogin.php:179
 msgid ""
 "If you already have an account, login with your username and password to "
 "connect it to your OpenID."
@@ -452,35 +189,29 @@ msgstr ""
 "pro connecter lo a tu OpenID."
 
 #. TRANS: Field label in form in which to connect an OpenID to an existing user on the site.
-#: finishopenidlogin.php:183
 msgid "Existing nickname"
 msgstr "Pseudonymo existente"
 
 #. TRANS: Field label in form in which to connect an OpenID to an existing user on the site.
-#: finishopenidlogin.php:187
 msgid "Password"
 msgstr "Contrasigno"
 
 #. TRANS: Button label in form in which to connect an OpenID to an existing user on the site.
-#: finishopenidlogin.php:191
 msgctxt "BUTTON"
 msgid "Connect"
 msgstr "Connecter"
 
 #. TRANS: Status message in case the response from the OpenID provider is that the logon attempt was cancelled.
-#: finishopenidlogin.php:237 finishaddopenid.php:90
 msgid "OpenID authentication cancelled."
 msgstr "Authentication OpenID cancellate."
 
 #. TRANS: OpenID authentication failed; display the error message. %s is the error message.
 #. TRANS: OpenID authentication failed; display the error message.
 #. TRANS: %s is the error message.
-#: finishopenidlogin.php:241 finishaddopenid.php:95
 #, php-format
 msgid "OpenID authentication failed: %s"
 msgstr "Le authentication OpenID ha fallite: %s"
 
-#: finishopenidlogin.php:261 finishaddopenid.php:111
 msgid ""
 "OpenID authentication aborted: you are not allowed to login to this site."
 msgstr ""
@@ -489,49 +220,274 @@ msgstr ""
 
 #. TRANS: OpenID plugin message. No new user registration is allowed on the site.
 #. TRANS: OpenID plugin message. No new user registration is allowed on the site without an invitation code, and none was provided.
-#: finishopenidlogin.php:317 finishopenidlogin.php:327
 msgid "Registration not allowed."
 msgstr "Creation de conto non permittite."
 
 #. TRANS: OpenID plugin message. No new user registration is allowed on the site without an invitation code, and the one provided was not valid.
-#: finishopenidlogin.php:335
 msgid "Not a valid invitation code."
 msgstr "Le codice de invitation es invalide."
 
 #. TRANS: OpenID plugin message. The entered new user name is blacklisted.
-#: finishopenidlogin.php:349
 msgid "Nickname not allowed."
 msgstr "Pseudonymo non permittite."
 
 #. TRANS: OpenID plugin message. The entered new user name is already used.
-#: finishopenidlogin.php:355
 msgid "Nickname already in use. Try another one."
 msgstr "Pseudonymo ja in uso. Proba un altere."
 
 #. TRANS: OpenID plugin server error. A stored OpenID cannot be retrieved.
 #. TRANS: OpenID plugin server error. A stored OpenID cannot be found.
-#: finishopenidlogin.php:363 finishopenidlogin.php:449
 msgid "Stored OpenID not found."
 msgstr "Le OpenID immagazinate non esseva trovate."
 
 #. TRANS: OpenID plugin server error.
-#: finishopenidlogin.php:373
 msgid "Creating new account for OpenID that already has a user."
 msgstr "Tentativa de crear un nove conto pro un OpenID que ha jam un usator."
 
 #. TRANS: OpenID plugin message.
-#: finishopenidlogin.php:437
 msgid "Invalid username or password."
 msgstr "Nomine de usator o contrasigno invalide."
 
 #. TRANS: OpenID plugin server error. The user or user profile could not be saved.
-#: finishopenidlogin.php:457
 msgid "Error connecting user to OpenID."
 msgstr "Error durante le connexion del usator a OpenID."
 
+#. TRANS: OpenID plugin server error.
+msgid "Cannot instantiate OpenID consumer object."
+msgstr "Non pote instantiar un objecto de consumitor OpenID."
+
+#. TRANS: OpenID plugin message. Given when an OpenID is not valid.
+msgid "Not a valid OpenID."
+msgstr "Non es un OpenID valide."
+
+#. TRANS: OpenID plugin server error. Given when the OpenID authentication request fails.
+#. TRANS: %s is the failure message.
+#, php-format
+msgid "OpenID failure: %s"
+msgstr "Fallimento de OpenID: %s"
+
+#. TRANS: OpenID plugin server error. Given when the OpenID authentication request cannot be redirected.
+#. TRANS: %s is the failure message.
+#, php-format
+msgid "Could not redirect to server: %s"
+msgstr "Non poteva rediriger al servitor: %s"
+
+#. TRANS: OpenID plugin user instructions.
+msgid ""
+"This form should automatically submit itself. If not, click the submit "
+"button to go to your OpenID provider."
+msgstr ""
+"Iste formulario deberea submitter se automaticamente. Si non, clicca super "
+"le button Submitter pro vader a tu fornitor de OpenID."
+
+#. TRANS: OpenID plugin server error.
+msgid "Error saving the profile."
+msgstr "Error durante le salveguarda del profilo."
+
+#. TRANS: OpenID plugin server error.
+msgid "Error saving the user."
+msgstr "Error durante le salveguarda del usator."
+
+#. TRANS: OpenID plugin client exception (403).
+msgid "Unauthorized URL used for OpenID login."
+msgstr ""
+"Un URL non autorisate ha essite usate pro le authentication via OpenID."
+
+#. TRANS: Title
+msgid "OpenID Login Submission"
+msgstr "Apertura de session via OpenID"
+
+#. TRANS: OpenID plugin message used while requesting authorization user's OpenID login provider.
+msgid "Requesting authorization from your login provider..."
+msgstr "Requesta autorisation de tu fornitor de authentication..."
+
+#. TRANS: OpenID plugin message. User instruction while requesting authorization user's OpenID login provider.
+msgid ""
+"If you are not redirected to your login provider in a few seconds, try "
+"pushing the button below."
+msgstr ""
+"Si tu non es redirigite a tu fornitor de authentication post pauc secundas, "
+"tenta pulsar le button hic infra."
+
+msgid "OpenID"
+msgstr "OpenID"
+
+msgid "OpenID settings"
+msgstr "Configuration OpenID"
+
+msgid "Invalid provider URL. Max length is 255 characters."
+msgstr "URL de fornitor invalide. Longitude maximal es 255 characteres."
+
+msgid "Invalid team name. Max length is 255 characters."
+msgstr "Nomine de equipa invalide. Longitude maximal es 255 characteres."
+
+msgid "Trusted provider"
+msgstr "Fornitor de confidentia"
+
+msgid ""
+"By default, users are allowed to authenticate with any OpenID provider. If "
+"you are using your own OpenID service for shared sign-in, you can restrict "
+"access to only your own users here."
+msgstr ""
+"Per predefinition, le usatores ha le permission de authenitcar se con omne "
+"fornitor de OpenID. Si tu usa tu proprie servicio OpenID pro le "
+"authentication in commun, tu pote hic restringer le accesso a solmente tu "
+"proprie usatores."
+
+msgid "Provider URL"
+msgstr "URL del fornitor"
+
+msgid ""
+"All OpenID logins will be sent to this URL; other providers may not be used."
+msgstr ""
+"Tote le authenticationes de OpenID essera inviate a iste URL; altere "
+"fornitores non pote esser usate."
+
+msgid "Append a username to base URL"
+msgstr "Adjunger un nomine de usator al URL de base"
+
+msgid ""
+"Login form will show the base URL and prompt for a username to add at the "
+"end. Use when OpenID provider URL should be the profile page for individual "
+"users."
+msgstr ""
+"Le formulario de authentication monstrara le URL de base e demandara un "
+"nomine de usator a adder al fin. Usa isto si le URL de un fornitor de OpenID "
+"debe esser le pagina de profilo pro usatores individual."
+
+msgid "Required team"
+msgstr "Equipa requirite"
+
+msgid "Only allow logins from users in the given team (Launchpad extension)."
+msgstr ""
+"Permitter solmente le apertura de session ab usatores in le equipa "
+"specificate (extension de Launchpad)."
+
+msgid "Options"
+msgstr "Optiones"
+
+msgid "Enable OpenID-only mode"
+msgstr "Activar modo OpenID sol"
+
+msgid ""
+"Require all users to login via OpenID. Warning: disables password "
+"authentication for all users!"
+msgstr ""
+"Requirer que tote le usatores aperi session via OpenID. Aviso: disactiva le "
+"authentication per contrasigno pro tote le usatores!"
+
+msgid "Save OpenID settings"
+msgstr "Salveguardar configurationes de OpenID"
+
+#. TRANS: Client error message
+msgid "Not logged in."
+msgstr "Tu non ha aperite un session."
+
+#. TRANS: message in case a user tries to add an OpenID that is already connected to them.
+msgid "You already have this OpenID!"
+msgstr "Tu jam ha iste OpenID!"
+
+#. TRANS: message in case a user tries to add an OpenID that is already used by another user.
+msgid "Someone else already has this OpenID."
+msgstr "Un altere persona jam ha iste OpenID."
+
+#. TRANS: message in case the OpenID object cannot be connected to the user.
+msgid "Error connecting user."
+msgstr "Error durante le connexion del usator."
+
+#. TRANS: message in case the user or the user profile cannot be saved in StatusNet.
+msgid "Error updating profile"
+msgstr "Error durante le actualisation del profilo"
+
+#. TRANS: Title after getting the status of the OpenID authorisation request.
+#. TRANS: OpenID plugin message. Title.
+msgid "OpenID Login"
+msgstr "Apertura de session via OpenID"
+
+#, php-format
+msgid ""
+"[OpenID](%%doc.openid%%) lets you log into many sites with the same user "
+"account. Manage your associated OpenIDs from here."
+msgstr ""
+"[OpenID](%%doc.openid%%) permitte authenticar te a multe sitos con le mesme "
+"conto de usator. Tu pote gerer hic tu OpenIDs associate."
+
+msgid "Add OpenID"
+msgstr "Adder OpenID"
+
+msgid ""
+"If you want to add an OpenID to your account, enter it in the box below and "
+"click \"Add\"."
+msgstr ""
+"Si tu vole adder un OpenID a tu conto, entra lo in le quadro hic infra e "
+"clicca \"Adder\"."
+
+msgid "Add"
+msgstr "Adder"
+
+msgid "Remove OpenID"
+msgstr "Remover OpenID"
+
+msgid ""
+"Removing your only OpenID would make it impossible to log in! If you need to "
+"remove it, add another OpenID first."
+msgstr ""
+"Le remotion de tu sol OpenID renderea le apertura de session impossibile! Si "
+"tu debe remover lo, adde primo un altere OpenID."
+
+msgid ""
+"You can remove an OpenID from your account by clicking the button marked "
+"\"Remove\"."
+msgstr ""
+"Tu pote remover un OpenID de tu conto per cliccar le button \"Remover\"."
+
+msgid "Remove"
+msgstr "Remover"
+
+msgid "OpenID Trusted Sites"
+msgstr "Sitos OpenID de confidentia"
+
+msgid ""
+"The following sites are allowed to access your identity and log you in. You "
+"can remove a site from this list to deny it access to your OpenID."
+msgstr ""
+"Le sequente sitos ha le permission de acceder a tu identitate e de "
+"authenticar te. Tu pote remover un sito de iste lista pro negar a illo le "
+"accesso a tu OpenID."
+
+msgid "Can't add new providers."
+msgstr "Non pote adder nove fornitores."
+
+msgid "Something weird happened."
+msgstr "Qualcosa de bizarre occurreva."
+
+msgid "No such OpenID trustroot."
+msgstr "Iste \"trustroot\" de OpenID non existe."
+
+msgid "Trustroots removed"
+msgstr "\"Trustroots\" removite"
+
+msgid "No such OpenID."
+msgstr "Iste OpenID non existe."
+
+msgid "That OpenID does not belong to you."
+msgstr "Iste OpenID non appertine a te."
+
+msgid "OpenID removed."
+msgstr "OpenID removite."
+
+#. TRANS: OpenID plugin client error given trying to add an unauthorised OpenID to a user (403).
+#, php-format
+msgid "You are not authorized to use the identity %s."
+msgstr "Tu non es autorisate a usar le identitate %s."
+
+#. TRANS: OpenID plugin client error given when not getting a response for a given OpenID provider (500).
+msgid "Just an OpenID provider. Nothing to see here, move along..."
+msgstr ""
+"Solmente un fornitor de OpenID. Nihil a vider hic, per favor continua..."
+
 #. TRANS: OpenID plugin message. Rememberme logins have to reauthenticate before changing any profile settings.
 #. TRANS: "OpenID" is the display text for a link with URL "(%%doc.openid%%)".
-#: openidlogin.php:74
 #, php-format
 msgid ""
 "For security reasons, please re-login with your [OpenID](%%doc.openid%%) "
@@ -542,84 +498,21 @@ msgstr ""
 
 #. TRANS: OpenID plugin message.
 #. TRANS: "OpenID" is the display text for a link with URL "(%%doc.openid%%)".
-#: openidlogin.php:80
 #, php-format
 msgid "Login with an [OpenID](%%doc.openid%%) account."
 msgstr "Aperir session con un conto [OpenID](%%doc.openid%%)."
 
-#. TRANS: OpenID plugin message. Title.
-#. TRANS: Title after getting the status of the OpenID authorisation request.
-#: openidlogin.php:114 finishaddopenid.php:187
-msgid "OpenID Login"
-msgstr "Apertura de session via OpenID"
-
 #. TRANS: OpenID plugin logon form checkbox label for setting to put the OpenID information in a cookie.
-#: openidlogin.php:160
 msgid "Remember me"
 msgstr "Memorar me"
 
 #. TRANS: OpenID plugin logon form field instructions.
-#: openidlogin.php:162
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 "Aperir session automaticamente in le futuro; non pro computatores usate in "
 "commun!"
 
 #. TRANS: OpenID plugin logon form button label to start logon with the data provided in the logon form.
-#: openidlogin.php:167
 msgctxt "BUTTON"
 msgid "Login"
 msgstr "Aperir session"
-
-#: openidtrust.php:52
-msgid "OpenID Identity Verification"
-msgstr "Verification de identitate via OpenID"
-
-#: openidtrust.php:70
-msgid ""
-"This page should only be reached during OpenID processing, not directly."
-msgstr ""
-"Iste pagina debe esser attingite solmente durante le tractamento de un "
-"OpenID, non directemente."
-
-#: openidtrust.php:118
-#, php-format
-msgid ""
-"%s  has asked to verify your identity. Click Continue to verify your "
-"identity and login without creating a new password."
-msgstr ""
-"%s  ha demandate de verificar tu identitate. Clicca super Continuar pro "
-"verificar tu identitate e aperir session sin crear un nove contrasigno."
-
-#: openidtrust.php:136
-msgid "Continue"
-msgstr "Continuar"
-
-#: openidtrust.php:137
-msgid "Cancel"
-msgstr "Cancellar"
-
-#. TRANS: Client error message
-#: finishaddopenid.php:68
-msgid "Not logged in."
-msgstr "Tu non ha aperite un session."
-
-#. TRANS: message in case a user tries to add an OpenID that is already connected to them.
-#: finishaddopenid.php:122
-msgid "You already have this OpenID!"
-msgstr "Tu jam ha iste OpenID!"
-
-#. TRANS: message in case a user tries to add an OpenID that is already used by another user.
-#: finishaddopenid.php:125
-msgid "Someone else already has this OpenID."
-msgstr "Un altere persona jam ha iste OpenID."
-
-#. TRANS: message in case the OpenID object cannot be connected to the user.
-#: finishaddopenid.php:138
-msgid "Error connecting user."
-msgstr "Error durante le connexion del usator."
-
-#. TRANS: message in case the user or the user profile cannot be saved in StatusNet.
-#: finishaddopenid.php:145
-msgid "Error updating profile"
-msgstr "Error durante le actualisation del profilo"
diff --git a/plugins/OpenID/locale/mk/LC_MESSAGES/OpenID.po b/plugins/OpenID/locale/mk/LC_MESSAGES/OpenID.po
index 2f9547cb13..e86602a17a 100644
--- a/plugins/OpenID/locale/mk/LC_MESSAGES/OpenID.po
+++ b/plugins/OpenID/locale/mk/LC_MESSAGES/OpenID.po
@@ -9,300 +9,67 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OpenID\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:34+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:49+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-14 17:22:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:46:02+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-openid\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
 
-#: openidsettings.php:58 openidadminpanel.php:65
-msgid "OpenID settings"
-msgstr "Нагодувања за OpenID"
+msgid "OpenID Identity Verification"
+msgstr "OpenID - потврда на идентитет"
+
+msgid ""
+"This page should only be reached during OpenID processing, not directly."
+msgstr ""
+"До оваа страница треба да се доаѓа само во текот на постапката на OpenID, а "
+"не директно."
 
-#: openidsettings.php:69
 #, php-format
 msgid ""
-"[OpenID](%%doc.openid%%) lets you log into many sites with the same user "
-"account. Manage your associated OpenIDs from here."
+"%s  has asked to verify your identity. Click Continue to verify your "
+"identity and login without creating a new password."
 msgstr ""
-"[OpenID](%%doc.openid%%) Ви дава можност да се најавувате на многубројни "
-"мреж. места со една иста сметка. Од ова место можете да раководите со Вашите "
-"OpenID-ја."
+"%s  побара да го потврдите Вашиот идентитет. Кликнете на „Продолжи“ за да "
+"потврдите и да се најавите без да треба да ставате нова лозинка."
 
-#: openidsettings.php:100
-msgid "Add OpenID"
-msgstr "Додај OpenID"
+msgid "Continue"
+msgstr "Продолжи"
 
-#: openidsettings.php:103
-msgid ""
-"If you want to add an OpenID to your account, enter it in the box below and "
-"click \"Add\"."
-msgstr ""
-"Доколку не сакате да приложите OpenID кон Вашата сметка, тогаш внесете ја во "
-"полето подолу и кликнете на „Додај“."
-
-#. TRANS: OpenID plugin logon form field label.
-#: openidsettings.php:108 OpenIDPlugin.php:703 openidlogin.php:152
-msgid "OpenID URL"
-msgstr "URL на OpenID"
-
-#: openidsettings.php:118
-msgid "Add"
-msgstr "Додај"
-
-#: openidsettings.php:130
-msgid "Remove OpenID"
-msgstr "Отстрани OpenID"
-
-#: openidsettings.php:135
-msgid ""
-"Removing your only OpenID would make it impossible to log in! If you need to "
-"remove it, add another OpenID first."
-msgstr ""
-"Ако го отстраните Вашиот единствен OpenID, тогаш нема да можете да се "
-"најавите! Ако треба да го отстраните, тогаш најпрвин додадете друг OpenID."
-
-#: openidsettings.php:150
-msgid ""
-"You can remove an OpenID from your account by clicking the button marked "
-"\"Remove\"."
-msgstr "Отстранувањето на OpenID од сметката се врши преку копчето „Отстрани“."
-
-#: openidsettings.php:173 openidsettings.php:214
-msgid "Remove"
-msgstr "Отстрани"
-
-#: openidsettings.php:187
-msgid "OpenID Trusted Sites"
-msgstr "Мреж. места од доверба на OpenID"
-
-#: openidsettings.php:190
-msgid ""
-"The following sites are allowed to access your identity and log you in. You "
-"can remove a site from this list to deny it access to your OpenID."
-msgstr ""
-"Следниве мреж. места имаат дозволен пристап до Вашиот идентитет и дозвола за "
-"да Ве најават. Ако сакате некое мрежно место да нема пристап до Вашиот "
-"OpenID, тогаш отстранете го од списоков."
-
-#. TRANS: Message given when there is a problem with the user's session token.
-#: openidsettings.php:232 finishopenidlogin.php:42
-msgid "There was a problem with your session token. Try again, please."
-msgstr "Се појави проблем со жетонот на Вашата сесија. Обидете се подоцна."
-
-#: openidsettings.php:239
-msgid "Can't add new providers."
-msgstr "Не можам да додадам нови услужители."
-
-#: openidsettings.php:252
-msgid "Something weird happened."
-msgstr "Се случи нешто чудно."
-
-#: openidsettings.php:276
-msgid "No such OpenID trustroot."
-msgstr "Нема таков довербен извор (trustroot) за OpenID"
-
-#: openidsettings.php:280
-msgid "Trustroots removed"
-msgstr "Довербените извори (trustroots) се отстранети"
-
-#: openidsettings.php:303
-msgid "No such OpenID."
-msgstr "Нема таков OpenID."
-
-#: openidsettings.php:308
-msgid "That OpenID does not belong to you."
-msgstr "Тој OpenID не Ви припаѓа Вам."
-
-#: openidsettings.php:312
-msgid "OpenID removed."
-msgstr "OpenID е отстранет."
-
-#: openidadminpanel.php:54
-msgid "OpenID"
-msgstr "OpenID"
-
-#: openidadminpanel.php:147
-msgid "Invalid provider URL. Max length is 255 characters."
-msgstr "Неважечка URL-адреса за услужителот. Дозволени се највеќе 255 знаци."
-
-#: openidadminpanel.php:153
-msgid "Invalid team name. Max length is 255 characters."
-msgstr "Неважечко екипно име. Дозволени се највеќе 255 знаци."
-
-#: openidadminpanel.php:210
-msgid "Trusted provider"
-msgstr "Услужник од доверба"
-
-#: openidadminpanel.php:212
-msgid ""
-"By default, users are allowed to authenticate with any OpenID provider. If "
-"you are using your own OpenID service for shared sign-in, you can restrict "
-"access to only your own users here."
-msgstr ""
-"Корисниците по основно можат да се потврдат со било кој OpenID-услужник. "
-"Доколку користите сопствена OpenID-сужба за заедничка најава, тука можете да "
-"им доделите право на пристап само на Вашите корисници."
-
-#: openidadminpanel.php:220
-msgid "Provider URL"
-msgstr "URL-адреса на услужникот"
-
-#: openidadminpanel.php:221
-msgid ""
-"All OpenID logins will be sent to this URL; other providers may not be used."
-msgstr ""
-"Сите OpenID-најави ќе бидат испратени на следнава URL-адреса. Нема да можат "
-"да се користат други услужници."
-
-#: openidadminpanel.php:228
-msgid "Append a username to base URL"
-msgstr "Приложи корисничко име кон основната URL-адреса"
-
-#: openidadminpanel.php:230
-msgid ""
-"Login form will show the base URL and prompt for a username to add at the "
-"end. Use when OpenID provider URL should be the profile page for individual "
-"users."
-msgstr ""
-"Образецот за најава ќе ја прикаже основната URL-адреса и ќе Ви побара на "
-"крајот да додадете корисничко име. Користете го ова кога URL-адресата на "
-"OpenID-услужникот треба да биде профилната страница за поединечни корисници."
-
-#: openidadminpanel.php:238
-msgid "Required team"
-msgstr "Потребна екипа"
-
-#: openidadminpanel.php:239
-msgid "Only allow logins from users in the given team (Launchpad extension)."
-msgstr ""
-"Дозволувај само најави на корисници од дадената екипа (додаток „Launchpad“)."
-
-#: openidadminpanel.php:251
-msgid "Options"
-msgstr "Нагодувања"
-
-#: openidadminpanel.php:258
-msgid "Enable OpenID-only mode"
-msgstr "Вклучи режим „само OpenID“"
-
-#: openidadminpanel.php:260
-msgid ""
-"Require all users to login via OpenID. Warning: disables password "
-"authentication for all users!"
-msgstr ""
-"Барај од сите корисници да се најавуваат преку OpenID. ПРЕДУПРЕДУВАЊЕ: ова "
-"ја оневозможува потврдата на лозинка за сите корисници!"
-
-#: openidadminpanel.php:278
-msgid "Save OpenID settings"
-msgstr "Зачувај нагодувања за OpenID"
-
-#. TRANS: OpenID plugin server error.
-#: openid.php:138
-msgid "Cannot instantiate OpenID consumer object."
-msgstr "Не можам да го повикам потрошувачкиот објект за OpenID."
-
-#. TRANS: OpenID plugin message. Given when an OpenID is not valid.
-#: openid.php:150
-msgid "Not a valid OpenID."
-msgstr "Ова не е важечки OpenID."
-
-#. TRANS: OpenID plugin server error. Given when the OpenID authentication request fails.
-#. TRANS: %s is the failure message.
-#: openid.php:155
-#, php-format
-msgid "OpenID failure: %s"
-msgstr "OpenID не успеа: %s"
-
-#. TRANS: OpenID plugin server error. Given when the OpenID authentication request cannot be redirected.
-#. TRANS: %s is the failure message.
-#: openid.php:205
-#, php-format
-msgid "Could not redirect to server: %s"
-msgstr "Не можев да пренасочам кон опслужувачот: %s"
-
-#. TRANS: OpenID plugin user instructions.
-#: openid.php:244
-msgid ""
-"This form should automatically submit itself. If not, click the submit "
-"button to go to your OpenID provider."
-msgstr ""
-"Овој образец би требало да се поднесе самиот. Ако тоа не се случи, кликнете "
-"на копчето „Поднеси“ за да дојдете до Вашиот OpenID-услужник."
-
-#. TRANS: OpenID plugin server error.
-#: openid.php:280
-msgid "Error saving the profile."
-msgstr "Грешка при зачувувањето на профилот."
-
-#. TRANS: OpenID plugin server error.
-#: openid.php:292
-msgid "Error saving the user."
-msgstr "Грешка при зачувувањето на корисникот."
-
-#. TRANS: OpenID plugin client exception (403).
-#: openid.php:322
-msgid "Unauthorized URL used for OpenID login."
-msgstr "Употребена е неовластена URL-адреса за најавата со OpenID."
-
-#. TRANS: Title
-#: openid.php:370
-msgid "OpenID Login Submission"
-msgstr "Поднесување на најава со OpenID"
-
-#. TRANS: OpenID plugin message used while requesting authorization user's OpenID login provider.
-#: openid.php:381
-msgid "Requesting authorization from your login provider..."
-msgstr "Барам овластување од Вашиот услужител за најава..."
-
-#. TRANS: OpenID plugin message. User instruction while requesting authorization user's OpenID login provider.
-#: openid.php:385
-msgid ""
-"If you are not redirected to your login provider in a few seconds, try "
-"pushing the button below."
-msgstr ""
-"Ако не бидете префрлени на Вашиот услужител за најава за неколку секунди, "
-"тогаш пристиснете го копчето подолу."
+msgid "Cancel"
+msgstr "Откажи"
 
 #. TRANS: Tooltip for main menu option "Login"
-#: OpenIDPlugin.php:218
 msgctxt "TOOLTIP"
 msgid "Login to the site"
 msgstr "Најава на мреж. место"
 
 #. TRANS: Main menu option when not logged in to log in
-#: OpenIDPlugin.php:221
 msgctxt "MENU"
 msgid "Login"
 msgstr "Најава"
 
 #. TRANS: Tooltip for main menu option "Help"
-#: OpenIDPlugin.php:226
 msgctxt "TOOLTIP"
 msgid "Help me!"
 msgstr "Напомош!"
 
 #. TRANS: Main menu option for help on the StatusNet site
-#: OpenIDPlugin.php:229
 msgctxt "MENU"
 msgid "Help"
 msgstr "Помош"
 
 #. TRANS: Tooltip for main menu option "Search"
-#: OpenIDPlugin.php:235
 msgctxt "TOOLTIP"
 msgid "Search for people or text"
 msgstr "Пребарување на луѓе или текст"
 
 #. TRANS: Main menu option when logged in or when the StatusNet instance is not private
-#: OpenIDPlugin.php:238
 msgctxt "MENU"
 msgid "Search"
 msgstr "Пребарај"
@@ -310,92 +77,73 @@ msgstr "Пребарај"
 #. TRANS: OpenID plugin menu item on site logon page.
 #. TRANS: OpenID plugin menu item on user settings page.
 #. TRANS: OpenID configuration menu item.
-#: OpenIDPlugin.php:295 OpenIDPlugin.php:331 OpenIDPlugin.php:605
 msgctxt "MENU"
 msgid "OpenID"
 msgstr "OpenID"
 
 #. TRANS: OpenID plugin tooltip for logon menu item.
-#: OpenIDPlugin.php:297
 msgid "Login or register with OpenID"
 msgstr "Најава или регистрација со OpenID"
 
 #. TRANS: OpenID plugin tooltip for user settings menu item.
-#: OpenIDPlugin.php:333
 msgid "Add or remove OpenIDs"
 msgstr "Додај или отстрани OpenID-ја"
 
 #. TRANS: Tooltip for OpenID configuration menu item.
-#: OpenIDPlugin.php:607
 msgid "OpenID configuration"
 msgstr "Поставки за OpenID"
 
 #. TRANS: OpenID plugin description.
-#: OpenIDPlugin.php:653
 msgid "Use <a href=\"http://openid.net/\">OpenID</a> to login to the site."
 msgstr "Користете <a href=\"http://openid.net/\">OpenID</a> за најава."
 
 #. TRANS: button label for OAuth authorization page when needing OpenID authentication first.
-#: OpenIDPlugin.php:663
 msgctxt "BUTTON"
 msgid "Continue"
 msgstr "Продолжи"
 
 #. TRANS: OpenID plugin logon form legend.
-#: OpenIDPlugin.php:680 openidlogin.php:132
 msgid "OpenID login"
 msgstr "Најава со OpenID"
 
 #. TRANS: Field label.
-#: OpenIDPlugin.php:688 openidlogin.php:139
 msgid "OpenID provider"
 msgstr "Услужител за OpenID"
 
 #. TRANS: Form guide.
-#: OpenIDPlugin.php:697 openidlogin.php:147
 msgid "Enter your username."
 msgstr "Внесете го Вашето корисничко име."
 
 #. TRANS: Form guide.
-#: OpenIDPlugin.php:699 openidlogin.php:148
 msgid "You will be sent to the provider's site for authentication."
 msgstr "Ќе бидете префрлени на мреж. место на услужникот за потврда."
 
+#. TRANS: OpenID plugin logon form field label.
+msgid "OpenID URL"
+msgstr "URL на OpenID"
+
 #. TRANS: OpenID plugin logon form field instructions.
-#: OpenIDPlugin.php:706 openidlogin.php:155
 msgid "Your OpenID URL"
 msgstr "URL-адреса на Вашиот OpenID"
 
-#. TRANS: OpenID plugin client error given trying to add an unauthorised OpenID to a user (403).
-#: openidserver.php:116
-#, php-format
-msgid "You are not authorized to use the identity %s."
-msgstr "Не сте овластени да го користите идентитетот %s."
-
-#. TRANS: OpenID plugin client error given when not getting a response for a given OpenID provider (500).
-#: openidserver.php:137
-msgid "Just an OpenID provider. Nothing to see here, move along..."
-msgstr ""
-"Ова е просто услужник за OpenID. Нема ништо интересно, продолжете понатаму..."
-
 #. TRANS: Client error message trying to log on with OpenID while already logged on.
-#: finishopenidlogin.php:37 openidlogin.php:33
 msgid "Already logged in."
 msgstr "Веќе сте најавени."
 
+#. TRANS: Message given when there is a problem with the user's session token.
+msgid "There was a problem with your session token. Try again, please."
+msgstr "Се појави проблем со жетонот на Вашата сесија. Обидете се подоцна."
+
 #. TRANS: Message given if user does not agree with the site's license.
-#: finishopenidlogin.php:48
 msgid "You can't register if you don't agree to the license."
 msgstr "Не можете да се регистрирате ако не се согласувате со лиценцата."
 
 #. TRANS: Messag given on an unknown error.
-#: finishopenidlogin.php:57
 msgid "An unknown error has occured."
 msgstr "Се појави непозната грешка."
 
 #. TRANS: Instructions given after a first successful logon using OpenID.
 #. TRANS: %s is the site name.
-#: finishopenidlogin.php:73
 #, php-format
 msgid ""
 "This is the first time you've logged into %s so we must connect your OpenID "
@@ -407,39 +155,31 @@ msgstr ""
 "се поврзете со Вашата постоечка сметка (ако ја имате)."
 
 #. TRANS: Title
-#: finishopenidlogin.php:80
 msgid "OpenID Account Setup"
 msgstr "Поставување на OpenID-сметка"
 
-#: finishopenidlogin.php:117
 msgid "Create new account"
 msgstr "Создај нова сметка"
 
-#: finishopenidlogin.php:119
 msgid "Create a new user with this nickname."
 msgstr "Создај нов корисник со овој прекар."
 
-#: finishopenidlogin.php:126
 msgid "New nickname"
 msgstr "Нов прекар"
 
-#: finishopenidlogin.php:128
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "1-64 мали букви или бројки, без интерпункциски знаци и празни места"
 
 #. TRANS: Button label in form in which to create a new user on the site for an OpenID.
-#: finishopenidlogin.php:162
 msgctxt "BUTTON"
 msgid "Create"
 msgstr "Создај"
 
 #. TRANS: Used as form legend for form in which to connect an OpenID to an existing user on the site.
-#: finishopenidlogin.php:176
 msgid "Connect existing account"
 msgstr "Поврзи постоечка сметка"
 
 #. TRANS: User instructions for form in which to connect an OpenID to an existing user on the site.
-#: finishopenidlogin.php:179
 msgid ""
 "If you already have an account, login with your username and password to "
 "connect it to your OpenID."
@@ -448,35 +188,29 @@ msgstr ""
 "поврзете со Вашиот OpenID."
 
 #. TRANS: Field label in form in which to connect an OpenID to an existing user on the site.
-#: finishopenidlogin.php:183
 msgid "Existing nickname"
 msgstr "Постоечки прекар"
 
 #. TRANS: Field label in form in which to connect an OpenID to an existing user on the site.
-#: finishopenidlogin.php:187
 msgid "Password"
 msgstr "Лозинка"
 
 #. TRANS: Button label in form in which to connect an OpenID to an existing user on the site.
-#: finishopenidlogin.php:191
 msgctxt "BUTTON"
 msgid "Connect"
 msgstr "Поврзи се"
 
 #. TRANS: Status message in case the response from the OpenID provider is that the logon attempt was cancelled.
-#: finishopenidlogin.php:237 finishaddopenid.php:90
 msgid "OpenID authentication cancelled."
 msgstr "Потврдувањето на OpenID е откажано."
 
 #. TRANS: OpenID authentication failed; display the error message. %s is the error message.
 #. TRANS: OpenID authentication failed; display the error message.
 #. TRANS: %s is the error message.
-#: finishopenidlogin.php:241 finishaddopenid.php:95
 #, php-format
 msgid "OpenID authentication failed: %s"
 msgstr "Потврдувањето на OpenID не успеа: %s"
 
-#: finishopenidlogin.php:261 finishaddopenid.php:111
 msgid ""
 "OpenID authentication aborted: you are not allowed to login to this site."
 msgstr ""
@@ -485,49 +219,271 @@ msgstr ""
 
 #. TRANS: OpenID plugin message. No new user registration is allowed on the site.
 #. TRANS: OpenID plugin message. No new user registration is allowed on the site without an invitation code, and none was provided.
-#: finishopenidlogin.php:317 finishopenidlogin.php:327
 msgid "Registration not allowed."
 msgstr "Регистрацијата не е дозволена."
 
 #. TRANS: OpenID plugin message. No new user registration is allowed on the site without an invitation code, and the one provided was not valid.
-#: finishopenidlogin.php:335
 msgid "Not a valid invitation code."
 msgstr "Ова не е важечки код за покана."
 
 #. TRANS: OpenID plugin message. The entered new user name is blacklisted.
-#: finishopenidlogin.php:349
 msgid "Nickname not allowed."
 msgstr "Прекарот не е дозволен."
 
 #. TRANS: OpenID plugin message. The entered new user name is already used.
-#: finishopenidlogin.php:355
 msgid "Nickname already in use. Try another one."
 msgstr "Прекарот е зафатен. Одберете друг."
 
 #. TRANS: OpenID plugin server error. A stored OpenID cannot be retrieved.
 #. TRANS: OpenID plugin server error. A stored OpenID cannot be found.
-#: finishopenidlogin.php:363 finishopenidlogin.php:449
 msgid "Stored OpenID not found."
 msgstr "Складираниот OpenID не е пронајден."
 
 #. TRANS: OpenID plugin server error.
-#: finishopenidlogin.php:373
 msgid "Creating new account for OpenID that already has a user."
 msgstr "Создавање на сметка за OpenID што веќе има корисник."
 
 #. TRANS: OpenID plugin message.
-#: finishopenidlogin.php:437
 msgid "Invalid username or password."
 msgstr "Неважечко корисничко име или лозинка."
 
 #. TRANS: OpenID plugin server error. The user or user profile could not be saved.
-#: finishopenidlogin.php:457
 msgid "Error connecting user to OpenID."
 msgstr "Грешка при поврзувањето на корисникот со OpenID."
 
+#. TRANS: OpenID plugin server error.
+msgid "Cannot instantiate OpenID consumer object."
+msgstr "Не можам да го повикам потрошувачкиот објект за OpenID."
+
+#. TRANS: OpenID plugin message. Given when an OpenID is not valid.
+msgid "Not a valid OpenID."
+msgstr "Ова не е важечки OpenID."
+
+#. TRANS: OpenID plugin server error. Given when the OpenID authentication request fails.
+#. TRANS: %s is the failure message.
+#, php-format
+msgid "OpenID failure: %s"
+msgstr "OpenID не успеа: %s"
+
+#. TRANS: OpenID plugin server error. Given when the OpenID authentication request cannot be redirected.
+#. TRANS: %s is the failure message.
+#, php-format
+msgid "Could not redirect to server: %s"
+msgstr "Не можев да пренасочам кон опслужувачот: %s"
+
+#. TRANS: OpenID plugin user instructions.
+msgid ""
+"This form should automatically submit itself. If not, click the submit "
+"button to go to your OpenID provider."
+msgstr ""
+"Овој образец би требало да се поднесе самиот. Ако тоа не се случи, кликнете "
+"на копчето „Поднеси“ за да дојдете до Вашиот OpenID-услужник."
+
+#. TRANS: OpenID plugin server error.
+msgid "Error saving the profile."
+msgstr "Грешка при зачувувањето на профилот."
+
+#. TRANS: OpenID plugin server error.
+msgid "Error saving the user."
+msgstr "Грешка при зачувувањето на корисникот."
+
+#. TRANS: OpenID plugin client exception (403).
+msgid "Unauthorized URL used for OpenID login."
+msgstr "Употребена е неовластена URL-адреса за најавата со OpenID."
+
+#. TRANS: Title
+msgid "OpenID Login Submission"
+msgstr "Поднесување на најава со OpenID"
+
+#. TRANS: OpenID plugin message used while requesting authorization user's OpenID login provider.
+msgid "Requesting authorization from your login provider..."
+msgstr "Барам овластување од Вашиот услужител за најава..."
+
+#. TRANS: OpenID plugin message. User instruction while requesting authorization user's OpenID login provider.
+msgid ""
+"If you are not redirected to your login provider in a few seconds, try "
+"pushing the button below."
+msgstr ""
+"Ако не бидете префрлени на Вашиот услужител за најава за неколку секунди, "
+"тогаш пристиснете го копчето подолу."
+
+msgid "OpenID"
+msgstr "OpenID"
+
+msgid "OpenID settings"
+msgstr "Нагодувања за OpenID"
+
+msgid "Invalid provider URL. Max length is 255 characters."
+msgstr "Неважечка URL-адреса за услужителот. Дозволени се највеќе 255 знаци."
+
+msgid "Invalid team name. Max length is 255 characters."
+msgstr "Неважечко екипно име. Дозволени се највеќе 255 знаци."
+
+msgid "Trusted provider"
+msgstr "Услужник од доверба"
+
+msgid ""
+"By default, users are allowed to authenticate with any OpenID provider. If "
+"you are using your own OpenID service for shared sign-in, you can restrict "
+"access to only your own users here."
+msgstr ""
+"Корисниците по основно можат да се потврдат со било кој OpenID-услужник. "
+"Доколку користите сопствена OpenID-сужба за заедничка најава, тука можете да "
+"им доделите право на пристап само на Вашите корисници."
+
+msgid "Provider URL"
+msgstr "URL-адреса на услужникот"
+
+msgid ""
+"All OpenID logins will be sent to this URL; other providers may not be used."
+msgstr ""
+"Сите OpenID-најави ќе бидат испратени на следнава URL-адреса. Нема да можат "
+"да се користат други услужници."
+
+msgid "Append a username to base URL"
+msgstr "Приложи корисничко име кон основната URL-адреса"
+
+msgid ""
+"Login form will show the base URL and prompt for a username to add at the "
+"end. Use when OpenID provider URL should be the profile page for individual "
+"users."
+msgstr ""
+"Образецот за најава ќе ја прикаже основната URL-адреса и ќе Ви побара на "
+"крајот да додадете корисничко име. Користете го ова кога URL-адресата на "
+"OpenID-услужникот треба да биде профилната страница за поединечни корисници."
+
+msgid "Required team"
+msgstr "Потребна екипа"
+
+msgid "Only allow logins from users in the given team (Launchpad extension)."
+msgstr ""
+"Дозволувај само најави на корисници од дадената екипа (додаток „Launchpad“)."
+
+msgid "Options"
+msgstr "Нагодувања"
+
+msgid "Enable OpenID-only mode"
+msgstr "Вклучи режим „само OpenID“"
+
+msgid ""
+"Require all users to login via OpenID. Warning: disables password "
+"authentication for all users!"
+msgstr ""
+"Барај од сите корисници да се најавуваат преку OpenID. ПРЕДУПРЕДУВАЊЕ: ова "
+"ја оневозможува потврдата на лозинка за сите корисници!"
+
+msgid "Save OpenID settings"
+msgstr "Зачувај нагодувања за OpenID"
+
+#. TRANS: Client error message
+msgid "Not logged in."
+msgstr "Не сте најавени."
+
+#. TRANS: message in case a user tries to add an OpenID that is already connected to them.
+msgid "You already have this OpenID!"
+msgstr "Веќе го имате овој OpenID!"
+
+#. TRANS: message in case a user tries to add an OpenID that is already used by another user.
+msgid "Someone else already has this OpenID."
+msgstr "Некој друг веќе го зафатил ова OpenID."
+
+#. TRANS: message in case the OpenID object cannot be connected to the user.
+msgid "Error connecting user."
+msgstr "Грешка при поврзувањето на корисникот."
+
+#. TRANS: message in case the user or the user profile cannot be saved in StatusNet.
+msgid "Error updating profile"
+msgstr "Грешка при подновувањето на профилот"
+
+#. TRANS: Title after getting the status of the OpenID authorisation request.
+#. TRANS: OpenID plugin message. Title.
+msgid "OpenID Login"
+msgstr "OpenID-Најава"
+
+#, php-format
+msgid ""
+"[OpenID](%%doc.openid%%) lets you log into many sites with the same user "
+"account. Manage your associated OpenIDs from here."
+msgstr ""
+"[OpenID](%%doc.openid%%) Ви дава можност да се најавувате на многубројни "
+"мреж. места со една иста сметка. Од ова место можете да раководите со Вашите "
+"OpenID-ја."
+
+msgid "Add OpenID"
+msgstr "Додај OpenID"
+
+msgid ""
+"If you want to add an OpenID to your account, enter it in the box below and "
+"click \"Add\"."
+msgstr ""
+"Доколку не сакате да приложите OpenID кон Вашата сметка, тогаш внесете ја во "
+"полето подолу и кликнете на „Додај“."
+
+msgid "Add"
+msgstr "Додај"
+
+msgid "Remove OpenID"
+msgstr "Отстрани OpenID"
+
+msgid ""
+"Removing your only OpenID would make it impossible to log in! If you need to "
+"remove it, add another OpenID first."
+msgstr ""
+"Ако го отстраните Вашиот единствен OpenID, тогаш нема да можете да се "
+"најавите! Ако треба да го отстраните, тогаш најпрвин додадете друг OpenID."
+
+msgid ""
+"You can remove an OpenID from your account by clicking the button marked "
+"\"Remove\"."
+msgstr "Отстранувањето на OpenID од сметката се врши преку копчето „Отстрани“."
+
+msgid "Remove"
+msgstr "Отстрани"
+
+msgid "OpenID Trusted Sites"
+msgstr "Мреж. места од доверба на OpenID"
+
+msgid ""
+"The following sites are allowed to access your identity and log you in. You "
+"can remove a site from this list to deny it access to your OpenID."
+msgstr ""
+"Следниве мреж. места имаат дозволен пристап до Вашиот идентитет и дозвола за "
+"да Ве најават. Ако сакате некое мрежно место да нема пристап до Вашиот "
+"OpenID, тогаш отстранете го од списоков."
+
+msgid "Can't add new providers."
+msgstr "Не можам да додадам нови услужители."
+
+msgid "Something weird happened."
+msgstr "Се случи нешто чудно."
+
+msgid "No such OpenID trustroot."
+msgstr "Нема таков довербен извор (trustroot) за OpenID"
+
+msgid "Trustroots removed"
+msgstr "Довербените извори (trustroots) се отстранети"
+
+msgid "No such OpenID."
+msgstr "Нема таков OpenID."
+
+msgid "That OpenID does not belong to you."
+msgstr "Тој OpenID не Ви припаѓа Вам."
+
+msgid "OpenID removed."
+msgstr "OpenID е отстранет."
+
+#. TRANS: OpenID plugin client error given trying to add an unauthorised OpenID to a user (403).
+#, php-format
+msgid "You are not authorized to use the identity %s."
+msgstr "Не сте овластени да го користите идентитетот %s."
+
+#. TRANS: OpenID plugin client error given when not getting a response for a given OpenID provider (500).
+msgid "Just an OpenID provider. Nothing to see here, move along..."
+msgstr ""
+"Ова е просто услужник за OpenID. Нема ништо интересно, продолжете понатаму..."
+
 #. TRANS: OpenID plugin message. Rememberme logins have to reauthenticate before changing any profile settings.
 #. TRANS: "OpenID" is the display text for a link with URL "(%%doc.openid%%)".
-#: openidlogin.php:74
 #, php-format
 msgid ""
 "For security reasons, please re-login with your [OpenID](%%doc.openid%%) "
@@ -538,83 +494,20 @@ msgstr ""
 
 #. TRANS: OpenID plugin message.
 #. TRANS: "OpenID" is the display text for a link with URL "(%%doc.openid%%)".
-#: openidlogin.php:80
 #, php-format
 msgid "Login with an [OpenID](%%doc.openid%%) account."
 msgstr "Најава со сметка на [OpenID](%%doc.openid%%)."
 
-#. TRANS: OpenID plugin message. Title.
-#. TRANS: Title after getting the status of the OpenID authorisation request.
-#: openidlogin.php:114 finishaddopenid.php:187
-msgid "OpenID Login"
-msgstr "OpenID-Најава"
-
 #. TRANS: OpenID plugin logon form checkbox label for setting to put the OpenID information in a cookie.
-#: openidlogin.php:160
 msgid "Remember me"
 msgstr "Запомни ме"
 
 #. TRANS: OpenID plugin logon form field instructions.
-#: openidlogin.php:162
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 "Отсега врши автоматска најава. Не треба да се користи за јавни сметачи!"
 
 #. TRANS: OpenID plugin logon form button label to start logon with the data provided in the logon form.
-#: openidlogin.php:167
 msgctxt "BUTTON"
 msgid "Login"
 msgstr "Најава"
-
-#: openidtrust.php:52
-msgid "OpenID Identity Verification"
-msgstr "OpenID - потврда на идентитет"
-
-#: openidtrust.php:70
-msgid ""
-"This page should only be reached during OpenID processing, not directly."
-msgstr ""
-"До оваа страница треба да се доаѓа само во текот на постапката на OpenID, а "
-"не директно."
-
-#: openidtrust.php:118
-#, php-format
-msgid ""
-"%s  has asked to verify your identity. Click Continue to verify your "
-"identity and login without creating a new password."
-msgstr ""
-"%s  побара да го потврдите Вашиот идентитет. Кликнете на „Продолжи“ за да "
-"потврдите и да се најавите без да треба да ставате нова лозинка."
-
-#: openidtrust.php:136
-msgid "Continue"
-msgstr "Продолжи"
-
-#: openidtrust.php:137
-msgid "Cancel"
-msgstr "Откажи"
-
-#. TRANS: Client error message
-#: finishaddopenid.php:68
-msgid "Not logged in."
-msgstr "Не сте најавени."
-
-#. TRANS: message in case a user tries to add an OpenID that is already connected to them.
-#: finishaddopenid.php:122
-msgid "You already have this OpenID!"
-msgstr "Веќе го имате овој OpenID!"
-
-#. TRANS: message in case a user tries to add an OpenID that is already used by another user.
-#: finishaddopenid.php:125
-msgid "Someone else already has this OpenID."
-msgstr "Некој друг веќе го зафатил ова OpenID."
-
-#. TRANS: message in case the OpenID object cannot be connected to the user.
-#: finishaddopenid.php:138
-msgid "Error connecting user."
-msgstr "Грешка при поврзувањето на корисникот."
-
-#. TRANS: message in case the user or the user profile cannot be saved in StatusNet.
-#: finishaddopenid.php:145
-msgid "Error updating profile"
-msgstr "Грешка при подновувањето на профилот"
diff --git a/plugins/OpenID/locale/nl/LC_MESSAGES/OpenID.po b/plugins/OpenID/locale/nl/LC_MESSAGES/OpenID.po
index 9ffbb1bc74..cf38e026b1 100644
--- a/plugins/OpenID/locale/nl/LC_MESSAGES/OpenID.po
+++ b/plugins/OpenID/locale/nl/LC_MESSAGES/OpenID.po
@@ -10,305 +10,70 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OpenID\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:34+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:49+0000\n"
 "Last-Translator: Siebrand Mazeland <s.mazeland@xs4all.nl>\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-02-14 17:22:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:46:02+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-openid\n"
 
-#: openidsettings.php:58 openidadminpanel.php:65
-msgid "OpenID settings"
-msgstr "OpenID-instellingen"
+msgid "OpenID Identity Verification"
+msgstr "OpenID-identiteitscontrole"
+
+msgid ""
+"This page should only be reached during OpenID processing, not directly."
+msgstr ""
+"Deze pagina hoort alleen bezocht te worden tijdens het verwerken van een "
+"OpenID, en niet direct."
 
-#: openidsettings.php:69
 #, php-format
 msgid ""
-"[OpenID](%%doc.openid%%) lets you log into many sites with the same user "
-"account. Manage your associated OpenIDs from here."
+"%s  has asked to verify your identity. Click Continue to verify your "
+"identity and login without creating a new password."
 msgstr ""
-"Met [OpenID](%%doc.openid%%) kunt u aanmelden bij veel websites met dezelfde "
-"gebruiker. U kunt hier uw gekoppelde OpenID's beheren."
+"%s heeft gevraagd uw identiteit te bevestigen. Klik op \"Doorgaan\" om uw "
+"indentiteit te controleren en aan te melden zonder een wachtwoord te hoeven "
+"invoeren."
 
-#: openidsettings.php:100
-msgid "Add OpenID"
-msgstr "OpenID toevoegen"
+msgid "Continue"
+msgstr "Doorgaan"
 
-#: openidsettings.php:103
-msgid ""
-"If you want to add an OpenID to your account, enter it in the box below and "
-"click \"Add\"."
-msgstr ""
-"Als u een OpenID aan uw gebruiker wilt toevoegen, voer deze dan hieronder in "
-"en klik op \"Toevoegen\"."
-
-#. TRANS: OpenID plugin logon form field label.
-#: openidsettings.php:108 OpenIDPlugin.php:703 openidlogin.php:152
-msgid "OpenID URL"
-msgstr "OpenID-URL"
-
-#: openidsettings.php:118
-msgid "Add"
-msgstr "Toevoegen"
-
-#: openidsettings.php:130
-msgid "Remove OpenID"
-msgstr "OpenID verwijderen"
-
-#: openidsettings.php:135
-msgid ""
-"Removing your only OpenID would make it impossible to log in! If you need to "
-"remove it, add another OpenID first."
-msgstr ""
-"Door uw enige OpenID te verwijderen zou het niet meer mogelijk zijn om aan "
-"te melden. Als u het wilt verwijderen, voeg dan eerst een andere OpenID toe."
-
-#: openidsettings.php:150
-msgid ""
-"You can remove an OpenID from your account by clicking the button marked "
-"\"Remove\"."
-msgstr ""
-"U kunt een OpenID van uw gebruiker verwijderen door te klikken op de knop "
-"\"Verwijderen\"."
-
-#: openidsettings.php:173 openidsettings.php:214
-msgid "Remove"
-msgstr "Verwijderen"
-
-#: openidsettings.php:187
-msgid "OpenID Trusted Sites"
-msgstr "Vertrouwde OpenID-sites"
-
-#: openidsettings.php:190
-msgid ""
-"The following sites are allowed to access your identity and log you in. You "
-"can remove a site from this list to deny it access to your OpenID."
-msgstr ""
-"De volgende sites hebben toegang tot uw indentiteit en kunnen u aanmelden. U "
-"kunt een site verwijderen uit deze lijst zodat deze niet langer toegang "
-"heeft tot uw OpenID."
-
-#. TRANS: Message given when there is a problem with the user's session token.
-#: openidsettings.php:232 finishopenidlogin.php:42
-msgid "There was a problem with your session token. Try again, please."
-msgstr "Er was een probleem met uw sessietoken. Probeer het opnieuw."
-
-#: openidsettings.php:239
-msgid "Can't add new providers."
-msgstr "Het niet is mogelijk nieuwe providers toe te voegen."
-
-#: openidsettings.php:252
-msgid "Something weird happened."
-msgstr "Er is iets vreemds gebeurd."
-
-#: openidsettings.php:276
-msgid "No such OpenID trustroot."
-msgstr "Die OpenID trustroot bestaat niet."
-
-#: openidsettings.php:280
-msgid "Trustroots removed"
-msgstr "De trustroots zijn verwijderd"
-
-#: openidsettings.php:303
-msgid "No such OpenID."
-msgstr "De OpenID bestaat niet."
-
-#: openidsettings.php:308
-msgid "That OpenID does not belong to you."
-msgstr "Die OpenID is niet van u."
-
-#: openidsettings.php:312
-msgid "OpenID removed."
-msgstr "OpenID verwijderd."
-
-#: openidadminpanel.php:54
-msgid "OpenID"
-msgstr "OpenID"
-
-#: openidadminpanel.php:147
-msgid "Invalid provider URL. Max length is 255 characters."
-msgstr "De URL voor de provider is ongeldig. De maximale lengte is 255 tekens."
-
-#: openidadminpanel.php:153
-msgid "Invalid team name. Max length is 255 characters."
-msgstr "De teamnaam is ongeldig. De maximale lengte is 255 tekens."
-
-#: openidadminpanel.php:210
-msgid "Trusted provider"
-msgstr "Vertrouwde provider"
-
-#: openidadminpanel.php:212
-msgid ""
-"By default, users are allowed to authenticate with any OpenID provider. If "
-"you are using your own OpenID service for shared sign-in, you can restrict "
-"access to only your own users here."
-msgstr ""
-"Gebruikers is het standaard toegestaan aan te melden via alle OpenID-"
-"providers. Als u uw eigen OpenID-dienst gebruikt voor gedeeld aanmelden, dan "
-"kunt u hier de toegang beperken tot alleen uw eigen gebruikers."
-
-#: openidadminpanel.php:220
-msgid "Provider URL"
-msgstr "URL van provider"
-
-#: openidadminpanel.php:221
-msgid ""
-"All OpenID logins will be sent to this URL; other providers may not be used."
-msgstr ""
-"Alle aanmeldpogingen voor OpenID worden naar deze URL gezonden. Andere "
-"providers kunnen niet gebruikt worden."
-
-#: openidadminpanel.php:228
-msgid "Append a username to base URL"
-msgstr "Gebruikersnaam aan basis-URL toevoegen"
-
-#: openidadminpanel.php:230
-msgid ""
-"Login form will show the base URL and prompt for a username to add at the "
-"end. Use when OpenID provider URL should be the profile page for individual "
-"users."
-msgstr ""
-"Het aanmeldformulier geeft de basis-URL weer en vraag om achteraan een "
-"gebruikersnaam toe te voegen. Gebruik deze instelling als de URL van een "
-"OpenID-provider de profielpagina van individuele gebruikers moet zijn."
-
-#: openidadminpanel.php:238
-msgid "Required team"
-msgstr "Vereist team"
-
-#: openidadminpanel.php:239
-msgid "Only allow logins from users in the given team (Launchpad extension)."
-msgstr ""
-"Alleen leden van een bepaald team toestaan aan te melden (uitbreiding van "
-"Launchpad)."
-
-#: openidadminpanel.php:251
-msgid "Options"
-msgstr "Opties"
-
-#: openidadminpanel.php:258
-msgid "Enable OpenID-only mode"
-msgstr "Alleen OpenID inschakelen"
-
-#: openidadminpanel.php:260
-msgid ""
-"Require all users to login via OpenID. Warning: disables password "
-"authentication for all users!"
-msgstr ""
-"Alle gebruikers verplichten aan te melden via OpenID. Waarschuwing: als deze "
-"instelling wordt gebruikt, kan geen enkele gebruiker met een wachtwoord "
-"aanmelden!"
-
-#: openidadminpanel.php:278
-msgid "Save OpenID settings"
-msgstr "OpenID-instellingen opslaan"
-
-#. TRANS: OpenID plugin server error.
-#: openid.php:138
-msgid "Cannot instantiate OpenID consumer object."
-msgstr "Het was niet mogelijk een OpenID-object aan te maken."
-
-#. TRANS: OpenID plugin message. Given when an OpenID is not valid.
-#: openid.php:150
-msgid "Not a valid OpenID."
-msgstr "Geen geldige OpenID."
-
-#. TRANS: OpenID plugin server error. Given when the OpenID authentication request fails.
-#. TRANS: %s is the failure message.
-#: openid.php:155
-#, php-format
-msgid "OpenID failure: %s"
-msgstr "OpenID-fout: %s"
-
-#. TRANS: OpenID plugin server error. Given when the OpenID authentication request cannot be redirected.
-#. TRANS: %s is the failure message.
-#: openid.php:205
-#, php-format
-msgid "Could not redirect to server: %s"
-msgstr "Het was niet mogelijk door te verwijzen naar de server: %s"
-
-#. TRANS: OpenID plugin user instructions.
-#: openid.php:244
-msgid ""
-"This form should automatically submit itself. If not, click the submit "
-"button to go to your OpenID provider."
-msgstr ""
-"Dit formulier hoort zichzelf automatisch op te slaan. Als dat niet gebeurt, "
-"klik dan op de knop \"Aanmelden\" om naar uw OpenID-provider te gaan."
-
-#. TRANS: OpenID plugin server error.
-#: openid.php:280
-msgid "Error saving the profile."
-msgstr "Fout bij het opslaan van het profiel."
-
-#. TRANS: OpenID plugin server error.
-#: openid.php:292
-msgid "Error saving the user."
-msgstr "Fout bij het opslaan van de gebruiker."
-
-#. TRANS: OpenID plugin client exception (403).
-#: openid.php:322
-msgid "Unauthorized URL used for OpenID login."
-msgstr "Ongeautoriseerde URL gebruikt voor aanmelden via OpenID"
-
-#. TRANS: Title
-#: openid.php:370
-msgid "OpenID Login Submission"
-msgstr "Aanmelden via OpenID"
-
-#. TRANS: OpenID plugin message used while requesting authorization user's OpenID login provider.
-#: openid.php:381
-msgid "Requesting authorization from your login provider..."
-msgstr "Bezig met het vragen van autorisatie van uw aanmeldprovider..."
-
-#. TRANS: OpenID plugin message. User instruction while requesting authorization user's OpenID login provider.
-#: openid.php:385
-msgid ""
-"If you are not redirected to your login provider in a few seconds, try "
-"pushing the button below."
-msgstr ""
-"Als u binnen een aantal seconden niet wordt doorverwezen naar uw "
-"aanmeldprovider, klik dan op de onderstaande knop."
+msgid "Cancel"
+msgstr "Annuleren"
 
 #. TRANS: Tooltip for main menu option "Login"
-#: OpenIDPlugin.php:218
 msgctxt "TOOLTIP"
 msgid "Login to the site"
 msgstr "Aanmelden bij de site"
 
 #. TRANS: Main menu option when not logged in to log in
-#: OpenIDPlugin.php:221
 msgctxt "MENU"
 msgid "Login"
 msgstr "Aanmelden"
 
 #. TRANS: Tooltip for main menu option "Help"
-#: OpenIDPlugin.php:226
 msgctxt "TOOLTIP"
 msgid "Help me!"
 msgstr "Help me"
 
 #. TRANS: Main menu option for help on the StatusNet site
-#: OpenIDPlugin.php:229
 msgctxt "MENU"
 msgid "Help"
 msgstr "Hulp"
 
 #. TRANS: Tooltip for main menu option "Search"
-#: OpenIDPlugin.php:235
 msgctxt "TOOLTIP"
 msgid "Search for people or text"
 msgstr "Zoeken naar mensen of tekst"
 
 #. TRANS: Main menu option when logged in or when the StatusNet instance is not private
-#: OpenIDPlugin.php:238
 msgctxt "MENU"
 msgid "Search"
 msgstr "Zoeken"
@@ -316,93 +81,75 @@ msgstr "Zoeken"
 #. TRANS: OpenID plugin menu item on site logon page.
 #. TRANS: OpenID plugin menu item on user settings page.
 #. TRANS: OpenID configuration menu item.
-#: OpenIDPlugin.php:295 OpenIDPlugin.php:331 OpenIDPlugin.php:605
 msgctxt "MENU"
 msgid "OpenID"
 msgstr "OpenID"
 
 #. TRANS: OpenID plugin tooltip for logon menu item.
-#: OpenIDPlugin.php:297
 msgid "Login or register with OpenID"
 msgstr "Aanmelden of registreren met OpenID"
 
 #. TRANS: OpenID plugin tooltip for user settings menu item.
-#: OpenIDPlugin.php:333
 msgid "Add or remove OpenIDs"
 msgstr "OpenID's toevoegen of verwijderen"
 
 #. TRANS: Tooltip for OpenID configuration menu item.
-#: OpenIDPlugin.php:607
 msgid "OpenID configuration"
 msgstr "OpenID-instellingen"
 
 #. TRANS: OpenID plugin description.
-#: OpenIDPlugin.php:653
 msgid "Use <a href=\"http://openid.net/\">OpenID</a> to login to the site."
 msgstr ""
 "Gebruik <a href=\"http://openid.net/\">OpenID</a> om aan te melden bij de "
 "site."
 
 #. TRANS: button label for OAuth authorization page when needing OpenID authentication first.
-#: OpenIDPlugin.php:663
 msgctxt "BUTTON"
 msgid "Continue"
 msgstr "Continue"
 
 #. TRANS: OpenID plugin logon form legend.
-#: OpenIDPlugin.php:680 openidlogin.php:132
 msgid "OpenID login"
 msgstr "Aanmelden via OpenID"
 
 #. TRANS: Field label.
-#: OpenIDPlugin.php:688 openidlogin.php:139
 msgid "OpenID provider"
 msgstr "OpenID-provider"
 
 #. TRANS: Form guide.
-#: OpenIDPlugin.php:697 openidlogin.php:147
 msgid "Enter your username."
 msgstr "Voer uw gebruikersnaam in"
 
 #. TRANS: Form guide.
-#: OpenIDPlugin.php:699 openidlogin.php:148
 msgid "You will be sent to the provider's site for authentication."
 msgstr "U wordt naar de site van de provider omgeleid om aan te melden."
 
+#. TRANS: OpenID plugin logon form field label.
+msgid "OpenID URL"
+msgstr "OpenID-URL"
+
 #. TRANS: OpenID plugin logon form field instructions.
-#: OpenIDPlugin.php:706 openidlogin.php:155
 msgid "Your OpenID URL"
 msgstr "Uw OpenID-URL"
 
-#. TRANS: OpenID plugin client error given trying to add an unauthorised OpenID to a user (403).
-#: openidserver.php:116
-#, php-format
-msgid "You are not authorized to use the identity %s."
-msgstr "U mag de identiteit %s niet gebruiken."
-
-#. TRANS: OpenID plugin client error given when not getting a response for a given OpenID provider (500).
-#: openidserver.php:137
-msgid "Just an OpenID provider. Nothing to see here, move along..."
-msgstr "Gewoon een OpenID-provider. Niets te zien hier..."
-
 #. TRANS: Client error message trying to log on with OpenID while already logged on.
-#: finishopenidlogin.php:37 openidlogin.php:33
 msgid "Already logged in."
 msgstr "U bent al aangemeld."
 
+#. TRANS: Message given when there is a problem with the user's session token.
+msgid "There was a problem with your session token. Try again, please."
+msgstr "Er was een probleem met uw sessietoken. Probeer het opnieuw."
+
 #. TRANS: Message given if user does not agree with the site's license.
-#: finishopenidlogin.php:48
 msgid "You can't register if you don't agree to the license."
 msgstr "U kunt niet registreren als u niet akkoord gaat met de licentie."
 
 #. TRANS: Messag given on an unknown error.
-#: finishopenidlogin.php:57
 msgid "An unknown error has occured."
 msgstr "Er is een onbekende fout opgetreden."
 
 #. TRANS: Instructions given after a first successful logon using OpenID.
 #. TRANS: %s is the site name.
-#: finishopenidlogin.php:73
 #, php-format
 msgid ""
 "This is the first time you've logged into %s so we must connect your OpenID "
@@ -414,39 +161,31 @@ msgstr ""
 "koppelen met uw bestaande gebruiker als u die al hebt."
 
 #. TRANS: Title
-#: finishopenidlogin.php:80
 msgid "OpenID Account Setup"
 msgstr "Instellingen OpenID"
 
-#: finishopenidlogin.php:117
 msgid "Create new account"
 msgstr "Nieuwe gebruiker aanmaken"
 
-#: finishopenidlogin.php:119
 msgid "Create a new user with this nickname."
 msgstr "Nieuwe gebruiker met deze naam aanmaken."
 
-#: finishopenidlogin.php:126
 msgid "New nickname"
 msgstr "Nieuwe gebruiker"
 
-#: finishopenidlogin.php:128
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "1-64 kleine letters of getallen; geen leestekens of spaties"
 
 #. TRANS: Button label in form in which to create a new user on the site for an OpenID.
-#: finishopenidlogin.php:162
 msgctxt "BUTTON"
 msgid "Create"
 msgstr "Aanmaken"
 
 #. TRANS: Used as form legend for form in which to connect an OpenID to an existing user on the site.
-#: finishopenidlogin.php:176
 msgid "Connect existing account"
 msgstr "Koppelen met bestaande gebruiker"
 
 #. TRANS: User instructions for form in which to connect an OpenID to an existing user on the site.
-#: finishopenidlogin.php:179
 msgid ""
 "If you already have an account, login with your username and password to "
 "connect it to your OpenID."
@@ -455,35 +194,29 @@ msgstr ""
 "wachtwoord om de gebruiker te koppelen met uw OpenID."
 
 #. TRANS: Field label in form in which to connect an OpenID to an existing user on the site.
-#: finishopenidlogin.php:183
 msgid "Existing nickname"
 msgstr "Bestaande gebruiker"
 
 #. TRANS: Field label in form in which to connect an OpenID to an existing user on the site.
-#: finishopenidlogin.php:187
 msgid "Password"
 msgstr "Wachtwoord"
 
 #. TRANS: Button label in form in which to connect an OpenID to an existing user on the site.
-#: finishopenidlogin.php:191
 msgctxt "BUTTON"
 msgid "Connect"
 msgstr "Koppelen"
 
 #. TRANS: Status message in case the response from the OpenID provider is that the logon attempt was cancelled.
-#: finishopenidlogin.php:237 finishaddopenid.php:90
 msgid "OpenID authentication cancelled."
 msgstr "De authenticatie via OpenID is afgebroken."
 
 #. TRANS: OpenID authentication failed; display the error message. %s is the error message.
 #. TRANS: OpenID authentication failed; display the error message.
 #. TRANS: %s is the error message.
-#: finishopenidlogin.php:241 finishaddopenid.php:95
 #, php-format
 msgid "OpenID authentication failed: %s"
 msgstr "De authenticatie via OpenID is mislukt: %s"
 
-#: finishopenidlogin.php:261 finishaddopenid.php:111
 msgid ""
 "OpenID authentication aborted: you are not allowed to login to this site."
 msgstr ""
@@ -491,49 +224,273 @@ msgstr ""
 
 #. TRANS: OpenID plugin message. No new user registration is allowed on the site.
 #. TRANS: OpenID plugin message. No new user registration is allowed on the site without an invitation code, and none was provided.
-#: finishopenidlogin.php:317 finishopenidlogin.php:327
 msgid "Registration not allowed."
 msgstr "Registreren is niet mogelijk."
 
 #. TRANS: OpenID plugin message. No new user registration is allowed on the site without an invitation code, and the one provided was not valid.
-#: finishopenidlogin.php:335
 msgid "Not a valid invitation code."
 msgstr "De uitnodigingscode is niet geldig."
 
 #. TRANS: OpenID plugin message. The entered new user name is blacklisted.
-#: finishopenidlogin.php:349
 msgid "Nickname not allowed."
 msgstr "Deze gebruikersnaam is niet toegestaan."
 
 #. TRANS: OpenID plugin message. The entered new user name is already used.
-#: finishopenidlogin.php:355
 msgid "Nickname already in use. Try another one."
 msgstr "Deze gebruikersnaam wordt al gebruikt. Kies een andere."
 
 #. TRANS: OpenID plugin server error. A stored OpenID cannot be retrieved.
 #. TRANS: OpenID plugin server error. A stored OpenID cannot be found.
-#: finishopenidlogin.php:363 finishopenidlogin.php:449
 msgid "Stored OpenID not found."
 msgstr "Het opgeslagen OpenID is niet aangetroffen."
 
 #. TRANS: OpenID plugin server error.
-#: finishopenidlogin.php:373
 msgid "Creating new account for OpenID that already has a user."
 msgstr "Poging tot aanmaken van een OpenID-account dat al een gebruiker heeft."
 
 #. TRANS: OpenID plugin message.
-#: finishopenidlogin.php:437
 msgid "Invalid username or password."
 msgstr "Ongeldige gebruikersnaam of wachtwoord."
 
 #. TRANS: OpenID plugin server error. The user or user profile could not be saved.
-#: finishopenidlogin.php:457
 msgid "Error connecting user to OpenID."
 msgstr "Fout bij het koppelen met OpenID."
 
+#. TRANS: OpenID plugin server error.
+msgid "Cannot instantiate OpenID consumer object."
+msgstr "Het was niet mogelijk een OpenID-object aan te maken."
+
+#. TRANS: OpenID plugin message. Given when an OpenID is not valid.
+msgid "Not a valid OpenID."
+msgstr "Geen geldige OpenID."
+
+#. TRANS: OpenID plugin server error. Given when the OpenID authentication request fails.
+#. TRANS: %s is the failure message.
+#, php-format
+msgid "OpenID failure: %s"
+msgstr "OpenID-fout: %s"
+
+#. TRANS: OpenID plugin server error. Given when the OpenID authentication request cannot be redirected.
+#. TRANS: %s is the failure message.
+#, php-format
+msgid "Could not redirect to server: %s"
+msgstr "Het was niet mogelijk door te verwijzen naar de server: %s"
+
+#. TRANS: OpenID plugin user instructions.
+msgid ""
+"This form should automatically submit itself. If not, click the submit "
+"button to go to your OpenID provider."
+msgstr ""
+"Dit formulier hoort zichzelf automatisch op te slaan. Als dat niet gebeurt, "
+"klik dan op de knop \"Aanmelden\" om naar uw OpenID-provider te gaan."
+
+#. TRANS: OpenID plugin server error.
+msgid "Error saving the profile."
+msgstr "Fout bij het opslaan van het profiel."
+
+#. TRANS: OpenID plugin server error.
+msgid "Error saving the user."
+msgstr "Fout bij het opslaan van de gebruiker."
+
+#. TRANS: OpenID plugin client exception (403).
+msgid "Unauthorized URL used for OpenID login."
+msgstr "Ongeautoriseerde URL gebruikt voor aanmelden via OpenID"
+
+#. TRANS: Title
+msgid "OpenID Login Submission"
+msgstr "Aanmelden via OpenID"
+
+#. TRANS: OpenID plugin message used while requesting authorization user's OpenID login provider.
+msgid "Requesting authorization from your login provider..."
+msgstr "Bezig met het vragen van autorisatie van uw aanmeldprovider..."
+
+#. TRANS: OpenID plugin message. User instruction while requesting authorization user's OpenID login provider.
+msgid ""
+"If you are not redirected to your login provider in a few seconds, try "
+"pushing the button below."
+msgstr ""
+"Als u binnen een aantal seconden niet wordt doorverwezen naar uw "
+"aanmeldprovider, klik dan op de onderstaande knop."
+
+msgid "OpenID"
+msgstr "OpenID"
+
+msgid "OpenID settings"
+msgstr "OpenID-instellingen"
+
+msgid "Invalid provider URL. Max length is 255 characters."
+msgstr "De URL voor de provider is ongeldig. De maximale lengte is 255 tekens."
+
+msgid "Invalid team name. Max length is 255 characters."
+msgstr "De teamnaam is ongeldig. De maximale lengte is 255 tekens."
+
+msgid "Trusted provider"
+msgstr "Vertrouwde provider"
+
+msgid ""
+"By default, users are allowed to authenticate with any OpenID provider. If "
+"you are using your own OpenID service for shared sign-in, you can restrict "
+"access to only your own users here."
+msgstr ""
+"Gebruikers is het standaard toegestaan aan te melden via alle OpenID-"
+"providers. Als u uw eigen OpenID-dienst gebruikt voor gedeeld aanmelden, dan "
+"kunt u hier de toegang beperken tot alleen uw eigen gebruikers."
+
+msgid "Provider URL"
+msgstr "URL van provider"
+
+msgid ""
+"All OpenID logins will be sent to this URL; other providers may not be used."
+msgstr ""
+"Alle aanmeldpogingen voor OpenID worden naar deze URL gezonden. Andere "
+"providers kunnen niet gebruikt worden."
+
+msgid "Append a username to base URL"
+msgstr "Gebruikersnaam aan basis-URL toevoegen"
+
+msgid ""
+"Login form will show the base URL and prompt for a username to add at the "
+"end. Use when OpenID provider URL should be the profile page for individual "
+"users."
+msgstr ""
+"Het aanmeldformulier geeft de basis-URL weer en vraag om achteraan een "
+"gebruikersnaam toe te voegen. Gebruik deze instelling als de URL van een "
+"OpenID-provider de profielpagina van individuele gebruikers moet zijn."
+
+msgid "Required team"
+msgstr "Vereist team"
+
+msgid "Only allow logins from users in the given team (Launchpad extension)."
+msgstr ""
+"Alleen leden van een bepaald team toestaan aan te melden (uitbreiding van "
+"Launchpad)."
+
+msgid "Options"
+msgstr "Opties"
+
+msgid "Enable OpenID-only mode"
+msgstr "Alleen OpenID inschakelen"
+
+msgid ""
+"Require all users to login via OpenID. Warning: disables password "
+"authentication for all users!"
+msgstr ""
+"Alle gebruikers verplichten aan te melden via OpenID. Waarschuwing: als deze "
+"instelling wordt gebruikt, kan geen enkele gebruiker met een wachtwoord "
+"aanmelden!"
+
+msgid "Save OpenID settings"
+msgstr "OpenID-instellingen opslaan"
+
+#. TRANS: Client error message
+msgid "Not logged in."
+msgstr "Niet aangemeld."
+
+#. TRANS: message in case a user tries to add an OpenID that is already connected to them.
+msgid "You already have this OpenID!"
+msgstr "U hebt deze OpenID al!"
+
+#. TRANS: message in case a user tries to add an OpenID that is already used by another user.
+msgid "Someone else already has this OpenID."
+msgstr "Iemand anders gebruikt deze OpenID al."
+
+#. TRANS: message in case the OpenID object cannot be connected to the user.
+msgid "Error connecting user."
+msgstr "Fout bij het verbinden met de gebruiker."
+
+#. TRANS: message in case the user or the user profile cannot be saved in StatusNet.
+msgid "Error updating profile"
+msgstr "Fout bij het bijwerken van het profiel."
+
+#. TRANS: Title after getting the status of the OpenID authorisation request.
+#. TRANS: OpenID plugin message. Title.
+msgid "OpenID Login"
+msgstr "Aanmelden via OpenID"
+
+#, php-format
+msgid ""
+"[OpenID](%%doc.openid%%) lets you log into many sites with the same user "
+"account. Manage your associated OpenIDs from here."
+msgstr ""
+"Met [OpenID](%%doc.openid%%) kunt u aanmelden bij veel websites met dezelfde "
+"gebruiker. U kunt hier uw gekoppelde OpenID's beheren."
+
+msgid "Add OpenID"
+msgstr "OpenID toevoegen"
+
+msgid ""
+"If you want to add an OpenID to your account, enter it in the box below and "
+"click \"Add\"."
+msgstr ""
+"Als u een OpenID aan uw gebruiker wilt toevoegen, voer deze dan hieronder in "
+"en klik op \"Toevoegen\"."
+
+msgid "Add"
+msgstr "Toevoegen"
+
+msgid "Remove OpenID"
+msgstr "OpenID verwijderen"
+
+msgid ""
+"Removing your only OpenID would make it impossible to log in! If you need to "
+"remove it, add another OpenID first."
+msgstr ""
+"Door uw enige OpenID te verwijderen zou het niet meer mogelijk zijn om aan "
+"te melden. Als u het wilt verwijderen, voeg dan eerst een andere OpenID toe."
+
+msgid ""
+"You can remove an OpenID from your account by clicking the button marked "
+"\"Remove\"."
+msgstr ""
+"U kunt een OpenID van uw gebruiker verwijderen door te klikken op de knop "
+"\"Verwijderen\"."
+
+msgid "Remove"
+msgstr "Verwijderen"
+
+msgid "OpenID Trusted Sites"
+msgstr "Vertrouwde OpenID-sites"
+
+msgid ""
+"The following sites are allowed to access your identity and log you in. You "
+"can remove a site from this list to deny it access to your OpenID."
+msgstr ""
+"De volgende sites hebben toegang tot uw indentiteit en kunnen u aanmelden. U "
+"kunt een site verwijderen uit deze lijst zodat deze niet langer toegang "
+"heeft tot uw OpenID."
+
+msgid "Can't add new providers."
+msgstr "Het niet is mogelijk nieuwe providers toe te voegen."
+
+msgid "Something weird happened."
+msgstr "Er is iets vreemds gebeurd."
+
+msgid "No such OpenID trustroot."
+msgstr "Die OpenID trustroot bestaat niet."
+
+msgid "Trustroots removed"
+msgstr "De trustroots zijn verwijderd"
+
+msgid "No such OpenID."
+msgstr "De OpenID bestaat niet."
+
+msgid "That OpenID does not belong to you."
+msgstr "Die OpenID is niet van u."
+
+msgid "OpenID removed."
+msgstr "OpenID verwijderd."
+
+#. TRANS: OpenID plugin client error given trying to add an unauthorised OpenID to a user (403).
+#, php-format
+msgid "You are not authorized to use the identity %s."
+msgstr "U mag de identiteit %s niet gebruiken."
+
+#. TRANS: OpenID plugin client error given when not getting a response for a given OpenID provider (500).
+msgid "Just an OpenID provider. Nothing to see here, move along..."
+msgstr "Gewoon een OpenID-provider. Niets te zien hier..."
+
 #. TRANS: OpenID plugin message. Rememberme logins have to reauthenticate before changing any profile settings.
 #. TRANS: "OpenID" is the display text for a link with URL "(%%doc.openid%%)".
-#: openidlogin.php:74
 #, php-format
 msgid ""
 "For security reasons, please re-login with your [OpenID](%%doc.openid%%) "
@@ -544,84 +501,20 @@ msgstr ""
 
 #. TRANS: OpenID plugin message.
 #. TRANS: "OpenID" is the display text for a link with URL "(%%doc.openid%%)".
-#: openidlogin.php:80
 #, php-format
 msgid "Login with an [OpenID](%%doc.openid%%) account."
 msgstr "Aanmelden met een [OpenID](%%doc.openid%%)-gebruiker."
 
-#. TRANS: OpenID plugin message. Title.
-#. TRANS: Title after getting the status of the OpenID authorisation request.
-#: openidlogin.php:114 finishaddopenid.php:187
-msgid "OpenID Login"
-msgstr "Aanmelden via OpenID"
-
 #. TRANS: OpenID plugin logon form checkbox label for setting to put the OpenID information in a cookie.
-#: openidlogin.php:160
 msgid "Remember me"
 msgstr "Aanmeldgegevens onthouden"
 
 #. TRANS: OpenID plugin logon form field instructions.
-#: openidlogin.php:162
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 "In het vervolg automatisch aanmelden. Niet gebruiken op gedeelde computers!"
 
 #. TRANS: OpenID plugin logon form button label to start logon with the data provided in the logon form.
-#: openidlogin.php:167
 msgctxt "BUTTON"
 msgid "Login"
 msgstr "Aanmelden"
-
-#: openidtrust.php:52
-msgid "OpenID Identity Verification"
-msgstr "OpenID-identiteitscontrole"
-
-#: openidtrust.php:70
-msgid ""
-"This page should only be reached during OpenID processing, not directly."
-msgstr ""
-"Deze pagina hoort alleen bezocht te worden tijdens het verwerken van een "
-"OpenID, en niet direct."
-
-#: openidtrust.php:118
-#, php-format
-msgid ""
-"%s  has asked to verify your identity. Click Continue to verify your "
-"identity and login without creating a new password."
-msgstr ""
-"%s heeft gevraagd uw identiteit te bevestigen. Klik op \"Doorgaan\" om uw "
-"indentiteit te controleren en aan te melden zonder een wachtwoord te hoeven "
-"invoeren."
-
-#: openidtrust.php:136
-msgid "Continue"
-msgstr "Doorgaan"
-
-#: openidtrust.php:137
-msgid "Cancel"
-msgstr "Annuleren"
-
-#. TRANS: Client error message
-#: finishaddopenid.php:68
-msgid "Not logged in."
-msgstr "Niet aangemeld."
-
-#. TRANS: message in case a user tries to add an OpenID that is already connected to them.
-#: finishaddopenid.php:122
-msgid "You already have this OpenID!"
-msgstr "U hebt deze OpenID al!"
-
-#. TRANS: message in case a user tries to add an OpenID that is already used by another user.
-#: finishaddopenid.php:125
-msgid "Someone else already has this OpenID."
-msgstr "Iemand anders gebruikt deze OpenID al."
-
-#. TRANS: message in case the OpenID object cannot be connected to the user.
-#: finishaddopenid.php:138
-msgid "Error connecting user."
-msgstr "Fout bij het verbinden met de gebruiker."
-
-#. TRANS: message in case the user or the user profile cannot be saved in StatusNet.
-#: finishaddopenid.php:145
-msgid "Error updating profile"
-msgstr "Fout bij het bijwerken van het profiel."
diff --git a/plugins/OpenID/locale/tl/LC_MESSAGES/OpenID.po b/plugins/OpenID/locale/tl/LC_MESSAGES/OpenID.po
index fba73ad1ed..4ded47598d 100644
--- a/plugins/OpenID/locale/tl/LC_MESSAGES/OpenID.po
+++ b/plugins/OpenID/locale/tl/LC_MESSAGES/OpenID.po
@@ -9,313 +9,68 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OpenID\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:34+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:49+0000\n"
 "Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-14 17:22:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:46:02+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-openid\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: openidsettings.php:58 openidadminpanel.php:65
-msgid "OpenID settings"
-msgstr "Mga katakdaan ng OpenID"
+msgid "OpenID Identity Verification"
+msgstr "Pagpapatunay sa Katauhan ng OpenID"
+
+msgid ""
+"This page should only be reached during OpenID processing, not directly."
+msgstr ""
+"Ang pahinang ito ay dapat lamang na maabot habang pinoproseso ang OpenID, "
+"hindi tuwiran."
 
-#: openidsettings.php:69
 #, php-format
 msgid ""
-"[OpenID](%%doc.openid%%) lets you log into many sites with the same user "
-"account. Manage your associated OpenIDs from here."
+"%s  has asked to verify your identity. Click Continue to verify your "
+"identity and login without creating a new password."
 msgstr ""
-"Nagpapahintulot ang [OpenID](%%doc.openid%%) na makalagda ka sa maraming mga "
-"sityong may katulad na akawnt ng tagagamit. Pamahalaan ang iyong kaugnay na "
-"mga OpenID mula rito."
+"Hiniling ng/ni %s na patunayan ang iyong katauhan. Pindutin ang Magpatuloy "
+"upang tiyakin ang iyong katauhan at lumagdang hindi lumilikha ng isang "
+"bagong hudyat."
 
-#: openidsettings.php:100
-msgid "Add OpenID"
-msgstr "Idagdag ang OpenID"
+msgid "Continue"
+msgstr "Magpatuloy"
 
-#: openidsettings.php:103
-msgid ""
-"If you want to add an OpenID to your account, enter it in the box below and "
-"click \"Add\"."
-msgstr ""
-"Kung nais mong magdagdag ng isang OpenID sa akawnt mo, ipasok ito sa kahong "
-"nasa ibaba at pindutin ang \"Idagdag\"."
-
-#. TRANS: OpenID plugin logon form field label.
-#: openidsettings.php:108 OpenIDPlugin.php:703 openidlogin.php:152
-msgid "OpenID URL"
-msgstr "URL ng OpenID"
-
-#: openidsettings.php:118
-msgid "Add"
-msgstr "Idagdag"
-
-#: openidsettings.php:130
-msgid "Remove OpenID"
-msgstr "Tanggalin ang OpenID"
-
-#: openidsettings.php:135
-msgid ""
-"Removing your only OpenID would make it impossible to log in! If you need to "
-"remove it, add another OpenID first."
-msgstr ""
-"Ang pagtatanggal ng iyong OpenID lamang ay makasasanhi ng imposibleng "
-"paglagda!  Kung kailangan mong tanggalin ito, magdagdag ng ibang OpenID muna."
-
-#: openidsettings.php:150
-msgid ""
-"You can remove an OpenID from your account by clicking the button marked "
-"\"Remove\"."
-msgstr ""
-"Matatanggap mo ang isang OpenID mula sa akawnt mo sa pamamagitan ng "
-"pagpindot sa pindutang may tatak na \"Tanggalin\"."
-
-#: openidsettings.php:173 openidsettings.php:214
-msgid "Remove"
-msgstr "Tanggalin"
-
-#: openidsettings.php:187
-msgid "OpenID Trusted Sites"
-msgstr "Pinagkakatiwalaang mga Sityo ng OpenID"
-
-#: openidsettings.php:190
-msgid ""
-"The following sites are allowed to access your identity and log you in. You "
-"can remove a site from this list to deny it access to your OpenID."
-msgstr ""
-"Ang sumusunod na mga sityo ay pinapahintulutang makapunta sa iyong katauhan "
-"at makalagda kang papasok.  Matatanggal mo ang isang sityo mula sa talaang "
-"ito upang tanggihan ang pagpunta nito sa iyong OpenID."
-
-#. TRANS: Message given when there is a problem with the user's session token.
-#: openidsettings.php:232 finishopenidlogin.php:42
-msgid "There was a problem with your session token. Try again, please."
-msgstr "May suliranin sa iyong token na pangsesyon.  Paki subukan uli."
-
-#: openidsettings.php:239
-msgid "Can't add new providers."
-msgstr "Hindi makapagdaragdag ng bagong mga tagapagbigay."
-
-#: openidsettings.php:252
-msgid "Something weird happened."
-msgstr "May nangyaring kakaiba."
-
-#: openidsettings.php:276
-msgid "No such OpenID trustroot."
-msgstr "Walng ganyang pinagkakatiwalaang ugat ng OpenID."
-
-#: openidsettings.php:280
-msgid "Trustroots removed"
-msgstr "Tinanggal ang mga pinagkakatiwalaang ugat"
-
-#: openidsettings.php:303
-msgid "No such OpenID."
-msgstr "Walang ganyang OpenID."
-
-#: openidsettings.php:308
-msgid "That OpenID does not belong to you."
-msgstr "Hindi mo pag-aari ang OpenID na iyan."
-
-#: openidsettings.php:312
-msgid "OpenID removed."
-msgstr "Tinanggal ang OpenID."
-
-#: openidadminpanel.php:54
-msgid "OpenID"
-msgstr "OpenID"
-
-#: openidadminpanel.php:147
-msgid "Invalid provider URL. Max length is 255 characters."
-msgstr ""
-"Hindi tanggap na URL ng tagapagbigay. Ang pinakamataas na haba ay 255 mga "
-"panitik."
-
-#: openidadminpanel.php:153
-msgid "Invalid team name. Max length is 255 characters."
-msgstr ""
-"Hindi tanggap ng pangalan ng pangkat. Pinakamataas na haba ay 255 mga "
-"panitik."
-
-#: openidadminpanel.php:210
-msgid "Trusted provider"
-msgstr "Pinagkakatiwalaang tagapagbigay"
-
-#: openidadminpanel.php:212
-msgid ""
-"By default, users are allowed to authenticate with any OpenID provider. If "
-"you are using your own OpenID service for shared sign-in, you can restrict "
-"access to only your own users here."
-msgstr ""
-"Bilang likas na pagtatakda, ang mga tagagamit ay hindi pinapahintulutang "
-"magpatunay sa pamamagitan ng anumang tagapagbigay ng OpenID.  Kung ginagamit "
-"mo ang sarili mong palingkuran ng OpenID para sa pinagsasaluhang paglagdang "
-"papasok, malilimitahan mo ang pagpunta sa iyong mga tagagamit lamang dito."
-
-#: openidadminpanel.php:220
-msgid "Provider URL"
-msgstr "URL ng tagapagbigay"
-
-#: openidadminpanel.php:221
-msgid ""
-"All OpenID logins will be sent to this URL; other providers may not be used."
-msgstr ""
-"Ang lahat ng mga paglalagda sa OpenID ay ipapadala sa URL na ito; hindi "
-"maaaring gamitin ang ibang mga tagapagbigay."
-
-#: openidadminpanel.php:228
-msgid "Append a username to base URL"
-msgstr "Ikabit ang isang pangalan ng tagagamit sa punong URL"
-
-#: openidadminpanel.php:230
-msgid ""
-"Login form will show the base URL and prompt for a username to add at the "
-"end. Use when OpenID provider URL should be the profile page for individual "
-"users."
-msgstr ""
-"Ang pormularyo ng paglagda ay magpapakita ng batayang URL at gagawa ng isang "
-"pangalan ng tagagamit na idaragdag sa huli.  Gamitin kapag ang URL ng "
-"tagapagbigay ng OpenID ay ang dapat na maging pahina ng balangkas para sa "
-"indibiduwal na mga tagagamit."
-
-#: openidadminpanel.php:238
-msgid "Required team"
-msgstr "Kailangang pangkat"
-
-#: openidadminpanel.php:239
-msgid "Only allow logins from users in the given team (Launchpad extension)."
-msgstr ""
-"Payagan lamang ang mga paglagda mula sa mga tagagamit na nasa loob ng "
-"ibinigay na pangkat (karugtong ng Launchpad)."
-
-#: openidadminpanel.php:251
-msgid "Options"
-msgstr "Mga pagpipilian"
-
-#: openidadminpanel.php:258
-msgid "Enable OpenID-only mode"
-msgstr "Paganahin ang gawi na OpenID lamang"
-
-#: openidadminpanel.php:260
-#, fuzzy
-msgid ""
-"Require all users to login via OpenID. Warning: disables password "
-"authentication for all users!"
-msgstr ""
-"Igiit sa lahat ng mga tagagamit na lumagda sa pamamagitan ng OpenID.  "
-"BABALA: hindi pinagagana ang pagpapatunay ng hudyat para sa lahat ng mga "
-"tagagamit!"
-
-#: openidadminpanel.php:278
-msgid "Save OpenID settings"
-msgstr "Sagipin ang mga katakdaan ng OpenID"
-
-#. TRANS: OpenID plugin server error.
-#: openid.php:138
-msgid "Cannot instantiate OpenID consumer object."
-msgstr "Hindi mapanimulan ang bagay na pangtagapagtangkilik ng OpenID."
-
-#. TRANS: OpenID plugin message. Given when an OpenID is not valid.
-#: openid.php:150
-msgid "Not a valid OpenID."
-msgstr "Hindi isang tanggap na OpenID."
-
-#. TRANS: OpenID plugin server error. Given when the OpenID authentication request fails.
-#. TRANS: %s is the failure message.
-#: openid.php:155
-#, php-format
-msgid "OpenID failure: %s"
-msgstr "Kabiguan ng OpenID: %s"
-
-#. TRANS: OpenID plugin server error. Given when the OpenID authentication request cannot be redirected.
-#. TRANS: %s is the failure message.
-#: openid.php:205
-#, php-format
-msgid "Could not redirect to server: %s"
-msgstr "Hindi mabago upang papuntahin sa tagapaghain: %s"
-
-#. TRANS: OpenID plugin user instructions.
-#: openid.php:244
-msgid ""
-"This form should automatically submit itself. If not, click the submit "
-"button to go to your OpenID provider."
-msgstr ""
-"Ang pormularyong ito ay dapat na kusang magpapasa ng kanyang sarili.  Kung "
-"hindi, pindutin ang pindutang pampasa upang pumunta sa iyong tagapagbigay ng "
-"OpenID."
-
-#. TRANS: OpenID plugin server error.
-#: openid.php:280
-msgid "Error saving the profile."
-msgstr "Kamalian sa pagsagip ng balangkas."
-
-#. TRANS: OpenID plugin server error.
-#: openid.php:292
-msgid "Error saving the user."
-msgstr "Kamalian sa pagsagip ng tagagamit."
-
-#. TRANS: OpenID plugin client exception (403).
-#: openid.php:322
-msgid "Unauthorized URL used for OpenID login."
-msgstr "Hindi pinahintulutang URL na ginamit para sa paglagda ng OpenID."
-
-#. TRANS: Title
-#: openid.php:370
-msgid "OpenID Login Submission"
-msgstr "Pagpapasa ng Paglagda ng OpenID"
-
-#. TRANS: OpenID plugin message used while requesting authorization user's OpenID login provider.
-#: openid.php:381
-msgid "Requesting authorization from your login provider..."
-msgstr ""
-"Humihiling ng pahintulot mula sa iyong tagapagbigay ng paglagdang papasok..."
-
-#. TRANS: OpenID plugin message. User instruction while requesting authorization user's OpenID login provider.
-#: openid.php:385
-msgid ""
-"If you are not redirected to your login provider in a few seconds, try "
-"pushing the button below."
-msgstr ""
-"Kapag hindi ka itinurong papunta sa iyong tagapagbigay ng paglagda sa loob "
-"ng ilang mga segundo, subukang pindutin ang pindutang nasa ibaba."
+msgid "Cancel"
+msgstr "Huwag ituloy"
 
 #. TRANS: Tooltip for main menu option "Login"
-#: OpenIDPlugin.php:218
 msgctxt "TOOLTIP"
 msgid "Login to the site"
 msgstr "Lumagda sa sityo"
 
 #. TRANS: Main menu option when not logged in to log in
-#: OpenIDPlugin.php:221
 msgctxt "MENU"
 msgid "Login"
 msgstr "Lumagda"
 
 #. TRANS: Tooltip for main menu option "Help"
-#: OpenIDPlugin.php:226
 msgctxt "TOOLTIP"
 msgid "Help me!"
 msgstr "Saklolohan ako!"
 
 #. TRANS: Main menu option for help on the StatusNet site
-#: OpenIDPlugin.php:229
 msgctxt "MENU"
 msgid "Help"
 msgstr "Saklolo"
 
 #. TRANS: Tooltip for main menu option "Search"
-#: OpenIDPlugin.php:235
 msgctxt "TOOLTIP"
 msgid "Search for people or text"
 msgstr "Maghanap ng mga tao o teksto"
 
 #. TRANS: Main menu option when logged in or when the StatusNet instance is not private
-#: OpenIDPlugin.php:238
 msgctxt "MENU"
 msgid "Search"
 msgstr "Maghanap"
@@ -323,94 +78,75 @@ msgstr "Maghanap"
 #. TRANS: OpenID plugin menu item on site logon page.
 #. TRANS: OpenID plugin menu item on user settings page.
 #. TRANS: OpenID configuration menu item.
-#: OpenIDPlugin.php:295 OpenIDPlugin.php:331 OpenIDPlugin.php:605
 msgctxt "MENU"
 msgid "OpenID"
 msgstr "OpenID"
 
 #. TRANS: OpenID plugin tooltip for logon menu item.
-#: OpenIDPlugin.php:297
 msgid "Login or register with OpenID"
 msgstr "Lumagda o magpatala na may OpenID"
 
 #. TRANS: OpenID plugin tooltip for user settings menu item.
-#: OpenIDPlugin.php:333
 msgid "Add or remove OpenIDs"
 msgstr "Idagdag o alisin ang mga OpenID"
 
 #. TRANS: Tooltip for OpenID configuration menu item.
-#: OpenIDPlugin.php:607
 msgid "OpenID configuration"
 msgstr "Pagkakaayos ng OpenID"
 
 #. TRANS: OpenID plugin description.
-#: OpenIDPlugin.php:653
 msgid "Use <a href=\"http://openid.net/\">OpenID</a> to login to the site."
 msgstr ""
 "Gamitin ang <a href=\"http://openid.net/\">OpenID</a> upang lumagda sa sityo."
 
 #. TRANS: button label for OAuth authorization page when needing OpenID authentication first.
-#: OpenIDPlugin.php:663
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Continue"
 msgstr "Magpatuloy"
 
 #. TRANS: OpenID plugin logon form legend.
-#: OpenIDPlugin.php:680 openidlogin.php:132
 msgid "OpenID login"
 msgstr "Panglagdang OpenID"
 
 #. TRANS: Field label.
-#: OpenIDPlugin.php:688 openidlogin.php:139
 msgid "OpenID provider"
 msgstr "Tagapagbigay ng OpenID"
 
 #. TRANS: Form guide.
-#: OpenIDPlugin.php:697 openidlogin.php:147
 msgid "Enter your username."
 msgstr "Ipasok ang iyong pangalan ng tagagamit."
 
 #. TRANS: Form guide.
-#: OpenIDPlugin.php:699 openidlogin.php:148
 msgid "You will be sent to the provider's site for authentication."
 msgstr "Ipapadala ka sa sityo ng tagapagbigay para sa pagpapatunay."
 
+#. TRANS: OpenID plugin logon form field label.
+msgid "OpenID URL"
+msgstr "URL ng OpenID"
+
 #. TRANS: OpenID plugin logon form field instructions.
-#: OpenIDPlugin.php:706 openidlogin.php:155
 msgid "Your OpenID URL"
 msgstr "Ang iyong URL ng OpenID"
 
-#. TRANS: OpenID plugin client error given trying to add an unauthorised OpenID to a user (403).
-#: openidserver.php:116
-#, php-format
-msgid "You are not authorized to use the identity %s."
-msgstr "Wala kang pahintulot na gamitin ang katauhang %s."
-
-#. TRANS: OpenID plugin client error given when not getting a response for a given OpenID provider (500).
-#: openidserver.php:137
-msgid "Just an OpenID provider. Nothing to see here, move along..."
-msgstr ""
-"Isa lamang na tagapagbigay ng OpenID. Walang makikita rito, magpatuloy..."
-
 #. TRANS: Client error message trying to log on with OpenID while already logged on.
-#: finishopenidlogin.php:37 openidlogin.php:33
 msgid "Already logged in."
 msgstr "Nakalagda na."
 
+#. TRANS: Message given when there is a problem with the user's session token.
+msgid "There was a problem with your session token. Try again, please."
+msgstr "May suliranin sa iyong token na pangsesyon.  Paki subukan uli."
+
 #. TRANS: Message given if user does not agree with the site's license.
-#: finishopenidlogin.php:48
 msgid "You can't register if you don't agree to the license."
 msgstr "Hindi ka makakapagpatala kung hindi ka sasang-ayon sa lisensiya."
 
 #. TRANS: Messag given on an unknown error.
-#: finishopenidlogin.php:57
 msgid "An unknown error has occured."
 msgstr "Naganap ang isang hindi nalalamang kamalian."
 
 #. TRANS: Instructions given after a first successful logon using OpenID.
 #. TRANS: %s is the site name.
-#: finishopenidlogin.php:73
 #, php-format
 msgid ""
 "This is the first time you've logged into %s so we must connect your OpenID "
@@ -423,40 +159,32 @@ msgstr ""
 "akawnt, kung mayroon ka."
 
 #. TRANS: Title
-#: finishopenidlogin.php:80
 msgid "OpenID Account Setup"
 msgstr "Pagkakaayos ng Akawnt na OpenID"
 
-#: finishopenidlogin.php:117
 msgid "Create new account"
 msgstr "Likhain ang bagong akawnt"
 
-#: finishopenidlogin.php:119
 msgid "Create a new user with this nickname."
 msgstr "Lumikha ng isang bagong tagagamit na may ganitong palayaw."
 
-#: finishopenidlogin.php:126
 msgid "New nickname"
 msgstr "Bagong palayaw"
 
-#: finishopenidlogin.php:128
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr ""
 "1 hanggang 64 maliliit na mga titik o mga bilang, walang bantas o mga patlang"
 
 #. TRANS: Button label in form in which to create a new user on the site for an OpenID.
-#: finishopenidlogin.php:162
 msgctxt "BUTTON"
 msgid "Create"
 msgstr "Likhain"
 
 #. TRANS: Used as form legend for form in which to connect an OpenID to an existing user on the site.
-#: finishopenidlogin.php:176
 msgid "Connect existing account"
 msgstr "Iugnay ang umiiral na akawnt"
 
 #. TRANS: User instructions for form in which to connect an OpenID to an existing user on the site.
-#: finishopenidlogin.php:179
 msgid ""
 "If you already have an account, login with your username and password to "
 "connect it to your OpenID."
@@ -465,35 +193,29 @@ msgstr ""
 "tagagamit at hudyat upang iugnay ito sa iyong OpenID."
 
 #. TRANS: Field label in form in which to connect an OpenID to an existing user on the site.
-#: finishopenidlogin.php:183
 msgid "Existing nickname"
 msgstr "Umiiral na palayaw"
 
 #. TRANS: Field label in form in which to connect an OpenID to an existing user on the site.
-#: finishopenidlogin.php:187
 msgid "Password"
 msgstr "Hudyat"
 
 #. TRANS: Button label in form in which to connect an OpenID to an existing user on the site.
-#: finishopenidlogin.php:191
 msgctxt "BUTTON"
 msgid "Connect"
 msgstr "Umugnay"
 
 #. TRANS: Status message in case the response from the OpenID provider is that the logon attempt was cancelled.
-#: finishopenidlogin.php:237 finishaddopenid.php:90
 msgid "OpenID authentication cancelled."
 msgstr "Kinansela ang pagpapatunay ng OpenID."
 
 #. TRANS: OpenID authentication failed; display the error message. %s is the error message.
 #. TRANS: OpenID authentication failed; display the error message.
 #. TRANS: %s is the error message.
-#: finishopenidlogin.php:241 finishaddopenid.php:95
 #, php-format
 msgid "OpenID authentication failed: %s"
 msgstr "Nabigo ang pagpapatunay ng OpenID: %s"
 
-#: finishopenidlogin.php:261 finishaddopenid.php:111
 msgid ""
 "OpenID authentication aborted: you are not allowed to login to this site."
 msgstr ""
@@ -502,50 +224,285 @@ msgstr ""
 
 #. TRANS: OpenID plugin message. No new user registration is allowed on the site.
 #. TRANS: OpenID plugin message. No new user registration is allowed on the site without an invitation code, and none was provided.
-#: finishopenidlogin.php:317 finishopenidlogin.php:327
 msgid "Registration not allowed."
 msgstr "Hindi pinayagan ang pagpapatala."
 
 #. TRANS: OpenID plugin message. No new user registration is allowed on the site without an invitation code, and the one provided was not valid.
-#: finishopenidlogin.php:335
 msgid "Not a valid invitation code."
 msgstr "Hindi isang tanggap na kodigo ng paanyaya."
 
 #. TRANS: OpenID plugin message. The entered new user name is blacklisted.
-#: finishopenidlogin.php:349
 msgid "Nickname not allowed."
 msgstr "Hindi pinayagan ang palayaw."
 
 #. TRANS: OpenID plugin message. The entered new user name is already used.
-#: finishopenidlogin.php:355
 msgid "Nickname already in use. Try another one."
 msgstr "Ginagamit na ang palayaw. Sumubok ng iba."
 
 #. TRANS: OpenID plugin server error. A stored OpenID cannot be retrieved.
 #. TRANS: OpenID plugin server error. A stored OpenID cannot be found.
-#: finishopenidlogin.php:363 finishopenidlogin.php:449
 msgid "Stored OpenID not found."
 msgstr "Hindi natagpuan ang nakalagak na OpenID."
 
 #. TRANS: OpenID plugin server error.
-#: finishopenidlogin.php:373
 msgid "Creating new account for OpenID that already has a user."
 msgstr ""
 "Nililikha ang bagong akawnt para sa OpenID na mayroon nang isang tagagamit."
 
 #. TRANS: OpenID plugin message.
-#: finishopenidlogin.php:437
 msgid "Invalid username or password."
 msgstr "Hindi tanggap na pangalan ng tagagamit o hudyat."
 
 #. TRANS: OpenID plugin server error. The user or user profile could not be saved.
-#: finishopenidlogin.php:457
 msgid "Error connecting user to OpenID."
 msgstr "May kamalian sa pag-ugnay ng tagagamit sa OpenID."
 
+#. TRANS: OpenID plugin server error.
+msgid "Cannot instantiate OpenID consumer object."
+msgstr "Hindi mapanimulan ang bagay na pangtagapagtangkilik ng OpenID."
+
+#. TRANS: OpenID plugin message. Given when an OpenID is not valid.
+msgid "Not a valid OpenID."
+msgstr "Hindi isang tanggap na OpenID."
+
+#. TRANS: OpenID plugin server error. Given when the OpenID authentication request fails.
+#. TRANS: %s is the failure message.
+#, php-format
+msgid "OpenID failure: %s"
+msgstr "Kabiguan ng OpenID: %s"
+
+#. TRANS: OpenID plugin server error. Given when the OpenID authentication request cannot be redirected.
+#. TRANS: %s is the failure message.
+#, php-format
+msgid "Could not redirect to server: %s"
+msgstr "Hindi mabago upang papuntahin sa tagapaghain: %s"
+
+#. TRANS: OpenID plugin user instructions.
+msgid ""
+"This form should automatically submit itself. If not, click the submit "
+"button to go to your OpenID provider."
+msgstr ""
+"Ang pormularyong ito ay dapat na kusang magpapasa ng kanyang sarili.  Kung "
+"hindi, pindutin ang pindutang pampasa upang pumunta sa iyong tagapagbigay ng "
+"OpenID."
+
+#. TRANS: OpenID plugin server error.
+msgid "Error saving the profile."
+msgstr "Kamalian sa pagsagip ng balangkas."
+
+#. TRANS: OpenID plugin server error.
+msgid "Error saving the user."
+msgstr "Kamalian sa pagsagip ng tagagamit."
+
+#. TRANS: OpenID plugin client exception (403).
+msgid "Unauthorized URL used for OpenID login."
+msgstr "Hindi pinahintulutang URL na ginamit para sa paglagda ng OpenID."
+
+#. TRANS: Title
+msgid "OpenID Login Submission"
+msgstr "Pagpapasa ng Paglagda ng OpenID"
+
+#. TRANS: OpenID plugin message used while requesting authorization user's OpenID login provider.
+msgid "Requesting authorization from your login provider..."
+msgstr ""
+"Humihiling ng pahintulot mula sa iyong tagapagbigay ng paglagdang papasok..."
+
+#. TRANS: OpenID plugin message. User instruction while requesting authorization user's OpenID login provider.
+msgid ""
+"If you are not redirected to your login provider in a few seconds, try "
+"pushing the button below."
+msgstr ""
+"Kapag hindi ka itinurong papunta sa iyong tagapagbigay ng paglagda sa loob "
+"ng ilang mga segundo, subukang pindutin ang pindutang nasa ibaba."
+
+msgid "OpenID"
+msgstr "OpenID"
+
+msgid "OpenID settings"
+msgstr "Mga katakdaan ng OpenID"
+
+msgid "Invalid provider URL. Max length is 255 characters."
+msgstr ""
+"Hindi tanggap na URL ng tagapagbigay. Ang pinakamataas na haba ay 255 mga "
+"panitik."
+
+msgid "Invalid team name. Max length is 255 characters."
+msgstr ""
+"Hindi tanggap ng pangalan ng pangkat. Pinakamataas na haba ay 255 mga "
+"panitik."
+
+msgid "Trusted provider"
+msgstr "Pinagkakatiwalaang tagapagbigay"
+
+msgid ""
+"By default, users are allowed to authenticate with any OpenID provider. If "
+"you are using your own OpenID service for shared sign-in, you can restrict "
+"access to only your own users here."
+msgstr ""
+"Bilang likas na pagtatakda, ang mga tagagamit ay hindi pinapahintulutang "
+"magpatunay sa pamamagitan ng anumang tagapagbigay ng OpenID.  Kung ginagamit "
+"mo ang sarili mong palingkuran ng OpenID para sa pinagsasaluhang paglagdang "
+"papasok, malilimitahan mo ang pagpunta sa iyong mga tagagamit lamang dito."
+
+msgid "Provider URL"
+msgstr "URL ng tagapagbigay"
+
+msgid ""
+"All OpenID logins will be sent to this URL; other providers may not be used."
+msgstr ""
+"Ang lahat ng mga paglalagda sa OpenID ay ipapadala sa URL na ito; hindi "
+"maaaring gamitin ang ibang mga tagapagbigay."
+
+msgid "Append a username to base URL"
+msgstr "Ikabit ang isang pangalan ng tagagamit sa punong URL"
+
+msgid ""
+"Login form will show the base URL and prompt for a username to add at the "
+"end. Use when OpenID provider URL should be the profile page for individual "
+"users."
+msgstr ""
+"Ang pormularyo ng paglagda ay magpapakita ng batayang URL at gagawa ng isang "
+"pangalan ng tagagamit na idaragdag sa huli.  Gamitin kapag ang URL ng "
+"tagapagbigay ng OpenID ay ang dapat na maging pahina ng balangkas para sa "
+"indibiduwal na mga tagagamit."
+
+msgid "Required team"
+msgstr "Kailangang pangkat"
+
+msgid "Only allow logins from users in the given team (Launchpad extension)."
+msgstr ""
+"Payagan lamang ang mga paglagda mula sa mga tagagamit na nasa loob ng "
+"ibinigay na pangkat (karugtong ng Launchpad)."
+
+msgid "Options"
+msgstr "Mga pagpipilian"
+
+msgid "Enable OpenID-only mode"
+msgstr "Paganahin ang gawi na OpenID lamang"
+
+#, fuzzy
+msgid ""
+"Require all users to login via OpenID. Warning: disables password "
+"authentication for all users!"
+msgstr ""
+"Igiit sa lahat ng mga tagagamit na lumagda sa pamamagitan ng OpenID.  "
+"BABALA: hindi pinagagana ang pagpapatunay ng hudyat para sa lahat ng mga "
+"tagagamit!"
+
+msgid "Save OpenID settings"
+msgstr "Sagipin ang mga katakdaan ng OpenID"
+
+#. TRANS: Client error message
+msgid "Not logged in."
+msgstr "Hindi nakalagda."
+
+#. TRANS: message in case a user tries to add an OpenID that is already connected to them.
+msgid "You already have this OpenID!"
+msgstr "Mayroon ka na ng ganitong OpenID!"
+
+#. TRANS: message in case a user tries to add an OpenID that is already used by another user.
+msgid "Someone else already has this OpenID."
+msgstr "Mayroon nang ibang tao na may ganitong OpenID."
+
+#. TRANS: message in case the OpenID object cannot be connected to the user.
+msgid "Error connecting user."
+msgstr "Kamalian sa pag-ugnay ng tagagamit."
+
+#. TRANS: message in case the user or the user profile cannot be saved in StatusNet.
+msgid "Error updating profile"
+msgstr "Kamalian sa pagsasapanahon ng balangkas"
+
+#. TRANS: Title after getting the status of the OpenID authorisation request.
+#. TRANS: OpenID plugin message. Title.
+msgid "OpenID Login"
+msgstr "Panglagdang OpenID"
+
+#, php-format
+msgid ""
+"[OpenID](%%doc.openid%%) lets you log into many sites with the same user "
+"account. Manage your associated OpenIDs from here."
+msgstr ""
+"Nagpapahintulot ang [OpenID](%%doc.openid%%) na makalagda ka sa maraming mga "
+"sityong may katulad na akawnt ng tagagamit. Pamahalaan ang iyong kaugnay na "
+"mga OpenID mula rito."
+
+msgid "Add OpenID"
+msgstr "Idagdag ang OpenID"
+
+msgid ""
+"If you want to add an OpenID to your account, enter it in the box below and "
+"click \"Add\"."
+msgstr ""
+"Kung nais mong magdagdag ng isang OpenID sa akawnt mo, ipasok ito sa kahong "
+"nasa ibaba at pindutin ang \"Idagdag\"."
+
+msgid "Add"
+msgstr "Idagdag"
+
+msgid "Remove OpenID"
+msgstr "Tanggalin ang OpenID"
+
+msgid ""
+"Removing your only OpenID would make it impossible to log in! If you need to "
+"remove it, add another OpenID first."
+msgstr ""
+"Ang pagtatanggal ng iyong OpenID lamang ay makasasanhi ng imposibleng "
+"paglagda!  Kung kailangan mong tanggalin ito, magdagdag ng ibang OpenID muna."
+
+msgid ""
+"You can remove an OpenID from your account by clicking the button marked "
+"\"Remove\"."
+msgstr ""
+"Matatanggap mo ang isang OpenID mula sa akawnt mo sa pamamagitan ng "
+"pagpindot sa pindutang may tatak na \"Tanggalin\"."
+
+msgid "Remove"
+msgstr "Tanggalin"
+
+msgid "OpenID Trusted Sites"
+msgstr "Pinagkakatiwalaang mga Sityo ng OpenID"
+
+msgid ""
+"The following sites are allowed to access your identity and log you in. You "
+"can remove a site from this list to deny it access to your OpenID."
+msgstr ""
+"Ang sumusunod na mga sityo ay pinapahintulutang makapunta sa iyong katauhan "
+"at makalagda kang papasok.  Matatanggal mo ang isang sityo mula sa talaang "
+"ito upang tanggihan ang pagpunta nito sa iyong OpenID."
+
+msgid "Can't add new providers."
+msgstr "Hindi makapagdaragdag ng bagong mga tagapagbigay."
+
+msgid "Something weird happened."
+msgstr "May nangyaring kakaiba."
+
+msgid "No such OpenID trustroot."
+msgstr "Walng ganyang pinagkakatiwalaang ugat ng OpenID."
+
+msgid "Trustroots removed"
+msgstr "Tinanggal ang mga pinagkakatiwalaang ugat"
+
+msgid "No such OpenID."
+msgstr "Walang ganyang OpenID."
+
+msgid "That OpenID does not belong to you."
+msgstr "Hindi mo pag-aari ang OpenID na iyan."
+
+msgid "OpenID removed."
+msgstr "Tinanggal ang OpenID."
+
+#. TRANS: OpenID plugin client error given trying to add an unauthorised OpenID to a user (403).
+#, php-format
+msgid "You are not authorized to use the identity %s."
+msgstr "Wala kang pahintulot na gamitin ang katauhang %s."
+
+#. TRANS: OpenID plugin client error given when not getting a response for a given OpenID provider (500).
+msgid "Just an OpenID provider. Nothing to see here, move along..."
+msgstr ""
+"Isa lamang na tagapagbigay ng OpenID. Walang makikita rito, magpatuloy..."
+
 #. TRANS: OpenID plugin message. Rememberme logins have to reauthenticate before changing any profile settings.
 #. TRANS: "OpenID" is the display text for a link with URL "(%%doc.openid%%)".
-#: openidlogin.php:74
 #, php-format
 msgid ""
 "For security reasons, please re-login with your [OpenID](%%doc.openid%%) "
@@ -556,84 +513,20 @@ msgstr ""
 
 #. TRANS: OpenID plugin message.
 #. TRANS: "OpenID" is the display text for a link with URL "(%%doc.openid%%)".
-#: openidlogin.php:80
 #, php-format
 msgid "Login with an [OpenID](%%doc.openid%%) account."
 msgstr "Lumagda sa pamamagitan ng isang akawnt ng [OpenID](%%doc.openid%%)."
 
-#. TRANS: OpenID plugin message. Title.
-#. TRANS: Title after getting the status of the OpenID authorisation request.
-#: openidlogin.php:114 finishaddopenid.php:187
-msgid "OpenID Login"
-msgstr "Panglagdang OpenID"
-
 #. TRANS: OpenID plugin logon form checkbox label for setting to put the OpenID information in a cookie.
-#: openidlogin.php:160
 msgid "Remember me"
 msgstr "Tandaan ako"
 
 #. TRANS: OpenID plugin logon form field instructions.
-#: openidlogin.php:162
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 "Kusang lumagda sa hinaharap; hindi para sa pinagsasaluhang mga kompyuter!"
 
 #. TRANS: OpenID plugin logon form button label to start logon with the data provided in the logon form.
-#: openidlogin.php:167
 msgctxt "BUTTON"
 msgid "Login"
 msgstr "Lumagda"
-
-#: openidtrust.php:52
-msgid "OpenID Identity Verification"
-msgstr "Pagpapatunay sa Katauhan ng OpenID"
-
-#: openidtrust.php:70
-msgid ""
-"This page should only be reached during OpenID processing, not directly."
-msgstr ""
-"Ang pahinang ito ay dapat lamang na maabot habang pinoproseso ang OpenID, "
-"hindi tuwiran."
-
-#: openidtrust.php:118
-#, php-format
-msgid ""
-"%s  has asked to verify your identity. Click Continue to verify your "
-"identity and login without creating a new password."
-msgstr ""
-"Hiniling ng/ni %s na patunayan ang iyong katauhan. Pindutin ang Magpatuloy "
-"upang tiyakin ang iyong katauhan at lumagdang hindi lumilikha ng isang "
-"bagong hudyat."
-
-#: openidtrust.php:136
-msgid "Continue"
-msgstr "Magpatuloy"
-
-#: openidtrust.php:137
-msgid "Cancel"
-msgstr "Huwag ituloy"
-
-#. TRANS: Client error message
-#: finishaddopenid.php:68
-msgid "Not logged in."
-msgstr "Hindi nakalagda."
-
-#. TRANS: message in case a user tries to add an OpenID that is already connected to them.
-#: finishaddopenid.php:122
-msgid "You already have this OpenID!"
-msgstr "Mayroon ka na ng ganitong OpenID!"
-
-#. TRANS: message in case a user tries to add an OpenID that is already used by another user.
-#: finishaddopenid.php:125
-msgid "Someone else already has this OpenID."
-msgstr "Mayroon nang ibang tao na may ganitong OpenID."
-
-#. TRANS: message in case the OpenID object cannot be connected to the user.
-#: finishaddopenid.php:138
-msgid "Error connecting user."
-msgstr "Kamalian sa pag-ugnay ng tagagamit."
-
-#. TRANS: message in case the user or the user profile cannot be saved in StatusNet.
-#: finishaddopenid.php:145
-msgid "Error updating profile"
-msgstr "Kamalian sa pagsasapanahon ng balangkas"
diff --git a/plugins/OpenID/locale/uk/LC_MESSAGES/OpenID.po b/plugins/OpenID/locale/uk/LC_MESSAGES/OpenID.po
index 348be1f7e0..cf3e795591 100644
--- a/plugins/OpenID/locale/uk/LC_MESSAGES/OpenID.po
+++ b/plugins/OpenID/locale/uk/LC_MESSAGES/OpenID.po
@@ -10,305 +10,67 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OpenID\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:34+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:50+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-14 17:22:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:46:02+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-openid\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: openidsettings.php:58 openidadminpanel.php:65
-msgid "OpenID settings"
-msgstr "Налаштування OpenID"
+msgid "OpenID Identity Verification"
+msgstr "Перевірка ідентичності OpenID"
+
+msgid ""
+"This page should only be reached during OpenID processing, not directly."
+msgstr ""
+"Ви потрапляєте на цю сторінку лише при обробці запитів OpenID, не напряму."
 
-#: openidsettings.php:69
 #, php-format
 msgid ""
-"[OpenID](%%doc.openid%%) lets you log into many sites with the same user "
-"account. Manage your associated OpenIDs from here."
+"%s  has asked to verify your identity. Click Continue to verify your "
+"identity and login without creating a new password."
 msgstr ""
-"[OpenID](%%doc.openid%%) дозволяє входити до багатьох веб-сторінок "
-"використовуючи той самий лоґін і пароль. Тут можна впорядкувати ваші OpenID-"
-"акаунти."
+"%s запрошує вас пройти перевірку на ідентичність. Натисніть «Продовжити», щоб "
+"перевірити вашу особу та увійти, не створюючи нового паролю."
 
-#: openidsettings.php:100
-msgid "Add OpenID"
-msgstr "Додати OpenID"
+msgid "Continue"
+msgstr "Продовжити"
 
-#: openidsettings.php:103
-msgid ""
-"If you want to add an OpenID to your account, enter it in the box below and "
-"click \"Add\"."
-msgstr ""
-"Якщо ви бажаєте додати OpenID до вашого акаунту, введіть його у полі нижче і "
-"натисніть «Додати»."
-
-#. TRANS: OpenID plugin logon form field label.
-#: openidsettings.php:108 OpenIDPlugin.php:703 openidlogin.php:152
-msgid "OpenID URL"
-msgstr "URL-адреса OpenID"
-
-#: openidsettings.php:118
-msgid "Add"
-msgstr "Додати"
-
-#: openidsettings.php:130
-msgid "Remove OpenID"
-msgstr "Видалити OpenID"
-
-#: openidsettings.php:135
-msgid ""
-"Removing your only OpenID would make it impossible to log in! If you need to "
-"remove it, add another OpenID first."
-msgstr ""
-"Якщо для входу ви використовуєте лише OpenID, то його видалення унеможливить "
-"вхід у майбутньому! Якщо вам потрібно видалити ваш єдиний OpenID, то спершу "
-"додайте інший."
-
-#: openidsettings.php:150
-msgid ""
-"You can remove an OpenID from your account by clicking the button marked "
-"\"Remove\"."
-msgstr "Ви можете видалити ваш OpenID просто натиснувши кнопку «Видалити»."
-
-#: openidsettings.php:173 openidsettings.php:214
-msgid "Remove"
-msgstr "Видалити"
-
-#: openidsettings.php:187
-msgid "OpenID Trusted Sites"
-msgstr "Довірені сайти OpenID"
-
-#: openidsettings.php:190
-msgid ""
-"The following sites are allowed to access your identity and log you in. You "
-"can remove a site from this list to deny it access to your OpenID."
-msgstr ""
-"У списку наведено OpenID-адреси, які ідентифіковані як ваші і їм дозволено "
-"вхід до сайту. Ви можете вилучити якийсь з них, тим самим скасувавши дозвіл "
-"на вхід."
-
-#. TRANS: Message given when there is a problem with the user's session token.
-#: openidsettings.php:232 finishopenidlogin.php:42
-msgid "There was a problem with your session token. Try again, please."
-msgstr ""
-"Виникли певні проблеми з токеном поточної сесії. Спробуйте знов, будь ласка."
-
-#: openidsettings.php:239
-msgid "Can't add new providers."
-msgstr "Не вдається додати нового OpenID-провайдера."
-
-#: openidsettings.php:252
-msgid "Something weird happened."
-msgstr "Сталося щось незрозуміле."
-
-#: openidsettings.php:276
-msgid "No such OpenID trustroot."
-msgstr "Серед довірених такого OpenID немає."
-
-#: openidsettings.php:280
-msgid "Trustroots removed"
-msgstr "Довірені OpenID видалено"
-
-#: openidsettings.php:303
-msgid "No such OpenID."
-msgstr "Немає такого OpenID."
-
-#: openidsettings.php:308
-msgid "That OpenID does not belong to you."
-msgstr "Даний OpenID належить не вам."
-
-#: openidsettings.php:312
-msgid "OpenID removed."
-msgstr "OpenID видалено."
-
-#: openidadminpanel.php:54
-msgid "OpenID"
-msgstr "OpenID"
-
-#: openidadminpanel.php:147
-msgid "Invalid provider URL. Max length is 255 characters."
-msgstr "Невірний URL OpenID-провайдера. Максимальна довжина — 255 символів."
-
-#: openidadminpanel.php:153
-msgid "Invalid team name. Max length is 255 characters."
-msgstr "Невірна назва спільноти. Максимальна довжина — 255 символів."
-
-#: openidadminpanel.php:210
-msgid "Trusted provider"
-msgstr "Довірений OpenID-провайдер"
-
-#: openidadminpanel.php:212
-msgid ""
-"By default, users are allowed to authenticate with any OpenID provider. If "
-"you are using your own OpenID service for shared sign-in, you can restrict "
-"access to only your own users here."
-msgstr ""
-"За замовчуванням, відвідувачам дозволено користуватись послугами будь-якого "
-"OpenID-провайдера. Якщо ви користуєтесь своїм власним OpenID для загального "
-"входу на веб-сторінки, то ви вільні обмежити доступ лише колом ваших власних "
-"користувачів."
-
-#: openidadminpanel.php:220
-msgid "Provider URL"
-msgstr "URL провайдера"
-
-#: openidadminpanel.php:221
-msgid ""
-"All OpenID logins will be sent to this URL; other providers may not be used."
-msgstr ""
-"Всі сесії входу через OpenID будуть спрямовуватись на цю URL-адресу; інших "
-"OpenID-провайдерів використовувати не можна."
-
-#: openidadminpanel.php:228
-msgid "Append a username to base URL"
-msgstr "Додати ім’я користувача до базового URL"
-
-#: openidadminpanel.php:230
-msgid ""
-"Login form will show the base URL and prompt for a username to add at the "
-"end. Use when OpenID provider URL should be the profile page for individual "
-"users."
-msgstr ""
-"У формі входу на сайт буде представлено базовий URL і запит щодо імені "
-"користувача у кінці. В такому випадку, URL OpenID-провайдера — це сторінка "
-"профілю окремих користувачів."
-
-#: openidadminpanel.php:238
-msgid "Required team"
-msgstr "Необхідна група"
-
-#: openidadminpanel.php:239
-msgid "Only allow logins from users in the given team (Launchpad extension)."
-msgstr ""
-"Дозволяється вхід лише користувачам у вказаній групі (розширення для "
-"Launchpad)."
-
-#: openidadminpanel.php:251
-msgid "Options"
-msgstr "Параметри"
-
-#: openidadminpanel.php:258
-msgid "Enable OpenID-only mode"
-msgstr "Увімкнути режим входу лише за OpenID"
-
-#: openidadminpanel.php:260
-msgid ""
-"Require all users to login via OpenID. Warning: disables password "
-"authentication for all users!"
-msgstr ""
-"Вимагає, щоб всі користувачі входили лише за допомогою OpenID. Увага: ця "
-"опція вимикає автентифікацію за паролем для всіх користувачів!"
-
-#: openidadminpanel.php:278
-msgid "Save OpenID settings"
-msgstr "Зберегти налаштування OpenID"
-
-#. TRANS: OpenID plugin server error.
-#: openid.php:138
-msgid "Cannot instantiate OpenID consumer object."
-msgstr "Не можу створити примірник об’єкта споживача OpenID."
-
-#. TRANS: OpenID plugin message. Given when an OpenID is not valid.
-#: openid.php:150
-msgid "Not a valid OpenID."
-msgstr "Це недійсний OpenID."
-
-#. TRANS: OpenID plugin server error. Given when the OpenID authentication request fails.
-#. TRANS: %s is the failure message.
-#: openid.php:155
-#, php-format
-msgid "OpenID failure: %s"
-msgstr "Неуспіх OpenID: %s"
-
-#. TRANS: OpenID plugin server error. Given when the OpenID authentication request cannot be redirected.
-#. TRANS: %s is the failure message.
-#: openid.php:205
-#, php-format
-msgid "Could not redirect to server: %s"
-msgstr "Не можу переадресувати на сервер: %s"
-
-#. TRANS: OpenID plugin user instructions.
-#: openid.php:244
-msgid ""
-"This form should automatically submit itself. If not, click the submit "
-"button to go to your OpenID provider."
-msgstr ""
-"Ця форма має автоматичне себе представити. Якщо ні, натисніть відповідну "
-"кнопку, щоб перейти до сторінки вашого OpenID-провайдера."
-
-#. TRANS: OpenID plugin server error.
-#: openid.php:280
-msgid "Error saving the profile."
-msgstr "Помилка при збереженні профілю."
-
-#. TRANS: OpenID plugin server error.
-#: openid.php:292
-msgid "Error saving the user."
-msgstr "Помилка при збереженні користувача."
-
-#. TRANS: OpenID plugin client exception (403).
-#: openid.php:322
-msgid "Unauthorized URL used for OpenID login."
-msgstr "Для входу за OpenID використовується неавторизований URL."
-
-#. TRANS: Title
-#: openid.php:370
-msgid "OpenID Login Submission"
-msgstr "Представлення входу за OpenID"
-
-#. TRANS: OpenID plugin message used while requesting authorization user's OpenID login provider.
-#: openid.php:381
-msgid "Requesting authorization from your login provider..."
-msgstr "Запитуємо дозвіл у вашого OpenID-провайдера..."
-
-#. TRANS: OpenID plugin message. User instruction while requesting authorization user's OpenID login provider.
-#: openid.php:385
-msgid ""
-"If you are not redirected to your login provider in a few seconds, try "
-"pushing the button below."
-msgstr ""
-"Якщо за кілька секунд вас не буде перенаправлено на сторінку входу вашого "
-"OpenID-провайдера, просто натисніть кнопку внизу."
+msgid "Cancel"
+msgstr "Скасувати"
 
 #. TRANS: Tooltip for main menu option "Login"
-#: OpenIDPlugin.php:218
 msgctxt "TOOLTIP"
 msgid "Login to the site"
 msgstr "Вхід на сайт"
 
 #. TRANS: Main menu option when not logged in to log in
-#: OpenIDPlugin.php:221
 msgctxt "MENU"
 msgid "Login"
 msgstr "Увійти"
 
 #. TRANS: Tooltip for main menu option "Help"
-#: OpenIDPlugin.php:226
 msgctxt "TOOLTIP"
 msgid "Help me!"
 msgstr "Допоможіть!"
 
 #. TRANS: Main menu option for help on the StatusNet site
-#: OpenIDPlugin.php:229
 msgctxt "MENU"
 msgid "Help"
 msgstr "Довідка"
 
 #. TRANS: Tooltip for main menu option "Search"
-#: OpenIDPlugin.php:235
 msgctxt "TOOLTIP"
 msgid "Search for people or text"
 msgstr "Пошук людей або текстів"
 
 #. TRANS: Main menu option when logged in or when the StatusNet instance is not private
-#: OpenIDPlugin.php:238
 msgctxt "MENU"
 msgid "Search"
 msgstr "Пошук"
@@ -316,94 +78,75 @@ msgstr "Пошук"
 #. TRANS: OpenID plugin menu item on site logon page.
 #. TRANS: OpenID plugin menu item on user settings page.
 #. TRANS: OpenID configuration menu item.
-#: OpenIDPlugin.php:295 OpenIDPlugin.php:331 OpenIDPlugin.php:605
 msgctxt "MENU"
 msgid "OpenID"
 msgstr "OpenID"
 
 #. TRANS: OpenID plugin tooltip for logon menu item.
-#: OpenIDPlugin.php:297
 msgid "Login or register with OpenID"
 msgstr "Увійти або зареєструватися за допомогою OpenID"
 
 #. TRANS: OpenID plugin tooltip for user settings menu item.
-#: OpenIDPlugin.php:333
 msgid "Add or remove OpenIDs"
 msgstr "Додати або видалити OpenID"
 
 #. TRANS: Tooltip for OpenID configuration menu item.
-#: OpenIDPlugin.php:607
 msgid "OpenID configuration"
 msgstr "Конфігурація OpenID"
 
 #. TRANS: OpenID plugin description.
-#: OpenIDPlugin.php:653
 msgid "Use <a href=\"http://openid.net/\">OpenID</a> to login to the site."
 msgstr ""
 "Використання <a href=\"http://openid.net/\">OpenID</a> для входу на сайт."
 
 #. TRANS: button label for OAuth authorization page when needing OpenID authentication first.
-#: OpenIDPlugin.php:663
 msgctxt "BUTTON"
 msgid "Continue"
 msgstr "Продовжити"
 
 #. TRANS: OpenID plugin logon form legend.
-#: OpenIDPlugin.php:680 openidlogin.php:132
 msgid "OpenID login"
 msgstr "Вхід з OpenID"
 
 #. TRANS: Field label.
-#: OpenIDPlugin.php:688 openidlogin.php:139
 msgid "OpenID provider"
 msgstr "OpenID-провайдер"
 
 #. TRANS: Form guide.
-#: OpenIDPlugin.php:697 openidlogin.php:147
 msgid "Enter your username."
 msgstr "Введіть ім’я користувача."
 
 #. TRANS: Form guide.
-#: OpenIDPlugin.php:699 openidlogin.php:148
 msgid "You will be sent to the provider's site for authentication."
 msgstr "Вас буде перенаправлено на веб-сторінку провайдера для автентифікації."
 
+#. TRANS: OpenID plugin logon form field label.
+msgid "OpenID URL"
+msgstr "URL-адреса OpenID"
+
 #. TRANS: OpenID plugin logon form field instructions.
-#: OpenIDPlugin.php:706 openidlogin.php:155
 msgid "Your OpenID URL"
 msgstr "URL вашого OpenID"
 
-#. TRANS: OpenID plugin client error given trying to add an unauthorised OpenID to a user (403).
-#: openidserver.php:116
-#, php-format
-msgid "You are not authorized to use the identity %s."
-msgstr ""
-"Ви не авторизовані, для того щоб мати можливість пройти перевірку "
-"ідентичності на %s."
-
-#. TRANS: OpenID plugin client error given when not getting a response for a given OpenID provider (500).
-#: openidserver.php:137
-msgid "Just an OpenID provider. Nothing to see here, move along..."
-msgstr "Просто OpenID-провайдер. Нічого належного чомусь не видно..."
-
 #. TRANS: Client error message trying to log on with OpenID while already logged on.
-#: finishopenidlogin.php:37 openidlogin.php:33
 msgid "Already logged in."
 msgstr "Тепер ви увійшли."
 
+#. TRANS: Message given when there is a problem with the user's session token.
+msgid "There was a problem with your session token. Try again, please."
+msgstr ""
+"Виникли певні проблеми з токеном поточної сесії. Спробуйте знов, будь ласка."
+
 #. TRANS: Message given if user does not agree with the site's license.
-#: finishopenidlogin.php:48
 msgid "You can't register if you don't agree to the license."
 msgstr "Ви не зможете зареєструватися, якщо не погодитесь з умовами ліцензії."
 
 #. TRANS: Messag given on an unknown error.
-#: finishopenidlogin.php:57
 msgid "An unknown error has occured."
 msgstr "Виникла якась незрозуміла помилка."
 
 #. TRANS: Instructions given after a first successful logon using OpenID.
 #. TRANS: %s is the site name.
-#: finishopenidlogin.php:73
 #, php-format
 msgid ""
 "This is the first time you've logged into %s so we must connect your OpenID "
@@ -415,40 +158,32 @@ msgstr ""
 "використати такий, що вже існує."
 
 #. TRANS: Title
-#: finishopenidlogin.php:80
 msgid "OpenID Account Setup"
 msgstr "Створення акаунту OpenID"
 
-#: finishopenidlogin.php:117
 msgid "Create new account"
 msgstr "Створити новий акаунт"
 
-#: finishopenidlogin.php:119
 msgid "Create a new user with this nickname."
 msgstr "Створити нового користувача з цим нікнеймом."
 
-#: finishopenidlogin.php:126
 msgid "New nickname"
 msgstr "Новий нікнейм"
 
-#: finishopenidlogin.php:128
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr ""
 "1-64 літери нижнього регістру і цифри, ніякої пунктуації або інтервалів"
 
 #. TRANS: Button label in form in which to create a new user on the site for an OpenID.
-#: finishopenidlogin.php:162
 msgctxt "BUTTON"
 msgid "Create"
 msgstr "Створити"
 
 #. TRANS: Used as form legend for form in which to connect an OpenID to an existing user on the site.
-#: finishopenidlogin.php:176
 msgid "Connect existing account"
 msgstr "Приєднати акаунт, який вже існує"
 
 #. TRANS: User instructions for form in which to connect an OpenID to an existing user on the site.
-#: finishopenidlogin.php:179
 msgid ""
 "If you already have an account, login with your username and password to "
 "connect it to your OpenID."
@@ -457,84 +192,304 @@ msgstr ""
 "приєднати їх до вашого OpenID."
 
 #. TRANS: Field label in form in which to connect an OpenID to an existing user on the site.
-#: finishopenidlogin.php:183
 msgid "Existing nickname"
 msgstr "Нікнейм, який вже існує"
 
 #. TRANS: Field label in form in which to connect an OpenID to an existing user on the site.
-#: finishopenidlogin.php:187
 msgid "Password"
 msgstr "Пароль"
 
 #. TRANS: Button label in form in which to connect an OpenID to an existing user on the site.
-#: finishopenidlogin.php:191
 msgctxt "BUTTON"
 msgid "Connect"
 msgstr "Під’єднати"
 
 #. TRANS: Status message in case the response from the OpenID provider is that the logon attempt was cancelled.
-#: finishopenidlogin.php:237 finishaddopenid.php:90
 msgid "OpenID authentication cancelled."
 msgstr "Автентифікацію за OpenID скасовано."
 
 #. TRANS: OpenID authentication failed; display the error message. %s is the error message.
 #. TRANS: OpenID authentication failed; display the error message.
 #. TRANS: %s is the error message.
-#: finishopenidlogin.php:241 finishaddopenid.php:95
 #, php-format
 msgid "OpenID authentication failed: %s"
 msgstr "Автентифікуватись за OpenID не вдалося: %s"
 
-#: finishopenidlogin.php:261 finishaddopenid.php:111
 msgid ""
 "OpenID authentication aborted: you are not allowed to login to this site."
 msgstr "Автентифікацію за OpenID перервано: ви не можете увійти на цей сайт."
 
 #. TRANS: OpenID plugin message. No new user registration is allowed on the site.
 #. TRANS: OpenID plugin message. No new user registration is allowed on the site without an invitation code, and none was provided.
-#: finishopenidlogin.php:317 finishopenidlogin.php:327
 msgid "Registration not allowed."
 msgstr "Реєстрацію не дозволено."
 
 #. TRANS: OpenID plugin message. No new user registration is allowed on the site without an invitation code, and the one provided was not valid.
-#: finishopenidlogin.php:335
 msgid "Not a valid invitation code."
 msgstr "Це не дійсний код запрошення."
 
 #. TRANS: OpenID plugin message. The entered new user name is blacklisted.
-#: finishopenidlogin.php:349
 msgid "Nickname not allowed."
 msgstr "Нікнейм не допускається."
 
 #. TRANS: OpenID plugin message. The entered new user name is already used.
-#: finishopenidlogin.php:355
 msgid "Nickname already in use. Try another one."
 msgstr "Цей нікнейм вже використовується. Спробуйте інший."
 
 #. TRANS: OpenID plugin server error. A stored OpenID cannot be retrieved.
 #. TRANS: OpenID plugin server error. A stored OpenID cannot be found.
-#: finishopenidlogin.php:363 finishopenidlogin.php:449
 msgid "Stored OpenID not found."
 msgstr "Збережений OpenID не знайдено."
 
 #. TRANS: OpenID plugin server error.
-#: finishopenidlogin.php:373
 msgid "Creating new account for OpenID that already has a user."
 msgstr "Створення нового акаунту для OpenID користувачем, який вже існує."
 
 #. TRANS: OpenID plugin message.
-#: finishopenidlogin.php:437
 msgid "Invalid username or password."
 msgstr "Невірне ім’я або пароль."
 
 #. TRANS: OpenID plugin server error. The user or user profile could not be saved.
-#: finishopenidlogin.php:457
 msgid "Error connecting user to OpenID."
 msgstr "Помилка при підключенні користувача до OpenID."
 
+#. TRANS: OpenID plugin server error.
+msgid "Cannot instantiate OpenID consumer object."
+msgstr "Не можу створити примірник об’єкта споживача OpenID."
+
+#. TRANS: OpenID plugin message. Given when an OpenID is not valid.
+msgid "Not a valid OpenID."
+msgstr "Це недійсний OpenID."
+
+#. TRANS: OpenID plugin server error. Given when the OpenID authentication request fails.
+#. TRANS: %s is the failure message.
+#, php-format
+msgid "OpenID failure: %s"
+msgstr "Неуспіх OpenID: %s"
+
+#. TRANS: OpenID plugin server error. Given when the OpenID authentication request cannot be redirected.
+#. TRANS: %s is the failure message.
+#, php-format
+msgid "Could not redirect to server: %s"
+msgstr "Не можу переадресувати на сервер: %s"
+
+#. TRANS: OpenID plugin user instructions.
+msgid ""
+"This form should automatically submit itself. If not, click the submit "
+"button to go to your OpenID provider."
+msgstr ""
+"Ця форма має автоматичне себе представити. Якщо ні, натисніть відповідну "
+"кнопку, щоб перейти до сторінки вашого OpenID-провайдера."
+
+#. TRANS: OpenID plugin server error.
+msgid "Error saving the profile."
+msgstr "Помилка при збереженні профілю."
+
+#. TRANS: OpenID plugin server error.
+msgid "Error saving the user."
+msgstr "Помилка при збереженні користувача."
+
+#. TRANS: OpenID plugin client exception (403).
+msgid "Unauthorized URL used for OpenID login."
+msgstr "Для входу за OpenID використовується неавторизований URL."
+
+#. TRANS: Title
+msgid "OpenID Login Submission"
+msgstr "Представлення входу за OpenID"
+
+#. TRANS: OpenID plugin message used while requesting authorization user's OpenID login provider.
+msgid "Requesting authorization from your login provider..."
+msgstr "Запитуємо дозвіл у вашого OpenID-провайдера..."
+
+#. TRANS: OpenID plugin message. User instruction while requesting authorization user's OpenID login provider.
+msgid ""
+"If you are not redirected to your login provider in a few seconds, try "
+"pushing the button below."
+msgstr ""
+"Якщо за кілька секунд вас не буде перенаправлено на сторінку входу вашого "
+"OpenID-провайдера, просто натисніть кнопку внизу."
+
+msgid "OpenID"
+msgstr "OpenID"
+
+msgid "OpenID settings"
+msgstr "Налаштування OpenID"
+
+msgid "Invalid provider URL. Max length is 255 characters."
+msgstr "Невірний URL OpenID-провайдера. Максимальна довжина — 255 символів."
+
+msgid "Invalid team name. Max length is 255 characters."
+msgstr "Невірна назва спільноти. Максимальна довжина — 255 символів."
+
+msgid "Trusted provider"
+msgstr "Довірений OpenID-провайдер"
+
+msgid ""
+"By default, users are allowed to authenticate with any OpenID provider. If "
+"you are using your own OpenID service for shared sign-in, you can restrict "
+"access to only your own users here."
+msgstr ""
+"За замовчуванням, відвідувачам дозволено користуватись послугами будь-якого "
+"OpenID-провайдера. Якщо ви користуєтесь своїм власним OpenID для загального "
+"входу на веб-сторінки, то ви вільні обмежити доступ лише колом ваших власних "
+"користувачів."
+
+msgid "Provider URL"
+msgstr "URL провайдера"
+
+msgid ""
+"All OpenID logins will be sent to this URL; other providers may not be used."
+msgstr ""
+"Всі сесії входу через OpenID будуть спрямовуватись на цю URL-адресу; інших "
+"OpenID-провайдерів використовувати не можна."
+
+msgid "Append a username to base URL"
+msgstr "Додати ім’я користувача до базового URL"
+
+msgid ""
+"Login form will show the base URL and prompt for a username to add at the "
+"end. Use when OpenID provider URL should be the profile page for individual "
+"users."
+msgstr ""
+"У формі входу на сайт буде представлено базовий URL і запит щодо імені "
+"користувача у кінці. В такому випадку, URL OpenID-провайдера — це сторінка "
+"профілю окремих користувачів."
+
+msgid "Required team"
+msgstr "Необхідна група"
+
+msgid "Only allow logins from users in the given team (Launchpad extension)."
+msgstr ""
+"Дозволяється вхід лише користувачам у вказаній групі (розширення для "
+"Launchpad)."
+
+msgid "Options"
+msgstr "Параметри"
+
+msgid "Enable OpenID-only mode"
+msgstr "Увімкнути режим входу лише за OpenID"
+
+msgid ""
+"Require all users to login via OpenID. Warning: disables password "
+"authentication for all users!"
+msgstr ""
+"Вимагає, щоб всі користувачі входили лише за допомогою OpenID. Увага: ця "
+"опція вимикає автентифікацію за паролем для всіх користувачів!"
+
+msgid "Save OpenID settings"
+msgstr "Зберегти налаштування OpenID"
+
+#. TRANS: Client error message
+msgid "Not logged in."
+msgstr "Ви не увійшли до системи."
+
+#. TRANS: message in case a user tries to add an OpenID that is already connected to them.
+msgid "You already have this OpenID!"
+msgstr "У вас вже є цей OpenID!"
+
+#. TRANS: message in case a user tries to add an OpenID that is already used by another user.
+msgid "Someone else already has this OpenID."
+msgstr "Хтось інший вже приєднав цей OpenID до свого акаунту."
+
+#. TRANS: message in case the OpenID object cannot be connected to the user.
+msgid "Error connecting user."
+msgstr "Помилка при підключенні користувача."
+
+#. TRANS: message in case the user or the user profile cannot be saved in StatusNet.
+msgid "Error updating profile"
+msgstr "Помилка при оновленні профілю"
+
+#. TRANS: Title after getting the status of the OpenID authorisation request.
+#. TRANS: OpenID plugin message. Title.
+msgid "OpenID Login"
+msgstr "Вхід з OpenID"
+
+#, php-format
+msgid ""
+"[OpenID](%%doc.openid%%) lets you log into many sites with the same user "
+"account. Manage your associated OpenIDs from here."
+msgstr ""
+"[OpenID](%%doc.openid%%) дозволяє входити до багатьох веб-сторінок "
+"використовуючи той самий лоґін і пароль. Тут можна впорядкувати ваші OpenID-"
+"акаунти."
+
+msgid "Add OpenID"
+msgstr "Додати OpenID"
+
+msgid ""
+"If you want to add an OpenID to your account, enter it in the box below and "
+"click \"Add\"."
+msgstr ""
+"Якщо ви бажаєте додати OpenID до вашого акаунту, введіть його у полі нижче і "
+"натисніть «Додати»."
+
+msgid "Add"
+msgstr "Додати"
+
+msgid "Remove OpenID"
+msgstr "Видалити OpenID"
+
+msgid ""
+"Removing your only OpenID would make it impossible to log in! If you need to "
+"remove it, add another OpenID first."
+msgstr ""
+"Якщо для входу ви використовуєте лише OpenID, то його видалення унеможливить "
+"вхід у майбутньому! Якщо вам потрібно видалити ваш єдиний OpenID, то спершу "
+"додайте інший."
+
+msgid ""
+"You can remove an OpenID from your account by clicking the button marked "
+"\"Remove\"."
+msgstr "Ви можете видалити ваш OpenID просто натиснувши кнопку «Видалити»."
+
+msgid "Remove"
+msgstr "Видалити"
+
+msgid "OpenID Trusted Sites"
+msgstr "Довірені сайти OpenID"
+
+msgid ""
+"The following sites are allowed to access your identity and log you in. You "
+"can remove a site from this list to deny it access to your OpenID."
+msgstr ""
+"У списку наведено OpenID-адреси, які ідентифіковані як ваші і їм дозволено "
+"вхід до сайту. Ви можете вилучити якийсь з них, тим самим скасувавши дозвіл "
+"на вхід."
+
+msgid "Can't add new providers."
+msgstr "Не вдається додати нового OpenID-провайдера."
+
+msgid "Something weird happened."
+msgstr "Сталося щось незрозуміле."
+
+msgid "No such OpenID trustroot."
+msgstr "Серед довірених такого OpenID немає."
+
+msgid "Trustroots removed"
+msgstr "Довірені OpenID видалено"
+
+msgid "No such OpenID."
+msgstr "Немає такого OpenID."
+
+msgid "That OpenID does not belong to you."
+msgstr "Даний OpenID належить не вам."
+
+msgid "OpenID removed."
+msgstr "OpenID видалено."
+
+#. TRANS: OpenID plugin client error given trying to add an unauthorised OpenID to a user (403).
+#, php-format
+msgid "You are not authorized to use the identity %s."
+msgstr ""
+"Ви не авторизовані, для того щоб мати можливість пройти перевірку "
+"ідентичності на %s."
+
+#. TRANS: OpenID plugin client error given when not getting a response for a given OpenID provider (500).
+msgid "Just an OpenID provider. Nothing to see here, move along..."
+msgstr "Просто OpenID-провайдер. Нічого належного чомусь не видно..."
+
 #. TRANS: OpenID plugin message. Rememberme logins have to reauthenticate before changing any profile settings.
 #. TRANS: "OpenID" is the display text for a link with URL "(%%doc.openid%%)".
-#: openidlogin.php:74
 #, php-format
 msgid ""
 "For security reasons, please re-login with your [OpenID](%%doc.openid%%) "
@@ -545,83 +500,21 @@ msgstr ""
 
 #. TRANS: OpenID plugin message.
 #. TRANS: "OpenID" is the display text for a link with URL "(%%doc.openid%%)".
-#: openidlogin.php:80
 #, php-format
 msgid "Login with an [OpenID](%%doc.openid%%) account."
 msgstr "Увійти з [OpenID](%%doc.openid%%)."
 
-#. TRANS: OpenID plugin message. Title.
-#. TRANS: Title after getting the status of the OpenID authorisation request.
-#: openidlogin.php:114 finishaddopenid.php:187
-msgid "OpenID Login"
-msgstr "Вхід з OpenID"
-
 #. TRANS: OpenID plugin logon form checkbox label for setting to put the OpenID information in a cookie.
-#: openidlogin.php:160
 msgid "Remember me"
 msgstr "Пам’ятати мене"
 
 #. TRANS: OpenID plugin logon form field instructions.
-#: openidlogin.php:162
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 "Автоматично входити у майбутньому; не для комп’ютерів загального "
 "користування!"
 
 #. TRANS: OpenID plugin logon form button label to start logon with the data provided in the logon form.
-#: openidlogin.php:167
 msgctxt "BUTTON"
 msgid "Login"
 msgstr "Увійти"
-
-#: openidtrust.php:52
-msgid "OpenID Identity Verification"
-msgstr "Перевірка ідентичності OpenID"
-
-#: openidtrust.php:70
-msgid ""
-"This page should only be reached during OpenID processing, not directly."
-msgstr ""
-"Ви потрапляєте на цю сторінку лише при обробці запитів OpenID, не напряму."
-
-#: openidtrust.php:118
-#, php-format
-msgid ""
-"%s  has asked to verify your identity. Click Continue to verify your "
-"identity and login without creating a new password."
-msgstr ""
-"%s запрошує вас пройти перевірку на ідентичність. Натисніть «Продовжити», щоб "
-"перевірити вашу особу та увійти, не створюючи нового паролю."
-
-#: openidtrust.php:136
-msgid "Continue"
-msgstr "Продовжити"
-
-#: openidtrust.php:137
-msgid "Cancel"
-msgstr "Скасувати"
-
-#. TRANS: Client error message
-#: finishaddopenid.php:68
-msgid "Not logged in."
-msgstr "Ви не увійшли до системи."
-
-#. TRANS: message in case a user tries to add an OpenID that is already connected to them.
-#: finishaddopenid.php:122
-msgid "You already have this OpenID!"
-msgstr "У вас вже є цей OpenID!"
-
-#. TRANS: message in case a user tries to add an OpenID that is already used by another user.
-#: finishaddopenid.php:125
-msgid "Someone else already has this OpenID."
-msgstr "Хтось інший вже приєднав цей OpenID до свого акаунту."
-
-#. TRANS: message in case the OpenID object cannot be connected to the user.
-#: finishaddopenid.php:138
-msgid "Error connecting user."
-msgstr "Помилка при підключенні користувача."
-
-#. TRANS: message in case the user or the user profile cannot be saved in StatusNet.
-#: finishaddopenid.php:145
-msgid "Error updating profile"
-msgstr "Помилка при оновленні профілю"
diff --git a/plugins/OpenX/locale/OpenX.pot b/plugins/OpenX/locale/OpenX.pot
index 9647573713..ea78e51c74 100644
--- a/plugins/OpenX/locale/OpenX.pot
+++ b/plugins/OpenX/locale/OpenX.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/OpenX/locale/br/LC_MESSAGES/OpenX.po b/plugins/OpenX/locale/br/LC_MESSAGES/OpenX.po
index 3d7bb6c1c3..4f2f449dee 100644
--- a/plugins/OpenX/locale/br/LC_MESSAGES/OpenX.po
+++ b/plugins/OpenX/locale/br/LC_MESSAGES/OpenX.po
@@ -9,103 +9,86 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OpenX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:47+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:51+0000\n"
 "Language-Team: Breton <http://translatewiki.net/wiki/Portal:br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-15 11:02:35+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:45:43+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-openx\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. TRANS: Menu item title/tooltip
-#: OpenXPlugin.php:201
 msgid "OpenX configuration"
 msgstr "Kefluniadur OpenX"
 
 #. TRANS: Menu item for site administration
-#: OpenXPlugin.php:203
 msgid "OpenX"
 msgstr "OpenX"
 
 #. TRANS: Plugin description.
-#: OpenXPlugin.php:224
 msgid "Plugin for <a href=\"http://www.openx.org/\">OpenX Ad Server</a>."
 msgstr ""
 "Plugin evit ar <a href=\"http://www.openx.org/\">servijer bruderezh OpenX</"
 "a>."
 
 #. TRANS: Page title for OpenX admin panel.
-#: openxadminpanel.php:53
 msgctxt "TITLE"
 msgid "OpenX"
 msgstr "OpenX"
 
 #. TRANS: Instructions for OpenX admin panel.
-#: openxadminpanel.php:64
 msgid "OpenX settings for this StatusNet site"
 msgstr "Arventennoù OpenX evit al lec'hienn StatusNet-mañ."
 
 #. TRANS: Form label in OpenX admin panel.
-#: openxadminpanel.php:167
 msgid "Ad script URL"
 msgstr "URL ar skript kemenn"
 
 #. TRANS: Tooltip for form label in OpenX admin panel.
-#: openxadminpanel.php:169
 msgid "Script URL"
 msgstr ""
 
 #. TRANS: Form label in OpenX admin panel. Refers to advertisement format.
-#: openxadminpanel.php:175
 msgid "Medium rectangle"
 msgstr ""
 
 #. TRANS: Tooltip for form label in OpenX admin panel. Refers to advertisement format.
-#: openxadminpanel.php:177
 msgid "Medium rectangle zone"
 msgstr ""
 
 #. TRANS: Form label in OpenX admin panel. Refers to advertisement format.
-#: openxadminpanel.php:183
 msgid "Rectangle"
 msgstr "Skouergornek"
 
 #. TRANS: Tooltip for form label in OpenX admin panel. Refers to advertisement format.
-#: openxadminpanel.php:185
 msgid "Rectangle zone"
 msgstr ""
 
 #. TRANS: Form label in OpenX admin panel. Refers to advertisement format.
-#: openxadminpanel.php:191
 msgid "Leaderboard"
 msgstr ""
 
 #. TRANS: Tooltip for form label in OpenX admin panel. Refers to advertisement format.
-#: openxadminpanel.php:193
 msgid "Leaderboard zone"
 msgstr ""
 
 #. TRANS: Form label in OpenX admin panel. Refers to advertisement format.
-#: openxadminpanel.php:199
 msgid "Skyscraper"
 msgstr "Giton a-serzh"
 
 #. TRANS: Tooltip for form label in OpenX admin panel. Refers to advertisement format.
-#: openxadminpanel.php:201
 msgid "Wide skyscraper zone"
 msgstr ""
 
 #. TRANS: Submit button text in OpenX admin panel.
-#: openxadminpanel.php:216
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Enrollañ"
 
 #. TRANS: Submit button title in OpenX admin panel.
-#: openxadminpanel.php:220
 msgid "Save OpenX settings"
 msgstr "Enrollañ arventennoù OpenX"
diff --git a/plugins/OpenX/locale/de/LC_MESSAGES/OpenX.po b/plugins/OpenX/locale/de/LC_MESSAGES/OpenX.po
index b74df493f5..6fbf6cc977 100644
--- a/plugins/OpenX/locale/de/LC_MESSAGES/OpenX.po
+++ b/plugins/OpenX/locale/de/LC_MESSAGES/OpenX.po
@@ -10,101 +10,84 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OpenX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-17 10:25+0000\n"
-"PO-Revision-Date: 2011-02-17 10:28:59+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:51+0000\n"
 "Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:28:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r82325); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:45:43+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-openx\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANS: Menu item title/tooltip
-#: OpenXPlugin.php:201
 msgid "OpenX configuration"
 msgstr "OpenX-Konfiguration"
 
 #. TRANS: Menu item for site administration
-#: OpenXPlugin.php:203
 msgid "OpenX"
 msgstr "OpenX"
 
 #. TRANS: Plugin description.
-#: OpenXPlugin.php:224
 msgid "Plugin for <a href=\"http://www.openx.org/\">OpenX Ad Server</a>."
 msgstr "Plugin für <a href=\"http://www.openx.org/\">OpenX Ad Server</a>."
 
 #. TRANS: Page title for OpenX admin panel.
-#: openxadminpanel.php:53
 msgctxt "TITLE"
 msgid "OpenX"
 msgstr "OpenX"
 
 #. TRANS: Instructions for OpenX admin panel.
-#: openxadminpanel.php:64
 msgid "OpenX settings for this StatusNet site"
 msgstr "Openx-Einstellungen dieser StatusNet-Website"
 
 #. TRANS: Form label in OpenX admin panel.
-#: openxadminpanel.php:167
 msgid "Ad script URL"
 msgstr "Skript-URL"
 
 #. TRANS: Tooltip for form label in OpenX admin panel.
-#: openxadminpanel.php:169
 msgid "Script URL"
 msgstr "Skript-URL"
 
 #. TRANS: Form label in OpenX admin panel. Refers to advertisement format.
-#: openxadminpanel.php:175
 msgid "Medium rectangle"
 msgstr ""
 
 #. TRANS: Tooltip for form label in OpenX admin panel. Refers to advertisement format.
-#: openxadminpanel.php:177
 msgid "Medium rectangle zone"
 msgstr ""
 
 #. TRANS: Form label in OpenX admin panel. Refers to advertisement format.
-#: openxadminpanel.php:183
 msgid "Rectangle"
 msgstr ""
 
 #. TRANS: Tooltip for form label in OpenX admin panel. Refers to advertisement format.
-#: openxadminpanel.php:185
 msgid "Rectangle zone"
 msgstr ""
 
 #. TRANS: Form label in OpenX admin panel. Refers to advertisement format.
-#: openxadminpanel.php:191
 msgid "Leaderboard"
 msgstr "Rangliste"
 
 #. TRANS: Tooltip for form label in OpenX admin panel. Refers to advertisement format.
-#: openxadminpanel.php:193
 msgid "Leaderboard zone"
 msgstr "Ranglisten-Zone"
 
 #. TRANS: Form label in OpenX admin panel. Refers to advertisement format.
-#: openxadminpanel.php:199
 msgid "Skyscraper"
 msgstr "Skyscraper"
 
 #. TRANS: Tooltip for form label in OpenX admin panel. Refers to advertisement format.
-#: openxadminpanel.php:201
 msgid "Wide skyscraper zone"
 msgstr ""
 
 #. TRANS: Submit button text in OpenX admin panel.
-#: openxadminpanel.php:216
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Speichern"
 
 #. TRANS: Submit button title in OpenX admin panel.
-#: openxadminpanel.php:220
 msgid "Save OpenX settings"
 msgstr "OpenX-Einstellungen speichern"
diff --git a/plugins/OpenX/locale/fr/LC_MESSAGES/OpenX.po b/plugins/OpenX/locale/fr/LC_MESSAGES/OpenX.po
index b8291f01aa..d136bd9995 100644
--- a/plugins/OpenX/locale/fr/LC_MESSAGES/OpenX.po
+++ b/plugins/OpenX/locale/fr/LC_MESSAGES/OpenX.po
@@ -9,103 +9,86 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OpenX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:47+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:51+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-15 11:02:35+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:45:43+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-openx\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. TRANS: Menu item title/tooltip
-#: OpenXPlugin.php:201
 msgid "OpenX configuration"
 msgstr "Configuration d’OpenX"
 
 #. TRANS: Menu item for site administration
-#: OpenXPlugin.php:203
 msgid "OpenX"
 msgstr "OpenX"
 
 #. TRANS: Plugin description.
-#: OpenXPlugin.php:224
 msgid "Plugin for <a href=\"http://www.openx.org/\">OpenX Ad Server</a>."
 msgstr ""
 "Module complémentaire pour le <a href=\"http://www.openx.org/\">serveur de "
 "publicité OpenX</a>."
 
 #. TRANS: Page title for OpenX admin panel.
-#: openxadminpanel.php:53
 msgctxt "TITLE"
 msgid "OpenX"
 msgstr "OpenX"
 
 #. TRANS: Instructions for OpenX admin panel.
-#: openxadminpanel.php:64
 msgid "OpenX settings for this StatusNet site"
 msgstr "Paramètres OpenX pour ce site StatusNet"
 
 #. TRANS: Form label in OpenX admin panel.
-#: openxadminpanel.php:167
 msgid "Ad script URL"
 msgstr "Adresse URL du script d’annonce"
 
 #. TRANS: Tooltip for form label in OpenX admin panel.
-#: openxadminpanel.php:169
 msgid "Script URL"
 msgstr "Adresse URL du script"
 
 #. TRANS: Form label in OpenX admin panel. Refers to advertisement format.
-#: openxadminpanel.php:175
 msgid "Medium rectangle"
 msgstr "Rectangle moyen"
 
 #. TRANS: Tooltip for form label in OpenX admin panel. Refers to advertisement format.
-#: openxadminpanel.php:177
 msgid "Medium rectangle zone"
 msgstr "Zone rectangulaire de taille moyenne"
 
 #. TRANS: Form label in OpenX admin panel. Refers to advertisement format.
-#: openxadminpanel.php:183
 msgid "Rectangle"
 msgstr "Rectangle"
 
 #. TRANS: Tooltip for form label in OpenX admin panel. Refers to advertisement format.
-#: openxadminpanel.php:185
 msgid "Rectangle zone"
 msgstr "Zone de forme rectangulaire"
 
 #. TRANS: Form label in OpenX admin panel. Refers to advertisement format.
-#: openxadminpanel.php:191
 msgid "Leaderboard"
 msgstr "Panneau de commande"
 
 #. TRANS: Tooltip for form label in OpenX admin panel. Refers to advertisement format.
-#: openxadminpanel.php:193
 msgid "Leaderboard zone"
 msgstr "Zone de format tableau de bord"
 
 #. TRANS: Form label in OpenX admin panel. Refers to advertisement format.
-#: openxadminpanel.php:199
 msgid "Skyscraper"
 msgstr "Bannière verticale"
 
 #. TRANS: Tooltip for form label in OpenX admin panel. Refers to advertisement format.
-#: openxadminpanel.php:201
 msgid "Wide skyscraper zone"
 msgstr "Zone de format vertical large"
 
 #. TRANS: Submit button text in OpenX admin panel.
-#: openxadminpanel.php:216
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Sauvegarder"
 
 #. TRANS: Submit button title in OpenX admin panel.
-#: openxadminpanel.php:220
 msgid "Save OpenX settings"
 msgstr "Sauvegarder les paramètres OpenX"
diff --git a/plugins/OpenX/locale/ia/LC_MESSAGES/OpenX.po b/plugins/OpenX/locale/ia/LC_MESSAGES/OpenX.po
index 9de743ab54..549691c4a9 100644
--- a/plugins/OpenX/locale/ia/LC_MESSAGES/OpenX.po
+++ b/plugins/OpenX/locale/ia/LC_MESSAGES/OpenX.po
@@ -9,103 +9,86 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OpenX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:47+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:51+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-15 11:02:35+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:45:43+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-openx\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANS: Menu item title/tooltip
-#: OpenXPlugin.php:201
 msgid "OpenX configuration"
 msgstr "Configuration de OpenX"
 
 #. TRANS: Menu item for site administration
-#: OpenXPlugin.php:203
 msgid "OpenX"
 msgstr "OpenX"
 
 #. TRANS: Plugin description.
-#: OpenXPlugin.php:224
 msgid "Plugin for <a href=\"http://www.openx.org/\">OpenX Ad Server</a>."
 msgstr ""
 "Plug-in pro le <a href=\"http://www.openx.org/\">servitor de annuncios "
 "OpenX</a>."
 
 #. TRANS: Page title for OpenX admin panel.
-#: openxadminpanel.php:53
 msgctxt "TITLE"
 msgid "OpenX"
 msgstr "OpenX"
 
 #. TRANS: Instructions for OpenX admin panel.
-#: openxadminpanel.php:64
 msgid "OpenX settings for this StatusNet site"
 msgstr "Configuration de OpenX pro iste sito StatusNet"
 
 #. TRANS: Form label in OpenX admin panel.
-#: openxadminpanel.php:167
 msgid "Ad script URL"
 msgstr "URL del script de publicitate"
 
 #. TRANS: Tooltip for form label in OpenX admin panel.
-#: openxadminpanel.php:169
 msgid "Script URL"
 msgstr "URL del script"
 
 #. TRANS: Form label in OpenX admin panel. Refers to advertisement format.
-#: openxadminpanel.php:175
 msgid "Medium rectangle"
 msgstr "Rectangulo medie"
 
 #. TRANS: Tooltip for form label in OpenX admin panel. Refers to advertisement format.
-#: openxadminpanel.php:177
 msgid "Medium rectangle zone"
 msgstr "Zona del rectangulo medie"
 
 #. TRANS: Form label in OpenX admin panel. Refers to advertisement format.
-#: openxadminpanel.php:183
 msgid "Rectangle"
 msgstr "Rectangulo"
 
 #. TRANS: Tooltip for form label in OpenX admin panel. Refers to advertisement format.
-#: openxadminpanel.php:185
 msgid "Rectangle zone"
 msgstr "Zona del rectangulo"
 
 #. TRANS: Form label in OpenX admin panel. Refers to advertisement format.
-#: openxadminpanel.php:191
 msgid "Leaderboard"
 msgstr "Bandiera large"
 
 #. TRANS: Tooltip for form label in OpenX admin panel. Refers to advertisement format.
-#: openxadminpanel.php:193
 msgid "Leaderboard zone"
 msgstr "Zona del bandiera large"
 
 #. TRANS: Form label in OpenX admin panel. Refers to advertisement format.
-#: openxadminpanel.php:199
 msgid "Skyscraper"
 msgstr "Grattacelo"
 
 #. TRANS: Tooltip for form label in OpenX admin panel. Refers to advertisement format.
-#: openxadminpanel.php:201
 msgid "Wide skyscraper zone"
 msgstr "Zona del grattacelo large"
 
 #. TRANS: Submit button text in OpenX admin panel.
-#: openxadminpanel.php:216
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Salveguardar"
 
 #. TRANS: Submit button title in OpenX admin panel.
-#: openxadminpanel.php:220
 msgid "Save OpenX settings"
 msgstr "Salveguardar configurationes de OpenX"
diff --git a/plugins/OpenX/locale/mk/LC_MESSAGES/OpenX.po b/plugins/OpenX/locale/mk/LC_MESSAGES/OpenX.po
index 53ff73403d..38835c79c0 100644
--- a/plugins/OpenX/locale/mk/LC_MESSAGES/OpenX.po
+++ b/plugins/OpenX/locale/mk/LC_MESSAGES/OpenX.po
@@ -9,103 +9,86 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OpenX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:48+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:51+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-15 11:02:35+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:45:43+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-openx\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
 
 #. TRANS: Menu item title/tooltip
-#: OpenXPlugin.php:201
 msgid "OpenX configuration"
 msgstr "Поставки за OpenX"
 
 #. TRANS: Menu item for site administration
-#: OpenXPlugin.php:203
 msgid "OpenX"
 msgstr "OpenX"
 
 #. TRANS: Plugin description.
-#: OpenXPlugin.php:224
 msgid "Plugin for <a href=\"http://www.openx.org/\">OpenX Ad Server</a>."
 msgstr ""
 "Додаток за <a href=\"http://www.openx.org/\">Рекламен опслужувач за OpenX</"
 "a>."
 
 #. TRANS: Page title for OpenX admin panel.
-#: openxadminpanel.php:53
 msgctxt "TITLE"
 msgid "OpenX"
 msgstr "OpenX"
 
 #. TRANS: Instructions for OpenX admin panel.
-#: openxadminpanel.php:64
 msgid "OpenX settings for this StatusNet site"
 msgstr "Поставки за OpenX на ова StatusNet-мрежно место"
 
 #. TRANS: Form label in OpenX admin panel.
-#: openxadminpanel.php:167
 msgid "Ad script URL"
 msgstr "URL-адреса на рекламната скрипта"
 
 #. TRANS: Tooltip for form label in OpenX admin panel.
-#: openxadminpanel.php:169
 msgid "Script URL"
 msgstr "URL-адреса на скриптата"
 
 #. TRANS: Form label in OpenX admin panel. Refers to advertisement format.
-#: openxadminpanel.php:175
 msgid "Medium rectangle"
 msgstr "Среден правоаголник"
 
 #. TRANS: Tooltip for form label in OpenX admin panel. Refers to advertisement format.
-#: openxadminpanel.php:177
 msgid "Medium rectangle zone"
 msgstr "Зона на среден правоаголник"
 
 #. TRANS: Form label in OpenX admin panel. Refers to advertisement format.
-#: openxadminpanel.php:183
 msgid "Rectangle"
 msgstr "Правоаголник"
 
 #. TRANS: Tooltip for form label in OpenX admin panel. Refers to advertisement format.
-#: openxadminpanel.php:185
 msgid "Rectangle zone"
 msgstr "Зона на правоаголник"
 
 #. TRANS: Form label in OpenX admin panel. Refers to advertisement format.
-#: openxadminpanel.php:191
 msgid "Leaderboard"
 msgstr "Предводници"
 
 #. TRANS: Tooltip for form label in OpenX admin panel. Refers to advertisement format.
-#: openxadminpanel.php:193
 msgid "Leaderboard zone"
 msgstr "Зона за Предводници"
 
 #. TRANS: Form label in OpenX admin panel. Refers to advertisement format.
-#: openxadminpanel.php:199
 msgid "Skyscraper"
 msgstr "Облакодер"
 
 #. TRANS: Tooltip for form label in OpenX admin panel. Refers to advertisement format.
-#: openxadminpanel.php:201
 msgid "Wide skyscraper zone"
 msgstr "Зона на широк облакодер"
 
 #. TRANS: Submit button text in OpenX admin panel.
-#: openxadminpanel.php:216
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Зачувај"
 
 #. TRANS: Submit button title in OpenX admin panel.
-#: openxadminpanel.php:220
 msgid "Save OpenX settings"
 msgstr "Зачувај поставки за"
diff --git a/plugins/OpenX/locale/nl/LC_MESSAGES/OpenX.po b/plugins/OpenX/locale/nl/LC_MESSAGES/OpenX.po
index 61ada44462..d13c7a6546 100644
--- a/plugins/OpenX/locale/nl/LC_MESSAGES/OpenX.po
+++ b/plugins/OpenX/locale/nl/LC_MESSAGES/OpenX.po
@@ -9,101 +9,84 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OpenX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:48+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:51+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-15 11:02:35+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:45:43+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-openx\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANS: Menu item title/tooltip
-#: OpenXPlugin.php:201
 msgid "OpenX configuration"
 msgstr "OpenX-instellingen"
 
 #. TRANS: Menu item for site administration
-#: OpenXPlugin.php:203
 msgid "OpenX"
 msgstr "OpenX"
 
 #. TRANS: Plugin description.
-#: OpenXPlugin.php:224
 msgid "Plugin for <a href=\"http://www.openx.org/\">OpenX Ad Server</a>."
 msgstr "Plug-in voor <a href=\"http://www.openx.org/\">OpenX Ad Server</a>."
 
 #. TRANS: Page title for OpenX admin panel.
-#: openxadminpanel.php:53
 msgctxt "TITLE"
 msgid "OpenX"
 msgstr "OpenX"
 
 #. TRANS: Instructions for OpenX admin panel.
-#: openxadminpanel.php:64
 msgid "OpenX settings for this StatusNet site"
 msgstr "OpenX-instellingen voor deze StatusNet-website"
 
 #. TRANS: Form label in OpenX admin panel.
-#: openxadminpanel.php:167
 msgid "Ad script URL"
 msgstr "URL voor advertentiescript"
 
 #. TRANS: Tooltip for form label in OpenX admin panel.
-#: openxadminpanel.php:169
 msgid "Script URL"
 msgstr "Script-URL"
 
 #. TRANS: Form label in OpenX admin panel. Refers to advertisement format.
-#: openxadminpanel.php:175
 msgid "Medium rectangle"
 msgstr "Middelgrote rechthoek"
 
 #. TRANS: Tooltip for form label in OpenX admin panel. Refers to advertisement format.
-#: openxadminpanel.php:177
 msgid "Medium rectangle zone"
 msgstr "Middelgrote rechthoekzone"
 
 #. TRANS: Form label in OpenX admin panel. Refers to advertisement format.
-#: openxadminpanel.php:183
 msgid "Rectangle"
 msgstr "Rechthoek"
 
 #. TRANS: Tooltip for form label in OpenX admin panel. Refers to advertisement format.
-#: openxadminpanel.php:185
 msgid "Rectangle zone"
 msgstr "Rechthoekzone"
 
 #. TRANS: Form label in OpenX admin panel. Refers to advertisement format.
-#: openxadminpanel.php:191
 msgid "Leaderboard"
 msgstr "Breedbeeldbanner"
 
 #. TRANS: Tooltip for form label in OpenX admin panel. Refers to advertisement format.
-#: openxadminpanel.php:193
 msgid "Leaderboard zone"
 msgstr "Breedbeeldbannerzone"
 
 #. TRANS: Form label in OpenX admin panel. Refers to advertisement format.
-#: openxadminpanel.php:199
 msgid "Skyscraper"
 msgstr "Skyscraper"
 
 #. TRANS: Tooltip for form label in OpenX admin panel. Refers to advertisement format.
-#: openxadminpanel.php:201
 msgid "Wide skyscraper zone"
 msgstr "Brede skyscraperzone"
 
 #. TRANS: Submit button text in OpenX admin panel.
-#: openxadminpanel.php:216
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Opslaan"
 
 #. TRANS: Submit button title in OpenX admin panel.
-#: openxadminpanel.php:220
 msgid "Save OpenX settings"
 msgstr "OpenX-instellingen opslaan"
diff --git a/plugins/OpenX/locale/uk/LC_MESSAGES/OpenX.po b/plugins/OpenX/locale/uk/LC_MESSAGES/OpenX.po
index 3b2a1fee72..3eadd6ce7b 100644
--- a/plugins/OpenX/locale/uk/LC_MESSAGES/OpenX.po
+++ b/plugins/OpenX/locale/uk/LC_MESSAGES/OpenX.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OpenX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:48+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:37:51+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-15 11:02:35+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:45:43+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-openx\n"
@@ -23,89 +23,72 @@ msgstr ""
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
 #. TRANS: Menu item title/tooltip
-#: OpenXPlugin.php:201
 msgid "OpenX configuration"
 msgstr "Конфігурація OpenX"
 
 #. TRANS: Menu item for site administration
-#: OpenXPlugin.php:203
 msgid "OpenX"
 msgstr "OpenX"
 
 #. TRANS: Plugin description.
-#: OpenXPlugin.php:224
 msgid "Plugin for <a href=\"http://www.openx.org/\">OpenX Ad Server</a>."
 msgstr ""
 "Додаток для <a href=\"http://www.openx.org/\">рекламного сервера OpenX</a>."
 
 #. TRANS: Page title for OpenX admin panel.
-#: openxadminpanel.php:53
 msgctxt "TITLE"
 msgid "OpenX"
 msgstr "OpenX"
 
 #. TRANS: Instructions for OpenX admin panel.
-#: openxadminpanel.php:64
 msgid "OpenX settings for this StatusNet site"
 msgstr "Налаштування OpenX для даного сайту StatusNet"
 
 #. TRANS: Form label in OpenX admin panel.
-#: openxadminpanel.php:167
 msgid "Ad script URL"
 msgstr "URL-адреса рекламного скрипту"
 
 #. TRANS: Tooltip for form label in OpenX admin panel.
-#: openxadminpanel.php:169
 msgid "Script URL"
 msgstr "URL-адреса скрипту"
 
 #. TRANS: Form label in OpenX admin panel. Refers to advertisement format.
-#: openxadminpanel.php:175
 msgid "Medium rectangle"
 msgstr "Середній прямокутник"
 
 #. TRANS: Tooltip for form label in OpenX admin panel. Refers to advertisement format.
-#: openxadminpanel.php:177
 msgid "Medium rectangle zone"
 msgstr "Зона середнього прямокутника"
 
 #. TRANS: Form label in OpenX admin panel. Refers to advertisement format.
-#: openxadminpanel.php:183
 msgid "Rectangle"
 msgstr "Прямокутник"
 
 #. TRANS: Tooltip for form label in OpenX admin panel. Refers to advertisement format.
-#: openxadminpanel.php:185
 msgid "Rectangle zone"
 msgstr "Зона прямокутника"
 
 #. TRANS: Form label in OpenX admin panel. Refers to advertisement format.
-#: openxadminpanel.php:191
 msgid "Leaderboard"
 msgstr "Банер"
 
 #. TRANS: Tooltip for form label in OpenX admin panel. Refers to advertisement format.
-#: openxadminpanel.php:193
 msgid "Leaderboard zone"
 msgstr "Зона банеру"
 
 #. TRANS: Form label in OpenX admin panel. Refers to advertisement format.
-#: openxadminpanel.php:199
 msgid "Skyscraper"
 msgstr "Хмарочос"
 
 #. TRANS: Tooltip for form label in OpenX admin panel. Refers to advertisement format.
-#: openxadminpanel.php:201
 msgid "Wide skyscraper zone"
 msgstr "Зона широкого хмарочосу"
 
 #. TRANS: Submit button text in OpenX admin panel.
-#: openxadminpanel.php:216
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Зберегти"
 
 #. TRANS: Submit button title in OpenX admin panel.
-#: openxadminpanel.php:220
 msgid "Save OpenX settings"
 msgstr "Зберегти налаштування OpenX"
diff --git a/plugins/PiwikAnalytics/locale/PiwikAnalytics.pot b/plugins/PiwikAnalytics/locale/PiwikAnalytics.pot
index cea5fa6147..4ddff82890 100644
--- a/plugins/PiwikAnalytics/locale/PiwikAnalytics.pot
+++ b/plugins/PiwikAnalytics/locale/PiwikAnalytics.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/PiwikAnalytics/locale/de/LC_MESSAGES/PiwikAnalytics.po b/plugins/PiwikAnalytics/locale/de/LC_MESSAGES/PiwikAnalytics.po
index ffadde96d2..8c3a0d6fa3 100644
--- a/plugins/PiwikAnalytics/locale/de/LC_MESSAGES/PiwikAnalytics.po
+++ b/plugins/PiwikAnalytics/locale/de/LC_MESSAGES/PiwikAnalytics.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PiwikAnalytics\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:59+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:00+0000\n"
 "Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:06+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:46:13+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-piwikanalytics\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: PiwikAnalyticsPlugin.php:113
 msgid ""
 "Use <a href=\"http://piwik.org/\">Piwik</a> Open Source web analytics "
 "software."
diff --git a/plugins/PiwikAnalytics/locale/es/LC_MESSAGES/PiwikAnalytics.po b/plugins/PiwikAnalytics/locale/es/LC_MESSAGES/PiwikAnalytics.po
index 7454146330..93df2bc32c 100644
--- a/plugins/PiwikAnalytics/locale/es/LC_MESSAGES/PiwikAnalytics.po
+++ b/plugins/PiwikAnalytics/locale/es/LC_MESSAGES/PiwikAnalytics.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PiwikAnalytics\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:59+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:00+0000\n"
 "Language-Team: Spanish <http://translatewiki.net/wiki/Portal:es>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:06+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:46:13+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-piwikanalytics\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: PiwikAnalyticsPlugin.php:113
 msgid ""
 "Use <a href=\"http://piwik.org/\">Piwik</a> Open Source web analytics "
 "software."
diff --git a/plugins/PiwikAnalytics/locale/fr/LC_MESSAGES/PiwikAnalytics.po b/plugins/PiwikAnalytics/locale/fr/LC_MESSAGES/PiwikAnalytics.po
index 6ce1287253..bba0b9f084 100644
--- a/plugins/PiwikAnalytics/locale/fr/LC_MESSAGES/PiwikAnalytics.po
+++ b/plugins/PiwikAnalytics/locale/fr/LC_MESSAGES/PiwikAnalytics.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PiwikAnalytics\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:59+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:00+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:06+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:46:13+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-piwikanalytics\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: PiwikAnalyticsPlugin.php:113
 msgid ""
 "Use <a href=\"http://piwik.org/\">Piwik</a> Open Source web analytics "
 "software."
diff --git a/plugins/PiwikAnalytics/locale/he/LC_MESSAGES/PiwikAnalytics.po b/plugins/PiwikAnalytics/locale/he/LC_MESSAGES/PiwikAnalytics.po
index 52000944a6..fca178c9c3 100644
--- a/plugins/PiwikAnalytics/locale/he/LC_MESSAGES/PiwikAnalytics.po
+++ b/plugins/PiwikAnalytics/locale/he/LC_MESSAGES/PiwikAnalytics.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PiwikAnalytics\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:00+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:00+0000\n"
 "Language-Team: Hebrew <http://translatewiki.net/wiki/Portal:he>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:06+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:46:13+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-plugin-piwikanalytics\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: PiwikAnalyticsPlugin.php:113
 msgid ""
 "Use <a href=\"http://piwik.org/\">Piwik</a> Open Source web analytics "
 "software."
diff --git a/plugins/PiwikAnalytics/locale/ia/LC_MESSAGES/PiwikAnalytics.po b/plugins/PiwikAnalytics/locale/ia/LC_MESSAGES/PiwikAnalytics.po
index ba001e9e32..6aac2ab67c 100644
--- a/plugins/PiwikAnalytics/locale/ia/LC_MESSAGES/PiwikAnalytics.po
+++ b/plugins/PiwikAnalytics/locale/ia/LC_MESSAGES/PiwikAnalytics.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PiwikAnalytics\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:00+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:00+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:06+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:46:13+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-piwikanalytics\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: PiwikAnalyticsPlugin.php:113
 msgid ""
 "Use <a href=\"http://piwik.org/\">Piwik</a> Open Source web analytics "
 "software."
diff --git a/plugins/PiwikAnalytics/locale/id/LC_MESSAGES/PiwikAnalytics.po b/plugins/PiwikAnalytics/locale/id/LC_MESSAGES/PiwikAnalytics.po
index bda548a8f8..1f339da89f 100644
--- a/plugins/PiwikAnalytics/locale/id/LC_MESSAGES/PiwikAnalytics.po
+++ b/plugins/PiwikAnalytics/locale/id/LC_MESSAGES/PiwikAnalytics.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PiwikAnalytics\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:00+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:00+0000\n"
 "Language-Team: Indonesian <http://translatewiki.net/wiki/Portal:id>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:06+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:46:13+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: id\n"
 "X-Message-Group: #out-statusnet-plugin-piwikanalytics\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: PiwikAnalyticsPlugin.php:113
 msgid ""
 "Use <a href=\"http://piwik.org/\">Piwik</a> Open Source web analytics "
 "software."
diff --git a/plugins/PiwikAnalytics/locale/mk/LC_MESSAGES/PiwikAnalytics.po b/plugins/PiwikAnalytics/locale/mk/LC_MESSAGES/PiwikAnalytics.po
index fc3f991883..85eec568cb 100644
--- a/plugins/PiwikAnalytics/locale/mk/LC_MESSAGES/PiwikAnalytics.po
+++ b/plugins/PiwikAnalytics/locale/mk/LC_MESSAGES/PiwikAnalytics.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PiwikAnalytics\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:00+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:00+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:06+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:46:13+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-piwikanalytics\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
 
-#: PiwikAnalyticsPlugin.php:113
 msgid ""
 "Use <a href=\"http://piwik.org/\">Piwik</a> Open Source web analytics "
 "software."
diff --git a/plugins/PiwikAnalytics/locale/nb/LC_MESSAGES/PiwikAnalytics.po b/plugins/PiwikAnalytics/locale/nb/LC_MESSAGES/PiwikAnalytics.po
index 04ea51b77f..6649f8c54d 100644
--- a/plugins/PiwikAnalytics/locale/nb/LC_MESSAGES/PiwikAnalytics.po
+++ b/plugins/PiwikAnalytics/locale/nb/LC_MESSAGES/PiwikAnalytics.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PiwikAnalytics\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:00+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:00+0000\n"
 "Language-Team: Norwegian (bokmål)‬ <http://translatewiki.net/wiki/Portal:no>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:06+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:46:13+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: #out-statusnet-plugin-piwikanalytics\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: PiwikAnalyticsPlugin.php:113
 msgid ""
 "Use <a href=\"http://piwik.org/\">Piwik</a> Open Source web analytics "
 "software."
diff --git a/plugins/PiwikAnalytics/locale/nl/LC_MESSAGES/PiwikAnalytics.po b/plugins/PiwikAnalytics/locale/nl/LC_MESSAGES/PiwikAnalytics.po
index 41d784ee4f..72c8385306 100644
--- a/plugins/PiwikAnalytics/locale/nl/LC_MESSAGES/PiwikAnalytics.po
+++ b/plugins/PiwikAnalytics/locale/nl/LC_MESSAGES/PiwikAnalytics.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PiwikAnalytics\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:00+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:00+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:06+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:46:13+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-piwikanalytics\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: PiwikAnalyticsPlugin.php:113
 msgid ""
 "Use <a href=\"http://piwik.org/\">Piwik</a> Open Source web analytics "
 "software."
diff --git a/plugins/PiwikAnalytics/locale/pt/LC_MESSAGES/PiwikAnalytics.po b/plugins/PiwikAnalytics/locale/pt/LC_MESSAGES/PiwikAnalytics.po
index c750d39ec8..af2fef2dd4 100644
--- a/plugins/PiwikAnalytics/locale/pt/LC_MESSAGES/PiwikAnalytics.po
+++ b/plugins/PiwikAnalytics/locale/pt/LC_MESSAGES/PiwikAnalytics.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PiwikAnalytics\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 15:58+0000\n"
-"PO-Revision-Date: 2011-03-03 16:02:40+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:00+0000\n"
 "Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:28:12+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:46:13+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-plugin-piwikanalytics\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: PiwikAnalyticsPlugin.php:113
 msgid ""
 "Use <a href=\"http://piwik.org/\">Piwik</a> Open Source web analytics "
 "software."
diff --git a/plugins/PiwikAnalytics/locale/pt_BR/LC_MESSAGES/PiwikAnalytics.po b/plugins/PiwikAnalytics/locale/pt_BR/LC_MESSAGES/PiwikAnalytics.po
index f2c84a4252..4e9922a648 100644
--- a/plugins/PiwikAnalytics/locale/pt_BR/LC_MESSAGES/PiwikAnalytics.po
+++ b/plugins/PiwikAnalytics/locale/pt_BR/LC_MESSAGES/PiwikAnalytics.po
@@ -9,20 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PiwikAnalytics\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:00+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:00+0000\n"
 "Language-Team: Brazilian Portuguese <http://translatewiki.net/wiki/Portal:pt-"
 "br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:06+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:46:13+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt-br\n"
 "X-Message-Group: #out-statusnet-plugin-piwikanalytics\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: PiwikAnalyticsPlugin.php:113
 msgid ""
 "Use <a href=\"http://piwik.org/\">Piwik</a> Open Source web analytics "
 "software."
diff --git a/plugins/PiwikAnalytics/locale/ru/LC_MESSAGES/PiwikAnalytics.po b/plugins/PiwikAnalytics/locale/ru/LC_MESSAGES/PiwikAnalytics.po
index 0a50fb26c7..d37283ca9a 100644
--- a/plugins/PiwikAnalytics/locale/ru/LC_MESSAGES/PiwikAnalytics.po
+++ b/plugins/PiwikAnalytics/locale/ru/LC_MESSAGES/PiwikAnalytics.po
@@ -9,20 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PiwikAnalytics\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:00+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:00+0000\n"
 "Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:06+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:46:13+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-piwikanalytics\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: PiwikAnalyticsPlugin.php:113
 msgid ""
 "Use <a href=\"http://piwik.org/\">Piwik</a> Open Source web analytics "
 "software."
diff --git a/plugins/PiwikAnalytics/locale/tl/LC_MESSAGES/PiwikAnalytics.po b/plugins/PiwikAnalytics/locale/tl/LC_MESSAGES/PiwikAnalytics.po
index 4bdbf978a4..348d0d6725 100644
--- a/plugins/PiwikAnalytics/locale/tl/LC_MESSAGES/PiwikAnalytics.po
+++ b/plugins/PiwikAnalytics/locale/tl/LC_MESSAGES/PiwikAnalytics.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PiwikAnalytics\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:00+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:00+0000\n"
 "Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:06+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:46:13+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-piwikanalytics\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: PiwikAnalyticsPlugin.php:113
 msgid ""
 "Use <a href=\"http://piwik.org/\">Piwik</a> Open Source web analytics "
 "software."
diff --git a/plugins/PiwikAnalytics/locale/uk/LC_MESSAGES/PiwikAnalytics.po b/plugins/PiwikAnalytics/locale/uk/LC_MESSAGES/PiwikAnalytics.po
index 48d3deaac3..af81efb0f0 100644
--- a/plugins/PiwikAnalytics/locale/uk/LC_MESSAGES/PiwikAnalytics.po
+++ b/plugins/PiwikAnalytics/locale/uk/LC_MESSAGES/PiwikAnalytics.po
@@ -9,20 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PiwikAnalytics\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:00+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:00+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:06+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:46:13+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-piwikanalytics\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: PiwikAnalyticsPlugin.php:113
 msgid ""
 "Use <a href=\"http://piwik.org/\">Piwik</a> Open Source web analytics "
 "software."
diff --git a/plugins/PostDebug/locale/PostDebug.pot b/plugins/PostDebug/locale/PostDebug.pot
index a9c20e270e..7e0d64310b 100644
--- a/plugins/PostDebug/locale/PostDebug.pot
+++ b/plugins/PostDebug/locale/PostDebug.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/PostDebug/locale/de/LC_MESSAGES/PostDebug.po b/plugins/PostDebug/locale/de/LC_MESSAGES/PostDebug.po
index 87f0664bac..52b3910069 100644
--- a/plugins/PostDebug/locale/de/LC_MESSAGES/PostDebug.po
+++ b/plugins/PostDebug/locale/de/LC_MESSAGES/PostDebug.po
@@ -9,18 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PostDebug\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:00+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:01+0000\n"
 "Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:06+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:46:15+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-postdebug\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: PostDebugPlugin.php:58
 msgid "Debugging tool to record request details on POST."
 msgstr "Debugging-Werkzeug zur Aufnahme von POST-Anfragedetails."
diff --git a/plugins/PostDebug/locale/es/LC_MESSAGES/PostDebug.po b/plugins/PostDebug/locale/es/LC_MESSAGES/PostDebug.po
index d9de419fca..8f7f190f10 100644
--- a/plugins/PostDebug/locale/es/LC_MESSAGES/PostDebug.po
+++ b/plugins/PostDebug/locale/es/LC_MESSAGES/PostDebug.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PostDebug\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:00+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:01+0000\n"
 "Language-Team: Spanish <http://translatewiki.net/wiki/Portal:es>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:06+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:46:15+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-postdebug\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: PostDebugPlugin.php:58
 msgid "Debugging tool to record request details on POST."
 msgstr ""
 "Herramienta de depuración para registrar detalles de solicitud en POST."
diff --git a/plugins/PostDebug/locale/fi/LC_MESSAGES/PostDebug.po b/plugins/PostDebug/locale/fi/LC_MESSAGES/PostDebug.po
index 9c62b0e6c5..000877087d 100644
--- a/plugins/PostDebug/locale/fi/LC_MESSAGES/PostDebug.po
+++ b/plugins/PostDebug/locale/fi/LC_MESSAGES/PostDebug.po
@@ -9,18 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PostDebug\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:01+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:01+0000\n"
 "Language-Team: Finnish <http://translatewiki.net/wiki/Portal:fi>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:06+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:46:15+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fi\n"
 "X-Message-Group: #out-statusnet-plugin-postdebug\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: PostDebugPlugin.php:58
 msgid "Debugging tool to record request details on POST."
 msgstr "Virheenjäljitystyökalu joka tallentaa POST-pyyntöjen tiedot"
diff --git a/plugins/PostDebug/locale/fr/LC_MESSAGES/PostDebug.po b/plugins/PostDebug/locale/fr/LC_MESSAGES/PostDebug.po
index 3bdfc01a8b..9721769b5f 100644
--- a/plugins/PostDebug/locale/fr/LC_MESSAGES/PostDebug.po
+++ b/plugins/PostDebug/locale/fr/LC_MESSAGES/PostDebug.po
@@ -9,18 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PostDebug\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:01+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:01+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:06+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:46:15+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-postdebug\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: PostDebugPlugin.php:58
 msgid "Debugging tool to record request details on POST."
 msgstr "Outil de débogage pour enregistrer les requêtes détaillées de POST."
diff --git a/plugins/PostDebug/locale/he/LC_MESSAGES/PostDebug.po b/plugins/PostDebug/locale/he/LC_MESSAGES/PostDebug.po
index 6c7fbb7fa7..8210212fda 100644
--- a/plugins/PostDebug/locale/he/LC_MESSAGES/PostDebug.po
+++ b/plugins/PostDebug/locale/he/LC_MESSAGES/PostDebug.po
@@ -9,18 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PostDebug\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:01+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:01+0000\n"
 "Language-Team: Hebrew <http://translatewiki.net/wiki/Portal:he>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:06+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:46:15+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-plugin-postdebug\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: PostDebugPlugin.php:58
 msgid "Debugging tool to record request details on POST."
 msgstr "כלי ניפוי שגיאות לרישום כל פרטי בקשות ה־POST."
diff --git a/plugins/PostDebug/locale/ia/LC_MESSAGES/PostDebug.po b/plugins/PostDebug/locale/ia/LC_MESSAGES/PostDebug.po
index bcae7eb3ff..b97343c10d 100644
--- a/plugins/PostDebug/locale/ia/LC_MESSAGES/PostDebug.po
+++ b/plugins/PostDebug/locale/ia/LC_MESSAGES/PostDebug.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PostDebug\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:01+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:01+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:06+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:46:15+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-postdebug\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: PostDebugPlugin.php:58
 msgid "Debugging tool to record request details on POST."
 msgstr ""
 "Instrumento pro eliminar defectos que registra le detalios del requestas "
diff --git a/plugins/PostDebug/locale/id/LC_MESSAGES/PostDebug.po b/plugins/PostDebug/locale/id/LC_MESSAGES/PostDebug.po
index 231e6fb5eb..c1afd81b4c 100644
--- a/plugins/PostDebug/locale/id/LC_MESSAGES/PostDebug.po
+++ b/plugins/PostDebug/locale/id/LC_MESSAGES/PostDebug.po
@@ -9,18 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PostDebug\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:01+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:01+0000\n"
 "Language-Team: Indonesian <http://translatewiki.net/wiki/Portal:id>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:06+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:46:15+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: id\n"
 "X-Message-Group: #out-statusnet-plugin-postdebug\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: PostDebugPlugin.php:58
 msgid "Debugging tool to record request details on POST."
 msgstr "Peralatan debugging untuk mencatat detail permintaan di POST."
diff --git a/plugins/PostDebug/locale/ja/LC_MESSAGES/PostDebug.po b/plugins/PostDebug/locale/ja/LC_MESSAGES/PostDebug.po
index 4829274e99..268dd20841 100644
--- a/plugins/PostDebug/locale/ja/LC_MESSAGES/PostDebug.po
+++ b/plugins/PostDebug/locale/ja/LC_MESSAGES/PostDebug.po
@@ -9,18 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PostDebug\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:01+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:01+0000\n"
 "Language-Team: Japanese <http://translatewiki.net/wiki/Portal:ja>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:06+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:46:15+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ja\n"
 "X-Message-Group: #out-statusnet-plugin-postdebug\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: PostDebugPlugin.php:58
 msgid "Debugging tool to record request details on POST."
 msgstr "POSTリクエストの詳細を記録するデバッグツール"
diff --git a/plugins/PostDebug/locale/mk/LC_MESSAGES/PostDebug.po b/plugins/PostDebug/locale/mk/LC_MESSAGES/PostDebug.po
index 7649ed9bf5..c7e2a2e722 100644
--- a/plugins/PostDebug/locale/mk/LC_MESSAGES/PostDebug.po
+++ b/plugins/PostDebug/locale/mk/LC_MESSAGES/PostDebug.po
@@ -9,18 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PostDebug\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:04+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:01+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:06+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:46:15+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-postdebug\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
 
-#: PostDebugPlugin.php:58
 msgid "Debugging tool to record request details on POST."
 msgstr "Алатка за отстранување на грешки за евидентирање на податоци за POST."
diff --git a/plugins/PostDebug/locale/nb/LC_MESSAGES/PostDebug.po b/plugins/PostDebug/locale/nb/LC_MESSAGES/PostDebug.po
index 15b53ba4b5..594f80eb37 100644
--- a/plugins/PostDebug/locale/nb/LC_MESSAGES/PostDebug.po
+++ b/plugins/PostDebug/locale/nb/LC_MESSAGES/PostDebug.po
@@ -9,18 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PostDebug\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:09+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:01+0000\n"
 "Language-Team: Norwegian (bokmål)‬ <http://translatewiki.net/wiki/Portal:no>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:06+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:46:15+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: #out-statusnet-plugin-postdebug\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: PostDebugPlugin.php:58
 msgid "Debugging tool to record request details on POST."
 msgstr "Feilsøkingsverktøy for å registrere forspørselsdetaljer om POST."
diff --git a/plugins/PostDebug/locale/nl/LC_MESSAGES/PostDebug.po b/plugins/PostDebug/locale/nl/LC_MESSAGES/PostDebug.po
index a46ab0b6f5..abe1f03624 100644
--- a/plugins/PostDebug/locale/nl/LC_MESSAGES/PostDebug.po
+++ b/plugins/PostDebug/locale/nl/LC_MESSAGES/PostDebug.po
@@ -9,18 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PostDebug\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:08+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:01+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:06+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:46:15+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-postdebug\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: PostDebugPlugin.php:58
 msgid "Debugging tool to record request details on POST."
 msgstr "Hulpprogramma voor debuggen om verzoekdetails van POST op te slaan."
diff --git a/plugins/PostDebug/locale/pt/LC_MESSAGES/PostDebug.po b/plugins/PostDebug/locale/pt/LC_MESSAGES/PostDebug.po
index a28193312e..5a53bf9e61 100644
--- a/plugins/PostDebug/locale/pt/LC_MESSAGES/PostDebug.po
+++ b/plugins/PostDebug/locale/pt/LC_MESSAGES/PostDebug.po
@@ -9,18 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PostDebug\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 15:58+0000\n"
-"PO-Revision-Date: 2011-03-03 16:02:40+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:01+0000\n"
 "Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:28:14+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:46:15+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-plugin-postdebug\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: PostDebugPlugin.php:58
 msgid "Debugging tool to record request details on POST."
 msgstr "Ferramenta de depuração para registar detalhes de pedidos POST."
diff --git a/plugins/PostDebug/locale/pt_BR/LC_MESSAGES/PostDebug.po b/plugins/PostDebug/locale/pt_BR/LC_MESSAGES/PostDebug.po
index a41a1dcec3..e73f4569c8 100644
--- a/plugins/PostDebug/locale/pt_BR/LC_MESSAGES/PostDebug.po
+++ b/plugins/PostDebug/locale/pt_BR/LC_MESSAGES/PostDebug.po
@@ -9,20 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PostDebug\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:09+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:01+0000\n"
 "Language-Team: Brazilian Portuguese <http://translatewiki.net/wiki/Portal:pt-"
 "br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:06+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:46:15+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt-br\n"
 "X-Message-Group: #out-statusnet-plugin-postdebug\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: PostDebugPlugin.php:58
 msgid "Debugging tool to record request details on POST."
 msgstr ""
 "Ferramenta de depuração para registrar detalhes de solicitação em POST."
diff --git a/plugins/PostDebug/locale/ru/LC_MESSAGES/PostDebug.po b/plugins/PostDebug/locale/ru/LC_MESSAGES/PostDebug.po
index 22eae3d23b..dce7aaa5be 100644
--- a/plugins/PostDebug/locale/ru/LC_MESSAGES/PostDebug.po
+++ b/plugins/PostDebug/locale/ru/LC_MESSAGES/PostDebug.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PostDebug\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:09+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:01+0000\n"
 "Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:06+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:46:15+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-postdebug\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: PostDebugPlugin.php:58
 msgid "Debugging tool to record request details on POST."
 msgstr "Инструмент отладки для записи подробностей POST-запросов."
diff --git a/plugins/PostDebug/locale/tl/LC_MESSAGES/PostDebug.po b/plugins/PostDebug/locale/tl/LC_MESSAGES/PostDebug.po
index 858ee6d876..0bc895f362 100644
--- a/plugins/PostDebug/locale/tl/LC_MESSAGES/PostDebug.po
+++ b/plugins/PostDebug/locale/tl/LC_MESSAGES/PostDebug.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PostDebug\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:09+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:01+0000\n"
 "Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:06+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:46:15+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-postdebug\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: PostDebugPlugin.php:58
 msgid "Debugging tool to record request details on POST."
 msgstr ""
 "Kasangkapang pantanggal ng depekto upang itala ang mga detalye ng paghiling "
diff --git a/plugins/PostDebug/locale/uk/LC_MESSAGES/PostDebug.po b/plugins/PostDebug/locale/uk/LC_MESSAGES/PostDebug.po
index 6e658b8e28..7421dabc57 100644
--- a/plugins/PostDebug/locale/uk/LC_MESSAGES/PostDebug.po
+++ b/plugins/PostDebug/locale/uk/LC_MESSAGES/PostDebug.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PostDebug\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:09+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:01+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:06+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:46:15+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-postdebug\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: PostDebugPlugin.php:58
 msgid "Debugging tool to record request details on POST."
 msgstr "Інструмент правки для запису деталей запитів щодо POST."
diff --git a/plugins/PoweredByStatusNet/locale/PoweredByStatusNet.pot b/plugins/PoweredByStatusNet/locale/PoweredByStatusNet.pot
index a3dcbce268..b7860ae96f 100644
--- a/plugins/PoweredByStatusNet/locale/PoweredByStatusNet.pot
+++ b/plugins/PoweredByStatusNet/locale/PoweredByStatusNet.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/PoweredByStatusNet/locale/br/LC_MESSAGES/PoweredByStatusNet.po b/plugins/PoweredByStatusNet/locale/br/LC_MESSAGES/PoweredByStatusNet.po
index e7ebb9f0b5..3965c236b5 100644
--- a/plugins/PoweredByStatusNet/locale/br/LC_MESSAGES/PoweredByStatusNet.po
+++ b/plugins/PoweredByStatusNet/locale/br/LC_MESSAGES/PoweredByStatusNet.po
@@ -9,29 +9,26 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PoweredByStatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:10+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:02+0000\n"
 "Language-Team: Breton <http://translatewiki.net/wiki/Portal:br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:45:47+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-poweredbystatusnet\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. TRANS: %s is a URL to status.net with "StatusNet" (localised) as link text.
-#: PoweredByStatusNetPlugin.php:51
 #, php-format
 msgid "powered by %s"
 msgstr "enlusket gant %s"
 
-#: PoweredByStatusNetPlugin.php:53
 msgid "StatusNet"
 msgstr "StatusNet"
 
-#: PoweredByStatusNetPlugin.php:66
 msgid ""
 "Outputs \"powered by <a href=\"http://status.net/\">StatusNet</a>\" after "
 "site name."
diff --git a/plugins/PoweredByStatusNet/locale/ca/LC_MESSAGES/PoweredByStatusNet.po b/plugins/PoweredByStatusNet/locale/ca/LC_MESSAGES/PoweredByStatusNet.po
index 98899a6dbd..3702092e54 100644
--- a/plugins/PoweredByStatusNet/locale/ca/LC_MESSAGES/PoweredByStatusNet.po
+++ b/plugins/PoweredByStatusNet/locale/ca/LC_MESSAGES/PoweredByStatusNet.po
@@ -9,29 +9,26 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PoweredByStatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:10+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:02+0000\n"
 "Language-Team: Catalan <http://translatewiki.net/wiki/Portal:ca>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:45:47+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ca\n"
 "X-Message-Group: #out-statusnet-plugin-poweredbystatusnet\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANS: %s is a URL to status.net with "StatusNet" (localised) as link text.
-#: PoweredByStatusNetPlugin.php:51
 #, php-format
 msgid "powered by %s"
 msgstr "funciona amb %s"
 
-#: PoweredByStatusNetPlugin.php:53
 msgid "StatusNet"
 msgstr "StatusNet"
 
-#: PoweredByStatusNetPlugin.php:66
 msgid ""
 "Outputs \"powered by <a href=\"http://status.net/\">StatusNet</a>\" after "
 "site name."
diff --git a/plugins/PoweredByStatusNet/locale/de/LC_MESSAGES/PoweredByStatusNet.po b/plugins/PoweredByStatusNet/locale/de/LC_MESSAGES/PoweredByStatusNet.po
index a2ed49e81e..030f39e8b8 100644
--- a/plugins/PoweredByStatusNet/locale/de/LC_MESSAGES/PoweredByStatusNet.po
+++ b/plugins/PoweredByStatusNet/locale/de/LC_MESSAGES/PoweredByStatusNet.po
@@ -9,29 +9,26 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PoweredByStatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:10+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:02+0000\n"
 "Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:45:47+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-poweredbystatusnet\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANS: %s is a URL to status.net with "StatusNet" (localised) as link text.
-#: PoweredByStatusNetPlugin.php:51
 #, php-format
 msgid "powered by %s"
 msgstr "bereitgestellt von %s"
 
-#: PoweredByStatusNetPlugin.php:53
 msgid "StatusNet"
 msgstr "StatusNet"
 
-#: PoweredByStatusNetPlugin.php:66
 msgid ""
 "Outputs \"powered by <a href=\"http://status.net/\">StatusNet</a>\" after "
 "site name."
diff --git a/plugins/PoweredByStatusNet/locale/fr/LC_MESSAGES/PoweredByStatusNet.po b/plugins/PoweredByStatusNet/locale/fr/LC_MESSAGES/PoweredByStatusNet.po
index 9c1c8b8ce3..aba8720500 100644
--- a/plugins/PoweredByStatusNet/locale/fr/LC_MESSAGES/PoweredByStatusNet.po
+++ b/plugins/PoweredByStatusNet/locale/fr/LC_MESSAGES/PoweredByStatusNet.po
@@ -10,29 +10,26 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PoweredByStatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:10+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:02+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:45:47+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-poweredbystatusnet\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. TRANS: %s is a URL to status.net with "StatusNet" (localised) as link text.
-#: PoweredByStatusNetPlugin.php:51
 #, php-format
 msgid "powered by %s"
 msgstr "propulsé par %s"
 
-#: PoweredByStatusNetPlugin.php:53
 msgid "StatusNet"
 msgstr "StatusNet"
 
-#: PoweredByStatusNetPlugin.php:66
 msgid ""
 "Outputs \"powered by <a href=\"http://status.net/\">StatusNet</a>\" after "
 "site name."
diff --git a/plugins/PoweredByStatusNet/locale/gl/LC_MESSAGES/PoweredByStatusNet.po b/plugins/PoweredByStatusNet/locale/gl/LC_MESSAGES/PoweredByStatusNet.po
index 08eb06f795..09f60f9637 100644
--- a/plugins/PoweredByStatusNet/locale/gl/LC_MESSAGES/PoweredByStatusNet.po
+++ b/plugins/PoweredByStatusNet/locale/gl/LC_MESSAGES/PoweredByStatusNet.po
@@ -9,29 +9,26 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PoweredByStatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:10+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:02+0000\n"
 "Language-Team: Galician <http://translatewiki.net/wiki/Portal:gl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:45:47+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: gl\n"
 "X-Message-Group: #out-statusnet-plugin-poweredbystatusnet\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANS: %s is a URL to status.net with "StatusNet" (localised) as link text.
-#: PoweredByStatusNetPlugin.php:51
 #, php-format
 msgid "powered by %s"
 msgstr "desenvolvido por %s"
 
-#: PoweredByStatusNetPlugin.php:53
 msgid "StatusNet"
 msgstr "StatusNet"
 
-#: PoweredByStatusNetPlugin.php:66
 msgid ""
 "Outputs \"powered by <a href=\"http://status.net/\">StatusNet</a>\" after "
 "site name."
diff --git a/plugins/PoweredByStatusNet/locale/ia/LC_MESSAGES/PoweredByStatusNet.po b/plugins/PoweredByStatusNet/locale/ia/LC_MESSAGES/PoweredByStatusNet.po
index 494094a222..d7a5ddc379 100644
--- a/plugins/PoweredByStatusNet/locale/ia/LC_MESSAGES/PoweredByStatusNet.po
+++ b/plugins/PoweredByStatusNet/locale/ia/LC_MESSAGES/PoweredByStatusNet.po
@@ -9,29 +9,26 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PoweredByStatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:10+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:02+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:45:47+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-poweredbystatusnet\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANS: %s is a URL to status.net with "StatusNet" (localised) as link text.
-#: PoweredByStatusNetPlugin.php:51
 #, php-format
 msgid "powered by %s"
 msgstr "actionate per %s"
 
-#: PoweredByStatusNetPlugin.php:53
 msgid "StatusNet"
 msgstr "StatusNet"
 
-#: PoweredByStatusNetPlugin.php:66
 msgid ""
 "Outputs \"powered by <a href=\"http://status.net/\">StatusNet</a>\" after "
 "site name."
diff --git a/plugins/PoweredByStatusNet/locale/mk/LC_MESSAGES/PoweredByStatusNet.po b/plugins/PoweredByStatusNet/locale/mk/LC_MESSAGES/PoweredByStatusNet.po
index 4b27988224..b7aeea6849 100644
--- a/plugins/PoweredByStatusNet/locale/mk/LC_MESSAGES/PoweredByStatusNet.po
+++ b/plugins/PoweredByStatusNet/locale/mk/LC_MESSAGES/PoweredByStatusNet.po
@@ -9,29 +9,26 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PoweredByStatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:10+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:02+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:45:47+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-poweredbystatusnet\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
 
 #. TRANS: %s is a URL to status.net with "StatusNet" (localised) as link text.
-#: PoweredByStatusNetPlugin.php:51
 #, php-format
 msgid "powered by %s"
 msgstr "овозможено од %s"
 
-#: PoweredByStatusNetPlugin.php:53
 msgid "StatusNet"
 msgstr "StatusNet"
 
-#: PoweredByStatusNetPlugin.php:66
 msgid ""
 "Outputs \"powered by <a href=\"http://status.net/\">StatusNet</a>\" after "
 "site name."
diff --git a/plugins/PoweredByStatusNet/locale/nl/LC_MESSAGES/PoweredByStatusNet.po b/plugins/PoweredByStatusNet/locale/nl/LC_MESSAGES/PoweredByStatusNet.po
index 1bc1bfc395..56165601e3 100644
--- a/plugins/PoweredByStatusNet/locale/nl/LC_MESSAGES/PoweredByStatusNet.po
+++ b/plugins/PoweredByStatusNet/locale/nl/LC_MESSAGES/PoweredByStatusNet.po
@@ -9,29 +9,26 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PoweredByStatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:10+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:02+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:45:47+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-poweredbystatusnet\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANS: %s is a URL to status.net with "StatusNet" (localised) as link text.
-#: PoweredByStatusNetPlugin.php:51
 #, php-format
 msgid "powered by %s"
 msgstr "Powered by %s"
 
-#: PoweredByStatusNetPlugin.php:53
 msgid "StatusNet"
 msgstr "StatusNet"
 
-#: PoweredByStatusNetPlugin.php:66
 msgid ""
 "Outputs \"powered by <a href=\"http://status.net/\">StatusNet</a>\" after "
 "site name."
diff --git a/plugins/PoweredByStatusNet/locale/pt/LC_MESSAGES/PoweredByStatusNet.po b/plugins/PoweredByStatusNet/locale/pt/LC_MESSAGES/PoweredByStatusNet.po
index ec8fe51bf4..58ebaa54c2 100644
--- a/plugins/PoweredByStatusNet/locale/pt/LC_MESSAGES/PoweredByStatusNet.po
+++ b/plugins/PoweredByStatusNet/locale/pt/LC_MESSAGES/PoweredByStatusNet.po
@@ -9,29 +9,26 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PoweredByStatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:10+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:02+0000\n"
 "Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:45:47+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-plugin-poweredbystatusnet\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANS: %s is a URL to status.net with "StatusNet" (localised) as link text.
-#: PoweredByStatusNetPlugin.php:51
 #, php-format
 msgid "powered by %s"
 msgstr "Potenciado por %s"
 
-#: PoweredByStatusNetPlugin.php:53
 msgid "StatusNet"
 msgstr "StatusNet"
 
-#: PoweredByStatusNetPlugin.php:66
 msgid ""
 "Outputs \"powered by <a href=\"http://status.net/\">StatusNet</a>\" after "
 "site name."
diff --git a/plugins/PoweredByStatusNet/locale/ru/LC_MESSAGES/PoweredByStatusNet.po b/plugins/PoweredByStatusNet/locale/ru/LC_MESSAGES/PoweredByStatusNet.po
index ae8ad077cc..72028e636e 100644
--- a/plugins/PoweredByStatusNet/locale/ru/LC_MESSAGES/PoweredByStatusNet.po
+++ b/plugins/PoweredByStatusNet/locale/ru/LC_MESSAGES/PoweredByStatusNet.po
@@ -10,13 +10,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PoweredByStatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:10+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:02+0000\n"
 "Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:45:47+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-poweredbystatusnet\n"
@@ -24,16 +24,13 @@ msgstr ""
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
 #. TRANS: %s is a URL to status.net with "StatusNet" (localised) as link text.
-#: PoweredByStatusNetPlugin.php:51
 #, php-format
 msgid "powered by %s"
 msgstr "при поддержке %s"
 
-#: PoweredByStatusNetPlugin.php:53
 msgid "StatusNet"
 msgstr "StatusNet"
 
-#: PoweredByStatusNetPlugin.php:66
 msgid ""
 "Outputs \"powered by <a href=\"http://status.net/\">StatusNet</a>\" after "
 "site name."
diff --git a/plugins/PoweredByStatusNet/locale/tl/LC_MESSAGES/PoweredByStatusNet.po b/plugins/PoweredByStatusNet/locale/tl/LC_MESSAGES/PoweredByStatusNet.po
index f7462a8f94..6a626f80bf 100644
--- a/plugins/PoweredByStatusNet/locale/tl/LC_MESSAGES/PoweredByStatusNet.po
+++ b/plugins/PoweredByStatusNet/locale/tl/LC_MESSAGES/PoweredByStatusNet.po
@@ -9,29 +9,26 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PoweredByStatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:10+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:02+0000\n"
 "Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:45:47+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-poweredbystatusnet\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANS: %s is a URL to status.net with "StatusNet" (localised) as link text.
-#: PoweredByStatusNetPlugin.php:51
 #, php-format
 msgid "powered by %s"
 msgstr "pinapatakbo ng %s"
 
-#: PoweredByStatusNetPlugin.php:53
 msgid "StatusNet"
 msgstr "StatusNet"
 
-#: PoweredByStatusNetPlugin.php:66
 msgid ""
 "Outputs \"powered by <a href=\"http://status.net/\">StatusNet</a>\" after "
 "site name."
diff --git a/plugins/PoweredByStatusNet/locale/uk/LC_MESSAGES/PoweredByStatusNet.po b/plugins/PoweredByStatusNet/locale/uk/LC_MESSAGES/PoweredByStatusNet.po
index 0702a2f656..ee7fde166f 100644
--- a/plugins/PoweredByStatusNet/locale/uk/LC_MESSAGES/PoweredByStatusNet.po
+++ b/plugins/PoweredByStatusNet/locale/uk/LC_MESSAGES/PoweredByStatusNet.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PoweredByStatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:10+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:02+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:45:47+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-poweredbystatusnet\n"
@@ -23,16 +23,13 @@ msgstr ""
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
 #. TRANS: %s is a URL to status.net with "StatusNet" (localised) as link text.
-#: PoweredByStatusNetPlugin.php:51
 #, php-format
 msgid "powered by %s"
 msgstr "працює на %s"
 
-#: PoweredByStatusNetPlugin.php:53
 msgid "StatusNet"
 msgstr "StatusNet"
 
-#: PoweredByStatusNetPlugin.php:66
 msgid ""
 "Outputs \"powered by <a href=\"http://status.net/\">StatusNet</a>\" after "
 "site name."
diff --git a/plugins/PtitUrl/locale/PtitUrl.pot b/plugins/PtitUrl/locale/PtitUrl.pot
index 6c5dad914c..1d74c701ac 100644
--- a/plugins/PtitUrl/locale/PtitUrl.pot
+++ b/plugins/PtitUrl/locale/PtitUrl.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/PtitUrl/locale/br/LC_MESSAGES/PtitUrl.po b/plugins/PtitUrl/locale/br/LC_MESSAGES/PtitUrl.po
index 0c11e735eb..69f6b55a27 100644
--- a/plugins/PtitUrl/locale/br/LC_MESSAGES/PtitUrl.po
+++ b/plugins/PtitUrl/locale/br/LC_MESSAGES/PtitUrl.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PtitUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:48+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:03+0000\n"
 "Language-Team: Breton <http://translatewiki.net/wiki/Portal:br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:28:16+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:46:18+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-ptiturl\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: PtitUrlPlugin.php:66
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr ""
diff --git a/plugins/PtitUrl/locale/de/LC_MESSAGES/PtitUrl.po b/plugins/PtitUrl/locale/de/LC_MESSAGES/PtitUrl.po
index c183fef995..1acb90421b 100644
--- a/plugins/PtitUrl/locale/de/LC_MESSAGES/PtitUrl.po
+++ b/plugins/PtitUrl/locale/de/LC_MESSAGES/PtitUrl.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PtitUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:48+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:03+0000\n"
 "Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:28:16+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:46:18+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-ptiturl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: PtitUrlPlugin.php:66
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr "Benutzung des <a href=\"http://%1$s/\">%1$s</a>-URL-Kürzungsdienstes."
diff --git a/plugins/PtitUrl/locale/es/LC_MESSAGES/PtitUrl.po b/plugins/PtitUrl/locale/es/LC_MESSAGES/PtitUrl.po
index 9f345055db..dceb1ab03d 100644
--- a/plugins/PtitUrl/locale/es/LC_MESSAGES/PtitUrl.po
+++ b/plugins/PtitUrl/locale/es/LC_MESSAGES/PtitUrl.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PtitUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:48+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:03+0000\n"
 "Language-Team: Spanish <http://translatewiki.net/wiki/Portal:es>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:28:16+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:46:18+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-ptiturl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: PtitUrlPlugin.php:66
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr ""
diff --git a/plugins/PtitUrl/locale/fr/LC_MESSAGES/PtitUrl.po b/plugins/PtitUrl/locale/fr/LC_MESSAGES/PtitUrl.po
index df93e87881..cd12a45acf 100644
--- a/plugins/PtitUrl/locale/fr/LC_MESSAGES/PtitUrl.po
+++ b/plugins/PtitUrl/locale/fr/LC_MESSAGES/PtitUrl.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PtitUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:48+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:03+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:28:16+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:46:18+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-ptiturl\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: PtitUrlPlugin.php:66
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr ""
diff --git a/plugins/PtitUrl/locale/gl/LC_MESSAGES/PtitUrl.po b/plugins/PtitUrl/locale/gl/LC_MESSAGES/PtitUrl.po
index e50a6d4eaf..6bf83efc4c 100644
--- a/plugins/PtitUrl/locale/gl/LC_MESSAGES/PtitUrl.po
+++ b/plugins/PtitUrl/locale/gl/LC_MESSAGES/PtitUrl.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PtitUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:48+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:03+0000\n"
 "Language-Team: Galician <http://translatewiki.net/wiki/Portal:gl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:28:16+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:46:18+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: gl\n"
 "X-Message-Group: #out-statusnet-plugin-ptiturl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: PtitUrlPlugin.php:66
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr ""
diff --git a/plugins/PtitUrl/locale/he/LC_MESSAGES/PtitUrl.po b/plugins/PtitUrl/locale/he/LC_MESSAGES/PtitUrl.po
index db964d850b..a8795246dc 100644
--- a/plugins/PtitUrl/locale/he/LC_MESSAGES/PtitUrl.po
+++ b/plugins/PtitUrl/locale/he/LC_MESSAGES/PtitUrl.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PtitUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:48+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:03+0000\n"
 "Language-Team: Hebrew <http://translatewiki.net/wiki/Portal:he>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:28:16+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:46:18+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-plugin-ptiturl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: PtitUrlPlugin.php:66
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr "שימוש בשירות קיצור הכתובות <a href=\"http://%1$s/\">%1$s</a>."
diff --git a/plugins/PtitUrl/locale/ia/LC_MESSAGES/PtitUrl.po b/plugins/PtitUrl/locale/ia/LC_MESSAGES/PtitUrl.po
index 0525aa7463..8e8e8fef18 100644
--- a/plugins/PtitUrl/locale/ia/LC_MESSAGES/PtitUrl.po
+++ b/plugins/PtitUrl/locale/ia/LC_MESSAGES/PtitUrl.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PtitUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:48+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:03+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:28:16+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:46:18+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-ptiturl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: PtitUrlPlugin.php:66
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr ""
diff --git a/plugins/PtitUrl/locale/ja/LC_MESSAGES/PtitUrl.po b/plugins/PtitUrl/locale/ja/LC_MESSAGES/PtitUrl.po
index 2f0816c8d4..818859f5a0 100644
--- a/plugins/PtitUrl/locale/ja/LC_MESSAGES/PtitUrl.po
+++ b/plugins/PtitUrl/locale/ja/LC_MESSAGES/PtitUrl.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PtitUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:48+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:03+0000\n"
 "Language-Team: Japanese <http://translatewiki.net/wiki/Portal:ja>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:28:16+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:46:18+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ja\n"
 "X-Message-Group: #out-statusnet-plugin-ptiturl\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: PtitUrlPlugin.php:66
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr "<a href=\"http://%1$s/\">%1$s</a>をURL短縮サービスとして利用する。"
diff --git a/plugins/PtitUrl/locale/mk/LC_MESSAGES/PtitUrl.po b/plugins/PtitUrl/locale/mk/LC_MESSAGES/PtitUrl.po
index a34d8afc61..bb9be3e3a7 100644
--- a/plugins/PtitUrl/locale/mk/LC_MESSAGES/PtitUrl.po
+++ b/plugins/PtitUrl/locale/mk/LC_MESSAGES/PtitUrl.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PtitUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:48+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:03+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:28:16+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:46:18+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-ptiturl\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
 
-#: PtitUrlPlugin.php:66
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr ""
diff --git a/plugins/PtitUrl/locale/nb/LC_MESSAGES/PtitUrl.po b/plugins/PtitUrl/locale/nb/LC_MESSAGES/PtitUrl.po
index 8a866c84c1..1ae40d116e 100644
--- a/plugins/PtitUrl/locale/nb/LC_MESSAGES/PtitUrl.po
+++ b/plugins/PtitUrl/locale/nb/LC_MESSAGES/PtitUrl.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PtitUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:48+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:03+0000\n"
 "Language-Team: Norwegian (bokmål)‬ <http://translatewiki.net/wiki/Portal:no>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:28:16+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:46:18+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: #out-statusnet-plugin-ptiturl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: PtitUrlPlugin.php:66
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr "Bruker URL-forkortertjenesten <a href=\"http://%1$s/\">%1$s</a>."
diff --git a/plugins/PtitUrl/locale/nl/LC_MESSAGES/PtitUrl.po b/plugins/PtitUrl/locale/nl/LC_MESSAGES/PtitUrl.po
index 5105cc432a..312e7593a4 100644
--- a/plugins/PtitUrl/locale/nl/LC_MESSAGES/PtitUrl.po
+++ b/plugins/PtitUrl/locale/nl/LC_MESSAGES/PtitUrl.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PtitUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:48+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:03+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:28:16+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:46:18+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-ptiturl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: PtitUrlPlugin.php:66
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr ""
diff --git a/plugins/PtitUrl/locale/pt/LC_MESSAGES/PtitUrl.po b/plugins/PtitUrl/locale/pt/LC_MESSAGES/PtitUrl.po
index 7842da9173..c966b20ae4 100644
--- a/plugins/PtitUrl/locale/pt/LC_MESSAGES/PtitUrl.po
+++ b/plugins/PtitUrl/locale/pt/LC_MESSAGES/PtitUrl.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PtitUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:48+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:03+0000\n"
 "Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:28:16+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:46:18+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-plugin-ptiturl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: PtitUrlPlugin.php:66
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr "Usa o serviço de abreviação de URLs <a href=\"http://%1$s/\">%1$s</a>."
diff --git a/plugins/PtitUrl/locale/pt_BR/LC_MESSAGES/PtitUrl.po b/plugins/PtitUrl/locale/pt_BR/LC_MESSAGES/PtitUrl.po
index 6687fe7fef..985caa9de0 100644
--- a/plugins/PtitUrl/locale/pt_BR/LC_MESSAGES/PtitUrl.po
+++ b/plugins/PtitUrl/locale/pt_BR/LC_MESSAGES/PtitUrl.po
@@ -9,20 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PtitUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:48+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:03+0000\n"
 "Language-Team: Brazilian Portuguese <http://translatewiki.net/wiki/Portal:pt-"
 "br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:28:16+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:46:18+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt-br\n"
 "X-Message-Group: #out-statusnet-plugin-ptiturl\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: PtitUrlPlugin.php:66
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr ""
diff --git a/plugins/PtitUrl/locale/ru/LC_MESSAGES/PtitUrl.po b/plugins/PtitUrl/locale/ru/LC_MESSAGES/PtitUrl.po
index b6f8b24b1e..52dcb1817a 100644
--- a/plugins/PtitUrl/locale/ru/LC_MESSAGES/PtitUrl.po
+++ b/plugins/PtitUrl/locale/ru/LC_MESSAGES/PtitUrl.po
@@ -9,20 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PtitUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:48+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:03+0000\n"
 "Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:28:16+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:46:18+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-ptiturl\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: PtitUrlPlugin.php:66
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr "Использование службы сокращения URL <a href=\"http://%1$s/\">%1$s</a>."
diff --git a/plugins/PtitUrl/locale/tl/LC_MESSAGES/PtitUrl.po b/plugins/PtitUrl/locale/tl/LC_MESSAGES/PtitUrl.po
index 7b744e43e3..4445576cf5 100644
--- a/plugins/PtitUrl/locale/tl/LC_MESSAGES/PtitUrl.po
+++ b/plugins/PtitUrl/locale/tl/LC_MESSAGES/PtitUrl.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PtitUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:48+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:03+0000\n"
 "Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:28:16+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:46:18+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-ptiturl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: PtitUrlPlugin.php:66
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr ""
diff --git a/plugins/PtitUrl/locale/uk/LC_MESSAGES/PtitUrl.po b/plugins/PtitUrl/locale/uk/LC_MESSAGES/PtitUrl.po
index 5627b60a51..adc816f0eb 100644
--- a/plugins/PtitUrl/locale/uk/LC_MESSAGES/PtitUrl.po
+++ b/plugins/PtitUrl/locale/uk/LC_MESSAGES/PtitUrl.po
@@ -9,20 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PtitUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:48+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:03+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:28:16+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:46:18+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-ptiturl\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: PtitUrlPlugin.php:66
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr ""
diff --git a/plugins/RSSCloud/locale/RSSCloud.pot b/plugins/RSSCloud/locale/RSSCloud.pot
index b82123e665..2a00d67478 100644
--- a/plugins/RSSCloud/locale/RSSCloud.pot
+++ b/plugins/RSSCloud/locale/RSSCloud.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,6 +16,14 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: LoggingAggregator.php:93
+msgid "This resource requires an HTTP GET."
+msgstr ""
+
+#: LoggingAggregator.php:104
+msgid "This resource requires an HTTP POST."
+msgstr ""
+
 #: RSSCloudRequestNotify.php:90
 msgid "Request must be POST."
 msgstr ""
@@ -51,14 +59,6 @@ msgid ""
 "notified."
 msgstr ""
 
-#: LoggingAggregator.php:93
-msgid "This resource requires an HTTP GET."
-msgstr ""
-
-#: LoggingAggregator.php:104
-msgid "This resource requires an HTTP POST."
-msgstr ""
-
 #: RSSCloudPlugin.php:245
 msgid ""
 "The RSSCloud plugin enables your StatusNet instance to publish real-time "
diff --git a/plugins/RSSCloud/locale/de/LC_MESSAGES/RSSCloud.po b/plugins/RSSCloud/locale/de/LC_MESSAGES/RSSCloud.po
index f0b849191a..4f28b89c03 100644
--- a/plugins/RSSCloud/locale/de/LC_MESSAGES/RSSCloud.po
+++ b/plugins/RSSCloud/locale/de/LC_MESSAGES/RSSCloud.po
@@ -11,33 +11,35 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - RSSCloud\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:52+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:08+0000\n"
 "Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-14 17:22:04+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:07+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-rsscloud\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: RSSCloudRequestNotify.php:90
+msgid "This resource requires an HTTP GET."
+msgstr "Diese Ressource erfordert eine HTTP-GET-Anfrage."
+
+msgid "This resource requires an HTTP POST."
+msgstr "Diese Ressource erfordert eine HTTP-POST-Anfrage."
+
 msgid "Request must be POST."
 msgstr "Anfrage muss ein POST sein."
 
-#: RSSCloudRequestNotify.php:107
 msgid "Only http-post notifications are supported at this time."
 msgstr "Nur HTTP-POST-Benachrichtigungen werden im Moment unterstützt."
 
 #. TRANS: %s is a comma separated list of parameters.
-#: RSSCloudRequestNotify.php:118
 #, php-format
 msgid "The following parameters were missing from the request body: %s."
 msgstr "Die folgenden Parameter fehlten aus den Anforderungshauptteil: %s."
 
-#: RSSCloudRequestNotify.php:124
 msgid ""
 "You must provide at least one valid profile feed url (url1, url2, url3 ... "
 "urlN)."
@@ -45,18 +47,15 @@ msgstr ""
 "Du musst mindestens eine gültige Profil-Feed-URL angeben (url1, url2, url3 … "
 "urlN)."
 
-#: RSSCloudRequestNotify.php:141
 msgid "Feed subscription failed: Not a valid feed."
 msgstr "Feed-Abonnement fehlgeschlagen: Ungültiger Feed."
 
-#: RSSCloudRequestNotify.php:147
 msgid ""
 "Feed subscription failed - notification handler doesn't respond correctly."
 msgstr ""
 "Feed-Abonnement fehlgeschlagen - Benachrichtigungs-Handler reagiert nicht "
 "richtig."
 
-#: RSSCloudRequestNotify.php:161
 msgid ""
 "Thanks for the subscription. When the feed(s) update(s), you will be "
 "notified."
@@ -64,15 +63,6 @@ msgstr ""
 "Vielen Dank für das Abonnement. Du wirst benachrichtigt, wenn der Feed "
 "aktualisiert wird."
 
-#: LoggingAggregator.php:93
-msgid "This resource requires an HTTP GET."
-msgstr "Diese Ressource erfordert eine HTTP-GET-Anfrage."
-
-#: LoggingAggregator.php:104
-msgid "This resource requires an HTTP POST."
-msgstr "Diese Ressource erfordert eine HTTP-POST-Anfrage."
-
-#: RSSCloudPlugin.php:245
 msgid ""
 "The RSSCloud plugin enables your StatusNet instance to publish real-time "
 "updates for profile RSS feeds using the <a href=\"http://rsscloud.org/"
diff --git a/plugins/RSSCloud/locale/fr/LC_MESSAGES/RSSCloud.po b/plugins/RSSCloud/locale/fr/LC_MESSAGES/RSSCloud.po
index 9b8cd95895..c884c562f9 100644
--- a/plugins/RSSCloud/locale/fr/LC_MESSAGES/RSSCloud.po
+++ b/plugins/RSSCloud/locale/fr/LC_MESSAGES/RSSCloud.po
@@ -9,37 +9,39 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - RSSCloud\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:52+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:08+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-14 17:22:04+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:07+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-rsscloud\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: RSSCloudRequestNotify.php:90
+msgid "This resource requires an HTTP GET."
+msgstr "Cette ressource nécessite une requête HTTP GET."
+
+msgid "This resource requires an HTTP POST."
+msgstr "Cette ressource nécessite une requête HTTP POST."
+
 msgid "Request must be POST."
 msgstr "La requête HTTP au nuage RSS doit être de type POST."
 
-#: RSSCloudRequestNotify.php:107
 msgid "Only http-post notifications are supported at this time."
 msgstr ""
 "Seules les notifications HTTP-POST sont prises en charge en ce moment sur le "
 "nuage RSS."
 
 #. TRANS: %s is a comma separated list of parameters.
-#: RSSCloudRequestNotify.php:118
 #, php-format
 msgid "The following parameters were missing from the request body: %s."
 msgstr ""
 "Les paramètres suivants étaient absents du corps de la requête au nuage "
 "RSS : %s."
 
-#: RSSCloudRequestNotify.php:124
 msgid ""
 "You must provide at least one valid profile feed url (url1, url2, url3 ... "
 "urlN)."
@@ -47,18 +49,15 @@ msgstr ""
 "Vous devez fournir au moins une adresse URL de flux de profil valide (url1, "
 "url2, url3 ... urlN)."
 
-#: RSSCloudRequestNotify.php:141
 msgid "Feed subscription failed: Not a valid feed."
 msgstr "L’abonnement au flux a échoué : ce n’est pas un flux RSS valide."
 
-#: RSSCloudRequestNotify.php:147
 msgid ""
 "Feed subscription failed - notification handler doesn't respond correctly."
 msgstr ""
 "L’abonnement au flux RSS a échoué : le gestionnaire de notifications ne "
 "répond pas correctement."
 
-#: RSSCloudRequestNotify.php:161
 msgid ""
 "Thanks for the subscription. When the feed(s) update(s), you will be "
 "notified."
@@ -66,15 +65,6 @@ msgstr ""
 "Merci pour l’abonnement. Vous serez informé lors des mises à jour de ce(s) "
 "flux."
 
-#: LoggingAggregator.php:93
-msgid "This resource requires an HTTP GET."
-msgstr "Cette ressource nécessite une requête HTTP GET."
-
-#: LoggingAggregator.php:104
-msgid "This resource requires an HTTP POST."
-msgstr "Cette ressource nécessite une requête HTTP POST."
-
-#: RSSCloudPlugin.php:245
 msgid ""
 "The RSSCloud plugin enables your StatusNet instance to publish real-time "
 "updates for profile RSS feeds using the <a href=\"http://rsscloud.org/"
diff --git a/plugins/RSSCloud/locale/ia/LC_MESSAGES/RSSCloud.po b/plugins/RSSCloud/locale/ia/LC_MESSAGES/RSSCloud.po
index da582b6ba6..1ebf78567a 100644
--- a/plugins/RSSCloud/locale/ia/LC_MESSAGES/RSSCloud.po
+++ b/plugins/RSSCloud/locale/ia/LC_MESSAGES/RSSCloud.po
@@ -9,33 +9,35 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - RSSCloud\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:52+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:08+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-14 17:22:04+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:07+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-rsscloud\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: RSSCloudRequestNotify.php:90
+msgid "This resource requires an HTTP GET."
+msgstr "Iste ressource require un HTTP GET."
+
+msgid "This resource requires an HTTP POST."
+msgstr "Iste ressource require un HTTP POST."
+
 msgid "Request must be POST."
 msgstr "Requesta debe esser POST."
 
-#: RSSCloudRequestNotify.php:107
 msgid "Only http-post notifications are supported at this time."
 msgstr "Solmente le notificationes http-post es presentemente supportate."
 
 #. TRANS: %s is a comma separated list of parameters.
-#: RSSCloudRequestNotify.php:118
 #, php-format
 msgid "The following parameters were missing from the request body: %s."
 msgstr "Le sequente parametros mancava del corpore del requesta: %s."
 
-#: RSSCloudRequestNotify.php:124
 msgid ""
 "You must provide at least one valid profile feed url (url1, url2, url3 ... "
 "urlN)."
@@ -43,18 +45,15 @@ msgstr ""
 "Tu debe fornir al minus un URL de syndication de profilo valide (url1, url2, "
 "url3 ... urlN)."
 
-#: RSSCloudRequestNotify.php:141
 msgid "Feed subscription failed: Not a valid feed."
 msgstr "Le subscription al syndication ha fallite: Non un syndication valide."
 
-#: RSSCloudRequestNotify.php:147
 msgid ""
 "Feed subscription failed - notification handler doesn't respond correctly."
 msgstr ""
 "Le subscription al syndication ha fallite - le gestor de notification non "
 "responde correctemente."
 
-#: RSSCloudRequestNotify.php:161
 msgid ""
 "Thanks for the subscription. When the feed(s) update(s), you will be "
 "notified."
@@ -62,15 +61,6 @@ msgstr ""
 "Gratias pro le subscription. Quando le syndication(es) se actualisa, tu "
 "recipera notification."
 
-#: LoggingAggregator.php:93
-msgid "This resource requires an HTTP GET."
-msgstr "Iste ressource require un HTTP GET."
-
-#: LoggingAggregator.php:104
-msgid "This resource requires an HTTP POST."
-msgstr "Iste ressource require un HTTP POST."
-
-#: RSSCloudPlugin.php:245
 msgid ""
 "The RSSCloud plugin enables your StatusNet instance to publish real-time "
 "updates for profile RSS feeds using the <a href=\"http://rsscloud.org/"
diff --git a/plugins/RSSCloud/locale/mk/LC_MESSAGES/RSSCloud.po b/plugins/RSSCloud/locale/mk/LC_MESSAGES/RSSCloud.po
index 4e58776b58..1e52a07285 100644
--- a/plugins/RSSCloud/locale/mk/LC_MESSAGES/RSSCloud.po
+++ b/plugins/RSSCloud/locale/mk/LC_MESSAGES/RSSCloud.po
@@ -9,33 +9,35 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - RSSCloud\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:52+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:09+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-14 17:22:04+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:07+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-rsscloud\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
 
-#: RSSCloudRequestNotify.php:90
+msgid "This resource requires an HTTP GET."
+msgstr "Овој ресурс бара HTTP GET."
+
+msgid "This resource requires an HTTP POST."
+msgstr "Овој ресурс бара HTTP POST."
+
 msgid "Request must be POST."
 msgstr "Барањето мора да биде POST."
 
-#: RSSCloudRequestNotify.php:107
 msgid "Only http-post notifications are supported at this time."
 msgstr "Моментално се поддржани само известувања од типот http-post."
 
 #. TRANS: %s is a comma separated list of parameters.
-#: RSSCloudRequestNotify.php:118
 #, php-format
 msgid "The following parameters were missing from the request body: %s."
 msgstr "Следниве параметри недостасуваа од содржината на барањето: %s."
 
-#: RSSCloudRequestNotify.php:124
 msgid ""
 "You must provide at least one valid profile feed url (url1, url2, url3 ... "
 "urlN)."
@@ -43,18 +45,15 @@ msgstr ""
 "Мора да наведете барем едеа важечка URL-адреса за профилен канал (url1, "
 "url2, url3 ... urlN)."
 
-#: RSSCloudRequestNotify.php:141
 msgid "Feed subscription failed: Not a valid feed."
 msgstr "Претплаќањето на каналот не успеа: Не е важечки канал."
 
-#: RSSCloudRequestNotify.php:147
 msgid ""
 "Feed subscription failed - notification handler doesn't respond correctly."
 msgstr ""
 "Претплаќањето на каналот не успеа - ракувачот со известувања не одговара "
 "правилно."
 
-#: RSSCloudRequestNotify.php:161
 msgid ""
 "Thanks for the subscription. When the feed(s) update(s), you will be "
 "notified."
@@ -62,15 +61,6 @@ msgstr ""
 "Ви благодариме шт осе претплативте. Ќе бидете известени за сите подновувања "
 "на каналот/ите."
 
-#: LoggingAggregator.php:93
-msgid "This resource requires an HTTP GET."
-msgstr "Овој ресурс бара HTTP GET."
-
-#: LoggingAggregator.php:104
-msgid "This resource requires an HTTP POST."
-msgstr "Овој ресурс бара HTTP POST."
-
-#: RSSCloudPlugin.php:245
 msgid ""
 "The RSSCloud plugin enables your StatusNet instance to publish real-time "
 "updates for profile RSS feeds using the <a href=\"http://rsscloud.org/"
diff --git a/plugins/RSSCloud/locale/nl/LC_MESSAGES/RSSCloud.po b/plugins/RSSCloud/locale/nl/LC_MESSAGES/RSSCloud.po
index b5b2c343a4..ce8a12bb8f 100644
--- a/plugins/RSSCloud/locale/nl/LC_MESSAGES/RSSCloud.po
+++ b/plugins/RSSCloud/locale/nl/LC_MESSAGES/RSSCloud.po
@@ -9,33 +9,35 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - RSSCloud\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:52+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:09+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-14 17:22:04+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:07+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-rsscloud\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: RSSCloudRequestNotify.php:90
+msgid "This resource requires an HTTP GET."
+msgstr "Deze bron heeft een HTTP GET nodig."
+
+msgid "This resource requires an HTTP POST."
+msgstr "Deze bron heeft een HTTP POST nodig."
+
 msgid "Request must be POST."
 msgstr "Het verzoek moet POST zijn."
 
-#: RSSCloudRequestNotify.php:107
 msgid "Only http-post notifications are supported at this time."
 msgstr "Op dit moment worden alle mededelingen via HTTP POST ondersteund."
 
 #. TRANS: %s is a comma separated list of parameters.
-#: RSSCloudRequestNotify.php:118
 #, php-format
 msgid "The following parameters were missing from the request body: %s."
 msgstr "De volgende parameters missen in de verzoekinhoud: %s."
 
-#: RSSCloudRequestNotify.php:124
 msgid ""
 "You must provide at least one valid profile feed url (url1, url2, url3 ... "
 "urlN)."
@@ -43,18 +45,15 @@ msgstr ""
 "U moet tenminste een geldige URL voor een profielfeed opgeven ( url1, url2, "
 "url3, ..., urlN)."
 
-#: RSSCloudRequestNotify.php:141
 msgid "Feed subscription failed: Not a valid feed."
 msgstr "Abonneren op de feed is mislukt: geen geldige feed."
 
-#: RSSCloudRequestNotify.php:147
 msgid ""
 "Feed subscription failed - notification handler doesn't respond correctly."
 msgstr ""
 "Abonneren op de feed is mislukt: het verwerkingsproces heeft niet juist "
 "geantwoord."
 
-#: RSSCloudRequestNotify.php:161
 msgid ""
 "Thanks for the subscription. When the feed(s) update(s), you will be "
 "notified."
@@ -62,15 +61,6 @@ msgstr ""
 "Dank u wel voor het abonneren. Als de feed of feeds bijgewerkt worden, wordt "
 "u op de hoogte gesteld."
 
-#: LoggingAggregator.php:93
-msgid "This resource requires an HTTP GET."
-msgstr "Deze bron heeft een HTTP GET nodig."
-
-#: LoggingAggregator.php:104
-msgid "This resource requires an HTTP POST."
-msgstr "Deze bron heeft een HTTP POST nodig."
-
-#: RSSCloudPlugin.php:245
 msgid ""
 "The RSSCloud plugin enables your StatusNet instance to publish real-time "
 "updates for profile RSS feeds using the <a href=\"http://rsscloud.org/"
diff --git a/plugins/RSSCloud/locale/tl/LC_MESSAGES/RSSCloud.po b/plugins/RSSCloud/locale/tl/LC_MESSAGES/RSSCloud.po
index 1a9d9d088a..c86b24216c 100644
--- a/plugins/RSSCloud/locale/tl/LC_MESSAGES/RSSCloud.po
+++ b/plugins/RSSCloud/locale/tl/LC_MESSAGES/RSSCloud.po
@@ -9,33 +9,35 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - RSSCloud\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:52+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:09+0000\n"
 "Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-14 17:22:04+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:07+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-rsscloud\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: RSSCloudRequestNotify.php:90
+msgid "This resource requires an HTTP GET."
+msgstr "Ang pinagkunang ito ay nangangailangan ng HTTP GET."
+
+msgid "This resource requires an HTTP POST."
+msgstr "Ang pinagkukunang ito ay nangangailangan ng HTTP POST."
+
 msgid "Request must be POST."
 msgstr "Ang hiling ay dapat na POST."
 
-#: RSSCloudRequestNotify.php:107
 msgid "Only http-post notifications are supported at this time."
 msgstr "Tanging mga pabatid na http-post lang ang tinatangkilik sa ngayon."
 
 #. TRANS: %s is a comma separated list of parameters.
-#: RSSCloudRequestNotify.php:118
 #, php-format
 msgid "The following parameters were missing from the request body: %s."
 msgstr "Nawawala ang sumusunod na mga parametro mula sa katawan ng hiling: %s."
 
-#: RSSCloudRequestNotify.php:124
 msgid ""
 "You must provide at least one valid profile feed url (url1, url2, url3 ... "
 "urlN)."
@@ -43,18 +45,15 @@ msgstr ""
 "Dapat kang magbigay ng kahit na isang url ng pakain ng tanggap na talaksan "
 "(url1, url2, url3 ... urlN)."
 
-#: RSSCloudRequestNotify.php:141
 msgid "Feed subscription failed: Not a valid feed."
 msgstr "Nabigo ang pagtanggap ng pakain: Hindi isang tanggap na pakain."
 
-#: RSSCloudRequestNotify.php:147
 msgid ""
 "Feed subscription failed - notification handler doesn't respond correctly."
 msgstr ""
 "Nabigo ang pagtanggap ng pakain - hindi tama ang pagtugon ng tagapaghawak ng "
 "pabatid."
 
-#: RSSCloudRequestNotify.php:161
 msgid ""
 "Thanks for the subscription. When the feed(s) update(s), you will be "
 "notified."
@@ -62,15 +61,6 @@ msgstr ""
 "Salamat sa pagtatanggap.  Kapag nagsapanahon ang (mga) pakain, pababatiran "
 "ka."
 
-#: LoggingAggregator.php:93
-msgid "This resource requires an HTTP GET."
-msgstr "Ang pinagkunang ito ay nangangailangan ng HTTP GET."
-
-#: LoggingAggregator.php:104
-msgid "This resource requires an HTTP POST."
-msgstr "Ang pinagkukunang ito ay nangangailangan ng HTTP POST."
-
-#: RSSCloudPlugin.php:245
 msgid ""
 "The RSSCloud plugin enables your StatusNet instance to publish real-time "
 "updates for profile RSS feeds using the <a href=\"http://rsscloud.org/"
diff --git a/plugins/RSSCloud/locale/uk/LC_MESSAGES/RSSCloud.po b/plugins/RSSCloud/locale/uk/LC_MESSAGES/RSSCloud.po
index f1e66b289b..4ea3fae49b 100644
--- a/plugins/RSSCloud/locale/uk/LC_MESSAGES/RSSCloud.po
+++ b/plugins/RSSCloud/locale/uk/LC_MESSAGES/RSSCloud.po
@@ -9,34 +9,36 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - RSSCloud\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:52+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:09+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-14 17:22:04+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:07+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-rsscloud\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: RSSCloudRequestNotify.php:90
+msgid "This resource requires an HTTP GET."
+msgstr "Цей ресурс вимагає форми HTTP GET."
+
+msgid "This resource requires an HTTP POST."
+msgstr "Цей ресурс вимагає форми HTTP POST."
+
 msgid "Request must be POST."
 msgstr "Запит вимагає форми POST."
 
-#: RSSCloudRequestNotify.php:107
 msgid "Only http-post notifications are supported at this time."
 msgstr "На даний момент підтримуються лише сповіщення форми http-post."
 
 #. TRANS: %s is a comma separated list of parameters.
-#: RSSCloudRequestNotify.php:118
 #, php-format
 msgid "The following parameters were missing from the request body: %s."
 msgstr "У формі запиту відсутні наступні параметри: %s."
 
-#: RSSCloudRequestNotify.php:124
 msgid ""
 "You must provide at least one valid profile feed url (url1, url2, url3 ... "
 "urlN)."
@@ -44,33 +46,21 @@ msgstr ""
 "Ви повинні зазначити щонайменше один дійсний профіль для URL-адреси веб-"
 "стрічки (URL-адреси через кому та пробіл)."
 
-#: RSSCloudRequestNotify.php:141
 msgid "Feed subscription failed: Not a valid feed."
 msgstr "Підписатися до веб-стрічки не вдалося: ця веб-стрічка не є дійсною."
 
-#: RSSCloudRequestNotify.php:147
 msgid ""
 "Feed subscription failed - notification handler doesn't respond correctly."
 msgstr ""
 "Підписатися до веб-стрічки не вдалося: обробник сповіщень відреагував "
 "неправильно."
 
-#: RSSCloudRequestNotify.php:161
 msgid ""
 "Thanks for the subscription. When the feed(s) update(s), you will be "
 "notified."
 msgstr ""
 "Дякуємо за підписку. Коли веб-стрічки оновляться, вас буде поінформовано."
 
-#: LoggingAggregator.php:93
-msgid "This resource requires an HTTP GET."
-msgstr "Цей ресурс вимагає форми HTTP GET."
-
-#: LoggingAggregator.php:104
-msgid "This resource requires an HTTP POST."
-msgstr "Цей ресурс вимагає форми HTTP POST."
-
-#: RSSCloudPlugin.php:245
 msgid ""
 "The RSSCloud plugin enables your StatusNet instance to publish real-time "
 "updates for profile RSS feeds using the <a href=\"http://rsscloud.org/"
diff --git a/plugins/Realtime/locale/Realtime.pot b/plugins/Realtime/locale/Realtime.pot
index 9549ce840b..b4a28472fc 100644
--- a/plugins/Realtime/locale/Realtime.pot
+++ b/plugins/Realtime/locale/Realtime.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/Realtime/locale/af/LC_MESSAGES/Realtime.po b/plugins/Realtime/locale/af/LC_MESSAGES/Realtime.po
index d0a6aa22ab..43be9c08b8 100644
--- a/plugins/Realtime/locale/af/LC_MESSAGES/Realtime.po
+++ b/plugins/Realtime/locale/af/LC_MESSAGES/Realtime.po
@@ -9,50 +9,44 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Realtime\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-14 16:01+0000\n"
-"PO-Revision-Date: 2011-02-14 16:09:47+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:04+0000\n"
 "Language-Team: Afrikaans <http://translatewiki.net/wiki/Portal:af>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:28:17+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r82114); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:45:50+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: af\n"
 "X-Message-Group: #out-statusnet-plugin-realtime\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANS: Text label for realtime view "play" button, usually replaced by an icon.
-#: RealtimePlugin.php:340
 msgctxt "BUTTON"
 msgid "Play"
 msgstr "Speel"
 
 #. TRANS: Tooltip for realtime view "play" button.
-#: RealtimePlugin.php:342
 msgctxt "TOOLTIP"
 msgid "Play"
 msgstr "Speel"
 
 #. TRANS: Text label for realtime view "pause" button
-#: RealtimePlugin.php:344
 msgctxt "BUTTON"
 msgid "Pause"
 msgstr "Wag"
 
 #. TRANS: Tooltip for realtime view "pause" button
-#: RealtimePlugin.php:346
 msgctxt "TOOLTIP"
 msgid "Pause"
 msgstr "Wag"
 
 #. TRANS: Text label for realtime view "popup" button, usually replaced by an icon.
-#: RealtimePlugin.php:348
 msgctxt "BUTTON"
 msgid "Pop up"
 msgstr "Pop-up"
 
 #. TRANS: Tooltip for realtime view "popup" button.
-#: RealtimePlugin.php:350
 msgctxt "TOOLTIP"
 msgid "Pop up in a window"
 msgstr "Wys in 'n venstertjie"
diff --git a/plugins/Realtime/locale/br/LC_MESSAGES/Realtime.po b/plugins/Realtime/locale/br/LC_MESSAGES/Realtime.po
index c4d56d85e2..346cbd45a2 100644
--- a/plugins/Realtime/locale/br/LC_MESSAGES/Realtime.po
+++ b/plugins/Realtime/locale/br/LC_MESSAGES/Realtime.po
@@ -9,50 +9,44 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Realtime\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-14 16:01+0000\n"
-"PO-Revision-Date: 2011-02-14 16:09:47+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:04+0000\n"
 "Language-Team: Breton <http://translatewiki.net/wiki/Portal:br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:28:17+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r82114); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:45:50+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-realtime\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. TRANS: Text label for realtime view "play" button, usually replaced by an icon.
-#: RealtimePlugin.php:340
 msgctxt "BUTTON"
 msgid "Play"
 msgstr "Lenn"
 
 #. TRANS: Tooltip for realtime view "play" button.
-#: RealtimePlugin.php:342
 msgctxt "TOOLTIP"
 msgid "Play"
 msgstr "Lenn"
 
 #. TRANS: Text label for realtime view "pause" button
-#: RealtimePlugin.php:344
 msgctxt "BUTTON"
 msgid "Pause"
 msgstr "Ehan"
 
 #. TRANS: Tooltip for realtime view "pause" button
-#: RealtimePlugin.php:346
 msgctxt "TOOLTIP"
 msgid "Pause"
 msgstr "Ehan"
 
 #. TRANS: Text label for realtime view "popup" button, usually replaced by an icon.
-#: RealtimePlugin.php:348
 msgctxt "BUTTON"
 msgid "Pop up"
 msgstr ""
 
 #. TRANS: Tooltip for realtime view "popup" button.
-#: RealtimePlugin.php:350
 msgctxt "TOOLTIP"
 msgid "Pop up in a window"
 msgstr ""
diff --git a/plugins/Realtime/locale/ca/LC_MESSAGES/Realtime.po b/plugins/Realtime/locale/ca/LC_MESSAGES/Realtime.po
index 07c8da8217..c6336d0ddf 100644
--- a/plugins/Realtime/locale/ca/LC_MESSAGES/Realtime.po
+++ b/plugins/Realtime/locale/ca/LC_MESSAGES/Realtime.po
@@ -9,50 +9,44 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Realtime\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-14 16:01+0000\n"
-"PO-Revision-Date: 2011-02-14 16:09:48+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:04+0000\n"
 "Language-Team: Catalan <http://translatewiki.net/wiki/Portal:ca>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:28:17+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r82114); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:45:50+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ca\n"
 "X-Message-Group: #out-statusnet-plugin-realtime\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANS: Text label for realtime view "play" button, usually replaced by an icon.
-#: RealtimePlugin.php:340
 msgctxt "BUTTON"
 msgid "Play"
 msgstr "Reprodueix"
 
 #. TRANS: Tooltip for realtime view "play" button.
-#: RealtimePlugin.php:342
 msgctxt "TOOLTIP"
 msgid "Play"
 msgstr "Reprodueix"
 
 #. TRANS: Text label for realtime view "pause" button
-#: RealtimePlugin.php:344
 msgctxt "BUTTON"
 msgid "Pause"
 msgstr "Pausa"
 
 #. TRANS: Tooltip for realtime view "pause" button
-#: RealtimePlugin.php:346
 msgctxt "TOOLTIP"
 msgid "Pause"
 msgstr "Pausa"
 
 #. TRANS: Text label for realtime view "popup" button, usually replaced by an icon.
-#: RealtimePlugin.php:348
 msgctxt "BUTTON"
 msgid "Pop up"
 msgstr "Emergent"
 
 #. TRANS: Tooltip for realtime view "popup" button.
-#: RealtimePlugin.php:350
 msgctxt "TOOLTIP"
 msgid "Pop up in a window"
 msgstr "Emergent en una finestra"
diff --git a/plugins/Realtime/locale/de/LC_MESSAGES/Realtime.po b/plugins/Realtime/locale/de/LC_MESSAGES/Realtime.po
index 174e1510c5..52b35c3dbe 100644
--- a/plugins/Realtime/locale/de/LC_MESSAGES/Realtime.po
+++ b/plugins/Realtime/locale/de/LC_MESSAGES/Realtime.po
@@ -9,50 +9,44 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Realtime\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-14 16:01+0000\n"
-"PO-Revision-Date: 2011-02-14 16:09:48+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:04+0000\n"
 "Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:28:17+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r82114); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:45:50+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-realtime\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANS: Text label for realtime view "play" button, usually replaced by an icon.
-#: RealtimePlugin.php:340
 msgctxt "BUTTON"
 msgid "Play"
 msgstr "Abspielen"
 
 #. TRANS: Tooltip for realtime view "play" button.
-#: RealtimePlugin.php:342
 msgctxt "TOOLTIP"
 msgid "Play"
 msgstr "Abspielen"
 
 #. TRANS: Text label for realtime view "pause" button
-#: RealtimePlugin.php:344
 msgctxt "BUTTON"
 msgid "Pause"
 msgstr "Pause"
 
 #. TRANS: Tooltip for realtime view "pause" button
-#: RealtimePlugin.php:346
 msgctxt "TOOLTIP"
 msgid "Pause"
 msgstr "Pause"
 
 #. TRANS: Text label for realtime view "popup" button, usually replaced by an icon.
-#: RealtimePlugin.php:348
 msgctxt "BUTTON"
 msgid "Pop up"
 msgstr "Popup"
 
 #. TRANS: Tooltip for realtime view "popup" button.
-#: RealtimePlugin.php:350
 msgctxt "TOOLTIP"
 msgid "Pop up in a window"
 msgstr "Popup in einem Fenster"
diff --git a/plugins/Realtime/locale/fr/LC_MESSAGES/Realtime.po b/plugins/Realtime/locale/fr/LC_MESSAGES/Realtime.po
index ce1eccf70e..ac419fa697 100644
--- a/plugins/Realtime/locale/fr/LC_MESSAGES/Realtime.po
+++ b/plugins/Realtime/locale/fr/LC_MESSAGES/Realtime.po
@@ -9,50 +9,44 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Realtime\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-14 16:01+0000\n"
-"PO-Revision-Date: 2011-02-14 16:09:50+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:04+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:28:17+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r82114); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:45:50+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-realtime\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. TRANS: Text label for realtime view "play" button, usually replaced by an icon.
-#: RealtimePlugin.php:340
 msgctxt "BUTTON"
 msgid "Play"
 msgstr "Jouer"
 
 #. TRANS: Tooltip for realtime view "play" button.
-#: RealtimePlugin.php:342
 msgctxt "TOOLTIP"
 msgid "Play"
 msgstr "Jouer"
 
 #. TRANS: Text label for realtime view "pause" button
-#: RealtimePlugin.php:344
 msgctxt "BUTTON"
 msgid "Pause"
 msgstr "Pause"
 
 #. TRANS: Tooltip for realtime view "pause" button
-#: RealtimePlugin.php:346
 msgctxt "TOOLTIP"
 msgid "Pause"
 msgstr "Pause"
 
 #. TRANS: Text label for realtime view "popup" button, usually replaced by an icon.
-#: RealtimePlugin.php:348
 msgctxt "BUTTON"
 msgid "Pop up"
 msgstr "Nouvelle fenêtre"
 
 #. TRANS: Tooltip for realtime view "popup" button.
-#: RealtimePlugin.php:350
 msgctxt "TOOLTIP"
 msgid "Pop up in a window"
 msgstr "Afficher dans une nouvelle fenêtre"
diff --git a/plugins/Realtime/locale/ia/LC_MESSAGES/Realtime.po b/plugins/Realtime/locale/ia/LC_MESSAGES/Realtime.po
index 6e3e4a82bb..2ef9363bc9 100644
--- a/plugins/Realtime/locale/ia/LC_MESSAGES/Realtime.po
+++ b/plugins/Realtime/locale/ia/LC_MESSAGES/Realtime.po
@@ -9,50 +9,44 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Realtime\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-14 16:01+0000\n"
-"PO-Revision-Date: 2011-02-14 16:09:52+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:04+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:28:17+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r82114); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:45:50+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-realtime\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANS: Text label for realtime view "play" button, usually replaced by an icon.
-#: RealtimePlugin.php:340
 msgctxt "BUTTON"
 msgid "Play"
 msgstr "Reproducer"
 
 #. TRANS: Tooltip for realtime view "play" button.
-#: RealtimePlugin.php:342
 msgctxt "TOOLTIP"
 msgid "Play"
 msgstr "Reproducer"
 
 #. TRANS: Text label for realtime view "pause" button
-#: RealtimePlugin.php:344
 msgctxt "BUTTON"
 msgid "Pause"
 msgstr "Pausar"
 
 #. TRANS: Tooltip for realtime view "pause" button
-#: RealtimePlugin.php:346
 msgctxt "TOOLTIP"
 msgid "Pause"
 msgstr "Pausar"
 
 #. TRANS: Text label for realtime view "popup" button, usually replaced by an icon.
-#: RealtimePlugin.php:348
 msgctxt "BUTTON"
 msgid "Pop up"
 msgstr "Fenestra"
 
 #. TRANS: Tooltip for realtime view "popup" button.
-#: RealtimePlugin.php:350
 msgctxt "TOOLTIP"
 msgid "Pop up in a window"
 msgstr "Aperir le reproductor in un nove fenestra"
diff --git a/plugins/Realtime/locale/mk/LC_MESSAGES/Realtime.po b/plugins/Realtime/locale/mk/LC_MESSAGES/Realtime.po
index 3f82d15605..ec087f8b34 100644
--- a/plugins/Realtime/locale/mk/LC_MESSAGES/Realtime.po
+++ b/plugins/Realtime/locale/mk/LC_MESSAGES/Realtime.po
@@ -9,50 +9,44 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Realtime\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-14 16:01+0000\n"
-"PO-Revision-Date: 2011-02-14 16:09:53+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:04+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:28:17+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r82114); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:45:50+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-realtime\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
 
 #. TRANS: Text label for realtime view "play" button, usually replaced by an icon.
-#: RealtimePlugin.php:340
 msgctxt "BUTTON"
 msgid "Play"
 msgstr "Пушти"
 
 #. TRANS: Tooltip for realtime view "play" button.
-#: RealtimePlugin.php:342
 msgctxt "TOOLTIP"
 msgid "Play"
 msgstr "Пушти"
 
 #. TRANS: Text label for realtime view "pause" button
-#: RealtimePlugin.php:344
 msgctxt "BUTTON"
 msgid "Pause"
 msgstr "Паузирај"
 
 #. TRANS: Tooltip for realtime view "pause" button
-#: RealtimePlugin.php:346
 msgctxt "TOOLTIP"
 msgid "Pause"
 msgstr "Паузирај"
 
 #. TRANS: Text label for realtime view "popup" button, usually replaced by an icon.
-#: RealtimePlugin.php:348
 msgctxt "BUTTON"
 msgid "Pop up"
 msgstr "Прозорче"
 
 #. TRANS: Tooltip for realtime view "popup" button.
-#: RealtimePlugin.php:350
 msgctxt "TOOLTIP"
 msgid "Pop up in a window"
 msgstr "Прикажи во прозорче"
diff --git a/plugins/Realtime/locale/ne/LC_MESSAGES/Realtime.po b/plugins/Realtime/locale/ne/LC_MESSAGES/Realtime.po
index 04ac2dbbc0..be1bda1d4a 100644
--- a/plugins/Realtime/locale/ne/LC_MESSAGES/Realtime.po
+++ b/plugins/Realtime/locale/ne/LC_MESSAGES/Realtime.po
@@ -9,50 +9,44 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Realtime\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-14 16:01+0000\n"
-"PO-Revision-Date: 2011-02-14 16:09:53+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:04+0000\n"
 "Language-Team: Nepali <http://translatewiki.net/wiki/Portal:ne>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:28:17+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r82114); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:45:50+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ne\n"
 "X-Message-Group: #out-statusnet-plugin-realtime\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANS: Text label for realtime view "play" button, usually replaced by an icon.
-#: RealtimePlugin.php:340
 msgctxt "BUTTON"
 msgid "Play"
 msgstr "बजाउ"
 
 #. TRANS: Tooltip for realtime view "play" button.
-#: RealtimePlugin.php:342
 msgctxt "TOOLTIP"
 msgid "Play"
 msgstr "बजाउ"
 
 #. TRANS: Text label for realtime view "pause" button
-#: RealtimePlugin.php:344
 msgctxt "BUTTON"
 msgid "Pause"
 msgstr "बिसाउ"
 
 #. TRANS: Tooltip for realtime view "pause" button
-#: RealtimePlugin.php:346
 msgctxt "TOOLTIP"
 msgid "Pause"
 msgstr "बिसाउ"
 
 #. TRANS: Text label for realtime view "popup" button, usually replaced by an icon.
-#: RealtimePlugin.php:348
 msgctxt "BUTTON"
 msgid "Pop up"
 msgstr "चम्काउ"
 
 #. TRANS: Tooltip for realtime view "popup" button.
-#: RealtimePlugin.php:350
 msgctxt "TOOLTIP"
 msgid "Pop up in a window"
 msgstr "चम्क विन्डोमा"
diff --git a/plugins/Realtime/locale/nl/LC_MESSAGES/Realtime.po b/plugins/Realtime/locale/nl/LC_MESSAGES/Realtime.po
index afb1e6f269..83a89a2f0e 100644
--- a/plugins/Realtime/locale/nl/LC_MESSAGES/Realtime.po
+++ b/plugins/Realtime/locale/nl/LC_MESSAGES/Realtime.po
@@ -9,50 +9,44 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Realtime\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-14 16:01+0000\n"
-"PO-Revision-Date: 2011-02-14 16:09:53+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:04+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:28:17+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r82114); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:45:50+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-realtime\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANS: Text label for realtime view "play" button, usually replaced by an icon.
-#: RealtimePlugin.php:340
 msgctxt "BUTTON"
 msgid "Play"
 msgstr "Afspelen"
 
 #. TRANS: Tooltip for realtime view "play" button.
-#: RealtimePlugin.php:342
 msgctxt "TOOLTIP"
 msgid "Play"
 msgstr "Afspelen"
 
 #. TRANS: Text label for realtime view "pause" button
-#: RealtimePlugin.php:344
 msgctxt "BUTTON"
 msgid "Pause"
 msgstr "Pauzeren"
 
 #. TRANS: Tooltip for realtime view "pause" button
-#: RealtimePlugin.php:346
 msgctxt "TOOLTIP"
 msgid "Pause"
 msgstr "Pauzeren"
 
 #. TRANS: Text label for realtime view "popup" button, usually replaced by an icon.
-#: RealtimePlugin.php:348
 msgctxt "BUTTON"
 msgid "Pop up"
 msgstr "Pop-up"
 
 #. TRANS: Tooltip for realtime view "popup" button.
-#: RealtimePlugin.php:350
 msgctxt "TOOLTIP"
 msgid "Pop up in a window"
 msgstr "In nieuw venstertje weergeven"
diff --git a/plugins/Realtime/locale/tr/LC_MESSAGES/Realtime.po b/plugins/Realtime/locale/tr/LC_MESSAGES/Realtime.po
index 8da3949897..c4b44af051 100644
--- a/plugins/Realtime/locale/tr/LC_MESSAGES/Realtime.po
+++ b/plugins/Realtime/locale/tr/LC_MESSAGES/Realtime.po
@@ -9,50 +9,44 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Realtime\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-14 16:01+0000\n"
-"PO-Revision-Date: 2011-02-14 16:09:53+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:04+0000\n"
 "Language-Team: Turkish <http://translatewiki.net/wiki/Portal:tr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:28:17+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r82114); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:45:50+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tr\n"
 "X-Message-Group: #out-statusnet-plugin-realtime\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. TRANS: Text label for realtime view "play" button, usually replaced by an icon.
-#: RealtimePlugin.php:340
 msgctxt "BUTTON"
 msgid "Play"
 msgstr "Oynat"
 
 #. TRANS: Tooltip for realtime view "play" button.
-#: RealtimePlugin.php:342
 msgctxt "TOOLTIP"
 msgid "Play"
 msgstr "Oynat"
 
 #. TRANS: Text label for realtime view "pause" button
-#: RealtimePlugin.php:344
 msgctxt "BUTTON"
 msgid "Pause"
 msgstr "Duraklat"
 
 #. TRANS: Tooltip for realtime view "pause" button
-#: RealtimePlugin.php:346
 msgctxt "TOOLTIP"
 msgid "Pause"
 msgstr "Duraklat"
 
 #. TRANS: Text label for realtime view "popup" button, usually replaced by an icon.
-#: RealtimePlugin.php:348
 msgctxt "BUTTON"
 msgid "Pop up"
 msgstr ""
 
 #. TRANS: Tooltip for realtime view "popup" button.
-#: RealtimePlugin.php:350
 msgctxt "TOOLTIP"
 msgid "Pop up in a window"
 msgstr ""
diff --git a/plugins/Realtime/locale/uk/LC_MESSAGES/Realtime.po b/plugins/Realtime/locale/uk/LC_MESSAGES/Realtime.po
index be409b8f4a..73f0bc8832 100644
--- a/plugins/Realtime/locale/uk/LC_MESSAGES/Realtime.po
+++ b/plugins/Realtime/locale/uk/LC_MESSAGES/Realtime.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Realtime\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-14 16:01+0000\n"
-"PO-Revision-Date: 2011-02-14 16:09:53+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:05+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:28:17+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r82114); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:45:50+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-realtime\n"
@@ -23,37 +23,31 @@ msgstr ""
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
 #. TRANS: Text label for realtime view "play" button, usually replaced by an icon.
-#: RealtimePlugin.php:340
 msgctxt "BUTTON"
 msgid "Play"
 msgstr "Оновлювати"
 
 #. TRANS: Tooltip for realtime view "play" button.
-#: RealtimePlugin.php:342
 msgctxt "TOOLTIP"
 msgid "Play"
 msgstr "Оновлювати"
 
 #. TRANS: Text label for realtime view "pause" button
-#: RealtimePlugin.php:344
 msgctxt "BUTTON"
 msgid "Pause"
 msgstr "Пауза"
 
 #. TRANS: Tooltip for realtime view "pause" button
-#: RealtimePlugin.php:346
 msgctxt "TOOLTIP"
 msgid "Pause"
 msgstr "Пауза"
 
 #. TRANS: Text label for realtime view "popup" button, usually replaced by an icon.
-#: RealtimePlugin.php:348
 msgctxt "BUTTON"
 msgid "Pop up"
 msgstr "Окреме вікно"
 
 #. TRANS: Tooltip for realtime view "popup" button.
-#: RealtimePlugin.php:350
 msgctxt "TOOLTIP"
 msgid "Pop up in a window"
 msgstr "Стрічка окремим вікном"
diff --git a/plugins/Recaptcha/locale/Recaptcha.pot b/plugins/Recaptcha/locale/Recaptcha.pot
index 66faa46bb8..396e6294ba 100644
--- a/plugins/Recaptcha/locale/Recaptcha.pot
+++ b/plugins/Recaptcha/locale/Recaptcha.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/Recaptcha/locale/de/LC_MESSAGES/Recaptcha.po b/plugins/Recaptcha/locale/de/LC_MESSAGES/Recaptcha.po
index 9acfd15397..8b7a2635e8 100644
--- a/plugins/Recaptcha/locale/de/LC_MESSAGES/Recaptcha.po
+++ b/plugins/Recaptcha/locale/de/LC_MESSAGES/Recaptcha.po
@@ -10,27 +10,24 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Recaptcha\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:49+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:05+0000\n"
 "Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:28:18+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:46:59+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-recaptcha\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: RecaptchaPlugin.php:57
 msgid "Captcha"
 msgstr "Captcha"
 
-#: RecaptchaPlugin.php:98
 msgid "Captcha does not match!"
 msgstr "Captcha stimmt nicht mit Text überein!"
 
-#: RecaptchaPlugin.php:110
 msgid ""
 "Uses <a href=\"http://recaptcha.org/\">Recaptcha</a> service to add a  "
 "captcha to the registration page."
diff --git a/plugins/Recaptcha/locale/fr/LC_MESSAGES/Recaptcha.po b/plugins/Recaptcha/locale/fr/LC_MESSAGES/Recaptcha.po
index 7976544b4f..5af3352e45 100644
--- a/plugins/Recaptcha/locale/fr/LC_MESSAGES/Recaptcha.po
+++ b/plugins/Recaptcha/locale/fr/LC_MESSAGES/Recaptcha.po
@@ -10,27 +10,24 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Recaptcha\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:49+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:05+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:28:18+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:46:59+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-recaptcha\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: RecaptchaPlugin.php:57
 msgid "Captcha"
 msgstr "Vérificateur anti-robot Captcha"
 
-#: RecaptchaPlugin.php:98
 msgid "Captcha does not match!"
 msgstr "Le Captcha ne correspond pas !"
 
-#: RecaptchaPlugin.php:110
 msgid ""
 "Uses <a href=\"http://recaptcha.org/\">Recaptcha</a> service to add a  "
 "captcha to the registration page."
diff --git a/plugins/Recaptcha/locale/fur/LC_MESSAGES/Recaptcha.po b/plugins/Recaptcha/locale/fur/LC_MESSAGES/Recaptcha.po
index 273b509c28..4065b1ed96 100644
--- a/plugins/Recaptcha/locale/fur/LC_MESSAGES/Recaptcha.po
+++ b/plugins/Recaptcha/locale/fur/LC_MESSAGES/Recaptcha.po
@@ -9,27 +9,24 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Recaptcha\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:49+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:05+0000\n"
 "Language-Team: Friulian <http://translatewiki.net/wiki/Portal:fur>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:28:18+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:46:59+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fur\n"
 "X-Message-Group: #out-statusnet-plugin-recaptcha\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: RecaptchaPlugin.php:57
 msgid "Captcha"
 msgstr "Captcha"
 
-#: RecaptchaPlugin.php:98
 msgid "Captcha does not match!"
 msgstr "Il Captcha nol corispuint!"
 
-#: RecaptchaPlugin.php:110
 msgid ""
 "Uses <a href=\"http://recaptcha.org/\">Recaptcha</a> service to add a  "
 "captcha to the registration page."
diff --git a/plugins/Recaptcha/locale/ia/LC_MESSAGES/Recaptcha.po b/plugins/Recaptcha/locale/ia/LC_MESSAGES/Recaptcha.po
index 33334530cf..edb96c745b 100644
--- a/plugins/Recaptcha/locale/ia/LC_MESSAGES/Recaptcha.po
+++ b/plugins/Recaptcha/locale/ia/LC_MESSAGES/Recaptcha.po
@@ -9,27 +9,24 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Recaptcha\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:49+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:05+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:28:18+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:46:59+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-recaptcha\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: RecaptchaPlugin.php:57
 msgid "Captcha"
 msgstr "Captcha"
 
-#: RecaptchaPlugin.php:98
 msgid "Captcha does not match!"
 msgstr "Captcha non corresponde!"
 
-#: RecaptchaPlugin.php:110
 msgid ""
 "Uses <a href=\"http://recaptcha.org/\">Recaptcha</a> service to add a  "
 "captcha to the registration page."
diff --git a/plugins/Recaptcha/locale/mk/LC_MESSAGES/Recaptcha.po b/plugins/Recaptcha/locale/mk/LC_MESSAGES/Recaptcha.po
index d641ab985f..5e725f77ee 100644
--- a/plugins/Recaptcha/locale/mk/LC_MESSAGES/Recaptcha.po
+++ b/plugins/Recaptcha/locale/mk/LC_MESSAGES/Recaptcha.po
@@ -9,27 +9,24 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Recaptcha\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:50+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:05+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:28:18+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:46:59+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-recaptcha\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
 
-#: RecaptchaPlugin.php:57
 msgid "Captcha"
 msgstr "Captcha"
 
-#: RecaptchaPlugin.php:98
 msgid "Captcha does not match!"
 msgstr "Captcha не се совпаѓа!"
 
-#: RecaptchaPlugin.php:110
 msgid ""
 "Uses <a href=\"http://recaptcha.org/\">Recaptcha</a> service to add a  "
 "captcha to the registration page."
diff --git a/plugins/Recaptcha/locale/nb/LC_MESSAGES/Recaptcha.po b/plugins/Recaptcha/locale/nb/LC_MESSAGES/Recaptcha.po
index ae5b0716e1..d683c44ab1 100644
--- a/plugins/Recaptcha/locale/nb/LC_MESSAGES/Recaptcha.po
+++ b/plugins/Recaptcha/locale/nb/LC_MESSAGES/Recaptcha.po
@@ -9,27 +9,24 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Recaptcha\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:50+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:05+0000\n"
 "Language-Team: Norwegian (bokmål)‬ <http://translatewiki.net/wiki/Portal:no>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:28:18+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:46:59+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: #out-statusnet-plugin-recaptcha\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: RecaptchaPlugin.php:57
 msgid "Captcha"
 msgstr "Captcha"
 
-#: RecaptchaPlugin.php:98
 msgid "Captcha does not match!"
 msgstr "Captcha stemmer ikke."
 
-#: RecaptchaPlugin.php:110
 msgid ""
 "Uses <a href=\"http://recaptcha.org/\">Recaptcha</a> service to add a  "
 "captcha to the registration page."
diff --git a/plugins/Recaptcha/locale/nl/LC_MESSAGES/Recaptcha.po b/plugins/Recaptcha/locale/nl/LC_MESSAGES/Recaptcha.po
index fe6ed4629e..dd8435e7c7 100644
--- a/plugins/Recaptcha/locale/nl/LC_MESSAGES/Recaptcha.po
+++ b/plugins/Recaptcha/locale/nl/LC_MESSAGES/Recaptcha.po
@@ -9,27 +9,24 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Recaptcha\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:50+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:05+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:28:18+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:46:59+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-recaptcha\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: RecaptchaPlugin.php:57
 msgid "Captcha"
 msgstr "Captcha"
 
-#: RecaptchaPlugin.php:98
 msgid "Captcha does not match!"
 msgstr "Captcha komt niet overeen!"
 
-#: RecaptchaPlugin.php:110
 msgid ""
 "Uses <a href=\"http://recaptcha.org/\">Recaptcha</a> service to add a  "
 "captcha to the registration page."
diff --git a/plugins/Recaptcha/locale/pt/LC_MESSAGES/Recaptcha.po b/plugins/Recaptcha/locale/pt/LC_MESSAGES/Recaptcha.po
index d47d24e1c8..4923f5742f 100644
--- a/plugins/Recaptcha/locale/pt/LC_MESSAGES/Recaptcha.po
+++ b/plugins/Recaptcha/locale/pt/LC_MESSAGES/Recaptcha.po
@@ -9,27 +9,24 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Recaptcha\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:50+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:05+0000\n"
 "Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:28:18+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:46:59+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-plugin-recaptcha\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: RecaptchaPlugin.php:57
 msgid "Captcha"
 msgstr "Imagem de verificação"
 
-#: RecaptchaPlugin.php:98
 msgid "Captcha does not match!"
 msgstr "A imagem de verificação não corresponde!"
 
-#: RecaptchaPlugin.php:110
 msgid ""
 "Uses <a href=\"http://recaptcha.org/\">Recaptcha</a> service to add a  "
 "captcha to the registration page."
diff --git a/plugins/Recaptcha/locale/ru/LC_MESSAGES/Recaptcha.po b/plugins/Recaptcha/locale/ru/LC_MESSAGES/Recaptcha.po
index e90689a5ce..0ceaab92c1 100644
--- a/plugins/Recaptcha/locale/ru/LC_MESSAGES/Recaptcha.po
+++ b/plugins/Recaptcha/locale/ru/LC_MESSAGES/Recaptcha.po
@@ -10,28 +10,25 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Recaptcha\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:50+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:05+0000\n"
 "Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:28:18+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:46:59+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-recaptcha\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: RecaptchaPlugin.php:57
 msgid "Captcha"
 msgstr "Капча"
 
-#: RecaptchaPlugin.php:98
 msgid "Captcha does not match!"
 msgstr "Код проверки не совпадает!"
 
-#: RecaptchaPlugin.php:110
 msgid ""
 "Uses <a href=\"http://recaptcha.org/\">Recaptcha</a> service to add a  "
 "captcha to the registration page."
diff --git a/plugins/Recaptcha/locale/tl/LC_MESSAGES/Recaptcha.po b/plugins/Recaptcha/locale/tl/LC_MESSAGES/Recaptcha.po
index d3dac3b2f2..9cd2f220d6 100644
--- a/plugins/Recaptcha/locale/tl/LC_MESSAGES/Recaptcha.po
+++ b/plugins/Recaptcha/locale/tl/LC_MESSAGES/Recaptcha.po
@@ -9,27 +9,24 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Recaptcha\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:50+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:05+0000\n"
 "Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:28:18+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:46:59+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-recaptcha\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: RecaptchaPlugin.php:57
 msgid "Captcha"
 msgstr "Captcha"
 
-#: RecaptchaPlugin.php:98
 msgid "Captcha does not match!"
 msgstr "Hindi tugma ang Captcha!"
 
-#: RecaptchaPlugin.php:110
 msgid ""
 "Uses <a href=\"http://recaptcha.org/\">Recaptcha</a> service to add a  "
 "captcha to the registration page."
diff --git a/plugins/Recaptcha/locale/uk/LC_MESSAGES/Recaptcha.po b/plugins/Recaptcha/locale/uk/LC_MESSAGES/Recaptcha.po
index f1ff37a26b..6c78a1dc13 100644
--- a/plugins/Recaptcha/locale/uk/LC_MESSAGES/Recaptcha.po
+++ b/plugins/Recaptcha/locale/uk/LC_MESSAGES/Recaptcha.po
@@ -9,28 +9,25 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Recaptcha\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:50+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:05+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:28:18+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:46:59+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-recaptcha\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: RecaptchaPlugin.php:57
 msgid "Captcha"
 msgstr "Captcha"
 
-#: RecaptchaPlugin.php:98
 msgid "Captcha does not match!"
 msgstr "Коди перевірки не збігаються!"
 
-#: RecaptchaPlugin.php:110
 msgid ""
 "Uses <a href=\"http://recaptcha.org/\">Recaptcha</a> service to add a  "
 "captcha to the registration page."
diff --git a/plugins/RegisterThrottle/locale/RegisterThrottle.pot b/plugins/RegisterThrottle/locale/RegisterThrottle.pot
index 3a34c4fef4..c174c79409 100644
--- a/plugins/RegisterThrottle/locale/RegisterThrottle.pot
+++ b/plugins/RegisterThrottle/locale/RegisterThrottle.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/RegisterThrottle/locale/de/LC_MESSAGES/RegisterThrottle.po b/plugins/RegisterThrottle/locale/de/LC_MESSAGES/RegisterThrottle.po
index 543dc825e5..e2b3cad8a7 100644
--- a/plugins/RegisterThrottle/locale/de/LC_MESSAGES/RegisterThrottle.po
+++ b/plugins/RegisterThrottle/locale/de/LC_MESSAGES/RegisterThrottle.po
@@ -9,31 +9,27 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - RegisterThrottle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:16+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:06+0000\n"
 "Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-22 19:32:40+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:46:38+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-registerthrottle\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: RegisterThrottlePlugin.php:134
 msgid "Cannot find IP address."
 msgstr "Kann IP-Addresse nicht finden."
 
-#: RegisterThrottlePlugin.php:149
 msgid "Too many registrations. Take a break and try again later."
 msgstr ""
 "Zu viele Registrierungen. Mach eine Pause and versuche es später noch einmal."
 
-#: RegisterThrottlePlugin.php:161
 msgid "A banned user has registered from this address."
 msgstr "Ein gesperrter Benutzer hat sich von dieser Adresse registriert."
 
-#: RegisterThrottlePlugin.php:220
 msgid "Throttles excessive registration from a single IP address."
 msgstr "Drosselt exzessive Registrierungen einer einzelnen IP-Adresse."
diff --git a/plugins/RegisterThrottle/locale/fr/LC_MESSAGES/RegisterThrottle.po b/plugins/RegisterThrottle/locale/fr/LC_MESSAGES/RegisterThrottle.po
index a4883015ed..a71366add0 100644
--- a/plugins/RegisterThrottle/locale/fr/LC_MESSAGES/RegisterThrottle.po
+++ b/plugins/RegisterThrottle/locale/fr/LC_MESSAGES/RegisterThrottle.po
@@ -10,32 +10,28 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - RegisterThrottle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:16+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:06+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-22 19:32:40+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:46:38+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-registerthrottle\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: RegisterThrottlePlugin.php:134
 msgid "Cannot find IP address."
 msgstr "Impossible de trouver l’adresse IP."
 
-#: RegisterThrottlePlugin.php:149
 msgid "Too many registrations. Take a break and try again later."
 msgstr ""
 "Inscriptions trop nombreuses. Faites une pause et essayez à nouveau plus "
 "tard."
 
-#: RegisterThrottlePlugin.php:161
 msgid "A banned user has registered from this address."
 msgstr "Un utilisateur banni s’est inscrit depuis cette adresse."
 
-#: RegisterThrottlePlugin.php:220
 msgid "Throttles excessive registration from a single IP address."
 msgstr "Évite les inscriptions excessives depuis une même adresse IP."
diff --git a/plugins/RegisterThrottle/locale/ia/LC_MESSAGES/RegisterThrottle.po b/plugins/RegisterThrottle/locale/ia/LC_MESSAGES/RegisterThrottle.po
index 679ddfc7af..c17328f3c5 100644
--- a/plugins/RegisterThrottle/locale/ia/LC_MESSAGES/RegisterThrottle.po
+++ b/plugins/RegisterThrottle/locale/ia/LC_MESSAGES/RegisterThrottle.po
@@ -9,30 +9,26 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - RegisterThrottle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:16+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:06+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-22 19:32:40+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:46:38+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-registerthrottle\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: RegisterThrottlePlugin.php:134
 msgid "Cannot find IP address."
 msgstr "Non pote trovar adresse IP."
 
-#: RegisterThrottlePlugin.php:149
 msgid "Too many registrations. Take a break and try again later."
 msgstr "Troppo de registrationes. Face un pausa e reproba plus tarde."
 
-#: RegisterThrottlePlugin.php:161
 msgid "A banned user has registered from this address."
 msgstr "Un usator bannite se ha registrate ab iste adresse."
 
-#: RegisterThrottlePlugin.php:220
 msgid "Throttles excessive registration from a single IP address."
 msgstr "Inhibi le creation de contos excessive ab un sol adresse IP."
diff --git a/plugins/RegisterThrottle/locale/mk/LC_MESSAGES/RegisterThrottle.po b/plugins/RegisterThrottle/locale/mk/LC_MESSAGES/RegisterThrottle.po
index f16f19eb57..83b60a890d 100644
--- a/plugins/RegisterThrottle/locale/mk/LC_MESSAGES/RegisterThrottle.po
+++ b/plugins/RegisterThrottle/locale/mk/LC_MESSAGES/RegisterThrottle.po
@@ -9,30 +9,26 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - RegisterThrottle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:16+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:06+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-22 19:32:40+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:46:38+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-registerthrottle\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
 
-#: RegisterThrottlePlugin.php:134
 msgid "Cannot find IP address."
 msgstr "Не можам да ја пронајдам IP-адресата."
 
-#: RegisterThrottlePlugin.php:149
 msgid "Too many registrations. Take a break and try again later."
 msgstr "Премногу регистрации. Направете пауза и обидете се подоцна."
 
-#: RegisterThrottlePlugin.php:161
 msgid "A banned user has registered from this address."
 msgstr "Од оваа адреса се регистрирал забранет корисник."
 
-#: RegisterThrottlePlugin.php:220
 msgid "Throttles excessive registration from a single IP address."
 msgstr "Истиснува прекумерни регистрации од една IP-адреса."
diff --git a/plugins/RegisterThrottle/locale/nl/LC_MESSAGES/RegisterThrottle.po b/plugins/RegisterThrottle/locale/nl/LC_MESSAGES/RegisterThrottle.po
index 6511fa207b..18d21a266a 100644
--- a/plugins/RegisterThrottle/locale/nl/LC_MESSAGES/RegisterThrottle.po
+++ b/plugins/RegisterThrottle/locale/nl/LC_MESSAGES/RegisterThrottle.po
@@ -10,30 +10,26 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - RegisterThrottle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:16+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:06+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-22 19:32:40+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:46:38+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-registerthrottle\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: RegisterThrottlePlugin.php:134
 msgid "Cannot find IP address."
 msgstr "Het IP-adres kon niet gevonden worden."
 
-#: RegisterThrottlePlugin.php:149
 msgid "Too many registrations. Take a break and try again later."
 msgstr "Te veel registraties. Wacht even en probeer het later opnieuw."
 
-#: RegisterThrottlePlugin.php:161
 msgid "A banned user has registered from this address."
 msgstr "Er is een geblokkeerde gebruiker die vanaf dit adres is geregistreerd."
 
-#: RegisterThrottlePlugin.php:220
 msgid "Throttles excessive registration from a single IP address."
 msgstr "Beperkt excessieve aantallen registraties vanaf één IP-adres."
diff --git a/plugins/RegisterThrottle/locale/tl/LC_MESSAGES/RegisterThrottle.po b/plugins/RegisterThrottle/locale/tl/LC_MESSAGES/RegisterThrottle.po
index cc6f8f7f26..bf8e5e6985 100644
--- a/plugins/RegisterThrottle/locale/tl/LC_MESSAGES/RegisterThrottle.po
+++ b/plugins/RegisterThrottle/locale/tl/LC_MESSAGES/RegisterThrottle.po
@@ -9,31 +9,27 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - RegisterThrottle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:16+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:06+0000\n"
 "Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-22 19:32:40+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:46:38+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-registerthrottle\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: RegisterThrottlePlugin.php:134
 msgid "Cannot find IP address."
 msgstr "Hindi matagpuan ang tirahan ng IP."
 
-#: RegisterThrottlePlugin.php:149
 msgid "Too many registrations. Take a break and try again later."
 msgstr "Napakaraming mga pagpapatala. Magpahinga muna at subukan uli mamaya."
 
-#: RegisterThrottlePlugin.php:161
 msgid "A banned user has registered from this address."
 msgstr ""
 
-#: RegisterThrottlePlugin.php:220
 msgid "Throttles excessive registration from a single IP address."
 msgstr ""
 "Naglilipat-lipat ng labis na pagpapatala mula sa isang nag-iisang tirahan ng "
diff --git a/plugins/RegisterThrottle/locale/uk/LC_MESSAGES/RegisterThrottle.po b/plugins/RegisterThrottle/locale/uk/LC_MESSAGES/RegisterThrottle.po
index 0fcaa61ca2..926a77f2e0 100644
--- a/plugins/RegisterThrottle/locale/uk/LC_MESSAGES/RegisterThrottle.po
+++ b/plugins/RegisterThrottle/locale/uk/LC_MESSAGES/RegisterThrottle.po
@@ -10,31 +10,27 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - RegisterThrottle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:16+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:06+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-22 19:32:40+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-03 17:46:38+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-registerthrottle\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: RegisterThrottlePlugin.php:134
 msgid "Cannot find IP address."
 msgstr "Не вдається знайти IP-адресу."
 
-#: RegisterThrottlePlugin.php:149
 msgid "Too many registrations. Take a break and try again later."
 msgstr "Забагато реєстрацій. Випийте поки що кави і повертайтесь пізніше."
 
-#: RegisterThrottlePlugin.php:161
 msgid "A banned user has registered from this address."
 msgstr "Заблокований користувач був зареєстрований з цієї адреси."
 
-#: RegisterThrottlePlugin.php:220
 msgid "Throttles excessive registration from a single IP address."
 msgstr "Цей додаток обмежує кількість реєстрацій з певної IP-адреси."
diff --git a/plugins/RequireValidatedEmail/locale/RequireValidatedEmail.pot b/plugins/RequireValidatedEmail/locale/RequireValidatedEmail.pot
index 82f2070334..be38192df9 100644
--- a/plugins/RequireValidatedEmail/locale/RequireValidatedEmail.pot
+++ b/plugins/RequireValidatedEmail/locale/RequireValidatedEmail.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/RequireValidatedEmail/locale/de/LC_MESSAGES/RequireValidatedEmail.po b/plugins/RequireValidatedEmail/locale/de/LC_MESSAGES/RequireValidatedEmail.po
index f92c965cc6..a2f9ae49f9 100644
--- a/plugins/RequireValidatedEmail/locale/de/LC_MESSAGES/RequireValidatedEmail.po
+++ b/plugins/RequireValidatedEmail/locale/de/LC_MESSAGES/RequireValidatedEmail.po
@@ -9,26 +9,23 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - RequireValidatedEmail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:51+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:07+0000\n"
 "Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-25 23:45:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:02+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-requirevalidatedemail\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: RequireValidatedEmailPlugin.php:121
 msgid "You must validate your email address before posting."
 msgstr "Du musst deine E-Mail-Adresse validieren, bevor du beitragen kannst."
 
-#: RequireValidatedEmailPlugin.php:141
 msgid "You must provide an email address to register."
 msgstr "Du musst eine E-Mail-Adresse angeben, um dich zu registrieren."
 
-#: RequireValidatedEmailPlugin.php:245
 msgid "Disables posting without a validated email address."
 msgstr "Deaktiviert Posten ohne gültige E-Mail-Adresse."
diff --git a/plugins/RequireValidatedEmail/locale/fr/LC_MESSAGES/RequireValidatedEmail.po b/plugins/RequireValidatedEmail/locale/fr/LC_MESSAGES/RequireValidatedEmail.po
index 75c1d5bd6c..d7ec5d5745 100644
--- a/plugins/RequireValidatedEmail/locale/fr/LC_MESSAGES/RequireValidatedEmail.po
+++ b/plugins/RequireValidatedEmail/locale/fr/LC_MESSAGES/RequireValidatedEmail.po
@@ -9,27 +9,24 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - RequireValidatedEmail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:51+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:07+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-25 23:45:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:02+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-requirevalidatedemail\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: RequireValidatedEmailPlugin.php:121
 msgid "You must validate your email address before posting."
 msgstr "Vous devez valider votre adresse électronique avant de poster."
 
-#: RequireValidatedEmailPlugin.php:141
 msgid "You must provide an email address to register."
 msgstr "Vous devez fournir une adresse électronique avant de vous enregistrer."
 
-#: RequireValidatedEmailPlugin.php:245
 msgid "Disables posting without a validated email address."
 msgstr ""
 "Désactive le postage pour ceux qui n’ont pas d’adresse électronique valide."
diff --git a/plugins/RequireValidatedEmail/locale/ia/LC_MESSAGES/RequireValidatedEmail.po b/plugins/RequireValidatedEmail/locale/ia/LC_MESSAGES/RequireValidatedEmail.po
index a5f9e6aec9..0d055fb6c1 100644
--- a/plugins/RequireValidatedEmail/locale/ia/LC_MESSAGES/RequireValidatedEmail.po
+++ b/plugins/RequireValidatedEmail/locale/ia/LC_MESSAGES/RequireValidatedEmail.po
@@ -9,26 +9,23 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - RequireValidatedEmail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:51+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:07+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-25 23:45:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:02+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-requirevalidatedemail\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: RequireValidatedEmailPlugin.php:121
 msgid "You must validate your email address before posting."
 msgstr "Tu debe validar tu adresse de e-mail ante de publicar."
 
-#: RequireValidatedEmailPlugin.php:141
 msgid "You must provide an email address to register."
 msgstr "Tu debe fornir un adresse de e-mail pro poter crear un conto."
 
-#: RequireValidatedEmailPlugin.php:245
 msgid "Disables posting without a validated email address."
 msgstr "Disactiva le publication de messages sin adresse de e-mail validate."
diff --git a/plugins/RequireValidatedEmail/locale/mk/LC_MESSAGES/RequireValidatedEmail.po b/plugins/RequireValidatedEmail/locale/mk/LC_MESSAGES/RequireValidatedEmail.po
index b55a7520c3..ddbde7627f 100644
--- a/plugins/RequireValidatedEmail/locale/mk/LC_MESSAGES/RequireValidatedEmail.po
+++ b/plugins/RequireValidatedEmail/locale/mk/LC_MESSAGES/RequireValidatedEmail.po
@@ -9,28 +9,25 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - RequireValidatedEmail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:51+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:07+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-25 23:45:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:02+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-requirevalidatedemail\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
 
-#: RequireValidatedEmailPlugin.php:121
 msgid "You must validate your email address before posting."
 msgstr ""
 "Пред да почнете да објавувате ќе мора да ја потврдите Вашата е-поштенска "
 "адреса."
 
-#: RequireValidatedEmailPlugin.php:141
 msgid "You must provide an email address to register."
 msgstr "За да се регистрирате, ќе мора да наведете е-поштенска адреса."
 
-#: RequireValidatedEmailPlugin.php:245
 msgid "Disables posting without a validated email address."
 msgstr "Оневозможува објавување без потврдена е-пошта."
diff --git a/plugins/RequireValidatedEmail/locale/nl/LC_MESSAGES/RequireValidatedEmail.po b/plugins/RequireValidatedEmail/locale/nl/LC_MESSAGES/RequireValidatedEmail.po
index 64c055389f..cfeb04dfed 100644
--- a/plugins/RequireValidatedEmail/locale/nl/LC_MESSAGES/RequireValidatedEmail.po
+++ b/plugins/RequireValidatedEmail/locale/nl/LC_MESSAGES/RequireValidatedEmail.po
@@ -9,26 +9,23 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - RequireValidatedEmail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:51+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:07+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-25 23:45:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:02+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-requirevalidatedemail\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: RequireValidatedEmailPlugin.php:121
 msgid "You must validate your email address before posting."
 msgstr "U moet uw e-mailadres bevestigen voordat u berichten kunt plaatsen."
 
-#: RequireValidatedEmailPlugin.php:141
 msgid "You must provide an email address to register."
 msgstr "U moet een e-mailadres opgeven om te kunnen registreren."
 
-#: RequireValidatedEmailPlugin.php:245
 msgid "Disables posting without a validated email address."
 msgstr "Schakelt berichten plaatsen zonder gevalideerd e-mailadres uit."
diff --git a/plugins/RequireValidatedEmail/locale/tl/LC_MESSAGES/RequireValidatedEmail.po b/plugins/RequireValidatedEmail/locale/tl/LC_MESSAGES/RequireValidatedEmail.po
index 3639efe2bc..183731d033 100644
--- a/plugins/RequireValidatedEmail/locale/tl/LC_MESSAGES/RequireValidatedEmail.po
+++ b/plugins/RequireValidatedEmail/locale/tl/LC_MESSAGES/RequireValidatedEmail.po
@@ -9,26 +9,23 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - RequireValidatedEmail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:51+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:07+0000\n"
 "Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-25 23:45:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:02+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-requirevalidatedemail\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: RequireValidatedEmailPlugin.php:121
 msgid "You must validate your email address before posting."
 msgstr "Kailangan patunayan mo ang iyong tirahan ng e-liham bago magpaskil."
 
-#: RequireValidatedEmailPlugin.php:141
 msgid "You must provide an email address to register."
 msgstr "Dapat kang magbigay ng isang tirahan ng e-liham upang makapagpatala."
 
-#: RequireValidatedEmailPlugin.php:245
 msgid "Disables posting without a validated email address."
 msgstr ""
diff --git a/plugins/RequireValidatedEmail/locale/uk/LC_MESSAGES/RequireValidatedEmail.po b/plugins/RequireValidatedEmail/locale/uk/LC_MESSAGES/RequireValidatedEmail.po
index bba5ef7932..5458918b3b 100644
--- a/plugins/RequireValidatedEmail/locale/uk/LC_MESSAGES/RequireValidatedEmail.po
+++ b/plugins/RequireValidatedEmail/locale/uk/LC_MESSAGES/RequireValidatedEmail.po
@@ -9,30 +9,27 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - RequireValidatedEmail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:51+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:07+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-25 23:45:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:02+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-requirevalidatedemail\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: RequireValidatedEmailPlugin.php:121
 msgid "You must validate your email address before posting."
 msgstr ""
 "Ви повинні підтвердити свою адресу електронної пошти до того, як почнете "
 "надсилати дописи поштою."
 
-#: RequireValidatedEmailPlugin.php:141
 msgid "You must provide an email address to register."
 msgstr "Ви повинні зазначити свою адресу електронної пошти для реєстрації."
 
-#: RequireValidatedEmailPlugin.php:245
 msgid "Disables posting without a validated email address."
 msgstr ""
 "Забороняє надсилання дописів, якщо користувач не має підтвердженої "
diff --git a/plugins/ReverseUsernameAuthentication/locale/ReverseUsernameAuthentication.pot b/plugins/ReverseUsernameAuthentication/locale/ReverseUsernameAuthentication.pot
index b242fcbc72..7bcbe8ba50 100644
--- a/plugins/ReverseUsernameAuthentication/locale/ReverseUsernameAuthentication.pot
+++ b/plugins/ReverseUsernameAuthentication/locale/ReverseUsernameAuthentication.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/ReverseUsernameAuthentication/locale/de/LC_MESSAGES/ReverseUsernameAuthentication.po b/plugins/ReverseUsernameAuthentication/locale/de/LC_MESSAGES/ReverseUsernameAuthentication.po
index 42dfe1bc9f..1405327cd8 100644
--- a/plugins/ReverseUsernameAuthentication/locale/de/LC_MESSAGES/ReverseUsernameAuthentication.po
+++ b/plugins/ReverseUsernameAuthentication/locale/de/LC_MESSAGES/ReverseUsernameAuthentication.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ReverseUsernameAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:51+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:07+0000\n"
 "Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-14 17:22:02+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:05+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-reverseusernameauthentication\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ReverseUsernameAuthenticationPlugin.php:67
 msgid ""
 "The Reverse Username Authentication plugin allows for StatusNet to handle "
 "authentication by checking if the provided password is the same as the "
diff --git a/plugins/ReverseUsernameAuthentication/locale/fr/LC_MESSAGES/ReverseUsernameAuthentication.po b/plugins/ReverseUsernameAuthentication/locale/fr/LC_MESSAGES/ReverseUsernameAuthentication.po
index b381cfaf01..cf116e3d7e 100644
--- a/plugins/ReverseUsernameAuthentication/locale/fr/LC_MESSAGES/ReverseUsernameAuthentication.po
+++ b/plugins/ReverseUsernameAuthentication/locale/fr/LC_MESSAGES/ReverseUsernameAuthentication.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ReverseUsernameAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:51+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:07+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-14 17:22:02+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:05+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-reverseusernameauthentication\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ReverseUsernameAuthenticationPlugin.php:67
 msgid ""
 "The Reverse Username Authentication plugin allows for StatusNet to handle "
 "authentication by checking if the provided password is the same as the "
diff --git a/plugins/ReverseUsernameAuthentication/locale/he/LC_MESSAGES/ReverseUsernameAuthentication.po b/plugins/ReverseUsernameAuthentication/locale/he/LC_MESSAGES/ReverseUsernameAuthentication.po
index 070d21c078..205e00b146 100644
--- a/plugins/ReverseUsernameAuthentication/locale/he/LC_MESSAGES/ReverseUsernameAuthentication.po
+++ b/plugins/ReverseUsernameAuthentication/locale/he/LC_MESSAGES/ReverseUsernameAuthentication.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ReverseUsernameAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:51+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:07+0000\n"
 "Language-Team: Hebrew <http://translatewiki.net/wiki/Portal:he>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-14 17:22:02+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:05+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-plugin-reverseusernameauthentication\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ReverseUsernameAuthenticationPlugin.php:67
 msgid ""
 "The Reverse Username Authentication plugin allows for StatusNet to handle "
 "authentication by checking if the provided password is the same as the "
diff --git a/plugins/ReverseUsernameAuthentication/locale/ia/LC_MESSAGES/ReverseUsernameAuthentication.po b/plugins/ReverseUsernameAuthentication/locale/ia/LC_MESSAGES/ReverseUsernameAuthentication.po
index 6dfde61a0e..410d72b3d5 100644
--- a/plugins/ReverseUsernameAuthentication/locale/ia/LC_MESSAGES/ReverseUsernameAuthentication.po
+++ b/plugins/ReverseUsernameAuthentication/locale/ia/LC_MESSAGES/ReverseUsernameAuthentication.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ReverseUsernameAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:51+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:07+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-14 17:22:02+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:05+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-reverseusernameauthentication\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ReverseUsernameAuthenticationPlugin.php:67
 msgid ""
 "The Reverse Username Authentication plugin allows for StatusNet to handle "
 "authentication by checking if the provided password is the same as the "
diff --git a/plugins/ReverseUsernameAuthentication/locale/id/LC_MESSAGES/ReverseUsernameAuthentication.po b/plugins/ReverseUsernameAuthentication/locale/id/LC_MESSAGES/ReverseUsernameAuthentication.po
index de4ca247c3..54ae4f7720 100644
--- a/plugins/ReverseUsernameAuthentication/locale/id/LC_MESSAGES/ReverseUsernameAuthentication.po
+++ b/plugins/ReverseUsernameAuthentication/locale/id/LC_MESSAGES/ReverseUsernameAuthentication.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ReverseUsernameAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:51+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:07+0000\n"
 "Language-Team: Indonesian <http://translatewiki.net/wiki/Portal:id>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-14 17:22:02+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:05+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: id\n"
 "X-Message-Group: #out-statusnet-plugin-reverseusernameauthentication\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ReverseUsernameAuthenticationPlugin.php:67
 msgid ""
 "The Reverse Username Authentication plugin allows for StatusNet to handle "
 "authentication by checking if the provided password is the same as the "
diff --git a/plugins/ReverseUsernameAuthentication/locale/ja/LC_MESSAGES/ReverseUsernameAuthentication.po b/plugins/ReverseUsernameAuthentication/locale/ja/LC_MESSAGES/ReverseUsernameAuthentication.po
index e1e9211d43..d407dc2d24 100644
--- a/plugins/ReverseUsernameAuthentication/locale/ja/LC_MESSAGES/ReverseUsernameAuthentication.po
+++ b/plugins/ReverseUsernameAuthentication/locale/ja/LC_MESSAGES/ReverseUsernameAuthentication.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ReverseUsernameAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:51+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:07+0000\n"
 "Language-Team: Japanese <http://translatewiki.net/wiki/Portal:ja>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-14 17:22:02+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:05+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ja\n"
 "X-Message-Group: #out-statusnet-plugin-reverseusernameauthentication\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ReverseUsernameAuthenticationPlugin.php:67
 msgid ""
 "The Reverse Username Authentication plugin allows for StatusNet to handle "
 "authentication by checking if the provided password is the same as the "
diff --git a/plugins/ReverseUsernameAuthentication/locale/mk/LC_MESSAGES/ReverseUsernameAuthentication.po b/plugins/ReverseUsernameAuthentication/locale/mk/LC_MESSAGES/ReverseUsernameAuthentication.po
index 36eda184e4..bcd9695cdd 100644
--- a/plugins/ReverseUsernameAuthentication/locale/mk/LC_MESSAGES/ReverseUsernameAuthentication.po
+++ b/plugins/ReverseUsernameAuthentication/locale/mk/LC_MESSAGES/ReverseUsernameAuthentication.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ReverseUsernameAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:51+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:07+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-14 17:22:02+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:05+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-reverseusernameauthentication\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
 
-#: ReverseUsernameAuthenticationPlugin.php:67
 msgid ""
 "The Reverse Username Authentication plugin allows for StatusNet to handle "
 "authentication by checking if the provided password is the same as the "
diff --git a/plugins/ReverseUsernameAuthentication/locale/nb/LC_MESSAGES/ReverseUsernameAuthentication.po b/plugins/ReverseUsernameAuthentication/locale/nb/LC_MESSAGES/ReverseUsernameAuthentication.po
index a3918398ab..799f4fc84b 100644
--- a/plugins/ReverseUsernameAuthentication/locale/nb/LC_MESSAGES/ReverseUsernameAuthentication.po
+++ b/plugins/ReverseUsernameAuthentication/locale/nb/LC_MESSAGES/ReverseUsernameAuthentication.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ReverseUsernameAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:51+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:07+0000\n"
 "Language-Team: Norwegian (bokmål)‬ <http://translatewiki.net/wiki/Portal:no>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-14 17:22:02+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:05+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: #out-statusnet-plugin-reverseusernameauthentication\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ReverseUsernameAuthenticationPlugin.php:67
 msgid ""
 "The Reverse Username Authentication plugin allows for StatusNet to handle "
 "authentication by checking if the provided password is the same as the "
diff --git a/plugins/ReverseUsernameAuthentication/locale/nl/LC_MESSAGES/ReverseUsernameAuthentication.po b/plugins/ReverseUsernameAuthentication/locale/nl/LC_MESSAGES/ReverseUsernameAuthentication.po
index 4ff6e99151..bad0094ca2 100644
--- a/plugins/ReverseUsernameAuthentication/locale/nl/LC_MESSAGES/ReverseUsernameAuthentication.po
+++ b/plugins/ReverseUsernameAuthentication/locale/nl/LC_MESSAGES/ReverseUsernameAuthentication.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ReverseUsernameAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:51+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:07+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-14 17:22:02+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:05+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-reverseusernameauthentication\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ReverseUsernameAuthenticationPlugin.php:67
 msgid ""
 "The Reverse Username Authentication plugin allows for StatusNet to handle "
 "authentication by checking if the provided password is the same as the "
diff --git a/plugins/ReverseUsernameAuthentication/locale/ru/LC_MESSAGES/ReverseUsernameAuthentication.po b/plugins/ReverseUsernameAuthentication/locale/ru/LC_MESSAGES/ReverseUsernameAuthentication.po
index ba1547fabd..cf5aa78416 100644
--- a/plugins/ReverseUsernameAuthentication/locale/ru/LC_MESSAGES/ReverseUsernameAuthentication.po
+++ b/plugins/ReverseUsernameAuthentication/locale/ru/LC_MESSAGES/ReverseUsernameAuthentication.po
@@ -9,20 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ReverseUsernameAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:51+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:07+0000\n"
 "Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-14 17:22:02+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:05+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-reverseusernameauthentication\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: ReverseUsernameAuthenticationPlugin.php:67
 msgid ""
 "The Reverse Username Authentication plugin allows for StatusNet to handle "
 "authentication by checking if the provided password is the same as the "
diff --git a/plugins/ReverseUsernameAuthentication/locale/tl/LC_MESSAGES/ReverseUsernameAuthentication.po b/plugins/ReverseUsernameAuthentication/locale/tl/LC_MESSAGES/ReverseUsernameAuthentication.po
index f24ce5355f..6651733ee7 100644
--- a/plugins/ReverseUsernameAuthentication/locale/tl/LC_MESSAGES/ReverseUsernameAuthentication.po
+++ b/plugins/ReverseUsernameAuthentication/locale/tl/LC_MESSAGES/ReverseUsernameAuthentication.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ReverseUsernameAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:51+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:07+0000\n"
 "Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-14 17:22:02+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:05+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-reverseusernameauthentication\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ReverseUsernameAuthenticationPlugin.php:67
 msgid ""
 "The Reverse Username Authentication plugin allows for StatusNet to handle "
 "authentication by checking if the provided password is the same as the "
diff --git a/plugins/ReverseUsernameAuthentication/locale/uk/LC_MESSAGES/ReverseUsernameAuthentication.po b/plugins/ReverseUsernameAuthentication/locale/uk/LC_MESSAGES/ReverseUsernameAuthentication.po
index baeb04e5c7..81bf4ec399 100644
--- a/plugins/ReverseUsernameAuthentication/locale/uk/LC_MESSAGES/ReverseUsernameAuthentication.po
+++ b/plugins/ReverseUsernameAuthentication/locale/uk/LC_MESSAGES/ReverseUsernameAuthentication.po
@@ -9,20 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ReverseUsernameAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:51+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:08+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-14 17:22:02+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:05+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-reverseusernameauthentication\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: ReverseUsernameAuthenticationPlugin.php:67
 msgid ""
 "The Reverse Username Authentication plugin allows for StatusNet to handle "
 "authentication by checking if the provided password is the same as the "
diff --git a/plugins/SQLProfile/locale/SQLProfile.pot b/plugins/SQLProfile/locale/SQLProfile.pot
index 1548a38ebd..5922ba4ef6 100644
--- a/plugins/SQLProfile/locale/SQLProfile.pot
+++ b/plugins/SQLProfile/locale/SQLProfile.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/SQLProfile/locale/de/LC_MESSAGES/SQLProfile.po b/plugins/SQLProfile/locale/de/LC_MESSAGES/SQLProfile.po
index 26bbe7c858..d10c3d0efa 100644
--- a/plugins/SQLProfile/locale/de/LC_MESSAGES/SQLProfile.po
+++ b/plugins/SQLProfile/locale/de/LC_MESSAGES/SQLProfile.po
@@ -9,18 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SQLProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:03+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:15+0000\n"
 "Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-14 17:22:10+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:20+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-sqlprofile\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: SQLProfilePlugin.php:41
 msgid "Debug tool to watch for poorly indexed DB queries."
 msgstr "Debug-Werkzeug zur Überwachung von schlecht indexierten DB-Abfragen."
diff --git a/plugins/SQLProfile/locale/fr/LC_MESSAGES/SQLProfile.po b/plugins/SQLProfile/locale/fr/LC_MESSAGES/SQLProfile.po
index b5d35fc1b3..8f7a0e225a 100644
--- a/plugins/SQLProfile/locale/fr/LC_MESSAGES/SQLProfile.po
+++ b/plugins/SQLProfile/locale/fr/LC_MESSAGES/SQLProfile.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SQLProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:03+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:15+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-14 17:22:10+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:20+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-sqlprofile\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: SQLProfilePlugin.php:41
 msgid "Debug tool to watch for poorly indexed DB queries."
 msgstr ""
 "Outil de débogage pour surveiller les requêtes de la base de données mal "
diff --git a/plugins/SQLProfile/locale/ia/LC_MESSAGES/SQLProfile.po b/plugins/SQLProfile/locale/ia/LC_MESSAGES/SQLProfile.po
index 80b96c5998..ee797e1cae 100644
--- a/plugins/SQLProfile/locale/ia/LC_MESSAGES/SQLProfile.po
+++ b/plugins/SQLProfile/locale/ia/LC_MESSAGES/SQLProfile.po
@@ -9,18 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SQLProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:03+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:15+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-14 17:22:10+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:20+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-sqlprofile\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: SQLProfilePlugin.php:41
 msgid "Debug tool to watch for poorly indexed DB queries."
 msgstr "Instrumento pro deteger le consultas mal indexate del base de datos."
diff --git a/plugins/SQLProfile/locale/mk/LC_MESSAGES/SQLProfile.po b/plugins/SQLProfile/locale/mk/LC_MESSAGES/SQLProfile.po
index dc514d16cc..376241af53 100644
--- a/plugins/SQLProfile/locale/mk/LC_MESSAGES/SQLProfile.po
+++ b/plugins/SQLProfile/locale/mk/LC_MESSAGES/SQLProfile.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SQLProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:03+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:15+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-14 17:22:10+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:20+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-sqlprofile\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
 
-#: SQLProfilePlugin.php:41
 msgid "Debug tool to watch for poorly indexed DB queries."
 msgstr ""
 "Алатка за поправање грешки што пронаоѓа лошо индексирани барања до базата на "
diff --git a/plugins/SQLProfile/locale/nl/LC_MESSAGES/SQLProfile.po b/plugins/SQLProfile/locale/nl/LC_MESSAGES/SQLProfile.po
index 57892bd43a..74d80b8c0c 100644
--- a/plugins/SQLProfile/locale/nl/LC_MESSAGES/SQLProfile.po
+++ b/plugins/SQLProfile/locale/nl/LC_MESSAGES/SQLProfile.po
@@ -9,18 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SQLProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:03+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:15+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-14 17:22:10+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:20+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-sqlprofile\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: SQLProfilePlugin.php:41
 msgid "Debug tool to watch for poorly indexed DB queries."
 msgstr "Debughulpmiddel om slecht geïndexeerde databasequery's te ontdekken."
diff --git a/plugins/SQLProfile/locale/pt/LC_MESSAGES/SQLProfile.po b/plugins/SQLProfile/locale/pt/LC_MESSAGES/SQLProfile.po
index 775a2fb8ab..eea9c97cab 100644
--- a/plugins/SQLProfile/locale/pt/LC_MESSAGES/SQLProfile.po
+++ b/plugins/SQLProfile/locale/pt/LC_MESSAGES/SQLProfile.po
@@ -9,18 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SQLProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:03+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:15+0000\n"
 "Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-14 17:22:10+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:20+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-plugin-sqlprofile\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: SQLProfilePlugin.php:41
 msgid "Debug tool to watch for poorly indexed DB queries."
 msgstr "Ferramenta de depuração para vigiar consultas à BD mal indexadas."
diff --git a/plugins/SQLProfile/locale/ru/LC_MESSAGES/SQLProfile.po b/plugins/SQLProfile/locale/ru/LC_MESSAGES/SQLProfile.po
index 443a30a27a..62f94d48d8 100644
--- a/plugins/SQLProfile/locale/ru/LC_MESSAGES/SQLProfile.po
+++ b/plugins/SQLProfile/locale/ru/LC_MESSAGES/SQLProfile.po
@@ -9,20 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SQLProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:04+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:15+0000\n"
 "Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-14 17:22:10+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:20+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-sqlprofile\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: SQLProfilePlugin.php:41
 msgid "Debug tool to watch for poorly indexed DB queries."
 msgstr ""
 "Отладочный инструмент для наблюдения плохо индексированных запросов к БД."
diff --git a/plugins/SQLProfile/locale/uk/LC_MESSAGES/SQLProfile.po b/plugins/SQLProfile/locale/uk/LC_MESSAGES/SQLProfile.po
index 24c004b9b2..1e1368b3aa 100644
--- a/plugins/SQLProfile/locale/uk/LC_MESSAGES/SQLProfile.po
+++ b/plugins/SQLProfile/locale/uk/LC_MESSAGES/SQLProfile.po
@@ -9,20 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SQLProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:04+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:15+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-14 17:22:10+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:20+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-sqlprofile\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: SQLProfilePlugin.php:41
 msgid "Debug tool to watch for poorly indexed DB queries."
 msgstr ""
 "Інструмент правки для спостереження за погано індексованими запитами до бази "
diff --git a/plugins/Sample/locale/Sample.pot b/plugins/Sample/locale/Sample.pot
index d1a4d06887..e1aae216be 100644
--- a/plugins/Sample/locale/Sample.pot
+++ b/plugins/Sample/locale/Sample.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,32 +17,10 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#. TRANS: Exception thrown when the user greeting count could not be saved in the database.
-#. TRANS: %d is a user ID (number).
-#: User_greeting_count.php:164
-#, php-format
-msgid "Could not save new greeting count for %d."
-msgstr ""
-
-#. TRANS: Exception thrown when the user greeting count could not be saved in the database.
-#. TRANS: %d is a user ID (number).
-#: User_greeting_count.php:177
-#, php-format
-msgid "Could not increment greeting count for %d."
-msgstr ""
-
-#: SamplePlugin.php:270 hello.php:111
+#: hello.php:111 SamplePlugin.php:270
 msgid "Hello"
 msgstr ""
 
-#: SamplePlugin.php:270
-msgid "A warm greeting"
-msgstr ""
-
-#: SamplePlugin.php:281
-msgid "A sample plugin to show basics of development for new hackers."
-msgstr ""
-
 #: hello.php:113
 #, php-format
 msgid "Hello, %s!"
@@ -63,3 +41,25 @@ msgid "I have greeted you %d time."
 msgid_plural "I have greeted you %d times."
 msgstr[0] ""
 msgstr[1] ""
+
+#: SamplePlugin.php:270
+msgid "A warm greeting"
+msgstr ""
+
+#: SamplePlugin.php:281
+msgid "A sample plugin to show basics of development for new hackers."
+msgstr ""
+
+#. TRANS: Exception thrown when the user greeting count could not be saved in the database.
+#. TRANS: %d is a user ID (number).
+#: User_greeting_count.php:164
+#, php-format
+msgid "Could not save new greeting count for %d."
+msgstr ""
+
+#. TRANS: Exception thrown when the user greeting count could not be saved in the database.
+#. TRANS: %d is a user ID (number).
+#: User_greeting_count.php:177
+#, php-format
+msgid "Could not increment greeting count for %d."
+msgstr ""
diff --git a/plugins/Sample/locale/br/LC_MESSAGES/Sample.po b/plugins/Sample/locale/br/LC_MESSAGES/Sample.po
index 61b030bfd5..7c816db1d6 100644
--- a/plugins/Sample/locale/br/LC_MESSAGES/Sample.po
+++ b/plugins/Sample/locale/br/LC_MESSAGES/Sample.po
@@ -9,63 +9,54 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Sample\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:53+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:09+0000\n"
 "Language-Team: Breton <http://translatewiki.net/wiki/Portal:br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:28:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:10+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-sample\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+msgid "Hello"
+msgstr "Demat"
+
+#, php-format
+msgid "Hello, %s!"
+msgstr "Demat, %s !"
+
+msgid "Hello, stranger!"
+msgstr "Demat, estrañjour!"
+
+#, php-format
+msgid "Hello, %s"
+msgstr "Demat, %s"
+
+#, php-format
+msgid "I have greeted you %d time."
+msgid_plural "I have greeted you %d times."
+msgstr[0] "ur"
+msgstr[1] "%d"
+
+msgid "A warm greeting"
+msgstr "Un degemer tomm"
+
+msgid "A sample plugin to show basics of development for new hackers."
+msgstr ""
+"Ur skouer a lugant evit diskouez an diazezoù diorren evit ar c'hoderien "
+"nevez."
+
 #. TRANS: Exception thrown when the user greeting count could not be saved in the database.
 #. TRANS: %d is a user ID (number).
-#: User_greeting_count.php:164
 #, php-format
 msgid "Could not save new greeting count for %d."
 msgstr "Dibosupl eo enrollañ ar gont degemer nevez evit an implijer %d."
 
 #. TRANS: Exception thrown when the user greeting count could not be saved in the database.
 #. TRANS: %d is a user ID (number).
-#: User_greeting_count.php:177
 #, php-format
 msgid "Could not increment greeting count for %d."
 msgstr "Dibosupl eo inkremantañ ar gont degemer nevez evit an implijer %d."
-
-#: SamplePlugin.php:270 hello.php:111
-msgid "Hello"
-msgstr "Demat"
-
-#: SamplePlugin.php:270
-msgid "A warm greeting"
-msgstr "Un degemer tomm"
-
-#: SamplePlugin.php:281
-msgid "A sample plugin to show basics of development for new hackers."
-msgstr ""
-"Ur skouer a lugant evit diskouez an diazezoù diorren evit ar c'hoderien "
-"nevez."
-
-#: hello.php:113
-#, php-format
-msgid "Hello, %s!"
-msgstr "Demat, %s !"
-
-#: hello.php:133
-msgid "Hello, stranger!"
-msgstr "Demat, estrañjour!"
-
-#: hello.php:136
-#, php-format
-msgid "Hello, %s"
-msgstr "Demat, %s"
-
-#: hello.php:138
-#, php-format
-msgid "I have greeted you %d time."
-msgid_plural "I have greeted you %d times."
-msgstr[0] "ur"
-msgstr[1] "%d"
diff --git a/plugins/Sample/locale/de/LC_MESSAGES/Sample.po b/plugins/Sample/locale/de/LC_MESSAGES/Sample.po
index fc4e7612c6..f5f5c78afc 100644
--- a/plugins/Sample/locale/de/LC_MESSAGES/Sample.po
+++ b/plugins/Sample/locale/de/LC_MESSAGES/Sample.po
@@ -9,61 +9,52 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Sample\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:53+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:09+0000\n"
 "Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:28:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:10+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-sample\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+msgid "Hello"
+msgstr "Hallo"
+
+#, php-format
+msgid "Hello, %s!"
+msgstr "Hallo %s!"
+
+msgid "Hello, stranger!"
+msgstr "Hallo Fremder!"
+
+#, php-format
+msgid "Hello, %s"
+msgstr "Hallo %s"
+
+#, php-format
+msgid "I have greeted you %d time."
+msgid_plural "I have greeted you %d times."
+msgstr[0] "Ich habe dich einmal begrüßt. "
+msgstr[1] "Ich habe dich %d-mal begrüßt. "
+
+msgid "A warm greeting"
+msgstr "Ein herzlicher Gruß"
+
+msgid "A sample plugin to show basics of development for new hackers."
+msgstr "Ein Beispiel-Plugin, um die Entwicklungsbasis neuen Hackern zu zeigen."
+
 #. TRANS: Exception thrown when the user greeting count could not be saved in the database.
 #. TRANS: %d is a user ID (number).
-#: User_greeting_count.php:164
 #, php-format
 msgid "Could not save new greeting count for %d."
 msgstr "Konnte neuen Grüßungszähler von %d nicht speichern."
 
 #. TRANS: Exception thrown when the user greeting count could not be saved in the database.
 #. TRANS: %d is a user ID (number).
-#: User_greeting_count.php:177
 #, php-format
 msgid "Could not increment greeting count for %d."
 msgstr "Konnte Grüßungszähler von %d nicht erhöhen."
-
-#: SamplePlugin.php:270 hello.php:111
-msgid "Hello"
-msgstr "Hallo"
-
-#: SamplePlugin.php:270
-msgid "A warm greeting"
-msgstr "Ein herzlicher Gruß"
-
-#: SamplePlugin.php:281
-msgid "A sample plugin to show basics of development for new hackers."
-msgstr "Ein Beispiel-Plugin, um die Entwicklungsbasis neuen Hackern zu zeigen."
-
-#: hello.php:113
-#, php-format
-msgid "Hello, %s!"
-msgstr "Hallo %s!"
-
-#: hello.php:133
-msgid "Hello, stranger!"
-msgstr "Hallo Fremder!"
-
-#: hello.php:136
-#, php-format
-msgid "Hello, %s"
-msgstr "Hallo %s"
-
-#: hello.php:138
-#, php-format
-msgid "I have greeted you %d time."
-msgid_plural "I have greeted you %d times."
-msgstr[0] "Ich habe dich einmal begrüßt. "
-msgstr[1] "Ich habe dich %d-mal begrüßt. "
diff --git a/plugins/Sample/locale/fr/LC_MESSAGES/Sample.po b/plugins/Sample/locale/fr/LC_MESSAGES/Sample.po
index 174910f779..1e32afa55c 100644
--- a/plugins/Sample/locale/fr/LC_MESSAGES/Sample.po
+++ b/plugins/Sample/locale/fr/LC_MESSAGES/Sample.po
@@ -9,21 +9,48 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Sample\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:53+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:10+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:28:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:10+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-sample\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+msgid "Hello"
+msgstr "Bonjour"
+
+#, php-format
+msgid "Hello, %s!"
+msgstr "Bonjour, %s !"
+
+msgid "Hello, stranger!"
+msgstr "Bonjour, étranger !"
+
+#, php-format
+msgid "Hello, %s"
+msgstr "Bonjour, %s"
+
+#, php-format
+msgid "I have greeted you %d time."
+msgid_plural "I have greeted you %d times."
+msgstr[0] "une"
+msgstr[1] "%d"
+
+msgid "A warm greeting"
+msgstr "Un accueil chaleureux"
+
+msgid "A sample plugin to show basics of development for new hackers."
+msgstr ""
+"Un exemple de greffon pour montrer les bases de développement pour les "
+"nouveaux codeurs."
+
 #. TRANS: Exception thrown when the user greeting count could not be saved in the database.
 #. TRANS: %d is a user ID (number).
-#: User_greeting_count.php:164
 #, php-format
 msgid "Could not save new greeting count for %d."
 msgstr ""
@@ -31,42 +58,6 @@ msgstr ""
 
 #. TRANS: Exception thrown when the user greeting count could not be saved in the database.
 #. TRANS: %d is a user ID (number).
-#: User_greeting_count.php:177
 #, php-format
 msgid "Could not increment greeting count for %d."
 msgstr "Impossible d’incrémenter le compte de vœux pour l’utilisateur %d."
-
-#: SamplePlugin.php:270 hello.php:111
-msgid "Hello"
-msgstr "Bonjour"
-
-#: SamplePlugin.php:270
-msgid "A warm greeting"
-msgstr "Un accueil chaleureux"
-
-#: SamplePlugin.php:281
-msgid "A sample plugin to show basics of development for new hackers."
-msgstr ""
-"Un exemple de greffon pour montrer les bases de développement pour les "
-"nouveaux codeurs."
-
-#: hello.php:113
-#, php-format
-msgid "Hello, %s!"
-msgstr "Bonjour, %s !"
-
-#: hello.php:133
-msgid "Hello, stranger!"
-msgstr "Bonjour, étranger !"
-
-#: hello.php:136
-#, php-format
-msgid "Hello, %s"
-msgstr "Bonjour, %s"
-
-#: hello.php:138
-#, php-format
-msgid "I have greeted you %d time."
-msgid_plural "I have greeted you %d times."
-msgstr[0] "une"
-msgstr[1] "%d"
diff --git a/plugins/Sample/locale/ia/LC_MESSAGES/Sample.po b/plugins/Sample/locale/ia/LC_MESSAGES/Sample.po
index ed716a4122..110c5b5490 100644
--- a/plugins/Sample/locale/ia/LC_MESSAGES/Sample.po
+++ b/plugins/Sample/locale/ia/LC_MESSAGES/Sample.po
@@ -9,63 +9,54 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Sample\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:53+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:10+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:28:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:10+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-sample\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+msgid "Hello"
+msgstr "Salute"
+
+#, php-format
+msgid "Hello, %s!"
+msgstr "Salute %s!"
+
+msgid "Hello, stranger!"
+msgstr "Salute estraniero!"
+
+#, php-format
+msgid "Hello, %s"
+msgstr "Salute %s"
+
+#, php-format
+msgid "I have greeted you %d time."
+msgid_plural "I have greeted you %d times."
+msgstr[0] "Io te ha salutate %d vice."
+msgstr[1] "Io te ha salutate %d vices."
+
+msgid "A warm greeting"
+msgstr "Un calide salutation"
+
+msgid "A sample plugin to show basics of development for new hackers."
+msgstr ""
+"Un plug-in de exemplo pro demonstrar le principios de disveloppamento pro "
+"nove programmatores."
+
 #. TRANS: Exception thrown when the user greeting count could not be saved in the database.
 #. TRANS: %d is a user ID (number).
-#: User_greeting_count.php:164
 #, php-format
 msgid "Could not save new greeting count for %d."
 msgstr "Non poteva salveguardar le numero de nove salutationes pro %d."
 
 #. TRANS: Exception thrown when the user greeting count could not be saved in the database.
 #. TRANS: %d is a user ID (number).
-#: User_greeting_count.php:177
 #, php-format
 msgid "Could not increment greeting count for %d."
 msgstr "Non poteva incrementar le numero de salutationes pro %d."
-
-#: SamplePlugin.php:270 hello.php:111
-msgid "Hello"
-msgstr "Salute"
-
-#: SamplePlugin.php:270
-msgid "A warm greeting"
-msgstr "Un calide salutation"
-
-#: SamplePlugin.php:281
-msgid "A sample plugin to show basics of development for new hackers."
-msgstr ""
-"Un plug-in de exemplo pro demonstrar le principios de disveloppamento pro "
-"nove programmatores."
-
-#: hello.php:113
-#, php-format
-msgid "Hello, %s!"
-msgstr "Salute %s!"
-
-#: hello.php:133
-msgid "Hello, stranger!"
-msgstr "Salute estraniero!"
-
-#: hello.php:136
-#, php-format
-msgid "Hello, %s"
-msgstr "Salute %s"
-
-#: hello.php:138
-#, php-format
-msgid "I have greeted you %d time."
-msgid_plural "I have greeted you %d times."
-msgstr[0] "Io te ha salutate %d vice."
-msgstr[1] "Io te ha salutate %d vices."
diff --git a/plugins/Sample/locale/lb/LC_MESSAGES/Sample.po b/plugins/Sample/locale/lb/LC_MESSAGES/Sample.po
index 8fe949a127..f82812568a 100644
--- a/plugins/Sample/locale/lb/LC_MESSAGES/Sample.po
+++ b/plugins/Sample/locale/lb/LC_MESSAGES/Sample.po
@@ -9,61 +9,52 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Sample\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:53+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:10+0000\n"
 "Language-Team: Luxembourgish <http://translatewiki.net/wiki/Portal:lb>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:28:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:10+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: lb\n"
 "X-Message-Group: #out-statusnet-plugin-sample\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+msgid "Hello"
+msgstr "Salut"
+
+#, php-format
+msgid "Hello, %s!"
+msgstr "Salut %s!"
+
+msgid "Hello, stranger!"
+msgstr ""
+
+#, php-format
+msgid "Hello, %s"
+msgstr "Salut, %s"
+
+#, php-format
+msgid "I have greeted you %d time."
+msgid_plural "I have greeted you %d times."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "A warm greeting"
+msgstr "E schéine Bonjour"
+
+msgid "A sample plugin to show basics of development for new hackers."
+msgstr ""
+
 #. TRANS: Exception thrown when the user greeting count could not be saved in the database.
 #. TRANS: %d is a user ID (number).
-#: User_greeting_count.php:164
 #, php-format
 msgid "Could not save new greeting count for %d."
 msgstr ""
 
 #. TRANS: Exception thrown when the user greeting count could not be saved in the database.
 #. TRANS: %d is a user ID (number).
-#: User_greeting_count.php:177
 #, php-format
 msgid "Could not increment greeting count for %d."
 msgstr ""
-
-#: SamplePlugin.php:270 hello.php:111
-msgid "Hello"
-msgstr "Salut"
-
-#: SamplePlugin.php:270
-msgid "A warm greeting"
-msgstr "E schéine Bonjour"
-
-#: SamplePlugin.php:281
-msgid "A sample plugin to show basics of development for new hackers."
-msgstr ""
-
-#: hello.php:113
-#, php-format
-msgid "Hello, %s!"
-msgstr "Salut %s!"
-
-#: hello.php:133
-msgid "Hello, stranger!"
-msgstr ""
-
-#: hello.php:136
-#, php-format
-msgid "Hello, %s"
-msgstr "Salut, %s"
-
-#: hello.php:138
-#, php-format
-msgid "I have greeted you %d time."
-msgid_plural "I have greeted you %d times."
-msgstr[0] ""
-msgstr[1] ""
diff --git a/plugins/Sample/locale/mk/LC_MESSAGES/Sample.po b/plugins/Sample/locale/mk/LC_MESSAGES/Sample.po
index 4d43e23db1..1414239daa 100644
--- a/plugins/Sample/locale/mk/LC_MESSAGES/Sample.po
+++ b/plugins/Sample/locale/mk/LC_MESSAGES/Sample.po
@@ -9,62 +9,53 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Sample\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:53+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:10+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:28:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:10+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-sample\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
 
+msgid "Hello"
+msgstr "Здраво"
+
+#, php-format
+msgid "Hello, %s!"
+msgstr "Здраво, %s!"
+
+msgid "Hello, stranger!"
+msgstr "Здрво, незнајнику!"
+
+#, php-format
+msgid "Hello, %s"
+msgstr "Здраво, %s"
+
+#, php-format
+msgid "I have greeted you %d time."
+msgid_plural "I have greeted you %d times."
+msgstr[0] "Ве поздравив еднаш."
+msgstr[1] "Ве поздравив %d пати."
+
+msgid "A warm greeting"
+msgstr "Срдечен поздрав"
+
+msgid "A sample plugin to show basics of development for new hackers."
+msgstr ""
+"Приклучок-пример за основите на развојното програмирање за нови хакери."
+
 #. TRANS: Exception thrown when the user greeting count could not be saved in the database.
 #. TRANS: %d is a user ID (number).
-#: User_greeting_count.php:164
 #, php-format
 msgid "Could not save new greeting count for %d."
 msgstr "Не можев да го зачувам бројот на поздрави за %d."
 
 #. TRANS: Exception thrown when the user greeting count could not be saved in the database.
 #. TRANS: %d is a user ID (number).
-#: User_greeting_count.php:177
 #, php-format
 msgid "Could not increment greeting count for %d."
 msgstr "Не можев да го дополнам бројот на поздрави за %d."
-
-#: SamplePlugin.php:270 hello.php:111
-msgid "Hello"
-msgstr "Здраво"
-
-#: SamplePlugin.php:270
-msgid "A warm greeting"
-msgstr "Срдечен поздрав"
-
-#: SamplePlugin.php:281
-msgid "A sample plugin to show basics of development for new hackers."
-msgstr ""
-"Приклучок-пример за основите на развојното програмирање за нови хакери."
-
-#: hello.php:113
-#, php-format
-msgid "Hello, %s!"
-msgstr "Здраво, %s!"
-
-#: hello.php:133
-msgid "Hello, stranger!"
-msgstr "Здрво, незнајнику!"
-
-#: hello.php:136
-#, php-format
-msgid "Hello, %s"
-msgstr "Здраво, %s"
-
-#: hello.php:138
-#, php-format
-msgid "I have greeted you %d time."
-msgid_plural "I have greeted you %d times."
-msgstr[0] "Ве поздравив еднаш."
-msgstr[1] "Ве поздравив %d пати."
diff --git a/plugins/Sample/locale/nl/LC_MESSAGES/Sample.po b/plugins/Sample/locale/nl/LC_MESSAGES/Sample.po
index d0da1a36a5..c41a6c88dc 100644
--- a/plugins/Sample/locale/nl/LC_MESSAGES/Sample.po
+++ b/plugins/Sample/locale/nl/LC_MESSAGES/Sample.po
@@ -9,62 +9,53 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Sample\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:53+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:10+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:28:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:10+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-sample\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+msgid "Hello"
+msgstr "Hallo"
+
+#, php-format
+msgid "Hello, %s!"
+msgstr "Hallo, %s!"
+
+msgid "Hello, stranger!"
+msgstr "Hallo vreemdeling!"
+
+#, php-format
+msgid "Hello, %s"
+msgstr "Hallo, %s"
+
+#, php-format
+msgid "I have greeted you %d time."
+msgid_plural "I have greeted you %d times."
+msgstr[0] "Ik heb u voor de eerste keer gegroet."
+msgstr[1] "Ik heb u %d keer gegroet."
+
+msgid "A warm greeting"
+msgstr "Een warme begroeting"
+
+msgid "A sample plugin to show basics of development for new hackers."
+msgstr ""
+"Een voorbeeldplug-in als basis voor ontwikkelingen door nieuwe hackers."
+
 #. TRANS: Exception thrown when the user greeting count could not be saved in the database.
 #. TRANS: %d is a user ID (number).
-#: User_greeting_count.php:164
 #, php-format
 msgid "Could not save new greeting count for %d."
 msgstr "Het was niet mogelijk het aantal begroetingen op te slaan voor %d."
 
 #. TRANS: Exception thrown when the user greeting count could not be saved in the database.
 #. TRANS: %d is a user ID (number).
-#: User_greeting_count.php:177
 #, php-format
 msgid "Could not increment greeting count for %d."
 msgstr "Het was niet mogelijk het aantal begroetingen op te hogen voor %d."
-
-#: SamplePlugin.php:270 hello.php:111
-msgid "Hello"
-msgstr "Hallo"
-
-#: SamplePlugin.php:270
-msgid "A warm greeting"
-msgstr "Een warme begroeting"
-
-#: SamplePlugin.php:281
-msgid "A sample plugin to show basics of development for new hackers."
-msgstr ""
-"Een voorbeeldplug-in als basis voor ontwikkelingen door nieuwe hackers."
-
-#: hello.php:113
-#, php-format
-msgid "Hello, %s!"
-msgstr "Hallo, %s!"
-
-#: hello.php:133
-msgid "Hello, stranger!"
-msgstr "Hallo vreemdeling!"
-
-#: hello.php:136
-#, php-format
-msgid "Hello, %s"
-msgstr "Hallo, %s"
-
-#: hello.php:138
-#, php-format
-msgid "I have greeted you %d time."
-msgid_plural "I have greeted you %d times."
-msgstr[0] "Ik heb u voor de eerste keer gegroet."
-msgstr[1] "Ik heb u %d keer gegroet."
diff --git a/plugins/Sample/locale/ru/LC_MESSAGES/Sample.po b/plugins/Sample/locale/ru/LC_MESSAGES/Sample.po
index cecf620f0c..b2bb01e3f3 100644
--- a/plugins/Sample/locale/ru/LC_MESSAGES/Sample.po
+++ b/plugins/Sample/locale/ru/LC_MESSAGES/Sample.po
@@ -10,63 +10,54 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Sample\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:53+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:10+0000\n"
 "Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:28:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:10+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-sample\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#. TRANS: Exception thrown when the user greeting count could not be saved in the database.
-#. TRANS: %d is a user ID (number).
-#: User_greeting_count.php:164
-#, php-format
-msgid "Could not save new greeting count for %d."
-msgstr "Не удалось сохранить новое приветствие для %d."
-
-#. TRANS: Exception thrown when the user greeting count could not be saved in the database.
-#. TRANS: %d is a user ID (number).
-#: User_greeting_count.php:177
-#, php-format
-msgid "Could not increment greeting count for %d."
-msgstr ""
-
-#: SamplePlugin.php:270 hello.php:111
 msgid "Hello"
 msgstr "Привет"
 
-#: SamplePlugin.php:270
-msgid "A warm greeting"
-msgstr ""
-
-#: SamplePlugin.php:281
-msgid "A sample plugin to show basics of development for new hackers."
-msgstr ""
-
-#: hello.php:113
 #, php-format
 msgid "Hello, %s!"
 msgstr "Здравствуйте, %s!"
 
-#: hello.php:133
 msgid "Hello, stranger!"
 msgstr "Привет, незнакомец!"
 
-#: hello.php:136
 #, php-format
 msgid "Hello, %s"
 msgstr "Здравствуйте,%s"
 
-#: hello.php:138
 #, php-format
 msgid "I have greeted you %d time."
 msgid_plural "I have greeted you %d times."
 msgstr[0] "Я вас попривестствовал %d раз."
 msgstr[1] "Я вас поприветствовал %d раза."
 msgstr[2] "Я вас попривестствовал %d раз."
+
+msgid "A warm greeting"
+msgstr ""
+
+msgid "A sample plugin to show basics of development for new hackers."
+msgstr ""
+
+#. TRANS: Exception thrown when the user greeting count could not be saved in the database.
+#. TRANS: %d is a user ID (number).
+#, php-format
+msgid "Could not save new greeting count for %d."
+msgstr "Не удалось сохранить новое приветствие для %d."
+
+#. TRANS: Exception thrown when the user greeting count could not be saved in the database.
+#. TRANS: %d is a user ID (number).
+#, php-format
+msgid "Could not increment greeting count for %d."
+msgstr ""
diff --git a/plugins/Sample/locale/tl/LC_MESSAGES/Sample.po b/plugins/Sample/locale/tl/LC_MESSAGES/Sample.po
index 5bb224ac76..ea5726cab9 100644
--- a/plugins/Sample/locale/tl/LC_MESSAGES/Sample.po
+++ b/plugins/Sample/locale/tl/LC_MESSAGES/Sample.po
@@ -9,63 +9,54 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Sample\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:53+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:10+0000\n"
 "Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:28:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:10+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-sample\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+msgid "Hello"
+msgstr "Kumusta"
+
+#, php-format
+msgid "Hello, %s!"
+msgstr "Kumusta, %s!"
+
+msgid "Hello, stranger!"
+msgstr "Kumusta, dayuhan!"
+
+#, php-format
+msgid "Hello, %s"
+msgstr "Kumusta, %s"
+
+#, php-format
+msgid "I have greeted you %d time."
+msgid_plural "I have greeted you %d times."
+msgstr[0] "Binati kita ng %d ulit."
+msgstr[1] "Binati kita ng %d mga ulit."
+
+msgid "A warm greeting"
+msgstr "Isang mainit-init na pagbati"
+
+msgid "A sample plugin to show basics of development for new hackers."
+msgstr ""
+"Isang halimbawang pampasak upang ipakita ang mga saligan ng kaunlaran para "
+"sa bagong mga mangunguha."
+
 #. TRANS: Exception thrown when the user greeting count could not be saved in the database.
 #. TRANS: %d is a user ID (number).
-#: User_greeting_count.php:164
 #, php-format
 msgid "Could not save new greeting count for %d."
 msgstr "Hindi masagip ang bagong bilang ng pagbati para sa %d."
 
 #. TRANS: Exception thrown when the user greeting count could not be saved in the database.
 #. TRANS: %d is a user ID (number).
-#: User_greeting_count.php:177
 #, php-format
 msgid "Could not increment greeting count for %d."
 msgstr "Hindi masudlungan ang bilang ng pagbati para sa %d."
-
-#: SamplePlugin.php:270 hello.php:111
-msgid "Hello"
-msgstr "Kumusta"
-
-#: SamplePlugin.php:270
-msgid "A warm greeting"
-msgstr "Isang mainit-init na pagbati"
-
-#: SamplePlugin.php:281
-msgid "A sample plugin to show basics of development for new hackers."
-msgstr ""
-"Isang halimbawang pampasak upang ipakita ang mga saligan ng kaunlaran para "
-"sa bagong mga mangunguha."
-
-#: hello.php:113
-#, php-format
-msgid "Hello, %s!"
-msgstr "Kumusta, %s!"
-
-#: hello.php:133
-msgid "Hello, stranger!"
-msgstr "Kumusta, dayuhan!"
-
-#: hello.php:136
-#, php-format
-msgid "Hello, %s"
-msgstr "Kumusta, %s"
-
-#: hello.php:138
-#, php-format
-msgid "I have greeted you %d time."
-msgid_plural "I have greeted you %d times."
-msgstr[0] "Binati kita ng %d ulit."
-msgstr[1] "Binati kita ng %d mga ulit."
diff --git a/plugins/Sample/locale/uk/LC_MESSAGES/Sample.po b/plugins/Sample/locale/uk/LC_MESSAGES/Sample.po
index a1209c8b62..4a082a6a48 100644
--- a/plugins/Sample/locale/uk/LC_MESSAGES/Sample.po
+++ b/plugins/Sample/locale/uk/LC_MESSAGES/Sample.po
@@ -9,63 +9,54 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Sample\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:53+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:10+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:28:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:10+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-sample\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#. TRANS: Exception thrown when the user greeting count could not be saved in the database.
-#. TRANS: %d is a user ID (number).
-#: User_greeting_count.php:164
-#, php-format
-msgid "Could not save new greeting count for %d."
-msgstr "Не вдалося зберегти новий лічильник привітань для %d."
-
-#. TRANS: Exception thrown when the user greeting count could not be saved in the database.
-#. TRANS: %d is a user ID (number).
-#: User_greeting_count.php:177
-#, php-format
-msgid "Could not increment greeting count for %d."
-msgstr "Не вдалося перерахувати лічильник привітань для %d."
-
-#: SamplePlugin.php:270 hello.php:111
 msgid "Hello"
 msgstr "Привіт"
 
-#: SamplePlugin.php:270
-msgid "A warm greeting"
-msgstr "Щирі вітання"
-
-#: SamplePlugin.php:281
-msgid "A sample plugin to show basics of development for new hackers."
-msgstr "Приклад додатку для демонстрації основ розробки новим гакерам."
-
-#: hello.php:113
 #, php-format
 msgid "Hello, %s!"
 msgstr "Привіт, %s!"
 
-#: hello.php:133
 msgid "Hello, stranger!"
 msgstr "Привіт, чужинцю!"
 
-#: hello.php:136
 #, php-format
 msgid "Hello, %s"
 msgstr "Привіт, %s"
 
-#: hello.php:138
 #, php-format
 msgid "I have greeted you %d time."
 msgid_plural "I have greeted you %d times."
 msgstr[0] "Я привітав вас %d раз."
 msgstr[1] "Я привітав вас %d разів."
 msgstr[2] "Я привітав вас %d разів."
+
+msgid "A warm greeting"
+msgstr "Щирі вітання"
+
+msgid "A sample plugin to show basics of development for new hackers."
+msgstr "Приклад додатку для демонстрації основ розробки новим гакерам."
+
+#. TRANS: Exception thrown when the user greeting count could not be saved in the database.
+#. TRANS: %d is a user ID (number).
+#, php-format
+msgid "Could not save new greeting count for %d."
+msgstr "Не вдалося зберегти новий лічильник привітань для %d."
+
+#. TRANS: Exception thrown when the user greeting count could not be saved in the database.
+#. TRANS: %d is a user ID (number).
+#, php-format
+msgid "Could not increment greeting count for %d."
+msgstr "Не вдалося перерахувати лічильник привітань для %d."
diff --git a/plugins/Sample/locale/zh_CN/LC_MESSAGES/Sample.po b/plugins/Sample/locale/zh_CN/LC_MESSAGES/Sample.po
index a50a8d8fb1..0a04358fb9 100644
--- a/plugins/Sample/locale/zh_CN/LC_MESSAGES/Sample.po
+++ b/plugins/Sample/locale/zh_CN/LC_MESSAGES/Sample.po
@@ -9,61 +9,52 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Sample\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:53+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:10+0000\n"
 "Language-Team: Simplified Chinese <http://translatewiki.net/wiki/Portal:zh-"
 "hans>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:28:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:10+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-sample\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+msgid "Hello"
+msgstr "你好"
+
+#, php-format
+msgid "Hello, %s!"
+msgstr "你好，%s！"
+
+msgid "Hello, stranger!"
+msgstr "你好，陌生人！"
+
+#, php-format
+msgid "Hello, %s"
+msgstr "你好，%s"
+
+#, php-format
+msgid "I have greeted you %d time."
+msgid_plural "I have greeted you %d times."
+msgstr[0] ""
+
+msgid "A warm greeting"
+msgstr "一个热情的问候"
+
+msgid "A sample plugin to show basics of development for new hackers."
+msgstr "一个为新的 hackers 显示基础开发的示例插件。"
+
 #. TRANS: Exception thrown when the user greeting count could not be saved in the database.
 #. TRANS: %d is a user ID (number).
-#: User_greeting_count.php:164
 #, php-format
 msgid "Could not save new greeting count for %d."
 msgstr "无法保存%d新的问候计数。"
 
 #. TRANS: Exception thrown when the user greeting count could not be saved in the database.
 #. TRANS: %d is a user ID (number).
-#: User_greeting_count.php:177
 #, php-format
 msgid "Could not increment greeting count for %d."
 msgstr "无法增加%d的问候计数。"
-
-#: SamplePlugin.php:270 hello.php:111
-msgid "Hello"
-msgstr "你好"
-
-#: SamplePlugin.php:270
-msgid "A warm greeting"
-msgstr "一个热情的问候"
-
-#: SamplePlugin.php:281
-msgid "A sample plugin to show basics of development for new hackers."
-msgstr "一个为新的 hackers 显示基础开发的示例插件。"
-
-#: hello.php:113
-#, php-format
-msgid "Hello, %s!"
-msgstr "你好，%s！"
-
-#: hello.php:133
-msgid "Hello, stranger!"
-msgstr "你好，陌生人！"
-
-#: hello.php:136
-#, php-format
-msgid "Hello, %s"
-msgstr "你好，%s"
-
-#: hello.php:138
-#, php-format
-msgid "I have greeted you %d time."
-msgid_plural "I have greeted you %d times."
-msgstr[0] ""
diff --git a/plugins/ShareNotice/locale/ShareNotice.pot b/plugins/ShareNotice/locale/ShareNotice.pot
index a1bbabf296..10d2466b6f 100644
--- a/plugins/ShareNotice/locale/ShareNotice.pot
+++ b/plugins/ShareNotice/locale/ShareNotice.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/ShareNotice/locale/br/LC_MESSAGES/ShareNotice.po b/plugins/ShareNotice/locale/br/LC_MESSAGES/ShareNotice.po
index d85b76bfa2..6c05366bdd 100644
--- a/plugins/ShareNotice/locale/br/LC_MESSAGES/ShareNotice.po
+++ b/plugins/ShareNotice/locale/br/LC_MESSAGES/ShareNotice.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ShareNotice\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:54+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:11+0000\n"
 "Language-Team: Breton <http://translatewiki.net/wiki/Portal:br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:28:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:12+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-sharenotice\n"
@@ -23,30 +23,25 @@ msgstr ""
 
 #. TRANS: Leave this message unchanged.
 #. TRANS: %s is notice content that is shared on Twitter, Facebook or another platform.
-#: ShareNoticePlugin.php:106 ShareNoticePlugin.php:194
 #, php-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
 #. TRANS: Tooltip for image to share a notice on Twitter.
-#: ShareNoticePlugin.php:130
 msgid "Share on Twitter"
 msgstr "Rannañ war Twitter"
 
 #. TRANS: Tooltip for image to share a notice on another platform (other than Twitter or Facebook).
 #. TRANS: %s is a host name.
-#: ShareNoticePlugin.php:163
 #, php-format
 msgid "Share on %s"
 msgstr "Rannañ war %s"
 
 #. TRANS: Tooltip for image to share a notice on Facebook.
-#: ShareNoticePlugin.php:186
 msgid "Share on Facebook"
 msgstr "Rannañ war Facebook"
 
 #. TRANS: Plugin description.
-#: ShareNoticePlugin.php:219
 msgid ""
 "This plugin allows sharing of notices to Twitter, Facebook and other "
 "platforms."
diff --git a/plugins/ShareNotice/locale/ca/LC_MESSAGES/ShareNotice.po b/plugins/ShareNotice/locale/ca/LC_MESSAGES/ShareNotice.po
index 8ddfa69819..e48ae15365 100644
--- a/plugins/ShareNotice/locale/ca/LC_MESSAGES/ShareNotice.po
+++ b/plugins/ShareNotice/locale/ca/LC_MESSAGES/ShareNotice.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ShareNotice\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:54+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:11+0000\n"
 "Language-Team: Catalan <http://translatewiki.net/wiki/Portal:ca>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:28:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:12+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ca\n"
 "X-Message-Group: #out-statusnet-plugin-sharenotice\n"
@@ -23,30 +23,25 @@ msgstr ""
 
 #. TRANS: Leave this message unchanged.
 #. TRANS: %s is notice content that is shared on Twitter, Facebook or another platform.
-#: ShareNoticePlugin.php:106 ShareNoticePlugin.php:194
 #, php-format
 msgid "\"%s\""
 msgstr "«%s»"
 
 #. TRANS: Tooltip for image to share a notice on Twitter.
-#: ShareNoticePlugin.php:130
 msgid "Share on Twitter"
 msgstr "Comparteix al Twitter"
 
 #. TRANS: Tooltip for image to share a notice on another platform (other than Twitter or Facebook).
 #. TRANS: %s is a host name.
-#: ShareNoticePlugin.php:163
 #, php-format
 msgid "Share on %s"
 msgstr "Comparteix a %s"
 
 #. TRANS: Tooltip for image to share a notice on Facebook.
-#: ShareNoticePlugin.php:186
 msgid "Share on Facebook"
 msgstr "Comparteix al Facebook"
 
 #. TRANS: Plugin description.
-#: ShareNoticePlugin.php:219
 msgid ""
 "This plugin allows sharing of notices to Twitter, Facebook and other "
 "platforms."
diff --git a/plugins/ShareNotice/locale/de/LC_MESSAGES/ShareNotice.po b/plugins/ShareNotice/locale/de/LC_MESSAGES/ShareNotice.po
index c940aa6edd..cba6ab6179 100644
--- a/plugins/ShareNotice/locale/de/LC_MESSAGES/ShareNotice.po
+++ b/plugins/ShareNotice/locale/de/LC_MESSAGES/ShareNotice.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ShareNotice\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:54+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:11+0000\n"
 "Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:28:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:12+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-sharenotice\n"
@@ -23,30 +23,25 @@ msgstr ""
 
 #. TRANS: Leave this message unchanged.
 #. TRANS: %s is notice content that is shared on Twitter, Facebook or another platform.
-#: ShareNoticePlugin.php:106 ShareNoticePlugin.php:194
 #, php-format
 msgid "\"%s\""
 msgstr "„%s“"
 
 #. TRANS: Tooltip for image to share a notice on Twitter.
-#: ShareNoticePlugin.php:130
 msgid "Share on Twitter"
 msgstr "Auf Twitter teilen"
 
 #. TRANS: Tooltip for image to share a notice on another platform (other than Twitter or Facebook).
 #. TRANS: %s is a host name.
-#: ShareNoticePlugin.php:163
 #, php-format
 msgid "Share on %s"
 msgstr "Auf %s teilen"
 
 #. TRANS: Tooltip for image to share a notice on Facebook.
-#: ShareNoticePlugin.php:186
 msgid "Share on Facebook"
 msgstr "Auf Facebook teilen"
 
 #. TRANS: Plugin description.
-#: ShareNoticePlugin.php:219
 msgid ""
 "This plugin allows sharing of notices to Twitter, Facebook and other "
 "platforms."
diff --git a/plugins/ShareNotice/locale/fr/LC_MESSAGES/ShareNotice.po b/plugins/ShareNotice/locale/fr/LC_MESSAGES/ShareNotice.po
index 6a56078243..665f3d2f51 100644
--- a/plugins/ShareNotice/locale/fr/LC_MESSAGES/ShareNotice.po
+++ b/plugins/ShareNotice/locale/fr/LC_MESSAGES/ShareNotice.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ShareNotice\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:54+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:11+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:28:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:12+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-sharenotice\n"
@@ -23,30 +23,25 @@ msgstr ""
 
 #. TRANS: Leave this message unchanged.
 #. TRANS: %s is notice content that is shared on Twitter, Facebook or another platform.
-#: ShareNoticePlugin.php:106 ShareNoticePlugin.php:194
 #, php-format
 msgid "\"%s\""
 msgstr "« %s »"
 
 #. TRANS: Tooltip for image to share a notice on Twitter.
-#: ShareNoticePlugin.php:130
 msgid "Share on Twitter"
 msgstr "Partager sur Twitter"
 
 #. TRANS: Tooltip for image to share a notice on another platform (other than Twitter or Facebook).
 #. TRANS: %s is a host name.
-#: ShareNoticePlugin.php:163
 #, php-format
 msgid "Share on %s"
 msgstr "Partager sur %s"
 
 #. TRANS: Tooltip for image to share a notice on Facebook.
-#: ShareNoticePlugin.php:186
 msgid "Share on Facebook"
 msgstr "Partager sur Facebook"
 
 #. TRANS: Plugin description.
-#: ShareNoticePlugin.php:219
 msgid ""
 "This plugin allows sharing of notices to Twitter, Facebook and other "
 "platforms."
diff --git a/plugins/ShareNotice/locale/ia/LC_MESSAGES/ShareNotice.po b/plugins/ShareNotice/locale/ia/LC_MESSAGES/ShareNotice.po
index 3701273edd..5bf145e020 100644
--- a/plugins/ShareNotice/locale/ia/LC_MESSAGES/ShareNotice.po
+++ b/plugins/ShareNotice/locale/ia/LC_MESSAGES/ShareNotice.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ShareNotice\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:54+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:11+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:28:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:12+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-sharenotice\n"
@@ -23,30 +23,25 @@ msgstr ""
 
 #. TRANS: Leave this message unchanged.
 #. TRANS: %s is notice content that is shared on Twitter, Facebook or another platform.
-#: ShareNoticePlugin.php:106 ShareNoticePlugin.php:194
 #, php-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
 #. TRANS: Tooltip for image to share a notice on Twitter.
-#: ShareNoticePlugin.php:130
 msgid "Share on Twitter"
 msgstr "Condivider in Twitter"
 
 #. TRANS: Tooltip for image to share a notice on another platform (other than Twitter or Facebook).
 #. TRANS: %s is a host name.
-#: ShareNoticePlugin.php:163
 #, php-format
 msgid "Share on %s"
 msgstr "Condivider in %s"
 
 #. TRANS: Tooltip for image to share a notice on Facebook.
-#: ShareNoticePlugin.php:186
 msgid "Share on Facebook"
 msgstr "Condivider in Facebook"
 
 #. TRANS: Plugin description.
-#: ShareNoticePlugin.php:219
 msgid ""
 "This plugin allows sharing of notices to Twitter, Facebook and other "
 "platforms."
diff --git a/plugins/ShareNotice/locale/mk/LC_MESSAGES/ShareNotice.po b/plugins/ShareNotice/locale/mk/LC_MESSAGES/ShareNotice.po
index 976c2e97f4..e8295cdbec 100644
--- a/plugins/ShareNotice/locale/mk/LC_MESSAGES/ShareNotice.po
+++ b/plugins/ShareNotice/locale/mk/LC_MESSAGES/ShareNotice.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ShareNotice\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:54+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:11+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:28:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:12+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-sharenotice\n"
@@ -23,30 +23,25 @@ msgstr ""
 
 #. TRANS: Leave this message unchanged.
 #. TRANS: %s is notice content that is shared on Twitter, Facebook or another platform.
-#: ShareNoticePlugin.php:106 ShareNoticePlugin.php:194
 #, php-format
 msgid "\"%s\""
 msgstr "„%s“"
 
 #. TRANS: Tooltip for image to share a notice on Twitter.
-#: ShareNoticePlugin.php:130
 msgid "Share on Twitter"
 msgstr "Сподели на Twitter"
 
 #. TRANS: Tooltip for image to share a notice on another platform (other than Twitter or Facebook).
 #. TRANS: %s is a host name.
-#: ShareNoticePlugin.php:163
 #, php-format
 msgid "Share on %s"
 msgstr "Сподели на %s"
 
 #. TRANS: Tooltip for image to share a notice on Facebook.
-#: ShareNoticePlugin.php:186
 msgid "Share on Facebook"
 msgstr "Сподели на Facebook"
 
 #. TRANS: Plugin description.
-#: ShareNoticePlugin.php:219
 msgid ""
 "This plugin allows sharing of notices to Twitter, Facebook and other "
 "platforms."
diff --git a/plugins/ShareNotice/locale/nl/LC_MESSAGES/ShareNotice.po b/plugins/ShareNotice/locale/nl/LC_MESSAGES/ShareNotice.po
index fc05170ae0..464f9a2336 100644
--- a/plugins/ShareNotice/locale/nl/LC_MESSAGES/ShareNotice.po
+++ b/plugins/ShareNotice/locale/nl/LC_MESSAGES/ShareNotice.po
@@ -10,13 +10,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ShareNotice\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:54+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:11+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:28:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:12+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-sharenotice\n"
@@ -24,30 +24,25 @@ msgstr ""
 
 #. TRANS: Leave this message unchanged.
 #. TRANS: %s is notice content that is shared on Twitter, Facebook or another platform.
-#: ShareNoticePlugin.php:106 ShareNoticePlugin.php:194
 #, php-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
 #. TRANS: Tooltip for image to share a notice on Twitter.
-#: ShareNoticePlugin.php:130
 msgid "Share on Twitter"
 msgstr "Delen op Twitter"
 
 #. TRANS: Tooltip for image to share a notice on another platform (other than Twitter or Facebook).
 #. TRANS: %s is a host name.
-#: ShareNoticePlugin.php:163
 #, php-format
 msgid "Share on %s"
 msgstr "Delen op %s"
 
 #. TRANS: Tooltip for image to share a notice on Facebook.
-#: ShareNoticePlugin.php:186
 msgid "Share on Facebook"
 msgstr "Delen op Facebook"
 
 #. TRANS: Plugin description.
-#: ShareNoticePlugin.php:219
 msgid ""
 "This plugin allows sharing of notices to Twitter, Facebook and other "
 "platforms."
diff --git a/plugins/ShareNotice/locale/tl/LC_MESSAGES/ShareNotice.po b/plugins/ShareNotice/locale/tl/LC_MESSAGES/ShareNotice.po
index 8be749ef27..d59890969d 100644
--- a/plugins/ShareNotice/locale/tl/LC_MESSAGES/ShareNotice.po
+++ b/plugins/ShareNotice/locale/tl/LC_MESSAGES/ShareNotice.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ShareNotice\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:54+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:11+0000\n"
 "Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:28:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:12+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-sharenotice\n"
@@ -23,30 +23,25 @@ msgstr ""
 
 #. TRANS: Leave this message unchanged.
 #. TRANS: %s is notice content that is shared on Twitter, Facebook or another platform.
-#: ShareNoticePlugin.php:106 ShareNoticePlugin.php:194
 #, php-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
 #. TRANS: Tooltip for image to share a notice on Twitter.
-#: ShareNoticePlugin.php:130
 msgid "Share on Twitter"
 msgstr "Ibahagi sa Twitter"
 
 #. TRANS: Tooltip for image to share a notice on another platform (other than Twitter or Facebook).
 #. TRANS: %s is a host name.
-#: ShareNoticePlugin.php:163
 #, php-format
 msgid "Share on %s"
 msgstr "Ibahagi sa %s"
 
 #. TRANS: Tooltip for image to share a notice on Facebook.
-#: ShareNoticePlugin.php:186
 msgid "Share on Facebook"
 msgstr "Ibahagi sa Facebook"
 
 #. TRANS: Plugin description.
-#: ShareNoticePlugin.php:219
 msgid ""
 "This plugin allows sharing of notices to Twitter, Facebook and other "
 "platforms."
diff --git a/plugins/ShareNotice/locale/uk/LC_MESSAGES/ShareNotice.po b/plugins/ShareNotice/locale/uk/LC_MESSAGES/ShareNotice.po
index a669984d0c..d3af4a8aed 100644
--- a/plugins/ShareNotice/locale/uk/LC_MESSAGES/ShareNotice.po
+++ b/plugins/ShareNotice/locale/uk/LC_MESSAGES/ShareNotice.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ShareNotice\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:54+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:11+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:28:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:12+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-sharenotice\n"
@@ -24,30 +24,25 @@ msgstr ""
 
 #. TRANS: Leave this message unchanged.
 #. TRANS: %s is notice content that is shared on Twitter, Facebook or another platform.
-#: ShareNoticePlugin.php:106 ShareNoticePlugin.php:194
 #, php-format
 msgid "\"%s\""
 msgstr "«%s»"
 
 #. TRANS: Tooltip for image to share a notice on Twitter.
-#: ShareNoticePlugin.php:130
 msgid "Share on Twitter"
 msgstr "Розмістити в Twitter"
 
 #. TRANS: Tooltip for image to share a notice on another platform (other than Twitter or Facebook).
 #. TRANS: %s is a host name.
-#: ShareNoticePlugin.php:163
 #, php-format
 msgid "Share on %s"
 msgstr "Розмістити в %s"
 
 #. TRANS: Tooltip for image to share a notice on Facebook.
-#: ShareNoticePlugin.php:186
 msgid "Share on Facebook"
 msgstr "Розмістити в Facebook"
 
 #. TRANS: Plugin description.
-#: ShareNoticePlugin.php:219
 msgid ""
 "This plugin allows sharing of notices to Twitter, Facebook and other "
 "platforms."
diff --git a/plugins/SimpleUrl/locale/SimpleUrl.pot b/plugins/SimpleUrl/locale/SimpleUrl.pot
index d75df682c7..50cc59e2af 100644
--- a/plugins/SimpleUrl/locale/SimpleUrl.pot
+++ b/plugins/SimpleUrl/locale/SimpleUrl.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/SimpleUrl/locale/br/LC_MESSAGES/SimpleUrl.po b/plugins/SimpleUrl/locale/br/LC_MESSAGES/SimpleUrl.po
index b8b7dc37ff..bf0051f8b0 100644
--- a/plugins/SimpleUrl/locale/br/LC_MESSAGES/SimpleUrl.po
+++ b/plugins/SimpleUrl/locale/br/LC_MESSAGES/SimpleUrl.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SimpleUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:54+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:11+0000\n"
 "Language-Team: Breton <http://translatewiki.net/wiki/Portal:br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:28:26+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:13+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-simpleurl\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: SimpleUrlPlugin.php:56
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr ""
diff --git a/plugins/SimpleUrl/locale/de/LC_MESSAGES/SimpleUrl.po b/plugins/SimpleUrl/locale/de/LC_MESSAGES/SimpleUrl.po
index 161eb788dc..485d11be27 100644
--- a/plugins/SimpleUrl/locale/de/LC_MESSAGES/SimpleUrl.po
+++ b/plugins/SimpleUrl/locale/de/LC_MESSAGES/SimpleUrl.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SimpleUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:54+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:11+0000\n"
 "Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:28:26+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:13+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-simpleurl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: SimpleUrlPlugin.php:56
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr "Benutzung des <a href=\"http://%1$s/\">%1$s</a>-URL-Kürzungsdienstes."
diff --git a/plugins/SimpleUrl/locale/es/LC_MESSAGES/SimpleUrl.po b/plugins/SimpleUrl/locale/es/LC_MESSAGES/SimpleUrl.po
index f408784173..f1120f83ea 100644
--- a/plugins/SimpleUrl/locale/es/LC_MESSAGES/SimpleUrl.po
+++ b/plugins/SimpleUrl/locale/es/LC_MESSAGES/SimpleUrl.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SimpleUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:54+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:11+0000\n"
 "Language-Team: Spanish <http://translatewiki.net/wiki/Portal:es>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:28:26+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:13+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-simpleurl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: SimpleUrlPlugin.php:56
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr ""
diff --git a/plugins/SimpleUrl/locale/fr/LC_MESSAGES/SimpleUrl.po b/plugins/SimpleUrl/locale/fr/LC_MESSAGES/SimpleUrl.po
index a0d157b926..af8f29a67d 100644
--- a/plugins/SimpleUrl/locale/fr/LC_MESSAGES/SimpleUrl.po
+++ b/plugins/SimpleUrl/locale/fr/LC_MESSAGES/SimpleUrl.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SimpleUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:54+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:11+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:28:26+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:13+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-simpleurl\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: SimpleUrlPlugin.php:56
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr ""
diff --git a/plugins/SimpleUrl/locale/gl/LC_MESSAGES/SimpleUrl.po b/plugins/SimpleUrl/locale/gl/LC_MESSAGES/SimpleUrl.po
index b26c8551ca..23e129579f 100644
--- a/plugins/SimpleUrl/locale/gl/LC_MESSAGES/SimpleUrl.po
+++ b/plugins/SimpleUrl/locale/gl/LC_MESSAGES/SimpleUrl.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SimpleUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:54+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:11+0000\n"
 "Language-Team: Galician <http://translatewiki.net/wiki/Portal:gl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:28:26+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:13+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: gl\n"
 "X-Message-Group: #out-statusnet-plugin-simpleurl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: SimpleUrlPlugin.php:56
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr ""
diff --git a/plugins/SimpleUrl/locale/he/LC_MESSAGES/SimpleUrl.po b/plugins/SimpleUrl/locale/he/LC_MESSAGES/SimpleUrl.po
index 0464888b73..bc35bce541 100644
--- a/plugins/SimpleUrl/locale/he/LC_MESSAGES/SimpleUrl.po
+++ b/plugins/SimpleUrl/locale/he/LC_MESSAGES/SimpleUrl.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SimpleUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:54+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:11+0000\n"
 "Language-Team: Hebrew <http://translatewiki.net/wiki/Portal:he>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:28:26+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:13+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-plugin-simpleurl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: SimpleUrlPlugin.php:56
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr "שימוש בשירות קיצור הכתובות <a href=\"http://%1$s/\">%1$s</a>."
diff --git a/plugins/SimpleUrl/locale/ia/LC_MESSAGES/SimpleUrl.po b/plugins/SimpleUrl/locale/ia/LC_MESSAGES/SimpleUrl.po
index 7c316f18a7..142f269042 100644
--- a/plugins/SimpleUrl/locale/ia/LC_MESSAGES/SimpleUrl.po
+++ b/plugins/SimpleUrl/locale/ia/LC_MESSAGES/SimpleUrl.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SimpleUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:55+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:11+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:28:26+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:13+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-simpleurl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: SimpleUrlPlugin.php:56
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr ""
diff --git a/plugins/SimpleUrl/locale/id/LC_MESSAGES/SimpleUrl.po b/plugins/SimpleUrl/locale/id/LC_MESSAGES/SimpleUrl.po
index e4c4b48fdf..57189eff12 100644
--- a/plugins/SimpleUrl/locale/id/LC_MESSAGES/SimpleUrl.po
+++ b/plugins/SimpleUrl/locale/id/LC_MESSAGES/SimpleUrl.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SimpleUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:55+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:11+0000\n"
 "Language-Team: Indonesian <http://translatewiki.net/wiki/Portal:id>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:28:26+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:13+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: id\n"
 "X-Message-Group: #out-statusnet-plugin-simpleurl\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: SimpleUrlPlugin.php:56
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr "Menggunakan layanan pemendek URL <a href=\"http://%1$s/\">%1$s</a>."
diff --git a/plugins/SimpleUrl/locale/ja/LC_MESSAGES/SimpleUrl.po b/plugins/SimpleUrl/locale/ja/LC_MESSAGES/SimpleUrl.po
index 8f781859ed..784e9886c8 100644
--- a/plugins/SimpleUrl/locale/ja/LC_MESSAGES/SimpleUrl.po
+++ b/plugins/SimpleUrl/locale/ja/LC_MESSAGES/SimpleUrl.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SimpleUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:55+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:12+0000\n"
 "Language-Team: Japanese <http://translatewiki.net/wiki/Portal:ja>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:28:26+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:13+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ja\n"
 "X-Message-Group: #out-statusnet-plugin-simpleurl\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: SimpleUrlPlugin.php:56
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr "<a href=\"http://%1$s/\">%1$s</a>をURL短縮サービスとして利用する。"
diff --git a/plugins/SimpleUrl/locale/mk/LC_MESSAGES/SimpleUrl.po b/plugins/SimpleUrl/locale/mk/LC_MESSAGES/SimpleUrl.po
index 68ff2bb8cc..e461339b3c 100644
--- a/plugins/SimpleUrl/locale/mk/LC_MESSAGES/SimpleUrl.po
+++ b/plugins/SimpleUrl/locale/mk/LC_MESSAGES/SimpleUrl.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SimpleUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:55+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:12+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:28:26+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:13+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-simpleurl\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
 
-#: SimpleUrlPlugin.php:56
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr ""
diff --git a/plugins/SimpleUrl/locale/nb/LC_MESSAGES/SimpleUrl.po b/plugins/SimpleUrl/locale/nb/LC_MESSAGES/SimpleUrl.po
index 037ae501ff..40c1208b19 100644
--- a/plugins/SimpleUrl/locale/nb/LC_MESSAGES/SimpleUrl.po
+++ b/plugins/SimpleUrl/locale/nb/LC_MESSAGES/SimpleUrl.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SimpleUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:55+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:12+0000\n"
 "Language-Team: Norwegian (bokmål)‬ <http://translatewiki.net/wiki/Portal:no>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:28:26+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:13+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: #out-statusnet-plugin-simpleurl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: SimpleUrlPlugin.php:56
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr "Bruker URL-forkortertjenesten <a href=\"http://%1$s/\">%1$s</a>."
diff --git a/plugins/SimpleUrl/locale/nl/LC_MESSAGES/SimpleUrl.po b/plugins/SimpleUrl/locale/nl/LC_MESSAGES/SimpleUrl.po
index e08ad1d4aa..2bf95c3d49 100644
--- a/plugins/SimpleUrl/locale/nl/LC_MESSAGES/SimpleUrl.po
+++ b/plugins/SimpleUrl/locale/nl/LC_MESSAGES/SimpleUrl.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SimpleUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:55+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:12+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:28:26+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:13+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-simpleurl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: SimpleUrlPlugin.php:56
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr ""
diff --git a/plugins/SimpleUrl/locale/pt/LC_MESSAGES/SimpleUrl.po b/plugins/SimpleUrl/locale/pt/LC_MESSAGES/SimpleUrl.po
index e02cf8320b..2284ad3151 100644
--- a/plugins/SimpleUrl/locale/pt/LC_MESSAGES/SimpleUrl.po
+++ b/plugins/SimpleUrl/locale/pt/LC_MESSAGES/SimpleUrl.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SimpleUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:55+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:12+0000\n"
 "Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:28:26+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:13+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-plugin-simpleurl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: SimpleUrlPlugin.php:56
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr "Usa o serviço de abreviação de URLs <a href=\"http://%1$s/\">%1$s</a>."
diff --git a/plugins/SimpleUrl/locale/ru/LC_MESSAGES/SimpleUrl.po b/plugins/SimpleUrl/locale/ru/LC_MESSAGES/SimpleUrl.po
index db579ddd05..a2beedce15 100644
--- a/plugins/SimpleUrl/locale/ru/LC_MESSAGES/SimpleUrl.po
+++ b/plugins/SimpleUrl/locale/ru/LC_MESSAGES/SimpleUrl.po
@@ -9,20 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SimpleUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:55+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:12+0000\n"
 "Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:28:26+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:13+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-simpleurl\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: SimpleUrlPlugin.php:56
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr "Использование службы сокращения URL <a href=\"http://%1$s/\">%1$s</a>."
diff --git a/plugins/SimpleUrl/locale/tl/LC_MESSAGES/SimpleUrl.po b/plugins/SimpleUrl/locale/tl/LC_MESSAGES/SimpleUrl.po
index f4568ab003..27f6d19975 100644
--- a/plugins/SimpleUrl/locale/tl/LC_MESSAGES/SimpleUrl.po
+++ b/plugins/SimpleUrl/locale/tl/LC_MESSAGES/SimpleUrl.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SimpleUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:55+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:12+0000\n"
 "Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:28:26+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:13+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-simpleurl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: SimpleUrlPlugin.php:56
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr ""
diff --git a/plugins/SimpleUrl/locale/uk/LC_MESSAGES/SimpleUrl.po b/plugins/SimpleUrl/locale/uk/LC_MESSAGES/SimpleUrl.po
index a155748315..13ddf6e685 100644
--- a/plugins/SimpleUrl/locale/uk/LC_MESSAGES/SimpleUrl.po
+++ b/plugins/SimpleUrl/locale/uk/LC_MESSAGES/SimpleUrl.po
@@ -9,20 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SimpleUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:55+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:12+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:28:26+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:13+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-simpleurl\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: SimpleUrlPlugin.php:56
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr ""
diff --git a/plugins/Sitemap/locale/Sitemap.pot b/plugins/Sitemap/locale/Sitemap.pot
index 142406585b..fd9a4cc6a8 100644
--- a/plugins/Sitemap/locale/Sitemap.pot
+++ b/plugins/Sitemap/locale/Sitemap.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/Sitemap/locale/br/LC_MESSAGES/Sitemap.po b/plugins/Sitemap/locale/br/LC_MESSAGES/Sitemap.po
index 9e57dc248e..61927983ce 100644
--- a/plugins/Sitemap/locale/br/LC_MESSAGES/Sitemap.po
+++ b/plugins/Sitemap/locale/br/LC_MESSAGES/Sitemap.po
@@ -10,82 +10,69 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Sitemap\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:56+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:13+0000\n"
 "Language-Team: Breton <http://translatewiki.net/wiki/Portal:br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-14 17:22:07+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:15+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-sitemap\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. TRANS: Title for sitemap.
-#: sitemapadminpanel.php:53
 msgid "Sitemap"
 msgstr "Tres al lec'hienn"
 
 #. TRANS: Instructions for sitemap.
-#: sitemapadminpanel.php:64
 msgid "Sitemap settings for this StatusNet site"
 msgstr ""
 
 #. TRANS: Field label.
-#: sitemapadminpanel.php:167
 msgid "Google key"
 msgstr "Alc'hwez Google"
 
 #. TRANS: Title for field label.
-#: sitemapadminpanel.php:169
 msgid "Google Webmaster Tools verification key."
 msgstr ""
 
 #. TRANS: Field label.
-#: sitemapadminpanel.php:175
 msgid "Yahoo key"
 msgstr "Alc'hwez Yahoo"
 
 #. TRANS: Title for field label.
-#: sitemapadminpanel.php:177
 msgid "Yahoo! Site Explorer verification key."
 msgstr ""
 
 #. TRANS: Field label.
-#: sitemapadminpanel.php:183
 msgid "Bing key"
 msgstr "Alc'hwez Bing"
 
 #. TRANS: Title for field label.
-#: sitemapadminpanel.php:185
 msgid "Bing Webmaster Tools verification key."
 msgstr ""
 
 #. TRANS: Submit button text to save sitemap settings.
-#: sitemapadminpanel.php:200
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Enrollañ"
 
 #. TRANS: Submit button title to save sitemap settings.
-#: sitemapadminpanel.php:204
 msgid "Save sitemap settings."
 msgstr "Enrollañ arventennoù tres al lec'hienn"
 
 #. TRANS: Menu item title/tooltip
-#: SitemapPlugin.php:211
 msgid "Sitemap configuration"
 msgstr "Kefluniadur tres al lec'hienn"
 
 #. TRANS: Menu item for site administration
-#: SitemapPlugin.php:213
 msgctxt "MENU"
 msgid "Sitemap"
 msgstr "Tres al lec'hienn"
 
 #. TRANS: Plugin description.
-#: SitemapPlugin.php:238
 msgid "This plugin allows creation of sitemaps for Bing, Yahoo! and Google."
 msgstr ""
 "Gant an astenn-mañ e c'haller sevel tresoù lec'hiennoù evit Bing, Yahoo! ha "
diff --git a/plugins/Sitemap/locale/de/LC_MESSAGES/Sitemap.po b/plugins/Sitemap/locale/de/LC_MESSAGES/Sitemap.po
index 890e989b8b..0c951b6bbc 100644
--- a/plugins/Sitemap/locale/de/LC_MESSAGES/Sitemap.po
+++ b/plugins/Sitemap/locale/de/LC_MESSAGES/Sitemap.po
@@ -10,82 +10,69 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Sitemap\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:56+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:13+0000\n"
 "Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-14 17:22:07+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:15+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-sitemap\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANS: Title for sitemap.
-#: sitemapadminpanel.php:53
 msgid "Sitemap"
 msgstr "Sitemap"
 
 #. TRANS: Instructions for sitemap.
-#: sitemapadminpanel.php:64
 msgid "Sitemap settings for this StatusNet site"
 msgstr "Sitemap-Einstellungen dieser StatusNet-Website"
 
 #. TRANS: Field label.
-#: sitemapadminpanel.php:167
 msgid "Google key"
 msgstr "Google-Schlüssel"
 
 #. TRANS: Title for field label.
-#: sitemapadminpanel.php:169
 msgid "Google Webmaster Tools verification key."
 msgstr "Google Webmaster-Tools-Verifikationsschlüssel."
 
 #. TRANS: Field label.
-#: sitemapadminpanel.php:175
 msgid "Yahoo key"
 msgstr "Yahoo-Schlüssel"
 
 #. TRANS: Title for field label.
-#: sitemapadminpanel.php:177
 msgid "Yahoo! Site Explorer verification key."
 msgstr "„Yahoo! Site Explorer“-Verifikationsschlüssel"
 
 #. TRANS: Field label.
-#: sitemapadminpanel.php:183
 msgid "Bing key"
 msgstr "Bing-Schlüssel"
 
 #. TRANS: Title for field label.
-#: sitemapadminpanel.php:185
 msgid "Bing Webmaster Tools verification key."
 msgstr "Bing Webmaster-Tools-Verifikationsschlüssel."
 
 #. TRANS: Submit button text to save sitemap settings.
-#: sitemapadminpanel.php:200
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Speichern"
 
 #. TRANS: Submit button title to save sitemap settings.
-#: sitemapadminpanel.php:204
 msgid "Save sitemap settings."
 msgstr "Sitemap-Einstellungen speichern."
 
 #. TRANS: Menu item title/tooltip
-#: SitemapPlugin.php:211
 msgid "Sitemap configuration"
 msgstr "Sitemap-Konfiguration"
 
 #. TRANS: Menu item for site administration
-#: SitemapPlugin.php:213
 msgctxt "MENU"
 msgid "Sitemap"
 msgstr "Sitemap"
 
 #. TRANS: Plugin description.
-#: SitemapPlugin.php:238
 msgid "This plugin allows creation of sitemaps for Bing, Yahoo! and Google."
 msgstr ""
 "Dieses Plugin ermöglicht die Erstellung von Sitemaps für Bing, Yahoo! und "
diff --git a/plugins/Sitemap/locale/fr/LC_MESSAGES/Sitemap.po b/plugins/Sitemap/locale/fr/LC_MESSAGES/Sitemap.po
index 5dcd13ff78..5dd9e24eef 100644
--- a/plugins/Sitemap/locale/fr/LC_MESSAGES/Sitemap.po
+++ b/plugins/Sitemap/locale/fr/LC_MESSAGES/Sitemap.po
@@ -9,82 +9,69 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Sitemap\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:56+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:13+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-14 17:22:07+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:15+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-sitemap\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. TRANS: Title for sitemap.
-#: sitemapadminpanel.php:53
 msgid "Sitemap"
 msgstr "Plan du site"
 
 #. TRANS: Instructions for sitemap.
-#: sitemapadminpanel.php:64
 msgid "Sitemap settings for this StatusNet site"
 msgstr "Paramètres de plan du site pour ce site StatusNet"
 
 #. TRANS: Field label.
-#: sitemapadminpanel.php:167
 msgid "Google key"
 msgstr "Clé Google"
 
 #. TRANS: Title for field label.
-#: sitemapadminpanel.php:169
 msgid "Google Webmaster Tools verification key."
 msgstr "Clé de vérification pour les outils Google Webmaster."
 
 #. TRANS: Field label.
-#: sitemapadminpanel.php:175
 msgid "Yahoo key"
 msgstr "Clé Yahoo"
 
 #. TRANS: Title for field label.
-#: sitemapadminpanel.php:177
 msgid "Yahoo! Site Explorer verification key."
 msgstr "Clé de vérification pour l’explorateur de site Yahoo!"
 
 #. TRANS: Field label.
-#: sitemapadminpanel.php:183
 msgid "Bing key"
 msgstr "Clé Bing"
 
 #. TRANS: Title for field label.
-#: sitemapadminpanel.php:185
 msgid "Bing Webmaster Tools verification key."
 msgstr "Clé de vérification pour les outils Bing Webmaster."
 
 #. TRANS: Submit button text to save sitemap settings.
-#: sitemapadminpanel.php:200
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Sauvegarder"
 
 #. TRANS: Submit button title to save sitemap settings.
-#: sitemapadminpanel.php:204
 msgid "Save sitemap settings."
 msgstr "Sauvegarder les paramètres de plan du site."
 
 #. TRANS: Menu item title/tooltip
-#: SitemapPlugin.php:211
 msgid "Sitemap configuration"
 msgstr "Configuration du plan du site"
 
 #. TRANS: Menu item for site administration
-#: SitemapPlugin.php:213
 msgctxt "MENU"
 msgid "Sitemap"
 msgstr "Plan du site"
 
 #. TRANS: Plugin description.
-#: SitemapPlugin.php:238
 msgid "This plugin allows creation of sitemaps for Bing, Yahoo! and Google."
 msgstr ""
 "Cette extension permet de créer des plans du site pour Bing, Yahoo! et "
diff --git a/plugins/Sitemap/locale/ia/LC_MESSAGES/Sitemap.po b/plugins/Sitemap/locale/ia/LC_MESSAGES/Sitemap.po
index de14e52422..43e1047768 100644
--- a/plugins/Sitemap/locale/ia/LC_MESSAGES/Sitemap.po
+++ b/plugins/Sitemap/locale/ia/LC_MESSAGES/Sitemap.po
@@ -9,82 +9,69 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Sitemap\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:56+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:13+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-14 17:22:07+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:15+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-sitemap\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANS: Title for sitemap.
-#: sitemapadminpanel.php:53
 msgid "Sitemap"
 msgstr "Mappa del sito"
 
 #. TRANS: Instructions for sitemap.
-#: sitemapadminpanel.php:64
 msgid "Sitemap settings for this StatusNet site"
 msgstr "Configuration de mappa de sito pro iste sito StatusNet"
 
 #. TRANS: Field label.
-#: sitemapadminpanel.php:167
 msgid "Google key"
 msgstr "Clave Google"
 
 #. TRANS: Title for field label.
-#: sitemapadminpanel.php:169
 msgid "Google Webmaster Tools verification key."
 msgstr "Clave de verification de Google Webmaster Tools."
 
 #. TRANS: Field label.
-#: sitemapadminpanel.php:175
 msgid "Yahoo key"
 msgstr "Clave Yahoo"
 
 #. TRANS: Title for field label.
-#: sitemapadminpanel.php:177
 msgid "Yahoo! Site Explorer verification key."
 msgstr "Clave de verification de Yahoo Site Explorer."
 
 #. TRANS: Field label.
-#: sitemapadminpanel.php:183
 msgid "Bing key"
 msgstr "Clave Bing"
 
 #. TRANS: Title for field label.
-#: sitemapadminpanel.php:185
 msgid "Bing Webmaster Tools verification key."
 msgstr "Clave de verification de Bing Webmaster Tools."
 
 #. TRANS: Submit button text to save sitemap settings.
-#: sitemapadminpanel.php:200
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Salveguardar"
 
 #. TRANS: Submit button title to save sitemap settings.
-#: sitemapadminpanel.php:204
 msgid "Save sitemap settings."
 msgstr "Salveguardar configuration de mappa de sito."
 
 #. TRANS: Menu item title/tooltip
-#: SitemapPlugin.php:211
 msgid "Sitemap configuration"
 msgstr "Configuration de mappa de sito"
 
 #. TRANS: Menu item for site administration
-#: SitemapPlugin.php:213
 msgctxt "MENU"
 msgid "Sitemap"
 msgstr "Mappa del sito"
 
 #. TRANS: Plugin description.
-#: SitemapPlugin.php:238
 msgid "This plugin allows creation of sitemaps for Bing, Yahoo! and Google."
 msgstr ""
 "Iste plug-in permitte le creation de mappas de sito pro Bing, Yahoo! e "
diff --git a/plugins/Sitemap/locale/mk/LC_MESSAGES/Sitemap.po b/plugins/Sitemap/locale/mk/LC_MESSAGES/Sitemap.po
index 95ed335ff4..f9d1d3899d 100644
--- a/plugins/Sitemap/locale/mk/LC_MESSAGES/Sitemap.po
+++ b/plugins/Sitemap/locale/mk/LC_MESSAGES/Sitemap.po
@@ -9,82 +9,69 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Sitemap\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:56+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:13+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-14 17:22:07+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:15+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-sitemap\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
 
 #. TRANS: Title for sitemap.
-#: sitemapadminpanel.php:53
 msgid "Sitemap"
 msgstr "План на мреж. место"
 
 #. TRANS: Instructions for sitemap.
-#: sitemapadminpanel.php:64
 msgid "Sitemap settings for this StatusNet site"
 msgstr "Нагодувања за планот на ова StatusNet-мрежно место"
 
 #. TRANS: Field label.
-#: sitemapadminpanel.php:167
 msgid "Google key"
 msgstr "Google-клуч"
 
 #. TRANS: Title for field label.
-#: sitemapadminpanel.php:169
 msgid "Google Webmaster Tools verification key."
 msgstr "Потврден клуч за Управните алатки на Google."
 
 #. TRANS: Field label.
-#: sitemapadminpanel.php:175
 msgid "Yahoo key"
 msgstr "Yahoo-клуч"
 
 #. TRANS: Title for field label.
-#: sitemapadminpanel.php:177
 msgid "Yahoo! Site Explorer verification key."
 msgstr "Потврден клуч за Yahoo! Site Explorer."
 
 #. TRANS: Field label.
-#: sitemapadminpanel.php:183
 msgid "Bing key"
 msgstr "Bing-клуч"
 
 #. TRANS: Title for field label.
-#: sitemapadminpanel.php:185
 msgid "Bing Webmaster Tools verification key."
 msgstr "Потврден клуч за Управните алатки на Bing."
 
 #. TRANS: Submit button text to save sitemap settings.
-#: sitemapadminpanel.php:200
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Зачувај"
 
 #. TRANS: Submit button title to save sitemap settings.
-#: sitemapadminpanel.php:204
 msgid "Save sitemap settings."
 msgstr "Зачувај нагодувања за план."
 
 #. TRANS: Menu item title/tooltip
-#: SitemapPlugin.php:211
 msgid "Sitemap configuration"
 msgstr "Поставки за план"
 
 #. TRANS: Menu item for site administration
-#: SitemapPlugin.php:213
 msgctxt "MENU"
 msgid "Sitemap"
 msgstr "План на мреж. место"
 
 #. TRANS: Plugin description.
-#: SitemapPlugin.php:238
 msgid "This plugin allows creation of sitemaps for Bing, Yahoo! and Google."
 msgstr ""
 "Овој приклучок овозможува создавање на планови на мреж. места на Bing, "
diff --git a/plugins/Sitemap/locale/nl/LC_MESSAGES/Sitemap.po b/plugins/Sitemap/locale/nl/LC_MESSAGES/Sitemap.po
index 128f5cb72d..543473debb 100644
--- a/plugins/Sitemap/locale/nl/LC_MESSAGES/Sitemap.po
+++ b/plugins/Sitemap/locale/nl/LC_MESSAGES/Sitemap.po
@@ -9,82 +9,69 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Sitemap\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:56+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:13+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-14 17:22:07+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:15+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-sitemap\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANS: Title for sitemap.
-#: sitemapadminpanel.php:53
 msgid "Sitemap"
 msgstr "Sitemap"
 
 #. TRANS: Instructions for sitemap.
-#: sitemapadminpanel.php:64
 msgid "Sitemap settings for this StatusNet site"
 msgstr "Sitemapinstellingen voor deze StatusNetwebsite"
 
 #. TRANS: Field label.
-#: sitemapadminpanel.php:167
 msgid "Google key"
 msgstr "Googlesleutel"
 
 #. TRANS: Title for field label.
-#: sitemapadminpanel.php:169
 msgid "Google Webmaster Tools verification key."
 msgstr "Verificatiesleutel voor Google Webmaster Tools."
 
 #. TRANS: Field label.
-#: sitemapadminpanel.php:175
 msgid "Yahoo key"
 msgstr "Yahoosleutel"
 
 #. TRANS: Title for field label.
-#: sitemapadminpanel.php:177
 msgid "Yahoo! Site Explorer verification key."
 msgstr "Verificatiesleutel voor Yahoo! Site Explorer."
 
 #. TRANS: Field label.
-#: sitemapadminpanel.php:183
 msgid "Bing key"
 msgstr "Bingsleutel"
 
 #. TRANS: Title for field label.
-#: sitemapadminpanel.php:185
 msgid "Bing Webmaster Tools verification key."
 msgstr "Verificatiesleutel voor Bing Webmaster Tools."
 
 #. TRANS: Submit button text to save sitemap settings.
-#: sitemapadminpanel.php:200
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Opslaan"
 
 #. TRANS: Submit button title to save sitemap settings.
-#: sitemapadminpanel.php:204
 msgid "Save sitemap settings."
 msgstr "Instellingen voor sitemap opslaan."
 
 #. TRANS: Menu item title/tooltip
-#: SitemapPlugin.php:211
 msgid "Sitemap configuration"
 msgstr "Instellingen voor sitemap"
 
 #. TRANS: Menu item for site administration
-#: SitemapPlugin.php:213
 msgctxt "MENU"
 msgid "Sitemap"
 msgstr "Sitemap"
 
 #. TRANS: Plugin description.
-#: SitemapPlugin.php:238
 msgid "This plugin allows creation of sitemaps for Bing, Yahoo! and Google."
 msgstr ""
 "Deze plugin maakt het mogelijk sitemaps aan te maken voor Bing, Yahoo! en "
diff --git a/plugins/Sitemap/locale/ru/LC_MESSAGES/Sitemap.po b/plugins/Sitemap/locale/ru/LC_MESSAGES/Sitemap.po
index 3c3a31414d..71417660e2 100644
--- a/plugins/Sitemap/locale/ru/LC_MESSAGES/Sitemap.po
+++ b/plugins/Sitemap/locale/ru/LC_MESSAGES/Sitemap.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Sitemap\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:56+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:13+0000\n"
 "Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-14 17:22:07+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:15+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-sitemap\n"
@@ -23,68 +23,55 @@ msgstr ""
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
 #. TRANS: Title for sitemap.
-#: sitemapadminpanel.php:53
 msgid "Sitemap"
 msgstr "Карта сайта"
 
 #. TRANS: Instructions for sitemap.
-#: sitemapadminpanel.php:64
 msgid "Sitemap settings for this StatusNet site"
 msgstr "Настройки карты этого сайта на движке StatusNet"
 
 #. TRANS: Field label.
-#: sitemapadminpanel.php:167
 msgid "Google key"
 msgstr "Ключ Google"
 
 #. TRANS: Title for field label.
-#: sitemapadminpanel.php:169
 msgid "Google Webmaster Tools verification key."
 msgstr "Ключ для подтверждения в инструментах вебмастера Google."
 
 #. TRANS: Field label.
-#: sitemapadminpanel.php:175
 msgid "Yahoo key"
 msgstr "Ключ Yahoo"
 
 #. TRANS: Title for field label.
-#: sitemapadminpanel.php:177
 msgid "Yahoo! Site Explorer verification key."
 msgstr "Ключ для подтверждения в Yahoo! Site Explorer."
 
 #. TRANS: Field label.
-#: sitemapadminpanel.php:183
 msgid "Bing key"
 msgstr "Ключ Bing"
 
 #. TRANS: Title for field label.
-#: sitemapadminpanel.php:185
 msgid "Bing Webmaster Tools verification key."
 msgstr "Ключ для подтверждения в инструментах вебмастера Bing."
 
 #. TRANS: Submit button text to save sitemap settings.
-#: sitemapadminpanel.php:200
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Сохранить"
 
 #. TRANS: Submit button title to save sitemap settings.
-#: sitemapadminpanel.php:204
 msgid "Save sitemap settings."
 msgstr "Сохранить настройки карты сайта."
 
 #. TRANS: Menu item title/tooltip
-#: SitemapPlugin.php:211
 msgid "Sitemap configuration"
 msgstr "Настройки карты сайта"
 
 #. TRANS: Menu item for site administration
-#: SitemapPlugin.php:213
 msgctxt "MENU"
 msgid "Sitemap"
 msgstr "Карта сайта"
 
 #. TRANS: Plugin description.
-#: SitemapPlugin.php:238
 msgid "This plugin allows creation of sitemaps for Bing, Yahoo! and Google."
 msgstr "Этот плагин позволяет создавать карты сайта для Bing, Yahoo! и Google."
diff --git a/plugins/Sitemap/locale/tl/LC_MESSAGES/Sitemap.po b/plugins/Sitemap/locale/tl/LC_MESSAGES/Sitemap.po
index f3d33006cb..50a546bbae 100644
--- a/plugins/Sitemap/locale/tl/LC_MESSAGES/Sitemap.po
+++ b/plugins/Sitemap/locale/tl/LC_MESSAGES/Sitemap.po
@@ -9,82 +9,69 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Sitemap\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:56+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:13+0000\n"
 "Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-14 17:22:07+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:15+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-sitemap\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANS: Title for sitemap.
-#: sitemapadminpanel.php:53
 msgid "Sitemap"
 msgstr "Mapa ng sityo"
 
 #. TRANS: Instructions for sitemap.
-#: sitemapadminpanel.php:64
 msgid "Sitemap settings for this StatusNet site"
 msgstr "Mga katakdaan ng mapa ng sityo para sa sityong ito ng StatusNet"
 
 #. TRANS: Field label.
-#: sitemapadminpanel.php:167
 msgid "Google key"
 msgstr "Susi ng Google"
 
 #. TRANS: Title for field label.
-#: sitemapadminpanel.php:169
 msgid "Google Webmaster Tools verification key."
 msgstr "Susing pantiyak ng mga Kasangkapan ng Maestro ng Web ng Google."
 
 #. TRANS: Field label.
-#: sitemapadminpanel.php:175
 msgid "Yahoo key"
 msgstr "Susi ng Yahoo"
 
 #. TRANS: Title for field label.
-#: sitemapadminpanel.php:177
 msgid "Yahoo! Site Explorer verification key."
 msgstr "Susing pantiyak ng Panggalugad ng Sityo ng Yahoo!"
 
 #. TRANS: Field label.
-#: sitemapadminpanel.php:183
 msgid "Bing key"
 msgstr "Susi ng Bing"
 
 #. TRANS: Title for field label.
-#: sitemapadminpanel.php:185
 msgid "Bing Webmaster Tools verification key."
 msgstr "Susing pantiyak ng mga Kasangkapan ng Maestro ng Web ng Bing."
 
 #. TRANS: Submit button text to save sitemap settings.
-#: sitemapadminpanel.php:200
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Sagipin"
 
 #. TRANS: Submit button title to save sitemap settings.
-#: sitemapadminpanel.php:204
 msgid "Save sitemap settings."
 msgstr "Sagipin ang mga katakdaan ng mapa ng sityo."
 
 #. TRANS: Menu item title/tooltip
-#: SitemapPlugin.php:211
 msgid "Sitemap configuration"
 msgstr "Pagkakaayos ng mapa ng sityo"
 
 #. TRANS: Menu item for site administration
-#: SitemapPlugin.php:213
 msgctxt "MENU"
 msgid "Sitemap"
 msgstr "Mapa ng sityo"
 
 #. TRANS: Plugin description.
-#: SitemapPlugin.php:238
 msgid "This plugin allows creation of sitemaps for Bing, Yahoo! and Google."
 msgstr ""
 "Nagpapahintulot ang pampasak na ito ng paglikha ng mga mapa ng sityo para sa "
diff --git a/plugins/Sitemap/locale/uk/LC_MESSAGES/Sitemap.po b/plugins/Sitemap/locale/uk/LC_MESSAGES/Sitemap.po
index 2505524903..fb8203b2c7 100644
--- a/plugins/Sitemap/locale/uk/LC_MESSAGES/Sitemap.po
+++ b/plugins/Sitemap/locale/uk/LC_MESSAGES/Sitemap.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Sitemap\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:56+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:13+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-14 17:22:07+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:15+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-sitemap\n"
@@ -23,69 +23,56 @@ msgstr ""
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
 #. TRANS: Title for sitemap.
-#: sitemapadminpanel.php:53
 msgid "Sitemap"
 msgstr "Карта сайту"
 
 #. TRANS: Instructions for sitemap.
-#: sitemapadminpanel.php:64
 msgid "Sitemap settings for this StatusNet site"
 msgstr "Налаштування карти сайту на даному сайті StatusNet"
 
 #. TRANS: Field label.
-#: sitemapadminpanel.php:167
 msgid "Google key"
 msgstr "Ключ Google"
 
 #. TRANS: Title for field label.
-#: sitemapadminpanel.php:169
 msgid "Google Webmaster Tools verification key."
 msgstr "Ключ підтвердження Google Webmaster Tools"
 
 #. TRANS: Field label.
-#: sitemapadminpanel.php:175
 msgid "Yahoo key"
 msgstr "Ключ Yahoo"
 
 #. TRANS: Title for field label.
-#: sitemapadminpanel.php:177
 msgid "Yahoo! Site Explorer verification key."
 msgstr "Ключ підтвердження Yahoo! Site Explorer"
 
 #. TRANS: Field label.
-#: sitemapadminpanel.php:183
 msgid "Bing key"
 msgstr "Ключ Bing"
 
 #. TRANS: Title for field label.
-#: sitemapadminpanel.php:185
 msgid "Bing Webmaster Tools verification key."
 msgstr "Ключ підтвердження Bing Webmaster Tools"
 
 #. TRANS: Submit button text to save sitemap settings.
-#: sitemapadminpanel.php:200
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Зберегти"
 
 #. TRANS: Submit button title to save sitemap settings.
-#: sitemapadminpanel.php:204
 msgid "Save sitemap settings."
 msgstr "Зберегти налаштування карти сайту."
 
 #. TRANS: Menu item title/tooltip
-#: SitemapPlugin.php:211
 msgid "Sitemap configuration"
 msgstr "Конфігурація карти сайту"
 
 #. TRANS: Menu item for site administration
-#: SitemapPlugin.php:213
 msgctxt "MENU"
 msgid "Sitemap"
 msgstr "Карта сайту"
 
 #. TRANS: Plugin description.
-#: SitemapPlugin.php:238
 msgid "This plugin allows creation of sitemaps for Bing, Yahoo! and Google."
 msgstr ""
 "Цей додаток дозволяє створювати карти сайту для Bing, Yahoo! та Google."
diff --git a/plugins/SlicedFavorites/locale/SlicedFavorites.pot b/plugins/SlicedFavorites/locale/SlicedFavorites.pot
index 5e6912450e..eb953b9fd6 100644
--- a/plugins/SlicedFavorites/locale/SlicedFavorites.pot
+++ b/plugins/SlicedFavorites/locale/SlicedFavorites.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/SlicedFavorites/locale/de/LC_MESSAGES/SlicedFavorites.po b/plugins/SlicedFavorites/locale/de/LC_MESSAGES/SlicedFavorites.po
index 661e6bab1c..403b8c5e7b 100644
--- a/plugins/SlicedFavorites/locale/de/LC_MESSAGES/SlicedFavorites.po
+++ b/plugins/SlicedFavorites/locale/de/LC_MESSAGES/SlicedFavorites.po
@@ -9,26 +9,24 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SlicedFavorites\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:56+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:13+0000\n"
 "Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-14 17:22:08+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:16+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-slicedfavorites\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANS: Plugin description.
-#: SlicedFavoritesPlugin.php:129
 msgid "Shows timelines of popular notices for defined subsets of users."
 msgstr ""
 "Zeigt Zeitleisten beliebter Nachrichten für eine definierte Teilmenge von "
 "Benutzern."
 
 #. TRANS: Client exception.
-#: favoritedsliceaction.php:56
 msgid "Unknown favorites slice."
 msgstr "Unbekannter Favoriten-Slice."
diff --git a/plugins/SlicedFavorites/locale/fr/LC_MESSAGES/SlicedFavorites.po b/plugins/SlicedFavorites/locale/fr/LC_MESSAGES/SlicedFavorites.po
index 5ec335d54b..f44e2ccbaa 100644
--- a/plugins/SlicedFavorites/locale/fr/LC_MESSAGES/SlicedFavorites.po
+++ b/plugins/SlicedFavorites/locale/fr/LC_MESSAGES/SlicedFavorites.po
@@ -9,26 +9,24 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SlicedFavorites\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:56+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:13+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-14 17:22:08+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:16+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-slicedfavorites\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. TRANS: Plugin description.
-#: SlicedFavoritesPlugin.php:129
 msgid "Shows timelines of popular notices for defined subsets of users."
 msgstr ""
 "Affiche des listes d’avis populaires pour des sous-ensembles définis "
 "d’utilisateurs."
 
 #. TRANS: Client exception.
-#: favoritedsliceaction.php:56
 msgid "Unknown favorites slice."
 msgstr "Tranche préférée inconnue."
diff --git a/plugins/SlicedFavorites/locale/he/LC_MESSAGES/SlicedFavorites.po b/plugins/SlicedFavorites/locale/he/LC_MESSAGES/SlicedFavorites.po
index 67e4130f48..383ed9911a 100644
--- a/plugins/SlicedFavorites/locale/he/LC_MESSAGES/SlicedFavorites.po
+++ b/plugins/SlicedFavorites/locale/he/LC_MESSAGES/SlicedFavorites.po
@@ -9,24 +9,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SlicedFavorites\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:56+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:14+0000\n"
 "Language-Team: Hebrew <http://translatewiki.net/wiki/Portal:he>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-14 17:22:08+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:16+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-plugin-slicedfavorites\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANS: Plugin description.
-#: SlicedFavoritesPlugin.php:129
 msgid "Shows timelines of popular notices for defined subsets of users."
 msgstr "הצגת צירי זמן של התרעות נפוצות לקבוצות מסוימות של משתמשים."
 
 #. TRANS: Client exception.
-#: favoritedsliceaction.php:56
 msgid "Unknown favorites slice."
 msgstr "נתח מועדפים בלתי ידוע."
diff --git a/plugins/SlicedFavorites/locale/ia/LC_MESSAGES/SlicedFavorites.po b/plugins/SlicedFavorites/locale/ia/LC_MESSAGES/SlicedFavorites.po
index d129160ef3..b74a84105e 100644
--- a/plugins/SlicedFavorites/locale/ia/LC_MESSAGES/SlicedFavorites.po
+++ b/plugins/SlicedFavorites/locale/ia/LC_MESSAGES/SlicedFavorites.po
@@ -9,24 +9,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SlicedFavorites\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:56+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:14+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-14 17:22:08+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:16+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-slicedfavorites\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANS: Plugin description.
-#: SlicedFavoritesPlugin.php:129
 msgid "Shows timelines of popular notices for defined subsets of users."
 msgstr "Monstra chronologias de notas popular pro certe gruppos de usatores."
 
 #. TRANS: Client exception.
-#: favoritedsliceaction.php:56
 msgid "Unknown favorites slice."
 msgstr "Section de favorites incognite."
diff --git a/plugins/SlicedFavorites/locale/id/LC_MESSAGES/SlicedFavorites.po b/plugins/SlicedFavorites/locale/id/LC_MESSAGES/SlicedFavorites.po
index 0c0b8651b1..0b5dbf2afb 100644
--- a/plugins/SlicedFavorites/locale/id/LC_MESSAGES/SlicedFavorites.po
+++ b/plugins/SlicedFavorites/locale/id/LC_MESSAGES/SlicedFavorites.po
@@ -9,26 +9,24 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SlicedFavorites\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:56+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:14+0000\n"
 "Language-Team: Indonesian <http://translatewiki.net/wiki/Portal:id>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-14 17:22:08+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:16+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: id\n"
 "X-Message-Group: #out-statusnet-plugin-slicedfavorites\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. TRANS: Plugin description.
-#: SlicedFavoritesPlugin.php:129
 msgid "Shows timelines of popular notices for defined subsets of users."
 msgstr ""
 "Menampilkan garis waktu pemberitahuan populer untuk sekumpulan pengguna yang "
 "ditentukan."
 
 #. TRANS: Client exception.
-#: favoritedsliceaction.php:56
 msgid "Unknown favorites slice."
 msgstr "Pembagian favorit tidak diketahui."
diff --git a/plugins/SlicedFavorites/locale/mk/LC_MESSAGES/SlicedFavorites.po b/plugins/SlicedFavorites/locale/mk/LC_MESSAGES/SlicedFavorites.po
index c7634d1b04..988577d2c4 100644
--- a/plugins/SlicedFavorites/locale/mk/LC_MESSAGES/SlicedFavorites.po
+++ b/plugins/SlicedFavorites/locale/mk/LC_MESSAGES/SlicedFavorites.po
@@ -9,26 +9,24 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SlicedFavorites\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:56+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:14+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-14 17:22:08+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:16+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-slicedfavorites\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
 
 #. TRANS: Plugin description.
-#: SlicedFavoritesPlugin.php:129
 msgid "Shows timelines of popular notices for defined subsets of users."
 msgstr ""
 "Прикажува хронологии на популарни забелешки за определени подмножества "
 "корисници."
 
 #. TRANS: Client exception.
-#: favoritedsliceaction.php:56
 msgid "Unknown favorites slice."
 msgstr "Непознато парче од бендисаните."
diff --git a/plugins/SlicedFavorites/locale/nl/LC_MESSAGES/SlicedFavorites.po b/plugins/SlicedFavorites/locale/nl/LC_MESSAGES/SlicedFavorites.po
index 26bf1f4780..4c85e7d62b 100644
--- a/plugins/SlicedFavorites/locale/nl/LC_MESSAGES/SlicedFavorites.po
+++ b/plugins/SlicedFavorites/locale/nl/LC_MESSAGES/SlicedFavorites.po
@@ -9,26 +9,24 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SlicedFavorites\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:56+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:14+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-14 17:22:08+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:16+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-slicedfavorites\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANS: Plugin description.
-#: SlicedFavoritesPlugin.php:129
 msgid "Shows timelines of popular notices for defined subsets of users."
 msgstr ""
 "Geeft de tijdlijnen van populaire mededelingen weer voor ingestelde groepen "
 "gebruikers."
 
 #. TRANS: Client exception.
-#: favoritedsliceaction.php:56
 msgid "Unknown favorites slice."
 msgstr "Onbekende favorietengebruikersgroep."
diff --git a/plugins/SlicedFavorites/locale/ru/LC_MESSAGES/SlicedFavorites.po b/plugins/SlicedFavorites/locale/ru/LC_MESSAGES/SlicedFavorites.po
index e26c3aa0bf..9e738f8bb2 100644
--- a/plugins/SlicedFavorites/locale/ru/LC_MESSAGES/SlicedFavorites.po
+++ b/plugins/SlicedFavorites/locale/ru/LC_MESSAGES/SlicedFavorites.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SlicedFavorites\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:56+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:14+0000\n"
 "Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-14 17:22:08+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:16+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-slicedfavorites\n"
@@ -23,13 +23,11 @@ msgstr ""
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
 #. TRANS: Plugin description.
-#: SlicedFavoritesPlugin.php:129
 msgid "Shows timelines of popular notices for defined subsets of users."
 msgstr ""
 "Показывает хронологию популярных уведомлений для определенных подмножеств "
 "пользователей."
 
 #. TRANS: Client exception.
-#: favoritedsliceaction.php:56
 msgid "Unknown favorites slice."
 msgstr "Неизвестный срез избранного."
diff --git a/plugins/SlicedFavorites/locale/tl/LC_MESSAGES/SlicedFavorites.po b/plugins/SlicedFavorites/locale/tl/LC_MESSAGES/SlicedFavorites.po
index ed9b1df3ec..607cf89175 100644
--- a/plugins/SlicedFavorites/locale/tl/LC_MESSAGES/SlicedFavorites.po
+++ b/plugins/SlicedFavorites/locale/tl/LC_MESSAGES/SlicedFavorites.po
@@ -9,26 +9,24 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SlicedFavorites\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:56+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:14+0000\n"
 "Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-14 17:22:08+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:16+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-slicedfavorites\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANS: Plugin description.
-#: SlicedFavoritesPlugin.php:129
 msgid "Shows timelines of popular notices for defined subsets of users."
 msgstr ""
 "Nagpapakita ng mga guhit ng panahon ng tanyag na mga pabatid para sa "
 "inilarawang mga kabahaging pangkat ng mga tagagamit."
 
 #. TRANS: Client exception.
-#: favoritedsliceaction.php:56
 msgid "Unknown favorites slice."
 msgstr "Hindi nalalamang hiwa ng mga paborito."
diff --git a/plugins/SlicedFavorites/locale/uk/LC_MESSAGES/SlicedFavorites.po b/plugins/SlicedFavorites/locale/uk/LC_MESSAGES/SlicedFavorites.po
index cc08b9b994..e1109f6511 100644
--- a/plugins/SlicedFavorites/locale/uk/LC_MESSAGES/SlicedFavorites.po
+++ b/plugins/SlicedFavorites/locale/uk/LC_MESSAGES/SlicedFavorites.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SlicedFavorites\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:56+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:14+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-14 17:22:08+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:16+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-slicedfavorites\n"
@@ -23,11 +23,9 @@ msgstr ""
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
 #. TRANS: Plugin description.
-#: SlicedFavoritesPlugin.php:129
 msgid "Shows timelines of popular notices for defined subsets of users."
 msgstr "Показує стрічки популярних дописів для певних підмножин користувачів."
 
 #. TRANS: Client exception.
-#: favoritedsliceaction.php:56
 msgid "Unknown favorites slice."
 msgstr "Невідома вибірка обраних повідомлень."
diff --git a/plugins/SphinxSearch/locale/SphinxSearch.pot b/plugins/SphinxSearch/locale/SphinxSearch.pot
index 977547f73c..2748722d23 100644
--- a/plugins/SphinxSearch/locale/SphinxSearch.pot
+++ b/plugins/SphinxSearch/locale/SphinxSearch.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,6 +16,11 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#. TRANS: Server exception thrown when a database name cannot be identified.
+#: sphinxsearch.php:96
+msgid "Sphinx search could not identify database name."
+msgstr ""
+
 #. TRANS: Server exception.
 #: SphinxSearchPlugin.php:87
 msgid "Sphinx PHP extension must be installed."
@@ -25,8 +30,3 @@ msgstr ""
 #: SphinxSearchPlugin.php:118
 msgid "Plugin for Sphinx search backend."
 msgstr ""
-
-#. TRANS: Server exception thrown when a database name cannot be identified.
-#: sphinxsearch.php:96
-msgid "Sphinx search could not identify database name."
-msgstr ""
diff --git a/plugins/SphinxSearch/locale/de/LC_MESSAGES/SphinxSearch.po b/plugins/SphinxSearch/locale/de/LC_MESSAGES/SphinxSearch.po
index 2b49580dd1..4956f2464e 100644
--- a/plugins/SphinxSearch/locale/de/LC_MESSAGES/SphinxSearch.po
+++ b/plugins/SphinxSearch/locale/de/LC_MESSAGES/SphinxSearch.po
@@ -9,29 +9,26 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SphinxSearch\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:57+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:14+0000\n"
 "Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-14 17:22:09+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:18+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-sphinxsearch\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Server exception thrown when a database name cannot be identified.
+msgid "Sphinx search could not identify database name."
+msgstr "Sphinx-Suche konnte den Datenbanknamen nicht identifizieren."
+
 #. TRANS: Server exception.
-#: SphinxSearchPlugin.php:87
 msgid "Sphinx PHP extension must be installed."
 msgstr "Sphinx-PHP-Erweiterung muss installiert sein."
 
 #. TRANS: Plugin description.
-#: SphinxSearchPlugin.php:118
 msgid "Plugin for Sphinx search backend."
 msgstr "Plugin für das Sphinx-Suchbackend."
-
-#. TRANS: Server exception thrown when a database name cannot be identified.
-#: sphinxsearch.php:96
-msgid "Sphinx search could not identify database name."
-msgstr "Sphinx-Suche konnte den Datenbanknamen nicht identifizieren."
diff --git a/plugins/SphinxSearch/locale/fr/LC_MESSAGES/SphinxSearch.po b/plugins/SphinxSearch/locale/fr/LC_MESSAGES/SphinxSearch.po
index eb3da48b50..65978ac966 100644
--- a/plugins/SphinxSearch/locale/fr/LC_MESSAGES/SphinxSearch.po
+++ b/plugins/SphinxSearch/locale/fr/LC_MESSAGES/SphinxSearch.po
@@ -9,30 +9,27 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SphinxSearch\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:57+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:14+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-14 17:22:09+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:18+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-sphinxsearch\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#. TRANS: Server exception thrown when a database name cannot be identified.
+msgid "Sphinx search could not identify database name."
+msgstr ""
+"La recherche Sphinx n’a pas pu identifier le nom de la base de données."
+
 #. TRANS: Server exception.
-#: SphinxSearchPlugin.php:87
 msgid "Sphinx PHP extension must be installed."
 msgstr "L’extension PHP Sphinx doit être installée."
 
 #. TRANS: Plugin description.
-#: SphinxSearchPlugin.php:118
 msgid "Plugin for Sphinx search backend."
 msgstr "Extension pour le moteur de recherche Sphinx."
-
-#. TRANS: Server exception thrown when a database name cannot be identified.
-#: sphinxsearch.php:96
-msgid "Sphinx search could not identify database name."
-msgstr ""
-"La recherche Sphinx n’a pas pu identifier le nom de la base de données."
diff --git a/plugins/SphinxSearch/locale/ia/LC_MESSAGES/SphinxSearch.po b/plugins/SphinxSearch/locale/ia/LC_MESSAGES/SphinxSearch.po
index 35b4d81481..10a4e887e8 100644
--- a/plugins/SphinxSearch/locale/ia/LC_MESSAGES/SphinxSearch.po
+++ b/plugins/SphinxSearch/locale/ia/LC_MESSAGES/SphinxSearch.po
@@ -9,29 +9,26 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SphinxSearch\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:57+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:14+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-14 17:22:09+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:18+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-sphinxsearch\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Server exception thrown when a database name cannot be identified.
+msgid "Sphinx search could not identify database name."
+msgstr "Le recerca Sphinx non poteva identificar le nomine del base de datos."
+
 #. TRANS: Server exception.
-#: SphinxSearchPlugin.php:87
 msgid "Sphinx PHP extension must be installed."
 msgstr "Le extension PHP Sphinx debe esser installate."
 
 #. TRANS: Plugin description.
-#: SphinxSearchPlugin.php:118
 msgid "Plugin for Sphinx search backend."
 msgstr "Plug-in pro back-end de recerca Sphinx."
-
-#. TRANS: Server exception thrown when a database name cannot be identified.
-#: sphinxsearch.php:96
-msgid "Sphinx search could not identify database name."
-msgstr "Le recerca Sphinx non poteva identificar le nomine del base de datos."
diff --git a/plugins/SphinxSearch/locale/mk/LC_MESSAGES/SphinxSearch.po b/plugins/SphinxSearch/locale/mk/LC_MESSAGES/SphinxSearch.po
index fba5987035..1e2dc1fa05 100644
--- a/plugins/SphinxSearch/locale/mk/LC_MESSAGES/SphinxSearch.po
+++ b/plugins/SphinxSearch/locale/mk/LC_MESSAGES/SphinxSearch.po
@@ -9,29 +9,26 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SphinxSearch\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:27:57+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:14+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-14 17:22:09+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:18+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-sphinxsearch\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
 
+#. TRANS: Server exception thrown when a database name cannot be identified.
+msgid "Sphinx search could not identify database name."
+msgstr "Пребарувањето со Sphinx не можеше да го утврди името на базата."
+
 #. TRANS: Server exception.
-#: SphinxSearchPlugin.php:87
 msgid "Sphinx PHP extension must be installed."
 msgstr "Мора да се инсталира PHP-додатокот Sphinx"
 
 #. TRANS: Plugin description.
-#: SphinxSearchPlugin.php:118
 msgid "Plugin for Sphinx search backend."
 msgstr "Приклучок за пребарување со Sphinx."
-
-#. TRANS: Server exception thrown when a database name cannot be identified.
-#: sphinxsearch.php:96
-msgid "Sphinx search could not identify database name."
-msgstr "Пребарувањето со Sphinx не можеше да го утврди името на базата."
diff --git a/plugins/SphinxSearch/locale/nl/LC_MESSAGES/SphinxSearch.po b/plugins/SphinxSearch/locale/nl/LC_MESSAGES/SphinxSearch.po
index 01db579045..e0b69a2188 100644
--- a/plugins/SphinxSearch/locale/nl/LC_MESSAGES/SphinxSearch.po
+++ b/plugins/SphinxSearch/locale/nl/LC_MESSAGES/SphinxSearch.po
@@ -9,30 +9,27 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SphinxSearch\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:00+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:15+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-14 17:22:09+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:18+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-sphinxsearch\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Server exception thrown when a database name cannot be identified.
+msgid "Sphinx search could not identify database name."
+msgstr ""
+"Het was voor Sphinx search niet mogelijk een database te identificeren."
+
 #. TRANS: Server exception.
-#: SphinxSearchPlugin.php:87
 msgid "Sphinx PHP extension must be installed."
 msgstr "De PHP-extensie Sphinx moet geïnstalleerd. zijn."
 
 #. TRANS: Plugin description.
-#: SphinxSearchPlugin.php:118
 msgid "Plugin for Sphinx search backend."
 msgstr "Plug-in voor een Sphinxbackend."
-
-#. TRANS: Server exception thrown when a database name cannot be identified.
-#: sphinxsearch.php:96
-msgid "Sphinx search could not identify database name."
-msgstr ""
-"Het was voor Sphinx search niet mogelijk een database te identificeren."
diff --git a/plugins/SphinxSearch/locale/ru/LC_MESSAGES/SphinxSearch.po b/plugins/SphinxSearch/locale/ru/LC_MESSAGES/SphinxSearch.po
index b43b59fea2..1c0f748a63 100644
--- a/plugins/SphinxSearch/locale/ru/LC_MESSAGES/SphinxSearch.po
+++ b/plugins/SphinxSearch/locale/ru/LC_MESSAGES/SphinxSearch.po
@@ -9,30 +9,27 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SphinxSearch\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:03+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:15+0000\n"
 "Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-14 17:22:09+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:18+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-sphinxsearch\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
+#. TRANS: Server exception thrown when a database name cannot be identified.
+msgid "Sphinx search could not identify database name."
+msgstr "Поиск Sphinx не смог определить название базы данных."
+
 #. TRANS: Server exception.
-#: SphinxSearchPlugin.php:87
 msgid "Sphinx PHP extension must be installed."
 msgstr "Необходимо установить расширение Sphinx для PHP."
 
 #. TRANS: Plugin description.
-#: SphinxSearchPlugin.php:118
 msgid "Plugin for Sphinx search backend."
 msgstr "Плагин для поискового движка Sphinx."
-
-#. TRANS: Server exception thrown when a database name cannot be identified.
-#: sphinxsearch.php:96
-msgid "Sphinx search could not identify database name."
-msgstr "Поиск Sphinx не смог определить название базы данных."
diff --git a/plugins/SphinxSearch/locale/tl/LC_MESSAGES/SphinxSearch.po b/plugins/SphinxSearch/locale/tl/LC_MESSAGES/SphinxSearch.po
index c1fa820bd8..96856d152b 100644
--- a/plugins/SphinxSearch/locale/tl/LC_MESSAGES/SphinxSearch.po
+++ b/plugins/SphinxSearch/locale/tl/LC_MESSAGES/SphinxSearch.po
@@ -9,30 +9,27 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SphinxSearch\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:03+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:15+0000\n"
 "Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-14 17:22:09+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:18+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-sphinxsearch\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Server exception thrown when a database name cannot be identified.
+msgid "Sphinx search could not identify database name."
+msgstr ""
+"Hindi makilala ng panghanap ng Sphinx ang pangalan ng kalipunan ng dato."
+
 #. TRANS: Server exception.
-#: SphinxSearchPlugin.php:87
 msgid "Sphinx PHP extension must be installed."
 msgstr "Dapat na iluklok ang dugtong na PHP ng Sphinx."
 
 #. TRANS: Plugin description.
-#: SphinxSearchPlugin.php:118
 msgid "Plugin for Sphinx search backend."
 msgstr "Pamasak para sa wakas ng likuran ng panghanap ng Sphinx."
-
-#. TRANS: Server exception thrown when a database name cannot be identified.
-#: sphinxsearch.php:96
-msgid "Sphinx search could not identify database name."
-msgstr ""
-"Hindi makilala ng panghanap ng Sphinx ang pangalan ng kalipunan ng dato."
diff --git a/plugins/SphinxSearch/locale/uk/LC_MESSAGES/SphinxSearch.po b/plugins/SphinxSearch/locale/uk/LC_MESSAGES/SphinxSearch.po
index 245d5d14e4..ba64e81261 100644
--- a/plugins/SphinxSearch/locale/uk/LC_MESSAGES/SphinxSearch.po
+++ b/plugins/SphinxSearch/locale/uk/LC_MESSAGES/SphinxSearch.po
@@ -9,30 +9,27 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SphinxSearch\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:03+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:15+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-14 17:22:09+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:18+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-sphinxsearch\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
+#. TRANS: Server exception thrown when a database name cannot be identified.
+msgid "Sphinx search could not identify database name."
+msgstr "Пошук Sphinx не може визначити ім’я бази даних."
+
 #. TRANS: Server exception.
-#: SphinxSearchPlugin.php:87
 msgid "Sphinx PHP extension must be installed."
 msgstr "Розширення Sphinx PHP повинно бути встановлено."
 
 #. TRANS: Plugin description.
-#: SphinxSearchPlugin.php:118
 msgid "Plugin for Sphinx search backend."
 msgstr "Додаток для пошуку за допомогою Sphinx."
-
-#. TRANS: Server exception thrown when a database name cannot be identified.
-#: sphinxsearch.php:96
-msgid "Sphinx search could not identify database name."
-msgstr "Пошук Sphinx не може визначити ім’я бази даних."
diff --git a/plugins/StrictTransportSecurity/locale/StrictTransportSecurity.pot b/plugins/StrictTransportSecurity/locale/StrictTransportSecurity.pot
index 8b5836eb3e..25f7965e17 100644
--- a/plugins/StrictTransportSecurity/locale/StrictTransportSecurity.pot
+++ b/plugins/StrictTransportSecurity/locale/StrictTransportSecurity.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/StrictTransportSecurity/locale/ia/LC_MESSAGES/StrictTransportSecurity.po b/plugins/StrictTransportSecurity/locale/ia/LC_MESSAGES/StrictTransportSecurity.po
new file mode 100644
index 0000000000..c5d0ddd162
--- /dev/null
+++ b/plugins/StrictTransportSecurity/locale/ia/LC_MESSAGES/StrictTransportSecurity.po
@@ -0,0 +1,30 @@
+# Translation of StatusNet - StrictTransportSecurity to Interlingua (Interlingua)
+# Exported from translatewiki.net
+#
+# Author: McDutchie
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - StrictTransportSecurity\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:16+0000\n"
+"Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-03-03 20:42:25+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: ia\n"
+"X-Message-Group: #out-statusnet-plugin-stricttransportsecurity\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid ""
+"The Strict Transport Security plugin implements the Strict Transport "
+"Security header, improving the security of HTTPS only sites."
+msgstr ""
+"Le plug-in \"Strict Transport Security\" (securitate rigorose de "
+"transmission) implementa le capite (header) \"Strict Transport Security\", "
+"meliorante le securitate de sitos attingibile per HTTPS sol."
diff --git a/plugins/StrictTransportSecurity/locale/mk/LC_MESSAGES/StrictTransportSecurity.po b/plugins/StrictTransportSecurity/locale/mk/LC_MESSAGES/StrictTransportSecurity.po
new file mode 100644
index 0000000000..cf3a9745d4
--- /dev/null
+++ b/plugins/StrictTransportSecurity/locale/mk/LC_MESSAGES/StrictTransportSecurity.po
@@ -0,0 +1,29 @@
+# Translation of StatusNet - StrictTransportSecurity to Macedonian (Македонски)
+# Exported from translatewiki.net
+#
+# Author: Bjankuloski06
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - StrictTransportSecurity\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:16+0000\n"
+"Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-03-03 20:42:25+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: mk\n"
+"X-Message-Group: #out-statusnet-plugin-stricttransportsecurity\n"
+"Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
+
+msgid ""
+"The Strict Transport Security plugin implements the Strict Transport "
+"Security header, improving the security of HTTPS only sites."
+msgstr ""
+"Приклучокот Strict Transport Security става заглавие за строга безбедност "
+"при пренос, подобрувајќи ја безбедноста на мреж. места со само HTTPS."
diff --git a/plugins/StrictTransportSecurity/locale/nl/LC_MESSAGES/StrictTransportSecurity.po b/plugins/StrictTransportSecurity/locale/nl/LC_MESSAGES/StrictTransportSecurity.po
new file mode 100644
index 0000000000..8363f80661
--- /dev/null
+++ b/plugins/StrictTransportSecurity/locale/nl/LC_MESSAGES/StrictTransportSecurity.po
@@ -0,0 +1,29 @@
+# Translation of StatusNet - StrictTransportSecurity to Dutch (Nederlands)
+# Exported from translatewiki.net
+#
+# Author: Siebrand
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - StrictTransportSecurity\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:16+0000\n"
+"Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-03-03 20:42:25+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: nl\n"
+"X-Message-Group: #out-statusnet-plugin-stricttransportsecurity\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid ""
+"The Strict Transport Security plugin implements the Strict Transport "
+"Security header, improving the security of HTTPS only sites."
+msgstr ""
+"Implementeert de Strict Transport Security-header, waardoor de beveiliging "
+"van sites die alleen HTTPS gebruiken wordt verbeterd."
diff --git a/plugins/SubMirror/locale/SubMirror.pot b/plugins/SubMirror/locale/SubMirror.pot
index 2c331f21bc..81ae0a0f91 100644
--- a/plugins/SubMirror/locale/SubMirror.pot
+++ b/plugins/SubMirror/locale/SubMirror.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,65 +16,6 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: SubMirrorPlugin.php:90
-msgid "Pull feeds into your timeline!"
-msgstr ""
-
-#. TRANS: SubMirror plugin menu item on user settings page.
-#: SubMirrorPlugin.php:110
-msgctxt "MENU"
-msgid "Mirroring"
-msgstr ""
-
-#. TRANS: SubMirror plugin tooltip for user settings menu item.
-#: SubMirrorPlugin.php:112
-msgid "Configure mirroring of posts from other feeds"
-msgstr ""
-
-#: SubMirrorPlugin.php:183
-msgid "Mirrored feeds"
-msgstr ""
-
-#: lib/editmirrorform.php:83
-msgctxt "LABEL"
-msgid "Remote feed:"
-msgstr ""
-
-#: lib/editmirrorform.php:87
-msgctxt "LABEL"
-msgid "Local user"
-msgstr ""
-
-#: lib/editmirrorform.php:93
-msgid "Mirroring style"
-msgstr ""
-
-#: lib/editmirrorform.php:95
-msgid ""
-"Repeat: reference the original user's post (sometimes shows as 'RT @blah')"
-msgstr ""
-
-#: lib/editmirrorform.php:96
-msgid "Repost the content under my account"
-msgstr ""
-
-#: lib/editmirrorform.php:115
-msgid "Save"
-msgstr ""
-
-#: lib/editmirrorform.php:117
-msgid "Stop mirroring"
-msgstr ""
-
-#: lib/addmirrorform.php:59
-msgid "Web page or feed URL:"
-msgstr ""
-
-#: lib/addmirrorform.php:64
-msgctxt "BUTTON"
-msgid "Add feed"
-msgstr ""
-
 #: actions/basemirror.php:71
 msgid "Invalid feed URL."
 msgstr ""
@@ -132,3 +73,62 @@ msgid ""
 "You can mirror updates from many RSS and Atom feeds into your StatusNet "
 "timeline!"
 msgstr ""
+
+#: SubMirrorPlugin.php:90
+msgid "Pull feeds into your timeline!"
+msgstr ""
+
+#. TRANS: SubMirror plugin menu item on user settings page.
+#: SubMirrorPlugin.php:110
+msgctxt "MENU"
+msgid "Mirroring"
+msgstr ""
+
+#. TRANS: SubMirror plugin tooltip for user settings menu item.
+#: SubMirrorPlugin.php:112
+msgid "Configure mirroring of posts from other feeds"
+msgstr ""
+
+#: SubMirrorPlugin.php:183
+msgid "Mirrored feeds"
+msgstr ""
+
+#: lib/addmirrorform.php:59
+msgid "Web page or feed URL:"
+msgstr ""
+
+#: lib/addmirrorform.php:64
+msgctxt "BUTTON"
+msgid "Add feed"
+msgstr ""
+
+#: lib/editmirrorform.php:83
+msgctxt "LABEL"
+msgid "Remote feed:"
+msgstr ""
+
+#: lib/editmirrorform.php:87
+msgctxt "LABEL"
+msgid "Local user"
+msgstr ""
+
+#: lib/editmirrorform.php:93
+msgid "Mirroring style"
+msgstr ""
+
+#: lib/editmirrorform.php:95
+msgid ""
+"Repeat: reference the original user's post (sometimes shows as 'RT @blah')"
+msgstr ""
+
+#: lib/editmirrorform.php:96
+msgid "Repost the content under my account"
+msgstr ""
+
+#: lib/editmirrorform.php:115
+msgid "Save"
+msgstr ""
+
+#: lib/editmirrorform.php:117
+msgid "Stop mirroring"
+msgstr ""
diff --git a/plugins/SubMirror/locale/de/LC_MESSAGES/SubMirror.po b/plugins/SubMirror/locale/de/LC_MESSAGES/SubMirror.po
index 07d1c2a376..f3fb0f911f 100644
--- a/plugins/SubMirror/locale/de/LC_MESSAGES/SubMirror.po
+++ b/plugins/SubMirror/locale/de/LC_MESSAGES/SubMirror.po
@@ -9,133 +9,107 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SubMirror\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:05+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:18+0000\n"
 "Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-14 17:22:11+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:23+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-submirror\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: SubMirrorPlugin.php:90
+msgid "Invalid feed URL."
+msgstr "Ungültige Feed-URL."
+
+#. TRANS: Error message returned to user when setting up feed mirroring, but we were unable to resolve the given URL to a working feed.
+msgid "Invalid profile for mirroring."
+msgstr "Ungültiges Profil für das Spiegeln."
+
+msgid "Can't mirror a StatusNet group at this time."
+msgstr "Kann im Moment keine StatusNet-Gruppe spiegeln."
+
+msgid "This action only accepts POST requests."
+msgstr "Diese Aktion nimmt nur POST-Requests."
+
+msgid "There was a problem with your session token. Try again, please."
+msgstr "Es gab ein Problem mit deinem Sitzungstoken. Bitte versuche es erneut."
+
+msgid "Not logged in."
+msgstr "Nicht angemeldet."
+
+msgid "Subscribed"
+msgstr "Abonniert"
+
+msgid "Requested invalid profile to edit."
+msgstr "Ungültiges Profil zum Bearbeiten angefordert."
+
+msgid "Bad form data."
+msgstr "Ungültige Formulardaten."
+
+#. TRANS: Client error thrown when a mirror request is made and no result is retrieved.
+msgid "Requested edit of missing mirror."
+msgstr "Bearbeitung eines fehlenden Spiegels angefordert."
+
+msgid "Could not subscribe to feed."
+msgstr "Konnte den Feed nicht abonnieren."
+
+#. TRANS: Title.
+msgid "Feed mirror settings"
+msgstr "Feed-Spiegel-Einstellungen"
+
+#. TRANS: Instructions.
+msgid ""
+"You can mirror updates from many RSS and Atom feeds into your StatusNet "
+"timeline!"
+msgstr ""
+
 msgid "Pull feeds into your timeline!"
 msgstr "Ziehe Feeds in deine Zeitleiste!"
 
 #. TRANS: SubMirror plugin menu item on user settings page.
-#: SubMirrorPlugin.php:110
 msgctxt "MENU"
 msgid "Mirroring"
 msgstr "Spiegeln"
 
 #. TRANS: SubMirror plugin tooltip for user settings menu item.
-#: SubMirrorPlugin.php:112
 msgid "Configure mirroring of posts from other feeds"
 msgstr "Konfiguration des Spiegelns von Posts von anderen Feeds"
 
-#: SubMirrorPlugin.php:183
 msgid "Mirrored feeds"
 msgstr "Gespiegelte Feeds"
 
-#: lib/editmirrorform.php:83
+msgid "Web page or feed URL:"
+msgstr "Webseiten- oder Feed-URL:"
+
+msgctxt "BUTTON"
+msgid "Add feed"
+msgstr "Feed hinzufügen"
+
 msgctxt "LABEL"
 msgid "Remote feed:"
 msgstr "Remote-Feed:"
 
-#: lib/editmirrorform.php:87
 msgctxt "LABEL"
 msgid "Local user"
 msgstr "Lokaler Benutzer"
 
-#: lib/editmirrorform.php:93
 msgid "Mirroring style"
 msgstr "Spiegelungs-Stil"
 
-#: lib/editmirrorform.php:95
 msgid ""
 "Repeat: reference the original user's post (sometimes shows as 'RT @blah')"
 msgstr ""
 "Wiederholen: Auf den Post des ursprünglichen Benutzers beziehen (manchmal "
 "als „RT @blah“ dargestellt)"
 
-#: lib/editmirrorform.php:96
 msgid "Repost the content under my account"
 msgstr "Den Inhalt mit meinem Konto erneut posten"
 
-#: lib/editmirrorform.php:115
 msgid "Save"
 msgstr "Speichern"
 
-#: lib/editmirrorform.php:117
 msgid "Stop mirroring"
 msgstr "Mit dem Spiegeln aufhören"
-
-#: lib/addmirrorform.php:59
-msgid "Web page or feed URL:"
-msgstr "Webseiten- oder Feed-URL:"
-
-#: lib/addmirrorform.php:64
-msgctxt "BUTTON"
-msgid "Add feed"
-msgstr "Feed hinzufügen"
-
-#: actions/basemirror.php:71
-msgid "Invalid feed URL."
-msgstr "Ungültige Feed-URL."
-
-#. TRANS: Error message returned to user when setting up feed mirroring, but we were unable to resolve the given URL to a working feed.
-#: actions/basemirror.php:83
-msgid "Invalid profile for mirroring."
-msgstr "Ungültiges Profil für das Spiegeln."
-
-#: actions/basemirror.php:101
-msgid "Can't mirror a StatusNet group at this time."
-msgstr "Kann im Moment keine StatusNet-Gruppe spiegeln."
-
-#: actions/basemirror.php:115
-msgid "This action only accepts POST requests."
-msgstr "Diese Aktion nimmt nur POST-Requests."
-
-#: actions/basemirror.php:123
-msgid "There was a problem with your session token. Try again, please."
-msgstr "Es gab ein Problem mit deinem Sitzungstoken. Bitte versuche es erneut."
-
-#: actions/basemirror.php:133
-msgid "Not logged in."
-msgstr "Nicht angemeldet."
-
-#: actions/basemirror.php:156
-msgid "Subscribed"
-msgstr "Abonniert"
-
-#: actions/editmirror.php:68
-msgid "Requested invalid profile to edit."
-msgstr "Ungültiges Profil zum Bearbeiten angefordert."
-
-#: actions/editmirror.php:86
-msgid "Bad form data."
-msgstr "Ungültige Formulardaten."
-
-#. TRANS: Client error thrown when a mirror request is made and no result is retrieved.
-#: actions/editmirror.php:95
-msgid "Requested edit of missing mirror."
-msgstr "Bearbeitung eines fehlenden Spiegels angefordert."
-
-#: actions/addmirror.php:72
-msgid "Could not subscribe to feed."
-msgstr "Konnte den Feed nicht abonnieren."
-
-#. TRANS: Title.
-#: actions/mirrorsettings.php:42
-msgid "Feed mirror settings"
-msgstr "Feed-Spiegel-Einstellungen"
-
-#. TRANS: Instructions.
-#: actions/mirrorsettings.php:54
-msgid ""
-"You can mirror updates from many RSS and Atom feeds into your StatusNet "
-"timeline!"
-msgstr ""
diff --git a/plugins/SubMirror/locale/fr/LC_MESSAGES/SubMirror.po b/plugins/SubMirror/locale/fr/LC_MESSAGES/SubMirror.po
index 2933870198..5715014646 100644
--- a/plugins/SubMirror/locale/fr/LC_MESSAGES/SubMirror.po
+++ b/plugins/SubMirror/locale/fr/LC_MESSAGES/SubMirror.po
@@ -10,137 +10,111 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SubMirror\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:05+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:18+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-14 17:22:11+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:23+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-submirror\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: SubMirrorPlugin.php:90
-msgid "Pull feeds into your timeline!"
-msgstr "Importez des flux d’information dans votre agenda !"
-
-#. TRANS: SubMirror plugin menu item on user settings page.
-#: SubMirrorPlugin.php:110
-msgctxt "MENU"
-msgid "Mirroring"
-msgstr "Mise en miroir"
-
-#. TRANS: SubMirror plugin tooltip for user settings menu item.
-#: SubMirrorPlugin.php:112
-msgid "Configure mirroring of posts from other feeds"
-msgstr "Configurer la mise en miroir de messages provenant d’autres flux"
-
-#: SubMirrorPlugin.php:183
-msgid "Mirrored feeds"
-msgstr "Flux en miroir"
-
-#: lib/editmirrorform.php:83
-msgctxt "LABEL"
-msgid "Remote feed:"
-msgstr "Flux distant :"
-
-#: lib/editmirrorform.php:87
-msgctxt "LABEL"
-msgid "Local user"
-msgstr "Utilisateur local"
-
-#: lib/editmirrorform.php:93
-msgid "Mirroring style"
-msgstr "Style de mise en miroir"
-
-#: lib/editmirrorform.php:95
-msgid ""
-"Repeat: reference the original user's post (sometimes shows as 'RT @blah')"
-msgstr ""
-"Répéter : référence le message de l’auteur d’origine (montré parfois comme « "
-"RT @blabla »)"
-
-#: lib/editmirrorform.php:96
-msgid "Repost the content under my account"
-msgstr "Reposter le contenu sous mon compte"
-
-#: lib/editmirrorform.php:115
-msgid "Save"
-msgstr "Sauvegarder"
-
-#: lib/editmirrorform.php:117
-msgid "Stop mirroring"
-msgstr "Arrêter le miroir"
-
-#: lib/addmirrorform.php:59
-msgid "Web page or feed URL:"
-msgstr "Adresse URL de la page Web ou du flux :"
-
-#: lib/addmirrorform.php:64
-msgctxt "BUTTON"
-msgid "Add feed"
-msgstr "Ajouter le flux"
-
-#: actions/basemirror.php:71
 msgid "Invalid feed URL."
 msgstr "Adresse URL de flux invalide."
 
 #. TRANS: Error message returned to user when setting up feed mirroring, but we were unable to resolve the given URL to a working feed.
-#: actions/basemirror.php:83
 msgid "Invalid profile for mirroring."
 msgstr "Profil invalide pour la mise en miroir."
 
-#: actions/basemirror.php:101
 msgid "Can't mirror a StatusNet group at this time."
 msgstr "Impossible de mettre en miroir un groupe StatusNet actuellement."
 
-#: actions/basemirror.php:115
 msgid "This action only accepts POST requests."
 msgstr "Cette action n’accepte que les requêtes de type POST."
 
-#: actions/basemirror.php:123
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 "Un problème est survenu avec votre jeton de session. Veuillez essayer à "
 "nouveau."
 
-#: actions/basemirror.php:133
 msgid "Not logged in."
 msgstr "Non connecté."
 
-#: actions/basemirror.php:156
 msgid "Subscribed"
 msgstr "Abonné"
 
-#: actions/editmirror.php:68
 msgid "Requested invalid profile to edit."
 msgstr "Profil invalide demandé à modifier."
 
-#: actions/editmirror.php:86
 msgid "Bad form data."
 msgstr "Données de formulaire erronées."
 
 #. TRANS: Client error thrown when a mirror request is made and no result is retrieved.
-#: actions/editmirror.php:95
 msgid "Requested edit of missing mirror."
 msgstr "Miroir inexistant demandé à modifier."
 
-#: actions/addmirror.php:72
 msgid "Could not subscribe to feed."
 msgstr "Impossible de vous abonner au flux."
 
 #. TRANS: Title.
-#: actions/mirrorsettings.php:42
 msgid "Feed mirror settings"
 msgstr "Paramètres de miroir de flux"
 
 #. TRANS: Instructions.
-#: actions/mirrorsettings.php:54
 msgid ""
 "You can mirror updates from many RSS and Atom feeds into your StatusNet "
 "timeline!"
 msgstr ""
 "Vous pouvez mettre en miroir dans votre agenda StatusNet les mises à jour de "
 "nombreux flux RSS et Atom !"
+
+msgid "Pull feeds into your timeline!"
+msgstr "Importez des flux d’information dans votre agenda !"
+
+#. TRANS: SubMirror plugin menu item on user settings page.
+msgctxt "MENU"
+msgid "Mirroring"
+msgstr "Mise en miroir"
+
+#. TRANS: SubMirror plugin tooltip for user settings menu item.
+msgid "Configure mirroring of posts from other feeds"
+msgstr "Configurer la mise en miroir de messages provenant d’autres flux"
+
+msgid "Mirrored feeds"
+msgstr "Flux en miroir"
+
+msgid "Web page or feed URL:"
+msgstr "Adresse URL de la page Web ou du flux :"
+
+msgctxt "BUTTON"
+msgid "Add feed"
+msgstr "Ajouter le flux"
+
+msgctxt "LABEL"
+msgid "Remote feed:"
+msgstr "Flux distant :"
+
+msgctxt "LABEL"
+msgid "Local user"
+msgstr "Utilisateur local"
+
+msgid "Mirroring style"
+msgstr "Style de mise en miroir"
+
+msgid ""
+"Repeat: reference the original user's post (sometimes shows as 'RT @blah')"
+msgstr ""
+"Répéter : référence le message de l’auteur d’origine (montré parfois comme « "
+"RT @blabla »)"
+
+msgid "Repost the content under my account"
+msgstr "Reposter le contenu sous mon compte"
+
+msgid "Save"
+msgstr "Sauvegarder"
+
+msgid "Stop mirroring"
+msgstr "Arrêter le miroir"
diff --git a/plugins/SubMirror/locale/ia/LC_MESSAGES/SubMirror.po b/plugins/SubMirror/locale/ia/LC_MESSAGES/SubMirror.po
index 48fa001c4b..f6f1b5eb2a 100644
--- a/plugins/SubMirror/locale/ia/LC_MESSAGES/SubMirror.po
+++ b/plugins/SubMirror/locale/ia/LC_MESSAGES/SubMirror.po
@@ -9,135 +9,109 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SubMirror\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:05+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:18+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-14 17:22:11+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:23+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-submirror\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: SubMirrorPlugin.php:90
-msgid "Pull feeds into your timeline!"
-msgstr "Importar syndicationes in tu chronologia!"
-
-#. TRANS: SubMirror plugin menu item on user settings page.
-#: SubMirrorPlugin.php:110
-msgctxt "MENU"
-msgid "Mirroring"
-msgstr "Republication"
-
-#. TRANS: SubMirror plugin tooltip for user settings menu item.
-#: SubMirrorPlugin.php:112
-msgid "Configure mirroring of posts from other feeds"
-msgstr "Configurar le republication de messages de altere syndicationes"
-
-#: SubMirrorPlugin.php:183
-msgid "Mirrored feeds"
-msgstr "Speculos de syndicationes"
-
-#: lib/editmirrorform.php:83
-msgctxt "LABEL"
-msgid "Remote feed:"
-msgstr "Syndication remote:"
-
-#: lib/editmirrorform.php:87
-msgctxt "LABEL"
-msgid "Local user"
-msgstr "Usator local"
-
-#: lib/editmirrorform.php:93
-msgid "Mirroring style"
-msgstr "Stilo de republication"
-
-#: lib/editmirrorform.php:95
-msgid ""
-"Repeat: reference the original user's post (sometimes shows as 'RT @blah')"
-msgstr ""
-"Repeter: referer al message del usator original (monstrate a vices como 'RT "
-"@pseudonymo')"
-
-#: lib/editmirrorform.php:96
-msgid "Repost the content under my account"
-msgstr "Republicar le contento sub mi conto"
-
-#: lib/editmirrorform.php:115
-msgid "Save"
-msgstr "Salveguardar"
-
-#: lib/editmirrorform.php:117
-msgid "Stop mirroring"
-msgstr "Cessar le republication"
-
-#: lib/addmirrorform.php:59
-msgid "Web page or feed URL:"
-msgstr "URL de pagina web o syndication:"
-
-#: lib/addmirrorform.php:64
-msgctxt "BUTTON"
-msgid "Add feed"
-msgstr "Adder syndication"
-
-#: actions/basemirror.php:71
 msgid "Invalid feed URL."
 msgstr "URL de syndication invalide."
 
 #. TRANS: Error message returned to user when setting up feed mirroring, but we were unable to resolve the given URL to a working feed.
-#: actions/basemirror.php:83
 msgid "Invalid profile for mirroring."
 msgstr "Profilo invalide pro republication."
 
-#: actions/basemirror.php:101
 msgid "Can't mirror a StatusNet group at this time."
 msgstr "Al presente il es impossibile republicar un gruppo StatusNet."
 
-#: actions/basemirror.php:115
 msgid "This action only accepts POST requests."
 msgstr "Iste action accepta solmente le requestas de typo POST."
 
-#: actions/basemirror.php:123
 msgid "There was a problem with your session token. Try again, please."
 msgstr "Occurreva un problema con le indicio de tu session. Per favor reproba."
 
-#: actions/basemirror.php:133
 msgid "Not logged in."
 msgstr "Tu non ha aperite un session."
 
-#: actions/basemirror.php:156
 msgid "Subscribed"
 msgstr "Subscribite"
 
-#: actions/editmirror.php:68
 msgid "Requested invalid profile to edit."
 msgstr "Requestava un profilo invalide a modificar."
 
-#: actions/editmirror.php:86
 msgid "Bad form data."
 msgstr "Mal datos de formulario."
 
 #. TRANS: Client error thrown when a mirror request is made and no result is retrieved.
-#: actions/editmirror.php:95
 msgid "Requested edit of missing mirror."
 msgstr "Requestava le modification de un speculo mancante."
 
-#: actions/addmirror.php:72
 msgid "Could not subscribe to feed."
 msgstr "Non poteva subscriber al syndication."
 
 #. TRANS: Title.
-#: actions/mirrorsettings.php:42
 msgid "Feed mirror settings"
 msgstr "Configuration de speculo de syndication"
 
 #. TRANS: Instructions.
-#: actions/mirrorsettings.php:54
 msgid ""
 "You can mirror updates from many RSS and Atom feeds into your StatusNet "
 "timeline!"
 msgstr ""
 "Tu pote republicar actualisationes de multe syndicationes RSS e Atom in tu "
 "chronologia de StatusNet!"
+
+msgid "Pull feeds into your timeline!"
+msgstr "Importar syndicationes in tu chronologia!"
+
+#. TRANS: SubMirror plugin menu item on user settings page.
+msgctxt "MENU"
+msgid "Mirroring"
+msgstr "Republication"
+
+#. TRANS: SubMirror plugin tooltip for user settings menu item.
+msgid "Configure mirroring of posts from other feeds"
+msgstr "Configurar le republication de messages de altere syndicationes"
+
+msgid "Mirrored feeds"
+msgstr "Speculos de syndicationes"
+
+msgid "Web page or feed URL:"
+msgstr "URL de pagina web o syndication:"
+
+msgctxt "BUTTON"
+msgid "Add feed"
+msgstr "Adder syndication"
+
+msgctxt "LABEL"
+msgid "Remote feed:"
+msgstr "Syndication remote:"
+
+msgctxt "LABEL"
+msgid "Local user"
+msgstr "Usator local"
+
+msgid "Mirroring style"
+msgstr "Stilo de republication"
+
+msgid ""
+"Repeat: reference the original user's post (sometimes shows as 'RT @blah')"
+msgstr ""
+"Repeter: referer al message del usator original (monstrate a vices como 'RT "
+"@pseudonymo')"
+
+msgid "Repost the content under my account"
+msgstr "Republicar le contento sub mi conto"
+
+msgid "Save"
+msgstr "Salveguardar"
+
+msgid "Stop mirroring"
+msgstr "Cessar le republication"
diff --git a/plugins/SubMirror/locale/mk/LC_MESSAGES/SubMirror.po b/plugins/SubMirror/locale/mk/LC_MESSAGES/SubMirror.po
index 208fd8db5b..e6da0cb3ae 100644
--- a/plugins/SubMirror/locale/mk/LC_MESSAGES/SubMirror.po
+++ b/plugins/SubMirror/locale/mk/LC_MESSAGES/SubMirror.po
@@ -9,135 +9,109 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SubMirror\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:05+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:18+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-14 17:22:11+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:23+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-submirror\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
 
-#: SubMirrorPlugin.php:90
-msgid "Pull feeds into your timeline!"
-msgstr "Повлекувајте каналски емитувања во Вашата хронологија!"
-
-#. TRANS: SubMirror plugin menu item on user settings page.
-#: SubMirrorPlugin.php:110
-msgctxt "MENU"
-msgid "Mirroring"
-msgstr "Отсликување"
-
-#. TRANS: SubMirror plugin tooltip for user settings menu item.
-#: SubMirrorPlugin.php:112
-msgid "Configure mirroring of posts from other feeds"
-msgstr "Нагодување на отсликувањето на објавите од други канали"
-
-#: SubMirrorPlugin.php:183
-msgid "Mirrored feeds"
-msgstr "Огледални канали"
-
-#: lib/editmirrorform.php:83
-msgctxt "LABEL"
-msgid "Remote feed:"
-msgstr "Далечински канал:"
-
-#: lib/editmirrorform.php:87
-msgctxt "LABEL"
-msgid "Local user"
-msgstr "Локален корисник"
-
-#: lib/editmirrorform.php:93
-msgid "Mirroring style"
-msgstr "Стил на отсликување"
-
-#: lib/editmirrorform.php:95
-msgid ""
-"Repeat: reference the original user's post (sometimes shows as 'RT @blah')"
-msgstr ""
-"Повторување: наведете ја објавата на изворниот корисник (понекогаш се "
-"прикажува како „RT @blah“)"
-
-#: lib/editmirrorform.php:96
-msgid "Repost the content under my account"
-msgstr "Објави ја содржината под мојата сметка"
-
-#: lib/editmirrorform.php:115
-msgid "Save"
-msgstr "Зачувај"
-
-#: lib/editmirrorform.php:117
-msgid "Stop mirroring"
-msgstr "Престани со отсликување"
-
-#: lib/addmirrorform.php:59
-msgid "Web page or feed URL:"
-msgstr "Мреж. страница или URL на каналот:"
-
-#: lib/addmirrorform.php:64
-msgctxt "BUTTON"
-msgid "Add feed"
-msgstr "Додај канал"
-
-#: actions/basemirror.php:71
 msgid "Invalid feed URL."
 msgstr "Неважечка URL-адреса за каналот."
 
 #. TRANS: Error message returned to user when setting up feed mirroring, but we were unable to resolve the given URL to a working feed.
-#: actions/basemirror.php:83
 msgid "Invalid profile for mirroring."
 msgstr "Неважечки профил за отсликување."
 
-#: actions/basemirror.php:101
 msgid "Can't mirror a StatusNet group at this time."
 msgstr "Моментално не можам да отсликам група од StatusNet."
 
-#: actions/basemirror.php:115
 msgid "This action only accepts POST requests."
 msgstr "Оваа постапка прифаќа само POST-барања."
 
-#: actions/basemirror.php:123
 msgid "There was a problem with your session token. Try again, please."
 msgstr "Се појави проблем со жетонот на Вашата сесија. Обидете се подоцна."
 
-#: actions/basemirror.php:133
 msgid "Not logged in."
 msgstr "Не сте најавени."
 
-#: actions/basemirror.php:156
 msgid "Subscribed"
 msgstr "Претплатено"
 
-#: actions/editmirror.php:68
 msgid "Requested invalid profile to edit."
 msgstr "Побаран е неважечки профил за уредување."
 
-#: actions/editmirror.php:86
 msgid "Bad form data."
 msgstr "Неисправни податоци за образецот."
 
 #. TRANS: Client error thrown when a mirror request is made and no result is retrieved.
-#: actions/editmirror.php:95
 msgid "Requested edit of missing mirror."
 msgstr "Побаравте уредување на отсликување што недостасува."
 
-#: actions/addmirror.php:72
 msgid "Could not subscribe to feed."
 msgstr "Не можев да Ве претплатам на каналот."
 
 #. TRANS: Title.
-#: actions/mirrorsettings.php:42
 msgid "Feed mirror settings"
 msgstr "Нагодувања на каналското отсликување"
 
 #. TRANS: Instructions.
-#: actions/mirrorsettings.php:54
 msgid ""
 "You can mirror updates from many RSS and Atom feeds into your StatusNet "
 "timeline!"
 msgstr ""
 "Можете да отсликувате поднови од многу RSS- и Atom-канали во Вашата "
 "хронологија на StatusNet!"
+
+msgid "Pull feeds into your timeline!"
+msgstr "Повлекувајте каналски емитувања во Вашата хронологија!"
+
+#. TRANS: SubMirror plugin menu item on user settings page.
+msgctxt "MENU"
+msgid "Mirroring"
+msgstr "Отсликување"
+
+#. TRANS: SubMirror plugin tooltip for user settings menu item.
+msgid "Configure mirroring of posts from other feeds"
+msgstr "Нагодување на отсликувањето на објавите од други канали"
+
+msgid "Mirrored feeds"
+msgstr "Огледални канали"
+
+msgid "Web page or feed URL:"
+msgstr "Мреж. страница или URL на каналот:"
+
+msgctxt "BUTTON"
+msgid "Add feed"
+msgstr "Додај канал"
+
+msgctxt "LABEL"
+msgid "Remote feed:"
+msgstr "Далечински канал:"
+
+msgctxt "LABEL"
+msgid "Local user"
+msgstr "Локален корисник"
+
+msgid "Mirroring style"
+msgstr "Стил на отсликување"
+
+msgid ""
+"Repeat: reference the original user's post (sometimes shows as 'RT @blah')"
+msgstr ""
+"Повторување: наведете ја објавата на изворниот корисник (понекогаш се "
+"прикажува како „RT @blah“)"
+
+msgid "Repost the content under my account"
+msgstr "Објави ја содржината под мојата сметка"
+
+msgid "Save"
+msgstr "Зачувај"
+
+msgid "Stop mirroring"
+msgstr "Престани со отсликување"
diff --git a/plugins/SubMirror/locale/nl/LC_MESSAGES/SubMirror.po b/plugins/SubMirror/locale/nl/LC_MESSAGES/SubMirror.po
index e603027c02..f61cf8bab0 100644
--- a/plugins/SubMirror/locale/nl/LC_MESSAGES/SubMirror.po
+++ b/plugins/SubMirror/locale/nl/LC_MESSAGES/SubMirror.po
@@ -9,137 +9,111 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SubMirror\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:05+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:18+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-14 17:22:11+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:23+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-submirror\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: SubMirrorPlugin.php:90
-msgid "Pull feeds into your timeline!"
-msgstr "Neem feeds op in uw tijdlijn!"
-
-#. TRANS: SubMirror plugin menu item on user settings page.
-#: SubMirrorPlugin.php:110
-msgctxt "MENU"
-msgid "Mirroring"
-msgstr "Spiegelen"
-
-#. TRANS: SubMirror plugin tooltip for user settings menu item.
-#: SubMirrorPlugin.php:112
-msgid "Configure mirroring of posts from other feeds"
-msgstr "Spiegelen instellen voor berichten van andere feeds"
-
-#: SubMirrorPlugin.php:183
-msgid "Mirrored feeds"
-msgstr "Gespiegelde feeds"
-
-#: lib/editmirrorform.php:83
-msgctxt "LABEL"
-msgid "Remote feed:"
-msgstr "Bronfeed:"
-
-#: lib/editmirrorform.php:87
-msgctxt "LABEL"
-msgid "Local user"
-msgstr "Lokale gebruiker"
-
-#: lib/editmirrorform.php:93
-msgid "Mirroring style"
-msgstr "Spiegelstijl"
-
-#: lib/editmirrorform.php:95
-msgid ""
-"Repeat: reference the original user's post (sometimes shows as 'RT @blah')"
-msgstr ""
-"Herhalen: refereer aan het bericht van de originele gebruiker (wordt soms "
-"weergegeven als \"RT @blah ...\")"
-
-#: lib/editmirrorform.php:96
-msgid "Repost the content under my account"
-msgstr "De inhoud herhalen alsof die van mij komt"
-
-#: lib/editmirrorform.php:115
-msgid "Save"
-msgstr "Opslaan"
-
-#: lib/editmirrorform.php:117
-msgid "Stop mirroring"
-msgstr "Spiegelen beëindigen"
-
-#: lib/addmirrorform.php:59
-msgid "Web page or feed URL:"
-msgstr "URL van webpagina of feed:"
-
-#: lib/addmirrorform.php:64
-msgctxt "BUTTON"
-msgid "Add feed"
-msgstr "Feed toevoegen"
-
-#: actions/basemirror.php:71
 msgid "Invalid feed URL."
 msgstr "Ongeldige URL voor feed."
 
 #. TRANS: Error message returned to user when setting up feed mirroring, but we were unable to resolve the given URL to a working feed.
-#: actions/basemirror.php:83
 msgid "Invalid profile for mirroring."
 msgstr "Ongeldig profiel om te spiegelen."
 
-#: actions/basemirror.php:101
 msgid "Can't mirror a StatusNet group at this time."
 msgstr "Het is niet mogelijk om een StatusNet-groep te spiegelen."
 
-#: actions/basemirror.php:115
 msgid "This action only accepts POST requests."
 msgstr "Deze handeling accepteert alleen POST-verzoeken."
 
-#: actions/basemirror.php:123
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 "Er is een probleem ontstaan met uw sessie. Probeer het nog een keer, "
 "alstublieft."
 
-#: actions/basemirror.php:133
 msgid "Not logged in."
 msgstr "Niet aangemeld."
 
-#: actions/basemirror.php:156
 msgid "Subscribed"
 msgstr "Geabonneerd"
 
-#: actions/editmirror.php:68
 msgid "Requested invalid profile to edit."
 msgstr "Er is een ongeldig profiel opgevraagd om te bewerken."
 
-#: actions/editmirror.php:86
 msgid "Bad form data."
 msgstr "Onjuiste formuliergegevens."
 
 #. TRANS: Client error thrown when a mirror request is made and no result is retrieved.
-#: actions/editmirror.php:95
 msgid "Requested edit of missing mirror."
 msgstr "Er is een missende spiegel opgevraagd om te bewerken."
 
-#: actions/addmirror.php:72
 msgid "Could not subscribe to feed."
 msgstr "Het abonneren op de feed is mislukt."
 
 #. TRANS: Title.
-#: actions/mirrorsettings.php:42
 msgid "Feed mirror settings"
 msgstr "Instellingen voor spiegelfeed"
 
 #. TRANS: Instructions.
-#: actions/mirrorsettings.php:54
 msgid ""
 "You can mirror updates from many RSS and Atom feeds into your StatusNet "
 "timeline!"
 msgstr ""
 "U kunt statusupdates vanuit veel RSS- en Atomfeeds spiegelen in uit "
 "StatusNet-tijdlijn."
+
+msgid "Pull feeds into your timeline!"
+msgstr "Neem feeds op in uw tijdlijn!"
+
+#. TRANS: SubMirror plugin menu item on user settings page.
+msgctxt "MENU"
+msgid "Mirroring"
+msgstr "Spiegelen"
+
+#. TRANS: SubMirror plugin tooltip for user settings menu item.
+msgid "Configure mirroring of posts from other feeds"
+msgstr "Spiegelen instellen voor berichten van andere feeds"
+
+msgid "Mirrored feeds"
+msgstr "Gespiegelde feeds"
+
+msgid "Web page or feed URL:"
+msgstr "URL van webpagina of feed:"
+
+msgctxt "BUTTON"
+msgid "Add feed"
+msgstr "Feed toevoegen"
+
+msgctxt "LABEL"
+msgid "Remote feed:"
+msgstr "Bronfeed:"
+
+msgctxt "LABEL"
+msgid "Local user"
+msgstr "Lokale gebruiker"
+
+msgid "Mirroring style"
+msgstr "Spiegelstijl"
+
+msgid ""
+"Repeat: reference the original user's post (sometimes shows as 'RT @blah')"
+msgstr ""
+"Herhalen: refereer aan het bericht van de originele gebruiker (wordt soms "
+"weergegeven als \"RT @blah ...\")"
+
+msgid "Repost the content under my account"
+msgstr "De inhoud herhalen alsof die van mij komt"
+
+msgid "Save"
+msgstr "Opslaan"
+
+msgid "Stop mirroring"
+msgstr "Spiegelen beëindigen"
diff --git a/plugins/SubMirror/locale/tl/LC_MESSAGES/SubMirror.po b/plugins/SubMirror/locale/tl/LC_MESSAGES/SubMirror.po
index 15bdb4b660..cd82af0273 100644
--- a/plugins/SubMirror/locale/tl/LC_MESSAGES/SubMirror.po
+++ b/plugins/SubMirror/locale/tl/LC_MESSAGES/SubMirror.po
@@ -9,135 +9,109 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SubMirror\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:06+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:18+0000\n"
 "Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-14 17:22:11+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:23+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-submirror\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: SubMirrorPlugin.php:90
-msgid "Pull feeds into your timeline!"
-msgstr "Hilahin ang mga pakain papasok sa iyong guhit ng panahon!"
-
-#. TRANS: SubMirror plugin menu item on user settings page.
-#: SubMirrorPlugin.php:110
-msgctxt "MENU"
-msgid "Mirroring"
-msgstr "Sinasalamin"
-
-#. TRANS: SubMirror plugin tooltip for user settings menu item.
-#: SubMirrorPlugin.php:112
-msgid "Configure mirroring of posts from other feeds"
-msgstr "Iayos ang pagsasalamin ng mga pagpapaskil mula sa ibang mga pakain"
-
-#: SubMirrorPlugin.php:183
-msgid "Mirrored feeds"
-msgstr ""
-
-#: lib/editmirrorform.php:83
-msgctxt "LABEL"
-msgid "Remote feed:"
-msgstr "Pakaing malayo:"
-
-#: lib/editmirrorform.php:87
-msgctxt "LABEL"
-msgid "Local user"
-msgstr "Katutubong tagagamit"
-
-#: lib/editmirrorform.php:93
-msgid "Mirroring style"
-msgstr "Estilo ng pagsasalamin"
-
-#: lib/editmirrorform.php:95
-msgid ""
-"Repeat: reference the original user's post (sometimes shows as 'RT @blah')"
-msgstr ""
-"Ulitin: sangguniin ang orihinal na pagpapaskil ng tagagamit (minsang "
-"ipinapakita bilang 'RT @blah')"
-
-#: lib/editmirrorform.php:96
-msgid "Repost the content under my account"
-msgstr "Muling ipaskil ang nilalaman sa ilalim ng aking akawnt"
-
-#: lib/editmirrorform.php:115
-msgid "Save"
-msgstr "Sagipin"
-
-#: lib/editmirrorform.php:117
-msgid "Stop mirroring"
-msgstr "Ihinto ang pagsasalamin"
-
-#: lib/addmirrorform.php:59
-msgid "Web page or feed URL:"
-msgstr "URL ng pahina sa web o pakain:"
-
-#: lib/addmirrorform.php:64
-msgctxt "BUTTON"
-msgid "Add feed"
-msgstr "Idagdag ang pakain"
-
-#: actions/basemirror.php:71
 msgid "Invalid feed URL."
 msgstr "Hindi tanggap na URL ng pakain."
 
 #. TRANS: Error message returned to user when setting up feed mirroring, but we were unable to resolve the given URL to a working feed.
-#: actions/basemirror.php:83
 msgid "Invalid profile for mirroring."
 msgstr "Hindi tanggap na balangkas para sa pagsasalamin."
 
-#: actions/basemirror.php:101
 msgid "Can't mirror a StatusNet group at this time."
 msgstr "Hindi maisalamin sa ngayon ang isang pangkat ng StatusNet."
 
-#: actions/basemirror.php:115
 msgid "This action only accepts POST requests."
 msgstr "Ang galaw na ito ay tumatanggap lamang ng mga kahilingang POST."
 
-#: actions/basemirror.php:123
 msgid "There was a problem with your session token. Try again, please."
 msgstr "May isang suliranin sa iyong token ng sesyon. Pakisubukan uli."
 
-#: actions/basemirror.php:133
 msgid "Not logged in."
 msgstr "Hindi nakalagda."
 
-#: actions/basemirror.php:156
 msgid "Subscribed"
 msgstr "Tumanggap ng sipi"
 
-#: actions/editmirror.php:68
 msgid "Requested invalid profile to edit."
 msgstr "Hiniling na pamamatnugutang hindi tanggap na balangkas."
 
-#: actions/editmirror.php:86
 msgid "Bad form data."
 msgstr "Datong may masamang anyo."
 
 #. TRANS: Client error thrown when a mirror request is made and no result is retrieved.
-#: actions/editmirror.php:95
 msgid "Requested edit of missing mirror."
 msgstr "Hiniling na pagpatnugot ng nawawalang salamin."
 
-#: actions/addmirror.php:72
 msgid "Could not subscribe to feed."
 msgstr "Hindi magawang makatanggap ng pakain."
 
 #. TRANS: Title.
-#: actions/mirrorsettings.php:42
 msgid "Feed mirror settings"
 msgstr "Mga katakdaan ng salamin ng pakain"
 
 #. TRANS: Instructions.
-#: actions/mirrorsettings.php:54
 msgid ""
 "You can mirror updates from many RSS and Atom feeds into your StatusNet "
 "timeline!"
 msgstr ""
 "Maisasalamin mo ang mga pagsasapanahon mula sa maraming mga pakain ng RSS at "
 "Atom sa iyong guhit ng panahon ng StatusNet!"
+
+msgid "Pull feeds into your timeline!"
+msgstr "Hilahin ang mga pakain papasok sa iyong guhit ng panahon!"
+
+#. TRANS: SubMirror plugin menu item on user settings page.
+msgctxt "MENU"
+msgid "Mirroring"
+msgstr "Sinasalamin"
+
+#. TRANS: SubMirror plugin tooltip for user settings menu item.
+msgid "Configure mirroring of posts from other feeds"
+msgstr "Iayos ang pagsasalamin ng mga pagpapaskil mula sa ibang mga pakain"
+
+msgid "Mirrored feeds"
+msgstr ""
+
+msgid "Web page or feed URL:"
+msgstr "URL ng pahina sa web o pakain:"
+
+msgctxt "BUTTON"
+msgid "Add feed"
+msgstr "Idagdag ang pakain"
+
+msgctxt "LABEL"
+msgid "Remote feed:"
+msgstr "Pakaing malayo:"
+
+msgctxt "LABEL"
+msgid "Local user"
+msgstr "Katutubong tagagamit"
+
+msgid "Mirroring style"
+msgstr "Estilo ng pagsasalamin"
+
+msgid ""
+"Repeat: reference the original user's post (sometimes shows as 'RT @blah')"
+msgstr ""
+"Ulitin: sangguniin ang orihinal na pagpapaskil ng tagagamit (minsang "
+"ipinapakita bilang 'RT @blah')"
+
+msgid "Repost the content under my account"
+msgstr "Muling ipaskil ang nilalaman sa ilalim ng aking akawnt"
+
+msgid "Save"
+msgstr "Sagipin"
+
+msgid "Stop mirroring"
+msgstr "Ihinto ang pagsasalamin"
diff --git a/plugins/SubMirror/locale/uk/LC_MESSAGES/SubMirror.po b/plugins/SubMirror/locale/uk/LC_MESSAGES/SubMirror.po
index ac9e7741e5..8c57930fdf 100644
--- a/plugins/SubMirror/locale/uk/LC_MESSAGES/SubMirror.po
+++ b/plugins/SubMirror/locale/uk/LC_MESSAGES/SubMirror.po
@@ -9,136 +9,110 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SubMirror\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:06+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:18+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-14 17:22:11+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:23+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-submirror\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: SubMirrorPlugin.php:90
-msgid "Pull feeds into your timeline!"
-msgstr "Стягування веб-каналів до вашої стрічки повідомлень!"
-
-#. TRANS: SubMirror plugin menu item on user settings page.
-#: SubMirrorPlugin.php:110
-msgctxt "MENU"
-msgid "Mirroring"
-msgstr "Дзеркала"
-
-#. TRANS: SubMirror plugin tooltip for user settings menu item.
-#: SubMirrorPlugin.php:112
-msgid "Configure mirroring of posts from other feeds"
-msgstr "Конфігурація віддзеркалення дописів з інших веб-стрічок"
-
-#: SubMirrorPlugin.php:183
-msgid "Mirrored feeds"
-msgstr "Дзеркала"
-
-#: lib/editmirrorform.php:83
-msgctxt "LABEL"
-msgid "Remote feed:"
-msgstr "Віддалена веб-стрічка:"
-
-#: lib/editmirrorform.php:87
-msgctxt "LABEL"
-msgid "Local user"
-msgstr "Тутешній користувач"
-
-#: lib/editmirrorform.php:93
-msgid "Mirroring style"
-msgstr "Форма віддзеркалення"
-
-#: lib/editmirrorform.php:95
-msgid ""
-"Repeat: reference the original user's post (sometimes shows as 'RT @blah')"
-msgstr ""
-"Повторення: посилання до оригінального допису користувача (щось на зразок «RT "
-"@pupkin»)"
-
-#: lib/editmirrorform.php:96
-msgid "Repost the content under my account"
-msgstr "Повторення змісту під моїм акаунтом"
-
-#: lib/editmirrorform.php:115
-msgid "Save"
-msgstr "Зберегти"
-
-#: lib/editmirrorform.php:117
-msgid "Stop mirroring"
-msgstr "Зупинити віддзеркалення"
-
-#: lib/addmirrorform.php:59
-msgid "Web page or feed URL:"
-msgstr "Веб-сторінка або ж URL-адреса стрічки:"
-
-#: lib/addmirrorform.php:64
-msgctxt "BUTTON"
-msgid "Add feed"
-msgstr "Додати веб-стрічку"
-
-#: actions/basemirror.php:71
 msgid "Invalid feed URL."
 msgstr "Помилкова URL-адреса веб-стрічки."
 
 #. TRANS: Error message returned to user when setting up feed mirroring, but we were unable to resolve the given URL to a working feed.
-#: actions/basemirror.php:83
 msgid "Invalid profile for mirroring."
 msgstr "Помилковий профіль для віддзеркалення."
 
-#: actions/basemirror.php:101
 msgid "Can't mirror a StatusNet group at this time."
 msgstr "На даний момент не можу віддзеркалювати спільноту на сайті StatusNet."
 
-#: actions/basemirror.php:115
 msgid "This action only accepts POST requests."
 msgstr "Ця дія приймає запити лише за формою POST."
 
-#: actions/basemirror.php:123
 msgid "There was a problem with your session token. Try again, please."
 msgstr "Виникли певні проблеми з токеном сесії. Спробуйте знов, будь ласка."
 
-#: actions/basemirror.php:133
 msgid "Not logged in."
 msgstr "Ви не увійшли до системи."
 
-#: actions/basemirror.php:156
 msgid "Subscribed"
 msgstr "Підписані"
 
-#: actions/editmirror.php:68
 msgid "Requested invalid profile to edit."
 msgstr "Було запитано невірний профіль для редагування."
 
-#: actions/editmirror.php:86
 msgid "Bad form data."
 msgstr "Невірні дані форми."
 
 #. TRANS: Client error thrown when a mirror request is made and no result is retrieved.
-#: actions/editmirror.php:95
 msgid "Requested edit of missing mirror."
 msgstr "Запитано редагування зниклого дзеркала."
 
-#: actions/addmirror.php:72
 msgid "Could not subscribe to feed."
 msgstr "Не можу підписатися до веб-стрічки."
 
 #. TRANS: Title.
-#: actions/mirrorsettings.php:42
 msgid "Feed mirror settings"
 msgstr "Налаштування дзеркала веб-стрічки"
 
 #. TRANS: Instructions.
-#: actions/mirrorsettings.php:54
 msgid ""
 "You can mirror updates from many RSS and Atom feeds into your StatusNet "
 "timeline!"
 msgstr ""
 "Ви маєте можливість віддзеркалювати оновлення багатьох веб-стрічок формату "
 "RSS або Atom одразу до стрічки своїх дописів на сайті StatusNet!"
+
+msgid "Pull feeds into your timeline!"
+msgstr "Стягування веб-каналів до вашої стрічки повідомлень!"
+
+#. TRANS: SubMirror plugin menu item on user settings page.
+msgctxt "MENU"
+msgid "Mirroring"
+msgstr "Дзеркала"
+
+#. TRANS: SubMirror plugin tooltip for user settings menu item.
+msgid "Configure mirroring of posts from other feeds"
+msgstr "Конфігурація віддзеркалення дописів з інших веб-стрічок"
+
+msgid "Mirrored feeds"
+msgstr "Дзеркала"
+
+msgid "Web page or feed URL:"
+msgstr "Веб-сторінка або ж URL-адреса стрічки:"
+
+msgctxt "BUTTON"
+msgid "Add feed"
+msgstr "Додати веб-стрічку"
+
+msgctxt "LABEL"
+msgid "Remote feed:"
+msgstr "Віддалена веб-стрічка:"
+
+msgctxt "LABEL"
+msgid "Local user"
+msgstr "Тутешній користувач"
+
+msgid "Mirroring style"
+msgstr "Форма віддзеркалення"
+
+msgid ""
+"Repeat: reference the original user's post (sometimes shows as 'RT @blah')"
+msgstr ""
+"Повторення: посилання до оригінального допису користувача (щось на зразок «RT "
+"@pupkin»)"
+
+msgid "Repost the content under my account"
+msgstr "Повторення змісту під моїм акаунтом"
+
+msgid "Save"
+msgstr "Зберегти"
+
+msgid "Stop mirroring"
+msgstr "Зупинити віддзеркалення"
diff --git a/plugins/SubscriptionThrottle/locale/SubscriptionThrottle.pot b/plugins/SubscriptionThrottle/locale/SubscriptionThrottle.pot
index cb3be6b7e9..331baf29c5 100644
--- a/plugins/SubscriptionThrottle/locale/SubscriptionThrottle.pot
+++ b/plugins/SubscriptionThrottle/locale/SubscriptionThrottle.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/SubscriptionThrottle/locale/de/LC_MESSAGES/SubscriptionThrottle.po b/plugins/SubscriptionThrottle/locale/de/LC_MESSAGES/SubscriptionThrottle.po
index c1eefbdda5..1b805f06aa 100644
--- a/plugins/SubscriptionThrottle/locale/de/LC_MESSAGES/SubscriptionThrottle.po
+++ b/plugins/SubscriptionThrottle/locale/de/LC_MESSAGES/SubscriptionThrottle.po
@@ -9,18 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SubscriptionThrottle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:06+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:18+0000\n"
 "Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:07+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:24+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-subscriptionthrottle\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: SubscriptionThrottlePlugin.php:171
 msgid "Configurable limits for subscriptions and group memberships."
 msgstr "Konfigurierbare Limits für Abonnements und Gruppenmitgliedschaften."
diff --git a/plugins/SubscriptionThrottle/locale/es/LC_MESSAGES/SubscriptionThrottle.po b/plugins/SubscriptionThrottle/locale/es/LC_MESSAGES/SubscriptionThrottle.po
index 16a45f15c4..60ddef8bb8 100644
--- a/plugins/SubscriptionThrottle/locale/es/LC_MESSAGES/SubscriptionThrottle.po
+++ b/plugins/SubscriptionThrottle/locale/es/LC_MESSAGES/SubscriptionThrottle.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SubscriptionThrottle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:06+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:18+0000\n"
 "Language-Team: Spanish <http://translatewiki.net/wiki/Portal:es>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:07+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:24+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-subscriptionthrottle\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: SubscriptionThrottlePlugin.php:171
 msgid "Configurable limits for subscriptions and group memberships."
 msgstr ""
 "Límites configurables para las suscripciones y adhesiones a los grupos."
diff --git a/plugins/SubscriptionThrottle/locale/fr/LC_MESSAGES/SubscriptionThrottle.po b/plugins/SubscriptionThrottle/locale/fr/LC_MESSAGES/SubscriptionThrottle.po
index 1df4cac4c9..072c7056c6 100644
--- a/plugins/SubscriptionThrottle/locale/fr/LC_MESSAGES/SubscriptionThrottle.po
+++ b/plugins/SubscriptionThrottle/locale/fr/LC_MESSAGES/SubscriptionThrottle.po
@@ -9,18 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SubscriptionThrottle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:06+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:18+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:07+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:24+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-subscriptionthrottle\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: SubscriptionThrottlePlugin.php:171
 msgid "Configurable limits for subscriptions and group memberships."
 msgstr "Limites configurables pour les abonnements et adhésions aux groupes."
diff --git a/plugins/SubscriptionThrottle/locale/he/LC_MESSAGES/SubscriptionThrottle.po b/plugins/SubscriptionThrottle/locale/he/LC_MESSAGES/SubscriptionThrottle.po
index 889086db5e..78f109fdc6 100644
--- a/plugins/SubscriptionThrottle/locale/he/LC_MESSAGES/SubscriptionThrottle.po
+++ b/plugins/SubscriptionThrottle/locale/he/LC_MESSAGES/SubscriptionThrottle.po
@@ -9,18 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SubscriptionThrottle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:06+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:18+0000\n"
 "Language-Team: Hebrew <http://translatewiki.net/wiki/Portal:he>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:07+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:24+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-plugin-subscriptionthrottle\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: SubscriptionThrottlePlugin.php:171
 msgid "Configurable limits for subscriptions and group memberships."
 msgstr "הגבלות מינוי וחברות בקבוצות הניתנות להגדרה."
diff --git a/plugins/SubscriptionThrottle/locale/ia/LC_MESSAGES/SubscriptionThrottle.po b/plugins/SubscriptionThrottle/locale/ia/LC_MESSAGES/SubscriptionThrottle.po
index e920e0ba0b..4505be6428 100644
--- a/plugins/SubscriptionThrottle/locale/ia/LC_MESSAGES/SubscriptionThrottle.po
+++ b/plugins/SubscriptionThrottle/locale/ia/LC_MESSAGES/SubscriptionThrottle.po
@@ -9,18 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SubscriptionThrottle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:06+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:18+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:07+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:24+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-subscriptionthrottle\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: SubscriptionThrottlePlugin.php:171
 msgid "Configurable limits for subscriptions and group memberships."
 msgstr "Limites configurabile pro subscriptiones e membrato de gruppos."
diff --git a/plugins/SubscriptionThrottle/locale/id/LC_MESSAGES/SubscriptionThrottle.po b/plugins/SubscriptionThrottle/locale/id/LC_MESSAGES/SubscriptionThrottle.po
index 4e03f4e48f..6e7727eb90 100644
--- a/plugins/SubscriptionThrottle/locale/id/LC_MESSAGES/SubscriptionThrottle.po
+++ b/plugins/SubscriptionThrottle/locale/id/LC_MESSAGES/SubscriptionThrottle.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SubscriptionThrottle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:06+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:18+0000\n"
 "Language-Team: Indonesian <http://translatewiki.net/wiki/Portal:id>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:07+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:24+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: id\n"
 "X-Message-Group: #out-statusnet-plugin-subscriptionthrottle\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: SubscriptionThrottlePlugin.php:171
 msgid "Configurable limits for subscriptions and group memberships."
 msgstr ""
 "Batasan yang dapat disesuaikan untuk langganan dan keanggotaan kelompok."
diff --git a/plugins/SubscriptionThrottle/locale/mk/LC_MESSAGES/SubscriptionThrottle.po b/plugins/SubscriptionThrottle/locale/mk/LC_MESSAGES/SubscriptionThrottle.po
index 6592f994f4..937d3eb29d 100644
--- a/plugins/SubscriptionThrottle/locale/mk/LC_MESSAGES/SubscriptionThrottle.po
+++ b/plugins/SubscriptionThrottle/locale/mk/LC_MESSAGES/SubscriptionThrottle.po
@@ -9,18 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SubscriptionThrottle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:06+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:18+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:07+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:24+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-subscriptionthrottle\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
 
-#: SubscriptionThrottlePlugin.php:171
 msgid "Configurable limits for subscriptions and group memberships."
 msgstr "Прилагодливи ограничувања за претплата и членства во групи."
diff --git a/plugins/SubscriptionThrottle/locale/nb/LC_MESSAGES/SubscriptionThrottle.po b/plugins/SubscriptionThrottle/locale/nb/LC_MESSAGES/SubscriptionThrottle.po
index 74c1c7a710..7973cf1116 100644
--- a/plugins/SubscriptionThrottle/locale/nb/LC_MESSAGES/SubscriptionThrottle.po
+++ b/plugins/SubscriptionThrottle/locale/nb/LC_MESSAGES/SubscriptionThrottle.po
@@ -9,18 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SubscriptionThrottle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:06+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:19+0000\n"
 "Language-Team: Norwegian (bokmål)‬ <http://translatewiki.net/wiki/Portal:no>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:07+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:24+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: #out-statusnet-plugin-subscriptionthrottle\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: SubscriptionThrottlePlugin.php:171
 msgid "Configurable limits for subscriptions and group memberships."
 msgstr "Konfigurerbare grenser for abonnement og gruppemedlemsskap."
diff --git a/plugins/SubscriptionThrottle/locale/nl/LC_MESSAGES/SubscriptionThrottle.po b/plugins/SubscriptionThrottle/locale/nl/LC_MESSAGES/SubscriptionThrottle.po
index bbb0c8de12..9a07b6c438 100644
--- a/plugins/SubscriptionThrottle/locale/nl/LC_MESSAGES/SubscriptionThrottle.po
+++ b/plugins/SubscriptionThrottle/locale/nl/LC_MESSAGES/SubscriptionThrottle.po
@@ -9,18 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SubscriptionThrottle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:06+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:19+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:07+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:24+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-subscriptionthrottle\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: SubscriptionThrottlePlugin.php:171
 msgid "Configurable limits for subscriptions and group memberships."
 msgstr "In te stellen limieten voor abonnementen en groepslidmaatschappen."
diff --git a/plugins/SubscriptionThrottle/locale/pt/LC_MESSAGES/SubscriptionThrottle.po b/plugins/SubscriptionThrottle/locale/pt/LC_MESSAGES/SubscriptionThrottle.po
index 090e41870c..9a17e027bc 100644
--- a/plugins/SubscriptionThrottle/locale/pt/LC_MESSAGES/SubscriptionThrottle.po
+++ b/plugins/SubscriptionThrottle/locale/pt/LC_MESSAGES/SubscriptionThrottle.po
@@ -9,18 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SubscriptionThrottle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:06+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:19+0000\n"
 "Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:07+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:24+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-plugin-subscriptionthrottle\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: SubscriptionThrottlePlugin.php:171
 msgid "Configurable limits for subscriptions and group memberships."
 msgstr "Limites configuráveis para subscrições e adesões a grupos."
diff --git a/plugins/SubscriptionThrottle/locale/ru/LC_MESSAGES/SubscriptionThrottle.po b/plugins/SubscriptionThrottle/locale/ru/LC_MESSAGES/SubscriptionThrottle.po
index 7dbb0c3f5e..78544e3ce5 100644
--- a/plugins/SubscriptionThrottle/locale/ru/LC_MESSAGES/SubscriptionThrottle.po
+++ b/plugins/SubscriptionThrottle/locale/ru/LC_MESSAGES/SubscriptionThrottle.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SubscriptionThrottle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:06+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:19+0000\n"
 "Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:07+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:24+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-subscriptionthrottle\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: SubscriptionThrottlePlugin.php:171
 msgid "Configurable limits for subscriptions and group memberships."
 msgstr "Настраиваемые ограничения на подписки и членство в группах."
diff --git a/plugins/SubscriptionThrottle/locale/tl/LC_MESSAGES/SubscriptionThrottle.po b/plugins/SubscriptionThrottle/locale/tl/LC_MESSAGES/SubscriptionThrottle.po
index cf367ad2ad..d84997712c 100644
--- a/plugins/SubscriptionThrottle/locale/tl/LC_MESSAGES/SubscriptionThrottle.po
+++ b/plugins/SubscriptionThrottle/locale/tl/LC_MESSAGES/SubscriptionThrottle.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SubscriptionThrottle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:06+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:19+0000\n"
 "Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:07+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:24+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-subscriptionthrottle\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: SubscriptionThrottlePlugin.php:171
 msgid "Configurable limits for subscriptions and group memberships."
 msgstr ""
 "Maisasaayos na mga hangganan para sa mga pagtatanggap at mga kasapian sa "
diff --git a/plugins/SubscriptionThrottle/locale/uk/LC_MESSAGES/SubscriptionThrottle.po b/plugins/SubscriptionThrottle/locale/uk/LC_MESSAGES/SubscriptionThrottle.po
index c9bd03f549..2f26e46022 100644
--- a/plugins/SubscriptionThrottle/locale/uk/LC_MESSAGES/SubscriptionThrottle.po
+++ b/plugins/SubscriptionThrottle/locale/uk/LC_MESSAGES/SubscriptionThrottle.po
@@ -9,20 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SubscriptionThrottle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:06+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:19+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:07+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:24+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-subscriptionthrottle\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: SubscriptionThrottlePlugin.php:171
 msgid "Configurable limits for subscriptions and group memberships."
 msgstr ""
 "З допомогою цього додатку можна обмежувати кількість можливих підписок для "
diff --git a/plugins/TabFocus/locale/TabFocus.pot b/plugins/TabFocus/locale/TabFocus.pot
index dfd9c09fc9..8452d9c9e8 100644
--- a/plugins/TabFocus/locale/TabFocus.pot
+++ b/plugins/TabFocus/locale/TabFocus.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/TabFocus/locale/br/LC_MESSAGES/TabFocus.po b/plugins/TabFocus/locale/br/LC_MESSAGES/TabFocus.po
index 9fa70fdfb1..48f6e9b228 100644
--- a/plugins/TabFocus/locale/br/LC_MESSAGES/TabFocus.po
+++ b/plugins/TabFocus/locale/br/LC_MESSAGES/TabFocus.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TabFocus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:06+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:19+0000\n"
 "Language-Team: Breton <http://translatewiki.net/wiki/Portal:br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:08+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:26+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-tabfocus\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: TabFocusPlugin.php:54
 msgid ""
 "TabFocus changes the notice form behavior so that, while in the text area, "
 "pressing the tab key focuses the \"Send\" button, matching the behavior of "
diff --git a/plugins/TabFocus/locale/es/LC_MESSAGES/TabFocus.po b/plugins/TabFocus/locale/es/LC_MESSAGES/TabFocus.po
index 662e2aacab..fc4f97eba0 100644
--- a/plugins/TabFocus/locale/es/LC_MESSAGES/TabFocus.po
+++ b/plugins/TabFocus/locale/es/LC_MESSAGES/TabFocus.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TabFocus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:06+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:19+0000\n"
 "Language-Team: Spanish <http://translatewiki.net/wiki/Portal:es>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:08+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:26+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-tabfocus\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: TabFocusPlugin.php:54
 msgid ""
 "TabFocus changes the notice form behavior so that, while in the text area, "
 "pressing the tab key focuses the \"Send\" button, matching the behavior of "
diff --git a/plugins/TabFocus/locale/fr/LC_MESSAGES/TabFocus.po b/plugins/TabFocus/locale/fr/LC_MESSAGES/TabFocus.po
index 6e022603fc..bf43e53e73 100644
--- a/plugins/TabFocus/locale/fr/LC_MESSAGES/TabFocus.po
+++ b/plugins/TabFocus/locale/fr/LC_MESSAGES/TabFocus.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TabFocus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:06+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:19+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:08+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:26+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-tabfocus\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: TabFocusPlugin.php:54
 msgid ""
 "TabFocus changes the notice form behavior so that, while in the text area, "
 "pressing the tab key focuses the \"Send\" button, matching the behavior of "
diff --git a/plugins/TabFocus/locale/gl/LC_MESSAGES/TabFocus.po b/plugins/TabFocus/locale/gl/LC_MESSAGES/TabFocus.po
index b9e99a39c4..f3d72285c7 100644
--- a/plugins/TabFocus/locale/gl/LC_MESSAGES/TabFocus.po
+++ b/plugins/TabFocus/locale/gl/LC_MESSAGES/TabFocus.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TabFocus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:06+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:19+0000\n"
 "Language-Team: Galician <http://translatewiki.net/wiki/Portal:gl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:08+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:26+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: gl\n"
 "X-Message-Group: #out-statusnet-plugin-tabfocus\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: TabFocusPlugin.php:54
 msgid ""
 "TabFocus changes the notice form behavior so that, while in the text area, "
 "pressing the tab key focuses the \"Send\" button, matching the behavior of "
diff --git a/plugins/TabFocus/locale/he/LC_MESSAGES/TabFocus.po b/plugins/TabFocus/locale/he/LC_MESSAGES/TabFocus.po
index 2d4769b235..8b73b25644 100644
--- a/plugins/TabFocus/locale/he/LC_MESSAGES/TabFocus.po
+++ b/plugins/TabFocus/locale/he/LC_MESSAGES/TabFocus.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TabFocus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:06+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:19+0000\n"
 "Language-Team: Hebrew <http://translatewiki.net/wiki/Portal:he>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:08+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:26+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-plugin-tabfocus\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: TabFocusPlugin.php:54
 msgid ""
 "TabFocus changes the notice form behavior so that, while in the text area, "
 "pressing the tab key focuses the \"Send\" button, matching the behavior of "
diff --git a/plugins/TabFocus/locale/ia/LC_MESSAGES/TabFocus.po b/plugins/TabFocus/locale/ia/LC_MESSAGES/TabFocus.po
index 15a0d27d25..501fe921e9 100644
--- a/plugins/TabFocus/locale/ia/LC_MESSAGES/TabFocus.po
+++ b/plugins/TabFocus/locale/ia/LC_MESSAGES/TabFocus.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TabFocus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:06+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:19+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:08+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:26+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-tabfocus\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: TabFocusPlugin.php:54
 msgid ""
 "TabFocus changes the notice form behavior so that, while in the text area, "
 "pressing the tab key focuses the \"Send\" button, matching the behavior of "
diff --git a/plugins/TabFocus/locale/id/LC_MESSAGES/TabFocus.po b/plugins/TabFocus/locale/id/LC_MESSAGES/TabFocus.po
index b1bc20069d..5f176d917e 100644
--- a/plugins/TabFocus/locale/id/LC_MESSAGES/TabFocus.po
+++ b/plugins/TabFocus/locale/id/LC_MESSAGES/TabFocus.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TabFocus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:06+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:19+0000\n"
 "Language-Team: Indonesian <http://translatewiki.net/wiki/Portal:id>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:08+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:26+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: id\n"
 "X-Message-Group: #out-statusnet-plugin-tabfocus\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: TabFocusPlugin.php:54
 msgid ""
 "TabFocus changes the notice form behavior so that, while in the text area, "
 "pressing the tab key focuses the \"Send\" button, matching the behavior of "
diff --git a/plugins/TabFocus/locale/mk/LC_MESSAGES/TabFocus.po b/plugins/TabFocus/locale/mk/LC_MESSAGES/TabFocus.po
index 2de7f9c020..9ed6bceb9f 100644
--- a/plugins/TabFocus/locale/mk/LC_MESSAGES/TabFocus.po
+++ b/plugins/TabFocus/locale/mk/LC_MESSAGES/TabFocus.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TabFocus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:06+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:19+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:08+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:26+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-tabfocus\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
 
-#: TabFocusPlugin.php:54
 msgid ""
 "TabFocus changes the notice form behavior so that, while in the text area, "
 "pressing the tab key focuses the \"Send\" button, matching the behavior of "
diff --git a/plugins/TabFocus/locale/nb/LC_MESSAGES/TabFocus.po b/plugins/TabFocus/locale/nb/LC_MESSAGES/TabFocus.po
index 9e0cc691b0..0b5eb9c557 100644
--- a/plugins/TabFocus/locale/nb/LC_MESSAGES/TabFocus.po
+++ b/plugins/TabFocus/locale/nb/LC_MESSAGES/TabFocus.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TabFocus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:07+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:20+0000\n"
 "Language-Team: Norwegian (bokmål)‬ <http://translatewiki.net/wiki/Portal:no>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:08+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:26+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: #out-statusnet-plugin-tabfocus\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: TabFocusPlugin.php:54
 msgid ""
 "TabFocus changes the notice form behavior so that, while in the text area, "
 "pressing the tab key focuses the \"Send\" button, matching the behavior of "
diff --git a/plugins/TabFocus/locale/nl/LC_MESSAGES/TabFocus.po b/plugins/TabFocus/locale/nl/LC_MESSAGES/TabFocus.po
index 01ae767b1f..c74335ba8b 100644
--- a/plugins/TabFocus/locale/nl/LC_MESSAGES/TabFocus.po
+++ b/plugins/TabFocus/locale/nl/LC_MESSAGES/TabFocus.po
@@ -10,19 +10,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TabFocus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:07+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:20+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:08+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:26+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-tabfocus\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: TabFocusPlugin.php:54
 msgid ""
 "TabFocus changes the notice form behavior so that, while in the text area, "
 "pressing the tab key focuses the \"Send\" button, matching the behavior of "
diff --git a/plugins/TabFocus/locale/ru/LC_MESSAGES/TabFocus.po b/plugins/TabFocus/locale/ru/LC_MESSAGES/TabFocus.po
index 921ac5c4b5..2f964eac19 100644
--- a/plugins/TabFocus/locale/ru/LC_MESSAGES/TabFocus.po
+++ b/plugins/TabFocus/locale/ru/LC_MESSAGES/TabFocus.po
@@ -9,20 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TabFocus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:07+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:20+0000\n"
 "Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:08+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:26+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-tabfocus\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: TabFocusPlugin.php:54
 msgid ""
 "TabFocus changes the notice form behavior so that, while in the text area, "
 "pressing the tab key focuses the \"Send\" button, matching the behavior of "
diff --git a/plugins/TabFocus/locale/tl/LC_MESSAGES/TabFocus.po b/plugins/TabFocus/locale/tl/LC_MESSAGES/TabFocus.po
index af192168ed..0cac0d3246 100644
--- a/plugins/TabFocus/locale/tl/LC_MESSAGES/TabFocus.po
+++ b/plugins/TabFocus/locale/tl/LC_MESSAGES/TabFocus.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TabFocus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:07+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:20+0000\n"
 "Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:08+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:26+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-tabfocus\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: TabFocusPlugin.php:54
 msgid ""
 "TabFocus changes the notice form behavior so that, while in the text area, "
 "pressing the tab key focuses the \"Send\" button, matching the behavior of "
diff --git a/plugins/TabFocus/locale/uk/LC_MESSAGES/TabFocus.po b/plugins/TabFocus/locale/uk/LC_MESSAGES/TabFocus.po
index 307609b06f..decefd0a08 100644
--- a/plugins/TabFocus/locale/uk/LC_MESSAGES/TabFocus.po
+++ b/plugins/TabFocus/locale/uk/LC_MESSAGES/TabFocus.po
@@ -9,20 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TabFocus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:07+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:20+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:08+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:26+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-tabfocus\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: TabFocusPlugin.php:54
 msgid ""
 "TabFocus changes the notice form behavior so that, while in the text area, "
 "pressing the tab key focuses the \"Send\" button, matching the behavior of "
diff --git a/plugins/TightUrl/locale/TightUrl.pot b/plugins/TightUrl/locale/TightUrl.pot
index e749d38002..96cf87c66d 100644
--- a/plugins/TightUrl/locale/TightUrl.pot
+++ b/plugins/TightUrl/locale/TightUrl.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/TightUrl/locale/de/LC_MESSAGES/TightUrl.po b/plugins/TightUrl/locale/de/LC_MESSAGES/TightUrl.po
index 1283c83ba5..ee002c4435 100644
--- a/plugins/TightUrl/locale/de/LC_MESSAGES/TightUrl.po
+++ b/plugins/TightUrl/locale/de/LC_MESSAGES/TightUrl.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TightUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:07+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:20+0000\n"
 "Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:10+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:28+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-tighturl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: TightUrlPlugin.php:66
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr "Benutzung des <a href=\"http://%1$s/\">%1$s</a>-URL-Kürzungsdienstes."
diff --git a/plugins/TightUrl/locale/es/LC_MESSAGES/TightUrl.po b/plugins/TightUrl/locale/es/LC_MESSAGES/TightUrl.po
index d45993f150..c48b3702d1 100644
--- a/plugins/TightUrl/locale/es/LC_MESSAGES/TightUrl.po
+++ b/plugins/TightUrl/locale/es/LC_MESSAGES/TightUrl.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TightUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:07+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:20+0000\n"
 "Language-Team: Spanish <http://translatewiki.net/wiki/Portal:es>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:10+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:28+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-tighturl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: TightUrlPlugin.php:66
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr ""
diff --git a/plugins/TightUrl/locale/fr/LC_MESSAGES/TightUrl.po b/plugins/TightUrl/locale/fr/LC_MESSAGES/TightUrl.po
index 7f439fcb05..28ec671b99 100644
--- a/plugins/TightUrl/locale/fr/LC_MESSAGES/TightUrl.po
+++ b/plugins/TightUrl/locale/fr/LC_MESSAGES/TightUrl.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TightUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:07+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:20+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:10+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:28+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-tighturl\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: TightUrlPlugin.php:66
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr ""
diff --git a/plugins/TightUrl/locale/gl/LC_MESSAGES/TightUrl.po b/plugins/TightUrl/locale/gl/LC_MESSAGES/TightUrl.po
index 8da08b4a61..bf8cb27695 100644
--- a/plugins/TightUrl/locale/gl/LC_MESSAGES/TightUrl.po
+++ b/plugins/TightUrl/locale/gl/LC_MESSAGES/TightUrl.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TightUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:07+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:20+0000\n"
 "Language-Team: Galician <http://translatewiki.net/wiki/Portal:gl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:10+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:28+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: gl\n"
 "X-Message-Group: #out-statusnet-plugin-tighturl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: TightUrlPlugin.php:66
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr ""
diff --git a/plugins/TightUrl/locale/he/LC_MESSAGES/TightUrl.po b/plugins/TightUrl/locale/he/LC_MESSAGES/TightUrl.po
index aa87a5c00b..c3e4fd9218 100644
--- a/plugins/TightUrl/locale/he/LC_MESSAGES/TightUrl.po
+++ b/plugins/TightUrl/locale/he/LC_MESSAGES/TightUrl.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TightUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:07+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:20+0000\n"
 "Language-Team: Hebrew <http://translatewiki.net/wiki/Portal:he>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:10+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:28+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-plugin-tighturl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: TightUrlPlugin.php:66
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr "שימוש בשירות קיצור הכתובות <a href=\"http://%1$s/\">%1$s</a>."
diff --git a/plugins/TightUrl/locale/ia/LC_MESSAGES/TightUrl.po b/plugins/TightUrl/locale/ia/LC_MESSAGES/TightUrl.po
index 3609b610ad..231b36d052 100644
--- a/plugins/TightUrl/locale/ia/LC_MESSAGES/TightUrl.po
+++ b/plugins/TightUrl/locale/ia/LC_MESSAGES/TightUrl.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TightUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:07+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:20+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:10+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:28+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-tighturl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: TightUrlPlugin.php:66
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr ""
diff --git a/plugins/TightUrl/locale/id/LC_MESSAGES/TightUrl.po b/plugins/TightUrl/locale/id/LC_MESSAGES/TightUrl.po
index 6bfb03c2d3..fd0f39ef43 100644
--- a/plugins/TightUrl/locale/id/LC_MESSAGES/TightUrl.po
+++ b/plugins/TightUrl/locale/id/LC_MESSAGES/TightUrl.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TightUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:07+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:20+0000\n"
 "Language-Team: Indonesian <http://translatewiki.net/wiki/Portal:id>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:10+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:28+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: id\n"
 "X-Message-Group: #out-statusnet-plugin-tighturl\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: TightUrlPlugin.php:66
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr "Menggunakan layanan pemendek URL <a href=\"http://%1$s/\">%1$s</a>."
diff --git a/plugins/TightUrl/locale/ja/LC_MESSAGES/TightUrl.po b/plugins/TightUrl/locale/ja/LC_MESSAGES/TightUrl.po
index bd413f9195..ba772535cf 100644
--- a/plugins/TightUrl/locale/ja/LC_MESSAGES/TightUrl.po
+++ b/plugins/TightUrl/locale/ja/LC_MESSAGES/TightUrl.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TightUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:07+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:20+0000\n"
 "Language-Team: Japanese <http://translatewiki.net/wiki/Portal:ja>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:10+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:28+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ja\n"
 "X-Message-Group: #out-statusnet-plugin-tighturl\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: TightUrlPlugin.php:66
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr "<a href=\"http://%1$s/\">%1$s</a>をURL短縮サービスとして利用する。"
diff --git a/plugins/TightUrl/locale/mk/LC_MESSAGES/TightUrl.po b/plugins/TightUrl/locale/mk/LC_MESSAGES/TightUrl.po
index 734a99405d..218db32cce 100644
--- a/plugins/TightUrl/locale/mk/LC_MESSAGES/TightUrl.po
+++ b/plugins/TightUrl/locale/mk/LC_MESSAGES/TightUrl.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TightUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:07+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:20+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:10+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:28+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-tighturl\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
 
-#: TightUrlPlugin.php:66
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr ""
diff --git a/plugins/TightUrl/locale/nb/LC_MESSAGES/TightUrl.po b/plugins/TightUrl/locale/nb/LC_MESSAGES/TightUrl.po
index 61595b125b..1a891f8ec7 100644
--- a/plugins/TightUrl/locale/nb/LC_MESSAGES/TightUrl.po
+++ b/plugins/TightUrl/locale/nb/LC_MESSAGES/TightUrl.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TightUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:07+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:21+0000\n"
 "Language-Team: Norwegian (bokmål)‬ <http://translatewiki.net/wiki/Portal:no>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:10+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:28+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: #out-statusnet-plugin-tighturl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: TightUrlPlugin.php:66
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr "Bruker URL-forkortertjenesten <a href=\"http://%1$s/\">%1$s</a>."
diff --git a/plugins/TightUrl/locale/nl/LC_MESSAGES/TightUrl.po b/plugins/TightUrl/locale/nl/LC_MESSAGES/TightUrl.po
index 0e8ade5788..341e5f7abc 100644
--- a/plugins/TightUrl/locale/nl/LC_MESSAGES/TightUrl.po
+++ b/plugins/TightUrl/locale/nl/LC_MESSAGES/TightUrl.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TightUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:07+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:21+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:10+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:28+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-tighturl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: TightUrlPlugin.php:66
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr ""
diff --git a/plugins/TightUrl/locale/pt/LC_MESSAGES/TightUrl.po b/plugins/TightUrl/locale/pt/LC_MESSAGES/TightUrl.po
index 3c1d236268..eb4236d821 100644
--- a/plugins/TightUrl/locale/pt/LC_MESSAGES/TightUrl.po
+++ b/plugins/TightUrl/locale/pt/LC_MESSAGES/TightUrl.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TightUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:07+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:21+0000\n"
 "Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:10+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:28+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-plugin-tighturl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: TightUrlPlugin.php:66
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr "Usa o serviço de abreviação de URLs <a href=\"http://%1$s/\">%1$s</a>."
diff --git a/plugins/TightUrl/locale/pt_BR/LC_MESSAGES/TightUrl.po b/plugins/TightUrl/locale/pt_BR/LC_MESSAGES/TightUrl.po
index d42461220b..cc2ea80b18 100644
--- a/plugins/TightUrl/locale/pt_BR/LC_MESSAGES/TightUrl.po
+++ b/plugins/TightUrl/locale/pt_BR/LC_MESSAGES/TightUrl.po
@@ -9,20 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TightUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:07+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:21+0000\n"
 "Language-Team: Brazilian Portuguese <http://translatewiki.net/wiki/Portal:pt-"
 "br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:10+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:28+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt-br\n"
 "X-Message-Group: #out-statusnet-plugin-tighturl\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: TightUrlPlugin.php:66
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr ""
diff --git a/plugins/TightUrl/locale/ru/LC_MESSAGES/TightUrl.po b/plugins/TightUrl/locale/ru/LC_MESSAGES/TightUrl.po
index 63887b9209..8a148e7247 100644
--- a/plugins/TightUrl/locale/ru/LC_MESSAGES/TightUrl.po
+++ b/plugins/TightUrl/locale/ru/LC_MESSAGES/TightUrl.po
@@ -9,20 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TightUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:07+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:21+0000\n"
 "Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:10+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:28+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-tighturl\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: TightUrlPlugin.php:66
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr "Использование службы сокращения URL <a href=\"http://%1$s/\">%1$s</a>."
diff --git a/plugins/TightUrl/locale/tl/LC_MESSAGES/TightUrl.po b/plugins/TightUrl/locale/tl/LC_MESSAGES/TightUrl.po
index 72a32a1a67..396e5d1696 100644
--- a/plugins/TightUrl/locale/tl/LC_MESSAGES/TightUrl.po
+++ b/plugins/TightUrl/locale/tl/LC_MESSAGES/TightUrl.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TightUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:07+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:21+0000\n"
 "Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:10+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:28+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-tighturl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: TightUrlPlugin.php:66
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr ""
diff --git a/plugins/TightUrl/locale/uk/LC_MESSAGES/TightUrl.po b/plugins/TightUrl/locale/uk/LC_MESSAGES/TightUrl.po
index 84eb10730e..ba9ee74b4b 100644
--- a/plugins/TightUrl/locale/uk/LC_MESSAGES/TightUrl.po
+++ b/plugins/TightUrl/locale/uk/LC_MESSAGES/TightUrl.po
@@ -9,20 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TightUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:07+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:21+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:10+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:28+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-tighturl\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: TightUrlPlugin.php:66
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr ""
diff --git a/plugins/TinyMCE/locale/TinyMCE.pot b/plugins/TinyMCE/locale/TinyMCE.pot
index 55764b7288..f098aeeb30 100644
--- a/plugins/TinyMCE/locale/TinyMCE.pot
+++ b/plugins/TinyMCE/locale/TinyMCE.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/TinyMCE/locale/ca/LC_MESSAGES/TinyMCE.po b/plugins/TinyMCE/locale/ca/LC_MESSAGES/TinyMCE.po
index 88eb00425a..8decedee77 100644
--- a/plugins/TinyMCE/locale/ca/LC_MESSAGES/TinyMCE.po
+++ b/plugins/TinyMCE/locale/ca/LC_MESSAGES/TinyMCE.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TinyMCE\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:07+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:21+0000\n"
 "Language-Team: Catalan <http://translatewiki.net/wiki/Portal:ca>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-14 17:22:12+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:29+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ca\n"
 "X-Message-Group: #out-statusnet-plugin-tinymce\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: TinyMCEPlugin.php:87
 msgid "Use TinyMCE library to allow rich text editing in the browser."
 msgstr ""
 "Fes servir la biblioteca TinyMCE per permetre l'edició de text ric en el "
diff --git a/plugins/TinyMCE/locale/eo/LC_MESSAGES/TinyMCE.po b/plugins/TinyMCE/locale/eo/LC_MESSAGES/TinyMCE.po
index 50c612c9b5..a6158a2230 100644
--- a/plugins/TinyMCE/locale/eo/LC_MESSAGES/TinyMCE.po
+++ b/plugins/TinyMCE/locale/eo/LC_MESSAGES/TinyMCE.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TinyMCE\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:07+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:21+0000\n"
 "Language-Team: Esperanto <http://translatewiki.net/wiki/Portal:eo>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-14 17:22:12+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:29+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: eo\n"
 "X-Message-Group: #out-statusnet-plugin-tinymce\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: TinyMCEPlugin.php:87
 msgid "Use TinyMCE library to allow rich text editing in the browser."
 msgstr ""
 "Uzas la bibliotekon TinyMCE por ebligi redakton de riĉigita teksto en la "
diff --git a/plugins/TinyMCE/locale/es/LC_MESSAGES/TinyMCE.po b/plugins/TinyMCE/locale/es/LC_MESSAGES/TinyMCE.po
index 9106672959..1fdfe9b2fc 100644
--- a/plugins/TinyMCE/locale/es/LC_MESSAGES/TinyMCE.po
+++ b/plugins/TinyMCE/locale/es/LC_MESSAGES/TinyMCE.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TinyMCE\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:08+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:21+0000\n"
 "Language-Team: Spanish <http://translatewiki.net/wiki/Portal:es>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-14 17:22:12+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:29+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-tinymce\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: TinyMCEPlugin.php:87
 msgid "Use TinyMCE library to allow rich text editing in the browser."
 msgstr ""
 "Utiliza la biblioteca TinyMCE para permitir la edición de texto enriquecido "
diff --git a/plugins/TinyMCE/locale/fr/LC_MESSAGES/TinyMCE.po b/plugins/TinyMCE/locale/fr/LC_MESSAGES/TinyMCE.po
index bc63c04bbc..c80a3093a5 100644
--- a/plugins/TinyMCE/locale/fr/LC_MESSAGES/TinyMCE.po
+++ b/plugins/TinyMCE/locale/fr/LC_MESSAGES/TinyMCE.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TinyMCE\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:08+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:21+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-14 17:22:12+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:29+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-tinymce\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: TinyMCEPlugin.php:87
 msgid "Use TinyMCE library to allow rich text editing in the browser."
 msgstr ""
 "Utiliser la bibliothèque TinyMCE pour permettre la modification de texte "
diff --git a/plugins/TinyMCE/locale/he/LC_MESSAGES/TinyMCE.po b/plugins/TinyMCE/locale/he/LC_MESSAGES/TinyMCE.po
index 50a0615f07..14007aa006 100644
--- a/plugins/TinyMCE/locale/he/LC_MESSAGES/TinyMCE.po
+++ b/plugins/TinyMCE/locale/he/LC_MESSAGES/TinyMCE.po
@@ -9,18 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TinyMCE\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:08+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:21+0000\n"
 "Language-Team: Hebrew <http://translatewiki.net/wiki/Portal:he>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-14 17:22:12+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:29+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-plugin-tinymce\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: TinyMCEPlugin.php:87
 msgid "Use TinyMCE library to allow rich text editing in the browser."
 msgstr "שימוש בספרייה TinyMCE כדי לאפשר עריכת טקסט עשיר באמצעות הדפדפן."
diff --git a/plugins/TinyMCE/locale/ia/LC_MESSAGES/TinyMCE.po b/plugins/TinyMCE/locale/ia/LC_MESSAGES/TinyMCE.po
index 385df5da9f..67cd5fa421 100644
--- a/plugins/TinyMCE/locale/ia/LC_MESSAGES/TinyMCE.po
+++ b/plugins/TinyMCE/locale/ia/LC_MESSAGES/TinyMCE.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TinyMCE\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:08+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:21+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-14 17:22:12+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:29+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-tinymce\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: TinyMCEPlugin.php:87
 msgid "Use TinyMCE library to allow rich text editing in the browser."
 msgstr ""
 "Usar le bibliotheca TinyMCE pro permitter le modification de texto "
diff --git a/plugins/TinyMCE/locale/id/LC_MESSAGES/TinyMCE.po b/plugins/TinyMCE/locale/id/LC_MESSAGES/TinyMCE.po
index 9369ecf97b..41f6e8c05e 100644
--- a/plugins/TinyMCE/locale/id/LC_MESSAGES/TinyMCE.po
+++ b/plugins/TinyMCE/locale/id/LC_MESSAGES/TinyMCE.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TinyMCE\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:08+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:21+0000\n"
 "Language-Team: Indonesian <http://translatewiki.net/wiki/Portal:id>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-14 17:22:12+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:29+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: id\n"
 "X-Message-Group: #out-statusnet-plugin-tinymce\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: TinyMCEPlugin.php:87
 msgid "Use TinyMCE library to allow rich text editing in the browser."
 msgstr ""
 "Gunakan pustaka TinyMCE untuk memungkinkan penyuntingan teks kaya pada "
diff --git a/plugins/TinyMCE/locale/mk/LC_MESSAGES/TinyMCE.po b/plugins/TinyMCE/locale/mk/LC_MESSAGES/TinyMCE.po
index e9106594b6..a1b53329af 100644
--- a/plugins/TinyMCE/locale/mk/LC_MESSAGES/TinyMCE.po
+++ b/plugins/TinyMCE/locale/mk/LC_MESSAGES/TinyMCE.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TinyMCE\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:08+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:21+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-14 17:22:12+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:29+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-tinymce\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
 
-#: TinyMCEPlugin.php:87
 msgid "Use TinyMCE library to allow rich text editing in the browser."
 msgstr ""
 "Користи ја библиотеката TinyMCE за уредување со збогатен текст во "
diff --git a/plugins/TinyMCE/locale/nb/LC_MESSAGES/TinyMCE.po b/plugins/TinyMCE/locale/nb/LC_MESSAGES/TinyMCE.po
index 0eed6e9667..a25045ef1d 100644
--- a/plugins/TinyMCE/locale/nb/LC_MESSAGES/TinyMCE.po
+++ b/plugins/TinyMCE/locale/nb/LC_MESSAGES/TinyMCE.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TinyMCE\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:08+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:21+0000\n"
 "Language-Team: Norwegian (bokmål)‬ <http://translatewiki.net/wiki/Portal:no>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-14 17:22:12+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:29+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: #out-statusnet-plugin-tinymce\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: TinyMCEPlugin.php:87
 msgid "Use TinyMCE library to allow rich text editing in the browser."
 msgstr ""
 "Bruk TinyMCE-biblioteket for å tillate rik tekstredigering i nettleseren."
diff --git a/plugins/TinyMCE/locale/nl/LC_MESSAGES/TinyMCE.po b/plugins/TinyMCE/locale/nl/LC_MESSAGES/TinyMCE.po
index d5e675d8bd..ba33bc76c4 100644
--- a/plugins/TinyMCE/locale/nl/LC_MESSAGES/TinyMCE.po
+++ b/plugins/TinyMCE/locale/nl/LC_MESSAGES/TinyMCE.po
@@ -9,18 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TinyMCE\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:08+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:21+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-14 17:22:12+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:29+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-tinymce\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: TinyMCEPlugin.php:87
 msgid "Use TinyMCE library to allow rich text editing in the browser."
 msgstr "TinyMCE gebruiken om WYSIWYG-bewerken in de browser mogelijk te maken."
diff --git a/plugins/TinyMCE/locale/pt/LC_MESSAGES/TinyMCE.po b/plugins/TinyMCE/locale/pt/LC_MESSAGES/TinyMCE.po
index 1bc9f10e9f..8e617c14a0 100644
--- a/plugins/TinyMCE/locale/pt/LC_MESSAGES/TinyMCE.po
+++ b/plugins/TinyMCE/locale/pt/LC_MESSAGES/TinyMCE.po
@@ -9,18 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TinyMCE\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:08+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:22+0000\n"
 "Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-14 17:22:12+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:29+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-plugin-tinymce\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: TinyMCEPlugin.php:87
 msgid "Use TinyMCE library to allow rich text editing in the browser."
 msgstr "Use biblioteca TinyMCE para permitir a edição em rich text no browser."
diff --git a/plugins/TinyMCE/locale/pt_BR/LC_MESSAGES/TinyMCE.po b/plugins/TinyMCE/locale/pt_BR/LC_MESSAGES/TinyMCE.po
index 328e93c5ee..00b3041a03 100644
--- a/plugins/TinyMCE/locale/pt_BR/LC_MESSAGES/TinyMCE.po
+++ b/plugins/TinyMCE/locale/pt_BR/LC_MESSAGES/TinyMCE.po
@@ -9,20 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TinyMCE\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:08+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:22+0000\n"
 "Language-Team: Brazilian Portuguese <http://translatewiki.net/wiki/Portal:pt-"
 "br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-14 17:22:12+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:29+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt-br\n"
 "X-Message-Group: #out-statusnet-plugin-tinymce\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: TinyMCEPlugin.php:87
 msgid "Use TinyMCE library to allow rich text editing in the browser."
 msgstr ""
 "Utilizar a biblioteca TinyMCE para permitir edição em rich text no navegador."
diff --git a/plugins/TinyMCE/locale/ru/LC_MESSAGES/TinyMCE.po b/plugins/TinyMCE/locale/ru/LC_MESSAGES/TinyMCE.po
index e8d4fdccab..d2ad8ff39f 100644
--- a/plugins/TinyMCE/locale/ru/LC_MESSAGES/TinyMCE.po
+++ b/plugins/TinyMCE/locale/ru/LC_MESSAGES/TinyMCE.po
@@ -9,20 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TinyMCE\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:08+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:22+0000\n"
 "Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-14 17:22:12+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:29+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-tinymce\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: TinyMCEPlugin.php:87
 msgid "Use TinyMCE library to allow rich text editing in the browser."
 msgstr ""
 "Использование библиотеки TinyMCE, для редактирования текста в браузере."
diff --git a/plugins/TinyMCE/locale/tl/LC_MESSAGES/TinyMCE.po b/plugins/TinyMCE/locale/tl/LC_MESSAGES/TinyMCE.po
index 16e60f248f..4b19caa804 100644
--- a/plugins/TinyMCE/locale/tl/LC_MESSAGES/TinyMCE.po
+++ b/plugins/TinyMCE/locale/tl/LC_MESSAGES/TinyMCE.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TinyMCE\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:08+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:22+0000\n"
 "Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-14 17:22:12+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:29+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-tinymce\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: TinyMCEPlugin.php:87
 msgid "Use TinyMCE library to allow rich text editing in the browser."
 msgstr ""
 "Gamitin ang aklatan ng TinyMCE upang pahintulutan ang pamamatnugot ng "
diff --git a/plugins/TinyMCE/locale/uk/LC_MESSAGES/TinyMCE.po b/plugins/TinyMCE/locale/uk/LC_MESSAGES/TinyMCE.po
index 606ceabb70..0606afacdf 100644
--- a/plugins/TinyMCE/locale/uk/LC_MESSAGES/TinyMCE.po
+++ b/plugins/TinyMCE/locale/uk/LC_MESSAGES/TinyMCE.po
@@ -9,20 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TinyMCE\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:08+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:22+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-14 17:22:12+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:29+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-tinymce\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: TinyMCEPlugin.php:87
 msgid "Use TinyMCE library to allow rich text editing in the browser."
 msgstr ""
 "Використання бібліотеки TinyMCE для простого форматування тексту у вікні "
diff --git a/plugins/TwitterBridge/locale/TwitterBridge.pot b/plugins/TwitterBridge/locale/TwitterBridge.pot
index b8c627b9cb..50485cd883 100644
--- a/plugins/TwitterBridge/locale/TwitterBridge.pot
+++ b/plugins/TwitterBridge/locale/TwitterBridge.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,150 +16,108 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
-#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: twitterimport.php:114
-#, php-format
-msgid "RT @%1$s %2$s"
+#: twittersettings.php:57
+msgid "Twitter settings"
 msgstr ""
 
-#: twitter.php:409
-msgid "Your Twitter bridge has been disabled."
+#: twittersettings.php:68
+msgid ""
+"Connect your Twitter account to share your updates with your Twitter friends "
+"and vice-versa."
 msgstr ""
 
-#: twitter.php:413
+#: twittersettings.php:115
+msgid "Twitter account"
+msgstr ""
+
+#: twittersettings.php:120
+msgid "Connected Twitter account"
+msgstr ""
+
+#: twittersettings.php:125
+msgid "Disconnect my account from Twitter"
+msgstr ""
+
+#: twittersettings.php:131
+msgid "Disconnecting your Twitter could make it impossible to log in! Please "
+msgstr ""
+
+#: twittersettings.php:135
+msgid "set a password"
+msgstr ""
+
+#: twittersettings.php:137
+msgid " first."
+msgstr ""
+
+#. TRANS: %1$s is the current website name.
+#: twittersettings.php:141
 #, php-format
 msgid ""
-"Hi, %1$s. We're sorry to inform you that your link to Twitter has been "
-"disabled. We no longer seem to have permission to update your Twitter "
-"status. Did you maybe revoke %3$s's access?\n"
-"\n"
-"You can re-enable your Twitter bridge by visiting your Twitter settings "
-"page:\n"
-"\n"
-"\t%2$s\n"
-"\n"
-"Regards,\n"
-"%3$s"
+"Keep your %1$s account but disconnect from Twitter. You can use your %1$s "
+"password to log in."
 msgstr ""
 
-#: TwitterBridgePlugin.php:151 TwitterBridgePlugin.php:174
-#: TwitterBridgePlugin.php:302 twitteradminpanel.php:52
-msgid "Twitter"
+#: twittersettings.php:149
+msgid "Disconnect"
 msgstr ""
 
-#: TwitterBridgePlugin.php:152
-msgid "Login or register using Twitter"
+#: twittersettings.php:156
+msgid "Preferences"
 msgstr ""
 
-#: TwitterBridgePlugin.php:175
-msgid "Twitter integration options"
+#: twittersettings.php:160
+msgid "Automatically send my notices to Twitter."
 msgstr ""
 
-#: TwitterBridgePlugin.php:303
-msgid "Twitter bridge configuration"
+#: twittersettings.php:167
+msgid "Send local \"@\" replies to Twitter."
 msgstr ""
 
-#: TwitterBridgePlugin.php:327
-msgid ""
-"The Twitter \"bridge\" plugin allows integration of a StatusNet instance "
-"with <a href=\"http://twitter.com/\">Twitter</a>."
+#: twittersettings.php:174
+msgid "Subscribe to my Twitter friends here."
 msgstr ""
 
-#: twitteradminpanel.php:62
-msgid "Twitter bridge settings"
+#: twittersettings.php:183
+msgid "Import my friends timeline."
 msgstr ""
 
-#: twitteradminpanel.php:150
-msgid "Invalid consumer key. Max length is 255 characters."
-msgstr ""
-
-#: twitteradminpanel.php:156
-msgid "Invalid consumer secret. Max length is 255 characters."
-msgstr ""
-
-#: twitteradminpanel.php:212
-msgid "Twitter application settings"
-msgstr ""
-
-#: twitteradminpanel.php:218
-msgid "Consumer key"
-msgstr ""
-
-#: twitteradminpanel.php:219
-msgid "Consumer key assigned by Twitter"
-msgstr ""
-
-#: twitteradminpanel.php:227
-msgid "Consumer secret"
-msgstr ""
-
-#: twitteradminpanel.php:228
-msgid "Consumer secret assigned by Twitter"
-msgstr ""
-
-#: twitteradminpanel.php:238
-msgid "Note: a global consumer key and secret are set."
-msgstr ""
-
-#: twitteradminpanel.php:245
-msgid "Integration source"
-msgstr ""
-
-#: twitteradminpanel.php:246
-msgid "Name of your Twitter application"
-msgstr ""
-
-#: twitteradminpanel.php:258
-msgid "Options"
-msgstr ""
-
-#: twitteradminpanel.php:265
-msgid "Enable \"Sign-in with Twitter\""
-msgstr ""
-
-#: twitteradminpanel.php:267
-msgid "Allow users to login with their Twitter credentials"
-msgstr ""
-
-#: twitteradminpanel.php:274
-msgid "Enable Twitter import"
-msgstr ""
-
-#: twitteradminpanel.php:276
-msgid ""
-"Allow users to import their Twitter friends' timelines. Requires daemons to "
-"be manually configured."
-msgstr ""
-
-#: twitteradminpanel.php:293 twittersettings.php:199
+#: twittersettings.php:199 twitteradminpanel.php:293
 msgid "Save"
 msgstr ""
 
-#: twitteradminpanel.php:293
-msgid "Save Twitter settings"
+#: twittersettings.php:201
+msgid "Add"
 msgstr ""
 
-#: twitterlogin.php:56
-msgid "Already logged in."
-msgstr ""
-
-#: twitterlogin.php:64
-msgid "Twitter Login"
-msgstr ""
-
-#: twitterlogin.php:69
-msgid "Login with your Twitter account"
-msgstr ""
-
-#: twitterlogin.php:87
-msgid "Sign in with Twitter"
-msgstr ""
-
-#: twitterauthorization.php:120 twittersettings.php:225
+#: twittersettings.php:225 twitterauthorization.php:120
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 
+#: twittersettings.php:235
+msgid "Unexpected form submission."
+msgstr ""
+
+#: twittersettings.php:250
+msgid "No Twitter connection to remove."
+msgstr ""
+
+#: twittersettings.php:258
+msgid "Couldn't remove Twitter user."
+msgstr ""
+
+#: twittersettings.php:262
+msgid "Twitter account disconnected."
+msgstr ""
+
+#: twittersettings.php:282 twittersettings.php:293
+msgid "Couldn't save Twitter preferences."
+msgstr ""
+
+#: twittersettings.php:301
+msgid "Twitter preferences saved."
+msgstr ""
+
 #: twitterauthorization.php:126
 msgid "You can't register if you don't agree to the license."
 msgstr ""
@@ -271,96 +229,138 @@ msgstr ""
 msgid "Invalid username or password."
 msgstr ""
 
-#: twittersettings.php:57
-msgid "Twitter settings"
+#: twitteradminpanel.php:52 TwitterBridgePlugin.php:151
+#: TwitterBridgePlugin.php:174 TwitterBridgePlugin.php:302
+msgid "Twitter"
 msgstr ""
 
-#: twittersettings.php:68
+#: twitteradminpanel.php:62
+msgid "Twitter bridge settings"
+msgstr ""
+
+#: twitteradminpanel.php:150
+msgid "Invalid consumer key. Max length is 255 characters."
+msgstr ""
+
+#: twitteradminpanel.php:156
+msgid "Invalid consumer secret. Max length is 255 characters."
+msgstr ""
+
+#: twitteradminpanel.php:212
+msgid "Twitter application settings"
+msgstr ""
+
+#: twitteradminpanel.php:218
+msgid "Consumer key"
+msgstr ""
+
+#: twitteradminpanel.php:219
+msgid "Consumer key assigned by Twitter"
+msgstr ""
+
+#: twitteradminpanel.php:227
+msgid "Consumer secret"
+msgstr ""
+
+#: twitteradminpanel.php:228
+msgid "Consumer secret assigned by Twitter"
+msgstr ""
+
+#: twitteradminpanel.php:238
+msgid "Note: a global consumer key and secret are set."
+msgstr ""
+
+#: twitteradminpanel.php:245
+msgid "Integration source"
+msgstr ""
+
+#: twitteradminpanel.php:246
+msgid "Name of your Twitter application"
+msgstr ""
+
+#: twitteradminpanel.php:258
+msgid "Options"
+msgstr ""
+
+#: twitteradminpanel.php:265
+msgid "Enable \"Sign-in with Twitter\""
+msgstr ""
+
+#: twitteradminpanel.php:267
+msgid "Allow users to login with their Twitter credentials"
+msgstr ""
+
+#: twitteradminpanel.php:274
+msgid "Enable Twitter import"
+msgstr ""
+
+#: twitteradminpanel.php:276
 msgid ""
-"Connect your Twitter account to share your updates with your Twitter friends "
-"and vice-versa."
+"Allow users to import their Twitter friends' timelines. Requires daemons to "
+"be manually configured."
 msgstr ""
 
-#: twittersettings.php:115
-msgid "Twitter account"
+#: twitteradminpanel.php:293
+msgid "Save Twitter settings"
 msgstr ""
 
-#: twittersettings.php:120
-msgid "Connected Twitter account"
+#: TwitterBridgePlugin.php:152
+msgid "Login or register using Twitter"
 msgstr ""
 
-#: twittersettings.php:125
-msgid "Disconnect my account from Twitter"
+#: TwitterBridgePlugin.php:175
+msgid "Twitter integration options"
 msgstr ""
 
-#: twittersettings.php:131
-msgid "Disconnecting your Twitter could make it impossible to log in! Please "
+#: TwitterBridgePlugin.php:303
+msgid "Twitter bridge configuration"
 msgstr ""
 
-#: twittersettings.php:135
-msgid "set a password"
+#: TwitterBridgePlugin.php:327
+msgid ""
+"The Twitter \"bridge\" plugin allows integration of a StatusNet instance "
+"with <a href=\"http://twitter.com/\">Twitter</a>."
 msgstr ""
 
-#: twittersettings.php:137
-msgid " first."
+#: twitterlogin.php:56
+msgid "Already logged in."
 msgstr ""
 
-#. TRANS: %1$s is the current website name.
-#: twittersettings.php:141
+#: twitterlogin.php:64
+msgid "Twitter Login"
+msgstr ""
+
+#: twitterlogin.php:69
+msgid "Login with your Twitter account"
+msgstr ""
+
+#: twitterlogin.php:87
+msgid "Sign in with Twitter"
+msgstr ""
+
+#: twitter.php:409
+msgid "Your Twitter bridge has been disabled."
+msgstr ""
+
+#: twitter.php:413
 #, php-format
 msgid ""
-"Keep your %1$s account but disconnect from Twitter. You can use your %1$s "
-"password to log in."
+"Hi, %1$s. We're sorry to inform you that your link to Twitter has been "
+"disabled. We no longer seem to have permission to update your Twitter "
+"status. Did you maybe revoke %3$s's access?\n"
+"\n"
+"You can re-enable your Twitter bridge by visiting your Twitter settings "
+"page:\n"
+"\n"
+"\t%2$s\n"
+"\n"
+"Regards,\n"
+"%3$s"
 msgstr ""
 
-#: twittersettings.php:149
-msgid "Disconnect"
-msgstr ""
-
-#: twittersettings.php:156
-msgid "Preferences"
-msgstr ""
-
-#: twittersettings.php:160
-msgid "Automatically send my notices to Twitter."
-msgstr ""
-
-#: twittersettings.php:167
-msgid "Send local \"@\" replies to Twitter."
-msgstr ""
-
-#: twittersettings.php:174
-msgid "Subscribe to my Twitter friends here."
-msgstr ""
-
-#: twittersettings.php:183
-msgid "Import my friends timeline."
-msgstr ""
-
-#: twittersettings.php:201
-msgid "Add"
-msgstr ""
-
-#: twittersettings.php:235
-msgid "Unexpected form submission."
-msgstr ""
-
-#: twittersettings.php:250
-msgid "No Twitter connection to remove."
-msgstr ""
-
-#: twittersettings.php:258
-msgid "Couldn't remove Twitter user."
-msgstr ""
-
-#: twittersettings.php:262
-msgid "Twitter account disconnected."
-msgstr ""
-
-#: twittersettings.php:282 twittersettings.php:293
-msgid "Couldn't save Twitter preferences."
-msgstr ""
-
-#: twittersettings.php:301
-msgid "Twitter preferences saved."
+#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
+#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
+#: twitterimport.php:114
+#, php-format
+msgid "RT @%1$s %2$s"
 msgstr ""
diff --git a/plugins/TwitterBridge/locale/br/LC_MESSAGES/TwitterBridge.po b/plugins/TwitterBridge/locale/br/LC_MESSAGES/TwitterBridge.po
index 49a8831e9f..ce27b60b64 100644
--- a/plugins/TwitterBridge/locale/br/LC_MESSAGES/TwitterBridge.po
+++ b/plugins/TwitterBridge/locale/br/LC_MESSAGES/TwitterBridge.po
@@ -9,30 +9,265 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TwitterBridge\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:13+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:26+0000\n"
 "Language-Team: Breton <http://translatewiki.net/wiki/Portal:br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-14 17:22:14+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:31+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-twitterbridge\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
-#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: twitterimport.php:114
-#, php-format
-msgid "RT @%1$s %2$s"
-msgstr "RT @%1$s %2$s"
+msgid "Twitter settings"
+msgstr "Arventennoù Twitter"
+
+msgid ""
+"Connect your Twitter account to share your updates with your Twitter friends "
+"and vice-versa."
+msgstr ""
+
+msgid "Twitter account"
+msgstr "Kont Twitter"
+
+msgid "Connected Twitter account"
+msgstr ""
+
+msgid "Disconnect my account from Twitter"
+msgstr "Digevreañ ma c'hont deus Twitter"
+
+msgid "Disconnecting your Twitter could make it impossible to log in! Please "
+msgstr ""
+
+msgid "set a password"
+msgstr "Termeniñ ur ger-tremen"
+
+msgid " first."
+msgstr "da gentañ."
+
+#. TRANS: %1$s is the current website name.
+#, php-format
+msgid ""
+"Keep your %1$s account but disconnect from Twitter. You can use your %1$s "
+"password to log in."
+msgstr ""
+
+msgid "Disconnect"
+msgstr "Digevreet"
+
+msgid "Preferences"
+msgstr "Penndibaboù"
+
+msgid "Automatically send my notices to Twitter."
+msgstr ""
+
+msgid "Send local \"@\" replies to Twitter."
+msgstr ""
+
+msgid "Subscribe to my Twitter friends here."
+msgstr ""
+
+msgid "Import my friends timeline."
+msgstr ""
+
+msgid "Save"
+msgstr "Enrollañ"
+
+msgid "Add"
+msgstr "Ouzhpennañ"
+
+msgid "There was a problem with your session token. Try again, please."
+msgstr ""
+
+msgid "Unexpected form submission."
+msgstr ""
+
+msgid "No Twitter connection to remove."
+msgstr ""
+
+msgid "Couldn't remove Twitter user."
+msgstr ""
+
+msgid "Twitter account disconnected."
+msgstr ""
+
+msgid "Couldn't save Twitter preferences."
+msgstr ""
+
+msgid "Twitter preferences saved."
+msgstr ""
+
+msgid "You can't register if you don't agree to the license."
+msgstr ""
+
+msgid "Something weird happened."
+msgstr ""
+
+msgid "Couldn't link your Twitter account."
+msgstr ""
+
+msgid "Couldn't link your Twitter account: oauth_token mismatch."
+msgstr ""
+
+#, php-format
+msgid ""
+"This is the first time you've logged into %s so we must connect your Twitter "
+"account to a local account. You can either create a new account, or connect "
+"with your existing account, if you have one."
+msgstr ""
+
+msgid "Twitter Account Setup"
+msgstr ""
+
+msgid "Connection options"
+msgstr "Dibarzhioù kevreañ"
+
+#, php-format
+msgid ""
+"My text and files are available under %s except this private data: password, "
+"email address, IM address, and phone number."
+msgstr ""
+
+msgid "Create new account"
+msgstr "Krouiñ ur gont nevez"
+
+msgid "Create a new user with this nickname."
+msgstr "Krouiñ un implijer nevez gant al lesanv-se."
+
+msgid "New nickname"
+msgstr "Lesanv nevez"
+
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+msgstr ""
+
+msgid "Create"
+msgstr "Krouiñ"
+
+msgid "Connect existing account"
+msgstr "Kevreañ d'ur gont a zo dioutañ"
+
+msgid ""
+"If you already have an account, login with your username and password to "
+"connect it to your Twitter account."
+msgstr ""
+
+msgid "Existing nickname"
+msgstr "Lesanv a zo dioutañ"
+
+msgid "Password"
+msgstr "Ger-tremen"
+
+msgid "Connect"
+msgstr "Kevreañ"
+
+msgid "Registration not allowed."
+msgstr "N'eo ket aotreet krouiñ kontoù."
+
+msgid "Not a valid invitation code."
+msgstr ""
+
+msgid "Nickname not allowed."
+msgstr "Lesanv nann-aotreet."
+
+msgid "Nickname already in use. Try another one."
+msgstr "Implijet eo dija al lesanv-se. Klaskit unan all."
+
+msgid "Error registering user."
+msgstr ""
+
+msgid "Error connecting user to Twitter."
+msgstr ""
+
+msgid "Invalid username or password."
+msgstr "Anv implijer pe ger-tremen direizh."
+
+msgid "Twitter"
+msgstr "Twitter"
+
+msgid "Twitter bridge settings"
+msgstr ""
+
+msgid "Invalid consumer key. Max length is 255 characters."
+msgstr ""
+
+msgid "Invalid consumer secret. Max length is 255 characters."
+msgstr ""
+
+msgid "Twitter application settings"
+msgstr ""
+
+msgid "Consumer key"
+msgstr ""
+
+msgid "Consumer key assigned by Twitter"
+msgstr ""
+
+msgid "Consumer secret"
+msgstr ""
+
+msgid "Consumer secret assigned by Twitter"
+msgstr ""
+
+msgid "Note: a global consumer key and secret are set."
+msgstr ""
+
+msgid "Integration source"
+msgstr ""
+
+msgid "Name of your Twitter application"
+msgstr ""
+
+msgid "Options"
+msgstr "Dibarzhioù"
+
+msgid "Enable \"Sign-in with Twitter\""
+msgstr ""
+
+msgid "Allow users to login with their Twitter credentials"
+msgstr ""
+
+msgid "Enable Twitter import"
+msgstr ""
+
+msgid ""
+"Allow users to import their Twitter friends' timelines. Requires daemons to "
+"be manually configured."
+msgstr ""
+
+msgid "Save Twitter settings"
+msgstr "Enrollañ arventennoù Twitter"
+
+msgid "Login or register using Twitter"
+msgstr "Kevreañ pe en em enskrivañ dre Twitter"
+
+msgid "Twitter integration options"
+msgstr "Dibarzhioù enframmañ Twitter"
+
+msgid "Twitter bridge configuration"
+msgstr ""
+
+msgid ""
+"The Twitter \"bridge\" plugin allows integration of a StatusNet instance "
+"with <a href=\"http://twitter.com/\">Twitter</a>."
+msgstr ""
+
+msgid "Already logged in."
+msgstr "Kevreet oc'h dija."
+
+msgid "Twitter Login"
+msgstr "Keveadenn Twitter"
+
+msgid "Login with your Twitter account"
+msgstr "Kevreadenn gant ho kont Twitter"
+
+msgid "Sign in with Twitter"
+msgstr "Kevreañ gant Twitter"
 
-#: twitter.php:409
 msgid "Your Twitter bridge has been disabled."
 msgstr ""
 
-#: twitter.php:413
 #, php-format
 msgid ""
 "Hi, %1$s. We're sorry to inform you that your link to Twitter has been "
@@ -48,324 +283,8 @@ msgid ""
 "%3$s"
 msgstr ""
 
-#: TwitterBridgePlugin.php:151 TwitterBridgePlugin.php:174
-#: TwitterBridgePlugin.php:302 twitteradminpanel.php:52
-msgid "Twitter"
-msgstr "Twitter"
-
-#: TwitterBridgePlugin.php:152
-msgid "Login or register using Twitter"
-msgstr "Kevreañ pe en em enskrivañ dre Twitter"
-
-#: TwitterBridgePlugin.php:175
-msgid "Twitter integration options"
-msgstr "Dibarzhioù enframmañ Twitter"
-
-#: TwitterBridgePlugin.php:303
-msgid "Twitter bridge configuration"
-msgstr ""
-
-#: TwitterBridgePlugin.php:327
-msgid ""
-"The Twitter \"bridge\" plugin allows integration of a StatusNet instance "
-"with <a href=\"http://twitter.com/\">Twitter</a>."
-msgstr ""
-
-#: twitteradminpanel.php:62
-msgid "Twitter bridge settings"
-msgstr ""
-
-#: twitteradminpanel.php:150
-msgid "Invalid consumer key. Max length is 255 characters."
-msgstr ""
-
-#: twitteradminpanel.php:156
-msgid "Invalid consumer secret. Max length is 255 characters."
-msgstr ""
-
-#: twitteradminpanel.php:212
-msgid "Twitter application settings"
-msgstr ""
-
-#: twitteradminpanel.php:218
-msgid "Consumer key"
-msgstr ""
-
-#: twitteradminpanel.php:219
-msgid "Consumer key assigned by Twitter"
-msgstr ""
-
-#: twitteradminpanel.php:227
-msgid "Consumer secret"
-msgstr ""
-
-#: twitteradminpanel.php:228
-msgid "Consumer secret assigned by Twitter"
-msgstr ""
-
-#: twitteradminpanel.php:238
-msgid "Note: a global consumer key and secret are set."
-msgstr ""
-
-#: twitteradminpanel.php:245
-msgid "Integration source"
-msgstr ""
-
-#: twitteradminpanel.php:246
-msgid "Name of your Twitter application"
-msgstr ""
-
-#: twitteradminpanel.php:258
-msgid "Options"
-msgstr "Dibarzhioù"
-
-#: twitteradminpanel.php:265
-msgid "Enable \"Sign-in with Twitter\""
-msgstr ""
-
-#: twitteradminpanel.php:267
-msgid "Allow users to login with their Twitter credentials"
-msgstr ""
-
-#: twitteradminpanel.php:274
-msgid "Enable Twitter import"
-msgstr ""
-
-#: twitteradminpanel.php:276
-msgid ""
-"Allow users to import their Twitter friends' timelines. Requires daemons to "
-"be manually configured."
-msgstr ""
-
-#: twitteradminpanel.php:293 twittersettings.php:199
-msgid "Save"
-msgstr "Enrollañ"
-
-#: twitteradminpanel.php:293
-msgid "Save Twitter settings"
-msgstr "Enrollañ arventennoù Twitter"
-
-#: twitterlogin.php:56
-msgid "Already logged in."
-msgstr "Kevreet oc'h dija."
-
-#: twitterlogin.php:64
-msgid "Twitter Login"
-msgstr "Keveadenn Twitter"
-
-#: twitterlogin.php:69
-msgid "Login with your Twitter account"
-msgstr "Kevreadenn gant ho kont Twitter"
-
-#: twitterlogin.php:87
-msgid "Sign in with Twitter"
-msgstr "Kevreañ gant Twitter"
-
-#: twitterauthorization.php:120 twittersettings.php:225
-msgid "There was a problem with your session token. Try again, please."
-msgstr ""
-
-#: twitterauthorization.php:126
-msgid "You can't register if you don't agree to the license."
-msgstr ""
-
-#: twitterauthorization.php:135
-msgid "Something weird happened."
-msgstr ""
-
-#: twitterauthorization.php:181 twitterauthorization.php:229
-#: twitterauthorization.php:300
-msgid "Couldn't link your Twitter account."
-msgstr ""
-
-#: twitterauthorization.php:201
-msgid "Couldn't link your Twitter account: oauth_token mismatch."
-msgstr ""
-
-#: twitterauthorization.php:312
+#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
+#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
 #, php-format
-msgid ""
-"This is the first time you've logged into %s so we must connect your Twitter "
-"account to a local account. You can either create a new account, or connect "
-"with your existing account, if you have one."
-msgstr ""
-
-#: twitterauthorization.php:318
-msgid "Twitter Account Setup"
-msgstr ""
-
-#: twitterauthorization.php:351
-msgid "Connection options"
-msgstr "Dibarzhioù kevreañ"
-
-#: twitterauthorization.php:360
-#, php-format
-msgid ""
-"My text and files are available under %s except this private data: password, "
-"email address, IM address, and phone number."
-msgstr ""
-
-#: twitterauthorization.php:381
-msgid "Create new account"
-msgstr "Krouiñ ur gont nevez"
-
-#: twitterauthorization.php:383
-msgid "Create a new user with this nickname."
-msgstr "Krouiñ un implijer nevez gant al lesanv-se."
-
-#: twitterauthorization.php:390
-msgid "New nickname"
-msgstr "Lesanv nevez"
-
-#: twitterauthorization.php:392
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr ""
-
-#: twitterauthorization.php:404
-msgid "Create"
-msgstr "Krouiñ"
-
-#: twitterauthorization.php:409
-msgid "Connect existing account"
-msgstr "Kevreañ d'ur gont a zo dioutañ"
-
-#: twitterauthorization.php:411
-msgid ""
-"If you already have an account, login with your username and password to "
-"connect it to your Twitter account."
-msgstr ""
-
-#: twitterauthorization.php:414
-msgid "Existing nickname"
-msgstr "Lesanv a zo dioutañ"
-
-#: twitterauthorization.php:417
-msgid "Password"
-msgstr "Ger-tremen"
-
-#: twitterauthorization.php:420
-msgid "Connect"
-msgstr "Kevreañ"
-
-#: twitterauthorization.php:466 twitterauthorization.php:475
-msgid "Registration not allowed."
-msgstr "N'eo ket aotreet krouiñ kontoù."
-
-#: twitterauthorization.php:482
-msgid "Not a valid invitation code."
-msgstr ""
-
-#: twitterauthorization.php:495
-msgid "Nickname not allowed."
-msgstr "Lesanv nann-aotreet."
-
-#: twitterauthorization.php:500
-msgid "Nickname already in use. Try another one."
-msgstr "Implijet eo dija al lesanv-se. Klaskit unan all."
-
-#: twitterauthorization.php:520
-msgid "Error registering user."
-msgstr ""
-
-#: twitterauthorization.php:531 twitterauthorization.php:571
-#: twitterauthorization.php:591
-msgid "Error connecting user to Twitter."
-msgstr ""
-
-#: twitterauthorization.php:553
-msgid "Invalid username or password."
-msgstr "Anv implijer pe ger-tremen direizh."
-
-#: twittersettings.php:57
-msgid "Twitter settings"
-msgstr "Arventennoù Twitter"
-
-#: twittersettings.php:68
-msgid ""
-"Connect your Twitter account to share your updates with your Twitter friends "
-"and vice-versa."
-msgstr ""
-
-#: twittersettings.php:115
-msgid "Twitter account"
-msgstr "Kont Twitter"
-
-#: twittersettings.php:120
-msgid "Connected Twitter account"
-msgstr ""
-
-#: twittersettings.php:125
-msgid "Disconnect my account from Twitter"
-msgstr "Digevreañ ma c'hont deus Twitter"
-
-#: twittersettings.php:131
-msgid "Disconnecting your Twitter could make it impossible to log in! Please "
-msgstr ""
-
-#: twittersettings.php:135
-msgid "set a password"
-msgstr "Termeniñ ur ger-tremen"
-
-#: twittersettings.php:137
-msgid " first."
-msgstr "da gentañ."
-
-#. TRANS: %1$s is the current website name.
-#: twittersettings.php:141
-#, php-format
-msgid ""
-"Keep your %1$s account but disconnect from Twitter. You can use your %1$s "
-"password to log in."
-msgstr ""
-
-#: twittersettings.php:149
-msgid "Disconnect"
-msgstr "Digevreet"
-
-#: twittersettings.php:156
-msgid "Preferences"
-msgstr "Penndibaboù"
-
-#: twittersettings.php:160
-msgid "Automatically send my notices to Twitter."
-msgstr ""
-
-#: twittersettings.php:167
-msgid "Send local \"@\" replies to Twitter."
-msgstr ""
-
-#: twittersettings.php:174
-msgid "Subscribe to my Twitter friends here."
-msgstr ""
-
-#: twittersettings.php:183
-msgid "Import my friends timeline."
-msgstr ""
-
-#: twittersettings.php:201
-msgid "Add"
-msgstr "Ouzhpennañ"
-
-#: twittersettings.php:235
-msgid "Unexpected form submission."
-msgstr ""
-
-#: twittersettings.php:250
-msgid "No Twitter connection to remove."
-msgstr ""
-
-#: twittersettings.php:258
-msgid "Couldn't remove Twitter user."
-msgstr ""
-
-#: twittersettings.php:262
-msgid "Twitter account disconnected."
-msgstr ""
-
-#: twittersettings.php:282 twittersettings.php:293
-msgid "Couldn't save Twitter preferences."
-msgstr ""
-
-#: twittersettings.php:301
-msgid "Twitter preferences saved."
-msgstr ""
+msgid "RT @%1$s %2$s"
+msgstr "RT @%1$s %2$s"
diff --git a/plugins/TwitterBridge/locale/ca/LC_MESSAGES/TwitterBridge.po b/plugins/TwitterBridge/locale/ca/LC_MESSAGES/TwitterBridge.po
index 8949997fcc..f301b668a7 100644
--- a/plugins/TwitterBridge/locale/ca/LC_MESSAGES/TwitterBridge.po
+++ b/plugins/TwitterBridge/locale/ca/LC_MESSAGES/TwitterBridge.po
@@ -9,30 +9,288 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TwitterBridge\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:13+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:26+0000\n"
 "Language-Team: Catalan <http://translatewiki.net/wiki/Portal:ca>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-14 17:22:14+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:31+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ca\n"
 "X-Message-Group: #out-statusnet-plugin-twitterbridge\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
-#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: twitterimport.php:114
-#, php-format
-msgid "RT @%1$s %2$s"
-msgstr "RT @%1$s %2$s"
+msgid "Twitter settings"
+msgstr "Paràmetres del Twitter"
+
+msgid ""
+"Connect your Twitter account to share your updates with your Twitter friends "
+"and vice-versa."
+msgstr ""
+"Connecteu el vostre compte del Twitter per compartir les vostres "
+"actualitzacions amb els vostres amics del Twitter i viceversa."
+
+msgid "Twitter account"
+msgstr "Compte del Twitter"
+
+msgid "Connected Twitter account"
+msgstr "Compte del Twitter connectat"
+
+msgid "Disconnect my account from Twitter"
+msgstr "Desconnecta el meu compte del Twitter"
+
+msgid "Disconnecting your Twitter could make it impossible to log in! Please "
+msgstr ""
+"En desconnectar el vostre Twitter podeu impossibilitar que torneu a iniciar "
+"una sessió! "
+
+msgid "set a password"
+msgstr "Definiu una contrasenya"
+
+msgid " first."
+msgstr " primer."
+
+#. TRANS: %1$s is the current website name.
+#, php-format
+msgid ""
+"Keep your %1$s account but disconnect from Twitter. You can use your %1$s "
+"password to log in."
+msgstr ""
+"Mantingueu el vostre compte %1$s, però desconnecteu-lo del Twitter. Podeu "
+"emprar la vostra contrasenya %1$s per iniciar una sessió."
+
+msgid "Disconnect"
+msgstr "Desconnecta"
+
+msgid "Preferences"
+msgstr "Preferències"
+
+msgid "Automatically send my notices to Twitter."
+msgstr "Envia automàticament els meus avisos al Twitter."
+
+msgid "Send local \"@\" replies to Twitter."
+msgstr "Envia les respostes locals «@» al Twitter."
+
+msgid "Subscribe to my Twitter friends here."
+msgstr "Subscriu els meus amics del Twitter aquí."
+
+msgid "Import my friends timeline."
+msgstr "Importa la línia temporal d'amics."
+
+msgid "Save"
+msgstr "Desa"
+
+msgid "Add"
+msgstr "Afegeix"
+
+msgid "There was a problem with your session token. Try again, please."
+msgstr ""
+"S'ha produït un problema amb el vostre testimoni de sessió. Torneu-ho a "
+"provar."
+
+msgid "Unexpected form submission."
+msgstr "Enviament de formulari inesperat."
+
+msgid "No Twitter connection to remove."
+msgstr "No hi ha cap connexió del Twitter a suprimir."
+
+msgid "Couldn't remove Twitter user."
+msgstr "No s'ha pogut suprimir l'usuari del Twitter."
+
+msgid "Twitter account disconnected."
+msgstr "S'ha desconnectat el compte del Twitter."
+
+msgid "Couldn't save Twitter preferences."
+msgstr "No s'han pogut desar les preferències del Twitter."
+
+msgid "Twitter preferences saved."
+msgstr "S'han desat les preferències del Twitter."
+
+msgid "You can't register if you don't agree to the license."
+msgstr "No podeu registrar-vos-hi si no accepteu la llicència."
+
+msgid "Something weird happened."
+msgstr "Ha passat quelcom estrany."
+
+msgid "Couldn't link your Twitter account."
+msgstr "No s'ha pogut enllaçar amb el compte del Twitter."
+
+msgid "Couldn't link your Twitter account: oauth_token mismatch."
+msgstr ""
+"No s'ha pogut enllaçar amb el vostre compte del Twitter: no coincidència de "
+"l'oath_token."
+
+#, php-format
+msgid ""
+"This is the first time you've logged into %s so we must connect your Twitter "
+"account to a local account. You can either create a new account, or connect "
+"with your existing account, if you have one."
+msgstr ""
+"Aquesta és la primera vegada que inicieu una sessió a %s, per tant hem de "
+"connectar el vostre compte del Twitter al vostre compte local. Podeu crear "
+"un compte nou, o bé connectar-vos amb un compte ja existent si en teniu un."
+
+msgid "Twitter Account Setup"
+msgstr "Configuració del compte del Twitter"
+
+msgid "Connection options"
+msgstr "Opcions de connexió"
+
+#, php-format
+msgid ""
+"My text and files are available under %s except this private data: password, "
+"email address, IM address, and phone number."
+msgstr ""
+"El meu text i fitxers es troben disponibles sots %s excepte pel que fa a les "
+"dades privades: contrasenya, adreça de correu electrònic i MI, i número de "
+"telèfon."
+
+msgid "Create new account"
+msgstr "Crea un compte nou"
+
+msgid "Create a new user with this nickname."
+msgstr "Crea un usuari nom amb aquest sobrenom."
+
+msgid "New nickname"
+msgstr "Nou sobrenom"
+
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+msgstr "1-64 lletres en minúscules o nombres, sense puntuació o espais"
+
+msgid "Create"
+msgstr "Crea"
+
+msgid "Connect existing account"
+msgstr "Connecta un compte ja existent"
+
+msgid ""
+"If you already have an account, login with your username and password to "
+"connect it to your Twitter account."
+msgstr ""
+"Si ja teniu un compte, inicieu una sessió amb el vostre usuari i contrasenya "
+"per connectar-lo al vostre compte del Twitter."
+
+msgid "Existing nickname"
+msgstr "Sobrenom ja existent"
+
+msgid "Password"
+msgstr "Contrasenya"
+
+msgid "Connect"
+msgstr "Connecta"
+
+msgid "Registration not allowed."
+msgstr "No es permet el registre."
+
+msgid "Not a valid invitation code."
+msgstr "No és un codi d'invitació vàlid."
+
+msgid "Nickname not allowed."
+msgstr "El sobrenom no és permès."
+
+msgid "Nickname already in use. Try another one."
+msgstr "El sobrenom ja és en ús. Proveu-ne un altre."
+
+msgid "Error registering user."
+msgstr "Error en registrar l'usuari."
+
+msgid "Error connecting user to Twitter."
+msgstr "Error en connectar l'usuari al Twitter."
+
+msgid "Invalid username or password."
+msgstr "Nom d'usuari o contrasenya no vàlida."
+
+msgid "Twitter"
+msgstr "Twitter"
+
+msgid "Twitter bridge settings"
+msgstr "Paràmetres del pont del Twitter"
+
+msgid "Invalid consumer key. Max length is 255 characters."
+msgstr "Clau de consumidor no vàlida. La llargada màxima és 255 caràcters."
+
+msgid "Invalid consumer secret. Max length is 255 characters."
+msgstr ""
+"Clau secreta de consumidor no vàlida. La llargada màxima és 255 caràcters."
+
+msgid "Twitter application settings"
+msgstr "Paràmetres de l'aplicació del Twitter"
+
+msgid "Consumer key"
+msgstr "Clau de consumidor"
+
+msgid "Consumer key assigned by Twitter"
+msgstr "Clau de consumidor assignada pel Twitter"
+
+msgid "Consumer secret"
+msgstr "Clau secreta de consumidor"
+
+msgid "Consumer secret assigned by Twitter"
+msgstr "Clau secreta de consumidor assignada pel Twitter"
+
+msgid "Note: a global consumer key and secret are set."
+msgstr "Nota: es defineixen una clau pública i secreta de consumidor."
+
+msgid "Integration source"
+msgstr "Font d'integració"
+
+msgid "Name of your Twitter application"
+msgstr "Nom de la vostra aplicació del Twitter"
+
+msgid "Options"
+msgstr "Opcions"
+
+msgid "Enable \"Sign-in with Twitter\""
+msgstr "Habilita l'inici de sessió amb el Twitter"
+
+msgid "Allow users to login with their Twitter credentials"
+msgstr "Permet als usuaris iniciar una sessió amb les credencials del Twitter"
+
+msgid "Enable Twitter import"
+msgstr "Habilita la importació del Twitter"
+
+msgid ""
+"Allow users to import their Twitter friends' timelines. Requires daemons to "
+"be manually configured."
+msgstr ""
+"Permet als usuaris importar les línies temporals dels amics al Twitter. Cal "
+"que es configurin els dimonis manualment."
+
+msgid "Save Twitter settings"
+msgstr "Desa els paràmetres del Twitter"
+
+msgid "Login or register using Twitter"
+msgstr "Inicieu una sessió o registreu-vos fent servir el Twitter"
+
+msgid "Twitter integration options"
+msgstr "Opcions d'integració del Twitter"
+
+msgid "Twitter bridge configuration"
+msgstr "Configuració del pont del Twitter"
+
+msgid ""
+"The Twitter \"bridge\" plugin allows integration of a StatusNet instance "
+"with <a href=\"http://twitter.com/\">Twitter</a>."
+msgstr ""
+"El connector del pont del Twitter permet integrar una instància de "
+"l'StatusNet amb el <a href=\"http://twitter.com/\">Twitter</a>."
+
+msgid "Already logged in."
+msgstr "Ja heu iniciat una sessió."
+
+msgid "Twitter Login"
+msgstr "Inici de sessió del Twitter"
+
+msgid "Login with your Twitter account"
+msgstr "Inicieu una sessió amb el vostre compte del Twitter"
+
+msgid "Sign in with Twitter"
+msgstr "Inici de sessió amb el Twitter"
 
-#: twitter.php:409
 msgid "Your Twitter bridge has been disabled."
 msgstr "S'ha inhabilitat el vostre pont del Twitter."
 
-#: twitter.php:413
 #, php-format
 msgid ""
 "Hi, %1$s. We're sorry to inform you that your link to Twitter has been "
@@ -59,347 +317,8 @@ msgstr ""
 "Atentament,\n"
 "%3$s"
 
-#: TwitterBridgePlugin.php:151 TwitterBridgePlugin.php:174
-#: TwitterBridgePlugin.php:302 twitteradminpanel.php:52
-msgid "Twitter"
-msgstr "Twitter"
-
-#: TwitterBridgePlugin.php:152
-msgid "Login or register using Twitter"
-msgstr "Inicieu una sessió o registreu-vos fent servir el Twitter"
-
-#: TwitterBridgePlugin.php:175
-msgid "Twitter integration options"
-msgstr "Opcions d'integració del Twitter"
-
-#: TwitterBridgePlugin.php:303
-msgid "Twitter bridge configuration"
-msgstr "Configuració del pont del Twitter"
-
-#: TwitterBridgePlugin.php:327
-msgid ""
-"The Twitter \"bridge\" plugin allows integration of a StatusNet instance "
-"with <a href=\"http://twitter.com/\">Twitter</a>."
-msgstr ""
-"El connector del pont del Twitter permet integrar una instància de "
-"l'StatusNet amb el <a href=\"http://twitter.com/\">Twitter</a>."
-
-#: twitteradminpanel.php:62
-msgid "Twitter bridge settings"
-msgstr "Paràmetres del pont del Twitter"
-
-#: twitteradminpanel.php:150
-msgid "Invalid consumer key. Max length is 255 characters."
-msgstr "Clau de consumidor no vàlida. La llargada màxima és 255 caràcters."
-
-#: twitteradminpanel.php:156
-msgid "Invalid consumer secret. Max length is 255 characters."
-msgstr ""
-"Clau secreta de consumidor no vàlida. La llargada màxima és 255 caràcters."
-
-#: twitteradminpanel.php:212
-msgid "Twitter application settings"
-msgstr "Paràmetres de l'aplicació del Twitter"
-
-#: twitteradminpanel.php:218
-msgid "Consumer key"
-msgstr "Clau de consumidor"
-
-#: twitteradminpanel.php:219
-msgid "Consumer key assigned by Twitter"
-msgstr "Clau de consumidor assignada pel Twitter"
-
-#: twitteradminpanel.php:227
-msgid "Consumer secret"
-msgstr "Clau secreta de consumidor"
-
-#: twitteradminpanel.php:228
-msgid "Consumer secret assigned by Twitter"
-msgstr "Clau secreta de consumidor assignada pel Twitter"
-
-#: twitteradminpanel.php:238
-msgid "Note: a global consumer key and secret are set."
-msgstr "Nota: es defineixen una clau pública i secreta de consumidor."
-
-#: twitteradminpanel.php:245
-msgid "Integration source"
-msgstr "Font d'integració"
-
-#: twitteradminpanel.php:246
-msgid "Name of your Twitter application"
-msgstr "Nom de la vostra aplicació del Twitter"
-
-#: twitteradminpanel.php:258
-msgid "Options"
-msgstr "Opcions"
-
-#: twitteradminpanel.php:265
-msgid "Enable \"Sign-in with Twitter\""
-msgstr "Habilita l'inici de sessió amb el Twitter"
-
-#: twitteradminpanel.php:267
-msgid "Allow users to login with their Twitter credentials"
-msgstr "Permet als usuaris iniciar una sessió amb les credencials del Twitter"
-
-#: twitteradminpanel.php:274
-msgid "Enable Twitter import"
-msgstr "Habilita la importació del Twitter"
-
-#: twitteradminpanel.php:276
-msgid ""
-"Allow users to import their Twitter friends' timelines. Requires daemons to "
-"be manually configured."
-msgstr ""
-"Permet als usuaris importar les línies temporals dels amics al Twitter. Cal "
-"que es configurin els dimonis manualment."
-
-#: twitteradminpanel.php:293 twittersettings.php:199
-msgid "Save"
-msgstr "Desa"
-
-#: twitteradminpanel.php:293
-msgid "Save Twitter settings"
-msgstr "Desa els paràmetres del Twitter"
-
-#: twitterlogin.php:56
-msgid "Already logged in."
-msgstr "Ja heu iniciat una sessió."
-
-#: twitterlogin.php:64
-msgid "Twitter Login"
-msgstr "Inici de sessió del Twitter"
-
-#: twitterlogin.php:69
-msgid "Login with your Twitter account"
-msgstr "Inicieu una sessió amb el vostre compte del Twitter"
-
-#: twitterlogin.php:87
-msgid "Sign in with Twitter"
-msgstr "Inici de sessió amb el Twitter"
-
-#: twitterauthorization.php:120 twittersettings.php:225
-msgid "There was a problem with your session token. Try again, please."
-msgstr ""
-"S'ha produït un problema amb el vostre testimoni de sessió. Torneu-ho a "
-"provar."
-
-#: twitterauthorization.php:126
-msgid "You can't register if you don't agree to the license."
-msgstr "No podeu registrar-vos-hi si no accepteu la llicència."
-
-#: twitterauthorization.php:135
-msgid "Something weird happened."
-msgstr "Ha passat quelcom estrany."
-
-#: twitterauthorization.php:181 twitterauthorization.php:229
-#: twitterauthorization.php:300
-msgid "Couldn't link your Twitter account."
-msgstr "No s'ha pogut enllaçar amb el compte del Twitter."
-
-#: twitterauthorization.php:201
-msgid "Couldn't link your Twitter account: oauth_token mismatch."
-msgstr ""
-"No s'ha pogut enllaçar amb el vostre compte del Twitter: no coincidència de "
-"l'oath_token."
-
-#: twitterauthorization.php:312
+#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
+#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
 #, php-format
-msgid ""
-"This is the first time you've logged into %s so we must connect your Twitter "
-"account to a local account. You can either create a new account, or connect "
-"with your existing account, if you have one."
-msgstr ""
-"Aquesta és la primera vegada que inicieu una sessió a %s, per tant hem de "
-"connectar el vostre compte del Twitter al vostre compte local. Podeu crear "
-"un compte nou, o bé connectar-vos amb un compte ja existent si en teniu un."
-
-#: twitterauthorization.php:318
-msgid "Twitter Account Setup"
-msgstr "Configuració del compte del Twitter"
-
-#: twitterauthorization.php:351
-msgid "Connection options"
-msgstr "Opcions de connexió"
-
-#: twitterauthorization.php:360
-#, php-format
-msgid ""
-"My text and files are available under %s except this private data: password, "
-"email address, IM address, and phone number."
-msgstr ""
-"El meu text i fitxers es troben disponibles sots %s excepte pel que fa a les "
-"dades privades: contrasenya, adreça de correu electrònic i MI, i número de "
-"telèfon."
-
-#: twitterauthorization.php:381
-msgid "Create new account"
-msgstr "Crea un compte nou"
-
-#: twitterauthorization.php:383
-msgid "Create a new user with this nickname."
-msgstr "Crea un usuari nom amb aquest sobrenom."
-
-#: twitterauthorization.php:390
-msgid "New nickname"
-msgstr "Nou sobrenom"
-
-#: twitterauthorization.php:392
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr "1-64 lletres en minúscules o nombres, sense puntuació o espais"
-
-#: twitterauthorization.php:404
-msgid "Create"
-msgstr "Crea"
-
-#: twitterauthorization.php:409
-msgid "Connect existing account"
-msgstr "Connecta un compte ja existent"
-
-#: twitterauthorization.php:411
-msgid ""
-"If you already have an account, login with your username and password to "
-"connect it to your Twitter account."
-msgstr ""
-"Si ja teniu un compte, inicieu una sessió amb el vostre usuari i contrasenya "
-"per connectar-lo al vostre compte del Twitter."
-
-#: twitterauthorization.php:414
-msgid "Existing nickname"
-msgstr "Sobrenom ja existent"
-
-#: twitterauthorization.php:417
-msgid "Password"
-msgstr "Contrasenya"
-
-#: twitterauthorization.php:420
-msgid "Connect"
-msgstr "Connecta"
-
-#: twitterauthorization.php:466 twitterauthorization.php:475
-msgid "Registration not allowed."
-msgstr "No es permet el registre."
-
-#: twitterauthorization.php:482
-msgid "Not a valid invitation code."
-msgstr "No és un codi d'invitació vàlid."
-
-#: twitterauthorization.php:495
-msgid "Nickname not allowed."
-msgstr "El sobrenom no és permès."
-
-#: twitterauthorization.php:500
-msgid "Nickname already in use. Try another one."
-msgstr "El sobrenom ja és en ús. Proveu-ne un altre."
-
-#: twitterauthorization.php:520
-msgid "Error registering user."
-msgstr "Error en registrar l'usuari."
-
-#: twitterauthorization.php:531 twitterauthorization.php:571
-#: twitterauthorization.php:591
-msgid "Error connecting user to Twitter."
-msgstr "Error en connectar l'usuari al Twitter."
-
-#: twitterauthorization.php:553
-msgid "Invalid username or password."
-msgstr "Nom d'usuari o contrasenya no vàlida."
-
-#: twittersettings.php:57
-msgid "Twitter settings"
-msgstr "Paràmetres del Twitter"
-
-#: twittersettings.php:68
-msgid ""
-"Connect your Twitter account to share your updates with your Twitter friends "
-"and vice-versa."
-msgstr ""
-"Connecteu el vostre compte del Twitter per compartir les vostres "
-"actualitzacions amb els vostres amics del Twitter i viceversa."
-
-#: twittersettings.php:115
-msgid "Twitter account"
-msgstr "Compte del Twitter"
-
-#: twittersettings.php:120
-msgid "Connected Twitter account"
-msgstr "Compte del Twitter connectat"
-
-#: twittersettings.php:125
-msgid "Disconnect my account from Twitter"
-msgstr "Desconnecta el meu compte del Twitter"
-
-#: twittersettings.php:131
-msgid "Disconnecting your Twitter could make it impossible to log in! Please "
-msgstr ""
-"En desconnectar el vostre Twitter podeu impossibilitar que torneu a iniciar "
-"una sessió! "
-
-#: twittersettings.php:135
-msgid "set a password"
-msgstr "Definiu una contrasenya"
-
-#: twittersettings.php:137
-msgid " first."
-msgstr " primer."
-
-#. TRANS: %1$s is the current website name.
-#: twittersettings.php:141
-#, php-format
-msgid ""
-"Keep your %1$s account but disconnect from Twitter. You can use your %1$s "
-"password to log in."
-msgstr ""
-"Mantingueu el vostre compte %1$s, però desconnecteu-lo del Twitter. Podeu "
-"emprar la vostra contrasenya %1$s per iniciar una sessió."
-
-#: twittersettings.php:149
-msgid "Disconnect"
-msgstr "Desconnecta"
-
-#: twittersettings.php:156
-msgid "Preferences"
-msgstr "Preferències"
-
-#: twittersettings.php:160
-msgid "Automatically send my notices to Twitter."
-msgstr "Envia automàticament els meus avisos al Twitter."
-
-#: twittersettings.php:167
-msgid "Send local \"@\" replies to Twitter."
-msgstr "Envia les respostes locals «@» al Twitter."
-
-#: twittersettings.php:174
-msgid "Subscribe to my Twitter friends here."
-msgstr "Subscriu els meus amics del Twitter aquí."
-
-#: twittersettings.php:183
-msgid "Import my friends timeline."
-msgstr "Importa la línia temporal d'amics."
-
-#: twittersettings.php:201
-msgid "Add"
-msgstr "Afegeix"
-
-#: twittersettings.php:235
-msgid "Unexpected form submission."
-msgstr "Enviament de formulari inesperat."
-
-#: twittersettings.php:250
-msgid "No Twitter connection to remove."
-msgstr "No hi ha cap connexió del Twitter a suprimir."
-
-#: twittersettings.php:258
-msgid "Couldn't remove Twitter user."
-msgstr "No s'ha pogut suprimir l'usuari del Twitter."
-
-#: twittersettings.php:262
-msgid "Twitter account disconnected."
-msgstr "S'ha desconnectat el compte del Twitter."
-
-#: twittersettings.php:282 twittersettings.php:293
-msgid "Couldn't save Twitter preferences."
-msgstr "No s'han pogut desar les preferències del Twitter."
-
-#: twittersettings.php:301
-msgid "Twitter preferences saved."
-msgstr "S'han desat les preferències del Twitter."
+msgid "RT @%1$s %2$s"
+msgstr "RT @%1$s %2$s"
diff --git a/plugins/TwitterBridge/locale/fa/LC_MESSAGES/TwitterBridge.po b/plugins/TwitterBridge/locale/fa/LC_MESSAGES/TwitterBridge.po
index fa3129d220..d1d245bee9 100644
--- a/plugins/TwitterBridge/locale/fa/LC_MESSAGES/TwitterBridge.po
+++ b/plugins/TwitterBridge/locale/fa/LC_MESSAGES/TwitterBridge.po
@@ -9,30 +9,265 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TwitterBridge\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:13+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:26+0000\n"
 "Language-Team: Persian <http://translatewiki.net/wiki/Portal:fa>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-14 17:22:14+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:31+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fa\n"
 "X-Message-Group: #out-statusnet-plugin-twitterbridge\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
-#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: twitterimport.php:114
-#, php-format
-msgid "RT @%1$s %2$s"
+msgid "Twitter settings"
+msgstr "تنظیمات توییتر"
+
+msgid ""
+"Connect your Twitter account to share your updates with your Twitter friends "
+"and vice-versa."
 msgstr ""
 
-#: twitter.php:409
+msgid "Twitter account"
+msgstr "حساب کاربری توییتر"
+
+msgid "Connected Twitter account"
+msgstr "حساب کاربری توییتر متصل شد"
+
+msgid "Disconnect my account from Twitter"
+msgstr "قطع ارتباط حساب کاربری من از توییتر"
+
+msgid "Disconnecting your Twitter could make it impossible to log in! Please "
+msgstr ""
+
+msgid "set a password"
+msgstr "تنظیم رمز عبور"
+
+msgid " first."
+msgstr " ابتدا."
+
+#. TRANS: %1$s is the current website name.
+#, php-format
+msgid ""
+"Keep your %1$s account but disconnect from Twitter. You can use your %1$s "
+"password to log in."
+msgstr ""
+
+msgid "Disconnect"
+msgstr "قطع اتصال"
+
+msgid "Preferences"
+msgstr "ترجیحات"
+
+msgid "Automatically send my notices to Twitter."
+msgstr ""
+
+msgid "Send local \"@\" replies to Twitter."
+msgstr ""
+
+msgid "Subscribe to my Twitter friends here."
+msgstr ""
+
+msgid "Import my friends timeline."
+msgstr ""
+
+msgid "Save"
+msgstr "ذخیره"
+
+msgid "Add"
+msgstr "افزودن"
+
+msgid "There was a problem with your session token. Try again, please."
+msgstr ""
+
+msgid "Unexpected form submission."
+msgstr ""
+
+msgid "No Twitter connection to remove."
+msgstr "هیچ ارتباط توییتری برای حذف وجود ندارد."
+
+msgid "Couldn't remove Twitter user."
+msgstr "نمی‌توان کاربر توییتر را حذف کرد."
+
+msgid "Twitter account disconnected."
+msgstr "حساب توییتر قطع شده است."
+
+msgid "Couldn't save Twitter preferences."
+msgstr "نمی‌توان ترجیحات توییتر را ذخیره کرد."
+
+msgid "Twitter preferences saved."
+msgstr "تنظیمات توییتر ذخیره شد."
+
+msgid "You can't register if you don't agree to the license."
+msgstr ""
+
+msgid "Something weird happened."
+msgstr ""
+
+msgid "Couldn't link your Twitter account."
+msgstr ""
+
+msgid "Couldn't link your Twitter account: oauth_token mismatch."
+msgstr ""
+
+#, php-format
+msgid ""
+"This is the first time you've logged into %s so we must connect your Twitter "
+"account to a local account. You can either create a new account, or connect "
+"with your existing account, if you have one."
+msgstr ""
+
+msgid "Twitter Account Setup"
+msgstr "تنظیم حساب کاربری توییتر"
+
+msgid "Connection options"
+msgstr "تنظیمات اتصال"
+
+#, php-format
+msgid ""
+"My text and files are available under %s except this private data: password, "
+"email address, IM address, and phone number."
+msgstr ""
+
+msgid "Create new account"
+msgstr "ایجاد حساب کاربری جدید"
+
+msgid "Create a new user with this nickname."
+msgstr "ایجاد یک کاربر جدید با این نام مستعار."
+
+msgid "New nickname"
+msgstr "نام مستعار جدید"
+
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+msgstr ""
+
+msgid "Create"
+msgstr "ایجاد"
+
+msgid "Connect existing account"
+msgstr "اتصال به حساب کاربری موجود"
+
+msgid ""
+"If you already have an account, login with your username and password to "
+"connect it to your Twitter account."
+msgstr ""
+
+msgid "Existing nickname"
+msgstr "نام مستعار موجود"
+
+msgid "Password"
+msgstr "رمز عبور"
+
+msgid "Connect"
+msgstr "اتصال"
+
+msgid "Registration not allowed."
+msgstr "اجازهٔ ثبت‌نام داده نشده است."
+
+msgid "Not a valid invitation code."
+msgstr "کد دعوت نامعتبر است."
+
+msgid "Nickname not allowed."
+msgstr "نام مستعار مجاز نیست."
+
+msgid "Nickname already in use. Try another one."
+msgstr "این نام مستعار در حال حاضر مورد استفاده است. یکی دیگر را بیازمایید."
+
+msgid "Error registering user."
+msgstr "خطا در ثبت نام کاربر."
+
+msgid "Error connecting user to Twitter."
+msgstr "خطا در اتصال کاربر به توییتر."
+
+msgid "Invalid username or password."
+msgstr "نام کاربری یا رمز عبور اشتباه است."
+
+msgid "Twitter"
+msgstr "توییتر"
+
+msgid "Twitter bridge settings"
+msgstr "تنظیمات پل توییتر"
+
+msgid "Invalid consumer key. Max length is 255 characters."
+msgstr ""
+
+msgid "Invalid consumer secret. Max length is 255 characters."
+msgstr ""
+
+msgid "Twitter application settings"
+msgstr ""
+
+msgid "Consumer key"
+msgstr ""
+
+msgid "Consumer key assigned by Twitter"
+msgstr ""
+
+msgid "Consumer secret"
+msgstr ""
+
+msgid "Consumer secret assigned by Twitter"
+msgstr ""
+
+msgid "Note: a global consumer key and secret are set."
+msgstr ""
+
+msgid "Integration source"
+msgstr ""
+
+msgid "Name of your Twitter application"
+msgstr ""
+
+msgid "Options"
+msgstr "تنظیمات"
+
+msgid "Enable \"Sign-in with Twitter\""
+msgstr ""
+
+msgid "Allow users to login with their Twitter credentials"
+msgstr ""
+
+msgid "Enable Twitter import"
+msgstr ""
+
+msgid ""
+"Allow users to import their Twitter friends' timelines. Requires daemons to "
+"be manually configured."
+msgstr ""
+
+msgid "Save Twitter settings"
+msgstr "ذخیره تنظیمات توییتر"
+
+msgid "Login or register using Twitter"
+msgstr "برای استفاده از توییتر، وارد شوید یا ثبت نام کنید"
+
+msgid "Twitter integration options"
+msgstr "تنظیمات پیوسته توییتر"
+
+msgid "Twitter bridge configuration"
+msgstr "پیکربندی پل توییتر"
+
+msgid ""
+"The Twitter \"bridge\" plugin allows integration of a StatusNet instance "
+"with <a href=\"http://twitter.com/\">Twitter</a>."
+msgstr ""
+
+msgid "Already logged in."
+msgstr "در حال حاضر وارد شده‌اید."
+
+msgid "Twitter Login"
+msgstr "ورود به توییتر"
+
+msgid "Login with your Twitter account"
+msgstr ""
+
+msgid "Sign in with Twitter"
+msgstr "با حساب کاربری توییتر وارد شوید"
+
 msgid "Your Twitter bridge has been disabled."
 msgstr "پل توییتر شما غیر فعال شده است."
 
-#: twitter.php:413
 #, php-format
 msgid ""
 "Hi, %1$s. We're sorry to inform you that your link to Twitter has been "
@@ -48,324 +283,8 @@ msgid ""
 "%3$s"
 msgstr ""
 
-#: TwitterBridgePlugin.php:151 TwitterBridgePlugin.php:174
-#: TwitterBridgePlugin.php:302 twitteradminpanel.php:52
-msgid "Twitter"
-msgstr "توییتر"
-
-#: TwitterBridgePlugin.php:152
-msgid "Login or register using Twitter"
-msgstr "برای استفاده از توییتر، وارد شوید یا ثبت نام کنید"
-
-#: TwitterBridgePlugin.php:175
-msgid "Twitter integration options"
-msgstr "تنظیمات پیوسته توییتر"
-
-#: TwitterBridgePlugin.php:303
-msgid "Twitter bridge configuration"
-msgstr "پیکربندی پل توییتر"
-
-#: TwitterBridgePlugin.php:327
-msgid ""
-"The Twitter \"bridge\" plugin allows integration of a StatusNet instance "
-"with <a href=\"http://twitter.com/\">Twitter</a>."
-msgstr ""
-
-#: twitteradminpanel.php:62
-msgid "Twitter bridge settings"
-msgstr "تنظیمات پل توییتر"
-
-#: twitteradminpanel.php:150
-msgid "Invalid consumer key. Max length is 255 characters."
-msgstr ""
-
-#: twitteradminpanel.php:156
-msgid "Invalid consumer secret. Max length is 255 characters."
-msgstr ""
-
-#: twitteradminpanel.php:212
-msgid "Twitter application settings"
-msgstr ""
-
-#: twitteradminpanel.php:218
-msgid "Consumer key"
-msgstr ""
-
-#: twitteradminpanel.php:219
-msgid "Consumer key assigned by Twitter"
-msgstr ""
-
-#: twitteradminpanel.php:227
-msgid "Consumer secret"
-msgstr ""
-
-#: twitteradminpanel.php:228
-msgid "Consumer secret assigned by Twitter"
-msgstr ""
-
-#: twitteradminpanel.php:238
-msgid "Note: a global consumer key and secret are set."
-msgstr ""
-
-#: twitteradminpanel.php:245
-msgid "Integration source"
-msgstr ""
-
-#: twitteradminpanel.php:246
-msgid "Name of your Twitter application"
-msgstr ""
-
-#: twitteradminpanel.php:258
-msgid "Options"
-msgstr "تنظیمات"
-
-#: twitteradminpanel.php:265
-msgid "Enable \"Sign-in with Twitter\""
-msgstr ""
-
-#: twitteradminpanel.php:267
-msgid "Allow users to login with their Twitter credentials"
-msgstr ""
-
-#: twitteradminpanel.php:274
-msgid "Enable Twitter import"
-msgstr ""
-
-#: twitteradminpanel.php:276
-msgid ""
-"Allow users to import their Twitter friends' timelines. Requires daemons to "
-"be manually configured."
-msgstr ""
-
-#: twitteradminpanel.php:293 twittersettings.php:199
-msgid "Save"
-msgstr "ذخیره"
-
-#: twitteradminpanel.php:293
-msgid "Save Twitter settings"
-msgstr "ذخیره تنظیمات توییتر"
-
-#: twitterlogin.php:56
-msgid "Already logged in."
-msgstr "در حال حاضر وارد شده‌اید."
-
-#: twitterlogin.php:64
-msgid "Twitter Login"
-msgstr "ورود به توییتر"
-
-#: twitterlogin.php:69
-msgid "Login with your Twitter account"
-msgstr ""
-
-#: twitterlogin.php:87
-msgid "Sign in with Twitter"
-msgstr "با حساب کاربری توییتر وارد شوید"
-
-#: twitterauthorization.php:120 twittersettings.php:225
-msgid "There was a problem with your session token. Try again, please."
-msgstr ""
-
-#: twitterauthorization.php:126
-msgid "You can't register if you don't agree to the license."
-msgstr ""
-
-#: twitterauthorization.php:135
-msgid "Something weird happened."
-msgstr ""
-
-#: twitterauthorization.php:181 twitterauthorization.php:229
-#: twitterauthorization.php:300
-msgid "Couldn't link your Twitter account."
-msgstr ""
-
-#: twitterauthorization.php:201
-msgid "Couldn't link your Twitter account: oauth_token mismatch."
-msgstr ""
-
-#: twitterauthorization.php:312
+#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
+#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
 #, php-format
-msgid ""
-"This is the first time you've logged into %s so we must connect your Twitter "
-"account to a local account. You can either create a new account, or connect "
-"with your existing account, if you have one."
+msgid "RT @%1$s %2$s"
 msgstr ""
-
-#: twitterauthorization.php:318
-msgid "Twitter Account Setup"
-msgstr "تنظیم حساب کاربری توییتر"
-
-#: twitterauthorization.php:351
-msgid "Connection options"
-msgstr "تنظیمات اتصال"
-
-#: twitterauthorization.php:360
-#, php-format
-msgid ""
-"My text and files are available under %s except this private data: password, "
-"email address, IM address, and phone number."
-msgstr ""
-
-#: twitterauthorization.php:381
-msgid "Create new account"
-msgstr "ایجاد حساب کاربری جدید"
-
-#: twitterauthorization.php:383
-msgid "Create a new user with this nickname."
-msgstr "ایجاد یک کاربر جدید با این نام مستعار."
-
-#: twitterauthorization.php:390
-msgid "New nickname"
-msgstr "نام مستعار جدید"
-
-#: twitterauthorization.php:392
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr ""
-
-#: twitterauthorization.php:404
-msgid "Create"
-msgstr "ایجاد"
-
-#: twitterauthorization.php:409
-msgid "Connect existing account"
-msgstr "اتصال به حساب کاربری موجود"
-
-#: twitterauthorization.php:411
-msgid ""
-"If you already have an account, login with your username and password to "
-"connect it to your Twitter account."
-msgstr ""
-
-#: twitterauthorization.php:414
-msgid "Existing nickname"
-msgstr "نام مستعار موجود"
-
-#: twitterauthorization.php:417
-msgid "Password"
-msgstr "رمز عبور"
-
-#: twitterauthorization.php:420
-msgid "Connect"
-msgstr "اتصال"
-
-#: twitterauthorization.php:466 twitterauthorization.php:475
-msgid "Registration not allowed."
-msgstr "اجازهٔ ثبت‌نام داده نشده است."
-
-#: twitterauthorization.php:482
-msgid "Not a valid invitation code."
-msgstr "کد دعوت نامعتبر است."
-
-#: twitterauthorization.php:495
-msgid "Nickname not allowed."
-msgstr "نام مستعار مجاز نیست."
-
-#: twitterauthorization.php:500
-msgid "Nickname already in use. Try another one."
-msgstr "این نام مستعار در حال حاضر مورد استفاده است. یکی دیگر را بیازمایید."
-
-#: twitterauthorization.php:520
-msgid "Error registering user."
-msgstr "خطا در ثبت نام کاربر."
-
-#: twitterauthorization.php:531 twitterauthorization.php:571
-#: twitterauthorization.php:591
-msgid "Error connecting user to Twitter."
-msgstr "خطا در اتصال کاربر به توییتر."
-
-#: twitterauthorization.php:553
-msgid "Invalid username or password."
-msgstr "نام کاربری یا رمز عبور اشتباه است."
-
-#: twittersettings.php:57
-msgid "Twitter settings"
-msgstr "تنظیمات توییتر"
-
-#: twittersettings.php:68
-msgid ""
-"Connect your Twitter account to share your updates with your Twitter friends "
-"and vice-versa."
-msgstr ""
-
-#: twittersettings.php:115
-msgid "Twitter account"
-msgstr "حساب کاربری توییتر"
-
-#: twittersettings.php:120
-msgid "Connected Twitter account"
-msgstr "حساب کاربری توییتر متصل شد"
-
-#: twittersettings.php:125
-msgid "Disconnect my account from Twitter"
-msgstr "قطع ارتباط حساب کاربری من از توییتر"
-
-#: twittersettings.php:131
-msgid "Disconnecting your Twitter could make it impossible to log in! Please "
-msgstr ""
-
-#: twittersettings.php:135
-msgid "set a password"
-msgstr "تنظیم رمز عبور"
-
-#: twittersettings.php:137
-msgid " first."
-msgstr " ابتدا."
-
-#. TRANS: %1$s is the current website name.
-#: twittersettings.php:141
-#, php-format
-msgid ""
-"Keep your %1$s account but disconnect from Twitter. You can use your %1$s "
-"password to log in."
-msgstr ""
-
-#: twittersettings.php:149
-msgid "Disconnect"
-msgstr "قطع اتصال"
-
-#: twittersettings.php:156
-msgid "Preferences"
-msgstr "ترجیحات"
-
-#: twittersettings.php:160
-msgid "Automatically send my notices to Twitter."
-msgstr ""
-
-#: twittersettings.php:167
-msgid "Send local \"@\" replies to Twitter."
-msgstr ""
-
-#: twittersettings.php:174
-msgid "Subscribe to my Twitter friends here."
-msgstr ""
-
-#: twittersettings.php:183
-msgid "Import my friends timeline."
-msgstr ""
-
-#: twittersettings.php:201
-msgid "Add"
-msgstr "افزودن"
-
-#: twittersettings.php:235
-msgid "Unexpected form submission."
-msgstr ""
-
-#: twittersettings.php:250
-msgid "No Twitter connection to remove."
-msgstr "هیچ ارتباط توییتری برای حذف وجود ندارد."
-
-#: twittersettings.php:258
-msgid "Couldn't remove Twitter user."
-msgstr "نمی‌توان کاربر توییتر را حذف کرد."
-
-#: twittersettings.php:262
-msgid "Twitter account disconnected."
-msgstr "حساب توییتر قطع شده است."
-
-#: twittersettings.php:282 twittersettings.php:293
-msgid "Couldn't save Twitter preferences."
-msgstr "نمی‌توان ترجیحات توییتر را ذخیره کرد."
-
-#: twittersettings.php:301
-msgid "Twitter preferences saved."
-msgstr "تنظیمات توییتر ذخیره شد."
diff --git a/plugins/TwitterBridge/locale/fr/LC_MESSAGES/TwitterBridge.po b/plugins/TwitterBridge/locale/fr/LC_MESSAGES/TwitterBridge.po
index 0483cf33e2..08e1f9f516 100644
--- a/plugins/TwitterBridge/locale/fr/LC_MESSAGES/TwitterBridge.po
+++ b/plugins/TwitterBridge/locale/fr/LC_MESSAGES/TwitterBridge.po
@@ -10,30 +10,290 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TwitterBridge\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:13+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:27+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-14 17:22:14+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:31+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-twitterbridge\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
-#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: twitterimport.php:114
-#, php-format
-msgid "RT @%1$s %2$s"
-msgstr "RT @%1$s %2$s"
+msgid "Twitter settings"
+msgstr "Paramètres Twitter"
+
+msgid ""
+"Connect your Twitter account to share your updates with your Twitter friends "
+"and vice-versa."
+msgstr ""
+"Connectez votre compte Twitter pour partager vos mises à jour avec vos amis "
+"Twitter et vice-versa."
+
+msgid "Twitter account"
+msgstr "Compte Twitter"
+
+msgid "Connected Twitter account"
+msgstr "Compte Twitter connecté"
+
+msgid "Disconnect my account from Twitter"
+msgstr "Déconnecter mon compte de Twitter"
+
+msgid "Disconnecting your Twitter could make it impossible to log in! Please "
+msgstr ""
+"La déconnexion de votre compte Twitter ne vous permettrait plus de vous "
+"connecter ! S’il vous plaît "
+
+msgid "set a password"
+msgstr "définissez un mot de passe"
+
+msgid " first."
+msgstr " tout d’abord."
+
+#. TRANS: %1$s is the current website name.
+#, php-format
+msgid ""
+"Keep your %1$s account but disconnect from Twitter. You can use your %1$s "
+"password to log in."
+msgstr ""
+"Gardez votre compte %1$s, mais déconnectez-vous de Twitter. Vous pouvez "
+"utiliser votre mot de passe %1$s pour vous connecter."
+
+msgid "Disconnect"
+msgstr "Déconnecter"
+
+msgid "Preferences"
+msgstr "Préférences"
+
+msgid "Automatically send my notices to Twitter."
+msgstr "Envoyer automatiquement  mes avis sur Twitter."
+
+msgid "Send local \"@\" replies to Twitter."
+msgstr "Envoyer des réponses \"@\" locales à Twitter."
+
+msgid "Subscribe to my Twitter friends here."
+msgstr "S’abonner à mes amis Twitter ici."
+
+msgid "Import my friends timeline."
+msgstr "Importer l’agenda de mes amis."
+
+msgid "Save"
+msgstr "Sauvegarder"
+
+msgid "Add"
+msgstr "Ajouter"
+
+msgid "There was a problem with your session token. Try again, please."
+msgstr ""
+"Un problème est survenu avec votre jeton de session. Veuillez essayer à "
+"nouveau."
+
+msgid "Unexpected form submission."
+msgstr "Soumission de formulaire inattendue."
+
+msgid "No Twitter connection to remove."
+msgstr "Aucune connexion Twitter à retirer."
+
+msgid "Couldn't remove Twitter user."
+msgstr "Impossible de supprimer l’utilisateur Twitter."
+
+msgid "Twitter account disconnected."
+msgstr "Compte Twitter déconnecté."
+
+msgid "Couldn't save Twitter preferences."
+msgstr "Impossible de sauvegarder les préférences Twitter."
+
+msgid "Twitter preferences saved."
+msgstr "Préférences Twitter enregistrées."
+
+msgid "You can't register if you don't agree to the license."
+msgstr "Vous ne pouvez pas vous inscrire si vous n’acceptez pas la licence."
+
+msgid "Something weird happened."
+msgstr "Quelque chose de bizarre s’est passé."
+
+msgid "Couldn't link your Twitter account."
+msgstr "Impossible de lier votre compte Twitter."
+
+msgid "Couldn't link your Twitter account: oauth_token mismatch."
+msgstr ""
+"Impossible de lier votre compte Twitter : le jeton d’authentification ne "
+"correspond pas."
+
+#, php-format
+msgid ""
+"This is the first time you've logged into %s so we must connect your Twitter "
+"account to a local account. You can either create a new account, or connect "
+"with your existing account, if you have one."
+msgstr ""
+"C’est la première fois que vous êtes connecté à %s via Twitter, il nous faut "
+"donc lier votre compte Twitter à un compte local. Vous pouvez soit créer un "
+"nouveau compte, soit vous connecter avec votre compte local existant si vous "
+"en avez un."
+
+msgid "Twitter Account Setup"
+msgstr "Configuration du compte Twitter"
+
+msgid "Connection options"
+msgstr "Options de connexion"
+
+#, php-format
+msgid ""
+"My text and files are available under %s except this private data: password, "
+"email address, IM address, and phone number."
+msgstr ""
+"Mon texte et mes fichiers sont disponibles sous licence %s, à l’exception "
+"des données privées suivantes : mot de passe, adresse courriel, adresse de "
+"messagerie instantanée et numéro de téléphone."
+
+msgid "Create new account"
+msgstr "Créer un nouveau compte"
+
+msgid "Create a new user with this nickname."
+msgstr "Créer un nouvel utilisateur avec ce pseudonyme."
+
+msgid "New nickname"
+msgstr "Nouveau pseudonyme"
+
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+msgstr "1 à 64 lettres minuscules ou chiffres, sans ponctuation ni espaces"
+
+msgid "Create"
+msgstr "Créer"
+
+msgid "Connect existing account"
+msgstr "Se connecter à un compte existant"
+
+msgid ""
+"If you already have an account, login with your username and password to "
+"connect it to your Twitter account."
+msgstr ""
+"Si vous avez déjà un compte ici, connectez-vous avec votre nom d’utilisateur "
+"et mot de passe pour l’associer à votre compte Twitter."
+
+msgid "Existing nickname"
+msgstr "Pseudonyme existant"
+
+msgid "Password"
+msgstr "Mot de passe"
+
+msgid "Connect"
+msgstr "Connexion"
+
+msgid "Registration not allowed."
+msgstr "Inscription non autorisée."
+
+msgid "Not a valid invitation code."
+msgstr "Le code d’invitation n’est pas valide."
+
+msgid "Nickname not allowed."
+msgstr "Pseudonyme non autorisé."
+
+msgid "Nickname already in use. Try another one."
+msgstr "Pseudonyme déjà utilisé. Essayez-en un autre."
+
+msgid "Error registering user."
+msgstr "Erreur lors de l’inscription de l’utilisateur."
+
+msgid "Error connecting user to Twitter."
+msgstr "Erreur de connexion de l’utilisateur à Twitter."
+
+msgid "Invalid username or password."
+msgstr "Nom d’utilisateur ou mot de passe incorrect."
+
+msgid "Twitter"
+msgstr "Twitter"
+
+msgid "Twitter bridge settings"
+msgstr "Paramètres de la passerelle Twitter"
+
+msgid "Invalid consumer key. Max length is 255 characters."
+msgstr "Clé de client invalide. La longueur maximum est de 255 caractères."
+
+msgid "Invalid consumer secret. Max length is 255 characters."
+msgstr ""
+"Code secret du client invalide. La longueur maximum est de 255 caractères."
+
+msgid "Twitter application settings"
+msgstr "Paramètres de l’application Twitter"
+
+msgid "Consumer key"
+msgstr "Clé du client"
+
+msgid "Consumer key assigned by Twitter"
+msgstr "Clé du client assignée par Twitter"
+
+msgid "Consumer secret"
+msgstr "Code secret du client"
+
+msgid "Consumer secret assigned by Twitter"
+msgstr "Code secret du client assigné par Twitter"
+
+msgid "Note: a global consumer key and secret are set."
+msgstr "Note : une clé et un code secret de client global sont définis."
+
+msgid "Integration source"
+msgstr "Source d’intégration"
+
+msgid "Name of your Twitter application"
+msgstr "Nom de votre application Twitter"
+
+msgid "Options"
+msgstr "Options"
+
+msgid "Enable \"Sign-in with Twitter\""
+msgstr "Activer « S’inscrire avec Twitter »"
+
+msgid "Allow users to login with their Twitter credentials"
+msgstr ""
+"Permet aux utilisateurs de se connecter avec leurs identifiants Twitter"
+
+msgid "Enable Twitter import"
+msgstr "Activer l’importation Twitter"
+
+msgid ""
+"Allow users to import their Twitter friends' timelines. Requires daemons to "
+"be manually configured."
+msgstr ""
+"Permettre aux utilisateurs d’importer les agendas de leurs amis Twitter. "
+"Exige que les démons soient configurés manuellement."
+
+msgid "Save Twitter settings"
+msgstr "Sauvegarder les paramètres Twitter"
+
+msgid "Login or register using Twitter"
+msgstr "Se connecter ou s’inscrire via Twitter"
+
+msgid "Twitter integration options"
+msgstr "Options d’intégration de Twitter"
+
+msgid "Twitter bridge configuration"
+msgstr "Configuration de la passerelle Twitter"
+
+msgid ""
+"The Twitter \"bridge\" plugin allows integration of a StatusNet instance "
+"with <a href=\"http://twitter.com/\">Twitter</a>."
+msgstr ""
+"Le greffon de « passerelle » Twitter permet l’intégration d’une instance de "
+"StatusNet avec <a href=\"http://twitter.com/\">Twitter</a>."
+
+msgid "Already logged in."
+msgstr "Déjà connecté."
+
+msgid "Twitter Login"
+msgstr "Connexion Twitter"
+
+msgid "Login with your Twitter account"
+msgstr "Connexion avec votre compte Twitter"
+
+msgid "Sign in with Twitter"
+msgstr "S’inscrire avec Twitter"
 
-#: twitter.php:409
 msgid "Your Twitter bridge has been disabled."
 msgstr "Votre passerelle Twitter a été désactivée."
 
-#: twitter.php:413
 #, php-format
 msgid ""
 "Hi, %1$s. We're sorry to inform you that your link to Twitter has been "
@@ -61,349 +321,8 @@ msgstr ""
 "Cordialement,\n"
 "%3$s"
 
-#: TwitterBridgePlugin.php:151 TwitterBridgePlugin.php:174
-#: TwitterBridgePlugin.php:302 twitteradminpanel.php:52
-msgid "Twitter"
-msgstr "Twitter"
-
-#: TwitterBridgePlugin.php:152
-msgid "Login or register using Twitter"
-msgstr "Se connecter ou s’inscrire via Twitter"
-
-#: TwitterBridgePlugin.php:175
-msgid "Twitter integration options"
-msgstr "Options d’intégration de Twitter"
-
-#: TwitterBridgePlugin.php:303
-msgid "Twitter bridge configuration"
-msgstr "Configuration de la passerelle Twitter"
-
-#: TwitterBridgePlugin.php:327
-msgid ""
-"The Twitter \"bridge\" plugin allows integration of a StatusNet instance "
-"with <a href=\"http://twitter.com/\">Twitter</a>."
-msgstr ""
-"Le greffon de « passerelle » Twitter permet l’intégration d’une instance de "
-"StatusNet avec <a href=\"http://twitter.com/\">Twitter</a>."
-
-#: twitteradminpanel.php:62
-msgid "Twitter bridge settings"
-msgstr "Paramètres de la passerelle Twitter"
-
-#: twitteradminpanel.php:150
-msgid "Invalid consumer key. Max length is 255 characters."
-msgstr "Clé de client invalide. La longueur maximum est de 255 caractères."
-
-#: twitteradminpanel.php:156
-msgid "Invalid consumer secret. Max length is 255 characters."
-msgstr ""
-"Code secret du client invalide. La longueur maximum est de 255 caractères."
-
-#: twitteradminpanel.php:212
-msgid "Twitter application settings"
-msgstr "Paramètres de l’application Twitter"
-
-#: twitteradminpanel.php:218
-msgid "Consumer key"
-msgstr "Clé du client"
-
-#: twitteradminpanel.php:219
-msgid "Consumer key assigned by Twitter"
-msgstr "Clé du client assignée par Twitter"
-
-#: twitteradminpanel.php:227
-msgid "Consumer secret"
-msgstr "Code secret du client"
-
-#: twitteradminpanel.php:228
-msgid "Consumer secret assigned by Twitter"
-msgstr "Code secret du client assigné par Twitter"
-
-#: twitteradminpanel.php:238
-msgid "Note: a global consumer key and secret are set."
-msgstr "Note : une clé et un code secret de client global sont définis."
-
-#: twitteradminpanel.php:245
-msgid "Integration source"
-msgstr "Source d’intégration"
-
-#: twitteradminpanel.php:246
-msgid "Name of your Twitter application"
-msgstr "Nom de votre application Twitter"
-
-#: twitteradminpanel.php:258
-msgid "Options"
-msgstr "Options"
-
-#: twitteradminpanel.php:265
-msgid "Enable \"Sign-in with Twitter\""
-msgstr "Activer « S’inscrire avec Twitter »"
-
-#: twitteradminpanel.php:267
-msgid "Allow users to login with their Twitter credentials"
-msgstr ""
-"Permet aux utilisateurs de se connecter avec leurs identifiants Twitter"
-
-#: twitteradminpanel.php:274
-msgid "Enable Twitter import"
-msgstr "Activer l’importation Twitter"
-
-#: twitteradminpanel.php:276
-msgid ""
-"Allow users to import their Twitter friends' timelines. Requires daemons to "
-"be manually configured."
-msgstr ""
-"Permettre aux utilisateurs d’importer les agendas de leurs amis Twitter. "
-"Exige que les démons soient configurés manuellement."
-
-#: twitteradminpanel.php:293 twittersettings.php:199
-msgid "Save"
-msgstr "Sauvegarder"
-
-#: twitteradminpanel.php:293
-msgid "Save Twitter settings"
-msgstr "Sauvegarder les paramètres Twitter"
-
-#: twitterlogin.php:56
-msgid "Already logged in."
-msgstr "Déjà connecté."
-
-#: twitterlogin.php:64
-msgid "Twitter Login"
-msgstr "Connexion Twitter"
-
-#: twitterlogin.php:69
-msgid "Login with your Twitter account"
-msgstr "Connexion avec votre compte Twitter"
-
-#: twitterlogin.php:87
-msgid "Sign in with Twitter"
-msgstr "S’inscrire avec Twitter"
-
-#: twitterauthorization.php:120 twittersettings.php:225
-msgid "There was a problem with your session token. Try again, please."
-msgstr ""
-"Un problème est survenu avec votre jeton de session. Veuillez essayer à "
-"nouveau."
-
-#: twitterauthorization.php:126
-msgid "You can't register if you don't agree to the license."
-msgstr "Vous ne pouvez pas vous inscrire si vous n’acceptez pas la licence."
-
-#: twitterauthorization.php:135
-msgid "Something weird happened."
-msgstr "Quelque chose de bizarre s’est passé."
-
-#: twitterauthorization.php:181 twitterauthorization.php:229
-#: twitterauthorization.php:300
-msgid "Couldn't link your Twitter account."
-msgstr "Impossible de lier votre compte Twitter."
-
-#: twitterauthorization.php:201
-msgid "Couldn't link your Twitter account: oauth_token mismatch."
-msgstr ""
-"Impossible de lier votre compte Twitter : le jeton d’authentification ne "
-"correspond pas."
-
-#: twitterauthorization.php:312
+#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
+#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
 #, php-format
-msgid ""
-"This is the first time you've logged into %s so we must connect your Twitter "
-"account to a local account. You can either create a new account, or connect "
-"with your existing account, if you have one."
-msgstr ""
-"C’est la première fois que vous êtes connecté à %s via Twitter, il nous faut "
-"donc lier votre compte Twitter à un compte local. Vous pouvez soit créer un "
-"nouveau compte, soit vous connecter avec votre compte local existant si vous "
-"en avez un."
-
-#: twitterauthorization.php:318
-msgid "Twitter Account Setup"
-msgstr "Configuration du compte Twitter"
-
-#: twitterauthorization.php:351
-msgid "Connection options"
-msgstr "Options de connexion"
-
-#: twitterauthorization.php:360
-#, php-format
-msgid ""
-"My text and files are available under %s except this private data: password, "
-"email address, IM address, and phone number."
-msgstr ""
-"Mon texte et mes fichiers sont disponibles sous licence %s, à l’exception "
-"des données privées suivantes : mot de passe, adresse courriel, adresse de "
-"messagerie instantanée et numéro de téléphone."
-
-#: twitterauthorization.php:381
-msgid "Create new account"
-msgstr "Créer un nouveau compte"
-
-#: twitterauthorization.php:383
-msgid "Create a new user with this nickname."
-msgstr "Créer un nouvel utilisateur avec ce pseudonyme."
-
-#: twitterauthorization.php:390
-msgid "New nickname"
-msgstr "Nouveau pseudonyme"
-
-#: twitterauthorization.php:392
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr "1 à 64 lettres minuscules ou chiffres, sans ponctuation ni espaces"
-
-#: twitterauthorization.php:404
-msgid "Create"
-msgstr "Créer"
-
-#: twitterauthorization.php:409
-msgid "Connect existing account"
-msgstr "Se connecter à un compte existant"
-
-#: twitterauthorization.php:411
-msgid ""
-"If you already have an account, login with your username and password to "
-"connect it to your Twitter account."
-msgstr ""
-"Si vous avez déjà un compte ici, connectez-vous avec votre nom d’utilisateur "
-"et mot de passe pour l’associer à votre compte Twitter."
-
-#: twitterauthorization.php:414
-msgid "Existing nickname"
-msgstr "Pseudonyme existant"
-
-#: twitterauthorization.php:417
-msgid "Password"
-msgstr "Mot de passe"
-
-#: twitterauthorization.php:420
-msgid "Connect"
-msgstr "Connexion"
-
-#: twitterauthorization.php:466 twitterauthorization.php:475
-msgid "Registration not allowed."
-msgstr "Inscription non autorisée."
-
-#: twitterauthorization.php:482
-msgid "Not a valid invitation code."
-msgstr "Le code d’invitation n’est pas valide."
-
-#: twitterauthorization.php:495
-msgid "Nickname not allowed."
-msgstr "Pseudonyme non autorisé."
-
-#: twitterauthorization.php:500
-msgid "Nickname already in use. Try another one."
-msgstr "Pseudonyme déjà utilisé. Essayez-en un autre."
-
-#: twitterauthorization.php:520
-msgid "Error registering user."
-msgstr "Erreur lors de l’inscription de l’utilisateur."
-
-#: twitterauthorization.php:531 twitterauthorization.php:571
-#: twitterauthorization.php:591
-msgid "Error connecting user to Twitter."
-msgstr "Erreur de connexion de l’utilisateur à Twitter."
-
-#: twitterauthorization.php:553
-msgid "Invalid username or password."
-msgstr "Nom d’utilisateur ou mot de passe incorrect."
-
-#: twittersettings.php:57
-msgid "Twitter settings"
-msgstr "Paramètres Twitter"
-
-#: twittersettings.php:68
-msgid ""
-"Connect your Twitter account to share your updates with your Twitter friends "
-"and vice-versa."
-msgstr ""
-"Connectez votre compte Twitter pour partager vos mises à jour avec vos amis "
-"Twitter et vice-versa."
-
-#: twittersettings.php:115
-msgid "Twitter account"
-msgstr "Compte Twitter"
-
-#: twittersettings.php:120
-msgid "Connected Twitter account"
-msgstr "Compte Twitter connecté"
-
-#: twittersettings.php:125
-msgid "Disconnect my account from Twitter"
-msgstr "Déconnecter mon compte de Twitter"
-
-#: twittersettings.php:131
-msgid "Disconnecting your Twitter could make it impossible to log in! Please "
-msgstr ""
-"La déconnexion de votre compte Twitter ne vous permettrait plus de vous "
-"connecter ! S’il vous plaît "
-
-#: twittersettings.php:135
-msgid "set a password"
-msgstr "définissez un mot de passe"
-
-#: twittersettings.php:137
-msgid " first."
-msgstr " tout d’abord."
-
-#. TRANS: %1$s is the current website name.
-#: twittersettings.php:141
-#, php-format
-msgid ""
-"Keep your %1$s account but disconnect from Twitter. You can use your %1$s "
-"password to log in."
-msgstr ""
-"Gardez votre compte %1$s, mais déconnectez-vous de Twitter. Vous pouvez "
-"utiliser votre mot de passe %1$s pour vous connecter."
-
-#: twittersettings.php:149
-msgid "Disconnect"
-msgstr "Déconnecter"
-
-#: twittersettings.php:156
-msgid "Preferences"
-msgstr "Préférences"
-
-#: twittersettings.php:160
-msgid "Automatically send my notices to Twitter."
-msgstr "Envoyer automatiquement  mes avis sur Twitter."
-
-#: twittersettings.php:167
-msgid "Send local \"@\" replies to Twitter."
-msgstr "Envoyer des réponses \"@\" locales à Twitter."
-
-#: twittersettings.php:174
-msgid "Subscribe to my Twitter friends here."
-msgstr "S’abonner à mes amis Twitter ici."
-
-#: twittersettings.php:183
-msgid "Import my friends timeline."
-msgstr "Importer l’agenda de mes amis."
-
-#: twittersettings.php:201
-msgid "Add"
-msgstr "Ajouter"
-
-#: twittersettings.php:235
-msgid "Unexpected form submission."
-msgstr "Soumission de formulaire inattendue."
-
-#: twittersettings.php:250
-msgid "No Twitter connection to remove."
-msgstr "Aucune connexion Twitter à retirer."
-
-#: twittersettings.php:258
-msgid "Couldn't remove Twitter user."
-msgstr "Impossible de supprimer l’utilisateur Twitter."
-
-#: twittersettings.php:262
-msgid "Twitter account disconnected."
-msgstr "Compte Twitter déconnecté."
-
-#: twittersettings.php:282 twittersettings.php:293
-msgid "Couldn't save Twitter preferences."
-msgstr "Impossible de sauvegarder les préférences Twitter."
-
-#: twittersettings.php:301
-msgid "Twitter preferences saved."
-msgstr "Préférences Twitter enregistrées."
+msgid "RT @%1$s %2$s"
+msgstr "RT @%1$s %2$s"
diff --git a/plugins/TwitterBridge/locale/ia/LC_MESSAGES/TwitterBridge.po b/plugins/TwitterBridge/locale/ia/LC_MESSAGES/TwitterBridge.po
index c1855ebffd..40d8f44064 100644
--- a/plugins/TwitterBridge/locale/ia/LC_MESSAGES/TwitterBridge.po
+++ b/plugins/TwitterBridge/locale/ia/LC_MESSAGES/TwitterBridge.po
@@ -9,30 +9,283 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TwitterBridge\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:13+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:27+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-14 17:22:14+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:31+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-twitterbridge\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
-#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: twitterimport.php:114
-#, php-format
-msgid "RT @%1$s %2$s"
-msgstr "RT @%1$s %2$s"
+msgid "Twitter settings"
+msgstr "Configuration de Twitter"
+
+msgid ""
+"Connect your Twitter account to share your updates with your Twitter friends "
+"and vice-versa."
+msgstr ""
+"Connecte tu conto de Twitter pro condivider tu actualisationes con tu amicos "
+"de Twitter e vice versa."
+
+msgid "Twitter account"
+msgstr "Conto de Twitter"
+
+msgid "Connected Twitter account"
+msgstr "Conto de Twitter connectite"
+
+msgid "Disconnect my account from Twitter"
+msgstr "Disconnecter mi conto ab Twitter"
+
+msgid "Disconnecting your Twitter could make it impossible to log in! Please "
+msgstr ""
+"Le disconnexion de tu conto de Twitter renderea le authentication "
+"impossibile! Per favor "
+
+msgid "set a password"
+msgstr "defini un contrasigno"
+
+msgid " first."
+msgstr " primo."
+
+#. TRANS: %1$s is the current website name.
+#, php-format
+msgid ""
+"Keep your %1$s account but disconnect from Twitter. You can use your %1$s "
+"password to log in."
+msgstr ""
+"Retene tu conto de %1$s ma disconnecte ab Twitter. Tu pote usar tu "
+"contrasigno de %1$s pro aperir session."
+
+msgid "Disconnect"
+msgstr "Disconnecter"
+
+msgid "Preferences"
+msgstr "Preferentias"
+
+msgid "Automatically send my notices to Twitter."
+msgstr "Automaticamente inviar mi notas a Twitter."
+
+msgid "Send local \"@\" replies to Twitter."
+msgstr "Inviar responsas \"@\" local a Twitter."
+
+msgid "Subscribe to my Twitter friends here."
+msgstr "Subscriber hic a mi amicos de Twitter."
+
+msgid "Import my friends timeline."
+msgstr "Importar le chronologia de mi amicos."
+
+msgid "Save"
+msgstr "Salveguardar"
+
+msgid "Add"
+msgstr "Adder"
+
+msgid "There was a problem with your session token. Try again, please."
+msgstr "Occurreva un problema con le indicio de tu session. Per favor reproba."
+
+msgid "Unexpected form submission."
+msgstr "Submission de formulario inexpectate."
+
+msgid "No Twitter connection to remove."
+msgstr "Nulle connexion Twitter a remover."
+
+msgid "Couldn't remove Twitter user."
+msgstr "Non poteva remover le usator de Twitter."
+
+msgid "Twitter account disconnected."
+msgstr "Conto de Twitter disconnectite."
+
+msgid "Couldn't save Twitter preferences."
+msgstr "Non poteva salveguardar le preferentias de Twitter."
+
+msgid "Twitter preferences saved."
+msgstr "Preferentias de Twitter salveguardate."
+
+msgid "You can't register if you don't agree to the license."
+msgstr "Tu non pote crear un conto si tu non accepta le licentia."
+
+msgid "Something weird happened."
+msgstr "Qualcosa de bizarre occurreva."
+
+msgid "Couldn't link your Twitter account."
+msgstr "Non poteva ligar a tu conto de Twitter."
+
+msgid "Couldn't link your Twitter account: oauth_token mismatch."
+msgstr "Non poteva ligar a tu conto de Twitter: oauth_token non corresponde."
+
+#, php-format
+msgid ""
+"This is the first time you've logged into %s so we must connect your Twitter "
+"account to a local account. You can either create a new account, or connect "
+"with your existing account, if you have one."
+msgstr ""
+"Isto es le prime vice que tu ha aperite un session in %s; dunque, nos debe "
+"connecter tu conto de Twitter a un conto local. Tu pote crear un nove conto, "
+"o connecter con tu conto existente, si tu ha un."
+
+msgid "Twitter Account Setup"
+msgstr "Configuration del conto de Twitter"
+
+msgid "Connection options"
+msgstr "Optiones de connexion"
+
+#, php-format
+msgid ""
+"My text and files are available under %s except this private data: password, "
+"email address, IM address, and phone number."
+msgstr ""
+"Mi texto e files es disponibile sub %s excepte iste datos private: "
+"contrasigno, adresse de e-mail, adresse de messageria instantanee, numero de "
+"telephono."
+
+msgid "Create new account"
+msgstr "Crear nove conto"
+
+msgid "Create a new user with this nickname."
+msgstr "Crear un nove usator con iste pseudonymo."
+
+msgid "New nickname"
+msgstr "Nove pseudonymo"
+
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+msgstr "1-64 minusculas o numeros, sin punctuation o spatios"
+
+msgid "Create"
+msgstr "Crear"
+
+msgid "Connect existing account"
+msgstr "Connecter conto existente"
+
+msgid ""
+"If you already have an account, login with your username and password to "
+"connect it to your Twitter account."
+msgstr ""
+"Si tu ha jam un conto, aperi session con tu nomine de usator e contrasigno "
+"pro connecter lo a tu conto de Twitter."
+
+msgid "Existing nickname"
+msgstr "Pseudonymo existente"
+
+msgid "Password"
+msgstr "Contrasigno"
+
+msgid "Connect"
+msgstr "Connecter"
+
+msgid "Registration not allowed."
+msgstr "Creation de conto non permittite."
+
+msgid "Not a valid invitation code."
+msgstr "Le codice de invitation es invalide."
+
+msgid "Nickname not allowed."
+msgstr "Pseudonymo non permittite."
+
+msgid "Nickname already in use. Try another one."
+msgstr "Pseudonymo ja in uso. Proba un altere."
+
+msgid "Error registering user."
+msgstr "Error durante le registration del usator."
+
+msgid "Error connecting user to Twitter."
+msgstr "Error durante le connexion del usator a Twitter."
+
+msgid "Invalid username or password."
+msgstr "Nomine de usator o contrasigno invalide."
+
+msgid "Twitter"
+msgstr "Twitter"
+
+msgid "Twitter bridge settings"
+msgstr "Configuration del ponte a Twitter"
+
+msgid "Invalid consumer key. Max length is 255 characters."
+msgstr "Clave de consumitor invalide. Longitude maximal es 255 characteres."
+
+msgid "Invalid consumer secret. Max length is 255 characters."
+msgstr "Secreto de consumitor invalide. Longitude maximal es 255 characteres."
+
+msgid "Twitter application settings"
+msgstr "Configuration del application Twitter"
+
+msgid "Consumer key"
+msgstr "Clave de consumitor"
+
+msgid "Consumer key assigned by Twitter"
+msgstr "Clave de consumitor assignate per Twitter"
+
+msgid "Consumer secret"
+msgstr "Secreto de consumitor"
+
+msgid "Consumer secret assigned by Twitter"
+msgstr "Secreto de consumitor assignate per Twitter"
+
+msgid "Note: a global consumer key and secret are set."
+msgstr "Nota: un clave e un secreto de consumitor global es definite."
+
+msgid "Integration source"
+msgstr "Fonte de integration"
+
+msgid "Name of your Twitter application"
+msgstr "Nomine de tu application Twitter"
+
+msgid "Options"
+msgstr "Optiones"
+
+msgid "Enable \"Sign-in with Twitter\""
+msgstr "Activar \"Aperir session con Twitter\""
+
+msgid "Allow users to login with their Twitter credentials"
+msgstr "Permitte que usatores aperi session con lor conto de Twitter"
+
+msgid "Enable Twitter import"
+msgstr "Activar le importation de Twitter"
+
+msgid ""
+"Allow users to import their Twitter friends' timelines. Requires daemons to "
+"be manually configured."
+msgstr ""
+"Permitte que usatores importa le chronologias de lor amicos de Twitter. "
+"Require que le demones sia configurate manualmente."
+
+msgid "Save Twitter settings"
+msgstr "Salveguardar configurationes de Twitter"
+
+msgid "Login or register using Twitter"
+msgstr "Aperir session o crear conto usante Twitter"
+
+msgid "Twitter integration options"
+msgstr "Optiones de integration de Twitter"
+
+msgid "Twitter bridge configuration"
+msgstr "Configuration del ponte a Twitter"
+
+msgid ""
+"The Twitter \"bridge\" plugin allows integration of a StatusNet instance "
+"with <a href=\"http://twitter.com/\">Twitter</a>."
+msgstr ""
+"Le plug-in de \"ponte\" a Twitter permitte le integration de un installation "
+"de StatusNet con <a href=\"http://twitter.com/\">Twitter</a>."
+
+msgid "Already logged in."
+msgstr "Tu es jam authenticate."
+
+msgid "Twitter Login"
+msgstr "Apertura de session con Twitter"
+
+msgid "Login with your Twitter account"
+msgstr "Aperir session con tu conto de Twitter"
+
+msgid "Sign in with Twitter"
+msgstr "Aperir session con Twitter"
 
-#: twitter.php:409
 msgid "Your Twitter bridge has been disabled."
 msgstr "Tu ponte a Twitter ha essite disactivate."
 
-#: twitter.php:413
 #, php-format
 msgid ""
 "Hi, %1$s. We're sorry to inform you that your link to Twitter has been "
@@ -59,342 +312,8 @@ msgstr ""
 "Cordialmente,\n"
 "%3$s"
 
-#: TwitterBridgePlugin.php:151 TwitterBridgePlugin.php:174
-#: TwitterBridgePlugin.php:302 twitteradminpanel.php:52
-msgid "Twitter"
-msgstr "Twitter"
-
-#: TwitterBridgePlugin.php:152
-msgid "Login or register using Twitter"
-msgstr "Aperir session o crear conto usante Twitter"
-
-#: TwitterBridgePlugin.php:175
-msgid "Twitter integration options"
-msgstr "Optiones de integration de Twitter"
-
-#: TwitterBridgePlugin.php:303
-msgid "Twitter bridge configuration"
-msgstr "Configuration del ponte a Twitter"
-
-#: TwitterBridgePlugin.php:327
-msgid ""
-"The Twitter \"bridge\" plugin allows integration of a StatusNet instance "
-"with <a href=\"http://twitter.com/\">Twitter</a>."
-msgstr ""
-"Le plug-in de \"ponte\" a Twitter permitte le integration de un installation "
-"de StatusNet con <a href=\"http://twitter.com/\">Twitter</a>."
-
-#: twitteradminpanel.php:62
-msgid "Twitter bridge settings"
-msgstr "Configuration del ponte a Twitter"
-
-#: twitteradminpanel.php:150
-msgid "Invalid consumer key. Max length is 255 characters."
-msgstr "Clave de consumitor invalide. Longitude maximal es 255 characteres."
-
-#: twitteradminpanel.php:156
-msgid "Invalid consumer secret. Max length is 255 characters."
-msgstr "Secreto de consumitor invalide. Longitude maximal es 255 characteres."
-
-#: twitteradminpanel.php:212
-msgid "Twitter application settings"
-msgstr "Configuration del application Twitter"
-
-#: twitteradminpanel.php:218
-msgid "Consumer key"
-msgstr "Clave de consumitor"
-
-#: twitteradminpanel.php:219
-msgid "Consumer key assigned by Twitter"
-msgstr "Clave de consumitor assignate per Twitter"
-
-#: twitteradminpanel.php:227
-msgid "Consumer secret"
-msgstr "Secreto de consumitor"
-
-#: twitteradminpanel.php:228
-msgid "Consumer secret assigned by Twitter"
-msgstr "Secreto de consumitor assignate per Twitter"
-
-#: twitteradminpanel.php:238
-msgid "Note: a global consumer key and secret are set."
-msgstr "Nota: un clave e un secreto de consumitor global es definite."
-
-#: twitteradminpanel.php:245
-msgid "Integration source"
-msgstr "Fonte de integration"
-
-#: twitteradminpanel.php:246
-msgid "Name of your Twitter application"
-msgstr "Nomine de tu application Twitter"
-
-#: twitteradminpanel.php:258
-msgid "Options"
-msgstr "Optiones"
-
-#: twitteradminpanel.php:265
-msgid "Enable \"Sign-in with Twitter\""
-msgstr "Activar \"Aperir session con Twitter\""
-
-#: twitteradminpanel.php:267
-msgid "Allow users to login with their Twitter credentials"
-msgstr "Permitte que usatores aperi session con lor conto de Twitter"
-
-#: twitteradminpanel.php:274
-msgid "Enable Twitter import"
-msgstr "Activar le importation de Twitter"
-
-#: twitteradminpanel.php:276
-msgid ""
-"Allow users to import their Twitter friends' timelines. Requires daemons to "
-"be manually configured."
-msgstr ""
-"Permitte que usatores importa le chronologias de lor amicos de Twitter. "
-"Require que le demones sia configurate manualmente."
-
-#: twitteradminpanel.php:293 twittersettings.php:199
-msgid "Save"
-msgstr "Salveguardar"
-
-#: twitteradminpanel.php:293
-msgid "Save Twitter settings"
-msgstr "Salveguardar configurationes de Twitter"
-
-#: twitterlogin.php:56
-msgid "Already logged in."
-msgstr "Tu es jam authenticate."
-
-#: twitterlogin.php:64
-msgid "Twitter Login"
-msgstr "Apertura de session con Twitter"
-
-#: twitterlogin.php:69
-msgid "Login with your Twitter account"
-msgstr "Aperir session con tu conto de Twitter"
-
-#: twitterlogin.php:87
-msgid "Sign in with Twitter"
-msgstr "Aperir session con Twitter"
-
-#: twitterauthorization.php:120 twittersettings.php:225
-msgid "There was a problem with your session token. Try again, please."
-msgstr "Occurreva un problema con le indicio de tu session. Per favor reproba."
-
-#: twitterauthorization.php:126
-msgid "You can't register if you don't agree to the license."
-msgstr "Tu non pote crear un conto si tu non accepta le licentia."
-
-#: twitterauthorization.php:135
-msgid "Something weird happened."
-msgstr "Qualcosa de bizarre occurreva."
-
-#: twitterauthorization.php:181 twitterauthorization.php:229
-#: twitterauthorization.php:300
-msgid "Couldn't link your Twitter account."
-msgstr "Non poteva ligar a tu conto de Twitter."
-
-#: twitterauthorization.php:201
-msgid "Couldn't link your Twitter account: oauth_token mismatch."
-msgstr "Non poteva ligar a tu conto de Twitter: oauth_token non corresponde."
-
-#: twitterauthorization.php:312
+#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
+#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
 #, php-format
-msgid ""
-"This is the first time you've logged into %s so we must connect your Twitter "
-"account to a local account. You can either create a new account, or connect "
-"with your existing account, if you have one."
-msgstr ""
-"Isto es le prime vice que tu ha aperite un session in %s; dunque, nos debe "
-"connecter tu conto de Twitter a un conto local. Tu pote crear un nove conto, "
-"o connecter con tu conto existente, si tu ha un."
-
-#: twitterauthorization.php:318
-msgid "Twitter Account Setup"
-msgstr "Configuration del conto de Twitter"
-
-#: twitterauthorization.php:351
-msgid "Connection options"
-msgstr "Optiones de connexion"
-
-#: twitterauthorization.php:360
-#, php-format
-msgid ""
-"My text and files are available under %s except this private data: password, "
-"email address, IM address, and phone number."
-msgstr ""
-"Mi texto e files es disponibile sub %s excepte iste datos private: "
-"contrasigno, adresse de e-mail, adresse de messageria instantanee, numero de "
-"telephono."
-
-#: twitterauthorization.php:381
-msgid "Create new account"
-msgstr "Crear nove conto"
-
-#: twitterauthorization.php:383
-msgid "Create a new user with this nickname."
-msgstr "Crear un nove usator con iste pseudonymo."
-
-#: twitterauthorization.php:390
-msgid "New nickname"
-msgstr "Nove pseudonymo"
-
-#: twitterauthorization.php:392
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr "1-64 minusculas o numeros, sin punctuation o spatios"
-
-#: twitterauthorization.php:404
-msgid "Create"
-msgstr "Crear"
-
-#: twitterauthorization.php:409
-msgid "Connect existing account"
-msgstr "Connecter conto existente"
-
-#: twitterauthorization.php:411
-msgid ""
-"If you already have an account, login with your username and password to "
-"connect it to your Twitter account."
-msgstr ""
-"Si tu ha jam un conto, aperi session con tu nomine de usator e contrasigno "
-"pro connecter lo a tu conto de Twitter."
-
-#: twitterauthorization.php:414
-msgid "Existing nickname"
-msgstr "Pseudonymo existente"
-
-#: twitterauthorization.php:417
-msgid "Password"
-msgstr "Contrasigno"
-
-#: twitterauthorization.php:420
-msgid "Connect"
-msgstr "Connecter"
-
-#: twitterauthorization.php:466 twitterauthorization.php:475
-msgid "Registration not allowed."
-msgstr "Creation de conto non permittite."
-
-#: twitterauthorization.php:482
-msgid "Not a valid invitation code."
-msgstr "Le codice de invitation es invalide."
-
-#: twitterauthorization.php:495
-msgid "Nickname not allowed."
-msgstr "Pseudonymo non permittite."
-
-#: twitterauthorization.php:500
-msgid "Nickname already in use. Try another one."
-msgstr "Pseudonymo ja in uso. Proba un altere."
-
-#: twitterauthorization.php:520
-msgid "Error registering user."
-msgstr "Error durante le registration del usator."
-
-#: twitterauthorization.php:531 twitterauthorization.php:571
-#: twitterauthorization.php:591
-msgid "Error connecting user to Twitter."
-msgstr "Error durante le connexion del usator a Twitter."
-
-#: twitterauthorization.php:553
-msgid "Invalid username or password."
-msgstr "Nomine de usator o contrasigno invalide."
-
-#: twittersettings.php:57
-msgid "Twitter settings"
-msgstr "Configuration de Twitter"
-
-#: twittersettings.php:68
-msgid ""
-"Connect your Twitter account to share your updates with your Twitter friends "
-"and vice-versa."
-msgstr ""
-"Connecte tu conto de Twitter pro condivider tu actualisationes con tu amicos "
-"de Twitter e vice versa."
-
-#: twittersettings.php:115
-msgid "Twitter account"
-msgstr "Conto de Twitter"
-
-#: twittersettings.php:120
-msgid "Connected Twitter account"
-msgstr "Conto de Twitter connectite"
-
-#: twittersettings.php:125
-msgid "Disconnect my account from Twitter"
-msgstr "Disconnecter mi conto ab Twitter"
-
-#: twittersettings.php:131
-msgid "Disconnecting your Twitter could make it impossible to log in! Please "
-msgstr ""
-"Le disconnexion de tu conto de Twitter renderea le authentication "
-"impossibile! Per favor "
-
-#: twittersettings.php:135
-msgid "set a password"
-msgstr "defini un contrasigno"
-
-#: twittersettings.php:137
-msgid " first."
-msgstr " primo."
-
-#. TRANS: %1$s is the current website name.
-#: twittersettings.php:141
-#, php-format
-msgid ""
-"Keep your %1$s account but disconnect from Twitter. You can use your %1$s "
-"password to log in."
-msgstr ""
-"Retene tu conto de %1$s ma disconnecte ab Twitter. Tu pote usar tu "
-"contrasigno de %1$s pro aperir session."
-
-#: twittersettings.php:149
-msgid "Disconnect"
-msgstr "Disconnecter"
-
-#: twittersettings.php:156
-msgid "Preferences"
-msgstr "Preferentias"
-
-#: twittersettings.php:160
-msgid "Automatically send my notices to Twitter."
-msgstr "Automaticamente inviar mi notas a Twitter."
-
-#: twittersettings.php:167
-msgid "Send local \"@\" replies to Twitter."
-msgstr "Inviar responsas \"@\" local a Twitter."
-
-#: twittersettings.php:174
-msgid "Subscribe to my Twitter friends here."
-msgstr "Subscriber hic a mi amicos de Twitter."
-
-#: twittersettings.php:183
-msgid "Import my friends timeline."
-msgstr "Importar le chronologia de mi amicos."
-
-#: twittersettings.php:201
-msgid "Add"
-msgstr "Adder"
-
-#: twittersettings.php:235
-msgid "Unexpected form submission."
-msgstr "Submission de formulario inexpectate."
-
-#: twittersettings.php:250
-msgid "No Twitter connection to remove."
-msgstr "Nulle connexion Twitter a remover."
-
-#: twittersettings.php:258
-msgid "Couldn't remove Twitter user."
-msgstr "Non poteva remover le usator de Twitter."
-
-#: twittersettings.php:262
-msgid "Twitter account disconnected."
-msgstr "Conto de Twitter disconnectite."
-
-#: twittersettings.php:282 twittersettings.php:293
-msgid "Couldn't save Twitter preferences."
-msgstr "Non poteva salveguardar le preferentias de Twitter."
-
-#: twittersettings.php:301
-msgid "Twitter preferences saved."
-msgstr "Preferentias de Twitter salveguardate."
+msgid "RT @%1$s %2$s"
+msgstr "RT @%1$s %2$s"
diff --git a/plugins/TwitterBridge/locale/mk/LC_MESSAGES/TwitterBridge.po b/plugins/TwitterBridge/locale/mk/LC_MESSAGES/TwitterBridge.po
index b242639ee7..b1b6347657 100644
--- a/plugins/TwitterBridge/locale/mk/LC_MESSAGES/TwitterBridge.po
+++ b/plugins/TwitterBridge/locale/mk/LC_MESSAGES/TwitterBridge.po
@@ -9,30 +9,285 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TwitterBridge\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:13+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:27+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-14 17:22:14+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:31+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-twitterbridge\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
 
-#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
-#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: twitterimport.php:114
-#, php-format
-msgid "RT @%1$s %2$s"
-msgstr "RT @%1$s %2$s"
+msgid "Twitter settings"
+msgstr "Нагодувања за Twitter"
+
+msgid ""
+"Connect your Twitter account to share your updates with your Twitter friends "
+"and vice-versa."
+msgstr ""
+"Поврзете ја Вашата сметка на Twitter за да ги споделувате подновувањата со "
+"Вашите пријатели на Twitter и обратно."
+
+msgid "Twitter account"
+msgstr "Сметка на Twitter"
+
+msgid "Connected Twitter account"
+msgstr "Поврзана сметка на Twitter"
+
+msgid "Disconnect my account from Twitter"
+msgstr "Прекини ја врската со сметката на Twitter"
+
+msgid "Disconnecting your Twitter could make it impossible to log in! Please "
+msgstr ""
+"Ако ја прекинете врската со сметката на Twitter, нема да можете да се "
+"најавите! Затоа "
+
+msgid "set a password"
+msgstr "ставете лозинка"
+
+msgid " first."
+msgstr "пред да продолжите."
+
+#. TRANS: %1$s is the current website name.
+#, php-format
+msgid ""
+"Keep your %1$s account but disconnect from Twitter. You can use your %1$s "
+"password to log in."
+msgstr ""
+"Задржете си ја сметката на %1$s, но прекинете ја врската со Twitter. За "
+"најава, користете ја Вашата лозинка на %1$s."
+
+msgid "Disconnect"
+msgstr "Прекини"
+
+msgid "Preferences"
+msgstr "Нагодувања"
+
+msgid "Automatically send my notices to Twitter."
+msgstr "Автоматски испраќај ми ги забелешките на Twitter."
+
+msgid "Send local \"@\" replies to Twitter."
+msgstr "Испраќај локални „@“ одговори на Twitter."
+
+msgid "Subscribe to my Twitter friends here."
+msgstr "Претплатете се на пријателите од Twitter тука."
+
+msgid "Import my friends timeline."
+msgstr "Увези ја хронологијата на моите пријатели."
+
+msgid "Save"
+msgstr "Зачувај"
+
+msgid "Add"
+msgstr "Додај"
+
+msgid "There was a problem with your session token. Try again, please."
+msgstr "Се појави проблем со жетонот на Вашата сесија. Обидете се повторно."
+
+msgid "Unexpected form submission."
+msgstr "Неочекувано поднесување на образец."
+
+msgid "No Twitter connection to remove."
+msgstr "Нема врска со Twitter за отстранување."
+
+msgid "Couldn't remove Twitter user."
+msgstr "Не можев да го отстранам корисникот на Twitter."
+
+msgid "Twitter account disconnected."
+msgstr "Врската со сметката на Twitter е прекината."
+
+msgid "Couldn't save Twitter preferences."
+msgstr "Не можев да ги зачувам нагодувањата за Twitter."
+
+msgid "Twitter preferences saved."
+msgstr "Нагодувањата за Twitter се зачувани."
+
+msgid "You can't register if you don't agree to the license."
+msgstr "Не можете да се регистрирате ако не се согласувате со лиценцата."
+
+msgid "Something weird happened."
+msgstr "Се случи нешто чудно."
+
+msgid "Couldn't link your Twitter account."
+msgstr "Не можам да ја поврзам Вашата сметка на Twitter."
+
+msgid "Couldn't link your Twitter account: oauth_token mismatch."
+msgstr ""
+"Не можев да ја поврзам Вашата сметка на Twitter: несогласување со "
+"oauth_token."
+
+#, php-format
+msgid ""
+"This is the first time you've logged into %s so we must connect your Twitter "
+"account to a local account. You can either create a new account, or connect "
+"with your existing account, if you have one."
+msgstr ""
+"Ова е прв пат како се најавувате на %s, па затоа мораме да ја поврземе "
+"Вашата сметка на Twitter со локална сметка. Можете да создадете нова сметка, "
+"или пак да се поврзете со Вашата постоечка сметка (ако ја имате)."
+
+msgid "Twitter Account Setup"
+msgstr "Поставки за сметката на Twitter"
+
+msgid "Connection options"
+msgstr "Нагодувања за врска"
+
+#, php-format
+msgid ""
+"My text and files are available under %s except this private data: password, "
+"email address, IM address, and phone number."
+msgstr ""
+"Мојот текст и податотеки се достапни под %s, освен следниве приватни "
+"податоци: лозинка, е-пошта, IM-адреса и телефонски број."
+
+msgid "Create new account"
+msgstr "Создај нова сметка"
+
+msgid "Create a new user with this nickname."
+msgstr "Создај нов корисник со овој прекар."
+
+msgid "New nickname"
+msgstr "Нов прекар"
+
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+msgstr "1-64 мали букви или бројки, без интерпункциски знаци и празни места"
+
+msgid "Create"
+msgstr "Создај"
+
+msgid "Connect existing account"
+msgstr "Поврзи постоечка сметка"
+
+msgid ""
+"If you already have an account, login with your username and password to "
+"connect it to your Twitter account."
+msgstr ""
+"Ако веќе имате сметка, најавете се со корисничкото име и лозинката за да ја "
+"поврзете со профилот на Twitter."
+
+msgid "Existing nickname"
+msgstr "Постоечки прекар"
+
+msgid "Password"
+msgstr "Лозинка"
+
+msgid "Connect"
+msgstr "Поврзи се"
+
+msgid "Registration not allowed."
+msgstr "Регистрацијата не е дозволена."
+
+msgid "Not a valid invitation code."
+msgstr "Ова не е важечки код за покана."
+
+msgid "Nickname not allowed."
+msgstr "Прекарот не е дозволен."
+
+msgid "Nickname already in use. Try another one."
+msgstr "Прекарот е зафатен. Одберете друг."
+
+msgid "Error registering user."
+msgstr "Грешка при регистрирање на корисникот."
+
+msgid "Error connecting user to Twitter."
+msgstr "Грешка при поврзувањето на корисникот со Twitter."
+
+msgid "Invalid username or password."
+msgstr "Неважечко корисничко име или лозинка."
+
+msgid "Twitter"
+msgstr "Twitter"
+
+msgid "Twitter bridge settings"
+msgstr "Поставки за мостот до Twitter"
+
+msgid "Invalid consumer key. Max length is 255 characters."
+msgstr "Неважечки потрошувачки клуч. Дозволени се највеќе 255 знаци."
+
+msgid "Invalid consumer secret. Max length is 255 characters."
+msgstr "Неважечка потрошувачка тајна. Дозволени се највеќе 255 знаци."
+
+msgid "Twitter application settings"
+msgstr "Нагодувања на програмчето за Twitter"
+
+msgid "Consumer key"
+msgstr "Потрошувачки клуч"
+
+msgid "Consumer key assigned by Twitter"
+msgstr "Потрошувачкиот клуч доделен од Twitter"
+
+msgid "Consumer secret"
+msgstr "Потрошувачка тајна"
+
+msgid "Consumer secret assigned by Twitter"
+msgstr "Потрошувачката тајна доделена од Twitter"
+
+msgid "Note: a global consumer key and secret are set."
+msgstr "Напомена: поставени се глобални потрошувачки клуч и тајна."
+
+msgid "Integration source"
+msgstr "Извор на соединување"
+
+msgid "Name of your Twitter application"
+msgstr "Име на Вашето програмче за Twitter"
+
+msgid "Options"
+msgstr "Поставки"
+
+msgid "Enable \"Sign-in with Twitter\""
+msgstr "Овозможи „најава со Twitter“"
+
+msgid "Allow users to login with their Twitter credentials"
+msgstr ""
+"Им овозможува на корисниците да се најавуваат со нивните податоци од Twitter"
+
+msgid "Enable Twitter import"
+msgstr "Овозможу увоз од Twitter"
+
+msgid ""
+"Allow users to import their Twitter friends' timelines. Requires daemons to "
+"be manually configured."
+msgstr ""
+"Им овозможува на корисниците да ги увезуваат хронологиите на нивните "
+"пријатели на Twitter. Бара рачно нагодување на демоните."
+
+msgid "Save Twitter settings"
+msgstr "Зачувај нагодувања на Twitter"
+
+msgid "Login or register using Twitter"
+msgstr "Најава или регистрација со Twitter"
+
+msgid "Twitter integration options"
+msgstr "Нагодувања за обединување со Twitter"
+
+msgid "Twitter bridge configuration"
+msgstr "Нагодувања за мостот до Twitter"
+
+msgid ""
+"The Twitter \"bridge\" plugin allows integration of a StatusNet instance "
+"with <a href=\"http://twitter.com/\">Twitter</a>."
+msgstr ""
+"Приклучокот за „мост“ до Twitter овозможува соединување на примерок на "
+"StatusNet со <a href=\"http://twitter.com/\">Twitter</a>."
+
+msgid "Already logged in."
+msgstr "Веќе сте најавени."
+
+msgid "Twitter Login"
+msgstr "Најава со Twitter"
+
+msgid "Login with your Twitter account"
+msgstr "Најава со Вашата сметка од Twitter"
+
+msgid "Sign in with Twitter"
+msgstr "Најава со Twitter"
 
-#: twitter.php:409
 msgid "Your Twitter bridge has been disabled."
 msgstr "Вашиот мост до Twitter е оневозможен."
 
-#: twitter.php:413
 #, php-format
 msgid ""
 "Hi, %1$s. We're sorry to inform you that your link to Twitter has been "
@@ -59,344 +314,8 @@ msgstr ""
 "Поздрав,\n"
 "%3$s"
 
-#: TwitterBridgePlugin.php:151 TwitterBridgePlugin.php:174
-#: TwitterBridgePlugin.php:302 twitteradminpanel.php:52
-msgid "Twitter"
-msgstr "Twitter"
-
-#: TwitterBridgePlugin.php:152
-msgid "Login or register using Twitter"
-msgstr "Најава или регистрација со Twitter"
-
-#: TwitterBridgePlugin.php:175
-msgid "Twitter integration options"
-msgstr "Нагодувања за обединување со Twitter"
-
-#: TwitterBridgePlugin.php:303
-msgid "Twitter bridge configuration"
-msgstr "Нагодувања за мостот до Twitter"
-
-#: TwitterBridgePlugin.php:327
-msgid ""
-"The Twitter \"bridge\" plugin allows integration of a StatusNet instance "
-"with <a href=\"http://twitter.com/\">Twitter</a>."
-msgstr ""
-"Приклучокот за „мост“ до Twitter овозможува соединување на примерок на "
-"StatusNet со <a href=\"http://twitter.com/\">Twitter</a>."
-
-#: twitteradminpanel.php:62
-msgid "Twitter bridge settings"
-msgstr "Поставки за мостот до Twitter"
-
-#: twitteradminpanel.php:150
-msgid "Invalid consumer key. Max length is 255 characters."
-msgstr "Неважечки потрошувачки клуч. Дозволени се највеќе 255 знаци."
-
-#: twitteradminpanel.php:156
-msgid "Invalid consumer secret. Max length is 255 characters."
-msgstr "Неважечка потрошувачка тајна. Дозволени се највеќе 255 знаци."
-
-#: twitteradminpanel.php:212
-msgid "Twitter application settings"
-msgstr "Нагодувања на програмчето за Twitter"
-
-#: twitteradminpanel.php:218
-msgid "Consumer key"
-msgstr "Потрошувачки клуч"
-
-#: twitteradminpanel.php:219
-msgid "Consumer key assigned by Twitter"
-msgstr "Потрошувачкиот клуч доделен од Twitter"
-
-#: twitteradminpanel.php:227
-msgid "Consumer secret"
-msgstr "Потрошувачка тајна"
-
-#: twitteradminpanel.php:228
-msgid "Consumer secret assigned by Twitter"
-msgstr "Потрошувачката тајна доделена од Twitter"
-
-#: twitteradminpanel.php:238
-msgid "Note: a global consumer key and secret are set."
-msgstr "Напомена: поставени се глобални потрошувачки клуч и тајна."
-
-#: twitteradminpanel.php:245
-msgid "Integration source"
-msgstr "Извор на соединување"
-
-#: twitteradminpanel.php:246
-msgid "Name of your Twitter application"
-msgstr "Име на Вашето програмче за Twitter"
-
-#: twitteradminpanel.php:258
-msgid "Options"
-msgstr "Поставки"
-
-#: twitteradminpanel.php:265
-msgid "Enable \"Sign-in with Twitter\""
-msgstr "Овозможи „најава со Twitter“"
-
-#: twitteradminpanel.php:267
-msgid "Allow users to login with their Twitter credentials"
-msgstr ""
-"Им овозможува на корисниците да се најавуваат со нивните податоци од Twitter"
-
-#: twitteradminpanel.php:274
-msgid "Enable Twitter import"
-msgstr "Овозможу увоз од Twitter"
-
-#: twitteradminpanel.php:276
-msgid ""
-"Allow users to import their Twitter friends' timelines. Requires daemons to "
-"be manually configured."
-msgstr ""
-"Им овозможува на корисниците да ги увезуваат хронологиите на нивните "
-"пријатели на Twitter. Бара рачно нагодување на демоните."
-
-#: twitteradminpanel.php:293 twittersettings.php:199
-msgid "Save"
-msgstr "Зачувај"
-
-#: twitteradminpanel.php:293
-msgid "Save Twitter settings"
-msgstr "Зачувај нагодувања на Twitter"
-
-#: twitterlogin.php:56
-msgid "Already logged in."
-msgstr "Веќе сте најавени."
-
-#: twitterlogin.php:64
-msgid "Twitter Login"
-msgstr "Најава со Twitter"
-
-#: twitterlogin.php:69
-msgid "Login with your Twitter account"
-msgstr "Најава со Вашата сметка од Twitter"
-
-#: twitterlogin.php:87
-msgid "Sign in with Twitter"
-msgstr "Најава со Twitter"
-
-#: twitterauthorization.php:120 twittersettings.php:225
-msgid "There was a problem with your session token. Try again, please."
-msgstr "Се појави проблем со жетонот на Вашата сесија. Обидете се повторно."
-
-#: twitterauthorization.php:126
-msgid "You can't register if you don't agree to the license."
-msgstr "Не можете да се регистрирате ако не се согласувате со лиценцата."
-
-#: twitterauthorization.php:135
-msgid "Something weird happened."
-msgstr "Се случи нешто чудно."
-
-#: twitterauthorization.php:181 twitterauthorization.php:229
-#: twitterauthorization.php:300
-msgid "Couldn't link your Twitter account."
-msgstr "Не можам да ја поврзам Вашата сметка на Twitter."
-
-#: twitterauthorization.php:201
-msgid "Couldn't link your Twitter account: oauth_token mismatch."
-msgstr ""
-"Не можев да ја поврзам Вашата сметка на Twitter: несогласување со "
-"oauth_token."
-
-#: twitterauthorization.php:312
+#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
+#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
 #, php-format
-msgid ""
-"This is the first time you've logged into %s so we must connect your Twitter "
-"account to a local account. You can either create a new account, or connect "
-"with your existing account, if you have one."
-msgstr ""
-"Ова е прв пат како се најавувате на %s, па затоа мораме да ја поврземе "
-"Вашата сметка на Twitter со локална сметка. Можете да создадете нова сметка, "
-"или пак да се поврзете со Вашата постоечка сметка (ако ја имате)."
-
-#: twitterauthorization.php:318
-msgid "Twitter Account Setup"
-msgstr "Поставки за сметката на Twitter"
-
-#: twitterauthorization.php:351
-msgid "Connection options"
-msgstr "Нагодувања за врска"
-
-#: twitterauthorization.php:360
-#, php-format
-msgid ""
-"My text and files are available under %s except this private data: password, "
-"email address, IM address, and phone number."
-msgstr ""
-"Мојот текст и податотеки се достапни под %s, освен следниве приватни "
-"податоци: лозинка, е-пошта, IM-адреса и телефонски број."
-
-#: twitterauthorization.php:381
-msgid "Create new account"
-msgstr "Создај нова сметка"
-
-#: twitterauthorization.php:383
-msgid "Create a new user with this nickname."
-msgstr "Создај нов корисник со овој прекар."
-
-#: twitterauthorization.php:390
-msgid "New nickname"
-msgstr "Нов прекар"
-
-#: twitterauthorization.php:392
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr "1-64 мали букви или бројки, без интерпункциски знаци и празни места"
-
-#: twitterauthorization.php:404
-msgid "Create"
-msgstr "Создај"
-
-#: twitterauthorization.php:409
-msgid "Connect existing account"
-msgstr "Поврзи постоечка сметка"
-
-#: twitterauthorization.php:411
-msgid ""
-"If you already have an account, login with your username and password to "
-"connect it to your Twitter account."
-msgstr ""
-"Ако веќе имате сметка, најавете се со корисничкото име и лозинката за да ја "
-"поврзете со профилот на Twitter."
-
-#: twitterauthorization.php:414
-msgid "Existing nickname"
-msgstr "Постоечки прекар"
-
-#: twitterauthorization.php:417
-msgid "Password"
-msgstr "Лозинка"
-
-#: twitterauthorization.php:420
-msgid "Connect"
-msgstr "Поврзи се"
-
-#: twitterauthorization.php:466 twitterauthorization.php:475
-msgid "Registration not allowed."
-msgstr "Регистрацијата не е дозволена."
-
-#: twitterauthorization.php:482
-msgid "Not a valid invitation code."
-msgstr "Ова не е важечки код за покана."
-
-#: twitterauthorization.php:495
-msgid "Nickname not allowed."
-msgstr "Прекарот не е дозволен."
-
-#: twitterauthorization.php:500
-msgid "Nickname already in use. Try another one."
-msgstr "Прекарот е зафатен. Одберете друг."
-
-#: twitterauthorization.php:520
-msgid "Error registering user."
-msgstr "Грешка при регистрирање на корисникот."
-
-#: twitterauthorization.php:531 twitterauthorization.php:571
-#: twitterauthorization.php:591
-msgid "Error connecting user to Twitter."
-msgstr "Грешка при поврзувањето на корисникот со Twitter."
-
-#: twitterauthorization.php:553
-msgid "Invalid username or password."
-msgstr "Неважечко корисничко име или лозинка."
-
-#: twittersettings.php:57
-msgid "Twitter settings"
-msgstr "Нагодувања за Twitter"
-
-#: twittersettings.php:68
-msgid ""
-"Connect your Twitter account to share your updates with your Twitter friends "
-"and vice-versa."
-msgstr ""
-"Поврзете ја Вашата сметка на Twitter за да ги споделувате подновувањата со "
-"Вашите пријатели на Twitter и обратно."
-
-#: twittersettings.php:115
-msgid "Twitter account"
-msgstr "Сметка на Twitter"
-
-#: twittersettings.php:120
-msgid "Connected Twitter account"
-msgstr "Поврзана сметка на Twitter"
-
-#: twittersettings.php:125
-msgid "Disconnect my account from Twitter"
-msgstr "Прекини ја врската со сметката на Twitter"
-
-#: twittersettings.php:131
-msgid "Disconnecting your Twitter could make it impossible to log in! Please "
-msgstr ""
-"Ако ја прекинете врската со сметката на Twitter, нема да можете да се "
-"најавите! Затоа "
-
-#: twittersettings.php:135
-msgid "set a password"
-msgstr "ставете лозинка"
-
-#: twittersettings.php:137
-msgid " first."
-msgstr "пред да продолжите."
-
-#. TRANS: %1$s is the current website name.
-#: twittersettings.php:141
-#, php-format
-msgid ""
-"Keep your %1$s account but disconnect from Twitter. You can use your %1$s "
-"password to log in."
-msgstr ""
-"Задржете си ја сметката на %1$s, но прекинете ја врската со Twitter. За "
-"најава, користете ја Вашата лозинка на %1$s."
-
-#: twittersettings.php:149
-msgid "Disconnect"
-msgstr "Прекини"
-
-#: twittersettings.php:156
-msgid "Preferences"
-msgstr "Нагодувања"
-
-#: twittersettings.php:160
-msgid "Automatically send my notices to Twitter."
-msgstr "Автоматски испраќај ми ги забелешките на Twitter."
-
-#: twittersettings.php:167
-msgid "Send local \"@\" replies to Twitter."
-msgstr "Испраќај локални „@“ одговори на Twitter."
-
-#: twittersettings.php:174
-msgid "Subscribe to my Twitter friends here."
-msgstr "Претплатете се на пријателите од Twitter тука."
-
-#: twittersettings.php:183
-msgid "Import my friends timeline."
-msgstr "Увези ја хронологијата на моите пријатели."
-
-#: twittersettings.php:201
-msgid "Add"
-msgstr "Додај"
-
-#: twittersettings.php:235
-msgid "Unexpected form submission."
-msgstr "Неочекувано поднесување на образец."
-
-#: twittersettings.php:250
-msgid "No Twitter connection to remove."
-msgstr "Нема врска со Twitter за отстранување."
-
-#: twittersettings.php:258
-msgid "Couldn't remove Twitter user."
-msgstr "Не можев да го отстранам корисникот на Twitter."
-
-#: twittersettings.php:262
-msgid "Twitter account disconnected."
-msgstr "Врската со сметката на Twitter е прекината."
-
-#: twittersettings.php:282 twittersettings.php:293
-msgid "Couldn't save Twitter preferences."
-msgstr "Не можев да ги зачувам нагодувањата за Twitter."
-
-#: twittersettings.php:301
-msgid "Twitter preferences saved."
-msgstr "Нагодувањата за Twitter се зачувани."
+msgid "RT @%1$s %2$s"
+msgstr "RT @%1$s %2$s"
diff --git a/plugins/TwitterBridge/locale/nl/LC_MESSAGES/TwitterBridge.po b/plugins/TwitterBridge/locale/nl/LC_MESSAGES/TwitterBridge.po
index 45a9a209aa..7155826cb1 100644
--- a/plugins/TwitterBridge/locale/nl/LC_MESSAGES/TwitterBridge.po
+++ b/plugins/TwitterBridge/locale/nl/LC_MESSAGES/TwitterBridge.po
@@ -9,30 +9,289 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TwitterBridge\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:13+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:27+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-14 17:22:14+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:31+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-twitterbridge\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
-#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: twitterimport.php:114
-#, php-format
-msgid "RT @%1$s %2$s"
-msgstr "RT @%1$s %2$s"
+msgid "Twitter settings"
+msgstr "Twitterinstellingen"
+
+msgid ""
+"Connect your Twitter account to share your updates with your Twitter friends "
+"and vice-versa."
+msgstr ""
+"Koppel uw Twittergebruiker om uw berichten te delen met uw Twittervrienden "
+"en vice versa."
+
+msgid "Twitter account"
+msgstr "Twittergebruiker"
+
+msgid "Connected Twitter account"
+msgstr "Gekoppelde Twittergebruiker"
+
+msgid "Disconnect my account from Twitter"
+msgstr "Mijn gebruiker loskoppelen van Twitter"
+
+msgid "Disconnecting your Twitter could make it impossible to log in! Please "
+msgstr ""
+"Loskoppelen van uw Twittergebruiker zou ervoor zorgen dat u niet langer kunt "
+"aanmelden. U moet eerst "
+
+msgid "set a password"
+msgstr "een wachtwoord instellen"
+
+msgid " first."
+msgstr " voordat u verder kunt met deze handeling."
+
+#. TRANS: %1$s is the current website name.
+#, php-format
+msgid ""
+"Keep your %1$s account but disconnect from Twitter. You can use your %1$s "
+"password to log in."
+msgstr ""
+"Uw gebruiker bij %1$s behouden maar deze loskoppelen van Twitter. U kunt uw "
+"wachtwoord van %1$s gebruiken om aan te melden."
+
+msgid "Disconnect"
+msgstr "Loskoppelen"
+
+msgid "Preferences"
+msgstr "Voorkeuren"
+
+msgid "Automatically send my notices to Twitter."
+msgstr "Mijn berichten automatisch naar Twitter verzenden"
+
+msgid "Send local \"@\" replies to Twitter."
+msgstr "Lokale antwoorden met \"2\" naar Twitter verzenden."
+
+msgid "Subscribe to my Twitter friends here."
+msgstr "Hier op mijn Twittervrienden abonneren."
+
+msgid "Import my friends timeline."
+msgstr "Tijdlijn van mijn vrienden importeren."
+
+msgid "Save"
+msgstr "Opslaan"
+
+msgid "Add"
+msgstr "Toevoegen"
+
+msgid "There was a problem with your session token. Try again, please."
+msgstr ""
+"Er is een probleem ontstaan met uw sessie. Probeer het nog een keer, "
+"alstublieft."
+
+msgid "Unexpected form submission."
+msgstr "Het formulier is onverwacht ingezonden."
+
+msgid "No Twitter connection to remove."
+msgstr "Er is geen Twitterkoppeling om te verwijderen."
+
+msgid "Couldn't remove Twitter user."
+msgstr "Het was niet mogelijk de Twittergebruiker te verwijderen."
+
+msgid "Twitter account disconnected."
+msgstr "De Twittergebruiker is ontkoppeld."
+
+msgid "Couldn't save Twitter preferences."
+msgstr "Het was niet mogelijk de Twittervoorkeuren op te slaan."
+
+msgid "Twitter preferences saved."
+msgstr "De Twitterinstellingen zijn opgeslagen."
+
+msgid "You can't register if you don't agree to the license."
+msgstr "U kunt zich niet registreren als u niet met de licentie akkoord gaat."
+
+msgid "Something weird happened."
+msgstr "Er is iets vreemds gebeurd."
+
+msgid "Couldn't link your Twitter account."
+msgstr "Het was niet mogelijk uw Twittergebruiker te koppelen."
+
+msgid "Couldn't link your Twitter account: oauth_token mismatch."
+msgstr ""
+"Het was niet mogelijk uw Twittergebruiker te koppelen: het oauth_token kwam "
+"niet overeen."
+
+#, php-format
+msgid ""
+"This is the first time you've logged into %s so we must connect your Twitter "
+"account to a local account. You can either create a new account, or connect "
+"with your existing account, if you have one."
+msgstr ""
+"Dit is de eerste keer dat u aanmeldt bij %s en dan moeten we uw "
+"Twittergebruiker koppelen met uw lokale gebruiker. U kunt een nieuwe "
+"gebruiker aanmaken of koppelen met een bestaande gebruiker als u die al hebt."
+
+msgid "Twitter Account Setup"
+msgstr "Instellingen Twittergebruiker"
+
+msgid "Connection options"
+msgstr "Koppelingsinstellingen"
+
+#, php-format
+msgid ""
+"My text and files are available under %s except this private data: password, "
+"email address, IM address, and phone number."
+msgstr ""
+"Mijn teksten en bestanden zijn beschikbaar onder %s, behalve de volgende "
+"privégegevens: wachtwoord, e-mailadres, IM-adres, telefoonnummer."
+
+msgid "Create new account"
+msgstr "Nieuwe gebruiker aanmaken"
+
+msgid "Create a new user with this nickname."
+msgstr "Nieuwe gebruiker aanmaken met deze gebruikersnaam."
+
+msgid "New nickname"
+msgstr "Nieuwe gebruikersnaam"
+
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+msgstr "1-64 kleine letters of cijfers, geen leestekens of spaties"
+
+msgid "Create"
+msgstr "Aanmaken"
+
+msgid "Connect existing account"
+msgstr "Verbinden met een bestaande gebruiker"
+
+msgid ""
+"If you already have an account, login with your username and password to "
+"connect it to your Twitter account."
+msgstr ""
+"Als u al een gebruiker hebt, meld dan aan met uw gebruikersnaam en "
+"wachtwoord om deze daarna te koppelen met uw Twittergebruiker."
+
+msgid "Existing nickname"
+msgstr "Bestaande gebruikersnaam"
+
+msgid "Password"
+msgstr "Wachtwoord"
+
+msgid "Connect"
+msgstr "Koppelen"
+
+msgid "Registration not allowed."
+msgstr "Registratie is niet toegestaan."
+
+msgid "Not a valid invitation code."
+msgstr "De uitnodigingscode is ongeldig."
+
+msgid "Nickname not allowed."
+msgstr "Gebruikersnaam niet toegestaan."
+
+msgid "Nickname already in use. Try another one."
+msgstr ""
+"De opgegeven gebruikersnaam is al in gebruik. Kies een andere gebruikersnaam."
+
+msgid "Error registering user."
+msgstr "Fout bij het registreren van de gebruiker."
+
+msgid "Error connecting user to Twitter."
+msgstr "Fout bij het verbinden van de gebruiker met Twitter."
+
+msgid "Invalid username or password."
+msgstr "Ongeldige gebruikersnaam of wachtwoord."
+
+msgid "Twitter"
+msgstr "Twitter"
+
+msgid "Twitter bridge settings"
+msgstr "Instellingen Twitterkoppeling"
+
+msgid "Invalid consumer key. Max length is 255 characters."
+msgstr "Ongeldige gebruikerssleutel. De maximale lengte is 255 tekens."
+
+msgid "Invalid consumer secret. Max length is 255 characters."
+msgstr "Ongeldig gebruikersgeheim. De maximale lengte is 255 tekens."
+
+msgid "Twitter application settings"
+msgstr "Instellingen Twitterapplicatie"
+
+msgid "Consumer key"
+msgstr "Gebruikerssleutel"
+
+msgid "Consumer key assigned by Twitter"
+msgstr "Gebruikerssleutel uitgegeven door Twitter"
+
+msgid "Consumer secret"
+msgstr "Gebruikersgeheim"
+
+msgid "Consumer secret assigned by Twitter"
+msgstr "Gebruikersgeheim uitgegeven door Twitter"
+
+msgid "Note: a global consumer key and secret are set."
+msgstr "Let op: er zijn een gebruikerssleutel en gebruikersgeheim ingesteld."
+
+msgid "Integration source"
+msgstr "Integratiebron"
+
+msgid "Name of your Twitter application"
+msgstr "Naam van uw Twitterapplicatie"
+
+msgid "Options"
+msgstr "Opties"
+
+msgid "Enable \"Sign-in with Twitter\""
+msgstr "\"Aanmelden via Twitter\" inschakelen"
+
+msgid "Allow users to login with their Twitter credentials"
+msgstr ""
+"Gebruikers toestaan aan te melden met hun gebruikersnaam en wachtwoord van "
+"Twitter"
+
+msgid "Enable Twitter import"
+msgstr "Twitterimport inschakelen"
+
+msgid ""
+"Allow users to import their Twitter friends' timelines. Requires daemons to "
+"be manually configured."
+msgstr ""
+"Gebruikers toestaan de tijdlijnen van hun Twittervrienden te importeren. "
+"Vereist handmatig te configureren daemons."
+
+msgid "Save Twitter settings"
+msgstr "Twitterinstellingen opslaan"
+
+msgid "Login or register using Twitter"
+msgstr "Aanmelden of registreren via Twitter"
+
+msgid "Twitter integration options"
+msgstr "Opties voor Twitterintegratie"
+
+msgid "Twitter bridge configuration"
+msgstr "Instellingen voor Twitterkoppeling"
+
+msgid ""
+"The Twitter \"bridge\" plugin allows integration of a StatusNet instance "
+"with <a href=\"http://twitter.com/\">Twitter</a>."
+msgstr ""
+"De plugin Twitter Brigde maakt het mogelijk en StatusNetinstallatie te "
+"integreren met <a href=\"http://twitter.com/\">Twitter</a>."
+
+msgid "Already logged in."
+msgstr "U bent al aangemeld."
+
+msgid "Twitter Login"
+msgstr "Aanmelden via Twitter"
+
+msgid "Login with your Twitter account"
+msgstr "Aanmelden met uw Twittergebruiker"
+
+msgid "Sign in with Twitter"
+msgstr "Aanmelden met Twitter"
 
-#: twitter.php:409
 msgid "Your Twitter bridge has been disabled."
 msgstr "Uw koppeling naar Twitter is uitgeschakeld."
 
-#: twitter.php:413
 #, php-format
 msgid ""
 "Hi, %1$s. We're sorry to inform you that your link to Twitter has been "
@@ -61,348 +320,8 @@ msgstr ""
 "Met vriendelijke groet,\n"
 "%3$s"
 
-#: TwitterBridgePlugin.php:151 TwitterBridgePlugin.php:174
-#: TwitterBridgePlugin.php:302 twitteradminpanel.php:52
-msgid "Twitter"
-msgstr "Twitter"
-
-#: TwitterBridgePlugin.php:152
-msgid "Login or register using Twitter"
-msgstr "Aanmelden of registreren via Twitter"
-
-#: TwitterBridgePlugin.php:175
-msgid "Twitter integration options"
-msgstr "Opties voor Twitterintegratie"
-
-#: TwitterBridgePlugin.php:303
-msgid "Twitter bridge configuration"
-msgstr "Instellingen voor Twitterkoppeling"
-
-#: TwitterBridgePlugin.php:327
-msgid ""
-"The Twitter \"bridge\" plugin allows integration of a StatusNet instance "
-"with <a href=\"http://twitter.com/\">Twitter</a>."
-msgstr ""
-"De plugin Twitter Brigde maakt het mogelijk en StatusNetinstallatie te "
-"integreren met <a href=\"http://twitter.com/\">Twitter</a>."
-
-#: twitteradminpanel.php:62
-msgid "Twitter bridge settings"
-msgstr "Instellingen Twitterkoppeling"
-
-#: twitteradminpanel.php:150
-msgid "Invalid consumer key. Max length is 255 characters."
-msgstr "Ongeldige gebruikerssleutel. De maximale lengte is 255 tekens."
-
-#: twitteradminpanel.php:156
-msgid "Invalid consumer secret. Max length is 255 characters."
-msgstr "Ongeldig gebruikersgeheim. De maximale lengte is 255 tekens."
-
-#: twitteradminpanel.php:212
-msgid "Twitter application settings"
-msgstr "Instellingen Twitterapplicatie"
-
-#: twitteradminpanel.php:218
-msgid "Consumer key"
-msgstr "Gebruikerssleutel"
-
-#: twitteradminpanel.php:219
-msgid "Consumer key assigned by Twitter"
-msgstr "Gebruikerssleutel uitgegeven door Twitter"
-
-#: twitteradminpanel.php:227
-msgid "Consumer secret"
-msgstr "Gebruikersgeheim"
-
-#: twitteradminpanel.php:228
-msgid "Consumer secret assigned by Twitter"
-msgstr "Gebruikersgeheim uitgegeven door Twitter"
-
-#: twitteradminpanel.php:238
-msgid "Note: a global consumer key and secret are set."
-msgstr "Let op: er zijn een gebruikerssleutel en gebruikersgeheim ingesteld."
-
-#: twitteradminpanel.php:245
-msgid "Integration source"
-msgstr "Integratiebron"
-
-#: twitteradminpanel.php:246
-msgid "Name of your Twitter application"
-msgstr "Naam van uw Twitterapplicatie"
-
-#: twitteradminpanel.php:258
-msgid "Options"
-msgstr "Opties"
-
-#: twitteradminpanel.php:265
-msgid "Enable \"Sign-in with Twitter\""
-msgstr "\"Aanmelden via Twitter\" inschakelen"
-
-#: twitteradminpanel.php:267
-msgid "Allow users to login with their Twitter credentials"
-msgstr ""
-"Gebruikers toestaan aan te melden met hun gebruikersnaam en wachtwoord van "
-"Twitter"
-
-#: twitteradminpanel.php:274
-msgid "Enable Twitter import"
-msgstr "Twitterimport inschakelen"
-
-#: twitteradminpanel.php:276
-msgid ""
-"Allow users to import their Twitter friends' timelines. Requires daemons to "
-"be manually configured."
-msgstr ""
-"Gebruikers toestaan de tijdlijnen van hun Twittervrienden te importeren. "
-"Vereist handmatig te configureren daemons."
-
-#: twitteradminpanel.php:293 twittersettings.php:199
-msgid "Save"
-msgstr "Opslaan"
-
-#: twitteradminpanel.php:293
-msgid "Save Twitter settings"
-msgstr "Twitterinstellingen opslaan"
-
-#: twitterlogin.php:56
-msgid "Already logged in."
-msgstr "U bent al aangemeld."
-
-#: twitterlogin.php:64
-msgid "Twitter Login"
-msgstr "Aanmelden via Twitter"
-
-#: twitterlogin.php:69
-msgid "Login with your Twitter account"
-msgstr "Aanmelden met uw Twittergebruiker"
-
-#: twitterlogin.php:87
-msgid "Sign in with Twitter"
-msgstr "Aanmelden met Twitter"
-
-#: twitterauthorization.php:120 twittersettings.php:225
-msgid "There was a problem with your session token. Try again, please."
-msgstr ""
-"Er is een probleem ontstaan met uw sessie. Probeer het nog een keer, "
-"alstublieft."
-
-#: twitterauthorization.php:126
-msgid "You can't register if you don't agree to the license."
-msgstr "U kunt zich niet registreren als u niet met de licentie akkoord gaat."
-
-#: twitterauthorization.php:135
-msgid "Something weird happened."
-msgstr "Er is iets vreemds gebeurd."
-
-#: twitterauthorization.php:181 twitterauthorization.php:229
-#: twitterauthorization.php:300
-msgid "Couldn't link your Twitter account."
-msgstr "Het was niet mogelijk uw Twittergebruiker te koppelen."
-
-#: twitterauthorization.php:201
-msgid "Couldn't link your Twitter account: oauth_token mismatch."
-msgstr ""
-"Het was niet mogelijk uw Twittergebruiker te koppelen: het oauth_token kwam "
-"niet overeen."
-
-#: twitterauthorization.php:312
+#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
+#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
 #, php-format
-msgid ""
-"This is the first time you've logged into %s so we must connect your Twitter "
-"account to a local account. You can either create a new account, or connect "
-"with your existing account, if you have one."
-msgstr ""
-"Dit is de eerste keer dat u aanmeldt bij %s en dan moeten we uw "
-"Twittergebruiker koppelen met uw lokale gebruiker. U kunt een nieuwe "
-"gebruiker aanmaken of koppelen met een bestaande gebruiker als u die al hebt."
-
-#: twitterauthorization.php:318
-msgid "Twitter Account Setup"
-msgstr "Instellingen Twittergebruiker"
-
-#: twitterauthorization.php:351
-msgid "Connection options"
-msgstr "Koppelingsinstellingen"
-
-#: twitterauthorization.php:360
-#, php-format
-msgid ""
-"My text and files are available under %s except this private data: password, "
-"email address, IM address, and phone number."
-msgstr ""
-"Mijn teksten en bestanden zijn beschikbaar onder %s, behalve de volgende "
-"privégegevens: wachtwoord, e-mailadres, IM-adres, telefoonnummer."
-
-#: twitterauthorization.php:381
-msgid "Create new account"
-msgstr "Nieuwe gebruiker aanmaken"
-
-#: twitterauthorization.php:383
-msgid "Create a new user with this nickname."
-msgstr "Nieuwe gebruiker aanmaken met deze gebruikersnaam."
-
-#: twitterauthorization.php:390
-msgid "New nickname"
-msgstr "Nieuwe gebruikersnaam"
-
-#: twitterauthorization.php:392
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr "1-64 kleine letters of cijfers, geen leestekens of spaties"
-
-#: twitterauthorization.php:404
-msgid "Create"
-msgstr "Aanmaken"
-
-#: twitterauthorization.php:409
-msgid "Connect existing account"
-msgstr "Verbinden met een bestaande gebruiker"
-
-#: twitterauthorization.php:411
-msgid ""
-"If you already have an account, login with your username and password to "
-"connect it to your Twitter account."
-msgstr ""
-"Als u al een gebruiker hebt, meld dan aan met uw gebruikersnaam en "
-"wachtwoord om deze daarna te koppelen met uw Twittergebruiker."
-
-#: twitterauthorization.php:414
-msgid "Existing nickname"
-msgstr "Bestaande gebruikersnaam"
-
-#: twitterauthorization.php:417
-msgid "Password"
-msgstr "Wachtwoord"
-
-#: twitterauthorization.php:420
-msgid "Connect"
-msgstr "Koppelen"
-
-#: twitterauthorization.php:466 twitterauthorization.php:475
-msgid "Registration not allowed."
-msgstr "Registratie is niet toegestaan."
-
-#: twitterauthorization.php:482
-msgid "Not a valid invitation code."
-msgstr "De uitnodigingscode is ongeldig."
-
-#: twitterauthorization.php:495
-msgid "Nickname not allowed."
-msgstr "Gebruikersnaam niet toegestaan."
-
-#: twitterauthorization.php:500
-msgid "Nickname already in use. Try another one."
-msgstr ""
-"De opgegeven gebruikersnaam is al in gebruik. Kies een andere gebruikersnaam."
-
-#: twitterauthorization.php:520
-msgid "Error registering user."
-msgstr "Fout bij het registreren van de gebruiker."
-
-#: twitterauthorization.php:531 twitterauthorization.php:571
-#: twitterauthorization.php:591
-msgid "Error connecting user to Twitter."
-msgstr "Fout bij het verbinden van de gebruiker met Twitter."
-
-#: twitterauthorization.php:553
-msgid "Invalid username or password."
-msgstr "Ongeldige gebruikersnaam of wachtwoord."
-
-#: twittersettings.php:57
-msgid "Twitter settings"
-msgstr "Twitterinstellingen"
-
-#: twittersettings.php:68
-msgid ""
-"Connect your Twitter account to share your updates with your Twitter friends "
-"and vice-versa."
-msgstr ""
-"Koppel uw Twittergebruiker om uw berichten te delen met uw Twittervrienden "
-"en vice versa."
-
-#: twittersettings.php:115
-msgid "Twitter account"
-msgstr "Twittergebruiker"
-
-#: twittersettings.php:120
-msgid "Connected Twitter account"
-msgstr "Gekoppelde Twittergebruiker"
-
-#: twittersettings.php:125
-msgid "Disconnect my account from Twitter"
-msgstr "Mijn gebruiker loskoppelen van Twitter"
-
-#: twittersettings.php:131
-msgid "Disconnecting your Twitter could make it impossible to log in! Please "
-msgstr ""
-"Loskoppelen van uw Twittergebruiker zou ervoor zorgen dat u niet langer kunt "
-"aanmelden. U moet eerst "
-
-#: twittersettings.php:135
-msgid "set a password"
-msgstr "een wachtwoord instellen"
-
-#: twittersettings.php:137
-msgid " first."
-msgstr " voordat u verder kunt met deze handeling."
-
-#. TRANS: %1$s is the current website name.
-#: twittersettings.php:141
-#, php-format
-msgid ""
-"Keep your %1$s account but disconnect from Twitter. You can use your %1$s "
-"password to log in."
-msgstr ""
-"Uw gebruiker bij %1$s behouden maar deze loskoppelen van Twitter. U kunt uw "
-"wachtwoord van %1$s gebruiken om aan te melden."
-
-#: twittersettings.php:149
-msgid "Disconnect"
-msgstr "Loskoppelen"
-
-#: twittersettings.php:156
-msgid "Preferences"
-msgstr "Voorkeuren"
-
-#: twittersettings.php:160
-msgid "Automatically send my notices to Twitter."
-msgstr "Mijn berichten automatisch naar Twitter verzenden"
-
-#: twittersettings.php:167
-msgid "Send local \"@\" replies to Twitter."
-msgstr "Lokale antwoorden met \"2\" naar Twitter verzenden."
-
-#: twittersettings.php:174
-msgid "Subscribe to my Twitter friends here."
-msgstr "Hier op mijn Twittervrienden abonneren."
-
-#: twittersettings.php:183
-msgid "Import my friends timeline."
-msgstr "Tijdlijn van mijn vrienden importeren."
-
-#: twittersettings.php:201
-msgid "Add"
-msgstr "Toevoegen"
-
-#: twittersettings.php:235
-msgid "Unexpected form submission."
-msgstr "Het formulier is onverwacht ingezonden."
-
-#: twittersettings.php:250
-msgid "No Twitter connection to remove."
-msgstr "Er is geen Twitterkoppeling om te verwijderen."
-
-#: twittersettings.php:258
-msgid "Couldn't remove Twitter user."
-msgstr "Het was niet mogelijk de Twittergebruiker te verwijderen."
-
-#: twittersettings.php:262
-msgid "Twitter account disconnected."
-msgstr "De Twittergebruiker is ontkoppeld."
-
-#: twittersettings.php:282 twittersettings.php:293
-msgid "Couldn't save Twitter preferences."
-msgstr "Het was niet mogelijk de Twittervoorkeuren op te slaan."
-
-#: twittersettings.php:301
-msgid "Twitter preferences saved."
-msgstr "De Twitterinstellingen zijn opgeslagen."
+msgid "RT @%1$s %2$s"
+msgstr "RT @%1$s %2$s"
diff --git a/plugins/TwitterBridge/locale/tr/LC_MESSAGES/TwitterBridge.po b/plugins/TwitterBridge/locale/tr/LC_MESSAGES/TwitterBridge.po
index 7b23e06920..ed99c9418b 100644
--- a/plugins/TwitterBridge/locale/tr/LC_MESSAGES/TwitterBridge.po
+++ b/plugins/TwitterBridge/locale/tr/LC_MESSAGES/TwitterBridge.po
@@ -9,30 +9,276 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TwitterBridge\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:13+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:27+0000\n"
 "Language-Team: Turkish <http://translatewiki.net/wiki/Portal:tr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-14 17:22:14+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:31+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tr\n"
 "X-Message-Group: #out-statusnet-plugin-twitterbridge\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
-#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: twitterimport.php:114
-#, php-format
-msgid "RT @%1$s %2$s"
+msgid "Twitter settings"
+msgstr "Twitter ayarları"
+
+msgid ""
+"Connect your Twitter account to share your updates with your Twitter friends "
+"and vice-versa."
+msgstr ""
+"Güncellemelerinizi Twitter arkadaşlarınızla paylaşmak ve onların sizi takip "
+"edebilmesi için Twitter hesabınızla bağlantı kurun."
+
+msgid "Twitter account"
+msgstr "Twitter hesabı"
+
+msgid "Connected Twitter account"
+msgstr "Bağlı Twitter hesabı"
+
+msgid "Disconnect my account from Twitter"
+msgstr "Hesabımın Twitter bağlantısını kes."
+
+msgid "Disconnecting your Twitter could make it impossible to log in! Please "
+msgstr ""
+
+msgid "set a password"
+msgstr "bir parola ayarla"
+
+msgid " first."
+msgstr " ilk."
+
+#. TRANS: %1$s is the current website name.
+#, php-format
+msgid ""
+"Keep your %1$s account but disconnect from Twitter. You can use your %1$s "
+"password to log in."
+msgstr ""
+
+msgid "Disconnect"
+msgstr "Bağlantıyı Kes"
+
+msgid "Preferences"
+msgstr "Tercihler"
+
+msgid "Automatically send my notices to Twitter."
+msgstr "Durum mesajlarımı otomatik olarak Twitter'a gönder."
+
+msgid "Send local \"@\" replies to Twitter."
+msgstr ""
+
+msgid "Subscribe to my Twitter friends here."
+msgstr ""
+
+msgid "Import my friends timeline."
+msgstr "Arkadaşlarımın zaman çizelgesini içeri aktar."
+
+msgid "Save"
+msgstr "Kaydet"
+
+msgid "Add"
+msgstr "Ekle"
+
+msgid "There was a problem with your session token. Try again, please."
+msgstr ""
+
+msgid "Unexpected form submission."
+msgstr "Beklenmedik form gönderimi."
+
+msgid "No Twitter connection to remove."
+msgstr ""
+
+msgid "Couldn't remove Twitter user."
+msgstr "Twitter kullanıcısı silinemedi."
+
+msgid "Twitter account disconnected."
+msgstr "Twitter hesabı bağlantısı kesildi."
+
+msgid "Couldn't save Twitter preferences."
+msgstr "Twitter tercihleri kaydedilemedi."
+
+msgid "Twitter preferences saved."
+msgstr "Twitter tercihleriniz kaydedildi."
+
+msgid "You can't register if you don't agree to the license."
+msgstr "Eğer lisansı kabul etmezseniz kayıt olamazsınız."
+
+msgid "Something weird happened."
+msgstr "Garip bir şeyler oldu."
+
+msgid "Couldn't link your Twitter account."
+msgstr ""
+
+msgid "Couldn't link your Twitter account: oauth_token mismatch."
+msgstr ""
+
+#, php-format
+msgid ""
+"This is the first time you've logged into %s so we must connect your Twitter "
+"account to a local account. You can either create a new account, or connect "
+"with your existing account, if you have one."
+msgstr ""
+"İlk defa %s'ye giriş yaptınız, Twitter hesabınızı yerel bir hesapla "
+"bağlamamız gerekiyor. Yeni bir hesap oluşturabilir ya da varolan bir "
+"hesabınızı kullanabilirsiniz."
+
+msgid "Twitter Account Setup"
+msgstr "Twitter Hesap Kurulumu"
+
+msgid "Connection options"
+msgstr "Bağlantı seçenekleri"
+
+#, php-format
+msgid ""
+"My text and files are available under %s except this private data: password, "
+"email address, IM address, and phone number."
+msgstr ""
+"Parola, e-posta adresi, anlık mesajlaşma adresi ve telefon numarası gibi "
+"özel verilerim dışındaki tüm yazı ve dosyalarım %s dahilinde kullanılabilir."
+
+msgid "Create new account"
+msgstr "Yeni hesap oluştur"
+
+msgid "Create a new user with this nickname."
+msgstr "Bu kullanıcı adıyla yeni bir kullanıcı oluştur."
+
+msgid "New nickname"
+msgstr "Yeni kullanıcı adı"
+
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+msgstr ""
+"1-64 tane küçük harf veya rakam, noktalama işaretlerine ve boşluklara izin "
+"verilmez"
+
+msgid "Create"
+msgstr "Oluştur"
+
+msgid "Connect existing account"
+msgstr "Varolan hesaba bağlan"
+
+msgid ""
+"If you already have an account, login with your username and password to "
+"connect it to your Twitter account."
+msgstr ""
+"Halihazırda bir hesabınız varsa, Twitter hesabınızla bağlantı kurmak için "
+"kullanıcı adı ve parolanızla giriş yapın."
+
+msgid "Existing nickname"
+msgstr "Varolan kullanıcı adı"
+
+msgid "Password"
+msgstr "Parola"
+
+msgid "Connect"
+msgstr "Bağlan"
+
+msgid "Registration not allowed."
+msgstr "Kayıt yapılmasına izin verilmiyor."
+
+msgid "Not a valid invitation code."
+msgstr "Geçerli bir davet kodu değil."
+
+msgid "Nickname not allowed."
+msgstr "Bu kullanıcı adına izin verilmiyor."
+
+msgid "Nickname already in use. Try another one."
+msgstr "Kullanıcı adı halihazırda kullanılıyor. Başka bir tane deneyin."
+
+msgid "Error registering user."
+msgstr "Kullanıcı kayıt hatası."
+
+msgid "Error connecting user to Twitter."
+msgstr "Twitter'a kullanıcı bağlama hatası."
+
+msgid "Invalid username or password."
+msgstr "Geçersiz kullanıcı adı veya parola."
+
+msgid "Twitter"
+msgstr "Twitter"
+
+msgid "Twitter bridge settings"
+msgstr "Twitter köprü ayarları"
+
+msgid "Invalid consumer key. Max length is 255 characters."
+msgstr ""
+
+msgid "Invalid consumer secret. Max length is 255 characters."
+msgstr ""
+
+msgid "Twitter application settings"
+msgstr ""
+
+msgid "Consumer key"
+msgstr "Kullanıcı anahtarı"
+
+msgid "Consumer key assigned by Twitter"
+msgstr "Twitter tarafından atanan kullanıcı anahtarı"
+
+msgid "Consumer secret"
+msgstr ""
+
+msgid "Consumer secret assigned by Twitter"
+msgstr ""
+
+msgid "Note: a global consumer key and secret are set."
+msgstr ""
+
+msgid "Integration source"
+msgstr "Entegrasyon kaynağı"
+
+msgid "Name of your Twitter application"
+msgstr "Twitter uygulamanızın ismi"
+
+msgid "Options"
+msgstr "Seçenekler"
+
+msgid "Enable \"Sign-in with Twitter\""
+msgstr ""
+
+msgid "Allow users to login with their Twitter credentials"
+msgstr ""
+
+msgid "Enable Twitter import"
+msgstr ""
+
+msgid ""
+"Allow users to import their Twitter friends' timelines. Requires daemons to "
+"be manually configured."
+msgstr ""
+
+msgid "Save Twitter settings"
+msgstr "Twitter ayarlarını kaydet"
+
+msgid "Login or register using Twitter"
+msgstr ""
+
+msgid "Twitter integration options"
+msgstr "Twitter entegrasyon seçenekleri"
+
+msgid "Twitter bridge configuration"
+msgstr "Twitter köprü yapılandırması"
+
+msgid ""
+"The Twitter \"bridge\" plugin allows integration of a StatusNet instance "
+"with <a href=\"http://twitter.com/\">Twitter</a>."
+msgstr ""
+
+msgid "Already logged in."
+msgstr "Zaten giriş yapılmış."
+
+msgid "Twitter Login"
+msgstr "Twitter Giriş"
+
+msgid "Login with your Twitter account"
+msgstr "Twitter hesabınızla giriş yapın"
+
+msgid "Sign in with Twitter"
 msgstr ""
 
-#: twitter.php:409
 msgid "Your Twitter bridge has been disabled."
 msgstr ""
 
-#: twitter.php:413
 #, php-format
 msgid ""
 "Hi, %1$s. We're sorry to inform you that your link to Twitter has been "
@@ -48,335 +294,8 @@ msgid ""
 "%3$s"
 msgstr ""
 
-#: TwitterBridgePlugin.php:151 TwitterBridgePlugin.php:174
-#: TwitterBridgePlugin.php:302 twitteradminpanel.php:52
-msgid "Twitter"
-msgstr "Twitter"
-
-#: TwitterBridgePlugin.php:152
-msgid "Login or register using Twitter"
-msgstr ""
-
-#: TwitterBridgePlugin.php:175
-msgid "Twitter integration options"
-msgstr "Twitter entegrasyon seçenekleri"
-
-#: TwitterBridgePlugin.php:303
-msgid "Twitter bridge configuration"
-msgstr "Twitter köprü yapılandırması"
-
-#: TwitterBridgePlugin.php:327
-msgid ""
-"The Twitter \"bridge\" plugin allows integration of a StatusNet instance "
-"with <a href=\"http://twitter.com/\">Twitter</a>."
-msgstr ""
-
-#: twitteradminpanel.php:62
-msgid "Twitter bridge settings"
-msgstr "Twitter köprü ayarları"
-
-#: twitteradminpanel.php:150
-msgid "Invalid consumer key. Max length is 255 characters."
-msgstr ""
-
-#: twitteradminpanel.php:156
-msgid "Invalid consumer secret. Max length is 255 characters."
-msgstr ""
-
-#: twitteradminpanel.php:212
-msgid "Twitter application settings"
-msgstr ""
-
-#: twitteradminpanel.php:218
-msgid "Consumer key"
-msgstr "Kullanıcı anahtarı"
-
-#: twitteradminpanel.php:219
-msgid "Consumer key assigned by Twitter"
-msgstr "Twitter tarafından atanan kullanıcı anahtarı"
-
-#: twitteradminpanel.php:227
-msgid "Consumer secret"
-msgstr ""
-
-#: twitteradminpanel.php:228
-msgid "Consumer secret assigned by Twitter"
-msgstr ""
-
-#: twitteradminpanel.php:238
-msgid "Note: a global consumer key and secret are set."
-msgstr ""
-
-#: twitteradminpanel.php:245
-msgid "Integration source"
-msgstr "Entegrasyon kaynağı"
-
-#: twitteradminpanel.php:246
-msgid "Name of your Twitter application"
-msgstr "Twitter uygulamanızın ismi"
-
-#: twitteradminpanel.php:258
-msgid "Options"
-msgstr "Seçenekler"
-
-#: twitteradminpanel.php:265
-msgid "Enable \"Sign-in with Twitter\""
-msgstr ""
-
-#: twitteradminpanel.php:267
-msgid "Allow users to login with their Twitter credentials"
-msgstr ""
-
-#: twitteradminpanel.php:274
-msgid "Enable Twitter import"
-msgstr ""
-
-#: twitteradminpanel.php:276
-msgid ""
-"Allow users to import their Twitter friends' timelines. Requires daemons to "
-"be manually configured."
-msgstr ""
-
-#: twitteradminpanel.php:293 twittersettings.php:199
-msgid "Save"
-msgstr "Kaydet"
-
-#: twitteradminpanel.php:293
-msgid "Save Twitter settings"
-msgstr "Twitter ayarlarını kaydet"
-
-#: twitterlogin.php:56
-msgid "Already logged in."
-msgstr "Zaten giriş yapılmış."
-
-#: twitterlogin.php:64
-msgid "Twitter Login"
-msgstr "Twitter Giriş"
-
-#: twitterlogin.php:69
-msgid "Login with your Twitter account"
-msgstr "Twitter hesabınızla giriş yapın"
-
-#: twitterlogin.php:87
-msgid "Sign in with Twitter"
-msgstr ""
-
-#: twitterauthorization.php:120 twittersettings.php:225
-msgid "There was a problem with your session token. Try again, please."
-msgstr ""
-
-#: twitterauthorization.php:126
-msgid "You can't register if you don't agree to the license."
-msgstr "Eğer lisansı kabul etmezseniz kayıt olamazsınız."
-
-#: twitterauthorization.php:135
-msgid "Something weird happened."
-msgstr "Garip bir şeyler oldu."
-
-#: twitterauthorization.php:181 twitterauthorization.php:229
-#: twitterauthorization.php:300
-msgid "Couldn't link your Twitter account."
-msgstr ""
-
-#: twitterauthorization.php:201
-msgid "Couldn't link your Twitter account: oauth_token mismatch."
-msgstr ""
-
-#: twitterauthorization.php:312
+#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
+#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
 #, php-format
-msgid ""
-"This is the first time you've logged into %s so we must connect your Twitter "
-"account to a local account. You can either create a new account, or connect "
-"with your existing account, if you have one."
+msgid "RT @%1$s %2$s"
 msgstr ""
-"İlk defa %s'ye giriş yaptınız, Twitter hesabınızı yerel bir hesapla "
-"bağlamamız gerekiyor. Yeni bir hesap oluşturabilir ya da varolan bir "
-"hesabınızı kullanabilirsiniz."
-
-#: twitterauthorization.php:318
-msgid "Twitter Account Setup"
-msgstr "Twitter Hesap Kurulumu"
-
-#: twitterauthorization.php:351
-msgid "Connection options"
-msgstr "Bağlantı seçenekleri"
-
-#: twitterauthorization.php:360
-#, php-format
-msgid ""
-"My text and files are available under %s except this private data: password, "
-"email address, IM address, and phone number."
-msgstr ""
-"Parola, e-posta adresi, anlık mesajlaşma adresi ve telefon numarası gibi "
-"özel verilerim dışındaki tüm yazı ve dosyalarım %s dahilinde kullanılabilir."
-
-#: twitterauthorization.php:381
-msgid "Create new account"
-msgstr "Yeni hesap oluştur"
-
-#: twitterauthorization.php:383
-msgid "Create a new user with this nickname."
-msgstr "Bu kullanıcı adıyla yeni bir kullanıcı oluştur."
-
-#: twitterauthorization.php:390
-msgid "New nickname"
-msgstr "Yeni kullanıcı adı"
-
-#: twitterauthorization.php:392
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr ""
-"1-64 tane küçük harf veya rakam, noktalama işaretlerine ve boşluklara izin "
-"verilmez"
-
-#: twitterauthorization.php:404
-msgid "Create"
-msgstr "Oluştur"
-
-#: twitterauthorization.php:409
-msgid "Connect existing account"
-msgstr "Varolan hesaba bağlan"
-
-#: twitterauthorization.php:411
-msgid ""
-"If you already have an account, login with your username and password to "
-"connect it to your Twitter account."
-msgstr ""
-"Halihazırda bir hesabınız varsa, Twitter hesabınızla bağlantı kurmak için "
-"kullanıcı adı ve parolanızla giriş yapın."
-
-#: twitterauthorization.php:414
-msgid "Existing nickname"
-msgstr "Varolan kullanıcı adı"
-
-#: twitterauthorization.php:417
-msgid "Password"
-msgstr "Parola"
-
-#: twitterauthorization.php:420
-msgid "Connect"
-msgstr "Bağlan"
-
-#: twitterauthorization.php:466 twitterauthorization.php:475
-msgid "Registration not allowed."
-msgstr "Kayıt yapılmasına izin verilmiyor."
-
-#: twitterauthorization.php:482
-msgid "Not a valid invitation code."
-msgstr "Geçerli bir davet kodu değil."
-
-#: twitterauthorization.php:495
-msgid "Nickname not allowed."
-msgstr "Bu kullanıcı adına izin verilmiyor."
-
-#: twitterauthorization.php:500
-msgid "Nickname already in use. Try another one."
-msgstr "Kullanıcı adı halihazırda kullanılıyor. Başka bir tane deneyin."
-
-#: twitterauthorization.php:520
-msgid "Error registering user."
-msgstr "Kullanıcı kayıt hatası."
-
-#: twitterauthorization.php:531 twitterauthorization.php:571
-#: twitterauthorization.php:591
-msgid "Error connecting user to Twitter."
-msgstr "Twitter'a kullanıcı bağlama hatası."
-
-#: twitterauthorization.php:553
-msgid "Invalid username or password."
-msgstr "Geçersiz kullanıcı adı veya parola."
-
-#: twittersettings.php:57
-msgid "Twitter settings"
-msgstr "Twitter ayarları"
-
-#: twittersettings.php:68
-msgid ""
-"Connect your Twitter account to share your updates with your Twitter friends "
-"and vice-versa."
-msgstr ""
-"Güncellemelerinizi Twitter arkadaşlarınızla paylaşmak ve onların sizi takip "
-"edebilmesi için Twitter hesabınızla bağlantı kurun."
-
-#: twittersettings.php:115
-msgid "Twitter account"
-msgstr "Twitter hesabı"
-
-#: twittersettings.php:120
-msgid "Connected Twitter account"
-msgstr "Bağlı Twitter hesabı"
-
-#: twittersettings.php:125
-msgid "Disconnect my account from Twitter"
-msgstr "Hesabımın Twitter bağlantısını kes."
-
-#: twittersettings.php:131
-msgid "Disconnecting your Twitter could make it impossible to log in! Please "
-msgstr ""
-
-#: twittersettings.php:135
-msgid "set a password"
-msgstr "bir parola ayarla"
-
-#: twittersettings.php:137
-msgid " first."
-msgstr " ilk."
-
-#. TRANS: %1$s is the current website name.
-#: twittersettings.php:141
-#, php-format
-msgid ""
-"Keep your %1$s account but disconnect from Twitter. You can use your %1$s "
-"password to log in."
-msgstr ""
-
-#: twittersettings.php:149
-msgid "Disconnect"
-msgstr "Bağlantıyı Kes"
-
-#: twittersettings.php:156
-msgid "Preferences"
-msgstr "Tercihler"
-
-#: twittersettings.php:160
-msgid "Automatically send my notices to Twitter."
-msgstr "Durum mesajlarımı otomatik olarak Twitter'a gönder."
-
-#: twittersettings.php:167
-msgid "Send local \"@\" replies to Twitter."
-msgstr ""
-
-#: twittersettings.php:174
-msgid "Subscribe to my Twitter friends here."
-msgstr ""
-
-#: twittersettings.php:183
-msgid "Import my friends timeline."
-msgstr "Arkadaşlarımın zaman çizelgesini içeri aktar."
-
-#: twittersettings.php:201
-msgid "Add"
-msgstr "Ekle"
-
-#: twittersettings.php:235
-msgid "Unexpected form submission."
-msgstr "Beklenmedik form gönderimi."
-
-#: twittersettings.php:250
-msgid "No Twitter connection to remove."
-msgstr ""
-
-#: twittersettings.php:258
-msgid "Couldn't remove Twitter user."
-msgstr "Twitter kullanıcısı silinemedi."
-
-#: twittersettings.php:262
-msgid "Twitter account disconnected."
-msgstr "Twitter hesabı bağlantısı kesildi."
-
-#: twittersettings.php:282 twittersettings.php:293
-msgid "Couldn't save Twitter preferences."
-msgstr "Twitter tercihleri kaydedilemedi."
-
-#: twittersettings.php:301
-msgid "Twitter preferences saved."
-msgstr "Twitter tercihleriniz kaydedildi."
diff --git a/plugins/TwitterBridge/locale/uk/LC_MESSAGES/TwitterBridge.po b/plugins/TwitterBridge/locale/uk/LC_MESSAGES/TwitterBridge.po
index 68945904f0..60c77ef9e8 100644
--- a/plugins/TwitterBridge/locale/uk/LC_MESSAGES/TwitterBridge.po
+++ b/plugins/TwitterBridge/locale/uk/LC_MESSAGES/TwitterBridge.po
@@ -9,31 +9,286 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TwitterBridge\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:13+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:27+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-14 17:22:14+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:31+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-twitterbridge\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
-#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: twitterimport.php:114
-#, php-format
-msgid "RT @%1$s %2$s"
-msgstr "RT @%1$s %2$s"
+msgid "Twitter settings"
+msgstr "Налаштування Twitter"
+
+msgid ""
+"Connect your Twitter account to share your updates with your Twitter friends "
+"and vice-versa."
+msgstr ""
+"Підключіть ваш акаунт Twitter, щоб ділитися новими дописами з друзями в "
+"Twitter і навпаки."
+
+msgid "Twitter account"
+msgstr "Акаунт Twitter"
+
+msgid "Connected Twitter account"
+msgstr "Під’єднаний акаунт Twitter"
+
+msgid "Disconnect my account from Twitter"
+msgstr "Від’єднати мій акаунт від Twitter"
+
+msgid "Disconnecting your Twitter could make it impossible to log in! Please "
+msgstr ""
+"Якщо ви від’єднаєте свій Twitter, то це унеможливить вхід до системи у "
+"майбутньому! Будь ласка, "
+
+msgid "set a password"
+msgstr "встановіть пароль"
+
+msgid " first."
+msgstr " спочатку."
+
+#. TRANS: %1$s is the current website name.
+#, php-format
+msgid ""
+"Keep your %1$s account but disconnect from Twitter. You can use your %1$s "
+"password to log in."
+msgstr ""
+"Зберегти ваш акаунт %1$s, але від’єднати його від Twitter. Ви можете "
+"використовувати пароль від %1$s для входу на сайт."
+
+msgid "Disconnect"
+msgstr "Від’єднати"
+
+msgid "Preferences"
+msgstr "Налаштування"
+
+msgid "Automatically send my notices to Twitter."
+msgstr "Автоматично пересилати мої дописи на Twitter."
+
+msgid "Send local \"@\" replies to Twitter."
+msgstr "Надіслати локальні «@» відповіді на Twitter."
+
+msgid "Subscribe to my Twitter friends here."
+msgstr "Підписатись до моїх друзів з Twitter тут."
+
+msgid "Import my friends timeline."
+msgstr "Імпортувати стрічку дописів моїх друзів."
+
+msgid "Save"
+msgstr "Зберегти"
+
+msgid "Add"
+msgstr "Додати"
+
+msgid "There was a problem with your session token. Try again, please."
+msgstr "Виникли певні проблеми з токеном сесії. Спробуйте знов, будь ласка."
+
+msgid "Unexpected form submission."
+msgstr "Несподіване представлення форми."
+
+msgid "No Twitter connection to remove."
+msgstr "Не виявлено з’єднань з Twitter для видалення."
+
+msgid "Couldn't remove Twitter user."
+msgstr "Не вдається видалити користувача Twitter."
+
+msgid "Twitter account disconnected."
+msgstr "Акаунт Twitter від’єднано."
+
+msgid "Couldn't save Twitter preferences."
+msgstr "Не можу зберегти налаштування Twitter."
+
+msgid "Twitter preferences saved."
+msgstr "Налаштування Twitter збережено."
+
+msgid "You can't register if you don't agree to the license."
+msgstr "Ви не зможете зареєструватись, якщо не погодитесь з умовами ліцензії."
+
+msgid "Something weird happened."
+msgstr "Сталося щось незрозуміле."
+
+msgid "Couldn't link your Twitter account."
+msgstr "Не вдається підключити ваш акаунт Twitter."
+
+msgid "Couldn't link your Twitter account: oauth_token mismatch."
+msgstr ""
+"Не вдається підключити ваш акаунт Twitter: невідповідність oauth_token."
+
+#, php-format
+msgid ""
+"This is the first time you've logged into %s so we must connect your Twitter "
+"account to a local account. You can either create a new account, or connect "
+"with your existing account, if you have one."
+msgstr ""
+"Ви вперше увійшли до сайту %s, отже ми мусимо приєднати ваш акаунт Twitter "
+"до акаунту на даному сайті. Ви маєте можливість створити новий акаунт або "
+"використати такий, що вже існує, якщо він у вас є."
+
+msgid "Twitter Account Setup"
+msgstr "Створення акаунту за допомогою Twitter"
+
+msgid "Connection options"
+msgstr "Опції з’єднання"
+
+#, php-format
+msgid ""
+"My text and files are available under %s except this private data: password, "
+"email address, IM address, and phone number."
+msgstr ""
+"Мої дописи і файли доступні на умовах %s, окрім цих приватних даних: пароль, "
+"електронна адреса, адреса IM, телефонний номер."
+
+msgid "Create new account"
+msgstr "Створити новий акаунт"
+
+msgid "Create a new user with this nickname."
+msgstr "Створити нового користувача з цим нікнеймом."
+
+msgid "New nickname"
+msgstr "Новий нікнейм"
+
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+msgstr ""
+"1-64 літери нижнього регістру і цифри, ніякої пунктуації або інтервалів"
+
+msgid "Create"
+msgstr "Створити"
+
+msgid "Connect existing account"
+msgstr "Приєднати акаунт, який вже існує"
+
+msgid ""
+"If you already have an account, login with your username and password to "
+"connect it to your Twitter account."
+msgstr ""
+"Якщо ви вже маєте акаунт, увійдіть з вашим ім’ям користувача та паролем, аби "
+"приєднати їх до Twitter."
+
+msgid "Existing nickname"
+msgstr "Нікнейм, який вже існує"
+
+msgid "Password"
+msgstr "Пароль"
+
+msgid "Connect"
+msgstr "Під’єднати"
+
+msgid "Registration not allowed."
+msgstr "Реєстрацію не дозволено."
+
+msgid "Not a valid invitation code."
+msgstr "Це не дійсний код запрошення."
+
+msgid "Nickname not allowed."
+msgstr "Нікнейм не допускається."
+
+msgid "Nickname already in use. Try another one."
+msgstr "Цей нікнейм вже використовується. Спробуйте інший."
+
+msgid "Error registering user."
+msgstr "Помилка при реєстрації користувача."
+
+msgid "Error connecting user to Twitter."
+msgstr "Помилка при підключенні користувача до Twitter."
+
+msgid "Invalid username or password."
+msgstr "Недійсне ім’я або пароль."
+
+msgid "Twitter"
+msgstr "Twitter"
+
+msgid "Twitter bridge settings"
+msgstr "Налаштування містка з Twitter"
+
+msgid "Invalid consumer key. Max length is 255 characters."
+msgstr "Невірний ключ споживача. Максимальна довжина — 255 символів."
+
+msgid "Invalid consumer secret. Max length is 255 characters."
+msgstr "Невірний секретний код споживача. Максимальна довжина — 255 символів."
+
+msgid "Twitter application settings"
+msgstr "Налаштування додатку для Twitter"
+
+msgid "Consumer key"
+msgstr "Ключ споживача"
+
+msgid "Consumer key assigned by Twitter"
+msgstr "Ключ споживача, що він був наданий сервісом Twitter"
+
+msgid "Consumer secret"
+msgstr "Секретний код споживача"
+
+msgid "Consumer secret assigned by Twitter"
+msgstr "Секретний код споживача, що він був наданий сервісом Twitter"
+
+msgid "Note: a global consumer key and secret are set."
+msgstr "Примітка: глобальний ключ споживача та секретний код встановлено."
+
+msgid "Integration source"
+msgstr "Джерело об’єднання"
+
+msgid "Name of your Twitter application"
+msgstr "Назва вашого додатку для Twitter"
+
+msgid "Options"
+msgstr "Параметри"
+
+msgid "Enable \"Sign-in with Twitter\""
+msgstr "Увімкнути «Увійти з допомогою Twitter»"
+
+msgid "Allow users to login with their Twitter credentials"
+msgstr ""
+"Дозволити користувачам входити на сайт, використовуючи повноваження Twitter"
+
+msgid "Enable Twitter import"
+msgstr "Увімкнути імпорт з Twitter"
+
+msgid ""
+"Allow users to import their Twitter friends' timelines. Requires daemons to "
+"be manually configured."
+msgstr ""
+"Дозволити користувачам імпортувати їхні стрічки дописів з Twitter. Це "
+"вимагає ручної настройки процесів типу «daemon»."
+
+msgid "Save Twitter settings"
+msgstr "Зберегти налаштування Twitter"
+
+msgid "Login or register using Twitter"
+msgstr "Увійти або зареєструватись з Twitter"
+
+msgid "Twitter integration options"
+msgstr "Параметри інтеграції з Twitter"
+
+msgid "Twitter bridge configuration"
+msgstr "Налаштування містка з Twitter"
+
+msgid ""
+"The Twitter \"bridge\" plugin allows integration of a StatusNet instance "
+"with <a href=\"http://twitter.com/\">Twitter</a>."
+msgstr ""
+"Додаток TwitterBridge дозволяє інтегрувати StatusNet-сумісний сайт з <a href="
+"\"http://twitter.com/\">Twitter</a>, встановлюючи так званий «місток»."
+
+msgid "Already logged in."
+msgstr "Тепер ви увійшли."
+
+msgid "Twitter Login"
+msgstr "Вхід Twitter"
+
+msgid "Login with your Twitter account"
+msgstr "Увійти за допомогою акаунту Twitter"
+
+msgid "Sign in with Twitter"
+msgstr "Увійти з акаунтом Twitter"
 
-#: twitter.php:409
 msgid "Your Twitter bridge has been disabled."
 msgstr "Ваш місток до Twitter було відключено."
 
-#: twitter.php:413
 #, php-format
 msgid ""
 "Hi, %1$s. We're sorry to inform you that your link to Twitter has been "
@@ -61,344 +316,8 @@ msgstr ""
 "З повагою,\n"
 "%3$s"
 
-#: TwitterBridgePlugin.php:151 TwitterBridgePlugin.php:174
-#: TwitterBridgePlugin.php:302 twitteradminpanel.php:52
-msgid "Twitter"
-msgstr "Twitter"
-
-#: TwitterBridgePlugin.php:152
-msgid "Login or register using Twitter"
-msgstr "Увійти або зареєструватись з Twitter"
-
-#: TwitterBridgePlugin.php:175
-msgid "Twitter integration options"
-msgstr "Параметри інтеграції з Twitter"
-
-#: TwitterBridgePlugin.php:303
-msgid "Twitter bridge configuration"
-msgstr "Налаштування містка з Twitter"
-
-#: TwitterBridgePlugin.php:327
-msgid ""
-"The Twitter \"bridge\" plugin allows integration of a StatusNet instance "
-"with <a href=\"http://twitter.com/\">Twitter</a>."
-msgstr ""
-"Додаток TwitterBridge дозволяє інтегрувати StatusNet-сумісний сайт з <a href="
-"\"http://twitter.com/\">Twitter</a>, встановлюючи так званий «місток»."
-
-#: twitteradminpanel.php:62
-msgid "Twitter bridge settings"
-msgstr "Налаштування містка з Twitter"
-
-#: twitteradminpanel.php:150
-msgid "Invalid consumer key. Max length is 255 characters."
-msgstr "Невірний ключ споживача. Максимальна довжина — 255 символів."
-
-#: twitteradminpanel.php:156
-msgid "Invalid consumer secret. Max length is 255 characters."
-msgstr "Невірний секретний код споживача. Максимальна довжина — 255 символів."
-
-#: twitteradminpanel.php:212
-msgid "Twitter application settings"
-msgstr "Налаштування додатку для Twitter"
-
-#: twitteradminpanel.php:218
-msgid "Consumer key"
-msgstr "Ключ споживача"
-
-#: twitteradminpanel.php:219
-msgid "Consumer key assigned by Twitter"
-msgstr "Ключ споживача, що він був наданий сервісом Twitter"
-
-#: twitteradminpanel.php:227
-msgid "Consumer secret"
-msgstr "Секретний код споживача"
-
-#: twitteradminpanel.php:228
-msgid "Consumer secret assigned by Twitter"
-msgstr "Секретний код споживача, що він був наданий сервісом Twitter"
-
-#: twitteradminpanel.php:238
-msgid "Note: a global consumer key and secret are set."
-msgstr "Примітка: глобальний ключ споживача та секретний код встановлено."
-
-#: twitteradminpanel.php:245
-msgid "Integration source"
-msgstr "Джерело об’єднання"
-
-#: twitteradminpanel.php:246
-msgid "Name of your Twitter application"
-msgstr "Назва вашого додатку для Twitter"
-
-#: twitteradminpanel.php:258
-msgid "Options"
-msgstr "Параметри"
-
-#: twitteradminpanel.php:265
-msgid "Enable \"Sign-in with Twitter\""
-msgstr "Увімкнути «Увійти з допомогою Twitter»"
-
-#: twitteradminpanel.php:267
-msgid "Allow users to login with their Twitter credentials"
-msgstr ""
-"Дозволити користувачам входити на сайт, використовуючи повноваження Twitter"
-
-#: twitteradminpanel.php:274
-msgid "Enable Twitter import"
-msgstr "Увімкнути імпорт з Twitter"
-
-#: twitteradminpanel.php:276
-msgid ""
-"Allow users to import their Twitter friends' timelines. Requires daemons to "
-"be manually configured."
-msgstr ""
-"Дозволити користувачам імпортувати їхні стрічки дописів з Twitter. Це "
-"вимагає ручної настройки процесів типу «daemon»."
-
-#: twitteradminpanel.php:293 twittersettings.php:199
-msgid "Save"
-msgstr "Зберегти"
-
-#: twitteradminpanel.php:293
-msgid "Save Twitter settings"
-msgstr "Зберегти налаштування Twitter"
-
-#: twitterlogin.php:56
-msgid "Already logged in."
-msgstr "Тепер ви увійшли."
-
-#: twitterlogin.php:64
-msgid "Twitter Login"
-msgstr "Вхід Twitter"
-
-#: twitterlogin.php:69
-msgid "Login with your Twitter account"
-msgstr "Увійти за допомогою акаунту Twitter"
-
-#: twitterlogin.php:87
-msgid "Sign in with Twitter"
-msgstr "Увійти з акаунтом Twitter"
-
-#: twitterauthorization.php:120 twittersettings.php:225
-msgid "There was a problem with your session token. Try again, please."
-msgstr "Виникли певні проблеми з токеном сесії. Спробуйте знов, будь ласка."
-
-#: twitterauthorization.php:126
-msgid "You can't register if you don't agree to the license."
-msgstr "Ви не зможете зареєструватись, якщо не погодитесь з умовами ліцензії."
-
-#: twitterauthorization.php:135
-msgid "Something weird happened."
-msgstr "Сталося щось незрозуміле."
-
-#: twitterauthorization.php:181 twitterauthorization.php:229
-#: twitterauthorization.php:300
-msgid "Couldn't link your Twitter account."
-msgstr "Не вдається підключити ваш акаунт Twitter."
-
-#: twitterauthorization.php:201
-msgid "Couldn't link your Twitter account: oauth_token mismatch."
-msgstr ""
-"Не вдається підключити ваш акаунт Twitter: невідповідність oauth_token."
-
-#: twitterauthorization.php:312
+#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
+#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
 #, php-format
-msgid ""
-"This is the first time you've logged into %s so we must connect your Twitter "
-"account to a local account. You can either create a new account, or connect "
-"with your existing account, if you have one."
-msgstr ""
-"Ви вперше увійшли до сайту %s, отже ми мусимо приєднати ваш акаунт Twitter "
-"до акаунту на даному сайті. Ви маєте можливість створити новий акаунт або "
-"використати такий, що вже існує, якщо він у вас є."
-
-#: twitterauthorization.php:318
-msgid "Twitter Account Setup"
-msgstr "Створення акаунту за допомогою Twitter"
-
-#: twitterauthorization.php:351
-msgid "Connection options"
-msgstr "Опції з’єднання"
-
-#: twitterauthorization.php:360
-#, php-format
-msgid ""
-"My text and files are available under %s except this private data: password, "
-"email address, IM address, and phone number."
-msgstr ""
-"Мої дописи і файли доступні на умовах %s, окрім цих приватних даних: пароль, "
-"електронна адреса, адреса IM, телефонний номер."
-
-#: twitterauthorization.php:381
-msgid "Create new account"
-msgstr "Створити новий акаунт"
-
-#: twitterauthorization.php:383
-msgid "Create a new user with this nickname."
-msgstr "Створити нового користувача з цим нікнеймом."
-
-#: twitterauthorization.php:390
-msgid "New nickname"
-msgstr "Новий нікнейм"
-
-#: twitterauthorization.php:392
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr ""
-"1-64 літери нижнього регістру і цифри, ніякої пунктуації або інтервалів"
-
-#: twitterauthorization.php:404
-msgid "Create"
-msgstr "Створити"
-
-#: twitterauthorization.php:409
-msgid "Connect existing account"
-msgstr "Приєднати акаунт, який вже існує"
-
-#: twitterauthorization.php:411
-msgid ""
-"If you already have an account, login with your username and password to "
-"connect it to your Twitter account."
-msgstr ""
-"Якщо ви вже маєте акаунт, увійдіть з вашим ім’ям користувача та паролем, аби "
-"приєднати їх до Twitter."
-
-#: twitterauthorization.php:414
-msgid "Existing nickname"
-msgstr "Нікнейм, який вже існує"
-
-#: twitterauthorization.php:417
-msgid "Password"
-msgstr "Пароль"
-
-#: twitterauthorization.php:420
-msgid "Connect"
-msgstr "Під’єднати"
-
-#: twitterauthorization.php:466 twitterauthorization.php:475
-msgid "Registration not allowed."
-msgstr "Реєстрацію не дозволено."
-
-#: twitterauthorization.php:482
-msgid "Not a valid invitation code."
-msgstr "Це не дійсний код запрошення."
-
-#: twitterauthorization.php:495
-msgid "Nickname not allowed."
-msgstr "Нікнейм не допускається."
-
-#: twitterauthorization.php:500
-msgid "Nickname already in use. Try another one."
-msgstr "Цей нікнейм вже використовується. Спробуйте інший."
-
-#: twitterauthorization.php:520
-msgid "Error registering user."
-msgstr "Помилка при реєстрації користувача."
-
-#: twitterauthorization.php:531 twitterauthorization.php:571
-#: twitterauthorization.php:591
-msgid "Error connecting user to Twitter."
-msgstr "Помилка при підключенні користувача до Twitter."
-
-#: twitterauthorization.php:553
-msgid "Invalid username or password."
-msgstr "Недійсне ім’я або пароль."
-
-#: twittersettings.php:57
-msgid "Twitter settings"
-msgstr "Налаштування Twitter"
-
-#: twittersettings.php:68
-msgid ""
-"Connect your Twitter account to share your updates with your Twitter friends "
-"and vice-versa."
-msgstr ""
-"Підключіть ваш акаунт Twitter, щоб ділитися новими дописами з друзями в "
-"Twitter і навпаки."
-
-#: twittersettings.php:115
-msgid "Twitter account"
-msgstr "Акаунт Twitter"
-
-#: twittersettings.php:120
-msgid "Connected Twitter account"
-msgstr "Під’єднаний акаунт Twitter"
-
-#: twittersettings.php:125
-msgid "Disconnect my account from Twitter"
-msgstr "Від’єднати мій акаунт від Twitter"
-
-#: twittersettings.php:131
-msgid "Disconnecting your Twitter could make it impossible to log in! Please "
-msgstr ""
-"Якщо ви від’єднаєте свій Twitter, то це унеможливить вхід до системи у "
-"майбутньому! Будь ласка, "
-
-#: twittersettings.php:135
-msgid "set a password"
-msgstr "встановіть пароль"
-
-#: twittersettings.php:137
-msgid " first."
-msgstr " спочатку."
-
-#. TRANS: %1$s is the current website name.
-#: twittersettings.php:141
-#, php-format
-msgid ""
-"Keep your %1$s account but disconnect from Twitter. You can use your %1$s "
-"password to log in."
-msgstr ""
-"Зберегти ваш акаунт %1$s, але від’єднати його від Twitter. Ви можете "
-"використовувати пароль від %1$s для входу на сайт."
-
-#: twittersettings.php:149
-msgid "Disconnect"
-msgstr "Від’єднати"
-
-#: twittersettings.php:156
-msgid "Preferences"
-msgstr "Налаштування"
-
-#: twittersettings.php:160
-msgid "Automatically send my notices to Twitter."
-msgstr "Автоматично пересилати мої дописи на Twitter."
-
-#: twittersettings.php:167
-msgid "Send local \"@\" replies to Twitter."
-msgstr "Надіслати локальні «@» відповіді на Twitter."
-
-#: twittersettings.php:174
-msgid "Subscribe to my Twitter friends here."
-msgstr "Підписатись до моїх друзів з Twitter тут."
-
-#: twittersettings.php:183
-msgid "Import my friends timeline."
-msgstr "Імпортувати стрічку дописів моїх друзів."
-
-#: twittersettings.php:201
-msgid "Add"
-msgstr "Додати"
-
-#: twittersettings.php:235
-msgid "Unexpected form submission."
-msgstr "Несподіване представлення форми."
-
-#: twittersettings.php:250
-msgid "No Twitter connection to remove."
-msgstr "Не виявлено з’єднань з Twitter для видалення."
-
-#: twittersettings.php:258
-msgid "Couldn't remove Twitter user."
-msgstr "Не вдається видалити користувача Twitter."
-
-#: twittersettings.php:262
-msgid "Twitter account disconnected."
-msgstr "Акаунт Twitter від’єднано."
-
-#: twittersettings.php:282 twittersettings.php:293
-msgid "Couldn't save Twitter preferences."
-msgstr "Не можу зберегти налаштування Twitter."
-
-#: twittersettings.php:301
-msgid "Twitter preferences saved."
-msgstr "Налаштування Twitter збережено."
+msgid "RT @%1$s %2$s"
+msgstr "RT @%1$s %2$s"
diff --git a/plugins/TwitterBridge/locale/zh_CN/LC_MESSAGES/TwitterBridge.po b/plugins/TwitterBridge/locale/zh_CN/LC_MESSAGES/TwitterBridge.po
index 5d1a69d7b7..42b013704d 100644
--- a/plugins/TwitterBridge/locale/zh_CN/LC_MESSAGES/TwitterBridge.po
+++ b/plugins/TwitterBridge/locale/zh_CN/LC_MESSAGES/TwitterBridge.po
@@ -10,31 +10,273 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TwitterBridge\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:13+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:27+0000\n"
 "Language-Team: Simplified Chinese <http://translatewiki.net/wiki/Portal:zh-"
 "hans>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-14 17:22:14+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:31+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-twitterbridge\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
-#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: twitterimport.php:114
-#, php-format
-msgid "RT @%1$s %2$s"
-msgstr "RT @%1$s %2$s"
+msgid "Twitter settings"
+msgstr "Twitter 设置"
+
+msgid ""
+"Connect your Twitter account to share your updates with your Twitter friends "
+"and vice-versa."
+msgstr ""
+"关联你的 Twitter 帐号并与你的 Twitter 好友分享你的更新和查看好友的更新。"
+
+msgid "Twitter account"
+msgstr "Twitter 帐号"
+
+msgid "Connected Twitter account"
+msgstr "已关联的 Twitter 帐号"
+
+msgid "Disconnect my account from Twitter"
+msgstr "取消我的帐号与 Twitter 的关联"
+
+msgid "Disconnecting your Twitter could make it impossible to log in! Please "
+msgstr "取消关联你的 Twitter 帐号和能会导致无法登录！请"
+
+msgid "set a password"
+msgstr "设置一个密码"
+
+msgid " first."
+msgstr "先。"
+
+#. TRANS: %1$s is the current website name.
+#, php-format
+msgid ""
+"Keep your %1$s account but disconnect from Twitter. You can use your %1$s "
+"password to log in."
+msgstr "保留你的 %1$s 帐号并取消关联 Twitter。你可以使用你的 %1$s 密码来登录。"
+
+msgid "Disconnect"
+msgstr "取消关联"
+
+msgid "Preferences"
+msgstr "参数设置"
+
+msgid "Automatically send my notices to Twitter."
+msgstr "自动将我的消息发送到 Twitter。"
+
+msgid "Send local \"@\" replies to Twitter."
+msgstr "将本地的“@”回复发送到 Twitter。"
+
+msgid "Subscribe to my Twitter friends here."
+msgstr "关注我在这里的 Twitter 好友。"
+
+msgid "Import my friends timeline."
+msgstr "导入我好友的时间线。"
+
+msgid "Save"
+msgstr "保存"
+
+msgid "Add"
+msgstr "添加"
+
+msgid "There was a problem with your session token. Try again, please."
+msgstr "你的 session token 出现了一个问题，请重试。"
+
+msgid "Unexpected form submission."
+msgstr "未预料的表单提交。"
+
+msgid "No Twitter connection to remove."
+msgstr "没有可以移除的Twitter连接。"
+
+msgid "Couldn't remove Twitter user."
+msgstr "无法删除 Twitter 用户。"
+
+msgid "Twitter account disconnected."
+msgstr "已取消 Twitter 帐号关联。"
+
+msgid "Couldn't save Twitter preferences."
+msgstr "无法保存 Twitter 参数设置。"
+
+msgid "Twitter preferences saved."
+msgstr "已保存 Twitter 参数设置。"
+
+msgid "You can't register if you don't agree to the license."
+msgstr "你必须同意许可协议才能注册。"
+
+msgid "Something weird happened."
+msgstr "发生了很诡异的事情。"
+
+msgid "Couldn't link your Twitter account."
+msgstr "无法连接你的 Twitter 帐号。"
+
+msgid "Couldn't link your Twitter account: oauth_token mismatch."
+msgstr "无法连接你的 Twitter 帐号：oauth_token 不符。"
+
+#, php-format
+msgid ""
+"This is the first time you've logged into %s so we must connect your Twitter "
+"account to a local account. You can either create a new account, or connect "
+"with your existing account, if you have one."
+msgstr ""
+"这是你第一次登录到 %s，我们需要将你的 Twitter 帐号与一个本地的帐号关联。你可"
+"以新建一个帐号，或者使用你在本站已有的帐号。"
+
+msgid "Twitter Account Setup"
+msgstr "Twitter 帐号设置"
+
+msgid "Connection options"
+msgstr "连接选项"
+
+#, php-format
+msgid ""
+"My text and files are available under %s except this private data: password, "
+"email address, IM address, and phone number."
+msgstr ""
+"我的文字和文件在%s下提供，除了如下隐私内容：密码、电子邮件地址、IM 地址和电话"
+"号码。"
+
+msgid "Create new account"
+msgstr "创建新帐户"
+
+msgid "Create a new user with this nickname."
+msgstr "以此昵称创建新帐户"
+
+msgid "New nickname"
+msgstr "新昵称"
+
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+msgstr "1 到 64 个小写字母或数字，不包含标点或空格"
+
+msgid "Create"
+msgstr "创建"
+
+msgid "Connect existing account"
+msgstr "关联现有账号"
+
+msgid ""
+"If you already have an account, login with your username and password to "
+"connect it to your Twitter account."
+msgstr "如果你已有帐号，请输入用户名和密码登录并将其与你的 Twitter 账号关联。"
+
+msgid "Existing nickname"
+msgstr "已存在的昵称"
+
+msgid "Password"
+msgstr "密码"
+
+msgid "Connect"
+msgstr "关联"
+
+msgid "Registration not allowed."
+msgstr "不允许注册。"
+
+msgid "Not a valid invitation code."
+msgstr "无效的邀请码。"
+
+msgid "Nickname not allowed."
+msgstr "昵称不被允许。"
+
+msgid "Nickname already in use. Try another one."
+msgstr "昵称已被使用，换一个吧。"
+
+msgid "Error registering user."
+msgstr "注册用户出错。"
+
+msgid "Error connecting user to Twitter."
+msgstr "关联用户到 Twitter 出错。"
+
+msgid "Invalid username or password."
+msgstr "用户名或密码不正确。"
+
+msgid "Twitter"
+msgstr "Twitter"
+
+msgid "Twitter bridge settings"
+msgstr "Twitter bridge 设置"
+
+msgid "Invalid consumer key. Max length is 255 characters."
+msgstr "无效的 consumer key。最大长度为 255 字符。"
+
+msgid "Invalid consumer secret. Max length is 255 characters."
+msgstr "无效的 consumer secret。最大长度为 255 字符。"
+
+msgid "Twitter application settings"
+msgstr "Twitter 应用设置"
+
+msgid "Consumer key"
+msgstr "Consumer key"
+
+msgid "Consumer key assigned by Twitter"
+msgstr "Twitter 分配的 consumer key"
+
+msgid "Consumer secret"
+msgstr "Consumer secret"
+
+msgid "Consumer secret assigned by Twitter"
+msgstr "Twitter 分配的 consumer secret"
+
+msgid "Note: a global consumer key and secret are set."
+msgstr "注意：已设置了一个全局的 consumer key 和 secret。"
+
+msgid "Integration source"
+msgstr "整合来源"
+
+msgid "Name of your Twitter application"
+msgstr "你的 Twitter 应用名称"
+
+msgid "Options"
+msgstr "选项"
+
+msgid "Enable \"Sign-in with Twitter\""
+msgstr "启用 “使用 Twitter 登录”"
+
+msgid "Allow users to login with their Twitter credentials"
+msgstr "允许用户使用他们的 Twitter 帐号登录。"
+
+msgid "Enable Twitter import"
+msgstr "启用 Twitter 导入"
+
+msgid ""
+"Allow users to import their Twitter friends' timelines. Requires daemons to "
+"be manually configured."
+msgstr "允许用户导入他们 Twitter 好友的时间线。需要手动设置后台进程。"
+
+msgid "Save Twitter settings"
+msgstr "保存 Twitter 设置"
+
+msgid "Login or register using Twitter"
+msgstr "使用 Twitter 登录或注册"
+
+msgid "Twitter integration options"
+msgstr "Twitter 整合选项"
+
+msgid "Twitter bridge configuration"
+msgstr "Twitter bridge 设置"
+
+msgid ""
+"The Twitter \"bridge\" plugin allows integration of a StatusNet instance "
+"with <a href=\"http://twitter.com/\">Twitter</a>."
+msgstr ""
+"Twitter \"bridge\" 是个可以让 StatusNet 账户与 <a href=\"http://twitter.com/"
+"\">Twitter</a> 整合的插件。"
+
+msgid "Already logged in."
+msgstr "已登录。"
+
+msgid "Twitter Login"
+msgstr "Twitter 登录"
+
+msgid "Login with your Twitter account"
+msgstr "使用你的 Twitter 帐号登录"
+
+msgid "Sign in with Twitter"
+msgstr "使用 Twitter 登录"
 
-#: twitter.php:409
 msgid "Your Twitter bridge has been disabled."
 msgstr "你的 Twitter bridge 已被禁用。"
 
-#: twitter.php:413
 #, php-format
 msgid ""
 "Hi, %1$s. We're sorry to inform you that your link to Twitter has been "
@@ -59,331 +301,8 @@ msgstr ""
 "祝好，\n"
 "%3$s"
 
-#: TwitterBridgePlugin.php:151 TwitterBridgePlugin.php:174
-#: TwitterBridgePlugin.php:302 twitteradminpanel.php:52
-msgid "Twitter"
-msgstr "Twitter"
-
-#: TwitterBridgePlugin.php:152
-msgid "Login or register using Twitter"
-msgstr "使用 Twitter 登录或注册"
-
-#: TwitterBridgePlugin.php:175
-msgid "Twitter integration options"
-msgstr "Twitter 整合选项"
-
-#: TwitterBridgePlugin.php:303
-msgid "Twitter bridge configuration"
-msgstr "Twitter bridge 设置"
-
-#: TwitterBridgePlugin.php:327
-msgid ""
-"The Twitter \"bridge\" plugin allows integration of a StatusNet instance "
-"with <a href=\"http://twitter.com/\">Twitter</a>."
-msgstr ""
-"Twitter \"bridge\" 是个可以让 StatusNet 账户与 <a href=\"http://twitter.com/"
-"\">Twitter</a> 整合的插件。"
-
-#: twitteradminpanel.php:62
-msgid "Twitter bridge settings"
-msgstr "Twitter bridge 设置"
-
-#: twitteradminpanel.php:150
-msgid "Invalid consumer key. Max length is 255 characters."
-msgstr "无效的 consumer key。最大长度为 255 字符。"
-
-#: twitteradminpanel.php:156
-msgid "Invalid consumer secret. Max length is 255 characters."
-msgstr "无效的 consumer secret。最大长度为 255 字符。"
-
-#: twitteradminpanel.php:212
-msgid "Twitter application settings"
-msgstr "Twitter 应用设置"
-
-#: twitteradminpanel.php:218
-msgid "Consumer key"
-msgstr "Consumer key"
-
-#: twitteradminpanel.php:219
-msgid "Consumer key assigned by Twitter"
-msgstr "Twitter 分配的 consumer key"
-
-#: twitteradminpanel.php:227
-msgid "Consumer secret"
-msgstr "Consumer secret"
-
-#: twitteradminpanel.php:228
-msgid "Consumer secret assigned by Twitter"
-msgstr "Twitter 分配的 consumer secret"
-
-#: twitteradminpanel.php:238
-msgid "Note: a global consumer key and secret are set."
-msgstr "注意：已设置了一个全局的 consumer key 和 secret。"
-
-#: twitteradminpanel.php:245
-msgid "Integration source"
-msgstr "整合来源"
-
-#: twitteradminpanel.php:246
-msgid "Name of your Twitter application"
-msgstr "你的 Twitter 应用名称"
-
-#: twitteradminpanel.php:258
-msgid "Options"
-msgstr "选项"
-
-#: twitteradminpanel.php:265
-msgid "Enable \"Sign-in with Twitter\""
-msgstr "启用 “使用 Twitter 登录”"
-
-#: twitteradminpanel.php:267
-msgid "Allow users to login with their Twitter credentials"
-msgstr "允许用户使用他们的 Twitter 帐号登录。"
-
-#: twitteradminpanel.php:274
-msgid "Enable Twitter import"
-msgstr "启用 Twitter 导入"
-
-#: twitteradminpanel.php:276
-msgid ""
-"Allow users to import their Twitter friends' timelines. Requires daemons to "
-"be manually configured."
-msgstr "允许用户导入他们 Twitter 好友的时间线。需要手动设置后台进程。"
-
-#: twitteradminpanel.php:293 twittersettings.php:199
-msgid "Save"
-msgstr "保存"
-
-#: twitteradminpanel.php:293
-msgid "Save Twitter settings"
-msgstr "保存 Twitter 设置"
-
-#: twitterlogin.php:56
-msgid "Already logged in."
-msgstr "已登录。"
-
-#: twitterlogin.php:64
-msgid "Twitter Login"
-msgstr "Twitter 登录"
-
-#: twitterlogin.php:69
-msgid "Login with your Twitter account"
-msgstr "使用你的 Twitter 帐号登录"
-
-#: twitterlogin.php:87
-msgid "Sign in with Twitter"
-msgstr "使用 Twitter 登录"
-
-#: twitterauthorization.php:120 twittersettings.php:225
-msgid "There was a problem with your session token. Try again, please."
-msgstr "你的 session token 出现了一个问题，请重试。"
-
-#: twitterauthorization.php:126
-msgid "You can't register if you don't agree to the license."
-msgstr "你必须同意许可协议才能注册。"
-
-#: twitterauthorization.php:135
-msgid "Something weird happened."
-msgstr "发生了很诡异的事情。"
-
-#: twitterauthorization.php:181 twitterauthorization.php:229
-#: twitterauthorization.php:300
-msgid "Couldn't link your Twitter account."
-msgstr "无法连接你的 Twitter 帐号。"
-
-#: twitterauthorization.php:201
-msgid "Couldn't link your Twitter account: oauth_token mismatch."
-msgstr "无法连接你的 Twitter 帐号：oauth_token 不符。"
-
-#: twitterauthorization.php:312
+#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
+#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
 #, php-format
-msgid ""
-"This is the first time you've logged into %s so we must connect your Twitter "
-"account to a local account. You can either create a new account, or connect "
-"with your existing account, if you have one."
-msgstr ""
-"这是你第一次登录到 %s，我们需要将你的 Twitter 帐号与一个本地的帐号关联。你可"
-"以新建一个帐号，或者使用你在本站已有的帐号。"
-
-#: twitterauthorization.php:318
-msgid "Twitter Account Setup"
-msgstr "Twitter 帐号设置"
-
-#: twitterauthorization.php:351
-msgid "Connection options"
-msgstr "连接选项"
-
-#: twitterauthorization.php:360
-#, php-format
-msgid ""
-"My text and files are available under %s except this private data: password, "
-"email address, IM address, and phone number."
-msgstr ""
-"我的文字和文件在%s下提供，除了如下隐私内容：密码、电子邮件地址、IM 地址和电话"
-"号码。"
-
-#: twitterauthorization.php:381
-msgid "Create new account"
-msgstr "创建新帐户"
-
-#: twitterauthorization.php:383
-msgid "Create a new user with this nickname."
-msgstr "以此昵称创建新帐户"
-
-#: twitterauthorization.php:390
-msgid "New nickname"
-msgstr "新昵称"
-
-#: twitterauthorization.php:392
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr "1 到 64 个小写字母或数字，不包含标点或空格"
-
-#: twitterauthorization.php:404
-msgid "Create"
-msgstr "创建"
-
-#: twitterauthorization.php:409
-msgid "Connect existing account"
-msgstr "关联现有账号"
-
-#: twitterauthorization.php:411
-msgid ""
-"If you already have an account, login with your username and password to "
-"connect it to your Twitter account."
-msgstr "如果你已有帐号，请输入用户名和密码登录并将其与你的 Twitter 账号关联。"
-
-#: twitterauthorization.php:414
-msgid "Existing nickname"
-msgstr "已存在的昵称"
-
-#: twitterauthorization.php:417
-msgid "Password"
-msgstr "密码"
-
-#: twitterauthorization.php:420
-msgid "Connect"
-msgstr "关联"
-
-#: twitterauthorization.php:466 twitterauthorization.php:475
-msgid "Registration not allowed."
-msgstr "不允许注册。"
-
-#: twitterauthorization.php:482
-msgid "Not a valid invitation code."
-msgstr "无效的邀请码。"
-
-#: twitterauthorization.php:495
-msgid "Nickname not allowed."
-msgstr "昵称不被允许。"
-
-#: twitterauthorization.php:500
-msgid "Nickname already in use. Try another one."
-msgstr "昵称已被使用，换一个吧。"
-
-#: twitterauthorization.php:520
-msgid "Error registering user."
-msgstr "注册用户出错。"
-
-#: twitterauthorization.php:531 twitterauthorization.php:571
-#: twitterauthorization.php:591
-msgid "Error connecting user to Twitter."
-msgstr "关联用户到 Twitter 出错。"
-
-#: twitterauthorization.php:553
-msgid "Invalid username or password."
-msgstr "用户名或密码不正确。"
-
-#: twittersettings.php:57
-msgid "Twitter settings"
-msgstr "Twitter 设置"
-
-#: twittersettings.php:68
-msgid ""
-"Connect your Twitter account to share your updates with your Twitter friends "
-"and vice-versa."
-msgstr ""
-"关联你的 Twitter 帐号并与你的 Twitter 好友分享你的更新和查看好友的更新。"
-
-#: twittersettings.php:115
-msgid "Twitter account"
-msgstr "Twitter 帐号"
-
-#: twittersettings.php:120
-msgid "Connected Twitter account"
-msgstr "已关联的 Twitter 帐号"
-
-#: twittersettings.php:125
-msgid "Disconnect my account from Twitter"
-msgstr "取消我的帐号与 Twitter 的关联"
-
-#: twittersettings.php:131
-msgid "Disconnecting your Twitter could make it impossible to log in! Please "
-msgstr "取消关联你的 Twitter 帐号和能会导致无法登录！请"
-
-#: twittersettings.php:135
-msgid "set a password"
-msgstr "设置一个密码"
-
-#: twittersettings.php:137
-msgid " first."
-msgstr "先。"
-
-#. TRANS: %1$s is the current website name.
-#: twittersettings.php:141
-#, php-format
-msgid ""
-"Keep your %1$s account but disconnect from Twitter. You can use your %1$s "
-"password to log in."
-msgstr "保留你的 %1$s 帐号并取消关联 Twitter。你可以使用你的 %1$s 密码来登录。"
-
-#: twittersettings.php:149
-msgid "Disconnect"
-msgstr "取消关联"
-
-#: twittersettings.php:156
-msgid "Preferences"
-msgstr "参数设置"
-
-#: twittersettings.php:160
-msgid "Automatically send my notices to Twitter."
-msgstr "自动将我的消息发送到 Twitter。"
-
-#: twittersettings.php:167
-msgid "Send local \"@\" replies to Twitter."
-msgstr "将本地的“@”回复发送到 Twitter。"
-
-#: twittersettings.php:174
-msgid "Subscribe to my Twitter friends here."
-msgstr "关注我在这里的 Twitter 好友。"
-
-#: twittersettings.php:183
-msgid "Import my friends timeline."
-msgstr "导入我好友的时间线。"
-
-#: twittersettings.php:201
-msgid "Add"
-msgstr "添加"
-
-#: twittersettings.php:235
-msgid "Unexpected form submission."
-msgstr "未预料的表单提交。"
-
-#: twittersettings.php:250
-msgid "No Twitter connection to remove."
-msgstr "没有可以移除的Twitter连接。"
-
-#: twittersettings.php:258
-msgid "Couldn't remove Twitter user."
-msgstr "无法删除 Twitter 用户。"
-
-#: twittersettings.php:262
-msgid "Twitter account disconnected."
-msgstr "已取消 Twitter 帐号关联。"
-
-#: twittersettings.php:282 twittersettings.php:293
-msgid "Couldn't save Twitter preferences."
-msgstr "无法保存 Twitter 参数设置。"
-
-#: twittersettings.php:301
-msgid "Twitter preferences saved."
-msgstr "已保存 Twitter 参数设置。"
+msgid "RT @%1$s %2$s"
+msgstr "RT @%1$s %2$s"
diff --git a/plugins/UserFlag/locale/UserFlag.pot b/plugins/UserFlag/locale/UserFlag.pot
index d85e58424f..8930e08c9e 100644
--- a/plugins/UserFlag/locale/UserFlag.pot
+++ b/plugins/UserFlag/locale/UserFlag.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,6 +17,43 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
+#. TRANS: AJAX form title for a flagged profile.
+#: flagprofile.php:125
+msgid "Flagged for review"
+msgstr ""
+
+#. TRANS: Body text for AJAX form when a profile has been flagged for review.
+#. TRANS: Message added to a profile if it has been flagged for review.
+#: flagprofile.php:129 UserFlagPlugin.php:173
+msgid "Flagged"
+msgstr ""
+
+#. TRANS: Plugin description.
+#: UserFlagPlugin.php:294
+msgid ""
+"This plugin allows flagging of profiles for review and reviewing flagged "
+"profiles."
+msgstr ""
+
+#. TRANS: Form title for flagging a profile for review.
+#: flagprofileform.php:78
+msgid "Flag"
+msgstr ""
+
+#. TRANS: Form description.
+#: flagprofileform.php:89
+msgid "Flag profile for review."
+msgstr ""
+
+#. TRANS: Form title for action on a profile.
+#: clearflagform.php:76
+msgid "Clear"
+msgstr ""
+
+#: clearflagform.php:88
+msgid "Clear all flags"
+msgstr ""
+
 #. TRANS: Title for page with a list of profiles that were flagged for review.
 #: adminprofileflag.php:125
 msgid "Flagged profiles"
@@ -44,24 +81,6 @@ msgstr[1] ""
 msgid "Flagged by %s"
 msgstr ""
 
-#. TRANS: AJAX form title for a flagged profile.
-#: flagprofile.php:125
-msgid "Flagged for review"
-msgstr ""
-
-#. TRANS: Body text for AJAX form when a profile has been flagged for review.
-#. TRANS: Message added to a profile if it has been flagged for review.
-#: flagprofile.php:129 UserFlagPlugin.php:173
-msgid "Flagged"
-msgstr ""
-
-#. TRANS: Plugin description.
-#: UserFlagPlugin.php:294
-msgid ""
-"This plugin allows flagging of profiles for review and reviewing flagged "
-"profiles."
-msgstr ""
-
 #. TRANS: Server exception given when flags could not be cleared.
 #: clearflag.php:105
 #, php-format
@@ -78,27 +97,8 @@ msgstr ""
 msgid "Cleared"
 msgstr ""
 
-#. TRANS: Form title for flagging a profile for review.
-#: flagprofileform.php:78
-msgid "Flag"
-msgstr ""
-
-#. TRANS: Form description.
-#: flagprofileform.php:89
-msgid "Flag profile for review."
-msgstr ""
-
 #. TRANS: Server exception.
 #: User_flag_profile.php:160
 #, php-format
 msgid "Couldn't flag profile \"%d\" for review."
 msgstr ""
-
-#. TRANS: Form title for action on a profile.
-#: clearflagform.php:76
-msgid "Clear"
-msgstr ""
-
-#: clearflagform.php:88
-msgid "Clear all flags"
-msgstr ""
diff --git a/plugins/UserFlag/locale/ca/LC_MESSAGES/UserFlag.po b/plugins/UserFlag/locale/ca/LC_MESSAGES/UserFlag.po
index 31061daf79..619f21b422 100644
--- a/plugins/UserFlag/locale/ca/LC_MESSAGES/UserFlag.po
+++ b/plugins/UserFlag/locale/ca/LC_MESSAGES/UserFlag.po
@@ -9,32 +9,61 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - UserFlag\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:15+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:28+0000\n"
 "Language-Team: Catalan <http://translatewiki.net/wiki/Portal:ca>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:15+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:33+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ca\n"
 "X-Message-Group: #out-statusnet-plugin-userflag\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: AJAX form title for a flagged profile.
+msgid "Flagged for review"
+msgstr "Senyalat per revisar"
+
+#. TRANS: Body text for AJAX form when a profile has been flagged for review.
+#. TRANS: Message added to a profile if it has been flagged for review.
+msgid "Flagged"
+msgstr "Senyalat"
+
+#. TRANS: Plugin description.
+msgid ""
+"This plugin allows flagging of profiles for review and reviewing flagged "
+"profiles."
+msgstr ""
+"Aquest connector permet senyalar perfils per revisar i revisar els perfils "
+"senyalats."
+
+#. TRANS: Form title for flagging a profile for review.
+msgid "Flag"
+msgstr "Senyala"
+
+#. TRANS: Form description.
+msgid "Flag profile for review."
+msgstr "Senyala el perfil per revisar."
+
+#. TRANS: Form title for action on a profile.
+msgid "Clear"
+msgstr "Esborra"
+
+msgid "Clear all flags"
+msgstr "Esborra tots els senyals"
+
 #. TRANS: Title for page with a list of profiles that were flagged for review.
-#: adminprofileflag.php:125
 msgid "Flagged profiles"
 msgstr "Perfils senyalats"
 
 #. TRANS: Header for moderation menu with action buttons for flagged profiles (like 'sandbox', 'silence', ...).
-#: adminprofileflag.php:242
 msgid "Moderate"
 msgstr "Modera"
 
 #. TRANS: Message displayed on a profile if it has been flagged.
 #. TRANS: %1$s is a comma separated list of at most 5 user nicknames that flagged.
 #. TRANS: %2$d is a positive integer of additional flagging users. Also used for the plural.
-#: adminprofileflag.php:388
 #, php-format
 msgid "Flagged by %1$s and %2$d other"
 msgid_plural "Flagged by %1$s and %2$d others"
@@ -43,68 +72,24 @@ msgstr[1] "Senyalat per %1$s i %2$d altres"
 
 #. TRANS: Message displayed on a profile if it has been flagged.
 #. TRANS: %s is a comma separated list of at most 5 user nicknames that flagged.
-#: adminprofileflag.php:392
 #, php-format
 msgid "Flagged by %s"
 msgstr "Senyalat per %s"
 
-#. TRANS: AJAX form title for a flagged profile.
-#: flagprofile.php:125
-msgid "Flagged for review"
-msgstr "Senyalat per revisar"
-
-#. TRANS: Body text for AJAX form when a profile has been flagged for review.
-#. TRANS: Message added to a profile if it has been flagged for review.
-#: flagprofile.php:129 UserFlagPlugin.php:173
-msgid "Flagged"
-msgstr "Senyalat"
-
-#. TRANS: Plugin description.
-#: UserFlagPlugin.php:294
-msgid ""
-"This plugin allows flagging of profiles for review and reviewing flagged "
-"profiles."
-msgstr ""
-"Aquest connector permet senyalar perfils per revisar i revisar els perfils "
-"senyalats."
-
 #. TRANS: Server exception given when flags could not be cleared.
-#: clearflag.php:105
 #, php-format
 msgid "Couldn't clear flags for profile \"%s\"."
 msgstr "No s'han pogut esborrar els senyals del perfil «%s»."
 
 #. TRANS: Title for AJAX form to indicated that flags were removed.
-#: clearflag.php:129
 msgid "Flags cleared"
 msgstr "S'han esborrat els senyals"
 
 #. TRANS: Body element for "flags cleared" form.
-#: clearflag.php:133
 msgid "Cleared"
 msgstr "S'ha esborrat"
 
-#. TRANS: Form title for flagging a profile for review.
-#: flagprofileform.php:78
-msgid "Flag"
-msgstr "Senyala"
-
-#. TRANS: Form description.
-#: flagprofileform.php:89
-msgid "Flag profile for review."
-msgstr "Senyala el perfil per revisar."
-
 #. TRANS: Server exception.
-#: User_flag_profile.php:160
 #, php-format
 msgid "Couldn't flag profile \"%d\" for review."
 msgstr "No s'ha pogut senyalar el perfil «%d» per revisar."
-
-#. TRANS: Form title for action on a profile.
-#: clearflagform.php:76
-msgid "Clear"
-msgstr "Esborra"
-
-#: clearflagform.php:88
-msgid "Clear all flags"
-msgstr "Esborra tots els senyals"
diff --git a/plugins/UserFlag/locale/fr/LC_MESSAGES/UserFlag.po b/plugins/UserFlag/locale/fr/LC_MESSAGES/UserFlag.po
index 703364021e..687107ef21 100644
--- a/plugins/UserFlag/locale/fr/LC_MESSAGES/UserFlag.po
+++ b/plugins/UserFlag/locale/fr/LC_MESSAGES/UserFlag.po
@@ -9,32 +9,61 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - UserFlag\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:15+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:28+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:15+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:33+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-userflag\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#. TRANS: AJAX form title for a flagged profile.
+msgid "Flagged for review"
+msgstr "Marqué pour vérification"
+
+#. TRANS: Body text for AJAX form when a profile has been flagged for review.
+#. TRANS: Message added to a profile if it has been flagged for review.
+msgid "Flagged"
+msgstr "Marqué"
+
+#. TRANS: Plugin description.
+msgid ""
+"This plugin allows flagging of profiles for review and reviewing flagged "
+"profiles."
+msgstr ""
+"Cette extension permet de marquer des profils pour vérification et de "
+"vérifier des profils marqués."
+
+#. TRANS: Form title for flagging a profile for review.
+msgid "Flag"
+msgstr "Marquer"
+
+#. TRANS: Form description.
+msgid "Flag profile for review."
+msgstr "Marquer le profil pour vérification."
+
+#. TRANS: Form title for action on a profile.
+msgid "Clear"
+msgstr "Effacer"
+
+msgid "Clear all flags"
+msgstr "Effacer tous les marquages"
+
 #. TRANS: Title for page with a list of profiles that were flagged for review.
-#: adminprofileflag.php:125
 msgid "Flagged profiles"
 msgstr "Profils marqués"
 
 #. TRANS: Header for moderation menu with action buttons for flagged profiles (like 'sandbox', 'silence', ...).
-#: adminprofileflag.php:242
 msgid "Moderate"
 msgstr "Modérer"
 
 #. TRANS: Message displayed on a profile if it has been flagged.
 #. TRANS: %1$s is a comma separated list of at most 5 user nicknames that flagged.
 #. TRANS: %2$d is a positive integer of additional flagging users. Also used for the plural.
-#: adminprofileflag.php:388
 #, php-format
 msgid "Flagged by %1$s and %2$d other"
 msgid_plural "Flagged by %1$s and %2$d others"
@@ -43,68 +72,24 @@ msgstr[1] "Marqué par %1$s et %2$d autres"
 
 #. TRANS: Message displayed on a profile if it has been flagged.
 #. TRANS: %s is a comma separated list of at most 5 user nicknames that flagged.
-#: adminprofileflag.php:392
 #, php-format
 msgid "Flagged by %s"
 msgstr "Marqué par %s"
 
-#. TRANS: AJAX form title for a flagged profile.
-#: flagprofile.php:125
-msgid "Flagged for review"
-msgstr "Marqué pour vérification"
-
-#. TRANS: Body text for AJAX form when a profile has been flagged for review.
-#. TRANS: Message added to a profile if it has been flagged for review.
-#: flagprofile.php:129 UserFlagPlugin.php:173
-msgid "Flagged"
-msgstr "Marqué"
-
-#. TRANS: Plugin description.
-#: UserFlagPlugin.php:294
-msgid ""
-"This plugin allows flagging of profiles for review and reviewing flagged "
-"profiles."
-msgstr ""
-"Cette extension permet de marquer des profils pour vérification et de "
-"vérifier des profils marqués."
-
 #. TRANS: Server exception given when flags could not be cleared.
-#: clearflag.php:105
 #, php-format
 msgid "Couldn't clear flags for profile \"%s\"."
 msgstr "Impossible de supprimer les marquages pour le profil « %s »."
 
 #. TRANS: Title for AJAX form to indicated that flags were removed.
-#: clearflag.php:129
 msgid "Flags cleared"
 msgstr "Marquages supprimés"
 
 #. TRANS: Body element for "flags cleared" form.
-#: clearflag.php:133
 msgid "Cleared"
 msgstr "Effacé"
 
-#. TRANS: Form title for flagging a profile for review.
-#: flagprofileform.php:78
-msgid "Flag"
-msgstr "Marquer"
-
-#. TRANS: Form description.
-#: flagprofileform.php:89
-msgid "Flag profile for review."
-msgstr "Marquer le profil pour vérification."
-
 #. TRANS: Server exception.
-#: User_flag_profile.php:160
 #, php-format
 msgid "Couldn't flag profile \"%d\" for review."
 msgstr "Impossible de marquer le profil « %d » pour vérification."
-
-#. TRANS: Form title for action on a profile.
-#: clearflagform.php:76
-msgid "Clear"
-msgstr "Effacer"
-
-#: clearflagform.php:88
-msgid "Clear all flags"
-msgstr "Effacer tous les marquages"
diff --git a/plugins/UserFlag/locale/ia/LC_MESSAGES/UserFlag.po b/plugins/UserFlag/locale/ia/LC_MESSAGES/UserFlag.po
index 376cf02b05..2c99cd0c51 100644
--- a/plugins/UserFlag/locale/ia/LC_MESSAGES/UserFlag.po
+++ b/plugins/UserFlag/locale/ia/LC_MESSAGES/UserFlag.po
@@ -9,32 +9,60 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - UserFlag\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:15+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:28+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:15+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:33+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-userflag\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: AJAX form title for a flagged profile.
+msgid "Flagged for review"
+msgstr "Marcate pro revision"
+
+#. TRANS: Body text for AJAX form when a profile has been flagged for review.
+#. TRANS: Message added to a profile if it has been flagged for review.
+msgid "Flagged"
+msgstr "Marcate"
+
+#. TRANS: Plugin description.
+msgid ""
+"This plugin allows flagging of profiles for review and reviewing flagged "
+"profiles."
+msgstr ""
+"Iste plugin permitte marcar profilos pro revision e revider profilos marcate."
+
+#. TRANS: Form title for flagging a profile for review.
+msgid "Flag"
+msgstr "Rader tote le marcas"
+
+#. TRANS: Form description.
+msgid "Flag profile for review."
+msgstr "Marcar profilo pro revision."
+
+#. TRANS: Form title for action on a profile.
+msgid "Clear"
+msgstr "Rader"
+
+msgid "Clear all flags"
+msgstr "Rader tote le marcas"
+
 #. TRANS: Title for page with a list of profiles that were flagged for review.
-#: adminprofileflag.php:125
 msgid "Flagged profiles"
 msgstr "Profilos marcate"
 
 #. TRANS: Header for moderation menu with action buttons for flagged profiles (like 'sandbox', 'silence', ...).
-#: adminprofileflag.php:242
 msgid "Moderate"
 msgstr "Moderar"
 
 #. TRANS: Message displayed on a profile if it has been flagged.
 #. TRANS: %1$s is a comma separated list of at most 5 user nicknames that flagged.
 #. TRANS: %2$d is a positive integer of additional flagging users. Also used for the plural.
-#: adminprofileflag.php:388
 #, php-format
 msgid "Flagged by %1$s and %2$d other"
 msgid_plural "Flagged by %1$s and %2$d others"
@@ -43,67 +71,24 @@ msgstr[1] "Marcate per %1$s e %2$d alteres"
 
 #. TRANS: Message displayed on a profile if it has been flagged.
 #. TRANS: %s is a comma separated list of at most 5 user nicknames that flagged.
-#: adminprofileflag.php:392
 #, php-format
 msgid "Flagged by %s"
 msgstr "Marcate per %s"
 
-#. TRANS: AJAX form title for a flagged profile.
-#: flagprofile.php:125
-msgid "Flagged for review"
-msgstr "Marcate pro revision"
-
-#. TRANS: Body text for AJAX form when a profile has been flagged for review.
-#. TRANS: Message added to a profile if it has been flagged for review.
-#: flagprofile.php:129 UserFlagPlugin.php:173
-msgid "Flagged"
-msgstr "Marcate"
-
-#. TRANS: Plugin description.
-#: UserFlagPlugin.php:294
-msgid ""
-"This plugin allows flagging of profiles for review and reviewing flagged "
-"profiles."
-msgstr ""
-"Iste plugin permitte marcar profilos pro revision e revider profilos marcate."
-
 #. TRANS: Server exception given when flags could not be cleared.
-#: clearflag.php:105
 #, php-format
 msgid "Couldn't clear flags for profile \"%s\"."
 msgstr "Non poteva rader marcas pro profilo \"%s\"."
 
 #. TRANS: Title for AJAX form to indicated that flags were removed.
-#: clearflag.php:129
 msgid "Flags cleared"
 msgstr "Marcas radite"
 
 #. TRANS: Body element for "flags cleared" form.
-#: clearflag.php:133
 msgid "Cleared"
 msgstr "Radite"
 
-#. TRANS: Form title for flagging a profile for review.
-#: flagprofileform.php:78
-msgid "Flag"
-msgstr "Rader tote le marcas"
-
-#. TRANS: Form description.
-#: flagprofileform.php:89
-msgid "Flag profile for review."
-msgstr "Marcar profilo pro revision."
-
 #. TRANS: Server exception.
-#: User_flag_profile.php:160
 #, php-format
 msgid "Couldn't flag profile \"%d\" for review."
 msgstr "Non poteva marcar profilo \"%d\" pro revision."
-
-#. TRANS: Form title for action on a profile.
-#: clearflagform.php:76
-msgid "Clear"
-msgstr "Rader"
-
-#: clearflagform.php:88
-msgid "Clear all flags"
-msgstr "Rader tote le marcas"
diff --git a/plugins/UserFlag/locale/mk/LC_MESSAGES/UserFlag.po b/plugins/UserFlag/locale/mk/LC_MESSAGES/UserFlag.po
index 204b755c3b..61f7551496 100644
--- a/plugins/UserFlag/locale/mk/LC_MESSAGES/UserFlag.po
+++ b/plugins/UserFlag/locale/mk/LC_MESSAGES/UserFlag.po
@@ -9,32 +9,61 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - UserFlag\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:15+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:28+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:15+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:33+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-userflag\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
 
+#. TRANS: AJAX form title for a flagged profile.
+msgid "Flagged for review"
+msgstr "Означено за преглед"
+
+#. TRANS: Body text for AJAX form when a profile has been flagged for review.
+#. TRANS: Message added to a profile if it has been flagged for review.
+msgid "Flagged"
+msgstr "Означено"
+
+#. TRANS: Plugin description.
+msgid ""
+"This plugin allows flagging of profiles for review and reviewing flagged "
+"profiles."
+msgstr ""
+"Овој приклучок овозможува означување на профили за преглед и прегледување на "
+"означени профили."
+
+#. TRANS: Form title for flagging a profile for review.
+msgid "Flag"
+msgstr "Означи"
+
+#. TRANS: Form description.
+msgid "Flag profile for review."
+msgstr "Означи профил за преглед."
+
+#. TRANS: Form title for action on a profile.
+msgid "Clear"
+msgstr "Отстрани"
+
+msgid "Clear all flags"
+msgstr "Отстрани ги сите ознаки"
+
 #. TRANS: Title for page with a list of profiles that were flagged for review.
-#: adminprofileflag.php:125
 msgid "Flagged profiles"
 msgstr "Означени профили"
 
 #. TRANS: Header for moderation menu with action buttons for flagged profiles (like 'sandbox', 'silence', ...).
-#: adminprofileflag.php:242
 msgid "Moderate"
 msgstr "Модерирај"
 
 #. TRANS: Message displayed on a profile if it has been flagged.
 #. TRANS: %1$s is a comma separated list of at most 5 user nicknames that flagged.
 #. TRANS: %2$d is a positive integer of additional flagging users. Also used for the plural.
-#: adminprofileflag.php:388
 #, php-format
 msgid "Flagged by %1$s and %2$d other"
 msgid_plural "Flagged by %1$s and %2$d others"
@@ -43,68 +72,24 @@ msgstr[1] "Означено од %1$s и уште %2$d други"
 
 #. TRANS: Message displayed on a profile if it has been flagged.
 #. TRANS: %s is a comma separated list of at most 5 user nicknames that flagged.
-#: adminprofileflag.php:392
 #, php-format
 msgid "Flagged by %s"
 msgstr "Означено од %s"
 
-#. TRANS: AJAX form title for a flagged profile.
-#: flagprofile.php:125
-msgid "Flagged for review"
-msgstr "Означено за преглед"
-
-#. TRANS: Body text for AJAX form when a profile has been flagged for review.
-#. TRANS: Message added to a profile if it has been flagged for review.
-#: flagprofile.php:129 UserFlagPlugin.php:173
-msgid "Flagged"
-msgstr "Означено"
-
-#. TRANS: Plugin description.
-#: UserFlagPlugin.php:294
-msgid ""
-"This plugin allows flagging of profiles for review and reviewing flagged "
-"profiles."
-msgstr ""
-"Овој приклучок овозможува означување на профили за преглед и прегледување на "
-"означени профили."
-
 #. TRANS: Server exception given when flags could not be cleared.
-#: clearflag.php:105
 #, php-format
 msgid "Couldn't clear flags for profile \"%s\"."
 msgstr "Не можев да ги отстранам ознаките за профилот „%s“."
 
 #. TRANS: Title for AJAX form to indicated that flags were removed.
-#: clearflag.php:129
 msgid "Flags cleared"
 msgstr "Ознаките се отстранети"
 
 #. TRANS: Body element for "flags cleared" form.
-#: clearflag.php:133
 msgid "Cleared"
 msgstr "Отстрането"
 
-#. TRANS: Form title for flagging a profile for review.
-#: flagprofileform.php:78
-msgid "Flag"
-msgstr "Означи"
-
-#. TRANS: Form description.
-#: flagprofileform.php:89
-msgid "Flag profile for review."
-msgstr "Означи профил за преглед."
-
 #. TRANS: Server exception.
-#: User_flag_profile.php:160
 #, php-format
 msgid "Couldn't flag profile \"%d\" for review."
 msgstr "Не можев да го означам профилот „%d“ за преглед."
-
-#. TRANS: Form title for action on a profile.
-#: clearflagform.php:76
-msgid "Clear"
-msgstr "Отстрани"
-
-#: clearflagform.php:88
-msgid "Clear all flags"
-msgstr "Отстрани ги сите ознаки"
diff --git a/plugins/UserFlag/locale/nl/LC_MESSAGES/UserFlag.po b/plugins/UserFlag/locale/nl/LC_MESSAGES/UserFlag.po
index 0e791fc2b2..f4de243364 100644
--- a/plugins/UserFlag/locale/nl/LC_MESSAGES/UserFlag.po
+++ b/plugins/UserFlag/locale/nl/LC_MESSAGES/UserFlag.po
@@ -9,32 +9,61 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - UserFlag\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:15+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:29+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:15+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:33+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-userflag\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: AJAX form title for a flagged profile.
+msgid "Flagged for review"
+msgstr "Gemarkeerd voor controle"
+
+#. TRANS: Body text for AJAX form when a profile has been flagged for review.
+#. TRANS: Message added to a profile if it has been flagged for review.
+msgid "Flagged"
+msgstr "Gemarkeerd"
+
+#. TRANS: Plugin description.
+msgid ""
+"This plugin allows flagging of profiles for review and reviewing flagged "
+"profiles."
+msgstr ""
+"Deze plugin maakt het markeren van profielen voor controle mogelijk en de "
+"controle van gemarkeerde profielen."
+
+#. TRANS: Form title for flagging a profile for review.
+msgid "Flag"
+msgstr "Markeren"
+
+#. TRANS: Form description.
+msgid "Flag profile for review."
+msgstr "Profiel voor controle markeren"
+
+#. TRANS: Form title for action on a profile.
+msgid "Clear"
+msgstr "Wissen"
+
+msgid "Clear all flags"
+msgstr "Alle markeringen wissen"
+
 #. TRANS: Title for page with a list of profiles that were flagged for review.
-#: adminprofileflag.php:125
 msgid "Flagged profiles"
 msgstr "Gemarkeerde profielen"
 
 #. TRANS: Header for moderation menu with action buttons for flagged profiles (like 'sandbox', 'silence', ...).
-#: adminprofileflag.php:242
 msgid "Moderate"
 msgstr "Modereren"
 
 #. TRANS: Message displayed on a profile if it has been flagged.
 #. TRANS: %1$s is a comma separated list of at most 5 user nicknames that flagged.
 #. TRANS: %2$d is a positive integer of additional flagging users. Also used for the plural.
-#: adminprofileflag.php:388
 #, php-format
 msgid "Flagged by %1$s and %2$d other"
 msgid_plural "Flagged by %1$s and %2$d others"
@@ -43,69 +72,25 @@ msgstr[1] "Gemarkeerd door %1$s en %2$d anderen"
 
 #. TRANS: Message displayed on a profile if it has been flagged.
 #. TRANS: %s is a comma separated list of at most 5 user nicknames that flagged.
-#: adminprofileflag.php:392
 #, php-format
 msgid "Flagged by %s"
 msgstr "Gemarkeerd door %s"
 
-#. TRANS: AJAX form title for a flagged profile.
-#: flagprofile.php:125
-msgid "Flagged for review"
-msgstr "Gemarkeerd voor controle"
-
-#. TRANS: Body text for AJAX form when a profile has been flagged for review.
-#. TRANS: Message added to a profile if it has been flagged for review.
-#: flagprofile.php:129 UserFlagPlugin.php:173
-msgid "Flagged"
-msgstr "Gemarkeerd"
-
-#. TRANS: Plugin description.
-#: UserFlagPlugin.php:294
-msgid ""
-"This plugin allows flagging of profiles for review and reviewing flagged "
-"profiles."
-msgstr ""
-"Deze plugin maakt het markeren van profielen voor controle mogelijk en de "
-"controle van gemarkeerde profielen."
-
 #. TRANS: Server exception given when flags could not be cleared.
-#: clearflag.php:105
 #, php-format
 msgid "Couldn't clear flags for profile \"%s\"."
 msgstr ""
 "Het was niet mogelijk de markeringen van het profiel \"%s\" te verwijderen."
 
 #. TRANS: Title for AJAX form to indicated that flags were removed.
-#: clearflag.php:129
 msgid "Flags cleared"
 msgstr "Markeringen verwijderd"
 
 #. TRANS: Body element for "flags cleared" form.
-#: clearflag.php:133
 msgid "Cleared"
 msgstr "Verwijderd"
 
-#. TRANS: Form title for flagging a profile for review.
-#: flagprofileform.php:78
-msgid "Flag"
-msgstr "Markeren"
-
-#. TRANS: Form description.
-#: flagprofileform.php:89
-msgid "Flag profile for review."
-msgstr "Profiel voor controle markeren"
-
 #. TRANS: Server exception.
-#: User_flag_profile.php:160
 #, php-format
 msgid "Couldn't flag profile \"%d\" for review."
 msgstr "Het was niet mogelijk het profiel \"%d\" voor controle te markeren."
-
-#. TRANS: Form title for action on a profile.
-#: clearflagform.php:76
-msgid "Clear"
-msgstr "Wissen"
-
-#: clearflagform.php:88
-msgid "Clear all flags"
-msgstr "Alle markeringen wissen"
diff --git a/plugins/UserFlag/locale/pt/LC_MESSAGES/UserFlag.po b/plugins/UserFlag/locale/pt/LC_MESSAGES/UserFlag.po
index b85c2aefd1..0b905240c6 100644
--- a/plugins/UserFlag/locale/pt/LC_MESSAGES/UserFlag.po
+++ b/plugins/UserFlag/locale/pt/LC_MESSAGES/UserFlag.po
@@ -9,32 +9,61 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - UserFlag\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:15+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:29+0000\n"
 "Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:15+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:33+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-plugin-userflag\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: AJAX form title for a flagged profile.
+msgid "Flagged for review"
+msgstr "Sinalizado para análise"
+
+#. TRANS: Body text for AJAX form when a profile has been flagged for review.
+#. TRANS: Message added to a profile if it has been flagged for review.
+msgid "Flagged"
+msgstr "Sinalizado"
+
+#. TRANS: Plugin description.
+msgid ""
+"This plugin allows flagging of profiles for review and reviewing flagged "
+"profiles."
+msgstr ""
+"Este plugin permite sinalizar perfis para análise e analisar perfis "
+"sinalizados."
+
+#. TRANS: Form title for flagging a profile for review.
+msgid "Flag"
+msgstr "Sinalização"
+
+#. TRANS: Form description.
+msgid "Flag profile for review."
+msgstr "Sinalizar perfil para análise."
+
+#. TRANS: Form title for action on a profile.
+msgid "Clear"
+msgstr "Limpar"
+
+msgid "Clear all flags"
+msgstr "Limpar todas as sinalizações"
+
 #. TRANS: Title for page with a list of profiles that were flagged for review.
-#: adminprofileflag.php:125
 msgid "Flagged profiles"
 msgstr "Perfis sinalizados"
 
 #. TRANS: Header for moderation menu with action buttons for flagged profiles (like 'sandbox', 'silence', ...).
-#: adminprofileflag.php:242
 msgid "Moderate"
 msgstr "Moderar"
 
 #. TRANS: Message displayed on a profile if it has been flagged.
 #. TRANS: %1$s is a comma separated list of at most 5 user nicknames that flagged.
 #. TRANS: %2$d is a positive integer of additional flagging users. Also used for the plural.
-#: adminprofileflag.php:388
 #, php-format
 msgid "Flagged by %1$s and %2$d other"
 msgid_plural "Flagged by %1$s and %2$d others"
@@ -43,68 +72,24 @@ msgstr[1] "Sinalizado por %1$s e mais %2$d pessoas"
 
 #. TRANS: Message displayed on a profile if it has been flagged.
 #. TRANS: %s is a comma separated list of at most 5 user nicknames that flagged.
-#: adminprofileflag.php:392
 #, php-format
 msgid "Flagged by %s"
 msgstr "Sinalizado por %s"
 
-#. TRANS: AJAX form title for a flagged profile.
-#: flagprofile.php:125
-msgid "Flagged for review"
-msgstr "Sinalizado para análise"
-
-#. TRANS: Body text for AJAX form when a profile has been flagged for review.
-#. TRANS: Message added to a profile if it has been flagged for review.
-#: flagprofile.php:129 UserFlagPlugin.php:173
-msgid "Flagged"
-msgstr "Sinalizado"
-
-#. TRANS: Plugin description.
-#: UserFlagPlugin.php:294
-msgid ""
-"This plugin allows flagging of profiles for review and reviewing flagged "
-"profiles."
-msgstr ""
-"Este plugin permite sinalizar perfis para análise e analisar perfis "
-"sinalizados."
-
 #. TRANS: Server exception given when flags could not be cleared.
-#: clearflag.php:105
 #, php-format
 msgid "Couldn't clear flags for profile \"%s\"."
 msgstr "Não foi possível limpar as sinalizações do perfil \"%s\"."
 
 #. TRANS: Title for AJAX form to indicated that flags were removed.
-#: clearflag.php:129
 msgid "Flags cleared"
 msgstr "Sinalizações limpas"
 
 #. TRANS: Body element for "flags cleared" form.
-#: clearflag.php:133
 msgid "Cleared"
 msgstr "Limpas"
 
-#. TRANS: Form title for flagging a profile for review.
-#: flagprofileform.php:78
-msgid "Flag"
-msgstr "Sinalização"
-
-#. TRANS: Form description.
-#: flagprofileform.php:89
-msgid "Flag profile for review."
-msgstr "Sinalizar perfil para análise."
-
 #. TRANS: Server exception.
-#: User_flag_profile.php:160
 #, php-format
 msgid "Couldn't flag profile \"%d\" for review."
 msgstr "Não foi possível sinalizar o perfil \"%d\" para análise."
-
-#. TRANS: Form title for action on a profile.
-#: clearflagform.php:76
-msgid "Clear"
-msgstr "Limpar"
-
-#: clearflagform.php:88
-msgid "Clear all flags"
-msgstr "Limpar todas as sinalizações"
diff --git a/plugins/UserFlag/locale/ru/LC_MESSAGES/UserFlag.po b/plugins/UserFlag/locale/ru/LC_MESSAGES/UserFlag.po
index 299d3b6d81..e31e63b51e 100644
--- a/plugins/UserFlag/locale/ru/LC_MESSAGES/UserFlag.po
+++ b/plugins/UserFlag/locale/ru/LC_MESSAGES/UserFlag.po
@@ -9,33 +9,62 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - UserFlag\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:15+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:29+0000\n"
 "Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:15+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:33+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-userflag\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
+#. TRANS: AJAX form title for a flagged profile.
+msgid "Flagged for review"
+msgstr "Помечен для просмотра"
+
+#. TRANS: Body text for AJAX form when a profile has been flagged for review.
+#. TRANS: Message added to a profile if it has been flagged for review.
+msgid "Flagged"
+msgstr "Отмеченные"
+
+#. TRANS: Plugin description.
+msgid ""
+"This plugin allows flagging of profiles for review and reviewing flagged "
+"profiles."
+msgstr ""
+"Этот плагин позволяет отмечать профили для осмотра и просматривать "
+"отмеченные профили."
+
+#. TRANS: Form title for flagging a profile for review.
+msgid "Flag"
+msgstr "Отметить"
+
+#. TRANS: Form description.
+msgid "Flag profile for review."
+msgstr "Профиль помечен для просмотра"
+
+#. TRANS: Form title for action on a profile.
+msgid "Clear"
+msgstr "Очистить"
+
+msgid "Clear all flags"
+msgstr "Очистить все флаги"
+
 #. TRANS: Title for page with a list of profiles that were flagged for review.
-#: adminprofileflag.php:125
 msgid "Flagged profiles"
 msgstr "Отмеченные профили"
 
 #. TRANS: Header for moderation menu with action buttons for flagged profiles (like 'sandbox', 'silence', ...).
-#: adminprofileflag.php:242
 msgid "Moderate"
 msgstr "Модерировать"
 
 #. TRANS: Message displayed on a profile if it has been flagged.
 #. TRANS: %1$s is a comma separated list of at most 5 user nicknames that flagged.
 #. TRANS: %2$d is a positive integer of additional flagging users. Also used for the plural.
-#: adminprofileflag.php:388
 #, php-format
 msgid "Flagged by %1$s and %2$d other"
 msgid_plural "Flagged by %1$s and %2$d others"
@@ -45,68 +74,24 @@ msgstr[2] ""
 
 #. TRANS: Message displayed on a profile if it has been flagged.
 #. TRANS: %s is a comma separated list of at most 5 user nicknames that flagged.
-#: adminprofileflag.php:392
 #, php-format
 msgid "Flagged by %s"
 msgstr "Отмечено %s"
 
-#. TRANS: AJAX form title for a flagged profile.
-#: flagprofile.php:125
-msgid "Flagged for review"
-msgstr "Помечен для просмотра"
-
-#. TRANS: Body text for AJAX form when a profile has been flagged for review.
-#. TRANS: Message added to a profile if it has been flagged for review.
-#: flagprofile.php:129 UserFlagPlugin.php:173
-msgid "Flagged"
-msgstr "Отмеченные"
-
-#. TRANS: Plugin description.
-#: UserFlagPlugin.php:294
-msgid ""
-"This plugin allows flagging of profiles for review and reviewing flagged "
-"profiles."
-msgstr ""
-"Этот плагин позволяет отмечать профили для осмотра и просматривать "
-"отмеченные профили."
-
 #. TRANS: Server exception given when flags could not be cleared.
-#: clearflag.php:105
 #, php-format
 msgid "Couldn't clear flags for profile \"%s\"."
 msgstr "Не снимать отметки для профиля %s"
 
 #. TRANS: Title for AJAX form to indicated that flags were removed.
-#: clearflag.php:129
 msgid "Flags cleared"
 msgstr "Отметки сняты"
 
 #. TRANS: Body element for "flags cleared" form.
-#: clearflag.php:133
 msgid "Cleared"
 msgstr "Снято"
 
-#. TRANS: Form title for flagging a profile for review.
-#: flagprofileform.php:78
-msgid "Flag"
-msgstr "Отметить"
-
-#. TRANS: Form description.
-#: flagprofileform.php:89
-msgid "Flag profile for review."
-msgstr "Профиль помечен для просмотра"
-
 #. TRANS: Server exception.
-#: User_flag_profile.php:160
 #, php-format
 msgid "Couldn't flag profile \"%d\" for review."
 msgstr "Невозможно отметить профиль %d для просмотра."
-
-#. TRANS: Form title for action on a profile.
-#: clearflagform.php:76
-msgid "Clear"
-msgstr "Очистить"
-
-#: clearflagform.php:88
-msgid "Clear all flags"
-msgstr "Очистить все флаги"
diff --git a/plugins/UserFlag/locale/uk/LC_MESSAGES/UserFlag.po b/plugins/UserFlag/locale/uk/LC_MESSAGES/UserFlag.po
index d17c6ff308..2317e0415e 100644
--- a/plugins/UserFlag/locale/uk/LC_MESSAGES/UserFlag.po
+++ b/plugins/UserFlag/locale/uk/LC_MESSAGES/UserFlag.po
@@ -9,33 +9,62 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - UserFlag\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:15+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:29+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:15+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:33+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-userflag\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
+#. TRANS: AJAX form title for a flagged profile.
+msgid "Flagged for review"
+msgstr "Відмічені для розгляду"
+
+#. TRANS: Body text for AJAX form when a profile has been flagged for review.
+#. TRANS: Message added to a profile if it has been flagged for review.
+msgid "Flagged"
+msgstr "Відмічені"
+
+#. TRANS: Plugin description.
+msgid ""
+"This plugin allows flagging of profiles for review and reviewing flagged "
+"profiles."
+msgstr ""
+"Цей додаток дозволяє відмічати профілі користувачів для подальшого розгляду "
+"та аналізу відмічених профілів."
+
+#. TRANS: Form title for flagging a profile for review.
+msgid "Flag"
+msgstr "Відмітити"
+
+#. TRANS: Form description.
+msgid "Flag profile for review."
+msgstr "Відмітити профіль для розгляду."
+
+#. TRANS: Form title for action on a profile.
+msgid "Clear"
+msgstr "Зняти"
+
+msgid "Clear all flags"
+msgstr "Зняти всі позначки"
+
 #. TRANS: Title for page with a list of profiles that were flagged for review.
-#: adminprofileflag.php:125
 msgid "Flagged profiles"
 msgstr "Відмічені профілі"
 
 #. TRANS: Header for moderation menu with action buttons for flagged profiles (like 'sandbox', 'silence', ...).
-#: adminprofileflag.php:242
 msgid "Moderate"
 msgstr "Модерувати"
 
 #. TRANS: Message displayed on a profile if it has been flagged.
 #. TRANS: %1$s is a comma separated list of at most 5 user nicknames that flagged.
 #. TRANS: %2$d is a positive integer of additional flagging users. Also used for the plural.
-#: adminprofileflag.php:388
 #, php-format
 msgid "Flagged by %1$s and %2$d other"
 msgid_plural "Flagged by %1$s and %2$d others"
@@ -45,68 +74,24 @@ msgstr[2] "Відмічено %1$s та ще %2$d користувачами"
 
 #. TRANS: Message displayed on a profile if it has been flagged.
 #. TRANS: %s is a comma separated list of at most 5 user nicknames that flagged.
-#: adminprofileflag.php:392
 #, php-format
 msgid "Flagged by %s"
 msgstr "Відмічено %s"
 
-#. TRANS: AJAX form title for a flagged profile.
-#: flagprofile.php:125
-msgid "Flagged for review"
-msgstr "Відмічені для розгляду"
-
-#. TRANS: Body text for AJAX form when a profile has been flagged for review.
-#. TRANS: Message added to a profile if it has been flagged for review.
-#: flagprofile.php:129 UserFlagPlugin.php:173
-msgid "Flagged"
-msgstr "Відмічені"
-
-#. TRANS: Plugin description.
-#: UserFlagPlugin.php:294
-msgid ""
-"This plugin allows flagging of profiles for review and reviewing flagged "
-"profiles."
-msgstr ""
-"Цей додаток дозволяє відмічати профілі користувачів для подальшого розгляду "
-"та аналізу відмічених профілів."
-
 #. TRANS: Server exception given when flags could not be cleared.
-#: clearflag.php:105
 #, php-format
 msgid "Couldn't clear flags for profile \"%s\"."
 msgstr "Не можу зняти позначки для профілю «%s»."
 
 #. TRANS: Title for AJAX form to indicated that flags were removed.
-#: clearflag.php:129
 msgid "Flags cleared"
 msgstr "Позначки знято"
 
 #. TRANS: Body element for "flags cleared" form.
-#: clearflag.php:133
 msgid "Cleared"
 msgstr "Знято"
 
-#. TRANS: Form title for flagging a profile for review.
-#: flagprofileform.php:78
-msgid "Flag"
-msgstr "Відмітити"
-
-#. TRANS: Form description.
-#: flagprofileform.php:89
-msgid "Flag profile for review."
-msgstr "Відмітити профіль для розгляду."
-
 #. TRANS: Server exception.
-#: User_flag_profile.php:160
 #, php-format
 msgid "Couldn't flag profile \"%d\" for review."
 msgstr "Не вдалося відмітити профіль «%d» для розгляду."
-
-#. TRANS: Form title for action on a profile.
-#: clearflagform.php:76
-msgid "Clear"
-msgstr "Зняти"
-
-#: clearflagform.php:88
-msgid "Clear all flags"
-msgstr "Зняти всі позначки"
diff --git a/plugins/UserLimit/locale/UserLimit.pot b/plugins/UserLimit/locale/UserLimit.pot
index e716e93ba9..d332dadd44 100644
--- a/plugins/UserLimit/locale/UserLimit.pot
+++ b/plugins/UserLimit/locale/UserLimit.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/UserLimit/locale/br/LC_MESSAGES/UserLimit.po b/plugins/UserLimit/locale/br/LC_MESSAGES/UserLimit.po
index 658dbf4b8f..bad734cb26 100644
--- a/plugins/UserLimit/locale/br/LC_MESSAGES/UserLimit.po
+++ b/plugins/UserLimit/locale/br/LC_MESSAGES/UserLimit.po
@@ -9,18 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - UserLimit\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:15+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:29+0000\n"
 "Language-Team: Breton <http://translatewiki.net/wiki/Portal:br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:16+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:36+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-userlimit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: UserLimitPlugin.php:89
 msgid "Limit the number of users who can register."
 msgstr "Bevenniñ an niver a implijerien a c'hall en em enskrivañ"
diff --git a/plugins/UserLimit/locale/de/LC_MESSAGES/UserLimit.po b/plugins/UserLimit/locale/de/LC_MESSAGES/UserLimit.po
index cbc3cc0baf..5f81e779d2 100644
--- a/plugins/UserLimit/locale/de/LC_MESSAGES/UserLimit.po
+++ b/plugins/UserLimit/locale/de/LC_MESSAGES/UserLimit.po
@@ -9,18 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - UserLimit\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:15+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:29+0000\n"
 "Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:16+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:36+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-userlimit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: UserLimitPlugin.php:89
 msgid "Limit the number of users who can register."
 msgstr "Beschränkung der Anzahl von Benutzern, die sich registrieren können."
diff --git a/plugins/UserLimit/locale/es/LC_MESSAGES/UserLimit.po b/plugins/UserLimit/locale/es/LC_MESSAGES/UserLimit.po
index 1cf72b60c9..0015fef2d3 100644
--- a/plugins/UserLimit/locale/es/LC_MESSAGES/UserLimit.po
+++ b/plugins/UserLimit/locale/es/LC_MESSAGES/UserLimit.po
@@ -9,18 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - UserLimit\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:15+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:29+0000\n"
 "Language-Team: Spanish <http://translatewiki.net/wiki/Portal:es>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:16+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:36+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-userlimit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: UserLimitPlugin.php:89
 msgid "Limit the number of users who can register."
 msgstr "Limitarla cantidad de usuarios que pueden registrarse."
diff --git a/plugins/UserLimit/locale/fi/LC_MESSAGES/UserLimit.po b/plugins/UserLimit/locale/fi/LC_MESSAGES/UserLimit.po
index d8eabfc7ce..798b021483 100644
--- a/plugins/UserLimit/locale/fi/LC_MESSAGES/UserLimit.po
+++ b/plugins/UserLimit/locale/fi/LC_MESSAGES/UserLimit.po
@@ -9,18 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - UserLimit\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:15+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:29+0000\n"
 "Language-Team: Finnish <http://translatewiki.net/wiki/Portal:fi>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:16+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:36+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fi\n"
 "X-Message-Group: #out-statusnet-plugin-userlimit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: UserLimitPlugin.php:89
 msgid "Limit the number of users who can register."
 msgstr "Rajoita niiden käyttäjien lukumäärää, jotka voivat rekisteröityä."
diff --git a/plugins/UserLimit/locale/fr/LC_MESSAGES/UserLimit.po b/plugins/UserLimit/locale/fr/LC_MESSAGES/UserLimit.po
index a7b4eb8d1c..466a691087 100644
--- a/plugins/UserLimit/locale/fr/LC_MESSAGES/UserLimit.po
+++ b/plugins/UserLimit/locale/fr/LC_MESSAGES/UserLimit.po
@@ -9,18 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - UserLimit\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:15+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:29+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:16+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:36+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-userlimit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: UserLimitPlugin.php:89
 msgid "Limit the number of users who can register."
 msgstr "Limiter le nombre d’utilisateurs qui peuvent s’inscrire."
diff --git a/plugins/UserLimit/locale/gl/LC_MESSAGES/UserLimit.po b/plugins/UserLimit/locale/gl/LC_MESSAGES/UserLimit.po
index e36479a1e1..eac95726d2 100644
--- a/plugins/UserLimit/locale/gl/LC_MESSAGES/UserLimit.po
+++ b/plugins/UserLimit/locale/gl/LC_MESSAGES/UserLimit.po
@@ -9,18 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - UserLimit\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:15+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:29+0000\n"
 "Language-Team: Galician <http://translatewiki.net/wiki/Portal:gl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:16+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:36+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: gl\n"
 "X-Message-Group: #out-statusnet-plugin-userlimit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: UserLimitPlugin.php:89
 msgid "Limit the number of users who can register."
 msgstr "Limitar o número de usuarios que se poden rexistrar."
diff --git a/plugins/UserLimit/locale/he/LC_MESSAGES/UserLimit.po b/plugins/UserLimit/locale/he/LC_MESSAGES/UserLimit.po
index d14e614e16..bb173c609f 100644
--- a/plugins/UserLimit/locale/he/LC_MESSAGES/UserLimit.po
+++ b/plugins/UserLimit/locale/he/LC_MESSAGES/UserLimit.po
@@ -9,18 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - UserLimit\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:15+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:29+0000\n"
 "Language-Team: Hebrew <http://translatewiki.net/wiki/Portal:he>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:16+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:36+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-plugin-userlimit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: UserLimitPlugin.php:89
 msgid "Limit the number of users who can register."
 msgstr "הגבלת מספר המשתמשים שיכולים להירשם."
diff --git a/plugins/UserLimit/locale/ia/LC_MESSAGES/UserLimit.po b/plugins/UserLimit/locale/ia/LC_MESSAGES/UserLimit.po
index e6eebc8d39..2acc420d35 100644
--- a/plugins/UserLimit/locale/ia/LC_MESSAGES/UserLimit.po
+++ b/plugins/UserLimit/locale/ia/LC_MESSAGES/UserLimit.po
@@ -9,18 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - UserLimit\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:15+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:29+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:16+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:36+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-userlimit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: UserLimitPlugin.php:89
 msgid "Limit the number of users who can register."
 msgstr "Limitar le numero de usatores que pote registrar se."
diff --git a/plugins/UserLimit/locale/id/LC_MESSAGES/UserLimit.po b/plugins/UserLimit/locale/id/LC_MESSAGES/UserLimit.po
index 269f7edfd6..f87043f34a 100644
--- a/plugins/UserLimit/locale/id/LC_MESSAGES/UserLimit.po
+++ b/plugins/UserLimit/locale/id/LC_MESSAGES/UserLimit.po
@@ -9,18 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - UserLimit\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:15+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:29+0000\n"
 "Language-Team: Indonesian <http://translatewiki.net/wiki/Portal:id>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:16+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:36+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: id\n"
 "X-Message-Group: #out-statusnet-plugin-userlimit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: UserLimitPlugin.php:89
 msgid "Limit the number of users who can register."
 msgstr "Batasi jumlah pengguna yang boleh mendaftar."
diff --git a/plugins/UserLimit/locale/lb/LC_MESSAGES/UserLimit.po b/plugins/UserLimit/locale/lb/LC_MESSAGES/UserLimit.po
index f89c8932ae..6929416512 100644
--- a/plugins/UserLimit/locale/lb/LC_MESSAGES/UserLimit.po
+++ b/plugins/UserLimit/locale/lb/LC_MESSAGES/UserLimit.po
@@ -9,18 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - UserLimit\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:15+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:29+0000\n"
 "Language-Team: Luxembourgish <http://translatewiki.net/wiki/Portal:lb>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:16+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:36+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: lb\n"
 "X-Message-Group: #out-statusnet-plugin-userlimit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: UserLimitPlugin.php:89
 msgid "Limit the number of users who can register."
 msgstr "D'Zuel vun de Benotzer, déi sech registréiere kënnen, limitéieren."
diff --git a/plugins/UserLimit/locale/lv/LC_MESSAGES/UserLimit.po b/plugins/UserLimit/locale/lv/LC_MESSAGES/UserLimit.po
index 859475792b..016ab3bb16 100644
--- a/plugins/UserLimit/locale/lv/LC_MESSAGES/UserLimit.po
+++ b/plugins/UserLimit/locale/lv/LC_MESSAGES/UserLimit.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - UserLimit\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:15+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:29+0000\n"
 "Language-Team: Latvian <http://translatewiki.net/wiki/Portal:lv>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:16+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:36+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: lv\n"
 "X-Message-Group: #out-statusnet-plugin-userlimit\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n != "
 "0) ? 1 : 2 );\n"
 
-#: UserLimitPlugin.php:89
 msgid "Limit the number of users who can register."
 msgstr "Ierobežotais lietotāju skaits, kuri var reģistrēties."
diff --git a/plugins/UserLimit/locale/mk/LC_MESSAGES/UserLimit.po b/plugins/UserLimit/locale/mk/LC_MESSAGES/UserLimit.po
index 5dfe980f0c..420501a158 100644
--- a/plugins/UserLimit/locale/mk/LC_MESSAGES/UserLimit.po
+++ b/plugins/UserLimit/locale/mk/LC_MESSAGES/UserLimit.po
@@ -9,18 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - UserLimit\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:15+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:29+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:16+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:36+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-userlimit\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
 
-#: UserLimitPlugin.php:89
 msgid "Limit the number of users who can register."
 msgstr "Ограничување на бројот на корисници што можат да се регистрираат."
diff --git a/plugins/UserLimit/locale/nb/LC_MESSAGES/UserLimit.po b/plugins/UserLimit/locale/nb/LC_MESSAGES/UserLimit.po
index 3799089e61..f97f6746e3 100644
--- a/plugins/UserLimit/locale/nb/LC_MESSAGES/UserLimit.po
+++ b/plugins/UserLimit/locale/nb/LC_MESSAGES/UserLimit.po
@@ -9,18 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - UserLimit\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:15+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:29+0000\n"
 "Language-Team: Norwegian (bokmål)‬ <http://translatewiki.net/wiki/Portal:no>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:16+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:36+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: #out-statusnet-plugin-userlimit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: UserLimitPlugin.php:89
 msgid "Limit the number of users who can register."
 msgstr "Begrens antallet brukere som kan registrere seg."
diff --git a/plugins/UserLimit/locale/nl/LC_MESSAGES/UserLimit.po b/plugins/UserLimit/locale/nl/LC_MESSAGES/UserLimit.po
index 961c1f6732..1c400e3c60 100644
--- a/plugins/UserLimit/locale/nl/LC_MESSAGES/UserLimit.po
+++ b/plugins/UserLimit/locale/nl/LC_MESSAGES/UserLimit.po
@@ -9,18 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - UserLimit\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:15+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:29+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:16+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:36+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-userlimit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: UserLimitPlugin.php:89
 msgid "Limit the number of users who can register."
 msgstr "Limiteert het aantal gebruikers dat kan registreren."
diff --git a/plugins/UserLimit/locale/pt/LC_MESSAGES/UserLimit.po b/plugins/UserLimit/locale/pt/LC_MESSAGES/UserLimit.po
index ce10755874..3500e57350 100644
--- a/plugins/UserLimit/locale/pt/LC_MESSAGES/UserLimit.po
+++ b/plugins/UserLimit/locale/pt/LC_MESSAGES/UserLimit.po
@@ -9,18 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - UserLimit\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:15+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:29+0000\n"
 "Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:16+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:36+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-plugin-userlimit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: UserLimitPlugin.php:89
 msgid "Limit the number of users who can register."
 msgstr "Limitar o número de utilizadores que se podem registar."
diff --git a/plugins/UserLimit/locale/pt_BR/LC_MESSAGES/UserLimit.po b/plugins/UserLimit/locale/pt_BR/LC_MESSAGES/UserLimit.po
index e2a4f7dc4c..079a77cdee 100644
--- a/plugins/UserLimit/locale/pt_BR/LC_MESSAGES/UserLimit.po
+++ b/plugins/UserLimit/locale/pt_BR/LC_MESSAGES/UserLimit.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - UserLimit\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:15+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:30+0000\n"
 "Language-Team: Brazilian Portuguese <http://translatewiki.net/wiki/Portal:pt-"
 "br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:16+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:36+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt-br\n"
 "X-Message-Group: #out-statusnet-plugin-userlimit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: UserLimitPlugin.php:89
 msgid "Limit the number of users who can register."
 msgstr "Limitar o número de usuários que podem se registrar."
diff --git a/plugins/UserLimit/locale/ru/LC_MESSAGES/UserLimit.po b/plugins/UserLimit/locale/ru/LC_MESSAGES/UserLimit.po
index c72e38d998..fbf70c31e3 100644
--- a/plugins/UserLimit/locale/ru/LC_MESSAGES/UserLimit.po
+++ b/plugins/UserLimit/locale/ru/LC_MESSAGES/UserLimit.po
@@ -9,20 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - UserLimit\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:15+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:30+0000\n"
 "Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:16+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:36+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-userlimit\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: UserLimitPlugin.php:89
 msgid "Limit the number of users who can register."
 msgstr ""
 "Ограничение количества пользователей, которые могут зарегистрироваться."
diff --git a/plugins/UserLimit/locale/tl/LC_MESSAGES/UserLimit.po b/plugins/UserLimit/locale/tl/LC_MESSAGES/UserLimit.po
index 157ae59a6d..5085c63b8d 100644
--- a/plugins/UserLimit/locale/tl/LC_MESSAGES/UserLimit.po
+++ b/plugins/UserLimit/locale/tl/LC_MESSAGES/UserLimit.po
@@ -9,18 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - UserLimit\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:15+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:30+0000\n"
 "Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:16+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:36+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-userlimit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: UserLimitPlugin.php:89
 msgid "Limit the number of users who can register."
 msgstr "Hangganan ng bilang ng mga tagagamit na makakapagpatala."
diff --git a/plugins/UserLimit/locale/tr/LC_MESSAGES/UserLimit.po b/plugins/UserLimit/locale/tr/LC_MESSAGES/UserLimit.po
index 372b32a10b..dec2c6bb7a 100644
--- a/plugins/UserLimit/locale/tr/LC_MESSAGES/UserLimit.po
+++ b/plugins/UserLimit/locale/tr/LC_MESSAGES/UserLimit.po
@@ -9,18 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - UserLimit\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:15+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:30+0000\n"
 "Language-Team: Turkish <http://translatewiki.net/wiki/Portal:tr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:16+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:36+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tr\n"
 "X-Message-Group: #out-statusnet-plugin-userlimit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: UserLimitPlugin.php:89
 msgid "Limit the number of users who can register."
 msgstr "Kayıt olabilecek kullanıcı sayısını sınırla."
diff --git a/plugins/UserLimit/locale/uk/LC_MESSAGES/UserLimit.po b/plugins/UserLimit/locale/uk/LC_MESSAGES/UserLimit.po
index cf15ec04a4..072e4335bf 100644
--- a/plugins/UserLimit/locale/uk/LC_MESSAGES/UserLimit.po
+++ b/plugins/UserLimit/locale/uk/LC_MESSAGES/UserLimit.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - UserLimit\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:15+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:30+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:16+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:36+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-userlimit\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: UserLimitPlugin.php:89
 msgid "Limit the number of users who can register."
 msgstr "Обмеження кількості користувачів, котрі можуть зареєструватися."
diff --git a/plugins/WikiHashtags/locale/WikiHashtags.pot b/plugins/WikiHashtags/locale/WikiHashtags.pot
index 02e425fb2e..ad6274ee7a 100644
--- a/plugins/WikiHashtags/locale/WikiHashtags.pot
+++ b/plugins/WikiHashtags/locale/WikiHashtags.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/WikiHashtags/locale/br/LC_MESSAGES/WikiHashtags.po b/plugins/WikiHashtags/locale/br/LC_MESSAGES/WikiHashtags.po
index a26b1467e3..a069dcb1c4 100644
--- a/plugins/WikiHashtags/locale/br/LC_MESSAGES/WikiHashtags.po
+++ b/plugins/WikiHashtags/locale/br/LC_MESSAGES/WikiHashtags.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - WikiHashtags\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:16+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:30+0000\n"
 "Language-Team: Breton <http://translatewiki.net/wiki/Portal:br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:51+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:38+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-wikihashtags\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: WikiHashtagsPlugin.php:110
 msgid ""
 "Gets hashtag descriptions from <a href=\"http://hashtags.wikia.com/"
 "\">WikiHashtags</a>."
diff --git a/plugins/WikiHashtags/locale/de/LC_MESSAGES/WikiHashtags.po b/plugins/WikiHashtags/locale/de/LC_MESSAGES/WikiHashtags.po
index 0c7761c44f..d518cb9128 100644
--- a/plugins/WikiHashtags/locale/de/LC_MESSAGES/WikiHashtags.po
+++ b/plugins/WikiHashtags/locale/de/LC_MESSAGES/WikiHashtags.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - WikiHashtags\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:16+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:30+0000\n"
 "Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:51+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:38+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-wikihashtags\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: WikiHashtagsPlugin.php:110
 msgid ""
 "Gets hashtag descriptions from <a href=\"http://hashtags.wikia.com/"
 "\">WikiHashtags</a>."
diff --git a/plugins/WikiHashtags/locale/fr/LC_MESSAGES/WikiHashtags.po b/plugins/WikiHashtags/locale/fr/LC_MESSAGES/WikiHashtags.po
index 0987b8c6d9..1aa3b6f965 100644
--- a/plugins/WikiHashtags/locale/fr/LC_MESSAGES/WikiHashtags.po
+++ b/plugins/WikiHashtags/locale/fr/LC_MESSAGES/WikiHashtags.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - WikiHashtags\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:16+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:30+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:51+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:38+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-wikihashtags\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: WikiHashtagsPlugin.php:110
 msgid ""
 "Gets hashtag descriptions from <a href=\"http://hashtags.wikia.com/"
 "\">WikiHashtags</a>."
diff --git a/plugins/WikiHashtags/locale/he/LC_MESSAGES/WikiHashtags.po b/plugins/WikiHashtags/locale/he/LC_MESSAGES/WikiHashtags.po
index 72d6e19063..f57bfab06a 100644
--- a/plugins/WikiHashtags/locale/he/LC_MESSAGES/WikiHashtags.po
+++ b/plugins/WikiHashtags/locale/he/LC_MESSAGES/WikiHashtags.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - WikiHashtags\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:16+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:30+0000\n"
 "Language-Team: Hebrew <http://translatewiki.net/wiki/Portal:he>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:51+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:38+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-plugin-wikihashtags\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: WikiHashtagsPlugin.php:110
 msgid ""
 "Gets hashtag descriptions from <a href=\"http://hashtags.wikia.com/"
 "\">WikiHashtags</a>."
diff --git a/plugins/WikiHashtags/locale/ia/LC_MESSAGES/WikiHashtags.po b/plugins/WikiHashtags/locale/ia/LC_MESSAGES/WikiHashtags.po
index 8a1b620a95..2235cfb51e 100644
--- a/plugins/WikiHashtags/locale/ia/LC_MESSAGES/WikiHashtags.po
+++ b/plugins/WikiHashtags/locale/ia/LC_MESSAGES/WikiHashtags.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - WikiHashtags\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:16+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:30+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:51+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:38+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-wikihashtags\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: WikiHashtagsPlugin.php:110
 msgid ""
 "Gets hashtag descriptions from <a href=\"http://hashtags.wikia.com/"
 "\">WikiHashtags</a>."
diff --git a/plugins/WikiHashtags/locale/id/LC_MESSAGES/WikiHashtags.po b/plugins/WikiHashtags/locale/id/LC_MESSAGES/WikiHashtags.po
index 03c98b1444..5380384feb 100644
--- a/plugins/WikiHashtags/locale/id/LC_MESSAGES/WikiHashtags.po
+++ b/plugins/WikiHashtags/locale/id/LC_MESSAGES/WikiHashtags.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - WikiHashtags\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:16+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:30+0000\n"
 "Language-Team: Indonesian <http://translatewiki.net/wiki/Portal:id>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:51+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:38+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: id\n"
 "X-Message-Group: #out-statusnet-plugin-wikihashtags\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: WikiHashtagsPlugin.php:110
 msgid ""
 "Gets hashtag descriptions from <a href=\"http://hashtags.wikia.com/"
 "\">WikiHashtags</a>."
diff --git a/plugins/WikiHashtags/locale/mk/LC_MESSAGES/WikiHashtags.po b/plugins/WikiHashtags/locale/mk/LC_MESSAGES/WikiHashtags.po
index 3ab4e2653b..c6a02f1024 100644
--- a/plugins/WikiHashtags/locale/mk/LC_MESSAGES/WikiHashtags.po
+++ b/plugins/WikiHashtags/locale/mk/LC_MESSAGES/WikiHashtags.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - WikiHashtags\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:16+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:30+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:51+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:38+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-wikihashtags\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
 
-#: WikiHashtagsPlugin.php:110
 msgid ""
 "Gets hashtag descriptions from <a href=\"http://hashtags.wikia.com/"
 "\">WikiHashtags</a>."
diff --git a/plugins/WikiHashtags/locale/nb/LC_MESSAGES/WikiHashtags.po b/plugins/WikiHashtags/locale/nb/LC_MESSAGES/WikiHashtags.po
index 3d299035e7..14dabea579 100644
--- a/plugins/WikiHashtags/locale/nb/LC_MESSAGES/WikiHashtags.po
+++ b/plugins/WikiHashtags/locale/nb/LC_MESSAGES/WikiHashtags.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - WikiHashtags\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:16+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:30+0000\n"
 "Language-Team: Norwegian (bokmål)‬ <http://translatewiki.net/wiki/Portal:no>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:51+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:38+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: #out-statusnet-plugin-wikihashtags\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: WikiHashtagsPlugin.php:110
 msgid ""
 "Gets hashtag descriptions from <a href=\"http://hashtags.wikia.com/"
 "\">WikiHashtags</a>."
diff --git a/plugins/WikiHashtags/locale/nl/LC_MESSAGES/WikiHashtags.po b/plugins/WikiHashtags/locale/nl/LC_MESSAGES/WikiHashtags.po
index e95286c818..2b04fd56d2 100644
--- a/plugins/WikiHashtags/locale/nl/LC_MESSAGES/WikiHashtags.po
+++ b/plugins/WikiHashtags/locale/nl/LC_MESSAGES/WikiHashtags.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - WikiHashtags\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:16+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:30+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:51+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:38+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-wikihashtags\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: WikiHashtagsPlugin.php:110
 msgid ""
 "Gets hashtag descriptions from <a href=\"http://hashtags.wikia.com/"
 "\">WikiHashtags</a>."
diff --git a/plugins/WikiHashtags/locale/pt/LC_MESSAGES/WikiHashtags.po b/plugins/WikiHashtags/locale/pt/LC_MESSAGES/WikiHashtags.po
index 433ad79941..0dc5f67f87 100644
--- a/plugins/WikiHashtags/locale/pt/LC_MESSAGES/WikiHashtags.po
+++ b/plugins/WikiHashtags/locale/pt/LC_MESSAGES/WikiHashtags.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - WikiHashtags\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:16+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:30+0000\n"
 "Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:51+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:38+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-plugin-wikihashtags\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: WikiHashtagsPlugin.php:110
 msgid ""
 "Gets hashtag descriptions from <a href=\"http://hashtags.wikia.com/"
 "\">WikiHashtags</a>."
diff --git a/plugins/WikiHashtags/locale/pt_BR/LC_MESSAGES/WikiHashtags.po b/plugins/WikiHashtags/locale/pt_BR/LC_MESSAGES/WikiHashtags.po
index f5f30bcae5..49ba0a6633 100644
--- a/plugins/WikiHashtags/locale/pt_BR/LC_MESSAGES/WikiHashtags.po
+++ b/plugins/WikiHashtags/locale/pt_BR/LC_MESSAGES/WikiHashtags.po
@@ -9,20 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - WikiHashtags\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:16+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:30+0000\n"
 "Language-Team: Brazilian Portuguese <http://translatewiki.net/wiki/Portal:pt-"
 "br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:51+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:38+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt-br\n"
 "X-Message-Group: #out-statusnet-plugin-wikihashtags\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: WikiHashtagsPlugin.php:110
 msgid ""
 "Gets hashtag descriptions from <a href=\"http://hashtags.wikia.com/"
 "\">WikiHashtags</a>."
diff --git a/plugins/WikiHashtags/locale/ru/LC_MESSAGES/WikiHashtags.po b/plugins/WikiHashtags/locale/ru/LC_MESSAGES/WikiHashtags.po
index 7d8b0c948f..a0c241b36e 100644
--- a/plugins/WikiHashtags/locale/ru/LC_MESSAGES/WikiHashtags.po
+++ b/plugins/WikiHashtags/locale/ru/LC_MESSAGES/WikiHashtags.po
@@ -9,20 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - WikiHashtags\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:16+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:31+0000\n"
 "Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:51+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:38+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-wikihashtags\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: WikiHashtagsPlugin.php:110
 msgid ""
 "Gets hashtag descriptions from <a href=\"http://hashtags.wikia.com/"
 "\">WikiHashtags</a>."
diff --git a/plugins/WikiHashtags/locale/tl/LC_MESSAGES/WikiHashtags.po b/plugins/WikiHashtags/locale/tl/LC_MESSAGES/WikiHashtags.po
index 5dfc2f834a..decb2a17fa 100644
--- a/plugins/WikiHashtags/locale/tl/LC_MESSAGES/WikiHashtags.po
+++ b/plugins/WikiHashtags/locale/tl/LC_MESSAGES/WikiHashtags.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - WikiHashtags\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:16+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:31+0000\n"
 "Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:51+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:38+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-wikihashtags\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: WikiHashtagsPlugin.php:110
 msgid ""
 "Gets hashtag descriptions from <a href=\"http://hashtags.wikia.com/"
 "\">WikiHashtags</a>."
diff --git a/plugins/WikiHashtags/locale/tr/LC_MESSAGES/WikiHashtags.po b/plugins/WikiHashtags/locale/tr/LC_MESSAGES/WikiHashtags.po
index 19a3f06f4a..2df71313a1 100644
--- a/plugins/WikiHashtags/locale/tr/LC_MESSAGES/WikiHashtags.po
+++ b/plugins/WikiHashtags/locale/tr/LC_MESSAGES/WikiHashtags.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - WikiHashtags\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:16+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:31+0000\n"
 "Language-Team: Turkish <http://translatewiki.net/wiki/Portal:tr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:51+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:38+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tr\n"
 "X-Message-Group: #out-statusnet-plugin-wikihashtags\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: WikiHashtagsPlugin.php:110
 msgid ""
 "Gets hashtag descriptions from <a href=\"http://hashtags.wikia.com/"
 "\">WikiHashtags</a>."
diff --git a/plugins/WikiHashtags/locale/uk/LC_MESSAGES/WikiHashtags.po b/plugins/WikiHashtags/locale/uk/LC_MESSAGES/WikiHashtags.po
index 3802b6ad5c..b2bfa6ab87 100644
--- a/plugins/WikiHashtags/locale/uk/LC_MESSAGES/WikiHashtags.po
+++ b/plugins/WikiHashtags/locale/uk/LC_MESSAGES/WikiHashtags.po
@@ -9,20 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - WikiHashtags\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:16+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:31+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:51+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:38+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-wikihashtags\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: WikiHashtagsPlugin.php:110
 msgid ""
 "Gets hashtag descriptions from <a href=\"http://hashtags.wikia.com/"
 "\">WikiHashtags</a>."
diff --git a/plugins/WikiHowProfile/locale/WikiHowProfile.pot b/plugins/WikiHowProfile/locale/WikiHowProfile.pot
index 7e5f5030a5..516710715e 100644
--- a/plugins/WikiHowProfile/locale/WikiHowProfile.pot
+++ b/plugins/WikiHowProfile/locale/WikiHowProfile.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/WikiHowProfile/locale/fr/LC_MESSAGES/WikiHowProfile.po b/plugins/WikiHowProfile/locale/fr/LC_MESSAGES/WikiHowProfile.po
index 1aac2b4d7e..dbedfcfd2e 100644
--- a/plugins/WikiHowProfile/locale/fr/LC_MESSAGES/WikiHowProfile.po
+++ b/plugins/WikiHowProfile/locale/fr/LC_MESSAGES/WikiHowProfile.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - WikiHowProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:16+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:31+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:52+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:52+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-wikihowprofile\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: WikiHowProfilePlugin.php:59
 msgid ""
 "Fetches avatar and other profile information for WikiHow users when setting "
 "up an account via OpenID."
@@ -29,12 +28,10 @@ msgstr ""
 "Récupère l’avatar et les autres informations de profil des utilisateurs "
 "WikiHow lorsqu’ils créent un compte via OpenID."
 
-#: WikiHowProfilePlugin.php:171
 #, php-format
 msgid "Invalid avatar URL %s."
 msgstr "Adresse URL d’avatar « %s » invalide."
 
-#: WikiHowProfilePlugin.php:179
 #, php-format
 msgid "Unable to fetch avatar from %s."
 msgstr "Impossible de récupérer l’avatar depuis « %s »."
diff --git a/plugins/WikiHowProfile/locale/ia/LC_MESSAGES/WikiHowProfile.po b/plugins/WikiHowProfile/locale/ia/LC_MESSAGES/WikiHowProfile.po
index 33e770d149..2a0937cf1f 100644
--- a/plugins/WikiHowProfile/locale/ia/LC_MESSAGES/WikiHowProfile.po
+++ b/plugins/WikiHowProfile/locale/ia/LC_MESSAGES/WikiHowProfile.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - WikiHowProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:16+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:31+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:52+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:52+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-wikihowprofile\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: WikiHowProfilePlugin.php:59
 msgid ""
 "Fetches avatar and other profile information for WikiHow users when setting "
 "up an account via OpenID."
@@ -29,12 +28,10 @@ msgstr ""
 "Obtene le avatar e altere informationes de profilo pro usatores de WikiHow "
 "durante le creation de un conto via OpenID."
 
-#: WikiHowProfilePlugin.php:171
 #, php-format
 msgid "Invalid avatar URL %s."
 msgstr "URL de avatar %s invalide."
 
-#: WikiHowProfilePlugin.php:179
 #, php-format
 msgid "Unable to fetch avatar from %s."
 msgstr "Incapace de obtener avatar ab %s."
diff --git a/plugins/WikiHowProfile/locale/mk/LC_MESSAGES/WikiHowProfile.po b/plugins/WikiHowProfile/locale/mk/LC_MESSAGES/WikiHowProfile.po
index e52aa1bb1b..e28f2b2b0b 100644
--- a/plugins/WikiHowProfile/locale/mk/LC_MESSAGES/WikiHowProfile.po
+++ b/plugins/WikiHowProfile/locale/mk/LC_MESSAGES/WikiHowProfile.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - WikiHowProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:16+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:31+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:52+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:52+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-wikihowprofile\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
 
-#: WikiHowProfilePlugin.php:59
 msgid ""
 "Fetches avatar and other profile information for WikiHow users when setting "
 "up an account via OpenID."
@@ -29,12 +28,10 @@ msgstr ""
 "Презема аватар и други профилни податоци за корисници на WikiHow при "
 "создавање на сметка преку OpenID."
 
-#: WikiHowProfilePlugin.php:171
 #, php-format
 msgid "Invalid avatar URL %s."
 msgstr "Неважечка URL-адреса на аватарот: %s."
 
-#: WikiHowProfilePlugin.php:179
 #, php-format
 msgid "Unable to fetch avatar from %s."
 msgstr "Не можев да го преземам аватарот од %s."
diff --git a/plugins/WikiHowProfile/locale/nl/LC_MESSAGES/WikiHowProfile.po b/plugins/WikiHowProfile/locale/nl/LC_MESSAGES/WikiHowProfile.po
index 8e39d70036..04c6d06c6d 100644
--- a/plugins/WikiHowProfile/locale/nl/LC_MESSAGES/WikiHowProfile.po
+++ b/plugins/WikiHowProfile/locale/nl/LC_MESSAGES/WikiHowProfile.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - WikiHowProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:16+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:31+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:52+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:52+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-wikihowprofile\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: WikiHowProfilePlugin.php:59
 msgid ""
 "Fetches avatar and other profile information for WikiHow users when setting "
 "up an account via OpenID."
@@ -29,12 +28,10 @@ msgstr ""
 "Haalt avatar- en andere informatie op voor WikiHow-gebruikers die een "
 "gebruiker aanmaken via OpenID."
 
-#: WikiHowProfilePlugin.php:171
 #, php-format
 msgid "Invalid avatar URL %s."
 msgstr "Ongeldige avatar-URL %s."
 
-#: WikiHowProfilePlugin.php:179
 #, php-format
 msgid "Unable to fetch avatar from %s."
 msgstr "Het was niet mogelijk om de avatar op te halen van %s."
diff --git a/plugins/WikiHowProfile/locale/ru/LC_MESSAGES/WikiHowProfile.po b/plugins/WikiHowProfile/locale/ru/LC_MESSAGES/WikiHowProfile.po
index 4d48f7ba25..a8acb6443e 100644
--- a/plugins/WikiHowProfile/locale/ru/LC_MESSAGES/WikiHowProfile.po
+++ b/plugins/WikiHowProfile/locale/ru/LC_MESSAGES/WikiHowProfile.po
@@ -9,20 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - WikiHowProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:17+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:31+0000\n"
 "Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:52+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:52+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-wikihowprofile\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: WikiHowProfilePlugin.php:59
 msgid ""
 "Fetches avatar and other profile information for WikiHow users when setting "
 "up an account via OpenID."
@@ -30,12 +29,10 @@ msgstr ""
 "Запрашивает аватару и прочую информацию из профиля пользователя WikiHow при "
 "создании учётной записи с помощью OpenID."
 
-#: WikiHowProfilePlugin.php:171
 #, php-format
 msgid "Invalid avatar URL %s."
 msgstr "Неверный URL-адрес аватары %s"
 
-#: WikiHowProfilePlugin.php:179
 #, php-format
 msgid "Unable to fetch avatar from %s."
 msgstr "Не удаётся получить аватару из %s."
diff --git a/plugins/WikiHowProfile/locale/tl/LC_MESSAGES/WikiHowProfile.po b/plugins/WikiHowProfile/locale/tl/LC_MESSAGES/WikiHowProfile.po
index b5c1a39b49..fc08fc7b33 100644
--- a/plugins/WikiHowProfile/locale/tl/LC_MESSAGES/WikiHowProfile.po
+++ b/plugins/WikiHowProfile/locale/tl/LC_MESSAGES/WikiHowProfile.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - WikiHowProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:17+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:31+0000\n"
 "Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:52+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:52+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-wikihowprofile\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: WikiHowProfilePlugin.php:59
 msgid ""
 "Fetches avatar and other profile information for WikiHow users when setting "
 "up an account via OpenID."
@@ -29,12 +28,10 @@ msgstr ""
 "Dumarampot ng abatar at ibang kabatiran ng balangkas para sa mga tagagamit "
 "ng WikiHow kapag nagtatalaga ng isang akawnt sa pamamagitan ng OpenID."
 
-#: WikiHowProfilePlugin.php:171
 #, php-format
 msgid "Invalid avatar URL %s."
 msgstr "Hindi tanggap na URL ng abatar ang %s."
 
-#: WikiHowProfilePlugin.php:179
 #, php-format
 msgid "Unable to fetch avatar from %s."
 msgstr "Hindi nagawang damputin ang abatar mula sa %s."
diff --git a/plugins/WikiHowProfile/locale/tr/LC_MESSAGES/WikiHowProfile.po b/plugins/WikiHowProfile/locale/tr/LC_MESSAGES/WikiHowProfile.po
index 5b8d124aee..e87533cce8 100644
--- a/plugins/WikiHowProfile/locale/tr/LC_MESSAGES/WikiHowProfile.po
+++ b/plugins/WikiHowProfile/locale/tr/LC_MESSAGES/WikiHowProfile.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - WikiHowProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:17+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:31+0000\n"
 "Language-Team: Turkish <http://translatewiki.net/wiki/Portal:tr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:52+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:52+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tr\n"
 "X-Message-Group: #out-statusnet-plugin-wikihowprofile\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: WikiHowProfilePlugin.php:59
 msgid ""
 "Fetches avatar and other profile information for WikiHow users when setting "
 "up an account via OpenID."
@@ -29,12 +28,10 @@ msgstr ""
 "OpenID aracılığıyla hesap oluşturan WikiHow kullanıcıları için kullanıcı "
 "resimlerini ve diğer profil bilgilerini alır."
 
-#: WikiHowProfilePlugin.php:171
 #, php-format
 msgid "Invalid avatar URL %s."
 msgstr "Geçersiz kullanıcı resmi bağlantısı %s."
 
-#: WikiHowProfilePlugin.php:179
 #, php-format
 msgid "Unable to fetch avatar from %s."
 msgstr "%s'ten kullanıcı resmi alınamıyor."
diff --git a/plugins/WikiHowProfile/locale/uk/LC_MESSAGES/WikiHowProfile.po b/plugins/WikiHowProfile/locale/uk/LC_MESSAGES/WikiHowProfile.po
index b9da782d2e..7bd224c0e7 100644
--- a/plugins/WikiHowProfile/locale/uk/LC_MESSAGES/WikiHowProfile.po
+++ b/plugins/WikiHowProfile/locale/uk/LC_MESSAGES/WikiHowProfile.po
@@ -9,20 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - WikiHowProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:17+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:31+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:52+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:52+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-wikihowprofile\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: WikiHowProfilePlugin.php:59
 msgid ""
 "Fetches avatar and other profile information for WikiHow users when setting "
 "up an account via OpenID."
@@ -30,12 +29,10 @@ msgstr ""
 "Запитує аватар та іншу супутню інформацію з WikiHow для користувачів, котрі "
 "створюють акаунти через OpenID."
 
-#: WikiHowProfilePlugin.php:171
 #, php-format
 msgid "Invalid avatar URL %s."
 msgstr "Невірна URL-адреса аватари %s."
 
-#: WikiHowProfilePlugin.php:179
 #, php-format
 msgid "Unable to fetch avatar from %s."
 msgstr "Неможливо завантажити аватару з %s."
diff --git a/plugins/XCache/locale/XCache.pot b/plugins/XCache/locale/XCache.pot
index c27c733d22..0fa7a754f0 100644
--- a/plugins/XCache/locale/XCache.pot
+++ b/plugins/XCache/locale/XCache.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/XCache/locale/br/LC_MESSAGES/XCache.po b/plugins/XCache/locale/br/LC_MESSAGES/XCache.po
index a9c195eafa..f923f4dbfc 100644
--- a/plugins/XCache/locale/br/LC_MESSAGES/XCache.po
+++ b/plugins/XCache/locale/br/LC_MESSAGES/XCache.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - XCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:17+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:32+0000\n"
 "Language-Team: Breton <http://translatewiki.net/wiki/Portal:br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:54+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:53+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-xcache\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: XCachePlugin.php:120
 msgid ""
 "Use the <a href=\"http://xcache.lighttpd.net/\">XCache</a> variable cache to "
 "cache query results."
diff --git a/plugins/XCache/locale/es/LC_MESSAGES/XCache.po b/plugins/XCache/locale/es/LC_MESSAGES/XCache.po
index 85f6d26f7a..7fdc9a915f 100644
--- a/plugins/XCache/locale/es/LC_MESSAGES/XCache.po
+++ b/plugins/XCache/locale/es/LC_MESSAGES/XCache.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - XCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:17+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:32+0000\n"
 "Language-Team: Spanish <http://translatewiki.net/wiki/Portal:es>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:54+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:53+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-xcache\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: XCachePlugin.php:120
 msgid ""
 "Use the <a href=\"http://xcache.lighttpd.net/\">XCache</a> variable cache to "
 "cache query results."
diff --git a/plugins/XCache/locale/fi/LC_MESSAGES/XCache.po b/plugins/XCache/locale/fi/LC_MESSAGES/XCache.po
index b9effc3810..9f49825803 100644
--- a/plugins/XCache/locale/fi/LC_MESSAGES/XCache.po
+++ b/plugins/XCache/locale/fi/LC_MESSAGES/XCache.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - XCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:17+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:32+0000\n"
 "Language-Team: Finnish <http://translatewiki.net/wiki/Portal:fi>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:54+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:53+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fi\n"
 "X-Message-Group: #out-statusnet-plugin-xcache\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: XCachePlugin.php:120
 msgid ""
 "Use the <a href=\"http://xcache.lighttpd.net/\">XCache</a> variable cache to "
 "cache query results."
diff --git a/plugins/XCache/locale/fr/LC_MESSAGES/XCache.po b/plugins/XCache/locale/fr/LC_MESSAGES/XCache.po
index 947f4465a7..f7476862fa 100644
--- a/plugins/XCache/locale/fr/LC_MESSAGES/XCache.po
+++ b/plugins/XCache/locale/fr/LC_MESSAGES/XCache.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - XCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:17+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:32+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:54+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:53+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-xcache\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: XCachePlugin.php:120
 msgid ""
 "Use the <a href=\"http://xcache.lighttpd.net/\">XCache</a> variable cache to "
 "cache query results."
diff --git a/plugins/XCache/locale/gl/LC_MESSAGES/XCache.po b/plugins/XCache/locale/gl/LC_MESSAGES/XCache.po
index dd4531b2e8..d749caed71 100644
--- a/plugins/XCache/locale/gl/LC_MESSAGES/XCache.po
+++ b/plugins/XCache/locale/gl/LC_MESSAGES/XCache.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - XCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:17+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:32+0000\n"
 "Language-Team: Galician <http://translatewiki.net/wiki/Portal:gl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:54+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:53+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: gl\n"
 "X-Message-Group: #out-statusnet-plugin-xcache\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: XCachePlugin.php:120
 msgid ""
 "Use the <a href=\"http://xcache.lighttpd.net/\">XCache</a> variable cache to "
 "cache query results."
diff --git a/plugins/XCache/locale/he/LC_MESSAGES/XCache.po b/plugins/XCache/locale/he/LC_MESSAGES/XCache.po
index 5e08cb4ed3..739da3720c 100644
--- a/plugins/XCache/locale/he/LC_MESSAGES/XCache.po
+++ b/plugins/XCache/locale/he/LC_MESSAGES/XCache.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - XCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:17+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:32+0000\n"
 "Language-Team: Hebrew <http://translatewiki.net/wiki/Portal:he>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:54+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:53+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-plugin-xcache\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: XCachePlugin.php:120
 msgid ""
 "Use the <a href=\"http://xcache.lighttpd.net/\">XCache</a> variable cache to "
 "cache query results."
diff --git a/plugins/XCache/locale/ia/LC_MESSAGES/XCache.po b/plugins/XCache/locale/ia/LC_MESSAGES/XCache.po
index a13d1d5e90..9c980c3f0f 100644
--- a/plugins/XCache/locale/ia/LC_MESSAGES/XCache.po
+++ b/plugins/XCache/locale/ia/LC_MESSAGES/XCache.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - XCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:17+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:32+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:54+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:53+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-xcache\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: XCachePlugin.php:120
 msgid ""
 "Use the <a href=\"http://xcache.lighttpd.net/\">XCache</a> variable cache to "
 "cache query results."
diff --git a/plugins/XCache/locale/id/LC_MESSAGES/XCache.po b/plugins/XCache/locale/id/LC_MESSAGES/XCache.po
index b3a3ed22c2..00783e464b 100644
--- a/plugins/XCache/locale/id/LC_MESSAGES/XCache.po
+++ b/plugins/XCache/locale/id/LC_MESSAGES/XCache.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - XCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:17+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:32+0000\n"
 "Language-Team: Indonesian <http://translatewiki.net/wiki/Portal:id>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:54+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:53+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: id\n"
 "X-Message-Group: #out-statusnet-plugin-xcache\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: XCachePlugin.php:120
 msgid ""
 "Use the <a href=\"http://xcache.lighttpd.net/\">XCache</a> variable cache to "
 "cache query results."
diff --git a/plugins/XCache/locale/mk/LC_MESSAGES/XCache.po b/plugins/XCache/locale/mk/LC_MESSAGES/XCache.po
index 712387545d..9037013c8f 100644
--- a/plugins/XCache/locale/mk/LC_MESSAGES/XCache.po
+++ b/plugins/XCache/locale/mk/LC_MESSAGES/XCache.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - XCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:17+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:32+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:54+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:53+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-xcache\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
 
-#: XCachePlugin.php:120
 msgid ""
 "Use the <a href=\"http://xcache.lighttpd.net/\">XCache</a> variable cache to "
 "cache query results."
diff --git a/plugins/XCache/locale/nb/LC_MESSAGES/XCache.po b/plugins/XCache/locale/nb/LC_MESSAGES/XCache.po
index c31f913c86..0d0887b085 100644
--- a/plugins/XCache/locale/nb/LC_MESSAGES/XCache.po
+++ b/plugins/XCache/locale/nb/LC_MESSAGES/XCache.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - XCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:17+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:32+0000\n"
 "Language-Team: Norwegian (bokmål)‬ <http://translatewiki.net/wiki/Portal:no>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:54+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:53+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: #out-statusnet-plugin-xcache\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: XCachePlugin.php:120
 msgid ""
 "Use the <a href=\"http://xcache.lighttpd.net/\">XCache</a> variable cache to "
 "cache query results."
diff --git a/plugins/XCache/locale/nl/LC_MESSAGES/XCache.po b/plugins/XCache/locale/nl/LC_MESSAGES/XCache.po
index d6e80652fd..a0a99feafd 100644
--- a/plugins/XCache/locale/nl/LC_MESSAGES/XCache.po
+++ b/plugins/XCache/locale/nl/LC_MESSAGES/XCache.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - XCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:17+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:32+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:54+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:53+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-xcache\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: XCachePlugin.php:120
 msgid ""
 "Use the <a href=\"http://xcache.lighttpd.net/\">XCache</a> variable cache to "
 "cache query results."
diff --git a/plugins/XCache/locale/pt/LC_MESSAGES/XCache.po b/plugins/XCache/locale/pt/LC_MESSAGES/XCache.po
index 699453c39e..25302166f5 100644
--- a/plugins/XCache/locale/pt/LC_MESSAGES/XCache.po
+++ b/plugins/XCache/locale/pt/LC_MESSAGES/XCache.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - XCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:17+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:32+0000\n"
 "Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:54+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:53+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-plugin-xcache\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: XCachePlugin.php:120
 msgid ""
 "Use the <a href=\"http://xcache.lighttpd.net/\">XCache</a> variable cache to "
 "cache query results."
diff --git a/plugins/XCache/locale/pt_BR/LC_MESSAGES/XCache.po b/plugins/XCache/locale/pt_BR/LC_MESSAGES/XCache.po
index e52df8c462..54e87fe71e 100644
--- a/plugins/XCache/locale/pt_BR/LC_MESSAGES/XCache.po
+++ b/plugins/XCache/locale/pt_BR/LC_MESSAGES/XCache.po
@@ -9,20 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - XCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:17+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:32+0000\n"
 "Language-Team: Brazilian Portuguese <http://translatewiki.net/wiki/Portal:pt-"
 "br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:54+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:53+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt-br\n"
 "X-Message-Group: #out-statusnet-plugin-xcache\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: XCachePlugin.php:120
 msgid ""
 "Use the <a href=\"http://xcache.lighttpd.net/\">XCache</a> variable cache to "
 "cache query results."
diff --git a/plugins/XCache/locale/ru/LC_MESSAGES/XCache.po b/plugins/XCache/locale/ru/LC_MESSAGES/XCache.po
index 8afccae06c..757c4f35c4 100644
--- a/plugins/XCache/locale/ru/LC_MESSAGES/XCache.po
+++ b/plugins/XCache/locale/ru/LC_MESSAGES/XCache.po
@@ -9,20 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - XCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:17+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:32+0000\n"
 "Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:54+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:53+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-xcache\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: XCachePlugin.php:120
 msgid ""
 "Use the <a href=\"http://xcache.lighttpd.net/\">XCache</a> variable cache to "
 "cache query results."
diff --git a/plugins/XCache/locale/tl/LC_MESSAGES/XCache.po b/plugins/XCache/locale/tl/LC_MESSAGES/XCache.po
index 3ab573f9df..39f514948f 100644
--- a/plugins/XCache/locale/tl/LC_MESSAGES/XCache.po
+++ b/plugins/XCache/locale/tl/LC_MESSAGES/XCache.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - XCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:17+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:32+0000\n"
 "Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:54+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:53+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-xcache\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: XCachePlugin.php:120
 msgid ""
 "Use the <a href=\"http://xcache.lighttpd.net/\">XCache</a> variable cache to "
 "cache query results."
diff --git a/plugins/XCache/locale/tr/LC_MESSAGES/XCache.po b/plugins/XCache/locale/tr/LC_MESSAGES/XCache.po
index b9d3cf733e..5ead868dc5 100644
--- a/plugins/XCache/locale/tr/LC_MESSAGES/XCache.po
+++ b/plugins/XCache/locale/tr/LC_MESSAGES/XCache.po
@@ -9,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - XCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:17+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:32+0000\n"
 "Language-Team: Turkish <http://translatewiki.net/wiki/Portal:tr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:54+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:53+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tr\n"
 "X-Message-Group: #out-statusnet-plugin-xcache\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: XCachePlugin.php:120
 msgid ""
 "Use the <a href=\"http://xcache.lighttpd.net/\">XCache</a> variable cache to "
 "cache query results."
diff --git a/plugins/XCache/locale/uk/LC_MESSAGES/XCache.po b/plugins/XCache/locale/uk/LC_MESSAGES/XCache.po
index 82b1336253..2ed237de74 100644
--- a/plugins/XCache/locale/uk/LC_MESSAGES/XCache.po
+++ b/plugins/XCache/locale/uk/LC_MESSAGES/XCache.po
@@ -9,20 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - XCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:17+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:32+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:54+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:53+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-xcache\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: XCachePlugin.php:120
 msgid ""
 "Use the <a href=\"http://xcache.lighttpd.net/\">XCache</a> variable cache to "
 "cache query results."
diff --git a/plugins/Xmpp/locale/Xmpp.pot b/plugins/Xmpp/locale/Xmpp.pot
index d6ed6ad6fa..253252675a 100644
--- a/plugins/Xmpp/locale/Xmpp.pot
+++ b/plugins/Xmpp/locale/Xmpp.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,6 +16,10 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: xmppmanager.php:168 xmppmanager.php:207
+msgid "Send me a message to post a notice"
+msgstr ""
+
 #: XmppPlugin.php:62
 msgid "XMPP/Jabber/GTalk"
 msgstr ""
@@ -25,7 +29,3 @@ msgid ""
 "The XMPP plugin allows users to send and receive notices over the XMPP/"
 "Jabber network."
 msgstr ""
-
-#: xmppmanager.php:168 xmppmanager.php:207
-msgid "Send me a message to post a notice"
-msgstr ""
diff --git a/plugins/Xmpp/locale/ia/LC_MESSAGES/Xmpp.po b/plugins/Xmpp/locale/ia/LC_MESSAGES/Xmpp.po
new file mode 100644
index 0000000000..cff3ebf5df
--- /dev/null
+++ b/plugins/Xmpp/locale/ia/LC_MESSAGES/Xmpp.po
@@ -0,0 +1,35 @@
+# Translation of StatusNet - Xmpp to Interlingua (Interlingua)
+# Exported from translatewiki.net
+#
+# Author: McDutchie
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Xmpp\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:33+0000\n"
+"Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-03-03 20:42:26+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: ia\n"
+"X-Message-Group: #out-statusnet-plugin-xmpp\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "Send me a message to post a notice"
+msgstr "Inviar me un message pro publicar un nota"
+
+msgid "XMPP/Jabber/GTalk"
+msgstr "XMPP/Jabber/GTalk"
+
+msgid ""
+"The XMPP plugin allows users to send and receive notices over the XMPP/"
+"Jabber network."
+msgstr ""
+"Le plug-in XMPP permitte que usatores invia e recipe notas per le rete XMPP/"
+"Jabber."
diff --git a/plugins/Xmpp/locale/mk/LC_MESSAGES/Xmpp.po b/plugins/Xmpp/locale/mk/LC_MESSAGES/Xmpp.po
new file mode 100644
index 0000000000..7025bfda50
--- /dev/null
+++ b/plugins/Xmpp/locale/mk/LC_MESSAGES/Xmpp.po
@@ -0,0 +1,35 @@
+# Translation of StatusNet - Xmpp to Macedonian (Македонски)
+# Exported from translatewiki.net
+#
+# Author: Bjankuloski06
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Xmpp\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:33+0000\n"
+"Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-03-03 20:42:26+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: mk\n"
+"X-Message-Group: #out-statusnet-plugin-xmpp\n"
+"Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
+
+msgid "Send me a message to post a notice"
+msgstr "Испрати ми порака за да објавам забелешка"
+
+msgid "XMPP/Jabber/GTalk"
+msgstr "XMPP/Jabber/GTalk"
+
+msgid ""
+"The XMPP plugin allows users to send and receive notices over the XMPP/"
+"Jabber network."
+msgstr ""
+"Приклучокот за XMPP им овозможува на корисниците да испраќаат и примаат "
+"забелешки преку мрежата на XMPP/Jabber."
diff --git a/plugins/Xmpp/locale/nl/LC_MESSAGES/Xmpp.po b/plugins/Xmpp/locale/nl/LC_MESSAGES/Xmpp.po
new file mode 100644
index 0000000000..f943a79f29
--- /dev/null
+++ b/plugins/Xmpp/locale/nl/LC_MESSAGES/Xmpp.po
@@ -0,0 +1,35 @@
+# Translation of StatusNet - Xmpp to Dutch (Nederlands)
+# Exported from translatewiki.net
+#
+# Author: Siebrand
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Xmpp\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:33+0000\n"
+"Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-03-03 20:42:26+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: nl\n"
+"X-Message-Group: #out-statusnet-plugin-xmpp\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "Send me a message to post a notice"
+msgstr "Mij een bericht sturen om een mededeling te verzenden"
+
+msgid "XMPP/Jabber/GTalk"
+msgstr "XMPP/Jabber/Google Talk"
+
+msgid ""
+"The XMPP plugin allows users to send and receive notices over the XMPP/"
+"Jabber network."
+msgstr ""
+"Maakt het mogelijk om mededelingen te zenden naar en ontvangen van het XMPP/"
+"Jabber-netwerk."
diff --git a/plugins/YammerImport/locale/YammerImport.pot b/plugins/YammerImport/locale/YammerImport.pot
index e78563baa0..7260eaef9c 100644
--- a/plugins/YammerImport/locale/YammerImport.pot
+++ b/plugins/YammerImport/locale/YammerImport.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,29 +17,33 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: YammerImportPlugin.php:98
-msgid "Yammer"
-msgstr ""
-
-#: YammerImportPlugin.php:99 actions/yammeradminpanel.php:135
-msgid "Yammer import"
-msgstr ""
-
-#: lib/yammerauthinitform.php:48 lib/yammerauthverifyform.php:56
-#: lib/yammerprogressform.php:68 actions/yammerauth.php:71
+#: actions/yammerauth.php:71 lib/yammerauthinitform.php:48
+#: lib/yammerprogressform.php:68 lib/yammerauthverifyform.php:56
 msgid "Connect to Yammer"
 msgstr ""
 
-#: lib/yammerauthinitform.php:62
-msgid "Start authentication"
+#: actions/yammeradminpanel.php:45
+msgid "Yammer Import"
 msgstr ""
 
-#: lib/yammerauthinitform.php:62
-msgid "Request authorization to connect to Yammer account"
+#: actions/yammeradminpanel.php:55
+msgid ""
+"This Yammer import tool is still undergoing testing, and is incomplete in "
+"some areas. Currently user subscriptions and group memberships are not "
+"transferred; in the future this may be supported for imports done by "
+"verified administrators on the Yammer side."
 msgstr ""
 
-#: lib/yammerauthinitform.php:63
-msgid "Change API key"
+#: actions/yammeradminpanel.php:102
+msgid "Paused from admin panel."
+msgstr ""
+
+#: actions/yammeradminpanel.php:135 YammerImportPlugin.php:99
+msgid "Yammer import"
+msgstr ""
+
+#: YammerImportPlugin.php:98
+msgid "Yammer"
 msgstr ""
 
 #: lib/yammerimporter.php:230
@@ -56,66 +60,16 @@ msgstr ""
 msgid "Unable to fetch avatar from %s."
 msgstr ""
 
-#: lib/yammerapikeyform.php:56
-msgid "Yammer API registration"
+#: lib/yammerauthinitform.php:62
+msgid "Start authentication"
 msgstr ""
 
-#: lib/yammerapikeyform.php:72
-msgid ""
-"Before we can connect to your Yammer network, you will need to register the "
-"importer as an application authorized to pull data on your behalf. This "
-"registration will work only for your own network. Follow this link to "
-"register the app at Yammer; you will be prompted to log in if necessary:"
+#: lib/yammerauthinitform.php:62
+msgid "Request authorization to connect to Yammer account"
 msgstr ""
 
-#: lib/yammerapikeyform.php:84
-msgid "Open Yammer application registration form"
-msgstr ""
-
-#: lib/yammerapikeyform.php:87
-msgid "Copy the consumer key and secret you are given into the form below:"
-msgstr ""
-
-#: lib/yammerapikeyform.php:91
-msgid "Consumer key:"
-msgstr ""
-
-#: lib/yammerapikeyform.php:94
-msgid "Consumer secret:"
-msgstr ""
-
-#: lib/yammerapikeyform.php:98
-msgid "Save"
-msgstr ""
-
-#: lib/yammerapikeyform.php:98
-msgid "Save these consumer keys"
-msgstr ""
-
-#: lib/yammerauthverifyform.php:72
-msgid ""
-"Follow this link to confirm authorization at Yammer; you will be prompted to "
-"log in if necessary:"
-msgstr ""
-
-#: lib/yammerauthverifyform.php:87
-msgid "Open Yammer authentication window"
-msgstr ""
-
-#: lib/yammerauthverifyform.php:90
-msgid "Copy the verification code you are given below:"
-msgstr ""
-
-#: lib/yammerauthverifyform.php:94
-msgid "Verification code:"
-msgstr ""
-
-#: lib/yammerauthverifyform.php:98 lib/yammerprogressform.php:164
-msgid "Continue"
-msgstr ""
-
-#: lib/yammerauthverifyform.php:98
-msgid "Save code and begin import"
+#: lib/yammerauthinitform.php:63
+msgid "Change API key"
 msgstr ""
 
 #: lib/yammerprogressform.php:63
@@ -243,22 +197,68 @@ msgstr ""
 msgid "Paused"
 msgstr ""
 
+#: lib/yammerprogressform.php:164 lib/yammerauthverifyform.php:98
+msgid "Continue"
+msgstr ""
+
 #: lib/yammerprogressform.php:165
 msgid "Abort import"
 msgstr ""
 
-#: actions/yammeradminpanel.php:45
-msgid "Yammer Import"
-msgstr ""
-
-#: actions/yammeradminpanel.php:55
+#: lib/yammerauthverifyform.php:72
 msgid ""
-"This Yammer import tool is still undergoing testing, and is incomplete in "
-"some areas. Currently user subscriptions and group memberships are not "
-"transferred; in the future this may be supported for imports done by "
-"verified administrators on the Yammer side."
+"Follow this link to confirm authorization at Yammer; you will be prompted to "
+"log in if necessary:"
 msgstr ""
 
-#: actions/yammeradminpanel.php:102
-msgid "Paused from admin panel."
+#: lib/yammerauthverifyform.php:87
+msgid "Open Yammer authentication window"
+msgstr ""
+
+#: lib/yammerauthverifyform.php:90
+msgid "Copy the verification code you are given below:"
+msgstr ""
+
+#: lib/yammerauthverifyform.php:94
+msgid "Verification code:"
+msgstr ""
+
+#: lib/yammerauthverifyform.php:98
+msgid "Save code and begin import"
+msgstr ""
+
+#: lib/yammerapikeyform.php:56
+msgid "Yammer API registration"
+msgstr ""
+
+#: lib/yammerapikeyform.php:72
+msgid ""
+"Before we can connect to your Yammer network, you will need to register the "
+"importer as an application authorized to pull data on your behalf. This "
+"registration will work only for your own network. Follow this link to "
+"register the app at Yammer; you will be prompted to log in if necessary:"
+msgstr ""
+
+#: lib/yammerapikeyform.php:84
+msgid "Open Yammer application registration form"
+msgstr ""
+
+#: lib/yammerapikeyform.php:87
+msgid "Copy the consumer key and secret you are given into the form below:"
+msgstr ""
+
+#: lib/yammerapikeyform.php:91
+msgid "Consumer key:"
+msgstr ""
+
+#: lib/yammerapikeyform.php:94
+msgid "Consumer secret:"
+msgstr ""
+
+#: lib/yammerapikeyform.php:98
+msgid "Save"
+msgstr ""
+
+#: lib/yammerapikeyform.php:98
+msgid "Save these consumer keys"
 msgstr ""
diff --git a/plugins/YammerImport/locale/br/LC_MESSAGES/YammerImport.po b/plugins/YammerImport/locale/br/LC_MESSAGES/YammerImport.po
index f29347eeeb..0c1d340001 100644
--- a/plugins/YammerImport/locale/br/LC_MESSAGES/YammerImport.po
+++ b/plugins/YammerImport/locale/br/LC_MESSAGES/YammerImport.po
@@ -10,261 +10,24 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - YammerImport\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:21+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:36+0000\n"
 "Language-Team: Breton <http://translatewiki.net/wiki/Portal:br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:55+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:55+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-yammerimport\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: YammerImportPlugin.php:98
-msgid "Yammer"
-msgstr "Yammer"
-
-#: YammerImportPlugin.php:99 actions/yammeradminpanel.php:135
-msgid "Yammer import"
-msgstr "Enporzh Yammer"
-
-#: lib/yammerauthinitform.php:48 lib/yammerauthverifyform.php:56
-#: lib/yammerprogressform.php:68 actions/yammerauth.php:71
 msgid "Connect to Yammer"
 msgstr "Kevreañ da Yammer"
 
-#: lib/yammerauthinitform.php:62
-msgid "Start authentication"
-msgstr ""
-
-#: lib/yammerauthinitform.php:62
-msgid "Request authorization to connect to Yammer account"
-msgstr ""
-
-#: lib/yammerauthinitform.php:63
-msgid "Change API key"
-msgstr ""
-
-#: lib/yammerimporter.php:230
-msgid "Expertise:"
-msgstr "Prizacha :"
-
-#: lib/yammerimporter.php:433
-#, php-format
-msgid "Invalid avatar URL %s."
-msgstr "Direizh eo URL an avatar %s."
-
-#: lib/yammerimporter.php:441
-#, php-format
-msgid "Unable to fetch avatar from %s."
-msgstr "Dibosupl eo adtapout an avatar adalek %s."
-
-#: lib/yammerapikeyform.php:56
-msgid "Yammer API registration"
-msgstr "Enrolladenn an API Yammer"
-
-#: lib/yammerapikeyform.php:72
-msgid ""
-"Before we can connect to your Yammer network, you will need to register the "
-"importer as an application authorized to pull data on your behalf. This "
-"registration will work only for your own network. Follow this link to "
-"register the app at Yammer; you will be prompted to log in if necessary:"
-msgstr ""
-"Kent gallout kevreañ ouzh ho rouedad Yammer e rankit enrollañ an arload "
-"enporzhiañ evel un arload aotreet da zastum roadennoù en hoc'h anv. Ne "
-"dalvezo an enrolladenn-se nemet evit ho rouedad deoc'h. Heuilhit al liamm-"
-"mañ evit enrollañ an arload war Yammer ; mar bez ret e vo goulennet ouzhoc'h "
-"kevreañ."
-
-#: lib/yammerapikeyform.php:84
-msgid "Open Yammer application registration form"
-msgstr "Digeriñ furmskrid enrollañ Yammer"
-
-#: lib/yammerapikeyform.php:87
-msgid "Copy the consumer key and secret you are given into the form below:"
-msgstr ""
-"Eilit er furmskrid a-is an alc'hwez hag ar sekred implijer bet roet deoc'h :"
-
-#: lib/yammerapikeyform.php:91
-msgid "Consumer key:"
-msgstr "Alc'hwez implijer :"
-
-#: lib/yammerapikeyform.php:94
-msgid "Consumer secret:"
-msgstr "Sekred an implijer :"
-
-#: lib/yammerapikeyform.php:98
-msgid "Save"
-msgstr "Enrollañ"
-
-#: lib/yammerapikeyform.php:98
-msgid "Save these consumer keys"
-msgstr "Enrollañ an alc'hwezioù implijer-mañ"
-
-#: lib/yammerauthverifyform.php:72
-msgid ""
-"Follow this link to confirm authorization at Yammer; you will be prompted to "
-"log in if necessary:"
-msgstr ""
-"Heuliañ al liamm-mañ da gadarnaat an aotre war Yammer ; mar bez ret e vo "
-"goulennet ouzhoc'h kevreañ :"
-
-#: lib/yammerauthverifyform.php:87
-msgid "Open Yammer authentication window"
-msgstr "Digeriñ prenestr emzisklêriañ Yammer"
-
-#: lib/yammerauthverifyform.php:90
-msgid "Copy the verification code you are given below:"
-msgstr "Eilit a-is ar c'hod gwiriañ bet roet deoc'h :"
-
-#: lib/yammerauthverifyform.php:94
-msgid "Verification code:"
-msgstr "Kod gwiriañ :"
-
-#: lib/yammerauthverifyform.php:98 lib/yammerprogressform.php:164
-msgid "Continue"
-msgstr "Kenderc'hel"
-
-#: lib/yammerauthverifyform.php:98
-msgid "Save code and begin import"
-msgstr "Enrollañ ar c'hod ha kregiñ da enporzhiañ"
-
-#: lib/yammerprogressform.php:63
-msgid "Initialize"
-msgstr "Deraouekaat"
-
-#: lib/yammerprogressform.php:64
-msgid "No import running"
-msgstr "Enporzhiadenn ebet o treiñ"
-
-#: lib/yammerprogressform.php:65
-msgid "Initiated Yammer server connection..."
-msgstr "Loc'het ar gevreadenn d'ar servijer Yammer"
-
-#: lib/yammerprogressform.php:69
-msgid "Awaiting authorization..."
-msgstr "O c'hortoz an aotre..."
-
-#: lib/yammerprogressform.php:70
-msgid "Connected."
-msgstr "Kevreet."
-
-#: lib/yammerprogressform.php:73
-msgid "Import user accounts"
-msgstr "Enporzhiañ ar c'hontoù implijer"
-
-#: lib/yammerprogressform.php:74
-#, php-format
-msgid "Importing %d user..."
-msgid_plural "Importing %d users..."
-msgstr[0] "Oc'h enporzhiañ %d implijer..."
-msgstr[1] "Oc'h enporzhiañ %d implijer..."
-
-#: lib/yammerprogressform.php:75
-#, php-format
-msgid "Imported %d user."
-msgid_plural "Imported %d users."
-msgstr[0] "Enporzhiet %d implijer."
-msgstr[1] "Enporzhiet %d implijer."
-
-#: lib/yammerprogressform.php:78
-msgid "Import user groups"
-msgstr "Enporzhiañ strolladoù implijer"
-
-#: lib/yammerprogressform.php:79
-#, php-format
-msgid "Importing %d group..."
-msgid_plural "Importing %d groups..."
-msgstr[0] "Oc'h enporzhiañ %d strollad..."
-msgstr[1] "Oc'h enporzhiañ %d strollad..."
-
-#: lib/yammerprogressform.php:80
-#, php-format
-msgid "Imported %d group."
-msgid_plural "Imported %d groups."
-msgstr[0] "Enporzhiet %d strollad..."
-msgstr[1] "Enporzhiet %d strollad..."
-
-#: lib/yammerprogressform.php:83
-msgid "Prepare public notices for import"
-msgstr "O prientiñ enporzh ar c'hemennoù foran"
-
-#: lib/yammerprogressform.php:84
-#, php-format
-msgid "Preparing %d notice..."
-msgid_plural "Preparing %d notices..."
-msgstr[0] "O prientiñ %d kemenn..."
-msgstr[1] "O prientiñ %d kemenn..."
-
-#: lib/yammerprogressform.php:85
-#, php-format
-msgid "Prepared %d notice."
-msgid_plural "Prepared %d notices."
-msgstr[0] "Prientet %d kemenn."
-msgstr[1] "Prientet %d kemenn."
-
-#: lib/yammerprogressform.php:88
-msgid "Import public notices"
-msgstr "Enporzh kemennoù foran"
-
-#: lib/yammerprogressform.php:89
-#, php-format
-msgid "Importing %d notice..."
-msgid_plural "Importing %d notices..."
-msgstr[0] "Oc'h enporzhiañ %d kemenn..."
-msgstr[1] "Oc'h enporzhiañ %d kemenn..."
-
-#: lib/yammerprogressform.php:90
-#, php-format
-msgid "Imported %d notice."
-msgid_plural "Imported %d notices."
-msgstr[0] "Enporzhiet %d kemenn."
-msgstr[1] "Enporzhiet %d kemenn."
-
-#: lib/yammerprogressform.php:93
-msgid "Done"
-msgstr "Graet"
-
-#: lib/yammerprogressform.php:94 lib/yammerprogressform.php:95
-msgid "Import is complete!"
-msgstr "Enporzh kaset da benn vat !"
-
-#: lib/yammerprogressform.php:108
-msgid "Import status"
-msgstr "Stad an enporzh"
-
-#: lib/yammerprogressform.php:132
-msgid "Waiting..."
-msgstr "O c'hortoz..."
-
-#: lib/yammerprogressform.php:146
-msgid "Reset import state"
-msgstr "Adderaouekaat stad an enporzh"
-
-#: lib/yammerprogressform.php:151
-msgid "Pause import"
-msgstr "Ober un tamm ehan gant an enporzh"
-
-#: lib/yammerprogressform.php:160
-#, php-format
-msgid "Encountered error \"%s\""
-msgstr "C'hoarvezet eo ar fazi \"%s\""
-
-#: lib/yammerprogressform.php:162
-msgid "Paused"
-msgstr "Ehanet"
-
-#: lib/yammerprogressform.php:165
-msgid "Abort import"
-msgstr "Nullañ an enporzh"
-
-#: actions/yammeradminpanel.php:45
 msgid "Yammer Import"
 msgstr "Enporzh Yammer"
 
-#: actions/yammeradminpanel.php:55
 msgid ""
 "This Yammer import tool is still undergoing testing, and is incomplete in "
 "some areas. Currently user subscriptions and group memberships are not "
@@ -277,6 +40,190 @@ msgstr ""
 "bezañ en amzer da zont evit an enporzhiadennoù sevenet gant ar verourien "
 "aotreet eus tu YAMMER."
 
-#: actions/yammeradminpanel.php:102
 msgid "Paused from admin panel."
 msgstr "Ehanet adalek ar banell verañ."
+
+msgid "Yammer import"
+msgstr "Enporzh Yammer"
+
+msgid "Yammer"
+msgstr "Yammer"
+
+msgid "Expertise:"
+msgstr "Prizacha :"
+
+#, php-format
+msgid "Invalid avatar URL %s."
+msgstr "Direizh eo URL an avatar %s."
+
+#, php-format
+msgid "Unable to fetch avatar from %s."
+msgstr "Dibosupl eo adtapout an avatar adalek %s."
+
+msgid "Start authentication"
+msgstr ""
+
+msgid "Request authorization to connect to Yammer account"
+msgstr ""
+
+msgid "Change API key"
+msgstr ""
+
+msgid "Initialize"
+msgstr "Deraouekaat"
+
+msgid "No import running"
+msgstr "Enporzhiadenn ebet o treiñ"
+
+msgid "Initiated Yammer server connection..."
+msgstr "Loc'het ar gevreadenn d'ar servijer Yammer"
+
+msgid "Awaiting authorization..."
+msgstr "O c'hortoz an aotre..."
+
+msgid "Connected."
+msgstr "Kevreet."
+
+msgid "Import user accounts"
+msgstr "Enporzhiañ ar c'hontoù implijer"
+
+#, php-format
+msgid "Importing %d user..."
+msgid_plural "Importing %d users..."
+msgstr[0] "Oc'h enporzhiañ %d implijer..."
+msgstr[1] "Oc'h enporzhiañ %d implijer..."
+
+#, php-format
+msgid "Imported %d user."
+msgid_plural "Imported %d users."
+msgstr[0] "Enporzhiet %d implijer."
+msgstr[1] "Enporzhiet %d implijer."
+
+msgid "Import user groups"
+msgstr "Enporzhiañ strolladoù implijer"
+
+#, php-format
+msgid "Importing %d group..."
+msgid_plural "Importing %d groups..."
+msgstr[0] "Oc'h enporzhiañ %d strollad..."
+msgstr[1] "Oc'h enporzhiañ %d strollad..."
+
+#, php-format
+msgid "Imported %d group."
+msgid_plural "Imported %d groups."
+msgstr[0] "Enporzhiet %d strollad..."
+msgstr[1] "Enporzhiet %d strollad..."
+
+msgid "Prepare public notices for import"
+msgstr "O prientiñ enporzh ar c'hemennoù foran"
+
+#, php-format
+msgid "Preparing %d notice..."
+msgid_plural "Preparing %d notices..."
+msgstr[0] "O prientiñ %d kemenn..."
+msgstr[1] "O prientiñ %d kemenn..."
+
+#, php-format
+msgid "Prepared %d notice."
+msgid_plural "Prepared %d notices."
+msgstr[0] "Prientet %d kemenn."
+msgstr[1] "Prientet %d kemenn."
+
+msgid "Import public notices"
+msgstr "Enporzh kemennoù foran"
+
+#, php-format
+msgid "Importing %d notice..."
+msgid_plural "Importing %d notices..."
+msgstr[0] "Oc'h enporzhiañ %d kemenn..."
+msgstr[1] "Oc'h enporzhiañ %d kemenn..."
+
+#, php-format
+msgid "Imported %d notice."
+msgid_plural "Imported %d notices."
+msgstr[0] "Enporzhiet %d kemenn."
+msgstr[1] "Enporzhiet %d kemenn."
+
+msgid "Done"
+msgstr "Graet"
+
+msgid "Import is complete!"
+msgstr "Enporzh kaset da benn vat !"
+
+msgid "Import status"
+msgstr "Stad an enporzh"
+
+msgid "Waiting..."
+msgstr "O c'hortoz..."
+
+msgid "Reset import state"
+msgstr "Adderaouekaat stad an enporzh"
+
+msgid "Pause import"
+msgstr "Ober un tamm ehan gant an enporzh"
+
+#, php-format
+msgid "Encountered error \"%s\""
+msgstr "C'hoarvezet eo ar fazi \"%s\""
+
+msgid "Paused"
+msgstr "Ehanet"
+
+msgid "Continue"
+msgstr "Kenderc'hel"
+
+msgid "Abort import"
+msgstr "Nullañ an enporzh"
+
+msgid ""
+"Follow this link to confirm authorization at Yammer; you will be prompted to "
+"log in if necessary:"
+msgstr ""
+"Heuliañ al liamm-mañ da gadarnaat an aotre war Yammer ; mar bez ret e vo "
+"goulennet ouzhoc'h kevreañ :"
+
+msgid "Open Yammer authentication window"
+msgstr "Digeriñ prenestr emzisklêriañ Yammer"
+
+msgid "Copy the verification code you are given below:"
+msgstr "Eilit a-is ar c'hod gwiriañ bet roet deoc'h :"
+
+msgid "Verification code:"
+msgstr "Kod gwiriañ :"
+
+msgid "Save code and begin import"
+msgstr "Enrollañ ar c'hod ha kregiñ da enporzhiañ"
+
+msgid "Yammer API registration"
+msgstr "Enrolladenn an API Yammer"
+
+msgid ""
+"Before we can connect to your Yammer network, you will need to register the "
+"importer as an application authorized to pull data on your behalf. This "
+"registration will work only for your own network. Follow this link to "
+"register the app at Yammer; you will be prompted to log in if necessary:"
+msgstr ""
+"Kent gallout kevreañ ouzh ho rouedad Yammer e rankit enrollañ an arload "
+"enporzhiañ evel un arload aotreet da zastum roadennoù en hoc'h anv. Ne "
+"dalvezo an enrolladenn-se nemet evit ho rouedad deoc'h. Heuilhit al liamm-"
+"mañ evit enrollañ an arload war Yammer ; mar bez ret e vo goulennet ouzhoc'h "
+"kevreañ."
+
+msgid "Open Yammer application registration form"
+msgstr "Digeriñ furmskrid enrollañ Yammer"
+
+msgid "Copy the consumer key and secret you are given into the form below:"
+msgstr ""
+"Eilit er furmskrid a-is an alc'hwez hag ar sekred implijer bet roet deoc'h :"
+
+msgid "Consumer key:"
+msgstr "Alc'hwez implijer :"
+
+msgid "Consumer secret:"
+msgstr "Sekred an implijer :"
+
+msgid "Save"
+msgstr "Enrollañ"
+
+msgid "Save these consumer keys"
+msgstr "Enrollañ an alc'hwezioù implijer-mañ"
diff --git a/plugins/YammerImport/locale/fr/LC_MESSAGES/YammerImport.po b/plugins/YammerImport/locale/fr/LC_MESSAGES/YammerImport.po
index 8d09f81e3a..76318b1faf 100644
--- a/plugins/YammerImport/locale/fr/LC_MESSAGES/YammerImport.po
+++ b/plugins/YammerImport/locale/fr/LC_MESSAGES/YammerImport.po
@@ -9,262 +9,24 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - YammerImport\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:21+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:36+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:55+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:55+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-yammerimport\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: YammerImportPlugin.php:98
-msgid "Yammer"
-msgstr "Yammer"
-
-#: YammerImportPlugin.php:99 actions/yammeradminpanel.php:135
-msgid "Yammer import"
-msgstr "Import Yammer"
-
-#: lib/yammerauthinitform.php:48 lib/yammerauthverifyform.php:56
-#: lib/yammerprogressform.php:68 actions/yammerauth.php:71
 msgid "Connect to Yammer"
 msgstr "Connexion à Yammer"
 
-#: lib/yammerauthinitform.php:62
-msgid "Start authentication"
-msgstr "Démarrer l’identification"
-
-#: lib/yammerauthinitform.php:62
-msgid "Request authorization to connect to Yammer account"
-msgstr "Demander l’autorisation de se connecter à un compte Yammer"
-
-#: lib/yammerauthinitform.php:63
-msgid "Change API key"
-msgstr "Changer la clé de l’API"
-
-#: lib/yammerimporter.php:230
-msgid "Expertise:"
-msgstr "Expertise :"
-
-#: lib/yammerimporter.php:433
-#, php-format
-msgid "Invalid avatar URL %s."
-msgstr "URL d’avatar invalide : %s."
-
-#: lib/yammerimporter.php:441
-#, php-format
-msgid "Unable to fetch avatar from %s."
-msgstr "Impossible de récupérer l’avatar depuis « %s »."
-
-#: lib/yammerapikeyform.php:56
-msgid "Yammer API registration"
-msgstr "Enregistrement de l’API Yammer"
-
-#: lib/yammerapikeyform.php:72
-msgid ""
-"Before we can connect to your Yammer network, you will need to register the "
-"importer as an application authorized to pull data on your behalf. This "
-"registration will work only for your own network. Follow this link to "
-"register the app at Yammer; you will be prompted to log in if necessary:"
-msgstr ""
-"Avant de pouvoir nous connecter à votre réseau Yammer, vous devez "
-"enregistrer l’application d’import comme étant autorisée à recueillir des "
-"données en votre nom. Cet enregistrement ne sera valable que pour votre "
-"propre réseau. Suivez ce lien pour enregistrer l’application sur Yammer ; si "
-"cela est nécessaire, il vous sera demandé de vous identifier :"
-
-#: lib/yammerapikeyform.php:84
-msgid "Open Yammer application registration form"
-msgstr "Ouvrir le formulaire d’enregistrement de l’application Yammer"
-
-#: lib/yammerapikeyform.php:87
-msgid "Copy the consumer key and secret you are given into the form below:"
-msgstr ""
-"Copiez dans le formulaire ci-dessous la clé et le secret utilisateur qui "
-"vous sont donnés :"
-
-#: lib/yammerapikeyform.php:91
-msgid "Consumer key:"
-msgstr "Clé de l'utilisateur :"
-
-#: lib/yammerapikeyform.php:94
-msgid "Consumer secret:"
-msgstr "Secret de l'utilisateur :"
-
-#: lib/yammerapikeyform.php:98
-msgid "Save"
-msgstr "Sauvegarder"
-
-#: lib/yammerapikeyform.php:98
-msgid "Save these consumer keys"
-msgstr "Enregistrer ces clés utilisateur"
-
-#: lib/yammerauthverifyform.php:72
-msgid ""
-"Follow this link to confirm authorization at Yammer; you will be prompted to "
-"log in if necessary:"
-msgstr ""
-"Suivez ce lien pour confirmer l’autorisation sur Yammer ; il vous sera "
-"demandé de vous identifier si nécessaire :"
-
-#: lib/yammerauthverifyform.php:87
-msgid "Open Yammer authentication window"
-msgstr "Ouvrir la fenêtre d’identification Yammer"
-
-#: lib/yammerauthverifyform.php:90
-msgid "Copy the verification code you are given below:"
-msgstr "Copiez ci-dessous le code de vérification qui vous est donné :"
-
-#: lib/yammerauthverifyform.php:94
-msgid "Verification code:"
-msgstr "Code de vérification :"
-
-#: lib/yammerauthverifyform.php:98 lib/yammerprogressform.php:164
-msgid "Continue"
-msgstr "Continuer"
-
-#: lib/yammerauthverifyform.php:98
-msgid "Save code and begin import"
-msgstr "Enregistrer le code et commencer l’import"
-
-#: lib/yammerprogressform.php:63
-msgid "Initialize"
-msgstr "Initialiser"
-
-#: lib/yammerprogressform.php:64
-msgid "No import running"
-msgstr "Aucun import en cours d’exécution"
-
-#: lib/yammerprogressform.php:65
-msgid "Initiated Yammer server connection..."
-msgstr "Connexion au serveur Yammer initiée..."
-
-#: lib/yammerprogressform.php:69
-msgid "Awaiting authorization..."
-msgstr "En attente d’autorisation..."
-
-#: lib/yammerprogressform.php:70
-msgid "Connected."
-msgstr "Connecté."
-
-#: lib/yammerprogressform.php:73
-msgid "Import user accounts"
-msgstr "Importer des comptes utilisateur"
-
-#: lib/yammerprogressform.php:74
-#, php-format
-msgid "Importing %d user..."
-msgid_plural "Importing %d users..."
-msgstr[0] "Import de %d utilisateur..."
-msgstr[1] "Import de %d utilisateurs..."
-
-#: lib/yammerprogressform.php:75
-#, php-format
-msgid "Imported %d user."
-msgid_plural "Imported %d users."
-msgstr[0] "%d utilisateur importé."
-msgstr[1] "%d utilisateurs importés."
-
-#: lib/yammerprogressform.php:78
-msgid "Import user groups"
-msgstr "Importer des groupes utilisateur"
-
-#: lib/yammerprogressform.php:79
-#, php-format
-msgid "Importing %d group..."
-msgid_plural "Importing %d groups..."
-msgstr[0] "Import de %d groupe..."
-msgstr[1] "Import de %d groupes..."
-
-#: lib/yammerprogressform.php:80
-#, php-format
-msgid "Imported %d group."
-msgid_plural "Imported %d groups."
-msgstr[0] "%d groupe importé."
-msgstr[1] "%d groupes importés."
-
-#: lib/yammerprogressform.php:83
-msgid "Prepare public notices for import"
-msgstr "Préparation de l’import d’avis publiques"
-
-#: lib/yammerprogressform.php:84
-#, php-format
-msgid "Preparing %d notice..."
-msgid_plural "Preparing %d notices..."
-msgstr[0] "Préparation de %d avis..."
-msgstr[1] "Préparation de %d avis..."
-
-#: lib/yammerprogressform.php:85
-#, php-format
-msgid "Prepared %d notice."
-msgid_plural "Prepared %d notices."
-msgstr[0] "%d avis prépara."
-msgstr[1] "%d avis préparés."
-
-#: lib/yammerprogressform.php:88
-msgid "Import public notices"
-msgstr "Import d’avis publiques"
-
-#: lib/yammerprogressform.php:89
-#, php-format
-msgid "Importing %d notice..."
-msgid_plural "Importing %d notices..."
-msgstr[0] "Import de %d avis..."
-msgstr[1] "Import de %d avis..."
-
-#: lib/yammerprogressform.php:90
-#, php-format
-msgid "Imported %d notice."
-msgid_plural "Imported %d notices."
-msgstr[0] "%d avis importé."
-msgstr[1] "%d avis importés."
-
-#: lib/yammerprogressform.php:93
-msgid "Done"
-msgstr "Fait"
-
-#: lib/yammerprogressform.php:94 lib/yammerprogressform.php:95
-msgid "Import is complete!"
-msgstr "L’import est terminé !"
-
-#: lib/yammerprogressform.php:108
-msgid "Import status"
-msgstr "État de l’import"
-
-#: lib/yammerprogressform.php:132
-msgid "Waiting..."
-msgstr "Attente..."
-
-#: lib/yammerprogressform.php:146
-msgid "Reset import state"
-msgstr "Réinitialiser l’état de l’import"
-
-#: lib/yammerprogressform.php:151
-msgid "Pause import"
-msgstr "Mettre l’import en pause"
-
-#: lib/yammerprogressform.php:160
-#, php-format
-msgid "Encountered error \"%s\""
-msgstr "L’erreur « %s » est survenue"
-
-#: lib/yammerprogressform.php:162
-msgid "Paused"
-msgstr "En pause"
-
-#: lib/yammerprogressform.php:165
-msgid "Abort import"
-msgstr "Abandonner l’import"
-
-#: actions/yammeradminpanel.php:45
 msgid "Yammer Import"
 msgstr "Import Yammer"
 
-#: actions/yammeradminpanel.php:55
 msgid ""
 "This Yammer import tool is still undergoing testing, and is incomplete in "
 "some areas. Currently user subscriptions and group memberships are not "
@@ -277,6 +39,191 @@ msgstr ""
 "le futur pour les imports réalisés par les administrateurs autorisés du côté "
 "de Yammer."
 
-#: actions/yammeradminpanel.php:102
 msgid "Paused from admin panel."
 msgstr "Mis en pause depuis le panneau d’administration"
+
+msgid "Yammer import"
+msgstr "Import Yammer"
+
+msgid "Yammer"
+msgstr "Yammer"
+
+msgid "Expertise:"
+msgstr "Expertise :"
+
+#, php-format
+msgid "Invalid avatar URL %s."
+msgstr "URL d’avatar invalide : %s."
+
+#, php-format
+msgid "Unable to fetch avatar from %s."
+msgstr "Impossible de récupérer l’avatar depuis « %s »."
+
+msgid "Start authentication"
+msgstr "Démarrer l’identification"
+
+msgid "Request authorization to connect to Yammer account"
+msgstr "Demander l’autorisation de se connecter à un compte Yammer"
+
+msgid "Change API key"
+msgstr "Changer la clé de l’API"
+
+msgid "Initialize"
+msgstr "Initialiser"
+
+msgid "No import running"
+msgstr "Aucun import en cours d’exécution"
+
+msgid "Initiated Yammer server connection..."
+msgstr "Connexion au serveur Yammer initiée..."
+
+msgid "Awaiting authorization..."
+msgstr "En attente d’autorisation..."
+
+msgid "Connected."
+msgstr "Connecté."
+
+msgid "Import user accounts"
+msgstr "Importer des comptes utilisateur"
+
+#, php-format
+msgid "Importing %d user..."
+msgid_plural "Importing %d users..."
+msgstr[0] "Import de %d utilisateur..."
+msgstr[1] "Import de %d utilisateurs..."
+
+#, php-format
+msgid "Imported %d user."
+msgid_plural "Imported %d users."
+msgstr[0] "%d utilisateur importé."
+msgstr[1] "%d utilisateurs importés."
+
+msgid "Import user groups"
+msgstr "Importer des groupes utilisateur"
+
+#, php-format
+msgid "Importing %d group..."
+msgid_plural "Importing %d groups..."
+msgstr[0] "Import de %d groupe..."
+msgstr[1] "Import de %d groupes..."
+
+#, php-format
+msgid "Imported %d group."
+msgid_plural "Imported %d groups."
+msgstr[0] "%d groupe importé."
+msgstr[1] "%d groupes importés."
+
+msgid "Prepare public notices for import"
+msgstr "Préparation de l’import d’avis publiques"
+
+#, php-format
+msgid "Preparing %d notice..."
+msgid_plural "Preparing %d notices..."
+msgstr[0] "Préparation de %d avis..."
+msgstr[1] "Préparation de %d avis..."
+
+#, php-format
+msgid "Prepared %d notice."
+msgid_plural "Prepared %d notices."
+msgstr[0] "%d avis prépara."
+msgstr[1] "%d avis préparés."
+
+msgid "Import public notices"
+msgstr "Import d’avis publiques"
+
+#, php-format
+msgid "Importing %d notice..."
+msgid_plural "Importing %d notices..."
+msgstr[0] "Import de %d avis..."
+msgstr[1] "Import de %d avis..."
+
+#, php-format
+msgid "Imported %d notice."
+msgid_plural "Imported %d notices."
+msgstr[0] "%d avis importé."
+msgstr[1] "%d avis importés."
+
+msgid "Done"
+msgstr "Fait"
+
+msgid "Import is complete!"
+msgstr "L’import est terminé !"
+
+msgid "Import status"
+msgstr "État de l’import"
+
+msgid "Waiting..."
+msgstr "Attente..."
+
+msgid "Reset import state"
+msgstr "Réinitialiser l’état de l’import"
+
+msgid "Pause import"
+msgstr "Mettre l’import en pause"
+
+#, php-format
+msgid "Encountered error \"%s\""
+msgstr "L’erreur « %s » est survenue"
+
+msgid "Paused"
+msgstr "En pause"
+
+msgid "Continue"
+msgstr "Continuer"
+
+msgid "Abort import"
+msgstr "Abandonner l’import"
+
+msgid ""
+"Follow this link to confirm authorization at Yammer; you will be prompted to "
+"log in if necessary:"
+msgstr ""
+"Suivez ce lien pour confirmer l’autorisation sur Yammer ; il vous sera "
+"demandé de vous identifier si nécessaire :"
+
+msgid "Open Yammer authentication window"
+msgstr "Ouvrir la fenêtre d’identification Yammer"
+
+msgid "Copy the verification code you are given below:"
+msgstr "Copiez ci-dessous le code de vérification qui vous est donné :"
+
+msgid "Verification code:"
+msgstr "Code de vérification :"
+
+msgid "Save code and begin import"
+msgstr "Enregistrer le code et commencer l’import"
+
+msgid "Yammer API registration"
+msgstr "Enregistrement de l’API Yammer"
+
+msgid ""
+"Before we can connect to your Yammer network, you will need to register the "
+"importer as an application authorized to pull data on your behalf. This "
+"registration will work only for your own network. Follow this link to "
+"register the app at Yammer; you will be prompted to log in if necessary:"
+msgstr ""
+"Avant de pouvoir nous connecter à votre réseau Yammer, vous devez "
+"enregistrer l’application d’import comme étant autorisée à recueillir des "
+"données en votre nom. Cet enregistrement ne sera valable que pour votre "
+"propre réseau. Suivez ce lien pour enregistrer l’application sur Yammer ; si "
+"cela est nécessaire, il vous sera demandé de vous identifier :"
+
+msgid "Open Yammer application registration form"
+msgstr "Ouvrir le formulaire d’enregistrement de l’application Yammer"
+
+msgid "Copy the consumer key and secret you are given into the form below:"
+msgstr ""
+"Copiez dans le formulaire ci-dessous la clé et le secret utilisateur qui "
+"vous sont donnés :"
+
+msgid "Consumer key:"
+msgstr "Clé de l'utilisateur :"
+
+msgid "Consumer secret:"
+msgstr "Secret de l'utilisateur :"
+
+msgid "Save"
+msgstr "Sauvegarder"
+
+msgid "Save these consumer keys"
+msgstr "Enregistrer ces clés utilisateur"
diff --git a/plugins/YammerImport/locale/gl/LC_MESSAGES/YammerImport.po b/plugins/YammerImport/locale/gl/LC_MESSAGES/YammerImport.po
index 543f1e22c9..c3a59edae8 100644
--- a/plugins/YammerImport/locale/gl/LC_MESSAGES/YammerImport.po
+++ b/plugins/YammerImport/locale/gl/LC_MESSAGES/YammerImport.po
@@ -9,253 +9,24 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - YammerImport\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:21+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:36+0000\n"
 "Language-Team: Galician <http://translatewiki.net/wiki/Portal:gl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:55+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:55+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: gl\n"
 "X-Message-Group: #out-statusnet-plugin-yammerimport\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: YammerImportPlugin.php:98
-msgid "Yammer"
-msgstr ""
-
-#: YammerImportPlugin.php:99 actions/yammeradminpanel.php:135
-msgid "Yammer import"
-msgstr ""
-
-#: lib/yammerauthinitform.php:48 lib/yammerauthverifyform.php:56
-#: lib/yammerprogressform.php:68 actions/yammerauth.php:71
 msgid "Connect to Yammer"
 msgstr ""
 
-#: lib/yammerauthinitform.php:62
-msgid "Start authentication"
-msgstr ""
-
-#: lib/yammerauthinitform.php:62
-msgid "Request authorization to connect to Yammer account"
-msgstr ""
-
-#: lib/yammerauthinitform.php:63
-msgid "Change API key"
-msgstr ""
-
-#: lib/yammerimporter.php:230
-msgid "Expertise:"
-msgstr ""
-
-#: lib/yammerimporter.php:433
-#, php-format
-msgid "Invalid avatar URL %s."
-msgstr ""
-
-#: lib/yammerimporter.php:441
-#, php-format
-msgid "Unable to fetch avatar from %s."
-msgstr ""
-
-#: lib/yammerapikeyform.php:56
-msgid "Yammer API registration"
-msgstr ""
-
-#: lib/yammerapikeyform.php:72
-msgid ""
-"Before we can connect to your Yammer network, you will need to register the "
-"importer as an application authorized to pull data on your behalf. This "
-"registration will work only for your own network. Follow this link to "
-"register the app at Yammer; you will be prompted to log in if necessary:"
-msgstr ""
-
-#: lib/yammerapikeyform.php:84
-msgid "Open Yammer application registration form"
-msgstr ""
-
-#: lib/yammerapikeyform.php:87
-msgid "Copy the consumer key and secret you are given into the form below:"
-msgstr ""
-
-#: lib/yammerapikeyform.php:91
-msgid "Consumer key:"
-msgstr "Clave do consumidor:"
-
-#: lib/yammerapikeyform.php:94
-msgid "Consumer secret:"
-msgstr "Pregunta secreta do consumidor:"
-
-#: lib/yammerapikeyform.php:98
-msgid "Save"
-msgstr "Gardar"
-
-#: lib/yammerapikeyform.php:98
-msgid "Save these consumer keys"
-msgstr ""
-
-#: lib/yammerauthverifyform.php:72
-msgid ""
-"Follow this link to confirm authorization at Yammer; you will be prompted to "
-"log in if necessary:"
-msgstr ""
-
-#: lib/yammerauthverifyform.php:87
-msgid "Open Yammer authentication window"
-msgstr ""
-
-#: lib/yammerauthverifyform.php:90
-msgid "Copy the verification code you are given below:"
-msgstr ""
-
-#: lib/yammerauthverifyform.php:94
-msgid "Verification code:"
-msgstr "Código de verificación:"
-
-#: lib/yammerauthverifyform.php:98 lib/yammerprogressform.php:164
-msgid "Continue"
-msgstr "Continuar"
-
-#: lib/yammerauthverifyform.php:98
-msgid "Save code and begin import"
-msgstr ""
-
-#: lib/yammerprogressform.php:63
-msgid "Initialize"
-msgstr "Iniciar"
-
-#: lib/yammerprogressform.php:64
-msgid "No import running"
-msgstr ""
-
-#: lib/yammerprogressform.php:65
-msgid "Initiated Yammer server connection..."
-msgstr ""
-
-#: lib/yammerprogressform.php:69
-msgid "Awaiting authorization..."
-msgstr "Agardando a autorización..."
-
-#: lib/yammerprogressform.php:70
-msgid "Connected."
-msgstr "Conectado."
-
-#: lib/yammerprogressform.php:73
-msgid "Import user accounts"
-msgstr ""
-
-#: lib/yammerprogressform.php:74
-#, php-format
-msgid "Importing %d user..."
-msgid_plural "Importing %d users..."
-msgstr[0] ""
-msgstr[1] ""
-
-#: lib/yammerprogressform.php:75
-#, php-format
-msgid "Imported %d user."
-msgid_plural "Imported %d users."
-msgstr[0] ""
-msgstr[1] ""
-
-#: lib/yammerprogressform.php:78
-msgid "Import user groups"
-msgstr ""
-
-#: lib/yammerprogressform.php:79
-#, php-format
-msgid "Importing %d group..."
-msgid_plural "Importing %d groups..."
-msgstr[0] ""
-msgstr[1] ""
-
-#: lib/yammerprogressform.php:80
-#, php-format
-msgid "Imported %d group."
-msgid_plural "Imported %d groups."
-msgstr[0] ""
-msgstr[1] ""
-
-#: lib/yammerprogressform.php:83
-msgid "Prepare public notices for import"
-msgstr ""
-
-#: lib/yammerprogressform.php:84
-#, php-format
-msgid "Preparing %d notice..."
-msgid_plural "Preparing %d notices..."
-msgstr[0] ""
-msgstr[1] ""
-
-#: lib/yammerprogressform.php:85
-#, php-format
-msgid "Prepared %d notice."
-msgid_plural "Prepared %d notices."
-msgstr[0] ""
-msgstr[1] ""
-
-#: lib/yammerprogressform.php:88
-msgid "Import public notices"
-msgstr ""
-
-#: lib/yammerprogressform.php:89
-#, php-format
-msgid "Importing %d notice..."
-msgid_plural "Importing %d notices..."
-msgstr[0] ""
-msgstr[1] ""
-
-#: lib/yammerprogressform.php:90
-#, php-format
-msgid "Imported %d notice."
-msgid_plural "Imported %d notices."
-msgstr[0] ""
-msgstr[1] ""
-
-#: lib/yammerprogressform.php:93
-msgid "Done"
-msgstr "Feito"
-
-#: lib/yammerprogressform.php:94 lib/yammerprogressform.php:95
-msgid "Import is complete!"
-msgstr "Completouse a importación!"
-
-#: lib/yammerprogressform.php:108
-msgid "Import status"
-msgstr "Estado da importación"
-
-#: lib/yammerprogressform.php:132
-msgid "Waiting..."
-msgstr "Agarde..."
-
-#: lib/yammerprogressform.php:146
-msgid "Reset import state"
-msgstr "Reiniciar o estado da importación"
-
-#: lib/yammerprogressform.php:151
-msgid "Pause import"
-msgstr "Pausar a importación"
-
-#: lib/yammerprogressform.php:160
-#, php-format
-msgid "Encountered error \"%s\""
-msgstr "Atopouse o erro \"%s\""
-
-#: lib/yammerprogressform.php:162
-msgid "Paused"
-msgstr "En pausa"
-
-#: lib/yammerprogressform.php:165
-msgid "Abort import"
-msgstr "Abortar a importación"
-
-#: actions/yammeradminpanel.php:45
 msgid "Yammer Import"
 msgstr "Importación Yammer"
 
-#: actions/yammeradminpanel.php:55
 msgid ""
 "This Yammer import tool is still undergoing testing, and is incomplete in "
 "some areas. Currently user subscriptions and group memberships are not "
@@ -263,6 +34,182 @@ msgid ""
 "verified administrators on the Yammer side."
 msgstr ""
 
-#: actions/yammeradminpanel.php:102
 msgid "Paused from admin panel."
 msgstr "En pausa desde o panel de administración."
+
+msgid "Yammer import"
+msgstr ""
+
+msgid "Yammer"
+msgstr ""
+
+msgid "Expertise:"
+msgstr ""
+
+#, php-format
+msgid "Invalid avatar URL %s."
+msgstr ""
+
+#, php-format
+msgid "Unable to fetch avatar from %s."
+msgstr ""
+
+msgid "Start authentication"
+msgstr ""
+
+msgid "Request authorization to connect to Yammer account"
+msgstr ""
+
+msgid "Change API key"
+msgstr ""
+
+msgid "Initialize"
+msgstr "Iniciar"
+
+msgid "No import running"
+msgstr ""
+
+msgid "Initiated Yammer server connection..."
+msgstr ""
+
+msgid "Awaiting authorization..."
+msgstr "Agardando a autorización..."
+
+msgid "Connected."
+msgstr "Conectado."
+
+msgid "Import user accounts"
+msgstr ""
+
+#, php-format
+msgid "Importing %d user..."
+msgid_plural "Importing %d users..."
+msgstr[0] ""
+msgstr[1] ""
+
+#, php-format
+msgid "Imported %d user."
+msgid_plural "Imported %d users."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Import user groups"
+msgstr ""
+
+#, php-format
+msgid "Importing %d group..."
+msgid_plural "Importing %d groups..."
+msgstr[0] ""
+msgstr[1] ""
+
+#, php-format
+msgid "Imported %d group."
+msgid_plural "Imported %d groups."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Prepare public notices for import"
+msgstr ""
+
+#, php-format
+msgid "Preparing %d notice..."
+msgid_plural "Preparing %d notices..."
+msgstr[0] ""
+msgstr[1] ""
+
+#, php-format
+msgid "Prepared %d notice."
+msgid_plural "Prepared %d notices."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Import public notices"
+msgstr ""
+
+#, php-format
+msgid "Importing %d notice..."
+msgid_plural "Importing %d notices..."
+msgstr[0] ""
+msgstr[1] ""
+
+#, php-format
+msgid "Imported %d notice."
+msgid_plural "Imported %d notices."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Done"
+msgstr "Feito"
+
+msgid "Import is complete!"
+msgstr "Completouse a importación!"
+
+msgid "Import status"
+msgstr "Estado da importación"
+
+msgid "Waiting..."
+msgstr "Agarde..."
+
+msgid "Reset import state"
+msgstr "Reiniciar o estado da importación"
+
+msgid "Pause import"
+msgstr "Pausar a importación"
+
+#, php-format
+msgid "Encountered error \"%s\""
+msgstr "Atopouse o erro \"%s\""
+
+msgid "Paused"
+msgstr "En pausa"
+
+msgid "Continue"
+msgstr "Continuar"
+
+msgid "Abort import"
+msgstr "Abortar a importación"
+
+msgid ""
+"Follow this link to confirm authorization at Yammer; you will be prompted to "
+"log in if necessary:"
+msgstr ""
+
+msgid "Open Yammer authentication window"
+msgstr ""
+
+msgid "Copy the verification code you are given below:"
+msgstr ""
+
+msgid "Verification code:"
+msgstr "Código de verificación:"
+
+msgid "Save code and begin import"
+msgstr ""
+
+msgid "Yammer API registration"
+msgstr ""
+
+msgid ""
+"Before we can connect to your Yammer network, you will need to register the "
+"importer as an application authorized to pull data on your behalf. This "
+"registration will work only for your own network. Follow this link to "
+"register the app at Yammer; you will be prompted to log in if necessary:"
+msgstr ""
+
+msgid "Open Yammer application registration form"
+msgstr ""
+
+msgid "Copy the consumer key and secret you are given into the form below:"
+msgstr ""
+
+msgid "Consumer key:"
+msgstr "Clave do consumidor:"
+
+msgid "Consumer secret:"
+msgstr "Pregunta secreta do consumidor:"
+
+msgid "Save"
+msgstr "Gardar"
+
+msgid "Save these consumer keys"
+msgstr ""
diff --git a/plugins/YammerImport/locale/ia/LC_MESSAGES/YammerImport.po b/plugins/YammerImport/locale/ia/LC_MESSAGES/YammerImport.po
index 172dcae8d1..95f76f8717 100644
--- a/plugins/YammerImport/locale/ia/LC_MESSAGES/YammerImport.po
+++ b/plugins/YammerImport/locale/ia/LC_MESSAGES/YammerImport.po
@@ -9,262 +9,24 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - YammerImport\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:21+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:36+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:55+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:55+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-yammerimport\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: YammerImportPlugin.php:98
-msgid "Yammer"
-msgstr "Yammer"
-
-#: YammerImportPlugin.php:99 actions/yammeradminpanel.php:135
-msgid "Yammer import"
-msgstr "Importation de Yammer"
-
-#: lib/yammerauthinitform.php:48 lib/yammerauthverifyform.php:56
-#: lib/yammerprogressform.php:68 actions/yammerauth.php:71
 msgid "Connect to Yammer"
 msgstr "Connecter a Yammer"
 
-#: lib/yammerauthinitform.php:62
-msgid "Start authentication"
-msgstr "Comenciar authentication"
-
-#: lib/yammerauthinitform.php:62
-msgid "Request authorization to connect to Yammer account"
-msgstr "Requestar autorisation de connecter al conto Yammer"
-
-#: lib/yammerauthinitform.php:63
-msgid "Change API key"
-msgstr "Cambiar clave API"
-
-#: lib/yammerimporter.php:230
-msgid "Expertise:"
-msgstr "Expertise:"
-
-#: lib/yammerimporter.php:433
-#, php-format
-msgid "Invalid avatar URL %s."
-msgstr "URL de avatar %s invalide."
-
-#: lib/yammerimporter.php:441
-#, php-format
-msgid "Unable to fetch avatar from %s."
-msgstr "Incapace de obtener avatar ab %s."
-
-#: lib/yammerapikeyform.php:56
-msgid "Yammer API registration"
-msgstr "Registration in API de Yammer"
-
-#: lib/yammerapikeyform.php:72
-msgid ""
-"Before we can connect to your Yammer network, you will need to register the "
-"importer as an application authorized to pull data on your behalf. This "
-"registration will work only for your own network. Follow this link to "
-"register the app at Yammer; you will be prompted to log in if necessary:"
-msgstr ""
-"Ante que nos pote connecter a tu rete Yammer, tu debe registrar le "
-"importator como application autorisate a colliger datos in tu nomine. Iste "
-"registration functionara solmente pro tu proprie rete. Seque iste ligamine "
-"pro registrar le application a Yammer; tu essera demandate de aperir session "
-"si necessari:"
-
-#: lib/yammerapikeyform.php:84
-msgid "Open Yammer application registration form"
-msgstr "Aperir formulario de registration del application Yammer"
-
-#: lib/yammerapikeyform.php:87
-msgid "Copy the consumer key and secret you are given into the form below:"
-msgstr ""
-"Copia le clave e secreto de consumitor que tu recipe in le formulario hic "
-"infra:"
-
-#: lib/yammerapikeyform.php:91
-msgid "Consumer key:"
-msgstr "Clave de consumitor:"
-
-#: lib/yammerapikeyform.php:94
-msgid "Consumer secret:"
-msgstr "Secreto de consumitor:"
-
-#: lib/yammerapikeyform.php:98
-msgid "Save"
-msgstr "Salveguardar"
-
-#: lib/yammerapikeyform.php:98
-msgid "Save these consumer keys"
-msgstr "Salveguardar iste claves de consumitor"
-
-#: lib/yammerauthverifyform.php:72
-msgid ""
-"Follow this link to confirm authorization at Yammer; you will be prompted to "
-"log in if necessary:"
-msgstr ""
-"Seque iste ligamine pro confirmar autorisation a Yammer; tu essera demandate "
-"de aperir session si necessari:"
-
-#: lib/yammerauthverifyform.php:87
-msgid "Open Yammer authentication window"
-msgstr "Aperir fenestra de authentication a Yammer"
-
-#: lib/yammerauthverifyform.php:90
-msgid "Copy the verification code you are given below:"
-msgstr "Copia hic infra le codice de verification que tu recipe:"
-
-#: lib/yammerauthverifyform.php:94
-msgid "Verification code:"
-msgstr "Codice de verification:"
-
-#: lib/yammerauthverifyform.php:98 lib/yammerprogressform.php:164
-msgid "Continue"
-msgstr "Continuar"
-
-#: lib/yammerauthverifyform.php:98
-msgid "Save code and begin import"
-msgstr "Salveguardar codice e comenciar importation"
-
-#: lib/yammerprogressform.php:63
-msgid "Initialize"
-msgstr "Initialisar"
-
-#: lib/yammerprogressform.php:64
-msgid "No import running"
-msgstr "Nulle importation in curso"
-
-#: lib/yammerprogressform.php:65
-msgid "Initiated Yammer server connection..."
-msgstr "Connexion al servitor Yammer initiate..."
-
-#: lib/yammerprogressform.php:69
-msgid "Awaiting authorization..."
-msgstr "Attende autorisation..."
-
-#: lib/yammerprogressform.php:70
-msgid "Connected."
-msgstr "Connectite."
-
-#: lib/yammerprogressform.php:73
-msgid "Import user accounts"
-msgstr "Importar contos de usator"
-
-#: lib/yammerprogressform.php:74
-#, php-format
-msgid "Importing %d user..."
-msgid_plural "Importing %d users..."
-msgstr[0] "Importa %d usator..."
-msgstr[1] "Importa %d usatores..."
-
-#: lib/yammerprogressform.php:75
-#, php-format
-msgid "Imported %d user."
-msgid_plural "Imported %d users."
-msgstr[0] "%d usator importate."
-msgstr[1] "%d usatores importate."
-
-#: lib/yammerprogressform.php:78
-msgid "Import user groups"
-msgstr "Importar gruppos de usatores"
-
-#: lib/yammerprogressform.php:79
-#, php-format
-msgid "Importing %d group..."
-msgid_plural "Importing %d groups..."
-msgstr[0] "Importa %d gruppo..."
-msgstr[1] "Importa %d gruppos..."
-
-#: lib/yammerprogressform.php:80
-#, php-format
-msgid "Imported %d group."
-msgid_plural "Imported %d groups."
-msgstr[0] "%d gruppo importate."
-msgstr[1] "%d gruppos importate."
-
-#: lib/yammerprogressform.php:83
-msgid "Prepare public notices for import"
-msgstr "Preparar notas public pro importation"
-
-#: lib/yammerprogressform.php:84
-#, php-format
-msgid "Preparing %d notice..."
-msgid_plural "Preparing %d notices..."
-msgstr[0] "Prepara %d nota..."
-msgstr[1] "Prepara %d notas..."
-
-#: lib/yammerprogressform.php:85
-#, php-format
-msgid "Prepared %d notice."
-msgid_plural "Prepared %d notices."
-msgstr[0] "%d nota preparate."
-msgstr[1] "%d notas preparate."
-
-#: lib/yammerprogressform.php:88
-msgid "Import public notices"
-msgstr "Importar notas public"
-
-#: lib/yammerprogressform.php:89
-#, php-format
-msgid "Importing %d notice..."
-msgid_plural "Importing %d notices..."
-msgstr[0] "Importa %d nota..."
-msgstr[1] "Importa %d notas..."
-
-#: lib/yammerprogressform.php:90
-#, php-format
-msgid "Imported %d notice."
-msgid_plural "Imported %d notices."
-msgstr[0] "%d nota importate."
-msgstr[1] "%d notas importate."
-
-#: lib/yammerprogressform.php:93
-msgid "Done"
-msgstr "Finite"
-
-#: lib/yammerprogressform.php:94 lib/yammerprogressform.php:95
-msgid "Import is complete!"
-msgstr "Le importation es complete!"
-
-#: lib/yammerprogressform.php:108
-msgid "Import status"
-msgstr "Stato de importation"
-
-#: lib/yammerprogressform.php:132
-msgid "Waiting..."
-msgstr "Attende..."
-
-#: lib/yammerprogressform.php:146
-msgid "Reset import state"
-msgstr "Reinitialisar stato de importation"
-
-#: lib/yammerprogressform.php:151
-msgid "Pause import"
-msgstr "Pausar importation"
-
-#: lib/yammerprogressform.php:160
-#, php-format
-msgid "Encountered error \"%s\""
-msgstr "Incontrava error \"%s\""
-
-#: lib/yammerprogressform.php:162
-msgid "Paused"
-msgstr "Pausate"
-
-#: lib/yammerprogressform.php:165
-msgid "Abort import"
-msgstr "Abortar importation"
-
-#: actions/yammeradminpanel.php:45
 msgid "Yammer Import"
 msgstr "Importation de Yammer"
 
-#: actions/yammeradminpanel.php:55
 msgid ""
 "This Yammer import tool is still undergoing testing, and is incomplete in "
 "some areas. Currently user subscriptions and group memberships are not "
@@ -277,6 +39,191 @@ msgstr ""
 "supportate pro importationes facite per administratores verificate al latere "
 "de Yammer."
 
-#: actions/yammeradminpanel.php:102
 msgid "Paused from admin panel."
 msgstr "Pausate ab le pannello admin."
+
+msgid "Yammer import"
+msgstr "Importation de Yammer"
+
+msgid "Yammer"
+msgstr "Yammer"
+
+msgid "Expertise:"
+msgstr "Expertise:"
+
+#, php-format
+msgid "Invalid avatar URL %s."
+msgstr "URL de avatar %s invalide."
+
+#, php-format
+msgid "Unable to fetch avatar from %s."
+msgstr "Incapace de obtener avatar ab %s."
+
+msgid "Start authentication"
+msgstr "Comenciar authentication"
+
+msgid "Request authorization to connect to Yammer account"
+msgstr "Requestar autorisation de connecter al conto Yammer"
+
+msgid "Change API key"
+msgstr "Cambiar clave API"
+
+msgid "Initialize"
+msgstr "Initialisar"
+
+msgid "No import running"
+msgstr "Nulle importation in curso"
+
+msgid "Initiated Yammer server connection..."
+msgstr "Connexion al servitor Yammer initiate..."
+
+msgid "Awaiting authorization..."
+msgstr "Attende autorisation..."
+
+msgid "Connected."
+msgstr "Connectite."
+
+msgid "Import user accounts"
+msgstr "Importar contos de usator"
+
+#, php-format
+msgid "Importing %d user..."
+msgid_plural "Importing %d users..."
+msgstr[0] "Importa %d usator..."
+msgstr[1] "Importa %d usatores..."
+
+#, php-format
+msgid "Imported %d user."
+msgid_plural "Imported %d users."
+msgstr[0] "%d usator importate."
+msgstr[1] "%d usatores importate."
+
+msgid "Import user groups"
+msgstr "Importar gruppos de usatores"
+
+#, php-format
+msgid "Importing %d group..."
+msgid_plural "Importing %d groups..."
+msgstr[0] "Importa %d gruppo..."
+msgstr[1] "Importa %d gruppos..."
+
+#, php-format
+msgid "Imported %d group."
+msgid_plural "Imported %d groups."
+msgstr[0] "%d gruppo importate."
+msgstr[1] "%d gruppos importate."
+
+msgid "Prepare public notices for import"
+msgstr "Preparar notas public pro importation"
+
+#, php-format
+msgid "Preparing %d notice..."
+msgid_plural "Preparing %d notices..."
+msgstr[0] "Prepara %d nota..."
+msgstr[1] "Prepara %d notas..."
+
+#, php-format
+msgid "Prepared %d notice."
+msgid_plural "Prepared %d notices."
+msgstr[0] "%d nota preparate."
+msgstr[1] "%d notas preparate."
+
+msgid "Import public notices"
+msgstr "Importar notas public"
+
+#, php-format
+msgid "Importing %d notice..."
+msgid_plural "Importing %d notices..."
+msgstr[0] "Importa %d nota..."
+msgstr[1] "Importa %d notas..."
+
+#, php-format
+msgid "Imported %d notice."
+msgid_plural "Imported %d notices."
+msgstr[0] "%d nota importate."
+msgstr[1] "%d notas importate."
+
+msgid "Done"
+msgstr "Finite"
+
+msgid "Import is complete!"
+msgstr "Le importation es complete!"
+
+msgid "Import status"
+msgstr "Stato de importation"
+
+msgid "Waiting..."
+msgstr "Attende..."
+
+msgid "Reset import state"
+msgstr "Reinitialisar stato de importation"
+
+msgid "Pause import"
+msgstr "Pausar importation"
+
+#, php-format
+msgid "Encountered error \"%s\""
+msgstr "Incontrava error \"%s\""
+
+msgid "Paused"
+msgstr "Pausate"
+
+msgid "Continue"
+msgstr "Continuar"
+
+msgid "Abort import"
+msgstr "Abortar importation"
+
+msgid ""
+"Follow this link to confirm authorization at Yammer; you will be prompted to "
+"log in if necessary:"
+msgstr ""
+"Seque iste ligamine pro confirmar autorisation a Yammer; tu essera demandate "
+"de aperir session si necessari:"
+
+msgid "Open Yammer authentication window"
+msgstr "Aperir fenestra de authentication a Yammer"
+
+msgid "Copy the verification code you are given below:"
+msgstr "Copia hic infra le codice de verification que tu recipe:"
+
+msgid "Verification code:"
+msgstr "Codice de verification:"
+
+msgid "Save code and begin import"
+msgstr "Salveguardar codice e comenciar importation"
+
+msgid "Yammer API registration"
+msgstr "Registration in API de Yammer"
+
+msgid ""
+"Before we can connect to your Yammer network, you will need to register the "
+"importer as an application authorized to pull data on your behalf. This "
+"registration will work only for your own network. Follow this link to "
+"register the app at Yammer; you will be prompted to log in if necessary:"
+msgstr ""
+"Ante que nos pote connecter a tu rete Yammer, tu debe registrar le "
+"importator como application autorisate a colliger datos in tu nomine. Iste "
+"registration functionara solmente pro tu proprie rete. Seque iste ligamine "
+"pro registrar le application a Yammer; tu essera demandate de aperir session "
+"si necessari:"
+
+msgid "Open Yammer application registration form"
+msgstr "Aperir formulario de registration del application Yammer"
+
+msgid "Copy the consumer key and secret you are given into the form below:"
+msgstr ""
+"Copia le clave e secreto de consumitor que tu recipe in le formulario hic "
+"infra:"
+
+msgid "Consumer key:"
+msgstr "Clave de consumitor:"
+
+msgid "Consumer secret:"
+msgstr "Secreto de consumitor:"
+
+msgid "Save"
+msgstr "Salveguardar"
+
+msgid "Save these consumer keys"
+msgstr "Salveguardar iste claves de consumitor"
diff --git a/plugins/YammerImport/locale/mk/LC_MESSAGES/YammerImport.po b/plugins/YammerImport/locale/mk/LC_MESSAGES/YammerImport.po
index bd56dff878..0bc23085de 100644
--- a/plugins/YammerImport/locale/mk/LC_MESSAGES/YammerImport.po
+++ b/plugins/YammerImport/locale/mk/LC_MESSAGES/YammerImport.po
@@ -9,62 +9,192 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - YammerImport\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:21+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:36+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:55+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:55+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-yammerimport\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
 
-#: YammerImportPlugin.php:98
-msgid "Yammer"
-msgstr "Yammer"
-
-#: YammerImportPlugin.php:99 actions/yammeradminpanel.php:135
-msgid "Yammer import"
-msgstr "Увоз од Yammer"
-
-#: lib/yammerauthinitform.php:48 lib/yammerauthverifyform.php:56
-#: lib/yammerprogressform.php:68 actions/yammerauth.php:71
 msgid "Connect to Yammer"
 msgstr "Поврзување со Yammer"
 
-#: lib/yammerauthinitform.php:62
-msgid "Start authentication"
-msgstr "Започни проверка"
+msgid "Yammer Import"
+msgstr "Увоз од Yammer"
 
-#: lib/yammerauthinitform.php:62
-msgid "Request authorization to connect to Yammer account"
-msgstr "Барај овластување за поврзување со сметката на Yammer"
+msgid ""
+"This Yammer import tool is still undergoing testing, and is incomplete in "
+"some areas. Currently user subscriptions and group memberships are not "
+"transferred; in the future this may be supported for imports done by "
+"verified administrators on the Yammer side."
+msgstr ""
+"Оваа алатка за увоз од Yammer сè уште е во фаза на испробување, а наместа е "
+"недработена. Моментално не можат да се префрлаат кориснички претплати и "
+"членства во групи. Ваквите префрлања може да се поддржани во иднина, и тие "
+"би ги вршеле овластени администратори на Yammer."
 
-#: lib/yammerauthinitform.php:63
-msgid "Change API key"
-msgstr "Промени API-клуч"
+msgid "Paused from admin panel."
+msgstr "Паузирано од администраторската табла."
+
+msgid "Yammer import"
+msgstr "Увоз од Yammer"
+
+msgid "Yammer"
+msgstr "Yammer"
 
-#: lib/yammerimporter.php:230
 msgid "Expertise:"
 msgstr "Стручност:"
 
-#: lib/yammerimporter.php:433
 #, php-format
 msgid "Invalid avatar URL %s."
 msgstr "Неважечка URL-адреса на аватарот: %s."
 
-#: lib/yammerimporter.php:441
 #, php-format
 msgid "Unable to fetch avatar from %s."
 msgstr "Не можев да го преземам аватарот од %s."
 
-#: lib/yammerapikeyform.php:56
+msgid "Start authentication"
+msgstr "Започни проверка"
+
+msgid "Request authorization to connect to Yammer account"
+msgstr "Барај овластување за поврзување со сметката на Yammer"
+
+msgid "Change API key"
+msgstr "Промени API-клуч"
+
+msgid "Initialize"
+msgstr "Започни"
+
+msgid "No import running"
+msgstr "Увозот не е во тек"
+
+msgid "Initiated Yammer server connection..."
+msgstr "Започнав со поврзувањето со опслужувачот на Yammer..."
+
+msgid "Awaiting authorization..."
+msgstr "Чекам на овластување..."
+
+msgid "Connected."
+msgstr "Поврзано."
+
+msgid "Import user accounts"
+msgstr "Увези кориснички сметки"
+
+#, php-format
+msgid "Importing %d user..."
+msgid_plural "Importing %d users..."
+msgstr[0] "Увезувам %d корисник..."
+msgstr[1] "Увезувам %d корисници..."
+
+#, php-format
+msgid "Imported %d user."
+msgid_plural "Imported %d users."
+msgstr[0] "Увезов %d корисник."
+msgstr[1] "Увезов %d корисници."
+
+msgid "Import user groups"
+msgstr "Увези кориснички групи"
+
+#, php-format
+msgid "Importing %d group..."
+msgid_plural "Importing %d groups..."
+msgstr[0] "Увезувам %d група..."
+msgstr[1] "Увезувам %d групи..."
+
+#, php-format
+msgid "Imported %d group."
+msgid_plural "Imported %d groups."
+msgstr[0] "Увезов %d група."
+msgstr[1] "Увезов %d групи."
+
+msgid "Prepare public notices for import"
+msgstr "Подготви јавни известувања за увоз"
+
+#, php-format
+msgid "Preparing %d notice..."
+msgid_plural "Preparing %d notices..."
+msgstr[0] "Подготвувам %d известување..."
+msgstr[1] "Подготвувам %d известувања..."
+
+#, php-format
+msgid "Prepared %d notice."
+msgid_plural "Prepared %d notices."
+msgstr[0] "Подготвив %d известување."
+msgstr[1] "Подготвив %d известувања."
+
+msgid "Import public notices"
+msgstr "Увези јавни известувања"
+
+#, php-format
+msgid "Importing %d notice..."
+msgid_plural "Importing %d notices..."
+msgstr[0] "Увезувам %d известување..."
+msgstr[1] "Увезувам %d известувања..."
+
+#, php-format
+msgid "Imported %d notice."
+msgid_plural "Imported %d notices."
+msgstr[0] "Увезов %d известување..."
+msgstr[1] "Увезов %d известувања..."
+
+msgid "Done"
+msgstr "Готово"
+
+msgid "Import is complete!"
+msgstr "Увозот заврши!"
+
+msgid "Import status"
+msgstr "Увези статус"
+
+msgid "Waiting..."
+msgstr "Чекам..."
+
+msgid "Reset import state"
+msgstr "Врати основна состојба на увозот"
+
+msgid "Pause import"
+msgstr "Паузирај увоз"
+
+#, php-format
+msgid "Encountered error \"%s\""
+msgstr "Наидов на грешка „%s“"
+
+msgid "Paused"
+msgstr "Паузирано"
+
+msgid "Continue"
+msgstr "Продолжи"
+
+msgid "Abort import"
+msgstr "Прекини увоз"
+
+msgid ""
+"Follow this link to confirm authorization at Yammer; you will be prompted to "
+"log in if necessary:"
+msgstr ""
+"Проследете ја врскава за да го потврдите овластувањето на страницата на "
+"Yammer. Ако е потребно, ќе Ви биде побарано да се најавите:"
+
+msgid "Open Yammer authentication window"
+msgstr "Отвори прозорец за потврда на Yammer"
+
+msgid "Copy the verification code you are given below:"
+msgstr "Ископирајте го долунаведениот потврден код:"
+
+msgid "Verification code:"
+msgstr "Потврден код:"
+
+msgid "Save code and begin import"
+msgstr "Зачувај код и почни со увоз"
+
 msgid "Yammer API registration"
 msgstr "Регистрација на API за Yammer"
 
-#: lib/yammerapikeyform.php:72
 msgid ""
 "Before we can connect to your Yammer network, you will need to register the "
 "importer as an application authorized to pull data on your behalf. This "
@@ -77,205 +207,22 @@ msgstr ""
 "врската за да го регистрирате програмот на Yammer. Ако е потребно, ќе Ви "
 "биде побарано да се најавите:"
 
-#: lib/yammerapikeyform.php:84
 msgid "Open Yammer application registration form"
 msgstr "Отвори образец за регистрација на програм на Yammer"
 
-#: lib/yammerapikeyform.php:87
 msgid "Copy the consumer key and secret you are given into the form below:"
 msgstr ""
 "Ископирајте ги потрошувачкиот клуч и тајната што се наведени во образецот "
 "подолу:"
 
-#: lib/yammerapikeyform.php:91
 msgid "Consumer key:"
 msgstr "Потрошувачки клуч:"
 
-#: lib/yammerapikeyform.php:94
 msgid "Consumer secret:"
 msgstr "Потрошувачка тајна:"
 
-#: lib/yammerapikeyform.php:98
 msgid "Save"
 msgstr "Зачувај"
 
-#: lib/yammerapikeyform.php:98
 msgid "Save these consumer keys"
 msgstr "Зачувај ги овие потрошувачки клучеви"
-
-#: lib/yammerauthverifyform.php:72
-msgid ""
-"Follow this link to confirm authorization at Yammer; you will be prompted to "
-"log in if necessary:"
-msgstr ""
-"Проследете ја врскава за да го потврдите овластувањето на страницата на "
-"Yammer. Ако е потребно, ќе Ви биде побарано да се најавите:"
-
-#: lib/yammerauthverifyform.php:87
-msgid "Open Yammer authentication window"
-msgstr "Отвори прозорец за потврда на Yammer"
-
-#: lib/yammerauthverifyform.php:90
-msgid "Copy the verification code you are given below:"
-msgstr "Ископирајте го долунаведениот потврден код:"
-
-#: lib/yammerauthverifyform.php:94
-msgid "Verification code:"
-msgstr "Потврден код:"
-
-#: lib/yammerauthverifyform.php:98 lib/yammerprogressform.php:164
-msgid "Continue"
-msgstr "Продолжи"
-
-#: lib/yammerauthverifyform.php:98
-msgid "Save code and begin import"
-msgstr "Зачувај код и почни со увоз"
-
-#: lib/yammerprogressform.php:63
-msgid "Initialize"
-msgstr "Започни"
-
-#: lib/yammerprogressform.php:64
-msgid "No import running"
-msgstr "Увозот не е во тек"
-
-#: lib/yammerprogressform.php:65
-msgid "Initiated Yammer server connection..."
-msgstr "Започнав со поврзувањето со опслужувачот на Yammer..."
-
-#: lib/yammerprogressform.php:69
-msgid "Awaiting authorization..."
-msgstr "Чекам на овластување..."
-
-#: lib/yammerprogressform.php:70
-msgid "Connected."
-msgstr "Поврзано."
-
-#: lib/yammerprogressform.php:73
-msgid "Import user accounts"
-msgstr "Увези кориснички сметки"
-
-#: lib/yammerprogressform.php:74
-#, php-format
-msgid "Importing %d user..."
-msgid_plural "Importing %d users..."
-msgstr[0] "Увезувам %d корисник..."
-msgstr[1] "Увезувам %d корисници..."
-
-#: lib/yammerprogressform.php:75
-#, php-format
-msgid "Imported %d user."
-msgid_plural "Imported %d users."
-msgstr[0] "Увезов %d корисник."
-msgstr[1] "Увезов %d корисници."
-
-#: lib/yammerprogressform.php:78
-msgid "Import user groups"
-msgstr "Увези кориснички групи"
-
-#: lib/yammerprogressform.php:79
-#, php-format
-msgid "Importing %d group..."
-msgid_plural "Importing %d groups..."
-msgstr[0] "Увезувам %d група..."
-msgstr[1] "Увезувам %d групи..."
-
-#: lib/yammerprogressform.php:80
-#, php-format
-msgid "Imported %d group."
-msgid_plural "Imported %d groups."
-msgstr[0] "Увезов %d група."
-msgstr[1] "Увезов %d групи."
-
-#: lib/yammerprogressform.php:83
-msgid "Prepare public notices for import"
-msgstr "Подготви јавни известувања за увоз"
-
-#: lib/yammerprogressform.php:84
-#, php-format
-msgid "Preparing %d notice..."
-msgid_plural "Preparing %d notices..."
-msgstr[0] "Подготвувам %d известување..."
-msgstr[1] "Подготвувам %d известувања..."
-
-#: lib/yammerprogressform.php:85
-#, php-format
-msgid "Prepared %d notice."
-msgid_plural "Prepared %d notices."
-msgstr[0] "Подготвив %d известување."
-msgstr[1] "Подготвив %d известувања."
-
-#: lib/yammerprogressform.php:88
-msgid "Import public notices"
-msgstr "Увези јавни известувања"
-
-#: lib/yammerprogressform.php:89
-#, php-format
-msgid "Importing %d notice..."
-msgid_plural "Importing %d notices..."
-msgstr[0] "Увезувам %d известување..."
-msgstr[1] "Увезувам %d известувања..."
-
-#: lib/yammerprogressform.php:90
-#, php-format
-msgid "Imported %d notice."
-msgid_plural "Imported %d notices."
-msgstr[0] "Увезов %d известување..."
-msgstr[1] "Увезов %d известувања..."
-
-#: lib/yammerprogressform.php:93
-msgid "Done"
-msgstr "Готово"
-
-#: lib/yammerprogressform.php:94 lib/yammerprogressform.php:95
-msgid "Import is complete!"
-msgstr "Увозот заврши!"
-
-#: lib/yammerprogressform.php:108
-msgid "Import status"
-msgstr "Увези статус"
-
-#: lib/yammerprogressform.php:132
-msgid "Waiting..."
-msgstr "Чекам..."
-
-#: lib/yammerprogressform.php:146
-msgid "Reset import state"
-msgstr "Врати основна состојба на увозот"
-
-#: lib/yammerprogressform.php:151
-msgid "Pause import"
-msgstr "Паузирај увоз"
-
-#: lib/yammerprogressform.php:160
-#, php-format
-msgid "Encountered error \"%s\""
-msgstr "Наидов на грешка „%s“"
-
-#: lib/yammerprogressform.php:162
-msgid "Paused"
-msgstr "Паузирано"
-
-#: lib/yammerprogressform.php:165
-msgid "Abort import"
-msgstr "Прекини увоз"
-
-#: actions/yammeradminpanel.php:45
-msgid "Yammer Import"
-msgstr "Увоз од Yammer"
-
-#: actions/yammeradminpanel.php:55
-msgid ""
-"This Yammer import tool is still undergoing testing, and is incomplete in "
-"some areas. Currently user subscriptions and group memberships are not "
-"transferred; in the future this may be supported for imports done by "
-"verified administrators on the Yammer side."
-msgstr ""
-"Оваа алатка за увоз од Yammer сè уште е во фаза на испробување, а наместа е "
-"недработена. Моментално не можат да се префрлаат кориснички претплати и "
-"членства во групи. Ваквите префрлања може да се поддржани во иднина, и тие "
-"би ги вршеле овластени администратори на Yammer."
-
-#: actions/yammeradminpanel.php:102
-msgid "Paused from admin panel."
-msgstr "Паузирано од администраторската табла."
diff --git a/plugins/YammerImport/locale/nl/LC_MESSAGES/YammerImport.po b/plugins/YammerImport/locale/nl/LC_MESSAGES/YammerImport.po
index b3362acde6..f259ec5374 100644
--- a/plugins/YammerImport/locale/nl/LC_MESSAGES/YammerImport.po
+++ b/plugins/YammerImport/locale/nl/LC_MESSAGES/YammerImport.po
@@ -10,262 +10,24 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - YammerImport\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:21+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:36+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:55+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:55+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-yammerimport\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: YammerImportPlugin.php:98
-msgid "Yammer"
-msgstr "Yammer"
-
-#: YammerImportPlugin.php:99 actions/yammeradminpanel.php:135
-msgid "Yammer import"
-msgstr "Yammerimport"
-
-#: lib/yammerauthinitform.php:48 lib/yammerauthverifyform.php:56
-#: lib/yammerprogressform.php:68 actions/yammerauth.php:71
 msgid "Connect to Yammer"
 msgstr "Verbinden met Yammer"
 
-#: lib/yammerauthinitform.php:62
-msgid "Start authentication"
-msgstr "Authenticatie starten"
-
-#: lib/yammerauthinitform.php:62
-msgid "Request authorization to connect to Yammer account"
-msgstr "Autorisatie verzoeken om te verbinden met Yammergebruiker"
-
-#: lib/yammerauthinitform.php:63
-msgid "Change API key"
-msgstr "API-sleutel wijzigen"
-
-#: lib/yammerimporter.php:230
-msgid "Expertise:"
-msgstr "Expertise:"
-
-#: lib/yammerimporter.php:433
-#, php-format
-msgid "Invalid avatar URL %s."
-msgstr "%s is een ongeldige URL voor avatar."
-
-#: lib/yammerimporter.php:441
-#, php-format
-msgid "Unable to fetch avatar from %s."
-msgstr "Het was niet mogelijk de avatar op te halen van %s."
-
-#: lib/yammerapikeyform.php:56
-msgid "Yammer API registration"
-msgstr "API-registratie voor Yammer"
-
-#: lib/yammerapikeyform.php:72
-msgid ""
-"Before we can connect to your Yammer network, you will need to register the "
-"importer as an application authorized to pull data on your behalf. This "
-"registration will work only for your own network. Follow this link to "
-"register the app at Yammer; you will be prompted to log in if necessary:"
-msgstr ""
-"Voordat er verbinding gemaakt kan worden met uw Yammernetwerk, moet u het "
-"importprogramma eerst registreren als een applicatie die namens u gegevens "
-"mag ophalen. Deze registratie geldt alleen voor uw eigen netwerk. Volg de "
-"onderstaande verwijzing om de applicatie bij Yammer te registreren. Als het "
-"nodig is om aan te melden, wordt u dat gevraagd:"
-
-#: lib/yammerapikeyform.php:84
-msgid "Open Yammer application registration form"
-msgstr "Applicatieregistratieformulier voor Yammer openen"
-
-#: lib/yammerapikeyform.php:87
-msgid "Copy the consumer key and secret you are given into the form below:"
-msgstr ""
-"Kopieer de gebruikerssleutel en het gebruikersgeheim dat u hebt gekregen in "
-"het formulier hieronder:"
-
-#: lib/yammerapikeyform.php:91
-msgid "Consumer key:"
-msgstr "Gebruikerssleutel:"
-
-#: lib/yammerapikeyform.php:94
-msgid "Consumer secret:"
-msgstr "Gebruikersgeheim:"
-
-#: lib/yammerapikeyform.php:98
-msgid "Save"
-msgstr "Opslaan"
-
-#: lib/yammerapikeyform.php:98
-msgid "Save these consumer keys"
-msgstr "Deze gebruikerssleutels opslaan"
-
-#: lib/yammerauthverifyform.php:72
-msgid ""
-"Follow this link to confirm authorization at Yammer; you will be prompted to "
-"log in if necessary:"
-msgstr ""
-"Volg deze verwijzing om de autorisatie bij Yammer te bevestigen. Als u moet "
-"aanmelden wordt daarom gevraagd:"
-
-#: lib/yammerauthverifyform.php:87
-msgid "Open Yammer authentication window"
-msgstr "Authenticatievenster voor Yammer openen"
-
-#: lib/yammerauthverifyform.php:90
-msgid "Copy the verification code you are given below:"
-msgstr "Kopieer de verificatiecode die u hebt gekregen hieronder:"
-
-#: lib/yammerauthverifyform.php:94
-msgid "Verification code:"
-msgstr "Verificatiecode:"
-
-#: lib/yammerauthverifyform.php:98 lib/yammerprogressform.php:164
-msgid "Continue"
-msgstr "Doorgaan"
-
-#: lib/yammerauthverifyform.php:98
-msgid "Save code and begin import"
-msgstr "Code opslaan en importeren"
-
-#: lib/yammerprogressform.php:63
-msgid "Initialize"
-msgstr "Initialiseren"
-
-#: lib/yammerprogressform.php:64
-msgid "No import running"
-msgstr "Er loopt geen import"
-
-#: lib/yammerprogressform.php:65
-msgid "Initiated Yammer server connection..."
-msgstr "Er is verbinding gemaakt met de Yammerserver..."
-
-#: lib/yammerprogressform.php:69
-msgid "Awaiting authorization..."
-msgstr "Wachten op autorisatie..."
-
-#: lib/yammerprogressform.php:70
-msgid "Connected."
-msgstr "Verbonden."
-
-#: lib/yammerprogressform.php:73
-msgid "Import user accounts"
-msgstr "Gebruikers importeren"
-
-#: lib/yammerprogressform.php:74
-#, php-format
-msgid "Importing %d user..."
-msgid_plural "Importing %d users..."
-msgstr[0] "Bezig met het importeren van %d gebruiker..."
-msgstr[1] "Bezig met het importeren van %d gebruikers..."
-
-#: lib/yammerprogressform.php:75
-#, php-format
-msgid "Imported %d user."
-msgid_plural "Imported %d users."
-msgstr[0] "%d gebruiker geïmporteerd."
-msgstr[1] "%d gebruikers geïmporteerd."
-
-#: lib/yammerprogressform.php:78
-msgid "Import user groups"
-msgstr "Gebruikersgroepen importeren"
-
-#: lib/yammerprogressform.php:79
-#, php-format
-msgid "Importing %d group..."
-msgid_plural "Importing %d groups..."
-msgstr[0] "Bezig met het importeren van %d gebruikersgroep..."
-msgstr[1] "Bezig met het importeren van %d gebruikersgroepen..."
-
-#: lib/yammerprogressform.php:80
-#, php-format
-msgid "Imported %d group."
-msgid_plural "Imported %d groups."
-msgstr[0] "%d gebruikersgroep geïmporteerd."
-msgstr[1] "%d gebruikersgroepen geïmporteerd."
-
-#: lib/yammerprogressform.php:83
-msgid "Prepare public notices for import"
-msgstr "Publieke mededelingen voorbereiden op import"
-
-#: lib/yammerprogressform.php:84
-#, php-format
-msgid "Preparing %d notice..."
-msgid_plural "Preparing %d notices..."
-msgstr[0] "Bezig met het voorbereiden van %d mededeling..."
-msgstr[1] "Bezig met het voorbereiden van %d mededelingen..."
-
-#: lib/yammerprogressform.php:85
-#, php-format
-msgid "Prepared %d notice."
-msgid_plural "Prepared %d notices."
-msgstr[0] "%d mededeling voorbereid."
-msgstr[1] "%d mededelingen voorbereid."
-
-#: lib/yammerprogressform.php:88
-msgid "Import public notices"
-msgstr "Publieke mededelingen importeren"
-
-#: lib/yammerprogressform.php:89
-#, php-format
-msgid "Importing %d notice..."
-msgid_plural "Importing %d notices..."
-msgstr[0] "Bezig met het importeren van %d mededeling..."
-msgstr[1] "Bezig met het importeren van %d mededelingen..."
-
-#: lib/yammerprogressform.php:90
-#, php-format
-msgid "Imported %d notice."
-msgid_plural "Imported %d notices."
-msgstr[0] "%d mededeling geïmporteerd."
-msgstr[1] "%d mededelingen geïmporteerd."
-
-#: lib/yammerprogressform.php:93
-msgid "Done"
-msgstr "Afgerond"
-
-#: lib/yammerprogressform.php:94 lib/yammerprogressform.php:95
-msgid "Import is complete!"
-msgstr "Het importeren is voltooid!"
-
-#: lib/yammerprogressform.php:108
-msgid "Import status"
-msgstr "Importstatus"
-
-#: lib/yammerprogressform.php:132
-msgid "Waiting..."
-msgstr "Even geduld alstublieft..."
-
-#: lib/yammerprogressform.php:146
-msgid "Reset import state"
-msgstr "Importstatus herstellen"
-
-#: lib/yammerprogressform.php:151
-msgid "Pause import"
-msgstr "Import pauzeren"
-
-#: lib/yammerprogressform.php:160
-#, php-format
-msgid "Encountered error \"%s\""
-msgstr "Er is een fout opgetreden: \"%s\""
-
-#: lib/yammerprogressform.php:162
-msgid "Paused"
-msgstr "Gepauzeerd"
-
-#: lib/yammerprogressform.php:165
-msgid "Abort import"
-msgstr "Import afbreken"
-
-#: actions/yammeradminpanel.php:45
 msgid "Yammer Import"
 msgstr "Yammerimport"
 
-#: actions/yammeradminpanel.php:55
 msgid ""
 "This Yammer import tool is still undergoing testing, and is incomplete in "
 "some areas. Currently user subscriptions and group memberships are not "
@@ -278,6 +40,191 @@ msgstr ""
 "mogelijk voor imports die door bevestigde beheerders in Yammer worden "
 "uitgevoerd."
 
-#: actions/yammeradminpanel.php:102
 msgid "Paused from admin panel."
 msgstr "Gepauzeerd vanuit het beheerpaneel."
+
+msgid "Yammer import"
+msgstr "Yammerimport"
+
+msgid "Yammer"
+msgstr "Yammer"
+
+msgid "Expertise:"
+msgstr "Expertise:"
+
+#, php-format
+msgid "Invalid avatar URL %s."
+msgstr "%s is een ongeldige URL voor avatar."
+
+#, php-format
+msgid "Unable to fetch avatar from %s."
+msgstr "Het was niet mogelijk de avatar op te halen van %s."
+
+msgid "Start authentication"
+msgstr "Authenticatie starten"
+
+msgid "Request authorization to connect to Yammer account"
+msgstr "Autorisatie verzoeken om te verbinden met Yammergebruiker"
+
+msgid "Change API key"
+msgstr "API-sleutel wijzigen"
+
+msgid "Initialize"
+msgstr "Initialiseren"
+
+msgid "No import running"
+msgstr "Er loopt geen import"
+
+msgid "Initiated Yammer server connection..."
+msgstr "Er is verbinding gemaakt met de Yammerserver..."
+
+msgid "Awaiting authorization..."
+msgstr "Wachten op autorisatie..."
+
+msgid "Connected."
+msgstr "Verbonden."
+
+msgid "Import user accounts"
+msgstr "Gebruikers importeren"
+
+#, php-format
+msgid "Importing %d user..."
+msgid_plural "Importing %d users..."
+msgstr[0] "Bezig met het importeren van %d gebruiker..."
+msgstr[1] "Bezig met het importeren van %d gebruikers..."
+
+#, php-format
+msgid "Imported %d user."
+msgid_plural "Imported %d users."
+msgstr[0] "%d gebruiker geïmporteerd."
+msgstr[1] "%d gebruikers geïmporteerd."
+
+msgid "Import user groups"
+msgstr "Gebruikersgroepen importeren"
+
+#, php-format
+msgid "Importing %d group..."
+msgid_plural "Importing %d groups..."
+msgstr[0] "Bezig met het importeren van %d gebruikersgroep..."
+msgstr[1] "Bezig met het importeren van %d gebruikersgroepen..."
+
+#, php-format
+msgid "Imported %d group."
+msgid_plural "Imported %d groups."
+msgstr[0] "%d gebruikersgroep geïmporteerd."
+msgstr[1] "%d gebruikersgroepen geïmporteerd."
+
+msgid "Prepare public notices for import"
+msgstr "Publieke mededelingen voorbereiden op import"
+
+#, php-format
+msgid "Preparing %d notice..."
+msgid_plural "Preparing %d notices..."
+msgstr[0] "Bezig met het voorbereiden van %d mededeling..."
+msgstr[1] "Bezig met het voorbereiden van %d mededelingen..."
+
+#, php-format
+msgid "Prepared %d notice."
+msgid_plural "Prepared %d notices."
+msgstr[0] "%d mededeling voorbereid."
+msgstr[1] "%d mededelingen voorbereid."
+
+msgid "Import public notices"
+msgstr "Publieke mededelingen importeren"
+
+#, php-format
+msgid "Importing %d notice..."
+msgid_plural "Importing %d notices..."
+msgstr[0] "Bezig met het importeren van %d mededeling..."
+msgstr[1] "Bezig met het importeren van %d mededelingen..."
+
+#, php-format
+msgid "Imported %d notice."
+msgid_plural "Imported %d notices."
+msgstr[0] "%d mededeling geïmporteerd."
+msgstr[1] "%d mededelingen geïmporteerd."
+
+msgid "Done"
+msgstr "Afgerond"
+
+msgid "Import is complete!"
+msgstr "Het importeren is voltooid!"
+
+msgid "Import status"
+msgstr "Importstatus"
+
+msgid "Waiting..."
+msgstr "Even geduld alstublieft..."
+
+msgid "Reset import state"
+msgstr "Importstatus herstellen"
+
+msgid "Pause import"
+msgstr "Import pauzeren"
+
+#, php-format
+msgid "Encountered error \"%s\""
+msgstr "Er is een fout opgetreden: \"%s\""
+
+msgid "Paused"
+msgstr "Gepauzeerd"
+
+msgid "Continue"
+msgstr "Doorgaan"
+
+msgid "Abort import"
+msgstr "Import afbreken"
+
+msgid ""
+"Follow this link to confirm authorization at Yammer; you will be prompted to "
+"log in if necessary:"
+msgstr ""
+"Volg deze verwijzing om de autorisatie bij Yammer te bevestigen. Als u moet "
+"aanmelden wordt daarom gevraagd:"
+
+msgid "Open Yammer authentication window"
+msgstr "Authenticatievenster voor Yammer openen"
+
+msgid "Copy the verification code you are given below:"
+msgstr "Kopieer de verificatiecode die u hebt gekregen hieronder:"
+
+msgid "Verification code:"
+msgstr "Verificatiecode:"
+
+msgid "Save code and begin import"
+msgstr "Code opslaan en importeren"
+
+msgid "Yammer API registration"
+msgstr "API-registratie voor Yammer"
+
+msgid ""
+"Before we can connect to your Yammer network, you will need to register the "
+"importer as an application authorized to pull data on your behalf. This "
+"registration will work only for your own network. Follow this link to "
+"register the app at Yammer; you will be prompted to log in if necessary:"
+msgstr ""
+"Voordat er verbinding gemaakt kan worden met uw Yammernetwerk, moet u het "
+"importprogramma eerst registreren als een applicatie die namens u gegevens "
+"mag ophalen. Deze registratie geldt alleen voor uw eigen netwerk. Volg de "
+"onderstaande verwijzing om de applicatie bij Yammer te registreren. Als het "
+"nodig is om aan te melden, wordt u dat gevraagd:"
+
+msgid "Open Yammer application registration form"
+msgstr "Applicatieregistratieformulier voor Yammer openen"
+
+msgid "Copy the consumer key and secret you are given into the form below:"
+msgstr ""
+"Kopieer de gebruikerssleutel en het gebruikersgeheim dat u hebt gekregen in "
+"het formulier hieronder:"
+
+msgid "Consumer key:"
+msgstr "Gebruikerssleutel:"
+
+msgid "Consumer secret:"
+msgstr "Gebruikersgeheim:"
+
+msgid "Save"
+msgstr "Opslaan"
+
+msgid "Save these consumer keys"
+msgstr "Deze gebruikerssleutels opslaan"
diff --git a/plugins/YammerImport/locale/ru/LC_MESSAGES/YammerImport.po b/plugins/YammerImport/locale/ru/LC_MESSAGES/YammerImport.po
index 11e2b56c3c..ad166e3bb3 100644
--- a/plugins/YammerImport/locale/ru/LC_MESSAGES/YammerImport.po
+++ b/plugins/YammerImport/locale/ru/LC_MESSAGES/YammerImport.po
@@ -10,262 +10,25 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - YammerImport\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:21+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:37+0000\n"
 "Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:55+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:55+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-yammerimport\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: YammerImportPlugin.php:98
-msgid "Yammer"
-msgstr ""
-
-#: YammerImportPlugin.php:99 actions/yammeradminpanel.php:135
-msgid "Yammer import"
-msgstr ""
-
-#: lib/yammerauthinitform.php:48 lib/yammerauthverifyform.php:56
-#: lib/yammerprogressform.php:68 actions/yammerauth.php:71
 msgid "Connect to Yammer"
 msgstr ""
 
-#: lib/yammerauthinitform.php:62
-msgid "Start authentication"
-msgstr "Начало проверки подлинности"
-
-#: lib/yammerauthinitform.php:62
-msgid "Request authorization to connect to Yammer account"
-msgstr ""
-
-#: lib/yammerauthinitform.php:63
-msgid "Change API key"
-msgstr ""
-
-#: lib/yammerimporter.php:230
-msgid "Expertise:"
-msgstr ""
-
-#: lib/yammerimporter.php:433
-#, php-format
-msgid "Invalid avatar URL %s."
-msgstr ""
-
-#: lib/yammerimporter.php:441
-#, php-format
-msgid "Unable to fetch avatar from %s."
-msgstr ""
-
-#: lib/yammerapikeyform.php:56
-msgid "Yammer API registration"
-msgstr ""
-
-#: lib/yammerapikeyform.php:72
-msgid ""
-"Before we can connect to your Yammer network, you will need to register the "
-"importer as an application authorized to pull data on your behalf. This "
-"registration will work only for your own network. Follow this link to "
-"register the app at Yammer; you will be prompted to log in if necessary:"
-msgstr ""
-
-#: lib/yammerapikeyform.php:84
-msgid "Open Yammer application registration form"
-msgstr ""
-
-#: lib/yammerapikeyform.php:87
-msgid "Copy the consumer key and secret you are given into the form below:"
-msgstr ""
-
-#: lib/yammerapikeyform.php:91
-msgid "Consumer key:"
-msgstr ""
-
-#: lib/yammerapikeyform.php:94
-msgid "Consumer secret:"
-msgstr ""
-
-#: lib/yammerapikeyform.php:98
-msgid "Save"
-msgstr "Сохранить"
-
-#: lib/yammerapikeyform.php:98
-msgid "Save these consumer keys"
-msgstr ""
-
-#: lib/yammerauthverifyform.php:72
-msgid ""
-"Follow this link to confirm authorization at Yammer; you will be prompted to "
-"log in if necessary:"
-msgstr ""
-
-#: lib/yammerauthverifyform.php:87
-msgid "Open Yammer authentication window"
-msgstr ""
-
-#: lib/yammerauthverifyform.php:90
-msgid "Copy the verification code you are given below:"
-msgstr ""
-
-#: lib/yammerauthverifyform.php:94
-msgid "Verification code:"
-msgstr "Код подтверждения:"
-
-#: lib/yammerauthverifyform.php:98 lib/yammerprogressform.php:164
-msgid "Continue"
-msgstr "Продолжить"
-
-#: lib/yammerauthverifyform.php:98
-msgid "Save code and begin import"
-msgstr "Сохранить код и начать импорт"
-
-#: lib/yammerprogressform.php:63
-msgid "Initialize"
-msgstr "Инициализация"
-
-#: lib/yammerprogressform.php:64
-msgid "No import running"
-msgstr "Импорт не запущен"
-
-#: lib/yammerprogressform.php:65
-msgid "Initiated Yammer server connection..."
-msgstr ""
-
-#: lib/yammerprogressform.php:69
-msgid "Awaiting authorization..."
-msgstr "Ожидание авторизации…"
-
-#: lib/yammerprogressform.php:70
-msgid "Connected."
-msgstr "Подсоединено."
-
-#: lib/yammerprogressform.php:73
-msgid "Import user accounts"
-msgstr "Импорт учётных записей пользователей"
-
-#: lib/yammerprogressform.php:74
-#, php-format
-msgid "Importing %d user..."
-msgid_plural "Importing %d users..."
-msgstr[0] "Импорт %d пользователя…"
-msgstr[1] "Импорт %d пользователей…"
-msgstr[2] "Импорт %d пользователей…"
-
-#: lib/yammerprogressform.php:75
-#, php-format
-msgid "Imported %d user."
-msgid_plural "Imported %d users."
-msgstr[0] "Импортирован %d пользователь."
-msgstr[1] "Импортировано %d пользователя."
-msgstr[2] "Импортировано %d пользователей."
-
-#: lib/yammerprogressform.php:78
-msgid "Import user groups"
-msgstr "Импорт групп пользователей"
-
-#: lib/yammerprogressform.php:79
-#, php-format
-msgid "Importing %d group..."
-msgid_plural "Importing %d groups..."
-msgstr[0] "Импорт %d группы…"
-msgstr[1] "Импорт %d группы…"
-msgstr[2] ""
-
-#: lib/yammerprogressform.php:80
-#, php-format
-msgid "Imported %d group."
-msgid_plural "Imported %d groups."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: lib/yammerprogressform.php:83
-msgid "Prepare public notices for import"
-msgstr ""
-
-#: lib/yammerprogressform.php:84
-#, php-format
-msgid "Preparing %d notice..."
-msgid_plural "Preparing %d notices..."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: lib/yammerprogressform.php:85
-#, php-format
-msgid "Prepared %d notice."
-msgid_plural "Prepared %d notices."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: lib/yammerprogressform.php:88
-msgid "Import public notices"
-msgstr ""
-
-#: lib/yammerprogressform.php:89
-#, php-format
-msgid "Importing %d notice..."
-msgid_plural "Importing %d notices..."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: lib/yammerprogressform.php:90
-#, php-format
-msgid "Imported %d notice."
-msgid_plural "Imported %d notices."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: lib/yammerprogressform.php:93
-msgid "Done"
-msgstr "Готово"
-
-#: lib/yammerprogressform.php:94 lib/yammerprogressform.php:95
-msgid "Import is complete!"
-msgstr "Импорт завершён!"
-
-#: lib/yammerprogressform.php:108
-msgid "Import status"
-msgstr "Статус процесса импорта"
-
-#: lib/yammerprogressform.php:132
-msgid "Waiting..."
-msgstr "Ожидание…"
-
-#: lib/yammerprogressform.php:146
-msgid "Reset import state"
-msgstr ""
-
-#: lib/yammerprogressform.php:151
-msgid "Pause import"
-msgstr "Приостановить импорт"
-
-#: lib/yammerprogressform.php:160
-#, php-format
-msgid "Encountered error \"%s\""
-msgstr "Обнаружена ошибка «%s»"
-
-#: lib/yammerprogressform.php:162
-msgid "Paused"
-msgstr "Приостановлено"
-
-#: lib/yammerprogressform.php:165
-msgid "Abort import"
-msgstr "Прервать импорт"
-
-#: actions/yammeradminpanel.php:45
 msgid "Yammer Import"
 msgstr ""
 
-#: actions/yammeradminpanel.php:55
 msgid ""
 "This Yammer import tool is still undergoing testing, and is incomplete in "
 "some areas. Currently user subscriptions and group memberships are not "
@@ -273,6 +36,190 @@ msgid ""
 "verified administrators on the Yammer side."
 msgstr ""
 
-#: actions/yammeradminpanel.php:102
 msgid "Paused from admin panel."
 msgstr ""
+
+msgid "Yammer import"
+msgstr ""
+
+msgid "Yammer"
+msgstr ""
+
+msgid "Expertise:"
+msgstr ""
+
+#, php-format
+msgid "Invalid avatar URL %s."
+msgstr ""
+
+#, php-format
+msgid "Unable to fetch avatar from %s."
+msgstr ""
+
+msgid "Start authentication"
+msgstr "Начало проверки подлинности"
+
+msgid "Request authorization to connect to Yammer account"
+msgstr ""
+
+msgid "Change API key"
+msgstr ""
+
+msgid "Initialize"
+msgstr "Инициализация"
+
+msgid "No import running"
+msgstr "Импорт не запущен"
+
+msgid "Initiated Yammer server connection..."
+msgstr ""
+
+msgid "Awaiting authorization..."
+msgstr "Ожидание авторизации…"
+
+msgid "Connected."
+msgstr "Подсоединено."
+
+msgid "Import user accounts"
+msgstr "Импорт учётных записей пользователей"
+
+#, php-format
+msgid "Importing %d user..."
+msgid_plural "Importing %d users..."
+msgstr[0] "Импорт %d пользователя…"
+msgstr[1] "Импорт %d пользователей…"
+msgstr[2] "Импорт %d пользователей…"
+
+#, php-format
+msgid "Imported %d user."
+msgid_plural "Imported %d users."
+msgstr[0] "Импортирован %d пользователь."
+msgstr[1] "Импортировано %d пользователя."
+msgstr[2] "Импортировано %d пользователей."
+
+msgid "Import user groups"
+msgstr "Импорт групп пользователей"
+
+#, php-format
+msgid "Importing %d group..."
+msgid_plural "Importing %d groups..."
+msgstr[0] "Импорт %d группы…"
+msgstr[1] "Импорт %d группы…"
+msgstr[2] ""
+
+#, php-format
+msgid "Imported %d group."
+msgid_plural "Imported %d groups."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+msgid "Prepare public notices for import"
+msgstr ""
+
+#, php-format
+msgid "Preparing %d notice..."
+msgid_plural "Preparing %d notices..."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#, php-format
+msgid "Prepared %d notice."
+msgid_plural "Prepared %d notices."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+msgid "Import public notices"
+msgstr ""
+
+#, php-format
+msgid "Importing %d notice..."
+msgid_plural "Importing %d notices..."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#, php-format
+msgid "Imported %d notice."
+msgid_plural "Imported %d notices."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+msgid "Done"
+msgstr "Готово"
+
+msgid "Import is complete!"
+msgstr "Импорт завершён!"
+
+msgid "Import status"
+msgstr "Статус процесса импорта"
+
+msgid "Waiting..."
+msgstr "Ожидание…"
+
+msgid "Reset import state"
+msgstr ""
+
+msgid "Pause import"
+msgstr "Приостановить импорт"
+
+#, php-format
+msgid "Encountered error \"%s\""
+msgstr "Обнаружена ошибка «%s»"
+
+msgid "Paused"
+msgstr "Приостановлено"
+
+msgid "Continue"
+msgstr "Продолжить"
+
+msgid "Abort import"
+msgstr "Прервать импорт"
+
+msgid ""
+"Follow this link to confirm authorization at Yammer; you will be prompted to "
+"log in if necessary:"
+msgstr ""
+
+msgid "Open Yammer authentication window"
+msgstr ""
+
+msgid "Copy the verification code you are given below:"
+msgstr ""
+
+msgid "Verification code:"
+msgstr "Код подтверждения:"
+
+msgid "Save code and begin import"
+msgstr "Сохранить код и начать импорт"
+
+msgid "Yammer API registration"
+msgstr ""
+
+msgid ""
+"Before we can connect to your Yammer network, you will need to register the "
+"importer as an application authorized to pull data on your behalf. This "
+"registration will work only for your own network. Follow this link to "
+"register the app at Yammer; you will be prompted to log in if necessary:"
+msgstr ""
+
+msgid "Open Yammer application registration form"
+msgstr ""
+
+msgid "Copy the consumer key and secret you are given into the form below:"
+msgstr ""
+
+msgid "Consumer key:"
+msgstr ""
+
+msgid "Consumer secret:"
+msgstr ""
+
+msgid "Save"
+msgstr "Сохранить"
+
+msgid "Save these consumer keys"
+msgstr ""
diff --git a/plugins/YammerImport/locale/tr/LC_MESSAGES/YammerImport.po b/plugins/YammerImport/locale/tr/LC_MESSAGES/YammerImport.po
index 05b5ecfe45..0c04ad05f0 100644
--- a/plugins/YammerImport/locale/tr/LC_MESSAGES/YammerImport.po
+++ b/plugins/YammerImport/locale/tr/LC_MESSAGES/YammerImport.po
@@ -9,245 +9,24 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - YammerImport\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:21+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:37+0000\n"
 "Language-Team: Turkish <http://translatewiki.net/wiki/Portal:tr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:55+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:55+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tr\n"
 "X-Message-Group: #out-statusnet-plugin-yammerimport\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: YammerImportPlugin.php:98
-msgid "Yammer"
-msgstr "Yammer"
-
-#: YammerImportPlugin.php:99 actions/yammeradminpanel.php:135
-msgid "Yammer import"
-msgstr "Yammer içeri aktarma"
-
-#: lib/yammerauthinitform.php:48 lib/yammerauthverifyform.php:56
-#: lib/yammerprogressform.php:68 actions/yammerauth.php:71
 msgid "Connect to Yammer"
 msgstr "Yammer'a Bağlan"
 
-#: lib/yammerauthinitform.php:62
-msgid "Start authentication"
-msgstr "Kimlik doğrulamaya başla"
-
-#: lib/yammerauthinitform.php:62
-msgid "Request authorization to connect to Yammer account"
-msgstr ""
-
-#: lib/yammerauthinitform.php:63
-msgid "Change API key"
-msgstr ""
-
-#: lib/yammerimporter.php:230
-msgid "Expertise:"
-msgstr ""
-
-#: lib/yammerimporter.php:433
-#, php-format
-msgid "Invalid avatar URL %s."
-msgstr "Geçersiz kullanıcı resmi bağlantısı %s."
-
-#: lib/yammerimporter.php:441
-#, php-format
-msgid "Unable to fetch avatar from %s."
-msgstr ""
-
-#: lib/yammerapikeyform.php:56
-msgid "Yammer API registration"
-msgstr ""
-
-#: lib/yammerapikeyform.php:72
-msgid ""
-"Before we can connect to your Yammer network, you will need to register the "
-"importer as an application authorized to pull data on your behalf. This "
-"registration will work only for your own network. Follow this link to "
-"register the app at Yammer; you will be prompted to log in if necessary:"
-msgstr ""
-
-#: lib/yammerapikeyform.php:84
-msgid "Open Yammer application registration form"
-msgstr ""
-
-#: lib/yammerapikeyform.php:87
-msgid "Copy the consumer key and secret you are given into the form below:"
-msgstr ""
-
-#: lib/yammerapikeyform.php:91
-msgid "Consumer key:"
-msgstr ""
-
-#: lib/yammerapikeyform.php:94
-msgid "Consumer secret:"
-msgstr ""
-
-#: lib/yammerapikeyform.php:98
-msgid "Save"
-msgstr "Kaydet"
-
-#: lib/yammerapikeyform.php:98
-msgid "Save these consumer keys"
-msgstr ""
-
-#: lib/yammerauthverifyform.php:72
-msgid ""
-"Follow this link to confirm authorization at Yammer; you will be prompted to "
-"log in if necessary:"
-msgstr ""
-
-#: lib/yammerauthverifyform.php:87
-msgid "Open Yammer authentication window"
-msgstr "Open Yammer kimlik doğrulama penceresi"
-
-#: lib/yammerauthverifyform.php:90
-msgid "Copy the verification code you are given below:"
-msgstr "Aşağıda verilen doğrulama kodunu kopyalayın:"
-
-#: lib/yammerauthverifyform.php:94
-msgid "Verification code:"
-msgstr "Doğrulama kodu:"
-
-#: lib/yammerauthverifyform.php:98 lib/yammerprogressform.php:164
-msgid "Continue"
-msgstr "Devam et"
-
-#: lib/yammerauthverifyform.php:98
-msgid "Save code and begin import"
-msgstr "Kodu kaydet ve içeri aktarmaya başla"
-
-#: lib/yammerprogressform.php:63
-msgid "Initialize"
-msgstr "İlk kullanıma hazırla"
-
-#: lib/yammerprogressform.php:64
-msgid "No import running"
-msgstr "Çalışan içeri aktarma yok"
-
-#: lib/yammerprogressform.php:65
-msgid "Initiated Yammer server connection..."
-msgstr "Başlatılan Yammer sunucu bağlantısı..."
-
-#: lib/yammerprogressform.php:69
-msgid "Awaiting authorization..."
-msgstr "Yetkilendirme bekleniyor..."
-
-#: lib/yammerprogressform.php:70
-msgid "Connected."
-msgstr "Bağlandı."
-
-#: lib/yammerprogressform.php:73
-msgid "Import user accounts"
-msgstr "Kullanıcı hesaplarını içeri aktar"
-
-#: lib/yammerprogressform.php:74
-#, php-format
-msgid "Importing %d user..."
-msgid_plural "Importing %d users..."
-msgstr[0] ""
-
-#: lib/yammerprogressform.php:75
-#, php-format
-msgid "Imported %d user."
-msgid_plural "Imported %d users."
-msgstr[0] ""
-
-#: lib/yammerprogressform.php:78
-msgid "Import user groups"
-msgstr "Kullanıcı gruplarını içeri aktar"
-
-#: lib/yammerprogressform.php:79
-#, php-format
-msgid "Importing %d group..."
-msgid_plural "Importing %d groups..."
-msgstr[0] ""
-
-#: lib/yammerprogressform.php:80
-#, php-format
-msgid "Imported %d group."
-msgid_plural "Imported %d groups."
-msgstr[0] ""
-
-#: lib/yammerprogressform.php:83
-msgid "Prepare public notices for import"
-msgstr "Genel durum mesajlarını içeri aktarmak için hazırla"
-
-#: lib/yammerprogressform.php:84
-#, php-format
-msgid "Preparing %d notice..."
-msgid_plural "Preparing %d notices..."
-msgstr[0] ""
-
-#: lib/yammerprogressform.php:85
-#, php-format
-msgid "Prepared %d notice."
-msgid_plural "Prepared %d notices."
-msgstr[0] ""
-
-#: lib/yammerprogressform.php:88
-msgid "Import public notices"
-msgstr "Genel durum mesajlarını içeri aktar"
-
-#: lib/yammerprogressform.php:89
-#, php-format
-msgid "Importing %d notice..."
-msgid_plural "Importing %d notices..."
-msgstr[0] ""
-
-#: lib/yammerprogressform.php:90
-#, php-format
-msgid "Imported %d notice."
-msgid_plural "Imported %d notices."
-msgstr[0] ""
-
-#: lib/yammerprogressform.php:93
-msgid "Done"
-msgstr "Tamamlandı"
-
-#: lib/yammerprogressform.php:94 lib/yammerprogressform.php:95
-msgid "Import is complete!"
-msgstr "İçeri aktarma tamamlandı!"
-
-#: lib/yammerprogressform.php:108
-msgid "Import status"
-msgstr "İçeri aktarma durumu"
-
-#: lib/yammerprogressform.php:132
-msgid "Waiting..."
-msgstr "Bekleniyor..."
-
-#: lib/yammerprogressform.php:146
-msgid "Reset import state"
-msgstr "İçeri aktarma durumunu sıfırla"
-
-#: lib/yammerprogressform.php:151
-msgid "Pause import"
-msgstr "İçeri aktarmayı duraklat"
-
-#: lib/yammerprogressform.php:160
-#, php-format
-msgid "Encountered error \"%s\""
-msgstr "Karşılaşılan hata \"%s\""
-
-#: lib/yammerprogressform.php:162
-msgid "Paused"
-msgstr "Duraklatıldı"
-
-#: lib/yammerprogressform.php:165
-msgid "Abort import"
-msgstr "İçeri aktarmayı iptal et"
-
-#: actions/yammeradminpanel.php:45
 msgid "Yammer Import"
 msgstr "Yammer İçeri Aktar"
 
-#: actions/yammeradminpanel.php:55
 msgid ""
 "This Yammer import tool is still undergoing testing, and is incomplete in "
 "some areas. Currently user subscriptions and group memberships are not "
@@ -255,6 +34,174 @@ msgid ""
 "verified administrators on the Yammer side."
 msgstr ""
 
-#: actions/yammeradminpanel.php:102
 msgid "Paused from admin panel."
 msgstr "Yönetim panelinden durduruldu."
+
+msgid "Yammer import"
+msgstr "Yammer içeri aktarma"
+
+msgid "Yammer"
+msgstr "Yammer"
+
+msgid "Expertise:"
+msgstr ""
+
+#, php-format
+msgid "Invalid avatar URL %s."
+msgstr "Geçersiz kullanıcı resmi bağlantısı %s."
+
+#, php-format
+msgid "Unable to fetch avatar from %s."
+msgstr ""
+
+msgid "Start authentication"
+msgstr "Kimlik doğrulamaya başla"
+
+msgid "Request authorization to connect to Yammer account"
+msgstr ""
+
+msgid "Change API key"
+msgstr ""
+
+msgid "Initialize"
+msgstr "İlk kullanıma hazırla"
+
+msgid "No import running"
+msgstr "Çalışan içeri aktarma yok"
+
+msgid "Initiated Yammer server connection..."
+msgstr "Başlatılan Yammer sunucu bağlantısı..."
+
+msgid "Awaiting authorization..."
+msgstr "Yetkilendirme bekleniyor..."
+
+msgid "Connected."
+msgstr "Bağlandı."
+
+msgid "Import user accounts"
+msgstr "Kullanıcı hesaplarını içeri aktar"
+
+#, php-format
+msgid "Importing %d user..."
+msgid_plural "Importing %d users..."
+msgstr[0] ""
+
+#, php-format
+msgid "Imported %d user."
+msgid_plural "Imported %d users."
+msgstr[0] ""
+
+msgid "Import user groups"
+msgstr "Kullanıcı gruplarını içeri aktar"
+
+#, php-format
+msgid "Importing %d group..."
+msgid_plural "Importing %d groups..."
+msgstr[0] ""
+
+#, php-format
+msgid "Imported %d group."
+msgid_plural "Imported %d groups."
+msgstr[0] ""
+
+msgid "Prepare public notices for import"
+msgstr "Genel durum mesajlarını içeri aktarmak için hazırla"
+
+#, php-format
+msgid "Preparing %d notice..."
+msgid_plural "Preparing %d notices..."
+msgstr[0] ""
+
+#, php-format
+msgid "Prepared %d notice."
+msgid_plural "Prepared %d notices."
+msgstr[0] ""
+
+msgid "Import public notices"
+msgstr "Genel durum mesajlarını içeri aktar"
+
+#, php-format
+msgid "Importing %d notice..."
+msgid_plural "Importing %d notices..."
+msgstr[0] ""
+
+#, php-format
+msgid "Imported %d notice."
+msgid_plural "Imported %d notices."
+msgstr[0] ""
+
+msgid "Done"
+msgstr "Tamamlandı"
+
+msgid "Import is complete!"
+msgstr "İçeri aktarma tamamlandı!"
+
+msgid "Import status"
+msgstr "İçeri aktarma durumu"
+
+msgid "Waiting..."
+msgstr "Bekleniyor..."
+
+msgid "Reset import state"
+msgstr "İçeri aktarma durumunu sıfırla"
+
+msgid "Pause import"
+msgstr "İçeri aktarmayı duraklat"
+
+#, php-format
+msgid "Encountered error \"%s\""
+msgstr "Karşılaşılan hata \"%s\""
+
+msgid "Paused"
+msgstr "Duraklatıldı"
+
+msgid "Continue"
+msgstr "Devam et"
+
+msgid "Abort import"
+msgstr "İçeri aktarmayı iptal et"
+
+msgid ""
+"Follow this link to confirm authorization at Yammer; you will be prompted to "
+"log in if necessary:"
+msgstr ""
+
+msgid "Open Yammer authentication window"
+msgstr "Open Yammer kimlik doğrulama penceresi"
+
+msgid "Copy the verification code you are given below:"
+msgstr "Aşağıda verilen doğrulama kodunu kopyalayın:"
+
+msgid "Verification code:"
+msgstr "Doğrulama kodu:"
+
+msgid "Save code and begin import"
+msgstr "Kodu kaydet ve içeri aktarmaya başla"
+
+msgid "Yammer API registration"
+msgstr ""
+
+msgid ""
+"Before we can connect to your Yammer network, you will need to register the "
+"importer as an application authorized to pull data on your behalf. This "
+"registration will work only for your own network. Follow this link to "
+"register the app at Yammer; you will be prompted to log in if necessary:"
+msgstr ""
+
+msgid "Open Yammer application registration form"
+msgstr ""
+
+msgid "Copy the consumer key and secret you are given into the form below:"
+msgstr ""
+
+msgid "Consumer key:"
+msgstr ""
+
+msgid "Consumer secret:"
+msgstr ""
+
+msgid "Save"
+msgstr "Kaydet"
+
+msgid "Save these consumer keys"
+msgstr ""
diff --git a/plugins/YammerImport/locale/uk/LC_MESSAGES/YammerImport.po b/plugins/YammerImport/locale/uk/LC_MESSAGES/YammerImport.po
index 8577621835..2b20174390 100644
--- a/plugins/YammerImport/locale/uk/LC_MESSAGES/YammerImport.po
+++ b/plugins/YammerImport/locale/uk/LC_MESSAGES/YammerImport.po
@@ -9,271 +9,25 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - YammerImport\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-03 17:24+0000\n"
-"PO-Revision-Date: 2011-03-03 17:28:21+0000\n"
+"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"PO-Revision-Date: 2011-03-06 01:38:37+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-29 22:29:55+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-03-03 17:47:55+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-yammerimport\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: YammerImportPlugin.php:98
-msgid "Yammer"
-msgstr "Yammer"
-
-#: YammerImportPlugin.php:99 actions/yammeradminpanel.php:135
-msgid "Yammer import"
-msgstr "Імпорт з Yammer"
-
-#: lib/yammerauthinitform.php:48 lib/yammerauthverifyform.php:56
-#: lib/yammerprogressform.php:68 actions/yammerauth.php:71
 msgid "Connect to Yammer"
 msgstr "З’єднання з Yammer"
 
-#: lib/yammerauthinitform.php:62
-msgid "Start authentication"
-msgstr "Початок автентифікації"
-
-#: lib/yammerauthinitform.php:62
-msgid "Request authorization to connect to Yammer account"
-msgstr "Запит дозволу на підключення до Yammer"
-
-#: lib/yammerauthinitform.php:63
-msgid "Change API key"
-msgstr "Змінити API-ключ"
-
-#: lib/yammerimporter.php:230
-msgid "Expertise:"
-msgstr "Експертиза:"
-
-#: lib/yammerimporter.php:433
-#, php-format
-msgid "Invalid avatar URL %s."
-msgstr "Невірна URL-адреса аватари %s."
-
-#: lib/yammerimporter.php:441
-#, php-format
-msgid "Unable to fetch avatar from %s."
-msgstr "Неможливо завантажити аватару з %s."
-
-#: lib/yammerapikeyform.php:56
-msgid "Yammer API registration"
-msgstr "Реєстрація API Yammer"
-
-#: lib/yammerapikeyform.php:72
-msgid ""
-"Before we can connect to your Yammer network, you will need to register the "
-"importer as an application authorized to pull data on your behalf. This "
-"registration will work only for your own network. Follow this link to "
-"register the app at Yammer; you will be prompted to log in if necessary:"
-msgstr ""
-"Перш ніж ми зможемо підключитися до вашого акаунту Yammer, вам необхідно "
-"зареєструвати у якості імпортера цей авторизований додаток, аби той забирав "
-"дані від вашого імені. Ця реєстрація буде працювати тільки для вашої власної "
-"мережі. Перейдіть за цим посиланням, щоб зареєструвати додаток на Yammer; "
-"вам буде запропоновано увійти до системи, якщо це необхідно:"
-
-#: lib/yammerapikeyform.php:84
-msgid "Open Yammer application registration form"
-msgstr "Відкрити реєстраційну форму додатку для Yammer"
-
-#: lib/yammerapikeyform.php:87
-msgid "Copy the consumer key and secret you are given into the form below:"
-msgstr ""
-"Скопіюйте ключ споживача та секретний код, котрі вам було надано, до віконця "
-"нижче:"
-
-#: lib/yammerapikeyform.php:91
-msgid "Consumer key:"
-msgstr "Ключ споживача:"
-
-#: lib/yammerapikeyform.php:94
-msgid "Consumer secret:"
-msgstr "Секретний код:"
-
-#: lib/yammerapikeyform.php:98
-msgid "Save"
-msgstr "Зберегти"
-
-#: lib/yammerapikeyform.php:98
-msgid "Save these consumer keys"
-msgstr "Зберегти ключі споживача"
-
-#: lib/yammerauthverifyform.php:72
-msgid ""
-"Follow this link to confirm authorization at Yammer; you will be prompted to "
-"log in if necessary:"
-msgstr ""
-"Перейдіть за цим посиланням для підтвердження дозволу від Yammer; вам буде "
-"запропоновано увійти до системи, якщо це необхідно:"
-
-#: lib/yammerauthverifyform.php:87
-msgid "Open Yammer authentication window"
-msgstr "Відкрити вікно автентифікації Yammer"
-
-#: lib/yammerauthverifyform.php:90
-msgid "Copy the verification code you are given below:"
-msgstr "Скопіюйте наданий вам код підтвердження до віконця нижче:"
-
-#: lib/yammerauthverifyform.php:94
-msgid "Verification code:"
-msgstr "Код підтвердження:"
-
-#: lib/yammerauthverifyform.php:98 lib/yammerprogressform.php:164
-msgid "Continue"
-msgstr "Продовжити"
-
-#: lib/yammerauthverifyform.php:98
-msgid "Save code and begin import"
-msgstr "Зберегти код і почати імпорт"
-
-#: lib/yammerprogressform.php:63
-msgid "Initialize"
-msgstr "Ініціалізація"
-
-#: lib/yammerprogressform.php:64
-msgid "No import running"
-msgstr "Імпорт не працює"
-
-#: lib/yammerprogressform.php:65
-msgid "Initiated Yammer server connection..."
-msgstr "Розпочато з’єднання з сервером Yammer..."
-
-#: lib/yammerprogressform.php:69
-msgid "Awaiting authorization..."
-msgstr "Чекаємо дозволу..."
-
-#: lib/yammerprogressform.php:70
-msgid "Connected."
-msgstr "Під’єднано."
-
-#: lib/yammerprogressform.php:73
-msgid "Import user accounts"
-msgstr "Імпорт облікових записів користувачів"
-
-#: lib/yammerprogressform.php:74
-#, php-format
-msgid "Importing %d user..."
-msgid_plural "Importing %d users..."
-msgstr[0] "Імпорт %d користувача..."
-msgstr[1] "Імпорт %d користувачів..."
-msgstr[2] "Імпорт %d користувачів..."
-
-#: lib/yammerprogressform.php:75
-#, php-format
-msgid "Imported %d user."
-msgid_plural "Imported %d users."
-msgstr[0] "Імпортовано %d користувача."
-msgstr[1] "Імпортовано %d користувачів."
-msgstr[2] "Імпортовано %d користувачів."
-
-#: lib/yammerprogressform.php:78
-msgid "Import user groups"
-msgstr "Імпорт спільнот"
-
-#: lib/yammerprogressform.php:79
-#, php-format
-msgid "Importing %d group..."
-msgid_plural "Importing %d groups..."
-msgstr[0] "Імпорт %d спільноти..."
-msgstr[1] "Імпорт %d спільнот..."
-msgstr[2] "Імпорт %d спільнот..."
-
-#: lib/yammerprogressform.php:80
-#, php-format
-msgid "Imported %d group."
-msgid_plural "Imported %d groups."
-msgstr[0] "Імпортовано %d спільноту."
-msgstr[1] "Імпортовано %d спільнот."
-msgstr[2] "Імпортовано %d спільнот."
-
-#: lib/yammerprogressform.php:83
-msgid "Prepare public notices for import"
-msgstr "Підготовка до імпорту стрічки дописів"
-
-#: lib/yammerprogressform.php:84
-#, php-format
-msgid "Preparing %d notice..."
-msgid_plural "Preparing %d notices..."
-msgstr[0] "Підготовка %d допису..."
-msgstr[1] "Підготовка %d дописів..."
-msgstr[2] "Підготовка %d дописів..."
-
-#: lib/yammerprogressform.php:85
-#, php-format
-msgid "Prepared %d notice."
-msgid_plural "Prepared %d notices."
-msgstr[0] "Готовий %d допис."
-msgstr[1] "Готово %d дописів."
-msgstr[2] "Готово %d дописів."
-
-#: lib/yammerprogressform.php:88
-msgid "Import public notices"
-msgstr "Імпорт стрічки дописів"
-
-#: lib/yammerprogressform.php:89
-#, php-format
-msgid "Importing %d notice..."
-msgid_plural "Importing %d notices..."
-msgstr[0] "Імпорт %d допису..."
-msgstr[1] "Імпорт %d дописів..."
-msgstr[2] "Імпорт %d дописів..."
-
-#: lib/yammerprogressform.php:90
-#, php-format
-msgid "Imported %d notice."
-msgid_plural "Imported %d notices."
-msgstr[0] "Імпортовано %d допис."
-msgstr[1] "Імпортовано %d дописів."
-msgstr[2] "Імпортовано %d дописів."
-
-#: lib/yammerprogressform.php:93
-msgid "Done"
-msgstr "Виконано"
-
-#: lib/yammerprogressform.php:94 lib/yammerprogressform.php:95
-msgid "Import is complete!"
-msgstr "Імпорт завершено!"
-
-#: lib/yammerprogressform.php:108
-msgid "Import status"
-msgstr "Статус процесу імпорту"
-
-#: lib/yammerprogressform.php:132
-msgid "Waiting..."
-msgstr "Очікування..."
-
-#: lib/yammerprogressform.php:146
-msgid "Reset import state"
-msgstr "Перезапустити імпорт"
-
-#: lib/yammerprogressform.php:151
-msgid "Pause import"
-msgstr "Призупинити імпорт"
-
-#: lib/yammerprogressform.php:160
-#, php-format
-msgid "Encountered error \"%s\""
-msgstr "Виявлено помилку «%s»"
-
-#: lib/yammerprogressform.php:162
-msgid "Paused"
-msgstr "Призупинено"
-
-#: lib/yammerprogressform.php:165
-msgid "Abort import"
-msgstr "Перервати імпорт"
-
-#: actions/yammeradminpanel.php:45
 msgid "Yammer Import"
 msgstr "Імпорт з Yammer"
 
-#: actions/yammeradminpanel.php:55
 msgid ""
 "This Yammer import tool is still undergoing testing, and is incomplete in "
 "some areas. Currently user subscriptions and group memberships are not "
@@ -286,6 +40,199 @@ msgstr ""
 "сайту Yammer піде нам на зустріч і тоді роботу над цим додатком буде "
 "завершено."
 
-#: actions/yammeradminpanel.php:102
 msgid "Paused from admin panel."
 msgstr "Призупинено з адміністраторської панелі."
+
+msgid "Yammer import"
+msgstr "Імпорт з Yammer"
+
+msgid "Yammer"
+msgstr "Yammer"
+
+msgid "Expertise:"
+msgstr "Експертиза:"
+
+#, php-format
+msgid "Invalid avatar URL %s."
+msgstr "Невірна URL-адреса аватари %s."
+
+#, php-format
+msgid "Unable to fetch avatar from %s."
+msgstr "Неможливо завантажити аватару з %s."
+
+msgid "Start authentication"
+msgstr "Початок автентифікації"
+
+msgid "Request authorization to connect to Yammer account"
+msgstr "Запит дозволу на підключення до Yammer"
+
+msgid "Change API key"
+msgstr "Змінити API-ключ"
+
+msgid "Initialize"
+msgstr "Ініціалізація"
+
+msgid "No import running"
+msgstr "Імпорт не працює"
+
+msgid "Initiated Yammer server connection..."
+msgstr "Розпочато з’єднання з сервером Yammer..."
+
+msgid "Awaiting authorization..."
+msgstr "Чекаємо дозволу..."
+
+msgid "Connected."
+msgstr "Під’єднано."
+
+msgid "Import user accounts"
+msgstr "Імпорт облікових записів користувачів"
+
+#, php-format
+msgid "Importing %d user..."
+msgid_plural "Importing %d users..."
+msgstr[0] "Імпорт %d користувача..."
+msgstr[1] "Імпорт %d користувачів..."
+msgstr[2] "Імпорт %d користувачів..."
+
+#, php-format
+msgid "Imported %d user."
+msgid_plural "Imported %d users."
+msgstr[0] "Імпортовано %d користувача."
+msgstr[1] "Імпортовано %d користувачів."
+msgstr[2] "Імпортовано %d користувачів."
+
+msgid "Import user groups"
+msgstr "Імпорт спільнот"
+
+#, php-format
+msgid "Importing %d group..."
+msgid_plural "Importing %d groups..."
+msgstr[0] "Імпорт %d спільноти..."
+msgstr[1] "Імпорт %d спільнот..."
+msgstr[2] "Імпорт %d спільнот..."
+
+#, php-format
+msgid "Imported %d group."
+msgid_plural "Imported %d groups."
+msgstr[0] "Імпортовано %d спільноту."
+msgstr[1] "Імпортовано %d спільнот."
+msgstr[2] "Імпортовано %d спільнот."
+
+msgid "Prepare public notices for import"
+msgstr "Підготовка до імпорту стрічки дописів"
+
+#, php-format
+msgid "Preparing %d notice..."
+msgid_plural "Preparing %d notices..."
+msgstr[0] "Підготовка %d допису..."
+msgstr[1] "Підготовка %d дописів..."
+msgstr[2] "Підготовка %d дописів..."
+
+#, php-format
+msgid "Prepared %d notice."
+msgid_plural "Prepared %d notices."
+msgstr[0] "Готовий %d допис."
+msgstr[1] "Готово %d дописів."
+msgstr[2] "Готово %d дописів."
+
+msgid "Import public notices"
+msgstr "Імпорт стрічки дописів"
+
+#, php-format
+msgid "Importing %d notice..."
+msgid_plural "Importing %d notices..."
+msgstr[0] "Імпорт %d допису..."
+msgstr[1] "Імпорт %d дописів..."
+msgstr[2] "Імпорт %d дописів..."
+
+#, php-format
+msgid "Imported %d notice."
+msgid_plural "Imported %d notices."
+msgstr[0] "Імпортовано %d допис."
+msgstr[1] "Імпортовано %d дописів."
+msgstr[2] "Імпортовано %d дописів."
+
+msgid "Done"
+msgstr "Виконано"
+
+msgid "Import is complete!"
+msgstr "Імпорт завершено!"
+
+msgid "Import status"
+msgstr "Статус процесу імпорту"
+
+msgid "Waiting..."
+msgstr "Очікування..."
+
+msgid "Reset import state"
+msgstr "Перезапустити імпорт"
+
+msgid "Pause import"
+msgstr "Призупинити імпорт"
+
+#, php-format
+msgid "Encountered error \"%s\""
+msgstr "Виявлено помилку «%s»"
+
+msgid "Paused"
+msgstr "Призупинено"
+
+msgid "Continue"
+msgstr "Продовжити"
+
+msgid "Abort import"
+msgstr "Перервати імпорт"
+
+msgid ""
+"Follow this link to confirm authorization at Yammer; you will be prompted to "
+"log in if necessary:"
+msgstr ""
+"Перейдіть за цим посиланням для підтвердження дозволу від Yammer; вам буде "
+"запропоновано увійти до системи, якщо це необхідно:"
+
+msgid "Open Yammer authentication window"
+msgstr "Відкрити вікно автентифікації Yammer"
+
+msgid "Copy the verification code you are given below:"
+msgstr "Скопіюйте наданий вам код підтвердження до віконця нижче:"
+
+msgid "Verification code:"
+msgstr "Код підтвердження:"
+
+msgid "Save code and begin import"
+msgstr "Зберегти код і почати імпорт"
+
+msgid "Yammer API registration"
+msgstr "Реєстрація API Yammer"
+
+msgid ""
+"Before we can connect to your Yammer network, you will need to register the "
+"importer as an application authorized to pull data on your behalf. This "
+"registration will work only for your own network. Follow this link to "
+"register the app at Yammer; you will be prompted to log in if necessary:"
+msgstr ""
+"Перш ніж ми зможемо підключитися до вашого акаунту Yammer, вам необхідно "
+"зареєструвати у якості імпортера цей авторизований додаток, аби той забирав "
+"дані від вашого імені. Ця реєстрація буде працювати тільки для вашої власної "
+"мережі. Перейдіть за цим посиланням, щоб зареєструвати додаток на Yammer; "
+"вам буде запропоновано увійти до системи, якщо це необхідно:"
+
+msgid "Open Yammer application registration form"
+msgstr "Відкрити реєстраційну форму додатку для Yammer"
+
+msgid "Copy the consumer key and secret you are given into the form below:"
+msgstr ""
+"Скопіюйте ключ споживача та секретний код, котрі вам було надано, до віконця "
+"нижче:"
+
+msgid "Consumer key:"
+msgstr "Ключ споживача:"
+
+msgid "Consumer secret:"
+msgstr "Секретний код:"
+
+msgid "Save"
+msgstr "Зберегти"
+
+msgid "Save these consumer keys"
+msgstr "Зберегти ключі споживача"

From 17db6cce3d85fd464529443076466045fcba467a Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Sun, 6 Mar 2011 16:33:36 -0500
Subject: [PATCH 410/655] first (non-working) move to microapp structure for
 bookmarks

---
 lib/microapp.php                    |  70 ----
 lib/microappplugin.php              | 214 +++++++++-
 plugins/Bookmark/BookmarkPlugin.php | 591 ++++++++++------------------
 3 files changed, 420 insertions(+), 455 deletions(-)
 delete mode 100644 lib/microapp.php

diff --git a/lib/microapp.php b/lib/microapp.php
deleted file mode 100644
index 23b4b5bb84..0000000000
--- a/lib/microapp.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-/**
- * StatusNet - the distributed open-source microblogging tool
- * Copyright (C) 2011, StatusNet, Inc.
- *
- * Superclass for microapp plugin
- * 
- * 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  Microapp
- * @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);
-}
-
-/**
- * Superclass for microapp plugins
- *
- * This class lets you define micro-applications with different kinds of activities.
- *
- * The applications work more-or-less like other 
- * 
- * @category  Microapp
- * @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/
- */
-
-abstract class MicroAppPlugin extends Plugin
-{
-    abstract function types();
-    abstract function saveNoticeFromActivity($activity);
-    abstract function activityFromNotice($notice);
-    abstract function showNotice($notice, $out);
-    abstract function entryForm();
-
-    function isMyNotice($notice) {
-        $types = $this->types();
-        return in_array($notice->object_type, $types);
-    }
-
-    function isMyActivity($activity) {
-        $types = $this->types();
-        return (count($activity->objects) == 1 &&
-                in_array($activity->objects[0]->type, $types));
-    }
-}
diff --git a/lib/microappplugin.php b/lib/microappplugin.php
index 23b4b5bb84..1cdbe965e6 100644
--- a/lib/microappplugin.php
+++ b/lib/microappplugin.php
@@ -51,11 +51,14 @@ if (!defined('STATUSNET')) {
 
 abstract class MicroAppPlugin extends Plugin
 {
+    abstract function appTitle();
+    abstract function tag();
     abstract function types();
-    abstract function saveNoticeFromActivity($activity);
-    abstract function activityFromNotice($notice);
+    abstract function saveNoticeFromActivity($activity, $actor);
+    abstract function activityObjectFromNotice($notice);
     abstract function showNotice($notice, $out);
-    abstract function entryForm();
+    abstract function entryForm($out);
+    abstract function deleteRelated($notice);
 
     function isMyNotice($notice) {
         $types = $this->types();
@@ -67,4 +70,209 @@ abstract class MicroAppPlugin extends Plugin
         return (count($activity->objects) == 1 &&
                 in_array($activity->objects[0]->type, $types));
     }
+
+    /**
+     * When a notice is deleted, delete the related objects
+     *
+     * @param Notice $notice Notice being deleted
+     * 
+     * @return boolean hook value
+     */
+
+    function onNoticeDeleteRelated($notice)
+    {
+        if ($this->isMyNotice($notice)) {
+            $this->deleteRelated($notice);
+        }
+
+        return true;
+    }
+
+    /**
+     * Output the HTML for this kind of object in a list
+     *
+     * @param NoticeListItem $nli The list item being shown.
+     *
+     * @return boolean hook value
+     */
+
+    function onStartShowNoticeItem($nli)
+    {
+        if (!$this->isMyNotice($nli->notice)) {
+            return true;
+        }
+
+        $out = $nli->out;
+
+        $this->showNotice($notice, $out);
+
+        $nli->showNoticeLink();
+        $nli->showNoticeSource();
+        $nli->showNoticeLocation();
+        $nli->showContext();
+        $nli->showRepeat();
+        
+        $out->elementEnd('div');
+        
+        $nli->showNoticeOptions();
+
+        return false;
+    }
+
+    /**
+     * Render a notice as one of our objects
+     *
+     * @param Notice         $notice  Notice to render
+     * @param ActivityObject &$object Empty object to fill
+     *
+     * @return boolean hook value
+     */
+     
+    function onStartActivityObjectFromNotice($notice, &$object)
+    {
+        if ($this->isMyNotice($notice)) {
+            $object = $this->activityObjectFromNotice($notice);
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Handle a posted object from PuSH
+     *
+     * @param Activity        $activity activity to handle
+     * @param Ostatus_profile $oprofile Profile for the feed
+     *
+     * @return boolean hook value
+     */
+
+    function onStartHandleFeedEntryWithProfile($activity, $oprofile)
+    {
+        if ($this->isMyActivity($activity)) {
+
+            $actor = $oprofile->checkAuthorship($activity);
+
+            if (empty($actor)) {
+                throw new ClientException(_('Can\'t get author for activity.'));
+            }
+
+            $this->saveNoticeFromActivity($activity, $actor);
+
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Handle a posted object from Salmon
+     *
+     * @param Activity $activity activity to handle
+     * @param mixed    $target   user or group targeted
+     *
+     * @return boolean hook value
+     */
+
+    function onStartHandleSalmonTarget($activity, $target)
+    {
+        if ($this->isMyActivity($activity)) {
+
+            $this->log(LOG_INFO, "Checking {$activity->id} as a valid Salmon slap.");
+
+            if ($target instanceof User_group) {
+                $uri = $target->getUri();
+                if (!in_array($uri, $activity->context->attention)) {
+                    throw new ClientException(_("Bookmark not posted ".
+                                                "to this group."));
+                }
+            } else if ($target instanceof User) {
+                $uri      = $target->uri;
+                $original = null;
+                if (!empty($activity->context->replyToID)) {
+                    $original = Notice::staticGet('uri', 
+                                                  $activity->context->replyToID); 
+                }
+                if (!in_array($uri, $activity->context->attention) &&
+                    (empty($original) ||
+                     $original->profile_id != $target->id)) {
+                    throw new ClientException(_("Bookmark not posted ".
+                                                "to this user."));
+                }
+            } else {
+                throw new ServerException(_("Don't know how to handle ".
+                                            "this kind of target."));
+            }
+
+            $actor = Ostatus_profile::ensureActivityObjectProfile($activity->actor);
+
+            $this->saveNoticeFromActivity($activity, $actor);
+
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Handle object posted via AtomPub
+     *
+     * @param Activity &$activity Activity that was posted
+     * @param User     $user      User that posted it
+     * @param Notice   &$notice   Resulting notice
+     *
+     * @return boolean hook value
+     */
+
+    function onStartAtomPubNewActivity(&$activity, $user, &$notice)
+    {
+        if ($this->isMyActivity($activity)) {
+
+            $options = array('source' => 'atompub');
+
+            $this->saveNoticeFromActivity($activity,
+                                          $user->getProfile(),
+                                          $options);
+
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Handle object imported from a backup file
+     *
+     * @param User           $user     User to import for
+     * @param ActivityObject $author   Original author per import file
+     * @param Activity       $activity Activity to import
+     * @param boolean        $trusted  Is this a trusted user?
+     * @param boolean        &$done    Is this done (success or unrecoverable error)
+     *
+     * @return boolean hook value
+     */
+
+    function onStartImportActivity($user, $author, $activity, $trusted, &$done)
+    {
+        if ($this->isMyActivity($activity)) {
+
+            $obj = $activity->objects[0];
+
+            $options = array('uri' => $bookmark->id,
+                             'url' => $bookmark->link,
+                             'source' => 'restore');
+
+            $saved = $this->saveNoticeFromActivity($activity,
+                                                   $user->getProfile(),
+                                                   $options);
+
+            if (!empty($saved)) {
+                $done = true;
+            }
+
+            return false;
+        }
+
+        return true;
+    }
 }
diff --git a/plugins/Bookmark/BookmarkPlugin.php b/plugins/Bookmark/BookmarkPlugin.php
index 2e6baf5e4e..c3ff17c4e9 100644
--- a/plugins/Bookmark/BookmarkPlugin.php
+++ b/plugins/Bookmark/BookmarkPlugin.php
@@ -44,7 +44,7 @@ if (!defined('STATUSNET')) {
  * @link      http://status.net/
  */
 
-class BookmarkPlugin extends Plugin
+class BookmarkPlugin extends MicroAppPlugin
 {
     const VERSION         = '0.1';
     const IMPORTDELICIOUS = 'BookmarkPlugin:IMPORTDELICIOUS';
@@ -120,25 +120,6 @@ class BookmarkPlugin extends Plugin
         return true;
     }
 
-    /**
-     * When a notice is deleted, delete the related Bookmark
-     *
-     * @param Notice $notice Notice being deleted
-     * 
-     * @return boolean hook value
-     */
-
-    function onNoticeDeleteRelated($notice)
-    {
-        $nb = Bookmark::getByNotice($notice);
-
-        if (!empty($nb)) {
-            $nb->delete();
-        }
-
-        return true;
-    }
-
     /**
      * Show the CSS necessary for this plugin
      *
@@ -218,212 +199,6 @@ class BookmarkPlugin extends Plugin
         return true;
     }
 
-    /**
-     * Output the HTML for a bookmark in a list
-     *
-     * @param NoticeListItem $nli The list item being shown.
-     *
-     * @return boolean hook value
-     */
-
-    function onStartShowNoticeItem($nli)
-    {
-        $nb = Bookmark::getByNotice($nli->notice);
-
-        if (!empty($nb)) {
-
-            $out     = $nli->out;
-            $notice  = $nli->notice;
-            $profile = $nli->profile;
-
-            $atts = $notice->attachments();
-
-            if (count($atts) < 1) {
-                // Something wrong; let default code deal with it.
-                return true;
-            }
-
-            $att = $atts[0];
-
-            // XXX: only show the bookmark URL for non-single-page stuff
-
-            if ($out instanceof ShowbookmarkAction) {
-            } else {
-                $out->elementStart('h3');
-                $out->element('a',
-                              array('href' => $att->url,
-                                    'class' => 'bookmark-title entry-title'),
-                              $nb->title);
-                $out->elementEnd('h3');
-
-                $countUrl = common_local_url('noticebyurl',
-                                             array('id' => $att->id));
-
-                $out->element('a', array('class' => 'bookmark-notice-count',
-                                         'href' => $countUrl),
-                              $att->noticeCount());
-            }
-
-            // Replies look like "for:" tags
-
-            $replies = $nli->notice->getReplies();
-            $tags = $nli->notice->getTags();
-
-            if (!empty($replies) || !empty($tags)) {
-
-                $out->elementStart('ul', array('class' => 'bookmark-tags'));
-            
-                foreach ($replies as $reply) {
-                    $other = Profile::staticGet('id', $reply);
-                    $out->elementStart('li');
-                    $out->element('a', array('rel' => 'tag',
-                                             'href' => $other->profileurl,
-                                             'title' => $other->getBestName()),
-                                  sprintf('for:%s', $other->nickname));
-                    $out->elementEnd('li');
-                    $out->text(' ');
-                }
-
-                foreach ($tags as $tag) {
-                    $out->elementStart('li');
-                    $out->element('a', 
-                                  array('rel' => 'tag',
-                                        'href' => Notice_tag::url($tag)),
-                                  $tag);
-                    $out->elementEnd('li');
-                    $out->text(' ');
-                }
-
-                $out->elementEnd('ul');
-            }
-
-            if (!empty($nb->description)) {
-                $out->element('p',
-                              array('class' => 'bookmark-description'),
-                              $nb->description);
-            }
-
-            if (common_config('attachments', 'show_thumbs')) {
-                $haveThumbs = false;
-                foreach ($atts as $check) {
-                    $thumbnail = File_thumbnail::staticGet('file_id', $check->id);
-                    if (!empty($thumbnail)) {
-                        $haveThumbs = true;
-                        break;
-                    }
-                }
-                if ($haveThumbs) {
-                    $al = new InlineAttachmentList($notice, $out);
-                    $al->show();
-                }
-            }
-
-            $out->elementStart('div', array('class' => 'bookmark-info entry-content'));
-
-            $avatar = $profile->getAvatar(AVATAR_MINI_SIZE);
-
-            $out->element('img', 
-                          array('src' => ($avatar) ?
-                                $avatar->displayUrl() :
-                                Avatar::defaultImage(AVATAR_MINI_SIZE),
-                                'class' => 'avatar photo bookmark-avatar',
-                                'width' => AVATAR_MINI_SIZE,
-                                'height' => AVATAR_MINI_SIZE,
-                                'alt' => $profile->getBestName()));
-
-            $out->raw('&nbsp;');
-
-            $out->element('a', 
-                          array('href' => $profile->profileurl,
-                                'title' => $profile->getBestName()),
-                          $profile->nickname);
-
-            $nli->showNoticeLink();
-            $nli->showNoticeSource();
-            $nli->showNoticeLocation();
-            $nli->showContext();
-            $nli->showRepeat();
-
-            $out->elementEnd('div');
-
-            $nli->showNoticeOptions();
-
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * Render a notice as a Bookmark object
-     *
-     * @param Notice         $notice  Notice to render
-     * @param ActivityObject &$object Empty object to fill
-     *
-     * @return boolean hook value
-     */
-     
-    function onStartActivityObjectFromNotice($notice, &$object)
-    {
-        common_log(LOG_INFO,
-                   "Checking {$notice->uri} to see if it's a bookmark.");
-
-        $nb = Bookmark::getByNotice($notice);
-                                         
-        if (!empty($nb)) {
-
-            common_log(LOG_INFO,
-                       "Formatting notice {$notice->uri} as a bookmark.");
-
-            $object->id      = $notice->uri;
-            $object->type    = ActivityObject::BOOKMARK;
-            $object->title   = $nb->title;
-            $object->summary = $nb->description;
-            $object->link    = $notice->bestUrl();
-
-            // Attributes of the URL
-
-            $attachments = $notice->attachments();
-
-            if (count($attachments) != 1) {
-                throw new ServerException(_('Bookmark notice with the '.
-                                            'wrong number of attachments.'));
-            }
-
-            $target = $attachments[0];
-
-            $attrs = array('rel' => 'related',
-                           'href' => $target->url);
-
-            if (!empty($target->title)) {
-                $attrs['title'] = $target->title;
-            }
-
-            $object->extra[] = array('link', $attrs, null);
-                                                   
-            // Attributes of the thumbnail, if any
-
-            $thumbnail = $target->getThumbnail();
-
-            if (!empty($thumbnail)) {
-                $tattrs = array('rel' => 'preview',
-                                'href' => $thumbnail->url);
-
-                if (!empty($thumbnail->width)) {
-                    $tattrs['media:width'] = $thumbnail->width;
-                }
-
-                if (!empty($thumbnail->height)) {
-                    $tattrs['media:height'] = $thumbnail->height;
-                }
-
-                $object->extra[] = array('link', $attrs, null);
-            }
-
-            return false;
-        }
-
-        return true;
-    }
 
     /**
      * Add our two queue handlers to the queue manager
@@ -481,149 +256,7 @@ class BookmarkPlugin extends Plugin
         return true;
     }
 
-    /**
-     * Handle a posted bookmark from PuSH
-     *
-     * @param Activity        $activity activity to handle
-     * @param Ostatus_profile $oprofile Profile for the feed
-     *
-     * @return boolean hook value
-     */
 
-    function onStartHandleFeedEntryWithProfile($activity, $oprofile)
-    {
-        common_log(LOG_INFO, "BookmarkPlugin called for new feed entry.");
-
-        if (self::_isPostBookmark($activity)) {
-
-            common_log(LOG_INFO, 
-                       "Importing activity {$activity->id} as a bookmark.");
-
-            $author = $oprofile->checkAuthorship($activity);
-
-            if (empty($author)) {
-                throw new ClientException(_('Can\'t get author for activity.'));
-            }
-
-            self::_postRemoteBookmark($author,
-                                      $activity);
-
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * Handle a posted bookmark from Salmon
-     *
-     * @param Activity $activity activity to handle
-     * @param mixed    $target   user or group targeted
-     *
-     * @return boolean hook value
-     */
-
-    function onStartHandleSalmonTarget($activity, $target)
-    {
-        if (self::_isPostBookmark($activity)) {
-
-            $this->log(LOG_INFO, "Checking {$activity->id} as a valid Salmon slap.");
-
-            if ($target instanceof User_group) {
-                $uri = $target->getUri();
-                if (!in_array($uri, $activity->context->attention)) {
-                    throw new ClientException(_("Bookmark not posted ".
-                                                "to this group."));
-                }
-            } else if ($target instanceof User) {
-                $uri      = $target->uri;
-                $original = null;
-                if (!empty($activity->context->replyToID)) {
-                    $original = Notice::staticGet('uri', 
-                                                  $activity->context->replyToID); 
-                }
-                if (!in_array($uri, $activity->context->attention) &&
-                    (empty($original) ||
-                     $original->profile_id != $target->id)) {
-                    throw new ClientException(_("Bookmark not posted ".
-                                                "to this user."));
-                }
-            } else {
-                throw new ServerException(_("Don't know how to handle ".
-                                            "this kind of target."));
-            }
-
-            $author = Ostatus_profile::ensureActivityObjectProfile($activity->actor);
-
-            self::_postRemoteBookmark($author,
-                                      $activity);
-
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * Handle bookmark posted via AtomPub
-     *
-     * @param Activity &$activity Activity that was posted
-     * @param User     $user      User that posted it
-     * @param Notice   &$notice   Resulting notice
-     *
-     * @return boolean hook value
-     */
-
-    function onStartAtomPubNewActivity(&$activity, $user, &$notice)
-    {
-        if (self::_isPostBookmark($activity)) {
-            $options = array('source' => 'atompub');
-            $notice  = self::_postBookmark($user->getProfile(),
-                                           $activity,
-                                           $options);
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * Handle bookmark imported from a backup file
-     *
-     * @param User           $user     User to import for
-     * @param ActivityObject $author   Original author per import file
-     * @param Activity       $activity Activity to import
-     * @param boolean        $trusted  Is this a trusted user?
-     * @param boolean        &$done    Is this done (success or unrecoverable error)
-     *
-     * @return boolean hook value
-     */
-
-    function onStartImportActivity($user, $author, $activity, $trusted, &$done)
-    {
-        if (self::_isPostBookmark($activity)) {
-
-            $bookmark = $activity->objects[0];
-
-            $this->log(LOG_INFO,
-                       'Importing Bookmark ' . $bookmark->id . 
-                       ' for user ' . $user->nickname);
-
-            $options = array('uri' => $bookmark->id,
-                             'url' => $bookmark->link,
-                             'source' => 'restore');
-
-            $saved = self::_postBookmark($user->getProfile(), $activity, $options);
-
-            if (!empty($saved)) {
-                $done = true;
-            }
-
-            return false;
-        }
-
-        return true;
-    }
 
     /**
      * Show a link to our delicious import page on profile settings form
@@ -691,6 +324,44 @@ class BookmarkPlugin extends Plugin
         return self::_postBookmark($author->localProfile(), $activity, $options);
     }
 
+    /**
+     * Test if an activity represents posting a bookmark
+     *
+     * @param Activity $activity Activity to test
+     *
+     * @return true if it's a Post of a Bookmark, else false
+     */
+
+    static private function _isPostBookmark($activity)
+    {
+        return ($activity->verb == ActivityVerb::POST &&
+                $activity->objects[0]->type == ActivityObject::BOOKMARK);
+    }
+
+    function types()
+    {
+        return array(ActivityObject::BOOKMARK);
+    }
+
+    /**
+     * When a notice is deleted, delete the related Bookmark
+     *
+     * @param Notice $notice Notice being deleted
+     * 
+     * @return boolean hook value
+     */
+
+    function deleteRelated($notice)
+    {
+        $nb = Bookmark::getByNotice($notice);
+
+        if (!empty($nb)) {
+            $nb->delete();
+        }
+
+        return true;
+    }
+
     /**
      * Save a bookmark from an activity
      *
@@ -701,10 +372,10 @@ class BookmarkPlugin extends Plugin
      * @return Notice resulting notice
      */
 
-    static private function _postBookmark(Profile $profile,
-                                          Activity $activity,
-                                          $options=array())
+    function saveNoticeFromActivity($activity, $profile)
     {
+        $options = array();
+
         $bookmark = $activity->objects[0];
 
         $relLinkEls = ActivityUtils::getLinks($bookmark->element, 'related');
@@ -782,17 +453,173 @@ class BookmarkPlugin extends Plugin
                                  $options);
     }
 
-    /**
-     * Test if an activity represents posting a bookmark
-     *
-     * @param Activity $activity Activity to test
-     *
-     * @return true if it's a Post of a Bookmark, else false
-     */
-
-    static private function _isPostBookmark($activity)
+    function activityObjectFromNotice($notice)
     {
-        return ($activity->verb == ActivityVerb::POST &&
-                $activity->objects[0]->type == ActivityObject::BOOKMARK);
+        assert($this->isMyNotice($notice));
+
+        common_log(LOG_INFO,
+                   "Formatting notice {$notice->uri} as a bookmark.");
+
+        $object = new ActivityObject();
+
+        $object->id      = $notice->uri;
+        $object->type    = ActivityObject::BOOKMARK;
+        $object->title   = $nb->title;
+        $object->summary = $nb->description;
+        $object->link    = $notice->bestUrl();
+
+        // Attributes of the URL
+
+        $attachments = $notice->attachments();
+
+        if (count($attachments) != 1) {
+            throw new ServerException(_('Bookmark notice with the '.
+                                        'wrong number of attachments.'));
+        }
+
+        $target = $attachments[0];
+
+        $attrs = array('rel' => 'related',
+                       'href' => $target->url);
+
+        if (!empty($target->title)) {
+            $attrs['title'] = $target->title;
+        }
+
+        $object->extra[] = array('link', $attrs, null);
+                                                   
+        // Attributes of the thumbnail, if any
+
+        $thumbnail = $target->getThumbnail();
+
+        if (!empty($thumbnail)) {
+            $tattrs = array('rel' => 'preview',
+                            'href' => $thumbnail->url);
+
+            if (!empty($thumbnail->width)) {
+                $tattrs['media:width'] = $thumbnail->width;
+            }
+
+            if (!empty($thumbnail->height)) {
+                $tattrs['media:height'] = $thumbnail->height;
+            }
+
+            $object->extra[] = array('link', $attrs, null);
+        }
+
+        return $object;
     }
+
+    function showNotice($notice, $out)
+    {
+        $profile = $notice->getProfile();
+
+        $atts = $notice->attachments();
+
+        if (count($atts) < 1) {
+            // Something wrong; let default code deal with it.
+            throw new Exception("That can't be right.");
+        }
+
+        $att = $atts[0];
+
+        // XXX: only show the bookmark URL for non-single-page stuff
+
+        if ($out instanceof ShowbookmarkAction) {
+        } else {
+            $out->elementStart('h3');
+            $out->element('a',
+                          array('href' => $att->url,
+                                'class' => 'bookmark-title entry-title'),
+                          $nb->title);
+            $out->elementEnd('h3');
+
+            $countUrl = common_local_url('noticebyurl',
+                                         array('id' => $att->id));
+
+            $out->element('a', array('class' => 'bookmark-notice-count',
+                                     'href' => $countUrl),
+                          $att->noticeCount());
+        }
+
+        // Replies look like "for:" tags
+
+        $replies = $nli->notice->getReplies();
+        $tags = $nli->notice->getTags();
+
+        if (!empty($replies) || !empty($tags)) {
+
+            $out->elementStart('ul', array('class' => 'bookmark-tags'));
+            
+            foreach ($replies as $reply) {
+                $other = Profile::staticGet('id', $reply);
+                $out->elementStart('li');
+                $out->element('a', array('rel' => 'tag',
+                                         'href' => $other->profileurl,
+                                         'title' => $other->getBestName()),
+                              sprintf('for:%s', $other->nickname));
+                $out->elementEnd('li');
+                $out->text(' ');
+            }
+
+            foreach ($tags as $tag) {
+                $out->elementStart('li');
+                $out->element('a', 
+                              array('rel' => 'tag',
+                                    'href' => Notice_tag::url($tag)),
+                              $tag);
+                $out->elementEnd('li');
+                $out->text(' ');
+            }
+
+            $out->elementEnd('ul');
+        }
+
+        if (!empty($nb->description)) {
+            $out->element('p',
+                          array('class' => 'bookmark-description'),
+                          $nb->description);
+        }
+
+        if (common_config('attachments', 'show_thumbs')) {
+            $haveThumbs = false;
+            foreach ($atts as $check) {
+                $thumbnail = File_thumbnail::staticGet('file_id', $check->id);
+                if (!empty($thumbnail)) {
+                    $haveThumbs = true;
+                    break;
+                }
+            }
+            if ($haveThumbs) {
+                $al = new InlineAttachmentList($notice, $out);
+                $al->show();
+            }
+        }
+
+        $out->elementStart('div', array('class' => 'bookmark-info entry-content'));
+
+        $avatar = $profile->getAvatar(AVATAR_MINI_SIZE);
+
+        $out->element('img', 
+                      array('src' => ($avatar) ?
+                            $avatar->displayUrl() :
+                            Avatar::defaultImage(AVATAR_MINI_SIZE),
+                            'class' => 'avatar photo bookmark-avatar',
+                            'width' => AVATAR_MINI_SIZE,
+                            'height' => AVATAR_MINI_SIZE,
+                            'alt' => $profile->getBestName()));
+
+        $out->raw('&nbsp;');
+
+        $out->element('a', 
+                      array('href' => $profile->profileurl,
+                            'title' => $profile->getBestName()),
+                      $profile->nickname);
+    }
+
+    function entryForm($out)
+    {
+        return new BookmarkForm($out);
+    }
+
 }

From b54a9f389cacd6b4efd5499316a10729e89e2578 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Sun, 6 Mar 2011 17:27:03 -0500
Subject: [PATCH 411/655] made the input-form switcher work, kinda

---
 lib/action.php                      | 56 +++++++++++++++++++++++++++--
 lib/microappplugin.php              | 42 +++++++++++++++++++---
 plugins/Bookmark/BookmarkPlugin.php | 13 +++++--
 3 files changed, 101 insertions(+), 10 deletions(-)

diff --git a/lib/action.php b/lib/action.php
index 650f706a4b..1c616daf89 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -640,8 +640,60 @@ class Action extends HTMLOutputter // lawsuit
      */
     function showNoticeForm()
     {
-        $notice_form = new NoticeForm($this);
-        $notice_form->show();
+        $tabs = array('status' => _('Status'));
+
+        $this->elementStart('div', 'input_forms');
+
+        if (Event::handle('StartShowEntryForms', array(&$tabs))) {
+
+            $this->elementStart('ul', array('class' => 'nav',
+                                            'id' => 'input_form_nav'));
+
+            foreach ($tabs as $tag => $title) {
+
+                $attrs = array('id' => 'input_form_nav_'.$title);
+
+                if ($tag == 'status') {
+                    $attrs['class'] = 'current';
+                }
+
+                $this->elementStart('li', $attrs);
+
+                $this->element('a',
+                               array('href' => 'javascript:switchInputFormTab("'.$tag.'")'),
+                               $title);
+                $this->elementEnd('li');
+            }
+
+            $this->elementEnd('ul');
+
+            foreach ($tabs as $tag => $title) {
+
+                $attrs = array('class' => 'input_form',
+                               'id' => 'input_form_'.$tag);
+
+                if ($tag == 'status') {
+                    $attrs['class'] .= ' active';
+                } else {
+                    $attrs['class'] .= ' inactive';
+                }
+
+                $this->elementStart('div', $attrs);
+
+                $form = null;
+
+                if (Event::handle('StartMakeEntryForm', array($tag, $this, &$form))) {
+                    if ($tag == 'status') {
+                        $form = new NoticeForm($this);
+                    }
+                    Event::handle('EndMakeEntryForm', array($tag, $this, $form));
+                }
+
+                if (!empty($form)) {
+                    $form->show();
+                }
+            }
+        }
     }
 
     /**
diff --git a/lib/microappplugin.php b/lib/microappplugin.php
index 1cdbe965e6..0b02f5da52 100644
--- a/lib/microappplugin.php
+++ b/lib/microappplugin.php
@@ -54,7 +54,7 @@ abstract class MicroAppPlugin extends Plugin
     abstract function appTitle();
     abstract function tag();
     abstract function types();
-    abstract function saveNoticeFromActivity($activity, $actor);
+    abstract function saveNoticeFromActivity($activity, $actor, $options);
     abstract function activityObjectFromNotice($notice);
     abstract function showNotice($notice, $out);
     abstract function entryForm($out);
@@ -157,6 +157,13 @@ abstract class MicroAppPlugin extends Plugin
                 throw new ClientException(_('Can\'t get author for activity.'));
             }
 
+            $object = $activity->objects[0];
+
+            $options = array('uri' => $object->id,
+                             'url' => $object->link,
+                             'is_local' => Notice::REMOTE_OMB,
+                             'source' => 'ostatus');
+            
             $this->saveNoticeFromActivity($activity, $actor);
 
             return false;
@@ -196,7 +203,7 @@ abstract class MicroAppPlugin extends Plugin
                 if (!in_array($uri, $activity->context->attention) &&
                     (empty($original) ||
                      $original->profile_id != $target->id)) {
-                    throw new ClientException(_("Bookmark not posted ".
+                    throw new ClientException(_("Object not posted ".
                                                 "to this user."));
                 }
             } else {
@@ -206,7 +213,14 @@ abstract class MicroAppPlugin extends Plugin
 
             $actor = Ostatus_profile::ensureActivityObjectProfile($activity->actor);
 
-            $this->saveNoticeFromActivity($activity, $actor);
+            $object = $activity->objects[0];
+
+            $options = array('uri' => $object->id,
+                             'url' => $object->link,
+                             'is_local' => Notice::REMOTE_OMB,
+                             'source' => 'ostatus');
+
+            $this->saveNoticeFromActivity($activity, $actor, $options);
 
             return false;
         }
@@ -258,8 +272,8 @@ abstract class MicroAppPlugin extends Plugin
 
             $obj = $activity->objects[0];
 
-            $options = array('uri' => $bookmark->id,
-                             'url' => $bookmark->link,
+            $options = array('uri' => $object->id,
+                             'url' => $object->link,
                              'source' => 'restore');
 
             $saved = $this->saveNoticeFromActivity($activity,
@@ -275,4 +289,22 @@ abstract class MicroAppPlugin extends Plugin
 
         return true;
     }
+
+    function onStartShowEntryForms(&$tabs)
+    {
+        $tabs[$this->tag()] = $this->appTitle();
+        return true;
+    }
+
+    function onStartMakeEntryForm($tag, $out, &$form)
+    {
+        $this->log(LOG_INFO, "onStartMakeEntryForm() called for tag '$tag'");
+
+        if ($tag == $this->tag()) {
+            $form = $this->entryForm($out);
+            return false;
+        }
+
+        return true;
+    }
 }
diff --git a/plugins/Bookmark/BookmarkPlugin.php b/plugins/Bookmark/BookmarkPlugin.php
index c3ff17c4e9..1ef5f5c0e3 100644
--- a/plugins/Bookmark/BookmarkPlugin.php
+++ b/plugins/Bookmark/BookmarkPlugin.php
@@ -372,10 +372,8 @@ class BookmarkPlugin extends MicroAppPlugin
      * @return Notice resulting notice
      */
 
-    function saveNoticeFromActivity($activity, $profile)
+    function saveNoticeFromActivity($activity, $profile, $options=array())
     {
-        $options = array();
-
         $bookmark = $activity->objects[0];
 
         $relLinkEls = ActivityUtils::getLinks($bookmark->element, 'related');
@@ -622,4 +620,13 @@ class BookmarkPlugin extends MicroAppPlugin
         return new BookmarkForm($out);
     }
 
+    function tag()
+    {
+        return 'bookmark';
+    }
+
+    function appTitle()
+    {
+        return _m('Bookmark');
+    }
 }

From 457d76c0ca32350ac600006369ca318a269946fc Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Sun, 6 Mar 2011 17:32:26 -0500
Subject: [PATCH 412/655] submenu headers are <h3> elements

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

diff --git a/lib/menu.php b/lib/menu.php
index 7947b4d7e4..2713b44d50 100644
--- a/lib/menu.php
+++ b/lib/menu.php
@@ -85,7 +85,7 @@ class Menu extends Widget
     function submenu($label, $menu)
     {
         $this->action->elementStart('li');
-        $this->action->text($label);
+        $this->action->element('h3', null, $label);
         $menu->show();
         $this->action->elementEnd('li');
     }

From 00c14ffa88c508d1675881e6a20b70f2b1288963 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Sun, 6 Mar 2011 22:07:42 -0800
Subject: [PATCH 413/655] Better instructions, and better empty search results
 messages.

---
 plugins/Directory/actions/userdirectory.php | 50 ++++++++++++++-------
 1 file changed, 35 insertions(+), 15 deletions(-)

diff --git a/plugins/Directory/actions/userdirectory.php b/plugins/Directory/actions/userdirectory.php
index 005fb787d3..20ec5c19e3 100644
--- a/plugins/Directory/actions/userdirectory.php
+++ b/plugins/Directory/actions/userdirectory.php
@@ -91,20 +91,18 @@ class UserdirectoryAction extends Action
 
         if ($this->filter == 'all') {
             if ($this->page != 1) {
-                return(sprintf(_m('All users, page %d'), $this->page));
+                return(sprintf(_m('User Directory, page %d'), $this->page));
             }
-            return _m('All users');
-        }
-
-        if ($this->page == 1) {
+            return _m('User directory');
+        } else if ($this->page == 1) {
             return sprintf(
-                _m('Users with nicknames beginning with %s'),
-                $this->filter
+                _m('User directory - %s'),
+                strtoupper($this->filter)
             );
         } else {
             return sprintf(
-                _m('Users with nicknames starting with %s, page %d'),
-                $this->filter,
+                _m('User directory - %s, page %d'),
+                strtoupper($this->filter),
                 $this->page
             );
         }
@@ -117,7 +115,12 @@ class UserdirectoryAction extends Action
      */
     function getInstructions()
     {
-        return _('User directory');
+        // TRANS: %%site.name%% is the name of the StatusNet site.
+        return _(
+            'Search for people on %%site.name%% by their name, '
+            . 'location, or interests. Separate the terms by spaces; '
+            . ' they must be 3 characters or more.'
+        );
     }
 
     /**
@@ -362,11 +365,28 @@ class UserdirectoryAction extends Action
      */
     function showEmptyListMessage()
     {
-        $message = sprintf(_m('No users starting with **%s**'), $this->filter);
-
-        $this->elementStart('div', 'guide');
-        $this->raw(common_markup_to_html($message));
-        $this->elementEnd('div');
+        if (!empty($this->filter) && ($this->filter != 'all')) {
+            $this->element(
+                'p',
+                'error',
+                sprintf(
+                    _m('No users starting with %s'),
+                    $this->filter
+                )
+            );
+        } else {
+            $this->element('p', 'error', _('No results.'));
+            $message = _m(<<<E_O_T
+* Make sure all words are spelled correctly.
+* Try different keywords.
+* Try more general keywords.
+* Try fewer keywords.
+E_O_T
+);
+            $this->elementStart('div', 'help instructions');
+            $this->raw(common_markup_to_html($message));
+            $this->elementEnd('div');
+        }
     }
 
 }

From 97dc0260d9633f857790d54649ad434b0f37ff62 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Thu, 3 Mar 2011 16:53:44 -0500
Subject: [PATCH 414/655] first pass at microapp class

---
 lib/microapp.php | 59 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 59 insertions(+)
 create mode 100644 lib/microapp.php

diff --git a/lib/microapp.php b/lib/microapp.php
new file mode 100644
index 0000000000..77e6abb7e3
--- /dev/null
+++ b/lib/microapp.php
@@ -0,0 +1,59 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2011, StatusNet, Inc.
+ *
+ * Superclass for microapp plugin
+ * 
+ * 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  Microapp
+ * @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);
+}
+
+/**
+ * Superclass for microapp plugins
+ *
+ * This class lets you define micro-applications with different kinds of activities.
+ *
+ * The applications work more-or-less like other 
+ * 
+ * @category  Microapp
+ * @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 MicroAppPlugin extends Plugin
+{
+    abstract function isMyNotice($notice);
+    abstract function isMyActivity($activity);
+    abstract function saveNoticeFromActivity($activity);
+    abstract function activityFromNotice($notice);
+    abstract function showNotice($notice, $out);
+}

From a0e2ebec8fa614f7c0f3a1942cb47ca04aaca80e Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Thu, 3 Mar 2011 16:57:16 -0500
Subject: [PATCH 415/655] add activity object type to notice

---
 db/core.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/db/core.php b/db/core.php
index 55d724b505..62730b853f 100644
--- a/db/core.php
+++ b/db/core.php
@@ -201,6 +201,7 @@ $schema['notice'] = array(
         'location_id' => array('type' => 'int', 'description' => 'location id if possible'),
         'location_ns' => array('type' => 'int', 'description' => 'namespace for location'),
         'repeat_of' => array('type' => 'int', 'description' => 'notice this is a repeat of'),
+        'object_type' => array('type' => 'varchar', 'length' => 32, 'description' => 'URI representing activity streams object type'),
     ),
     'primary key' => array('id'),
     'unique keys' => array(

From 1b5faf1c4e264c396b8945cc192b04f99b6f9f1d Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Fri, 4 Mar 2011 16:41:17 -0500
Subject: [PATCH 416/655] correct length and default value for object_type

---
 db/core.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/db/core.php b/db/core.php
index 62730b853f..16a59462d4 100644
--- a/db/core.php
+++ b/db/core.php
@@ -201,7 +201,7 @@ $schema['notice'] = array(
         'location_id' => array('type' => 'int', 'description' => 'location id if possible'),
         'location_ns' => array('type' => 'int', 'description' => 'namespace for location'),
         'repeat_of' => array('type' => 'int', 'description' => 'notice this is a repeat of'),
-        'object_type' => array('type' => 'varchar', 'length' => 32, 'description' => 'URI representing activity streams object type'),
+        'object_type' => array('type' => 'varchar', 'length' => 255, 'description' => 'URI representing activity streams object type', 'default' => 'http://activitystrea.ms/schema/1.0/note'),
     ),
     'primary key' => array('id'),
     'unique keys' => array(

From a7b6f7a6698f646c3e9962b15d8d2c570b48a5a7 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Sat, 5 Mar 2011 14:47:37 -0500
Subject: [PATCH 417/655] add a couple of methods to MicroAppPlugin

---
 lib/microapp.php | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/lib/microapp.php b/lib/microapp.php
index 77e6abb7e3..23b4b5bb84 100644
--- a/lib/microapp.php
+++ b/lib/microapp.php
@@ -49,11 +49,22 @@ if (!defined('STATUSNET')) {
  * @link      http://status.net/
  */
 
-class MicroAppPlugin extends Plugin
+abstract class MicroAppPlugin extends Plugin
 {
-    abstract function isMyNotice($notice);
-    abstract function isMyActivity($activity);
+    abstract function types();
     abstract function saveNoticeFromActivity($activity);
     abstract function activityFromNotice($notice);
     abstract function showNotice($notice, $out);
+    abstract function entryForm();
+
+    function isMyNotice($notice) {
+        $types = $this->types();
+        return in_array($notice->object_type, $types);
+    }
+
+    function isMyActivity($activity) {
+        $types = $this->types();
+        return (count($activity->objects) == 1 &&
+                in_array($activity->objects[0]->type, $types));
+    }
 }

From 0c3d27046ecda5e584f9e71286f7e768f641d7ed Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Sat, 5 Mar 2011 14:48:10 -0500
Subject: [PATCH 418/655] move microapp.php to microappplugin.php

---
 lib/microappplugin.php | 70 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 70 insertions(+)
 create mode 100644 lib/microappplugin.php

diff --git a/lib/microappplugin.php b/lib/microappplugin.php
new file mode 100644
index 0000000000..23b4b5bb84
--- /dev/null
+++ b/lib/microappplugin.php
@@ -0,0 +1,70 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2011, StatusNet, Inc.
+ *
+ * Superclass for microapp plugin
+ * 
+ * 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  Microapp
+ * @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);
+}
+
+/**
+ * Superclass for microapp plugins
+ *
+ * This class lets you define micro-applications with different kinds of activities.
+ *
+ * The applications work more-or-less like other 
+ * 
+ * @category  Microapp
+ * @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/
+ */
+
+abstract class MicroAppPlugin extends Plugin
+{
+    abstract function types();
+    abstract function saveNoticeFromActivity($activity);
+    abstract function activityFromNotice($notice);
+    abstract function showNotice($notice, $out);
+    abstract function entryForm();
+
+    function isMyNotice($notice) {
+        $types = $this->types();
+        return in_array($notice->object_type, $types);
+    }
+
+    function isMyActivity($activity) {
+        $types = $this->types();
+        return (count($activity->objects) == 1 &&
+                in_array($activity->objects[0]->type, $types));
+    }
+}

From 52952d13c0b926b568d537d837aa36fcfcd9afa0 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Sun, 6 Mar 2011 16:33:36 -0500
Subject: [PATCH 419/655] first (non-working) move to microapp structure for
 bookmarks

---
 lib/microapp.php                    |  70 ----
 lib/microappplugin.php              | 214 +++++++++-
 plugins/Bookmark/BookmarkPlugin.php | 591 ++++++++++------------------
 3 files changed, 420 insertions(+), 455 deletions(-)
 delete mode 100644 lib/microapp.php

diff --git a/lib/microapp.php b/lib/microapp.php
deleted file mode 100644
index 23b4b5bb84..0000000000
--- a/lib/microapp.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-/**
- * StatusNet - the distributed open-source microblogging tool
- * Copyright (C) 2011, StatusNet, Inc.
- *
- * Superclass for microapp plugin
- * 
- * 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  Microapp
- * @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);
-}
-
-/**
- * Superclass for microapp plugins
- *
- * This class lets you define micro-applications with different kinds of activities.
- *
- * The applications work more-or-less like other 
- * 
- * @category  Microapp
- * @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/
- */
-
-abstract class MicroAppPlugin extends Plugin
-{
-    abstract function types();
-    abstract function saveNoticeFromActivity($activity);
-    abstract function activityFromNotice($notice);
-    abstract function showNotice($notice, $out);
-    abstract function entryForm();
-
-    function isMyNotice($notice) {
-        $types = $this->types();
-        return in_array($notice->object_type, $types);
-    }
-
-    function isMyActivity($activity) {
-        $types = $this->types();
-        return (count($activity->objects) == 1 &&
-                in_array($activity->objects[0]->type, $types));
-    }
-}
diff --git a/lib/microappplugin.php b/lib/microappplugin.php
index 23b4b5bb84..1cdbe965e6 100644
--- a/lib/microappplugin.php
+++ b/lib/microappplugin.php
@@ -51,11 +51,14 @@ if (!defined('STATUSNET')) {
 
 abstract class MicroAppPlugin extends Plugin
 {
+    abstract function appTitle();
+    abstract function tag();
     abstract function types();
-    abstract function saveNoticeFromActivity($activity);
-    abstract function activityFromNotice($notice);
+    abstract function saveNoticeFromActivity($activity, $actor);
+    abstract function activityObjectFromNotice($notice);
     abstract function showNotice($notice, $out);
-    abstract function entryForm();
+    abstract function entryForm($out);
+    abstract function deleteRelated($notice);
 
     function isMyNotice($notice) {
         $types = $this->types();
@@ -67,4 +70,209 @@ abstract class MicroAppPlugin extends Plugin
         return (count($activity->objects) == 1 &&
                 in_array($activity->objects[0]->type, $types));
     }
+
+    /**
+     * When a notice is deleted, delete the related objects
+     *
+     * @param Notice $notice Notice being deleted
+     * 
+     * @return boolean hook value
+     */
+
+    function onNoticeDeleteRelated($notice)
+    {
+        if ($this->isMyNotice($notice)) {
+            $this->deleteRelated($notice);
+        }
+
+        return true;
+    }
+
+    /**
+     * Output the HTML for this kind of object in a list
+     *
+     * @param NoticeListItem $nli The list item being shown.
+     *
+     * @return boolean hook value
+     */
+
+    function onStartShowNoticeItem($nli)
+    {
+        if (!$this->isMyNotice($nli->notice)) {
+            return true;
+        }
+
+        $out = $nli->out;
+
+        $this->showNotice($notice, $out);
+
+        $nli->showNoticeLink();
+        $nli->showNoticeSource();
+        $nli->showNoticeLocation();
+        $nli->showContext();
+        $nli->showRepeat();
+        
+        $out->elementEnd('div');
+        
+        $nli->showNoticeOptions();
+
+        return false;
+    }
+
+    /**
+     * Render a notice as one of our objects
+     *
+     * @param Notice         $notice  Notice to render
+     * @param ActivityObject &$object Empty object to fill
+     *
+     * @return boolean hook value
+     */
+     
+    function onStartActivityObjectFromNotice($notice, &$object)
+    {
+        if ($this->isMyNotice($notice)) {
+            $object = $this->activityObjectFromNotice($notice);
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Handle a posted object from PuSH
+     *
+     * @param Activity        $activity activity to handle
+     * @param Ostatus_profile $oprofile Profile for the feed
+     *
+     * @return boolean hook value
+     */
+
+    function onStartHandleFeedEntryWithProfile($activity, $oprofile)
+    {
+        if ($this->isMyActivity($activity)) {
+
+            $actor = $oprofile->checkAuthorship($activity);
+
+            if (empty($actor)) {
+                throw new ClientException(_('Can\'t get author for activity.'));
+            }
+
+            $this->saveNoticeFromActivity($activity, $actor);
+
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Handle a posted object from Salmon
+     *
+     * @param Activity $activity activity to handle
+     * @param mixed    $target   user or group targeted
+     *
+     * @return boolean hook value
+     */
+
+    function onStartHandleSalmonTarget($activity, $target)
+    {
+        if ($this->isMyActivity($activity)) {
+
+            $this->log(LOG_INFO, "Checking {$activity->id} as a valid Salmon slap.");
+
+            if ($target instanceof User_group) {
+                $uri = $target->getUri();
+                if (!in_array($uri, $activity->context->attention)) {
+                    throw new ClientException(_("Bookmark not posted ".
+                                                "to this group."));
+                }
+            } else if ($target instanceof User) {
+                $uri      = $target->uri;
+                $original = null;
+                if (!empty($activity->context->replyToID)) {
+                    $original = Notice::staticGet('uri', 
+                                                  $activity->context->replyToID); 
+                }
+                if (!in_array($uri, $activity->context->attention) &&
+                    (empty($original) ||
+                     $original->profile_id != $target->id)) {
+                    throw new ClientException(_("Bookmark not posted ".
+                                                "to this user."));
+                }
+            } else {
+                throw new ServerException(_("Don't know how to handle ".
+                                            "this kind of target."));
+            }
+
+            $actor = Ostatus_profile::ensureActivityObjectProfile($activity->actor);
+
+            $this->saveNoticeFromActivity($activity, $actor);
+
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Handle object posted via AtomPub
+     *
+     * @param Activity &$activity Activity that was posted
+     * @param User     $user      User that posted it
+     * @param Notice   &$notice   Resulting notice
+     *
+     * @return boolean hook value
+     */
+
+    function onStartAtomPubNewActivity(&$activity, $user, &$notice)
+    {
+        if ($this->isMyActivity($activity)) {
+
+            $options = array('source' => 'atompub');
+
+            $this->saveNoticeFromActivity($activity,
+                                          $user->getProfile(),
+                                          $options);
+
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Handle object imported from a backup file
+     *
+     * @param User           $user     User to import for
+     * @param ActivityObject $author   Original author per import file
+     * @param Activity       $activity Activity to import
+     * @param boolean        $trusted  Is this a trusted user?
+     * @param boolean        &$done    Is this done (success or unrecoverable error)
+     *
+     * @return boolean hook value
+     */
+
+    function onStartImportActivity($user, $author, $activity, $trusted, &$done)
+    {
+        if ($this->isMyActivity($activity)) {
+
+            $obj = $activity->objects[0];
+
+            $options = array('uri' => $bookmark->id,
+                             'url' => $bookmark->link,
+                             'source' => 'restore');
+
+            $saved = $this->saveNoticeFromActivity($activity,
+                                                   $user->getProfile(),
+                                                   $options);
+
+            if (!empty($saved)) {
+                $done = true;
+            }
+
+            return false;
+        }
+
+        return true;
+    }
 }
diff --git a/plugins/Bookmark/BookmarkPlugin.php b/plugins/Bookmark/BookmarkPlugin.php
index 2e6baf5e4e..c3ff17c4e9 100644
--- a/plugins/Bookmark/BookmarkPlugin.php
+++ b/plugins/Bookmark/BookmarkPlugin.php
@@ -44,7 +44,7 @@ if (!defined('STATUSNET')) {
  * @link      http://status.net/
  */
 
-class BookmarkPlugin extends Plugin
+class BookmarkPlugin extends MicroAppPlugin
 {
     const VERSION         = '0.1';
     const IMPORTDELICIOUS = 'BookmarkPlugin:IMPORTDELICIOUS';
@@ -120,25 +120,6 @@ class BookmarkPlugin extends Plugin
         return true;
     }
 
-    /**
-     * When a notice is deleted, delete the related Bookmark
-     *
-     * @param Notice $notice Notice being deleted
-     * 
-     * @return boolean hook value
-     */
-
-    function onNoticeDeleteRelated($notice)
-    {
-        $nb = Bookmark::getByNotice($notice);
-
-        if (!empty($nb)) {
-            $nb->delete();
-        }
-
-        return true;
-    }
-
     /**
      * Show the CSS necessary for this plugin
      *
@@ -218,212 +199,6 @@ class BookmarkPlugin extends Plugin
         return true;
     }
 
-    /**
-     * Output the HTML for a bookmark in a list
-     *
-     * @param NoticeListItem $nli The list item being shown.
-     *
-     * @return boolean hook value
-     */
-
-    function onStartShowNoticeItem($nli)
-    {
-        $nb = Bookmark::getByNotice($nli->notice);
-
-        if (!empty($nb)) {
-
-            $out     = $nli->out;
-            $notice  = $nli->notice;
-            $profile = $nli->profile;
-
-            $atts = $notice->attachments();
-
-            if (count($atts) < 1) {
-                // Something wrong; let default code deal with it.
-                return true;
-            }
-
-            $att = $atts[0];
-
-            // XXX: only show the bookmark URL for non-single-page stuff
-
-            if ($out instanceof ShowbookmarkAction) {
-            } else {
-                $out->elementStart('h3');
-                $out->element('a',
-                              array('href' => $att->url,
-                                    'class' => 'bookmark-title entry-title'),
-                              $nb->title);
-                $out->elementEnd('h3');
-
-                $countUrl = common_local_url('noticebyurl',
-                                             array('id' => $att->id));
-
-                $out->element('a', array('class' => 'bookmark-notice-count',
-                                         'href' => $countUrl),
-                              $att->noticeCount());
-            }
-
-            // Replies look like "for:" tags
-
-            $replies = $nli->notice->getReplies();
-            $tags = $nli->notice->getTags();
-
-            if (!empty($replies) || !empty($tags)) {
-
-                $out->elementStart('ul', array('class' => 'bookmark-tags'));
-            
-                foreach ($replies as $reply) {
-                    $other = Profile::staticGet('id', $reply);
-                    $out->elementStart('li');
-                    $out->element('a', array('rel' => 'tag',
-                                             'href' => $other->profileurl,
-                                             'title' => $other->getBestName()),
-                                  sprintf('for:%s', $other->nickname));
-                    $out->elementEnd('li');
-                    $out->text(' ');
-                }
-
-                foreach ($tags as $tag) {
-                    $out->elementStart('li');
-                    $out->element('a', 
-                                  array('rel' => 'tag',
-                                        'href' => Notice_tag::url($tag)),
-                                  $tag);
-                    $out->elementEnd('li');
-                    $out->text(' ');
-                }
-
-                $out->elementEnd('ul');
-            }
-
-            if (!empty($nb->description)) {
-                $out->element('p',
-                              array('class' => 'bookmark-description'),
-                              $nb->description);
-            }
-
-            if (common_config('attachments', 'show_thumbs')) {
-                $haveThumbs = false;
-                foreach ($atts as $check) {
-                    $thumbnail = File_thumbnail::staticGet('file_id', $check->id);
-                    if (!empty($thumbnail)) {
-                        $haveThumbs = true;
-                        break;
-                    }
-                }
-                if ($haveThumbs) {
-                    $al = new InlineAttachmentList($notice, $out);
-                    $al->show();
-                }
-            }
-
-            $out->elementStart('div', array('class' => 'bookmark-info entry-content'));
-
-            $avatar = $profile->getAvatar(AVATAR_MINI_SIZE);
-
-            $out->element('img', 
-                          array('src' => ($avatar) ?
-                                $avatar->displayUrl() :
-                                Avatar::defaultImage(AVATAR_MINI_SIZE),
-                                'class' => 'avatar photo bookmark-avatar',
-                                'width' => AVATAR_MINI_SIZE,
-                                'height' => AVATAR_MINI_SIZE,
-                                'alt' => $profile->getBestName()));
-
-            $out->raw('&nbsp;');
-
-            $out->element('a', 
-                          array('href' => $profile->profileurl,
-                                'title' => $profile->getBestName()),
-                          $profile->nickname);
-
-            $nli->showNoticeLink();
-            $nli->showNoticeSource();
-            $nli->showNoticeLocation();
-            $nli->showContext();
-            $nli->showRepeat();
-
-            $out->elementEnd('div');
-
-            $nli->showNoticeOptions();
-
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * Render a notice as a Bookmark object
-     *
-     * @param Notice         $notice  Notice to render
-     * @param ActivityObject &$object Empty object to fill
-     *
-     * @return boolean hook value
-     */
-     
-    function onStartActivityObjectFromNotice($notice, &$object)
-    {
-        common_log(LOG_INFO,
-                   "Checking {$notice->uri} to see if it's a bookmark.");
-
-        $nb = Bookmark::getByNotice($notice);
-                                         
-        if (!empty($nb)) {
-
-            common_log(LOG_INFO,
-                       "Formatting notice {$notice->uri} as a bookmark.");
-
-            $object->id      = $notice->uri;
-            $object->type    = ActivityObject::BOOKMARK;
-            $object->title   = $nb->title;
-            $object->summary = $nb->description;
-            $object->link    = $notice->bestUrl();
-
-            // Attributes of the URL
-
-            $attachments = $notice->attachments();
-
-            if (count($attachments) != 1) {
-                throw new ServerException(_('Bookmark notice with the '.
-                                            'wrong number of attachments.'));
-            }
-
-            $target = $attachments[0];
-
-            $attrs = array('rel' => 'related',
-                           'href' => $target->url);
-
-            if (!empty($target->title)) {
-                $attrs['title'] = $target->title;
-            }
-
-            $object->extra[] = array('link', $attrs, null);
-                                                   
-            // Attributes of the thumbnail, if any
-
-            $thumbnail = $target->getThumbnail();
-
-            if (!empty($thumbnail)) {
-                $tattrs = array('rel' => 'preview',
-                                'href' => $thumbnail->url);
-
-                if (!empty($thumbnail->width)) {
-                    $tattrs['media:width'] = $thumbnail->width;
-                }
-
-                if (!empty($thumbnail->height)) {
-                    $tattrs['media:height'] = $thumbnail->height;
-                }
-
-                $object->extra[] = array('link', $attrs, null);
-            }
-
-            return false;
-        }
-
-        return true;
-    }
 
     /**
      * Add our two queue handlers to the queue manager
@@ -481,149 +256,7 @@ class BookmarkPlugin extends Plugin
         return true;
     }
 
-    /**
-     * Handle a posted bookmark from PuSH
-     *
-     * @param Activity        $activity activity to handle
-     * @param Ostatus_profile $oprofile Profile for the feed
-     *
-     * @return boolean hook value
-     */
 
-    function onStartHandleFeedEntryWithProfile($activity, $oprofile)
-    {
-        common_log(LOG_INFO, "BookmarkPlugin called for new feed entry.");
-
-        if (self::_isPostBookmark($activity)) {
-
-            common_log(LOG_INFO, 
-                       "Importing activity {$activity->id} as a bookmark.");
-
-            $author = $oprofile->checkAuthorship($activity);
-
-            if (empty($author)) {
-                throw new ClientException(_('Can\'t get author for activity.'));
-            }
-
-            self::_postRemoteBookmark($author,
-                                      $activity);
-
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * Handle a posted bookmark from Salmon
-     *
-     * @param Activity $activity activity to handle
-     * @param mixed    $target   user or group targeted
-     *
-     * @return boolean hook value
-     */
-
-    function onStartHandleSalmonTarget($activity, $target)
-    {
-        if (self::_isPostBookmark($activity)) {
-
-            $this->log(LOG_INFO, "Checking {$activity->id} as a valid Salmon slap.");
-
-            if ($target instanceof User_group) {
-                $uri = $target->getUri();
-                if (!in_array($uri, $activity->context->attention)) {
-                    throw new ClientException(_("Bookmark not posted ".
-                                                "to this group."));
-                }
-            } else if ($target instanceof User) {
-                $uri      = $target->uri;
-                $original = null;
-                if (!empty($activity->context->replyToID)) {
-                    $original = Notice::staticGet('uri', 
-                                                  $activity->context->replyToID); 
-                }
-                if (!in_array($uri, $activity->context->attention) &&
-                    (empty($original) ||
-                     $original->profile_id != $target->id)) {
-                    throw new ClientException(_("Bookmark not posted ".
-                                                "to this user."));
-                }
-            } else {
-                throw new ServerException(_("Don't know how to handle ".
-                                            "this kind of target."));
-            }
-
-            $author = Ostatus_profile::ensureActivityObjectProfile($activity->actor);
-
-            self::_postRemoteBookmark($author,
-                                      $activity);
-
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * Handle bookmark posted via AtomPub
-     *
-     * @param Activity &$activity Activity that was posted
-     * @param User     $user      User that posted it
-     * @param Notice   &$notice   Resulting notice
-     *
-     * @return boolean hook value
-     */
-
-    function onStartAtomPubNewActivity(&$activity, $user, &$notice)
-    {
-        if (self::_isPostBookmark($activity)) {
-            $options = array('source' => 'atompub');
-            $notice  = self::_postBookmark($user->getProfile(),
-                                           $activity,
-                                           $options);
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * Handle bookmark imported from a backup file
-     *
-     * @param User           $user     User to import for
-     * @param ActivityObject $author   Original author per import file
-     * @param Activity       $activity Activity to import
-     * @param boolean        $trusted  Is this a trusted user?
-     * @param boolean        &$done    Is this done (success or unrecoverable error)
-     *
-     * @return boolean hook value
-     */
-
-    function onStartImportActivity($user, $author, $activity, $trusted, &$done)
-    {
-        if (self::_isPostBookmark($activity)) {
-
-            $bookmark = $activity->objects[0];
-
-            $this->log(LOG_INFO,
-                       'Importing Bookmark ' . $bookmark->id . 
-                       ' for user ' . $user->nickname);
-
-            $options = array('uri' => $bookmark->id,
-                             'url' => $bookmark->link,
-                             'source' => 'restore');
-
-            $saved = self::_postBookmark($user->getProfile(), $activity, $options);
-
-            if (!empty($saved)) {
-                $done = true;
-            }
-
-            return false;
-        }
-
-        return true;
-    }
 
     /**
      * Show a link to our delicious import page on profile settings form
@@ -691,6 +324,44 @@ class BookmarkPlugin extends Plugin
         return self::_postBookmark($author->localProfile(), $activity, $options);
     }
 
+    /**
+     * Test if an activity represents posting a bookmark
+     *
+     * @param Activity $activity Activity to test
+     *
+     * @return true if it's a Post of a Bookmark, else false
+     */
+
+    static private function _isPostBookmark($activity)
+    {
+        return ($activity->verb == ActivityVerb::POST &&
+                $activity->objects[0]->type == ActivityObject::BOOKMARK);
+    }
+
+    function types()
+    {
+        return array(ActivityObject::BOOKMARK);
+    }
+
+    /**
+     * When a notice is deleted, delete the related Bookmark
+     *
+     * @param Notice $notice Notice being deleted
+     * 
+     * @return boolean hook value
+     */
+
+    function deleteRelated($notice)
+    {
+        $nb = Bookmark::getByNotice($notice);
+
+        if (!empty($nb)) {
+            $nb->delete();
+        }
+
+        return true;
+    }
+
     /**
      * Save a bookmark from an activity
      *
@@ -701,10 +372,10 @@ class BookmarkPlugin extends Plugin
      * @return Notice resulting notice
      */
 
-    static private function _postBookmark(Profile $profile,
-                                          Activity $activity,
-                                          $options=array())
+    function saveNoticeFromActivity($activity, $profile)
     {
+        $options = array();
+
         $bookmark = $activity->objects[0];
 
         $relLinkEls = ActivityUtils::getLinks($bookmark->element, 'related');
@@ -782,17 +453,173 @@ class BookmarkPlugin extends Plugin
                                  $options);
     }
 
-    /**
-     * Test if an activity represents posting a bookmark
-     *
-     * @param Activity $activity Activity to test
-     *
-     * @return true if it's a Post of a Bookmark, else false
-     */
-
-    static private function _isPostBookmark($activity)
+    function activityObjectFromNotice($notice)
     {
-        return ($activity->verb == ActivityVerb::POST &&
-                $activity->objects[0]->type == ActivityObject::BOOKMARK);
+        assert($this->isMyNotice($notice));
+
+        common_log(LOG_INFO,
+                   "Formatting notice {$notice->uri} as a bookmark.");
+
+        $object = new ActivityObject();
+
+        $object->id      = $notice->uri;
+        $object->type    = ActivityObject::BOOKMARK;
+        $object->title   = $nb->title;
+        $object->summary = $nb->description;
+        $object->link    = $notice->bestUrl();
+
+        // Attributes of the URL
+
+        $attachments = $notice->attachments();
+
+        if (count($attachments) != 1) {
+            throw new ServerException(_('Bookmark notice with the '.
+                                        'wrong number of attachments.'));
+        }
+
+        $target = $attachments[0];
+
+        $attrs = array('rel' => 'related',
+                       'href' => $target->url);
+
+        if (!empty($target->title)) {
+            $attrs['title'] = $target->title;
+        }
+
+        $object->extra[] = array('link', $attrs, null);
+                                                   
+        // Attributes of the thumbnail, if any
+
+        $thumbnail = $target->getThumbnail();
+
+        if (!empty($thumbnail)) {
+            $tattrs = array('rel' => 'preview',
+                            'href' => $thumbnail->url);
+
+            if (!empty($thumbnail->width)) {
+                $tattrs['media:width'] = $thumbnail->width;
+            }
+
+            if (!empty($thumbnail->height)) {
+                $tattrs['media:height'] = $thumbnail->height;
+            }
+
+            $object->extra[] = array('link', $attrs, null);
+        }
+
+        return $object;
     }
+
+    function showNotice($notice, $out)
+    {
+        $profile = $notice->getProfile();
+
+        $atts = $notice->attachments();
+
+        if (count($atts) < 1) {
+            // Something wrong; let default code deal with it.
+            throw new Exception("That can't be right.");
+        }
+
+        $att = $atts[0];
+
+        // XXX: only show the bookmark URL for non-single-page stuff
+
+        if ($out instanceof ShowbookmarkAction) {
+        } else {
+            $out->elementStart('h3');
+            $out->element('a',
+                          array('href' => $att->url,
+                                'class' => 'bookmark-title entry-title'),
+                          $nb->title);
+            $out->elementEnd('h3');
+
+            $countUrl = common_local_url('noticebyurl',
+                                         array('id' => $att->id));
+
+            $out->element('a', array('class' => 'bookmark-notice-count',
+                                     'href' => $countUrl),
+                          $att->noticeCount());
+        }
+
+        // Replies look like "for:" tags
+
+        $replies = $nli->notice->getReplies();
+        $tags = $nli->notice->getTags();
+
+        if (!empty($replies) || !empty($tags)) {
+
+            $out->elementStart('ul', array('class' => 'bookmark-tags'));
+            
+            foreach ($replies as $reply) {
+                $other = Profile::staticGet('id', $reply);
+                $out->elementStart('li');
+                $out->element('a', array('rel' => 'tag',
+                                         'href' => $other->profileurl,
+                                         'title' => $other->getBestName()),
+                              sprintf('for:%s', $other->nickname));
+                $out->elementEnd('li');
+                $out->text(' ');
+            }
+
+            foreach ($tags as $tag) {
+                $out->elementStart('li');
+                $out->element('a', 
+                              array('rel' => 'tag',
+                                    'href' => Notice_tag::url($tag)),
+                              $tag);
+                $out->elementEnd('li');
+                $out->text(' ');
+            }
+
+            $out->elementEnd('ul');
+        }
+
+        if (!empty($nb->description)) {
+            $out->element('p',
+                          array('class' => 'bookmark-description'),
+                          $nb->description);
+        }
+
+        if (common_config('attachments', 'show_thumbs')) {
+            $haveThumbs = false;
+            foreach ($atts as $check) {
+                $thumbnail = File_thumbnail::staticGet('file_id', $check->id);
+                if (!empty($thumbnail)) {
+                    $haveThumbs = true;
+                    break;
+                }
+            }
+            if ($haveThumbs) {
+                $al = new InlineAttachmentList($notice, $out);
+                $al->show();
+            }
+        }
+
+        $out->elementStart('div', array('class' => 'bookmark-info entry-content'));
+
+        $avatar = $profile->getAvatar(AVATAR_MINI_SIZE);
+
+        $out->element('img', 
+                      array('src' => ($avatar) ?
+                            $avatar->displayUrl() :
+                            Avatar::defaultImage(AVATAR_MINI_SIZE),
+                            'class' => 'avatar photo bookmark-avatar',
+                            'width' => AVATAR_MINI_SIZE,
+                            'height' => AVATAR_MINI_SIZE,
+                            'alt' => $profile->getBestName()));
+
+        $out->raw('&nbsp;');
+
+        $out->element('a', 
+                      array('href' => $profile->profileurl,
+                            'title' => $profile->getBestName()),
+                      $profile->nickname);
+    }
+
+    function entryForm($out)
+    {
+        return new BookmarkForm($out);
+    }
+
 }

From 7aa55f820066106da9d13c6a5962661e924b38e5 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Sun, 6 Mar 2011 17:27:03 -0500
Subject: [PATCH 420/655] made the input-form switcher work, kinda

---
 lib/action.php                      | 56 +++++++++++++++++++++++++++--
 lib/microappplugin.php              | 42 +++++++++++++++++++---
 plugins/Bookmark/BookmarkPlugin.php | 13 +++++--
 3 files changed, 101 insertions(+), 10 deletions(-)

diff --git a/lib/action.php b/lib/action.php
index 31e52dfcf2..a049fec97c 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -646,8 +646,60 @@ class Action extends HTMLOutputter // lawsuit
      */
     function showNoticeForm()
     {
-        $notice_form = new NoticeForm($this);
-        $notice_form->show();
+        $tabs = array('status' => _('Status'));
+
+        $this->elementStart('div', 'input_forms');
+
+        if (Event::handle('StartShowEntryForms', array(&$tabs))) {
+
+            $this->elementStart('ul', array('class' => 'nav',
+                                            'id' => 'input_form_nav'));
+
+            foreach ($tabs as $tag => $title) {
+
+                $attrs = array('id' => 'input_form_nav_'.$title);
+
+                if ($tag == 'status') {
+                    $attrs['class'] = 'current';
+                }
+
+                $this->elementStart('li', $attrs);
+
+                $this->element('a',
+                               array('href' => 'javascript:switchInputFormTab("'.$tag.'")'),
+                               $title);
+                $this->elementEnd('li');
+            }
+
+            $this->elementEnd('ul');
+
+            foreach ($tabs as $tag => $title) {
+
+                $attrs = array('class' => 'input_form',
+                               'id' => 'input_form_'.$tag);
+
+                if ($tag == 'status') {
+                    $attrs['class'] .= ' active';
+                } else {
+                    $attrs['class'] .= ' inactive';
+                }
+
+                $this->elementStart('div', $attrs);
+
+                $form = null;
+
+                if (Event::handle('StartMakeEntryForm', array($tag, $this, &$form))) {
+                    if ($tag == 'status') {
+                        $form = new NoticeForm($this);
+                    }
+                    Event::handle('EndMakeEntryForm', array($tag, $this, $form));
+                }
+
+                if (!empty($form)) {
+                    $form->show();
+                }
+            }
+        }
     }
 
     /**
diff --git a/lib/microappplugin.php b/lib/microappplugin.php
index 1cdbe965e6..0b02f5da52 100644
--- a/lib/microappplugin.php
+++ b/lib/microappplugin.php
@@ -54,7 +54,7 @@ abstract class MicroAppPlugin extends Plugin
     abstract function appTitle();
     abstract function tag();
     abstract function types();
-    abstract function saveNoticeFromActivity($activity, $actor);
+    abstract function saveNoticeFromActivity($activity, $actor, $options);
     abstract function activityObjectFromNotice($notice);
     abstract function showNotice($notice, $out);
     abstract function entryForm($out);
@@ -157,6 +157,13 @@ abstract class MicroAppPlugin extends Plugin
                 throw new ClientException(_('Can\'t get author for activity.'));
             }
 
+            $object = $activity->objects[0];
+
+            $options = array('uri' => $object->id,
+                             'url' => $object->link,
+                             'is_local' => Notice::REMOTE_OMB,
+                             'source' => 'ostatus');
+            
             $this->saveNoticeFromActivity($activity, $actor);
 
             return false;
@@ -196,7 +203,7 @@ abstract class MicroAppPlugin extends Plugin
                 if (!in_array($uri, $activity->context->attention) &&
                     (empty($original) ||
                      $original->profile_id != $target->id)) {
-                    throw new ClientException(_("Bookmark not posted ".
+                    throw new ClientException(_("Object not posted ".
                                                 "to this user."));
                 }
             } else {
@@ -206,7 +213,14 @@ abstract class MicroAppPlugin extends Plugin
 
             $actor = Ostatus_profile::ensureActivityObjectProfile($activity->actor);
 
-            $this->saveNoticeFromActivity($activity, $actor);
+            $object = $activity->objects[0];
+
+            $options = array('uri' => $object->id,
+                             'url' => $object->link,
+                             'is_local' => Notice::REMOTE_OMB,
+                             'source' => 'ostatus');
+
+            $this->saveNoticeFromActivity($activity, $actor, $options);
 
             return false;
         }
@@ -258,8 +272,8 @@ abstract class MicroAppPlugin extends Plugin
 
             $obj = $activity->objects[0];
 
-            $options = array('uri' => $bookmark->id,
-                             'url' => $bookmark->link,
+            $options = array('uri' => $object->id,
+                             'url' => $object->link,
                              'source' => 'restore');
 
             $saved = $this->saveNoticeFromActivity($activity,
@@ -275,4 +289,22 @@ abstract class MicroAppPlugin extends Plugin
 
         return true;
     }
+
+    function onStartShowEntryForms(&$tabs)
+    {
+        $tabs[$this->tag()] = $this->appTitle();
+        return true;
+    }
+
+    function onStartMakeEntryForm($tag, $out, &$form)
+    {
+        $this->log(LOG_INFO, "onStartMakeEntryForm() called for tag '$tag'");
+
+        if ($tag == $this->tag()) {
+            $form = $this->entryForm($out);
+            return false;
+        }
+
+        return true;
+    }
 }
diff --git a/plugins/Bookmark/BookmarkPlugin.php b/plugins/Bookmark/BookmarkPlugin.php
index c3ff17c4e9..1ef5f5c0e3 100644
--- a/plugins/Bookmark/BookmarkPlugin.php
+++ b/plugins/Bookmark/BookmarkPlugin.php
@@ -372,10 +372,8 @@ class BookmarkPlugin extends MicroAppPlugin
      * @return Notice resulting notice
      */
 
-    function saveNoticeFromActivity($activity, $profile)
+    function saveNoticeFromActivity($activity, $profile, $options=array())
     {
-        $options = array();
-
         $bookmark = $activity->objects[0];
 
         $relLinkEls = ActivityUtils::getLinks($bookmark->element, 'related');
@@ -622,4 +620,13 @@ class BookmarkPlugin extends MicroAppPlugin
         return new BookmarkForm($out);
     }
 
+    function tag()
+    {
+        return 'bookmark';
+    }
+
+    function appTitle()
+    {
+        return _m('Bookmark');
+    }
 }

From cf1a4d829283de1a95e5d33dc4f76e2a9c229110 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Mon, 7 Mar 2011 04:57:49 -0500
Subject: [PATCH 421/655] Input form switcher works

This change adds the input form switcher, which adds a navigation menu
across the top of the input form, letting you switch between different kinds of input.

The input menu doesn't yet look like a nice set of tabs; it could use some love.
---
 js/util.js                   | 11 ++++++++++-
 js/util.min.js               |  2 +-
 lib/action.php               | 11 ++++++-----
 theme/rebase/css/display.css | 21 ++++++++++++++++++++-
 4 files changed, 37 insertions(+), 8 deletions(-)

diff --git a/js/util.js b/js/util.js
index cc94c5ced7..2100521869 100644
--- a/js/util.js
+++ b/js/util.js
@@ -1272,7 +1272,16 @@ var SN = { // StatusNet
             // UI links currently on the page use malleable names.
 
             return false;
-        }
+        },
+
+	switchInputFormTab: function(tag) {
+	    // The one that's current isn't current anymore
+	    $('.input_form_nav_tab.current').removeClass('current');
+	    $('#input_form_nav_'+tag).addClass('current');
+
+	    $('.input_form.current').removeClass('current');
+	    $('#input_form_'+tag).addClass('current');
+	}
     },
 
     Init: {
diff --git a/js/util.min.js b/js/util.min.js
index 280aca6a45..cfbd66d662 100644
--- a/js/util.min.js
+++ b/js/util.min.js
@@ -1 +1 @@
-var SN={C:{I:{CounterBlackout:false,MaxLength:140,PatternUsername:/^[0-9a-zA-Z\-_.]*$/,HTTP20x30x:[200,201,202,203,204,205,206,300,301,302,303,304,305,306,307]},S:{Disabled:"disabled",Warning:"warning",Error:"error",Success:"success",Processing:"processing",CommandResult:"command_result",FormNotice:"form_notice",NoticeDataGeo:"notice_data-geo",NoticeDataGeoCookie:"NoticeDataGeo",NoticeDataGeoSelected:"notice_data-geo_selected",StatusNetInstance:"StatusNetInstance"}},messages:{},msg:function(a){if(typeof SN.messages[a]=="undefined"){return"["+a+"]"}else{return SN.messages[a]}},U:{FormNoticeEnhancements:function(b){if(jQuery.data(b[0],"ElementData")===undefined){MaxLength=b.find(".count").text();if(typeof(MaxLength)=="undefined"){MaxLength=SN.C.I.MaxLength}jQuery.data(b[0],"ElementData",{MaxLength:MaxLength});SN.U.Counter(b);NDT=b.find("[name=status_textarea]");NDT.bind("keyup",function(c){SN.U.Counter(b)});var a=function(c){window.setTimeout(function(){SN.U.Counter(b)},50)};NDT.bind("cut",a).bind("paste",a)}else{b.find(".count").text(jQuery.data(b[0],"ElementData").MaxLength)}},Counter:function(d){SN.C.I.FormNoticeCurrent=d;var b=jQuery.data(d[0],"ElementData").MaxLength;if(b<=0){return}var c=b-SN.U.CharacterCount(d);var a=d.find(".count");if(c.toString()!=a.text()){if(!SN.C.I.CounterBlackout||c===0){if(a.text()!=String(c)){a.text(c)}if(c<0){d.addClass(SN.C.S.Warning)}else{d.removeClass(SN.C.S.Warning)}if(!SN.C.I.CounterBlackout){SN.C.I.CounterBlackout=true;SN.C.I.FormNoticeCurrent=d;window.setTimeout("SN.U.ClearCounterBlackout(SN.C.I.FormNoticeCurrent);",500)}}}},CharacterCount:function(a){return a.find("[name=status_textarea]").val().length},ClearCounterBlackout:function(a){SN.C.I.CounterBlackout=false;SN.U.Counter(a)},RewriteAjaxAction:function(a){if(document.location.protocol=="https:"&&a.substr(0,5)=="http:"){return a.replace(/^http:\/\/[^:\/]+/,"https://"+document.location.host)}else{return a}},FormXHR:function(a){$.ajax({type:"POST",dataType:"xml",url:SN.U.RewriteAjaxAction(a.attr("action")),data:a.serialize()+"&ajax=1",beforeSend:function(b){a.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(c,d,b){alert(b||d)},success:function(b,c){if(typeof($("form",b)[0])!="undefined"){form_new=document._importNode($("form",b)[0],true);a.replaceWith(form_new)}else{a.replaceWith(document._importNode($("p",b)[0],true))}}})},FormNoticeXHR:function(b){SN.C.I.NoticeDataGeo={};b.append('<input type="hidden" name="ajax" value="1"/>');b.attr("action",SN.U.RewriteAjaxAction(b.attr("action")));var c=function(d,e){b.append($('<p class="form_response"></p>').addClass(d).text(e))};var a=function(){b.find(".form_response").remove()};b.ajaxForm({dataType:"xml",timeout:"60000",beforeSend:function(d){if(b.find("[name=status_textarea]").val()==""){b.addClass(SN.C.S.Warning);return false}b.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled);SN.U.normalizeGeoData(b);return true},error:function(f,g,e){b.removeClass(SN.C.S.Processing).find(".submit").removeClass(SN.C.S.Disabled).removeAttr(SN.C.S.Disabled,SN.C.S.Disabled);a();if(g=="timeout"){c("error","Sorry! We had trouble sending your notice. The servers are overloaded. Please try again, and contact the site administrator if this problem persists.")}else{var d=SN.U.GetResponseXML(f);if($("."+SN.C.S.Error,d).length>0){b.append(document._importNode($("."+SN.C.S.Error,d)[0],true))}else{if(parseInt(f.status)===0||jQuery.inArray(parseInt(f.status),SN.C.I.HTTP20x30x)>=0){b.resetForm().find(".attach-status").remove();SN.U.FormNoticeEnhancements(b)}else{c("error","(Sorry! We had trouble sending your notice ("+f.status+" "+f.statusText+"). Please report the problem to the site administrator if this happens again.")}}}},success:function(i,f){a();var n=$("#"+SN.C.S.Error,i);if(n.length>0){c("error",n.text())}else{if($("body")[0].id=="bookmarklet"){self.close()}var d=$("#"+SN.C.S.CommandResult,i);if(d.length>0){c("success",d.text())}else{var m=document._importNode($("li",i)[0],true);var k=$("#notices_primary .notices:first");var l=b.closest("li.notice-reply");if(l.length>0){var e=$(m).attr("id");if($("#"+e).length==0){var j=l.closest("li.notice");l.replaceWith(m);SN.U.NoticeInlineReplyPlaceholder(j)}else{l.remove()}}else{if(k.length>0&&SN.U.belongsOnTimeline(m)){if($("#"+m.id).length===0){var h=b.find("[name=inreplyto]").val();var g="#notices_primary #notice-"+h;if($("body")[0].id=="conversation"){if(h.length>0&&$(g+" .notices").length<1){$(g).append('<ul class="notices"></ul>')}$($(g+" .notices")[0]).append(m)}else{k.prepend(m)}$("#"+m.id).css({display:"none"}).fadeIn(2500);SN.U.NoticeWithAttachment($("#"+m.id));SN.U.NoticeReplyTo($("#"+m.id))}}else{c("success",$("title",i).text())}}}b.resetForm();b.find("[name=inreplyto]").val("");b.find(".attach-status").remove();SN.U.FormNoticeEnhancements(b)}},complete:function(d,e){b.removeClass(SN.C.S.Processing).find(".submit").removeAttr(SN.C.S.Disabled).removeClass(SN.C.S.Disabled);b.find("[name=lat]").val(SN.C.I.NoticeDataGeo.NLat);b.find("[name=lon]").val(SN.C.I.NoticeDataGeo.NLon);b.find("[name=location_ns]").val(SN.C.I.NoticeDataGeo.NLNS);b.find("[name=location_id]").val(SN.C.I.NoticeDataGeo.NLID);b.find("[name=notice_data-geo]").attr("checked",SN.C.I.NoticeDataGeo.NDG)}})},normalizeGeoData:function(a){SN.C.I.NoticeDataGeo.NLat=a.find("[name=lat]").val();SN.C.I.NoticeDataGeo.NLon=a.find("[name=lon]").val();SN.C.I.NoticeDataGeo.NLNS=a.find("[name=location_ns]").val();SN.C.I.NoticeDataGeo.NLID=a.find("[name=location_id]").val();SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked");var b=$.cookie(SN.C.S.NoticeDataGeoCookie);if(b!==null&&b!="disabled"){b=JSON.parse(b);SN.C.I.NoticeDataGeo.NLat=a.find("[name=lat]").val(b.NLat).val();SN.C.I.NoticeDataGeo.NLon=a.find("[name=lon]").val(b.NLon).val();if(b.NLNS){SN.C.I.NoticeDataGeo.NLNS=a.find("[name=location_ns]").val(b.NLNS).val();SN.C.I.NoticeDataGeo.NLID=a.find("[name=location_id]").val(b.NLID).val()}else{a.find("[name=location_ns]").val("");a.find("[name=location_id]").val("")}}if(b=="disabled"){SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked",false).attr("checked")}else{SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked",true).attr("checked")}},GetResponseXML:function(b){try{return b.responseXML}catch(a){return(new DOMParser()).parseFromString(b.responseText,"text/xml")}},NoticeReply:function(){if($("#content .notice_reply").length>0){$("#content .notice").each(function(){SN.U.NoticeReplyTo($(this))})}},NoticeReplyTo:function(a){a.find(".notice_reply").live("click",function(c){c.preventDefault();var b=($(".author .nickname",a).length>0)?$($(".author .nickname",a)[0]):$(".author .nickname.uid");SN.U.NoticeInlineReplyTrigger(a,"@"+b.text());return false})},NoticeInlineReplyTrigger:function(g,h){var b=$($(".notice_id",g)[0]).text();var d=g;var e=g.closest(".notices");if(e.hasClass("threaded-replies")){d=e.closest(".notice")}else{e=$("ul.threaded-replies",g);if(e.length==0){e=$('<ul class="notices threaded-replies xoxo"></ul>');g.append(e)}}var i=$(".notice-reply-form",e);var c=function(){i.find("input[name=inreplyto]").val(b);var l=i.find("textarea");if(l.length==0){throw"No textarea"}var k="";if(h){k=h+" "}l.val(k+l.val().replace(RegExp(k,"i"),""));l.data("initialText",$.trim(h+""));l.focus();if(l[0].setSelectionRange){var j=l.val().length;l[0].setSelectionRange(j,j)}};if(i.length>0){c()}else{$("li.notice-reply-placeholder").remove();var f=$("li.notice-reply",e);if(f.length==0){var a=$("#form_notice").attr("action");f=$('<li class="notice-reply"></li>');$.get(a,{ajax:1},function(l,n,m){var j=document._importNode($("form",l)[0],true);f.append(j);e.append(f);var k=i=$(j);SN.U.NoticeLocationAttach(k);SN.U.FormNoticeXHR(k);SN.U.FormNoticeEnhancements(k);SN.U.NoticeDataAttach(k);c()})}}},NoticeFavor:function(){$(".form_favor").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_disfavor").live("click",function(){SN.U.FormXHR($(this));return false})},NoticeInlineReplyPlaceholder:function(b){var a=b.find("ul.threaded-replies");var c=$('<li class="notice-reply-placeholder"><input class="placeholder"></li>');c.click(function(){SN.U.NoticeInlineReplyTrigger(b)});c.find("input").val(SN.msg("reply_placeholder"));a.append(c)},NoticeInlineReplySetup:function(){$(".threaded-replies").each(function(){var b=$(this);var a=b.closest(".notice");SN.U.NoticeInlineReplyPlaceholder(a)})},NoticeRepeat:function(){$(".form_repeat").live("click",function(a){a.preventDefault();SN.U.NoticeRepeatConfirmation($(this));return false})},NoticeRepeatConfirmation:function(a){var c=a.find(".submit");var b=c.clone();b.addClass("submit_dialogbox").removeClass("submit");a.append(b);b.bind("click",function(){SN.U.FormXHR(a);return false});c.hide();a.addClass("dialogbox").append('<button class="close">&#215;</button>').closest(".notice-options").addClass("opaque");a.find("button.close").click(function(){$(this).remove();a.removeClass("dialogbox").closest(".notice-options").removeClass("opaque");a.find(".submit_dialogbox").remove();a.find(".submit").show();return false})},NoticeAttachments:function(){$(".notice a.attachment").each(function(){SN.U.NoticeWithAttachment($(this).closest(".notice"))})},NoticeWithAttachment:function(b){if(b.find(".attachment").length===0){return}var a=b.find(".attachment.more");if(a.length>0){$(a[0]).click(function(){var c=$(this);c.addClass(SN.C.S.Processing);$.get(c.attr("href")+"/ajax",null,function(d){c.parent(".entry-content").html($(d).find("#attachment_view .entry-content").html())});return false}).attr("title",SN.msg("showmore_tooltip"))}},NoticeDataAttach:function(b){var a=b.find("input[type=file]");a.change(function(f){b.find(".attach-status").remove();var d=$(this).val();if(!d){return false}var c=$('<div class="attach-status '+SN.C.S.Success+'"><code></code> <button class="close">&#215;</button></div>');c.find("code").text(d);c.find("button").click(function(){c.remove();a.val("");return false});b.append(c);if(typeof this.files=="object"){for(var e=0;e<this.files.length;e++){SN.U.PreviewAttach(b,this.files[e])}}})},maxFileSize:function(b){var a=$(b).find("input[name=MAX_FILE_SIZE]").attr("value");if(a){return parseInt(a)}else{return 0}},PreviewAttach:function(d,c){var e=c.type+" "+Math.round(c.size/1024)+"KB";var f=true;var h;if(typeof window.createObjectURL!="undefined"){h=function(i,j){j(window.createObjectURL(i))}}else{if(typeof window.FileReader!="undefined"){h=function(j,k){var i=new FileReader();i.onload=function(l){k(i.result)};i.readAsDataURL(j)}}else{f=false}}var a=["image/png","image/jpeg","image/gif","image/svg+xml"];if($.inArray(c.type,a)==-1){f=false}var g=8*1024*1024;if(c.size>g){f=false}if(f){h(c,function(j){var i=$("<img>").attr("title",e).attr("alt",e).attr("src",j).attr("style","height: 120px");d.find(".attach-status").append(i)})}else{var b=$("<div></div>").text(e);d.find(".attach-status").append(b)}},NoticeLocationAttach:function(a){var e=a.find("[name=lat]");var k=a.find("[name=lon]");var g=a.find("[name=location_ns]").val();var l=a.find("[name=location_id]").val();var b="";var d=a.find("[name=notice_data-geo]");var c=a.find("[name=notice_data-geo]");var j=a.find("label.notice_data-geo");function f(n){j.attr("title",jQuery.trim(j.text())).removeClass("checked");a.find("[name=lat]").val("");a.find("[name=lon]").val("");a.find("[name=location_ns]").val("");a.find("[name=location_id]").val("");a.find("[name=notice_data-geo]").attr("checked",false);$.cookie(SN.C.S.NoticeDataGeoCookie,"disabled",{path:"/"});if(n){a.find(".geo_status_wrapper").removeClass("success").addClass("error");a.find(".geo_status_wrapper .geo_status").text(n)}else{a.find(".geo_status_wrapper").remove()}}function m(n,o){SN.U.NoticeGeoStatus(a,"Looking up place name...");$.getJSON(n,o,function(p){var q,r;if(typeof(p.location_ns)!="undefined"){a.find("[name=location_ns]").val(p.location_ns);q=p.location_ns}if(typeof(p.location_id)!="undefined"){a.find("[name=location_id]").val(p.location_id);r=p.location_id}if(typeof(p.name)=="undefined"){NLN_text=o.lat+";"+o.lon}else{NLN_text=p.name}SN.U.NoticeGeoStatus(a,NLN_text,o.lat,o.lon,p.url);j.attr("title",NoticeDataGeo_text.ShareDisable+" ("+NLN_text+")");a.find("[name=lat]").val(o.lat);a.find("[name=lon]").val(o.lon);a.find("[name=location_ns]").val(q);a.find("[name=location_id]").val(r);a.find("[name=notice_data-geo]").attr("checked",true);var s={NLat:o.lat,NLon:o.lon,NLNS:q,NLID:r,NLN:NLN_text,NLNU:p.url,NDG:true};$.cookie(SN.C.S.NoticeDataGeoCookie,JSON.stringify(s),{path:"/"})})}if(c.length>0){if($.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){c.attr("checked",false)}else{c.attr("checked",true)}var h=a.find(".notice_data-geo_wrap");var i=h.attr("title");h.removeAttr("title");j.attr("title",j.text());c.change(function(){if(c.attr("checked")===true||$.cookie(SN.C.S.NoticeDataGeoCookie)===null){j.attr("title",NoticeDataGeo_text.ShareDisable).addClass("checked");if($.cookie(SN.C.S.NoticeDataGeoCookie)===null||$.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){if(navigator.geolocation){SN.U.NoticeGeoStatus(a,"Requesting location from browser...");navigator.geolocation.getCurrentPosition(function(p){a.find("[name=lat]").val(p.coords.latitude);a.find("[name=lon]").val(p.coords.longitude);var q={lat:p.coords.latitude,lon:p.coords.longitude,token:$("#token").val()};m(i,q)},function(p){switch(p.code){case p.PERMISSION_DENIED:f("Location permission denied.");break;case p.TIMEOUT:f("Location lookup timeout.");break}},{timeout:10000})}else{if(e.length>0&&k.length>0){var n={lat:e,lon:k,token:$("#token").val()};m(i,n)}else{f();c.remove();j.remove()}}}else{var o=JSON.parse($.cookie(SN.C.S.NoticeDataGeoCookie));a.find("[name=lat]").val(o.NLat);a.find("[name=lon]").val(o.NLon);a.find("[name=location_ns]").val(o.NLNS);a.find("[name=location_id]").val(o.NLID);a.find("[name=notice_data-geo]").attr("checked",o.NDG);SN.U.NoticeGeoStatus(a,o.NLN,o.NLat,o.NLon,o.NLNU);j.attr("title",NoticeDataGeo_text.ShareDisable+" ("+o.NLN+")").addClass("checked")}}else{f()}}).change()}},NoticeGeoStatus:function(e,a,f,g,c){var h=e.find(".geo_status_wrapper");if(h.length==0){h=$('<div class="'+SN.C.S.Success+' geo_status_wrapper"><button class="close" style="float:right">&#215;</button><div class="geo_status"></div></div>');h.find("button.close").click(function(){e.find("[name=notice_data-geo]").removeAttr("checked").change()});e.append(h)}var b;if(c){b=$("<a></a>").attr("href",c)}else{b=$("<span></span>")}b.text(a);if(f||g){var d=f+";"+g;b.attr("title",d);if(!a){b.text(d)}}h.find(".geo_status").empty().append(b)},NewDirectMessage:function(){NDM=$(".entity_send-a-message a");NDM.attr({href:NDM.attr("href")+"&ajax=1"});NDM.bind("click",function(){var a=$(".entity_send-a-message form");if(a.length===0){$(this).addClass(SN.C.S.Processing);$.get(NDM.attr("href"),null,function(b){$(".entity_send-a-message").append(document._importNode($("form",b)[0],true));a=$(".entity_send-a-message .form_notice");SN.U.FormNoticeXHR(a);SN.U.FormNoticeEnhancements(a);a.append('<button class="close">&#215;</button>');$(".entity_send-a-message button").click(function(){a.hide();return false});NDM.removeClass(SN.C.S.Processing)})}else{a.show();$(".entity_send-a-message textarea").focus()}return false})},GetFullYear:function(c,d,a){var b=new Date();b.setFullYear(c,d,a);return b},StatusNetInstance:{Set:function(b){var a=SN.U.StatusNetInstance.Get();if(a!==null){b=$.extend(a,b)}$.cookie(SN.C.S.StatusNetInstance,JSON.stringify(b),{path:"/",expires:SN.U.GetFullYear(2029,0,1)})},Get:function(){var a=$.cookie(SN.C.S.StatusNetInstance);if(a!==null){return JSON.parse(a)}return null},Delete:function(){$.cookie(SN.C.S.StatusNetInstance,null)}},belongsOnTimeline:function(b){var a=$("body").attr("id");if(a=="public"){return true}var c=$("#nav_profile a").attr("href");if(c){var d=$(b).find(".entry-title .author a.url").attr("href");if(d==c){if(a=="all"||a=="showstream"){return true}}}return false}},Init:{NoticeForm:function(){if($("body.user_in").length>0){$("."+SN.C.S.FormNotice).each(function(){var a=$(this);SN.U.NoticeLocationAttach(a);SN.U.FormNoticeXHR(a);SN.U.FormNoticeEnhancements(a);SN.U.NoticeDataAttach(a)})}},Notices:function(){if($("body.user_in").length>0){SN.U.NoticeFavor();SN.U.NoticeRepeat();SN.U.NoticeReply();SN.U.NoticeInlineReplySetup()}SN.U.NoticeAttachments()},EntityActions:function(){if($("body.user_in").length>0){$(".form_user_subscribe").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_user_unsubscribe").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_group_join").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_group_leave").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_user_nudge").live("click",function(){SN.U.FormXHR($(this));return false});SN.U.NewDirectMessage()}},Login:function(){if(SN.U.StatusNetInstance.Get()!==null){var a=SN.U.StatusNetInstance.Get().Nickname;if(a!==null){$("#form_login #nickname").val(a)}}$("#form_login").bind("submit",function(){SN.U.StatusNetInstance.Set({Nickname:$("#form_login #nickname").val()});return true})},UploadForms:function(){$("input[type=file]").change(function(d){if(typeof this.files=="object"&&this.files.length>0){var c=0;for(var b=0;b<this.files.length;b++){c+=this.files[b].size}var a=SN.U.maxFileSize($(this.form));if(a>0&&c>a){var e="File too large: maximum upload size is %d bytes.";alert(e.replace("%d",a));$(this).val("");d.preventDefault();return false}}})}}};$(document).ready(function(){SN.Init.UploadForms();if($("."+SN.C.S.FormNotice).length>0){SN.Init.NoticeForm()}if($("#content .notices").length>0){SN.Init.Notices()}if($("#content .entity_actions").length>0){SN.Init.EntityActions()}if($("#form_login").length>0){SN.Init.Login()}});if(!document.ELEMENT_NODE){document.ELEMENT_NODE=1;document.ATTRIBUTE_NODE=2;document.TEXT_NODE=3;document.CDATA_SECTION_NODE=4;document.ENTITY_REFERENCE_NODE=5;document.ENTITY_NODE=6;document.PROCESSING_INSTRUCTION_NODE=7;document.COMMENT_NODE=8;document.DOCUMENT_NODE=9;document.DOCUMENT_TYPE_NODE=10;document.DOCUMENT_FRAGMENT_NODE=11;document.NOTATION_NODE=12}document._importNode=function(e,a){switch(e.nodeType){case document.ELEMENT_NODE:var d=document.createElement(e.nodeName);if(e.attributes&&e.attributes.length>0){for(var c=0,b=e.attributes.length;c<b;){if(e.attributes[c].nodeName=="class"){d.className=e.getAttribute(e.attributes[c++].nodeName)}else{d.setAttribute(e.attributes[c].nodeName,e.getAttribute(e.attributes[c++].nodeName))}}}if(a&&e.childNodes&&e.childNodes.length>0){for(var c=0,b=e.childNodes.length;c<b;){d.appendChild(document._importNode(e.childNodes[c++],a))}}return d;break;case document.TEXT_NODE:case document.CDATA_SECTION_NODE:case document.COMMENT_NODE:return document.createTextNode(e.nodeValue);break}};if(typeof navigator.geolocation=="undefined"||navigator.geolocation.shim){(function(){(function(){if(window.google&&google.gears){return}var c=null;if(typeof GearsFactory!="undefined"){c=new GearsFactory()}else{try{c=new ActiveXObject("Gears.Factory");if(c.getBuildInfo().indexOf("ie_mobile")!=-1){c.privateSetGlobalObject(this)}}catch(d){if((typeof navigator.mimeTypes!="undefined")&&navigator.mimeTypes["application/x-googlegears"]){c=document.createElement("object");c.style.display="none";c.width=0;c.height=0;c.type="application/x-googlegears";document.documentElement.appendChild(c)}}}if(!c){return}if(!window.google){google={}}if(!google.gears){google.gears={factory:c}}})();var a=(function(){var d=google.gears.factory.create("beta.geolocation");var c=function(f,e){return function(g){f(g);e.lastPosition=g}};return{shim:true,type:"Gears",lastPosition:null,getCurrentPosition:function(e,g,h){var f=this;var i=c(e,f);d.getCurrentPosition(i,g,h)},watchPosition:function(e,f,g){d.watchPosition(e,f,g)},clearWatch:function(e){d.clearWatch(e)},getPermission:function(g,e,f){d.getPermission(g,e,f)}}});var b=(function(){var i=false;var e=function(){if(!d()&&!i){i=true;var j=document.createElement("script");j.src=(document.location.protocol=="https:"?"https://":"http://")+"www.google.com/jsapi?callback=_google_loader_apiLoaded";j.type="text/javascript";document.getElementsByTagName("body")[0].appendChild(j)}};var c=[];var h=function(j){c.push(j)};var f=function(){if(d()){while(c.length>0){var j=c.pop();j()}}};window._google_loader_apiLoaded=function(){f()};var d=function(){return(window.google&&google.loader)};var g=function(j){if(d()){return true}h(j);e();return false};e();return{shim:true,type:"ClientLocation",lastPosition:null,getCurrentPosition:function(k,n,o){var m=this;if(!g(function(){m.getCurrentPosition(k,n,o)})){return}if(google.loader.ClientLocation){var l=google.loader.ClientLocation;var j={coords:{latitude:l.latitude,longitude:l.longitude,altitude:null,accuracy:43000,altitudeAccuracy:null,heading:null,speed:null},address:{city:l.address.city,country:l.address.country,country_code:l.address.country_code,region:l.address.region},timestamp:new Date()};k(j);this.lastPosition=j}else{if(n==="function"){n({code:3,message:"Using the Google ClientLocation API and it is not able to calculate a location."})}}},watchPosition:function(j,l,m){this.getCurrentPosition(j,l,m);var k=this;var n=setInterval(function(){k.getCurrentPosition(j,l,m)},10000);return n},clearWatch:function(j){clearInterval(j)},getPermission:function(l,j,k){return true}}});navigator.geolocation=(window.google&&google.gears)?a():b()})()};
\ No newline at end of file
+var SN={C:{I:{CounterBlackout:false,MaxLength:140,PatternUsername:/^[0-9a-zA-Z\-_.]*$/,HTTP20x30x:[200,201,202,203,204,205,206,300,301,302,303,304,305,306,307]},S:{Disabled:"disabled",Warning:"warning",Error:"error",Success:"success",Processing:"processing",CommandResult:"command_result",FormNotice:"form_notice",NoticeDataGeo:"notice_data-geo",NoticeDataGeoCookie:"NoticeDataGeo",NoticeDataGeoSelected:"notice_data-geo_selected",StatusNetInstance:"StatusNetInstance"}},messages:{},msg:function(a){if(typeof SN.messages[a]=="undefined"){return"["+a+"]"}else{return SN.messages[a]}},U:{FormNoticeEnhancements:function(b){if(jQuery.data(b[0],"ElementData")===undefined){MaxLength=b.find(".count").text();if(typeof(MaxLength)=="undefined"){MaxLength=SN.C.I.MaxLength}jQuery.data(b[0],"ElementData",{MaxLength:MaxLength});SN.U.Counter(b);NDT=b.find("[name=status_textarea]");NDT.bind("keyup",function(c){SN.U.Counter(b)});var a=function(c){window.setTimeout(function(){SN.U.Counter(b)},50)};NDT.bind("cut",a).bind("paste",a)}else{b.find(".count").text(jQuery.data(b[0],"ElementData").MaxLength)}},Counter:function(d){SN.C.I.FormNoticeCurrent=d;var b=jQuery.data(d[0],"ElementData").MaxLength;if(b<=0){return}var c=b-SN.U.CharacterCount(d);var a=d.find(".count");if(c.toString()!=a.text()){if(!SN.C.I.CounterBlackout||c===0){if(a.text()!=String(c)){a.text(c)}if(c<0){d.addClass(SN.C.S.Warning)}else{d.removeClass(SN.C.S.Warning)}if(!SN.C.I.CounterBlackout){SN.C.I.CounterBlackout=true;SN.C.I.FormNoticeCurrent=d;window.setTimeout("SN.U.ClearCounterBlackout(SN.C.I.FormNoticeCurrent);",500)}}}},CharacterCount:function(a){return a.find("[name=status_textarea]").val().length},ClearCounterBlackout:function(a){SN.C.I.CounterBlackout=false;SN.U.Counter(a)},RewriteAjaxAction:function(a){if(document.location.protocol=="https:"&&a.substr(0,5)=="http:"){return a.replace(/^http:\/\/[^:\/]+/,"https://"+document.location.host)}else{return a}},FormXHR:function(a){$.ajax({type:"POST",dataType:"xml",url:SN.U.RewriteAjaxAction(a.attr("action")),data:a.serialize()+"&ajax=1",beforeSend:function(b){a.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(c,d,b){alert(b||d)},success:function(b,c){if(typeof($("form",b)[0])!="undefined"){form_new=document._importNode($("form",b)[0],true);a.replaceWith(form_new)}else{a.replaceWith(document._importNode($("p",b)[0],true))}}})},FormNoticeXHR:function(b){SN.C.I.NoticeDataGeo={};b.append('<input type="hidden" name="ajax" value="1"/>');b.attr("action",SN.U.RewriteAjaxAction(b.attr("action")));var c=function(d,e){b.append($('<p class="form_response"></p>').addClass(d).text(e))};var a=function(){b.find(".form_response").remove()};b.ajaxForm({dataType:"xml",timeout:"60000",beforeSend:function(d){if(b.find("[name=status_textarea]").val()==""){b.addClass(SN.C.S.Warning);return false}b.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled);SN.U.normalizeGeoData(b);return true},error:function(f,g,e){b.removeClass(SN.C.S.Processing).find(".submit").removeClass(SN.C.S.Disabled).removeAttr(SN.C.S.Disabled,SN.C.S.Disabled);a();if(g=="timeout"){c("error","Sorry! We had trouble sending your notice. The servers are overloaded. Please try again, and contact the site administrator if this problem persists.")}else{var d=SN.U.GetResponseXML(f);if($("."+SN.C.S.Error,d).length>0){b.append(document._importNode($("."+SN.C.S.Error,d)[0],true))}else{if(parseInt(f.status)===0||jQuery.inArray(parseInt(f.status),SN.C.I.HTTP20x30x)>=0){b.resetForm().find(".attach-status").remove();SN.U.FormNoticeEnhancements(b)}else{c("error","(Sorry! We had trouble sending your notice ("+f.status+" "+f.statusText+"). Please report the problem to the site administrator if this happens again.")}}}},success:function(i,f){a();var n=$("#"+SN.C.S.Error,i);if(n.length>0){c("error",n.text())}else{if($("body")[0].id=="bookmarklet"){self.close()}var d=$("#"+SN.C.S.CommandResult,i);if(d.length>0){c("success",d.text())}else{var m=document._importNode($("li",i)[0],true);var k=$("#notices_primary .notices:first");var l=b.closest("li.notice-reply");if(l.length>0){var e=$(m).attr("id");if($("#"+e).length==0){var j=l.closest("li.notice");l.replaceWith(m);SN.U.NoticeInlineReplyPlaceholder(j)}else{l.remove()}}else{if(k.length>0&&SN.U.belongsOnTimeline(m)){if($("#"+m.id).length===0){var h=b.find("[name=inreplyto]").val();var g="#notices_primary #notice-"+h;if($("body")[0].id=="conversation"){if(h.length>0&&$(g+" .notices").length<1){$(g).append('<ul class="notices"></ul>')}$($(g+" .notices")[0]).append(m)}else{k.prepend(m)}$("#"+m.id).css({display:"none"}).fadeIn(2500);SN.U.NoticeWithAttachment($("#"+m.id));SN.U.NoticeReplyTo($("#"+m.id))}}else{c("success",$("title",i).text())}}}b.resetForm();b.find("[name=inreplyto]").val("");b.find(".attach-status").remove();SN.U.FormNoticeEnhancements(b)}},complete:function(d,e){b.removeClass(SN.C.S.Processing).find(".submit").removeAttr(SN.C.S.Disabled).removeClass(SN.C.S.Disabled);b.find("[name=lat]").val(SN.C.I.NoticeDataGeo.NLat);b.find("[name=lon]").val(SN.C.I.NoticeDataGeo.NLon);b.find("[name=location_ns]").val(SN.C.I.NoticeDataGeo.NLNS);b.find("[name=location_id]").val(SN.C.I.NoticeDataGeo.NLID);b.find("[name=notice_data-geo]").attr("checked",SN.C.I.NoticeDataGeo.NDG)}})},normalizeGeoData:function(a){SN.C.I.NoticeDataGeo.NLat=a.find("[name=lat]").val();SN.C.I.NoticeDataGeo.NLon=a.find("[name=lon]").val();SN.C.I.NoticeDataGeo.NLNS=a.find("[name=location_ns]").val();SN.C.I.NoticeDataGeo.NLID=a.find("[name=location_id]").val();SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked");var b=$.cookie(SN.C.S.NoticeDataGeoCookie);if(b!==null&&b!="disabled"){b=JSON.parse(b);SN.C.I.NoticeDataGeo.NLat=a.find("[name=lat]").val(b.NLat).val();SN.C.I.NoticeDataGeo.NLon=a.find("[name=lon]").val(b.NLon).val();if(b.NLNS){SN.C.I.NoticeDataGeo.NLNS=a.find("[name=location_ns]").val(b.NLNS).val();SN.C.I.NoticeDataGeo.NLID=a.find("[name=location_id]").val(b.NLID).val()}else{a.find("[name=location_ns]").val("");a.find("[name=location_id]").val("")}}if(b=="disabled"){SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked",false).attr("checked")}else{SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked",true).attr("checked")}},GetResponseXML:function(b){try{return b.responseXML}catch(a){return(new DOMParser()).parseFromString(b.responseText,"text/xml")}},NoticeReply:function(){if($("#content .notice_reply").length>0){$("#content .notice").each(function(){SN.U.NoticeReplyTo($(this))})}},NoticeReplyTo:function(a){a.find(".notice_reply").live("click",function(c){c.preventDefault();var b=($(".author .nickname",a).length>0)?$($(".author .nickname",a)[0]):$(".author .nickname.uid");SN.U.NoticeInlineReplyTrigger(a,"@"+b.text());return false})},NoticeInlineReplyTrigger:function(g,h){var b=$($(".notice_id",g)[0]).text();var d=g;var e=g.closest(".notices");if(e.hasClass("threaded-replies")){d=e.closest(".notice")}else{e=$("ul.threaded-replies",g);if(e.length==0){e=$('<ul class="notices threaded-replies xoxo"></ul>');g.append(e)}}var i=$(".notice-reply-form",e);var c=function(){i.find("input[name=inreplyto]").val(b);var l=i.find("textarea");if(l.length==0){throw"No textarea"}var k="";if(h){k=h+" "}l.val(k+l.val().replace(RegExp(k,"i"),""));l.data("initialText",$.trim(h+""));l.focus();if(l[0].setSelectionRange){var j=l.val().length;l[0].setSelectionRange(j,j)}};if(i.length>0){c()}else{$("li.notice-reply-placeholder").remove();var f=$("li.notice-reply",e);if(f.length==0){var a=$("#form_notice").attr("action");f=$('<li class="notice-reply"></li>');$.get(a,{ajax:1},function(l,n,m){var j=document._importNode($("form",l)[0],true);f.append(j);e.append(f);var k=i=$(j);SN.U.NoticeLocationAttach(k);SN.U.FormNoticeXHR(k);SN.U.FormNoticeEnhancements(k);SN.U.NoticeDataAttach(k);c()})}}},NoticeFavor:function(){$(".form_favor").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_disfavor").live("click",function(){SN.U.FormXHR($(this));return false})},NoticeInlineReplyPlaceholder:function(b){var a=b.find("ul.threaded-replies");var c=$('<li class="notice-reply-placeholder"><input class="placeholder"></li>');c.click(function(){SN.U.NoticeInlineReplyTrigger(b)});c.find("input").val(SN.msg("reply_placeholder"));a.append(c)},NoticeInlineReplySetup:function(){$(".threaded-replies").each(function(){var b=$(this);var a=b.closest(".notice");SN.U.NoticeInlineReplyPlaceholder(a)})},NoticeRepeat:function(){$(".form_repeat").live("click",function(a){a.preventDefault();SN.U.NoticeRepeatConfirmation($(this));return false})},NoticeRepeatConfirmation:function(a){var c=a.find(".submit");var b=c.clone();b.addClass("submit_dialogbox").removeClass("submit");a.append(b);b.bind("click",function(){SN.U.FormXHR(a);return false});c.hide();a.addClass("dialogbox").append('<button class="close">&#215;</button>').closest(".notice-options").addClass("opaque");a.find("button.close").click(function(){$(this).remove();a.removeClass("dialogbox").closest(".notice-options").removeClass("opaque");a.find(".submit_dialogbox").remove();a.find(".submit").show();return false})},NoticeAttachments:function(){$(".notice a.attachment").each(function(){SN.U.NoticeWithAttachment($(this).closest(".notice"))})},NoticeWithAttachment:function(b){if(b.find(".attachment").length===0){return}var a=b.find(".attachment.more");if(a.length>0){$(a[0]).click(function(){var c=$(this);c.addClass(SN.C.S.Processing);$.get(c.attr("href")+"/ajax",null,function(d){c.parent(".entry-content").html($(d).find("#attachment_view .entry-content").html())});return false}).attr("title",SN.msg("showmore_tooltip"))}},NoticeDataAttach:function(b){var a=b.find("input[type=file]");a.change(function(f){b.find(".attach-status").remove();var d=$(this).val();if(!d){return false}var c=$('<div class="attach-status '+SN.C.S.Success+'"><code></code> <button class="close">&#215;</button></div>');c.find("code").text(d);c.find("button").click(function(){c.remove();a.val("");return false});b.append(c);if(typeof this.files=="object"){for(var e=0;e<this.files.length;e++){SN.U.PreviewAttach(b,this.files[e])}}})},maxFileSize:function(b){var a=$(b).find("input[name=MAX_FILE_SIZE]").attr("value");if(a){return parseInt(a)}else{return 0}},PreviewAttach:function(d,c){var e=c.type+" "+Math.round(c.size/1024)+"KB";var f=true;var h;if(typeof window.createObjectURL!="undefined"){h=function(i,j){j(window.createObjectURL(i))}}else{if(typeof window.FileReader!="undefined"){h=function(j,k){var i=new FileReader();i.onload=function(l){k(i.result)};i.readAsDataURL(j)}}else{f=false}}var a=["image/png","image/jpeg","image/gif","image/svg+xml"];if($.inArray(c.type,a)==-1){f=false}var g=8*1024*1024;if(c.size>g){f=false}if(f){h(c,function(j){var i=$("<img>").attr("title",e).attr("alt",e).attr("src",j).attr("style","height: 120px");d.find(".attach-status").append(i)})}else{var b=$("<div></div>").text(e);d.find(".attach-status").append(b)}},NoticeLocationAttach:function(a){var e=a.find("[name=lat]");var k=a.find("[name=lon]");var g=a.find("[name=location_ns]").val();var l=a.find("[name=location_id]").val();var b="";var d=a.find("[name=notice_data-geo]");var c=a.find("[name=notice_data-geo]");var j=a.find("label.notice_data-geo");function f(n){j.attr("title",jQuery.trim(j.text())).removeClass("checked");a.find("[name=lat]").val("");a.find("[name=lon]").val("");a.find("[name=location_ns]").val("");a.find("[name=location_id]").val("");a.find("[name=notice_data-geo]").attr("checked",false);$.cookie(SN.C.S.NoticeDataGeoCookie,"disabled",{path:"/"});if(n){a.find(".geo_status_wrapper").removeClass("success").addClass("error");a.find(".geo_status_wrapper .geo_status").text(n)}else{a.find(".geo_status_wrapper").remove()}}function m(n,o){SN.U.NoticeGeoStatus(a,"Looking up place name...");$.getJSON(n,o,function(p){var q,r;if(typeof(p.location_ns)!="undefined"){a.find("[name=location_ns]").val(p.location_ns);q=p.location_ns}if(typeof(p.location_id)!="undefined"){a.find("[name=location_id]").val(p.location_id);r=p.location_id}if(typeof(p.name)=="undefined"){NLN_text=o.lat+";"+o.lon}else{NLN_text=p.name}SN.U.NoticeGeoStatus(a,NLN_text,o.lat,o.lon,p.url);j.attr("title",NoticeDataGeo_text.ShareDisable+" ("+NLN_text+")");a.find("[name=lat]").val(o.lat);a.find("[name=lon]").val(o.lon);a.find("[name=location_ns]").val(q);a.find("[name=location_id]").val(r);a.find("[name=notice_data-geo]").attr("checked",true);var s={NLat:o.lat,NLon:o.lon,NLNS:q,NLID:r,NLN:NLN_text,NLNU:p.url,NDG:true};$.cookie(SN.C.S.NoticeDataGeoCookie,JSON.stringify(s),{path:"/"})})}if(c.length>0){if($.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){c.attr("checked",false)}else{c.attr("checked",true)}var h=a.find(".notice_data-geo_wrap");var i=h.attr("title");h.removeAttr("title");j.attr("title",j.text());c.change(function(){if(c.attr("checked")===true||$.cookie(SN.C.S.NoticeDataGeoCookie)===null){j.attr("title",NoticeDataGeo_text.ShareDisable).addClass("checked");if($.cookie(SN.C.S.NoticeDataGeoCookie)===null||$.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){if(navigator.geolocation){SN.U.NoticeGeoStatus(a,"Requesting location from browser...");navigator.geolocation.getCurrentPosition(function(p){a.find("[name=lat]").val(p.coords.latitude);a.find("[name=lon]").val(p.coords.longitude);var q={lat:p.coords.latitude,lon:p.coords.longitude,token:$("#token").val()};m(i,q)},function(p){switch(p.code){case p.PERMISSION_DENIED:f("Location permission denied.");break;case p.TIMEOUT:f("Location lookup timeout.");break}},{timeout:10000})}else{if(e.length>0&&k.length>0){var n={lat:e,lon:k,token:$("#token").val()};m(i,n)}else{f();c.remove();j.remove()}}}else{var o=JSON.parse($.cookie(SN.C.S.NoticeDataGeoCookie));a.find("[name=lat]").val(o.NLat);a.find("[name=lon]").val(o.NLon);a.find("[name=location_ns]").val(o.NLNS);a.find("[name=location_id]").val(o.NLID);a.find("[name=notice_data-geo]").attr("checked",o.NDG);SN.U.NoticeGeoStatus(a,o.NLN,o.NLat,o.NLon,o.NLNU);j.attr("title",NoticeDataGeo_text.ShareDisable+" ("+o.NLN+")").addClass("checked")}}else{f()}}).change()}},NoticeGeoStatus:function(e,a,f,g,c){var h=e.find(".geo_status_wrapper");if(h.length==0){h=$('<div class="'+SN.C.S.Success+' geo_status_wrapper"><button class="close" style="float:right">&#215;</button><div class="geo_status"></div></div>');h.find("button.close").click(function(){e.find("[name=notice_data-geo]").removeAttr("checked").change()});e.append(h)}var b;if(c){b=$("<a></a>").attr("href",c)}else{b=$("<span></span>")}b.text(a);if(f||g){var d=f+";"+g;b.attr("title",d);if(!a){b.text(d)}}h.find(".geo_status").empty().append(b)},NewDirectMessage:function(){NDM=$(".entity_send-a-message a");NDM.attr({href:NDM.attr("href")+"&ajax=1"});NDM.bind("click",function(){var a=$(".entity_send-a-message form");if(a.length===0){$(this).addClass(SN.C.S.Processing);$.get(NDM.attr("href"),null,function(b){$(".entity_send-a-message").append(document._importNode($("form",b)[0],true));a=$(".entity_send-a-message .form_notice");SN.U.FormNoticeXHR(a);SN.U.FormNoticeEnhancements(a);a.append('<button class="close">&#215;</button>');$(".entity_send-a-message button").click(function(){a.hide();return false});NDM.removeClass(SN.C.S.Processing)})}else{a.show();$(".entity_send-a-message textarea").focus()}return false})},GetFullYear:function(c,d,a){var b=new Date();b.setFullYear(c,d,a);return b},StatusNetInstance:{Set:function(b){var a=SN.U.StatusNetInstance.Get();if(a!==null){b=$.extend(a,b)}$.cookie(SN.C.S.StatusNetInstance,JSON.stringify(b),{path:"/",expires:SN.U.GetFullYear(2029,0,1)})},Get:function(){var a=$.cookie(SN.C.S.StatusNetInstance);if(a!==null){return JSON.parse(a)}return null},Delete:function(){$.cookie(SN.C.S.StatusNetInstance,null)}},belongsOnTimeline:function(b){var a=$("body").attr("id");if(a=="public"){return true}var c=$("#nav_profile a").attr("href");if(c){var d=$(b).find(".entry-title .author a.url").attr("href");if(d==c){if(a=="all"||a=="showstream"){return true}}}return false},switchInputFormTab:function(a){$(".input_form_nav_tab.current").removeClass("current");$("#input_form_nav_"+a).addClass("current");$(".input_form.current").removeClass("current");$("#input_form_"+a).addClass("current")}},Init:{NoticeForm:function(){if($("body.user_in").length>0){$("."+SN.C.S.FormNotice).each(function(){var a=$(this);SN.U.NoticeLocationAttach(a);SN.U.FormNoticeXHR(a);SN.U.FormNoticeEnhancements(a);SN.U.NoticeDataAttach(a)})}},Notices:function(){if($("body.user_in").length>0){SN.U.NoticeFavor();SN.U.NoticeRepeat();SN.U.NoticeReply();SN.U.NoticeInlineReplySetup()}SN.U.NoticeAttachments()},EntityActions:function(){if($("body.user_in").length>0){$(".form_user_subscribe").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_user_unsubscribe").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_group_join").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_group_leave").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_user_nudge").live("click",function(){SN.U.FormXHR($(this));return false});SN.U.NewDirectMessage()}},Login:function(){if(SN.U.StatusNetInstance.Get()!==null){var a=SN.U.StatusNetInstance.Get().Nickname;if(a!==null){$("#form_login #nickname").val(a)}}$("#form_login").bind("submit",function(){SN.U.StatusNetInstance.Set({Nickname:$("#form_login #nickname").val()});return true})},UploadForms:function(){$("input[type=file]").change(function(d){if(typeof this.files=="object"&&this.files.length>0){var c=0;for(var b=0;b<this.files.length;b++){c+=this.files[b].size}var a=SN.U.maxFileSize($(this.form));if(a>0&&c>a){var e="File too large: maximum upload size is %d bytes.";alert(e.replace("%d",a));$(this).val("");d.preventDefault();return false}}})}}};$(document).ready(function(){SN.Init.UploadForms();if($("."+SN.C.S.FormNotice).length>0){SN.Init.NoticeForm()}if($("#content .notices").length>0){SN.Init.Notices()}if($("#content .entity_actions").length>0){SN.Init.EntityActions()}if($("#form_login").length>0){SN.Init.Login()}});if(!document.ELEMENT_NODE){document.ELEMENT_NODE=1;document.ATTRIBUTE_NODE=2;document.TEXT_NODE=3;document.CDATA_SECTION_NODE=4;document.ENTITY_REFERENCE_NODE=5;document.ENTITY_NODE=6;document.PROCESSING_INSTRUCTION_NODE=7;document.COMMENT_NODE=8;document.DOCUMENT_NODE=9;document.DOCUMENT_TYPE_NODE=10;document.DOCUMENT_FRAGMENT_NODE=11;document.NOTATION_NODE=12}document._importNode=function(e,a){switch(e.nodeType){case document.ELEMENT_NODE:var d=document.createElement(e.nodeName);if(e.attributes&&e.attributes.length>0){for(var c=0,b=e.attributes.length;c<b;){if(e.attributes[c].nodeName=="class"){d.className=e.getAttribute(e.attributes[c++].nodeName)}else{d.setAttribute(e.attributes[c].nodeName,e.getAttribute(e.attributes[c++].nodeName))}}}if(a&&e.childNodes&&e.childNodes.length>0){for(var c=0,b=e.childNodes.length;c<b;){d.appendChild(document._importNode(e.childNodes[c++],a))}}return d;break;case document.TEXT_NODE:case document.CDATA_SECTION_NODE:case document.COMMENT_NODE:return document.createTextNode(e.nodeValue);break}};if(typeof navigator.geolocation=="undefined"||navigator.geolocation.shim){(function(){(function(){if(window.google&&google.gears){return}var c=null;if(typeof GearsFactory!="undefined"){c=new GearsFactory()}else{try{c=new ActiveXObject("Gears.Factory");if(c.getBuildInfo().indexOf("ie_mobile")!=-1){c.privateSetGlobalObject(this)}}catch(d){if((typeof navigator.mimeTypes!="undefined")&&navigator.mimeTypes["application/x-googlegears"]){c=document.createElement("object");c.style.display="none";c.width=0;c.height=0;c.type="application/x-googlegears";document.documentElement.appendChild(c)}}}if(!c){return}if(!window.google){google={}}if(!google.gears){google.gears={factory:c}}})();var a=(function(){var d=google.gears.factory.create("beta.geolocation");var c=function(f,e){return function(g){f(g);e.lastPosition=g}};return{shim:true,type:"Gears",lastPosition:null,getCurrentPosition:function(e,g,h){var f=this;var i=c(e,f);d.getCurrentPosition(i,g,h)},watchPosition:function(e,f,g){d.watchPosition(e,f,g)},clearWatch:function(e){d.clearWatch(e)},getPermission:function(g,e,f){d.getPermission(g,e,f)}}});var b=(function(){var i=false;var e=function(){if(!d()&&!i){i=true;var j=document.createElement("script");j.src=(document.location.protocol=="https:"?"https://":"http://")+"www.google.com/jsapi?callback=_google_loader_apiLoaded";j.type="text/javascript";document.getElementsByTagName("body")[0].appendChild(j)}};var c=[];var h=function(j){c.push(j)};var f=function(){if(d()){while(c.length>0){var j=c.pop();j()}}};window._google_loader_apiLoaded=function(){f()};var d=function(){return(window.google&&google.loader)};var g=function(j){if(d()){return true}h(j);e();return false};e();return{shim:true,type:"ClientLocation",lastPosition:null,getCurrentPosition:function(k,n,o){var m=this;if(!g(function(){m.getCurrentPosition(k,n,o)})){return}if(google.loader.ClientLocation){var l=google.loader.ClientLocation;var j={coords:{latitude:l.latitude,longitude:l.longitude,altitude:null,accuracy:43000,altitudeAccuracy:null,heading:null,speed:null},address:{city:l.address.city,country:l.address.country,country_code:l.address.country_code,region:l.address.region},timestamp:new Date()};k(j);this.lastPosition=j}else{if(n==="function"){n({code:3,message:"Using the Google ClientLocation API and it is not able to calculate a location."})}}},watchPosition:function(j,l,m){this.getCurrentPosition(j,l,m);var k=this;var n=setInterval(function(){k.getCurrentPosition(j,l,m)},10000);return n},clearWatch:function(j){clearInterval(j)},getPermission:function(l,j,k){return true}}});navigator.geolocation=(window.google&&google.gears)?a():b()})()};
\ No newline at end of file
diff --git a/lib/action.php b/lib/action.php
index a049fec97c..b7f0036699 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -657,7 +657,8 @@ class Action extends HTMLOutputter // lawsuit
 
             foreach ($tabs as $tag => $title) {
 
-                $attrs = array('id' => 'input_form_nav_'.$title);
+                $attrs = array('id' => 'input_form_nav_'.$tag,
+                               'class' => 'input_form_nav_tab');
 
                 if ($tag == 'status') {
                     $attrs['class'] = 'current';
@@ -666,7 +667,7 @@ class Action extends HTMLOutputter // lawsuit
                 $this->elementStart('li', $attrs);
 
                 $this->element('a',
-                               array('href' => 'javascript:switchInputFormTab("'.$tag.'")'),
+                               array('href' => 'javascript:SN.U.switchInputFormTab("'.$tag.'")'),
                                $title);
                 $this->elementEnd('li');
             }
@@ -679,9 +680,7 @@ class Action extends HTMLOutputter // lawsuit
                                'id' => 'input_form_'.$tag);
 
                 if ($tag == 'status') {
-                    $attrs['class'] .= ' active';
-                } else {
-                    $attrs['class'] .= ' inactive';
+                    $attrs['class'] .= ' current';
                 }
 
                 $this->elementStart('div', $attrs);
@@ -698,6 +697,8 @@ class Action extends HTMLOutputter // lawsuit
                 if (!empty($form)) {
                     $form->show();
                 }
+
+                $this->elementEnd('div');
             }
         }
     }
diff --git a/theme/rebase/css/display.css b/theme/rebase/css/display.css
index 32df41b93a..f569131213 100644
--- a/theme/rebase/css/display.css
+++ b/theme/rebase/css/display.css
@@ -1953,8 +1953,27 @@ margin-bottom:18px;
 padding-left:20px;
 }
 
+#input_form_nav { 
+    list-style-type: none;
+}
 
-}/*end of @media screen, projection, tv*/
+#input_form_nav li { 
+    display:inline;
+}
+
+.input_form_nav_tab.current {
+    text-decoration: underline;
+}
+
+.input_form { 
+    display: none;
+}
+
+.input_form.current { 
+    display: block;
+}
+
+/*end of @media screen, projection, tv*/
 
 
 @media print {

From 876c7a42c835273b71a0a2a10c9e79e1660ebe47 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Mon, 7 Mar 2011 12:36:04 -0500
Subject: [PATCH 422/655] remove adminpanelnav from adminpanelaction module

---
 lib/adminpanelaction.php | 126 ---------------------------------------
 1 file changed, 126 deletions(-)

diff --git a/lib/adminpanelaction.php b/lib/adminpanelaction.php
index 8dd16e9d0c..a085fcd5dc 100644
--- a/lib/adminpanelaction.php
+++ b/lib/adminpanelaction.php
@@ -291,129 +291,3 @@ class AdminPanelAction extends Action
         return $isOK;
     }
 }
-
-/**
- * Menu for public group of actions
- *
- * @category Output
- * @package  StatusNet
- * @author   Evan Prodromou <evan@status.net>
- * @author   Sarven Capadisli <csarven@status.net>
- * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://status.net/
- *
- * @see      Widget
- */
-class AdminPanelNav extends Widget
-{
-    var $action = null;
-
-    /**
-     * Construction
-     *
-     * @param Action $action current action, used for output
-     */
-    function __construct($action=null)
-    {
-        parent::__construct($action);
-        $this->action = $action;
-    }
-
-    /**
-     * Show the menu
-     *
-     * @return void
-     */
-    function show()
-    {
-        $action_name = $this->action->trimmed('action');
-
-        $this->action->elementStart('ul', array('class' => 'nav'));
-
-        if (Event::handle('StartAdminPanelNav', array($this))) {
-
-            if (AdminPanelAction::canAdmin('site')) {
-                // TRANS: Menu item title/tooltip
-                $menu_title = _('Basic site configuration');
-                // TRANS: Menu item for site administration
-                $this->out->menuItem(common_local_url('siteadminpanel'), _m('MENU', 'Site'),
-                                     $menu_title, $action_name == 'siteadminpanel', 'nav_site_admin_panel');
-            }
-
-            if (AdminPanelAction::canAdmin('design')) {
-                // TRANS: Menu item title/tooltip
-                $menu_title = _('Design configuration');
-                // TRANS: Menu item for site administration
-                $this->out->menuItem(common_local_url('designadminpanel'), _m('MENU', 'Design'),
-                                     $menu_title, $action_name == 'designadminpanel', 'nav_design_admin_panel');
-            }
-
-            if (AdminPanelAction::canAdmin('user')) {
-                // TRANS: Menu item title/tooltip
-                $menu_title = _('User configuration');
-                // TRANS: Menu item for site administration
-                $this->out->menuItem(common_local_url('useradminpanel'), _('User'),
-                                     $menu_title, $action_name == 'useradminpanel', 'nav_user_admin_panel');
-            }
-
-            if (AdminPanelAction::canAdmin('access')) {
-                // TRANS: Menu item title/tooltip
-                $menu_title = _('Access configuration');
-                // TRANS: Menu item for site administration
-                $this->out->menuItem(common_local_url('accessadminpanel'), _('Access'),
-                                     $menu_title, $action_name == 'accessadminpanel', 'nav_access_admin_panel');
-            }
-
-            if (AdminPanelAction::canAdmin('paths')) {
-                // TRANS: Menu item title/tooltip
-                $menu_title = _('Paths configuration');
-                // TRANS: Menu item for site administration
-                $this->out->menuItem(common_local_url('pathsadminpanel'), _('Paths'),
-                                    $menu_title, $action_name == 'pathsadminpanel', 'nav_paths_admin_panel');
-            }
-
-            if (AdminPanelAction::canAdmin('sessions')) {
-                // TRANS: Menu item title/tooltip
-                $menu_title = _('Sessions configuration');
-                // TRANS: Menu item for site administration
-                $this->out->menuItem(common_local_url('sessionsadminpanel'), _('Sessions'),
-                                     $menu_title, $action_name == 'sessionsadminpanel', 'nav_sessions_admin_panel');
-            }
-
-            if (AdminPanelAction::canAdmin('sitenotice')) {
-                // TRANS: Menu item title/tooltip
-                $menu_title = _('Edit site notice');
-                // TRANS: Menu item for site administration
-                $this->out->menuItem(common_local_url('sitenoticeadminpanel'), _('Site notice'),
-                                     $menu_title, $action_name == 'sitenoticeadminpanel', 'nav_sitenotice_admin_panel');
-            }
-
-            if (AdminPanelAction::canAdmin('snapshot')) {
-                // TRANS: Menu item title/tooltip
-                $menu_title = _('Snapshots configuration');
-                // TRANS: Menu item for site administration
-                $this->out->menuItem(common_local_url('snapshotadminpanel'), _('Snapshots'),
-                                     $menu_title, $action_name == 'snapshotadminpanel', 'nav_snapshot_admin_panel');
-            }
-
-            if (AdminPanelAction::canAdmin('license')) {
-                // TRANS: Menu item title/tooltip
-                $menu_title = _('Set site license');
-                // TRANS: Menu item for site administration
-                $this->out->menuItem(common_local_url('licenseadminpanel'), _('License'),
-                                     $menu_title, $action_name == 'licenseadminpanel', 'nav_license_admin_panel');
-            }
-
-            if (AdminPanelAction::canAdmin('plugins')) {
-                // TRANS: Menu item title/tooltip
-                $menu_title = _('Plugins configuration');
-                // TRANS: Menu item for site administration
-                $this->out->menuItem(common_local_url('pluginsadminpanel'), _('Plugins'),
-                                     $menu_title, $action_name == 'pluginsadminpanel', 'nav_design_admin_panel');
-            }
-
-            Event::handle('EndAdminPanelNav', array($this));
-        }
-        $this->action->elementEnd('ul');
-    }
-}

From b4f1281799766570ff68580e13c588ea8c8ce1f1 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Mon, 7 Mar 2011 12:36:45 -0500
Subject: [PATCH 423/655] abstraction for starting and ending a menu

---
 lib/menu.php | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/lib/menu.php b/lib/menu.php
index 2713b44d50..751f8e1b7d 100644
--- a/lib/menu.php
+++ b/lib/menu.php
@@ -62,6 +62,23 @@ class Menu extends Widget
         $this->actionName = $action->trimmed('action');
     }
 
+    function id()
+    {
+        return 'unknown_menu';
+    }
+
+    function menuStart()
+    {
+        $this->action->elementStart('div', array('id' => $this->id()));
+        $this->action->elementStart('ul', array('class' => 'nav'));
+    }
+
+    function menuEnd()
+    {
+        $this->action->elementEnd('ul');
+        $this->action->elementEnd('div');
+    }
+
     function item($actionName, $args, $label, $description, $id=null)
     {
         if (empty($id)) {

From 8e03c83a57e29a0e840b44b1e5cb04e1422a845f Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Mon, 7 Mar 2011 12:37:07 -0500
Subject: [PATCH 424/655] primarynav uses menustart and menuend

---
 lib/primarynav.php | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/lib/primarynav.php b/lib/primarynav.php
index 296328d8bd..de3ea2641f 100644
--- a/lib/primarynav.php
+++ b/lib/primarynav.php
@@ -50,8 +50,7 @@ class PrimaryNav extends Menu
     function show()
     {
         $user = common_current_user();
-        $this->action->elementStart('ul', array('class' => 'nav',
-                                        'id' => 'site_nav_global_primary'));
+        $this->menuStart();
         if (Event::handle('StartPrimaryNav', array($this->action))) {
             if (!empty($user)) {
                 $this->action->menuItem(common_local_url('profilesettings'),
@@ -89,7 +88,12 @@ class PrimaryNav extends Menu
 
             Event::handle('EndPrimaryNav', array($this->action));
         }
-
+        $this->menuEnd();
         $this->action->elementEnd('ul');
     }
+    
+    function id()
+    {
+        return 'site_nav_global_primary';
+    }
 }

From 6ab7329e85b1878b40165bc2475151a6e78195b4 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Mon, 7 Mar 2011 12:39:31 -0500
Subject: [PATCH 425/655] Revert "primarynav uses menustart and menuend"

This reverts commit 8e03c83a57e29a0e840b44b1e5cb04e1422a845f.
---
 lib/primarynav.php | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/lib/primarynav.php b/lib/primarynav.php
index de3ea2641f..296328d8bd 100644
--- a/lib/primarynav.php
+++ b/lib/primarynav.php
@@ -50,7 +50,8 @@ class PrimaryNav extends Menu
     function show()
     {
         $user = common_current_user();
-        $this->menuStart();
+        $this->action->elementStart('ul', array('class' => 'nav',
+                                        'id' => 'site_nav_global_primary'));
         if (Event::handle('StartPrimaryNav', array($this->action))) {
             if (!empty($user)) {
                 $this->action->menuItem(common_local_url('profilesettings'),
@@ -88,12 +89,7 @@ class PrimaryNav extends Menu
 
             Event::handle('EndPrimaryNav', array($this->action));
         }
-        $this->menuEnd();
+
         $this->action->elementEnd('ul');
     }
-    
-    function id()
-    {
-        return 'site_nav_global_primary';
-    }
 }

From b751ab70fb4f9f7ad807e29b5716f2100aeb0de8 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Mon, 7 Mar 2011 12:39:52 -0500
Subject: [PATCH 426/655] Revert "abstraction for starting and ending a menu"

This reverts commit b4f1281799766570ff68580e13c588ea8c8ce1f1.
---
 lib/menu.php | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/lib/menu.php b/lib/menu.php
index 751f8e1b7d..2713b44d50 100644
--- a/lib/menu.php
+++ b/lib/menu.php
@@ -62,23 +62,6 @@ class Menu extends Widget
         $this->actionName = $action->trimmed('action');
     }
 
-    function id()
-    {
-        return 'unknown_menu';
-    }
-
-    function menuStart()
-    {
-        $this->action->elementStart('div', array('id' => $this->id()));
-        $this->action->elementStart('ul', array('class' => 'nav'));
-    }
-
-    function menuEnd()
-    {
-        $this->action->elementEnd('ul');
-        $this->action->elementEnd('div');
-    }
-
     function item($actionName, $args, $label, $description, $id=null)
     {
         if (empty($id)) {

From 2272044ad1c8bcde9d79aeaf1b135dc7b47784da Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Mon, 7 Mar 2011 12:42:51 -0500
Subject: [PATCH 427/655] wrapper div for primary nav

---
 lib/action.php     | 2 ++
 lib/primarynav.php | 3 +--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/action.php b/lib/action.php
index dc95b030d2..7ef959bc4e 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -536,8 +536,10 @@ class Action extends HTMLOutputter // lawsuit
      */
     function showPrimaryNav()
     {
+        $this->elementStart('div', array('id' => 'site_nav_global_primary'));
         $pn = new PrimaryNav($this);
         $pn->show();
+        $this->elementEnd('div');
     }
 
     /**
diff --git a/lib/primarynav.php b/lib/primarynav.php
index 296328d8bd..7748d7a1c7 100644
--- a/lib/primarynav.php
+++ b/lib/primarynav.php
@@ -50,8 +50,7 @@ class PrimaryNav extends Menu
     function show()
     {
         $user = common_current_user();
-        $this->action->elementStart('ul', array('class' => 'nav',
-                                        'id' => 'site_nav_global_primary'));
+        $this->action->elementStart('ul', array('class' => 'nav'));
         if (Event::handle('StartPrimaryNav', array($this->action))) {
             if (!empty($user)) {
                 $this->action->menuItem(common_local_url('profilesettings'),

From 998733cdd44143b1a3ded13f28ff5e848516b1c6 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Mon, 7 Mar 2011 12:49:20 -0500
Subject: [PATCH 428/655] UR FACE

---
 lib/userprofile.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/userprofile.php b/lib/userprofile.php
index 0b7efb22fc..9c563db5d0 100644
--- a/lib/userprofile.php
+++ b/lib/userprofile.php
@@ -95,6 +95,8 @@ class UserProfile extends Widget
 
     function showAvatar()
     {
+        $this->out->elementStart('div', 'ur_face');
+
         if (Event::handle('StartProfilePageAvatar', array($this->out, $this->profile))) {
 
             $avatar = $this->profile->getAvatar(AVATAR_PROFILE_SIZE);
@@ -119,6 +121,8 @@ class UserProfile extends Widget
             Event::handle('EndProfilePageAvatar',
                           array($this->out, $this->profile));
         }
+
+        $this->out->elementEnd('div');
     }
 
     function showNickname()

From 618a65898566a99bd06ac869c369934d11f7764f Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Mon, 7 Mar 2011 14:06:46 -0500
Subject: [PATCH 429/655] show correct notice in output

---
 lib/microappplugin.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/microappplugin.php b/lib/microappplugin.php
index 0b02f5da52..dbbc6262af 100644
--- a/lib/microappplugin.php
+++ b/lib/microappplugin.php
@@ -103,6 +103,7 @@ abstract class MicroAppPlugin extends Plugin
         }
 
         $out = $nli->out;
+        $notice = $nli->notice;
 
         $this->showNotice($notice, $out);
 

From 32f4daf44daa88df1b8e06a5e45a17f1f228d40a Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Mon, 7 Mar 2011 14:20:55 -0500
Subject: [PATCH 430/655] Notice saves its object type

---
 classes/Notice.php    | 8 ++++++++
 classes/statusnet.ini | 1 +
 2 files changed, 9 insertions(+)

diff --git a/classes/Notice.php b/classes/Notice.php
index 157fdf2dc4..7be63b4e9f 100644
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -72,6 +72,7 @@ class Notice extends Memcached_DataObject
     public $location_id;                     // int(4)
     public $location_ns;                     // int(4)
     public $repeat_of;                       // int(4)
+    public $object_type;                     // varchar(255)
 
     /* Static get */
     function staticGet($k,$v=NULL)
@@ -241,6 +242,7 @@ class Notice extends Memcached_DataObject
      *              array 'urls' list of attached/referred URLs to save with the
      *                           notice in place of extracting links from content
      *              boolean 'distribute' whether to distribute the notice, default true
+     *              string 'object_type' URL of the associated object type (default ActivityObject::NOTE)
      *
      * @fixme tag override
      *
@@ -360,6 +362,12 @@ class Notice extends Memcached_DataObject
             $notice->rendered = common_render_content($final, $notice);
         }
 
+        if (empty($object_type)) {
+            $notice->object_type = ActivityObject::NOTE;
+        } else {
+            $notice->object_type = $object_type;
+        }
+
         if (Event::handle('StartNoticeSave', array(&$notice))) {
 
             // XXX: some of these functions write to the DB
diff --git a/classes/statusnet.ini b/classes/statusnet.ini
index bf8d173805..338e5c5aea 100644
--- a/classes/statusnet.ini
+++ b/classes/statusnet.ini
@@ -336,6 +336,7 @@ lon = 1
 location_id = 1
 location_ns = 1
 repeat_of = 1
+object_type = 2
 
 [notice__keys]
 id = N

From 6862f765f6c0550ec7c28bb9ef7efdacd270d275 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Mon, 7 Mar 2011 14:21:16 -0500
Subject: [PATCH 431/655] ActivityObject uses Notice's object_type by default

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

diff --git a/lib/activityobject.php b/lib/activityobject.php
index a69e1a1b42..de2fcab767 100644
--- a/lib/activityobject.php
+++ b/lib/activityobject.php
@@ -422,7 +422,7 @@ class ActivityObject
 
 		if (Event::handle('StartActivityObjectFromNotice', array($notice, &$object))) {
 
-			$object->type    = ActivityObject::NOTE;
+			$object->type    = (empty($notice->object_type)) ? ActivityObject::NOTE : $notice->object_type;
 
 			$object->id      = $notice->uri;
 			$object->title   = $notice->content;

From f5782e9e56759e5ce3b200d51204336443b78dd7 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Mon, 7 Mar 2011 14:25:05 -0500
Subject: [PATCH 432/655] save the object type when saving a new bookmark
 notice

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

diff --git a/plugins/Bookmark/Bookmark.php b/plugins/Bookmark/Bookmark.php
index 777b50f724..04cd8dbfa8 100644
--- a/plugins/Bookmark/Bookmark.php
+++ b/plugins/Bookmark/Bookmark.php
@@ -307,7 +307,8 @@ class Bookmark extends Memcached_DataObject
         $options = array_merge(array('urls' => array($url),
                                      'rendered' => $rendered,
                                      'tags' => $tags,
-                                     'replies' => $replies),
+                                     'replies' => $replies,
+                                     'object_type' => ActivityObject::BOOKMARK),
                                $options);
 
         if (!array_key_exists('uri', $options)) {

From 095e2a74d4af3f5312ab44e2f388bf48d0f6cc36 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Mon, 7 Mar 2011 14:25:37 -0500
Subject: [PATCH 433/655] fix object errors with bookmark notices

---
 plugins/Bookmark/BookmarkPlugin.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/plugins/Bookmark/BookmarkPlugin.php b/plugins/Bookmark/BookmarkPlugin.php
index 1ef5f5c0e3..44f3db7867 100644
--- a/plugins/Bookmark/BookmarkPlugin.php
+++ b/plugins/Bookmark/BookmarkPlugin.php
@@ -510,6 +510,8 @@ class BookmarkPlugin extends MicroAppPlugin
 
     function showNotice($notice, $out)
     {
+        $nb = Bookmark::getByNotice($notice);
+
         $profile = $notice->getProfile();
 
         $atts = $notice->attachments();
@@ -542,8 +544,8 @@ class BookmarkPlugin extends MicroAppPlugin
 
         // Replies look like "for:" tags
 
-        $replies = $nli->notice->getReplies();
-        $tags = $nli->notice->getTags();
+        $replies = $notice->getReplies();
+        $tags = $notice->getTags();
 
         if (!empty($replies) || !empty($tags)) {
 

From e1d177de7e222db401c92a0343e0453219db4607 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Mon, 7 Mar 2011 14:27:23 -0500
Subject: [PATCH 434/655] store reply_to notices as comment activity objects

---
 classes/Notice.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/classes/Notice.php b/classes/Notice.php
index 7be63b4e9f..d520f4728f 100644
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -363,7 +363,7 @@ class Notice extends Memcached_DataObject
         }
 
         if (empty($object_type)) {
-            $notice->object_type = ActivityObject::NOTE;
+            $notice->object_type = (empty($notice->reply_to)) ? ActivityObject::NOTE : ActivityObject::COMMENT;
         } else {
             $notice->object_type = $object_type;
         }

From 0b95d68910bf2c67742083aeb88577dc3ac662fb Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Mon, 7 Mar 2011 14:32:21 -0500
Subject: [PATCH 435/655] cleaner is the new default theme (for now)

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

diff --git a/lib/default.php b/lib/default.php
index c612557d69..38903730f5 100644
--- a/lib/default.php
+++ b/lib/default.php
@@ -33,7 +33,7 @@ $default =
               'nickname' => 'statusnet',
               'wildcard' => null,
               'server' => $_server,
-              'theme' => 'default',
+              'theme' => 'cleaner',
               'path' => $_path,
               'logfile' => null,
               'logo' => null,

From 15686cdf56bbb6eb39f80422579c273e8ae5ffad Mon Sep 17 00:00:00 2001
From: Samantha Doherty <sammy@status.net>
Date: Mon, 7 Mar 2011 14:43:06 -0500
Subject: [PATCH 436/655] First version of 3cl theme neo.

---
 theme/neo/css/display.css            | 828 +++++++++++++++++++++++++++
 theme/neo/css/ie.css                 |  81 +++
 theme/neo/css/mp-screen.css          | 204 +++++++
 theme/neo/default-avatar-mini.png    | Bin 0 -> 857 bytes
 theme/neo/default-avatar-profile.png | Bin 0 -> 3737 bytes
 theme/neo/default-avatar-stream.png  | Bin 0 -> 1791 bytes
 theme/neo/images/bg.png              | Bin 0 -> 207 bytes
 theme/neo/logo.png                   | Bin 0 -> 1633 bytes
 theme/neo/mobilelogo.png             | Bin 0 -> 9357 bytes
 theme/neo/theme.ini                  |   1 +
 10 files changed, 1114 insertions(+)
 create mode 100644 theme/neo/css/display.css
 create mode 100644 theme/neo/css/ie.css
 create mode 100644 theme/neo/css/mp-screen.css
 create mode 100644 theme/neo/default-avatar-mini.png
 create mode 100644 theme/neo/default-avatar-profile.png
 create mode 100644 theme/neo/default-avatar-stream.png
 create mode 100644 theme/neo/images/bg.png
 create mode 100644 theme/neo/logo.png
 create mode 100644 theme/neo/mobilelogo.png
 create mode 100644 theme/neo/theme.ini

diff --git a/theme/neo/css/display.css b/theme/neo/css/display.css
new file mode 100644
index 0000000000..a542ed7609
--- /dev/null
+++ b/theme/neo/css/display.css
@@ -0,0 +1,828 @@
+/** theme: neo
+ *
+ * @package   StatusNet
+ * @author    Samantha Doherty <sammy@status.net>
+ * @copyright 2011 StatusNet, Inc.
+ * @license   http://creativecommons.org/licenses/by/3.0/ Creative Commons Attribution 3.0 Unported
+ * @link      http://status.net/
+ */
+
+
+@media screen, projection, tv {
+
+body {
+    background-color: #C6C8CC;
+    background-image: url(../images/bg.png);
+    font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; 
+    font-size: 82%;
+}
+
+a {color: #3e3e8c;}
+
+h1 {font-size: 1.6em;}
+h2 {font-size: 1.6em;}
+h3 {font-size: 1.4em;}
+h4 {font-size: 1.4em;}
+h5 {font-size: 1.2em;}
+h6 {font-size: 1em;}
+
+#wrap {
+    width: 930px;
+    margin: 0px auto;
+    padding: 0px 15px 10px 15px;
+    background-color: #fff;
+    border-left: 10px solid #E0E0E0;
+    border-right: 10px solid #E0E0E0;
+}
+
+#header {
+    width: 940px;
+    padding: 0px;
+    padding-top: 50px;
+}
+
+address {
+    float: left;
+    margin-right: 20px;
+    margin-top: 0px;
+}
+
+.poweredby {
+    background: url(../images/sn-tiny.png) no-repeat top left;
+    height: 40px;
+    font-size: 0.8em;
+    color: #fff;
+    line-height: 42px;
+    padding-left: 50px;
+    position: absolute;
+    top: 6px;
+    left: 0;
+    z-index: 99;
+    font-style: normal;
+}
+
+.poweredby a {
+    color: #fff !important;
+    font-weight: bold;
+}
+
+#site_nav_global_primary {
+    display: block;
+    position: absolute;
+    top: 0;
+    left: 0;
+    z-index: 98;
+    background-color: #364A84;
+    width: 960px;
+    margin-left: -15px; 
+    margin-top: 0px;
+    height: 24px;
+    line-height: 20px;
+    border-top: 10px solid #fff;
+    border-bottom: 1px solid #fff;
+}
+
+#site_nav_global_primary ul {
+    float: right;
+}
+
+#site_nav_global_primary li {
+    margin-right: 0px;
+}
+
+#site_nav_global_primary li:last-child {
+    margin-right: 16px;
+}
+
+#site_nav_global_primary a {
+    color: #fff !important;
+    text-shadow: 0px 1px 1px rgba(0, 0, 0, 0.5);
+    padding: 2px 12px 2px 12px;
+    height: 20px;
+    display: block;
+    float: left;
+}
+
+#site_nav_global_primary a:hover {
+    color: #fff !important;
+    text-shadow: 0px 1px 1px rgba(0, 0, 0, 0.5);
+    background: #4c619c;
+    text-decoration: none;
+}
+
+#site_notice {
+    color: #000;
+    float: right;
+    width: 280px;
+    padding: 10px; 
+    margin-left: 40px;
+    -webkit-border-radius: 6px;
+    -moz-border-radius: 6px;
+    border-radius: 6px;
+}
+
+#site_notice a {
+    color: #3e3e8c;
+}
+
+#anon_notice {
+    color: #000;
+    clear: both;
+    background: none;
+    padding: 0px;
+    margin-bottom: 10px;
+}
+
+#anon_notice a {
+    color: #3e3e8c;
+}
+
+.form_notice {
+    float: left;
+    margin-top: 0px;
+    width: 510px;
+    padding: 10px;
+    -webkit-border-radius: 6px;
+    -moz-border-radius: 6px;
+    border-radius: 6px;
+    background: #cdd1dd;
+}
+
+.form_notice fieldset {
+    width: 100%;
+}
+
+.form_notice textarea {
+    width: 378px;
+    height: 54px;
+    -webkit-border-radius: 6px;
+    -moz-border-radius: 6px;
+    border-radius: 6px;
+}
+
+.form_notice label[for=notice_data-attach],
+.form_notice #notice_data-attach {
+    top: 27px;
+    right: 86px;
+}
+
+.form_notice #notice_data-geo_wrap label,
+.form_notice #notice_data-geo_wrap input {
+    top: 52px;
+    right: 86px;
+}
+
+.form_notice #notice_action-submit {
+    font-size: 0.9em;
+    top: 80px;
+	right: -2px;
+    height: 2.4em;
+    width: 106px;
+}
+
+.form_notice .error,
+.form_notice .success {
+    width: 341px;
+}
+
+.form_notice .error {
+    margin-left: 0px;
+}
+
+#core {
+    clear: both;
+    margin: 0px;
+    width: 930px;
+    margin-left: 0px;
+    margin-top: 8px;
+}
+
+#content {
+    width: 530px;
+    margin-right: 0px;
+    padding-left: 30px;
+    padding-right: 30px;
+}
+
+#site_nav_local_views {
+    display: block;
+    float: left;
+    width: 130px;
+    margin-top: 5px;
+}
+
+#site_nav_local_views H3 {
+    border-bottom: 3px solid #A6ADBF;
+    color: #A6ADBF;
+    font-size: 1.1em;
+    letter-spacing: 2px;
+    margin-bottom: 10px;
+    text-transform: uppercase;
+}
+
+#site_nav_local_views li {
+    display: block;
+    margin: 0px 0px 6px 0px;
+}
+
+#site_nav_local_views li ul {
+    margin-bottom: 20px;
+}
+
+#site_nav_local_views a {
+    padding: 2px 0px 2px 10px;
+    display: block;
+    -webkit-border-radius: 6px;
+    -moz-border-radius: 6px;
+    border-radius: 6px;
+}
+
+#site_nav_local_views a:hover {
+    background: #8e98b4 !important;
+    color: #fff !important;
+    text-decoration: none;
+    text-shadow: 0px 1px 1px rgba(0, 0, 0, 0.5);
+}
+
+#site_nav_local_views .current a {
+    text-decoration: none;
+    background: #8e98b4 !important;
+    color: #fff !important;
+    text-shadow: 0px 1px 1px rgba(0, 0, 0, 0.5);
+}
+
+#aside_primary {
+    background: none;
+    width: 210px;
+    padding-top: 0px;
+    margin-top: 5px;
+}
+
+#aside_primary .section {
+    width: 100%;
+    margin-left: 0px;
+    margin-right: 0px;
+}
+
+#aside_primary h2 {
+    border-bottom: 3px solid #A6ADBF;
+    color: #A6ADBF;
+    font-size: 1.1em;
+    letter-spacing: 2px;
+    margin-bottom: 10px;
+    text-transform: uppercase;
+    text-align: right;
+}
+
+.section ul.entities {
+    width: 290px;
+}
+
+.section .entities li {
+    margin-right: 17px;
+    margin-bottom: 10px;
+    width: 24px;
+}
+
+#popular_notices .avatar {
+    position: relative;
+    top: 2px;
+    margin-bottom: 4px;
+}
+
+#aside_primary td {
+    padding-right: 20px;
+    padding-bottom: 14px;
+}
+
+#aside_primary td .nickname {
+    line-height: 1.6em;
+}
+
+.section .avatar {
+    box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.5);
+    -moz-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.5);
+    -webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.5);
+}
+
+#content h1 {
+    border-bottom: 3px solid #A6ADBF;
+    color: #A6ADBF;
+    font-size: 1.4em;
+    letter-spacing: 4px;
+    text-transform: uppercase;
+}
+
+#notices_primary {
+    margin-top: -5px;
+}
+
+#content .notice {
+    padding-bottom: 14px;
+    border-bottom: 2px dotted #eee;
+}
+
+.notice {
+    line-height: 1.35em;
+    margin-bottom: 10px;
+}
+
+#content .notice .author .photo {
+    left: 0px;
+    top: 6px;
+}
+
+#content .notice .entry-title {
+    min-height: 34px;
+}
+
+#showstream .notice .entry-title {
+    min-height: 1px;
+}
+
+#shownotice .notice .entry-title {
+    min-height:123px;
+}
+
+.notice div.entry-content {
+    font-size: 0.9em;
+    line-height: 1.2em;
+    margin-top: 6px;
+    opacity: 0.6;
+}
+
+.notice:hover div.entry-content {
+    opacity: 1;
+}
+
+.user_in .notice div.entry-content {
+    max-width: 440px;
+}
+
+div.entry-content a.response:before {
+	content: "(";
+}
+
+div.entry-content a.response:after {
+	content: ")";
+}
+
+.notice-options {
+    margin-top: 4px;
+}
+
+.pagination {
+    height: 1.2em;
+}
+
+#jOverlayContent button {
+    top: 20px;
+    right: 36px;
+}
+
+.entity_profile {
+    float: left;
+    width: 435px;
+    margin-top: 4px;
+}
+
+td.entity_profile { /* cf directory table */
+    width: auto;
+}
+
+.entity_profile .entity_depiction {
+    margin-top: 4px;
+}
+
+.entity_actions {
+    width: 140px;
+    margin-top: 8px;
+    margin-bottom: 10px;
+}
+
+.entity_actions a, .entity_actions p, .entity_actions .entity_subscribe input, .entity_actions .entity_block input, .entity_actions .entity_moderation input, .entity_actions .entity_role input, .entity_actions .entity_nudge input, .entity_actions .entity_delete input {
+   	text-shadow:0 1px 0 rgba(255,255,255,0.4);
+    border-radius: 4px;
+    -moz-border-radius: 4px;
+    -webkit-border-radius: 4px;
+    background-color: #CDD1DD !important;
+}
+
+.entity_moderation:hover ul,
+.entity_role:hover ul {
+    border-radius: 4px;
+    -moz-border-radius: 4px;
+    -webkit-border-radius: 4px;
+}
+
+.entity_send-a-message .form_notice legend {
+   	text-shadow:0 1px 0 rgba(255,255,255,0.4);
+}
+
+.entity_send-a-message .form_notice {
+    border: 1px solid #7B4E82;
+}
+
+.entity_send-a-message .form_notice #notice_action-submit {
+    color: #fff !important;
+    top: 46px;
+}
+
+#aside_primary #entity_remote_subscribe a:hover {
+    background-color: #fff !important;
+}
+
+#entity_remote_subscribe .dialogbox {
+    border: 1px solid #7B4E82;
+    border-radius: 8px;
+	-moz-border-radius: 8px;
+	-webkit-border-radius: 8px;
+}
+
+#entity_remote_subscribe input {
+    padding-left: 4px;
+}
+
+#entity_remote_subscribe .submit_dialogbox {
+    margin-top: 10px;
+    float: right;
+}
+
+#filter_tags_item .submit {
+  left: 6px;
+  top: -3px;
+}
+
+.pagination {
+    height: 1.2em;
+    padding-bottom: 12px;
+    -webkit-border-radius: 6px;
+    -moz-border-radius: 6px;
+    border-radius: 6px;
+}
+
+#footer {
+    color: #000;
+    margin-left: 0px;
+    margin-right: 0px;
+    -webkit-border-top-left-radius: 6px;
+    -webkit-border-top-right-radius: 6px;
+    -moz-border-radius-topleft: 6px;
+    -moz-border-radius-topright: 6px;
+    border-top-left-radius: 6px;
+    border-top-right-radius: 6px;
+}
+
+#footer a {
+    color: #3e3e8c;
+}
+
+#site_nav_global_secondary {
+    margin-bottom: 10px;
+}
+
+.error, .success {
+    background-color: #F7E8E8;
+    padding: 4px;
+    -webkit-border-radius: 6px;
+    -moz-border-radius: 6px;
+    border-radius: 6px;
+}
+.success {
+    background-color: #f2f2f2;
+}
+
+.form_notice input.submit, .form_settings input.submit, .form_settings input.cancel {
+    border-radius: 3px;
+    -moz-border-radius: 3px;
+    -webkit-border-radius: 3px;
+    text-shadow: 0px 1px 1px rgba(0, 0, 0, 0.5);
+    color:#fff;
+    font-weight: normal;
+    font-size: 1em;
+    height: 2.2em;
+    padding-left: 1em;
+    padding-right: 1em;
+    background: #7080aa;
+    background: -moz-linear-gradient(top, #7b8dbb , #7080aa);
+    background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#7b8dbb), color-stop(100%,#7080aa)); 
+    filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#7b8dbb', endColorstr='#7080aa',GradientType=0 );
+    border-width: 1px;
+}
+
+.form_notice input.submit:hover, .form_settings input.submit:hover, .form_settings input.cancel:hover {
+    text-shadow: 0px 1px 1px rgba(0, 0, 0, 0.8);
+    background: #7b8dbb;
+    background: -moz-linear-gradient(top, #7080aa , #7b8dbb);
+    background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#7080aa), color-stop(100%,#7b8dbb));
+    filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#7080aa', endColorstr='#7b8dbb',GradientType=0 );
+}
+
+.form_settings input#settings_design_reset, .form_settings input.cancel {
+    background: #e2e2e2;
+    color: #8e181b;
+    text-shadow: 0px 1px 1px rgba(255, 255, 255, 0.5);
+}
+
+.form_settings input#settings_design_reset:hover, .form_settings input.cancel:hover {
+    background: #f2f2f2;
+    color: #8e181b;
+    text-shadow: 0px 1px 1px rgba(255, 255, 255, 0.5);
+}
+
+.form_settings input.checkbox, .form_settings input.radio {
+    margin-left: 24%;
+    margin-top: 2px;
+    position: relative;
+    left: -14px;
+}
+
+.form_settings label.checkbox, .form_settings label.radio {
+    width: auto;
+    max-width: 60%;
+    position: relative;
+    left: -30px;
+}
+
+.form_settings li input.radio {
+    clear: left;
+}
+
+.form_settings label.radio {
+    margin-left: 10px;
+    margin-right: 10px;
+    text-align: left;
+}
+
+#form_login p.form_guide, #form_register #settings_rememberme p.form_guide, #form_openid_login #settings_rememberme p.form_guide, #settings_twitter_remove p.form_guide, #design_background-image_onoff p.form_guide {
+    margin-left: 26%;
+}
+
+#form_search ul.form_data #q {
+    margin-left: 10px;
+}
+
+.form_settings fieldset fieldset {
+    margin-bottom: 30px;
+    padding-top: 25px;
+}
+
+
+#content thead th {
+text-align:left;
+}
+#content tbody th {
+vertical-align:top;
+text-align:left;
+font-weight:normal;
+padding-top:11px;
+padding-right:18px;
+}
+#content tbody tr {
+    border-top: 1px dotted #bbb;
+}
+#content td {
+padding:11px 18px 11px 0;
+vertical-align:top;
+}
+#content td:last-child {
+padding-right:0;
+}
+
+
+#realtime_actions {
+    position: relative !important;
+    float: right;
+    padding-top: 15px;
+    margin-bottom: -8px !important;
+}
+
+.realtime-popup #content {
+    padding-left: 4px !important;
+    padding-right: 4px !important;
+    margin-right: 0px;
+}
+
+.realtime-popup .form_notice textarea {
+    width: 325px !important;
+}
+
+.realtime-popup .form_notice #notice_action-submit {
+    top: 59px !important;
+    right: 6px !important;
+}
+
+.realtime-popup .form_notice label[for=notice_data-attach], .realtime-popup .form_notice #notice_data-attach {
+    right: 74px;
+    top: 3px !important;
+}
+
+.realtime-popup .form_notice #notice_data-geo_wrap label, .realtime-popup .form_notice #notice_data-geo_wrap input {
+    right: 8px;
+    top: 3px !important;
+}
+
+
+/* Bookmark specific styles */
+
+#content .bookmark .entry-title {
+    margin-left: 0px;
+}
+
+.bookmark h3 {
+    margin: 0px 0px 8px 0px;
+    float: left;
+    line-height: 1.2em;
+    max-width: 92%;
+}
+
+.bookmark-notice-count {
+    border-radius: 4px;
+	-moz-border-radius: 4px;
+	-webkit-border-radius: 4px;
+    padding: 1px 6px;
+    font-size: 1.2em;
+    line-height: 1.2em;
+    background: #fff;
+    border: 1px solid #7b8dbb;
+    color: #3e3e8c !important;
+    position: relative;
+    right: 4px;
+    margin-left: 10px;
+}
+
+.bookmark-notice-count:hover {
+    text-decoration: none;
+    background: #f2f2f2;
+    border: 1px solid #7b8dbb;
+    text-shadow: 0px 1px 1px rgba(255, 255, 255, 0.5);
+}
+
+.notice .bookmark-description {
+    clear: both;
+    margin-left: 0px;
+    margin-bottom: 0px;
+}
+
+.notice .bookmark-author {
+    margin-left: 0px;
+    float: left;
+}
+
+.bookmark-tags {
+    clear: both;
+    margin-bottom: 8px;
+    line-height: 1.6em;
+}
+
+ul.bookmark-tags a {
+    border-radius: 4px;
+	-moz-border-radius: 4px;
+	-webkit-border-radius: 4px;
+    padding: 1px 6px;
+    background: #f2f2f2;
+    color: #3e3e8c !important;
+    text-shadow: 0px 1px 1px rgba(255, 255, 255, 0.5);
+    font-size: 0.9em;
+}
+
+ul.bookmark-tags a:hover {
+    background-color: #cdd1dd;
+    text-decoration: none;
+}
+
+.bookmark-avatar {
+    float: none !important;
+    position: relative;
+    top: 2px;
+}
+
+.bookmark div.entry-content {
+    font-size: 0.9em;
+    line-height: 1.2em;
+    margin-top: 6px;
+    opacity: 0.6;
+    margin-bottom: 0px;
+}
+
+.bookmark:hover div.entry-content {
+    opacity: 1;
+}
+
+.bookmark .notice-options {
+    margin-top: 16px;
+}
+
+#bookmarkpopup {
+    min-width: 600px;
+    margin-top: 0px;
+    height: 100%;
+    border: 10px solid #364A84;
+    background: #364A84;
+}
+
+#bookmarkpopup #wrap {
+    width: auto;
+    min-width: 560px;
+    padding: 40px 0px 25px 0px;
+    margin-right: 2px;
+    background: #fff url(../mobilelogo.png) no-repeat 6px 6px;
+}
+
+#bookmarkpopup #header {
+    width: auto;
+    padding: 0px 10px;
+}
+
+#bookmarkpopup .form_settings label {
+    margin-top: 2px;
+    text-align: right;
+    width: 24%;
+    font-size: 1.2em;
+}
+
+#bookmarkpopup .form_settings .form_data input {
+    width: 60%;
+}
+
+#bookmarkpopup .form_guide {
+    color: #777;
+}
+
+#bookmarkpopup #submit {
+    float: right;
+    margin-right: 0px;
+}
+
+#bookmarkpopup fieldset fieldset {
+    margin-bottom: 10px;
+}
+
+/* Onboard specific styles */
+
+.onboard-flash {
+    border-radius: 6px;
+ 	-moz-border-radius: 6px;
+   	-webkit-border-radius: 6px;
+    font-size: 1.1em;
+    box-shadow: 0px 0px 12px rgba(0, 0, 0, 0.5);
+    -moz-box-shadow: 0px 0px 12px rgba(0, 0, 0, 0.5);
+    -webkit-box-shadow: 0px 0px 12px rgba(0, 0, 0, 0.5);
+}
+
+.onboard-flash p {
+    margin-bottom: 10px;
+}
+
+.onboard-flash .next:before {
+    content: '\00BB';
+    padding-right: 6px;
+}
+
+.onboard-breadcrumbs {
+    margin-bottom: 16px !important;
+}
+
+.onboard-breadcrumbs li {
+    background: none !important;
+    border-top: none !important;
+    padding: 6px 12px 2px 0px !important;
+}
+
+.onboard-breadcrumbs li:last-child {
+    padding-right: 0px !important;
+}
+
+.onboard-breadcrumbs a {
+    text-decoration: none;
+}
+
+.onboard-breadcrumbs a:hover {
+    color: #3e3e8c !important;
+}
+
+/* Billing specific styles */
+
+#content table.billing_info {
+    margin-top: 10px;
+    background:rgba(240, 240, 240, 0.4);
+}
+
+#content table.billing_info th {
+    text-align: right;
+    width: 50%;
+}
+
+.invalid {
+    border: solid 2px red !important;
+}
+
+#payment_history table {
+    width: 100%;
+}
+
+#billingadminpanel .form_settings input {
+    margin-right: 0px;
+}
+
+}/*end of @media screen, projection, tv*/
diff --git a/theme/neo/css/ie.css b/theme/neo/css/ie.css
new file mode 100644
index 0000000000..41f7dc9f88
--- /dev/null
+++ b/theme/neo/css/ie.css
@@ -0,0 +1,81 @@
+/* Temporary copy of base styles for overriding */
+
+input.checkbox,
+input.radio {
+top:0;
+}
+.form_notice textarea {
+    width: 328px;
+}
+.form_notice .form_note + label {
+position:absolute;
+top:25px;
+left:83%;
+text-indent:-9999px;
+height:16px;
+width:16px;
+display:block;
+    left: 390px;
+    top: 27px;
+}
+.form_notice #notice_action-submit {
+    width: 106px;
+    max-width: 106px;
+}
+.form_notice #notice_data-attach_selected,
+.form_notice #notice_data-geo_selected {
+width:78.75%;
+}
+.form_notice #notice_data-attach_selected button,
+.form_notice #notice_data-geo_selected button {
+padding:0 4px;
+}
+.notice-options input.submit {
+font-size:0;
+text-align:right;
+text-indent:0;
+}
+.notice div.entry-content .timestamp a {
+margin-right:4px;
+}
+.entity_profile {
+width:64%;
+}
+.notice {
+z-index:1;
+}
+.notice:hover {
+z-index:9999;
+}
+.notice .thumbnail img {
+z-index:9999;
+}
+
+.form_settings fieldset fieldset legend {
+line-height:auto;
+}
+
+/* IE specific styles */
+
+#site_nav_global_primary ul {
+    margin-right: 0px;
+}
+
+.notice-options input.submit {
+    color:#FFFFFF;
+}
+
+.form_notice #notice_data-attach {
+    filter: alpha(opacity=0);
+}
+
+.form_notice .form_note + label {
+    background:transparent url(../../rebase/images/icons/icons-01.gif) no-repeat 0 -328px;
+}
+
+.form_notice #notice_data-geo_wrap label {
+   background:transparent url(../../rebase/images/icons/icons-01.gif) no-repeat 0 -1780px;
+}
+.form_notice #notice_data-geo_wrap label.checked {
+   background:transparent url(../../rebase/images/icons/icons-01.gif) no-repeat 0 -1846px;
+}
diff --git a/theme/neo/css/mp-screen.css b/theme/neo/css/mp-screen.css
new file mode 100644
index 0000000000..d3f95db9b6
--- /dev/null
+++ b/theme/neo/css/mp-screen.css
@@ -0,0 +1,204 @@
+/* mobile style */
+
+body {
+    background-image: none;
+    min-width: 0;
+}
+
+#wrap {
+    margin: 0;
+    padding: 0;
+    min-width:0;
+    max-width:100%;
+}
+
+#header {
+    width: 96%;
+    padding: 0 2%;
+    padding-top: 20px;
+}
+
+.user_in #header {
+    padding-top: 40px;
+}
+
+address {
+margin:1em 0 0 0;
+float:left;
+width:100%;
+}
+
+address img + .fn {
+display:block;
+margin-top:1em;
+    margin-right: 10px;
+clear: left;
+float:left;
+}
+
+#site_nav_global_primary {
+    margin:0;
+    width: 100%;
+    padding: 4px 0;
+    height: auto;
+    position:absolute;
+    top:0;
+    left:0;
+    font-size: 1em;
+	letter-spacing: 0em;
+    border-top: none;
+}
+
+#site_nav_global_primary li {
+    margin-left:0;
+    margin-right:0px;
+    float:left;
+    font-size:0.9em;
+    padding: 2px 4px;
+    line-height: 1em;
+    height: auto;
+}
+
+#site_nav_global_primary li a {
+    height: auto;
+}
+
+.form_notice {
+    float: left;
+    margin-left: 0px;
+    width: 300px;
+    padding: 4px;
+}
+
+#form_notice-direct.form_notice {
+    padding-top: 10px;
+}
+
+.form_notice textarea {
+    width: 210px;
+    height: 50px;
+    padding: 4px;
+}
+
+#notice_text-count {
+position:absolute;
+bottom:2px;
+    left: 175px;
+    font-size: 0.8em;
+z-index:9;
+}
+
+#form_notice-direct.form_notice #notice_text-count {
+    left: 0px;
+}
+
+/*input type=file no good in
+iPhone/iPod Touch, Android, Opera Mini Simulator
+*/
+.form_notice #notice_text-count + label,
+.form_notice label[for="notice_data-attach"] {
+display:none;
+}
+.form_notice #notice_data-attach {
+position:static;
+clear:both;
+width:65%;
+height:auto;
+display:block;
+z-index:9;
+padding:0;
+margin:0;
+background:none;
+opacity:1;
+}
+
+.form_notice #notice_action-submit {
+    text-align: center;
+    left: 230px;
+    top: 32px;
+    width: 70px;
+    font-size: 0.8em;
+}
+
+#form_notice-direct.form_notice #notice_action-submit {
+    top: 62px;
+}
+
+#site_nav_local_views {
+    height: auto;
+    font-size: 0.9em;
+    line-height: 2em;
+    margin-bottom: 0px;
+    padding-left: 4px;
+    background: none;
+}
+
+#site_nav_local_views li {
+    margin-right: 6px;
+}
+
+#site_nav_local_views a {
+    background-color: #7080aa;
+    -webkit-border-radius: 6px;
+    -moz-border-radius: 6px;
+    border-radius: 6px;
+    margin-right: 2px;
+    margin-bottom: 2px;
+}
+
+#core {
+    width: 100%;
+    margin: 0;
+}
+
+#content {
+    width: 96%;
+    padding: 10px 2%;
+    margin: 0;
+    min-height: auto;
+}
+
+#footer {
+    margin: 0;
+    padding: 10px 4px 4px 4px;
+}
+
+
+.form_settings fieldset {
+margin-bottom:7px;
+}
+
+.form_settings label {
+width:auto;
+display:block;
+float:none;
+    text-align: left;
+}
+
+.form_settings .form_data li {
+margin-bottom:7px;
+}
+
+.form_settings .form_data textarea,
+.form_settings .form_data select, 
+.form_settings .form_data input {
+margin-left:0;
+display:block;
+}
+.form_settings .form_data textarea {
+width:96.41%;
+}
+
+.form_settings .form_data label {
+float:none;
+}
+
+.form_settings .form_data p.form_guide {
+width:auto;
+margin-left:0;
+}
+
+#settings_design_color .form_data {
+ width: auto;
+ margin-right: 0;
+}
diff --git a/theme/neo/default-avatar-mini.png b/theme/neo/default-avatar-mini.png
new file mode 100644
index 0000000000000000000000000000000000000000..a3410e307ede7b70f4878fb83e7fd7c81353887e
GIT binary patch
literal 857
zcmV-f1E&0mP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00001b5ch_0Itp)
z=>Px&6G=otR7l5_mDz3^M-W9%_3Rw3q8!CbY~=rcB|v}xesCffGGZyT7A`~1a5zhs
zA1IDA;)1B38eP?Ot8U-wlD|G*skIhs!59z`j4{NWfb+8s$JW<x_taK#jPTosH=GT-
zjjgO|zWj4dQC7HRRX2v(0w~m$Vo{MSGtS3-`dy!sOOKn(se83me%vj%dr0?ezUMYR
zliMkqO}WKV<?7olMOgtLfBbo=0Al2Lf~t%LF>l84vopB7y4&upVjP3#I@EPdRa-;^
zwTc^e0vy-D$Tpjzs2cR$5)tM}MjS_ULi2bAq3^QJOT-AO%BCo{bUo%e9CQ$Ct%^Kl
zze;l!Ny`00(qyu$BJe#veHgXC|NeU0@&V|CK7&C_FZOVs2M6fJA>BA6@I7uOQ>yLD
zBO>H^L9#69_nscza~*a<@mz=TS+6CEqmO((?sM_Wi29kz#0blD-SX@AI;d5;ameo<
z$9sx9siN^&k8T_`rHcq@w%PNGqJVc7{nyLXF~VrnL+z8$)hf@5qN*()-wzMoU*|RM
zDF6|{bDe{--AU!*JZ{-0w=0&bM;e9G005374Mop^53Q?zrxaz?vY!M{RkC$)G~i3Q
z?!b4AXXJkXOlPaTE`Q0|_nUdEvbYn_?{^3T|1`jCk&@>H#xYOL7I-b6Ra%i|8;oO6
zRnCT8-oG8=`|fEK&E_fJukV}SyI->#hcEn=%~uge0dFrxO>h8LRa+eAdBOcOVKz@&
zU&XG1xD&LcxGA^1tJ3R5gkihU+%K2c1ise{ilV3}iV9WT<6c#XLT7&#2pD6UFT4ei
ztqZbs@uC5aOK~^(4hf>R`npa&)OhK-JghjYY&PXy&%6%62-DfBbru9(6Lh{<F<)eD
z01;`;RL2Ou=Mn`TaTL(&Mnr*!W43--mQz+w7vB9k1l@vHwdMN12Np?6S=Cr;k(<d>
zt+mv(f<WMV&D46y{lhF}xmx2mPHXT??p7qrtWlGQ(C>ysVSpq_qOYOJDolPPL{Y$K
j5VS#(tWln-qE`6{uAq@WFI4De00000NkvXXu0mjf*0Gv=

literal 0
HcmV?d00001

diff --git a/theme/neo/default-avatar-profile.png b/theme/neo/default-avatar-profile.png
new file mode 100644
index 0000000000000000000000000000000000000000..8f635d1aa657ecbab286f32ca274ba13f1f6c47c
GIT binary patch
literal 3737
zcmV;K4rcL*P)<h;3K|Lk000e1NJLTq003YB003YJ1^@s6;+S_h00001b5ch_0Itp)
z=>Px@Q%OWYRCwC$U1xI~xe<K;CTz|OqNF>WLzO@H|Njcx<+EMoa7iadar4gZWB~p!
zi{UOMiaVG<^6t8d#kvy*Gw9ddKnFC)U%&l9qC}EXLJEmy!^UvXM!m*LdCz#d!D8h?
zN(n;9<KHAD{`{w}P^(!7J#*+>C({+)f4Bvu6ofwh9TX)KAq0dHY`g%MH*<`qn^N9m
z7zS{tC`mvHi6DpyVZM~fi(@XZ-uUU9zxa$uo+%vw1p=iMLI}*48(ds3AVjh6=(cUp
z17|~M!l3JqbBOJSC?@8iFpRNWZ60NQ@)4*GfL+N00M`rg^TiZvH!f^wN&&`LCZSkw
zd`zaRTw0)>jbe_=>nUO`4%S3MNVNbEO45l&F~{}I9J7UA*!Znx?O;YKGjVw{M-*{w
z4IqR-N{Pi{jn&FM$owc`v|<2uKRQteiScBK$;>Te+|i(sFht0MHBw56?|!_#`=$&)
zsK1ROjt`fUgz@t5=S+h=4FIVGZlz^9a|&CWErX`^^-zuUgAm{T>!)-9eQ4M8IhssY
z_~*ZW-qWf>=ilu%pALXMJIH8ZAPk4y%#ut9LCgjI``snZFUF8kLI{zLp@c<^D}+E4
zas20h7kK~Sc2BDhB}NH4Eei&o2{D6VI&(k>!D!IX9;aDnFb#$%=GkpIBtA}-m@U@m
zv>WKO8)!CdP?E?g=N!)3!(!>e*?5pbf-<TlbVs8^P@W9{3WV`w3EMW&ZkpQTynQ{y
z4?lebXg0}Ie;adw>CC}ox=MCfi~<r6Qh<N}B%8U}CBX$6bt|18#WN#jFkD^FkWqm5
zoiYZrTXn6SjWRcsQBX?nB%C1qZ%XN&S<1qE+cxp`b^mVr{M-OglJ((Yl53o^(+()5
zxg0FDNbmmWlHdZS$?)}?!M^{(V-CT^r$5_8s0a^H2ZSi*IKQ0d8s}uxh2Y}Jg-Xg~
zt$6!-i2E3l%d4pbx!Y<<DG|p4eh?xEB192SkSEA31v*mG>o#z5)Ycy3{rL<*7=cpy
zWXzXR;;YxA&juoiOla?qg#_X#Mi|8i!x)|yVB;n~_dVJwCh+Q{ue~S>0sQZW8&F0o
z6`thXNm%0b*$}P9=l45A9$;gln1jb08#lmo=3wQxl>s58gk>6d_jaH?#$@JVI&-wP
zjJn?}xInFD;mz3q#uq|VUj*QOkV;C4DB=jh2;=R384{&VOnpPY+sx%3eE)s|Aw(qt
zBZWl2*TnIt_4s-x4_sw;!H`md3klB)@czRsf*>jl1oe4&wZPd#xV)Mklqku=c*YoB
zo%YeJ9~PNC7=VX>2*Vhc*Hg^q>(We;dS|y?KS-(`qVIkh7nc3HFCbD#wA*!@opiGK
zEIM06H3>opY}>@Uua41Z)Npk(D|~{x6Lq~X*BJe7GYNMvQW)bYrD!&6ygJs~sb$uH
zFKNVd=HTLLk|ZTG0#rrX*3VH83cNobXWmXrA@?Gzgb+{yblMFZ4V$^<l{*%+s}aLN
z8$t+NUQfY=EL0m*u*~x#?J;bNqEWZty5YfEAmttNDWxzNMX%RFuWc1FFQYK#Y?*yD
z>LTU>A8+TygFp$wD2B6+&~EAZ1vNVX;Na>BA;AoWx@}@KY{RyS-E0&V4c!Id)kz;h
z2#hC7a8X<+gAfA21zgY92cTvhEct{G)axdO!!8=Na&~!zhNE{uI6ED{^8&2ae&Gvq
z9y4Sx3TCjh8sbZf>!8=dpjRu^ZzvqrT@X%B1~9h%K~X_HLJ5K(g0s;B!894z1Af3R
z^UqFtr8B=20CquWHES3S+J#EL8q0NkO$|u2;Gx7l0m0XAhG^8Q$yJpe963Gip>CUn
z`v!S@0?Iy3+)F7zDaG&K9l<oJ3)+<ifYJiS7*0<5h2|9qB?!Y9Q7m(5(S7Fs;oS&T
zN3BbJotkLB+k|Brg(r9XK(DfH*Zioh<{#dT@Dx-!-n&j((ZB{lr2S2*KvxQh-@QA=
zQ&A<=(Eu<Sc9IDfs0CpZ>jSX;-Rm|gwfU6;pvW=}^tz41%LWetAk+hZZ(}>mV7bzr
zFA4wv=yhAgY1Y;s$Vv)-DWA^nm*xo{8U~O;=1z(bLLj6-5Q<FknJ5y7VvdueeyMYf
zVu>K+h~p%$9z`567hsgYvJ9A}3B#aI006<k#j}S{%q8qh>jvMZIPF5`wsZo_7aRC~
z_^HoB0LVmZrI6ToL0Uy!830mBFiK!sruO3bS(73JfWr@F#IeBfs8hgvfcetL%5nFY
z{#eTMei*zm0F-0as9Olas1VOsMMtv`V@XwV9@BF3ae<8+9L)4*vjzZwX_|*0raMFu
zGY+Q9{Fnpd>0L=qQFTVosybS0OUcVEos<%o%r;m$9(c?PFFdFmfTF_@LX=ng>1-lQ
zrYnSD3_?jMr8kuWP$t8Qq}js9Y_SICywt+8r_q1{x1nVe-Clomuy*}4O8Sd&#LCbB
zR&bTu`Q;qm*2Au%n72|t07w!kMNLe~q++2cdVfAkeUz#ysVj>G5ke4zk#+#>K?y3z
zK3`lfDrbJ>CTP9(3!7ki*xAgl0h5_qsAfJp08~=OS$l;pz{w(<?|IMXm@hY_%=y^>
zpu!LjokZ7`9@9YHHMq!v;`>ZjHKb~6#Rv7b5~O?p)Z|<*Ec6_KloB;7-{*h0m=#jF
zx660}0@GwL7)8BqqfxhDm<BA<fWatYF2FfQ918?tR6YO-{hN=oVh=`0z_#@db32;|
zVVu8;TP5`=qo~^^+U+_z?FQPd`a$CwRY<?@hgdpZ5`-hgjhzR8#bON}=ks#ap~hyz
zMyJ!ju;1RRJ>Bg!@zC>?tO3^_=Lr~;6bh`ZX@XYk5dJp4lh^Ew1|1xYx@b1+PniCg
z1`tx>8jwnV5Mt%Hg>UgplWCWVFP9q#A+*B`f(tN%;q<tNqfvLS{x$17jWU@J0GC(A
zAJ&jk!nX9x&vF&O3-l90f(sZ1#oIR{40^3kj%+<EPx$I)hULmDmiZzns%kX!Dwo$A
zKPd{(_#PEVd~-I!u;1Qe{<8^1s1I7MHki(w%o(f4w^e{)P_&xaGg~o7BK=ff`p-@W
z81!48?DC!k0E+ox6yxT$oY;yoKRVTHt`~x9_Q4TcU^r-FH0-2nM-j;-S~T;cnB)9>
zjP=GZh532*|7ov_jNhd40;6FEmT71&xTOJ*N`4sQ!}%@dt8%*I0?Pd8*?-Rqw9Jnb
z5~D#2^}1b{>B+qd+LZw1Y<;+#V6}3~Yg-^BEZfxTKkfM(VHju5AE-u4y<Q8Z!3sa`
zrVYSuy8_n>ad9<)<9Oxvj39ue>3r?h@nofTtDZ`K(f*8~EA>E9oxE7Cad|V(?baVc
zj4|!)XAnkupaZDaZJ0(mUEhr?jNffL>~4JAj2EfNsiGH;!KilQrYO?e{n)mNM%^lO
z;e8Z<`!7-sM-W5^!U)Ud29x<Zb;+xuJPG(X7MT}dDJ3k+NOxUjWXz1m?0Xo-2*L>K
zjgR#vDMnS5zEyRgDq`osInTZWl1YE(EM3_%1K_N^y@_$o5k(wf6eErWq9{s}DZpLt
z{VFMqFzR}+GAV~Kn4tx_QD$M*`Neoox^^=*dmlo{lO(P8oEFXKWe{-fZ#Rr`oBbK-
zfoF23c1p^hn&A&=LiQMtcy@D10jS!J>)L+RP_}9+yOj0$bAQJK=Gi^zY7gfeob%rR
z$YX+74lU<GmU;%^MFF5&LZS@-x$7YO8vt8#;Q86jfx)2Fh@21tFNoj=;coz_{k-q%
zF+(Sarxt(D3-&77ew~XjArL~q*Q~Ct*_L*jgpC_$1OJQC07A(2`aul<YI>(52~941
zTkTYK7pVm=3IHJKkg{}qEdW#*VOG!~f%)7iMGIb>21p^{y4e}gtTPy<p;a2Gv|#tP
z)}plF#c2ScNwu9$aYM6VYpnw+jBz_&+})i}5C|_003b=OsM9uCNG0=i7)KdRJH;zg
z^lYjksy0I)z*?hiWxHv@woUEb5M>mumlPi;=Pa)lRMInU_opZjTrY&{3oSF0_ubCg
z!;e4Rq>27K^D4YDPKYFG$zzT<ij%_&G`ajt{r}zTvUD$7lR{!XcQQXa>^EWCrgmgi
znVpRn;K%njSS;3BH?gK(dM<`<d#@>#CWN5XsBKS(d^vf(T8CI~d~DnxWk!}9gxZ;S
zek)U*5T(glkmovcCG}wx<L8Sp7AqHLr-Rhn&N43f>$g8h9Z6Te8Dr?S>lpT%xlSxz
z-#Ty{FFnX{$OP2YfI4@}s6*MgjwfvekPre!lh*wwN8P;~@<U*xl_r1r`}guOb-Vwd
z!6-WIMy^|p9-{d&z-+z(=Lryx9rF=f;Ox~PbGgc5<zqZ`9vwfcP%=u;Zq?E2w$Sa=
zVHjU-SWEu)k01B`mF$$0C&z%y?P)&~HM_bJ6xSD+Ocsb@4k5oRNsJQw{@qdLcU;~q
zwF`D1wGP{Zdo{~|VHz+E2Fo%acoNTw;~2glgREAo>Mx7TNEcTN1Ywls1MV|RaDn5a
zo>n8iGW$d9f}tAs?KbdxF@C_CvmTB|Jy@oZhKTph=2C*&$wF)FqfxiCmNcKc8dv>J
z|LvtXVC`12*baIvSeCKZ23ZBne!j?l`)ae!_Re}$O)t(99`@__=Bpw4y=LNDY_Hv=
zjKcRr%of=_<Uy~7UZ<fIE&Wx-f&k!n)WX?G54L5dUN&VE<LOc>P<J$JqTg*+euwgl
z1pojV_2hoZPP>sZju3*2tC=>a{a&;1F7Lls02IACZsY89kcKG2D8|irtqsEQQLi!(
zeh~lwNu=|S-y9{GFCpQqJ?)#8`du4muLkKBw@ms!_PR=bCbCvD00000NkvXXu0mjf
D=79U5

literal 0
HcmV?d00001

diff --git a/theme/neo/default-avatar-stream.png b/theme/neo/default-avatar-stream.png
new file mode 100644
index 0000000000000000000000000000000000000000..a3024639f481200223f0640450f65d4d3ffae513
GIT binary patch
literal 1791
zcmV<b1_1eqP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00001b5ch_0Itp)
z=>Px*xk*GpRA}C{T3K`3I1>H<9-=Pluxux>9VgkTo&Wzkre<rV_F*@h$u)7}LnlS?
zCei!AP}V_0pc3OnC8-<iue;F~$bSFxJwb615l9dWL&M9<5p+$BPZ03_(|B*MhH2pH
z;siar4I%<#tn#^@AK^c5zd+k~C=r39#$t?tYaD4N@c!dHW{XgXkF%VYXj@ltlEQU^
z_1?SxZ+@T7+&zFKY692<!Z^cZy2Q7;r4moeGWYf%A}p3Z<_mBA+os^fcW3EgGFxr|
zC}@rXu-=>jD?h}|?cyN)^K-j&k0?rTdpE^&<|2;MEy1HG!Ts35-#3%|cfM@_)6}8k
z2Uej)KZx=5&cVgAo`e=?HVgz&vZYDJ8T=r|&9@0UZ41q21G>hMq#436#=`LdhJEc5
zFdTHie*4!u+SKT#2I?Gc0O;E-oQ*nC+P8n*uU)V#K<u6e#@U|mBnaJZ6EDtfaNBOd
zwp(bo8fcgXND#6#%L$3p-3fr>25{U+N_#TwmhM{w2*z_oGXDL0iSVtai5K5pk_ACT
zU;qfn1R={Z_(6<?v%+c>?rGqVC3KDB)zt`Ga=QNdG=UJJmZdj^zq%Ma0;dvn2qBOp
z89YD2-Te%H5Gw-_nZTgmmby|9X88PNycN?AxhDV&`yGsit!>L~0@zI^M1&;C@bz|z
zx#LNb&F%x=T%So3-G|Q;q*=8UND#pC&rZj}^Rr&5RZA_f8;1el%hxf+Q&$Ou$OP<e
z3(wEHl{5<{#QoR-*LbD7^m=VPJCz3oUYV$NGUL_7DF(fEX~x{+=M3&Dkka&f7K9L`
zf)58B{QArJLE#T3vfa%1`uZGA%Q$F(0;KCDQaatx*U^rMU>Z99`HwS<1}){o&Fdtr
z!V(}TSz)nQNoh>uF^@J(1Fx=zwUeoGDN%svv@Hz!Z6zK*h~*a0c^(=q6W5o6qpE@0
z)hGa*j(U3`t_rZsP-!Y)7#c2L^p7rQY8P{b6&j|Y1bF2q(!E9}_K%cf#}{*Uw}tW4
zIY<{p3A*iau$E=Q?wD##kpQANLz)SsNeV%^3)TiuxKY!}>n5f#DQ%WzQYA>i#{w%a
zg71g$gSa#Y9c=;ARA6O!eO2A$lzVWJ5~gzxOV`hp#PjNvGyd~jNOg%!)S{ovd@PoJ
z&c{%isecN9x}~<tx_xjTGdNS@JsLn5rH3CtP^vfq;OngeFNkV`){oIVV+<?TUw3ea
z`h!F3VX{&ZzRc=JM<LgXl;|4`dA@Mm2#cj(Dg36;BnYOd!?H|hoFPfG<6LMub0J75
zS*zWY19%uO4{Dw<hSAW*$*_x7)7%QD`Z4bFFkUE`n=vMBEhjTSZ!I~KX8qUK=P<ul
zu0^R|%Y`->r!#kNG*TJooAN9>TdYc3)xvFt{SIDVpO<!v%C*oYV;JW18<h~6w}LIH
z?~|ZP;k%tCUcEe%3V#s5CSx3@`1JP!(p1g&0btN;RMNO^Q0Y3Hb6j7Zt}9xZwYf}y
zf-wjpeE4*ihdRXsV_9<d@%*ULa%UqOhM_6t1ie7GiM04k(hN)2$Nj?`L6|5f84`qU
zr&;-blIAVsZf#S@(6ig%T&>dAcZDV*L{S1ih~X?f%pDIR6SW6iG7HGEc+)c0t)|KZ
zL@(y<MEO)MPErJ6f|VB{OSAQeuWpTGnOxc<R9Vh6_4V0Ms)cU8O&(jkOgs))YYJXA
zjjmc*mPrqAt&S|+DR+NF=*?a@6Odm)5lU+*S^rQ9xJXdD8SY0xgi%`gzou#B6KbAc
zcoaQ^O1|NEg2fm^7{*5xcwrbLPEzGF@H7B8!^*3^0PMDn$~%H}u_)9!xhDZoXfmzt
z=b`D<ZZw^{2*O0^lI6)<h%vUleJmaB+O2iOD_b8w->=8-G7txAAr&o@(J?Lua589@
z?p=V7;sozM+#)G4W5Gj2c_|_7z6j7X21D1-?KELo26UYx4D+Ptc>$6%LngLCFvcK+
zz;qtqWY8>$_rRdve!PX;$qS4zctM2!{_h4aFGuKhntRcbF$VU>zdulw3z&uu+is!L
zI@~raoDhzigV{WQBnZF$a$d>z?&J92YX-$-$FSc)yVclAcI;t1Cjbz{VCoE<%e$z<
z(~1n!`3k-tgFx#ET-9a8auwt5LEho5UFQ3c%QW=$)Q>HfOL~ffyj;bYFFZtX0uqEb
zug+lT<pSQ1T{s)>Ow^f5JQ;vuji(+KOCK6%cym4a>2o2DCtjx~Z9F^egE1z3G34TT
h51qDEYw8C8{|Awj`>|Veoaq1n002ovPDHLkV1i2$S&jez

literal 0
HcmV?d00001

diff --git a/theme/neo/images/bg.png b/theme/neo/images/bg.png
new file mode 100644
index 0000000000000000000000000000000000000000..df665bd7274c7cc30c20d33c5cba5dcf4366c258
GIT binary patch
literal 207
zcmeAS@N?(olHy`uVBq!ia0vp^AT~b-6Oas=domJ8NtU=qlmzFem6RtIr7}3C<R_&n
zc;+Uirv{}arc@T5Otk?jD)e-545_$P5)jRIK!InI%lrBzsrJ@WZ<$`(`AZ{SMIq$H
zuK5=x1Su&!-Fj`#W`P#|rBe=GG&uR`kX2I8<TZ?Ea%63fti2$xo@w#32*&E?aUk6I
zRNb5Po8}tkNsn1OSZ<chJY@A??cdYKw~DT3U}ktX!#9PKQPl@%IfJLGpUXO@geCwE
CyG|Pb

literal 0
HcmV?d00001

diff --git a/theme/neo/logo.png b/theme/neo/logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..61a445a61a952eb71507419aa052774c96603c72
GIT binary patch
literal 1633
zcmV-n2A=teP)<h;3K|Lk000e1NJLTq006xJ000;W1^@s6uLk^W0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU&14%?dRCwC#T-|NsI1pwG;a*q3z1@?p
zg2)xbt{_SUkt;}CL6Qn=S74_COBF<0L6i!jeYv*-^n6%gmt&0fcm#(cDbkjJ8-Q?N
zNz@GI<NR@)h$-mzKdy8Bamz=hxZLtl@lo<o{QcKQi_a|h#~T|+e7-9MKfuRP`nu-#
z&I$g1u;H}i^H-YrDt>*bcsI2U%KL?9?)iYvMD;Al%g2t-(J+t1-@V}<sp8U_4|rFO
zyvg?fKd*coIt&=TufrC|8Y||kbaML8?M#|5<>Qn8xhDY6kkJh9`9wg5rd!2#z-z)L
zOq~Cik0Wl9oB%vSfIQ-QZ{RtPY@|59YP|D7ZHg4Hy#sCxWR<ZM6LWTQK8ITOnaC6_
zz73Fo@grJ`V8B2?s3@N@;BmcejmD!7k7__0LoC2OZ#n~n*8SZQTTlGCeK61q3UIL?
zExNf-qyxqMgbn?ku%ISXj!c#q<xyIA>Y4%NA%H&<ET${qA@;2UE~pOJiHU0+p_NY@
zEPO{0LqCsDtOcQqp`gt%=kZ37CT8vuiybC3-HyJ+O(FvxK9>Y&b0Sfy4ZzVS@B<$!
zISJLopeh;H#P^{n*BFr<CUasw(-|cI{7UuUKY0|Jc#hu=-z!UAyP^f~cGDA5X5zYG
zSVQr&6%$sxcS9Io_<pX@ErqdzDhi2&M2V_k$eDS;8H9;i(Zb_>6;YW`Zm6z0;uzY9
z_pGD}kctn|TN&`-n<!@1oR@<PI?nqGD3xE^_9UbxvHq0>pKIxz2hPh5<8u|=7!)8>
z^McM`?wSa*Aqh?aZ-j0sjD1txKhp@@P^BoCC~!z)6SK!>sv!A}ft71ctasZ3_z+a9
z-idne<puM^jKI~Fkh4bX>}mk*sy9TuyuVag5aYwt<K`F>QFZOjh&FIJFp;KoS2(`+
z+ILJ}6HMlqNObprvc94fC;~6~y(Z6)dCkDG*c_5vm_7*01#%s6y<3#E!8I=?B%coS
zsbdX3_6_>dz^bNV{LdK&1-t}wyVPm$iijyQjcXhmfx&n(Q1U`BKHzn?xaLy;KLyf-
zL2<%n6FG-BTaC-r3AG7PM@1K}3abi?``RgoI4FZl@_ag&@_ZsY^*qQ8^k_Mj4!~zD
zKpj<+^_QBsa51sAggfR|7EKMj#Q$Uv-khut2hAK8G`F1R!O?QrWc{s>N0bDQnMq|~
zB-S1b%pBv}duDe;4;FttQOq@rs8XFB^r(miW9AiFZx~<Dx+F~B5alzLSGlrU@F=Zj
z^KGYu06blN7OGVVRw@!*91Cl4f%63$qIC3n=@aEhql`+n-b9P9*LX`4+L$CjNq2~G
z!Rkcp2>x0QcQ9O|ngGWh%27JFzBFTzrD6&^H4D=3GO#B_OlZ#m`k1h`)TaIFun`(O
z{eJ2LJ+>EIO#t*zUQYUc7ZB2uiLJ$;MCgrv?1{HSHhB3sn8^e1MV(1(#N-**E;j`M
z9{%lnsxdd3*m&$Y3$<>?o>pY22)>1CEsg{*zagOE@ZbR%{w64E!RWG}F9rB0JD%DS
zJRhEwj6O{I)b#a;@olA0Y%W+oxc(vBm$H9<VPs=T$3(hy0|R?N57-J`QY=@W4o0aa
zJ7>^KfEQioqX$c96WUO12dzfIl;^qi!INOMpc(3EKpedj50oUpcXDJnOv;hXnerAN
z>-IqCC`OF+;mkYmBL(1Hvh<gLR=%JFMi==>EY#Zb$>kk$`=L!GRx9vVW<x`;DU~Z%
z%>4&SzdVD_Hj~*vH`(>n`(P&1xJWY5(<MxvtycGY0UKElxLHK{U~Y$izvetc-_xbn
zO%CIhJ`LCmt>~RYT;4G=*v(@7T@^aC1`2)+m>;MV_$PWcof0Zso0Y6A?3Z6M`@_6b
z-;wY5_Kd)vTgu$^cFleF8b!zy0ILxGJwr->utCO43u|*Agsr7{mxSOZ^Vg=E)bSm1
zRRY45XJNA@0@$0ra$INq@cAxTO*I>+WS0MG!_s)!7AIN*ovOU@QYcH`u>UsI4e2VS
fFs78@rvL*0?F*Xy<Y62900000NkvXXu0mjfTnPt3

literal 0
HcmV?d00001

diff --git a/theme/neo/mobilelogo.png b/theme/neo/mobilelogo.png
new file mode 100644
index 0000000000000000000000000000000000000000..781e79578c6a63ece890aa9089c8dd1afd58f308
GIT binary patch
literal 9357
zcmeHNX>43a9iMr->$96UX)cn~alCfiB*y1DNoi4(5LApr300vLA4<g`RSHysexWT8
z2^B?12n3W0q<#P)HME6r2*d{t1ywC>V#jMIZc6R7<H&LB)JJ?DyYD@Izj<%ozTLIg
zrfJd$b<*dVH}gM!|6~3$Z`JP~ec=9Z(bgg%M7a4AM;=69$EP3<e;+m$PN0)dK6w9O
zaq8UmVIj&y^N~XjJsy&E746+v`=EW`fgACFyb<Ob;ce@PH-rDPc#hh(JtU><#rU@v
z|0-HnVXs#9EjOSw)&s2abpSj7ur^=(U@>K4D$-aR>G#hsH#U}AxLNZ67lZ62!DF5V
z1z<!R5!$#K47bz(c>hZPS3_U`syrXQqfo3}QzQ&S3I@alO<XUz<D6YE=jwaB2+Yqw
zByc)FKfHT~$jeJXc&mFr%*-xm;|{Gxy|#Eo+6%3Hg$p6`7<BIu(!N^?dEK_Hm}MA$
z-&Yg)=ZXSAfV5DX69$M~k*$K>_qT<`gt&0=G7X@WT>1(&^b3BP%yG*6%oX?jT&(A5
zOUOqTq*+DBNeRJpAbKf{=742C)fS7-V(PT8<Ts=B<>!|Yh4cyQc>>JO4=IptCaI<T
zJkBw_RElwKMSRQdfws>0L3nJ&lJa{HxC<hcVD|ja{ew=u7r~xS3d8Dbi}n1pwWBZH
zwV;M4r(Ca+Sy&d_LSDCV%``3js(WtuoNY-1&UW<tKv?!^2rY6|q%<ujPT3(Dq_0Zb
zTJnwpz+GU6SX=b<4=YI=v(cEb@hR6yiip#1@K3ImWk72z{=9*^lS&kyhjIz=t$_pi
zEA4GatMQhu-u1pUB0q@-Sf!YqTNH1;Js?KMro{NfjOgjRDlT6c(NQ7MNt^|ab$%fk
z<226#{4vOW4oa3fU<d%^&Je+1K-iWo786NT{s<_uQ8VH(kPv41fx4=MUPoG9hMeuR
zg7TaIa6c&-TJI><s*rZ0ns2$@+azb+=wBmb;yLCvg=+>XVO&E1T~@kDtO@hl>of~S
z3=EEl5qObwJ~p*Yz_~pr13v`y*EA34z6iR%;a!1sG&xm=da-^DT?F8#HBYYI1KQfr
z(<W`%;B3$o3xToZ-BDbS2G9>UnKV`TGqX3QvOYAoP+WV@o>?swQJBP7RVBz#hM=3r
z+!yft4&Y5qyHc<AKuc$D393jv)7Q^Hko0<Hy(SI3<dHI^YWD6BP8m#zphqb(QI!94
zkJuSJOWAzT#?Z6g7vg#Oe*sTsWkATbzRm=|yN8OxH*Q!f?pznnN)Iw-Htvn8immA$
zAdz!$968e&4`?39KIJUQE&$$uC+A_M`IhRH0SMx^lpY@i^SgB0hE;(l8x0PHf+CDm
z%V=<lTxVd}H$R2gn5Z(<zPWcb47Ob8EtW~kU_=oEF9PdIij_bn!D^aH76{pdsKqZ0
zscPlpE0C65g7+cLfp#0Zk8td7ZL!|%QkWmJq)`T~37kcj5;E|o19dx>-O#~2(=4%&
zNq+DYT3nRnNx!Zo$25X`up_O}1vq2*jjmf5-v5_=IolaO3=jSSKCG~9V4*j;h#P81
zn7Bjrylz|KiD-RAo959y_>2JWHJOdq+jrHLVS@_qEbxQJ9qCno_y^(=A*%{Fz3F*W
z3A{%dvbD9n=cP<cFxQ$;m$QtO`2|m3#!Bwj1@dJX0goENWF{w0>+=A5pX=}}t`xmG
zA8cue&*89rH8qbQHP%*6P$4&=zl~pCHtqamS>uVxSwub^3yK7SJU{0rMq0drD~H;|
zFhVg918=D%Ym3!KP9BN^iwPTPP$?nFz7Iw`t7W-&A^T<D{#9#9+zf}VU034_+cfWz
z{rJSR3cp?iC=>^K#0Ufz^c>O#8(Mxw>m+cRP+7iJ?5(;>l<(LqB4t}d_3lzpUbacC
zDH_I>sU^iT7vF4CRZSUy3h|wE|8xIHac#sgAhX13AiAe;w(j1mVsSAmQ?MuHa6?Un
zmy^KyOK^DSf(8ESyGwCRDNM@*%3WU)R)+BUoocq2UM%@F-<@+H6zGO+BY01<Batx0
z`HTI6(O9Zcf$|KD9UK}LlT)+sPI~%~4-R-y^S8HO&O;u2THWL@N&a2%JkJm|KffM_
zf<aMs*Cx+6rV@aEw5>fJPzFS+%XttS2l_Pa6hM!5Ug#IoGjr-AL}_vVaGjg>t?nyg
zaCj_Dxu&B%rYT?1@1|VbsZz&97XSoaRcJ`A7WQ2tArd0&ur%y|cN=Y}t9Txp<1zR&
z3fZ0^98&n(@vBOHQDMH?XbkD()SO!5dgjLUz`))68Y11^yAbPH<&_bbqyg0CQ|Tj3
z4f7Ep+NhC1LILsu7Z`sFCY#k3NzWutI0eki&Z{q{>-Y%Kd6`o=YR79one{s);TO;E
ziq*6v_kbq_9Q*+co=Y<zT3t1YT~Uj3!K9ZmoAwj|>nD>Y>m6e94-OsB^OkM#zOP@^
zcQ75J-0RJz4;W#la*9huVj5?ynPvdl8fzk*W-z%K6?cY=up`@&bon{ooMf?&Ya%Ns
z2OWuySXQ9keq51Yl+vdO-JWwa_{!j@FB8Zs$3@V{Hh_Hl7zrUag71WrtV)@q(G~3P
zpacJ0OPv?J%nKrBMAO+=w{q70>WZY4xV~d=un`;&zjsD(o+{#$8V!B`;3rW;bORZU
zeX?P1xhqAlEYY8d{bwz{f*(gIJOp)35FZ9V4iSYJQvw$(*@C3{x3tVIGhmDumc1Ku
z2eI~LP$8PQ%t_-LO||7eqKdBgJ92J%0vki-<5gM0pHz4PZ@hDjC@ggDef;nr#$n0|
z$nOoODYN>bwUG$l6|=i?Q##ytj^WC10*b;2#TI<LsNYl0b;gh4n(%vgoi0~62#t+t
z#ilD8BjYqW4P$9FMQbZt6^*-c)4ImG$j^io*o?x^f*kpaR@6`v`2&D`8=#3!Atq2h
z0eG8_ekTv;fS%y(hctN3YtuNs>8-UR{uH*vhZ<`up3uthfzMy8UjSGy5_-++9mj*h
zezdW!LR}&B+ATGJO3%jP_u_7SrKx`BB@F^bJc98_JXuE2^9+n_$<IgYBcw@dx7+|~
zKOOHaD4tGOO|?~v8Vzo!4`cirJOJz^y;_D<pTeg7v!?a;?~4I`0RAz)5gtL+KM7E7
zBy3bKd9<k}@<%_Ne|%dRKwyYOKLSw7(*wqIN9!WH{D3pZy0~V}zi;nJL+&SZr{Gvj
ztDMcdjpn3U^<v=oHqZv|<^Kz?YNllggO+s-g>nG3a;&kwvVB=Xcj2~+MzpRHTR^nn
zUiR0Oz;pdQj>c+Ku1te{@FMEJSFLh!+?ECeE%SWR2(Iea>f6$Q`Nb{q#hHOzj{pBz
Z`|)dg_CLLlRA)x>#~(Oy>hNRV{V%a^K%f8s

literal 0
HcmV?d00001

diff --git a/theme/neo/theme.ini b/theme/neo/theme.ini
new file mode 100644
index 0000000000..0209008d40
--- /dev/null
+++ b/theme/neo/theme.ini
@@ -0,0 +1 @@
+include=rebase

From 4c0a746831c4c96d4d7ae827d491d5a00993a4bb Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Mon, 7 Mar 2011 15:00:43 -0500
Subject: [PATCH 437/655] neo is the default

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

diff --git a/lib/default.php b/lib/default.php
index 38903730f5..e6caf0301a 100644
--- a/lib/default.php
+++ b/lib/default.php
@@ -33,7 +33,7 @@ $default =
               'nickname' => 'statusnet',
               'wildcard' => null,
               'server' => $_server,
-              'theme' => 'cleaner',
+              'theme' => 'neo',
               'path' => $_path,
               'logfile' => null,
               'logo' => null,

From b7a8863b27235374fcc1f576eb49a418709c8262 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Mon, 7 Mar 2011 15:06:21 -0500
Subject: [PATCH 438/655] lost a </div> in input_forms

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

diff --git a/lib/action.php b/lib/action.php
index e7c55ef10c..28b0fdbacf 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -635,6 +635,8 @@ class Action extends HTMLOutputter // lawsuit
                 $this->elementEnd('div');
             }
         }
+
+        $this->elementEnd('div');
     }
 
     /**

From 985ff9243159a8cf69c4440216c3ae6d2d0992e5 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Mon, 7 Mar 2011 12:10:34 -0800
Subject: [PATCH 439/655] Fix bad reference

---
 lib/personalgroupnav.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/personalgroupnav.php b/lib/personalgroupnav.php
index 9d78857c6d..3d6bb98fc0 100644
--- a/lib/personalgroupnav.php
+++ b/lib/personalgroupnav.php
@@ -70,23 +70,23 @@ class PersonalGroupNav extends Menu
                                                                $nickname)),
                                  _('Home'),
                                  sprintf(_('%s and friends'), $name),
-                                 $action == 'all', 'nav_timeline_personal');
+                                 $this->action == 'all', 'nav_timeline_personal');
             $this->out->menuItem(common_local_url('showstream', array('nickname' =>
                                                                       $nickname)),
                                  _('Profile'),
                                  _('Your profile'),
-                                 $action == 'showstream',
+                                 $this->action == 'showstream',
                                  'nav_profile');
             $this->out->menuItem(common_local_url('replies', array('nickname' =>
                                                                    $nickname)),
                                  _('Replies'),
                                  sprintf(_('Replies to %s'), $name),
-                                 $action == 'replies', 'nav_timeline_replies');
+                                 $this->action == 'replies', 'nav_timeline_replies');
             $this->out->menuItem(common_local_url('showfavorites', array('nickname' =>
                                                                          $nickname)),
                                  _('Favorites'),
                                  sprintf(_('%s\'s favorite notices'), ($user_profile) ? $name : _('User')),
-                                 $action == 'showfavorites', 'nav_timeline_favorites');
+                                 $this->action == 'showfavorites', 'nav_timeline_favorites');
 
             $cur = common_current_user();
 
@@ -97,7 +97,7 @@ class PersonalGroupNav extends Menu
                                                                      $nickname)),
                                      _('Messages'),
                                      _('Your incoming messages'),
-                                     $action == 'inbox');
+                                     $this->action == 'inbox');
             }
 
             Event::handle('EndPersonalGroupNav', array($this));

From 884c3d06d243b961ef5e7d7d47ceac78996918e6 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Mon, 7 Mar 2011 15:11:38 -0500
Subject: [PATCH 440/655] mailboxes were wrongly overriding global menu

---
 lib/mailbox.php | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/lib/mailbox.php b/lib/mailbox.php
index cb56eb5904..e9e4f78c6b 100644
--- a/lib/mailbox.php
+++ b/lib/mailbox.php
@@ -92,12 +92,6 @@ class MailboxAction extends CurrentUserDesignAction
         $this->showPage();
     }
 
-    function showLocalNav()
-    {
-        $nav = new PersonalGroupNav($this);
-        $nav->show();
-    }
-
     function showNoticeForm()
     {
         $message_form = new MessageForm($this);

From 0c2289fb2fb6c1b1639dba8cc76cd06b882cc2f9 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Mon, 7 Mar 2011 12:18:46 -0800
Subject: [PATCH 441/655] Avoid AJAX fetch delay for inline replies when
 possible; we clone a copy of the notice form skeleton at initialization, then
 insert it in place instead of fetching a new one.

---
 js/util.js     | 28 +++++++++++++++++++++++-----
 js/util.min.js |  2 +-
 2 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/js/util.js b/js/util.js
index 2100521869..fc03bc75fe 100644
--- a/js/util.js
+++ b/js/util.js
@@ -31,7 +31,8 @@ var SN = { // StatusNet
             CounterBlackout: false,
             MaxLength: 140,
             PatternUsername: /^[0-9a-zA-Z\-_.]*$/,
-            HTTP20x30x: [200, 201, 202, 203, 204, 205, 206, 300, 301, 302, 303, 304, 305, 306, 307]
+            HTTP20x30x: [200, 201, 202, 203, 204, 205, 206, 300, 301, 302, 303, 304, 305, 306, 307],
+            NoticeFormMaster: null // to be cloned from the one at top
         },
 
         /**
@@ -600,10 +601,10 @@ var SN = { // StatusNet
                 // Create the reply form entry at the end
                 var replyItem = $('li.notice-reply', list);
                 if (replyItem.length == 0) {
-                    var url = $('#form_notice').attr('action');
                     replyItem = $('<li class="notice-reply"></li>');
-                    $.get(url, {ajax: 1}, function(data, textStatus, xhr) {
-                        var formEl = document._importNode($('form', data)[0], true);
+
+                    var intermediateStep = function(formMaster) {
+                        var formEl = document._importNode(formMaster, true);
                         replyItem.append(formEl);
                         list.append(replyItem);
 
@@ -614,7 +615,20 @@ var SN = { // StatusNet
                         SN.U.NoticeDataAttach(form);
 
                         nextStep();
-                    });
+                    };
+                    if (SN.C.I.NoticeFormMaster) {
+                        // We've already saved a master copy of the form.
+                        // Clone it in!
+                        intermediateStep(SN.C.I.NoticeFormMaster);
+                    } else {
+                        // Fetch a fresh copy of the notice form over AJAX.
+                        // Warning: this can have a delay, which looks bad.
+                        // @fixme this fallback may or may not work
+                        var url = $('#form_notice').attr('action');
+                        $.get(url, {ajax: 1}, function(data, textStatus, xhr) {
+                            intermediateStep($('form', data)[0]);
+                        });
+                    }
                 }
             }
         },
@@ -1313,6 +1327,10 @@ var SN = { // StatusNet
          */
         Notices: function() {
             if ($('body.user_in').length > 0) {
+                var masterForm = $('.form_notice:first');
+                if (masterForm.length > 0) {
+                    SN.C.I.NoticeFormMaster = document._importNode(masterForm[0], true);
+                }
                 SN.U.NoticeFavor();
                 SN.U.NoticeRepeat();
                 SN.U.NoticeReply();
diff --git a/js/util.min.js b/js/util.min.js
index cfbd66d662..af8b2200e9 100644
--- a/js/util.min.js
+++ b/js/util.min.js
@@ -1 +1 @@
-var SN={C:{I:{CounterBlackout:false,MaxLength:140,PatternUsername:/^[0-9a-zA-Z\-_.]*$/,HTTP20x30x:[200,201,202,203,204,205,206,300,301,302,303,304,305,306,307]},S:{Disabled:"disabled",Warning:"warning",Error:"error",Success:"success",Processing:"processing",CommandResult:"command_result",FormNotice:"form_notice",NoticeDataGeo:"notice_data-geo",NoticeDataGeoCookie:"NoticeDataGeo",NoticeDataGeoSelected:"notice_data-geo_selected",StatusNetInstance:"StatusNetInstance"}},messages:{},msg:function(a){if(typeof SN.messages[a]=="undefined"){return"["+a+"]"}else{return SN.messages[a]}},U:{FormNoticeEnhancements:function(b){if(jQuery.data(b[0],"ElementData")===undefined){MaxLength=b.find(".count").text();if(typeof(MaxLength)=="undefined"){MaxLength=SN.C.I.MaxLength}jQuery.data(b[0],"ElementData",{MaxLength:MaxLength});SN.U.Counter(b);NDT=b.find("[name=status_textarea]");NDT.bind("keyup",function(c){SN.U.Counter(b)});var a=function(c){window.setTimeout(function(){SN.U.Counter(b)},50)};NDT.bind("cut",a).bind("paste",a)}else{b.find(".count").text(jQuery.data(b[0],"ElementData").MaxLength)}},Counter:function(d){SN.C.I.FormNoticeCurrent=d;var b=jQuery.data(d[0],"ElementData").MaxLength;if(b<=0){return}var c=b-SN.U.CharacterCount(d);var a=d.find(".count");if(c.toString()!=a.text()){if(!SN.C.I.CounterBlackout||c===0){if(a.text()!=String(c)){a.text(c)}if(c<0){d.addClass(SN.C.S.Warning)}else{d.removeClass(SN.C.S.Warning)}if(!SN.C.I.CounterBlackout){SN.C.I.CounterBlackout=true;SN.C.I.FormNoticeCurrent=d;window.setTimeout("SN.U.ClearCounterBlackout(SN.C.I.FormNoticeCurrent);",500)}}}},CharacterCount:function(a){return a.find("[name=status_textarea]").val().length},ClearCounterBlackout:function(a){SN.C.I.CounterBlackout=false;SN.U.Counter(a)},RewriteAjaxAction:function(a){if(document.location.protocol=="https:"&&a.substr(0,5)=="http:"){return a.replace(/^http:\/\/[^:\/]+/,"https://"+document.location.host)}else{return a}},FormXHR:function(a){$.ajax({type:"POST",dataType:"xml",url:SN.U.RewriteAjaxAction(a.attr("action")),data:a.serialize()+"&ajax=1",beforeSend:function(b){a.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(c,d,b){alert(b||d)},success:function(b,c){if(typeof($("form",b)[0])!="undefined"){form_new=document._importNode($("form",b)[0],true);a.replaceWith(form_new)}else{a.replaceWith(document._importNode($("p",b)[0],true))}}})},FormNoticeXHR:function(b){SN.C.I.NoticeDataGeo={};b.append('<input type="hidden" name="ajax" value="1"/>');b.attr("action",SN.U.RewriteAjaxAction(b.attr("action")));var c=function(d,e){b.append($('<p class="form_response"></p>').addClass(d).text(e))};var a=function(){b.find(".form_response").remove()};b.ajaxForm({dataType:"xml",timeout:"60000",beforeSend:function(d){if(b.find("[name=status_textarea]").val()==""){b.addClass(SN.C.S.Warning);return false}b.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled);SN.U.normalizeGeoData(b);return true},error:function(f,g,e){b.removeClass(SN.C.S.Processing).find(".submit").removeClass(SN.C.S.Disabled).removeAttr(SN.C.S.Disabled,SN.C.S.Disabled);a();if(g=="timeout"){c("error","Sorry! We had trouble sending your notice. The servers are overloaded. Please try again, and contact the site administrator if this problem persists.")}else{var d=SN.U.GetResponseXML(f);if($("."+SN.C.S.Error,d).length>0){b.append(document._importNode($("."+SN.C.S.Error,d)[0],true))}else{if(parseInt(f.status)===0||jQuery.inArray(parseInt(f.status),SN.C.I.HTTP20x30x)>=0){b.resetForm().find(".attach-status").remove();SN.U.FormNoticeEnhancements(b)}else{c("error","(Sorry! We had trouble sending your notice ("+f.status+" "+f.statusText+"). Please report the problem to the site administrator if this happens again.")}}}},success:function(i,f){a();var n=$("#"+SN.C.S.Error,i);if(n.length>0){c("error",n.text())}else{if($("body")[0].id=="bookmarklet"){self.close()}var d=$("#"+SN.C.S.CommandResult,i);if(d.length>0){c("success",d.text())}else{var m=document._importNode($("li",i)[0],true);var k=$("#notices_primary .notices:first");var l=b.closest("li.notice-reply");if(l.length>0){var e=$(m).attr("id");if($("#"+e).length==0){var j=l.closest("li.notice");l.replaceWith(m);SN.U.NoticeInlineReplyPlaceholder(j)}else{l.remove()}}else{if(k.length>0&&SN.U.belongsOnTimeline(m)){if($("#"+m.id).length===0){var h=b.find("[name=inreplyto]").val();var g="#notices_primary #notice-"+h;if($("body")[0].id=="conversation"){if(h.length>0&&$(g+" .notices").length<1){$(g).append('<ul class="notices"></ul>')}$($(g+" .notices")[0]).append(m)}else{k.prepend(m)}$("#"+m.id).css({display:"none"}).fadeIn(2500);SN.U.NoticeWithAttachment($("#"+m.id));SN.U.NoticeReplyTo($("#"+m.id))}}else{c("success",$("title",i).text())}}}b.resetForm();b.find("[name=inreplyto]").val("");b.find(".attach-status").remove();SN.U.FormNoticeEnhancements(b)}},complete:function(d,e){b.removeClass(SN.C.S.Processing).find(".submit").removeAttr(SN.C.S.Disabled).removeClass(SN.C.S.Disabled);b.find("[name=lat]").val(SN.C.I.NoticeDataGeo.NLat);b.find("[name=lon]").val(SN.C.I.NoticeDataGeo.NLon);b.find("[name=location_ns]").val(SN.C.I.NoticeDataGeo.NLNS);b.find("[name=location_id]").val(SN.C.I.NoticeDataGeo.NLID);b.find("[name=notice_data-geo]").attr("checked",SN.C.I.NoticeDataGeo.NDG)}})},normalizeGeoData:function(a){SN.C.I.NoticeDataGeo.NLat=a.find("[name=lat]").val();SN.C.I.NoticeDataGeo.NLon=a.find("[name=lon]").val();SN.C.I.NoticeDataGeo.NLNS=a.find("[name=location_ns]").val();SN.C.I.NoticeDataGeo.NLID=a.find("[name=location_id]").val();SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked");var b=$.cookie(SN.C.S.NoticeDataGeoCookie);if(b!==null&&b!="disabled"){b=JSON.parse(b);SN.C.I.NoticeDataGeo.NLat=a.find("[name=lat]").val(b.NLat).val();SN.C.I.NoticeDataGeo.NLon=a.find("[name=lon]").val(b.NLon).val();if(b.NLNS){SN.C.I.NoticeDataGeo.NLNS=a.find("[name=location_ns]").val(b.NLNS).val();SN.C.I.NoticeDataGeo.NLID=a.find("[name=location_id]").val(b.NLID).val()}else{a.find("[name=location_ns]").val("");a.find("[name=location_id]").val("")}}if(b=="disabled"){SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked",false).attr("checked")}else{SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked",true).attr("checked")}},GetResponseXML:function(b){try{return b.responseXML}catch(a){return(new DOMParser()).parseFromString(b.responseText,"text/xml")}},NoticeReply:function(){if($("#content .notice_reply").length>0){$("#content .notice").each(function(){SN.U.NoticeReplyTo($(this))})}},NoticeReplyTo:function(a){a.find(".notice_reply").live("click",function(c){c.preventDefault();var b=($(".author .nickname",a).length>0)?$($(".author .nickname",a)[0]):$(".author .nickname.uid");SN.U.NoticeInlineReplyTrigger(a,"@"+b.text());return false})},NoticeInlineReplyTrigger:function(g,h){var b=$($(".notice_id",g)[0]).text();var d=g;var e=g.closest(".notices");if(e.hasClass("threaded-replies")){d=e.closest(".notice")}else{e=$("ul.threaded-replies",g);if(e.length==0){e=$('<ul class="notices threaded-replies xoxo"></ul>');g.append(e)}}var i=$(".notice-reply-form",e);var c=function(){i.find("input[name=inreplyto]").val(b);var l=i.find("textarea");if(l.length==0){throw"No textarea"}var k="";if(h){k=h+" "}l.val(k+l.val().replace(RegExp(k,"i"),""));l.data("initialText",$.trim(h+""));l.focus();if(l[0].setSelectionRange){var j=l.val().length;l[0].setSelectionRange(j,j)}};if(i.length>0){c()}else{$("li.notice-reply-placeholder").remove();var f=$("li.notice-reply",e);if(f.length==0){var a=$("#form_notice").attr("action");f=$('<li class="notice-reply"></li>');$.get(a,{ajax:1},function(l,n,m){var j=document._importNode($("form",l)[0],true);f.append(j);e.append(f);var k=i=$(j);SN.U.NoticeLocationAttach(k);SN.U.FormNoticeXHR(k);SN.U.FormNoticeEnhancements(k);SN.U.NoticeDataAttach(k);c()})}}},NoticeFavor:function(){$(".form_favor").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_disfavor").live("click",function(){SN.U.FormXHR($(this));return false})},NoticeInlineReplyPlaceholder:function(b){var a=b.find("ul.threaded-replies");var c=$('<li class="notice-reply-placeholder"><input class="placeholder"></li>');c.click(function(){SN.U.NoticeInlineReplyTrigger(b)});c.find("input").val(SN.msg("reply_placeholder"));a.append(c)},NoticeInlineReplySetup:function(){$(".threaded-replies").each(function(){var b=$(this);var a=b.closest(".notice");SN.U.NoticeInlineReplyPlaceholder(a)})},NoticeRepeat:function(){$(".form_repeat").live("click",function(a){a.preventDefault();SN.U.NoticeRepeatConfirmation($(this));return false})},NoticeRepeatConfirmation:function(a){var c=a.find(".submit");var b=c.clone();b.addClass("submit_dialogbox").removeClass("submit");a.append(b);b.bind("click",function(){SN.U.FormXHR(a);return false});c.hide();a.addClass("dialogbox").append('<button class="close">&#215;</button>').closest(".notice-options").addClass("opaque");a.find("button.close").click(function(){$(this).remove();a.removeClass("dialogbox").closest(".notice-options").removeClass("opaque");a.find(".submit_dialogbox").remove();a.find(".submit").show();return false})},NoticeAttachments:function(){$(".notice a.attachment").each(function(){SN.U.NoticeWithAttachment($(this).closest(".notice"))})},NoticeWithAttachment:function(b){if(b.find(".attachment").length===0){return}var a=b.find(".attachment.more");if(a.length>0){$(a[0]).click(function(){var c=$(this);c.addClass(SN.C.S.Processing);$.get(c.attr("href")+"/ajax",null,function(d){c.parent(".entry-content").html($(d).find("#attachment_view .entry-content").html())});return false}).attr("title",SN.msg("showmore_tooltip"))}},NoticeDataAttach:function(b){var a=b.find("input[type=file]");a.change(function(f){b.find(".attach-status").remove();var d=$(this).val();if(!d){return false}var c=$('<div class="attach-status '+SN.C.S.Success+'"><code></code> <button class="close">&#215;</button></div>');c.find("code").text(d);c.find("button").click(function(){c.remove();a.val("");return false});b.append(c);if(typeof this.files=="object"){for(var e=0;e<this.files.length;e++){SN.U.PreviewAttach(b,this.files[e])}}})},maxFileSize:function(b){var a=$(b).find("input[name=MAX_FILE_SIZE]").attr("value");if(a){return parseInt(a)}else{return 0}},PreviewAttach:function(d,c){var e=c.type+" "+Math.round(c.size/1024)+"KB";var f=true;var h;if(typeof window.createObjectURL!="undefined"){h=function(i,j){j(window.createObjectURL(i))}}else{if(typeof window.FileReader!="undefined"){h=function(j,k){var i=new FileReader();i.onload=function(l){k(i.result)};i.readAsDataURL(j)}}else{f=false}}var a=["image/png","image/jpeg","image/gif","image/svg+xml"];if($.inArray(c.type,a)==-1){f=false}var g=8*1024*1024;if(c.size>g){f=false}if(f){h(c,function(j){var i=$("<img>").attr("title",e).attr("alt",e).attr("src",j).attr("style","height: 120px");d.find(".attach-status").append(i)})}else{var b=$("<div></div>").text(e);d.find(".attach-status").append(b)}},NoticeLocationAttach:function(a){var e=a.find("[name=lat]");var k=a.find("[name=lon]");var g=a.find("[name=location_ns]").val();var l=a.find("[name=location_id]").val();var b="";var d=a.find("[name=notice_data-geo]");var c=a.find("[name=notice_data-geo]");var j=a.find("label.notice_data-geo");function f(n){j.attr("title",jQuery.trim(j.text())).removeClass("checked");a.find("[name=lat]").val("");a.find("[name=lon]").val("");a.find("[name=location_ns]").val("");a.find("[name=location_id]").val("");a.find("[name=notice_data-geo]").attr("checked",false);$.cookie(SN.C.S.NoticeDataGeoCookie,"disabled",{path:"/"});if(n){a.find(".geo_status_wrapper").removeClass("success").addClass("error");a.find(".geo_status_wrapper .geo_status").text(n)}else{a.find(".geo_status_wrapper").remove()}}function m(n,o){SN.U.NoticeGeoStatus(a,"Looking up place name...");$.getJSON(n,o,function(p){var q,r;if(typeof(p.location_ns)!="undefined"){a.find("[name=location_ns]").val(p.location_ns);q=p.location_ns}if(typeof(p.location_id)!="undefined"){a.find("[name=location_id]").val(p.location_id);r=p.location_id}if(typeof(p.name)=="undefined"){NLN_text=o.lat+";"+o.lon}else{NLN_text=p.name}SN.U.NoticeGeoStatus(a,NLN_text,o.lat,o.lon,p.url);j.attr("title",NoticeDataGeo_text.ShareDisable+" ("+NLN_text+")");a.find("[name=lat]").val(o.lat);a.find("[name=lon]").val(o.lon);a.find("[name=location_ns]").val(q);a.find("[name=location_id]").val(r);a.find("[name=notice_data-geo]").attr("checked",true);var s={NLat:o.lat,NLon:o.lon,NLNS:q,NLID:r,NLN:NLN_text,NLNU:p.url,NDG:true};$.cookie(SN.C.S.NoticeDataGeoCookie,JSON.stringify(s),{path:"/"})})}if(c.length>0){if($.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){c.attr("checked",false)}else{c.attr("checked",true)}var h=a.find(".notice_data-geo_wrap");var i=h.attr("title");h.removeAttr("title");j.attr("title",j.text());c.change(function(){if(c.attr("checked")===true||$.cookie(SN.C.S.NoticeDataGeoCookie)===null){j.attr("title",NoticeDataGeo_text.ShareDisable).addClass("checked");if($.cookie(SN.C.S.NoticeDataGeoCookie)===null||$.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){if(navigator.geolocation){SN.U.NoticeGeoStatus(a,"Requesting location from browser...");navigator.geolocation.getCurrentPosition(function(p){a.find("[name=lat]").val(p.coords.latitude);a.find("[name=lon]").val(p.coords.longitude);var q={lat:p.coords.latitude,lon:p.coords.longitude,token:$("#token").val()};m(i,q)},function(p){switch(p.code){case p.PERMISSION_DENIED:f("Location permission denied.");break;case p.TIMEOUT:f("Location lookup timeout.");break}},{timeout:10000})}else{if(e.length>0&&k.length>0){var n={lat:e,lon:k,token:$("#token").val()};m(i,n)}else{f();c.remove();j.remove()}}}else{var o=JSON.parse($.cookie(SN.C.S.NoticeDataGeoCookie));a.find("[name=lat]").val(o.NLat);a.find("[name=lon]").val(o.NLon);a.find("[name=location_ns]").val(o.NLNS);a.find("[name=location_id]").val(o.NLID);a.find("[name=notice_data-geo]").attr("checked",o.NDG);SN.U.NoticeGeoStatus(a,o.NLN,o.NLat,o.NLon,o.NLNU);j.attr("title",NoticeDataGeo_text.ShareDisable+" ("+o.NLN+")").addClass("checked")}}else{f()}}).change()}},NoticeGeoStatus:function(e,a,f,g,c){var h=e.find(".geo_status_wrapper");if(h.length==0){h=$('<div class="'+SN.C.S.Success+' geo_status_wrapper"><button class="close" style="float:right">&#215;</button><div class="geo_status"></div></div>');h.find("button.close").click(function(){e.find("[name=notice_data-geo]").removeAttr("checked").change()});e.append(h)}var b;if(c){b=$("<a></a>").attr("href",c)}else{b=$("<span></span>")}b.text(a);if(f||g){var d=f+";"+g;b.attr("title",d);if(!a){b.text(d)}}h.find(".geo_status").empty().append(b)},NewDirectMessage:function(){NDM=$(".entity_send-a-message a");NDM.attr({href:NDM.attr("href")+"&ajax=1"});NDM.bind("click",function(){var a=$(".entity_send-a-message form");if(a.length===0){$(this).addClass(SN.C.S.Processing);$.get(NDM.attr("href"),null,function(b){$(".entity_send-a-message").append(document._importNode($("form",b)[0],true));a=$(".entity_send-a-message .form_notice");SN.U.FormNoticeXHR(a);SN.U.FormNoticeEnhancements(a);a.append('<button class="close">&#215;</button>');$(".entity_send-a-message button").click(function(){a.hide();return false});NDM.removeClass(SN.C.S.Processing)})}else{a.show();$(".entity_send-a-message textarea").focus()}return false})},GetFullYear:function(c,d,a){var b=new Date();b.setFullYear(c,d,a);return b},StatusNetInstance:{Set:function(b){var a=SN.U.StatusNetInstance.Get();if(a!==null){b=$.extend(a,b)}$.cookie(SN.C.S.StatusNetInstance,JSON.stringify(b),{path:"/",expires:SN.U.GetFullYear(2029,0,1)})},Get:function(){var a=$.cookie(SN.C.S.StatusNetInstance);if(a!==null){return JSON.parse(a)}return null},Delete:function(){$.cookie(SN.C.S.StatusNetInstance,null)}},belongsOnTimeline:function(b){var a=$("body").attr("id");if(a=="public"){return true}var c=$("#nav_profile a").attr("href");if(c){var d=$(b).find(".entry-title .author a.url").attr("href");if(d==c){if(a=="all"||a=="showstream"){return true}}}return false},switchInputFormTab:function(a){$(".input_form_nav_tab.current").removeClass("current");$("#input_form_nav_"+a).addClass("current");$(".input_form.current").removeClass("current");$("#input_form_"+a).addClass("current")}},Init:{NoticeForm:function(){if($("body.user_in").length>0){$("."+SN.C.S.FormNotice).each(function(){var a=$(this);SN.U.NoticeLocationAttach(a);SN.U.FormNoticeXHR(a);SN.U.FormNoticeEnhancements(a);SN.U.NoticeDataAttach(a)})}},Notices:function(){if($("body.user_in").length>0){SN.U.NoticeFavor();SN.U.NoticeRepeat();SN.U.NoticeReply();SN.U.NoticeInlineReplySetup()}SN.U.NoticeAttachments()},EntityActions:function(){if($("body.user_in").length>0){$(".form_user_subscribe").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_user_unsubscribe").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_group_join").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_group_leave").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_user_nudge").live("click",function(){SN.U.FormXHR($(this));return false});SN.U.NewDirectMessage()}},Login:function(){if(SN.U.StatusNetInstance.Get()!==null){var a=SN.U.StatusNetInstance.Get().Nickname;if(a!==null){$("#form_login #nickname").val(a)}}$("#form_login").bind("submit",function(){SN.U.StatusNetInstance.Set({Nickname:$("#form_login #nickname").val()});return true})},UploadForms:function(){$("input[type=file]").change(function(d){if(typeof this.files=="object"&&this.files.length>0){var c=0;for(var b=0;b<this.files.length;b++){c+=this.files[b].size}var a=SN.U.maxFileSize($(this.form));if(a>0&&c>a){var e="File too large: maximum upload size is %d bytes.";alert(e.replace("%d",a));$(this).val("");d.preventDefault();return false}}})}}};$(document).ready(function(){SN.Init.UploadForms();if($("."+SN.C.S.FormNotice).length>0){SN.Init.NoticeForm()}if($("#content .notices").length>0){SN.Init.Notices()}if($("#content .entity_actions").length>0){SN.Init.EntityActions()}if($("#form_login").length>0){SN.Init.Login()}});if(!document.ELEMENT_NODE){document.ELEMENT_NODE=1;document.ATTRIBUTE_NODE=2;document.TEXT_NODE=3;document.CDATA_SECTION_NODE=4;document.ENTITY_REFERENCE_NODE=5;document.ENTITY_NODE=6;document.PROCESSING_INSTRUCTION_NODE=7;document.COMMENT_NODE=8;document.DOCUMENT_NODE=9;document.DOCUMENT_TYPE_NODE=10;document.DOCUMENT_FRAGMENT_NODE=11;document.NOTATION_NODE=12}document._importNode=function(e,a){switch(e.nodeType){case document.ELEMENT_NODE:var d=document.createElement(e.nodeName);if(e.attributes&&e.attributes.length>0){for(var c=0,b=e.attributes.length;c<b;){if(e.attributes[c].nodeName=="class"){d.className=e.getAttribute(e.attributes[c++].nodeName)}else{d.setAttribute(e.attributes[c].nodeName,e.getAttribute(e.attributes[c++].nodeName))}}}if(a&&e.childNodes&&e.childNodes.length>0){for(var c=0,b=e.childNodes.length;c<b;){d.appendChild(document._importNode(e.childNodes[c++],a))}}return d;break;case document.TEXT_NODE:case document.CDATA_SECTION_NODE:case document.COMMENT_NODE:return document.createTextNode(e.nodeValue);break}};if(typeof navigator.geolocation=="undefined"||navigator.geolocation.shim){(function(){(function(){if(window.google&&google.gears){return}var c=null;if(typeof GearsFactory!="undefined"){c=new GearsFactory()}else{try{c=new ActiveXObject("Gears.Factory");if(c.getBuildInfo().indexOf("ie_mobile")!=-1){c.privateSetGlobalObject(this)}}catch(d){if((typeof navigator.mimeTypes!="undefined")&&navigator.mimeTypes["application/x-googlegears"]){c=document.createElement("object");c.style.display="none";c.width=0;c.height=0;c.type="application/x-googlegears";document.documentElement.appendChild(c)}}}if(!c){return}if(!window.google){google={}}if(!google.gears){google.gears={factory:c}}})();var a=(function(){var d=google.gears.factory.create("beta.geolocation");var c=function(f,e){return function(g){f(g);e.lastPosition=g}};return{shim:true,type:"Gears",lastPosition:null,getCurrentPosition:function(e,g,h){var f=this;var i=c(e,f);d.getCurrentPosition(i,g,h)},watchPosition:function(e,f,g){d.watchPosition(e,f,g)},clearWatch:function(e){d.clearWatch(e)},getPermission:function(g,e,f){d.getPermission(g,e,f)}}});var b=(function(){var i=false;var e=function(){if(!d()&&!i){i=true;var j=document.createElement("script");j.src=(document.location.protocol=="https:"?"https://":"http://")+"www.google.com/jsapi?callback=_google_loader_apiLoaded";j.type="text/javascript";document.getElementsByTagName("body")[0].appendChild(j)}};var c=[];var h=function(j){c.push(j)};var f=function(){if(d()){while(c.length>0){var j=c.pop();j()}}};window._google_loader_apiLoaded=function(){f()};var d=function(){return(window.google&&google.loader)};var g=function(j){if(d()){return true}h(j);e();return false};e();return{shim:true,type:"ClientLocation",lastPosition:null,getCurrentPosition:function(k,n,o){var m=this;if(!g(function(){m.getCurrentPosition(k,n,o)})){return}if(google.loader.ClientLocation){var l=google.loader.ClientLocation;var j={coords:{latitude:l.latitude,longitude:l.longitude,altitude:null,accuracy:43000,altitudeAccuracy:null,heading:null,speed:null},address:{city:l.address.city,country:l.address.country,country_code:l.address.country_code,region:l.address.region},timestamp:new Date()};k(j);this.lastPosition=j}else{if(n==="function"){n({code:3,message:"Using the Google ClientLocation API and it is not able to calculate a location."})}}},watchPosition:function(j,l,m){this.getCurrentPosition(j,l,m);var k=this;var n=setInterval(function(){k.getCurrentPosition(j,l,m)},10000);return n},clearWatch:function(j){clearInterval(j)},getPermission:function(l,j,k){return true}}});navigator.geolocation=(window.google&&google.gears)?a():b()})()};
\ No newline at end of file
+var SN={C:{I:{CounterBlackout:false,MaxLength:140,PatternUsername:/^[0-9a-zA-Z\-_.]*$/,HTTP20x30x:[200,201,202,203,204,205,206,300,301,302,303,304,305,306,307],NoticeFormMaster:null},S:{Disabled:"disabled",Warning:"warning",Error:"error",Success:"success",Processing:"processing",CommandResult:"command_result",FormNotice:"form_notice",NoticeDataGeo:"notice_data-geo",NoticeDataGeoCookie:"NoticeDataGeo",NoticeDataGeoSelected:"notice_data-geo_selected",StatusNetInstance:"StatusNetInstance"}},messages:{},msg:function(a){if(typeof SN.messages[a]=="undefined"){return"["+a+"]"}else{return SN.messages[a]}},U:{FormNoticeEnhancements:function(b){if(jQuery.data(b[0],"ElementData")===undefined){MaxLength=b.find(".count").text();if(typeof(MaxLength)=="undefined"){MaxLength=SN.C.I.MaxLength}jQuery.data(b[0],"ElementData",{MaxLength:MaxLength});SN.U.Counter(b);NDT=b.find("[name=status_textarea]");NDT.bind("keyup",function(c){SN.U.Counter(b)});var a=function(c){window.setTimeout(function(){SN.U.Counter(b)},50)};NDT.bind("cut",a).bind("paste",a)}else{b.find(".count").text(jQuery.data(b[0],"ElementData").MaxLength)}},Counter:function(d){SN.C.I.FormNoticeCurrent=d;var b=jQuery.data(d[0],"ElementData").MaxLength;if(b<=0){return}var c=b-SN.U.CharacterCount(d);var a=d.find(".count");if(c.toString()!=a.text()){if(!SN.C.I.CounterBlackout||c===0){if(a.text()!=String(c)){a.text(c)}if(c<0){d.addClass(SN.C.S.Warning)}else{d.removeClass(SN.C.S.Warning)}if(!SN.C.I.CounterBlackout){SN.C.I.CounterBlackout=true;SN.C.I.FormNoticeCurrent=d;window.setTimeout("SN.U.ClearCounterBlackout(SN.C.I.FormNoticeCurrent);",500)}}}},CharacterCount:function(a){return a.find("[name=status_textarea]").val().length},ClearCounterBlackout:function(a){SN.C.I.CounterBlackout=false;SN.U.Counter(a)},RewriteAjaxAction:function(a){if(document.location.protocol=="https:"&&a.substr(0,5)=="http:"){return a.replace(/^http:\/\/[^:\/]+/,"https://"+document.location.host)}else{return a}},FormXHR:function(a){$.ajax({type:"POST",dataType:"xml",url:SN.U.RewriteAjaxAction(a.attr("action")),data:a.serialize()+"&ajax=1",beforeSend:function(b){a.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(c,d,b){alert(b||d)},success:function(b,c){if(typeof($("form",b)[0])!="undefined"){form_new=document._importNode($("form",b)[0],true);a.replaceWith(form_new)}else{a.replaceWith(document._importNode($("p",b)[0],true))}}})},FormNoticeXHR:function(b){SN.C.I.NoticeDataGeo={};b.append('<input type="hidden" name="ajax" value="1"/>');b.attr("action",SN.U.RewriteAjaxAction(b.attr("action")));var c=function(d,e){b.append($('<p class="form_response"></p>').addClass(d).text(e))};var a=function(){b.find(".form_response").remove()};b.ajaxForm({dataType:"xml",timeout:"60000",beforeSend:function(d){if(b.find("[name=status_textarea]").val()==""){b.addClass(SN.C.S.Warning);return false}b.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled);SN.U.normalizeGeoData(b);return true},error:function(f,g,e){b.removeClass(SN.C.S.Processing).find(".submit").removeClass(SN.C.S.Disabled).removeAttr(SN.C.S.Disabled,SN.C.S.Disabled);a();if(g=="timeout"){c("error","Sorry! We had trouble sending your notice. The servers are overloaded. Please try again, and contact the site administrator if this problem persists.")}else{var d=SN.U.GetResponseXML(f);if($("."+SN.C.S.Error,d).length>0){b.append(document._importNode($("."+SN.C.S.Error,d)[0],true))}else{if(parseInt(f.status)===0||jQuery.inArray(parseInt(f.status),SN.C.I.HTTP20x30x)>=0){b.resetForm().find(".attach-status").remove();SN.U.FormNoticeEnhancements(b)}else{c("error","(Sorry! We had trouble sending your notice ("+f.status+" "+f.statusText+"). Please report the problem to the site administrator if this happens again.")}}}},success:function(i,f){a();var n=$("#"+SN.C.S.Error,i);if(n.length>0){c("error",n.text())}else{if($("body")[0].id=="bookmarklet"){self.close()}var d=$("#"+SN.C.S.CommandResult,i);if(d.length>0){c("success",d.text())}else{var m=document._importNode($("li",i)[0],true);var k=$("#notices_primary .notices:first");var l=b.closest("li.notice-reply");if(l.length>0){var e=$(m).attr("id");if($("#"+e).length==0){var j=l.closest("li.notice");l.replaceWith(m);SN.U.NoticeInlineReplyPlaceholder(j)}else{l.remove()}}else{if(k.length>0&&SN.U.belongsOnTimeline(m)){if($("#"+m.id).length===0){var h=b.find("[name=inreplyto]").val();var g="#notices_primary #notice-"+h;if($("body")[0].id=="conversation"){if(h.length>0&&$(g+" .notices").length<1){$(g).append('<ul class="notices"></ul>')}$($(g+" .notices")[0]).append(m)}else{k.prepend(m)}$("#"+m.id).css({display:"none"}).fadeIn(2500);SN.U.NoticeWithAttachment($("#"+m.id));SN.U.NoticeReplyTo($("#"+m.id))}}else{c("success",$("title",i).text())}}}b.resetForm();b.find("[name=inreplyto]").val("");b.find(".attach-status").remove();SN.U.FormNoticeEnhancements(b)}},complete:function(d,e){b.removeClass(SN.C.S.Processing).find(".submit").removeAttr(SN.C.S.Disabled).removeClass(SN.C.S.Disabled);b.find("[name=lat]").val(SN.C.I.NoticeDataGeo.NLat);b.find("[name=lon]").val(SN.C.I.NoticeDataGeo.NLon);b.find("[name=location_ns]").val(SN.C.I.NoticeDataGeo.NLNS);b.find("[name=location_id]").val(SN.C.I.NoticeDataGeo.NLID);b.find("[name=notice_data-geo]").attr("checked",SN.C.I.NoticeDataGeo.NDG)}})},normalizeGeoData:function(a){SN.C.I.NoticeDataGeo.NLat=a.find("[name=lat]").val();SN.C.I.NoticeDataGeo.NLon=a.find("[name=lon]").val();SN.C.I.NoticeDataGeo.NLNS=a.find("[name=location_ns]").val();SN.C.I.NoticeDataGeo.NLID=a.find("[name=location_id]").val();SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked");var b=$.cookie(SN.C.S.NoticeDataGeoCookie);if(b!==null&&b!="disabled"){b=JSON.parse(b);SN.C.I.NoticeDataGeo.NLat=a.find("[name=lat]").val(b.NLat).val();SN.C.I.NoticeDataGeo.NLon=a.find("[name=lon]").val(b.NLon).val();if(b.NLNS){SN.C.I.NoticeDataGeo.NLNS=a.find("[name=location_ns]").val(b.NLNS).val();SN.C.I.NoticeDataGeo.NLID=a.find("[name=location_id]").val(b.NLID).val()}else{a.find("[name=location_ns]").val("");a.find("[name=location_id]").val("")}}if(b=="disabled"){SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked",false).attr("checked")}else{SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked",true).attr("checked")}},GetResponseXML:function(b){try{return b.responseXML}catch(a){return(new DOMParser()).parseFromString(b.responseText,"text/xml")}},NoticeReply:function(){if($("#content .notice_reply").length>0){$("#content .notice").each(function(){SN.U.NoticeReplyTo($(this))})}},NoticeReplyTo:function(a){a.find(".notice_reply").live("click",function(c){c.preventDefault();var b=($(".author .nickname",a).length>0)?$($(".author .nickname",a)[0]):$(".author .nickname.uid");SN.U.NoticeInlineReplyTrigger(a,"@"+b.text());return false})},NoticeInlineReplyTrigger:function(h,i){var b=$($(".notice_id",h)[0]).text();var e=h;var f=h.closest(".notices");if(f.hasClass("threaded-replies")){e=f.closest(".notice")}else{f=$("ul.threaded-replies",h);if(f.length==0){f=$('<ul class="notices threaded-replies xoxo"></ul>');h.append(f)}}var j=$(".notice-reply-form",f);var d=function(){j.find("input[name=inreplyto]").val(b);var m=j.find("textarea");if(m.length==0){throw"No textarea"}var l="";if(i){l=i+" "}m.val(l+m.val().replace(RegExp(l,"i"),""));m.data("initialText",$.trim(i+""));m.focus();if(m[0].setSelectionRange){var k=m.val().length;m[0].setSelectionRange(k,k)}};if(j.length>0){d()}else{$("li.notice-reply-placeholder").remove();var g=$("li.notice-reply",f);if(g.length==0){g=$('<li class="notice-reply"></li>');var c=function(k){var l=document._importNode(k,true);g.append(l);f.append(g);var m=j=$(l);SN.U.NoticeLocationAttach(m);SN.U.FormNoticeXHR(m);SN.U.FormNoticeEnhancements(m);SN.U.NoticeDataAttach(m);d()};if(SN.C.I.NoticeFormMaster){c(SN.C.I.NoticeFormMaster)}else{var a=$("#form_notice").attr("action");$.get(a,{ajax:1},function(k,m,l){c($("form",k)[0])})}}}},NoticeFavor:function(){$(".form_favor").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_disfavor").live("click",function(){SN.U.FormXHR($(this));return false})},NoticeInlineReplyPlaceholder:function(b){var a=b.find("ul.threaded-replies");var c=$('<li class="notice-reply-placeholder"><input class="placeholder"></li>');c.click(function(){SN.U.NoticeInlineReplyTrigger(b)});c.find("input").val(SN.msg("reply_placeholder"));a.append(c)},NoticeInlineReplySetup:function(){$(".threaded-replies").each(function(){var b=$(this);var a=b.closest(".notice");SN.U.NoticeInlineReplyPlaceholder(a)})},NoticeRepeat:function(){$(".form_repeat").live("click",function(a){a.preventDefault();SN.U.NoticeRepeatConfirmation($(this));return false})},NoticeRepeatConfirmation:function(a){var c=a.find(".submit");var b=c.clone();b.addClass("submit_dialogbox").removeClass("submit");a.append(b);b.bind("click",function(){SN.U.FormXHR(a);return false});c.hide();a.addClass("dialogbox").append('<button class="close">&#215;</button>').closest(".notice-options").addClass("opaque");a.find("button.close").click(function(){$(this).remove();a.removeClass("dialogbox").closest(".notice-options").removeClass("opaque");a.find(".submit_dialogbox").remove();a.find(".submit").show();return false})},NoticeAttachments:function(){$(".notice a.attachment").each(function(){SN.U.NoticeWithAttachment($(this).closest(".notice"))})},NoticeWithAttachment:function(b){if(b.find(".attachment").length===0){return}var a=b.find(".attachment.more");if(a.length>0){$(a[0]).click(function(){var c=$(this);c.addClass(SN.C.S.Processing);$.get(c.attr("href")+"/ajax",null,function(d){c.parent(".entry-content").html($(d).find("#attachment_view .entry-content").html())});return false}).attr("title",SN.msg("showmore_tooltip"))}},NoticeDataAttach:function(b){var a=b.find("input[type=file]");a.change(function(f){b.find(".attach-status").remove();var d=$(this).val();if(!d){return false}var c=$('<div class="attach-status '+SN.C.S.Success+'"><code></code> <button class="close">&#215;</button></div>');c.find("code").text(d);c.find("button").click(function(){c.remove();a.val("");return false});b.append(c);if(typeof this.files=="object"){for(var e=0;e<this.files.length;e++){SN.U.PreviewAttach(b,this.files[e])}}})},maxFileSize:function(b){var a=$(b).find("input[name=MAX_FILE_SIZE]").attr("value");if(a){return parseInt(a)}else{return 0}},PreviewAttach:function(d,c){var e=c.type+" "+Math.round(c.size/1024)+"KB";var f=true;var h;if(typeof window.createObjectURL!="undefined"){h=function(i,j){j(window.createObjectURL(i))}}else{if(typeof window.FileReader!="undefined"){h=function(j,k){var i=new FileReader();i.onload=function(l){k(i.result)};i.readAsDataURL(j)}}else{f=false}}var a=["image/png","image/jpeg","image/gif","image/svg+xml"];if($.inArray(c.type,a)==-1){f=false}var g=8*1024*1024;if(c.size>g){f=false}if(f){h(c,function(j){var i=$("<img>").attr("title",e).attr("alt",e).attr("src",j).attr("style","height: 120px");d.find(".attach-status").append(i)})}else{var b=$("<div></div>").text(e);d.find(".attach-status").append(b)}},NoticeLocationAttach:function(a){var e=a.find("[name=lat]");var k=a.find("[name=lon]");var g=a.find("[name=location_ns]").val();var l=a.find("[name=location_id]").val();var b="";var d=a.find("[name=notice_data-geo]");var c=a.find("[name=notice_data-geo]");var j=a.find("label.notice_data-geo");function f(n){j.attr("title",jQuery.trim(j.text())).removeClass("checked");a.find("[name=lat]").val("");a.find("[name=lon]").val("");a.find("[name=location_ns]").val("");a.find("[name=location_id]").val("");a.find("[name=notice_data-geo]").attr("checked",false);$.cookie(SN.C.S.NoticeDataGeoCookie,"disabled",{path:"/"});if(n){a.find(".geo_status_wrapper").removeClass("success").addClass("error");a.find(".geo_status_wrapper .geo_status").text(n)}else{a.find(".geo_status_wrapper").remove()}}function m(n,o){SN.U.NoticeGeoStatus(a,"Looking up place name...");$.getJSON(n,o,function(p){var q,r;if(typeof(p.location_ns)!="undefined"){a.find("[name=location_ns]").val(p.location_ns);q=p.location_ns}if(typeof(p.location_id)!="undefined"){a.find("[name=location_id]").val(p.location_id);r=p.location_id}if(typeof(p.name)=="undefined"){NLN_text=o.lat+";"+o.lon}else{NLN_text=p.name}SN.U.NoticeGeoStatus(a,NLN_text,o.lat,o.lon,p.url);j.attr("title",NoticeDataGeo_text.ShareDisable+" ("+NLN_text+")");a.find("[name=lat]").val(o.lat);a.find("[name=lon]").val(o.lon);a.find("[name=location_ns]").val(q);a.find("[name=location_id]").val(r);a.find("[name=notice_data-geo]").attr("checked",true);var s={NLat:o.lat,NLon:o.lon,NLNS:q,NLID:r,NLN:NLN_text,NLNU:p.url,NDG:true};$.cookie(SN.C.S.NoticeDataGeoCookie,JSON.stringify(s),{path:"/"})})}if(c.length>0){if($.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){c.attr("checked",false)}else{c.attr("checked",true)}var h=a.find(".notice_data-geo_wrap");var i=h.attr("title");h.removeAttr("title");j.attr("title",j.text());c.change(function(){if(c.attr("checked")===true||$.cookie(SN.C.S.NoticeDataGeoCookie)===null){j.attr("title",NoticeDataGeo_text.ShareDisable).addClass("checked");if($.cookie(SN.C.S.NoticeDataGeoCookie)===null||$.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){if(navigator.geolocation){SN.U.NoticeGeoStatus(a,"Requesting location from browser...");navigator.geolocation.getCurrentPosition(function(p){a.find("[name=lat]").val(p.coords.latitude);a.find("[name=lon]").val(p.coords.longitude);var q={lat:p.coords.latitude,lon:p.coords.longitude,token:$("#token").val()};m(i,q)},function(p){switch(p.code){case p.PERMISSION_DENIED:f("Location permission denied.");break;case p.TIMEOUT:f("Location lookup timeout.");break}},{timeout:10000})}else{if(e.length>0&&k.length>0){var n={lat:e,lon:k,token:$("#token").val()};m(i,n)}else{f();c.remove();j.remove()}}}else{var o=JSON.parse($.cookie(SN.C.S.NoticeDataGeoCookie));a.find("[name=lat]").val(o.NLat);a.find("[name=lon]").val(o.NLon);a.find("[name=location_ns]").val(o.NLNS);a.find("[name=location_id]").val(o.NLID);a.find("[name=notice_data-geo]").attr("checked",o.NDG);SN.U.NoticeGeoStatus(a,o.NLN,o.NLat,o.NLon,o.NLNU);j.attr("title",NoticeDataGeo_text.ShareDisable+" ("+o.NLN+")").addClass("checked")}}else{f()}}).change()}},NoticeGeoStatus:function(e,a,f,g,c){var h=e.find(".geo_status_wrapper");if(h.length==0){h=$('<div class="'+SN.C.S.Success+' geo_status_wrapper"><button class="close" style="float:right">&#215;</button><div class="geo_status"></div></div>');h.find("button.close").click(function(){e.find("[name=notice_data-geo]").removeAttr("checked").change()});e.append(h)}var b;if(c){b=$("<a></a>").attr("href",c)}else{b=$("<span></span>")}b.text(a);if(f||g){var d=f+";"+g;b.attr("title",d);if(!a){b.text(d)}}h.find(".geo_status").empty().append(b)},NewDirectMessage:function(){NDM=$(".entity_send-a-message a");NDM.attr({href:NDM.attr("href")+"&ajax=1"});NDM.bind("click",function(){var a=$(".entity_send-a-message form");if(a.length===0){$(this).addClass(SN.C.S.Processing);$.get(NDM.attr("href"),null,function(b){$(".entity_send-a-message").append(document._importNode($("form",b)[0],true));a=$(".entity_send-a-message .form_notice");SN.U.FormNoticeXHR(a);SN.U.FormNoticeEnhancements(a);a.append('<button class="close">&#215;</button>');$(".entity_send-a-message button").click(function(){a.hide();return false});NDM.removeClass(SN.C.S.Processing)})}else{a.show();$(".entity_send-a-message textarea").focus()}return false})},GetFullYear:function(c,d,a){var b=new Date();b.setFullYear(c,d,a);return b},StatusNetInstance:{Set:function(b){var a=SN.U.StatusNetInstance.Get();if(a!==null){b=$.extend(a,b)}$.cookie(SN.C.S.StatusNetInstance,JSON.stringify(b),{path:"/",expires:SN.U.GetFullYear(2029,0,1)})},Get:function(){var a=$.cookie(SN.C.S.StatusNetInstance);if(a!==null){return JSON.parse(a)}return null},Delete:function(){$.cookie(SN.C.S.StatusNetInstance,null)}},belongsOnTimeline:function(b){var a=$("body").attr("id");if(a=="public"){return true}var c=$("#nav_profile a").attr("href");if(c){var d=$(b).find(".entry-title .author a.url").attr("href");if(d==c){if(a=="all"||a=="showstream"){return true}}}return false},switchInputFormTab:function(a){$(".input_form_nav_tab.current").removeClass("current");$("#input_form_nav_"+a).addClass("current");$(".input_form.current").removeClass("current");$("#input_form_"+a).addClass("current")}},Init:{NoticeForm:function(){if($("body.user_in").length>0){$("."+SN.C.S.FormNotice).each(function(){var a=$(this);SN.U.NoticeLocationAttach(a);SN.U.FormNoticeXHR(a);SN.U.FormNoticeEnhancements(a);SN.U.NoticeDataAttach(a)})}},Notices:function(){if($("body.user_in").length>0){var a=$(".form_notice:first");if(a.length>0){SN.C.I.NoticeFormMaster=document._importNode(a[0],true)}SN.U.NoticeFavor();SN.U.NoticeRepeat();SN.U.NoticeReply();SN.U.NoticeInlineReplySetup()}SN.U.NoticeAttachments()},EntityActions:function(){if($("body.user_in").length>0){$(".form_user_subscribe").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_user_unsubscribe").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_group_join").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_group_leave").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_user_nudge").live("click",function(){SN.U.FormXHR($(this));return false});SN.U.NewDirectMessage()}},Login:function(){if(SN.U.StatusNetInstance.Get()!==null){var a=SN.U.StatusNetInstance.Get().Nickname;if(a!==null){$("#form_login #nickname").val(a)}}$("#form_login").bind("submit",function(){SN.U.StatusNetInstance.Set({Nickname:$("#form_login #nickname").val()});return true})},UploadForms:function(){$("input[type=file]").change(function(d){if(typeof this.files=="object"&&this.files.length>0){var c=0;for(var b=0;b<this.files.length;b++){c+=this.files[b].size}var a=SN.U.maxFileSize($(this.form));if(a>0&&c>a){var e="File too large: maximum upload size is %d bytes.";alert(e.replace("%d",a));$(this).val("");d.preventDefault();return false}}})}}};$(document).ready(function(){SN.Init.UploadForms();if($("."+SN.C.S.FormNotice).length>0){SN.Init.NoticeForm()}if($("#content .notices").length>0){SN.Init.Notices()}if($("#content .entity_actions").length>0){SN.Init.EntityActions()}if($("#form_login").length>0){SN.Init.Login()}});if(!document.ELEMENT_NODE){document.ELEMENT_NODE=1;document.ATTRIBUTE_NODE=2;document.TEXT_NODE=3;document.CDATA_SECTION_NODE=4;document.ENTITY_REFERENCE_NODE=5;document.ENTITY_NODE=6;document.PROCESSING_INSTRUCTION_NODE=7;document.COMMENT_NODE=8;document.DOCUMENT_NODE=9;document.DOCUMENT_TYPE_NODE=10;document.DOCUMENT_FRAGMENT_NODE=11;document.NOTATION_NODE=12}document._importNode=function(e,a){switch(e.nodeType){case document.ELEMENT_NODE:var d=document.createElement(e.nodeName);if(e.attributes&&e.attributes.length>0){for(var c=0,b=e.attributes.length;c<b;){if(e.attributes[c].nodeName=="class"){d.className=e.getAttribute(e.attributes[c++].nodeName)}else{d.setAttribute(e.attributes[c].nodeName,e.getAttribute(e.attributes[c++].nodeName))}}}if(a&&e.childNodes&&e.childNodes.length>0){for(var c=0,b=e.childNodes.length;c<b;){d.appendChild(document._importNode(e.childNodes[c++],a))}}return d;break;case document.TEXT_NODE:case document.CDATA_SECTION_NODE:case document.COMMENT_NODE:return document.createTextNode(e.nodeValue);break}};if(typeof navigator.geolocation=="undefined"||navigator.geolocation.shim){(function(){(function(){if(window.google&&google.gears){return}var c=null;if(typeof GearsFactory!="undefined"){c=new GearsFactory()}else{try{c=new ActiveXObject("Gears.Factory");if(c.getBuildInfo().indexOf("ie_mobile")!=-1){c.privateSetGlobalObject(this)}}catch(d){if((typeof navigator.mimeTypes!="undefined")&&navigator.mimeTypes["application/x-googlegears"]){c=document.createElement("object");c.style.display="none";c.width=0;c.height=0;c.type="application/x-googlegears";document.documentElement.appendChild(c)}}}if(!c){return}if(!window.google){google={}}if(!google.gears){google.gears={factory:c}}})();var a=(function(){var d=google.gears.factory.create("beta.geolocation");var c=function(f,e){return function(g){f(g);e.lastPosition=g}};return{shim:true,type:"Gears",lastPosition:null,getCurrentPosition:function(e,g,h){var f=this;var i=c(e,f);d.getCurrentPosition(i,g,h)},watchPosition:function(e,f,g){d.watchPosition(e,f,g)},clearWatch:function(e){d.clearWatch(e)},getPermission:function(g,e,f){d.getPermission(g,e,f)}}});var b=(function(){var i=false;var e=function(){if(!d()&&!i){i=true;var j=document.createElement("script");j.src=(document.location.protocol=="https:"?"https://":"http://")+"www.google.com/jsapi?callback=_google_loader_apiLoaded";j.type="text/javascript";document.getElementsByTagName("body")[0].appendChild(j)}};var c=[];var h=function(j){c.push(j)};var f=function(){if(d()){while(c.length>0){var j=c.pop();j()}}};window._google_loader_apiLoaded=function(){f()};var d=function(){return(window.google&&google.loader)};var g=function(j){if(d()){return true}h(j);e();return false};e();return{shim:true,type:"ClientLocation",lastPosition:null,getCurrentPosition:function(k,n,o){var m=this;if(!g(function(){m.getCurrentPosition(k,n,o)})){return}if(google.loader.ClientLocation){var l=google.loader.ClientLocation;var j={coords:{latitude:l.latitude,longitude:l.longitude,altitude:null,accuracy:43000,altitudeAccuracy:null,heading:null,speed:null},address:{city:l.address.city,country:l.address.country,country_code:l.address.country_code,region:l.address.region},timestamp:new Date()};k(j);this.lastPosition=j}else{if(n==="function"){n({code:3,message:"Using the Google ClientLocation API and it is not able to calculate a location."})}}},watchPosition:function(j,l,m){this.getCurrentPosition(j,l,m);var k=this;var n=setInterval(function(){k.getCurrentPosition(j,l,m)},10000);return n},clearWatch:function(j){clearInterval(j)},getPermission:function(l,j,k){return true}}});navigator.geolocation=(window.google&&google.gears)?a():b()})()};
\ No newline at end of file

From 9a837ee33b5817df292e3ceffd5b2bd81d1cde34 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Mon, 7 Mar 2011 13:36:15 -0800
Subject: [PATCH 442/655] Doc comments for MicroAppPlugin

---
 lib/microappplugin.php              | 140 +++++++++++++++++++++++++++-
 plugins/Bookmark/BookmarkPlugin.php |   2 +-
 2 files changed, 140 insertions(+), 2 deletions(-)

diff --git a/lib/microappplugin.php b/lib/microappplugin.php
index dbbc6262af..8bc657f44a 100644
--- a/lib/microappplugin.php
+++ b/lib/microappplugin.php
@@ -51,20 +51,157 @@ if (!defined('STATUSNET')) {
 
 abstract class MicroAppPlugin extends Plugin
 {
+    /**
+     * Returns a localized string which represents this micro-app,
+     * to be shown to users selecting what type of post to make.
+     * This is paired with the key string in $this->tag().
+     *
+     * All micro-app classes must override this method.
+     *
+     * @return string
+     */
     abstract function appTitle();
+
+    /**
+     * Returns a key string which represents this micro-app in HTML
+     * ids etc, as when offering selection of what type of post to make.
+     * This is paired with the user-visible localizable $this->appTitle().
+     *
+     * All micro-app classes must override this method.
+     */
     abstract function tag();
+
+    /**
+     * Return a list of ActivityStreams object type URIs
+     * which this micro-app handles. Default implementations
+     * of the base class will use this list to check if a
+     * given ActivityStreams object belongs to us, via
+     * $this->isMyNotice() or $this->isMyActivity.
+     *
+     * All micro-app classes must override this method.
+     *
+     * @fixme can we confirm that these types are the same
+     * for Atom and JSON streams? Any limitations or issues?
+     *
+     * @return array of strings
+     */
     abstract function types();
-    abstract function saveNoticeFromActivity($activity, $actor, $options);
+
+    /**
+     * Given a parsed ActivityStreams activity, your plugin
+     * gets to figure out how to actually save it into a notice
+     * and any additional data structures you require.
+     *
+     * This will handle things received via AtomPub, OStatus
+     * (PuSH and Salmon transports), or ActivityStreams-based
+     * backup/restore of account data.
+     *
+     * You should be able to accept as input the output from your
+     * $this->activityObjectFromNotice(). Where applicable, try to
+     * use existing ActivityStreams structures and object types,
+     * and be liberal in accepting input from what might be other
+     * compatible apps.
+     *
+     * All micro-app classes must override this method.
+     *
+     * @fixme are there any standard options?
+     *
+     * @param Activity $activity
+     * @param Profile $actor
+     * @param array $options=array()
+     *
+     * @return Notice the resulting notice
+     */
+    abstract function saveNoticeFromActivity($activity, $actor, $options=array());
+
+    /**
+     * Given an existing Notice object, your plugin gets to
+     * figure out how to arrange it into an ActivityStreams
+     * object.
+     *
+     * This will be how your specialized notice gets output in
+     * Atom feeds and JSON-based ActivityStreams output, including
+     * account backup/restore and OStatus (PuSH and Salmon transports).
+     *
+     * You should be able to round-trip data from this format back
+     * through $this->saveNoticeFromActivity(). Where applicable, try
+     * to use existing ActivityStreams structures and object types,
+     * and consider interop with other compatible apps.
+     *
+     * All micro-app classes must override this method.
+     *
+     * @fixme this outputs an ActivityObject, not an Activity. Any compat issues?
+     *
+     * @param Notice $notice
+     *
+     * @return ActivityObject
+     */
     abstract function activityObjectFromNotice($notice);
+
+    /**
+     * Custom HTML output for your special notice; called when a
+     * matching notice turns up in a NoticeListItem.
+     *
+     * All micro-app classes must override this method.
+     *
+     * @param Notice $notice
+     * @param HTMLOutputter $out
+     */
     abstract function showNotice($notice, $out);
+
+    /**
+     * When building the primary notice form, we'll fetch also some
+     * alternate forms for specialized types -- that's you!
+     *
+     * Return a custom Widget or Form object for the given output
+     * object, and it'll be included in the HTML output. Beware that
+     * your form may be initially hidden.
+     *
+     * All micro-app classes must override this method.
+     *
+     * @param HTMLOutputter $out
+     * @return Widget
+     */
     abstract function entryForm($out);
+
+    /**
+     * When a notice is deleted, you'll be called here for a chance
+     * to clean up any related resources.
+     *
+     * All micro-app classes must override this method.
+     *
+     * @param Notice $notice
+     */
     abstract function deleteRelated($notice);
 
+    /**
+     * Check if a given notice object should be handled by this micro-app
+     * plugin.
+     *
+     * The default implementation checks against the activity type list
+     * returned by $this->types(). You can override this method to expand
+     * your checks.
+     *
+     * @param Notice $notice
+     * @return boolean
+     */
     function isMyNotice($notice) {
         $types = $this->types();
         return in_array($notice->object_type, $types);
     }
 
+    /**
+     * Check if a given ActivityStreams activity should be handled by this
+     * micro-app plugin.
+     *
+     * The default implementation checks against the activity type list
+     * returned by $this->types(), and requires that exactly one matching
+     * object be present. You can override this method to expand
+     * your checks or to compare the activity's verb, etc.
+     *
+     * @param Activity $activity
+     * @return boolean
+     */
     function isMyActivity($activity) {
         $types = $this->types();
         return (count($activity->objects) == 1 &&
@@ -73,6 +210,7 @@ abstract class MicroAppPlugin extends Plugin
 
     /**
      * When a notice is deleted, delete the related objects
+     * by calling the overridable $this->deleteRelated().
      *
      * @param Notice $notice Notice being deleted
      * 
diff --git a/plugins/Bookmark/BookmarkPlugin.php b/plugins/Bookmark/BookmarkPlugin.php
index 44f3db7867..1dc71d9dfa 100644
--- a/plugins/Bookmark/BookmarkPlugin.php
+++ b/plugins/Bookmark/BookmarkPlugin.php
@@ -365,8 +365,8 @@ class BookmarkPlugin extends MicroAppPlugin
     /**
      * Save a bookmark from an activity
      *
-     * @param Profile  $profile  Profile to use as author
      * @param Activity $activity Activity to save
+     * @param Profile  $profile  Profile to use as author
      * @param array    $options  Options to pass to bookmark-saving code
      *
      * @return Notice resulting notice

From b431a3b21686b67f2b8fc95feeb03f545e8e3ce3 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Mon, 7 Mar 2011 14:32:14 -0800
Subject: [PATCH 443/655] Rearrange alphanav to better fit 3CL

---
 plugins/Directory/DirectoryPlugin.php       |  2 +-
 plugins/Directory/actions/userdirectory.php | 13 +++++++++++--
 plugins/Directory/lib/alphanav.php          |  4 ++--
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/plugins/Directory/DirectoryPlugin.php b/plugins/Directory/DirectoryPlugin.php
index 50a0da7cf9..541ec556bf 100644
--- a/plugins/Directory/DirectoryPlugin.php
+++ b/plugins/Directory/DirectoryPlugin.php
@@ -121,7 +121,7 @@ class DirectoryPlugin extends Plugin
         $m->connect(
             'directory/users/:filter',
             array('action' => 'userdirectory'),
-            array('filter' => '[0-9a-zA-Z_]{1,64}')
+            array('filter' => '([0-9a-zA-Z_]{1,64}|0-9)')
         );
 
         return true;
diff --git a/plugins/Directory/actions/userdirectory.php b/plugins/Directory/actions/userdirectory.php
index 20ec5c19e3..24d91ad772 100644
--- a/plugins/Directory/actions/userdirectory.php
+++ b/plugins/Directory/actions/userdirectory.php
@@ -213,7 +213,7 @@ class UserdirectoryAction extends Action
 
         $this->elementStart('div', array('id' => 'user_directory'));
 
-        $alphaNav = new AlphaNav($this, true, array('All'));
+        $alphaNav = new AlphaNav($this, false, false, array('0-9', 'All'));
         $alphaNav->show();
 
         $profile = null;
@@ -320,7 +320,16 @@ class UserdirectoryAction extends Action
             $sort   = $this->getSortKey();
             $sql    = 'SELECT profile.* FROM profile, user WHERE profile.id = user.id';
 
-            if ($this->filter != 'all') {
+            switch($this->filter)
+            {
+            case 'all':
+                // NOOP
+                break;
+            case '0-9':
+                $sql .=
+                    '  AND LEFT(profile.nickname, 1) BETWEEN \'0\' AND \'9\'';
+                break;
+            default:
                 $sql .= sprintf(
                     ' AND LEFT(LOWER(profile.nickname), 1) = \'%s\'',
                     $this->filter
diff --git a/plugins/Directory/lib/alphanav.php b/plugins/Directory/lib/alphanav.php
index 645cdfa601..dadb589094 100644
--- a/plugins/Directory/lib/alphanav.php
+++ b/plugins/Directory/lib/alphanav.php
@@ -75,11 +75,11 @@ class AlphaNav extends Widget
             $this->filters = array_merge($this->filters, range(0, 9));
         }
 
+        $this->filters = array_merge($this->filters, range('A', 'Z'));
+
         if ($append) {
             $this->filters = array_merge($this->filters, $append);
         }
-
-        $this->filters = array_merge($this->filters, range('A', 'Z'));
     }
 
     /**

From 541613ce69be049dd93a9b05c82ad22b4d101714 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Mon, 7 Mar 2011 15:15:21 -0800
Subject: [PATCH 444/655] More doc comments on MicroApp stuff; some of the
 show-notice code & the ActivityStreams stuff is a bit wonky and may need
 smoothing out

---
 lib/activityobject.php              | 7 ++++++-
 lib/microappplugin.php              | 6 ++++++
 plugins/Bookmark/BookmarkPlugin.php | 7 +++++++
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/lib/activityobject.php b/lib/activityobject.php
index de2fcab767..d620bf27bb 100644
--- a/lib/activityobject.php
+++ b/lib/activityobject.php
@@ -613,6 +613,8 @@ class ActivityObject
             $this->poco->outputTo($xo);
         }
 
+        // @fixme there's no way here to make a tree; elements can only contain plaintext
+        // @fixme these may collide with JSON extensions
         foreach ($this->extra as $el) {
             list($extraTag, $attrs, $content) = $el;
             $xo->element($extraTag, $attrs, $content);
@@ -697,6 +699,7 @@ 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);
 
         // summary
@@ -708,7 +711,9 @@ class ActivityObject
         $object['url'] = $this->id;
 
         /* Extensions */
-
+        // @fixme these may collide with XML extensions
+        // @fixme multiple tags of same name will overwrite each other
+        // @fixme text content from XML extensions will be lost
         foreach ($this->extra as $e) {
             list($objectName, $props, $txt) = $e;
             $object[$objectName] = $props;
diff --git a/lib/microappplugin.php b/lib/microappplugin.php
index 8bc657f44a..93b70a0324 100644
--- a/lib/microappplugin.php
+++ b/lib/microappplugin.php
@@ -146,6 +146,10 @@ abstract class MicroAppPlugin extends Plugin
      *
      * @param Notice $notice
      * @param HTMLOutputter $out
+     *
+     * @fixme WARNING WARNING WARNING base plugin stuff below tries to close
+     * a div that this function opens in the BookmarkPlugin child class.
+     * This is probably wrong.
      */
     abstract function showNotice($notice, $out);
 
@@ -232,6 +236,8 @@ abstract class MicroAppPlugin extends Plugin
      * @param NoticeListItem $nli The list item being shown.
      *
      * @return boolean hook value
+     *
+     * @fixme WARNING WARNING WARNING this closes a 'div' that is implicitly opened in BookmarkPlugin's showNotice implementation
      */
 
     function onStartShowNoticeItem($nli)
diff --git a/plugins/Bookmark/BookmarkPlugin.php b/plugins/Bookmark/BookmarkPlugin.php
index 1dc71d9dfa..6c3f8cdc28 100644
--- a/plugins/Bookmark/BookmarkPlugin.php
+++ b/plugins/Bookmark/BookmarkPlugin.php
@@ -508,6 +508,13 @@ class BookmarkPlugin extends MicroAppPlugin
         return $object;
     }
 
+    /**
+     * @fixme WARNING WARNING WARNING this opens a 'div' that is apparently closed by MicroAppPlugin
+     * @fixme that's probably wrong?
+     *
+     * @param Notice $notice
+     * @param HTMLOutputter $out
+     */
     function showNotice($notice, $out)
     {
         $nb = Bookmark::getByNotice($notice);

From 68a3246f1cb1debf45687770fdf840af778694da Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Mon, 7 Mar 2011 17:18:30 -0800
Subject: [PATCH 445/655] Fixup sphinx plugin to have additional sort orders

---
 plugins/SphinxSearch/sphinxsearch.php | 32 ++++++++++++++++++++++++++-
 1 file changed, 31 insertions(+), 1 deletion(-)

diff --git a/plugins/SphinxSearch/sphinxsearch.php b/plugins/SphinxSearch/sphinxsearch.php
index 1ce9bfd72d..46b5e3e28a 100644
--- a/plugins/SphinxSearch/sphinxsearch.php
+++ b/plugins/SphinxSearch/sphinxsearch.php
@@ -73,9 +73,39 @@ class SphinxSearch extends SearchEngine
 
     function set_sort_mode($mode)
     {
-        if ('chron' === $mode) {
+        switch ($mode) {
+        case 'chron':
             $this->sphinx->SetSortMode(SPH_SORT_ATTR_DESC, 'created_ts');
             return $this->target->orderBy('id desc');
+            break;
+        case 'reverse_chron':
+            $this->sphinx->SetSortMode(SPH_SORT_ATTR_ASC, 'created_ts');
+            return $this->target->orderBy('id asc');
+            break;
+        case 'nickname_desc':
+            if ($this->table != 'profile') {
+                throw new Exception(
+                    'nickname_desc sort mode can only be use when searching profile.'
+                );
+            } else {
+                $this->sphinx->SetSortMode(SPH_SORT_ATTR_DESC, 'nickname');
+                return $this->target->orderBy('id desc');
+            }
+            break;
+        case 'nickname_asc':
+            if ($this->table != 'profile') {
+                throw new Exception(
+                    'nickname_desc sort mode can only be use when searching profile.'
+                );
+            } else {
+                $this->sphinx->SetSortMode(SPH_SORT_ATTR_ASC, 'nickname');
+                return $this->target->orderBy('id asc');
+            }
+            break;
+        default:
+            $this->sphinx->SetSortMode(SPH_SORT_ATTR_DESC, 'created_ts');
+            return $this->target->orderBy('id desc');
+            break;
         }
     }
 

From b9e2c727404b603bb97dc7c6ef75e3244c4506f3 Mon Sep 17 00:00:00 2001
From: Siebrand Mazeland <s.mazeland@xs4all.nl>
Date: Tue, 8 Mar 2011 02:18:32 +0100
Subject: [PATCH 446/655] Localisation updates from http://translatewiki.net.

---
 locale/ar/LC_MESSAGES/statusnet.po            | 212 +++---
 locale/arz/LC_MESSAGES/statusnet.po           | 215 +++---
 locale/bg/LC_MESSAGES/statusnet.po            | 210 +++---
 locale/br/LC_MESSAGES/statusnet.po            | 211 +++---
 locale/ca/LC_MESSAGES/statusnet.po            | 263 ++++---
 locale/cs/LC_MESSAGES/statusnet.po            | 215 +++---
 locale/de/LC_MESSAGES/statusnet.po            | 213 +++---
 locale/en_GB/LC_MESSAGES/statusnet.po         | 213 +++---
 locale/eo/LC_MESSAGES/statusnet.po            | 363 +++++-----
 locale/es/LC_MESSAGES/statusnet.po            | 211 +++---
 locale/fa/LC_MESSAGES/statusnet.po            | 229 +++----
 locale/fi/LC_MESSAGES/statusnet.po            | 213 +++---
 locale/fr/LC_MESSAGES/statusnet.po            | 211 +++---
 locale/fur/LC_MESSAGES/statusnet.po           | 225 +++---
 locale/gl/LC_MESSAGES/statusnet.po            | 262 ++++---
 locale/hsb/LC_MESSAGES/statusnet.po           | 220 +++---
 locale/hu/LC_MESSAGES/statusnet.po            | 219 +++---
 locale/ia/LC_MESSAGES/statusnet.po            | 232 +++----
 locale/it/LC_MESSAGES/statusnet.po            | 213 +++---
 locale/ja/LC_MESSAGES/statusnet.po            | 211 +++---
 locale/ka/LC_MESSAGES/statusnet.po            | 220 +++---
 locale/ko/LC_MESSAGES/statusnet.po            | 213 +++---
 locale/mk/LC_MESSAGES/statusnet.po            | 236 +++----
 locale/ml/LC_MESSAGES/statusnet.po            | 223 +++---
 locale/nb/LC_MESSAGES/statusnet.po            | 221 +++---
 locale/nl/LC_MESSAGES/statusnet.po            | 232 +++----
 locale/nn/LC_MESSAGES/statusnet.po            | 212 +++---
 locale/pl/LC_MESSAGES/statusnet.po            | 211 +++---
 locale/pt/LC_MESSAGES/statusnet.po            | 648 ++++++++----------
 locale/pt_BR/LC_MESSAGES/statusnet.po         | 211 +++---
 locale/ru/LC_MESSAGES/statusnet.po            | 215 +++---
 locale/statusnet.pot                          | 512 +++++++-------
 locale/sv/LC_MESSAGES/statusnet.po            | 211 +++---
 locale/te/LC_MESSAGES/statusnet.po            | 215 +++---
 locale/tr/LC_MESSAGES/statusnet.po            | 215 +++---
 locale/uk/LC_MESSAGES/statusnet.po            | 389 +++++------
 locale/zh_CN/LC_MESSAGES/statusnet.po         | 211 +++---
 .../locale/pt/LC_MESSAGES/AccountManager.po   |  27 +
 .../locale/uk/LC_MESSAGES/AccountManager.po   |  27 +
 plugins/Aim/locale/pt/LC_MESSAGES/Aim.po      |  34 +
 plugins/Aim/locale/uk/LC_MESSAGES/Aim.po      |  34 +
 plugins/Bookmark/locale/Bookmark.pot          |   8 +-
 .../locale/br/LC_MESSAGES/Bookmark.po         |  11 +-
 .../locale/de/LC_MESSAGES/Bookmark.po         |  11 +-
 .../locale/fr/LC_MESSAGES/Bookmark.po         |  11 +-
 .../locale/ia/LC_MESSAGES/Bookmark.po         |  11 +-
 .../locale/mk/LC_MESSAGES/Bookmark.po         |  11 +-
 .../locale/my/LC_MESSAGES/Bookmark.po         |  11 +-
 .../locale/nl/LC_MESSAGES/Bookmark.po         |  11 +-
 .../locale/ru/LC_MESSAGES/Bookmark.po         |  11 +-
 .../locale/te/LC_MESSAGES/Bookmark.po         |  11 +-
 .../locale/uk/LC_MESSAGES/Bookmark.po         |  11 +-
 .../locale/zh_CN/LC_MESSAGES/Bookmark.po      |  11 +-
 .../Disqus/locale/pt/LC_MESSAGES/Disqus.po    |  45 ++
 .../locale/uk/LC_MESSAGES/ExtendedProfile.po  |  98 +++
 .../locale/pt/LC_MESSAGES/ForceGroup.po       |  36 +
 .../pt/LC_MESSAGES/GroupPrivateMessage.po     |  52 ++
 plugins/Irc/locale/uk/LC_MESSAGES/Irc.po      |  39 ++
 .../locale/pt/LC_MESSAGES/Linkback.po         |  33 +
 .../locale/uk/LC_MESSAGES/MobileProfile.po    |  12 +-
 .../locale/pt/LC_MESSAGES/ModHelper.po        |  28 +
 plugins/Msn/locale/pt/LC_MESSAGES/Msn.po      |  29 +
 plugins/Msn/locale/uk/LC_MESSAGES/Msn.po      |  31 +
 .../locale/pt/LC_MESSAGES/NoticeTitle.po      |  30 +
 .../uk/LC_MESSAGES/StrictTransportSecurity.po |  30 +
 plugins/Xmpp/locale/pt/LC_MESSAGES/Xmpp.po    |  35 +
 plugins/Xmpp/locale/uk/LC_MESSAGES/Xmpp.po    |  36 +
 67 files changed, 5229 insertions(+), 4712 deletions(-)
 create mode 100644 plugins/AccountManager/locale/pt/LC_MESSAGES/AccountManager.po
 create mode 100644 plugins/AccountManager/locale/uk/LC_MESSAGES/AccountManager.po
 create mode 100644 plugins/Aim/locale/pt/LC_MESSAGES/Aim.po
 create mode 100644 plugins/Aim/locale/uk/LC_MESSAGES/Aim.po
 create mode 100644 plugins/Disqus/locale/pt/LC_MESSAGES/Disqus.po
 create mode 100644 plugins/ExtendedProfile/locale/uk/LC_MESSAGES/ExtendedProfile.po
 create mode 100644 plugins/ForceGroup/locale/pt/LC_MESSAGES/ForceGroup.po
 create mode 100644 plugins/GroupPrivateMessage/locale/pt/LC_MESSAGES/GroupPrivateMessage.po
 create mode 100644 plugins/Irc/locale/uk/LC_MESSAGES/Irc.po
 create mode 100644 plugins/Linkback/locale/pt/LC_MESSAGES/Linkback.po
 create mode 100644 plugins/ModHelper/locale/pt/LC_MESSAGES/ModHelper.po
 create mode 100644 plugins/Msn/locale/pt/LC_MESSAGES/Msn.po
 create mode 100644 plugins/Msn/locale/uk/LC_MESSAGES/Msn.po
 create mode 100644 plugins/NoticeTitle/locale/pt/LC_MESSAGES/NoticeTitle.po
 create mode 100644 plugins/StrictTransportSecurity/locale/uk/LC_MESSAGES/StrictTransportSecurity.po
 create mode 100644 plugins/Xmpp/locale/pt/LC_MESSAGES/Xmpp.po
 create mode 100644 plugins/Xmpp/locale/uk/LC_MESSAGES/Xmpp.po

diff --git a/locale/ar/LC_MESSAGES/statusnet.po b/locale/ar/LC_MESSAGES/statusnet.po
index 5e39b68475..655d9cc767 100644
--- a/locale/ar/LC_MESSAGES/statusnet.po
+++ b/locale/ar/LC_MESSAGES/statusnet.po
@@ -12,19 +12,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-06 02:34+0100\n"
-"PO-Revision-Date: 2011-03-06 01:36:06+0000\n"
+"POT-Creation-Date: 2011-03-08 01:03+0000\n"
+"PO-Revision-Date: 2011-03-08 01:04:58+0000\n"
 "Language-Team: Arabic <http://translatewiki.net/wiki/Portal:ar>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ar\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=6; plural=(n == 0) ? 0 : ( (n == 1) ? 1 : ( (n == "
 "2) ? 2 : ( (n%100 >= 3 && n%100 <= 10) ? 3 : ( (n%100 >= 11 && n%100 <= "
 "99) ? 4 : 5 ) ) ) );\n"
-"X-POT-Import-Date: 2011-03-03 17:59:19+0000\n"
+"X-POT-Import-Date: 2011-03-06 02:16:47+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -5911,82 +5911,9 @@ msgstr "رُد"
 msgid "Write a reply..."
 msgstr ""
 
-msgid "Home"
-msgstr "الرئيسية"
-
 #, fuzzy
-msgid "Friends timeline"
-msgstr "مسار %s الزمني"
-
-msgid "Your profile"
-msgstr "ملفك الشخصي"
-
-msgid "Public"
-msgstr "عام"
-
-#, fuzzy
-msgid "Everyone on this site"
-msgstr "ابحث عن أشخاص على هذا الموقع"
-
-msgid "Settings"
-msgstr "إعدادات"
-
-#, fuzzy
-msgid "Change your personal settings"
-msgstr "غيّر إعدادات ملفك الشخصي"
-
-#, fuzzy
-msgid "Site configuration"
-msgstr "ضبط المستخدم"
-
-msgid "Logout"
-msgstr "اخرج"
-
-msgid "Logout from the site"
-msgstr "اخرج من الموقع"
-
-msgid "Login to the site"
-msgstr "لُج إلى الموقع"
-
-msgid "Search"
-msgstr "ابحث"
-
-#, fuzzy
-msgid "Search the site"
-msgstr "ابحث في الموقع"
-
-#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-msgid "Help"
-msgstr "مساعدة"
-
-#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-msgid "About"
-msgstr "عن"
-
-#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-msgid "FAQ"
-msgstr "الأسئلة المكررة"
-
-#. TRANS: Secondary navigation menu option leading to Terms of Service.
-msgid "TOS"
-msgstr "الشروط"
-
-#. TRANS: Secondary navigation menu option leading to privacy policy.
-msgid "Privacy"
-msgstr "خصوصية"
-
-#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-msgid "Source"
-msgstr "المصدر"
-
-#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
-#. TRANS: StatusNet site, where to report bugs, ...
-msgid "Contact"
-msgstr "اتصل"
-
-#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-msgid "Badge"
-msgstr "الجسر"
+msgid "Status"
+msgstr "ستاتس نت"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #. TRANS: Text between [] is a link description, text between () is the link itself.
@@ -6810,6 +6737,12 @@ msgstr "اذهب إلى المُثبّت."
 msgid "Database error"
 msgstr "خطأ قاعدة بيانات"
 
+msgid "Home"
+msgstr "الرئيسية"
+
+msgid "Public"
+msgstr "عام"
+
 #. TRANS: Description of form for deleting a user.
 msgid "Delete this user"
 msgstr "احذف هذا المستخدم"
@@ -7426,6 +7359,18 @@ msgid ""
 "users in conversation. People can send you messages for your eyes only."
 msgstr ""
 
+msgid "Inbox"
+msgstr "صندوق الوارد"
+
+msgid "Your incoming messages"
+msgstr "رسائلك الواردة"
+
+msgid "Outbox"
+msgstr "صندوق الصادر"
+
+msgid "Your sent messages"
+msgstr "رسائلك المُرسلة"
+
 msgid "Could not parse message."
 msgstr "تعذّر تحليل الرسالة."
 
@@ -7504,6 +7449,20 @@ msgstr "رسالة"
 msgid "from"
 msgstr "من"
 
+msgid "Can't get author for activity."
+msgstr ""
+
+#, fuzzy
+msgid "Bookmark not posted to this group."
+msgstr "لا يسمح لك بحذف هذه المجموعة."
+
+#, fuzzy
+msgid "Object not posted to this user."
+msgstr "لا تحذف هذا المستخدم."
+
+msgid "Don't know how to handle this kind of target."
+msgstr ""
+
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 msgid "Nickname cannot be empty."
 msgstr ""
@@ -7621,24 +7580,15 @@ msgstr ""
 msgid "Couldn't insert new subscription."
 msgstr "تعذّر إدراج اشتراك جديد."
 
+msgid "Your profile"
+msgstr "ملفك الشخصي"
+
 msgid "Replies"
 msgstr "الردود"
 
 msgid "Favorites"
 msgstr "المفضلات"
 
-msgid "Inbox"
-msgstr "صندوق الوارد"
-
-msgid "Your incoming messages"
-msgstr "رسائلك الواردة"
-
-msgid "Outbox"
-msgstr "صندوق الصادر"
-
-msgid "Your sent messages"
-msgstr "رسائلك المُرسلة"
-
 #. TRANS: Title for personal tag cloud section. %s is a user nickname.
 #, php-format
 msgid "Tags in %s's notices"
@@ -7662,6 +7612,33 @@ msgctxt "plugin-description"
 msgid "(Plugin descriptions unavailable when disabled.)"
 msgstr ""
 
+msgid "Settings"
+msgstr "إعدادات"
+
+#, fuzzy
+msgid "Change your personal settings"
+msgstr "غيّر إعدادات ملفك الشخصي"
+
+#, fuzzy
+msgid "Site configuration"
+msgstr "ضبط المستخدم"
+
+msgid "Logout"
+msgstr "اخرج"
+
+msgid "Logout from the site"
+msgstr "اخرج من الموقع"
+
+msgid "Login to the site"
+msgstr "لُج إلى الموقع"
+
+msgid "Search"
+msgstr "ابحث"
+
+#, fuzzy
+msgid "Search the site"
+msgstr "ابحث في الموقع"
+
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
 msgid "Subscriptions"
@@ -7771,6 +7748,39 @@ msgstr "ابحث عن محتويات في الإشعارات"
 msgid "Find groups on this site"
 msgstr "ابحث عن مجموعات على هذا الموقع"
 
+#. TRANS: Secondary navigation menu option leading to help on StatusNet.
+msgid "Help"
+msgstr "مساعدة"
+
+#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
+msgid "About"
+msgstr "عن"
+
+#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
+msgid "FAQ"
+msgstr "الأسئلة المكررة"
+
+#. TRANS: Secondary navigation menu option leading to Terms of Service.
+msgid "TOS"
+msgstr "الشروط"
+
+#. TRANS: Secondary navigation menu option leading to privacy policy.
+msgid "Privacy"
+msgstr "خصوصية"
+
+#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
+msgid "Source"
+msgstr "المصدر"
+
+#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+msgid "Contact"
+msgstr "اتصل"
+
+#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
+msgid "Badge"
+msgstr "الجسر"
+
 msgid "Untitled section"
 msgstr "قسم غير مُعنون"
 
@@ -8077,20 +8087,10 @@ msgstr ""
 msgid "Getting backup from file '%s'."
 msgstr ""
 
-#~ msgid "Full name is too long (max 255 chars)."
-#~ msgstr "الاسم الكامل طويل جدا (الأقصى 255 حرفًا)"
-
-#~ msgid "description is too long (max %d chars)."
-#~ msgstr "المنظمة طويلة جدا (الأقصى %d حرفا)."
+#, fuzzy
+#~ msgid "Friends timeline"
+#~ msgstr "مسار %s الزمني"
 
 #, fuzzy
-#~ msgid "Location is too long (max 255 chars)."
-#~ msgstr "المنظمة طويلة جدا (الأقصى 255 حرفا)."
-
-#~ msgid "Too many aliases! Maximum %d."
-#~ msgstr "كنيات كيرة! العدد الأقصى هو %d."
-
-#, fuzzy
-#~ msgctxt "BUTTON"
-#~ msgid "Comment"
-#~ msgstr "المحتوى"
+#~ msgid "Everyone on this site"
+#~ msgstr "ابحث عن أشخاص على هذا الموقع"
diff --git a/locale/arz/LC_MESSAGES/statusnet.po b/locale/arz/LC_MESSAGES/statusnet.po
index 0b1b7510a7..f0c94461f9 100644
--- a/locale/arz/LC_MESSAGES/statusnet.po
+++ b/locale/arz/LC_MESSAGES/statusnet.po
@@ -11,19 +11,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-06 02:34+0100\n"
-"PO-Revision-Date: 2011-03-06 01:36:07+0000\n"
+"POT-Creation-Date: 2011-03-08 01:03+0000\n"
+"PO-Revision-Date: 2011-03-08 01:04:59+0000\n"
 "Language-Team: Egyptian Spoken Arabic <http://translatewiki.net/wiki/Portal:"
 "arz>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: arz\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=6; plural= n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
 "&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
-"X-POT-Import-Date: 2011-03-03 17:59:19+0000\n"
+"X-POT-Import-Date: 2011-03-06 02:16:47+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -5947,85 +5947,9 @@ msgstr "رُد"
 msgid "Write a reply..."
 msgstr ""
 
-msgid "Home"
-msgstr "الرئيسية"
-
 #, fuzzy
-msgid "Friends timeline"
-msgstr "مسار %s الزمني"
-
-#, fuzzy
-msgid "Your profile"
-msgstr "ملف المجموعه الشخصي"
-
-msgid "Public"
-msgstr "عام"
-
-#, fuzzy
-msgid "Everyone on this site"
-msgstr "ابحث عن أشخاص على هذا الموقع"
-
-#, fuzzy
-msgid "Settings"
-msgstr "تظبيطات الـSMS"
-
-#, fuzzy
-msgid "Change your personal settings"
-msgstr "غيّر إعدادات ملفك الشخصي"
-
-#, fuzzy
-msgid "Site configuration"
-msgstr "ضبط المسارات"
-
-msgid "Logout"
-msgstr "اخرج"
-
-msgid "Logout from the site"
-msgstr "اخرج من الموقع"
-
-msgid "Login to the site"
-msgstr "لُج إلى الموقع"
-
-msgid "Search"
-msgstr "ابحث"
-
-#, fuzzy
-msgid "Search the site"
-msgstr "ابحث فى الموقع"
-
-#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-msgid "Help"
-msgstr "مساعدة"
-
-#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-msgid "About"
-msgstr "عن"
-
-#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-msgid "FAQ"
-msgstr "الأسئله المكررة"
-
-#. TRANS: Secondary navigation menu option leading to Terms of Service.
-msgid "TOS"
-msgstr "الشروط"
-
-#. TRANS: Secondary navigation menu option leading to privacy policy.
-msgid "Privacy"
-msgstr "خصوصية"
-
-#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-msgid "Source"
-msgstr "المصدر"
-
-#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
-#. TRANS: StatusNet site, where to report bugs, ...
-msgid "Contact"
-msgstr "اتصل"
-
-#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#, fuzzy
-msgid "Badge"
-msgstr "نبّه"
+msgid "Status"
+msgstr "StatusNet"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #. TRANS: Text between [] is a link description, text between () is the link itself.
@@ -6823,6 +6747,12 @@ msgstr "اذهب إلى المُثبّت."
 msgid "Database error"
 msgstr "خطأ قاعده بيانات"
 
+msgid "Home"
+msgstr "الرئيسية"
+
+msgid "Public"
+msgstr "عام"
+
 #. TRANS: Description of form for deleting a user.
 msgid "Delete this user"
 msgstr "احذف هذا المستخدم"
@@ -7422,6 +7352,18 @@ msgid ""
 "users in conversation. People can send you messages for your eyes only."
 msgstr ""
 
+msgid "Inbox"
+msgstr "صندوق الوارد"
+
+msgid "Your incoming messages"
+msgstr "رسائلك الواردة"
+
+msgid "Outbox"
+msgstr "صندوق الصادر"
+
+msgid "Your sent messages"
+msgstr "رسائلك المُرسلة"
+
 msgid "Could not parse message."
 msgstr "تعذّر تحليل الرساله."
 
@@ -7500,6 +7442,20 @@ msgstr "رسالة"
 msgid "from"
 msgstr "من"
 
+msgid "Can't get author for activity."
+msgstr ""
+
+#, fuzzy
+msgid "Bookmark not posted to this group."
+msgstr "لست عضوا فى تلك المجموعه."
+
+#, fuzzy
+msgid "Object not posted to this user."
+msgstr "لا تحذف هذا الإشعار"
+
+msgid "Don't know how to handle this kind of target."
+msgstr ""
+
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 msgid "Nickname cannot be empty."
 msgstr ""
@@ -7617,24 +7573,16 @@ msgstr ""
 msgid "Couldn't insert new subscription."
 msgstr "تعذّر إدراج اشتراك جديد."
 
+#, fuzzy
+msgid "Your profile"
+msgstr "ملف المجموعه الشخصي"
+
 msgid "Replies"
 msgstr "الردود"
 
 msgid "Favorites"
 msgstr "المفضلات"
 
-msgid "Inbox"
-msgstr "صندوق الوارد"
-
-msgid "Your incoming messages"
-msgstr "رسائلك الواردة"
-
-msgid "Outbox"
-msgstr "صندوق الصادر"
-
-msgid "Your sent messages"
-msgstr "رسائلك المُرسلة"
-
 #. TRANS: Title for personal tag cloud section. %s is a user nickname.
 #, fuzzy, php-format
 msgid "Tags in %s's notices"
@@ -7658,6 +7606,34 @@ msgctxt "plugin-description"
 msgid "(Plugin descriptions unavailable when disabled.)"
 msgstr ""
 
+#, fuzzy
+msgid "Settings"
+msgstr "تظبيطات الـSMS"
+
+#, fuzzy
+msgid "Change your personal settings"
+msgstr "غيّر إعدادات ملفك الشخصي"
+
+#, fuzzy
+msgid "Site configuration"
+msgstr "ضبط المسارات"
+
+msgid "Logout"
+msgstr "اخرج"
+
+msgid "Logout from the site"
+msgstr "اخرج من الموقع"
+
+msgid "Login to the site"
+msgstr "لُج إلى الموقع"
+
+msgid "Search"
+msgstr "ابحث"
+
+#, fuzzy
+msgid "Search the site"
+msgstr "ابحث فى الموقع"
+
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
 msgid "Subscriptions"
@@ -7768,6 +7744,40 @@ msgstr "ابحث عن محتويات فى الإشعارات"
 msgid "Find groups on this site"
 msgstr "ابحث عن مجموعات على هذا الموقع"
 
+#. TRANS: Secondary navigation menu option leading to help on StatusNet.
+msgid "Help"
+msgstr "مساعدة"
+
+#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
+msgid "About"
+msgstr "عن"
+
+#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
+msgid "FAQ"
+msgstr "الأسئله المكررة"
+
+#. TRANS: Secondary navigation menu option leading to Terms of Service.
+msgid "TOS"
+msgstr "الشروط"
+
+#. TRANS: Secondary navigation menu option leading to privacy policy.
+msgid "Privacy"
+msgstr "خصوصية"
+
+#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
+msgid "Source"
+msgstr "المصدر"
+
+#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+msgid "Contact"
+msgstr "اتصل"
+
+#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
+#, fuzzy
+msgid "Badge"
+msgstr "نبّه"
+
 msgid "Untitled section"
 msgstr "قسم غير مُعنون"
 
@@ -8076,17 +8086,10 @@ msgstr ""
 msgid "Getting backup from file '%s'."
 msgstr ""
 
-#~ msgid "Full name is too long (max 255 chars)."
-#~ msgstr "الاسم الكامل طويل جدا (الأقصى 255 حرفًا)"
-
-#~ msgid "description is too long (max %d chars)."
-#~ msgstr "المنظمه طويله جدا (اكتر حاجه %d رمز)."
+#, fuzzy
+#~ msgid "Friends timeline"
+#~ msgstr "مسار %s الزمني"
 
 #, fuzzy
-#~ msgid "Location is too long (max 255 chars)."
-#~ msgstr "المنظمه طويله جدا (اكتر حاجه 255 رمز)."
-
-#, fuzzy
-#~ msgctxt "BUTTON"
-#~ msgid "Comment"
-#~ msgstr "المحتوى"
+#~ msgid "Everyone on this site"
+#~ msgstr "ابحث عن أشخاص على هذا الموقع"
diff --git a/locale/bg/LC_MESSAGES/statusnet.po b/locale/bg/LC_MESSAGES/statusnet.po
index b783c1fa31..e9a3b189d3 100644
--- a/locale/bg/LC_MESSAGES/statusnet.po
+++ b/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-03-06 02:34+0100\n"
-"PO-Revision-Date: 2011-03-06 01:36:08+0000\n"
+"POT-Creation-Date: 2011-03-08 01:03+0000\n"
+"PO-Revision-Date: 2011-03-08 01:05:00+0000\n"
 "Language-Team: Bulgarian <http://translatewiki.net/wiki/Portal:bg>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: bg\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-03-03 17:59:19+0000\n"
+"X-POT-Import-Date: 2011-03-06 02:16:47+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -5954,83 +5954,9 @@ msgstr "Отговор"
 msgid "Write a reply..."
 msgstr ""
 
-msgid "Home"
-msgstr "Лична страница"
-
 #, fuzzy
-msgid "Friends timeline"
-msgstr "Поток на %s"
-
-#, fuzzy
-msgid "Your profile"
-msgstr "Профил на групата"
-
-msgid "Public"
-msgstr "Общ поток"
-
-#, fuzzy
-msgid "Everyone on this site"
-msgstr "Търсене на хора в сайта"
-
-msgid "Settings"
-msgstr "Настройки за SMS"
-
-#, fuzzy
-msgid "Change your personal settings"
-msgstr "Промяна настройките на профила"
-
-#, fuzzy
-msgid "Site configuration"
-msgstr "Настройка на пътищата"
-
-msgid "Logout"
-msgstr "Изход"
-
-msgid "Logout from the site"
-msgstr "Излизане от сайта"
-
-msgid "Login to the site"
-msgstr "Влизане в сайта"
-
-msgid "Search"
-msgstr "Търсене"
-
-#, fuzzy
-msgid "Search the site"
-msgstr "Търсене в сайта"
-
-#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-msgid "Help"
-msgstr "Помощ"
-
-#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-msgid "About"
-msgstr "Относно"
-
-#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-msgid "FAQ"
-msgstr "Въпроси"
-
-#. TRANS: Secondary navigation menu option leading to Terms of Service.
-msgid "TOS"
-msgstr "Условия"
-
-#. TRANS: Secondary navigation menu option leading to privacy policy.
-msgid "Privacy"
-msgstr "Поверителност"
-
-#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-msgid "Source"
-msgstr "Изходен код"
-
-#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
-#. TRANS: StatusNet site, where to report bugs, ...
-msgid "Contact"
-msgstr "Контакт"
-
-#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-msgid "Badge"
-msgstr "Табелка"
+msgid "Status"
+msgstr "StatusNet"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #. TRANS: Text between [] is a link description, text between () is the link itself.
@@ -6811,6 +6737,12 @@ msgstr "Влизане в сайта"
 msgid "Database error"
 msgstr "Грешка в базата от данни"
 
+msgid "Home"
+msgstr "Лична страница"
+
+msgid "Public"
+msgstr "Общ поток"
+
 #. TRANS: Description of form for deleting a user.
 msgid "Delete this user"
 msgstr "Изтриване на този потребител"
@@ -7399,6 +7331,18 @@ msgid ""
 "users in conversation. People can send you messages for your eyes only."
 msgstr ""
 
+msgid "Inbox"
+msgstr "Входящи"
+
+msgid "Your incoming messages"
+msgstr "Получените от вас съобщения"
+
+msgid "Outbox"
+msgstr "Изходящи"
+
+msgid "Your sent messages"
+msgstr "Изпратените от вас съобщения"
+
 msgid "Could not parse message."
 msgstr "Грешка при обработка на съобщението"
 
@@ -7476,6 +7420,20 @@ msgstr "Съобщение"
 msgid "from"
 msgstr "от"
 
+msgid "Can't get author for activity."
+msgstr ""
+
+#, fuzzy
+msgid "Bookmark not posted to this group."
+msgstr "Не членувате в тази група."
+
+#, fuzzy
+msgid "Object not posted to this user."
+msgstr "Да не се изтрива бележката"
+
+msgid "Don't know how to handle this kind of target."
+msgstr ""
+
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 msgid "Nickname cannot be empty."
 msgstr ""
@@ -7589,24 +7547,16 @@ msgstr ""
 msgid "Couldn't insert new subscription."
 msgstr "Грешка при добавяне на нов абонамент."
 
+#, fuzzy
+msgid "Your profile"
+msgstr "Профил на групата"
+
 msgid "Replies"
 msgstr "Отговори"
 
 msgid "Favorites"
 msgstr "Любими"
 
-msgid "Inbox"
-msgstr "Входящи"
-
-msgid "Your incoming messages"
-msgstr "Получените от вас съобщения"
-
-msgid "Outbox"
-msgstr "Изходящи"
-
-msgid "Your sent messages"
-msgstr "Изпратените от вас съобщения"
-
 #. TRANS: Title for personal tag cloud section. %s is a user nickname.
 #, php-format
 msgid "Tags in %s's notices"
@@ -7630,6 +7580,33 @@ msgctxt "plugin-description"
 msgid "(Plugin descriptions unavailable when disabled.)"
 msgstr ""
 
+msgid "Settings"
+msgstr "Настройки за SMS"
+
+#, fuzzy
+msgid "Change your personal settings"
+msgstr "Промяна настройките на профила"
+
+#, fuzzy
+msgid "Site configuration"
+msgstr "Настройка на пътищата"
+
+msgid "Logout"
+msgstr "Изход"
+
+msgid "Logout from the site"
+msgstr "Излизане от сайта"
+
+msgid "Login to the site"
+msgstr "Влизане в сайта"
+
+msgid "Search"
+msgstr "Търсене"
+
+#, fuzzy
+msgid "Search the site"
+msgstr "Търсене в сайта"
+
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
 msgid "Subscriptions"
@@ -7742,6 +7719,39 @@ msgstr "Търсене в съдържанието на бележките"
 msgid "Find groups on this site"
 msgstr "Търсене на групи в сайта"
 
+#. TRANS: Secondary navigation menu option leading to help on StatusNet.
+msgid "Help"
+msgstr "Помощ"
+
+#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
+msgid "About"
+msgstr "Относно"
+
+#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
+msgid "FAQ"
+msgstr "Въпроси"
+
+#. TRANS: Secondary navigation menu option leading to Terms of Service.
+msgid "TOS"
+msgstr "Условия"
+
+#. TRANS: Secondary navigation menu option leading to privacy policy.
+msgid "Privacy"
+msgstr "Поверителност"
+
+#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
+msgid "Source"
+msgstr "Изходен код"
+
+#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+msgid "Contact"
+msgstr "Контакт"
+
+#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
+msgid "Badge"
+msgstr "Табелка"
+
 msgid "Untitled section"
 msgstr "Неозаглавен раздел"
 
@@ -8028,16 +8038,10 @@ msgstr ""
 msgid "Getting backup from file '%s'."
 msgstr ""
 
-#~ msgid "Full name is too long (max 255 chars)."
-#~ msgstr "Пълното име е твърде дълго (макс. 255 знака)"
-
-#~ msgid "description is too long (max %d chars)."
-#~ msgstr "Описанието е твърде дълго (до %d символа)."
-
-#~ msgid "Location is too long (max 255 chars)."
-#~ msgstr "Името на местоположението е твърде дълго (макс. 255 знака)."
+#, fuzzy
+#~ msgid "Friends timeline"
+#~ msgstr "Поток на %s"
 
 #, fuzzy
-#~ msgctxt "BUTTON"
-#~ msgid "Comment"
-#~ msgstr "Съдържание"
+#~ msgid "Everyone on this site"
+#~ msgstr "Търсене на хора в сайта"
diff --git a/locale/br/LC_MESSAGES/statusnet.po b/locale/br/LC_MESSAGES/statusnet.po
index 9e987d19f4..b6aefb027d 100644
--- a/locale/br/LC_MESSAGES/statusnet.po
+++ b/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-03-06 02:34+0100\n"
-"PO-Revision-Date: 2011-03-06 01:36:09+0000\n"
+"POT-Creation-Date: 2011-03-08 01:03+0000\n"
+"PO-Revision-Date: 2011-03-08 01:05:02+0000\n"
 "Language-Team: Breton <http://translatewiki.net/wiki/Portal:br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-POT-Import-Date: 2011-03-03 17:59:19+0000\n"
+"X-POT-Import-Date: 2011-03-06 02:16:47+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -5867,80 +5867,9 @@ msgstr "Respont"
 msgid "Write a reply..."
 msgstr ""
 
-msgid "Home"
-msgstr "Degemer"
-
 #, fuzzy
-msgid "Friends timeline"
-msgstr "Oberezhioù %s"
-
-msgid "Your profile"
-msgstr "Ho profil"
-
-msgid "Public"
-msgstr "Foran"
-
-#, fuzzy
-msgid "Everyone on this site"
-msgstr "Klask tud el lec'hienn-mañ"
-
-msgid "Settings"
-msgstr "Arventennoù"
-
-msgid "Change your personal settings"
-msgstr "Kemmañ ho arventennoù hiniennel"
-
-#, fuzzy
-msgid "Site configuration"
-msgstr "Kefluniadur an implijer"
-
-msgid "Logout"
-msgstr "Digevreañ"
-
-msgid "Logout from the site"
-msgstr "Digevreañ diouzh al lec'hienn"
-
-msgid "Login to the site"
-msgstr "Kevreañ d'al lec'hienn"
-
-msgid "Search"
-msgstr "Klask"
-
-msgid "Search the site"
-msgstr "Klask el lec'hienn"
-
-#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-msgid "Help"
-msgstr "Skoazell"
-
-#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-msgid "About"
-msgstr "Diwar-benn"
-
-#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-msgid "FAQ"
-msgstr "FAG"
-
-#. TRANS: Secondary navigation menu option leading to Terms of Service.
-msgid "TOS"
-msgstr "AIH"
-
-#. TRANS: Secondary navigation menu option leading to privacy policy.
-msgid "Privacy"
-msgstr "Prevezded"
-
-#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-msgid "Source"
-msgstr "Mammenn"
-
-#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
-#. TRANS: StatusNet site, where to report bugs, ...
-msgid "Contact"
-msgstr "Darempred"
-
-#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-msgid "Badge"
-msgstr "Badj"
+msgid "Status"
+msgstr "StatusNet"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #. TRANS: Text between [] is a link description, text between () is the link itself.
@@ -6704,6 +6633,12 @@ msgstr "Mont d'ar meziant staliañ"
 msgid "Database error"
 msgstr "Fazi bank roadennoù"
 
+msgid "Home"
+msgstr "Degemer"
+
+msgid "Public"
+msgstr "Foran"
+
 #. TRANS: Description of form for deleting a user.
 msgid "Delete this user"
 msgstr "Diverkañ an implijer-mañ"
@@ -7285,6 +7220,18 @@ msgid ""
 "users in conversation. People can send you messages for your eyes only."
 msgstr ""
 
+msgid "Inbox"
+msgstr "Boest resev"
+
+msgid "Your incoming messages"
+msgstr "Ar gemennadennoù ho peus resevet"
+
+msgid "Outbox"
+msgstr "Boest kas"
+
+msgid "Your sent messages"
+msgstr "Ar c'hemenadennoù kaset ganeoc'h"
+
 #, fuzzy
 msgid "Could not parse message."
 msgstr "Diposubl eo ensoc'hañ ur gemenadenn"
@@ -7364,6 +7311,20 @@ msgstr "Kemennadennoù"
 msgid "from"
 msgstr "eus"
 
+msgid "Can't get author for activity."
+msgstr ""
+
+#, fuzzy
+msgid "Bookmark not posted to this group."
+msgstr "N'oc'h ket aotreet da zilemel ar gont-mañ."
+
+#, fuzzy
+msgid "Object not posted to this user."
+msgstr "Arabat dilemel an implijer-mañ"
+
+msgid "Don't know how to handle this kind of target."
+msgstr ""
+
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 msgid "Nickname cannot be empty."
 msgstr ""
@@ -7477,24 +7438,15 @@ msgstr ""
 msgid "Couldn't insert new subscription."
 msgstr "Dibosupl eo dilemel ar c'houmanant."
 
+msgid "Your profile"
+msgstr "Ho profil"
+
 msgid "Replies"
 msgstr "Respontoù"
 
 msgid "Favorites"
 msgstr "Pennrolloù"
 
-msgid "Inbox"
-msgstr "Boest resev"
-
-msgid "Your incoming messages"
-msgstr "Ar gemennadennoù ho peus resevet"
-
-msgid "Outbox"
-msgstr "Boest kas"
-
-msgid "Your sent messages"
-msgstr "Ar c'hemenadennoù kaset ganeoc'h"
-
 #. TRANS: Title for personal tag cloud section. %s is a user nickname.
 #, fuzzy, php-format
 msgid "Tags in %s's notices"
@@ -7518,6 +7470,31 @@ msgctxt "plugin-description"
 msgid "(Plugin descriptions unavailable when disabled.)"
 msgstr ""
 
+msgid "Settings"
+msgstr "Arventennoù"
+
+msgid "Change your personal settings"
+msgstr "Kemmañ ho arventennoù hiniennel"
+
+#, fuzzy
+msgid "Site configuration"
+msgstr "Kefluniadur an implijer"
+
+msgid "Logout"
+msgstr "Digevreañ"
+
+msgid "Logout from the site"
+msgstr "Digevreañ diouzh al lec'hienn"
+
+msgid "Login to the site"
+msgstr "Kevreañ d'al lec'hienn"
+
+msgid "Search"
+msgstr "Klask"
+
+msgid "Search the site"
+msgstr "Klask el lec'hienn"
+
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
 msgid "Subscriptions"
@@ -7629,6 +7606,39 @@ msgstr "Klask alioù en danvez"
 msgid "Find groups on this site"
 msgstr "Klask strolladoù el lec'hienn-mañ"
 
+#. TRANS: Secondary navigation menu option leading to help on StatusNet.
+msgid "Help"
+msgstr "Skoazell"
+
+#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
+msgid "About"
+msgstr "Diwar-benn"
+
+#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
+msgid "FAQ"
+msgstr "FAG"
+
+#. TRANS: Secondary navigation menu option leading to Terms of Service.
+msgid "TOS"
+msgstr "AIH"
+
+#. TRANS: Secondary navigation menu option leading to privacy policy.
+msgid "Privacy"
+msgstr "Prevezded"
+
+#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
+msgid "Source"
+msgstr "Mammenn"
+
+#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+msgid "Contact"
+msgstr "Darempred"
+
+#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
+msgid "Badge"
+msgstr "Badj"
+
 msgid "Untitled section"
 msgstr "Rann hep titl"
 
@@ -7914,21 +7924,10 @@ msgstr ""
 msgid "Getting backup from file '%s'."
 msgstr ""
 
-#~ msgid "Full name is too long (max 255 chars)."
-#~ msgstr "Re hir eo an anv klok (255 arouezenn d'ar muiañ)."
+#, fuzzy
+#~ msgid "Friends timeline"
+#~ msgstr "Oberezhioù %s"
 
-#~ msgid "description is too long (max %d chars)."
-#~ msgstr "re hir eo an deskrivadur (%d arouezenn d'ar muiañ)."
-
-#~ msgid "Location is too long (max 255 chars)."
-#~ msgstr "Re hir eo al lec'hiadur (255 arouezenn d'ar muiañ)."
-
-#~ msgid "Too many aliases! Maximum %d."
-#~ msgstr "Re a aliasoù ! %d d'ar muiañ."
-
-#~ msgctxt "BUTTON"
-#~ msgid "Comment"
-#~ msgstr "Evezhiadenn"
-
-#~ msgid "Add a comment..."
-#~ msgstr "Ouzhpennañ un evezhiadenn..."
+#, fuzzy
+#~ msgid "Everyone on this site"
+#~ msgstr "Klask tud el lec'hienn-mañ"
diff --git a/locale/ca/LC_MESSAGES/statusnet.po b/locale/ca/LC_MESSAGES/statusnet.po
index 0ccbd9d1d9..37f2527a9f 100644
--- a/locale/ca/LC_MESSAGES/statusnet.po
+++ b/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-03-06 02:34+0100\n"
-"PO-Revision-Date: 2011-03-06 01:36:10+0000\n"
+"POT-Creation-Date: 2011-03-08 01:03+0000\n"
+"PO-Revision-Date: 2011-03-08 01:05:03+0000\n"
 "Language-Team: Catalan <http://translatewiki.net/wiki/Portal:ca>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ca\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-03-03 17:59:19+0000\n"
+"X-POT-Import-Date: 2011-03-06 02:16:47+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -2590,7 +2590,7 @@ msgstr "Adreça de missatgeria instantània"
 
 #, php-format
 msgid "%s screenname."
-msgstr ""
+msgstr "Nom en pantalla %s"
 
 #. TRANS: Header for IM preferences form.
 #, fuzzy
@@ -2634,9 +2634,8 @@ msgstr "S'han desat les preferències."
 msgid "No screenname."
 msgstr "Cap sobrenom."
 
-#, fuzzy
 msgid "No transport."
-msgstr "Cap avís."
+msgstr "No hi ha cap transport."
 
 #. TRANS: Message given saving IM address that cannot be normalised.
 #, fuzzy
@@ -2959,9 +2958,8 @@ msgid "Type"
 msgstr "Tipus"
 
 #. TRANS: Dropdown field instructions in the license admin panel.
-#, fuzzy
 msgid "Select a license."
-msgstr "Seleccioneu la llicència"
+msgstr "Seleccioneu una llicència."
 
 #. TRANS: Form legend in the license admin panel.
 msgid "License details"
@@ -3000,9 +2998,8 @@ msgid "URL for an image to display with the license."
 msgstr "URL de la imatge que es mostrarà juntament amb la llicència."
 
 #. TRANS: Button title in the license admin panel.
-#, fuzzy
 msgid "Save license settings."
-msgstr "Desa els paràmetres de la llicència"
+msgstr "Desa els paràmetres de la llicència."
 
 #. TRANS: Client error displayed when trying to log in while already logged in.
 #. TRANS: Client error displayed trying to use "one time password login" when already logged in.
@@ -3039,10 +3036,9 @@ msgstr ""
 "compartits!"
 
 #. TRANS: Button text for log in on login page.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Login"
-msgstr "Inici de sessió"
+msgstr "Inicia una sessió"
 
 #. TRANS: Link text for link to "reset password" on login page.
 msgid "Lost or forgotten password?"
@@ -3136,9 +3132,8 @@ msgstr "Nou missatge"
 
 #. TRANS: Client error displayed trying to send a direct message to a user while sender and
 #. TRANS: receiver are not subscribed to each other.
-#, fuzzy
 msgid "You cannot send a message to this user."
-msgstr "No podeu enviar un misssatge a aquest usuari."
+msgstr "No podeu enviar un missatge a l'usuari."
 
 #. TRANS: Form validator error displayed trying to send a direct message without content.
 #. TRANS: Client error displayed trying to send a notice without content.
@@ -3686,16 +3681,15 @@ msgstr "Usuaris que s'han etiquetat amb %1$s - pàgina %2$d"
 #. TRANS: Page title for AJAX form return when a disabling a plugin.
 msgctxt "plugin"
 msgid "Disabled"
-msgstr ""
+msgstr "Inhabilitat"
 
 #. TRANS: Client error displayed trying to perform any request method other than POST.
 #. TRANS: Do not translate POST.
 msgid "This action only accepts POST requests."
 msgstr "Aquesta acció només accepta sol·licituds POST."
 
-#, fuzzy
 msgid "You cannot administer plugins."
-msgstr "No podeu eliminar els usuaris."
+msgstr "No es poden administrar els connectors."
 
 #, fuzzy
 msgid "No such plugin."
@@ -3704,7 +3698,7 @@ msgstr "No existeix la pàgina."
 #. TRANS: Page title for AJAX form return when enabling a plugin.
 msgctxt "plugin"
 msgid "Enabled"
-msgstr ""
+msgstr "Habilitat"
 
 #. TRANS: Tab and title for plugins admin panel.
 #. TRANS: Menu item for site administration
@@ -3717,15 +3711,19 @@ msgid ""
 "\"http://status.net/wiki/Plugins\">online plugin documentation</a> for more "
 "details."
 msgstr ""
+"Es poden configurar i habilitar connectors addicionals manualment. Vegeu la "
+"<a href=\"http://status.net/wiki/Plugins\">documentació en línia sobre els "
+"connectors</a> per a més detalls."
 
 #. TRANS: Admin form section header
-#, fuzzy
 msgid "Default plugins"
-msgstr "Llengua per defecte"
+msgstr "Connectors per defecte"
 
 msgid ""
 "All default plugins have been disabled from the site's configuration file."
 msgstr ""
+"S'han inhabilitat tots els connectors per defecte del fitxer de configuració "
+"del lloc."
 
 msgid "Invalid notice content."
 msgstr "El contingut de l'avís no és vàlid."
@@ -5309,7 +5307,7 @@ msgid "[none]"
 msgstr "Cap"
 
 msgid "[internal]"
-msgstr ""
+msgstr "[intern]"
 
 #. TRANS: Label for dropdown with URL shortener services.
 msgid "Shorten URLs with"
@@ -5560,9 +5558,8 @@ msgstr "Visualitza els dissenys de perfil"
 msgid "Show or hide profile designs."
 msgstr "Mostra o amaga els dissenys de perfil."
 
-#, fuzzy
 msgid "Background file"
-msgstr "Fons"
+msgstr "Fitxer de fons"
 
 #. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number.
 #, php-format
@@ -5966,92 +5963,17 @@ msgid "Show more"
 msgstr "Mostra més"
 
 #. TRANS: Inline reply form submit button: submits a reply comment.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Reply"
 msgstr "Respon"
 
 #. TRANS: Placeholder text for inline reply form. Clicking in this box will turn it into a mini notice form.
 msgid "Write a reply..."
-msgstr ""
-
-msgid "Home"
-msgstr "Pàgina personal"
+msgstr "Escriviu una resposta..."
 
 #, fuzzy
-msgid "Friends timeline"
-msgstr "%s línia temporal"
-
-#, fuzzy
-msgid "Your profile"
-msgstr "Perfil del grup"
-
-msgid "Public"
-msgstr "Públic"
-
-#, fuzzy
-msgid "Everyone on this site"
-msgstr "Cerca gent en aquest lloc"
-
-msgid "Settings"
-msgstr "Paràmetres de l'SMS"
-
-#, fuzzy
-msgid "Change your personal settings"
-msgstr "Canvieu els paràmetres del vostre perfil"
-
-#, fuzzy
-msgid "Site configuration"
-msgstr "Configuració de l'usuari"
-
-msgid "Logout"
-msgstr "Finalitza la sessió"
-
-msgid "Logout from the site"
-msgstr "Finalitza la sessió del lloc"
-
-msgid "Login to the site"
-msgstr "Inicia una sessió al lloc"
-
-msgid "Search"
-msgstr "Cerca"
-
-#, fuzzy
-msgid "Search the site"
-msgstr "Cerca al lloc"
-
-#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-msgid "Help"
-msgstr "Ajuda"
-
-#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-msgid "About"
-msgstr "Quant a"
-
-#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-msgid "FAQ"
-msgstr "Preguntes més freqüents"
-
-#. TRANS: Secondary navigation menu option leading to Terms of Service.
-msgid "TOS"
-msgstr "Termes del servei"
-
-#. TRANS: Secondary navigation menu option leading to privacy policy.
-msgid "Privacy"
-msgstr "Privadesa"
-
-#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-msgid "Source"
-msgstr "Font"
-
-#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
-#. TRANS: StatusNet site, where to report bugs, ...
-msgid "Contact"
-msgstr "Contacte"
-
-#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-msgid "Badge"
-msgstr "Insígnia"
+msgid "Status"
+msgstr "StatusNet"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #. TRANS: Text between [] is a link description, text between () is the link itself.
@@ -6278,9 +6200,8 @@ msgid "Set site license"
 msgstr "Defineix la llicència del lloc"
 
 #. TRANS: Menu item title/tooltip
-#, fuzzy
 msgid "Plugins configuration"
-msgstr "Configuració dels camins"
+msgstr "Configuració dels connectors"
 
 #. TRANS: Client error 401.
 msgid "API resource requires read-write access, but you only have read access."
@@ -6539,9 +6460,8 @@ msgstr ""
 "Avisos: %3$s"
 
 #. TRANS: Error message text shown when a favorite could not be set because it has already been favorited.
-#, fuzzy
 msgid "Could not create favorite: already favorited."
-msgstr "No es pot crear el preferit."
+msgstr "No es pot crear el preferit: ja era preferit."
 
 #. TRANS: Text shown when a notice has been marked as favourite successfully.
 msgid "Notice marked as fave."
@@ -6851,13 +6771,18 @@ msgstr "Vés a l'instal·lador."
 msgid "Database error"
 msgstr "Error de la base de dades"
 
+msgid "Home"
+msgstr "Pàgina personal"
+
+msgid "Public"
+msgstr "Públic"
+
 #. TRANS: Description of form for deleting a user.
 msgid "Delete this user"
 msgstr "Elimina l'usuari"
 
-#, fuzzy
 msgid "Change design"
-msgstr "Desa el disseny"
+msgstr "Canvia el disseny"
 
 #. TRANS: Fieldset legend on profile design page to change profile page colours.
 msgid "Change colours"
@@ -6881,7 +6806,6 @@ msgid "Upload file"
 msgstr "Puja un fitxer"
 
 #. TRANS: Instructions for form on profile design page.
-#, fuzzy
 msgid ""
 "You can upload your personal background image. The maximum file size is 2Mb."
 msgstr ""
@@ -7526,6 +7450,18 @@ msgstr ""
 "usuaris en la conversa. La gent pot enviar-vos missatges només per als "
 "vostres ulls."
 
+msgid "Inbox"
+msgstr "Safata d'entrada"
+
+msgid "Your incoming messages"
+msgstr "Els teus missatges rebuts"
+
+msgid "Outbox"
+msgstr "Safata de sortida"
+
+msgid "Your sent messages"
+msgstr "Els teus missatges enviats"
+
 msgid "Could not parse message."
 msgstr "No es pot analitzar el missatge."
 
@@ -7603,6 +7539,20 @@ msgstr "Missatges"
 msgid "from"
 msgstr "de"
 
+msgid "Can't get author for activity."
+msgstr ""
+
+#, fuzzy
+msgid "Bookmark not posted to this group."
+msgstr "No teniu permisos per eliminar el grup."
+
+#, fuzzy
+msgid "Object not posted to this user."
+msgstr "No eliminis l'usuari."
+
+msgid "Don't know how to handle this kind of target."
+msgstr ""
+
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 msgid "Nickname cannot be empty."
 msgstr "El sobrenom no pot estar en blanc."
@@ -7717,24 +7667,15 @@ msgstr "Avís duplicat."
 msgid "Couldn't insert new subscription."
 msgstr "No s'ha pogut inserir una nova subscripció."
 
+msgid "Your profile"
+msgstr "El vostre perfil"
+
 msgid "Replies"
 msgstr "Respostes"
 
 msgid "Favorites"
 msgstr "Preferits"
 
-msgid "Inbox"
-msgstr "Safata d'entrada"
-
-msgid "Your incoming messages"
-msgstr "Els teus missatges rebuts"
-
-msgid "Outbox"
-msgstr "Safata de sortida"
-
-msgid "Your sent messages"
-msgstr "Els teus missatges enviats"
-
 #. TRANS: Title for personal tag cloud section. %s is a user nickname.
 #, php-format
 msgid "Tags in %s's notices"
@@ -7747,17 +7688,41 @@ msgstr "Desconegut"
 #. TRANS: Plugin admin panel controls
 msgctxt "plugin"
 msgid "Disable"
-msgstr ""
+msgstr "Inhabilita"
 
 #. TRANS: Plugin admin panel controls
 msgctxt "plugin"
 msgid "Enable"
-msgstr ""
+msgstr "Habilita"
 
 msgctxt "plugin-description"
 msgid "(Plugin descriptions unavailable when disabled.)"
 msgstr ""
 
+msgid "Settings"
+msgstr "Paràmetres de l'SMS"
+
+msgid "Change your personal settings"
+msgstr "Canvieu els vostres paràmetres personals"
+
+msgid "Site configuration"
+msgstr "Configuració del lloc"
+
+msgid "Logout"
+msgstr "Finalitza la sessió"
+
+msgid "Logout from the site"
+msgstr "Finalitza la sessió del lloc"
+
+msgid "Login to the site"
+msgstr "Inicia una sessió al lloc"
+
+msgid "Search"
+msgstr "Cerca"
+
+msgid "Search the site"
+msgstr "Cerca al lloc"
+
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
 msgid "Subscriptions"
@@ -7866,6 +7831,39 @@ msgstr "Cerca el contingut dels avisos"
 msgid "Find groups on this site"
 msgstr "Cerca grups en aquest lloc"
 
+#. TRANS: Secondary navigation menu option leading to help on StatusNet.
+msgid "Help"
+msgstr "Ajuda"
+
+#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
+msgid "About"
+msgstr "Quant a"
+
+#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
+msgid "FAQ"
+msgstr "Preguntes més freqüents"
+
+#. TRANS: Secondary navigation menu option leading to Terms of Service.
+msgid "TOS"
+msgstr "Termes del servei"
+
+#. TRANS: Secondary navigation menu option leading to privacy policy.
+msgid "Privacy"
+msgstr "Privadesa"
+
+#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
+msgid "Source"
+msgstr "Font"
+
+#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+msgid "Contact"
+msgstr "Contacte"
+
+#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
+msgid "Badge"
+msgstr "Insígnia"
+
 msgid "Untitled section"
 msgstr "Secció sense títol"
 
@@ -8145,19 +8143,8 @@ msgstr "L'XML no és vàlid, hi manca l'arrel XRD."
 msgid "Getting backup from file '%s'."
 msgstr "Es recupera la còpia de seguretat del fitxer '%s'."
 
-#~ msgid "Full name is too long (max 255 chars)."
-#~ msgstr "El vostre nom sencer és massa llarg (màx. 255 caràcters)."
+#~ msgid "Friends timeline"
+#~ msgstr "Línia temporal dels amics"
 
-#~ msgid "description is too long (max %d chars)."
-#~ msgstr "la descripció és massa llarga (màx. %d caràcters)."
-
-#~ msgid "Location is too long (max 255 chars)."
-#~ msgstr "La localització és massa llarga (màx. 255 caràcters)."
-
-#~ msgid "Too many aliases! Maximum %d."
-#~ msgstr "Hi ha massa àlies! Màxim %d."
-
-#, fuzzy
-#~ msgctxt "BUTTON"
-#~ msgid "Comment"
-#~ msgstr "Contingut"
+#~ msgid "Everyone on this site"
+#~ msgstr "Tothom en aquest lloc"
diff --git a/locale/cs/LC_MESSAGES/statusnet.po b/locale/cs/LC_MESSAGES/statusnet.po
index 041a6ca799..e97d4980e0 100644
--- a/locale/cs/LC_MESSAGES/statusnet.po
+++ b/locale/cs/LC_MESSAGES/statusnet.po
@@ -11,18 +11,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-06 02:34+0100\n"
-"PO-Revision-Date: 2011-03-06 01:36:11+0000\n"
+"POT-Creation-Date: 2011-03-08 01:03+0000\n"
+"PO-Revision-Date: 2011-03-08 01:05:04+0000\n"
 "Language-Team: Czech <http://translatewiki.net/wiki/Portal:cs>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: cs\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=3; plural=(n == 1) ? 0 : ( (n >= 2 && n <= 4) ? 1 : "
 "2 );\n"
-"X-POT-Import-Date: 2011-03-03 17:59:19+0000\n"
+"X-POT-Import-Date: 2011-03-06 02:16:47+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -6051,84 +6051,9 @@ msgstr "Odpovědět"
 msgid "Write a reply..."
 msgstr ""
 
-msgid "Home"
-msgstr "Moje stránky"
-
 #, fuzzy
-msgid "Friends timeline"
-msgstr "časová osa %s"
-
-msgid "Your profile"
-msgstr "Profil skupiny"
-
-msgid "Public"
-msgstr "Veřejné"
-
-#, fuzzy
-msgid "Everyone on this site"
-msgstr "Najít lidi na této stránce"
-
-msgid "Settings"
-msgstr "nastavení SMS"
-
-#, fuzzy
-msgid "Change your personal settings"
-msgstr "Změňte nastavení profilu"
-
-#, fuzzy
-msgid "Site configuration"
-msgstr "Akce uživatele"
-
-msgid "Logout"
-msgstr "Odhlásit se"
-
-#, fuzzy
-msgid "Logout from the site"
-msgstr "Odhlášení z webu"
-
-#, fuzzy
-msgid "Login to the site"
-msgstr "Přihlásit se na stránky"
-
-msgid "Search"
-msgstr "Hledat"
-
-#, fuzzy
-msgid "Search the site"
-msgstr "Prohledat stránky"
-
-#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-msgid "Help"
-msgstr "Nápověda"
-
-#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-msgid "About"
-msgstr "O nás"
-
-#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-msgid "FAQ"
-msgstr "FAQ"
-
-#. TRANS: Secondary navigation menu option leading to Terms of Service.
-msgid "TOS"
-msgstr "TOS (pravidla použití služby)"
-
-#. TRANS: Secondary navigation menu option leading to privacy policy.
-msgid "Privacy"
-msgstr "Soukromí"
-
-#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-msgid "Source"
-msgstr "Zdroj"
-
-#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
-#. TRANS: StatusNet site, where to report bugs, ...
-msgid "Contact"
-msgstr "Kontakt"
-
-#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-msgid "Badge"
-msgstr "Odznak"
+msgid "Status"
+msgstr "StatusNet"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #. TRANS: Text between [] is a link description, text between () is the link itself.
@@ -6929,6 +6854,12 @@ msgstr "Jdi na instalaci."
 msgid "Database error"
 msgstr "Chyba databáze"
 
+msgid "Home"
+msgstr "Moje stránky"
+
+msgid "Public"
+msgstr "Veřejné"
+
 #. TRANS: Description of form for deleting a user.
 msgid "Delete this user"
 msgstr "Odstranit tohoto uživatele"
@@ -7612,6 +7543,18 @@ msgstr ""
 "zapojili ostatní uživatelé v rozhovoru. Lidé mohou posílat zprávy jen pro "
 "vaše oči."
 
+msgid "Inbox"
+msgstr "Doručená pošta"
+
+msgid "Your incoming messages"
+msgstr "Vaše příchozí zprávy"
+
+msgid "Outbox"
+msgstr "Odeslaná pošta"
+
+msgid "Your sent messages"
+msgstr "Vaše odeslané zprávy"
+
 msgid "Could not parse message."
 msgstr "Nelze zpracovat zprávu."
 
@@ -7688,6 +7631,20 @@ msgstr "Zpráva"
 msgid "from"
 msgstr "od"
 
+msgid "Can't get author for activity."
+msgstr ""
+
+#, fuzzy
+msgid "Bookmark not posted to this group."
+msgstr "Nejste členem této skupiny."
+
+#, fuzzy
+msgid "Object not posted to this user."
+msgstr "Neodstraňujte toto oznámení"
+
+msgid "Don't know how to handle this kind of target."
+msgstr ""
+
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 msgid "Nickname cannot be empty."
 msgstr ""
@@ -7803,24 +7760,15 @@ msgstr ""
 msgid "Couldn't insert new subscription."
 msgstr "Nelze vložit odebírání"
 
+msgid "Your profile"
+msgstr "Profil skupiny"
+
 msgid "Replies"
 msgstr "Odpovědi"
 
 msgid "Favorites"
 msgstr "Oblíbené"
 
-msgid "Inbox"
-msgstr "Doručená pošta"
-
-msgid "Your incoming messages"
-msgstr "Vaše příchozí zprávy"
-
-msgid "Outbox"
-msgstr "Odeslaná pošta"
-
-msgid "Your sent messages"
-msgstr "Vaše odeslané zprávy"
-
 #. TRANS: Title for personal tag cloud section. %s is a user nickname.
 #, php-format
 msgid "Tags in %s's notices"
@@ -7844,6 +7792,35 @@ msgctxt "plugin-description"
 msgid "(Plugin descriptions unavailable when disabled.)"
 msgstr ""
 
+msgid "Settings"
+msgstr "nastavení SMS"
+
+#, fuzzy
+msgid "Change your personal settings"
+msgstr "Změňte nastavení profilu"
+
+#, fuzzy
+msgid "Site configuration"
+msgstr "Akce uživatele"
+
+msgid "Logout"
+msgstr "Odhlásit se"
+
+#, fuzzy
+msgid "Logout from the site"
+msgstr "Odhlášení z webu"
+
+#, fuzzy
+msgid "Login to the site"
+msgstr "Přihlásit se na stránky"
+
+msgid "Search"
+msgstr "Hledat"
+
+#, fuzzy
+msgid "Search the site"
+msgstr "Prohledat stránky"
+
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
 msgid "Subscriptions"
@@ -7953,6 +7930,39 @@ 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 option leading to help on StatusNet.
+msgid "Help"
+msgstr "Nápověda"
+
+#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
+msgid "About"
+msgstr "O nás"
+
+#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
+msgid "FAQ"
+msgstr "FAQ"
+
+#. TRANS: Secondary navigation menu option leading to Terms of Service.
+msgid "TOS"
+msgstr "TOS (pravidla použití služby)"
+
+#. TRANS: Secondary navigation menu option leading to privacy policy.
+msgid "Privacy"
+msgstr "Soukromí"
+
+#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
+msgid "Source"
+msgstr "Zdroj"
+
+#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+msgid "Contact"
+msgstr "Kontakt"
+
+#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
+msgid "Badge"
+msgstr "Odznak"
+
 msgid "Untitled section"
 msgstr "Oddíl bez názvu"
 
@@ -8243,19 +8253,10 @@ msgstr ""
 msgid "Getting backup from file '%s'."
 msgstr ""
 
-#~ msgid "Full name is too long (max 255 chars)."
-#~ msgstr "Celé jméno je moc dlouhé (maximální délka je 255 znaků)."
-
-#~ msgid "description is too long (max %d chars)."
-#~ msgstr "Popis je příliš dlouhý (maximálně %d znaků)."
-
-#~ msgid "Location is too long (max 255 chars)."
-#~ msgstr "Umístění je příliš dlouhé (maximálně 255 znaků)."
-
-#~ msgid "Too many aliases! Maximum %d."
-#~ msgstr "Příliš mnoho aliasů! Maximálně %d."
+#, fuzzy
+#~ msgid "Friends timeline"
+#~ msgstr "časová osa %s"
 
 #, fuzzy
-#~ msgctxt "BUTTON"
-#~ msgid "Comment"
-#~ msgstr "Obsah"
+#~ msgid "Everyone on this site"
+#~ msgstr "Najít lidi na této stránce"
diff --git a/locale/de/LC_MESSAGES/statusnet.po b/locale/de/LC_MESSAGES/statusnet.po
index 1c7cad4a6e..939acc989b 100644
--- a/locale/de/LC_MESSAGES/statusnet.po
+++ b/locale/de/LC_MESSAGES/statusnet.po
@@ -21,17 +21,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-06 02:34+0100\n"
-"PO-Revision-Date: 2011-03-06 01:36:12+0000\n"
+"POT-Creation-Date: 2011-03-08 01:03+0000\n"
+"PO-Revision-Date: 2011-03-08 01:05:05+0000\n"
 "Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-03-03 17:59:19+0000\n"
+"X-POT-Import-Date: 2011-03-06 02:16:47+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -6052,83 +6052,9 @@ msgstr "Antworten"
 msgid "Write a reply..."
 msgstr ""
 
-msgid "Home"
-msgstr "Homepage"
-
 #, fuzzy
-msgid "Friends timeline"
-msgstr "%s-Zeitleiste"
-
-#, fuzzy
-msgid "Your profile"
-msgstr "Gruppenprofil"
-
-msgid "Public"
-msgstr "Zeitleiste"
-
-#, fuzzy
-msgid "Everyone on this site"
-msgstr "Finde Leute auf dieser Seite"
-
-msgid "Settings"
-msgstr "SMS-Einstellungen"
-
-#, fuzzy
-msgid "Change your personal settings"
-msgstr "Ändern der Profileinstellungen"
-
-#, fuzzy
-msgid "Site configuration"
-msgstr "Benutzereinstellung"
-
-msgid "Logout"
-msgstr "Abmelden"
-
-msgid "Logout from the site"
-msgstr "Von der Seite abmelden"
-
-msgid "Login to the site"
-msgstr "Auf der Seite anmelden"
-
-msgid "Search"
-msgstr "Suchen"
-
-#, fuzzy
-msgid "Search the site"
-msgstr "Website durchsuchen"
-
-#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-msgid "Help"
-msgstr "Hilfe"
-
-#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-msgid "About"
-msgstr "Über"
-
-#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-msgid "FAQ"
-msgstr "FAQ"
-
-#. TRANS: Secondary navigation menu option leading to Terms of Service.
-msgid "TOS"
-msgstr "AGB"
-
-#. TRANS: Secondary navigation menu option leading to privacy policy.
-msgid "Privacy"
-msgstr "Privatsphäre"
-
-#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-msgid "Source"
-msgstr "Quellcode"
-
-#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
-#. TRANS: StatusNet site, where to report bugs, ...
-msgid "Contact"
-msgstr "Kontakt"
-
-#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-msgid "Badge"
-msgstr "Plakette"
+msgid "Status"
+msgstr "StatusNet"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #. TRANS: Text between [] is a link description, text between () is the link itself.
@@ -6924,6 +6850,12 @@ msgstr "Zur Installation gehen."
 msgid "Database error"
 msgstr "Datenbankfehler."
 
+msgid "Home"
+msgstr "Homepage"
+
+msgid "Public"
+msgstr "Zeitleiste"
+
 #. TRANS: Description of form for deleting a user.
 msgid "Delete this user"
 msgstr "Diesen Benutzer löschen"
@@ -7600,6 +7532,18 @@ msgstr ""
 "schicken, um sie in eine Konversation zu verwickeln. Andere Leute können dir "
 "Nachrichten schicken, die nur du sehen kannst."
 
+msgid "Inbox"
+msgstr "Posteingang"
+
+msgid "Your incoming messages"
+msgstr "Deine eingehenden Nachrichten"
+
+msgid "Outbox"
+msgstr "Postausgang"
+
+msgid "Your sent messages"
+msgstr "Deine gesendeten Nachrichten"
+
 msgid "Could not parse message."
 msgstr "Konnte Nachricht nicht parsen."
 
@@ -7679,6 +7623,20 @@ msgstr "Nachricht"
 msgid "from"
 msgstr "von"
 
+msgid "Can't get author for activity."
+msgstr ""
+
+#, fuzzy
+msgid "Bookmark not posted to this group."
+msgstr "Du darfst diese Gruppe nicht löschen."
+
+#, fuzzy
+msgid "Object not posted to this user."
+msgstr "Diesen Benutzer nicht löschen"
+
+msgid "Don't know how to handle this kind of target."
+msgstr ""
+
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 msgid "Nickname cannot be empty."
 msgstr ""
@@ -7793,24 +7751,16 @@ msgstr "Doppelte Nachricht."
 msgid "Couldn't insert new subscription."
 msgstr "Konnte neues Abonnement nicht eintragen."
 
+#, fuzzy
+msgid "Your profile"
+msgstr "Gruppenprofil"
+
 msgid "Replies"
 msgstr "Antworten"
 
 msgid "Favorites"
 msgstr "Favoriten"
 
-msgid "Inbox"
-msgstr "Posteingang"
-
-msgid "Your incoming messages"
-msgstr "Deine eingehenden Nachrichten"
-
-msgid "Outbox"
-msgstr "Postausgang"
-
-msgid "Your sent messages"
-msgstr "Deine gesendeten Nachrichten"
-
 #. TRANS: Title for personal tag cloud section. %s is a user nickname.
 #, php-format
 msgid "Tags in %s's notices"
@@ -7834,6 +7784,33 @@ msgctxt "plugin-description"
 msgid "(Plugin descriptions unavailable when disabled.)"
 msgstr ""
 
+msgid "Settings"
+msgstr "SMS-Einstellungen"
+
+#, fuzzy
+msgid "Change your personal settings"
+msgstr "Ändern der Profileinstellungen"
+
+#, fuzzy
+msgid "Site configuration"
+msgstr "Benutzereinstellung"
+
+msgid "Logout"
+msgstr "Abmelden"
+
+msgid "Logout from the site"
+msgstr "Von der Seite abmelden"
+
+msgid "Login to the site"
+msgstr "Auf der Seite anmelden"
+
+msgid "Search"
+msgstr "Suchen"
+
+#, fuzzy
+msgid "Search the site"
+msgstr "Website durchsuchen"
+
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
 msgid "Subscriptions"
@@ -7942,6 +7919,39 @@ msgstr "Durchsuche den Inhalt der Nachrichten"
 msgid "Find groups on this site"
 msgstr "Finde Gruppen auf dieser Seite"
 
+#. TRANS: Secondary navigation menu option leading to help on StatusNet.
+msgid "Help"
+msgstr "Hilfe"
+
+#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
+msgid "About"
+msgstr "Über"
+
+#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
+msgid "FAQ"
+msgstr "FAQ"
+
+#. TRANS: Secondary navigation menu option leading to Terms of Service.
+msgid "TOS"
+msgstr "AGB"
+
+#. TRANS: Secondary navigation menu option leading to privacy policy.
+msgid "Privacy"
+msgstr "Privatsphäre"
+
+#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
+msgid "Source"
+msgstr "Quellcode"
+
+#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+msgid "Contact"
+msgstr "Kontakt"
+
+#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
+msgid "Badge"
+msgstr "Plakette"
+
 msgid "Untitled section"
 msgstr "Abschnitt ohne Titel"
 
@@ -8225,19 +8235,10 @@ msgstr ""
 msgid "Getting backup from file '%s'."
 msgstr "Hole Backup von der Datei „%s“."
 
-#~ msgid "Full name is too long (max 255 chars)."
-#~ msgstr "Der vollständige Name ist zu lang (maximal 255 Zeichen)."
-
-#~ msgid "description is too long (max %d chars)."
-#~ msgstr "Die Beschreibung ist zu lang (max. %d Zeichen)."
-
-#~ msgid "Location is too long (max 255 chars)."
-#~ msgstr "Der eingegebene Aufenthaltsort ist zu lang (maximal 255 Zeichen)."
-
-#~ msgid "Too many aliases! Maximum %d."
-#~ msgstr "Zu viele Pseudonyme! Maximale Anzahl ist %d."
+#, fuzzy
+#~ msgid "Friends timeline"
+#~ msgstr "%s-Zeitleiste"
 
 #, fuzzy
-#~ msgctxt "BUTTON"
-#~ msgid "Comment"
-#~ msgstr "Inhalt"
+#~ msgid "Everyone on this site"
+#~ msgstr "Finde Leute auf dieser Seite"
diff --git a/locale/en_GB/LC_MESSAGES/statusnet.po b/locale/en_GB/LC_MESSAGES/statusnet.po
index af6016977d..b7c4366f53 100644
--- a/locale/en_GB/LC_MESSAGES/statusnet.po
+++ b/locale/en_GB/LC_MESSAGES/statusnet.po
@@ -13,17 +13,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-06 02:34+0100\n"
-"PO-Revision-Date: 2011-03-06 01:36:13+0000\n"
+"POT-Creation-Date: 2011-03-08 01:03+0000\n"
+"PO-Revision-Date: 2011-03-08 01:05:06+0000\n"
 "Language-Team: British English <http://translatewiki.net/wiki/Portal:en-gb>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: en-gb\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-03-03 17:59:19+0000\n"
+"X-POT-Import-Date: 2011-03-06 02:16:47+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -5979,83 +5979,9 @@ msgstr "Reply"
 msgid "Write a reply..."
 msgstr ""
 
-msgid "Home"
-msgstr "Homepage"
-
 #, fuzzy
-msgid "Friends timeline"
-msgstr "%s timeline"
-
-#, fuzzy
-msgid "Your profile"
-msgstr "Group profile"
-
-msgid "Public"
-msgstr "Public"
-
-#, fuzzy
-msgid "Everyone on this site"
-msgstr "Find people on this site"
-
-msgid "Settings"
-msgstr "SMS settings"
-
-#, fuzzy
-msgid "Change your personal settings"
-msgstr "Change your profile settings"
-
-#, fuzzy
-msgid "Site configuration"
-msgstr "User configuration"
-
-msgid "Logout"
-msgstr "Logout"
-
-msgid "Logout from the site"
-msgstr "Logout from the site"
-
-msgid "Login to the site"
-msgstr "Login to the site"
-
-msgid "Search"
-msgstr "Search"
-
-#, fuzzy
-msgid "Search the site"
-msgstr "Search site"
-
-#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-msgid "Help"
-msgstr "Help"
-
-#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-msgid "About"
-msgstr "About"
-
-#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-msgid "FAQ"
-msgstr "F.A.Q."
-
-#. TRANS: Secondary navigation menu option leading to Terms of Service.
-msgid "TOS"
-msgstr ""
-
-#. TRANS: Secondary navigation menu option leading to privacy policy.
-msgid "Privacy"
-msgstr "Privacy"
-
-#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-msgid "Source"
-msgstr "Source"
-
-#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
-#. TRANS: StatusNet site, where to report bugs, ...
-msgid "Contact"
-msgstr "Contact"
-
-#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-msgid "Badge"
-msgstr "Badge"
+msgid "Status"
+msgstr "StatusNet"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #. TRANS: Text between [] is a link description, text between () is the link itself.
@@ -6839,6 +6765,12 @@ msgstr "Go to the installer."
 msgid "Database error"
 msgstr ""
 
+msgid "Home"
+msgstr "Homepage"
+
+msgid "Public"
+msgstr "Public"
+
 #. TRANS: Description of form for deleting a user.
 msgid "Delete this user"
 msgstr "Delete this user"
@@ -7429,6 +7361,18 @@ msgid ""
 "users in conversation. People can send you messages for your eyes only."
 msgstr ""
 
+msgid "Inbox"
+msgstr "Inbox"
+
+msgid "Your incoming messages"
+msgstr "Your incoming messages"
+
+msgid "Outbox"
+msgstr "Outbox"
+
+msgid "Your sent messages"
+msgstr "Your sent messages"
+
 msgid "Could not parse message."
 msgstr "Could not parse message."
 
@@ -7505,6 +7449,20 @@ msgstr "Message"
 msgid "from"
 msgstr "from"
 
+msgid "Can't get author for activity."
+msgstr ""
+
+#, fuzzy
+msgid "Bookmark not posted to this group."
+msgstr "You are not allowed to delete this group."
+
+#, fuzzy
+msgid "Object not posted to this user."
+msgstr "Do not delete this group"
+
+msgid "Don't know how to handle this kind of target."
+msgstr ""
+
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 msgid "Nickname cannot be empty."
 msgstr ""
@@ -7616,24 +7574,16 @@ msgstr ""
 msgid "Couldn't insert new subscription."
 msgstr "Couldn't insert new subscription."
 
+#, fuzzy
+msgid "Your profile"
+msgstr "Group profile"
+
 msgid "Replies"
 msgstr "Replies"
 
 msgid "Favorites"
 msgstr "Favourites"
 
-msgid "Inbox"
-msgstr "Inbox"
-
-msgid "Your incoming messages"
-msgstr "Your incoming messages"
-
-msgid "Outbox"
-msgstr "Outbox"
-
-msgid "Your sent messages"
-msgstr "Your sent messages"
-
 #. TRANS: Title for personal tag cloud section. %s is a user nickname.
 #, php-format
 msgid "Tags in %s's notices"
@@ -7657,6 +7607,33 @@ msgctxt "plugin-description"
 msgid "(Plugin descriptions unavailable when disabled.)"
 msgstr ""
 
+msgid "Settings"
+msgstr "SMS settings"
+
+#, fuzzy
+msgid "Change your personal settings"
+msgstr "Change your profile settings"
+
+#, fuzzy
+msgid "Site configuration"
+msgstr "User configuration"
+
+msgid "Logout"
+msgstr "Logout"
+
+msgid "Logout from the site"
+msgstr "Logout from the site"
+
+msgid "Login to the site"
+msgstr "Login to the site"
+
+msgid "Search"
+msgstr "Search"
+
+#, fuzzy
+msgid "Search the site"
+msgstr "Search site"
+
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
 msgid "Subscriptions"
@@ -7766,6 +7743,39 @@ msgstr "Find content of notices"
 msgid "Find groups on this site"
 msgstr "Find groups on this site"
 
+#. TRANS: Secondary navigation menu option leading to help on StatusNet.
+msgid "Help"
+msgstr "Help"
+
+#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
+msgid "About"
+msgstr "About"
+
+#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
+msgid "FAQ"
+msgstr "F.A.Q."
+
+#. TRANS: Secondary navigation menu option leading to Terms of Service.
+msgid "TOS"
+msgstr ""
+
+#. TRANS: Secondary navigation menu option leading to privacy policy.
+msgid "Privacy"
+msgstr "Privacy"
+
+#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
+msgid "Source"
+msgstr "Source"
+
+#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+msgid "Contact"
+msgstr "Contact"
+
+#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
+msgid "Badge"
+msgstr "Badge"
+
 msgid "Untitled section"
 msgstr "Untitled section"
 
@@ -8045,19 +8055,10 @@ msgstr ""
 msgid "Getting backup from file '%s'."
 msgstr ""
 
-#~ msgid "Full name is too long (max 255 chars)."
-#~ msgstr "Full name is too long (max 255 chars)."
-
-#~ msgid "description is too long (max %d chars)."
-#~ msgstr "description is too long (max %d chars)."
-
-#~ msgid "Location is too long (max 255 chars)."
-#~ msgstr "Location is too long (max 255 chars)."
-
-#~ msgid "Too many aliases! Maximum %d."
-#~ msgstr "Too many aliases! Maximum %d."
+#, fuzzy
+#~ msgid "Friends timeline"
+#~ msgstr "%s timeline"
 
 #, fuzzy
-#~ msgctxt "BUTTON"
-#~ msgid "Comment"
-#~ msgstr "Content"
+#~ msgid "Everyone on this site"
+#~ msgstr "Find people on this site"
diff --git a/locale/eo/LC_MESSAGES/statusnet.po b/locale/eo/LC_MESSAGES/statusnet.po
index b29239e094..fc4a68c796 100644
--- a/locale/eo/LC_MESSAGES/statusnet.po
+++ b/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-03-06 02:34+0100\n"
-"PO-Revision-Date: 2011-03-06 01:36:14+0000\n"
+"POT-Creation-Date: 2011-03-08 01:03+0000\n"
+"PO-Revision-Date: 2011-03-08 01:05:07+0000\n"
 "Language-Team: Esperanto <http://translatewiki.net/wiki/Portal:eo>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: eo\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-03-03 17:59:19+0000\n"
+"X-POT-Import-Date: 2011-03-06 02:16:47+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -69,7 +69,7 @@ msgstr "Fermita"
 
 #. TRANS: Title for button to save access settings in site admin panel.
 msgid "Save access settings"
-msgstr "Konservu atingan agordon"
+msgstr "Konservi atingan agordon"
 
 #. TRANS: Tooltip for button to save access settings in site admin panel.
 #. TRANS: Button text for saving theme settings.
@@ -87,7 +87,7 @@ msgstr "Konservu atingan agordon"
 #. TRANS: Button text on profile design page to save settings.
 msgctxt "BUTTON"
 msgid "Save"
-msgstr "Konservu"
+msgstr "Konservi"
 
 #. TRANS: Server error when page not found (404).
 #. TRANS: Server error when page not found (404)
@@ -835,13 +835,13 @@ msgstr "La avizo jam ripetiĝis."
 #. TRANS: Client exception thrown when using an unsupported HTTP method.
 #, fuzzy
 msgid "HTTP method not supported."
-msgstr "Metodo de API ne troviĝas."
+msgstr "Metodo de HTTP ne troviĝas."
 
 #. TRANS: Exception thrown requesting an unsupported notice output format.
 #. TRANS: %s is the requested output format.
 #, fuzzy, php-format
 msgid "Unsupported format: %s."
-msgstr "Formato ne subtenata."
+msgstr "Formato/aranĝo ne subtenata: %s."
 
 #. TRANS: Client error displayed requesting a deleted status.
 msgid "Status deleted."
@@ -862,9 +862,9 @@ msgid "Cannot delete this notice."
 msgstr "Ne povas forigi ĉi tiun avizon."
 
 #. TRANS: Confirmation of notice deletion in API. %d is the ID (number) of the deleted notice.
-#, fuzzy, php-format
+#, php-format
 msgid "Deleted notice %d"
-msgstr "Forigi avizon"
+msgstr "Estas forigita la avizo %d"
 
 #. TRANS: Client error displayed when the parameter "status" is missing.
 msgid "Client must provide a 'status' parameter with a value."
@@ -879,9 +879,8 @@ msgstr[0] "Tro longas. Longlimo por avizo estas %d signoj."
 msgstr[1] "Tro longas. Longlimo por avizo estas %d signoj."
 
 #. TRANS: Client error displayed when replying to a non-existing notice.
-#, fuzzy
 msgid "Parent notice not found."
-msgstr "Metodo de API ne troviĝas."
+msgstr ""
 
 #. TRANS: Client error displayed exceeding the maximum notice length.
 #. TRANS: %d is the maximum lenth for a notice.
@@ -938,7 +937,7 @@ msgstr "%s ĝisdatigoj de ĉiuj!"
 #. TRANS: Server error displayed calling unimplemented API method for 'retweeted by me'.
 #, fuzzy
 msgid "Unimplemented."
-msgstr "Nerealiĝita metodo"
+msgstr "Nerealigita"
 
 #. TRANS: Title for Atom feed "repeated to me". %s is the user nickname.
 #, php-format
@@ -1006,24 +1005,23 @@ msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
 #. TRANS: %d is the notice ID (number).
-#, fuzzy, php-format
+#, php-format
 msgid "No content for notice %d."
-msgstr "Serĉi enhavon ĉe la retejo"
+msgstr "Mankas enhavo por avizo %d."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
 #. TRANS: %s is the notice URI.
 #, fuzzy, php-format
 msgid "Notice with URI \"%s\" already exists."
-msgstr "Avizo kun tiu identigaĵo ne ekzistas."
+msgstr "Avizo kun identigaĵo \"%s\" jam ekzistas."
 
 #. TRANS: Server error for unfinished API method showTrends.
 msgid "API method under construction."
 msgstr "API-metodo farata."
 
 #. TRANS: Client error displayed when requesting user information for a non-existing user.
-#, fuzzy
 msgid "User not found."
-msgstr "Metodo de API ne troviĝas."
+msgstr "Uzanto ne ekzistas."
 
 #. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
 #. TRANS: Client exception.
@@ -1035,18 +1033,17 @@ msgstr "Ne ekzistas tia profilo."
 #. TRANS: %1$s is a user nickname, %2$s is the StatusNet sitename.
 #, fuzzy, php-format
 msgid "Notices %1$s has favorited on %2$s"
-msgstr "Ĝisdatiĝoj de %1$s kaj amikoj ĉe %2$s!"
+msgstr "Avizoj, ŝatmarkitaj de %1$s ĉe %2$s"
 
 #. TRANS: Client exception thrown when trying to set a favorite for another user.
 #. TRANS: Client exception thrown when trying to subscribe another user.
 #, fuzzy
 msgid "Cannot add someone else's subscription."
-msgstr "Estas neeble aldoni abonon de aliulo."
+msgstr "Estas neeble aldoni abonstaton por aliulo."
 
 #. TRANS: Client exception thrown when trying use an incorrect activity verb for the Atom pub method.
-#, fuzzy
 msgid "Can only handle favorite activities."
-msgstr "Serĉi enhavon ĉe la retejo"
+msgstr ""
 
 #. TRANS: Client exception thrown when trying favorite an object that is not a notice.
 #, fuzzy
@@ -1087,18 +1084,18 @@ msgid "Can only handle join activities."
 msgstr "Serĉi enhavon ĉe la retejo"
 
 #. TRANS: Client exception thrown when trying to subscribe to a non-existing group.
-#, fuzzy
 msgid "Unknown group."
 msgstr "Nekonata grupo."
 
 #. TRANS: Client exception thrown when trying to subscribe to an already subscribed group.
 #, fuzzy
 msgid "Already a member."
-msgstr "Ĉiuj grupanoj"
+msgstr "Jam ano."
 
 #. TRANS: Client exception thrown when trying to subscribe to group while blocked from that group.
+#, fuzzy
 msgid "Blocked by admin."
-msgstr ""
+msgstr "Blokita de administranto."
 
 #. TRANS: Client exception thrown when referencing a non-existing favorite.
 #, fuzzy
@@ -1169,9 +1166,9 @@ msgstr "Ne eblas forigi abonon de aliulo."
 
 #. TRANS: Subtitle for Atom subscription feed.
 #. TRANS: %1$s is a user nickname, %s$s is the StatusNet sitename.
-#, fuzzy, php-format
+#, php-format
 msgid "People %1$s has subscribed to on %2$s"
-msgstr "Abonantoj de %s"
+msgstr "Abonatoj de %1$s ĉe %2$s"
 
 #. TRANS: Client error displayed when not using the follow verb.
 msgid "Can only handle Follow activities."
@@ -1262,7 +1259,6 @@ msgstr "Forigi"
 
 #. TRANS: Button on avatar upload page to upload an avatar.
 #. TRANS: Submit button to confirm upload of a user backup file for account restore.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Upload"
 msgstr "Alŝuti"
@@ -1302,18 +1298,18 @@ msgstr "Vizaĝbildo forigita."
 #. TRANS: Title for backup account page.
 #. TRANS: Option in profile settings to create a backup of the account of the currently logged in user.
 msgid "Backup account"
-msgstr ""
+msgstr "Sekurkopii la konton"
 
 #. TRANS: Client exception thrown when trying to backup an account while not logged in.
-#, fuzzy
 msgid "Only logged-in users can backup their account."
-msgstr "Nur ensalutinto rajtas ripeti avizon."
+msgstr "Nur ensalutintoj povas sekurkopii siajn kontojn."
 
 #. TRANS: Client exception thrown when trying to backup an account without having backup rights.
 msgid "You may not backup your account."
-msgstr ""
+msgstr "Vi ne rajtas sekurkopii vian konton."
 
 #. TRANS: Information displayed on the backup account page.
+#, fuzzy
 msgid ""
 "You can backup your account data in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format. This is an experimental feature and provides "
@@ -1321,16 +1317,20 @@ msgid ""
 "addresses is not backed up. Additionally, uploaded files and direct messages "
 "are not backed up."
 msgstr ""
+"Vi povas sekurkopii datumojn de via konto aranĝite laŭ <a href=\"http://"
+"activitystrea.ms/\">Activity Streams</a>. Realigo de la funkcio estas prova "
+"kaj provizas nekompletan sekurkopion; ne estas kopiataj privataj "
+"kontodatumoj kiel retpoŝtaj kaj tujmesaĝilaj adresoj. Krom tio, ne kopiiĝas "
+"alŝutitaj dosieroj kaj rektaj mesaĝoj."
 
 #. TRANS: Submit button to backup an account on the backup account page.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Backup"
-msgstr "Fono"
+msgstr "Sekurkopii"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
 msgid "Backup your account."
-msgstr ""
+msgstr "Sekurkopii vian konton."
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
 msgid "You already blocked that user."
@@ -1485,9 +1485,8 @@ msgid "Only logged-in users can delete their account."
 msgstr "Nur ensalutinto rajtas ripeti avizon."
 
 #. TRANS: Client exception displayed trying to delete a user account without have the rights to do that.
-#, fuzzy
 msgid "You cannot delete your account."
-msgstr "Vi ne povas forigi uzantojn."
+msgstr "Vi ne povas forviŝi vian konton."
 
 #. TRANS: Confirmation text for user deletion. The user has to type this exactly the same, including punctuation.
 msgid "I am sure."
@@ -1506,15 +1505,16 @@ msgstr "Vizaĝbildo forigita."
 
 #. TRANS: Page title for page on which a user account can be deleted.
 #. TRANS: Option in profile settings to delete the account of the currently logged in user.
-#, fuzzy
 msgid "Delete account"
-msgstr "Krei konton"
+msgstr "Forviŝo de konto"
 
 #. TRANS: Form text for user deletion form.
 msgid ""
 "This will <strong>permanently delete</strong> your account data from this "
 "server."
 msgstr ""
+"Tio ĉi <strong>por ĉiam forviŝos</strong> viajn konto-datumojn el ĉi tiu "
+"servilo."
 
 #. TRANS: Additional form text for user deletion form shown if a user has account backup rights.
 #. TRANS: %s is a URL to the backup page.
@@ -1523,6 +1523,8 @@ msgid ""
 "You are strongly advised to <a href=\"%s\">back up your data</a> before "
 "deletion."
 msgstr ""
+"Ni forte rekomendas, ke vi <a href=\"%s\">sekurkopiu viajn datumojn</a> "
+"antaŭ la forviŝo."
 
 #. TRANS: Field label for delete account confirmation entry.
 #. TRANS: Field label for password reset form where the password has to be typed again.
@@ -1531,14 +1533,13 @@ msgstr "Konfirmi"
 
 #. TRANS: Input title for the delete account field.
 #. TRANS: %s is the text that needs to be input.
-#, fuzzy, php-format
+#, php-format
 msgid "Enter \"%s\" to confirm that you want to delete your account."
-msgstr "Vi ne povas forigi uzantojn."
+msgstr "Enigu «%s» por konfirmi, ke vi volas forviŝi vian konton."
 
 #. TRANS: Button title for user account deletion.
-#, fuzzy
 msgid "Permanently delete your account"
-msgstr "Vi ne povas forigi uzantojn."
+msgstr "Forviŝi nemalfareble vian konton"
 
 #. TRANS: Client error displayed trying to delete an application while not logged in.
 msgid "You must be logged in to delete an application."
@@ -1572,17 +1573,14 @@ msgstr ""
 "la datumbazo, inkluzive de ĉiu ekzistanta uzanto-konekto."
 
 #. TRANS: Submit button title for 'No' when deleting an application.
-#, fuzzy
 msgid "Do not delete this application."
-msgstr "Ne forigu ĉi tiun aplikaĵon."
+msgstr "Ne forigi ĉi tiun aplikaĵon."
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
-#, fuzzy
 msgid "Delete this application."
-msgstr "Viŝi ĉi tiun aplikon"
+msgstr "Forigi ĉi tiun aplikaĵon."
 
 #. TRANS: Client error when trying to delete group while not logged in.
-#, fuzzy
 msgid "You must be logged in to delete a group."
 msgstr "Por povi forigi grupon, oni devas ensaluti."
 
@@ -1593,47 +1591,44 @@ msgid "No nickname or ID."
 msgstr "Ne estas alinomo aŭ ID."
 
 #. TRANS: Client error when trying to delete a group without having the rights to delete it.
-#, fuzzy
 msgid "You are not allowed to delete this group."
-msgstr "Vi ne estas grupano."
+msgstr "Vi ne rajtas forigi ĉi tiun grupon."
 
 #. TRANS: Server error displayed if a group could not be deleted.
 #. TRANS: %s is the name of the group that could not be deleted.
 #, fuzzy, php-format
 msgid "Could not delete group %s."
-msgstr "Malsukcesis ĝisdatigi grupon."
+msgstr "Malsukcesis forigi la grupon %s."
 
 #. TRANS: Message given after deleting a group.
 #. TRANS: %s is the deleted group's name.
 #, fuzzy, php-format
 msgid "Deleted group %s"
-msgstr "%1$s eksaniĝis de grupo %2$s"
+msgstr "Forigis la grupon %s"
 
 #. TRANS: Title of delete group page.
 #. TRANS: Form legend for deleting a group.
 #, fuzzy
 msgid "Delete group"
-msgstr "Forigi grupon"
+msgstr "Forigo de grupo"
 
 #. TRANS: Warning in form for deleleting a group.
-#, fuzzy
 msgid ""
 "Are you sure you want to delete this group? This will clear all data about "
 "the group from the database, without a backup. Public posts to this group "
 "will still appear in individual timelines."
 msgstr ""
-"Ĉu vi certe volas forigi la uzanton? Ĉiu datumo pri la uzanto viŝiĝos de la "
-"datumbazo sen sekurkopio."
+"Ĉu vi certe volas forigi ĉi tiun grupon? Tio forviŝos ĉiujn datumojn pri la "
+"grupo el la datumbazo, sen sekurkopio. Publikaj avizoj en la grupo plu "
+"restos videblaj en apartaj tempstrioj."
 
 #. TRANS: Submit button title for 'No' when deleting a group.
-#, fuzzy
 msgid "Do not delete this group."
-msgstr "Ne forigi la avizon"
+msgstr "Ne forigi ĉi tiun grupon"
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
-#, fuzzy
 msgid "Delete this group."
-msgstr "Forigi la uzanton"
+msgstr "Forigi ĉi tiun grupon."
 
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
 #. TRANS: Client error displayed when trying to remove a favorite while not logged in.
@@ -1669,14 +1664,12 @@ msgid "Are you sure you want to delete this notice?"
 msgstr "Ĉu vi certe volas forigi la avizon?"
 
 #. TRANS: Submit button title for 'No' when deleting a notice.
-#, fuzzy
 msgid "Do not delete this notice."
-msgstr "Ne forigi la avizon"
+msgstr "Ne forviŝi ĉi tiun avizon."
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#, fuzzy
 msgid "Delete this notice."
-msgstr "Forigi la avizon"
+msgstr "Forviŝi ĉi tiun avizon."
 
 #. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
 msgid "You cannot delete users."
@@ -1729,7 +1722,7 @@ msgstr "URL por la emblemo nevalida."
 #. TRANS: Client error displayed when an SSL logo URL is invalid.
 #, fuzzy
 msgid "Invalid SSL logo URL."
-msgstr "URL por la emblemo nevalida."
+msgstr "URL por la SSLa emblemo nevalidas."
 
 #. TRANS: Client error displayed when a theme is submitted through the form that is not in the theme list.
 #. TRANS: %s is the chosen unavailable theme.
@@ -1748,7 +1741,7 @@ msgstr "Reteja emblemo"
 #. TRANS: Field label for SSL StatusNet site logo.
 #, fuzzy
 msgid "SSL logo"
-msgstr "Reteja emblemo"
+msgstr "SSLa emblemo"
 
 #. TRANS: Fieldset legend for form change StatusNet site's theme.
 msgid "Change theme"
@@ -1807,7 +1800,6 @@ msgid "Tile background image"
 msgstr "Ripeti la fonbildon"
 
 #. TRANS: Fieldset legend for theme colors.
-#, fuzzy
 msgid "Change colors"
 msgstr "Ŝanĝi kolorojn"
 
@@ -1840,10 +1832,9 @@ msgid "Custom CSS"
 msgstr "Propra CSS"
 
 #. TRANS: Button text for resetting theme settings.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Use defaults"
-msgstr "Uzu defaŭlton"
+msgstr "Uzi defaŭlton"
 
 #. TRANS: Title for button for resetting theme settings.
 #, fuzzy
@@ -2183,7 +2174,7 @@ msgstr "Ĉi tiu avizo jam estas ŝatata."
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
 #, fuzzy
 msgid "Disfavor favorite."
-msgstr "Malŝati ŝataton."
+msgstr "Forigi ŝatmarkon."
 
 #. TRANS: Page title for first page of favorited notices.
 #. TRANS: Title for favourited notices section.
@@ -2500,14 +2491,13 @@ msgid "Updates from members of %1$s on %2$s!"
 msgstr "Ĝisdatigoj de grupano de %1$s ĉe %2$s!"
 
 #. TRANS: Title for first page of the groups list.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Groups"
 msgstr "Grupoj"
 
 #. TRANS: Title for all but the first page of the groups list.
 #. TRANS: %d is the page number.
-#, fuzzy, php-format
+#, php-format
 msgctxt "TITLE"
 msgid "Groups, page %d"
 msgstr "Grupoj, paĝo %d"
@@ -2604,9 +2594,9 @@ msgstr ""
 msgid "IM is not available."
 msgstr "Tujmesaĝilo ne estas disponebla."
 
-#, fuzzy, php-format
+#, php-format
 msgid "Current confirmed %s address."
-msgstr "Nuna konfirmita retpoŝtadreso."
+msgstr "Nuna konfirmita adreso je %s."
 
 #. TRANS: Form note in IM settings form.
 #. TRANS: %s is the IM address set for the site.
@@ -2615,8 +2605,8 @@ msgid ""
 "Awaiting confirmation on this address. Check your %s account for a message "
 "with further instructions. (Did you add %s to your buddy list?)"
 msgstr ""
-"Atendante konfirmon por la adreso. Kontrolu vian Jabber/GTalk-konton por "
-"mesaĝo kun pli da gvido. (Ĉu vi aldonis %s al via amikolisto?)"
+"Atendante konfirmon por la adreso. Kontrolu vian konton je %s pri mesaĝo kun "
+"pluaj instrukcioj. (Ĉu vi aldonis %s al via amikolisto?)"
 
 msgid "IM address"
 msgstr "Tujmesaĝila adreso"
@@ -3683,7 +3673,7 @@ msgstr "Servilo, kien direkti \"SSL\"-petojn"
 
 #. TRANS: Button title text to store form data in the Paths admin panel.
 msgid "Save paths"
-msgstr "Konservu lokigilon"
+msgstr "Konservi lokigilon"
 
 #. TRANS: Instructions for the "People search" page.
 #. TRANS: %%site.name%% is the name of the StatusNet site.
@@ -5981,87 +5971,8 @@ msgid "Write a reply..."
 msgstr ""
 
 #, fuzzy
-msgid "Home"
-msgstr "Hejmpaĝo"
-
-#, fuzzy
-msgid "Friends timeline"
-msgstr "Tempstrio de %s"
-
-#, fuzzy
-msgid "Your profile"
-msgstr "Grupa profilo"
-
-msgid "Public"
-msgstr "Publika"
-
-#, fuzzy
-msgid "Everyone on this site"
-msgstr "Serĉi homon ĉe la retejo"
-
-#, fuzzy
-msgid "Settings"
-msgstr "SMM-a agordo"
-
-#, fuzzy
-msgid "Change your personal settings"
-msgstr "Ŝanĝi vian profilan agordon."
-
-#, fuzzy
-msgid "Site configuration"
-msgstr "Uzanta agordo"
-
-#, fuzzy
-msgid "Logout"
-msgstr " Elsaluti"
-
-#, fuzzy
-msgid "Logout from the site"
-msgstr "Elsaluti el la retejo"
-
-#, fuzzy
-msgid "Login to the site"
-msgstr "Ensaluti al la retejo"
-
-msgid "Search"
-msgstr "Serĉi"
-
-#, fuzzy
-msgid "Search the site"
-msgstr "Serĉi ĉe retejo"
-
-#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-msgid "Help"
-msgstr "Helpo"
-
-#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-msgid "About"
-msgstr "Enkonduko"
-
-#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-msgid "FAQ"
-msgstr "Oftaj demandoj"
-
-#. TRANS: Secondary navigation menu option leading to Terms of Service.
-msgid "TOS"
-msgstr "Serva Kondiĉo"
-
-#. TRANS: Secondary navigation menu option leading to privacy policy.
-msgid "Privacy"
-msgstr "Privateco"
-
-#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-msgid "Source"
-msgstr "Fontkodo"
-
-#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
-#. TRANS: StatusNet site, where to report bugs, ...
-msgid "Contact"
-msgstr "Kontakto"
-
-#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-msgid "Badge"
-msgstr "Insigno"
+msgid "Status"
+msgstr "StatusNet"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #. TRANS: Text between [] is a link description, text between () is the link itself.
@@ -6860,6 +6771,13 @@ msgstr "Al la instalilo."
 msgid "Database error"
 msgstr "Datumbaza eraro"
 
+#, fuzzy
+msgid "Home"
+msgstr "Hejmpaĝo"
+
+msgid "Public"
+msgstr "Publika"
+
 #. TRANS: Description of form for deleting a user.
 msgid "Delete this user"
 msgstr "Forigi la uzanton"
@@ -6874,7 +6792,7 @@ msgstr "Ŝanĝi kolorojn"
 
 #. TRANS: Button text on profile design page to immediately reset all colour settings to default.
 msgid "Use defaults"
-msgstr "Uzu defaŭlton"
+msgstr "Uzi defaŭlton"
 
 #. TRANS: Title for button on profile design page to reset all colour settings to default.
 msgid "Restore default designs"
@@ -6929,7 +6847,7 @@ msgstr "Maleble revoki aliradon al aplikaĵo: %s."
 #. TRANS: Form legend for removing the favourite status for a favourite notice.
 #. TRANS: Title for button text for removing the favourite status for a favourite notice.
 msgid "Disfavor this notice"
-msgstr "Neŝati la avizon"
+msgstr "Forigi ŝatmarkon de ĉi tiu avizo"
 
 #. TRANS: Button text for removing the favourite status for a favourite notice.
 #, fuzzy
@@ -7535,6 +7453,18 @@ msgstr ""
 "Vi ne ricevis privatan mesaĝon. Vi povas sendi privatan mesaĝon al iu kaj "
 "interparoli kun ili. Homo sendas al vi mesaĝon al vi sole."
 
+msgid "Inbox"
+msgstr "Alvenkesto"
+
+msgid "Your incoming messages"
+msgstr "Viaj alvenaj mesaĝoj"
+
+msgid "Outbox"
+msgstr "Elirkesto"
+
+msgid "Your sent messages"
+msgstr "Viaj senditaj mesaĝoj"
+
 #, fuzzy
 msgid "Could not parse message."
 msgstr "Malsukcesis ĝisdatigi uzanton"
@@ -7614,6 +7544,20 @@ msgstr "Mesaĝo"
 msgid "from"
 msgstr "de"
 
+msgid "Can't get author for activity."
+msgstr ""
+
+#, fuzzy
+msgid "Bookmark not posted to this group."
+msgstr "Vi ne rajtas forigi ĉi tiun grupon."
+
+#, fuzzy
+msgid "Object not posted to this user."
+msgstr "Ne forigi la avizon"
+
+msgid "Don't know how to handle this kind of target."
+msgstr ""
+
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 msgid "Nickname cannot be empty."
 msgstr ""
@@ -7728,24 +7672,16 @@ msgstr "Refoja avizo."
 msgid "Couldn't insert new subscription."
 msgstr "Eraris enmeti novan abonon."
 
+#, fuzzy
+msgid "Your profile"
+msgstr "Grupa profilo"
+
 msgid "Replies"
 msgstr "Respondoj"
 
 msgid "Favorites"
 msgstr "Ŝatolisto"
 
-msgid "Inbox"
-msgstr "Alvenkesto"
-
-msgid "Your incoming messages"
-msgstr "Viaj alvenaj mesaĝoj"
-
-msgid "Outbox"
-msgstr "Elirkesto"
-
-msgid "Your sent messages"
-msgstr "Viaj senditaj mesaĝoj"
-
 #. TRANS: Title for personal tag cloud section. %s is a user nickname.
 #, php-format
 msgid "Tags in %s's notices"
@@ -7769,6 +7705,37 @@ msgctxt "plugin-description"
 msgid "(Plugin descriptions unavailable when disabled.)"
 msgstr ""
 
+#, fuzzy
+msgid "Settings"
+msgstr "SMM-a agordo"
+
+#, fuzzy
+msgid "Change your personal settings"
+msgstr "Ŝanĝi vian profilan agordon."
+
+#, fuzzy
+msgid "Site configuration"
+msgstr "Uzanta agordo"
+
+#, fuzzy
+msgid "Logout"
+msgstr " Elsaluti"
+
+#, fuzzy
+msgid "Logout from the site"
+msgstr "Elsaluti el la retejo"
+
+#, fuzzy
+msgid "Login to the site"
+msgstr "Ensaluti al la retejo"
+
+msgid "Search"
+msgstr "Serĉi"
+
+#, fuzzy
+msgid "Search the site"
+msgstr "Serĉi ĉe retejo"
+
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
 msgid "Subscriptions"
@@ -7879,6 +7846,39 @@ msgstr "Serĉi enhavon ĉe la retejo"
 msgid "Find groups on this site"
 msgstr "Serĉi grupon ĉe la retejo"
 
+#. TRANS: Secondary navigation menu option leading to help on StatusNet.
+msgid "Help"
+msgstr "Helpo"
+
+#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
+msgid "About"
+msgstr "Enkonduko"
+
+#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
+msgid "FAQ"
+msgstr "Oftaj demandoj"
+
+#. TRANS: Secondary navigation menu option leading to Terms of Service.
+msgid "TOS"
+msgstr "Serva Kondiĉo"
+
+#. TRANS: Secondary navigation menu option leading to privacy policy.
+msgid "Privacy"
+msgstr "Privateco"
+
+#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
+msgid "Source"
+msgstr "Fontkodo"
+
+#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+msgid "Contact"
+msgstr "Kontakto"
+
+#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
+msgid "Badge"
+msgstr "Insigno"
+
 msgid "Untitled section"
 msgstr "Sentitola sekcio"
 
@@ -8162,19 +8162,10 @@ msgstr ""
 msgid "Getting backup from file '%s'."
 msgstr ""
 
-#~ msgid "Full name is too long (max 255 chars)."
-#~ msgstr "Plennomo estas tro longa (maksimume 255 literoj)"
-
-#~ msgid "description is too long (max %d chars)."
-#~ msgstr "Priskribo estas tro longa (maksimume %d signoj)."
-
-#~ msgid "Location is too long (max 255 chars)."
-#~ msgstr "lokonomo estas tro longa (maksimume 255 literoj)"
-
-#~ msgid "Too many aliases! Maximum %d."
-#~ msgstr "Tro da alinomoj! Maksimume %d."
+#, fuzzy
+#~ msgid "Friends timeline"
+#~ msgstr "Tempstrio de %s"
 
 #, fuzzy
-#~ msgctxt "BUTTON"
-#~ msgid "Comment"
-#~ msgstr "Enhavo"
+#~ msgid "Everyone on this site"
+#~ msgstr "Serĉi homon ĉe la retejo"
diff --git a/locale/es/LC_MESSAGES/statusnet.po b/locale/es/LC_MESSAGES/statusnet.po
index a9c0a7d99f..81bccda833 100644
--- a/locale/es/LC_MESSAGES/statusnet.po
+++ b/locale/es/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-03-06 02:34+0100\n"
-"PO-Revision-Date: 2011-03-06 01:36:15+0000\n"
+"POT-Creation-Date: 2011-03-08 01:03+0000\n"
+"PO-Revision-Date: 2011-03-08 01:05:08+0000\n"
 "Language-Team: Spanish <http://translatewiki.net/wiki/Portal:es>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-03-03 17:59:19+0000\n"
+"X-POT-Import-Date: 2011-03-06 02:16:47+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -6083,82 +6083,9 @@ msgstr "Responder"
 msgid "Write a reply..."
 msgstr ""
 
-msgid "Home"
-msgstr "Página de inicio"
-
 #, fuzzy
-msgid "Friends timeline"
-msgstr "línea temporal de %s"
-
-msgid "Your profile"
-msgstr "Perfil del grupo"
-
-msgid "Public"
-msgstr "Público"
-
-#, fuzzy
-msgid "Everyone on this site"
-msgstr "Encontrar gente en este sitio"
-
-msgid "Settings"
-msgstr "Configuración de SMS"
-
-#, fuzzy
-msgid "Change your personal settings"
-msgstr "Cambia tus opciones de perfil"
-
-#, fuzzy
-msgid "Site configuration"
-msgstr "Configuración de usuario"
-
-msgid "Logout"
-msgstr "Cerrar sesión"
-
-msgid "Logout from the site"
-msgstr "Cerrar sesión en el sitio"
-
-msgid "Login to the site"
-msgstr "Iniciar sesión en el sitio"
-
-msgid "Search"
-msgstr "Buscar"
-
-#, fuzzy
-msgid "Search the site"
-msgstr "Buscar sitio"
-
-#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-msgid "Help"
-msgstr "Ayuda"
-
-#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-msgid "About"
-msgstr "Acerca de"
-
-#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-msgid "FAQ"
-msgstr "Preguntas Frecuentes"
-
-#. TRANS: Secondary navigation menu option leading to Terms of Service.
-msgid "TOS"
-msgstr "TOS"
-
-#. TRANS: Secondary navigation menu option leading to privacy policy.
-msgid "Privacy"
-msgstr "Privacidad"
-
-#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-msgid "Source"
-msgstr "Fuente"
-
-#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
-#. TRANS: StatusNet site, where to report bugs, ...
-msgid "Contact"
-msgstr "Ponerse en contacto"
-
-#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-msgid "Badge"
-msgstr "Insignia"
+msgid "Status"
+msgstr "StatusNet"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #. TRANS: Text between [] is a link description, text between () is the link itself.
@@ -6965,6 +6892,12 @@ msgstr "Ir al instalador."
 msgid "Database error"
 msgstr "Error de la base de datos"
 
+msgid "Home"
+msgstr "Página de inicio"
+
+msgid "Public"
+msgstr "Público"
+
 #. TRANS: Description of form for deleting a user.
 msgid "Delete this user"
 msgstr "Borrar este usuario"
@@ -7648,6 +7581,18 @@ msgstr ""
 "otros usuarios partícipes de la conversación. La gente puede enviarte "
 "mensajes que sólo puedas leer tú."
 
+msgid "Inbox"
+msgstr "Bandeja de Entrada"
+
+msgid "Your incoming messages"
+msgstr "Mensajes entrantes"
+
+msgid "Outbox"
+msgstr "Bandeja de Salida"
+
+msgid "Your sent messages"
+msgstr "Mensajes enviados"
+
 msgid "Could not parse message."
 msgstr "No se pudo analizar sintácticamente mensaje."
 
@@ -7728,6 +7673,20 @@ msgstr "Mensaje"
 msgid "from"
 msgstr "desde"
 
+msgid "Can't get author for activity."
+msgstr ""
+
+#, fuzzy
+msgid "Bookmark not posted to this group."
+msgstr "No puede eliminar este grupo."
+
+#, fuzzy
+msgid "Object not posted to this user."
+msgstr "No eliminar este usuario"
+
+msgid "Don't know how to handle this kind of target."
+msgstr ""
+
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 msgid "Nickname cannot be empty."
 msgstr ""
@@ -7842,24 +7801,15 @@ msgstr "Mensaje duplicado."
 msgid "Couldn't insert new subscription."
 msgstr "No se pudo insertar una nueva suscripción."
 
+msgid "Your profile"
+msgstr "Perfil del grupo"
+
 msgid "Replies"
 msgstr "Respuestas"
 
 msgid "Favorites"
 msgstr "Favoritos"
 
-msgid "Inbox"
-msgstr "Bandeja de Entrada"
-
-msgid "Your incoming messages"
-msgstr "Mensajes entrantes"
-
-msgid "Outbox"
-msgstr "Bandeja de Salida"
-
-msgid "Your sent messages"
-msgstr "Mensajes enviados"
-
 #. TRANS: Title for personal tag cloud section. %s is a user nickname.
 #, php-format
 msgid "Tags in %s's notices"
@@ -7883,6 +7833,33 @@ msgctxt "plugin-description"
 msgid "(Plugin descriptions unavailable when disabled.)"
 msgstr ""
 
+msgid "Settings"
+msgstr "Configuración de SMS"
+
+#, fuzzy
+msgid "Change your personal settings"
+msgstr "Cambia tus opciones de perfil"
+
+#, fuzzy
+msgid "Site configuration"
+msgstr "Configuración de usuario"
+
+msgid "Logout"
+msgstr "Cerrar sesión"
+
+msgid "Logout from the site"
+msgstr "Cerrar sesión en el sitio"
+
+msgid "Login to the site"
+msgstr "Iniciar sesión en el sitio"
+
+msgid "Search"
+msgstr "Buscar"
+
+#, fuzzy
+msgid "Search the site"
+msgstr "Buscar sitio"
+
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
 msgid "Subscriptions"
@@ -7992,6 +7969,39 @@ msgstr "Buscar en el contenido de mensajes"
 msgid "Find groups on this site"
 msgstr "Encontrar grupos en este sitio"
 
+#. TRANS: Secondary navigation menu option leading to help on StatusNet.
+msgid "Help"
+msgstr "Ayuda"
+
+#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
+msgid "About"
+msgstr "Acerca de"
+
+#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
+msgid "FAQ"
+msgstr "Preguntas Frecuentes"
+
+#. TRANS: Secondary navigation menu option leading to Terms of Service.
+msgid "TOS"
+msgstr "TOS"
+
+#. TRANS: Secondary navigation menu option leading to privacy policy.
+msgid "Privacy"
+msgstr "Privacidad"
+
+#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
+msgid "Source"
+msgstr "Fuente"
+
+#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+msgid "Contact"
+msgstr "Ponerse en contacto"
+
+#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
+msgid "Badge"
+msgstr "Insignia"
+
 msgid "Untitled section"
 msgstr "Sección sin título"
 
@@ -8277,19 +8287,10 @@ msgstr ""
 msgid "Getting backup from file '%s'."
 msgstr ""
 
-#~ msgid "Full name is too long (max 255 chars)."
-#~ msgstr "Tu nombre es demasiado largo (max. 255 carac.)"
-
-#~ msgid "description is too long (max %d chars)."
-#~ msgstr "La descripción es muy larga (máx. %d caracteres)."
-
-#~ msgid "Location is too long (max 255 chars)."
-#~ msgstr "La ubicación es demasiado larga (máx. 255 caracteres)."
-
-#~ msgid "Too many aliases! Maximum %d."
-#~ msgstr "¡Muchos seudónimos! El máximo es %d."
+#, fuzzy
+#~ msgid "Friends timeline"
+#~ msgstr "línea temporal de %s"
 
 #, fuzzy
-#~ msgctxt "BUTTON"
-#~ msgid "Comment"
-#~ msgstr "Contenido"
+#~ msgid "Everyone on this site"
+#~ msgstr "Encontrar gente en este sitio"
diff --git a/locale/fa/LC_MESSAGES/statusnet.po b/locale/fa/LC_MESSAGES/statusnet.po
index a103a57df9..d8bcba9d6d 100644
--- a/locale/fa/LC_MESSAGES/statusnet.po
+++ b/locale/fa/LC_MESSAGES/statusnet.po
@@ -7,6 +7,7 @@
 # Author: Everplays
 # Author: Mjbmr
 # Author: Narcissus
+# Author: Sahim
 # Author: ZxxZxxZ
 # --
 # This file is distributed under the same license as the StatusNet package.
@@ -15,8 +16,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-06 02:34+0100\n"
-"PO-Revision-Date: 2011-03-06 01:36:17+0000\n"
+"POT-Creation-Date: 2011-03-08 01:03+0000\n"
+"PO-Revision-Date: 2011-03-08 01:05:10+0000\n"
 "Last-Translator: Ahmad Sufi Mahmudi\n"
 "Language-Team: Persian <http://translatewiki.net/wiki/Portal:fa>\n"
 "MIME-Version: 1.0\n"
@@ -25,9 +26,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.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
-"X-POT-Import-Date: 2011-03-03 17:59:19+0000\n"
+"X-POT-Import-Date: 2011-03-06 02:16:47+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -1712,9 +1713,8 @@ msgid "Do not delete this user."
 msgstr "این پیام را پاک نکن"
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
-#, fuzzy
 msgid "Delete this user."
-msgstr "حذف این کاربر"
+msgstr "این کاربر حذف شود."
 
 #. TRANS: Message used as title for design settings for the site.
 msgid "Design"
@@ -5023,9 +5023,8 @@ msgid "SMS phone number"
 msgstr "شمارهٔ تماس پیامک"
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
-#, fuzzy
 msgid "Phone number, no punctuation or spaces, with area code."
-msgstr "شماره تلفن، بدون نشانه گذاری یا فاصله، با کد منطقه"
+msgstr "شماره تلفن، بدون نشانه‌گذاری یا فاصله‌گذاری، با کد منطقه."
 
 #. TRANS: Form legend for SMS preferences form.
 msgid "SMS preferences"
@@ -5368,9 +5367,8 @@ msgstr "مدیریت انتخاب های مختلف دیگر."
 msgid " (free service)"
 msgstr " (سرویس‌ آزاد)"
 
-#, fuzzy
 msgid "[none]"
-msgstr "هیچ"
+msgstr "[هیچ]"
 
 msgid "[internal]"
 msgstr ""
@@ -6029,84 +6027,9 @@ msgstr "پاسخ"
 msgid "Write a reply..."
 msgstr ""
 
-msgid "Home"
-msgstr "خانه"
-
 #, fuzzy
-msgid "Friends timeline"
-msgstr "خط‌زمانی %s"
-
-#, fuzzy
-msgid "Your profile"
-msgstr "نمایهٔ گروه"
-
-msgid "Public"
-msgstr "عمومی"
-
-#, fuzzy
-msgid "Everyone on this site"
-msgstr "پیدا کردن افراد در این وب‌گاه"
-
-#, fuzzy
-msgid "Settings"
-msgstr "تنظیمات پیامک"
-
-#, fuzzy
-msgid "Change your personal settings"
-msgstr "تنظیمات نمایه‌تان را تغییر دهید"
-
-#, fuzzy
-msgid "Site configuration"
-msgstr "پیکربندی کاربر"
-
-msgid "Logout"
-msgstr "خروج"
-
-msgid "Logout from the site"
-msgstr "خارج شدن از سایت ."
-
-msgid "Login to the site"
-msgstr "ورود به وب‌گاه"
-
-msgid "Search"
-msgstr "جست‌وجو"
-
-#, fuzzy
-msgid "Search the site"
-msgstr "جست‌وجوی وب‌گاه"
-
-#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-msgid "Help"
-msgstr "کمک"
-
-#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-msgid "About"
-msgstr "دربارهٔ"
-
-#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-msgid "FAQ"
-msgstr "سوال‌های رایج"
-
-#. TRANS: Secondary navigation menu option leading to Terms of Service.
-msgid "TOS"
-msgstr "شرایط سرویس"
-
-#. TRANS: Secondary navigation menu option leading to privacy policy.
-msgid "Privacy"
-msgstr "خصوصی"
-
-#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-msgid "Source"
-msgstr "منبع"
-
-#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
-#. TRANS: StatusNet site, where to report bugs, ...
-msgid "Contact"
-msgstr "تماس"
-
-#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-msgid "Badge"
-msgstr "نشان"
+msgid "Status"
+msgstr "StatusNet"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #. TRANS: Text between [] is a link description, text between () is the link itself.
@@ -6224,9 +6147,9 @@ msgstr ""
 msgid "No content for notice %s."
 msgstr "پیدا کردن محتوای پیام‌ها"
 
-#, 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.
@@ -6901,6 +6824,12 @@ msgstr "برو به نصاب."
 msgid "Database error"
 msgstr "خطای پایگاه داده"
 
+msgid "Home"
+msgstr "خانه"
+
+msgid "Public"
+msgstr "عمومی"
+
 #. TRANS: Description of form for deleting a user.
 msgid "Delete this user"
 msgstr "حذف این کاربر"
@@ -7574,6 +7503,18 @@ msgid ""
 "users in conversation. People can send you messages for your eyes only."
 msgstr ""
 
+msgid "Inbox"
+msgstr "صندوق دریافتی"
+
+msgid "Your incoming messages"
+msgstr "پیام های وارد شونده ی شما"
+
+msgid "Outbox"
+msgstr "صندوق خروجی"
+
+msgid "Your sent messages"
+msgstr "پیام‌های فرستاده شدهٔ شما"
+
 msgid "Could not parse message."
 msgstr "نمی‌توان پیام را تجزیه کرد."
 
@@ -7651,6 +7592,20 @@ msgstr "پیام"
 msgid "from"
 msgstr "از"
 
+msgid "Can't get author for activity."
+msgstr ""
+
+#, fuzzy
+msgid "Bookmark not posted to this group."
+msgstr "شما یک عضو این گروه نیستید."
+
+#, fuzzy
+msgid "Object not posted to this user."
+msgstr "این پیام را پاک نکن"
+
+msgid "Don't know how to handle this kind of target."
+msgstr ""
+
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 msgid "Nickname cannot be empty."
 msgstr ""
@@ -7765,24 +7720,16 @@ msgstr ""
 msgid "Couldn't insert new subscription."
 msgstr "نمی‌توان اشتراک تازه‌ای افزود."
 
+#, fuzzy
+msgid "Your profile"
+msgstr "نمایهٔ گروه"
+
 msgid "Replies"
 msgstr "پاسخ ها"
 
 msgid "Favorites"
 msgstr "برگزیده‌ها"
 
-msgid "Inbox"
-msgstr "صندوق دریافتی"
-
-msgid "Your incoming messages"
-msgstr "پیام های وارد شونده ی شما"
-
-msgid "Outbox"
-msgstr "صندوق خروجی"
-
-msgid "Your sent messages"
-msgstr "پیام‌های فرستاده شدهٔ شما"
-
 #. TRANS: Title for personal tag cloud section. %s is a user nickname.
 #, php-format
 msgid "Tags in %s's notices"
@@ -7806,6 +7753,34 @@ msgctxt "plugin-description"
 msgid "(Plugin descriptions unavailable when disabled.)"
 msgstr ""
 
+#, fuzzy
+msgid "Settings"
+msgstr "تنظیمات پیامک"
+
+#, fuzzy
+msgid "Change your personal settings"
+msgstr "تنظیمات نمایه‌تان را تغییر دهید"
+
+#, fuzzy
+msgid "Site configuration"
+msgstr "پیکربندی کاربر"
+
+msgid "Logout"
+msgstr "خروج"
+
+msgid "Logout from the site"
+msgstr "خارج شدن از سایت ."
+
+msgid "Login to the site"
+msgstr "ورود به وب‌گاه"
+
+msgid "Search"
+msgstr "جست‌وجو"
+
+#, fuzzy
+msgid "Search the site"
+msgstr "جست‌وجوی وب‌گاه"
+
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
 msgid "Subscriptions"
@@ -7918,6 +7893,39 @@ msgstr "پیدا کردن محتوای پیام‌ها"
 msgid "Find groups on this site"
 msgstr "پیدا کردن گروه‌ها در این وب‌گاه"
 
+#. TRANS: Secondary navigation menu option leading to help on StatusNet.
+msgid "Help"
+msgstr "کمک"
+
+#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
+msgid "About"
+msgstr "دربارهٔ"
+
+#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
+msgid "FAQ"
+msgstr "سوال‌های رایج"
+
+#. TRANS: Secondary navigation menu option leading to Terms of Service.
+msgid "TOS"
+msgstr "شرایط سرویس"
+
+#. TRANS: Secondary navigation menu option leading to privacy policy.
+msgid "Privacy"
+msgstr "خصوصی"
+
+#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
+msgid "Source"
+msgstr "منبع"
+
+#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+msgid "Contact"
+msgstr "تماس"
+
+#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
+msgid "Badge"
+msgstr "نشان"
+
 msgid "Untitled section"
 msgstr "بخش بی‌نام"
 
@@ -8194,19 +8202,10 @@ msgstr ""
 msgid "Getting backup from file '%s'."
 msgstr ""
 
-#~ msgid "Full name is too long (max 255 chars)."
-#~ msgstr "نام کامل خیلی طولانی است (حداکثر ۲۵۵ نویسه)."
-
-#~ msgid "description is too long (max %d chars)."
-#~ msgstr "توصیف خیلی طولانی است (حداکثر %d نویسه)"
-
-#~ msgid "Location is too long (max 255 chars)."
-#~ msgstr "نام مکان خیلی طولانی است (حداکثر ۲۵۵ نویسه)"
-
-#~ msgid "Too many aliases! Maximum %d."
-#~ msgstr "نام‌های مستعار بسیار زیاد هستند! حداکثر %d."
+#, fuzzy
+#~ msgid "Friends timeline"
+#~ msgstr "خط‌زمانی %s"
 
 #, fuzzy
-#~ msgctxt "BUTTON"
-#~ msgid "Comment"
-#~ msgstr "محتوا"
+#~ msgid "Everyone on this site"
+#~ msgstr "پیدا کردن افراد در این وب‌گاه"
diff --git a/locale/fi/LC_MESSAGES/statusnet.po b/locale/fi/LC_MESSAGES/statusnet.po
index 63c5dffdf9..31e3ddcf16 100644
--- a/locale/fi/LC_MESSAGES/statusnet.po
+++ b/locale/fi/LC_MESSAGES/statusnet.po
@@ -15,17 +15,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-06 02:34+0100\n"
-"PO-Revision-Date: 2011-03-06 01:36:18+0000\n"
+"POT-Creation-Date: 2011-03-08 01:03+0000\n"
+"PO-Revision-Date: 2011-03-08 01:05:11+0000\n"
 "Language-Team: Finnish <http://translatewiki.net/wiki/Portal:fi>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fi\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-03-03 17:59:19+0000\n"
+"X-POT-Import-Date: 2011-03-06 02:16:47+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -6011,83 +6011,9 @@ msgstr "Vastaus"
 msgid "Write a reply..."
 msgstr ""
 
-msgid "Home"
-msgstr "Kotisivu"
-
 #, fuzzy
-msgid "Friends timeline"
-msgstr "%s aikajana"
-
-msgid "Your profile"
-msgstr "Sinun profiilisi"
-
-msgid "Public"
-msgstr "Julkinen"
-
-#, fuzzy
-msgid "Everyone on this site"
-msgstr "Hae ihmisiä tältä sivustolta"
-
-msgid "Settings"
-msgstr "Profiilikuva-asetukset"
-
-#, fuzzy
-msgid "Change your personal settings"
-msgstr "Vaihda profiiliasetuksesi"
-
-#, fuzzy
-msgid "Site configuration"
-msgstr "SMS vahvistus"
-
-msgid "Logout"
-msgstr "Kirjaudu ulos"
-
-msgid "Logout from the site"
-msgstr "Kirjaudu sisään"
-
-msgid "Login to the site"
-msgstr "Kirjaudu sisään"
-
-msgid "Search"
-msgstr "Haku"
-
-#, fuzzy
-msgid "Search the site"
-msgstr "Haku"
-
-#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-msgid "Help"
-msgstr "Ohjeet"
-
-#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-msgid "About"
-msgstr "Tietoa"
-
-#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-msgid "FAQ"
-msgstr "UKK"
-
-#. TRANS: Secondary navigation menu option leading to Terms of Service.
-msgid "TOS"
-msgstr ""
-
-#. TRANS: Secondary navigation menu option leading to privacy policy.
-msgid "Privacy"
-msgstr "Yksityisyys"
-
-#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-msgid "Source"
-msgstr "Lähdekoodi"
-
-#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
-#. TRANS: StatusNet site, where to report bugs, ...
-msgid "Contact"
-msgstr "Ota yhteyttä"
-
-#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#, fuzzy
-msgid "Badge"
-msgstr "Tönäise"
+msgid "Status"
+msgstr "Päivitys poistettu."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #. TRANS: Text between [] is a link description, text between () is the link itself.
@@ -6870,6 +6796,12 @@ msgstr "Kirjaudu sisään palveluun"
 msgid "Database error"
 msgstr "Tietokantavirhe"
 
+msgid "Home"
+msgstr "Kotisivu"
+
+msgid "Public"
+msgstr "Julkinen"
+
 #. TRANS: Description of form for deleting a user.
 msgid "Delete this user"
 msgstr "Poista käyttäjä"
@@ -7472,6 +7404,18 @@ msgid ""
 "users in conversation. People can send you messages for your eyes only."
 msgstr ""
 
+msgid "Inbox"
+msgstr "Saapuneet"
+
+msgid "Your incoming messages"
+msgstr "Sinulle saapuneet viestit"
+
+msgid "Outbox"
+msgstr "Lähetetyt"
+
+msgid "Your sent messages"
+msgstr "Lähettämäsi viestit"
+
 msgid "Could not parse message."
 msgstr "Ei voitu lukea viestiä."
 
@@ -7549,6 +7493,20 @@ msgstr "Viesti"
 msgid "from"
 msgstr " lähteestä "
 
+msgid "Can't get author for activity."
+msgstr ""
+
+#, fuzzy
+msgid "Bookmark not posted to this group."
+msgstr "Sinä et kuulu tähän ryhmään."
+
+#, fuzzy
+msgid "Object not posted to this user."
+msgstr "Älä poista tätä päivitystä"
+
+msgid "Don't know how to handle this kind of target."
+msgstr ""
+
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 msgid "Nickname cannot be empty."
 msgstr ""
@@ -7666,24 +7624,15 @@ msgstr ""
 msgid "Couldn't insert new subscription."
 msgstr "Ei voitu lisätä uutta tilausta."
 
+msgid "Your profile"
+msgstr "Sinun profiilisi"
+
 msgid "Replies"
 msgstr "Vastaukset"
 
 msgid "Favorites"
 msgstr "Suosikit"
 
-msgid "Inbox"
-msgstr "Saapuneet"
-
-msgid "Your incoming messages"
-msgstr "Sinulle saapuneet viestit"
-
-msgid "Outbox"
-msgstr "Lähetetyt"
-
-msgid "Your sent messages"
-msgstr "Lähettämäsi viestit"
-
 #. TRANS: Title for personal tag cloud section. %s is a user nickname.
 #, php-format
 msgid "Tags in %s's notices"
@@ -7708,6 +7657,33 @@ msgctxt "plugin-description"
 msgid "(Plugin descriptions unavailable when disabled.)"
 msgstr ""
 
+msgid "Settings"
+msgstr "Profiilikuva-asetukset"
+
+#, fuzzy
+msgid "Change your personal settings"
+msgstr "Vaihda profiiliasetuksesi"
+
+#, fuzzy
+msgid "Site configuration"
+msgstr "SMS vahvistus"
+
+msgid "Logout"
+msgstr "Kirjaudu ulos"
+
+msgid "Logout from the site"
+msgstr "Kirjaudu sisään"
+
+msgid "Login to the site"
+msgstr "Kirjaudu sisään"
+
+msgid "Search"
+msgstr "Haku"
+
+#, fuzzy
+msgid "Search the site"
+msgstr "Haku"
+
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
 msgid "Subscriptions"
@@ -7824,6 +7800,40 @@ msgstr "Hae päivityksien sisällöstä"
 msgid "Find groups on this site"
 msgstr "Etsi ryhmiä tästä palvelusta"
 
+#. TRANS: Secondary navigation menu option leading to help on StatusNet.
+msgid "Help"
+msgstr "Ohjeet"
+
+#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
+msgid "About"
+msgstr "Tietoa"
+
+#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
+msgid "FAQ"
+msgstr "UKK"
+
+#. TRANS: Secondary navigation menu option leading to Terms of Service.
+msgid "TOS"
+msgstr ""
+
+#. TRANS: Secondary navigation menu option leading to privacy policy.
+msgid "Privacy"
+msgstr "Yksityisyys"
+
+#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
+msgid "Source"
+msgstr "Lähdekoodi"
+
+#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+msgid "Contact"
+msgstr "Ota yhteyttä"
+
+#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
+#, fuzzy
+msgid "Badge"
+msgstr "Tönäise"
+
 msgid "Untitled section"
 msgstr "Nimetön osa"
 
@@ -8114,19 +8124,10 @@ msgstr ""
 msgid "Getting backup from file '%s'."
 msgstr ""
 
-#~ msgid "Full name is too long (max 255 chars)."
-#~ msgstr "Koko nimi on liian pitkä (max 255 merkkiä)."
-
-#~ msgid "description is too long (max %d chars)."
-#~ msgstr "kuvaus on liian pitkä (max %d merkkiä)."
-
-#~ msgid "Location is too long (max 255 chars)."
-#~ msgstr "Kotipaikka on liian pitkä (enintään 255 merkkiä)."
-
-#~ msgid "Too many aliases! Maximum %d."
-#~ msgstr "Liikaa aliaksia. Maksimimäärä on %d."
+#, fuzzy
+#~ msgid "Friends timeline"
+#~ msgstr "%s aikajana"
 
 #, fuzzy
-#~ msgctxt "BUTTON"
-#~ msgid "Comment"
-#~ msgstr "Sisältö"
+#~ msgid "Everyone on this site"
+#~ msgstr "Hae ihmisiä tältä sivustolta"
diff --git a/locale/fr/LC_MESSAGES/statusnet.po b/locale/fr/LC_MESSAGES/statusnet.po
index 825c092aca..4006bd8157 100644
--- a/locale/fr/LC_MESSAGES/statusnet.po
+++ b/locale/fr/LC_MESSAGES/statusnet.po
@@ -21,17 +21,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-06 02:34+0100\n"
-"PO-Revision-Date: 2011-03-06 01:36:19+0000\n"
+"POT-Creation-Date: 2011-03-08 01:03+0000\n"
+"PO-Revision-Date: 2011-03-08 01:05:12+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-POT-Import-Date: 2011-03-03 17:59:19+0000\n"
+"X-POT-Import-Date: 2011-03-06 02:16:47+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -6095,82 +6095,9 @@ msgstr "Répondre"
 msgid "Write a reply..."
 msgstr ""
 
-msgid "Home"
-msgstr "Site personnel"
-
 #, fuzzy
-msgid "Friends timeline"
-msgstr "Activité de %s"
-
-msgid "Your profile"
-msgstr "Votre profil"
-
-msgid "Public"
-msgstr "Public"
-
-#, fuzzy
-msgid "Everyone on this site"
-msgstr "Chercher des personnes sur ce site"
-
-msgid "Settings"
-msgstr "Paramètres SMS"
-
-#, fuzzy
-msgid "Change your personal settings"
-msgstr "Modifier vos paramètres de profil"
-
-#, fuzzy
-msgid "Site configuration"
-msgstr "Configuration utilisateur"
-
-msgid "Logout"
-msgstr "Déconnexion"
-
-msgid "Logout from the site"
-msgstr "Fermer la session"
-
-msgid "Login to the site"
-msgstr "Ouvrir une session"
-
-msgid "Search"
-msgstr "Rechercher"
-
-#, fuzzy
-msgid "Search the site"
-msgstr "Rechercher sur le site"
-
-#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-msgid "Help"
-msgstr "Aide"
-
-#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-msgid "About"
-msgstr "À propos"
-
-#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-msgid "FAQ"
-msgstr "FAQ"
-
-#. TRANS: Secondary navigation menu option leading to Terms of Service.
-msgid "TOS"
-msgstr "CGU"
-
-#. TRANS: Secondary navigation menu option leading to privacy policy.
-msgid "Privacy"
-msgstr "Confidentialité"
-
-#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-msgid "Source"
-msgstr "Source"
-
-#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
-#. TRANS: StatusNet site, where to report bugs, ...
-msgid "Contact"
-msgstr "Contact"
-
-#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-msgid "Badge"
-msgstr "Insigne"
+msgid "Status"
+msgstr "StatusNet"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #. TRANS: Text between [] is a link description, text between () is the link itself.
@@ -6981,6 +6908,12 @@ msgstr "Aller au programme d’installation"
 msgid "Database error"
 msgstr "Erreur de la base de données"
 
+msgid "Home"
+msgstr "Site personnel"
+
+msgid "Public"
+msgstr "Public"
+
 #. TRANS: Description of form for deleting a user.
 msgid "Delete this user"
 msgstr "Supprimer cet utilisateur"
@@ -7664,6 +7597,18 @@ msgstr ""
 "pour démarrer des conversations avec d’autres utilisateurs. Ceux-ci peuvent "
 "vous envoyer des messages destinés à vous seul(e)."
 
+msgid "Inbox"
+msgstr "Boîte de réception"
+
+msgid "Your incoming messages"
+msgstr "Vos messages reçus"
+
+msgid "Outbox"
+msgstr "Boîte d’envoi"
+
+msgid "Your sent messages"
+msgstr "Vos messages envoyés"
+
 msgid "Could not parse message."
 msgstr "Impossible de déchiffrer ce message."
 
@@ -7742,6 +7687,20 @@ msgstr "Message"
 msgid "from"
 msgstr "de"
 
+msgid "Can't get author for activity."
+msgstr ""
+
+#, fuzzy
+msgid "Bookmark not posted to this group."
+msgstr "Vous n’êtes pas autorisé à supprimer ce groupe."
+
+#, fuzzy
+msgid "Object not posted to this user."
+msgstr "Ne pas supprimer ce groupe"
+
+msgid "Don't know how to handle this kind of target."
+msgstr ""
+
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 msgid "Nickname cannot be empty."
 msgstr "Le pseudonyme ne peut pas être vide."
@@ -7856,24 +7815,15 @@ msgstr "Avis en doublon."
 msgid "Couldn't insert new subscription."
 msgstr "Impossible d’insérer un nouvel abonnement."
 
+msgid "Your profile"
+msgstr "Votre profil"
+
 msgid "Replies"
 msgstr "Réponses"
 
 msgid "Favorites"
 msgstr "Favoris"
 
-msgid "Inbox"
-msgstr "Boîte de réception"
-
-msgid "Your incoming messages"
-msgstr "Vos messages reçus"
-
-msgid "Outbox"
-msgstr "Boîte d’envoi"
-
-msgid "Your sent messages"
-msgstr "Vos messages envoyés"
-
 #. TRANS: Title for personal tag cloud section. %s is a user nickname.
 #, php-format
 msgid "Tags in %s's notices"
@@ -7897,6 +7847,33 @@ msgctxt "plugin-description"
 msgid "(Plugin descriptions unavailable when disabled.)"
 msgstr ""
 
+msgid "Settings"
+msgstr "Paramètres SMS"
+
+#, fuzzy
+msgid "Change your personal settings"
+msgstr "Modifier vos paramètres de profil"
+
+#, fuzzy
+msgid "Site configuration"
+msgstr "Configuration utilisateur"
+
+msgid "Logout"
+msgstr "Déconnexion"
+
+msgid "Logout from the site"
+msgstr "Fermer la session"
+
+msgid "Login to the site"
+msgstr "Ouvrir une session"
+
+msgid "Search"
+msgstr "Rechercher"
+
+#, fuzzy
+msgid "Search the site"
+msgstr "Rechercher sur le site"
+
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
 msgid "Subscriptions"
@@ -8005,6 +7982,39 @@ msgstr "Chercher dans le contenu des avis"
 msgid "Find groups on this site"
 msgstr "Rechercher des groupes sur ce site"
 
+#. TRANS: Secondary navigation menu option leading to help on StatusNet.
+msgid "Help"
+msgstr "Aide"
+
+#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
+msgid "About"
+msgstr "À propos"
+
+#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
+msgid "FAQ"
+msgstr "FAQ"
+
+#. TRANS: Secondary navigation menu option leading to Terms of Service.
+msgid "TOS"
+msgstr "CGU"
+
+#. TRANS: Secondary navigation menu option leading to privacy policy.
+msgid "Privacy"
+msgstr "Confidentialité"
+
+#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
+msgid "Source"
+msgstr "Source"
+
+#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+msgid "Contact"
+msgstr "Contact"
+
+#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
+msgid "Badge"
+msgstr "Insigne"
+
 msgid "Untitled section"
 msgstr "Section sans titre"
 
@@ -8292,19 +8302,10 @@ msgstr "XML invalide, racine XRD manquante."
 msgid "Getting backup from file '%s'."
 msgstr "Obtention de la sauvegarde depuis le fichier « %s »."
 
-#~ msgid "Full name is too long (max 255 chars)."
-#~ msgstr "Le nom complet est trop long (limité à 255 caractères maximum)."
-
-#~ msgid "description is too long (max %d chars)."
-#~ msgstr "la description est trop longue (%d caractères maximum)."
-
-#~ msgid "Location is too long (max 255 chars)."
-#~ msgstr "L’emplacement est trop long (limité à 255 caractères maximum)."
-
-#~ msgid "Too many aliases! Maximum %d."
-#~ msgstr "Trop d’alias ! Maximum %d."
+#, fuzzy
+#~ msgid "Friends timeline"
+#~ msgstr "Activité de %s"
 
 #, fuzzy
-#~ msgctxt "BUTTON"
-#~ msgid "Comment"
-#~ msgstr "Contenu"
+#~ msgid "Everyone on this site"
+#~ msgstr "Chercher des personnes sur ce site"
diff --git a/locale/fur/LC_MESSAGES/statusnet.po b/locale/fur/LC_MESSAGES/statusnet.po
index feef13b8d9..8935ca9b3a 100644
--- a/locale/fur/LC_MESSAGES/statusnet.po
+++ b/locale/fur/LC_MESSAGES/statusnet.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-06 02:34+0100\n"
-"PO-Revision-Date: 2011-03-06 01:36:20+0000\n"
+"POT-Creation-Date: 2011-03-08 01:03+0000\n"
+"PO-Revision-Date: 2011-03-08 01:05:13+0000\n"
 "Language-Team: Friulian <http://translatewiki.net/wiki/Portal:fur>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-03 17:59:19+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-POT-Import-Date: 2011-03-06 02:16:47+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fur\n"
 "X-Message-Group: #out-statusnet-core\n"
@@ -5693,88 +5693,8 @@ msgid "Write a reply..."
 msgstr ""
 
 #, fuzzy
-msgid "Home"
-msgstr "Pagjine web"
-
-#, fuzzy
-msgid "Friends timeline"
-msgstr "Ativitât di %s"
-
-#, fuzzy
-msgid "Your profile"
-msgstr "Profîl dal grup"
-
-msgid "Public"
-msgstr "Public"
-
-#, fuzzy
-msgid "Everyone on this site"
-msgstr "Cjate int in chest sît"
-
-#, fuzzy
-msgid "Settings"
-msgstr "Impuestazions IM"
-
-#, fuzzy
-msgid "Change your personal settings"
-msgstr "Cambie lis impuestazions dal to profîl"
-
-#, fuzzy
-msgid "Site configuration"
-msgstr "Cambie la configurazion dal sît"
-
-#, fuzzy
-msgid "Logout"
-msgstr "Jes"
-
-#, fuzzy
-msgid "Logout from the site"
-msgstr "Jes dal sît"
-
-#, fuzzy
-msgid "Login to the site"
-msgstr "Jentre tal sît"
-
-#, fuzzy
-msgid "Search"
-msgstr "Cîr"
-
-#, fuzzy
-msgid "Search the site"
-msgstr "Cîr tal sît"
-
-#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-msgid "Help"
-msgstr "Jutori"
-
-#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-msgid "About"
-msgstr "Informazions"
-
-#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-msgid "FAQ"
-msgstr ""
-
-#. TRANS: Secondary navigation menu option leading to Terms of Service.
-msgid "TOS"
-msgstr ""
-
-#. TRANS: Secondary navigation menu option leading to privacy policy.
-msgid "Privacy"
-msgstr ""
-
-#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-msgid "Source"
-msgstr "Sorzint"
-
-#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
-#. TRANS: StatusNet site, where to report bugs, ...
-msgid "Contact"
-msgstr "Contats"
-
-#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-msgid "Badge"
-msgstr ""
+msgid "Status"
+msgstr "StatusNet"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #. TRANS: Text between [] is a link description, text between () is the link itself.
@@ -6524,6 +6444,13 @@ msgstr ""
 msgid "Database error"
 msgstr "Erôr de base di dâts"
 
+#, fuzzy
+msgid "Home"
+msgstr "Pagjine web"
+
+msgid "Public"
+msgstr "Public"
+
 #. TRANS: Description of form for deleting a user.
 msgid "Delete this user"
 msgstr "Elimine chest utent"
@@ -7090,6 +7017,19 @@ msgid ""
 "users in conversation. People can send you messages for your eyes only."
 msgstr ""
 
+msgid "Inbox"
+msgstr ""
+
+msgid "Your incoming messages"
+msgstr ""
+
+#, fuzzy
+msgid "Outbox"
+msgstr "Pueste in jessude par %s"
+
+msgid "Your sent messages"
+msgstr ""
+
 msgid "Could not parse message."
 msgstr ""
 
@@ -7163,6 +7103,20 @@ msgstr "Messaçs"
 msgid "from"
 msgstr "di"
 
+msgid "Can't get author for activity."
+msgstr ""
+
+#, fuzzy
+msgid "Bookmark not posted to this group."
+msgstr "No tu fasis part di chest grup."
+
+#, fuzzy
+msgid "Object not posted to this user."
+msgstr "No stâ eliminâ chest utent"
+
+msgid "Don't know how to handle this kind of target."
+msgstr ""
+
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 msgid "Nickname cannot be empty."
 msgstr ""
@@ -7275,6 +7229,10 @@ msgstr ""
 msgid "Couldn't insert new subscription."
 msgstr ""
 
+#, fuzzy
+msgid "Your profile"
+msgstr "Profîl dal grup"
+
 #, fuzzy
 msgid "Replies"
 msgstr "Rispuestis"
@@ -7283,19 +7241,6 @@ msgstr "Rispuestis"
 msgid "Favorites"
 msgstr "Preferîts"
 
-msgid "Inbox"
-msgstr ""
-
-msgid "Your incoming messages"
-msgstr ""
-
-#, fuzzy
-msgid "Outbox"
-msgstr "Pueste in jessude par %s"
-
-msgid "Your sent messages"
-msgstr ""
-
 #. TRANS: Title for personal tag cloud section. %s is a user nickname.
 #, php-format
 msgid "Tags in %s's notices"
@@ -7319,6 +7264,38 @@ msgctxt "plugin-description"
 msgid "(Plugin descriptions unavailable when disabled.)"
 msgstr ""
 
+#, fuzzy
+msgid "Settings"
+msgstr "Impuestazions IM"
+
+#, fuzzy
+msgid "Change your personal settings"
+msgstr "Cambie lis impuestazions dal to profîl"
+
+#, fuzzy
+msgid "Site configuration"
+msgstr "Cambie la configurazion dal sît"
+
+#, fuzzy
+msgid "Logout"
+msgstr "Jes"
+
+#, fuzzy
+msgid "Logout from the site"
+msgstr "Jes dal sît"
+
+#, fuzzy
+msgid "Login to the site"
+msgstr "Jentre tal sît"
+
+#, fuzzy
+msgid "Search"
+msgstr "Cîr"
+
+#, fuzzy
+msgid "Search the site"
+msgstr "Cîr tal sît"
+
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
 msgid "Subscriptions"
@@ -7427,6 +7404,39 @@ msgstr ""
 msgid "Find groups on this site"
 msgstr ""
 
+#. TRANS: Secondary navigation menu option leading to help on StatusNet.
+msgid "Help"
+msgstr "Jutori"
+
+#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
+msgid "About"
+msgstr "Informazions"
+
+#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
+msgid "FAQ"
+msgstr ""
+
+#. TRANS: Secondary navigation menu option leading to Terms of Service.
+msgid "TOS"
+msgstr ""
+
+#. TRANS: Secondary navigation menu option leading to privacy policy.
+msgid "Privacy"
+msgstr ""
+
+#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
+msgid "Source"
+msgstr "Sorzint"
+
+#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+msgid "Contact"
+msgstr "Contats"
+
+#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
+msgid "Badge"
+msgstr ""
+
 msgid "Untitled section"
 msgstr ""
 
@@ -7705,18 +7715,9 @@ msgid "Getting backup from file '%s'."
 msgstr ""
 
 #, fuzzy
-#~ msgid "Full name is too long (max 255 chars)."
-#~ msgstr "Il non complet al è masse lunc (max 255 caratars)."
+#~ msgid "Friends timeline"
+#~ msgstr "Ativitât di %s"
 
 #, fuzzy
-#~ msgid "description is too long (max %d chars)."
-#~ msgstr "La descrizion e je masse lungje (massim %d caratar)."
-
-#, fuzzy
-#~ msgid "Location is too long (max 255 chars)."
-#~ msgstr "Il lûc al è masse lunc (max 255 caratars)."
-
-#, fuzzy
-#~ msgctxt "BUTTON"
-#~ msgid "Comment"
-#~ msgstr "Contignût"
+#~ msgid "Everyone on this site"
+#~ msgstr "Cjate int in chest sît"
diff --git a/locale/gl/LC_MESSAGES/statusnet.po b/locale/gl/LC_MESSAGES/statusnet.po
index 0f2762b236..82a1934778 100644
--- a/locale/gl/LC_MESSAGES/statusnet.po
+++ b/locale/gl/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-03-06 02:34+0100\n"
-"PO-Revision-Date: 2011-03-06 01:36:21+0000\n"
+"POT-Creation-Date: 2011-03-08 01:03+0000\n"
+"PO-Revision-Date: 2011-03-08 01:05:14+0000\n"
 "Language-Team: Galician <http://translatewiki.net/wiki/Portal:gl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: gl\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-03-03 17:59:19+0000\n"
+"X-POT-Import-Date: 2011-03-06 02:16:47+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -272,7 +272,7 @@ msgstr "Non se puido gardar o perfil."
 #. TRANS: Client error displayed when the number of bytes in a POST request exceeds a limit.
 #. TRANS: %s is the number of bytes of the CONTENT_LENGTH.
 #. TRANS: Form validation error in design settings form. POST should remain untranslated.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s byte) due to its "
 "current configuration."
@@ -302,7 +302,7 @@ msgstr "Non se puido actualizar o seu deseño."
 #. TRANS: Title for Atom feed.
 msgctxt "ATOM"
 msgid "Main"
-msgstr ""
+msgstr "Principal"
 
 #. TRANS: Title for Atom feed. %s is a user nickname.
 #. TRANS: Message is used as link title. %s is a user nickname.
@@ -324,12 +324,12 @@ msgstr "%s subscricións"
 #. TRANS: Title for Atom feed with a user's favorite notices. %s is a user nickname.
 #. TRANS: Title for Atom favorites feed.
 #. TRANS: %s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "%s favorites"
-msgstr "Favoritas"
+msgstr "Favoritos de %s"
 
 #. TRANS: Title for Atom feed with a user's memberships. %s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "%s memberships"
 msgstr "Membros do grupo %s"
 
@@ -373,7 +373,7 @@ msgstr "A mensaxe non ten texto!"
 #. TRANS: %d is the maximum number of characters for a message.
 #. TRANS: Form validation error displayed when message content is too long.
 #. TRANS: %d is the maximum number of characters for a message.
-#, fuzzy, php-format
+#, php-format
 msgid "That's too long. Maximum message size is %d character."
 msgid_plural "That's too long. Maximum message size is %d characters."
 msgstr[0] ""
@@ -386,13 +386,11 @@ msgid "Recipient user not found."
 msgstr "Non se atopou o destinatario."
 
 #. TRANS: Client error displayed trying to direct message another user who's not a friend (403).
-#, fuzzy
 msgid "Cannot send direct messages to users who aren't your friend."
 msgstr ""
 "Non pode enviar mensaxes directas a usuarios que non sexan amigos seus."
 
 #. TRANS: Client error displayed trying to direct message self (403).
-#, fuzzy
 msgid ""
 "Do not send a message to yourself; just say it to yourself quietly instead."
 msgstr "Non se envíe unha mensaxe, limítese a pensar nela."
@@ -441,7 +439,6 @@ msgid "You cannot unfollow yourself."
 msgstr "Non pode deixar de seguirse a si mesmo."
 
 #. TRANS: Client error displayed when supplying invalid parameters to an API call checking if a friendship exists.
-#, fuzzy
 msgid "Two valid IDs or nick names must be supplied."
 msgstr "Deben fornecerse dúas identificacións ou nomes de usuario."
 
@@ -484,7 +481,6 @@ msgstr "O URL da páxina persoal non é correcto."
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "O nome completo é longo de máis (o máximo son 255 caracteres)."
 
@@ -499,7 +495,7 @@ msgstr "O nome completo é longo de máis (o máximo son 255 caracteres)."
 #. TRANS: %d is the maximum number of characters for the description.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed characters.
-#, fuzzy, php-format
+#, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."
 msgstr[0] "A descrición é longa de máis (o máximo son %d caracteres)."
@@ -510,7 +506,6 @@ msgstr[1] "A descrición é longa de máis (o máximo son %d caracteres)."
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#, fuzzy
 msgid "Location is too long (maximum 255 characters)."
 msgstr "A localidade é longa de máis (o máximo son 255 caracteres)."
 
@@ -522,7 +517,7 @@ msgstr "A localidade é longa de máis (o máximo son 255 caracteres)."
 #. TRANS: %d is the maximum number of allowed aliases.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.
-#, fuzzy, php-format
+#, php-format
 msgid "Too many aliases! Maximum %d allowed."
 msgid_plural "Too many aliases! Maximum %d allowed."
 msgstr[0] "Demasiados pseudónimos! O número máximo é %d."
@@ -641,7 +636,6 @@ msgstr ""
 
 #. TRANS: API validation exception thrown when alias is the same as nickname.
 #. TRANS: Group create form validation error.
-#, fuzzy
 msgid "Alias cannot be the same as nickname."
 msgstr "O pseudónimo non pode coincidir co alcume."
 
@@ -650,7 +644,6 @@ msgid "Upload failed."
 msgstr "Houbo un erro durante a carga."
 
 #. TRANS: Client error given from the OAuth API when the request token or verifier is invalid.
-#, fuzzy
 msgid "Invalid request token or verifier."
 msgstr "O pase especificado é incorrecto."
 
@@ -663,9 +656,8 @@ msgid "Invalid request token."
 msgstr "Pase de solicitude incorrecto."
 
 #. TRANS: Client error given when an invalid request token was passed to the OAuth API.
-#, fuzzy
 msgid "Request token already authorized."
-msgstr "Non está autorizado."
+msgstr "O pase solicitado xa está autorizado."
 
 #. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
 #. TRANS: Client error displayed when the session token does not match or is not given.
@@ -681,11 +673,9 @@ msgid "Invalid nickname / password!"
 msgstr "O alcume ou o contrasinal son incorrectos!"
 
 #. TRANS: Server error displayed when a database action fails.
-#, fuzzy
 msgid "Database error inserting oauth_token_association."
 msgstr ""
-"Houbo un erro na base de datos ao intentar inserir o usuario da aplicación "
-"OAuth."
+"Houbo un erro na base de datos ao intentar inserir o oauth_token_association."
 
 #. TRANS: Client error given on when invalid data was passed through a form in the OAuth API.
 #. TRANS: Unexpected validation error on avatar upload form.
@@ -861,14 +851,13 @@ msgstr ""
 
 #. TRANS: Client error displayed when a user has no rights to delete notices of other users.
 #. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
-#, fuzzy
 msgid "Cannot delete this notice."
 msgstr "Non se pode borrar esta nota."
 
 #. TRANS: Confirmation of notice deletion in API. %d is the ID (number) of the deleted notice.
-#, fuzzy, php-format
+#, php-format
 msgid "Deleted notice %d"
-msgstr "Borrar a nota"
+msgstr "Borrar a nota %d"
 
 #. TRANS: Client error displayed when the parameter "status" is missing.
 msgid "Client must provide a 'status' parameter with a value."
@@ -1675,9 +1664,8 @@ msgid "Are you sure you want to delete this notice?"
 msgstr "Está seguro de querer borrar esta nota?"
 
 #. TRANS: Submit button title for 'No' when deleting a notice.
-#, fuzzy
 msgid "Do not delete this notice."
-msgstr "Non borrar esta nota"
+msgstr "Non borrar esta nota."
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
 #, fuzzy
@@ -4740,7 +4728,6 @@ msgid "Created"
 msgstr "Creado"
 
 #. TRANS: Label for member count in statistics on group page.
-#, fuzzy
 msgctxt "LABEL"
 msgid "Members"
 msgstr "Membros"
@@ -6091,87 +6078,8 @@ msgid "Write a reply..."
 msgstr ""
 
 #, fuzzy
-msgid "Home"
-msgstr "Páxina persoal"
-
-#, fuzzy
-msgid "Friends timeline"
-msgstr "Liña do tempo de %s"
-
-#, fuzzy
-msgid "Your profile"
-msgstr "Perfil do grupo"
-
-msgid "Public"
-msgstr "Públicas"
-
-#, fuzzy
-msgid "Everyone on this site"
-msgstr "Atopar xente neste sitio"
-
-#, fuzzy
-msgid "Settings"
-msgstr "Configuración dos SMS"
-
-#, fuzzy
-msgid "Change your personal settings"
-msgstr "Cambie a configuración do seu perfil"
-
-#, fuzzy
-msgid "Site configuration"
-msgstr "Configuración do usuario"
-
-#, fuzzy
-msgid "Logout"
-msgstr "Saír"
-
-#, fuzzy
-msgid "Logout from the site"
-msgstr "Saír ao anonimato"
-
-#, fuzzy
-msgid "Login to the site"
-msgstr "Identificarse no sitio"
-
-msgid "Search"
-msgstr "Buscar"
-
-#, fuzzy
-msgid "Search the site"
-msgstr "Buscar no sitio"
-
-#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-msgid "Help"
-msgstr "Axuda"
-
-#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-msgid "About"
-msgstr "Acerca de"
-
-#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-msgid "FAQ"
-msgstr "Preguntas máis frecuentes"
-
-#. TRANS: Secondary navigation menu option leading to Terms of Service.
-msgid "TOS"
-msgstr "Condicións do servicio"
-
-#. TRANS: Secondary navigation menu option leading to privacy policy.
-msgid "Privacy"
-msgstr "Protección de datos"
-
-#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-msgid "Source"
-msgstr "Código fonte"
-
-#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
-#. TRANS: StatusNet site, where to report bugs, ...
-msgid "Contact"
-msgstr "Contacto"
-
-#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-msgid "Badge"
-msgstr "Insignia"
+msgid "Status"
+msgstr "StatusNet"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #. TRANS: Text between [] is a link description, text between () is the link itself.
@@ -6983,6 +6891,13 @@ msgstr "Ir ao instalador."
 msgid "Database error"
 msgstr "Houbo un erro na base de datos"
 
+#, fuzzy
+msgid "Home"
+msgstr "Páxina persoal"
+
+msgid "Public"
+msgstr "Públicas"
+
 #. TRANS: Description of form for deleting a user.
 msgid "Delete this user"
 msgstr "Borrar o usuario"
@@ -7668,6 +7583,18 @@ msgstr ""
 "Non ten mensaxes privadas. Pode enviar mensaxes privadas para conversar con "
 "outros usuarios. A xente pode enviarlle mensaxes para que só as lea vostede."
 
+msgid "Inbox"
+msgstr "Caixa de entrada"
+
+msgid "Your incoming messages"
+msgstr "As mensaxes recibidas"
+
+msgid "Outbox"
+msgstr "Caixa de saída"
+
+msgid "Your sent messages"
+msgstr "As mensaxes enviadas"
+
 msgid "Could not parse message."
 msgstr "Non se puido analizar a mensaxe."
 
@@ -7747,6 +7674,20 @@ msgstr "Mensaxe"
 msgid "from"
 msgstr "de"
 
+msgid "Can't get author for activity."
+msgstr ""
+
+#, fuzzy
+msgid "Bookmark not posted to this group."
+msgstr "Vostede non pertence a este grupo."
+
+#, fuzzy
+msgid "Object not posted to this user."
+msgstr "Non borrar esta nota"
+
+msgid "Don't know how to handle this kind of target."
+msgstr ""
+
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 msgid "Nickname cannot be empty."
 msgstr ""
@@ -7861,24 +7802,16 @@ msgstr "Nota duplicada."
 msgid "Couldn't insert new subscription."
 msgstr "Non se puido inserir unha subscrición nova."
 
+#, fuzzy
+msgid "Your profile"
+msgstr "Perfil do grupo"
+
 msgid "Replies"
 msgstr "Respostas"
 
 msgid "Favorites"
 msgstr "Favoritas"
 
-msgid "Inbox"
-msgstr "Caixa de entrada"
-
-msgid "Your incoming messages"
-msgstr "As mensaxes recibidas"
-
-msgid "Outbox"
-msgstr "Caixa de saída"
-
-msgid "Your sent messages"
-msgstr "As mensaxes enviadas"
-
 #. TRANS: Title for personal tag cloud section. %s is a user nickname.
 #, php-format
 msgid "Tags in %s's notices"
@@ -7902,6 +7835,37 @@ msgctxt "plugin-description"
 msgid "(Plugin descriptions unavailable when disabled.)"
 msgstr ""
 
+#, fuzzy
+msgid "Settings"
+msgstr "Configuración dos SMS"
+
+#, fuzzy
+msgid "Change your personal settings"
+msgstr "Cambie a configuración do seu perfil"
+
+#, fuzzy
+msgid "Site configuration"
+msgstr "Configuración do usuario"
+
+#, fuzzy
+msgid "Logout"
+msgstr "Saír"
+
+#, fuzzy
+msgid "Logout from the site"
+msgstr "Saír ao anonimato"
+
+#, fuzzy
+msgid "Login to the site"
+msgstr "Identificarse no sitio"
+
+msgid "Search"
+msgstr "Buscar"
+
+#, fuzzy
+msgid "Search the site"
+msgstr "Buscar no sitio"
+
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
 msgid "Subscriptions"
@@ -8011,6 +7975,39 @@ msgstr "Buscar nos contidos das notas"
 msgid "Find groups on this site"
 msgstr "Buscar grupos neste sitio"
 
+#. TRANS: Secondary navigation menu option leading to help on StatusNet.
+msgid "Help"
+msgstr "Axuda"
+
+#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
+msgid "About"
+msgstr "Acerca de"
+
+#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
+msgid "FAQ"
+msgstr "Preguntas máis frecuentes"
+
+#. TRANS: Secondary navigation menu option leading to Terms of Service.
+msgid "TOS"
+msgstr "Condicións do servicio"
+
+#. TRANS: Secondary navigation menu option leading to privacy policy.
+msgid "Privacy"
+msgstr "Protección de datos"
+
+#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
+msgid "Source"
+msgstr "Código fonte"
+
+#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+msgid "Contact"
+msgstr "Contacto"
+
+#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
+msgid "Badge"
+msgstr "Insignia"
+
 msgid "Untitled section"
 msgstr "Sección sen título"
 
@@ -8298,19 +8295,10 @@ msgstr ""
 msgid "Getting backup from file '%s'."
 msgstr ""
 
-#~ msgid "Full name is too long (max 255 chars)."
-#~ msgstr "O nome completo é longo de máis (o máximo son 255 caracteres)."
-
-#~ msgid "description is too long (max %d chars)."
-#~ msgstr "a descrición é longa de máis (o límite é de %d caracteres)."
-
-#~ msgid "Location is too long (max 255 chars)."
-#~ msgstr "A localidade é longa de máis (o máximo son 255 caracteres)."
-
-#~ msgid "Too many aliases! Maximum %d."
-#~ msgstr "Demasiados pseudónimos! O número máximo é %d."
+#, fuzzy
+#~ msgid "Friends timeline"
+#~ msgstr "Liña do tempo de %s"
 
 #, fuzzy
-#~ msgctxt "BUTTON"
-#~ msgid "Comment"
-#~ msgstr "Contido"
+#~ msgid "Everyone on this site"
+#~ msgstr "Atopar xente neste sitio"
diff --git a/locale/hsb/LC_MESSAGES/statusnet.po b/locale/hsb/LC_MESSAGES/statusnet.po
index da7a95e7ed..a5b1dc4d09 100644
--- a/locale/hsb/LC_MESSAGES/statusnet.po
+++ b/locale/hsb/LC_MESSAGES/statusnet.po
@@ -11,18 +11,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-06 02:34+0100\n"
-"PO-Revision-Date: 2011-03-06 01:36:22+0000\n"
+"POT-Creation-Date: 2011-03-08 01:03+0000\n"
+"PO-Revision-Date: 2011-03-08 01:05:15+0000\n"
 "Language-Team: Upper Sorbian <http://translatewiki.net/wiki/Portal:hsb>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: hsb\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : (n%100==3 || "
 "n%100==4) ? 2 : 3)\n"
-"X-POT-Import-Date: 2011-03-03 17:59:19+0000\n"
+"X-POT-Import-Date: 2011-03-06 02:16:47+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -5694,86 +5694,8 @@ msgid "Write a reply..."
 msgstr ""
 
 #, fuzzy
-msgid "Home"
-msgstr "Startowa strona"
-
-msgid "Friends timeline"
-msgstr ""
-
-#, fuzzy
-msgid "Your profile"
-msgstr "Skupinski profil"
-
-msgid "Public"
-msgstr "Zjawny"
-
-#, fuzzy
-msgid "Everyone on this site"
-msgstr "Ludźi na tutym sydle pytać"
-
-#, fuzzy
-msgid "Settings"
-msgstr "SMS-nastajenja"
-
-#, fuzzy
-msgid "Change your personal settings"
-msgstr "Twoje profilowe nastajenja změnić"
-
-#, fuzzy
-msgid "Site configuration"
-msgstr "Wužiwarska konfiguracija"
-
-#, fuzzy
-msgid "Logout"
-msgstr "Wotzjewić"
-
-#, fuzzy
-msgid "Logout from the site"
-msgstr "Ze sydła wotzjewić"
-
-#, fuzzy
-msgid "Login to the site"
-msgstr "Při sydle přizjewić"
-
-msgid "Search"
-msgstr "Pytać"
-
-#, fuzzy
-msgid "Search the site"
-msgstr "Pytanske sydło"
-
-#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-msgid "Help"
-msgstr "Pomoc"
-
-#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-msgid "About"
-msgstr "Wo"
-
-#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-msgid "FAQ"
-msgstr "Huste prašenja"
-
-#. TRANS: Secondary navigation menu option leading to Terms of Service.
-msgid "TOS"
-msgstr "Wužiwarske wuměnjenja"
-
-#. TRANS: Secondary navigation menu option leading to privacy policy.
-msgid "Privacy"
-msgstr "Priwatnosć"
-
-#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-msgid "Source"
-msgstr "Žórło"
-
-#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
-#. TRANS: StatusNet site, where to report bugs, ...
-msgid "Contact"
-msgstr "Kontakt"
-
-#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-msgid "Badge"
-msgstr "Plaketa"
+msgid "Status"
+msgstr "StatusNet"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #. TRANS: Text between [] is a link description, text between () is the link itself.
@@ -6533,6 +6455,13 @@ msgstr "K instalaciji"
 msgid "Database error"
 msgstr "Zmylk w datowej bance"
 
+#, fuzzy
+msgid "Home"
+msgstr "Startowa strona"
+
+msgid "Public"
+msgstr "Zjawny"
+
 #. TRANS: Description of form for deleting a user.
 msgid "Delete this user"
 msgstr "Tutoho wužiwarja wušmórnyć"
@@ -7122,6 +7051,18 @@ msgstr ""
 "wužiwarjow do konwersacije zaplesć. Ludźo móža ći powěsće pósłać, kotrež "
 "jenož ty móžeš widźeć."
 
+msgid "Inbox"
+msgstr "Dochadny póst"
+
+msgid "Your incoming messages"
+msgstr "Twoje dochadźace powěsće"
+
+msgid "Outbox"
+msgstr "Wuchadny póst"
+
+msgid "Your sent messages"
+msgstr "Twoje pósłane powěsće"
+
 msgid "Could not parse message."
 msgstr "Powěsć njeda so analyzować."
 
@@ -7199,6 +7140,20 @@ msgstr "Powěsće"
 msgid "from"
 msgstr "wot"
 
+msgid "Can't get author for activity."
+msgstr ""
+
+#, fuzzy
+msgid "Bookmark not posted to this group."
+msgstr "Njesměš tutu skupinu zhašeć."
+
+#, fuzzy
+msgid "Object not posted to this user."
+msgstr "Tutoho wužiwarja njezhašeć."
+
+msgid "Don't know how to handle this kind of target."
+msgstr ""
+
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 msgid "Nickname cannot be empty."
 msgstr "Přimjeno njemóže prózdne być."
@@ -7313,24 +7268,16 @@ msgstr "Dwójna zdźělenka."
 msgid "Couldn't insert new subscription."
 msgstr "Nowy abonement njeda so zasunyć."
 
+#, fuzzy
+msgid "Your profile"
+msgstr "Skupinski profil"
+
 msgid "Replies"
 msgstr "Wotmołwy"
 
 msgid "Favorites"
 msgstr "Fawority"
 
-msgid "Inbox"
-msgstr "Dochadny póst"
-
-msgid "Your incoming messages"
-msgstr "Twoje dochadźace powěsće"
-
-msgid "Outbox"
-msgstr "Wuchadny póst"
-
-msgid "Your sent messages"
-msgstr "Twoje pósłane powěsće"
-
 #. TRANS: Title for personal tag cloud section. %s is a user nickname.
 #, php-format
 msgid "Tags in %s's notices"
@@ -7354,6 +7301,37 @@ msgctxt "plugin-description"
 msgid "(Plugin descriptions unavailable when disabled.)"
 msgstr ""
 
+#, fuzzy
+msgid "Settings"
+msgstr "SMS-nastajenja"
+
+#, fuzzy
+msgid "Change your personal settings"
+msgstr "Twoje profilowe nastajenja změnić"
+
+#, fuzzy
+msgid "Site configuration"
+msgstr "Wužiwarska konfiguracija"
+
+#, fuzzy
+msgid "Logout"
+msgstr "Wotzjewić"
+
+#, fuzzy
+msgid "Logout from the site"
+msgstr "Ze sydła wotzjewić"
+
+#, fuzzy
+msgid "Login to the site"
+msgstr "Při sydle přizjewić"
+
+msgid "Search"
+msgstr "Pytać"
+
+#, fuzzy
+msgid "Search the site"
+msgstr "Pytanske sydło"
+
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
 msgid "Subscriptions"
@@ -7462,6 +7440,39 @@ msgstr "Wobsah zdźělenkow přepytać"
 msgid "Find groups on this site"
 msgstr "Skupiny na tutym sydle pytać"
 
+#. TRANS: Secondary navigation menu option leading to help on StatusNet.
+msgid "Help"
+msgstr "Pomoc"
+
+#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
+msgid "About"
+msgstr "Wo"
+
+#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
+msgid "FAQ"
+msgstr "Huste prašenja"
+
+#. TRANS: Secondary navigation menu option leading to Terms of Service.
+msgid "TOS"
+msgstr "Wužiwarske wuměnjenja"
+
+#. TRANS: Secondary navigation menu option leading to privacy policy.
+msgid "Privacy"
+msgstr "Priwatnosć"
+
+#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
+msgid "Source"
+msgstr "Žórło"
+
+#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+msgid "Contact"
+msgstr "Kontakt"
+
+#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
+msgid "Badge"
+msgstr "Plaketa"
+
 msgid "Untitled section"
 msgstr "Wotrězk bjez titula"
 
@@ -7751,19 +7762,6 @@ msgstr "Njepłaćiwy XML, korjeń XRD faluje."
 msgid "Getting backup from file '%s'."
 msgstr "Wobstaruje so zawěsćenje z dataje \"%s\"-"
 
-#~ msgid "Full name is too long (max 255 chars)."
-#~ msgstr "Dospołne mjeno je předołho (maks. 255 znamješkow)."
-
-#~ msgid "description is too long (max %d chars)."
-#~ msgstr "wopisanje je předołho (maks. %d znamješkow)."
-
-#~ msgid "Location is too long (max 255 chars)."
-#~ msgstr "Městno je předołho (maks. 255 znamješkow)."
-
-#~ msgid "Too many aliases! Maximum %d."
-#~ msgstr "Přewjele aliasow! Maksimum: %d."
-
 #, fuzzy
-#~ msgctxt "BUTTON"
-#~ msgid "Comment"
-#~ msgstr "Wobsah"
+#~ msgid "Everyone on this site"
+#~ msgstr "Ludźi na tutym sydle pytać"
diff --git a/locale/hu/LC_MESSAGES/statusnet.po b/locale/hu/LC_MESSAGES/statusnet.po
index c52526e5b3..fa3776bd12 100644
--- a/locale/hu/LC_MESSAGES/statusnet.po
+++ b/locale/hu/LC_MESSAGES/statusnet.po
@@ -12,13 +12,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-06 02:34+0100\n"
-"PO-Revision-Date: 2011-03-06 01:36:23+0000\n"
+"POT-Creation-Date: 2011-03-08 01:03+0000\n"
+"PO-Revision-Date: 2011-03-08 01:05:16+0000\n"
 "Language-Team: Hungarian <http://translatewiki.net/wiki/Portal:hu>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-03 17:59:19+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-POT-Import-Date: 2011-03-06 02:16:47+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: hu\n"
 "X-Message-Group: #out-statusnet-core\n"
@@ -5841,84 +5841,9 @@ msgstr "Válasz"
 msgid "Write a reply..."
 msgstr ""
 
-msgid "Home"
-msgstr "Otthon"
-
 #, fuzzy
-msgid "Friends timeline"
-msgstr "%s története"
-
-#, fuzzy
-msgid "Your profile"
-msgstr "Csoportprofil"
-
-msgid "Public"
-msgstr ""
-
-#, fuzzy
-msgid "Everyone on this site"
-msgstr "Emberek keresése az oldalon"
-
-#, fuzzy
-msgid "Settings"
-msgstr "SMS beállítások"
-
-#, fuzzy
-msgid "Change your personal settings"
-msgstr "Változtasd meg a jelszavad"
-
-#, fuzzy
-msgid "Site configuration"
-msgstr "A felhasználók beállításai"
-
-msgid "Logout"
-msgstr "Kijelentkezés"
-
-msgid "Logout from the site"
-msgstr "Kijelentkezés a webhelyről"
-
-msgid "Login to the site"
-msgstr "Bejelentkezés a webhelyre"
-
-msgid "Search"
-msgstr "Keresés"
-
-#, fuzzy
-msgid "Search the site"
-msgstr "A webhely témája."
-
-#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-msgid "Help"
-msgstr "Súgó"
-
-#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-msgid "About"
-msgstr "Névjegy"
-
-#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-msgid "FAQ"
-msgstr "GyIK"
-
-#. TRANS: Secondary navigation menu option leading to Terms of Service.
-msgid "TOS"
-msgstr "Felhasználási feltételek"
-
-#. TRANS: Secondary navigation menu option leading to privacy policy.
-msgid "Privacy"
-msgstr ""
-
-#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-msgid "Source"
-msgstr "Forrás"
-
-#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
-#. TRANS: StatusNet site, where to report bugs, ...
-msgid "Contact"
-msgstr "Kapcsolat"
-
-#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-msgid "Badge"
-msgstr ""
+msgid "Status"
+msgstr "StatusNet"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #. TRANS: Text between [] is a link description, text between () is the link itself.
@@ -6664,6 +6589,12 @@ msgstr "Menj a telepítőhöz."
 msgid "Database error"
 msgstr "Adatbázishiba"
 
+msgid "Home"
+msgstr "Otthon"
+
+msgid "Public"
+msgstr ""
+
 #. TRANS: Description of form for deleting a user.
 msgid "Delete this user"
 msgstr "Töröljük ezt a felhasználót"
@@ -7308,6 +7239,20 @@ msgstr ""
 "keveredj más felhasználókkal. Olyan üzenetet küldhetnek neked emberek, amit "
 "csak te láthatsz."
 
+#, fuzzy
+msgid "Inbox"
+msgstr "Homokozó"
+
+msgid "Your incoming messages"
+msgstr "A bejövő üzeneteid"
+
+#, fuzzy
+msgid "Outbox"
+msgstr "%s kimenő postafiókja"
+
+msgid "Your sent messages"
+msgstr "A küldött üzeneteid"
+
 msgid "Could not parse message."
 msgstr "Nem sikerült az üzenetet feldolgozni."
 
@@ -7384,6 +7329,20 @@ msgstr "Üzenet"
 msgid "from"
 msgstr "írta"
 
+msgid "Can't get author for activity."
+msgstr ""
+
+#, fuzzy
+msgid "Bookmark not posted to this group."
+msgstr "Nem vagy tagja ennek a csoportnak."
+
+#, fuzzy
+msgid "Object not posted to this user."
+msgstr "Ne töröljük ezt a hírt"
+
+msgid "Don't know how to handle this kind of target."
+msgstr ""
+
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 msgid "Nickname cannot be empty."
 msgstr ""
@@ -7496,26 +7455,16 @@ msgstr ""
 msgid "Couldn't insert new subscription."
 msgstr ""
 
+#, fuzzy
+msgid "Your profile"
+msgstr "Csoportprofil"
+
 msgid "Replies"
 msgstr "Válaszok"
 
 msgid "Favorites"
 msgstr "Kedvencek"
 
-#, fuzzy
-msgid "Inbox"
-msgstr "Homokozó"
-
-msgid "Your incoming messages"
-msgstr "A bejövő üzeneteid"
-
-#, fuzzy
-msgid "Outbox"
-msgstr "%s kimenő postafiókja"
-
-msgid "Your sent messages"
-msgstr "A küldött üzeneteid"
-
 #. TRANS: Title for personal tag cloud section. %s is a user nickname.
 #, php-format
 msgid "Tags in %s's notices"
@@ -7539,6 +7488,34 @@ msgctxt "plugin-description"
 msgid "(Plugin descriptions unavailable when disabled.)"
 msgstr ""
 
+#, fuzzy
+msgid "Settings"
+msgstr "SMS beállítások"
+
+#, fuzzy
+msgid "Change your personal settings"
+msgstr "Változtasd meg a jelszavad"
+
+#, fuzzy
+msgid "Site configuration"
+msgstr "A felhasználók beállításai"
+
+msgid "Logout"
+msgstr "Kijelentkezés"
+
+msgid "Logout from the site"
+msgstr "Kijelentkezés a webhelyről"
+
+msgid "Login to the site"
+msgstr "Bejelentkezés a webhelyre"
+
+msgid "Search"
+msgstr "Keresés"
+
+#, fuzzy
+msgid "Search the site"
+msgstr "A webhely témája."
+
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
 msgid "Subscriptions"
@@ -7648,6 +7625,39 @@ msgstr "Keressünk a hírek tartalmában"
 msgid "Find groups on this site"
 msgstr "Csoportok keresése az oldalon"
 
+#. TRANS: Secondary navigation menu option leading to help on StatusNet.
+msgid "Help"
+msgstr "Súgó"
+
+#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
+msgid "About"
+msgstr "Névjegy"
+
+#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
+msgid "FAQ"
+msgstr "GyIK"
+
+#. TRANS: Secondary navigation menu option leading to Terms of Service.
+msgid "TOS"
+msgstr "Felhasználási feltételek"
+
+#. TRANS: Secondary navigation menu option leading to privacy policy.
+msgid "Privacy"
+msgstr ""
+
+#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
+msgid "Source"
+msgstr "Forrás"
+
+#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+msgid "Contact"
+msgstr "Kapcsolat"
+
+#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
+msgid "Badge"
+msgstr ""
+
 msgid "Untitled section"
 msgstr "Névtelen szakasz"
 
@@ -7927,19 +7937,10 @@ msgstr ""
 msgid "Getting backup from file '%s'."
 msgstr ""
 
-#~ msgid "Full name is too long (max 255 chars)."
-#~ msgstr "A teljes név túl hosszú (legfeljebb 255 karakter lehet)."
-
-#~ msgid "description is too long (max %d chars)."
-#~ msgstr "a leírás túl hosszú (legfeljebb %d karakter)."
-
-#~ msgid "Location is too long (max 255 chars)."
-#~ msgstr "A hely túl hosszú (legfeljebb 255 karakter lehet)."
-
-#~ msgid "Too many aliases! Maximum %d."
-#~ msgstr "Túl sok álnév! Legfeljebb %d lehet."
+#, fuzzy
+#~ msgid "Friends timeline"
+#~ msgstr "%s története"
 
 #, fuzzy
-#~ msgctxt "BUTTON"
-#~ msgid "Comment"
-#~ msgstr "Tartalom"
+#~ msgid "Everyone on this site"
+#~ msgstr "Emberek keresése az oldalon"
diff --git a/locale/ia/LC_MESSAGES/statusnet.po b/locale/ia/LC_MESSAGES/statusnet.po
index 41dc0c2520..fce258aa37 100644
--- a/locale/ia/LC_MESSAGES/statusnet.po
+++ b/locale/ia/LC_MESSAGES/statusnet.po
@@ -9,17 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-06 02:34+0100\n"
-"PO-Revision-Date: 2011-03-06 01:36:24+0000\n"
+"POT-Creation-Date: 2011-03-08 01:03+0000\n"
+"PO-Revision-Date: 2011-03-08 01:05:17+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-03-03 17:59:19+0000\n"
+"X-POT-Import-Date: 2011-03-06 02:16:47+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -2928,9 +2928,8 @@ msgid "Type"
 msgstr "Typo"
 
 #. TRANS: Dropdown field instructions in the license admin panel.
-#, fuzzy
 msgid "Select a license."
-msgstr "Selige licentia"
+msgstr "Selige un licentia."
 
 #. TRANS: Form legend in the license admin panel.
 msgid "License details"
@@ -2969,9 +2968,8 @@ msgid "URL for an image to display with the license."
 msgstr "Le URL de un imagine a monstrar con le licentia."
 
 #. TRANS: Button title in the license admin panel.
-#, fuzzy
 msgid "Save license settings."
-msgstr "Salveguardar configurationes de licentia"
+msgstr "Salveguardar configurationes de licentia."
 
 #. TRANS: Client error displayed when trying to log in while already logged in.
 #. TRANS: Client error displayed trying to use "one time password login" when already logged in.
@@ -3007,7 +3005,6 @@ msgstr ""
 "commun!"
 
 #. TRANS: Button text for log in on login page.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Login"
 msgstr "Aperir session"
@@ -3103,7 +3100,6 @@ msgstr "Nove message"
 
 #. TRANS: Client error displayed trying to send a direct message to a user while sender and
 #. TRANS: receiver are not subscribed to each other.
-#, fuzzy
 msgid "You cannot send a message to this user."
 msgstr "Tu non pote inviar un message a iste usator."
 
@@ -5915,86 +5911,17 @@ msgid "Show more"
 msgstr "Monstrar plus"
 
 #. TRANS: Inline reply form submit button: submits a reply comment.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Reply"
 msgstr "Responder"
 
 #. TRANS: Placeholder text for inline reply form. Clicking in this box will turn it into a mini notice form.
 msgid "Write a reply..."
-msgstr ""
+msgstr "Scriber un responsa..."
 
-msgid "Home"
-msgstr "Initio"
-
-msgid "Friends timeline"
-msgstr "Chronologia de amicos"
-
-msgid "Your profile"
-msgstr "Tu profilo"
-
-msgid "Public"
-msgstr "Public"
-
-msgid "Everyone on this site"
-msgstr "Omnes in iste sito"
-
-msgid "Settings"
-msgstr "Configurationes"
-
-msgid "Change your personal settings"
-msgstr "Cambiar tu optiones personal"
-
-msgid "Site configuration"
-msgstr "Configuration del sito"
-
-msgid "Logout"
-msgstr "Clauder session"
-
-msgid "Logout from the site"
-msgstr "Terminar le session del sito"
-
-msgid "Login to the site"
-msgstr "Authenticar te a iste sito"
-
-msgid "Search"
-msgstr "Cercar"
-
-msgid "Search the site"
-msgstr "Cercar in le sito"
-
-#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-msgid "Help"
-msgstr "Adjuta"
-
-#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-msgid "About"
-msgstr "A proposito"
-
-#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-msgid "FAQ"
-msgstr "FAQ"
-
-#. TRANS: Secondary navigation menu option leading to Terms of Service.
-msgid "TOS"
-msgstr "CdS"
-
-#. TRANS: Secondary navigation menu option leading to privacy policy.
-msgid "Privacy"
-msgstr "Confidentialitate"
-
-#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-msgid "Source"
-msgstr "Fonte"
-
-#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
-#. TRANS: StatusNet site, where to report bugs, ...
-msgid "Contact"
-msgstr "Contacto"
-
-#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-msgid "Badge"
-msgstr "Insignia"
+#, fuzzy
+msgid "Status"
+msgstr "StatusNet"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #. TRANS: Text between [] is a link description, text between () is the link itself.
@@ -6788,6 +6715,12 @@ msgstr "Ir al installator."
 msgid "Database error"
 msgstr "Error de base de datos"
 
+msgid "Home"
+msgstr "Initio"
+
+msgid "Public"
+msgstr "Public"
+
 #. TRANS: Description of form for deleting a user.
 msgid "Delete this user"
 msgstr "Deler iste usator"
@@ -7463,6 +7396,18 @@ msgstr ""
 "altere usatores in conversation. Altere personas pote inviar te messages que "
 "solmente tu pote leger."
 
+msgid "Inbox"
+msgstr "Cassa de entrata"
+
+msgid "Your incoming messages"
+msgstr "Tu messages recipite"
+
+msgid "Outbox"
+msgstr "Cassa de exito"
+
+msgid "Your sent messages"
+msgstr "Tu messages inviate"
+
 msgid "Could not parse message."
 msgstr "Non comprendeva le syntaxe del message."
 
@@ -7540,6 +7485,20 @@ msgstr "Messages"
 msgid "from"
 msgstr "via"
 
+msgid "Can't get author for activity."
+msgstr ""
+
+#, fuzzy
+msgid "Bookmark not posted to this group."
+msgstr "Tu non ha le permission de deler iste gruppo."
+
+#, fuzzy
+msgid "Object not posted to this user."
+msgstr "Non deler iste usator."
+
+msgid "Don't know how to handle this kind of target."
+msgstr ""
+
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 msgid "Nickname cannot be empty."
 msgstr "Le pseudonymo non pote esser vacue."
@@ -7565,9 +7524,8 @@ msgid "Attach"
 msgstr "Annexar"
 
 #. TRANS: Title for input field to attach a file to a notice.
-#, fuzzy
 msgid "Attach a file."
-msgstr "Annexar un file"
+msgstr "Annexar un file."
 
 #. TRANS: Field label to add location to a notice.
 msgid "Share my location"
@@ -7654,24 +7612,15 @@ msgstr "Nota duplicate."
 msgid "Couldn't insert new subscription."
 msgstr "Non poteva inserer nove subscription."
 
+msgid "Your profile"
+msgstr "Tu profilo"
+
 msgid "Replies"
 msgstr "Responsas"
 
 msgid "Favorites"
 msgstr "Favorites"
 
-msgid "Inbox"
-msgstr "Cassa de entrata"
-
-msgid "Your incoming messages"
-msgstr "Tu messages recipite"
-
-msgid "Outbox"
-msgstr "Cassa de exito"
-
-msgid "Your sent messages"
-msgstr "Tu messages inviate"
-
 #. TRANS: Title for personal tag cloud section. %s is a user nickname.
 #, php-format
 msgid "Tags in %s's notices"
@@ -7695,6 +7644,30 @@ msgctxt "plugin-description"
 msgid "(Plugin descriptions unavailable when disabled.)"
 msgstr "(Le descriptiones de plug-ins non es disponibile si disactivate.)"
 
+msgid "Settings"
+msgstr "Configurationes"
+
+msgid "Change your personal settings"
+msgstr "Cambiar tu optiones personal"
+
+msgid "Site configuration"
+msgstr "Configuration del sito"
+
+msgid "Logout"
+msgstr "Clauder session"
+
+msgid "Logout from the site"
+msgstr "Terminar le session del sito"
+
+msgid "Login to the site"
+msgstr "Authenticar te a iste sito"
+
+msgid "Search"
+msgstr "Cercar"
+
+msgid "Search the site"
+msgstr "Cercar in le sito"
+
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
 msgid "Subscriptions"
@@ -7803,6 +7776,39 @@ msgstr "Cercar in contento de notas"
 msgid "Find groups on this site"
 msgstr "Cercar gruppos in iste sito"
 
+#. TRANS: Secondary navigation menu option leading to help on StatusNet.
+msgid "Help"
+msgstr "Adjuta"
+
+#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
+msgid "About"
+msgstr "A proposito"
+
+#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
+msgid "FAQ"
+msgstr "FAQ"
+
+#. TRANS: Secondary navigation menu option leading to Terms of Service.
+msgid "TOS"
+msgstr "CdS"
+
+#. TRANS: Secondary navigation menu option leading to privacy policy.
+msgid "Privacy"
+msgstr "Confidentialitate"
+
+#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
+msgid "Source"
+msgstr "Fonte"
+
+#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+msgid "Contact"
+msgstr "Contacto"
+
+#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
+msgid "Badge"
+msgstr "Insignia"
+
 msgid "Untitled section"
 msgstr "Section sin titulo"
 
@@ -7930,11 +7936,11 @@ msgstr ""
 msgid "Error opening theme archive."
 msgstr "Error durante le apertura del archivo del apparentia."
 
-#, fuzzy, php-format
+#, php-format
 msgid "Show %d reply"
 msgid_plural "Show all %d replies"
-msgstr[0] "Monstrar plus"
-msgstr[1] "Monstrar plus"
+msgstr[0] "Monstrar %d responsa"
+msgstr[1] "Monstrar tote le %d responsas"
 
 msgid "Top posters"
 msgstr "Qui scribe le plus"
@@ -8088,26 +8094,8 @@ msgstr "XML invalide, radice XRD mancante."
 msgid "Getting backup from file '%s'."
 msgstr "Obtene copia de reserva ex file '%s'."
 
-#~ msgid "Full name is too long (max 255 chars)."
-#~ msgstr "Le nomine complete es troppo longe (max. 255 characteres)."
+#~ msgid "Friends timeline"
+#~ msgstr "Chronologia de amicos"
 
-#~ msgid "description is too long (max %d chars)."
-#~ msgstr "description es troppo longe (max %d chars)."
-
-#~ msgid "Location is too long (max 255 chars)."
-#~ msgstr "Loco es troppo longe (max. 255 characteres)."
-
-#~ msgid "Too many aliases! Maximum %d."
-#~ msgstr "Troppo de aliases! Maximo: %d."
-
-#~ msgctxt "BUTTON"
-#~ msgid "Comment"
-#~ msgstr "Commento"
-
-#~ msgid "Add a comment..."
-#~ msgstr "Adder un commento..."
-
-#~ msgid "Show all %d comment"
-#~ msgid_plural "Show all %d comments"
-#~ msgstr[0] "Monstrar %d commento"
-#~ msgstr[1] "Monstrar tote le %d commentos"
+#~ msgid "Everyone on this site"
+#~ msgstr "Omnes in iste sito"
diff --git a/locale/it/LC_MESSAGES/statusnet.po b/locale/it/LC_MESSAGES/statusnet.po
index efc7abd4ee..472a3eb844 100644
--- a/locale/it/LC_MESSAGES/statusnet.po
+++ b/locale/it/LC_MESSAGES/statusnet.po
@@ -11,17 +11,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-06 02:34+0100\n"
-"PO-Revision-Date: 2011-03-06 01:36:25+0000\n"
+"POT-Creation-Date: 2011-03-08 01:03+0000\n"
+"PO-Revision-Date: 2011-03-08 01:05:18+0000\n"
 "Language-Team: Italian <http://translatewiki.net/wiki/Portal:it>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: it\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-03-03 17:59:19+0000\n"
+"X-POT-Import-Date: 2011-03-06 02:16:47+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -6073,83 +6073,9 @@ msgstr "Rispondi"
 msgid "Write a reply..."
 msgstr ""
 
-msgid "Home"
-msgstr "Pagina web"
-
 #, fuzzy
-msgid "Friends timeline"
-msgstr "Attività di %s"
-
-#, fuzzy
-msgid "Your profile"
-msgstr "Profilo del gruppo"
-
-msgid "Public"
-msgstr "Pubblico"
-
-#, fuzzy
-msgid "Everyone on this site"
-msgstr "Trova persone in questo sito"
-
-msgid "Settings"
-msgstr "Impostazioni SMS"
-
-#, fuzzy
-msgid "Change your personal settings"
-msgstr "Modifica le impostazioni del tuo profilo"
-
-#, fuzzy
-msgid "Site configuration"
-msgstr "Configurazione utente"
-
-msgid "Logout"
-msgstr "Esci"
-
-msgid "Logout from the site"
-msgstr "Termina la tua sessione sul sito"
-
-msgid "Login to the site"
-msgstr "Accedi al sito"
-
-msgid "Search"
-msgstr "Cerca"
-
-#, fuzzy
-msgid "Search the site"
-msgstr "Cerca nel sito"
-
-#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-msgid "Help"
-msgstr "Aiuto"
-
-#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-msgid "About"
-msgstr "Informazioni"
-
-#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-msgid "FAQ"
-msgstr "FAQ"
-
-#. TRANS: Secondary navigation menu option leading to Terms of Service.
-msgid "TOS"
-msgstr "TOS"
-
-#. TRANS: Secondary navigation menu option leading to privacy policy.
-msgid "Privacy"
-msgstr "Privacy"
-
-#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-msgid "Source"
-msgstr "Sorgenti"
-
-#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
-#. TRANS: StatusNet site, where to report bugs, ...
-msgid "Contact"
-msgstr "Contatti"
-
-#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-msgid "Badge"
-msgstr "Badge"
+msgid "Status"
+msgstr "StatusNet"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #. TRANS: Text between [] is a link description, text between () is the link itself.
@@ -6956,6 +6882,12 @@ msgstr "Vai al programma d'installazione."
 msgid "Database error"
 msgstr "Errore del database"
 
+msgid "Home"
+msgstr "Pagina web"
+
+msgid "Public"
+msgstr "Pubblico"
+
 #. TRANS: Description of form for deleting a user.
 msgid "Delete this user"
 msgstr "Elimina questo utente"
@@ -7637,6 +7569,18 @@ msgstr ""
 "iniziare una conversazione con altri utenti. Altre persone possono mandare "
 "messaggi riservati solamente a te."
 
+msgid "Inbox"
+msgstr "In arrivo"
+
+msgid "Your incoming messages"
+msgstr "I tuoi messaggi in arrivo"
+
+msgid "Outbox"
+msgstr "Inviati"
+
+msgid "Your sent messages"
+msgstr "I tuoi messaggi inviati"
+
 msgid "Could not parse message."
 msgstr "Impossibile analizzare il messaggio."
 
@@ -7716,6 +7660,20 @@ msgstr "Messaggio"
 msgid "from"
 msgstr "via"
 
+msgid "Can't get author for activity."
+msgstr ""
+
+#, fuzzy
+msgid "Bookmark not posted to this group."
+msgstr "Non fai parte di questo gruppo."
+
+#, fuzzy
+msgid "Object not posted to this user."
+msgstr "Non eliminare il messaggio"
+
+msgid "Don't know how to handle this kind of target."
+msgstr ""
+
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 msgid "Nickname cannot be empty."
 msgstr ""
@@ -7830,24 +7788,16 @@ msgstr "Messaggio duplicato."
 msgid "Couldn't insert new subscription."
 msgstr "Impossibile inserire un nuovo abbonamento."
 
+#, fuzzy
+msgid "Your profile"
+msgstr "Profilo del gruppo"
+
 msgid "Replies"
 msgstr "Risposte"
 
 msgid "Favorites"
 msgstr "Preferiti"
 
-msgid "Inbox"
-msgstr "In arrivo"
-
-msgid "Your incoming messages"
-msgstr "I tuoi messaggi in arrivo"
-
-msgid "Outbox"
-msgstr "Inviati"
-
-msgid "Your sent messages"
-msgstr "I tuoi messaggi inviati"
-
 #. TRANS: Title for personal tag cloud section. %s is a user nickname.
 #, php-format
 msgid "Tags in %s's notices"
@@ -7871,6 +7821,33 @@ msgctxt "plugin-description"
 msgid "(Plugin descriptions unavailable when disabled.)"
 msgstr ""
 
+msgid "Settings"
+msgstr "Impostazioni SMS"
+
+#, fuzzy
+msgid "Change your personal settings"
+msgstr "Modifica le impostazioni del tuo profilo"
+
+#, fuzzy
+msgid "Site configuration"
+msgstr "Configurazione utente"
+
+msgid "Logout"
+msgstr "Esci"
+
+msgid "Logout from the site"
+msgstr "Termina la tua sessione sul sito"
+
+msgid "Login to the site"
+msgstr "Accedi al sito"
+
+msgid "Search"
+msgstr "Cerca"
+
+#, fuzzy
+msgid "Search the site"
+msgstr "Cerca nel sito"
+
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
 msgid "Subscriptions"
@@ -7980,6 +7957,39 @@ msgstr "Trova contenuto dei messaggi"
 msgid "Find groups on this site"
 msgstr "Trova gruppi in questo sito"
 
+#. TRANS: Secondary navigation menu option leading to help on StatusNet.
+msgid "Help"
+msgstr "Aiuto"
+
+#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
+msgid "About"
+msgstr "Informazioni"
+
+#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
+msgid "FAQ"
+msgstr "FAQ"
+
+#. TRANS: Secondary navigation menu option leading to Terms of Service.
+msgid "TOS"
+msgstr "TOS"
+
+#. TRANS: Secondary navigation menu option leading to privacy policy.
+msgid "Privacy"
+msgstr "Privacy"
+
+#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
+msgid "Source"
+msgstr "Sorgenti"
+
+#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+msgid "Contact"
+msgstr "Contatti"
+
+#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
+msgid "Badge"
+msgstr "Badge"
+
 msgid "Untitled section"
 msgstr "Sezione senza nome"
 
@@ -8265,19 +8275,10 @@ msgstr ""
 msgid "Getting backup from file '%s'."
 msgstr ""
 
-#~ msgid "Full name is too long (max 255 chars)."
-#~ msgstr "Nome troppo lungo (max 255 caratteri)."
-
-#~ msgid "description is too long (max %d chars)."
-#~ msgstr "La descrizione è troppo lunga (max %d caratteri)."
-
-#~ msgid "Location is too long (max 255 chars)."
-#~ msgstr "Ubicazione troppo lunga (max 255 caratteri)."
-
-#~ msgid "Too many aliases! Maximum %d."
-#~ msgstr "Troppi alias! Massimo %d."
+#, fuzzy
+#~ msgid "Friends timeline"
+#~ msgstr "Attività di %s"
 
 #, fuzzy
-#~ msgctxt "BUTTON"
-#~ msgid "Comment"
-#~ msgstr "Contenuto"
+#~ msgid "Everyone on this site"
+#~ msgstr "Trova persone in questo sito"
diff --git a/locale/ja/LC_MESSAGES/statusnet.po b/locale/ja/LC_MESSAGES/statusnet.po
index 859ac92bf3..3eec1131ea 100644
--- a/locale/ja/LC_MESSAGES/statusnet.po
+++ b/locale/ja/LC_MESSAGES/statusnet.po
@@ -14,17 +14,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-06 02:34+0100\n"
-"PO-Revision-Date: 2011-03-06 01:36:26+0000\n"
+"POT-Creation-Date: 2011-03-08 01:03+0000\n"
+"PO-Revision-Date: 2011-03-08 01:05:19+0000\n"
 "Language-Team: Japanese <http://translatewiki.net/wiki/Portal:ja>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ja\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-POT-Import-Date: 2011-03-03 17:59:19+0000\n"
+"X-POT-Import-Date: 2011-03-06 02:16:47+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -6061,82 +6061,9 @@ msgstr "返信"
 msgid "Write a reply..."
 msgstr ""
 
-msgid "Home"
-msgstr "ホームページ"
-
 #, fuzzy
-msgid "Friends timeline"
-msgstr "%s のタイムライン"
-
-msgid "Your profile"
-msgstr "グループプロファイル"
-
-msgid "Public"
-msgstr "パブリック"
-
-#, fuzzy
-msgid "Everyone on this site"
-msgstr "このサイトの人々を探す"
-
-msgid "Settings"
-msgstr "SMS 設定"
-
-#, fuzzy
-msgid "Change your personal settings"
-msgstr "プロファイル設定の変更"
-
-#, fuzzy
-msgid "Site configuration"
-msgstr "ユーザ設定"
-
-msgid "Logout"
-msgstr "ロゴ"
-
-msgid "Logout from the site"
-msgstr "サイトのテーマ"
-
-msgid "Login to the site"
-msgstr "サイトへログイン"
-
-msgid "Search"
-msgstr "検索"
-
-#, fuzzy
-msgid "Search the site"
-msgstr "サイト検索"
-
-#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-msgid "Help"
-msgstr "ヘルプ"
-
-#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-msgid "About"
-msgstr "About"
-
-#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-msgid "FAQ"
-msgstr "よくある質問"
-
-#. TRANS: Secondary navigation menu option leading to Terms of Service.
-msgid "TOS"
-msgstr ""
-
-#. TRANS: Secondary navigation menu option leading to privacy policy.
-msgid "Privacy"
-msgstr "プライバシー"
-
-#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-msgid "Source"
-msgstr "ソース"
-
-#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
-#. TRANS: StatusNet site, where to report bugs, ...
-msgid "Contact"
-msgstr "連絡先"
-
-#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-msgid "Badge"
-msgstr "バッジ"
+msgid "Status"
+msgstr "StatusNet"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #. TRANS: Text between [] is a link description, text between () is the link itself.
@@ -6900,6 +6827,12 @@ msgstr "インストーラへ。"
 msgid "Database error"
 msgstr "データベースエラー"
 
+msgid "Home"
+msgstr "ホームページ"
+
+msgid "Public"
+msgstr "パブリック"
+
 #. TRANS: Description of form for deleting a user.
 msgid "Delete this user"
 msgstr "このユーザを削除"
@@ -7546,6 +7479,18 @@ msgstr ""
 "に引き込むプライベートメッセージを送ることができます。人々はあなただけへの"
 "メッセージを送ることができます。"
 
+msgid "Inbox"
+msgstr "受信箱"
+
+msgid "Your incoming messages"
+msgstr "あなたの入ってくるメッセージ"
+
+msgid "Outbox"
+msgstr "送信箱"
+
+msgid "Your sent messages"
+msgstr "あなたが送ったメッセージ"
+
 msgid "Could not parse message."
 msgstr "メッセージを分析できませんでした。"
 
@@ -7625,6 +7570,20 @@ msgstr "メッセージ"
 msgid "from"
 msgstr "from"
 
+msgid "Can't get author for activity."
+msgstr ""
+
+#, fuzzy
+msgid "Bookmark not posted to this group."
+msgstr "このグループのメンバーではありません。"
+
+#, fuzzy
+msgid "Object not posted to this user."
+msgstr "このつぶやきを削除できません。"
+
+msgid "Don't know how to handle this kind of target."
+msgstr ""
+
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 msgid "Nickname cannot be empty."
 msgstr ""
@@ -7742,24 +7701,15 @@ msgstr ""
 msgid "Couldn't insert new subscription."
 msgstr "サブスクリプションを追加できません"
 
+msgid "Your profile"
+msgstr "グループプロファイル"
+
 msgid "Replies"
 msgstr "返信"
 
 msgid "Favorites"
 msgstr "お気に入り"
 
-msgid "Inbox"
-msgstr "受信箱"
-
-msgid "Your incoming messages"
-msgstr "あなたの入ってくるメッセージ"
-
-msgid "Outbox"
-msgstr "送信箱"
-
-msgid "Your sent messages"
-msgstr "あなたが送ったメッセージ"
-
 #. TRANS: Title for personal tag cloud section. %s is a user nickname.
 #, php-format
 msgid "Tags in %s's notices"
@@ -7783,6 +7733,33 @@ msgctxt "plugin-description"
 msgid "(Plugin descriptions unavailable when disabled.)"
 msgstr ""
 
+msgid "Settings"
+msgstr "SMS 設定"
+
+#, fuzzy
+msgid "Change your personal settings"
+msgstr "プロファイル設定の変更"
+
+#, fuzzy
+msgid "Site configuration"
+msgstr "ユーザ設定"
+
+msgid "Logout"
+msgstr "ロゴ"
+
+msgid "Logout from the site"
+msgstr "サイトのテーマ"
+
+msgid "Login to the site"
+msgstr "サイトへログイン"
+
+msgid "Search"
+msgstr "検索"
+
+#, fuzzy
+msgid "Search the site"
+msgstr "サイト検索"
+
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
 msgid "Subscriptions"
@@ -7892,6 +7869,39 @@ msgstr "つぶやきの内容を探す"
 msgid "Find groups on this site"
 msgstr "このサイト上のグループを検索する"
 
+#. TRANS: Secondary navigation menu option leading to help on StatusNet.
+msgid "Help"
+msgstr "ヘルプ"
+
+#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
+msgid "About"
+msgstr "About"
+
+#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
+msgid "FAQ"
+msgstr "よくある質問"
+
+#. TRANS: Secondary navigation menu option leading to Terms of Service.
+msgid "TOS"
+msgstr ""
+
+#. TRANS: Secondary navigation menu option leading to privacy policy.
+msgid "Privacy"
+msgstr "プライバシー"
+
+#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
+msgid "Source"
+msgstr "ソース"
+
+#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+msgid "Contact"
+msgstr "連絡先"
+
+#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
+msgid "Badge"
+msgstr "バッジ"
+
 msgid "Untitled section"
 msgstr "名称未設定のセクション"
 
@@ -8170,19 +8180,10 @@ msgstr ""
 msgid "Getting backup from file '%s'."
 msgstr ""
 
-#~ msgid "Full name is too long (max 255 chars)."
-#~ msgstr "フルネームが長すぎます。（255字まで）"
-
-#~ msgid "description is too long (max %d chars)."
-#~ msgstr "記述が長すぎます。（最長 %d 字）"
-
-#~ msgid "Location is too long (max 255 chars)."
-#~ msgstr "場所が長すぎます。（255字まで）"
-
-#~ msgid "Too many aliases! Maximum %d."
-#~ msgstr "別名が多すぎます! 最大 %d。"
+#, fuzzy
+#~ msgid "Friends timeline"
+#~ msgstr "%s のタイムライン"
 
 #, fuzzy
-#~ msgctxt "BUTTON"
-#~ msgid "Comment"
-#~ msgstr "内容"
+#~ msgid "Everyone on this site"
+#~ msgstr "このサイトの人々を探す"
diff --git a/locale/ka/LC_MESSAGES/statusnet.po b/locale/ka/LC_MESSAGES/statusnet.po
index 67e579623d..2ee236d8e5 100644
--- a/locale/ka/LC_MESSAGES/statusnet.po
+++ b/locale/ka/LC_MESSAGES/statusnet.po
@@ -9,17 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-06 02:34+0100\n"
-"PO-Revision-Date: 2011-03-06 01:36:27+0000\n"
+"POT-Creation-Date: 2011-03-08 01:03+0000\n"
+"PO-Revision-Date: 2011-03-08 01:05:20+0000\n"
 "Language-Team: Georgian <http://translatewiki.net/wiki/Portal:ka>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ka\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-POT-Import-Date: 2011-03-03 17:59:19+0000\n"
+"X-POT-Import-Date: 2011-03-06 02:16:47+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -5992,87 +5992,8 @@ msgid "Write a reply..."
 msgstr ""
 
 #, fuzzy
-msgid "Home"
-msgstr "ვებ. გვერსი"
-
-#, fuzzy
-msgid "Friends timeline"
-msgstr "%s-ის ნაკადი"
-
-#, fuzzy
-msgid "Your profile"
-msgstr "მომხმარებლის პროფილი"
-
-msgid "Public"
-msgstr "საჯარო"
-
-#, fuzzy
-msgid "Everyone on this site"
-msgstr "მოძებნე ადამიანები ამ საიტზე"
-
-#, fuzzy
-msgid "Settings"
-msgstr "SMS პარამეტრები"
-
-#, fuzzy
-msgid "Change your personal settings"
-msgstr "შეცვალე პროფილის პარამეტრები"
-
-#, fuzzy
-msgid "Site configuration"
-msgstr "მომხმარებლის კონფიგურაცია"
-
-#, fuzzy
-msgid "Logout"
-msgstr "გასვლა"
-
-#, fuzzy
-msgid "Logout from the site"
-msgstr "გასვლა საიტიდან"
-
-#, fuzzy
-msgid "Login to the site"
-msgstr "საიტზე შესვლა"
-
-msgid "Search"
-msgstr "ძიება"
-
-#, fuzzy
-msgid "Search the site"
-msgstr "ძიება საიტზე"
-
-#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-msgid "Help"
-msgstr "დახმარება"
-
-#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-msgid "About"
-msgstr "საიტის შესახებ"
-
-#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-msgid "FAQ"
-msgstr "ხდკ"
-
-#. TRANS: Secondary navigation menu option leading to Terms of Service.
-msgid "TOS"
-msgstr "მპ"
-
-#. TRANS: Secondary navigation menu option leading to privacy policy.
-msgid "Privacy"
-msgstr "პირადი"
-
-#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-msgid "Source"
-msgstr "წყარო"
-
-#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
-#. TRANS: StatusNet site, where to report bugs, ...
-msgid "Contact"
-msgstr "კონტაქტი"
-
-#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-msgid "Badge"
-msgstr "იარლიყი"
+msgid "Status"
+msgstr "StatusNet"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #. TRANS: Text between [] is a link description, text between () is the link itself.
@@ -6829,6 +6750,13 @@ msgstr "გადადი ამ ინსტალატორზე."
 msgid "Database error"
 msgstr "მონაცემთა ბაზის შეცდომა"
 
+#, fuzzy
+msgid "Home"
+msgstr "ვებ. გვერსი"
+
+msgid "Public"
+msgstr "საჯარო"
+
 #. TRANS: Description of form for deleting a user.
 msgid "Delete this user"
 msgstr "ამ მომხმარებლის წაშლა"
@@ -7483,6 +7411,18 @@ msgstr ""
 "შეტყობინებები, რომ ჩაერთოთ საუბრებში სხვა ხალხთან. ხალხს შეუძლია "
 "გამოგიგზავნონ შეტყობინებები მხოლოდ თქვენ დასანახად."
 
+msgid "Inbox"
+msgstr "შემომავალი წერილების ყუთი"
+
+msgid "Your incoming messages"
+msgstr "თქვენი შემომავალი შეტყობინებები"
+
+msgid "Outbox"
+msgstr "გამავალი წერილების ყუთი"
+
+msgid "Your sent messages"
+msgstr "თქვენი გაგზავნილი წერილები"
+
 msgid "Could not parse message."
 msgstr "შეტყობინების გაცრა (გა-parse-ვა) ვერ მოხერხდა."
 
@@ -7561,6 +7501,20 @@ msgstr "შეტყობინება"
 msgid "from"
 msgstr "ვისგან"
 
+msgid "Can't get author for activity."
+msgstr ""
+
+#, fuzzy
+msgid "Bookmark not posted to this group."
+msgstr "თვენ არ ხართ ამ ჯგუფის წევრი."
+
+#, fuzzy
+msgid "Object not posted to this user."
+msgstr "არ წაშალო ეს შეტყობინება"
+
+msgid "Don't know how to handle this kind of target."
+msgstr ""
+
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 msgid "Nickname cannot be empty."
 msgstr ""
@@ -7674,24 +7628,16 @@ msgstr ""
 msgid "Couldn't insert new subscription."
 msgstr "ახალი გამოწერის ჩასმა ვერ მოხერხდა."
 
+#, fuzzy
+msgid "Your profile"
+msgstr "მომხმარებლის პროფილი"
+
 msgid "Replies"
 msgstr "პასუხები"
 
 msgid "Favorites"
 msgstr "რჩეულები"
 
-msgid "Inbox"
-msgstr "შემომავალი წერილების ყუთი"
-
-msgid "Your incoming messages"
-msgstr "თქვენი შემომავალი შეტყობინებები"
-
-msgid "Outbox"
-msgstr "გამავალი წერილების ყუთი"
-
-msgid "Your sent messages"
-msgstr "თქვენი გაგზავნილი წერილები"
-
 #. TRANS: Title for personal tag cloud section. %s is a user nickname.
 #, php-format
 msgid "Tags in %s's notices"
@@ -7715,6 +7661,37 @@ msgctxt "plugin-description"
 msgid "(Plugin descriptions unavailable when disabled.)"
 msgstr ""
 
+#, fuzzy
+msgid "Settings"
+msgstr "SMS პარამეტრები"
+
+#, fuzzy
+msgid "Change your personal settings"
+msgstr "შეცვალე პროფილის პარამეტრები"
+
+#, fuzzy
+msgid "Site configuration"
+msgstr "მომხმარებლის კონფიგურაცია"
+
+#, fuzzy
+msgid "Logout"
+msgstr "გასვლა"
+
+#, fuzzy
+msgid "Logout from the site"
+msgstr "გასვლა საიტიდან"
+
+#, fuzzy
+msgid "Login to the site"
+msgstr "საიტზე შესვლა"
+
+msgid "Search"
+msgstr "ძიება"
+
+#, fuzzy
+msgid "Search the site"
+msgstr "ძიება საიტზე"
+
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
 msgid "Subscriptions"
@@ -7824,6 +7801,39 @@ msgstr "მოძებნე შეტყობინებებში"
 msgid "Find groups on this site"
 msgstr "მოძებნე ჯგუფები ამ საიტზე"
 
+#. TRANS: Secondary navigation menu option leading to help on StatusNet.
+msgid "Help"
+msgstr "დახმარება"
+
+#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
+msgid "About"
+msgstr "საიტის შესახებ"
+
+#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
+msgid "FAQ"
+msgstr "ხდკ"
+
+#. TRANS: Secondary navigation menu option leading to Terms of Service.
+msgid "TOS"
+msgstr "მპ"
+
+#. TRANS: Secondary navigation menu option leading to privacy policy.
+msgid "Privacy"
+msgstr "პირადი"
+
+#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
+msgid "Source"
+msgstr "წყარო"
+
+#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+msgid "Contact"
+msgstr "კონტაქტი"
+
+#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
+msgid "Badge"
+msgstr "იარლიყი"
+
 msgid "Untitled section"
 msgstr "უსათაურო სექცია"
 
@@ -8102,16 +8112,10 @@ msgstr ""
 msgid "Getting backup from file '%s'."
 msgstr ""
 
-#~ msgid "Full name is too long (max 255 chars)."
-#~ msgstr "სრული სახელი ძალიან გრძელია (არაუმეტეს 255 სიმბოლო)."
-
-#~ msgid "description is too long (max %d chars)."
-#~ msgstr "აღწერა ძალიან გრძელია (არაუმეტეს %d სიმბოლო)."
-
-#~ msgid "Location is too long (max 255 chars)."
-#~ msgstr "ადგილმდებარეობა ძალიან გრძელია (არაუმეტეს 255 სიმბოლო)."
+#, fuzzy
+#~ msgid "Friends timeline"
+#~ msgstr "%s-ის ნაკადი"
 
 #, fuzzy
-#~ msgctxt "BUTTON"
-#~ msgid "Comment"
-#~ msgstr "შიგთავსი"
+#~ msgid "Everyone on this site"
+#~ msgstr "მოძებნე ადამიანები ამ საიტზე"
diff --git a/locale/ko/LC_MESSAGES/statusnet.po b/locale/ko/LC_MESSAGES/statusnet.po
index 33e9120240..4a924d8d21 100644
--- a/locale/ko/LC_MESSAGES/statusnet.po
+++ b/locale/ko/LC_MESSAGES/statusnet.po
@@ -11,17 +11,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-06 02:34+0100\n"
-"PO-Revision-Date: 2011-03-06 01:36:28+0000\n"
+"POT-Creation-Date: 2011-03-08 01:03+0000\n"
+"PO-Revision-Date: 2011-03-08 01:05:21+0000\n"
 "Language-Team: Korean <http://translatewiki.net/wiki/Portal:ko>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ko\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-POT-Import-Date: 2011-03-03 17:59:19+0000\n"
+"X-POT-Import-Date: 2011-03-06 02:16:47+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -5936,83 +5936,9 @@ msgstr "답장하기"
 msgid "Write a reply..."
 msgstr ""
 
-msgid "Home"
-msgstr "홈페이지"
-
 #, fuzzy
-msgid "Friends timeline"
-msgstr "%s 타임라인"
-
-#, fuzzy
-msgid "Your profile"
-msgstr "그룹 프로필"
-
-msgid "Public"
-msgstr "공개"
-
-#, fuzzy
-msgid "Everyone on this site"
-msgstr "이 사이트에 있는 사람 찾기"
-
-msgid "Settings"
-msgstr "메일 설정"
-
-#, fuzzy
-msgid "Change your personal settings"
-msgstr "프로필 세팅 바꾸기"
-
-#, fuzzy
-msgid "Site configuration"
-msgstr "메일 주소 확인"
-
-msgid "Logout"
-msgstr "로그아웃"
-
-msgid "Logout from the site"
-msgstr "이 사이트에서 로그아웃"
-
-msgid "Login to the site"
-msgstr "이 사이트에 로그인"
-
-msgid "Search"
-msgstr "검색"
-
-#, fuzzy
-msgid "Search the site"
-msgstr "검색 도움말"
-
-#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-msgid "Help"
-msgstr "도움말"
-
-#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-msgid "About"
-msgstr "정보"
-
-#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-msgid "FAQ"
-msgstr "자주 묻는 질문"
-
-#. TRANS: Secondary navigation menu option leading to Terms of Service.
-msgid "TOS"
-msgstr "서비스 약관"
-
-#. TRANS: Secondary navigation menu option leading to privacy policy.
-msgid "Privacy"
-msgstr "개인정보 취급방침"
-
-#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-msgid "Source"
-msgstr "소스 코드"
-
-#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
-#. TRANS: StatusNet site, where to report bugs, ...
-msgid "Contact"
-msgstr "연락하기"
-
-#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-msgid "Badge"
-msgstr "배지"
+msgid "Status"
+msgstr "StatusNet %s"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #. TRANS: Text between [] is a link description, text between () is the link itself.
@@ -6771,6 +6697,12 @@ msgstr "이 사이트에 로그인"
 msgid "Database error"
 msgstr "데이터베이스 오류"
 
+msgid "Home"
+msgstr "홈페이지"
+
+msgid "Public"
+msgstr "공개"
+
 #. TRANS: Description of form for deleting a user.
 msgid "Delete this user"
 msgstr "이 사용자 삭제"
@@ -7344,6 +7276,18 @@ msgid ""
 "users in conversation. People can send you messages for your eyes only."
 msgstr ""
 
+msgid "Inbox"
+msgstr "받은 쪽지함"
+
+msgid "Your incoming messages"
+msgstr "받은 메시지"
+
+msgid "Outbox"
+msgstr "보낸 쪽지함"
+
+msgid "Your sent messages"
+msgstr "보낸 메시지"
+
 msgid "Could not parse message."
 msgstr "메시지를 분리할 수 없습니다."
 
@@ -7420,6 +7364,20 @@ msgstr "메시지"
 msgid "from"
 msgstr "방법"
 
+msgid "Can't get author for activity."
+msgstr ""
+
+#, fuzzy
+msgid "Bookmark not posted to this group."
+msgstr "당신은 해당 그룹의 멤버가 아닙니다."
+
+#, fuzzy
+msgid "Object not posted to this user."
+msgstr "이 통지를 지울 수 없습니다."
+
+msgid "Don't know how to handle this kind of target."
+msgstr ""
+
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 msgid "Nickname cannot be empty."
 msgstr ""
@@ -7532,24 +7490,16 @@ msgstr ""
 msgid "Couldn't insert new subscription."
 msgstr "예약 구독을 추가 할 수 없습니다."
 
+#, fuzzy
+msgid "Your profile"
+msgstr "그룹 프로필"
+
 msgid "Replies"
 msgstr "답신"
 
 msgid "Favorites"
 msgstr "좋아하는 글들"
 
-msgid "Inbox"
-msgstr "받은 쪽지함"
-
-msgid "Your incoming messages"
-msgstr "받은 메시지"
-
-msgid "Outbox"
-msgstr "보낸 쪽지함"
-
-msgid "Your sent messages"
-msgstr "보낸 메시지"
-
 #. TRANS: Title for personal tag cloud section. %s is a user nickname.
 #, php-format
 msgid "Tags in %s's notices"
@@ -7574,6 +7524,33 @@ msgctxt "plugin-description"
 msgid "(Plugin descriptions unavailable when disabled.)"
 msgstr ""
 
+msgid "Settings"
+msgstr "메일 설정"
+
+#, fuzzy
+msgid "Change your personal settings"
+msgstr "프로필 세팅 바꾸기"
+
+#, fuzzy
+msgid "Site configuration"
+msgstr "메일 주소 확인"
+
+msgid "Logout"
+msgstr "로그아웃"
+
+msgid "Logout from the site"
+msgstr "이 사이트에서 로그아웃"
+
+msgid "Login to the site"
+msgstr "이 사이트에 로그인"
+
+msgid "Search"
+msgstr "검색"
+
+#, fuzzy
+msgid "Search the site"
+msgstr "검색 도움말"
+
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
 msgid "Subscriptions"
@@ -7687,6 +7664,39 @@ msgstr "통지들의 내용 찾기"
 msgid "Find groups on this site"
 msgstr "이 사이트에서 그룹 찾기"
 
+#. TRANS: Secondary navigation menu option leading to help on StatusNet.
+msgid "Help"
+msgstr "도움말"
+
+#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
+msgid "About"
+msgstr "정보"
+
+#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
+msgid "FAQ"
+msgstr "자주 묻는 질문"
+
+#. TRANS: Secondary navigation menu option leading to Terms of Service.
+msgid "TOS"
+msgstr "서비스 약관"
+
+#. TRANS: Secondary navigation menu option leading to privacy policy.
+msgid "Privacy"
+msgstr "개인정보 취급방침"
+
+#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
+msgid "Source"
+msgstr "소스 코드"
+
+#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+msgid "Contact"
+msgstr "연락하기"
+
+#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
+msgid "Badge"
+msgstr "배지"
+
 msgid "Untitled section"
 msgstr "제목없는 섹션"
 
@@ -7966,19 +7976,10 @@ msgstr ""
 msgid "Getting backup from file '%s'."
 msgstr ""
 
-#~ msgid "Full name is too long (max 255 chars)."
-#~ msgstr "실명이 너무 깁니다. (최대 255글자)"
-
-#~ msgid "description is too long (max %d chars)."
-#~ msgstr "설명이 너무 길어요. (최대 %d글자)"
-
-#~ msgid "Location is too long (max 255 chars)."
-#~ msgstr "위치가 너무 깁니다. (최대 255글자)"
-
-#~ msgid "Too many aliases! Maximum %d."
-#~ msgstr "별명이 너무 많습니다! 최대 %d개."
+#, fuzzy
+#~ msgid "Friends timeline"
+#~ msgstr "%s 타임라인"
 
 #, fuzzy
-#~ msgctxt "BUTTON"
-#~ msgid "Comment"
-#~ msgstr "만족하는"
+#~ msgid "Everyone on this site"
+#~ msgstr "이 사이트에 있는 사람 찾기"
diff --git a/locale/mk/LC_MESSAGES/statusnet.po b/locale/mk/LC_MESSAGES/statusnet.po
index a366dfc6e2..04eee7354c 100644
--- a/locale/mk/LC_MESSAGES/statusnet.po
+++ b/locale/mk/LC_MESSAGES/statusnet.po
@@ -10,17 +10,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-06 02:34+0100\n"
-"PO-Revision-Date: 2011-03-06 01:36:29+0000\n"
+"POT-Creation-Date: 2011-03-08 01:03+0000\n"
+"PO-Revision-Date: 2011-03-08 01:05:22+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
-"X-POT-Import-Date: 2011-03-03 17:59:19+0000\n"
+"X-POT-Import-Date: 2011-03-06 02:16:47+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -2935,9 +2935,8 @@ msgid "Type"
 msgstr "Тип"
 
 #. TRANS: Dropdown field instructions in the license admin panel.
-#, fuzzy
 msgid "Select a license."
-msgstr "Одберете лиценца"
+msgstr "Одберете лиценца."
 
 #. TRANS: Form legend in the license admin panel.
 msgid "License details"
@@ -2978,9 +2977,8 @@ msgid "URL for an image to display with the license."
 msgstr "URL-адреса за слика што ќе се прикажува со лиценцата."
 
 #. TRANS: Button title in the license admin panel.
-#, fuzzy
 msgid "Save license settings."
-msgstr "Зачувај нагодувања на лиценцата"
+msgstr "Зачувај нагодувања на лиценцата."
 
 #. TRANS: Client error displayed when trying to log in while already logged in.
 #. TRANS: Client error displayed trying to use "one time password login" when already logged in.
@@ -3014,7 +3012,6 @@ msgstr ""
 "Отсега врши автоматска најава. Не треба да се користи за јавни сметачи!"
 
 #. TRANS: Button text for log in on login page.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Login"
 msgstr "Најава"
@@ -3110,9 +3107,8 @@ msgstr "Нова порака"
 
 #. TRANS: Client error displayed trying to send a direct message to a user while sender and
 #. TRANS: receiver are not subscribed to each other.
-#, fuzzy
 msgid "You cannot send a message to this user."
-msgstr "Не можете да испратите порака до овојо корисник."
+msgstr "Не можете да испратите порака до овој корисник."
 
 #. TRANS: Form validator error displayed trying to send a direct message without content.
 #. TRANS: Client error displayed trying to send a notice without content.
@@ -5944,86 +5940,17 @@ msgid "Show more"
 msgstr "Повеќе"
 
 #. TRANS: Inline reply form submit button: submits a reply comment.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Reply"
-msgstr "Одговор"
+msgstr "Одговори"
 
 #. TRANS: Placeholder text for inline reply form. Clicking in this box will turn it into a mini notice form.
 msgid "Write a reply..."
-msgstr ""
+msgstr "Напишете одговор..."
 
-msgid "Home"
-msgstr "Домашна страница"
-
-msgid "Friends timeline"
-msgstr "Историја на пријатели"
-
-msgid "Your profile"
-msgstr "Профил на група"
-
-msgid "Public"
-msgstr "Јавен"
-
-msgid "Everyone on this site"
-msgstr "Сите на ова мрежно место"
-
-msgid "Settings"
-msgstr "Нагодувања за СМС"
-
-msgid "Change your personal settings"
-msgstr "Измена на лични поставки"
-
-msgid "Site configuration"
-msgstr "Поставки на мреж. место"
-
-msgid "Logout"
-msgstr "Одјава"
-
-msgid "Logout from the site"
-msgstr "Одјава"
-
-msgid "Login to the site"
-msgstr "Најава"
-
-msgid "Search"
-msgstr "Барај"
-
-msgid "Search the site"
-msgstr "Пребарај по мрежното место"
-
-#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-msgid "Help"
-msgstr "Помош"
-
-#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-msgid "About"
-msgstr "За нас"
-
-#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-msgid "FAQ"
-msgstr "ЧПП"
-
-#. TRANS: Secondary navigation menu option leading to Terms of Service.
-msgid "TOS"
-msgstr "Услови"
-
-#. TRANS: Secondary navigation menu option leading to privacy policy.
-msgid "Privacy"
-msgstr "Приватност"
-
-#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-msgid "Source"
-msgstr "Изворен код"
-
-#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
-#. TRANS: StatusNet site, where to report bugs, ...
-msgid "Contact"
-msgstr "Контакт"
-
-#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-msgid "Badge"
-msgstr "Значка"
+#, fuzzy
+msgid "Status"
+msgstr "StatusNet"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #. TRANS: Text between [] is a link description, text between () is the link itself.
@@ -6815,6 +6742,12 @@ msgstr "Оди на инсталаторот."
 msgid "Database error"
 msgstr "Грешка во базата на податоци"
 
+msgid "Home"
+msgstr "Домашна страница"
+
+msgid "Public"
+msgstr "Јавен"
+
 #. TRANS: Description of form for deleting a user.
 msgid "Delete this user"
 msgstr "Избриши овој корисник"
@@ -7494,6 +7427,18 @@ msgstr ""
 "впуштите во разговор со други корисници. Луѓето можат да Ви испраќаат пораки "
 "што ќе можете да ги видите само Вие."
 
+msgid "Inbox"
+msgstr "Примени"
+
+msgid "Your incoming messages"
+msgstr "Ваши приемни пораки"
+
+msgid "Outbox"
+msgstr "За праќање"
+
+msgid "Your sent messages"
+msgstr "Ваши испратени пораки"
+
 msgid "Could not parse message."
 msgstr "Не можев да ја парсирам пораката."
 
@@ -7571,6 +7516,20 @@ msgstr "Пораки"
 msgid "from"
 msgstr "од"
 
+msgid "Can't get author for activity."
+msgstr ""
+
+#, fuzzy
+msgid "Bookmark not posted to this group."
+msgstr "Не Ви е дозволено да ја избришете оваа група."
+
+#, fuzzy
+msgid "Object not posted to this user."
+msgstr "Не го бриши корисников."
+
+msgid "Don't know how to handle this kind of target."
+msgstr ""
+
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 msgid "Nickname cannot be empty."
 msgstr "Прекарот не може да стои празен."
@@ -7596,9 +7555,8 @@ msgid "Attach"
 msgstr "Приложи"
 
 #. TRANS: Title for input field to attach a file to a notice.
-#, fuzzy
 msgid "Attach a file."
-msgstr "Приложи податотека"
+msgstr "Приложи податотека."
 
 #. TRANS: Field label to add location to a notice.
 msgid "Share my location"
@@ -7685,24 +7643,15 @@ msgstr "Дуплирана забелешка."
 msgid "Couldn't insert new subscription."
 msgstr "Не може да се внесе нова претплата."
 
+msgid "Your profile"
+msgstr "Профил на група"
+
 msgid "Replies"
 msgstr "Одговори"
 
 msgid "Favorites"
 msgstr "Бендисани"
 
-msgid "Inbox"
-msgstr "Примени"
-
-msgid "Your incoming messages"
-msgstr "Ваши приемни пораки"
-
-msgid "Outbox"
-msgstr "За праќање"
-
-msgid "Your sent messages"
-msgstr "Ваши испратени пораки"
-
 #. TRANS: Title for personal tag cloud section. %s is a user nickname.
 #, php-format
 msgid "Tags in %s's notices"
@@ -7726,6 +7675,30 @@ msgctxt "plugin-description"
 msgid "(Plugin descriptions unavailable when disabled.)"
 msgstr "(Описите на приклучоците не се достапни ако е оневозможено.)"
 
+msgid "Settings"
+msgstr "Нагодувања за СМС"
+
+msgid "Change your personal settings"
+msgstr "Измена на лични поставки"
+
+msgid "Site configuration"
+msgstr "Поставки на мреж. место"
+
+msgid "Logout"
+msgstr "Одјава"
+
+msgid "Logout from the site"
+msgstr "Одјава"
+
+msgid "Login to the site"
+msgstr "Најава"
+
+msgid "Search"
+msgstr "Барај"
+
+msgid "Search the site"
+msgstr "Пребарај по мрежното место"
+
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
 msgid "Subscriptions"
@@ -7834,6 +7807,39 @@ msgstr "Пронајдете содржини на забелешките"
 msgid "Find groups on this site"
 msgstr "Пронајдете групи на ова мрежно место"
 
+#. TRANS: Secondary navigation menu option leading to help on StatusNet.
+msgid "Help"
+msgstr "Помош"
+
+#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
+msgid "About"
+msgstr "За нас"
+
+#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
+msgid "FAQ"
+msgstr "ЧПП"
+
+#. TRANS: Secondary navigation menu option leading to Terms of Service.
+msgid "TOS"
+msgstr "Услови"
+
+#. TRANS: Secondary navigation menu option leading to privacy policy.
+msgid "Privacy"
+msgstr "Приватност"
+
+#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
+msgid "Source"
+msgstr "Изворен код"
+
+#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+msgid "Contact"
+msgstr "Контакт"
+
+#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
+msgid "Badge"
+msgstr "Значка"
+
 msgid "Untitled section"
 msgstr "Заглавие без наслов"
 
@@ -7956,11 +7962,11 @@ msgstr "Изгледот содржи податотека од типот „.%
 msgid "Error opening theme archive."
 msgstr "Грешка при отворањето на архивот за мотив."
 
-#, fuzzy, php-format
+#, php-format
 msgid "Show %d reply"
 msgid_plural "Show all %d replies"
-msgstr[0] "Повеќе"
-msgstr[1] "Повеќе"
+msgstr[0] "Прикажи %d одговор"
+msgstr[1] "Прикажи ги сите %d одговори"
 
 msgid "Top posters"
 msgstr "Најактивни објавувачи"
@@ -8115,26 +8121,8 @@ msgstr "Неважечки XML. Нема XRD-корен."
 msgid "Getting backup from file '%s'."
 msgstr "Земам резерва на податотеката „%s“."
 
-#~ msgid "Full name is too long (max 255 chars)."
-#~ msgstr "Целото име е предолго (највеќе 255 знаци)"
+#~ msgid "Friends timeline"
+#~ msgstr "Историја на пријатели"
 
-#~ msgid "description is too long (max %d chars)."
-#~ msgstr "описот е предолг (највеќе %d знаци)"
-
-#~ msgid "Location is too long (max 255 chars)."
-#~ msgstr "Местоположбата е предолга (дозволени се највеќе 255 знаци)."
-
-#~ msgid "Too many aliases! Maximum %d."
-#~ msgstr "Премногу алијаси! Дозволено е највеќе %d."
-
-#~ msgctxt "BUTTON"
-#~ msgid "Comment"
-#~ msgstr "Коментар"
-
-#~ msgid "Add a comment..."
-#~ msgstr "Додај коментар..."
-
-#~ msgid "Show all %d comment"
-#~ msgid_plural "Show all %d comments"
-#~ msgstr[0] "Прикажи го коментарот"
-#~ msgstr[1] "Прикажи ги сите %d коментари"
+#~ msgid "Everyone on this site"
+#~ msgstr "Сите на ова мрежно место"
diff --git a/locale/ml/LC_MESSAGES/statusnet.po b/locale/ml/LC_MESSAGES/statusnet.po
index 56658d79f5..84a9210ef5 100644
--- a/locale/ml/LC_MESSAGES/statusnet.po
+++ b/locale/ml/LC_MESSAGES/statusnet.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-06 02:34+0100\n"
-"PO-Revision-Date: 2011-03-06 01:36:30+0000\n"
+"POT-Creation-Date: 2011-03-08 01:03+0000\n"
+"PO-Revision-Date: 2011-03-08 01:05:23+0000\n"
 "Language-Team: Malayalam <http://translatewiki.net/wiki/Portal:ml>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-03 17:59:19+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-POT-Import-Date: 2011-03-06 02:16:47+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ml\n"
 "X-Message-Group: #out-statusnet-core\n"
@@ -5735,88 +5735,8 @@ msgid "Write a reply..."
 msgstr ""
 
 #, fuzzy
-msgid "Home"
-msgstr "ഹോംപേജ്"
-
-#, fuzzy
-msgid "Friends timeline"
-msgstr "%s എന്ന ഉപയോക്താവിന്റെ സമയരേഖ"
-
-#, fuzzy
-msgid "Your profile"
-msgstr "അജ്ഞാതമായ കുറിപ്പ്."
-
-msgid "Public"
-msgstr "സാർവ്വജനികം"
-
-#, fuzzy
-msgid "Everyone on this site"
-msgstr "ഈ സൈറ്റിലെ ആൾക്കാരെ കണ്ടെത്തുക"
-
-#, fuzzy
-msgid "Settings"
-msgstr "എസ്.എം.എസ്. സജ്ജീകരണങ്ങൾ"
-
-#, fuzzy
-msgid "Change your personal settings"
-msgstr "താങ്കളുടെ രഹസ്യവാക്ക് മാറ്റുക"
-
-#, fuzzy
-msgid "Site configuration"
-msgstr "ഉപയോക്തൃ ക്രമീകരണം"
-
-#, fuzzy
-msgid "Logout"
-msgstr "ലോഗൗട്ട്"
-
-#, fuzzy
-msgid "Logout from the site"
-msgstr "സൈറ്റിൽ നിന്നും പുറത്തുകടക്കുക"
-
-#, fuzzy
-msgid "Login to the site"
-msgstr "സൈറ്റിലേക്ക് പ്രവേശിക്കുക"
-
-#, fuzzy
-msgid "Search"
-msgstr "തിരയുക"
-
-#, fuzzy
-msgid "Search the site"
-msgstr "സൈറ്റിൽ തിരയുക"
-
-#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-msgid "Help"
-msgstr "സഹായം"
-
-#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-msgid "About"
-msgstr "വിവരണം"
-
-#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-msgid "FAQ"
-msgstr "പതിവുചോദ്യങ്ങൾ"
-
-#. TRANS: Secondary navigation menu option leading to Terms of Service.
-msgid "TOS"
-msgstr ""
-
-#. TRANS: Secondary navigation menu option leading to privacy policy.
-msgid "Privacy"
-msgstr "സ്വകാര്യത"
-
-#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-msgid "Source"
-msgstr "സ്രോതസ്സ്"
-
-#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
-#. TRANS: StatusNet site, where to report bugs, ...
-msgid "Contact"
-msgstr "സമ്പർക്കം"
-
-#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-msgid "Badge"
-msgstr ""
+msgid "Status"
+msgstr "സ്റ്റാറ്റസ്‌നെറ്റ്"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #. TRANS: Text between [] is a link description, text between () is the link itself.
@@ -6553,6 +6473,13 @@ msgstr ""
 msgid "Database error"
 msgstr "ഡാറ്റാബേസ് പിഴവ്"
 
+#, fuzzy
+msgid "Home"
+msgstr "ഹോംപേജ്"
+
+msgid "Public"
+msgstr "സാർവ്വജനികം"
+
 #. TRANS: Description of form for deleting a user.
 msgid "Delete this user"
 msgstr "ഈ ഉപയോക്താവിനെ നീക്കം ചെയ്യുക"
@@ -7127,6 +7054,18 @@ msgstr ""
 "സന്ദേശങ്ങൾ അയയ്ക്കാവുന്നതാണ്. താങ്കൾക്ക് മാത്രം കാണാവുന്ന സന്ദേശങ്ങൾ അയയ്ക്കാൻ മറ്റുള്ളവർക്കും "
 "കഴിയുന്നതാണ്."
 
+msgid "Inbox"
+msgstr "ഇൻബോക്സ്"
+
+msgid "Your incoming messages"
+msgstr "താങ്കൾക്ക് വരുന്ന സന്ദേശങ്ങൾ"
+
+msgid "Outbox"
+msgstr "ഔട്ട്ബോക്സ്"
+
+msgid "Your sent messages"
+msgstr "താങ്കൾ അയച്ച സന്ദേശങ്ങൾ"
+
 msgid "Could not parse message."
 msgstr ""
 
@@ -7201,6 +7140,20 @@ msgstr "സന്ദേശങ്ങൾ"
 msgid "from"
 msgstr "അയച്ചത്"
 
+msgid "Can't get author for activity."
+msgstr ""
+
+#, fuzzy
+msgid "Bookmark not posted to this group."
+msgstr "ഈ സംഘത്തെ മായ്ക്കരുത്."
+
+#, fuzzy
+msgid "Object not posted to this user."
+msgstr "ഈ ഉപയോക്താവിനെ നീക്കം ചെയ്യരുത്."
+
+msgid "Don't know how to handle this kind of target."
+msgstr ""
+
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 msgid "Nickname cannot be empty."
 msgstr "വിളിപ്പേര് ശൂന്യമായിരിക്കാൻ പാടില്ല."
@@ -7315,6 +7268,10 @@ msgstr "അറിയിപ്പിന്റെ പകർപ്പ്."
 msgid "Couldn't insert new subscription."
 msgstr ""
 
+#, fuzzy
+msgid "Your profile"
+msgstr "അജ്ഞാതമായ കുറിപ്പ്."
+
 msgid "Replies"
 msgstr "മറുപടികൾ"
 
@@ -7322,18 +7279,6 @@ msgstr "മറുപടികൾ"
 msgid "Favorites"
 msgstr "%s എന്ന ഉപയോക്താവിന് പ്രിയങ്കരമായവ"
 
-msgid "Inbox"
-msgstr "ഇൻബോക്സ്"
-
-msgid "Your incoming messages"
-msgstr "താങ്കൾക്ക് വരുന്ന സന്ദേശങ്ങൾ"
-
-msgid "Outbox"
-msgstr "ഔട്ട്ബോക്സ്"
-
-msgid "Your sent messages"
-msgstr "താങ്കൾ അയച്ച സന്ദേശങ്ങൾ"
-
 #. TRANS: Title for personal tag cloud section. %s is a user nickname.
 #, php-format
 msgid "Tags in %s's notices"
@@ -7357,6 +7302,38 @@ msgctxt "plugin-description"
 msgid "(Plugin descriptions unavailable when disabled.)"
 msgstr ""
 
+#, fuzzy
+msgid "Settings"
+msgstr "എസ്.എം.എസ്. സജ്ജീകരണങ്ങൾ"
+
+#, fuzzy
+msgid "Change your personal settings"
+msgstr "താങ്കളുടെ രഹസ്യവാക്ക് മാറ്റുക"
+
+#, fuzzy
+msgid "Site configuration"
+msgstr "ഉപയോക്തൃ ക്രമീകരണം"
+
+#, fuzzy
+msgid "Logout"
+msgstr "ലോഗൗട്ട്"
+
+#, fuzzy
+msgid "Logout from the site"
+msgstr "സൈറ്റിൽ നിന്നും പുറത്തുകടക്കുക"
+
+#, fuzzy
+msgid "Login to the site"
+msgstr "സൈറ്റിലേക്ക് പ്രവേശിക്കുക"
+
+#, fuzzy
+msgid "Search"
+msgstr "തിരയുക"
+
+#, fuzzy
+msgid "Search the site"
+msgstr "സൈറ്റിൽ തിരയുക"
+
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
 msgid "Subscriptions"
@@ -7465,6 +7442,39 @@ msgstr "അറിയിപ്പുകളുടെ ഉള്ളടക്കം 
 msgid "Find groups on this site"
 msgstr "ഈ സൈറ്റിലെ സംഘങ്ങൾ കണ്ടെത്തുക"
 
+#. TRANS: Secondary navigation menu option leading to help on StatusNet.
+msgid "Help"
+msgstr "സഹായം"
+
+#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
+msgid "About"
+msgstr "വിവരണം"
+
+#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
+msgid "FAQ"
+msgstr "പതിവുചോദ്യങ്ങൾ"
+
+#. TRANS: Secondary navigation menu option leading to Terms of Service.
+msgid "TOS"
+msgstr ""
+
+#. TRANS: Secondary navigation menu option leading to privacy policy.
+msgid "Privacy"
+msgstr "സ്വകാര്യത"
+
+#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
+msgid "Source"
+msgstr "സ്രോതസ്സ്"
+
+#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+msgid "Contact"
+msgstr "സമ്പർക്കം"
+
+#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
+msgid "Badge"
+msgstr ""
+
 msgid "Untitled section"
 msgstr "തലക്കെട്ടില്ലാത്ത ഭാഗം"
 
@@ -7743,18 +7753,9 @@ msgid "Getting backup from file '%s'."
 msgstr ""
 
 #, fuzzy
-#~ msgid "Full name is too long (max 255 chars)."
-#~ msgstr "പൂർണ്ണ നാമത്തിന്റെ നീളം വളരെ കൂടുതലാണ് (പരമാവധി 255 അക്ഷരങ്ങൾ)."
+#~ msgid "Friends timeline"
+#~ msgstr "%s എന്ന ഉപയോക്താവിന്റെ സമയരേഖ"
 
 #, fuzzy
-#~ msgid "description is too long (max %d chars)."
-#~ msgstr "വിവരണത്തിനു നീളം കൂടുതലാണ് (പരമാവധി %d അക്ഷരം)."
-
-#, fuzzy
-#~ msgid "Location is too long (max 255 chars)."
-#~ msgstr "സംഘടനയുടെ പേരിന്റെ നീളം വളരെക്കൂടുതലാണ് (പരമാവധി 255 അക്ഷരങ്ങൾ)."
-
-#, fuzzy
-#~ msgctxt "BUTTON"
-#~ msgid "Comment"
-#~ msgstr "ഉള്ളടക്കം"
+#~ msgid "Everyone on this site"
+#~ msgstr "ഈ സൈറ്റിലെ ആൾക്കാരെ കണ്ടെത്തുക"
diff --git a/locale/nb/LC_MESSAGES/statusnet.po b/locale/nb/LC_MESSAGES/statusnet.po
index 192917074d..1fa8ea3e77 100644
--- a/locale/nb/LC_MESSAGES/statusnet.po
+++ b/locale/nb/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-03-06 02:34+0100\n"
-"PO-Revision-Date: 2011-03-06 01:36:33+0000\n"
+"POT-Creation-Date: 2011-03-08 01:03+0000\n"
+"PO-Revision-Date: 2011-03-08 01:05:26+0000\n"
 "Language-Team: Norwegian (bokmål)‬ <http://translatewiki.net/wiki/Portal:no>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-03-03 17:59:19+0000\n"
+"X-POT-Import-Date: 2011-03-06 02:16:47+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -5961,87 +5961,9 @@ msgstr "Svar"
 msgid "Write a reply..."
 msgstr ""
 
-msgid "Home"
-msgstr "Hjemmesiden"
-
 #, fuzzy
-msgid "Friends timeline"
-msgstr "%s tidslinje"
-
-msgid "Your profile"
-msgstr "Gruppeprofil"
-
-msgid "Public"
-msgstr "Offentlig"
-
-#, fuzzy
-msgid "Everyone on this site"
-msgstr "Finn personer på dette nettstedet"
-
-#, fuzzy
-msgid "Settings"
-msgstr "SMS-innstillinger"
-
-#, fuzzy
-msgid "Change your personal settings"
-msgstr "Endre profilinnstillingene dine"
-
-#, fuzzy
-msgid "Site configuration"
-msgstr "Brukerkonfigurasjon"
-
-msgid "Logout"
-msgstr "Logg ut"
-
-#, fuzzy
-msgid "Logout from the site"
-msgstr "Logg ut fra nettstedet"
-
-#, fuzzy
-msgid "Login to the site"
-msgstr "Log inn på nettstedet"
-
-msgid "Search"
-msgstr "Søk"
-
-#, fuzzy
-msgid "Search the site"
-msgstr "Søk nettsted"
-
-#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-msgid "Help"
-msgstr "Hjelp"
-
-#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-msgid "About"
-msgstr "Om"
-
-#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-msgid "FAQ"
-msgstr "OSS/FAQ"
-
-#. TRANS: Secondary navigation menu option leading to Terms of Service.
-msgid "TOS"
-msgstr ""
-
-#. TRANS: Secondary navigation menu option leading to privacy policy.
-#, fuzzy
-msgid "Privacy"
-msgstr "Privat"
-
-#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-msgid "Source"
-msgstr "Kilde"
-
-#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
-#. TRANS: StatusNet site, where to report bugs, ...
-msgid "Contact"
-msgstr "Kontakt"
-
-#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#, fuzzy
-msgid "Badge"
-msgstr "Knuff"
+msgid "Status"
+msgstr "StatusNet"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #. TRANS: Text between [] is a link description, text between () is the link itself.
@@ -6808,6 +6730,12 @@ msgstr "Log inn på nettstedet"
 msgid "Database error"
 msgstr "Databasefeil"
 
+msgid "Home"
+msgstr "Hjemmesiden"
+
+msgid "Public"
+msgstr "Offentlig"
+
 #. TRANS: Description of form for deleting a user.
 msgid "Delete this user"
 msgstr "Slett denne brukeren"
@@ -7483,6 +7411,18 @@ msgstr ""
 "engasjere andre brukere i en samtale. Personer kan sende deg meldinger som "
 "bare du kan se."
 
+msgid "Inbox"
+msgstr "Innboks"
+
+msgid "Your incoming messages"
+msgstr "Dine innkommende meldinger"
+
+msgid "Outbox"
+msgstr "Utboks"
+
+msgid "Your sent messages"
+msgstr "Dine sendte meldinger"
+
 msgid "Could not parse message."
 msgstr "Kunne ikke tolke meldingen."
 
@@ -7561,6 +7501,20 @@ msgstr "Melding"
 msgid "from"
 msgstr "fra"
 
+msgid "Can't get author for activity."
+msgstr ""
+
+#, fuzzy
+msgid "Bookmark not posted to this group."
+msgstr "Du har ikke tillatelse til å slette denne gruppen."
+
+#, fuzzy
+msgid "Object not posted to this user."
+msgstr "Ikke slett denne gruppen"
+
+msgid "Don't know how to handle this kind of target."
+msgstr ""
+
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 msgid "Nickname cannot be empty."
 msgstr ""
@@ -7677,24 +7631,15 @@ msgstr ""
 msgid "Couldn't insert new subscription."
 msgstr "Kunne ikke sette inn bekreftelseskode."
 
+msgid "Your profile"
+msgstr "Gruppeprofil"
+
 msgid "Replies"
 msgstr "Svar"
 
 msgid "Favorites"
 msgstr "Favoritter"
 
-msgid "Inbox"
-msgstr "Innboks"
-
-msgid "Your incoming messages"
-msgstr "Dine innkommende meldinger"
-
-msgid "Outbox"
-msgstr "Utboks"
-
-msgid "Your sent messages"
-msgstr "Dine sendte meldinger"
-
 #. TRANS: Title for personal tag cloud section. %s is a user nickname.
 #, fuzzy, php-format
 msgid "Tags in %s's notices"
@@ -7718,6 +7663,36 @@ msgctxt "plugin-description"
 msgid "(Plugin descriptions unavailable when disabled.)"
 msgstr ""
 
+#, fuzzy
+msgid "Settings"
+msgstr "SMS-innstillinger"
+
+#, fuzzy
+msgid "Change your personal settings"
+msgstr "Endre profilinnstillingene dine"
+
+#, fuzzy
+msgid "Site configuration"
+msgstr "Brukerkonfigurasjon"
+
+msgid "Logout"
+msgstr "Logg ut"
+
+#, fuzzy
+msgid "Logout from the site"
+msgstr "Logg ut fra nettstedet"
+
+#, fuzzy
+msgid "Login to the site"
+msgstr "Log inn på nettstedet"
+
+msgid "Search"
+msgstr "Søk"
+
+#, fuzzy
+msgid "Search the site"
+msgstr "Søk nettsted"
+
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
 msgid "Subscriptions"
@@ -7832,6 +7807,41 @@ msgstr "Finn innhold i notiser"
 msgid "Find groups on this site"
 msgstr "Finn grupper på dette nettstedet"
 
+#. TRANS: Secondary navigation menu option leading to help on StatusNet.
+msgid "Help"
+msgstr "Hjelp"
+
+#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
+msgid "About"
+msgstr "Om"
+
+#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
+msgid "FAQ"
+msgstr "OSS/FAQ"
+
+#. TRANS: Secondary navigation menu option leading to Terms of Service.
+msgid "TOS"
+msgstr ""
+
+#. TRANS: Secondary navigation menu option leading to privacy policy.
+#, fuzzy
+msgid "Privacy"
+msgstr "Privat"
+
+#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
+msgid "Source"
+msgstr "Kilde"
+
+#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+msgid "Contact"
+msgstr "Kontakt"
+
+#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
+#, fuzzy
+msgid "Badge"
+msgstr "Knuff"
+
 #, fuzzy
 msgid "Untitled section"
 msgstr "Side uten tittel"
@@ -8120,19 +8130,10 @@ msgstr ""
 msgid "Getting backup from file '%s'."
 msgstr ""
 
-#~ msgid "Full name is too long (max 255 chars)."
-#~ msgstr "Fullt navn er for langt (maks 255 tegn)."
-
-#~ msgid "description is too long (max %d chars)."
-#~ msgstr "beskrivelse er for lang (maks %d tegn)"
-
-#~ msgid "Location is too long (max 255 chars)."
-#~ msgstr "Plassering er for lang (maks 255 tegn)."
-
-#~ msgid "Too many aliases! Maximum %d."
-#~ msgstr "For mange alias! Maksimum %d."
+#, fuzzy
+#~ msgid "Friends timeline"
+#~ msgstr "%s tidslinje"
 
 #, fuzzy
-#~ msgctxt "BUTTON"
-#~ msgid "Comment"
-#~ msgstr "Innhold"
+#~ msgid "Everyone on this site"
+#~ msgstr "Finn personer på dette nettstedet"
diff --git a/locale/nl/LC_MESSAGES/statusnet.po b/locale/nl/LC_MESSAGES/statusnet.po
index 90e79433cf..a7d99e5410 100644
--- a/locale/nl/LC_MESSAGES/statusnet.po
+++ b/locale/nl/LC_MESSAGES/statusnet.po
@@ -12,17 +12,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-06 02:34+0100\n"
-"PO-Revision-Date: 2011-03-06 01:36:31+0000\n"
+"POT-Creation-Date: 2011-03-08 01:03+0000\n"
+"PO-Revision-Date: 2011-03-08 01:05:24+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-03-03 17:59:19+0000\n"
+"X-POT-Import-Date: 2011-03-06 02:16:47+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -2961,9 +2961,8 @@ msgid "Type"
 msgstr "Type"
 
 #. TRANS: Dropdown field instructions in the license admin panel.
-#, fuzzy
 msgid "Select a license."
-msgstr "Selecteer licentie"
+msgstr "Selecteer een licentie."
 
 #. TRANS: Form legend in the license admin panel.
 msgid "License details"
@@ -3002,9 +3001,8 @@ msgid "URL for an image to display with the license."
 msgstr "Een URL voor een afbeelding om weer te geven met de licentie."
 
 #. TRANS: Button title in the license admin panel.
-#, fuzzy
 msgid "Save license settings."
-msgstr "Licentieinstellingen opslaan"
+msgstr "Licentieinstellingen opslaan."
 
 #. TRANS: Client error displayed when trying to log in while already logged in.
 #. TRANS: Client error displayed trying to use "one time password login" when already logged in.
@@ -3039,7 +3037,6 @@ msgid "Automatically login in the future; not for shared computers!"
 msgstr "Voortaan automatisch aanmelden. Niet gebruiken op gedeelde computers!"
 
 #. TRANS: Button text for log in on login page.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Login"
 msgstr "Aanmelden"
@@ -3136,7 +3133,6 @@ msgstr "Nieuw bericht"
 
 #. TRANS: Client error displayed trying to send a direct message to a user while sender and
 #. TRANS: receiver are not subscribed to each other.
-#, fuzzy
 msgid "You cannot send a message to this user."
 msgstr "U kunt geen bericht naar deze gebruiker zenden."
 
@@ -5987,86 +5983,17 @@ msgid "Show more"
 msgstr "Meer weergeven"
 
 #. TRANS: Inline reply form submit button: submits a reply comment.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Reply"
 msgstr "Antwoorden"
 
 #. TRANS: Placeholder text for inline reply form. Clicking in this box will turn it into a mini notice form.
 msgid "Write a reply..."
-msgstr ""
+msgstr "Schrijf een antwoord..."
 
-msgid "Home"
-msgstr "Start"
-
-msgid "Friends timeline"
-msgstr "Tijdlijn van vrienden"
-
-msgid "Your profile"
-msgstr "Uw profiel"
-
-msgid "Public"
-msgstr "Openbaar"
-
-msgid "Everyone on this site"
-msgstr "Iedereen op deze site"
-
-msgid "Settings"
-msgstr "SMS-instellingen"
-
-msgid "Change your personal settings"
-msgstr "Persoonlijke instellingen wijzigen"
-
-msgid "Site configuration"
-msgstr "Siteinstellingen"
-
-msgid "Logout"
-msgstr "Afmelden"
-
-msgid "Logout from the site"
-msgstr "Van de site afmelden"
-
-msgid "Login to the site"
-msgstr "Bij de site aanmelden"
-
-msgid "Search"
-msgstr "Zoeken"
-
-msgid "Search the site"
-msgstr "Site doorzoeken"
-
-#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-msgid "Help"
-msgstr "Help"
-
-#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-msgid "About"
-msgstr "Over"
-
-#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-msgid "FAQ"
-msgstr "Veel gestelde vragen"
-
-#. TRANS: Secondary navigation menu option leading to Terms of Service.
-msgid "TOS"
-msgstr "Gebruiksvoorwaarden"
-
-#. TRANS: Secondary navigation menu option leading to privacy policy.
-msgid "Privacy"
-msgstr "Privacy"
-
-#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-msgid "Source"
-msgstr "Broncode"
-
-#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
-#. TRANS: StatusNet site, where to report bugs, ...
-msgid "Contact"
-msgstr "Contact"
-
-#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-msgid "Badge"
-msgstr "Widget"
+#, fuzzy
+msgid "Status"
+msgstr "StatusNet"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #. TRANS: Text between [] is a link description, text between () is the link itself.
@@ -6878,6 +6805,12 @@ msgstr "Naar het installatieprogramma gaan."
 msgid "Database error"
 msgstr "Databasefout"
 
+msgid "Home"
+msgstr "Start"
+
+msgid "Public"
+msgstr "Openbaar"
+
 #. TRANS: Description of form for deleting a user.
 msgid "Delete this user"
 msgstr "Gebruiker verwijderen"
@@ -7556,6 +7489,18 @@ msgstr ""
 "U hebt geen privéberichten. U kunt privéberichten verzenden aan andere "
 "gebruikers. Mensen kunnen u privéberichten sturen die alleen u kunt lezen."
 
+msgid "Inbox"
+msgstr "Postvak IN"
+
+msgid "Your incoming messages"
+msgstr "Uw inkomende berichten"
+
+msgid "Outbox"
+msgstr "Postvak UIT"
+
+msgid "Your sent messages"
+msgstr "Uw verzonden berichten"
+
 msgid "Could not parse message."
 msgstr "Het was niet mogelijk het bericht te verwerken."
 
@@ -7633,6 +7578,20 @@ msgstr "Berichten"
 msgid "from"
 msgstr "van"
 
+msgid "Can't get author for activity."
+msgstr ""
+
+#, fuzzy
+msgid "Bookmark not posted to this group."
+msgstr "U mag deze groep niet verwijderen."
+
+#, fuzzy
+msgid "Object not posted to this user."
+msgstr "Deze gebruiker niet verwijderen."
+
+msgid "Don't know how to handle this kind of target."
+msgstr ""
+
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 msgid "Nickname cannot be empty."
 msgstr "Gebruikersnaam kan niet leeg zijn."
@@ -7658,9 +7617,8 @@ msgid "Attach"
 msgstr "Toevoegen"
 
 #. TRANS: Title for input field to attach a file to a notice.
-#, fuzzy
 msgid "Attach a file."
-msgstr "Bestand toevoegen"
+msgstr "Voeg een bestand toe."
 
 #. TRANS: Field label to add location to a notice.
 msgid "Share my location"
@@ -7747,24 +7705,15 @@ msgstr "Dubbele mededeling."
 msgid "Couldn't insert new subscription."
 msgstr "Kon nieuw abonnement niet toevoegen."
 
+msgid "Your profile"
+msgstr "Uw profiel"
+
 msgid "Replies"
 msgstr "Antwoorden"
 
 msgid "Favorites"
 msgstr "Favorieten"
 
-msgid "Inbox"
-msgstr "Postvak IN"
-
-msgid "Your incoming messages"
-msgstr "Uw inkomende berichten"
-
-msgid "Outbox"
-msgstr "Postvak UIT"
-
-msgid "Your sent messages"
-msgstr "Uw verzonden berichten"
-
 #. TRANS: Title for personal tag cloud section. %s is a user nickname.
 #, php-format
 msgid "Tags in %s's notices"
@@ -7788,6 +7737,30 @@ msgctxt "plugin-description"
 msgid "(Plugin descriptions unavailable when disabled.)"
 msgstr "Plug-inbeschrijvingen zijn niet beschikbaar als uitgeschakeld."
 
+msgid "Settings"
+msgstr "SMS-instellingen"
+
+msgid "Change your personal settings"
+msgstr "Persoonlijke instellingen wijzigen"
+
+msgid "Site configuration"
+msgstr "Siteinstellingen"
+
+msgid "Logout"
+msgstr "Afmelden"
+
+msgid "Logout from the site"
+msgstr "Van de site afmelden"
+
+msgid "Login to the site"
+msgstr "Bij de site aanmelden"
+
+msgid "Search"
+msgstr "Zoeken"
+
+msgid "Search the site"
+msgstr "Site doorzoeken"
+
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
 msgid "Subscriptions"
@@ -7896,6 +7869,39 @@ msgstr "Inhoud van mededelingen vinden"
 msgid "Find groups on this site"
 msgstr "Groepen op deze site vinden"
 
+#. TRANS: Secondary navigation menu option leading to help on StatusNet.
+msgid "Help"
+msgstr "Help"
+
+#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
+msgid "About"
+msgstr "Over"
+
+#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
+msgid "FAQ"
+msgstr "Veel gestelde vragen"
+
+#. TRANS: Secondary navigation menu option leading to Terms of Service.
+msgid "TOS"
+msgstr "Gebruiksvoorwaarden"
+
+#. TRANS: Secondary navigation menu option leading to privacy policy.
+msgid "Privacy"
+msgstr "Privacy"
+
+#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
+msgid "Source"
+msgstr "Broncode"
+
+#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+msgid "Contact"
+msgstr "Contact"
+
+#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
+msgid "Badge"
+msgstr "Widget"
+
 msgid "Untitled section"
 msgstr "Naamloze sectie"
 
@@ -8025,11 +8031,11 @@ msgstr ""
 "Er is een fout opgetreden tijdens het openen van het archiefbestand met de "
 "vormgeving."
 
-#, fuzzy, php-format
+#, php-format
 msgid "Show %d reply"
 msgid_plural "Show all %d replies"
-msgstr[0] "Meer weergeven"
-msgstr[1] "Meer weergeven"
+msgstr[0] "Antwoord weergegeven"
+msgstr[1] "Alle %d antwoorden weergegeven"
 
 msgid "Top posters"
 msgstr "Meest actieve gebruikers"
@@ -8183,26 +8189,8 @@ msgstr "Ongeldige XML. De XRD-root mist."
 msgid "Getting backup from file '%s'."
 msgstr "De back-up wordt uit het bestand \"%s\" geladen."
 
-#~ msgid "Full name is too long (max 255 chars)."
-#~ msgstr "De volledige naam is te lang (maximaal 255 tekens)."
+#~ msgid "Friends timeline"
+#~ msgstr "Tijdlijn van vrienden"
 
-#~ msgid "description is too long (max %d chars)."
-#~ msgstr "de beschrijving is te lang (maximaal %d tekens)"
-
-#~ msgid "Location is too long (max 255 chars)."
-#~ msgstr "De locatie is te lang (maximaal 255 tekens)."
-
-#~ msgid "Too many aliases! Maximum %d."
-#~ msgstr "Te veel aliassen! Het maximale aantal is %d."
-
-#~ msgctxt "BUTTON"
-#~ msgid "Comment"
-#~ msgstr "Opmerking"
-
-#~ msgid "Add a comment..."
-#~ msgstr "Opmerking toevoegen..."
-
-#~ msgid "Show all %d comment"
-#~ msgid_plural "Show all %d comments"
-#~ msgstr[0] "Opmerking weergeven"
-#~ msgstr[1] "Alle %d opmerkingen weergeven"
+#~ msgid "Everyone on this site"
+#~ msgstr "Iedereen op deze site"
diff --git a/locale/nn/LC_MESSAGES/statusnet.po b/locale/nn/LC_MESSAGES/statusnet.po
index 7915f43312..ba6a86422f 100644
--- a/locale/nn/LC_MESSAGES/statusnet.po
+++ b/locale/nn/LC_MESSAGES/statusnet.po
@@ -10,17 +10,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-06 02:34+0100\n"
-"PO-Revision-Date: 2011-03-06 01:36:32+0000\n"
+"POT-Creation-Date: 2011-03-08 01:03+0000\n"
+"PO-Revision-Date: 2011-03-08 01:05:25+0000\n"
 "Language-Team: Norwegian Nynorsk <http://translatewiki.net/wiki/Portal:nn>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nn\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-03-03 17:59:19+0000\n"
+"X-POT-Import-Date: 2011-03-06 02:16:47+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -6043,84 +6043,9 @@ msgstr "Svar"
 msgid "Write a reply..."
 msgstr ""
 
-msgid "Home"
-msgstr "Heimeside"
-
 #, fuzzy
-msgid "Friends timeline"
-msgstr "%s tidsline"
-
-#, fuzzy
-msgid "Your profile"
-msgstr "Gruppe profil"
-
-msgid "Public"
-msgstr "Offentleg"
-
-#, fuzzy
-msgid "Everyone on this site"
-msgstr "Finn folk på denne sida"
-
-msgid "Settings"
-msgstr "Avatar-innstillingar"
-
-#, fuzzy
-msgid "Change your personal settings"
-msgstr "Endra profilinnstillingane dine"
-
-#, fuzzy
-msgid "Site configuration"
-msgstr "SMS bekreftelse"
-
-msgid "Logout"
-msgstr "Logo"
-
-msgid "Logout from the site"
-msgstr "Logg inn "
-
-msgid "Login to the site"
-msgstr "Logg inn "
-
-msgid "Search"
-msgstr "Søk"
-
-#, fuzzy
-msgid "Search the site"
-msgstr "Søk"
-
-#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-msgid "Help"
-msgstr "Hjelp"
-
-#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-msgid "About"
-msgstr "Om"
-
-#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-msgid "FAQ"
-msgstr "OSS"
-
-#. TRANS: Secondary navigation menu option leading to Terms of Service.
-msgid "TOS"
-msgstr ""
-
-#. TRANS: Secondary navigation menu option leading to privacy policy.
-msgid "Privacy"
-msgstr "Personvern"
-
-#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-msgid "Source"
-msgstr "Kjeldekode"
-
-#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
-#. TRANS: StatusNet site, where to report bugs, ...
-msgid "Contact"
-msgstr "Kontakt"
-
-#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#, fuzzy
-msgid "Badge"
-msgstr "Dult"
+msgid "Status"
+msgstr "Statistikk"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #. TRANS: Text between [] is a link description, text between () is the link itself.
@@ -6899,6 +6824,12 @@ msgstr "Logg inn or sida"
 msgid "Database error"
 msgstr ""
 
+msgid "Home"
+msgstr "Heimeside"
+
+msgid "Public"
+msgstr "Offentleg"
+
 #. TRANS: Description of form for deleting a user.
 #, fuzzy
 msgid "Delete this user"
@@ -7490,6 +7421,18 @@ msgid ""
 "users in conversation. People can send you messages for your eyes only."
 msgstr ""
 
+msgid "Inbox"
+msgstr "Innboks"
+
+msgid "Your incoming messages"
+msgstr "Dine innkomande meldinger"
+
+msgid "Outbox"
+msgstr "Utboks"
+
+msgid "Your sent messages"
+msgstr "Dine sende meldingar"
+
 msgid "Could not parse message."
 msgstr "Kunne ikkje prosessera melding."
 
@@ -7568,6 +7511,20 @@ msgstr "Melding"
 msgid "from"
 msgstr " frå "
 
+msgid "Can't get author for activity."
+msgstr ""
+
+#, fuzzy
+msgid "Bookmark not posted to this group."
+msgstr "Du er ikkje medlem av den gruppa."
+
+#, fuzzy
+msgid "Object not posted to this user."
+msgstr "Ikkje slett denne gruppa"
+
+msgid "Don't know how to handle this kind of target."
+msgstr ""
+
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 msgid "Nickname cannot be empty."
 msgstr ""
@@ -7685,24 +7642,16 @@ msgstr ""
 msgid "Couldn't insert new subscription."
 msgstr "Kan ikkje leggja til ny tinging."
 
+#, fuzzy
+msgid "Your profile"
+msgstr "Gruppe profil"
+
 msgid "Replies"
 msgstr "Svar"
 
 msgid "Favorites"
 msgstr "Favorittar"
 
-msgid "Inbox"
-msgstr "Innboks"
-
-msgid "Your incoming messages"
-msgstr "Dine innkomande meldinger"
-
-msgid "Outbox"
-msgstr "Utboks"
-
-msgid "Your sent messages"
-msgstr "Dine sende meldingar"
-
 #. TRANS: Title for personal tag cloud section. %s is a user nickname.
 #, php-format
 msgid "Tags in %s's notices"
@@ -7727,6 +7676,33 @@ msgctxt "plugin-description"
 msgid "(Plugin descriptions unavailable when disabled.)"
 msgstr ""
 
+msgid "Settings"
+msgstr "Avatar-innstillingar"
+
+#, fuzzy
+msgid "Change your personal settings"
+msgstr "Endra profilinnstillingane dine"
+
+#, fuzzy
+msgid "Site configuration"
+msgstr "SMS bekreftelse"
+
+msgid "Logout"
+msgstr "Logo"
+
+msgid "Logout from the site"
+msgstr "Logg inn "
+
+msgid "Login to the site"
+msgstr "Logg inn "
+
+msgid "Search"
+msgstr "Søk"
+
+#, fuzzy
+msgid "Search the site"
+msgstr "Søk"
+
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
 msgid "Subscriptions"
@@ -7843,6 +7819,40 @@ msgstr "Søk i innhaldet av notisar"
 msgid "Find groups on this site"
 msgstr "Finn grupper på denne sida"
 
+#. TRANS: Secondary navigation menu option leading to help on StatusNet.
+msgid "Help"
+msgstr "Hjelp"
+
+#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
+msgid "About"
+msgstr "Om"
+
+#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
+msgid "FAQ"
+msgstr "OSS"
+
+#. TRANS: Secondary navigation menu option leading to Terms of Service.
+msgid "TOS"
+msgstr ""
+
+#. TRANS: Secondary navigation menu option leading to privacy policy.
+msgid "Privacy"
+msgstr "Personvern"
+
+#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
+msgid "Source"
+msgstr "Kjeldekode"
+
+#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+msgid "Contact"
+msgstr "Kontakt"
+
+#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
+#, fuzzy
+msgid "Badge"
+msgstr "Dult"
+
 msgid "Untitled section"
 msgstr "Seksjon utan tittel"
 
@@ -8133,16 +8143,10 @@ msgstr ""
 msgid "Getting backup from file '%s'."
 msgstr ""
 
-#~ msgid "Full name is too long (max 255 chars)."
-#~ msgstr "Ditt fulle namn er for langt (maksimalt 255 teikn)."
-
-#~ msgid "description is too long (max %d chars)."
-#~ msgstr "Plassering er for lang (maksimalt 255 teikn)."
-
-#~ msgid "Location is too long (max 255 chars)."
-#~ msgstr "Plassering er for lang (maksimalt 255 teikn)."
+#, fuzzy
+#~ msgid "Friends timeline"
+#~ msgstr "%s tidsline"
 
 #, fuzzy
-#~ msgctxt "BUTTON"
-#~ msgid "Comment"
-#~ msgstr "Innhald"
+#~ msgid "Everyone on this site"
+#~ msgstr "Finn folk på denne sida"
diff --git a/locale/pl/LC_MESSAGES/statusnet.po b/locale/pl/LC_MESSAGES/statusnet.po
index baea938057..f2f776d44e 100644
--- a/locale/pl/LC_MESSAGES/statusnet.po
+++ b/locale/pl/LC_MESSAGES/statusnet.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-06 02:34+0100\n"
-"PO-Revision-Date: 2011-03-06 01:36:34+0000\n"
+"POT-Creation-Date: 2011-03-08 01:03+0000\n"
+"PO-Revision-Date: 2011-03-08 01:05:27+0000\n"
 "Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
 "Language-Team: Polish <http://translatewiki.net/wiki/Portal:pl>\n"
 "MIME-Version: 1.0\n"
@@ -20,11 +20,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n == 1) ? 0 : ( (n%10 >= 2 && n%10 <= 4 && "
 "(n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
-"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pl\n"
 "X-Message-Group: #out-statusnet-core\n"
-"X-POT-Import-Date: 2011-03-03 17:59:19+0000\n"
+"X-POT-Import-Date: 2011-03-06 02:16:47+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -6004,82 +6004,9 @@ msgstr "Odpowiedz"
 msgid "Write a reply..."
 msgstr ""
 
-msgid "Home"
-msgstr "Strona domowa"
-
 #, fuzzy
-msgid "Friends timeline"
-msgstr "Oś czasu użytkownika %s"
-
-msgid "Your profile"
-msgstr "Profil grupy"
-
-msgid "Public"
-msgstr "Publiczny"
-
-#, fuzzy
-msgid "Everyone on this site"
-msgstr "Znajdź osoby na tej witrynie"
-
-msgid "Settings"
-msgstr "Ustawienia SMS"
-
-#, fuzzy
-msgid "Change your personal settings"
-msgstr "Zmień ustawienia profilu"
-
-#, fuzzy
-msgid "Site configuration"
-msgstr "Konfiguracja użytkownika"
-
-msgid "Logout"
-msgstr "Wyloguj się"
-
-msgid "Logout from the site"
-msgstr "Wyloguj się z witryny"
-
-msgid "Login to the site"
-msgstr "Zaloguj się na witrynie"
-
-msgid "Search"
-msgstr "Wyszukaj"
-
-#, fuzzy
-msgid "Search the site"
-msgstr "Przeszukaj witrynę"
-
-#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-msgid "Help"
-msgstr "Pomoc"
-
-#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-msgid "About"
-msgstr "O usłudze"
-
-#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-msgid "FAQ"
-msgstr "FAQ"
-
-#. TRANS: Secondary navigation menu option leading to Terms of Service.
-msgid "TOS"
-msgstr "TOS"
-
-#. TRANS: Secondary navigation menu option leading to privacy policy.
-msgid "Privacy"
-msgstr "Prywatność"
-
-#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-msgid "Source"
-msgstr "Kod źródłowy"
-
-#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
-#. TRANS: StatusNet site, where to report bugs, ...
-msgid "Contact"
-msgstr "Kontakt"
-
-#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-msgid "Badge"
-msgstr "Odznaka"
+msgid "Status"
+msgstr "StatusNet"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #. TRANS: Text between [] is a link description, text between () is the link itself.
@@ -6877,6 +6804,12 @@ msgstr "Przejdź do instalatora."
 msgid "Database error"
 msgstr "Błąd bazy danych"
 
+msgid "Home"
+msgstr "Strona domowa"
+
+msgid "Public"
+msgstr "Publiczny"
+
 #. TRANS: Description of form for deleting a user.
 msgid "Delete this user"
 msgstr "Usuń tego użytkownika"
@@ -7559,6 +7492,18 @@ msgstr ""
 "rozmowę z innymi użytkownikami. Inni mogą wysyłać ci wiadomości tylko dla "
 "twoich oczu."
 
+msgid "Inbox"
+msgstr "Odebrane"
+
+msgid "Your incoming messages"
+msgstr "Wiadomości przychodzące"
+
+msgid "Outbox"
+msgstr "Wysłane"
+
+msgid "Your sent messages"
+msgstr "Wysłane wiadomości"
+
 msgid "Could not parse message."
 msgstr "Nie można przetworzyć wiadomości."
 
@@ -7635,6 +7580,20 @@ msgstr "Wiadomość"
 msgid "from"
 msgstr "z"
 
+msgid "Can't get author for activity."
+msgstr ""
+
+#, fuzzy
+msgid "Bookmark not posted to this group."
+msgstr "Brak uprawnienia do usunięcia tej grupy."
+
+#, fuzzy
+msgid "Object not posted to this user."
+msgstr "Nie usuwaj tego użytkownika"
+
+msgid "Don't know how to handle this kind of target."
+msgstr ""
+
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 msgid "Nickname cannot be empty."
 msgstr "Pseudonim nie może być pusty."
@@ -7750,24 +7709,15 @@ msgstr "Podwójny wpis."
 msgid "Couldn't insert new subscription."
 msgstr "Nie można wprowadzić nowej subskrypcji."
 
+msgid "Your profile"
+msgstr "Profil grupy"
+
 msgid "Replies"
 msgstr "Odpowiedzi"
 
 msgid "Favorites"
 msgstr "Ulubione"
 
-msgid "Inbox"
-msgstr "Odebrane"
-
-msgid "Your incoming messages"
-msgstr "Wiadomości przychodzące"
-
-msgid "Outbox"
-msgstr "Wysłane"
-
-msgid "Your sent messages"
-msgstr "Wysłane wiadomości"
-
 #. TRANS: Title for personal tag cloud section. %s is a user nickname.
 #, php-format
 msgid "Tags in %s's notices"
@@ -7791,6 +7741,33 @@ msgctxt "plugin-description"
 msgid "(Plugin descriptions unavailable when disabled.)"
 msgstr ""
 
+msgid "Settings"
+msgstr "Ustawienia SMS"
+
+#, fuzzy
+msgid "Change your personal settings"
+msgstr "Zmień ustawienia profilu"
+
+#, fuzzy
+msgid "Site configuration"
+msgstr "Konfiguracja użytkownika"
+
+msgid "Logout"
+msgstr "Wyloguj się"
+
+msgid "Logout from the site"
+msgstr "Wyloguj się z witryny"
+
+msgid "Login to the site"
+msgstr "Zaloguj się na witrynie"
+
+msgid "Search"
+msgstr "Wyszukaj"
+
+#, fuzzy
+msgid "Search the site"
+msgstr "Przeszukaj witrynę"
+
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
 msgid "Subscriptions"
@@ -7899,6 +7876,39 @@ msgstr "Przeszukaj zawartość wpisów"
 msgid "Find groups on this site"
 msgstr "Znajdź grupy na tej witrynie"
 
+#. TRANS: Secondary navigation menu option leading to help on StatusNet.
+msgid "Help"
+msgstr "Pomoc"
+
+#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
+msgid "About"
+msgstr "O usłudze"
+
+#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
+msgid "FAQ"
+msgstr "FAQ"
+
+#. TRANS: Secondary navigation menu option leading to Terms of Service.
+msgid "TOS"
+msgstr "TOS"
+
+#. TRANS: Secondary navigation menu option leading to privacy policy.
+msgid "Privacy"
+msgstr "Prywatność"
+
+#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
+msgid "Source"
+msgstr "Kod źródłowy"
+
+#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+msgid "Contact"
+msgstr "Kontakt"
+
+#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
+msgid "Badge"
+msgstr "Odznaka"
+
 msgid "Untitled section"
 msgstr "Sekcja bez nazwy"
 
@@ -8194,19 +8204,10 @@ msgstr "Nieprawidłowy kod XML, brak głównego XRD."
 msgid "Getting backup from file '%s'."
 msgstr "Pobieranie kopii zapasowej z pliku \"%s\"."
 
-#~ msgid "Full name is too long (max 255 chars)."
-#~ msgstr "Imię i nazwisko jest za długie (maksymalnie 255 znaków)."
-
-#~ msgid "description is too long (max %d chars)."
-#~ msgstr "Opis jest za długi (maksymalnie %d znak)."
-
-#~ msgid "Location is too long (max 255 chars)."
-#~ msgstr "Położenie jest za długie (maksymalnie 255 znaków)."
-
-#~ msgid "Too many aliases! Maximum %d."
-#~ msgstr "Za dużo aliasów. Maksymalnie dozwolony jest %d."
+#, fuzzy
+#~ msgid "Friends timeline"
+#~ msgstr "Oś czasu użytkownika %s"
 
 #, fuzzy
-#~ msgctxt "BUTTON"
-#~ msgid "Comment"
-#~ msgstr "Treść"
+#~ msgid "Everyone on this site"
+#~ msgstr "Znajdź osoby na tej witrynie"
diff --git a/locale/pt/LC_MESSAGES/statusnet.po b/locale/pt/LC_MESSAGES/statusnet.po
index 5794a3272f..715f73afa7 100644
--- a/locale/pt/LC_MESSAGES/statusnet.po
+++ b/locale/pt/LC_MESSAGES/statusnet.po
@@ -8,6 +8,7 @@
 # Author: Hamilton Abreu
 # Author: Ipublicis
 # Author: McDutchie
+# Author: SandroHc
 # Author: Waldir
 # --
 # This file is distributed under the same license as the StatusNet package.
@@ -16,17 +17,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-06 02:34+0100\n"
-"PO-Revision-Date: 2011-03-06 01:36:35+0000\n"
+"POT-Creation-Date: 2011-03-08 01:03+0000\n"
+"PO-Revision-Date: 2011-03-08 01:05:28+0000\n"
 "Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-03-03 17:59:19+0000\n"
+"X-POT-Import-Date: 2011-03-06 02:16:47+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -302,7 +303,6 @@ msgid "Could not update your design."
 msgstr "Não foi possível actualizar o seu estilo."
 
 #. TRANS: Title for Atom feed.
-#, fuzzy
 msgctxt "ATOM"
 msgid "Main"
 msgstr "Principal"
@@ -332,7 +332,7 @@ msgid "%s favorites"
 msgstr "Favoritas de %s"
 
 #. TRANS: Title for Atom feed with a user's memberships. %s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "%s memberships"
 msgstr "Membros do grupo %s"
 
@@ -376,7 +376,7 @@ msgstr "Mensagem não tem texto!"
 #. TRANS: %d is the maximum number of characters for a message.
 #. TRANS: Form validation error displayed when message content is too long.
 #. TRANS: %d is the maximum number of characters for a message.
-#, fuzzy, php-format
+#, php-format
 msgid "That's too long. Maximum message size is %d character."
 msgid_plural "That's too long. Maximum message size is %d characters."
 msgstr[0] "Demasiado longo. Tamanho máx. das mensagens é %d caracteres."
@@ -387,13 +387,11 @@ msgid "Recipient user not found."
 msgstr "Destinatário não encontrado."
 
 #. TRANS: Client error displayed trying to direct message another user who's not a friend (403).
-#, fuzzy
 msgid "Cannot send direct messages to users who aren't your friend."
 msgstr ""
 "Não pode enviar mensagens directas a utilizadores que não sejam amigos."
 
 #. TRANS: Client error displayed trying to direct message self (403).
-#, fuzzy
 msgid ""
 "Do not send a message to yourself; just say it to yourself quietly instead."
 msgstr "Não auto-envie uma mensagem; basta lê-la baixinho a si próprio."
@@ -443,7 +441,6 @@ msgid "You cannot unfollow yourself."
 msgstr "Não pode deixar de seguir-se a si próprio."
 
 #. TRANS: Client error displayed when supplying invalid parameters to an API call checking if a friendship exists.
-#, fuzzy
 msgid "Two valid IDs or nick names must be supplied."
 msgstr "Têm de ser fornecidos dois IDs ou nomes de utilizador válidos."
 
@@ -486,7 +483,6 @@ msgstr "Página de ínicio não é uma URL válida."
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "Nome completo demasiado longo (máx. 255 caracteres)."
 
@@ -501,7 +497,7 @@ msgstr "Nome completo demasiado longo (máx. 255 caracteres)."
 #. TRANS: %d is the maximum number of characters for the description.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed characters.
-#, fuzzy, php-format
+#, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."
 msgstr[0] "Descrição demasiado longa (máx. %d caracteres)."
@@ -512,7 +508,6 @@ msgstr[1] "Descrição demasiado longa (máx. %d caracteres)."
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#, fuzzy
 msgid "Location is too long (maximum 255 characters)."
 msgstr "Localidade demasiado longa (máx. 255 caracteres)."
 
@@ -524,7 +519,7 @@ msgstr "Localidade demasiado longa (máx. 255 caracteres)."
 #. TRANS: %d is the maximum number of allowed aliases.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.
-#, fuzzy, php-format
+#, php-format
 msgid "Too many aliases! Maximum %d allowed."
 msgid_plural "Too many aliases! Maximum %d allowed."
 msgstr[0] "Demasiados nomes alternativos! Máx. %d."
@@ -641,7 +636,6 @@ msgstr "Utilizador só deve conter letras minúsculas e números. Sem espaços."
 
 #. TRANS: API validation exception thrown when alias is the same as nickname.
 #. TRANS: Group create form validation error.
-#, fuzzy
 msgid "Alias cannot be the same as nickname."
 msgstr "Um nome alternativo não pode ser igual ao nome do utilizador."
 
@@ -650,7 +644,6 @@ msgid "Upload failed."
 msgstr "O upload falhou."
 
 #. TRANS: Client error given from the OAuth API when the request token or verifier is invalid.
-#, fuzzy
 msgid "Invalid request token or verifier."
 msgstr "Chave de entrada especificada é inválida."
 
@@ -659,12 +652,10 @@ msgid "No oauth_token parameter provided."
 msgstr "Não foi fornecido o parâmetro oauth_token."
 
 #. TRANS: Client error given when an invalid request token was passed to the OAuth API.
-#, fuzzy
 msgid "Invalid request token."
 msgstr "Chave inválida."
 
 #. TRANS: Client error given when an invalid request token was passed to the OAuth API.
-#, fuzzy
 msgid "Request token already authorized."
 msgstr "Não tem autorização."
 
@@ -682,7 +673,6 @@ msgid "Invalid nickname / password!"
 msgstr "Utilizador ou senha inválidos!"
 
 #. TRANS: Server error displayed when a database action fails.
-#, fuzzy
 msgid "Database error inserting oauth_token_association."
 msgstr "Erro na base de dados ao inserir o utilizador da aplicação OAuth."
 
@@ -711,14 +701,14 @@ msgstr "Permitir ou negar acesso"
 
 #. TRANS: User notification of external application requesting account access.
 #. TRANS: %3$s is the access type requested (read-write or read-only), %4$s is the StatusNet sitename.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "An application would like the ability to <strong>%3$s</strong> your %4$s "
 "account data. You should only give access to your %4$s account to third "
 "parties you trust."
 msgstr ""
-"A aplicação <strong>%1$s</strong> por <strong>%2$s</strong> solicita "
-"permissão para <strong>%3$s</strong> os dados da sua conta %4$s. Só deve "
+"A aplicação <strong>%3$s</strong> por <strong>%4$s</strong> solicita "
+"permissão para <strong>%4$s</strong> os dados da sua conta %4$s. Só deve "
 "permitir acesso à sua conta %4$s a terceiros da sua confiança."
 
 #. TRANS: User notification of external application requesting account access.
@@ -735,7 +725,6 @@ msgstr ""
 "permitir acesso à sua conta %4$s a terceiros da sua confiança."
 
 #. TRANS: Fieldset legend.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "Account"
 msgstr "Conta"
@@ -762,29 +751,25 @@ msgid "Cancel"
 msgstr "Cancelar"
 
 #. TRANS: Button text that when clicked will allow access to an account by an external application.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Allow"
 msgstr "Permitir"
 
 #. TRANS: Form instructions.
-#, fuzzy
 msgid "Authorize access to your account information."
 msgstr "Permitir ou negar acesso à informação da sua conta."
 
 #. TRANS: Header for user notification after revoking OAuth access to an application.
-#, fuzzy
 msgid "Authorization canceled."
 msgstr "Confirmação do mensageiro instantâneo cancelada."
 
 #. TRANS: User notification after revoking OAuth access to an application.
 #. TRANS: %s is an OAuth token.
-#, fuzzy, php-format
+#, php-format
 msgid "The request token %s has been revoked."
 msgstr "A chave de pedido %s foi negada e retirada."
 
 #. TRANS: Title of the page notifying the user that an anonymous client application was successfully authorized to access the user's account with OAuth.
-#, fuzzy
 msgid "You have successfully authorized the application"
 msgstr "Não tem autorização."
 
@@ -796,9 +781,9 @@ msgstr ""
 
 #. TRANS: Title of the page notifying the user that the client application was successfully authorized to access the user's account with OAuth.
 #. TRANS: %s is the authorised application name.
-#, fuzzy, php-format
+#, php-format
 msgid "You have successfully authorized %s"
-msgstr "Não tem autorização."
+msgstr "Não tem autorização %s"
 
 #. TRANS: Message notifying the user that the client application was successfully authorized to access the user's account with OAuth.
 #. TRANS: %s is the authorised application name.
@@ -840,15 +825,14 @@ msgstr "Já repetiu essa nota."
 #. TRANS: Client exception thrown when using an unsupported HTTP method.
 #. TRANS: Client error shown when using a non-supported HTTP method.
 #. TRANS: Client exception thrown when using an unsupported HTTP method.
-#, fuzzy
 msgid "HTTP method not supported."
 msgstr "Método da API não encontrado."
 
 #. 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 "Formato não suportado."
+msgstr "Formato não suportado: %s."
 
 #. TRANS: Client error displayed requesting a deleted status.
 msgid "Status deleted."
@@ -864,14 +848,13 @@ msgstr ""
 
 #. TRANS: Client error displayed when a user has no rights to delete notices of other users.
 #. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
-#, fuzzy
 msgid "Cannot delete this notice."
 msgstr "Nota não pode ser apagada."
 
 #. TRANS: Confirmation of notice deletion in API. %d is the ID (number) of the deleted notice.
-#, fuzzy, php-format
+#, php-format
 msgid "Deleted notice %d"
-msgstr "Apagar nota"
+msgstr "Apagar nota %d"
 
 #. TRANS: Client error displayed when the parameter "status" is missing.
 msgid "Client must provide a 'status' parameter with a value."
@@ -879,20 +862,19 @@ msgstr "O cliente tem de fornecer um parâmetro 'status' com um valor."
 
 #. TRANS: Client error displayed when the parameter "status" is missing.
 #. TRANS: %d is the maximum number of character for a notice.
-#, fuzzy, php-format
+#, php-format
 msgid "That's too long. Maximum notice size is %d character."
 msgid_plural "That's too long. Maximum notice size is %d characters."
 msgstr[0] "Demasiado longo. Tamanho máx. das notas é %d caracteres."
 msgstr[1] "Demasiado longo. Tamanho máx. das notas é %d caracteres."
 
 #. TRANS: Client error displayed when replying to a non-existing notice.
-#, fuzzy
 msgid "Parent notice not found."
 msgstr "Método da API não encontrado."
 
 #. TRANS: Client error displayed exceeding the maximum notice length.
 #. TRANS: %d is the maximum lenth for a notice.
-#, fuzzy, php-format
+#, php-format
 msgid "Maximum notice size is %d character, including attachment URL."
 msgid_plural "Maximum notice size is %d characters, including attachment URL."
 msgstr[0] "Tamanho máx. das notas é %d caracteres, incluindo a URL do anexo."
@@ -912,9 +894,9 @@ msgstr "%1$s / Favoritas de %2$s"
 #. TRANS: Subtitle for timeline of most recent favourite notices by a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user's full name,
 #. TRANS: %3$s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s updates favorited by %2$s / %3$s."
-msgstr "%1$s actualizações preferidas por %2$s / %2$s."
+msgstr "%1$s actualizações preferidas por %2$s / %3$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.
@@ -941,7 +923,6 @@ msgid "%s updates from everyone!"
 msgstr "%s actualizações de todos!"
 
 #. TRANS: Server error displayed calling unimplemented API method for 'retweeted by me'.
-#, fuzzy
 msgid "Unimplemented."
 msgstr "Método não implementado."
 
@@ -950,7 +931,7 @@ msgstr "Método não implementado."
 msgid "Repeated to %s"
 msgstr "Repetida para %s"
 
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s notices that were to repeated to %2$s / %3$s."
 msgstr "%1$s actualizações em resposta a actualizações de %2$s / %3$s."
 
@@ -960,9 +941,9 @@ msgstr "%1$s actualizações em resposta a actualizações de %2$s / %3$s."
 msgid "Repeats of %s"
 msgstr "Repetições de %s"
 
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s notices that %2$s / %3$s has repeated."
-msgstr "%s (@%s) adicionou a sua nota às favoritas."
+msgstr "%1$s avisos que %2$s / %3$s repetiu."
 
 #. TRANS: Title for timeline with lastest notices with a given tag.
 #. TRANS: %s is the tag.
@@ -979,7 +960,6 @@ msgid "Updates tagged with %1$s on %2$s!"
 msgstr "Actualizações categorizadas com %1$s em %2$s!"
 
 #. TRANS: Client error displayed trying to add a notice to another user's timeline.
-#, fuzzy
 msgid "Only the user can add to their own timeline."
 msgstr "Só o próprio utilizador pode ler a sua caixa de correio."
 
@@ -1011,24 +991,23 @@ msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
 #. TRANS: %d is the notice ID (number).
-#, fuzzy, php-format
+#, php-format
 msgid "No content for notice %d."
-msgstr "Procurar no conteúdo das notas"
+msgstr "Nenhum conteúdo para a notícia %d."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
 #. TRANS: %s is the notice URI.
-#, fuzzy, php-format
+#, php-format
 msgid "Notice with URI \"%s\" already exists."
-msgstr "Não existe nenhuma nota com essa identificação."
+msgstr "Notícia com URI \"%s\" já existe."
 
 #. TRANS: Server error for unfinished API method showTrends.
 msgid "API method under construction."
 msgstr "Método da API em desenvolvimento."
 
 #. TRANS: Client error displayed when requesting user information for a non-existing user.
-#, fuzzy
 msgid "User not found."
-msgstr "Método da API não encontrado."
+msgstr "Utilizador não encontrado."
 
 #. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
 #. TRANS: Client exception.
@@ -1038,80 +1017,69 @@ msgstr "Perfil não foi encontrado."
 
 #. TRANS: Subtitle for Atom favorites feed.
 #. TRANS: %1$s is a user nickname, %2$s is the StatusNet sitename.
-#, fuzzy, php-format
+#, php-format
 msgid "Notices %1$s has favorited on %2$s"
-msgstr "Actualizações de %1$s e amigos no %2$s!"
+msgstr "Actualizações de %1$s têm favoritos em %2$s"
 
 #. TRANS: Client exception thrown when trying to set a favorite for another user.
 #. TRANS: Client exception thrown when trying to subscribe another user.
-#, fuzzy
 msgid "Cannot add someone else's subscription."
-msgstr "Não foi possível inserir nova subscrição."
+msgstr "Não é possível adicionar uma subscrição de outra pessoa."
 
 #. TRANS: Client exception thrown when trying use an incorrect activity verb for the Atom pub method.
-#, fuzzy
 msgid "Can only handle favorite activities."
-msgstr "Procurar no conteúdo das notas"
+msgstr "Só podes lidar com as tuas actividades favoritas."
 
 #. TRANS: Client exception thrown when trying favorite an object that is not a notice.
-#, fuzzy
 msgid "Can only fave notices."
-msgstr "Procurar no conteúdo das notas"
+msgstr "Só pode por actualizações nos favoritos."
 
 #. TRANS: Client exception thrown when trying favorite a notice without content.
-#, fuzzy
 msgid "Unknown note."
-msgstr "Desconhecida"
+msgstr "Nota desconhecida."
 
 #. TRANS: Client exception thrown when trying favorite an already favorited notice.
-#, fuzzy
 msgid "Already a favorite."
-msgstr "Adicionar às favoritas"
+msgstr "Já nos favoritos"
 
 #. TRANS: Title for group membership feed.
 #. TRANS: %s is a username.
-#, fuzzy, php-format
+#, php-format
 msgid "%s group memberships"
-msgstr "Membros do grupo %s"
+msgstr "%s membros do grupo"
 
 #. TRANS: Subtitle for group membership feed.
 #. TRANS: %1$s is a username, %2$s is the StatusNet sitename.
-#, fuzzy, php-format
+#, php-format
 msgid "Groups %1$s is a member of on %2$s"
-msgstr "Grupos de que %s é membro"
+msgstr "Os grupos %1$s são membros em %2$s"
 
 #. TRANS: Client exception thrown when trying subscribe someone else to a group.
-#, fuzzy
 msgid "Cannot add someone else's membership."
-msgstr "Não foi possível inserir nova subscrição."
+msgstr "Não é possível adicionar alguém já subscrito."
 
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#, fuzzy
 msgid "Can only handle join activities."
-msgstr "Procurar no conteúdo das notas"
+msgstr "Só podes tratar de participar nas atividades."
 
 #. TRANS: Client exception thrown when trying to subscribe to a non-existing group.
-#, fuzzy
 msgid "Unknown group."
-msgstr "Desconhecida"
+msgstr "Grupo desconhecido."
 
 #. TRANS: Client exception thrown when trying to subscribe to an already subscribed group.
-#, fuzzy
 msgid "Already a member."
-msgstr "Todos os membros"
+msgstr "Já és um membro."
 
 #. TRANS: Client exception thrown when trying to subscribe to group while blocked from that group.
 msgid "Blocked by admin."
-msgstr ""
+msgstr "Bloqueado pelos administradores."
 
 #. TRANS: Client exception thrown when referencing a non-existing favorite.
-#, fuzzy
 msgid "No such favorite."
-msgstr "Ficheiro não foi encontrado."
+msgstr "Nenhum favorito encontrado."
 
 #. TRANS: Client exception thrown when trying to remove a favorite notice of another user.
-#, fuzzy
 msgid "Cannot delete someone else's favorite."
 msgstr "Não foi possível eliminar o favorito."
 
@@ -1146,26 +1114,24 @@ msgid "No such group."
 msgstr "Grupo não foi encontrado."
 
 #. TRANS: Client exception thrown when trying to show membership of a non-subscribed group
-#, fuzzy
 msgid "Not a member."
-msgstr "Todos os membros"
+msgstr "Não é membro."
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
-#, fuzzy
 msgid "Cannot delete someone else's membership."
 msgstr "Não foi possível apagar a auto-subscrição."
 
 #. TRANS: Client exception thrown when trying to display a subscription for a non-existing profile ID.
 #. TRANS: %d is the non-existing profile ID number.
-#, fuzzy, php-format
+#, php-format
 msgid "No such profile id: %d."
-msgstr "Perfil não foi encontrado."
+msgstr "Nenhum ID de perfil: %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.
-#, fuzzy, php-format
+#, php-format
 msgid "Profile %1$d not subscribed to profile %2$d."
-msgstr "Não subscreveu esse perfil."
+msgstr "O perfil %1$d não subscreveu o perfil %2$d."
 
 #. TRANS: Client exception thrown when trying to delete a subscription of another user.
 #, fuzzy
@@ -1174,9 +1140,9 @@ msgstr "Não foi possível apagar a auto-subscrição."
 
 #. TRANS: Subtitle for Atom subscription feed.
 #. TRANS: %1$s is a user nickname, %s$s is the StatusNet sitename.
-#, fuzzy, php-format
+#, php-format
 msgid "People %1$s has subscribed to on %2$s"
-msgstr "Pessoas que subscrevem %s"
+msgstr "As pessoas %1$s subscreveram %2$s"
 
 #. TRANS: Client error displayed when not using the follow verb.
 msgid "Can only handle Follow activities."
@@ -1184,19 +1150,19 @@ msgstr ""
 
 #. TRANS: Client exception thrown when subscribing to an object that is not a person.
 msgid "Can only follow people."
-msgstr ""
+msgstr "Só podes seguir pessoas."
 
 #. TRANS: Client exception thrown when subscribing to a non-existing profile.
 #. TRANS: %s is the unknown profile ID.
-#, fuzzy, php-format
+#, php-format
 msgid "Unknown profile %s."
-msgstr "Tipo do ficheiro é desconhecido"
+msgstr "Tipo do ficheiro %s é desconhecido."
 
 #. TRANS: Client error displayed trying to subscribe to an already subscribed profile.
 #. TRANS: %s is the profile the user already has a subscription on.
-#, fuzzy, php-format
+#, php-format
 msgid "Already subscribed to %s."
-msgstr "Já subscrito!"
+msgstr "Já subscrito em %s."
 
 #. TRANS: Client error displayed trying to get a non-existing attachment.
 msgid "No such attachment."
@@ -1260,20 +1226,17 @@ msgstr "Antevisão"
 
 #. TRANS: Button on avatar upload page to delete current avatar.
 #. TRANS: Button text for user account deletion.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Delete"
 msgstr "Apagar"
 
 #. TRANS: Button on avatar upload page to upload an avatar.
 #. TRANS: Submit button to confirm upload of a user backup file for account restore.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Upload"
 msgstr "Carregar"
 
 #. TRANS: Button on avatar upload crop form to confirm a selected crop as avatar.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Crop"
 msgstr "Cortar"
@@ -1283,9 +1246,8 @@ msgid "No file uploaded."
 msgstr "Não foi carregado nenhum ficheiro."
 
 #. TRANS: Avatar upload form instruction after uploading a file.
-#, fuzzy
 msgid "Pick a square area of the image to be your avatar."
-msgstr "Escolha uma área quadrada da imagem para ser o seu avatar"
+msgstr "Escolhe uma área quadrada da imagem para ser o teu avatar."
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
 #. TRANS: Server error displayed trying to crop an uploaded group logo that is no longer present.
@@ -1307,12 +1269,11 @@ msgstr "Avatar apagado."
 #. TRANS: Title for backup account page.
 #. TRANS: Option in profile settings to create a backup of the account of the currently logged in user.
 msgid "Backup account"
-msgstr ""
+msgstr "Backup da conta"
 
 #. TRANS: Client exception thrown when trying to backup an account while not logged in.
-#, fuzzy
 msgid "Only logged-in users can backup their account."
-msgstr "Só utilizadores com sessão iniciada podem repetir notas."
+msgstr "Somente utilizadores registados podem fazer o backup da sua conta."
 
 #. TRANS: Client exception thrown when trying to backup an account without having backup rights.
 msgid "You may not backup your account."
@@ -1328,14 +1289,13 @@ msgid ""
 msgstr ""
 
 #. TRANS: Submit button to backup an account on the backup account page.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Backup"
-msgstr "Fundo"
+msgstr "Backup"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
 msgid "Backup your account."
-msgstr ""
+msgstr "Backup da tua conta."
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
 msgid "You already blocked that user."
@@ -1368,9 +1328,8 @@ msgid "No"
 msgstr "Não"
 
 #. TRANS: Submit button title for 'No' when blocking a user.
-#, fuzzy
 msgid "Do not block this user."
-msgstr "Não bloquear este utilizador"
+msgstr "Não bloquear este utilizador."
 
 #. TRANS: Button label on the user block form.
 #. TRANS: Button label on the delete application form.
@@ -1383,9 +1342,8 @@ msgid "Yes"
 msgstr "Sim"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#, fuzzy
 msgid "Block this user."
-msgstr "Bloquear este utilizador"
+msgstr "Bloquear este utilizador."
 
 #. TRANS: Server error displayed when blocking a user fails.
 msgid "Failed to save block information."
@@ -1412,7 +1370,6 @@ msgid "Unblock user from group"
 msgstr "Desbloquear utilizador do grupo"
 
 #. TRANS: Button text for unblocking a user from a group.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Unblock"
 msgstr "Desbloquear"
@@ -1452,19 +1409,16 @@ msgstr "Esse endereço já tinha sido confirmado."
 msgid "Couldn't update user."
 msgstr "Não foi possível actualizar o utilizador."
 
-#, fuzzy
 msgid "Couldn't update user im preferences."
-msgstr "Não foi possível actualizar o registo do utilizador."
+msgstr "Não foi possível actualizar as preferências do utilizador."
 
-#, fuzzy
 msgid "Couldn't insert user im preferences."
-msgstr "Não foi possível inserir nova subscrição."
+msgstr "Não foi possível inserir as preferências do utilizador."
 
 #. TRANS: Server error displayed when an address confirmation code deletion from the
 #. TRANS: database fails in the contact address confirmation action.
-#, fuzzy
 msgid "Could not delete address confirmation."
-msgstr "Não foi possível apagar a confirmação do mensageiro instantâneo."
+msgstr "Não foi possível excluir a confirmação do endereço."
 
 #. TRANS: Title for the contact address confirmation action.
 msgid "Confirm address"
@@ -1486,41 +1440,39 @@ msgid "Notices"
 msgstr "Notas"
 
 #. TRANS: Client exception displayed trying to delete a user account while not logged in.
-#, fuzzy
 msgid "Only logged-in users can delete their account."
-msgstr "Só utilizadores com sessão iniciada podem repetir notas."
+msgstr "Apenas utilizadores conectados podem apagar a sua conta."
 
 #. TRANS: Client exception displayed trying to delete a user account without have the rights to do that.
-#, fuzzy
 msgid "You cannot delete your account."
-msgstr "Não pode apagar utilizadores."
+msgstr "Não podes apagar a tua conta."
 
 #. TRANS: Confirmation text for user deletion. The user has to type this exactly the same, including punctuation.
 msgid "I am sure."
-msgstr ""
+msgstr "Eu tenho certeza."
 
 #. TRANS: Notification for user about the text that must be input to be able to delete a user account.
 #. TRANS: %s is the text that needs to be input.
 #, php-format
 msgid "You must write \"%s\" exactly in the box."
-msgstr ""
+msgstr "Deves escrever exactamente \"%s\" na caixa."
 
 #. TRANS: Confirmation that a user account has been deleted.
-#, fuzzy
 msgid "Account deleted."
-msgstr "Avatar apagado."
+msgstr "Conta apagada."
 
 #. TRANS: Page title for page on which a user account can be deleted.
 #. TRANS: Option in profile settings to delete the account of the currently logged in user.
-#, fuzzy
 msgid "Delete account"
-msgstr "Criar uma conta"
+msgstr "Apagar conta"
 
 #. TRANS: Form text for user deletion form.
 msgid ""
 "This will <strong>permanently delete</strong> your account data from this "
 "server."
 msgstr ""
+"Isso <strong>vai apagar</strong> os dados da tua conta a partir deste "
+"servidor."
 
 #. TRANS: Additional form text for user deletion form shown if a user has account backup rights.
 #. TRANS: %s is a URL to the backup page.
@@ -1529,6 +1481,7 @@ msgid ""
 "You are strongly advised to <a href=\"%s\">back up your data</a> before "
 "deletion."
 msgstr ""
+"Aconselhamos a <a href=\"%s\">fazer backup dos dados</a> antes de apagares."
 
 #. TRANS: Field label for delete account confirmation entry.
 #. TRANS: Field label for password reset form where the password has to be typed again.
@@ -1537,14 +1490,13 @@ msgstr "Confirmação"
 
 #. TRANS: Input title for the delete account field.
 #. TRANS: %s is the text that needs to be input.
-#, fuzzy, php-format
+#, php-format
 msgid "Enter \"%s\" to confirm that you want to delete your account."
-msgstr "Não pode apagar utilizadores."
+msgstr "Coloca \"%s\" para confirmar que desejas apagar a tua conta."
 
 #. TRANS: Button title for user account deletion.
-#, fuzzy
 msgid "Permanently delete your account"
-msgstr "Não pode apagar utilizadores."
+msgstr "Apagar permanentemente a tua conta"
 
 #. TRANS: Client error displayed trying to delete an application while not logged in.
 msgid "You must be logged in to delete an application."
@@ -1579,19 +1531,16 @@ msgstr ""
 "utilizadores em existência."
 
 #. TRANS: Submit button title for 'No' when deleting an application.
-#, fuzzy
 msgid "Do not delete this application."
-msgstr "Não apagar esta aplicação"
+msgstr "Não apagues essa aplicação."
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
-#, fuzzy
 msgid "Delete this application."
-msgstr "Apagar esta aplicação"
+msgstr "Apagar esta aplicação."
 
 #. TRANS: Client error when trying to delete group while not logged in.
-#, fuzzy
 msgid "You must be logged in to delete a group."
-msgstr "Tem de iniciar uma sessão para deixar um grupo."
+msgstr "Precisas estar logado para excluir um grupo."
 
 #. TRANS: Client error when trying to delete a group without providing a nickname or ID for the group.
 #. TRANS: Client error displayed when trying to join a group without providing a group name or group ID.
@@ -1600,47 +1549,43 @@ msgid "No nickname or ID."
 msgstr "Nenhum utilizador ou ID."
 
 #. TRANS: Client error when trying to delete a group without having the rights to delete it.
-#, fuzzy
 msgid "You are not allowed to delete this group."
-msgstr "Não é membro deste grupo."
+msgstr "Não tens permissão para apagar este grupo."
 
 #. TRANS: Server error displayed if a group could not be deleted.
 #. TRANS: %s is the name of the group that could not be deleted.
-#, fuzzy, php-format
+#, php-format
 msgid "Could not delete group %s."
-msgstr "Não foi possível actualizar o grupo."
+msgstr "Não foi possível apagar o grupo %s."
 
 #. TRANS: Message given after deleting a group.
 #. TRANS: %s is the deleted group's name.
-#, fuzzy, php-format
+#, php-format
 msgid "Deleted group %s"
-msgstr "%1$s deixou o grupo %2$s"
+msgstr "Grupo %s apagado"
 
 #. TRANS: Title of delete group page.
 #. TRANS: Form legend for deleting a group.
-#, fuzzy
 msgid "Delete group"
-msgstr "Apagar utilizador"
+msgstr "Apagar grupo"
 
 #. TRANS: Warning in form for deleleting a group.
-#, fuzzy
 msgid ""
 "Are you sure you want to delete this group? This will clear all data about "
 "the group from the database, without a backup. Public posts to this group "
 "will still appear in individual timelines."
 msgstr ""
-"Tem a certeza de que quer apagar este utilizador? Todos os dados do "
-"utilizador serão eliminados da base de dados, sem haver cópias."
+"Tens certeza de que desejas apagar este grupo? Isto irá limpar todos os "
+"dados sobre o grupo do banco de dados sem um backup. Postagens públicas "
+"deste grupo ainda vão aparecer em cronogramas individuais."
 
 #. TRANS: Submit button title for 'No' when deleting a group.
-#, fuzzy
 msgid "Do not delete this group."
-msgstr "Não apagar esta nota"
+msgstr "Não apagues este grupo."
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
-#, fuzzy
 msgid "Delete this group."
-msgstr "Apagar este utilizador"
+msgstr "Apagar este grupo."
 
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
 #. TRANS: Client error displayed when trying to remove a favorite while not logged in.
@@ -1677,14 +1622,12 @@ msgid "Are you sure you want to delete this notice?"
 msgstr "Tem a certeza de que quer apagar esta nota?"
 
 #. TRANS: Submit button title for 'No' when deleting a notice.
-#, fuzzy
 msgid "Do not delete this notice."
-msgstr "Não apagar esta nota"
+msgstr "Não apagues esta nota."
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#, fuzzy
 msgid "Delete this notice."
-msgstr "Apagar esta nota"
+msgstr "Apagar esta nota."
 
 #. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
 msgid "You cannot delete users."
@@ -1695,7 +1638,6 @@ msgid "You can only delete local users."
 msgstr "Só pode apagar utilizadores locais."
 
 #. TRANS: Title of delete user page.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Delete user"
 msgstr "Apagar utilizador"
@@ -1713,14 +1655,12 @@ msgstr ""
 "utilizador serão eliminados da base de dados, sem haver cópias."
 
 #. TRANS: Submit button title for 'No' when deleting a user.
-#, fuzzy
 msgid "Do not delete this user."
-msgstr "Não apagar esta nota"
+msgstr "Não apagues este utilizador."
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
-#, fuzzy
 msgid "Delete this user."
-msgstr "Apagar este utilizador"
+msgstr "Apagar este utilizador."
 
 #. TRANS: Message used as title for design settings for the site.
 msgid "Design"
@@ -1735,9 +1675,8 @@ msgid "Invalid logo URL."
 msgstr "URL do logotipo inválida."
 
 #. TRANS: Client error displayed when an SSL logo URL is invalid.
-#, fuzzy
 msgid "Invalid SSL logo URL."
-msgstr "URL do logotipo inválida."
+msgstr "URL SSL do logotipo inválido."
 
 #. TRANS: Client error displayed when a theme is submitted through the form that is not in the theme list.
 #. TRANS: %s is the chosen unavailable theme.
@@ -1754,9 +1693,8 @@ msgid "Site logo"
 msgstr "Logotipo do site"
 
 #. TRANS: Field label for SSL StatusNet site logo.
-#, fuzzy
 msgid "SSL logo"
-msgstr "Logotipo do site"
+msgstr "Logótipo SSL"
 
 #. TRANS: Fieldset legend for form change StatusNet site's theme.
 msgid "Change theme"
@@ -1819,7 +1757,6 @@ msgid "Tile background image"
 msgstr "Repetir imagem de fundo em mosaico"
 
 #. TRANS: Fieldset legend for theme colors.
-#, fuzzy
 msgid "Change colors"
 msgstr "Alterar cores"
 
@@ -1852,25 +1789,21 @@ msgid "Custom CSS"
 msgstr "CSS personalizado"
 
 #. TRANS: Button text for resetting theme settings.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Use defaults"
-msgstr "Usar predefinições"
+msgstr "Usar padrão"
 
 #. TRANS: Title for button for resetting theme settings.
-#, fuzzy
 msgid "Restore default designs."
-msgstr "Repor estilos predefinidos"
+msgstr "Restaurar designs padrão."
 
 #. TRANS: Title for button for resetting theme settings.
-#, fuzzy
 msgid "Reset back to default."
-msgstr "Repor predefinição"
+msgstr "Repor para o padrão."
 
 #. TRANS: Title for button for saving theme settings.
-#, fuzzy
 msgid "Save design."
-msgstr "Gravar o estilo"
+msgstr "Salvar o design."
 
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
 msgid "This notice is not a favorite!"
@@ -1882,9 +1815,9 @@ msgstr "Adicionar às favoritas"
 
 #. TRANS: Client exception thrown when requesting a document from the documentation that does not exist.
 #. TRANS: %s is the non-existing document.
-#, fuzzy, php-format
+#, php-format
 msgid "No such document \"%s\"."
-msgstr "Documento \"%s\" não foi encontrado"
+msgstr "Documento \"%s\" não foi encontrado."
 
 #. TRANS: Title for "Edit application" form.
 #. TRANS: Form legend.
@@ -1910,7 +1843,6 @@ msgstr "Nome é obrigatório."
 
 #. 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 "Nome é demasiado longo (máx. 255 caracteres)."
 
@@ -2180,7 +2112,6 @@ msgstr "Sem endereço electrónico de entrada."
 #. 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 "Não foi possível actualizar o registo do utilizador."
 
@@ -2199,9 +2130,8 @@ msgid "This notice is already a favorite!"
 msgstr "Esta nota já é uma favorita!"
 
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
-#, fuzzy
 msgid "Disfavor favorite."
-msgstr "Retirar das favoritas"
+msgstr "Retirar dos favoritos."
 
 #. TRANS: Page title for first page of favorited notices.
 #. TRANS: Title for favourited notices section.
@@ -2501,7 +2431,7 @@ msgstr "Bloquear"
 #. TRANS: Submit button title.
 msgctxt "TOOLTIP"
 msgid "Block this user"
-msgstr ""
+msgstr "Bloquear este utilizador"
 
 #. TRANS: Form legend for form to make a user a group admin.
 msgid "Make user an admin of the group"
@@ -2523,14 +2453,13 @@ msgid "Updates from members of %1$s on %2$s!"
 msgstr "Actualizações dos membros de %1$s em %2$s!"
 
 #. TRANS: Title for first page of the groups list.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Groups"
 msgstr "Grupos"
 
 #. TRANS: Title for all but the first page of the groups list.
 #. TRANS: %d is the page number.
-#, fuzzy, php-format
+#, php-format
 msgctxt "TITLE"
 msgid "Groups, page %d"
 msgstr "Grupos, página %d"
@@ -2650,14 +2579,12 @@ msgid "%s screenname."
 msgstr ""
 
 #. TRANS: Header for IM preferences form.
-#, fuzzy
 msgid "IM Preferences"
-msgstr "Preferências de MI"
+msgstr "Preferências IM"
 
 #. TRANS: Checkbox label in IM preferences form.
-#, fuzzy
 msgid "Send me notices"
-msgstr "Enviar uma nota"
+msgstr "Enviar-me avisos"
 
 #. TRANS: Checkbox label in IM preferences form.
 #, fuzzy
@@ -2689,9 +2616,8 @@ msgstr "Preferências gravadas."
 msgid "No screenname."
 msgstr "Nome de utilizador não definido."
 
-#, fuzzy
 msgid "No transport."
-msgstr "Sem nota."
+msgstr "Sem transporte."
 
 #. TRANS: Message given saving IM address that cannot be normalised.
 #, fuzzy
@@ -2780,7 +2706,6 @@ msgid "Invalid email address: %s."
 msgstr "Endereço electrónico inválido: %s"
 
 #. TRANS: Page title when invitations have been sent.
-#, fuzzy
 msgid "Invitations sent"
 msgstr "Convite(s) enviado(s)"
 
@@ -2792,15 +2717,14 @@ msgstr "Convidar novos utilizadores"
 #. TRANS: is already subscribed to one or more users with the given e-mail address(es).
 #. TRANS: Plural form is based on the number of reported already subscribed e-mail addresses.
 #. TRANS: Followed by a bullet list.
-#, fuzzy
 msgid "You are already subscribed to this user:"
 msgid_plural "You are already subscribed to these users:"
 msgstr[0] "Já subscreveu estes utilizadores:"
-msgstr[1] "Já subscreveu estes utilizadores:"
+msgstr[1] "Já subscreves-te a estes utilizadores:"
 
 #. TRANS: Used as list item for already subscribed users (%1$s is nickname, %2$s is e-mail address).
 #. TRANS: Used as list item for already registered people (%1$s is nickname, %2$s is e-mail address).
-#, fuzzy, php-format
+#, php-format
 msgctxt "INVITE"
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
@@ -2936,7 +2860,7 @@ msgid "You must be logged in to join a group."
 msgstr "Tem de iniciar uma sessão para se juntar a um grupo."
 
 #. TRANS: Title for join group page after joining.
-#, fuzzy, php-format
+#, php-format
 msgctxt "TITLE"
 msgid "%1$s joined group %2$s"
 msgstr "%1$s juntou-se ao grupo %2$s"
@@ -2951,7 +2875,7 @@ msgid "You are not a member of that group."
 msgstr "Não é um membro desse grupo."
 
 #. TRANS: Title for leave group page after leaving.
-#, fuzzy, php-format
+#, php-format
 msgctxt "TITLE"
 msgid "%1$s left group %2$s"
 msgstr "%1$s deixou o grupo %2$s"
@@ -2959,7 +2883,7 @@ msgstr "%1$s deixou o grupo %2$s"
 #. TRANS: User admin panel title
 msgctxt "TITLE"
 msgid "License"
-msgstr ""
+msgstr "Licença"
 
 #. TRANS: Form instructions for the site license admin panel.
 msgid "License for this StatusNet site"
@@ -3006,7 +2930,7 @@ msgstr "Privado"
 
 #. TRANS: License option in the license admin panel.
 msgid "All Rights Reserved"
-msgstr ""
+msgstr "Todos os Direitos Reservados"
 
 #. TRANS: License option in the license admin panel.
 msgid "Creative Commons"
@@ -3014,20 +2938,19 @@ msgstr ""
 
 #. TRANS: Dropdown field label in the license admin panel.
 msgid "Type"
-msgstr ""
+msgstr "Tipo"
 
 #. TRANS: Dropdown field instructions in the license admin panel.
-#, fuzzy
 msgid "Select a license."
-msgstr "Seleccione um operador"
+msgstr "Selecciona uma licença."
 
 #. TRANS: Form legend in the license admin panel.
 msgid "License details"
-msgstr ""
+msgstr "Detalhes da licença"
 
 #. TRANS: Field label in the license admin panel.
 msgid "Owner"
-msgstr ""
+msgstr "Proprietário"
 
 #. TRANS: Field title in the license admin panel.
 msgid "Name of the owner of the site's content (if applicable)."
@@ -3035,7 +2958,7 @@ msgstr ""
 
 #. TRANS: Field label in the license admin panel.
 msgid "License Title"
-msgstr ""
+msgstr "Título da Licença"
 
 #. TRANS: Field title in the license admin panel.
 msgid "The title of the license."
@@ -3095,10 +3018,9 @@ msgstr ""
 "partilhados!"
 
 #. TRANS: Button text for log in on login page.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Login"
-msgstr "Entrar"
+msgstr "Iniciar sessão"
 
 #. TRANS: Link text for link to "reset password" on login page.
 msgid "Lost or forgotten password?"
@@ -3154,7 +3076,7 @@ msgstr "Sem estado actual."
 #. TRANS: This is the title of the form for adding a new application.
 #, fuzzy
 msgid "New application"
-msgstr "Aplicação Nova"
+msgstr "Nova aplicação"
 
 #. TRANS: Client error displayed trying to add a new application while not logged in.
 msgid "You must be logged in to register an application."
@@ -3285,9 +3207,9 @@ msgstr "Actualizações com \"%s\""
 
 #. TRANS: RSS notice search feed description.
 #. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#, fuzzy, php-format
+#, php-format
 msgid "Updates matching search term \"%1$s\" on %2$s."
-msgstr "Actualizações que contêm o termo \"%1$s\" em %2$s!"
+msgstr "Actualizações que contêm o termo \"%1$s\" em %2$s."
 
 #. TRANS: Client error displayed trying to nudge a user that cannot be nudged.
 #, fuzzy
@@ -3337,9 +3259,9 @@ msgstr "Não é utilizador dessa aplicação."
 
 #. TRANS: Client error when revoking access has failed for some reason.
 #. TRANS: %s is the application ID revoking access failed for.
-#, fuzzy, php-format
+#, php-format
 msgid "Unable to revoke access for application: %s."
-msgstr "Não foi possível retirar acesso da aplicação: %s"
+msgstr "Não foi possível retirar acesso da aplicação: %s."
 
 #. TRANS: Success message after revoking access for an application.
 #. TRANS: %1$s is the application name, %2$s is the first part of the user token.
@@ -3471,14 +3393,12 @@ msgstr "Antiga"
 msgid "New password"
 msgstr "Nova"
 
-#, fuzzy
 msgid "6 or more characters."
-msgstr "6 ou mais caracteres"
+msgstr "6 ou mais caracteres."
 
 #. TRANS: Ttile for field label for password reset form where the password has to be typed again.
-#, fuzzy
 msgid "Same as password above."
-msgstr "Repita a senha nova"
+msgstr "Repita a nova senha."
 
 msgid "Change"
 msgstr "Modificar"
@@ -3496,9 +3416,8 @@ msgid "Error saving user; invalid."
 msgstr "Erro ao guardar utilizador; inválido."
 
 #. TRANS: Reset password form validation error message.
-#, fuzzy
 msgid "Cannot save new password."
-msgstr "Não é possível guardar a nova senha."
+msgstr "Não é possível salvar a nova senha."
 
 msgid "Password saved."
 msgstr "Senha gravada."
@@ -3556,14 +3475,12 @@ msgstr "Nome do servidor do site."
 msgid "Path"
 msgstr "Localização"
 
-#, fuzzy
 msgid "Site path."
-msgstr "Localização do site"
+msgstr "Localização do site."
 
 #. TRANS: Field label in Paths admin panel.
-#, fuzzy
 msgid "Locale directory"
-msgstr "Directório do tema"
+msgstr "Directório local"
 
 #, fuzzy
 msgid "Directory path to locales."
@@ -3580,9 +3497,8 @@ msgid "Theme"
 msgstr "Tema"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#, fuzzy
 msgid "Server for themes."
-msgstr "O tema para o site."
+msgstr "Servidor para temas."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
 msgid "Web path to themes."
@@ -3597,9 +3513,8 @@ msgid "SSL server for themes (default: SSL server)."
 msgstr ""
 
 #. TRANS: Field label in Paths admin panel.
-#, fuzzy
 msgid "SSL path"
-msgstr "Localização do site"
+msgstr "Localização SSL"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
 msgid "SSL path to themes (default: /theme/)."
@@ -3633,9 +3548,8 @@ msgid "Avatar path"
 msgstr "Localização do avatar"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#, fuzzy
 msgid "Web path to avatars."
-msgstr "Falha ao actualizar avatar."
+msgstr "Localização dos avatares na Web."
 
 #. TRANS: Field label in Paths admin panel.
 msgid "Avatar directory"
@@ -3651,9 +3565,8 @@ msgid "Backgrounds"
 msgstr "Fundos"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#, fuzzy
 msgid "Server for backgrounds."
-msgstr "O tema para o site."
+msgstr "Servidor para os fundos."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
 msgid "Web path to backgrounds."
@@ -3687,9 +3600,8 @@ msgid "Web path to attachments."
 msgstr "Sem anexos."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#, fuzzy
 msgid "Server for attachments on SSL pages."
-msgstr "O tema para o site."
+msgstr "Servidor para anexos nas páginas SSL."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
 msgid "Web path to attachments on SSL pages."
@@ -3759,7 +3671,7 @@ msgstr "Utilizadores auto-categorizados com %1$s - página %2$d"
 #. TRANS: Page title for AJAX form return when a disabling a plugin.
 msgctxt "plugin"
 msgid "Disabled"
-msgstr ""
+msgstr "Desabilitado"
 
 #. TRANS: Client error displayed trying to perform any request method other than POST.
 #. TRANS: Do not translate POST.
@@ -3777,7 +3689,7 @@ msgstr "Página não foi encontrada."
 #. TRANS: Page title for AJAX form return when enabling a plugin.
 msgctxt "plugin"
 msgid "Enabled"
-msgstr ""
+msgstr "Habilitado"
 
 #. TRANS: Tab and title for plugins admin panel.
 #. TRANS: Menu item for site administration
@@ -3792,9 +3704,8 @@ msgid ""
 msgstr ""
 
 #. TRANS: Admin form section header
-#, fuzzy
 msgid "Default plugins"
-msgstr "Língua, por omissão"
+msgstr "Plugins padrão"
 
 msgid ""
 "All default plugins have been disabled from the site's configuration file."
@@ -3890,9 +3801,8 @@ msgid "Language"
 msgstr "Língua"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#, fuzzy
 msgid "Preferred language."
-msgstr "Língua preferida"
+msgstr "Língua preferida."
 
 #. TRANS: Dropdownlist label in form for profile settings.
 msgid "Timezone"
@@ -4024,7 +3934,7 @@ msgstr ""
 #. TRANS: Public RSS feed description. %s is the StatusNet site name.
 #, fuzzy, php-format
 msgid "%s updates from everyone."
-msgstr "%s actualizações de todos!"
+msgstr "%s actualizações de todos."
 
 #. TRANS: Title for public tag cloud.
 msgid "Public tag cloud"
@@ -4120,7 +4030,6 @@ msgid "Recover"
 msgstr "Recuperar"
 
 #. TRANS: Button text on password recovery page.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Recover"
 msgstr "Recuperar"
@@ -4139,9 +4048,8 @@ msgid "Password recovery requested"
 msgstr "Solicitada recuperação da senha"
 
 #. TRANS: Title for password recovery page in password saved mode.
-#, fuzzy
 msgid "Password saved"
-msgstr "Senha gravada."
+msgstr "Senha gravada"
 
 #. TRANS: Title for password recovery page when an unknown action has been specified.
 msgid "Unknown action"
@@ -4209,9 +4117,9 @@ msgstr "A senha nova foi gravada com sucesso. Iniciou uma sessão."
 msgid "No id parameter"
 msgstr "Argumento de identificação (ID) em falta."
 
-#, fuzzy, php-format
+#, php-format
 msgid "No such file \"%d\""
-msgstr "Ficheiro não foi encontrado."
+msgstr "O ficheiro \"%d\" não foi encontrado."
 
 msgid "Sorry, only invited people can register."
 msgstr "Desculpe, só pessoas convidadas se podem registar."
@@ -4448,9 +4356,9 @@ msgstr ""
 
 #. TRANS: RSS reply feed description.
 #. TRANS: %1$s is a user nickname, %2$s is the StatusNet site name.
-#, fuzzy, php-format
+#, php-format
 msgid "Replies to %1$s on %2$s."
-msgstr "Respostas a %1$s em %2$s!"
+msgstr "Respostas a %1$s em %2$s."
 
 #. TRANS: Client exception displayed when trying to restore an account while not logged in.
 #, fuzzy
@@ -4464,9 +4372,8 @@ msgstr "Ainda não registou nenhuma aplicação."
 
 #. TRANS: Client exception displayed trying to restore an account while something went wrong uploading a file.
 #. TRANS: Client exception. No file; probably just a non-AJAX submission.
-#, fuzzy
 msgid "No uploaded file."
-msgstr "Carregar ficheiro"
+msgstr "Nenhum ficheiro carregado."
 
 #. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
@@ -4727,13 +4634,11 @@ msgstr "Todos os membros"
 msgid "Statistics"
 msgstr "Estatísticas"
 
-#, fuzzy
 msgctxt "LABEL"
 msgid "Created"
 msgstr "Criado"
 
 #. TRANS: Label for member count in statistics on group page.
-#, fuzzy
 msgctxt "LABEL"
 msgid "Members"
 msgstr "Membros"
@@ -4800,9 +4705,9 @@ msgid "Notice deleted."
 msgstr "Avatar actualizado."
 
 #. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s tagged %2$s"
-msgstr "%1$s, página %2$d"
+msgstr "%1$s etiquetado como %2$s"
 
 #. TRANS: Page title showing tagged notices in one user's stream.
 #. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
@@ -5139,9 +5044,8 @@ msgstr ""
 "para %s."
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
-#, fuzzy
 msgid "No code entered."
-msgstr "Nenhum código introduzido"
+msgstr "Nenhum código introduzido."
 
 #. TRANS: Menu item for site administration
 msgid "Snapshots"
@@ -5403,12 +5307,11 @@ msgstr "Gerir várias outras opções."
 msgid " (free service)"
 msgstr " (serviço livre)"
 
-#, fuzzy
 msgid "[none]"
-msgstr "Nenhum"
+msgstr "[nenhum]"
 
 msgid "[internal]"
-msgstr ""
+msgstr "[interno]"
 
 #. TRANS: Label for dropdown with URL shortener services.
 msgid "Shorten URLs with"
@@ -5535,7 +5438,6 @@ msgstr ""
 "as notas de alguém, simplesmente clique \"Rejeitar\"."
 
 #. TRANS: Button text on Authorise Subscription page.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Accept"
 msgstr "Aceitar"
@@ -5546,7 +5448,6 @@ msgid "Subscribe to this user."
 msgstr "Subscrever este utilizador"
 
 #. TRANS: Button text on Authorise Subscription page.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Reject"
 msgstr "Rejeitar"
@@ -5663,9 +5564,8 @@ msgstr "Ver estilos para o perfil"
 msgid "Show or hide profile designs."
 msgstr "Mostrar ou esconder estilos para o perfil."
 
-#, fuzzy
 msgid "Background file"
-msgstr "Fundo"
+msgstr "Ficheiro de fundo"
 
 #. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number.
 #, php-format
@@ -6066,7 +5966,7 @@ msgstr "Página sem título"
 #. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.
 msgctxt "TOOLTIP"
 msgid "Show more"
-msgstr ""
+msgstr "Mostrar mais"
 
 #. TRANS: Inline reply form submit button: submits a reply comment.
 #, fuzzy
@@ -6076,86 +5976,11 @@ msgstr "Responder"
 
 #. TRANS: Placeholder text for inline reply form. Clicking in this box will turn it into a mini notice form.
 msgid "Write a reply..."
-msgstr ""
-
-msgid "Home"
-msgstr "Página pessoal"
+msgstr "Escrever uma resposta..."
 
 #, fuzzy
-msgid "Friends timeline"
-msgstr "Notas de %s"
-
-#, fuzzy
-msgid "Your profile"
-msgstr "Perfil do grupo"
-
-msgid "Public"
-msgstr "Público"
-
-#, fuzzy
-msgid "Everyone on this site"
-msgstr "Procurar pessoas neste site"
-
-#, fuzzy
-msgid "Settings"
-msgstr "Configurações de SMS"
-
-#, fuzzy
-msgid "Change your personal settings"
-msgstr "Modificar as suas definições de perfil"
-
-#, fuzzy
-msgid "Site configuration"
-msgstr "Configuração do utilizador"
-
-msgid "Logout"
-msgstr "Sair"
-
-msgid "Logout from the site"
-msgstr "Terminar esta sessão"
-
-msgid "Login to the site"
-msgstr "Iniciar uma sessão"
-
-msgid "Search"
-msgstr "Pesquisa"
-
-#, fuzzy
-msgid "Search the site"
-msgstr "Pesquisar site"
-
-#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-msgid "Help"
-msgstr "Ajuda"
-
-#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-msgid "About"
-msgstr "Sobre"
-
-#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-msgid "FAQ"
-msgstr "FAQ"
-
-#. TRANS: Secondary navigation menu option leading to Terms of Service.
-msgid "TOS"
-msgstr "Termos"
-
-#. TRANS: Secondary navigation menu option leading to privacy policy.
-msgid "Privacy"
-msgstr "Privacidade"
-
-#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-msgid "Source"
-msgstr "Código fonte"
-
-#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
-#. TRANS: StatusNet site, where to report bugs, ...
-msgid "Contact"
-msgstr "Contacto"
-
-#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-msgid "Badge"
-msgstr "Emblema"
+msgid "Status"
+msgstr "StatusNet"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #. TRANS: Text between [] is a link description, text between () is the link itself.
@@ -6260,9 +6085,8 @@ msgid "Remote profile is not a group!"
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to join a group the importing user is already a member of.
-#, fuzzy
 msgid "User is already a member of this group."
-msgstr "Já é membro desse grupo."
+msgstr "O utilizador já é membro deste grupo."
 
 #. TRANS: Client exception thrown when trying to import a notice by another user.
 #. TRANS: %1$s is the source URI of the notice, %2$s is the URI of the author.
@@ -6280,9 +6104,9 @@ msgstr ""
 msgid "No content for notice %s."
 msgstr "Procurar no conteúdo das notas"
 
-#, fuzzy, php-format
+#, php-format
 msgid "No such user %s."
-msgstr "Utilizador não foi encontrado."
+msgstr "Utilizador %s não foi encontrado."
 
 #. 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.
@@ -6381,12 +6205,11 @@ msgstr "Configuração dos instântaneos"
 
 #. TRANS: Menu item title/tooltip
 msgid "Set site license"
-msgstr ""
+msgstr "Conjunto de licenças do site"
 
 #. TRANS: Menu item title/tooltip
-#, fuzzy
 msgid "Plugins configuration"
-msgstr "Configuração das localizações"
+msgstr "Configuração dos plugins"
 
 #. TRANS: Client error 401.
 msgid "API resource requires read-write access, but you only have read access."
@@ -6428,16 +6251,16 @@ msgid ""
 msgstr ""
 
 #. TRANS: Exception thrown when no access token can be issued.
-#, fuzzy
 msgid "Could not issue access token."
-msgstr "Não foi possível inserir a mensagem."
+msgstr "Não foi possível emitir a ficha de acesso."
 
 msgid "Database error inserting OAuth application user."
 msgstr "Erro na base de dados ao inserir o utilizador da aplicação OAuth."
 
-#, fuzzy
 msgid "Database error updating OAuth application user."
-msgstr "Erro na base de dados ao inserir o utilizador da aplicação OAuth."
+msgstr ""
+"Erro na actualização da base de dados ao inserir o utilizador da aplicação "
+"OAuth."
 
 #. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
 msgid "Tried to revoke unknown token."
@@ -6520,7 +6343,7 @@ msgid "Cancel"
 msgstr "Cancelar"
 
 msgid " by "
-msgstr ""
+msgstr "por "
 
 #. TRANS: Application access type
 msgid "read-write"
@@ -6955,6 +6778,12 @@ msgstr "Ir para o instalador."
 msgid "Database error"
 msgstr "Erro de base de dados"
 
+msgid "Home"
+msgstr "Página pessoal"
+
+msgid "Public"
+msgstr "Público"
+
 #. TRANS: Description of form for deleting a user.
 msgid "Delete this user"
 msgstr "Apagar este utilizador"
@@ -7632,6 +7461,18 @@ msgstr ""
 "conversa com outros utilizadores. Outros podem enviar-lhe mensagens, a que "
 "só você terá acesso."
 
+msgid "Inbox"
+msgstr "Recebidas"
+
+msgid "Your incoming messages"
+msgstr "Mensagens recebidas"
+
+msgid "Outbox"
+msgstr "Enviadas"
+
+msgid "Your sent messages"
+msgstr "Mensagens enviadas"
+
 msgid "Could not parse message."
 msgstr "Não foi possível fazer a análise sintáctica da mensagem."
 
@@ -7712,6 +7553,20 @@ msgstr "Mensagem"
 msgid "from"
 msgstr "a partir de"
 
+msgid "Can't get author for activity."
+msgstr ""
+
+#, fuzzy
+msgid "Bookmark not posted to this group."
+msgstr "Não tens permissão para apagar este grupo."
+
+#, fuzzy
+msgid "Object not posted to this user."
+msgstr "Não apagues este utilizador."
+
+msgid "Don't know how to handle this kind of target."
+msgstr ""
+
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 msgid "Nickname cannot be empty."
 msgstr ""
@@ -7826,24 +7681,16 @@ msgstr "Nota duplicada."
 msgid "Couldn't insert new subscription."
 msgstr "Não foi possível inserir nova subscrição."
 
+#, fuzzy
+msgid "Your profile"
+msgstr "Perfil do grupo"
+
 msgid "Replies"
 msgstr "Respostas"
 
 msgid "Favorites"
 msgstr "Favoritas"
 
-msgid "Inbox"
-msgstr "Recebidas"
-
-msgid "Your incoming messages"
-msgstr "Mensagens recebidas"
-
-msgid "Outbox"
-msgstr "Enviadas"
-
-msgid "Your sent messages"
-msgstr "Mensagens enviadas"
-
 #. TRANS: Title for personal tag cloud section. %s is a user nickname.
 #, php-format
 msgid "Tags in %s's notices"
@@ -7867,6 +7714,32 @@ msgctxt "plugin-description"
 msgid "(Plugin descriptions unavailable when disabled.)"
 msgstr ""
 
+msgid "Settings"
+msgstr "Configurações"
+
+#, fuzzy
+msgid "Change your personal settings"
+msgstr "Modificar as suas definições de perfil"
+
+#, fuzzy
+msgid "Site configuration"
+msgstr "Configuração do utilizador"
+
+msgid "Logout"
+msgstr "Sair"
+
+msgid "Logout from the site"
+msgstr "Terminar esta sessão"
+
+msgid "Login to the site"
+msgstr "Iniciar uma sessão"
+
+msgid "Search"
+msgstr "Pesquisa"
+
+msgid "Search the site"
+msgstr "Pesquisar no site"
+
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
 msgid "Subscriptions"
@@ -7976,6 +7849,39 @@ msgstr "Procurar no conteúdo das notas"
 msgid "Find groups on this site"
 msgstr "Procurar grupos neste site"
 
+#. TRANS: Secondary navigation menu option leading to help on StatusNet.
+msgid "Help"
+msgstr "Ajuda"
+
+#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
+msgid "About"
+msgstr "Sobre"
+
+#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
+msgid "FAQ"
+msgstr "FAQ"
+
+#. TRANS: Secondary navigation menu option leading to Terms of Service.
+msgid "TOS"
+msgstr "Termos"
+
+#. TRANS: Secondary navigation menu option leading to privacy policy.
+msgid "Privacy"
+msgstr "Privacidade"
+
+#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
+msgid "Source"
+msgstr "Código fonte"
+
+#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+msgid "Contact"
+msgstr "Contacto"
+
+#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
+msgid "Badge"
+msgstr "Emblema"
+
 msgid "Untitled section"
 msgstr "Secção sem título"
 
@@ -8262,19 +8168,9 @@ msgstr ""
 msgid "Getting backup from file '%s'."
 msgstr ""
 
-#~ msgid "Full name is too long (max 255 chars)."
-#~ msgstr "Nome completo demasiado longo (máx. 255 caracteres)."
-
-#~ msgid "description is too long (max %d chars)."
-#~ msgstr "descrição é demasiada extensa (máx. %d caracteres)."
-
-#~ msgid "Location is too long (max 255 chars)."
-#~ msgstr "Localidade demasiado longa (máx. 255 caracteres)."
-
-#~ msgid "Too many aliases! Maximum %d."
-#~ msgstr "Demasiados nomes alternativos! Máx. %d."
-
 #, fuzzy
-#~ msgctxt "BUTTON"
-#~ msgid "Comment"
-#~ msgstr "Conteúdo"
+#~ msgid "Friends timeline"
+#~ msgstr "Notas de %s"
+
+#~ msgid "Everyone on this site"
+#~ msgstr "Todos neste site"
diff --git a/locale/pt_BR/LC_MESSAGES/statusnet.po b/locale/pt_BR/LC_MESSAGES/statusnet.po
index d6d5363303..ade9fcc57c 100644
--- a/locale/pt_BR/LC_MESSAGES/statusnet.po
+++ b/locale/pt_BR/LC_MESSAGES/statusnet.po
@@ -15,18 +15,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-06 02:34+0100\n"
-"PO-Revision-Date: 2011-03-06 01:36:36+0000\n"
+"POT-Creation-Date: 2011-03-08 01:03+0000\n"
+"PO-Revision-Date: 2011-03-08 01:05:29+0000\n"
 "Language-Team: Brazilian Portuguese <http://translatewiki.net/wiki/Portal:pt-"
 "br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt-br\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-POT-Import-Date: 2011-03-03 17:59:19+0000\n"
+"X-POT-Import-Date: 2011-03-06 02:16:47+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -6045,82 +6045,9 @@ msgstr "Responder"
 msgid "Write a reply..."
 msgstr ""
 
-msgid "Home"
-msgstr "Site"
-
 #, fuzzy
-msgid "Friends timeline"
-msgstr "Mensagens de %s"
-
-msgid "Your profile"
-msgstr "Perfil do grupo"
-
-msgid "Public"
-msgstr "Público"
-
-#, fuzzy
-msgid "Everyone on this site"
-msgstr "Encontre pessoas neste site"
-
-msgid "Settings"
-msgstr "Configuração do SMS"
-
-#, fuzzy
-msgid "Change your personal settings"
-msgstr "Alterar as suas configurações de perfil"
-
-#, fuzzy
-msgid "Site configuration"
-msgstr "Configuração do usuário"
-
-msgid "Logout"
-msgstr "Sair"
-
-msgid "Logout from the site"
-msgstr "Sai do site"
-
-msgid "Login to the site"
-msgstr "Autentique-se no site"
-
-msgid "Search"
-msgstr "Pesquisar"
-
-#, fuzzy
-msgid "Search the site"
-msgstr "Procurar no site"
-
-#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-msgid "Help"
-msgstr "Ajuda"
-
-#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-msgid "About"
-msgstr "Sobre"
-
-#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-msgid "FAQ"
-msgstr "FAQ"
-
-#. TRANS: Secondary navigation menu option leading to Terms of Service.
-msgid "TOS"
-msgstr "Termos de uso"
-
-#. TRANS: Secondary navigation menu option leading to privacy policy.
-msgid "Privacy"
-msgstr "Privacidade"
-
-#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-msgid "Source"
-msgstr "Fonte"
-
-#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
-#. TRANS: StatusNet site, where to report bugs, ...
-msgid "Contact"
-msgstr "Contato"
-
-#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-msgid "Badge"
-msgstr "Mini-aplicativo"
+msgid "Status"
+msgstr "StatusNet"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #. TRANS: Text between [] is a link description, text between () is the link itself.
@@ -6929,6 +6856,12 @@ msgstr "Ir para o instalador."
 msgid "Database error"
 msgstr "Erro no banco de dados"
 
+msgid "Home"
+msgstr "Site"
+
+msgid "Public"
+msgstr "Público"
+
 #. TRANS: Description of form for deleting a user.
 msgid "Delete this user"
 msgstr "Excluir este usuário"
@@ -7610,6 +7543,18 @@ msgstr ""
 "privadas para envolver outras pessoas em uma conversa. Você também pode "
 "receber mensagens privadas."
 
+msgid "Inbox"
+msgstr "Recebidas"
+
+msgid "Your incoming messages"
+msgstr "Suas mensagens recebidas"
+
+msgid "Outbox"
+msgstr "Enviadas"
+
+msgid "Your sent messages"
+msgstr "Suas mensagens enviadas"
+
 msgid "Could not parse message."
 msgstr "Não foi possível analisar a mensagem."
 
@@ -7690,6 +7635,20 @@ msgstr "Mensagem"
 msgid "from"
 msgstr "de"
 
+msgid "Can't get author for activity."
+msgstr ""
+
+#, fuzzy
+msgid "Bookmark not posted to this group."
+msgstr "Você não tem permissão para excluir este grupo."
+
+#, fuzzy
+msgid "Object not posted to this user."
+msgstr "Não excluir este grupo"
+
+msgid "Don't know how to handle this kind of target."
+msgstr ""
+
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 msgid "Nickname cannot be empty."
 msgstr ""
@@ -7804,24 +7763,15 @@ msgstr "Nota duplicada."
 msgid "Couldn't insert new subscription."
 msgstr "Não foi possível inserir a nova assinatura."
 
+msgid "Your profile"
+msgstr "Perfil do grupo"
+
 msgid "Replies"
 msgstr "Respostas"
 
 msgid "Favorites"
 msgstr "Favoritos"
 
-msgid "Inbox"
-msgstr "Recebidas"
-
-msgid "Your incoming messages"
-msgstr "Suas mensagens recebidas"
-
-msgid "Outbox"
-msgstr "Enviadas"
-
-msgid "Your sent messages"
-msgstr "Suas mensagens enviadas"
-
 #. TRANS: Title for personal tag cloud section. %s is a user nickname.
 #, php-format
 msgid "Tags in %s's notices"
@@ -7845,6 +7795,33 @@ msgctxt "plugin-description"
 msgid "(Plugin descriptions unavailable when disabled.)"
 msgstr ""
 
+msgid "Settings"
+msgstr "Configuração do SMS"
+
+#, fuzzy
+msgid "Change your personal settings"
+msgstr "Alterar as suas configurações de perfil"
+
+#, fuzzy
+msgid "Site configuration"
+msgstr "Configuração do usuário"
+
+msgid "Logout"
+msgstr "Sair"
+
+msgid "Logout from the site"
+msgstr "Sai do site"
+
+msgid "Login to the site"
+msgstr "Autentique-se no site"
+
+msgid "Search"
+msgstr "Pesquisar"
+
+#, fuzzy
+msgid "Search the site"
+msgstr "Procurar no site"
+
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
 msgid "Subscriptions"
@@ -7954,6 +7931,39 @@ msgstr "Encontre conteúdo de mensagens"
 msgid "Find groups on this site"
 msgstr "Encontre grupos neste site"
 
+#. TRANS: Secondary navigation menu option leading to help on StatusNet.
+msgid "Help"
+msgstr "Ajuda"
+
+#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
+msgid "About"
+msgstr "Sobre"
+
+#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
+msgid "FAQ"
+msgstr "FAQ"
+
+#. TRANS: Secondary navigation menu option leading to Terms of Service.
+msgid "TOS"
+msgstr "Termos de uso"
+
+#. TRANS: Secondary navigation menu option leading to privacy policy.
+msgid "Privacy"
+msgstr "Privacidade"
+
+#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
+msgid "Source"
+msgstr "Fonte"
+
+#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+msgid "Contact"
+msgstr "Contato"
+
+#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
+msgid "Badge"
+msgstr "Mini-aplicativo"
+
 msgid "Untitled section"
 msgstr "Seção sem título"
 
@@ -8238,19 +8248,10 @@ msgstr ""
 msgid "Getting backup from file '%s'."
 msgstr ""
 
-#~ msgid "Full name is too long (max 255 chars)."
-#~ msgstr "Nome completo muito extenso (máx. 255 caracteres)"
-
-#~ msgid "description is too long (max %d chars)."
-#~ msgstr "descrição muito extensa (máximo %d caracteres)."
-
-#~ msgid "Location is too long (max 255 chars)."
-#~ msgstr "Localização muito extensa (máx. 255 caracteres)."
-
-#~ msgid "Too many aliases! Maximum %d."
-#~ msgstr "Muitos apelidos! O máximo são %d."
+#, fuzzy
+#~ msgid "Friends timeline"
+#~ msgstr "Mensagens de %s"
 
 #, fuzzy
-#~ msgctxt "BUTTON"
-#~ msgid "Comment"
-#~ msgstr "Conteúdo"
+#~ msgid "Everyone on this site"
+#~ msgstr "Encontre pessoas neste site"
diff --git a/locale/ru/LC_MESSAGES/statusnet.po b/locale/ru/LC_MESSAGES/statusnet.po
index f06b0313e5..e3319efb95 100644
--- a/locale/ru/LC_MESSAGES/statusnet.po
+++ b/locale/ru/LC_MESSAGES/statusnet.po
@@ -18,18 +18,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-06 02:34+0100\n"
-"PO-Revision-Date: 2011-03-06 01:36:37+0000\n"
+"POT-Creation-Date: 2011-03-08 01:03+0000\n"
+"PO-Revision-Date: 2011-03-08 01:05:30+0000\n"
 "Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
-"X-POT-Import-Date: 2011-03-03 17:59:19+0000\n"
+"X-POT-Import-Date: 2011-03-06 02:16:47+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -1324,7 +1324,7 @@ msgstr ""
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Backup"
-msgstr "Фон"
+msgstr "Создать резервную копию"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
 #, fuzzy
@@ -6043,83 +6043,9 @@ msgstr "Ответить"
 msgid "Write a reply..."
 msgstr ""
 
-msgid "Home"
-msgstr "Главная"
-
 #, fuzzy
-msgid "Friends timeline"
-msgstr "Лента %s"
-
-#, fuzzy
-msgid "Your profile"
-msgstr "Профиль группы"
-
-msgid "Public"
-msgstr "Общее"
-
-#, fuzzy
-msgid "Everyone on this site"
-msgstr "Найти человека на этом сайте"
-
-msgid "Settings"
-msgstr "Установки СМС"
-
-#, fuzzy
-msgid "Change your personal settings"
-msgstr "Изменить ваши настройки профиля"
-
-#, fuzzy
-msgid "Site configuration"
-msgstr "Конфигурация пользователя"
-
-msgid "Logout"
-msgstr "Выход"
-
-msgid "Logout from the site"
-msgstr "Выйти"
-
-msgid "Login to the site"
-msgstr "Войти"
-
-msgid "Search"
-msgstr "Поиск"
-
-#, fuzzy
-msgid "Search the site"
-msgstr "Поиск по сайту"
-
-#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-msgid "Help"
-msgstr "Помощь"
-
-#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-msgid "About"
-msgstr "О проекте"
-
-#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-msgid "FAQ"
-msgstr "ЧаВо"
-
-#. TRANS: Secondary navigation menu option leading to Terms of Service.
-msgid "TOS"
-msgstr "TOS"
-
-#. TRANS: Secondary navigation menu option leading to privacy policy.
-msgid "Privacy"
-msgstr "Пользовательское соглашение"
-
-#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-msgid "Source"
-msgstr "Исходный код"
-
-#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
-#. TRANS: StatusNet site, where to report bugs, ...
-msgid "Contact"
-msgstr "Контактная информация"
-
-#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-msgid "Badge"
-msgstr "Бедж"
+msgid "Status"
+msgstr "StatusNet"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #. TRANS: Text between [] is a link description, text between () is the link itself.
@@ -6924,6 +6850,12 @@ msgstr "Перейти к установщику"
 msgid "Database error"
 msgstr "Ошибка базы данных"
 
+msgid "Home"
+msgstr "Главная"
+
+msgid "Public"
+msgstr "Общее"
+
 #. TRANS: Description of form for deleting a user.
 msgid "Delete this user"
 msgstr "Удалить этого пользователя"
@@ -7608,6 +7540,18 @@ msgstr ""
 "вовлечения других пользователей в разговор. Сообщения, получаемые от других "
 "людей, видите только вы."
 
+msgid "Inbox"
+msgstr "Входящие"
+
+msgid "Your incoming messages"
+msgstr "Ваши входящие сообщения"
+
+msgid "Outbox"
+msgstr "Исходящие"
+
+msgid "Your sent messages"
+msgstr "Ваши исходящие сообщения"
+
 msgid "Could not parse message."
 msgstr "Сообщение не удаётся разобрать."
 
@@ -7686,6 +7630,20 @@ msgstr "Сообщение"
 msgid "from"
 msgstr "от"
 
+msgid "Can't get author for activity."
+msgstr ""
+
+#, fuzzy
+msgid "Bookmark not posted to this group."
+msgstr "Вы не можете удалить эту группу."
+
+#, fuzzy
+msgid "Object not posted to this user."
+msgstr "Не удаляйте эту группу"
+
+msgid "Don't know how to handle this kind of target."
+msgstr ""
+
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 msgid "Nickname cannot be empty."
 msgstr "Псевдоним не может быть пустым."
@@ -7801,24 +7759,16 @@ msgstr "Дублирующаяся запись."
 msgid "Couldn't insert new subscription."
 msgstr "Не удаётся вставить новую подписку."
 
+#, fuzzy
+msgid "Your profile"
+msgstr "Профиль группы"
+
 msgid "Replies"
 msgstr "Ответы"
 
 msgid "Favorites"
 msgstr "Любимое"
 
-msgid "Inbox"
-msgstr "Входящие"
-
-msgid "Your incoming messages"
-msgstr "Ваши входящие сообщения"
-
-msgid "Outbox"
-msgstr "Исходящие"
-
-msgid "Your sent messages"
-msgstr "Ваши исходящие сообщения"
-
 #. TRANS: Title for personal tag cloud section. %s is a user nickname.
 #, php-format
 msgid "Tags in %s's notices"
@@ -7842,6 +7792,33 @@ msgctxt "plugin-description"
 msgid "(Plugin descriptions unavailable when disabled.)"
 msgstr ""
 
+msgid "Settings"
+msgstr "Установки СМС"
+
+#, fuzzy
+msgid "Change your personal settings"
+msgstr "Изменить ваши настройки профиля"
+
+#, fuzzy
+msgid "Site configuration"
+msgstr "Конфигурация пользователя"
+
+msgid "Logout"
+msgstr "Выход"
+
+msgid "Logout from the site"
+msgstr "Выйти"
+
+msgid "Login to the site"
+msgstr "Войти"
+
+msgid "Search"
+msgstr "Поиск"
+
+#, fuzzy
+msgid "Search the site"
+msgstr "Поиск по сайту"
+
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
 msgid "Subscriptions"
@@ -7950,6 +7927,39 @@ msgstr "Найти запись по содержимому"
 msgid "Find groups on this site"
 msgstr "Найти группы на этом сайте"
 
+#. TRANS: Secondary navigation menu option leading to help on StatusNet.
+msgid "Help"
+msgstr "Помощь"
+
+#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
+msgid "About"
+msgstr "О проекте"
+
+#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
+msgid "FAQ"
+msgstr "ЧаВо"
+
+#. TRANS: Secondary navigation menu option leading to Terms of Service.
+msgid "TOS"
+msgstr "TOS"
+
+#. TRANS: Secondary navigation menu option leading to privacy policy.
+msgid "Privacy"
+msgstr "Пользовательское соглашение"
+
+#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
+msgid "Source"
+msgstr "Исходный код"
+
+#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+msgid "Contact"
+msgstr "Контактная информация"
+
+#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
+msgid "Badge"
+msgstr "Бедж"
+
 msgid "Untitled section"
 msgstr "Секция без названия"
 
@@ -8242,19 +8252,10 @@ msgstr "Неверный XML, отсутствует корень XRD."
 msgid "Getting backup from file '%s'."
 msgstr "Получение резервной копии из файла «%s»."
 
-#~ msgid "Full name is too long (max 255 chars)."
-#~ msgstr "Полное имя слишком длинное (максимум 255 символов)."
-
-#~ msgid "description is too long (max %d chars)."
-#~ msgstr "Слишком длинное описание (максимум %d символов)"
-
-#~ msgid "Location is too long (max 255 chars)."
-#~ msgstr "Слишком длинное месторасположение (максимум 255 символов)."
-
-#~ msgid "Too many aliases! Maximum %d."
-#~ msgstr "Слишком много алиасов! Максимальное число — %d."
+#, fuzzy
+#~ msgid "Friends timeline"
+#~ msgstr "Лента %s"
 
 #, fuzzy
-#~ msgctxt "BUTTON"
-#~ msgid "Comment"
-#~ msgstr "Содержание"
+#~ msgid "Everyone on this site"
+#~ msgstr "Найти человека на этом сайте"
diff --git a/locale/statusnet.pot b/locale/statusnet.pot
index 4f043edeb4..81cdbaba1e 100644
--- a/locale/statusnet.pot
+++ b/locale/statusnet.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"POT-Creation-Date: 2011-03-08 01:03+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -19,7 +19,7 @@ msgstr ""
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
-#: actions/accessadminpanel.php:53 lib/adminpanelaction.php:363
+#: actions/accessadminpanel.php:53 lib/adminpanelnav.php:92
 msgid "Access"
 msgstr ""
 
@@ -174,9 +174,9 @@ msgstr ""
 #. TRANS: H1 text for page. %s is a user nickname.
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Timeline title for user and friends. %s is a user nickname.
-#: actions/all.php:94 actions/all.php:191 actions/allrss.php:117
+#: actions/all.php:94 actions/all.php:185 actions/allrss.php:117
 #: actions/apitimelinefriends.php:207 actions/apitimelinehome.php:113
-#: lib/personalgroupnav.php:100
+#: lib/personalgroupnav.php:72
 #, php-format
 msgid "%s and friends"
 msgstr ""
@@ -200,7 +200,7 @@ msgid "Feed for friends of %s (Atom)"
 msgstr ""
 
 #. TRANS: Empty list message. %s is a user nickname.
-#: actions/all.php:139
+#: actions/all.php:133
 #, php-format
 msgid ""
 "This is the timeline for %s and friends but no one has posted anything yet."
@@ -208,7 +208,7 @@ msgstr ""
 
 #. TRANS: Encouragement displayed on logged in user's empty timeline.
 #. TRANS: This message contains Markdown links. Keep "](" together.
-#: actions/all.php:146
+#: actions/all.php:140
 #, php-format
 msgid ""
 "Try subscribing to more people, [join a group](%%action.groups%%) or post "
@@ -217,7 +217,7 @@ msgstr ""
 
 #. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@".
 #. TRANS: This message contains Markdown links. Keep "](" together.
-#: actions/all.php:150
+#: actions/all.php:144
 #, php-format
 msgid ""
 "You can try to [nudge %1$s](../%2$s) from their profile or [post something "
@@ -228,7 +228,7 @@ msgstr ""
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
 #. TRANS: Second sentence of empty message for anonymous users. %s is a user nickname.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:221
+#: actions/all.php:149 actions/replies.php:198 actions/showstream.php:221
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -236,7 +236,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: H1 text for page when viewing a list for self.
-#: actions/all.php:188
+#: actions/all.php:182
 msgid "You and friends"
 msgstr ""
 
@@ -385,7 +385,7 @@ msgstr[1] ""
 #: actions/apiaccountupdateprofilebackgroundimage.php:149
 #: actions/apiaccountupdateprofilecolors.php:160
 #: actions/apiaccountupdateprofilecolors.php:171
-#: actions/groupdesignsettings.php:285 actions/groupdesignsettings.php:296
+#: actions/groupdesignsettings.php:295 actions/groupdesignsettings.php:306
 #: actions/userdesignsettings.php:218 actions/userdesignsettings.php:228
 #: actions/userdesignsettings.php:270 actions/userdesignsettings.php:280
 msgid "Unable to save your design settings."
@@ -943,7 +943,7 @@ msgstr ""
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Field label on login page.
 #: actions/apioauthauthorize.php:463 actions/login.php:235
-#: actions/register.php:415 lib/settingsnav.php:87
+#: actions/register.php:415 lib/settingsnav.php:74
 msgid "Password"
 msgstr ""
 
@@ -1505,7 +1505,7 @@ msgid "Invalid size."
 msgstr ""
 
 #. TRANS: Title for avatar upload page.
-#: actions/avatarsettings.php:66 lib/settingsnav.php:82
+#: actions/avatarsettings.php:66 lib/settingsnav.php:69
 msgid "Avatar"
 msgstr ""
 
@@ -1809,7 +1809,7 @@ msgstr ""
 #. TRANS: Header on conversation page. Hidden by default (h2).
 #. TRANS: Label for user statistics.
 #: actions/conversation.php:149 lib/noticelist.php:87
-#: lib/profileaction.php:246 lib/searchgroupnav.php:82
+#: lib/profileaction.php:246 lib/searchgroupnav.php:78
 #: lib/threadednoticelist.php:66
 msgid "Notices"
 msgstr ""
@@ -1902,7 +1902,7 @@ msgstr ""
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
 #: actions/newapplication.php:112 actions/showapplication.php:113
-#: lib/action.php:1397
+#: lib/action.php:1388
 msgid "There was a problem with your session token."
 msgstr ""
 
@@ -2077,7 +2077,7 @@ msgid "Delete this user."
 msgstr ""
 
 #. TRANS: Message used as title for design settings for the site.
-#: actions/designadminpanel.php:60 lib/settingsnav.php:97
+#: actions/designadminpanel.php:60 lib/settingsnav.php:84
 msgid "Design"
 msgstr ""
 
@@ -2636,7 +2636,7 @@ msgstr ""
 #. TRANS: Page title for first page of favorited notices.
 #. TRANS: Title for favourited notices section.
 #: actions/favorited.php:65 lib/popularnoticesection.php:62
-#: lib/publicgroupnav.php:93
+#: lib/publicgroupnav.php:79
 msgid "Popular notices"
 msgstr ""
 
@@ -2678,7 +2678,7 @@ msgstr ""
 #. TRANS: Title for first page of favourite notices of a user.
 #. TRANS: %s is the user for whom the favourite notices are displayed.
 #: actions/favoritesrss.php:111 actions/showfavorites.php:76
-#: lib/personalgroupnav.php:110
+#: lib/personalgroupnav.php:88
 #, php-format
 msgid "%s's favorite notices"
 msgstr ""
@@ -2693,7 +2693,7 @@ msgstr ""
 #. TRANS: Page title for first page of featured users.
 #. TRANS: Title for featured users section.
 #: actions/featured.php:69 lib/featureduserssection.php:87
-#: lib/publicgroupnav.php:89
+#: lib/publicgroupnav.php:75
 msgid "Featured users"
 msgstr ""
 
@@ -2705,7 +2705,7 @@ msgid "Featured users, page %d"
 msgstr ""
 
 #. TRANS: Description on page displaying featured users.
-#: actions/featured.php:102
+#: actions/featured.php:96
 #, php-format
 msgid "A selection of some great users on %s."
 msgstr ""
@@ -2901,12 +2901,12 @@ msgid ""
 msgstr ""
 
 #. TRANS: Form validation error displayed when group design settings could not be updated because of an application issue.
-#: actions/groupdesignsettings.php:262
+#: actions/groupdesignsettings.php:272
 msgid "Unable to update your design settings."
 msgstr ""
 
 #. TRANS: Form text to confirm saved group design settings.
-#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:239
+#: actions/groupdesignsettings.php:317 actions/userdesignsettings.php:239
 msgid "Design preferences saved."
 msgstr ""
 
@@ -2969,7 +2969,7 @@ msgid "A list of the users in this group."
 msgstr ""
 
 #. TRANS: Indicator in group members list that this user is a group administrator.
-#: actions/groupmembers.php:190 lib/action.php:587
+#: actions/groupmembers.php:190 lib/primarynav.php:63
 msgid "Admin"
 msgstr ""
 
@@ -3025,7 +3025,7 @@ msgstr ""
 #. TRANS: Page notice of group list. %%%%site.name%%%% is the StatusNet site name,
 #. TRANS: %%%%action.groupsearch%%%% and %%%%action.newgroup%%%% are URLs. Do not change them.
 #. TRANS: This message contains Markdown links in the form [link text](link).
-#: actions/groups.php:95
+#: actions/groups.php:89
 #, php-format
 msgid ""
 "%%%%site.name%%%% groups let you find and talk with people of similar "
@@ -3036,7 +3036,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: Link to create a new group on the group list page.
-#: actions/groups.php:113 actions/usergroups.php:126 lib/groupeditform.php:115
+#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:115
 msgid "Create a new group"
 msgstr ""
 
@@ -3580,7 +3580,7 @@ msgid "Error setting user. You are probably not authorized."
 msgstr ""
 
 #. TRANS: Page title for login page.
-#: actions/login.php:189 lib/action.php:604
+#: actions/login.php:189 lib/primarynav.php:75
 msgid "Login"
 msgstr ""
 
@@ -4076,7 +4076,7 @@ msgstr ""
 
 #. TRANS: Title for Paths admin panel.
 #. TRANS: Menu item for site administration
-#: actions/pathsadminpanel.php:58 lib/adminpanelaction.php:371
+#: actions/pathsadminpanel.php:58 lib/adminpanelnav.php:100
 msgid "Paths"
 msgstr ""
 
@@ -4396,7 +4396,7 @@ msgstr ""
 #. TRANS: Tab and title for plugins admin panel.
 #. TRANS: Menu item for site administration
 #: actions/pluginsadminpanel.php:56 actions/version.php:191
-#: lib/adminpanelaction.php:411
+#: lib/adminpanelnav.php:140
 msgid "Plugins"
 msgstr ""
 
@@ -4612,7 +4612,7 @@ msgstr ""
 msgid "Public timeline, page %d"
 msgstr ""
 
-#: actions/public.php:132 lib/publicgroupnav.php:79
+#: actions/public.php:132 lib/publicgroupnav.php:65
 msgid "Public timeline"
 msgstr ""
 
@@ -4628,24 +4628,24 @@ msgstr ""
 msgid "Public Stream Feed (Atom)"
 msgstr ""
 
-#: actions/public.php:188
+#: actions/public.php:173
 #, php-format
 msgid ""
 "This is the public timeline for %%site.name%% but no one has posted anything "
 "yet."
 msgstr ""
 
-#: actions/public.php:191
+#: actions/public.php:176
 msgid "Be the first to post!"
 msgstr ""
 
-#: actions/public.php:195
+#: actions/public.php:180
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post!"
 msgstr ""
 
-#: actions/public.php:242
+#: actions/public.php:227
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -4654,7 +4654,7 @@ msgid ""
 "friends, family, and colleagues! ([Read more](%%doc.help%%))"
 msgstr ""
 
-#: actions/public.php:247
+#: actions/public.php:232
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -4916,7 +4916,7 @@ msgid ""
 msgstr ""
 
 #: actions/register.php:424 actions/register.php:428
-#: actions/siteadminpanel.php:238 lib/settingsnav.php:92
+#: actions/siteadminpanel.php:238 lib/settingsnav.php:79
 msgid "Email"
 msgstr ""
 
@@ -5020,7 +5020,7 @@ msgstr ""
 
 #. TRANS: Link text for link that will subscribe to a remote profile.
 #: actions/remotesubscribe.php:136 lib/subscribeform.php:139
-#: lib/userprofile.php:402
+#: lib/userprofile.php:406
 msgid "Subscribe"
 msgstr ""
 
@@ -5066,7 +5066,7 @@ msgstr ""
 
 #. TRANS: RSS reply feed title. %s is a user nickname.
 #: actions/replies.php:126 actions/repliesrss.php:68
-#: lib/personalgroupnav.php:105
+#: lib/personalgroupnav.php:83
 #, php-format
 msgid "Replies to %s"
 msgstr ""
@@ -5091,21 +5091,21 @@ msgstr ""
 msgid "Replies feed for %s (Atom)"
 msgstr ""
 
-#: actions/replies.php:199
+#: actions/replies.php:187
 #, php-format
 msgid ""
 "This is the timeline showing replies to %1$s but %2$s hasn't received a "
 "notice to them yet."
 msgstr ""
 
-#: actions/replies.php:204
+#: actions/replies.php:192
 #, php-format
 msgid ""
 "You can engage other users in a conversation, subscribe to more people or "
 "[join groups](%%action.groups%%)."
 msgstr ""
 
-#: actions/replies.php:206
+#: actions/replies.php:194
 #, php-format
 msgid ""
 "You can try to [nudge %1$s](../%2$s) or [post something to them](%%%%action."
@@ -5225,7 +5225,7 @@ msgstr ""
 
 #. TRANS: Menu item for site administration
 #: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
-#: lib/adminpanelaction.php:379
+#: lib/adminpanelnav.php:108
 msgid "Sessions"
 msgstr ""
 
@@ -5332,7 +5332,7 @@ msgid "Feed for favorites of %s (Atom)"
 msgstr ""
 
 #. TRANS: Text displayed instead of favourite notices for the current logged in user that has no favourites.
-#: actions/showfavorites.php:209
+#: actions/showfavorites.php:198
 msgid ""
 "You haven't chosen any favorite notices yet. Click the fave button on "
 "notices you like to bookmark them for later or shed a spotlight on them."
@@ -5340,7 +5340,7 @@ msgstr ""
 
 #. TRANS: Text displayed instead of favourite notices for a user that has no favourites while logged in.
 #. TRANS: %s is a username.
-#: actions/showfavorites.php:213
+#: actions/showfavorites.php:202
 #, php-format
 msgid ""
 "%s hasn't added any favorite notices yet. Post something interesting they "
@@ -5350,7 +5350,7 @@ msgstr ""
 #. TRANS: Text displayed instead of favourite notices for a user that has no favourites while not logged in.
 #. TRANS: %s is a username, %%%%action.register%%%% is a link to the user registration page.
 #. TRANS: (link text)[link] is a Mark Down link.
-#: actions/showfavorites.php:220
+#: actions/showfavorites.php:209
 #, php-format
 msgid ""
 "%s hasn't added any favorite notices yet. Why not [register an account](%%%%"
@@ -5359,7 +5359,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: Page notice for show favourites page.
-#: actions/showfavorites.php:251
+#: actions/showfavorites.php:240
 msgid "This is a way to share what you like."
 msgstr ""
 
@@ -5902,7 +5902,7 @@ msgstr ""
 
 #. TRANS: Menu item for site administration
 #: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
-#: lib/adminpanelaction.php:395
+#: lib/adminpanelnav.php:124
 msgid "Snapshots"
 msgstr ""
 
@@ -6082,12 +6082,12 @@ msgid "Subscription feed for %s (Atom)"
 msgstr ""
 
 #. TRANS: Checkbox label for enabling Jabber messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:241 lib/settingsnav.php:110
+#: actions/subscriptions.php:241 lib/settingsnav.php:97
 msgid "IM"
 msgstr ""
 
 #. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:256 lib/settingsnav.php:117
+#: actions/subscriptions.php:256 lib/settingsnav.php:104
 msgid "SMS"
 msgstr ""
 
@@ -6278,8 +6278,8 @@ msgstr ""
 msgid "Invalid default subscripton: \"%1$s\" is not a user."
 msgstr ""
 
-#: actions/useradminpanel.php:215 lib/action.php:571 lib/settingsnav.php:77
-#: lib/subgroupnav.php:81
+#: actions/useradminpanel.php:215 lib/personalgroupnav.php:76
+#: lib/settingsnav.php:64 lib/subgroupnav.php:79
 msgid "Profile"
 msgstr ""
 
@@ -6540,7 +6540,7 @@ msgid "Contributors"
 msgstr ""
 
 #. TRANS: Menu item for site administration
-#: actions/version.php:167 lib/adminpanelaction.php:403
+#: actions/version.php:167 lib/adminpanelnav.php:132
 msgid "License"
 msgstr ""
 
@@ -6573,7 +6573,7 @@ msgid "Name"
 msgstr ""
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:891
+#: actions/version.php:198 lib/secondarynav.php:78
 msgid "Version"
 msgstr ""
 
@@ -6722,71 +6722,71 @@ msgstr ""
 
 #. TRANS: Server exception thrown when a user profile for a notice cannot be found.
 #. TRANS: %1$d is a profile ID (number), %2$d is a notice ID (number).
-#: classes/Notice.php:98
+#: classes/Notice.php:99
 #, php-format
 msgid "No such profile (%1$d) for notice (%2$d)."
 msgstr ""
 
 #. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:199
+#: classes/Notice.php:200
 #, php-format
 msgid "Database error inserting hashtag: %s"
 msgstr ""
 
 #. TRANS: Client exception thrown if a notice contains too many characters.
-#: classes/Notice.php:279
+#: classes/Notice.php:281
 msgid "Problem saving notice. Too long."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to save a notice for an unknown user.
-#: classes/Notice.php:284
+#: classes/Notice.php:286
 msgid "Problem saving notice. Unknown user."
 msgstr ""
 
 #. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
-#: classes/Notice.php:290
+#: classes/Notice.php:292
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 
 #. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
-#: classes/Notice.php:297
+#: classes/Notice.php:299
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
 "few minutes."
 msgstr ""
 
 #. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:305
+#: classes/Notice.php:307
 msgid "You are banned from posting notices on this site."
 msgstr ""
 
 #. TRANS: Server exception thrown when a notice cannot be saved.
 #. TRANS: Server exception thrown when a notice cannot be updated.
-#: classes/Notice.php:372 classes/Notice.php:399
+#: classes/Notice.php:380 classes/Notice.php:407
 msgid "Problem saving notice."
 msgstr ""
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:929
+#: classes/Notice.php:937
 msgid "Bad type provided to saveKnownGroups."
 msgstr ""
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:1028
+#: classes/Notice.php:1036
 msgid "Problem saving group inbox."
 msgstr ""
 
 #. TRANS: Server exception thrown when a reply cannot be saved.
 #. TRANS: %1$d is a notice ID, %2$d is the ID of the mentioned user.
-#: classes/Notice.php:1144
+#: classes/Notice.php:1152
 #, php-format
 msgid "Could not save reply for %1$d, %2$d."
 msgstr ""
 
 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1663
+#: classes/Notice.php:1671
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr ""
@@ -6955,104 +6955,15 @@ msgstr ""
 msgid "Write a reply..."
 msgstr ""
 
-#: lib/action.php:565 lib/personalgroupnav.php:99
-msgid "Home"
-msgstr ""
-
-#: lib/action.php:566
-msgid "Friends timeline"
-msgstr ""
-
-#: lib/action.php:572
-msgid "Your profile"
-msgstr ""
-
-#: lib/action.php:576 lib/action.php:599 lib/publicgroupnav.php:78
-msgid "Public"
-msgstr ""
-
-#: lib/action.php:577 lib/action.php:600
-msgid "Everyone on this site"
-msgstr ""
-
-#: lib/action.php:581
-msgid "Settings"
-msgstr ""
-
-#: lib/action.php:582
-msgid "Change your personal settings"
-msgstr ""
-
-#: lib/action.php:588
-msgid "Site configuration"
-msgstr ""
-
-#: lib/action.php:593
-msgid "Logout"
-msgstr ""
-
-#: lib/action.php:594
-msgid "Logout from the site"
-msgstr ""
-
-#: lib/action.php:605
-msgid "Login to the site"
-msgstr ""
-
-#: lib/action.php:612
-msgid "Search"
-msgstr ""
-
-#: lib/action.php:613
-msgid "Search the site"
-msgstr ""
-
-#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:870
-msgid "Help"
-msgstr ""
-
-#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:873
-msgid "About"
-msgstr ""
-
-#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:876
-msgid "FAQ"
-msgstr ""
-
-#. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:881
-msgid "TOS"
-msgstr ""
-
-#. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:885
-msgid "Privacy"
-msgstr ""
-
-#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:888
-msgid "Source"
-msgstr ""
-
-#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
-#. TRANS: StatusNet site, where to report bugs, ...
-#: lib/action.php:895
-msgid "Contact"
-msgstr ""
-
-#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:898
-msgid "Badge"
+#: lib/action.php:583
+msgid "Status"
 msgstr ""
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:927
+#: lib/action.php:918
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7060,7 +6971,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:930
+#: lib/action.php:921
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr ""
@@ -7069,7 +6980,7 @@ msgstr ""
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:937
+#: lib/action.php:928
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7079,39 +6990,39 @@ msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:955
+#: lib/action.php:946
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:962
+#: lib/action.php:953
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:966
+#: lib/action.php:957
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:998
+#: lib/action.php:989
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1341
+#: lib/action.php:1332
 msgid "After"
 msgstr ""
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1351
+#: lib/action.php:1342
 msgid "Before"
 msgstr ""
 
@@ -7234,75 +7145,75 @@ msgid "Unable to delete design setting."
 msgstr ""
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:337
+#: lib/adminpanelnav.php:66
 msgid "Basic site configuration"
 msgstr ""
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:339
+#: lib/adminpanelnav.php:68
 msgctxt "MENU"
 msgid "Site"
 msgstr ""
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:345
+#: lib/adminpanelnav.php:74
 msgid "Design configuration"
 msgstr ""
 
 #. TRANS: Menu item for site administration
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/adminpanelaction.php:347 lib/groupnav.php:135
+#: lib/adminpanelnav.php:76 lib/groupnav.php:133
 msgctxt "MENU"
 msgid "Design"
 msgstr ""
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:353
+#: lib/adminpanelnav.php:82
 msgid "User configuration"
 msgstr ""
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:110
+#: lib/adminpanelnav.php:84 lib/personalgroupnav.php:88
 msgid "User"
 msgstr ""
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:361
+#: lib/adminpanelnav.php:90
 msgid "Access configuration"
 msgstr ""
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:369
+#: lib/adminpanelnav.php:98
 msgid "Paths configuration"
 msgstr ""
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:377
+#: lib/adminpanelnav.php:106
 msgid "Sessions configuration"
 msgstr ""
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:385
+#: lib/adminpanelnav.php:114
 msgid "Edit site notice"
 msgstr ""
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:387
+#: lib/adminpanelnav.php:116
 msgid "Site notice"
 msgstr ""
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:393
+#: lib/adminpanelnav.php:122
 msgid "Snapshots configuration"
 msgstr ""
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:401
+#: lib/adminpanelnav.php:130
 msgid "Set site license"
 msgstr ""
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:409
+#: lib/adminpanelnav.php:138
 msgid "Plugins configuration"
 msgstr ""
 
@@ -7919,6 +7830,14 @@ msgstr ""
 msgid "Database error"
 msgstr ""
 
+#: lib/defaultlocalnav.php:58 lib/personalgroupnav.php:71
+msgid "Home"
+msgstr ""
+
+#: lib/defaultlocalnav.php:62 lib/publicgroupnav.php:64
+msgid "Public"
+msgstr ""
+
 #. TRANS: Description of form for deleting a user.
 #: lib/deleteuserform.php:75
 msgid "Delete this user"
@@ -8112,70 +8031,70 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Menu item in the group navigation page.
-#: lib/groupnav.php:86
+#: lib/groupnav.php:84
 msgctxt "MENU"
 msgid "Group"
 msgstr ""
 
 #. TRANS: Tooltip for menu item in the group navigation page.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:89
+#: lib/groupnav.php:87
 #, php-format
 msgctxt "TOOLTIP"
 msgid "%s group"
 msgstr ""
 
 #. TRANS: Menu item in the group navigation page.
-#: lib/groupnav.php:95
+#: lib/groupnav.php:93
 msgctxt "MENU"
 msgid "Members"
 msgstr ""
 
 #. TRANS: Tooltip for menu item in the group navigation page.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:98
+#: lib/groupnav.php:96
 #, php-format
 msgctxt "TOOLTIP"
 msgid "%s group members"
 msgstr ""
 
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/groupnav.php:108
+#: lib/groupnav.php:106
 msgctxt "MENU"
 msgid "Blocked"
 msgstr ""
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:111
+#: lib/groupnav.php:109
 #, php-format
 msgctxt "TOOLTIP"
 msgid "%s blocked users"
 msgstr ""
 
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/groupnav.php:117
+#: lib/groupnav.php:115
 msgctxt "MENU"
 msgid "Admin"
 msgstr ""
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:120
+#: lib/groupnav.php:118
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Edit %s group properties"
 msgstr ""
 
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/groupnav.php:126
+#: lib/groupnav.php:124
 msgctxt "MENU"
 msgid "Logo"
 msgstr ""
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:129
+#: lib/groupnav.php:127
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Add or edit %s logo"
@@ -8183,7 +8102,7 @@ msgstr ""
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:138
+#: lib/groupnav.php:136
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Add or edit %s design"
@@ -8293,24 +8212,24 @@ msgid "Leave"
 msgstr ""
 
 #. TRANS: Menu item for logging in to the StatusNet site.
-#: lib/logingroupnav.php:77
+#: lib/logingroupnav.php:64
 msgctxt "MENU"
 msgid "Login"
 msgstr ""
 
 #. TRANS: Title for menu item for logging in to the StatusNet site.
-#: lib/logingroupnav.php:79
+#: lib/logingroupnav.php:66
 msgid "Login with a username and password"
 msgstr ""
 
 #. TRANS: Menu item for registering with the StatusNet site.
-#: lib/logingroupnav.php:85
+#: lib/logingroupnav.php:72
 msgctxt "MENU"
 msgid "Register"
 msgstr ""
 
 #. TRANS: Title for menu item for registering with the StatusNet site.
-#: lib/logingroupnav.php:87
+#: lib/logingroupnav.php:74
 msgid "Sign up for a new account"
 msgstr ""
 
@@ -8566,12 +8485,28 @@ msgstr ""
 msgid "Only the user can read their own mailboxes."
 msgstr ""
 
-#: lib/mailbox.php:125
+#: lib/mailbox.php:119
 msgid ""
 "You have no private messages. You can send private message to engage other "
 "users in conversation. People can send you messages for your eyes only."
 msgstr ""
 
+#: lib/mailboxmenu.php:59
+msgid "Inbox"
+msgstr ""
+
+#: lib/mailboxmenu.php:60 lib/personalgroupnav.php:99
+msgid "Your incoming messages"
+msgstr ""
+
+#: lib/mailboxmenu.php:64
+msgid "Outbox"
+msgstr ""
+
+#: lib/mailboxmenu.php:65
+msgid "Your sent messages"
+msgstr ""
+
 #: lib/mailhandler.php:37
 msgid "Could not parse message."
 msgstr ""
@@ -8655,7 +8590,7 @@ msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr ""
 
-#: lib/messagelist.php:77
+#: lib/messagelist.php:77 lib/personalgroupnav.php:98
 msgid "Messages"
 msgstr ""
 
@@ -8663,6 +8598,22 @@ msgstr ""
 msgid "from"
 msgstr ""
 
+#: lib/microappplugin.php:302
+msgid "Can't get author for activity."
+msgstr ""
+
+#: lib/microappplugin.php:338
+msgid "Bookmark not posted to this group."
+msgstr ""
+
+#: lib/microappplugin.php:351
+msgid "Object not posted to this user."
+msgstr ""
+
+#: lib/microappplugin.php:355
+msgid "Don't know how to handle this kind of target."
+msgstr ""
+
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 #: lib/nickname.php:178
 msgid "Nickname cannot be empty."
@@ -8804,30 +8755,18 @@ msgstr ""
 msgid "Couldn't insert new subscription."
 msgstr ""
 
-#: lib/personalgroupnav.php:104
+#: lib/personalgroupnav.php:77
+msgid "Your profile"
+msgstr ""
+
+#: lib/personalgroupnav.php:82
 msgid "Replies"
 msgstr ""
 
-#: lib/personalgroupnav.php:109
+#: lib/personalgroupnav.php:87
 msgid "Favorites"
 msgstr ""
 
-#: lib/personalgroupnav.php:120
-msgid "Inbox"
-msgstr ""
-
-#: lib/personalgroupnav.php:121
-msgid "Your incoming messages"
-msgstr ""
-
-#: lib/personalgroupnav.php:125
-msgid "Outbox"
-msgstr ""
-
-#: lib/personalgroupnav.php:126
-msgid "Your sent messages"
-msgstr ""
-
 #. TRANS: Title for personal tag cloud section. %s is a user nickname.
 #: lib/personaltagcloudsection.php:56
 #, php-format
@@ -8856,9 +8795,41 @@ msgctxt "plugin-description"
 msgid "(Plugin descriptions unavailable when disabled.)"
 msgstr ""
 
+#: lib/primarynav.php:57
+msgid "Settings"
+msgstr ""
+
+#: lib/primarynav.php:58
+msgid "Change your personal settings"
+msgstr ""
+
+#: lib/primarynav.php:64
+msgid "Site configuration"
+msgstr ""
+
+#: lib/primarynav.php:69
+msgid "Logout"
+msgstr ""
+
+#: lib/primarynav.php:70
+msgid "Logout from the site"
+msgstr ""
+
+#: lib/primarynav.php:76
+msgid "Login to the site"
+msgstr ""
+
+#: lib/primarynav.php:83
+msgid "Search"
+msgstr ""
+
+#: lib/primarynav.php:84
+msgid "Search the site"
+msgstr ""
+
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:88
+#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:86
 msgid "Subscriptions"
 msgstr ""
 
@@ -8869,7 +8840,7 @@ msgstr ""
 
 #. TRANS: H2 text for user subscriber statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:96
+#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:94
 msgid "Subscribers"
 msgstr ""
 
@@ -8891,7 +8862,7 @@ msgstr ""
 #. TRANS: Label for user statistics.
 #. TRANS: H2 text for user group membership statistics.
 #: lib/profileaction.php:239 lib/profileaction.php:290
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:104
+#: lib/publicgroupnav.php:67 lib/searchgroupnav.php:80 lib/subgroupnav.php:102
 msgid "Groups"
 msgstr ""
 
@@ -8911,19 +8882,19 @@ msgstr ""
 msgid "Unimplemented method."
 msgstr ""
 
-#: lib/publicgroupnav.php:82
+#: lib/publicgroupnav.php:68
 msgid "User groups"
 msgstr ""
 
-#: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
+#: lib/publicgroupnav.php:70 lib/publicgroupnav.php:71
 msgid "Recent tags"
 msgstr ""
 
-#: lib/publicgroupnav.php:88
+#: lib/publicgroupnav.php:74
 msgid "Featured"
 msgstr ""
 
-#: lib/publicgroupnav.php:92
+#: lib/publicgroupnav.php:78
 msgid "Popular"
 msgstr ""
 
@@ -8978,22 +8949,63 @@ msgctxt "BUTTON"
 msgid "Search"
 msgstr ""
 
-#: lib/searchgroupnav.php:80
+#: lib/searchgroupnav.php:76
 msgid "People"
 msgstr ""
 
-#: lib/searchgroupnav.php:81
+#: lib/searchgroupnav.php:77
 msgid "Find people on this site"
 msgstr ""
 
-#: lib/searchgroupnav.php:83
+#: lib/searchgroupnav.php:79
 msgid "Find content of notices"
 msgstr ""
 
-#: lib/searchgroupnav.php:85
+#: lib/searchgroupnav.php:81
 msgid "Find groups on this site"
 msgstr ""
 
+#. TRANS: Secondary navigation menu option leading to help on StatusNet.
+#: lib/secondarynav.php:57
+msgid "Help"
+msgstr ""
+
+#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
+#: lib/secondarynav.php:60
+msgid "About"
+msgstr ""
+
+#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
+#: lib/secondarynav.php:63
+msgid "FAQ"
+msgstr ""
+
+#. TRANS: Secondary navigation menu option leading to Terms of Service.
+#: lib/secondarynav.php:68
+msgid "TOS"
+msgstr ""
+
+#. TRANS: Secondary navigation menu option leading to privacy policy.
+#: lib/secondarynav.php:72
+msgid "Privacy"
+msgstr ""
+
+#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
+#: lib/secondarynav.php:75
+msgid "Source"
+msgstr ""
+
+#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+#: lib/secondarynav.php:82
+msgid "Contact"
+msgstr ""
+
+#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
+#: lib/secondarynav.php:85
+msgid "Badge"
+msgstr ""
+
 #: lib/section.php:89
 msgid "Untitled section"
 msgstr ""
@@ -9002,47 +9014,47 @@ msgstr ""
 msgid "More..."
 msgstr ""
 
-#: lib/settingsnav.php:78
+#: lib/settingsnav.php:65
 msgid "Change your profile settings"
 msgstr ""
 
-#: lib/settingsnav.php:83
+#: lib/settingsnav.php:70
 msgid "Upload an avatar"
 msgstr ""
 
-#: lib/settingsnav.php:88
+#: lib/settingsnav.php:75
 msgid "Change your password"
 msgstr ""
 
-#: lib/settingsnav.php:93
+#: lib/settingsnav.php:80
 msgid "Change email handling"
 msgstr ""
 
-#: lib/settingsnav.php:98
+#: lib/settingsnav.php:85
 msgid "Design your profile"
 msgstr ""
 
-#: lib/settingsnav.php:102
+#: lib/settingsnav.php:89
 msgid "URL"
 msgstr ""
 
-#: lib/settingsnav.php:103
+#: lib/settingsnav.php:90
 msgid "URL shorteners"
 msgstr ""
 
-#: lib/settingsnav.php:111
+#: lib/settingsnav.php:98
 msgid "Updates by instant messenger (IM)"
 msgstr ""
 
-#: lib/settingsnav.php:118
+#: lib/settingsnav.php:105
 msgid "Updates by SMS"
 msgstr ""
 
-#: lib/settingsnav.php:123
+#: lib/settingsnav.php:110
 msgid "Connections"
 msgstr ""
 
-#: lib/settingsnav.php:124
+#: lib/settingsnav.php:111
 msgid "Authorized connected applications"
 msgstr ""
 
@@ -9054,26 +9066,26 @@ msgstr ""
 msgid "Silence this user"
 msgstr ""
 
-#: lib/subgroupnav.php:89
+#: lib/subgroupnav.php:87
 #, php-format
 msgid "People %s subscribes to"
 msgstr ""
 
-#: lib/subgroupnav.php:97
+#: lib/subgroupnav.php:95
 #, php-format
 msgid "People subscribed to %s"
 msgstr ""
 
-#: lib/subgroupnav.php:105
+#: lib/subgroupnav.php:103
 #, php-format
 msgid "Groups %s is a member of"
 msgstr ""
 
-#: lib/subgroupnav.php:111
+#: lib/subgroupnav.php:109
 msgid "Invite"
 msgstr ""
 
-#: lib/subgroupnav.php:112
+#: lib/subgroupnav.php:110
 #, php-format
 msgid "Invite friends and colleagues to join you on %s"
 msgstr ""
@@ -9198,59 +9210,59 @@ msgstr ""
 msgid "User %1$s (%2$d) has no profile record."
 msgstr ""
 
-#: lib/userprofile.php:116
+#: lib/userprofile.php:118
 msgid "Edit Avatar"
 msgstr ""
 
 #. TRANS: H2 for user actions in a profile.
 #. TRANS: H2 for entity actions in a profile.
-#: lib/userprofile.php:216 lib/userprofile.php:232
+#: lib/userprofile.php:220 lib/userprofile.php:236
 msgid "User actions"
 msgstr ""
 
 #. TRANS: Text shown in user profile of not yet compeltely deleted users.
-#: lib/userprofile.php:220
+#: lib/userprofile.php:224
 msgid "User deletion in progress..."
 msgstr ""
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:248
+#: lib/userprofile.php:252
 msgid "Edit profile settings"
 msgstr ""
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:250
+#: lib/userprofile.php:254
 msgid "Edit"
 msgstr ""
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:274
+#: lib/userprofile.php:278
 msgid "Send a direct message to this user"
 msgstr ""
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:276
+#: lib/userprofile.php:280
 msgid "Message"
 msgstr ""
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:318
+#: lib/userprofile.php:322
 msgid "Moderate"
 msgstr ""
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:357
+#: lib/userprofile.php:361
 msgid "User role"
 msgstr ""
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:360
+#: lib/userprofile.php:364
 msgctxt "role"
 msgid "Administrator"
 msgstr ""
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:362
+#: lib/userprofile.php:366
 msgctxt "role"
 msgid "Moderator"
 msgstr ""
diff --git a/locale/sv/LC_MESSAGES/statusnet.po b/locale/sv/LC_MESSAGES/statusnet.po
index 90c09d93b6..54b5404f05 100644
--- a/locale/sv/LC_MESSAGES/statusnet.po
+++ b/locale/sv/LC_MESSAGES/statusnet.po
@@ -13,17 +13,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-06 02:34+0100\n"
-"PO-Revision-Date: 2011-03-06 01:36:38+0000\n"
+"POT-Creation-Date: 2011-03-08 01:03+0000\n"
+"PO-Revision-Date: 2011-03-08 01:05:31+0000\n"
 "Language-Team: Swedish <http://translatewiki.net/wiki/Portal:sv>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: sv\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-03-03 17:59:19+0000\n"
+"X-POT-Import-Date: 2011-03-06 02:16:47+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -6028,82 +6028,9 @@ msgstr "Svara"
 msgid "Write a reply..."
 msgstr ""
 
-msgid "Home"
-msgstr "Hemsida"
-
 #, fuzzy
-msgid "Friends timeline"
-msgstr "%s tidslinje"
-
-msgid "Your profile"
-msgstr "Grupprofil"
-
-msgid "Public"
-msgstr "Publikt"
-
-#, fuzzy
-msgid "Everyone on this site"
-msgstr "Hitta personer på denna webbplats"
-
-msgid "Settings"
-msgstr "Inställningar för SMS"
-
-#, fuzzy
-msgid "Change your personal settings"
-msgstr "Ändra dina profilinställningar"
-
-#, fuzzy
-msgid "Site configuration"
-msgstr "Konfiguration av användare"
-
-msgid "Logout"
-msgstr "Logga ut"
-
-msgid "Logout from the site"
-msgstr "Logga ut från webbplatsen"
-
-msgid "Login to the site"
-msgstr "Logga in på webbplatsen"
-
-msgid "Search"
-msgstr "Sök"
-
-#, fuzzy
-msgid "Search the site"
-msgstr "Sök webbplats"
-
-#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-msgid "Help"
-msgstr "Hjälp"
-
-#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-msgid "About"
-msgstr "Om"
-
-#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-msgid "FAQ"
-msgstr "Frågor & svar"
-
-#. TRANS: Secondary navigation menu option leading to Terms of Service.
-msgid "TOS"
-msgstr "Användarvillkor"
-
-#. TRANS: Secondary navigation menu option leading to privacy policy.
-msgid "Privacy"
-msgstr "Sekretess"
-
-#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-msgid "Source"
-msgstr "Källa"
-
-#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
-#. TRANS: StatusNet site, where to report bugs, ...
-msgid "Contact"
-msgstr "Kontakt"
-
-#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-msgid "Badge"
-msgstr "Emblem"
+msgid "Status"
+msgstr "StatusNet"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #. TRANS: Text between [] is a link description, text between () is the link itself.
@@ -6896,6 +6823,12 @@ msgstr "Gå till installeraren."
 msgid "Database error"
 msgstr "Databasfel"
 
+msgid "Home"
+msgstr "Hemsida"
+
+msgid "Public"
+msgstr "Publikt"
+
 #. TRANS: Description of form for deleting a user.
 msgid "Delete this user"
 msgstr "Ta bort denna användare"
@@ -7570,6 +7503,18 @@ msgstr ""
 "engagera andra användare i konversationen. Folk kan skicka meddelanden till "
 "dig som bara du ser."
 
+msgid "Inbox"
+msgstr "Inkorg"
+
+msgid "Your incoming messages"
+msgstr "Dina inkommande meddelanden"
+
+msgid "Outbox"
+msgstr "Utkorg"
+
+msgid "Your sent messages"
+msgstr "Dina skickade meddelanden"
+
 msgid "Could not parse message."
 msgstr "Kunde inte tolka meddelande."
 
@@ -7649,6 +7594,20 @@ msgstr "Meddelande"
 msgid "from"
 msgstr "från"
 
+msgid "Can't get author for activity."
+msgstr ""
+
+#, fuzzy
+msgid "Bookmark not posted to this group."
+msgstr "Du får inte ta bort denna grupp."
+
+#, fuzzy
+msgid "Object not posted to this user."
+msgstr "Ta inte bort denna grupp"
+
+msgid "Don't know how to handle this kind of target."
+msgstr ""
+
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 msgid "Nickname cannot be empty."
 msgstr ""
@@ -7763,24 +7722,15 @@ msgstr "Duplicera notis."
 msgid "Couldn't insert new subscription."
 msgstr "Kunde inte infoga ny prenumeration."
 
+msgid "Your profile"
+msgstr "Grupprofil"
+
 msgid "Replies"
 msgstr "Svar"
 
 msgid "Favorites"
 msgstr "Favoriter"
 
-msgid "Inbox"
-msgstr "Inkorg"
-
-msgid "Your incoming messages"
-msgstr "Dina inkommande meddelanden"
-
-msgid "Outbox"
-msgstr "Utkorg"
-
-msgid "Your sent messages"
-msgstr "Dina skickade meddelanden"
-
 #. TRANS: Title for personal tag cloud section. %s is a user nickname.
 #, php-format
 msgid "Tags in %s's notices"
@@ -7804,6 +7754,33 @@ msgctxt "plugin-description"
 msgid "(Plugin descriptions unavailable when disabled.)"
 msgstr ""
 
+msgid "Settings"
+msgstr "Inställningar för SMS"
+
+#, fuzzy
+msgid "Change your personal settings"
+msgstr "Ändra dina profilinställningar"
+
+#, fuzzy
+msgid "Site configuration"
+msgstr "Konfiguration av användare"
+
+msgid "Logout"
+msgstr "Logga ut"
+
+msgid "Logout from the site"
+msgstr "Logga ut från webbplatsen"
+
+msgid "Login to the site"
+msgstr "Logga in på webbplatsen"
+
+msgid "Search"
+msgstr "Sök"
+
+#, fuzzy
+msgid "Search the site"
+msgstr "Sök webbplats"
+
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
 msgid "Subscriptions"
@@ -7913,6 +7890,39 @@ msgstr "Hitta innehåll i notiser"
 msgid "Find groups on this site"
 msgstr "Hitta grupper på denna webbplats"
 
+#. TRANS: Secondary navigation menu option leading to help on StatusNet.
+msgid "Help"
+msgstr "Hjälp"
+
+#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
+msgid "About"
+msgstr "Om"
+
+#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
+msgid "FAQ"
+msgstr "Frågor & svar"
+
+#. TRANS: Secondary navigation menu option leading to Terms of Service.
+msgid "TOS"
+msgstr "Användarvillkor"
+
+#. TRANS: Secondary navigation menu option leading to privacy policy.
+msgid "Privacy"
+msgstr "Sekretess"
+
+#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
+msgid "Source"
+msgstr "Källa"
+
+#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+msgid "Contact"
+msgstr "Kontakt"
+
+#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
+msgid "Badge"
+msgstr "Emblem"
+
 msgid "Untitled section"
 msgstr "Namnlös sektion"
 
@@ -8195,19 +8205,10 @@ msgstr ""
 msgid "Getting backup from file '%s'."
 msgstr ""
 
-#~ msgid "Full name is too long (max 255 chars)."
-#~ msgstr "Fullständigt namn är för långt (max 255 tecken)."
-
-#~ msgid "description is too long (max %d chars)."
-#~ msgstr "beskrivning är för lång (max %d tecken)."
-
-#~ msgid "Location is too long (max 255 chars)."
-#~ msgstr "Beskrivning av plats är för lång (max 255 tecken)."
-
-#~ msgid "Too many aliases! Maximum %d."
-#~ msgstr "För många alias! Maximum %d."
+#, fuzzy
+#~ msgid "Friends timeline"
+#~ msgstr "%s tidslinje"
 
 #, fuzzy
-#~ msgctxt "BUTTON"
-#~ msgid "Comment"
-#~ msgstr "Innehåll"
+#~ msgid "Everyone on this site"
+#~ msgstr "Hitta personer på denna webbplats"
diff --git a/locale/te/LC_MESSAGES/statusnet.po b/locale/te/LC_MESSAGES/statusnet.po
index e2c657b3a3..a79be5da68 100644
--- a/locale/te/LC_MESSAGES/statusnet.po
+++ b/locale/te/LC_MESSAGES/statusnet.po
@@ -10,17 +10,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-06 02:34+0100\n"
-"PO-Revision-Date: 2011-03-06 01:36:39+0000\n"
+"POT-Creation-Date: 2011-03-08 01:03+0000\n"
+"PO-Revision-Date: 2011-03-08 01:05:32+0000\n"
 "Language-Team: Telugu <http://translatewiki.net/wiki/Portal:te>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: te\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-03-03 17:59:19+0000\n"
+"X-POT-Import-Date: 2011-03-06 02:16:47+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -5918,82 +5918,9 @@ msgstr "స్పందించండి"
 msgid "Write a reply..."
 msgstr ""
 
-msgid "Home"
-msgstr "ముంగిలి"
-
 #, fuzzy
-msgid "Friends timeline"
-msgstr "%s కాలరేఖ"
-
-msgid "Your profile"
-msgstr "గుంపు ప్రొఫైలు"
-
-msgid "Public"
-msgstr "ప్రజా"
-
-#, fuzzy
-msgid "Everyone on this site"
-msgstr "ఈ సైటులోని వ్యక్తులని కనుగొనండి"
-
-msgid "Settings"
-msgstr "SMS అమరికలు"
-
-#, fuzzy
-msgid "Change your personal settings"
-msgstr "ఫ్రొఫైలు అమరికలని మార్చు"
-
-#, fuzzy
-msgid "Site configuration"
-msgstr "వాడుకరి స్వరూపణం"
-
-msgid "Logout"
-msgstr "నిష్క్రమించు"
-
-msgid "Logout from the site"
-msgstr "సైటు నుండి నిష్క్రమించు"
-
-msgid "Login to the site"
-msgstr "సైటులోని ప్రవేశించు"
-
-msgid "Search"
-msgstr "వెతుకు"
-
-#, fuzzy
-msgid "Search the site"
-msgstr "సైటుని వెతుకు"
-
-#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-msgid "Help"
-msgstr "సహాయం"
-
-#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-msgid "About"
-msgstr "గురించి"
-
-#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-msgid "FAQ"
-msgstr "ప్రశ్నలు"
-
-#. TRANS: Secondary navigation menu option leading to Terms of Service.
-msgid "TOS"
-msgstr "సేవా నియమాలు"
-
-#. TRANS: Secondary navigation menu option leading to privacy policy.
-msgid "Privacy"
-msgstr "అంతరంగికత"
-
-#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-msgid "Source"
-msgstr "మూలము"
-
-#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
-#. TRANS: StatusNet site, where to report bugs, ...
-msgid "Contact"
-msgstr "సంప్రదించు"
-
-#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-msgid "Badge"
-msgstr "బాడ్జి"
+msgid "Status"
+msgstr "స్టేటస్‌నెట్"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #. TRANS: Text between [] is a link description, text between () is the link itself.
@@ -6758,6 +6685,12 @@ msgstr "సైటు లోనికి ప్రవేశించండి"
 msgid "Database error"
 msgstr ""
 
+msgid "Home"
+msgstr "ముంగిలి"
+
+msgid "Public"
+msgstr "ప్రజా"
+
 #. TRANS: Description of form for deleting a user.
 msgid "Delete this user"
 msgstr "ఈ వాడుకరిని తొలగించు"
@@ -7419,6 +7352,18 @@ msgstr ""
 "మీకు అంతరంగిక సందేశాలు లేవు. ఇతర వాడుకరులతో సంభాషణకై మీరు వారికి అంతరంగిక సందేశాలు "
 "పంపించవచ్చు. మీ కంటికి మాత్రమే కనబడేలా వారు మీకు సందేశాలు పంపవచ్చు."
 
+msgid "Inbox"
+msgstr "వచ్చినవి"
+
+msgid "Your incoming messages"
+msgstr "మీకు వచ్చిన సందేశాలు"
+
+msgid "Outbox"
+msgstr "పంపినవి"
+
+msgid "Your sent messages"
+msgstr "మీరు పంపిన సందేశాలు"
+
 #, fuzzy
 msgid "Could not parse message."
 msgstr "వాడుకరిని తాజాకరించలేకున్నాం."
@@ -7497,6 +7442,20 @@ msgstr "సందేశం"
 msgid "from"
 msgstr "నుండి"
 
+msgid "Can't get author for activity."
+msgstr ""
+
+#, fuzzy
+msgid "Bookmark not posted to this group."
+msgstr "ఈ గుంపును తొలగించడానికి మీకు అనుమతి లేదు."
+
+#, fuzzy
+msgid "Object not posted to this user."
+msgstr "ఈ వాడుకరిని తొలగించకండి."
+
+msgid "Don't know how to handle this kind of target."
+msgstr ""
+
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 msgid "Nickname cannot be empty."
 msgstr ""
@@ -7614,24 +7573,15 @@ msgstr ""
 msgid "Couldn't insert new subscription."
 msgstr "కొత్త చందాని చేర్చలేకపోయాం."
 
+msgid "Your profile"
+msgstr "గుంపు ప్రొఫైలు"
+
 msgid "Replies"
 msgstr "స్పందనలు"
 
 msgid "Favorites"
 msgstr "ఇష్టాంశాలు"
 
-msgid "Inbox"
-msgstr "వచ్చినవి"
-
-msgid "Your incoming messages"
-msgstr "మీకు వచ్చిన సందేశాలు"
-
-msgid "Outbox"
-msgstr "పంపినవి"
-
-msgid "Your sent messages"
-msgstr "మీరు పంపిన సందేశాలు"
-
 #. TRANS: Title for personal tag cloud section. %s is a user nickname.
 #, php-format
 msgid "Tags in %s's notices"
@@ -7656,6 +7606,33 @@ msgctxt "plugin-description"
 msgid "(Plugin descriptions unavailable when disabled.)"
 msgstr ""
 
+msgid "Settings"
+msgstr "SMS అమరికలు"
+
+#, fuzzy
+msgid "Change your personal settings"
+msgstr "ఫ్రొఫైలు అమరికలని మార్చు"
+
+#, fuzzy
+msgid "Site configuration"
+msgstr "వాడుకరి స్వరూపణం"
+
+msgid "Logout"
+msgstr "నిష్క్రమించు"
+
+msgid "Logout from the site"
+msgstr "సైటు నుండి నిష్క్రమించు"
+
+msgid "Login to the site"
+msgstr "సైటులోని ప్రవేశించు"
+
+msgid "Search"
+msgstr "వెతుకు"
+
+#, fuzzy
+msgid "Search the site"
+msgstr "సైటుని వెతుకు"
+
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
 msgid "Subscriptions"
@@ -7766,6 +7743,39 @@ msgstr ""
 msgid "Find groups on this site"
 msgstr "ఈ సైటులోని గుంపులని కనుగొనండి"
 
+#. TRANS: Secondary navigation menu option leading to help on StatusNet.
+msgid "Help"
+msgstr "సహాయం"
+
+#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
+msgid "About"
+msgstr "గురించి"
+
+#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
+msgid "FAQ"
+msgstr "ప్రశ్నలు"
+
+#. TRANS: Secondary navigation menu option leading to Terms of Service.
+msgid "TOS"
+msgstr "సేవా నియమాలు"
+
+#. TRANS: Secondary navigation menu option leading to privacy policy.
+msgid "Privacy"
+msgstr "అంతరంగికత"
+
+#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
+msgid "Source"
+msgstr "మూలము"
+
+#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+msgid "Contact"
+msgstr "సంప్రదించు"
+
+#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
+msgid "Badge"
+msgstr "బాడ్జి"
+
 msgid "Untitled section"
 msgstr "శీర్షికలేని విభాగం"
 
@@ -8047,21 +8057,10 @@ msgstr ""
 msgid "Getting backup from file '%s'."
 msgstr ""
 
-#~ msgid "Full name is too long (max 255 chars)."
-#~ msgstr "పూర్తి పేరు చాలా పెద్దగా ఉంది (గరిష్ఠం 255 అక్షరాలు)."
+#, fuzzy
+#~ msgid "Friends timeline"
+#~ msgstr "%s కాలరేఖ"
 
-#~ msgid "description is too long (max %d chars)."
-#~ msgstr "వివరణ చాలా పెద్దదిగా ఉంది (140 అక్షరాలు గరిష్ఠం)."
-
-#~ msgid "Location is too long (max 255 chars)."
-#~ msgstr "ప్రాంతం పేరు మరీ పెద్దగా ఉంది (255 అక్షరాలు గరిష్ఠం)."
-
-#~ msgid "Too many aliases! Maximum %d."
-#~ msgstr "చాలా మారుపేర్లు! %d గరిష్ఠం."
-
-#~ msgctxt "BUTTON"
-#~ msgid "Comment"
-#~ msgstr "వ్యాఖ్య"
-
-#~ msgid "Add a comment..."
-#~ msgstr "ఒక వ్యాఖ్యని చేర్చండి..."
+#, fuzzy
+#~ msgid "Everyone on this site"
+#~ msgstr "ఈ సైటులోని వ్యక్తులని కనుగొనండి"
diff --git a/locale/tr/LC_MESSAGES/statusnet.po b/locale/tr/LC_MESSAGES/statusnet.po
index 95d467fcf1..a0278b8b99 100644
--- a/locale/tr/LC_MESSAGES/statusnet.po
+++ b/locale/tr/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-03-06 02:34+0100\n"
-"PO-Revision-Date: 2011-03-06 01:36:40+0000\n"
+"POT-Creation-Date: 2011-03-08 01:03+0000\n"
+"PO-Revision-Date: 2011-03-08 01:05:33+0000\n"
 "Language-Team: Turkish <http://translatewiki.net/wiki/Portal:tr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tr\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-POT-Import-Date: 2011-03-03 17:59:19+0000\n"
+"X-POT-Import-Date: 2011-03-06 02:16:47+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -5925,84 +5925,9 @@ msgstr "Cevaplar"
 msgid "Write a reply..."
 msgstr ""
 
-msgid "Home"
-msgstr "Başlangıç Sayfası"
-
 #, fuzzy
-msgid "Friends timeline"
-msgstr "%s zaman çizelgesi"
-
-msgid "Your profile"
-msgstr "Kullanıcının profili yok."
-
-msgid "Public"
-msgstr "Genel"
-
-#, fuzzy
-msgid "Everyone on this site"
-msgstr "Siteye giriş"
-
-msgid "Settings"
-msgstr "Profil ayarları"
-
-#, fuzzy
-msgid "Change your personal settings"
-msgstr "Profil ayarlarınızı değiştirin"
-
-#, fuzzy
-msgid "Site configuration"
-msgstr "Onay kodu yok."
-
-msgid "Logout"
-msgstr "Çıkış"
-
-#, fuzzy
-msgid "Logout from the site"
-msgstr "Siteye giriş"
-
-#, fuzzy
-msgid "Login to the site"
-msgstr "Siteye giriş"
-
-msgid "Search"
-msgstr "Ara"
-
-#, fuzzy
-msgid "Search the site"
-msgstr "Ara"
-
-#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-msgid "Help"
-msgstr "Yardım"
-
-#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-msgid "About"
-msgstr "Hakkında"
-
-#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-msgid "FAQ"
-msgstr "SSS"
-
-#. TRANS: Secondary navigation menu option leading to Terms of Service.
-msgid "TOS"
-msgstr ""
-
-#. TRANS: Secondary navigation menu option leading to privacy policy.
-msgid "Privacy"
-msgstr "Gizlilik"
-
-#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-msgid "Source"
-msgstr "Kaynak"
-
-#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
-#. TRANS: StatusNet site, where to report bugs, ...
-msgid "Contact"
-msgstr "İletişim"
-
-#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-msgid "Badge"
-msgstr ""
+msgid "Status"
+msgstr "İstatistikler"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #. TRANS: Text between [] is a link description, text between () is the link itself.
@@ -6762,6 +6687,12 @@ msgstr ""
 msgid "Database error"
 msgstr ""
 
+msgid "Home"
+msgstr "Başlangıç Sayfası"
+
+msgid "Public"
+msgstr "Genel"
+
 #. TRANS: Description of form for deleting a user.
 msgid "Delete this user"
 msgstr "Bu kullanıcıyı sil"
@@ -7346,6 +7277,18 @@ msgid ""
 "users in conversation. People can send you messages for your eyes only."
 msgstr ""
 
+msgid "Inbox"
+msgstr ""
+
+msgid "Your incoming messages"
+msgstr ""
+
+msgid "Outbox"
+msgstr ""
+
+msgid "Your sent messages"
+msgstr ""
+
 msgid "Could not parse message."
 msgstr "Mesaj ayrıştırılamadı."
 
@@ -7422,6 +7365,20 @@ msgstr "Mesaj gönder"
 msgid "from"
 msgstr ""
 
+msgid "Can't get author for activity."
+msgstr ""
+
+#, fuzzy
+msgid "Bookmark not posted to this group."
+msgstr "Bu grubun bir üyesi değilsiniz."
+
+#, fuzzy
+msgid "Object not posted to this user."
+msgstr "Bu durum mesajını silme"
+
+msgid "Don't know how to handle this kind of target."
+msgstr ""
+
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 msgid "Nickname cannot be empty."
 msgstr ""
@@ -7538,6 +7495,9 @@ msgstr ""
 msgid "Couldn't insert new subscription."
 msgstr "Yeni abonelik eklenemedi."
 
+msgid "Your profile"
+msgstr "Kullanıcının profili yok."
+
 msgid "Replies"
 msgstr "Cevaplar"
 
@@ -7545,18 +7505,6 @@ msgstr "Cevaplar"
 msgid "Favorites"
 msgstr "%s favorileri"
 
-msgid "Inbox"
-msgstr ""
-
-msgid "Your incoming messages"
-msgstr ""
-
-msgid "Outbox"
-msgstr ""
-
-msgid "Your sent messages"
-msgstr ""
-
 #. TRANS: Title for personal tag cloud section. %s is a user nickname.
 #, php-format
 msgid "Tags in %s's notices"
@@ -7580,6 +7528,35 @@ msgctxt "plugin-description"
 msgid "(Plugin descriptions unavailable when disabled.)"
 msgstr ""
 
+msgid "Settings"
+msgstr "Profil ayarları"
+
+#, fuzzy
+msgid "Change your personal settings"
+msgstr "Profil ayarlarınızı değiştirin"
+
+#, fuzzy
+msgid "Site configuration"
+msgstr "Onay kodu yok."
+
+msgid "Logout"
+msgstr "Çıkış"
+
+#, fuzzy
+msgid "Logout from the site"
+msgstr "Siteye giriş"
+
+#, fuzzy
+msgid "Login to the site"
+msgstr "Siteye giriş"
+
+msgid "Search"
+msgstr "Ara"
+
+#, fuzzy
+msgid "Search the site"
+msgstr "Ara"
+
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
 msgid "Subscriptions"
@@ -7697,6 +7674,39 @@ msgstr ""
 msgid "Find groups on this site"
 msgstr ""
 
+#. TRANS: Secondary navigation menu option leading to help on StatusNet.
+msgid "Help"
+msgstr "Yardım"
+
+#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
+msgid "About"
+msgstr "Hakkında"
+
+#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
+msgid "FAQ"
+msgstr "SSS"
+
+#. TRANS: Secondary navigation menu option leading to Terms of Service.
+msgid "TOS"
+msgstr ""
+
+#. TRANS: Secondary navigation menu option leading to privacy policy.
+msgid "Privacy"
+msgstr "Gizlilik"
+
+#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
+msgid "Source"
+msgstr "Kaynak"
+
+#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+msgid "Contact"
+msgstr "İletişim"
+
+#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
+msgid "Badge"
+msgstr ""
+
 msgid "Untitled section"
 msgstr ""
 
@@ -7981,19 +7991,10 @@ msgstr ""
 msgid "Getting backup from file '%s'."
 msgstr ""
 
-#~ msgid "Full name is too long (max 255 chars)."
-#~ msgstr "Tam isim çok uzun (en fazla: 255 karakter)."
-
-#~ msgid "description is too long (max %d chars)."
-#~ msgstr "Tanım çok uzun (en fazla %d karakter)."
-
-#~ msgid "Location is too long (max 255 chars)."
-#~ msgstr "Yer bilgisi çok uzun (en fazla 255 karakter)."
-
-#~ msgid "Too many aliases! Maximum %d."
-#~ msgstr "Çok fazla diğerisim! En fazla %d."
+#, fuzzy
+#~ msgid "Friends timeline"
+#~ msgstr "%s zaman çizelgesi"
 
 #, fuzzy
-#~ msgctxt "BUTTON"
-#~ msgid "Comment"
-#~ msgstr "İçerik"
+#~ msgid "Everyone on this site"
+#~ msgstr "Siteye giriş"
diff --git a/locale/uk/LC_MESSAGES/statusnet.po b/locale/uk/LC_MESSAGES/statusnet.po
index b830803af4..3077a74597 100644
--- a/locale/uk/LC_MESSAGES/statusnet.po
+++ b/locale/uk/LC_MESSAGES/statusnet.po
@@ -12,18 +12,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-06 02:34+0100\n"
-"PO-Revision-Date: 2011-03-06 01:36:41+0000\n"
+"POT-Creation-Date: 2011-03-08 01:03+0000\n"
+"PO-Revision-Date: 2011-03-08 01:05:34+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
-"X-POT-Import-Date: 2011-03-03 17:59:19+0000\n"
+"X-POT-Import-Date: 2011-03-06 02:16:47+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -956,9 +956,9 @@ msgstr "Метод не виконується."
 msgid "Repeated to %s"
 msgstr "Повторено для %s"
 
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s notices that were to repeated to %2$s / %3$s."
-msgstr "%1$s оновив цю відповідь на допис від %2$s / %3$s."
+msgstr "Дописи %1$s, що вони були повторені %2$s / %3$s."
 
 #. TRANS: Title of list of repeated notices of the logged in user.
 #. TRANS: %s is the nickname of the logged in user.
@@ -966,9 +966,9 @@ msgstr "%1$s оновив цю відповідь на допис від %2$s /
 msgid "Repeats of %s"
 msgstr "Повторення %s"
 
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s notices that %2$s / %3$s has repeated."
-msgstr "%1$s додав(ла) ваш допис %2$s до обраних."
+msgstr "Дописи %1$s, які повторював %2$s / %3$s."
 
 #. TRANS: Title for timeline with lastest notices with a given tag.
 #. TRANS: %s is the tag.
@@ -1441,13 +1441,11 @@ msgstr "Цю адресу вже підтверджено."
 msgid "Couldn't update user."
 msgstr "Не вдалося оновити користувача."
 
-#, fuzzy
 msgid "Couldn't update user im preferences."
-msgstr "Не вдалося оновити запис користувача."
+msgstr "Не вдалося оновити налаштування сервісу миттєвих повідомлень."
 
-#, fuzzy
 msgid "Couldn't insert user im preferences."
-msgstr "Не вдалося додати нову підписку."
+msgstr "Не вдалося вставити налаштування сервісу миттєвих повідомлень."
 
 #. TRANS: Server error displayed when an address confirmation code deletion from the
 #. TRANS: database fails in the contact address confirmation action.
@@ -2567,73 +2565,63 @@ msgstr "Налаштування ІМ"
 #. 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 [instant messages]"
 "(%%doc.im%%). Configure your addresses and settings below."
 msgstr ""
-"Ви можете надсилати та отримувати дописи через Jabber/Google Talk [службу "
-"миттєвих повідомлень](%%doc.im%%). Вкажіть свою адресу і налаштуйте опції "
-"нижче."
+"Ви можете надсилати та отримувати дописи через повідомлення [служби миттєвих "
+"повідомлень](%%doc.im%%). Вкажіть свою адресу і налаштуйте опції нижче."
 
 #. TRANS: Message given in the IM settings if IM is not enabled on the site.
 msgid "IM is not available."
 msgstr "ІМ недоступний"
 
-#, fuzzy, php-format
+#, php-format
 msgid "Current confirmed %s address."
-msgstr "Поточна підтверджена поштова адреса."
+msgstr "Поточна підтверджена %s адреса."
 
 #. TRANS: Form note in IM settings form.
 #. TRANS: %s is the IM address set for the site.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your %s account for a message "
 "with further instructions. (Did you add %s to your buddy list?)"
 msgstr ""
-"Очікування підтвердження цієї адреси. Перевірте свій Jabber/Google Talk "
-"акаунт, туди має надійти повідомлення з подальшими інструкціями. (Ви додали %"
-"s до вашого списку контактів?)"
+"Очікування підтвердження цієї адреси. Перевірте свій %s-акаунт, туди має "
+"надійти повідомлення з подальшими інструкціями. (Ви додали %s до вашого "
+"списку контактів?)"
 
 msgid "IM address"
 msgstr "ІМ-адреса"
 
 #, php-format
 msgid "%s screenname."
-msgstr ""
+msgstr "Псевдонім %s."
 
 #. TRANS: Header for IM preferences form.
-#, fuzzy
 msgid "IM Preferences"
 msgstr "Преференції ІМ"
 
 #. TRANS: Checkbox label in IM preferences form.
-#, fuzzy
 msgid "Send me notices"
-msgstr "Надіслати допис"
+msgstr "Надсилати мені дописи"
 
 #. TRANS: Checkbox label in IM preferences form.
-#, fuzzy
 msgid "Post a notice when my status changes."
-msgstr ""
-"Надсилати дописи на сайт, коли мій статус Jabber/Google Talk змінюється."
+msgstr "Надсилати дописи на сайт, коли мій статус змінюється."
 
 #. TRANS: Checkbox label in IM preferences form.
-#, fuzzy
 msgid "Send me replies from people I'm not subscribed to."
-msgstr ""
-"Надсилати мені відповіді через Jabber/Google Talk від людей, до яких я не "
-"підписаний."
+msgstr "Надсилати мені відповіді від людей, до яких я не підписаний."
 
 #. TRANS: Checkbox label in IM preferences form.
-#, fuzzy
 msgid "Publish a MicroID"
-msgstr "Позначати міткою MicroID мою електронну адресу."
+msgstr "Публікувати MicroID."
 
 #. TRANS: Server error thrown on database error updating IM preferences.
-#, fuzzy
 msgid "Couldn't update IM preferences."
-msgstr "Не вдалося оновити користувача."
+msgstr "Не вдалося оновити налаштування сервісу миттєвих повідомлень."
 
 #. TRANS: Confirmation message for successful IM preferences save.
 #. TRANS: Confirmation message after saving preferences.
@@ -2641,44 +2629,35 @@ msgid "Preferences saved."
 msgstr "Преференції збережно."
 
 #. TRANS: Message given saving IM address without having provided one.
-#, fuzzy
 msgid "No screenname."
-msgstr "Немає імені."
+msgstr "Немає псевдоніму."
 
-#, fuzzy
 msgid "No transport."
-msgstr "Немає допису."
+msgstr "Немає транспорту."
 
 #. TRANS: Message given saving IM address that cannot be normalised.
-#, fuzzy
 msgid "Cannot normalize that screenname"
-msgstr "Не можна полагодити цей Jabber ID."
+msgstr "Не можна впорядкувати цей псевдонім"
 
 #. TRANS: Message given saving IM address that not valid.
-#, fuzzy
 msgid "Not a valid screenname"
-msgstr "Це недійсне ім’я користувача."
+msgstr "Це недійсне ім’я користувача"
 
 #. TRANS: Message given saving IM address that is already set for another user.
-#, fuzzy
 msgid "Screenname already belongs to another user."
-msgstr "Jabber ID вже належить іншому користувачу."
+msgstr "Даний псевдонім вже належить іншому користувачеві."
 
 #. TRANS: Message given saving valid IM address that is to be confirmed.
-#, fuzzy
 msgid "A confirmation code was sent to the IM address you added."
-msgstr ""
-"Код підтвердження був відправлений на адресу IM, яку ви зазначили. Ви "
-"повинні затвердити %s для відправлення вам повідомлень."
+msgstr "Код підтвердження був відправлений на адресу IM, яку ви зазначили."
 
 #. TRANS: Message given canceling IM address confirmation for the wrong IM address.
 msgid "That is the wrong IM address."
 msgstr "Це помилкова адреса IM."
 
 #. TRANS: Server error thrown on database error canceling IM address confirmation.
-#, fuzzy
 msgid "Couldn't delete confirmation."
-msgstr "Не вдалося видалити підтвердження ІМ-адреси."
+msgstr "Не вдалося видалити підтвердження."
 
 #. TRANS: Message given after successfully canceling IM address confirmation.
 msgid "IM confirmation cancelled."
@@ -2686,14 +2665,13 @@ msgstr "Підтвердження ІМ скасовано."
 
 #. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.
-#, fuzzy
 msgid "That is not your screenname."
-msgstr "Це не ваш телефонний номер."
+msgstr "Це не ваш псевдонім."
 
 #. TRANS: Server error thrown on database error removing a registered IM address.
-#, fuzzy
 msgid "Couldn't update user im prefs."
-msgstr "Не вдалося оновити запис користувача."
+msgstr ""
+"Не вдалося оновити користувацькі налаштування служби миттєвих повідомлень."
 
 #. TRANS: Message given after successfully removing a registered Instant Messaging address.
 msgid "The IM address was removed."
@@ -2974,9 +2952,8 @@ msgid "Type"
 msgstr "Тип"
 
 #. TRANS: Dropdown field instructions in the license admin panel.
-#, fuzzy
 msgid "Select a license."
-msgstr "Оберіть ліцензію"
+msgstr "Оберіть ліцензію."
 
 #. TRANS: Form legend in the license admin panel.
 msgid "License details"
@@ -3015,9 +2992,8 @@ msgid "URL for an image to display with the license."
 msgstr "URL-адреса зображення (логотипу) для показу поруч з ліцензією"
 
 #. TRANS: Button title in the license admin panel.
-#, fuzzy
 msgid "Save license settings."
-msgstr "Зберегти налаштування ліцензії"
+msgstr "Зберегти налаштування ліцензії."
 
 #. TRANS: Client error displayed when trying to log in while already logged in.
 #. TRANS: Client error displayed trying to use "one time password login" when already logged in.
@@ -3052,7 +3028,6 @@ msgstr ""
 "користування!"
 
 #. TRANS: Button text for log in on login page.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Login"
 msgstr "Увійти"
@@ -3152,7 +3127,6 @@ msgstr "Нове повідомлення"
 
 #. TRANS: Client error displayed trying to send a direct message to a user while sender and
 #. TRANS: receiver are not subscribed to each other.
-#, fuzzy
 msgid "You cannot send a message to this user."
 msgstr "Ви не можете надіслати повідомлення цьому користувачеві."
 
@@ -3703,25 +3677,23 @@ msgstr "Користувачі з особистим теґом «%1$s» — с
 #. TRANS: Page title for AJAX form return when a disabling a plugin.
 msgctxt "plugin"
 msgid "Disabled"
-msgstr ""
+msgstr "Вимкнений"
 
 #. TRANS: Client error displayed trying to perform any request method other than POST.
 #. TRANS: Do not translate POST.
 msgid "This action only accepts POST requests."
 msgstr "Ця дія приймає лише запити POST."
 
-#, fuzzy
 msgid "You cannot administer plugins."
-msgstr "Ви не можете видаляти користувачів."
+msgstr "Ви не можете керувати додатками."
 
-#, fuzzy
 msgid "No such plugin."
-msgstr "Немає такої сторінки."
+msgstr "Немає такого додатку."
 
 #. TRANS: Page title for AJAX form return when enabling a plugin.
 msgctxt "plugin"
 msgid "Enabled"
-msgstr ""
+msgstr "Увімкнений"
 
 #. TRANS: Tab and title for plugins admin panel.
 #. TRANS: Menu item for site administration
@@ -3734,15 +3706,18 @@ msgid ""
 "\"http://status.net/wiki/Plugins\">online plugin documentation</a> for more "
 "details."
 msgstr ""
+"Додатки можна увімкнути та налаштувати вручну. Перегляньте <a href=\"http://"
+"status.net/wiki/Plugins\">документацію щодо цього</a>, аби отримати більше "
+"відомостей."
 
 #. TRANS: Admin form section header
-#, fuzzy
 msgid "Default plugins"
-msgstr "Мова за замовчуванням"
+msgstr "Додатки за замовчуванням"
 
 msgid ""
 "All default plugins have been disabled from the site's configuration file."
 msgstr ""
+"Всі додатки за замовчуванням було вимкнено у файлі конфігурації даного сайту."
 
 msgid "Invalid notice content."
 msgstr "Недійсний зміст допису."
@@ -4133,13 +4108,12 @@ msgstr "Помилка в налаштуваннях користувача."
 msgid "New password successfully saved. You are now logged in."
 msgstr "Новий пароль успішно збережено. Тепер ви увійшли."
 
-#, fuzzy
 msgid "No id parameter"
-msgstr "Немає ID аргументу."
+msgstr "Немає параметру ID."
 
-#, fuzzy, php-format
+#, php-format
 msgid "No such file \"%d\""
-msgstr "Такого файлу немає."
+msgstr "Немає такого файлу «%d»"
 
 msgid "Sorry, only invited people can register."
 msgstr ""
@@ -5293,9 +5267,8 @@ msgid ""
 "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
 msgstr "Ліцензія «%1$s» не відповідає ліцензії сайту «%2$s»."
 
-#, fuzzy
 msgid "URL settings"
-msgstr "Налаштування ІМ"
+msgstr "Налаштування URL"
 
 #. TRANS: Instructions for tab "Other" in user profile settings.
 msgid "Manage various other options."
@@ -5307,12 +5280,11 @@ msgstr "Керування деякими іншими опціями."
 msgid " (free service)"
 msgstr " (вільний сервіс)"
 
-#, fuzzy
 msgid "[none]"
-msgstr "Пусто"
+msgstr "[пусто]"
 
 msgid "[internal]"
-msgstr ""
+msgstr "[внутрішній]"
 
 #. TRANS: Label for dropdown with URL shortener services.
 msgid "Shorten URLs with"
@@ -5323,31 +5295,34 @@ msgid "Automatic shortening service to use."
 msgstr "Доступні сервіси."
 
 msgid "URL longer than"
-msgstr ""
+msgstr "URL-адреса, довша за"
 
 msgid "URLs longer than this will be shortened, 0 means always shorten."
 msgstr ""
+"URL-адреси, довші за це значення, будуть скорочуватись (0 — завжди "
+"скорочувати)."
 
 msgid "Text longer than"
-msgstr ""
+msgstr "Текст, довший за"
 
 msgid ""
 "URLs in notices longer than this will be shortened, 0 means always shorten."
 msgstr ""
+"URL-адреси в дописах, довших за це значення, будуть скорочуватись (0 — "
+"завжди скорочувати)."
 
 #. TRANS: Form validation error for form "Other settings" in user profile.
 msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr "Сервіс скорочення URL-адрес надто довгий (50 символів максимум)."
 
 msgid "Invalid number for max url length."
-msgstr ""
+msgstr "Невірне значення параметру максимальної довжини URL-адреси."
 
-#, fuzzy
 msgid "Invalid number for max notice length."
-msgstr "Недійсний зміст допису."
+msgstr "Невірне значення параметру максимальної довжини допису."
 
 msgid "Error saving user URL shortening preferences."
-msgstr ""
+msgstr "Помилка при збереженні налаштувань сервісу скорочення URL-адрес."
 
 #. TRANS: User admin panel title
 msgctxt "TITLE"
@@ -5547,9 +5522,8 @@ msgstr ""
 msgid "Enjoy your hotdog!"
 msgstr "Поласуйте бутербродом!"
 
-#, fuzzy
 msgid "Design settings"
-msgstr "Зберегти налаштування сайту"
+msgstr "Налаштування дизайну"
 
 msgid "View profile designs"
 msgstr "Переглядати дизайн користувачів"
@@ -5557,9 +5531,8 @@ msgstr "Переглядати дизайн користувачів"
 msgid "Show or hide profile designs."
 msgstr "Показувати або приховувати дизайни сторінок окремих користувачів."
 
-#, fuzzy
 msgid "Background file"
-msgstr "Фон"
+msgstr "Файл фону"
 
 #. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number.
 #, php-format
@@ -5964,91 +5937,17 @@ msgid "Show more"
 msgstr "Розгорнути"
 
 #. TRANS: Inline reply form submit button: submits a reply comment.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Reply"
 msgstr "Відповісти"
 
 #. TRANS: Placeholder text for inline reply form. Clicking in this box will turn it into a mini notice form.
 msgid "Write a reply..."
-msgstr ""
-
-msgid "Home"
-msgstr "Веб-сторінка"
+msgstr "Пише відповідь..."
 
 #, fuzzy
-msgid "Friends timeline"
-msgstr "%s стрічка"
-
-msgid "Your profile"
-msgstr "Профіль спільноти"
-
-msgid "Public"
-msgstr "Загал"
-
-#, fuzzy
-msgid "Everyone on this site"
-msgstr "Пошук людей на цьому сайті"
-
-msgid "Settings"
-msgstr "Налаштування СМС"
-
-#, fuzzy
-msgid "Change your personal settings"
-msgstr "Змінити налаштування профілю"
-
-#, fuzzy
-msgid "Site configuration"
-msgstr "Конфігурація користувача"
-
-msgid "Logout"
-msgstr "Вийти"
-
-msgid "Logout from the site"
-msgstr "Вийти з сайту"
-
-msgid "Login to the site"
-msgstr "Увійти на сайт"
-
-msgid "Search"
-msgstr "Пошук"
-
-#, fuzzy
-msgid "Search the site"
-msgstr "Пошук"
-
-#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-msgid "Help"
-msgstr "Допомога"
-
-#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-msgid "About"
-msgstr "Про"
-
-#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-msgid "FAQ"
-msgstr "ЧаП"
-
-#. TRANS: Secondary navigation menu option leading to Terms of Service.
-msgid "TOS"
-msgstr "Умови"
-
-#. TRANS: Secondary navigation menu option leading to privacy policy.
-msgid "Privacy"
-msgstr "Приватність"
-
-#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-msgid "Source"
-msgstr "Джерело"
-
-#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
-#. TRANS: StatusNet site, where to report bugs, ...
-msgid "Contact"
-msgstr "Контакт"
-
-#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-msgid "Badge"
-msgstr "Бедж"
+msgid "Status"
+msgstr "StatusNet"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #. TRANS: Text between [] is a link description, text between () is the link itself.
@@ -6269,9 +6168,8 @@ msgid "Set site license"
 msgstr "Зазначте ліцензію сайту"
 
 #. TRANS: Menu item title/tooltip
-#, fuzzy
 msgid "Plugins configuration"
-msgstr "Конфігурація шляху"
+msgstr "Налаштування додатків"
 
 #. TRANS: Client error 401.
 msgid "API resource requires read-write access, but you only have read access."
@@ -6528,9 +6426,8 @@ msgstr ""
 "Дописи: %3$s"
 
 #. TRANS: Error message text shown when a favorite could not be set because it has already been favorited.
-#, fuzzy
 msgid "Could not create favorite: already favorited."
-msgstr "Не можна позначити як обране."
+msgstr "Не можна позначити як обране: вже обране."
 
 #. TRANS: Text shown when a notice has been marked as favourite successfully.
 msgid "Notice marked as fave."
@@ -6846,13 +6743,18 @@ msgstr "Іти до файлу інсталяції."
 msgid "Database error"
 msgstr "Помилка бази даних"
 
+msgid "Home"
+msgstr "Веб-сторінка"
+
+msgid "Public"
+msgstr "Загал"
+
 #. TRANS: Description of form for deleting a user.
 msgid "Delete this user"
 msgstr "Видалити цього користувача"
 
-#, fuzzy
 msgid "Change design"
-msgstr "Зберегти дизайн"
+msgstr "Змінити дизайн"
 
 #. TRANS: Fieldset legend on profile design page to change profile page colours.
 msgid "Change colours"
@@ -7156,6 +7058,11 @@ msgid ""
 "user isn't you, or if you didn't request this confirmation, just ignore this "
 "message."
 msgstr ""
+"Користувач «%s» на сайті %s повідомив, що псевдонім %s належить йому. Якщо це "
+"дійсно так, ви можете підтвердити це просто перейшовши за наступною ланкою: %"
+"s. (Якщо ви не можете натиснути на посилання, то скопіюйте адресу до "
+"адресного рядка вашого веб-оглядача.) Якщо ви не є згаданим користувачем, не "
+"підтверджуйте нічого, просто проігноруйте це повідомлення."
 
 #, php-format
 msgid "Unknown inbox source %d."
@@ -7529,6 +7436,18 @@ msgstr ""
 "повідомлення аби долучити користувачів до розмови. Такі повідомлення бачите "
 "лише ви."
 
+msgid "Inbox"
+msgstr "Вхідні"
+
+msgid "Your incoming messages"
+msgstr "Ваші вхідні повідомлення"
+
+msgid "Outbox"
+msgstr "Вихідні"
+
+msgid "Your sent messages"
+msgstr "Надіслані вами повідомлення"
+
 msgid "Could not parse message."
 msgstr "Не можна розібрати повідомлення."
 
@@ -7605,6 +7524,20 @@ msgstr "Повідомлення"
 msgid "from"
 msgstr "з"
 
+msgid "Can't get author for activity."
+msgstr ""
+
+#, fuzzy
+msgid "Bookmark not posted to this group."
+msgstr "Вам не дозволено видаляти цю спільноту."
+
+#, fuzzy
+msgid "Object not posted to this user."
+msgstr "Не видаляти цього користувача."
+
+msgid "Don't know how to handle this kind of target."
+msgstr ""
+
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 msgid "Nickname cannot be empty."
 msgstr "Псевдонім не може бути порожнім."
@@ -7631,9 +7564,8 @@ msgid "Attach"
 msgstr "Вкласти"
 
 #. TRANS: Title for input field to attach a file to a notice.
-#, fuzzy
 msgid "Attach a file."
-msgstr "Вкласти файл"
+msgstr "Вкласти файл."
 
 #. TRANS: Field label to add location to a notice.
 msgid "Share my location"
@@ -7720,24 +7652,15 @@ msgstr "Дублікат допису."
 msgid "Couldn't insert new subscription."
 msgstr "Не вдалося додати нову підписку."
 
+msgid "Your profile"
+msgstr "Профіль спільноти"
+
 msgid "Replies"
 msgstr "Відповіді"
 
 msgid "Favorites"
 msgstr "Обрані"
 
-msgid "Inbox"
-msgstr "Вхідні"
-
-msgid "Your incoming messages"
-msgstr "Ваші вхідні повідомлення"
-
-msgid "Outbox"
-msgstr "Вихідні"
-
-msgid "Your sent messages"
-msgstr "Надіслані вами повідомлення"
-
 #. TRANS: Title for personal tag cloud section. %s is a user nickname.
 #, php-format
 msgid "Tags in %s's notices"
@@ -7750,16 +7673,40 @@ msgstr "Невідомо"
 #. TRANS: Plugin admin panel controls
 msgctxt "plugin"
 msgid "Disable"
-msgstr ""
+msgstr "Вимкнути"
 
 #. TRANS: Plugin admin panel controls
 msgctxt "plugin"
 msgid "Enable"
-msgstr ""
+msgstr "Увімкнути"
 
 msgctxt "plugin-description"
 msgid "(Plugin descriptions unavailable when disabled.)"
-msgstr ""
+msgstr "(Опис додатку недоступний, якщо даний додаток вимкнутий.)"
+
+msgid "Settings"
+msgstr "Налаштування СМС"
+
+msgid "Change your personal settings"
+msgstr "Змінити персональні налаштування"
+
+msgid "Site configuration"
+msgstr "Конфігурація сайту"
+
+msgid "Logout"
+msgstr "Вийти"
+
+msgid "Logout from the site"
+msgstr "Вийти з сайту"
+
+msgid "Login to the site"
+msgstr "Увійти на сайт"
+
+msgid "Search"
+msgstr "Пошук"
+
+msgid "Search the site"
+msgstr "Пошук на сайті"
 
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
@@ -7869,6 +7816,39 @@ msgstr "Пошук дописів за змістом"
 msgid "Find groups on this site"
 msgstr "Пошук спільнот на цьому сайті"
 
+#. TRANS: Secondary navigation menu option leading to help on StatusNet.
+msgid "Help"
+msgstr "Допомога"
+
+#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
+msgid "About"
+msgstr "Про"
+
+#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
+msgid "FAQ"
+msgstr "ЧаП"
+
+#. TRANS: Secondary navigation menu option leading to Terms of Service.
+msgid "TOS"
+msgstr "Умови"
+
+#. TRANS: Secondary navigation menu option leading to privacy policy.
+msgid "Privacy"
+msgstr "Приватність"
+
+#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
+msgid "Source"
+msgstr "Джерело"
+
+#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+msgid "Contact"
+msgstr "Контакт"
+
+#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
+msgid "Badge"
+msgstr "Бедж"
+
 msgid "Untitled section"
 msgstr "Розділ без заголовку"
 
@@ -7894,7 +7874,7 @@ msgid "URL"
 msgstr "URL"
 
 msgid "URL shorteners"
-msgstr ""
+msgstr "Скорочення URL"
 
 msgid "Updates by instant messenger (IM)"
 msgstr "Оновлення за допомогою служби миттєвих повідомлень (ІМ)"
@@ -7997,12 +7977,12 @@ msgstr "Тема містить файл типу «.%s», який є непр
 msgid "Error opening theme archive."
 msgstr "Помилка при відкритті архіву з темою."
 
-#, fuzzy, php-format
+#, php-format
 msgid "Show %d reply"
 msgid_plural "Show all %d replies"
-msgstr[0] "Розгорнути"
-msgstr[1] "Розгорнути"
-msgstr[2] "Розгорнути"
+msgstr[0] "Показати %d відповідь"
+msgstr[1] "Показати %d відповіді"
+msgstr[2] "Показати %d відповідей"
 
 msgid "Top posters"
 msgstr "Топ-дописувачі"
@@ -8160,19 +8140,8 @@ msgstr "Неправильний XML, корінь XRD відсутній."
 msgid "Getting backup from file '%s'."
 msgstr "Отримання резервної копії файлу «%s»."
 
-#~ msgid "Full name is too long (max 255 chars)."
-#~ msgstr "Повне ім’я задовге (255 знаків максимум)"
+#~ msgid "Friends timeline"
+#~ msgstr "Стрічка друзів"
 
-#~ msgid "description is too long (max %d chars)."
-#~ msgstr "опис надто довгий (%d знаків максимум)."
-
-#~ msgid "Location is too long (max 255 chars)."
-#~ msgstr "Розташування надто довге (255 знаків максимум)."
-
-#~ msgid "Too many aliases! Maximum %d."
-#~ msgstr "Забагато додаткових імен! Максимум становить %d."
-
-#, fuzzy
-#~ msgctxt "BUTTON"
-#~ msgid "Comment"
-#~ msgstr "Зміст"
+#~ msgid "Everyone on this site"
+#~ msgstr "Всі на цьому сайті"
diff --git a/locale/zh_CN/LC_MESSAGES/statusnet.po b/locale/zh_CN/LC_MESSAGES/statusnet.po
index c79258d3ca..c8367a9bd1 100644
--- a/locale/zh_CN/LC_MESSAGES/statusnet.po
+++ b/locale/zh_CN/LC_MESSAGES/statusnet.po
@@ -15,18 +15,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-06 02:34+0100\n"
-"PO-Revision-Date: 2011-03-06 01:36:42+0000\n"
+"POT-Creation-Date: 2011-03-08 01:03+0000\n"
+"PO-Revision-Date: 2011-03-08 01:05:35+0000\n"
 "Language-Team: Simplified Chinese <http://translatewiki.net/wiki/Portal:zh-"
 "hans>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-POT-Import-Date: 2011-03-03 17:59:19+0000\n"
+"X-POT-Import-Date: 2011-03-06 02:16:47+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -5753,82 +5753,9 @@ msgstr "回复"
 msgid "Write a reply..."
 msgstr ""
 
-msgid "Home"
-msgstr "主页"
-
 #, fuzzy
-msgid "Friends timeline"
-msgstr "%s的时间线"
-
-msgid "Your profile"
-msgstr "小组资料"
-
-msgid "Public"
-msgstr "公共"
-
-#, fuzzy
-msgid "Everyone on this site"
-msgstr "搜索本站用户"
-
-msgid "Settings"
-msgstr "SMS 设置"
-
-#, fuzzy
-msgid "Change your personal settings"
-msgstr "修改你的个人信息"
-
-#, fuzzy
-msgid "Site configuration"
-msgstr "用户配置"
-
-msgid "Logout"
-msgstr "登出"
-
-msgid "Logout from the site"
-msgstr "从网站登出"
-
-msgid "Login to the site"
-msgstr "登录这个网站"
-
-msgid "Search"
-msgstr "搜索"
-
-#, fuzzy
-msgid "Search the site"
-msgstr "搜索帮助"
-
-#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-msgid "Help"
-msgstr "帮助"
-
-#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-msgid "About"
-msgstr "关于"
-
-#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-msgid "FAQ"
-msgstr "FAQ"
-
-#. TRANS: Secondary navigation menu option leading to Terms of Service.
-msgid "TOS"
-msgstr "条款"
-
-#. TRANS: Secondary navigation menu option leading to privacy policy.
-msgid "Privacy"
-msgstr "隐私"
-
-#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-msgid "Source"
-msgstr "源码"
-
-#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
-#. TRANS: StatusNet site, where to report bugs, ...
-msgid "Contact"
-msgstr "联系"
-
-#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-msgid "Badge"
-msgstr "挂件"
+msgid "Status"
+msgstr "StatusNet"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #. TRANS: Text between [] is a link description, text between () is the link itself.
@@ -6598,6 +6525,12 @@ msgstr "去安装程序。"
 msgid "Database error"
 msgstr "数据库错误"
 
+msgid "Home"
+msgstr "主页"
+
+msgid "Public"
+msgstr "公共"
+
 #. TRANS: Description of form for deleting a user.
 msgid "Delete this user"
 msgstr "删除这个用户"
@@ -7256,6 +7189,18 @@ msgstr ""
 "你没有任何私信。你可以试着发送私信给其他用户鼓励他们用私信和你交流。其他用户"
 "发给你你私信只有你看得到。"
 
+msgid "Inbox"
+msgstr "收件箱"
+
+msgid "Your incoming messages"
+msgstr "你收到的私信"
+
+msgid "Outbox"
+msgstr "发件箱"
+
+msgid "Your sent messages"
+msgstr "你发送的私信"
+
 msgid "Could not parse message."
 msgstr "无法解析消息。"
 
@@ -7329,6 +7274,20 @@ msgstr "消息"
 msgid "from"
 msgstr "通过"
 
+msgid "Can't get author for activity."
+msgstr ""
+
+#, fuzzy
+msgid "Bookmark not posted to this group."
+msgstr "你不能删除这个小组。"
+
+#, fuzzy
+msgid "Object not posted to this user."
+msgstr "请不要删除该用户。"
+
+msgid "Don't know how to handle this kind of target."
+msgstr ""
+
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 msgid "Nickname cannot be empty."
 msgstr "昵称不能为空。"
@@ -7440,24 +7399,15 @@ msgstr "复制消息。"
 msgid "Couldn't insert new subscription."
 msgstr "无法添加新的关注。"
 
+msgid "Your profile"
+msgstr "小组资料"
+
 msgid "Replies"
 msgstr "答复"
 
 msgid "Favorites"
 msgstr "收藏夹"
 
-msgid "Inbox"
-msgstr "收件箱"
-
-msgid "Your incoming messages"
-msgstr "你收到的私信"
-
-msgid "Outbox"
-msgstr "发件箱"
-
-msgid "Your sent messages"
-msgstr "你发送的私信"
-
 #. TRANS: Title for personal tag cloud section. %s is a user nickname.
 #, php-format
 msgid "Tags in %s's notices"
@@ -7481,6 +7431,33 @@ msgctxt "plugin-description"
 msgid "(Plugin descriptions unavailable when disabled.)"
 msgstr ""
 
+msgid "Settings"
+msgstr "SMS 设置"
+
+#, fuzzy
+msgid "Change your personal settings"
+msgstr "修改你的个人信息"
+
+#, fuzzy
+msgid "Site configuration"
+msgstr "用户配置"
+
+msgid "Logout"
+msgstr "登出"
+
+msgid "Logout from the site"
+msgstr "从网站登出"
+
+msgid "Login to the site"
+msgstr "登录这个网站"
+
+msgid "Search"
+msgstr "搜索"
+
+#, fuzzy
+msgid "Search the site"
+msgstr "搜索帮助"
+
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
 msgid "Subscriptions"
@@ -7589,6 +7566,39 @@ msgstr "搜索消息内容"
 msgid "Find groups on this site"
 msgstr "搜索本站小组"
 
+#. TRANS: Secondary navigation menu option leading to help on StatusNet.
+msgid "Help"
+msgstr "帮助"
+
+#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
+msgid "About"
+msgstr "关于"
+
+#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
+msgid "FAQ"
+msgstr "FAQ"
+
+#. TRANS: Secondary navigation menu option leading to Terms of Service.
+msgid "TOS"
+msgstr "条款"
+
+#. TRANS: Secondary navigation menu option leading to privacy policy.
+msgid "Privacy"
+msgstr "隐私"
+
+#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
+msgid "Source"
+msgstr "源码"
+
+#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+msgid "Contact"
+msgstr "联系"
+
+#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
+msgid "Badge"
+msgstr "挂件"
+
 msgid "Untitled section"
 msgstr "无标题章节"
 
@@ -7859,19 +7869,10 @@ msgstr "不合法的XML, 缺少XRD根"
 msgid "Getting backup from file '%s'."
 msgstr "从文件'%s'获取备份。"
 
-#~ msgid "Full name is too long (max 255 chars)."
-#~ msgstr "全名过长(不能超过 255 个字符)。"
-
-#~ msgid "description is too long (max %d chars)."
-#~ msgstr "描述过长(不能超过%d个字符)。"
-
-#~ msgid "Location is too long (max 255 chars)."
-#~ msgstr "位置过长(不能超过255个字符)。"
-
-#~ msgid "Too many aliases! Maximum %d."
-#~ msgstr "太多别名了！最多%d 个。"
+#, fuzzy
+#~ msgid "Friends timeline"
+#~ msgstr "%s的时间线"
 
 #, fuzzy
-#~ msgctxt "BUTTON"
-#~ msgid "Comment"
-#~ msgstr "内容"
+#~ msgid "Everyone on this site"
+#~ msgstr "搜索本站用户"
diff --git a/plugins/AccountManager/locale/pt/LC_MESSAGES/AccountManager.po b/plugins/AccountManager/locale/pt/LC_MESSAGES/AccountManager.po
new file mode 100644
index 0000000000..88b9c40056
--- /dev/null
+++ b/plugins/AccountManager/locale/pt/LC_MESSAGES/AccountManager.po
@@ -0,0 +1,27 @@
+# Translation of StatusNet - AccountManager to Portuguese (Português)
+# Exported from translatewiki.net
+#
+# Author: SandroHc
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - AccountManager\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-08 01:03+0000\n"
+"PO-Revision-Date: 2011-03-08 01:05:36+0000\n"
+"Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-03-06 02:12:46+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: pt\n"
+"X-Message-Group: #out-statusnet-plugin-accountmanager\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid ""
+"The Account Manager plugin implements the Account Manager specification."
+msgstr ""
+"O plugin do Gestor da Conta implementa a especificação do Gestor da Conta."
diff --git a/plugins/AccountManager/locale/uk/LC_MESSAGES/AccountManager.po b/plugins/AccountManager/locale/uk/LC_MESSAGES/AccountManager.po
new file mode 100644
index 0000000000..a288252762
--- /dev/null
+++ b/plugins/AccountManager/locale/uk/LC_MESSAGES/AccountManager.po
@@ -0,0 +1,27 @@
+# Translation of StatusNet - AccountManager to Ukrainian (Українська)
+# Exported from translatewiki.net
+#
+# Author: Boogie
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - AccountManager\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-08 01:03+0000\n"
+"PO-Revision-Date: 2011-03-08 01:05:36+0000\n"
+"Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-03-06 02:12:46+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: uk\n"
+"X-Message-Group: #out-statusnet-plugin-accountmanager\n"
+"Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
+"2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
+
+msgid ""
+"The Account Manager plugin implements the Account Manager specification."
+msgstr "Додаток Account Manager реалізує специфікацію керування акаунтом."
diff --git a/plugins/Aim/locale/pt/LC_MESSAGES/Aim.po b/plugins/Aim/locale/pt/LC_MESSAGES/Aim.po
new file mode 100644
index 0000000000..c535066116
--- /dev/null
+++ b/plugins/Aim/locale/pt/LC_MESSAGES/Aim.po
@@ -0,0 +1,34 @@
+# Translation of StatusNet - Aim to Portuguese (Português)
+# Exported from translatewiki.net
+#
+# Author: SandroHc
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Aim\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-08 01:03+0000\n"
+"PO-Revision-Date: 2011-03-08 01:05:39+0000\n"
+"Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-03-06 02:12:48+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: pt\n"
+"X-Message-Group: #out-statusnet-plugin-aim\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "Send me a message to post a notice"
+msgstr "Envie-me uma mensagem para colocar uma notícia"
+
+msgid "AIM"
+msgstr "AIM"
+
+msgid ""
+"The AIM plugin allows users to send and receive notices over the AIM network."
+msgstr ""
+"O plugin AIM permite aos utilizadores enviar e receber avisos sobre a rede "
+"AIM."
diff --git a/plugins/Aim/locale/uk/LC_MESSAGES/Aim.po b/plugins/Aim/locale/uk/LC_MESSAGES/Aim.po
new file mode 100644
index 0000000000..61214acf2e
--- /dev/null
+++ b/plugins/Aim/locale/uk/LC_MESSAGES/Aim.po
@@ -0,0 +1,34 @@
+# Translation of StatusNet - Aim to Ukrainian (Українська)
+# Exported from translatewiki.net
+#
+# Author: Boogie
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Aim\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-08 01:03+0000\n"
+"PO-Revision-Date: 2011-03-08 01:05:39+0000\n"
+"Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-03-06 02:12:48+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: uk\n"
+"X-Message-Group: #out-statusnet-plugin-aim\n"
+"Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
+"2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
+
+msgid "Send me a message to post a notice"
+msgstr "Надішліть мені повідомлення, щоб опублікувати свій допис"
+
+msgid "AIM"
+msgstr "AIM"
+
+msgid ""
+"The AIM plugin allows users to send and receive notices over the AIM network."
+msgstr ""
+"Додаток AIM дозволяє користувачам надсилати і отримувати дописи у мережі AIM."
diff --git a/plugins/Bookmark/locale/Bookmark.pot b/plugins/Bookmark/locale/Bookmark.pot
index 78fa302e1e..c7fc76af60 100644
--- a/plugins/Bookmark/locale/Bookmark.pot
+++ b/plugins/Bookmark/locale/Bookmark.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"POT-Creation-Date: 2011-03-08 01:03+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,10 +16,14 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: BookmarkPlugin.php:458
+#: BookmarkPlugin.php:233
 msgid "Simple extension for supporting bookmarks."
 msgstr ""
 
+#: BookmarkPlugin.php:639
+msgid "Bookmark"
+msgstr ""
+
 #: importdelicious.php:340
 msgctxt "BUTTON"
 msgid "Upload"
diff --git a/plugins/Bookmark/locale/br/LC_MESSAGES/Bookmark.po b/plugins/Bookmark/locale/br/LC_MESSAGES/Bookmark.po
index da0f636160..c0ff37727e 100644
--- a/plugins/Bookmark/locale/br/LC_MESSAGES/Bookmark.po
+++ b/plugins/Bookmark/locale/br/LC_MESSAGES/Bookmark.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Bookmark\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-06 02:34+0100\n"
-"PO-Revision-Date: 2011-03-06 01:36:56+0000\n"
+"POT-Creation-Date: 2011-03-08 01:03+0000\n"
+"PO-Revision-Date: 2011-03-08 01:05:50+0000\n"
 "Language-Team: Breton <http://translatewiki.net/wiki/Portal:br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-03 17:43:07+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-POT-Import-Date: 2011-03-06 02:12:57+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-bookmark\n"
@@ -24,6 +24,9 @@ msgstr ""
 msgid "Simple extension for supporting bookmarks."
 msgstr ""
 
+msgid "Bookmark"
+msgstr ""
+
 msgctxt "BUTTON"
 msgid "Upload"
 msgstr "Enporzhiañ"
diff --git a/plugins/Bookmark/locale/de/LC_MESSAGES/Bookmark.po b/plugins/Bookmark/locale/de/LC_MESSAGES/Bookmark.po
index 46a110b549..f8913d4fc4 100644
--- a/plugins/Bookmark/locale/de/LC_MESSAGES/Bookmark.po
+++ b/plugins/Bookmark/locale/de/LC_MESSAGES/Bookmark.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Bookmark\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-06 02:34+0100\n"
-"PO-Revision-Date: 2011-03-06 01:36:56+0000\n"
+"POT-Creation-Date: 2011-03-08 01:03+0000\n"
+"PO-Revision-Date: 2011-03-08 01:05:50+0000\n"
 "Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-03 17:43:07+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-POT-Import-Date: 2011-03-06 02:12:57+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-bookmark\n"
@@ -24,6 +24,9 @@ msgstr ""
 msgid "Simple extension for supporting bookmarks."
 msgstr "Einfache Erweiterung zur Unterstützung von Lesezeichen."
 
+msgid "Bookmark"
+msgstr ""
+
 msgctxt "BUTTON"
 msgid "Upload"
 msgstr "Hochladen"
diff --git a/plugins/Bookmark/locale/fr/LC_MESSAGES/Bookmark.po b/plugins/Bookmark/locale/fr/LC_MESSAGES/Bookmark.po
index 1cf80a5740..9836e1b7ca 100644
--- a/plugins/Bookmark/locale/fr/LC_MESSAGES/Bookmark.po
+++ b/plugins/Bookmark/locale/fr/LC_MESSAGES/Bookmark.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Bookmark\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-06 02:34+0100\n"
-"PO-Revision-Date: 2011-03-06 01:36:56+0000\n"
+"POT-Creation-Date: 2011-03-08 01:03+0000\n"
+"PO-Revision-Date: 2011-03-08 01:05:50+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-03 17:43:07+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-POT-Import-Date: 2011-03-06 02:12:57+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-bookmark\n"
@@ -24,6 +24,9 @@ msgstr ""
 msgid "Simple extension for supporting bookmarks."
 msgstr "Simple extension pour supporter les signets."
 
+msgid "Bookmark"
+msgstr ""
+
 msgctxt "BUTTON"
 msgid "Upload"
 msgstr "Téléverser"
diff --git a/plugins/Bookmark/locale/ia/LC_MESSAGES/Bookmark.po b/plugins/Bookmark/locale/ia/LC_MESSAGES/Bookmark.po
index fa9f1940b1..7513e1830e 100644
--- a/plugins/Bookmark/locale/ia/LC_MESSAGES/Bookmark.po
+++ b/plugins/Bookmark/locale/ia/LC_MESSAGES/Bookmark.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Bookmark\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-06 02:34+0100\n"
-"PO-Revision-Date: 2011-03-06 01:36:56+0000\n"
+"POT-Creation-Date: 2011-03-08 01:03+0000\n"
+"PO-Revision-Date: 2011-03-08 01:05:50+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-03 17:43:07+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-POT-Import-Date: 2011-03-06 02:12:57+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-bookmark\n"
@@ -24,6 +24,9 @@ msgstr ""
 msgid "Simple extension for supporting bookmarks."
 msgstr "Extension simple pro supportar marcapaginas."
 
+msgid "Bookmark"
+msgstr ""
+
 msgctxt "BUTTON"
 msgid "Upload"
 msgstr "Incargar"
diff --git a/plugins/Bookmark/locale/mk/LC_MESSAGES/Bookmark.po b/plugins/Bookmark/locale/mk/LC_MESSAGES/Bookmark.po
index d589e32af7..8621cf3093 100644
--- a/plugins/Bookmark/locale/mk/LC_MESSAGES/Bookmark.po
+++ b/plugins/Bookmark/locale/mk/LC_MESSAGES/Bookmark.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Bookmark\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-06 02:34+0100\n"
-"PO-Revision-Date: 2011-03-06 01:36:56+0000\n"
+"POT-Creation-Date: 2011-03-08 01:03+0000\n"
+"PO-Revision-Date: 2011-03-08 01:05:50+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-03 17:43:07+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-POT-Import-Date: 2011-03-06 02:12:57+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-bookmark\n"
@@ -24,6 +24,9 @@ msgstr ""
 msgid "Simple extension for supporting bookmarks."
 msgstr "Прост додаток за поддршка на обележувачи."
 
+msgid "Bookmark"
+msgstr ""
+
 msgctxt "BUTTON"
 msgid "Upload"
 msgstr "Подигни"
diff --git a/plugins/Bookmark/locale/my/LC_MESSAGES/Bookmark.po b/plugins/Bookmark/locale/my/LC_MESSAGES/Bookmark.po
index e452765aa8..df27d6b70d 100644
--- a/plugins/Bookmark/locale/my/LC_MESSAGES/Bookmark.po
+++ b/plugins/Bookmark/locale/my/LC_MESSAGES/Bookmark.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Bookmark\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-06 02:34+0100\n"
-"PO-Revision-Date: 2011-03-06 01:36:57+0000\n"
+"POT-Creation-Date: 2011-03-08 01:03+0000\n"
+"PO-Revision-Date: 2011-03-08 01:05:50+0000\n"
 "Language-Team: Burmese <http://translatewiki.net/wiki/Portal:my>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-03 17:43:07+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-POT-Import-Date: 2011-03-06 02:12:57+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: my\n"
 "X-Message-Group: #out-statusnet-plugin-bookmark\n"
@@ -24,6 +24,9 @@ msgstr ""
 msgid "Simple extension for supporting bookmarks."
 msgstr ""
 
+msgid "Bookmark"
+msgstr ""
+
 msgctxt "BUTTON"
 msgid "Upload"
 msgstr "Upload တင်ရန်"
diff --git a/plugins/Bookmark/locale/nl/LC_MESSAGES/Bookmark.po b/plugins/Bookmark/locale/nl/LC_MESSAGES/Bookmark.po
index a759a059b8..ca207809ec 100644
--- a/plugins/Bookmark/locale/nl/LC_MESSAGES/Bookmark.po
+++ b/plugins/Bookmark/locale/nl/LC_MESSAGES/Bookmark.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Bookmark\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-06 02:34+0100\n"
-"PO-Revision-Date: 2011-03-06 01:36:57+0000\n"
+"POT-Creation-Date: 2011-03-08 01:03+0000\n"
+"PO-Revision-Date: 2011-03-08 01:05:50+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-03 17:43:07+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-POT-Import-Date: 2011-03-06 02:12:57+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-bookmark\n"
@@ -24,6 +24,9 @@ msgstr ""
 msgid "Simple extension for supporting bookmarks."
 msgstr "Eenvoudige extensie voor de ondersteuning van bladwijzers."
 
+msgid "Bookmark"
+msgstr ""
+
 msgctxt "BUTTON"
 msgid "Upload"
 msgstr "Uploaden"
diff --git a/plugins/Bookmark/locale/ru/LC_MESSAGES/Bookmark.po b/plugins/Bookmark/locale/ru/LC_MESSAGES/Bookmark.po
index 9962ee5ca5..318a8496c5 100644
--- a/plugins/Bookmark/locale/ru/LC_MESSAGES/Bookmark.po
+++ b/plugins/Bookmark/locale/ru/LC_MESSAGES/Bookmark.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Bookmark\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-06 02:34+0100\n"
-"PO-Revision-Date: 2011-03-06 01:36:57+0000\n"
+"POT-Creation-Date: 2011-03-08 01:03+0000\n"
+"PO-Revision-Date: 2011-03-08 01:05:50+0000\n"
 "Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-03 17:43:07+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-POT-Import-Date: 2011-03-06 02:12:57+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-bookmark\n"
@@ -25,6 +25,9 @@ msgstr ""
 msgid "Simple extension for supporting bookmarks."
 msgstr ""
 
+msgid "Bookmark"
+msgstr ""
+
 msgctxt "BUTTON"
 msgid "Upload"
 msgstr "Загрузить"
diff --git a/plugins/Bookmark/locale/te/LC_MESSAGES/Bookmark.po b/plugins/Bookmark/locale/te/LC_MESSAGES/Bookmark.po
index 48065a1fc1..65e6f37601 100644
--- a/plugins/Bookmark/locale/te/LC_MESSAGES/Bookmark.po
+++ b/plugins/Bookmark/locale/te/LC_MESSAGES/Bookmark.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Bookmark\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-06 02:34+0100\n"
-"PO-Revision-Date: 2011-03-06 01:36:57+0000\n"
+"POT-Creation-Date: 2011-03-08 01:03+0000\n"
+"PO-Revision-Date: 2011-03-08 01:05:50+0000\n"
 "Language-Team: Telugu <http://translatewiki.net/wiki/Portal:te>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-03 17:43:07+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-POT-Import-Date: 2011-03-06 02:12:57+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: te\n"
 "X-Message-Group: #out-statusnet-plugin-bookmark\n"
@@ -24,6 +24,9 @@ msgstr ""
 msgid "Simple extension for supporting bookmarks."
 msgstr ""
 
+msgid "Bookmark"
+msgstr ""
+
 msgctxt "BUTTON"
 msgid "Upload"
 msgstr "ఎక్కించు"
diff --git a/plugins/Bookmark/locale/uk/LC_MESSAGES/Bookmark.po b/plugins/Bookmark/locale/uk/LC_MESSAGES/Bookmark.po
index 7eaa40faf2..b23106c113 100644
--- a/plugins/Bookmark/locale/uk/LC_MESSAGES/Bookmark.po
+++ b/plugins/Bookmark/locale/uk/LC_MESSAGES/Bookmark.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Bookmark\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-06 02:34+0100\n"
-"PO-Revision-Date: 2011-03-06 01:36:57+0000\n"
+"POT-Creation-Date: 2011-03-08 01:03+0000\n"
+"PO-Revision-Date: 2011-03-08 01:05:50+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-03 17:43:07+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-POT-Import-Date: 2011-03-06 02:12:57+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-bookmark\n"
@@ -25,6 +25,9 @@ msgstr ""
 msgid "Simple extension for supporting bookmarks."
 msgstr "Простий додаток, що підтримує додавання закладок."
 
+msgid "Bookmark"
+msgstr ""
+
 msgctxt "BUTTON"
 msgid "Upload"
 msgstr "Завантажити"
diff --git a/plugins/Bookmark/locale/zh_CN/LC_MESSAGES/Bookmark.po b/plugins/Bookmark/locale/zh_CN/LC_MESSAGES/Bookmark.po
index 53bdbd96a8..24139d495b 100644
--- a/plugins/Bookmark/locale/zh_CN/LC_MESSAGES/Bookmark.po
+++ b/plugins/Bookmark/locale/zh_CN/LC_MESSAGES/Bookmark.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Bookmark\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-06 02:34+0100\n"
-"PO-Revision-Date: 2011-03-06 01:36:57+0000\n"
+"POT-Creation-Date: 2011-03-08 01:03+0000\n"
+"PO-Revision-Date: 2011-03-08 01:05:50+0000\n"
 "Language-Team: Simplified Chinese <http://translatewiki.net/wiki/Portal:zh-"
 "hans>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-03 17:43:07+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-POT-Import-Date: 2011-03-06 02:12:57+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-bookmark\n"
@@ -25,6 +25,9 @@ msgstr ""
 msgid "Simple extension for supporting bookmarks."
 msgstr "支持书签的简单扩展。"
 
+msgid "Bookmark"
+msgstr ""
+
 msgctxt "BUTTON"
 msgid "Upload"
 msgstr "上载"
diff --git a/plugins/Disqus/locale/pt/LC_MESSAGES/Disqus.po b/plugins/Disqus/locale/pt/LC_MESSAGES/Disqus.po
new file mode 100644
index 0000000000..112d9f3bdf
--- /dev/null
+++ b/plugins/Disqus/locale/pt/LC_MESSAGES/Disqus.po
@@ -0,0 +1,45 @@
+# Translation of StatusNet - Disqus to Portuguese (Português)
+# Exported from translatewiki.net
+#
+# Author: SandroHc
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Disqus\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-08 01:03+0000\n"
+"PO-Revision-Date: 2011-03-08 01:05:58+0000\n"
+"Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-03-06 02:17:19+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: pt\n"
+"X-Message-Group: #out-statusnet-plugin-disqus\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: User notification that JavaScript is required for Disqus comment display.
+#, php-format
+msgid ""
+"Please enable JavaScript to view the [comments powered by Disqus](http://"
+"disqus.com/?ref_noscript=%s)."
+msgstr ""
+
+#. TRANS: This message is followed by a Disqus logo. Alt text is "Disqus".
+msgid "Comments powered by "
+msgstr "Comentários criados por "
+
+#. TRANS: Plugin supplied feature for Disqus comments to notices.
+msgid "Comments"
+msgstr "Comentários"
+
+#. TRANS: Plugin description.
+msgid ""
+"Use <a href=\"http://disqus.com/\">Disqus</a> to add commenting to notice "
+"pages."
+msgstr ""
+"Usa o <a href=\"http://disqus.com/\">Disqus</a> para adicionar comentários "
+"ás páginas."
diff --git a/plugins/ExtendedProfile/locale/uk/LC_MESSAGES/ExtendedProfile.po b/plugins/ExtendedProfile/locale/uk/LC_MESSAGES/ExtendedProfile.po
new file mode 100644
index 0000000000..b98ce66ca3
--- /dev/null
+++ b/plugins/ExtendedProfile/locale/uk/LC_MESSAGES/ExtendedProfile.po
@@ -0,0 +1,98 @@
+# Translation of StatusNet - ExtendedProfile to Ukrainian (Українська)
+# Exported from translatewiki.net
+#
+# Author: Boogie
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - ExtendedProfile\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-08 01:03+0000\n"
+"PO-Revision-Date: 2011-03-08 01:06:03+0000\n"
+"Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-03-06 02:17:22+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: uk\n"
+"X-Message-Group: #out-statusnet-plugin-extendedprofile\n"
+"Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
+"2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
+
+msgid "UI extensions for additional profile fields."
+msgstr "Розширення інтерфейсу для додаткових полів у профілі."
+
+#. TRANS: Link description in user account settings menu.
+msgid "Details"
+msgstr "Деталі"
+
+msgid "More details..."
+msgstr "Детальніше..."
+
+msgid "Personal"
+msgstr "Профіль"
+
+msgid "Full name"
+msgstr "Повне ім’я"
+
+msgid "Title"
+msgstr "Назва"
+
+msgid "Manager"
+msgstr "Керування"
+
+msgid "Location"
+msgstr "Розташування"
+
+msgid "Bio"
+msgstr "Про себе"
+
+msgid "Tags"
+msgstr "Теґи"
+
+msgid "Contact"
+msgstr "Контакти"
+
+msgid "Phone"
+msgstr "Телефон"
+
+msgid "IM"
+msgstr "ІМ"
+
+msgid "Websites"
+msgstr "Сайти"
+
+msgid "Birthday"
+msgstr "День народження"
+
+msgid "Spouse's name"
+msgstr "Ім’я дружини/чоловіка:"
+
+msgid "Kids' names"
+msgstr "Імена дітей"
+
+msgid "Work experience"
+msgstr "Досвід роботи"
+
+msgid "Employer"
+msgstr "Роботодавець"
+
+msgid "Education"
+msgstr "Освіта"
+
+msgid "Institution"
+msgstr "Установа"
+
+#. TRANS: Link title for link on user profile.
+msgid "Edit extended profile settings"
+msgstr "Змінити розширені налаштування профілю"
+
+#. TRANS: Link text for link on user profile.
+msgid "Edit"
+msgstr "Змінити"
+
+msgid "Extended profile settings"
+msgstr "Розширені налаштування профілю"
diff --git a/plugins/ForceGroup/locale/pt/LC_MESSAGES/ForceGroup.po b/plugins/ForceGroup/locale/pt/LC_MESSAGES/ForceGroup.po
new file mode 100644
index 0000000000..50f3192384
--- /dev/null
+++ b/plugins/ForceGroup/locale/pt/LC_MESSAGES/ForceGroup.po
@@ -0,0 +1,36 @@
+# Translation of StatusNet - ForceGroup to Portuguese (Português)
+# Exported from translatewiki.net
+#
+# Author: SandroHc
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - ForceGroup\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-08 01:03+0000\n"
+"PO-Revision-Date: 2011-03-08 01:06:09+0000\n"
+"Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-03-06 02:17:25+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: pt\n"
+"X-Message-Group: #out-statusnet-plugin-forcegroup\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Server exception.
+#. TRANS: %1$s is a user nickname, %2$s is a group nickname.
+#, php-format
+msgid "Could not join user %1$s to group %2$s."
+msgstr "Não foi possível juntar o usuário %1$s ao grupo %2$s."
+
+#. TRANS: Plugin description.
+msgid ""
+"Allows forced group memberships and forces all notices to appear in groups "
+"that users were forced in."
+msgstr ""
+"Permite que membros forçados do grupo forcem com que todos os anúncios "
+"apareçam em grupos em que os utilizadores foram forçados."
diff --git a/plugins/GroupPrivateMessage/locale/pt/LC_MESSAGES/GroupPrivateMessage.po b/plugins/GroupPrivateMessage/locale/pt/LC_MESSAGES/GroupPrivateMessage.po
new file mode 100644
index 0000000000..c2be92e199
--- /dev/null
+++ b/plugins/GroupPrivateMessage/locale/pt/LC_MESSAGES/GroupPrivateMessage.po
@@ -0,0 +1,52 @@
+# Translation of StatusNet - GroupPrivateMessage to Portuguese (Português)
+# Exported from translatewiki.net
+#
+# Author: SandroHc
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - GroupPrivateMessage\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-08 01:03+0000\n"
+"PO-Revision-Date: 2011-03-08 01:06:16+0000\n"
+"Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-03-06 02:17:29+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: pt\n"
+"X-Message-Group: #out-statusnet-plugin-groupprivatemessage\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "Inbox"
+msgstr "Caixa de Entrada"
+
+msgid "Private messages for this group"
+msgstr "Mensagens privadas para este grupo"
+
+msgid "Allow posting DMs to a group."
+msgstr "Permitir pastagens DMs a um grupo."
+
+msgid "This group has not received any private messages."
+msgstr "Este grupo ainda não recebeu nenhuma mensagem privada."
+
+#. TRANS: Instructions for user inbox page.
+msgid ""
+"This is the group inbox, which lists all incoming private messages for this "
+"group."
+msgstr ""
+"Esta é a caixa de entrada do grupo, que lista todas as mensagens privadas "
+"recebidas para este grupo."
+
+msgctxt "Send button for sending notice"
+msgid "Send"
+msgstr "Enviar"
+
+#, php-format
+msgid "That's too long. Maximum message size is %d character."
+msgid_plural "That's too long. Maximum message size is %d characters."
+msgstr[0] "É muito longo. Máx. tamanho da mensagem é %d caracteres."
+msgstr[1] "É muito longo. Máx. tamanho da mensagem é %d caracteres."
diff --git a/plugins/Irc/locale/uk/LC_MESSAGES/Irc.po b/plugins/Irc/locale/uk/LC_MESSAGES/Irc.po
new file mode 100644
index 0000000000..3d027ce23f
--- /dev/null
+++ b/plugins/Irc/locale/uk/LC_MESSAGES/Irc.po
@@ -0,0 +1,39 @@
+# Translation of StatusNet - Irc to Ukrainian (Українська)
+# Exported from translatewiki.net
+#
+# Author: Boogie
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Irc\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-08 01:03+0000\n"
+"PO-Revision-Date: 2011-03-08 01:06:19+0000\n"
+"Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-03-06 02:17:33+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: uk\n"
+"X-Message-Group: #out-statusnet-plugin-irc\n"
+"Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
+"2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
+
+msgid "IRC"
+msgstr "IRC"
+
+msgid ""
+"The IRC plugin allows users to send and receive notices over an IRC network."
+msgstr ""
+"Додаток IRC дозволяє користувачам надсилати і отримувати дописи у мережі IRC."
+
+#, php-format
+msgid "Could not increment attempts count for %d"
+msgstr "Не вдалося збільшити кількість спроб для %d"
+
+msgid "Your nickname is not registered so IRC connectivity cannot be enabled"
+msgstr ""
+"Ваш псевдонім не зареєстровано і тому підключення до IRC увімкнути неможливо"
diff --git a/plugins/Linkback/locale/pt/LC_MESSAGES/Linkback.po b/plugins/Linkback/locale/pt/LC_MESSAGES/Linkback.po
new file mode 100644
index 0000000000..f69ba1a6bd
--- /dev/null
+++ b/plugins/Linkback/locale/pt/LC_MESSAGES/Linkback.po
@@ -0,0 +1,33 @@
+# Translation of StatusNet - Linkback to Portuguese (Português)
+# Exported from translatewiki.net
+#
+# Author: SandroHc
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Linkback\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-08 01:03+0000\n"
+"PO-Revision-Date: 2011-03-08 01:06:23+0000\n"
+"Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-03-06 02:17:36+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: pt\n"
+"X-Message-Group: #out-statusnet-plugin-linkback\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid ""
+"Notify blog authors when their posts have been linked in microblog notices "
+"using <a href=\"http://www.hixie.ch/specs/pingback/pingback\">Pingback</a> "
+"or <a href=\"http://www.movabletype.org/docs/mttrackback.html\">Trackback</"
+"a> protocols."
+msgstr ""
+"Notificar os autores do blog quando as suas postagens forem vinculadas em "
+"anúncios de microblog usando os protocolos <a href=\"http://www.hixie.ch/"
+"specs/pingback/pingback\">Pingback</a> ou <a href=\"http://www.movabletype."
+"org/docs/mttrackback.html\">Trackback</a>."
diff --git a/plugins/MobileProfile/locale/uk/LC_MESSAGES/MobileProfile.po b/plugins/MobileProfile/locale/uk/LC_MESSAGES/MobileProfile.po
index 7f3c9d8a35..d88f8d4449 100644
--- a/plugins/MobileProfile/locale/uk/LC_MESSAGES/MobileProfile.po
+++ b/plugins/MobileProfile/locale/uk/LC_MESSAGES/MobileProfile.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - MobileProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-06 02:34+0100\n"
-"PO-Revision-Date: 2011-03-06 01:37:37+0000\n"
+"POT-Creation-Date: 2011-03-08 01:03+0000\n"
+"PO-Revision-Date: 2011-03-08 01:06:31+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-03 17:49:34+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-POT-Import-Date: 2011-03-06 02:18:32+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-mobileprofile\n"
@@ -63,11 +63,11 @@ msgstr "Вкласти файл"
 
 #. TRANS: Link to switch site layout from mobile to desktop mode. Appears at very bottom of page.
 msgid "Switch to desktop site layout."
-msgstr ""
+msgstr "Перемкнути вигляд сайту на варіант для робочого столу."
 
 #. TRANS: Link to switch site layout from desktop to mobile mode. Appears at very bottom of page.
 msgid "Switch to mobile site layout."
-msgstr ""
+msgstr "Перемкнути вигляд сайту на варіант для мобільних пристроїв."
 
 msgid "XHTML MobileProfile output for supporting user agents."
 msgstr ""
diff --git a/plugins/ModHelper/locale/pt/LC_MESSAGES/ModHelper.po b/plugins/ModHelper/locale/pt/LC_MESSAGES/ModHelper.po
new file mode 100644
index 0000000000..248354e442
--- /dev/null
+++ b/plugins/ModHelper/locale/pt/LC_MESSAGES/ModHelper.po
@@ -0,0 +1,28 @@
+# Translation of StatusNet - ModHelper to Portuguese (Português)
+# Exported from translatewiki.net
+#
+# Author: SandroHc
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - ModHelper\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-08 01:03+0000\n"
+"PO-Revision-Date: 2011-03-08 01:06:32+0000\n"
+"Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-03-06 02:18:32+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: pt\n"
+"X-Message-Group: #out-statusnet-plugin-modhelper\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid ""
+"Lets users who have been manually marked as \"modhelper\"s silence accounts."
+msgstr ""
+"Permite que os usuários que tenham sido manualmente marcados como \"modhelper"
+"\" silenciem contas."
diff --git a/plugins/Msn/locale/pt/LC_MESSAGES/Msn.po b/plugins/Msn/locale/pt/LC_MESSAGES/Msn.po
new file mode 100644
index 0000000000..3dc5f24c79
--- /dev/null
+++ b/plugins/Msn/locale/pt/LC_MESSAGES/Msn.po
@@ -0,0 +1,29 @@
+# Translation of StatusNet - Msn to Portuguese (Português)
+# Exported from translatewiki.net
+#
+# Author: SandroHc
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Msn\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-08 01:03+0000\n"
+"PO-Revision-Date: 2011-03-08 01:06:33+0000\n"
+"Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-03-06 02:18:33+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: pt\n"
+"X-Message-Group: #out-statusnet-plugin-msn\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "MSN"
+msgstr "MSN"
+
+msgid ""
+"The MSN plugin allows users to send and receive notices over the MSN network."
+msgstr ""
diff --git a/plugins/Msn/locale/uk/LC_MESSAGES/Msn.po b/plugins/Msn/locale/uk/LC_MESSAGES/Msn.po
new file mode 100644
index 0000000000..eb3a9b0a2b
--- /dev/null
+++ b/plugins/Msn/locale/uk/LC_MESSAGES/Msn.po
@@ -0,0 +1,31 @@
+# Translation of StatusNet - Msn to Ukrainian (Українська)
+# Exported from translatewiki.net
+#
+# Author: Boogie
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Msn\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-08 01:03+0000\n"
+"PO-Revision-Date: 2011-03-08 01:06:33+0000\n"
+"Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-03-06 02:18:33+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: uk\n"
+"X-Message-Group: #out-statusnet-plugin-msn\n"
+"Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
+"2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
+
+msgid "MSN"
+msgstr "MSN"
+
+msgid ""
+"The MSN plugin allows users to send and receive notices over the MSN network."
+msgstr ""
+"Додаток MSN дозволяє користувачам надсилати і отримувати дописи у мережі MSN."
diff --git a/plugins/NoticeTitle/locale/pt/LC_MESSAGES/NoticeTitle.po b/plugins/NoticeTitle/locale/pt/LC_MESSAGES/NoticeTitle.po
new file mode 100644
index 0000000000..2e3d27a55d
--- /dev/null
+++ b/plugins/NoticeTitle/locale/pt/LC_MESSAGES/NoticeTitle.po
@@ -0,0 +1,30 @@
+# Translation of StatusNet - NoticeTitle to Portuguese (Português)
+# Exported from translatewiki.net
+#
+# Author: SandroHc
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - NoticeTitle\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-08 01:03+0000\n"
+"PO-Revision-Date: 2011-03-08 01:06:36+0000\n"
+"Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-03-06 02:18:34+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: pt\n"
+"X-Message-Group: #out-statusnet-plugin-noticetitle\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "Adds optional titles to notices."
+msgstr ""
+
+#. TRANS: Page title. %1$s is the title, %2$s is the site name.
+#, php-format
+msgid "%1$s - %2$s"
+msgstr "%1$s - %2$s"
diff --git a/plugins/StrictTransportSecurity/locale/uk/LC_MESSAGES/StrictTransportSecurity.po b/plugins/StrictTransportSecurity/locale/uk/LC_MESSAGES/StrictTransportSecurity.po
new file mode 100644
index 0000000000..c8e44bc835
--- /dev/null
+++ b/plugins/StrictTransportSecurity/locale/uk/LC_MESSAGES/StrictTransportSecurity.po
@@ -0,0 +1,30 @@
+# Translation of StatusNet - StrictTransportSecurity to Ukrainian (Українська)
+# Exported from translatewiki.net
+#
+# Author: Boogie
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - StrictTransportSecurity\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-08 01:03+0000\n"
+"PO-Revision-Date: 2011-03-08 01:07:11+0000\n"
+"Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-03-06 02:19:33+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: uk\n"
+"X-Message-Group: #out-statusnet-plugin-stricttransportsecurity\n"
+"Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
+"2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
+
+msgid ""
+"The Strict Transport Security plugin implements the Strict Transport "
+"Security header, improving the security of HTTPS only sites."
+msgstr ""
+"Додаток Strict Transport Security реалізує режим суворої безпеки, "
+"забезпечуючи безпеку лише для https-сайтів."
diff --git a/plugins/Xmpp/locale/pt/LC_MESSAGES/Xmpp.po b/plugins/Xmpp/locale/pt/LC_MESSAGES/Xmpp.po
new file mode 100644
index 0000000000..f3a2968fd0
--- /dev/null
+++ b/plugins/Xmpp/locale/pt/LC_MESSAGES/Xmpp.po
@@ -0,0 +1,35 @@
+# Translation of StatusNet - Xmpp to Portuguese (Português)
+# Exported from translatewiki.net
+#
+# Author: SandroHc
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Xmpp\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-08 01:03+0000\n"
+"PO-Revision-Date: 2011-03-08 01:07:28+0000\n"
+"Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-03-06 02:19:41+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: pt\n"
+"X-Message-Group: #out-statusnet-plugin-xmpp\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "Send me a message to post a notice"
+msgstr "Envia-me uma mensagem para postar uma notícia"
+
+msgid "XMPP/Jabber/GTalk"
+msgstr "XMPP/Jabber/GTalk"
+
+msgid ""
+"The XMPP plugin allows users to send and receive notices over the XMPP/"
+"Jabber network."
+msgstr ""
+"O plugin XMPP permite aos utilizadores enviar e receber avisos sobre a rede "
+"XMPP/Jabber."
diff --git a/plugins/Xmpp/locale/uk/LC_MESSAGES/Xmpp.po b/plugins/Xmpp/locale/uk/LC_MESSAGES/Xmpp.po
new file mode 100644
index 0000000000..2d4117c059
--- /dev/null
+++ b/plugins/Xmpp/locale/uk/LC_MESSAGES/Xmpp.po
@@ -0,0 +1,36 @@
+# Translation of StatusNet - Xmpp to Ukrainian (Українська)
+# Exported from translatewiki.net
+#
+# Author: Boogie
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Xmpp\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-08 01:03+0000\n"
+"PO-Revision-Date: 2011-03-08 01:07:28+0000\n"
+"Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-03-06 02:19:41+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: uk\n"
+"X-Message-Group: #out-statusnet-plugin-xmpp\n"
+"Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
+"2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
+
+msgid "Send me a message to post a notice"
+msgstr "Надішліть мені повідомлення, щоб опублікувати допис"
+
+msgid "XMPP/Jabber/GTalk"
+msgstr "XMPP/Jabber/GTalk"
+
+msgid ""
+"The XMPP plugin allows users to send and receive notices over the XMPP/"
+"Jabber network."
+msgstr ""
+"Додаток XMPP дозволяє користувачам надсилати і отримувати дописи у мережі "
+"XMPP (Jabber)."

From be53b94bfdb0498b335aaa558f5631c95a23e3d5 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Mon, 7 Mar 2011 17:26:19 -0800
Subject: [PATCH 447/655] - Fix table name; add comments

---
 plugins/ExtendedProfile/Profile_detail.php | 63 +++++++++++++++++++---
 1 file changed, 57 insertions(+), 6 deletions(-)

diff --git a/plugins/ExtendedProfile/Profile_detail.php b/plugins/ExtendedProfile/Profile_detail.php
index 6fd96cca70..25eca4d09c 100644
--- a/plugins/ExtendedProfile/Profile_detail.php
+++ b/plugins/ExtendedProfile/Profile_detail.php
@@ -21,18 +21,52 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
+/**
+ * DataObject class to store extended profile fields. Allows for storing
+ * multiple values per a "field" (field property is not unique).
+ *
+ * Example:
+ *
+ *     Jed's Phone Numbers
+ *     home  : 510-384-1992
+ *     mobile: 510-719-1139
+ *     work  : 415-231-1121
+ *
+ * We can store these phone numbers in a "field" represented by three
+ * Profile_detail objects, each named 'phone_number' like this:
+ *
+ *     $phone1 = new Profile_detail();
+ *     $phone1->field       = 'phone_number';
+ *     $phone1->rel         = 'home';
+ *     $phone1->field_index = 1;
+ *     $phone1->value       = '510-384-1992';
+ *
+ *     $phone1 = new Profile_detail();
+ *     $phone1->field       = 'phone_number';
+ *     $phone1->rel         = 'mobile';
+ *     $phone1->field_index = 2;
+ *     $phone1->value       = '510-719-1139';
+ *
+ *     $phone1 = new Profile_detail();
+ *     $phone1->field       = 'phone_number';
+ *     $phone1->rel         = 'work';
+ *     $phone1->field_index = 3;
+ *     $phone1->value       = '415-231-1121';
+ *
+ */
 class Profile_detail extends Memcached_DataObject
 {
-    public $__table = 'submirror';
+    public $__table = 'profile_detail';
 
     public $id;
 
     public $profile_id;
+    public $rel;         // detail for some field types; eg "home", "mobile", "work" for phones or "aim", "irc", "xmpp" for IM
     public $field;
+
+    public $value;       // primary text value
     public $field_index; // relative ordering of multiple values in the same field
 
-    public $value; // primary text value
-    public $rel; // detail for some field types; eg "home", "mobile", "work" for phones or "aim", "irc", "xmpp" for IM
     public $ref_profile; // for people types, allows pointing to a known profile in the system
 
     public $created;
@@ -68,9 +102,17 @@ class Profile_detail extends Memcached_DataObject
                      'modified' => DB_DATAOBJECT_STR + DB_DATAOBJECT_DATE + DB_DATAOBJECT_TIME + DB_DATAOBJECT_NOTNULL);
     }
 
+    /**
+     * Database schema setup
+     *
+     * @see Schema
+     * @see ColumnDef
+     *
+     * @return boolean hook value; true means continue processing, false means stop.
+     */
+
     static function schemaDef()
     {
-        // @fixme need a reverse key on (subscribed, subscriber) as well
         return array(new ColumnDef('id', 'integer',
                                    null, false, 'PRI'),
 
@@ -113,7 +155,7 @@ class Profile_detail extends Memcached_DataObject
     }
 
     /**
-     * return key definitions for DB_DataObject
+     * Return key definitions for DB_DataObject
      *
      * DB_DataObject needs to know about keys that the table has; this function
      * defines them.
@@ -127,7 +169,7 @@ class Profile_detail extends Memcached_DataObject
     }
 
     /**
-     * return key definitions for Memcached_DataObject
+     * Return key definitions for Memcached_DataObject
      *
      * Our caching system uses the same key definitions, but uses a different
      * method to get them.
@@ -142,6 +184,15 @@ class Profile_detail extends Memcached_DataObject
         return array('id' => 'K');
     }
 
+    /**
+     * Get the sequence key
+     *
+     * Returns the first serial column defined in the table, if any.
+     *
+     * @access private
+     * @return array (column,use_native,sequence_name)
+     */
+
     function sequenceKey()
     {
         return array('id', true);

From 3438a78c023d84c344200b5f2794c37ead83e539 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Mon, 7 Mar 2011 21:28:36 -0800
Subject: [PATCH 448/655] Initial checkin of Poll plugin: micro-app to post
 mini polls/surveys from the notice form.

This version is fairly basic; votes do not (yet) show a reply, they just got in the table. No pretty graphs for the results yet, just text.
The ActivityStream output is temporary and probably should be replaced; the current structures for adding custom data aren't really ready yet (especially since we need to cover JSON and Atom formats, probably pretty differently)

Uses similar system as Bookmark for attaching to notices -- saves a custom URI for an alternate action, which we can then pass in and hook back up to our poll object. This can probably do with a little more simplification in the parent MicroAppPlugin class.

Currently adds two tables:
- poll holds the main poll info: id and URI to associate with the notice, then the question and a text blob with the options.
- poll_response records the selections picked by our nice fellows.

Hopefully no off-by-one bugs left in the selection, but I give no guarantees. ;)
Some todo notes in the README and in doc comments.
---
 plugins/Poll/Poll.php             | 250 +++++++++++++++++++++++++
 plugins/Poll/PollPlugin.php       | 293 ++++++++++++++++++++++++++++++
 plugins/Poll/Poll_response.php    | 110 +++++++++++
 plugins/Poll/README               |  21 +++
 plugins/Poll/newpoll.php          | 193 ++++++++++++++++++++
 plugins/Poll/newpollform.php      | 150 +++++++++++++++
 plugins/Poll/pollresponseform.php | 135 ++++++++++++++
 plugins/Poll/pollresultform.php   | 131 +++++++++++++
 plugins/Poll/respondpoll.php      | 189 +++++++++++++++++++
 plugins/Poll/showpoll.php         | 111 +++++++++++
 10 files changed, 1583 insertions(+)
 create mode 100644 plugins/Poll/Poll.php
 create mode 100644 plugins/Poll/PollPlugin.php
 create mode 100644 plugins/Poll/Poll_response.php
 create mode 100644 plugins/Poll/README
 create mode 100644 plugins/Poll/newpoll.php
 create mode 100644 plugins/Poll/newpollform.php
 create mode 100644 plugins/Poll/pollresponseform.php
 create mode 100644 plugins/Poll/pollresultform.php
 create mode 100644 plugins/Poll/respondpoll.php
 create mode 100644 plugins/Poll/showpoll.php

diff --git a/plugins/Poll/Poll.php b/plugins/Poll/Poll.php
new file mode 100644
index 0000000000..60ec4399fd
--- /dev/null
+++ b/plugins/Poll/Poll.php
@@ -0,0 +1,250 @@
+<?php
+/**
+ * Data class to mark notices as bookmarks
+ *
+ * PHP version 5
+ *
+ * @category PollPlugin
+ * @package  StatusNet
+ * @author   Brion Vibber <brion@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
+ * @link     http://status.net/
+ *
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2011, StatusNet, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.     See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
+/**
+ * For storing the poll options and such
+ *
+ * @category PollPlugin
+ * @package  StatusNet
+ * @author   Brion Vibber <brion@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
+ * @link     http://status.net/
+ *
+ * @see      DB_DataObject
+ */
+
+class Poll extends Managed_DataObject
+{
+    public $__table = 'poll'; // table name
+    public $id;          // char(36) primary key not null -> UUID
+    public $profile_id;  // int -> profile.id
+    public $question;    // text
+    public $options;     // text; newline(?)-delimited
+    public $created;     // datetime
+
+    /**
+     * Get an instance by key
+     *
+     * This is a utility method to get a single instance with a given key value.
+     *
+     * @param string $k Key to use to lookup (usually 'user_id' for this class)
+     * @param mixed  $v Value to lookup
+     *
+     * @return User_greeting_count object found, or null for no hits
+     *
+     */
+
+    function staticGet($k, $v=null)
+    {
+        return Memcached_DataObject::staticGet('Poll', $k, $v);
+    }
+
+    /**
+     * Get an instance by compound key
+     *
+     * This is a utility method to get a single instance with a given set of
+     * key-value pairs. Usually used for the primary key for a compound key; thus
+     * the name.
+     *
+     * @param array $kv array of key-value mappings
+     *
+     * @return Bookmark object found, or null for no hits
+     *
+     */
+
+    function pkeyGet($kv)
+    {
+        return Memcached_DataObject::pkeyGet('Poll', $kv);
+    }
+
+    /**
+     * The One True Thingy that must be defined and declared.
+     */
+    public static function schemaDef()
+    {
+        return array(
+            'description' => 'Per-notice poll data for Poll plugin',
+            'fields' => array(
+                'id' => array('type' => 'char', 'length' => 36, 'not null' => true, 'description' => 'UUID'),
+                'uri' => array('type' => 'varchar', 'length' => 255, 'not null' => true),
+                'profile_id' => array('type' => 'int'),
+                'question' => array('type' => 'text'),
+                'options' => array('type' => 'text'),
+                'created' => array('type' => 'datetime', 'not null' => true),
+            ),
+            'primary key' => array('id'),
+            'unique keys' => array(
+                'poll_uri_key' => array('uri'),
+            ),
+        );
+    }
+
+    /**
+     * Get a bookmark based on a notice
+     *
+     * @param Notice $notice Notice to check for
+     *
+     * @return Poll found poll or null
+     */
+
+    function getByNotice($notice)
+    {
+        return self::staticGet('uri', $notice->uri);
+    }
+
+    function getOptions()
+    {
+        return explode("\n", $this->options);
+    }
+
+    function getNotice()
+    {
+        return Notice::staticGet('uri', $this->uri);
+    }
+
+    function bestUrl()
+    {
+        return $this->getNotice()->bestUrl();
+    }
+
+    /**
+     * Get the response of a particular user to this poll, if any.
+     *
+     * @param Profile $profile
+     * @return Poll_response object or null
+     */
+    function getResponse(Profile $profile)
+    {
+        $pr = new Poll_response();
+        $pr->poll_id = $this->id;
+        $pr->profile_id = $profile->id;
+        $pr->find();
+        if ($pr->fetch()) {
+            return $pr;
+        } else {
+            return null;
+        }
+    }
+
+    function countResponses()
+    {
+        $pr = new Poll_response();
+        $pr->poll_id = $this->id;
+        $pr->groupBy('selection');
+        $pr->selectAdd('count(profile_id) as votes');
+        $pr->find();
+
+        $raw = array();
+        while ($pr->fetch()) {
+            $raw[$pr->selection] = $pr->votes;
+        }
+
+        $counts = array();
+        foreach (array_keys($this->getOptions()) as $key) {
+            if (isset($raw[$key])) {
+                $counts[$key] = $raw[$key];
+            } else {
+                $counts[$key] = 0;
+            }
+        }
+        return $counts;
+    }
+
+    /**
+     * Save a new poll notice
+     *
+     * @param Profile $profile
+     * @param string  $question
+     * @param array   $opts (poll responses)
+     *
+     * @return Notice saved notice
+     */
+
+    static function saveNew($profile, $question, $opts, $options=null)
+    {
+        if (empty($options)) {
+            $options = array();
+        }
+
+        $p = new Poll();
+
+        $p->id          = UUID::gen();
+        $p->profile_id  = $profile->id;
+        $p->question    = $question;
+        $p->options     = implode("\n", $opts);
+
+        if (array_key_exists('created', $options)) {
+            $p->created = $options['created'];
+        } else {
+            $p->created = common_sql_now();
+        }
+
+        if (array_key_exists('uri', $options)) {
+            $p->uri = $options['uri'];
+        } else {
+            $p->uri = common_local_url('showpoll',
+                                        array('id' => $p->id));
+        }
+
+        $p->insert();
+
+        $content  = sprintf(_m('Poll: %s %s'),
+                            $question,
+                            $p->uri);
+        $rendered = sprintf(_m('Poll: <a href="%s">%s</a>'),
+                            htmlspecialchars($p->uri),
+                            htmlspecialchars($question));
+
+        $tags    = array('poll');
+        $replies = array();
+
+        $options = array_merge(array('urls' => array(),
+                                     'rendered' => $rendered,
+                                     'tags' => $tags,
+                                     'replies' => $replies,
+                                     'object_type' => PollPlugin::POLL_OBJECT),
+                               $options);
+
+        if (!array_key_exists('uri', $options)) {
+            $options['uri'] = $p->uri;
+        }
+
+        $saved = Notice::saveNew($profile->id,
+                                 $content,
+                                 array_key_exists('source', $options) ?
+                                 $options['source'] : 'web',
+                                 $options);
+
+        return $saved;
+    }
+}
diff --git a/plugins/Poll/PollPlugin.php b/plugins/Poll/PollPlugin.php
new file mode 100644
index 0000000000..6fa95aa0e7
--- /dev/null
+++ b/plugins/Poll/PollPlugin.php
@@ -0,0 +1,293 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2011, StatusNet, Inc.
+ *
+ * A plugin to enable social-bookmarking functionality
+ *
+ * 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  PollPlugin
+ * @package   StatusNet
+ * @author    Brion Vibber <brion@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')) {
+    exit(1);
+}
+
+/**
+ * Poll plugin main class
+ *
+ * @category  PollPlugin
+ * @package   StatusNet
+ * @author    Brion Vibber <brionv@status.net>
+ * @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 PollPlugin extends MicroAppPlugin
+{
+    const VERSION         = '0.1';
+    const POLL_OBJECT     = 'http://apinamespace.org/activitystreams/object/poll';
+
+    /**
+     * Database schema setup
+     *
+     * @see Schema
+     * @see ColumnDef
+     *
+     * @return boolean hook value; true means continue processing, false means stop.
+     */
+
+    function onCheckSchema()
+    {
+        $schema = Schema::get();
+        $schema->ensureTable('poll', Poll::schemaDef());
+        $schema->ensureTable('poll_response', Poll_response::schemaDef());
+        return true;
+    }
+
+    /**
+     * Show the CSS necessary for this plugin
+     *
+     * @param Action $action the action being run
+     *
+     * @return boolean hook value
+     */
+
+    function onEndShowStyles($action)
+    {
+        $action->cssLink($this->path('poll.css'));
+        return true;
+    }
+
+    /**
+     * Load related modules when needed
+     *
+     * @param string $cls Name of the class to be loaded
+     *
+     * @return boolean hook value; true means continue processing, false means stop.
+     */
+
+    function onAutoload($cls)
+    {
+        $dir = dirname(__FILE__);
+
+        switch ($cls)
+        {
+        case 'ShowpollAction':
+        case 'NewpollAction':
+        case 'RespondpollAction':
+            include_once $dir . '/' . strtolower(mb_substr($cls, 0, -6)) . '.php';
+            return false;
+        case 'Poll':
+        case 'Poll_response':
+            include_once $dir.'/'.$cls.'.php';
+            return false;
+        case 'NewPollForm':
+        case 'PollResponseForm':
+        case 'PollResultForm':
+            include_once $dir.'/'.strtolower($cls).'.php';
+            return false;
+        default:
+            return true;
+        }
+    }
+
+    /**
+     * Map URLs to actions
+     *
+     * @param Net_URL_Mapper $m path-to-action mapper
+     *
+     * @return boolean hook value; true means continue processing, false means stop.
+     */
+
+    function onRouterInitialized($m)
+    {
+        $m->connect('main/poll/new',
+                    array('action' => 'newpoll'),
+                    array('id' => '[0-9]+'));
+
+        $m->connect('main/poll/:id/respond',
+                    array('action' => 'respondpoll'),
+                    array('id' => '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}'));
+
+        return true;
+    }
+
+    /**
+     * Plugin version data
+     *
+     * @param array &$versions array of version data
+     *
+     * @return value
+     */
+
+    function onPluginVersion(&$versions)
+    {
+        $versions[] = array('name' => 'Poll',
+                            'version' => self::VERSION,
+                            'author' => 'Brion Vibber',
+                            'homepage' => 'http://status.net/wiki/Plugin:Poll',
+                            'rawdescription' =>
+                            _m('Simple extension for supporting basic polls.'));
+        return true;
+    }
+
+    function types()
+    {
+        return array(self::POLL_OBJECT);
+    }
+
+    /**
+     * When a notice is deleted, delete the related Poll
+     *
+     * @param Notice $notice Notice being deleted
+     *
+     * @return boolean hook value
+     */
+
+    function deleteRelated($notice)
+    {
+        $p = Poll::getByNotice($notice);
+
+        if (!empty($p)) {
+            $p->delete();
+        }
+
+        return true;
+    }
+
+    /**
+     * Save a poll from an activity
+     *
+     * @param Profile  $profile  Profile to use as author
+     * @param Activity $activity Activity to save
+     * @param array    $options  Options to pass to bookmark-saving code
+     *
+     * @return Notice resulting notice
+     */
+
+    function saveNoticeFromActivity($activity, $profile, $options=array())
+    {
+        // @fixme
+    }
+
+    function activityObjectFromNotice($notice)
+    {
+        assert($this->isMyNotice($notice));
+
+        $object = new ActivityObject();
+        $object->id      = $notice->uri;
+        $object->type    = self::POLL_OBJECT;
+        $object->title   = 'Poll title';
+        $object->summary = 'Poll summary';
+        $object->link    = $notice->bestUrl();
+
+        $poll = Poll::getByNotice($notice);
+        /**
+         * Adding the poll-specific data. There's no standard in AS for polls,
+         * so we're making stuff up.
+         *
+         * For the moment, using a kind of icky-looking schema that happens to
+         * work with out code for generating both Atom and JSON forms, though
+         * I don't like it:
+         *
+         * <poll:data xmlns:poll="http://apinamespace.org/activitystreams/object/poll"
+         *            question="Who wants a poll question?"
+         *            option1="Option one"
+         *            option2="Option two"
+         *            option3="Option three"></poll:data>
+         *
+         * "poll:data": {
+         *     "xmlns:poll": http://apinamespace.org/activitystreams/object/poll
+         *     "question": "Who wants a poll question?"
+         *     "option1": "Option one"
+         *     "option2": "Option two"
+         *     "option3": "Option three"
+         * }
+         *
+         */
+        // @fixme there's no way to specify an XML node tree here, like <poll><option/><option/></poll>
+        // @fixme there's no way to specify a JSON array or multi-level tree unless you break the XML attribs
+        // @fixme XML node contents don't get shown in JSON
+        $data = array('xmlns:poll' => self::POLL_OBJECT,
+                      'question'   => $poll->question);
+        foreach ($poll->getOptions() as $i => $opt) {
+            $data['option' . ($i + 1)] = $opt;
+        }
+        $object->extra[] = array('poll:data', $data, '');
+        return $object;
+    }
+
+    /**
+     * @fixme WARNING WARNING WARNING parent class closes the final div that we
+     * open here, but we probably shouldn't open it here. Check parent class
+     * and Bookmark plugin for if that's right.
+     */
+    function showNotice($notice, $out)
+    {
+        $user = common_current_user();
+
+        // @hack we want regular rendering, then just add stuff after that
+        $nli = new NoticeListItem($notice, $out);
+        $nli->showNotice();
+
+        $out->elementStart('div', array('class' => 'entry-content poll-content'));
+        $poll = Poll::getByNotice($notice);
+        if ($poll) {
+            if ($user) {
+                $profile = $user->getProfile();
+                $response = $poll->getResponse($profile);
+                if ($response) {
+                    // User has already responded; show the results.
+                    $form = new PollResultForm($poll, $out);
+                } else {
+                    $form = new PollResponseForm($poll, $out);
+                }
+                $form->show();
+            }
+        } else {
+            $out->text('Poll data is missing');
+        }
+        $out->elementEnd('div');
+
+        // @fixme
+        $out->elementStart('div', array('class' => 'entry-content'));
+    }
+
+    function entryForm($out)
+    {
+        return new NewPollForm($out);
+    }
+
+    // @fixme is this from parent?
+    function tag()
+    {
+        return 'poll';
+    }
+
+    function appTitle()
+    {
+        return _m('Poll');
+    }
+}
diff --git a/plugins/Poll/Poll_response.php b/plugins/Poll/Poll_response.php
new file mode 100644
index 0000000000..44bc421c22
--- /dev/null
+++ b/plugins/Poll/Poll_response.php
@@ -0,0 +1,110 @@
+<?php
+/**
+ * Data class to record responses to polls
+ *
+ * PHP version 5
+ *
+ * @category PollPlugin
+ * @package  StatusNet
+ * @author   Brion Vibber <brion@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
+ * @link     http://status.net/
+ *
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2011, StatusNet, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.     See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
+/**
+ * For storing the poll options and such
+ *
+ * @category PollPlugin
+ * @package  StatusNet
+ * @author   Brion Vibber <brion@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
+ * @link     http://status.net/
+ *
+ * @see      DB_DataObject
+ */
+
+class Poll_response extends Managed_DataObject
+{
+    public $__table = 'poll_response'; // table name
+    public $poll_id;     // char(36) primary key not null -> UUID
+    public $profile_id;  // int -> profile.id
+    public $selection;   // int -> choice #
+    public $created;     // datetime
+
+    /**
+     * Get an instance by key
+     *
+     * This is a utility method to get a single instance with a given key value.
+     *
+     * @param string $k Key to use to lookup (usually 'user_id' for this class)
+     * @param mixed  $v Value to lookup
+     *
+     * @return User_greeting_count object found, or null for no hits
+     *
+     */
+
+    function staticGet($k, $v=null)
+    {
+        return Memcached_DataObject::staticGet('Poll_response', $k, $v);
+    }
+
+    /**
+     * Get an instance by compound key
+     *
+     * This is a utility method to get a single instance with a given set of
+     * key-value pairs. Usually used for the primary key for a compound key; thus
+     * the name.
+     *
+     * @param array $kv array of key-value mappings
+     *
+     * @return Bookmark object found, or null for no hits
+     *
+     */
+
+    function pkeyGet($kv)
+    {
+        return Memcached_DataObject::pkeyGet('Poll_response', $kv);
+    }
+
+    /**
+     * The One True Thingy that must be defined and declared.
+     */
+    public static function schemaDef()
+    {
+        return array(
+            'description' => 'Record of responses to polls',
+            'fields' => array(
+                'poll_id' => array('type' => 'char', 'length' => 36, 'not null' => true, 'description' => 'UUID'),
+                'profile_id' => array('type' => 'int'),
+                'selection' => array('type' => 'int'),
+                'created' => array('type' => 'datetime', 'not null' => true),
+            ),
+            'unique keys' => array(
+                'poll_response_poll_id_profile_id_key' => array('poll_id', 'profile_id'),
+            ),
+            'indexes' => array(
+                'poll_response_profile_id_poll_id_index' => array('profile_id', 'poll_id'),
+            )
+        );
+    }
+}
diff --git a/plugins/Poll/README b/plugins/Poll/README
new file mode 100644
index 0000000000..cd91a03945
--- /dev/null
+++ b/plugins/Poll/README
@@ -0,0 +1,21 @@
+Unfinished basic stuff:
+* make pretty graphs for response counts
+* ActivityStreams output of poll data is temporary; the interfaces need more flexibility
+* ActivityStreams input not done yet
+* need link -> show results in addition to showing results if you already voted
+* way to change/cancel your vote
+
+Known issues:
+* HTTP caching needs fixing on show-poll; may show you old data if you voted after
+
+Things todo:
+* should we allow anonymous responses? or ways for remote profiles to respond locally?
+
+Fancier things todo:
+* make sure backup/restore work
+* make sure ostatus transfer works
+* a way to do poll responses over ostatus directly?
+* allow links, tags, @-references in poll question & answers? or not?
+
+Storage todo:
+* probably separate the options into a table instead of squishing them in a text blob
diff --git a/plugins/Poll/newpoll.php b/plugins/Poll/newpoll.php
new file mode 100644
index 0000000000..66386affa9
--- /dev/null
+++ b/plugins/Poll/newpoll.php
@@ -0,0 +1,193 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2011, StatusNet, Inc.
+ *
+ * Add a new Poll
+ *
+ * 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  Poll
+ * @package   StatusNet
+ * @author    Brion Vibber <brion@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);
+}
+
+/**
+ * Add a new Poll
+ *
+ * @category  Poll
+ * @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 NewPollAction extends Action
+{
+    protected $user        = null;
+    protected $error       = null;
+    protected $complete    = null;
+
+    protected $question    = null;
+    protected $options     = array();
+
+    /**
+     * Returns the title of the action
+     *
+     * @return string Action title
+     */
+
+    function title()
+    {
+        return _('New poll');
+    }
+
+    /**
+     * For initializing members of the class.
+     *
+     * @param array $argarray misc. arguments
+     *
+     * @return boolean true
+     */
+
+    function prepare($argarray)
+    {
+        parent::prepare($argarray);
+
+        $this->user = common_current_user();
+
+        if (empty($this->user)) {
+            throw new ClientException(_("Must be logged in to post a poll."),
+                                      403);
+        }
+
+        if ($this->isPost()) {
+            $this->checkSessionToken();
+        }
+
+        $this->question = $this->trimmed('question');
+        for ($i = 1; $i < 20; $i++) {
+            $opt = $this->trimmed('option' . $i);
+            if ($opt != '') {
+                $this->options[] = $opt;
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * Handler method
+     *
+     * @param array $argarray is ignored since it's now passed in in prepare()
+     *
+     * @return void
+     */
+
+    function handle($argarray=null)
+    {
+        parent::handle($argarray);
+
+        if ($this->isPost()) {
+            $this->newPoll();
+        } else {
+            $this->showPage();
+        }
+
+        return;
+    }
+
+    /**
+     * Add a new Poll
+     *
+     * @return void
+     */
+
+    function newPoll()
+    {
+        try {
+            if (empty($this->question)) {
+                throw new ClientException(_('Poll must have a question.'));
+            }
+
+            if (count($this->options) < 2) {
+                throw new ClientException(_('Poll must have at least two options.'));
+            }
+
+
+            $saved = Poll::saveNew($this->user->getProfile(),
+                                              $this->question,
+                                              $this->options);
+
+        } catch (ClientException $ce) {
+            $this->error = $ce->getMessage();
+            $this->showPage();
+            return;
+        }
+
+        common_redirect($saved->bestUrl(), 303);
+    }
+
+    /**
+     * Show the Poll form
+     *
+     * @return void
+     */
+
+    function showContent()
+    {
+        if (!empty($this->error)) {
+            $this->element('p', 'error', $this->error);
+        }
+
+        $form = new NewPollForm($this,
+                                 $this->questions,
+                                 $this->options);
+
+        $form->show();
+
+        return;
+    }
+
+    /**
+     * Return true if read only.
+     *
+     * MAY override
+     *
+     * @param array $args other arguments
+     *
+     * @return boolean is read only action?
+     */
+
+    function isReadOnly($args)
+    {
+        if ($_SERVER['REQUEST_METHOD'] == 'GET' ||
+            $_SERVER['REQUEST_METHOD'] == 'HEAD') {
+            return true;
+        } else {
+            return false;
+        }
+    }
+}
diff --git a/plugins/Poll/newpollform.php b/plugins/Poll/newpollform.php
new file mode 100644
index 0000000000..fd5f28748b
--- /dev/null
+++ b/plugins/Poll/newpollform.php
@@ -0,0 +1,150 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2011, StatusNet, Inc.
+ *
+ * Form for adding a new poll
+ *
+ * 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  PollPlugin
+ * @package   StatusNet
+ * @author    Brion Vibber <brion@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);
+}
+
+/**
+ * Form to add a new poll thingy
+ *
+ * @category  PollPlugin
+ * @package   StatusNet
+ * @author    Brion Vibber <brion@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 NewpollForm extends Form
+{
+
+    protected $question = null;
+    protected $options = array();
+
+    /**
+     * Construct a new poll form
+     *
+     * @param HTMLOutputter $out         output channel
+     *
+     * @return void
+     */
+
+    function __construct($out=null, $question=null, $options=null)
+    {
+        parent::__construct($out);
+    }
+
+    /**
+     * ID of the form
+     *
+     * @return int ID of the form
+     */
+
+    function id()
+    {
+        return 'newpoll-form';
+    }
+
+    /**
+     * class of the form
+     *
+     * @return string class of the form
+     */
+
+    function formClass()
+    {
+        return 'form_settings';
+    }
+
+    /**
+     * Action of the form
+     *
+     * @return string URL of the action
+     */
+
+    function action()
+    {
+        return common_local_url('newpoll');
+    }
+
+    /**
+     * Data elements of the form
+     *
+     * @return void
+     */
+
+    function formData()
+    {
+        $this->out->elementStart('fieldset', array('id' => 'newpoll-data'));
+        $this->out->elementStart('ul', 'form_data');
+
+        $this->li();
+        $this->out->input('question',
+                          _m('Question'),
+                          $this->question,
+                          _m('What question are people answering?'));
+        $this->unli();
+
+        $max = 5;
+        if (count($this->options) + 1 > $max) {
+            $max = count($this->options) + 2;
+        }
+        for ($i = 0; $i < $max; $i++) {
+            // @fixme make extensible
+            if (isset($this->options[$i])) {
+                $default = $this->options[$i];
+            } else {
+                $default = '';
+            }
+            $this->li();
+            $this->out->input('option' . ($i + 1),
+                              sprintf(_m('Option %d'), $i + 1),
+                              $default);
+            $this->unli();
+        }
+
+        $this->out->elementEnd('ul');
+        $this->out->elementEnd('fieldset');
+    }
+
+    /**
+     * Action elements
+     *
+     * @return void
+     */
+
+    function formActions()
+    {
+        $this->out->submit('submit', _m('BUTTON', 'Save'));
+    }
+}
diff --git a/plugins/Poll/pollresponseform.php b/plugins/Poll/pollresponseform.php
new file mode 100644
index 0000000000..87340f926f
--- /dev/null
+++ b/plugins/Poll/pollresponseform.php
@@ -0,0 +1,135 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2011, StatusNet, Inc.
+ *
+ * Form for adding a new poll
+ *
+ * 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  PollPlugin
+ * @package   StatusNet
+ * @author    Brion Vibber <brion@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);
+}
+
+/**
+ * Form to add a new poll thingy
+ *
+ * @category  PollPlugin
+ * @package   StatusNet
+ * @author    Brion Vibber <brion@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 PollResponseForm extends Form
+{
+    protected $poll;
+
+    /**
+     * Construct a new poll form
+     *
+     * @param Poll $poll
+     * @param HTMLOutputter $out         output channel
+     *
+     * @return void
+     */
+
+    function __construct(Poll $poll, HTMLOutputter $out)
+    {
+        parent::__construct($out);
+        $this->poll = $poll;
+    }
+
+    /**
+     * ID of the form
+     *
+     * @return int ID of the form
+     */
+
+    function id()
+    {
+        return 'pollresponse-form';
+    }
+
+    /**
+     * class of the form
+     *
+     * @return string class of the form
+     */
+
+    function formClass()
+    {
+        return 'form_settings';
+    }
+
+    /**
+     * Action of the form
+     *
+     * @return string URL of the action
+     */
+
+    function action()
+    {
+        return common_local_url('respondpoll', array('id' => $this->poll->id));
+    }
+
+    /**
+     * Data elements of the form
+     *
+     * @return void
+     */
+
+    function formData()
+    {
+        $poll = $this->poll;
+        $out = $this->out;
+        $id = "poll-" . $poll->id;
+
+        $out->element('p', 'poll-question', $poll->question);
+        $out->elementStart('ul', 'poll-options');
+        foreach ($poll->getOptions() as $i => $opt) {
+            $out->elementStart('li');
+            $out->elementStart('label');
+            $out->element('input', array('type' => 'radio', 'name' => 'pollselection', 'value' => $i + 1), '');
+            $out->text(' ' . $opt);
+            $out->elementEnd('label');
+            $out->elementEnd('li');
+        }
+        $out->elementEnd('ul');
+    }
+
+    /**
+     * Action elements
+     *
+     * @return void
+     */
+
+    function formActions()
+    {
+        $this->out->submit('submit', _m('BUTTON', 'Submit'));
+    }
+}
diff --git a/plugins/Poll/pollresultform.php b/plugins/Poll/pollresultform.php
new file mode 100644
index 0000000000..eace105e0d
--- /dev/null
+++ b/plugins/Poll/pollresultform.php
@@ -0,0 +1,131 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2011, StatusNet, Inc.
+ *
+ * Form for adding a new poll
+ *
+ * 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  PollPlugin
+ * @package   StatusNet
+ * @author    Brion Vibber <brion@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);
+}
+
+/**
+ * Form to add a new poll thingy
+ *
+ * @category  PollPlugin
+ * @package   StatusNet
+ * @author    Brion Vibber <brion@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 PollResultForm extends Form
+{
+    protected $poll;
+
+    /**
+     * Construct a new poll form
+     *
+     * @param Poll $poll
+     * @param HTMLOutputter $out         output channel
+     *
+     * @return void
+     */
+
+    function __construct(Poll $poll, HTMLOutputter $out)
+    {
+        parent::__construct($out);
+        $this->poll = $poll;
+    }
+
+    /**
+     * ID of the form
+     *
+     * @return int ID of the form
+     */
+
+    function id()
+    {
+        return 'pollresult-form';
+    }
+
+    /**
+     * class of the form
+     *
+     * @return string class of the form
+     */
+
+    function formClass()
+    {
+        return 'form_settings';
+    }
+
+    /**
+     * Action of the form
+     *
+     * @return string URL of the action
+     */
+
+    function action()
+    {
+        return common_local_url('respondpoll', array('id' => $this->poll->id));
+    }
+
+    /**
+     * Data elements of the form
+     *
+     * @return void
+     */
+
+    function formData()
+    {
+        $poll = $this->poll;
+        $out = $this->out;
+        $counts = $poll->countResponses();
+
+        $out->element('p', 'poll-question', $poll->question);
+        $out->elementStart('ul', 'poll-options');
+        foreach ($poll->getOptions() as $i => $opt) {
+            $out->elementStart('li');
+            $out->text($counts[$i] . ' ' . $opt);
+            $out->elementEnd('li');
+        }
+        $out->elementEnd('ul');
+    }
+
+    /**
+     * Action elements
+     *
+     * @return void
+     */
+
+    function formActions()
+    {
+    }
+}
diff --git a/plugins/Poll/respondpoll.php b/plugins/Poll/respondpoll.php
new file mode 100644
index 0000000000..8ae31443fc
--- /dev/null
+++ b/plugins/Poll/respondpoll.php
@@ -0,0 +1,189 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2011, StatusNet, Inc.
+ *
+ * Add a new Poll
+ *
+ * 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  Poll
+ * @package   StatusNet
+ * @author    Brion Vibber <brion@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);
+}
+
+/**
+ * Add a new Poll
+ *
+ * @category  Poll
+ * @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 RespondPollAction extends Action
+{
+    protected $user        = null;
+    protected $error       = null;
+    protected $complete    = null;
+
+    protected $poll        = null;
+    protected $selection   = null;
+
+    /**
+     * Returns the title of the action
+     *
+     * @return string Action title
+     */
+
+    function title()
+    {
+        return _m('Poll response');
+    }
+
+    /**
+     * For initializing members of the class.
+     *
+     * @param array $argarray misc. arguments
+     *
+     * @return boolean true
+     */
+
+    function prepare($argarray)
+    {
+        parent::prepare($argarray);
+
+        $this->user = common_current_user();
+
+        if (empty($this->user)) {
+            throw new ClientException(_m("Must be logged in to respond to a poll."),
+                                      403);
+        }
+
+        if ($this->isPost()) {
+            $this->checkSessionToken();
+        }
+
+        $id = $this->trimmed('id');
+        $this->poll = Poll::staticGet('id', $id);
+        if (empty($this->poll)) {
+            throw new ClientException(_m("Invalid or missing poll."), 404);
+        }
+
+        $selection = intval($this->trimmed('pollselection'));
+        if ($selection < 1 || $selection > count($this->poll->getOptions())) {
+            throw new ClientException(_m('Invalid poll selection.'));
+        }
+        $this->selection = $selection;
+
+        return true;
+    }
+
+    /**
+     * Handler method
+     *
+     * @param array $argarray is ignored since it's now passed in in prepare()
+     *
+     * @return void
+     */
+
+    function handle($argarray=null)
+    {
+        parent::handle($argarray);
+
+        if ($this->isPost()) {
+            $this->respondPoll();
+        } else {
+            $this->showPage();
+        }
+
+        return;
+    }
+
+    /**
+     * Add a new Poll
+     *
+     * @return void
+     */
+
+    function respondPoll()
+    {
+        try {
+            $response = new Poll_response();
+            $response->poll_id = $this->poll->id;
+            $response->profile_id = $this->user->id;
+            $response->selection = $this->selection;
+            $response->created = common_sql_now();
+            $response->insert();
+
+        } catch (ClientException $ce) {
+            $this->error = $ce->getMessage();
+            $this->showPage();
+            return;
+        }
+
+        common_redirect($this->poll->bestUrl(), 303);
+    }
+
+    /**
+     * Show the Poll form
+     *
+     * @return void
+     */
+
+    function showContent()
+    {
+        if (!empty($this->error)) {
+            $this->element('p', 'error', $this->error);
+        }
+
+        $form = new PollResponseForm($this->poll, $this);
+
+        $form->show();
+
+        return;
+    }
+
+    /**
+     * Return true if read only.
+     *
+     * MAY override
+     *
+     * @param array $args other arguments
+     *
+     * @return boolean is read only action?
+     */
+
+    function isReadOnly($args)
+    {
+        if ($_SERVER['REQUEST_METHOD'] == 'GET' ||
+            $_SERVER['REQUEST_METHOD'] == 'HEAD') {
+            return true;
+        } else {
+            return false;
+        }
+    }
+}
diff --git a/plugins/Poll/showpoll.php b/plugins/Poll/showpoll.php
new file mode 100644
index 0000000000..f5002701a2
--- /dev/null
+++ b/plugins/Poll/showpoll.php
@@ -0,0 +1,111 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2011, StatusNet, Inc.
+ *
+ * Show a single Poll
+ *
+ * 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  PollPlugin
+ * @package   StatusNet
+ * @author    Brion Vibber <brion@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);
+}
+
+/**
+ * Show a single Poll, with associated information
+ *
+ * @category  PollPlugin
+ * @package   StatusNet
+ * @author    Brion Vibber <brion@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 ShowPollAction extends ShownoticeAction
+{
+    protected $poll = null;
+
+    /**
+     * For initializing members of the class.
+     *
+     * @param array $argarray misc. arguments
+     *
+     * @return boolean true
+     */
+
+    function prepare($argarray)
+    {
+        OwnerDesignAction::prepare($argarray);
+
+        $this->id = $this->trimmed('id');
+
+        $this->poll = Poll::staticGet('id', $this->id);
+
+        if (empty($this->poll)) {
+            throw new ClientException(_m('No such poll.'), 404);
+        }
+
+        $this->notice = $this->poll->getNotice();
+
+        if (empty($this->notice)) {
+            // Did we used to have it, and it got deleted?
+            throw new ClientException(_m('No such poll notice.'), 404);
+        }
+
+        $this->user = User::staticGet('id', $this->poll->profile_id);
+
+        if (empty($this->user)) {
+            throw new ClientException(_m('No such user.'), 404);
+        }
+
+        $this->profile = $this->user->getProfile();
+
+        if (empty($this->profile)) {
+            throw new ServerException(_m('User without a profile.'));
+        }
+
+        $this->avatar = $this->profile->getAvatar(AVATAR_PROFILE_SIZE);
+
+        return true;
+    }
+
+    /**
+     * Title of the page
+     *
+     * Used by Action class for layout.
+     *
+     * @return string page tile
+     */
+
+    function title()
+    {
+        return sprintf(_('%s\'s poll: %s'),
+                       $this->user->nickname,
+                       $this->poll->question);
+    }
+
+}

From 99bd8c670c3a1be5be944879ffed248c040c2770 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Mon, 7 Mar 2011 21:34:57 -0800
Subject: [PATCH 449/655] Fix a couple things

---
 plugins/ExtendedProfile/Profile_detail.php  | 2 +-
 plugins/ExtendedProfile/extendedprofile.php | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/plugins/ExtendedProfile/Profile_detail.php b/plugins/ExtendedProfile/Profile_detail.php
index 25eca4d09c..4b193e54ee 100644
--- a/plugins/ExtendedProfile/Profile_detail.php
+++ b/plugins/ExtendedProfile/Profile_detail.php
@@ -96,7 +96,7 @@ class Profile_detail extends Memcached_DataObject
 
                      'value' => DB_DATAOBJECT_STR,
                      'rel' => DB_DATAOBJECT_STR,
-                     'ref_profile' => DB_DATAOBJECT_ID,
+                     'ref_profile' => DB_DATAOBJECT_INT,
 
                      'created' => DB_DATAOBJECT_STR + DB_DATAOBJECT_DATE + DB_DATAOBJECT_TIME + DB_DATAOBJECT_NOTNULL,
                      'modified' => DB_DATAOBJECT_STR + DB_DATAOBJECT_DATE + DB_DATAOBJECT_TIME + DB_DATAOBJECT_NOTNULL);
diff --git a/plugins/ExtendedProfile/extendedprofile.php b/plugins/ExtendedProfile/extendedprofile.php
index 7f69f90899..3be753b23f 100644
--- a/plugins/ExtendedProfile/extendedprofile.php
+++ b/plugins/ExtendedProfile/extendedprofile.php
@@ -35,8 +35,10 @@ class ExtendedProfile
         $detail = new Profile_detail();
         $detail->profile_id = $this->profile->id;
         $detail->find();
-        
-        while ($detail->get()) {
+
+        $fields = array();
+
+        while ($detail->fetch()) {
             $fields[$detail->field][] = clone($detail);
         }
         return $fields;

From 5b0ca315b4c232b63b0b453ff4c7fc732f3670ff Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Tue, 8 Mar 2011 10:58:14 -0800
Subject: [PATCH 450/655] 'note' -> 'notice' in an error message -- thx to AVRS
 on IRC for the catch on translatewiki.net :D

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

diff --git a/actions/atompubfavoritefeed.php b/actions/atompubfavoritefeed.php
index c31fcbd72a..634bb22457 100644
--- a/actions/atompubfavoritefeed.php
+++ b/actions/atompubfavoritefeed.php
@@ -256,7 +256,7 @@ class AtompubfavoritefeedAction extends ApiAuthAction
             if (empty($notice)) {
                 // XXX: import from listed URL or something
                 // TRANS: Client exception thrown when trying favorite a notice without content.
-                throw new ClientException(_('Unknown note.'));
+                throw new ClientException(_('Unknown notice.'));
             }
 
             $old = Fave::pkeyGet(array('user_id' => $this->auth_user->id,

From ba1ada28809fdef593c8849dad0e3e01a261bbaf Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Tue, 8 Mar 2011 12:01:12 -0800
Subject: [PATCH 451/655] de-IDifying labels in notice form to fix issue with
 geo pin activating the wrong place when cloning the form

Note that changes to the attachment from <label for/><input id/> to <label><input></label> affect some of the existing styles which attempt to place them both in the same place based on having a common parent. Only 'neo' has been fully tested and fixed for this case, as the others all fail due to the new layout anyway. :)
---
 lib/noticeform.php                   | 16 +++++++++-------
 plugins/MobileProfile/mp-screen.css  |  2 +-
 plugins/Realtime/realtimeupdate.css  |  6 +++---
 theme/base/css/display.css           |  8 ++++----
 theme/biz/css/base.css               |  8 ++++----
 theme/biz/css/display.css            |  6 +++---
 theme/clean/css/display.css          |  4 ++--
 theme/clean/css/ie.css               |  2 +-
 theme/clean/css/mp-screen.css        |  2 +-
 theme/cleaner/css/display.css        |  6 +++---
 theme/cleaner/css/ie.css             |  2 +-
 theme/cleaner/css/mp-screen.css      |  2 +-
 theme/cloudy/css/display.css         | 14 +++++++-------
 theme/cloudy/css/ie.css              |  2 +-
 theme/default/css/display.css        |  6 +++---
 theme/default/css/ie.css             |  2 +-
 theme/identica/css/display.css       |  6 +++---
 theme/identica/css/ie.css            |  2 +-
 theme/mnml/css/display.css           | 12 ++++++------
 theme/mnml/css/ie.css                |  2 +-
 theme/mnml/css/mp-screen.css         |  2 +-
 theme/neo/css/display.css            | 21 ++++++++++-----------
 theme/neo/css/ie.css                 |  6 +++---
 theme/neo/css/mp-screen.css          |  2 +-
 theme/pigeonthoughts/css/base.css    | 15 ++++++++++-----
 theme/pigeonthoughts/css/display.css |  6 +++---
 theme/rebase/css/display.css         | 27 +++++++++++++++++----------
 theme/rebase/css/ie.css              |  2 +-
 theme/shiny/css/display.css          |  4 ++--
 theme/shiny/css/ie.css               |  2 +-
 theme/shiny/css/mp-screen.css        |  2 +-
 theme/victorian/css/display.css      |  6 +++---
 theme/victorian/css/ie.css           |  2 +-
 theme/victorian/css/mp-screen.css    |  2 +-
 34 files changed, 111 insertions(+), 98 deletions(-)

diff --git a/lib/noticeform.php b/lib/noticeform.php
index ace8e5582b..271a37449c 100644
--- a/lib/noticeform.php
+++ b/lib/noticeform.php
@@ -187,12 +187,14 @@ class NoticeForm extends Form
             if (common_config('attachments', 'uploads')) {
                 $this->out->hidden('MAX_FILE_SIZE', common_config('attachments', 'file_quota'));
                 // TRANS: Input label in notice form for adding an attachment.
-                $this->out->element('label', array('for' => 'notice_data-attach'),_('Attach'));
-                $this->out->element('input', array('id' => 'notice_data-attach',
+                $this->out->elementStart('label', array('class' => 'notice_data-attach'));
+                $this->out->text(_('Attach'));
+                $this->out->element('input', array('class' => 'notice_data-attach',
                                                    'type' => 'file',
                                                    'name' => 'attach',
                                                    // TRANS: Title for input field to attach a file to a notice.
                                                    'title' => _('Attach a file.')));
+                $this->out->elementEnd('label');
             }
             if ($this->action) {
                 $this->out->hidden('notice_return-to', $this->action, 'returnto');
@@ -210,6 +212,7 @@ class NoticeForm extends Form
 
                 // @fixme checkbox method allows no way to change the id without changing the name
                 //$this->out->checkbox('notice_data-geo', _('Share my location'), true);
+                $this->out->elementStart('label', 'notice_data-geo');
                 $this->out->element('input', array(
                     'name' => 'notice_data-geo',
                     'type' => 'checkbox',
@@ -218,11 +221,10 @@ class NoticeForm extends Form
                     'checked' => true, // ?
                 ));
                 $this->out->text(' ');
-                $this->out->element('label', array('class' => 'notice_data-geo',
-                                              'for' => $this->id() . '-notice_data-geo'),
-                               // TRANS: Field label to add location to a notice.
-                               _('Share my location'));
-
+                // TRANS: Field label to add location to a notice.
+                $this->out->text(_('Share my location'));
+                $this->out->elementEnd('label');
+                               
                 $this->out->elementEnd('div');
                 // TRANS: Text to not share location for a notice in notice form.
                 $share_disable_text = _('Do not share my location');
diff --git a/plugins/MobileProfile/mp-screen.css b/plugins/MobileProfile/mp-screen.css
index fcd88277e5..d82486182a 100644
--- a/plugins/MobileProfile/mp-screen.css
+++ b/plugins/MobileProfile/mp-screen.css
@@ -108,7 +108,7 @@ iPhone/iPod Touch, Android, Opera Mini Simulator
 #form_notice label[for="notice_data-attach"] {
 display:none;
 }
-#form_notice #notice_data-attach {
+#form_notice input.notice_data-attach {
 position:static;
 clear:both;
 width:65%;
diff --git a/plugins/Realtime/realtimeupdate.css b/plugins/Realtime/realtimeupdate.css
index 7fd7fd5ed3..3295fe4a31 100644
--- a/plugins/Realtime/realtimeupdate.css
+++ b/plugins/Realtime/realtimeupdate.css
@@ -17,13 +17,13 @@ max-width:451px;
 display:none;
 }
 
-.realtime-popup #form_notice label[for=notice_data-attach],
-.realtime-popup #form_notice #notice_data-attach,
+.realtime-popup #form_notice label.notice_data-attach,
+.realtime-popup #form_notice input.notice_data-attach,
 .realtime-popup #form_notice label.notice_data-geo {
 top:0;
 }
 
-.realtime-popup #form_notice #notice_data-attach {
+.realtime-popup #form_notice input.notice_data-attach {
 left:auto;
 right:0;
 }
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 16c2b6dce6..85ec1286b9 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -597,19 +597,19 @@ float:left;
 font-size:1.3em;
 margin-bottom:7px;
 }
-.form_notice label[for=notice_data-attach],
-.form_notice #notice_data-attach {
+.form_notice label.notice_data-attach,
+.form_notice input.notice_data-attach {
 position:absolute;
 top:25px;
 right:10.5%;
 cursor:pointer;
 }
-.form_notice label[for=notice_data-attach] {
+.form_notice label.notice_data-attach {
 text-indent:-9999px;
 width:16px;
 height:16px;
 }
-.form_notice #notice_data-attach {
+.form_notice input.notice_data-attach {
 padding:0;
 height:16px;
 }
diff --git a/theme/biz/css/base.css b/theme/biz/css/base.css
index 53aca59009..3a20871de9 100644
--- a/theme/biz/css/base.css
+++ b/theme/biz/css/base.css
@@ -462,11 +462,11 @@ float:left;
 font-size:1.3em;
 margin-bottom:7px;
 }
-#form_notice label[for=notice_data-attach] {
+#form_notice label.notice_data-attach {
 text-indent:-9999px;
 }
-#form_notice label[for=notice_data-attach],
-#form_notice #notice_data-attach {
+#form_notice label.notice_data-attach,
+#form_notice input.notice_data-attach {
 position:absolute;
 top:25px;
 right:49px;
@@ -474,7 +474,7 @@ width:16px;
 height:16px;
 cursor:pointer;
 }
-#form_notice #notice_data-attach {
+#form_notice input.notice_data-attach {
 text-indent:-279px;
 }
 #form_notice #notice_submit label {
diff --git a/theme/biz/css/display.css b/theme/biz/css/display.css
index 0bb53f74a8..2e96d99d1a 100644
--- a/theme/biz/css/display.css
+++ b/theme/biz/css/display.css
@@ -172,14 +172,14 @@ color:#333333;
 #form_notice.warning .count {
 color:#000000;
 }
-.form_notice label[for=notice_data-attach] {
+.form_notice label.notice_data-attach {
 background-position:0 -328px;
 }
-.form_notice #notice_data-attach {
+.form_notice input.notice_data-attach {
 opacity:0;
 }
 
-.form_notice label[for=notice_data-attach],
+.form_notice label.notice_data-attach,
 #export_data li a.rss,
 #export_data li a.atom,
 #export_data li a.foaf,
diff --git a/theme/clean/css/display.css b/theme/clean/css/display.css
index 96a5c02a56..ea2d62020e 100644
--- a/theme/clean/css/display.css
+++ b/theme/clean/css/display.css
@@ -114,8 +114,8 @@ address {
     height: 54px;
 }
 
-.form_notice label[for=notice_data-attach],
-.form_notice #notice_data-attach {
+.form_notice label.notice_data-attach,
+.form_notice input.notice_data-attach {
     top: 27px;
 }
 
diff --git a/theme/clean/css/ie.css b/theme/clean/css/ie.css
index 994c1297d3..272a5bbcae 100644
--- a/theme/clean/css/ie.css
+++ b/theme/clean/css/ie.css
@@ -61,7 +61,7 @@ line-height:auto;
     color:#FFFFFF;
 }
 
-.form_notice #notice_data-attach {
+.form_notice input.notice_data-attach {
     filter: alpha(opacity=0);
 }
 
diff --git a/theme/clean/css/mp-screen.css b/theme/clean/css/mp-screen.css
index 35d8326a41..8d9489b0b1 100644
--- a/theme/clean/css/mp-screen.css
+++ b/theme/clean/css/mp-screen.css
@@ -94,7 +94,7 @@ iPhone/iPod Touch, Android, Opera Mini Simulator
 .form_notice label[for="notice_data-attach"] {
 display:none;
 }
-.form_notice #notice_data-attach {
+.form_notice input.notice_data-attach {
 position:static;
 clear:both;
 width:65%;
diff --git a/theme/cleaner/css/display.css b/theme/cleaner/css/display.css
index 214c821e59..98d4560d2a 100644
--- a/theme/cleaner/css/display.css
+++ b/theme/cleaner/css/display.css
@@ -161,8 +161,8 @@ address {
     border-radius: 6px;
 }
 
-.form_notice label[for=notice_data-attach],
-.form_notice #notice_data-attach {
+.form_notice label.notice_data-attach,
+.form_notice input.notice_data-attach {
     top: 27px;
     right: 86px;
 }
@@ -594,7 +594,7 @@ padding-right:0;
     right: 6px !important;
 }
 
-.realtime-popup .form_notice label[for=notice_data-attach], .realtime-popup .form_notice #notice_data-attach {
+.realtime-popup .form_notice label.notice_data-attach, .realtime-popup .form_notice input.notice_data-attach {
     right: 74px;
     top: 3px !important;
 }
diff --git a/theme/cleaner/css/ie.css b/theme/cleaner/css/ie.css
index dbc72b1c22..7bd48790bf 100644
--- a/theme/cleaner/css/ie.css
+++ b/theme/cleaner/css/ie.css
@@ -65,7 +65,7 @@ line-height:auto;
     color:#FFFFFF;
 }
 
-.form_notice #notice_data-attach {
+.form_notice input.notice_data-attach {
     filter: alpha(opacity=0);
 }
 
diff --git a/theme/cleaner/css/mp-screen.css b/theme/cleaner/css/mp-screen.css
index 8b55e596fe..cb3c6d06b6 100644
--- a/theme/cleaner/css/mp-screen.css
+++ b/theme/cleaner/css/mp-screen.css
@@ -99,7 +99,7 @@ iPhone/iPod Touch, Android, Opera Mini Simulator
 .form_notice label[for="notice_data-attach"] {
 display:none;
 }
-.form_notice #notice_data-attach {
+.form_notice input.notice_data-attach {
 position:static;
 clear:both;
 width:65%;
diff --git a/theme/cloudy/css/display.css b/theme/cloudy/css/display.css
index a5eabac4ad..5bc8ab0c1e 100644
--- a/theme/cloudy/css/display.css
+++ b/theme/cloudy/css/display.css
@@ -493,19 +493,19 @@ float:left;
 font-size:1.3em;
 margin-bottom:7px;
 }
-.form_notice label[for=notice_data-attach],
-.form_notice #notice_data-attach {
+.form_notice label.notice_data-attach,
+.form_notice input.notice_data-attach {
 position:absolute;
 top:25px;
 right:10.5%;
 cursor:pointer;
 }
-.form_notice label[for=notice_data-attach] {
+.form_notice label.notice_data-attach {
 text-indent:-9999px;
 width:16px;
 height:16px;
 }
-.form_notice #notice_data-attach {
+.form_notice input.notice_data-attach {
 padding:0;
 height:16px;
 }
@@ -1602,7 +1602,7 @@ background:none;
 }
 
 
-.form_notice label[for=notice_data-attach],
+.form_notice label.notice_data-attach,
 #export_data li a.rss,
 #export_data li a.atom,
 #export_data li a.foaf,
@@ -1787,10 +1787,10 @@ color:#000000;
 #form_notice.warning .count {
 color:#000000;
 }
-#form_notice label[for=notice_data-attach] {
+#form_notice label.notice_data-attach {
 background:transparent url(../../base/images/icons/twotone/green/clip-01.gif) no-repeat 0 45%;
 }
-#form_notice #notice_data-attach {
+#form_notice input.notice_data-attach {
 opacity:0;
 }
 
diff --git a/theme/cloudy/css/ie.css b/theme/cloudy/css/ie.css
index edddc16d88..013bdf9d16 100644
--- a/theme/cloudy/css/ie.css
+++ b/theme/cloudy/css/ie.css
@@ -34,7 +34,7 @@ height:16px;
 width:16px;
 display:block;
 }
-#form_notice #notice_data-attach {
+#form_notice input.notice_data-attach {
 filter: alpha(opacity = 0);
 left:33.5%;
 }
diff --git a/theme/default/css/display.css b/theme/default/css/display.css
index fbd3afb12c..3e3bfdfa86 100644
--- a/theme/default/css/display.css
+++ b/theme/default/css/display.css
@@ -152,14 +152,14 @@ color:#333333;
 .entity_actions .dialogbox input {
 color:#000000;
 }
-.form_notice label[for=notice_data-attach] {
+.form_notice label.notice_data-attach {
 background-position:0 -328px;
 }
-.form_notice #notice_data-attach {
+.form_notice input.notice_data-attach {
 opacity:0;
 }
 
-.form_notice label[for=notice_data-attach],
+.form_notice label.notice_data-attach,
 #export_data li a.rss,
 #export_data li a.atom,
 #export_data li a.foaf,
diff --git a/theme/default/css/ie.css b/theme/default/css/ie.css
index 2bbeb7ffa4..3100821688 100644
--- a/theme/default/css/ie.css
+++ b/theme/default/css/ie.css
@@ -16,7 +16,7 @@ background-color:#C8D1D5;
 .form_notice .count + label {
 background:transparent url(../../base/images/icons/icons-01.gif) no-repeat 0 -328px;
 }
-.form_notice #notice_data-attach {
+.form_notice input.notice_data-attach {
 filter: alpha(opacity=0);
 }
 .notice-options form.form_favor input.submit {
diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index fba72a09d6..fe7ffa9f7d 100644
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -153,14 +153,14 @@ color:#333333;
 .entity_actions .dialogbox input {
 color:#000000;
 }
-.form_notice label[for=notice_data-attach] {
+.form_notice label.notice_data-attach {
 background-position:0 -328px;
 }
-.form_notice #notice_data-attach {
+.form_notice input.notice_data-attach {
 opacity:0;
 }
 
-.form_notice label[for=notice_data-attach],
+.form_notice label.notice_data-attach,
 #export_data li a.rss,
 #export_data li a.atom,
 #export_data li a.foaf,
diff --git a/theme/identica/css/ie.css b/theme/identica/css/ie.css
index 888c486f40..858cf3e181 100644
--- a/theme/identica/css/ie.css
+++ b/theme/identica/css/ie.css
@@ -16,7 +16,7 @@ background-color:#D9DADB;
 .form_notice .count + label {
 background:transparent url(../../base/images/icons/icons-01.gif) no-repeat 0 -328px;
 }
-.form_notice #notice_data-attach {
+.form_notice input.notice_data-attach {
 filter: alpha(opacity=0);
 }
 .notice-options form.form_favor input.submit {
diff --git a/theme/mnml/css/display.css b/theme/mnml/css/display.css
index 57ad426c55..e7bce84439 100644
--- a/theme/mnml/css/display.css
+++ b/theme/mnml/css/display.css
@@ -234,7 +234,7 @@ p.instructions {
 
 /*-- FORMS --*/
 
-.form_notice label[for=notice_data-attach],
+.form_notice label.notice_data-attach,
 #export_data li a.rss,
 #export_data li a.atom,
 #export_data li a.foaf,
@@ -292,7 +292,7 @@ button.minimize,
 .form_notice label.notice_data-geo.checked {
     background-position:0 -1846px;
 }
-.form_notice label[for=notice_data-attach] {
+.form_notice label.notice_data-attach {
     background-position:0 -328px;
 }
 button.close {
@@ -937,19 +937,19 @@ z-index:2;
 .form_notice label {
 float:left;
 }
-.form_notice label[for=notice_data-attach],
-.form_notice #notice_data-attach {
+.form_notice label.notice_data-attach,
+.form_notice input.notice_data-attach {
 position:absolute;
 top:2em;
 right: 3em;
 cursor:pointer;
 }
-.form_notice label[for=notice_data-attach] {
+.form_notice label.notice_data-attach {
 text-indent:-9999px;
 width:16px;
 height:16px;
 }
-.form_notice #notice_data-attach {
+.form_notice input.notice_data-attach {
 opacity: 0;
 padding:0;
 height:1.6em;
diff --git a/theme/mnml/css/ie.css b/theme/mnml/css/ie.css
index fed65f8b9a..839855aa6f 100644
--- a/theme/mnml/css/ie.css
+++ b/theme/mnml/css/ie.css
@@ -45,7 +45,7 @@ padding:0 4px;
     background:transparent url(../images/icons/icons-01.png) no-repeat 0 -328px;
 }
 
-.form_notice #notice_data-attach {
+.form_notice input.notice_data-attach {
     filter: alpha(opacity=0);
 }
 .form_notice .notice_data-geo_wrap label {
diff --git a/theme/mnml/css/mp-screen.css b/theme/mnml/css/mp-screen.css
index fdee4cdef3..47fdbf5e3b 100644
--- a/theme/mnml/css/mp-screen.css
+++ b/theme/mnml/css/mp-screen.css
@@ -114,7 +114,7 @@ iPhone/iPod Touch, Android, Opera Mini Simulator
 #form_notice label[for="notice_data-attach"] {
 display:none;
 }
-#form_notice #notice_data-attach {
+#form_notice input.notice_data-attach {
 position:static;
 clear:both;
 width:65%;
diff --git a/theme/neo/css/display.css b/theme/neo/css/display.css
index a542ed7609..3d98b09f02 100644
--- a/theme/neo/css/display.css
+++ b/theme/neo/css/display.css
@@ -160,8 +160,7 @@ address {
     border-radius: 6px;
 }
 
-.form_notice label[for=notice_data-attach],
-.form_notice #notice_data-attach {
+.form_notice label.notice_data-attach {
     top: 27px;
     right: 86px;
 }
@@ -434,8 +433,8 @@ td.entity_profile { /* cf directory table */
 
 #entity_remote_subscribe .dialogbox {
     border: 1px solid #7B4E82;
-    border-radius: 8px;
-	-moz-border-radius: 8px;
+    border-radius: 8px;
+	-moz-border-radius: 8px;
 	-webkit-border-radius: 8px;
 }
 
@@ -612,7 +611,7 @@ padding-right:0;
     right: 6px !important;
 }
 
-.realtime-popup .form_notice label[for=notice_data-attach], .realtime-popup .form_notice #notice_data-attach {
+.realtime-popup .form_notice label.notice_data-attach, .realtime-popup .form_notice input.notice_data-attach {
     right: 74px;
     top: 3px !important;
 }
@@ -637,8 +636,8 @@ padding-right:0;
 }
 
 .bookmark-notice-count {
-    border-radius: 4px;
-	-moz-border-radius: 4px;
+    border-radius: 4px;
+	-moz-border-radius: 4px;
 	-webkit-border-radius: 4px;
     padding: 1px 6px;
     font-size: 1.2em;
@@ -676,8 +675,8 @@ padding-right:0;
 }
 
 ul.bookmark-tags a {
-    border-radius: 4px;
-	-moz-border-radius: 4px;
+    border-radius: 4px;
+	-moz-border-radius: 4px;
 	-webkit-border-radius: 4px;
     padding: 1px 6px;
     background: #f2f2f2;
@@ -761,8 +760,8 @@ ul.bookmark-tags a:hover {
 /* Onboard specific styles */
 
 .onboard-flash {
-    border-radius: 6px;
- 	-moz-border-radius: 6px;
+    border-radius: 6px;
+ 	-moz-border-radius: 6px;
    	-webkit-border-radius: 6px;
     font-size: 1.1em;
     box-shadow: 0px 0px 12px rgba(0, 0, 0, 0.5);
diff --git a/theme/neo/css/ie.css b/theme/neo/css/ie.css
index 41f7dc9f88..81d13f443e 100644
--- a/theme/neo/css/ie.css
+++ b/theme/neo/css/ie.css
@@ -22,11 +22,11 @@ display:block;
     width: 106px;
     max-width: 106px;
 }
-.form_notice #notice_data-attach_selected,
+.form_notice input.notice_data-attach_selected,
 .form_notice #notice_data-geo_selected {
 width:78.75%;
 }
-.form_notice #notice_data-attach_selected button,
+.form_notice input.notice_data-attach_selected button,
 .form_notice #notice_data-geo_selected button {
 padding:0 4px;
 }
@@ -65,7 +65,7 @@ line-height:auto;
     color:#FFFFFF;
 }
 
-.form_notice #notice_data-attach {
+.form_notice input.notice_data-attach {
     filter: alpha(opacity=0);
 }
 
diff --git a/theme/neo/css/mp-screen.css b/theme/neo/css/mp-screen.css
index d3f95db9b6..1b7480ecaf 100644
--- a/theme/neo/css/mp-screen.css
+++ b/theme/neo/css/mp-screen.css
@@ -99,7 +99,7 @@ iPhone/iPod Touch, Android, Opera Mini Simulator
 .form_notice label[for="notice_data-attach"] {
 display:none;
 }
-.form_notice #notice_data-attach {
+.form_notice input.notice_data-attach {
 position:static;
 clear:both;
 width:65%;
diff --git a/theme/pigeonthoughts/css/base.css b/theme/pigeonthoughts/css/base.css
index 59cba446ac..2eade7a451 100644
--- a/theme/pigeonthoughts/css/base.css
+++ b/theme/pigeonthoughts/css/base.css
@@ -450,19 +450,24 @@ float:left;
 font-size:1.3em;
 margin-bottom:7px;
 }
-#form_notice label[for=notice_data-attach],
-#form_notice #notice_data-attach {
+#form_notice label.notice_data-attach,
+#form_notice input.notice_data-attach {
 position:absolute;
-top:25px;
 cursor:pointer;
 }
-#form_notice label[for=notice_data-attach] {
+#form_notice label.notice_data-attach {
+top:25px;
+}
+#form_notice input.notice_data-attach {
+top:0;
+}
+#form_notice label.notice_data-attach {
 text-indent:-9999px;
 left:394px;
 width:16px;
 height:16px;
 }
-#form_notice #notice_data-attach {
+#form_notice input.notice_data-attach {
 left:183px;
 padding:0;
 height:16px;
diff --git a/theme/pigeonthoughts/css/display.css b/theme/pigeonthoughts/css/display.css
index b4f2f297b0..3ac0f0bce7 100644
--- a/theme/pigeonthoughts/css/display.css
+++ b/theme/pigeonthoughts/css/display.css
@@ -192,14 +192,14 @@ color:#333333;
 #form_notice.warning .count {
 color:#000000;
 }
-#form_notice label[for=notice_data-attach] {
+#form_notice label.notice_data-attach {
 background-position:0 -328px;
 }
-#form_notice #notice_data-attach {
+#form_notice input.notice_data-attach {
 opacity:0;
 }
 
-.form_notice label[for=notice_data-attach],
+.form_notice label.notice_data-attach,
 #export_data li a.rss,
 #export_data li a.atom,
 #export_data li a.foaf,
diff --git a/theme/rebase/css/display.css b/theme/rebase/css/display.css
index f569131213..810dd70bc1 100644
--- a/theme/rebase/css/display.css
+++ b/theme/rebase/css/display.css
@@ -226,21 +226,28 @@ address .poweredby {
     color: #333 !important;
 }
 
-.form_notice label[for=notice_data-attach],
-.form_notice #notice_data-attach {
+.form_notice label.notice_data-attach,
+.form_notice input.notice_data-attach {
     position:absolute;
-    top: 31px;
-    right: 88px;
     cursor:pointer;
 }
+.form_notice label.notice_data-attach {
+    top: 31px;
+    right: 88px;
+}
+.form_notice input.notice_data-attach {
+    /* Positioned inside the label */
+    top: 0;
+    right: 0;
+}
 
-.form_notice label[for=notice_data-attach] {
+.form_notice label.notice_data-attach {
     text-indent:-9999px;
     width:16px;
     height:16px;
 }
 
-.form_notice #notice_data-attach {
+.form_notice input.notice_data-attach {
     padding:0;
     height:16px;
 }
@@ -348,7 +355,7 @@ address .poweredby {
     opacity: 1;
 }
 
-.form_notice #notice_data-attach {
+.form_notice input.notice_data-attach {
     opacity:0;
 }
 
@@ -1724,7 +1731,7 @@ body.realtime-popup {
     width: 86px;
 }
 
-.realtime-popup .form_notice label[for=notice_data-attach], .form_notice #notice_data-attach {
+.realtime-popup .form_notice label.notice_data-attach {
     right: 70px;
 }
 
@@ -1734,7 +1741,7 @@ body.realtime-popup {
 
 /* icons */
 
-.form_notice label[for=notice_data-attach],
+.form_notice label.notice_data-attach,
 #export_data li a.rss,
 #export_data li a.atom,
 #export_data li a.foaf,
@@ -1921,7 +1928,7 @@ background-position:0 -1648px;
 #new_group a {
 background-position:0 -1054px;
 }
-.form_notice label[for=notice_data-attach] {
+.form_notice label.notice_data-attach {
     background-position: 0 -328px;
 }
 .form_notice label.notice_data-geo {
diff --git a/theme/rebase/css/ie.css b/theme/rebase/css/ie.css
index 20e038998b..9dfb176698 100644
--- a/theme/rebase/css/ie.css
+++ b/theme/rebase/css/ie.css
@@ -61,7 +61,7 @@ line-height:auto;
     color:#FFFFFF;
 }
 
-.form_notice #notice_data-attach {
+.form_notice input.notice_data-attach {
     filter: alpha(opacity=0);
 }
 
diff --git a/theme/shiny/css/display.css b/theme/shiny/css/display.css
index e027153dd7..32a0a7e255 100644
--- a/theme/shiny/css/display.css
+++ b/theme/shiny/css/display.css
@@ -230,8 +230,8 @@ h6 {font-size: 1em;}
     border: 1px solid #9495b7;
 }
 
-.form_notice label[for=notice_data-attach],
-.form_notice #notice_data-attach {
+.form_notice label.notice_data-attach,
+.form_notice input.notice_data-attach {
     top: 27px;
     right: 86px;
 }
diff --git a/theme/shiny/css/ie.css b/theme/shiny/css/ie.css
index 8145073db5..e916b1e4cc 100644
--- a/theme/shiny/css/ie.css
+++ b/theme/shiny/css/ie.css
@@ -63,7 +63,7 @@ line-height:auto;
     color:#FFFFFF;
 }
 
-.form_notice #notice_data-attach {
+.form_notice input.notice_data-attach {
     filter: alpha(opacity=0);
 }
 
diff --git a/theme/shiny/css/mp-screen.css b/theme/shiny/css/mp-screen.css
index cb899b3557..c23a24b3c9 100644
--- a/theme/shiny/css/mp-screen.css
+++ b/theme/shiny/css/mp-screen.css
@@ -99,7 +99,7 @@ iPhone/iPod Touch, Android, Opera Mini Simulator
 .form_notice label[for="notice_data-attach"] {
 display:none;
 }
-.form_notice #notice_data-attach {
+.form_notice input.notice_data-attach {
 position:static;
 clear:both;
 width:65%;
diff --git a/theme/victorian/css/display.css b/theme/victorian/css/display.css
index 6252fdf908..65d73e96fc 100644
--- a/theme/victorian/css/display.css
+++ b/theme/victorian/css/display.css
@@ -328,15 +328,15 @@ a,
     color:#000000;
 }
 
-.form_notice label[for=notice_data-attach] {
+.form_notice label.notice_data-attach {
     background-position:0 -328px;
 }
 
-.form_notice #notice_data-attach {
+.form_notice input.notice_data-attach {
     opacity:0;
 }
 
-.form_notice label[for=notice_data-attach],
+.form_notice label.notice_data-attach,
 #export_data li a.rss,
 #export_data li a.atom,
 #export_data li a.foaf,
diff --git a/theme/victorian/css/ie.css b/theme/victorian/css/ie.css
index 038195faaf..2befa9cc48 100644
--- a/theme/victorian/css/ie.css
+++ b/theme/victorian/css/ie.css
@@ -9,7 +9,7 @@ background-color:#C8D1D5;
 .form_notice .count + label {
 background:transparent url(../../base/images/icons/icons-01.gif) no-repeat 0 -328px;
 }
-.form_notice #notice_data-attach {
+.form_notice input.notice_data-attach {
 filter: alpha(opacity=0);
 }
 .notice-options form.form_favor input.submit {
diff --git a/theme/victorian/css/mp-screen.css b/theme/victorian/css/mp-screen.css
index 94a534912f..584bfc7c10 100644
--- a/theme/victorian/css/mp-screen.css
+++ b/theme/victorian/css/mp-screen.css
@@ -109,7 +109,7 @@ iPhone/iPod Touch, Android, Opera Mini Simulator
 #form_notice label[for="notice_data-attach"] {
 display:none;
 }
-#form_notice #notice_data-attach {
+#form_notice input.notice_data-attach {
 position:static;
 clear:both;
 width:65%;

From 90f1cfcfc0fc8f925866842d765c089616009f40 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Tue, 8 Mar 2011 13:45:51 -0800
Subject: [PATCH 452/655] Poll plugin: make the polling response form submit
 via AJAX and return the results.

Now, any form marked with 'ajax' class will get the simple FormXHR treatment. Should help cut down on code that just adds that into individual forms.
---
 js/util.js                        | 11 +++++++++++
 js/util.min.js                    |  2 +-
 plugins/Poll/pollresponseform.php |  2 +-
 plugins/Poll/pollresultform.php   |  2 +-
 plugins/Poll/respondpoll.php      | 17 ++++++++++++++++-
 5 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/js/util.js b/js/util.js
index fc03bc75fe..a83d2c0e75 100644
--- a/js/util.js
+++ b/js/util.js
@@ -1380,6 +1380,16 @@ var SN = { // StatusNet
             });
         },
 
+        /**
+         * Set up any generic 'ajax' form so it submits via AJAX with auto-replacement.
+         */
+        AjaxForms: function() {
+            $('form.ajax').live('submit', function() {
+                SN.U.FormXHR($(this));
+                return false;
+            });
+        },
+
         /**
          * Add logic to any file upload forms to handle file size limits,
          * on browsers that support basic FileAPI.
@@ -1416,6 +1426,7 @@ var SN = { // StatusNet
  * don't start them loading until after DOM-ready time!
  */
 $(document).ready(function(){
+    SN.Init.AjaxForms();
     SN.Init.UploadForms();
     if ($('.'+SN.C.S.FormNotice).length > 0) {
         SN.Init.NoticeForm();
diff --git a/js/util.min.js b/js/util.min.js
index af8b2200e9..20c6b294a4 100644
--- a/js/util.min.js
+++ b/js/util.min.js
@@ -1 +1 @@
-var SN={C:{I:{CounterBlackout:false,MaxLength:140,PatternUsername:/^[0-9a-zA-Z\-_.]*$/,HTTP20x30x:[200,201,202,203,204,205,206,300,301,302,303,304,305,306,307],NoticeFormMaster:null},S:{Disabled:"disabled",Warning:"warning",Error:"error",Success:"success",Processing:"processing",CommandResult:"command_result",FormNotice:"form_notice",NoticeDataGeo:"notice_data-geo",NoticeDataGeoCookie:"NoticeDataGeo",NoticeDataGeoSelected:"notice_data-geo_selected",StatusNetInstance:"StatusNetInstance"}},messages:{},msg:function(a){if(typeof SN.messages[a]=="undefined"){return"["+a+"]"}else{return SN.messages[a]}},U:{FormNoticeEnhancements:function(b){if(jQuery.data(b[0],"ElementData")===undefined){MaxLength=b.find(".count").text();if(typeof(MaxLength)=="undefined"){MaxLength=SN.C.I.MaxLength}jQuery.data(b[0],"ElementData",{MaxLength:MaxLength});SN.U.Counter(b);NDT=b.find("[name=status_textarea]");NDT.bind("keyup",function(c){SN.U.Counter(b)});var a=function(c){window.setTimeout(function(){SN.U.Counter(b)},50)};NDT.bind("cut",a).bind("paste",a)}else{b.find(".count").text(jQuery.data(b[0],"ElementData").MaxLength)}},Counter:function(d){SN.C.I.FormNoticeCurrent=d;var b=jQuery.data(d[0],"ElementData").MaxLength;if(b<=0){return}var c=b-SN.U.CharacterCount(d);var a=d.find(".count");if(c.toString()!=a.text()){if(!SN.C.I.CounterBlackout||c===0){if(a.text()!=String(c)){a.text(c)}if(c<0){d.addClass(SN.C.S.Warning)}else{d.removeClass(SN.C.S.Warning)}if(!SN.C.I.CounterBlackout){SN.C.I.CounterBlackout=true;SN.C.I.FormNoticeCurrent=d;window.setTimeout("SN.U.ClearCounterBlackout(SN.C.I.FormNoticeCurrent);",500)}}}},CharacterCount:function(a){return a.find("[name=status_textarea]").val().length},ClearCounterBlackout:function(a){SN.C.I.CounterBlackout=false;SN.U.Counter(a)},RewriteAjaxAction:function(a){if(document.location.protocol=="https:"&&a.substr(0,5)=="http:"){return a.replace(/^http:\/\/[^:\/]+/,"https://"+document.location.host)}else{return a}},FormXHR:function(a){$.ajax({type:"POST",dataType:"xml",url:SN.U.RewriteAjaxAction(a.attr("action")),data:a.serialize()+"&ajax=1",beforeSend:function(b){a.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(c,d,b){alert(b||d)},success:function(b,c){if(typeof($("form",b)[0])!="undefined"){form_new=document._importNode($("form",b)[0],true);a.replaceWith(form_new)}else{a.replaceWith(document._importNode($("p",b)[0],true))}}})},FormNoticeXHR:function(b){SN.C.I.NoticeDataGeo={};b.append('<input type="hidden" name="ajax" value="1"/>');b.attr("action",SN.U.RewriteAjaxAction(b.attr("action")));var c=function(d,e){b.append($('<p class="form_response"></p>').addClass(d).text(e))};var a=function(){b.find(".form_response").remove()};b.ajaxForm({dataType:"xml",timeout:"60000",beforeSend:function(d){if(b.find("[name=status_textarea]").val()==""){b.addClass(SN.C.S.Warning);return false}b.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled);SN.U.normalizeGeoData(b);return true},error:function(f,g,e){b.removeClass(SN.C.S.Processing).find(".submit").removeClass(SN.C.S.Disabled).removeAttr(SN.C.S.Disabled,SN.C.S.Disabled);a();if(g=="timeout"){c("error","Sorry! We had trouble sending your notice. The servers are overloaded. Please try again, and contact the site administrator if this problem persists.")}else{var d=SN.U.GetResponseXML(f);if($("."+SN.C.S.Error,d).length>0){b.append(document._importNode($("."+SN.C.S.Error,d)[0],true))}else{if(parseInt(f.status)===0||jQuery.inArray(parseInt(f.status),SN.C.I.HTTP20x30x)>=0){b.resetForm().find(".attach-status").remove();SN.U.FormNoticeEnhancements(b)}else{c("error","(Sorry! We had trouble sending your notice ("+f.status+" "+f.statusText+"). Please report the problem to the site administrator if this happens again.")}}}},success:function(i,f){a();var n=$("#"+SN.C.S.Error,i);if(n.length>0){c("error",n.text())}else{if($("body")[0].id=="bookmarklet"){self.close()}var d=$("#"+SN.C.S.CommandResult,i);if(d.length>0){c("success",d.text())}else{var m=document._importNode($("li",i)[0],true);var k=$("#notices_primary .notices:first");var l=b.closest("li.notice-reply");if(l.length>0){var e=$(m).attr("id");if($("#"+e).length==0){var j=l.closest("li.notice");l.replaceWith(m);SN.U.NoticeInlineReplyPlaceholder(j)}else{l.remove()}}else{if(k.length>0&&SN.U.belongsOnTimeline(m)){if($("#"+m.id).length===0){var h=b.find("[name=inreplyto]").val();var g="#notices_primary #notice-"+h;if($("body")[0].id=="conversation"){if(h.length>0&&$(g+" .notices").length<1){$(g).append('<ul class="notices"></ul>')}$($(g+" .notices")[0]).append(m)}else{k.prepend(m)}$("#"+m.id).css({display:"none"}).fadeIn(2500);SN.U.NoticeWithAttachment($("#"+m.id));SN.U.NoticeReplyTo($("#"+m.id))}}else{c("success",$("title",i).text())}}}b.resetForm();b.find("[name=inreplyto]").val("");b.find(".attach-status").remove();SN.U.FormNoticeEnhancements(b)}},complete:function(d,e){b.removeClass(SN.C.S.Processing).find(".submit").removeAttr(SN.C.S.Disabled).removeClass(SN.C.S.Disabled);b.find("[name=lat]").val(SN.C.I.NoticeDataGeo.NLat);b.find("[name=lon]").val(SN.C.I.NoticeDataGeo.NLon);b.find("[name=location_ns]").val(SN.C.I.NoticeDataGeo.NLNS);b.find("[name=location_id]").val(SN.C.I.NoticeDataGeo.NLID);b.find("[name=notice_data-geo]").attr("checked",SN.C.I.NoticeDataGeo.NDG)}})},normalizeGeoData:function(a){SN.C.I.NoticeDataGeo.NLat=a.find("[name=lat]").val();SN.C.I.NoticeDataGeo.NLon=a.find("[name=lon]").val();SN.C.I.NoticeDataGeo.NLNS=a.find("[name=location_ns]").val();SN.C.I.NoticeDataGeo.NLID=a.find("[name=location_id]").val();SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked");var b=$.cookie(SN.C.S.NoticeDataGeoCookie);if(b!==null&&b!="disabled"){b=JSON.parse(b);SN.C.I.NoticeDataGeo.NLat=a.find("[name=lat]").val(b.NLat).val();SN.C.I.NoticeDataGeo.NLon=a.find("[name=lon]").val(b.NLon).val();if(b.NLNS){SN.C.I.NoticeDataGeo.NLNS=a.find("[name=location_ns]").val(b.NLNS).val();SN.C.I.NoticeDataGeo.NLID=a.find("[name=location_id]").val(b.NLID).val()}else{a.find("[name=location_ns]").val("");a.find("[name=location_id]").val("")}}if(b=="disabled"){SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked",false).attr("checked")}else{SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked",true).attr("checked")}},GetResponseXML:function(b){try{return b.responseXML}catch(a){return(new DOMParser()).parseFromString(b.responseText,"text/xml")}},NoticeReply:function(){if($("#content .notice_reply").length>0){$("#content .notice").each(function(){SN.U.NoticeReplyTo($(this))})}},NoticeReplyTo:function(a){a.find(".notice_reply").live("click",function(c){c.preventDefault();var b=($(".author .nickname",a).length>0)?$($(".author .nickname",a)[0]):$(".author .nickname.uid");SN.U.NoticeInlineReplyTrigger(a,"@"+b.text());return false})},NoticeInlineReplyTrigger:function(h,i){var b=$($(".notice_id",h)[0]).text();var e=h;var f=h.closest(".notices");if(f.hasClass("threaded-replies")){e=f.closest(".notice")}else{f=$("ul.threaded-replies",h);if(f.length==0){f=$('<ul class="notices threaded-replies xoxo"></ul>');h.append(f)}}var j=$(".notice-reply-form",f);var d=function(){j.find("input[name=inreplyto]").val(b);var m=j.find("textarea");if(m.length==0){throw"No textarea"}var l="";if(i){l=i+" "}m.val(l+m.val().replace(RegExp(l,"i"),""));m.data("initialText",$.trim(i+""));m.focus();if(m[0].setSelectionRange){var k=m.val().length;m[0].setSelectionRange(k,k)}};if(j.length>0){d()}else{$("li.notice-reply-placeholder").remove();var g=$("li.notice-reply",f);if(g.length==0){g=$('<li class="notice-reply"></li>');var c=function(k){var l=document._importNode(k,true);g.append(l);f.append(g);var m=j=$(l);SN.U.NoticeLocationAttach(m);SN.U.FormNoticeXHR(m);SN.U.FormNoticeEnhancements(m);SN.U.NoticeDataAttach(m);d()};if(SN.C.I.NoticeFormMaster){c(SN.C.I.NoticeFormMaster)}else{var a=$("#form_notice").attr("action");$.get(a,{ajax:1},function(k,m,l){c($("form",k)[0])})}}}},NoticeFavor:function(){$(".form_favor").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_disfavor").live("click",function(){SN.U.FormXHR($(this));return false})},NoticeInlineReplyPlaceholder:function(b){var a=b.find("ul.threaded-replies");var c=$('<li class="notice-reply-placeholder"><input class="placeholder"></li>');c.click(function(){SN.U.NoticeInlineReplyTrigger(b)});c.find("input").val(SN.msg("reply_placeholder"));a.append(c)},NoticeInlineReplySetup:function(){$(".threaded-replies").each(function(){var b=$(this);var a=b.closest(".notice");SN.U.NoticeInlineReplyPlaceholder(a)})},NoticeRepeat:function(){$(".form_repeat").live("click",function(a){a.preventDefault();SN.U.NoticeRepeatConfirmation($(this));return false})},NoticeRepeatConfirmation:function(a){var c=a.find(".submit");var b=c.clone();b.addClass("submit_dialogbox").removeClass("submit");a.append(b);b.bind("click",function(){SN.U.FormXHR(a);return false});c.hide();a.addClass("dialogbox").append('<button class="close">&#215;</button>').closest(".notice-options").addClass("opaque");a.find("button.close").click(function(){$(this).remove();a.removeClass("dialogbox").closest(".notice-options").removeClass("opaque");a.find(".submit_dialogbox").remove();a.find(".submit").show();return false})},NoticeAttachments:function(){$(".notice a.attachment").each(function(){SN.U.NoticeWithAttachment($(this).closest(".notice"))})},NoticeWithAttachment:function(b){if(b.find(".attachment").length===0){return}var a=b.find(".attachment.more");if(a.length>0){$(a[0]).click(function(){var c=$(this);c.addClass(SN.C.S.Processing);$.get(c.attr("href")+"/ajax",null,function(d){c.parent(".entry-content").html($(d).find("#attachment_view .entry-content").html())});return false}).attr("title",SN.msg("showmore_tooltip"))}},NoticeDataAttach:function(b){var a=b.find("input[type=file]");a.change(function(f){b.find(".attach-status").remove();var d=$(this).val();if(!d){return false}var c=$('<div class="attach-status '+SN.C.S.Success+'"><code></code> <button class="close">&#215;</button></div>');c.find("code").text(d);c.find("button").click(function(){c.remove();a.val("");return false});b.append(c);if(typeof this.files=="object"){for(var e=0;e<this.files.length;e++){SN.U.PreviewAttach(b,this.files[e])}}})},maxFileSize:function(b){var a=$(b).find("input[name=MAX_FILE_SIZE]").attr("value");if(a){return parseInt(a)}else{return 0}},PreviewAttach:function(d,c){var e=c.type+" "+Math.round(c.size/1024)+"KB";var f=true;var h;if(typeof window.createObjectURL!="undefined"){h=function(i,j){j(window.createObjectURL(i))}}else{if(typeof window.FileReader!="undefined"){h=function(j,k){var i=new FileReader();i.onload=function(l){k(i.result)};i.readAsDataURL(j)}}else{f=false}}var a=["image/png","image/jpeg","image/gif","image/svg+xml"];if($.inArray(c.type,a)==-1){f=false}var g=8*1024*1024;if(c.size>g){f=false}if(f){h(c,function(j){var i=$("<img>").attr("title",e).attr("alt",e).attr("src",j).attr("style","height: 120px");d.find(".attach-status").append(i)})}else{var b=$("<div></div>").text(e);d.find(".attach-status").append(b)}},NoticeLocationAttach:function(a){var e=a.find("[name=lat]");var k=a.find("[name=lon]");var g=a.find("[name=location_ns]").val();var l=a.find("[name=location_id]").val();var b="";var d=a.find("[name=notice_data-geo]");var c=a.find("[name=notice_data-geo]");var j=a.find("label.notice_data-geo");function f(n){j.attr("title",jQuery.trim(j.text())).removeClass("checked");a.find("[name=lat]").val("");a.find("[name=lon]").val("");a.find("[name=location_ns]").val("");a.find("[name=location_id]").val("");a.find("[name=notice_data-geo]").attr("checked",false);$.cookie(SN.C.S.NoticeDataGeoCookie,"disabled",{path:"/"});if(n){a.find(".geo_status_wrapper").removeClass("success").addClass("error");a.find(".geo_status_wrapper .geo_status").text(n)}else{a.find(".geo_status_wrapper").remove()}}function m(n,o){SN.U.NoticeGeoStatus(a,"Looking up place name...");$.getJSON(n,o,function(p){var q,r;if(typeof(p.location_ns)!="undefined"){a.find("[name=location_ns]").val(p.location_ns);q=p.location_ns}if(typeof(p.location_id)!="undefined"){a.find("[name=location_id]").val(p.location_id);r=p.location_id}if(typeof(p.name)=="undefined"){NLN_text=o.lat+";"+o.lon}else{NLN_text=p.name}SN.U.NoticeGeoStatus(a,NLN_text,o.lat,o.lon,p.url);j.attr("title",NoticeDataGeo_text.ShareDisable+" ("+NLN_text+")");a.find("[name=lat]").val(o.lat);a.find("[name=lon]").val(o.lon);a.find("[name=location_ns]").val(q);a.find("[name=location_id]").val(r);a.find("[name=notice_data-geo]").attr("checked",true);var s={NLat:o.lat,NLon:o.lon,NLNS:q,NLID:r,NLN:NLN_text,NLNU:p.url,NDG:true};$.cookie(SN.C.S.NoticeDataGeoCookie,JSON.stringify(s),{path:"/"})})}if(c.length>0){if($.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){c.attr("checked",false)}else{c.attr("checked",true)}var h=a.find(".notice_data-geo_wrap");var i=h.attr("title");h.removeAttr("title");j.attr("title",j.text());c.change(function(){if(c.attr("checked")===true||$.cookie(SN.C.S.NoticeDataGeoCookie)===null){j.attr("title",NoticeDataGeo_text.ShareDisable).addClass("checked");if($.cookie(SN.C.S.NoticeDataGeoCookie)===null||$.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){if(navigator.geolocation){SN.U.NoticeGeoStatus(a,"Requesting location from browser...");navigator.geolocation.getCurrentPosition(function(p){a.find("[name=lat]").val(p.coords.latitude);a.find("[name=lon]").val(p.coords.longitude);var q={lat:p.coords.latitude,lon:p.coords.longitude,token:$("#token").val()};m(i,q)},function(p){switch(p.code){case p.PERMISSION_DENIED:f("Location permission denied.");break;case p.TIMEOUT:f("Location lookup timeout.");break}},{timeout:10000})}else{if(e.length>0&&k.length>0){var n={lat:e,lon:k,token:$("#token").val()};m(i,n)}else{f();c.remove();j.remove()}}}else{var o=JSON.parse($.cookie(SN.C.S.NoticeDataGeoCookie));a.find("[name=lat]").val(o.NLat);a.find("[name=lon]").val(o.NLon);a.find("[name=location_ns]").val(o.NLNS);a.find("[name=location_id]").val(o.NLID);a.find("[name=notice_data-geo]").attr("checked",o.NDG);SN.U.NoticeGeoStatus(a,o.NLN,o.NLat,o.NLon,o.NLNU);j.attr("title",NoticeDataGeo_text.ShareDisable+" ("+o.NLN+")").addClass("checked")}}else{f()}}).change()}},NoticeGeoStatus:function(e,a,f,g,c){var h=e.find(".geo_status_wrapper");if(h.length==0){h=$('<div class="'+SN.C.S.Success+' geo_status_wrapper"><button class="close" style="float:right">&#215;</button><div class="geo_status"></div></div>');h.find("button.close").click(function(){e.find("[name=notice_data-geo]").removeAttr("checked").change()});e.append(h)}var b;if(c){b=$("<a></a>").attr("href",c)}else{b=$("<span></span>")}b.text(a);if(f||g){var d=f+";"+g;b.attr("title",d);if(!a){b.text(d)}}h.find(".geo_status").empty().append(b)},NewDirectMessage:function(){NDM=$(".entity_send-a-message a");NDM.attr({href:NDM.attr("href")+"&ajax=1"});NDM.bind("click",function(){var a=$(".entity_send-a-message form");if(a.length===0){$(this).addClass(SN.C.S.Processing);$.get(NDM.attr("href"),null,function(b){$(".entity_send-a-message").append(document._importNode($("form",b)[0],true));a=$(".entity_send-a-message .form_notice");SN.U.FormNoticeXHR(a);SN.U.FormNoticeEnhancements(a);a.append('<button class="close">&#215;</button>');$(".entity_send-a-message button").click(function(){a.hide();return false});NDM.removeClass(SN.C.S.Processing)})}else{a.show();$(".entity_send-a-message textarea").focus()}return false})},GetFullYear:function(c,d,a){var b=new Date();b.setFullYear(c,d,a);return b},StatusNetInstance:{Set:function(b){var a=SN.U.StatusNetInstance.Get();if(a!==null){b=$.extend(a,b)}$.cookie(SN.C.S.StatusNetInstance,JSON.stringify(b),{path:"/",expires:SN.U.GetFullYear(2029,0,1)})},Get:function(){var a=$.cookie(SN.C.S.StatusNetInstance);if(a!==null){return JSON.parse(a)}return null},Delete:function(){$.cookie(SN.C.S.StatusNetInstance,null)}},belongsOnTimeline:function(b){var a=$("body").attr("id");if(a=="public"){return true}var c=$("#nav_profile a").attr("href");if(c){var d=$(b).find(".entry-title .author a.url").attr("href");if(d==c){if(a=="all"||a=="showstream"){return true}}}return false},switchInputFormTab:function(a){$(".input_form_nav_tab.current").removeClass("current");$("#input_form_nav_"+a).addClass("current");$(".input_form.current").removeClass("current");$("#input_form_"+a).addClass("current")}},Init:{NoticeForm:function(){if($("body.user_in").length>0){$("."+SN.C.S.FormNotice).each(function(){var a=$(this);SN.U.NoticeLocationAttach(a);SN.U.FormNoticeXHR(a);SN.U.FormNoticeEnhancements(a);SN.U.NoticeDataAttach(a)})}},Notices:function(){if($("body.user_in").length>0){var a=$(".form_notice:first");if(a.length>0){SN.C.I.NoticeFormMaster=document._importNode(a[0],true)}SN.U.NoticeFavor();SN.U.NoticeRepeat();SN.U.NoticeReply();SN.U.NoticeInlineReplySetup()}SN.U.NoticeAttachments()},EntityActions:function(){if($("body.user_in").length>0){$(".form_user_subscribe").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_user_unsubscribe").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_group_join").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_group_leave").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_user_nudge").live("click",function(){SN.U.FormXHR($(this));return false});SN.U.NewDirectMessage()}},Login:function(){if(SN.U.StatusNetInstance.Get()!==null){var a=SN.U.StatusNetInstance.Get().Nickname;if(a!==null){$("#form_login #nickname").val(a)}}$("#form_login").bind("submit",function(){SN.U.StatusNetInstance.Set({Nickname:$("#form_login #nickname").val()});return true})},UploadForms:function(){$("input[type=file]").change(function(d){if(typeof this.files=="object"&&this.files.length>0){var c=0;for(var b=0;b<this.files.length;b++){c+=this.files[b].size}var a=SN.U.maxFileSize($(this.form));if(a>0&&c>a){var e="File too large: maximum upload size is %d bytes.";alert(e.replace("%d",a));$(this).val("");d.preventDefault();return false}}})}}};$(document).ready(function(){SN.Init.UploadForms();if($("."+SN.C.S.FormNotice).length>0){SN.Init.NoticeForm()}if($("#content .notices").length>0){SN.Init.Notices()}if($("#content .entity_actions").length>0){SN.Init.EntityActions()}if($("#form_login").length>0){SN.Init.Login()}});if(!document.ELEMENT_NODE){document.ELEMENT_NODE=1;document.ATTRIBUTE_NODE=2;document.TEXT_NODE=3;document.CDATA_SECTION_NODE=4;document.ENTITY_REFERENCE_NODE=5;document.ENTITY_NODE=6;document.PROCESSING_INSTRUCTION_NODE=7;document.COMMENT_NODE=8;document.DOCUMENT_NODE=9;document.DOCUMENT_TYPE_NODE=10;document.DOCUMENT_FRAGMENT_NODE=11;document.NOTATION_NODE=12}document._importNode=function(e,a){switch(e.nodeType){case document.ELEMENT_NODE:var d=document.createElement(e.nodeName);if(e.attributes&&e.attributes.length>0){for(var c=0,b=e.attributes.length;c<b;){if(e.attributes[c].nodeName=="class"){d.className=e.getAttribute(e.attributes[c++].nodeName)}else{d.setAttribute(e.attributes[c].nodeName,e.getAttribute(e.attributes[c++].nodeName))}}}if(a&&e.childNodes&&e.childNodes.length>0){for(var c=0,b=e.childNodes.length;c<b;){d.appendChild(document._importNode(e.childNodes[c++],a))}}return d;break;case document.TEXT_NODE:case document.CDATA_SECTION_NODE:case document.COMMENT_NODE:return document.createTextNode(e.nodeValue);break}};if(typeof navigator.geolocation=="undefined"||navigator.geolocation.shim){(function(){(function(){if(window.google&&google.gears){return}var c=null;if(typeof GearsFactory!="undefined"){c=new GearsFactory()}else{try{c=new ActiveXObject("Gears.Factory");if(c.getBuildInfo().indexOf("ie_mobile")!=-1){c.privateSetGlobalObject(this)}}catch(d){if((typeof navigator.mimeTypes!="undefined")&&navigator.mimeTypes["application/x-googlegears"]){c=document.createElement("object");c.style.display="none";c.width=0;c.height=0;c.type="application/x-googlegears";document.documentElement.appendChild(c)}}}if(!c){return}if(!window.google){google={}}if(!google.gears){google.gears={factory:c}}})();var a=(function(){var d=google.gears.factory.create("beta.geolocation");var c=function(f,e){return function(g){f(g);e.lastPosition=g}};return{shim:true,type:"Gears",lastPosition:null,getCurrentPosition:function(e,g,h){var f=this;var i=c(e,f);d.getCurrentPosition(i,g,h)},watchPosition:function(e,f,g){d.watchPosition(e,f,g)},clearWatch:function(e){d.clearWatch(e)},getPermission:function(g,e,f){d.getPermission(g,e,f)}}});var b=(function(){var i=false;var e=function(){if(!d()&&!i){i=true;var j=document.createElement("script");j.src=(document.location.protocol=="https:"?"https://":"http://")+"www.google.com/jsapi?callback=_google_loader_apiLoaded";j.type="text/javascript";document.getElementsByTagName("body")[0].appendChild(j)}};var c=[];var h=function(j){c.push(j)};var f=function(){if(d()){while(c.length>0){var j=c.pop();j()}}};window._google_loader_apiLoaded=function(){f()};var d=function(){return(window.google&&google.loader)};var g=function(j){if(d()){return true}h(j);e();return false};e();return{shim:true,type:"ClientLocation",lastPosition:null,getCurrentPosition:function(k,n,o){var m=this;if(!g(function(){m.getCurrentPosition(k,n,o)})){return}if(google.loader.ClientLocation){var l=google.loader.ClientLocation;var j={coords:{latitude:l.latitude,longitude:l.longitude,altitude:null,accuracy:43000,altitudeAccuracy:null,heading:null,speed:null},address:{city:l.address.city,country:l.address.country,country_code:l.address.country_code,region:l.address.region},timestamp:new Date()};k(j);this.lastPosition=j}else{if(n==="function"){n({code:3,message:"Using the Google ClientLocation API and it is not able to calculate a location."})}}},watchPosition:function(j,l,m){this.getCurrentPosition(j,l,m);var k=this;var n=setInterval(function(){k.getCurrentPosition(j,l,m)},10000);return n},clearWatch:function(j){clearInterval(j)},getPermission:function(l,j,k){return true}}});navigator.geolocation=(window.google&&google.gears)?a():b()})()};
\ No newline at end of file
+var SN={C:{I:{CounterBlackout:false,MaxLength:140,PatternUsername:/^[0-9a-zA-Z\-_.]*$/,HTTP20x30x:[200,201,202,203,204,205,206,300,301,302,303,304,305,306,307],NoticeFormMaster:null},S:{Disabled:"disabled",Warning:"warning",Error:"error",Success:"success",Processing:"processing",CommandResult:"command_result",FormNotice:"form_notice",NoticeDataGeo:"notice_data-geo",NoticeDataGeoCookie:"NoticeDataGeo",NoticeDataGeoSelected:"notice_data-geo_selected",StatusNetInstance:"StatusNetInstance"}},messages:{},msg:function(a){if(typeof SN.messages[a]=="undefined"){return"["+a+"]"}else{return SN.messages[a]}},U:{FormNoticeEnhancements:function(b){if(jQuery.data(b[0],"ElementData")===undefined){MaxLength=b.find(".count").text();if(typeof(MaxLength)=="undefined"){MaxLength=SN.C.I.MaxLength}jQuery.data(b[0],"ElementData",{MaxLength:MaxLength});SN.U.Counter(b);NDT=b.find("[name=status_textarea]");NDT.bind("keyup",function(c){SN.U.Counter(b)});var a=function(c){window.setTimeout(function(){SN.U.Counter(b)},50)};NDT.bind("cut",a).bind("paste",a)}else{b.find(".count").text(jQuery.data(b[0],"ElementData").MaxLength)}},Counter:function(d){SN.C.I.FormNoticeCurrent=d;var b=jQuery.data(d[0],"ElementData").MaxLength;if(b<=0){return}var c=b-SN.U.CharacterCount(d);var a=d.find(".count");if(c.toString()!=a.text()){if(!SN.C.I.CounterBlackout||c===0){if(a.text()!=String(c)){a.text(c)}if(c<0){d.addClass(SN.C.S.Warning)}else{d.removeClass(SN.C.S.Warning)}if(!SN.C.I.CounterBlackout){SN.C.I.CounterBlackout=true;SN.C.I.FormNoticeCurrent=d;window.setTimeout("SN.U.ClearCounterBlackout(SN.C.I.FormNoticeCurrent);",500)}}}},CharacterCount:function(a){return a.find("[name=status_textarea]").val().length},ClearCounterBlackout:function(a){SN.C.I.CounterBlackout=false;SN.U.Counter(a)},RewriteAjaxAction:function(a){if(document.location.protocol=="https:"&&a.substr(0,5)=="http:"){return a.replace(/^http:\/\/[^:\/]+/,"https://"+document.location.host)}else{return a}},FormXHR:function(a){$.ajax({type:"POST",dataType:"xml",url:SN.U.RewriteAjaxAction(a.attr("action")),data:a.serialize()+"&ajax=1",beforeSend:function(b){a.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(c,d,b){alert(b||d)},success:function(b,c){if(typeof($("form",b)[0])!="undefined"){form_new=document._importNode($("form",b)[0],true);a.replaceWith(form_new)}else{a.replaceWith(document._importNode($("p",b)[0],true))}}})},FormNoticeXHR:function(b){SN.C.I.NoticeDataGeo={};b.append('<input type="hidden" name="ajax" value="1"/>');b.attr("action",SN.U.RewriteAjaxAction(b.attr("action")));var c=function(d,e){b.append($('<p class="form_response"></p>').addClass(d).text(e))};var a=function(){b.find(".form_response").remove()};b.ajaxForm({dataType:"xml",timeout:"60000",beforeSend:function(d){if(b.find("[name=status_textarea]").val()==""){b.addClass(SN.C.S.Warning);return false}b.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled);SN.U.normalizeGeoData(b);return true},error:function(f,g,e){b.removeClass(SN.C.S.Processing).find(".submit").removeClass(SN.C.S.Disabled).removeAttr(SN.C.S.Disabled,SN.C.S.Disabled);a();if(g=="timeout"){c("error","Sorry! We had trouble sending your notice. The servers are overloaded. Please try again, and contact the site administrator if this problem persists.")}else{var d=SN.U.GetResponseXML(f);if($("."+SN.C.S.Error,d).length>0){b.append(document._importNode($("."+SN.C.S.Error,d)[0],true))}else{if(parseInt(f.status)===0||jQuery.inArray(parseInt(f.status),SN.C.I.HTTP20x30x)>=0){b.resetForm().find(".attach-status").remove();SN.U.FormNoticeEnhancements(b)}else{c("error","(Sorry! We had trouble sending your notice ("+f.status+" "+f.statusText+"). Please report the problem to the site administrator if this happens again.")}}}},success:function(i,f){a();var n=$("#"+SN.C.S.Error,i);if(n.length>0){c("error",n.text())}else{if($("body")[0].id=="bookmarklet"){self.close()}var d=$("#"+SN.C.S.CommandResult,i);if(d.length>0){c("success",d.text())}else{var m=document._importNode($("li",i)[0],true);var k=$("#notices_primary .notices:first");var l=b.closest("li.notice-reply");if(l.length>0){var e=$(m).attr("id");if($("#"+e).length==0){var j=l.closest("li.notice");l.replaceWith(m);SN.U.NoticeInlineReplyPlaceholder(j)}else{l.remove()}}else{if(k.length>0&&SN.U.belongsOnTimeline(m)){if($("#"+m.id).length===0){var h=b.find("[name=inreplyto]").val();var g="#notices_primary #notice-"+h;if($("body")[0].id=="conversation"){if(h.length>0&&$(g+" .notices").length<1){$(g).append('<ul class="notices"></ul>')}$($(g+" .notices")[0]).append(m)}else{k.prepend(m)}$("#"+m.id).css({display:"none"}).fadeIn(2500);SN.U.NoticeWithAttachment($("#"+m.id));SN.U.NoticeReplyTo($("#"+m.id))}}else{c("success",$("title",i).text())}}}b.resetForm();b.find("[name=inreplyto]").val("");b.find(".attach-status").remove();SN.U.FormNoticeEnhancements(b)}},complete:function(d,e){b.removeClass(SN.C.S.Processing).find(".submit").removeAttr(SN.C.S.Disabled).removeClass(SN.C.S.Disabled);b.find("[name=lat]").val(SN.C.I.NoticeDataGeo.NLat);b.find("[name=lon]").val(SN.C.I.NoticeDataGeo.NLon);b.find("[name=location_ns]").val(SN.C.I.NoticeDataGeo.NLNS);b.find("[name=location_id]").val(SN.C.I.NoticeDataGeo.NLID);b.find("[name=notice_data-geo]").attr("checked",SN.C.I.NoticeDataGeo.NDG)}})},normalizeGeoData:function(a){SN.C.I.NoticeDataGeo.NLat=a.find("[name=lat]").val();SN.C.I.NoticeDataGeo.NLon=a.find("[name=lon]").val();SN.C.I.NoticeDataGeo.NLNS=a.find("[name=location_ns]").val();SN.C.I.NoticeDataGeo.NLID=a.find("[name=location_id]").val();SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked");var b=$.cookie(SN.C.S.NoticeDataGeoCookie);if(b!==null&&b!="disabled"){b=JSON.parse(b);SN.C.I.NoticeDataGeo.NLat=a.find("[name=lat]").val(b.NLat).val();SN.C.I.NoticeDataGeo.NLon=a.find("[name=lon]").val(b.NLon).val();if(b.NLNS){SN.C.I.NoticeDataGeo.NLNS=a.find("[name=location_ns]").val(b.NLNS).val();SN.C.I.NoticeDataGeo.NLID=a.find("[name=location_id]").val(b.NLID).val()}else{a.find("[name=location_ns]").val("");a.find("[name=location_id]").val("")}}if(b=="disabled"){SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked",false).attr("checked")}else{SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked",true).attr("checked")}},GetResponseXML:function(b){try{return b.responseXML}catch(a){return(new DOMParser()).parseFromString(b.responseText,"text/xml")}},NoticeReply:function(){if($("#content .notice_reply").length>0){$("#content .notice").each(function(){SN.U.NoticeReplyTo($(this))})}},NoticeReplyTo:function(a){a.find(".notice_reply").live("click",function(c){c.preventDefault();var b=($(".author .nickname",a).length>0)?$($(".author .nickname",a)[0]):$(".author .nickname.uid");SN.U.NoticeInlineReplyTrigger(a,"@"+b.text());return false})},NoticeInlineReplyTrigger:function(h,i){var b=$($(".notice_id",h)[0]).text();var e=h;var f=h.closest(".notices");if(f.hasClass("threaded-replies")){e=f.closest(".notice")}else{f=$("ul.threaded-replies",h);if(f.length==0){f=$('<ul class="notices threaded-replies xoxo"></ul>');h.append(f)}}var j=$(".notice-reply-form",f);var d=function(){j.find("input[name=inreplyto]").val(b);var m=j.find("textarea");if(m.length==0){throw"No textarea"}var l="";if(i){l=i+" "}m.val(l+m.val().replace(RegExp(l,"i"),""));m.data("initialText",$.trim(i+""));m.focus();if(m[0].setSelectionRange){var k=m.val().length;m[0].setSelectionRange(k,k)}};if(j.length>0){d()}else{$("li.notice-reply-placeholder").remove();var g=$("li.notice-reply",f);if(g.length==0){g=$('<li class="notice-reply"></li>');var c=function(k){var l=document._importNode(k,true);g.append(l);f.append(g);var m=j=$(l);SN.U.NoticeLocationAttach(m);SN.U.FormNoticeXHR(m);SN.U.FormNoticeEnhancements(m);SN.U.NoticeDataAttach(m);d()};if(SN.C.I.NoticeFormMaster){c(SN.C.I.NoticeFormMaster)}else{var a=$("#form_notice").attr("action");$.get(a,{ajax:1},function(k,m,l){c($("form",k)[0])})}}}},NoticeFavor:function(){$(".form_favor").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_disfavor").live("click",function(){SN.U.FormXHR($(this));return false})},NoticeInlineReplyPlaceholder:function(b){var a=b.find("ul.threaded-replies");var c=$('<li class="notice-reply-placeholder"><input class="placeholder"></li>');c.click(function(){SN.U.NoticeInlineReplyTrigger(b)});c.find("input").val(SN.msg("reply_placeholder"));a.append(c)},NoticeInlineReplySetup:function(){$(".threaded-replies").each(function(){var b=$(this);var a=b.closest(".notice");SN.U.NoticeInlineReplyPlaceholder(a)})},NoticeRepeat:function(){$(".form_repeat").live("click",function(a){a.preventDefault();SN.U.NoticeRepeatConfirmation($(this));return false})},NoticeRepeatConfirmation:function(a){var c=a.find(".submit");var b=c.clone();b.addClass("submit_dialogbox").removeClass("submit");a.append(b);b.bind("click",function(){SN.U.FormXHR(a);return false});c.hide();a.addClass("dialogbox").append('<button class="close">&#215;</button>').closest(".notice-options").addClass("opaque");a.find("button.close").click(function(){$(this).remove();a.removeClass("dialogbox").closest(".notice-options").removeClass("opaque");a.find(".submit_dialogbox").remove();a.find(".submit").show();return false})},NoticeAttachments:function(){$(".notice a.attachment").each(function(){SN.U.NoticeWithAttachment($(this).closest(".notice"))})},NoticeWithAttachment:function(b){if(b.find(".attachment").length===0){return}var a=b.find(".attachment.more");if(a.length>0){$(a[0]).click(function(){var c=$(this);c.addClass(SN.C.S.Processing);$.get(c.attr("href")+"/ajax",null,function(d){c.parent(".entry-content").html($(d).find("#attachment_view .entry-content").html())});return false}).attr("title",SN.msg("showmore_tooltip"))}},NoticeDataAttach:function(b){var a=b.find("input[type=file]");a.change(function(f){b.find(".attach-status").remove();var d=$(this).val();if(!d){return false}var c=$('<div class="attach-status '+SN.C.S.Success+'"><code></code> <button class="close">&#215;</button></div>');c.find("code").text(d);c.find("button").click(function(){c.remove();a.val("");return false});b.append(c);if(typeof this.files=="object"){for(var e=0;e<this.files.length;e++){SN.U.PreviewAttach(b,this.files[e])}}})},maxFileSize:function(b){var a=$(b).find("input[name=MAX_FILE_SIZE]").attr("value");if(a){return parseInt(a)}else{return 0}},PreviewAttach:function(d,c){var e=c.type+" "+Math.round(c.size/1024)+"KB";var f=true;var h;if(typeof window.createObjectURL!="undefined"){h=function(i,j){j(window.createObjectURL(i))}}else{if(typeof window.FileReader!="undefined"){h=function(j,k){var i=new FileReader();i.onload=function(l){k(i.result)};i.readAsDataURL(j)}}else{f=false}}var a=["image/png","image/jpeg","image/gif","image/svg+xml"];if($.inArray(c.type,a)==-1){f=false}var g=8*1024*1024;if(c.size>g){f=false}if(f){h(c,function(j){var i=$("<img>").attr("title",e).attr("alt",e).attr("src",j).attr("style","height: 120px");d.find(".attach-status").append(i)})}else{var b=$("<div></div>").text(e);d.find(".attach-status").append(b)}},NoticeLocationAttach:function(a){var e=a.find("[name=lat]");var k=a.find("[name=lon]");var g=a.find("[name=location_ns]").val();var l=a.find("[name=location_id]").val();var b="";var d=a.find("[name=notice_data-geo]");var c=a.find("[name=notice_data-geo]");var j=a.find("label.notice_data-geo");function f(n){j.attr("title",jQuery.trim(j.text())).removeClass("checked");a.find("[name=lat]").val("");a.find("[name=lon]").val("");a.find("[name=location_ns]").val("");a.find("[name=location_id]").val("");a.find("[name=notice_data-geo]").attr("checked",false);$.cookie(SN.C.S.NoticeDataGeoCookie,"disabled",{path:"/"});if(n){a.find(".geo_status_wrapper").removeClass("success").addClass("error");a.find(".geo_status_wrapper .geo_status").text(n)}else{a.find(".geo_status_wrapper").remove()}}function m(n,o){SN.U.NoticeGeoStatus(a,"Looking up place name...");$.getJSON(n,o,function(p){var q,r;if(typeof(p.location_ns)!="undefined"){a.find("[name=location_ns]").val(p.location_ns);q=p.location_ns}if(typeof(p.location_id)!="undefined"){a.find("[name=location_id]").val(p.location_id);r=p.location_id}if(typeof(p.name)=="undefined"){NLN_text=o.lat+";"+o.lon}else{NLN_text=p.name}SN.U.NoticeGeoStatus(a,NLN_text,o.lat,o.lon,p.url);j.attr("title",NoticeDataGeo_text.ShareDisable+" ("+NLN_text+")");a.find("[name=lat]").val(o.lat);a.find("[name=lon]").val(o.lon);a.find("[name=location_ns]").val(q);a.find("[name=location_id]").val(r);a.find("[name=notice_data-geo]").attr("checked",true);var s={NLat:o.lat,NLon:o.lon,NLNS:q,NLID:r,NLN:NLN_text,NLNU:p.url,NDG:true};$.cookie(SN.C.S.NoticeDataGeoCookie,JSON.stringify(s),{path:"/"})})}if(c.length>0){if($.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){c.attr("checked",false)}else{c.attr("checked",true)}var h=a.find(".notice_data-geo_wrap");var i=h.attr("title");h.removeAttr("title");j.attr("title",j.text());c.change(function(){if(c.attr("checked")===true||$.cookie(SN.C.S.NoticeDataGeoCookie)===null){j.attr("title",NoticeDataGeo_text.ShareDisable).addClass("checked");if($.cookie(SN.C.S.NoticeDataGeoCookie)===null||$.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){if(navigator.geolocation){SN.U.NoticeGeoStatus(a,"Requesting location from browser...");navigator.geolocation.getCurrentPosition(function(p){a.find("[name=lat]").val(p.coords.latitude);a.find("[name=lon]").val(p.coords.longitude);var q={lat:p.coords.latitude,lon:p.coords.longitude,token:$("#token").val()};m(i,q)},function(p){switch(p.code){case p.PERMISSION_DENIED:f("Location permission denied.");break;case p.TIMEOUT:f("Location lookup timeout.");break}},{timeout:10000})}else{if(e.length>0&&k.length>0){var n={lat:e,lon:k,token:$("#token").val()};m(i,n)}else{f();c.remove();j.remove()}}}else{var o=JSON.parse($.cookie(SN.C.S.NoticeDataGeoCookie));a.find("[name=lat]").val(o.NLat);a.find("[name=lon]").val(o.NLon);a.find("[name=location_ns]").val(o.NLNS);a.find("[name=location_id]").val(o.NLID);a.find("[name=notice_data-geo]").attr("checked",o.NDG);SN.U.NoticeGeoStatus(a,o.NLN,o.NLat,o.NLon,o.NLNU);j.attr("title",NoticeDataGeo_text.ShareDisable+" ("+o.NLN+")").addClass("checked")}}else{f()}}).change()}},NoticeGeoStatus:function(e,a,f,g,c){var h=e.find(".geo_status_wrapper");if(h.length==0){h=$('<div class="'+SN.C.S.Success+' geo_status_wrapper"><button class="close" style="float:right">&#215;</button><div class="geo_status"></div></div>');h.find("button.close").click(function(){e.find("[name=notice_data-geo]").removeAttr("checked").change()});e.append(h)}var b;if(c){b=$("<a></a>").attr("href",c)}else{b=$("<span></span>")}b.text(a);if(f||g){var d=f+";"+g;b.attr("title",d);if(!a){b.text(d)}}h.find(".geo_status").empty().append(b)},NewDirectMessage:function(){NDM=$(".entity_send-a-message a");NDM.attr({href:NDM.attr("href")+"&ajax=1"});NDM.bind("click",function(){var a=$(".entity_send-a-message form");if(a.length===0){$(this).addClass(SN.C.S.Processing);$.get(NDM.attr("href"),null,function(b){$(".entity_send-a-message").append(document._importNode($("form",b)[0],true));a=$(".entity_send-a-message .form_notice");SN.U.FormNoticeXHR(a);SN.U.FormNoticeEnhancements(a);a.append('<button class="close">&#215;</button>');$(".entity_send-a-message button").click(function(){a.hide();return false});NDM.removeClass(SN.C.S.Processing)})}else{a.show();$(".entity_send-a-message textarea").focus()}return false})},GetFullYear:function(c,d,a){var b=new Date();b.setFullYear(c,d,a);return b},StatusNetInstance:{Set:function(b){var a=SN.U.StatusNetInstance.Get();if(a!==null){b=$.extend(a,b)}$.cookie(SN.C.S.StatusNetInstance,JSON.stringify(b),{path:"/",expires:SN.U.GetFullYear(2029,0,1)})},Get:function(){var a=$.cookie(SN.C.S.StatusNetInstance);if(a!==null){return JSON.parse(a)}return null},Delete:function(){$.cookie(SN.C.S.StatusNetInstance,null)}},belongsOnTimeline:function(b){var a=$("body").attr("id");if(a=="public"){return true}var c=$("#nav_profile a").attr("href");if(c){var d=$(b).find(".entry-title .author a.url").attr("href");if(d==c){if(a=="all"||a=="showstream"){return true}}}return false},switchInputFormTab:function(a){$(".input_form_nav_tab.current").removeClass("current");$("#input_form_nav_"+a).addClass("current");$(".input_form.current").removeClass("current");$("#input_form_"+a).addClass("current")}},Init:{NoticeForm:function(){if($("body.user_in").length>0){$("."+SN.C.S.FormNotice).each(function(){var a=$(this);SN.U.NoticeLocationAttach(a);SN.U.FormNoticeXHR(a);SN.U.FormNoticeEnhancements(a);SN.U.NoticeDataAttach(a)})}},Notices:function(){if($("body.user_in").length>0){var a=$(".form_notice:first");if(a.length>0){SN.C.I.NoticeFormMaster=document._importNode(a[0],true)}SN.U.NoticeFavor();SN.U.NoticeRepeat();SN.U.NoticeReply();SN.U.NoticeInlineReplySetup()}SN.U.NoticeAttachments()},EntityActions:function(){if($("body.user_in").length>0){$(".form_user_subscribe").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_user_unsubscribe").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_group_join").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_group_leave").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_user_nudge").live("click",function(){SN.U.FormXHR($(this));return false});SN.U.NewDirectMessage()}},Login:function(){if(SN.U.StatusNetInstance.Get()!==null){var a=SN.U.StatusNetInstance.Get().Nickname;if(a!==null){$("#form_login #nickname").val(a)}}$("#form_login").bind("submit",function(){SN.U.StatusNetInstance.Set({Nickname:$("#form_login #nickname").val()});return true})},AjaxForms:function(){$("form.ajax").live("submit",function(){SN.U.FormXHR($(this));return false})},UploadForms:function(){$("input[type=file]").change(function(d){if(typeof this.files=="object"&&this.files.length>0){var c=0;for(var b=0;b<this.files.length;b++){c+=this.files[b].size}var a=SN.U.maxFileSize($(this.form));if(a>0&&c>a){var e="File too large: maximum upload size is %d bytes.";alert(e.replace("%d",a));$(this).val("");d.preventDefault();return false}}})}}};$(document).ready(function(){SN.Init.AjaxForms();SN.Init.UploadForms();if($("."+SN.C.S.FormNotice).length>0){SN.Init.NoticeForm()}if($("#content .notices").length>0){SN.Init.Notices()}if($("#content .entity_actions").length>0){SN.Init.EntityActions()}if($("#form_login").length>0){SN.Init.Login()}});if(!document.ELEMENT_NODE){document.ELEMENT_NODE=1;document.ATTRIBUTE_NODE=2;document.TEXT_NODE=3;document.CDATA_SECTION_NODE=4;document.ENTITY_REFERENCE_NODE=5;document.ENTITY_NODE=6;document.PROCESSING_INSTRUCTION_NODE=7;document.COMMENT_NODE=8;document.DOCUMENT_NODE=9;document.DOCUMENT_TYPE_NODE=10;document.DOCUMENT_FRAGMENT_NODE=11;document.NOTATION_NODE=12}document._importNode=function(e,a){switch(e.nodeType){case document.ELEMENT_NODE:var d=document.createElement(e.nodeName);if(e.attributes&&e.attributes.length>0){for(var c=0,b=e.attributes.length;c<b;){if(e.attributes[c].nodeName=="class"){d.className=e.getAttribute(e.attributes[c++].nodeName)}else{d.setAttribute(e.attributes[c].nodeName,e.getAttribute(e.attributes[c++].nodeName))}}}if(a&&e.childNodes&&e.childNodes.length>0){for(var c=0,b=e.childNodes.length;c<b;){d.appendChild(document._importNode(e.childNodes[c++],a))}}return d;break;case document.TEXT_NODE:case document.CDATA_SECTION_NODE:case document.COMMENT_NODE:return document.createTextNode(e.nodeValue);break}};if(typeof navigator.geolocation=="undefined"||navigator.geolocation.shim){(function(){(function(){if(window.google&&google.gears){return}var c=null;if(typeof GearsFactory!="undefined"){c=new GearsFactory()}else{try{c=new ActiveXObject("Gears.Factory");if(c.getBuildInfo().indexOf("ie_mobile")!=-1){c.privateSetGlobalObject(this)}}catch(d){if((typeof navigator.mimeTypes!="undefined")&&navigator.mimeTypes["application/x-googlegears"]){c=document.createElement("object");c.style.display="none";c.width=0;c.height=0;c.type="application/x-googlegears";document.documentElement.appendChild(c)}}}if(!c){return}if(!window.google){google={}}if(!google.gears){google.gears={factory:c}}})();var a=(function(){var d=google.gears.factory.create("beta.geolocation");var c=function(f,e){return function(g){f(g);e.lastPosition=g}};return{shim:true,type:"Gears",lastPosition:null,getCurrentPosition:function(e,g,h){var f=this;var i=c(e,f);d.getCurrentPosition(i,g,h)},watchPosition:function(e,f,g){d.watchPosition(e,f,g)},clearWatch:function(e){d.clearWatch(e)},getPermission:function(g,e,f){d.getPermission(g,e,f)}}});var b=(function(){var i=false;var e=function(){if(!d()&&!i){i=true;var j=document.createElement("script");j.src=(document.location.protocol=="https:"?"https://":"http://")+"www.google.com/jsapi?callback=_google_loader_apiLoaded";j.type="text/javascript";document.getElementsByTagName("body")[0].appendChild(j)}};var c=[];var h=function(j){c.push(j)};var f=function(){if(d()){while(c.length>0){var j=c.pop();j()}}};window._google_loader_apiLoaded=function(){f()};var d=function(){return(window.google&&google.loader)};var g=function(j){if(d()){return true}h(j);e();return false};e();return{shim:true,type:"ClientLocation",lastPosition:null,getCurrentPosition:function(k,n,o){var m=this;if(!g(function(){m.getCurrentPosition(k,n,o)})){return}if(google.loader.ClientLocation){var l=google.loader.ClientLocation;var j={coords:{latitude:l.latitude,longitude:l.longitude,altitude:null,accuracy:43000,altitudeAccuracy:null,heading:null,speed:null},address:{city:l.address.city,country:l.address.country,country_code:l.address.country_code,region:l.address.region},timestamp:new Date()};k(j);this.lastPosition=j}else{if(n==="function"){n({code:3,message:"Using the Google ClientLocation API and it is not able to calculate a location."})}}},watchPosition:function(j,l,m){this.getCurrentPosition(j,l,m);var k=this;var n=setInterval(function(){k.getCurrentPosition(j,l,m)},10000);return n},clearWatch:function(j){clearInterval(j)},getPermission:function(l,j,k){return true}}});navigator.geolocation=(window.google&&google.gears)?a():b()})()};
\ No newline at end of file
diff --git a/plugins/Poll/pollresponseform.php b/plugins/Poll/pollresponseform.php
index 87340f926f..015dbb1b1f 100644
--- a/plugins/Poll/pollresponseform.php
+++ b/plugins/Poll/pollresponseform.php
@@ -83,7 +83,7 @@ class PollResponseForm extends Form
 
     function formClass()
     {
-        return 'form_settings';
+        return 'form_settings ajax';
     }
 
     /**
diff --git a/plugins/Poll/pollresultform.php b/plugins/Poll/pollresultform.php
index eace105e0d..1db86938fc 100644
--- a/plugins/Poll/pollresultform.php
+++ b/plugins/Poll/pollresultform.php
@@ -83,7 +83,7 @@ class PollResultForm extends Form
 
     function formClass()
     {
-        return 'form_settings';
+        return 'form_settings ajax';
     }
 
     /**
diff --git a/plugins/Poll/respondpoll.php b/plugins/Poll/respondpoll.php
index 8ae31443fc..07a5235406 100644
--- a/plugins/Poll/respondpoll.php
+++ b/plugins/Poll/respondpoll.php
@@ -145,7 +145,22 @@ class RespondPollAction extends Action
             return;
         }
 
-        common_redirect($this->poll->bestUrl(), 303);
+        if ($this->arg('ajax')) {
+            header('Content-Type: text/xml;charset=utf-8');
+            $this->xw->startDocument('1.0', 'UTF-8');
+            $this->elementStart('html');
+            $this->elementStart('head');
+            // TRANS: Page title after sending a poll response.
+            $this->element('title', null, _m('Poll results'));
+            $this->elementEnd('head');
+            $this->elementStart('body');
+            $form = new PollResultForm($this->poll, $this);
+            $form->show();
+            $this->elementEnd('body');
+            $this->elementEnd('html');
+        } else {
+            common_redirect($this->poll->bestUrl(), 303);
+        }
     }
 
     /**

From 28809035d0d032c59731c0796610bb444f97dbf5 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Tue, 8 Mar 2011 13:58:28 -0800
Subject: [PATCH 453/655] Replace explicit FormXHR setup for a bunch of simple
 AJAX form submissions with adding the 'ajax' class on them. This avoids
 having to add extra custom JS bits just to initialize forms using the common
 AJAX submission path.

---
 js/util.js                           | 21 +++------------------
 js/util.min.js                       |  2 +-
 lib/disfavorform.php                 |  2 +-
 lib/favorform.php                    |  2 +-
 lib/form.php                         |  8 +++++++-
 lib/joinform.php                     |  2 +-
 lib/leaveform.php                    |  2 +-
 lib/nudgeform.php                    |  2 +-
 lib/subscribeform.php                |  2 +-
 lib/unsubscribeform.php              |  2 +-
 plugins/UserFlag/UserFlagPlugin.php  | 15 ---------------
 plugins/UserFlag/flagprofileform.php |  2 +-
 12 files changed, 19 insertions(+), 43 deletions(-)

diff --git a/js/util.js b/js/util.js
index a83d2c0e75..dcb8da4600 100644
--- a/js/util.js
+++ b/js/util.js
@@ -228,6 +228,9 @@ var SN = { // StatusNet
          * will be extracted and copied in, replacing the original form.
          * If there's no form, the first paragraph will be used.
          *
+         * This will automatically be applied on the 'submit' event for
+         * any form with the 'ajax' class.
+         *
          * @fixme can sometimes explode confusingly if returnd data is bogus
          * @fixme error handling is pretty vague
          * @fixme can't submit file uploads
@@ -633,17 +636,6 @@ var SN = { // StatusNet
             }
         },
 
-        /**
-         * Setup function -- DOES NOT apply immediately.
-         *
-         * Sets up event handlers for favor/disfavor forms to submit via XHR.
-         * Uses 'live' rather than 'bind', so applies to future as well as present items.
-         */
-        NoticeFavor: function() {
-            $('.form_favor').live('click', function() { SN.U.FormXHR($(this)); return false; });
-            $('.form_disfavor').live('click', function() { SN.U.FormXHR($(this)); return false; });
-        },
-
         NoticeInlineReplyPlaceholder: function(notice) {
             var list = notice.find('ul.threaded-replies');
             var placeholder = $('<li class="notice-reply-placeholder">' +
@@ -1331,7 +1323,6 @@ var SN = { // StatusNet
                 if (masterForm.length > 0) {
                     SN.C.I.NoticeFormMaster = document._importNode(masterForm[0], true);
                 }
-                SN.U.NoticeFavor();
                 SN.U.NoticeRepeat();
                 SN.U.NoticeReply();
                 SN.U.NoticeInlineReplySetup();
@@ -1348,12 +1339,6 @@ var SN = { // StatusNet
          */
         EntityActions: function() {
             if ($('body.user_in').length > 0) {
-                $('.form_user_subscribe').live('click', function() { SN.U.FormXHR($(this)); return false; });
-                $('.form_user_unsubscribe').live('click', function() { SN.U.FormXHR($(this)); return false; });
-                $('.form_group_join').live('click', function() { SN.U.FormXHR($(this)); return false; });
-                $('.form_group_leave').live('click', function() { SN.U.FormXHR($(this)); return false; });
-                $('.form_user_nudge').live('click', function() { SN.U.FormXHR($(this)); return false; });
-
                 SN.U.NewDirectMessage();
             }
         },
diff --git a/js/util.min.js b/js/util.min.js
index 20c6b294a4..5e08cc78b5 100644
--- a/js/util.min.js
+++ b/js/util.min.js
@@ -1 +1 @@
-var SN={C:{I:{CounterBlackout:false,MaxLength:140,PatternUsername:/^[0-9a-zA-Z\-_.]*$/,HTTP20x30x:[200,201,202,203,204,205,206,300,301,302,303,304,305,306,307],NoticeFormMaster:null},S:{Disabled:"disabled",Warning:"warning",Error:"error",Success:"success",Processing:"processing",CommandResult:"command_result",FormNotice:"form_notice",NoticeDataGeo:"notice_data-geo",NoticeDataGeoCookie:"NoticeDataGeo",NoticeDataGeoSelected:"notice_data-geo_selected",StatusNetInstance:"StatusNetInstance"}},messages:{},msg:function(a){if(typeof SN.messages[a]=="undefined"){return"["+a+"]"}else{return SN.messages[a]}},U:{FormNoticeEnhancements:function(b){if(jQuery.data(b[0],"ElementData")===undefined){MaxLength=b.find(".count").text();if(typeof(MaxLength)=="undefined"){MaxLength=SN.C.I.MaxLength}jQuery.data(b[0],"ElementData",{MaxLength:MaxLength});SN.U.Counter(b);NDT=b.find("[name=status_textarea]");NDT.bind("keyup",function(c){SN.U.Counter(b)});var a=function(c){window.setTimeout(function(){SN.U.Counter(b)},50)};NDT.bind("cut",a).bind("paste",a)}else{b.find(".count").text(jQuery.data(b[0],"ElementData").MaxLength)}},Counter:function(d){SN.C.I.FormNoticeCurrent=d;var b=jQuery.data(d[0],"ElementData").MaxLength;if(b<=0){return}var c=b-SN.U.CharacterCount(d);var a=d.find(".count");if(c.toString()!=a.text()){if(!SN.C.I.CounterBlackout||c===0){if(a.text()!=String(c)){a.text(c)}if(c<0){d.addClass(SN.C.S.Warning)}else{d.removeClass(SN.C.S.Warning)}if(!SN.C.I.CounterBlackout){SN.C.I.CounterBlackout=true;SN.C.I.FormNoticeCurrent=d;window.setTimeout("SN.U.ClearCounterBlackout(SN.C.I.FormNoticeCurrent);",500)}}}},CharacterCount:function(a){return a.find("[name=status_textarea]").val().length},ClearCounterBlackout:function(a){SN.C.I.CounterBlackout=false;SN.U.Counter(a)},RewriteAjaxAction:function(a){if(document.location.protocol=="https:"&&a.substr(0,5)=="http:"){return a.replace(/^http:\/\/[^:\/]+/,"https://"+document.location.host)}else{return a}},FormXHR:function(a){$.ajax({type:"POST",dataType:"xml",url:SN.U.RewriteAjaxAction(a.attr("action")),data:a.serialize()+"&ajax=1",beforeSend:function(b){a.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(c,d,b){alert(b||d)},success:function(b,c){if(typeof($("form",b)[0])!="undefined"){form_new=document._importNode($("form",b)[0],true);a.replaceWith(form_new)}else{a.replaceWith(document._importNode($("p",b)[0],true))}}})},FormNoticeXHR:function(b){SN.C.I.NoticeDataGeo={};b.append('<input type="hidden" name="ajax" value="1"/>');b.attr("action",SN.U.RewriteAjaxAction(b.attr("action")));var c=function(d,e){b.append($('<p class="form_response"></p>').addClass(d).text(e))};var a=function(){b.find(".form_response").remove()};b.ajaxForm({dataType:"xml",timeout:"60000",beforeSend:function(d){if(b.find("[name=status_textarea]").val()==""){b.addClass(SN.C.S.Warning);return false}b.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled);SN.U.normalizeGeoData(b);return true},error:function(f,g,e){b.removeClass(SN.C.S.Processing).find(".submit").removeClass(SN.C.S.Disabled).removeAttr(SN.C.S.Disabled,SN.C.S.Disabled);a();if(g=="timeout"){c("error","Sorry! We had trouble sending your notice. The servers are overloaded. Please try again, and contact the site administrator if this problem persists.")}else{var d=SN.U.GetResponseXML(f);if($("."+SN.C.S.Error,d).length>0){b.append(document._importNode($("."+SN.C.S.Error,d)[0],true))}else{if(parseInt(f.status)===0||jQuery.inArray(parseInt(f.status),SN.C.I.HTTP20x30x)>=0){b.resetForm().find(".attach-status").remove();SN.U.FormNoticeEnhancements(b)}else{c("error","(Sorry! We had trouble sending your notice ("+f.status+" "+f.statusText+"). Please report the problem to the site administrator if this happens again.")}}}},success:function(i,f){a();var n=$("#"+SN.C.S.Error,i);if(n.length>0){c("error",n.text())}else{if($("body")[0].id=="bookmarklet"){self.close()}var d=$("#"+SN.C.S.CommandResult,i);if(d.length>0){c("success",d.text())}else{var m=document._importNode($("li",i)[0],true);var k=$("#notices_primary .notices:first");var l=b.closest("li.notice-reply");if(l.length>0){var e=$(m).attr("id");if($("#"+e).length==0){var j=l.closest("li.notice");l.replaceWith(m);SN.U.NoticeInlineReplyPlaceholder(j)}else{l.remove()}}else{if(k.length>0&&SN.U.belongsOnTimeline(m)){if($("#"+m.id).length===0){var h=b.find("[name=inreplyto]").val();var g="#notices_primary #notice-"+h;if($("body")[0].id=="conversation"){if(h.length>0&&$(g+" .notices").length<1){$(g).append('<ul class="notices"></ul>')}$($(g+" .notices")[0]).append(m)}else{k.prepend(m)}$("#"+m.id).css({display:"none"}).fadeIn(2500);SN.U.NoticeWithAttachment($("#"+m.id));SN.U.NoticeReplyTo($("#"+m.id))}}else{c("success",$("title",i).text())}}}b.resetForm();b.find("[name=inreplyto]").val("");b.find(".attach-status").remove();SN.U.FormNoticeEnhancements(b)}},complete:function(d,e){b.removeClass(SN.C.S.Processing).find(".submit").removeAttr(SN.C.S.Disabled).removeClass(SN.C.S.Disabled);b.find("[name=lat]").val(SN.C.I.NoticeDataGeo.NLat);b.find("[name=lon]").val(SN.C.I.NoticeDataGeo.NLon);b.find("[name=location_ns]").val(SN.C.I.NoticeDataGeo.NLNS);b.find("[name=location_id]").val(SN.C.I.NoticeDataGeo.NLID);b.find("[name=notice_data-geo]").attr("checked",SN.C.I.NoticeDataGeo.NDG)}})},normalizeGeoData:function(a){SN.C.I.NoticeDataGeo.NLat=a.find("[name=lat]").val();SN.C.I.NoticeDataGeo.NLon=a.find("[name=lon]").val();SN.C.I.NoticeDataGeo.NLNS=a.find("[name=location_ns]").val();SN.C.I.NoticeDataGeo.NLID=a.find("[name=location_id]").val();SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked");var b=$.cookie(SN.C.S.NoticeDataGeoCookie);if(b!==null&&b!="disabled"){b=JSON.parse(b);SN.C.I.NoticeDataGeo.NLat=a.find("[name=lat]").val(b.NLat).val();SN.C.I.NoticeDataGeo.NLon=a.find("[name=lon]").val(b.NLon).val();if(b.NLNS){SN.C.I.NoticeDataGeo.NLNS=a.find("[name=location_ns]").val(b.NLNS).val();SN.C.I.NoticeDataGeo.NLID=a.find("[name=location_id]").val(b.NLID).val()}else{a.find("[name=location_ns]").val("");a.find("[name=location_id]").val("")}}if(b=="disabled"){SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked",false).attr("checked")}else{SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked",true).attr("checked")}},GetResponseXML:function(b){try{return b.responseXML}catch(a){return(new DOMParser()).parseFromString(b.responseText,"text/xml")}},NoticeReply:function(){if($("#content .notice_reply").length>0){$("#content .notice").each(function(){SN.U.NoticeReplyTo($(this))})}},NoticeReplyTo:function(a){a.find(".notice_reply").live("click",function(c){c.preventDefault();var b=($(".author .nickname",a).length>0)?$($(".author .nickname",a)[0]):$(".author .nickname.uid");SN.U.NoticeInlineReplyTrigger(a,"@"+b.text());return false})},NoticeInlineReplyTrigger:function(h,i){var b=$($(".notice_id",h)[0]).text();var e=h;var f=h.closest(".notices");if(f.hasClass("threaded-replies")){e=f.closest(".notice")}else{f=$("ul.threaded-replies",h);if(f.length==0){f=$('<ul class="notices threaded-replies xoxo"></ul>');h.append(f)}}var j=$(".notice-reply-form",f);var d=function(){j.find("input[name=inreplyto]").val(b);var m=j.find("textarea");if(m.length==0){throw"No textarea"}var l="";if(i){l=i+" "}m.val(l+m.val().replace(RegExp(l,"i"),""));m.data("initialText",$.trim(i+""));m.focus();if(m[0].setSelectionRange){var k=m.val().length;m[0].setSelectionRange(k,k)}};if(j.length>0){d()}else{$("li.notice-reply-placeholder").remove();var g=$("li.notice-reply",f);if(g.length==0){g=$('<li class="notice-reply"></li>');var c=function(k){var l=document._importNode(k,true);g.append(l);f.append(g);var m=j=$(l);SN.U.NoticeLocationAttach(m);SN.U.FormNoticeXHR(m);SN.U.FormNoticeEnhancements(m);SN.U.NoticeDataAttach(m);d()};if(SN.C.I.NoticeFormMaster){c(SN.C.I.NoticeFormMaster)}else{var a=$("#form_notice").attr("action");$.get(a,{ajax:1},function(k,m,l){c($("form",k)[0])})}}}},NoticeFavor:function(){$(".form_favor").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_disfavor").live("click",function(){SN.U.FormXHR($(this));return false})},NoticeInlineReplyPlaceholder:function(b){var a=b.find("ul.threaded-replies");var c=$('<li class="notice-reply-placeholder"><input class="placeholder"></li>');c.click(function(){SN.U.NoticeInlineReplyTrigger(b)});c.find("input").val(SN.msg("reply_placeholder"));a.append(c)},NoticeInlineReplySetup:function(){$(".threaded-replies").each(function(){var b=$(this);var a=b.closest(".notice");SN.U.NoticeInlineReplyPlaceholder(a)})},NoticeRepeat:function(){$(".form_repeat").live("click",function(a){a.preventDefault();SN.U.NoticeRepeatConfirmation($(this));return false})},NoticeRepeatConfirmation:function(a){var c=a.find(".submit");var b=c.clone();b.addClass("submit_dialogbox").removeClass("submit");a.append(b);b.bind("click",function(){SN.U.FormXHR(a);return false});c.hide();a.addClass("dialogbox").append('<button class="close">&#215;</button>').closest(".notice-options").addClass("opaque");a.find("button.close").click(function(){$(this).remove();a.removeClass("dialogbox").closest(".notice-options").removeClass("opaque");a.find(".submit_dialogbox").remove();a.find(".submit").show();return false})},NoticeAttachments:function(){$(".notice a.attachment").each(function(){SN.U.NoticeWithAttachment($(this).closest(".notice"))})},NoticeWithAttachment:function(b){if(b.find(".attachment").length===0){return}var a=b.find(".attachment.more");if(a.length>0){$(a[0]).click(function(){var c=$(this);c.addClass(SN.C.S.Processing);$.get(c.attr("href")+"/ajax",null,function(d){c.parent(".entry-content").html($(d).find("#attachment_view .entry-content").html())});return false}).attr("title",SN.msg("showmore_tooltip"))}},NoticeDataAttach:function(b){var a=b.find("input[type=file]");a.change(function(f){b.find(".attach-status").remove();var d=$(this).val();if(!d){return false}var c=$('<div class="attach-status '+SN.C.S.Success+'"><code></code> <button class="close">&#215;</button></div>');c.find("code").text(d);c.find("button").click(function(){c.remove();a.val("");return false});b.append(c);if(typeof this.files=="object"){for(var e=0;e<this.files.length;e++){SN.U.PreviewAttach(b,this.files[e])}}})},maxFileSize:function(b){var a=$(b).find("input[name=MAX_FILE_SIZE]").attr("value");if(a){return parseInt(a)}else{return 0}},PreviewAttach:function(d,c){var e=c.type+" "+Math.round(c.size/1024)+"KB";var f=true;var h;if(typeof window.createObjectURL!="undefined"){h=function(i,j){j(window.createObjectURL(i))}}else{if(typeof window.FileReader!="undefined"){h=function(j,k){var i=new FileReader();i.onload=function(l){k(i.result)};i.readAsDataURL(j)}}else{f=false}}var a=["image/png","image/jpeg","image/gif","image/svg+xml"];if($.inArray(c.type,a)==-1){f=false}var g=8*1024*1024;if(c.size>g){f=false}if(f){h(c,function(j){var i=$("<img>").attr("title",e).attr("alt",e).attr("src",j).attr("style","height: 120px");d.find(".attach-status").append(i)})}else{var b=$("<div></div>").text(e);d.find(".attach-status").append(b)}},NoticeLocationAttach:function(a){var e=a.find("[name=lat]");var k=a.find("[name=lon]");var g=a.find("[name=location_ns]").val();var l=a.find("[name=location_id]").val();var b="";var d=a.find("[name=notice_data-geo]");var c=a.find("[name=notice_data-geo]");var j=a.find("label.notice_data-geo");function f(n){j.attr("title",jQuery.trim(j.text())).removeClass("checked");a.find("[name=lat]").val("");a.find("[name=lon]").val("");a.find("[name=location_ns]").val("");a.find("[name=location_id]").val("");a.find("[name=notice_data-geo]").attr("checked",false);$.cookie(SN.C.S.NoticeDataGeoCookie,"disabled",{path:"/"});if(n){a.find(".geo_status_wrapper").removeClass("success").addClass("error");a.find(".geo_status_wrapper .geo_status").text(n)}else{a.find(".geo_status_wrapper").remove()}}function m(n,o){SN.U.NoticeGeoStatus(a,"Looking up place name...");$.getJSON(n,o,function(p){var q,r;if(typeof(p.location_ns)!="undefined"){a.find("[name=location_ns]").val(p.location_ns);q=p.location_ns}if(typeof(p.location_id)!="undefined"){a.find("[name=location_id]").val(p.location_id);r=p.location_id}if(typeof(p.name)=="undefined"){NLN_text=o.lat+";"+o.lon}else{NLN_text=p.name}SN.U.NoticeGeoStatus(a,NLN_text,o.lat,o.lon,p.url);j.attr("title",NoticeDataGeo_text.ShareDisable+" ("+NLN_text+")");a.find("[name=lat]").val(o.lat);a.find("[name=lon]").val(o.lon);a.find("[name=location_ns]").val(q);a.find("[name=location_id]").val(r);a.find("[name=notice_data-geo]").attr("checked",true);var s={NLat:o.lat,NLon:o.lon,NLNS:q,NLID:r,NLN:NLN_text,NLNU:p.url,NDG:true};$.cookie(SN.C.S.NoticeDataGeoCookie,JSON.stringify(s),{path:"/"})})}if(c.length>0){if($.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){c.attr("checked",false)}else{c.attr("checked",true)}var h=a.find(".notice_data-geo_wrap");var i=h.attr("title");h.removeAttr("title");j.attr("title",j.text());c.change(function(){if(c.attr("checked")===true||$.cookie(SN.C.S.NoticeDataGeoCookie)===null){j.attr("title",NoticeDataGeo_text.ShareDisable).addClass("checked");if($.cookie(SN.C.S.NoticeDataGeoCookie)===null||$.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){if(navigator.geolocation){SN.U.NoticeGeoStatus(a,"Requesting location from browser...");navigator.geolocation.getCurrentPosition(function(p){a.find("[name=lat]").val(p.coords.latitude);a.find("[name=lon]").val(p.coords.longitude);var q={lat:p.coords.latitude,lon:p.coords.longitude,token:$("#token").val()};m(i,q)},function(p){switch(p.code){case p.PERMISSION_DENIED:f("Location permission denied.");break;case p.TIMEOUT:f("Location lookup timeout.");break}},{timeout:10000})}else{if(e.length>0&&k.length>0){var n={lat:e,lon:k,token:$("#token").val()};m(i,n)}else{f();c.remove();j.remove()}}}else{var o=JSON.parse($.cookie(SN.C.S.NoticeDataGeoCookie));a.find("[name=lat]").val(o.NLat);a.find("[name=lon]").val(o.NLon);a.find("[name=location_ns]").val(o.NLNS);a.find("[name=location_id]").val(o.NLID);a.find("[name=notice_data-geo]").attr("checked",o.NDG);SN.U.NoticeGeoStatus(a,o.NLN,o.NLat,o.NLon,o.NLNU);j.attr("title",NoticeDataGeo_text.ShareDisable+" ("+o.NLN+")").addClass("checked")}}else{f()}}).change()}},NoticeGeoStatus:function(e,a,f,g,c){var h=e.find(".geo_status_wrapper");if(h.length==0){h=$('<div class="'+SN.C.S.Success+' geo_status_wrapper"><button class="close" style="float:right">&#215;</button><div class="geo_status"></div></div>');h.find("button.close").click(function(){e.find("[name=notice_data-geo]").removeAttr("checked").change()});e.append(h)}var b;if(c){b=$("<a></a>").attr("href",c)}else{b=$("<span></span>")}b.text(a);if(f||g){var d=f+";"+g;b.attr("title",d);if(!a){b.text(d)}}h.find(".geo_status").empty().append(b)},NewDirectMessage:function(){NDM=$(".entity_send-a-message a");NDM.attr({href:NDM.attr("href")+"&ajax=1"});NDM.bind("click",function(){var a=$(".entity_send-a-message form");if(a.length===0){$(this).addClass(SN.C.S.Processing);$.get(NDM.attr("href"),null,function(b){$(".entity_send-a-message").append(document._importNode($("form",b)[0],true));a=$(".entity_send-a-message .form_notice");SN.U.FormNoticeXHR(a);SN.U.FormNoticeEnhancements(a);a.append('<button class="close">&#215;</button>');$(".entity_send-a-message button").click(function(){a.hide();return false});NDM.removeClass(SN.C.S.Processing)})}else{a.show();$(".entity_send-a-message textarea").focus()}return false})},GetFullYear:function(c,d,a){var b=new Date();b.setFullYear(c,d,a);return b},StatusNetInstance:{Set:function(b){var a=SN.U.StatusNetInstance.Get();if(a!==null){b=$.extend(a,b)}$.cookie(SN.C.S.StatusNetInstance,JSON.stringify(b),{path:"/",expires:SN.U.GetFullYear(2029,0,1)})},Get:function(){var a=$.cookie(SN.C.S.StatusNetInstance);if(a!==null){return JSON.parse(a)}return null},Delete:function(){$.cookie(SN.C.S.StatusNetInstance,null)}},belongsOnTimeline:function(b){var a=$("body").attr("id");if(a=="public"){return true}var c=$("#nav_profile a").attr("href");if(c){var d=$(b).find(".entry-title .author a.url").attr("href");if(d==c){if(a=="all"||a=="showstream"){return true}}}return false},switchInputFormTab:function(a){$(".input_form_nav_tab.current").removeClass("current");$("#input_form_nav_"+a).addClass("current");$(".input_form.current").removeClass("current");$("#input_form_"+a).addClass("current")}},Init:{NoticeForm:function(){if($("body.user_in").length>0){$("."+SN.C.S.FormNotice).each(function(){var a=$(this);SN.U.NoticeLocationAttach(a);SN.U.FormNoticeXHR(a);SN.U.FormNoticeEnhancements(a);SN.U.NoticeDataAttach(a)})}},Notices:function(){if($("body.user_in").length>0){var a=$(".form_notice:first");if(a.length>0){SN.C.I.NoticeFormMaster=document._importNode(a[0],true)}SN.U.NoticeFavor();SN.U.NoticeRepeat();SN.U.NoticeReply();SN.U.NoticeInlineReplySetup()}SN.U.NoticeAttachments()},EntityActions:function(){if($("body.user_in").length>0){$(".form_user_subscribe").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_user_unsubscribe").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_group_join").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_group_leave").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_user_nudge").live("click",function(){SN.U.FormXHR($(this));return false});SN.U.NewDirectMessage()}},Login:function(){if(SN.U.StatusNetInstance.Get()!==null){var a=SN.U.StatusNetInstance.Get().Nickname;if(a!==null){$("#form_login #nickname").val(a)}}$("#form_login").bind("submit",function(){SN.U.StatusNetInstance.Set({Nickname:$("#form_login #nickname").val()});return true})},AjaxForms:function(){$("form.ajax").live("submit",function(){SN.U.FormXHR($(this));return false})},UploadForms:function(){$("input[type=file]").change(function(d){if(typeof this.files=="object"&&this.files.length>0){var c=0;for(var b=0;b<this.files.length;b++){c+=this.files[b].size}var a=SN.U.maxFileSize($(this.form));if(a>0&&c>a){var e="File too large: maximum upload size is %d bytes.";alert(e.replace("%d",a));$(this).val("");d.preventDefault();return false}}})}}};$(document).ready(function(){SN.Init.AjaxForms();SN.Init.UploadForms();if($("."+SN.C.S.FormNotice).length>0){SN.Init.NoticeForm()}if($("#content .notices").length>0){SN.Init.Notices()}if($("#content .entity_actions").length>0){SN.Init.EntityActions()}if($("#form_login").length>0){SN.Init.Login()}});if(!document.ELEMENT_NODE){document.ELEMENT_NODE=1;document.ATTRIBUTE_NODE=2;document.TEXT_NODE=3;document.CDATA_SECTION_NODE=4;document.ENTITY_REFERENCE_NODE=5;document.ENTITY_NODE=6;document.PROCESSING_INSTRUCTION_NODE=7;document.COMMENT_NODE=8;document.DOCUMENT_NODE=9;document.DOCUMENT_TYPE_NODE=10;document.DOCUMENT_FRAGMENT_NODE=11;document.NOTATION_NODE=12}document._importNode=function(e,a){switch(e.nodeType){case document.ELEMENT_NODE:var d=document.createElement(e.nodeName);if(e.attributes&&e.attributes.length>0){for(var c=0,b=e.attributes.length;c<b;){if(e.attributes[c].nodeName=="class"){d.className=e.getAttribute(e.attributes[c++].nodeName)}else{d.setAttribute(e.attributes[c].nodeName,e.getAttribute(e.attributes[c++].nodeName))}}}if(a&&e.childNodes&&e.childNodes.length>0){for(var c=0,b=e.childNodes.length;c<b;){d.appendChild(document._importNode(e.childNodes[c++],a))}}return d;break;case document.TEXT_NODE:case document.CDATA_SECTION_NODE:case document.COMMENT_NODE:return document.createTextNode(e.nodeValue);break}};if(typeof navigator.geolocation=="undefined"||navigator.geolocation.shim){(function(){(function(){if(window.google&&google.gears){return}var c=null;if(typeof GearsFactory!="undefined"){c=new GearsFactory()}else{try{c=new ActiveXObject("Gears.Factory");if(c.getBuildInfo().indexOf("ie_mobile")!=-1){c.privateSetGlobalObject(this)}}catch(d){if((typeof navigator.mimeTypes!="undefined")&&navigator.mimeTypes["application/x-googlegears"]){c=document.createElement("object");c.style.display="none";c.width=0;c.height=0;c.type="application/x-googlegears";document.documentElement.appendChild(c)}}}if(!c){return}if(!window.google){google={}}if(!google.gears){google.gears={factory:c}}})();var a=(function(){var d=google.gears.factory.create("beta.geolocation");var c=function(f,e){return function(g){f(g);e.lastPosition=g}};return{shim:true,type:"Gears",lastPosition:null,getCurrentPosition:function(e,g,h){var f=this;var i=c(e,f);d.getCurrentPosition(i,g,h)},watchPosition:function(e,f,g){d.watchPosition(e,f,g)},clearWatch:function(e){d.clearWatch(e)},getPermission:function(g,e,f){d.getPermission(g,e,f)}}});var b=(function(){var i=false;var e=function(){if(!d()&&!i){i=true;var j=document.createElement("script");j.src=(document.location.protocol=="https:"?"https://":"http://")+"www.google.com/jsapi?callback=_google_loader_apiLoaded";j.type="text/javascript";document.getElementsByTagName("body")[0].appendChild(j)}};var c=[];var h=function(j){c.push(j)};var f=function(){if(d()){while(c.length>0){var j=c.pop();j()}}};window._google_loader_apiLoaded=function(){f()};var d=function(){return(window.google&&google.loader)};var g=function(j){if(d()){return true}h(j);e();return false};e();return{shim:true,type:"ClientLocation",lastPosition:null,getCurrentPosition:function(k,n,o){var m=this;if(!g(function(){m.getCurrentPosition(k,n,o)})){return}if(google.loader.ClientLocation){var l=google.loader.ClientLocation;var j={coords:{latitude:l.latitude,longitude:l.longitude,altitude:null,accuracy:43000,altitudeAccuracy:null,heading:null,speed:null},address:{city:l.address.city,country:l.address.country,country_code:l.address.country_code,region:l.address.region},timestamp:new Date()};k(j);this.lastPosition=j}else{if(n==="function"){n({code:3,message:"Using the Google ClientLocation API and it is not able to calculate a location."})}}},watchPosition:function(j,l,m){this.getCurrentPosition(j,l,m);var k=this;var n=setInterval(function(){k.getCurrentPosition(j,l,m)},10000);return n},clearWatch:function(j){clearInterval(j)},getPermission:function(l,j,k){return true}}});navigator.geolocation=(window.google&&google.gears)?a():b()})()};
\ No newline at end of file
+var SN={C:{I:{CounterBlackout:false,MaxLength:140,PatternUsername:/^[0-9a-zA-Z\-_.]*$/,HTTP20x30x:[200,201,202,203,204,205,206,300,301,302,303,304,305,306,307],NoticeFormMaster:null},S:{Disabled:"disabled",Warning:"warning",Error:"error",Success:"success",Processing:"processing",CommandResult:"command_result",FormNotice:"form_notice",NoticeDataGeo:"notice_data-geo",NoticeDataGeoCookie:"NoticeDataGeo",NoticeDataGeoSelected:"notice_data-geo_selected",StatusNetInstance:"StatusNetInstance"}},messages:{},msg:function(a){if(typeof SN.messages[a]=="undefined"){return"["+a+"]"}else{return SN.messages[a]}},U:{FormNoticeEnhancements:function(b){if(jQuery.data(b[0],"ElementData")===undefined){MaxLength=b.find(".count").text();if(typeof(MaxLength)=="undefined"){MaxLength=SN.C.I.MaxLength}jQuery.data(b[0],"ElementData",{MaxLength:MaxLength});SN.U.Counter(b);NDT=b.find("[name=status_textarea]");NDT.bind("keyup",function(c){SN.U.Counter(b)});var a=function(c){window.setTimeout(function(){SN.U.Counter(b)},50)};NDT.bind("cut",a).bind("paste",a)}else{b.find(".count").text(jQuery.data(b[0],"ElementData").MaxLength)}},Counter:function(d){SN.C.I.FormNoticeCurrent=d;var b=jQuery.data(d[0],"ElementData").MaxLength;if(b<=0){return}var c=b-SN.U.CharacterCount(d);var a=d.find(".count");if(c.toString()!=a.text()){if(!SN.C.I.CounterBlackout||c===0){if(a.text()!=String(c)){a.text(c)}if(c<0){d.addClass(SN.C.S.Warning)}else{d.removeClass(SN.C.S.Warning)}if(!SN.C.I.CounterBlackout){SN.C.I.CounterBlackout=true;SN.C.I.FormNoticeCurrent=d;window.setTimeout("SN.U.ClearCounterBlackout(SN.C.I.FormNoticeCurrent);",500)}}}},CharacterCount:function(a){return a.find("[name=status_textarea]").val().length},ClearCounterBlackout:function(a){SN.C.I.CounterBlackout=false;SN.U.Counter(a)},RewriteAjaxAction:function(a){if(document.location.protocol=="https:"&&a.substr(0,5)=="http:"){return a.replace(/^http:\/\/[^:\/]+/,"https://"+document.location.host)}else{return a}},FormXHR:function(a){$.ajax({type:"POST",dataType:"xml",url:SN.U.RewriteAjaxAction(a.attr("action")),data:a.serialize()+"&ajax=1",beforeSend:function(b){a.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(c,d,b){alert(b||d)},success:function(b,c){if(typeof($("form",b)[0])!="undefined"){form_new=document._importNode($("form",b)[0],true);a.replaceWith(form_new)}else{a.replaceWith(document._importNode($("p",b)[0],true))}}})},FormNoticeXHR:function(b){SN.C.I.NoticeDataGeo={};b.append('<input type="hidden" name="ajax" value="1"/>');b.attr("action",SN.U.RewriteAjaxAction(b.attr("action")));var c=function(d,e){b.append($('<p class="form_response"></p>').addClass(d).text(e))};var a=function(){b.find(".form_response").remove()};b.ajaxForm({dataType:"xml",timeout:"60000",beforeSend:function(d){if(b.find("[name=status_textarea]").val()==""){b.addClass(SN.C.S.Warning);return false}b.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled);SN.U.normalizeGeoData(b);return true},error:function(f,g,e){b.removeClass(SN.C.S.Processing).find(".submit").removeClass(SN.C.S.Disabled).removeAttr(SN.C.S.Disabled,SN.C.S.Disabled);a();if(g=="timeout"){c("error","Sorry! We had trouble sending your notice. The servers are overloaded. Please try again, and contact the site administrator if this problem persists.")}else{var d=SN.U.GetResponseXML(f);if($("."+SN.C.S.Error,d).length>0){b.append(document._importNode($("."+SN.C.S.Error,d)[0],true))}else{if(parseInt(f.status)===0||jQuery.inArray(parseInt(f.status),SN.C.I.HTTP20x30x)>=0){b.resetForm().find(".attach-status").remove();SN.U.FormNoticeEnhancements(b)}else{c("error","(Sorry! We had trouble sending your notice ("+f.status+" "+f.statusText+"). Please report the problem to the site administrator if this happens again.")}}}},success:function(i,f){a();var n=$("#"+SN.C.S.Error,i);if(n.length>0){c("error",n.text())}else{if($("body")[0].id=="bookmarklet"){self.close()}var d=$("#"+SN.C.S.CommandResult,i);if(d.length>0){c("success",d.text())}else{var m=document._importNode($("li",i)[0],true);var k=$("#notices_primary .notices:first");var l=b.closest("li.notice-reply");if(l.length>0){var e=$(m).attr("id");if($("#"+e).length==0){var j=l.closest("li.notice");l.replaceWith(m);SN.U.NoticeInlineReplyPlaceholder(j)}else{l.remove()}}else{if(k.length>0&&SN.U.belongsOnTimeline(m)){if($("#"+m.id).length===0){var h=b.find("[name=inreplyto]").val();var g="#notices_primary #notice-"+h;if($("body")[0].id=="conversation"){if(h.length>0&&$(g+" .notices").length<1){$(g).append('<ul class="notices"></ul>')}$($(g+" .notices")[0]).append(m)}else{k.prepend(m)}$("#"+m.id).css({display:"none"}).fadeIn(2500);SN.U.NoticeWithAttachment($("#"+m.id));SN.U.NoticeReplyTo($("#"+m.id))}}else{c("success",$("title",i).text())}}}b.resetForm();b.find("[name=inreplyto]").val("");b.find(".attach-status").remove();SN.U.FormNoticeEnhancements(b)}},complete:function(d,e){b.removeClass(SN.C.S.Processing).find(".submit").removeAttr(SN.C.S.Disabled).removeClass(SN.C.S.Disabled);b.find("[name=lat]").val(SN.C.I.NoticeDataGeo.NLat);b.find("[name=lon]").val(SN.C.I.NoticeDataGeo.NLon);b.find("[name=location_ns]").val(SN.C.I.NoticeDataGeo.NLNS);b.find("[name=location_id]").val(SN.C.I.NoticeDataGeo.NLID);b.find("[name=notice_data-geo]").attr("checked",SN.C.I.NoticeDataGeo.NDG)}})},normalizeGeoData:function(a){SN.C.I.NoticeDataGeo.NLat=a.find("[name=lat]").val();SN.C.I.NoticeDataGeo.NLon=a.find("[name=lon]").val();SN.C.I.NoticeDataGeo.NLNS=a.find("[name=location_ns]").val();SN.C.I.NoticeDataGeo.NLID=a.find("[name=location_id]").val();SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked");var b=$.cookie(SN.C.S.NoticeDataGeoCookie);if(b!==null&&b!="disabled"){b=JSON.parse(b);SN.C.I.NoticeDataGeo.NLat=a.find("[name=lat]").val(b.NLat).val();SN.C.I.NoticeDataGeo.NLon=a.find("[name=lon]").val(b.NLon).val();if(b.NLNS){SN.C.I.NoticeDataGeo.NLNS=a.find("[name=location_ns]").val(b.NLNS).val();SN.C.I.NoticeDataGeo.NLID=a.find("[name=location_id]").val(b.NLID).val()}else{a.find("[name=location_ns]").val("");a.find("[name=location_id]").val("")}}if(b=="disabled"){SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked",false).attr("checked")}else{SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked",true).attr("checked")}},GetResponseXML:function(b){try{return b.responseXML}catch(a){return(new DOMParser()).parseFromString(b.responseText,"text/xml")}},NoticeReply:function(){if($("#content .notice_reply").length>0){$("#content .notice").each(function(){SN.U.NoticeReplyTo($(this))})}},NoticeReplyTo:function(a){a.find(".notice_reply").live("click",function(c){c.preventDefault();var b=($(".author .nickname",a).length>0)?$($(".author .nickname",a)[0]):$(".author .nickname.uid");SN.U.NoticeInlineReplyTrigger(a,"@"+b.text());return false})},NoticeInlineReplyTrigger:function(h,i){var b=$($(".notice_id",h)[0]).text();var e=h;var f=h.closest(".notices");if(f.hasClass("threaded-replies")){e=f.closest(".notice")}else{f=$("ul.threaded-replies",h);if(f.length==0){f=$('<ul class="notices threaded-replies xoxo"></ul>');h.append(f)}}var j=$(".notice-reply-form",f);var d=function(){j.find("input[name=inreplyto]").val(b);var m=j.find("textarea");if(m.length==0){throw"No textarea"}var l="";if(i){l=i+" "}m.val(l+m.val().replace(RegExp(l,"i"),""));m.data("initialText",$.trim(i+""));m.focus();if(m[0].setSelectionRange){var k=m.val().length;m[0].setSelectionRange(k,k)}};if(j.length>0){d()}else{$("li.notice-reply-placeholder").remove();var g=$("li.notice-reply",f);if(g.length==0){g=$('<li class="notice-reply"></li>');var c=function(k){var l=document._importNode(k,true);g.append(l);f.append(g);var m=j=$(l);SN.U.NoticeLocationAttach(m);SN.U.FormNoticeXHR(m);SN.U.FormNoticeEnhancements(m);SN.U.NoticeDataAttach(m);d()};if(SN.C.I.NoticeFormMaster){c(SN.C.I.NoticeFormMaster)}else{var a=$("#form_notice").attr("action");$.get(a,{ajax:1},function(k,m,l){c($("form",k)[0])})}}}},NoticeInlineReplyPlaceholder:function(b){var a=b.find("ul.threaded-replies");var c=$('<li class="notice-reply-placeholder"><input class="placeholder"></li>');c.click(function(){SN.U.NoticeInlineReplyTrigger(b)});c.find("input").val(SN.msg("reply_placeholder"));a.append(c)},NoticeInlineReplySetup:function(){$(".threaded-replies").each(function(){var b=$(this);var a=b.closest(".notice");SN.U.NoticeInlineReplyPlaceholder(a)})},NoticeRepeat:function(){$(".form_repeat").live("click",function(a){a.preventDefault();SN.U.NoticeRepeatConfirmation($(this));return false})},NoticeRepeatConfirmation:function(a){var c=a.find(".submit");var b=c.clone();b.addClass("submit_dialogbox").removeClass("submit");a.append(b);b.bind("click",function(){SN.U.FormXHR(a);return false});c.hide();a.addClass("dialogbox").append('<button class="close">&#215;</button>').closest(".notice-options").addClass("opaque");a.find("button.close").click(function(){$(this).remove();a.removeClass("dialogbox").closest(".notice-options").removeClass("opaque");a.find(".submit_dialogbox").remove();a.find(".submit").show();return false})},NoticeAttachments:function(){$(".notice a.attachment").each(function(){SN.U.NoticeWithAttachment($(this).closest(".notice"))})},NoticeWithAttachment:function(b){if(b.find(".attachment").length===0){return}var a=b.find(".attachment.more");if(a.length>0){$(a[0]).click(function(){var c=$(this);c.addClass(SN.C.S.Processing);$.get(c.attr("href")+"/ajax",null,function(d){c.parent(".entry-content").html($(d).find("#attachment_view .entry-content").html())});return false}).attr("title",SN.msg("showmore_tooltip"))}},NoticeDataAttach:function(b){var a=b.find("input[type=file]");a.change(function(f){b.find(".attach-status").remove();var d=$(this).val();if(!d){return false}var c=$('<div class="attach-status '+SN.C.S.Success+'"><code></code> <button class="close">&#215;</button></div>');c.find("code").text(d);c.find("button").click(function(){c.remove();a.val("");return false});b.append(c);if(typeof this.files=="object"){for(var e=0;e<this.files.length;e++){SN.U.PreviewAttach(b,this.files[e])}}})},maxFileSize:function(b){var a=$(b).find("input[name=MAX_FILE_SIZE]").attr("value");if(a){return parseInt(a)}else{return 0}},PreviewAttach:function(d,c){var e=c.type+" "+Math.round(c.size/1024)+"KB";var f=true;var h;if(typeof window.createObjectURL!="undefined"){h=function(i,j){j(window.createObjectURL(i))}}else{if(typeof window.FileReader!="undefined"){h=function(j,k){var i=new FileReader();i.onload=function(l){k(i.result)};i.readAsDataURL(j)}}else{f=false}}var a=["image/png","image/jpeg","image/gif","image/svg+xml"];if($.inArray(c.type,a)==-1){f=false}var g=8*1024*1024;if(c.size>g){f=false}if(f){h(c,function(j){var i=$("<img>").attr("title",e).attr("alt",e).attr("src",j).attr("style","height: 120px");d.find(".attach-status").append(i)})}else{var b=$("<div></div>").text(e);d.find(".attach-status").append(b)}},NoticeLocationAttach:function(a){var e=a.find("[name=lat]");var k=a.find("[name=lon]");var g=a.find("[name=location_ns]").val();var l=a.find("[name=location_id]").val();var b="";var d=a.find("[name=notice_data-geo]");var c=a.find("[name=notice_data-geo]");var j=a.find("label.notice_data-geo");function f(n){j.attr("title",jQuery.trim(j.text())).removeClass("checked");a.find("[name=lat]").val("");a.find("[name=lon]").val("");a.find("[name=location_ns]").val("");a.find("[name=location_id]").val("");a.find("[name=notice_data-geo]").attr("checked",false);$.cookie(SN.C.S.NoticeDataGeoCookie,"disabled",{path:"/"});if(n){a.find(".geo_status_wrapper").removeClass("success").addClass("error");a.find(".geo_status_wrapper .geo_status").text(n)}else{a.find(".geo_status_wrapper").remove()}}function m(n,o){SN.U.NoticeGeoStatus(a,"Looking up place name...");$.getJSON(n,o,function(p){var q,r;if(typeof(p.location_ns)!="undefined"){a.find("[name=location_ns]").val(p.location_ns);q=p.location_ns}if(typeof(p.location_id)!="undefined"){a.find("[name=location_id]").val(p.location_id);r=p.location_id}if(typeof(p.name)=="undefined"){NLN_text=o.lat+";"+o.lon}else{NLN_text=p.name}SN.U.NoticeGeoStatus(a,NLN_text,o.lat,o.lon,p.url);j.attr("title",NoticeDataGeo_text.ShareDisable+" ("+NLN_text+")");a.find("[name=lat]").val(o.lat);a.find("[name=lon]").val(o.lon);a.find("[name=location_ns]").val(q);a.find("[name=location_id]").val(r);a.find("[name=notice_data-geo]").attr("checked",true);var s={NLat:o.lat,NLon:o.lon,NLNS:q,NLID:r,NLN:NLN_text,NLNU:p.url,NDG:true};$.cookie(SN.C.S.NoticeDataGeoCookie,JSON.stringify(s),{path:"/"})})}if(c.length>0){if($.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){c.attr("checked",false)}else{c.attr("checked",true)}var h=a.find(".notice_data-geo_wrap");var i=h.attr("title");h.removeAttr("title");j.attr("title",j.text());c.change(function(){if(c.attr("checked")===true||$.cookie(SN.C.S.NoticeDataGeoCookie)===null){j.attr("title",NoticeDataGeo_text.ShareDisable).addClass("checked");if($.cookie(SN.C.S.NoticeDataGeoCookie)===null||$.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){if(navigator.geolocation){SN.U.NoticeGeoStatus(a,"Requesting location from browser...");navigator.geolocation.getCurrentPosition(function(p){a.find("[name=lat]").val(p.coords.latitude);a.find("[name=lon]").val(p.coords.longitude);var q={lat:p.coords.latitude,lon:p.coords.longitude,token:$("#token").val()};m(i,q)},function(p){switch(p.code){case p.PERMISSION_DENIED:f("Location permission denied.");break;case p.TIMEOUT:f("Location lookup timeout.");break}},{timeout:10000})}else{if(e.length>0&&k.length>0){var n={lat:e,lon:k,token:$("#token").val()};m(i,n)}else{f();c.remove();j.remove()}}}else{var o=JSON.parse($.cookie(SN.C.S.NoticeDataGeoCookie));a.find("[name=lat]").val(o.NLat);a.find("[name=lon]").val(o.NLon);a.find("[name=location_ns]").val(o.NLNS);a.find("[name=location_id]").val(o.NLID);a.find("[name=notice_data-geo]").attr("checked",o.NDG);SN.U.NoticeGeoStatus(a,o.NLN,o.NLat,o.NLon,o.NLNU);j.attr("title",NoticeDataGeo_text.ShareDisable+" ("+o.NLN+")").addClass("checked")}}else{f()}}).change()}},NoticeGeoStatus:function(e,a,f,g,c){var h=e.find(".geo_status_wrapper");if(h.length==0){h=$('<div class="'+SN.C.S.Success+' geo_status_wrapper"><button class="close" style="float:right">&#215;</button><div class="geo_status"></div></div>');h.find("button.close").click(function(){e.find("[name=notice_data-geo]").removeAttr("checked").change()});e.append(h)}var b;if(c){b=$("<a></a>").attr("href",c)}else{b=$("<span></span>")}b.text(a);if(f||g){var d=f+";"+g;b.attr("title",d);if(!a){b.text(d)}}h.find(".geo_status").empty().append(b)},NewDirectMessage:function(){NDM=$(".entity_send-a-message a");NDM.attr({href:NDM.attr("href")+"&ajax=1"});NDM.bind("click",function(){var a=$(".entity_send-a-message form");if(a.length===0){$(this).addClass(SN.C.S.Processing);$.get(NDM.attr("href"),null,function(b){$(".entity_send-a-message").append(document._importNode($("form",b)[0],true));a=$(".entity_send-a-message .form_notice");SN.U.FormNoticeXHR(a);SN.U.FormNoticeEnhancements(a);a.append('<button class="close">&#215;</button>');$(".entity_send-a-message button").click(function(){a.hide();return false});NDM.removeClass(SN.C.S.Processing)})}else{a.show();$(".entity_send-a-message textarea").focus()}return false})},GetFullYear:function(c,d,a){var b=new Date();b.setFullYear(c,d,a);return b},StatusNetInstance:{Set:function(b){var a=SN.U.StatusNetInstance.Get();if(a!==null){b=$.extend(a,b)}$.cookie(SN.C.S.StatusNetInstance,JSON.stringify(b),{path:"/",expires:SN.U.GetFullYear(2029,0,1)})},Get:function(){var a=$.cookie(SN.C.S.StatusNetInstance);if(a!==null){return JSON.parse(a)}return null},Delete:function(){$.cookie(SN.C.S.StatusNetInstance,null)}},belongsOnTimeline:function(b){var a=$("body").attr("id");if(a=="public"){return true}var c=$("#nav_profile a").attr("href");if(c){var d=$(b).find(".entry-title .author a.url").attr("href");if(d==c){if(a=="all"||a=="showstream"){return true}}}return false},switchInputFormTab:function(a){$(".input_form_nav_tab.current").removeClass("current");$("#input_form_nav_"+a).addClass("current");$(".input_form.current").removeClass("current");$("#input_form_"+a).addClass("current")}},Init:{NoticeForm:function(){if($("body.user_in").length>0){$("."+SN.C.S.FormNotice).each(function(){var a=$(this);SN.U.NoticeLocationAttach(a);SN.U.FormNoticeXHR(a);SN.U.FormNoticeEnhancements(a);SN.U.NoticeDataAttach(a)})}},Notices:function(){if($("body.user_in").length>0){var a=$(".form_notice:first");if(a.length>0){SN.C.I.NoticeFormMaster=document._importNode(a[0],true)}SN.U.NoticeRepeat();SN.U.NoticeReply();SN.U.NoticeInlineReplySetup()}SN.U.NoticeAttachments()},EntityActions:function(){if($("body.user_in").length>0){SN.U.NewDirectMessage()}},Login:function(){if(SN.U.StatusNetInstance.Get()!==null){var a=SN.U.StatusNetInstance.Get().Nickname;if(a!==null){$("#form_login #nickname").val(a)}}$("#form_login").bind("submit",function(){SN.U.StatusNetInstance.Set({Nickname:$("#form_login #nickname").val()});return true})},AjaxForms:function(){$("form.ajax").live("submit",function(){SN.U.FormXHR($(this));return false})},UploadForms:function(){$("input[type=file]").change(function(d){if(typeof this.files=="object"&&this.files.length>0){var c=0;for(var b=0;b<this.files.length;b++){c+=this.files[b].size}var a=SN.U.maxFileSize($(this.form));if(a>0&&c>a){var e="File too large: maximum upload size is %d bytes.";alert(e.replace("%d",a));$(this).val("");d.preventDefault();return false}}})}}};$(document).ready(function(){SN.Init.AjaxForms();SN.Init.UploadForms();if($("."+SN.C.S.FormNotice).length>0){SN.Init.NoticeForm()}if($("#content .notices").length>0){SN.Init.Notices()}if($("#content .entity_actions").length>0){SN.Init.EntityActions()}if($("#form_login").length>0){SN.Init.Login()}});if(!document.ELEMENT_NODE){document.ELEMENT_NODE=1;document.ATTRIBUTE_NODE=2;document.TEXT_NODE=3;document.CDATA_SECTION_NODE=4;document.ENTITY_REFERENCE_NODE=5;document.ENTITY_NODE=6;document.PROCESSING_INSTRUCTION_NODE=7;document.COMMENT_NODE=8;document.DOCUMENT_NODE=9;document.DOCUMENT_TYPE_NODE=10;document.DOCUMENT_FRAGMENT_NODE=11;document.NOTATION_NODE=12}document._importNode=function(e,a){switch(e.nodeType){case document.ELEMENT_NODE:var d=document.createElement(e.nodeName);if(e.attributes&&e.attributes.length>0){for(var c=0,b=e.attributes.length;c<b;){if(e.attributes[c].nodeName=="class"){d.className=e.getAttribute(e.attributes[c++].nodeName)}else{d.setAttribute(e.attributes[c].nodeName,e.getAttribute(e.attributes[c++].nodeName))}}}if(a&&e.childNodes&&e.childNodes.length>0){for(var c=0,b=e.childNodes.length;c<b;){d.appendChild(document._importNode(e.childNodes[c++],a))}}return d;break;case document.TEXT_NODE:case document.CDATA_SECTION_NODE:case document.COMMENT_NODE:return document.createTextNode(e.nodeValue);break}};if(typeof navigator.geolocation=="undefined"||navigator.geolocation.shim){(function(){(function(){if(window.google&&google.gears){return}var c=null;if(typeof GearsFactory!="undefined"){c=new GearsFactory()}else{try{c=new ActiveXObject("Gears.Factory");if(c.getBuildInfo().indexOf("ie_mobile")!=-1){c.privateSetGlobalObject(this)}}catch(d){if((typeof navigator.mimeTypes!="undefined")&&navigator.mimeTypes["application/x-googlegears"]){c=document.createElement("object");c.style.display="none";c.width=0;c.height=0;c.type="application/x-googlegears";document.documentElement.appendChild(c)}}}if(!c){return}if(!window.google){google={}}if(!google.gears){google.gears={factory:c}}})();var a=(function(){var d=google.gears.factory.create("beta.geolocation");var c=function(f,e){return function(g){f(g);e.lastPosition=g}};return{shim:true,type:"Gears",lastPosition:null,getCurrentPosition:function(e,g,h){var f=this;var i=c(e,f);d.getCurrentPosition(i,g,h)},watchPosition:function(e,f,g){d.watchPosition(e,f,g)},clearWatch:function(e){d.clearWatch(e)},getPermission:function(g,e,f){d.getPermission(g,e,f)}}});var b=(function(){var i=false;var e=function(){if(!d()&&!i){i=true;var j=document.createElement("script");j.src=(document.location.protocol=="https:"?"https://":"http://")+"www.google.com/jsapi?callback=_google_loader_apiLoaded";j.type="text/javascript";document.getElementsByTagName("body")[0].appendChild(j)}};var c=[];var h=function(j){c.push(j)};var f=function(){if(d()){while(c.length>0){var j=c.pop();j()}}};window._google_loader_apiLoaded=function(){f()};var d=function(){return(window.google&&google.loader)};var g=function(j){if(d()){return true}h(j);e();return false};e();return{shim:true,type:"ClientLocation",lastPosition:null,getCurrentPosition:function(k,n,o){var m=this;if(!g(function(){m.getCurrentPosition(k,n,o)})){return}if(google.loader.ClientLocation){var l=google.loader.ClientLocation;var j={coords:{latitude:l.latitude,longitude:l.longitude,altitude:null,accuracy:43000,altitudeAccuracy:null,heading:null,speed:null},address:{city:l.address.city,country:l.address.country,country_code:l.address.country_code,region:l.address.region},timestamp:new Date()};k(j);this.lastPosition=j}else{if(n==="function"){n({code:3,message:"Using the Google ClientLocation API and it is not able to calculate a location."})}}},watchPosition:function(j,l,m){this.getCurrentPosition(j,l,m);var k=this;var n=setInterval(function(){k.getCurrentPosition(j,l,m)},10000);return n},clearWatch:function(j){clearInterval(j)},getPermission:function(l,j,k){return true}}});navigator.geolocation=(window.google&&google.gears)?a():b()})()};
\ No newline at end of file
diff --git a/lib/disfavorform.php b/lib/disfavorform.php
index 3a1c7d17fb..9d0e39784e 100644
--- a/lib/disfavorform.php
+++ b/lib/disfavorform.php
@@ -147,6 +147,6 @@ class DisfavorForm extends Form
      */
     function formClass()
     {
-        return 'form_disfavor';
+        return 'form_disfavor ajax';
     }
 }
diff --git a/lib/favorform.php b/lib/favorform.php
index 956cc896a2..c07ba6df59 100644
--- a/lib/favorform.php
+++ b/lib/favorform.php
@@ -146,6 +146,6 @@ class FavorForm extends Form
      */
     function formClass()
     {
-        return 'form_favor';
+        return 'form_favor ajax';
     }
 }
diff --git a/lib/form.php b/lib/form.php
index f6501dc6da..74737f6df5 100644
--- a/lib/form.php
+++ b/lib/form.php
@@ -172,7 +172,13 @@ class Form extends Widget
     }
 
     /**
-     * Class of the form.
+     * Class of the form. May include space-separated list of multiple classes.
+     *
+     * If 'ajax' is included, the form will automatically be submitted with
+     * an 'ajax=1' parameter added, and the resulting form or error message
+     * will replace the form after submission.
+     *
+     * It's up to you to make sure that the target action supports this!
      *
      * @return string the form's class
      */
diff --git a/lib/joinform.php b/lib/joinform.php
index aa8bc20e24..0918133a55 100644
--- a/lib/joinform.php
+++ b/lib/joinform.php
@@ -88,7 +88,7 @@ class JoinForm extends Form
 
     function formClass()
     {
-        return 'form_group_join';
+        return 'form_group_join ajax';
     }
 
     /**
diff --git a/lib/leaveform.php b/lib/leaveform.php
index 5469b5704c..34671f5f8d 100644
--- a/lib/leaveform.php
+++ b/lib/leaveform.php
@@ -88,7 +88,7 @@ class LeaveForm extends Form
 
     function formClass()
     {
-        return 'form_group_leave';
+        return 'form_group_leave ajax';
     }
 
     /**
diff --git a/lib/nudgeform.php b/lib/nudgeform.php
index 3f13b58462..18a008122d 100644
--- a/lib/nudgeform.php
+++ b/lib/nudgeform.php
@@ -89,7 +89,7 @@ class NudgeForm extends Form
 
     function formClass()
     {
-        return 'form_user_nudge';
+        return 'form_user_nudge ajax';
     }
 
 
diff --git a/lib/subscribeform.php b/lib/subscribeform.php
index ae2a6db61c..1cc5b4e48e 100644
--- a/lib/subscribeform.php
+++ b/lib/subscribeform.php
@@ -89,7 +89,7 @@ class SubscribeForm extends Form
 
     function formClass()
     {
-        return 'form_user_subscribe';
+        return 'form_user_subscribe ajax';
     }
 
 
diff --git a/lib/unsubscribeform.php b/lib/unsubscribeform.php
index cb6a87515f..a8e6915d6c 100644
--- a/lib/unsubscribeform.php
+++ b/lib/unsubscribeform.php
@@ -89,7 +89,7 @@ class UnsubscribeForm extends Form
 
     function formClass()
     {
-        return 'form_user_unsubscribe';
+        return 'form_user_unsubscribe ajax';
     }
 
     /**
diff --git a/plugins/UserFlag/UserFlagPlugin.php b/plugins/UserFlag/UserFlagPlugin.php
index 52b1fc299e..42a8948dff 100644
--- a/plugins/UserFlag/UserFlagPlugin.php
+++ b/plugins/UserFlag/UserFlagPlugin.php
@@ -180,21 +180,6 @@ class UserFlagPlugin extends Plugin
         }
     }
 
-    /**
-     * Initialize any flagging buttons on the page
-     *
-     * @param Action $action action being shown
-     *
-     * @return boolean hook result
-     */
-    function onEndShowScripts($action)
-    {
-        $action->inlineScript('if ($(".form_entity_flag").length > 0) { '.
-                              '$(".form_entity_flag").bind("click", function() {'.
-                              'SN.U.FormXHR($(this)); return false; }); }');
-        return true;
-    }
-
     /**
      * Check whether a user has one of our defined rights
      *
diff --git a/plugins/UserFlag/flagprofileform.php b/plugins/UserFlag/flagprofileform.php
index 045c9de852..acb47629e2 100644
--- a/plugins/UserFlag/flagprofileform.php
+++ b/plugins/UserFlag/flagprofileform.php
@@ -54,7 +54,7 @@ class FlagProfileForm extends ProfileActionForm
      */
     function formClass()
     {
-        return 'form_entity_flag';
+        return 'form_entity_flag ajax';
     }
 
     /**

From cbf16a4974564fc33e31efe686393bb2f007e03b Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Tue, 8 Mar 2011 15:10:30 -0800
Subject: [PATCH 454/655] Bookmark and poll plugins' custom notice forms now do
 AJAX submit, with the resulting notice appearing in the timeline.

FormNoticeXHR now is triggered on any form labeled with class 'ajax-notice', so those other than the traditional notice form should work as long as they handle the AJAX submission and return a properly formatted notice.

Things to watch out for:
* to determine whether the resulting notice should show on the current timeline, the JS code needs to be able to check the author and such. Keeping the existing vcard bits helps for this!
* the notice form submission stuff clears out inputs from your form -- test to make sure this behaves correctly
* error messages returned from the thingy _should_ come through, but this needs more testing for consistency
* while form components that aren't in a custom form should just be ignored, this should be tested more. (eg there's no location or attachment box for poll or bookmark plugins)
* NoticeListItem isn't currently reachable via autoloader -- touch NoticeList explicitly before calling into it for now.
---
 js/util.js                          |  4 ++--
 js/util.min.js                      |  2 +-
 lib/noticeform.php                  |  2 +-
 plugins/Bookmark/BookmarkPlugin.php |  7 ++++--
 plugins/Bookmark/bookmarkform.php   |  2 +-
 plugins/Bookmark/newbookmark.php    | 35 ++++++++++++++++++++++++++-
 plugins/Poll/Poll.php               |  1 +
 plugins/Poll/newpoll.php            | 37 +++++++++++++++++++++++++++--
 plugins/Poll/newpollform.php        |  2 +-
 9 files changed, 81 insertions(+), 11 deletions(-)

diff --git a/js/util.js b/js/util.js
index dcb8da4600..6bba34fae6 100644
--- a/js/util.js
+++ b/js/util.js
@@ -1263,7 +1263,7 @@ var SN = { // StatusNet
 
             var profileLink = $('#nav_profile a').attr('href');
             if (profileLink) {
-                var authorUrl = $(notice).find('.entry-title .author a.url').attr('href');
+                var authorUrl = $(notice).find('.vcard.author a.url').attr('href');
                 if (authorUrl == profileLink) {
                     if (action == 'all' || action == 'showstream') {
                         // Posts always show on your own friends and profile streams.
@@ -1301,7 +1301,7 @@ var SN = { // StatusNet
          */
         NoticeForm: function() {
             if ($('body.user_in').length > 0) {
-                $('.'+SN.C.S.FormNotice).each(function() {
+                $('.ajax-notice').each(function() {
                     var form = $(this);
                     SN.U.NoticeLocationAttach(form);
                     SN.U.FormNoticeXHR(form);
diff --git a/js/util.min.js b/js/util.min.js
index 5e08cc78b5..88db1a1ac6 100644
--- a/js/util.min.js
+++ b/js/util.min.js
@@ -1 +1 @@
-var SN={C:{I:{CounterBlackout:false,MaxLength:140,PatternUsername:/^[0-9a-zA-Z\-_.]*$/,HTTP20x30x:[200,201,202,203,204,205,206,300,301,302,303,304,305,306,307],NoticeFormMaster:null},S:{Disabled:"disabled",Warning:"warning",Error:"error",Success:"success",Processing:"processing",CommandResult:"command_result",FormNotice:"form_notice",NoticeDataGeo:"notice_data-geo",NoticeDataGeoCookie:"NoticeDataGeo",NoticeDataGeoSelected:"notice_data-geo_selected",StatusNetInstance:"StatusNetInstance"}},messages:{},msg:function(a){if(typeof SN.messages[a]=="undefined"){return"["+a+"]"}else{return SN.messages[a]}},U:{FormNoticeEnhancements:function(b){if(jQuery.data(b[0],"ElementData")===undefined){MaxLength=b.find(".count").text();if(typeof(MaxLength)=="undefined"){MaxLength=SN.C.I.MaxLength}jQuery.data(b[0],"ElementData",{MaxLength:MaxLength});SN.U.Counter(b);NDT=b.find("[name=status_textarea]");NDT.bind("keyup",function(c){SN.U.Counter(b)});var a=function(c){window.setTimeout(function(){SN.U.Counter(b)},50)};NDT.bind("cut",a).bind("paste",a)}else{b.find(".count").text(jQuery.data(b[0],"ElementData").MaxLength)}},Counter:function(d){SN.C.I.FormNoticeCurrent=d;var b=jQuery.data(d[0],"ElementData").MaxLength;if(b<=0){return}var c=b-SN.U.CharacterCount(d);var a=d.find(".count");if(c.toString()!=a.text()){if(!SN.C.I.CounterBlackout||c===0){if(a.text()!=String(c)){a.text(c)}if(c<0){d.addClass(SN.C.S.Warning)}else{d.removeClass(SN.C.S.Warning)}if(!SN.C.I.CounterBlackout){SN.C.I.CounterBlackout=true;SN.C.I.FormNoticeCurrent=d;window.setTimeout("SN.U.ClearCounterBlackout(SN.C.I.FormNoticeCurrent);",500)}}}},CharacterCount:function(a){return a.find("[name=status_textarea]").val().length},ClearCounterBlackout:function(a){SN.C.I.CounterBlackout=false;SN.U.Counter(a)},RewriteAjaxAction:function(a){if(document.location.protocol=="https:"&&a.substr(0,5)=="http:"){return a.replace(/^http:\/\/[^:\/]+/,"https://"+document.location.host)}else{return a}},FormXHR:function(a){$.ajax({type:"POST",dataType:"xml",url:SN.U.RewriteAjaxAction(a.attr("action")),data:a.serialize()+"&ajax=1",beforeSend:function(b){a.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(c,d,b){alert(b||d)},success:function(b,c){if(typeof($("form",b)[0])!="undefined"){form_new=document._importNode($("form",b)[0],true);a.replaceWith(form_new)}else{a.replaceWith(document._importNode($("p",b)[0],true))}}})},FormNoticeXHR:function(b){SN.C.I.NoticeDataGeo={};b.append('<input type="hidden" name="ajax" value="1"/>');b.attr("action",SN.U.RewriteAjaxAction(b.attr("action")));var c=function(d,e){b.append($('<p class="form_response"></p>').addClass(d).text(e))};var a=function(){b.find(".form_response").remove()};b.ajaxForm({dataType:"xml",timeout:"60000",beforeSend:function(d){if(b.find("[name=status_textarea]").val()==""){b.addClass(SN.C.S.Warning);return false}b.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled);SN.U.normalizeGeoData(b);return true},error:function(f,g,e){b.removeClass(SN.C.S.Processing).find(".submit").removeClass(SN.C.S.Disabled).removeAttr(SN.C.S.Disabled,SN.C.S.Disabled);a();if(g=="timeout"){c("error","Sorry! We had trouble sending your notice. The servers are overloaded. Please try again, and contact the site administrator if this problem persists.")}else{var d=SN.U.GetResponseXML(f);if($("."+SN.C.S.Error,d).length>0){b.append(document._importNode($("."+SN.C.S.Error,d)[0],true))}else{if(parseInt(f.status)===0||jQuery.inArray(parseInt(f.status),SN.C.I.HTTP20x30x)>=0){b.resetForm().find(".attach-status").remove();SN.U.FormNoticeEnhancements(b)}else{c("error","(Sorry! We had trouble sending your notice ("+f.status+" "+f.statusText+"). Please report the problem to the site administrator if this happens again.")}}}},success:function(i,f){a();var n=$("#"+SN.C.S.Error,i);if(n.length>0){c("error",n.text())}else{if($("body")[0].id=="bookmarklet"){self.close()}var d=$("#"+SN.C.S.CommandResult,i);if(d.length>0){c("success",d.text())}else{var m=document._importNode($("li",i)[0],true);var k=$("#notices_primary .notices:first");var l=b.closest("li.notice-reply");if(l.length>0){var e=$(m).attr("id");if($("#"+e).length==0){var j=l.closest("li.notice");l.replaceWith(m);SN.U.NoticeInlineReplyPlaceholder(j)}else{l.remove()}}else{if(k.length>0&&SN.U.belongsOnTimeline(m)){if($("#"+m.id).length===0){var h=b.find("[name=inreplyto]").val();var g="#notices_primary #notice-"+h;if($("body")[0].id=="conversation"){if(h.length>0&&$(g+" .notices").length<1){$(g).append('<ul class="notices"></ul>')}$($(g+" .notices")[0]).append(m)}else{k.prepend(m)}$("#"+m.id).css({display:"none"}).fadeIn(2500);SN.U.NoticeWithAttachment($("#"+m.id));SN.U.NoticeReplyTo($("#"+m.id))}}else{c("success",$("title",i).text())}}}b.resetForm();b.find("[name=inreplyto]").val("");b.find(".attach-status").remove();SN.U.FormNoticeEnhancements(b)}},complete:function(d,e){b.removeClass(SN.C.S.Processing).find(".submit").removeAttr(SN.C.S.Disabled).removeClass(SN.C.S.Disabled);b.find("[name=lat]").val(SN.C.I.NoticeDataGeo.NLat);b.find("[name=lon]").val(SN.C.I.NoticeDataGeo.NLon);b.find("[name=location_ns]").val(SN.C.I.NoticeDataGeo.NLNS);b.find("[name=location_id]").val(SN.C.I.NoticeDataGeo.NLID);b.find("[name=notice_data-geo]").attr("checked",SN.C.I.NoticeDataGeo.NDG)}})},normalizeGeoData:function(a){SN.C.I.NoticeDataGeo.NLat=a.find("[name=lat]").val();SN.C.I.NoticeDataGeo.NLon=a.find("[name=lon]").val();SN.C.I.NoticeDataGeo.NLNS=a.find("[name=location_ns]").val();SN.C.I.NoticeDataGeo.NLID=a.find("[name=location_id]").val();SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked");var b=$.cookie(SN.C.S.NoticeDataGeoCookie);if(b!==null&&b!="disabled"){b=JSON.parse(b);SN.C.I.NoticeDataGeo.NLat=a.find("[name=lat]").val(b.NLat).val();SN.C.I.NoticeDataGeo.NLon=a.find("[name=lon]").val(b.NLon).val();if(b.NLNS){SN.C.I.NoticeDataGeo.NLNS=a.find("[name=location_ns]").val(b.NLNS).val();SN.C.I.NoticeDataGeo.NLID=a.find("[name=location_id]").val(b.NLID).val()}else{a.find("[name=location_ns]").val("");a.find("[name=location_id]").val("")}}if(b=="disabled"){SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked",false).attr("checked")}else{SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked",true).attr("checked")}},GetResponseXML:function(b){try{return b.responseXML}catch(a){return(new DOMParser()).parseFromString(b.responseText,"text/xml")}},NoticeReply:function(){if($("#content .notice_reply").length>0){$("#content .notice").each(function(){SN.U.NoticeReplyTo($(this))})}},NoticeReplyTo:function(a){a.find(".notice_reply").live("click",function(c){c.preventDefault();var b=($(".author .nickname",a).length>0)?$($(".author .nickname",a)[0]):$(".author .nickname.uid");SN.U.NoticeInlineReplyTrigger(a,"@"+b.text());return false})},NoticeInlineReplyTrigger:function(h,i){var b=$($(".notice_id",h)[0]).text();var e=h;var f=h.closest(".notices");if(f.hasClass("threaded-replies")){e=f.closest(".notice")}else{f=$("ul.threaded-replies",h);if(f.length==0){f=$('<ul class="notices threaded-replies xoxo"></ul>');h.append(f)}}var j=$(".notice-reply-form",f);var d=function(){j.find("input[name=inreplyto]").val(b);var m=j.find("textarea");if(m.length==0){throw"No textarea"}var l="";if(i){l=i+" "}m.val(l+m.val().replace(RegExp(l,"i"),""));m.data("initialText",$.trim(i+""));m.focus();if(m[0].setSelectionRange){var k=m.val().length;m[0].setSelectionRange(k,k)}};if(j.length>0){d()}else{$("li.notice-reply-placeholder").remove();var g=$("li.notice-reply",f);if(g.length==0){g=$('<li class="notice-reply"></li>');var c=function(k){var l=document._importNode(k,true);g.append(l);f.append(g);var m=j=$(l);SN.U.NoticeLocationAttach(m);SN.U.FormNoticeXHR(m);SN.U.FormNoticeEnhancements(m);SN.U.NoticeDataAttach(m);d()};if(SN.C.I.NoticeFormMaster){c(SN.C.I.NoticeFormMaster)}else{var a=$("#form_notice").attr("action");$.get(a,{ajax:1},function(k,m,l){c($("form",k)[0])})}}}},NoticeInlineReplyPlaceholder:function(b){var a=b.find("ul.threaded-replies");var c=$('<li class="notice-reply-placeholder"><input class="placeholder"></li>');c.click(function(){SN.U.NoticeInlineReplyTrigger(b)});c.find("input").val(SN.msg("reply_placeholder"));a.append(c)},NoticeInlineReplySetup:function(){$(".threaded-replies").each(function(){var b=$(this);var a=b.closest(".notice");SN.U.NoticeInlineReplyPlaceholder(a)})},NoticeRepeat:function(){$(".form_repeat").live("click",function(a){a.preventDefault();SN.U.NoticeRepeatConfirmation($(this));return false})},NoticeRepeatConfirmation:function(a){var c=a.find(".submit");var b=c.clone();b.addClass("submit_dialogbox").removeClass("submit");a.append(b);b.bind("click",function(){SN.U.FormXHR(a);return false});c.hide();a.addClass("dialogbox").append('<button class="close">&#215;</button>').closest(".notice-options").addClass("opaque");a.find("button.close").click(function(){$(this).remove();a.removeClass("dialogbox").closest(".notice-options").removeClass("opaque");a.find(".submit_dialogbox").remove();a.find(".submit").show();return false})},NoticeAttachments:function(){$(".notice a.attachment").each(function(){SN.U.NoticeWithAttachment($(this).closest(".notice"))})},NoticeWithAttachment:function(b){if(b.find(".attachment").length===0){return}var a=b.find(".attachment.more");if(a.length>0){$(a[0]).click(function(){var c=$(this);c.addClass(SN.C.S.Processing);$.get(c.attr("href")+"/ajax",null,function(d){c.parent(".entry-content").html($(d).find("#attachment_view .entry-content").html())});return false}).attr("title",SN.msg("showmore_tooltip"))}},NoticeDataAttach:function(b){var a=b.find("input[type=file]");a.change(function(f){b.find(".attach-status").remove();var d=$(this).val();if(!d){return false}var c=$('<div class="attach-status '+SN.C.S.Success+'"><code></code> <button class="close">&#215;</button></div>');c.find("code").text(d);c.find("button").click(function(){c.remove();a.val("");return false});b.append(c);if(typeof this.files=="object"){for(var e=0;e<this.files.length;e++){SN.U.PreviewAttach(b,this.files[e])}}})},maxFileSize:function(b){var a=$(b).find("input[name=MAX_FILE_SIZE]").attr("value");if(a){return parseInt(a)}else{return 0}},PreviewAttach:function(d,c){var e=c.type+" "+Math.round(c.size/1024)+"KB";var f=true;var h;if(typeof window.createObjectURL!="undefined"){h=function(i,j){j(window.createObjectURL(i))}}else{if(typeof window.FileReader!="undefined"){h=function(j,k){var i=new FileReader();i.onload=function(l){k(i.result)};i.readAsDataURL(j)}}else{f=false}}var a=["image/png","image/jpeg","image/gif","image/svg+xml"];if($.inArray(c.type,a)==-1){f=false}var g=8*1024*1024;if(c.size>g){f=false}if(f){h(c,function(j){var i=$("<img>").attr("title",e).attr("alt",e).attr("src",j).attr("style","height: 120px");d.find(".attach-status").append(i)})}else{var b=$("<div></div>").text(e);d.find(".attach-status").append(b)}},NoticeLocationAttach:function(a){var e=a.find("[name=lat]");var k=a.find("[name=lon]");var g=a.find("[name=location_ns]").val();var l=a.find("[name=location_id]").val();var b="";var d=a.find("[name=notice_data-geo]");var c=a.find("[name=notice_data-geo]");var j=a.find("label.notice_data-geo");function f(n){j.attr("title",jQuery.trim(j.text())).removeClass("checked");a.find("[name=lat]").val("");a.find("[name=lon]").val("");a.find("[name=location_ns]").val("");a.find("[name=location_id]").val("");a.find("[name=notice_data-geo]").attr("checked",false);$.cookie(SN.C.S.NoticeDataGeoCookie,"disabled",{path:"/"});if(n){a.find(".geo_status_wrapper").removeClass("success").addClass("error");a.find(".geo_status_wrapper .geo_status").text(n)}else{a.find(".geo_status_wrapper").remove()}}function m(n,o){SN.U.NoticeGeoStatus(a,"Looking up place name...");$.getJSON(n,o,function(p){var q,r;if(typeof(p.location_ns)!="undefined"){a.find("[name=location_ns]").val(p.location_ns);q=p.location_ns}if(typeof(p.location_id)!="undefined"){a.find("[name=location_id]").val(p.location_id);r=p.location_id}if(typeof(p.name)=="undefined"){NLN_text=o.lat+";"+o.lon}else{NLN_text=p.name}SN.U.NoticeGeoStatus(a,NLN_text,o.lat,o.lon,p.url);j.attr("title",NoticeDataGeo_text.ShareDisable+" ("+NLN_text+")");a.find("[name=lat]").val(o.lat);a.find("[name=lon]").val(o.lon);a.find("[name=location_ns]").val(q);a.find("[name=location_id]").val(r);a.find("[name=notice_data-geo]").attr("checked",true);var s={NLat:o.lat,NLon:o.lon,NLNS:q,NLID:r,NLN:NLN_text,NLNU:p.url,NDG:true};$.cookie(SN.C.S.NoticeDataGeoCookie,JSON.stringify(s),{path:"/"})})}if(c.length>0){if($.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){c.attr("checked",false)}else{c.attr("checked",true)}var h=a.find(".notice_data-geo_wrap");var i=h.attr("title");h.removeAttr("title");j.attr("title",j.text());c.change(function(){if(c.attr("checked")===true||$.cookie(SN.C.S.NoticeDataGeoCookie)===null){j.attr("title",NoticeDataGeo_text.ShareDisable).addClass("checked");if($.cookie(SN.C.S.NoticeDataGeoCookie)===null||$.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){if(navigator.geolocation){SN.U.NoticeGeoStatus(a,"Requesting location from browser...");navigator.geolocation.getCurrentPosition(function(p){a.find("[name=lat]").val(p.coords.latitude);a.find("[name=lon]").val(p.coords.longitude);var q={lat:p.coords.latitude,lon:p.coords.longitude,token:$("#token").val()};m(i,q)},function(p){switch(p.code){case p.PERMISSION_DENIED:f("Location permission denied.");break;case p.TIMEOUT:f("Location lookup timeout.");break}},{timeout:10000})}else{if(e.length>0&&k.length>0){var n={lat:e,lon:k,token:$("#token").val()};m(i,n)}else{f();c.remove();j.remove()}}}else{var o=JSON.parse($.cookie(SN.C.S.NoticeDataGeoCookie));a.find("[name=lat]").val(o.NLat);a.find("[name=lon]").val(o.NLon);a.find("[name=location_ns]").val(o.NLNS);a.find("[name=location_id]").val(o.NLID);a.find("[name=notice_data-geo]").attr("checked",o.NDG);SN.U.NoticeGeoStatus(a,o.NLN,o.NLat,o.NLon,o.NLNU);j.attr("title",NoticeDataGeo_text.ShareDisable+" ("+o.NLN+")").addClass("checked")}}else{f()}}).change()}},NoticeGeoStatus:function(e,a,f,g,c){var h=e.find(".geo_status_wrapper");if(h.length==0){h=$('<div class="'+SN.C.S.Success+' geo_status_wrapper"><button class="close" style="float:right">&#215;</button><div class="geo_status"></div></div>');h.find("button.close").click(function(){e.find("[name=notice_data-geo]").removeAttr("checked").change()});e.append(h)}var b;if(c){b=$("<a></a>").attr("href",c)}else{b=$("<span></span>")}b.text(a);if(f||g){var d=f+";"+g;b.attr("title",d);if(!a){b.text(d)}}h.find(".geo_status").empty().append(b)},NewDirectMessage:function(){NDM=$(".entity_send-a-message a");NDM.attr({href:NDM.attr("href")+"&ajax=1"});NDM.bind("click",function(){var a=$(".entity_send-a-message form");if(a.length===0){$(this).addClass(SN.C.S.Processing);$.get(NDM.attr("href"),null,function(b){$(".entity_send-a-message").append(document._importNode($("form",b)[0],true));a=$(".entity_send-a-message .form_notice");SN.U.FormNoticeXHR(a);SN.U.FormNoticeEnhancements(a);a.append('<button class="close">&#215;</button>');$(".entity_send-a-message button").click(function(){a.hide();return false});NDM.removeClass(SN.C.S.Processing)})}else{a.show();$(".entity_send-a-message textarea").focus()}return false})},GetFullYear:function(c,d,a){var b=new Date();b.setFullYear(c,d,a);return b},StatusNetInstance:{Set:function(b){var a=SN.U.StatusNetInstance.Get();if(a!==null){b=$.extend(a,b)}$.cookie(SN.C.S.StatusNetInstance,JSON.stringify(b),{path:"/",expires:SN.U.GetFullYear(2029,0,1)})},Get:function(){var a=$.cookie(SN.C.S.StatusNetInstance);if(a!==null){return JSON.parse(a)}return null},Delete:function(){$.cookie(SN.C.S.StatusNetInstance,null)}},belongsOnTimeline:function(b){var a=$("body").attr("id");if(a=="public"){return true}var c=$("#nav_profile a").attr("href");if(c){var d=$(b).find(".entry-title .author a.url").attr("href");if(d==c){if(a=="all"||a=="showstream"){return true}}}return false},switchInputFormTab:function(a){$(".input_form_nav_tab.current").removeClass("current");$("#input_form_nav_"+a).addClass("current");$(".input_form.current").removeClass("current");$("#input_form_"+a).addClass("current")}},Init:{NoticeForm:function(){if($("body.user_in").length>0){$("."+SN.C.S.FormNotice).each(function(){var a=$(this);SN.U.NoticeLocationAttach(a);SN.U.FormNoticeXHR(a);SN.U.FormNoticeEnhancements(a);SN.U.NoticeDataAttach(a)})}},Notices:function(){if($("body.user_in").length>0){var a=$(".form_notice:first");if(a.length>0){SN.C.I.NoticeFormMaster=document._importNode(a[0],true)}SN.U.NoticeRepeat();SN.U.NoticeReply();SN.U.NoticeInlineReplySetup()}SN.U.NoticeAttachments()},EntityActions:function(){if($("body.user_in").length>0){SN.U.NewDirectMessage()}},Login:function(){if(SN.U.StatusNetInstance.Get()!==null){var a=SN.U.StatusNetInstance.Get().Nickname;if(a!==null){$("#form_login #nickname").val(a)}}$("#form_login").bind("submit",function(){SN.U.StatusNetInstance.Set({Nickname:$("#form_login #nickname").val()});return true})},AjaxForms:function(){$("form.ajax").live("submit",function(){SN.U.FormXHR($(this));return false})},UploadForms:function(){$("input[type=file]").change(function(d){if(typeof this.files=="object"&&this.files.length>0){var c=0;for(var b=0;b<this.files.length;b++){c+=this.files[b].size}var a=SN.U.maxFileSize($(this.form));if(a>0&&c>a){var e="File too large: maximum upload size is %d bytes.";alert(e.replace("%d",a));$(this).val("");d.preventDefault();return false}}})}}};$(document).ready(function(){SN.Init.AjaxForms();SN.Init.UploadForms();if($("."+SN.C.S.FormNotice).length>0){SN.Init.NoticeForm()}if($("#content .notices").length>0){SN.Init.Notices()}if($("#content .entity_actions").length>0){SN.Init.EntityActions()}if($("#form_login").length>0){SN.Init.Login()}});if(!document.ELEMENT_NODE){document.ELEMENT_NODE=1;document.ATTRIBUTE_NODE=2;document.TEXT_NODE=3;document.CDATA_SECTION_NODE=4;document.ENTITY_REFERENCE_NODE=5;document.ENTITY_NODE=6;document.PROCESSING_INSTRUCTION_NODE=7;document.COMMENT_NODE=8;document.DOCUMENT_NODE=9;document.DOCUMENT_TYPE_NODE=10;document.DOCUMENT_FRAGMENT_NODE=11;document.NOTATION_NODE=12}document._importNode=function(e,a){switch(e.nodeType){case document.ELEMENT_NODE:var d=document.createElement(e.nodeName);if(e.attributes&&e.attributes.length>0){for(var c=0,b=e.attributes.length;c<b;){if(e.attributes[c].nodeName=="class"){d.className=e.getAttribute(e.attributes[c++].nodeName)}else{d.setAttribute(e.attributes[c].nodeName,e.getAttribute(e.attributes[c++].nodeName))}}}if(a&&e.childNodes&&e.childNodes.length>0){for(var c=0,b=e.childNodes.length;c<b;){d.appendChild(document._importNode(e.childNodes[c++],a))}}return d;break;case document.TEXT_NODE:case document.CDATA_SECTION_NODE:case document.COMMENT_NODE:return document.createTextNode(e.nodeValue);break}};if(typeof navigator.geolocation=="undefined"||navigator.geolocation.shim){(function(){(function(){if(window.google&&google.gears){return}var c=null;if(typeof GearsFactory!="undefined"){c=new GearsFactory()}else{try{c=new ActiveXObject("Gears.Factory");if(c.getBuildInfo().indexOf("ie_mobile")!=-1){c.privateSetGlobalObject(this)}}catch(d){if((typeof navigator.mimeTypes!="undefined")&&navigator.mimeTypes["application/x-googlegears"]){c=document.createElement("object");c.style.display="none";c.width=0;c.height=0;c.type="application/x-googlegears";document.documentElement.appendChild(c)}}}if(!c){return}if(!window.google){google={}}if(!google.gears){google.gears={factory:c}}})();var a=(function(){var d=google.gears.factory.create("beta.geolocation");var c=function(f,e){return function(g){f(g);e.lastPosition=g}};return{shim:true,type:"Gears",lastPosition:null,getCurrentPosition:function(e,g,h){var f=this;var i=c(e,f);d.getCurrentPosition(i,g,h)},watchPosition:function(e,f,g){d.watchPosition(e,f,g)},clearWatch:function(e){d.clearWatch(e)},getPermission:function(g,e,f){d.getPermission(g,e,f)}}});var b=(function(){var i=false;var e=function(){if(!d()&&!i){i=true;var j=document.createElement("script");j.src=(document.location.protocol=="https:"?"https://":"http://")+"www.google.com/jsapi?callback=_google_loader_apiLoaded";j.type="text/javascript";document.getElementsByTagName("body")[0].appendChild(j)}};var c=[];var h=function(j){c.push(j)};var f=function(){if(d()){while(c.length>0){var j=c.pop();j()}}};window._google_loader_apiLoaded=function(){f()};var d=function(){return(window.google&&google.loader)};var g=function(j){if(d()){return true}h(j);e();return false};e();return{shim:true,type:"ClientLocation",lastPosition:null,getCurrentPosition:function(k,n,o){var m=this;if(!g(function(){m.getCurrentPosition(k,n,o)})){return}if(google.loader.ClientLocation){var l=google.loader.ClientLocation;var j={coords:{latitude:l.latitude,longitude:l.longitude,altitude:null,accuracy:43000,altitudeAccuracy:null,heading:null,speed:null},address:{city:l.address.city,country:l.address.country,country_code:l.address.country_code,region:l.address.region},timestamp:new Date()};k(j);this.lastPosition=j}else{if(n==="function"){n({code:3,message:"Using the Google ClientLocation API and it is not able to calculate a location."})}}},watchPosition:function(j,l,m){this.getCurrentPosition(j,l,m);var k=this;var n=setInterval(function(){k.getCurrentPosition(j,l,m)},10000);return n},clearWatch:function(j){clearInterval(j)},getPermission:function(l,j,k){return true}}});navigator.geolocation=(window.google&&google.gears)?a():b()})()};
\ No newline at end of file
+var SN={C:{I:{CounterBlackout:false,MaxLength:140,PatternUsername:/^[0-9a-zA-Z\-_.]*$/,HTTP20x30x:[200,201,202,203,204,205,206,300,301,302,303,304,305,306,307],NoticeFormMaster:null},S:{Disabled:"disabled",Warning:"warning",Error:"error",Success:"success",Processing:"processing",CommandResult:"command_result",FormNotice:"form_notice",NoticeDataGeo:"notice_data-geo",NoticeDataGeoCookie:"NoticeDataGeo",NoticeDataGeoSelected:"notice_data-geo_selected",StatusNetInstance:"StatusNetInstance"}},messages:{},msg:function(a){if(typeof SN.messages[a]=="undefined"){return"["+a+"]"}else{return SN.messages[a]}},U:{FormNoticeEnhancements:function(b){if(jQuery.data(b[0],"ElementData")===undefined){MaxLength=b.find(".count").text();if(typeof(MaxLength)=="undefined"){MaxLength=SN.C.I.MaxLength}jQuery.data(b[0],"ElementData",{MaxLength:MaxLength});SN.U.Counter(b);NDT=b.find("[name=status_textarea]");NDT.bind("keyup",function(c){SN.U.Counter(b)});var a=function(c){window.setTimeout(function(){SN.U.Counter(b)},50)};NDT.bind("cut",a).bind("paste",a)}else{b.find(".count").text(jQuery.data(b[0],"ElementData").MaxLength)}},Counter:function(d){SN.C.I.FormNoticeCurrent=d;var b=jQuery.data(d[0],"ElementData").MaxLength;if(b<=0){return}var c=b-SN.U.CharacterCount(d);var a=d.find(".count");if(c.toString()!=a.text()){if(!SN.C.I.CounterBlackout||c===0){if(a.text()!=String(c)){a.text(c)}if(c<0){d.addClass(SN.C.S.Warning)}else{d.removeClass(SN.C.S.Warning)}if(!SN.C.I.CounterBlackout){SN.C.I.CounterBlackout=true;SN.C.I.FormNoticeCurrent=d;window.setTimeout("SN.U.ClearCounterBlackout(SN.C.I.FormNoticeCurrent);",500)}}}},CharacterCount:function(a){return a.find("[name=status_textarea]").val().length},ClearCounterBlackout:function(a){SN.C.I.CounterBlackout=false;SN.U.Counter(a)},RewriteAjaxAction:function(a){if(document.location.protocol=="https:"&&a.substr(0,5)=="http:"){return a.replace(/^http:\/\/[^:\/]+/,"https://"+document.location.host)}else{return a}},FormXHR:function(a){$.ajax({type:"POST",dataType:"xml",url:SN.U.RewriteAjaxAction(a.attr("action")),data:a.serialize()+"&ajax=1",beforeSend:function(b){a.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(c,d,b){alert(b||d)},success:function(b,c){if(typeof($("form",b)[0])!="undefined"){form_new=document._importNode($("form",b)[0],true);a.replaceWith(form_new)}else{a.replaceWith(document._importNode($("p",b)[0],true))}}})},FormNoticeXHR:function(b){SN.C.I.NoticeDataGeo={};b.append('<input type="hidden" name="ajax" value="1"/>');b.attr("action",SN.U.RewriteAjaxAction(b.attr("action")));var c=function(d,e){b.append($('<p class="form_response"></p>').addClass(d).text(e))};var a=function(){b.find(".form_response").remove()};b.ajaxForm({dataType:"xml",timeout:"60000",beforeSend:function(d){if(b.find("[name=status_textarea]").val()==""){b.addClass(SN.C.S.Warning);return false}b.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled);SN.U.normalizeGeoData(b);return true},error:function(f,g,e){b.removeClass(SN.C.S.Processing).find(".submit").removeClass(SN.C.S.Disabled).removeAttr(SN.C.S.Disabled,SN.C.S.Disabled);a();if(g=="timeout"){c("error","Sorry! We had trouble sending your notice. The servers are overloaded. Please try again, and contact the site administrator if this problem persists.")}else{var d=SN.U.GetResponseXML(f);if($("."+SN.C.S.Error,d).length>0){b.append(document._importNode($("."+SN.C.S.Error,d)[0],true))}else{if(parseInt(f.status)===0||jQuery.inArray(parseInt(f.status),SN.C.I.HTTP20x30x)>=0){b.resetForm().find(".attach-status").remove();SN.U.FormNoticeEnhancements(b)}else{c("error","(Sorry! We had trouble sending your notice ("+f.status+" "+f.statusText+"). Please report the problem to the site administrator if this happens again.")}}}},success:function(i,f){a();var n=$("#"+SN.C.S.Error,i);if(n.length>0){c("error",n.text())}else{if($("body")[0].id=="bookmarklet"){self.close()}var d=$("#"+SN.C.S.CommandResult,i);if(d.length>0){c("success",d.text())}else{var m=document._importNode($("li",i)[0],true);var k=$("#notices_primary .notices:first");var l=b.closest("li.notice-reply");if(l.length>0){var e=$(m).attr("id");if($("#"+e).length==0){var j=l.closest("li.notice");l.replaceWith(m);SN.U.NoticeInlineReplyPlaceholder(j)}else{l.remove()}}else{if(k.length>0&&SN.U.belongsOnTimeline(m)){if($("#"+m.id).length===0){var h=b.find("[name=inreplyto]").val();var g="#notices_primary #notice-"+h;if($("body")[0].id=="conversation"){if(h.length>0&&$(g+" .notices").length<1){$(g).append('<ul class="notices"></ul>')}$($(g+" .notices")[0]).append(m)}else{k.prepend(m)}$("#"+m.id).css({display:"none"}).fadeIn(2500);SN.U.NoticeWithAttachment($("#"+m.id));SN.U.NoticeReplyTo($("#"+m.id))}}else{c("success",$("title",i).text())}}}b.resetForm();b.find("[name=inreplyto]").val("");b.find(".attach-status").remove();SN.U.FormNoticeEnhancements(b)}},complete:function(d,e){b.removeClass(SN.C.S.Processing).find(".submit").removeAttr(SN.C.S.Disabled).removeClass(SN.C.S.Disabled);b.find("[name=lat]").val(SN.C.I.NoticeDataGeo.NLat);b.find("[name=lon]").val(SN.C.I.NoticeDataGeo.NLon);b.find("[name=location_ns]").val(SN.C.I.NoticeDataGeo.NLNS);b.find("[name=location_id]").val(SN.C.I.NoticeDataGeo.NLID);b.find("[name=notice_data-geo]").attr("checked",SN.C.I.NoticeDataGeo.NDG)}})},normalizeGeoData:function(a){SN.C.I.NoticeDataGeo.NLat=a.find("[name=lat]").val();SN.C.I.NoticeDataGeo.NLon=a.find("[name=lon]").val();SN.C.I.NoticeDataGeo.NLNS=a.find("[name=location_ns]").val();SN.C.I.NoticeDataGeo.NLID=a.find("[name=location_id]").val();SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked");var b=$.cookie(SN.C.S.NoticeDataGeoCookie);if(b!==null&&b!="disabled"){b=JSON.parse(b);SN.C.I.NoticeDataGeo.NLat=a.find("[name=lat]").val(b.NLat).val();SN.C.I.NoticeDataGeo.NLon=a.find("[name=lon]").val(b.NLon).val();if(b.NLNS){SN.C.I.NoticeDataGeo.NLNS=a.find("[name=location_ns]").val(b.NLNS).val();SN.C.I.NoticeDataGeo.NLID=a.find("[name=location_id]").val(b.NLID).val()}else{a.find("[name=location_ns]").val("");a.find("[name=location_id]").val("")}}if(b=="disabled"){SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked",false).attr("checked")}else{SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked",true).attr("checked")}},GetResponseXML:function(b){try{return b.responseXML}catch(a){return(new DOMParser()).parseFromString(b.responseText,"text/xml")}},NoticeReply:function(){if($("#content .notice_reply").length>0){$("#content .notice").each(function(){SN.U.NoticeReplyTo($(this))})}},NoticeReplyTo:function(a){a.find(".notice_reply").live("click",function(c){c.preventDefault();var b=($(".author .nickname",a).length>0)?$($(".author .nickname",a)[0]):$(".author .nickname.uid");SN.U.NoticeInlineReplyTrigger(a,"@"+b.text());return false})},NoticeInlineReplyTrigger:function(h,i){var b=$($(".notice_id",h)[0]).text();var e=h;var f=h.closest(".notices");if(f.hasClass("threaded-replies")){e=f.closest(".notice")}else{f=$("ul.threaded-replies",h);if(f.length==0){f=$('<ul class="notices threaded-replies xoxo"></ul>');h.append(f)}}var j=$(".notice-reply-form",f);var d=function(){j.find("input[name=inreplyto]").val(b);var m=j.find("textarea");if(m.length==0){throw"No textarea"}var l="";if(i){l=i+" "}m.val(l+m.val().replace(RegExp(l,"i"),""));m.data("initialText",$.trim(i+""));m.focus();if(m[0].setSelectionRange){var k=m.val().length;m[0].setSelectionRange(k,k)}};if(j.length>0){d()}else{$("li.notice-reply-placeholder").remove();var g=$("li.notice-reply",f);if(g.length==0){g=$('<li class="notice-reply"></li>');var c=function(k){var l=document._importNode(k,true);g.append(l);f.append(g);var m=j=$(l);SN.U.NoticeLocationAttach(m);SN.U.FormNoticeXHR(m);SN.U.FormNoticeEnhancements(m);SN.U.NoticeDataAttach(m);d()};if(SN.C.I.NoticeFormMaster){c(SN.C.I.NoticeFormMaster)}else{var a=$("#form_notice").attr("action");$.get(a,{ajax:1},function(k,m,l){c($("form",k)[0])})}}}},NoticeInlineReplyPlaceholder:function(b){var a=b.find("ul.threaded-replies");var c=$('<li class="notice-reply-placeholder"><input class="placeholder"></li>');c.click(function(){SN.U.NoticeInlineReplyTrigger(b)});c.find("input").val(SN.msg("reply_placeholder"));a.append(c)},NoticeInlineReplySetup:function(){$(".threaded-replies").each(function(){var b=$(this);var a=b.closest(".notice");SN.U.NoticeInlineReplyPlaceholder(a)})},NoticeRepeat:function(){$(".form_repeat").live("click",function(a){a.preventDefault();SN.U.NoticeRepeatConfirmation($(this));return false})},NoticeRepeatConfirmation:function(a){var c=a.find(".submit");var b=c.clone();b.addClass("submit_dialogbox").removeClass("submit");a.append(b);b.bind("click",function(){SN.U.FormXHR(a);return false});c.hide();a.addClass("dialogbox").append('<button class="close">&#215;</button>').closest(".notice-options").addClass("opaque");a.find("button.close").click(function(){$(this).remove();a.removeClass("dialogbox").closest(".notice-options").removeClass("opaque");a.find(".submit_dialogbox").remove();a.find(".submit").show();return false})},NoticeAttachments:function(){$(".notice a.attachment").each(function(){SN.U.NoticeWithAttachment($(this).closest(".notice"))})},NoticeWithAttachment:function(b){if(b.find(".attachment").length===0){return}var a=b.find(".attachment.more");if(a.length>0){$(a[0]).click(function(){var c=$(this);c.addClass(SN.C.S.Processing);$.get(c.attr("href")+"/ajax",null,function(d){c.parent(".entry-content").html($(d).find("#attachment_view .entry-content").html())});return false}).attr("title",SN.msg("showmore_tooltip"))}},NoticeDataAttach:function(b){var a=b.find("input[type=file]");a.change(function(f){b.find(".attach-status").remove();var d=$(this).val();if(!d){return false}var c=$('<div class="attach-status '+SN.C.S.Success+'"><code></code> <button class="close">&#215;</button></div>');c.find("code").text(d);c.find("button").click(function(){c.remove();a.val("");return false});b.append(c);if(typeof this.files=="object"){for(var e=0;e<this.files.length;e++){SN.U.PreviewAttach(b,this.files[e])}}})},maxFileSize:function(b){var a=$(b).find("input[name=MAX_FILE_SIZE]").attr("value");if(a){return parseInt(a)}else{return 0}},PreviewAttach:function(d,c){var e=c.type+" "+Math.round(c.size/1024)+"KB";var f=true;var h;if(typeof window.createObjectURL!="undefined"){h=function(i,j){j(window.createObjectURL(i))}}else{if(typeof window.FileReader!="undefined"){h=function(j,k){var i=new FileReader();i.onload=function(l){k(i.result)};i.readAsDataURL(j)}}else{f=false}}var a=["image/png","image/jpeg","image/gif","image/svg+xml"];if($.inArray(c.type,a)==-1){f=false}var g=8*1024*1024;if(c.size>g){f=false}if(f){h(c,function(j){var i=$("<img>").attr("title",e).attr("alt",e).attr("src",j).attr("style","height: 120px");d.find(".attach-status").append(i)})}else{var b=$("<div></div>").text(e);d.find(".attach-status").append(b)}},NoticeLocationAttach:function(a){var e=a.find("[name=lat]");var k=a.find("[name=lon]");var g=a.find("[name=location_ns]").val();var l=a.find("[name=location_id]").val();var b="";var d=a.find("[name=notice_data-geo]");var c=a.find("[name=notice_data-geo]");var j=a.find("label.notice_data-geo");function f(n){j.attr("title",jQuery.trim(j.text())).removeClass("checked");a.find("[name=lat]").val("");a.find("[name=lon]").val("");a.find("[name=location_ns]").val("");a.find("[name=location_id]").val("");a.find("[name=notice_data-geo]").attr("checked",false);$.cookie(SN.C.S.NoticeDataGeoCookie,"disabled",{path:"/"});if(n){a.find(".geo_status_wrapper").removeClass("success").addClass("error");a.find(".geo_status_wrapper .geo_status").text(n)}else{a.find(".geo_status_wrapper").remove()}}function m(n,o){SN.U.NoticeGeoStatus(a,"Looking up place name...");$.getJSON(n,o,function(p){var q,r;if(typeof(p.location_ns)!="undefined"){a.find("[name=location_ns]").val(p.location_ns);q=p.location_ns}if(typeof(p.location_id)!="undefined"){a.find("[name=location_id]").val(p.location_id);r=p.location_id}if(typeof(p.name)=="undefined"){NLN_text=o.lat+";"+o.lon}else{NLN_text=p.name}SN.U.NoticeGeoStatus(a,NLN_text,o.lat,o.lon,p.url);j.attr("title",NoticeDataGeo_text.ShareDisable+" ("+NLN_text+")");a.find("[name=lat]").val(o.lat);a.find("[name=lon]").val(o.lon);a.find("[name=location_ns]").val(q);a.find("[name=location_id]").val(r);a.find("[name=notice_data-geo]").attr("checked",true);var s={NLat:o.lat,NLon:o.lon,NLNS:q,NLID:r,NLN:NLN_text,NLNU:p.url,NDG:true};$.cookie(SN.C.S.NoticeDataGeoCookie,JSON.stringify(s),{path:"/"})})}if(c.length>0){if($.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){c.attr("checked",false)}else{c.attr("checked",true)}var h=a.find(".notice_data-geo_wrap");var i=h.attr("title");h.removeAttr("title");j.attr("title",j.text());c.change(function(){if(c.attr("checked")===true||$.cookie(SN.C.S.NoticeDataGeoCookie)===null){j.attr("title",NoticeDataGeo_text.ShareDisable).addClass("checked");if($.cookie(SN.C.S.NoticeDataGeoCookie)===null||$.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){if(navigator.geolocation){SN.U.NoticeGeoStatus(a,"Requesting location from browser...");navigator.geolocation.getCurrentPosition(function(p){a.find("[name=lat]").val(p.coords.latitude);a.find("[name=lon]").val(p.coords.longitude);var q={lat:p.coords.latitude,lon:p.coords.longitude,token:$("#token").val()};m(i,q)},function(p){switch(p.code){case p.PERMISSION_DENIED:f("Location permission denied.");break;case p.TIMEOUT:f("Location lookup timeout.");break}},{timeout:10000})}else{if(e.length>0&&k.length>0){var n={lat:e,lon:k,token:$("#token").val()};m(i,n)}else{f();c.remove();j.remove()}}}else{var o=JSON.parse($.cookie(SN.C.S.NoticeDataGeoCookie));a.find("[name=lat]").val(o.NLat);a.find("[name=lon]").val(o.NLon);a.find("[name=location_ns]").val(o.NLNS);a.find("[name=location_id]").val(o.NLID);a.find("[name=notice_data-geo]").attr("checked",o.NDG);SN.U.NoticeGeoStatus(a,o.NLN,o.NLat,o.NLon,o.NLNU);j.attr("title",NoticeDataGeo_text.ShareDisable+" ("+o.NLN+")").addClass("checked")}}else{f()}}).change()}},NoticeGeoStatus:function(e,a,f,g,c){var h=e.find(".geo_status_wrapper");if(h.length==0){h=$('<div class="'+SN.C.S.Success+' geo_status_wrapper"><button class="close" style="float:right">&#215;</button><div class="geo_status"></div></div>');h.find("button.close").click(function(){e.find("[name=notice_data-geo]").removeAttr("checked").change()});e.append(h)}var b;if(c){b=$("<a></a>").attr("href",c)}else{b=$("<span></span>")}b.text(a);if(f||g){var d=f+";"+g;b.attr("title",d);if(!a){b.text(d)}}h.find(".geo_status").empty().append(b)},NewDirectMessage:function(){NDM=$(".entity_send-a-message a");NDM.attr({href:NDM.attr("href")+"&ajax=1"});NDM.bind("click",function(){var a=$(".entity_send-a-message form");if(a.length===0){$(this).addClass(SN.C.S.Processing);$.get(NDM.attr("href"),null,function(b){$(".entity_send-a-message").append(document._importNode($("form",b)[0],true));a=$(".entity_send-a-message .form_notice");SN.U.FormNoticeXHR(a);SN.U.FormNoticeEnhancements(a);a.append('<button class="close">&#215;</button>');$(".entity_send-a-message button").click(function(){a.hide();return false});NDM.removeClass(SN.C.S.Processing)})}else{a.show();$(".entity_send-a-message textarea").focus()}return false})},GetFullYear:function(c,d,a){var b=new Date();b.setFullYear(c,d,a);return b},StatusNetInstance:{Set:function(b){var a=SN.U.StatusNetInstance.Get();if(a!==null){b=$.extend(a,b)}$.cookie(SN.C.S.StatusNetInstance,JSON.stringify(b),{path:"/",expires:SN.U.GetFullYear(2029,0,1)})},Get:function(){var a=$.cookie(SN.C.S.StatusNetInstance);if(a!==null){return JSON.parse(a)}return null},Delete:function(){$.cookie(SN.C.S.StatusNetInstance,null)}},belongsOnTimeline:function(b){var a=$("body").attr("id");if(a=="public"){return true}var c=$("#nav_profile a").attr("href");if(c){var d=$(b).find(".vcard.author a.url").attr("href");if(d==c){if(a=="all"||a=="showstream"){return true}}}return false},switchInputFormTab:function(a){$(".input_form_nav_tab.current").removeClass("current");$("#input_form_nav_"+a).addClass("current");$(".input_form.current").removeClass("current");$("#input_form_"+a).addClass("current")}},Init:{NoticeForm:function(){if($("body.user_in").length>0){$(".ajax-notice").each(function(){var a=$(this);SN.U.NoticeLocationAttach(a);SN.U.FormNoticeXHR(a);SN.U.FormNoticeEnhancements(a);SN.U.NoticeDataAttach(a)})}},Notices:function(){if($("body.user_in").length>0){var a=$(".form_notice:first");if(a.length>0){SN.C.I.NoticeFormMaster=document._importNode(a[0],true)}SN.U.NoticeRepeat();SN.U.NoticeReply();SN.U.NoticeInlineReplySetup()}SN.U.NoticeAttachments()},EntityActions:function(){if($("body.user_in").length>0){SN.U.NewDirectMessage()}},Login:function(){if(SN.U.StatusNetInstance.Get()!==null){var a=SN.U.StatusNetInstance.Get().Nickname;if(a!==null){$("#form_login #nickname").val(a)}}$("#form_login").bind("submit",function(){SN.U.StatusNetInstance.Set({Nickname:$("#form_login #nickname").val()});return true})},AjaxForms:function(){$("form.ajax").live("submit",function(){SN.U.FormXHR($(this));return false})},UploadForms:function(){$("input[type=file]").change(function(d){if(typeof this.files=="object"&&this.files.length>0){var c=0;for(var b=0;b<this.files.length;b++){c+=this.files[b].size}var a=SN.U.maxFileSize($(this.form));if(a>0&&c>a){var e="File too large: maximum upload size is %d bytes.";alert(e.replace("%d",a));$(this).val("");d.preventDefault();return false}}})}}};$(document).ready(function(){SN.Init.AjaxForms();SN.Init.UploadForms();if($("."+SN.C.S.FormNotice).length>0){SN.Init.NoticeForm()}if($("#content .notices").length>0){SN.Init.Notices()}if($("#content .entity_actions").length>0){SN.Init.EntityActions()}if($("#form_login").length>0){SN.Init.Login()}});if(!document.ELEMENT_NODE){document.ELEMENT_NODE=1;document.ATTRIBUTE_NODE=2;document.TEXT_NODE=3;document.CDATA_SECTION_NODE=4;document.ENTITY_REFERENCE_NODE=5;document.ENTITY_NODE=6;document.PROCESSING_INSTRUCTION_NODE=7;document.COMMENT_NODE=8;document.DOCUMENT_NODE=9;document.DOCUMENT_TYPE_NODE=10;document.DOCUMENT_FRAGMENT_NODE=11;document.NOTATION_NODE=12}document._importNode=function(e,a){switch(e.nodeType){case document.ELEMENT_NODE:var d=document.createElement(e.nodeName);if(e.attributes&&e.attributes.length>0){for(var c=0,b=e.attributes.length;c<b;){if(e.attributes[c].nodeName=="class"){d.className=e.getAttribute(e.attributes[c++].nodeName)}else{d.setAttribute(e.attributes[c].nodeName,e.getAttribute(e.attributes[c++].nodeName))}}}if(a&&e.childNodes&&e.childNodes.length>0){for(var c=0,b=e.childNodes.length;c<b;){d.appendChild(document._importNode(e.childNodes[c++],a))}}return d;break;case document.TEXT_NODE:case document.CDATA_SECTION_NODE:case document.COMMENT_NODE:return document.createTextNode(e.nodeValue);break}};if(typeof navigator.geolocation=="undefined"||navigator.geolocation.shim){(function(){(function(){if(window.google&&google.gears){return}var c=null;if(typeof GearsFactory!="undefined"){c=new GearsFactory()}else{try{c=new ActiveXObject("Gears.Factory");if(c.getBuildInfo().indexOf("ie_mobile")!=-1){c.privateSetGlobalObject(this)}}catch(d){if((typeof navigator.mimeTypes!="undefined")&&navigator.mimeTypes["application/x-googlegears"]){c=document.createElement("object");c.style.display="none";c.width=0;c.height=0;c.type="application/x-googlegears";document.documentElement.appendChild(c)}}}if(!c){return}if(!window.google){google={}}if(!google.gears){google.gears={factory:c}}})();var a=(function(){var d=google.gears.factory.create("beta.geolocation");var c=function(f,e){return function(g){f(g);e.lastPosition=g}};return{shim:true,type:"Gears",lastPosition:null,getCurrentPosition:function(e,g,h){var f=this;var i=c(e,f);d.getCurrentPosition(i,g,h)},watchPosition:function(e,f,g){d.watchPosition(e,f,g)},clearWatch:function(e){d.clearWatch(e)},getPermission:function(g,e,f){d.getPermission(g,e,f)}}});var b=(function(){var i=false;var e=function(){if(!d()&&!i){i=true;var j=document.createElement("script");j.src=(document.location.protocol=="https:"?"https://":"http://")+"www.google.com/jsapi?callback=_google_loader_apiLoaded";j.type="text/javascript";document.getElementsByTagName("body")[0].appendChild(j)}};var c=[];var h=function(j){c.push(j)};var f=function(){if(d()){while(c.length>0){var j=c.pop();j()}}};window._google_loader_apiLoaded=function(){f()};var d=function(){return(window.google&&google.loader)};var g=function(j){if(d()){return true}h(j);e();return false};e();return{shim:true,type:"ClientLocation",lastPosition:null,getCurrentPosition:function(k,n,o){var m=this;if(!g(function(){m.getCurrentPosition(k,n,o)})){return}if(google.loader.ClientLocation){var l=google.loader.ClientLocation;var j={coords:{latitude:l.latitude,longitude:l.longitude,altitude:null,accuracy:43000,altitudeAccuracy:null,heading:null,speed:null},address:{city:l.address.city,country:l.address.country,country_code:l.address.country_code,region:l.address.region},timestamp:new Date()};k(j);this.lastPosition=j}else{if(n==="function"){n({code:3,message:"Using the Google ClientLocation API and it is not able to calculate a location."})}}},watchPosition:function(j,l,m){this.getCurrentPosition(j,l,m);var k=this;var n=setInterval(function(){k.getCurrentPosition(j,l,m)},10000);return n},clearWatch:function(j){clearInterval(j)},getPermission:function(l,j,k){return true}}});navigator.geolocation=(window.google&&google.gears)?a():b()})()};
\ No newline at end of file
diff --git a/lib/noticeform.php b/lib/noticeform.php
index 271a37449c..e889036f55 100644
--- a/lib/noticeform.php
+++ b/lib/noticeform.php
@@ -132,7 +132,7 @@ class NoticeForm extends Form
 
     function formClass()
     {
-        return 'form_notice';
+        return 'form_notice ajax-notice';
     }
 
     /**
diff --git a/plugins/Bookmark/BookmarkPlugin.php b/plugins/Bookmark/BookmarkPlugin.php
index 6c3f8cdc28..bc8985e907 100644
--- a/plugins/Bookmark/BookmarkPlugin.php
+++ b/plugins/Bookmark/BookmarkPlugin.php
@@ -616,12 +616,15 @@ class BookmarkPlugin extends MicroAppPlugin
                             'height' => AVATAR_MINI_SIZE,
                             'alt' => $profile->getBestName()));
 
-        $out->raw('&nbsp;');
+        $out->raw('&#160;'); // avoid &nbsp; for AJAX XML compatibility
 
+        $out->elementStart('span', 'vcard author'); // hack for belongsOnTimeline; JS needs to be able to find the author
         $out->element('a', 
-                      array('href' => $profile->profileurl,
+                      array('class' => 'url',
+                            'href' => $profile->profileurl,
                             'title' => $profile->getBestName()),
                       $profile->nickname);
+        $out->elementEnd('span');
     }
 
     function entryForm($out)
diff --git a/plugins/Bookmark/bookmarkform.php b/plugins/Bookmark/bookmarkform.php
index b99568e154..d8cf1f7f5b 100644
--- a/plugins/Bookmark/bookmarkform.php
+++ b/plugins/Bookmark/bookmarkform.php
@@ -94,7 +94,7 @@ class BookmarkForm extends Form
 
     function formClass()
     {
-        return 'form_settings';
+        return 'form_settings ajax-notice';
     }
 
     /**
diff --git a/plugins/Bookmark/newbookmark.php b/plugins/Bookmark/newbookmark.php
index a0cf3fffb2..ebfdb6cb95 100644
--- a/plugins/Bookmark/newbookmark.php
+++ b/plugins/Bookmark/newbookmark.php
@@ -125,6 +125,9 @@ class NewbookmarkAction extends Action
 
     function newBookmark()
     {
+        if ($this->boolean('ajax')) {
+            StatusNet::setApi(true);
+        }
         try {
             if (empty($this->title)) {
                 throw new ClientException(_('Bookmark must have a title.'));
@@ -147,7 +150,37 @@ class NewbookmarkAction extends Action
             return;
         }
 
-        common_redirect($saved->bestUrl(), 303);
+        if ($this->boolean('ajax')) {
+            header('Content-Type: text/xml;charset=utf-8');
+            $this->xw->startDocument('1.0', 'UTF-8');
+            $this->elementStart('html');
+            $this->elementStart('head');
+            // TRANS: Page title after sending a notice.
+            $this->element('title', null, _('Notice posted'));
+            $this->elementEnd('head');
+            $this->elementStart('body');
+            $this->showNotice($saved);
+            $this->elementEnd('body');
+            $this->elementEnd('html');
+        } else {
+            common_redirect($saved->bestUrl(), 303);
+        }
+    }
+
+    /**
+     * Output a notice
+     *
+     * Used to generate the notice code for Ajax results.
+     *
+     * @param Notice $notice Notice that was saved
+     *
+     * @return void
+     */
+    function showNotice($notice)
+    {
+        class_exists('NoticeList'); // @fixme hack for autoloader
+        $nli = new NoticeListItem($notice, $this);
+        $nli->show();
     }
 
     /**
diff --git a/plugins/Poll/Poll.php b/plugins/Poll/Poll.php
index 60ec4399fd..8d02f7de34 100644
--- a/plugins/Poll/Poll.php
+++ b/plugins/Poll/Poll.php
@@ -216,6 +216,7 @@ class Poll extends Managed_DataObject
                                         array('id' => $p->id));
         }
 
+        common_log(LOG_DEBUG, "Saving poll: $p->id $p->uri");
         $p->insert();
 
         $content  = sprintf(_m('Poll: %s %s'),
diff --git a/plugins/Poll/newpoll.php b/plugins/Poll/newpoll.php
index 66386affa9..fa6eb798d7 100644
--- a/plugins/Poll/newpoll.php
+++ b/plugins/Poll/newpoll.php
@@ -127,6 +127,9 @@ class NewPollAction extends Action
 
     function newPoll()
     {
+        if ($this->boolean('ajax')) {
+            StatusNet::setApi(true);
+        }
         try {
             if (empty($this->question)) {
                 throw new ClientException(_('Poll must have a question.'));
@@ -147,7 +150,37 @@ class NewPollAction extends Action
             return;
         }
 
-        common_redirect($saved->bestUrl(), 303);
+        if ($this->boolean('ajax')) {
+            header('Content-Type: text/xml;charset=utf-8');
+            $this->xw->startDocument('1.0', 'UTF-8');
+            $this->elementStart('html');
+            $this->elementStart('head');
+            // TRANS: Page title after sending a notice.
+            $this->element('title', null, _('Notice posted'));
+            $this->elementEnd('head');
+            $this->elementStart('body');
+            $this->showNotice($saved);
+            $this->elementEnd('body');
+            $this->elementEnd('html');
+        } else {
+            common_redirect($saved->bestUrl(), 303);
+        }
+    }
+
+    /**
+     * Output a notice
+     *
+     * Used to generate the notice code for Ajax results.
+     *
+     * @param Notice $notice Notice that was saved
+     *
+     * @return void
+     */
+    function showNotice($notice)
+    {
+        class_exists('NoticeList'); // @fixme hack for autoloader
+        $nli = new NoticeListItem($notice, $this);
+        $nli->show();
     }
 
     /**
@@ -163,7 +196,7 @@ class NewPollAction extends Action
         }
 
         $form = new NewPollForm($this,
-                                 $this->questions,
+                                 $this->question,
                                  $this->options);
 
         $form->show();
diff --git a/plugins/Poll/newpollform.php b/plugins/Poll/newpollform.php
index fd5f28748b..73e516c891 100644
--- a/plugins/Poll/newpollform.php
+++ b/plugins/Poll/newpollform.php
@@ -83,7 +83,7 @@ class NewpollForm extends Form
 
     function formClass()
     {
-        return 'form_settings';
+        return 'form_settings ajax-notice';
     }
 
     /**

From d990357be93dbe50b22c32e5fe41de4fbfc85c46 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Tue, 8 Mar 2011 15:44:51 -0800
Subject: [PATCH 455/655] fix off-by-one error in poll results display

---
 plugins/Poll/Poll.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/plugins/Poll/Poll.php b/plugins/Poll/Poll.php
index 8d02f7de34..65aad4830e 100644
--- a/plugins/Poll/Poll.php
+++ b/plugins/Poll/Poll.php
@@ -166,7 +166,9 @@ class Poll extends Managed_DataObject
 
         $raw = array();
         while ($pr->fetch()) {
-            $raw[$pr->selection] = $pr->votes;
+            // Votes list 1-based
+            // Array stores 0-based
+            $raw[$pr->selection - 1] = $pr->votes;
         }
 
         $counts = array();

From 921eb1eb23043d090655b94fa5a7cc7575b81815 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Tue, 8 Mar 2011 16:04:32 -0800
Subject: [PATCH 456/655] quickie bar chart for poll results

---
 plugins/Poll/poll.css           | 10 ++++++++++
 plugins/Poll/pollresultform.php | 33 ++++++++++++++++++++++++++-------
 2 files changed, 36 insertions(+), 7 deletions(-)
 create mode 100644 plugins/Poll/poll.css

diff --git a/plugins/Poll/poll.css b/plugins/Poll/poll.css
new file mode 100644
index 0000000000..5ba9c1588f
--- /dev/null
+++ b/plugins/Poll/poll.css
@@ -0,0 +1,10 @@
+.poll-block {
+    float: left;
+    height: 16px;
+    background: #8aa;
+    margin-right: 8px;
+}
+
+.poll-winner {
+    background: #4af;
+}
diff --git a/plugins/Poll/pollresultform.php b/plugins/Poll/pollresultform.php
index 1db86938fc..f4da10cb53 100644
--- a/plugins/Poll/pollresultform.php
+++ b/plugins/Poll/pollresultform.php
@@ -109,14 +109,33 @@ class PollResultForm extends Form
         $out = $this->out;
         $counts = $poll->countResponses();
 
-        $out->element('p', 'poll-question', $poll->question);
-        $out->elementStart('ul', 'poll-options');
-        foreach ($poll->getOptions() as $i => $opt) {
-            $out->elementStart('li');
-            $out->text($counts[$i] . ' ' . $opt);
-            $out->elementEnd('li');
+        $width = 200;
+        $max = max($counts);
+        if ($max == 0) {
+            $max = 1; // quick hack :D
         }
-        $out->elementEnd('ul');
+
+        $out->element('p', 'poll-question', $poll->question);
+        $out->elementStart('table', 'poll-results');
+        foreach ($poll->getOptions() as $i => $opt) {
+            $w = intval($counts[$i] * $width / $max) + 1;
+
+            $out->elementStart('tr');
+
+            $out->elementStart('td');
+            $out->text($opt);
+            $out->elementEnd('td');
+
+            $out->elementStart('td');
+            $out->element('span', array('class' => 'poll-block',
+                                       'style' => "width: {$w}px"),
+                                  "\xc2\xa0"); // nbsp
+            $out->text($counts[$i]);
+            $out->elementEnd('td');
+
+            $out->elementEnd('tr');
+        }
+        $out->elementEnd('table');
     }
 
     /**

From 1413ed911f74c3cd2ba07f5e5c270375931620cc Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Tue, 8 Mar 2011 16:06:30 -0800
Subject: [PATCH 457/655] Hackaround for http caching problem on poll pages;
 the notice doesn't change, but the results do, so don't use the notice's
 last-modifeid time as a caching epoch.

---
 plugins/Poll/showpoll.php | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/plugins/Poll/showpoll.php b/plugins/Poll/showpoll.php
index f5002701a2..21ac7647c0 100644
--- a/plugins/Poll/showpoll.php
+++ b/plugins/Poll/showpoll.php
@@ -108,4 +108,21 @@ class ShowPollAction extends ShownoticeAction
                        $this->poll->question);
     }
 
+    /**
+     * @fixme combine the notice time with poll update time
+     */
+    function lastModified()
+    {
+        return Action::lastModified();
+    }
+
+
+    /**
+     * @fixme combine the notice time with poll update time
+     */
+    function etag()
+    {
+        return Action::etag();
+    }
+
 }

From 794cb5609b94befce80f7ebaf68419e993821897 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Tue, 8 Mar 2011 19:20:43 -0800
Subject: [PATCH 458/655] Save basic profile data to the right place

---
 plugins/ExtendedProfile/extendedprofile.php   |  57 +++++-
 .../ExtendedProfile/extendedprofilewidget.php | 165 ++++++++++++++++--
 .../ExtendedProfile/profiledetailaction.php   |   1 +
 .../profiledetailsettingsaction.php           | 134 +++++++++++++-
 4 files changed, 338 insertions(+), 19 deletions(-)

diff --git a/plugins/ExtendedProfile/extendedprofile.php b/plugins/ExtendedProfile/extendedprofile.php
index 3be753b23f..61a66b4b43 100644
--- a/plugins/ExtendedProfile/extendedprofile.php
+++ b/plugins/ExtendedProfile/extendedprofile.php
@@ -21,15 +21,29 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
+/**
+ * Class to represent extended profile data
+ */
 class ExtendedProfile
 {
+    /**
+     * Constructor
+     *
+     * @param Profile $profile
+     */
     function __construct(Profile $profile)
     {
-        $this->profile = $profile;
+        $this->profile  = $profile;
+        $this->user     = $profile->getUser();
         $this->sections = $this->getSections();
-        $this->fields = $this->loadFields();
+        $this->fields   = $this->loadFields();
     }
 
+    /**
+     * Load extended profile fields
+     *
+     * @return array $fields the list of fields
+     */
     function loadFields()
     {
         $detail = new Profile_detail();
@@ -41,9 +55,48 @@ class ExtendedProfile
         while ($detail->fetch()) {
             $fields[$detail->field][] = clone($detail);
         }
+
         return $fields;
     }
 
+    /**
+     * Get a the self-tags associated with this profile
+     *
+     * @return string the concatenated string of tags
+     */
+    function getTags()
+    {
+        return implode(' ', $this->user->getSelfTags());
+    }
+
+    /**
+     * Return a simple string value. Checks for fields that should
+     * be stored in the regular profile and returns values from it
+     * if appropriate.
+     *
+     * @param string $name name of the detail field to get the
+     *                     value from
+     *
+     * @return string the value
+     */
+    function getTextValue($name)
+    {
+        $profileFields = array('fullname', 'location', 'bio');
+
+        if (in_array(strtolower($name), $profileFields)) {
+            return $this->profile->$name;
+        } else if (in_array($name, $this->fields)) {
+            return $this->fields[$name]->value;
+        } else {
+            return null;
+        }
+    }
+
+    /**
+     *  Return all the sections of the extended profile
+     *
+     * @return array the big list of sections and fields
+     */
     function getSections()
     {
         return array(
diff --git a/plugins/ExtendedProfile/extendedprofilewidget.php b/plugins/ExtendedProfile/extendedprofilewidget.php
index bf9b4056cd..fbb3ff3c23 100644
--- a/plugins/ExtendedProfile/extendedprofilewidget.php
+++ b/plugins/ExtendedProfile/extendedprofilewidget.php
@@ -21,13 +21,35 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-class ExtendedProfileWidget extends Widget
+/**
+ * Class for outputting a widget to display or edit
+ * extended profiles
+ */
+class ExtendedProfileWidget extends Form
 {
-    const EDITABLE=true;
+    const EDITABLE = true;
 
+    /**
+     * The parent profile
+     *
+     * @var Profile
+     */
     protected $profile;
+
+    /**
+     * The extended profile
+     *
+     * @var Extended_profile
+     */
     protected $ext;
 
+    /**
+     * Constructor
+     *
+     * @param XMLOutputter  $out
+     * @param Profile       $profile
+     * @param boolean       $editable
+     */
     public function __construct(XMLOutputter $out=null, Profile $profile=null, $editable=false)
     {
         parent::__construct($out);
@@ -38,7 +60,30 @@ class ExtendedProfileWidget extends Widget
         $this->editable = $editable;
     }
 
+    /**
+     * Show the extended profile, or the edit form
+     */
     public function show()
+    {
+        if ($this->editable) {
+            parent::show();
+        } else {
+            $this->showSections();
+        }
+    }
+
+    /**
+     * Show form data
+     */
+    public function formData()
+    {
+        $this->showSections();
+    }
+
+    /**
+     * Show each section of the extended profile
+     */
+    public function showSections()
     {
         $sections = $this->ext->getSections();
         foreach ($sections as $name => $section) {
@@ -46,6 +91,12 @@ class ExtendedProfileWidget extends Widget
         }
     }
 
+    /**
+     * Show an extended profile section
+     *
+     * @param string $name      name of the section
+     * @param array  $section   array of fields for the section
+     */
     protected function showExtendedProfileSection($name, $section)
     {
         $this->out->element('h3', null, $section['label']);
@@ -56,6 +107,12 @@ class ExtendedProfileWidget extends Widget
         $this->out->elementEnd('table');
     }
 
+    /**
+     * Show an extended profile field
+     *
+     * @param string $name  name of the field
+     * @param array  $field set of key/value pairs for the field
+     */
     protected function showExtendedProfileField($name, $field)
     {
         $this->out->elementStart('tr');
@@ -73,30 +130,110 @@ class ExtendedProfileWidget extends Widget
         $this->out->elementEnd('tr');
     }
 
+    /**
+     * Outputs the value of a field
+     *
+     * @param string $name  name of the field
+     * @param array  $field set of key/value pairs for the field
+     */
     protected function showFieldValue($name, $field)
     {
-        $this->out->text($name);
+        $type = strval(@$field['type']);
+
+        switch($type)
+        {
+        case '':
+        case 'text':
+        case 'textarea':
+            $this->out->text($this->ext->getTextValue($name));
+            break;
+        case 'tags':
+            $this->out->text($this->ext->getTags());
+            break;
+        default:
+            $this->out->text("TYPE: $type");
+        }
+
     }
 
+    /**
+     * Show an editable version of the field
+     *
+     * @param string $name  name fo the field
+     * @param array  $field array of key/value pairs for the field
+     */
     protected function showEditableField($name, $field)
     {
         $out = $this->out;
-        //$out = new HTMLOutputter();
-        // @fixme
+
         $type = strval(@$field['type']);
         $id = "extprofile-" . $name;
+
         $value = 'placeholder';
 
         switch ($type) {
-            case '':
-            case 'text':
-                $out->input($id, null, $value);
-                break;
-            case 'textarea':
-                $out->textarea($id, null, $value);
-                break;
-            default:
-                $out->input($id, null, "TYPE: $type");
+        case '':
+        case 'text':
+            $out->input($id, null, $this->ext->getTextValue($name));
+            break;
+        case 'textarea':
+            $out->textarea($id, null,  $this->ext->getTextValue($name));
+            break;
+        case 'tags':
+            $out->input($id, null, $this->ext->getTags());
+            break;
+        default:
+            $out->input($id, null, "TYPE: $type");
         }
     }
+
+    /**
+     * Action elements
+     *
+     * @return void
+     */
+
+    function formActions()
+    {
+        $this->out->submit(
+            'save',
+            _m('BUTTON','Save'),
+            'submit form_action-secondary',
+            'save',
+            _('Save details')
+       );
+    }
+
+    /**
+     * ID of the form
+     *
+     * @return string ID of the form
+     */
+
+    function id()
+    {
+        return 'profile-details-' . $this->profile->id;
+    }
+
+    /**
+     * class of the form
+     *
+     * @return string of the form class
+     */
+
+    function formClass()
+    {
+        return 'form_profile_details';
+    }
+
+    /**
+     * Action of the form
+     *
+     * @return string URL of the action
+     */
+
+    function action()
+    {
+        return common_local_url('profiledetailsettings');
+    }
 }
diff --git a/plugins/ExtendedProfile/profiledetailaction.php b/plugins/ExtendedProfile/profiledetailaction.php
index a4bb12956e..d2eb06775c 100644
--- a/plugins/ExtendedProfile/profiledetailaction.php
+++ b/plugins/ExtendedProfile/profiledetailaction.php
@@ -23,6 +23,7 @@ if (!defined('STATUSNET')) {
 
 class ProfileDetailAction extends ProfileAction
 {
+
     function isReadOnly($args)
     {
         return true;
diff --git a/plugins/ExtendedProfile/profiledetailsettingsaction.php b/plugins/ExtendedProfile/profiledetailsettingsaction.php
index 77d755c0b0..d1153cc075 100644
--- a/plugins/ExtendedProfile/profiledetailsettingsaction.php
+++ b/plugins/ExtendedProfile/profiledetailsettingsaction.php
@@ -21,7 +21,7 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-class ProfileDetailSettingsAction extends AccountSettingsAction
+class ProfileDetailSettingsAction extends SettingsAction
 {
 
     function title()
@@ -47,9 +47,26 @@ class ProfileDetailSettingsAction extends AccountSettingsAction
         return true;
     }
 
-    function handle($args)
+    function handlePost()
     {
-        $this->showPage();
+        // CSRF protection
+        $token = $this->trimmed('token');
+        if (!$token || $token != common_session_token()) {
+            $this->show_form(
+                _m(
+                    'There was a problem with your session token. '
+                    .   'Try again, please.'
+                  )
+            );
+            return;
+        }
+
+        if ($this->arg('save')) {
+            $this->saveDetails();
+        } else {
+            // TRANS: Message given submitting a form with an unknown action
+            $this->showForm(_m('Unexpected form submission.'));
+        }
     }
 
     function showContent()
@@ -60,4 +77,115 @@ class ProfileDetailSettingsAction extends AccountSettingsAction
         $widget = new ExtendedProfileWidget($this, $profile, ExtendedProfileWidget::EDITABLE);
         $widget->show();
     }
+
+    function saveDetails()
+    {
+        common_debug(var_export($_POST, true));
+
+        $user = common_current_user();
+
+        try {
+           $this->saveStandardProfileDetails($user);
+        } catch (Exception $e) {
+            $this->showForm($e->getMessage(), false);
+            return;
+        }
+
+        $profile = $user->getProfile();
+
+
+        $simple_fields = array('title', 'manager', 'tags', 'spouse');
+
+        $this->showForm(_('Details saved.'), true);
+
+    }
+
+    /**
+     * Save fields that should be stored in the main profile object
+     *
+     * XXX: There's a lot of dupe code here from ProfileSettingsAction.
+     *      Do not want.
+     *
+     * @param User $user the current user
+     */
+    function saveStandardProfileDetails($user)
+    {
+        $user->query('BEGIN');
+
+        $fullname  = $this->trimmed('extprofile-fullname');
+        $location  = $this->trimmed('extprofile-location');
+        $tagstring = $this->trimmed('extprofile-tags');
+        $bio       = $this->trimmed('extprofile-bio');
+
+        if ($tagstring) {
+            $tags = array_map(
+                'common_canonical_tag',
+                preg_split('/[\s,]+/', $tagstring)
+            );
+        } else {
+            $tags = array();
+        }
+
+        foreach ($tags as $tag) {
+            if (!common_valid_profile_tag($tag)) {
+                // TRANS: Validation error in form for profile settings.
+                // TRANS: %s is an invalid tag.
+                throw new Exception(sprintf(_m('Invalid tag: "%s".'), $tag));
+            }
+        }
+
+        $profile = $user->getProfile();
+
+        if ($fullname    != $profile->fullname
+            || $location != $profile->location
+            || $tags     != $profile->tags
+            || $bio      != $profile->bio) {
+
+            $orig = clone($profile);
+
+            $profile->nickname = $user->nickname;
+            $profile->fullname = $fullname;
+            $profile->bio      = $bio;
+            $profile->location = $location;
+
+            $loc = Location::fromName($location);
+
+            if (empty($loc)) {
+                $profile->lat         = null;
+                $profile->lon         = null;
+                $profile->location_id = null;
+                $profile->location_ns = null;
+            } else {
+                $profile->lat         = $loc->lat;
+                $profile->lon         = $loc->lon;
+                $profile->location_id = $loc->location_id;
+                $profile->location_ns = $loc->location_ns;
+            }
+
+            $profile->profileurl = common_profile_url($user->nickname);
+
+            $result = $profile->update($orig);
+
+            if ($result === false) {
+                common_log_db_error($profile, 'UPDATE', __FILE__);
+                // TRANS: Server error thrown when user profile settings could not be saved.
+                $this->serverError(_('Could not save profile.'));
+                return;
+            }
+
+            // Set the user tags
+            $result = $user->setSelfTags($tags);
+
+            if (!$result) {
+                // TRANS: Server error thrown when user profile settings tags could not be saved.
+                $this->serverError(_('Could not save tags.'));
+                return;
+            }
+
+            $user->query('COMMIT');
+            Event::handle('EndProfileSaveForm', array($this));
+            common_broadcast_profile($profile);
+        }
+    }
+
 }

From b8b1fbb6b5cb3a044acab3487e0a041220bf263d Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Tue, 8 Mar 2011 22:48:16 -0500
Subject: [PATCH 459/655] Give NoticeListItem its own class

---
 lib/noticelist.php     | 589 --------------------------------------
 lib/noticelistitem.php | 625 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 625 insertions(+), 589 deletions(-)
 create mode 100644 lib/noticelistitem.php

diff --git a/lib/noticelist.php b/lib/noticelist.php
index 8c07f904c8..dbe2a0996f 100644
--- a/lib/noticelist.php
+++ b/lib/noticelist.php
@@ -129,592 +129,3 @@ class NoticeList extends Widget
     }
 }
 
-/**
- * widget for displaying a single notice
- *
- * This widget has the core smarts for showing a single notice: what to display,
- * where, and under which circumstances. Its key method is show(); this is a recipe
- * that calls all the other show*() methods to build up a single notice. The
- * ProfileNoticeListItem subclass, for example, overrides showAuthor() to skip
- * author info (since that's implicit by the data in the page).
- *
- * @category UI
- * @package  StatusNet
- * @author   Evan Prodromou <evan@status.net>
- * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://status.net/
- * @see      NoticeList
- * @see      ProfileNoticeListItem
- */
-
-class NoticeListItem extends Widget
-{
-    /** The notice this item will show. */
-
-    var $notice = null;
-
-    /** The notice that was repeated. */
-
-    var $repeat = null;
-
-    /** The profile of the author of the notice, extracted once for convenience. */
-
-    var $profile = null;
-
-    /**
-     * constructor
-     *
-     * Also initializes the profile attribute.
-     *
-     * @param Notice $notice The notice we'll display
-     */
-
-    function __construct($notice, $out=null)
-    {
-        parent::__construct($out);
-        if (!empty($notice->repeat_of)) {
-            $original = Notice::staticGet('id', $notice->repeat_of);
-            if (empty($original)) { // could have been deleted
-                $this->notice = $notice;
-            } else {
-                $this->notice = $original;
-                $this->repeat = $notice;
-            }
-        } else {
-            $this->notice  = $notice;
-        }
-        $this->profile = $this->notice->getProfile();
-    }
-
-    /**
-     * recipe function for displaying a single notice.
-     *
-     * This uses all the other methods to correctly display a notice. Override
-     * it or one of the others to fine-tune the output.
-     *
-     * @return void
-     */
-
-    function show()
-    {
-        if (empty($this->notice)) {
-            common_log(LOG_WARNING, "Trying to show missing notice; skipping.");
-            return;
-        } else if (empty($this->profile)) {
-            common_log(LOG_WARNING, "Trying to show missing profile (" . $this->notice->profile_id . "); skipping.");
-            return;
-        }
-
-        $this->showStart();
-        if (Event::handle('StartShowNoticeItem', array($this))) {
-            $this->showNotice();
-            $this->showNoticeAttachments();
-            $this->showNoticeInfo();
-            $this->showNoticeOptions();
-            Event::handle('EndShowNoticeItem', array($this));
-        }
-        $this->showEnd();
-    }
-
-    function showNotice()
-    {
-        $this->out->elementStart('div', 'entry-title');
-        $this->showAuthor();
-        $this->showContent();
-        $this->out->elementEnd('div');
-    }
-
-    function showNoticeInfo()
-    {
-        $this->out->elementStart('div', 'entry-content');
-        if (Event::handle('StartShowNoticeInfo', array($this))) {
-            $this->showNoticeLink();
-            $this->showNoticeSource();
-            $this->showNoticeLocation();
-            $this->showContext();
-            $this->showRepeat();
-            Event::handle('EndShowNoticeInfo', array($this));
-        }
-
-        $this->out->elementEnd('div');
-    }
-
-    function showNoticeOptions()
-    {
-        if (Event::handle('StartShowNoticeOptions', array($this))) {
-            $user = common_current_user();
-            if ($user) {
-                $this->out->elementStart('div', 'notice-options');
-                $this->showFaveForm();
-                $this->showReplyLink();
-                $this->showRepeatForm();
-                $this->showDeleteLink();
-                $this->out->elementEnd('div');
-            }
-            Event::handle('EndShowNoticeOptions', array($this));
-        }
-    }
-
-    /**
-     * start a single notice.
-     *
-     * @return void
-     */
-
-    function showStart()
-    {
-        if (Event::handle('StartOpenNoticeListItemElement', array($this))) {
-            $id = (empty($this->repeat)) ? $this->notice->id : $this->repeat->id;
-            $this->out->elementStart('li', array('class' => 'hentry notice',
-                                                 'id' => 'notice-' . $id));
-            Event::handle('EndOpenNoticeListItemElement', array($this));
-        }
-    }
-
-    /**
-     * show the "favorite" form
-     *
-     * @return void
-     */
-
-    function showFaveForm()
-    {
-        if (Event::handle('StartShowFaveForm', array($this))) {
-            $user = common_current_user();
-            if ($user) {
-                if ($user->hasFave($this->notice)) {
-                    $disfavor = new DisfavorForm($this->out, $this->notice);
-                    $disfavor->show();
-                } else {
-                    $favor = new FavorForm($this->out, $this->notice);
-                    $favor->show();
-                }
-            }
-            Event::handle('EndShowFaveForm', array($this));
-        }
-    }
-
-    /**
-     * show the author of a notice
-     *
-     * By default, this shows the avatar and (linked) nickname of the author.
-     *
-     * @return void
-     */
-
-    function showAuthor()
-    {
-        $this->out->elementStart('span', 'vcard author');
-        $attrs = array('href' => $this->profile->profileurl,
-                       'class' => 'url');
-        if (!empty($this->profile->fullname)) {
-            $attrs['title'] = $this->profile->getFancyName();
-        }
-        $this->out->elementStart('a', $attrs);
-        $this->showAvatar();
-        $this->out->text(' ');
-        $this->showNickname();
-        $this->out->elementEnd('a');
-        $this->out->elementEnd('span');
-    }
-
-    /**
-     * show the avatar of the notice's author
-     *
-     * This will use the default avatar if no avatar is assigned for the author.
-     * It makes a link to the author's profile.
-     *
-     * @return void
-     */
-
-    function showAvatar()
-    {
-        $avatar_size = $this->avatarSize();
-
-        $avatar = $this->profile->getAvatar($avatar_size);
-
-        $this->out->element('img', array('src' => ($avatar) ?
-                                         $avatar->displayUrl() :
-                                         Avatar::defaultImage($avatar_size),
-                                         'class' => 'avatar photo',
-                                         'width' => $avatar_size,
-                                         'height' => $avatar_size,
-                                         'alt' =>
-                                         ($this->profile->fullname) ?
-                                         $this->profile->fullname :
-                                         $this->profile->nickname));
-    }
-
-    function avatarSize()
-    {
-        return AVATAR_STREAM_SIZE;
-    }
-
-    /**
-     * show the nickname of the author
-     *
-     * Links to the author's profile page
-     *
-     * @return void
-     */
-
-    function showNickname()
-    {
-        $this->out->raw('<span class="nickname fn">' .
-                        htmlspecialchars($this->profile->nickname) .
-                        '</span>');
-    }
-
-    /**
-     * show the content of the notice
-     *
-     * Shows the content of the notice. This is pre-rendered for efficiency
-     * at save time. Some very old notices might not be pre-rendered, so
-     * they're rendered on the spot.
-     *
-     * @return void
-     */
-
-    function showContent()
-    {
-        // FIXME: URL, image, video, audio
-        $this->out->elementStart('p', array('class' => 'entry-content'));
-        if ($this->notice->rendered) {
-            $this->out->raw($this->notice->rendered);
-        } else {
-            // XXX: may be some uncooked notices in the DB,
-            // we cook them right now. This should probably disappear in future
-            // versions (>> 0.4.x)
-            $this->out->raw(common_render_content($this->notice->content, $this->notice));
-        }
-        $this->out->elementEnd('p');
-    }
-
-    function showNoticeAttachments() {
-        if (common_config('attachments', 'show_thumbs')) {
-            $al = new InlineAttachmentList($this->notice, $this->out);
-            $al->show();
-        }
-    }
-
-    /**
-     * show the link to the main page for the notice
-     *
-     * Displays a link to the page for a notice, with "relative" time. Tries to
-     * get remote notice URLs correct, but doesn't always succeed.
-     *
-     * @return void
-     */
-
-    function showNoticeLink()
-    {
-        $noticeurl = $this->notice->bestUrl();
-
-        // above should always return an URL
-
-        assert(!empty($noticeurl));
-
-        $this->out->elementStart('a', array('rel' => 'bookmark',
-                                            'class' => 'timestamp',
-                                            'href' => $noticeurl));
-        $dt = common_date_iso8601($this->notice->created);
-        $this->out->element('abbr', array('class' => 'published',
-                                          'title' => $dt),
-                            common_date_string($this->notice->created));
-        $this->out->elementEnd('a');
-    }
-
-    /**
-     * show the notice location
-     *
-     * shows the notice location in the correct language.
-     *
-     * If an URL is available, makes a link. Otherwise, just a span.
-     *
-     * @return void
-     */
-
-    function showNoticeLocation()
-    {
-        $id = $this->notice->id;
-
-        $location = $this->notice->getLocation();
-
-        if (empty($location)) {
-            return;
-        }
-
-        $name = $location->getName();
-
-        $lat = $this->notice->lat;
-        $lon = $this->notice->lon;
-        $latlon = (!empty($lat) && !empty($lon)) ? $lat.';'.$lon : '';
-
-        if (empty($name)) {
-            $latdms = $this->decimalDegreesToDMS(abs($lat));
-            $londms = $this->decimalDegreesToDMS(abs($lon));
-            // TRANS: Used in coordinates as abbreviation of north
-            $north = _('N');
-            // TRANS: Used in coordinates as abbreviation of south
-            $south = _('S');
-            // TRANS: Used in coordinates as abbreviation of east
-            $east = _('E');
-            // TRANS: Used in coordinates as abbreviation of west
-            $west = _('W');
-            $name = sprintf(
-                _('%1$u°%2$u\'%3$u"%4$s %5$u°%6$u\'%7$u"%8$s'),
-                $latdms['deg'],$latdms['min'], $latdms['sec'],($lat>0? $north:$south),
-                $londms['deg'],$londms['min'], $londms['sec'],($lon>0? $east:$west));
-        }
-
-        $url  = $location->getUrl();
-
-        $this->out->text(' ');
-        $this->out->elementStart('span', array('class' => 'location'));
-        $this->out->text(_('at'));
-        $this->out->text(' ');
-        if (empty($url)) {
-            $this->out->element('abbr', array('class' => 'geo',
-                                              'title' => $latlon),
-                                $name);
-        } else {
-            $xstr = new XMLStringer(false);
-            $xstr->elementStart('a', array('href' => $url,
-                                           'rel' => 'external'));
-            $xstr->element('abbr', array('class' => 'geo',
-                                         'title' => $latlon),
-                           $name);
-            $xstr->elementEnd('a');
-            $this->out->raw($xstr->getString());
-        }
-        $this->out->elementEnd('span');
-    }
-
-    /**
-     * @param number $dec decimal degrees
-     * @return array split into 'deg', 'min', and 'sec'
-     */
-    function decimalDegreesToDMS($dec)
-    {
-        $deg = intval($dec);
-        $tempma = abs($dec) - abs($deg);
-
-        $tempma = $tempma * 3600;
-        $min = floor($tempma / 60);
-        $sec = $tempma - ($min*60);
-
-        return array("deg"=>$deg,"min"=>$min,"sec"=>$sec);
-    }
-
-    /**
-     * Show the source of the notice
-     *
-     * Either the name (and link) of the API client that posted the notice,
-     * or one of other other channels.
-     *
-     * @return void
-     */
-
-    function showNoticeSource()
-    {
-        $ns = $this->notice->getSource();
-
-        if ($ns) {
-            $source_name = (empty($ns->name)) ? ($ns->code ? _($ns->code) : _('web')) : _($ns->name);
-            $this->out->text(' ');
-            $this->out->elementStart('span', 'source');
-            // FIXME: probably i18n issue. If "from" is followed by text, that should be a parameter to "from" (from %s).
-            $this->out->text(_('from'));
-            $this->out->text(' ');
-
-            $name  = $source_name;
-            $url   = $ns->url;
-            $title = null;
-
-            if (Event::handle('StartNoticeSourceLink', array($this->notice, &$name, &$url, &$title))) {
-                $name = $source_name;
-                $url  = $ns->url;
-            }
-            Event::handle('EndNoticeSourceLink', array($this->notice, &$name, &$url, &$title));
-
-            // if $ns->name and $ns->url are populated we have
-            // configured a source attr somewhere
-            if (!empty($name) && !empty($url)) {
-
-                $this->out->elementStart('span', 'device');
-
-                $attrs = array(
-                    'href' => $url,
-                    'rel' => 'external'
-                );
-
-                if (!empty($title)) {
-                    $attrs['title'] = $title;
-                }
-
-                $this->out->element('a', $attrs, $name);
-                $this->out->elementEnd('span');
-            } else {
-                $this->out->element('span', 'device', $name);
-            }
-
-            $this->out->elementEnd('span');
-        }
-    }
-
-    /**
-     * show link to notice this notice is a reply to
-     *
-     * If this notice is a reply, show a link to the notice it is replying to. The
-     * heavy lifting for figuring out replies happens at save time.
-     *
-     * @return void
-     */
-
-    function showContext()
-    {
-        if ($this->notice->hasConversation()) {
-            $conv = Conversation::staticGet(
-                'id',
-                $this->notice->conversation
-            );
-            $convurl = $conv->uri;
-            if (!empty($convurl)) {
-                $this->out->text(' ');
-                $this->out->element(
-                    'a',
-                    array(
-                    'href' => $convurl.'#notice-'.$this->notice->id,
-                    'class' => 'response'),
-                    _('in context')
-                );
-            } else {
-                $msg = sprintf(
-                    "Couldn't find Conversation ID %d to make 'in context'"
-                    . "link for Notice ID %d",
-                    $this->notice->conversation,
-                    $this->notice->id
-                );
-                common_log(LOG_WARNING, $msg);
-            }
-        }
-    }
-
-    /**
-     * show a link to the author of repeat
-     *
-     * @return void
-     */
-
-    function showRepeat()
-    {
-        if (!empty($this->repeat)) {
-
-            $repeater = Profile::staticGet('id', $this->repeat->profile_id);
-
-            $attrs = array('href' => $repeater->profileurl,
-                           'class' => 'url');
-
-            if (!empty($repeater->fullname)) {
-                $attrs['title'] = $repeater->fullname . ' (' . $repeater->nickname . ')';
-            }
-
-            $this->out->elementStart('span', 'repeat vcard');
-
-            $this->out->raw(_('Repeated by'));
-
-            $this->out->elementStart('a', $attrs);
-            $this->out->element('span', 'fn nickname', $repeater->nickname);
-            $this->out->elementEnd('a');
-
-            $this->out->elementEnd('span');
-        }
-    }
-
-    /**
-     * show a link to reply to the current notice
-     *
-     * Should either do the reply in the current notice form (if available), or
-     * link out to the notice-posting form. A little flakey, doesn't always work.
-     *
-     * @return void
-     */
-
-    function showReplyLink()
-    {
-        if (common_logged_in()) {
-            $this->out->text(' ');
-            $reply_url = common_local_url('newnotice',
-                                          array('replyto' => $this->profile->nickname, 'inreplyto' => $this->notice->id));
-            $this->out->elementStart('a', array('href' => $reply_url,
-                                                'class' => 'notice_reply',
-                                                'title' => _('Reply to this notice')));
-            $this->out->text(_('Reply'));
-            $this->out->text(' ');
-            $this->out->element('span', 'notice_id', $this->notice->id);
-            $this->out->elementEnd('a');
-        }
-    }
-
-    /**
-     * if the user is the author, let them delete the notice
-     *
-     * @return void
-     */
-
-    function showDeleteLink()
-    {
-        $user = common_current_user();
-
-        $todel = (empty($this->repeat)) ? $this->notice : $this->repeat;
-
-        if (!empty($user) &&
-            ($todel->profile_id == $user->id || $user->hasRight(Right::DELETEOTHERSNOTICE))) {
-            $this->out->text(' ');
-            $deleteurl = common_local_url('deletenotice',
-                                          array('notice' => $todel->id));
-            $this->out->element('a', array('href' => $deleteurl,
-                                           'class' => 'notice_delete',
-                                           'title' => _('Delete this notice')), _('Delete'));
-        }
-    }
-
-    /**
-     * show the form to repeat a notice
-     *
-     * @return void
-     */
-
-    function showRepeatForm()
-    {
-        $user = common_current_user();
-        if ($user && $user->id != $this->notice->profile_id) {
-            $this->out->text(' ');
-            $profile = $user->getProfile();
-            if ($profile->hasRepeated($this->notice->id)) {
-                $this->out->element('span', array('class' => 'repeated',
-                                                  'title' => _('Notice repeated')),
-                                            _('Repeated'));
-            } else {
-                $rf = new RepeatForm($this->out, $this->notice);
-                $rf->show();
-            }
-        }
-    }
-
-    /**
-     * finish the notice
-     *
-     * Close the last elements in the notice list item
-     *
-     * @return void
-     */
-
-    function showEnd()
-    {
-        if (Event::handle('StartCloseNoticeListItemElement', array($this))) {
-            $this->out->elementEnd('li');
-            Event::handle('EndCloseNoticeListItemElement', array($this));
-        }
-    }
-}
diff --git a/lib/noticelistitem.php b/lib/noticelistitem.php
new file mode 100644
index 0000000000..17827d07ef
--- /dev/null
+++ b/lib/noticelistitem.php
@@ -0,0 +1,625 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2010, StatusNet, Inc.
+ *
+ * An item in a notice list
+ * 
+ * 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  Widget
+ * @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);
+}
+
+/**
+ * widget for displaying a single notice
+ *
+ * This widget has the core smarts for showing a single notice: what to display,
+ * where, and under which circumstances. Its key method is show(); this is a recipe
+ * that calls all the other show*() methods to build up a single notice. The
+ * ProfileNoticeListItem subclass, for example, overrides showAuthor() to skip
+ * author info (since that's implicit by the data in the page).
+ *
+ * @category UI
+ * @package  StatusNet
+ * @author   Evan Prodromou <evan@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://status.net/
+ * @see      NoticeList
+ * @see      ProfileNoticeListItem
+ */
+
+class NoticeListItem extends Widget
+{
+    /** The notice this item will show. */
+
+    var $notice = null;
+
+    /** The notice that was repeated. */
+
+    var $repeat = null;
+
+    /** The profile of the author of the notice, extracted once for convenience. */
+
+    var $profile = null;
+
+    /**
+     * constructor
+     *
+     * Also initializes the profile attribute.
+     *
+     * @param Notice $notice The notice we'll display
+     */
+
+    function __construct($notice, $out=null)
+    {
+        parent::__construct($out);
+        if (!empty($notice->repeat_of)) {
+            $original = Notice::staticGet('id', $notice->repeat_of);
+            if (empty($original)) { // could have been deleted
+                $this->notice = $notice;
+            } else {
+                $this->notice = $original;
+                $this->repeat = $notice;
+            }
+        } else {
+            $this->notice  = $notice;
+        }
+        $this->profile = $this->notice->getProfile();
+    }
+
+    /**
+     * recipe function for displaying a single notice.
+     *
+     * This uses all the other methods to correctly display a notice. Override
+     * it or one of the others to fine-tune the output.
+     *
+     * @return void
+     */
+
+    function show()
+    {
+        if (empty($this->notice)) {
+            common_log(LOG_WARNING, "Trying to show missing notice; skipping.");
+            return;
+        } else if (empty($this->profile)) {
+            common_log(LOG_WARNING, "Trying to show missing profile (" . $this->notice->profile_id . "); skipping.");
+            return;
+        }
+
+        $this->showStart();
+        if (Event::handle('StartShowNoticeItem', array($this))) {
+            $this->showNotice();
+            $this->showNoticeAttachments();
+            $this->showNoticeInfo();
+            $this->showNoticeOptions();
+            Event::handle('EndShowNoticeItem', array($this));
+        }
+        $this->showEnd();
+    }
+
+    function showNotice()
+    {
+        $this->out->elementStart('div', 'entry-title');
+        $this->showAuthor();
+        $this->showContent();
+        $this->out->elementEnd('div');
+    }
+
+    function showNoticeInfo()
+    {
+        $this->out->elementStart('div', 'entry-content');
+        if (Event::handle('StartShowNoticeInfo', array($this))) {
+            $this->showNoticeLink();
+            $this->showNoticeSource();
+            $this->showNoticeLocation();
+            $this->showContext();
+            $this->showRepeat();
+            Event::handle('EndShowNoticeInfo', array($this));
+        }
+
+        $this->out->elementEnd('div');
+    }
+
+    function showNoticeOptions()
+    {
+        if (Event::handle('StartShowNoticeOptions', array($this))) {
+            $user = common_current_user();
+            if ($user) {
+                $this->out->elementStart('div', 'notice-options');
+                $this->showFaveForm();
+                $this->showReplyLink();
+                $this->showRepeatForm();
+                $this->showDeleteLink();
+                $this->out->elementEnd('div');
+            }
+            Event::handle('EndShowNoticeOptions', array($this));
+        }
+    }
+
+    /**
+     * start a single notice.
+     *
+     * @return void
+     */
+
+    function showStart()
+    {
+        if (Event::handle('StartOpenNoticeListItemElement', array($this))) {
+            $id = (empty($this->repeat)) ? $this->notice->id : $this->repeat->id;
+            $this->out->elementStart('li', array('class' => 'hentry notice',
+                                                 'id' => 'notice-' . $id));
+            Event::handle('EndOpenNoticeListItemElement', array($this));
+        }
+    }
+
+    /**
+     * show the "favorite" form
+     *
+     * @return void
+     */
+
+    function showFaveForm()
+    {
+        if (Event::handle('StartShowFaveForm', array($this))) {
+            $user = common_current_user();
+            if ($user) {
+                if ($user->hasFave($this->notice)) {
+                    $disfavor = new DisfavorForm($this->out, $this->notice);
+                    $disfavor->show();
+                } else {
+                    $favor = new FavorForm($this->out, $this->notice);
+                    $favor->show();
+                }
+            }
+            Event::handle('EndShowFaveForm', array($this));
+        }
+    }
+
+    /**
+     * show the author of a notice
+     *
+     * By default, this shows the avatar and (linked) nickname of the author.
+     *
+     * @return void
+     */
+
+    function showAuthor()
+    {
+        $this->out->elementStart('span', 'vcard author');
+        $attrs = array('href' => $this->profile->profileurl,
+                       'class' => 'url');
+        if (!empty($this->profile->fullname)) {
+            $attrs['title'] = $this->profile->getFancyName();
+        }
+        $this->out->elementStart('a', $attrs);
+        $this->showAvatar();
+        $this->out->text(' ');
+        $this->showNickname();
+        $this->out->elementEnd('a');
+        $this->out->elementEnd('span');
+    }
+
+    /**
+     * show the avatar of the notice's author
+     *
+     * This will use the default avatar if no avatar is assigned for the author.
+     * It makes a link to the author's profile.
+     *
+     * @return void
+     */
+
+    function showAvatar()
+    {
+        $avatar_size = $this->avatarSize();
+
+        $avatar = $this->profile->getAvatar($avatar_size);
+
+        $this->out->element('img', array('src' => ($avatar) ?
+                                         $avatar->displayUrl() :
+                                         Avatar::defaultImage($avatar_size),
+                                         'class' => 'avatar photo',
+                                         'width' => $avatar_size,
+                                         'height' => $avatar_size,
+                                         'alt' =>
+                                         ($this->profile->fullname) ?
+                                         $this->profile->fullname :
+                                         $this->profile->nickname));
+    }
+
+    function avatarSize()
+    {
+        return AVATAR_STREAM_SIZE;
+    }
+
+    /**
+     * show the nickname of the author
+     *
+     * Links to the author's profile page
+     *
+     * @return void
+     */
+
+    function showNickname()
+    {
+        $this->out->raw('<span class="nickname fn">' .
+                        htmlspecialchars($this->profile->nickname) .
+                        '</span>');
+    }
+
+    /**
+     * show the content of the notice
+     *
+     * Shows the content of the notice. This is pre-rendered for efficiency
+     * at save time. Some very old notices might not be pre-rendered, so
+     * they're rendered on the spot.
+     *
+     * @return void
+     */
+
+    function showContent()
+    {
+        // FIXME: URL, image, video, audio
+        $this->out->elementStart('p', array('class' => 'entry-content'));
+        if ($this->notice->rendered) {
+            $this->out->raw($this->notice->rendered);
+        } else {
+            // XXX: may be some uncooked notices in the DB,
+            // we cook them right now. This should probably disappear in future
+            // versions (>> 0.4.x)
+            $this->out->raw(common_render_content($this->notice->content, $this->notice));
+        }
+        $this->out->elementEnd('p');
+    }
+
+    function showNoticeAttachments() {
+        if (common_config('attachments', 'show_thumbs')) {
+            $al = new InlineAttachmentList($this->notice, $this->out);
+            $al->show();
+        }
+    }
+
+    /**
+     * show the link to the main page for the notice
+     *
+     * Displays a link to the page for a notice, with "relative" time. Tries to
+     * get remote notice URLs correct, but doesn't always succeed.
+     *
+     * @return void
+     */
+
+    function showNoticeLink()
+    {
+        $noticeurl = $this->notice->bestUrl();
+
+        // above should always return an URL
+
+        assert(!empty($noticeurl));
+
+        $this->out->elementStart('a', array('rel' => 'bookmark',
+                                            'class' => 'timestamp',
+                                            'href' => $noticeurl));
+        $dt = common_date_iso8601($this->notice->created);
+        $this->out->element('abbr', array('class' => 'published',
+                                          'title' => $dt),
+                            common_date_string($this->notice->created));
+        $this->out->elementEnd('a');
+    }
+
+    /**
+     * show the notice location
+     *
+     * shows the notice location in the correct language.
+     *
+     * If an URL is available, makes a link. Otherwise, just a span.
+     *
+     * @return void
+     */
+
+    function showNoticeLocation()
+    {
+        $id = $this->notice->id;
+
+        $location = $this->notice->getLocation();
+
+        if (empty($location)) {
+            return;
+        }
+
+        $name = $location->getName();
+
+        $lat = $this->notice->lat;
+        $lon = $this->notice->lon;
+        $latlon = (!empty($lat) && !empty($lon)) ? $lat.';'.$lon : '';
+
+        if (empty($name)) {
+            $latdms = $this->decimalDegreesToDMS(abs($lat));
+            $londms = $this->decimalDegreesToDMS(abs($lon));
+            // TRANS: Used in coordinates as abbreviation of north
+            $north = _('N');
+            // TRANS: Used in coordinates as abbreviation of south
+            $south = _('S');
+            // TRANS: Used in coordinates as abbreviation of east
+            $east = _('E');
+            // TRANS: Used in coordinates as abbreviation of west
+            $west = _('W');
+            $name = sprintf(
+                _('%1$u°%2$u\'%3$u"%4$s %5$u°%6$u\'%7$u"%8$s'),
+                $latdms['deg'],$latdms['min'], $latdms['sec'],($lat>0? $north:$south),
+                $londms['deg'],$londms['min'], $londms['sec'],($lon>0? $east:$west));
+        }
+
+        $url  = $location->getUrl();
+
+        $this->out->text(' ');
+        $this->out->elementStart('span', array('class' => 'location'));
+        $this->out->text(_('at'));
+        $this->out->text(' ');
+        if (empty($url)) {
+            $this->out->element('abbr', array('class' => 'geo',
+                                              'title' => $latlon),
+                                $name);
+        } else {
+            $xstr = new XMLStringer(false);
+            $xstr->elementStart('a', array('href' => $url,
+                                           'rel' => 'external'));
+            $xstr->element('abbr', array('class' => 'geo',
+                                         'title' => $latlon),
+                           $name);
+            $xstr->elementEnd('a');
+            $this->out->raw($xstr->getString());
+        }
+        $this->out->elementEnd('span');
+    }
+
+    /**
+     * @param number $dec decimal degrees
+     * @return array split into 'deg', 'min', and 'sec'
+     */
+    function decimalDegreesToDMS($dec)
+    {
+        $deg = intval($dec);
+        $tempma = abs($dec) - abs($deg);
+
+        $tempma = $tempma * 3600;
+        $min = floor($tempma / 60);
+        $sec = $tempma - ($min*60);
+
+        return array("deg"=>$deg,"min"=>$min,"sec"=>$sec);
+    }
+
+    /**
+     * Show the source of the notice
+     *
+     * Either the name (and link) of the API client that posted the notice,
+     * or one of other other channels.
+     *
+     * @return void
+     */
+
+    function showNoticeSource()
+    {
+        $ns = $this->notice->getSource();
+
+        if ($ns) {
+            $source_name = (empty($ns->name)) ? ($ns->code ? _($ns->code) : _('web')) : _($ns->name);
+            $this->out->text(' ');
+            $this->out->elementStart('span', 'source');
+            // FIXME: probably i18n issue. If "from" is followed by text, that should be a parameter to "from" (from %s).
+            $this->out->text(_('from'));
+            $this->out->text(' ');
+
+            $name  = $source_name;
+            $url   = $ns->url;
+            $title = null;
+
+            if (Event::handle('StartNoticeSourceLink', array($this->notice, &$name, &$url, &$title))) {
+                $name = $source_name;
+                $url  = $ns->url;
+            }
+            Event::handle('EndNoticeSourceLink', array($this->notice, &$name, &$url, &$title));
+
+            // if $ns->name and $ns->url are populated we have
+            // configured a source attr somewhere
+            if (!empty($name) && !empty($url)) {
+
+                $this->out->elementStart('span', 'device');
+
+                $attrs = array(
+                    'href' => $url,
+                    'rel' => 'external'
+                );
+
+                if (!empty($title)) {
+                    $attrs['title'] = $title;
+                }
+
+                $this->out->element('a', $attrs, $name);
+                $this->out->elementEnd('span');
+            } else {
+                $this->out->element('span', 'device', $name);
+            }
+
+            $this->out->elementEnd('span');
+        }
+    }
+
+    /**
+     * show link to notice this notice is a reply to
+     *
+     * If this notice is a reply, show a link to the notice it is replying to. The
+     * heavy lifting for figuring out replies happens at save time.
+     *
+     * @return void
+     */
+
+    function showContext()
+    {
+        if ($this->notice->hasConversation()) {
+            $conv = Conversation::staticGet(
+                'id',
+                $this->notice->conversation
+            );
+            $convurl = $conv->uri;
+            if (!empty($convurl)) {
+                $this->out->text(' ');
+                $this->out->element(
+                    'a',
+                    array(
+                    'href' => $convurl.'#notice-'.$this->notice->id,
+                    'class' => 'response'),
+                    _('in context')
+                );
+            } else {
+                $msg = sprintf(
+                    "Couldn't find Conversation ID %d to make 'in context'"
+                    . "link for Notice ID %d",
+                    $this->notice->conversation,
+                    $this->notice->id
+                );
+                common_log(LOG_WARNING, $msg);
+            }
+        }
+    }
+
+    /**
+     * show a link to the author of repeat
+     *
+     * @return void
+     */
+
+    function showRepeat()
+    {
+        if (!empty($this->repeat)) {
+
+            $repeater = Profile::staticGet('id', $this->repeat->profile_id);
+
+            $attrs = array('href' => $repeater->profileurl,
+                           'class' => 'url');
+
+            if (!empty($repeater->fullname)) {
+                $attrs['title'] = $repeater->fullname . ' (' . $repeater->nickname . ')';
+            }
+
+            $this->out->elementStart('span', 'repeat vcard');
+
+            $this->out->raw(_('Repeated by'));
+
+            $this->out->elementStart('a', $attrs);
+            $this->out->element('span', 'fn nickname', $repeater->nickname);
+            $this->out->elementEnd('a');
+
+            $this->out->elementEnd('span');
+        }
+    }
+
+    /**
+     * show a link to reply to the current notice
+     *
+     * Should either do the reply in the current notice form (if available), or
+     * link out to the notice-posting form. A little flakey, doesn't always work.
+     *
+     * @return void
+     */
+
+    function showReplyLink()
+    {
+        if (common_logged_in()) {
+            $this->out->text(' ');
+            $reply_url = common_local_url('newnotice',
+                                          array('replyto' => $this->profile->nickname, 'inreplyto' => $this->notice->id));
+            $this->out->elementStart('a', array('href' => $reply_url,
+                                                'class' => 'notice_reply',
+                                                'title' => _('Reply to this notice')));
+            $this->out->text(_('Reply'));
+            $this->out->text(' ');
+            $this->out->element('span', 'notice_id', $this->notice->id);
+            $this->out->elementEnd('a');
+        }
+    }
+
+    /**
+     * if the user is the author, let them delete the notice
+     *
+     * @return void
+     */
+
+    function showDeleteLink()
+    {
+        $user = common_current_user();
+
+        $todel = (empty($this->repeat)) ? $this->notice : $this->repeat;
+
+        if (!empty($user) &&
+            ($todel->profile_id == $user->id || $user->hasRight(Right::DELETEOTHERSNOTICE))) {
+            $this->out->text(' ');
+            $deleteurl = common_local_url('deletenotice',
+                                          array('notice' => $todel->id));
+            $this->out->element('a', array('href' => $deleteurl,
+                                           'class' => 'notice_delete',
+                                           'title' => _('Delete this notice')), _('Delete'));
+        }
+    }
+
+    /**
+     * show the form to repeat a notice
+     *
+     * @return void
+     */
+
+    function showRepeatForm()
+    {
+        $user = common_current_user();
+        if ($user && $user->id != $this->notice->profile_id) {
+            $this->out->text(' ');
+            $profile = $user->getProfile();
+            if ($profile->hasRepeated($this->notice->id)) {
+                $this->out->element('span', array('class' => 'repeated',
+                                                  'title' => _('Notice repeated')),
+                                            _('Repeated'));
+            } else {
+                $rf = new RepeatForm($this->out, $this->notice);
+                $rf->show();
+            }
+        }
+    }
+
+    /**
+     * finish the notice
+     *
+     * Close the last elements in the notice list item
+     *
+     * @return void
+     */
+
+    function showEnd()
+    {
+        if (Event::handle('StartCloseNoticeListItemElement', array($this))) {
+            $this->out->elementEnd('li');
+            Event::handle('EndCloseNoticeListItemElement', array($this));
+        }
+    }
+}

From 24fd39d6ab2c0bf72ba0dc970883fdd9fa751465 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Tue, 8 Mar 2011 11:15:17 -0500
Subject: [PATCH 460/655] new Event plugin

---
 plugins/Event/Event.php       | 184 ++++++++++++++++++++++
 plugins/Event/EventPlugin.php | 284 ++++++++++++++++++++++++++++++++++
 plugins/Event/RSVP.php        | 184 ++++++++++++++++++++++
 plugins/Event/newevent.php    | 164 ++++++++++++++++++++
 plugins/Event/newrsvp.php     | 164 ++++++++++++++++++++
 5 files changed, 980 insertions(+)
 create mode 100644 plugins/Event/Event.php
 create mode 100644 plugins/Event/EventPlugin.php
 create mode 100644 plugins/Event/RSVP.php
 create mode 100644 plugins/Event/newevent.php
 create mode 100644 plugins/Event/newrsvp.php

diff --git a/plugins/Event/Event.php b/plugins/Event/Event.php
new file mode 100644
index 0000000000..38d68c91ed
--- /dev/null
+++ b/plugins/Event/Event.php
@@ -0,0 +1,184 @@
+<?php
+/**
+ * Data class for counting greetings
+ *
+ * PHP version 5
+ *
+ * @category Data
+ * @package  StatusNet
+ * @author   Evan Prodromou <evan@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
+ * @link     http://status.net/
+ *
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2009, StatusNet, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.     See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
+require_once INSTALLDIR . '/classes/Memcached_DataObject.php';
+
+/**
+ * Data class for counting greetings
+ *
+ * We use the DB_DataObject framework for data classes in StatusNet. Each
+ * table maps to a particular data class, making it easier to manipulate
+ * data.
+ *
+ * Data classes should extend Memcached_DataObject, the (slightly misnamed)
+ * extension of DB_DataObject that provides caching, internationalization,
+ * and other bits of good functionality to StatusNet-specific data classes.
+ *
+ * @category Action
+ * @package  StatusNet
+ * @author   Evan Prodromou <evan@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
+ * @link     http://status.net/
+ *
+ * @see      DB_DataObject
+ */
+
+class User_greeting_count extends Memcached_DataObject
+{
+    public $__table = 'user_greeting_count'; // table name
+    public $user_id;                         // int(4)  primary_key not_null
+    public $greeting_count;                  // int(4)
+
+    /**
+     * Get an instance by key
+     *
+     * This is a utility method to get a single instance with a given key value.
+     *
+     * @param string $k Key to use to lookup (usually 'user_id' for this class)
+     * @param mixed  $v Value to lookup
+     *
+     * @return User_greeting_count object found, or null for no hits
+     *
+     */
+    function staticGet($k, $v=null)
+    {
+        return Memcached_DataObject::staticGet('User_greeting_count', $k, $v);
+    }
+
+    /**
+     * return table definition for DB_DataObject
+     *
+     * DB_DataObject needs to know something about the table to manipulate
+     * instances. This method provides all the DB_DataObject needs to know.
+     *
+     * @return array array of column definitions
+     */
+    function table()
+    {
+        return array('user_id' => DB_DATAOBJECT_INT + DB_DATAOBJECT_NOTNULL,
+                     'greeting_count' => DB_DATAOBJECT_INT);
+    }
+
+    /**
+     * return key definitions for DB_DataObject
+     *
+     * DB_DataObject needs to know about keys that the table has, since it
+     * won't appear in StatusNet's own keys list. In most cases, this will
+     * simply reference your keyTypes() function.
+     *
+     * @return array list of key field names
+     */
+    function keys()
+    {
+        return array_keys($this->keyTypes());
+    }
+
+    /**
+     * return key definitions for Memcached_DataObject
+     *
+     * Our caching system uses the same key definitions, but uses a different
+     * method to get them. This key information is used to store and clear
+     * cached data, so be sure to list any key that will be used for static
+     * lookups.
+     *
+     * @return array associative array of key definitions, field name to type:
+     *         'K' for primary key: for compound keys, add an entry for each component;
+     *         'U' for unique keys: compound keys are not well supported here.
+     */
+    function keyTypes()
+    {
+        return array('user_id' => 'K');
+    }
+
+    /**
+     * Magic formula for non-autoincrementing integer primary keys
+     *
+     * If a table has a single integer column as its primary key, DB_DataObject
+     * assumes that the column is auto-incrementing and makes a sequence table
+     * to do this incrementation. Since we don't need this for our class, we
+     * overload this method and return the magic formula that DB_DataObject needs.
+     *
+     * @return array magic three-false array that stops auto-incrementing.
+     */
+    function sequenceKey()
+    {
+        return array(false, false, false);
+    }
+
+    /**
+     * Increment a user's greeting count and return instance
+     *
+     * This method handles the ins and outs of creating a new greeting_count for a
+     * user or fetching the existing greeting count and incrementing its value.
+     *
+     * @param integer $user_id ID of the user to get a count for
+     *
+     * @return User_greeting_count instance for this user, with count already incremented.
+     */
+    static function inc($user_id)
+    {
+        $gc = User_greeting_count::staticGet('user_id', $user_id);
+
+        if (empty($gc)) {
+
+            $gc = new User_greeting_count();
+
+            $gc->user_id        = $user_id;
+            $gc->greeting_count = 1;
+
+            $result = $gc->insert();
+
+            if (!$result) {
+                // TRANS: Exception thrown when the user greeting count could not be saved in the database.
+                // TRANS: %d is a user ID (number).
+                throw Exception(sprintf(_m("Could not save new greeting count for %d."),
+                                        $user_id));
+            }
+        } else {
+            $orig = clone($gc);
+
+            $gc->greeting_count++;
+
+            $result = $gc->update($orig);
+
+            if (!$result) {
+                // TRANS: Exception thrown when the user greeting count could not be saved in the database.
+                // TRANS: %d is a user ID (number).
+                throw Exception(sprintf(_m("Could not increment greeting count for %d."),
+                                        $user_id));
+            }
+        }
+
+        return $gc;
+    }
+}
diff --git a/plugins/Event/EventPlugin.php b/plugins/Event/EventPlugin.php
new file mode 100644
index 0000000000..a0d1140f37
--- /dev/null
+++ b/plugins/Event/EventPlugin.php
@@ -0,0 +1,284 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2009, StatusNet, Inc.
+ *
+ * A sample module to show best practices for StatusNet plugins
+ *
+ * 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  Sample
+ * @package   StatusNet
+ * @author    Brion Vibber <brionv@status.net>
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2009 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);
+}
+
+/**
+ * Sample plugin main class
+ *
+ * Each plugin requires a main class to interact with the StatusNet system.
+ *
+ * The main class usually extends the Plugin class that comes with StatusNet.
+ *
+ * The class has standard-named methods that will be called when certain events
+ * happen in the code base. These methods have names like 'onX' where X is an
+ * event name (see EVENTS.txt for the list of available events). Event handlers
+ * have pre-defined arguments, based on which event they're handling. A typical
+ * event handler:
+ *
+ *    function onSomeEvent($paramA, &$paramB)
+ *    {
+ *        if ($paramA == 'jed') {
+ *            throw new Exception(sprintf(_m("Invalid parameter %s"), $paramA));
+ *        }
+ *        $paramB = 'spock';
+ *        return true;
+ *    }
+ *
+ * Event handlers must return a boolean value. If they return false, all other
+ * event handlers for this event (in other plugins) will be skipped, and in some
+ * cases the default processing for that event would be skipped. This is great for
+ * replacing the default action of an event.
+ *
+ * If the handler returns true, processing of other event handlers and the default
+ * processing will continue. This is great for extending existing functionality.
+ *
+ * If the handler throws an exception, processing will stop, and the exception's
+ * error will be shown to the user.
+ *
+ * To install a plugin (like this one), site admins add the following code to
+ * their config.php file:
+ *
+ *     addPlugin('Sample');
+ *
+ * Plugins must be installed in one of the following directories:
+ *
+ *     local/plugins/{$pluginclass}.php
+ *     local/plugins/{$name}/{$pluginclass}.php
+ *     local/{$pluginclass}.php
+ *     local/{$name}/{$pluginclass}.php
+ *     plugins/{$pluginclass}.php
+ *     plugins/{$name}/{$pluginclass}.php
+ *
+ * Here, {$name} is the name of the plugin, like 'Sample', and {$pluginclass} is
+ * the name of the main class, like 'SamplePlugin'. Plugins that are part of the
+ * main StatusNet distribution go in 'plugins' and third-party or local ones go
+ * in 'local'.
+ *
+ * Simple plugins can be implemented as a single module. Others are more complex
+ * and require additional modules; these should use their own directory, like
+ * 'local/plugins/{$name}/'. All files related to the plugin, including images,
+ * JavaScript, CSS, external libraries or PHP modules should go in the plugin
+ * directory.
+ *
+ * @category  Sample
+ * @package   StatusNet
+ * @author    Brion Vibber <brionv@status.net>
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2009 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+class SamplePlugin extends Plugin
+{
+    /**
+     * Plugins are configured using public instance attributes. To set
+     * their values, site administrators use this syntax:
+     *
+     * addPlugin('Sample', array('attr1' => 'foo', 'attr2' => 'bar'));
+     *
+     * The same plugin class can be initialized multiple times with different
+     * arguments:
+     *
+     * addPlugin('EmailNotify', array('sendTo' => 'evan@status.net'));
+     * addPlugin('EmailNotify', array('sendTo' => 'brionv@status.net'));
+     *
+     */
+
+    public $attr1 = null;
+    public $attr2 = null;
+
+    /**
+     * Initializer for this plugin
+     *
+     * Plugins overload this method to do any initialization they need,
+     * like connecting to remote servers or creating paths or so on.
+     *
+     * @return boolean hook value; true means continue processing, false means stop.
+     */
+    function initialize()
+    {
+        return true;
+    }
+
+    /**
+     * Cleanup for this plugin
+     *
+     * Plugins overload this method to do any cleanup they need,
+     * like disconnecting from remote servers or deleting temp files or so on.
+     *
+     * @return boolean hook value; true means continue processing, false means stop.
+     */
+    function cleanup()
+    {
+        return true;
+    }
+
+    /**
+     * Database schema setup
+     *
+     * Plugins can add their own tables to the StatusNet database. Plugins
+     * should use StatusNet's schema interface to add or delete tables. The
+     * ensureTable() method provides an easy way to ensure a table's structure
+     * and availability.
+     *
+     * By default, the schema is checked every time StatusNet is run (say, when
+     * a Web page is hit). Admins can configure their systems to only check the
+     * schema when the checkschema.php script is run, greatly improving performance.
+     * However, they need to remember to run that script after installing or
+     * upgrading a plugin!
+     *
+     * @see Schema
+     * @see ColumnDef
+     *
+     * @return boolean hook value; true means continue processing, false means stop.
+     */
+    function onCheckSchema()
+    {
+        $schema = Schema::get();
+
+        // For storing user-submitted flags on profiles
+
+        $schema->ensureTable('user_greeting_count',
+            array(
+                'fields' => array(
+                    'user_id' => array('type' => 'int', 'not null' => true),
+                    'greeting_count' => array('type' => 'int'),
+                ),
+                'primary key' => array('user_id'),
+                'foreign keys' => array(
+                    // Not all databases will support foreign keys, but even
+                    // when not enforced it's helpful to include these definitions
+                    // as documentation.
+                    'user_greeting_count_user_id_fkey' => array('user', array('user_id' => 'id')),
+                ),
+            )
+        );
+
+        return true;
+    }
+
+    /**
+     * Load related modules when needed
+     *
+     * Most non-trivial plugins will require extra modules to do their work. Typically
+     * these include data classes, action classes, widget classes, or external libraries.
+     *
+     * This method receives a class name and loads the PHP file related to that class. By
+     * tradition, action classes typically have files named for the action, all lower-case.
+     * Data classes are in files with the data class name, initial letter capitalized.
+     *
+     * Note that this method will be called for *all* overloaded classes, not just ones
+     * in this plugin! So, make sure to return true by default to let other plugins, and
+     * the core code, get a chance.
+     *
+     * @param string $cls Name of the class to be loaded
+     *
+     * @return boolean hook value; true means continue processing, false means stop.
+     */
+    function onAutoload($cls)
+    {
+        $dir = dirname(__FILE__);
+
+        switch ($cls)
+        {
+        case 'HelloAction':
+            include_once $dir . '/' . strtolower(mb_substr($cls, 0, -6)) . '.php';
+            return false;
+        case 'User_greeting_count':
+            include_once $dir . '/'.$cls.'.php';
+            return false;
+        default:
+            return true;
+        }
+    }
+
+    /**
+     * Map URLs to actions
+     *
+     * This event handler lets the plugin map URLs on the site to actions (and
+     * thus an action handler class). Note that the action handler class for an
+     * action will be named 'FoobarAction', where action = 'foobar'. The class
+     * must be loaded in the onAutoload() method.
+     *
+     * @param Net_URL_Mapper $m path-to-action mapper
+     *
+     * @return boolean hook value; true means continue processing, false means stop.
+     */
+    function onRouterInitialized($m)
+    {
+        $m->connect('main/hello',
+                    array('action' => 'hello'));
+        return true;
+    }
+
+    /**
+     * Modify the default menu to link to our custom action
+     *
+     * Using event handlers, it's possible to modify the default UI for pages
+     * almost without limit. In this method, we add a menu item to the default
+     * primary menu for the interface to link to our action.
+     *
+     * The Action class provides a rich set of events to hook, as well as output
+     * methods.
+     *
+     * @param Action $action The current action handler. Use this to
+     *                       do any output.
+     *
+     * @return boolean hook value; true means continue processing, false means stop.
+     *
+     * @see Action
+     */
+    function onEndPrimaryNav($action)
+    {
+        // common_local_url() gets the correct URL for the action name
+        // we provide
+
+        $action->menuItem(common_local_url('hello'),
+                          _m('Hello'), _m('A warm greeting'), false, 'nav_hello');
+        return true;
+    }
+
+    function onPluginVersion(&$versions)
+    {
+        $versions[] = array('name' => 'Sample',
+                            'version' => STATUSNET_VERSION,
+                            'author' => 'Brion Vibber, Evan Prodromou',
+                            'homepage' => 'http://status.net/wiki/Plugin:Sample',
+                            'rawdescription' =>
+                            _m('A sample plugin to show basics of development for new hackers.'));
+        return true;
+    }
+}
diff --git a/plugins/Event/RSVP.php b/plugins/Event/RSVP.php
new file mode 100644
index 0000000000..38d68c91ed
--- /dev/null
+++ b/plugins/Event/RSVP.php
@@ -0,0 +1,184 @@
+<?php
+/**
+ * Data class for counting greetings
+ *
+ * PHP version 5
+ *
+ * @category Data
+ * @package  StatusNet
+ * @author   Evan Prodromou <evan@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
+ * @link     http://status.net/
+ *
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2009, StatusNet, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.     See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
+require_once INSTALLDIR . '/classes/Memcached_DataObject.php';
+
+/**
+ * Data class for counting greetings
+ *
+ * We use the DB_DataObject framework for data classes in StatusNet. Each
+ * table maps to a particular data class, making it easier to manipulate
+ * data.
+ *
+ * Data classes should extend Memcached_DataObject, the (slightly misnamed)
+ * extension of DB_DataObject that provides caching, internationalization,
+ * and other bits of good functionality to StatusNet-specific data classes.
+ *
+ * @category Action
+ * @package  StatusNet
+ * @author   Evan Prodromou <evan@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
+ * @link     http://status.net/
+ *
+ * @see      DB_DataObject
+ */
+
+class User_greeting_count extends Memcached_DataObject
+{
+    public $__table = 'user_greeting_count'; // table name
+    public $user_id;                         // int(4)  primary_key not_null
+    public $greeting_count;                  // int(4)
+
+    /**
+     * Get an instance by key
+     *
+     * This is a utility method to get a single instance with a given key value.
+     *
+     * @param string $k Key to use to lookup (usually 'user_id' for this class)
+     * @param mixed  $v Value to lookup
+     *
+     * @return User_greeting_count object found, or null for no hits
+     *
+     */
+    function staticGet($k, $v=null)
+    {
+        return Memcached_DataObject::staticGet('User_greeting_count', $k, $v);
+    }
+
+    /**
+     * return table definition for DB_DataObject
+     *
+     * DB_DataObject needs to know something about the table to manipulate
+     * instances. This method provides all the DB_DataObject needs to know.
+     *
+     * @return array array of column definitions
+     */
+    function table()
+    {
+        return array('user_id' => DB_DATAOBJECT_INT + DB_DATAOBJECT_NOTNULL,
+                     'greeting_count' => DB_DATAOBJECT_INT);
+    }
+
+    /**
+     * return key definitions for DB_DataObject
+     *
+     * DB_DataObject needs to know about keys that the table has, since it
+     * won't appear in StatusNet's own keys list. In most cases, this will
+     * simply reference your keyTypes() function.
+     *
+     * @return array list of key field names
+     */
+    function keys()
+    {
+        return array_keys($this->keyTypes());
+    }
+
+    /**
+     * return key definitions for Memcached_DataObject
+     *
+     * Our caching system uses the same key definitions, but uses a different
+     * method to get them. This key information is used to store and clear
+     * cached data, so be sure to list any key that will be used for static
+     * lookups.
+     *
+     * @return array associative array of key definitions, field name to type:
+     *         'K' for primary key: for compound keys, add an entry for each component;
+     *         'U' for unique keys: compound keys are not well supported here.
+     */
+    function keyTypes()
+    {
+        return array('user_id' => 'K');
+    }
+
+    /**
+     * Magic formula for non-autoincrementing integer primary keys
+     *
+     * If a table has a single integer column as its primary key, DB_DataObject
+     * assumes that the column is auto-incrementing and makes a sequence table
+     * to do this incrementation. Since we don't need this for our class, we
+     * overload this method and return the magic formula that DB_DataObject needs.
+     *
+     * @return array magic three-false array that stops auto-incrementing.
+     */
+    function sequenceKey()
+    {
+        return array(false, false, false);
+    }
+
+    /**
+     * Increment a user's greeting count and return instance
+     *
+     * This method handles the ins and outs of creating a new greeting_count for a
+     * user or fetching the existing greeting count and incrementing its value.
+     *
+     * @param integer $user_id ID of the user to get a count for
+     *
+     * @return User_greeting_count instance for this user, with count already incremented.
+     */
+    static function inc($user_id)
+    {
+        $gc = User_greeting_count::staticGet('user_id', $user_id);
+
+        if (empty($gc)) {
+
+            $gc = new User_greeting_count();
+
+            $gc->user_id        = $user_id;
+            $gc->greeting_count = 1;
+
+            $result = $gc->insert();
+
+            if (!$result) {
+                // TRANS: Exception thrown when the user greeting count could not be saved in the database.
+                // TRANS: %d is a user ID (number).
+                throw Exception(sprintf(_m("Could not save new greeting count for %d."),
+                                        $user_id));
+            }
+        } else {
+            $orig = clone($gc);
+
+            $gc->greeting_count++;
+
+            $result = $gc->update($orig);
+
+            if (!$result) {
+                // TRANS: Exception thrown when the user greeting count could not be saved in the database.
+                // TRANS: %d is a user ID (number).
+                throw Exception(sprintf(_m("Could not increment greeting count for %d."),
+                                        $user_id));
+            }
+        }
+
+        return $gc;
+    }
+}
diff --git a/plugins/Event/newevent.php b/plugins/Event/newevent.php
new file mode 100644
index 0000000000..a793ac6de2
--- /dev/null
+++ b/plugins/Event/newevent.php
@@ -0,0 +1,164 @@
+<?php
+/**
+ * Give a warm greeting to our friendly user
+ *
+ * PHP version 5
+ *
+ * @category Sample
+ * @package  StatusNet
+ * @author   Evan Prodromou <evan@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
+ * @link     http://status.net/
+ *
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2009, StatusNet, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
+/**
+ * Give a warm greeting to our friendly user
+ *
+ * This sample action shows some basic ways of doing output in an action
+ * class.
+ *
+ * Action classes have several output methods that they override from
+ * the parent class.
+ *
+ * @category Sample
+ * @package  StatusNet
+ * @author   Evan Prodromou <evan@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
+ * @link     http://status.net/
+ */
+class HelloAction extends Action
+{
+    var $user = null;
+    var $gc   = null;
+
+    /**
+     * Take arguments for running
+     *
+     * This method is called first, and it lets the action class get
+     * all its arguments and validate them. It's also the time
+     * to fetch any relevant data from the database.
+     *
+     * Action classes should run parent::prepare($args) as the first
+     * line of this method to make sure the default argument-processing
+     * happens.
+     *
+     * @param array $args $_REQUEST args
+     *
+     * @return boolean success flag
+     */
+    function prepare($args)
+    {
+        parent::prepare($args);
+
+        $this->user = common_current_user();
+
+        if (!empty($this->user)) {
+            $this->gc = User_greeting_count::inc($this->user->id);
+        }
+
+        return true;
+    }
+
+    /**
+     * Handle request
+     *
+     * This is the main method for handling a request. Note that
+     * most preparation should be done in the prepare() method;
+     * by the time handle() is called the action should be
+     * more or less ready to go.
+     *
+     * @param array $args $_REQUEST args; handled in prepare()
+     *
+     * @return void
+     */
+    function handle($args)
+    {
+        parent::handle($args);
+
+        $this->showPage();
+    }
+
+    /**
+     * Title of this page
+     *
+     * Override this method to show a custom title.
+     *
+     * @return string Title of the page
+     */
+    function title()
+    {
+        if (empty($this->user)) {
+            return _m('Hello');
+        } else {
+            return sprintf(_m('Hello, %s!'), $this->user->nickname);
+        }
+    }
+
+    /**
+     * Show content in the content area
+     *
+     * The default StatusNet page has a lot of decorations: menus,
+     * logos, tabs, all that jazz. This method is used to show
+     * content in the content area of the page; it's the main
+     * thing you want to overload.
+     *
+     * This method also demonstrates use of a plural localized string.
+     *
+     * @return void
+     */
+    function showContent()
+    {
+        if (empty($this->user)) {
+            $this->element('p', array('class' => 'greeting'),
+                           _m('Hello, stranger!'));
+        } else {
+            $this->element('p', array('class' => 'greeting'),
+                           sprintf(_m('Hello, %s'), $this->user->nickname));
+            $this->element('p', array('class' => 'greeting_count'),
+                           sprintf(_m('I have greeted you %d time.',
+                                      'I have greeted you %d times.',
+                                      $this->gc->greeting_count),
+                                   $this->gc->greeting_count));
+        }
+    }
+
+    /**
+     * Return true if read only.
+     *
+     * Some actions only read from the database; others read and write.
+     * The simple database load-balancer built into StatusNet will
+     * direct read-only actions to database mirrors (if they are configured),
+     * and read-write actions to the master database.
+     *
+     * This defaults to false to avoid data integrity issues, but you
+     * should make sure to overload it for performance gains.
+     *
+     * @param array $args other arguments, if RO/RW status depends on them.
+     *
+     * @return boolean is read only action?
+     */
+    function isReadOnly($args)
+    {
+        return false;
+    }
+}
diff --git a/plugins/Event/newrsvp.php b/plugins/Event/newrsvp.php
new file mode 100644
index 0000000000..a793ac6de2
--- /dev/null
+++ b/plugins/Event/newrsvp.php
@@ -0,0 +1,164 @@
+<?php
+/**
+ * Give a warm greeting to our friendly user
+ *
+ * PHP version 5
+ *
+ * @category Sample
+ * @package  StatusNet
+ * @author   Evan Prodromou <evan@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
+ * @link     http://status.net/
+ *
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2009, StatusNet, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
+/**
+ * Give a warm greeting to our friendly user
+ *
+ * This sample action shows some basic ways of doing output in an action
+ * class.
+ *
+ * Action classes have several output methods that they override from
+ * the parent class.
+ *
+ * @category Sample
+ * @package  StatusNet
+ * @author   Evan Prodromou <evan@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
+ * @link     http://status.net/
+ */
+class HelloAction extends Action
+{
+    var $user = null;
+    var $gc   = null;
+
+    /**
+     * Take arguments for running
+     *
+     * This method is called first, and it lets the action class get
+     * all its arguments and validate them. It's also the time
+     * to fetch any relevant data from the database.
+     *
+     * Action classes should run parent::prepare($args) as the first
+     * line of this method to make sure the default argument-processing
+     * happens.
+     *
+     * @param array $args $_REQUEST args
+     *
+     * @return boolean success flag
+     */
+    function prepare($args)
+    {
+        parent::prepare($args);
+
+        $this->user = common_current_user();
+
+        if (!empty($this->user)) {
+            $this->gc = User_greeting_count::inc($this->user->id);
+        }
+
+        return true;
+    }
+
+    /**
+     * Handle request
+     *
+     * This is the main method for handling a request. Note that
+     * most preparation should be done in the prepare() method;
+     * by the time handle() is called the action should be
+     * more or less ready to go.
+     *
+     * @param array $args $_REQUEST args; handled in prepare()
+     *
+     * @return void
+     */
+    function handle($args)
+    {
+        parent::handle($args);
+
+        $this->showPage();
+    }
+
+    /**
+     * Title of this page
+     *
+     * Override this method to show a custom title.
+     *
+     * @return string Title of the page
+     */
+    function title()
+    {
+        if (empty($this->user)) {
+            return _m('Hello');
+        } else {
+            return sprintf(_m('Hello, %s!'), $this->user->nickname);
+        }
+    }
+
+    /**
+     * Show content in the content area
+     *
+     * The default StatusNet page has a lot of decorations: menus,
+     * logos, tabs, all that jazz. This method is used to show
+     * content in the content area of the page; it's the main
+     * thing you want to overload.
+     *
+     * This method also demonstrates use of a plural localized string.
+     *
+     * @return void
+     */
+    function showContent()
+    {
+        if (empty($this->user)) {
+            $this->element('p', array('class' => 'greeting'),
+                           _m('Hello, stranger!'));
+        } else {
+            $this->element('p', array('class' => 'greeting'),
+                           sprintf(_m('Hello, %s'), $this->user->nickname));
+            $this->element('p', array('class' => 'greeting_count'),
+                           sprintf(_m('I have greeted you %d time.',
+                                      'I have greeted you %d times.',
+                                      $this->gc->greeting_count),
+                                   $this->gc->greeting_count));
+        }
+    }
+
+    /**
+     * Return true if read only.
+     *
+     * Some actions only read from the database; others read and write.
+     * The simple database load-balancer built into StatusNet will
+     * direct read-only actions to database mirrors (if they are configured),
+     * and read-write actions to the master database.
+     *
+     * This defaults to false to avoid data integrity issues, but you
+     * should make sure to overload it for performance gains.
+     *
+     * @param array $args other arguments, if RO/RW status depends on them.
+     *
+     * @return boolean is read only action?
+     */
+    function isReadOnly($args)
+    {
+        return false;
+    }
+}

From 0b30fb3971ab1ac3a2bf9e4efa969a449490fb5c Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Tue, 8 Mar 2011 11:28:53 -0500
Subject: [PATCH 461/655] Make event-specific stuff in EventPlugin

---
 plugins/Event/EventPlugin.php | 212 ++++------------------------------
 1 file changed, 24 insertions(+), 188 deletions(-)

diff --git a/plugins/Event/EventPlugin.php b/plugins/Event/EventPlugin.php
index a0d1140f37..af0875c805 100644
--- a/plugins/Event/EventPlugin.php
+++ b/plugins/Event/EventPlugin.php
@@ -1,9 +1,9 @@
 <?php
 /**
  * StatusNet - the distributed open-source microblogging tool
- * Copyright (C) 2009, StatusNet, Inc.
+ * Copyright (C) 2011, StatusNet, Inc.
  *
- * A sample module to show best practices for StatusNet plugins
+ * Microapp plugin for event invitations and RSVPs
  *
  * PHP version 5
  *
@@ -20,11 +20,10 @@
  * 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  Sample
+ * @category  Event
  * @package   StatusNet
- * @author    Brion Vibber <brionv@status.net>
  * @author    Evan Prodromou <evan@status.net>
- * @copyright 2009 StatusNet, Inc.
+ * @copyright 2011 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
  * @link      http://status.net/
  */
@@ -36,129 +35,19 @@ if (!defined('STATUSNET')) {
 }
 
 /**
- * Sample plugin main class
- *
- * Each plugin requires a main class to interact with the StatusNet system.
- *
- * The main class usually extends the Plugin class that comes with StatusNet.
- *
- * The class has standard-named methods that will be called when certain events
- * happen in the code base. These methods have names like 'onX' where X is an
- * event name (see EVENTS.txt for the list of available events). Event handlers
- * have pre-defined arguments, based on which event they're handling. A typical
- * event handler:
- *
- *    function onSomeEvent($paramA, &$paramB)
- *    {
- *        if ($paramA == 'jed') {
- *            throw new Exception(sprintf(_m("Invalid parameter %s"), $paramA));
- *        }
- *        $paramB = 'spock';
- *        return true;
- *    }
- *
- * Event handlers must return a boolean value. If they return false, all other
- * event handlers for this event (in other plugins) will be skipped, and in some
- * cases the default processing for that event would be skipped. This is great for
- * replacing the default action of an event.
- *
- * If the handler returns true, processing of other event handlers and the default
- * processing will continue. This is great for extending existing functionality.
- *
- * If the handler throws an exception, processing will stop, and the exception's
- * error will be shown to the user.
- *
- * To install a plugin (like this one), site admins add the following code to
- * their config.php file:
- *
- *     addPlugin('Sample');
- *
- * Plugins must be installed in one of the following directories:
- *
- *     local/plugins/{$pluginclass}.php
- *     local/plugins/{$name}/{$pluginclass}.php
- *     local/{$pluginclass}.php
- *     local/{$name}/{$pluginclass}.php
- *     plugins/{$pluginclass}.php
- *     plugins/{$name}/{$pluginclass}.php
- *
- * Here, {$name} is the name of the plugin, like 'Sample', and {$pluginclass} is
- * the name of the main class, like 'SamplePlugin'. Plugins that are part of the
- * main StatusNet distribution go in 'plugins' and third-party or local ones go
- * in 'local'.
- *
- * Simple plugins can be implemented as a single module. Others are more complex
- * and require additional modules; these should use their own directory, like
- * 'local/plugins/{$name}/'. All files related to the plugin, including images,
- * JavaScript, CSS, external libraries or PHP modules should go in the plugin
- * directory.
+ * Event plugin
  *
  * @category  Sample
  * @package   StatusNet
- * @author    Brion Vibber <brionv@status.net>
  * @author    Evan Prodromou <evan@status.net>
- * @copyright 2009 StatusNet, Inc.
+ * @copyright 2011 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
  * @link      http://status.net/
  */
-class SamplePlugin extends Plugin
+class EventPlugin extends MicroappPlugin
 {
     /**
-     * Plugins are configured using public instance attributes. To set
-     * their values, site administrators use this syntax:
-     *
-     * addPlugin('Sample', array('attr1' => 'foo', 'attr2' => 'bar'));
-     *
-     * The same plugin class can be initialized multiple times with different
-     * arguments:
-     *
-     * addPlugin('EmailNotify', array('sendTo' => 'evan@status.net'));
-     * addPlugin('EmailNotify', array('sendTo' => 'brionv@status.net'));
-     *
-     */
-
-    public $attr1 = null;
-    public $attr2 = null;
-
-    /**
-     * Initializer for this plugin
-     *
-     * Plugins overload this method to do any initialization they need,
-     * like connecting to remote servers or creating paths or so on.
-     *
-     * @return boolean hook value; true means continue processing, false means stop.
-     */
-    function initialize()
-    {
-        return true;
-    }
-
-    /**
-     * Cleanup for this plugin
-     *
-     * Plugins overload this method to do any cleanup they need,
-     * like disconnecting from remote servers or deleting temp files or so on.
-     *
-     * @return boolean hook value; true means continue processing, false means stop.
-     */
-    function cleanup()
-    {
-        return true;
-    }
-
-    /**
-     * Database schema setup
-     *
-     * Plugins can add their own tables to the StatusNet database. Plugins
-     * should use StatusNet's schema interface to add or delete tables. The
-     * ensureTable() method provides an easy way to ensure a table's structure
-     * and availability.
-     *
-     * By default, the schema is checked every time StatusNet is run (say, when
-     * a Web page is hit). Admins can configure their systems to only check the
-     * schema when the checkschema.php script is run, greatly improving performance.
-     * However, they need to remember to run that script after installing or
-     * upgrading a plugin!
+     * Set up our tables (event and rsvp)
      *
      * @see Schema
      * @see ColumnDef
@@ -169,23 +58,8 @@ class SamplePlugin extends Plugin
     {
         $schema = Schema::get();
 
-        // For storing user-submitted flags on profiles
-
-        $schema->ensureTable('user_greeting_count',
-            array(
-                'fields' => array(
-                    'user_id' => array('type' => 'int', 'not null' => true),
-                    'greeting_count' => array('type' => 'int'),
-                ),
-                'primary key' => array('user_id'),
-                'foreign keys' => array(
-                    // Not all databases will support foreign keys, but even
-                    // when not enforced it's helpful to include these definitions
-                    // as documentation.
-                    'user_greeting_count_user_id_fkey' => array('user', array('user_id' => 'id')),
-                ),
-            )
-        );
+        $schema->ensureTable('event', Event::schemaDef());
+        $schema->ensureTable('rsvp', RSVP::schemaDef());
 
         return true;
     }
@@ -193,17 +67,6 @@ class SamplePlugin extends Plugin
     /**
      * Load related modules when needed
      *
-     * Most non-trivial plugins will require extra modules to do their work. Typically
-     * these include data classes, action classes, widget classes, or external libraries.
-     *
-     * This method receives a class name and loads the PHP file related to that class. By
-     * tradition, action classes typically have files named for the action, all lower-case.
-     * Data classes are in files with the data class name, initial letter capitalized.
-     *
-     * Note that this method will be called for *all* overloaded classes, not just ones
-     * in this plugin! So, make sure to return true by default to let other plugins, and
-     * the core code, get a chance.
-     *
      * @param string $cls Name of the class to be loaded
      *
      * @return boolean hook value; true means continue processing, false means stop.
@@ -214,10 +77,12 @@ class SamplePlugin extends Plugin
 
         switch ($cls)
         {
-        case 'HelloAction':
+        case 'NeweventAction':
+        case 'NewrsvpAction':
             include_once $dir . '/' . strtolower(mb_substr($cls, 0, -6)) . '.php';
             return false;
-        case 'User_greeting_count':
+        case 'Event':
+        case 'RSVP':
             include_once $dir . '/'.$cls.'.php';
             return false;
         default:
@@ -228,57 +93,28 @@ class SamplePlugin extends Plugin
     /**
      * Map URLs to actions
      *
-     * This event handler lets the plugin map URLs on the site to actions (and
-     * thus an action handler class). Note that the action handler class for an
-     * action will be named 'FoobarAction', where action = 'foobar'. The class
-     * must be loaded in the onAutoload() method.
-     *
      * @param Net_URL_Mapper $m path-to-action mapper
      *
      * @return boolean hook value; true means continue processing, false means stop.
      */
+
     function onRouterInitialized($m)
     {
-        $m->connect('main/hello',
-                    array('action' => 'hello'));
-        return true;
-    }
-
-    /**
-     * Modify the default menu to link to our custom action
-     *
-     * Using event handlers, it's possible to modify the default UI for pages
-     * almost without limit. In this method, we add a menu item to the default
-     * primary menu for the interface to link to our action.
-     *
-     * The Action class provides a rich set of events to hook, as well as output
-     * methods.
-     *
-     * @param Action $action The current action handler. Use this to
-     *                       do any output.
-     *
-     * @return boolean hook value; true means continue processing, false means stop.
-     *
-     * @see Action
-     */
-    function onEndPrimaryNav($action)
-    {
-        // common_local_url() gets the correct URL for the action name
-        // we provide
-
-        $action->menuItem(common_local_url('hello'),
-                          _m('Hello'), _m('A warm greeting'), false, 'nav_hello');
+        $m->connect('main/event/new',
+                    array('action' => 'newevent'));
+        $m->connect('main/event/rsvp',
+                    array('action' => 'newrsvp'));
         return true;
     }
 
     function onPluginVersion(&$versions)
     {
-        $versions[] = array('name' => 'Sample',
+        $versions[] = array('name' => 'Event',
                             'version' => STATUSNET_VERSION,
-                            'author' => 'Brion Vibber, Evan Prodromou',
-                            'homepage' => 'http://status.net/wiki/Plugin:Sample',
-                            'rawdescription' =>
-                            _m('A sample plugin to show basics of development for new hackers.'));
+                            'author' => 'Evan Prodromou',
+                            'homepage' => 'http://status.net/wiki/Plugin:Event',
+                            'description' =>
+                            _m('Event invitations and RSVPs.'));
         return true;
     }
 }

From f715821cf0a4f95eb0d265eda62abed294474b2b Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Wed, 9 Mar 2011 02:33:26 -0500
Subject: [PATCH 462/655] Kinda complete and kinda working-ish events

---
 plugins/Event/Event.php       | 184 ------------------------
 plugins/Event/EventPlugin.php | 224 ++++++++++++++++++++++++++++-
 plugins/Event/Happening.php   | 198 ++++++++++++++++++++++++++
 plugins/Event/RSVP.php        | 255 ++++++++++++++++++----------------
 plugins/Event/eventform.php   | 157 +++++++++++++++++++++
 plugins/Event/newevent.php    | 217 ++++++++++++++++-------------
 plugins/Event/showevent.php   | 109 +++++++++++++++
 plugins/Event/showrsvp.php    | 117 ++++++++++++++++
 8 files changed, 1060 insertions(+), 401 deletions(-)
 delete mode 100644 plugins/Event/Event.php
 create mode 100644 plugins/Event/Happening.php
 create mode 100644 plugins/Event/eventform.php
 create mode 100644 plugins/Event/showevent.php
 create mode 100644 plugins/Event/showrsvp.php

diff --git a/plugins/Event/Event.php b/plugins/Event/Event.php
deleted file mode 100644
index 38d68c91ed..0000000000
--- a/plugins/Event/Event.php
+++ /dev/null
@@ -1,184 +0,0 @@
-<?php
-/**
- * Data class for counting greetings
- *
- * PHP version 5
- *
- * @category Data
- * @package  StatusNet
- * @author   Evan Prodromou <evan@status.net>
- * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
- * @link     http://status.net/
- *
- * StatusNet - the distributed open-source microblogging tool
- * Copyright (C) 2009, StatusNet, Inc.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.     See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-if (!defined('STATUSNET')) {
-    exit(1);
-}
-
-require_once INSTALLDIR . '/classes/Memcached_DataObject.php';
-
-/**
- * Data class for counting greetings
- *
- * We use the DB_DataObject framework for data classes in StatusNet. Each
- * table maps to a particular data class, making it easier to manipulate
- * data.
- *
- * Data classes should extend Memcached_DataObject, the (slightly misnamed)
- * extension of DB_DataObject that provides caching, internationalization,
- * and other bits of good functionality to StatusNet-specific data classes.
- *
- * @category Action
- * @package  StatusNet
- * @author   Evan Prodromou <evan@status.net>
- * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
- * @link     http://status.net/
- *
- * @see      DB_DataObject
- */
-
-class User_greeting_count extends Memcached_DataObject
-{
-    public $__table = 'user_greeting_count'; // table name
-    public $user_id;                         // int(4)  primary_key not_null
-    public $greeting_count;                  // int(4)
-
-    /**
-     * Get an instance by key
-     *
-     * This is a utility method to get a single instance with a given key value.
-     *
-     * @param string $k Key to use to lookup (usually 'user_id' for this class)
-     * @param mixed  $v Value to lookup
-     *
-     * @return User_greeting_count object found, or null for no hits
-     *
-     */
-    function staticGet($k, $v=null)
-    {
-        return Memcached_DataObject::staticGet('User_greeting_count', $k, $v);
-    }
-
-    /**
-     * return table definition for DB_DataObject
-     *
-     * DB_DataObject needs to know something about the table to manipulate
-     * instances. This method provides all the DB_DataObject needs to know.
-     *
-     * @return array array of column definitions
-     */
-    function table()
-    {
-        return array('user_id' => DB_DATAOBJECT_INT + DB_DATAOBJECT_NOTNULL,
-                     'greeting_count' => DB_DATAOBJECT_INT);
-    }
-
-    /**
-     * return key definitions for DB_DataObject
-     *
-     * DB_DataObject needs to know about keys that the table has, since it
-     * won't appear in StatusNet's own keys list. In most cases, this will
-     * simply reference your keyTypes() function.
-     *
-     * @return array list of key field names
-     */
-    function keys()
-    {
-        return array_keys($this->keyTypes());
-    }
-
-    /**
-     * return key definitions for Memcached_DataObject
-     *
-     * Our caching system uses the same key definitions, but uses a different
-     * method to get them. This key information is used to store and clear
-     * cached data, so be sure to list any key that will be used for static
-     * lookups.
-     *
-     * @return array associative array of key definitions, field name to type:
-     *         'K' for primary key: for compound keys, add an entry for each component;
-     *         'U' for unique keys: compound keys are not well supported here.
-     */
-    function keyTypes()
-    {
-        return array('user_id' => 'K');
-    }
-
-    /**
-     * Magic formula for non-autoincrementing integer primary keys
-     *
-     * If a table has a single integer column as its primary key, DB_DataObject
-     * assumes that the column is auto-incrementing and makes a sequence table
-     * to do this incrementation. Since we don't need this for our class, we
-     * overload this method and return the magic formula that DB_DataObject needs.
-     *
-     * @return array magic three-false array that stops auto-incrementing.
-     */
-    function sequenceKey()
-    {
-        return array(false, false, false);
-    }
-
-    /**
-     * Increment a user's greeting count and return instance
-     *
-     * This method handles the ins and outs of creating a new greeting_count for a
-     * user or fetching the existing greeting count and incrementing its value.
-     *
-     * @param integer $user_id ID of the user to get a count for
-     *
-     * @return User_greeting_count instance for this user, with count already incremented.
-     */
-    static function inc($user_id)
-    {
-        $gc = User_greeting_count::staticGet('user_id', $user_id);
-
-        if (empty($gc)) {
-
-            $gc = new User_greeting_count();
-
-            $gc->user_id        = $user_id;
-            $gc->greeting_count = 1;
-
-            $result = $gc->insert();
-
-            if (!$result) {
-                // TRANS: Exception thrown when the user greeting count could not be saved in the database.
-                // TRANS: %d is a user ID (number).
-                throw Exception(sprintf(_m("Could not save new greeting count for %d."),
-                                        $user_id));
-            }
-        } else {
-            $orig = clone($gc);
-
-            $gc->greeting_count++;
-
-            $result = $gc->update($orig);
-
-            if (!$result) {
-                // TRANS: Exception thrown when the user greeting count could not be saved in the database.
-                // TRANS: %d is a user ID (number).
-                throw Exception(sprintf(_m("Could not increment greeting count for %d."),
-                                        $user_id));
-            }
-        }
-
-        return $gc;
-    }
-}
diff --git a/plugins/Event/EventPlugin.php b/plugins/Event/EventPlugin.php
index af0875c805..d6d7e00fc1 100644
--- a/plugins/Event/EventPlugin.php
+++ b/plugins/Event/EventPlugin.php
@@ -58,7 +58,7 @@ class EventPlugin extends MicroappPlugin
     {
         $schema = Schema::get();
 
-        $schema->ensureTable('event', Event::schemaDef());
+        $schema->ensureTable('event', Happening::schemaDef());
         $schema->ensureTable('rsvp', RSVP::schemaDef());
 
         return true;
@@ -79,9 +79,14 @@ class EventPlugin extends MicroappPlugin
         {
         case 'NeweventAction':
         case 'NewrsvpAction':
+        case 'ShoweventAction':
+        case 'ShowrsvpAction':
             include_once $dir . '/' . strtolower(mb_substr($cls, 0, -6)) . '.php';
             return false;
-        case 'Event':
+        case 'EventForm':
+            include_once $dir . '/'.strtolower($cls).'.php';
+            break;
+        case 'Happening':
         case 'RSVP':
             include_once $dir . '/'.$cls.'.php';
             return false;
@@ -104,6 +109,12 @@ class EventPlugin extends MicroappPlugin
                     array('action' => 'newevent'));
         $m->connect('main/event/rsvp',
                     array('action' => 'newrsvp'));
+        $m->connect('event/:id',
+                    array('action' => 'showevent'),
+                    array('id' => '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}'));
+        $m->connect('rsvp/:id',
+                    array('action' => 'showrsvp'),
+                    array('id' => '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}'));
         return true;
     }
 
@@ -117,4 +128,213 @@ class EventPlugin extends MicroappPlugin
                             _m('Event invitations and RSVPs.'));
         return true;
     }
+
+    function appTitle() {
+        return _m('Event');
+    }
+
+    function tag() {
+        return 'event';
+    }
+
+    function types() {
+        return array(Happening::OBJECT_TYPE,
+                     RSVP::POSITIVE,
+                     RSVP::NEGATIVE,
+                     RSVP::POSSIBLE);
+    }
+
+    /**
+     * Given a parsed ActivityStreams activity, save it into a notice
+     * and other data structures.
+     *
+     * @param Activity $activity
+     * @param Profile $actor
+     * @param array $options=array()
+     *
+     * @return Notice the resulting notice
+     */
+    function saveNoticeFromActivity($activity, $actor, $options=array())
+    {
+        if (count($activity->objects) != 1) {
+            throw new Exception('Too many activity objects.');
+        }
+
+        $happeningObj = $activity->objects[0];
+
+        if ($happeningObj->type != Happening::OBJECT_TYPE) {
+            throw new Exception('Wrong type for object.');
+        }
+
+        $notice = null;
+
+        switch ($activity->verb) {
+        case ActivityVerb::POST:
+            $notice = Happening::saveNew($actor, 
+                                     $start_time, 
+                                     $end_time,
+                                     $happeningObj->title,
+                                     null,
+                                     $happeningObj->summary,
+                                     $options);
+            break;
+        case RSVP::POSITIVE:
+        case RSVP::NEGATIVE:
+        case RSVP::POSSIBLE:
+            $happening = Happening::staticGet('uri', $happeningObj->id);
+            if (empty($happening)) {
+                // FIXME: save the event
+                throw new Exception("RSVP for unknown event.");
+            }
+            $notice = RSVP::saveNew($actor, $happening, $activity->verb, $options);
+            break;
+        default:
+            throw new Exception("Unknown verb for events");
+        }
+
+        return $notice;
+    }
+
+    /**
+     * Turn a Notice into an activity object
+     *
+     * @param Notice $notice
+     *
+     * @return ActivityObject
+     */
+
+    function activityObjectFromNotice($notice)
+    {
+        $happening = null;
+
+        switch ($notice->object_type) {
+        case Happening::OBJECT_TYPE:
+            $happening = Happening::fromNotice($notice);
+            break;
+        case RSVP::POSITIVE:
+        case RSVP::NEGATIVE:
+        case RSVP::POSSIBLE:
+            $rsvp  = RSVP::fromNotice($notice);
+            $happening = $rsvp->getEvent();
+            break;
+        }
+
+        if (empty($happening)) {
+            throw new Exception("Unknown object type.");
+        }
+
+        $notice = $happening->getNotice();
+
+        if (empty($notice)) {
+            throw new Exception("Unknown event notice.");
+        }
+
+        $obj = new ActivityObject();
+
+        $obj->id      = $happening->uri;
+        $obj->type    = Happening::OBJECT_TYPE;
+        $obj->title   = $happening->title;
+        $obj->summary = $happening->description;
+        $obj->link    = $notice->bestUrl();
+
+        // XXX: how to get this stuff into JSON?!
+
+        $obj->extra[] = array('dtstart',
+                              array('xmlns' => 'urn:ietf:params:xml:ns:xcal'),
+                              common_date_iso8601($happening->start_date));
+
+        $obj->extra[] = array('dtend',
+                              array('xmlns' => 'urn:ietf:params:xml:ns:xcal'),
+                              common_date_iso8601($happening->end_date));
+
+        // XXX: probably need other stuff here
+
+        return $obj;
+    }
+
+    /**
+     * Change the verb on RSVP notices
+     *
+     * @param Notice $notice
+     *
+     * @return ActivityObject
+     */
+
+    function onEndNoticeAsActivity($notice, &$act) {
+        switch ($notice->object_type) {
+        case RSVP::POSITIVE:
+        case RSVP::NEGATIVE:
+        case RSVP::POSSIBLE:
+            $act->verb = $notice->object_type;
+            break;
+        }
+        return true;
+    }
+
+    /**
+     * Custom HTML output for our notices
+     *
+     * @param Notice $notice
+     * @param HTMLOutputter $out
+     */
+
+    function showNotice($notice, $out)
+    {
+        switch ($notice->object_type) {
+        case Happening::OBJECT_TYPE:
+            $this->showEventNotice($notice, $out);
+            break;
+        case RSVP::POSITIVE:
+        case RSVP::NEGATIVE:
+        case RSVP::POSSIBLE:
+            $this->showRSVPNotice($notice, $out);
+            break;
+        }
+    }
+
+    function showRSVPNotice($notice, $out)
+    {
+        $out->element('span', null, 'RSVP');
+        return;
+    }
+
+    function showEventNotice($notice, $out)
+    {
+        $out->raw($notice->rendered);
+        return;
+    }
+
+    /**
+     * Form for our app
+     *
+     * @param HTMLOutputter $out
+     * @return Widget
+     */
+
+    function entryForm($out)
+    {
+        return new EventForm($out);
+    }
+
+    /**
+     * When a notice is deleted, clean up related tables.
+     *
+     * @param Notice $notice
+     */
+
+    function deleteRelated($notice)
+    {
+        switch ($notice->object_type) {
+        case Happening::OBJECT_TYPE:
+            $happening = Happening::fromNotice($notice);
+            $happening->delete();
+            break;
+        case RSVP::POSITIVE:
+        case RSVP::NEGATIVE:
+        case RSVP::POSSIBLE:
+            $rsvp = RSVP::fromNotice($notice);
+            $rsvp->delete();
+            break;
+        }
+    }
 }
diff --git a/plugins/Event/Happening.php b/plugins/Event/Happening.php
new file mode 100644
index 0000000000..054e57c732
--- /dev/null
+++ b/plugins/Event/Happening.php
@@ -0,0 +1,198 @@
+<?php
+/**
+ * Data class for happenings
+ *
+ * PHP version 5
+ *
+ * @category Data
+ * @package  StatusNet
+ * @author   Evan Prodromou <evan@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
+ * @link     http://status.net/
+ *
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2011, StatusNet, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.     See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
+/**
+ * Data class for happenings
+ *
+ * There's already an Event class in lib/event.php, so we couldn't
+ * call this an Event without causing a hole in space-time.
+ *
+ * "Happening" seemed good enough.
+ *
+ * @category Event
+ * @package  StatusNet
+ * @author   Evan Prodromou <evan@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
+ * @link     http://status.net/
+ *
+ * @see      Managed_DataObject
+ */
+
+class Happening extends Managed_DataObject
+{
+    const OBJECT_TYPE = 'http://activitystrea.ms/schema/1.0/event';
+
+    public $__table = 'happening'; // table name
+    public $id;                    // varchar(36) UUID
+    public $uri;                   // varchar(255)
+    public $profile_id;            // int
+    public $start_time;            // datetime
+    public $end_time;              // datetime
+    public $title;                 // varchar(255)
+    public $location;              // varchar(255)
+    public $description;           // text
+    public $created;               // datetime
+
+    /**
+     * Get an instance by key
+     *
+     * @param string $k Key to use to lookup (usually 'id' for this class)
+     * @param mixed  $v Value to lookup
+     *
+     * @return Happening object found, or null for no hits
+     *
+     */
+    function staticGet($k, $v=null)
+    {
+        return Memcached_DataObject::staticGet('Happening', $k, $v);
+    }
+
+    /**
+     * The One True Thingy that must be defined and declared.
+     */
+    public static function schemaDef()
+    {
+        return array(
+            'description' => 'A real-world happening',
+            'fields' => array(
+                'id' => array('type' => 'char',
+                              'length' => 36,
+                              'not null' => true,
+                              'description' => 'UUID'),
+                'uri' => array('type' => 'varchar',
+                               'length' => 255,
+                               'not null' => true),
+                'profile_id' => array('type' => 'int'),
+                'start_time' => array('type' => 'datetime'),
+                'end_time' => array('type' => 'datetime'),
+                'title' => array('type' => 'varchar',
+                                 'length' => 255,
+                                 'not null' => true),
+                'location' => array('type' => 'varchar',
+                                    'length' => 255,
+                                    'not null' => true),
+                'description' => array('type' => 'text'),
+                'created' => array('type' => 'datetime',
+                                   'not null' => true),
+            ),
+            'primary key' => array('id'),
+            'unique keys' => array(
+                'happening_uri_key' => array('uri'),
+            ),
+        );
+    }
+
+    function saveNew($profile, $start_time, $end_time, $title, $location, $description, $options)
+    {
+        if (array_key_exists('uri', $options)) {
+            $other = Happening::staticGet('uri', $options['uri']);
+            if (!empty($other)) {
+                throw new ClientException(_('Event already exists.'));
+            }
+        }
+
+        $ev = new Happening();
+
+        $ev->id          = UUID::gen();
+        $ev->profile_id  = $profile->id;
+        $ev->start_time  = common_sql_date($start_time);
+        $ev->end_time    = common_sql_date($end_time);
+        $ev->title       = $title;
+        $ev->location    = $location;
+        $ev->description = $description;
+
+        if (array_key_exists('created', $options)) {
+            $ev->created = $options['created'];
+        } else {
+            $ev->created = common_sql_now();
+        }
+
+        if (array_key_exists('uri', $options)) {
+            $ev->uri = $options['uri'];
+        } else {
+            $ev->uri = common_local_url('showevent',
+                                        array('id' => $ev->id));
+        }
+
+        $ev->insert();
+
+        // XXX: does this get truncated?
+
+        $content = sprintf(_('"%s" %s - %s (%s): %s'),
+                           $title,
+                           common_exact_date($start_time),
+                           common_exact_date($end_time),
+                           $location,
+                           $description);
+
+        $rendered = sprintf(_('<span class="vevent">'.
+                              '<span class="summary">%s</span> '.
+                              '<abbr class="dtstart" title="%s">%s</a> - '.
+                              '<abbr class="dtend" title="%s">%s</a> '.
+                              '(<span class="location">%s</span>): '.
+                              '<span class="description">%s</span> '.
+                              '</span>'),
+                            htmlspecialchars($title),
+                            htmlspecialchars(common_date_iso8601($start_time)),
+                            htmlspecialchars(common_exact_date($start_time)),
+                            htmlspecialchars(common_date_iso8601($end_time)),
+                            htmlspecialchars(common_exact_date($end_time)),
+                            htmlspecialchars($location),
+                            htmlspecialchars($description));
+
+        $options = array_merge(array('object_type' => Happening::OBJECT_TYPE),
+                               $options);
+
+        if (!array_key_exists('uri', $options)) {
+            $options['uri'] = $ev->uri;
+        }
+
+        $saved = Notice::saveNew($profile->id,
+                                 $content,
+                                 array_key_exists('source', $options) ?
+                                 $options['source'] : 'web',
+                                 $options);
+
+        return $saved;
+    }
+
+    function getNotice()
+    {
+        return Notice::staticGet('uri', $this->uri);
+    }
+
+    static function fromNotice()
+    {
+        return Happening::staticGet('uri', $notice->uri);
+    }
+}
diff --git a/plugins/Event/RSVP.php b/plugins/Event/RSVP.php
index 38d68c91ed..69cae4b7dc 100644
--- a/plugins/Event/RSVP.php
+++ b/plugins/Event/RSVP.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Data class for counting greetings
+ * Data class for event RSVPs
  *
  * PHP version 5
  *
@@ -11,7 +11,7 @@
  * @link     http://status.net/
  *
  * StatusNet - the distributed open-source microblogging tool
- * Copyright (C) 2009, StatusNet, Inc.
+ * Copyright (C) 2011, StatusNet, Inc.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -31,154 +31,169 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/classes/Memcached_DataObject.php';
-
 /**
- * Data class for counting greetings
+ * Data class for event RSVPs
  *
- * We use the DB_DataObject framework for data classes in StatusNet. Each
- * table maps to a particular data class, making it easier to manipulate
- * data.
- *
- * Data classes should extend Memcached_DataObject, the (slightly misnamed)
- * extension of DB_DataObject that provides caching, internationalization,
- * and other bits of good functionality to StatusNet-specific data classes.
- *
- * @category Action
+ * @category Event
  * @package  StatusNet
  * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
  * @link     http://status.net/
  *
- * @see      DB_DataObject
+ * @see      Managed_DataObject
  */
 
-class User_greeting_count extends Memcached_DataObject
+class RSVP extends Managed_DataObject
 {
-    public $__table = 'user_greeting_count'; // table name
-    public $user_id;                         // int(4)  primary_key not_null
-    public $greeting_count;                  // int(4)
+    const POSITIVE = 'http://activitystrea.ms/schema/1.0/rsvp-yes';
+    const POSSIBLE = 'http://activitystrea.ms/schema/1.0/rsvp-maybe';
+    const NEGATIVE = 'http://activitystrea.ms/schema/1.0/rsvp-no';
+
+    public $__table = 'rsvp'; // table name
+    public $id;                // varchar(36) UUID
+    public $uri;               // varchar(255)
+    public $profile_id;        // int
+    public $event_id;          // varchar(36) UUID
+    public $result;            // tinyint
+    public $created;           // datetime
 
     /**
      * Get an instance by key
      *
-     * This is a utility method to get a single instance with a given key value.
-     *
-     * @param string $k Key to use to lookup (usually 'user_id' for this class)
+     * @param string $k Key to use to lookup (usually 'id' for this class)
      * @param mixed  $v Value to lookup
      *
-     * @return User_greeting_count object found, or null for no hits
+     * @return RSVP object found, or null for no hits
      *
      */
     function staticGet($k, $v=null)
     {
-        return Memcached_DataObject::staticGet('User_greeting_count', $k, $v);
+        return Memcached_DataObject::staticGet('RSVP', $k, $v);
     }
 
     /**
-     * return table definition for DB_DataObject
-     *
-     * DB_DataObject needs to know something about the table to manipulate
-     * instances. This method provides all the DB_DataObject needs to know.
-     *
-     * @return array array of column definitions
+     * The One True Thingy that must be defined and declared.
      */
-    function table()
+    public static function schemaDef()
     {
-        return array('user_id' => DB_DATAOBJECT_INT + DB_DATAOBJECT_NOTNULL,
-                     'greeting_count' => DB_DATAOBJECT_INT);
+        return array(
+            'description' => 'A real-world event',
+            'fields' => array(
+                'id' => array('type' => 'char',
+                              'length' => 36,
+                              'not null' => true,
+                              'description' => 'UUID'),
+                'uri' => array('type' => 'varchar',
+                               'length' => 255,
+                               'not null' => true),
+                'profile_id' => array('type' => 'int'),
+                'event_id' => array('type' => 'char',
+                              'length' => 36,
+                              'not null' => true,
+                              'description' => 'UUID'),
+                'result' => array('type' => 'tinyint',
+                                  'description' => '1, 0, or null for three-state yes, no, maybe'),
+                'created' => array('type' => 'datetime',
+                                   'not null' => true),
+            ),
+            'primary key' => array('id'),
+            'unique keys' => array(
+                'rsvp_uri_key' => array('uri'),
+                'rsvp_profile_event_key' => array('profile_id', 'event_id'),
+            ),
+            'foreign keys' => array('rsvp_event_id_key' => array('event', array('event_id' => 'id')),
+                                    'rsvp_profile_id__key' => array('profile', array('profile_id' => 'id'))),
+            'indexes' => array('rsvp_created_idx' => array('created')),
+        );
     }
 
-    /**
-     * return key definitions for DB_DataObject
-     *
-     * DB_DataObject needs to know about keys that the table has, since it
-     * won't appear in StatusNet's own keys list. In most cases, this will
-     * simply reference your keyTypes() function.
-     *
-     * @return array list of key field names
-     */
-    function keys()
+    function saveNew($profile, $event, $result, $options)
     {
-        return array_keys($this->keyTypes());
-    }
-
-    /**
-     * return key definitions for Memcached_DataObject
-     *
-     * Our caching system uses the same key definitions, but uses a different
-     * method to get them. This key information is used to store and clear
-     * cached data, so be sure to list any key that will be used for static
-     * lookups.
-     *
-     * @return array associative array of key definitions, field name to type:
-     *         'K' for primary key: for compound keys, add an entry for each component;
-     *         'U' for unique keys: compound keys are not well supported here.
-     */
-    function keyTypes()
-    {
-        return array('user_id' => 'K');
-    }
-
-    /**
-     * Magic formula for non-autoincrementing integer primary keys
-     *
-     * If a table has a single integer column as its primary key, DB_DataObject
-     * assumes that the column is auto-incrementing and makes a sequence table
-     * to do this incrementation. Since we don't need this for our class, we
-     * overload this method and return the magic formula that DB_DataObject needs.
-     *
-     * @return array magic three-false array that stops auto-incrementing.
-     */
-    function sequenceKey()
-    {
-        return array(false, false, false);
-    }
-
-    /**
-     * Increment a user's greeting count and return instance
-     *
-     * This method handles the ins and outs of creating a new greeting_count for a
-     * user or fetching the existing greeting count and incrementing its value.
-     *
-     * @param integer $user_id ID of the user to get a count for
-     *
-     * @return User_greeting_count instance for this user, with count already incremented.
-     */
-    static function inc($user_id)
-    {
-        $gc = User_greeting_count::staticGet('user_id', $user_id);
-
-        if (empty($gc)) {
-
-            $gc = new User_greeting_count();
-
-            $gc->user_id        = $user_id;
-            $gc->greeting_count = 1;
-
-            $result = $gc->insert();
-
-            if (!$result) {
-                // TRANS: Exception thrown when the user greeting count could not be saved in the database.
-                // TRANS: %d is a user ID (number).
-                throw Exception(sprintf(_m("Could not save new greeting count for %d."),
-                                        $user_id));
-            }
-        } else {
-            $orig = clone($gc);
-
-            $gc->greeting_count++;
-
-            $result = $gc->update($orig);
-
-            if (!$result) {
-                // TRANS: Exception thrown when the user greeting count could not be saved in the database.
-                // TRANS: %d is a user ID (number).
-                throw Exception(sprintf(_m("Could not increment greeting count for %d."),
-                                        $user_id));
+        if (array_key_exists('uri', $options)) {
+            $other = RSVP::staticGet('uri', $options['uri']);
+            if (!empty($other)) {
+                throw new ClientException(_('RSVP already exists.'));
             }
         }
 
-        return $gc;
+        $other = RSVP::pkeyGet(array('profile_id' => $profile->id,
+                                     'event_id' => $event->id));
+
+        if (!empty($other)) {
+            throw new ClientException(_('RSVP already exists.'));
+        }
+
+        $rsvp = new RSVP();
+
+        $rsvp->id          = UUID::gen();
+        $rsvp->profile_id  = $profile->id;
+        $rsvp->event_id    = $event->id;
+        $rsvp->result      = self::codeFor($result);
+
+        if (array_key_exists('created', $options)) {
+            $rsvp->created = $options['created'];
+        } else {
+            $rsvp->created = common_sql_now();
+        }
+
+        if (array_key_exists('uri', $options)) {
+            $rsvp->uri = $options['uri'];
+        } else {
+            $rsvp->uri = common_local_url('showrsvp',
+                                        array('id' => $rsvp->id));
+        }
+
+        $rsvp->insert();
+
+        // XXX: come up with something sexier
+
+        $content = sprintf(_('RSVPed %s for an event.'),
+                           ($result == RSVP::POSITIVE) ? _('positively') :
+                           ($result == RSVP::NEGATIVE) ? _('negatively') : _('possibly'));
+        
+        $rendered = $content;
+
+        $options = array_merge(array('object_type' => $result),
+                               $options);
+
+        if (!array_key_exists('uri', $options)) {
+            $options['uri'] = $rsvp->uri;
+        }
+
+        $eventNotice = $event->getNotice();
+
+        if (!empty($eventNotice)) {
+            $options['reply_to'] = $eventNotice->id;
+        }
+
+        $saved = Notice::saveNew($profile->id,
+                                 $content,
+                                 array_key_exists('source', $options) ?
+                                 $options['source'] : 'web',
+                                 $options);
+
+        return $saved;
+    }
+
+    function codeFor($verb)
+    {
+        return ($verb == RSVP::POSITIVE) ? 1 :
+            ($verb == RSVP::NEGATIVE) ? 0 : null;
+    }
+
+    function verbFor($code)
+    {
+        return ($code == 1) ? RSVP::POSITIVE :
+            ($code == 0) ? RSVP::NEGATIVE : null;
+    }
+
+    function getNotice()
+    {
+        return Notice::staticGet('uri', $this->uri);
+    }
+
+    static function fromNotice()
+    {
+        return RSVP::staticGet('uri', $notice->uri);
     }
 }
diff --git a/plugins/Event/eventform.php b/plugins/Event/eventform.php
new file mode 100644
index 0000000000..8347639b5b
--- /dev/null
+++ b/plugins/Event/eventform.php
@@ -0,0 +1,157 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2011, StatusNet, Inc.
+ *
+ * Form for entering an event
+ * 
+ * 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  Event
+ * @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);
+}
+
+/**
+ * Form for adding an event
+ *
+ * @category  Event
+ * @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 EventForm extends Form
+{
+    /**
+     * ID of the form
+     *
+     * @return int ID of the form
+     */
+
+    function id()
+    {
+        return 'form_new_event';
+    }
+
+    /**
+     * class of the form
+     *
+     * @return string class of the form
+     */
+
+    function formClass()
+    {
+        return 'form_settings ajax';
+    }
+
+    /**
+     * Action of the form
+     *
+     * @return string URL of the action
+     */
+
+    function action()
+    {
+        return common_local_url('newevent');
+    }
+
+    /**
+     * Data elements of the form
+     *
+     * @return void
+     */
+
+    function formData()
+    {
+        $this->out->elementStart('fieldset', array('id' => 'new_bookmark_data'));
+        $this->out->elementStart('ul', 'form_data');
+
+        $this->li();
+        $this->out->input('title',
+                          _('Title'),
+                          null,
+                          _('Title of the event'));
+        $this->unli();
+
+        $this->li();
+        $this->out->input('startdate',
+                          _('Start date'),
+                          null,
+                          _('Date the event starts'));
+        $this->unli();
+
+        $this->li();
+        $this->out->input('starttime',
+                          _('Start time'),
+                          null,
+                          _('Time the event starts'));
+        $this->unli();
+
+        $this->li();
+        $this->out->input('enddate',
+                          _('End date'),
+                          null,   
+                          _('Date the event ends'));
+        $this->unli();
+
+        $this->li();
+        $this->out->input('endtime',
+                          _('End time'),
+                          null,
+                          _('Time the event ends'));
+        $this->unli();
+
+        $this->li();
+        $this->out->input('location',
+                          _('Location'),
+                          null,
+                          _('Event location'));
+        $this->unli();
+
+        $this->li();
+        $this->out->input('description',
+                          _('Description'),
+                          null,
+                          _('Description of the event'));
+        $this->unli();
+
+        $this->out->elementEnd('ul');
+        $this->out->elementEnd('fieldset');
+    }
+
+    /**
+     * Action elements
+     *
+     * @return void
+     */
+
+    function formActions()
+    {
+        $this->out->submit('submit', _m('BUTTON', 'Save'));
+    }
+}
diff --git a/plugins/Event/newevent.php b/plugins/Event/newevent.php
index a793ac6de2..66b15ea41b 100644
--- a/plugins/Event/newevent.php
+++ b/plugins/Event/newevent.php
@@ -1,17 +1,11 @@
 <?php
 /**
- * Give a warm greeting to our friendly user
- *
- * PHP version 5
- *
- * @category Sample
- * @package  StatusNet
- * @author   Evan Prodromou <evan@status.net>
- * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
- * @link     http://status.net/
- *
  * StatusNet - the distributed open-source microblogging tool
- * Copyright (C) 2009, StatusNet, Inc.
+ * Copyright (C) 2011, StatusNet, Inc.
+ *
+ * Add a new event
+ * 
+ * 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
@@ -25,140 +19,173 @@
  *
  * 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  Event
+ * @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);
 }
 
 /**
- * Give a warm greeting to our friendly user
+ * Add a new event
  *
- * This sample action shows some basic ways of doing output in an action
- * class.
- *
- * Action classes have several output methods that they override from
- * the parent class.
- *
- * @category Sample
- * @package  StatusNet
- * @author   Evan Prodromou <evan@status.net>
- * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
- * @link     http://status.net/
+ * @category  Event
+ * @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 HelloAction extends Action
+
+class NeweventAction extends Action
 {
-    var $user = null;
-    var $gc   = null;
+    protected $user        = null;
+    protected $error       = null;
+    protected $complete    = null;
+    protected $title       = null;
+    protected $location    = null;
+    protected $description = null;
+    protected $start_time  = null;
+    protected $end_time    = null;
 
     /**
-     * Take arguments for running
+     * Returns the title of the action
      *
-     * This method is called first, and it lets the action class get
-     * all its arguments and validate them. It's also the time
-     * to fetch any relevant data from the database.
-     *
-     * Action classes should run parent::prepare($args) as the first
-     * line of this method to make sure the default argument-processing
-     * happens.
-     *
-     * @param array $args $_REQUEST args
-     *
-     * @return boolean success flag
+     * @return string Action title
      */
-    function prepare($args)
+
+    function title()
     {
-        parent::prepare($args);
+        return _('New event');
+    }
+
+    /**
+     * For initializing members of the class.
+     *
+     * @param array $argarray misc. arguments
+     *
+     * @return boolean true
+     */
+
+    function prepare($argarray)
+    {
+        parent::prepare($argarray);
 
         $this->user = common_current_user();
 
-        if (!empty($this->user)) {
-            $this->gc = User_greeting_count::inc($this->user->id);
+        if (empty($this->user)) {
+            throw new ClientException(_("Must be logged in to post a event."),
+                                      403);
         }
 
+        if ($this->isPost()) {
+            $this->checkSessionToken();
+        }
+
+        $this->title       = $this->trimmed('title');
+        $this->location    = $this->trimmed('location');
+        $this->description = $this->trimmed('description');
+
         return true;
     }
 
     /**
-     * Handle request
+     * Handler method
      *
-     * This is the main method for handling a request. Note that
-     * most preparation should be done in the prepare() method;
-     * by the time handle() is called the action should be
-     * more or less ready to go.
-     *
-     * @param array $args $_REQUEST args; handled in prepare()
+     * @param array $argarray is ignored since it's now passed in in prepare()
      *
      * @return void
      */
-    function handle($args)
-    {
-        parent::handle($args);
 
-        $this->showPage();
-    }
-
-    /**
-     * Title of this page
-     *
-     * Override this method to show a custom title.
-     *
-     * @return string Title of the page
-     */
-    function title()
+    function handle($argarray=null)
     {
-        if (empty($this->user)) {
-            return _m('Hello');
+        parent::handle($argarray);
+
+        if ($this->isPost()) {
+            $this->newEvent();
         } else {
-            return sprintf(_m('Hello, %s!'), $this->user->nickname);
+            $this->showPage();
         }
+
+        return;
     }
 
     /**
-     * Show content in the content area
-     *
-     * The default StatusNet page has a lot of decorations: menus,
-     * logos, tabs, all that jazz. This method is used to show
-     * content in the content area of the page; it's the main
-     * thing you want to overload.
-     *
-     * This method also demonstrates use of a plural localized string.
+     * Add a new event
      *
      * @return void
      */
+
+    function newEvent()
+    {
+        try {
+            if (empty($this->title)) {
+                throw new ClientException(_('Event must have a title.'));
+            }
+
+            if (empty($this->url)) {
+                throw new ClientException(_('Event must have an URL.'));
+            }
+
+
+            $saved = Event::saveNew($this->user->getProfile(),
+                                              $this->title,
+                                              $this->url,
+                                              $this->tags,
+                                              $this->description);
+
+        } catch (ClientException $ce) {
+            $this->error = $ce->getMessage();
+            $this->showPage();
+            return;
+        }
+
+        common_redirect($saved->bestUrl(), 303);
+    }
+
+    /**
+     * Show the event form
+     *
+     * @return void
+     */
+
     function showContent()
     {
-        if (empty($this->user)) {
-            $this->element('p', array('class' => 'greeting'),
-                           _m('Hello, stranger!'));
-        } else {
-            $this->element('p', array('class' => 'greeting'),
-                           sprintf(_m('Hello, %s'), $this->user->nickname));
-            $this->element('p', array('class' => 'greeting_count'),
-                           sprintf(_m('I have greeted you %d time.',
-                                      'I have greeted you %d times.',
-                                      $this->gc->greeting_count),
-                                   $this->gc->greeting_count));
+        if (!empty($this->error)) {
+            $this->element('p', 'error', $this->error);
         }
+
+        $form = new EventForm($this);
+
+        $form->show();
+
+        return;
     }
 
     /**
      * Return true if read only.
      *
-     * Some actions only read from the database; others read and write.
-     * The simple database load-balancer built into StatusNet will
-     * direct read-only actions to database mirrors (if they are configured),
-     * and read-write actions to the master database.
+     * MAY override
      *
-     * This defaults to false to avoid data integrity issues, but you
-     * should make sure to overload it for performance gains.
-     *
-     * @param array $args other arguments, if RO/RW status depends on them.
+     * @param array $args other arguments
      *
      * @return boolean is read only action?
      */
+
     function isReadOnly($args)
     {
-        return false;
+        if ($_SERVER['REQUEST_METHOD'] == 'GET' ||
+            $_SERVER['REQUEST_METHOD'] == 'HEAD') {
+            return true;
+        } else {
+            return false;
+        }
     }
 }
diff --git a/plugins/Event/showevent.php b/plugins/Event/showevent.php
new file mode 100644
index 0000000000..f8b032c111
--- /dev/null
+++ b/plugins/Event/showevent.php
@@ -0,0 +1,109 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2011, StatusNet, Inc.
+ *
+ * Show a single event
+ * 
+ * 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  Event
+ * @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);
+}
+
+/**
+ * Show a single event, with associated information
+ *
+ * @category  Event
+ * @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 ShoweventAction extends ShownoticeAction
+{
+    protected $id    = null;
+    protected $event = null;
+
+    /**
+     * For initializing members of the class.
+     *
+     * @param array $argarray misc. arguments
+     *
+     * @return boolean true
+     */
+
+    function prepare($argarray)
+    {
+        OwnerDesignAction::prepare($argarray);
+
+        $this->id = $this->trimmed('id');
+
+        $this->event = Event::staticGet('id', $this->id);
+
+        if (empty($this->event)) {
+            throw new ClientException(_('No such event.'), 404);
+        }
+
+        $this->notice = $event->getNotice();
+
+        if (empty($this->notice)) {
+            // Did we used to have it, and it got deleted?
+            throw new ClientException(_('No such event.'), 404);
+        }
+
+        $this->user = User::staticGet('id', $this->event->profile_id);
+
+        if (empty($this->user)) {
+            throw new ClientException(_('No such user.'), 404);
+        }
+
+        $this->profile = $this->user->getProfile();
+
+        if (empty($this->profile)) {
+            throw new ServerException(_('User without a profile.'));
+        }
+
+        $this->avatar = $this->profile->getAvatar(AVATAR_PROFILE_SIZE);
+
+        return true;
+    }
+
+    /**
+     * Title of the page
+     *
+     * Used by Action class for layout.
+     *
+     * @return string page tile
+     */
+
+    function title()
+    {
+        return $this->event->title;
+    }
+}
diff --git a/plugins/Event/showrsvp.php b/plugins/Event/showrsvp.php
new file mode 100644
index 0000000000..fde1d48f0e
--- /dev/null
+++ b/plugins/Event/showrsvp.php
@@ -0,0 +1,117 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2010, StatusNet, Inc.
+ *
+ * Show a single RSVP
+ * 
+ * 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  RSVP
+ * @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);
+}
+
+/**
+ * Show a single RSVP, with associated information
+ *
+ * @category  RSVP
+ * @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 ShowrsvpAction extends ShownoticeAction
+{
+    protected $rsvp = null;
+    protected $event = null;
+
+    /**
+     * For initializing members of the class.
+     *
+     * @param array $argarray misc. arguments
+     *
+     * @return boolean true
+     */
+
+    function prepare($argarray)
+    {
+        OwnerDesignAction::prepare($argarray);
+
+        $this->id = $this->trimmed('id');
+
+        $this->rsvp = RSVP::staticGet('id', $this->id);
+
+        if (empty($this->rsvp)) {
+            throw new ClientException(_('No such RSVP.'), 404);
+        }
+
+        $this->event = $this->rsvp->getEvent();
+
+        if (empty($this->event)) {
+            throw new ClientException(_('No such Event.'), 404);
+        }
+
+        $this->notice = $this->rsvp->getNotice();
+
+        if (empty($this->notice)) {
+            // Did we used to have it, and it got deleted?
+            throw new ClientException(_('No such RSVP.'), 404);
+        }
+
+        $this->user = User::staticGet('id', $this->rsvp->profile_id);
+
+        if (empty($this->user)) {
+            throw new ClientException(_('No such user.'), 404);
+        }
+
+        $this->profile = $this->user->getProfile();
+
+        if (empty($this->profile)) {
+            throw new ServerException(_('User without a profile.'));
+        }
+
+        $this->avatar = $this->profile->getAvatar(AVATAR_PROFILE_SIZE);
+
+        return true;
+    }
+
+    /**
+     * Title of the page
+     *
+     * Used by Action class for layout.
+     *
+     * @return string page tile
+     */
+
+    function title()
+    {
+        return sprintf(_('%s\'s RSVP for "%s"'),
+                       $this->user->nickname,
+                       $this->event->title);
+    }
+}

From ca36dfecf9217670f31d9c1c65c337064cd2413a Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Wed, 9 Mar 2011 02:37:51 -0500
Subject: [PATCH 463/655] more fixes for events

---
 plugins/Event/Happening.php |  2 +-
 plugins/Event/newevent.php  | 26 +++++++++++++++++++-------
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/plugins/Event/Happening.php b/plugins/Event/Happening.php
index 054e57c732..5ede26706b 100644
--- a/plugins/Event/Happening.php
+++ b/plugins/Event/Happening.php
@@ -112,7 +112,7 @@ class Happening extends Managed_DataObject
         );
     }
 
-    function saveNew($profile, $start_time, $end_time, $title, $location, $description, $options)
+    function saveNew($profile, $start_time, $end_time, $title, $location, $description, $options=array())
     {
         if (array_key_exists('uri', $options)) {
             $other = Happening::staticGet('uri', $options['uri']);
diff --git a/plugins/Event/newevent.php b/plugins/Event/newevent.php
index 66b15ea41b..fe23e8825d 100644
--- a/plugins/Event/newevent.php
+++ b/plugins/Event/newevent.php
@@ -93,6 +93,14 @@ class NeweventAction extends Action
         $this->location    = $this->trimmed('location');
         $this->description = $this->trimmed('description');
 
+        $start_date = $this->trimmed('start_date');
+        $start_time = $this->trimmed('start_time');
+        $end_date   = $this->trimmed('end_date');
+        $end_time   = $this->trimmed('end_time');
+
+        $this->start_time = strtotime($start_date . ' ' . $start_time);
+        $this->end_time   = strtotime($end_date . ' ' . $end_time);
+
         return true;
     }
 
@@ -130,16 +138,20 @@ class NeweventAction extends Action
                 throw new ClientException(_('Event must have a title.'));
             }
 
-            if (empty($this->url)) {
-                throw new ClientException(_('Event must have an URL.'));
+            if (empty($this->start_time)) {
+                throw new ClientException(_('Event must have a start time.'));
             }
 
+            if (empty($this->end_time)) {
+                throw new ClientException(_('Event must have an end time.'));
+            }
 
             $saved = Event::saveNew($this->user->getProfile(),
-                                              $this->title,
-                                              $this->url,
-                                              $this->tags,
-                                              $this->description);
+                                    $this->start_time,
+                                    $this->end_time,
+                                    $this->title,
+                                    $this->location,
+                                    $this->description);
 
         } catch (ClientException $ce) {
             $this->error = $ce->getMessage();
@@ -147,7 +159,7 @@ class NeweventAction extends Action
             return;
         }
 
-        common_redirect($saved->bestUrl(), 303);
+
     }
 
     /**

From 53e67b5ed5bb01e19fef02b98932e5d9d6e76160 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Wed, 9 Mar 2011 02:48:14 -0500
Subject: [PATCH 464/655] make new event work, sort of

---
 plugins/Event/EventPlugin.php |  2 +-
 plugins/Event/eventform.php   |  2 +-
 plugins/Event/newevent.php    | 44 +++++++++++++++++++++++++++++------
 3 files changed, 39 insertions(+), 9 deletions(-)

diff --git a/plugins/Event/EventPlugin.php b/plugins/Event/EventPlugin.php
index d6d7e00fc1..f33de09d78 100644
--- a/plugins/Event/EventPlugin.php
+++ b/plugins/Event/EventPlugin.php
@@ -58,7 +58,7 @@ class EventPlugin extends MicroappPlugin
     {
         $schema = Schema::get();
 
-        $schema->ensureTable('event', Happening::schemaDef());
+        $schema->ensureTable('happening', Happening::schemaDef());
         $schema->ensureTable('rsvp', RSVP::schemaDef());
 
         return true;
diff --git a/plugins/Event/eventform.php b/plugins/Event/eventform.php
index 8347639b5b..8d108020a6 100644
--- a/plugins/Event/eventform.php
+++ b/plugins/Event/eventform.php
@@ -66,7 +66,7 @@ class EventForm extends Form
 
     function formClass()
     {
-        return 'form_settings ajax';
+        return 'form_settings ajax-notice';
     }
 
     /**
diff --git a/plugins/Event/newevent.php b/plugins/Event/newevent.php
index fe23e8825d..365e9c1434 100644
--- a/plugins/Event/newevent.php
+++ b/plugins/Event/newevent.php
@@ -146,12 +146,12 @@ class NeweventAction extends Action
                 throw new ClientException(_('Event must have an end time.'));
             }
 
-            $saved = Event::saveNew($this->user->getProfile(),
-                                    $this->start_time,
-                                    $this->end_time,
-                                    $this->title,
-                                    $this->location,
-                                    $this->description);
+            $saved = Happening::saveNew($this->user->getProfile(),
+                                        $this->start_time,
+                                        $this->end_time,
+                                        $this->title,
+                                        $this->location,
+                                        $this->description);
 
         } catch (ClientException $ce) {
             $this->error = $ce->getMessage();
@@ -159,7 +159,21 @@ class NeweventAction extends Action
             return;
         }
 
-
+        if ($this->boolean('ajax')) {
+            header('Content-Type: text/xml;charset=utf-8');
+            $this->xw->startDocument('1.0', 'UTF-8');
+            $this->elementStart('html');
+            $this->elementStart('head');
+            // TRANS: Page title after sending a notice.
+            $this->element('title', null, _('Event saved'));
+            $this->elementEnd('head');
+            $this->elementStart('body');
+            $this->showNotice($saved);
+            $this->elementEnd('body');
+            $this->elementEnd('html');
+        } else {
+            common_redirect($saved->bestUrl(), 303);
+        }
     }
 
     /**
@@ -200,4 +214,20 @@ class NeweventAction extends Action
             return false;
         }
     }
+
+
+    /**
+     * Output a notice
+     *
+     * Used to generate the notice code for Ajax results.
+     *
+     * @param Notice $notice Notice that was saved
+     *
+     * @return void
+     */
+    function showNotice($notice)
+    {
+        $nli = new NoticeListItem($notice, $this);
+        $nli->show();
+    }
 }

From f00f5f20b8b373fc8631071e8be6522a937a7690 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Wed, 9 Mar 2011 10:07:30 -0500
Subject: [PATCH 465/655] add url to events

---
 plugins/Event/EventPlugin.php | 65 +++++++++++++++++++++++++++++++++--
 plugins/Event/Happening.php   | 24 +++++++++----
 plugins/Event/RSVP.php        |  2 +-
 plugins/Event/eventform.php   |  7 ++++
 plugins/Event/newevent.php    |  8 +++--
 5 files changed, 94 insertions(+), 12 deletions(-)

diff --git a/plugins/Event/EventPlugin.php b/plugins/Event/EventPlugin.php
index f33de09d78..896ecaf5c8 100644
--- a/plugins/Event/EventPlugin.php
+++ b/plugins/Event/EventPlugin.php
@@ -300,8 +300,69 @@ class EventPlugin extends MicroappPlugin
 
     function showEventNotice($notice, $out)
     {
-        $out->raw($notice->rendered);
-        return;
+        $profile = $notice->getProfile();
+        $event   = Happening::fromNotice($notice);
+
+        assert(!empty($event));
+        assert(!empty($profile));
+
+        $out->elementStart('div', 'vevent');
+
+        $out->elementStart('h3');
+
+        if (!empty($event->url)) {
+            $out->element('a',
+                          array('href' => $att->url,
+                                'class' => 'event-title entry-title summary'),
+                          $event->title);
+        } else {
+            $out->text($event->title);
+        }
+
+        $out->elementEnd('h3');
+
+        $out->elementStart('div', 'event-times');
+        $out->element('abbr', array('class' => 'dtstart',
+                                    'title' => common_date_iso8601($event->start_time)),
+                      common_exact_date($event->start_time));
+        $out->text(' - ');
+        $out->element('span', array('class' => 'dtend',
+                                    'title' => common_date_iso8601($event->end_time)),
+                      common_exact_date($event->end_time));
+        $out->elementEnd('div');
+
+        if (!empty($event->description)) {
+            $out->element('div', 'description', $event->description);
+        }
+
+        if (!empty($event->location)) {
+            $out->element('div', 'location', $event->location);
+        }
+
+        $out->elementStart('div', array('class' => 'event-info entry-content'));
+
+        $avatar = $profile->getAvatar(AVATAR_MINI_SIZE);
+
+        $out->element('img', 
+                      array('src' => ($avatar) ?
+                            $avatar->displayUrl() :
+                            Avatar::defaultImage(AVATAR_MINI_SIZE),
+                            'class' => 'avatar photo bookmark-avatar',
+                            'width' => AVATAR_MINI_SIZE,
+                            'height' => AVATAR_MINI_SIZE,
+                            'alt' => $profile->getBestName()));
+
+        $out->raw('&#160;'); // avoid &nbsp; for AJAX XML compatibility
+
+        $out->elementStart('span', 'vcard author'); // hack for belongsOnTimeline; JS needs to be able to find the author
+        $out->element('a', 
+                      array('class' => 'url',
+                            'href' => $profile->profileurl,
+                            'title' => $profile->getBestName()),
+                      $profile->nickname);
+        $out->elementEnd('span');
+
+        $out->elementEnd('div');
     }
 
     /**
diff --git a/plugins/Event/Happening.php b/plugins/Event/Happening.php
index 5ede26706b..503cd8af14 100644
--- a/plugins/Event/Happening.php
+++ b/plugins/Event/Happening.php
@@ -60,6 +60,7 @@ class Happening extends Managed_DataObject
     public $end_time;              // datetime
     public $title;                 // varchar(255)
     public $location;              // varchar(255)
+    public $url;                   // varchar(255)
     public $description;           // text
     public $created;               // datetime
 
@@ -92,15 +93,16 @@ class Happening extends Managed_DataObject
                 'uri' => array('type' => 'varchar',
                                'length' => 255,
                                'not null' => true),
-                'profile_id' => array('type' => 'int'),
-                'start_time' => array('type' => 'datetime'),
-                'end_time' => array('type' => 'datetime'),
+                'profile_id' => array('type' => 'int', 'not null' => true),
+                'start_time' => array('type' => 'datetime', 'not null' => true),
+                'end_time' => array('type' => 'datetime', 'not null' => true),
                 'title' => array('type' => 'varchar',
                                  'length' => 255,
                                  'not null' => true),
                 'location' => array('type' => 'varchar',
-                                    'length' => 255,
-                                    'not null' => true),
+                                    'length' => 255),
+                'url' => array('type' => 'varchar',
+                               'length' => 255),
                 'description' => array('type' => 'text'),
                 'created' => array('type' => 'datetime',
                                    'not null' => true),
@@ -109,10 +111,13 @@ class Happening extends Managed_DataObject
             'unique keys' => array(
                 'happening_uri_key' => array('uri'),
             ),
+            'foreign keys' => array('happening_profile_id__key' => array('profile', array('profile_id' => 'id'))),
+            'indexes' => array('happening_created_idx' => array('created'),
+                               'happening_start_end_idx' => array('start_time', 'end_time')),
         );
     }
 
-    function saveNew($profile, $start_time, $end_time, $title, $location, $description, $options=array())
+    function saveNew($profile, $start_time, $end_time, $title, $location, $description, $url, $options=array())
     {
         if (array_key_exists('uri', $options)) {
             $other = Happening::staticGet('uri', $options['uri']);
@@ -130,6 +135,7 @@ class Happening extends Managed_DataObject
         $ev->title       = $title;
         $ev->location    = $location;
         $ev->description = $description;
+        $ev->url         = $url;
 
         if (array_key_exists('created', $options)) {
             $ev->created = $options['created'];
@@ -177,6 +183,10 @@ class Happening extends Managed_DataObject
             $options['uri'] = $ev->uri;
         }
 
+        if (!empty($url)) {
+            $options['urls'] = array($url);
+        }
+
         $saved = Notice::saveNew($profile->id,
                                  $content,
                                  array_key_exists('source', $options) ?
@@ -191,7 +201,7 @@ class Happening extends Managed_DataObject
         return Notice::staticGet('uri', $this->uri);
     }
 
-    static function fromNotice()
+    static function fromNotice($notice)
     {
         return Happening::staticGet('uri', $notice->uri);
     }
diff --git a/plugins/Event/RSVP.php b/plugins/Event/RSVP.php
index 69cae4b7dc..851978e819 100644
--- a/plugins/Event/RSVP.php
+++ b/plugins/Event/RSVP.php
@@ -192,7 +192,7 @@ class RSVP extends Managed_DataObject
         return Notice::staticGet('uri', $this->uri);
     }
 
-    static function fromNotice()
+    static function fromNotice($notice)
     {
         return RSVP::staticGet('uri', $notice->uri);
     }
diff --git a/plugins/Event/eventform.php b/plugins/Event/eventform.php
index 8d108020a6..e6bc1e7016 100644
--- a/plugins/Event/eventform.php
+++ b/plugins/Event/eventform.php
@@ -133,6 +133,13 @@ class EventForm extends Form
                           _('Event location'));
         $this->unli();
 
+        $this->li();
+        $this->out->input('url',
+                          _('URL'),
+                          null,
+                          _('URL for more information'));
+        $this->unli();
+
         $this->li();
         $this->out->input('description',
                           _('Description'),
diff --git a/plugins/Event/newevent.php b/plugins/Event/newevent.php
index 365e9c1434..7c0fd0177f 100644
--- a/plugins/Event/newevent.php
+++ b/plugins/Event/newevent.php
@@ -91,6 +91,7 @@ class NeweventAction extends Action
 
         $this->title       = $this->trimmed('title');
         $this->location    = $this->trimmed('location');
+        $this->url         = $this->trimmed('url');
         $this->description = $this->trimmed('description');
 
         $start_date = $this->trimmed('start_date');
@@ -146,12 +147,15 @@ class NeweventAction extends Action
                 throw new ClientException(_('Event must have an end time.'));
             }
 
-            $saved = Happening::saveNew($this->user->getProfile(),
+            $profile = $this->user->getProfile();
+
+            $saved = Happening::saveNew($profile,
                                         $this->start_time,
                                         $this->end_time,
                                         $this->title,
                                         $this->location,
-                                        $this->description);
+                                        $this->description,
+                                        $this->url);
 
         } catch (ClientException $ce) {
             $this->error = $ce->getMessage();

From a4b3edaf40a397fca66f1f6be4b3c21af03ab6c8 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Wed, 9 Mar 2011 10:11:59 -0500
Subject: [PATCH 466/655] Login actions don't show the notice form

---
 actions/login.php              | 4 ++++
 actions/register.php           | 4 ++++
 plugins/OpenID/openidlogin.php | 4 ++++
 3 files changed, 12 insertions(+)

diff --git a/actions/login.php b/actions/login.php
index 768bc04cef..547374a12e 100644
--- a/actions/login.php
+++ b/actions/login.php
@@ -297,4 +297,8 @@ class LoginAction extends Action
         $nav = new LoginGroupNav($this);
         $nav->show();
     }
+
+    function showNoticeForm()
+    {
+    }
 }
diff --git a/actions/register.php b/actions/register.php
index 6b039c93f6..d0dbceeb81 100644
--- a/actions/register.php
+++ b/actions/register.php
@@ -606,4 +606,8 @@ class RegisterAction extends Action
         $nav = new LoginGroupNav($this);
         $nav->show();
     }
+
+    function showNoticeForm()
+    {
+    }
 }
diff --git a/plugins/OpenID/openidlogin.php b/plugins/OpenID/openidlogin.php
index 8d25a2e9ac..850b68e63a 100644
--- a/plugins/OpenID/openidlogin.php
+++ b/plugins/OpenID/openidlogin.php
@@ -174,4 +174,8 @@ class OpenidloginAction extends Action
         $nav = new LoginGroupNav($this);
         $nav->show();
     }
+
+    function showNoticeForm()
+    {
+    }
 }

From 3d310c80bed74015d0a56d3f6e37d23302b7a633 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Wed, 9 Mar 2011 10:12:53 -0500
Subject: [PATCH 467/655] no notice form on error pages

---
 lib/error.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/error.php b/lib/error.php
index 762425dc44..d234ab92b2 100644
--- a/lib/error.php
+++ b/lib/error.php
@@ -91,6 +91,7 @@ class ErrorAction extends InfoAction
         $this->element('div', array('class' => 'error'), $this->message);
     }
 
-
-
+    function showNoticeForm()
+    {
+    }
 }

From b150b9439a05d954e8ea17bc366b50d2a50e4ae8 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Wed, 9 Mar 2011 10:15:19 -0500
Subject: [PATCH 468/655] don't show register in login if already logged in

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

diff --git a/lib/logingroupnav.php b/lib/logingroupnav.php
index 3c67f76322..5d1b52f795 100644
--- a/lib/logingroupnav.php
+++ b/lib/logingroupnav.php
@@ -66,7 +66,8 @@ class LoginGroupNav extends Menu
                                     _('Login with a username and password'),
                                     $action_name === 'login');
 
-            if (!(common_config('site','closed') || common_config('site','inviteonly'))) {
+            if (!common_logged_in() &&
+                !(common_config('site','closed') || common_config('site','inviteonly'))) {
                 $this->action->menuItem(common_local_url('register'),
                                         // TRANS: Menu item for registering with the StatusNet site.
                                         _m('MENU','Register'),

From 04a3157681ed5375220c1030b7d5043413ecd65a Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Wed, 9 Mar 2011 10:25:50 -0500
Subject: [PATCH 469/655] stream for direct responses

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

diff --git a/classes/Notice.php b/classes/Notice.php
index d520f4728f..d49a8f483b 100644
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -463,6 +463,10 @@ class Notice extends Memcached_DataObject
         // was not the root of the conversation.  What to do now?
 
         self::blow('notice:conversation_ids:%d', $this->conversation);
+        
+        if (!empty($this->reply_to)) {
+            self::blow('notice:responses:%d', $this->reply_to);
+        }
 
         if (!empty($this->repeat_of)) {
             self::blow('notice:repeats:%d', $this->repeat_of);
@@ -492,6 +496,7 @@ class Notice extends Memcached_DataObject
         $this->blowOnInsert();
 
         self::blow('profile:notice_ids:%d;last', $this->profile_id);
+        self::blow('notice:responses:%d', $this->id);
 
         if ($this->isPublic()) {
             self::blow('public;last');
@@ -2133,4 +2138,46 @@ class Notice extends Memcached_DataObject
                     ($this->is_local != Notice::GATEWAY));
         }
     }
+
+    function responseStream($offset=0, $limit=20, $since_id=0, $max_id=0)
+    {
+        $ids = Notice::stream(array($this, '_responseStreamDirect'),
+                              array(),
+                              'notice:responses:'.$id,
+                              $offset, $limit, $since_id, $max_id);
+
+        return Notice::getStreamByIds($ids);
+    }
+
+    function _responseStreamDirect($offset=0, $limit=20, $since_id=0, $max_id=0)
+    {
+        $notice = new Notice();
+
+        $notice->selectAdd(); // clears it
+        $notice->selectAdd('id');
+
+        $notice->reply_to = $this->reply_to;
+
+        $notice->orderBy('created DESC, id DESC');
+
+        if (!is_null($offset)) {
+            $notice->limit($offset, $limit);
+        }
+
+        Notice::addWhereSinceId($notice, $since_id);
+        Notice::addWhereMaxId($notice, $max_id);
+
+        $ids = array();
+
+        if ($notice->find()) {
+            while ($notice->fetch()) {
+                $ids[] = $notice->id;
+            }
+        }
+
+        $notice->free();
+        $notice = NULL;
+
+        return $ids;
+    }
 }

From 1e4e9a8456907821a2c84ae17ec4f28b0fb44604 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Wed, 9 Mar 2011 10:40:19 -0500
Subject: [PATCH 470/655] Revert "stream for direct responses"

I don't actually need this so I'm reverting it.

This reverts commit 04a3157681ed5375220c1030b7d5043413ecd65a.
---
 classes/Notice.php | 47 ----------------------------------------------
 1 file changed, 47 deletions(-)

diff --git a/classes/Notice.php b/classes/Notice.php
index d49a8f483b..d520f4728f 100644
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -463,10 +463,6 @@ class Notice extends Memcached_DataObject
         // was not the root of the conversation.  What to do now?
 
         self::blow('notice:conversation_ids:%d', $this->conversation);
-        
-        if (!empty($this->reply_to)) {
-            self::blow('notice:responses:%d', $this->reply_to);
-        }
 
         if (!empty($this->repeat_of)) {
             self::blow('notice:repeats:%d', $this->repeat_of);
@@ -496,7 +492,6 @@ class Notice extends Memcached_DataObject
         $this->blowOnInsert();
 
         self::blow('profile:notice_ids:%d;last', $this->profile_id);
-        self::blow('notice:responses:%d', $this->id);
 
         if ($this->isPublic()) {
             self::blow('public;last');
@@ -2138,46 +2133,4 @@ class Notice extends Memcached_DataObject
                     ($this->is_local != Notice::GATEWAY));
         }
     }
-
-    function responseStream($offset=0, $limit=20, $since_id=0, $max_id=0)
-    {
-        $ids = Notice::stream(array($this, '_responseStreamDirect'),
-                              array(),
-                              'notice:responses:'.$id,
-                              $offset, $limit, $since_id, $max_id);
-
-        return Notice::getStreamByIds($ids);
-    }
-
-    function _responseStreamDirect($offset=0, $limit=20, $since_id=0, $max_id=0)
-    {
-        $notice = new Notice();
-
-        $notice->selectAdd(); // clears it
-        $notice->selectAdd('id');
-
-        $notice->reply_to = $this->reply_to;
-
-        $notice->orderBy('created DESC, id DESC');
-
-        if (!is_null($offset)) {
-            $notice->limit($offset, $limit);
-        }
-
-        Notice::addWhereSinceId($notice, $since_id);
-        Notice::addWhereMaxId($notice, $max_id);
-
-        $ids = array();
-
-        if ($notice->find()) {
-            while ($notice->fetch()) {
-                $ids[] = $notice->id;
-            }
-        }
-
-        $notice->free();
-        $notice = NULL;
-
-        return $ids;
-    }
 }

From 728869e3110d3246dc1943a5d6ca14e88a2cc821 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Wed, 9 Mar 2011 10:40:49 -0500
Subject: [PATCH 471/655] show RSVPs for an event

---
 plugins/Event/EventPlugin.php | 10 ++++++++++
 plugins/Event/Happening.php   |  5 +++++
 plugins/Event/RSVP.php        | 18 ++++++++++++++++++
 3 files changed, 33 insertions(+)

diff --git a/plugins/Event/EventPlugin.php b/plugins/Event/EventPlugin.php
index 896ecaf5c8..d8d9b572ed 100644
--- a/plugins/Event/EventPlugin.php
+++ b/plugins/Event/EventPlugin.php
@@ -321,6 +321,8 @@ class EventPlugin extends MicroappPlugin
 
         $out->elementEnd('h3');
 
+        // FIXME: better dates
+
         $out->elementStart('div', 'event-times');
         $out->element('abbr', array('class' => 'dtstart',
                                     'title' => common_date_iso8601($event->start_time)),
@@ -339,6 +341,14 @@ class EventPlugin extends MicroappPlugin
             $out->element('div', 'location', $event->location);
         }
 
+        $rsvps = $event->getRSVPs();
+
+        $out->element('div', 'event-rsvps',
+                      sprintf(_('Yes: %d No: %d Maybe: %d'),
+                              count($rsvps[RSVP::POSITIVE]),
+                              count($rsvps[RSVP::NEGATIVE]),
+                              count($rsvps[RSVP::POSSIBLE])));
+
         $out->elementStart('div', array('class' => 'event-info entry-content'));
 
         $avatar = $profile->getAvatar(AVATAR_MINI_SIZE);
diff --git a/plugins/Event/Happening.php b/plugins/Event/Happening.php
index 503cd8af14..b2adb4d9b5 100644
--- a/plugins/Event/Happening.php
+++ b/plugins/Event/Happening.php
@@ -205,4 +205,9 @@ class Happening extends Managed_DataObject
     {
         return Happening::staticGet('uri', $notice->uri);
     }
+
+    function getRSVPs()
+    {
+        return RSVP::forEvent($this);
+    }
 }
diff --git a/plugins/Event/RSVP.php b/plugins/Event/RSVP.php
index 851978e819..36c6b32ec7 100644
--- a/plugins/Event/RSVP.php
+++ b/plugins/Event/RSVP.php
@@ -196,4 +196,22 @@ class RSVP extends Managed_DataObject
     {
         return RSVP::staticGet('uri', $notice->uri);
     }
+
+    static function forEvent($event)
+    {
+        $rsvps = array(RSVP::POSITIVE => array(), RSVP::NEGATIVE => array(), RSVP::POSSIBLE => array());
+
+        $rsvp = new RSVP();
+
+        $rsvp->event_id = $event->id;
+
+        if ($rsvp->find()) {
+            while ($rsvp->fetch()) {
+                $verb = $this->verbFor($rsvp->code);
+                $rsvps[$verb][] = clone($rsvp);
+            }
+        }
+
+        return $rsvps;
+    }
 }

From 35429c28e5bdde71fe9dff9e69ef795a31a96e8d Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Wed, 9 Mar 2011 12:28:25 -0500
Subject: [PATCH 472/655] updates to make RSVPs work

---
 plugins/Event/EventPlugin.php    |  23 +++-
 plugins/Event/Happening.php      |   6 +
 plugins/Event/RSVP.php           |  32 ++++-
 plugins/Event/cancelrsvp.php     | 202 ++++++++++++++++++++++++++++
 plugins/Event/cancelrsvpform.php | 128 ++++++++++++++++++
 plugins/Event/newevent.php       |   4 +
 plugins/Event/newrsvp.php        | 218 ++++++++++++++++++-------------
 plugins/Event/rsvpform.php       | 120 +++++++++++++++++
 plugins/Event/showevent.php      |   4 +-
 9 files changed, 638 insertions(+), 99 deletions(-)
 create mode 100644 plugins/Event/cancelrsvp.php
 create mode 100644 plugins/Event/cancelrsvpform.php
 create mode 100644 plugins/Event/rsvpform.php

diff --git a/plugins/Event/EventPlugin.php b/plugins/Event/EventPlugin.php
index d8d9b572ed..7ca2fa9c0e 100644
--- a/plugins/Event/EventPlugin.php
+++ b/plugins/Event/EventPlugin.php
@@ -79,11 +79,14 @@ class EventPlugin extends MicroappPlugin
         {
         case 'NeweventAction':
         case 'NewrsvpAction':
+        case 'CancelrsvpAction':
         case 'ShoweventAction':
         case 'ShowrsvpAction':
             include_once $dir . '/' . strtolower(mb_substr($cls, 0, -6)) . '.php';
             return false;
         case 'EventForm':
+        case 'RSVPForm':
+        case 'CancelRSVPForm':
             include_once $dir . '/'.strtolower($cls).'.php';
             break;
         case 'Happening':
@@ -109,6 +112,8 @@ class EventPlugin extends MicroappPlugin
                     array('action' => 'newevent'));
         $m->connect('main/event/rsvp',
                     array('action' => 'newrsvp'));
+        $m->connect('main/event/rsvp/cancel',
+                    array('action' => 'cancelrsvp'));
         $m->connect('event/:id',
                     array('action' => 'showevent'),
                     array('id' => '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}'));
@@ -294,7 +299,7 @@ class EventPlugin extends MicroappPlugin
 
     function showRSVPNotice($notice, $out)
     {
-        $out->element('span', null, 'RSVP');
+        $out->raw($notice->rendered);
         return;
     }
 
@@ -312,7 +317,7 @@ class EventPlugin extends MicroappPlugin
 
         if (!empty($event->url)) {
             $out->element('a',
-                          array('href' => $att->url,
+                          array('href' => $event->url,
                                 'class' => 'event-title entry-title summary'),
                           $event->title);
         } else {
@@ -349,6 +354,20 @@ class EventPlugin extends MicroappPlugin
                               count($rsvps[RSVP::NEGATIVE]),
                               count($rsvps[RSVP::POSSIBLE])));
 
+        $user = common_current_user();
+
+        if (!empty($user)) {
+            $rsvp = $event->getRSVP($user->getProfile());
+
+            if (empty($rsvp)) {
+                $form = new RSVPForm($event, $out);
+            } else {
+                $form = new CancelRSVPForm($rsvp, $out);
+            }
+
+            $form->show();
+        }
+
         $out->elementStart('div', array('class' => 'event-info entry-content'));
 
         $avatar = $profile->getAvatar(AVATAR_MINI_SIZE);
diff --git a/plugins/Event/Happening.php b/plugins/Event/Happening.php
index b2adb4d9b5..1a6a028dca 100644
--- a/plugins/Event/Happening.php
+++ b/plugins/Event/Happening.php
@@ -210,4 +210,10 @@ class Happening extends Managed_DataObject
     {
         return RSVP::forEvent($this);
     }
+
+    function getRSVP($profile)
+    {
+        return RSVP::pkeyGet(array('profile_id' => $profile->id,
+                                   'event_id' => $this->id));
+    }
 }
diff --git a/plugins/Event/RSVP.php b/plugins/Event/RSVP.php
index 36c6b32ec7..22bd239a68 100644
--- a/plugins/Event/RSVP.php
+++ b/plugins/Event/RSVP.php
@@ -71,13 +71,27 @@ class RSVP extends Managed_DataObject
         return Memcached_DataObject::staticGet('RSVP', $k, $v);
     }
 
+    /**
+     * Get an instance by compound key
+     *
+     * @param array $kv array of key-value mappings
+     *
+     * @return Bookmark object found, or null for no hits
+     *
+     */
+
+    function pkeyGet($kv)
+    {
+        return Memcached_DataObject::pkeyGet('RSVP', $kv);
+    }
+
     /**
      * The One True Thingy that must be defined and declared.
      */
     public static function schemaDef()
     {
         return array(
-            'description' => 'A real-world event',
+            'description' => 'Plan to attend event',
             'fields' => array(
                 'id' => array('type' => 'char',
                               'length' => 36,
@@ -107,7 +121,7 @@ class RSVP extends Managed_DataObject
         );
     }
 
-    function saveNew($profile, $event, $result, $options)
+    function saveNew($profile, $event, $result, $options=array())
     {
         if (array_key_exists('uri', $options)) {
             $other = RSVP::staticGet('uri', $options['uri']);
@@ -181,7 +195,7 @@ class RSVP extends Managed_DataObject
             ($verb == RSVP::NEGATIVE) ? 0 : null;
     }
 
-    function verbFor($code)
+    static function verbFor($code)
     {
         return ($code == 1) ? RSVP::POSITIVE :
             ($code == 0) ? RSVP::NEGATIVE : null;
@@ -189,7 +203,11 @@ class RSVP extends Managed_DataObject
 
     function getNotice()
     {
-        return Notice::staticGet('uri', $this->uri);
+        $notice = Notice::staticGet('uri', $this->uri);
+        if (empty($notice)) {
+            throw new ServerException("RSVP {$this->id} does not correspond to a notice in the DB.");
+        }
+        return $notice;
     }
 
     static function fromNotice($notice)
@@ -207,11 +225,15 @@ class RSVP extends Managed_DataObject
 
         if ($rsvp->find()) {
             while ($rsvp->fetch()) {
-                $verb = $this->verbFor($rsvp->code);
+                $verb = self::verbFor($rsvp->result);
                 $rsvps[$verb][] = clone($rsvp);
             }
         }
 
         return $rsvps;
     }
+
+    function delete()
+    {
+    }
 }
diff --git a/plugins/Event/cancelrsvp.php b/plugins/Event/cancelrsvp.php
new file mode 100644
index 0000000000..21ed41a451
--- /dev/null
+++ b/plugins/Event/cancelrsvp.php
@@ -0,0 +1,202 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2011, StatusNet, Inc.
+ *
+ * Cancel the RSVP for an event
+ * 
+ * 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  Event
+ * @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);
+}
+
+/**
+ * RSVP for an event
+ *
+ * @category  Event
+ * @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 CancelrsvpAction extends Action
+{
+    protected $user  = null;
+    protected $rsvp  = null;
+    protected $event = null;
+
+    /**
+     * Returns the title of the action
+     *
+     * @return string Action title
+     */
+
+    function title()
+    {
+        return _('Cancel RSVP');
+    }
+
+    /**
+     * For initializing members of the class.
+     *
+     * @param array $argarray misc. arguments
+     *
+     * @return boolean true
+     */
+
+    function prepare($argarray)
+    {
+        parent::prepare($argarray);
+
+        $rsvpId = $this->trimmed('rsvp');
+
+        if (empty($rsvpId)) {
+            throw new ClientException(_('No such rsvp.'));
+        }
+
+        $this->rsvp = RSVP::staticGet('id', $rsvpId);
+
+        if (empty($this->rsvp)) {
+            throw new ClientException(_('No such rsvp.'));
+        }
+
+        $this->event = Happening::staticGet('id', $this->rsvp->event_id);
+
+        if (empty($this->event)) {
+            throw new ClientException(_('No such event.'));
+        }
+
+        $this->user = common_current_user();
+
+        if (empty($this->user)) {
+            throw new ClientException(_('You must be logged in to RSVP for an event.'));
+        }
+
+        return true;
+    }
+
+    /**
+     * Handler method
+     *
+     * @param array $argarray is ignored since it's now passed in in prepare()
+     *
+     * @return void
+     */
+
+    function handle($argarray=null)
+    {
+        parent::handle($argarray);
+
+        if ($this->isPost()) {
+            $this->cancelRSVP();
+        } else {
+            $this->showPage();
+        }
+
+        return;
+    }
+
+    /**
+     * Add a new event
+     *
+     * @return void
+     */
+
+    function cancelRSVP()
+    {
+        try {
+            $notice = $this->rsvp->getNotice();
+            // NB: this will delete the rsvp, too
+            if (!empty($notice)) {
+                $notice->delete();
+            } else {
+                $this->rsvp->delete();
+            }
+        } catch (ClientException $ce) {
+            $this->error = $ce->getMessage();
+            $this->showPage();
+            return;
+        }
+
+        if ($this->boolean('ajax')) {
+            header('Content-Type: text/xml;charset=utf-8');
+            $this->xw->startDocument('1.0', 'UTF-8');
+            $this->elementStart('html');
+            $this->elementStart('head');
+            // TRANS: Page title after sending a notice.
+            $this->element('title', null, _('Event saved'));
+            $this->elementEnd('head');
+            $this->elementStart('body');
+            $this->elementStart('body');
+            $form = new RSVPForm($this->event, $this);
+            $form->show();
+            $this->elementEnd('body');
+            $this->elementEnd('body');
+            $this->elementEnd('html');
+        }
+    }
+
+    /**
+     * Show the event form
+     *
+     * @return void
+     */
+
+    function showContent()
+    {
+        if (!empty($this->error)) {
+            $this->element('p', 'error', $this->error);
+        }
+
+        $form = new CancelRSVPForm($this->rsvp, $this);
+
+        $form->show();
+
+        return;
+    }
+
+    /**
+     * Return true if read only.
+     *
+     * MAY override
+     *
+     * @param array $args other arguments
+     *
+     * @return boolean is read only action?
+     */
+
+    function isReadOnly($args)
+    {
+        if ($_SERVER['REQUEST_METHOD'] == 'GET' ||
+            $_SERVER['REQUEST_METHOD'] == 'HEAD') {
+            return true;
+        } else {
+            return false;
+        }
+    }
+}
diff --git a/plugins/Event/cancelrsvpform.php b/plugins/Event/cancelrsvpform.php
new file mode 100644
index 0000000000..8cccbdb661
--- /dev/null
+++ b/plugins/Event/cancelrsvpform.php
@@ -0,0 +1,128 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2011, StatusNet, Inc.
+ *
+ * Form to RSVP for an event
+ * 
+ * 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  Event
+ * @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);
+}
+
+/**
+ * A form to RSVP for an event
+ *
+ * @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 CancelRSVPForm extends Form
+{
+    protected $rsvp = null;
+
+    function __construct($rsvp, $out=null)
+    {
+        parent::__construct($out);
+        $this->rsvp = $rsvp;
+    }
+
+    /**
+     * ID of the form
+     *
+     * @return int ID of the form
+     */
+
+    function id()
+    {
+        return 'form_event_rsvp';
+    }
+
+    /**
+     * class of the form
+     *
+     * @return string class of the form
+     */
+
+    function formClass()
+    {
+        return 'ajax';
+    }
+
+    /**
+     * Action of the form
+     *
+     * @return string URL of the action
+     */
+
+    function action()
+    {
+        return common_local_url('cancelrsvp');
+    }
+
+    /**
+     * Data elements of the form
+     *
+     * @return void
+     */
+
+    function formData()
+    {
+        $this->out->elementStart('fieldset', array('id' => 'new_rsvp_data'));
+
+        $this->out->hidden('rsvp', $this->rsvp->id);
+
+        switch (RSVP::verbFor($this->rsvp->result)) {
+        case RSVP::POSITIVE:
+            $this->out->text(_('You will attend this event.'));
+            break;
+        case RSVP::NEGATIVE:
+            $this->out->text(_('You will not attend this event.'));
+            break;
+        case RSVP::POSSIBLE:
+            $this->out->text(_('You might attend this event.'));
+            break;
+        }
+
+        $this->out->elementEnd('fieldset');
+    }
+
+    /**
+     * Action elements
+     *
+     * @return void
+     */
+
+    function formActions()
+    {
+        $this->out->submit('cancel', _m('BUTTON', 'Cancel'));
+    }
+}
diff --git a/plugins/Event/newevent.php b/plugins/Event/newevent.php
index 7c0fd0177f..0f5635487b 100644
--- a/plugins/Event/newevent.php
+++ b/plugins/Event/newevent.php
@@ -157,6 +157,10 @@ class NeweventAction extends Action
                                         $this->description,
                                         $this->url);
 
+            $event = Happening::fromNotice($saved);
+
+            RSVP::saveNew($profile, $event, RSVP::POSITIVE);
+
         } catch (ClientException $ce) {
             $this->error = $ce->getMessage();
             $this->showPage();
diff --git a/plugins/Event/newrsvp.php b/plugins/Event/newrsvp.php
index a793ac6de2..da613ec6c7 100644
--- a/plugins/Event/newrsvp.php
+++ b/plugins/Event/newrsvp.php
@@ -1,17 +1,11 @@
 <?php
 /**
- * Give a warm greeting to our friendly user
- *
- * PHP version 5
- *
- * @category Sample
- * @package  StatusNet
- * @author   Evan Prodromou <evan@status.net>
- * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
- * @link     http://status.net/
- *
  * StatusNet - the distributed open-source microblogging tool
- * Copyright (C) 2009, StatusNet, Inc.
+ * Copyright (C) 2011, StatusNet, Inc.
+ *
+ * RSVP for an event
+ * 
+ * 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
@@ -25,140 +19,184 @@
  *
  * 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  Event
+ * @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);
 }
 
 /**
- * Give a warm greeting to our friendly user
+ * RSVP for an event
  *
- * This sample action shows some basic ways of doing output in an action
- * class.
- *
- * Action classes have several output methods that they override from
- * the parent class.
- *
- * @category Sample
- * @package  StatusNet
- * @author   Evan Prodromou <evan@status.net>
- * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
- * @link     http://status.net/
+ * @category  Event
+ * @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 HelloAction extends Action
+
+class NewrsvpAction extends Action
 {
-    var $user = null;
-    var $gc   = null;
+    protected $user  = null;
+    protected $event = null;
+    protected $type  = null;
 
     /**
-     * Take arguments for running
+     * Returns the title of the action
      *
-     * This method is called first, and it lets the action class get
-     * all its arguments and validate them. It's also the time
-     * to fetch any relevant data from the database.
-     *
-     * Action classes should run parent::prepare($args) as the first
-     * line of this method to make sure the default argument-processing
-     * happens.
-     *
-     * @param array $args $_REQUEST args
-     *
-     * @return boolean success flag
+     * @return string Action title
      */
-    function prepare($args)
+
+    function title()
     {
-        parent::prepare($args);
+        return _('New RSVP');
+    }
+
+    /**
+     * For initializing members of the class.
+     *
+     * @param array $argarray misc. arguments
+     *
+     * @return boolean true
+     */
+
+    function prepare($argarray)
+    {
+        parent::prepare($argarray);
+
+        $eventId = $this->trimmed('event');
+
+        if (empty($eventId)) {
+            throw new ClientException(_('No such event.'));
+        }
+
+        $this->event = Happening::staticGet('id', $eventId);
+
+        if (empty($this->event)) {
+            throw new ClientException(_('No such event.'));
+        }
 
         $this->user = common_current_user();
 
-        if (!empty($this->user)) {
-            $this->gc = User_greeting_count::inc($this->user->id);
+        if (empty($this->user)) {
+            throw new ClientException(_('You must be logged in to RSVP for an event.'));
         }
 
+        if ($this->arg('yes')) {
+            $this->type = RSVP::POSITIVE;
+        } else if ($this->arg('no')) {
+            $this->type = RSVP::NEGATIVE;
+        } else {
+            $this->type = RSVP::POSSIBLE;
+        }
         return true;
     }
 
     /**
-     * Handle request
+     * Handler method
      *
-     * This is the main method for handling a request. Note that
-     * most preparation should be done in the prepare() method;
-     * by the time handle() is called the action should be
-     * more or less ready to go.
-     *
-     * @param array $args $_REQUEST args; handled in prepare()
+     * @param array $argarray is ignored since it's now passed in in prepare()
      *
      * @return void
      */
-    function handle($args)
-    {
-        parent::handle($args);
 
-        $this->showPage();
+    function handle($argarray=null)
+    {
+        parent::handle($argarray);
+
+        if ($this->isPost()) {
+            $this->newRSVP();
+        } else {
+            $this->showPage();
+        }
+
+        return;
     }
 
     /**
-     * Title of this page
+     * Add a new event
      *
-     * Override this method to show a custom title.
-     *
-     * @return string Title of the page
+     * @return void
      */
-    function title()
+
+    function newRSVP()
     {
-        if (empty($this->user)) {
-            return _m('Hello');
+        try {
+            $saved = RSVP::saveNew($this->user->getProfile(),
+                                   $this->event,
+                                   $this->type);
+        } catch (ClientException $ce) {
+            $this->error = $ce->getMessage();
+            $this->showPage();
+            return;
+        }
+
+        if ($this->boolean('ajax')) {
+            $rsvp = RSVP::fromNotice($saved);
+            header('Content-Type: text/xml;charset=utf-8');
+            $this->xw->startDocument('1.0', 'UTF-8');
+            $this->elementStart('html');
+            $this->elementStart('head');
+            // TRANS: Page title after sending a notice.
+            $this->element('title', null, _('Event saved'));
+            $this->elementEnd('head');
+            $this->elementStart('body');
+            $this->elementStart('body');
+            $cancel = new CancelRSVPForm($rsvp, $this);
+            $cancel->show();
+            $this->elementEnd('body');
+            $this->elementEnd('body');
+            $this->elementEnd('html');
         } else {
-            return sprintf(_m('Hello, %s!'), $this->user->nickname);
+            common_redirect($saved->bestUrl(), 303);
         }
     }
 
     /**
-     * Show content in the content area
-     *
-     * The default StatusNet page has a lot of decorations: menus,
-     * logos, tabs, all that jazz. This method is used to show
-     * content in the content area of the page; it's the main
-     * thing you want to overload.
-     *
-     * This method also demonstrates use of a plural localized string.
+     * Show the event form
      *
      * @return void
      */
+
     function showContent()
     {
-        if (empty($this->user)) {
-            $this->element('p', array('class' => 'greeting'),
-                           _m('Hello, stranger!'));
-        } else {
-            $this->element('p', array('class' => 'greeting'),
-                           sprintf(_m('Hello, %s'), $this->user->nickname));
-            $this->element('p', array('class' => 'greeting_count'),
-                           sprintf(_m('I have greeted you %d time.',
-                                      'I have greeted you %d times.',
-                                      $this->gc->greeting_count),
-                                   $this->gc->greeting_count));
+        if (!empty($this->error)) {
+            $this->element('p', 'error', $this->error);
         }
+
+        $form = new RSVPForm($this->event, $this);
+
+        $form->show();
+
+        return;
     }
 
     /**
      * Return true if read only.
      *
-     * Some actions only read from the database; others read and write.
-     * The simple database load-balancer built into StatusNet will
-     * direct read-only actions to database mirrors (if they are configured),
-     * and read-write actions to the master database.
+     * MAY override
      *
-     * This defaults to false to avoid data integrity issues, but you
-     * should make sure to overload it for performance gains.
-     *
-     * @param array $args other arguments, if RO/RW status depends on them.
+     * @param array $args other arguments
      *
      * @return boolean is read only action?
      */
+
     function isReadOnly($args)
     {
-        return false;
+        if ($_SERVER['REQUEST_METHOD'] == 'GET' ||
+            $_SERVER['REQUEST_METHOD'] == 'HEAD') {
+            return true;
+        } else {
+            return false;
+        }
     }
 }
diff --git a/plugins/Event/rsvpform.php b/plugins/Event/rsvpform.php
new file mode 100644
index 0000000000..ad30f6a36e
--- /dev/null
+++ b/plugins/Event/rsvpform.php
@@ -0,0 +1,120 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2011, StatusNet, Inc.
+ *
+ * Form to RSVP for an event
+ * 
+ * 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  Event
+ * @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);
+}
+
+/**
+ * A form to RSVP for an event
+ *
+ * @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 RSVPForm extends Form
+{
+    protected $event = null;
+
+    function __construct($event, $out=null)
+    {
+        parent::__construct($out);
+        $this->event = $event;
+    }
+
+    /**
+     * ID of the form
+     *
+     * @return int ID of the form
+     */
+
+    function id()
+    {
+        return 'form_event_rsvp';
+    }
+
+    /**
+     * class of the form
+     *
+     * @return string class of the form
+     */
+
+    function formClass()
+    {
+        return 'ajax';
+    }
+
+    /**
+     * Action of the form
+     *
+     * @return string URL of the action
+     */
+
+    function action()
+    {
+        return common_local_url('newrsvp');
+    }
+
+    /**
+     * Data elements of the form
+     *
+     * @return void
+     */
+
+    function formData()
+    {
+        $this->out->elementStart('fieldset', array('id' => 'new_rsvp_data'));
+
+        $this->out->text(_('RSVP: '));
+
+        $this->out->hidden('event', $this->event->id);
+
+        $this->out->elementEnd('fieldset');
+    }
+
+    /**
+     * Action elements
+     *
+     * @return void
+     */
+
+    function formActions()
+    {
+        $this->out->submit('yes', _m('BUTTON', 'Yes'));
+        $this->out->submit('no', _m('BUTTON', 'No'));
+        $this->out->submit('maybe', _m('BUTTON', 'Maybe'));
+    }
+}
diff --git a/plugins/Event/showevent.php b/plugins/Event/showevent.php
index f8b032c111..7fb702f9db 100644
--- a/plugins/Event/showevent.php
+++ b/plugins/Event/showevent.php
@@ -64,13 +64,13 @@ class ShoweventAction extends ShownoticeAction
 
         $this->id = $this->trimmed('id');
 
-        $this->event = Event::staticGet('id', $this->id);
+        $this->event = Happening::staticGet('id', $this->id);
 
         if (empty($this->event)) {
             throw new ClientException(_('No such event.'), 404);
         }
 
-        $this->notice = $event->getNotice();
+        $this->notice = $this->event->getNotice();
 
         if (empty($this->notice)) {
             // Did we used to have it, and it got deleted?

From 1f86f45bb9e349f23a000319b2cac19759c0b218 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Wed, 9 Mar 2011 10:38:44 -0800
Subject: [PATCH 473/655] Move object menu into aside

---
 lib/action.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/action.php b/lib/action.php
index 28b0fdbacf..92be43ba68 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -669,10 +669,6 @@ class Action extends HTMLOutputter // lawsuit
             $this->showContentBlock();
             Event::handle('EndShowContentBlock', array($this));
         }
-        if (Event::handle('StartShowObjectNavBlock', array($this))) {
-            $this->showObjectNavBlock();
-            Event::handle('EndShowObjectNavBlock', array($this));
-        }
         if (Event::handle('StartShowAside', array($this))) {
             $this->showAside();
             Event::handle('EndShowAside', array($this));
@@ -828,6 +824,10 @@ class Action extends HTMLOutputter // lawsuit
     {
         $this->elementStart('div', array('id' => 'aside_primary',
                                          'class' => 'aside'));
+        if (Event::handle('StartShowObjectNavBlock', array($this))) {
+            $this->showObjectNavBlock();
+            Event::handle('EndShowObjectNavBlock', array($this));
+        }
         if (Event::handle('StartShowSections', array($this))) {
             $this->showSections();
             Event::handle('EndShowSections', array($this));

From 7f42e48631049ae4c29166684f2c1aa0ad5e2f04 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Wed, 9 Mar 2011 10:53:45 -0800
Subject: [PATCH 474/655] section class on object nav

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

diff --git a/lib/action.php b/lib/action.php
index 92be43ba68..ca380cc02c 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -712,7 +712,8 @@ class Action extends HTMLOutputter // lawsuit
     {
         // Need to have this ID for CSS; I'm too lazy to add it to
         // all menus
-        $this->elementStart('div', array('id' => 'site_nav_object'));
+        $this->elementStart('div', array('id' => 'site_nav_object',
+                                         'class' => 'section'));
         $this->showObjectNav();
         $this->elementEnd('div');
     }

From 65f9b5d954f35e9a89edaad9dfdb48f61bc9c2c5 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Wed, 9 Mar 2011 11:27:29 -0800
Subject: [PATCH 475/655] Attempt to save field (doesn't work right yet)

---
 .../profiledetailsettingsaction.php           | 44 ++++++++++++++++++-
 1 file changed, 42 insertions(+), 2 deletions(-)

diff --git a/plugins/ExtendedProfile/profiledetailsettingsaction.php b/plugins/ExtendedProfile/profiledetailsettingsaction.php
index d1153cc075..ce0828c3e1 100644
--- a/plugins/ExtendedProfile/profiledetailsettingsaction.php
+++ b/plugins/ExtendedProfile/profiledetailsettingsaction.php
@@ -93,13 +93,50 @@ class ProfileDetailSettingsAction extends SettingsAction
 
         $profile = $user->getProfile();
 
+        $simpleFieldNames = array('title');
 
-        $simple_fields = array('title', 'manager', 'tags', 'spouse');
+        foreach ($simpleFieldNames as $name) {
+            $value = $this->trimmed('extprofile-' . $name);
+            $this->saveSimpleField($user, $name, $value);
+        }
 
         $this->showForm(_('Details saved.'), true);
 
     }
 
+    function saveSimpleField($user, $name, $value)
+    {
+        $profile = $user->getProfile();
+
+        $detail = new Profile_detail();
+
+        $detail->profile_id  = $profile->id;
+        $detail->field       = $name;
+        $detail->field_index = 1;
+
+        $result = $detail->find(true);
+
+
+        if (empty($result)) {
+            $detail->value = $value;
+
+            $detail->created = common_sql_now();
+
+            common_debug("XXXXXXXXXXXXXXX not found");
+            //common_debug('bbbbbbbbbbbb ' . var_export($detail, true));
+
+            $result = $detail->insert();
+        } else {
+            common_debug('zzzzz FOUND');
+            $orig = clone($detail);
+            $detail->value = $value;
+            $result = $detail->update($orig);
+        }
+
+        $detail->free();
+
+    }
+
     /**
      * Save fields that should be stored in the main profile object
      *
@@ -136,9 +173,12 @@ class ProfileDetailSettingsAction extends SettingsAction
 
         $profile = $user->getProfile();
 
+        $oldTags = $user->getSelfTags();
+        $newTags = array_diff($tags, $oldTags);
+
         if ($fullname    != $profile->fullname
             || $location != $profile->location
-            || $tags     != $profile->tags
+            || !empty($newTags)
             || $bio      != $profile->bio) {
 
             $orig = clone($profile);

From 0a19949f6db090fa529eb8d7a42fa313ebf87561 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Wed, 9 Mar 2011 10:53:12 -0800
Subject: [PATCH 476/655] Allow theme.ini to specify external CSS URLs, such as
 Google Font API loaders.

Example theme.ini:

  external="http://fonts.googleapis.com/css?family=Lato:100,100italic,300,300italic,400,400italic,700,700italic,900,900italic"
  include=rebase

Notes:
* URLs must be quoted in the .ini file or the .ini file parser explodes!
* To do multiples, list as external[] instead of external.
* If there's an included base theme, any externals it lists will be included first.
* All externals are loaded before any local styles.
---
 lib/action.php |  9 ++++++++-
 lib/theme.php  | 52 +++++++++++++++++++++++++++++++++++++++++++++++---
 2 files changed, 57 insertions(+), 4 deletions(-)

diff --git a/lib/action.php b/lib/action.php
index ca380cc02c..ea3b50a229 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -267,9 +267,16 @@ class Action extends HTMLOutputter // lawsuit
 
     function primaryCssLink($mainTheme=null, $media=null)
     {
+        $theme = new Theme($mainTheme);
+
+        // Some themes may have external stylesheets, such as using the
+        // Google Font APIs to load webfonts.
+        foreach ($theme->getExternals() as $url) {
+            $this->cssLink($url, $mainTheme, $media);
+        }
+
         // If the currently-selected theme has dependencies on other themes,
         // we'll need to load their display.css files as well in order.
-        $theme = new Theme($mainTheme);
         $baseThemes = $theme->getDeps();
         foreach ($baseThemes as $baseTheme) {
             $this->cssLink('css/display.css', $baseTheme, $media);
diff --git a/lib/theme.php b/lib/theme.php
index 5caa046c20..b5f2b58cf2 100644
--- a/lib/theme.php
+++ b/lib/theme.php
@@ -56,6 +56,9 @@ class Theme
     var $name = null;
     var $dir  = null;
     var $path = null;
+    protected $metadata = null; // access via getMetadata() lazy-loader
+    protected $externals = null;
+    protected $deps = null;
 
     /**
      * Constructor
@@ -199,9 +202,12 @@ class Theme
      */
     function getDeps()
     {
-        $chain = $this->doGetDeps(array($this->name));
-        array_pop($chain); // Drop us back off
-        return $chain;
+        if ($this->deps === null) {
+            $chain = $this->doGetDeps(array($this->name));
+            array_pop($chain); // Drop us back off
+            $this->deps = $chain;
+        }
+        return $this->deps;
     }
 
     protected function doGetDeps($chain)
@@ -233,6 +239,20 @@ class Theme
      * @return associative array of strings
      */
     function getMetadata()
+    {
+        if ($this->metadata == null) {
+            $this->metadata = $this->doGetMetadata();
+        }
+        return $this->metadata;
+    }
+
+    /**
+     * Pull data from the theme's theme.ini file.
+     * @fixme calling getFile will fall back to default theme, this may be unsafe.
+     *
+     * @return associative array of strings
+     */
+    private function doGetMetadata()
     {
         $iniFile = $this->getFile('theme.ini');
         if (file_exists($iniFile)) {
@@ -242,6 +262,32 @@ class Theme
         }
     }
 
+    /**
+     * Get list of any external URLs required by this theme and any
+     * dependencies. These are lazy-loaded from theme.ini.
+     *
+     * @return array of URL strings
+     */
+    function getExternals()
+    {
+        if ($this->externals == null) {
+            $data = $this->getMetadata();
+            if (!empty($data['external'])) {
+                $ext = (array)$data['external'];
+            } else {
+                $ext = array();
+            }
+
+            if (!empty($data['include'])) {
+                $theme = new Theme($data['include']);
+                $ext = array_merge($ext, $theme->getExternals());
+            }
+
+            $this->externals = array_unique($ext);
+        }
+        return $this->externals;
+    }
+
     /**
      * Gets the full path of a file in a theme dir based on its relative name
      *

From 1f9a9c69bc3f5d7b33f4f73da3252ec07b5f3a87 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Wed, 9 Mar 2011 12:07:26 -0800
Subject: [PATCH 477/655] Only show the site_nav_object block if
 Action::showObjectNav has been overridden to do something.

(Copied similar check from showPageNoticeBlock, handy!)
---
 lib/action.php | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/lib/action.php b/lib/action.php
index ea3b50a229..2b237118af 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -713,16 +713,24 @@ class Action extends HTMLOutputter // lawsuit
     /**
      * Show menu for an object (group, profile)
      *
+     * This block will only show if a subclass has overridden
+     * the showObjectNav() method.
+     *
      * @return nothing
      */
     function showObjectNavBlock()
     {
-        // Need to have this ID for CSS; I'm too lazy to add it to
-        // all menus
-        $this->elementStart('div', array('id' => 'site_nav_object',
-                                         'class' => 'section'));
-        $this->showObjectNav();
-        $this->elementEnd('div');
+        $rmethod = new ReflectionMethod($this, 'showObjectNav');
+        $dclass = $rmethod->getDeclaringClass()->getName();
+
+        if ($dclass != 'Action') {
+            // Need to have this ID for CSS; I'm too lazy to add it to
+            // all menus
+            $this->elementStart('div', array('id' => 'site_nav_object',
+                                             'class' => 'section'));
+            $this->showObjectNav();
+            $this->elementEnd('div');
+        }
     }
 
     /**

From 381ffc3fe8c4048761128103d4dfcb153d75464e Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Wed, 9 Mar 2011 12:38:06 -0800
Subject: [PATCH 478/655] Stub 'home' subsection at top of settings & admin nav
 panels, so folks always know how to get home. (If we drop the section titles,
 these'll look a little cleaner since it'll only show 'Home' once :D)

---
 lib/adminpanelnav.php | 19 +++++++++++++++++++
 lib/settingsnav.php   | 20 ++++++++++++++++++++
 2 files changed, 39 insertions(+)

diff --git a/lib/adminpanelnav.php b/lib/adminpanelnav.php
index ceedf6ceac..2c9d83ceba 100644
--- a/lib/adminpanelnav.php
+++ b/lib/adminpanelnav.php
@@ -56,7 +56,25 @@ class AdminPanelNav extends Menu
     function show()
     {
         $action_name = $this->action->trimmed('action');
+        $user = common_current_user();
+        $nickname = $user->nickname;
+        $name = $user->getProfile()->getBestName();
 
+        // Stub section w/ home link
+        $this->action->elementStart('ul');
+        $this->action->element('h3', null, _('Home'));
+        $this->action->elementStart('ul', 'nav');
+        $this->out->menuItem(common_local_url('all', array('nickname' =>
+                                                           $nickname)),
+                             _('Home'),
+                             sprintf(_('%s and friends'), $name),
+                             $this->action == 'all', 'nav_timeline_personal');
+
+        $this->action->elementEnd('ul');
+        $this->action->elementEnd('ul');
+
+        $this->action->elementStart('ul');
+        $this->action->element('h3', null, _('Admin'));
         $this->action->elementStart('ul', array('class' => 'nav'));
 
         if (Event::handle('StartAdminPanelNav', array($this))) {
@@ -144,5 +162,6 @@ class AdminPanelNav extends Menu
             Event::handle('EndAdminPanelNav', array($this));
         }
         $this->action->elementEnd('ul');
+        $this->action->elementEnd('ul');
     }
 }
diff --git a/lib/settingsnav.php b/lib/settingsnav.php
index 697e7ee46b..2987e36ea9 100644
--- a/lib/settingsnav.php
+++ b/lib/settingsnav.php
@@ -57,6 +57,25 @@ class SettingsNav extends Menu
     function show()
     {
         $actionName = $this->action->trimmed('action');
+        $user = common_current_user();
+        $nickname = $user->nickname;
+        $name = $user->getProfile()->getBestName();
+
+        // Stub section w/ home link
+        $this->action->elementStart('ul');
+        $this->action->element('h3', null, _('Home'));
+        $this->action->elementStart('ul', 'nav');
+        $this->out->menuItem(common_local_url('all', array('nickname' =>
+                                                           $nickname)),
+                             _('Home'),
+                             sprintf(_('%s and friends'), $name),
+                             $this->action == 'all', 'nav_timeline_personal');
+
+        $this->action->elementEnd('ul');
+        $this->action->elementEnd('ul');
+
+        $this->action->elementStart('ul');
+        $this->action->element('h3', null, _('Settings'));
         $this->action->elementStart('ul', array('class' => 'nav'));
 
         if (Event::handle('StartAccountSettingsNav', array(&$this->action))) {
@@ -115,5 +134,6 @@ class SettingsNav extends Menu
         }
 
         $this->action->elementEnd('ul');
+        $this->action->elementEnd('ul');
     }
 }

From 040baf291d031b20723ec5455e120b3e40c98a49 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Wed, 9 Mar 2011 13:05:12 -0800
Subject: [PATCH 479/655] Fix for input tab selection

---
 js/util.js     | 7 +++++++
 lib/action.php | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/js/util.js b/js/util.js
index 6bba34fae6..6bd5d668a9 100644
--- a/js/util.js
+++ b/js/util.js
@@ -1280,6 +1280,13 @@ var SN = { // StatusNet
             return false;
         },
 
+        /**
+         * Switch to another active input sub-form.
+         * This will hide the current form (if any), show the new one, and
+         * update the input type tab selection state.
+         *
+         * @param {String} tag
+         */
 	switchInputFormTab: function(tag) {
 	    // The one that's current isn't current anymore
 	    $('.input_form_nav_tab.current').removeClass('current');
diff --git a/lib/action.php b/lib/action.php
index 2b237118af..0ba4b8b8ff 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -602,7 +602,7 @@ class Action extends HTMLOutputter // lawsuit
                                'class' => 'input_form_nav_tab');
 
                 if ($tag == 'status') {
-                    $attrs['class'] = 'current';
+                    $attrs['class'] .= ' current';
                 }
 
                 $this->elementStart('li', $attrs);

From e9cab215fe5789ac26a1feab3d4f67f2f97ae4b9 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Wed, 9 Mar 2011 13:31:22 -0800
Subject: [PATCH 480/655] Event: fix for display problem -- need to leave this
 div open for now

---
 plugins/Event/EventPlugin.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/Event/EventPlugin.php b/plugins/Event/EventPlugin.php
index 7ca2fa9c0e..bd9c10b3e4 100644
--- a/plugins/Event/EventPlugin.php
+++ b/plugins/Event/EventPlugin.php
@@ -391,7 +391,8 @@ class EventPlugin extends MicroappPlugin
                       $profile->nickname);
         $out->elementEnd('span');
 
-        $out->elementEnd('div');
+        // @fixme right now we have to leave this div open
+        //$out->elementEnd('div');
     }
 
     /**

From 4ea35f339d9f926c1c1f50c4b11a9149e8e524f4 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Wed, 9 Mar 2011 14:10:26 -0800
Subject: [PATCH 481/655] Fixes for Event plugin: * RSVP cancel/delete now
 works * caching fix for RSVP insert and delete (compound unique keys aren't
 properly handled for pkeyGet's caching right now; hacked it for this class
 for the moment) * div nesting fix * missing name/avatar on RSVP responses

---
 plugins/Event/EventPlugin.php | 67 +++++++++++++++++++----------------
 plugins/Event/Happening.php   |  1 +
 plugins/Event/RSVP.php        | 18 +++++++---
 plugins/Event/cancelrsvp.php  |  5 +++
 plugins/Event/newrsvp.php     |  3 ++
 5 files changed, 60 insertions(+), 34 deletions(-)

diff --git a/plugins/Event/EventPlugin.php b/plugins/Event/EventPlugin.php
index bd9c10b3e4..5c2fd35d74 100644
--- a/plugins/Event/EventPlugin.php
+++ b/plugins/Event/EventPlugin.php
@@ -295,6 +295,31 @@ class EventPlugin extends MicroappPlugin
             $this->showRSVPNotice($notice, $out);
             break;
         }
+
+        // @fixme we have to start the name/avatar and open this div
+        $out->elementStart('div', array('class' => 'event-info entry-content')); // EVENT-INFO.ENTRY-CONTENT IN
+
+        $profile = $notice->getProfile();
+        $avatar = $profile->getAvatar(AVATAR_MINI_SIZE);
+
+        $out->element('img',
+                      array('src' => ($avatar) ?
+                            $avatar->displayUrl() :
+                            Avatar::defaultImage(AVATAR_MINI_SIZE),
+                            'class' => 'avatar photo bookmark-avatar',
+                            'width' => AVATAR_MINI_SIZE,
+                            'height' => AVATAR_MINI_SIZE,
+                            'alt' => $profile->getBestName()));
+
+        $out->raw('&#160;'); // avoid &nbsp; for AJAX XML compatibility
+
+        $out->elementStart('span', 'vcard author'); // hack for belongsOnTimeline; JS needs to be able to find the author
+        $out->element('a',
+                      array('class' => 'url',
+                            'href' => $profile->profileurl,
+                            'title' => $profile->getBestName()),
+                      $profile->nickname);
+        $out->elementEnd('span');
     }
 
     function showRSVPNotice($notice, $out)
@@ -311,9 +336,9 @@ class EventPlugin extends MicroappPlugin
         assert(!empty($event));
         assert(!empty($profile));
 
-        $out->elementStart('div', 'vevent');
+        $out->elementStart('div', 'vevent'); // VEVENT IN
 
-        $out->elementStart('h3');
+        $out->elementStart('h3');  // VEVENT/H3 IN
 
         if (!empty($event->url)) {
             $out->element('a',
@@ -324,11 +349,11 @@ class EventPlugin extends MicroappPlugin
             $out->text($event->title);
         }
 
-        $out->elementEnd('h3');
+        $out->elementEnd('h3'); // VEVENT/H3 OUT
 
         // FIXME: better dates
 
-        $out->elementStart('div', 'event-times');
+        $out->elementStart('div', 'event-times'); // VEVENT/EVENT-TIMES IN
         $out->element('abbr', array('class' => 'dtstart',
                                     'title' => common_date_iso8601($event->start_time)),
                       common_exact_date($event->start_time));
@@ -336,7 +361,7 @@ class EventPlugin extends MicroappPlugin
         $out->element('span', array('class' => 'dtend',
                                     'title' => common_date_iso8601($event->end_time)),
                       common_exact_date($event->end_time));
-        $out->elementEnd('div');
+        $out->elementEnd('div'); // VEVENT/EVENT-TIMES OUT
 
         if (!empty($event->description)) {
             $out->element('div', 'description', $event->description);
@@ -358,6 +383,7 @@ class EventPlugin extends MicroappPlugin
 
         if (!empty($user)) {
             $rsvp = $event->getRSVP($user->getProfile());
+            common_log(LOG_DEBUG, "RSVP is: " . ($rsvp ? $rsvp->id : 'none'));
 
             if (empty($rsvp)) {
                 $form = new RSVPForm($event, $out);
@@ -368,31 +394,7 @@ class EventPlugin extends MicroappPlugin
             $form->show();
         }
 
-        $out->elementStart('div', array('class' => 'event-info entry-content'));
-
-        $avatar = $profile->getAvatar(AVATAR_MINI_SIZE);
-
-        $out->element('img', 
-                      array('src' => ($avatar) ?
-                            $avatar->displayUrl() :
-                            Avatar::defaultImage(AVATAR_MINI_SIZE),
-                            'class' => 'avatar photo bookmark-avatar',
-                            'width' => AVATAR_MINI_SIZE,
-                            'height' => AVATAR_MINI_SIZE,
-                            'alt' => $profile->getBestName()));
-
-        $out->raw('&#160;'); // avoid &nbsp; for AJAX XML compatibility
-
-        $out->elementStart('span', 'vcard author'); // hack for belongsOnTimeline; JS needs to be able to find the author
-        $out->element('a', 
-                      array('class' => 'url',
-                            'href' => $profile->profileurl,
-                            'title' => $profile->getBestName()),
-                      $profile->nickname);
-        $out->elementEnd('span');
-
-        // @fixme right now we have to leave this div open
-        //$out->elementEnd('div');
+        $out->elementEnd('div'); // vevent out
     }
 
     /**
@@ -417,15 +419,20 @@ class EventPlugin extends MicroappPlugin
     {
         switch ($notice->object_type) {
         case Happening::OBJECT_TYPE:
+            common_log(LOG_DEBUG, "Deleting event from notice...");
             $happening = Happening::fromNotice($notice);
             $happening->delete();
             break;
         case RSVP::POSITIVE:
         case RSVP::NEGATIVE:
         case RSVP::POSSIBLE:
+            common_log(LOG_DEBUG, "Deleting rsvp from notice...");
             $rsvp = RSVP::fromNotice($notice);
+            common_log(LOG_DEBUG, "to delete: $rsvp->id");
             $rsvp->delete();
             break;
+        default:
+            common_log(LOG_DEBUG, "Not deleting related, wtf...");
         }
     }
 }
diff --git a/plugins/Event/Happening.php b/plugins/Event/Happening.php
index 1a6a028dca..376f27c698 100644
--- a/plugins/Event/Happening.php
+++ b/plugins/Event/Happening.php
@@ -213,6 +213,7 @@ class Happening extends Managed_DataObject
 
     function getRSVP($profile)
     {
+        common_log(LOG_DEBUG, "Finding RSVP for " . $profile->id . ', ' . $this->id);
         return RSVP::pkeyGet(array('profile_id' => $profile->id,
                                    'event_id' => $this->id));
     }
diff --git a/plugins/Event/RSVP.php b/plugins/Event/RSVP.php
index 22bd239a68..c61ff3dbf0 100644
--- a/plugins/Event/RSVP.php
+++ b/plugins/Event/RSVP.php
@@ -85,6 +85,20 @@ class RSVP extends Managed_DataObject
         return Memcached_DataObject::pkeyGet('RSVP', $kv);
     }
 
+    /**
+     * Add the compound profile_id/event_id index to our cache keys
+     * since the DB_DataObject stuff doesn't understand compound keys
+     * except for the primary.
+     *
+     * @return array
+     */
+    function _allCacheKeys() {
+        $keys = parent::_allCacheKeys();
+        $keys[] = self::multicacheKey('RSVP', array('profile_id' => $this->profile_id,
+                                                    'event_id' => $this->event_id));
+        return $keys;
+    }
+
     /**
      * The One True Thingy that must be defined and declared.
      */
@@ -232,8 +246,4 @@ class RSVP extends Managed_DataObject
 
         return $rsvps;
     }
-
-    function delete()
-    {
-    }
 }
diff --git a/plugins/Event/cancelrsvp.php b/plugins/Event/cancelrsvp.php
index 21ed41a451..83dabe2de5 100644
--- a/plugins/Event/cancelrsvp.php
+++ b/plugins/Event/cancelrsvp.php
@@ -72,6 +72,9 @@ class CancelrsvpAction extends Action
     function prepare($argarray)
     {
         parent::prepare($argarray);
+        if ($this->boolean('ajax')) {
+            StatusNet::setApi(true); // short error results!
+        }
 
         $rsvpId = $this->trimmed('rsvp');
 
@@ -133,8 +136,10 @@ class CancelrsvpAction extends Action
             $notice = $this->rsvp->getNotice();
             // NB: this will delete the rsvp, too
             if (!empty($notice)) {
+                common_log(LOG_DEBUG, "Deleting notice...");
                 $notice->delete();
             } else {
+                common_log(LOG_DEBUG, "Deleting RSVP alone...");
                 $this->rsvp->delete();
             }
         } catch (ClientException $ce) {
diff --git a/plugins/Event/newrsvp.php b/plugins/Event/newrsvp.php
index da613ec6c7..4bacd129f4 100644
--- a/plugins/Event/newrsvp.php
+++ b/plugins/Event/newrsvp.php
@@ -72,6 +72,9 @@ class NewrsvpAction extends Action
     function prepare($argarray)
     {
         parent::prepare($argarray);
+        if ($this->boolean('ajax')) {
+            StatusNet::setApi(true); // short error results!
+        }
 
         $eventId = $this->trimmed('event');
 

From e74590d41465b691cc49f4ae50fc9d9013293a91 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Wed, 9 Mar 2011 15:46:24 -0800
Subject: [PATCH 482/655] Ticket #3076: fix regression in password recovery
 when email address given that doesn't match

Was triggering errors due to use of common_canonical_nickname() on arbitrary input without checking for exceptions about invalid nicknames (which didn't exist long ago in the before time)
---
 actions/recoverpassword.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/actions/recoverpassword.php b/actions/recoverpassword.php
index 9019d6fb22..a73872bfdb 100644
--- a/actions/recoverpassword.php
+++ b/actions/recoverpassword.php
@@ -282,7 +282,11 @@ class RecoverpasswordAction extends Action
         $user = User::staticGet('email', common_canonical_email($nore));
 
         if (!$user) {
-            $user = User::staticGet('nickname', common_canonical_nickname($nore));
+            try {
+                $user = User::staticGet('nickname', common_canonical_nickname($nore));
+            } catch (NicknameException $e) {
+                // invalid
+            }
         }
 
         # See if it's an unconfirmed email address

From cecc2576a57f75421df2cdc2416d5f3940967f64 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Wed, 9 Mar 2011 16:55:52 -0800
Subject: [PATCH 483/655] Fixes for direct message form for JS changes to the
 main form

---
 js/util.js          | 6 +++---
 js/util.min.js      | 2 +-
 lib/messageform.php | 4 ++--
 lib/noticeform.php  | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/js/util.js b/js/util.js
index 6bd5d668a9..37a7585d23 100644
--- a/js/util.js
+++ b/js/util.js
@@ -104,7 +104,7 @@ var SN = { // StatusNet
 
                 SN.U.Counter(form);
 
-                NDT = form.find('[name=status_textarea]');
+                NDT = form.find('.notice_data-text:first');
 
                 NDT.bind('keyup', function(e) {
                     SN.U.Counter(form);
@@ -183,7 +183,7 @@ var SN = { // StatusNet
          * @return number of chars
          */
         CharacterCount: function(form) {
-            return form.find('[name=status_textarea]').val().length;
+            return form.find('.notice_data-text:first').val().length;
         },
 
         /**
@@ -327,7 +327,7 @@ var SN = { // StatusNet
                 dataType: 'xml',
                 timeout: '60000',
                 beforeSend: function(formData) {
-                    if (form.find('[name=status_textarea]').val() == '') {
+                    if (form.find('.notice_data-text:first').val() == '') {
                         form.addClass(SN.C.S.Warning);
                         return false;
                     }
diff --git a/js/util.min.js b/js/util.min.js
index 88db1a1ac6..07994af6d1 100644
--- a/js/util.min.js
+++ b/js/util.min.js
@@ -1 +1 @@
-var SN={C:{I:{CounterBlackout:false,MaxLength:140,PatternUsername:/^[0-9a-zA-Z\-_.]*$/,HTTP20x30x:[200,201,202,203,204,205,206,300,301,302,303,304,305,306,307],NoticeFormMaster:null},S:{Disabled:"disabled",Warning:"warning",Error:"error",Success:"success",Processing:"processing",CommandResult:"command_result",FormNotice:"form_notice",NoticeDataGeo:"notice_data-geo",NoticeDataGeoCookie:"NoticeDataGeo",NoticeDataGeoSelected:"notice_data-geo_selected",StatusNetInstance:"StatusNetInstance"}},messages:{},msg:function(a){if(typeof SN.messages[a]=="undefined"){return"["+a+"]"}else{return SN.messages[a]}},U:{FormNoticeEnhancements:function(b){if(jQuery.data(b[0],"ElementData")===undefined){MaxLength=b.find(".count").text();if(typeof(MaxLength)=="undefined"){MaxLength=SN.C.I.MaxLength}jQuery.data(b[0],"ElementData",{MaxLength:MaxLength});SN.U.Counter(b);NDT=b.find("[name=status_textarea]");NDT.bind("keyup",function(c){SN.U.Counter(b)});var a=function(c){window.setTimeout(function(){SN.U.Counter(b)},50)};NDT.bind("cut",a).bind("paste",a)}else{b.find(".count").text(jQuery.data(b[0],"ElementData").MaxLength)}},Counter:function(d){SN.C.I.FormNoticeCurrent=d;var b=jQuery.data(d[0],"ElementData").MaxLength;if(b<=0){return}var c=b-SN.U.CharacterCount(d);var a=d.find(".count");if(c.toString()!=a.text()){if(!SN.C.I.CounterBlackout||c===0){if(a.text()!=String(c)){a.text(c)}if(c<0){d.addClass(SN.C.S.Warning)}else{d.removeClass(SN.C.S.Warning)}if(!SN.C.I.CounterBlackout){SN.C.I.CounterBlackout=true;SN.C.I.FormNoticeCurrent=d;window.setTimeout("SN.U.ClearCounterBlackout(SN.C.I.FormNoticeCurrent);",500)}}}},CharacterCount:function(a){return a.find("[name=status_textarea]").val().length},ClearCounterBlackout:function(a){SN.C.I.CounterBlackout=false;SN.U.Counter(a)},RewriteAjaxAction:function(a){if(document.location.protocol=="https:"&&a.substr(0,5)=="http:"){return a.replace(/^http:\/\/[^:\/]+/,"https://"+document.location.host)}else{return a}},FormXHR:function(a){$.ajax({type:"POST",dataType:"xml",url:SN.U.RewriteAjaxAction(a.attr("action")),data:a.serialize()+"&ajax=1",beforeSend:function(b){a.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(c,d,b){alert(b||d)},success:function(b,c){if(typeof($("form",b)[0])!="undefined"){form_new=document._importNode($("form",b)[0],true);a.replaceWith(form_new)}else{a.replaceWith(document._importNode($("p",b)[0],true))}}})},FormNoticeXHR:function(b){SN.C.I.NoticeDataGeo={};b.append('<input type="hidden" name="ajax" value="1"/>');b.attr("action",SN.U.RewriteAjaxAction(b.attr("action")));var c=function(d,e){b.append($('<p class="form_response"></p>').addClass(d).text(e))};var a=function(){b.find(".form_response").remove()};b.ajaxForm({dataType:"xml",timeout:"60000",beforeSend:function(d){if(b.find("[name=status_textarea]").val()==""){b.addClass(SN.C.S.Warning);return false}b.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled);SN.U.normalizeGeoData(b);return true},error:function(f,g,e){b.removeClass(SN.C.S.Processing).find(".submit").removeClass(SN.C.S.Disabled).removeAttr(SN.C.S.Disabled,SN.C.S.Disabled);a();if(g=="timeout"){c("error","Sorry! We had trouble sending your notice. The servers are overloaded. Please try again, and contact the site administrator if this problem persists.")}else{var d=SN.U.GetResponseXML(f);if($("."+SN.C.S.Error,d).length>0){b.append(document._importNode($("."+SN.C.S.Error,d)[0],true))}else{if(parseInt(f.status)===0||jQuery.inArray(parseInt(f.status),SN.C.I.HTTP20x30x)>=0){b.resetForm().find(".attach-status").remove();SN.U.FormNoticeEnhancements(b)}else{c("error","(Sorry! We had trouble sending your notice ("+f.status+" "+f.statusText+"). Please report the problem to the site administrator if this happens again.")}}}},success:function(i,f){a();var n=$("#"+SN.C.S.Error,i);if(n.length>0){c("error",n.text())}else{if($("body")[0].id=="bookmarklet"){self.close()}var d=$("#"+SN.C.S.CommandResult,i);if(d.length>0){c("success",d.text())}else{var m=document._importNode($("li",i)[0],true);var k=$("#notices_primary .notices:first");var l=b.closest("li.notice-reply");if(l.length>0){var e=$(m).attr("id");if($("#"+e).length==0){var j=l.closest("li.notice");l.replaceWith(m);SN.U.NoticeInlineReplyPlaceholder(j)}else{l.remove()}}else{if(k.length>0&&SN.U.belongsOnTimeline(m)){if($("#"+m.id).length===0){var h=b.find("[name=inreplyto]").val();var g="#notices_primary #notice-"+h;if($("body")[0].id=="conversation"){if(h.length>0&&$(g+" .notices").length<1){$(g).append('<ul class="notices"></ul>')}$($(g+" .notices")[0]).append(m)}else{k.prepend(m)}$("#"+m.id).css({display:"none"}).fadeIn(2500);SN.U.NoticeWithAttachment($("#"+m.id));SN.U.NoticeReplyTo($("#"+m.id))}}else{c("success",$("title",i).text())}}}b.resetForm();b.find("[name=inreplyto]").val("");b.find(".attach-status").remove();SN.U.FormNoticeEnhancements(b)}},complete:function(d,e){b.removeClass(SN.C.S.Processing).find(".submit").removeAttr(SN.C.S.Disabled).removeClass(SN.C.S.Disabled);b.find("[name=lat]").val(SN.C.I.NoticeDataGeo.NLat);b.find("[name=lon]").val(SN.C.I.NoticeDataGeo.NLon);b.find("[name=location_ns]").val(SN.C.I.NoticeDataGeo.NLNS);b.find("[name=location_id]").val(SN.C.I.NoticeDataGeo.NLID);b.find("[name=notice_data-geo]").attr("checked",SN.C.I.NoticeDataGeo.NDG)}})},normalizeGeoData:function(a){SN.C.I.NoticeDataGeo.NLat=a.find("[name=lat]").val();SN.C.I.NoticeDataGeo.NLon=a.find("[name=lon]").val();SN.C.I.NoticeDataGeo.NLNS=a.find("[name=location_ns]").val();SN.C.I.NoticeDataGeo.NLID=a.find("[name=location_id]").val();SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked");var b=$.cookie(SN.C.S.NoticeDataGeoCookie);if(b!==null&&b!="disabled"){b=JSON.parse(b);SN.C.I.NoticeDataGeo.NLat=a.find("[name=lat]").val(b.NLat).val();SN.C.I.NoticeDataGeo.NLon=a.find("[name=lon]").val(b.NLon).val();if(b.NLNS){SN.C.I.NoticeDataGeo.NLNS=a.find("[name=location_ns]").val(b.NLNS).val();SN.C.I.NoticeDataGeo.NLID=a.find("[name=location_id]").val(b.NLID).val()}else{a.find("[name=location_ns]").val("");a.find("[name=location_id]").val("")}}if(b=="disabled"){SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked",false).attr("checked")}else{SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked",true).attr("checked")}},GetResponseXML:function(b){try{return b.responseXML}catch(a){return(new DOMParser()).parseFromString(b.responseText,"text/xml")}},NoticeReply:function(){if($("#content .notice_reply").length>0){$("#content .notice").each(function(){SN.U.NoticeReplyTo($(this))})}},NoticeReplyTo:function(a){a.find(".notice_reply").live("click",function(c){c.preventDefault();var b=($(".author .nickname",a).length>0)?$($(".author .nickname",a)[0]):$(".author .nickname.uid");SN.U.NoticeInlineReplyTrigger(a,"@"+b.text());return false})},NoticeInlineReplyTrigger:function(h,i){var b=$($(".notice_id",h)[0]).text();var e=h;var f=h.closest(".notices");if(f.hasClass("threaded-replies")){e=f.closest(".notice")}else{f=$("ul.threaded-replies",h);if(f.length==0){f=$('<ul class="notices threaded-replies xoxo"></ul>');h.append(f)}}var j=$(".notice-reply-form",f);var d=function(){j.find("input[name=inreplyto]").val(b);var m=j.find("textarea");if(m.length==0){throw"No textarea"}var l="";if(i){l=i+" "}m.val(l+m.val().replace(RegExp(l,"i"),""));m.data("initialText",$.trim(i+""));m.focus();if(m[0].setSelectionRange){var k=m.val().length;m[0].setSelectionRange(k,k)}};if(j.length>0){d()}else{$("li.notice-reply-placeholder").remove();var g=$("li.notice-reply",f);if(g.length==0){g=$('<li class="notice-reply"></li>');var c=function(k){var l=document._importNode(k,true);g.append(l);f.append(g);var m=j=$(l);SN.U.NoticeLocationAttach(m);SN.U.FormNoticeXHR(m);SN.U.FormNoticeEnhancements(m);SN.U.NoticeDataAttach(m);d()};if(SN.C.I.NoticeFormMaster){c(SN.C.I.NoticeFormMaster)}else{var a=$("#form_notice").attr("action");$.get(a,{ajax:1},function(k,m,l){c($("form",k)[0])})}}}},NoticeInlineReplyPlaceholder:function(b){var a=b.find("ul.threaded-replies");var c=$('<li class="notice-reply-placeholder"><input class="placeholder"></li>');c.click(function(){SN.U.NoticeInlineReplyTrigger(b)});c.find("input").val(SN.msg("reply_placeholder"));a.append(c)},NoticeInlineReplySetup:function(){$(".threaded-replies").each(function(){var b=$(this);var a=b.closest(".notice");SN.U.NoticeInlineReplyPlaceholder(a)})},NoticeRepeat:function(){$(".form_repeat").live("click",function(a){a.preventDefault();SN.U.NoticeRepeatConfirmation($(this));return false})},NoticeRepeatConfirmation:function(a){var c=a.find(".submit");var b=c.clone();b.addClass("submit_dialogbox").removeClass("submit");a.append(b);b.bind("click",function(){SN.U.FormXHR(a);return false});c.hide();a.addClass("dialogbox").append('<button class="close">&#215;</button>').closest(".notice-options").addClass("opaque");a.find("button.close").click(function(){$(this).remove();a.removeClass("dialogbox").closest(".notice-options").removeClass("opaque");a.find(".submit_dialogbox").remove();a.find(".submit").show();return false})},NoticeAttachments:function(){$(".notice a.attachment").each(function(){SN.U.NoticeWithAttachment($(this).closest(".notice"))})},NoticeWithAttachment:function(b){if(b.find(".attachment").length===0){return}var a=b.find(".attachment.more");if(a.length>0){$(a[0]).click(function(){var c=$(this);c.addClass(SN.C.S.Processing);$.get(c.attr("href")+"/ajax",null,function(d){c.parent(".entry-content").html($(d).find("#attachment_view .entry-content").html())});return false}).attr("title",SN.msg("showmore_tooltip"))}},NoticeDataAttach:function(b){var a=b.find("input[type=file]");a.change(function(f){b.find(".attach-status").remove();var d=$(this).val();if(!d){return false}var c=$('<div class="attach-status '+SN.C.S.Success+'"><code></code> <button class="close">&#215;</button></div>');c.find("code").text(d);c.find("button").click(function(){c.remove();a.val("");return false});b.append(c);if(typeof this.files=="object"){for(var e=0;e<this.files.length;e++){SN.U.PreviewAttach(b,this.files[e])}}})},maxFileSize:function(b){var a=$(b).find("input[name=MAX_FILE_SIZE]").attr("value");if(a){return parseInt(a)}else{return 0}},PreviewAttach:function(d,c){var e=c.type+" "+Math.round(c.size/1024)+"KB";var f=true;var h;if(typeof window.createObjectURL!="undefined"){h=function(i,j){j(window.createObjectURL(i))}}else{if(typeof window.FileReader!="undefined"){h=function(j,k){var i=new FileReader();i.onload=function(l){k(i.result)};i.readAsDataURL(j)}}else{f=false}}var a=["image/png","image/jpeg","image/gif","image/svg+xml"];if($.inArray(c.type,a)==-1){f=false}var g=8*1024*1024;if(c.size>g){f=false}if(f){h(c,function(j){var i=$("<img>").attr("title",e).attr("alt",e).attr("src",j).attr("style","height: 120px");d.find(".attach-status").append(i)})}else{var b=$("<div></div>").text(e);d.find(".attach-status").append(b)}},NoticeLocationAttach:function(a){var e=a.find("[name=lat]");var k=a.find("[name=lon]");var g=a.find("[name=location_ns]").val();var l=a.find("[name=location_id]").val();var b="";var d=a.find("[name=notice_data-geo]");var c=a.find("[name=notice_data-geo]");var j=a.find("label.notice_data-geo");function f(n){j.attr("title",jQuery.trim(j.text())).removeClass("checked");a.find("[name=lat]").val("");a.find("[name=lon]").val("");a.find("[name=location_ns]").val("");a.find("[name=location_id]").val("");a.find("[name=notice_data-geo]").attr("checked",false);$.cookie(SN.C.S.NoticeDataGeoCookie,"disabled",{path:"/"});if(n){a.find(".geo_status_wrapper").removeClass("success").addClass("error");a.find(".geo_status_wrapper .geo_status").text(n)}else{a.find(".geo_status_wrapper").remove()}}function m(n,o){SN.U.NoticeGeoStatus(a,"Looking up place name...");$.getJSON(n,o,function(p){var q,r;if(typeof(p.location_ns)!="undefined"){a.find("[name=location_ns]").val(p.location_ns);q=p.location_ns}if(typeof(p.location_id)!="undefined"){a.find("[name=location_id]").val(p.location_id);r=p.location_id}if(typeof(p.name)=="undefined"){NLN_text=o.lat+";"+o.lon}else{NLN_text=p.name}SN.U.NoticeGeoStatus(a,NLN_text,o.lat,o.lon,p.url);j.attr("title",NoticeDataGeo_text.ShareDisable+" ("+NLN_text+")");a.find("[name=lat]").val(o.lat);a.find("[name=lon]").val(o.lon);a.find("[name=location_ns]").val(q);a.find("[name=location_id]").val(r);a.find("[name=notice_data-geo]").attr("checked",true);var s={NLat:o.lat,NLon:o.lon,NLNS:q,NLID:r,NLN:NLN_text,NLNU:p.url,NDG:true};$.cookie(SN.C.S.NoticeDataGeoCookie,JSON.stringify(s),{path:"/"})})}if(c.length>0){if($.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){c.attr("checked",false)}else{c.attr("checked",true)}var h=a.find(".notice_data-geo_wrap");var i=h.attr("title");h.removeAttr("title");j.attr("title",j.text());c.change(function(){if(c.attr("checked")===true||$.cookie(SN.C.S.NoticeDataGeoCookie)===null){j.attr("title",NoticeDataGeo_text.ShareDisable).addClass("checked");if($.cookie(SN.C.S.NoticeDataGeoCookie)===null||$.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){if(navigator.geolocation){SN.U.NoticeGeoStatus(a,"Requesting location from browser...");navigator.geolocation.getCurrentPosition(function(p){a.find("[name=lat]").val(p.coords.latitude);a.find("[name=lon]").val(p.coords.longitude);var q={lat:p.coords.latitude,lon:p.coords.longitude,token:$("#token").val()};m(i,q)},function(p){switch(p.code){case p.PERMISSION_DENIED:f("Location permission denied.");break;case p.TIMEOUT:f("Location lookup timeout.");break}},{timeout:10000})}else{if(e.length>0&&k.length>0){var n={lat:e,lon:k,token:$("#token").val()};m(i,n)}else{f();c.remove();j.remove()}}}else{var o=JSON.parse($.cookie(SN.C.S.NoticeDataGeoCookie));a.find("[name=lat]").val(o.NLat);a.find("[name=lon]").val(o.NLon);a.find("[name=location_ns]").val(o.NLNS);a.find("[name=location_id]").val(o.NLID);a.find("[name=notice_data-geo]").attr("checked",o.NDG);SN.U.NoticeGeoStatus(a,o.NLN,o.NLat,o.NLon,o.NLNU);j.attr("title",NoticeDataGeo_text.ShareDisable+" ("+o.NLN+")").addClass("checked")}}else{f()}}).change()}},NoticeGeoStatus:function(e,a,f,g,c){var h=e.find(".geo_status_wrapper");if(h.length==0){h=$('<div class="'+SN.C.S.Success+' geo_status_wrapper"><button class="close" style="float:right">&#215;</button><div class="geo_status"></div></div>');h.find("button.close").click(function(){e.find("[name=notice_data-geo]").removeAttr("checked").change()});e.append(h)}var b;if(c){b=$("<a></a>").attr("href",c)}else{b=$("<span></span>")}b.text(a);if(f||g){var d=f+";"+g;b.attr("title",d);if(!a){b.text(d)}}h.find(".geo_status").empty().append(b)},NewDirectMessage:function(){NDM=$(".entity_send-a-message a");NDM.attr({href:NDM.attr("href")+"&ajax=1"});NDM.bind("click",function(){var a=$(".entity_send-a-message form");if(a.length===0){$(this).addClass(SN.C.S.Processing);$.get(NDM.attr("href"),null,function(b){$(".entity_send-a-message").append(document._importNode($("form",b)[0],true));a=$(".entity_send-a-message .form_notice");SN.U.FormNoticeXHR(a);SN.U.FormNoticeEnhancements(a);a.append('<button class="close">&#215;</button>');$(".entity_send-a-message button").click(function(){a.hide();return false});NDM.removeClass(SN.C.S.Processing)})}else{a.show();$(".entity_send-a-message textarea").focus()}return false})},GetFullYear:function(c,d,a){var b=new Date();b.setFullYear(c,d,a);return b},StatusNetInstance:{Set:function(b){var a=SN.U.StatusNetInstance.Get();if(a!==null){b=$.extend(a,b)}$.cookie(SN.C.S.StatusNetInstance,JSON.stringify(b),{path:"/",expires:SN.U.GetFullYear(2029,0,1)})},Get:function(){var a=$.cookie(SN.C.S.StatusNetInstance);if(a!==null){return JSON.parse(a)}return null},Delete:function(){$.cookie(SN.C.S.StatusNetInstance,null)}},belongsOnTimeline:function(b){var a=$("body").attr("id");if(a=="public"){return true}var c=$("#nav_profile a").attr("href");if(c){var d=$(b).find(".vcard.author a.url").attr("href");if(d==c){if(a=="all"||a=="showstream"){return true}}}return false},switchInputFormTab:function(a){$(".input_form_nav_tab.current").removeClass("current");$("#input_form_nav_"+a).addClass("current");$(".input_form.current").removeClass("current");$("#input_form_"+a).addClass("current")}},Init:{NoticeForm:function(){if($("body.user_in").length>0){$(".ajax-notice").each(function(){var a=$(this);SN.U.NoticeLocationAttach(a);SN.U.FormNoticeXHR(a);SN.U.FormNoticeEnhancements(a);SN.U.NoticeDataAttach(a)})}},Notices:function(){if($("body.user_in").length>0){var a=$(".form_notice:first");if(a.length>0){SN.C.I.NoticeFormMaster=document._importNode(a[0],true)}SN.U.NoticeRepeat();SN.U.NoticeReply();SN.U.NoticeInlineReplySetup()}SN.U.NoticeAttachments()},EntityActions:function(){if($("body.user_in").length>0){SN.U.NewDirectMessage()}},Login:function(){if(SN.U.StatusNetInstance.Get()!==null){var a=SN.U.StatusNetInstance.Get().Nickname;if(a!==null){$("#form_login #nickname").val(a)}}$("#form_login").bind("submit",function(){SN.U.StatusNetInstance.Set({Nickname:$("#form_login #nickname").val()});return true})},AjaxForms:function(){$("form.ajax").live("submit",function(){SN.U.FormXHR($(this));return false})},UploadForms:function(){$("input[type=file]").change(function(d){if(typeof this.files=="object"&&this.files.length>0){var c=0;for(var b=0;b<this.files.length;b++){c+=this.files[b].size}var a=SN.U.maxFileSize($(this.form));if(a>0&&c>a){var e="File too large: maximum upload size is %d bytes.";alert(e.replace("%d",a));$(this).val("");d.preventDefault();return false}}})}}};$(document).ready(function(){SN.Init.AjaxForms();SN.Init.UploadForms();if($("."+SN.C.S.FormNotice).length>0){SN.Init.NoticeForm()}if($("#content .notices").length>0){SN.Init.Notices()}if($("#content .entity_actions").length>0){SN.Init.EntityActions()}if($("#form_login").length>0){SN.Init.Login()}});if(!document.ELEMENT_NODE){document.ELEMENT_NODE=1;document.ATTRIBUTE_NODE=2;document.TEXT_NODE=3;document.CDATA_SECTION_NODE=4;document.ENTITY_REFERENCE_NODE=5;document.ENTITY_NODE=6;document.PROCESSING_INSTRUCTION_NODE=7;document.COMMENT_NODE=8;document.DOCUMENT_NODE=9;document.DOCUMENT_TYPE_NODE=10;document.DOCUMENT_FRAGMENT_NODE=11;document.NOTATION_NODE=12}document._importNode=function(e,a){switch(e.nodeType){case document.ELEMENT_NODE:var d=document.createElement(e.nodeName);if(e.attributes&&e.attributes.length>0){for(var c=0,b=e.attributes.length;c<b;){if(e.attributes[c].nodeName=="class"){d.className=e.getAttribute(e.attributes[c++].nodeName)}else{d.setAttribute(e.attributes[c].nodeName,e.getAttribute(e.attributes[c++].nodeName))}}}if(a&&e.childNodes&&e.childNodes.length>0){for(var c=0,b=e.childNodes.length;c<b;){d.appendChild(document._importNode(e.childNodes[c++],a))}}return d;break;case document.TEXT_NODE:case document.CDATA_SECTION_NODE:case document.COMMENT_NODE:return document.createTextNode(e.nodeValue);break}};if(typeof navigator.geolocation=="undefined"||navigator.geolocation.shim){(function(){(function(){if(window.google&&google.gears){return}var c=null;if(typeof GearsFactory!="undefined"){c=new GearsFactory()}else{try{c=new ActiveXObject("Gears.Factory");if(c.getBuildInfo().indexOf("ie_mobile")!=-1){c.privateSetGlobalObject(this)}}catch(d){if((typeof navigator.mimeTypes!="undefined")&&navigator.mimeTypes["application/x-googlegears"]){c=document.createElement("object");c.style.display="none";c.width=0;c.height=0;c.type="application/x-googlegears";document.documentElement.appendChild(c)}}}if(!c){return}if(!window.google){google={}}if(!google.gears){google.gears={factory:c}}})();var a=(function(){var d=google.gears.factory.create("beta.geolocation");var c=function(f,e){return function(g){f(g);e.lastPosition=g}};return{shim:true,type:"Gears",lastPosition:null,getCurrentPosition:function(e,g,h){var f=this;var i=c(e,f);d.getCurrentPosition(i,g,h)},watchPosition:function(e,f,g){d.watchPosition(e,f,g)},clearWatch:function(e){d.clearWatch(e)},getPermission:function(g,e,f){d.getPermission(g,e,f)}}});var b=(function(){var i=false;var e=function(){if(!d()&&!i){i=true;var j=document.createElement("script");j.src=(document.location.protocol=="https:"?"https://":"http://")+"www.google.com/jsapi?callback=_google_loader_apiLoaded";j.type="text/javascript";document.getElementsByTagName("body")[0].appendChild(j)}};var c=[];var h=function(j){c.push(j)};var f=function(){if(d()){while(c.length>0){var j=c.pop();j()}}};window._google_loader_apiLoaded=function(){f()};var d=function(){return(window.google&&google.loader)};var g=function(j){if(d()){return true}h(j);e();return false};e();return{shim:true,type:"ClientLocation",lastPosition:null,getCurrentPosition:function(k,n,o){var m=this;if(!g(function(){m.getCurrentPosition(k,n,o)})){return}if(google.loader.ClientLocation){var l=google.loader.ClientLocation;var j={coords:{latitude:l.latitude,longitude:l.longitude,altitude:null,accuracy:43000,altitudeAccuracy:null,heading:null,speed:null},address:{city:l.address.city,country:l.address.country,country_code:l.address.country_code,region:l.address.region},timestamp:new Date()};k(j);this.lastPosition=j}else{if(n==="function"){n({code:3,message:"Using the Google ClientLocation API and it is not able to calculate a location."})}}},watchPosition:function(j,l,m){this.getCurrentPosition(j,l,m);var k=this;var n=setInterval(function(){k.getCurrentPosition(j,l,m)},10000);return n},clearWatch:function(j){clearInterval(j)},getPermission:function(l,j,k){return true}}});navigator.geolocation=(window.google&&google.gears)?a():b()})()};
\ No newline at end of file
+var SN={C:{I:{CounterBlackout:false,MaxLength:140,PatternUsername:/^[0-9a-zA-Z\-_.]*$/,HTTP20x30x:[200,201,202,203,204,205,206,300,301,302,303,304,305,306,307],NoticeFormMaster:null},S:{Disabled:"disabled",Warning:"warning",Error:"error",Success:"success",Processing:"processing",CommandResult:"command_result",FormNotice:"form_notice",NoticeDataGeo:"notice_data-geo",NoticeDataGeoCookie:"NoticeDataGeo",NoticeDataGeoSelected:"notice_data-geo_selected",StatusNetInstance:"StatusNetInstance"}},messages:{},msg:function(a){if(typeof SN.messages[a]=="undefined"){return"["+a+"]"}else{return SN.messages[a]}},U:{FormNoticeEnhancements:function(b){if(jQuery.data(b[0],"ElementData")===undefined){MaxLength=b.find(".count").text();if(typeof(MaxLength)=="undefined"){MaxLength=SN.C.I.MaxLength}jQuery.data(b[0],"ElementData",{MaxLength:MaxLength});SN.U.Counter(b);NDT=b.find(".notice_data-text:first");NDT.bind("keyup",function(c){SN.U.Counter(b)});var a=function(c){window.setTimeout(function(){SN.U.Counter(b)},50)};NDT.bind("cut",a).bind("paste",a)}else{b.find(".count").text(jQuery.data(b[0],"ElementData").MaxLength)}},Counter:function(d){SN.C.I.FormNoticeCurrent=d;var b=jQuery.data(d[0],"ElementData").MaxLength;if(b<=0){return}var c=b-SN.U.CharacterCount(d);var a=d.find(".count");if(c.toString()!=a.text()){if(!SN.C.I.CounterBlackout||c===0){if(a.text()!=String(c)){a.text(c)}if(c<0){d.addClass(SN.C.S.Warning)}else{d.removeClass(SN.C.S.Warning)}if(!SN.C.I.CounterBlackout){SN.C.I.CounterBlackout=true;SN.C.I.FormNoticeCurrent=d;window.setTimeout("SN.U.ClearCounterBlackout(SN.C.I.FormNoticeCurrent);",500)}}}},CharacterCount:function(a){return a.find(".notice_data-text:first").val().length},ClearCounterBlackout:function(a){SN.C.I.CounterBlackout=false;SN.U.Counter(a)},RewriteAjaxAction:function(a){if(document.location.protocol=="https:"&&a.substr(0,5)=="http:"){return a.replace(/^http:\/\/[^:\/]+/,"https://"+document.location.host)}else{return a}},FormXHR:function(a){$.ajax({type:"POST",dataType:"xml",url:SN.U.RewriteAjaxAction(a.attr("action")),data:a.serialize()+"&ajax=1",beforeSend:function(b){a.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(c,d,b){alert(b||d)},success:function(b,c){if(typeof($("form",b)[0])!="undefined"){form_new=document._importNode($("form",b)[0],true);a.replaceWith(form_new)}else{a.replaceWith(document._importNode($("p",b)[0],true))}}})},FormNoticeXHR:function(b){SN.C.I.NoticeDataGeo={};b.append('<input type="hidden" name="ajax" value="1"/>');b.attr("action",SN.U.RewriteAjaxAction(b.attr("action")));var c=function(d,e){b.append($('<p class="form_response"></p>').addClass(d).text(e))};var a=function(){b.find(".form_response").remove()};b.ajaxForm({dataType:"xml",timeout:"60000",beforeSend:function(d){if(b.find(".notice_data-text:first").val()==""){b.addClass(SN.C.S.Warning);return false}b.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled);SN.U.normalizeGeoData(b);return true},error:function(f,g,e){b.removeClass(SN.C.S.Processing).find(".submit").removeClass(SN.C.S.Disabled).removeAttr(SN.C.S.Disabled,SN.C.S.Disabled);a();if(g=="timeout"){c("error","Sorry! We had trouble sending your notice. The servers are overloaded. Please try again, and contact the site administrator if this problem persists.")}else{var d=SN.U.GetResponseXML(f);if($("."+SN.C.S.Error,d).length>0){b.append(document._importNode($("."+SN.C.S.Error,d)[0],true))}else{if(parseInt(f.status)===0||jQuery.inArray(parseInt(f.status),SN.C.I.HTTP20x30x)>=0){b.resetForm().find(".attach-status").remove();SN.U.FormNoticeEnhancements(b)}else{c("error","(Sorry! We had trouble sending your notice ("+f.status+" "+f.statusText+"). Please report the problem to the site administrator if this happens again.")}}}},success:function(i,f){a();var n=$("#"+SN.C.S.Error,i);if(n.length>0){c("error",n.text())}else{if($("body")[0].id=="bookmarklet"){self.close()}var d=$("#"+SN.C.S.CommandResult,i);if(d.length>0){c("success",d.text())}else{var m=document._importNode($("li",i)[0],true);var k=$("#notices_primary .notices:first");var l=b.closest("li.notice-reply");if(l.length>0){var e=$(m).attr("id");if($("#"+e).length==0){var j=l.closest("li.notice");l.replaceWith(m);SN.U.NoticeInlineReplyPlaceholder(j)}else{l.remove()}}else{if(k.length>0&&SN.U.belongsOnTimeline(m)){if($("#"+m.id).length===0){var h=b.find("[name=inreplyto]").val();var g="#notices_primary #notice-"+h;if($("body")[0].id=="conversation"){if(h.length>0&&$(g+" .notices").length<1){$(g).append('<ul class="notices"></ul>')}$($(g+" .notices")[0]).append(m)}else{k.prepend(m)}$("#"+m.id).css({display:"none"}).fadeIn(2500);SN.U.NoticeWithAttachment($("#"+m.id));SN.U.NoticeReplyTo($("#"+m.id))}}else{c("success",$("title",i).text())}}}b.resetForm();b.find("[name=inreplyto]").val("");b.find(".attach-status").remove();SN.U.FormNoticeEnhancements(b)}},complete:function(d,e){b.removeClass(SN.C.S.Processing).find(".submit").removeAttr(SN.C.S.Disabled).removeClass(SN.C.S.Disabled);b.find("[name=lat]").val(SN.C.I.NoticeDataGeo.NLat);b.find("[name=lon]").val(SN.C.I.NoticeDataGeo.NLon);b.find("[name=location_ns]").val(SN.C.I.NoticeDataGeo.NLNS);b.find("[name=location_id]").val(SN.C.I.NoticeDataGeo.NLID);b.find("[name=notice_data-geo]").attr("checked",SN.C.I.NoticeDataGeo.NDG)}})},normalizeGeoData:function(a){SN.C.I.NoticeDataGeo.NLat=a.find("[name=lat]").val();SN.C.I.NoticeDataGeo.NLon=a.find("[name=lon]").val();SN.C.I.NoticeDataGeo.NLNS=a.find("[name=location_ns]").val();SN.C.I.NoticeDataGeo.NLID=a.find("[name=location_id]").val();SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked");var b=$.cookie(SN.C.S.NoticeDataGeoCookie);if(b!==null&&b!="disabled"){b=JSON.parse(b);SN.C.I.NoticeDataGeo.NLat=a.find("[name=lat]").val(b.NLat).val();SN.C.I.NoticeDataGeo.NLon=a.find("[name=lon]").val(b.NLon).val();if(b.NLNS){SN.C.I.NoticeDataGeo.NLNS=a.find("[name=location_ns]").val(b.NLNS).val();SN.C.I.NoticeDataGeo.NLID=a.find("[name=location_id]").val(b.NLID).val()}else{a.find("[name=location_ns]").val("");a.find("[name=location_id]").val("")}}if(b=="disabled"){SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked",false).attr("checked")}else{SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked",true).attr("checked")}},GetResponseXML:function(b){try{return b.responseXML}catch(a){return(new DOMParser()).parseFromString(b.responseText,"text/xml")}},NoticeReply:function(){if($("#content .notice_reply").length>0){$("#content .notice").each(function(){SN.U.NoticeReplyTo($(this))})}},NoticeReplyTo:function(a){a.find(".notice_reply").live("click",function(c){c.preventDefault();var b=($(".author .nickname",a).length>0)?$($(".author .nickname",a)[0]):$(".author .nickname.uid");SN.U.NoticeInlineReplyTrigger(a,"@"+b.text());return false})},NoticeInlineReplyTrigger:function(h,i){var b=$($(".notice_id",h)[0]).text();var e=h;var f=h.closest(".notices");if(f.hasClass("threaded-replies")){e=f.closest(".notice")}else{f=$("ul.threaded-replies",h);if(f.length==0){f=$('<ul class="notices threaded-replies xoxo"></ul>');h.append(f)}}var j=$(".notice-reply-form",f);var d=function(){j.find("input[name=inreplyto]").val(b);var m=j.find("textarea");if(m.length==0){throw"No textarea"}var l="";if(i){l=i+" "}m.val(l+m.val().replace(RegExp(l,"i"),""));m.data("initialText",$.trim(i+""));m.focus();if(m[0].setSelectionRange){var k=m.val().length;m[0].setSelectionRange(k,k)}};if(j.length>0){d()}else{$("li.notice-reply-placeholder").remove();var g=$("li.notice-reply",f);if(g.length==0){g=$('<li class="notice-reply"></li>');var c=function(k){var l=document._importNode(k,true);g.append(l);f.append(g);var m=j=$(l);SN.U.NoticeLocationAttach(m);SN.U.FormNoticeXHR(m);SN.U.FormNoticeEnhancements(m);SN.U.NoticeDataAttach(m);d()};if(SN.C.I.NoticeFormMaster){c(SN.C.I.NoticeFormMaster)}else{var a=$("#form_notice").attr("action");$.get(a,{ajax:1},function(k,m,l){c($("form",k)[0])})}}}},NoticeInlineReplyPlaceholder:function(b){var a=b.find("ul.threaded-replies");var c=$('<li class="notice-reply-placeholder"><input class="placeholder"></li>');c.click(function(){SN.U.NoticeInlineReplyTrigger(b)});c.find("input").val(SN.msg("reply_placeholder"));a.append(c)},NoticeInlineReplySetup:function(){$(".threaded-replies").each(function(){var b=$(this);var a=b.closest(".notice");SN.U.NoticeInlineReplyPlaceholder(a)})},NoticeRepeat:function(){$(".form_repeat").live("click",function(a){a.preventDefault();SN.U.NoticeRepeatConfirmation($(this));return false})},NoticeRepeatConfirmation:function(a){var c=a.find(".submit");var b=c.clone();b.addClass("submit_dialogbox").removeClass("submit");a.append(b);b.bind("click",function(){SN.U.FormXHR(a);return false});c.hide();a.addClass("dialogbox").append('<button class="close">&#215;</button>').closest(".notice-options").addClass("opaque");a.find("button.close").click(function(){$(this).remove();a.removeClass("dialogbox").closest(".notice-options").removeClass("opaque");a.find(".submit_dialogbox").remove();a.find(".submit").show();return false})},NoticeAttachments:function(){$(".notice a.attachment").each(function(){SN.U.NoticeWithAttachment($(this).closest(".notice"))})},NoticeWithAttachment:function(b){if(b.find(".attachment").length===0){return}var a=b.find(".attachment.more");if(a.length>0){$(a[0]).click(function(){var c=$(this);c.addClass(SN.C.S.Processing);$.get(c.attr("href")+"/ajax",null,function(d){c.parent(".entry-content").html($(d).find("#attachment_view .entry-content").html())});return false}).attr("title",SN.msg("showmore_tooltip"))}},NoticeDataAttach:function(b){var a=b.find("input[type=file]");a.change(function(f){b.find(".attach-status").remove();var d=$(this).val();if(!d){return false}var c=$('<div class="attach-status '+SN.C.S.Success+'"><code></code> <button class="close">&#215;</button></div>');c.find("code").text(d);c.find("button").click(function(){c.remove();a.val("");return false});b.append(c);if(typeof this.files=="object"){for(var e=0;e<this.files.length;e++){SN.U.PreviewAttach(b,this.files[e])}}})},maxFileSize:function(b){var a=$(b).find("input[name=MAX_FILE_SIZE]").attr("value");if(a){return parseInt(a)}else{return 0}},PreviewAttach:function(d,c){var e=c.type+" "+Math.round(c.size/1024)+"KB";var f=true;var h;if(typeof window.createObjectURL!="undefined"){h=function(i,j){j(window.createObjectURL(i))}}else{if(typeof window.FileReader!="undefined"){h=function(j,k){var i=new FileReader();i.onload=function(l){k(i.result)};i.readAsDataURL(j)}}else{f=false}}var a=["image/png","image/jpeg","image/gif","image/svg+xml"];if($.inArray(c.type,a)==-1){f=false}var g=8*1024*1024;if(c.size>g){f=false}if(f){h(c,function(j){var i=$("<img>").attr("title",e).attr("alt",e).attr("src",j).attr("style","height: 120px");d.find(".attach-status").append(i)})}else{var b=$("<div></div>").text(e);d.find(".attach-status").append(b)}},NoticeLocationAttach:function(a){var e=a.find("[name=lat]");var k=a.find("[name=lon]");var g=a.find("[name=location_ns]").val();var l=a.find("[name=location_id]").val();var b="";var d=a.find("[name=notice_data-geo]");var c=a.find("[name=notice_data-geo]");var j=a.find("label.notice_data-geo");function f(n){j.attr("title",jQuery.trim(j.text())).removeClass("checked");a.find("[name=lat]").val("");a.find("[name=lon]").val("");a.find("[name=location_ns]").val("");a.find("[name=location_id]").val("");a.find("[name=notice_data-geo]").attr("checked",false);$.cookie(SN.C.S.NoticeDataGeoCookie,"disabled",{path:"/"});if(n){a.find(".geo_status_wrapper").removeClass("success").addClass("error");a.find(".geo_status_wrapper .geo_status").text(n)}else{a.find(".geo_status_wrapper").remove()}}function m(n,o){SN.U.NoticeGeoStatus(a,"Looking up place name...");$.getJSON(n,o,function(p){var q,r;if(typeof(p.location_ns)!="undefined"){a.find("[name=location_ns]").val(p.location_ns);q=p.location_ns}if(typeof(p.location_id)!="undefined"){a.find("[name=location_id]").val(p.location_id);r=p.location_id}if(typeof(p.name)=="undefined"){NLN_text=o.lat+";"+o.lon}else{NLN_text=p.name}SN.U.NoticeGeoStatus(a,NLN_text,o.lat,o.lon,p.url);j.attr("title",NoticeDataGeo_text.ShareDisable+" ("+NLN_text+")");a.find("[name=lat]").val(o.lat);a.find("[name=lon]").val(o.lon);a.find("[name=location_ns]").val(q);a.find("[name=location_id]").val(r);a.find("[name=notice_data-geo]").attr("checked",true);var s={NLat:o.lat,NLon:o.lon,NLNS:q,NLID:r,NLN:NLN_text,NLNU:p.url,NDG:true};$.cookie(SN.C.S.NoticeDataGeoCookie,JSON.stringify(s),{path:"/"})})}if(c.length>0){if($.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){c.attr("checked",false)}else{c.attr("checked",true)}var h=a.find(".notice_data-geo_wrap");var i=h.attr("title");h.removeAttr("title");j.attr("title",j.text());c.change(function(){if(c.attr("checked")===true||$.cookie(SN.C.S.NoticeDataGeoCookie)===null){j.attr("title",NoticeDataGeo_text.ShareDisable).addClass("checked");if($.cookie(SN.C.S.NoticeDataGeoCookie)===null||$.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){if(navigator.geolocation){SN.U.NoticeGeoStatus(a,"Requesting location from browser...");navigator.geolocation.getCurrentPosition(function(p){a.find("[name=lat]").val(p.coords.latitude);a.find("[name=lon]").val(p.coords.longitude);var q={lat:p.coords.latitude,lon:p.coords.longitude,token:$("#token").val()};m(i,q)},function(p){switch(p.code){case p.PERMISSION_DENIED:f("Location permission denied.");break;case p.TIMEOUT:f("Location lookup timeout.");break}},{timeout:10000})}else{if(e.length>0&&k.length>0){var n={lat:e,lon:k,token:$("#token").val()};m(i,n)}else{f();c.remove();j.remove()}}}else{var o=JSON.parse($.cookie(SN.C.S.NoticeDataGeoCookie));a.find("[name=lat]").val(o.NLat);a.find("[name=lon]").val(o.NLon);a.find("[name=location_ns]").val(o.NLNS);a.find("[name=location_id]").val(o.NLID);a.find("[name=notice_data-geo]").attr("checked",o.NDG);SN.U.NoticeGeoStatus(a,o.NLN,o.NLat,o.NLon,o.NLNU);j.attr("title",NoticeDataGeo_text.ShareDisable+" ("+o.NLN+")").addClass("checked")}}else{f()}}).change()}},NoticeGeoStatus:function(e,a,f,g,c){var h=e.find(".geo_status_wrapper");if(h.length==0){h=$('<div class="'+SN.C.S.Success+' geo_status_wrapper"><button class="close" style="float:right">&#215;</button><div class="geo_status"></div></div>');h.find("button.close").click(function(){e.find("[name=notice_data-geo]").removeAttr("checked").change()});e.append(h)}var b;if(c){b=$("<a></a>").attr("href",c)}else{b=$("<span></span>")}b.text(a);if(f||g){var d=f+";"+g;b.attr("title",d);if(!a){b.text(d)}}h.find(".geo_status").empty().append(b)},NewDirectMessage:function(){NDM=$(".entity_send-a-message a");NDM.attr({href:NDM.attr("href")+"&ajax=1"});NDM.bind("click",function(){var a=$(".entity_send-a-message form");if(a.length===0){$(this).addClass(SN.C.S.Processing);$.get(NDM.attr("href"),null,function(b){$(".entity_send-a-message").append(document._importNode($("form",b)[0],true));a=$(".entity_send-a-message .form_notice");SN.U.FormNoticeXHR(a);SN.U.FormNoticeEnhancements(a);a.append('<button class="close">&#215;</button>');$(".entity_send-a-message button").click(function(){a.hide();return false});NDM.removeClass(SN.C.S.Processing)})}else{a.show();$(".entity_send-a-message textarea").focus()}return false})},GetFullYear:function(c,d,a){var b=new Date();b.setFullYear(c,d,a);return b},StatusNetInstance:{Set:function(b){var a=SN.U.StatusNetInstance.Get();if(a!==null){b=$.extend(a,b)}$.cookie(SN.C.S.StatusNetInstance,JSON.stringify(b),{path:"/",expires:SN.U.GetFullYear(2029,0,1)})},Get:function(){var a=$.cookie(SN.C.S.StatusNetInstance);if(a!==null){return JSON.parse(a)}return null},Delete:function(){$.cookie(SN.C.S.StatusNetInstance,null)}},belongsOnTimeline:function(b){var a=$("body").attr("id");if(a=="public"){return true}var c=$("#nav_profile a").attr("href");if(c){var d=$(b).find(".vcard.author a.url").attr("href");if(d==c){if(a=="all"||a=="showstream"){return true}}}return false},switchInputFormTab:function(a){$(".input_form_nav_tab.current").removeClass("current");$("#input_form_nav_"+a).addClass("current");$(".input_form.current").removeClass("current");$("#input_form_"+a).addClass("current")}},Init:{NoticeForm:function(){if($("body.user_in").length>0){$(".ajax-notice").each(function(){var a=$(this);SN.U.NoticeLocationAttach(a);SN.U.FormNoticeXHR(a);SN.U.FormNoticeEnhancements(a);SN.U.NoticeDataAttach(a)})}},Notices:function(){if($("body.user_in").length>0){var a=$(".form_notice:first");if(a.length>0){SN.C.I.NoticeFormMaster=document._importNode(a[0],true)}SN.U.NoticeRepeat();SN.U.NoticeReply();SN.U.NoticeInlineReplySetup()}SN.U.NoticeAttachments()},EntityActions:function(){if($("body.user_in").length>0){SN.U.NewDirectMessage()}},Login:function(){if(SN.U.StatusNetInstance.Get()!==null){var a=SN.U.StatusNetInstance.Get().Nickname;if(a!==null){$("#form_login #nickname").val(a)}}$("#form_login").bind("submit",function(){SN.U.StatusNetInstance.Set({Nickname:$("#form_login #nickname").val()});return true})},AjaxForms:function(){$("form.ajax").live("submit",function(){SN.U.FormXHR($(this));return false})},UploadForms:function(){$("input[type=file]").change(function(d){if(typeof this.files=="object"&&this.files.length>0){var c=0;for(var b=0;b<this.files.length;b++){c+=this.files[b].size}var a=SN.U.maxFileSize($(this.form));if(a>0&&c>a){var e="File too large: maximum upload size is %d bytes.";alert(e.replace("%d",a));$(this).val("");d.preventDefault();return false}}})}}};$(document).ready(function(){SN.Init.AjaxForms();SN.Init.UploadForms();if($("."+SN.C.S.FormNotice).length>0){SN.Init.NoticeForm()}if($("#content .notices").length>0){SN.Init.Notices()}if($("#content .entity_actions").length>0){SN.Init.EntityActions()}if($("#form_login").length>0){SN.Init.Login()}});if(!document.ELEMENT_NODE){document.ELEMENT_NODE=1;document.ATTRIBUTE_NODE=2;document.TEXT_NODE=3;document.CDATA_SECTION_NODE=4;document.ENTITY_REFERENCE_NODE=5;document.ENTITY_NODE=6;document.PROCESSING_INSTRUCTION_NODE=7;document.COMMENT_NODE=8;document.DOCUMENT_NODE=9;document.DOCUMENT_TYPE_NODE=10;document.DOCUMENT_FRAGMENT_NODE=11;document.NOTATION_NODE=12}document._importNode=function(e,a){switch(e.nodeType){case document.ELEMENT_NODE:var d=document.createElement(e.nodeName);if(e.attributes&&e.attributes.length>0){for(var c=0,b=e.attributes.length;c<b;){if(e.attributes[c].nodeName=="class"){d.className=e.getAttribute(e.attributes[c++].nodeName)}else{d.setAttribute(e.attributes[c].nodeName,e.getAttribute(e.attributes[c++].nodeName))}}}if(a&&e.childNodes&&e.childNodes.length>0){for(var c=0,b=e.childNodes.length;c<b;){d.appendChild(document._importNode(e.childNodes[c++],a))}}return d;break;case document.TEXT_NODE:case document.CDATA_SECTION_NODE:case document.COMMENT_NODE:return document.createTextNode(e.nodeValue);break}};if(typeof navigator.geolocation=="undefined"||navigator.geolocation.shim){(function(){(function(){if(window.google&&google.gears){return}var c=null;if(typeof GearsFactory!="undefined"){c=new GearsFactory()}else{try{c=new ActiveXObject("Gears.Factory");if(c.getBuildInfo().indexOf("ie_mobile")!=-1){c.privateSetGlobalObject(this)}}catch(d){if((typeof navigator.mimeTypes!="undefined")&&navigator.mimeTypes["application/x-googlegears"]){c=document.createElement("object");c.style.display="none";c.width=0;c.height=0;c.type="application/x-googlegears";document.documentElement.appendChild(c)}}}if(!c){return}if(!window.google){google={}}if(!google.gears){google.gears={factory:c}}})();var a=(function(){var d=google.gears.factory.create("beta.geolocation");var c=function(f,e){return function(g){f(g);e.lastPosition=g}};return{shim:true,type:"Gears",lastPosition:null,getCurrentPosition:function(e,g,h){var f=this;var i=c(e,f);d.getCurrentPosition(i,g,h)},watchPosition:function(e,f,g){d.watchPosition(e,f,g)},clearWatch:function(e){d.clearWatch(e)},getPermission:function(g,e,f){d.getPermission(g,e,f)}}});var b=(function(){var i=false;var e=function(){if(!d()&&!i){i=true;var j=document.createElement("script");j.src=(document.location.protocol=="https:"?"https://":"http://")+"www.google.com/jsapi?callback=_google_loader_apiLoaded";j.type="text/javascript";document.getElementsByTagName("body")[0].appendChild(j)}};var c=[];var h=function(j){c.push(j)};var f=function(){if(d()){while(c.length>0){var j=c.pop();j()}}};window._google_loader_apiLoaded=function(){f()};var d=function(){return(window.google&&google.loader)};var g=function(j){if(d()){return true}h(j);e();return false};e();return{shim:true,type:"ClientLocation",lastPosition:null,getCurrentPosition:function(k,n,o){var m=this;if(!g(function(){m.getCurrentPosition(k,n,o)})){return}if(google.loader.ClientLocation){var l=google.loader.ClientLocation;var j={coords:{latitude:l.latitude,longitude:l.longitude,altitude:null,accuracy:43000,altitudeAccuracy:null,heading:null,speed:null},address:{city:l.address.city,country:l.address.country,country_code:l.address.country_code,region:l.address.region},timestamp:new Date()};k(j);this.lastPosition=j}else{if(n==="function"){n({code:3,message:"Using the Google ClientLocation API and it is not able to calculate a location."})}}},watchPosition:function(j,l,m){this.getCurrentPosition(j,l,m);var k=this;var n=setInterval(function(){k.getCurrentPosition(j,l,m)},10000);return n},clearWatch:function(j){clearInterval(j)},getPermission:function(l,j,k){return true}}});navigator.geolocation=(window.google&&google.gears)?a():b()})()};
\ No newline at end of file
diff --git a/lib/messageform.php b/lib/messageform.php
index 9a4dfbb0f5..733e83cd15 100644
--- a/lib/messageform.php
+++ b/lib/messageform.php
@@ -96,7 +96,7 @@ class MessageForm extends Form
 
     function formClass()
     {
-        return 'form_notice';
+        return 'form_notice ajax-notice';
     }
 
     /**
@@ -153,7 +153,7 @@ class MessageForm extends Form
         $this->out->dropdown('to', _('To'), $mutual, null, false,
                              ($this->to) ? $this->to->id : null);
 
-        $this->out->element('textarea', array('id' => 'notice_data-text',
+        $this->out->element('textarea', array('class' => 'notice_data-text',
                                               'cols' => 35,
                                               'rows' => 4,
                                               'name' => 'content'),
diff --git a/lib/noticeform.php b/lib/noticeform.php
index e889036f55..9d931b92ed 100644
--- a/lib/noticeform.php
+++ b/lib/noticeform.php
@@ -170,7 +170,7 @@ class NoticeForm extends Form
                                 // TRANS: Title for notice label. %s is the user's nickname.
                                 sprintf(_('What\'s up, %s?'), $this->user->nickname));
             // XXX: vary by defined max size
-            $this->out->element('textarea', array('id' => 'notice_data-text',
+            $this->out->element('textarea', array('class' => 'notice_data-text',
                                                   'cols' => 35,
                                                   'rows' => 4,
                                                   'name' => 'status_textarea'),

From ec828a094cf187a6650fa5325d1591351f031323 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Wed, 9 Mar 2011 17:43:31 -0800
Subject: [PATCH 484/655] Update LinkPreview plugin for multiple notice forms.

* main notice form setup now encapsulated into SN.Init.NoticeForm(form) -- this can be monkeypatched by plugins to append their own setup code, as LinkPreview does
* LinkPreview now supports debugging with non-minified JS source when $config['site']['minify'] is false
* tweaked core & neo styles so 'notice-status' class gets same styles as attach-status, so we can more easily add mroe statusy things. (needs more consolidation with geo-status, etc)
* tweaked LinkPreview's preview area to use that style
---
 js/util.js                                |  24 +-
 js/util.min.js                            |   2 +-
 plugins/LinkPreview/LinkPreviewPlugin.php |   7 +-
 plugins/LinkPreview/linkpreview.js        | 343 ++++++++++++----------
 plugins/LinkPreview/linkpreview.min.js    |   2 +-
 theme/base/css/display.css                |   6 +-
 theme/neo/css/display.css                 |   7 +-
 theme/rebase/css/display.css              |   6 +-
 8 files changed, 219 insertions(+), 178 deletions(-)

diff --git a/js/util.js b/js/util.js
index 37a7585d23..cc95a08bf5 100644
--- a/js/util.js
+++ b/js/util.js
@@ -612,10 +612,7 @@ var SN = { // StatusNet
                         list.append(replyItem);
 
                         var form = replyForm = $(formEl);
-                        SN.U.NoticeLocationAttach(form);
-                        SN.U.FormNoticeXHR(form);
-                        SN.U.FormNoticeEnhancements(form);
-                        SN.U.NoticeDataAttach(form);
+                        SN.Init.NoticeFormSetup(form);
 
                         nextStep();
                     };
@@ -1310,14 +1307,25 @@ var SN = { // StatusNet
             if ($('body.user_in').length > 0) {
                 $('.ajax-notice').each(function() {
                     var form = $(this);
-                    SN.U.NoticeLocationAttach(form);
-                    SN.U.FormNoticeXHR(form);
-                    SN.U.FormNoticeEnhancements(form);
-                    SN.U.NoticeDataAttach(form);
+                    SN.Init.NoticeFormSetup(form);
                 });
             }
         },
 
+        /**
+         * Encapsulate notice form setup for a single form.
+         * Plugins can add extra setup by monkeypatching this
+         * function.
+         *
+         * @param {jQuery} form
+         */
+        NoticeFormSetup: function(form) {
+            SN.U.NoticeLocationAttach(form);
+            SN.U.FormNoticeXHR(form);
+            SN.U.FormNoticeEnhancements(form);
+            SN.U.NoticeDataAttach(form);
+        },
+
         /**
          * Run setup code for notice timeline views items:
          *
diff --git a/js/util.min.js b/js/util.min.js
index 07994af6d1..32a893355f 100644
--- a/js/util.min.js
+++ b/js/util.min.js
@@ -1 +1 @@
-var SN={C:{I:{CounterBlackout:false,MaxLength:140,PatternUsername:/^[0-9a-zA-Z\-_.]*$/,HTTP20x30x:[200,201,202,203,204,205,206,300,301,302,303,304,305,306,307],NoticeFormMaster:null},S:{Disabled:"disabled",Warning:"warning",Error:"error",Success:"success",Processing:"processing",CommandResult:"command_result",FormNotice:"form_notice",NoticeDataGeo:"notice_data-geo",NoticeDataGeoCookie:"NoticeDataGeo",NoticeDataGeoSelected:"notice_data-geo_selected",StatusNetInstance:"StatusNetInstance"}},messages:{},msg:function(a){if(typeof SN.messages[a]=="undefined"){return"["+a+"]"}else{return SN.messages[a]}},U:{FormNoticeEnhancements:function(b){if(jQuery.data(b[0],"ElementData")===undefined){MaxLength=b.find(".count").text();if(typeof(MaxLength)=="undefined"){MaxLength=SN.C.I.MaxLength}jQuery.data(b[0],"ElementData",{MaxLength:MaxLength});SN.U.Counter(b);NDT=b.find(".notice_data-text:first");NDT.bind("keyup",function(c){SN.U.Counter(b)});var a=function(c){window.setTimeout(function(){SN.U.Counter(b)},50)};NDT.bind("cut",a).bind("paste",a)}else{b.find(".count").text(jQuery.data(b[0],"ElementData").MaxLength)}},Counter:function(d){SN.C.I.FormNoticeCurrent=d;var b=jQuery.data(d[0],"ElementData").MaxLength;if(b<=0){return}var c=b-SN.U.CharacterCount(d);var a=d.find(".count");if(c.toString()!=a.text()){if(!SN.C.I.CounterBlackout||c===0){if(a.text()!=String(c)){a.text(c)}if(c<0){d.addClass(SN.C.S.Warning)}else{d.removeClass(SN.C.S.Warning)}if(!SN.C.I.CounterBlackout){SN.C.I.CounterBlackout=true;SN.C.I.FormNoticeCurrent=d;window.setTimeout("SN.U.ClearCounterBlackout(SN.C.I.FormNoticeCurrent);",500)}}}},CharacterCount:function(a){return a.find(".notice_data-text:first").val().length},ClearCounterBlackout:function(a){SN.C.I.CounterBlackout=false;SN.U.Counter(a)},RewriteAjaxAction:function(a){if(document.location.protocol=="https:"&&a.substr(0,5)=="http:"){return a.replace(/^http:\/\/[^:\/]+/,"https://"+document.location.host)}else{return a}},FormXHR:function(a){$.ajax({type:"POST",dataType:"xml",url:SN.U.RewriteAjaxAction(a.attr("action")),data:a.serialize()+"&ajax=1",beforeSend:function(b){a.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(c,d,b){alert(b||d)},success:function(b,c){if(typeof($("form",b)[0])!="undefined"){form_new=document._importNode($("form",b)[0],true);a.replaceWith(form_new)}else{a.replaceWith(document._importNode($("p",b)[0],true))}}})},FormNoticeXHR:function(b){SN.C.I.NoticeDataGeo={};b.append('<input type="hidden" name="ajax" value="1"/>');b.attr("action",SN.U.RewriteAjaxAction(b.attr("action")));var c=function(d,e){b.append($('<p class="form_response"></p>').addClass(d).text(e))};var a=function(){b.find(".form_response").remove()};b.ajaxForm({dataType:"xml",timeout:"60000",beforeSend:function(d){if(b.find(".notice_data-text:first").val()==""){b.addClass(SN.C.S.Warning);return false}b.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled);SN.U.normalizeGeoData(b);return true},error:function(f,g,e){b.removeClass(SN.C.S.Processing).find(".submit").removeClass(SN.C.S.Disabled).removeAttr(SN.C.S.Disabled,SN.C.S.Disabled);a();if(g=="timeout"){c("error","Sorry! We had trouble sending your notice. The servers are overloaded. Please try again, and contact the site administrator if this problem persists.")}else{var d=SN.U.GetResponseXML(f);if($("."+SN.C.S.Error,d).length>0){b.append(document._importNode($("."+SN.C.S.Error,d)[0],true))}else{if(parseInt(f.status)===0||jQuery.inArray(parseInt(f.status),SN.C.I.HTTP20x30x)>=0){b.resetForm().find(".attach-status").remove();SN.U.FormNoticeEnhancements(b)}else{c("error","(Sorry! We had trouble sending your notice ("+f.status+" "+f.statusText+"). Please report the problem to the site administrator if this happens again.")}}}},success:function(i,f){a();var n=$("#"+SN.C.S.Error,i);if(n.length>0){c("error",n.text())}else{if($("body")[0].id=="bookmarklet"){self.close()}var d=$("#"+SN.C.S.CommandResult,i);if(d.length>0){c("success",d.text())}else{var m=document._importNode($("li",i)[0],true);var k=$("#notices_primary .notices:first");var l=b.closest("li.notice-reply");if(l.length>0){var e=$(m).attr("id");if($("#"+e).length==0){var j=l.closest("li.notice");l.replaceWith(m);SN.U.NoticeInlineReplyPlaceholder(j)}else{l.remove()}}else{if(k.length>0&&SN.U.belongsOnTimeline(m)){if($("#"+m.id).length===0){var h=b.find("[name=inreplyto]").val();var g="#notices_primary #notice-"+h;if($("body")[0].id=="conversation"){if(h.length>0&&$(g+" .notices").length<1){$(g).append('<ul class="notices"></ul>')}$($(g+" .notices")[0]).append(m)}else{k.prepend(m)}$("#"+m.id).css({display:"none"}).fadeIn(2500);SN.U.NoticeWithAttachment($("#"+m.id));SN.U.NoticeReplyTo($("#"+m.id))}}else{c("success",$("title",i).text())}}}b.resetForm();b.find("[name=inreplyto]").val("");b.find(".attach-status").remove();SN.U.FormNoticeEnhancements(b)}},complete:function(d,e){b.removeClass(SN.C.S.Processing).find(".submit").removeAttr(SN.C.S.Disabled).removeClass(SN.C.S.Disabled);b.find("[name=lat]").val(SN.C.I.NoticeDataGeo.NLat);b.find("[name=lon]").val(SN.C.I.NoticeDataGeo.NLon);b.find("[name=location_ns]").val(SN.C.I.NoticeDataGeo.NLNS);b.find("[name=location_id]").val(SN.C.I.NoticeDataGeo.NLID);b.find("[name=notice_data-geo]").attr("checked",SN.C.I.NoticeDataGeo.NDG)}})},normalizeGeoData:function(a){SN.C.I.NoticeDataGeo.NLat=a.find("[name=lat]").val();SN.C.I.NoticeDataGeo.NLon=a.find("[name=lon]").val();SN.C.I.NoticeDataGeo.NLNS=a.find("[name=location_ns]").val();SN.C.I.NoticeDataGeo.NLID=a.find("[name=location_id]").val();SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked");var b=$.cookie(SN.C.S.NoticeDataGeoCookie);if(b!==null&&b!="disabled"){b=JSON.parse(b);SN.C.I.NoticeDataGeo.NLat=a.find("[name=lat]").val(b.NLat).val();SN.C.I.NoticeDataGeo.NLon=a.find("[name=lon]").val(b.NLon).val();if(b.NLNS){SN.C.I.NoticeDataGeo.NLNS=a.find("[name=location_ns]").val(b.NLNS).val();SN.C.I.NoticeDataGeo.NLID=a.find("[name=location_id]").val(b.NLID).val()}else{a.find("[name=location_ns]").val("");a.find("[name=location_id]").val("")}}if(b=="disabled"){SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked",false).attr("checked")}else{SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked",true).attr("checked")}},GetResponseXML:function(b){try{return b.responseXML}catch(a){return(new DOMParser()).parseFromString(b.responseText,"text/xml")}},NoticeReply:function(){if($("#content .notice_reply").length>0){$("#content .notice").each(function(){SN.U.NoticeReplyTo($(this))})}},NoticeReplyTo:function(a){a.find(".notice_reply").live("click",function(c){c.preventDefault();var b=($(".author .nickname",a).length>0)?$($(".author .nickname",a)[0]):$(".author .nickname.uid");SN.U.NoticeInlineReplyTrigger(a,"@"+b.text());return false})},NoticeInlineReplyTrigger:function(h,i){var b=$($(".notice_id",h)[0]).text();var e=h;var f=h.closest(".notices");if(f.hasClass("threaded-replies")){e=f.closest(".notice")}else{f=$("ul.threaded-replies",h);if(f.length==0){f=$('<ul class="notices threaded-replies xoxo"></ul>');h.append(f)}}var j=$(".notice-reply-form",f);var d=function(){j.find("input[name=inreplyto]").val(b);var m=j.find("textarea");if(m.length==0){throw"No textarea"}var l="";if(i){l=i+" "}m.val(l+m.val().replace(RegExp(l,"i"),""));m.data("initialText",$.trim(i+""));m.focus();if(m[0].setSelectionRange){var k=m.val().length;m[0].setSelectionRange(k,k)}};if(j.length>0){d()}else{$("li.notice-reply-placeholder").remove();var g=$("li.notice-reply",f);if(g.length==0){g=$('<li class="notice-reply"></li>');var c=function(k){var l=document._importNode(k,true);g.append(l);f.append(g);var m=j=$(l);SN.U.NoticeLocationAttach(m);SN.U.FormNoticeXHR(m);SN.U.FormNoticeEnhancements(m);SN.U.NoticeDataAttach(m);d()};if(SN.C.I.NoticeFormMaster){c(SN.C.I.NoticeFormMaster)}else{var a=$("#form_notice").attr("action");$.get(a,{ajax:1},function(k,m,l){c($("form",k)[0])})}}}},NoticeInlineReplyPlaceholder:function(b){var a=b.find("ul.threaded-replies");var c=$('<li class="notice-reply-placeholder"><input class="placeholder"></li>');c.click(function(){SN.U.NoticeInlineReplyTrigger(b)});c.find("input").val(SN.msg("reply_placeholder"));a.append(c)},NoticeInlineReplySetup:function(){$(".threaded-replies").each(function(){var b=$(this);var a=b.closest(".notice");SN.U.NoticeInlineReplyPlaceholder(a)})},NoticeRepeat:function(){$(".form_repeat").live("click",function(a){a.preventDefault();SN.U.NoticeRepeatConfirmation($(this));return false})},NoticeRepeatConfirmation:function(a){var c=a.find(".submit");var b=c.clone();b.addClass("submit_dialogbox").removeClass("submit");a.append(b);b.bind("click",function(){SN.U.FormXHR(a);return false});c.hide();a.addClass("dialogbox").append('<button class="close">&#215;</button>').closest(".notice-options").addClass("opaque");a.find("button.close").click(function(){$(this).remove();a.removeClass("dialogbox").closest(".notice-options").removeClass("opaque");a.find(".submit_dialogbox").remove();a.find(".submit").show();return false})},NoticeAttachments:function(){$(".notice a.attachment").each(function(){SN.U.NoticeWithAttachment($(this).closest(".notice"))})},NoticeWithAttachment:function(b){if(b.find(".attachment").length===0){return}var a=b.find(".attachment.more");if(a.length>0){$(a[0]).click(function(){var c=$(this);c.addClass(SN.C.S.Processing);$.get(c.attr("href")+"/ajax",null,function(d){c.parent(".entry-content").html($(d).find("#attachment_view .entry-content").html())});return false}).attr("title",SN.msg("showmore_tooltip"))}},NoticeDataAttach:function(b){var a=b.find("input[type=file]");a.change(function(f){b.find(".attach-status").remove();var d=$(this).val();if(!d){return false}var c=$('<div class="attach-status '+SN.C.S.Success+'"><code></code> <button class="close">&#215;</button></div>');c.find("code").text(d);c.find("button").click(function(){c.remove();a.val("");return false});b.append(c);if(typeof this.files=="object"){for(var e=0;e<this.files.length;e++){SN.U.PreviewAttach(b,this.files[e])}}})},maxFileSize:function(b){var a=$(b).find("input[name=MAX_FILE_SIZE]").attr("value");if(a){return parseInt(a)}else{return 0}},PreviewAttach:function(d,c){var e=c.type+" "+Math.round(c.size/1024)+"KB";var f=true;var h;if(typeof window.createObjectURL!="undefined"){h=function(i,j){j(window.createObjectURL(i))}}else{if(typeof window.FileReader!="undefined"){h=function(j,k){var i=new FileReader();i.onload=function(l){k(i.result)};i.readAsDataURL(j)}}else{f=false}}var a=["image/png","image/jpeg","image/gif","image/svg+xml"];if($.inArray(c.type,a)==-1){f=false}var g=8*1024*1024;if(c.size>g){f=false}if(f){h(c,function(j){var i=$("<img>").attr("title",e).attr("alt",e).attr("src",j).attr("style","height: 120px");d.find(".attach-status").append(i)})}else{var b=$("<div></div>").text(e);d.find(".attach-status").append(b)}},NoticeLocationAttach:function(a){var e=a.find("[name=lat]");var k=a.find("[name=lon]");var g=a.find("[name=location_ns]").val();var l=a.find("[name=location_id]").val();var b="";var d=a.find("[name=notice_data-geo]");var c=a.find("[name=notice_data-geo]");var j=a.find("label.notice_data-geo");function f(n){j.attr("title",jQuery.trim(j.text())).removeClass("checked");a.find("[name=lat]").val("");a.find("[name=lon]").val("");a.find("[name=location_ns]").val("");a.find("[name=location_id]").val("");a.find("[name=notice_data-geo]").attr("checked",false);$.cookie(SN.C.S.NoticeDataGeoCookie,"disabled",{path:"/"});if(n){a.find(".geo_status_wrapper").removeClass("success").addClass("error");a.find(".geo_status_wrapper .geo_status").text(n)}else{a.find(".geo_status_wrapper").remove()}}function m(n,o){SN.U.NoticeGeoStatus(a,"Looking up place name...");$.getJSON(n,o,function(p){var q,r;if(typeof(p.location_ns)!="undefined"){a.find("[name=location_ns]").val(p.location_ns);q=p.location_ns}if(typeof(p.location_id)!="undefined"){a.find("[name=location_id]").val(p.location_id);r=p.location_id}if(typeof(p.name)=="undefined"){NLN_text=o.lat+";"+o.lon}else{NLN_text=p.name}SN.U.NoticeGeoStatus(a,NLN_text,o.lat,o.lon,p.url);j.attr("title",NoticeDataGeo_text.ShareDisable+" ("+NLN_text+")");a.find("[name=lat]").val(o.lat);a.find("[name=lon]").val(o.lon);a.find("[name=location_ns]").val(q);a.find("[name=location_id]").val(r);a.find("[name=notice_data-geo]").attr("checked",true);var s={NLat:o.lat,NLon:o.lon,NLNS:q,NLID:r,NLN:NLN_text,NLNU:p.url,NDG:true};$.cookie(SN.C.S.NoticeDataGeoCookie,JSON.stringify(s),{path:"/"})})}if(c.length>0){if($.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){c.attr("checked",false)}else{c.attr("checked",true)}var h=a.find(".notice_data-geo_wrap");var i=h.attr("title");h.removeAttr("title");j.attr("title",j.text());c.change(function(){if(c.attr("checked")===true||$.cookie(SN.C.S.NoticeDataGeoCookie)===null){j.attr("title",NoticeDataGeo_text.ShareDisable).addClass("checked");if($.cookie(SN.C.S.NoticeDataGeoCookie)===null||$.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){if(navigator.geolocation){SN.U.NoticeGeoStatus(a,"Requesting location from browser...");navigator.geolocation.getCurrentPosition(function(p){a.find("[name=lat]").val(p.coords.latitude);a.find("[name=lon]").val(p.coords.longitude);var q={lat:p.coords.latitude,lon:p.coords.longitude,token:$("#token").val()};m(i,q)},function(p){switch(p.code){case p.PERMISSION_DENIED:f("Location permission denied.");break;case p.TIMEOUT:f("Location lookup timeout.");break}},{timeout:10000})}else{if(e.length>0&&k.length>0){var n={lat:e,lon:k,token:$("#token").val()};m(i,n)}else{f();c.remove();j.remove()}}}else{var o=JSON.parse($.cookie(SN.C.S.NoticeDataGeoCookie));a.find("[name=lat]").val(o.NLat);a.find("[name=lon]").val(o.NLon);a.find("[name=location_ns]").val(o.NLNS);a.find("[name=location_id]").val(o.NLID);a.find("[name=notice_data-geo]").attr("checked",o.NDG);SN.U.NoticeGeoStatus(a,o.NLN,o.NLat,o.NLon,o.NLNU);j.attr("title",NoticeDataGeo_text.ShareDisable+" ("+o.NLN+")").addClass("checked")}}else{f()}}).change()}},NoticeGeoStatus:function(e,a,f,g,c){var h=e.find(".geo_status_wrapper");if(h.length==0){h=$('<div class="'+SN.C.S.Success+' geo_status_wrapper"><button class="close" style="float:right">&#215;</button><div class="geo_status"></div></div>');h.find("button.close").click(function(){e.find("[name=notice_data-geo]").removeAttr("checked").change()});e.append(h)}var b;if(c){b=$("<a></a>").attr("href",c)}else{b=$("<span></span>")}b.text(a);if(f||g){var d=f+";"+g;b.attr("title",d);if(!a){b.text(d)}}h.find(".geo_status").empty().append(b)},NewDirectMessage:function(){NDM=$(".entity_send-a-message a");NDM.attr({href:NDM.attr("href")+"&ajax=1"});NDM.bind("click",function(){var a=$(".entity_send-a-message form");if(a.length===0){$(this).addClass(SN.C.S.Processing);$.get(NDM.attr("href"),null,function(b){$(".entity_send-a-message").append(document._importNode($("form",b)[0],true));a=$(".entity_send-a-message .form_notice");SN.U.FormNoticeXHR(a);SN.U.FormNoticeEnhancements(a);a.append('<button class="close">&#215;</button>');$(".entity_send-a-message button").click(function(){a.hide();return false});NDM.removeClass(SN.C.S.Processing)})}else{a.show();$(".entity_send-a-message textarea").focus()}return false})},GetFullYear:function(c,d,a){var b=new Date();b.setFullYear(c,d,a);return b},StatusNetInstance:{Set:function(b){var a=SN.U.StatusNetInstance.Get();if(a!==null){b=$.extend(a,b)}$.cookie(SN.C.S.StatusNetInstance,JSON.stringify(b),{path:"/",expires:SN.U.GetFullYear(2029,0,1)})},Get:function(){var a=$.cookie(SN.C.S.StatusNetInstance);if(a!==null){return JSON.parse(a)}return null},Delete:function(){$.cookie(SN.C.S.StatusNetInstance,null)}},belongsOnTimeline:function(b){var a=$("body").attr("id");if(a=="public"){return true}var c=$("#nav_profile a").attr("href");if(c){var d=$(b).find(".vcard.author a.url").attr("href");if(d==c){if(a=="all"||a=="showstream"){return true}}}return false},switchInputFormTab:function(a){$(".input_form_nav_tab.current").removeClass("current");$("#input_form_nav_"+a).addClass("current");$(".input_form.current").removeClass("current");$("#input_form_"+a).addClass("current")}},Init:{NoticeForm:function(){if($("body.user_in").length>0){$(".ajax-notice").each(function(){var a=$(this);SN.U.NoticeLocationAttach(a);SN.U.FormNoticeXHR(a);SN.U.FormNoticeEnhancements(a);SN.U.NoticeDataAttach(a)})}},Notices:function(){if($("body.user_in").length>0){var a=$(".form_notice:first");if(a.length>0){SN.C.I.NoticeFormMaster=document._importNode(a[0],true)}SN.U.NoticeRepeat();SN.U.NoticeReply();SN.U.NoticeInlineReplySetup()}SN.U.NoticeAttachments()},EntityActions:function(){if($("body.user_in").length>0){SN.U.NewDirectMessage()}},Login:function(){if(SN.U.StatusNetInstance.Get()!==null){var a=SN.U.StatusNetInstance.Get().Nickname;if(a!==null){$("#form_login #nickname").val(a)}}$("#form_login").bind("submit",function(){SN.U.StatusNetInstance.Set({Nickname:$("#form_login #nickname").val()});return true})},AjaxForms:function(){$("form.ajax").live("submit",function(){SN.U.FormXHR($(this));return false})},UploadForms:function(){$("input[type=file]").change(function(d){if(typeof this.files=="object"&&this.files.length>0){var c=0;for(var b=0;b<this.files.length;b++){c+=this.files[b].size}var a=SN.U.maxFileSize($(this.form));if(a>0&&c>a){var e="File too large: maximum upload size is %d bytes.";alert(e.replace("%d",a));$(this).val("");d.preventDefault();return false}}})}}};$(document).ready(function(){SN.Init.AjaxForms();SN.Init.UploadForms();if($("."+SN.C.S.FormNotice).length>0){SN.Init.NoticeForm()}if($("#content .notices").length>0){SN.Init.Notices()}if($("#content .entity_actions").length>0){SN.Init.EntityActions()}if($("#form_login").length>0){SN.Init.Login()}});if(!document.ELEMENT_NODE){document.ELEMENT_NODE=1;document.ATTRIBUTE_NODE=2;document.TEXT_NODE=3;document.CDATA_SECTION_NODE=4;document.ENTITY_REFERENCE_NODE=5;document.ENTITY_NODE=6;document.PROCESSING_INSTRUCTION_NODE=7;document.COMMENT_NODE=8;document.DOCUMENT_NODE=9;document.DOCUMENT_TYPE_NODE=10;document.DOCUMENT_FRAGMENT_NODE=11;document.NOTATION_NODE=12}document._importNode=function(e,a){switch(e.nodeType){case document.ELEMENT_NODE:var d=document.createElement(e.nodeName);if(e.attributes&&e.attributes.length>0){for(var c=0,b=e.attributes.length;c<b;){if(e.attributes[c].nodeName=="class"){d.className=e.getAttribute(e.attributes[c++].nodeName)}else{d.setAttribute(e.attributes[c].nodeName,e.getAttribute(e.attributes[c++].nodeName))}}}if(a&&e.childNodes&&e.childNodes.length>0){for(var c=0,b=e.childNodes.length;c<b;){d.appendChild(document._importNode(e.childNodes[c++],a))}}return d;break;case document.TEXT_NODE:case document.CDATA_SECTION_NODE:case document.COMMENT_NODE:return document.createTextNode(e.nodeValue);break}};if(typeof navigator.geolocation=="undefined"||navigator.geolocation.shim){(function(){(function(){if(window.google&&google.gears){return}var c=null;if(typeof GearsFactory!="undefined"){c=new GearsFactory()}else{try{c=new ActiveXObject("Gears.Factory");if(c.getBuildInfo().indexOf("ie_mobile")!=-1){c.privateSetGlobalObject(this)}}catch(d){if((typeof navigator.mimeTypes!="undefined")&&navigator.mimeTypes["application/x-googlegears"]){c=document.createElement("object");c.style.display="none";c.width=0;c.height=0;c.type="application/x-googlegears";document.documentElement.appendChild(c)}}}if(!c){return}if(!window.google){google={}}if(!google.gears){google.gears={factory:c}}})();var a=(function(){var d=google.gears.factory.create("beta.geolocation");var c=function(f,e){return function(g){f(g);e.lastPosition=g}};return{shim:true,type:"Gears",lastPosition:null,getCurrentPosition:function(e,g,h){var f=this;var i=c(e,f);d.getCurrentPosition(i,g,h)},watchPosition:function(e,f,g){d.watchPosition(e,f,g)},clearWatch:function(e){d.clearWatch(e)},getPermission:function(g,e,f){d.getPermission(g,e,f)}}});var b=(function(){var i=false;var e=function(){if(!d()&&!i){i=true;var j=document.createElement("script");j.src=(document.location.protocol=="https:"?"https://":"http://")+"www.google.com/jsapi?callback=_google_loader_apiLoaded";j.type="text/javascript";document.getElementsByTagName("body")[0].appendChild(j)}};var c=[];var h=function(j){c.push(j)};var f=function(){if(d()){while(c.length>0){var j=c.pop();j()}}};window._google_loader_apiLoaded=function(){f()};var d=function(){return(window.google&&google.loader)};var g=function(j){if(d()){return true}h(j);e();return false};e();return{shim:true,type:"ClientLocation",lastPosition:null,getCurrentPosition:function(k,n,o){var m=this;if(!g(function(){m.getCurrentPosition(k,n,o)})){return}if(google.loader.ClientLocation){var l=google.loader.ClientLocation;var j={coords:{latitude:l.latitude,longitude:l.longitude,altitude:null,accuracy:43000,altitudeAccuracy:null,heading:null,speed:null},address:{city:l.address.city,country:l.address.country,country_code:l.address.country_code,region:l.address.region},timestamp:new Date()};k(j);this.lastPosition=j}else{if(n==="function"){n({code:3,message:"Using the Google ClientLocation API and it is not able to calculate a location."})}}},watchPosition:function(j,l,m){this.getCurrentPosition(j,l,m);var k=this;var n=setInterval(function(){k.getCurrentPosition(j,l,m)},10000);return n},clearWatch:function(j){clearInterval(j)},getPermission:function(l,j,k){return true}}});navigator.geolocation=(window.google&&google.gears)?a():b()})()};
\ No newline at end of file
+var SN={C:{I:{CounterBlackout:false,MaxLength:140,PatternUsername:/^[0-9a-zA-Z\-_.]*$/,HTTP20x30x:[200,201,202,203,204,205,206,300,301,302,303,304,305,306,307],NoticeFormMaster:null},S:{Disabled:"disabled",Warning:"warning",Error:"error",Success:"success",Processing:"processing",CommandResult:"command_result",FormNotice:"form_notice",NoticeDataGeo:"notice_data-geo",NoticeDataGeoCookie:"NoticeDataGeo",NoticeDataGeoSelected:"notice_data-geo_selected",StatusNetInstance:"StatusNetInstance"}},messages:{},msg:function(a){if(typeof SN.messages[a]=="undefined"){return"["+a+"]"}else{return SN.messages[a]}},U:{FormNoticeEnhancements:function(b){if(jQuery.data(b[0],"ElementData")===undefined){MaxLength=b.find(".count").text();if(typeof(MaxLength)=="undefined"){MaxLength=SN.C.I.MaxLength}jQuery.data(b[0],"ElementData",{MaxLength:MaxLength});SN.U.Counter(b);NDT=b.find(".notice_data-text:first");NDT.bind("keyup",function(c){SN.U.Counter(b)});var a=function(c){window.setTimeout(function(){SN.U.Counter(b)},50)};NDT.bind("cut",a).bind("paste",a)}else{b.find(".count").text(jQuery.data(b[0],"ElementData").MaxLength)}},Counter:function(d){SN.C.I.FormNoticeCurrent=d;var b=jQuery.data(d[0],"ElementData").MaxLength;if(b<=0){return}var c=b-SN.U.CharacterCount(d);var a=d.find(".count");if(c.toString()!=a.text()){if(!SN.C.I.CounterBlackout||c===0){if(a.text()!=String(c)){a.text(c)}if(c<0){d.addClass(SN.C.S.Warning)}else{d.removeClass(SN.C.S.Warning)}if(!SN.C.I.CounterBlackout){SN.C.I.CounterBlackout=true;SN.C.I.FormNoticeCurrent=d;window.setTimeout("SN.U.ClearCounterBlackout(SN.C.I.FormNoticeCurrent);",500)}}}},CharacterCount:function(a){return a.find(".notice_data-text:first").val().length},ClearCounterBlackout:function(a){SN.C.I.CounterBlackout=false;SN.U.Counter(a)},RewriteAjaxAction:function(a){if(document.location.protocol=="https:"&&a.substr(0,5)=="http:"){return a.replace(/^http:\/\/[^:\/]+/,"https://"+document.location.host)}else{return a}},FormXHR:function(a){$.ajax({type:"POST",dataType:"xml",url:SN.U.RewriteAjaxAction(a.attr("action")),data:a.serialize()+"&ajax=1",beforeSend:function(b){a.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(c,d,b){alert(b||d)},success:function(b,c){if(typeof($("form",b)[0])!="undefined"){form_new=document._importNode($("form",b)[0],true);a.replaceWith(form_new)}else{a.replaceWith(document._importNode($("p",b)[0],true))}}})},FormNoticeXHR:function(b){SN.C.I.NoticeDataGeo={};b.append('<input type="hidden" name="ajax" value="1"/>');b.attr("action",SN.U.RewriteAjaxAction(b.attr("action")));var c=function(d,e){b.append($('<p class="form_response"></p>').addClass(d).text(e))};var a=function(){b.find(".form_response").remove()};b.ajaxForm({dataType:"xml",timeout:"60000",beforeSend:function(d){if(b.find(".notice_data-text:first").val()==""){b.addClass(SN.C.S.Warning);return false}b.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled);SN.U.normalizeGeoData(b);return true},error:function(f,g,e){b.removeClass(SN.C.S.Processing).find(".submit").removeClass(SN.C.S.Disabled).removeAttr(SN.C.S.Disabled,SN.C.S.Disabled);a();if(g=="timeout"){c("error","Sorry! We had trouble sending your notice. The servers are overloaded. Please try again, and contact the site administrator if this problem persists.")}else{var d=SN.U.GetResponseXML(f);if($("."+SN.C.S.Error,d).length>0){b.append(document._importNode($("."+SN.C.S.Error,d)[0],true))}else{if(parseInt(f.status)===0||jQuery.inArray(parseInt(f.status),SN.C.I.HTTP20x30x)>=0){b.resetForm().find(".attach-status").remove();SN.U.FormNoticeEnhancements(b)}else{c("error","(Sorry! We had trouble sending your notice ("+f.status+" "+f.statusText+"). Please report the problem to the site administrator if this happens again.")}}}},success:function(i,f){a();var n=$("#"+SN.C.S.Error,i);if(n.length>0){c("error",n.text())}else{if($("body")[0].id=="bookmarklet"){self.close()}var d=$("#"+SN.C.S.CommandResult,i);if(d.length>0){c("success",d.text())}else{var m=document._importNode($("li",i)[0],true);var k=$("#notices_primary .notices:first");var l=b.closest("li.notice-reply");if(l.length>0){var e=$(m).attr("id");if($("#"+e).length==0){var j=l.closest("li.notice");l.replaceWith(m);SN.U.NoticeInlineReplyPlaceholder(j)}else{l.remove()}}else{if(k.length>0&&SN.U.belongsOnTimeline(m)){if($("#"+m.id).length===0){var h=b.find("[name=inreplyto]").val();var g="#notices_primary #notice-"+h;if($("body")[0].id=="conversation"){if(h.length>0&&$(g+" .notices").length<1){$(g).append('<ul class="notices"></ul>')}$($(g+" .notices")[0]).append(m)}else{k.prepend(m)}$("#"+m.id).css({display:"none"}).fadeIn(2500);SN.U.NoticeWithAttachment($("#"+m.id));SN.U.NoticeReplyTo($("#"+m.id))}}else{c("success",$("title",i).text())}}}b.resetForm();b.find("[name=inreplyto]").val("");b.find(".attach-status").remove();SN.U.FormNoticeEnhancements(b)}},complete:function(d,e){b.removeClass(SN.C.S.Processing).find(".submit").removeAttr(SN.C.S.Disabled).removeClass(SN.C.S.Disabled);b.find("[name=lat]").val(SN.C.I.NoticeDataGeo.NLat);b.find("[name=lon]").val(SN.C.I.NoticeDataGeo.NLon);b.find("[name=location_ns]").val(SN.C.I.NoticeDataGeo.NLNS);b.find("[name=location_id]").val(SN.C.I.NoticeDataGeo.NLID);b.find("[name=notice_data-geo]").attr("checked",SN.C.I.NoticeDataGeo.NDG)}})},normalizeGeoData:function(a){SN.C.I.NoticeDataGeo.NLat=a.find("[name=lat]").val();SN.C.I.NoticeDataGeo.NLon=a.find("[name=lon]").val();SN.C.I.NoticeDataGeo.NLNS=a.find("[name=location_ns]").val();SN.C.I.NoticeDataGeo.NLID=a.find("[name=location_id]").val();SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked");var b=$.cookie(SN.C.S.NoticeDataGeoCookie);if(b!==null&&b!="disabled"){b=JSON.parse(b);SN.C.I.NoticeDataGeo.NLat=a.find("[name=lat]").val(b.NLat).val();SN.C.I.NoticeDataGeo.NLon=a.find("[name=lon]").val(b.NLon).val();if(b.NLNS){SN.C.I.NoticeDataGeo.NLNS=a.find("[name=location_ns]").val(b.NLNS).val();SN.C.I.NoticeDataGeo.NLID=a.find("[name=location_id]").val(b.NLID).val()}else{a.find("[name=location_ns]").val("");a.find("[name=location_id]").val("")}}if(b=="disabled"){SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked",false).attr("checked")}else{SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked",true).attr("checked")}},GetResponseXML:function(b){try{return b.responseXML}catch(a){return(new DOMParser()).parseFromString(b.responseText,"text/xml")}},NoticeReply:function(){if($("#content .notice_reply").length>0){$("#content .notice").each(function(){SN.U.NoticeReplyTo($(this))})}},NoticeReplyTo:function(a){a.find(".notice_reply").live("click",function(c){c.preventDefault();var b=($(".author .nickname",a).length>0)?$($(".author .nickname",a)[0]):$(".author .nickname.uid");SN.U.NoticeInlineReplyTrigger(a,"@"+b.text());return false})},NoticeInlineReplyTrigger:function(h,i){var b=$($(".notice_id",h)[0]).text();var e=h;var f=h.closest(".notices");if(f.hasClass("threaded-replies")){e=f.closest(".notice")}else{f=$("ul.threaded-replies",h);if(f.length==0){f=$('<ul class="notices threaded-replies xoxo"></ul>');h.append(f)}}var j=$(".notice-reply-form",f);var d=function(){j.find("input[name=inreplyto]").val(b);var m=j.find("textarea");if(m.length==0){throw"No textarea"}var l="";if(i){l=i+" "}m.val(l+m.val().replace(RegExp(l,"i"),""));m.data("initialText",$.trim(i+""));m.focus();if(m[0].setSelectionRange){var k=m.val().length;m[0].setSelectionRange(k,k)}};if(j.length>0){d()}else{$("li.notice-reply-placeholder").remove();var g=$("li.notice-reply",f);if(g.length==0){g=$('<li class="notice-reply"></li>');var c=function(k){var l=document._importNode(k,true);g.append(l);f.append(g);var m=j=$(l);SN.Init.NoticeFormSetup(m);d()};if(SN.C.I.NoticeFormMaster){c(SN.C.I.NoticeFormMaster)}else{var a=$("#form_notice").attr("action");$.get(a,{ajax:1},function(k,m,l){c($("form",k)[0])})}}}},NoticeInlineReplyPlaceholder:function(b){var a=b.find("ul.threaded-replies");var c=$('<li class="notice-reply-placeholder"><input class="placeholder"></li>');c.click(function(){SN.U.NoticeInlineReplyTrigger(b)});c.find("input").val(SN.msg("reply_placeholder"));a.append(c)},NoticeInlineReplySetup:function(){$(".threaded-replies").each(function(){var b=$(this);var a=b.closest(".notice");SN.U.NoticeInlineReplyPlaceholder(a)})},NoticeRepeat:function(){$(".form_repeat").live("click",function(a){a.preventDefault();SN.U.NoticeRepeatConfirmation($(this));return false})},NoticeRepeatConfirmation:function(a){var c=a.find(".submit");var b=c.clone();b.addClass("submit_dialogbox").removeClass("submit");a.append(b);b.bind("click",function(){SN.U.FormXHR(a);return false});c.hide();a.addClass("dialogbox").append('<button class="close">&#215;</button>').closest(".notice-options").addClass("opaque");a.find("button.close").click(function(){$(this).remove();a.removeClass("dialogbox").closest(".notice-options").removeClass("opaque");a.find(".submit_dialogbox").remove();a.find(".submit").show();return false})},NoticeAttachments:function(){$(".notice a.attachment").each(function(){SN.U.NoticeWithAttachment($(this).closest(".notice"))})},NoticeWithAttachment:function(b){if(b.find(".attachment").length===0){return}var a=b.find(".attachment.more");if(a.length>0){$(a[0]).click(function(){var c=$(this);c.addClass(SN.C.S.Processing);$.get(c.attr("href")+"/ajax",null,function(d){c.parent(".entry-content").html($(d).find("#attachment_view .entry-content").html())});return false}).attr("title",SN.msg("showmore_tooltip"))}},NoticeDataAttach:function(b){var a=b.find("input[type=file]");a.change(function(f){b.find(".attach-status").remove();var d=$(this).val();if(!d){return false}var c=$('<div class="attach-status '+SN.C.S.Success+'"><code></code> <button class="close">&#215;</button></div>');c.find("code").text(d);c.find("button").click(function(){c.remove();a.val("");return false});b.append(c);if(typeof this.files=="object"){for(var e=0;e<this.files.length;e++){SN.U.PreviewAttach(b,this.files[e])}}})},maxFileSize:function(b){var a=$(b).find("input[name=MAX_FILE_SIZE]").attr("value");if(a){return parseInt(a)}else{return 0}},PreviewAttach:function(d,c){var e=c.type+" "+Math.round(c.size/1024)+"KB";var f=true;var h;if(typeof window.createObjectURL!="undefined"){h=function(i,j){j(window.createObjectURL(i))}}else{if(typeof window.FileReader!="undefined"){h=function(j,k){var i=new FileReader();i.onload=function(l){k(i.result)};i.readAsDataURL(j)}}else{f=false}}var a=["image/png","image/jpeg","image/gif","image/svg+xml"];if($.inArray(c.type,a)==-1){f=false}var g=8*1024*1024;if(c.size>g){f=false}if(f){h(c,function(j){var i=$("<img>").attr("title",e).attr("alt",e).attr("src",j).attr("style","height: 120px");d.find(".attach-status").append(i)})}else{var b=$("<div></div>").text(e);d.find(".attach-status").append(b)}},NoticeLocationAttach:function(a){var e=a.find("[name=lat]");var k=a.find("[name=lon]");var g=a.find("[name=location_ns]").val();var l=a.find("[name=location_id]").val();var b="";var d=a.find("[name=notice_data-geo]");var c=a.find("[name=notice_data-geo]");var j=a.find("label.notice_data-geo");function f(n){j.attr("title",jQuery.trim(j.text())).removeClass("checked");a.find("[name=lat]").val("");a.find("[name=lon]").val("");a.find("[name=location_ns]").val("");a.find("[name=location_id]").val("");a.find("[name=notice_data-geo]").attr("checked",false);$.cookie(SN.C.S.NoticeDataGeoCookie,"disabled",{path:"/"});if(n){a.find(".geo_status_wrapper").removeClass("success").addClass("error");a.find(".geo_status_wrapper .geo_status").text(n)}else{a.find(".geo_status_wrapper").remove()}}function m(n,o){SN.U.NoticeGeoStatus(a,"Looking up place name...");$.getJSON(n,o,function(p){var q,r;if(typeof(p.location_ns)!="undefined"){a.find("[name=location_ns]").val(p.location_ns);q=p.location_ns}if(typeof(p.location_id)!="undefined"){a.find("[name=location_id]").val(p.location_id);r=p.location_id}if(typeof(p.name)=="undefined"){NLN_text=o.lat+";"+o.lon}else{NLN_text=p.name}SN.U.NoticeGeoStatus(a,NLN_text,o.lat,o.lon,p.url);j.attr("title",NoticeDataGeo_text.ShareDisable+" ("+NLN_text+")");a.find("[name=lat]").val(o.lat);a.find("[name=lon]").val(o.lon);a.find("[name=location_ns]").val(q);a.find("[name=location_id]").val(r);a.find("[name=notice_data-geo]").attr("checked",true);var s={NLat:o.lat,NLon:o.lon,NLNS:q,NLID:r,NLN:NLN_text,NLNU:p.url,NDG:true};$.cookie(SN.C.S.NoticeDataGeoCookie,JSON.stringify(s),{path:"/"})})}if(c.length>0){if($.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){c.attr("checked",false)}else{c.attr("checked",true)}var h=a.find(".notice_data-geo_wrap");var i=h.attr("title");h.removeAttr("title");j.attr("title",j.text());c.change(function(){if(c.attr("checked")===true||$.cookie(SN.C.S.NoticeDataGeoCookie)===null){j.attr("title",NoticeDataGeo_text.ShareDisable).addClass("checked");if($.cookie(SN.C.S.NoticeDataGeoCookie)===null||$.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){if(navigator.geolocation){SN.U.NoticeGeoStatus(a,"Requesting location from browser...");navigator.geolocation.getCurrentPosition(function(p){a.find("[name=lat]").val(p.coords.latitude);a.find("[name=lon]").val(p.coords.longitude);var q={lat:p.coords.latitude,lon:p.coords.longitude,token:$("#token").val()};m(i,q)},function(p){switch(p.code){case p.PERMISSION_DENIED:f("Location permission denied.");break;case p.TIMEOUT:f("Location lookup timeout.");break}},{timeout:10000})}else{if(e.length>0&&k.length>0){var n={lat:e,lon:k,token:$("#token").val()};m(i,n)}else{f();c.remove();j.remove()}}}else{var o=JSON.parse($.cookie(SN.C.S.NoticeDataGeoCookie));a.find("[name=lat]").val(o.NLat);a.find("[name=lon]").val(o.NLon);a.find("[name=location_ns]").val(o.NLNS);a.find("[name=location_id]").val(o.NLID);a.find("[name=notice_data-geo]").attr("checked",o.NDG);SN.U.NoticeGeoStatus(a,o.NLN,o.NLat,o.NLon,o.NLNU);j.attr("title",NoticeDataGeo_text.ShareDisable+" ("+o.NLN+")").addClass("checked")}}else{f()}}).change()}},NoticeGeoStatus:function(e,a,f,g,c){var h=e.find(".geo_status_wrapper");if(h.length==0){h=$('<div class="'+SN.C.S.Success+' geo_status_wrapper"><button class="close" style="float:right">&#215;</button><div class="geo_status"></div></div>');h.find("button.close").click(function(){e.find("[name=notice_data-geo]").removeAttr("checked").change()});e.append(h)}var b;if(c){b=$("<a></a>").attr("href",c)}else{b=$("<span></span>")}b.text(a);if(f||g){var d=f+";"+g;b.attr("title",d);if(!a){b.text(d)}}h.find(".geo_status").empty().append(b)},NewDirectMessage:function(){NDM=$(".entity_send-a-message a");NDM.attr({href:NDM.attr("href")+"&ajax=1"});NDM.bind("click",function(){var a=$(".entity_send-a-message form");if(a.length===0){$(this).addClass(SN.C.S.Processing);$.get(NDM.attr("href"),null,function(b){$(".entity_send-a-message").append(document._importNode($("form",b)[0],true));a=$(".entity_send-a-message .form_notice");SN.U.FormNoticeXHR(a);SN.U.FormNoticeEnhancements(a);a.append('<button class="close">&#215;</button>');$(".entity_send-a-message button").click(function(){a.hide();return false});NDM.removeClass(SN.C.S.Processing)})}else{a.show();$(".entity_send-a-message textarea").focus()}return false})},GetFullYear:function(c,d,a){var b=new Date();b.setFullYear(c,d,a);return b},StatusNetInstance:{Set:function(b){var a=SN.U.StatusNetInstance.Get();if(a!==null){b=$.extend(a,b)}$.cookie(SN.C.S.StatusNetInstance,JSON.stringify(b),{path:"/",expires:SN.U.GetFullYear(2029,0,1)})},Get:function(){var a=$.cookie(SN.C.S.StatusNetInstance);if(a!==null){return JSON.parse(a)}return null},Delete:function(){$.cookie(SN.C.S.StatusNetInstance,null)}},belongsOnTimeline:function(b){var a=$("body").attr("id");if(a=="public"){return true}var c=$("#nav_profile a").attr("href");if(c){var d=$(b).find(".vcard.author a.url").attr("href");if(d==c){if(a=="all"||a=="showstream"){return true}}}return false},switchInputFormTab:function(a){$(".input_form_nav_tab.current").removeClass("current");$("#input_form_nav_"+a).addClass("current");$(".input_form.current").removeClass("current");$("#input_form_"+a).addClass("current")}},Init:{NoticeForm:function(){if($("body.user_in").length>0){$(".ajax-notice").each(function(){var a=$(this);SN.Init.NoticeFormSetup(a)})}},NoticeFormSetup:function(a){SN.U.NoticeLocationAttach(a);SN.U.FormNoticeXHR(a);SN.U.FormNoticeEnhancements(a);SN.U.NoticeDataAttach(a)},Notices:function(){if($("body.user_in").length>0){var a=$(".form_notice:first");if(a.length>0){SN.C.I.NoticeFormMaster=document._importNode(a[0],true)}SN.U.NoticeRepeat();SN.U.NoticeReply();SN.U.NoticeInlineReplySetup()}SN.U.NoticeAttachments()},EntityActions:function(){if($("body.user_in").length>0){SN.U.NewDirectMessage()}},Login:function(){if(SN.U.StatusNetInstance.Get()!==null){var a=SN.U.StatusNetInstance.Get().Nickname;if(a!==null){$("#form_login #nickname").val(a)}}$("#form_login").bind("submit",function(){SN.U.StatusNetInstance.Set({Nickname:$("#form_login #nickname").val()});return true})},AjaxForms:function(){$("form.ajax").live("submit",function(){SN.U.FormXHR($(this));return false})},UploadForms:function(){$("input[type=file]").change(function(d){if(typeof this.files=="object"&&this.files.length>0){var c=0;for(var b=0;b<this.files.length;b++){c+=this.files[b].size}var a=SN.U.maxFileSize($(this.form));if(a>0&&c>a){var e="File too large: maximum upload size is %d bytes.";alert(e.replace("%d",a));$(this).val("");d.preventDefault();return false}}})}}};$(document).ready(function(){SN.Init.AjaxForms();SN.Init.UploadForms();if($("."+SN.C.S.FormNotice).length>0){SN.Init.NoticeForm()}if($("#content .notices").length>0){SN.Init.Notices()}if($("#content .entity_actions").length>0){SN.Init.EntityActions()}if($("#form_login").length>0){SN.Init.Login()}});if(!document.ELEMENT_NODE){document.ELEMENT_NODE=1;document.ATTRIBUTE_NODE=2;document.TEXT_NODE=3;document.CDATA_SECTION_NODE=4;document.ENTITY_REFERENCE_NODE=5;document.ENTITY_NODE=6;document.PROCESSING_INSTRUCTION_NODE=7;document.COMMENT_NODE=8;document.DOCUMENT_NODE=9;document.DOCUMENT_TYPE_NODE=10;document.DOCUMENT_FRAGMENT_NODE=11;document.NOTATION_NODE=12}document._importNode=function(e,a){switch(e.nodeType){case document.ELEMENT_NODE:var d=document.createElement(e.nodeName);if(e.attributes&&e.attributes.length>0){for(var c=0,b=e.attributes.length;c<b;){if(e.attributes[c].nodeName=="class"){d.className=e.getAttribute(e.attributes[c++].nodeName)}else{d.setAttribute(e.attributes[c].nodeName,e.getAttribute(e.attributes[c++].nodeName))}}}if(a&&e.childNodes&&e.childNodes.length>0){for(var c=0,b=e.childNodes.length;c<b;){d.appendChild(document._importNode(e.childNodes[c++],a))}}return d;break;case document.TEXT_NODE:case document.CDATA_SECTION_NODE:case document.COMMENT_NODE:return document.createTextNode(e.nodeValue);break}};if(typeof navigator.geolocation=="undefined"||navigator.geolocation.shim){(function(){(function(){if(window.google&&google.gears){return}var c=null;if(typeof GearsFactory!="undefined"){c=new GearsFactory()}else{try{c=new ActiveXObject("Gears.Factory");if(c.getBuildInfo().indexOf("ie_mobile")!=-1){c.privateSetGlobalObject(this)}}catch(d){if((typeof navigator.mimeTypes!="undefined")&&navigator.mimeTypes["application/x-googlegears"]){c=document.createElement("object");c.style.display="none";c.width=0;c.height=0;c.type="application/x-googlegears";document.documentElement.appendChild(c)}}}if(!c){return}if(!window.google){google={}}if(!google.gears){google.gears={factory:c}}})();var a=(function(){var d=google.gears.factory.create("beta.geolocation");var c=function(f,e){return function(g){f(g);e.lastPosition=g}};return{shim:true,type:"Gears",lastPosition:null,getCurrentPosition:function(e,g,h){var f=this;var i=c(e,f);d.getCurrentPosition(i,g,h)},watchPosition:function(e,f,g){d.watchPosition(e,f,g)},clearWatch:function(e){d.clearWatch(e)},getPermission:function(g,e,f){d.getPermission(g,e,f)}}});var b=(function(){var i=false;var e=function(){if(!d()&&!i){i=true;var j=document.createElement("script");j.src=(document.location.protocol=="https:"?"https://":"http://")+"www.google.com/jsapi?callback=_google_loader_apiLoaded";j.type="text/javascript";document.getElementsByTagName("body")[0].appendChild(j)}};var c=[];var h=function(j){c.push(j)};var f=function(){if(d()){while(c.length>0){var j=c.pop();j()}}};window._google_loader_apiLoaded=function(){f()};var d=function(){return(window.google&&google.loader)};var g=function(j){if(d()){return true}h(j);e();return false};e();return{shim:true,type:"ClientLocation",lastPosition:null,getCurrentPosition:function(k,n,o){var m=this;if(!g(function(){m.getCurrentPosition(k,n,o)})){return}if(google.loader.ClientLocation){var l=google.loader.ClientLocation;var j={coords:{latitude:l.latitude,longitude:l.longitude,altitude:null,accuracy:43000,altitudeAccuracy:null,heading:null,speed:null},address:{city:l.address.city,country:l.address.country,country_code:l.address.country_code,region:l.address.region},timestamp:new Date()};k(j);this.lastPosition=j}else{if(n==="function"){n({code:3,message:"Using the Google ClientLocation API and it is not able to calculate a location."})}}},watchPosition:function(j,l,m){this.getCurrentPosition(j,l,m);var k=this;var n=setInterval(function(){k.getCurrentPosition(j,l,m)},10000);return n},clearWatch:function(j){clearInterval(j)},getPermission:function(l,j,k){return true}}});navigator.geolocation=(window.google&&google.gears)?a():b()})()};
\ No newline at end of file
diff --git a/plugins/LinkPreview/LinkPreviewPlugin.php b/plugins/LinkPreview/LinkPreviewPlugin.php
index 8bc726413d..2cc077d90e 100644
--- a/plugins/LinkPreview/LinkPreviewPlugin.php
+++ b/plugins/LinkPreview/LinkPreviewPlugin.php
@@ -51,7 +51,12 @@ class LinkPreviewPlugin extends Plugin
     {
         $user = common_current_user();
         if ($user && common_config('attachments', 'process_links')) {
-            $action->script($this->path('linkpreview.min.js'));
+            if (common_config('site', 'minify')) {
+                $js = 'linkpreview.min.js';
+            } else {
+                $js = 'linkpreview.js';
+            }
+            $action->script($this->path($js));
             $data = json_encode(array(
                 'api' => common_local_url('oembedproxy'),
                 'width' => common_config('attachments', 'thumbwidth'),
diff --git a/plugins/LinkPreview/linkpreview.js b/plugins/LinkPreview/linkpreview.js
index 407934c5ae..132c4c8d77 100644
--- a/plugins/LinkPreview/linkpreview.js
+++ b/plugins/LinkPreview/linkpreview.js
@@ -74,174 +74,197 @@
         }
     };
 
-    var LinkPreview = {
-        links: [],
-        state: [],
-        refresh: [],
-
-        /**
-         * Find URL links from the source text that may be interesting.
-         *
-         * @param {String} text
-         * @return {Array} list of URLs
-         */
-        findLinks: function (text)
-        {
-            // @fixme match this to core code
-            var re = /(?:^| )(https?:\/\/.+?\/.+?)(?= |$)/mg;
-            var links = [];
-            var matches;
-            while ((matches = re.exec(text)) !== null) {
-                links.push(matches[1]);
-            }
-            return links;
-        },
-
-        /**
-         * Start looking up info for a link preview...
-         * May start async data loads.
-         *
-         * @param {number} col: column number to insert preview into
-         */
-        prepLinkPreview: function(col)
-        {
-            var id = 'link-preview-' + col;
-            var url = LinkPreview.links[col];
-            LinkPreview.refresh[col] = false;
-            LinkPreview.markLoading(col);
-
-            oEmbed.lookup(url, function(data) {
-                var thumb = null;
-                var width = 100;
-                if (data && typeof data.thumbnail_url == "string") {
-                    thumb = data.thumbnail_url;
-                    if (typeof data.thumbnail_width !== "undefined") {
-                        if (data.thumbnail_width < width) {
-                            width = data.thumbnail_width;
-                        }
-                    }
-                } else if (data && data.type == 'photo' && typeof data.url == "string") {
-                    thumb = data.url;
-                    if (typeof data.width !== "undefined") {
-                        if (data.width < width) {
-                            width = data.width;
-                        }
-                    }
-                }
-
-                if (thumb) {
-                    var link = $('<span class="inline-attachment"><a><img/></a></span>');
-                    link.find('a')
-                            .attr('href', url)
-                            .attr('target', '_blank')
-                            .last()
-                        .find('img')
-                            .attr('src', thumb)
-                            .attr('width', width)
-                            .attr('title', data.title || data.url || url);
-                    $('#' + id).empty();
-                    $('#' + id).append(link);
-                } else {
-                    // No thumbnail available or error retriving it.
-                    LinkPreview.clearLink(col);
-                }
-
-                if (LinkPreview.refresh[col]) {
-                    // Darn user has typed more characters.
-                    // Go fetch another link!
-                    LinkPreview.prepLinkPreview(col);
-                } else {
-                    LinkPreview.markDone(col);
-                }
-            });
-        },
-
-        /**
-         * Update the live preview section with links found in the given text.
-         * May start async data loads.
-         *
-         * @param {String} text: free-form input text
-         */
-        previewLinks: function(text)
-        {
-            var i;
-            var old = LinkPreview.links;
-            var links = LinkPreview.findLinks(text);
-            LinkPreview.links = links;
-
-            // Check for existing common elements...
-            for (i = 0; i < old.length && i < links.length; i++) {
-                if (links[i] != old[i]) {
-                    if (LinkPreview.state[i] == "loading") {
-                        // Slate this column for a refresh when this one's done.
-                        LinkPreview.refresh[i] = true;
-                    } else {
-                        // Change an existing entry!
-                        LinkPreview.prepLinkPreview(i);
-                    }
-                }
-            }
-            if (links.length > old.length) {
-                // Adding new entries, whee!
-                for (i = old.length; i < links.length; i++) {
-                    LinkPreview.addPreviewArea(i);
-                    LinkPreview.prepLinkPreview(i);
-                }
-            } else if (old.length > links.length) {
-                // Remove preview entries for links that have been removed.
-                for (i = links.length; i < old.length; i++) {
-                    LinkPreview.clearLink(i);
-                }
-            }
-        },
-
-        addPreviewArea: function(col) {
-            var id = 'link-preview-' + col;
-            $('#link-preview').append('<span id="' + id + '"></span>');
-        },
-
-        clearLink: function(col) {
-            var id = 'link-preview-' + col;
-            $('#' + id).html('');
-        },
-
-        markLoading: function(col) {
-            LinkPreview.state[col] = "loading";
-            var id = 'link-preview-' + col;
-            $('#' + id).attr('style', 'opacity: 0.5');
-        },
-
-        markDone: function(col) {
-            LinkPreview.state[col] = "done";
-            var id = 'link-preview-' + col;
-            $('#' + id).removeAttr('style');
-        },
-
-        /**
-         * Clear out any link preview data.
-         */
-        clear: function() {
-            LinkPreview.links = [];
-            $('#link-preview').empty();
-        }
-    };
-
     SN.Init.LinkPreview = function(params) {
         if (params.api) oEmbed.api = params.api;
         if (params.width) oEmbed.width = params.width;
         if (params.height) oEmbed.height = params.height;
+    }
 
-        $('#form_notice')
-            .append('<div id="link-preview" class="thumbnails"></div>')
+    // Piggyback on the counter update...
+    var origCounter = SN.U.Counter;
+    SN.U.Counter = function(form) {
+        var preview = form.data('LinkPreview');
+        if (preview) {
+            preview.previewLinks(form.find('.notice_data-text:first').val());
+        }
+        return origCounter(form);
+    }
+
+    // Customize notice form init...
+    var origSetup = SN.Init.NoticeFormSetup;
+    SN.Init.NoticeFormSetup = function(form) {
+        origSetup(form);
+
+        form
             .bind('reset', function() {
                 LinkPreview.clear();
             });
 
-        // Piggyback on the counter update...
-        var origCounter = SN.U.Counter;
-        SN.U.Counter = function(form) {
-            LinkPreview.previewLinks($('#notice_data-text').val());
-            return origCounter(form);
-        }
+        var LinkPreview = {
+            links: [],
+            state: [],
+            refresh: [],
+
+            /**
+             * Find URL links from the source text that may be interesting.
+             *
+             * @param {String} text
+             * @return {Array} list of URLs
+             */
+            findLinks: function (text)
+            {
+                // @fixme match this to core code
+                var re = /(?:^| )(https?:\/\/.+?\/.+?)(?= |$)/mg;
+                var links = [];
+                var matches;
+                while ((matches = re.exec(text)) !== null) {
+                    links.push(matches[1]);
+                }
+                return links;
+            },
+
+            ensureArea: function() {
+                if (form.find('.link-preview').length < 1) {
+                    form.append('<div class="notice-status link-preview thumbnails"></div>');
+                }
+            },
+
+            /**
+             * Start looking up info for a link preview...
+             * May start async data loads.
+             *
+             * @param {number} col: column number to insert preview into
+             */
+            prepLinkPreview: function(col)
+            {
+                var id = 'link-preview-' + col;
+                var url = LinkPreview.links[col];
+                LinkPreview.refresh[col] = false;
+                LinkPreview.markLoading(col);
+
+                oEmbed.lookup(url, function(data) {
+                    var thumb = null;
+                    var width = 100;
+                    if (data && typeof data.thumbnail_url == "string") {
+                        thumb = data.thumbnail_url;
+                        if (typeof data.thumbnail_width !== "undefined") {
+                            if (data.thumbnail_width < width) {
+                                width = data.thumbnail_width;
+                            }
+                        }
+                    } else if (data && data.type == 'photo' && typeof data.url == "string") {
+                        thumb = data.url;
+                        if (typeof data.width !== "undefined") {
+                            if (data.width < width) {
+                                width = data.width;
+                            }
+                        }
+                    }
+
+                    if (thumb) {
+                        LinkPreview.ensureArea();
+                        var link = $('<span class="inline-attachment"><a><img/></a></span>');
+                        link.find('a')
+                                .attr('href', url)
+                                .attr('target', '_blank')
+                                .last()
+                            .find('img')
+                                .attr('src', thumb)
+                                .attr('width', width)
+                                .attr('title', data.title || data.url || url);
+                        form.find('.' + id)
+                            .empty()
+                            .append(link);
+                    } else {
+                        // No thumbnail available or error retriving it.
+                        LinkPreview.clearLink(col);
+                    }
+
+                    if (LinkPreview.refresh[col]) {
+                        // Darn user has typed more characters.
+                        // Go fetch another link!
+                        LinkPreview.prepLinkPreview(col);
+                    } else {
+                        LinkPreview.markDone(col);
+                    }
+                });
+            },
+
+            /**
+             * Update the live preview section with links found in the given text.
+             * May start async data loads.
+             *
+             * @param {String} text: free-form input text
+             */
+            previewLinks: function(text)
+            {
+                var i;
+                var old = LinkPreview.links;
+                var links = LinkPreview.findLinks(text);
+                LinkPreview.links = links;
+
+                // Check for existing common elements...
+                for (i = 0; i < old.length && i < links.length; i++) {
+                    if (links[i] != old[i]) {
+                        if (LinkPreview.state[i] == "loading") {
+                            // Slate this column for a refresh when this one's done.
+                            LinkPreview.refresh[i] = true;
+                        } else {
+                            // Change an existing entry!
+                            LinkPreview.prepLinkPreview(i);
+                        }
+                    }
+                }
+                if (links.length > old.length) {
+                    // Adding new entries, whee!
+                    for (i = old.length; i < links.length; i++) {
+                        LinkPreview.addPreviewArea(i);
+                        LinkPreview.prepLinkPreview(i);
+                    }
+                } else if (old.length > links.length) {
+                    // Remove preview entries for links that have been removed.
+                    for (i = links.length; i < old.length; i++) {
+                        LinkPreview.clearLink(i);
+                    }
+                }
+                if (links.length == 0) {
+                    LinkPreview.clear();
+                }
+            },
+
+            addPreviewArea: function(col) {
+                LinkPreview.ensureArea();
+                var id = 'link-preview-' + col;
+                if (form.find('.' + id).length < 1) {
+                    form.find('.link-preview').append('<span class="' + id + '"></span>');
+                }
+            },
+
+            clearLink: function(col) {
+                var id = 'link-preview-' + col;
+                form.find('.' + id).html('');
+            },
+
+            markLoading: function(col) {
+                LinkPreview.state[col] = "loading";
+                var id = 'link-preview-' + col;
+                form.find('.' + id).attr('style', 'opacity: 0.5');
+            },
+
+            markDone: function(col) {
+                LinkPreview.state[col] = "done";
+                var id = 'link-preview-' + col;
+                form.find('.' + id).removeAttr('style');
+            },
+
+            /**
+             * Clear out any link preview data.
+             */
+            clear: function() {
+                LinkPreview.links = [];
+                form.find('.link-preview').remove();
+            }
+        };
+        form.data('LinkPreview', LinkPreview);
     }
 })();
diff --git a/plugins/LinkPreview/linkpreview.min.js b/plugins/LinkPreview/linkpreview.min.js
index a6fb9dba83..ea28f6bfee 100644
--- a/plugins/LinkPreview/linkpreview.min.js
+++ b/plugins/LinkPreview/linkpreview.min.js
@@ -1 +1 @@
-(function(){var a={api:"http://oohembed.com/oohembed",width:100,height:75,cache:{},callbacks:{},lookup:function(c,d){if(typeof a.cache[c]=="object"){d(a.cache[c])}else{if(typeof a.callbacks[c]=="undefined"){a.callbacks[c]=[d];a.rawLookup(c,function(g){a.cache[c]=g;var f=a.callbacks[c];a.callbacks[c]=undefined;for(var e=0;e<f.length;e++){f[e](g)}})}else{a.callbacks[c].push(d)}}},rawLookup:function(c,e){var d={url:c,format:"json",maxwidth:a.width,maxheight:a.height,token:$("#token").val()};$.ajax({url:a.api,data:d,dataType:"json",success:function(f,g){e(f)},error:function(g,h,f){e(null)}})}};var b={links:[],state:[],refresh:[],findLinks:function(f){var d=/(?:^| )(https?:\/\/.+?\/.+?)(?= |$)/mg;var c=[];var e;while((e=d.exec(f))!==null){c.push(e[1])}return c},prepLinkPreview:function(d){var e="link-preview-"+d;var c=b.links[d];b.refresh[d]=false;b.markLoading(d);a.lookup(c,function(i){var f=null;var g=100;if(i&&typeof i.thumbnail_url=="string"){f=i.thumbnail_url;if(typeof i.thumbnail_width!=="undefined"){if(i.thumbnail_width<g){g=i.thumbnail_width}}}else{if(i&&i.type=="photo"&&typeof i.url=="string"){f=i.url;if(typeof i.width!=="undefined"){if(i.width<g){g=i.width}}}}if(f){var h=$('<span class="inline-attachment"><a><img/></a></span>');h.find("a").attr("href",c).attr("target","_blank").last().find("img").attr("src",f).attr("width",g).attr("title",i.title||i.url||c);$("#"+e).empty();$("#"+e).append(h)}else{b.clearLink(d)}if(b.refresh[d]){b.prepLinkPreview(d)}else{b.markDone(d)}})},previewLinks:function(f){var e;var c=b.links;var d=b.findLinks(f);b.links=d;for(e=0;e<c.length&&e<d.length;e++){if(d[e]!=c[e]){if(b.state[e]=="loading"){b.refresh[e]=true}else{b.prepLinkPreview(e)}}}if(d.length>c.length){for(e=c.length;e<d.length;e++){b.addPreviewArea(e);b.prepLinkPreview(e)}}else{if(c.length>d.length){for(e=d.length;e<c.length;e++){b.clearLink(e)}}}},addPreviewArea:function(c){var d="link-preview-"+c;$("#link-preview").append('<span id="'+d+'"></span>')},clearLink:function(c){var d="link-preview-"+c;$("#"+d).html("")},markLoading:function(c){b.state[c]="loading";var d="link-preview-"+c;$("#"+d).attr("style","opacity: 0.5")},markDone:function(c){b.state[c]="done";var d="link-preview-"+c;$("#"+d).removeAttr("style")},clear:function(){b.links=[];$("#link-preview").empty()}};SN.Init.LinkPreview=function(c){if(c.api){a.api=c.api}if(c.width){a.width=c.width}if(c.height){a.height=c.height}$("#form_notice").append('<div id="link-preview" class="thumbnails"></div>').bind("reset",function(){b.clear()});var d=SN.U.Counter;SN.U.Counter=function(e){b.previewLinks($("#notice_data-text").val());return d(e)}}})();
\ No newline at end of file
+(function(){var b={api:"http://oohembed.com/oohembed",width:100,height:75,cache:{},callbacks:{},lookup:function(d,e){if(typeof b.cache[d]=="object"){e(b.cache[d])}else{if(typeof b.callbacks[d]=="undefined"){b.callbacks[d]=[e];b.rawLookup(d,function(h){b.cache[d]=h;var g=b.callbacks[d];b.callbacks[d]=undefined;for(var f=0;f<g.length;f++){g[f](h)}})}else{b.callbacks[d].push(e)}}},rawLookup:function(d,f){var e={url:d,format:"json",maxwidth:b.width,maxheight:b.height,token:$("#token").val()};$.ajax({url:b.api,data:e,dataType:"json",success:function(g,h){f(g)},error:function(h,i,g){f(null)}})}};SN.Init.LinkPreview=function(d){if(d.api){b.api=d.api}if(d.width){b.width=d.width}if(d.height){b.height=d.height}};var c=SN.U.Counter;SN.U.Counter=function(d){var e=d.data("LinkPreview");if(e){e.previewLinks(d.find(".notice_data-text:first").val())}return c(d)};var a=SN.Init.NoticeFormSetup;SN.Init.NoticeFormSetup=function(d){a(d);d.bind("reset",function(){e.clear()});var e={links:[],state:[],refresh:[],findLinks:function(i){var g=/(?:^| )(https?:\/\/.+?\/.+?)(?= |$)/mg;var f=[];var h;while((h=g.exec(i))!==null){f.push(h[1])}return f},ensureArea:function(){if(d.find(".link-preview").length<1){d.append('<div class="notice-status link-preview thumbnails"></div>')}},prepLinkPreview:function(g){var h="link-preview-"+g;var f=e.links[g];e.refresh[g]=false;e.markLoading(g);b.lookup(f,function(l){var i=null;var j=100;if(l&&typeof l.thumbnail_url=="string"){i=l.thumbnail_url;if(typeof l.thumbnail_width!=="undefined"){if(l.thumbnail_width<j){j=l.thumbnail_width}}}else{if(l&&l.type=="photo"&&typeof l.url=="string"){i=l.url;if(typeof l.width!=="undefined"){if(l.width<j){j=l.width}}}}if(i){e.ensureArea();var k=$('<span class="inline-attachment"><a><img/></a></span>');k.find("a").attr("href",f).attr("target","_blank").last().find("img").attr("src",i).attr("width",j).attr("title",l.title||l.url||f);d.find("."+h).empty().append(k)}else{e.clearLink(g)}if(e.refresh[g]){e.prepLinkPreview(g)}else{e.markDone(g)}})},previewLinks:function(j){var h;var f=e.links;var g=e.findLinks(j);e.links=g;for(h=0;h<f.length&&h<g.length;h++){if(g[h]!=f[h]){if(e.state[h]=="loading"){e.refresh[h]=true}else{e.prepLinkPreview(h)}}}if(g.length>f.length){for(h=f.length;h<g.length;h++){e.addPreviewArea(h);e.prepLinkPreview(h)}}else{if(f.length>g.length){for(h=g.length;h<f.length;h++){e.clearLink(h)}}}if(g.length==0){e.clear()}},addPreviewArea:function(f){e.ensureArea();var g="link-preview-"+f;if(d.find("."+g).length<1){d.find(".link-preview").append('<span class="'+g+'"></span>')}},clearLink:function(f){var g="link-preview-"+f;d.find("."+g).html("")},markLoading:function(f){e.state[f]="loading";var g="link-preview-"+f;d.find("."+g).attr("style","opacity: 0.5")},markDone:function(f){e.state[f]="done";var g="link-preview-"+f;d.find("."+g).removeAttr("style")},clear:function(){e.links=[];d.find(".link-preview").remove()}};d.data("LinkPreview",e)}})();
\ No newline at end of file
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 85ec1286b9..cd0e00d860 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -646,7 +646,8 @@ float:left;
 max-width:322px;
 }
 .form_notice .error,
-.form_notice .success {
+.form_notice .success,
+.form_notice .notice-status {
 float:left;
 clear:both;
 width:81.5%;
@@ -661,7 +662,8 @@ overflow:auto;
 margin-right:2.5%;
 font-size:1.1em;
 }
-.form_notice .attach-status button.close {
+.form_notice .attach-status button.close,
+.form_notice .notice-status button.close,{
 float:right;
 font-size:0.8em;
 }
diff --git a/theme/neo/css/display.css b/theme/neo/css/display.css
index 3d98b09f02..d230fc0a42 100644
--- a/theme/neo/css/display.css
+++ b/theme/neo/css/display.css
@@ -180,7 +180,8 @@ address {
 }
 
 .form_notice .error,
-.form_notice .success {
+.form_notice .success,
+.form_notice .notice-status {
     width: 341px;
 }
 
@@ -480,14 +481,14 @@ td.entity_profile { /* cf directory table */
     margin-bottom: 10px;
 }
 
-.error, .success {
+.error, .success, .notice-status {
     background-color: #F7E8E8;
     padding: 4px;
     -webkit-border-radius: 6px;
     -moz-border-radius: 6px;
     border-radius: 6px;
 }
-.success {
+.success, .notice-status {
     background-color: #f2f2f2;
 }
 
diff --git a/theme/rebase/css/display.css b/theme/rebase/css/display.css
index 810dd70bc1..c1ac1e8f4d 100644
--- a/theme/rebase/css/display.css
+++ b/theme/rebase/css/display.css
@@ -298,7 +298,8 @@ address .poweredby {
 }
 
 .form_notice .error,
-.form_notice .success {
+.form_notice .success,
+.form_notice .notice-status {
     clear: left;
     float: left;
     overflow: auto;
@@ -319,7 +320,8 @@ address .poweredby {
     padding: 6px 2px 6px 5px;
 }
 
-.form_notice .attach-status button.close {
+.form_notice .attach-status button.close,
+.form_notice .notice-status button.close {
     float:right;
     font-size:0.8em;
 }

From 0429a52c6e8bf135b03a86398c1aee95ddebea88 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Wed, 9 Mar 2011 18:00:24 -0800
Subject: [PATCH 485/655] Update to use new Managed_dataobject

---
 .../ExtendedProfile/ExtendedProfilePlugin.php |   2 -
 plugins/ExtendedProfile/Profile_detail.php    | 193 ++++++------------
 plugins/ExtendedProfile/extendedprofile.php   |   4 +-
 .../profiledetailsettingsaction.php           |  17 +-
 4 files changed, 80 insertions(+), 136 deletions(-)

diff --git a/plugins/ExtendedProfile/ExtendedProfilePlugin.php b/plugins/ExtendedProfile/ExtendedProfilePlugin.php
index 3f541c0008..933b43cad7 100644
--- a/plugins/ExtendedProfile/ExtendedProfilePlugin.php
+++ b/plugins/ExtendedProfile/ExtendedProfilePlugin.php
@@ -95,8 +95,6 @@ class ExtendedProfilePlugin extends Plugin
         $schema = Schema::get();
         $schema->ensureTable('profile_detail', Profile_detail::schemaDef());
 
-        // @hack until key definition support is merged
-        Profile_detail::fixIndexes($schema);
         return true;
     }
 
diff --git a/plugins/ExtendedProfile/Profile_detail.php b/plugins/ExtendedProfile/Profile_detail.php
index 4b193e54ee..ebbeb86054 100644
--- a/plugins/ExtendedProfile/Profile_detail.php
+++ b/plugins/ExtendedProfile/Profile_detail.php
@@ -23,7 +23,7 @@ if (!defined('STATUSNET')) {
 
 /**
  * DataObject class to store extended profile fields. Allows for storing
- * multiple values per a "field" (field property is not unique).
+ * multiple values per a "field_name" (field_name property is not unique).
  *
  * Example:
  *
@@ -36,166 +36,105 @@ if (!defined('STATUSNET')) {
  * Profile_detail objects, each named 'phone_number' like this:
  *
  *     $phone1 = new Profile_detail();
- *     $phone1->field       = 'phone_number';
+ *     $phone1->field_name  = 'phone_number';
  *     $phone1->rel         = 'home';
- *     $phone1->field_index = 1;
  *     $phone1->value       = '510-384-1992';
+ *     $phone1->value_index = 1;
  *
  *     $phone1 = new Profile_detail();
- *     $phone1->field       = 'phone_number';
+ *     $phone1->field_name  = 'phone_number';
  *     $phone1->rel         = 'mobile';
- *     $phone1->field_index = 2;
  *     $phone1->value       = '510-719-1139';
+ *     $phone1->value_index = 2;
  *
  *     $phone1 = new Profile_detail();
- *     $phone1->field       = 'phone_number';
+ *     $phone1->field_name  = 'phone_number';
  *     $phone1->rel         = 'work';
- *     $phone1->field_index = 3;
- *     $phone1->value       = '415-231-1121';
+ *     $phone1->field_value = '415-231-1121';
+ *     $phone1->value_index = 3;
  *
  */
-class Profile_detail extends Memcached_DataObject
+class Profile_detail extends Managed_DataObject
 {
     public $__table = 'profile_detail';
 
     public $id;
-
-    public $profile_id;
+    public $profile_id;  // profile this is for
     public $rel;         // detail for some field types; eg "home", "mobile", "work" for phones or "aim", "irc", "xmpp" for IM
-    public $field;
-
+    public $field_name;  // name
     public $value;       // primary text value
-    public $field_index; // relative ordering of multiple values in the same field
-
+    public $value_index; // relative ordering of multiple values in the same field
     public $ref_profile; // for people types, allows pointing to a known profile in the system
-
     public $created;
     public $modified;
 
-    public /*static*/ function staticGet($k, $v=null)
+    /**
+     * Get an instance by key
+     *
+     * This is a utility method to get a single instance with a given key value.
+     *
+     * @param string $k Key to use to lookup
+     * @param mixed  $v Value to lookup
+     *
+     * @return User_greeting_count object found, or null for no hits
+     *
+     */
+
+    function staticGet($k, $v=null)
     {
-        return parent::staticGet(__CLASS__, $k, $v);
+        return Memcached_DataObject::staticGet('Profile_detail', $k, $v);
     }
 
     /**
-     * return table definition for DB_DataObject
+     * Get an instance by compound key
      *
-     * DB_DataObject needs to know something about the table to manipulate
-     * instances. This method provides all the DB_DataObject needs to know.
+     * This is a utility method to get a single instance with a given set of
+     * key-value pairs. Usually used for the primary key for a compound key; thus
+     * the name.
+     *
+     * @param array $kv array of key-value mappings
+     *
+     * @return Bookmark object found, or null for no hits
      *
-     * @return array array of column definitions
      */
 
-    function table()
+    function pkeyGet($kv)
     {
-        return array('id' =>  DB_DATAOBJECT_INT + DB_DATAOBJECT_NOTNULL,
-
-                     'profile_id' => DB_DATAOBJECT_INT + DB_DATAOBJECT_NOTNULL,
-                     'field' => DB_DATAOBJECT_STR + DB_DATAOBJECT_NOTNULL,
-                     'field_index' => DB_DATAOBJECT_INT + DB_DATAOBJECT_NOTNULL,
-
-                     'value' => DB_DATAOBJECT_STR,
-                     'rel' => DB_DATAOBJECT_STR,
-                     'ref_profile' => DB_DATAOBJECT_INT,
-
-                     'created' => DB_DATAOBJECT_STR + DB_DATAOBJECT_DATE + DB_DATAOBJECT_TIME + DB_DATAOBJECT_NOTNULL,
-                     'modified' => DB_DATAOBJECT_STR + DB_DATAOBJECT_DATE + DB_DATAOBJECT_TIME + DB_DATAOBJECT_NOTNULL);
+        return Memcached_DataObject::pkeyGet('Profile_detail', $kv);
     }
 
-    /**
-     * Database schema setup
-     *
-     * @see Schema
-     * @see ColumnDef
-     *
-     * @return boolean hook value; true means continue processing, false means stop.
-     */
-
     static function schemaDef()
     {
-        return array(new ColumnDef('id', 'integer',
-                                   null, false, 'PRI'),
-
-                     // @fixme need a unique index on these three
-                     new ColumnDef('profile_id', 'integer',
-                                   null, false),
-                     new ColumnDef('field', 'varchar',
-                                   16, false),
-                     new ColumnDef('field_index', 'integer',
-                                   null, false),
-
-                     new ColumnDef('value', 'text',
-                                   null, true),
-                     new ColumnDef('rel', 'varchar',
-                                   16, true),
-                     new ColumnDef('ref_profile', 'integer',
-                                   null, true),
-
-                     new ColumnDef('created', 'datetime',
-                                   null, false),
-                     new ColumnDef('modified', 'datetime',
-                                   null, false));
-    }
-
-    /**
-     * Temporary hack to set up the compound index, since we can't do
-     * it yet through regular Schema interface. (Coming for 1.0...)
-     *
-     * @param Schema $schema
-     * @return void
-     */
-    static function fixIndexes($schema)
-    {
-        try {
-            // @fixme this won't be a unique index... SIGH
-            $schema->createIndex('profile_detail', array('profile_id', 'field', 'field_index'));
-        } catch (Exception $e) {
-            common_log(LOG_ERR, __METHOD__ . ': ' . $e->getMessage());
-        }
-    }
-
-    /**
-     * Return key definitions for DB_DataObject
-     *
-     * DB_DataObject needs to know about keys that the table has; this function
-     * defines them.
-     *
-     * @return array key definitions
-     */
-
-    function keys()
-    {
-        return array_keys($this->keyTypes());
-    }
-
-    /**
-     * Return key definitions for Memcached_DataObject
-     *
-     * Our caching system uses the same key definitions, but uses a different
-     * method to get them.
-     *
-     * @return array key definitions
-     */
-
-    function keyTypes()
-    {
-        // @fixme keys
-        // need a sane key for reverse lookup too
-        return array('id' => 'K');
-    }
-
-    /**
-     * Get the sequence key
-     *
-     * Returns the first serial column defined in the table, if any.
-     *
-     * @access private
-     * @return array (column,use_native,sequence_name)
-     */
-
-    function sequenceKey()
-    {
-        return array('id', true);
+        return array(
+            'description'
+                => 'Additional profile details for the ExtendedProfile plugin',
+            'fields'      => array(
+                'id'          => array('type' => 'serial', 'not null' => true),
+                'profile_id'  => array('type' => 'int', 'not null' => true),
+                'field_name'  => array(
+                    'type'     => 'varchar',
+                    'length'   => 16,
+                    'not null' => true
+                ),
+                'value_index' => array('type' => 'int'),
+                'field_value' => array('type' => 'text'),
+                'rel'         => array('type' => 'varchar', 'length' => 16),
+                'rel_profile' => array('type' => 'int'),
+                'created'     => array(
+                    'type'     => 'datetime',
+                    'not null' => true
+                 ),
+                'modified'    => array(
+                    'type' => 'timestamp',
+                    'not null' => true
+                ),
+            ),
+            'primary key' => array('id'),
+            'unique keys' => array(
+                'profile_detial_profile_id_field_name_value_index'
+                    => array('profile_id', 'field_name', 'value_index'),
+            )
+        );
     }
 
 }
diff --git a/plugins/ExtendedProfile/extendedprofile.php b/plugins/ExtendedProfile/extendedprofile.php
index 61a66b4b43..5731c808ae 100644
--- a/plugins/ExtendedProfile/extendedprofile.php
+++ b/plugins/ExtendedProfile/extendedprofile.php
@@ -53,7 +53,7 @@ class ExtendedProfile
         $fields = array();
 
         while ($detail->fetch()) {
-            $fields[$detail->field][] = clone($detail);
+            $fields[$detail->field_name][] = clone($detail);
         }
 
         return $fields;
@@ -86,7 +86,7 @@ class ExtendedProfile
         if (in_array(strtolower($name), $profileFields)) {
             return $this->profile->$name;
         } else if (in_array($name, $this->fields)) {
-            return $this->fields[$name]->value;
+            return $this->fields[$name]->field_value;
         } else {
             return null;
         }
diff --git a/plugins/ExtendedProfile/profiledetailsettingsaction.php b/plugins/ExtendedProfile/profiledetailsettingsaction.php
index ce0828c3e1..1f2be5a060 100644
--- a/plugins/ExtendedProfile/profiledetailsettingsaction.php
+++ b/plugins/ExtendedProfile/profiledetailsettingsaction.php
@@ -111,26 +111,33 @@ class ProfileDetailSettingsAction extends SettingsAction
         $detail = new Profile_detail();
 
         $detail->profile_id  = $profile->id;
-        $detail->field       = $name;
-        $detail->field_index = 1;
+        $detail->field_name  = $name;
 
         $result = $detail->find(true);
 
 
         if (empty($result)) {
-            $detail->value = $value;
+
+            $detail->field_value = $value;
 
             $detail->created = common_sql_now();
 
             common_debug("XXXXXXXXXXXXXXX not found");
-            //common_debug('bbbbbbbbbbbb ' . var_export($detail, true));
 
             $result = $detail->insert();
+
+            if (empty($result)) {
+                common_log_db_error($detail, 'INSERT', __FILE__);
+                $this->serverError(_m('Could not save profile details.'));
+            }
+
         } else {
+
             common_debug('zzzzz FOUND');
             $orig = clone($detail);
-            $detail->value = $value;
+            $detail->field_value = $value;
             $result = $detail->update($orig);
+
         }
 
         $detail->free();

From 4915b0cb9ef71e9efadea26ada7a3a936f48cccc Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Wed, 9 Mar 2011 18:01:41 -0800
Subject: [PATCH 486/655] Update Autocomplete plugin for reusable notice forms
 in 1.0.x. It's fun!

Now pulls the fetch API URL from a dedicated <span> with a data attribute ('data-url', should pass HTML 5 validators for our future overlords)
---
 plugins/Autocomplete/Autocomplete.js        | 21 ++++++++++++++++++---
 plugins/Autocomplete/AutocompletePlugin.php |  2 ++
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/plugins/Autocomplete/Autocomplete.js b/plugins/Autocomplete/Autocomplete.js
index c3f022702a..2b031cc313 100644
--- a/plugins/Autocomplete/Autocomplete.js
+++ b/plugins/Autocomplete/Autocomplete.js
@@ -1,4 +1,15 @@
-$(document).ready(function(){
+(function(SN, $) {
+
+var origInit = SN.Init.NoticeFormSetup;
+SN.Init.NoticeFormSetup = function(form) {
+    origInit(form);
+
+    // Only attach to traditional-style forms
+    var textarea = form.find('.notice_data-text:first');
+    if (textarea.length == 0) {
+        return;
+    }
+
     function fullName(row) {
         if (typeof row.fullname == "string" && row.fullname != '') {
             return row.nickname + ' (' + row.fullname + ')';
@@ -6,7 +17,9 @@ $(document).ready(function(){
             return row.nickname;
         }
     }
-    $('#notice_data-text').autocomplete($('address .url')[0].href+'main/autocomplete/suggest', {
+
+    var apiUrl = $('#autocomplete-api').attr('data-url');
+    textarea.autocomplete(apiUrl, {
         multiple: true,
         multipleSeparator: " ",
         minChars: 1,
@@ -35,4 +48,6 @@ $(document).ready(function(){
             }
         }
     });
-});
+};
+
+})(SN, jQuery);
diff --git a/plugins/Autocomplete/AutocompletePlugin.php b/plugins/Autocomplete/AutocompletePlugin.php
index ca495f79f4..1479ead602 100644
--- a/plugins/Autocomplete/AutocompletePlugin.php
+++ b/plugins/Autocomplete/AutocompletePlugin.php
@@ -51,6 +51,8 @@ class AutocompletePlugin extends Plugin
 
     function onEndShowScripts($action){
         if (common_logged_in()) {
+            $action->element('span', array('id' => 'autocomplete-api',
+                                           'data-url' => common_local_url('autocomplete')));
             $action->script($this->path('jquery-autocomplete/jquery.autocomplete.pack.js'));
             $action->script($this->path('Autocomplete.js'));
         }

From 662ad0f7bb3abb576d4ec188c11e235bf777a99b Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Wed, 9 Mar 2011 18:11:08 -0800
Subject: [PATCH 487/655] Update DirectionDetector for reusable notice forms.
 Also tweaked it to trigger on cut/paste, and to reset when the form resets.

---
 .../jquery.DirectionDetector.js               | 33 ++++++++++++-------
 1 file changed, 22 insertions(+), 11 deletions(-)

diff --git a/plugins/DirectionDetector/jquery.DirectionDetector.js b/plugins/DirectionDetector/jquery.DirectionDetector.js
index 6808bcabd8..840cd69097 100644
--- a/plugins/DirectionDetector/jquery.DirectionDetector.js
+++ b/plugins/DirectionDetector/jquery.DirectionDetector.js
@@ -47,15 +47,26 @@
 			return true;
 		return false;
 	};
-	$(document).ready(function(){
-		var tArea = $("#notice_data-text");
-		var tCleaner = new RegExp('@[^ ]+|![^ ]+|#[^ ]+|^RT[: ]{1}| RT | RT: |^RD[: ]{1}| RD | RD: |[♺♻:]+', 'g')
-		tArea.keyup(function(){
-			var cleaned = tArea.val().replace(tCleaner, '').replace(/^[ ]+/, '');
-			if($().isRTL(cleaned))
-				tArea.css('direction', 'rtl');
-			else
-				tArea.css('direction', 'ltr');
-		});
-	});
+    var origInit = SN.Init.NoticeFormSetup;
+    SN.Init.NoticeFormSetup = function(form) {
+        origInit(form);
+        var tArea = form.find(".notice_data-text:first");
+        if (tArea.length > 0) {
+            var tCleaner = new RegExp('@[^ ]+|![^ ]+|#[^ ]+|^RT[: ]{1}| RT | RT: |^RD[: ]{1}| RD | RD: |[♺♻:]+', 'g')
+            var ping = function(){
+                var cleaned = tArea.val().replace(tCleaner, '').replace(/^[ ]+/, '');
+                if($().isRTL(cleaned))
+                    tArea.css('direction', 'rtl');
+                else
+                    tArea.css('direction', 'ltr');
+            };
+            tArea.bind('keyup cut paste', function() {
+                // cut/paste trigger before the change
+                window.setTimeout(ping, 0);
+            });
+            form.bind('reset', function() {
+                tArea.css('direction', 'ltr');
+            });
+        }
+    };
 })(jQuery);

From 3d61d003bc03dd18aa46dc9e96ecb9b0ed9034c7 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Wed, 9 Mar 2011 18:16:02 -0800
Subject: [PATCH 488/655] Fix property declaration

---
 plugins/ExtendedProfile/Profile_detail.php  | 8 ++++----
 plugins/ExtendedProfile/extendedprofile.php | 1 +
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/plugins/ExtendedProfile/Profile_detail.php b/plugins/ExtendedProfile/Profile_detail.php
index ebbeb86054..f9f4d00098 100644
--- a/plugins/ExtendedProfile/Profile_detail.php
+++ b/plugins/ExtendedProfile/Profile_detail.php
@@ -38,13 +38,13 @@ if (!defined('STATUSNET')) {
  *     $phone1 = new Profile_detail();
  *     $phone1->field_name  = 'phone_number';
  *     $phone1->rel         = 'home';
- *     $phone1->value       = '510-384-1992';
+ *     $phone1->field_value = '510-384-1992';
  *     $phone1->value_index = 1;
  *
  *     $phone1 = new Profile_detail();
  *     $phone1->field_name  = 'phone_number';
  *     $phone1->rel         = 'mobile';
- *     $phone1->value       = '510-719-1139';
+ *     $phone1->field_value = '510-719-1139';
  *     $phone1->value_index = 2;
  *
  *     $phone1 = new Profile_detail();
@@ -62,7 +62,7 @@ class Profile_detail extends Managed_DataObject
     public $profile_id;  // profile this is for
     public $rel;         // detail for some field types; eg "home", "mobile", "work" for phones or "aim", "irc", "xmpp" for IM
     public $field_name;  // name
-    public $value;       // primary text value
+    public $field_value; // primary text value
     public $value_index; // relative ordering of multiple values in the same field
     public $ref_profile; // for people types, allows pointing to a known profile in the system
     public $created;
@@ -131,7 +131,7 @@ class Profile_detail extends Managed_DataObject
             ),
             'primary key' => array('id'),
             'unique keys' => array(
-                'profile_detial_profile_id_field_name_value_index'
+                'profile_detail_profile_id_field_name_value_index'
                     => array('profile_id', 'field_name', 'value_index'),
             )
         );
diff --git a/plugins/ExtendedProfile/extendedprofile.php b/plugins/ExtendedProfile/extendedprofile.php
index 5731c808ae..43f5b55b9c 100644
--- a/plugins/ExtendedProfile/extendedprofile.php
+++ b/plugins/ExtendedProfile/extendedprofile.php
@@ -37,6 +37,7 @@ class ExtendedProfile
         $this->user     = $profile->getUser();
         $this->sections = $this->getSections();
         $this->fields   = $this->loadFields();
+        common_debug(var_export($this->fields, true));
     }
 
     /**

From b653b2fb6434e6c99ffe2186469a0d4d01b1fdea Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Wed, 9 Mar 2011 18:29:10 -0800
Subject: [PATCH 489/655] Update TinyMCE plugin for reusable thingies; doesn't
 quite arrange properly in the layout, we'll have to figure that out still.

---
 plugins/TinyMCE/TinyMCEPlugin.php | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/plugins/TinyMCE/TinyMCEPlugin.php b/plugins/TinyMCE/TinyMCEPlugin.php
index 49bbdf90db..4051ff59ee 100644
--- a/plugins/TinyMCE/TinyMCEPlugin.php
+++ b/plugins/TinyMCE/TinyMCEPlugin.php
@@ -290,9 +290,14 @@ class TinyMCEPlugin extends Plugin
         // our AJAX form submission. Manually moving it to trigger
         // on our send button click.
         $scr = <<<END_OF_SCRIPT
-        $().ready(function() {
-            var noticeForm = $('#form_notice');
-            $('textarea#notice_data-text').tinymce({
+        (function() {
+        var origInit = SN.Init.NoticeFormSetup;
+        SN.Init.NoticeFormSetup = function(form) {
+            origInit(form);
+            var noticeForm = form;
+            var textarea = form.find('.notice_data-text');
+            if (textarea.length == 0) return;
+            textarea.tinymce({
                 script_url : '{$path}',
                 // General options
                 theme : "advanced",
@@ -306,7 +311,7 @@ class TinyMCEPlugin extends Plugin
                 setup: function(ed) {
                     noticeForm.append('<input type="hidden" name="richedit" value="1">');
 
-                    $('#notice_action-submit').click(function() {
+                    form.find('.submit:first').click(function() {
                         tinymce.triggerSave();
                     });
 
@@ -319,14 +324,15 @@ class TinyMCEPlugin extends Plugin
                         SN.U.Counter(noticeForm);
                     });
 
-                    $('#'+SN.C.S.NoticeDataAttach).change(function() {
+                    form.find('input[type=file]').change(function() {
                         var img = '<img src="{$placeholder}" class="placeholder" width="320" height="240">';
                         var html = tinyMCE.activeEditor.getContent();
                         ed.setContent(html + img);
                     });
                 }
             });
-        });
+        };
+        })();
 END_OF_SCRIPT;
 
         return $scr;

From adcda00e7668532b1261ba9808834ba45421c01a Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Wed, 9 Mar 2011 19:27:21 -0800
Subject: [PATCH 490/655] * Remove evil transaction * Fix text value retrieval
 method

---
 plugins/ExtendedProfile/extendedprofile.php           |  9 ++++++---
 .../ExtendedProfile/profiledetailsettingsaction.php   | 11 ++++++-----
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/plugins/ExtendedProfile/extendedprofile.php b/plugins/ExtendedProfile/extendedprofile.php
index 43f5b55b9c..5ad6db114f 100644
--- a/plugins/ExtendedProfile/extendedprofile.php
+++ b/plugins/ExtendedProfile/extendedprofile.php
@@ -26,6 +26,8 @@ if (!defined('STATUSNET')) {
  */
 class ExtendedProfile
 {
+    protected $fields;
+
     /**
      * Constructor
      *
@@ -82,12 +84,13 @@ class ExtendedProfile
      */
     function getTextValue($name)
     {
+        $key           = strtolower($name);
         $profileFields = array('fullname', 'location', 'bio');
 
-        if (in_array(strtolower($name), $profileFields)) {
+        if (in_array($key, $profileFields)) {
             return $this->profile->$name;
-        } else if (in_array($name, $this->fields)) {
-            return $this->fields[$name]->field_value;
+        } else if (array_key_exists($key, $this->fields)) {
+            return $this->fields[$key][0]->field_value;
         } else {
             return null;
         }
diff --git a/plugins/ExtendedProfile/profiledetailsettingsaction.php b/plugins/ExtendedProfile/profiledetailsettingsaction.php
index 1f2be5a060..7c68216972 100644
--- a/plugins/ExtendedProfile/profiledetailsettingsaction.php
+++ b/plugins/ExtendedProfile/profiledetailsettingsaction.php
@@ -74,7 +74,11 @@ class ProfileDetailSettingsAction extends SettingsAction
         $cur = common_current_user();
         $profile = $cur->getProfile();
 
-        $widget = new ExtendedProfileWidget($this, $profile, ExtendedProfileWidget::EDITABLE);
+        $widget = new ExtendedProfileWidget(
+            $this,
+            $profile,
+            ExtendedProfileWidget::EDITABLE
+        );
         $widget->show();
     }
 
@@ -154,8 +158,6 @@ class ProfileDetailSettingsAction extends SettingsAction
      */
     function saveStandardProfileDetails($user)
     {
-        $user->query('BEGIN');
-
         $fullname  = $this->trimmed('extprofile-fullname');
         $location  = $this->trimmed('extprofile-location');
         $tagstring = $this->trimmed('extprofile-tags');
@@ -187,7 +189,7 @@ class ProfileDetailSettingsAction extends SettingsAction
             || $location != $profile->location
             || !empty($newTags)
             || $bio      != $profile->bio) {
-
+ 
             $orig = clone($profile);
 
             $profile->nickname = $user->nickname;
@@ -229,7 +231,6 @@ class ProfileDetailSettingsAction extends SettingsAction
                 return;
             }
 
-            $user->query('COMMIT');
             Event::handle('EndProfileSaveForm', array($this));
             common_broadcast_profile($profile);
         }

From 5203fa7151c099e0ba5a9ef80565ed681a3a200a Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Wed, 9 Mar 2011 19:31:37 -0800
Subject: [PATCH 491/655] Make all simple fields save

---
 plugins/ExtendedProfile/profiledetailsettingsaction.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/ExtendedProfile/profiledetailsettingsaction.php b/plugins/ExtendedProfile/profiledetailsettingsaction.php
index 7c68216972..0f84dc0582 100644
--- a/plugins/ExtendedProfile/profiledetailsettingsaction.php
+++ b/plugins/ExtendedProfile/profiledetailsettingsaction.php
@@ -97,7 +97,7 @@ class ProfileDetailSettingsAction extends SettingsAction
 
         $profile = $user->getProfile();
 
-        $simpleFieldNames = array('title');
+        $simpleFieldNames = array('title', 'spouse', 'kids');
 
         foreach ($simpleFieldNames as $name) {
             $value = $this->trimmed('extprofile-' . $name);

From 39b308bf90e3da67cbe0e46f4db3b025704c0882 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Thu, 10 Mar 2011 10:14:09 -0600
Subject: [PATCH 492/655] reformatting on RSVP.php

---
 plugins/Event/RSVP.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/plugins/Event/RSVP.php b/plugins/Event/RSVP.php
index c61ff3dbf0..dc7166b9ce 100644
--- a/plugins/Event/RSVP.php
+++ b/plugins/Event/RSVP.php
@@ -177,7 +177,8 @@ class RSVP extends Managed_DataObject
 
         $content = sprintf(_('RSVPed %s for an event.'),
                            ($result == RSVP::POSITIVE) ? _('positively') :
-                           ($result == RSVP::NEGATIVE) ? _('negatively') : _('possibly'));
+                           ($result == RSVP::NEGATIVE) ? _('negatively') :
+                           _('possibly'));
         
         $rendered = $content;
 
@@ -231,7 +232,9 @@ class RSVP extends Managed_DataObject
 
     static function forEvent($event)
     {
-        $rsvps = array(RSVP::POSITIVE => array(), RSVP::NEGATIVE => array(), RSVP::POSSIBLE => array());
+        $rsvps = array(RSVP::POSITIVE => array(),
+                       RSVP::NEGATIVE => array(),
+                       RSVP::POSSIBLE => array());
 
         $rsvp = new RSVP();
 

From 347dd08272bf7b1e97c50cb2a5a92af3294ad4e4 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Thu, 10 Mar 2011 10:18:35 -0600
Subject: [PATCH 493/655] add jquery-ui js and css

---
 .../images/ui-bg_flat_0_aaaaaa_40x100.png     |   Bin 0 -> 180 bytes
 .../images/ui-bg_flat_75_ffffff_40x100.png    |   Bin 0 -> 178 bytes
 .../images/ui-bg_glass_55_fbf9ee_1x400.png    |   Bin 0 -> 120 bytes
 .../images/ui-bg_glass_65_ffffff_1x400.png    |   Bin 0 -> 105 bytes
 .../images/ui-bg_glass_75_dadada_1x400.png    |   Bin 0 -> 111 bytes
 .../images/ui-bg_glass_75_e6e6e6_1x400.png    |   Bin 0 -> 110 bytes
 .../images/ui-bg_glass_95_fef1ec_1x400.png    |   Bin 0 -> 119 bytes
 .../ui-bg_highlight-soft_75_cccccc_1x100.png  |   Bin 0 -> 101 bytes
 .../images/ui-icons_222222_256x240.png        |   Bin 0 -> 4369 bytes
 .../images/ui-icons_2e83ff_256x240.png        |   Bin 0 -> 4369 bytes
 .../images/ui-icons_454545_256x240.png        |   Bin 0 -> 4369 bytes
 .../images/ui-icons_888888_256x240.png        |   Bin 0 -> 4369 bytes
 .../images/ui-icons_cd0a0a_256x240.png        |   Bin 0 -> 4369 bytes
 js/css/smoothness/jquery-ui-1.8.10.custom.css |   573 +
 js/jquery-ui-1.8.10.custom.min.js             |   782 ++
 js/ui/i18n/jquery-ui-i18n.js                  |  1357 ++
 js/ui/i18n/jquery.ui.datepicker-af.js         |    23 +
 js/ui/i18n/jquery.ui.datepicker-ar-DZ.js      |    23 +
 js/ui/i18n/jquery.ui.datepicker-ar.js         |    23 +
 js/ui/i18n/jquery.ui.datepicker-az.js         |    23 +
 js/ui/i18n/jquery.ui.datepicker-bg.js         |    24 +
 js/ui/i18n/jquery.ui.datepicker-bs.js         |    23 +
 js/ui/i18n/jquery.ui.datepicker-ca.js         |    23 +
 js/ui/i18n/jquery.ui.datepicker-cs.js         |    23 +
 js/ui/i18n/jquery.ui.datepicker-da.js         |    23 +
 js/ui/i18n/jquery.ui.datepicker-de.js         |    23 +
 js/ui/i18n/jquery.ui.datepicker-el.js         |    23 +
 js/ui/i18n/jquery.ui.datepicker-en-AU.js      |    23 +
 js/ui/i18n/jquery.ui.datepicker-en-GB.js      |    23 +
 js/ui/i18n/jquery.ui.datepicker-en-NZ.js      |    23 +
 js/ui/i18n/jquery.ui.datepicker-eo.js         |    23 +
 js/ui/i18n/jquery.ui.datepicker-es.js         |    23 +
 js/ui/i18n/jquery.ui.datepicker-et.js         |    23 +
 js/ui/i18n/jquery.ui.datepicker-eu.js         |    23 +
 js/ui/i18n/jquery.ui.datepicker-fa.js         |    23 +
 js/ui/i18n/jquery.ui.datepicker-fi.js         |    23 +
 js/ui/i18n/jquery.ui.datepicker-fo.js         |    23 +
 js/ui/i18n/jquery.ui.datepicker-fr-CH.js      |    23 +
 js/ui/i18n/jquery.ui.datepicker-fr.js         |    25 +
 js/ui/i18n/jquery.ui.datepicker-gl.js         |    23 +
 js/ui/i18n/jquery.ui.datepicker-he.js         |    23 +
 js/ui/i18n/jquery.ui.datepicker-hr.js         |    23 +
 js/ui/i18n/jquery.ui.datepicker-hu.js         |    23 +
 js/ui/i18n/jquery.ui.datepicker-hy.js         |    23 +
 js/ui/i18n/jquery.ui.datepicker-id.js         |    23 +
 js/ui/i18n/jquery.ui.datepicker-is.js         |    23 +
 js/ui/i18n/jquery.ui.datepicker-it.js         |    23 +
 js/ui/i18n/jquery.ui.datepicker-ja.js         |    23 +
 js/ui/i18n/jquery.ui.datepicker-ko.js         |    23 +
 js/ui/i18n/jquery.ui.datepicker-kz.js         |    23 +
 js/ui/i18n/jquery.ui.datepicker-lt.js         |    23 +
 js/ui/i18n/jquery.ui.datepicker-lv.js         |    23 +
 js/ui/i18n/jquery.ui.datepicker-ml.js         |    23 +
 js/ui/i18n/jquery.ui.datepicker-ms.js         |    23 +
 js/ui/i18n/jquery.ui.datepicker-nl.js         |    23 +
 js/ui/i18n/jquery.ui.datepicker-no.js         |    23 +
 js/ui/i18n/jquery.ui.datepicker-pl.js         |    23 +
 js/ui/i18n/jquery.ui.datepicker-pt-BR.js      |    23 +
 js/ui/i18n/jquery.ui.datepicker-pt.js         |    22 +
 js/ui/i18n/jquery.ui.datepicker-rm.js         |    21 +
 js/ui/i18n/jquery.ui.datepicker-ro.js         |    26 +
 js/ui/i18n/jquery.ui.datepicker-ru.js         |    23 +
 js/ui/i18n/jquery.ui.datepicker-sk.js         |    23 +
 js/ui/i18n/jquery.ui.datepicker-sl.js         |    24 +
 js/ui/i18n/jquery.ui.datepicker-sq.js         |    23 +
 js/ui/i18n/jquery.ui.datepicker-sr-SR.js      |    23 +
 js/ui/i18n/jquery.ui.datepicker-sr.js         |    23 +
 js/ui/i18n/jquery.ui.datepicker-sv.js         |    23 +
 js/ui/i18n/jquery.ui.datepicker-ta.js         |    23 +
 js/ui/i18n/jquery.ui.datepicker-th.js         |    23 +
 js/ui/i18n/jquery.ui.datepicker-tr.js         |    23 +
 js/ui/i18n/jquery.ui.datepicker-uk.js         |    23 +
 js/ui/i18n/jquery.ui.datepicker-vi.js         |    23 +
 js/ui/i18n/jquery.ui.datepicker-zh-CN.js      |    23 +
 js/ui/i18n/jquery.ui.datepicker-zh-HK.js      |    23 +
 js/ui/i18n/jquery.ui.datepicker-zh-TW.js      |    23 +
 js/ui/jquery-ui-1.8.10.custom.js              | 11544 ++++++++++++++++
 js/ui/jquery.effects.blind.js                 |    49 +
 js/ui/jquery.effects.bounce.js                |    78 +
 js/ui/jquery.effects.clip.js                  |    54 +
 js/ui/jquery.effects.core.js                  |   747 +
 js/ui/jquery.effects.drop.js                  |    50 +
 js/ui/jquery.effects.explode.js               |    79 +
 js/ui/jquery.effects.fade.js                  |    32 +
 js/ui/jquery.effects.fold.js                  |    56 +
 js/ui/jquery.effects.highlight.js             |    50 +
 js/ui/jquery.effects.pulsate.js               |    51 +
 js/ui/jquery.effects.scale.js                 |   178 +
 js/ui/jquery.effects.shake.js                 |    57 +
 js/ui/jquery.effects.slide.js                 |    50 +
 js/ui/jquery.effects.transfer.js              |    45 +
 js/ui/jquery.ui.accordion.js                  |   606 +
 js/ui/jquery.ui.autocomplete.js               |   607 +
 js/ui/jquery.ui.button.js                     |   378 +
 js/ui/jquery.ui.core.js                       |   308 +
 js/ui/jquery.ui.datepicker.js                 |  1766 +++
 js/ui/jquery.ui.dialog.js                     |   857 ++
 js/ui/jquery.ui.draggable.js                  |   797 ++
 js/ui/jquery.ui.droppable.js                  |   285 +
 js/ui/jquery.ui.mouse.js                      |   151 +
 js/ui/jquery.ui.position.js                   |   252 +
 js/ui/jquery.ui.progressbar.js                |   108 +
 js/ui/jquery.ui.resizable.js                  |   812 ++
 js/ui/jquery.ui.selectable.js                 |   266 +
 js/ui/jquery.ui.slider.js                     |   682 +
 js/ui/jquery.ui.sortable.js                   |  1073 ++
 js/ui/jquery.ui.tabs.js                       |   758 +
 js/ui/jquery.ui.widget.js                     |   262 +
 108 files changed, 27184 insertions(+)
 create mode 100644 js/css/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png
 create mode 100644 js/css/smoothness/images/ui-bg_flat_75_ffffff_40x100.png
 create mode 100644 js/css/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png
 create mode 100644 js/css/smoothness/images/ui-bg_glass_65_ffffff_1x400.png
 create mode 100644 js/css/smoothness/images/ui-bg_glass_75_dadada_1x400.png
 create mode 100644 js/css/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png
 create mode 100644 js/css/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png
 create mode 100644 js/css/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png
 create mode 100644 js/css/smoothness/images/ui-icons_222222_256x240.png
 create mode 100644 js/css/smoothness/images/ui-icons_2e83ff_256x240.png
 create mode 100644 js/css/smoothness/images/ui-icons_454545_256x240.png
 create mode 100644 js/css/smoothness/images/ui-icons_888888_256x240.png
 create mode 100644 js/css/smoothness/images/ui-icons_cd0a0a_256x240.png
 create mode 100644 js/css/smoothness/jquery-ui-1.8.10.custom.css
 create mode 100644 js/jquery-ui-1.8.10.custom.min.js
 create mode 100644 js/ui/i18n/jquery-ui-i18n.js
 create mode 100644 js/ui/i18n/jquery.ui.datepicker-af.js
 create mode 100644 js/ui/i18n/jquery.ui.datepicker-ar-DZ.js
 create mode 100644 js/ui/i18n/jquery.ui.datepicker-ar.js
 create mode 100644 js/ui/i18n/jquery.ui.datepicker-az.js
 create mode 100644 js/ui/i18n/jquery.ui.datepicker-bg.js
 create mode 100644 js/ui/i18n/jquery.ui.datepicker-bs.js
 create mode 100644 js/ui/i18n/jquery.ui.datepicker-ca.js
 create mode 100644 js/ui/i18n/jquery.ui.datepicker-cs.js
 create mode 100644 js/ui/i18n/jquery.ui.datepicker-da.js
 create mode 100644 js/ui/i18n/jquery.ui.datepicker-de.js
 create mode 100644 js/ui/i18n/jquery.ui.datepicker-el.js
 create mode 100644 js/ui/i18n/jquery.ui.datepicker-en-AU.js
 create mode 100644 js/ui/i18n/jquery.ui.datepicker-en-GB.js
 create mode 100644 js/ui/i18n/jquery.ui.datepicker-en-NZ.js
 create mode 100644 js/ui/i18n/jquery.ui.datepicker-eo.js
 create mode 100644 js/ui/i18n/jquery.ui.datepicker-es.js
 create mode 100644 js/ui/i18n/jquery.ui.datepicker-et.js
 create mode 100644 js/ui/i18n/jquery.ui.datepicker-eu.js
 create mode 100644 js/ui/i18n/jquery.ui.datepicker-fa.js
 create mode 100644 js/ui/i18n/jquery.ui.datepicker-fi.js
 create mode 100644 js/ui/i18n/jquery.ui.datepicker-fo.js
 create mode 100644 js/ui/i18n/jquery.ui.datepicker-fr-CH.js
 create mode 100644 js/ui/i18n/jquery.ui.datepicker-fr.js
 create mode 100644 js/ui/i18n/jquery.ui.datepicker-gl.js
 create mode 100644 js/ui/i18n/jquery.ui.datepicker-he.js
 create mode 100644 js/ui/i18n/jquery.ui.datepicker-hr.js
 create mode 100644 js/ui/i18n/jquery.ui.datepicker-hu.js
 create mode 100644 js/ui/i18n/jquery.ui.datepicker-hy.js
 create mode 100644 js/ui/i18n/jquery.ui.datepicker-id.js
 create mode 100644 js/ui/i18n/jquery.ui.datepicker-is.js
 create mode 100644 js/ui/i18n/jquery.ui.datepicker-it.js
 create mode 100644 js/ui/i18n/jquery.ui.datepicker-ja.js
 create mode 100644 js/ui/i18n/jquery.ui.datepicker-ko.js
 create mode 100644 js/ui/i18n/jquery.ui.datepicker-kz.js
 create mode 100644 js/ui/i18n/jquery.ui.datepicker-lt.js
 create mode 100644 js/ui/i18n/jquery.ui.datepicker-lv.js
 create mode 100644 js/ui/i18n/jquery.ui.datepicker-ml.js
 create mode 100644 js/ui/i18n/jquery.ui.datepicker-ms.js
 create mode 100644 js/ui/i18n/jquery.ui.datepicker-nl.js
 create mode 100644 js/ui/i18n/jquery.ui.datepicker-no.js
 create mode 100644 js/ui/i18n/jquery.ui.datepicker-pl.js
 create mode 100644 js/ui/i18n/jquery.ui.datepicker-pt-BR.js
 create mode 100644 js/ui/i18n/jquery.ui.datepicker-pt.js
 create mode 100644 js/ui/i18n/jquery.ui.datepicker-rm.js
 create mode 100644 js/ui/i18n/jquery.ui.datepicker-ro.js
 create mode 100644 js/ui/i18n/jquery.ui.datepicker-ru.js
 create mode 100644 js/ui/i18n/jquery.ui.datepicker-sk.js
 create mode 100644 js/ui/i18n/jquery.ui.datepicker-sl.js
 create mode 100644 js/ui/i18n/jquery.ui.datepicker-sq.js
 create mode 100644 js/ui/i18n/jquery.ui.datepicker-sr-SR.js
 create mode 100644 js/ui/i18n/jquery.ui.datepicker-sr.js
 create mode 100644 js/ui/i18n/jquery.ui.datepicker-sv.js
 create mode 100644 js/ui/i18n/jquery.ui.datepicker-ta.js
 create mode 100644 js/ui/i18n/jquery.ui.datepicker-th.js
 create mode 100644 js/ui/i18n/jquery.ui.datepicker-tr.js
 create mode 100644 js/ui/i18n/jquery.ui.datepicker-uk.js
 create mode 100644 js/ui/i18n/jquery.ui.datepicker-vi.js
 create mode 100644 js/ui/i18n/jquery.ui.datepicker-zh-CN.js
 create mode 100644 js/ui/i18n/jquery.ui.datepicker-zh-HK.js
 create mode 100644 js/ui/i18n/jquery.ui.datepicker-zh-TW.js
 create mode 100644 js/ui/jquery-ui-1.8.10.custom.js
 create mode 100644 js/ui/jquery.effects.blind.js
 create mode 100644 js/ui/jquery.effects.bounce.js
 create mode 100644 js/ui/jquery.effects.clip.js
 create mode 100644 js/ui/jquery.effects.core.js
 create mode 100644 js/ui/jquery.effects.drop.js
 create mode 100644 js/ui/jquery.effects.explode.js
 create mode 100644 js/ui/jquery.effects.fade.js
 create mode 100644 js/ui/jquery.effects.fold.js
 create mode 100644 js/ui/jquery.effects.highlight.js
 create mode 100644 js/ui/jquery.effects.pulsate.js
 create mode 100644 js/ui/jquery.effects.scale.js
 create mode 100644 js/ui/jquery.effects.shake.js
 create mode 100644 js/ui/jquery.effects.slide.js
 create mode 100644 js/ui/jquery.effects.transfer.js
 create mode 100644 js/ui/jquery.ui.accordion.js
 create mode 100644 js/ui/jquery.ui.autocomplete.js
 create mode 100644 js/ui/jquery.ui.button.js
 create mode 100644 js/ui/jquery.ui.core.js
 create mode 100644 js/ui/jquery.ui.datepicker.js
 create mode 100644 js/ui/jquery.ui.dialog.js
 create mode 100644 js/ui/jquery.ui.draggable.js
 create mode 100644 js/ui/jquery.ui.droppable.js
 create mode 100644 js/ui/jquery.ui.mouse.js
 create mode 100644 js/ui/jquery.ui.position.js
 create mode 100644 js/ui/jquery.ui.progressbar.js
 create mode 100644 js/ui/jquery.ui.resizable.js
 create mode 100644 js/ui/jquery.ui.selectable.js
 create mode 100644 js/ui/jquery.ui.slider.js
 create mode 100644 js/ui/jquery.ui.sortable.js
 create mode 100644 js/ui/jquery.ui.tabs.js
 create mode 100644 js/ui/jquery.ui.widget.js

diff --git a/js/css/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png b/js/css/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png
new file mode 100644
index 0000000000000000000000000000000000000000..5b5dab2ab7b1c50dea9cfe73dc5a269a92d2d4b4
GIT binary patch
literal 180
zcmeAS@N?(olHy`uVBq!ia0vp^8bF-F!3HG1q!d*FscKIb$B>N1x91EQ4=4yQ7#`R^
z$vje}<irI&an_s0pV!D+$FtuP31JO&3=I&aE+u|=5A)Hv$*VMh&S3C#^>bP0l+XkK
DSH>_4

literal 0
HcmV?d00001

diff --git a/js/css/smoothness/images/ui-bg_flat_75_ffffff_40x100.png b/js/css/smoothness/images/ui-bg_flat_75_ffffff_40x100.png
new file mode 100644
index 0000000000000000000000000000000000000000..ac8b229af950c29356abf64a6c4aa894575445f0
GIT binary patch
literal 178
zcmeAS@N?(olHy`uVBq!ia0vp^8bF-F!3HG1q!d*FsY*{5$B>N1x91EQ4=4yQYz+E8
zPo9&<{J;c_6SHRil>2s{Zw^OT)6@jj2u|u!(plXsM>LJD`vD!n;OXk;vd$@?2>^GI
BH@yG=

literal 0
HcmV?d00001

diff --git a/js/css/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png b/js/css/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png
new file mode 100644
index 0000000000000000000000000000000000000000..ad3d6346e00f246102f72f2e026ed0491988b394
GIT binary patch
literal 120
zcmeAS@N?(olHy`uVBq!ia0vp^j6gJjgAK^akKnour0hLi978O6-<~(*I$*%ybaDOn
z{W;e!B}_MSUQoPXhYd^Y6RUoS1yepnPx`2Kz)7OXQG!!=-jY=F+d2OOy?#DnJ32>z
UEim$g7SJdLPgg&ebxsLQ09~*s;{X5v

literal 0
HcmV?d00001

diff --git a/js/css/smoothness/images/ui-bg_glass_65_ffffff_1x400.png b/js/css/smoothness/images/ui-bg_glass_65_ffffff_1x400.png
new file mode 100644
index 0000000000000000000000000000000000000000..42ccba269b6e91bef12ad0fa18be651b5ef0ee68
GIT binary patch
literal 105
zcmeAS@N?(olHy`uVBq!ia0vp^j6gJjgAK^akKnouqzpV=978O6-=0?FV^9z|eBtf=
z|7WztIJ;WT>{+tN>ySr~=F{k$>;_x^_y?afmf9pRKH0)6?eSP?3s5hEr>mdKI;Vst
E0O<Z9>;M1&

literal 0
HcmV?d00001

diff --git a/js/css/smoothness/images/ui-bg_glass_75_dadada_1x400.png b/js/css/smoothness/images/ui-bg_glass_75_dadada_1x400.png
new file mode 100644
index 0000000000000000000000000000000000000000..5a46b47cb16631068aee9e0bd61269fc4e95e5cd
GIT binary patch
literal 111
zcmeAS@N?(olHy`uVBq!ia0vp^j6gJjgAK^akKnouq|7{B978O6lPf+wIa#m9#>Unb
zm^4K~wN3Zq+uP<E-4iDYHYX${Ii)G?xY5!0{fvg8SC7yQ4u<2&oOc%dd<Zm-fx*+&
K&t;ucLK6Ud-y?JY

literal 0
HcmV?d00001

diff --git a/js/css/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png b/js/css/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png
new file mode 100644
index 0000000000000000000000000000000000000000..86c2baa655eac8539db34f8d9adb69ec1226201c
GIT binary patch
literal 110
zcmeAS@N?(olHy`uVBq!ia0vp^j6gJjgAK^akKnouq)a_s978O6-<~$)Vo(rZKDhVK
z|J9WTLT^QIG;Q^ml{ow8HvtEZhta#LLqp$|vO7%bGjI7IBizcw`SFI!bT^;@44$rj
JF6*2UngEbSBdP!Z

literal 0
HcmV?d00001

diff --git a/js/css/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png b/js/css/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png
new file mode 100644
index 0000000000000000000000000000000000000000..4443fdc1a156babad4336f004eaf5ca5dfa0f9ab
GIT binary patch
literal 119
zcmeAS@N?(olHy`uVBq!ia0vp^j6gJjgAK^akKnour0hIh978O6-<~(*YA|4MzBvER
z|7}eQtdCVXoUc2b{PaWeaIKu7gJx>{vDV26o)#~38&#8k_!`W=^oo1w6ixmPC4R1b
Tyd6G3lNdZ*{an^LB{Ts5`idse

literal 0
HcmV?d00001

diff --git a/js/css/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png b/js/css/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png
new file mode 100644
index 0000000000000000000000000000000000000000..7c9fa6c6edcfcdd3e5b77e6f547b719e6fc66e30
GIT binary patch
literal 101
zcmeAS@N?(olHy`uVBq!ia0vp^j6j^i!3HGVb)pi0l#Zv1V~E7m<ccpZF4n8Dv9Yx&
zy8QY7U*2m$;l+;n|NjK_PainIAnKgVYt6(keT9{lbLSy{pgsmqS3j3^P6<r_2PGZu

literal 0
HcmV?d00001

diff --git a/js/css/smoothness/images/ui-icons_222222_256x240.png b/js/css/smoothness/images/ui-icons_222222_256x240.png
new file mode 100644
index 0000000000000000000000000000000000000000..b273ff111d219c9b9a8b96d57683d0075fb7871a
GIT binary patch
literal 4369
zcmd^?`8O2)_s3^phOrG}UnfiUEn8(9QW1?MNkxXVDEpFin2{xWrLx5kBC;k~Gm<qS
zlCjL7i8RK}U~J#s@6Y%1S9~7lb?$xLU+y{go_o*h`AV=spXY*!!T<mOmxZ~R9RL9Q
zdj+hrf&W^P#f9C!Zpp^V{;aID?ElVL?Rdohw{Ucz9r_YL7=D6<&8F>PmYTG^FX}c%
zl<zAi(m>GE{DS1Q;~I7<vD)$Yj(fd>-6ze&TN@+F-xsI6sd%SwK#*O5K|pDRZqEy<
zJg0Nd8F@!OxqElm`~U#piM22@u@8B<<ecI*S<egUH7}csd8!)jLBD2s`p(8v&--KE
z71^q9MglFywkSt_5FCr2F%o&UR(5j7-O>moyKE%ct`B(jysxK+1m?G)UyIFs1t0}L
zemGR&?jGaM1YQblj?v&@0iXS#fi-VbR9zLEnHLP?xQ|=%Ihrc7^yPWR!tW$yH!zrw
z#I2}_!JnT^(qk)VgJr`NGdPtT^dmQIZc%=6nTAyJDXk+^3}wUOilJuwq>s=T_!9V)
zr1)DT6VQ2~rgd@!Jlrte3}}m~j}juCS`J4(d-5+e-3@EzzTJNCE2z)w(kJ90z*QE)
zBtnV@4mM>jTrZZ*$01SnGov0&=A-JrX5Ge%Pce1Vj}=5YQqBD^W@n4KmFxxpFK`uH
zP;(xKV+6VJ2|g+?_Lct7`uElL<&jzGS8Gfva2+=8A@#V+xsAj9|Dkg)vL5yhX@~B=
zN2KZSAUD%QH`x>H+@Ou(D1~Pyv#0nc&$!1kI?IO01yw3jD0@80qvc?T*Nr8?-%rC8
z@5$|WY?Hqp`ixmEkzeJTz_`_<!oE0dsO`po1=$i_1k<Um_}caMZcrpqA*x-}Rw(fX
z3Qyh8;-4^Fe)UICI@ayzmyV?48GbR;1*s>wsSRi1%Zivd`#+T{Aib6-rf$}M8sz6v
zb6ERbr-SniO2wbOv!M4)nb}6UVzoVZEh5kQWh_5x4rYy3<sHrHJLqL+DcLT5`t$L@
z5_J8#H;PWO1GW@oId1Y>c!871NeaM(_p=4(kbS6U#x<*k8Wg^KHs2ttCz<+pBxQ$Z
zQMv;kVm5_fF_vH`Mzrq$Y&6u?j6~f<juy`C^I0O`4mfXK0lrRY*VoeJX&k$9aL;Hl
zlp63sf~-1z_419)A8^j|LeQSmK&T8R7nA=Ki3^H;YaeL&hF6>tIV0Yg)Nw7JysIN_
z-_n*K_v1c&D}-1{NbBwS2h#m1y0a5RiEcYil+58$8IDh49bPnzE7R8In6P%V{2IZU
z7#clr=V4<zT-gP2u}DD>yyrRe@oXNqbqo^^LvlLE?%8XaI&N(Np90-psU}7kqmbWk
zZ;YBwJNnNs<m6GqjV2(cCX2e+#tSOgIGm~J&Djknhy!e`&p)NTq>$~d!mx9oMGyT(
znaBoj0d}gpQ^aRr?6nW)$4god*`@Uh2e+YpS@0(Mw{|z|6ko3NbTvDiCu3YO+)egL
z>uW(^ahKFj>iJ-JF!^KhKQyPTznJa;xyHYwxJgr16&Wid_9)-%*mEwo{B_|M9t@S1
zf@T@q?b2Qgl!~_(Roe;fdK)y|XG0;ls;ZbT)w-aOVttk#daQcY7$cpY496H*`m@+L
zeP#$&yRbBjFWv}B)|5-1v=(66M_;V1SWv6MHnO}}1=vby&9l+gaP?|pXwp0AFDe#L
z&MRJ^*qX6wgxhA_`*o=LGZ>G_NTX%AKHPz4bO^R72ZYK}ale3lffDgM8H!Wrw{B7A
z{?c_|dh2J*y<H{`M3l!HEtOc{;H{lJx}(C|*lvPQ+RAcV`>8b04c37OmqUw;#;G<*
z@nz@dV`;7&^$)e!B}cd5tl<nF(??uM#|`*5pIKe!DEUl5-&9M=s_3Yn@-P(czyPQ~
zTU3I3bk%z<*w;9V(oQvt^2H`kBAW;=2oA<L1<qVIK(Z{Hk@5&E&_2mS+|}+?g@FBu
zK+e=OWg<)e?RO;llNw00>0{g(Q>5_7H^@bEJi7;fQ4B$NGZerH#Ae1#8WDTH`iB&)
zC6Et3BYY#mcJxh&)b2C^{aLq~psFN)Q1SucCaBaBUr%5PYX{~-q{KGEh)*;n;?75k
z=hq%i^I}rd;z-#YyI`8-OfMpWz5kgJE3<X7ptj0dmPk5UrEf%nVD%<Giiw4wVh!K0
zFjy-VAnpOFJIDm=jqqahP0Wam<9qv4UMIazx8J<YJz>I!3ean6=UZi!BxG7i(YBk?
z02HM7wS0)Wni{dWbQMRtd-A)_Az!t>F;IwWf~!*)-Az4}yryNkz&9)w>ElA80Oc`6
zHo#9H!Y3*Qx9n@Jn)!w6G^hb;e_n8zpIyXCN`JFkPc)^Q?2MsLNFhMgrcZI-<#1ne
zjH;KFf?4eAT9<t<iUSC5BsF-<$q+H@@j%Yk>mQZ}ZfHLGA#d%s;SZK4p0FwZT2S^{
zQ2BG1xJsbK6?yrHTjJi|5C0u=!|r!?*4FL%y%3q#(d+e>b_2I9!*iI!30}42Ia0bq
zUf`Z?LGSEvtz8s``Tg5o_CP(FbR0X$FlE0yCnB7su<mcL>DPmI2=yOg^*2#cY9o`X
z;NY-3VBHZjnVcGS){GZ98{e+l<X|f4%S*+x526SE1mJ%6M<Nt*!}czEQf{?H1U0br
z^Y7cXNxH@=Ve^#j3H@BPU>q~O$u6pEcgd0CrnIsWffN1MbCZDH<7c^hv+Z0Ucf0{w
zSzi^qKuUHD9Dgp0EAGg@@$zr32dQx>N=ws`MESEsmzgT2&L;?MSTo&ky&!-JR3g~1
zPGTt515X)wr+Bx(G9lWd;@Y3^Vl}50Wb&6-Tiy;HPS0drF`rC}qYq22K4)G#AoD0X
zYw$E+Bz@Zr^50MAwu@$?%f9$r4WHH?*2|67&FXFhXBrVFGmg)6?h3^-1?t;UzH0*I
zNVf9wQLNLnG2@q>6CGm>&y|lC`iCFfYd}9i%+xkl^5oBJ?<;aneCfcHqJh7Yl5uLS
z9Fx-(kMdcNyZejXh22N{mCw_rX1O!cOE&3>e(ZH81PR95wQC37En4O{w;{3q9n1<A
zPC{;HRD3#A!@Lk)+k!~onQ0|-U%#uGd$&L?ZhNC&R)V(mb`NhUqrYysoMQ;Z)sq!y
zW_WwV!+jO*nGT8-Hx_JVmFK^=>t&;p)D%&Z%Nw$gSPa!nz8Slh7=ko2am)XARwOWw
zpsz0~K!s{(dM$NB=(A=kkp>T(*yU6<_dwIx>cH4+LWl282hXa6-EUq>R3t?G2623<
z*RwTN%-fgBmD{fu*ejNn)1@KG?Sg<bw3hQ~jCP9_dLp#J9Fi#nX3wGv<cLwQ;8x0`
zA<%pA%E0S;<5FJhw8e#?n&IA5g19Fv!v7YC%Gxqd<x1=+hht1t>*8z3hYtkQJQjB6
zQ|x>wA=o$=O)+nLmgTXW3<g>_6diA;b4EY{*i<HxX2Q~PA|R-tJ=V1~4KO3h7H~CG
ztNFL#J=a@4Q5K7Ogvj-+3N_IJUjc}x34}a7@bDE3!)Kj4s7ME<v)`yP${V~G_J@6l
zp{&i)CGxx1)X`lnwc}#g;g<(rA1#7Ez8@J}tuMD3bB{Wifbe~LWT0zYNjgb_qn|+G
z2TCDZw1rV|wPx@~-H8<4^MGxfR0aLq+_k+{JT<mckxWLsw*J%G%YH0>*R%6dO2EMg
z@6g?M3rpbnfB@hOdUeb9<OD{Zt&T^7p>6=~I?OIA3@BWAGmTwiQ{x5Cqq<8c10L!P
zd@Qk^BseTX%$Q7^s}5n%HB|)gKx}H$d8Sb$bBnq9-AglT2dGR2(+I;_fL|R4p$odJ
zllfb0NqI)7=^z~qAm1V{(PkpxXsQ#4*NH9yYZ`Vf@)?#ueGgtCmGGY|9U#v|hRdg-
zQ%0#cGIfXCd{Y)JB~qykO;KPvHu|5Ck&(Hn%DF~cct@}j+87xhs2ew;fLm5#2+mb|
z8{9e*YI(u|gt|{x1G+U=DA3y)9s2w7@cvQ($ZJIA)x$e~5_3L<r=v~@?aZ+642@!3
z&nTpp8p^rR@IEsq`uhzfD&i>KFV~ASci8W}jF&VeJoPDUy(BB>ExJpck;%;!`0AAo
zAcHgcnT8%OX&UW_n|%{2B|<6Wp2MMGvd5`T2KKv;ltt_~H+w00x6+SlAD`{K4!9zx
z*1?EpQ%Lwiik){3n{-+YNrT;fH_niD_Ng9|58@m8RsKFVF!6pk@qxa{BH-&8tsim0
zdAQ(GyC^9ane7_KW*#^vMIoeQdpJqmPp%%px3GIftbwESu#+vPyI*YTuJ6+4`z{s?
zpkv~0x4c_PFH`-tqafw5)>4AuQ78SkZ!$8}INLK;Egr;2tS18hEO5=t;QDmZ-qu?I
zG+=DN`nR72Xto{{bJp||`k}-2G;5#xg8E~xgz22)^_Z;=K|4@(E&5J)SY2of=olcw
z5)@L)_Ntcm!*5nEy0M9v0`S33;pO4T<mv%0Rx6?c2H~TA%zOO^T2$@D<Cut3{ae}|
zAT@Uzc>N;>4(Z+<j5j2DQ*r;U|6a;YfP1jST$I3mSn3aNn!?<=B-XkzG?hQH;@bu%
zmFYDDgbC%Wt{6LBrs%88L}deF9pse}dmIp4lmp@Tir9q)JKESa=h>19p_0>u#e-vE
zXCU(6gAvu~I7Cw(xd%0e59MNLw^U37ZDbsBrj%eDCexw8a3G`nTcXVNL6{B7Hj@i&
zbVB{;ApEtHk76q08DJ48dSxd$C(;$K6=FpU<~l9pVoT9arW^Vu{%Bcn4`eIpkOVC|
z$)AKYG_`ypM{0@BUb3^9lqi_c?ONH|4UJMJWDowMVjacycX7}9g={O7swOB+{;+?;
zjBo!9?+nd)ie#x5IbFW-zBOo0c4q@9wGVt5;pNt`=-~Zgcw#*`m($6ibxtZ`H=e=}
zF#GZ~5$%AUn};8U#tRem0J(JTR}<qii}wxmUzVwVIg2$uE2;GN{hhT&GE1i;_fi(_
z9KKXP)ds1Q)XnUhr?uXO-HbKE%5f%+-C>d4vR(dgK2ML~lZsPhayJ2h1%sD4FVst|
zKF)+@`iNzLRjg4=K8@**0=5cE>%?FDc({I^+g9USk<8$&^qD~@%W0i4b|yMG*p4`N
zh}I!ltTRI8Ex$+@V{02Br%xq#O?UlhO{r8WsaZnZCZq0MK9%AXU%MDLT;3=0A9(BV
z9VxxxJd7jo$hw3q;3o?yBLmA=azBUrd9>-<_ANs0n3?-Ic*6&ytb@H~?0E(*d>T5n
z-HiH2jsDf6uWhID%#n>SzOqrFCPDfUcu5QPd?<(=w6pv1BE#nsxS{n!UnC9qAha1<
z;3cpZ9A-e$+Y)%b;w@!!YRA9p%Kf9IHGGg^{+p`mh;q8i7}&e@V3EQaMsItEMS&=X
plT@$;k0WcB_jb;cn%_Idz4HO$QU*abf4}+wi?e96N>fbq{{i|W0@(ln

literal 0
HcmV?d00001

diff --git a/js/css/smoothness/images/ui-icons_2e83ff_256x240.png b/js/css/smoothness/images/ui-icons_2e83ff_256x240.png
new file mode 100644
index 0000000000000000000000000000000000000000..09d1cdc856c292c4ab6dd818c7543ac0828bd616
GIT binary patch
literal 4369
zcmd^?`8O2)_s3@pGmLE*`#M>&Z`mr_kcu#tBo!IbqU=l7VaSrbQrTh%5m}S08Obh0
zGL{*mi8RK}U~J#s@6Y%1S9~7lb?$xLU+y{go_o*h`AW1wUF3v{Kmh;%r@5J_9RL9Q
zdj+hqg8o{9`K7(TZrR4t{=9O`!T-(~c=yEWZ{eswJJe->5bP8)t4;f(Y*i_HU*sLM
z2=7-8guZ}@*(HhVC)Mqg<Fpc@JMZ@m_nbBrYio+A_)wDiw(`CFAx>r$3T8?#a(hu&
z?Kzuw!O%PM>AicSW`_U(cbvJYv3<y^W#?44=>{HfpIP~Q>@$^c588E$vv)V2c|Mr%
zuFO$+I~Hg@u}wPm17n%}j1Y+Pbu!bt?iPkjGAo7>9eRN0FZz3X2_QZj+V!}+*8oBQ
z_=iI^_TCA;Ea2tPmRNOeX3+VM>KL;o1(h`c@`6Ah`vdH<&+$yTg)jGWW<DoLyP@F%
z1a?(b6!zkLvMy_3J2VHTkjbIwpclDibDQ*&(<G#ZS8)TbY#<XBUji}ZBYc9y!j?g=
zCB)t#7=W%zwQbX@pwY(37C?J!LzE!l%t|=o`O|-??P**$^X>72T}6J`kUAv?2CgyV
zrs0y@Fpvpj@kWVE0TzL@Cy#qHn~kgensb{hIm6J&I8hkoNHOz6o1QQ3QM4NZyu?;=
zLd>`wPT*uGr+6vAxYv3k8{gMDR>tO}UavDKzzyi6hvbuP=XQ4Y|A)r4#B$U(q7{1Z
z0iLeSjo3;T*<wqybAvRAA?2T+&Y9txKIfi5?<yZ57FH|IAnl`(9<7HXJZ{X1{(kDN
z(Vkq6C${(+AkP^!;sw>diS*me%4|!s23l@>R}rn@#Zc{<%CFt;?gd5S<)b=8Yz32U
zBBLprntW3RE3f|uNX5Aw|I(IlJjW-Byd?QFFRk%hLU}O*YyYQel}WcXilLMJp9cB4
z)E?D+*Y4zai&XY!>niMfTW-2pp-^KFT93%Leig@uoQGPYRCva-`w#orm`is`p8b4s
zxD462;f<sb?0~I>*^XO$=3by=VzN9i@xxr<1w=pcxl!$!fjWt|fYmq1@@badT?v`d
zIi$|e$Ji}FXsiVYf)?pN1R0LBw;+)B5aUJj2fP+=m;=_Eho84g%Jq#@MLPSQEX*@T
z6sZb)m?)zby>{j1)(;rRML|gKSs+9jorf-XhQJ2Jyt5Cqc*`S3iX@A5C3jvgAns|4
z*|)YQ%Kmsj+YZ53;nMqh|AFvehUV-9R;1ZZ;w5r9l}8hjSw@#k;>)$P*r%)=Extyu
zB!$Kd-F?*50aJ2;TNTR-fc8B{KAq3!vW{g$LlGPfGW+%#CXU<Nz-K_W*D6U7Mo7f>
zJDcMsvyT2`x~v>>w8@yssoA`KuIZ98CLU{Ia%*nW3G4t}@ApsbC@o^WCqL>OXx>Y^
zSuVWEQ;3=A=@RxCnt0>G@#(VWBQ`0$qTwA#e>SX{_N~JWGsBxFHCw|5<IbE^2zQft
z+V(~OSkf)|lX5W_7EJt<@((Sk8!u;jnOqZIk=&$6YYOz$F?*zMPTU2T+x|MROAklN
z%9!TpTpdzgi=@hTRw^Ahcil~@&hwEFY;|?)K#dO5Scx8UFD*{3dV-!oOM#&cE&Q2n
zoW9TnYFwBbCzoyprD(`zOk49a>|?CzDi>92F-^=b*8sMXnhUJdb!>yGD2nhN@{582
zRPcxuDzs&;8De)>_J19z{0xppXQop#T_5ejGCKv@l>$O#DA-@X{y_1B-AsiU)H}DR
z3xDZ8G`amV_WmA&8!W=@jgm|%bnw<n8Q)drY3eYBD{f~yuK!dV>H%qkg(@J$hLaSV
z<b?8z3vpCe_J&8AY!c(!FqUw-kI7@s<dgb*ThA?Tu$O)zp>C-rXIFMM%y<|Gb)o?j
zpe-`dJ*N5tC-iH)d0CgLdBsw*C!ST9hY1EkI|Y(&=p&dH&q;a&7HXa5#_wtMsenQL
zcpyhwx)Ppw@XmVz?P)DI#^ee1oC!i`>>Jq1ESk-OuQ(Pbv=s{A0AjM@rw#FaU;RUh
z*At0{U*NtGVY_-JcuG$?zuuf%ZBTWxKU2yf?iN#-MRWs>A*2;p0G1Tp3d29u5RbnY
zDOON-G|PidOOGeybnbzu7UVv71l!<qLl#EcbYWe!wG5tcyhhuMWP&yr`zRz8F_ozM
zhJ``fFaR+RaQ$HxV1JAUt!HeCZ<^dcnDIL8eYWG)9j+;3USxo7a|iDliv%vqQj)sU
zoDLu%#I6^B)l^mSEoEz1>b=w7eU5l*{EdKuoKu`#LZ}|fnUr-+lSST9(MTT`0tqOG
z#<K!`0^vSUvDg(~Yn7}4&a+I75c`V)D|~FimXdl~J-Q;PJw#_TZAuc(RAcfC`&|}0
zkZV}8q8Q9<U*ERkYb6H2y_HbsHY0*XF((5#-fVna8M>+Q_=lXe-=;rE4u8s~;%i~~
z8v&&+VPeXG=2zw9B5sR$e?R(n%nf?p-(BCZ8}x!_-9T+LT;2=Zu?Wv)j3#>35$6dR
z4*7xmI)#06qjh#sXvX(%`#D1mD8fn1G~I;l%Dk{pw)}>_{+3^Fv_q)>2#de5qGCId
zPz?ix-3954nM&u@vaw{o%-#HU%_bLJMO#@enR^&B{3ihWdoU6%pBJ`o<w?5T9ud^Y
zI>>im+b-c6r-;c{vd0Z_)`75$jApy2?!9G4_FGa)iZ~9`6VELiYM+n!-mUfvfm{jt
zC?!1=%pxJhF>vyQ47Q}R;O48pxgMs)rz$SbM&jkp<6X$r4DHWg>ZnGB-$r2o1*nL#
zW0^*itcRY_^Uv^XgQP>W#>KQgM~l{;S(GkVW@&vld^AhWzG^m|9#0#USbM>^en{k2
za8~DTL`(Q~=ofsL&Fc`!L6r~qTnnGo8r98<(aG*<0%aNEr!!BIyY>VV82k<Gsoyn#
zvIJW>xhR%d>V(lN&#BId#urK_i~Pe6?>C~J!pU_lRon#&S_cXoQv;poG8FK4atc<p
zjeUBy@^Jw(V((z7r>N)npz1~X%p6x{M(Gw!!H=!}lmO0Xr*8ewyH(Q+>oy`fxQkxJ
zzzB$)%*xM4s_2(O>)T-QXhwP|&DZam#{O+47q|WKfz_ZL-MypRN~o{fE*I#6@eM?I
zs%f-6{Lz6j7rB#U$%O$~TIT!j?|Ip1CpSmb=JA9qCY3-mQf|fVCxswPjok|VofUEP
zW5^pTd5B;wRkyW%1a;nYHB$ef6Pv8^);`m0jv6p72iNJl+sVBqZugsq6cq_pyNREi
z>GN!h6ZQ6`aOMr_2KI@j=XR@$aJj(2jcpY?>f=2kMV@di5W7Swj?ug10zRe}F1nR*
ztMm6+T^)LJe^SzGgSxahQajq0h7<FIM)==mqOi0sP&ku%D`037mHLEQ;?YBXRgcBJ
zg;YBqQV1p<N>#|8oMV0>D~*N}jl?9_X`ka42R4@rryDc3o(c$R?1*!1O9zleSOczw
zYPS3~xbJ$~C(3+D7Z<s)U8yQk=*tiGGzJrAhaSC#qIs?Jh81YQ47QuqhWW!*VSm_0
z=t^45-NL{7OdQ=+(>krfjs_lneY^zv^kHmxt)aqZ!aeGABHZ`gvA&K`72z}ihI$Ht
z9V&)wQy0g@R9irwbf!{uE&_J2l9jXz^Vj#=qA77*3Pd9OjrE_tKDHADd!AjFQv(ji
zct-BMUt9()1Ox!dsI_h1(^F_U)_QJrx|%+y`zWWlD4=Nd?JQ=URh0*{fb1!o4tS(H
z^r_T(8t1SAHf1oduG+X^*EC_kL(!QnXL6Hp);449yO&1xE>MXGqT)t10lzvALl<?{
zrVF-Nlk*Lcvq9SGK;9)Dyv<a=@k|#mT05o~q+!s##A{Fr@jZNvP>lX;;Q)RiJX$dm
zlR8ep5-GdHmRm9?N#QCjNUA);vC03Gw6yds6^?c4;(MH>;O5xmQ2nGK3Dmk8i*v5t
z-{jJsQq30%z}0`g7SN-yN`l-`@6<bxgAJDPgWtfjt{vU|la%{8JOg<~aF@)sJ2H-T
zJtv=5W+3ZEjrJj*8XPnbuZ$;ozuG9)*k!x_DnY^o_splP?Xrx3x5yraES;Cf|J5r4
zKm=v+F$_FjQPn%(xB916O9fMjy+<RXM2|CFbj)`jN%Oc#F19k_UX>rkJ|V|>18`MV
zwUeH}DxWw&h+A+Dn|4|YNr&EfKS`Hz_NkeW3*sI5Rq-J&FzG=!{-K`n65#7O%^&f>
z`PkqxyC_K)>781~7H${^Nj{`>XEa&OPqqQhySR5%w2{5+sEakXXHazJp6~LP2QKDx
zpkvZrkDOa+A4BbqqX6ls&O)5-Q7`qkZ_?6~c-wQ9tseNtET;nhEOL^`*naKwcMX;R
zbto&a;oTR0s;vjfj3wigUg)Sj)!OHQfZoJwAsWYI1A4ntz>X=W4s|y?tUk1r=>#Ct
zf+?hq^>rQ3$KNboG$UhCdEmp{qAR13DK$f0ES7kAG~7q+g!jfVq`1b5+c62N^0%~o
zKw91o@Wv;0EW*7fINAX3O~L-V{`;xB0q()#^HKZ<VQD|Ssq*t15*X{M&@{ft%5R$-
z6owZW2o=m-TQzdLLef(vN96$G9ORVX`|MzBlmqVMs_3OgJL<%B=eg2K!P2uuCBqY8
z=fHBH!!ecFczAO@u@^ZX9m+}9YOS0K+RQxSNG(M>OlLrXVL*Dtw<PJE!!R49Z5AiW
z@RZu|VfY&-AB8mfbHEZ%<mzrpZlr6pW{4#|nDeZli!Dhng=XNJ^rLmrJ&?7uQ-W#5
zN$xbbvAOj#F;Y`(?y{ZDw0Pl^PWS5eUTBmOE@${373(N^u!ns<C}>-$SUp8*_J{r(
zW`6r`cz0yZQ#f0#*y+m64{bs7GP|2V$phf42rswJB?s@9qf;Bfc^pm-ZS#^5dkG{u
zzv;l&B$NYcegSqAnjnPN1?17VUQbPummcWry((85IFB(pFQNGN{hhN$Fv?~l_fr?|
z9=%dK(+;kZ(8=mwptjwC-ikBD$Z{l2++~*8wq5ynF<+PNlZI7ba5V#fg~L}kE;UH5
zJ;{P(`G{tNl&z5rUiH~e{I>GT8~9&*(J;Myx9z5P!db!F8RTII^I7c)HU=ss*bYB`
zgwiIMZ_q>KEC$4lFm+Afvu6^$X1jm1rB*4H)-EIO5Rvz<oJsXcs9TC3t>_p24?OkJ
zovD4{-1KA6*oL?a;3qR7GZRB!cE5oAdA#M@{w+fGgsJ-lSmQ^-?8E&Q%tbmjd=@gZ
z(}Mg*jsDf6Z)|7s%@9pc-tuw5W&zqUXjv2bVkC%-X?O3F72W4EsIl#1e<T(7Fti0z
z=*7Pu9Hvju-R6I>>Mdz=X4k*_>VxCu_2?jjg16N*5fwC-36OW&;Sz}@jMn}hgJdEd
pO;bST+>R{W-aENZYk%(=^(_R5N$LmL{Qc?!%+I4tt4z=_{|902Wu5>4

literal 0
HcmV?d00001

diff --git a/js/css/smoothness/images/ui-icons_454545_256x240.png b/js/css/smoothness/images/ui-icons_454545_256x240.png
new file mode 100644
index 0000000000000000000000000000000000000000..59bd45b907c4fd965697774ce8c5fc6b2fd9c105
GIT binary patch
literal 4369
zcmd^?`8O2)_s3^p#%>t<I$5%B*(%$RifAlJDl()+*_W)tj4atJl`V!4ku}Mhk*o=k
zjAh1XB8{;#7~8k^`}6($6`#j>oqJ#RmwV2==ic*rz7lOw=eaq=H~;_ux21)-Jpcgw
zdj+hrf&W^f<%Qk9Zpqf#;jH;N^Z%VA?R|9mZ{esQd(<U>2<!w4n{E5UY;_q2Kjdw+
z82?u;grSg`#RaKr$2IL$<8%^mo%i~NdQO^4v^7Omye~<8Q~6Hu057+~0Rg2Kxj!$g
z_L|8%XY3R8<nG-Oivs|FH_p=B)FJfcl1r-lR0AKR&!T)T_NiKgC;gh$={p-wz3z|u
zROYC?84a==-y$FRL$ECVCJ4mYI=QJG4=ZDk+_JG$hXLT(^ZwpmB3Qtdel0HV6@VBB
z`QccNy?aa`3wSB4C03J{1$_2{CdQ&kNo`e#GA|Uwc^|vvdo*2c<;VMsMZj6wesHJ&
zfn8A-hdn==tj|{1&XEIC%H&dZG>F=?y+!`XZ5CR?ue=UdHIfUDFM*m15I;g=VN2jw
zQW9?wOhDI#+P0|`@JQoC3!pu=AzGMtYB>V&?8(2>_B5_p`1Sb1t{^|J%bZYv09RS?
zQ*dcs7}$)taJ@vX0E<96P{ur)Eygr{&ALyNoMP%_94m}=qFVT)&CeG1DBBMLUSKP^
zp%%Q3$MEtKll)X*+$)3O_3x`4%cHY0uhy7U;5x^Ir}X1)mv&B%|A)@A$a>f}tP{5X
z9-gkti`YyT+hk9)cZW7fAQhjT%$XLLI^&VR=qev36;`WGBOP!^&(?!sK6jSH0Dnz4
zoEMMNu}y&n=rd-GWI?rGBI8!GD*NJ$k&e5-6+~-9F^6tV<=5`FcY~t{iqRcncEU+F
zkT~jww!oy(@~b~WGI8!lzjURX&IpJjFGxShOKUunP+rW$I{c|x0qM6!Gxf6n(;$D>
z+QYi<x}98akg5UfU4?yb%FQ<_lxiHnYmxajFXIG|a~w7(HNLUz{)0YtmeTE#r#~Mb
zEJ4?=`ylB=dthr}w$rA7r8hX4l&lC$d_P-w4$+T%W>ULqq)Fy4VDk&Mev)NyM@nvF
z7O6M*A$C)kBi0HGMT_+xfQ^USTM)>*h_Rx%eSRxA%n|FuC&=F=<MvvnBAs(r9_AGz
zj#LLeNR-pStzN#d`2)svUKrYY8VHp|=b;OpBCx?RZykcH-tb9~qbL$x$(`2<NV~cc
z4z2Bp@;~m=w?YY3`1HQse<0qUrn@*pl<9U81gTtZ)sci`){#ZC_;MW`&Pf|5tFMu)
zNntUAcOEu%z*Jn}7mF2zz<XZ9AJ69V*u*k%90)E)xjhFhGpDUB;8URcE48FZ6C~pM
z?Ts<B8K(dWLtX(n(qsy9ZnmtSZMvX}iN~6m-JIQUhB$Jp^#`POloqkwRUB~%vh1bb
zC>Pz}E5uCqbcy;7j=%Qh`glqEA-jx0(a<)uKO5Fe|JLD-ndZ-vnW<ri@n%jaMYzj7
zX?raMEa{g1Nj)C|3n6_>`G=O&^%pa}Ah(2<WOo_zsuE*m)B)+26L-$_R)8Mt!h_+m
zGSDo8r$fejfn53aqFM*uLw|#&_iQ*6TU{OdrA7}lT4KP`OOMm29%p3GQ($Ogs{j^T
z=g$nG8dsLaiNzbiDO&OwQ#OK3hnS0Xl?&>%m?oANs{lJ`?RhrZ8n!`Q97TKw{YAw9
zD)=M{mD(~_jj`LTd%q6Veum)Cnd!7lw}(5h%ub<pmB27LD)tw!KS(lRCsSz}_0~Q5
z++Vs6%x?XRy|>Hcg^2O`prn%u9es3C#&%TsnmSD3%3Ik^Yd@6-d%(I7kqT(B@dVX2
zIidXgd>qY<v*DpOyVTegj5UJcYxamc`M9CL<}>T-oTZ=1sGI7^*_E9Q)1F2mooE0R
zXopPnh^c<h&G9wfvaCzpvSP8>i@+wz2ZDjo&Owyxh6t90Gt!<xg*qpB3A;LdY7lS$
z0mzk>u0miLxc!bue^LvHF?)<XV}=kJ{RX*cfn)a+D2~O8Y=!~2fS9cKDPuz4*MQLC
zwM5dvXSiQv_>O@Yf!dQUXfW$u8(f_n07^N)-vpIe;TrHv5uKm{h_v`-IN^zwWc>Lk
ziGsSr89sDcdOR_wa~DjrqV&Nd*$18(vohPJ3hSzE<Osy0Rr*F0h@-*OS1G9oRHEq@
z9?sE*0Z4d4>JPF2d!u}415<NC)5PBXwD(D$(;YW&^GurZBLnrDJNQ>wrSMtS(zNa7
zbO0G4ajgKNp{`D7DO<(T?w<Vad&plCU;-58p5*QlLG@5irL1Y2E%1+sNBO!E$v_1(
zfer8z2=|SS#V-5VsAYZOJ`HMwI-D0;7GM{(mNwYz(HBeYA-SOGlhSZdjoDM|cX{lW
zT;rN$<q#H!`nF}iixL3*8!1g*3lc;eb3BOa_4<e9!5dnSekj=ZZv=o92q$bSz803h
z7E<{fE}<G^c|}1X@|J|p_rrh3+^FZ>owarQ0dIKLb<}#prQM)ytB73YNTPQgX^xoT
zm>;yKSJ*c@QfD8HW`6&+mowOaA|A&~G0fO6&xwj;E3O9^Zu<A)9K!;JSp!U!mD@?g
zY8W{D4p?v0TsF6soi+1C?#8#Pwz=pk`tnlA?1Px0KY`fa15t3ryzsq?UgTTtk-?2@
z0|NVY?NV-W%9wl=2mAnc9T>~ZXts~;-d%FyyeXrijORi<_S(dw_5@h&-fTY?#FJo%
zQZZ1&ED%$if+n8JVM{s-ZoK@P>p@z4s`AoI6hYxE!Ie_Y)cpjZjc8@~uNMYVfy#J$
z)+sdEX7DK^{}kUAST<B=OhV@qPQ3Qif^5MOYwO#g!x>8U6^p6#c>0Lc>T~9`0}`*2
zizaU)TFS4(u;BenUWZr?s{D)Z)rc9L5&gUvz3iSQaF#J)D)Ts{YgagdDcI1S`dtes
zPqb4|h-RIkjhnpmn(Q2Je6Di5C?MkCUL)!WoKn|P#al41v#-Q8`K1$Gh64UhPQj|T
zaZb%tJ}O{A?Cvl26!jeKS3OUkp5@8RDBYwh`Loxb5W<^m*R37+v}#*m-G{{ocF-#r
z7!k3ZS^4Qu9sNRNZ3`laW2TqV{rs<L?cD;oy6=sBSqa|O-#xsgg8I7UdX6C+-#}8N
znd2Pb5BF7hD4k?$9t_ypIzM1<*V|S%xjC{nk1uo~sRXK(ax-o(DHLID>R#~gtVp6C
zL0?}~gbLTv^jqtPQD@Cpq6{B6v&*Y)?tx}<G=OnA_)fo_PTo~X``>)z=qQNB4Z_59
zpI2L)xQ`!|J8wWgs82jSw_8(;#}y7~Y^&hY9P1G)@`CGtIi*tZ%-%&;$PuG(!M%)E
zQ?T#imBH8dCZxUBX^RWPwIh9LcnL3#$befQDr@UJl{=}o0){qIt52vU9X=3L_gvVW
zPqp_YhhpM6XiE7Lvn-G0Wzo>0;g|$_-7|ucz~*w%bW@hr6M?~v9dT}L=>UotTj13&
z?Uvt0_uOvzMq4iG<D=HMD%Hgb{RAOirV!H1;KNrOXnvc#AtgF6gZ)OeasJT7@IUOs
z3>6)gZqeU;W=<aJX`L6t55GM4`e+gS@%`w~YD0zXxJUHKM7ZDEBSSrtD&k2Z4D|#G
zJ5UbYqAiR`sJDPW>P@EVod;}Vr7P*@=C19v;iz$4N+c5ewauTtKK5e;yIx(FQUec0
z`G)VlTUY|m2L=KusMRgMlapu#wt8MohK3=y`!J`tD6nYd%?xIZO`Q)skL)R%3Vf(P
z__5Sx3h%fKF=sNdZo2p(w=_|}1M%ri7fO?8))sU1ySG;M4p4;zrr}4l0lzvA!WQ&a
zrwX>%lJkv`Gr_u=K>kHOg6(AB(R3FOryElY)-vi|<TomX`W?JNDC0g^IYOR`j#Ny?
zq>fRsB<c>S<)$1;TC_?BnyScjY6>_ZD=T|bjcbjz@D6V+yfHd4SU+J*2Dh%n;$5ou
zHh6R=)$>IH@%5js2KH#JkfFCVI}P>~U;|}>kk|06tA}^~B;|gJ$UvSF-l4GX43DAR
z&M2mp8OgiTaK4li0|Q2qmGNYsm+Qq^JM8yfCP<m#pZb=yU6K>>5!<CwWb^U_zj|i?
zNZ>31rjh4Mnq~+5X8+_$sc<T(_i%WG<aw%#f%)z$Z5cPg!(K+(t@5WjB;>fP1Fp!c
zcQO*#6cfJ?<K|t$r<_+q(>ZRxn_$Se_|}Xo1oIF7s(7CllypCW@W8-y5%Bel_K*0G
zd~8UWeYCWz>~^hF3ond|tQcClJ(8^9FW&&?U)a4O-pE;Y*u|FHGax>F*Kg_beOF5c
z&?#xRN5Q?ckEwCnNr-${XC=w-te5%QH(6O~yxke=R!_ns))PU07Pu)CY`<>$+XicZ
zCI=g^;q7NZnw=-vf;HoWLD+}`&Bph>kiqyX5jxjI1A41d$R3nahq@CHULV#9ItIwJ
z0)^JGy{hB;@SD|}Zel8~2z;<pba^ByrDo8Z)taD)hWlz9^I1QF7T0+5IwfJ%{+6}}
zNXy#>UjN96MR@dt;EV`9RP4X&zn8ib=n*107cICSp7z6srZ~4Qg|Vp$OB0By{I<bG
zWqMP99KyM)D<)2t$p)&F=o~<tqk;;2j}wB8cElfF5x>xAPaD7HGFw_HTza~wWN1A6
z3`7BZFse2a4{y#V^&;nRVcZOz*2>A?jm$%?)KawLR0cEz24qxxOOo9_2)9MrWpSg7
zPiPz+M7(zPRZ3$#11ti?uI!}bM!Dg%L#+uR+^2<I?Z^fxbR)l{AFT@>L2RX+QlMpL
zg_DrR=GIT7C~b+^OZK)?l7*9c-78zWVbLo1oS}bItdscuF80}guwA8c^(47DfaBjV
z^V@&JJHxYHqS+e7&X;ezZwsE2+t~n0?*m^(db@WnI{LgAnOqOa<8pRvo0E>*O&~J_
z&A)t2LOG)5=3$3n2_gi2Kpvgv)#L<a@xGzK%W{n`XE7#crIi1^zq2+7X4y>CUh2Y~
z!<QPT+96d^dRhJRw6@zEH{;AP@?1&dcUa`M?3O>A&(~-8reT$sJk0=L;m~ES3k}k%
zkF%gzzT(+nRU0IeUvuW8pq=8<I^mZ94rY+=zSZ<rG%I8)gE9nVIjuX+&P1hz*c0Xs
zQMyFSbw-$i)fY(<OkES?^r=MeneHELsa49QwM)p`B;>uzr&7HW>K5ZiD*8qL17AI^
zGqo>*mvIChU6+&t{A3|!W?~pi9_O$>k2d|<zeUO)Gxs<LYy4oGeX!SpInTgG%s{8N
zTaf>#(Z721wcT{S1)_<AzkE!%S%`iFUee}xJ{-&r+S&bhk>UFZ+}QS^KZ*u?5Y~bz
z^cLI;2{$C_ZwWqM@sYMYwG+^N<^Ivq8ZOwV;7xT+WCh)I9PHC}ut;VNr?<buAVK8A
pDJs~K*NL^;XFK;v?e86vzWG22X~SUKzh8ZT<yn+@l^Htb{{Z&^Au9j?

literal 0
HcmV?d00001

diff --git a/js/css/smoothness/images/ui-icons_888888_256x240.png b/js/css/smoothness/images/ui-icons_888888_256x240.png
new file mode 100644
index 0000000000000000000000000000000000000000..6d02426c114be4b57aabc0a80b8a63d9e56b9eb6
GIT binary patch
literal 4369
zcmd^?`8O2)_s3^phOrG}UnfiUEn8(9QW1?MNkxXVDEpFin2{xWrLx5kBC;k~Gm<qS
zlCjL7i8RK}U~J#s@6Y%1S9~7lb?$xLU+y{go_o*h`AV=spXY*!!T<mOmxZ~R9RL9Q
zdj+hrf&W^P#f9C!Zpp^V{%mq$^8e21?ZR9CEgT(ahrR?5hM!<zvuS&nr6z6fi@J>w
z<@?HsG!Qg3zaV+-xQ3ldtad!U<6iGz_enGH*2akP_r)o1D&8p^5M)<i5Kvm7+w+1d
z&*|KAM&6N6?%o|XKL7xDVlB)}>_c8IIj6Wy*7HJo&CBLuo~nj>(63pZzO(Vv^ZuB3
zMYigjkwA;FEy|G}1jpiMj6|NTm7Uyiw=@FDE*nX<>jR!W@9XIyf%$Fd*J5*D0Z0Lm
z9}ZQxyT|x5ftNy?V>EbJz-K>bV9gs9RaXUP<^=;e?&Fqxj;6{ieR-a-@H<J_4GiWZ
zaVu(K@aJcf^w<j8VA*iR3{E8n{m4z5Ta=$%rXkgQO6v#}L)oynVyGEE=_51-z65?H
zDgGA81aw}gX`NgF4>ycA1KMKhql8GOmcx<Hp8QKqcf*>wZ?_-(3hMK^^a*(gaFvBH
ziIC!fgH4$W*NbKIaY&T?%&13``KbD@S-0`xQ%v3TV+B!;RC7O!+1a9QCA$H@3tR;k
z)SSoR7(s4)f{zM}eWgFN{(ZH5d1O}l)f$ruT!)Q&NImXyZsTzOf9TwctcSfr+M)aJ
z5otO+$jvm-P4)ykH)x|cO5xeb>?!`qGw$(>&axqLL6yoB${vsMXgL_-bz@2J_tS92
zdvZG-+vKl@K4Vr(<X8D7Fm5%eurE#<YP<1YLAHb!!E~xCzIMI68x%=Yh-w$L6-vB;
z!c#Z2_$LgPU;Po3j&(cwr6cKhhF=VILF!3vYQvfMvLYtV{!ir!NUtS|shjnm2Kl+v
z9M*o<>EL{WQt@Z+Ea-hxX0}nTSZxnpi^#Kn8Ox8FgIS|hc}KJQ4tm*HO16ui{(O9}
z1YN)GjiQt6fGq`Cj+^`zUf?8hk^(T{{cOQGWFP98am}is28A!5%{R#ENv8fCN!j69
zl<vTXm`x#Aj3pR~5$!tw8x6HJBT;veqlI((e3l5f1J0XQfUi^9^|f?)8pp02+%sAX
zr3QSEAghjFy?kTy2b}Y~5VYqs5GsSo#pFLl;)0^z+6P*`;T5Mu&WLv=bzI9Q@9K!#
zx3ne5{kTux3L#b!(t3OTfpmY0?(76nqT7xWC3Cn`hU1f1hZjxb%CxmPCafJTzecbo
zhDHzEdDz$vS9U>MEK(2z?|BY=Je$XD9mB-Kkem*(d-j^9j$2#6r$Dz?s)-TCDCGCs
z8>6Pvj{Y+YIeFA@qY22V$)awy@q!9A4rgk5b9TcC;s9Ig^G|6nDP+5=Fzg&?(L=vc
zCbGd>fSu~@6!94td+o#d@sid<c4_^>!EI<?7QBi6t=$bf#g{8RUCj>X$rx7*cawe6
z`dScJ+$HssdOjE)O#Ybs56vm-FQ$7yuJJD^Zqk%hMaIgAJ<2yb_MFQte_i;62ScT$
zpjifYyR_E=rQ+>H)pmlr-Udzg*-!|ssw(D7wJvC+Sf8bb9;;q8#z?0p!!bsd{wy|5
zpBaMHE-Ve>i#LLjHRaMLtp%9&(HCng7Sw96jVv!#0k%?F^K7&=T)mnYn)D9(i;4x5
z^NJTJwq~pv;kH@#ejTd*48~(J(r6j34|m`h9fEDj0im)~+%I5XphWymhT;_Zty|Q&
zzjPg#-ufAHZ<omf5#{klOC=UKcxxw*?x^rKwwoZ7wz3@8eku)ggLNRn<<KIdajH#H
zeA)T=Seh$G{X;Ew$<Zx1YdFKl^buFmaRdI%XI9raN<LH2H`S7|Dmv<?JPd_9FaRph
z7M0*0UG<&|_BGC;v{TKZe6h)s$R@%If`c(mfiu?)kSq&lq&xx(v`_L7ceQ&}Az*(Z
zkTW$+naI+A`yGk?qy`dg`WSb{6e&FN4RX;O&+frr6hjc+3<Yokv6*p`M#SE){vkzc
z3FL#%2;YdX9eq<GwL48ff7Y!gs4B@Hlzc$A2`aV3*Atk++JX5HDY4Bk;uB4Yxbu<X
z`L&1ByqMIqI8t`UE|_LH(~F2;?|){*%50r1sI9V=C6bO-=^K$CSiOmlVqzhvSi?6g
z4AzPTh<iZl4l)6IBfJ=W6EkAt_}>1M*Gccw?Kf|8Pnhtb0`!{N`Bqsa37J+>wC$!e
z00k+2Egzz;rbcWoUB%Jvp8W1}$XD%e3>4y;;OZ1ccT-O#uW6Ys@C}Pa`nZrNKzR(2
z4e%3)@QI4SE&E!lW`5y14QhbepBG%_XBV-O(%<aX6HVzRJ7ee*QV3AB=~LWyIoy{V
zqv~a)U>5tj)@9#|;sC-MNev!zGDHk}JdpGC`iJF#8=8-P$Xoku_=Dw%Cv3{U7L>gf
zRQ?<$t`cZ*MP5GQmbmx#!+*!zu>0MewRO9GFGS{b^m_fJ-N0?j@EqoFf>$khj+E|@
z7r3We&^tR^YZrxKe*d<YJy4G(9mh^GOxZ8bi3n#Ytos{m`t{%)Lj8wW{Y{jV+Q_6T
zI5_MMSa-xsCZ~p-HRDCj#<#0BIhacN@>22agXqCO0l44&kqCv{u)T|(lv`~PK@DvE
z{QI_TlCH5z*gR!>LO)k67{^R+vWx24U2^2ODXpwT;6y+6+$5m)_*w4WY&#do9dCeE
z)>p+Ykdhq($DhmMiaYXey!@N%L26uz($aJ!QT{B^Wu}U$^9e#5)=c+XF9@Ill?ZmM
zlNgHiz*9!vDc&uxOo;ZVxb`Q!Sk0*gnfxWzmbZh4(=%CD%qP?0=);n$&zaW_$UKV9
z8axdcN#AyZ{P)wj?V{P}vM)YY!>6@}^>U+iv$`9>nMTCPjN>z%yF&3yf%>+T@0vh4
zlC8Xa6zeo?%=o3}M8{aebLHcO{^1Ar8qiM=Gquf?Jo)q5`-+?sUpg?QXyEUpWSm+n
z$K-UyqkI<R?*3wTVfWE~<@2<uS?-MVl1;jzAA8*iL4xsi?b?BNi<UXgZAh$t2eX2O
zlaSjP6`u~(FfWAHwjdICW?Bi|*YB$4-Yt-e+urDxm7s0C-NReT=&xHY=NLk9^<)K_
z8Qvc8a9@Rcrh{U|jRjj-<@xXJdfDhCHAU3q@`fxV7DF|YZ^rH=h9J#M-17gO6$#8E
z=<ACLP@x){UQ68&`mEVXq`?Cxb~%;JJ<xQvIxsey(BZq&!Lur1_nVgz6$w$lK^&jz
z^=yq5^Y*23<@W0Z_KKzDbZLlkyC5J9t>wHLquru~o(OF)hhz$Y*|X>ZIbswnxRvr~
z2=rdOGVuD|xRlpAZE<0!X1F(%Anpl^@V^D3vbM}qxe|NI;TTiZy7(IM;R69RkA>a&
z6gwYE2sREzQ_LHmWqB+ogMk(fMaSFeoDq-!HkFB_nXt5+2ncFuk9BQL1I&oB1zZi)
zYW{6_&-Ip1l*OVRA##1ILQS;5R{-K^0wGTiJbVSi@LA^$D$;@J>^G{6@&+%4{b3(s
zC~LEHiTv(0b#zxt?YJ0r_~pUZM~mQ(??(n#>&tD%+@nq=Abj5*8R!~Ul1`G~=qFJ4
zfl|m8ZDCYgtr`4LcOpgiJYX9qRY5;DcWti~PmS$VB$E-Zt^f4)vLDOe_3XTq5^ylW
zJ9PKm!V-8sAOJXnUfuFNIf0R9tK-pNs2hO04zr620}5B(Ok>yB)Of-3sP59qfQNbm
zA4{w!2@cB;GbR(~szVrbO%(w=5S!X`o@o@x++wbN_tMPT0V<QhG{UeJ;8({%=z{L*
zWd0UgQl1fNI!H$Y$hXK#w3!Gvn(74Nb)t*FnucAAe1;`Z--B03CHyB#2gq}g;qs~I
zlu;^<Ox+<j-;_m5iBxJsQxuqvjs7QOWMpota<0)9-Vv;XHb%w=>c)*I;Fgsbf^*g0
z2Di?HTApwKq3+YwfNsqd3iP%{hyK1iyuVZc@*0tO_3+N0#GFsz>8MjeJ2UJ%L!%hi
zGYYAthH`E+ywA*u{(eJ=ia3h*%k?779rk-K<0VZAPkl;TFUbmei|$fqWO8!_zIvqt
z$ly$VrlH46nnpX~X5Yk0iBJl;=WuA4>~X4-f&K0yWf42h&0b30t@NYX$7egQ1Fp!a
zbui-D6cWCWV&|R1CY@G8(qOmWjWeX3eX7UggZPGimA}soOuQdXe4uZ#2>5zN>qlI0
z9xk}lE=tNpX1m6*nFr2EQ3xs79!^sCldDJYE$m(qYv3q7>}1R7?iZW7>$~*%zKaC|
z=$N?ME$>#+%T&MZC`dW1wUl6Z)JgyCn~V%K&i0H|iwE%$>xsZW3tTfZxIUe<xAj&4
z4Hz4+{_ST0nym-LoHhM~e(110&D!U_p#In^VLIn{J!Y#z&<>Pci@p;cRu|d=ItIwF
z1clVHy{hH?@SD|(Zfqi^0DQ1hczHN7xq85h)rzQqLHMX2^IkuK7FB!kI40s$|CY7~
zNX^{_UjN8}L%Med;|+=4RNTMozn8KT;2tb77bUPCmioh+rZBfIiM6f_P34cQ__o1G
zWqQp3VL~~pE5?qODf%iiQQ3f42YF@09tQ*$<v=*TB6gv{jy879dA6iNsN{5E@!(k4
z8HhaiU_^B~4$+iH?m^ArL%A5*Efo_%8ySb3DJ2+($#iHi9LOmDmMF7*5N3n2&E!HG
zolrkI2!HM5qnOHg23Q1&UfD^`iFCzlg;)`TxlRkY*i!V9>4v_EKUx;t1KCPCBtgqg
z@+Tn;O)a0uky_%jm+WjNB?=~VyH>V#L!*=l*@OS6SVyt_UEH&NA=?V2stHPyKkVNy
z<J*73J43UcB3bH1PM2@IZw;E0-Pr(2?E_y%c)4{fI(WYro>&jg<#cjros){#ji)dK
z%)We0L_478=HZ8-@xnwsKrWs8)x`MB;(Y`Cmu2c-&SH(vN-F(*e`l?c%+l$|y_AJJ
zhcDGnwLvN+bu;_sX|1<mH)GAPa-4}{cUWY%Y?nWr&(mZ0q~a8r+)V&r!Qf@i3-wZ~
zk29f}K4Mv56>AiePh<L{fUUyPI`J1j9<HC~w$=DnBr|v`eP$5Ka$0AMorz8kwj<6R
zqIF0X>x@u&%P$hf*xE+O=~D?_(_KGWQ!158YL-y9$*6mmPo;Rp*Dl5lm-mVM2i`h-
zM@nxv590_tvMwPD_{l=b$iOm|+|S{D9&P%zeT$GgX6Akl-tfUF>tL@Ld!B&{pN39t
zH>3Vhqkr}2Yul+jb7UiouWVGPNsxX7Ueba+9|~dz?d*QM$ng0DZfO0`7fAy?2yMm|
zcnRzUhZ&IcwgjH9cuU!w+VStYa{p*)4IgBf|E8)sqMYtB2KH_}SfsFq(c9i(Q6S3U
oBo%DI<H*|Oy`A%<=J$?q?|gu`ltGZq->*Kv;w;*%(i9W@f3_WCF#rGn

literal 0
HcmV?d00001

diff --git a/js/css/smoothness/images/ui-icons_cd0a0a_256x240.png b/js/css/smoothness/images/ui-icons_cd0a0a_256x240.png
new file mode 100644
index 0000000000000000000000000000000000000000..2ab019b73ec11a485fa09378f3a0e155194f6a5d
GIT binary patch
literal 4369
zcmd^?`8O2)_s3@pGmLE*`#M>&Z`mr_kcwz5Nh&gy7G+<u4l}Z3uT-`eLPXXiYeupr
zL^75cG?B*G8I0}g{r-GEf5qo<UgzG|{pFr>@45H9p05OJ)J0CH2owMSaGIN$+5!N;
z<11j56?ANg=9hMl-IBGX-T8hf$N$b*<htN?TsSJw7Ig(61UtpdYTfoIOI6Cw7kLLQ
z!uyQ_p)X)!c1hyKNp)N0Sgm+m$Nk>H?$f4Xt&I`oABt1nR=k%#z{{*a!Axm|t}hCz
zJg0Ln7<xxOy?1Ze>;M4Zjx{$mwhMW+<dot%S<eIRH7lEod8QKXLAzmb_U^_r&j(}P
z71=6pM*_{qw#Y|*U@Wtr5dv|(R%UX?-NKMbX4z1pT@Ud5MPE-35yWRryAhlF8bAyH
z|Fo~d-aEmU3A_^89HY+73_AZ&9b?w0pt343GcORx{s6n=b2L?E;miG;na@$uc3?0c
zfn8A*g}peRq{~{+2F->kWN;|j>qTx_-zNX!GzqEZRa}QF8_0yk6+=w<h@T)auqDuI
z39)ww2B7m&P3z<eXt-g#8PFC}A0<dUvmB0i{`6mJx*OKae7pT%*N|V<rB2C#fve2;
zNw_383}nJsxLGWdk3}HuW=1`l%tqCI&$^BmpJC{vpD2iOpqTlgP0tr~E7}eKUScaa
zA!gk6C-Ac46TB2)>}$QD^&hM4%OkT=uh$q9;5u~NL-I+NQyaVc|3l+iWI5~|(hA-G
z08i8AMr@{uY_cWTx<VSokn+z@XHW4>o^y|<ca{y23aXT+kajqvN6Wzwk1KP6zn{7b
z&XddG#3o-o<T;~SJip2}fquJ5nQd{}K+Bcy8lok<2&!FO@vZCKy`V^fd{n!LjbP#}
zB#yG7$v0uJ{Q9qeRIKaKZ*2*Ob9|!6OOj7>Qyb33mlZLvc7H2Zm~>mB7&=-1X^@|D
z&0*~i?GBE&NM(Pv&Vt^zWu_bD3e|R?wTL{cSFwD^Ij9v%g=aLY@1U2Bxn#Te*{>%D
zOOW-O-bfnJ7T8jd<*><T?gdIBCCLL5KFk(eK=dJ>8`Z2DsFQi~S$%^npJwXam5>>p
zMd}QEjM)@~##n$LXpz1Hkl|2UGXi-JF<Lmc&uamP*<-zV_<1{}T;52Pr?KzK!aSoz
zk*dIl2{LN9)vLEQf5JE}3PO6$0wL1qTy*|31U4x8on4^CTOKiT<cwHnQpb&a(yq3c
zT}xYn?9T_Ztq?*bKCQRsABYd8Xikn`MViexK_Z7!c{o0aWq8pfu1rgdeZtDY;#&ku
zVrcZh-A9e>FePXB<sx|j(4Ober}KGSRxu156v1IHvuCGa;;^*^d<JxVt&$jFghc$f
zvoUHi?chH{mz6^fHySfJHksGWHeOQ3#9>WL+-5f%!S>L#KL3>Vl0w#d^21Jn<~_7q
zWx^Xg1(>PsPGO&cu{S;(pRQ;=Vw2J<9NdQVWx<+g-`ia=Q@puS)75M+?u>DTa95e9
zt#1T?#a)uWC>Mia!K6>g|InPW{&Kp9$tC_3*;R_Xsz6^Eu|xW1$6j#0?XLs7^l+%O
zlxddE)h^|=K(2UqS*0ECuDe0ic|H_^t*VOoTCKx0Qmn_^LyJ|b8l$Jvl3{2=3x8&7
z$1ik&YG>w#@x@y~$r`fhlUDo;yXecc6$`30m`3K8s{k8G&3RVp8n#|l6h(Xw`Axw9
z%6Y^J6k0P@4YAuSd%q7=eg)&u8EMoEmq$CWj1GY|rGQWw3ida!FHk&wCqrQh_0Bcw
z!ZBS3CbxgZ+}~wzgGIQ#QId%T_TE~_qdUqxjqS#8#jPxdwO@(@-5_nSP&uT?aGYYD
z6km36K9=gjUjImwO=5Hl#u85VF?r0HbW)#h^SR|s_L47Tl$&Z&Rz*ksl!t*(2O2;D
z+8`6$qpLn}LchhCmv*X}moGMX5?F<Km|!5ZW8ln9eFXEuIZ2Pe0<F{Bgk7y(6)?!3
z0OUwbQz9_;-+51@J*@#pn>@juGeHQAd<S1P!?Ahr6~*9%HbVg%Kul)bq#>dAn}0~r
zS_0|d3*0v%Y)8+8K<Q57*PC^%393r+XG%W6yD^no;Og-VA+5lCu%zf_7~!dgc-+NE
zvHaS@X&!WHS{yOEV;4lVnCXQ_u=PJTWMQ;U7SvW*$q<M~tF(<sCTP8}k3wQ0Q?a^l
zSQxYw0}%57*BxX6_C|Qndd8-N#__%VDX-JsXWQNGa7`HVA_H`r+Id%5B=DJ*lGN>{
zGyoYPb|W9Grm9M4E?vb^@16ePbI4omZv+(NoZ##fLUmKlB(G_jEbtDCM*27t$v`<Y
zffeuz2=|GK!7lq+sbqfTJj>JovAZa+%*Q5dDXF*Ftt*n!O>#ohCM4lZ)h5rdKV-3A
za}2AO6@!`W>ROk5FN*>2Zza^Z%}8KT%*jBGH|rml2X1LR{wZhWx8V<xBb>4>|5i};
zMnLIHn3!^)`87GYh}&Y`KMwyLbA#^pch}Z!`@P_qH&N^LS9SxpEy8mc!wFusq&Z@`
zeO}<6PC@VNaII|=n(^cNUiLseig*$;NjG7;IwvfYCBN>kzv<V5vk&zjV(~XtRBR&=
zt6-q8yC9trQ|X)<HkOQ+IUC=vTj!uFY0FE+vk#*O{{~?H^hd(wbHny7dy;RrMFcgl
z_VexAv`M(cDq`}K?C|}ZwID1by~#GJYj??k-AzhK5zm2o;<<@O?eQ_+b8EX0$Q7@T
zQqohwED)0&0>@v-V2eBQZ@oIs^)NLqMR935k|1}U;5<{s(Ebdj4r`?QtrrAPfQooq
zmPs_(YTy|??+nitNIFDoR7~qLPPFFCf^_~8OUt{#!|9o<Yi5&aakOEH)fbE#2PAF<
zCw1-yw1jWFe*TB)+;)*{RM}Ub>*3Q{!@9ZAI$7O~piD!;WX8#v&RxNH27i59$`1{o
zEYU_zE{bKEI%f3BbE0Fc;f2!4LjUlC`wgh4@R{1?O78r5t$hWKiLV{#QWWq{QZiPx
zm3?x$;&DDRVt0SByRiFczw$-e)GSv<ddVhD!H=!(lmOmnyLRosyG7Fs>pCRbzk^=E
zz=(+LjEc{Ps_2(OYg=G(93!oS=IeJ|WA8STv+LgI*Oj1c-QC06N~mvJ&KKx{arGp5
zswvJ6{%BvBYo>#2$%O$~TITuh?Rr^jCpAUX<nn|pBo;$7lHFqW5<?KC#;*DQ&Wbqt
zG33o<d5B;QRkx*X2zB0cB~t&PBb%)9<{r~@wi+-t8{gr()4{zeZu^Ia92E&xyG0nE
z>h)}m74`O|aOU>w2KI`k<#efwa5=-l4Xx!o>Z9Evg`RLN5W7SQp3$@D3_hY4EV!0(
ztMm6>zBcgY{<x&qI(2bjsAjk~6))xqjqtzCL}6)}r*J0rl*7;_Ds}NSq{D~&svZlw
z^C`AI<Pc08l&X+7KFj<>RvHZ{9Ey&&)jr2B4s0qDPBUh1ITaAp&>rj3ng*B=VGXz*
zs@eR<;J(XkpD6Q1U3}#FR)wlafiFMU(-=&e9(eQ`isrS-9aNwJ)7frS8RiXM4*SbC
zL|4*c?h^jfYvSOpn%Z$W?C|TuZ;uy2pFWHXuGW`ZkGV&kPJsKqJJQ!NswAE!!cb2k
zumi=AE$YIkm})cVlg>nn&PBjBR<eS2VeZCWD~=M|sX!vZ-&p<a?PWWWzw6m~B_-fs
zglFj9`-LUYd_Vwj2DQ57dwK#b$6Cj&PFK?hbsc6G6$TWpyq(6Zv8wWb=8@f{lL3!(
z2R@ZpP2%mB!KMrb)<qjX=#nZ7cqlrx=`_<QoVmqV{o$pNwF6WlfvEUlO~CJtgU|(?
z)ye!V)}%Z`<aCg>I*@mfhhRMsa5U8k#A!ztfiw)d7I_UyAif8$5sJ9a7WUv5!o%fL
z(J7-8EQzv1YIc)BNeWkLK~m%y4vqe&q@|_ZR5;eC3-9rkf*T{_19jtuWKhdW4Bn|~
zZ-YyFLN!k)0AKg{dO)|v3K?=oy+dzb4%T1F4}JsByncB1Z(`2p@O0!E!JQelouN^*
z%Q^YfQUh66D$Zx-RDZvLctsr9`_+1p#tz&4SMd@i_-8()tyg3OyhU~?Gt#-a{NKFN
z0VGf+AH%@o6;-_*?$$T4QX-f_>Ny-5CV8Ccq+@>gNSeovbFr0@b}RiTcJbLx>ws&r
zsvY!rR{4al#MpVKut~?&kTmF>_v3UaC!gvuxgg%5-{l{20}~&F6CUarF9N=u)BG71
zoQDlAwT+T=mfo&$Xy%4-kmW;4wuh6{{ABClybHV6L>t&k4?9_Ny8A_^?)ff#dEjhL
z2RbC~cFVbz^fJ`$I0%prYc0g-9(7X3eUp}^#Mzv)Z1EsGW;qr3cY$+e2HU5d_O9L%
zpbljP*1!A0PqpzNo3W&y(hD87qgweq5YQWYEkxrOuSain2-q@Z*P`x*ht-9)Fr5Ho
zSTKduvc9h6`S^#$i)LgjDi3_PQ+RbaGP!!di^Y;4kB0lGo$y{if)rJIaXTbpRgO#B
z1El6|18;s}$0FRjgK-7~ZwmI`_1{a`32+Y<pNrz(4@>>&O_iTpm%vz6hNkjGR(#*!
zpfJ2<fKb7l)fFR$t7JXpnW$_)ti7BPe2*QBjk3p|ToJw0U`rjl;WS%PAy{&@uy}AR
z>>OAQbTFba9S3j9BlRHXaG{)Zt(J<3ppA?}j+7F#{bV{M7zU)5e@~R&J_xf$+GKK~
z3{R;Y9fZGe^ifEqKL;!VMXv26=R~^TG(#*2!JKCWoo&c^$utAs#Gfq-?t!c&9TH5-
zj&i5L4NWbdNs*djvsY}bC&ddUbh=iyc0;3-@Y#d^s8|Ql{ax(yenFcG#i|K%lRxy|
zFys4w!@EPXp2AsbMUGc*eP|7uliAq-O6~(+MR>V(EZTd&9G+MY&gF2lZ=I8j*o`OC
z`AxrmOGMeD=H_9Cq47clT|h34>-EI=%;E!my;o&wU(aKV&PymBzrV9q2uA62<X+0c
z-NRREXWGD(5;~cE^VHTmP`6l9j4Vgu*j;9sEt}<!7xQ%KKB-s*23HdRSTJ~%<5Iok
z>XS@JrjKYANZAU>;8mag#BU?Nv`+ZVhlA<mxo$PS6V43YN}m~oFrU>PV`HF_gKY_O
zhbV2L`8qvR&f=@M5vH~geD+L&*L2s<)|5)clA0yt9TM{X)iWtx@wJO_!{vR#|AD6t
z*OAg2&P_i8jjW5y0DdtOGcqvrCHD*1Uq_q1ZQmngPnf!2fHizH%sSX>#$2Rh!>1ur
z+s(*-)abDuePc6~XNG8m@|KMXHVM#<Kuem?7ehg8Ogp=uF4KKJgBn^t_C->G4?~+V
z1z!An!D0GD-7WqXE8ddUXLkI%u01$fTEhhy<iD+|jwq)&kAb{f4;INRVYIgQ7$g(<
paFPNt=XPM}^4`vQTJvYesCPa<Oj19{`uM94Fh7qntu#SL{~w9ECo}*6

literal 0
HcmV?d00001

diff --git a/js/css/smoothness/jquery-ui-1.8.10.custom.css b/js/css/smoothness/jquery-ui-1.8.10.custom.css
new file mode 100644
index 0000000000..cd935e2c81
--- /dev/null
+++ b/js/css/smoothness/jquery-ui-1.8.10.custom.css
@@ -0,0 +1,573 @@
+/*
+ * jQuery UI CSS Framework 1.8.10
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Theming/API
+ */
+
+/* Layout helpers
+----------------------------------*/
+.ui-helper-hidden { display: none; }
+.ui-helper-hidden-accessible { position: absolute !important; clip: rect(1px 1px 1px 1px); clip: rect(1px,1px,1px,1px); }
+.ui-helper-reset { margin: 0; padding: 0; border: 0; outline: 0; line-height: 1.3; text-decoration: none; font-size: 100%; list-style: none; }
+.ui-helper-clearfix:after { content: "."; display: block; height: 0; clear: both; visibility: hidden; }
+.ui-helper-clearfix { display: inline-block; }
+/* required comment for clearfix to work in Opera \*/
+* html .ui-helper-clearfix { height:1%; }
+.ui-helper-clearfix { display:block; }
+/* end clearfix */
+.ui-helper-zfix { width: 100%; height: 100%; top: 0; left: 0; position: absolute; opacity: 0; filter:Alpha(Opacity=0); }
+
+
+/* Interaction Cues
+----------------------------------*/
+.ui-state-disabled { cursor: default !important; }
+
+
+/* Icons
+----------------------------------*/
+
+/* states and images */
+.ui-icon { display: block; text-indent: -99999px; overflow: hidden; background-repeat: no-repeat; }
+
+
+/* Misc visuals
+----------------------------------*/
+
+/* Overlays */
+.ui-widget-overlay { position: absolute; top: 0; left: 0; width: 100%; height: 100%; }
+
+
+/*
+ * jQuery UI CSS Framework 1.8.10
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Theming/API
+ *
+ * To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=Verdana,Arial,sans-serif&fwDefault=normal&fsDefault=1.1em&cornerRadius=4px&bgColorHeader=cccccc&bgTextureHeader=03_highlight_soft.png&bgImgOpacityHeader=75&borderColorHeader=aaaaaa&fcHeader=222222&iconColorHeader=222222&bgColorContent=ffffff&bgTextureContent=01_flat.png&bgImgOpacityContent=75&borderColorContent=aaaaaa&fcContent=222222&iconColorContent=222222&bgColorDefault=e6e6e6&bgTextureDefault=02_glass.png&bgImgOpacityDefault=75&borderColorDefault=d3d3d3&fcDefault=555555&iconColorDefault=888888&bgColorHover=dadada&bgTextureHover=02_glass.png&bgImgOpacityHover=75&borderColorHover=999999&fcHover=212121&iconColorHover=454545&bgColorActive=ffffff&bgTextureActive=02_glass.png&bgImgOpacityActive=65&borderColorActive=aaaaaa&fcActive=212121&iconColorActive=454545&bgColorHighlight=fbf9ee&bgTextureHighlight=02_glass.png&bgImgOpacityHighlight=55&borderColorHighlight=fcefa1&fcHighlight=363636&iconColorHighlight=2e83ff&bgColorError=fef1ec&bgTextureError=02_glass.png&bgImgOpacityError=95&borderColorError=cd0a0a&fcError=cd0a0a&iconColorError=cd0a0a&bgColorOverlay=aaaaaa&bgTextureOverlay=01_flat.png&bgImgOpacityOverlay=0&opacityOverlay=30&bgColorShadow=aaaaaa&bgTextureShadow=01_flat.png&bgImgOpacityShadow=0&opacityShadow=30&thicknessShadow=8px&offsetTopShadow=-8px&offsetLeftShadow=-8px&cornerRadiusShadow=8px
+ */
+
+
+/* Component containers
+----------------------------------*/
+.ui-widget { font-family: Verdana,Arial,sans-serif; font-size: 1.1em; }
+.ui-widget .ui-widget { font-size: 1em; }
+.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: Verdana,Arial,sans-serif; font-size: 1em; }
+.ui-widget-content { border: 1px solid #aaaaaa; background: #ffffff url(images/ui-bg_flat_75_ffffff_40x100.png) 50% 50% repeat-x; color: #222222; }
+.ui-widget-content a { color: #222222; }
+.ui-widget-header { border: 1px solid #aaaaaa; background: #cccccc url(images/ui-bg_highlight-soft_75_cccccc_1x100.png) 50% 50% repeat-x; color: #222222; font-weight: bold; }
+.ui-widget-header a { color: #222222; }
+
+/* Interaction states
+----------------------------------*/
+.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { border: 1px solid #d3d3d3; background: #e6e6e6 url(images/ui-bg_glass_75_e6e6e6_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #555555; }
+.ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { color: #555555; text-decoration: none; }
+.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus { border: 1px solid #999999; background: #dadada url(images/ui-bg_glass_75_dadada_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #212121; }
+.ui-state-hover a, .ui-state-hover a:hover { color: #212121; text-decoration: none; }
+.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active { border: 1px solid #aaaaaa; background: #ffffff url(images/ui-bg_glass_65_ffffff_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #212121; }
+.ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited { color: #212121; text-decoration: none; }
+.ui-widget :active { outline: none; }
+
+/* Interaction Cues
+----------------------------------*/
+.ui-state-highlight, .ui-widget-content .ui-state-highlight, .ui-widget-header .ui-state-highlight  {border: 1px solid #fcefa1; background: #fbf9ee url(images/ui-bg_glass_55_fbf9ee_1x400.png) 50% 50% repeat-x; color: #363636; }
+.ui-state-highlight a, .ui-widget-content .ui-state-highlight a,.ui-widget-header .ui-state-highlight a { color: #363636; }
+.ui-state-error, .ui-widget-content .ui-state-error, .ui-widget-header .ui-state-error {border: 1px solid #cd0a0a; background: #fef1ec url(images/ui-bg_glass_95_fef1ec_1x400.png) 50% 50% repeat-x; color: #cd0a0a; }
+.ui-state-error a, .ui-widget-content .ui-state-error a, .ui-widget-header .ui-state-error a { color: #cd0a0a; }
+.ui-state-error-text, .ui-widget-content .ui-state-error-text, .ui-widget-header .ui-state-error-text { color: #cd0a0a; }
+.ui-priority-primary, .ui-widget-content .ui-priority-primary, .ui-widget-header .ui-priority-primary { font-weight: bold; }
+.ui-priority-secondary, .ui-widget-content .ui-priority-secondary,  .ui-widget-header .ui-priority-secondary { opacity: .7; filter:Alpha(Opacity=70); font-weight: normal; }
+.ui-state-disabled, .ui-widget-content .ui-state-disabled, .ui-widget-header .ui-state-disabled { opacity: .35; filter:Alpha(Opacity=35); background-image: none; }
+
+/* Icons
+----------------------------------*/
+
+/* states and images */
+.ui-icon { width: 16px; height: 16px; background-image: url(images/ui-icons_222222_256x240.png); }
+.ui-widget-content .ui-icon {background-image: url(images/ui-icons_222222_256x240.png); }
+.ui-widget-header .ui-icon {background-image: url(images/ui-icons_222222_256x240.png); }
+.ui-state-default .ui-icon { background-image: url(images/ui-icons_888888_256x240.png); }
+.ui-state-hover .ui-icon, .ui-state-focus .ui-icon {background-image: url(images/ui-icons_454545_256x240.png); }
+.ui-state-active .ui-icon {background-image: url(images/ui-icons_454545_256x240.png); }
+.ui-state-highlight .ui-icon {background-image: url(images/ui-icons_2e83ff_256x240.png); }
+.ui-state-error .ui-icon, .ui-state-error-text .ui-icon {background-image: url(images/ui-icons_cd0a0a_256x240.png); }
+
+/* positioning */
+.ui-icon-carat-1-n { background-position: 0 0; }
+.ui-icon-carat-1-ne { background-position: -16px 0; }
+.ui-icon-carat-1-e { background-position: -32px 0; }
+.ui-icon-carat-1-se { background-position: -48px 0; }
+.ui-icon-carat-1-s { background-position: -64px 0; }
+.ui-icon-carat-1-sw { background-position: -80px 0; }
+.ui-icon-carat-1-w { background-position: -96px 0; }
+.ui-icon-carat-1-nw { background-position: -112px 0; }
+.ui-icon-carat-2-n-s { background-position: -128px 0; }
+.ui-icon-carat-2-e-w { background-position: -144px 0; }
+.ui-icon-triangle-1-n { background-position: 0 -16px; }
+.ui-icon-triangle-1-ne { background-position: -16px -16px; }
+.ui-icon-triangle-1-e { background-position: -32px -16px; }
+.ui-icon-triangle-1-se { background-position: -48px -16px; }
+.ui-icon-triangle-1-s { background-position: -64px -16px; }
+.ui-icon-triangle-1-sw { background-position: -80px -16px; }
+.ui-icon-triangle-1-w { background-position: -96px -16px; }
+.ui-icon-triangle-1-nw { background-position: -112px -16px; }
+.ui-icon-triangle-2-n-s { background-position: -128px -16px; }
+.ui-icon-triangle-2-e-w { background-position: -144px -16px; }
+.ui-icon-arrow-1-n { background-position: 0 -32px; }
+.ui-icon-arrow-1-ne { background-position: -16px -32px; }
+.ui-icon-arrow-1-e { background-position: -32px -32px; }
+.ui-icon-arrow-1-se { background-position: -48px -32px; }
+.ui-icon-arrow-1-s { background-position: -64px -32px; }
+.ui-icon-arrow-1-sw { background-position: -80px -32px; }
+.ui-icon-arrow-1-w { background-position: -96px -32px; }
+.ui-icon-arrow-1-nw { background-position: -112px -32px; }
+.ui-icon-arrow-2-n-s { background-position: -128px -32px; }
+.ui-icon-arrow-2-ne-sw { background-position: -144px -32px; }
+.ui-icon-arrow-2-e-w { background-position: -160px -32px; }
+.ui-icon-arrow-2-se-nw { background-position: -176px -32px; }
+.ui-icon-arrowstop-1-n { background-position: -192px -32px; }
+.ui-icon-arrowstop-1-e { background-position: -208px -32px; }
+.ui-icon-arrowstop-1-s { background-position: -224px -32px; }
+.ui-icon-arrowstop-1-w { background-position: -240px -32px; }
+.ui-icon-arrowthick-1-n { background-position: 0 -48px; }
+.ui-icon-arrowthick-1-ne { background-position: -16px -48px; }
+.ui-icon-arrowthick-1-e { background-position: -32px -48px; }
+.ui-icon-arrowthick-1-se { background-position: -48px -48px; }
+.ui-icon-arrowthick-1-s { background-position: -64px -48px; }
+.ui-icon-arrowthick-1-sw { background-position: -80px -48px; }
+.ui-icon-arrowthick-1-w { background-position: -96px -48px; }
+.ui-icon-arrowthick-1-nw { background-position: -112px -48px; }
+.ui-icon-arrowthick-2-n-s { background-position: -128px -48px; }
+.ui-icon-arrowthick-2-ne-sw { background-position: -144px -48px; }
+.ui-icon-arrowthick-2-e-w { background-position: -160px -48px; }
+.ui-icon-arrowthick-2-se-nw { background-position: -176px -48px; }
+.ui-icon-arrowthickstop-1-n { background-position: -192px -48px; }
+.ui-icon-arrowthickstop-1-e { background-position: -208px -48px; }
+.ui-icon-arrowthickstop-1-s { background-position: -224px -48px; }
+.ui-icon-arrowthickstop-1-w { background-position: -240px -48px; }
+.ui-icon-arrowreturnthick-1-w { background-position: 0 -64px; }
+.ui-icon-arrowreturnthick-1-n { background-position: -16px -64px; }
+.ui-icon-arrowreturnthick-1-e { background-position: -32px -64px; }
+.ui-icon-arrowreturnthick-1-s { background-position: -48px -64px; }
+.ui-icon-arrowreturn-1-w { background-position: -64px -64px; }
+.ui-icon-arrowreturn-1-n { background-position: -80px -64px; }
+.ui-icon-arrowreturn-1-e { background-position: -96px -64px; }
+.ui-icon-arrowreturn-1-s { background-position: -112px -64px; }
+.ui-icon-arrowrefresh-1-w { background-position: -128px -64px; }
+.ui-icon-arrowrefresh-1-n { background-position: -144px -64px; }
+.ui-icon-arrowrefresh-1-e { background-position: -160px -64px; }
+.ui-icon-arrowrefresh-1-s { background-position: -176px -64px; }
+.ui-icon-arrow-4 { background-position: 0 -80px; }
+.ui-icon-arrow-4-diag { background-position: -16px -80px; }
+.ui-icon-extlink { background-position: -32px -80px; }
+.ui-icon-newwin { background-position: -48px -80px; }
+.ui-icon-refresh { background-position: -64px -80px; }
+.ui-icon-shuffle { background-position: -80px -80px; }
+.ui-icon-transfer-e-w { background-position: -96px -80px; }
+.ui-icon-transferthick-e-w { background-position: -112px -80px; }
+.ui-icon-folder-collapsed { background-position: 0 -96px; }
+.ui-icon-folder-open { background-position: -16px -96px; }
+.ui-icon-document { background-position: -32px -96px; }
+.ui-icon-document-b { background-position: -48px -96px; }
+.ui-icon-note { background-position: -64px -96px; }
+.ui-icon-mail-closed { background-position: -80px -96px; }
+.ui-icon-mail-open { background-position: -96px -96px; }
+.ui-icon-suitcase { background-position: -112px -96px; }
+.ui-icon-comment { background-position: -128px -96px; }
+.ui-icon-person { background-position: -144px -96px; }
+.ui-icon-print { background-position: -160px -96px; }
+.ui-icon-trash { background-position: -176px -96px; }
+.ui-icon-locked { background-position: -192px -96px; }
+.ui-icon-unlocked { background-position: -208px -96px; }
+.ui-icon-bookmark { background-position: -224px -96px; }
+.ui-icon-tag { background-position: -240px -96px; }
+.ui-icon-home { background-position: 0 -112px; }
+.ui-icon-flag { background-position: -16px -112px; }
+.ui-icon-calendar { background-position: -32px -112px; }
+.ui-icon-cart { background-position: -48px -112px; }
+.ui-icon-pencil { background-position: -64px -112px; }
+.ui-icon-clock { background-position: -80px -112px; }
+.ui-icon-disk { background-position: -96px -112px; }
+.ui-icon-calculator { background-position: -112px -112px; }
+.ui-icon-zoomin { background-position: -128px -112px; }
+.ui-icon-zoomout { background-position: -144px -112px; }
+.ui-icon-search { background-position: -160px -112px; }
+.ui-icon-wrench { background-position: -176px -112px; }
+.ui-icon-gear { background-position: -192px -112px; }
+.ui-icon-heart { background-position: -208px -112px; }
+.ui-icon-star { background-position: -224px -112px; }
+.ui-icon-link { background-position: -240px -112px; }
+.ui-icon-cancel { background-position: 0 -128px; }
+.ui-icon-plus { background-position: -16px -128px; }
+.ui-icon-plusthick { background-position: -32px -128px; }
+.ui-icon-minus { background-position: -48px -128px; }
+.ui-icon-minusthick { background-position: -64px -128px; }
+.ui-icon-close { background-position: -80px -128px; }
+.ui-icon-closethick { background-position: -96px -128px; }
+.ui-icon-key { background-position: -112px -128px; }
+.ui-icon-lightbulb { background-position: -128px -128px; }
+.ui-icon-scissors { background-position: -144px -128px; }
+.ui-icon-clipboard { background-position: -160px -128px; }
+.ui-icon-copy { background-position: -176px -128px; }
+.ui-icon-contact { background-position: -192px -128px; }
+.ui-icon-image { background-position: -208px -128px; }
+.ui-icon-video { background-position: -224px -128px; }
+.ui-icon-script { background-position: -240px -128px; }
+.ui-icon-alert { background-position: 0 -144px; }
+.ui-icon-info { background-position: -16px -144px; }
+.ui-icon-notice { background-position: -32px -144px; }
+.ui-icon-help { background-position: -48px -144px; }
+.ui-icon-check { background-position: -64px -144px; }
+.ui-icon-bullet { background-position: -80px -144px; }
+.ui-icon-radio-off { background-position: -96px -144px; }
+.ui-icon-radio-on { background-position: -112px -144px; }
+.ui-icon-pin-w { background-position: -128px -144px; }
+.ui-icon-pin-s { background-position: -144px -144px; }
+.ui-icon-play { background-position: 0 -160px; }
+.ui-icon-pause { background-position: -16px -160px; }
+.ui-icon-seek-next { background-position: -32px -160px; }
+.ui-icon-seek-prev { background-position: -48px -160px; }
+.ui-icon-seek-end { background-position: -64px -160px; }
+.ui-icon-seek-start { background-position: -80px -160px; }
+/* ui-icon-seek-first is deprecated, use ui-icon-seek-start instead */
+.ui-icon-seek-first { background-position: -80px -160px; }
+.ui-icon-stop { background-position: -96px -160px; }
+.ui-icon-eject { background-position: -112px -160px; }
+.ui-icon-volume-off { background-position: -128px -160px; }
+.ui-icon-volume-on { background-position: -144px -160px; }
+.ui-icon-power { background-position: 0 -176px; }
+.ui-icon-signal-diag { background-position: -16px -176px; }
+.ui-icon-signal { background-position: -32px -176px; }
+.ui-icon-battery-0 { background-position: -48px -176px; }
+.ui-icon-battery-1 { background-position: -64px -176px; }
+.ui-icon-battery-2 { background-position: -80px -176px; }
+.ui-icon-battery-3 { background-position: -96px -176px; }
+.ui-icon-circle-plus { background-position: 0 -192px; }
+.ui-icon-circle-minus { background-position: -16px -192px; }
+.ui-icon-circle-close { background-position: -32px -192px; }
+.ui-icon-circle-triangle-e { background-position: -48px -192px; }
+.ui-icon-circle-triangle-s { background-position: -64px -192px; }
+.ui-icon-circle-triangle-w { background-position: -80px -192px; }
+.ui-icon-circle-triangle-n { background-position: -96px -192px; }
+.ui-icon-circle-arrow-e { background-position: -112px -192px; }
+.ui-icon-circle-arrow-s { background-position: -128px -192px; }
+.ui-icon-circle-arrow-w { background-position: -144px -192px; }
+.ui-icon-circle-arrow-n { background-position: -160px -192px; }
+.ui-icon-circle-zoomin { background-position: -176px -192px; }
+.ui-icon-circle-zoomout { background-position: -192px -192px; }
+.ui-icon-circle-check { background-position: -208px -192px; }
+.ui-icon-circlesmall-plus { background-position: 0 -208px; }
+.ui-icon-circlesmall-minus { background-position: -16px -208px; }
+.ui-icon-circlesmall-close { background-position: -32px -208px; }
+.ui-icon-squaresmall-plus { background-position: -48px -208px; }
+.ui-icon-squaresmall-minus { background-position: -64px -208px; }
+.ui-icon-squaresmall-close { background-position: -80px -208px; }
+.ui-icon-grip-dotted-vertical { background-position: 0 -224px; }
+.ui-icon-grip-dotted-horizontal { background-position: -16px -224px; }
+.ui-icon-grip-solid-vertical { background-position: -32px -224px; }
+.ui-icon-grip-solid-horizontal { background-position: -48px -224px; }
+.ui-icon-gripsmall-diagonal-se { background-position: -64px -224px; }
+.ui-icon-grip-diagonal-se { background-position: -80px -224px; }
+
+
+/* Misc visuals
+----------------------------------*/
+
+/* Corner radius */
+.ui-corner-tl { -moz-border-radius-topleft: 4px; -webkit-border-top-left-radius: 4px; border-top-left-radius: 4px; }
+.ui-corner-tr { -moz-border-radius-topright: 4px; -webkit-border-top-right-radius: 4px; border-top-right-radius: 4px; }
+.ui-corner-bl { -moz-border-radius-bottomleft: 4px; -webkit-border-bottom-left-radius: 4px; border-bottom-left-radius: 4px; }
+.ui-corner-br { -moz-border-radius-bottomright: 4px; -webkit-border-bottom-right-radius: 4px; border-bottom-right-radius: 4px; }
+.ui-corner-top { -moz-border-radius-topleft: 4px; -webkit-border-top-left-radius: 4px; border-top-left-radius: 4px; -moz-border-radius-topright: 4px; -webkit-border-top-right-radius: 4px; border-top-right-radius: 4px; }
+.ui-corner-bottom { -moz-border-radius-bottomleft: 4px; -webkit-border-bottom-left-radius: 4px; border-bottom-left-radius: 4px; -moz-border-radius-bottomright: 4px; -webkit-border-bottom-right-radius: 4px; border-bottom-right-radius: 4px; }
+.ui-corner-right {  -moz-border-radius-topright: 4px; -webkit-border-top-right-radius: 4px; border-top-right-radius: 4px; -moz-border-radius-bottomright: 4px; -webkit-border-bottom-right-radius: 4px; border-bottom-right-radius: 4px; }
+.ui-corner-left { -moz-border-radius-topleft: 4px; -webkit-border-top-left-radius: 4px; border-top-left-radius: 4px; -moz-border-radius-bottomleft: 4px; -webkit-border-bottom-left-radius: 4px; border-bottom-left-radius: 4px; }
+.ui-corner-all { -moz-border-radius: 4px; -webkit-border-radius: 4px; border-radius: 4px; }
+
+/* Overlays */
+.ui-widget-overlay { background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; opacity: .30;filter:Alpha(Opacity=30); }
+.ui-widget-shadow { margin: -8px 0 0 -8px; padding: 8px; background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; opacity: .30;filter:Alpha(Opacity=30); -moz-border-radius: 8px; -webkit-border-radius: 8px; border-radius: 8px; }/*
+ * jQuery UI Resizable 1.8.10
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Resizable#theming
+ */
+.ui-resizable { position: relative;}
+.ui-resizable-handle { position: absolute;font-size: 0.1px;z-index: 99999; display: block;}
+.ui-resizable-disabled .ui-resizable-handle, .ui-resizable-autohide .ui-resizable-handle { display: none; }
+.ui-resizable-n { cursor: n-resize; height: 7px; width: 100%; top: -5px; left: 0; }
+.ui-resizable-s { cursor: s-resize; height: 7px; width: 100%; bottom: -5px; left: 0; }
+.ui-resizable-e { cursor: e-resize; width: 7px; right: -5px; top: 0; height: 100%; }
+.ui-resizable-w { cursor: w-resize; width: 7px; left: -5px; top: 0; height: 100%; }
+.ui-resizable-se { cursor: se-resize; width: 12px; height: 12px; right: 1px; bottom: 1px; }
+.ui-resizable-sw { cursor: sw-resize; width: 9px; height: 9px; left: -5px; bottom: -5px; }
+.ui-resizable-nw { cursor: nw-resize; width: 9px; height: 9px; left: -5px; top: -5px; }
+.ui-resizable-ne { cursor: ne-resize; width: 9px; height: 9px; right: -5px; top: -5px;}/*
+ * jQuery UI Selectable 1.8.10
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Selectable#theming
+ */
+.ui-selectable-helper { position: absolute; z-index: 100; border:1px dotted black; }
+/*
+ * jQuery UI Accordion 1.8.10
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Accordion#theming
+ */
+/* IE/Win - Fix animation bug - #4615 */
+.ui-accordion { width: 100%; }
+.ui-accordion .ui-accordion-header { cursor: pointer; position: relative; margin-top: 1px; zoom: 1; }
+.ui-accordion .ui-accordion-li-fix { display: inline; }
+.ui-accordion .ui-accordion-header-active { border-bottom: 0 !important; }
+.ui-accordion .ui-accordion-header a { display: block; font-size: 1em; padding: .5em .5em .5em .7em; }
+.ui-accordion-icons .ui-accordion-header a { padding-left: 2.2em; }
+.ui-accordion .ui-accordion-header .ui-icon { position: absolute; left: .5em; top: 50%; margin-top: -8px; }
+.ui-accordion .ui-accordion-content { padding: 1em 2.2em; border-top: 0; margin-top: -2px; position: relative; top: 1px; margin-bottom: 2px; overflow: auto; display: none; zoom: 1; }
+.ui-accordion .ui-accordion-content-active { display: block; }
+/*
+ * jQuery UI Autocomplete 1.8.10
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Autocomplete#theming
+ */
+.ui-autocomplete { position: absolute; cursor: default; }	
+
+/* workarounds */
+* html .ui-autocomplete { width:1px; } /* without this, the menu expands to 100% in IE6 */
+
+/*
+ * jQuery UI Menu 1.8.10
+ *
+ * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Menu#theming
+ */
+.ui-menu {
+	list-style:none;
+	padding: 2px;
+	margin: 0;
+	display:block;
+	float: left;
+}
+.ui-menu .ui-menu {
+	margin-top: -3px;
+}
+.ui-menu .ui-menu-item {
+	margin:0;
+	padding: 0;
+	zoom: 1;
+	float: left;
+	clear: left;
+	width: 100%;
+}
+.ui-menu .ui-menu-item a {
+	text-decoration:none;
+	display:block;
+	padding:.2em .4em;
+	line-height:1.5;
+	zoom:1;
+}
+.ui-menu .ui-menu-item a.ui-state-hover,
+.ui-menu .ui-menu-item a.ui-state-active {
+	font-weight: normal;
+	margin: -1px;
+}
+/*
+ * jQuery UI Button 1.8.10
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Button#theming
+ */
+.ui-button { display: inline-block; position: relative; padding: 0; margin-right: .1em; text-decoration: none !important; cursor: pointer; text-align: center; zoom: 1; overflow: visible; } /* the overflow property removes extra width in IE */
+.ui-button-icon-only { width: 2.2em; } /* to make room for the icon, a width needs to be set here */
+button.ui-button-icon-only { width: 2.4em; } /* button elements seem to need a little more width */
+.ui-button-icons-only { width: 3.4em; } 
+button.ui-button-icons-only { width: 3.7em; } 
+
+/*button text element */
+.ui-button .ui-button-text { display: block; line-height: 1.4;  }
+.ui-button-text-only .ui-button-text { padding: .4em 1em; }
+.ui-button-icon-only .ui-button-text, .ui-button-icons-only .ui-button-text { padding: .4em; text-indent: -9999999px; }
+.ui-button-text-icon-primary .ui-button-text, .ui-button-text-icons .ui-button-text { padding: .4em 1em .4em 2.1em; }
+.ui-button-text-icon-secondary .ui-button-text, .ui-button-text-icons .ui-button-text { padding: .4em 2.1em .4em 1em; }
+.ui-button-text-icons .ui-button-text { padding-left: 2.1em; padding-right: 2.1em; }
+/* no icon support for input elements, provide padding by default */
+input.ui-button { padding: .4em 1em; }
+
+/*button icon element(s) */
+.ui-button-icon-only .ui-icon, .ui-button-text-icon-primary .ui-icon, .ui-button-text-icon-secondary .ui-icon, .ui-button-text-icons .ui-icon, .ui-button-icons-only .ui-icon { position: absolute; top: 50%; margin-top: -8px; }
+.ui-button-icon-only .ui-icon { left: 50%; margin-left: -8px; }
+.ui-button-text-icon-primary .ui-button-icon-primary, .ui-button-text-icons .ui-button-icon-primary, .ui-button-icons-only .ui-button-icon-primary { left: .5em; }
+.ui-button-text-icon-secondary .ui-button-icon-secondary, .ui-button-text-icons .ui-button-icon-secondary, .ui-button-icons-only .ui-button-icon-secondary { right: .5em; }
+.ui-button-text-icons .ui-button-icon-secondary, .ui-button-icons-only .ui-button-icon-secondary { right: .5em; }
+
+/*button sets*/
+.ui-buttonset { margin-right: 7px; }
+.ui-buttonset .ui-button { margin-left: 0; margin-right: -.3em; }
+
+/* workarounds */
+button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra padding in Firefox */
+/*
+ * jQuery UI Dialog 1.8.10
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Dialog#theming
+ */
+.ui-dialog { position: absolute; padding: .2em; width: 300px; overflow: hidden; }
+.ui-dialog .ui-dialog-titlebar { padding: .4em 1em; position: relative;  }
+.ui-dialog .ui-dialog-title { float: left; margin: .1em 16px .1em 0; } 
+.ui-dialog .ui-dialog-titlebar-close { position: absolute; right: .3em; top: 50%; width: 19px; margin: -10px 0 0 0; padding: 1px; height: 18px; }
+.ui-dialog .ui-dialog-titlebar-close span { display: block; margin: 1px; }
+.ui-dialog .ui-dialog-titlebar-close:hover, .ui-dialog .ui-dialog-titlebar-close:focus { padding: 0; }
+.ui-dialog .ui-dialog-content { position: relative; border: 0; padding: .5em 1em; background: none; overflow: auto; zoom: 1; }
+.ui-dialog .ui-dialog-buttonpane { text-align: left; border-width: 1px 0 0 0; background-image: none; margin: .5em 0 0 0; padding: .3em 1em .5em .4em; }
+.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset { float: right; }
+.ui-dialog .ui-dialog-buttonpane button { margin: .5em .4em .5em 0; cursor: pointer; }
+.ui-dialog .ui-resizable-se { width: 14px; height: 14px; right: 3px; bottom: 3px; }
+.ui-draggable .ui-dialog-titlebar { cursor: move; }
+/*
+ * jQuery UI Slider 1.8.10
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Slider#theming
+ */
+.ui-slider { position: relative; text-align: left; }
+.ui-slider .ui-slider-handle { position: absolute; z-index: 2; width: 1.2em; height: 1.2em; cursor: default; }
+.ui-slider .ui-slider-range { position: absolute; z-index: 1; font-size: .7em; display: block; border: 0; background-position: 0 0; }
+
+.ui-slider-horizontal { height: .8em; }
+.ui-slider-horizontal .ui-slider-handle { top: -.3em; margin-left: -.6em; }
+.ui-slider-horizontal .ui-slider-range { top: 0; height: 100%; }
+.ui-slider-horizontal .ui-slider-range-min { left: 0; }
+.ui-slider-horizontal .ui-slider-range-max { right: 0; }
+
+.ui-slider-vertical { width: .8em; height: 100px; }
+.ui-slider-vertical .ui-slider-handle { left: -.3em; margin-left: 0; margin-bottom: -.6em; }
+.ui-slider-vertical .ui-slider-range { left: 0; width: 100%; }
+.ui-slider-vertical .ui-slider-range-min { bottom: 0; }
+.ui-slider-vertical .ui-slider-range-max { top: 0; }/*
+ * jQuery UI Tabs 1.8.10
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Tabs#theming
+ */
+.ui-tabs { position: relative; padding: .2em; zoom: 1; } /* position: relative prevents IE scroll bug (element with position: relative inside container with overflow: auto appear as "fixed") */
+.ui-tabs .ui-tabs-nav { margin: 0; padding: .2em .2em 0; }
+.ui-tabs .ui-tabs-nav li { list-style: none; float: left; position: relative; top: 1px; margin: 0 .2em 1px 0; border-bottom: 0 !important; padding: 0; white-space: nowrap; }
+.ui-tabs .ui-tabs-nav li a { float: left; padding: .5em 1em; text-decoration: none; }
+.ui-tabs .ui-tabs-nav li.ui-tabs-selected { margin-bottom: 0; padding-bottom: 1px; }
+.ui-tabs .ui-tabs-nav li.ui-tabs-selected a, .ui-tabs .ui-tabs-nav li.ui-state-disabled a, .ui-tabs .ui-tabs-nav li.ui-state-processing a { cursor: text; }
+.ui-tabs .ui-tabs-nav li a, .ui-tabs.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-selected a { cursor: pointer; } /* first selector in group seems obsolete, but required to overcome bug in Opera applying cursor: text overall if defined elsewhere... */
+.ui-tabs .ui-tabs-panel { display: block; border-width: 0; padding: 1em 1.4em; background: none; }
+.ui-tabs .ui-tabs-hide { display: none !important; }
+/*
+ * jQuery UI Datepicker 1.8.10
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Datepicker#theming
+ */
+.ui-datepicker { width: 17em; padding: .2em .2em 0; display: none; }
+.ui-datepicker .ui-datepicker-header { position:relative; padding:.2em 0; }
+.ui-datepicker .ui-datepicker-prev, .ui-datepicker .ui-datepicker-next { position:absolute; top: 2px; width: 1.8em; height: 1.8em; }
+.ui-datepicker .ui-datepicker-prev-hover, .ui-datepicker .ui-datepicker-next-hover { top: 1px; }
+.ui-datepicker .ui-datepicker-prev { left:2px; }
+.ui-datepicker .ui-datepicker-next { right:2px; }
+.ui-datepicker .ui-datepicker-prev-hover { left:1px; }
+.ui-datepicker .ui-datepicker-next-hover { right:1px; }
+.ui-datepicker .ui-datepicker-prev span, .ui-datepicker .ui-datepicker-next span { display: block; position: absolute; left: 50%; margin-left: -8px; top: 50%; margin-top: -8px;  }
+.ui-datepicker .ui-datepicker-title { margin: 0 2.3em; line-height: 1.8em; text-align: center; }
+.ui-datepicker .ui-datepicker-title select { font-size:1em; margin:1px 0; }
+.ui-datepicker select.ui-datepicker-month-year {width: 100%;}
+.ui-datepicker select.ui-datepicker-month, 
+.ui-datepicker select.ui-datepicker-year { width: 49%;}
+.ui-datepicker table {width: 100%; font-size: .9em; border-collapse: collapse; margin:0 0 .4em; }
+.ui-datepicker th { padding: .7em .3em; text-align: center; font-weight: bold; border: 0;  }
+.ui-datepicker td { border: 0; padding: 1px; }
+.ui-datepicker td span, .ui-datepicker td a { display: block; padding: .2em; text-align: right; text-decoration: none; }
+.ui-datepicker .ui-datepicker-buttonpane { background-image: none; margin: .7em 0 0 0; padding:0 .2em; border-left: 0; border-right: 0; border-bottom: 0; }
+.ui-datepicker .ui-datepicker-buttonpane button { float: right; margin: .5em .2em .4em; cursor: pointer; padding: .2em .6em .3em .6em; width:auto; overflow:visible; }
+.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current { float:left; }
+
+/* with multiple calendars */
+.ui-datepicker.ui-datepicker-multi { width:auto; }
+.ui-datepicker-multi .ui-datepicker-group { float:left; }
+.ui-datepicker-multi .ui-datepicker-group table { width:95%; margin:0 auto .4em; }
+.ui-datepicker-multi-2 .ui-datepicker-group { width:50%; }
+.ui-datepicker-multi-3 .ui-datepicker-group { width:33.3%; }
+.ui-datepicker-multi-4 .ui-datepicker-group { width:25%; }
+.ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header { border-left-width:0; }
+.ui-datepicker-multi .ui-datepicker-group-middle .ui-datepicker-header { border-left-width:0; }
+.ui-datepicker-multi .ui-datepicker-buttonpane { clear:left; }
+.ui-datepicker-row-break { clear:both; width:100%; }
+
+/* RTL support */
+.ui-datepicker-rtl { direction: rtl; }
+.ui-datepicker-rtl .ui-datepicker-prev { right: 2px; left: auto; }
+.ui-datepicker-rtl .ui-datepicker-next { left: 2px; right: auto; }
+.ui-datepicker-rtl .ui-datepicker-prev:hover { right: 1px; left: auto; }
+.ui-datepicker-rtl .ui-datepicker-next:hover { left: 1px; right: auto; }
+.ui-datepicker-rtl .ui-datepicker-buttonpane { clear:right; }
+.ui-datepicker-rtl .ui-datepicker-buttonpane button { float: left; }
+.ui-datepicker-rtl .ui-datepicker-buttonpane button.ui-datepicker-current { float:right; }
+.ui-datepicker-rtl .ui-datepicker-group { float:right; }
+.ui-datepicker-rtl .ui-datepicker-group-last .ui-datepicker-header { border-right-width:0; border-left-width:1px; }
+.ui-datepicker-rtl .ui-datepicker-group-middle .ui-datepicker-header { border-right-width:0; border-left-width:1px; }
+
+/* IE6 IFRAME FIX (taken from datepicker 1.5.3 */
+.ui-datepicker-cover {
+    display: none; /*sorry for IE5*/
+    display/**/: block; /*sorry for IE5*/
+    position: absolute; /*must have*/
+    z-index: -1; /*must have*/
+    filter: mask(); /*must have*/
+    top: -4px; /*must have*/
+    left: -4px; /*must have*/
+    width: 200px; /*must have*/
+    height: 200px; /*must have*/
+}/*
+ * jQuery UI Progressbar 1.8.10
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Progressbar#theming
+ */
+.ui-progressbar { height:2em; text-align: left; }
+.ui-progressbar .ui-progressbar-value {margin: -1px; height:100%; }
\ No newline at end of file
diff --git a/js/jquery-ui-1.8.10.custom.min.js b/js/jquery-ui-1.8.10.custom.min.js
new file mode 100644
index 0000000000..7d4ff1cec1
--- /dev/null
+++ b/js/jquery-ui-1.8.10.custom.min.js
@@ -0,0 +1,782 @@
+/*!
+ * jQuery UI 1.8.10
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI
+ */
+(function(c,j){function k(a){return!c(a).parents().andSelf().filter(function(){return c.curCSS(this,"visibility")==="hidden"||c.expr.filters.hidden(this)}).length}c.ui=c.ui||{};if(!c.ui.version){c.extend(c.ui,{version:"1.8.10",keyCode:{ALT:18,BACKSPACE:8,CAPS_LOCK:20,COMMA:188,COMMAND:91,COMMAND_LEFT:91,COMMAND_RIGHT:93,CONTROL:17,DELETE:46,DOWN:40,END:35,ENTER:13,ESCAPE:27,HOME:36,INSERT:45,LEFT:37,MENU:93,NUMPAD_ADD:107,NUMPAD_DECIMAL:110,NUMPAD_DIVIDE:111,NUMPAD_ENTER:108,NUMPAD_MULTIPLY:106,
+NUMPAD_SUBTRACT:109,PAGE_DOWN:34,PAGE_UP:33,PERIOD:190,RIGHT:39,SHIFT:16,SPACE:32,TAB:9,UP:38,WINDOWS:91}});c.fn.extend({_focus:c.fn.focus,focus:function(a,b){return typeof a==="number"?this.each(function(){var d=this;setTimeout(function(){c(d).focus();b&&b.call(d)},a)}):this._focus.apply(this,arguments)},scrollParent:function(){var a;a=c.browser.msie&&/(static|relative)/.test(this.css("position"))||/absolute/.test(this.css("position"))?this.parents().filter(function(){return/(relative|absolute|fixed)/.test(c.curCSS(this,
+"position",1))&&/(auto|scroll)/.test(c.curCSS(this,"overflow",1)+c.curCSS(this,"overflow-y",1)+c.curCSS(this,"overflow-x",1))}).eq(0):this.parents().filter(function(){return/(auto|scroll)/.test(c.curCSS(this,"overflow",1)+c.curCSS(this,"overflow-y",1)+c.curCSS(this,"overflow-x",1))}).eq(0);return/fixed/.test(this.css("position"))||!a.length?c(document):a},zIndex:function(a){if(a!==j)return this.css("zIndex",a);if(this.length){a=c(this[0]);for(var b;a.length&&a[0]!==document;){b=a.css("position");
+if(b==="absolute"||b==="relative"||b==="fixed"){b=parseInt(a.css("zIndex"),10);if(!isNaN(b)&&b!==0)return b}a=a.parent()}}return 0},disableSelection:function(){return this.bind((c.support.selectstart?"selectstart":"mousedown")+".ui-disableSelection",function(a){a.preventDefault()})},enableSelection:function(){return this.unbind(".ui-disableSelection")}});c.each(["Width","Height"],function(a,b){function d(f,g,l,m){c.each(e,function(){g-=parseFloat(c.curCSS(f,"padding"+this,true))||0;if(l)g-=parseFloat(c.curCSS(f,
+"border"+this+"Width",true))||0;if(m)g-=parseFloat(c.curCSS(f,"margin"+this,true))||0});return g}var e=b==="Width"?["Left","Right"]:["Top","Bottom"],h=b.toLowerCase(),i={innerWidth:c.fn.innerWidth,innerHeight:c.fn.innerHeight,outerWidth:c.fn.outerWidth,outerHeight:c.fn.outerHeight};c.fn["inner"+b]=function(f){if(f===j)return i["inner"+b].call(this);return this.each(function(){c(this).css(h,d(this,f)+"px")})};c.fn["outer"+b]=function(f,g){if(typeof f!=="number")return i["outer"+b].call(this,f);return this.each(function(){c(this).css(h,
+d(this,f,true,g)+"px")})}});c.extend(c.expr[":"],{data:function(a,b,d){return!!c.data(a,d[3])},focusable:function(a){var b=a.nodeName.toLowerCase(),d=c.attr(a,"tabindex");if("area"===b){b=a.parentNode;d=b.name;if(!a.href||!d||b.nodeName.toLowerCase()!=="map")return false;a=c("img[usemap=#"+d+"]")[0];return!!a&&k(a)}return(/input|select|textarea|button|object/.test(b)?!a.disabled:"a"==b?a.href||!isNaN(d):!isNaN(d))&&k(a)},tabbable:function(a){var b=c.attr(a,"tabindex");return(isNaN(b)||b>=0)&&c(a).is(":focusable")}});
+c(function(){var a=document.body,b=a.appendChild(b=document.createElement("div"));c.extend(b.style,{minHeight:"100px",height:"auto",padding:0,borderWidth:0});c.support.minHeight=b.offsetHeight===100;c.support.selectstart="onselectstart"in b;a.removeChild(b).style.display="none"});c.extend(c.ui,{plugin:{add:function(a,b,d){a=c.ui[a].prototype;for(var e in d){a.plugins[e]=a.plugins[e]||[];a.plugins[e].push([b,d[e]])}},call:function(a,b,d){if((b=a.plugins[b])&&a.element[0].parentNode)for(var e=0;e<b.length;e++)a.options[b[e][0]]&&
+b[e][1].apply(a.element,d)}},contains:function(a,b){return document.compareDocumentPosition?a.compareDocumentPosition(b)&16:a!==b&&a.contains(b)},hasScroll:function(a,b){if(c(a).css("overflow")==="hidden")return false;b=b&&b==="left"?"scrollLeft":"scrollTop";var d=false;if(a[b]>0)return true;a[b]=1;d=a[b]>0;a[b]=0;return d},isOverAxis:function(a,b,d){return a>b&&a<b+d},isOver:function(a,b,d,e,h,i){return c.ui.isOverAxis(a,d,h)&&c.ui.isOverAxis(b,e,i)}})}})(jQuery);
+;/*!
+ * jQuery UI Widget 1.8.10
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Widget
+ */
+(function(b,j){if(b.cleanData){var k=b.cleanData;b.cleanData=function(a){for(var c=0,d;(d=a[c])!=null;c++)b(d).triggerHandler("remove");k(a)}}else{var l=b.fn.remove;b.fn.remove=function(a,c){return this.each(function(){if(!c)if(!a||b.filter(a,[this]).length)b("*",this).add([this]).each(function(){b(this).triggerHandler("remove")});return l.call(b(this),a,c)})}}b.widget=function(a,c,d){var e=a.split(".")[0],f;a=a.split(".")[1];f=e+"-"+a;if(!d){d=c;c=b.Widget}b.expr[":"][f]=function(h){return!!b.data(h,
+a)};b[e]=b[e]||{};b[e][a]=function(h,g){arguments.length&&this._createWidget(h,g)};c=new c;c.options=b.extend(true,{},c.options);b[e][a].prototype=b.extend(true,c,{namespace:e,widgetName:a,widgetEventPrefix:b[e][a].prototype.widgetEventPrefix||a,widgetBaseClass:f},d);b.widget.bridge(a,b[e][a])};b.widget.bridge=function(a,c){b.fn[a]=function(d){var e=typeof d==="string",f=Array.prototype.slice.call(arguments,1),h=this;d=!e&&f.length?b.extend.apply(null,[true,d].concat(f)):d;if(e&&d.charAt(0)==="_")return h;
+e?this.each(function(){var g=b.data(this,a),i=g&&b.isFunction(g[d])?g[d].apply(g,f):g;if(i!==g&&i!==j){h=i;return false}}):this.each(function(){var g=b.data(this,a);g?g.option(d||{})._init():b.data(this,a,new c(d,this))});return h}};b.Widget=function(a,c){arguments.length&&this._createWidget(a,c)};b.Widget.prototype={widgetName:"widget",widgetEventPrefix:"",options:{disabled:false},_createWidget:function(a,c){b.data(c,this.widgetName,this);this.element=b(c);this.options=b.extend(true,{},this.options,
+this._getCreateOptions(),a);var d=this;this.element.bind("remove."+this.widgetName,function(){d.destroy()});this._create();this._trigger("create");this._init()},_getCreateOptions:function(){return b.metadata&&b.metadata.get(this.element[0])[this.widgetName]},_create:function(){},_init:function(){},destroy:function(){this.element.unbind("."+this.widgetName).removeData(this.widgetName);this.widget().unbind("."+this.widgetName).removeAttr("aria-disabled").removeClass(this.widgetBaseClass+"-disabled ui-state-disabled")},
+widget:function(){return this.element},option:function(a,c){var d=a;if(arguments.length===0)return b.extend({},this.options);if(typeof a==="string"){if(c===j)return this.options[a];d={};d[a]=c}this._setOptions(d);return this},_setOptions:function(a){var c=this;b.each(a,function(d,e){c._setOption(d,e)});return this},_setOption:function(a,c){this.options[a]=c;if(a==="disabled")this.widget()[c?"addClass":"removeClass"](this.widgetBaseClass+"-disabled ui-state-disabled").attr("aria-disabled",c);return this},
+enable:function(){return this._setOption("disabled",false)},disable:function(){return this._setOption("disabled",true)},_trigger:function(a,c,d){var e=this.options[a];c=b.Event(c);c.type=(a===this.widgetEventPrefix?a:this.widgetEventPrefix+a).toLowerCase();d=d||{};if(c.originalEvent){a=b.event.props.length;for(var f;a;){f=b.event.props[--a];c[f]=c.originalEvent[f]}}this.element.trigger(c,d);return!(b.isFunction(e)&&e.call(this.element[0],c,d)===false||c.isDefaultPrevented())}}})(jQuery);
+;/*!
+ * jQuery UI Mouse 1.8.10
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Mouse
+ *
+ * Depends:
+ *	jquery.ui.widget.js
+ */
+(function(c){c.widget("ui.mouse",{options:{cancel:":input,option",distance:1,delay:0},_mouseInit:function(){var a=this;this.element.bind("mousedown."+this.widgetName,function(b){return a._mouseDown(b)}).bind("click."+this.widgetName,function(b){if(true===c.data(b.target,a.widgetName+".preventClickEvent")){c.removeData(b.target,a.widgetName+".preventClickEvent");b.stopImmediatePropagation();return false}});this.started=false},_mouseDestroy:function(){this.element.unbind("."+this.widgetName)},_mouseDown:function(a){a.originalEvent=
+a.originalEvent||{};if(!a.originalEvent.mouseHandled){this._mouseStarted&&this._mouseUp(a);this._mouseDownEvent=a;var b=this,e=a.which==1,f=typeof this.options.cancel=="string"?c(a.target).parents().add(a.target).filter(this.options.cancel).length:false;if(!e||f||!this._mouseCapture(a))return true;this.mouseDelayMet=!this.options.delay;if(!this.mouseDelayMet)this._mouseDelayTimer=setTimeout(function(){b.mouseDelayMet=true},this.options.delay);if(this._mouseDistanceMet(a)&&this._mouseDelayMet(a)){this._mouseStarted=
+this._mouseStart(a)!==false;if(!this._mouseStarted){a.preventDefault();return true}}this._mouseMoveDelegate=function(d){return b._mouseMove(d)};this._mouseUpDelegate=function(d){return b._mouseUp(d)};c(document).bind("mousemove."+this.widgetName,this._mouseMoveDelegate).bind("mouseup."+this.widgetName,this._mouseUpDelegate);a.preventDefault();return a.originalEvent.mouseHandled=true}},_mouseMove:function(a){if(c.browser.msie&&!(document.documentMode>=9)&&!a.button)return this._mouseUp(a);if(this._mouseStarted){this._mouseDrag(a);
+return a.preventDefault()}if(this._mouseDistanceMet(a)&&this._mouseDelayMet(a))(this._mouseStarted=this._mouseStart(this._mouseDownEvent,a)!==false)?this._mouseDrag(a):this._mouseUp(a);return!this._mouseStarted},_mouseUp:function(a){c(document).unbind("mousemove."+this.widgetName,this._mouseMoveDelegate).unbind("mouseup."+this.widgetName,this._mouseUpDelegate);if(this._mouseStarted){this._mouseStarted=false;a.target==this._mouseDownEvent.target&&c.data(a.target,this.widgetName+".preventClickEvent",
+true);this._mouseStop(a)}return false},_mouseDistanceMet:function(a){return Math.max(Math.abs(this._mouseDownEvent.pageX-a.pageX),Math.abs(this._mouseDownEvent.pageY-a.pageY))>=this.options.distance},_mouseDelayMet:function(){return this.mouseDelayMet},_mouseStart:function(){},_mouseDrag:function(){},_mouseStop:function(){},_mouseCapture:function(){return true}})})(jQuery);
+;/*
+ * jQuery UI Position 1.8.10
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Position
+ */
+(function(c){c.ui=c.ui||{};var n=/left|center|right/,o=/top|center|bottom/,t=c.fn.position,u=c.fn.offset;c.fn.position=function(b){if(!b||!b.of)return t.apply(this,arguments);b=c.extend({},b);var a=c(b.of),d=a[0],g=(b.collision||"flip").split(" "),e=b.offset?b.offset.split(" "):[0,0],h,k,j;if(d.nodeType===9){h=a.width();k=a.height();j={top:0,left:0}}else if(d.setTimeout){h=a.width();k=a.height();j={top:a.scrollTop(),left:a.scrollLeft()}}else if(d.preventDefault){b.at="left top";h=k=0;j={top:b.of.pageY,
+left:b.of.pageX}}else{h=a.outerWidth();k=a.outerHeight();j=a.offset()}c.each(["my","at"],function(){var f=(b[this]||"").split(" ");if(f.length===1)f=n.test(f[0])?f.concat(["center"]):o.test(f[0])?["center"].concat(f):["center","center"];f[0]=n.test(f[0])?f[0]:"center";f[1]=o.test(f[1])?f[1]:"center";b[this]=f});if(g.length===1)g[1]=g[0];e[0]=parseInt(e[0],10)||0;if(e.length===1)e[1]=e[0];e[1]=parseInt(e[1],10)||0;if(b.at[0]==="right")j.left+=h;else if(b.at[0]==="center")j.left+=h/2;if(b.at[1]==="bottom")j.top+=
+k;else if(b.at[1]==="center")j.top+=k/2;j.left+=e[0];j.top+=e[1];return this.each(function(){var f=c(this),l=f.outerWidth(),m=f.outerHeight(),p=parseInt(c.curCSS(this,"marginLeft",true))||0,q=parseInt(c.curCSS(this,"marginTop",true))||0,v=l+p+(parseInt(c.curCSS(this,"marginRight",true))||0),w=m+q+(parseInt(c.curCSS(this,"marginBottom",true))||0),i=c.extend({},j),r;if(b.my[0]==="right")i.left-=l;else if(b.my[0]==="center")i.left-=l/2;if(b.my[1]==="bottom")i.top-=m;else if(b.my[1]==="center")i.top-=
+m/2;i.left=Math.round(i.left);i.top=Math.round(i.top);r={left:i.left-p,top:i.top-q};c.each(["left","top"],function(s,x){c.ui.position[g[s]]&&c.ui.position[g[s]][x](i,{targetWidth:h,targetHeight:k,elemWidth:l,elemHeight:m,collisionPosition:r,collisionWidth:v,collisionHeight:w,offset:e,my:b.my,at:b.at})});c.fn.bgiframe&&f.bgiframe();f.offset(c.extend(i,{using:b.using}))})};c.ui.position={fit:{left:function(b,a){var d=c(window);d=a.collisionPosition.left+a.collisionWidth-d.width()-d.scrollLeft();b.left=
+d>0?b.left-d:Math.max(b.left-a.collisionPosition.left,b.left)},top:function(b,a){var d=c(window);d=a.collisionPosition.top+a.collisionHeight-d.height()-d.scrollTop();b.top=d>0?b.top-d:Math.max(b.top-a.collisionPosition.top,b.top)}},flip:{left:function(b,a){if(a.at[0]!=="center"){var d=c(window);d=a.collisionPosition.left+a.collisionWidth-d.width()-d.scrollLeft();var g=a.my[0]==="left"?-a.elemWidth:a.my[0]==="right"?a.elemWidth:0,e=a.at[0]==="left"?a.targetWidth:-a.targetWidth,h=-2*a.offset[0];b.left+=
+a.collisionPosition.left<0?g+e+h:d>0?g+e+h:0}},top:function(b,a){if(a.at[1]!=="center"){var d=c(window);d=a.collisionPosition.top+a.collisionHeight-d.height()-d.scrollTop();var g=a.my[1]==="top"?-a.elemHeight:a.my[1]==="bottom"?a.elemHeight:0,e=a.at[1]==="top"?a.targetHeight:-a.targetHeight,h=-2*a.offset[1];b.top+=a.collisionPosition.top<0?g+e+h:d>0?g+e+h:0}}}};if(!c.offset.setOffset){c.offset.setOffset=function(b,a){if(/static/.test(c.curCSS(b,"position")))b.style.position="relative";var d=c(b),
+g=d.offset(),e=parseInt(c.curCSS(b,"top",true),10)||0,h=parseInt(c.curCSS(b,"left",true),10)||0;g={top:a.top-g.top+e,left:a.left-g.left+h};"using"in a?a.using.call(b,g):d.css(g)};c.fn.offset=function(b){var a=this[0];if(!a||!a.ownerDocument)return null;if(b)return this.each(function(){c.offset.setOffset(this,b)});return u.call(this)}}})(jQuery);
+;/*
+ * jQuery UI Draggable 1.8.10
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Draggables
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ *	jquery.ui.mouse.js
+ *	jquery.ui.widget.js
+ */
+(function(d){d.widget("ui.draggable",d.ui.mouse,{widgetEventPrefix:"drag",options:{addClasses:true,appendTo:"parent",axis:false,connectToSortable:false,containment:false,cursor:"auto",cursorAt:false,grid:false,handle:false,helper:"original",iframeFix:false,opacity:false,refreshPositions:false,revert:false,revertDuration:500,scope:"default",scroll:true,scrollSensitivity:20,scrollSpeed:20,snap:false,snapMode:"both",snapTolerance:20,stack:false,zIndex:false},_create:function(){if(this.options.helper==
+"original"&&!/^(?:r|a|f)/.test(this.element.css("position")))this.element[0].style.position="relative";this.options.addClasses&&this.element.addClass("ui-draggable");this.options.disabled&&this.element.addClass("ui-draggable-disabled");this._mouseInit()},destroy:function(){if(this.element.data("draggable")){this.element.removeData("draggable").unbind(".draggable").removeClass("ui-draggable ui-draggable-dragging ui-draggable-disabled");this._mouseDestroy();return this}},_mouseCapture:function(a){var b=
+this.options;if(this.helper||b.disabled||d(a.target).is(".ui-resizable-handle"))return false;this.handle=this._getHandle(a);if(!this.handle)return false;return true},_mouseStart:function(a){var b=this.options;this.helper=this._createHelper(a);this._cacheHelperProportions();if(d.ui.ddmanager)d.ui.ddmanager.current=this;this._cacheMargins();this.cssPosition=this.helper.css("position");this.scrollParent=this.helper.scrollParent();this.offset=this.positionAbs=this.element.offset();this.offset={top:this.offset.top-
+this.margins.top,left:this.offset.left-this.margins.left};d.extend(this.offset,{click:{left:a.pageX-this.offset.left,top:a.pageY-this.offset.top},parent:this._getParentOffset(),relative:this._getRelativeOffset()});this.originalPosition=this.position=this._generatePosition(a);this.originalPageX=a.pageX;this.originalPageY=a.pageY;b.cursorAt&&this._adjustOffsetFromHelper(b.cursorAt);b.containment&&this._setContainment();if(this._trigger("start",a)===false){this._clear();return false}this._cacheHelperProportions();
+d.ui.ddmanager&&!b.dropBehaviour&&d.ui.ddmanager.prepareOffsets(this,a);this.helper.addClass("ui-draggable-dragging");this._mouseDrag(a,true);return true},_mouseDrag:function(a,b){this.position=this._generatePosition(a);this.positionAbs=this._convertPositionTo("absolute");if(!b){b=this._uiHash();if(this._trigger("drag",a,b)===false){this._mouseUp({});return false}this.position=b.position}if(!this.options.axis||this.options.axis!="y")this.helper[0].style.left=this.position.left+"px";if(!this.options.axis||
+this.options.axis!="x")this.helper[0].style.top=this.position.top+"px";d.ui.ddmanager&&d.ui.ddmanager.drag(this,a);return false},_mouseStop:function(a){var b=false;if(d.ui.ddmanager&&!this.options.dropBehaviour)b=d.ui.ddmanager.drop(this,a);if(this.dropped){b=this.dropped;this.dropped=false}if((!this.element[0]||!this.element[0].parentNode)&&this.options.helper=="original")return false;if(this.options.revert=="invalid"&&!b||this.options.revert=="valid"&&b||this.options.revert===true||d.isFunction(this.options.revert)&&
+this.options.revert.call(this.element,b)){var c=this;d(this.helper).animate(this.originalPosition,parseInt(this.options.revertDuration,10),function(){c._trigger("stop",a)!==false&&c._clear()})}else this._trigger("stop",a)!==false&&this._clear();return false},cancel:function(){this.helper.is(".ui-draggable-dragging")?this._mouseUp({}):this._clear();return this},_getHandle:function(a){var b=!this.options.handle||!d(this.options.handle,this.element).length?true:false;d(this.options.handle,this.element).find("*").andSelf().each(function(){if(this==
+a.target)b=true});return b},_createHelper:function(a){var b=this.options;a=d.isFunction(b.helper)?d(b.helper.apply(this.element[0],[a])):b.helper=="clone"?this.element.clone():this.element;a.parents("body").length||a.appendTo(b.appendTo=="parent"?this.element[0].parentNode:b.appendTo);a[0]!=this.element[0]&&!/(fixed|absolute)/.test(a.css("position"))&&a.css("position","absolute");return a},_adjustOffsetFromHelper:function(a){if(typeof a=="string")a=a.split(" ");if(d.isArray(a))a={left:+a[0],top:+a[1]||
+0};if("left"in a)this.offset.click.left=a.left+this.margins.left;if("right"in a)this.offset.click.left=this.helperProportions.width-a.right+this.margins.left;if("top"in a)this.offset.click.top=a.top+this.margins.top;if("bottom"in a)this.offset.click.top=this.helperProportions.height-a.bottom+this.margins.top},_getParentOffset:function(){this.offsetParent=this.helper.offsetParent();var a=this.offsetParent.offset();if(this.cssPosition=="absolute"&&this.scrollParent[0]!=document&&d.ui.contains(this.scrollParent[0],
+this.offsetParent[0])){a.left+=this.scrollParent.scrollLeft();a.top+=this.scrollParent.scrollTop()}if(this.offsetParent[0]==document.body||this.offsetParent[0].tagName&&this.offsetParent[0].tagName.toLowerCase()=="html"&&d.browser.msie)a={top:0,left:0};return{top:a.top+(parseInt(this.offsetParent.css("borderTopWidth"),10)||0),left:a.left+(parseInt(this.offsetParent.css("borderLeftWidth"),10)||0)}},_getRelativeOffset:function(){if(this.cssPosition=="relative"){var a=this.element.position();return{top:a.top-
+(parseInt(this.helper.css("top"),10)||0)+this.scrollParent.scrollTop(),left:a.left-(parseInt(this.helper.css("left"),10)||0)+this.scrollParent.scrollLeft()}}else return{top:0,left:0}},_cacheMargins:function(){this.margins={left:parseInt(this.element.css("marginLeft"),10)||0,top:parseInt(this.element.css("marginTop"),10)||0}},_cacheHelperProportions:function(){this.helperProportions={width:this.helper.outerWidth(),height:this.helper.outerHeight()}},_setContainment:function(){var a=this.options;if(a.containment==
+"parent")a.containment=this.helper[0].parentNode;if(a.containment=="document"||a.containment=="window")this.containment=[(a.containment=="document"?0:d(window).scrollLeft())-this.offset.relative.left-this.offset.parent.left,(a.containment=="document"?0:d(window).scrollTop())-this.offset.relative.top-this.offset.parent.top,(a.containment=="document"?0:d(window).scrollLeft())+d(a.containment=="document"?document:window).width()-this.helperProportions.width-this.margins.left,(a.containment=="document"?
+0:d(window).scrollTop())+(d(a.containment=="document"?document:window).height()||document.body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top];if(!/^(document|window|parent)$/.test(a.containment)&&a.containment.constructor!=Array){var b=d(a.containment)[0];if(b){a=d(a.containment).offset();var c=d(b).css("overflow")!="hidden";this.containment=[a.left+(parseInt(d(b).css("borderLeftWidth"),10)||0)+(parseInt(d(b).css("paddingLeft"),10)||0)-this.margins.left,a.top+(parseInt(d(b).css("borderTopWidth"),
+10)||0)+(parseInt(d(b).css("paddingTop"),10)||0)-this.margins.top,a.left+(c?Math.max(b.scrollWidth,b.offsetWidth):b.offsetWidth)-(parseInt(d(b).css("borderLeftWidth"),10)||0)-(parseInt(d(b).css("paddingRight"),10)||0)-this.helperProportions.width-this.margins.left,a.top+(c?Math.max(b.scrollHeight,b.offsetHeight):b.offsetHeight)-(parseInt(d(b).css("borderTopWidth"),10)||0)-(parseInt(d(b).css("paddingBottom"),10)||0)-this.helperProportions.height-this.margins.top]}}else if(a.containment.constructor==
+Array)this.containment=a.containment},_convertPositionTo:function(a,b){if(!b)b=this.position;a=a=="absolute"?1:-1;var c=this.cssPosition=="absolute"&&!(this.scrollParent[0]!=document&&d.ui.contains(this.scrollParent[0],this.offsetParent[0]))?this.offsetParent:this.scrollParent,f=/(html|body)/i.test(c[0].tagName);return{top:b.top+this.offset.relative.top*a+this.offset.parent.top*a-(d.browser.safari&&d.browser.version<526&&this.cssPosition=="fixed"?0:(this.cssPosition=="fixed"?-this.scrollParent.scrollTop():
+f?0:c.scrollTop())*a),left:b.left+this.offset.relative.left*a+this.offset.parent.left*a-(d.browser.safari&&d.browser.version<526&&this.cssPosition=="fixed"?0:(this.cssPosition=="fixed"?-this.scrollParent.scrollLeft():f?0:c.scrollLeft())*a)}},_generatePosition:function(a){var b=this.options,c=this.cssPosition=="absolute"&&!(this.scrollParent[0]!=document&&d.ui.contains(this.scrollParent[0],this.offsetParent[0]))?this.offsetParent:this.scrollParent,f=/(html|body)/i.test(c[0].tagName),e=a.pageX,g=a.pageY;
+if(this.originalPosition){if(this.containment){if(a.pageX-this.offset.click.left<this.containment[0])e=this.containment[0]+this.offset.click.left;if(a.pageY-this.offset.click.top<this.containment[1])g=this.containment[1]+this.offset.click.top;if(a.pageX-this.offset.click.left>this.containment[2])e=this.containment[2]+this.offset.click.left;if(a.pageY-this.offset.click.top>this.containment[3])g=this.containment[3]+this.offset.click.top}if(b.grid){g=this.originalPageY+Math.round((g-this.originalPageY)/
+b.grid[1])*b.grid[1];g=this.containment?!(g-this.offset.click.top<this.containment[1]||g-this.offset.click.top>this.containment[3])?g:!(g-this.offset.click.top<this.containment[1])?g-b.grid[1]:g+b.grid[1]:g;e=this.originalPageX+Math.round((e-this.originalPageX)/b.grid[0])*b.grid[0];e=this.containment?!(e-this.offset.click.left<this.containment[0]||e-this.offset.click.left>this.containment[2])?e:!(e-this.offset.click.left<this.containment[0])?e-b.grid[0]:e+b.grid[0]:e}}return{top:g-this.offset.click.top-
+this.offset.relative.top-this.offset.parent.top+(d.browser.safari&&d.browser.version<526&&this.cssPosition=="fixed"?0:this.cssPosition=="fixed"?-this.scrollParent.scrollTop():f?0:c.scrollTop()),left:e-this.offset.click.left-this.offset.relative.left-this.offset.parent.left+(d.browser.safari&&d.browser.version<526&&this.cssPosition=="fixed"?0:this.cssPosition=="fixed"?-this.scrollParent.scrollLeft():f?0:c.scrollLeft())}},_clear:function(){this.helper.removeClass("ui-draggable-dragging");this.helper[0]!=
+this.element[0]&&!this.cancelHelperRemoval&&this.helper.remove();this.helper=null;this.cancelHelperRemoval=false},_trigger:function(a,b,c){c=c||this._uiHash();d.ui.plugin.call(this,a,[b,c]);if(a=="drag")this.positionAbs=this._convertPositionTo("absolute");return d.Widget.prototype._trigger.call(this,a,b,c)},plugins:{},_uiHash:function(){return{helper:this.helper,position:this.position,originalPosition:this.originalPosition,offset:this.positionAbs}}});d.extend(d.ui.draggable,{version:"1.8.10"});
+d.ui.plugin.add("draggable","connectToSortable",{start:function(a,b){var c=d(this).data("draggable"),f=c.options,e=d.extend({},b,{item:c.element});c.sortables=[];d(f.connectToSortable).each(function(){var g=d.data(this,"sortable");if(g&&!g.options.disabled){c.sortables.push({instance:g,shouldRevert:g.options.revert});g._refreshItems();g._trigger("activate",a,e)}})},stop:function(a,b){var c=d(this).data("draggable"),f=d.extend({},b,{item:c.element});d.each(c.sortables,function(){if(this.instance.isOver){this.instance.isOver=
+0;c.cancelHelperRemoval=true;this.instance.cancelHelperRemoval=false;if(this.shouldRevert)this.instance.options.revert=true;this.instance._mouseStop(a);this.instance.options.helper=this.instance.options._helper;c.options.helper=="original"&&this.instance.currentItem.css({top:"auto",left:"auto"})}else{this.instance.cancelHelperRemoval=false;this.instance._trigger("deactivate",a,f)}})},drag:function(a,b){var c=d(this).data("draggable"),f=this;d.each(c.sortables,function(){this.instance.positionAbs=
+c.positionAbs;this.instance.helperProportions=c.helperProportions;this.instance.offset.click=c.offset.click;if(this.instance._intersectsWith(this.instance.containerCache)){if(!this.instance.isOver){this.instance.isOver=1;this.instance.currentItem=d(f).clone().appendTo(this.instance.element).data("sortable-item",true);this.instance.options._helper=this.instance.options.helper;this.instance.options.helper=function(){return b.helper[0]};a.target=this.instance.currentItem[0];this.instance._mouseCapture(a,
+true);this.instance._mouseStart(a,true,true);this.instance.offset.click.top=c.offset.click.top;this.instance.offset.click.left=c.offset.click.left;this.instance.offset.parent.left-=c.offset.parent.left-this.instance.offset.parent.left;this.instance.offset.parent.top-=c.offset.parent.top-this.instance.offset.parent.top;c._trigger("toSortable",a);c.dropped=this.instance.element;c.currentItem=c.element;this.instance.fromOutside=c}this.instance.currentItem&&this.instance._mouseDrag(a)}else if(this.instance.isOver){this.instance.isOver=
+0;this.instance.cancelHelperRemoval=true;this.instance.options.revert=false;this.instance._trigger("out",a,this.instance._uiHash(this.instance));this.instance._mouseStop(a,true);this.instance.options.helper=this.instance.options._helper;this.instance.currentItem.remove();this.instance.placeholder&&this.instance.placeholder.remove();c._trigger("fromSortable",a);c.dropped=false}})}});d.ui.plugin.add("draggable","cursor",{start:function(){var a=d("body"),b=d(this).data("draggable").options;if(a.css("cursor"))b._cursor=
+a.css("cursor");a.css("cursor",b.cursor)},stop:function(){var a=d(this).data("draggable").options;a._cursor&&d("body").css("cursor",a._cursor)}});d.ui.plugin.add("draggable","iframeFix",{start:function(){var a=d(this).data("draggable").options;d(a.iframeFix===true?"iframe":a.iframeFix).each(function(){d('<div class="ui-draggable-iframeFix" style="background: #fff;"></div>').css({width:this.offsetWidth+"px",height:this.offsetHeight+"px",position:"absolute",opacity:"0.001",zIndex:1E3}).css(d(this).offset()).appendTo("body")})},
+stop:function(){d("div.ui-draggable-iframeFix").each(function(){this.parentNode.removeChild(this)})}});d.ui.plugin.add("draggable","opacity",{start:function(a,b){a=d(b.helper);b=d(this).data("draggable").options;if(a.css("opacity"))b._opacity=a.css("opacity");a.css("opacity",b.opacity)},stop:function(a,b){a=d(this).data("draggable").options;a._opacity&&d(b.helper).css("opacity",a._opacity)}});d.ui.plugin.add("draggable","scroll",{start:function(){var a=d(this).data("draggable");if(a.scrollParent[0]!=
+document&&a.scrollParent[0].tagName!="HTML")a.overflowOffset=a.scrollParent.offset()},drag:function(a){var b=d(this).data("draggable"),c=b.options,f=false;if(b.scrollParent[0]!=document&&b.scrollParent[0].tagName!="HTML"){if(!c.axis||c.axis!="x")if(b.overflowOffset.top+b.scrollParent[0].offsetHeight-a.pageY<c.scrollSensitivity)b.scrollParent[0].scrollTop=f=b.scrollParent[0].scrollTop+c.scrollSpeed;else if(a.pageY-b.overflowOffset.top<c.scrollSensitivity)b.scrollParent[0].scrollTop=f=b.scrollParent[0].scrollTop-
+c.scrollSpeed;if(!c.axis||c.axis!="y")if(b.overflowOffset.left+b.scrollParent[0].offsetWidth-a.pageX<c.scrollSensitivity)b.scrollParent[0].scrollLeft=f=b.scrollParent[0].scrollLeft+c.scrollSpeed;else if(a.pageX-b.overflowOffset.left<c.scrollSensitivity)b.scrollParent[0].scrollLeft=f=b.scrollParent[0].scrollLeft-c.scrollSpeed}else{if(!c.axis||c.axis!="x")if(a.pageY-d(document).scrollTop()<c.scrollSensitivity)f=d(document).scrollTop(d(document).scrollTop()-c.scrollSpeed);else if(d(window).height()-
+(a.pageY-d(document).scrollTop())<c.scrollSensitivity)f=d(document).scrollTop(d(document).scrollTop()+c.scrollSpeed);if(!c.axis||c.axis!="y")if(a.pageX-d(document).scrollLeft()<c.scrollSensitivity)f=d(document).scrollLeft(d(document).scrollLeft()-c.scrollSpeed);else if(d(window).width()-(a.pageX-d(document).scrollLeft())<c.scrollSensitivity)f=d(document).scrollLeft(d(document).scrollLeft()+c.scrollSpeed)}f!==false&&d.ui.ddmanager&&!c.dropBehaviour&&d.ui.ddmanager.prepareOffsets(b,a)}});d.ui.plugin.add("draggable",
+"snap",{start:function(){var a=d(this).data("draggable"),b=a.options;a.snapElements=[];d(b.snap.constructor!=String?b.snap.items||":data(draggable)":b.snap).each(function(){var c=d(this),f=c.offset();this!=a.element[0]&&a.snapElements.push({item:this,width:c.outerWidth(),height:c.outerHeight(),top:f.top,left:f.left})})},drag:function(a,b){for(var c=d(this).data("draggable"),f=c.options,e=f.snapTolerance,g=b.offset.left,n=g+c.helperProportions.width,m=b.offset.top,o=m+c.helperProportions.height,h=
+c.snapElements.length-1;h>=0;h--){var i=c.snapElements[h].left,k=i+c.snapElements[h].width,j=c.snapElements[h].top,l=j+c.snapElements[h].height;if(i-e<g&&g<k+e&&j-e<m&&m<l+e||i-e<g&&g<k+e&&j-e<o&&o<l+e||i-e<n&&n<k+e&&j-e<m&&m<l+e||i-e<n&&n<k+e&&j-e<o&&o<l+e){if(f.snapMode!="inner"){var p=Math.abs(j-o)<=e,q=Math.abs(l-m)<=e,r=Math.abs(i-n)<=e,s=Math.abs(k-g)<=e;if(p)b.position.top=c._convertPositionTo("relative",{top:j-c.helperProportions.height,left:0}).top-c.margins.top;if(q)b.position.top=c._convertPositionTo("relative",
+{top:l,left:0}).top-c.margins.top;if(r)b.position.left=c._convertPositionTo("relative",{top:0,left:i-c.helperProportions.width}).left-c.margins.left;if(s)b.position.left=c._convertPositionTo("relative",{top:0,left:k}).left-c.margins.left}var t=p||q||r||s;if(f.snapMode!="outer"){p=Math.abs(j-m)<=e;q=Math.abs(l-o)<=e;r=Math.abs(i-g)<=e;s=Math.abs(k-n)<=e;if(p)b.position.top=c._convertPositionTo("relative",{top:j,left:0}).top-c.margins.top;if(q)b.position.top=c._convertPositionTo("relative",{top:l-c.helperProportions.height,
+left:0}).top-c.margins.top;if(r)b.position.left=c._convertPositionTo("relative",{top:0,left:i}).left-c.margins.left;if(s)b.position.left=c._convertPositionTo("relative",{top:0,left:k-c.helperProportions.width}).left-c.margins.left}if(!c.snapElements[h].snapping&&(p||q||r||s||t))c.options.snap.snap&&c.options.snap.snap.call(c.element,a,d.extend(c._uiHash(),{snapItem:c.snapElements[h].item}));c.snapElements[h].snapping=p||q||r||s||t}else{c.snapElements[h].snapping&&c.options.snap.release&&c.options.snap.release.call(c.element,
+a,d.extend(c._uiHash(),{snapItem:c.snapElements[h].item}));c.snapElements[h].snapping=false}}}});d.ui.plugin.add("draggable","stack",{start:function(){var a=d(this).data("draggable").options;a=d.makeArray(d(a.stack)).sort(function(c,f){return(parseInt(d(c).css("zIndex"),10)||0)-(parseInt(d(f).css("zIndex"),10)||0)});if(a.length){var b=parseInt(a[0].style.zIndex)||0;d(a).each(function(c){this.style.zIndex=b+c});this[0].style.zIndex=b+a.length}}});d.ui.plugin.add("draggable","zIndex",{start:function(a,
+b){a=d(b.helper);b=d(this).data("draggable").options;if(a.css("zIndex"))b._zIndex=a.css("zIndex");a.css("zIndex",b.zIndex)},stop:function(a,b){a=d(this).data("draggable").options;a._zIndex&&d(b.helper).css("zIndex",a._zIndex)}})})(jQuery);
+;/*
+ * jQuery UI Droppable 1.8.10
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Droppables
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ *	jquery.ui.widget.js
+ *	jquery.ui.mouse.js
+ *	jquery.ui.draggable.js
+ */
+(function(d){d.widget("ui.droppable",{widgetEventPrefix:"drop",options:{accept:"*",activeClass:false,addClasses:true,greedy:false,hoverClass:false,scope:"default",tolerance:"intersect"},_create:function(){var a=this.options,b=a.accept;this.isover=0;this.isout=1;this.accept=d.isFunction(b)?b:function(c){return c.is(b)};this.proportions={width:this.element[0].offsetWidth,height:this.element[0].offsetHeight};d.ui.ddmanager.droppables[a.scope]=d.ui.ddmanager.droppables[a.scope]||[];d.ui.ddmanager.droppables[a.scope].push(this);
+a.addClasses&&this.element.addClass("ui-droppable")},destroy:function(){for(var a=d.ui.ddmanager.droppables[this.options.scope],b=0;b<a.length;b++)a[b]==this&&a.splice(b,1);this.element.removeClass("ui-droppable ui-droppable-disabled").removeData("droppable").unbind(".droppable");return this},_setOption:function(a,b){if(a=="accept")this.accept=d.isFunction(b)?b:function(c){return c.is(b)};d.Widget.prototype._setOption.apply(this,arguments)},_activate:function(a){var b=d.ui.ddmanager.current;this.options.activeClass&&
+this.element.addClass(this.options.activeClass);b&&this._trigger("activate",a,this.ui(b))},_deactivate:function(a){var b=d.ui.ddmanager.current;this.options.activeClass&&this.element.removeClass(this.options.activeClass);b&&this._trigger("deactivate",a,this.ui(b))},_over:function(a){var b=d.ui.ddmanager.current;if(!(!b||(b.currentItem||b.element)[0]==this.element[0]))if(this.accept.call(this.element[0],b.currentItem||b.element)){this.options.hoverClass&&this.element.addClass(this.options.hoverClass);
+this._trigger("over",a,this.ui(b))}},_out:function(a){var b=d.ui.ddmanager.current;if(!(!b||(b.currentItem||b.element)[0]==this.element[0]))if(this.accept.call(this.element[0],b.currentItem||b.element)){this.options.hoverClass&&this.element.removeClass(this.options.hoverClass);this._trigger("out",a,this.ui(b))}},_drop:function(a,b){var c=b||d.ui.ddmanager.current;if(!c||(c.currentItem||c.element)[0]==this.element[0])return false;var e=false;this.element.find(":data(droppable)").not(".ui-draggable-dragging").each(function(){var g=
+d.data(this,"droppable");if(g.options.greedy&&!g.options.disabled&&g.options.scope==c.options.scope&&g.accept.call(g.element[0],c.currentItem||c.element)&&d.ui.intersect(c,d.extend(g,{offset:g.element.offset()}),g.options.tolerance)){e=true;return false}});if(e)return false;if(this.accept.call(this.element[0],c.currentItem||c.element)){this.options.activeClass&&this.element.removeClass(this.options.activeClass);this.options.hoverClass&&this.element.removeClass(this.options.hoverClass);this._trigger("drop",
+a,this.ui(c));return this.element}return false},ui:function(a){return{draggable:a.currentItem||a.element,helper:a.helper,position:a.position,offset:a.positionAbs}}});d.extend(d.ui.droppable,{version:"1.8.10"});d.ui.intersect=function(a,b,c){if(!b.offset)return false;var e=(a.positionAbs||a.position.absolute).left,g=e+a.helperProportions.width,f=(a.positionAbs||a.position.absolute).top,h=f+a.helperProportions.height,i=b.offset.left,k=i+b.proportions.width,j=b.offset.top,l=j+b.proportions.height;
+switch(c){case "fit":return i<=e&&g<=k&&j<=f&&h<=l;case "intersect":return i<e+a.helperProportions.width/2&&g-a.helperProportions.width/2<k&&j<f+a.helperProportions.height/2&&h-a.helperProportions.height/2<l;case "pointer":return d.ui.isOver((a.positionAbs||a.position.absolute).top+(a.clickOffset||a.offset.click).top,(a.positionAbs||a.position.absolute).left+(a.clickOffset||a.offset.click).left,j,i,b.proportions.height,b.proportions.width);case "touch":return(f>=j&&f<=l||h>=j&&h<=l||f<j&&h>l)&&(e>=
+i&&e<=k||g>=i&&g<=k||e<i&&g>k);default:return false}};d.ui.ddmanager={current:null,droppables:{"default":[]},prepareOffsets:function(a,b){var c=d.ui.ddmanager.droppables[a.options.scope]||[],e=b?b.type:null,g=(a.currentItem||a.element).find(":data(droppable)").andSelf(),f=0;a:for(;f<c.length;f++)if(!(c[f].options.disabled||a&&!c[f].accept.call(c[f].element[0],a.currentItem||a.element))){for(var h=0;h<g.length;h++)if(g[h]==c[f].element[0]){c[f].proportions.height=0;continue a}c[f].visible=c[f].element.css("display")!=
+"none";if(c[f].visible){c[f].offset=c[f].element.offset();c[f].proportions={width:c[f].element[0].offsetWidth,height:c[f].element[0].offsetHeight};e=="mousedown"&&c[f]._activate.call(c[f],b)}}},drop:function(a,b){var c=false;d.each(d.ui.ddmanager.droppables[a.options.scope]||[],function(){if(this.options){if(!this.options.disabled&&this.visible&&d.ui.intersect(a,this,this.options.tolerance))c=c||this._drop.call(this,b);if(!this.options.disabled&&this.visible&&this.accept.call(this.element[0],a.currentItem||
+a.element)){this.isout=1;this.isover=0;this._deactivate.call(this,b)}}});return c},drag:function(a,b){a.options.refreshPositions&&d.ui.ddmanager.prepareOffsets(a,b);d.each(d.ui.ddmanager.droppables[a.options.scope]||[],function(){if(!(this.options.disabled||this.greedyChild||!this.visible)){var c=d.ui.intersect(a,this,this.options.tolerance);if(c=!c&&this.isover==1?"isout":c&&this.isover==0?"isover":null){var e;if(this.options.greedy){var g=this.element.parents(":data(droppable):eq(0)");if(g.length){e=
+d.data(g[0],"droppable");e.greedyChild=c=="isover"?1:0}}if(e&&c=="isover"){e.isover=0;e.isout=1;e._out.call(e,b)}this[c]=1;this[c=="isout"?"isover":"isout"]=0;this[c=="isover"?"_over":"_out"].call(this,b);if(e&&c=="isout"){e.isout=0;e.isover=1;e._over.call(e,b)}}}})}}})(jQuery);
+;/*
+ * jQuery UI Resizable 1.8.10
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Resizables
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ *	jquery.ui.mouse.js
+ *	jquery.ui.widget.js
+ */
+(function(e){e.widget("ui.resizable",e.ui.mouse,{widgetEventPrefix:"resize",options:{alsoResize:false,animate:false,animateDuration:"slow",animateEasing:"swing",aspectRatio:false,autoHide:false,containment:false,ghost:false,grid:false,handles:"e,s,se",helper:false,maxHeight:null,maxWidth:null,minHeight:10,minWidth:10,zIndex:1E3},_create:function(){var b=this,a=this.options;this.element.addClass("ui-resizable");e.extend(this,{_aspectRatio:!!a.aspectRatio,aspectRatio:a.aspectRatio,originalElement:this.element,
+_proportionallyResizeElements:[],_helper:a.helper||a.ghost||a.animate?a.helper||"ui-resizable-helper":null});if(this.element[0].nodeName.match(/canvas|textarea|input|select|button|img/i)){/relative/.test(this.element.css("position"))&&e.browser.opera&&this.element.css({position:"relative",top:"auto",left:"auto"});this.element.wrap(e('<div class="ui-wrapper" style="overflow: hidden;"></div>').css({position:this.element.css("position"),width:this.element.outerWidth(),height:this.element.outerHeight(),
+top:this.element.css("top"),left:this.element.css("left")}));this.element=this.element.parent().data("resizable",this.element.data("resizable"));this.elementIsWrapper=true;this.element.css({marginLeft:this.originalElement.css("marginLeft"),marginTop:this.originalElement.css("marginTop"),marginRight:this.originalElement.css("marginRight"),marginBottom:this.originalElement.css("marginBottom")});this.originalElement.css({marginLeft:0,marginTop:0,marginRight:0,marginBottom:0});this.originalResizeStyle=
+this.originalElement.css("resize");this.originalElement.css("resize","none");this._proportionallyResizeElements.push(this.originalElement.css({position:"static",zoom:1,display:"block"}));this.originalElement.css({margin:this.originalElement.css("margin")});this._proportionallyResize()}this.handles=a.handles||(!e(".ui-resizable-handle",this.element).length?"e,s,se":{n:".ui-resizable-n",e:".ui-resizable-e",s:".ui-resizable-s",w:".ui-resizable-w",se:".ui-resizable-se",sw:".ui-resizable-sw",ne:".ui-resizable-ne",
+nw:".ui-resizable-nw"});if(this.handles.constructor==String){if(this.handles=="all")this.handles="n,e,s,w,se,sw,ne,nw";var c=this.handles.split(",");this.handles={};for(var d=0;d<c.length;d++){var f=e.trim(c[d]),g=e('<div class="ui-resizable-handle '+("ui-resizable-"+f)+'"></div>');/sw|se|ne|nw/.test(f)&&g.css({zIndex:++a.zIndex});"se"==f&&g.addClass("ui-icon ui-icon-gripsmall-diagonal-se");this.handles[f]=".ui-resizable-"+f;this.element.append(g)}}this._renderAxis=function(h){h=h||this.element;for(var i in this.handles){if(this.handles[i].constructor==
+String)this.handles[i]=e(this.handles[i],this.element).show();if(this.elementIsWrapper&&this.originalElement[0].nodeName.match(/textarea|input|select|button/i)){var j=e(this.handles[i],this.element),k=0;k=/sw|ne|nw|se|n|s/.test(i)?j.outerHeight():j.outerWidth();j=["padding",/ne|nw|n/.test(i)?"Top":/se|sw|s/.test(i)?"Bottom":/^e$/.test(i)?"Right":"Left"].join("");h.css(j,k);this._proportionallyResize()}e(this.handles[i])}};this._renderAxis(this.element);this._handles=e(".ui-resizable-handle",this.element).disableSelection();
+this._handles.mouseover(function(){if(!b.resizing){if(this.className)var h=this.className.match(/ui-resizable-(se|sw|ne|nw|n|e|s|w)/i);b.axis=h&&h[1]?h[1]:"se"}});if(a.autoHide){this._handles.hide();e(this.element).addClass("ui-resizable-autohide").hover(function(){e(this).removeClass("ui-resizable-autohide");b._handles.show()},function(){if(!b.resizing){e(this).addClass("ui-resizable-autohide");b._handles.hide()}})}this._mouseInit()},destroy:function(){this._mouseDestroy();var b=function(c){e(c).removeClass("ui-resizable ui-resizable-disabled ui-resizable-resizing").removeData("resizable").unbind(".resizable").find(".ui-resizable-handle").remove()};
+if(this.elementIsWrapper){b(this.element);var a=this.element;a.after(this.originalElement.css({position:a.css("position"),width:a.outerWidth(),height:a.outerHeight(),top:a.css("top"),left:a.css("left")})).remove()}this.originalElement.css("resize",this.originalResizeStyle);b(this.originalElement);return this},_mouseCapture:function(b){var a=false;for(var c in this.handles)if(e(this.handles[c])[0]==b.target)a=true;return!this.options.disabled&&a},_mouseStart:function(b){var a=this.options,c=this.element.position(),
+d=this.element;this.resizing=true;this.documentScroll={top:e(document).scrollTop(),left:e(document).scrollLeft()};if(d.is(".ui-draggable")||/absolute/.test(d.css("position")))d.css({position:"absolute",top:c.top,left:c.left});e.browser.opera&&/relative/.test(d.css("position"))&&d.css({position:"relative",top:"auto",left:"auto"});this._renderProxy();c=m(this.helper.css("left"));var f=m(this.helper.css("top"));if(a.containment){c+=e(a.containment).scrollLeft()||0;f+=e(a.containment).scrollTop()||0}this.offset=
+this.helper.offset();this.position={left:c,top:f};this.size=this._helper?{width:d.outerWidth(),height:d.outerHeight()}:{width:d.width(),height:d.height()};this.originalSize=this._helper?{width:d.outerWidth(),height:d.outerHeight()}:{width:d.width(),height:d.height()};this.originalPosition={left:c,top:f};this.sizeDiff={width:d.outerWidth()-d.width(),height:d.outerHeight()-d.height()};this.originalMousePosition={left:b.pageX,top:b.pageY};this.aspectRatio=typeof a.aspectRatio=="number"?a.aspectRatio:
+this.originalSize.width/this.originalSize.height||1;a=e(".ui-resizable-"+this.axis).css("cursor");e("body").css("cursor",a=="auto"?this.axis+"-resize":a);d.addClass("ui-resizable-resizing");this._propagate("start",b);return true},_mouseDrag:function(b){var a=this.helper,c=this.originalMousePosition,d=this._change[this.axis];if(!d)return false;c=d.apply(this,[b,b.pageX-c.left||0,b.pageY-c.top||0]);if(this._aspectRatio||b.shiftKey)c=this._updateRatio(c,b);c=this._respectSize(c,b);this._propagate("resize",
+b);a.css({top:this.position.top+"px",left:this.position.left+"px",width:this.size.width+"px",height:this.size.height+"px"});!this._helper&&this._proportionallyResizeElements.length&&this._proportionallyResize();this._updateCache(c);this._trigger("resize",b,this.ui());return false},_mouseStop:function(b){this.resizing=false;var a=this.options,c=this;if(this._helper){var d=this._proportionallyResizeElements,f=d.length&&/textarea/i.test(d[0].nodeName);d=f&&e.ui.hasScroll(d[0],"left")?0:c.sizeDiff.height;
+f=f?0:c.sizeDiff.width;f={width:c.helper.width()-f,height:c.helper.height()-d};d=parseInt(c.element.css("left"),10)+(c.position.left-c.originalPosition.left)||null;var g=parseInt(c.element.css("top"),10)+(c.position.top-c.originalPosition.top)||null;a.animate||this.element.css(e.extend(f,{top:g,left:d}));c.helper.height(c.size.height);c.helper.width(c.size.width);this._helper&&!a.animate&&this._proportionallyResize()}e("body").css("cursor","auto");this.element.removeClass("ui-resizable-resizing");
+this._propagate("stop",b);this._helper&&this.helper.remove();return false},_updateCache:function(b){this.offset=this.helper.offset();if(l(b.left))this.position.left=b.left;if(l(b.top))this.position.top=b.top;if(l(b.height))this.size.height=b.height;if(l(b.width))this.size.width=b.width},_updateRatio:function(b){var a=this.position,c=this.size,d=this.axis;if(b.height)b.width=c.height*this.aspectRatio;else if(b.width)b.height=c.width/this.aspectRatio;if(d=="sw"){b.left=a.left+(c.width-b.width);b.top=
+null}if(d=="nw"){b.top=a.top+(c.height-b.height);b.left=a.left+(c.width-b.width)}return b},_respectSize:function(b){var a=this.options,c=this.axis,d=l(b.width)&&a.maxWidth&&a.maxWidth<b.width,f=l(b.height)&&a.maxHeight&&a.maxHeight<b.height,g=l(b.width)&&a.minWidth&&a.minWidth>b.width,h=l(b.height)&&a.minHeight&&a.minHeight>b.height;if(g)b.width=a.minWidth;if(h)b.height=a.minHeight;if(d)b.width=a.maxWidth;if(f)b.height=a.maxHeight;var i=this.originalPosition.left+this.originalSize.width,j=this.position.top+
+this.size.height,k=/sw|nw|w/.test(c);c=/nw|ne|n/.test(c);if(g&&k)b.left=i-a.minWidth;if(d&&k)b.left=i-a.maxWidth;if(h&&c)b.top=j-a.minHeight;if(f&&c)b.top=j-a.maxHeight;if((a=!b.width&&!b.height)&&!b.left&&b.top)b.top=null;else if(a&&!b.top&&b.left)b.left=null;return b},_proportionallyResize:function(){if(this._proportionallyResizeElements.length)for(var b=this.helper||this.element,a=0;a<this._proportionallyResizeElements.length;a++){var c=this._proportionallyResizeElements[a];if(!this.borderDif){var d=
+[c.css("borderTopWidth"),c.css("borderRightWidth"),c.css("borderBottomWidth"),c.css("borderLeftWidth")],f=[c.css("paddingTop"),c.css("paddingRight"),c.css("paddingBottom"),c.css("paddingLeft")];this.borderDif=e.map(d,function(g,h){g=parseInt(g,10)||0;h=parseInt(f[h],10)||0;return g+h})}e.browser.msie&&(e(b).is(":hidden")||e(b).parents(":hidden").length)||c.css({height:b.height()-this.borderDif[0]-this.borderDif[2]||0,width:b.width()-this.borderDif[1]-this.borderDif[3]||0})}},_renderProxy:function(){var b=
+this.options;this.elementOffset=this.element.offset();if(this._helper){this.helper=this.helper||e('<div style="overflow:hidden;"></div>');var a=e.browser.msie&&e.browser.version<7,c=a?1:0;a=a?2:-1;this.helper.addClass(this._helper).css({width:this.element.outerWidth()+a,height:this.element.outerHeight()+a,position:"absolute",left:this.elementOffset.left-c+"px",top:this.elementOffset.top-c+"px",zIndex:++b.zIndex});this.helper.appendTo("body").disableSelection()}else this.helper=this.element},_change:{e:function(b,
+a){return{width:this.originalSize.width+a}},w:function(b,a){return{left:this.originalPosition.left+a,width:this.originalSize.width-a}},n:function(b,a,c){return{top:this.originalPosition.top+c,height:this.originalSize.height-c}},s:function(b,a,c){return{height:this.originalSize.height+c}},se:function(b,a,c){return e.extend(this._change.s.apply(this,arguments),this._change.e.apply(this,[b,a,c]))},sw:function(b,a,c){return e.extend(this._change.s.apply(this,arguments),this._change.w.apply(this,[b,a,
+c]))},ne:function(b,a,c){return e.extend(this._change.n.apply(this,arguments),this._change.e.apply(this,[b,a,c]))},nw:function(b,a,c){return e.extend(this._change.n.apply(this,arguments),this._change.w.apply(this,[b,a,c]))}},_propagate:function(b,a){e.ui.plugin.call(this,b,[a,this.ui()]);b!="resize"&&this._trigger(b,a,this.ui())},plugins:{},ui:function(){return{originalElement:this.originalElement,element:this.element,helper:this.helper,position:this.position,size:this.size,originalSize:this.originalSize,
+originalPosition:this.originalPosition}}});e.extend(e.ui.resizable,{version:"1.8.10"});e.ui.plugin.add("resizable","alsoResize",{start:function(){var b=e(this).data("resizable").options,a=function(c){e(c).each(function(){var d=e(this);d.data("resizable-alsoresize",{width:parseInt(d.width(),10),height:parseInt(d.height(),10),left:parseInt(d.css("left"),10),top:parseInt(d.css("top"),10),position:d.css("position")})})};if(typeof b.alsoResize=="object"&&!b.alsoResize.parentNode)if(b.alsoResize.length){b.alsoResize=
+b.alsoResize[0];a(b.alsoResize)}else e.each(b.alsoResize,function(c){a(c)});else a(b.alsoResize)},resize:function(b,a){var c=e(this).data("resizable");b=c.options;var d=c.originalSize,f=c.originalPosition,g={height:c.size.height-d.height||0,width:c.size.width-d.width||0,top:c.position.top-f.top||0,left:c.position.left-f.left||0},h=function(i,j){e(i).each(function(){var k=e(this),q=e(this).data("resizable-alsoresize"),p={},r=j&&j.length?j:k.parents(a.originalElement[0]).length?["width","height"]:["width",
+"height","top","left"];e.each(r,function(n,o){if((n=(q[o]||0)+(g[o]||0))&&n>=0)p[o]=n||null});if(e.browser.opera&&/relative/.test(k.css("position"))){c._revertToRelativePosition=true;k.css({position:"absolute",top:"auto",left:"auto"})}k.css(p)})};typeof b.alsoResize=="object"&&!b.alsoResize.nodeType?e.each(b.alsoResize,function(i,j){h(i,j)}):h(b.alsoResize)},stop:function(){var b=e(this).data("resizable"),a=b.options,c=function(d){e(d).each(function(){var f=e(this);f.css({position:f.data("resizable-alsoresize").position})})};
+if(b._revertToRelativePosition){b._revertToRelativePosition=false;typeof a.alsoResize=="object"&&!a.alsoResize.nodeType?e.each(a.alsoResize,function(d){c(d)}):c(a.alsoResize)}e(this).removeData("resizable-alsoresize")}});e.ui.plugin.add("resizable","animate",{stop:function(b){var a=e(this).data("resizable"),c=a.options,d=a._proportionallyResizeElements,f=d.length&&/textarea/i.test(d[0].nodeName),g=f&&e.ui.hasScroll(d[0],"left")?0:a.sizeDiff.height;f={width:a.size.width-(f?0:a.sizeDiff.width),height:a.size.height-
+g};g=parseInt(a.element.css("left"),10)+(a.position.left-a.originalPosition.left)||null;var h=parseInt(a.element.css("top"),10)+(a.position.top-a.originalPosition.top)||null;a.element.animate(e.extend(f,h&&g?{top:h,left:g}:{}),{duration:c.animateDuration,easing:c.animateEasing,step:function(){var i={width:parseInt(a.element.css("width"),10),height:parseInt(a.element.css("height"),10),top:parseInt(a.element.css("top"),10),left:parseInt(a.element.css("left"),10)};d&&d.length&&e(d[0]).css({width:i.width,
+height:i.height});a._updateCache(i);a._propagate("resize",b)}})}});e.ui.plugin.add("resizable","containment",{start:function(){var b=e(this).data("resizable"),a=b.element,c=b.options.containment;if(a=c instanceof e?c.get(0):/parent/.test(c)?a.parent().get(0):c){b.containerElement=e(a);if(/document/.test(c)||c==document){b.containerOffset={left:0,top:0};b.containerPosition={left:0,top:0};b.parentData={element:e(document),left:0,top:0,width:e(document).width(),height:e(document).height()||document.body.parentNode.scrollHeight}}else{var d=
+e(a),f=[];e(["Top","Right","Left","Bottom"]).each(function(i,j){f[i]=m(d.css("padding"+j))});b.containerOffset=d.offset();b.containerPosition=d.position();b.containerSize={height:d.innerHeight()-f[3],width:d.innerWidth()-f[1]};c=b.containerOffset;var g=b.containerSize.height,h=b.containerSize.width;h=e.ui.hasScroll(a,"left")?a.scrollWidth:h;g=e.ui.hasScroll(a)?a.scrollHeight:g;b.parentData={element:a,left:c.left,top:c.top,width:h,height:g}}}},resize:function(b){var a=e(this).data("resizable"),c=a.options,
+d=a.containerOffset,f=a.position;b=a._aspectRatio||b.shiftKey;var g={top:0,left:0},h=a.containerElement;if(h[0]!=document&&/static/.test(h.css("position")))g=d;if(f.left<(a._helper?d.left:0)){a.size.width+=a._helper?a.position.left-d.left:a.position.left-g.left;if(b)a.size.height=a.size.width/c.aspectRatio;a.position.left=c.helper?d.left:0}if(f.top<(a._helper?d.top:0)){a.size.height+=a._helper?a.position.top-d.top:a.position.top;if(b)a.size.width=a.size.height*c.aspectRatio;a.position.top=a._helper?
+d.top:0}a.offset.left=a.parentData.left+a.position.left;a.offset.top=a.parentData.top+a.position.top;c=Math.abs((a._helper?a.offset.left-g.left:a.offset.left-g.left)+a.sizeDiff.width);d=Math.abs((a._helper?a.offset.top-g.top:a.offset.top-d.top)+a.sizeDiff.height);f=a.containerElement.get(0)==a.element.parent().get(0);g=/relative|absolute/.test(a.containerElement.css("position"));if(f&&g)c-=a.parentData.left;if(c+a.size.width>=a.parentData.width){a.size.width=a.parentData.width-c;if(b)a.size.height=
+a.size.width/a.aspectRatio}if(d+a.size.height>=a.parentData.height){a.size.height=a.parentData.height-d;if(b)a.size.width=a.size.height*a.aspectRatio}},stop:function(){var b=e(this).data("resizable"),a=b.options,c=b.containerOffset,d=b.containerPosition,f=b.containerElement,g=e(b.helper),h=g.offset(),i=g.outerWidth()-b.sizeDiff.width;g=g.outerHeight()-b.sizeDiff.height;b._helper&&!a.animate&&/relative/.test(f.css("position"))&&e(this).css({left:h.left-d.left-c.left,width:i,height:g});b._helper&&!a.animate&&
+/static/.test(f.css("position"))&&e(this).css({left:h.left-d.left-c.left,width:i,height:g})}});e.ui.plugin.add("resizable","ghost",{start:function(){var b=e(this).data("resizable"),a=b.options,c=b.size;b.ghost=b.originalElement.clone();b.ghost.css({opacity:0.25,display:"block",position:"relative",height:c.height,width:c.width,margin:0,left:0,top:0}).addClass("ui-resizable-ghost").addClass(typeof a.ghost=="string"?a.ghost:"");b.ghost.appendTo(b.helper)},resize:function(){var b=e(this).data("resizable");
+b.ghost&&b.ghost.css({position:"relative",height:b.size.height,width:b.size.width})},stop:function(){var b=e(this).data("resizable");b.ghost&&b.helper&&b.helper.get(0).removeChild(b.ghost.get(0))}});e.ui.plugin.add("resizable","grid",{resize:function(){var b=e(this).data("resizable"),a=b.options,c=b.size,d=b.originalSize,f=b.originalPosition,g=b.axis;a.grid=typeof a.grid=="number"?[a.grid,a.grid]:a.grid;var h=Math.round((c.width-d.width)/(a.grid[0]||1))*(a.grid[0]||1);a=Math.round((c.height-d.height)/
+(a.grid[1]||1))*(a.grid[1]||1);if(/^(se|s|e)$/.test(g)){b.size.width=d.width+h;b.size.height=d.height+a}else if(/^(ne)$/.test(g)){b.size.width=d.width+h;b.size.height=d.height+a;b.position.top=f.top-a}else{if(/^(sw)$/.test(g)){b.size.width=d.width+h;b.size.height=d.height+a}else{b.size.width=d.width+h;b.size.height=d.height+a;b.position.top=f.top-a}b.position.left=f.left-h}}});var m=function(b){return parseInt(b,10)||0},l=function(b){return!isNaN(parseInt(b,10))}})(jQuery);
+;/*
+ * jQuery UI Selectable 1.8.10
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Selectables
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ *	jquery.ui.mouse.js
+ *	jquery.ui.widget.js
+ */
+(function(e){e.widget("ui.selectable",e.ui.mouse,{options:{appendTo:"body",autoRefresh:true,distance:0,filter:"*",tolerance:"touch"},_create:function(){var c=this;this.element.addClass("ui-selectable");this.dragged=false;var f;this.refresh=function(){f=e(c.options.filter,c.element[0]);f.each(function(){var d=e(this),b=d.offset();e.data(this,"selectable-item",{element:this,$element:d,left:b.left,top:b.top,right:b.left+d.outerWidth(),bottom:b.top+d.outerHeight(),startselected:false,selected:d.hasClass("ui-selected"),
+selecting:d.hasClass("ui-selecting"),unselecting:d.hasClass("ui-unselecting")})})};this.refresh();this.selectees=f.addClass("ui-selectee");this._mouseInit();this.helper=e("<div class='ui-selectable-helper'></div>")},destroy:function(){this.selectees.removeClass("ui-selectee").removeData("selectable-item");this.element.removeClass("ui-selectable ui-selectable-disabled").removeData("selectable").unbind(".selectable");this._mouseDestroy();return this},_mouseStart:function(c){var f=this;this.opos=[c.pageX,
+c.pageY];if(!this.options.disabled){var d=this.options;this.selectees=e(d.filter,this.element[0]);this._trigger("start",c);e(d.appendTo).append(this.helper);this.helper.css({left:c.clientX,top:c.clientY,width:0,height:0});d.autoRefresh&&this.refresh();this.selectees.filter(".ui-selected").each(function(){var b=e.data(this,"selectable-item");b.startselected=true;if(!c.metaKey){b.$element.removeClass("ui-selected");b.selected=false;b.$element.addClass("ui-unselecting");b.unselecting=true;f._trigger("unselecting",
+c,{unselecting:b.element})}});e(c.target).parents().andSelf().each(function(){var b=e.data(this,"selectable-item");if(b){var g=!c.metaKey||!b.$element.hasClass("ui-selected");b.$element.removeClass(g?"ui-unselecting":"ui-selected").addClass(g?"ui-selecting":"ui-unselecting");b.unselecting=!g;b.selecting=g;(b.selected=g)?f._trigger("selecting",c,{selecting:b.element}):f._trigger("unselecting",c,{unselecting:b.element});return false}})}},_mouseDrag:function(c){var f=this;this.dragged=true;if(!this.options.disabled){var d=
+this.options,b=this.opos[0],g=this.opos[1],h=c.pageX,i=c.pageY;if(b>h){var j=h;h=b;b=j}if(g>i){j=i;i=g;g=j}this.helper.css({left:b,top:g,width:h-b,height:i-g});this.selectees.each(function(){var a=e.data(this,"selectable-item");if(!(!a||a.element==f.element[0])){var k=false;if(d.tolerance=="touch")k=!(a.left>h||a.right<b||a.top>i||a.bottom<g);else if(d.tolerance=="fit")k=a.left>b&&a.right<h&&a.top>g&&a.bottom<i;if(k){if(a.selected){a.$element.removeClass("ui-selected");a.selected=false}if(a.unselecting){a.$element.removeClass("ui-unselecting");
+a.unselecting=false}if(!a.selecting){a.$element.addClass("ui-selecting");a.selecting=true;f._trigger("selecting",c,{selecting:a.element})}}else{if(a.selecting)if(c.metaKey&&a.startselected){a.$element.removeClass("ui-selecting");a.selecting=false;a.$element.addClass("ui-selected");a.selected=true}else{a.$element.removeClass("ui-selecting");a.selecting=false;if(a.startselected){a.$element.addClass("ui-unselecting");a.unselecting=true}f._trigger("unselecting",c,{unselecting:a.element})}if(a.selected)if(!c.metaKey&&
+!a.startselected){a.$element.removeClass("ui-selected");a.selected=false;a.$element.addClass("ui-unselecting");a.unselecting=true;f._trigger("unselecting",c,{unselecting:a.element})}}}});return false}},_mouseStop:function(c){var f=this;this.dragged=false;e(".ui-unselecting",this.element[0]).each(function(){var d=e.data(this,"selectable-item");d.$element.removeClass("ui-unselecting");d.unselecting=false;d.startselected=false;f._trigger("unselected",c,{unselected:d.element})});e(".ui-selecting",this.element[0]).each(function(){var d=
+e.data(this,"selectable-item");d.$element.removeClass("ui-selecting").addClass("ui-selected");d.selecting=false;d.selected=true;d.startselected=true;f._trigger("selected",c,{selected:d.element})});this._trigger("stop",c);this.helper.remove();return false}});e.extend(e.ui.selectable,{version:"1.8.10"})})(jQuery);
+;/*
+ * jQuery UI Sortable 1.8.10
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Sortables
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ *	jquery.ui.mouse.js
+ *	jquery.ui.widget.js
+ */
+(function(d){d.widget("ui.sortable",d.ui.mouse,{widgetEventPrefix:"sort",options:{appendTo:"parent",axis:false,connectWith:false,containment:false,cursor:"auto",cursorAt:false,dropOnEmpty:true,forcePlaceholderSize:false,forceHelperSize:false,grid:false,handle:false,helper:"original",items:"> *",opacity:false,placeholder:false,revert:false,scroll:true,scrollSensitivity:20,scrollSpeed:20,scope:"default",tolerance:"intersect",zIndex:1E3},_create:function(){this.containerCache={};this.element.addClass("ui-sortable");
+this.refresh();this.floating=this.items.length?/left|right/.test(this.items[0].item.css("float")):false;this.offset=this.element.offset();this._mouseInit()},destroy:function(){this.element.removeClass("ui-sortable ui-sortable-disabled").removeData("sortable").unbind(".sortable");this._mouseDestroy();for(var a=this.items.length-1;a>=0;a--)this.items[a].item.removeData("sortable-item");return this},_setOption:function(a,b){if(a==="disabled"){this.options[a]=b;this.widget()[b?"addClass":"removeClass"]("ui-sortable-disabled")}else d.Widget.prototype._setOption.apply(this,
+arguments)},_mouseCapture:function(a,b){if(this.reverting)return false;if(this.options.disabled||this.options.type=="static")return false;this._refreshItems(a);var c=null,e=this;d(a.target).parents().each(function(){if(d.data(this,"sortable-item")==e){c=d(this);return false}});if(d.data(a.target,"sortable-item")==e)c=d(a.target);if(!c)return false;if(this.options.handle&&!b){var f=false;d(this.options.handle,c).find("*").andSelf().each(function(){if(this==a.target)f=true});if(!f)return false}this.currentItem=
+c;this._removeCurrentsFromItems();return true},_mouseStart:function(a,b,c){b=this.options;var e=this;this.currentContainer=this;this.refreshPositions();this.helper=this._createHelper(a);this._cacheHelperProportions();this._cacheMargins();this.scrollParent=this.helper.scrollParent();this.offset=this.currentItem.offset();this.offset={top:this.offset.top-this.margins.top,left:this.offset.left-this.margins.left};this.helper.css("position","absolute");this.cssPosition=this.helper.css("position");d.extend(this.offset,
+{click:{left:a.pageX-this.offset.left,top:a.pageY-this.offset.top},parent:this._getParentOffset(),relative:this._getRelativeOffset()});this.originalPosition=this._generatePosition(a);this.originalPageX=a.pageX;this.originalPageY=a.pageY;b.cursorAt&&this._adjustOffsetFromHelper(b.cursorAt);this.domPosition={prev:this.currentItem.prev()[0],parent:this.currentItem.parent()[0]};this.helper[0]!=this.currentItem[0]&&this.currentItem.hide();this._createPlaceholder();b.containment&&this._setContainment();
+if(b.cursor){if(d("body").css("cursor"))this._storedCursor=d("body").css("cursor");d("body").css("cursor",b.cursor)}if(b.opacity){if(this.helper.css("opacity"))this._storedOpacity=this.helper.css("opacity");this.helper.css("opacity",b.opacity)}if(b.zIndex){if(this.helper.css("zIndex"))this._storedZIndex=this.helper.css("zIndex");this.helper.css("zIndex",b.zIndex)}if(this.scrollParent[0]!=document&&this.scrollParent[0].tagName!="HTML")this.overflowOffset=this.scrollParent.offset();this._trigger("start",
+a,this._uiHash());this._preserveHelperProportions||this._cacheHelperProportions();if(!c)for(c=this.containers.length-1;c>=0;c--)this.containers[c]._trigger("activate",a,e._uiHash(this));if(d.ui.ddmanager)d.ui.ddmanager.current=this;d.ui.ddmanager&&!b.dropBehaviour&&d.ui.ddmanager.prepareOffsets(this,a);this.dragging=true;this.helper.addClass("ui-sortable-helper");this._mouseDrag(a);return true},_mouseDrag:function(a){this.position=this._generatePosition(a);this.positionAbs=this._convertPositionTo("absolute");
+if(!this.lastPositionAbs)this.lastPositionAbs=this.positionAbs;if(this.options.scroll){var b=this.options,c=false;if(this.scrollParent[0]!=document&&this.scrollParent[0].tagName!="HTML"){if(this.overflowOffset.top+this.scrollParent[0].offsetHeight-a.pageY<b.scrollSensitivity)this.scrollParent[0].scrollTop=c=this.scrollParent[0].scrollTop+b.scrollSpeed;else if(a.pageY-this.overflowOffset.top<b.scrollSensitivity)this.scrollParent[0].scrollTop=c=this.scrollParent[0].scrollTop-b.scrollSpeed;if(this.overflowOffset.left+
+this.scrollParent[0].offsetWidth-a.pageX<b.scrollSensitivity)this.scrollParent[0].scrollLeft=c=this.scrollParent[0].scrollLeft+b.scrollSpeed;else if(a.pageX-this.overflowOffset.left<b.scrollSensitivity)this.scrollParent[0].scrollLeft=c=this.scrollParent[0].scrollLeft-b.scrollSpeed}else{if(a.pageY-d(document).scrollTop()<b.scrollSensitivity)c=d(document).scrollTop(d(document).scrollTop()-b.scrollSpeed);else if(d(window).height()-(a.pageY-d(document).scrollTop())<b.scrollSensitivity)c=d(document).scrollTop(d(document).scrollTop()+
+b.scrollSpeed);if(a.pageX-d(document).scrollLeft()<b.scrollSensitivity)c=d(document).scrollLeft(d(document).scrollLeft()-b.scrollSpeed);else if(d(window).width()-(a.pageX-d(document).scrollLeft())<b.scrollSensitivity)c=d(document).scrollLeft(d(document).scrollLeft()+b.scrollSpeed)}c!==false&&d.ui.ddmanager&&!b.dropBehaviour&&d.ui.ddmanager.prepareOffsets(this,a)}this.positionAbs=this._convertPositionTo("absolute");if(!this.options.axis||this.options.axis!="y")this.helper[0].style.left=this.position.left+
+"px";if(!this.options.axis||this.options.axis!="x")this.helper[0].style.top=this.position.top+"px";for(b=this.items.length-1;b>=0;b--){c=this.items[b];var e=c.item[0],f=this._intersectsWithPointer(c);if(f)if(e!=this.currentItem[0]&&this.placeholder[f==1?"next":"prev"]()[0]!=e&&!d.ui.contains(this.placeholder[0],e)&&(this.options.type=="semi-dynamic"?!d.ui.contains(this.element[0],e):true)){this.direction=f==1?"down":"up";if(this.options.tolerance=="pointer"||this._intersectsWithSides(c))this._rearrange(a,
+c);else break;this._trigger("change",a,this._uiHash());break}}this._contactContainers(a);d.ui.ddmanager&&d.ui.ddmanager.drag(this,a);this._trigger("sort",a,this._uiHash());this.lastPositionAbs=this.positionAbs;return false},_mouseStop:function(a,b){if(a){d.ui.ddmanager&&!this.options.dropBehaviour&&d.ui.ddmanager.drop(this,a);if(this.options.revert){var c=this;b=c.placeholder.offset();c.reverting=true;d(this.helper).animate({left:b.left-this.offset.parent.left-c.margins.left+(this.offsetParent[0]==
+document.body?0:this.offsetParent[0].scrollLeft),top:b.top-this.offset.parent.top-c.margins.top+(this.offsetParent[0]==document.body?0:this.offsetParent[0].scrollTop)},parseInt(this.options.revert,10)||500,function(){c._clear(a)})}else this._clear(a,b);return false}},cancel:function(){var a=this;if(this.dragging){this._mouseUp({target:null});this.options.helper=="original"?this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper"):this.currentItem.show();for(var b=this.containers.length-
+1;b>=0;b--){this.containers[b]._trigger("deactivate",null,a._uiHash(this));if(this.containers[b].containerCache.over){this.containers[b]._trigger("out",null,a._uiHash(this));this.containers[b].containerCache.over=0}}}if(this.placeholder){this.placeholder[0].parentNode&&this.placeholder[0].parentNode.removeChild(this.placeholder[0]);this.options.helper!="original"&&this.helper&&this.helper[0].parentNode&&this.helper.remove();d.extend(this,{helper:null,dragging:false,reverting:false,_noFinalSort:null});
+this.domPosition.prev?d(this.domPosition.prev).after(this.currentItem):d(this.domPosition.parent).prepend(this.currentItem)}return this},serialize:function(a){var b=this._getItemsAsjQuery(a&&a.connected),c=[];a=a||{};d(b).each(function(){var e=(d(a.item||this).attr(a.attribute||"id")||"").match(a.expression||/(.+)[-=_](.+)/);if(e)c.push((a.key||e[1]+"[]")+"="+(a.key&&a.expression?e[1]:e[2]))});!c.length&&a.key&&c.push(a.key+"=");return c.join("&")},toArray:function(a){var b=this._getItemsAsjQuery(a&&
+a.connected),c=[];a=a||{};b.each(function(){c.push(d(a.item||this).attr(a.attribute||"id")||"")});return c},_intersectsWith:function(a){var b=this.positionAbs.left,c=b+this.helperProportions.width,e=this.positionAbs.top,f=e+this.helperProportions.height,g=a.left,h=g+a.width,i=a.top,k=i+a.height,j=this.offset.click.top,l=this.offset.click.left;j=e+j>i&&e+j<k&&b+l>g&&b+l<h;return this.options.tolerance=="pointer"||this.options.forcePointerForContainers||this.options.tolerance!="pointer"&&this.helperProportions[this.floating?
+"width":"height"]>a[this.floating?"width":"height"]?j:g<b+this.helperProportions.width/2&&c-this.helperProportions.width/2<h&&i<e+this.helperProportions.height/2&&f-this.helperProportions.height/2<k},_intersectsWithPointer:function(a){var b=d.ui.isOverAxis(this.positionAbs.top+this.offset.click.top,a.top,a.height);a=d.ui.isOverAxis(this.positionAbs.left+this.offset.click.left,a.left,a.width);b=b&&a;a=this._getDragVerticalDirection();var c=this._getDragHorizontalDirection();if(!b)return false;return this.floating?
+c&&c=="right"||a=="down"?2:1:a&&(a=="down"?2:1)},_intersectsWithSides:function(a){var b=d.ui.isOverAxis(this.positionAbs.top+this.offset.click.top,a.top+a.height/2,a.height);a=d.ui.isOverAxis(this.positionAbs.left+this.offset.click.left,a.left+a.width/2,a.width);var c=this._getDragVerticalDirection(),e=this._getDragHorizontalDirection();return this.floating&&e?e=="right"&&a||e=="left"&&!a:c&&(c=="down"&&b||c=="up"&&!b)},_getDragVerticalDirection:function(){var a=this.positionAbs.top-this.lastPositionAbs.top;
+return a!=0&&(a>0?"down":"up")},_getDragHorizontalDirection:function(){var a=this.positionAbs.left-this.lastPositionAbs.left;return a!=0&&(a>0?"right":"left")},refresh:function(a){this._refreshItems(a);this.refreshPositions();return this},_connectWith:function(){var a=this.options;return a.connectWith.constructor==String?[a.connectWith]:a.connectWith},_getItemsAsjQuery:function(a){var b=[],c=[],e=this._connectWith();if(e&&a)for(a=e.length-1;a>=0;a--)for(var f=d(e[a]),g=f.length-1;g>=0;g--){var h=
+d.data(f[g],"sortable");if(h&&h!=this&&!h.options.disabled)c.push([d.isFunction(h.options.items)?h.options.items.call(h.element):d(h.options.items,h.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"),h])}c.push([d.isFunction(this.options.items)?this.options.items.call(this.element,null,{options:this.options,item:this.currentItem}):d(this.options.items,this.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"),this]);for(a=c.length-1;a>=0;a--)c[a][0].each(function(){b.push(this)});
+return d(b)},_removeCurrentsFromItems:function(){for(var a=this.currentItem.find(":data(sortable-item)"),b=0;b<this.items.length;b++)for(var c=0;c<a.length;c++)a[c]==this.items[b].item[0]&&this.items.splice(b,1)},_refreshItems:function(a){this.items=[];this.containers=[this];var b=this.items,c=[[d.isFunction(this.options.items)?this.options.items.call(this.element[0],a,{item:this.currentItem}):d(this.options.items,this.element),this]],e=this._connectWith();if(e)for(var f=e.length-1;f>=0;f--)for(var g=
+d(e[f]),h=g.length-1;h>=0;h--){var i=d.data(g[h],"sortable");if(i&&i!=this&&!i.options.disabled){c.push([d.isFunction(i.options.items)?i.options.items.call(i.element[0],a,{item:this.currentItem}):d(i.options.items,i.element),i]);this.containers.push(i)}}for(f=c.length-1;f>=0;f--){a=c[f][1];e=c[f][0];h=0;for(g=e.length;h<g;h++){i=d(e[h]);i.data("sortable-item",a);b.push({item:i,instance:a,width:0,height:0,left:0,top:0})}}},refreshPositions:function(a){if(this.offsetParent&&this.helper)this.offset.parent=
+this._getParentOffset();for(var b=this.items.length-1;b>=0;b--){var c=this.items[b],e=this.options.toleranceElement?d(this.options.toleranceElement,c.item):c.item;if(!a){c.width=e.outerWidth();c.height=e.outerHeight()}e=e.offset();c.left=e.left;c.top=e.top}if(this.options.custom&&this.options.custom.refreshContainers)this.options.custom.refreshContainers.call(this);else for(b=this.containers.length-1;b>=0;b--){e=this.containers[b].element.offset();this.containers[b].containerCache.left=e.left;this.containers[b].containerCache.top=
+e.top;this.containers[b].containerCache.width=this.containers[b].element.outerWidth();this.containers[b].containerCache.height=this.containers[b].element.outerHeight()}return this},_createPlaceholder:function(a){var b=a||this,c=b.options;if(!c.placeholder||c.placeholder.constructor==String){var e=c.placeholder;c.placeholder={element:function(){var f=d(document.createElement(b.currentItem[0].nodeName)).addClass(e||b.currentItem[0].className+" ui-sortable-placeholder").removeClass("ui-sortable-helper")[0];
+if(!e)f.style.visibility="hidden";return f},update:function(f,g){if(!(e&&!c.forcePlaceholderSize)){g.height()||g.height(b.currentItem.innerHeight()-parseInt(b.currentItem.css("paddingTop")||0,10)-parseInt(b.currentItem.css("paddingBottom")||0,10));g.width()||g.width(b.currentItem.innerWidth()-parseInt(b.currentItem.css("paddingLeft")||0,10)-parseInt(b.currentItem.css("paddingRight")||0,10))}}}}b.placeholder=d(c.placeholder.element.call(b.element,b.currentItem));b.currentItem.after(b.placeholder);
+c.placeholder.update(b,b.placeholder)},_contactContainers:function(a){for(var b=null,c=null,e=this.containers.length-1;e>=0;e--)if(!d.ui.contains(this.currentItem[0],this.containers[e].element[0]))if(this._intersectsWith(this.containers[e].containerCache)){if(!(b&&d.ui.contains(this.containers[e].element[0],b.element[0]))){b=this.containers[e];c=e}}else if(this.containers[e].containerCache.over){this.containers[e]._trigger("out",a,this._uiHash(this));this.containers[e].containerCache.over=0}if(b)if(this.containers.length===
+1){this.containers[c]._trigger("over",a,this._uiHash(this));this.containers[c].containerCache.over=1}else if(this.currentContainer!=this.containers[c]){b=1E4;e=null;for(var f=this.positionAbs[this.containers[c].floating?"left":"top"],g=this.items.length-1;g>=0;g--)if(d.ui.contains(this.containers[c].element[0],this.items[g].item[0])){var h=this.items[g][this.containers[c].floating?"left":"top"];if(Math.abs(h-f)<b){b=Math.abs(h-f);e=this.items[g]}}if(e||this.options.dropOnEmpty){this.currentContainer=
+this.containers[c];e?this._rearrange(a,e,null,true):this._rearrange(a,null,this.containers[c].element,true);this._trigger("change",a,this._uiHash());this.containers[c]._trigger("change",a,this._uiHash(this));this.options.placeholder.update(this.currentContainer,this.placeholder);this.containers[c]._trigger("over",a,this._uiHash(this));this.containers[c].containerCache.over=1}}},_createHelper:function(a){var b=this.options;a=d.isFunction(b.helper)?d(b.helper.apply(this.element[0],[a,this.currentItem])):
+b.helper=="clone"?this.currentItem.clone():this.currentItem;a.parents("body").length||d(b.appendTo!="parent"?b.appendTo:this.currentItem[0].parentNode)[0].appendChild(a[0]);if(a[0]==this.currentItem[0])this._storedCSS={width:this.currentItem[0].style.width,height:this.currentItem[0].style.height,position:this.currentItem.css("position"),top:this.currentItem.css("top"),left:this.currentItem.css("left")};if(a[0].style.width==""||b.forceHelperSize)a.width(this.currentItem.width());if(a[0].style.height==
+""||b.forceHelperSize)a.height(this.currentItem.height());return a},_adjustOffsetFromHelper:function(a){if(typeof a=="string")a=a.split(" ");if(d.isArray(a))a={left:+a[0],top:+a[1]||0};if("left"in a)this.offset.click.left=a.left+this.margins.left;if("right"in a)this.offset.click.left=this.helperProportions.width-a.right+this.margins.left;if("top"in a)this.offset.click.top=a.top+this.margins.top;if("bottom"in a)this.offset.click.top=this.helperProportions.height-a.bottom+this.margins.top},_getParentOffset:function(){this.offsetParent=
+this.helper.offsetParent();var a=this.offsetParent.offset();if(this.cssPosition=="absolute"&&this.scrollParent[0]!=document&&d.ui.contains(this.scrollParent[0],this.offsetParent[0])){a.left+=this.scrollParent.scrollLeft();a.top+=this.scrollParent.scrollTop()}if(this.offsetParent[0]==document.body||this.offsetParent[0].tagName&&this.offsetParent[0].tagName.toLowerCase()=="html"&&d.browser.msie)a={top:0,left:0};return{top:a.top+(parseInt(this.offsetParent.css("borderTopWidth"),10)||0),left:a.left+(parseInt(this.offsetParent.css("borderLeftWidth"),
+10)||0)}},_getRelativeOffset:function(){if(this.cssPosition=="relative"){var a=this.currentItem.position();return{top:a.top-(parseInt(this.helper.css("top"),10)||0)+this.scrollParent.scrollTop(),left:a.left-(parseInt(this.helper.css("left"),10)||0)+this.scrollParent.scrollLeft()}}else return{top:0,left:0}},_cacheMargins:function(){this.margins={left:parseInt(this.currentItem.css("marginLeft"),10)||0,top:parseInt(this.currentItem.css("marginTop"),10)||0}},_cacheHelperProportions:function(){this.helperProportions=
+{width:this.helper.outerWidth(),height:this.helper.outerHeight()}},_setContainment:function(){var a=this.options;if(a.containment=="parent")a.containment=this.helper[0].parentNode;if(a.containment=="document"||a.containment=="window")this.containment=[0-this.offset.relative.left-this.offset.parent.left,0-this.offset.relative.top-this.offset.parent.top,d(a.containment=="document"?document:window).width()-this.helperProportions.width-this.margins.left,(d(a.containment=="document"?document:window).height()||
+document.body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top];if(!/^(document|window|parent)$/.test(a.containment)){var b=d(a.containment)[0];a=d(a.containment).offset();var c=d(b).css("overflow")!="hidden";this.containment=[a.left+(parseInt(d(b).css("borderLeftWidth"),10)||0)+(parseInt(d(b).css("paddingLeft"),10)||0)-this.margins.left,a.top+(parseInt(d(b).css("borderTopWidth"),10)||0)+(parseInt(d(b).css("paddingTop"),10)||0)-this.margins.top,a.left+(c?Math.max(b.scrollWidth,
+b.offsetWidth):b.offsetWidth)-(parseInt(d(b).css("borderLeftWidth"),10)||0)-(parseInt(d(b).css("paddingRight"),10)||0)-this.helperProportions.width-this.margins.left,a.top+(c?Math.max(b.scrollHeight,b.offsetHeight):b.offsetHeight)-(parseInt(d(b).css("borderTopWidth"),10)||0)-(parseInt(d(b).css("paddingBottom"),10)||0)-this.helperProportions.height-this.margins.top]}},_convertPositionTo:function(a,b){if(!b)b=this.position;a=a=="absolute"?1:-1;var c=this.cssPosition=="absolute"&&!(this.scrollParent[0]!=
+document&&d.ui.contains(this.scrollParent[0],this.offsetParent[0]))?this.offsetParent:this.scrollParent,e=/(html|body)/i.test(c[0].tagName);return{top:b.top+this.offset.relative.top*a+this.offset.parent.top*a-(d.browser.safari&&this.cssPosition=="fixed"?0:(this.cssPosition=="fixed"?-this.scrollParent.scrollTop():e?0:c.scrollTop())*a),left:b.left+this.offset.relative.left*a+this.offset.parent.left*a-(d.browser.safari&&this.cssPosition=="fixed"?0:(this.cssPosition=="fixed"?-this.scrollParent.scrollLeft():
+e?0:c.scrollLeft())*a)}},_generatePosition:function(a){var b=this.options,c=this.cssPosition=="absolute"&&!(this.scrollParent[0]!=document&&d.ui.contains(this.scrollParent[0],this.offsetParent[0]))?this.offsetParent:this.scrollParent,e=/(html|body)/i.test(c[0].tagName);if(this.cssPosition=="relative"&&!(this.scrollParent[0]!=document&&this.scrollParent[0]!=this.offsetParent[0]))this.offset.relative=this._getRelativeOffset();var f=a.pageX,g=a.pageY;if(this.originalPosition){if(this.containment){if(a.pageX-
+this.offset.click.left<this.containment[0])f=this.containment[0]+this.offset.click.left;if(a.pageY-this.offset.click.top<this.containment[1])g=this.containment[1]+this.offset.click.top;if(a.pageX-this.offset.click.left>this.containment[2])f=this.containment[2]+this.offset.click.left;if(a.pageY-this.offset.click.top>this.containment[3])g=this.containment[3]+this.offset.click.top}if(b.grid){g=this.originalPageY+Math.round((g-this.originalPageY)/b.grid[1])*b.grid[1];g=this.containment?!(g-this.offset.click.top<
+this.containment[1]||g-this.offset.click.top>this.containment[3])?g:!(g-this.offset.click.top<this.containment[1])?g-b.grid[1]:g+b.grid[1]:g;f=this.originalPageX+Math.round((f-this.originalPageX)/b.grid[0])*b.grid[0];f=this.containment?!(f-this.offset.click.left<this.containment[0]||f-this.offset.click.left>this.containment[2])?f:!(f-this.offset.click.left<this.containment[0])?f-b.grid[0]:f+b.grid[0]:f}}return{top:g-this.offset.click.top-this.offset.relative.top-this.offset.parent.top+(d.browser.safari&&
+this.cssPosition=="fixed"?0:this.cssPosition=="fixed"?-this.scrollParent.scrollTop():e?0:c.scrollTop()),left:f-this.offset.click.left-this.offset.relative.left-this.offset.parent.left+(d.browser.safari&&this.cssPosition=="fixed"?0:this.cssPosition=="fixed"?-this.scrollParent.scrollLeft():e?0:c.scrollLeft())}},_rearrange:function(a,b,c,e){c?c[0].appendChild(this.placeholder[0]):b.item[0].parentNode.insertBefore(this.placeholder[0],this.direction=="down"?b.item[0]:b.item[0].nextSibling);this.counter=
+this.counter?++this.counter:1;var f=this,g=this.counter;window.setTimeout(function(){g==f.counter&&f.refreshPositions(!e)},0)},_clear:function(a,b){this.reverting=false;var c=[];!this._noFinalSort&&this.currentItem[0].parentNode&&this.placeholder.before(this.currentItem);this._noFinalSort=null;if(this.helper[0]==this.currentItem[0]){for(var e in this._storedCSS)if(this._storedCSS[e]=="auto"||this._storedCSS[e]=="static")this._storedCSS[e]="";this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper")}else this.currentItem.show();
+this.fromOutside&&!b&&c.push(function(f){this._trigger("receive",f,this._uiHash(this.fromOutside))});if((this.fromOutside||this.domPosition.prev!=this.currentItem.prev().not(".ui-sortable-helper")[0]||this.domPosition.parent!=this.currentItem.parent()[0])&&!b)c.push(function(f){this._trigger("update",f,this._uiHash())});if(!d.ui.contains(this.element[0],this.currentItem[0])){b||c.push(function(f){this._trigger("remove",f,this._uiHash())});for(e=this.containers.length-1;e>=0;e--)if(d.ui.contains(this.containers[e].element[0],
+this.currentItem[0])&&!b){c.push(function(f){return function(g){f._trigger("receive",g,this._uiHash(this))}}.call(this,this.containers[e]));c.push(function(f){return function(g){f._trigger("update",g,this._uiHash(this))}}.call(this,this.containers[e]))}}for(e=this.containers.length-1;e>=0;e--){b||c.push(function(f){return function(g){f._trigger("deactivate",g,this._uiHash(this))}}.call(this,this.containers[e]));if(this.containers[e].containerCache.over){c.push(function(f){return function(g){f._trigger("out",
+g,this._uiHash(this))}}.call(this,this.containers[e]));this.containers[e].containerCache.over=0}}this._storedCursor&&d("body").css("cursor",this._storedCursor);this._storedOpacity&&this.helper.css("opacity",this._storedOpacity);if(this._storedZIndex)this.helper.css("zIndex",this._storedZIndex=="auto"?"":this._storedZIndex);this.dragging=false;if(this.cancelHelperRemoval){if(!b){this._trigger("beforeStop",a,this._uiHash());for(e=0;e<c.length;e++)c[e].call(this,a);this._trigger("stop",a,this._uiHash())}return false}b||
+this._trigger("beforeStop",a,this._uiHash());this.placeholder[0].parentNode.removeChild(this.placeholder[0]);this.helper[0]!=this.currentItem[0]&&this.helper.remove();this.helper=null;if(!b){for(e=0;e<c.length;e++)c[e].call(this,a);this._trigger("stop",a,this._uiHash())}this.fromOutside=false;return true},_trigger:function(){d.Widget.prototype._trigger.apply(this,arguments)===false&&this.cancel()},_uiHash:function(a){var b=a||this;return{helper:b.helper,placeholder:b.placeholder||d([]),position:b.position,
+originalPosition:b.originalPosition,offset:b.positionAbs,item:b.currentItem,sender:a?a.element:null}}});d.extend(d.ui.sortable,{version:"1.8.10"})})(jQuery);
+;/*
+ * jQuery UI Accordion 1.8.10
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Accordion
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ *	jquery.ui.widget.js
+ */
+(function(c){c.widget("ui.accordion",{options:{active:0,animated:"slide",autoHeight:true,clearStyle:false,collapsible:false,event:"click",fillSpace:false,header:"> li > :first-child,> :not(li):even",icons:{header:"ui-icon-triangle-1-e",headerSelected:"ui-icon-triangle-1-s"},navigation:false,navigationFilter:function(){return this.href.toLowerCase()===location.href.toLowerCase()}},_create:function(){var a=this,b=a.options;a.running=0;a.element.addClass("ui-accordion ui-widget ui-helper-reset").children("li").addClass("ui-accordion-li-fix");
+a.headers=a.element.find(b.header).addClass("ui-accordion-header ui-helper-reset ui-state-default ui-corner-all").bind("mouseenter.accordion",function(){b.disabled||c(this).addClass("ui-state-hover")}).bind("mouseleave.accordion",function(){b.disabled||c(this).removeClass("ui-state-hover")}).bind("focus.accordion",function(){b.disabled||c(this).addClass("ui-state-focus")}).bind("blur.accordion",function(){b.disabled||c(this).removeClass("ui-state-focus")});a.headers.next().addClass("ui-accordion-content ui-helper-reset ui-widget-content ui-corner-bottom");
+if(b.navigation){var d=a.element.find("a").filter(b.navigationFilter).eq(0);if(d.length){var h=d.closest(".ui-accordion-header");a.active=h.length?h:d.closest(".ui-accordion-content").prev()}}a.active=a._findActive(a.active||b.active).addClass("ui-state-default ui-state-active").toggleClass("ui-corner-all").toggleClass("ui-corner-top");a.active.next().addClass("ui-accordion-content-active");a._createIcons();a.resize();a.element.attr("role","tablist");a.headers.attr("role","tab").bind("keydown.accordion",
+function(f){return a._keydown(f)}).next().attr("role","tabpanel");a.headers.not(a.active||"").attr({"aria-expanded":"false",tabIndex:-1}).next().hide();a.active.length?a.active.attr({"aria-expanded":"true",tabIndex:0}):a.headers.eq(0).attr("tabIndex",0);c.browser.safari||a.headers.find("a").attr("tabIndex",-1);b.event&&a.headers.bind(b.event.split(" ").join(".accordion ")+".accordion",function(f){a._clickHandler.call(a,f,this);f.preventDefault()})},_createIcons:function(){var a=this.options;if(a.icons){c("<span></span>").addClass("ui-icon "+
+a.icons.header).prependTo(this.headers);this.active.children(".ui-icon").toggleClass(a.icons.header).toggleClass(a.icons.headerSelected);this.element.addClass("ui-accordion-icons")}},_destroyIcons:function(){this.headers.children(".ui-icon").remove();this.element.removeClass("ui-accordion-icons")},destroy:function(){var a=this.options;this.element.removeClass("ui-accordion ui-widget ui-helper-reset").removeAttr("role");this.headers.unbind(".accordion").removeClass("ui-accordion-header ui-accordion-disabled ui-helper-reset ui-state-default ui-corner-all ui-state-active ui-state-disabled ui-corner-top").removeAttr("role").removeAttr("aria-expanded").removeAttr("tabIndex");
+this.headers.find("a").removeAttr("tabIndex");this._destroyIcons();var b=this.headers.next().css("display","").removeAttr("role").removeClass("ui-helper-reset ui-widget-content ui-corner-bottom ui-accordion-content ui-accordion-content-active ui-accordion-disabled ui-state-disabled");if(a.autoHeight||a.fillHeight)b.css("height","");return c.Widget.prototype.destroy.call(this)},_setOption:function(a,b){c.Widget.prototype._setOption.apply(this,arguments);a=="active"&&this.activate(b);if(a=="icons"){this._destroyIcons();
+b&&this._createIcons()}if(a=="disabled")this.headers.add(this.headers.next())[b?"addClass":"removeClass"]("ui-accordion-disabled ui-state-disabled")},_keydown:function(a){if(!(this.options.disabled||a.altKey||a.ctrlKey)){var b=c.ui.keyCode,d=this.headers.length,h=this.headers.index(a.target),f=false;switch(a.keyCode){case b.RIGHT:case b.DOWN:f=this.headers[(h+1)%d];break;case b.LEFT:case b.UP:f=this.headers[(h-1+d)%d];break;case b.SPACE:case b.ENTER:this._clickHandler({target:a.target},a.target);
+a.preventDefault()}if(f){c(a.target).attr("tabIndex",-1);c(f).attr("tabIndex",0);f.focus();return false}return true}},resize:function(){var a=this.options,b;if(a.fillSpace){if(c.browser.msie){var d=this.element.parent().css("overflow");this.element.parent().css("overflow","hidden")}b=this.element.parent().height();c.browser.msie&&this.element.parent().css("overflow",d);this.headers.each(function(){b-=c(this).outerHeight(true)});this.headers.next().each(function(){c(this).height(Math.max(0,b-c(this).innerHeight()+
+c(this).height()))}).css("overflow","auto")}else if(a.autoHeight){b=0;this.headers.next().each(function(){b=Math.max(b,c(this).height("").height())}).height(b)}return this},activate:function(a){this.options.active=a;a=this._findActive(a)[0];this._clickHandler({target:a},a);return this},_findActive:function(a){return a?typeof a==="number"?this.headers.filter(":eq("+a+")"):this.headers.not(this.headers.not(a)):a===false?c([]):this.headers.filter(":eq(0)")},_clickHandler:function(a,b){var d=this.options;
+if(!d.disabled)if(a.target){a=c(a.currentTarget||b);b=a[0]===this.active[0];d.active=d.collapsible&&b?false:this.headers.index(a);if(!(this.running||!d.collapsible&&b)){var h=this.active;j=a.next();g=this.active.next();e={options:d,newHeader:b&&d.collapsible?c([]):a,oldHeader:this.active,newContent:b&&d.collapsible?c([]):j,oldContent:g};var f=this.headers.index(this.active[0])>this.headers.index(a[0]);this.active=b?c([]):a;this._toggle(j,g,e,b,f);h.removeClass("ui-state-active ui-corner-top").addClass("ui-state-default ui-corner-all").children(".ui-icon").removeClass(d.icons.headerSelected).addClass(d.icons.header);
+if(!b){a.removeClass("ui-state-default ui-corner-all").addClass("ui-state-active ui-corner-top").children(".ui-icon").removeClass(d.icons.header).addClass(d.icons.headerSelected);a.next().addClass("ui-accordion-content-active")}}}else if(d.collapsible){this.active.removeClass("ui-state-active ui-corner-top").addClass("ui-state-default ui-corner-all").children(".ui-icon").removeClass(d.icons.headerSelected).addClass(d.icons.header);this.active.next().addClass("ui-accordion-content-active");var g=this.active.next(),
+e={options:d,newHeader:c([]),oldHeader:d.active,newContent:c([]),oldContent:g},j=this.active=c([]);this._toggle(j,g,e)}},_toggle:function(a,b,d,h,f){var g=this,e=g.options;g.toShow=a;g.toHide=b;g.data=d;var j=function(){if(g)return g._completed.apply(g,arguments)};g._trigger("changestart",null,g.data);g.running=b.size()===0?a.size():b.size();if(e.animated){d={};d=e.collapsible&&h?{toShow:c([]),toHide:b,complete:j,down:f,autoHeight:e.autoHeight||e.fillSpace}:{toShow:a,toHide:b,complete:j,down:f,autoHeight:e.autoHeight||
+e.fillSpace};if(!e.proxied)e.proxied=e.animated;if(!e.proxiedDuration)e.proxiedDuration=e.duration;e.animated=c.isFunction(e.proxied)?e.proxied(d):e.proxied;e.duration=c.isFunction(e.proxiedDuration)?e.proxiedDuration(d):e.proxiedDuration;h=c.ui.accordion.animations;var i=e.duration,k=e.animated;if(k&&!h[k]&&!c.easing[k])k="slide";h[k]||(h[k]=function(l){this.slide(l,{easing:k,duration:i||700})});h[k](d)}else{if(e.collapsible&&h)a.toggle();else{b.hide();a.show()}j(true)}b.prev().attr({"aria-expanded":"false",
+tabIndex:-1}).blur();a.prev().attr({"aria-expanded":"true",tabIndex:0}).focus()},_completed:function(a){this.running=a?0:--this.running;if(!this.running){this.options.clearStyle&&this.toShow.add(this.toHide).css({height:"",overflow:""});this.toHide.removeClass("ui-accordion-content-active");if(this.toHide.length)this.toHide.parent()[0].className=this.toHide.parent()[0].className;this._trigger("change",null,this.data)}}});c.extend(c.ui.accordion,{version:"1.8.10",animations:{slide:function(a,b){a=
+c.extend({easing:"swing",duration:300},a,b);if(a.toHide.size())if(a.toShow.size()){var d=a.toShow.css("overflow"),h=0,f={},g={},e;b=a.toShow;e=b[0].style.width;b.width(parseInt(b.parent().width(),10)-parseInt(b.css("paddingLeft"),10)-parseInt(b.css("paddingRight"),10)-(parseInt(b.css("borderLeftWidth"),10)||0)-(parseInt(b.css("borderRightWidth"),10)||0));c.each(["height","paddingTop","paddingBottom"],function(j,i){g[i]="hide";j=(""+c.css(a.toShow[0],i)).match(/^([\d+-.]+)(.*)$/);f[i]={value:j[1],
+unit:j[2]||"px"}});a.toShow.css({height:0,overflow:"hidden"}).show();a.toHide.filter(":hidden").each(a.complete).end().filter(":visible").animate(g,{step:function(j,i){if(i.prop=="height")h=i.end-i.start===0?0:(i.now-i.start)/(i.end-i.start);a.toShow[0].style[i.prop]=h*f[i.prop].value+f[i.prop].unit},duration:a.duration,easing:a.easing,complete:function(){a.autoHeight||a.toShow.css("height","");a.toShow.css({width:e,overflow:d});a.complete()}})}else a.toHide.animate({height:"hide",paddingTop:"hide",
+paddingBottom:"hide"},a);else a.toShow.animate({height:"show",paddingTop:"show",paddingBottom:"show"},a)},bounceslide:function(a){this.slide(a,{easing:a.down?"easeOutBounce":"swing",duration:a.down?1E3:200})}}})})(jQuery);
+;/*
+ * jQuery UI Autocomplete 1.8.10
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Autocomplete
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ *	jquery.ui.widget.js
+ *	jquery.ui.position.js
+ */
+(function(d){var e=0;d.widget("ui.autocomplete",{options:{appendTo:"body",delay:300,minLength:1,position:{my:"left top",at:"left bottom",collision:"none"},source:null},pending:0,_create:function(){var a=this,b=this.element[0].ownerDocument,g;this.element.addClass("ui-autocomplete-input").attr("autocomplete","off").attr({role:"textbox","aria-autocomplete":"list","aria-haspopup":"true"}).bind("keydown.autocomplete",function(c){if(!(a.options.disabled||a.element.attr("readonly"))){g=false;var f=d.ui.keyCode;
+switch(c.keyCode){case f.PAGE_UP:a._move("previousPage",c);break;case f.PAGE_DOWN:a._move("nextPage",c);break;case f.UP:a._move("previous",c);c.preventDefault();break;case f.DOWN:a._move("next",c);c.preventDefault();break;case f.ENTER:case f.NUMPAD_ENTER:if(a.menu.active){g=true;c.preventDefault()}case f.TAB:if(!a.menu.active)return;a.menu.select(c);break;case f.ESCAPE:a.element.val(a.term);a.close(c);break;default:clearTimeout(a.searching);a.searching=setTimeout(function(){if(a.term!=a.element.val()){a.selectedItem=
+null;a.search(null,c)}},a.options.delay);break}}}).bind("keypress.autocomplete",function(c){if(g){g=false;c.preventDefault()}}).bind("focus.autocomplete",function(){if(!a.options.disabled){a.selectedItem=null;a.previous=a.element.val()}}).bind("blur.autocomplete",function(c){if(!a.options.disabled){clearTimeout(a.searching);a.closing=setTimeout(function(){a.close(c);a._change(c)},150)}});this._initSource();this.response=function(){return a._response.apply(a,arguments)};this.menu=d("<ul></ul>").addClass("ui-autocomplete").appendTo(d(this.options.appendTo||
+"body",b)[0]).mousedown(function(c){var f=a.menu.element[0];d(c.target).closest(".ui-menu-item").length||setTimeout(function(){d(document).one("mousedown",function(h){h.target!==a.element[0]&&h.target!==f&&!d.ui.contains(f,h.target)&&a.close()})},1);setTimeout(function(){clearTimeout(a.closing)},13)}).menu({focus:function(c,f){f=f.item.data("item.autocomplete");false!==a._trigger("focus",c,{item:f})&&/^key/.test(c.originalEvent.type)&&a.element.val(f.value)},selected:function(c,f){var h=f.item.data("item.autocomplete"),
+i=a.previous;if(a.element[0]!==b.activeElement){a.element.focus();a.previous=i;setTimeout(function(){a.previous=i;a.selectedItem=h},1)}false!==a._trigger("select",c,{item:h})&&a.element.val(h.value);a.term=a.element.val();a.close(c);a.selectedItem=h},blur:function(){a.menu.element.is(":visible")&&a.element.val()!==a.term&&a.element.val(a.term)}}).zIndex(this.element.zIndex()+1).css({top:0,left:0}).hide().data("menu");d.fn.bgiframe&&this.menu.element.bgiframe()},destroy:function(){this.element.removeClass("ui-autocomplete-input").removeAttr("autocomplete").removeAttr("role").removeAttr("aria-autocomplete").removeAttr("aria-haspopup");
+this.menu.element.remove();d.Widget.prototype.destroy.call(this)},_setOption:function(a,b){d.Widget.prototype._setOption.apply(this,arguments);a==="source"&&this._initSource();if(a==="appendTo")this.menu.element.appendTo(d(b||"body",this.element[0].ownerDocument)[0]);a==="disabled"&&b&&this.xhr&&this.xhr.abort()},_initSource:function(){var a=this,b,g;if(d.isArray(this.options.source)){b=this.options.source;this.source=function(c,f){f(d.ui.autocomplete.filter(b,c.term))}}else if(typeof this.options.source===
+"string"){g=this.options.source;this.source=function(c,f){a.xhr&&a.xhr.abort();a.xhr=d.ajax({url:g,data:c,dataType:"json",autocompleteRequest:++e,success:function(h){this.autocompleteRequest===e&&f(h)},error:function(){this.autocompleteRequest===e&&f([])}})}}else this.source=this.options.source},search:function(a,b){a=a!=null?a:this.element.val();this.term=this.element.val();if(a.length<this.options.minLength)return this.close(b);clearTimeout(this.closing);if(this._trigger("search",b)!==false)return this._search(a)},
+_search:function(a){this.pending++;this.element.addClass("ui-autocomplete-loading");this.source({term:a},this.response)},_response:function(a){if(!this.options.disabled&&a&&a.length){a=this._normalize(a);this._suggest(a);this._trigger("open")}else this.close();this.pending--;this.pending||this.element.removeClass("ui-autocomplete-loading")},close:function(a){clearTimeout(this.closing);if(this.menu.element.is(":visible")){this.menu.element.hide();this.menu.deactivate();this._trigger("close",a)}},_change:function(a){this.previous!==
+this.element.val()&&this._trigger("change",a,{item:this.selectedItem})},_normalize:function(a){if(a.length&&a[0].label&&a[0].value)return a;return d.map(a,function(b){if(typeof b==="string")return{label:b,value:b};return d.extend({label:b.label||b.value,value:b.value||b.label},b)})},_suggest:function(a){var b=this.menu.element.empty().zIndex(this.element.zIndex()+1);this._renderMenu(b,a);this.menu.deactivate();this.menu.refresh();b.show();this._resizeMenu();b.position(d.extend({of:this.element},this.options.position))},
+_resizeMenu:function(){var a=this.menu.element;a.outerWidth(Math.max(a.width("").outerWidth(),this.element.outerWidth()))},_renderMenu:function(a,b){var g=this;d.each(b,function(c,f){g._renderItem(a,f)})},_renderItem:function(a,b){return d("<li></li>").data("item.autocomplete",b).append(d("<a></a>").text(b.label)).appendTo(a)},_move:function(a,b){if(this.menu.element.is(":visible"))if(this.menu.first()&&/^previous/.test(a)||this.menu.last()&&/^next/.test(a)){this.element.val(this.term);this.menu.deactivate()}else this.menu[a](b);
+else this.search(null,b)},widget:function(){return this.menu.element}});d.extend(d.ui.autocomplete,{escapeRegex:function(a){return a.replace(/[-[\]{}()*+?.,\\^$|#\s]/g,"\\$&")},filter:function(a,b){var g=new RegExp(d.ui.autocomplete.escapeRegex(b),"i");return d.grep(a,function(c){return g.test(c.label||c.value||c)})}})})(jQuery);
+(function(d){d.widget("ui.menu",{_create:function(){var e=this;this.element.addClass("ui-menu ui-widget ui-widget-content ui-corner-all").attr({role:"listbox","aria-activedescendant":"ui-active-menuitem"}).click(function(a){if(d(a.target).closest(".ui-menu-item a").length){a.preventDefault();e.select(a)}});this.refresh()},refresh:function(){var e=this;this.element.children("li:not(.ui-menu-item):has(a)").addClass("ui-menu-item").attr("role","menuitem").children("a").addClass("ui-corner-all").attr("tabindex",
+-1).mouseenter(function(a){e.activate(a,d(this).parent())}).mouseleave(function(){e.deactivate()})},activate:function(e,a){this.deactivate();if(this.hasScroll()){var b=a.offset().top-this.element.offset().top,g=this.element.attr("scrollTop"),c=this.element.height();if(b<0)this.element.attr("scrollTop",g+b);else b>=c&&this.element.attr("scrollTop",g+b-c+a.height())}this.active=a.eq(0).children("a").addClass("ui-state-hover").attr("id","ui-active-menuitem").end();this._trigger("focus",e,{item:a})},
+deactivate:function(){if(this.active){this.active.children("a").removeClass("ui-state-hover").removeAttr("id");this._trigger("blur");this.active=null}},next:function(e){this.move("next",".ui-menu-item:first",e)},previous:function(e){this.move("prev",".ui-menu-item:last",e)},first:function(){return this.active&&!this.active.prevAll(".ui-menu-item").length},last:function(){return this.active&&!this.active.nextAll(".ui-menu-item").length},move:function(e,a,b){if(this.active){e=this.active[e+"All"](".ui-menu-item").eq(0);
+e.length?this.activate(b,e):this.activate(b,this.element.children(a))}else this.activate(b,this.element.children(a))},nextPage:function(e){if(this.hasScroll())if(!this.active||this.last())this.activate(e,this.element.children(".ui-menu-item:first"));else{var a=this.active.offset().top,b=this.element.height(),g=this.element.children(".ui-menu-item").filter(function(){var c=d(this).offset().top-a-b+d(this).height();return c<10&&c>-10});g.length||(g=this.element.children(".ui-menu-item:last"));this.activate(e,
+g)}else this.activate(e,this.element.children(".ui-menu-item").filter(!this.active||this.last()?":first":":last"))},previousPage:function(e){if(this.hasScroll())if(!this.active||this.first())this.activate(e,this.element.children(".ui-menu-item:last"));else{var a=this.active.offset().top,b=this.element.height();result=this.element.children(".ui-menu-item").filter(function(){var g=d(this).offset().top-a+b-d(this).height();return g<10&&g>-10});result.length||(result=this.element.children(".ui-menu-item:first"));
+this.activate(e,result)}else this.activate(e,this.element.children(".ui-menu-item").filter(!this.active||this.first()?":last":":first"))},hasScroll:function(){return this.element.height()<this.element.attr("scrollHeight")},select:function(e){this._trigger("selected",e,{item:this.active})}})})(jQuery);
+;/*
+ * jQuery UI Button 1.8.10
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Button
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ *	jquery.ui.widget.js
+ */
+(function(a){var g,i=function(b){a(":ui-button",b.target.form).each(function(){var c=a(this).data("button");setTimeout(function(){c.refresh()},1)})},h=function(b){var c=b.name,d=b.form,f=a([]);if(c)f=d?a(d).find("[name='"+c+"']"):a("[name='"+c+"']",b.ownerDocument).filter(function(){return!this.form});return f};a.widget("ui.button",{options:{disabled:null,text:true,label:null,icons:{primary:null,secondary:null}},_create:function(){this.element.closest("form").unbind("reset.button").bind("reset.button",
+i);if(typeof this.options.disabled!=="boolean")this.options.disabled=this.element.attr("disabled");this._determineButtonType();this.hasTitle=!!this.buttonElement.attr("title");var b=this,c=this.options,d=this.type==="checkbox"||this.type==="radio",f="ui-state-hover"+(!d?" ui-state-active":"");if(c.label===null)c.label=this.buttonElement.html();if(this.element.is(":disabled"))c.disabled=true;this.buttonElement.addClass("ui-button ui-widget ui-state-default ui-corner-all").attr("role","button").bind("mouseenter.button",
+function(){if(!c.disabled){a(this).addClass("ui-state-hover");this===g&&a(this).addClass("ui-state-active")}}).bind("mouseleave.button",function(){c.disabled||a(this).removeClass(f)}).bind("focus.button",function(){a(this).addClass("ui-state-focus")}).bind("blur.button",function(){a(this).removeClass("ui-state-focus")});d&&this.element.bind("change.button",function(){b.refresh()});if(this.type==="checkbox")this.buttonElement.bind("click.button",function(){if(c.disabled)return false;a(this).toggleClass("ui-state-active");
+b.buttonElement.attr("aria-pressed",b.element[0].checked)});else if(this.type==="radio")this.buttonElement.bind("click.button",function(){if(c.disabled)return false;a(this).addClass("ui-state-active");b.buttonElement.attr("aria-pressed",true);var e=b.element[0];h(e).not(e).map(function(){return a(this).button("widget")[0]}).removeClass("ui-state-active").attr("aria-pressed",false)});else{this.buttonElement.bind("mousedown.button",function(){if(c.disabled)return false;a(this).addClass("ui-state-active");
+g=this;a(document).one("mouseup",function(){g=null})}).bind("mouseup.button",function(){if(c.disabled)return false;a(this).removeClass("ui-state-active")}).bind("keydown.button",function(e){if(c.disabled)return false;if(e.keyCode==a.ui.keyCode.SPACE||e.keyCode==a.ui.keyCode.ENTER)a(this).addClass("ui-state-active")}).bind("keyup.button",function(){a(this).removeClass("ui-state-active")});this.buttonElement.is("a")&&this.buttonElement.keyup(function(e){e.keyCode===a.ui.keyCode.SPACE&&a(this).click()})}this._setOption("disabled",
+c.disabled)},_determineButtonType:function(){this.type=this.element.is(":checkbox")?"checkbox":this.element.is(":radio")?"radio":this.element.is("input")?"input":"button";if(this.type==="checkbox"||this.type==="radio"){this.buttonElement=this.element.parents().last().find("label[for="+this.element.attr("id")+"]");this.element.addClass("ui-helper-hidden-accessible");var b=this.element.is(":checked");b&&this.buttonElement.addClass("ui-state-active");this.buttonElement.attr("aria-pressed",b)}else this.buttonElement=
+this.element},widget:function(){return this.buttonElement},destroy:function(){this.element.removeClass("ui-helper-hidden-accessible");this.buttonElement.removeClass("ui-button ui-widget ui-state-default ui-corner-all ui-state-hover ui-state-active  ui-button-icons-only ui-button-icon-only ui-button-text-icons ui-button-text-icon-primary ui-button-text-icon-secondary ui-button-text-only").removeAttr("role").removeAttr("aria-pressed").html(this.buttonElement.find(".ui-button-text").html());this.hasTitle||
+this.buttonElement.removeAttr("title");a.Widget.prototype.destroy.call(this)},_setOption:function(b,c){a.Widget.prototype._setOption.apply(this,arguments);if(b==="disabled")c?this.element.attr("disabled",true):this.element.removeAttr("disabled");this._resetButton()},refresh:function(){var b=this.element.is(":disabled");b!==this.options.disabled&&this._setOption("disabled",b);if(this.type==="radio")h(this.element[0]).each(function(){a(this).is(":checked")?a(this).button("widget").addClass("ui-state-active").attr("aria-pressed",
+true):a(this).button("widget").removeClass("ui-state-active").attr("aria-pressed",false)});else if(this.type==="checkbox")this.element.is(":checked")?this.buttonElement.addClass("ui-state-active").attr("aria-pressed",true):this.buttonElement.removeClass("ui-state-active").attr("aria-pressed",false)},_resetButton:function(){if(this.type==="input")this.options.label&&this.element.val(this.options.label);else{var b=this.buttonElement.removeClass("ui-button-icons-only ui-button-icon-only ui-button-text-icons ui-button-text-icon-primary ui-button-text-icon-secondary ui-button-text-only"),
+c=a("<span></span>").addClass("ui-button-text").html(this.options.label).appendTo(b.empty()).text(),d=this.options.icons,f=d.primary&&d.secondary,e=[];if(d.primary||d.secondary){e.push("ui-button-text-icon"+(f?"s":d.primary?"-primary":"-secondary"));d.primary&&b.prepend("<span class='ui-button-icon-primary ui-icon "+d.primary+"'></span>");d.secondary&&b.append("<span class='ui-button-icon-secondary ui-icon "+d.secondary+"'></span>");if(!this.options.text){e.push(f?"ui-button-icons-only":"ui-button-icon-only");
+b.removeClass("ui-button-text-icons ui-button-text-icon-primary ui-button-text-icon-secondary");this.hasTitle||b.attr("title",c)}}else e.push("ui-button-text-only");b.addClass(e.join(" "))}}});a.widget("ui.buttonset",{options:{items:":button, :submit, :reset, :checkbox, :radio, a, :data(button)"},_create:function(){this.element.addClass("ui-buttonset")},_init:function(){this.refresh()},_setOption:function(b,c){b==="disabled"&&this.buttons.button("option",b,c);a.Widget.prototype._setOption.apply(this,
+arguments)},refresh:function(){this.buttons=this.element.find(this.options.items).filter(":ui-button").button("refresh").end().not(":ui-button").button().end().map(function(){return a(this).button("widget")[0]}).removeClass("ui-corner-all ui-corner-left ui-corner-right").filter(":first").addClass("ui-corner-left").end().filter(":last").addClass("ui-corner-right").end().end()},destroy:function(){this.element.removeClass("ui-buttonset");this.buttons.map(function(){return a(this).button("widget")[0]}).removeClass("ui-corner-left ui-corner-right").end().button("destroy");
+a.Widget.prototype.destroy.call(this)}})})(jQuery);
+;/*
+ * jQuery UI Dialog 1.8.10
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Dialog
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ *	jquery.ui.widget.js
+ *  jquery.ui.button.js
+ *	jquery.ui.draggable.js
+ *	jquery.ui.mouse.js
+ *	jquery.ui.position.js
+ *	jquery.ui.resizable.js
+ */
+(function(c,j){var k={buttons:true,height:true,maxHeight:true,maxWidth:true,minHeight:true,minWidth:true,width:true},l={maxHeight:true,maxWidth:true,minHeight:true,minWidth:true};c.widget("ui.dialog",{options:{autoOpen:true,buttons:{},closeOnEscape:true,closeText:"close",dialogClass:"",draggable:true,hide:null,height:"auto",maxHeight:false,maxWidth:false,minHeight:150,minWidth:150,modal:false,position:{my:"center",at:"center",collision:"fit",using:function(a){var b=c(this).css(a).offset().top;b<0&&
+c(this).css("top",a.top-b)}},resizable:true,show:null,stack:true,title:"",width:300,zIndex:1E3},_create:function(){this.originalTitle=this.element.attr("title");if(typeof this.originalTitle!=="string")this.originalTitle="";this.options.title=this.options.title||this.originalTitle;var a=this,b=a.options,d=b.title||"&#160;",e=c.ui.dialog.getTitleId(a.element),g=(a.uiDialog=c("<div></div>")).appendTo(document.body).hide().addClass("ui-dialog ui-widget ui-widget-content ui-corner-all "+b.dialogClass).css({zIndex:b.zIndex}).attr("tabIndex",
+-1).css("outline",0).keydown(function(i){if(b.closeOnEscape&&i.keyCode&&i.keyCode===c.ui.keyCode.ESCAPE){a.close(i);i.preventDefault()}}).attr({role:"dialog","aria-labelledby":e}).mousedown(function(i){a.moveToTop(false,i)});a.element.show().removeAttr("title").addClass("ui-dialog-content ui-widget-content").appendTo(g);var f=(a.uiDialogTitlebar=c("<div></div>")).addClass("ui-dialog-titlebar ui-widget-header ui-corner-all ui-helper-clearfix").prependTo(g),h=c('<a href="#"></a>').addClass("ui-dialog-titlebar-close ui-corner-all").attr("role",
+"button").hover(function(){h.addClass("ui-state-hover")},function(){h.removeClass("ui-state-hover")}).focus(function(){h.addClass("ui-state-focus")}).blur(function(){h.removeClass("ui-state-focus")}).click(function(i){a.close(i);return false}).appendTo(f);(a.uiDialogTitlebarCloseText=c("<span></span>")).addClass("ui-icon ui-icon-closethick").text(b.closeText).appendTo(h);c("<span></span>").addClass("ui-dialog-title").attr("id",e).html(d).prependTo(f);if(c.isFunction(b.beforeclose)&&!c.isFunction(b.beforeClose))b.beforeClose=
+b.beforeclose;f.find("*").add(f).disableSelection();b.draggable&&c.fn.draggable&&a._makeDraggable();b.resizable&&c.fn.resizable&&a._makeResizable();a._createButtons(b.buttons);a._isOpen=false;c.fn.bgiframe&&g.bgiframe()},_init:function(){this.options.autoOpen&&this.open()},destroy:function(){var a=this;a.overlay&&a.overlay.destroy();a.uiDialog.hide();a.element.unbind(".dialog").removeData("dialog").removeClass("ui-dialog-content ui-widget-content").hide().appendTo("body");a.uiDialog.remove();a.originalTitle&&
+a.element.attr("title",a.originalTitle);return a},widget:function(){return this.uiDialog},close:function(a){var b=this,d,e;if(false!==b._trigger("beforeClose",a)){b.overlay&&b.overlay.destroy();b.uiDialog.unbind("keypress.ui-dialog");b._isOpen=false;if(b.options.hide)b.uiDialog.hide(b.options.hide,function(){b._trigger("close",a)});else{b.uiDialog.hide();b._trigger("close",a)}c.ui.dialog.overlay.resize();if(b.options.modal){d=0;c(".ui-dialog").each(function(){if(this!==b.uiDialog[0]){e=c(this).css("z-index");
+isNaN(e)||(d=Math.max(d,e))}});c.ui.dialog.maxZ=d}return b}},isOpen:function(){return this._isOpen},moveToTop:function(a,b){var d=this,e=d.options;if(e.modal&&!a||!e.stack&&!e.modal)return d._trigger("focus",b);if(e.zIndex>c.ui.dialog.maxZ)c.ui.dialog.maxZ=e.zIndex;if(d.overlay){c.ui.dialog.maxZ+=1;d.overlay.$el.css("z-index",c.ui.dialog.overlay.maxZ=c.ui.dialog.maxZ)}a={scrollTop:d.element.attr("scrollTop"),scrollLeft:d.element.attr("scrollLeft")};c.ui.dialog.maxZ+=1;d.uiDialog.css("z-index",c.ui.dialog.maxZ);
+d.element.attr(a);d._trigger("focus",b);return d},open:function(){if(!this._isOpen){var a=this,b=a.options,d=a.uiDialog;a.overlay=b.modal?new c.ui.dialog.overlay(a):null;a._size();a._position(b.position);d.show(b.show);a.moveToTop(true);b.modal&&d.bind("keypress.ui-dialog",function(e){if(e.keyCode===c.ui.keyCode.TAB){var g=c(":tabbable",this),f=g.filter(":first");g=g.filter(":last");if(e.target===g[0]&&!e.shiftKey){f.focus(1);return false}else if(e.target===f[0]&&e.shiftKey){g.focus(1);return false}}});
+c(a.element.find(":tabbable").get().concat(d.find(".ui-dialog-buttonpane :tabbable").get().concat(d.get()))).eq(0).focus();a._isOpen=true;a._trigger("open");return a}},_createButtons:function(a){var b=this,d=false,e=c("<div></div>").addClass("ui-dialog-buttonpane ui-widget-content ui-helper-clearfix"),g=c("<div></div>").addClass("ui-dialog-buttonset").appendTo(e);b.uiDialog.find(".ui-dialog-buttonpane").remove();typeof a==="object"&&a!==null&&c.each(a,function(){return!(d=true)});if(d){c.each(a,function(f,
+h){h=c.isFunction(h)?{click:h,text:f}:h;f=c('<button type="button"></button>').attr(h,true).unbind("click").click(function(){h.click.apply(b.element[0],arguments)}).appendTo(g);c.fn.button&&f.button()});e.appendTo(b.uiDialog)}},_makeDraggable:function(){function a(f){return{position:f.position,offset:f.offset}}var b=this,d=b.options,e=c(document),g;b.uiDialog.draggable({cancel:".ui-dialog-content, .ui-dialog-titlebar-close",handle:".ui-dialog-titlebar",containment:"document",start:function(f,h){g=
+d.height==="auto"?"auto":c(this).height();c(this).height(c(this).height()).addClass("ui-dialog-dragging");b._trigger("dragStart",f,a(h))},drag:function(f,h){b._trigger("drag",f,a(h))},stop:function(f,h){d.position=[h.position.left-e.scrollLeft(),h.position.top-e.scrollTop()];c(this).removeClass("ui-dialog-dragging").height(g);b._trigger("dragStop",f,a(h));c.ui.dialog.overlay.resize()}})},_makeResizable:function(a){function b(f){return{originalPosition:f.originalPosition,originalSize:f.originalSize,
+position:f.position,size:f.size}}a=a===j?this.options.resizable:a;var d=this,e=d.options,g=d.uiDialog.css("position");a=typeof a==="string"?a:"n,e,s,w,se,sw,ne,nw";d.uiDialog.resizable({cancel:".ui-dialog-content",containment:"document",alsoResize:d.element,maxWidth:e.maxWidth,maxHeight:e.maxHeight,minWidth:e.minWidth,minHeight:d._minHeight(),handles:a,start:function(f,h){c(this).addClass("ui-dialog-resizing");d._trigger("resizeStart",f,b(h))},resize:function(f,h){d._trigger("resize",f,b(h))},stop:function(f,
+h){c(this).removeClass("ui-dialog-resizing");e.height=c(this).height();e.width=c(this).width();d._trigger("resizeStop",f,b(h));c.ui.dialog.overlay.resize()}}).css("position",g).find(".ui-resizable-se").addClass("ui-icon ui-icon-grip-diagonal-se")},_minHeight:function(){var a=this.options;return a.height==="auto"?a.minHeight:Math.min(a.minHeight,a.height)},_position:function(a){var b=[],d=[0,0],e;if(a){if(typeof a==="string"||typeof a==="object"&&"0"in a){b=a.split?a.split(" "):[a[0],a[1]];if(b.length===
+1)b[1]=b[0];c.each(["left","top"],function(g,f){if(+b[g]===b[g]){d[g]=b[g];b[g]=f}});a={my:b.join(" "),at:b.join(" "),offset:d.join(" ")}}a=c.extend({},c.ui.dialog.prototype.options.position,a)}else a=c.ui.dialog.prototype.options.position;(e=this.uiDialog.is(":visible"))||this.uiDialog.show();this.uiDialog.css({top:0,left:0}).position(c.extend({of:window},a));e||this.uiDialog.hide()},_setOptions:function(a){var b=this,d={},e=false;c.each(a,function(g,f){b._setOption(g,f);if(g in k)e=true;if(g in
+l)d[g]=f});e&&this._size();this.uiDialog.is(":data(resizable)")&&this.uiDialog.resizable("option",d)},_setOption:function(a,b){var d=this,e=d.uiDialog;switch(a){case "beforeclose":a="beforeClose";break;case "buttons":d._createButtons(b);break;case "closeText":d.uiDialogTitlebarCloseText.text(""+b);break;case "dialogClass":e.removeClass(d.options.dialogClass).addClass("ui-dialog ui-widget ui-widget-content ui-corner-all "+b);break;case "disabled":b?e.addClass("ui-dialog-disabled"):e.removeClass("ui-dialog-disabled");
+break;case "draggable":var g=e.is(":data(draggable)");g&&!b&&e.draggable("destroy");!g&&b&&d._makeDraggable();break;case "position":d._position(b);break;case "resizable":(g=e.is(":data(resizable)"))&&!b&&e.resizable("destroy");g&&typeof b==="string"&&e.resizable("option","handles",b);!g&&b!==false&&d._makeResizable(b);break;case "title":c(".ui-dialog-title",d.uiDialogTitlebar).html(""+(b||"&#160;"));break}c.Widget.prototype._setOption.apply(d,arguments)},_size:function(){var a=this.options,b,d,e=
+this.uiDialog.is(":visible");this.element.show().css({width:"auto",minHeight:0,height:0});if(a.minWidth>a.width)a.width=a.minWidth;b=this.uiDialog.css({height:"auto",width:a.width}).height();d=Math.max(0,a.minHeight-b);if(a.height==="auto")if(c.support.minHeight)this.element.css({minHeight:d,height:"auto"});else{this.uiDialog.show();a=this.element.css("height","auto").height();e||this.uiDialog.hide();this.element.height(Math.max(a,d))}else this.element.height(Math.max(a.height-b,0));this.uiDialog.is(":data(resizable)")&&
+this.uiDialog.resizable("option","minHeight",this._minHeight())}});c.extend(c.ui.dialog,{version:"1.8.10",uuid:0,maxZ:0,getTitleId:function(a){a=a.attr("id");if(!a){this.uuid+=1;a=this.uuid}return"ui-dialog-title-"+a},overlay:function(a){this.$el=c.ui.dialog.overlay.create(a)}});c.extend(c.ui.dialog.overlay,{instances:[],oldInstances:[],maxZ:0,events:c.map("focus,mousedown,mouseup,keydown,keypress,click".split(","),function(a){return a+".dialog-overlay"}).join(" "),create:function(a){if(this.instances.length===
+0){setTimeout(function(){c.ui.dialog.overlay.instances.length&&c(document).bind(c.ui.dialog.overlay.events,function(d){if(c(d.target).zIndex()<c.ui.dialog.overlay.maxZ)return false})},1);c(document).bind("keydown.dialog-overlay",function(d){if(a.options.closeOnEscape&&d.keyCode&&d.keyCode===c.ui.keyCode.ESCAPE){a.close(d);d.preventDefault()}});c(window).bind("resize.dialog-overlay",c.ui.dialog.overlay.resize)}var b=(this.oldInstances.pop()||c("<div></div>").addClass("ui-widget-overlay")).appendTo(document.body).css({width:this.width(),
+height:this.height()});c.fn.bgiframe&&b.bgiframe();this.instances.push(b);return b},destroy:function(a){var b=c.inArray(a,this.instances);b!=-1&&this.oldInstances.push(this.instances.splice(b,1)[0]);this.instances.length===0&&c([document,window]).unbind(".dialog-overlay");a.remove();var d=0;c.each(this.instances,function(){d=Math.max(d,this.css("z-index"))});this.maxZ=d},height:function(){var a,b;if(c.browser.msie&&c.browser.version<7){a=Math.max(document.documentElement.scrollHeight,document.body.scrollHeight);
+b=Math.max(document.documentElement.offsetHeight,document.body.offsetHeight);return a<b?c(window).height()+"px":a+"px"}else return c(document).height()+"px"},width:function(){var a,b;if(c.browser.msie&&c.browser.version<7){a=Math.max(document.documentElement.scrollWidth,document.body.scrollWidth);b=Math.max(document.documentElement.offsetWidth,document.body.offsetWidth);return a<b?c(window).width()+"px":a+"px"}else return c(document).width()+"px"},resize:function(){var a=c([]);c.each(c.ui.dialog.overlay.instances,
+function(){a=a.add(this)});a.css({width:0,height:0}).css({width:c.ui.dialog.overlay.width(),height:c.ui.dialog.overlay.height()})}});c.extend(c.ui.dialog.overlay.prototype,{destroy:function(){c.ui.dialog.overlay.destroy(this.$el)}})})(jQuery);
+;/*
+ * jQuery UI Slider 1.8.10
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Slider
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ *	jquery.ui.mouse.js
+ *	jquery.ui.widget.js
+ */
+(function(d){d.widget("ui.slider",d.ui.mouse,{widgetEventPrefix:"slide",options:{animate:false,distance:0,max:100,min:0,orientation:"horizontal",range:false,step:1,value:0,values:null},_create:function(){var b=this,a=this.options;this._mouseSliding=this._keySliding=false;this._animateOff=true;this._handleIndex=null;this._detectOrientation();this._mouseInit();this.element.addClass("ui-slider ui-slider-"+this.orientation+" ui-widget ui-widget-content ui-corner-all");a.disabled&&this.element.addClass("ui-slider-disabled ui-disabled");
+this.range=d([]);if(a.range){if(a.range===true){this.range=d("<div></div>");if(!a.values)a.values=[this._valueMin(),this._valueMin()];if(a.values.length&&a.values.length!==2)a.values=[a.values[0],a.values[0]]}else this.range=d("<div></div>");this.range.appendTo(this.element).addClass("ui-slider-range");if(a.range==="min"||a.range==="max")this.range.addClass("ui-slider-range-"+a.range);this.range.addClass("ui-widget-header")}d(".ui-slider-handle",this.element).length===0&&d("<a href='#'></a>").appendTo(this.element).addClass("ui-slider-handle");
+if(a.values&&a.values.length)for(;d(".ui-slider-handle",this.element).length<a.values.length;)d("<a href='#'></a>").appendTo(this.element).addClass("ui-slider-handle");this.handles=d(".ui-slider-handle",this.element).addClass("ui-state-default ui-corner-all");this.handle=this.handles.eq(0);this.handles.add(this.range).filter("a").click(function(c){c.preventDefault()}).hover(function(){a.disabled||d(this).addClass("ui-state-hover")},function(){d(this).removeClass("ui-state-hover")}).focus(function(){if(a.disabled)d(this).blur();
+else{d(".ui-slider .ui-state-focus").removeClass("ui-state-focus");d(this).addClass("ui-state-focus")}}).blur(function(){d(this).removeClass("ui-state-focus")});this.handles.each(function(c){d(this).data("index.ui-slider-handle",c)});this.handles.keydown(function(c){var e=true,f=d(this).data("index.ui-slider-handle"),h,g,i;if(!b.options.disabled){switch(c.keyCode){case d.ui.keyCode.HOME:case d.ui.keyCode.END:case d.ui.keyCode.PAGE_UP:case d.ui.keyCode.PAGE_DOWN:case d.ui.keyCode.UP:case d.ui.keyCode.RIGHT:case d.ui.keyCode.DOWN:case d.ui.keyCode.LEFT:e=
+false;if(!b._keySliding){b._keySliding=true;d(this).addClass("ui-state-active");h=b._start(c,f);if(h===false)return}break}i=b.options.step;h=b.options.values&&b.options.values.length?(g=b.values(f)):(g=b.value());switch(c.keyCode){case d.ui.keyCode.HOME:g=b._valueMin();break;case d.ui.keyCode.END:g=b._valueMax();break;case d.ui.keyCode.PAGE_UP:g=b._trimAlignValue(h+(b._valueMax()-b._valueMin())/5);break;case d.ui.keyCode.PAGE_DOWN:g=b._trimAlignValue(h-(b._valueMax()-b._valueMin())/5);break;case d.ui.keyCode.UP:case d.ui.keyCode.RIGHT:if(h===
+b._valueMax())return;g=b._trimAlignValue(h+i);break;case d.ui.keyCode.DOWN:case d.ui.keyCode.LEFT:if(h===b._valueMin())return;g=b._trimAlignValue(h-i);break}b._slide(c,f,g);return e}}).keyup(function(c){var e=d(this).data("index.ui-slider-handle");if(b._keySliding){b._keySliding=false;b._stop(c,e);b._change(c,e);d(this).removeClass("ui-state-active")}});this._refreshValue();this._animateOff=false},destroy:function(){this.handles.remove();this.range.remove();this.element.removeClass("ui-slider ui-slider-horizontal ui-slider-vertical ui-slider-disabled ui-widget ui-widget-content ui-corner-all").removeData("slider").unbind(".slider");
+this._mouseDestroy();return this},_mouseCapture:function(b){var a=this.options,c,e,f,h,g;if(a.disabled)return false;this.elementSize={width:this.element.outerWidth(),height:this.element.outerHeight()};this.elementOffset=this.element.offset();c=this._normValueFromMouse({x:b.pageX,y:b.pageY});e=this._valueMax()-this._valueMin()+1;h=this;this.handles.each(function(i){var j=Math.abs(c-h.values(i));if(e>j){e=j;f=d(this);g=i}});if(a.range===true&&this.values(1)===a.min){g+=1;f=d(this.handles[g])}if(this._start(b,
+g)===false)return false;this._mouseSliding=true;h._handleIndex=g;f.addClass("ui-state-active").focus();a=f.offset();this._clickOffset=!d(b.target).parents().andSelf().is(".ui-slider-handle")?{left:0,top:0}:{left:b.pageX-a.left-f.width()/2,top:b.pageY-a.top-f.height()/2-(parseInt(f.css("borderTopWidth"),10)||0)-(parseInt(f.css("borderBottomWidth"),10)||0)+(parseInt(f.css("marginTop"),10)||0)};this.handles.hasClass("ui-state-hover")||this._slide(b,g,c);return this._animateOff=true},_mouseStart:function(){return true},
+_mouseDrag:function(b){var a=this._normValueFromMouse({x:b.pageX,y:b.pageY});this._slide(b,this._handleIndex,a);return false},_mouseStop:function(b){this.handles.removeClass("ui-state-active");this._mouseSliding=false;this._stop(b,this._handleIndex);this._change(b,this._handleIndex);this._clickOffset=this._handleIndex=null;return this._animateOff=false},_detectOrientation:function(){this.orientation=this.options.orientation==="vertical"?"vertical":"horizontal"},_normValueFromMouse:function(b){var a;
+if(this.orientation==="horizontal"){a=this.elementSize.width;b=b.x-this.elementOffset.left-(this._clickOffset?this._clickOffset.left:0)}else{a=this.elementSize.height;b=b.y-this.elementOffset.top-(this._clickOffset?this._clickOffset.top:0)}a=b/a;if(a>1)a=1;if(a<0)a=0;if(this.orientation==="vertical")a=1-a;b=this._valueMax()-this._valueMin();return this._trimAlignValue(this._valueMin()+a*b)},_start:function(b,a){var c={handle:this.handles[a],value:this.value()};if(this.options.values&&this.options.values.length){c.value=
+this.values(a);c.values=this.values()}return this._trigger("start",b,c)},_slide:function(b,a,c){var e;if(this.options.values&&this.options.values.length){e=this.values(a?0:1);if(this.options.values.length===2&&this.options.range===true&&(a===0&&c>e||a===1&&c<e))c=e;if(c!==this.values(a)){e=this.values();e[a]=c;b=this._trigger("slide",b,{handle:this.handles[a],value:c,values:e});this.values(a?0:1);b!==false&&this.values(a,c,true)}}else if(c!==this.value()){b=this._trigger("slide",b,{handle:this.handles[a],
+value:c});b!==false&&this.value(c)}},_stop:function(b,a){var c={handle:this.handles[a],value:this.value()};if(this.options.values&&this.options.values.length){c.value=this.values(a);c.values=this.values()}this._trigger("stop",b,c)},_change:function(b,a){if(!this._keySliding&&!this._mouseSliding){var c={handle:this.handles[a],value:this.value()};if(this.options.values&&this.options.values.length){c.value=this.values(a);c.values=this.values()}this._trigger("change",b,c)}},value:function(b){if(arguments.length){this.options.value=
+this._trimAlignValue(b);this._refreshValue();this._change(null,0)}return this._value()},values:function(b,a){var c,e,f;if(arguments.length>1){this.options.values[b]=this._trimAlignValue(a);this._refreshValue();this._change(null,b)}if(arguments.length)if(d.isArray(arguments[0])){c=this.options.values;e=arguments[0];for(f=0;f<c.length;f+=1){c[f]=this._trimAlignValue(e[f]);this._change(null,f)}this._refreshValue()}else return this.options.values&&this.options.values.length?this._values(b):this.value();
+else return this._values()},_setOption:function(b,a){var c,e=0;if(d.isArray(this.options.values))e=this.options.values.length;d.Widget.prototype._setOption.apply(this,arguments);switch(b){case "disabled":if(a){this.handles.filter(".ui-state-focus").blur();this.handles.removeClass("ui-state-hover");this.handles.attr("disabled","disabled");this.element.addClass("ui-disabled")}else{this.handles.removeAttr("disabled");this.element.removeClass("ui-disabled")}break;case "orientation":this._detectOrientation();
+this.element.removeClass("ui-slider-horizontal ui-slider-vertical").addClass("ui-slider-"+this.orientation);this._refreshValue();break;case "value":this._animateOff=true;this._refreshValue();this._change(null,0);this._animateOff=false;break;case "values":this._animateOff=true;this._refreshValue();for(c=0;c<e;c+=1)this._change(null,c);this._animateOff=false;break}},_value:function(){var b=this.options.value;return b=this._trimAlignValue(b)},_values:function(b){var a,c;if(arguments.length){a=this.options.values[b];
+return a=this._trimAlignValue(a)}else{a=this.options.values.slice();for(c=0;c<a.length;c+=1)a[c]=this._trimAlignValue(a[c]);return a}},_trimAlignValue:function(b){if(b<=this._valueMin())return this._valueMin();if(b>=this._valueMax())return this._valueMax();var a=this.options.step>0?this.options.step:1,c=(b-this._valueMin())%a;alignValue=b-c;if(Math.abs(c)*2>=a)alignValue+=c>0?a:-a;return parseFloat(alignValue.toFixed(5))},_valueMin:function(){return this.options.min},_valueMax:function(){return this.options.max},
+_refreshValue:function(){var b=this.options.range,a=this.options,c=this,e=!this._animateOff?a.animate:false,f,h={},g,i,j,l;if(this.options.values&&this.options.values.length)this.handles.each(function(k){f=(c.values(k)-c._valueMin())/(c._valueMax()-c._valueMin())*100;h[c.orientation==="horizontal"?"left":"bottom"]=f+"%";d(this).stop(1,1)[e?"animate":"css"](h,a.animate);if(c.options.range===true)if(c.orientation==="horizontal"){if(k===0)c.range.stop(1,1)[e?"animate":"css"]({left:f+"%"},a.animate);
+if(k===1)c.range[e?"animate":"css"]({width:f-g+"%"},{queue:false,duration:a.animate})}else{if(k===0)c.range.stop(1,1)[e?"animate":"css"]({bottom:f+"%"},a.animate);if(k===1)c.range[e?"animate":"css"]({height:f-g+"%"},{queue:false,duration:a.animate})}g=f});else{i=this.value();j=this._valueMin();l=this._valueMax();f=l!==j?(i-j)/(l-j)*100:0;h[c.orientation==="horizontal"?"left":"bottom"]=f+"%";this.handle.stop(1,1)[e?"animate":"css"](h,a.animate);if(b==="min"&&this.orientation==="horizontal")this.range.stop(1,
+1)[e?"animate":"css"]({width:f+"%"},a.animate);if(b==="max"&&this.orientation==="horizontal")this.range[e?"animate":"css"]({width:100-f+"%"},{queue:false,duration:a.animate});if(b==="min"&&this.orientation==="vertical")this.range.stop(1,1)[e?"animate":"css"]({height:f+"%"},a.animate);if(b==="max"&&this.orientation==="vertical")this.range[e?"animate":"css"]({height:100-f+"%"},{queue:false,duration:a.animate})}}});d.extend(d.ui.slider,{version:"1.8.10"})})(jQuery);
+;/*
+ * jQuery UI Tabs 1.8.10
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Tabs
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ *	jquery.ui.widget.js
+ */
+(function(d,p){function u(){return++v}function w(){return++x}var v=0,x=0;d.widget("ui.tabs",{options:{add:null,ajaxOptions:null,cache:false,cookie:null,collapsible:false,disable:null,disabled:[],enable:null,event:"click",fx:null,idPrefix:"ui-tabs-",load:null,panelTemplate:"<div></div>",remove:null,select:null,show:null,spinner:"<em>Loading&#8230;</em>",tabTemplate:"<li><a href='#{href}'><span>#{label}</span></a></li>"},_create:function(){this._tabify(true)},_setOption:function(b,e){if(b=="selected")this.options.collapsible&&
+e==this.options.selected||this.select(e);else{this.options[b]=e;this._tabify()}},_tabId:function(b){return b.title&&b.title.replace(/\s/g,"_").replace(/[^\w\u00c0-\uFFFF-]/g,"")||this.options.idPrefix+u()},_sanitizeSelector:function(b){return b.replace(/:/g,"\\:")},_cookie:function(){var b=this.cookie||(this.cookie=this.options.cookie.name||"ui-tabs-"+w());return d.cookie.apply(null,[b].concat(d.makeArray(arguments)))},_ui:function(b,e){return{tab:b,panel:e,index:this.anchors.index(b)}},_cleanup:function(){this.lis.filter(".ui-state-processing").removeClass("ui-state-processing").find("span:data(label.tabs)").each(function(){var b=
+d(this);b.html(b.data("label.tabs")).removeData("label.tabs")})},_tabify:function(b){function e(g,f){g.css("display","");!d.support.opacity&&f.opacity&&g[0].style.removeAttribute("filter")}var a=this,c=this.options,h=/^#.+/;this.list=this.element.find("ol,ul").eq(0);this.lis=d(" > li:has(a[href])",this.list);this.anchors=this.lis.map(function(){return d("a",this)[0]});this.panels=d([]);this.anchors.each(function(g,f){var i=d(f).attr("href"),l=i.split("#")[0],q;if(l&&(l===location.toString().split("#")[0]||
+(q=d("base")[0])&&l===q.href)){i=f.hash;f.href=i}if(h.test(i))a.panels=a.panels.add(a.element.find(a._sanitizeSelector(i)));else if(i&&i!=="#"){d.data(f,"href.tabs",i);d.data(f,"load.tabs",i.replace(/#.*$/,""));i=a._tabId(f);f.href="#"+i;f=a.element.find("#"+i);if(!f.length){f=d(c.panelTemplate).attr("id",i).addClass("ui-tabs-panel ui-widget-content ui-corner-bottom").insertAfter(a.panels[g-1]||a.list);f.data("destroy.tabs",true)}a.panels=a.panels.add(f)}else c.disabled.push(g)});if(b){this.element.addClass("ui-tabs ui-widget ui-widget-content ui-corner-all");
+this.list.addClass("ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all");this.lis.addClass("ui-state-default ui-corner-top");this.panels.addClass("ui-tabs-panel ui-widget-content ui-corner-bottom");if(c.selected===p){location.hash&&this.anchors.each(function(g,f){if(f.hash==location.hash){c.selected=g;return false}});if(typeof c.selected!=="number"&&c.cookie)c.selected=parseInt(a._cookie(),10);if(typeof c.selected!=="number"&&this.lis.filter(".ui-tabs-selected").length)c.selected=
+this.lis.index(this.lis.filter(".ui-tabs-selected"));c.selected=c.selected||(this.lis.length?0:-1)}else if(c.selected===null)c.selected=-1;c.selected=c.selected>=0&&this.anchors[c.selected]||c.selected<0?c.selected:0;c.disabled=d.unique(c.disabled.concat(d.map(this.lis.filter(".ui-state-disabled"),function(g){return a.lis.index(g)}))).sort();d.inArray(c.selected,c.disabled)!=-1&&c.disabled.splice(d.inArray(c.selected,c.disabled),1);this.panels.addClass("ui-tabs-hide");this.lis.removeClass("ui-tabs-selected ui-state-active");
+if(c.selected>=0&&this.anchors.length){a.element.find(a._sanitizeSelector(a.anchors[c.selected].hash)).removeClass("ui-tabs-hide");this.lis.eq(c.selected).addClass("ui-tabs-selected ui-state-active");a.element.queue("tabs",function(){a._trigger("show",null,a._ui(a.anchors[c.selected],a.element.find(a._sanitizeSelector(a.anchors[c.selected].hash))[0]))});this.load(c.selected)}d(window).bind("unload",function(){a.lis.add(a.anchors).unbind(".tabs");a.lis=a.anchors=a.panels=null})}else c.selected=this.lis.index(this.lis.filter(".ui-tabs-selected"));
+this.element[c.collapsible?"addClass":"removeClass"]("ui-tabs-collapsible");c.cookie&&this._cookie(c.selected,c.cookie);b=0;for(var j;j=this.lis[b];b++)d(j)[d.inArray(b,c.disabled)!=-1&&!d(j).hasClass("ui-tabs-selected")?"addClass":"removeClass"]("ui-state-disabled");c.cache===false&&this.anchors.removeData("cache.tabs");this.lis.add(this.anchors).unbind(".tabs");if(c.event!=="mouseover"){var k=function(g,f){f.is(":not(.ui-state-disabled)")&&f.addClass("ui-state-"+g)},n=function(g,f){f.removeClass("ui-state-"+
+g)};this.lis.bind("mouseover.tabs",function(){k("hover",d(this))});this.lis.bind("mouseout.tabs",function(){n("hover",d(this))});this.anchors.bind("focus.tabs",function(){k("focus",d(this).closest("li"))});this.anchors.bind("blur.tabs",function(){n("focus",d(this).closest("li"))})}var m,o;if(c.fx)if(d.isArray(c.fx)){m=c.fx[0];o=c.fx[1]}else m=o=c.fx;var r=o?function(g,f){d(g).closest("li").addClass("ui-tabs-selected ui-state-active");f.hide().removeClass("ui-tabs-hide").animate(o,o.duration||"normal",
+function(){e(f,o);a._trigger("show",null,a._ui(g,f[0]))})}:function(g,f){d(g).closest("li").addClass("ui-tabs-selected ui-state-active");f.removeClass("ui-tabs-hide");a._trigger("show",null,a._ui(g,f[0]))},s=m?function(g,f){f.animate(m,m.duration||"normal",function(){a.lis.removeClass("ui-tabs-selected ui-state-active");f.addClass("ui-tabs-hide");e(f,m);a.element.dequeue("tabs")})}:function(g,f){a.lis.removeClass("ui-tabs-selected ui-state-active");f.addClass("ui-tabs-hide");a.element.dequeue("tabs")};
+this.anchors.bind(c.event+".tabs",function(){var g=this,f=d(g).closest("li"),i=a.panels.filter(":not(.ui-tabs-hide)"),l=a.element.find(a._sanitizeSelector(g.hash));if(f.hasClass("ui-tabs-selected")&&!c.collapsible||f.hasClass("ui-state-disabled")||f.hasClass("ui-state-processing")||a.panels.filter(":animated").length||a._trigger("select",null,a._ui(this,l[0]))===false){this.blur();return false}c.selected=a.anchors.index(this);a.abort();if(c.collapsible)if(f.hasClass("ui-tabs-selected")){c.selected=
+-1;c.cookie&&a._cookie(c.selected,c.cookie);a.element.queue("tabs",function(){s(g,i)}).dequeue("tabs");this.blur();return false}else if(!i.length){c.cookie&&a._cookie(c.selected,c.cookie);a.element.queue("tabs",function(){r(g,l)});a.load(a.anchors.index(this));this.blur();return false}c.cookie&&a._cookie(c.selected,c.cookie);if(l.length){i.length&&a.element.queue("tabs",function(){s(g,i)});a.element.queue("tabs",function(){r(g,l)});a.load(a.anchors.index(this))}else throw"jQuery UI Tabs: Mismatching fragment identifier.";
+d.browser.msie&&this.blur()});this.anchors.bind("click.tabs",function(){return false})},_getIndex:function(b){if(typeof b=="string")b=this.anchors.index(this.anchors.filter("[href$="+b+"]"));return b},destroy:function(){var b=this.options;this.abort();this.element.unbind(".tabs").removeClass("ui-tabs ui-widget ui-widget-content ui-corner-all ui-tabs-collapsible").removeData("tabs");this.list.removeClass("ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all");this.anchors.each(function(){var e=
+d.data(this,"href.tabs");if(e)this.href=e;var a=d(this).unbind(".tabs");d.each(["href","load","cache"],function(c,h){a.removeData(h+".tabs")})});this.lis.unbind(".tabs").add(this.panels).each(function(){d.data(this,"destroy.tabs")?d(this).remove():d(this).removeClass("ui-state-default ui-corner-top ui-tabs-selected ui-state-active ui-state-hover ui-state-focus ui-state-disabled ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide")});b.cookie&&this._cookie(null,b.cookie);return this},add:function(b,
+e,a){if(a===p)a=this.anchors.length;var c=this,h=this.options;e=d(h.tabTemplate.replace(/#\{href\}/g,b).replace(/#\{label\}/g,e));b=!b.indexOf("#")?b.replace("#",""):this._tabId(d("a",e)[0]);e.addClass("ui-state-default ui-corner-top").data("destroy.tabs",true);var j=c.element.find("#"+b);j.length||(j=d(h.panelTemplate).attr("id",b).data("destroy.tabs",true));j.addClass("ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide");if(a>=this.lis.length){e.appendTo(this.list);j.appendTo(this.list[0].parentNode)}else{e.insertBefore(this.lis[a]);
+j.insertBefore(this.panels[a])}h.disabled=d.map(h.disabled,function(k){return k>=a?++k:k});this._tabify();if(this.anchors.length==1){h.selected=0;e.addClass("ui-tabs-selected ui-state-active");j.removeClass("ui-tabs-hide");this.element.queue("tabs",function(){c._trigger("show",null,c._ui(c.anchors[0],c.panels[0]))});this.load(0)}this._trigger("add",null,this._ui(this.anchors[a],this.panels[a]));return this},remove:function(b){b=this._getIndex(b);var e=this.options,a=this.lis.eq(b).remove(),c=this.panels.eq(b).remove();
+if(a.hasClass("ui-tabs-selected")&&this.anchors.length>1)this.select(b+(b+1<this.anchors.length?1:-1));e.disabled=d.map(d.grep(e.disabled,function(h){return h!=b}),function(h){return h>=b?--h:h});this._tabify();this._trigger("remove",null,this._ui(a.find("a")[0],c[0]));return this},enable:function(b){b=this._getIndex(b);var e=this.options;if(d.inArray(b,e.disabled)!=-1){this.lis.eq(b).removeClass("ui-state-disabled");e.disabled=d.grep(e.disabled,function(a){return a!=b});this._trigger("enable",null,
+this._ui(this.anchors[b],this.panels[b]));return this}},disable:function(b){b=this._getIndex(b);var e=this.options;if(b!=e.selected){this.lis.eq(b).addClass("ui-state-disabled");e.disabled.push(b);e.disabled.sort();this._trigger("disable",null,this._ui(this.anchors[b],this.panels[b]))}return this},select:function(b){b=this._getIndex(b);if(b==-1)if(this.options.collapsible&&this.options.selected!=-1)b=this.options.selected;else return this;this.anchors.eq(b).trigger(this.options.event+".tabs");return this},
+load:function(b){b=this._getIndex(b);var e=this,a=this.options,c=this.anchors.eq(b)[0],h=d.data(c,"load.tabs");this.abort();if(!h||this.element.queue("tabs").length!==0&&d.data(c,"cache.tabs"))this.element.dequeue("tabs");else{this.lis.eq(b).addClass("ui-state-processing");if(a.spinner){var j=d("span",c);j.data("label.tabs",j.html()).html(a.spinner)}this.xhr=d.ajax(d.extend({},a.ajaxOptions,{url:h,success:function(k,n){e.element.find(e._sanitizeSelector(c.hash)).html(k);e._cleanup();a.cache&&d.data(c,
+"cache.tabs",true);e._trigger("load",null,e._ui(e.anchors[b],e.panels[b]));try{a.ajaxOptions.success(k,n)}catch(m){}},error:function(k,n){e._cleanup();e._trigger("load",null,e._ui(e.anchors[b],e.panels[b]));try{a.ajaxOptions.error(k,n,b,c)}catch(m){}}}));e.element.dequeue("tabs");return this}},abort:function(){this.element.queue([]);this.panels.stop(false,true);this.element.queue("tabs",this.element.queue("tabs").splice(-2,2));if(this.xhr){this.xhr.abort();delete this.xhr}this._cleanup();return this},
+url:function(b,e){this.anchors.eq(b).removeData("cache.tabs").data("load.tabs",e);return this},length:function(){return this.anchors.length}});d.extend(d.ui.tabs,{version:"1.8.10"});d.extend(d.ui.tabs.prototype,{rotation:null,rotate:function(b,e){var a=this,c=this.options,h=a._rotate||(a._rotate=function(j){clearTimeout(a.rotation);a.rotation=setTimeout(function(){var k=c.selected;a.select(++k<a.anchors.length?k:0)},b);j&&j.stopPropagation()});e=a._unrotate||(a._unrotate=!e?function(j){j.clientX&&
+a.rotate(null)}:function(){t=c.selected;h()});if(b){this.element.bind("tabsshow",h);this.anchors.bind(c.event+".tabs",e);h()}else{clearTimeout(a.rotation);this.element.unbind("tabsshow",h);this.anchors.unbind(c.event+".tabs",e);delete this._rotate;delete this._unrotate}return this}})})(jQuery);
+;/*
+ * jQuery UI Datepicker 1.8.10
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Datepicker
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ */
+(function(d,G){function K(){this.debug=false;this._curInst=null;this._keyEvent=false;this._disabledInputs=[];this._inDialog=this._datepickerShowing=false;this._mainDivId="ui-datepicker-div";this._inlineClass="ui-datepicker-inline";this._appendClass="ui-datepicker-append";this._triggerClass="ui-datepicker-trigger";this._dialogClass="ui-datepicker-dialog";this._disableClass="ui-datepicker-disabled";this._unselectableClass="ui-datepicker-unselectable";this._currentClass="ui-datepicker-current-day";this._dayOverClass=
+"ui-datepicker-days-cell-over";this.regional=[];this.regional[""]={closeText:"Done",prevText:"Prev",nextText:"Next",currentText:"Today",monthNames:["January","February","March","April","May","June","July","August","September","October","November","December"],monthNamesShort:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],dayNames:["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],dayNamesShort:["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],dayNamesMin:["Su",
+"Mo","Tu","We","Th","Fr","Sa"],weekHeader:"Wk",dateFormat:"mm/dd/yy",firstDay:0,isRTL:false,showMonthAfterYear:false,yearSuffix:""};this._defaults={showOn:"focus",showAnim:"fadeIn",showOptions:{},defaultDate:null,appendText:"",buttonText:"...",buttonImage:"",buttonImageOnly:false,hideIfNoPrevNext:false,navigationAsDateFormat:false,gotoCurrent:false,changeMonth:false,changeYear:false,yearRange:"c-10:c+10",showOtherMonths:false,selectOtherMonths:false,showWeek:false,calculateWeek:this.iso8601Week,shortYearCutoff:"+10",
+minDate:null,maxDate:null,duration:"fast",beforeShowDay:null,beforeShow:null,onSelect:null,onChangeMonthYear:null,onClose:null,numberOfMonths:1,showCurrentAtPos:0,stepMonths:1,stepBigMonths:12,altField:"",altFormat:"",constrainInput:true,showButtonPanel:false,autoSize:false};d.extend(this._defaults,this.regional[""]);this.dpDiv=d('<div id="'+this._mainDivId+'" class="ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all"></div>')}function E(a,b){d.extend(a,b);for(var c in b)if(b[c]==
+null||b[c]==G)a[c]=b[c];return a}d.extend(d.ui,{datepicker:{version:"1.8.10"}});var y=(new Date).getTime();d.extend(K.prototype,{markerClassName:"hasDatepicker",log:function(){this.debug&&console.log.apply("",arguments)},_widgetDatepicker:function(){return this.dpDiv},setDefaults:function(a){E(this._defaults,a||{});return this},_attachDatepicker:function(a,b){var c=null;for(var e in this._defaults){var f=a.getAttribute("date:"+e);if(f){c=c||{};try{c[e]=eval(f)}catch(h){c[e]=f}}}e=a.nodeName.toLowerCase();
+f=e=="div"||e=="span";if(!a.id){this.uuid+=1;a.id="dp"+this.uuid}var i=this._newInst(d(a),f);i.settings=d.extend({},b||{},c||{});if(e=="input")this._connectDatepicker(a,i);else f&&this._inlineDatepicker(a,i)},_newInst:function(a,b){return{id:a[0].id.replace(/([^A-Za-z0-9_-])/g,"\\\\$1"),input:a,selectedDay:0,selectedMonth:0,selectedYear:0,drawMonth:0,drawYear:0,inline:b,dpDiv:!b?this.dpDiv:d('<div class="'+this._inlineClass+' ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all"></div>')}},
+_connectDatepicker:function(a,b){var c=d(a);b.append=d([]);b.trigger=d([]);if(!c.hasClass(this.markerClassName)){this._attachments(c,b);c.addClass(this.markerClassName).keydown(this._doKeyDown).keypress(this._doKeyPress).keyup(this._doKeyUp).bind("setData.datepicker",function(e,f,h){b.settings[f]=h}).bind("getData.datepicker",function(e,f){return this._get(b,f)});this._autoSize(b);d.data(a,"datepicker",b)}},_attachments:function(a,b){var c=this._get(b,"appendText"),e=this._get(b,"isRTL");b.append&&
+b.append.remove();if(c){b.append=d('<span class="'+this._appendClass+'">'+c+"</span>");a[e?"before":"after"](b.append)}a.unbind("focus",this._showDatepicker);b.trigger&&b.trigger.remove();c=this._get(b,"showOn");if(c=="focus"||c=="both")a.focus(this._showDatepicker);if(c=="button"||c=="both"){c=this._get(b,"buttonText");var f=this._get(b,"buttonImage");b.trigger=d(this._get(b,"buttonImageOnly")?d("<img/>").addClass(this._triggerClass).attr({src:f,alt:c,title:c}):d('<button type="button"></button>').addClass(this._triggerClass).html(f==
+""?c:d("<img/>").attr({src:f,alt:c,title:c})));a[e?"before":"after"](b.trigger);b.trigger.click(function(){d.datepicker._datepickerShowing&&d.datepicker._lastInput==a[0]?d.datepicker._hideDatepicker():d.datepicker._showDatepicker(a[0]);return false})}},_autoSize:function(a){if(this._get(a,"autoSize")&&!a.inline){var b=new Date(2009,11,20),c=this._get(a,"dateFormat");if(c.match(/[DM]/)){var e=function(f){for(var h=0,i=0,g=0;g<f.length;g++)if(f[g].length>h){h=f[g].length;i=g}return i};b.setMonth(e(this._get(a,
+c.match(/MM/)?"monthNames":"monthNamesShort")));b.setDate(e(this._get(a,c.match(/DD/)?"dayNames":"dayNamesShort"))+20-b.getDay())}a.input.attr("size",this._formatDate(a,b).length)}},_inlineDatepicker:function(a,b){var c=d(a);if(!c.hasClass(this.markerClassName)){c.addClass(this.markerClassName).append(b.dpDiv).bind("setData.datepicker",function(e,f,h){b.settings[f]=h}).bind("getData.datepicker",function(e,f){return this._get(b,f)});d.data(a,"datepicker",b);this._setDate(b,this._getDefaultDate(b),
+true);this._updateDatepicker(b);this._updateAlternate(b);b.dpDiv.show()}},_dialogDatepicker:function(a,b,c,e,f){a=this._dialogInst;if(!a){this.uuid+=1;this._dialogInput=d('<input type="text" id="'+("dp"+this.uuid)+'" style="position: absolute; top: -100px; width: 0px; z-index: -10;"/>');this._dialogInput.keydown(this._doKeyDown);d("body").append(this._dialogInput);a=this._dialogInst=this._newInst(this._dialogInput,false);a.settings={};d.data(this._dialogInput[0],"datepicker",a)}E(a.settings,e||{});
+b=b&&b.constructor==Date?this._formatDate(a,b):b;this._dialogInput.val(b);this._pos=f?f.length?f:[f.pageX,f.pageY]:null;if(!this._pos)this._pos=[document.documentElement.clientWidth/2-100+(document.documentElement.scrollLeft||document.body.scrollLeft),document.documentElement.clientHeight/2-150+(document.documentElement.scrollTop||document.body.scrollTop)];this._dialogInput.css("left",this._pos[0]+20+"px").css("top",this._pos[1]+"px");a.settings.onSelect=c;this._inDialog=true;this.dpDiv.addClass(this._dialogClass);
+this._showDatepicker(this._dialogInput[0]);d.blockUI&&d.blockUI(this.dpDiv);d.data(this._dialogInput[0],"datepicker",a);return this},_destroyDatepicker:function(a){var b=d(a),c=d.data(a,"datepicker");if(b.hasClass(this.markerClassName)){var e=a.nodeName.toLowerCase();d.removeData(a,"datepicker");if(e=="input"){c.append.remove();c.trigger.remove();b.removeClass(this.markerClassName).unbind("focus",this._showDatepicker).unbind("keydown",this._doKeyDown).unbind("keypress",this._doKeyPress).unbind("keyup",
+this._doKeyUp)}else if(e=="div"||e=="span")b.removeClass(this.markerClassName).empty()}},_enableDatepicker:function(a){var b=d(a),c=d.data(a,"datepicker");if(b.hasClass(this.markerClassName)){var e=a.nodeName.toLowerCase();if(e=="input"){a.disabled=false;c.trigger.filter("button").each(function(){this.disabled=false}).end().filter("img").css({opacity:"1.0",cursor:""})}else if(e=="div"||e=="span")b.children("."+this._inlineClass).children().removeClass("ui-state-disabled");this._disabledInputs=d.map(this._disabledInputs,
+function(f){return f==a?null:f})}},_disableDatepicker:function(a){var b=d(a),c=d.data(a,"datepicker");if(b.hasClass(this.markerClassName)){var e=a.nodeName.toLowerCase();if(e=="input"){a.disabled=true;c.trigger.filter("button").each(function(){this.disabled=true}).end().filter("img").css({opacity:"0.5",cursor:"default"})}else if(e=="div"||e=="span")b.children("."+this._inlineClass).children().addClass("ui-state-disabled");this._disabledInputs=d.map(this._disabledInputs,function(f){return f==a?null:
+f});this._disabledInputs[this._disabledInputs.length]=a}},_isDisabledDatepicker:function(a){if(!a)return false;for(var b=0;b<this._disabledInputs.length;b++)if(this._disabledInputs[b]==a)return true;return false},_getInst:function(a){try{return d.data(a,"datepicker")}catch(b){throw"Missing instance data for this datepicker";}},_optionDatepicker:function(a,b,c){var e=this._getInst(a);if(arguments.length==2&&typeof b=="string")return b=="defaults"?d.extend({},d.datepicker._defaults):e?b=="all"?d.extend({},
+e.settings):this._get(e,b):null;var f=b||{};if(typeof b=="string"){f={};f[b]=c}if(e){this._curInst==e&&this._hideDatepicker();var h=this._getDateDatepicker(a,true);E(e.settings,f);this._attachments(d(a),e);this._autoSize(e);this._setDateDatepicker(a,h);this._updateDatepicker(e)}},_changeDatepicker:function(a,b,c){this._optionDatepicker(a,b,c)},_refreshDatepicker:function(a){(a=this._getInst(a))&&this._updateDatepicker(a)},_setDateDatepicker:function(a,b){if(a=this._getInst(a)){this._setDate(a,b);
+this._updateDatepicker(a);this._updateAlternate(a)}},_getDateDatepicker:function(a,b){(a=this._getInst(a))&&!a.inline&&this._setDateFromField(a,b);return a?this._getDate(a):null},_doKeyDown:function(a){var b=d.datepicker._getInst(a.target),c=true,e=b.dpDiv.is(".ui-datepicker-rtl");b._keyEvent=true;if(d.datepicker._datepickerShowing)switch(a.keyCode){case 9:d.datepicker._hideDatepicker();c=false;break;case 13:c=d("td."+d.datepicker._dayOverClass+":not(."+d.datepicker._currentClass+")",b.dpDiv);c[0]?
+d.datepicker._selectDay(a.target,b.selectedMonth,b.selectedYear,c[0]):d.datepicker._hideDatepicker();return false;case 27:d.datepicker._hideDatepicker();break;case 33:d.datepicker._adjustDate(a.target,a.ctrlKey?-d.datepicker._get(b,"stepBigMonths"):-d.datepicker._get(b,"stepMonths"),"M");break;case 34:d.datepicker._adjustDate(a.target,a.ctrlKey?+d.datepicker._get(b,"stepBigMonths"):+d.datepicker._get(b,"stepMonths"),"M");break;case 35:if(a.ctrlKey||a.metaKey)d.datepicker._clearDate(a.target);c=a.ctrlKey||
+a.metaKey;break;case 36:if(a.ctrlKey||a.metaKey)d.datepicker._gotoToday(a.target);c=a.ctrlKey||a.metaKey;break;case 37:if(a.ctrlKey||a.metaKey)d.datepicker._adjustDate(a.target,e?+1:-1,"D");c=a.ctrlKey||a.metaKey;if(a.originalEvent.altKey)d.datepicker._adjustDate(a.target,a.ctrlKey?-d.datepicker._get(b,"stepBigMonths"):-d.datepicker._get(b,"stepMonths"),"M");break;case 38:if(a.ctrlKey||a.metaKey)d.datepicker._adjustDate(a.target,-7,"D");c=a.ctrlKey||a.metaKey;break;case 39:if(a.ctrlKey||a.metaKey)d.datepicker._adjustDate(a.target,
+e?-1:+1,"D");c=a.ctrlKey||a.metaKey;if(a.originalEvent.altKey)d.datepicker._adjustDate(a.target,a.ctrlKey?+d.datepicker._get(b,"stepBigMonths"):+d.datepicker._get(b,"stepMonths"),"M");break;case 40:if(a.ctrlKey||a.metaKey)d.datepicker._adjustDate(a.target,+7,"D");c=a.ctrlKey||a.metaKey;break;default:c=false}else if(a.keyCode==36&&a.ctrlKey)d.datepicker._showDatepicker(this);else c=false;if(c){a.preventDefault();a.stopPropagation()}},_doKeyPress:function(a){var b=d.datepicker._getInst(a.target);if(d.datepicker._get(b,
+"constrainInput")){b=d.datepicker._possibleChars(d.datepicker._get(b,"dateFormat"));var c=String.fromCharCode(a.charCode==G?a.keyCode:a.charCode);return a.ctrlKey||a.metaKey||c<" "||!b||b.indexOf(c)>-1}},_doKeyUp:function(a){a=d.datepicker._getInst(a.target);if(a.input.val()!=a.lastVal)try{if(d.datepicker.parseDate(d.datepicker._get(a,"dateFormat"),a.input?a.input.val():null,d.datepicker._getFormatConfig(a))){d.datepicker._setDateFromField(a);d.datepicker._updateAlternate(a);d.datepicker._updateDatepicker(a)}}catch(b){d.datepicker.log(b)}return true},
+_showDatepicker:function(a){a=a.target||a;if(a.nodeName.toLowerCase()!="input")a=d("input",a.parentNode)[0];if(!(d.datepicker._isDisabledDatepicker(a)||d.datepicker._lastInput==a)){var b=d.datepicker._getInst(a);d.datepicker._curInst&&d.datepicker._curInst!=b&&d.datepicker._curInst.dpDiv.stop(true,true);var c=d.datepicker._get(b,"beforeShow");E(b.settings,c?c.apply(a,[a,b]):{});b.lastVal=null;d.datepicker._lastInput=a;d.datepicker._setDateFromField(b);if(d.datepicker._inDialog)a.value="";if(!d.datepicker._pos){d.datepicker._pos=
+d.datepicker._findPos(a);d.datepicker._pos[1]+=a.offsetHeight}var e=false;d(a).parents().each(function(){e|=d(this).css("position")=="fixed";return!e});if(e&&d.browser.opera){d.datepicker._pos[0]-=document.documentElement.scrollLeft;d.datepicker._pos[1]-=document.documentElement.scrollTop}c={left:d.datepicker._pos[0],top:d.datepicker._pos[1]};d.datepicker._pos=null;b.dpDiv.empty();b.dpDiv.css({position:"absolute",display:"block",top:"-1000px"});d.datepicker._updateDatepicker(b);c=d.datepicker._checkOffset(b,
+c,e);b.dpDiv.css({position:d.datepicker._inDialog&&d.blockUI?"static":e?"fixed":"absolute",display:"none",left:c.left+"px",top:c.top+"px"});if(!b.inline){c=d.datepicker._get(b,"showAnim");var f=d.datepicker._get(b,"duration"),h=function(){d.datepicker._datepickerShowing=true;var i=b.dpDiv.find("iframe.ui-datepicker-cover");if(i.length){var g=d.datepicker._getBorders(b.dpDiv);i.css({left:-g[0],top:-g[1],width:b.dpDiv.outerWidth(),height:b.dpDiv.outerHeight()})}};b.dpDiv.zIndex(d(a).zIndex()+1);d.effects&&
+d.effects[c]?b.dpDiv.show(c,d.datepicker._get(b,"showOptions"),f,h):b.dpDiv[c||"show"](c?f:null,h);if(!c||!f)h();b.input.is(":visible")&&!b.input.is(":disabled")&&b.input.focus();d.datepicker._curInst=b}}},_updateDatepicker:function(a){var b=this,c=d.datepicker._getBorders(a.dpDiv);a.dpDiv.empty().append(this._generateHTML(a));var e=a.dpDiv.find("iframe.ui-datepicker-cover");e.length&&e.css({left:-c[0],top:-c[1],width:a.dpDiv.outerWidth(),height:a.dpDiv.outerHeight()});a.dpDiv.find("button, .ui-datepicker-prev, .ui-datepicker-next, .ui-datepicker-calendar td a").bind("mouseout",
+function(){d(this).removeClass("ui-state-hover");this.className.indexOf("ui-datepicker-prev")!=-1&&d(this).removeClass("ui-datepicker-prev-hover");this.className.indexOf("ui-datepicker-next")!=-1&&d(this).removeClass("ui-datepicker-next-hover")}).bind("mouseover",function(){if(!b._isDisabledDatepicker(a.inline?a.dpDiv.parent()[0]:a.input[0])){d(this).parents(".ui-datepicker-calendar").find("a").removeClass("ui-state-hover");d(this).addClass("ui-state-hover");this.className.indexOf("ui-datepicker-prev")!=
+-1&&d(this).addClass("ui-datepicker-prev-hover");this.className.indexOf("ui-datepicker-next")!=-1&&d(this).addClass("ui-datepicker-next-hover")}}).end().find("."+this._dayOverClass+" a").trigger("mouseover").end();c=this._getNumberOfMonths(a);e=c[1];e>1?a.dpDiv.addClass("ui-datepicker-multi-"+e).css("width",17*e+"em"):a.dpDiv.removeClass("ui-datepicker-multi-2 ui-datepicker-multi-3 ui-datepicker-multi-4").width("");a.dpDiv[(c[0]!=1||c[1]!=1?"add":"remove")+"Class"]("ui-datepicker-multi");a.dpDiv[(this._get(a,
+"isRTL")?"add":"remove")+"Class"]("ui-datepicker-rtl");a==d.datepicker._curInst&&d.datepicker._datepickerShowing&&a.input&&a.input.is(":visible")&&!a.input.is(":disabled")&&a.input[0]!=document.activeElement&&a.input.focus();if(a.yearshtml){var f=a.yearshtml;setTimeout(function(){f===a.yearshtml&&a.dpDiv.find("select.ui-datepicker-year:first").replaceWith(a.yearshtml);f=a.yearshtml=null},0)}},_getBorders:function(a){var b=function(c){return{thin:1,medium:2,thick:3}[c]||c};return[parseFloat(b(a.css("border-left-width"))),
+parseFloat(b(a.css("border-top-width")))]},_checkOffset:function(a,b,c){var e=a.dpDiv.outerWidth(),f=a.dpDiv.outerHeight(),h=a.input?a.input.outerWidth():0,i=a.input?a.input.outerHeight():0,g=document.documentElement.clientWidth+d(document).scrollLeft(),j=document.documentElement.clientHeight+d(document).scrollTop();b.left-=this._get(a,"isRTL")?e-h:0;b.left-=c&&b.left==a.input.offset().left?d(document).scrollLeft():0;b.top-=c&&b.top==a.input.offset().top+i?d(document).scrollTop():0;b.left-=Math.min(b.left,
+b.left+e>g&&g>e?Math.abs(b.left+e-g):0);b.top-=Math.min(b.top,b.top+f>j&&j>f?Math.abs(f+i):0);return b},_findPos:function(a){for(var b=this._get(this._getInst(a),"isRTL");a&&(a.type=="hidden"||a.nodeType!=1||d.expr.filters.hidden(a));)a=a[b?"previousSibling":"nextSibling"];a=d(a).offset();return[a.left,a.top]},_hideDatepicker:function(a){var b=this._curInst;if(!(!b||a&&b!=d.data(a,"datepicker")))if(this._datepickerShowing){a=this._get(b,"showAnim");var c=this._get(b,"duration"),e=function(){d.datepicker._tidyDialog(b);
+this._curInst=null};d.effects&&d.effects[a]?b.dpDiv.hide(a,d.datepicker._get(b,"showOptions"),c,e):b.dpDiv[a=="slideDown"?"slideUp":a=="fadeIn"?"fadeOut":"hide"](a?c:null,e);a||e();if(a=this._get(b,"onClose"))a.apply(b.input?b.input[0]:null,[b.input?b.input.val():"",b]);this._datepickerShowing=false;this._lastInput=null;if(this._inDialog){this._dialogInput.css({position:"absolute",left:"0",top:"-100px"});if(d.blockUI){d.unblockUI();d("body").append(this.dpDiv)}}this._inDialog=false}},_tidyDialog:function(a){a.dpDiv.removeClass(this._dialogClass).unbind(".ui-datepicker-calendar")},
+_checkExternalClick:function(a){if(d.datepicker._curInst){a=d(a.target);a[0].id!=d.datepicker._mainDivId&&a.parents("#"+d.datepicker._mainDivId).length==0&&!a.hasClass(d.datepicker.markerClassName)&&!a.hasClass(d.datepicker._triggerClass)&&d.datepicker._datepickerShowing&&!(d.datepicker._inDialog&&d.blockUI)&&d.datepicker._hideDatepicker()}},_adjustDate:function(a,b,c){a=d(a);var e=this._getInst(a[0]);if(!this._isDisabledDatepicker(a[0])){this._adjustInstDate(e,b+(c=="M"?this._get(e,"showCurrentAtPos"):
+0),c);this._updateDatepicker(e)}},_gotoToday:function(a){a=d(a);var b=this._getInst(a[0]);if(this._get(b,"gotoCurrent")&&b.currentDay){b.selectedDay=b.currentDay;b.drawMonth=b.selectedMonth=b.currentMonth;b.drawYear=b.selectedYear=b.currentYear}else{var c=new Date;b.selectedDay=c.getDate();b.drawMonth=b.selectedMonth=c.getMonth();b.drawYear=b.selectedYear=c.getFullYear()}this._notifyChange(b);this._adjustDate(a)},_selectMonthYear:function(a,b,c){a=d(a);var e=this._getInst(a[0]);e._selectingMonthYear=
+false;e["selected"+(c=="M"?"Month":"Year")]=e["draw"+(c=="M"?"Month":"Year")]=parseInt(b.options[b.selectedIndex].value,10);this._notifyChange(e);this._adjustDate(a)},_clickMonthYear:function(a){var b=this._getInst(d(a)[0]);b.input&&b._selectingMonthYear&&setTimeout(function(){b.input.focus()},0);b._selectingMonthYear=!b._selectingMonthYear},_selectDay:function(a,b,c,e){var f=d(a);if(!(d(e).hasClass(this._unselectableClass)||this._isDisabledDatepicker(f[0]))){f=this._getInst(f[0]);f.selectedDay=f.currentDay=
+d("a",e).html();f.selectedMonth=f.currentMonth=b;f.selectedYear=f.currentYear=c;this._selectDate(a,this._formatDate(f,f.currentDay,f.currentMonth,f.currentYear))}},_clearDate:function(a){a=d(a);this._getInst(a[0]);this._selectDate(a,"")},_selectDate:function(a,b){a=this._getInst(d(a)[0]);b=b!=null?b:this._formatDate(a);a.input&&a.input.val(b);this._updateAlternate(a);var c=this._get(a,"onSelect");if(c)c.apply(a.input?a.input[0]:null,[b,a]);else a.input&&a.input.trigger("change");if(a.inline)this._updateDatepicker(a);
+else{this._hideDatepicker();this._lastInput=a.input[0];typeof a.input[0]!="object"&&a.input.focus();this._lastInput=null}},_updateAlternate:function(a){var b=this._get(a,"altField");if(b){var c=this._get(a,"altFormat")||this._get(a,"dateFormat"),e=this._getDate(a),f=this.formatDate(c,e,this._getFormatConfig(a));d(b).each(function(){d(this).val(f)})}},noWeekends:function(a){a=a.getDay();return[a>0&&a<6,""]},iso8601Week:function(a){a=new Date(a.getTime());a.setDate(a.getDate()+4-(a.getDay()||7));var b=
+a.getTime();a.setMonth(0);a.setDate(1);return Math.floor(Math.round((b-a)/864E5)/7)+1},parseDate:function(a,b,c){if(a==null||b==null)throw"Invalid arguments";b=typeof b=="object"?b.toString():b+"";if(b=="")return null;var e=(c?c.shortYearCutoff:null)||this._defaults.shortYearCutoff;e=typeof e!="string"?e:(new Date).getFullYear()%100+parseInt(e,10);for(var f=(c?c.dayNamesShort:null)||this._defaults.dayNamesShort,h=(c?c.dayNames:null)||this._defaults.dayNames,i=(c?c.monthNamesShort:null)||this._defaults.monthNamesShort,
+g=(c?c.monthNames:null)||this._defaults.monthNames,j=c=-1,l=-1,u=-1,k=false,o=function(p){(p=z+1<a.length&&a.charAt(z+1)==p)&&z++;return p},m=function(p){var v=o(p);p=new RegExp("^\\d{1,"+(p=="@"?14:p=="!"?20:p=="y"&&v?4:p=="o"?3:2)+"}");p=b.substring(s).match(p);if(!p)throw"Missing number at position "+s;s+=p[0].length;return parseInt(p[0],10)},n=function(p,v,H){p=o(p)?H:v;for(v=0;v<p.length;v++)if(b.substr(s,p[v].length).toLowerCase()==p[v].toLowerCase()){s+=p[v].length;return v+1}throw"Unknown name at position "+
+s;},r=function(){if(b.charAt(s)!=a.charAt(z))throw"Unexpected literal at position "+s;s++},s=0,z=0;z<a.length;z++)if(k)if(a.charAt(z)=="'"&&!o("'"))k=false;else r();else switch(a.charAt(z)){case "d":l=m("d");break;case "D":n("D",f,h);break;case "o":u=m("o");break;case "m":j=m("m");break;case "M":j=n("M",i,g);break;case "y":c=m("y");break;case "@":var w=new Date(m("@"));c=w.getFullYear();j=w.getMonth()+1;l=w.getDate();break;case "!":w=new Date((m("!")-this._ticksTo1970)/1E4);c=w.getFullYear();j=w.getMonth()+
+1;l=w.getDate();break;case "'":if(o("'"))r();else k=true;break;default:r()}if(c==-1)c=(new Date).getFullYear();else if(c<100)c+=(new Date).getFullYear()-(new Date).getFullYear()%100+(c<=e?0:-100);if(u>-1){j=1;l=u;do{e=this._getDaysInMonth(c,j-1);if(l<=e)break;j++;l-=e}while(1)}w=this._daylightSavingAdjust(new Date(c,j-1,l));if(w.getFullYear()!=c||w.getMonth()+1!=j||w.getDate()!=l)throw"Invalid date";return w},ATOM:"yy-mm-dd",COOKIE:"D, dd M yy",ISO_8601:"yy-mm-dd",RFC_822:"D, d M y",RFC_850:"DD, dd-M-y",
+RFC_1036:"D, d M y",RFC_1123:"D, d M yy",RFC_2822:"D, d M yy",RSS:"D, d M y",TICKS:"!",TIMESTAMP:"@",W3C:"yy-mm-dd",_ticksTo1970:(718685+Math.floor(492.5)-Math.floor(19.7)+Math.floor(4.925))*24*60*60*1E7,formatDate:function(a,b,c){if(!b)return"";var e=(c?c.dayNamesShort:null)||this._defaults.dayNamesShort,f=(c?c.dayNames:null)||this._defaults.dayNames,h=(c?c.monthNamesShort:null)||this._defaults.monthNamesShort;c=(c?c.monthNames:null)||this._defaults.monthNames;var i=function(o){(o=k+1<a.length&&
+a.charAt(k+1)==o)&&k++;return o},g=function(o,m,n){m=""+m;if(i(o))for(;m.length<n;)m="0"+m;return m},j=function(o,m,n,r){return i(o)?r[m]:n[m]},l="",u=false;if(b)for(var k=0;k<a.length;k++)if(u)if(a.charAt(k)=="'"&&!i("'"))u=false;else l+=a.charAt(k);else switch(a.charAt(k)){case "d":l+=g("d",b.getDate(),2);break;case "D":l+=j("D",b.getDay(),e,f);break;case "o":l+=g("o",(b.getTime()-(new Date(b.getFullYear(),0,0)).getTime())/864E5,3);break;case "m":l+=g("m",b.getMonth()+1,2);break;case "M":l+=j("M",
+b.getMonth(),h,c);break;case "y":l+=i("y")?b.getFullYear():(b.getYear()%100<10?"0":"")+b.getYear()%100;break;case "@":l+=b.getTime();break;case "!":l+=b.getTime()*1E4+this._ticksTo1970;break;case "'":if(i("'"))l+="'";else u=true;break;default:l+=a.charAt(k)}return l},_possibleChars:function(a){for(var b="",c=false,e=function(h){(h=f+1<a.length&&a.charAt(f+1)==h)&&f++;return h},f=0;f<a.length;f++)if(c)if(a.charAt(f)=="'"&&!e("'"))c=false;else b+=a.charAt(f);else switch(a.charAt(f)){case "d":case "m":case "y":case "@":b+=
+"0123456789";break;case "D":case "M":return null;case "'":if(e("'"))b+="'";else c=true;break;default:b+=a.charAt(f)}return b},_get:function(a,b){return a.settings[b]!==G?a.settings[b]:this._defaults[b]},_setDateFromField:function(a,b){if(a.input.val()!=a.lastVal){var c=this._get(a,"dateFormat"),e=a.lastVal=a.input?a.input.val():null,f,h;f=h=this._getDefaultDate(a);var i=this._getFormatConfig(a);try{f=this.parseDate(c,e,i)||h}catch(g){this.log(g);e=b?"":e}a.selectedDay=f.getDate();a.drawMonth=a.selectedMonth=
+f.getMonth();a.drawYear=a.selectedYear=f.getFullYear();a.currentDay=e?f.getDate():0;a.currentMonth=e?f.getMonth():0;a.currentYear=e?f.getFullYear():0;this._adjustInstDate(a)}},_getDefaultDate:function(a){return this._restrictMinMax(a,this._determineDate(a,this._get(a,"defaultDate"),new Date))},_determineDate:function(a,b,c){var e=function(h){var i=new Date;i.setDate(i.getDate()+h);return i},f=function(h){try{return d.datepicker.parseDate(d.datepicker._get(a,"dateFormat"),h,d.datepicker._getFormatConfig(a))}catch(i){}var g=
+(h.toLowerCase().match(/^c/)?d.datepicker._getDate(a):null)||new Date,j=g.getFullYear(),l=g.getMonth();g=g.getDate();for(var u=/([+-]?[0-9]+)\s*(d|D|w|W|m|M|y|Y)?/g,k=u.exec(h);k;){switch(k[2]||"d"){case "d":case "D":g+=parseInt(k[1],10);break;case "w":case "W":g+=parseInt(k[1],10)*7;break;case "m":case "M":l+=parseInt(k[1],10);g=Math.min(g,d.datepicker._getDaysInMonth(j,l));break;case "y":case "Y":j+=parseInt(k[1],10);g=Math.min(g,d.datepicker._getDaysInMonth(j,l));break}k=u.exec(h)}return new Date(j,
+l,g)};if(b=(b=b==null||b===""?c:typeof b=="string"?f(b):typeof b=="number"?isNaN(b)?c:e(b):new Date(b.getTime()))&&b.toString()=="Invalid Date"?c:b){b.setHours(0);b.setMinutes(0);b.setSeconds(0);b.setMilliseconds(0)}return this._daylightSavingAdjust(b)},_daylightSavingAdjust:function(a){if(!a)return null;a.setHours(a.getHours()>12?a.getHours()+2:0);return a},_setDate:function(a,b,c){var e=!b,f=a.selectedMonth,h=a.selectedYear;b=this._restrictMinMax(a,this._determineDate(a,b,new Date));a.selectedDay=
+a.currentDay=b.getDate();a.drawMonth=a.selectedMonth=a.currentMonth=b.getMonth();a.drawYear=a.selectedYear=a.currentYear=b.getFullYear();if((f!=a.selectedMonth||h!=a.selectedYear)&&!c)this._notifyChange(a);this._adjustInstDate(a);if(a.input)a.input.val(e?"":this._formatDate(a))},_getDate:function(a){return!a.currentYear||a.input&&a.input.val()==""?null:this._daylightSavingAdjust(new Date(a.currentYear,a.currentMonth,a.currentDay))},_generateHTML:function(a){var b=new Date;b=this._daylightSavingAdjust(new Date(b.getFullYear(),
+b.getMonth(),b.getDate()));var c=this._get(a,"isRTL"),e=this._get(a,"showButtonPanel"),f=this._get(a,"hideIfNoPrevNext"),h=this._get(a,"navigationAsDateFormat"),i=this._getNumberOfMonths(a),g=this._get(a,"showCurrentAtPos"),j=this._get(a,"stepMonths"),l=i[0]!=1||i[1]!=1,u=this._daylightSavingAdjust(!a.currentDay?new Date(9999,9,9):new Date(a.currentYear,a.currentMonth,a.currentDay)),k=this._getMinMaxDate(a,"min"),o=this._getMinMaxDate(a,"max");g=a.drawMonth-g;var m=a.drawYear;if(g<0){g+=12;m--}if(o){var n=
+this._daylightSavingAdjust(new Date(o.getFullYear(),o.getMonth()-i[0]*i[1]+1,o.getDate()));for(n=k&&n<k?k:n;this._daylightSavingAdjust(new Date(m,g,1))>n;){g--;if(g<0){g=11;m--}}}a.drawMonth=g;a.drawYear=m;n=this._get(a,"prevText");n=!h?n:this.formatDate(n,this._daylightSavingAdjust(new Date(m,g-j,1)),this._getFormatConfig(a));n=this._canAdjustMonth(a,-1,m,g)?'<a class="ui-datepicker-prev ui-corner-all" onclick="DP_jQuery_'+y+".datepicker._adjustDate('#"+a.id+"', -"+j+", 'M');\" title=\""+n+'"><span class="ui-icon ui-icon-circle-triangle-'+
+(c?"e":"w")+'">'+n+"</span></a>":f?"":'<a class="ui-datepicker-prev ui-corner-all ui-state-disabled" title="'+n+'"><span class="ui-icon ui-icon-circle-triangle-'+(c?"e":"w")+'">'+n+"</span></a>";var r=this._get(a,"nextText");r=!h?r:this.formatDate(r,this._daylightSavingAdjust(new Date(m,g+j,1)),this._getFormatConfig(a));f=this._canAdjustMonth(a,+1,m,g)?'<a class="ui-datepicker-next ui-corner-all" onclick="DP_jQuery_'+y+".datepicker._adjustDate('#"+a.id+"', +"+j+", 'M');\" title=\""+r+'"><span class="ui-icon ui-icon-circle-triangle-'+
+(c?"w":"e")+'">'+r+"</span></a>":f?"":'<a class="ui-datepicker-next ui-corner-all ui-state-disabled" title="'+r+'"><span class="ui-icon ui-icon-circle-triangle-'+(c?"w":"e")+'">'+r+"</span></a>";j=this._get(a,"currentText");r=this._get(a,"gotoCurrent")&&a.currentDay?u:b;j=!h?j:this.formatDate(j,r,this._getFormatConfig(a));h=!a.inline?'<button type="button" class="ui-datepicker-close ui-state-default ui-priority-primary ui-corner-all" onclick="DP_jQuery_'+y+'.datepicker._hideDatepicker();">'+this._get(a,
+"closeText")+"</button>":"";e=e?'<div class="ui-datepicker-buttonpane ui-widget-content">'+(c?h:"")+(this._isInRange(a,r)?'<button type="button" class="ui-datepicker-current ui-state-default ui-priority-secondary ui-corner-all" onclick="DP_jQuery_'+y+".datepicker._gotoToday('#"+a.id+"');\">"+j+"</button>":"")+(c?"":h)+"</div>":"";h=parseInt(this._get(a,"firstDay"),10);h=isNaN(h)?0:h;j=this._get(a,"showWeek");r=this._get(a,"dayNames");this._get(a,"dayNamesShort");var s=this._get(a,"dayNamesMin"),z=
+this._get(a,"monthNames"),w=this._get(a,"monthNamesShort"),p=this._get(a,"beforeShowDay"),v=this._get(a,"showOtherMonths"),H=this._get(a,"selectOtherMonths");this._get(a,"calculateWeek");for(var L=this._getDefaultDate(a),I="",C=0;C<i[0];C++){for(var M="",D=0;D<i[1];D++){var N=this._daylightSavingAdjust(new Date(m,g,a.selectedDay)),t=" ui-corner-all",x="";if(l){x+='<div class="ui-datepicker-group';if(i[1]>1)switch(D){case 0:x+=" ui-datepicker-group-first";t=" ui-corner-"+(c?"right":"left");break;case i[1]-
+1:x+=" ui-datepicker-group-last";t=" ui-corner-"+(c?"left":"right");break;default:x+=" ui-datepicker-group-middle";t="";break}x+='">'}x+='<div class="ui-datepicker-header ui-widget-header ui-helper-clearfix'+t+'">'+(/all|left/.test(t)&&C==0?c?f:n:"")+(/all|right/.test(t)&&C==0?c?n:f:"")+this._generateMonthYearHeader(a,g,m,k,o,C>0||D>0,z,w)+'</div><table class="ui-datepicker-calendar"><thead><tr>';var A=j?'<th class="ui-datepicker-week-col">'+this._get(a,"weekHeader")+"</th>":"";for(t=0;t<7;t++){var q=
+(t+h)%7;A+="<th"+((t+h+6)%7>=5?' class="ui-datepicker-week-end"':"")+'><span title="'+r[q]+'">'+s[q]+"</span></th>"}x+=A+"</tr></thead><tbody>";A=this._getDaysInMonth(m,g);if(m==a.selectedYear&&g==a.selectedMonth)a.selectedDay=Math.min(a.selectedDay,A);t=(this._getFirstDayOfMonth(m,g)-h+7)%7;A=l?6:Math.ceil((t+A)/7);q=this._daylightSavingAdjust(new Date(m,g,1-t));for(var O=0;O<A;O++){x+="<tr>";var P=!j?"":'<td class="ui-datepicker-week-col">'+this._get(a,"calculateWeek")(q)+"</td>";for(t=0;t<7;t++){var F=
+p?p.apply(a.input?a.input[0]:null,[q]):[true,""],B=q.getMonth()!=g,J=B&&!H||!F[0]||k&&q<k||o&&q>o;P+='<td class="'+((t+h+6)%7>=5?" ui-datepicker-week-end":"")+(B?" ui-datepicker-other-month":"")+(q.getTime()==N.getTime()&&g==a.selectedMonth&&a._keyEvent||L.getTime()==q.getTime()&&L.getTime()==N.getTime()?" "+this._dayOverClass:"")+(J?" "+this._unselectableClass+" ui-state-disabled":"")+(B&&!v?"":" "+F[1]+(q.getTime()==u.getTime()?" "+this._currentClass:"")+(q.getTime()==b.getTime()?" ui-datepicker-today":
+""))+'"'+((!B||v)&&F[2]?' title="'+F[2]+'"':"")+(J?"":' onclick="DP_jQuery_'+y+".datepicker._selectDay('#"+a.id+"',"+q.getMonth()+","+q.getFullYear()+', this);return false;"')+">"+(B&&!v?"&#xa0;":J?'<span class="ui-state-default">'+q.getDate()+"</span>":'<a class="ui-state-default'+(q.getTime()==b.getTime()?" ui-state-highlight":"")+(q.getTime()==u.getTime()?" ui-state-active":"")+(B?" ui-priority-secondary":"")+'" href="#">'+q.getDate()+"</a>")+"</td>";q.setDate(q.getDate()+1);q=this._daylightSavingAdjust(q)}x+=
+P+"</tr>"}g++;if(g>11){g=0;m++}x+="</tbody></table>"+(l?"</div>"+(i[0]>0&&D==i[1]-1?'<div class="ui-datepicker-row-break"></div>':""):"");M+=x}I+=M}I+=e+(d.browser.msie&&parseInt(d.browser.version,10)<7&&!a.inline?'<iframe src="javascript:false;" class="ui-datepicker-cover" frameborder="0"></iframe>':"");a._keyEvent=false;return I},_generateMonthYearHeader:function(a,b,c,e,f,h,i,g){var j=this._get(a,"changeMonth"),l=this._get(a,"changeYear"),u=this._get(a,"showMonthAfterYear"),k='<div class="ui-datepicker-title">',
+o="";if(h||!j)o+='<span class="ui-datepicker-month">'+i[b]+"</span>";else{i=e&&e.getFullYear()==c;var m=f&&f.getFullYear()==c;o+='<select class="ui-datepicker-month" onchange="DP_jQuery_'+y+".datepicker._selectMonthYear('#"+a.id+"', this, 'M');\" onclick=\"DP_jQuery_"+y+".datepicker._clickMonthYear('#"+a.id+"');\">";for(var n=0;n<12;n++)if((!i||n>=e.getMonth())&&(!m||n<=f.getMonth()))o+='<option value="'+n+'"'+(n==b?' selected="selected"':"")+">"+g[n]+"</option>";o+="</select>"}u||(k+=o+(h||!(j&&
+l)?"&#xa0;":""));a.yearshtml="";if(h||!l)k+='<span class="ui-datepicker-year">'+c+"</span>";else{g=this._get(a,"yearRange").split(":");var r=(new Date).getFullYear();i=function(s){s=s.match(/c[+-].*/)?c+parseInt(s.substring(1),10):s.match(/[+-].*/)?r+parseInt(s,10):parseInt(s,10);return isNaN(s)?r:s};b=i(g[0]);g=Math.max(b,i(g[1]||""));b=e?Math.max(b,e.getFullYear()):b;g=f?Math.min(g,f.getFullYear()):g;for(a.yearshtml+='<select class="ui-datepicker-year" onchange="DP_jQuery_'+y+".datepicker._selectMonthYear('#"+
+a.id+"', this, 'Y');\" onclick=\"DP_jQuery_"+y+".datepicker._clickMonthYear('#"+a.id+"');\">";b<=g;b++)a.yearshtml+='<option value="'+b+'"'+(b==c?' selected="selected"':"")+">"+b+"</option>";a.yearshtml+="</select>";if(d.browser.mozilla)k+='<select class="ui-datepicker-year"><option value="'+c+'" selected="selected">'+c+"</option></select>";else{k+=a.yearshtml;a.yearshtml=null}}k+=this._get(a,"yearSuffix");if(u)k+=(h||!(j&&l)?"&#xa0;":"")+o;k+="</div>";return k},_adjustInstDate:function(a,b,c){var e=
+a.drawYear+(c=="Y"?b:0),f=a.drawMonth+(c=="M"?b:0);b=Math.min(a.selectedDay,this._getDaysInMonth(e,f))+(c=="D"?b:0);e=this._restrictMinMax(a,this._daylightSavingAdjust(new Date(e,f,b)));a.selectedDay=e.getDate();a.drawMonth=a.selectedMonth=e.getMonth();a.drawYear=a.selectedYear=e.getFullYear();if(c=="M"||c=="Y")this._notifyChange(a)},_restrictMinMax:function(a,b){var c=this._getMinMaxDate(a,"min");a=this._getMinMaxDate(a,"max");b=c&&b<c?c:b;return b=a&&b>a?a:b},_notifyChange:function(a){var b=this._get(a,
+"onChangeMonthYear");if(b)b.apply(a.input?a.input[0]:null,[a.selectedYear,a.selectedMonth+1,a])},_getNumberOfMonths:function(a){a=this._get(a,"numberOfMonths");return a==null?[1,1]:typeof a=="number"?[1,a]:a},_getMinMaxDate:function(a,b){return this._determineDate(a,this._get(a,b+"Date"),null)},_getDaysInMonth:function(a,b){return 32-this._daylightSavingAdjust(new Date(a,b,32)).getDate()},_getFirstDayOfMonth:function(a,b){return(new Date(a,b,1)).getDay()},_canAdjustMonth:function(a,b,c,e){var f=this._getNumberOfMonths(a);
+c=this._daylightSavingAdjust(new Date(c,e+(b<0?b:f[0]*f[1]),1));b<0&&c.setDate(this._getDaysInMonth(c.getFullYear(),c.getMonth()));return this._isInRange(a,c)},_isInRange:function(a,b){var c=this._getMinMaxDate(a,"min");a=this._getMinMaxDate(a,"max");return(!c||b.getTime()>=c.getTime())&&(!a||b.getTime()<=a.getTime())},_getFormatConfig:function(a){var b=this._get(a,"shortYearCutoff");b=typeof b!="string"?b:(new Date).getFullYear()%100+parseInt(b,10);return{shortYearCutoff:b,dayNamesShort:this._get(a,
+"dayNamesShort"),dayNames:this._get(a,"dayNames"),monthNamesShort:this._get(a,"monthNamesShort"),monthNames:this._get(a,"monthNames")}},_formatDate:function(a,b,c,e){if(!b){a.currentDay=a.selectedDay;a.currentMonth=a.selectedMonth;a.currentYear=a.selectedYear}b=b?typeof b=="object"?b:this._daylightSavingAdjust(new Date(e,c,b)):this._daylightSavingAdjust(new Date(a.currentYear,a.currentMonth,a.currentDay));return this.formatDate(this._get(a,"dateFormat"),b,this._getFormatConfig(a))}});d.fn.datepicker=
+function(a){if(!this.length)return this;if(!d.datepicker.initialized){d(document).mousedown(d.datepicker._checkExternalClick).find("body").append(d.datepicker.dpDiv);d.datepicker.initialized=true}var b=Array.prototype.slice.call(arguments,1);if(typeof a=="string"&&(a=="isDisabled"||a=="getDate"||a=="widget"))return d.datepicker["_"+a+"Datepicker"].apply(d.datepicker,[this[0]].concat(b));if(a=="option"&&arguments.length==2&&typeof arguments[1]=="string")return d.datepicker["_"+a+"Datepicker"].apply(d.datepicker,
+[this[0]].concat(b));return this.each(function(){typeof a=="string"?d.datepicker["_"+a+"Datepicker"].apply(d.datepicker,[this].concat(b)):d.datepicker._attachDatepicker(this,a)})};d.datepicker=new K;d.datepicker.initialized=false;d.datepicker.uuid=(new Date).getTime();d.datepicker.version="1.8.10";window["DP_jQuery_"+y]=d})(jQuery);
+;/*
+ * jQuery UI Progressbar 1.8.10
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Progressbar
+ *
+ * Depends:
+ *   jquery.ui.core.js
+ *   jquery.ui.widget.js
+ */
+(function(b,d){b.widget("ui.progressbar",{options:{value:0,max:100},min:0,_create:function(){this.element.addClass("ui-progressbar ui-widget ui-widget-content ui-corner-all").attr({role:"progressbar","aria-valuemin":this.min,"aria-valuemax":this.options.max,"aria-valuenow":this._value()});this.valueDiv=b("<div class='ui-progressbar-value ui-widget-header ui-corner-left'></div>").appendTo(this.element);this.oldValue=this._value();this._refreshValue()},destroy:function(){this.element.removeClass("ui-progressbar ui-widget ui-widget-content ui-corner-all").removeAttr("role").removeAttr("aria-valuemin").removeAttr("aria-valuemax").removeAttr("aria-valuenow");
+this.valueDiv.remove();b.Widget.prototype.destroy.apply(this,arguments)},value:function(a){if(a===d)return this._value();this._setOption("value",a);return this},_setOption:function(a,c){if(a==="value"){this.options.value=c;this._refreshValue();this._value()===this.options.max&&this._trigger("complete")}b.Widget.prototype._setOption.apply(this,arguments)},_value:function(){var a=this.options.value;if(typeof a!=="number")a=0;return Math.min(this.options.max,Math.max(this.min,a))},_percentage:function(){return 100*
+this._value()/this.options.max},_refreshValue:function(){var a=this.value(),c=this._percentage();if(this.oldValue!==a){this.oldValue=a;this._trigger("change")}this.valueDiv.toggleClass("ui-corner-right",a===this.options.max).width(c.toFixed(0)+"%");this.element.attr("aria-valuenow",a)}});b.extend(b.ui.progressbar,{version:"1.8.10"})})(jQuery);
+;/*
+ * jQuery UI Effects 1.8.10
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/
+ */
+jQuery.effects||function(f,j){function n(c){var a;if(c&&c.constructor==Array&&c.length==3)return c;if(a=/rgb\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*\)/.exec(c))return[parseInt(a[1],10),parseInt(a[2],10),parseInt(a[3],10)];if(a=/rgb\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*\)/.exec(c))return[parseFloat(a[1])*2.55,parseFloat(a[2])*2.55,parseFloat(a[3])*2.55];if(a=/#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/.exec(c))return[parseInt(a[1],
+16),parseInt(a[2],16),parseInt(a[3],16)];if(a=/#([a-fA-F0-9])([a-fA-F0-9])([a-fA-F0-9])/.exec(c))return[parseInt(a[1]+a[1],16),parseInt(a[2]+a[2],16),parseInt(a[3]+a[3],16)];if(/rgba\(0, 0, 0, 0\)/.exec(c))return o.transparent;return o[f.trim(c).toLowerCase()]}function s(c,a){var b;do{b=f.curCSS(c,a);if(b!=""&&b!="transparent"||f.nodeName(c,"body"))break;a="backgroundColor"}while(c=c.parentNode);return n(b)}function p(){var c=document.defaultView?document.defaultView.getComputedStyle(this,null):this.currentStyle,
+a={},b,d;if(c&&c.length&&c[0]&&c[c[0]])for(var e=c.length;e--;){b=c[e];if(typeof c[b]=="string"){d=b.replace(/\-(\w)/g,function(g,h){return h.toUpperCase()});a[d]=c[b]}}else for(b in c)if(typeof c[b]==="string")a[b]=c[b];return a}function q(c){var a,b;for(a in c){b=c[a];if(b==null||f.isFunction(b)||a in t||/scrollbar/.test(a)||!/color/i.test(a)&&isNaN(parseFloat(b)))delete c[a]}return c}function u(c,a){var b={_:0},d;for(d in a)if(c[d]!=a[d])b[d]=a[d];return b}function k(c,a,b,d){if(typeof c=="object"){d=
+a;b=null;a=c;c=a.effect}if(f.isFunction(a)){d=a;b=null;a={}}if(typeof a=="number"||f.fx.speeds[a]){d=b;b=a;a={}}if(f.isFunction(b)){d=b;b=null}a=a||{};b=b||a.duration;b=f.fx.off?0:typeof b=="number"?b:b in f.fx.speeds?f.fx.speeds[b]:f.fx.speeds._default;d=d||a.complete;return[c,a,b,d]}function m(c){if(!c||typeof c==="number"||f.fx.speeds[c])return true;if(typeof c==="string"&&!f.effects[c])return true;return false}f.effects={};f.each(["backgroundColor","borderBottomColor","borderLeftColor","borderRightColor",
+"borderTopColor","borderColor","color","outlineColor"],function(c,a){f.fx.step[a]=function(b){if(!b.colorInit){b.start=s(b.elem,a);b.end=n(b.end);b.colorInit=true}b.elem.style[a]="rgb("+Math.max(Math.min(parseInt(b.pos*(b.end[0]-b.start[0])+b.start[0],10),255),0)+","+Math.max(Math.min(parseInt(b.pos*(b.end[1]-b.start[1])+b.start[1],10),255),0)+","+Math.max(Math.min(parseInt(b.pos*(b.end[2]-b.start[2])+b.start[2],10),255),0)+")"}});var o={aqua:[0,255,255],azure:[240,255,255],beige:[245,245,220],black:[0,
+0,0],blue:[0,0,255],brown:[165,42,42],cyan:[0,255,255],darkblue:[0,0,139],darkcyan:[0,139,139],darkgrey:[169,169,169],darkgreen:[0,100,0],darkkhaki:[189,183,107],darkmagenta:[139,0,139],darkolivegreen:[85,107,47],darkorange:[255,140,0],darkorchid:[153,50,204],darkred:[139,0,0],darksalmon:[233,150,122],darkviolet:[148,0,211],fuchsia:[255,0,255],gold:[255,215,0],green:[0,128,0],indigo:[75,0,130],khaki:[240,230,140],lightblue:[173,216,230],lightcyan:[224,255,255],lightgreen:[144,238,144],lightgrey:[211,
+211,211],lightpink:[255,182,193],lightyellow:[255,255,224],lime:[0,255,0],magenta:[255,0,255],maroon:[128,0,0],navy:[0,0,128],olive:[128,128,0],orange:[255,165,0],pink:[255,192,203],purple:[128,0,128],violet:[128,0,128],red:[255,0,0],silver:[192,192,192],white:[255,255,255],yellow:[255,255,0],transparent:[255,255,255]},r=["add","remove","toggle"],t={border:1,borderBottom:1,borderColor:1,borderLeft:1,borderRight:1,borderTop:1,borderWidth:1,margin:1,padding:1};f.effects.animateClass=function(c,a,b,
+d){if(f.isFunction(b)){d=b;b=null}return this.queue("fx",function(){var e=f(this),g=e.attr("style")||" ",h=q(p.call(this)),l,v=e.attr("className");f.each(r,function(w,i){c[i]&&e[i+"Class"](c[i])});l=q(p.call(this));e.attr("className",v);e.animate(u(h,l),a,b,function(){f.each(r,function(w,i){c[i]&&e[i+"Class"](c[i])});if(typeof e.attr("style")=="object"){e.attr("style").cssText="";e.attr("style").cssText=g}else e.attr("style",g);d&&d.apply(this,arguments)});h=f.queue(this);l=h.splice(h.length-1,1)[0];
+h.splice(1,0,l);f.dequeue(this)})};f.fn.extend({_addClass:f.fn.addClass,addClass:function(c,a,b,d){return a?f.effects.animateClass.apply(this,[{add:c},a,b,d]):this._addClass(c)},_removeClass:f.fn.removeClass,removeClass:function(c,a,b,d){return a?f.effects.animateClass.apply(this,[{remove:c},a,b,d]):this._removeClass(c)},_toggleClass:f.fn.toggleClass,toggleClass:function(c,a,b,d,e){return typeof a=="boolean"||a===j?b?f.effects.animateClass.apply(this,[a?{add:c}:{remove:c},b,d,e]):this._toggleClass(c,
+a):f.effects.animateClass.apply(this,[{toggle:c},a,b,d])},switchClass:function(c,a,b,d,e){return f.effects.animateClass.apply(this,[{add:a,remove:c},b,d,e])}});f.extend(f.effects,{version:"1.8.10",save:function(c,a){for(var b=0;b<a.length;b++)a[b]!==null&&c.data("ec.storage."+a[b],c[0].style[a[b]])},restore:function(c,a){for(var b=0;b<a.length;b++)a[b]!==null&&c.css(a[b],c.data("ec.storage."+a[b]))},setMode:function(c,a){if(a=="toggle")a=c.is(":hidden")?"show":"hide";return a},getBaseline:function(c,
+a){var b;switch(c[0]){case "top":b=0;break;case "middle":b=0.5;break;case "bottom":b=1;break;default:b=c[0]/a.height}switch(c[1]){case "left":c=0;break;case "center":c=0.5;break;case "right":c=1;break;default:c=c[1]/a.width}return{x:c,y:b}},createWrapper:function(c){if(c.parent().is(".ui-effects-wrapper"))return c.parent();var a={width:c.outerWidth(true),height:c.outerHeight(true),"float":c.css("float")},b=f("<div></div>").addClass("ui-effects-wrapper").css({fontSize:"100%",background:"transparent",
+border:"none",margin:0,padding:0});c.wrap(b);b=c.parent();if(c.css("position")=="static"){b.css({position:"relative"});c.css({position:"relative"})}else{f.extend(a,{position:c.css("position"),zIndex:c.css("z-index")});f.each(["top","left","bottom","right"],function(d,e){a[e]=c.css(e);if(isNaN(parseInt(a[e],10)))a[e]="auto"});c.css({position:"relative",top:0,left:0,right:"auto",bottom:"auto"})}return b.css(a).show()},removeWrapper:function(c){if(c.parent().is(".ui-effects-wrapper"))return c.parent().replaceWith(c);
+return c},setTransition:function(c,a,b,d){d=d||{};f.each(a,function(e,g){unit=c.cssUnit(g);if(unit[0]>0)d[g]=unit[0]*b+unit[1]});return d}});f.fn.extend({effect:function(c){var a=k.apply(this,arguments),b={options:a[1],duration:a[2],callback:a[3]};a=b.options.mode;var d=f.effects[c];if(f.fx.off||!d)return a?this[a](b.duration,b.callback):this.each(function(){b.callback&&b.callback.call(this)});return d.call(this,b)},_show:f.fn.show,show:function(c){if(m(c))return this._show.apply(this,arguments);
+else{var a=k.apply(this,arguments);a[1].mode="show";return this.effect.apply(this,a)}},_hide:f.fn.hide,hide:function(c){if(m(c))return this._hide.apply(this,arguments);else{var a=k.apply(this,arguments);a[1].mode="hide";return this.effect.apply(this,a)}},__toggle:f.fn.toggle,toggle:function(c){if(m(c)||typeof c==="boolean"||f.isFunction(c))return this.__toggle.apply(this,arguments);else{var a=k.apply(this,arguments);a[1].mode="toggle";return this.effect.apply(this,a)}},cssUnit:function(c){var a=this.css(c),
+b=[];f.each(["em","px","%","pt"],function(d,e){if(a.indexOf(e)>0)b=[parseFloat(a),e]});return b}});f.easing.jswing=f.easing.swing;f.extend(f.easing,{def:"easeOutQuad",swing:function(c,a,b,d,e){return f.easing[f.easing.def](c,a,b,d,e)},easeInQuad:function(c,a,b,d,e){return d*(a/=e)*a+b},easeOutQuad:function(c,a,b,d,e){return-d*(a/=e)*(a-2)+b},easeInOutQuad:function(c,a,b,d,e){if((a/=e/2)<1)return d/2*a*a+b;return-d/2*(--a*(a-2)-1)+b},easeInCubic:function(c,a,b,d,e){return d*(a/=e)*a*a+b},easeOutCubic:function(c,
+a,b,d,e){return d*((a=a/e-1)*a*a+1)+b},easeInOutCubic:function(c,a,b,d,e){if((a/=e/2)<1)return d/2*a*a*a+b;return d/2*((a-=2)*a*a+2)+b},easeInQuart:function(c,a,b,d,e){return d*(a/=e)*a*a*a+b},easeOutQuart:function(c,a,b,d,e){return-d*((a=a/e-1)*a*a*a-1)+b},easeInOutQuart:function(c,a,b,d,e){if((a/=e/2)<1)return d/2*a*a*a*a+b;return-d/2*((a-=2)*a*a*a-2)+b},easeInQuint:function(c,a,b,d,e){return d*(a/=e)*a*a*a*a+b},easeOutQuint:function(c,a,b,d,e){return d*((a=a/e-1)*a*a*a*a+1)+b},easeInOutQuint:function(c,
+a,b,d,e){if((a/=e/2)<1)return d/2*a*a*a*a*a+b;return d/2*((a-=2)*a*a*a*a+2)+b},easeInSine:function(c,a,b,d,e){return-d*Math.cos(a/e*(Math.PI/2))+d+b},easeOutSine:function(c,a,b,d,e){return d*Math.sin(a/e*(Math.PI/2))+b},easeInOutSine:function(c,a,b,d,e){return-d/2*(Math.cos(Math.PI*a/e)-1)+b},easeInExpo:function(c,a,b,d,e){return a==0?b:d*Math.pow(2,10*(a/e-1))+b},easeOutExpo:function(c,a,b,d,e){return a==e?b+d:d*(-Math.pow(2,-10*a/e)+1)+b},easeInOutExpo:function(c,a,b,d,e){if(a==0)return b;if(a==
+e)return b+d;if((a/=e/2)<1)return d/2*Math.pow(2,10*(a-1))+b;return d/2*(-Math.pow(2,-10*--a)+2)+b},easeInCirc:function(c,a,b,d,e){return-d*(Math.sqrt(1-(a/=e)*a)-1)+b},easeOutCirc:function(c,a,b,d,e){return d*Math.sqrt(1-(a=a/e-1)*a)+b},easeInOutCirc:function(c,a,b,d,e){if((a/=e/2)<1)return-d/2*(Math.sqrt(1-a*a)-1)+b;return d/2*(Math.sqrt(1-(a-=2)*a)+1)+b},easeInElastic:function(c,a,b,d,e){c=1.70158;var g=0,h=d;if(a==0)return b;if((a/=e)==1)return b+d;g||(g=e*0.3);if(h<Math.abs(d)){h=d;c=g/4}else c=
+g/(2*Math.PI)*Math.asin(d/h);return-(h*Math.pow(2,10*(a-=1))*Math.sin((a*e-c)*2*Math.PI/g))+b},easeOutElastic:function(c,a,b,d,e){c=1.70158;var g=0,h=d;if(a==0)return b;if((a/=e)==1)return b+d;g||(g=e*0.3);if(h<Math.abs(d)){h=d;c=g/4}else c=g/(2*Math.PI)*Math.asin(d/h);return h*Math.pow(2,-10*a)*Math.sin((a*e-c)*2*Math.PI/g)+d+b},easeInOutElastic:function(c,a,b,d,e){c=1.70158;var g=0,h=d;if(a==0)return b;if((a/=e/2)==2)return b+d;g||(g=e*0.3*1.5);if(h<Math.abs(d)){h=d;c=g/4}else c=g/(2*Math.PI)*Math.asin(d/
+h);if(a<1)return-0.5*h*Math.pow(2,10*(a-=1))*Math.sin((a*e-c)*2*Math.PI/g)+b;return h*Math.pow(2,-10*(a-=1))*Math.sin((a*e-c)*2*Math.PI/g)*0.5+d+b},easeInBack:function(c,a,b,d,e,g){if(g==j)g=1.70158;return d*(a/=e)*a*((g+1)*a-g)+b},easeOutBack:function(c,a,b,d,e,g){if(g==j)g=1.70158;return d*((a=a/e-1)*a*((g+1)*a+g)+1)+b},easeInOutBack:function(c,a,b,d,e,g){if(g==j)g=1.70158;if((a/=e/2)<1)return d/2*a*a*(((g*=1.525)+1)*a-g)+b;return d/2*((a-=2)*a*(((g*=1.525)+1)*a+g)+2)+b},easeInBounce:function(c,
+a,b,d,e){return d-f.easing.easeOutBounce(c,e-a,0,d,e)+b},easeOutBounce:function(c,a,b,d,e){return(a/=e)<1/2.75?d*7.5625*a*a+b:a<2/2.75?d*(7.5625*(a-=1.5/2.75)*a+0.75)+b:a<2.5/2.75?d*(7.5625*(a-=2.25/2.75)*a+0.9375)+b:d*(7.5625*(a-=2.625/2.75)*a+0.984375)+b},easeInOutBounce:function(c,a,b,d,e){if(a<e/2)return f.easing.easeInBounce(c,a*2,0,d,e)*0.5+b;return f.easing.easeOutBounce(c,a*2-e,0,d,e)*0.5+d*0.5+b}})}(jQuery);
+;/*
+ * jQuery UI Effects Blind 1.8.10
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/Blind
+ *
+ * Depends:
+ *	jquery.effects.core.js
+ */
+(function(b){b.effects.blind=function(c){return this.queue(function(){var a=b(this),g=["position","top","bottom","left","right"],f=b.effects.setMode(a,c.options.mode||"hide"),d=c.options.direction||"vertical";b.effects.save(a,g);a.show();var e=b.effects.createWrapper(a).css({overflow:"hidden"}),h=d=="vertical"?"height":"width";d=d=="vertical"?e.height():e.width();f=="show"&&e.css(h,0);var i={};i[h]=f=="show"?d:0;e.animate(i,c.duration,c.options.easing,function(){f=="hide"&&a.hide();b.effects.restore(a,
+g);b.effects.removeWrapper(a);c.callback&&c.callback.apply(a[0],arguments);a.dequeue()})})}})(jQuery);
+;/*
+ * jQuery UI Effects Bounce 1.8.10
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/Bounce
+ *
+ * Depends:
+ *	jquery.effects.core.js
+ */
+(function(e){e.effects.bounce=function(b){return this.queue(function(){var a=e(this),l=["position","top","bottom","left","right"],h=e.effects.setMode(a,b.options.mode||"effect"),d=b.options.direction||"up",c=b.options.distance||20,m=b.options.times||5,i=b.duration||250;/show|hide/.test(h)&&l.push("opacity");e.effects.save(a,l);a.show();e.effects.createWrapper(a);var f=d=="up"||d=="down"?"top":"left";d=d=="up"||d=="left"?"pos":"neg";c=b.options.distance||(f=="top"?a.outerHeight({margin:true})/3:a.outerWidth({margin:true})/
+3);if(h=="show")a.css("opacity",0).css(f,d=="pos"?-c:c);if(h=="hide")c/=m*2;h!="hide"&&m--;if(h=="show"){var g={opacity:1};g[f]=(d=="pos"?"+=":"-=")+c;a.animate(g,i/2,b.options.easing);c/=2;m--}for(g=0;g<m;g++){var j={},k={};j[f]=(d=="pos"?"-=":"+=")+c;k[f]=(d=="pos"?"+=":"-=")+c;a.animate(j,i/2,b.options.easing).animate(k,i/2,b.options.easing);c=h=="hide"?c*2:c/2}if(h=="hide"){g={opacity:0};g[f]=(d=="pos"?"-=":"+=")+c;a.animate(g,i/2,b.options.easing,function(){a.hide();e.effects.restore(a,l);e.effects.removeWrapper(a);
+b.callback&&b.callback.apply(this,arguments)})}else{j={};k={};j[f]=(d=="pos"?"-=":"+=")+c;k[f]=(d=="pos"?"+=":"-=")+c;a.animate(j,i/2,b.options.easing).animate(k,i/2,b.options.easing,function(){e.effects.restore(a,l);e.effects.removeWrapper(a);b.callback&&b.callback.apply(this,arguments)})}a.queue("fx",function(){a.dequeue()});a.dequeue()})}})(jQuery);
+;/*
+ * jQuery UI Effects Clip 1.8.10
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/Clip
+ *
+ * Depends:
+ *	jquery.effects.core.js
+ */
+(function(b){b.effects.clip=function(e){return this.queue(function(){var a=b(this),i=["position","top","bottom","left","right","height","width"],f=b.effects.setMode(a,e.options.mode||"hide"),c=e.options.direction||"vertical";b.effects.save(a,i);a.show();var d=b.effects.createWrapper(a).css({overflow:"hidden"});d=a[0].tagName=="IMG"?d:a;var g={size:c=="vertical"?"height":"width",position:c=="vertical"?"top":"left"};c=c=="vertical"?d.height():d.width();if(f=="show"){d.css(g.size,0);d.css(g.position,
+c/2)}var h={};h[g.size]=f=="show"?c:0;h[g.position]=f=="show"?0:c/2;d.animate(h,{queue:false,duration:e.duration,easing:e.options.easing,complete:function(){f=="hide"&&a.hide();b.effects.restore(a,i);b.effects.removeWrapper(a);e.callback&&e.callback.apply(a[0],arguments);a.dequeue()}})})}})(jQuery);
+;/*
+ * jQuery UI Effects Drop 1.8.10
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/Drop
+ *
+ * Depends:
+ *	jquery.effects.core.js
+ */
+(function(c){c.effects.drop=function(d){return this.queue(function(){var a=c(this),h=["position","top","bottom","left","right","opacity"],e=c.effects.setMode(a,d.options.mode||"hide"),b=d.options.direction||"left";c.effects.save(a,h);a.show();c.effects.createWrapper(a);var f=b=="up"||b=="down"?"top":"left";b=b=="up"||b=="left"?"pos":"neg";var g=d.options.distance||(f=="top"?a.outerHeight({margin:true})/2:a.outerWidth({margin:true})/2);if(e=="show")a.css("opacity",0).css(f,b=="pos"?-g:g);var i={opacity:e==
+"show"?1:0};i[f]=(e=="show"?b=="pos"?"+=":"-=":b=="pos"?"-=":"+=")+g;a.animate(i,{queue:false,duration:d.duration,easing:d.options.easing,complete:function(){e=="hide"&&a.hide();c.effects.restore(a,h);c.effects.removeWrapper(a);d.callback&&d.callback.apply(this,arguments);a.dequeue()}})})}})(jQuery);
+;/*
+ * jQuery UI Effects Explode 1.8.10
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/Explode
+ *
+ * Depends:
+ *	jquery.effects.core.js
+ */
+(function(j){j.effects.explode=function(a){return this.queue(function(){var c=a.options.pieces?Math.round(Math.sqrt(a.options.pieces)):3,d=a.options.pieces?Math.round(Math.sqrt(a.options.pieces)):3;a.options.mode=a.options.mode=="toggle"?j(this).is(":visible")?"hide":"show":a.options.mode;var b=j(this).show().css("visibility","hidden"),g=b.offset();g.top-=parseInt(b.css("marginTop"),10)||0;g.left-=parseInt(b.css("marginLeft"),10)||0;for(var h=b.outerWidth(true),i=b.outerHeight(true),e=0;e<c;e++)for(var f=
+0;f<d;f++)b.clone().appendTo("body").wrap("<div></div>").css({position:"absolute",visibility:"visible",left:-f*(h/d),top:-e*(i/c)}).parent().addClass("ui-effects-explode").css({position:"absolute",overflow:"hidden",width:h/d,height:i/c,left:g.left+f*(h/d)+(a.options.mode=="show"?(f-Math.floor(d/2))*(h/d):0),top:g.top+e*(i/c)+(a.options.mode=="show"?(e-Math.floor(c/2))*(i/c):0),opacity:a.options.mode=="show"?0:1}).animate({left:g.left+f*(h/d)+(a.options.mode=="show"?0:(f-Math.floor(d/2))*(h/d)),top:g.top+
+e*(i/c)+(a.options.mode=="show"?0:(e-Math.floor(c/2))*(i/c)),opacity:a.options.mode=="show"?1:0},a.duration||500);setTimeout(function(){a.options.mode=="show"?b.css({visibility:"visible"}):b.css({visibility:"visible"}).hide();a.callback&&a.callback.apply(b[0]);b.dequeue();j("div.ui-effects-explode").remove()},a.duration||500)})}})(jQuery);
+;/*
+ * jQuery UI Effects Fade 1.8.10
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/Fade
+ *
+ * Depends:
+ *	jquery.effects.core.js
+ */
+(function(b){b.effects.fade=function(a){return this.queue(function(){var c=b(this),d=b.effects.setMode(c,a.options.mode||"hide");c.animate({opacity:d},{queue:false,duration:a.duration,easing:a.options.easing,complete:function(){a.callback&&a.callback.apply(this,arguments);c.dequeue()}})})}})(jQuery);
+;/*
+ * jQuery UI Effects Fold 1.8.10
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/Fold
+ *
+ * Depends:
+ *	jquery.effects.core.js
+ */
+(function(c){c.effects.fold=function(a){return this.queue(function(){var b=c(this),j=["position","top","bottom","left","right"],d=c.effects.setMode(b,a.options.mode||"hide"),g=a.options.size||15,h=!!a.options.horizFirst,k=a.duration?a.duration/2:c.fx.speeds._default/2;c.effects.save(b,j);b.show();var e=c.effects.createWrapper(b).css({overflow:"hidden"}),f=d=="show"!=h,l=f?["width","height"]:["height","width"];f=f?[e.width(),e.height()]:[e.height(),e.width()];var i=/([0-9]+)%/.exec(g);if(i)g=parseInt(i[1],
+10)/100*f[d=="hide"?0:1];if(d=="show")e.css(h?{height:0,width:g}:{height:g,width:0});h={};i={};h[l[0]]=d=="show"?f[0]:g;i[l[1]]=d=="show"?f[1]:0;e.animate(h,k,a.options.easing).animate(i,k,a.options.easing,function(){d=="hide"&&b.hide();c.effects.restore(b,j);c.effects.removeWrapper(b);a.callback&&a.callback.apply(b[0],arguments);b.dequeue()})})}})(jQuery);
+;/*
+ * jQuery UI Effects Highlight 1.8.10
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/Highlight
+ *
+ * Depends:
+ *	jquery.effects.core.js
+ */
+(function(b){b.effects.highlight=function(c){return this.queue(function(){var a=b(this),e=["backgroundImage","backgroundColor","opacity"],d=b.effects.setMode(a,c.options.mode||"show"),f={backgroundColor:a.css("backgroundColor")};if(d=="hide")f.opacity=0;b.effects.save(a,e);a.show().css({backgroundImage:"none",backgroundColor:c.options.color||"#ffff99"}).animate(f,{queue:false,duration:c.duration,easing:c.options.easing,complete:function(){d=="hide"&&a.hide();b.effects.restore(a,e);d=="show"&&!b.support.opacity&&
+this.style.removeAttribute("filter");c.callback&&c.callback.apply(this,arguments);a.dequeue()}})})}})(jQuery);
+;/*
+ * jQuery UI Effects Pulsate 1.8.10
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/Pulsate
+ *
+ * Depends:
+ *	jquery.effects.core.js
+ */
+(function(d){d.effects.pulsate=function(a){return this.queue(function(){var b=d(this),c=d.effects.setMode(b,a.options.mode||"show");times=(a.options.times||5)*2-1;duration=a.duration?a.duration/2:d.fx.speeds._default/2;isVisible=b.is(":visible");animateTo=0;if(!isVisible){b.css("opacity",0).show();animateTo=1}if(c=="hide"&&isVisible||c=="show"&&!isVisible)times--;for(c=0;c<times;c++){b.animate({opacity:animateTo},duration,a.options.easing);animateTo=(animateTo+1)%2}b.animate({opacity:animateTo},duration,
+a.options.easing,function(){animateTo==0&&b.hide();a.callback&&a.callback.apply(this,arguments)});b.queue("fx",function(){b.dequeue()}).dequeue()})}})(jQuery);
+;/*
+ * jQuery UI Effects Scale 1.8.10
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/Scale
+ *
+ * Depends:
+ *	jquery.effects.core.js
+ */
+(function(c){c.effects.puff=function(b){return this.queue(function(){var a=c(this),e=c.effects.setMode(a,b.options.mode||"hide"),g=parseInt(b.options.percent,10)||150,h=g/100,i={height:a.height(),width:a.width()};c.extend(b.options,{fade:true,mode:e,percent:e=="hide"?g:100,from:e=="hide"?i:{height:i.height*h,width:i.width*h}});a.effect("scale",b.options,b.duration,b.callback);a.dequeue()})};c.effects.scale=function(b){return this.queue(function(){var a=c(this),e=c.extend(true,{},b.options),g=c.effects.setMode(a,
+b.options.mode||"effect"),h=parseInt(b.options.percent,10)||(parseInt(b.options.percent,10)==0?0:g=="hide"?0:100),i=b.options.direction||"both",f=b.options.origin;if(g!="effect"){e.origin=f||["middle","center"];e.restore=true}f={height:a.height(),width:a.width()};a.from=b.options.from||(g=="show"?{height:0,width:0}:f);h={y:i!="horizontal"?h/100:1,x:i!="vertical"?h/100:1};a.to={height:f.height*h.y,width:f.width*h.x};if(b.options.fade){if(g=="show"){a.from.opacity=0;a.to.opacity=1}if(g=="hide"){a.from.opacity=
+1;a.to.opacity=0}}e.from=a.from;e.to=a.to;e.mode=g;a.effect("size",e,b.duration,b.callback);a.dequeue()})};c.effects.size=function(b){return this.queue(function(){var a=c(this),e=["position","top","bottom","left","right","width","height","overflow","opacity"],g=["position","top","bottom","left","right","overflow","opacity"],h=["width","height","overflow"],i=["fontSize"],f=["borderTopWidth","borderBottomWidth","paddingTop","paddingBottom"],k=["borderLeftWidth","borderRightWidth","paddingLeft","paddingRight"],
+p=c.effects.setMode(a,b.options.mode||"effect"),n=b.options.restore||false,m=b.options.scale||"both",l=b.options.origin,j={height:a.height(),width:a.width()};a.from=b.options.from||j;a.to=b.options.to||j;if(l){l=c.effects.getBaseline(l,j);a.from.top=(j.height-a.from.height)*l.y;a.from.left=(j.width-a.from.width)*l.x;a.to.top=(j.height-a.to.height)*l.y;a.to.left=(j.width-a.to.width)*l.x}var d={from:{y:a.from.height/j.height,x:a.from.width/j.width},to:{y:a.to.height/j.height,x:a.to.width/j.width}};
+if(m=="box"||m=="both"){if(d.from.y!=d.to.y){e=e.concat(f);a.from=c.effects.setTransition(a,f,d.from.y,a.from);a.to=c.effects.setTransition(a,f,d.to.y,a.to)}if(d.from.x!=d.to.x){e=e.concat(k);a.from=c.effects.setTransition(a,k,d.from.x,a.from);a.to=c.effects.setTransition(a,k,d.to.x,a.to)}}if(m=="content"||m=="both")if(d.from.y!=d.to.y){e=e.concat(i);a.from=c.effects.setTransition(a,i,d.from.y,a.from);a.to=c.effects.setTransition(a,i,d.to.y,a.to)}c.effects.save(a,n?e:g);a.show();c.effects.createWrapper(a);
+a.css("overflow","hidden").css(a.from);if(m=="content"||m=="both"){f=f.concat(["marginTop","marginBottom"]).concat(i);k=k.concat(["marginLeft","marginRight"]);h=e.concat(f).concat(k);a.find("*[width]").each(function(){child=c(this);n&&c.effects.save(child,h);var o={height:child.height(),width:child.width()};child.from={height:o.height*d.from.y,width:o.width*d.from.x};child.to={height:o.height*d.to.y,width:o.width*d.to.x};if(d.from.y!=d.to.y){child.from=c.effects.setTransition(child,f,d.from.y,child.from);
+child.to=c.effects.setTransition(child,f,d.to.y,child.to)}if(d.from.x!=d.to.x){child.from=c.effects.setTransition(child,k,d.from.x,child.from);child.to=c.effects.setTransition(child,k,d.to.x,child.to)}child.css(child.from);child.animate(child.to,b.duration,b.options.easing,function(){n&&c.effects.restore(child,h)})})}a.animate(a.to,{queue:false,duration:b.duration,easing:b.options.easing,complete:function(){a.to.opacity===0&&a.css("opacity",a.from.opacity);p=="hide"&&a.hide();c.effects.restore(a,
+n?e:g);c.effects.removeWrapper(a);b.callback&&b.callback.apply(this,arguments);a.dequeue()}})})}})(jQuery);
+;/*
+ * jQuery UI Effects Shake 1.8.10
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/Shake
+ *
+ * Depends:
+ *	jquery.effects.core.js
+ */
+(function(d){d.effects.shake=function(a){return this.queue(function(){var b=d(this),j=["position","top","bottom","left","right"];d.effects.setMode(b,a.options.mode||"effect");var c=a.options.direction||"left",e=a.options.distance||20,l=a.options.times||3,f=a.duration||a.options.duration||140;d.effects.save(b,j);b.show();d.effects.createWrapper(b);var g=c=="up"||c=="down"?"top":"left",h=c=="up"||c=="left"?"pos":"neg";c={};var i={},k={};c[g]=(h=="pos"?"-=":"+=")+e;i[g]=(h=="pos"?"+=":"-=")+e*2;k[g]=
+(h=="pos"?"-=":"+=")+e*2;b.animate(c,f,a.options.easing);for(e=1;e<l;e++)b.animate(i,f,a.options.easing).animate(k,f,a.options.easing);b.animate(i,f,a.options.easing).animate(c,f/2,a.options.easing,function(){d.effects.restore(b,j);d.effects.removeWrapper(b);a.callback&&a.callback.apply(this,arguments)});b.queue("fx",function(){b.dequeue()});b.dequeue()})}})(jQuery);
+;/*
+ * jQuery UI Effects Slide 1.8.10
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/Slide
+ *
+ * Depends:
+ *	jquery.effects.core.js
+ */
+(function(c){c.effects.slide=function(d){return this.queue(function(){var a=c(this),h=["position","top","bottom","left","right"],f=c.effects.setMode(a,d.options.mode||"show"),b=d.options.direction||"left";c.effects.save(a,h);a.show();c.effects.createWrapper(a).css({overflow:"hidden"});var g=b=="up"||b=="down"?"top":"left";b=b=="up"||b=="left"?"pos":"neg";var e=d.options.distance||(g=="top"?a.outerHeight({margin:true}):a.outerWidth({margin:true}));if(f=="show")a.css(g,b=="pos"?isNaN(e)?"-"+e:-e:e);
+var i={};i[g]=(f=="show"?b=="pos"?"+=":"-=":b=="pos"?"-=":"+=")+e;a.animate(i,{queue:false,duration:d.duration,easing:d.options.easing,complete:function(){f=="hide"&&a.hide();c.effects.restore(a,h);c.effects.removeWrapper(a);d.callback&&d.callback.apply(this,arguments);a.dequeue()}})})}})(jQuery);
+;/*
+ * jQuery UI Effects Transfer 1.8.10
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/Transfer
+ *
+ * Depends:
+ *	jquery.effects.core.js
+ */
+(function(e){e.effects.transfer=function(a){return this.queue(function(){var b=e(this),c=e(a.options.to),d=c.offset();c={top:d.top,left:d.left,height:c.innerHeight(),width:c.innerWidth()};d=b.offset();var f=e('<div class="ui-effects-transfer"></div>').appendTo(document.body).addClass(a.options.className).css({top:d.top,left:d.left,height:b.innerHeight(),width:b.innerWidth(),position:"absolute"}).animate(c,a.duration,a.options.easing,function(){f.remove();a.callback&&a.callback.apply(b[0],arguments);
+b.dequeue()})})}})(jQuery);
+;
\ No newline at end of file
diff --git a/js/ui/i18n/jquery-ui-i18n.js b/js/ui/i18n/jquery-ui-i18n.js
new file mode 100644
index 0000000000..7d207d976d
--- /dev/null
+++ b/js/ui/i18n/jquery-ui-i18n.js
@@ -0,0 +1,1357 @@
+/* Afrikaans initialisation for the jQuery UI date picker plugin. */
+/* Written by Renier Pretorius. */
+jQuery(function($){
+	$.datepicker.regional['af'] = {
+		closeText: 'Selekteer',
+		prevText: 'Vorige',
+		nextText: 'Volgende',
+		currentText: 'Vandag',
+		monthNames: ['Januarie','Februarie','Maart','April','Mei','Junie',
+		'Julie','Augustus','September','Oktober','November','Desember'],
+		monthNamesShort: ['Jan', 'Feb', 'Mrt', 'Apr', 'Mei', 'Jun',
+		'Jul', 'Aug', 'Sep', 'Okt', 'Nov', 'Des'],
+		dayNames: ['Sondag', 'Maandag', 'Dinsdag', 'Woensdag', 'Donderdag', 'Vrydag', 'Saterdag'],
+		dayNamesShort: ['Son', 'Maa', 'Din', 'Woe', 'Don', 'Vry', 'Sat'],
+		dayNamesMin: ['So','Ma','Di','Wo','Do','Vr','Sa'],
+		weekHeader: 'Wk',
+		dateFormat: 'dd/mm/yy',
+		firstDay: 1,
+		isRTL: false,
+		showMonthAfterYear: false,
+		yearSuffix: ''};
+	$.datepicker.setDefaults($.datepicker.regional['af']);
+});
+/* Algerian Arabic Translation for jQuery UI date picker plugin. (can be used for Tunisia)*/
+/* Mohamed Cherif BOUCHELAGHEM -- cherifbouchelaghem@yahoo.fr */
+
+jQuery(function($){
+	$.datepicker.regional['ar-DZ'] = {
+		closeText: 'إغلاق',
+		prevText: '&#x3c;السابق',
+		nextText: 'التالي&#x3e;',
+		currentText: 'اليوم',
+		monthNames: ['جانفي', 'فيفري', 'مارس', 'أفريل', 'ماي', 'جوان',
+		'جويلية', 'أوت', 'سبتمبر','أكتوبر', 'نوفمبر', 'ديسمبر'],
+		monthNamesShort: ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12'],
+		dayNames: ['الأحد', 'الاثنين', 'الثلاثاء', 'الأربعاء', 'الخميس', 'الجمعة', 'السبت'],
+		dayNamesShort: ['الأحد', 'الاثنين', 'الثلاثاء', 'الأربعاء', 'الخميس', 'الجمعة', 'السبت'],
+		dayNamesMin: ['الأحد', 'الاثنين', 'الثلاثاء', 'الأربعاء', 'الخميس', 'الجمعة', 'السبت'],
+		weekHeader: 'أسبوع',
+		dateFormat: 'dd/mm/yy',
+		firstDay: 6,
+  		isRTL: true,
+		showMonthAfterYear: false,
+		yearSuffix: ''};
+	$.datepicker.setDefaults($.datepicker.regional['ar-DZ']);
+});
+/* Arabic Translation for jQuery UI date picker plugin. */
+/* Khaled Alhourani -- me@khaledalhourani.com */
+/* NOTE: monthNames are the original months names and they are the Arabic names, not the new months name فبراير - يناير and there isn't any Arabic roots for these months */
+jQuery(function($){
+	$.datepicker.regional['ar'] = {
+		closeText: 'إغلاق',
+		prevText: '&#x3c;السابق',
+		nextText: 'التالي&#x3e;',
+		currentText: 'اليوم',
+		monthNames: ['كانون الثاني', 'شباط', 'آذار', 'نيسان', 'آذار', 'حزيران',
+		'تموز', 'آب', 'أيلول',	'تشرين الأول', 'تشرين الثاني', 'كانون الأول'],
+		monthNamesShort: ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12'],
+		dayNames: ['الأحد', 'الاثنين', 'الثلاثاء', 'الأربعاء', 'الخميس', 'الجمعة', 'السبت'],
+		dayNamesShort: ['الأحد', 'الاثنين', 'الثلاثاء', 'الأربعاء', 'الخميس', 'الجمعة', 'السبت'],
+		dayNamesMin: ['الأحد', 'الاثنين', 'الثلاثاء', 'الأربعاء', 'الخميس', 'الجمعة', 'السبت'],
+		weekHeader: 'أسبوع',
+		dateFormat: 'dd/mm/yy',
+		firstDay: 6,
+  		isRTL: true,
+		showMonthAfterYear: false,
+		yearSuffix: ''};
+	$.datepicker.setDefaults($.datepicker.regional['ar']);
+});/* Azerbaijani (UTF-8) initialisation for the jQuery UI date picker plugin. */
+/* Written by Jamil Najafov (necefov33@gmail.com). */
+jQuery(function($) {
+	$.datepicker.regional['az'] = {
+		closeText: 'Bağla',
+		prevText: '&#x3c;Geri',
+		nextText: 'İrəli&#x3e;',
+		currentText: 'Bugün',
+		monthNames: ['Yanvar','Fevral','Mart','Aprel','May','İyun',
+		'İyul','Avqust','Sentyabr','Oktyabr','Noyabr','Dekabr'],
+		monthNamesShort: ['Yan','Fev','Mar','Apr','May','İyun',
+		'İyul','Avq','Sen','Okt','Noy','Dek'],
+		dayNames: ['Bazar','Bazar ertəsi','Çərşənbə axşamı','Çərşənbə','Cümə axşamı','Cümə','Şənbə'],
+		dayNamesShort: ['B','Be','Ça','Ç','Ca','C','Ş'],
+		dayNamesMin: ['B','B','Ç','С','Ç','C','Ş'],
+		weekHeader: 'Hf',
+		dateFormat: 'dd.mm.yy',
+		firstDay: 1,
+		isRTL: false,
+		showMonthAfterYear: false,
+		yearSuffix: ''};
+	$.datepicker.setDefaults($.datepicker.regional['az']);
+});/* Bulgarian initialisation for the jQuery UI date picker plugin. */
+/* Written by Stoyan Kyosev (http://svest.org). */
+jQuery(function($){
+    $.datepicker.regional['bg'] = {
+        closeText: 'затвори',
+        prevText: '&#x3c;назад',
+        nextText: 'напред&#x3e;',
+		nextBigText: '&#x3e;&#x3e;',
+        currentText: 'днес',
+        monthNames: ['Януари','Февруари','Март','Април','Май','Юни',
+        'Юли','Август','Септември','Октомври','Ноември','Декември'],
+        monthNamesShort: ['Яну','Фев','Мар','Апр','Май','Юни',
+        'Юли','Авг','Сеп','Окт','Нов','Дек'],
+        dayNames: ['Неделя','Понеделник','Вторник','Сряда','Четвъртък','Петък','Събота'],
+        dayNamesShort: ['Нед','Пон','Вто','Сря','Чет','Пет','Съб'],
+        dayNamesMin: ['Не','По','Вт','Ср','Че','Пе','Съ'],
+		weekHeader: 'Wk',
+        dateFormat: 'dd.mm.yy',
+		firstDay: 1,
+        isRTL: false,
+		showMonthAfterYear: false,
+		yearSuffix: ''};
+    $.datepicker.setDefaults($.datepicker.regional['bg']);
+});
+/* Bosnian i18n for the jQuery UI date picker plugin. */
+/* Written by Kenan Konjo. */
+jQuery(function($){
+	$.datepicker.regional['bs'] = {
+		closeText: 'Zatvori', 
+		prevText: '&#x3c;', 
+		nextText: '&#x3e;', 
+		currentText: 'Danas', 
+		monthNames: ['Januar','Februar','Mart','April','Maj','Juni',
+		'Juli','August','Septembar','Oktobar','Novembar','Decembar'],
+		monthNamesShort: ['Jan','Feb','Mar','Apr','Maj','Jun',
+		'Jul','Aug','Sep','Okt','Nov','Dec'],
+		dayNames: ['Nedelja','Ponedeljak','Utorak','Srijeda','Četvrtak','Petak','Subota'],
+		dayNamesShort: ['Ned','Pon','Uto','Sri','Čet','Pet','Sub'],
+		dayNamesMin: ['Ne','Po','Ut','Sr','Če','Pe','Su'],
+		weekHeader: 'Wk',
+		dateFormat: 'dd.mm.yy',
+		firstDay: 1,
+		isRTL: false,
+		showMonthAfterYear: false,
+		yearSuffix: ''};
+	$.datepicker.setDefaults($.datepicker.regional['bs']);
+});/* Inicialització en català per a l'extenció 'calendar' per jQuery. */
+/* Writers: (joan.leon@gmail.com). */
+jQuery(function($){
+	$.datepicker.regional['ca'] = {
+		closeText: 'Tancar',
+		prevText: '&#x3c;Ant',
+		nextText: 'Seg&#x3e;',
+		currentText: 'Avui',
+		monthNames: ['Gener','Febrer','Mar&ccedil;','Abril','Maig','Juny',
+		'Juliol','Agost','Setembre','Octubre','Novembre','Desembre'],
+		monthNamesShort: ['Gen','Feb','Mar','Abr','Mai','Jun',
+		'Jul','Ago','Set','Oct','Nov','Des'],
+		dayNames: ['Diumenge','Dilluns','Dimarts','Dimecres','Dijous','Divendres','Dissabte'],
+		dayNamesShort: ['Dug','Dln','Dmt','Dmc','Djs','Dvn','Dsb'],
+		dayNamesMin: ['Dg','Dl','Dt','Dc','Dj','Dv','Ds'],
+		weekHeader: 'Sm',
+		dateFormat: 'dd/mm/yy',
+		firstDay: 1,
+		isRTL: false,
+		showMonthAfterYear: false,
+		yearSuffix: ''};
+	$.datepicker.setDefaults($.datepicker.regional['ca']);
+});/* Czech initialisation for the jQuery UI date picker plugin. */
+/* Written by Tomas Muller (tomas@tomas-muller.net). */
+jQuery(function($){
+	$.datepicker.regional['cs'] = {
+		closeText: 'Zavřít',
+		prevText: '&#x3c;Dříve',
+		nextText: 'Později&#x3e;',
+		currentText: 'Nyní',
+		monthNames: ['leden','únor','březen','duben','květen','červen',
+        'červenec','srpen','září','říjen','listopad','prosinec'],
+		monthNamesShort: ['led','úno','bře','dub','kvě','čer',
+		'čvc','srp','zář','říj','lis','pro'],
+		dayNames: ['neděle', 'pondělí', 'úterý', 'středa', 'čtvrtek', 'pátek', 'sobota'],
+		dayNamesShort: ['ne', 'po', 'út', 'st', 'čt', 'pá', 'so'],
+		dayNamesMin: ['ne','po','út','st','čt','pá','so'],
+		weekHeader: 'Týd',
+		dateFormat: 'dd.mm.yy',
+		firstDay: 1,
+		isRTL: false,
+		showMonthAfterYear: false,
+		yearSuffix: ''};
+	$.datepicker.setDefaults($.datepicker.regional['cs']);
+});
+/* Danish initialisation for the jQuery UI date picker plugin. */
+/* Written by Jan Christensen ( deletestuff@gmail.com). */
+jQuery(function($){
+    $.datepicker.regional['da'] = {
+		closeText: 'Luk',
+        prevText: '&#x3c;Forrige',
+		nextText: 'Næste&#x3e;',
+		currentText: 'Idag',
+        monthNames: ['Januar','Februar','Marts','April','Maj','Juni',
+        'Juli','August','September','Oktober','November','December'],
+        monthNamesShort: ['Jan','Feb','Mar','Apr','Maj','Jun',
+        'Jul','Aug','Sep','Okt','Nov','Dec'],
+		dayNames: ['Søndag','Mandag','Tirsdag','Onsdag','Torsdag','Fredag','Lørdag'],
+		dayNamesShort: ['Søn','Man','Tir','Ons','Tor','Fre','Lør'],
+		dayNamesMin: ['Sø','Ma','Ti','On','To','Fr','Lø'],
+		weekHeader: 'Uge',
+        dateFormat: 'dd-mm-yy',
+		firstDay: 1,
+		isRTL: false,
+		showMonthAfterYear: false,
+		yearSuffix: ''};
+    $.datepicker.setDefaults($.datepicker.regional['da']);
+});
+/* German initialisation for the jQuery UI date picker plugin. */
+/* Written by Milian Wolff (mail@milianw.de). */
+jQuery(function($){
+	$.datepicker.regional['de'] = {
+		closeText: 'schließen',
+		prevText: '&#x3c;zurück',
+		nextText: 'Vor&#x3e;',
+		currentText: 'heute',
+		monthNames: ['Januar','Februar','März','April','Mai','Juni',
+		'Juli','August','September','Oktober','November','Dezember'],
+		monthNamesShort: ['Jan','Feb','Mär','Apr','Mai','Jun',
+		'Jul','Aug','Sep','Okt','Nov','Dez'],
+		dayNames: ['Sonntag','Montag','Dienstag','Mittwoch','Donnerstag','Freitag','Samstag'],
+		dayNamesShort: ['So','Mo','Di','Mi','Do','Fr','Sa'],
+		dayNamesMin: ['So','Mo','Di','Mi','Do','Fr','Sa'],
+		weekHeader: 'Wo',
+		dateFormat: 'dd.mm.yy',
+		firstDay: 1,
+		isRTL: false,
+		showMonthAfterYear: false,
+		yearSuffix: ''};
+	$.datepicker.setDefaults($.datepicker.regional['de']);
+});
+/* Greek (el) initialisation for the jQuery UI date picker plugin. */
+/* Written by Alex Cicovic (http://www.alexcicovic.com) */
+jQuery(function($){
+	$.datepicker.regional['el'] = {
+		closeText: 'Κλείσιμο',
+		prevText: 'Προηγούμενος',
+		nextText: 'Επόμενος',
+		currentText: 'Τρέχων Μήνας',
+		monthNames: ['Ιανουάριος','Φεβρουάριος','Μάρτιος','Απρίλιος','Μάιος','Ιούνιος',
+		'Ιούλιος','Αύγουστος','Σεπτέμβριος','Οκτώβριος','Νοέμβριος','Δεκέμβριος'],
+		monthNamesShort: ['Ιαν','Φεβ','Μαρ','Απρ','Μαι','Ιουν',
+		'Ιουλ','Αυγ','Σεπ','Οκτ','Νοε','Δεκ'],
+		dayNames: ['Κυριακή','Δευτέρα','Τρίτη','Τετάρτη','Πέμπτη','Παρασκευή','Σάββατο'],
+		dayNamesShort: ['Κυρ','Δευ','Τρι','Τετ','Πεμ','Παρ','Σαβ'],
+		dayNamesMin: ['Κυ','Δε','Τρ','Τε','Πε','Πα','Σα'],
+		weekHeader: 'Εβδ',
+		dateFormat: 'dd/mm/yy',
+		firstDay: 1,
+		isRTL: false,
+		showMonthAfterYear: false,
+		yearSuffix: ''};
+	$.datepicker.setDefaults($.datepicker.regional['el']);
+});/* English/Australia initialisation for the jQuery UI date picker plugin. */
+/* Based on the en-GB initialisation. */
+jQuery(function($){
+	$.datepicker.regional['en-AU'] = {
+		closeText: 'Done',
+		prevText: 'Prev',
+		nextText: 'Next',
+		currentText: 'Today',
+		monthNames: ['January','February','March','April','May','June',
+		'July','August','September','October','November','December'],
+		monthNamesShort: ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun',
+		'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'],
+		dayNames: ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'],
+		dayNamesShort: ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'],
+		dayNamesMin: ['Su','Mo','Tu','We','Th','Fr','Sa'],
+		weekHeader: 'Wk',
+		dateFormat: 'dd/mm/yy',
+		firstDay: 1,
+		isRTL: false,
+		showMonthAfterYear: false,
+		yearSuffix: ''};
+	$.datepicker.setDefaults($.datepicker.regional['en-AU']);
+});
+/* English/UK initialisation for the jQuery UI date picker plugin. */
+/* Written by Stuart. */
+jQuery(function($){
+	$.datepicker.regional['en-GB'] = {
+		closeText: 'Done',
+		prevText: 'Prev',
+		nextText: 'Next',
+		currentText: 'Today',
+		monthNames: ['January','February','March','April','May','June',
+		'July','August','September','October','November','December'],
+		monthNamesShort: ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun',
+		'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'],
+		dayNames: ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'],
+		dayNamesShort: ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'],
+		dayNamesMin: ['Su','Mo','Tu','We','Th','Fr','Sa'],
+		weekHeader: 'Wk',
+		dateFormat: 'dd/mm/yy',
+		firstDay: 1,
+		isRTL: false,
+		showMonthAfterYear: false,
+		yearSuffix: ''};
+	$.datepicker.setDefaults($.datepicker.regional['en-GB']);
+});
+/* English/New Zealand initialisation for the jQuery UI date picker plugin. */
+/* Based on the en-GB initialisation. */
+jQuery(function($){
+	$.datepicker.regional['en-NZ'] = {
+		closeText: 'Done',
+		prevText: 'Prev',
+		nextText: 'Next',
+		currentText: 'Today',
+		monthNames: ['January','February','March','April','May','June',
+		'July','August','September','October','November','December'],
+		monthNamesShort: ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun',
+		'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'],
+		dayNames: ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'],
+		dayNamesShort: ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'],
+		dayNamesMin: ['Su','Mo','Tu','We','Th','Fr','Sa'],
+		weekHeader: 'Wk',
+		dateFormat: 'dd/mm/yy',
+		firstDay: 1,
+		isRTL: false,
+		showMonthAfterYear: false,
+		yearSuffix: ''};
+	$.datepicker.setDefaults($.datepicker.regional['en-NZ']);
+});
+/* Esperanto initialisation for the jQuery UI date picker plugin. */
+/* Written by Olivier M. (olivierweb@ifrance.com). */
+jQuery(function($){
+	$.datepicker.regional['eo'] = {
+		closeText: 'Fermi',
+		prevText: '&lt;Anta',
+		nextText: 'Sekv&gt;',
+		currentText: 'Nuna',
+		monthNames: ['Januaro','Februaro','Marto','Aprilo','Majo','Junio',
+		'Julio','Aŭgusto','Septembro','Oktobro','Novembro','Decembro'],
+		monthNamesShort: ['Jan','Feb','Mar','Apr','Maj','Jun',
+		'Jul','Aŭg','Sep','Okt','Nov','Dec'],
+		dayNames: ['Dimanĉo','Lundo','Mardo','Merkredo','Ĵaŭdo','Vendredo','Sabato'],
+		dayNamesShort: ['Dim','Lun','Mar','Mer','Ĵaŭ','Ven','Sab'],
+		dayNamesMin: ['Di','Lu','Ma','Me','Ĵa','Ve','Sa'],
+		weekHeader: 'Sb',
+		dateFormat: 'dd/mm/yy',
+		firstDay: 0,
+		isRTL: false,
+		showMonthAfterYear: false,
+		yearSuffix: ''};
+	$.datepicker.setDefaults($.datepicker.regional['eo']);
+});
+/* Inicialización en español para la extensión 'UI date picker' para jQuery. */
+/* Traducido por Vester (xvester@gmail.com). */
+jQuery(function($){
+	$.datepicker.regional['es'] = {
+		closeText: 'Cerrar',
+		prevText: '&#x3c;Ant',
+		nextText: 'Sig&#x3e;',
+		currentText: 'Hoy',
+		monthNames: ['Enero','Febrero','Marzo','Abril','Mayo','Junio',
+		'Julio','Agosto','Septiembre','Octubre','Noviembre','Diciembre'],
+		monthNamesShort: ['Ene','Feb','Mar','Abr','May','Jun',
+		'Jul','Ago','Sep','Oct','Nov','Dic'],
+		dayNames: ['Domingo','Lunes','Martes','Mi&eacute;rcoles','Jueves','Viernes','S&aacute;bado'],
+		dayNamesShort: ['Dom','Lun','Mar','Mi&eacute;','Juv','Vie','S&aacute;b'],
+		dayNamesMin: ['Do','Lu','Ma','Mi','Ju','Vi','S&aacute;'],
+		weekHeader: 'Sm',
+		dateFormat: 'dd/mm/yy',
+		firstDay: 1,
+		isRTL: false,
+		showMonthAfterYear: false,
+		yearSuffix: ''};
+	$.datepicker.setDefaults($.datepicker.regional['es']);
+});/* Estonian initialisation for the jQuery UI date picker plugin. */
+/* Written by Mart Sõmermaa (mrts.pydev at gmail com). */
+jQuery(function($){
+	$.datepicker.regional['et'] = {
+		closeText: 'Sulge',
+		prevText: 'Eelnev',
+		nextText: 'Järgnev',
+		currentText: 'Täna',
+		monthNames: ['Jaanuar','Veebruar','Märts','Aprill','Mai','Juuni',
+		'Juuli','August','September','Oktoober','November','Detsember'],
+		monthNamesShort: ['Jaan', 'Veebr', 'Märts', 'Apr', 'Mai', 'Juuni',
+		'Juuli', 'Aug', 'Sept', 'Okt', 'Nov', 'Dets'],
+		dayNames: ['Pühapäev', 'Esmaspäev', 'Teisipäev', 'Kolmapäev', 'Neljapäev', 'Reede', 'Laupäev'],
+		dayNamesShort: ['Pühap', 'Esmasp', 'Teisip', 'Kolmap', 'Neljap', 'Reede', 'Laup'],
+		dayNamesMin: ['P','E','T','K','N','R','L'],
+		weekHeader: 'Sm',
+		dateFormat: 'dd.mm.yy',
+		firstDay: 1,
+		isRTL: false,
+		showMonthAfterYear: false,
+		yearSuffix: ''};
+	$.datepicker.setDefaults($.datepicker.regional['et']);
+}); /* Euskarako oinarria 'UI date picker' jquery-ko extentsioarentzat */
+/* Karrikas-ek itzulia (karrikas@karrikas.com) */
+jQuery(function($){
+	$.datepicker.regional['eu'] = {
+		closeText: 'Egina',
+		prevText: '&#x3c;Aur',
+		nextText: 'Hur&#x3e;',
+		currentText: 'Gaur',
+		monthNames: ['Urtarrila','Otsaila','Martxoa','Apirila','Maiatza','Ekaina',
+		'Uztaila','Abuztua','Iraila','Urria','Azaroa','Abendua'],
+		monthNamesShort: ['Urt','Ots','Mar','Api','Mai','Eka',
+		'Uzt','Abu','Ira','Urr','Aza','Abe'],
+		dayNames: ['Igandea','Astelehena','Asteartea','Asteazkena','Osteguna','Ostirala','Larunbata'],
+		dayNamesShort: ['Iga','Ast','Ast','Ast','Ost','Ost','Lar'],
+		dayNamesMin: ['Ig','As','As','As','Os','Os','La'],
+		weekHeader: 'Wk',
+		dateFormat: 'yy/mm/dd',
+		firstDay: 1,
+		isRTL: false,
+		showMonthAfterYear: false,
+		yearSuffix: ''};
+	$.datepicker.setDefaults($.datepicker.regional['eu']);
+});/* Persian (Farsi) Translation for the jQuery UI date picker plugin. */
+/* Javad Mowlanezhad -- jmowla@gmail.com */
+/* Jalali calendar should supported soon! (Its implemented but I have to test it) */
+jQuery(function($) {
+	$.datepicker.regional['fa'] = {
+		closeText: 'بستن',
+		prevText: '&#x3c;قبلي',
+		nextText: 'بعدي&#x3e;',
+		currentText: 'امروز',
+		monthNames: ['فروردين','ارديبهشت','خرداد','تير','مرداد','شهريور',
+		'مهر','آبان','آذر','دي','بهمن','اسفند'],
+		monthNamesShort: ['1','2','3','4','5','6','7','8','9','10','11','12'],
+		dayNames: ['يکشنبه','دوشنبه','سه‌شنبه','چهارشنبه','پنجشنبه','جمعه','شنبه'],
+		dayNamesShort: ['ي','د','س','چ','پ','ج', 'ش'],
+		dayNamesMin: ['ي','د','س','چ','پ','ج', 'ش'],
+		weekHeader: 'هف',
+		dateFormat: 'yy/mm/dd',
+		firstDay: 6,
+		isRTL: true,
+		showMonthAfterYear: false,
+		yearSuffix: ''};
+	$.datepicker.setDefaults($.datepicker.regional['fa']);
+});/* Finnish initialisation for the jQuery UI date picker plugin. */
+/* Written by Harri Kilpi� (harrikilpio@gmail.com). */
+jQuery(function($){
+    $.datepicker.regional['fi'] = {
+		closeText: 'Sulje',
+		prevText: '&laquo;Edellinen',
+		nextText: 'Seuraava&raquo;',
+		currentText: 'T&auml;n&auml;&auml;n',
+        monthNames: ['Tammikuu','Helmikuu','Maaliskuu','Huhtikuu','Toukokuu','Kes&auml;kuu',
+        'Hein&auml;kuu','Elokuu','Syyskuu','Lokakuu','Marraskuu','Joulukuu'],
+        monthNamesShort: ['Tammi','Helmi','Maalis','Huhti','Touko','Kes&auml;',
+        'Hein&auml;','Elo','Syys','Loka','Marras','Joulu'],
+		dayNamesShort: ['Su','Ma','Ti','Ke','To','Pe','Su'],
+		dayNames: ['Sunnuntai','Maanantai','Tiistai','Keskiviikko','Torstai','Perjantai','Lauantai'],
+		dayNamesMin: ['Su','Ma','Ti','Ke','To','Pe','La'],
+		weekHeader: 'Vk',
+        dateFormat: 'dd.mm.yy',
+		firstDay: 1,
+		isRTL: false,
+		showMonthAfterYear: false,
+		yearSuffix: ''};
+    $.datepicker.setDefaults($.datepicker.regional['fi']);
+});
+/* Faroese initialisation for the jQuery UI date picker plugin */
+/* Written by Sverri Mohr Olsen, sverrimo@gmail.com */
+jQuery(function($){
+	$.datepicker.regional['fo'] = {
+		closeText: 'Lat aftur',
+		prevText: '&#x3c;Fyrra',
+		nextText: 'Næsta&#x3e;',
+		currentText: 'Í dag',
+		monthNames: ['Januar','Februar','Mars','Apríl','Mei','Juni',
+		'Juli','August','September','Oktober','November','Desember'],
+		monthNamesShort: ['Jan','Feb','Mar','Apr','Mei','Jun',
+		'Jul','Aug','Sep','Okt','Nov','Des'],
+		dayNames: ['Sunnudagur','Mánadagur','Týsdagur','Mikudagur','Hósdagur','Fríggjadagur','Leyardagur'],
+		dayNamesShort: ['Sun','Mán','Týs','Mik','Hós','Frí','Ley'],
+		dayNamesMin: ['Su','Má','Tý','Mi','Hó','Fr','Le'],
+		weekHeader: 'Vk',
+		dateFormat: 'dd-mm-yy',
+		firstDay: 0,
+		isRTL: false,
+		showMonthAfterYear: false,
+		yearSuffix: ''};
+	$.datepicker.setDefaults($.datepicker.regional['fo']);
+});
+/* Swiss-French initialisation for the jQuery UI date picker plugin. */
+/* Written Martin Voelkle (martin.voelkle@e-tc.ch). */
+jQuery(function($){
+	$.datepicker.regional['fr-CH'] = {
+		closeText: 'Fermer',
+		prevText: '&#x3c;Préc',
+		nextText: 'Suiv&#x3e;',
+		currentText: 'Courant',
+		monthNames: ['Janvier','Février','Mars','Avril','Mai','Juin',
+		'Juillet','Août','Septembre','Octobre','Novembre','Décembre'],
+		monthNamesShort: ['Jan','Fév','Mar','Avr','Mai','Jun',
+		'Jul','Aoû','Sep','Oct','Nov','Déc'],
+		dayNames: ['Dimanche','Lundi','Mardi','Mercredi','Jeudi','Vendredi','Samedi'],
+		dayNamesShort: ['Dim','Lun','Mar','Mer','Jeu','Ven','Sam'],
+		dayNamesMin: ['Di','Lu','Ma','Me','Je','Ve','Sa'],
+		weekHeader: 'Sm',
+		dateFormat: 'dd.mm.yy',
+		firstDay: 1,
+		isRTL: false,
+		showMonthAfterYear: false,
+		yearSuffix: ''};
+	$.datepicker.setDefaults($.datepicker.regional['fr-CH']);
+});/* French initialisation for the jQuery UI date picker plugin. */
+/* Written by Keith Wood (kbwood{at}iinet.com.au),
+              Stéphane Nahmani (sholby@sholby.net),
+              Stéphane Raimbault <stephane.raimbault@gmail.com> */
+jQuery(function($){
+	$.datepicker.regional['fr'] = {
+		closeText: 'Fermer',
+		prevText: 'Précédent',
+		nextText: 'Suivant',
+		currentText: 'Aujourd\'hui',
+		monthNames: ['Janvier','Février','Mars','Avril','Mai','Juin',
+		'Juillet','Août','Septembre','Octobre','Novembre','Décembre'],
+		monthNamesShort: ['Janv.','Févr.','Mars','Avril','Mai','Juin',
+		'Juil.','Août','Sept.','Oct.','Nov.','Déc.'],
+		dayNames: ['Dimanche','Lundi','Mardi','Mercredi','Jeudi','Vendredi','Samedi'],
+		dayNamesShort: ['Dim.','Lun.','Mar.','Mer.','Jeu.','Ven.','Sam.'],
+		dayNamesMin: ['D','L','M','M','J','V','S'],
+		weekHeader: 'Sem.',
+		dateFormat: 'dd/mm/yy',
+		firstDay: 1,
+		isRTL: false,
+		showMonthAfterYear: false,
+		yearSuffix: ''};
+	$.datepicker.setDefaults($.datepicker.regional['fr']);
+});
+/* Galician localization for 'UI date picker' jQuery extension. */
+/* Translated by Jorge Barreiro <yortx.barry@gmail.com>. */
+jQuery(function($){
+	$.datepicker.regional['gl'] = {
+		closeText: 'Pechar',
+		prevText: '&#x3c;Ant',
+		nextText: 'Seg&#x3e;',
+		currentText: 'Hoxe',
+		monthNames: ['Xaneiro','Febreiro','Marzo','Abril','Maio','Xuño',
+		'Xullo','Agosto','Setembro','Outubro','Novembro','Decembro'],
+		monthNamesShort: ['Xan','Feb','Mar','Abr','Mai','Xuñ',
+		'Xul','Ago','Set','Out','Nov','Dec'],
+		dayNames: ['Domingo','Luns','Martes','M&eacute;rcores','Xoves','Venres','S&aacute;bado'],
+		dayNamesShort: ['Dom','Lun','Mar','M&eacute;r','Xov','Ven','S&aacute;b'],
+		dayNamesMin: ['Do','Lu','Ma','M&eacute;','Xo','Ve','S&aacute;'],
+		weekHeader: 'Sm',
+		dateFormat: 'dd/mm/yy',
+		firstDay: 1,
+		isRTL: false,
+		showMonthAfterYear: false,
+		yearSuffix: ''};
+	$.datepicker.setDefaults($.datepicker.regional['gl']);
+});/* Hebrew initialisation for the UI Datepicker extension. */
+/* Written by Amir Hardon (ahardon at gmail dot com). */
+jQuery(function($){
+	$.datepicker.regional['he'] = {
+		closeText: 'סגור',
+		prevText: '&#x3c;הקודם',
+		nextText: 'הבא&#x3e;',
+		currentText: 'היום',
+		monthNames: ['ינואר','פברואר','מרץ','אפריל','מאי','יוני',
+		'יולי','אוגוסט','ספטמבר','אוקטובר','נובמבר','דצמבר'],
+		monthNamesShort: ['1','2','3','4','5','6',
+		'7','8','9','10','11','12'],
+		dayNames: ['ראשון','שני','שלישי','רביעי','חמישי','שישי','שבת'],
+		dayNamesShort: ['א\'','ב\'','ג\'','ד\'','ה\'','ו\'','שבת'],
+		dayNamesMin: ['א\'','ב\'','ג\'','ד\'','ה\'','ו\'','שבת'],
+		weekHeader: 'Wk',
+		dateFormat: 'dd/mm/yy',
+		firstDay: 0,
+		isRTL: true,
+		showMonthAfterYear: false,
+		yearSuffix: ''};
+	$.datepicker.setDefaults($.datepicker.regional['he']);
+});
+/* Croatian i18n for the jQuery UI date picker plugin. */
+/* Written by Vjekoslav Nesek. */
+jQuery(function($){
+	$.datepicker.regional['hr'] = {
+		closeText: 'Zatvori',
+		prevText: '&#x3c;',
+		nextText: '&#x3e;',
+		currentText: 'Danas',
+		monthNames: ['Siječanj','Veljača','Ožujak','Travanj','Svibanj','Lipanj',
+		'Srpanj','Kolovoz','Rujan','Listopad','Studeni','Prosinac'],
+		monthNamesShort: ['Sij','Velj','Ožu','Tra','Svi','Lip',
+		'Srp','Kol','Ruj','Lis','Stu','Pro'],
+		dayNames: ['Nedjelja','Ponedjeljak','Utorak','Srijeda','Četvrtak','Petak','Subota'],
+		dayNamesShort: ['Ned','Pon','Uto','Sri','Čet','Pet','Sub'],
+		dayNamesMin: ['Ne','Po','Ut','Sr','Če','Pe','Su'],
+		weekHeader: 'Tje',
+		dateFormat: 'dd.mm.yy.',
+		firstDay: 1,
+		isRTL: false,
+		showMonthAfterYear: false,
+		yearSuffix: ''};
+	$.datepicker.setDefaults($.datepicker.regional['hr']);
+});/* Hungarian initialisation for the jQuery UI date picker plugin. */
+/* Written by Istvan Karaszi (jquery@spam.raszi.hu). */
+jQuery(function($){
+	$.datepicker.regional['hu'] = {
+		closeText: 'bezárás',
+		prevText: '&laquo;&nbsp;vissza',
+		nextText: 'előre&nbsp;&raquo;',
+		currentText: 'ma',
+		monthNames: ['Január', 'Február', 'Március', 'Április', 'Május', 'Június',
+		'Július', 'Augusztus', 'Szeptember', 'Október', 'November', 'December'],
+		monthNamesShort: ['Jan', 'Feb', 'Már', 'Ápr', 'Máj', 'Jún',
+		'Júl', 'Aug', 'Szep', 'Okt', 'Nov', 'Dec'],
+		dayNames: ['Vasárnap', 'Hétfö', 'Kedd', 'Szerda', 'Csütörtök', 'Péntek', 'Szombat'],
+		dayNamesShort: ['Vas', 'Hét', 'Ked', 'Sze', 'Csü', 'Pén', 'Szo'],
+		dayNamesMin: ['V', 'H', 'K', 'Sze', 'Cs', 'P', 'Szo'],
+		weekHeader: 'Hé',
+		dateFormat: 'yy-mm-dd',
+		firstDay: 1,
+		isRTL: false,
+		showMonthAfterYear: true,
+		yearSuffix: ''};
+	$.datepicker.setDefaults($.datepicker.regional['hu']);
+});
+/* Armenian(UTF-8) initialisation for the jQuery UI date picker plugin. */
+/* Written by Levon Zakaryan (levon.zakaryan@gmail.com)*/
+jQuery(function($){
+	$.datepicker.regional['hy'] = {
+		closeText: 'Փակել',
+		prevText: '&#x3c;Նախ.',
+		nextText: 'Հաջ.&#x3e;',
+		currentText: 'Այսօր',
+		monthNames: ['Հունվար','Փետրվար','Մարտ','Ապրիլ','Մայիս','Հունիս',
+		'Հուլիս','Օգոստոս','Սեպտեմբեր','Հոկտեմբեր','Նոյեմբեր','Դեկտեմբեր'],
+		monthNamesShort: ['Հունվ','Փետր','Մարտ','Ապր','Մայիս','Հունիս',
+		'Հուլ','Օգս','Սեպ','Հոկ','Նոյ','Դեկ'],
+		dayNames: ['կիրակի','եկուշաբթի','երեքշաբթի','չորեքշաբթի','հինգշաբթի','ուրբաթ','շաբաթ'],
+		dayNamesShort: ['կիր','երկ','երք','չրք','հնգ','ուրբ','շբթ'],
+		dayNamesMin: ['կիր','երկ','երք','չրք','հնգ','ուրբ','շբթ'],
+		weekHeader: 'ՇԲՏ',
+		dateFormat: 'dd.mm.yy',
+		firstDay: 1,
+		isRTL: false,
+		showMonthAfterYear: false,
+		yearSuffix: ''};
+	$.datepicker.setDefaults($.datepicker.regional['hy']);
+});/* Indonesian initialisation for the jQuery UI date picker plugin. */
+/* Written by Deden Fathurahman (dedenf@gmail.com). */
+jQuery(function($){
+	$.datepicker.regional['id'] = {
+		closeText: 'Tutup',
+		prevText: '&#x3c;mundur',
+		nextText: 'maju&#x3e;',
+		currentText: 'hari ini',
+		monthNames: ['Januari','Februari','Maret','April','Mei','Juni',
+		'Juli','Agustus','September','Oktober','Nopember','Desember'],
+		monthNamesShort: ['Jan','Feb','Mar','Apr','Mei','Jun',
+		'Jul','Agus','Sep','Okt','Nop','Des'],
+		dayNames: ['Minggu','Senin','Selasa','Rabu','Kamis','Jumat','Sabtu'],
+		dayNamesShort: ['Min','Sen','Sel','Rab','kam','Jum','Sab'],
+		dayNamesMin: ['Mg','Sn','Sl','Rb','Km','jm','Sb'],
+		weekHeader: 'Mg',
+		dateFormat: 'dd/mm/yy',
+		firstDay: 0,
+		isRTL: false,
+		showMonthAfterYear: false,
+		yearSuffix: ''};
+	$.datepicker.setDefaults($.datepicker.regional['id']);
+});/* Icelandic initialisation for the jQuery UI date picker plugin. */
+/* Written by Haukur H. Thorsson (haukur@eskill.is). */
+jQuery(function($){
+	$.datepicker.regional['is'] = {
+		closeText: 'Loka',
+		prevText: '&#x3c; Fyrri',
+		nextText: 'N&aelig;sti &#x3e;',
+		currentText: '&Iacute; dag',
+		monthNames: ['Jan&uacute;ar','Febr&uacute;ar','Mars','Apr&iacute;l','Ma&iacute','J&uacute;n&iacute;',
+		'J&uacute;l&iacute;','&Aacute;g&uacute;st','September','Okt&oacute;ber','N&oacute;vember','Desember'],
+		monthNamesShort: ['Jan','Feb','Mar','Apr','Ma&iacute;','J&uacute;n',
+		'J&uacute;l','&Aacute;g&uacute;','Sep','Okt','N&oacute;v','Des'],
+		dayNames: ['Sunnudagur','M&aacute;nudagur','&THORN;ri&eth;judagur','Mi&eth;vikudagur','Fimmtudagur','F&ouml;studagur','Laugardagur'],
+		dayNamesShort: ['Sun','M&aacute;n','&THORN;ri','Mi&eth;','Fim','F&ouml;s','Lau'],
+		dayNamesMin: ['Su','M&aacute;','&THORN;r','Mi','Fi','F&ouml;','La'],
+		weekHeader: 'Vika',
+		dateFormat: 'dd/mm/yy',
+		firstDay: 0,
+		isRTL: false,
+		showMonthAfterYear: false,
+		yearSuffix: ''};
+	$.datepicker.setDefaults($.datepicker.regional['is']);
+});/* Italian initialisation for the jQuery UI date picker plugin. */
+/* Written by Antonello Pasella (antonello.pasella@gmail.com). */
+jQuery(function($){
+	$.datepicker.regional['it'] = {
+		closeText: 'Chiudi',
+		prevText: '&#x3c;Prec',
+		nextText: 'Succ&#x3e;',
+		currentText: 'Oggi',
+		monthNames: ['Gennaio','Febbraio','Marzo','Aprile','Maggio','Giugno',
+			'Luglio','Agosto','Settembre','Ottobre','Novembre','Dicembre'],
+		monthNamesShort: ['Gen','Feb','Mar','Apr','Mag','Giu',
+			'Lug','Ago','Set','Ott','Nov','Dic'],
+		dayNames: ['Domenica','Luned&#236','Marted&#236','Mercoled&#236','Gioved&#236','Venerd&#236','Sabato'],
+		dayNamesShort: ['Dom','Lun','Mar','Mer','Gio','Ven','Sab'],
+		dayNamesMin: ['Do','Lu','Ma','Me','Gi','Ve','Sa'],
+		weekHeader: 'Sm',
+		dateFormat: 'dd/mm/yy',
+		firstDay: 1,
+		isRTL: false,
+		showMonthAfterYear: false,
+		yearSuffix: ''};
+	$.datepicker.setDefaults($.datepicker.regional['it']);
+});
+/* Japanese initialisation for the jQuery UI date picker plugin. */
+/* Written by Kentaro SATO (kentaro@ranvis.com). */
+jQuery(function($){
+	$.datepicker.regional['ja'] = {
+		closeText: '閉じる',
+		prevText: '&#x3c;前',
+		nextText: '次&#x3e;',
+		currentText: '今日',
+		monthNames: ['1月','2月','3月','4月','5月','6月',
+		'7月','8月','9月','10月','11月','12月'],
+		monthNamesShort: ['1月','2月','3月','4月','5月','6月',
+		'7月','8月','9月','10月','11月','12月'],
+		dayNames: ['日曜日','月曜日','火曜日','水曜日','木曜日','金曜日','土曜日'],
+		dayNamesShort: ['日','月','火','水','木','金','土'],
+		dayNamesMin: ['日','月','火','水','木','金','土'],
+		weekHeader: '週',
+		dateFormat: 'yy/mm/dd',
+		firstDay: 0,
+		isRTL: false,
+		showMonthAfterYear: true,
+		yearSuffix: '年'};
+	$.datepicker.setDefaults($.datepicker.regional['ja']);
+});/* Korean initialisation for the jQuery calendar extension. */
+/* Written by DaeKwon Kang (ncrash.dk@gmail.com). */
+jQuery(function($){
+	$.datepicker.regional['ko'] = {
+		closeText: '닫기',
+		prevText: '이전달',
+		nextText: '다음달',
+		currentText: '오늘',
+		monthNames: ['1월(JAN)','2월(FEB)','3월(MAR)','4월(APR)','5월(MAY)','6월(JUN)',
+		'7월(JUL)','8월(AUG)','9월(SEP)','10월(OCT)','11월(NOV)','12월(DEC)'],
+		monthNamesShort: ['1월(JAN)','2월(FEB)','3월(MAR)','4월(APR)','5월(MAY)','6월(JUN)',
+		'7월(JUL)','8월(AUG)','9월(SEP)','10월(OCT)','11월(NOV)','12월(DEC)'],
+		dayNames: ['일','월','화','수','목','금','토'],
+		dayNamesShort: ['일','월','화','수','목','금','토'],
+		dayNamesMin: ['일','월','화','수','목','금','토'],
+		weekHeader: 'Wk',
+		dateFormat: 'yy-mm-dd',
+		firstDay: 0,
+		isRTL: false,
+		showMonthAfterYear: false,
+		yearSuffix: '년'};
+	$.datepicker.setDefaults($.datepicker.regional['ko']);
+});/* Kazakh (UTF-8) initialisation for the jQuery UI date picker plugin. */
+/* Written by Dmitriy Karasyov (dmitriy.karasyov@gmail.com). */
+jQuery(function($){
+	$.datepicker.regional['kz'] = {
+		closeText: 'Жабу',
+		prevText: '&#x3c;Алдыңғы',
+		nextText: 'Келесі&#x3e;',
+		currentText: 'Бүгін',
+		monthNames: ['Қаңтар','Ақпан','Наурыз','Сәуір','Мамыр','Маусым',
+		'Шілде','Тамыз','Қыркүйек','Қазан','Қараша','Желтоқсан'],
+		monthNamesShort: ['Қаң','Ақп','Нау','Сәу','Мам','Мау',
+		'Шіл','Там','Қыр','Қаз','Қар','Жел'],
+		dayNames: ['Жексенбі','Дүйсенбі','Сейсенбі','Сәрсенбі','Бейсенбі','Жұма','Сенбі'],
+		dayNamesShort: ['жкс','дсн','ссн','срс','бсн','жма','снб'],
+		dayNamesMin: ['Жк','Дс','Сс','Ср','Бс','Жм','Сн'],
+		weekHeader: 'Не',
+		dateFormat: 'dd.mm.yy',
+		firstDay: 1,
+		isRTL: false,
+		showMonthAfterYear: false,
+		yearSuffix: ''};
+	$.datepicker.setDefaults($.datepicker.regional['kz']);
+});
+/* Lithuanian (UTF-8) initialisation for the jQuery UI date picker plugin. */
+/* @author Arturas Paleicikas <arturas@avalon.lt> */
+jQuery(function($){
+	$.datepicker.regional['lt'] = {
+		closeText: 'Uždaryti',
+		prevText: '&#x3c;Atgal',
+		nextText: 'Pirmyn&#x3e;',
+		currentText: 'Šiandien',
+		monthNames: ['Sausis','Vasaris','Kovas','Balandis','Gegužė','Birželis',
+		'Liepa','Rugpjūtis','Rugsėjis','Spalis','Lapkritis','Gruodis'],
+		monthNamesShort: ['Sau','Vas','Kov','Bal','Geg','Bir',
+		'Lie','Rugp','Rugs','Spa','Lap','Gru'],
+		dayNames: ['sekmadienis','pirmadienis','antradienis','trečiadienis','ketvirtadienis','penktadienis','šeštadienis'],
+		dayNamesShort: ['sek','pir','ant','tre','ket','pen','šeš'],
+		dayNamesMin: ['Se','Pr','An','Tr','Ke','Pe','Še'],
+		weekHeader: 'Wk',
+		dateFormat: 'yy-mm-dd',
+		firstDay: 1,
+		isRTL: false,
+		showMonthAfterYear: false,
+		yearSuffix: ''};
+	$.datepicker.setDefaults($.datepicker.regional['lt']);
+});/* Latvian (UTF-8) initialisation for the jQuery UI date picker plugin. */
+/* @author Arturas Paleicikas <arturas.paleicikas@metasite.net> */
+jQuery(function($){
+	$.datepicker.regional['lv'] = {
+		closeText: 'Aizvērt',
+		prevText: 'Iepr',
+		nextText: 'Nāka',
+		currentText: 'Šodien',
+		monthNames: ['Janvāris','Februāris','Marts','Aprīlis','Maijs','Jūnijs',
+		'Jūlijs','Augusts','Septembris','Oktobris','Novembris','Decembris'],
+		monthNamesShort: ['Jan','Feb','Mar','Apr','Mai','Jūn',
+		'Jūl','Aug','Sep','Okt','Nov','Dec'],
+		dayNames: ['svētdiena','pirmdiena','otrdiena','trešdiena','ceturtdiena','piektdiena','sestdiena'],
+		dayNamesShort: ['svt','prm','otr','tre','ctr','pkt','sst'],
+		dayNamesMin: ['Sv','Pr','Ot','Tr','Ct','Pk','Ss'],
+		weekHeader: 'Nav',
+		dateFormat: 'dd-mm-yy',
+		firstDay: 1,
+		isRTL: false,
+		showMonthAfterYear: false,
+		yearSuffix: ''};
+	$.datepicker.setDefaults($.datepicker.regional['lv']);
+});/* Malayalam (UTF-8) initialisation for the jQuery UI date picker plugin. */
+/* Written by Saji Nediyanchath (saji89@gmail.com). */
+jQuery(function($){
+	$.datepicker.regional['ml'] = {
+		closeText: 'ശരി',
+		prevText: 'മുന്നത്തെ',  
+		nextText: 'അടുത്തത് ',
+		currentText: 'ഇന്ന്',
+		monthNames: ['ജനുവരി','ഫെബ്രുവരി','മാര്‍ച്ച്','ഏപ്രില്‍','മേയ്','ജൂണ്‍',
+		'ജൂലൈ','ആഗസ്റ്റ്','സെപ്റ്റംബര്‍','ഒക്ടോബര്‍','നവംബര്‍','ഡിസംബര്‍'],
+		monthNamesShort: ['ജനു', 'ഫെബ്', 'മാര്‍', 'ഏപ്രി', 'മേയ്', 'ജൂണ്‍',
+		'ജൂലാ', 'ആഗ', 'സെപ്', 'ഒക്ടോ', 'നവം', 'ഡിസ'],
+		dayNames: ['ഞായര്‍', 'തിങ്കള്‍', 'ചൊവ്വ', 'ബുധന്‍', 'വ്യാഴം', 'വെള്ളി', 'ശനി'],
+		dayNamesShort: ['ഞായ', 'തിങ്ക', 'ചൊവ്വ', 'ബുധ', 'വ്യാഴം', 'വെള്ളി', 'ശനി'],
+		dayNamesMin: ['ഞാ','തി','ചൊ','ബു','വ്യാ','വെ','ശ'],
+		weekHeader: 'ആ',
+		dateFormat: 'dd/mm/yy',
+		firstDay: 1,
+		isRTL: false,
+		showMonthAfterYear: false,
+		yearSuffix: ''};
+	$.datepicker.setDefaults($.datepicker.regional['ml']);
+});
+/* Malaysian initialisation for the jQuery UI date picker plugin. */
+/* Written by Mohd Nawawi Mohamad Jamili (nawawi@ronggeng.net). */
+jQuery(function($){
+	$.datepicker.regional['ms'] = {
+		closeText: 'Tutup',
+		prevText: '&#x3c;Sebelum',
+		nextText: 'Selepas&#x3e;',
+		currentText: 'hari ini',
+		monthNames: ['Januari','Februari','Mac','April','Mei','Jun',
+		'Julai','Ogos','September','Oktober','November','Disember'],
+		monthNamesShort: ['Jan','Feb','Mac','Apr','Mei','Jun',
+		'Jul','Ogo','Sep','Okt','Nov','Dis'],
+		dayNames: ['Ahad','Isnin','Selasa','Rabu','Khamis','Jumaat','Sabtu'],
+		dayNamesShort: ['Aha','Isn','Sel','Rab','kha','Jum','Sab'],
+		dayNamesMin: ['Ah','Is','Se','Ra','Kh','Ju','Sa'],
+		weekHeader: 'Mg',
+		dateFormat: 'dd/mm/yy',
+		firstDay: 0,
+		isRTL: false,
+		showMonthAfterYear: false,
+		yearSuffix: ''};
+	$.datepicker.setDefaults($.datepicker.regional['ms']);
+});/* Dutch (UTF-8) initialisation for the jQuery UI date picker plugin. */
+/* Written by Mathias Bynens <http://mathiasbynens.be/> */
+jQuery(function($){
+	$.datepicker.regional.nl = {
+		closeText: 'Sluiten',
+		prevText: '←',
+		nextText: '→',
+		currentText: 'Vandaag',
+		monthNames: ['januari', 'februari', 'maart', 'april', 'mei', 'juni',
+		'juli', 'augustus', 'september', 'oktober', 'november', 'december'],
+		monthNamesShort: ['jan', 'feb', 'maa', 'apr', 'mei', 'jun',
+		'jul', 'aug', 'sep', 'okt', 'nov', 'dec'],
+		dayNames: ['zondag', 'maandag', 'dinsdag', 'woensdag', 'donderdag', 'vrijdag', 'zaterdag'],
+		dayNamesShort: ['zon', 'maa', 'din', 'woe', 'don', 'vri', 'zat'],
+		dayNamesMin: ['zo', 'ma', 'di', 'wo', 'do', 'vr', 'za'],
+		weekHeader: 'Wk',
+		dateFormat: 'dd/mm/yy',
+		firstDay: 1,
+		isRTL: false,
+		showMonthAfterYear: false,
+		yearSuffix: ''};
+	$.datepicker.setDefaults($.datepicker.regional.nl);
+});/* Norwegian initialisation for the jQuery UI date picker plugin. */
+/* Written by Naimdjon Takhirov (naimdjon@gmail.com). */
+
+jQuery(function($){
+  $.datepicker.regional['no'] = {
+    closeText: 'Lukk',
+    prevText: '&laquo;Forrige',
+    nextText: 'Neste&raquo;',
+    currentText: 'I dag',
+    monthNames: ['januar','februar','mars','april','mai','juni','juli','august','september','oktober','november','desember'],
+    monthNamesShort: ['jan','feb','mar','apr','mai','jun','jul','aug','sep','okt','nov','des'],
+    dayNamesShort: ['søn','man','tir','ons','tor','fre','lør'],
+    dayNames: ['søndag','mandag','tirsdag','onsdag','torsdag','fredag','lørdag'],
+    dayNamesMin: ['sø','ma','ti','on','to','fr','lø'],
+    weekHeader: 'Uke',
+    dateFormat: 'dd.mm.yy',
+    firstDay: 1,
+    isRTL: false,
+    showMonthAfterYear: false,
+    yearSuffix: ''
+  };
+  $.datepicker.setDefaults($.datepicker.regional['no']);
+});
+/* Polish initialisation for the jQuery UI date picker plugin. */
+/* Written by Jacek Wysocki (jacek.wysocki@gmail.com). */
+jQuery(function($){
+	$.datepicker.regional['pl'] = {
+		closeText: 'Zamknij',
+		prevText: '&#x3c;Poprzedni',
+		nextText: 'Następny&#x3e;',
+		currentText: 'Dziś',
+		monthNames: ['Styczeń','Luty','Marzec','Kwiecień','Maj','Czerwiec',
+		'Lipiec','Sierpień','Wrzesień','Październik','Listopad','Grudzień'],
+		monthNamesShort: ['Sty','Lu','Mar','Kw','Maj','Cze',
+		'Lip','Sie','Wrz','Pa','Lis','Gru'],
+		dayNames: ['Niedziela','Poniedziałek','Wtorek','Środa','Czwartek','Piątek','Sobota'],
+		dayNamesShort: ['Nie','Pn','Wt','Śr','Czw','Pt','So'],
+		dayNamesMin: ['N','Pn','Wt','Śr','Cz','Pt','So'],
+		weekHeader: 'Tydz',
+		dateFormat: 'dd.mm.yy',
+		firstDay: 1,
+		isRTL: false,
+		showMonthAfterYear: false,
+		yearSuffix: ''};
+	$.datepicker.setDefaults($.datepicker.regional['pl']);
+});
+/* Brazilian initialisation for the jQuery UI date picker plugin. */
+/* Written by Leonildo Costa Silva (leocsilva@gmail.com). */
+jQuery(function($){
+	$.datepicker.regional['pt-BR'] = {
+		closeText: 'Fechar',
+		prevText: '&#x3c;Anterior',
+		nextText: 'Pr&oacute;ximo&#x3e;',
+		currentText: 'Hoje',
+		monthNames: ['Janeiro','Fevereiro','Mar&ccedil;o','Abril','Maio','Junho',
+		'Julho','Agosto','Setembro','Outubro','Novembro','Dezembro'],
+		monthNamesShort: ['Jan','Fev','Mar','Abr','Mai','Jun',
+		'Jul','Ago','Set','Out','Nov','Dez'],
+		dayNames: ['Domingo','Segunda-feira','Ter&ccedil;a-feira','Quarta-feira','Quinta-feira','Sexta-feira','S&aacute;bado'],
+		dayNamesShort: ['Dom','Seg','Ter','Qua','Qui','Sex','S&aacute;b'],
+		dayNamesMin: ['Dom','Seg','Ter','Qua','Qui','Sex','S&aacute;b'],
+		weekHeader: 'Sm',
+		dateFormat: 'dd/mm/yy',
+		firstDay: 0,
+		isRTL: false,
+		showMonthAfterYear: false,
+		yearSuffix: ''};
+	$.datepicker.setDefaults($.datepicker.regional['pt-BR']);
+});/* Portuguese initialisation for the jQuery UI date picker plugin. */
+jQuery(function($){
+	$.datepicker.regional['pt'] = {
+		closeText: 'Fechar',
+		prevText: '&#x3c;Anterior',
+		nextText: 'Seguinte',
+		currentText: 'Hoje',
+		monthNames: ['Janeiro','Fevereiro','Mar&ccedil;o','Abril','Maio','Junho',
+		'Julho','Agosto','Setembro','Outubro','Novembro','Dezembro'],
+		monthNamesShort: ['Jan','Fev','Mar','Abr','Mai','Jun',
+		'Jul','Ago','Set','Out','Nov','Dez'],
+		dayNames: ['Domingo','Segunda-feira','Ter&ccedil;a-feira','Quarta-feira','Quinta-feira','Sexta-feira','S&aacute;bado'],
+		dayNamesShort: ['Dom','Seg','Ter','Qua','Qui','Sex','S&aacute;b'],
+		dayNamesMin: ['Dom','Seg','Ter','Qua','Qui','Sex','S&aacute;b'],
+		weekHeader: 'Sem',
+		dateFormat: 'dd/mm/yy',
+		firstDay: 0,
+		isRTL: false,
+		showMonthAfterYear: false,
+		yearSuffix: ''};
+	$.datepicker.setDefaults($.datepicker.regional['pt']);
+});/* Romansh initialisation for the jQuery UI date picker plugin. */
+/* Written by Yvonne Gienal (yvonne.gienal@educa.ch). */
+jQuery(function($){
+	$.datepicker.regional['rm'] = {
+		closeText: 'Serrar',
+		prevText: '&#x3c;Suandant',
+		nextText: 'Precedent&#x3e;',
+		currentText: 'Actual',
+		monthNames: ['Schaner','Favrer','Mars','Avrigl','Matg','Zercladur', 'Fanadur','Avust','Settember','October','November','December'],
+		monthNamesShort: ['Scha','Fev','Mar','Avr','Matg','Zer', 'Fan','Avu','Sett','Oct','Nov','Dec'],
+		dayNames: ['Dumengia','Glindesdi','Mardi','Mesemna','Gievgia','Venderdi','Sonda'],
+		dayNamesShort: ['Dum','Gli','Mar','Mes','Gie','Ven','Som'],
+		dayNamesMin: ['Du','Gl','Ma','Me','Gi','Ve','So'],
+		weekHeader: 'emna',
+		dateFormat: 'dd/mm/yy',
+		firstDay: 1,
+		isRTL: false,
+		showMonthAfterYear: false,
+		yearSuffix: ''};
+	$.datepicker.setDefaults($.datepicker.regional['rm']);
+});
+/* Romanian initialisation for the jQuery UI date picker plugin.
+ *
+ * Written by Edmond L. (ll_edmond@walla.com)
+ * and Ionut G. Stan (ionut.g.stan@gmail.com)
+ */
+jQuery(function($){
+	$.datepicker.regional['ro'] = {
+		closeText: 'Închide',
+		prevText: '&laquo; Luna precedentă',
+		nextText: 'Luna următoare &raquo;',
+		currentText: 'Azi',
+		monthNames: ['Ianuarie','Februarie','Martie','Aprilie','Mai','Iunie',
+		'Iulie','August','Septembrie','Octombrie','Noiembrie','Decembrie'],
+		monthNamesShort: ['Ian', 'Feb', 'Mar', 'Apr', 'Mai', 'Iun',
+		'Iul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'],
+		dayNames: ['Duminică', 'Luni', 'Marţi', 'Miercuri', 'Joi', 'Vineri', 'Sâmbătă'],
+		dayNamesShort: ['Dum', 'Lun', 'Mar', 'Mie', 'Joi', 'Vin', 'Sâm'],
+		dayNamesMin: ['Du','Lu','Ma','Mi','Jo','Vi','Sâ'],
+		weekHeader: 'Săpt',
+		dateFormat: 'dd.mm.yy',
+		firstDay: 1,
+		isRTL: false,
+		showMonthAfterYear: false,
+		yearSuffix: ''};
+	$.datepicker.setDefaults($.datepicker.regional['ro']);
+});
+/* Russian (UTF-8) initialisation for the jQuery UI date picker plugin. */
+/* Written by Andrew Stromnov (stromnov@gmail.com). */
+jQuery(function($){
+	$.datepicker.regional['ru'] = {
+		closeText: 'Закрыть',
+		prevText: '&#x3c;Пред',
+		nextText: 'След&#x3e;',
+		currentText: 'Сегодня',
+		monthNames: ['Январь','Февраль','Март','Апрель','Май','Июнь',
+		'Июль','Август','Сентябрь','Октябрь','Ноябрь','Декабрь'],
+		monthNamesShort: ['Янв','Фев','Мар','Апр','Май','Июн',
+		'Июл','Авг','Сен','Окт','Ноя','Дек'],
+		dayNames: ['воскресенье','понедельник','вторник','среда','четверг','пятница','суббота'],
+		dayNamesShort: ['вск','пнд','втр','срд','чтв','птн','сбт'],
+		dayNamesMin: ['Вс','Пн','Вт','Ср','Чт','Пт','Сб'],
+		weekHeader: 'Нед',
+		dateFormat: 'dd.mm.yy',
+		firstDay: 1,
+		isRTL: false,
+		showMonthAfterYear: false,
+		yearSuffix: ''};
+	$.datepicker.setDefaults($.datepicker.regional['ru']);
+});/* Slovak initialisation for the jQuery UI date picker plugin. */
+/* Written by Vojtech Rinik (vojto@hmm.sk). */
+jQuery(function($){
+	$.datepicker.regional['sk'] = {
+		closeText: 'Zavrieť',
+		prevText: '&#x3c;Predchádzajúci',
+		nextText: 'Nasledujúci&#x3e;',
+		currentText: 'Dnes',
+		monthNames: ['Január','Február','Marec','Apríl','Máj','Jún',
+		'Júl','August','September','Október','November','December'],
+		monthNamesShort: ['Jan','Feb','Mar','Apr','Máj','Jún',
+		'Júl','Aug','Sep','Okt','Nov','Dec'],
+		dayNames: ['Nedel\'a','Pondelok','Utorok','Streda','Štvrtok','Piatok','Sobota'],
+		dayNamesShort: ['Ned','Pon','Uto','Str','Štv','Pia','Sob'],
+		dayNamesMin: ['Ne','Po','Ut','St','Št','Pia','So'],
+		weekHeader: 'Ty',
+		dateFormat: 'dd.mm.yy',
+		firstDay: 1,
+		isRTL: false,
+		showMonthAfterYear: false,
+		yearSuffix: ''};
+	$.datepicker.setDefaults($.datepicker.regional['sk']);
+});
+/* Slovenian initialisation for the jQuery UI date picker plugin. */
+/* Written by Jaka Jancar (jaka@kubje.org). */
+/* c = &#x10D;, s = &#x161; z = &#x17E; C = &#x10C; S = &#x160; Z = &#x17D; */
+jQuery(function($){
+	$.datepicker.regional['sl'] = {
+		closeText: 'Zapri',
+		prevText: '&lt;Prej&#x161;nji',
+		nextText: 'Naslednji&gt;',
+		currentText: 'Trenutni',
+		monthNames: ['Januar','Februar','Marec','April','Maj','Junij',
+		'Julij','Avgust','September','Oktober','November','December'],
+		monthNamesShort: ['Jan','Feb','Mar','Apr','Maj','Jun',
+		'Jul','Avg','Sep','Okt','Nov','Dec'],
+		dayNames: ['Nedelja','Ponedeljek','Torek','Sreda','&#x10C;etrtek','Petek','Sobota'],
+		dayNamesShort: ['Ned','Pon','Tor','Sre','&#x10C;et','Pet','Sob'],
+		dayNamesMin: ['Ne','Po','To','Sr','&#x10C;e','Pe','So'],
+		weekHeader: 'Teden',
+		dateFormat: 'dd.mm.yy',
+		firstDay: 1,
+		isRTL: false,
+		showMonthAfterYear: false,
+		yearSuffix: ''};
+	$.datepicker.setDefaults($.datepicker.regional['sl']);
+});
+/* Albanian initialisation for the jQuery UI date picker plugin. */
+/* Written by Flakron Bytyqi (flakron@gmail.com). */
+jQuery(function($){
+	$.datepicker.regional['sq'] = {
+		closeText: 'mbylle',
+		prevText: '&#x3c;mbrapa',
+		nextText: 'Përpara&#x3e;',
+		currentText: 'sot',
+		monthNames: ['Janar','Shkurt','Mars','Prill','Maj','Qershor',
+		'Korrik','Gusht','Shtator','Tetor','Nëntor','Dhjetor'],
+		monthNamesShort: ['Jan','Shk','Mar','Pri','Maj','Qer',
+		'Kor','Gus','Sht','Tet','Nën','Dhj'],
+		dayNames: ['E Diel','E Hënë','E Martë','E Mërkurë','E Enjte','E Premte','E Shtune'],
+		dayNamesShort: ['Di','Hë','Ma','Më','En','Pr','Sh'],
+		dayNamesMin: ['Di','Hë','Ma','Më','En','Pr','Sh'],
+		weekHeader: 'Ja',
+		dateFormat: 'dd.mm.yy',
+		firstDay: 1,
+		isRTL: false,
+		showMonthAfterYear: false,
+		yearSuffix: ''};
+	$.datepicker.setDefaults($.datepicker.regional['sq']);
+});
+/* Serbian i18n for the jQuery UI date picker plugin. */
+/* Written by Dejan Dimić. */
+jQuery(function($){
+	$.datepicker.regional['sr-SR'] = {
+		closeText: 'Zatvori',
+		prevText: '&#x3c;',
+		nextText: '&#x3e;',
+		currentText: 'Danas',
+		monthNames: ['Januar','Februar','Mart','April','Maj','Jun',
+		'Jul','Avgust','Septembar','Oktobar','Novembar','Decembar'],
+		monthNamesShort: ['Jan','Feb','Mar','Apr','Maj','Jun',
+		'Jul','Avg','Sep','Okt','Nov','Dec'],
+		dayNames: ['Nedelja','Ponedeljak','Utorak','Sreda','Četvrtak','Petak','Subota'],
+		dayNamesShort: ['Ned','Pon','Uto','Sre','Čet','Pet','Sub'],
+		dayNamesMin: ['Ne','Po','Ut','Sr','Če','Pe','Su'],
+		weekHeader: 'Sed',
+		dateFormat: 'dd/mm/yy',
+		firstDay: 1,
+		isRTL: false,
+		showMonthAfterYear: false,
+		yearSuffix: ''};
+	$.datepicker.setDefaults($.datepicker.regional['sr-SR']);
+});
+/* Serbian i18n for the jQuery UI date picker plugin. */
+/* Written by Dejan Dimić. */
+jQuery(function($){
+	$.datepicker.regional['sr'] = {
+		closeText: 'Затвори',
+		prevText: '&#x3c;',
+		nextText: '&#x3e;',
+		currentText: 'Данас',
+		monthNames: ['Јануар','Фебруар','Март','Април','Мај','Јун',
+		'Јул','Август','Септембар','Октобар','Новембар','Децембар'],
+		monthNamesShort: ['Јан','Феб','Мар','Апр','Мај','Јун',
+		'Јул','Авг','Сеп','Окт','Нов','Дец'],
+		dayNames: ['Недеља','Понедељак','Уторак','Среда','Четвртак','Петак','Субота'],
+		dayNamesShort: ['Нед','Пон','Уто','Сре','Чет','Пет','Суб'],
+		dayNamesMin: ['Не','По','Ут','Ср','Че','Пе','Су'],
+		weekHeader: 'Сед',
+		dateFormat: 'dd/mm/yy',
+		firstDay: 1,
+		isRTL: false,
+		showMonthAfterYear: false,
+		yearSuffix: ''};
+	$.datepicker.setDefaults($.datepicker.regional['sr']);
+});
+/* Swedish initialisation for the jQuery UI date picker plugin. */
+/* Written by Anders Ekdahl ( anders@nomadiz.se). */
+jQuery(function($){
+    $.datepicker.regional['sv'] = {
+		closeText: 'Stäng',
+        prevText: '&laquo;Förra',
+		nextText: 'Nästa&raquo;',
+		currentText: 'Idag',
+        monthNames: ['Januari','Februari','Mars','April','Maj','Juni',
+        'Juli','Augusti','September','Oktober','November','December'],
+        monthNamesShort: ['Jan','Feb','Mar','Apr','Maj','Jun',
+        'Jul','Aug','Sep','Okt','Nov','Dec'],
+		dayNamesShort: ['Sön','Mån','Tis','Ons','Tor','Fre','Lör'],
+		dayNames: ['Söndag','Måndag','Tisdag','Onsdag','Torsdag','Fredag','Lördag'],
+		dayNamesMin: ['Sö','Må','Ti','On','To','Fr','Lö'],
+		weekHeader: 'Ve',
+        dateFormat: 'yy-mm-dd',
+		firstDay: 1,
+		isRTL: false,
+		showMonthAfterYear: false,
+		yearSuffix: ''};
+    $.datepicker.setDefaults($.datepicker.regional['sv']);
+});
+/* Tamil (UTF-8) initialisation for the jQuery UI date picker plugin. */
+/* Written by S A Sureshkumar (saskumar@live.com). */
+jQuery(function($){
+	$.datepicker.regional['ta'] = {
+		closeText: 'மூடு',
+		prevText: 'முன்னையது',
+		nextText: 'அடுத்தது',
+		currentText: 'இன்று',
+		monthNames: ['தை','மாசி','பங்குனி','சித்திரை','வைகாசி','ஆனி',
+		'ஆடி','ஆவணி','புரட்டாசி','ஐப்பசி','கார்த்திகை','மார்கழி'],
+		monthNamesShort: ['தை','மாசி','பங்','சித்','வைகா','ஆனி',
+		'ஆடி','ஆவ','புர','ஐப்','கார்','மார்'],
+		dayNames: ['ஞாயிற்றுக்கிழமை','திங்கட்கிழமை','செவ்வாய்க்கிழமை','புதன்கிழமை','வியாழக்கிழமை','வெள்ளிக்கிழமை','சனிக்கிழமை'],
+		dayNamesShort: ['ஞாயிறு','திங்கள்','செவ்வாய்','புதன்','வியாழன்','வெள்ளி','சனி'],
+		dayNamesMin: ['ஞா','தி','செ','பு','வி','வெ','ச'],
+		weekHeader: 'Не',
+		dateFormat: 'dd/mm/yy',
+		firstDay: 1,
+		isRTL: false,
+		showMonthAfterYear: false,
+		yearSuffix: ''};
+	$.datepicker.setDefaults($.datepicker.regional['ta']);
+});
+/* Thai initialisation for the jQuery UI date picker plugin. */
+/* Written by pipo (pipo@sixhead.com). */
+jQuery(function($){
+	$.datepicker.regional['th'] = {
+		closeText: 'ปิด',
+		prevText: '&laquo;&nbsp;ย้อน',
+		nextText: 'ถัดไป&nbsp;&raquo;',
+		currentText: 'วันนี้',
+		monthNames: ['มกราคม','กุมภาพันธ์','มีนาคม','เมษายน','พฤษภาคม','มิถุนายน',
+		'กรกฎาคม','สิงหาคม','กันยายน','ตุลาคม','พฤศจิกายน','ธันวาคม'],
+		monthNamesShort: ['ม.ค.','ก.พ.','มี.ค.','เม.ย.','พ.ค.','มิ.ย.',
+		'ก.ค.','ส.ค.','ก.ย.','ต.ค.','พ.ย.','ธ.ค.'],
+		dayNames: ['อาทิตย์','จันทร์','อังคาร','พุธ','พฤหัสบดี','ศุกร์','เสาร์'],
+		dayNamesShort: ['อา.','จ.','อ.','พ.','พฤ.','ศ.','ส.'],
+		dayNamesMin: ['อา.','จ.','อ.','พ.','พฤ.','ศ.','ส.'],
+		weekHeader: 'Wk',
+		dateFormat: 'dd/mm/yy',
+		firstDay: 0,
+		isRTL: false,
+		showMonthAfterYear: false,
+		yearSuffix: ''};
+	$.datepicker.setDefaults($.datepicker.regional['th']);
+});/* Turkish initialisation for the jQuery UI date picker plugin. */
+/* Written by Izzet Emre Erkan (kara@karalamalar.net). */
+jQuery(function($){
+	$.datepicker.regional['tr'] = {
+		closeText: 'kapat',
+		prevText: '&#x3c;geri',
+		nextText: 'ileri&#x3e',
+		currentText: 'bugün',
+		monthNames: ['Ocak','Şubat','Mart','Nisan','Mayıs','Haziran',
+		'Temmuz','Ağustos','Eylül','Ekim','Kasım','Aralık'],
+		monthNamesShort: ['Oca','Şub','Mar','Nis','May','Haz',
+		'Tem','Ağu','Eyl','Eki','Kas','Ara'],
+		dayNames: ['Pazar','Pazartesi','Salı','Çarşamba','Perşembe','Cuma','Cumartesi'],
+		dayNamesShort: ['Pz','Pt','Sa','Ça','Pe','Cu','Ct'],
+		dayNamesMin: ['Pz','Pt','Sa','Ça','Pe','Cu','Ct'],
+		weekHeader: 'Hf',
+		dateFormat: 'dd.mm.yy',
+		firstDay: 1,
+		isRTL: false,
+		showMonthAfterYear: false,
+		yearSuffix: ''};
+	$.datepicker.setDefaults($.datepicker.regional['tr']);
+});/* Ukrainian (UTF-8) initialisation for the jQuery UI date picker plugin. */
+/* Written by Maxim Drogobitskiy (maxdao@gmail.com). */
+jQuery(function($){
+	$.datepicker.regional['uk'] = {
+		closeText: 'Закрити',
+		prevText: '&#x3c;',
+		nextText: '&#x3e;',
+		currentText: 'Сьогодні',
+		monthNames: ['Січень','Лютий','Березень','Квітень','Травень','Червень',
+		'Липень','Серпень','Вересень','Жовтень','Листопад','Грудень'],
+		monthNamesShort: ['Січ','Лют','Бер','Кві','Тра','Чер',
+		'Лип','Сер','Вер','Жов','Лис','Гру'],
+		dayNames: ['неділя','понеділок','вівторок','середа','четвер','п’ятниця','субота'],
+		dayNamesShort: ['нед','пнд','вів','срд','чтв','птн','сбт'],
+		dayNamesMin: ['Нд','Пн','Вт','Ср','Чт','Пт','Сб'],
+		weekHeader: 'Не',
+		dateFormat: 'dd/mm/yy',
+		firstDay: 1,
+		isRTL: false,
+		showMonthAfterYear: false,
+		yearSuffix: ''};
+	$.datepicker.setDefaults($.datepicker.regional['uk']);
+});/* Vietnamese initialisation for the jQuery UI date picker plugin. */
+/* Translated by Le Thanh Huy (lthanhhuy@cit.ctu.edu.vn). */
+jQuery(function($){
+	$.datepicker.regional['vi'] = {
+		closeText: 'Đóng',
+		prevText: '&#x3c;Trước',
+		nextText: 'Tiếp&#x3e;',
+		currentText: 'Hôm nay',
+		monthNames: ['Tháng Một', 'Tháng Hai', 'Tháng Ba', 'Tháng Tư', 'Tháng Năm', 'Tháng Sáu',
+		'Tháng Bảy', 'Tháng Tám', 'Tháng Chín', 'Tháng Mười', 'Tháng Mười Một', 'Tháng Mười Hai'],
+		monthNamesShort: ['Tháng 1', 'Tháng 2', 'Tháng 3', 'Tháng 4', 'Tháng 5', 'Tháng 6',
+		'Tháng 7', 'Tháng 8', 'Tháng 9', 'Tháng 10', 'Tháng 11', 'Tháng 12'],
+		dayNames: ['Chủ Nhật', 'Thứ Hai', 'Thứ Ba', 'Thứ Tư', 'Thứ Năm', 'Thứ Sáu', 'Thứ Bảy'],
+		dayNamesShort: ['CN', 'T2', 'T3', 'T4', 'T5', 'T6', 'T7'],
+		dayNamesMin: ['CN', 'T2', 'T3', 'T4', 'T5', 'T6', 'T7'],
+		weekHeader: 'Tu',
+		dateFormat: 'dd/mm/yy',
+		firstDay: 0,
+		isRTL: false,
+		showMonthAfterYear: false,
+		yearSuffix: ''};
+	$.datepicker.setDefaults($.datepicker.regional['vi']);
+});
+/* Chinese initialisation for the jQuery UI date picker plugin. */
+/* Written by Cloudream (cloudream@gmail.com). */
+jQuery(function($){
+	$.datepicker.regional['zh-CN'] = {
+		closeText: '关闭',
+		prevText: '&#x3c;上月',
+		nextText: '下月&#x3e;',
+		currentText: '今天',
+		monthNames: ['一月','二月','三月','四月','五月','六月',
+		'七月','八月','九月','十月','十一月','十二月'],
+		monthNamesShort: ['一','二','三','四','五','六',
+		'七','八','九','十','十一','十二'],
+		dayNames: ['星期日','星期一','星期二','星期三','星期四','星期五','星期六'],
+		dayNamesShort: ['周日','周一','周二','周三','周四','周五','周六'],
+		dayNamesMin: ['日','一','二','三','四','五','六'],
+		weekHeader: '周',
+		dateFormat: 'yy-mm-dd',
+		firstDay: 1,
+		isRTL: false,
+		showMonthAfterYear: true,
+		yearSuffix: '年'};
+	$.datepicker.setDefaults($.datepicker.regional['zh-CN']);
+});
+/* Chinese initialisation for the jQuery UI date picker plugin. */
+/* Written by SCCY (samuelcychan@gmail.com). */
+jQuery(function($){
+	$.datepicker.regional['zh-HK'] = {
+		closeText: '關閉',
+		prevText: '&#x3c;上月',
+		nextText: '下月&#x3e;',
+		currentText: '今天',
+		monthNames: ['一月','二月','三月','四月','五月','六月',
+		'七月','八月','九月','十月','十一月','十二月'],
+		monthNamesShort: ['一','二','三','四','五','六',
+		'七','八','九','十','十一','十二'],
+		dayNames: ['星期日','星期一','星期二','星期三','星期四','星期五','星期六'],
+		dayNamesShort: ['周日','周一','周二','周三','周四','周五','周六'],
+		dayNamesMin: ['日','一','二','三','四','五','六'],
+		weekHeader: '周',
+		dateFormat: 'dd-mm-yy',
+		firstDay: 0,
+		isRTL: false,
+		showMonthAfterYear: true,
+		yearSuffix: '年'};
+	$.datepicker.setDefaults($.datepicker.regional['zh-HK']);
+});
+/* Chinese initialisation for the jQuery UI date picker plugin. */
+/* Written by Ressol (ressol@gmail.com). */
+jQuery(function($){
+	$.datepicker.regional['zh-TW'] = {
+		closeText: '關閉',
+		prevText: '&#x3c;上月',
+		nextText: '下月&#x3e;',
+		currentText: '今天',
+		monthNames: ['一月','二月','三月','四月','五月','六月',
+		'七月','八月','九月','十月','十一月','十二月'],
+		monthNamesShort: ['一','二','三','四','五','六',
+		'七','八','九','十','十一','十二'],
+		dayNames: ['星期日','星期一','星期二','星期三','星期四','星期五','星期六'],
+		dayNamesShort: ['周日','周一','周二','周三','周四','周五','周六'],
+		dayNamesMin: ['日','一','二','三','四','五','六'],
+		weekHeader: '周',
+		dateFormat: 'yy/mm/dd',
+		firstDay: 1,
+		isRTL: false,
+		showMonthAfterYear: true,
+		yearSuffix: '年'};
+	$.datepicker.setDefaults($.datepicker.regional['zh-TW']);
+});
diff --git a/js/ui/i18n/jquery.ui.datepicker-af.js b/js/ui/i18n/jquery.ui.datepicker-af.js
new file mode 100644
index 0000000000..43fbf6cd8e
--- /dev/null
+++ b/js/ui/i18n/jquery.ui.datepicker-af.js
@@ -0,0 +1,23 @@
+/* Afrikaans initialisation for the jQuery UI date picker plugin. */
+/* Written by Renier Pretorius. */
+jQuery(function($){
+	$.datepicker.regional['af'] = {
+		closeText: 'Selekteer',
+		prevText: 'Vorige',
+		nextText: 'Volgende',
+		currentText: 'Vandag',
+		monthNames: ['Januarie','Februarie','Maart','April','Mei','Junie',
+		'Julie','Augustus','September','Oktober','November','Desember'],
+		monthNamesShort: ['Jan', 'Feb', 'Mrt', 'Apr', 'Mei', 'Jun',
+		'Jul', 'Aug', 'Sep', 'Okt', 'Nov', 'Des'],
+		dayNames: ['Sondag', 'Maandag', 'Dinsdag', 'Woensdag', 'Donderdag', 'Vrydag', 'Saterdag'],
+		dayNamesShort: ['Son', 'Maa', 'Din', 'Woe', 'Don', 'Vry', 'Sat'],
+		dayNamesMin: ['So','Ma','Di','Wo','Do','Vr','Sa'],
+		weekHeader: 'Wk',
+		dateFormat: 'dd/mm/yy',
+		firstDay: 1,
+		isRTL: false,
+		showMonthAfterYear: false,
+		yearSuffix: ''};
+	$.datepicker.setDefaults($.datepicker.regional['af']);
+});
diff --git a/js/ui/i18n/jquery.ui.datepicker-ar-DZ.js b/js/ui/i18n/jquery.ui.datepicker-ar-DZ.js
new file mode 100644
index 0000000000..e0e1685d84
--- /dev/null
+++ b/js/ui/i18n/jquery.ui.datepicker-ar-DZ.js
@@ -0,0 +1,23 @@
+/* Algerian Arabic Translation for jQuery UI date picker plugin. (can be used for Tunisia)*/
+/* Mohamed Cherif BOUCHELAGHEM -- cherifbouchelaghem@yahoo.fr */
+
+jQuery(function($){
+	$.datepicker.regional['ar-DZ'] = {
+		closeText: 'إغلاق',
+		prevText: '&#x3c;السابق',
+		nextText: 'التالي&#x3e;',
+		currentText: 'اليوم',
+		monthNames: ['جانفي', 'فيفري', 'مارس', 'أفريل', 'ماي', 'جوان',
+		'جويلية', 'أوت', 'سبتمبر','أكتوبر', 'نوفمبر', 'ديسمبر'],
+		monthNamesShort: ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12'],
+		dayNames: ['الأحد', 'الاثنين', 'الثلاثاء', 'الأربعاء', 'الخميس', 'الجمعة', 'السبت'],
+		dayNamesShort: ['الأحد', 'الاثنين', 'الثلاثاء', 'الأربعاء', 'الخميس', 'الجمعة', 'السبت'],
+		dayNamesMin: ['الأحد', 'الاثنين', 'الثلاثاء', 'الأربعاء', 'الخميس', 'الجمعة', 'السبت'],
+		weekHeader: 'أسبوع',
+		dateFormat: 'dd/mm/yy',
+		firstDay: 6,
+  		isRTL: true,
+		showMonthAfterYear: false,
+		yearSuffix: ''};
+	$.datepicker.setDefaults($.datepicker.regional['ar-DZ']);
+});
diff --git a/js/ui/i18n/jquery.ui.datepicker-ar.js b/js/ui/i18n/jquery.ui.datepicker-ar.js
new file mode 100644
index 0000000000..9e37911c26
--- /dev/null
+++ b/js/ui/i18n/jquery.ui.datepicker-ar.js
@@ -0,0 +1,23 @@
+/* Arabic Translation for jQuery UI date picker plugin. */
+/* Khaled Alhourani -- me@khaledalhourani.com */
+/* NOTE: monthNames are the original months names and they are the Arabic names, not the new months name فبراير - يناير and there isn't any Arabic roots for these months */
+jQuery(function($){
+	$.datepicker.regional['ar'] = {
+		closeText: 'إغلاق',
+		prevText: '&#x3c;السابق',
+		nextText: 'التالي&#x3e;',
+		currentText: 'اليوم',
+		monthNames: ['كانون الثاني', 'شباط', 'آذار', 'نيسان', 'آذار', 'حزيران',
+		'تموز', 'آب', 'أيلول',	'تشرين الأول', 'تشرين الثاني', 'كانون الأول'],
+		monthNamesShort: ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12'],
+		dayNames: ['الأحد', 'الاثنين', 'الثلاثاء', 'الأربعاء', 'الخميس', 'الجمعة', 'السبت'],
+		dayNamesShort: ['الأحد', 'الاثنين', 'الثلاثاء', 'الأربعاء', 'الخميس', 'الجمعة', 'السبت'],
+		dayNamesMin: ['الأحد', 'الاثنين', 'الثلاثاء', 'الأربعاء', 'الخميس', 'الجمعة', 'السبت'],
+		weekHeader: 'أسبوع',
+		dateFormat: 'dd/mm/yy',
+		firstDay: 6,
+  		isRTL: true,
+		showMonthAfterYear: false,
+		yearSuffix: ''};
+	$.datepicker.setDefaults($.datepicker.regional['ar']);
+});
\ No newline at end of file
diff --git a/js/ui/i18n/jquery.ui.datepicker-az.js b/js/ui/i18n/jquery.ui.datepicker-az.js
new file mode 100644
index 0000000000..b5434057b7
--- /dev/null
+++ b/js/ui/i18n/jquery.ui.datepicker-az.js
@@ -0,0 +1,23 @@
+/* Azerbaijani (UTF-8) initialisation for the jQuery UI date picker plugin. */
+/* Written by Jamil Najafov (necefov33@gmail.com). */
+jQuery(function($) {
+	$.datepicker.regional['az'] = {
+		closeText: 'Bağla',
+		prevText: '&#x3c;Geri',
+		nextText: 'İrəli&#x3e;',
+		currentText: 'Bugün',
+		monthNames: ['Yanvar','Fevral','Mart','Aprel','May','İyun',
+		'İyul','Avqust','Sentyabr','Oktyabr','Noyabr','Dekabr'],
+		monthNamesShort: ['Yan','Fev','Mar','Apr','May','İyun',
+		'İyul','Avq','Sen','Okt','Noy','Dek'],
+		dayNames: ['Bazar','Bazar ertəsi','Çərşənbə axşamı','Çərşənbə','Cümə axşamı','Cümə','Şənbə'],
+		dayNamesShort: ['B','Be','Ça','Ç','Ca','C','Ş'],
+		dayNamesMin: ['B','B','Ç','С','Ç','C','Ş'],
+		weekHeader: 'Hf',
+		dateFormat: 'dd.mm.yy',
+		firstDay: 1,
+		isRTL: false,
+		showMonthAfterYear: false,
+		yearSuffix: ''};
+	$.datepicker.setDefaults($.datepicker.regional['az']);
+});
\ No newline at end of file
diff --git a/js/ui/i18n/jquery.ui.datepicker-bg.js b/js/ui/i18n/jquery.ui.datepicker-bg.js
new file mode 100644
index 0000000000..b5113f7817
--- /dev/null
+++ b/js/ui/i18n/jquery.ui.datepicker-bg.js
@@ -0,0 +1,24 @@
+/* Bulgarian initialisation for the jQuery UI date picker plugin. */
+/* Written by Stoyan Kyosev (http://svest.org). */
+jQuery(function($){
+    $.datepicker.regional['bg'] = {
+        closeText: 'затвори',
+        prevText: '&#x3c;назад',
+        nextText: 'напред&#x3e;',
+		nextBigText: '&#x3e;&#x3e;',
+        currentText: 'днес',
+        monthNames: ['Януари','Февруари','Март','Април','Май','Юни',
+        'Юли','Август','Септември','Октомври','Ноември','Декември'],
+        monthNamesShort: ['Яну','Фев','Мар','Апр','Май','Юни',
+        'Юли','Авг','Сеп','Окт','Нов','Дек'],
+        dayNames: ['Неделя','Понеделник','Вторник','Сряда','Четвъртък','Петък','Събота'],
+        dayNamesShort: ['Нед','Пон','Вто','Сря','Чет','Пет','Съб'],
+        dayNamesMin: ['Не','По','Вт','Ср','Че','Пе','Съ'],
+		weekHeader: 'Wk',
+        dateFormat: 'dd.mm.yy',
+		firstDay: 1,
+        isRTL: false,
+		showMonthAfterYear: false,
+		yearSuffix: ''};
+    $.datepicker.setDefaults($.datepicker.regional['bg']);
+});
diff --git a/js/ui/i18n/jquery.ui.datepicker-bs.js b/js/ui/i18n/jquery.ui.datepicker-bs.js
new file mode 100644
index 0000000000..30ab826b0f
--- /dev/null
+++ b/js/ui/i18n/jquery.ui.datepicker-bs.js
@@ -0,0 +1,23 @@
+/* Bosnian i18n for the jQuery UI date picker plugin. */
+/* Written by Kenan Konjo. */
+jQuery(function($){
+	$.datepicker.regional['bs'] = {
+		closeText: 'Zatvori', 
+		prevText: '&#x3c;', 
+		nextText: '&#x3e;', 
+		currentText: 'Danas', 
+		monthNames: ['Januar','Februar','Mart','April','Maj','Juni',
+		'Juli','August','Septembar','Oktobar','Novembar','Decembar'],
+		monthNamesShort: ['Jan','Feb','Mar','Apr','Maj','Jun',
+		'Jul','Aug','Sep','Okt','Nov','Dec'],
+		dayNames: ['Nedelja','Ponedeljak','Utorak','Srijeda','Četvrtak','Petak','Subota'],
+		dayNamesShort: ['Ned','Pon','Uto','Sri','Čet','Pet','Sub'],
+		dayNamesMin: ['Ne','Po','Ut','Sr','Če','Pe','Su'],
+		weekHeader: 'Wk',
+		dateFormat: 'dd.mm.yy',
+		firstDay: 1,
+		isRTL: false,
+		showMonthAfterYear: false,
+		yearSuffix: ''};
+	$.datepicker.setDefaults($.datepicker.regional['bs']);
+});
\ No newline at end of file
diff --git a/js/ui/i18n/jquery.ui.datepicker-ca.js b/js/ui/i18n/jquery.ui.datepicker-ca.js
new file mode 100644
index 0000000000..b128e699ef
--- /dev/null
+++ b/js/ui/i18n/jquery.ui.datepicker-ca.js
@@ -0,0 +1,23 @@
+/* Inicialització en català per a l'extenció 'calendar' per jQuery. */
+/* Writers: (joan.leon@gmail.com). */
+jQuery(function($){
+	$.datepicker.regional['ca'] = {
+		closeText: 'Tancar',
+		prevText: '&#x3c;Ant',
+		nextText: 'Seg&#x3e;',
+		currentText: 'Avui',
+		monthNames: ['Gener','Febrer','Mar&ccedil;','Abril','Maig','Juny',
+		'Juliol','Agost','Setembre','Octubre','Novembre','Desembre'],
+		monthNamesShort: ['Gen','Feb','Mar','Abr','Mai','Jun',
+		'Jul','Ago','Set','Oct','Nov','Des'],
+		dayNames: ['Diumenge','Dilluns','Dimarts','Dimecres','Dijous','Divendres','Dissabte'],
+		dayNamesShort: ['Dug','Dln','Dmt','Dmc','Djs','Dvn','Dsb'],
+		dayNamesMin: ['Dg','Dl','Dt','Dc','Dj','Dv','Ds'],
+		weekHeader: 'Sm',
+		dateFormat: 'dd/mm/yy',
+		firstDay: 1,
+		isRTL: false,
+		showMonthAfterYear: false,
+		yearSuffix: ''};
+	$.datepicker.setDefaults($.datepicker.regional['ca']);
+});
\ No newline at end of file
diff --git a/js/ui/i18n/jquery.ui.datepicker-cs.js b/js/ui/i18n/jquery.ui.datepicker-cs.js
new file mode 100644
index 0000000000..c3c07ea672
--- /dev/null
+++ b/js/ui/i18n/jquery.ui.datepicker-cs.js
@@ -0,0 +1,23 @@
+/* Czech initialisation for the jQuery UI date picker plugin. */
+/* Written by Tomas Muller (tomas@tomas-muller.net). */
+jQuery(function($){
+	$.datepicker.regional['cs'] = {
+		closeText: 'Zavřít',
+		prevText: '&#x3c;Dříve',
+		nextText: 'Později&#x3e;',
+		currentText: 'Nyní',
+		monthNames: ['leden','únor','březen','duben','květen','červen',
+        'červenec','srpen','září','říjen','listopad','prosinec'],
+		monthNamesShort: ['led','úno','bře','dub','kvě','čer',
+		'čvc','srp','zář','říj','lis','pro'],
+		dayNames: ['neděle', 'pondělí', 'úterý', 'středa', 'čtvrtek', 'pátek', 'sobota'],
+		dayNamesShort: ['ne', 'po', 'út', 'st', 'čt', 'pá', 'so'],
+		dayNamesMin: ['ne','po','út','st','čt','pá','so'],
+		weekHeader: 'Týd',
+		dateFormat: 'dd.mm.yy',
+		firstDay: 1,
+		isRTL: false,
+		showMonthAfterYear: false,
+		yearSuffix: ''};
+	$.datepicker.setDefaults($.datepicker.regional['cs']);
+});
diff --git a/js/ui/i18n/jquery.ui.datepicker-da.js b/js/ui/i18n/jquery.ui.datepicker-da.js
new file mode 100644
index 0000000000..4a99a5833b
--- /dev/null
+++ b/js/ui/i18n/jquery.ui.datepicker-da.js
@@ -0,0 +1,23 @@
+/* Danish initialisation for the jQuery UI date picker plugin. */
+/* Written by Jan Christensen ( deletestuff@gmail.com). */
+jQuery(function($){
+    $.datepicker.regional['da'] = {
+		closeText: 'Luk',
+        prevText: '&#x3c;Forrige',
+		nextText: 'Næste&#x3e;',
+		currentText: 'Idag',
+        monthNames: ['Januar','Februar','Marts','April','Maj','Juni',
+        'Juli','August','September','Oktober','November','December'],
+        monthNamesShort: ['Jan','Feb','Mar','Apr','Maj','Jun',
+        'Jul','Aug','Sep','Okt','Nov','Dec'],
+		dayNames: ['Søndag','Mandag','Tirsdag','Onsdag','Torsdag','Fredag','Lørdag'],
+		dayNamesShort: ['Søn','Man','Tir','Ons','Tor','Fre','Lør'],
+		dayNamesMin: ['Sø','Ma','Ti','On','To','Fr','Lø'],
+		weekHeader: 'Uge',
+        dateFormat: 'dd-mm-yy',
+		firstDay: 1,
+		isRTL: false,
+		showMonthAfterYear: false,
+		yearSuffix: ''};
+    $.datepicker.setDefaults($.datepicker.regional['da']);
+});
diff --git a/js/ui/i18n/jquery.ui.datepicker-de.js b/js/ui/i18n/jquery.ui.datepicker-de.js
new file mode 100644
index 0000000000..ac2d516aa9
--- /dev/null
+++ b/js/ui/i18n/jquery.ui.datepicker-de.js
@@ -0,0 +1,23 @@
+/* German initialisation for the jQuery UI date picker plugin. */
+/* Written by Milian Wolff (mail@milianw.de). */
+jQuery(function($){
+	$.datepicker.regional['de'] = {
+		closeText: 'schließen',
+		prevText: '&#x3c;zurück',
+		nextText: 'Vor&#x3e;',
+		currentText: 'heute',
+		monthNames: ['Januar','Februar','März','April','Mai','Juni',
+		'Juli','August','September','Oktober','November','Dezember'],
+		monthNamesShort: ['Jan','Feb','Mär','Apr','Mai','Jun',
+		'Jul','Aug','Sep','Okt','Nov','Dez'],
+		dayNames: ['Sonntag','Montag','Dienstag','Mittwoch','Donnerstag','Freitag','Samstag'],
+		dayNamesShort: ['So','Mo','Di','Mi','Do','Fr','Sa'],
+		dayNamesMin: ['So','Mo','Di','Mi','Do','Fr','Sa'],
+		weekHeader: 'Wo',
+		dateFormat: 'dd.mm.yy',
+		firstDay: 1,
+		isRTL: false,
+		showMonthAfterYear: false,
+		yearSuffix: ''};
+	$.datepicker.setDefaults($.datepicker.regional['de']);
+});
diff --git a/js/ui/i18n/jquery.ui.datepicker-el.js b/js/ui/i18n/jquery.ui.datepicker-el.js
new file mode 100644
index 0000000000..9542769d9a
--- /dev/null
+++ b/js/ui/i18n/jquery.ui.datepicker-el.js
@@ -0,0 +1,23 @@
+/* Greek (el) initialisation for the jQuery UI date picker plugin. */
+/* Written by Alex Cicovic (http://www.alexcicovic.com) */
+jQuery(function($){
+	$.datepicker.regional['el'] = {
+		closeText: 'Κλείσιμο',
+		prevText: 'Προηγούμενος',
+		nextText: 'Επόμενος',
+		currentText: 'Τρέχων Μήνας',
+		monthNames: ['Ιανουάριος','Φεβρουάριος','Μάρτιος','Απρίλιος','Μάιος','Ιούνιος',
+		'Ιούλιος','Αύγουστος','Σεπτέμβριος','Οκτώβριος','Νοέμβριος','Δεκέμβριος'],
+		monthNamesShort: ['Ιαν','Φεβ','Μαρ','Απρ','Μαι','Ιουν',
+		'Ιουλ','Αυγ','Σεπ','Οκτ','Νοε','Δεκ'],
+		dayNames: ['Κυριακή','Δευτέρα','Τρίτη','Τετάρτη','Πέμπτη','Παρασκευή','Σάββατο'],
+		dayNamesShort: ['Κυρ','Δευ','Τρι','Τετ','Πεμ','Παρ','Σαβ'],
+		dayNamesMin: ['Κυ','Δε','Τρ','Τε','Πε','Πα','Σα'],
+		weekHeader: 'Εβδ',
+		dateFormat: 'dd/mm/yy',
+		firstDay: 1,
+		isRTL: false,
+		showMonthAfterYear: false,
+		yearSuffix: ''};
+	$.datepicker.setDefaults($.datepicker.regional['el']);
+});
\ No newline at end of file
diff --git a/js/ui/i18n/jquery.ui.datepicker-en-AU.js b/js/ui/i18n/jquery.ui.datepicker-en-AU.js
new file mode 100644
index 0000000000..c1a1020a14
--- /dev/null
+++ b/js/ui/i18n/jquery.ui.datepicker-en-AU.js
@@ -0,0 +1,23 @@
+/* English/Australia initialisation for the jQuery UI date picker plugin. */
+/* Based on the en-GB initialisation. */
+jQuery(function($){
+	$.datepicker.regional['en-AU'] = {
+		closeText: 'Done',
+		prevText: 'Prev',
+		nextText: 'Next',
+		currentText: 'Today',
+		monthNames: ['January','February','March','April','May','June',
+		'July','August','September','October','November','December'],
+		monthNamesShort: ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun',
+		'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'],
+		dayNames: ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'],
+		dayNamesShort: ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'],
+		dayNamesMin: ['Su','Mo','Tu','We','Th','Fr','Sa'],
+		weekHeader: 'Wk',
+		dateFormat: 'dd/mm/yy',
+		firstDay: 1,
+		isRTL: false,
+		showMonthAfterYear: false,
+		yearSuffix: ''};
+	$.datepicker.setDefaults($.datepicker.regional['en-AU']);
+});
diff --git a/js/ui/i18n/jquery.ui.datepicker-en-GB.js b/js/ui/i18n/jquery.ui.datepicker-en-GB.js
new file mode 100644
index 0000000000..aac7b6195c
--- /dev/null
+++ b/js/ui/i18n/jquery.ui.datepicker-en-GB.js
@@ -0,0 +1,23 @@
+/* English/UK initialisation for the jQuery UI date picker plugin. */
+/* Written by Stuart. */
+jQuery(function($){
+	$.datepicker.regional['en-GB'] = {
+		closeText: 'Done',
+		prevText: 'Prev',
+		nextText: 'Next',
+		currentText: 'Today',
+		monthNames: ['January','February','March','April','May','June',
+		'July','August','September','October','November','December'],
+		monthNamesShort: ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun',
+		'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'],
+		dayNames: ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'],
+		dayNamesShort: ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'],
+		dayNamesMin: ['Su','Mo','Tu','We','Th','Fr','Sa'],
+		weekHeader: 'Wk',
+		dateFormat: 'dd/mm/yy',
+		firstDay: 1,
+		isRTL: false,
+		showMonthAfterYear: false,
+		yearSuffix: ''};
+	$.datepicker.setDefaults($.datepicker.regional['en-GB']);
+});
diff --git a/js/ui/i18n/jquery.ui.datepicker-en-NZ.js b/js/ui/i18n/jquery.ui.datepicker-en-NZ.js
new file mode 100644
index 0000000000..7819df0528
--- /dev/null
+++ b/js/ui/i18n/jquery.ui.datepicker-en-NZ.js
@@ -0,0 +1,23 @@
+/* English/New Zealand initialisation for the jQuery UI date picker plugin. */
+/* Based on the en-GB initialisation. */
+jQuery(function($){
+	$.datepicker.regional['en-NZ'] = {
+		closeText: 'Done',
+		prevText: 'Prev',
+		nextText: 'Next',
+		currentText: 'Today',
+		monthNames: ['January','February','March','April','May','June',
+		'July','August','September','October','November','December'],
+		monthNamesShort: ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun',
+		'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'],
+		dayNames: ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'],
+		dayNamesShort: ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'],
+		dayNamesMin: ['Su','Mo','Tu','We','Th','Fr','Sa'],
+		weekHeader: 'Wk',
+		dateFormat: 'dd/mm/yy',
+		firstDay: 1,
+		isRTL: false,
+		showMonthAfterYear: false,
+		yearSuffix: ''};
+	$.datepicker.setDefaults($.datepicker.regional['en-NZ']);
+});
diff --git a/js/ui/i18n/jquery.ui.datepicker-eo.js b/js/ui/i18n/jquery.ui.datepicker-eo.js
new file mode 100644
index 0000000000..ba5715687b
--- /dev/null
+++ b/js/ui/i18n/jquery.ui.datepicker-eo.js
@@ -0,0 +1,23 @@
+/* Esperanto initialisation for the jQuery UI date picker plugin. */
+/* Written by Olivier M. (olivierweb@ifrance.com). */
+jQuery(function($){
+	$.datepicker.regional['eo'] = {
+		closeText: 'Fermi',
+		prevText: '&lt;Anta',
+		nextText: 'Sekv&gt;',
+		currentText: 'Nuna',
+		monthNames: ['Januaro','Februaro','Marto','Aprilo','Majo','Junio',
+		'Julio','Aŭgusto','Septembro','Oktobro','Novembro','Decembro'],
+		monthNamesShort: ['Jan','Feb','Mar','Apr','Maj','Jun',
+		'Jul','Aŭg','Sep','Okt','Nov','Dec'],
+		dayNames: ['Dimanĉo','Lundo','Mardo','Merkredo','Ĵaŭdo','Vendredo','Sabato'],
+		dayNamesShort: ['Dim','Lun','Mar','Mer','Ĵaŭ','Ven','Sab'],
+		dayNamesMin: ['Di','Lu','Ma','Me','Ĵa','Ve','Sa'],
+		weekHeader: 'Sb',
+		dateFormat: 'dd/mm/yy',
+		firstDay: 0,
+		isRTL: false,
+		showMonthAfterYear: false,
+		yearSuffix: ''};
+	$.datepicker.setDefaults($.datepicker.regional['eo']);
+});
diff --git a/js/ui/i18n/jquery.ui.datepicker-es.js b/js/ui/i18n/jquery.ui.datepicker-es.js
new file mode 100644
index 0000000000..a02133de3f
--- /dev/null
+++ b/js/ui/i18n/jquery.ui.datepicker-es.js
@@ -0,0 +1,23 @@
+/* Inicialización en español para la extensión 'UI date picker' para jQuery. */
+/* Traducido por Vester (xvester@gmail.com). */
+jQuery(function($){
+	$.datepicker.regional['es'] = {
+		closeText: 'Cerrar',
+		prevText: '&#x3c;Ant',
+		nextText: 'Sig&#x3e;',
+		currentText: 'Hoy',
+		monthNames: ['Enero','Febrero','Marzo','Abril','Mayo','Junio',
+		'Julio','Agosto','Septiembre','Octubre','Noviembre','Diciembre'],
+		monthNamesShort: ['Ene','Feb','Mar','Abr','May','Jun',
+		'Jul','Ago','Sep','Oct','Nov','Dic'],
+		dayNames: ['Domingo','Lunes','Martes','Mi&eacute;rcoles','Jueves','Viernes','S&aacute;bado'],
+		dayNamesShort: ['Dom','Lun','Mar','Mi&eacute;','Juv','Vie','S&aacute;b'],
+		dayNamesMin: ['Do','Lu','Ma','Mi','Ju','Vi','S&aacute;'],
+		weekHeader: 'Sm',
+		dateFormat: 'dd/mm/yy',
+		firstDay: 1,
+		isRTL: false,
+		showMonthAfterYear: false,
+		yearSuffix: ''};
+	$.datepicker.setDefaults($.datepicker.regional['es']);
+});
\ No newline at end of file
diff --git a/js/ui/i18n/jquery.ui.datepicker-et.js b/js/ui/i18n/jquery.ui.datepicker-et.js
new file mode 100644
index 0000000000..f97311f31a
--- /dev/null
+++ b/js/ui/i18n/jquery.ui.datepicker-et.js
@@ -0,0 +1,23 @@
+/* Estonian initialisation for the jQuery UI date picker plugin. */
+/* Written by Mart Sõmermaa (mrts.pydev at gmail com). */
+jQuery(function($){
+	$.datepicker.regional['et'] = {
+		closeText: 'Sulge',
+		prevText: 'Eelnev',
+		nextText: 'Järgnev',
+		currentText: 'Täna',
+		monthNames: ['Jaanuar','Veebruar','Märts','Aprill','Mai','Juuni',
+		'Juuli','August','September','Oktoober','November','Detsember'],
+		monthNamesShort: ['Jaan', 'Veebr', 'Märts', 'Apr', 'Mai', 'Juuni',
+		'Juuli', 'Aug', 'Sept', 'Okt', 'Nov', 'Dets'],
+		dayNames: ['Pühapäev', 'Esmaspäev', 'Teisipäev', 'Kolmapäev', 'Neljapäev', 'Reede', 'Laupäev'],
+		dayNamesShort: ['Pühap', 'Esmasp', 'Teisip', 'Kolmap', 'Neljap', 'Reede', 'Laup'],
+		dayNamesMin: ['P','E','T','K','N','R','L'],
+		weekHeader: 'Sm',
+		dateFormat: 'dd.mm.yy',
+		firstDay: 1,
+		isRTL: false,
+		showMonthAfterYear: false,
+		yearSuffix: ''};
+	$.datepicker.setDefaults($.datepicker.regional['et']);
+}); 
\ No newline at end of file
diff --git a/js/ui/i18n/jquery.ui.datepicker-eu.js b/js/ui/i18n/jquery.ui.datepicker-eu.js
new file mode 100644
index 0000000000..9ba6ee22e3
--- /dev/null
+++ b/js/ui/i18n/jquery.ui.datepicker-eu.js
@@ -0,0 +1,23 @@
+/* Euskarako oinarria 'UI date picker' jquery-ko extentsioarentzat */
+/* Karrikas-ek itzulia (karrikas@karrikas.com) */
+jQuery(function($){
+	$.datepicker.regional['eu'] = {
+		closeText: 'Egina',
+		prevText: '&#x3c;Aur',
+		nextText: 'Hur&#x3e;',
+		currentText: 'Gaur',
+		monthNames: ['Urtarrila','Otsaila','Martxoa','Apirila','Maiatza','Ekaina',
+		'Uztaila','Abuztua','Iraila','Urria','Azaroa','Abendua'],
+		monthNamesShort: ['Urt','Ots','Mar','Api','Mai','Eka',
+		'Uzt','Abu','Ira','Urr','Aza','Abe'],
+		dayNames: ['Igandea','Astelehena','Asteartea','Asteazkena','Osteguna','Ostirala','Larunbata'],
+		dayNamesShort: ['Iga','Ast','Ast','Ast','Ost','Ost','Lar'],
+		dayNamesMin: ['Ig','As','As','As','Os','Os','La'],
+		weekHeader: 'Wk',
+		dateFormat: 'yy/mm/dd',
+		firstDay: 1,
+		isRTL: false,
+		showMonthAfterYear: false,
+		yearSuffix: ''};
+	$.datepicker.setDefaults($.datepicker.regional['eu']);
+});
\ No newline at end of file
diff --git a/js/ui/i18n/jquery.ui.datepicker-fa.js b/js/ui/i18n/jquery.ui.datepicker-fa.js
new file mode 100644
index 0000000000..adb3709fed
--- /dev/null
+++ b/js/ui/i18n/jquery.ui.datepicker-fa.js
@@ -0,0 +1,23 @@
+/* Persian (Farsi) Translation for the jQuery UI date picker plugin. */
+/* Javad Mowlanezhad -- jmowla@gmail.com */
+/* Jalali calendar should supported soon! (Its implemented but I have to test it) */
+jQuery(function($) {
+	$.datepicker.regional['fa'] = {
+		closeText: 'بستن',
+		prevText: '&#x3c;قبلي',
+		nextText: 'بعدي&#x3e;',
+		currentText: 'امروز',
+		monthNames: ['فروردين','ارديبهشت','خرداد','تير','مرداد','شهريور',
+		'مهر','آبان','آذر','دي','بهمن','اسفند'],
+		monthNamesShort: ['1','2','3','4','5','6','7','8','9','10','11','12'],
+		dayNames: ['يکشنبه','دوشنبه','سه‌شنبه','چهارشنبه','پنجشنبه','جمعه','شنبه'],
+		dayNamesShort: ['ي','د','س','چ','پ','ج', 'ش'],
+		dayNamesMin: ['ي','د','س','چ','پ','ج', 'ش'],
+		weekHeader: 'هف',
+		dateFormat: 'yy/mm/dd',
+		firstDay: 6,
+		isRTL: true,
+		showMonthAfterYear: false,
+		yearSuffix: ''};
+	$.datepicker.setDefaults($.datepicker.regional['fa']);
+});
\ No newline at end of file
diff --git a/js/ui/i18n/jquery.ui.datepicker-fi.js b/js/ui/i18n/jquery.ui.datepicker-fi.js
new file mode 100644
index 0000000000..e1f25fd84c
--- /dev/null
+++ b/js/ui/i18n/jquery.ui.datepicker-fi.js
@@ -0,0 +1,23 @@
+/* Finnish initialisation for the jQuery UI date picker plugin. */
+/* Written by Harri Kilpi� (harrikilpio@gmail.com). */
+jQuery(function($){
+    $.datepicker.regional['fi'] = {
+		closeText: 'Sulje',
+		prevText: '&laquo;Edellinen',
+		nextText: 'Seuraava&raquo;',
+		currentText: 'T&auml;n&auml;&auml;n',
+        monthNames: ['Tammikuu','Helmikuu','Maaliskuu','Huhtikuu','Toukokuu','Kes&auml;kuu',
+        'Hein&auml;kuu','Elokuu','Syyskuu','Lokakuu','Marraskuu','Joulukuu'],
+        monthNamesShort: ['Tammi','Helmi','Maalis','Huhti','Touko','Kes&auml;',
+        'Hein&auml;','Elo','Syys','Loka','Marras','Joulu'],
+		dayNamesShort: ['Su','Ma','Ti','Ke','To','Pe','Su'],
+		dayNames: ['Sunnuntai','Maanantai','Tiistai','Keskiviikko','Torstai','Perjantai','Lauantai'],
+		dayNamesMin: ['Su','Ma','Ti','Ke','To','Pe','La'],
+		weekHeader: 'Vk',
+        dateFormat: 'dd.mm.yy',
+		firstDay: 1,
+		isRTL: false,
+		showMonthAfterYear: false,
+		yearSuffix: ''};
+    $.datepicker.setDefaults($.datepicker.regional['fi']);
+});
diff --git a/js/ui/i18n/jquery.ui.datepicker-fo.js b/js/ui/i18n/jquery.ui.datepicker-fo.js
new file mode 100644
index 0000000000..c14362216e
--- /dev/null
+++ b/js/ui/i18n/jquery.ui.datepicker-fo.js
@@ -0,0 +1,23 @@
+/* Faroese initialisation for the jQuery UI date picker plugin */
+/* Written by Sverri Mohr Olsen, sverrimo@gmail.com */
+jQuery(function($){
+	$.datepicker.regional['fo'] = {
+		closeText: 'Lat aftur',
+		prevText: '&#x3c;Fyrra',
+		nextText: 'Næsta&#x3e;',
+		currentText: 'Í dag',
+		monthNames: ['Januar','Februar','Mars','Apríl','Mei','Juni',
+		'Juli','August','September','Oktober','November','Desember'],
+		monthNamesShort: ['Jan','Feb','Mar','Apr','Mei','Jun',
+		'Jul','Aug','Sep','Okt','Nov','Des'],
+		dayNames: ['Sunnudagur','Mánadagur','Týsdagur','Mikudagur','Hósdagur','Fríggjadagur','Leyardagur'],
+		dayNamesShort: ['Sun','Mán','Týs','Mik','Hós','Frí','Ley'],
+		dayNamesMin: ['Su','Má','Tý','Mi','Hó','Fr','Le'],
+		weekHeader: 'Vk',
+		dateFormat: 'dd-mm-yy',
+		firstDay: 0,
+		isRTL: false,
+		showMonthAfterYear: false,
+		yearSuffix: ''};
+	$.datepicker.setDefaults($.datepicker.regional['fo']);
+});
diff --git a/js/ui/i18n/jquery.ui.datepicker-fr-CH.js b/js/ui/i18n/jquery.ui.datepicker-fr-CH.js
new file mode 100644
index 0000000000..38212d5482
--- /dev/null
+++ b/js/ui/i18n/jquery.ui.datepicker-fr-CH.js
@@ -0,0 +1,23 @@
+/* Swiss-French initialisation for the jQuery UI date picker plugin. */
+/* Written Martin Voelkle (martin.voelkle@e-tc.ch). */
+jQuery(function($){
+	$.datepicker.regional['fr-CH'] = {
+		closeText: 'Fermer',
+		prevText: '&#x3c;Préc',
+		nextText: 'Suiv&#x3e;',
+		currentText: 'Courant',
+		monthNames: ['Janvier','Février','Mars','Avril','Mai','Juin',
+		'Juillet','Août','Septembre','Octobre','Novembre','Décembre'],
+		monthNamesShort: ['Jan','Fév','Mar','Avr','Mai','Jun',
+		'Jul','Aoû','Sep','Oct','Nov','Déc'],
+		dayNames: ['Dimanche','Lundi','Mardi','Mercredi','Jeudi','Vendredi','Samedi'],
+		dayNamesShort: ['Dim','Lun','Mar','Mer','Jeu','Ven','Sam'],
+		dayNamesMin: ['Di','Lu','Ma','Me','Je','Ve','Sa'],
+		weekHeader: 'Sm',
+		dateFormat: 'dd.mm.yy',
+		firstDay: 1,
+		isRTL: false,
+		showMonthAfterYear: false,
+		yearSuffix: ''};
+	$.datepicker.setDefaults($.datepicker.regional['fr-CH']);
+});
\ No newline at end of file
diff --git a/js/ui/i18n/jquery.ui.datepicker-fr.js b/js/ui/i18n/jquery.ui.datepicker-fr.js
new file mode 100644
index 0000000000..74ea1c231a
--- /dev/null
+++ b/js/ui/i18n/jquery.ui.datepicker-fr.js
@@ -0,0 +1,25 @@
+/* French initialisation for the jQuery UI date picker plugin. */
+/* Written by Keith Wood (kbwood{at}iinet.com.au),
+              Stéphane Nahmani (sholby@sholby.net),
+              Stéphane Raimbault <stephane.raimbault@gmail.com> */
+jQuery(function($){
+	$.datepicker.regional['fr'] = {
+		closeText: 'Fermer',
+		prevText: 'Précédent',
+		nextText: 'Suivant',
+		currentText: 'Aujourd\'hui',
+		monthNames: ['Janvier','Février','Mars','Avril','Mai','Juin',
+		'Juillet','Août','Septembre','Octobre','Novembre','Décembre'],
+		monthNamesShort: ['Janv.','Févr.','Mars','Avril','Mai','Juin',
+		'Juil.','Août','Sept.','Oct.','Nov.','Déc.'],
+		dayNames: ['Dimanche','Lundi','Mardi','Mercredi','Jeudi','Vendredi','Samedi'],
+		dayNamesShort: ['Dim.','Lun.','Mar.','Mer.','Jeu.','Ven.','Sam.'],
+		dayNamesMin: ['D','L','M','M','J','V','S'],
+		weekHeader: 'Sem.',
+		dateFormat: 'dd/mm/yy',
+		firstDay: 1,
+		isRTL: false,
+		showMonthAfterYear: false,
+		yearSuffix: ''};
+	$.datepicker.setDefaults($.datepicker.regional['fr']);
+});
diff --git a/js/ui/i18n/jquery.ui.datepicker-gl.js b/js/ui/i18n/jquery.ui.datepicker-gl.js
new file mode 100644
index 0000000000..278403e8f1
--- /dev/null
+++ b/js/ui/i18n/jquery.ui.datepicker-gl.js
@@ -0,0 +1,23 @@
+/* Galician localization for 'UI date picker' jQuery extension. */
+/* Translated by Jorge Barreiro <yortx.barry@gmail.com>. */
+jQuery(function($){
+	$.datepicker.regional['gl'] = {
+		closeText: 'Pechar',
+		prevText: '&#x3c;Ant',
+		nextText: 'Seg&#x3e;',
+		currentText: 'Hoxe',
+		monthNames: ['Xaneiro','Febreiro','Marzo','Abril','Maio','Xuño',
+		'Xullo','Agosto','Setembro','Outubro','Novembro','Decembro'],
+		monthNamesShort: ['Xan','Feb','Mar','Abr','Mai','Xuñ',
+		'Xul','Ago','Set','Out','Nov','Dec'],
+		dayNames: ['Domingo','Luns','Martes','M&eacute;rcores','Xoves','Venres','S&aacute;bado'],
+		dayNamesShort: ['Dom','Lun','Mar','M&eacute;r','Xov','Ven','S&aacute;b'],
+		dayNamesMin: ['Do','Lu','Ma','M&eacute;','Xo','Ve','S&aacute;'],
+		weekHeader: 'Sm',
+		dateFormat: 'dd/mm/yy',
+		firstDay: 1,
+		isRTL: false,
+		showMonthAfterYear: false,
+		yearSuffix: ''};
+	$.datepicker.setDefaults($.datepicker.regional['gl']);
+});
\ No newline at end of file
diff --git a/js/ui/i18n/jquery.ui.datepicker-he.js b/js/ui/i18n/jquery.ui.datepicker-he.js
new file mode 100644
index 0000000000..3b3dc387f2
--- /dev/null
+++ b/js/ui/i18n/jquery.ui.datepicker-he.js
@@ -0,0 +1,23 @@
+/* Hebrew initialisation for the UI Datepicker extension. */
+/* Written by Amir Hardon (ahardon at gmail dot com). */
+jQuery(function($){
+	$.datepicker.regional['he'] = {
+		closeText: 'סגור',
+		prevText: '&#x3c;הקודם',
+		nextText: 'הבא&#x3e;',
+		currentText: 'היום',
+		monthNames: ['ינואר','פברואר','מרץ','אפריל','מאי','יוני',
+		'יולי','אוגוסט','ספטמבר','אוקטובר','נובמבר','דצמבר'],
+		monthNamesShort: ['1','2','3','4','5','6',
+		'7','8','9','10','11','12'],
+		dayNames: ['ראשון','שני','שלישי','רביעי','חמישי','שישי','שבת'],
+		dayNamesShort: ['א\'','ב\'','ג\'','ד\'','ה\'','ו\'','שבת'],
+		dayNamesMin: ['א\'','ב\'','ג\'','ד\'','ה\'','ו\'','שבת'],
+		weekHeader: 'Wk',
+		dateFormat: 'dd/mm/yy',
+		firstDay: 0,
+		isRTL: true,
+		showMonthAfterYear: false,
+		yearSuffix: ''};
+	$.datepicker.setDefaults($.datepicker.regional['he']);
+});
diff --git a/js/ui/i18n/jquery.ui.datepicker-hr.js b/js/ui/i18n/jquery.ui.datepicker-hr.js
new file mode 100644
index 0000000000..0285c1aa9b
--- /dev/null
+++ b/js/ui/i18n/jquery.ui.datepicker-hr.js
@@ -0,0 +1,23 @@
+/* Croatian i18n for the jQuery UI date picker plugin. */
+/* Written by Vjekoslav Nesek. */
+jQuery(function($){
+	$.datepicker.regional['hr'] = {
+		closeText: 'Zatvori',
+		prevText: '&#x3c;',
+		nextText: '&#x3e;',
+		currentText: 'Danas',
+		monthNames: ['Siječanj','Veljača','Ožujak','Travanj','Svibanj','Lipanj',
+		'Srpanj','Kolovoz','Rujan','Listopad','Studeni','Prosinac'],
+		monthNamesShort: ['Sij','Velj','Ožu','Tra','Svi','Lip',
+		'Srp','Kol','Ruj','Lis','Stu','Pro'],
+		dayNames: ['Nedjelja','Ponedjeljak','Utorak','Srijeda','Četvrtak','Petak','Subota'],
+		dayNamesShort: ['Ned','Pon','Uto','Sri','Čet','Pet','Sub'],
+		dayNamesMin: ['Ne','Po','Ut','Sr','Če','Pe','Su'],
+		weekHeader: 'Tje',
+		dateFormat: 'dd.mm.yy.',
+		firstDay: 1,
+		isRTL: false,
+		showMonthAfterYear: false,
+		yearSuffix: ''};
+	$.datepicker.setDefaults($.datepicker.regional['hr']);
+});
\ No newline at end of file
diff --git a/js/ui/i18n/jquery.ui.datepicker-hu.js b/js/ui/i18n/jquery.ui.datepicker-hu.js
new file mode 100644
index 0000000000..46e63f59b2
--- /dev/null
+++ b/js/ui/i18n/jquery.ui.datepicker-hu.js
@@ -0,0 +1,23 @@
+/* Hungarian initialisation for the jQuery UI date picker plugin. */
+/* Written by Istvan Karaszi (jquery@spam.raszi.hu). */
+jQuery(function($){
+	$.datepicker.regional['hu'] = {
+		closeText: 'bezárás',
+		prevText: '&laquo;&nbsp;vissza',
+		nextText: 'előre&nbsp;&raquo;',
+		currentText: 'ma',
+		monthNames: ['Január', 'Február', 'Március', 'Április', 'Május', 'Június',
+		'Július', 'Augusztus', 'Szeptember', 'Október', 'November', 'December'],
+		monthNamesShort: ['Jan', 'Feb', 'Már', 'Ápr', 'Máj', 'Jún',
+		'Júl', 'Aug', 'Szep', 'Okt', 'Nov', 'Dec'],
+		dayNames: ['Vasárnap', 'Hétfö', 'Kedd', 'Szerda', 'Csütörtök', 'Péntek', 'Szombat'],
+		dayNamesShort: ['Vas', 'Hét', 'Ked', 'Sze', 'Csü', 'Pén', 'Szo'],
+		dayNamesMin: ['V', 'H', 'K', 'Sze', 'Cs', 'P', 'Szo'],
+		weekHeader: 'Hé',
+		dateFormat: 'yy-mm-dd',
+		firstDay: 1,
+		isRTL: false,
+		showMonthAfterYear: true,
+		yearSuffix: ''};
+	$.datepicker.setDefaults($.datepicker.regional['hu']);
+});
diff --git a/js/ui/i18n/jquery.ui.datepicker-hy.js b/js/ui/i18n/jquery.ui.datepicker-hy.js
new file mode 100644
index 0000000000..c6cc1946c4
--- /dev/null
+++ b/js/ui/i18n/jquery.ui.datepicker-hy.js
@@ -0,0 +1,23 @@
+/* Armenian(UTF-8) initialisation for the jQuery UI date picker plugin. */
+/* Written by Levon Zakaryan (levon.zakaryan@gmail.com)*/
+jQuery(function($){
+	$.datepicker.regional['hy'] = {
+		closeText: 'Փակել',
+		prevText: '&#x3c;Նախ.',
+		nextText: 'Հաջ.&#x3e;',
+		currentText: 'Այսօր',
+		monthNames: ['Հունվար','Փետրվար','Մարտ','Ապրիլ','Մայիս','Հունիս',
+		'Հուլիս','Օգոստոս','Սեպտեմբեր','Հոկտեմբեր','Նոյեմբեր','Դեկտեմբեր'],
+		monthNamesShort: ['Հունվ','Փետր','Մարտ','Ապր','Մայիս','Հունիս',
+		'Հուլ','Օգս','Սեպ','Հոկ','Նոյ','Դեկ'],
+		dayNames: ['կիրակի','եկուշաբթի','երեքշաբթի','չորեքշաբթի','հինգշաբթի','ուրբաթ','շաբաթ'],
+		dayNamesShort: ['կիր','երկ','երք','չրք','հնգ','ուրբ','շբթ'],
+		dayNamesMin: ['կիր','երկ','երք','չրք','հնգ','ուրբ','շբթ'],
+		weekHeader: 'ՇԲՏ',
+		dateFormat: 'dd.mm.yy',
+		firstDay: 1,
+		isRTL: false,
+		showMonthAfterYear: false,
+		yearSuffix: ''};
+	$.datepicker.setDefaults($.datepicker.regional['hy']);
+});
\ No newline at end of file
diff --git a/js/ui/i18n/jquery.ui.datepicker-id.js b/js/ui/i18n/jquery.ui.datepicker-id.js
new file mode 100644
index 0000000000..c626fbb7b8
--- /dev/null
+++ b/js/ui/i18n/jquery.ui.datepicker-id.js
@@ -0,0 +1,23 @@
+/* Indonesian initialisation for the jQuery UI date picker plugin. */
+/* Written by Deden Fathurahman (dedenf@gmail.com). */
+jQuery(function($){
+	$.datepicker.regional['id'] = {
+		closeText: 'Tutup',
+		prevText: '&#x3c;mundur',
+		nextText: 'maju&#x3e;',
+		currentText: 'hari ini',
+		monthNames: ['Januari','Februari','Maret','April','Mei','Juni',
+		'Juli','Agustus','September','Oktober','Nopember','Desember'],
+		monthNamesShort: ['Jan','Feb','Mar','Apr','Mei','Jun',
+		'Jul','Agus','Sep','Okt','Nop','Des'],
+		dayNames: ['Minggu','Senin','Selasa','Rabu','Kamis','Jumat','Sabtu'],
+		dayNamesShort: ['Min','Sen','Sel','Rab','kam','Jum','Sab'],
+		dayNamesMin: ['Mg','Sn','Sl','Rb','Km','jm','Sb'],
+		weekHeader: 'Mg',
+		dateFormat: 'dd/mm/yy',
+		firstDay: 0,
+		isRTL: false,
+		showMonthAfterYear: false,
+		yearSuffix: ''};
+	$.datepicker.setDefaults($.datepicker.regional['id']);
+});
\ No newline at end of file
diff --git a/js/ui/i18n/jquery.ui.datepicker-is.js b/js/ui/i18n/jquery.ui.datepicker-is.js
new file mode 100644
index 0000000000..c53235a49e
--- /dev/null
+++ b/js/ui/i18n/jquery.ui.datepicker-is.js
@@ -0,0 +1,23 @@
+/* Icelandic initialisation for the jQuery UI date picker plugin. */
+/* Written by Haukur H. Thorsson (haukur@eskill.is). */
+jQuery(function($){
+	$.datepicker.regional['is'] = {
+		closeText: 'Loka',
+		prevText: '&#x3c; Fyrri',
+		nextText: 'N&aelig;sti &#x3e;',
+		currentText: '&Iacute; dag',
+		monthNames: ['Jan&uacute;ar','Febr&uacute;ar','Mars','Apr&iacute;l','Ma&iacute','J&uacute;n&iacute;',
+		'J&uacute;l&iacute;','&Aacute;g&uacute;st','September','Okt&oacute;ber','N&oacute;vember','Desember'],
+		monthNamesShort: ['Jan','Feb','Mar','Apr','Ma&iacute;','J&uacute;n',
+		'J&uacute;l','&Aacute;g&uacute;','Sep','Okt','N&oacute;v','Des'],
+		dayNames: ['Sunnudagur','M&aacute;nudagur','&THORN;ri&eth;judagur','Mi&eth;vikudagur','Fimmtudagur','F&ouml;studagur','Laugardagur'],
+		dayNamesShort: ['Sun','M&aacute;n','&THORN;ri','Mi&eth;','Fim','F&ouml;s','Lau'],
+		dayNamesMin: ['Su','M&aacute;','&THORN;r','Mi','Fi','F&ouml;','La'],
+		weekHeader: 'Vika',
+		dateFormat: 'dd/mm/yy',
+		firstDay: 0,
+		isRTL: false,
+		showMonthAfterYear: false,
+		yearSuffix: ''};
+	$.datepicker.setDefaults($.datepicker.regional['is']);
+});
\ No newline at end of file
diff --git a/js/ui/i18n/jquery.ui.datepicker-it.js b/js/ui/i18n/jquery.ui.datepicker-it.js
new file mode 100644
index 0000000000..59da2df671
--- /dev/null
+++ b/js/ui/i18n/jquery.ui.datepicker-it.js
@@ -0,0 +1,23 @@
+/* Italian initialisation for the jQuery UI date picker plugin. */
+/* Written by Antonello Pasella (antonello.pasella@gmail.com). */
+jQuery(function($){
+	$.datepicker.regional['it'] = {
+		closeText: 'Chiudi',
+		prevText: '&#x3c;Prec',
+		nextText: 'Succ&#x3e;',
+		currentText: 'Oggi',
+		monthNames: ['Gennaio','Febbraio','Marzo','Aprile','Maggio','Giugno',
+			'Luglio','Agosto','Settembre','Ottobre','Novembre','Dicembre'],
+		monthNamesShort: ['Gen','Feb','Mar','Apr','Mag','Giu',
+			'Lug','Ago','Set','Ott','Nov','Dic'],
+		dayNames: ['Domenica','Luned&#236','Marted&#236','Mercoled&#236','Gioved&#236','Venerd&#236','Sabato'],
+		dayNamesShort: ['Dom','Lun','Mar','Mer','Gio','Ven','Sab'],
+		dayNamesMin: ['Do','Lu','Ma','Me','Gi','Ve','Sa'],
+		weekHeader: 'Sm',
+		dateFormat: 'dd/mm/yy',
+		firstDay: 1,
+		isRTL: false,
+		showMonthAfterYear: false,
+		yearSuffix: ''};
+	$.datepicker.setDefaults($.datepicker.regional['it']);
+});
diff --git a/js/ui/i18n/jquery.ui.datepicker-ja.js b/js/ui/i18n/jquery.ui.datepicker-ja.js
new file mode 100644
index 0000000000..79cd827c76
--- /dev/null
+++ b/js/ui/i18n/jquery.ui.datepicker-ja.js
@@ -0,0 +1,23 @@
+/* Japanese initialisation for the jQuery UI date picker plugin. */
+/* Written by Kentaro SATO (kentaro@ranvis.com). */
+jQuery(function($){
+	$.datepicker.regional['ja'] = {
+		closeText: '閉じる',
+		prevText: '&#x3c;前',
+		nextText: '次&#x3e;',
+		currentText: '今日',
+		monthNames: ['1月','2月','3月','4月','5月','6月',
+		'7月','8月','9月','10月','11月','12月'],
+		monthNamesShort: ['1月','2月','3月','4月','5月','6月',
+		'7月','8月','9月','10月','11月','12月'],
+		dayNames: ['日曜日','月曜日','火曜日','水曜日','木曜日','金曜日','土曜日'],
+		dayNamesShort: ['日','月','火','水','木','金','土'],
+		dayNamesMin: ['日','月','火','水','木','金','土'],
+		weekHeader: '週',
+		dateFormat: 'yy/mm/dd',
+		firstDay: 0,
+		isRTL: false,
+		showMonthAfterYear: true,
+		yearSuffix: '年'};
+	$.datepicker.setDefaults($.datepicker.regional['ja']);
+});
\ No newline at end of file
diff --git a/js/ui/i18n/jquery.ui.datepicker-ko.js b/js/ui/i18n/jquery.ui.datepicker-ko.js
new file mode 100644
index 0000000000..5b3531652d
--- /dev/null
+++ b/js/ui/i18n/jquery.ui.datepicker-ko.js
@@ -0,0 +1,23 @@
+/* Korean initialisation for the jQuery calendar extension. */
+/* Written by DaeKwon Kang (ncrash.dk@gmail.com). */
+jQuery(function($){
+	$.datepicker.regional['ko'] = {
+		closeText: '닫기',
+		prevText: '이전달',
+		nextText: '다음달',
+		currentText: '오늘',
+		monthNames: ['1월(JAN)','2월(FEB)','3월(MAR)','4월(APR)','5월(MAY)','6월(JUN)',
+		'7월(JUL)','8월(AUG)','9월(SEP)','10월(OCT)','11월(NOV)','12월(DEC)'],
+		monthNamesShort: ['1월(JAN)','2월(FEB)','3월(MAR)','4월(APR)','5월(MAY)','6월(JUN)',
+		'7월(JUL)','8월(AUG)','9월(SEP)','10월(OCT)','11월(NOV)','12월(DEC)'],
+		dayNames: ['일','월','화','수','목','금','토'],
+		dayNamesShort: ['일','월','화','수','목','금','토'],
+		dayNamesMin: ['일','월','화','수','목','금','토'],
+		weekHeader: 'Wk',
+		dateFormat: 'yy-mm-dd',
+		firstDay: 0,
+		isRTL: false,
+		showMonthAfterYear: false,
+		yearSuffix: '년'};
+	$.datepicker.setDefaults($.datepicker.regional['ko']);
+});
\ No newline at end of file
diff --git a/js/ui/i18n/jquery.ui.datepicker-kz.js b/js/ui/i18n/jquery.ui.datepicker-kz.js
new file mode 100644
index 0000000000..f1f897b006
--- /dev/null
+++ b/js/ui/i18n/jquery.ui.datepicker-kz.js
@@ -0,0 +1,23 @@
+/* Kazakh (UTF-8) initialisation for the jQuery UI date picker plugin. */
+/* Written by Dmitriy Karasyov (dmitriy.karasyov@gmail.com). */
+jQuery(function($){
+	$.datepicker.regional['kz'] = {
+		closeText: 'Жабу',
+		prevText: '&#x3c;Алдыңғы',
+		nextText: 'Келесі&#x3e;',
+		currentText: 'Бүгін',
+		monthNames: ['Қаңтар','Ақпан','Наурыз','Сәуір','Мамыр','Маусым',
+		'Шілде','Тамыз','Қыркүйек','Қазан','Қараша','Желтоқсан'],
+		monthNamesShort: ['Қаң','Ақп','Нау','Сәу','Мам','Мау',
+		'Шіл','Там','Қыр','Қаз','Қар','Жел'],
+		dayNames: ['Жексенбі','Дүйсенбі','Сейсенбі','Сәрсенбі','Бейсенбі','Жұма','Сенбі'],
+		dayNamesShort: ['жкс','дсн','ссн','срс','бсн','жма','снб'],
+		dayNamesMin: ['Жк','Дс','Сс','Ср','Бс','Жм','Сн'],
+		weekHeader: 'Не',
+		dateFormat: 'dd.mm.yy',
+		firstDay: 1,
+		isRTL: false,
+		showMonthAfterYear: false,
+		yearSuffix: ''};
+	$.datepicker.setDefaults($.datepicker.regional['kz']);
+});
diff --git a/js/ui/i18n/jquery.ui.datepicker-lt.js b/js/ui/i18n/jquery.ui.datepicker-lt.js
new file mode 100644
index 0000000000..67d5119ca7
--- /dev/null
+++ b/js/ui/i18n/jquery.ui.datepicker-lt.js
@@ -0,0 +1,23 @@
+/* Lithuanian (UTF-8) initialisation for the jQuery UI date picker plugin. */
+/* @author Arturas Paleicikas <arturas@avalon.lt> */
+jQuery(function($){
+	$.datepicker.regional['lt'] = {
+		closeText: 'Uždaryti',
+		prevText: '&#x3c;Atgal',
+		nextText: 'Pirmyn&#x3e;',
+		currentText: 'Šiandien',
+		monthNames: ['Sausis','Vasaris','Kovas','Balandis','Gegužė','Birželis',
+		'Liepa','Rugpjūtis','Rugsėjis','Spalis','Lapkritis','Gruodis'],
+		monthNamesShort: ['Sau','Vas','Kov','Bal','Geg','Bir',
+		'Lie','Rugp','Rugs','Spa','Lap','Gru'],
+		dayNames: ['sekmadienis','pirmadienis','antradienis','trečiadienis','ketvirtadienis','penktadienis','šeštadienis'],
+		dayNamesShort: ['sek','pir','ant','tre','ket','pen','šeš'],
+		dayNamesMin: ['Se','Pr','An','Tr','Ke','Pe','Še'],
+		weekHeader: 'Wk',
+		dateFormat: 'yy-mm-dd',
+		firstDay: 1,
+		isRTL: false,
+		showMonthAfterYear: false,
+		yearSuffix: ''};
+	$.datepicker.setDefaults($.datepicker.regional['lt']);
+});
\ No newline at end of file
diff --git a/js/ui/i18n/jquery.ui.datepicker-lv.js b/js/ui/i18n/jquery.ui.datepicker-lv.js
new file mode 100644
index 0000000000..003934e721
--- /dev/null
+++ b/js/ui/i18n/jquery.ui.datepicker-lv.js
@@ -0,0 +1,23 @@
+/* Latvian (UTF-8) initialisation for the jQuery UI date picker plugin. */
+/* @author Arturas Paleicikas <arturas.paleicikas@metasite.net> */
+jQuery(function($){
+	$.datepicker.regional['lv'] = {
+		closeText: 'Aizvērt',
+		prevText: 'Iepr',
+		nextText: 'Nāka',
+		currentText: 'Šodien',
+		monthNames: ['Janvāris','Februāris','Marts','Aprīlis','Maijs','Jūnijs',
+		'Jūlijs','Augusts','Septembris','Oktobris','Novembris','Decembris'],
+		monthNamesShort: ['Jan','Feb','Mar','Apr','Mai','Jūn',
+		'Jūl','Aug','Sep','Okt','Nov','Dec'],
+		dayNames: ['svētdiena','pirmdiena','otrdiena','trešdiena','ceturtdiena','piektdiena','sestdiena'],
+		dayNamesShort: ['svt','prm','otr','tre','ctr','pkt','sst'],
+		dayNamesMin: ['Sv','Pr','Ot','Tr','Ct','Pk','Ss'],
+		weekHeader: 'Nav',
+		dateFormat: 'dd-mm-yy',
+		firstDay: 1,
+		isRTL: false,
+		showMonthAfterYear: false,
+		yearSuffix: ''};
+	$.datepicker.setDefaults($.datepicker.regional['lv']);
+});
\ No newline at end of file
diff --git a/js/ui/i18n/jquery.ui.datepicker-ml.js b/js/ui/i18n/jquery.ui.datepicker-ml.js
new file mode 100644
index 0000000000..753dba411d
--- /dev/null
+++ b/js/ui/i18n/jquery.ui.datepicker-ml.js
@@ -0,0 +1,23 @@
+/* Malayalam (UTF-8) initialisation for the jQuery UI date picker plugin. */
+/* Written by Saji Nediyanchath (saji89@gmail.com). */
+jQuery(function($){
+	$.datepicker.regional['ml'] = {
+		closeText: 'ശരി',
+		prevText: 'മുന്നത്തെ',  
+		nextText: 'അടുത്തത് ',
+		currentText: 'ഇന്ന്',
+		monthNames: ['ജനുവരി','ഫെബ്രുവരി','മാര്‍ച്ച്','ഏപ്രില്‍','മേയ്','ജൂണ്‍',
+		'ജൂലൈ','ആഗസ്റ്റ്','സെപ്റ്റംബര്‍','ഒക്ടോബര്‍','നവംബര്‍','ഡിസംബര്‍'],
+		monthNamesShort: ['ജനു', 'ഫെബ്', 'മാര്‍', 'ഏപ്രി', 'മേയ്', 'ജൂണ്‍',
+		'ജൂലാ', 'ആഗ', 'സെപ്', 'ഒക്ടോ', 'നവം', 'ഡിസ'],
+		dayNames: ['ഞായര്‍', 'തിങ്കള്‍', 'ചൊവ്വ', 'ബുധന്‍', 'വ്യാഴം', 'വെള്ളി', 'ശനി'],
+		dayNamesShort: ['ഞായ', 'തിങ്ക', 'ചൊവ്വ', 'ബുധ', 'വ്യാഴം', 'വെള്ളി', 'ശനി'],
+		dayNamesMin: ['ഞാ','തി','ചൊ','ബു','വ്യാ','വെ','ശ'],
+		weekHeader: 'ആ',
+		dateFormat: 'dd/mm/yy',
+		firstDay: 1,
+		isRTL: false,
+		showMonthAfterYear: false,
+		yearSuffix: ''};
+	$.datepicker.setDefaults($.datepicker.regional['ml']);
+});
diff --git a/js/ui/i18n/jquery.ui.datepicker-ms.js b/js/ui/i18n/jquery.ui.datepicker-ms.js
new file mode 100644
index 0000000000..e953ac04f1
--- /dev/null
+++ b/js/ui/i18n/jquery.ui.datepicker-ms.js
@@ -0,0 +1,23 @@
+/* Malaysian initialisation for the jQuery UI date picker plugin. */
+/* Written by Mohd Nawawi Mohamad Jamili (nawawi@ronggeng.net). */
+jQuery(function($){
+	$.datepicker.regional['ms'] = {
+		closeText: 'Tutup',
+		prevText: '&#x3c;Sebelum',
+		nextText: 'Selepas&#x3e;',
+		currentText: 'hari ini',
+		monthNames: ['Januari','Februari','Mac','April','Mei','Jun',
+		'Julai','Ogos','September','Oktober','November','Disember'],
+		monthNamesShort: ['Jan','Feb','Mac','Apr','Mei','Jun',
+		'Jul','Ogo','Sep','Okt','Nov','Dis'],
+		dayNames: ['Ahad','Isnin','Selasa','Rabu','Khamis','Jumaat','Sabtu'],
+		dayNamesShort: ['Aha','Isn','Sel','Rab','kha','Jum','Sab'],
+		dayNamesMin: ['Ah','Is','Se','Ra','Kh','Ju','Sa'],
+		weekHeader: 'Mg',
+		dateFormat: 'dd/mm/yy',
+		firstDay: 0,
+		isRTL: false,
+		showMonthAfterYear: false,
+		yearSuffix: ''};
+	$.datepicker.setDefaults($.datepicker.regional['ms']);
+});
\ No newline at end of file
diff --git a/js/ui/i18n/jquery.ui.datepicker-nl.js b/js/ui/i18n/jquery.ui.datepicker-nl.js
new file mode 100644
index 0000000000..663d6bb26b
--- /dev/null
+++ b/js/ui/i18n/jquery.ui.datepicker-nl.js
@@ -0,0 +1,23 @@
+/* Dutch (UTF-8) initialisation for the jQuery UI date picker plugin. */
+/* Written by Mathias Bynens <http://mathiasbynens.be/> */
+jQuery(function($){
+	$.datepicker.regional.nl = {
+		closeText: 'Sluiten',
+		prevText: '←',
+		nextText: '→',
+		currentText: 'Vandaag',
+		monthNames: ['januari', 'februari', 'maart', 'april', 'mei', 'juni',
+		'juli', 'augustus', 'september', 'oktober', 'november', 'december'],
+		monthNamesShort: ['jan', 'feb', 'maa', 'apr', 'mei', 'jun',
+		'jul', 'aug', 'sep', 'okt', 'nov', 'dec'],
+		dayNames: ['zondag', 'maandag', 'dinsdag', 'woensdag', 'donderdag', 'vrijdag', 'zaterdag'],
+		dayNamesShort: ['zon', 'maa', 'din', 'woe', 'don', 'vri', 'zat'],
+		dayNamesMin: ['zo', 'ma', 'di', 'wo', 'do', 'vr', 'za'],
+		weekHeader: 'Wk',
+		dateFormat: 'dd/mm/yy',
+		firstDay: 1,
+		isRTL: false,
+		showMonthAfterYear: false,
+		yearSuffix: ''};
+	$.datepicker.setDefaults($.datepicker.regional.nl);
+});
\ No newline at end of file
diff --git a/js/ui/i18n/jquery.ui.datepicker-no.js b/js/ui/i18n/jquery.ui.datepicker-no.js
new file mode 100644
index 0000000000..2507043a3f
--- /dev/null
+++ b/js/ui/i18n/jquery.ui.datepicker-no.js
@@ -0,0 +1,23 @@
+/* Norwegian initialisation for the jQuery UI date picker plugin. */
+/* Written by Naimdjon Takhirov (naimdjon@gmail.com). */
+
+jQuery(function($){
+  $.datepicker.regional['no'] = {
+    closeText: 'Lukk',
+    prevText: '&laquo;Forrige',
+    nextText: 'Neste&raquo;',
+    currentText: 'I dag',
+    monthNames: ['januar','februar','mars','april','mai','juni','juli','august','september','oktober','november','desember'],
+    monthNamesShort: ['jan','feb','mar','apr','mai','jun','jul','aug','sep','okt','nov','des'],
+    dayNamesShort: ['søn','man','tir','ons','tor','fre','lør'],
+    dayNames: ['søndag','mandag','tirsdag','onsdag','torsdag','fredag','lørdag'],
+    dayNamesMin: ['sø','ma','ti','on','to','fr','lø'],
+    weekHeader: 'Uke',
+    dateFormat: 'dd.mm.yy',
+    firstDay: 1,
+    isRTL: false,
+    showMonthAfterYear: false,
+    yearSuffix: ''
+  };
+  $.datepicker.setDefaults($.datepicker.regional['no']);
+});
diff --git a/js/ui/i18n/jquery.ui.datepicker-pl.js b/js/ui/i18n/jquery.ui.datepicker-pl.js
new file mode 100644
index 0000000000..61fa29ccd8
--- /dev/null
+++ b/js/ui/i18n/jquery.ui.datepicker-pl.js
@@ -0,0 +1,23 @@
+/* Polish initialisation for the jQuery UI date picker plugin. */
+/* Written by Jacek Wysocki (jacek.wysocki@gmail.com). */
+jQuery(function($){
+	$.datepicker.regional['pl'] = {
+		closeText: 'Zamknij',
+		prevText: '&#x3c;Poprzedni',
+		nextText: 'Następny&#x3e;',
+		currentText: 'Dziś',
+		monthNames: ['Styczeń','Luty','Marzec','Kwiecień','Maj','Czerwiec',
+		'Lipiec','Sierpień','Wrzesień','Październik','Listopad','Grudzień'],
+		monthNamesShort: ['Sty','Lu','Mar','Kw','Maj','Cze',
+		'Lip','Sie','Wrz','Pa','Lis','Gru'],
+		dayNames: ['Niedziela','Poniedziałek','Wtorek','Środa','Czwartek','Piątek','Sobota'],
+		dayNamesShort: ['Nie','Pn','Wt','Śr','Czw','Pt','So'],
+		dayNamesMin: ['N','Pn','Wt','Śr','Cz','Pt','So'],
+		weekHeader: 'Tydz',
+		dateFormat: 'dd.mm.yy',
+		firstDay: 1,
+		isRTL: false,
+		showMonthAfterYear: false,
+		yearSuffix: ''};
+	$.datepicker.setDefaults($.datepicker.regional['pl']);
+});
diff --git a/js/ui/i18n/jquery.ui.datepicker-pt-BR.js b/js/ui/i18n/jquery.ui.datepicker-pt-BR.js
new file mode 100644
index 0000000000..3cc8c796c8
--- /dev/null
+++ b/js/ui/i18n/jquery.ui.datepicker-pt-BR.js
@@ -0,0 +1,23 @@
+/* Brazilian initialisation for the jQuery UI date picker plugin. */
+/* Written by Leonildo Costa Silva (leocsilva@gmail.com). */
+jQuery(function($){
+	$.datepicker.regional['pt-BR'] = {
+		closeText: 'Fechar',
+		prevText: '&#x3c;Anterior',
+		nextText: 'Pr&oacute;ximo&#x3e;',
+		currentText: 'Hoje',
+		monthNames: ['Janeiro','Fevereiro','Mar&ccedil;o','Abril','Maio','Junho',
+		'Julho','Agosto','Setembro','Outubro','Novembro','Dezembro'],
+		monthNamesShort: ['Jan','Fev','Mar','Abr','Mai','Jun',
+		'Jul','Ago','Set','Out','Nov','Dez'],
+		dayNames: ['Domingo','Segunda-feira','Ter&ccedil;a-feira','Quarta-feira','Quinta-feira','Sexta-feira','S&aacute;bado'],
+		dayNamesShort: ['Dom','Seg','Ter','Qua','Qui','Sex','S&aacute;b'],
+		dayNamesMin: ['Dom','Seg','Ter','Qua','Qui','Sex','S&aacute;b'],
+		weekHeader: 'Sm',
+		dateFormat: 'dd/mm/yy',
+		firstDay: 0,
+		isRTL: false,
+		showMonthAfterYear: false,
+		yearSuffix: ''};
+	$.datepicker.setDefaults($.datepicker.regional['pt-BR']);
+});
\ No newline at end of file
diff --git a/js/ui/i18n/jquery.ui.datepicker-pt.js b/js/ui/i18n/jquery.ui.datepicker-pt.js
new file mode 100644
index 0000000000..f09f5aeb00
--- /dev/null
+++ b/js/ui/i18n/jquery.ui.datepicker-pt.js
@@ -0,0 +1,22 @@
+/* Portuguese initialisation for the jQuery UI date picker plugin. */
+jQuery(function($){
+	$.datepicker.regional['pt'] = {
+		closeText: 'Fechar',
+		prevText: '&#x3c;Anterior',
+		nextText: 'Seguinte',
+		currentText: 'Hoje',
+		monthNames: ['Janeiro','Fevereiro','Mar&ccedil;o','Abril','Maio','Junho',
+		'Julho','Agosto','Setembro','Outubro','Novembro','Dezembro'],
+		monthNamesShort: ['Jan','Fev','Mar','Abr','Mai','Jun',
+		'Jul','Ago','Set','Out','Nov','Dez'],
+		dayNames: ['Domingo','Segunda-feira','Ter&ccedil;a-feira','Quarta-feira','Quinta-feira','Sexta-feira','S&aacute;bado'],
+		dayNamesShort: ['Dom','Seg','Ter','Qua','Qui','Sex','S&aacute;b'],
+		dayNamesMin: ['Dom','Seg','Ter','Qua','Qui','Sex','S&aacute;b'],
+		weekHeader: 'Sem',
+		dateFormat: 'dd/mm/yy',
+		firstDay: 0,
+		isRTL: false,
+		showMonthAfterYear: false,
+		yearSuffix: ''};
+	$.datepicker.setDefaults($.datepicker.regional['pt']);
+});
\ No newline at end of file
diff --git a/js/ui/i18n/jquery.ui.datepicker-rm.js b/js/ui/i18n/jquery.ui.datepicker-rm.js
new file mode 100644
index 0000000000..cf03cd4c1a
--- /dev/null
+++ b/js/ui/i18n/jquery.ui.datepicker-rm.js
@@ -0,0 +1,21 @@
+/* Romansh initialisation for the jQuery UI date picker plugin. */
+/* Written by Yvonne Gienal (yvonne.gienal@educa.ch). */
+jQuery(function($){
+	$.datepicker.regional['rm'] = {
+		closeText: 'Serrar',
+		prevText: '&#x3c;Suandant',
+		nextText: 'Precedent&#x3e;',
+		currentText: 'Actual',
+		monthNames: ['Schaner','Favrer','Mars','Avrigl','Matg','Zercladur', 'Fanadur','Avust','Settember','October','November','December'],
+		monthNamesShort: ['Scha','Fev','Mar','Avr','Matg','Zer', 'Fan','Avu','Sett','Oct','Nov','Dec'],
+		dayNames: ['Dumengia','Glindesdi','Mardi','Mesemna','Gievgia','Venderdi','Sonda'],
+		dayNamesShort: ['Dum','Gli','Mar','Mes','Gie','Ven','Som'],
+		dayNamesMin: ['Du','Gl','Ma','Me','Gi','Ve','So'],
+		weekHeader: 'emna',
+		dateFormat: 'dd/mm/yy',
+		firstDay: 1,
+		isRTL: false,
+		showMonthAfterYear: false,
+		yearSuffix: ''};
+	$.datepicker.setDefaults($.datepicker.regional['rm']);
+});
diff --git a/js/ui/i18n/jquery.ui.datepicker-ro.js b/js/ui/i18n/jquery.ui.datepicker-ro.js
new file mode 100644
index 0000000000..4fe95aeac1
--- /dev/null
+++ b/js/ui/i18n/jquery.ui.datepicker-ro.js
@@ -0,0 +1,26 @@
+/* Romanian initialisation for the jQuery UI date picker plugin.
+ *
+ * Written by Edmond L. (ll_edmond@walla.com)
+ * and Ionut G. Stan (ionut.g.stan@gmail.com)
+ */
+jQuery(function($){
+	$.datepicker.regional['ro'] = {
+		closeText: 'Închide',
+		prevText: '&laquo; Luna precedentă',
+		nextText: 'Luna următoare &raquo;',
+		currentText: 'Azi',
+		monthNames: ['Ianuarie','Februarie','Martie','Aprilie','Mai','Iunie',
+		'Iulie','August','Septembrie','Octombrie','Noiembrie','Decembrie'],
+		monthNamesShort: ['Ian', 'Feb', 'Mar', 'Apr', 'Mai', 'Iun',
+		'Iul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'],
+		dayNames: ['Duminică', 'Luni', 'Marţi', 'Miercuri', 'Joi', 'Vineri', 'Sâmbătă'],
+		dayNamesShort: ['Dum', 'Lun', 'Mar', 'Mie', 'Joi', 'Vin', 'Sâm'],
+		dayNamesMin: ['Du','Lu','Ma','Mi','Jo','Vi','Sâ'],
+		weekHeader: 'Săpt',
+		dateFormat: 'dd.mm.yy',
+		firstDay: 1,
+		isRTL: false,
+		showMonthAfterYear: false,
+		yearSuffix: ''};
+	$.datepicker.setDefaults($.datepicker.regional['ro']);
+});
diff --git a/js/ui/i18n/jquery.ui.datepicker-ru.js b/js/ui/i18n/jquery.ui.datepicker-ru.js
new file mode 100644
index 0000000000..50a4613523
--- /dev/null
+++ b/js/ui/i18n/jquery.ui.datepicker-ru.js
@@ -0,0 +1,23 @@
+/* Russian (UTF-8) initialisation for the jQuery UI date picker plugin. */
+/* Written by Andrew Stromnov (stromnov@gmail.com). */
+jQuery(function($){
+	$.datepicker.regional['ru'] = {
+		closeText: 'Закрыть',
+		prevText: '&#x3c;Пред',
+		nextText: 'След&#x3e;',
+		currentText: 'Сегодня',
+		monthNames: ['Январь','Февраль','Март','Апрель','Май','Июнь',
+		'Июль','Август','Сентябрь','Октябрь','Ноябрь','Декабрь'],
+		monthNamesShort: ['Янв','Фев','Мар','Апр','Май','Июн',
+		'Июл','Авг','Сен','Окт','Ноя','Дек'],
+		dayNames: ['воскресенье','понедельник','вторник','среда','четверг','пятница','суббота'],
+		dayNamesShort: ['вск','пнд','втр','срд','чтв','птн','сбт'],
+		dayNamesMin: ['Вс','Пн','Вт','Ср','Чт','Пт','Сб'],
+		weekHeader: 'Нед',
+		dateFormat: 'dd.mm.yy',
+		firstDay: 1,
+		isRTL: false,
+		showMonthAfterYear: false,
+		yearSuffix: ''};
+	$.datepicker.setDefaults($.datepicker.regional['ru']);
+});
\ No newline at end of file
diff --git a/js/ui/i18n/jquery.ui.datepicker-sk.js b/js/ui/i18n/jquery.ui.datepicker-sk.js
new file mode 100644
index 0000000000..8a6771c1e0
--- /dev/null
+++ b/js/ui/i18n/jquery.ui.datepicker-sk.js
@@ -0,0 +1,23 @@
+/* Slovak initialisation for the jQuery UI date picker plugin. */
+/* Written by Vojtech Rinik (vojto@hmm.sk). */
+jQuery(function($){
+	$.datepicker.regional['sk'] = {
+		closeText: 'Zavrieť',
+		prevText: '&#x3c;Predchádzajúci',
+		nextText: 'Nasledujúci&#x3e;',
+		currentText: 'Dnes',
+		monthNames: ['Január','Február','Marec','Apríl','Máj','Jún',
+		'Júl','August','September','Október','November','December'],
+		monthNamesShort: ['Jan','Feb','Mar','Apr','Máj','Jún',
+		'Júl','Aug','Sep','Okt','Nov','Dec'],
+		dayNames: ['Nedel\'a','Pondelok','Utorok','Streda','Štvrtok','Piatok','Sobota'],
+		dayNamesShort: ['Ned','Pon','Uto','Str','Štv','Pia','Sob'],
+		dayNamesMin: ['Ne','Po','Ut','St','Št','Pia','So'],
+		weekHeader: 'Ty',
+		dateFormat: 'dd.mm.yy',
+		firstDay: 1,
+		isRTL: false,
+		showMonthAfterYear: false,
+		yearSuffix: ''};
+	$.datepicker.setDefaults($.datepicker.regional['sk']);
+});
diff --git a/js/ui/i18n/jquery.ui.datepicker-sl.js b/js/ui/i18n/jquery.ui.datepicker-sl.js
new file mode 100644
index 0000000000..516550192a
--- /dev/null
+++ b/js/ui/i18n/jquery.ui.datepicker-sl.js
@@ -0,0 +1,24 @@
+/* Slovenian initialisation for the jQuery UI date picker plugin. */
+/* Written by Jaka Jancar (jaka@kubje.org). */
+/* c = &#x10D;, s = &#x161; z = &#x17E; C = &#x10C; S = &#x160; Z = &#x17D; */
+jQuery(function($){
+	$.datepicker.regional['sl'] = {
+		closeText: 'Zapri',
+		prevText: '&lt;Prej&#x161;nji',
+		nextText: 'Naslednji&gt;',
+		currentText: 'Trenutni',
+		monthNames: ['Januar','Februar','Marec','April','Maj','Junij',
+		'Julij','Avgust','September','Oktober','November','December'],
+		monthNamesShort: ['Jan','Feb','Mar','Apr','Maj','Jun',
+		'Jul','Avg','Sep','Okt','Nov','Dec'],
+		dayNames: ['Nedelja','Ponedeljek','Torek','Sreda','&#x10C;etrtek','Petek','Sobota'],
+		dayNamesShort: ['Ned','Pon','Tor','Sre','&#x10C;et','Pet','Sob'],
+		dayNamesMin: ['Ne','Po','To','Sr','&#x10C;e','Pe','So'],
+		weekHeader: 'Teden',
+		dateFormat: 'dd.mm.yy',
+		firstDay: 1,
+		isRTL: false,
+		showMonthAfterYear: false,
+		yearSuffix: ''};
+	$.datepicker.setDefaults($.datepicker.regional['sl']);
+});
diff --git a/js/ui/i18n/jquery.ui.datepicker-sq.js b/js/ui/i18n/jquery.ui.datepicker-sq.js
new file mode 100644
index 0000000000..be84104c09
--- /dev/null
+++ b/js/ui/i18n/jquery.ui.datepicker-sq.js
@@ -0,0 +1,23 @@
+/* Albanian initialisation for the jQuery UI date picker plugin. */
+/* Written by Flakron Bytyqi (flakron@gmail.com). */
+jQuery(function($){
+	$.datepicker.regional['sq'] = {
+		closeText: 'mbylle',
+		prevText: '&#x3c;mbrapa',
+		nextText: 'Përpara&#x3e;',
+		currentText: 'sot',
+		monthNames: ['Janar','Shkurt','Mars','Prill','Maj','Qershor',
+		'Korrik','Gusht','Shtator','Tetor','Nëntor','Dhjetor'],
+		monthNamesShort: ['Jan','Shk','Mar','Pri','Maj','Qer',
+		'Kor','Gus','Sht','Tet','Nën','Dhj'],
+		dayNames: ['E Diel','E Hënë','E Martë','E Mërkurë','E Enjte','E Premte','E Shtune'],
+		dayNamesShort: ['Di','Hë','Ma','Më','En','Pr','Sh'],
+		dayNamesMin: ['Di','Hë','Ma','Më','En','Pr','Sh'],
+		weekHeader: 'Ja',
+		dateFormat: 'dd.mm.yy',
+		firstDay: 1,
+		isRTL: false,
+		showMonthAfterYear: false,
+		yearSuffix: ''};
+	$.datepicker.setDefaults($.datepicker.regional['sq']);
+});
diff --git a/js/ui/i18n/jquery.ui.datepicker-sr-SR.js b/js/ui/i18n/jquery.ui.datepicker-sr-SR.js
new file mode 100644
index 0000000000..8f8ea5e630
--- /dev/null
+++ b/js/ui/i18n/jquery.ui.datepicker-sr-SR.js
@@ -0,0 +1,23 @@
+/* Serbian i18n for the jQuery UI date picker plugin. */
+/* Written by Dejan Dimić. */
+jQuery(function($){
+	$.datepicker.regional['sr-SR'] = {
+		closeText: 'Zatvori',
+		prevText: '&#x3c;',
+		nextText: '&#x3e;',
+		currentText: 'Danas',
+		monthNames: ['Januar','Februar','Mart','April','Maj','Jun',
+		'Jul','Avgust','Septembar','Oktobar','Novembar','Decembar'],
+		monthNamesShort: ['Jan','Feb','Mar','Apr','Maj','Jun',
+		'Jul','Avg','Sep','Okt','Nov','Dec'],
+		dayNames: ['Nedelja','Ponedeljak','Utorak','Sreda','Četvrtak','Petak','Subota'],
+		dayNamesShort: ['Ned','Pon','Uto','Sre','Čet','Pet','Sub'],
+		dayNamesMin: ['Ne','Po','Ut','Sr','Če','Pe','Su'],
+		weekHeader: 'Sed',
+		dateFormat: 'dd/mm/yy',
+		firstDay: 1,
+		isRTL: false,
+		showMonthAfterYear: false,
+		yearSuffix: ''};
+	$.datepicker.setDefaults($.datepicker.regional['sr-SR']);
+});
diff --git a/js/ui/i18n/jquery.ui.datepicker-sr.js b/js/ui/i18n/jquery.ui.datepicker-sr.js
new file mode 100644
index 0000000000..49c9b4a303
--- /dev/null
+++ b/js/ui/i18n/jquery.ui.datepicker-sr.js
@@ -0,0 +1,23 @@
+/* Serbian i18n for the jQuery UI date picker plugin. */
+/* Written by Dejan Dimić. */
+jQuery(function($){
+	$.datepicker.regional['sr'] = {
+		closeText: 'Затвори',
+		prevText: '&#x3c;',
+		nextText: '&#x3e;',
+		currentText: 'Данас',
+		monthNames: ['Јануар','Фебруар','Март','Април','Мај','Јун',
+		'Јул','Август','Септембар','Октобар','Новембар','Децембар'],
+		monthNamesShort: ['Јан','Феб','Мар','Апр','Мај','Јун',
+		'Јул','Авг','Сеп','Окт','Нов','Дец'],
+		dayNames: ['Недеља','Понедељак','Уторак','Среда','Четвртак','Петак','Субота'],
+		dayNamesShort: ['Нед','Пон','Уто','Сре','Чет','Пет','Суб'],
+		dayNamesMin: ['Не','По','Ут','Ср','Че','Пе','Су'],
+		weekHeader: 'Сед',
+		dateFormat: 'dd/mm/yy',
+		firstDay: 1,
+		isRTL: false,
+		showMonthAfterYear: false,
+		yearSuffix: ''};
+	$.datepicker.setDefaults($.datepicker.regional['sr']);
+});
diff --git a/js/ui/i18n/jquery.ui.datepicker-sv.js b/js/ui/i18n/jquery.ui.datepicker-sv.js
new file mode 100644
index 0000000000..8236b62b53
--- /dev/null
+++ b/js/ui/i18n/jquery.ui.datepicker-sv.js
@@ -0,0 +1,23 @@
+/* Swedish initialisation for the jQuery UI date picker plugin. */
+/* Written by Anders Ekdahl ( anders@nomadiz.se). */
+jQuery(function($){
+    $.datepicker.regional['sv'] = {
+		closeText: 'Stäng',
+        prevText: '&laquo;Förra',
+		nextText: 'Nästa&raquo;',
+		currentText: 'Idag',
+        monthNames: ['Januari','Februari','Mars','April','Maj','Juni',
+        'Juli','Augusti','September','Oktober','November','December'],
+        monthNamesShort: ['Jan','Feb','Mar','Apr','Maj','Jun',
+        'Jul','Aug','Sep','Okt','Nov','Dec'],
+		dayNamesShort: ['Sön','Mån','Tis','Ons','Tor','Fre','Lör'],
+		dayNames: ['Söndag','Måndag','Tisdag','Onsdag','Torsdag','Fredag','Lördag'],
+		dayNamesMin: ['Sö','Må','Ti','On','To','Fr','Lö'],
+		weekHeader: 'Ve',
+        dateFormat: 'yy-mm-dd',
+		firstDay: 1,
+		isRTL: false,
+		showMonthAfterYear: false,
+		yearSuffix: ''};
+    $.datepicker.setDefaults($.datepicker.regional['sv']);
+});
diff --git a/js/ui/i18n/jquery.ui.datepicker-ta.js b/js/ui/i18n/jquery.ui.datepicker-ta.js
new file mode 100644
index 0000000000..91116d3877
--- /dev/null
+++ b/js/ui/i18n/jquery.ui.datepicker-ta.js
@@ -0,0 +1,23 @@
+/* Tamil (UTF-8) initialisation for the jQuery UI date picker plugin. */
+/* Written by S A Sureshkumar (saskumar@live.com). */
+jQuery(function($){
+	$.datepicker.regional['ta'] = {
+		closeText: 'மூடு',
+		prevText: 'முன்னையது',
+		nextText: 'அடுத்தது',
+		currentText: 'இன்று',
+		monthNames: ['தை','மாசி','பங்குனி','சித்திரை','வைகாசி','ஆனி',
+		'ஆடி','ஆவணி','புரட்டாசி','ஐப்பசி','கார்த்திகை','மார்கழி'],
+		monthNamesShort: ['தை','மாசி','பங்','சித்','வைகா','ஆனி',
+		'ஆடி','ஆவ','புர','ஐப்','கார்','மார்'],
+		dayNames: ['ஞாயிற்றுக்கிழமை','திங்கட்கிழமை','செவ்வாய்க்கிழமை','புதன்கிழமை','வியாழக்கிழமை','வெள்ளிக்கிழமை','சனிக்கிழமை'],
+		dayNamesShort: ['ஞாயிறு','திங்கள்','செவ்வாய்','புதன்','வியாழன்','வெள்ளி','சனி'],
+		dayNamesMin: ['ஞா','தி','செ','பு','வி','வெ','ச'],
+		weekHeader: 'Не',
+		dateFormat: 'dd/mm/yy',
+		firstDay: 1,
+		isRTL: false,
+		showMonthAfterYear: false,
+		yearSuffix: ''};
+	$.datepicker.setDefaults($.datepicker.regional['ta']);
+});
diff --git a/js/ui/i18n/jquery.ui.datepicker-th.js b/js/ui/i18n/jquery.ui.datepicker-th.js
new file mode 100644
index 0000000000..c090c6b81c
--- /dev/null
+++ b/js/ui/i18n/jquery.ui.datepicker-th.js
@@ -0,0 +1,23 @@
+/* Thai initialisation for the jQuery UI date picker plugin. */
+/* Written by pipo (pipo@sixhead.com). */
+jQuery(function($){
+	$.datepicker.regional['th'] = {
+		closeText: 'ปิด',
+		prevText: '&laquo;&nbsp;ย้อน',
+		nextText: 'ถัดไป&nbsp;&raquo;',
+		currentText: 'วันนี้',
+		monthNames: ['มกราคม','กุมภาพันธ์','มีนาคม','เมษายน','พฤษภาคม','มิถุนายน',
+		'กรกฎาคม','สิงหาคม','กันยายน','ตุลาคม','พฤศจิกายน','ธันวาคม'],
+		monthNamesShort: ['ม.ค.','ก.พ.','มี.ค.','เม.ย.','พ.ค.','มิ.ย.',
+		'ก.ค.','ส.ค.','ก.ย.','ต.ค.','พ.ย.','ธ.ค.'],
+		dayNames: ['อาทิตย์','จันทร์','อังคาร','พุธ','พฤหัสบดี','ศุกร์','เสาร์'],
+		dayNamesShort: ['อา.','จ.','อ.','พ.','พฤ.','ศ.','ส.'],
+		dayNamesMin: ['อา.','จ.','อ.','พ.','พฤ.','ศ.','ส.'],
+		weekHeader: 'Wk',
+		dateFormat: 'dd/mm/yy',
+		firstDay: 0,
+		isRTL: false,
+		showMonthAfterYear: false,
+		yearSuffix: ''};
+	$.datepicker.setDefaults($.datepicker.regional['th']);
+});
\ No newline at end of file
diff --git a/js/ui/i18n/jquery.ui.datepicker-tr.js b/js/ui/i18n/jquery.ui.datepicker-tr.js
new file mode 100644
index 0000000000..dedfc7ff99
--- /dev/null
+++ b/js/ui/i18n/jquery.ui.datepicker-tr.js
@@ -0,0 +1,23 @@
+/* Turkish initialisation for the jQuery UI date picker plugin. */
+/* Written by Izzet Emre Erkan (kara@karalamalar.net). */
+jQuery(function($){
+	$.datepicker.regional['tr'] = {
+		closeText: 'kapat',
+		prevText: '&#x3c;geri',
+		nextText: 'ileri&#x3e',
+		currentText: 'bugün',
+		monthNames: ['Ocak','Şubat','Mart','Nisan','Mayıs','Haziran',
+		'Temmuz','Ağustos','Eylül','Ekim','Kasım','Aralık'],
+		monthNamesShort: ['Oca','Şub','Mar','Nis','May','Haz',
+		'Tem','Ağu','Eyl','Eki','Kas','Ara'],
+		dayNames: ['Pazar','Pazartesi','Salı','Çarşamba','Perşembe','Cuma','Cumartesi'],
+		dayNamesShort: ['Pz','Pt','Sa','Ça','Pe','Cu','Ct'],
+		dayNamesMin: ['Pz','Pt','Sa','Ça','Pe','Cu','Ct'],
+		weekHeader: 'Hf',
+		dateFormat: 'dd.mm.yy',
+		firstDay: 1,
+		isRTL: false,
+		showMonthAfterYear: false,
+		yearSuffix: ''};
+	$.datepicker.setDefaults($.datepicker.regional['tr']);
+});
\ No newline at end of file
diff --git a/js/ui/i18n/jquery.ui.datepicker-uk.js b/js/ui/i18n/jquery.ui.datepicker-uk.js
new file mode 100644
index 0000000000..112b40e7f8
--- /dev/null
+++ b/js/ui/i18n/jquery.ui.datepicker-uk.js
@@ -0,0 +1,23 @@
+/* Ukrainian (UTF-8) initialisation for the jQuery UI date picker plugin. */
+/* Written by Maxim Drogobitskiy (maxdao@gmail.com). */
+jQuery(function($){
+	$.datepicker.regional['uk'] = {
+		closeText: 'Закрити',
+		prevText: '&#x3c;',
+		nextText: '&#x3e;',
+		currentText: 'Сьогодні',
+		monthNames: ['Січень','Лютий','Березень','Квітень','Травень','Червень',
+		'Липень','Серпень','Вересень','Жовтень','Листопад','Грудень'],
+		monthNamesShort: ['Січ','Лют','Бер','Кві','Тра','Чер',
+		'Лип','Сер','Вер','Жов','Лис','Гру'],
+		dayNames: ['неділя','понеділок','вівторок','середа','четвер','п’ятниця','субота'],
+		dayNamesShort: ['нед','пнд','вів','срд','чтв','птн','сбт'],
+		dayNamesMin: ['Нд','Пн','Вт','Ср','Чт','Пт','Сб'],
+		weekHeader: 'Не',
+		dateFormat: 'dd/mm/yy',
+		firstDay: 1,
+		isRTL: false,
+		showMonthAfterYear: false,
+		yearSuffix: ''};
+	$.datepicker.setDefaults($.datepicker.regional['uk']);
+});
\ No newline at end of file
diff --git a/js/ui/i18n/jquery.ui.datepicker-vi.js b/js/ui/i18n/jquery.ui.datepicker-vi.js
new file mode 100644
index 0000000000..9813a59e01
--- /dev/null
+++ b/js/ui/i18n/jquery.ui.datepicker-vi.js
@@ -0,0 +1,23 @@
+/* Vietnamese initialisation for the jQuery UI date picker plugin. */
+/* Translated by Le Thanh Huy (lthanhhuy@cit.ctu.edu.vn). */
+jQuery(function($){
+	$.datepicker.regional['vi'] = {
+		closeText: 'Đóng',
+		prevText: '&#x3c;Trước',
+		nextText: 'Tiếp&#x3e;',
+		currentText: 'Hôm nay',
+		monthNames: ['Tháng Một', 'Tháng Hai', 'Tháng Ba', 'Tháng Tư', 'Tháng Năm', 'Tháng Sáu',
+		'Tháng Bảy', 'Tháng Tám', 'Tháng Chín', 'Tháng Mười', 'Tháng Mười Một', 'Tháng Mười Hai'],
+		monthNamesShort: ['Tháng 1', 'Tháng 2', 'Tháng 3', 'Tháng 4', 'Tháng 5', 'Tháng 6',
+		'Tháng 7', 'Tháng 8', 'Tháng 9', 'Tháng 10', 'Tháng 11', 'Tháng 12'],
+		dayNames: ['Chủ Nhật', 'Thứ Hai', 'Thứ Ba', 'Thứ Tư', 'Thứ Năm', 'Thứ Sáu', 'Thứ Bảy'],
+		dayNamesShort: ['CN', 'T2', 'T3', 'T4', 'T5', 'T6', 'T7'],
+		dayNamesMin: ['CN', 'T2', 'T3', 'T4', 'T5', 'T6', 'T7'],
+		weekHeader: 'Tu',
+		dateFormat: 'dd/mm/yy',
+		firstDay: 0,
+		isRTL: false,
+		showMonthAfterYear: false,
+		yearSuffix: ''};
+	$.datepicker.setDefaults($.datepicker.regional['vi']);
+});
diff --git a/js/ui/i18n/jquery.ui.datepicker-zh-CN.js b/js/ui/i18n/jquery.ui.datepicker-zh-CN.js
new file mode 100644
index 0000000000..6c4883f536
--- /dev/null
+++ b/js/ui/i18n/jquery.ui.datepicker-zh-CN.js
@@ -0,0 +1,23 @@
+/* Chinese initialisation for the jQuery UI date picker plugin. */
+/* Written by Cloudream (cloudream@gmail.com). */
+jQuery(function($){
+	$.datepicker.regional['zh-CN'] = {
+		closeText: '关闭',
+		prevText: '&#x3c;上月',
+		nextText: '下月&#x3e;',
+		currentText: '今天',
+		monthNames: ['一月','二月','三月','四月','五月','六月',
+		'七月','八月','九月','十月','十一月','十二月'],
+		monthNamesShort: ['一','二','三','四','五','六',
+		'七','八','九','十','十一','十二'],
+		dayNames: ['星期日','星期一','星期二','星期三','星期四','星期五','星期六'],
+		dayNamesShort: ['周日','周一','周二','周三','周四','周五','周六'],
+		dayNamesMin: ['日','一','二','三','四','五','六'],
+		weekHeader: '周',
+		dateFormat: 'yy-mm-dd',
+		firstDay: 1,
+		isRTL: false,
+		showMonthAfterYear: true,
+		yearSuffix: '年'};
+	$.datepicker.setDefaults($.datepicker.regional['zh-CN']);
+});
diff --git a/js/ui/i18n/jquery.ui.datepicker-zh-HK.js b/js/ui/i18n/jquery.ui.datepicker-zh-HK.js
new file mode 100644
index 0000000000..06c4c628c4
--- /dev/null
+++ b/js/ui/i18n/jquery.ui.datepicker-zh-HK.js
@@ -0,0 +1,23 @@
+/* Chinese initialisation for the jQuery UI date picker plugin. */
+/* Written by SCCY (samuelcychan@gmail.com). */
+jQuery(function($){
+	$.datepicker.regional['zh-HK'] = {
+		closeText: '關閉',
+		prevText: '&#x3c;上月',
+		nextText: '下月&#x3e;',
+		currentText: '今天',
+		monthNames: ['一月','二月','三月','四月','五月','六月',
+		'七月','八月','九月','十月','十一月','十二月'],
+		monthNamesShort: ['一','二','三','四','五','六',
+		'七','八','九','十','十一','十二'],
+		dayNames: ['星期日','星期一','星期二','星期三','星期四','星期五','星期六'],
+		dayNamesShort: ['周日','周一','周二','周三','周四','周五','周六'],
+		dayNamesMin: ['日','一','二','三','四','五','六'],
+		weekHeader: '周',
+		dateFormat: 'dd-mm-yy',
+		firstDay: 0,
+		isRTL: false,
+		showMonthAfterYear: true,
+		yearSuffix: '年'};
+	$.datepicker.setDefaults($.datepicker.regional['zh-HK']);
+});
diff --git a/js/ui/i18n/jquery.ui.datepicker-zh-TW.js b/js/ui/i18n/jquery.ui.datepicker-zh-TW.js
new file mode 100644
index 0000000000..d211573c67
--- /dev/null
+++ b/js/ui/i18n/jquery.ui.datepicker-zh-TW.js
@@ -0,0 +1,23 @@
+/* Chinese initialisation for the jQuery UI date picker plugin. */
+/* Written by Ressol (ressol@gmail.com). */
+jQuery(function($){
+	$.datepicker.regional['zh-TW'] = {
+		closeText: '關閉',
+		prevText: '&#x3c;上月',
+		nextText: '下月&#x3e;',
+		currentText: '今天',
+		monthNames: ['一月','二月','三月','四月','五月','六月',
+		'七月','八月','九月','十月','十一月','十二月'],
+		monthNamesShort: ['一','二','三','四','五','六',
+		'七','八','九','十','十一','十二'],
+		dayNames: ['星期日','星期一','星期二','星期三','星期四','星期五','星期六'],
+		dayNamesShort: ['周日','周一','周二','周三','周四','周五','周六'],
+		dayNamesMin: ['日','一','二','三','四','五','六'],
+		weekHeader: '周',
+		dateFormat: 'yy/mm/dd',
+		firstDay: 1,
+		isRTL: false,
+		showMonthAfterYear: true,
+		yearSuffix: '年'};
+	$.datepicker.setDefaults($.datepicker.regional['zh-TW']);
+});
diff --git a/js/ui/jquery-ui-1.8.10.custom.js b/js/ui/jquery-ui-1.8.10.custom.js
new file mode 100644
index 0000000000..8219acdf28
--- /dev/null
+++ b/js/ui/jquery-ui-1.8.10.custom.js
@@ -0,0 +1,11544 @@
+/*!
+ * jQuery UI 1.8.10
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI
+ */
+(function( $, undefined ) {
+
+// prevent duplicate loading
+// this is only a problem because we proxy existing functions
+// and we don't want to double proxy them
+$.ui = $.ui || {};
+if ( $.ui.version ) {
+	return;
+}
+
+$.extend( $.ui, {
+	version: "1.8.10",
+
+	keyCode: {
+		ALT: 18,
+		BACKSPACE: 8,
+		CAPS_LOCK: 20,
+		COMMA: 188,
+		COMMAND: 91,
+		COMMAND_LEFT: 91, // COMMAND
+		COMMAND_RIGHT: 93,
+		CONTROL: 17,
+		DELETE: 46,
+		DOWN: 40,
+		END: 35,
+		ENTER: 13,
+		ESCAPE: 27,
+		HOME: 36,
+		INSERT: 45,
+		LEFT: 37,
+		MENU: 93, // COMMAND_RIGHT
+		NUMPAD_ADD: 107,
+		NUMPAD_DECIMAL: 110,
+		NUMPAD_DIVIDE: 111,
+		NUMPAD_ENTER: 108,
+		NUMPAD_MULTIPLY: 106,
+		NUMPAD_SUBTRACT: 109,
+		PAGE_DOWN: 34,
+		PAGE_UP: 33,
+		PERIOD: 190,
+		RIGHT: 39,
+		SHIFT: 16,
+		SPACE: 32,
+		TAB: 9,
+		UP: 38,
+		WINDOWS: 91 // COMMAND
+	}
+});
+
+// plugins
+$.fn.extend({
+	_focus: $.fn.focus,
+	focus: function( delay, fn ) {
+		return typeof delay === "number" ?
+			this.each(function() {
+				var elem = this;
+				setTimeout(function() {
+					$( elem ).focus();
+					if ( fn ) {
+						fn.call( elem );
+					}
+				}, delay );
+			}) :
+			this._focus.apply( this, arguments );
+	},
+
+	scrollParent: function() {
+		var scrollParent;
+		if (($.browser.msie && (/(static|relative)/).test(this.css('position'))) || (/absolute/).test(this.css('position'))) {
+			scrollParent = this.parents().filter(function() {
+				return (/(relative|absolute|fixed)/).test($.curCSS(this,'position',1)) && (/(auto|scroll)/).test($.curCSS(this,'overflow',1)+$.curCSS(this,'overflow-y',1)+$.curCSS(this,'overflow-x',1));
+			}).eq(0);
+		} else {
+			scrollParent = this.parents().filter(function() {
+				return (/(auto|scroll)/).test($.curCSS(this,'overflow',1)+$.curCSS(this,'overflow-y',1)+$.curCSS(this,'overflow-x',1));
+			}).eq(0);
+		}
+
+		return (/fixed/).test(this.css('position')) || !scrollParent.length ? $(document) : scrollParent;
+	},
+
+	zIndex: function( zIndex ) {
+		if ( zIndex !== undefined ) {
+			return this.css( "zIndex", zIndex );
+		}
+
+		if ( this.length ) {
+			var elem = $( this[ 0 ] ), position, value;
+			while ( elem.length && elem[ 0 ] !== document ) {
+				// Ignore z-index if position is set to a value where z-index is ignored by the browser
+				// This makes behavior of this function consistent across browsers
+				// WebKit always returns auto if the element is positioned
+				position = elem.css( "position" );
+				if ( position === "absolute" || position === "relative" || position === "fixed" ) {
+					// IE returns 0 when zIndex is not specified
+					// other browsers return a string
+					// we ignore the case of nested elements with an explicit value of 0
+					// <div style="z-index: -10;"><div style="z-index: 0;"></div></div>
+					value = parseInt( elem.css( "zIndex" ), 10 );
+					if ( !isNaN( value ) && value !== 0 ) {
+						return value;
+					}
+				}
+				elem = elem.parent();
+			}
+		}
+
+		return 0;
+	},
+
+	disableSelection: function() {
+		return this.bind( ( $.support.selectstart ? "selectstart" : "mousedown" ) +
+			".ui-disableSelection", function( event ) {
+				event.preventDefault();
+			});
+	},
+
+	enableSelection: function() {
+		return this.unbind( ".ui-disableSelection" );
+	}
+});
+
+$.each( [ "Width", "Height" ], function( i, name ) {
+	var side = name === "Width" ? [ "Left", "Right" ] : [ "Top", "Bottom" ],
+		type = name.toLowerCase(),
+		orig = {
+			innerWidth: $.fn.innerWidth,
+			innerHeight: $.fn.innerHeight,
+			outerWidth: $.fn.outerWidth,
+			outerHeight: $.fn.outerHeight
+		};
+
+	function reduce( elem, size, border, margin ) {
+		$.each( side, function() {
+			size -= parseFloat( $.curCSS( elem, "padding" + this, true) ) || 0;
+			if ( border ) {
+				size -= parseFloat( $.curCSS( elem, "border" + this + "Width", true) ) || 0;
+			}
+			if ( margin ) {
+				size -= parseFloat( $.curCSS( elem, "margin" + this, true) ) || 0;
+			}
+		});
+		return size;
+	}
+
+	$.fn[ "inner" + name ] = function( size ) {
+		if ( size === undefined ) {
+			return orig[ "inner" + name ].call( this );
+		}
+
+		return this.each(function() {
+			$( this ).css( type, reduce( this, size ) + "px" );
+		});
+	};
+
+	$.fn[ "outer" + name] = function( size, margin ) {
+		if ( typeof size !== "number" ) {
+			return orig[ "outer" + name ].call( this, size );
+		}
+
+		return this.each(function() {
+			$( this).css( type, reduce( this, size, true, margin ) + "px" );
+		});
+	};
+});
+
+// selectors
+function visible( element ) {
+	return !$( element ).parents().andSelf().filter(function() {
+		return $.curCSS( this, "visibility" ) === "hidden" ||
+			$.expr.filters.hidden( this );
+	}).length;
+}
+
+$.extend( $.expr[ ":" ], {
+	data: function( elem, i, match ) {
+		return !!$.data( elem, match[ 3 ] );
+	},
+
+	focusable: function( element ) {
+		var nodeName = element.nodeName.toLowerCase(),
+			tabIndex = $.attr( element, "tabindex" );
+		if ( "area" === nodeName ) {
+			var map = element.parentNode,
+				mapName = map.name,
+				img;
+			if ( !element.href || !mapName || map.nodeName.toLowerCase() !== "map" ) {
+				return false;
+			}
+			img = $( "img[usemap=#" + mapName + "]" )[0];
+			return !!img && visible( img );
+		}
+		return ( /input|select|textarea|button|object/.test( nodeName )
+			? !element.disabled
+			: "a" == nodeName
+				? element.href || !isNaN( tabIndex )
+				: !isNaN( tabIndex ))
+			// the element and all of its ancestors must be visible
+			&& visible( element );
+	},
+
+	tabbable: function( element ) {
+		var tabIndex = $.attr( element, "tabindex" );
+		return ( isNaN( tabIndex ) || tabIndex >= 0 ) && $( element ).is( ":focusable" );
+	}
+});
+
+// support
+$(function() {
+	var body = document.body,
+		div = body.appendChild( div = document.createElement( "div" ) );
+
+	$.extend( div.style, {
+		minHeight: "100px",
+		height: "auto",
+		padding: 0,
+		borderWidth: 0
+	});
+
+	$.support.minHeight = div.offsetHeight === 100;
+	$.support.selectstart = "onselectstart" in div;
+
+	// set display to none to avoid a layout bug in IE
+	// http://dev.jquery.com/ticket/4014
+	body.removeChild( div ).style.display = "none";
+});
+
+
+
+
+
+// deprecated
+$.extend( $.ui, {
+	// $.ui.plugin is deprecated.  Use the proxy pattern instead.
+	plugin: {
+		add: function( module, option, set ) {
+			var proto = $.ui[ module ].prototype;
+			for ( var i in set ) {
+				proto.plugins[ i ] = proto.plugins[ i ] || [];
+				proto.plugins[ i ].push( [ option, set[ i ] ] );
+			}
+		},
+		call: function( instance, name, args ) {
+			var set = instance.plugins[ name ];
+			if ( !set || !instance.element[ 0 ].parentNode ) {
+				return;
+			}
+	
+			for ( var i = 0; i < set.length; i++ ) {
+				if ( instance.options[ set[ i ][ 0 ] ] ) {
+					set[ i ][ 1 ].apply( instance.element, args );
+				}
+			}
+		}
+	},
+	
+	// will be deprecated when we switch to jQuery 1.4 - use jQuery.contains()
+	contains: function( a, b ) {
+		return document.compareDocumentPosition ?
+			a.compareDocumentPosition( b ) & 16 :
+			a !== b && a.contains( b );
+	},
+	
+	// only used by resizable
+	hasScroll: function( el, a ) {
+	
+		//If overflow is hidden, the element might have extra content, but the user wants to hide it
+		if ( $( el ).css( "overflow" ) === "hidden") {
+			return false;
+		}
+	
+		var scroll = ( a && a === "left" ) ? "scrollLeft" : "scrollTop",
+			has = false;
+	
+		if ( el[ scroll ] > 0 ) {
+			return true;
+		}
+	
+		// TODO: determine which cases actually cause this to happen
+		// if the element doesn't have the scroll set, see if it's possible to
+		// set the scroll
+		el[ scroll ] = 1;
+		has = ( el[ scroll ] > 0 );
+		el[ scroll ] = 0;
+		return has;
+	},
+	
+	// these are odd functions, fix the API or move into individual plugins
+	isOverAxis: function( x, reference, size ) {
+		//Determines when x coordinate is over "b" element axis
+		return ( x > reference ) && ( x < ( reference + size ) );
+	},
+	isOver: function( y, x, top, left, height, width ) {
+		//Determines when x, y coordinates is over "b" element
+		return $.ui.isOverAxis( y, top, height ) && $.ui.isOverAxis( x, left, width );
+	}
+});
+
+})( jQuery );
+/*!
+ * jQuery UI Widget 1.8.10
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Widget
+ */
+(function( $, undefined ) {
+
+// jQuery 1.4+
+if ( $.cleanData ) {
+	var _cleanData = $.cleanData;
+	$.cleanData = function( elems ) {
+		for ( var i = 0, elem; (elem = elems[i]) != null; i++ ) {
+			$( elem ).triggerHandler( "remove" );
+		}
+		_cleanData( elems );
+	};
+} else {
+	var _remove = $.fn.remove;
+	$.fn.remove = function( selector, keepData ) {
+		return this.each(function() {
+			if ( !keepData ) {
+				if ( !selector || $.filter( selector, [ this ] ).length ) {
+					$( "*", this ).add( [ this ] ).each(function() {
+						$( this ).triggerHandler( "remove" );
+					});
+				}
+			}
+			return _remove.call( $(this), selector, keepData );
+		});
+	};
+}
+
+$.widget = function( name, base, prototype ) {
+	var namespace = name.split( "." )[ 0 ],
+		fullName;
+	name = name.split( "." )[ 1 ];
+	fullName = namespace + "-" + name;
+
+	if ( !prototype ) {
+		prototype = base;
+		base = $.Widget;
+	}
+
+	// create selector for plugin
+	$.expr[ ":" ][ fullName ] = function( elem ) {
+		return !!$.data( elem, name );
+	};
+
+	$[ namespace ] = $[ namespace ] || {};
+	$[ namespace ][ name ] = function( options, element ) {
+		// allow instantiation without initializing for simple inheritance
+		if ( arguments.length ) {
+			this._createWidget( options, element );
+		}
+	};
+
+	var basePrototype = new base();
+	// we need to make the options hash a property directly on the new instance
+	// otherwise we'll modify the options hash on the prototype that we're
+	// inheriting from
+//	$.each( basePrototype, function( key, val ) {
+//		if ( $.isPlainObject(val) ) {
+//			basePrototype[ key ] = $.extend( {}, val );
+//		}
+//	});
+	basePrototype.options = $.extend( true, {}, basePrototype.options );
+	$[ namespace ][ name ].prototype = $.extend( true, basePrototype, {
+		namespace: namespace,
+		widgetName: name,
+		widgetEventPrefix: $[ namespace ][ name ].prototype.widgetEventPrefix || name,
+		widgetBaseClass: fullName
+	}, prototype );
+
+	$.widget.bridge( name, $[ namespace ][ name ] );
+};
+
+$.widget.bridge = function( name, object ) {
+	$.fn[ name ] = function( options ) {
+		var isMethodCall = typeof options === "string",
+			args = Array.prototype.slice.call( arguments, 1 ),
+			returnValue = this;
+
+		// allow multiple hashes to be passed on init
+		options = !isMethodCall && args.length ?
+			$.extend.apply( null, [ true, options ].concat(args) ) :
+			options;
+
+		// prevent calls to internal methods
+		if ( isMethodCall && options.charAt( 0 ) === "_" ) {
+			return returnValue;
+		}
+
+		if ( isMethodCall ) {
+			this.each(function() {
+				var instance = $.data( this, name ),
+					methodValue = instance && $.isFunction( instance[options] ) ?
+						instance[ options ].apply( instance, args ) :
+						instance;
+				// TODO: add this back in 1.9 and use $.error() (see #5972)
+//				if ( !instance ) {
+//					throw "cannot call methods on " + name + " prior to initialization; " +
+//						"attempted to call method '" + options + "'";
+//				}
+//				if ( !$.isFunction( instance[options] ) ) {
+//					throw "no such method '" + options + "' for " + name + " widget instance";
+//				}
+//				var methodValue = instance[ options ].apply( instance, args );
+				if ( methodValue !== instance && methodValue !== undefined ) {
+					returnValue = methodValue;
+					return false;
+				}
+			});
+		} else {
+			this.each(function() {
+				var instance = $.data( this, name );
+				if ( instance ) {
+					instance.option( options || {} )._init();
+				} else {
+					$.data( this, name, new object( options, this ) );
+				}
+			});
+		}
+
+		return returnValue;
+	};
+};
+
+$.Widget = function( options, element ) {
+	// allow instantiation without initializing for simple inheritance
+	if ( arguments.length ) {
+		this._createWidget( options, element );
+	}
+};
+
+$.Widget.prototype = {
+	widgetName: "widget",
+	widgetEventPrefix: "",
+	options: {
+		disabled: false
+	},
+	_createWidget: function( options, element ) {
+		// $.widget.bridge stores the plugin instance, but we do it anyway
+		// so that it's stored even before the _create function runs
+		$.data( element, this.widgetName, this );
+		this.element = $( element );
+		this.options = $.extend( true, {},
+			this.options,
+			this._getCreateOptions(),
+			options );
+
+		var self = this;
+		this.element.bind( "remove." + this.widgetName, function() {
+			self.destroy();
+		});
+
+		this._create();
+		this._trigger( "create" );
+		this._init();
+	},
+	_getCreateOptions: function() {
+		return $.metadata && $.metadata.get( this.element[0] )[ this.widgetName ];
+	},
+	_create: function() {},
+	_init: function() {},
+
+	destroy: function() {
+		this.element
+			.unbind( "." + this.widgetName )
+			.removeData( this.widgetName );
+		this.widget()
+			.unbind( "." + this.widgetName )
+			.removeAttr( "aria-disabled" )
+			.removeClass(
+				this.widgetBaseClass + "-disabled " +
+				"ui-state-disabled" );
+	},
+
+	widget: function() {
+		return this.element;
+	},
+
+	option: function( key, value ) {
+		var options = key;
+
+		if ( arguments.length === 0 ) {
+			// don't return a reference to the internal hash
+			return $.extend( {}, this.options );
+		}
+
+		if  (typeof key === "string" ) {
+			if ( value === undefined ) {
+				return this.options[ key ];
+			}
+			options = {};
+			options[ key ] = value;
+		}
+
+		this._setOptions( options );
+
+		return this;
+	},
+	_setOptions: function( options ) {
+		var self = this;
+		$.each( options, function( key, value ) {
+			self._setOption( key, value );
+		});
+
+		return this;
+	},
+	_setOption: function( key, value ) {
+		this.options[ key ] = value;
+
+		if ( key === "disabled" ) {
+			this.widget()
+				[ value ? "addClass" : "removeClass"](
+					this.widgetBaseClass + "-disabled" + " " +
+					"ui-state-disabled" )
+				.attr( "aria-disabled", value );
+		}
+
+		return this;
+	},
+
+	enable: function() {
+		return this._setOption( "disabled", false );
+	},
+	disable: function() {
+		return this._setOption( "disabled", true );
+	},
+
+	_trigger: function( type, event, data ) {
+		var callback = this.options[ type ];
+
+		event = $.Event( event );
+		event.type = ( type === this.widgetEventPrefix ?
+			type :
+			this.widgetEventPrefix + type ).toLowerCase();
+		data = data || {};
+
+		// copy original event properties over to the new event
+		// this would happen if we could call $.event.fix instead of $.Event
+		// but we don't have a way to force an event to be fixed multiple times
+		if ( event.originalEvent ) {
+			for ( var i = $.event.props.length, prop; i; ) {
+				prop = $.event.props[ --i ];
+				event[ prop ] = event.originalEvent[ prop ];
+			}
+		}
+
+		this.element.trigger( event, data );
+
+		return !( $.isFunction(callback) &&
+			callback.call( this.element[0], event, data ) === false ||
+			event.isDefaultPrevented() );
+	}
+};
+
+})( jQuery );
+/*!
+ * jQuery UI Mouse 1.8.10
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Mouse
+ *
+ * Depends:
+ *	jquery.ui.widget.js
+ */
+(function( $, undefined ) {
+
+$.widget("ui.mouse", {
+	options: {
+		cancel: ':input,option',
+		distance: 1,
+		delay: 0
+	},
+	_mouseInit: function() {
+		var self = this;
+
+		this.element
+			.bind('mousedown.'+this.widgetName, function(event) {
+				return self._mouseDown(event);
+			})
+			.bind('click.'+this.widgetName, function(event) {
+				if (true === $.data(event.target, self.widgetName + '.preventClickEvent')) {
+				    $.removeData(event.target, self.widgetName + '.preventClickEvent');
+					event.stopImmediatePropagation();
+					return false;
+				}
+			});
+
+		this.started = false;
+	},
+
+	// TODO: make sure destroying one instance of mouse doesn't mess with
+	// other instances of mouse
+	_mouseDestroy: function() {
+		this.element.unbind('.'+this.widgetName);
+	},
+
+	_mouseDown: function(event) {
+		// don't let more than one widget handle mouseStart
+		// TODO: figure out why we have to use originalEvent
+		event.originalEvent = event.originalEvent || {};
+		if (event.originalEvent.mouseHandled) { return; }
+
+		// we may have missed mouseup (out of window)
+		(this._mouseStarted && this._mouseUp(event));
+
+		this._mouseDownEvent = event;
+
+		var self = this,
+			btnIsLeft = (event.which == 1),
+			elIsCancel = (typeof this.options.cancel == "string" ? $(event.target).parents().add(event.target).filter(this.options.cancel).length : false);
+		if (!btnIsLeft || elIsCancel || !this._mouseCapture(event)) {
+			return true;
+		}
+
+		this.mouseDelayMet = !this.options.delay;
+		if (!this.mouseDelayMet) {
+			this._mouseDelayTimer = setTimeout(function() {
+				self.mouseDelayMet = true;
+			}, this.options.delay);
+		}
+
+		if (this._mouseDistanceMet(event) && this._mouseDelayMet(event)) {
+			this._mouseStarted = (this._mouseStart(event) !== false);
+			if (!this._mouseStarted) {
+				event.preventDefault();
+				return true;
+			}
+		}
+
+		// these delegates are required to keep context
+		this._mouseMoveDelegate = function(event) {
+			return self._mouseMove(event);
+		};
+		this._mouseUpDelegate = function(event) {
+			return self._mouseUp(event);
+		};
+		$(document)
+			.bind('mousemove.'+this.widgetName, this._mouseMoveDelegate)
+			.bind('mouseup.'+this.widgetName, this._mouseUpDelegate);
+
+		event.preventDefault();
+		event.originalEvent.mouseHandled = true;
+		return true;
+	},
+
+	_mouseMove: function(event) {
+		// IE mouseup check - mouseup happened when mouse was out of window
+		if ($.browser.msie && !(document.documentMode >= 9) && !event.button) {
+			return this._mouseUp(event);
+		}
+
+		if (this._mouseStarted) {
+			this._mouseDrag(event);
+			return event.preventDefault();
+		}
+
+		if (this._mouseDistanceMet(event) && this._mouseDelayMet(event)) {
+			this._mouseStarted =
+				(this._mouseStart(this._mouseDownEvent, event) !== false);
+			(this._mouseStarted ? this._mouseDrag(event) : this._mouseUp(event));
+		}
+
+		return !this._mouseStarted;
+	},
+
+	_mouseUp: function(event) {
+		$(document)
+			.unbind('mousemove.'+this.widgetName, this._mouseMoveDelegate)
+			.unbind('mouseup.'+this.widgetName, this._mouseUpDelegate);
+
+		if (this._mouseStarted) {
+			this._mouseStarted = false;
+
+			if (event.target == this._mouseDownEvent.target) {
+			    $.data(event.target, this.widgetName + '.preventClickEvent', true);
+			}
+
+			this._mouseStop(event);
+		}
+
+		return false;
+	},
+
+	_mouseDistanceMet: function(event) {
+		return (Math.max(
+				Math.abs(this._mouseDownEvent.pageX - event.pageX),
+				Math.abs(this._mouseDownEvent.pageY - event.pageY)
+			) >= this.options.distance
+		);
+	},
+
+	_mouseDelayMet: function(event) {
+		return this.mouseDelayMet;
+	},
+
+	// These are placeholder methods, to be overriden by extending plugin
+	_mouseStart: function(event) {},
+	_mouseDrag: function(event) {},
+	_mouseStop: function(event) {},
+	_mouseCapture: function(event) { return true; }
+});
+
+})(jQuery);
+/*
+ * jQuery UI Position 1.8.10
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Position
+ */
+(function( $, undefined ) {
+
+$.ui = $.ui || {};
+
+var horizontalPositions = /left|center|right/,
+	verticalPositions = /top|center|bottom/,
+	center = "center",
+	_position = $.fn.position,
+	_offset = $.fn.offset;
+
+$.fn.position = function( options ) {
+	if ( !options || !options.of ) {
+		return _position.apply( this, arguments );
+	}
+
+	// make a copy, we don't want to modify arguments
+	options = $.extend( {}, options );
+
+	var target = $( options.of ),
+		targetElem = target[0],
+		collision = ( options.collision || "flip" ).split( " " ),
+		offset = options.offset ? options.offset.split( " " ) : [ 0, 0 ],
+		targetWidth,
+		targetHeight,
+		basePosition;
+
+	if ( targetElem.nodeType === 9 ) {
+		targetWidth = target.width();
+		targetHeight = target.height();
+		basePosition = { top: 0, left: 0 };
+	// TODO: use $.isWindow() in 1.9
+	} else if ( targetElem.setTimeout ) {
+		targetWidth = target.width();
+		targetHeight = target.height();
+		basePosition = { top: target.scrollTop(), left: target.scrollLeft() };
+	} else if ( targetElem.preventDefault ) {
+		// force left top to allow flipping
+		options.at = "left top";
+		targetWidth = targetHeight = 0;
+		basePosition = { top: options.of.pageY, left: options.of.pageX };
+	} else {
+		targetWidth = target.outerWidth();
+		targetHeight = target.outerHeight();
+		basePosition = target.offset();
+	}
+
+	// force my and at to have valid horizontal and veritcal positions
+	// if a value is missing or invalid, it will be converted to center 
+	$.each( [ "my", "at" ], function() {
+		var pos = ( options[this] || "" ).split( " " );
+		if ( pos.length === 1) {
+			pos = horizontalPositions.test( pos[0] ) ?
+				pos.concat( [center] ) :
+				verticalPositions.test( pos[0] ) ?
+					[ center ].concat( pos ) :
+					[ center, center ];
+		}
+		pos[ 0 ] = horizontalPositions.test( pos[0] ) ? pos[ 0 ] : center;
+		pos[ 1 ] = verticalPositions.test( pos[1] ) ? pos[ 1 ] : center;
+		options[ this ] = pos;
+	});
+
+	// normalize collision option
+	if ( collision.length === 1 ) {
+		collision[ 1 ] = collision[ 0 ];
+	}
+
+	// normalize offset option
+	offset[ 0 ] = parseInt( offset[0], 10 ) || 0;
+	if ( offset.length === 1 ) {
+		offset[ 1 ] = offset[ 0 ];
+	}
+	offset[ 1 ] = parseInt( offset[1], 10 ) || 0;
+
+	if ( options.at[0] === "right" ) {
+		basePosition.left += targetWidth;
+	} else if ( options.at[0] === center ) {
+		basePosition.left += targetWidth / 2;
+	}
+
+	if ( options.at[1] === "bottom" ) {
+		basePosition.top += targetHeight;
+	} else if ( options.at[1] === center ) {
+		basePosition.top += targetHeight / 2;
+	}
+
+	basePosition.left += offset[ 0 ];
+	basePosition.top += offset[ 1 ];
+
+	return this.each(function() {
+		var elem = $( this ),
+			elemWidth = elem.outerWidth(),
+			elemHeight = elem.outerHeight(),
+			marginLeft = parseInt( $.curCSS( this, "marginLeft", true ) ) || 0,
+			marginTop = parseInt( $.curCSS( this, "marginTop", true ) ) || 0,
+			collisionWidth = elemWidth + marginLeft +
+				( parseInt( $.curCSS( this, "marginRight", true ) ) || 0 ),
+			collisionHeight = elemHeight + marginTop +
+				( parseInt( $.curCSS( this, "marginBottom", true ) ) || 0 ),
+			position = $.extend( {}, basePosition ),
+			collisionPosition;
+
+		if ( options.my[0] === "right" ) {
+			position.left -= elemWidth;
+		} else if ( options.my[0] === center ) {
+			position.left -= elemWidth / 2;
+		}
+
+		if ( options.my[1] === "bottom" ) {
+			position.top -= elemHeight;
+		} else if ( options.my[1] === center ) {
+			position.top -= elemHeight / 2;
+		}
+
+		// prevent fractions (see #5280)
+		position.left = Math.round( position.left );
+		position.top = Math.round( position.top );
+
+		collisionPosition = {
+			left: position.left - marginLeft,
+			top: position.top - marginTop
+		};
+
+		$.each( [ "left", "top" ], function( i, dir ) {
+			if ( $.ui.position[ collision[i] ] ) {
+				$.ui.position[ collision[i] ][ dir ]( position, {
+					targetWidth: targetWidth,
+					targetHeight: targetHeight,
+					elemWidth: elemWidth,
+					elemHeight: elemHeight,
+					collisionPosition: collisionPosition,
+					collisionWidth: collisionWidth,
+					collisionHeight: collisionHeight,
+					offset: offset,
+					my: options.my,
+					at: options.at
+				});
+			}
+		});
+
+		if ( $.fn.bgiframe ) {
+			elem.bgiframe();
+		}
+		elem.offset( $.extend( position, { using: options.using } ) );
+	});
+};
+
+$.ui.position = {
+	fit: {
+		left: function( position, data ) {
+			var win = $( window ),
+				over = data.collisionPosition.left + data.collisionWidth - win.width() - win.scrollLeft();
+			position.left = over > 0 ? position.left - over : Math.max( position.left - data.collisionPosition.left, position.left );
+		},
+		top: function( position, data ) {
+			var win = $( window ),
+				over = data.collisionPosition.top + data.collisionHeight - win.height() - win.scrollTop();
+			position.top = over > 0 ? position.top - over : Math.max( position.top - data.collisionPosition.top, position.top );
+		}
+	},
+
+	flip: {
+		left: function( position, data ) {
+			if ( data.at[0] === center ) {
+				return;
+			}
+			var win = $( window ),
+				over = data.collisionPosition.left + data.collisionWidth - win.width() - win.scrollLeft(),
+				myOffset = data.my[ 0 ] === "left" ?
+					-data.elemWidth :
+					data.my[ 0 ] === "right" ?
+						data.elemWidth :
+						0,
+				atOffset = data.at[ 0 ] === "left" ?
+					data.targetWidth :
+					-data.targetWidth,
+				offset = -2 * data.offset[ 0 ];
+			position.left += data.collisionPosition.left < 0 ?
+				myOffset + atOffset + offset :
+				over > 0 ?
+					myOffset + atOffset + offset :
+					0;
+		},
+		top: function( position, data ) {
+			if ( data.at[1] === center ) {
+				return;
+			}
+			var win = $( window ),
+				over = data.collisionPosition.top + data.collisionHeight - win.height() - win.scrollTop(),
+				myOffset = data.my[ 1 ] === "top" ?
+					-data.elemHeight :
+					data.my[ 1 ] === "bottom" ?
+						data.elemHeight :
+						0,
+				atOffset = data.at[ 1 ] === "top" ?
+					data.targetHeight :
+					-data.targetHeight,
+				offset = -2 * data.offset[ 1 ];
+			position.top += data.collisionPosition.top < 0 ?
+				myOffset + atOffset + offset :
+				over > 0 ?
+					myOffset + atOffset + offset :
+					0;
+		}
+	}
+};
+
+// offset setter from jQuery 1.4
+if ( !$.offset.setOffset ) {
+	$.offset.setOffset = function( elem, options ) {
+		// set position first, in-case top/left are set even on static elem
+		if ( /static/.test( $.curCSS( elem, "position" ) ) ) {
+			elem.style.position = "relative";
+		}
+		var curElem   = $( elem ),
+			curOffset = curElem.offset(),
+			curTop    = parseInt( $.curCSS( elem, "top",  true ), 10 ) || 0,
+			curLeft   = parseInt( $.curCSS( elem, "left", true ), 10)  || 0,
+			props     = {
+				top:  (options.top  - curOffset.top)  + curTop,
+				left: (options.left - curOffset.left) + curLeft
+			};
+		
+		if ( 'using' in options ) {
+			options.using.call( elem, props );
+		} else {
+			curElem.css( props );
+		}
+	};
+
+	$.fn.offset = function( options ) {
+		var elem = this[ 0 ];
+		if ( !elem || !elem.ownerDocument ) { return null; }
+		if ( options ) { 
+			return this.each(function() {
+				$.offset.setOffset( this, options );
+			});
+		}
+		return _offset.call( this );
+	};
+}
+
+}( jQuery ));
+/*
+ * jQuery UI Draggable 1.8.10
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Draggables
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ *	jquery.ui.mouse.js
+ *	jquery.ui.widget.js
+ */
+(function( $, undefined ) {
+
+$.widget("ui.draggable", $.ui.mouse, {
+	widgetEventPrefix: "drag",
+	options: {
+		addClasses: true,
+		appendTo: "parent",
+		axis: false,
+		connectToSortable: false,
+		containment: false,
+		cursor: "auto",
+		cursorAt: false,
+		grid: false,
+		handle: false,
+		helper: "original",
+		iframeFix: false,
+		opacity: false,
+		refreshPositions: false,
+		revert: false,
+		revertDuration: 500,
+		scope: "default",
+		scroll: true,
+		scrollSensitivity: 20,
+		scrollSpeed: 20,
+		snap: false,
+		snapMode: "both",
+		snapTolerance: 20,
+		stack: false,
+		zIndex: false
+	},
+	_create: function() {
+
+		if (this.options.helper == 'original' && !(/^(?:r|a|f)/).test(this.element.css("position")))
+			this.element[0].style.position = 'relative';
+
+		(this.options.addClasses && this.element.addClass("ui-draggable"));
+		(this.options.disabled && this.element.addClass("ui-draggable-disabled"));
+
+		this._mouseInit();
+
+	},
+
+	destroy: function() {
+		if(!this.element.data('draggable')) return;
+		this.element
+			.removeData("draggable")
+			.unbind(".draggable")
+			.removeClass("ui-draggable"
+				+ " ui-draggable-dragging"
+				+ " ui-draggable-disabled");
+		this._mouseDestroy();
+
+		return this;
+	},
+
+	_mouseCapture: function(event) {
+
+		var o = this.options;
+
+		// among others, prevent a drag on a resizable-handle
+		if (this.helper || o.disabled || $(event.target).is('.ui-resizable-handle'))
+			return false;
+
+		//Quit if we're not on a valid handle
+		this.handle = this._getHandle(event);
+		if (!this.handle)
+			return false;
+
+		return true;
+
+	},
+
+	_mouseStart: function(event) {
+
+		var o = this.options;
+
+		//Create and append the visible helper
+		this.helper = this._createHelper(event);
+
+		//Cache the helper size
+		this._cacheHelperProportions();
+
+		//If ddmanager is used for droppables, set the global draggable
+		if($.ui.ddmanager)
+			$.ui.ddmanager.current = this;
+
+		/*
+		 * - Position generation -
+		 * This block generates everything position related - it's the core of draggables.
+		 */
+
+		//Cache the margins of the original element
+		this._cacheMargins();
+
+		//Store the helper's css position
+		this.cssPosition = this.helper.css("position");
+		this.scrollParent = this.helper.scrollParent();
+
+		//The element's absolute position on the page minus margins
+		this.offset = this.positionAbs = this.element.offset();
+		this.offset = {
+			top: this.offset.top - this.margins.top,
+			left: this.offset.left - this.margins.left
+		};
+
+		$.extend(this.offset, {
+			click: { //Where the click happened, relative to the element
+				left: event.pageX - this.offset.left,
+				top: event.pageY - this.offset.top
+			},
+			parent: this._getParentOffset(),
+			relative: this._getRelativeOffset() //This is a relative to absolute position minus the actual position calculation - only used for relative positioned helper
+		});
+
+		//Generate the original position
+		this.originalPosition = this.position = this._generatePosition(event);
+		this.originalPageX = event.pageX;
+		this.originalPageY = event.pageY;
+
+		//Adjust the mouse offset relative to the helper if 'cursorAt' is supplied
+		(o.cursorAt && this._adjustOffsetFromHelper(o.cursorAt));
+
+		//Set a containment if given in the options
+		if(o.containment)
+			this._setContainment();
+
+		//Trigger event + callbacks
+		if(this._trigger("start", event) === false) {
+			this._clear();
+			return false;
+		}
+
+		//Recache the helper size
+		this._cacheHelperProportions();
+
+		//Prepare the droppable offsets
+		if ($.ui.ddmanager && !o.dropBehaviour)
+			$.ui.ddmanager.prepareOffsets(this, event);
+
+		this.helper.addClass("ui-draggable-dragging");
+		this._mouseDrag(event, true); //Execute the drag once - this causes the helper not to be visible before getting its correct position
+		return true;
+	},
+
+	_mouseDrag: function(event, noPropagation) {
+
+		//Compute the helpers position
+		this.position = this._generatePosition(event);
+		this.positionAbs = this._convertPositionTo("absolute");
+
+		//Call plugins and callbacks and use the resulting position if something is returned
+		if (!noPropagation) {
+			var ui = this._uiHash();
+			if(this._trigger('drag', event, ui) === false) {
+				this._mouseUp({});
+				return false;
+			}
+			this.position = ui.position;
+		}
+
+		if(!this.options.axis || this.options.axis != "y") this.helper[0].style.left = this.position.left+'px';
+		if(!this.options.axis || this.options.axis != "x") this.helper[0].style.top = this.position.top+'px';
+		if($.ui.ddmanager) $.ui.ddmanager.drag(this, event);
+
+		return false;
+	},
+
+	_mouseStop: function(event) {
+
+		//If we are using droppables, inform the manager about the drop
+		var dropped = false;
+		if ($.ui.ddmanager && !this.options.dropBehaviour)
+			dropped = $.ui.ddmanager.drop(this, event);
+
+		//if a drop comes from outside (a sortable)
+		if(this.dropped) {
+			dropped = this.dropped;
+			this.dropped = false;
+		}
+		
+		//if the original element is removed, don't bother to continue if helper is set to "original"
+		if((!this.element[0] || !this.element[0].parentNode) && this.options.helper == "original")
+			return false;
+
+		if((this.options.revert == "invalid" && !dropped) || (this.options.revert == "valid" && dropped) || this.options.revert === true || ($.isFunction(this.options.revert) && this.options.revert.call(this.element, dropped))) {
+			var self = this;
+			$(this.helper).animate(this.originalPosition, parseInt(this.options.revertDuration, 10), function() {
+				if(self._trigger("stop", event) !== false) {
+					self._clear();
+				}
+			});
+		} else {
+			if(this._trigger("stop", event) !== false) {
+				this._clear();
+			}
+		}
+
+		return false;
+	},
+	
+	cancel: function() {
+		
+		if(this.helper.is(".ui-draggable-dragging")) {
+			this._mouseUp({});
+		} else {
+			this._clear();
+		}
+		
+		return this;
+		
+	},
+
+	_getHandle: function(event) {
+
+		var handle = !this.options.handle || !$(this.options.handle, this.element).length ? true : false;
+		$(this.options.handle, this.element)
+			.find("*")
+			.andSelf()
+			.each(function() {
+				if(this == event.target) handle = true;
+			});
+
+		return handle;
+
+	},
+
+	_createHelper: function(event) {
+
+		var o = this.options;
+		var helper = $.isFunction(o.helper) ? $(o.helper.apply(this.element[0], [event])) : (o.helper == 'clone' ? this.element.clone() : this.element);
+
+		if(!helper.parents('body').length)
+			helper.appendTo((o.appendTo == 'parent' ? this.element[0].parentNode : o.appendTo));
+
+		if(helper[0] != this.element[0] && !(/(fixed|absolute)/).test(helper.css("position")))
+			helper.css("position", "absolute");
+
+		return helper;
+
+	},
+
+	_adjustOffsetFromHelper: function(obj) {
+		if (typeof obj == 'string') {
+			obj = obj.split(' ');
+		}
+		if ($.isArray(obj)) {
+			obj = {left: +obj[0], top: +obj[1] || 0};
+		}
+		if ('left' in obj) {
+			this.offset.click.left = obj.left + this.margins.left;
+		}
+		if ('right' in obj) {
+			this.offset.click.left = this.helperProportions.width - obj.right + this.margins.left;
+		}
+		if ('top' in obj) {
+			this.offset.click.top = obj.top + this.margins.top;
+		}
+		if ('bottom' in obj) {
+			this.offset.click.top = this.helperProportions.height - obj.bottom + this.margins.top;
+		}
+	},
+
+	_getParentOffset: function() {
+
+		//Get the offsetParent and cache its position
+		this.offsetParent = this.helper.offsetParent();
+		var po = this.offsetParent.offset();
+
+		// This is a special case where we need to modify a offset calculated on start, since the following happened:
+		// 1. The position of the helper is absolute, so it's position is calculated based on the next positioned parent
+		// 2. The actual offset parent is a child of the scroll parent, and the scroll parent isn't the document, which means that
+		//    the scroll is included in the initial calculation of the offset of the parent, and never recalculated upon drag
+		if(this.cssPosition == 'absolute' && this.scrollParent[0] != document && $.ui.contains(this.scrollParent[0], this.offsetParent[0])) {
+			po.left += this.scrollParent.scrollLeft();
+			po.top += this.scrollParent.scrollTop();
+		}
+
+		if((this.offsetParent[0] == document.body) //This needs to be actually done for all browsers, since pageX/pageY includes this information
+		|| (this.offsetParent[0].tagName && this.offsetParent[0].tagName.toLowerCase() == 'html' && $.browser.msie)) //Ugly IE fix
+			po = { top: 0, left: 0 };
+
+		return {
+			top: po.top + (parseInt(this.offsetParent.css("borderTopWidth"),10) || 0),
+			left: po.left + (parseInt(this.offsetParent.css("borderLeftWidth"),10) || 0)
+		};
+
+	},
+
+	_getRelativeOffset: function() {
+
+		if(this.cssPosition == "relative") {
+			var p = this.element.position();
+			return {
+				top: p.top - (parseInt(this.helper.css("top"),10) || 0) + this.scrollParent.scrollTop(),
+				left: p.left - (parseInt(this.helper.css("left"),10) || 0) + this.scrollParent.scrollLeft()
+			};
+		} else {
+			return { top: 0, left: 0 };
+		}
+
+	},
+
+	_cacheMargins: function() {
+		this.margins = {
+			left: (parseInt(this.element.css("marginLeft"),10) || 0),
+			top: (parseInt(this.element.css("marginTop"),10) || 0)
+		};
+	},
+
+	_cacheHelperProportions: function() {
+		this.helperProportions = {
+			width: this.helper.outerWidth(),
+			height: this.helper.outerHeight()
+		};
+	},
+
+	_setContainment: function() {
+
+		var o = this.options;
+		if(o.containment == 'parent') o.containment = this.helper[0].parentNode;
+		if(o.containment == 'document' || o.containment == 'window') this.containment = [
+			(o.containment == 'document' ? 0 : $(window).scrollLeft()) - this.offset.relative.left - this.offset.parent.left,
+			(o.containment == 'document' ? 0 : $(window).scrollTop()) - this.offset.relative.top - this.offset.parent.top,
+			(o.containment == 'document' ? 0 : $(window).scrollLeft()) + $(o.containment == 'document' ? document : window).width() - this.helperProportions.width - this.margins.left,
+			(o.containment == 'document' ? 0 : $(window).scrollTop()) + ($(o.containment == 'document' ? document : window).height() || document.body.parentNode.scrollHeight) - this.helperProportions.height - this.margins.top
+		];
+
+		if(!(/^(document|window|parent)$/).test(o.containment) && o.containment.constructor != Array) {
+			var ce = $(o.containment)[0]; if(!ce) return;
+			var co = $(o.containment).offset();
+			var over = ($(ce).css("overflow") != 'hidden');
+
+			this.containment = [
+				co.left + (parseInt($(ce).css("borderLeftWidth"),10) || 0) + (parseInt($(ce).css("paddingLeft"),10) || 0) - this.margins.left,
+				co.top + (parseInt($(ce).css("borderTopWidth"),10) || 0) + (parseInt($(ce).css("paddingTop"),10) || 0) - this.margins.top,
+				co.left+(over ? Math.max(ce.scrollWidth,ce.offsetWidth) : ce.offsetWidth) - (parseInt($(ce).css("borderLeftWidth"),10) || 0) - (parseInt($(ce).css("paddingRight"),10) || 0) - this.helperProportions.width - this.margins.left,
+				co.top+(over ? Math.max(ce.scrollHeight,ce.offsetHeight) : ce.offsetHeight) - (parseInt($(ce).css("borderTopWidth"),10) || 0) - (parseInt($(ce).css("paddingBottom"),10) || 0) - this.helperProportions.height - this.margins.top
+			];
+		} else if(o.containment.constructor == Array) {
+			this.containment = o.containment;
+		}
+
+	},
+
+	_convertPositionTo: function(d, pos) {
+
+		if(!pos) pos = this.position;
+		var mod = d == "absolute" ? 1 : -1;
+		var o = this.options, scroll = this.cssPosition == 'absolute' && !(this.scrollParent[0] != document && $.ui.contains(this.scrollParent[0], this.offsetParent[0])) ? this.offsetParent : this.scrollParent, scrollIsRootNode = (/(html|body)/i).test(scroll[0].tagName);
+
+		return {
+			top: (
+				pos.top																	// The absolute mouse position
+				+ this.offset.relative.top * mod										// Only for relative positioned nodes: Relative offset from element to offset parent
+				+ this.offset.parent.top * mod											// The offsetParent's offset without borders (offset + border)
+				- ($.browser.safari && $.browser.version < 526 && this.cssPosition == 'fixed' ? 0 : ( this.cssPosition == 'fixed' ? -this.scrollParent.scrollTop() : ( scrollIsRootNode ? 0 : scroll.scrollTop() ) ) * mod)
+			),
+			left: (
+				pos.left																// The absolute mouse position
+				+ this.offset.relative.left * mod										// Only for relative positioned nodes: Relative offset from element to offset parent
+				+ this.offset.parent.left * mod											// The offsetParent's offset without borders (offset + border)
+				- ($.browser.safari && $.browser.version < 526 && this.cssPosition == 'fixed' ? 0 : ( this.cssPosition == 'fixed' ? -this.scrollParent.scrollLeft() : scrollIsRootNode ? 0 : scroll.scrollLeft() ) * mod)
+			)
+		};
+
+	},
+
+	_generatePosition: function(event) {
+
+		var o = this.options, scroll = this.cssPosition == 'absolute' && !(this.scrollParent[0] != document && $.ui.contains(this.scrollParent[0], this.offsetParent[0])) ? this.offsetParent : this.scrollParent, scrollIsRootNode = (/(html|body)/i).test(scroll[0].tagName);
+		var pageX = event.pageX;
+		var pageY = event.pageY;
+
+		/*
+		 * - Position constraining -
+		 * Constrain the position to a mix of grid, containment.
+		 */
+
+		if(this.originalPosition) { //If we are not dragging yet, we won't check for options
+
+			if(this.containment) {
+				if(event.pageX - this.offset.click.left < this.containment[0]) pageX = this.containment[0] + this.offset.click.left;
+				if(event.pageY - this.offset.click.top < this.containment[1]) pageY = this.containment[1] + this.offset.click.top;
+				if(event.pageX - this.offset.click.left > this.containment[2]) pageX = this.containment[2] + this.offset.click.left;
+				if(event.pageY - this.offset.click.top > this.containment[3]) pageY = this.containment[3] + this.offset.click.top;
+			}
+
+			if(o.grid) {
+				var top = this.originalPageY + Math.round((pageY - this.originalPageY) / o.grid[1]) * o.grid[1];
+				pageY = this.containment ? (!(top - this.offset.click.top < this.containment[1] || top - this.offset.click.top > this.containment[3]) ? top : (!(top - this.offset.click.top < this.containment[1]) ? top - o.grid[1] : top + o.grid[1])) : top;
+
+				var left = this.originalPageX + Math.round((pageX - this.originalPageX) / o.grid[0]) * o.grid[0];
+				pageX = this.containment ? (!(left - this.offset.click.left < this.containment[0] || left - this.offset.click.left > this.containment[2]) ? left : (!(left - this.offset.click.left < this.containment[0]) ? left - o.grid[0] : left + o.grid[0])) : left;
+			}
+
+		}
+
+		return {
+			top: (
+				pageY																// The absolute mouse position
+				- this.offset.click.top													// Click offset (relative to the element)
+				- this.offset.relative.top												// Only for relative positioned nodes: Relative offset from element to offset parent
+				- this.offset.parent.top												// The offsetParent's offset without borders (offset + border)
+				+ ($.browser.safari && $.browser.version < 526 && this.cssPosition == 'fixed' ? 0 : ( this.cssPosition == 'fixed' ? -this.scrollParent.scrollTop() : ( scrollIsRootNode ? 0 : scroll.scrollTop() ) ))
+			),
+			left: (
+				pageX																// The absolute mouse position
+				- this.offset.click.left												// Click offset (relative to the element)
+				- this.offset.relative.left												// Only for relative positioned nodes: Relative offset from element to offset parent
+				- this.offset.parent.left												// The offsetParent's offset without borders (offset + border)
+				+ ($.browser.safari && $.browser.version < 526 && this.cssPosition == 'fixed' ? 0 : ( this.cssPosition == 'fixed' ? -this.scrollParent.scrollLeft() : scrollIsRootNode ? 0 : scroll.scrollLeft() ))
+			)
+		};
+
+	},
+
+	_clear: function() {
+		this.helper.removeClass("ui-draggable-dragging");
+		if(this.helper[0] != this.element[0] && !this.cancelHelperRemoval) this.helper.remove();
+		//if($.ui.ddmanager) $.ui.ddmanager.current = null;
+		this.helper = null;
+		this.cancelHelperRemoval = false;
+	},
+
+	// From now on bulk stuff - mainly helpers
+
+	_trigger: function(type, event, ui) {
+		ui = ui || this._uiHash();
+		$.ui.plugin.call(this, type, [event, ui]);
+		if(type == "drag") this.positionAbs = this._convertPositionTo("absolute"); //The absolute position has to be recalculated after plugins
+		return $.Widget.prototype._trigger.call(this, type, event, ui);
+	},
+
+	plugins: {},
+
+	_uiHash: function(event) {
+		return {
+			helper: this.helper,
+			position: this.position,
+			originalPosition: this.originalPosition,
+			offset: this.positionAbs
+		};
+	}
+
+});
+
+$.extend($.ui.draggable, {
+	version: "1.8.10"
+});
+
+$.ui.plugin.add("draggable", "connectToSortable", {
+	start: function(event, ui) {
+
+		var inst = $(this).data("draggable"), o = inst.options,
+			uiSortable = $.extend({}, ui, { item: inst.element });
+		inst.sortables = [];
+		$(o.connectToSortable).each(function() {
+			var sortable = $.data(this, 'sortable');
+			if (sortable && !sortable.options.disabled) {
+				inst.sortables.push({
+					instance: sortable,
+					shouldRevert: sortable.options.revert
+				});
+				sortable._refreshItems();	//Do a one-time refresh at start to refresh the containerCache
+				sortable._trigger("activate", event, uiSortable);
+			}
+		});
+
+	},
+	stop: function(event, ui) {
+
+		//If we are still over the sortable, we fake the stop event of the sortable, but also remove helper
+		var inst = $(this).data("draggable"),
+			uiSortable = $.extend({}, ui, { item: inst.element });
+
+		$.each(inst.sortables, function() {
+			if(this.instance.isOver) {
+
+				this.instance.isOver = 0;
+
+				inst.cancelHelperRemoval = true; //Don't remove the helper in the draggable instance
+				this.instance.cancelHelperRemoval = false; //Remove it in the sortable instance (so sortable plugins like revert still work)
+
+				//The sortable revert is supported, and we have to set a temporary dropped variable on the draggable to support revert: 'valid/invalid'
+				if(this.shouldRevert) this.instance.options.revert = true;
+
+				//Trigger the stop of the sortable
+				this.instance._mouseStop(event);
+
+				this.instance.options.helper = this.instance.options._helper;
+
+				//If the helper has been the original item, restore properties in the sortable
+				if(inst.options.helper == 'original')
+					this.instance.currentItem.css({ top: 'auto', left: 'auto' });
+
+			} else {
+				this.instance.cancelHelperRemoval = false; //Remove the helper in the sortable instance
+				this.instance._trigger("deactivate", event, uiSortable);
+			}
+
+		});
+
+	},
+	drag: function(event, ui) {
+
+		var inst = $(this).data("draggable"), self = this;
+
+		var checkPos = function(o) {
+			var dyClick = this.offset.click.top, dxClick = this.offset.click.left;
+			var helperTop = this.positionAbs.top, helperLeft = this.positionAbs.left;
+			var itemHeight = o.height, itemWidth = o.width;
+			var itemTop = o.top, itemLeft = o.left;
+
+			return $.ui.isOver(helperTop + dyClick, helperLeft + dxClick, itemTop, itemLeft, itemHeight, itemWidth);
+		};
+
+		$.each(inst.sortables, function(i) {
+			
+			//Copy over some variables to allow calling the sortable's native _intersectsWith
+			this.instance.positionAbs = inst.positionAbs;
+			this.instance.helperProportions = inst.helperProportions;
+			this.instance.offset.click = inst.offset.click;
+			
+			if(this.instance._intersectsWith(this.instance.containerCache)) {
+
+				//If it intersects, we use a little isOver variable and set it once, so our move-in stuff gets fired only once
+				if(!this.instance.isOver) {
+
+					this.instance.isOver = 1;
+					//Now we fake the start of dragging for the sortable instance,
+					//by cloning the list group item, appending it to the sortable and using it as inst.currentItem
+					//We can then fire the start event of the sortable with our passed browser event, and our own helper (so it doesn't create a new one)
+					this.instance.currentItem = $(self).clone().appendTo(this.instance.element).data("sortable-item", true);
+					this.instance.options._helper = this.instance.options.helper; //Store helper option to later restore it
+					this.instance.options.helper = function() { return ui.helper[0]; };
+
+					event.target = this.instance.currentItem[0];
+					this.instance._mouseCapture(event, true);
+					this.instance._mouseStart(event, true, true);
+
+					//Because the browser event is way off the new appended portlet, we modify a couple of variables to reflect the changes
+					this.instance.offset.click.top = inst.offset.click.top;
+					this.instance.offset.click.left = inst.offset.click.left;
+					this.instance.offset.parent.left -= inst.offset.parent.left - this.instance.offset.parent.left;
+					this.instance.offset.parent.top -= inst.offset.parent.top - this.instance.offset.parent.top;
+
+					inst._trigger("toSortable", event);
+					inst.dropped = this.instance.element; //draggable revert needs that
+					//hack so receive/update callbacks work (mostly)
+					inst.currentItem = inst.element;
+					this.instance.fromOutside = inst;
+
+				}
+
+				//Provided we did all the previous steps, we can fire the drag event of the sortable on every draggable drag, when it intersects with the sortable
+				if(this.instance.currentItem) this.instance._mouseDrag(event);
+
+			} else {
+
+				//If it doesn't intersect with the sortable, and it intersected before,
+				//we fake the drag stop of the sortable, but make sure it doesn't remove the helper by using cancelHelperRemoval
+				if(this.instance.isOver) {
+
+					this.instance.isOver = 0;
+					this.instance.cancelHelperRemoval = true;
+					
+					//Prevent reverting on this forced stop
+					this.instance.options.revert = false;
+					
+					// The out event needs to be triggered independently
+					this.instance._trigger('out', event, this.instance._uiHash(this.instance));
+					
+					this.instance._mouseStop(event, true);
+					this.instance.options.helper = this.instance.options._helper;
+
+					//Now we remove our currentItem, the list group clone again, and the placeholder, and animate the helper back to it's original size
+					this.instance.currentItem.remove();
+					if(this.instance.placeholder) this.instance.placeholder.remove();
+
+					inst._trigger("fromSortable", event);
+					inst.dropped = false; //draggable revert needs that
+				}
+
+			};
+
+		});
+
+	}
+});
+
+$.ui.plugin.add("draggable", "cursor", {
+	start: function(event, ui) {
+		var t = $('body'), o = $(this).data('draggable').options;
+		if (t.css("cursor")) o._cursor = t.css("cursor");
+		t.css("cursor", o.cursor);
+	},
+	stop: function(event, ui) {
+		var o = $(this).data('draggable').options;
+		if (o._cursor) $('body').css("cursor", o._cursor);
+	}
+});
+
+$.ui.plugin.add("draggable", "iframeFix", {
+	start: function(event, ui) {
+		var o = $(this).data('draggable').options;
+		$(o.iframeFix === true ? "iframe" : o.iframeFix).each(function() {
+			$('<div class="ui-draggable-iframeFix" style="background: #fff;"></div>')
+			.css({
+				width: this.offsetWidth+"px", height: this.offsetHeight+"px",
+				position: "absolute", opacity: "0.001", zIndex: 1000
+			})
+			.css($(this).offset())
+			.appendTo("body");
+		});
+	},
+	stop: function(event, ui) {
+		$("div.ui-draggable-iframeFix").each(function() { this.parentNode.removeChild(this); }); //Remove frame helpers
+	}
+});
+
+$.ui.plugin.add("draggable", "opacity", {
+	start: function(event, ui) {
+		var t = $(ui.helper), o = $(this).data('draggable').options;
+		if(t.css("opacity")) o._opacity = t.css("opacity");
+		t.css('opacity', o.opacity);
+	},
+	stop: function(event, ui) {
+		var o = $(this).data('draggable').options;
+		if(o._opacity) $(ui.helper).css('opacity', o._opacity);
+	}
+});
+
+$.ui.plugin.add("draggable", "scroll", {
+	start: function(event, ui) {
+		var i = $(this).data("draggable");
+		if(i.scrollParent[0] != document && i.scrollParent[0].tagName != 'HTML') i.overflowOffset = i.scrollParent.offset();
+	},
+	drag: function(event, ui) {
+
+		var i = $(this).data("draggable"), o = i.options, scrolled = false;
+
+		if(i.scrollParent[0] != document && i.scrollParent[0].tagName != 'HTML') {
+
+			if(!o.axis || o.axis != 'x') {
+				if((i.overflowOffset.top + i.scrollParent[0].offsetHeight) - event.pageY < o.scrollSensitivity)
+					i.scrollParent[0].scrollTop = scrolled = i.scrollParent[0].scrollTop + o.scrollSpeed;
+				else if(event.pageY - i.overflowOffset.top < o.scrollSensitivity)
+					i.scrollParent[0].scrollTop = scrolled = i.scrollParent[0].scrollTop - o.scrollSpeed;
+			}
+
+			if(!o.axis || o.axis != 'y') {
+				if((i.overflowOffset.left + i.scrollParent[0].offsetWidth) - event.pageX < o.scrollSensitivity)
+					i.scrollParent[0].scrollLeft = scrolled = i.scrollParent[0].scrollLeft + o.scrollSpeed;
+				else if(event.pageX - i.overflowOffset.left < o.scrollSensitivity)
+					i.scrollParent[0].scrollLeft = scrolled = i.scrollParent[0].scrollLeft - o.scrollSpeed;
+			}
+
+		} else {
+
+			if(!o.axis || o.axis != 'x') {
+				if(event.pageY - $(document).scrollTop() < o.scrollSensitivity)
+					scrolled = $(document).scrollTop($(document).scrollTop() - o.scrollSpeed);
+				else if($(window).height() - (event.pageY - $(document).scrollTop()) < o.scrollSensitivity)
+					scrolled = $(document).scrollTop($(document).scrollTop() + o.scrollSpeed);
+			}
+
+			if(!o.axis || o.axis != 'y') {
+				if(event.pageX - $(document).scrollLeft() < o.scrollSensitivity)
+					scrolled = $(document).scrollLeft($(document).scrollLeft() - o.scrollSpeed);
+				else if($(window).width() - (event.pageX - $(document).scrollLeft()) < o.scrollSensitivity)
+					scrolled = $(document).scrollLeft($(document).scrollLeft() + o.scrollSpeed);
+			}
+
+		}
+
+		if(scrolled !== false && $.ui.ddmanager && !o.dropBehaviour)
+			$.ui.ddmanager.prepareOffsets(i, event);
+
+	}
+});
+
+$.ui.plugin.add("draggable", "snap", {
+	start: function(event, ui) {
+
+		var i = $(this).data("draggable"), o = i.options;
+		i.snapElements = [];
+
+		$(o.snap.constructor != String ? ( o.snap.items || ':data(draggable)' ) : o.snap).each(function() {
+			var $t = $(this); var $o = $t.offset();
+			if(this != i.element[0]) i.snapElements.push({
+				item: this,
+				width: $t.outerWidth(), height: $t.outerHeight(),
+				top: $o.top, left: $o.left
+			});
+		});
+
+	},
+	drag: function(event, ui) {
+
+		var inst = $(this).data("draggable"), o = inst.options;
+		var d = o.snapTolerance;
+
+		var x1 = ui.offset.left, x2 = x1 + inst.helperProportions.width,
+			y1 = ui.offset.top, y2 = y1 + inst.helperProportions.height;
+
+		for (var i = inst.snapElements.length - 1; i >= 0; i--){
+
+			var l = inst.snapElements[i].left, r = l + inst.snapElements[i].width,
+				t = inst.snapElements[i].top, b = t + inst.snapElements[i].height;
+
+			//Yes, I know, this is insane ;)
+			if(!((l-d < x1 && x1 < r+d && t-d < y1 && y1 < b+d) || (l-d < x1 && x1 < r+d && t-d < y2 && y2 < b+d) || (l-d < x2 && x2 < r+d && t-d < y1 && y1 < b+d) || (l-d < x2 && x2 < r+d && t-d < y2 && y2 < b+d))) {
+				if(inst.snapElements[i].snapping) (inst.options.snap.release && inst.options.snap.release.call(inst.element, event, $.extend(inst._uiHash(), { snapItem: inst.snapElements[i].item })));
+				inst.snapElements[i].snapping = false;
+				continue;
+			}
+
+			if(o.snapMode != 'inner') {
+				var ts = Math.abs(t - y2) <= d;
+				var bs = Math.abs(b - y1) <= d;
+				var ls = Math.abs(l - x2) <= d;
+				var rs = Math.abs(r - x1) <= d;
+				if(ts) ui.position.top = inst._convertPositionTo("relative", { top: t - inst.helperProportions.height, left: 0 }).top - inst.margins.top;
+				if(bs) ui.position.top = inst._convertPositionTo("relative", { top: b, left: 0 }).top - inst.margins.top;
+				if(ls) ui.position.left = inst._convertPositionTo("relative", { top: 0, left: l - inst.helperProportions.width }).left - inst.margins.left;
+				if(rs) ui.position.left = inst._convertPositionTo("relative", { top: 0, left: r }).left - inst.margins.left;
+			}
+
+			var first = (ts || bs || ls || rs);
+
+			if(o.snapMode != 'outer') {
+				var ts = Math.abs(t - y1) <= d;
+				var bs = Math.abs(b - y2) <= d;
+				var ls = Math.abs(l - x1) <= d;
+				var rs = Math.abs(r - x2) <= d;
+				if(ts) ui.position.top = inst._convertPositionTo("relative", { top: t, left: 0 }).top - inst.margins.top;
+				if(bs) ui.position.top = inst._convertPositionTo("relative", { top: b - inst.helperProportions.height, left: 0 }).top - inst.margins.top;
+				if(ls) ui.position.left = inst._convertPositionTo("relative", { top: 0, left: l }).left - inst.margins.left;
+				if(rs) ui.position.left = inst._convertPositionTo("relative", { top: 0, left: r - inst.helperProportions.width }).left - inst.margins.left;
+			}
+
+			if(!inst.snapElements[i].snapping && (ts || bs || ls || rs || first))
+				(inst.options.snap.snap && inst.options.snap.snap.call(inst.element, event, $.extend(inst._uiHash(), { snapItem: inst.snapElements[i].item })));
+			inst.snapElements[i].snapping = (ts || bs || ls || rs || first);
+
+		};
+
+	}
+});
+
+$.ui.plugin.add("draggable", "stack", {
+	start: function(event, ui) {
+
+		var o = $(this).data("draggable").options;
+
+		var group = $.makeArray($(o.stack)).sort(function(a,b) {
+			return (parseInt($(a).css("zIndex"),10) || 0) - (parseInt($(b).css("zIndex"),10) || 0);
+		});
+		if (!group.length) { return; }
+		
+		var min = parseInt(group[0].style.zIndex) || 0;
+		$(group).each(function(i) {
+			this.style.zIndex = min + i;
+		});
+
+		this[0].style.zIndex = min + group.length;
+
+	}
+});
+
+$.ui.plugin.add("draggable", "zIndex", {
+	start: function(event, ui) {
+		var t = $(ui.helper), o = $(this).data("draggable").options;
+		if(t.css("zIndex")) o._zIndex = t.css("zIndex");
+		t.css('zIndex', o.zIndex);
+	},
+	stop: function(event, ui) {
+		var o = $(this).data("draggable").options;
+		if(o._zIndex) $(ui.helper).css('zIndex', o._zIndex);
+	}
+});
+
+})(jQuery);
+/*
+ * jQuery UI Droppable 1.8.10
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Droppables
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ *	jquery.ui.widget.js
+ *	jquery.ui.mouse.js
+ *	jquery.ui.draggable.js
+ */
+(function( $, undefined ) {
+
+$.widget("ui.droppable", {
+	widgetEventPrefix: "drop",
+	options: {
+		accept: '*',
+		activeClass: false,
+		addClasses: true,
+		greedy: false,
+		hoverClass: false,
+		scope: 'default',
+		tolerance: 'intersect'
+	},
+	_create: function() {
+
+		var o = this.options, accept = o.accept;
+		this.isover = 0; this.isout = 1;
+
+		this.accept = $.isFunction(accept) ? accept : function(d) {
+			return d.is(accept);
+		};
+
+		//Store the droppable's proportions
+		this.proportions = { width: this.element[0].offsetWidth, height: this.element[0].offsetHeight };
+
+		// Add the reference and positions to the manager
+		$.ui.ddmanager.droppables[o.scope] = $.ui.ddmanager.droppables[o.scope] || [];
+		$.ui.ddmanager.droppables[o.scope].push(this);
+
+		(o.addClasses && this.element.addClass("ui-droppable"));
+
+	},
+
+	destroy: function() {
+		var drop = $.ui.ddmanager.droppables[this.options.scope];
+		for ( var i = 0; i < drop.length; i++ )
+			if ( drop[i] == this )
+				drop.splice(i, 1);
+
+		this.element
+			.removeClass("ui-droppable ui-droppable-disabled")
+			.removeData("droppable")
+			.unbind(".droppable");
+
+		return this;
+	},
+
+	_setOption: function(key, value) {
+
+		if(key == 'accept') {
+			this.accept = $.isFunction(value) ? value : function(d) {
+				return d.is(value);
+			};
+		}
+		$.Widget.prototype._setOption.apply(this, arguments);
+	},
+
+	_activate: function(event) {
+		var draggable = $.ui.ddmanager.current;
+		if(this.options.activeClass) this.element.addClass(this.options.activeClass);
+		(draggable && this._trigger('activate', event, this.ui(draggable)));
+	},
+
+	_deactivate: function(event) {
+		var draggable = $.ui.ddmanager.current;
+		if(this.options.activeClass) this.element.removeClass(this.options.activeClass);
+		(draggable && this._trigger('deactivate', event, this.ui(draggable)));
+	},
+
+	_over: function(event) {
+
+		var draggable = $.ui.ddmanager.current;
+		if (!draggable || (draggable.currentItem || draggable.element)[0] == this.element[0]) return; // Bail if draggable and droppable are same element
+
+		if (this.accept.call(this.element[0],(draggable.currentItem || draggable.element))) {
+			if(this.options.hoverClass) this.element.addClass(this.options.hoverClass);
+			this._trigger('over', event, this.ui(draggable));
+		}
+
+	},
+
+	_out: function(event) {
+
+		var draggable = $.ui.ddmanager.current;
+		if (!draggable || (draggable.currentItem || draggable.element)[0] == this.element[0]) return; // Bail if draggable and droppable are same element
+
+		if (this.accept.call(this.element[0],(draggable.currentItem || draggable.element))) {
+			if(this.options.hoverClass) this.element.removeClass(this.options.hoverClass);
+			this._trigger('out', event, this.ui(draggable));
+		}
+
+	},
+
+	_drop: function(event,custom) {
+
+		var draggable = custom || $.ui.ddmanager.current;
+		if (!draggable || (draggable.currentItem || draggable.element)[0] == this.element[0]) return false; // Bail if draggable and droppable are same element
+
+		var childrenIntersection = false;
+		this.element.find(":data(droppable)").not(".ui-draggable-dragging").each(function() {
+			var inst = $.data(this, 'droppable');
+			if(
+				inst.options.greedy
+				&& !inst.options.disabled
+				&& inst.options.scope == draggable.options.scope
+				&& inst.accept.call(inst.element[0], (draggable.currentItem || draggable.element))
+				&& $.ui.intersect(draggable, $.extend(inst, { offset: inst.element.offset() }), inst.options.tolerance)
+			) { childrenIntersection = true; return false; }
+		});
+		if(childrenIntersection) return false;
+
+		if(this.accept.call(this.element[0],(draggable.currentItem || draggable.element))) {
+			if(this.options.activeClass) this.element.removeClass(this.options.activeClass);
+			if(this.options.hoverClass) this.element.removeClass(this.options.hoverClass);
+			this._trigger('drop', event, this.ui(draggable));
+			return this.element;
+		}
+
+		return false;
+
+	},
+
+	ui: function(c) {
+		return {
+			draggable: (c.currentItem || c.element),
+			helper: c.helper,
+			position: c.position,
+			offset: c.positionAbs
+		};
+	}
+
+});
+
+$.extend($.ui.droppable, {
+	version: "1.8.10"
+});
+
+$.ui.intersect = function(draggable, droppable, toleranceMode) {
+
+	if (!droppable.offset) return false;
+
+	var x1 = (draggable.positionAbs || draggable.position.absolute).left, x2 = x1 + draggable.helperProportions.width,
+		y1 = (draggable.positionAbs || draggable.position.absolute).top, y2 = y1 + draggable.helperProportions.height;
+	var l = droppable.offset.left, r = l + droppable.proportions.width,
+		t = droppable.offset.top, b = t + droppable.proportions.height;
+
+	switch (toleranceMode) {
+		case 'fit':
+			return (l <= x1 && x2 <= r
+				&& t <= y1 && y2 <= b);
+			break;
+		case 'intersect':
+			return (l < x1 + (draggable.helperProportions.width / 2) // Right Half
+				&& x2 - (draggable.helperProportions.width / 2) < r // Left Half
+				&& t < y1 + (draggable.helperProportions.height / 2) // Bottom Half
+				&& y2 - (draggable.helperProportions.height / 2) < b ); // Top Half
+			break;
+		case 'pointer':
+			var draggableLeft = ((draggable.positionAbs || draggable.position.absolute).left + (draggable.clickOffset || draggable.offset.click).left),
+				draggableTop = ((draggable.positionAbs || draggable.position.absolute).top + (draggable.clickOffset || draggable.offset.click).top),
+				isOver = $.ui.isOver(draggableTop, draggableLeft, t, l, droppable.proportions.height, droppable.proportions.width);
+			return isOver;
+			break;
+		case 'touch':
+			return (
+					(y1 >= t && y1 <= b) ||	// Top edge touching
+					(y2 >= t && y2 <= b) ||	// Bottom edge touching
+					(y1 < t && y2 > b)		// Surrounded vertically
+				) && (
+					(x1 >= l && x1 <= r) ||	// Left edge touching
+					(x2 >= l && x2 <= r) ||	// Right edge touching
+					(x1 < l && x2 > r)		// Surrounded horizontally
+				);
+			break;
+		default:
+			return false;
+			break;
+		}
+
+};
+
+/*
+	This manager tracks offsets of draggables and droppables
+*/
+$.ui.ddmanager = {
+	current: null,
+	droppables: { 'default': [] },
+	prepareOffsets: function(t, event) {
+
+		var m = $.ui.ddmanager.droppables[t.options.scope] || [];
+		var type = event ? event.type : null; // workaround for #2317
+		var list = (t.currentItem || t.element).find(":data(droppable)").andSelf();
+
+		droppablesLoop: for (var i = 0; i < m.length; i++) {
+
+			if(m[i].options.disabled || (t && !m[i].accept.call(m[i].element[0],(t.currentItem || t.element)))) continue;	//No disabled and non-accepted
+			for (var j=0; j < list.length; j++) { if(list[j] == m[i].element[0]) { m[i].proportions.height = 0; continue droppablesLoop; } }; //Filter out elements in the current dragged item
+			m[i].visible = m[i].element.css("display") != "none"; if(!m[i].visible) continue; 									//If the element is not visible, continue
+
+			m[i].offset = m[i].element.offset();
+			m[i].proportions = { width: m[i].element[0].offsetWidth, height: m[i].element[0].offsetHeight };
+
+			if(type == "mousedown") m[i]._activate.call(m[i], event); //Activate the droppable if used directly from draggables
+
+		}
+
+	},
+	drop: function(draggable, event) {
+
+		var dropped = false;
+		$.each($.ui.ddmanager.droppables[draggable.options.scope] || [], function() {
+
+			if(!this.options) return;
+			if (!this.options.disabled && this.visible && $.ui.intersect(draggable, this, this.options.tolerance))
+				dropped = dropped || this._drop.call(this, event);
+
+			if (!this.options.disabled && this.visible && this.accept.call(this.element[0],(draggable.currentItem || draggable.element))) {
+				this.isout = 1; this.isover = 0;
+				this._deactivate.call(this, event);
+			}
+
+		});
+		return dropped;
+
+	},
+	drag: function(draggable, event) {
+
+		//If you have a highly dynamic page, you might try this option. It renders positions every time you move the mouse.
+		if(draggable.options.refreshPositions) $.ui.ddmanager.prepareOffsets(draggable, event);
+
+		//Run through all droppables and check their positions based on specific tolerance options
+		$.each($.ui.ddmanager.droppables[draggable.options.scope] || [], function() {
+
+			if(this.options.disabled || this.greedyChild || !this.visible) return;
+			var intersects = $.ui.intersect(draggable, this, this.options.tolerance);
+
+			var c = !intersects && this.isover == 1 ? 'isout' : (intersects && this.isover == 0 ? 'isover' : null);
+			if(!c) return;
+
+			var parentInstance;
+			if (this.options.greedy) {
+				var parent = this.element.parents(':data(droppable):eq(0)');
+				if (parent.length) {
+					parentInstance = $.data(parent[0], 'droppable');
+					parentInstance.greedyChild = (c == 'isover' ? 1 : 0);
+				}
+			}
+
+			// we just moved into a greedy child
+			if (parentInstance && c == 'isover') {
+				parentInstance['isover'] = 0;
+				parentInstance['isout'] = 1;
+				parentInstance._out.call(parentInstance, event);
+			}
+
+			this[c] = 1; this[c == 'isout' ? 'isover' : 'isout'] = 0;
+			this[c == "isover" ? "_over" : "_out"].call(this, event);
+
+			// we just moved out of a greedy child
+			if (parentInstance && c == 'isout') {
+				parentInstance['isout'] = 0;
+				parentInstance['isover'] = 1;
+				parentInstance._over.call(parentInstance, event);
+			}
+		});
+
+	}
+};
+
+})(jQuery);
+/*
+ * jQuery UI Resizable 1.8.10
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Resizables
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ *	jquery.ui.mouse.js
+ *	jquery.ui.widget.js
+ */
+(function( $, undefined ) {
+
+$.widget("ui.resizable", $.ui.mouse, {
+	widgetEventPrefix: "resize",
+	options: {
+		alsoResize: false,
+		animate: false,
+		animateDuration: "slow",
+		animateEasing: "swing",
+		aspectRatio: false,
+		autoHide: false,
+		containment: false,
+		ghost: false,
+		grid: false,
+		handles: "e,s,se",
+		helper: false,
+		maxHeight: null,
+		maxWidth: null,
+		minHeight: 10,
+		minWidth: 10,
+		zIndex: 1000
+	},
+	_create: function() {
+
+		var self = this, o = this.options;
+		this.element.addClass("ui-resizable");
+
+		$.extend(this, {
+			_aspectRatio: !!(o.aspectRatio),
+			aspectRatio: o.aspectRatio,
+			originalElement: this.element,
+			_proportionallyResizeElements: [],
+			_helper: o.helper || o.ghost || o.animate ? o.helper || 'ui-resizable-helper' : null
+		});
+
+		//Wrap the element if it cannot hold child nodes
+		if(this.element[0].nodeName.match(/canvas|textarea|input|select|button|img/i)) {
+
+			//Opera fix for relative positioning
+			if (/relative/.test(this.element.css('position')) && $.browser.opera)
+				this.element.css({ position: 'relative', top: 'auto', left: 'auto' });
+
+			//Create a wrapper element and set the wrapper to the new current internal element
+			this.element.wrap(
+				$('<div class="ui-wrapper" style="overflow: hidden;"></div>').css({
+					position: this.element.css('position'),
+					width: this.element.outerWidth(),
+					height: this.element.outerHeight(),
+					top: this.element.css('top'),
+					left: this.element.css('left')
+				})
+			);
+
+			//Overwrite the original this.element
+			this.element = this.element.parent().data(
+				"resizable", this.element.data('resizable')
+			);
+
+			this.elementIsWrapper = true;
+
+			//Move margins to the wrapper
+			this.element.css({ marginLeft: this.originalElement.css("marginLeft"), marginTop: this.originalElement.css("marginTop"), marginRight: this.originalElement.css("marginRight"), marginBottom: this.originalElement.css("marginBottom") });
+			this.originalElement.css({ marginLeft: 0, marginTop: 0, marginRight: 0, marginBottom: 0});
+
+			//Prevent Safari textarea resize
+			this.originalResizeStyle = this.originalElement.css('resize');
+			this.originalElement.css('resize', 'none');
+
+			//Push the actual element to our proportionallyResize internal array
+			this._proportionallyResizeElements.push(this.originalElement.css({ position: 'static', zoom: 1, display: 'block' }));
+
+			// avoid IE jump (hard set the margin)
+			this.originalElement.css({ margin: this.originalElement.css('margin') });
+
+			// fix handlers offset
+			this._proportionallyResize();
+
+		}
+
+		this.handles = o.handles || (!$('.ui-resizable-handle', this.element).length ? "e,s,se" : { n: '.ui-resizable-n', e: '.ui-resizable-e', s: '.ui-resizable-s', w: '.ui-resizable-w', se: '.ui-resizable-se', sw: '.ui-resizable-sw', ne: '.ui-resizable-ne', nw: '.ui-resizable-nw' });
+		if(this.handles.constructor == String) {
+
+			if(this.handles == 'all') this.handles = 'n,e,s,w,se,sw,ne,nw';
+			var n = this.handles.split(","); this.handles = {};
+
+			for(var i = 0; i < n.length; i++) {
+
+				var handle = $.trim(n[i]), hname = 'ui-resizable-'+handle;
+				var axis = $('<div class="ui-resizable-handle ' + hname + '"></div>');
+
+				// increase zIndex of sw, se, ne, nw axis
+				//TODO : this modifies original option
+				if(/sw|se|ne|nw/.test(handle)) axis.css({ zIndex: ++o.zIndex });
+
+				//TODO : What's going on here?
+				if ('se' == handle) {
+					axis.addClass('ui-icon ui-icon-gripsmall-diagonal-se');
+				};
+
+				//Insert into internal handles object and append to element
+				this.handles[handle] = '.ui-resizable-'+handle;
+				this.element.append(axis);
+			}
+
+		}
+
+		this._renderAxis = function(target) {
+
+			target = target || this.element;
+
+			for(var i in this.handles) {
+
+				if(this.handles[i].constructor == String)
+					this.handles[i] = $(this.handles[i], this.element).show();
+
+				//Apply pad to wrapper element, needed to fix axis position (textarea, inputs, scrolls)
+				if (this.elementIsWrapper && this.originalElement[0].nodeName.match(/textarea|input|select|button/i)) {
+
+					var axis = $(this.handles[i], this.element), padWrapper = 0;
+
+					//Checking the correct pad and border
+					padWrapper = /sw|ne|nw|se|n|s/.test(i) ? axis.outerHeight() : axis.outerWidth();
+
+					//The padding type i have to apply...
+					var padPos = [ 'padding',
+						/ne|nw|n/.test(i) ? 'Top' :
+						/se|sw|s/.test(i) ? 'Bottom' :
+						/^e$/.test(i) ? 'Right' : 'Left' ].join("");
+
+					target.css(padPos, padWrapper);
+
+					this._proportionallyResize();
+
+				}
+
+				//TODO: What's that good for? There's not anything to be executed left
+				if(!$(this.handles[i]).length)
+					continue;
+
+			}
+		};
+
+		//TODO: make renderAxis a prototype function
+		this._renderAxis(this.element);
+
+		this._handles = $('.ui-resizable-handle', this.element)
+			.disableSelection();
+
+		//Matching axis name
+		this._handles.mouseover(function() {
+			if (!self.resizing) {
+				if (this.className)
+					var axis = this.className.match(/ui-resizable-(se|sw|ne|nw|n|e|s|w)/i);
+				//Axis, default = se
+				self.axis = axis && axis[1] ? axis[1] : 'se';
+			}
+		});
+
+		//If we want to auto hide the elements
+		if (o.autoHide) {
+			this._handles.hide();
+			$(this.element)
+				.addClass("ui-resizable-autohide")
+				.hover(function() {
+					$(this).removeClass("ui-resizable-autohide");
+					self._handles.show();
+				},
+				function(){
+					if (!self.resizing) {
+						$(this).addClass("ui-resizable-autohide");
+						self._handles.hide();
+					}
+				});
+		}
+
+		//Initialize the mouse interaction
+		this._mouseInit();
+
+	},
+
+	destroy: function() {
+
+		this._mouseDestroy();
+
+		var _destroy = function(exp) {
+			$(exp).removeClass("ui-resizable ui-resizable-disabled ui-resizable-resizing")
+				.removeData("resizable").unbind(".resizable").find('.ui-resizable-handle').remove();
+		};
+
+		//TODO: Unwrap at same DOM position
+		if (this.elementIsWrapper) {
+			_destroy(this.element);
+			var wrapper = this.element;
+			wrapper.after(
+				this.originalElement.css({
+					position: wrapper.css('position'),
+					width: wrapper.outerWidth(),
+					height: wrapper.outerHeight(),
+					top: wrapper.css('top'),
+					left: wrapper.css('left')
+				})
+			).remove();
+		}
+
+		this.originalElement.css('resize', this.originalResizeStyle);
+		_destroy(this.originalElement);
+
+		return this;
+	},
+
+	_mouseCapture: function(event) {
+		var handle = false;
+		for (var i in this.handles) {
+			if ($(this.handles[i])[0] == event.target) {
+				handle = true;
+			}
+		}
+
+		return !this.options.disabled && handle;
+	},
+
+	_mouseStart: function(event) {
+
+		var o = this.options, iniPos = this.element.position(), el = this.element;
+
+		this.resizing = true;
+		this.documentScroll = { top: $(document).scrollTop(), left: $(document).scrollLeft() };
+
+		// bugfix for http://dev.jquery.com/ticket/1749
+		if (el.is('.ui-draggable') || (/absolute/).test(el.css('position'))) {
+			el.css({ position: 'absolute', top: iniPos.top, left: iniPos.left });
+		}
+
+		//Opera fixing relative position
+		if ($.browser.opera && (/relative/).test(el.css('position')))
+			el.css({ position: 'relative', top: 'auto', left: 'auto' });
+
+		this._renderProxy();
+
+		var curleft = num(this.helper.css('left')), curtop = num(this.helper.css('top'));
+
+		if (o.containment) {
+			curleft += $(o.containment).scrollLeft() || 0;
+			curtop += $(o.containment).scrollTop() || 0;
+		}
+
+		//Store needed variables
+		this.offset = this.helper.offset();
+		this.position = { left: curleft, top: curtop };
+		this.size = this._helper ? { width: el.outerWidth(), height: el.outerHeight() } : { width: el.width(), height: el.height() };
+		this.originalSize = this._helper ? { width: el.outerWidth(), height: el.outerHeight() } : { width: el.width(), height: el.height() };
+		this.originalPosition = { left: curleft, top: curtop };
+		this.sizeDiff = { width: el.outerWidth() - el.width(), height: el.outerHeight() - el.height() };
+		this.originalMousePosition = { left: event.pageX, top: event.pageY };
+
+		//Aspect Ratio
+		this.aspectRatio = (typeof o.aspectRatio == 'number') ? o.aspectRatio : ((this.originalSize.width / this.originalSize.height) || 1);
+
+	    var cursor = $('.ui-resizable-' + this.axis).css('cursor');
+	    $('body').css('cursor', cursor == 'auto' ? this.axis + '-resize' : cursor);
+
+		el.addClass("ui-resizable-resizing");
+		this._propagate("start", event);
+		return true;
+	},
+
+	_mouseDrag: function(event) {
+
+		//Increase performance, avoid regex
+		var el = this.helper, o = this.options, props = {},
+			self = this, smp = this.originalMousePosition, a = this.axis;
+
+		var dx = (event.pageX-smp.left)||0, dy = (event.pageY-smp.top)||0;
+		var trigger = this._change[a];
+		if (!trigger) return false;
+
+		// Calculate the attrs that will be change
+		var data = trigger.apply(this, [event, dx, dy]), ie6 = $.browser.msie && $.browser.version < 7, csdif = this.sizeDiff;
+
+		if (this._aspectRatio || event.shiftKey)
+			data = this._updateRatio(data, event);
+
+		data = this._respectSize(data, event);
+
+		// plugins callbacks need to be called first
+		this._propagate("resize", event);
+
+		el.css({
+			top: this.position.top + "px", left: this.position.left + "px",
+			width: this.size.width + "px", height: this.size.height + "px"
+		});
+
+		if (!this._helper && this._proportionallyResizeElements.length)
+			this._proportionallyResize();
+
+		this._updateCache(data);
+
+		// calling the user callback at the end
+		this._trigger('resize', event, this.ui());
+
+		return false;
+	},
+
+	_mouseStop: function(event) {
+
+		this.resizing = false;
+		var o = this.options, self = this;
+
+		if(this._helper) {
+			var pr = this._proportionallyResizeElements, ista = pr.length && (/textarea/i).test(pr[0].nodeName),
+				soffseth = ista && $.ui.hasScroll(pr[0], 'left') /* TODO - jump height */ ? 0 : self.sizeDiff.height,
+				soffsetw = ista ? 0 : self.sizeDiff.width;
+
+			var s = { width: (self.helper.width()  - soffsetw), height: (self.helper.height() - soffseth) },
+				left = (parseInt(self.element.css('left'), 10) + (self.position.left - self.originalPosition.left)) || null,
+				top = (parseInt(self.element.css('top'), 10) + (self.position.top - self.originalPosition.top)) || null;
+
+			if (!o.animate)
+				this.element.css($.extend(s, { top: top, left: left }));
+
+			self.helper.height(self.size.height);
+			self.helper.width(self.size.width);
+
+			if (this._helper && !o.animate) this._proportionallyResize();
+		}
+
+		$('body').css('cursor', 'auto');
+
+		this.element.removeClass("ui-resizable-resizing");
+
+		this._propagate("stop", event);
+
+		if (this._helper) this.helper.remove();
+		return false;
+
+	},
+
+	_updateCache: function(data) {
+		var o = this.options;
+		this.offset = this.helper.offset();
+		if (isNumber(data.left)) this.position.left = data.left;
+		if (isNumber(data.top)) this.position.top = data.top;
+		if (isNumber(data.height)) this.size.height = data.height;
+		if (isNumber(data.width)) this.size.width = data.width;
+	},
+
+	_updateRatio: function(data, event) {
+
+		var o = this.options, cpos = this.position, csize = this.size, a = this.axis;
+
+		if (data.height) data.width = (csize.height * this.aspectRatio);
+		else if (data.width) data.height = (csize.width / this.aspectRatio);
+
+		if (a == 'sw') {
+			data.left = cpos.left + (csize.width - data.width);
+			data.top = null;
+		}
+		if (a == 'nw') {
+			data.top = cpos.top + (csize.height - data.height);
+			data.left = cpos.left + (csize.width - data.width);
+		}
+
+		return data;
+	},
+
+	_respectSize: function(data, event) {
+
+		var el = this.helper, o = this.options, pRatio = this._aspectRatio || event.shiftKey, a = this.axis,
+				ismaxw = isNumber(data.width) && o.maxWidth && (o.maxWidth < data.width), ismaxh = isNumber(data.height) && o.maxHeight && (o.maxHeight < data.height),
+					isminw = isNumber(data.width) && o.minWidth && (o.minWidth > data.width), isminh = isNumber(data.height) && o.minHeight && (o.minHeight > data.height);
+
+		if (isminw) data.width = o.minWidth;
+		if (isminh) data.height = o.minHeight;
+		if (ismaxw) data.width = o.maxWidth;
+		if (ismaxh) data.height = o.maxHeight;
+
+		var dw = this.originalPosition.left + this.originalSize.width, dh = this.position.top + this.size.height;
+		var cw = /sw|nw|w/.test(a), ch = /nw|ne|n/.test(a);
+
+		if (isminw && cw) data.left = dw - o.minWidth;
+		if (ismaxw && cw) data.left = dw - o.maxWidth;
+		if (isminh && ch)	data.top = dh - o.minHeight;
+		if (ismaxh && ch)	data.top = dh - o.maxHeight;
+
+		// fixing jump error on top/left - bug #2330
+		var isNotwh = !data.width && !data.height;
+		if (isNotwh && !data.left && data.top) data.top = null;
+		else if (isNotwh && !data.top && data.left) data.left = null;
+
+		return data;
+	},
+
+	_proportionallyResize: function() {
+
+		var o = this.options;
+		if (!this._proportionallyResizeElements.length) return;
+		var element = this.helper || this.element;
+
+		for (var i=0; i < this._proportionallyResizeElements.length; i++) {
+
+			var prel = this._proportionallyResizeElements[i];
+
+			if (!this.borderDif) {
+				var b = [prel.css('borderTopWidth'), prel.css('borderRightWidth'), prel.css('borderBottomWidth'), prel.css('borderLeftWidth')],
+					p = [prel.css('paddingTop'), prel.css('paddingRight'), prel.css('paddingBottom'), prel.css('paddingLeft')];
+
+				this.borderDif = $.map(b, function(v, i) {
+					var border = parseInt(v,10)||0, padding = parseInt(p[i],10)||0;
+					return border + padding;
+				});
+			}
+
+			if ($.browser.msie && !(!($(element).is(':hidden') || $(element).parents(':hidden').length)))
+				continue;
+
+			prel.css({
+				height: (element.height() - this.borderDif[0] - this.borderDif[2]) || 0,
+				width: (element.width() - this.borderDif[1] - this.borderDif[3]) || 0
+			});
+
+		};
+
+	},
+
+	_renderProxy: function() {
+
+		var el = this.element, o = this.options;
+		this.elementOffset = el.offset();
+
+		if(this._helper) {
+
+			this.helper = this.helper || $('<div style="overflow:hidden;"></div>');
+
+			// fix ie6 offset TODO: This seems broken
+			var ie6 = $.browser.msie && $.browser.version < 7, ie6offset = (ie6 ? 1 : 0),
+			pxyoffset = ( ie6 ? 2 : -1 );
+
+			this.helper.addClass(this._helper).css({
+				width: this.element.outerWidth() + pxyoffset,
+				height: this.element.outerHeight() + pxyoffset,
+				position: 'absolute',
+				left: this.elementOffset.left - ie6offset +'px',
+				top: this.elementOffset.top - ie6offset +'px',
+				zIndex: ++o.zIndex //TODO: Don't modify option
+			});
+
+			this.helper
+				.appendTo("body")
+				.disableSelection();
+
+		} else {
+			this.helper = this.element;
+		}
+
+	},
+
+	_change: {
+		e: function(event, dx, dy) {
+			return { width: this.originalSize.width + dx };
+		},
+		w: function(event, dx, dy) {
+			var o = this.options, cs = this.originalSize, sp = this.originalPosition;
+			return { left: sp.left + dx, width: cs.width - dx };
+		},
+		n: function(event, dx, dy) {
+			var o = this.options, cs = this.originalSize, sp = this.originalPosition;
+			return { top: sp.top + dy, height: cs.height - dy };
+		},
+		s: function(event, dx, dy) {
+			return { height: this.originalSize.height + dy };
+		},
+		se: function(event, dx, dy) {
+			return $.extend(this._change.s.apply(this, arguments), this._change.e.apply(this, [event, dx, dy]));
+		},
+		sw: function(event, dx, dy) {
+			return $.extend(this._change.s.apply(this, arguments), this._change.w.apply(this, [event, dx, dy]));
+		},
+		ne: function(event, dx, dy) {
+			return $.extend(this._change.n.apply(this, arguments), this._change.e.apply(this, [event, dx, dy]));
+		},
+		nw: function(event, dx, dy) {
+			return $.extend(this._change.n.apply(this, arguments), this._change.w.apply(this, [event, dx, dy]));
+		}
+	},
+
+	_propagate: function(n, event) {
+		$.ui.plugin.call(this, n, [event, this.ui()]);
+		(n != "resize" && this._trigger(n, event, this.ui()));
+	},
+
+	plugins: {},
+
+	ui: function() {
+		return {
+			originalElement: this.originalElement,
+			element: this.element,
+			helper: this.helper,
+			position: this.position,
+			size: this.size,
+			originalSize: this.originalSize,
+			originalPosition: this.originalPosition
+		};
+	}
+
+});
+
+$.extend($.ui.resizable, {
+	version: "1.8.10"
+});
+
+/*
+ * Resizable Extensions
+ */
+
+$.ui.plugin.add("resizable", "alsoResize", {
+
+	start: function (event, ui) {
+		var self = $(this).data("resizable"), o = self.options;
+
+		var _store = function (exp) {
+			$(exp).each(function() {
+				var el = $(this);
+				el.data("resizable-alsoresize", {
+					width: parseInt(el.width(), 10), height: parseInt(el.height(), 10),
+					left: parseInt(el.css('left'), 10), top: parseInt(el.css('top'), 10),
+					position: el.css('position') // to reset Opera on stop()
+				});
+			});
+		};
+
+		if (typeof(o.alsoResize) == 'object' && !o.alsoResize.parentNode) {
+			if (o.alsoResize.length) { o.alsoResize = o.alsoResize[0]; _store(o.alsoResize); }
+			else { $.each(o.alsoResize, function (exp) { _store(exp); }); }
+		}else{
+			_store(o.alsoResize);
+		}
+	},
+
+	resize: function (event, ui) {
+		var self = $(this).data("resizable"), o = self.options, os = self.originalSize, op = self.originalPosition;
+
+		var delta = {
+			height: (self.size.height - os.height) || 0, width: (self.size.width - os.width) || 0,
+			top: (self.position.top - op.top) || 0, left: (self.position.left - op.left) || 0
+		},
+
+		_alsoResize = function (exp, c) {
+			$(exp).each(function() {
+				var el = $(this), start = $(this).data("resizable-alsoresize"), style = {}, 
+					css = c && c.length ? c : el.parents(ui.originalElement[0]).length ? ['width', 'height'] : ['width', 'height', 'top', 'left'];
+
+				$.each(css, function (i, prop) {
+					var sum = (start[prop]||0) + (delta[prop]||0);
+					if (sum && sum >= 0)
+						style[prop] = sum || null;
+				});
+
+				// Opera fixing relative position
+				if ($.browser.opera && /relative/.test(el.css('position'))) {
+					self._revertToRelativePosition = true;
+					el.css({ position: 'absolute', top: 'auto', left: 'auto' });
+				}
+
+				el.css(style);
+			});
+		};
+
+		if (typeof(o.alsoResize) == 'object' && !o.alsoResize.nodeType) {
+			$.each(o.alsoResize, function (exp, c) { _alsoResize(exp, c); });
+		}else{
+			_alsoResize(o.alsoResize);
+		}
+	},
+
+	stop: function (event, ui) {
+		var self = $(this).data("resizable"), o = self.options;
+
+		var _reset = function (exp) {
+			$(exp).each(function() {
+				var el = $(this);
+				// reset position for Opera - no need to verify it was changed
+				el.css({ position: el.data("resizable-alsoresize").position });
+			});
+		};
+
+		if (self._revertToRelativePosition) {
+			self._revertToRelativePosition = false;
+			if (typeof(o.alsoResize) == 'object' && !o.alsoResize.nodeType) {
+				$.each(o.alsoResize, function (exp) { _reset(exp); });
+			}else{
+				_reset(o.alsoResize);
+			}
+		}
+
+		$(this).removeData("resizable-alsoresize");
+	}
+});
+
+$.ui.plugin.add("resizable", "animate", {
+
+	stop: function(event, ui) {
+		var self = $(this).data("resizable"), o = self.options;
+
+		var pr = self._proportionallyResizeElements, ista = pr.length && (/textarea/i).test(pr[0].nodeName),
+					soffseth = ista && $.ui.hasScroll(pr[0], 'left') /* TODO - jump height */ ? 0 : self.sizeDiff.height,
+						soffsetw = ista ? 0 : self.sizeDiff.width;
+
+		var style = { width: (self.size.width - soffsetw), height: (self.size.height - soffseth) },
+					left = (parseInt(self.element.css('left'), 10) + (self.position.left - self.originalPosition.left)) || null,
+						top = (parseInt(self.element.css('top'), 10) + (self.position.top - self.originalPosition.top)) || null;
+
+		self.element.animate(
+			$.extend(style, top && left ? { top: top, left: left } : {}), {
+				duration: o.animateDuration,
+				easing: o.animateEasing,
+				step: function() {
+
+					var data = {
+						width: parseInt(self.element.css('width'), 10),
+						height: parseInt(self.element.css('height'), 10),
+						top: parseInt(self.element.css('top'), 10),
+						left: parseInt(self.element.css('left'), 10)
+					};
+
+					if (pr && pr.length) $(pr[0]).css({ width: data.width, height: data.height });
+
+					// propagating resize, and updating values for each animation step
+					self._updateCache(data);
+					self._propagate("resize", event);
+
+				}
+			}
+		);
+	}
+
+});
+
+$.ui.plugin.add("resizable", "containment", {
+
+	start: function(event, ui) {
+		var self = $(this).data("resizable"), o = self.options, el = self.element;
+		var oc = o.containment,	ce = (oc instanceof $) ? oc.get(0) : (/parent/.test(oc)) ? el.parent().get(0) : oc;
+		if (!ce) return;
+
+		self.containerElement = $(ce);
+
+		if (/document/.test(oc) || oc == document) {
+			self.containerOffset = { left: 0, top: 0 };
+			self.containerPosition = { left: 0, top: 0 };
+
+			self.parentData = {
+				element: $(document), left: 0, top: 0,
+				width: $(document).width(), height: $(document).height() || document.body.parentNode.scrollHeight
+			};
+		}
+
+		// i'm a node, so compute top, left, right, bottom
+		else {
+			var element = $(ce), p = [];
+			$([ "Top", "Right", "Left", "Bottom" ]).each(function(i, name) { p[i] = num(element.css("padding" + name)); });
+
+			self.containerOffset = element.offset();
+			self.containerPosition = element.position();
+			self.containerSize = { height: (element.innerHeight() - p[3]), width: (element.innerWidth() - p[1]) };
+
+			var co = self.containerOffset, ch = self.containerSize.height,	cw = self.containerSize.width,
+						width = ($.ui.hasScroll(ce, "left") ? ce.scrollWidth : cw ), height = ($.ui.hasScroll(ce) ? ce.scrollHeight : ch);
+
+			self.parentData = {
+				element: ce, left: co.left, top: co.top, width: width, height: height
+			};
+		}
+	},
+
+	resize: function(event, ui) {
+		var self = $(this).data("resizable"), o = self.options,
+				ps = self.containerSize, co = self.containerOffset, cs = self.size, cp = self.position,
+				pRatio = self._aspectRatio || event.shiftKey, cop = { top:0, left:0 }, ce = self.containerElement;
+
+		if (ce[0] != document && (/static/).test(ce.css('position'))) cop = co;
+
+		if (cp.left < (self._helper ? co.left : 0)) {
+			self.size.width = self.size.width + (self._helper ? (self.position.left - co.left) : (self.position.left - cop.left));
+			if (pRatio) self.size.height = self.size.width / o.aspectRatio;
+			self.position.left = o.helper ? co.left : 0;
+		}
+
+		if (cp.top < (self._helper ? co.top : 0)) {
+			self.size.height = self.size.height + (self._helper ? (self.position.top - co.top) : self.position.top);
+			if (pRatio) self.size.width = self.size.height * o.aspectRatio;
+			self.position.top = self._helper ? co.top : 0;
+		}
+
+		self.offset.left = self.parentData.left+self.position.left;
+		self.offset.top = self.parentData.top+self.position.top;
+
+		var woset = Math.abs( (self._helper ? self.offset.left - cop.left : (self.offset.left - cop.left)) + self.sizeDiff.width ),
+					hoset = Math.abs( (self._helper ? self.offset.top - cop.top : (self.offset.top - co.top)) + self.sizeDiff.height );
+
+		var isParent = self.containerElement.get(0) == self.element.parent().get(0),
+		    isOffsetRelative = /relative|absolute/.test(self.containerElement.css('position'));
+
+		if(isParent && isOffsetRelative) woset -= self.parentData.left;
+
+		if (woset + self.size.width >= self.parentData.width) {
+			self.size.width = self.parentData.width - woset;
+			if (pRatio) self.size.height = self.size.width / self.aspectRatio;
+		}
+
+		if (hoset + self.size.height >= self.parentData.height) {
+			self.size.height = self.parentData.height - hoset;
+			if (pRatio) self.size.width = self.size.height * self.aspectRatio;
+		}
+	},
+
+	stop: function(event, ui){
+		var self = $(this).data("resizable"), o = self.options, cp = self.position,
+				co = self.containerOffset, cop = self.containerPosition, ce = self.containerElement;
+
+		var helper = $(self.helper), ho = helper.offset(), w = helper.outerWidth() - self.sizeDiff.width, h = helper.outerHeight() - self.sizeDiff.height;
+
+		if (self._helper && !o.animate && (/relative/).test(ce.css('position')))
+			$(this).css({ left: ho.left - cop.left - co.left, width: w, height: h });
+
+		if (self._helper && !o.animate && (/static/).test(ce.css('position')))
+			$(this).css({ left: ho.left - cop.left - co.left, width: w, height: h });
+
+	}
+});
+
+$.ui.plugin.add("resizable", "ghost", {
+
+	start: function(event, ui) {
+
+		var self = $(this).data("resizable"), o = self.options, cs = self.size;
+
+		self.ghost = self.originalElement.clone();
+		self.ghost
+			.css({ opacity: .25, display: 'block', position: 'relative', height: cs.height, width: cs.width, margin: 0, left: 0, top: 0 })
+			.addClass('ui-resizable-ghost')
+			.addClass(typeof o.ghost == 'string' ? o.ghost : '');
+
+		self.ghost.appendTo(self.helper);
+
+	},
+
+	resize: function(event, ui){
+		var self = $(this).data("resizable"), o = self.options;
+		if (self.ghost) self.ghost.css({ position: 'relative', height: self.size.height, width: self.size.width });
+	},
+
+	stop: function(event, ui){
+		var self = $(this).data("resizable"), o = self.options;
+		if (self.ghost && self.helper) self.helper.get(0).removeChild(self.ghost.get(0));
+	}
+
+});
+
+$.ui.plugin.add("resizable", "grid", {
+
+	resize: function(event, ui) {
+		var self = $(this).data("resizable"), o = self.options, cs = self.size, os = self.originalSize, op = self.originalPosition, a = self.axis, ratio = o._aspectRatio || event.shiftKey;
+		o.grid = typeof o.grid == "number" ? [o.grid, o.grid] : o.grid;
+		var ox = Math.round((cs.width - os.width) / (o.grid[0]||1)) * (o.grid[0]||1), oy = Math.round((cs.height - os.height) / (o.grid[1]||1)) * (o.grid[1]||1);
+
+		if (/^(se|s|e)$/.test(a)) {
+			self.size.width = os.width + ox;
+			self.size.height = os.height + oy;
+		}
+		else if (/^(ne)$/.test(a)) {
+			self.size.width = os.width + ox;
+			self.size.height = os.height + oy;
+			self.position.top = op.top - oy;
+		}
+		else if (/^(sw)$/.test(a)) {
+			self.size.width = os.width + ox;
+			self.size.height = os.height + oy;
+			self.position.left = op.left - ox;
+		}
+		else {
+			self.size.width = os.width + ox;
+			self.size.height = os.height + oy;
+			self.position.top = op.top - oy;
+			self.position.left = op.left - ox;
+		}
+	}
+
+});
+
+var num = function(v) {
+	return parseInt(v, 10) || 0;
+};
+
+var isNumber = function(value) {
+	return !isNaN(parseInt(value, 10));
+};
+
+})(jQuery);
+/*
+ * jQuery UI Selectable 1.8.10
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Selectables
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ *	jquery.ui.mouse.js
+ *	jquery.ui.widget.js
+ */
+(function( $, undefined ) {
+
+$.widget("ui.selectable", $.ui.mouse, {
+	options: {
+		appendTo: 'body',
+		autoRefresh: true,
+		distance: 0,
+		filter: '*',
+		tolerance: 'touch'
+	},
+	_create: function() {
+		var self = this;
+
+		this.element.addClass("ui-selectable");
+
+		this.dragged = false;
+
+		// cache selectee children based on filter
+		var selectees;
+		this.refresh = function() {
+			selectees = $(self.options.filter, self.element[0]);
+			selectees.each(function() {
+				var $this = $(this);
+				var pos = $this.offset();
+				$.data(this, "selectable-item", {
+					element: this,
+					$element: $this,
+					left: pos.left,
+					top: pos.top,
+					right: pos.left + $this.outerWidth(),
+					bottom: pos.top + $this.outerHeight(),
+					startselected: false,
+					selected: $this.hasClass('ui-selected'),
+					selecting: $this.hasClass('ui-selecting'),
+					unselecting: $this.hasClass('ui-unselecting')
+				});
+			});
+		};
+		this.refresh();
+
+		this.selectees = selectees.addClass("ui-selectee");
+
+		this._mouseInit();
+
+		this.helper = $("<div class='ui-selectable-helper'></div>");
+	},
+
+	destroy: function() {
+		this.selectees
+			.removeClass("ui-selectee")
+			.removeData("selectable-item");
+		this.element
+			.removeClass("ui-selectable ui-selectable-disabled")
+			.removeData("selectable")
+			.unbind(".selectable");
+		this._mouseDestroy();
+
+		return this;
+	},
+
+	_mouseStart: function(event) {
+		var self = this;
+
+		this.opos = [event.pageX, event.pageY];
+
+		if (this.options.disabled)
+			return;
+
+		var options = this.options;
+
+		this.selectees = $(options.filter, this.element[0]);
+
+		this._trigger("start", event);
+
+		$(options.appendTo).append(this.helper);
+		// position helper (lasso)
+		this.helper.css({
+			"left": event.clientX,
+			"top": event.clientY,
+			"width": 0,
+			"height": 0
+		});
+
+		if (options.autoRefresh) {
+			this.refresh();
+		}
+
+		this.selectees.filter('.ui-selected').each(function() {
+			var selectee = $.data(this, "selectable-item");
+			selectee.startselected = true;
+			if (!event.metaKey) {
+				selectee.$element.removeClass('ui-selected');
+				selectee.selected = false;
+				selectee.$element.addClass('ui-unselecting');
+				selectee.unselecting = true;
+				// selectable UNSELECTING callback
+				self._trigger("unselecting", event, {
+					unselecting: selectee.element
+				});
+			}
+		});
+
+		$(event.target).parents().andSelf().each(function() {
+			var selectee = $.data(this, "selectable-item");
+			if (selectee) {
+				var doSelect = !event.metaKey || !selectee.$element.hasClass('ui-selected');
+				selectee.$element
+					.removeClass(doSelect ? "ui-unselecting" : "ui-selected")
+					.addClass(doSelect ? "ui-selecting" : "ui-unselecting");
+				selectee.unselecting = !doSelect;
+				selectee.selecting = doSelect;
+				selectee.selected = doSelect;
+				// selectable (UN)SELECTING callback
+				if (doSelect) {
+					self._trigger("selecting", event, {
+						selecting: selectee.element
+					});
+				} else {
+					self._trigger("unselecting", event, {
+						unselecting: selectee.element
+					});
+				}
+				return false;
+			}
+		});
+
+	},
+
+	_mouseDrag: function(event) {
+		var self = this;
+		this.dragged = true;
+
+		if (this.options.disabled)
+			return;
+
+		var options = this.options;
+
+		var x1 = this.opos[0], y1 = this.opos[1], x2 = event.pageX, y2 = event.pageY;
+		if (x1 > x2) { var tmp = x2; x2 = x1; x1 = tmp; }
+		if (y1 > y2) { var tmp = y2; y2 = y1; y1 = tmp; }
+		this.helper.css({left: x1, top: y1, width: x2-x1, height: y2-y1});
+
+		this.selectees.each(function() {
+			var selectee = $.data(this, "selectable-item");
+			//prevent helper from being selected if appendTo: selectable
+			if (!selectee || selectee.element == self.element[0])
+				return;
+			var hit = false;
+			if (options.tolerance == 'touch') {
+				hit = ( !(selectee.left > x2 || selectee.right < x1 || selectee.top > y2 || selectee.bottom < y1) );
+			} else if (options.tolerance == 'fit') {
+				hit = (selectee.left > x1 && selectee.right < x2 && selectee.top > y1 && selectee.bottom < y2);
+			}
+
+			if (hit) {
+				// SELECT
+				if (selectee.selected) {
+					selectee.$element.removeClass('ui-selected');
+					selectee.selected = false;
+				}
+				if (selectee.unselecting) {
+					selectee.$element.removeClass('ui-unselecting');
+					selectee.unselecting = false;
+				}
+				if (!selectee.selecting) {
+					selectee.$element.addClass('ui-selecting');
+					selectee.selecting = true;
+					// selectable SELECTING callback
+					self._trigger("selecting", event, {
+						selecting: selectee.element
+					});
+				}
+			} else {
+				// UNSELECT
+				if (selectee.selecting) {
+					if (event.metaKey && selectee.startselected) {
+						selectee.$element.removeClass('ui-selecting');
+						selectee.selecting = false;
+						selectee.$element.addClass('ui-selected');
+						selectee.selected = true;
+					} else {
+						selectee.$element.removeClass('ui-selecting');
+						selectee.selecting = false;
+						if (selectee.startselected) {
+							selectee.$element.addClass('ui-unselecting');
+							selectee.unselecting = true;
+						}
+						// selectable UNSELECTING callback
+						self._trigger("unselecting", event, {
+							unselecting: selectee.element
+						});
+					}
+				}
+				if (selectee.selected) {
+					if (!event.metaKey && !selectee.startselected) {
+						selectee.$element.removeClass('ui-selected');
+						selectee.selected = false;
+
+						selectee.$element.addClass('ui-unselecting');
+						selectee.unselecting = true;
+						// selectable UNSELECTING callback
+						self._trigger("unselecting", event, {
+							unselecting: selectee.element
+						});
+					}
+				}
+			}
+		});
+
+		return false;
+	},
+
+	_mouseStop: function(event) {
+		var self = this;
+
+		this.dragged = false;
+
+		var options = this.options;
+
+		$('.ui-unselecting', this.element[0]).each(function() {
+			var selectee = $.data(this, "selectable-item");
+			selectee.$element.removeClass('ui-unselecting');
+			selectee.unselecting = false;
+			selectee.startselected = false;
+			self._trigger("unselected", event, {
+				unselected: selectee.element
+			});
+		});
+		$('.ui-selecting', this.element[0]).each(function() {
+			var selectee = $.data(this, "selectable-item");
+			selectee.$element.removeClass('ui-selecting').addClass('ui-selected');
+			selectee.selecting = false;
+			selectee.selected = true;
+			selectee.startselected = true;
+			self._trigger("selected", event, {
+				selected: selectee.element
+			});
+		});
+		this._trigger("stop", event);
+
+		this.helper.remove();
+
+		return false;
+	}
+
+});
+
+$.extend($.ui.selectable, {
+	version: "1.8.10"
+});
+
+})(jQuery);
+/*
+ * jQuery UI Sortable 1.8.10
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Sortables
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ *	jquery.ui.mouse.js
+ *	jquery.ui.widget.js
+ */
+(function( $, undefined ) {
+
+$.widget("ui.sortable", $.ui.mouse, {
+	widgetEventPrefix: "sort",
+	options: {
+		appendTo: "parent",
+		axis: false,
+		connectWith: false,
+		containment: false,
+		cursor: 'auto',
+		cursorAt: false,
+		dropOnEmpty: true,
+		forcePlaceholderSize: false,
+		forceHelperSize: false,
+		grid: false,
+		handle: false,
+		helper: "original",
+		items: '> *',
+		opacity: false,
+		placeholder: false,
+		revert: false,
+		scroll: true,
+		scrollSensitivity: 20,
+		scrollSpeed: 20,
+		scope: "default",
+		tolerance: "intersect",
+		zIndex: 1000
+	},
+	_create: function() {
+
+		var o = this.options;
+		this.containerCache = {};
+		this.element.addClass("ui-sortable");
+
+		//Get the items
+		this.refresh();
+
+		//Let's determine if the items are floating
+		this.floating = this.items.length ? (/left|right/).test(this.items[0].item.css('float')) : false;
+
+		//Let's determine the parent's offset
+		this.offset = this.element.offset();
+
+		//Initialize mouse events for interaction
+		this._mouseInit();
+
+	},
+
+	destroy: function() {
+		this.element
+			.removeClass("ui-sortable ui-sortable-disabled")
+			.removeData("sortable")
+			.unbind(".sortable");
+		this._mouseDestroy();
+
+		for ( var i = this.items.length - 1; i >= 0; i-- )
+			this.items[i].item.removeData("sortable-item");
+
+		return this;
+	},
+
+	_setOption: function(key, value){
+		if ( key === "disabled" ) {
+			this.options[ key ] = value;
+	
+			this.widget()
+				[ value ? "addClass" : "removeClass"]( "ui-sortable-disabled" );
+		} else {
+			// Don't call widget base _setOption for disable as it adds ui-state-disabled class
+			$.Widget.prototype._setOption.apply(this, arguments);
+		}
+	},
+
+	_mouseCapture: function(event, overrideHandle) {
+
+		if (this.reverting) {
+			return false;
+		}
+
+		if(this.options.disabled || this.options.type == 'static') return false;
+
+		//We have to refresh the items data once first
+		this._refreshItems(event);
+
+		//Find out if the clicked node (or one of its parents) is a actual item in this.items
+		var currentItem = null, self = this, nodes = $(event.target).parents().each(function() {
+			if($.data(this, 'sortable-item') == self) {
+				currentItem = $(this);
+				return false;
+			}
+		});
+		if($.data(event.target, 'sortable-item') == self) currentItem = $(event.target);
+
+		if(!currentItem) return false;
+		if(this.options.handle && !overrideHandle) {
+			var validHandle = false;
+
+			$(this.options.handle, currentItem).find("*").andSelf().each(function() { if(this == event.target) validHandle = true; });
+			if(!validHandle) return false;
+		}
+
+		this.currentItem = currentItem;
+		this._removeCurrentsFromItems();
+		return true;
+
+	},
+
+	_mouseStart: function(event, overrideHandle, noActivation) {
+
+		var o = this.options, self = this;
+		this.currentContainer = this;
+
+		//We only need to call refreshPositions, because the refreshItems call has been moved to mouseCapture
+		this.refreshPositions();
+
+		//Create and append the visible helper
+		this.helper = this._createHelper(event);
+
+		//Cache the helper size
+		this._cacheHelperProportions();
+
+		/*
+		 * - Position generation -
+		 * This block generates everything position related - it's the core of draggables.
+		 */
+
+		//Cache the margins of the original element
+		this._cacheMargins();
+
+		//Get the next scrolling parent
+		this.scrollParent = this.helper.scrollParent();
+
+		//The element's absolute position on the page minus margins
+		this.offset = this.currentItem.offset();
+		this.offset = {
+			top: this.offset.top - this.margins.top,
+			left: this.offset.left - this.margins.left
+		};
+
+		// Only after we got the offset, we can change the helper's position to absolute
+		// TODO: Still need to figure out a way to make relative sorting possible
+		this.helper.css("position", "absolute");
+		this.cssPosition = this.helper.css("position");
+
+		$.extend(this.offset, {
+			click: { //Where the click happened, relative to the element
+				left: event.pageX - this.offset.left,
+				top: event.pageY - this.offset.top
+			},
+			parent: this._getParentOffset(),
+			relative: this._getRelativeOffset() //This is a relative to absolute position minus the actual position calculation - only used for relative positioned helper
+		});
+
+		//Generate the original position
+		this.originalPosition = this._generatePosition(event);
+		this.originalPageX = event.pageX;
+		this.originalPageY = event.pageY;
+
+		//Adjust the mouse offset relative to the helper if 'cursorAt' is supplied
+		(o.cursorAt && this._adjustOffsetFromHelper(o.cursorAt));
+
+		//Cache the former DOM position
+		this.domPosition = { prev: this.currentItem.prev()[0], parent: this.currentItem.parent()[0] };
+
+		//If the helper is not the original, hide the original so it's not playing any role during the drag, won't cause anything bad this way
+		if(this.helper[0] != this.currentItem[0]) {
+			this.currentItem.hide();
+		}
+
+		//Create the placeholder
+		this._createPlaceholder();
+
+		//Set a containment if given in the options
+		if(o.containment)
+			this._setContainment();
+
+		if(o.cursor) { // cursor option
+			if ($('body').css("cursor")) this._storedCursor = $('body').css("cursor");
+			$('body').css("cursor", o.cursor);
+		}
+
+		if(o.opacity) { // opacity option
+			if (this.helper.css("opacity")) this._storedOpacity = this.helper.css("opacity");
+			this.helper.css("opacity", o.opacity);
+		}
+
+		if(o.zIndex) { // zIndex option
+			if (this.helper.css("zIndex")) this._storedZIndex = this.helper.css("zIndex");
+			this.helper.css("zIndex", o.zIndex);
+		}
+
+		//Prepare scrolling
+		if(this.scrollParent[0] != document && this.scrollParent[0].tagName != 'HTML')
+			this.overflowOffset = this.scrollParent.offset();
+
+		//Call callbacks
+		this._trigger("start", event, this._uiHash());
+
+		//Recache the helper size
+		if(!this._preserveHelperProportions)
+			this._cacheHelperProportions();
+
+
+		//Post 'activate' events to possible containers
+		if(!noActivation) {
+			 for (var i = this.containers.length - 1; i >= 0; i--) { this.containers[i]._trigger("activate", event, self._uiHash(this)); }
+		}
+
+		//Prepare possible droppables
+		if($.ui.ddmanager)
+			$.ui.ddmanager.current = this;
+
+		if ($.ui.ddmanager && !o.dropBehaviour)
+			$.ui.ddmanager.prepareOffsets(this, event);
+
+		this.dragging = true;
+
+		this.helper.addClass("ui-sortable-helper");
+		this._mouseDrag(event); //Execute the drag once - this causes the helper not to be visible before getting its correct position
+		return true;
+
+	},
+
+	_mouseDrag: function(event) {
+
+		//Compute the helpers position
+		this.position = this._generatePosition(event);
+		this.positionAbs = this._convertPositionTo("absolute");
+
+		if (!this.lastPositionAbs) {
+			this.lastPositionAbs = this.positionAbs;
+		}
+
+		//Do scrolling
+		if(this.options.scroll) {
+			var o = this.options, scrolled = false;
+			if(this.scrollParent[0] != document && this.scrollParent[0].tagName != 'HTML') {
+
+				if((this.overflowOffset.top + this.scrollParent[0].offsetHeight) - event.pageY < o.scrollSensitivity)
+					this.scrollParent[0].scrollTop = scrolled = this.scrollParent[0].scrollTop + o.scrollSpeed;
+				else if(event.pageY - this.overflowOffset.top < o.scrollSensitivity)
+					this.scrollParent[0].scrollTop = scrolled = this.scrollParent[0].scrollTop - o.scrollSpeed;
+
+				if((this.overflowOffset.left + this.scrollParent[0].offsetWidth) - event.pageX < o.scrollSensitivity)
+					this.scrollParent[0].scrollLeft = scrolled = this.scrollParent[0].scrollLeft + o.scrollSpeed;
+				else if(event.pageX - this.overflowOffset.left < o.scrollSensitivity)
+					this.scrollParent[0].scrollLeft = scrolled = this.scrollParent[0].scrollLeft - o.scrollSpeed;
+
+			} else {
+
+				if(event.pageY - $(document).scrollTop() < o.scrollSensitivity)
+					scrolled = $(document).scrollTop($(document).scrollTop() - o.scrollSpeed);
+				else if($(window).height() - (event.pageY - $(document).scrollTop()) < o.scrollSensitivity)
+					scrolled = $(document).scrollTop($(document).scrollTop() + o.scrollSpeed);
+
+				if(event.pageX - $(document).scrollLeft() < o.scrollSensitivity)
+					scrolled = $(document).scrollLeft($(document).scrollLeft() - o.scrollSpeed);
+				else if($(window).width() - (event.pageX - $(document).scrollLeft()) < o.scrollSensitivity)
+					scrolled = $(document).scrollLeft($(document).scrollLeft() + o.scrollSpeed);
+
+			}
+
+			if(scrolled !== false && $.ui.ddmanager && !o.dropBehaviour)
+				$.ui.ddmanager.prepareOffsets(this, event);
+		}
+
+		//Regenerate the absolute position used for position checks
+		this.positionAbs = this._convertPositionTo("absolute");
+
+		//Set the helper position
+		if(!this.options.axis || this.options.axis != "y") this.helper[0].style.left = this.position.left+'px';
+		if(!this.options.axis || this.options.axis != "x") this.helper[0].style.top = this.position.top+'px';
+
+		//Rearrange
+		for (var i = this.items.length - 1; i >= 0; i--) {
+
+			//Cache variables and intersection, continue if no intersection
+			var item = this.items[i], itemElement = item.item[0], intersection = this._intersectsWithPointer(item);
+			if (!intersection) continue;
+
+			if(itemElement != this.currentItem[0] //cannot intersect with itself
+				&&	this.placeholder[intersection == 1 ? "next" : "prev"]()[0] != itemElement //no useless actions that have been done before
+				&&	!$.ui.contains(this.placeholder[0], itemElement) //no action if the item moved is the parent of the item checked
+				&& (this.options.type == 'semi-dynamic' ? !$.ui.contains(this.element[0], itemElement) : true)
+				//&& itemElement.parentNode == this.placeholder[0].parentNode // only rearrange items within the same container
+			) {
+
+				this.direction = intersection == 1 ? "down" : "up";
+
+				if (this.options.tolerance == "pointer" || this._intersectsWithSides(item)) {
+					this._rearrange(event, item);
+				} else {
+					break;
+				}
+
+				this._trigger("change", event, this._uiHash());
+				break;
+			}
+		}
+
+		//Post events to containers
+		this._contactContainers(event);
+
+		//Interconnect with droppables
+		if($.ui.ddmanager) $.ui.ddmanager.drag(this, event);
+
+		//Call callbacks
+		this._trigger('sort', event, this._uiHash());
+
+		this.lastPositionAbs = this.positionAbs;
+		return false;
+
+	},
+
+	_mouseStop: function(event, noPropagation) {
+
+		if(!event) return;
+
+		//If we are using droppables, inform the manager about the drop
+		if ($.ui.ddmanager && !this.options.dropBehaviour)
+			$.ui.ddmanager.drop(this, event);
+
+		if(this.options.revert) {
+			var self = this;
+			var cur = self.placeholder.offset();
+
+			self.reverting = true;
+
+			$(this.helper).animate({
+				left: cur.left - this.offset.parent.left - self.margins.left + (this.offsetParent[0] == document.body ? 0 : this.offsetParent[0].scrollLeft),
+				top: cur.top - this.offset.parent.top - self.margins.top + (this.offsetParent[0] == document.body ? 0 : this.offsetParent[0].scrollTop)
+			}, parseInt(this.options.revert, 10) || 500, function() {
+				self._clear(event);
+			});
+		} else {
+			this._clear(event, noPropagation);
+		}
+
+		return false;
+
+	},
+
+	cancel: function() {
+
+		var self = this;
+
+		if(this.dragging) {
+
+			this._mouseUp({ target: null });
+
+			if(this.options.helper == "original")
+				this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper");
+			else
+				this.currentItem.show();
+
+			//Post deactivating events to containers
+			for (var i = this.containers.length - 1; i >= 0; i--){
+				this.containers[i]._trigger("deactivate", null, self._uiHash(this));
+				if(this.containers[i].containerCache.over) {
+					this.containers[i]._trigger("out", null, self._uiHash(this));
+					this.containers[i].containerCache.over = 0;
+				}
+			}
+
+		}
+
+		if (this.placeholder) {
+			//$(this.placeholder[0]).remove(); would have been the jQuery way - unfortunately, it unbinds ALL events from the original node!
+			if(this.placeholder[0].parentNode) this.placeholder[0].parentNode.removeChild(this.placeholder[0]);
+			if(this.options.helper != "original" && this.helper && this.helper[0].parentNode) this.helper.remove();
+
+			$.extend(this, {
+				helper: null,
+				dragging: false,
+				reverting: false,
+				_noFinalSort: null
+			});
+
+			if(this.domPosition.prev) {
+				$(this.domPosition.prev).after(this.currentItem);
+			} else {
+				$(this.domPosition.parent).prepend(this.currentItem);
+			}
+		}
+
+		return this;
+
+	},
+
+	serialize: function(o) {
+
+		var items = this._getItemsAsjQuery(o && o.connected);
+		var str = []; o = o || {};
+
+		$(items).each(function() {
+			var res = ($(o.item || this).attr(o.attribute || 'id') || '').match(o.expression || (/(.+)[-=_](.+)/));
+			if(res) str.push((o.key || res[1]+'[]')+'='+(o.key && o.expression ? res[1] : res[2]));
+		});
+
+		if(!str.length && o.key) {
+			str.push(o.key + '=');
+		}
+
+		return str.join('&');
+
+	},
+
+	toArray: function(o) {
+
+		var items = this._getItemsAsjQuery(o && o.connected);
+		var ret = []; o = o || {};
+
+		items.each(function() { ret.push($(o.item || this).attr(o.attribute || 'id') || ''); });
+		return ret;
+
+	},
+
+	/* Be careful with the following core functions */
+	_intersectsWith: function(item) {
+
+		var x1 = this.positionAbs.left,
+			x2 = x1 + this.helperProportions.width,
+			y1 = this.positionAbs.top,
+			y2 = y1 + this.helperProportions.height;
+
+		var l = item.left,
+			r = l + item.width,
+			t = item.top,
+			b = t + item.height;
+
+		var dyClick = this.offset.click.top,
+			dxClick = this.offset.click.left;
+
+		var isOverElement = (y1 + dyClick) > t && (y1 + dyClick) < b && (x1 + dxClick) > l && (x1 + dxClick) < r;
+
+		if(	   this.options.tolerance == "pointer"
+			|| this.options.forcePointerForContainers
+			|| (this.options.tolerance != "pointer" && this.helperProportions[this.floating ? 'width' : 'height'] > item[this.floating ? 'width' : 'height'])
+		) {
+			return isOverElement;
+		} else {
+
+			return (l < x1 + (this.helperProportions.width / 2) // Right Half
+				&& x2 - (this.helperProportions.width / 2) < r // Left Half
+				&& t < y1 + (this.helperProportions.height / 2) // Bottom Half
+				&& y2 - (this.helperProportions.height / 2) < b ); // Top Half
+
+		}
+	},
+
+	_intersectsWithPointer: function(item) {
+
+		var isOverElementHeight = $.ui.isOverAxis(this.positionAbs.top + this.offset.click.top, item.top, item.height),
+			isOverElementWidth = $.ui.isOverAxis(this.positionAbs.left + this.offset.click.left, item.left, item.width),
+			isOverElement = isOverElementHeight && isOverElementWidth,
+			verticalDirection = this._getDragVerticalDirection(),
+			horizontalDirection = this._getDragHorizontalDirection();
+
+		if (!isOverElement)
+			return false;
+
+		return this.floating ?
+			( ((horizontalDirection && horizontalDirection == "right") || verticalDirection == "down") ? 2 : 1 )
+			: ( verticalDirection && (verticalDirection == "down" ? 2 : 1) );
+
+	},
+
+	_intersectsWithSides: function(item) {
+
+		var isOverBottomHalf = $.ui.isOverAxis(this.positionAbs.top + this.offset.click.top, item.top + (item.height/2), item.height),
+			isOverRightHalf = $.ui.isOverAxis(this.positionAbs.left + this.offset.click.left, item.left + (item.width/2), item.width),
+			verticalDirection = this._getDragVerticalDirection(),
+			horizontalDirection = this._getDragHorizontalDirection();
+
+		if (this.floating && horizontalDirection) {
+			return ((horizontalDirection == "right" && isOverRightHalf) || (horizontalDirection == "left" && !isOverRightHalf));
+		} else {
+			return verticalDirection && ((verticalDirection == "down" && isOverBottomHalf) || (verticalDirection == "up" && !isOverBottomHalf));
+		}
+
+	},
+
+	_getDragVerticalDirection: function() {
+		var delta = this.positionAbs.top - this.lastPositionAbs.top;
+		return delta != 0 && (delta > 0 ? "down" : "up");
+	},
+
+	_getDragHorizontalDirection: function() {
+		var delta = this.positionAbs.left - this.lastPositionAbs.left;
+		return delta != 0 && (delta > 0 ? "right" : "left");
+	},
+
+	refresh: function(event) {
+		this._refreshItems(event);
+		this.refreshPositions();
+		return this;
+	},
+
+	_connectWith: function() {
+		var options = this.options;
+		return options.connectWith.constructor == String
+			? [options.connectWith]
+			: options.connectWith;
+	},
+	
+	_getItemsAsjQuery: function(connected) {
+
+		var self = this;
+		var items = [];
+		var queries = [];
+		var connectWith = this._connectWith();
+
+		if(connectWith && connected) {
+			for (var i = connectWith.length - 1; i >= 0; i--){
+				var cur = $(connectWith[i]);
+				for (var j = cur.length - 1; j >= 0; j--){
+					var inst = $.data(cur[j], 'sortable');
+					if(inst && inst != this && !inst.options.disabled) {
+						queries.push([$.isFunction(inst.options.items) ? inst.options.items.call(inst.element) : $(inst.options.items, inst.element).not(".ui-sortable-helper").not('.ui-sortable-placeholder'), inst]);
+					}
+				};
+			};
+		}
+
+		queries.push([$.isFunction(this.options.items) ? this.options.items.call(this.element, null, { options: this.options, item: this.currentItem }) : $(this.options.items, this.element).not(".ui-sortable-helper").not('.ui-sortable-placeholder'), this]);
+
+		for (var i = queries.length - 1; i >= 0; i--){
+			queries[i][0].each(function() {
+				items.push(this);
+			});
+		};
+
+		return $(items);
+
+	},
+
+	_removeCurrentsFromItems: function() {
+
+		var list = this.currentItem.find(":data(sortable-item)");
+
+		for (var i=0; i < this.items.length; i++) {
+
+			for (var j=0; j < list.length; j++) {
+				if(list[j] == this.items[i].item[0])
+					this.items.splice(i,1);
+			};
+
+		};
+
+	},
+
+	_refreshItems: function(event) {
+
+		this.items = [];
+		this.containers = [this];
+		var items = this.items;
+		var self = this;
+		var queries = [[$.isFunction(this.options.items) ? this.options.items.call(this.element[0], event, { item: this.currentItem }) : $(this.options.items, this.element), this]];
+		var connectWith = this._connectWith();
+
+		if(connectWith) {
+			for (var i = connectWith.length - 1; i >= 0; i--){
+				var cur = $(connectWith[i]);
+				for (var j = cur.length - 1; j >= 0; j--){
+					var inst = $.data(cur[j], 'sortable');
+					if(inst && inst != this && !inst.options.disabled) {
+						queries.push([$.isFunction(inst.options.items) ? inst.options.items.call(inst.element[0], event, { item: this.currentItem }) : $(inst.options.items, inst.element), inst]);
+						this.containers.push(inst);
+					}
+				};
+			};
+		}
+
+		for (var i = queries.length - 1; i >= 0; i--) {
+			var targetData = queries[i][1];
+			var _queries = queries[i][0];
+
+			for (var j=0, queriesLength = _queries.length; j < queriesLength; j++) {
+				var item = $(_queries[j]);
+
+				item.data('sortable-item', targetData); // Data for target checking (mouse manager)
+
+				items.push({
+					item: item,
+					instance: targetData,
+					width: 0, height: 0,
+					left: 0, top: 0
+				});
+			};
+		};
+
+	},
+
+	refreshPositions: function(fast) {
+
+		//This has to be redone because due to the item being moved out/into the offsetParent, the offsetParent's position will change
+		if(this.offsetParent && this.helper) {
+			this.offset.parent = this._getParentOffset();
+		}
+
+		for (var i = this.items.length - 1; i >= 0; i--){
+			var item = this.items[i];
+
+			var t = this.options.toleranceElement ? $(this.options.toleranceElement, item.item) : item.item;
+
+			if (!fast) {
+				item.width = t.outerWidth();
+				item.height = t.outerHeight();
+			}
+
+			var p = t.offset();
+			item.left = p.left;
+			item.top = p.top;
+		};
+
+		if(this.options.custom && this.options.custom.refreshContainers) {
+			this.options.custom.refreshContainers.call(this);
+		} else {
+			for (var i = this.containers.length - 1; i >= 0; i--){
+				var p = this.containers[i].element.offset();
+				this.containers[i].containerCache.left = p.left;
+				this.containers[i].containerCache.top = p.top;
+				this.containers[i].containerCache.width	= this.containers[i].element.outerWidth();
+				this.containers[i].containerCache.height = this.containers[i].element.outerHeight();
+			};
+		}
+
+		return this;
+	},
+
+	_createPlaceholder: function(that) {
+
+		var self = that || this, o = self.options;
+
+		if(!o.placeholder || o.placeholder.constructor == String) {
+			var className = o.placeholder;
+			o.placeholder = {
+				element: function() {
+
+					var el = $(document.createElement(self.currentItem[0].nodeName))
+						.addClass(className || self.currentItem[0].className+" ui-sortable-placeholder")
+						.removeClass("ui-sortable-helper")[0];
+
+					if(!className)
+						el.style.visibility = "hidden";
+
+					return el;
+				},
+				update: function(container, p) {
+
+					// 1. If a className is set as 'placeholder option, we don't force sizes - the class is responsible for that
+					// 2. The option 'forcePlaceholderSize can be enabled to force it even if a class name is specified
+					if(className && !o.forcePlaceholderSize) return;
+
+					//If the element doesn't have a actual height by itself (without styles coming from a stylesheet), it receives the inline height from the dragged item
+					if(!p.height()) { p.height(self.currentItem.innerHeight() - parseInt(self.currentItem.css('paddingTop')||0, 10) - parseInt(self.currentItem.css('paddingBottom')||0, 10)); };
+					if(!p.width()) { p.width(self.currentItem.innerWidth() - parseInt(self.currentItem.css('paddingLeft')||0, 10) - parseInt(self.currentItem.css('paddingRight')||0, 10)); };
+				}
+			};
+		}
+
+		//Create the placeholder
+		self.placeholder = $(o.placeholder.element.call(self.element, self.currentItem));
+
+		//Append it after the actual current item
+		self.currentItem.after(self.placeholder);
+
+		//Update the size of the placeholder (TODO: Logic to fuzzy, see line 316/317)
+		o.placeholder.update(self, self.placeholder);
+
+	},
+
+	_contactContainers: function(event) {
+		
+		// get innermost container that intersects with item 
+		var innermostContainer = null, innermostIndex = null;		
+		
+		
+		for (var i = this.containers.length - 1; i >= 0; i--){
+
+			// never consider a container that's located within the item itself 
+			if($.ui.contains(this.currentItem[0], this.containers[i].element[0]))
+				continue;
+
+			if(this._intersectsWith(this.containers[i].containerCache)) {
+
+				// if we've already found a container and it's more "inner" than this, then continue 
+				if(innermostContainer && $.ui.contains(this.containers[i].element[0], innermostContainer.element[0]))
+					continue;
+
+				innermostContainer = this.containers[i]; 
+				innermostIndex = i;
+					
+			} else {
+				// container doesn't intersect. trigger "out" event if necessary 
+				if(this.containers[i].containerCache.over) {
+					this.containers[i]._trigger("out", event, this._uiHash(this));
+					this.containers[i].containerCache.over = 0;
+				}
+			}
+
+		}
+		
+		// if no intersecting containers found, return 
+		if(!innermostContainer) return; 
+
+		// move the item into the container if it's not there already
+		if(this.containers.length === 1) {
+			this.containers[innermostIndex]._trigger("over", event, this._uiHash(this));
+			this.containers[innermostIndex].containerCache.over = 1;
+		} else if(this.currentContainer != this.containers[innermostIndex]) { 
+
+			//When entering a new container, we will find the item with the least distance and append our item near it 
+			var dist = 10000; var itemWithLeastDistance = null; var base = this.positionAbs[this.containers[innermostIndex].floating ? 'left' : 'top']; 
+			for (var j = this.items.length - 1; j >= 0; j--) { 
+				if(!$.ui.contains(this.containers[innermostIndex].element[0], this.items[j].item[0])) continue; 
+				var cur = this.items[j][this.containers[innermostIndex].floating ? 'left' : 'top']; 
+				if(Math.abs(cur - base) < dist) { 
+					dist = Math.abs(cur - base); itemWithLeastDistance = this.items[j]; 
+				} 
+			} 
+
+			if(!itemWithLeastDistance && !this.options.dropOnEmpty) //Check if dropOnEmpty is enabled 
+				return; 
+
+			this.currentContainer = this.containers[innermostIndex]; 
+			itemWithLeastDistance ? this._rearrange(event, itemWithLeastDistance, null, true) : this._rearrange(event, null, this.containers[innermostIndex].element, true); 
+			this._trigger("change", event, this._uiHash()); 
+			this.containers[innermostIndex]._trigger("change", event, this._uiHash(this)); 
+
+			//Update the placeholder 
+			this.options.placeholder.update(this.currentContainer, this.placeholder); 
+		
+			this.containers[innermostIndex]._trigger("over", event, this._uiHash(this)); 
+			this.containers[innermostIndex].containerCache.over = 1;
+		} 
+	
+		
+	},
+
+	_createHelper: function(event) {
+
+		var o = this.options;
+		var helper = $.isFunction(o.helper) ? $(o.helper.apply(this.element[0], [event, this.currentItem])) : (o.helper == 'clone' ? this.currentItem.clone() : this.currentItem);
+
+		if(!helper.parents('body').length) //Add the helper to the DOM if that didn't happen already
+			$(o.appendTo != 'parent' ? o.appendTo : this.currentItem[0].parentNode)[0].appendChild(helper[0]);
+
+		if(helper[0] == this.currentItem[0])
+			this._storedCSS = { width: this.currentItem[0].style.width, height: this.currentItem[0].style.height, position: this.currentItem.css("position"), top: this.currentItem.css("top"), left: this.currentItem.css("left") };
+
+		if(helper[0].style.width == '' || o.forceHelperSize) helper.width(this.currentItem.width());
+		if(helper[0].style.height == '' || o.forceHelperSize) helper.height(this.currentItem.height());
+
+		return helper;
+
+	},
+
+	_adjustOffsetFromHelper: function(obj) {
+		if (typeof obj == 'string') {
+			obj = obj.split(' ');
+		}
+		if ($.isArray(obj)) {
+			obj = {left: +obj[0], top: +obj[1] || 0};
+		}
+		if ('left' in obj) {
+			this.offset.click.left = obj.left + this.margins.left;
+		}
+		if ('right' in obj) {
+			this.offset.click.left = this.helperProportions.width - obj.right + this.margins.left;
+		}
+		if ('top' in obj) {
+			this.offset.click.top = obj.top + this.margins.top;
+		}
+		if ('bottom' in obj) {
+			this.offset.click.top = this.helperProportions.height - obj.bottom + this.margins.top;
+		}
+	},
+
+	_getParentOffset: function() {
+
+
+		//Get the offsetParent and cache its position
+		this.offsetParent = this.helper.offsetParent();
+		var po = this.offsetParent.offset();
+
+		// This is a special case where we need to modify a offset calculated on start, since the following happened:
+		// 1. The position of the helper is absolute, so it's position is calculated based on the next positioned parent
+		// 2. The actual offset parent is a child of the scroll parent, and the scroll parent isn't the document, which means that
+		//    the scroll is included in the initial calculation of the offset of the parent, and never recalculated upon drag
+		if(this.cssPosition == 'absolute' && this.scrollParent[0] != document && $.ui.contains(this.scrollParent[0], this.offsetParent[0])) {
+			po.left += this.scrollParent.scrollLeft();
+			po.top += this.scrollParent.scrollTop();
+		}
+
+		if((this.offsetParent[0] == document.body) //This needs to be actually done for all browsers, since pageX/pageY includes this information
+		|| (this.offsetParent[0].tagName && this.offsetParent[0].tagName.toLowerCase() == 'html' && $.browser.msie)) //Ugly IE fix
+			po = { top: 0, left: 0 };
+
+		return {
+			top: po.top + (parseInt(this.offsetParent.css("borderTopWidth"),10) || 0),
+			left: po.left + (parseInt(this.offsetParent.css("borderLeftWidth"),10) || 0)
+		};
+
+	},
+
+	_getRelativeOffset: function() {
+
+		if(this.cssPosition == "relative") {
+			var p = this.currentItem.position();
+			return {
+				top: p.top - (parseInt(this.helper.css("top"),10) || 0) + this.scrollParent.scrollTop(),
+				left: p.left - (parseInt(this.helper.css("left"),10) || 0) + this.scrollParent.scrollLeft()
+			};
+		} else {
+			return { top: 0, left: 0 };
+		}
+
+	},
+
+	_cacheMargins: function() {
+		this.margins = {
+			left: (parseInt(this.currentItem.css("marginLeft"),10) || 0),
+			top: (parseInt(this.currentItem.css("marginTop"),10) || 0)
+		};
+	},
+
+	_cacheHelperProportions: function() {
+		this.helperProportions = {
+			width: this.helper.outerWidth(),
+			height: this.helper.outerHeight()
+		};
+	},
+
+	_setContainment: function() {
+
+		var o = this.options;
+		if(o.containment == 'parent') o.containment = this.helper[0].parentNode;
+		if(o.containment == 'document' || o.containment == 'window') this.containment = [
+			0 - this.offset.relative.left - this.offset.parent.left,
+			0 - this.offset.relative.top - this.offset.parent.top,
+			$(o.containment == 'document' ? document : window).width() - this.helperProportions.width - this.margins.left,
+			($(o.containment == 'document' ? document : window).height() || document.body.parentNode.scrollHeight) - this.helperProportions.height - this.margins.top
+		];
+
+		if(!(/^(document|window|parent)$/).test(o.containment)) {
+			var ce = $(o.containment)[0];
+			var co = $(o.containment).offset();
+			var over = ($(ce).css("overflow") != 'hidden');
+
+			this.containment = [
+				co.left + (parseInt($(ce).css("borderLeftWidth"),10) || 0) + (parseInt($(ce).css("paddingLeft"),10) || 0) - this.margins.left,
+				co.top + (parseInt($(ce).css("borderTopWidth"),10) || 0) + (parseInt($(ce).css("paddingTop"),10) || 0) - this.margins.top,
+				co.left+(over ? Math.max(ce.scrollWidth,ce.offsetWidth) : ce.offsetWidth) - (parseInt($(ce).css("borderLeftWidth"),10) || 0) - (parseInt($(ce).css("paddingRight"),10) || 0) - this.helperProportions.width - this.margins.left,
+				co.top+(over ? Math.max(ce.scrollHeight,ce.offsetHeight) : ce.offsetHeight) - (parseInt($(ce).css("borderTopWidth"),10) || 0) - (parseInt($(ce).css("paddingBottom"),10) || 0) - this.helperProportions.height - this.margins.top
+			];
+		}
+
+	},
+
+	_convertPositionTo: function(d, pos) {
+
+		if(!pos) pos = this.position;
+		var mod = d == "absolute" ? 1 : -1;
+		var o = this.options, scroll = this.cssPosition == 'absolute' && !(this.scrollParent[0] != document && $.ui.contains(this.scrollParent[0], this.offsetParent[0])) ? this.offsetParent : this.scrollParent, scrollIsRootNode = (/(html|body)/i).test(scroll[0].tagName);
+
+		return {
+			top: (
+				pos.top																	// The absolute mouse position
+				+ this.offset.relative.top * mod										// Only for relative positioned nodes: Relative offset from element to offset parent
+				+ this.offset.parent.top * mod											// The offsetParent's offset without borders (offset + border)
+				- ($.browser.safari && this.cssPosition == 'fixed' ? 0 : ( this.cssPosition == 'fixed' ? -this.scrollParent.scrollTop() : ( scrollIsRootNode ? 0 : scroll.scrollTop() ) ) * mod)
+			),
+			left: (
+				pos.left																// The absolute mouse position
+				+ this.offset.relative.left * mod										// Only for relative positioned nodes: Relative offset from element to offset parent
+				+ this.offset.parent.left * mod											// The offsetParent's offset without borders (offset + border)
+				- ($.browser.safari && this.cssPosition == 'fixed' ? 0 : ( this.cssPosition == 'fixed' ? -this.scrollParent.scrollLeft() : scrollIsRootNode ? 0 : scroll.scrollLeft() ) * mod)
+			)
+		};
+
+	},
+
+	_generatePosition: function(event) {
+
+		var o = this.options, scroll = this.cssPosition == 'absolute' && !(this.scrollParent[0] != document && $.ui.contains(this.scrollParent[0], this.offsetParent[0])) ? this.offsetParent : this.scrollParent, scrollIsRootNode = (/(html|body)/i).test(scroll[0].tagName);
+
+		// This is another very weird special case that only happens for relative elements:
+		// 1. If the css position is relative
+		// 2. and the scroll parent is the document or similar to the offset parent
+		// we have to refresh the relative offset during the scroll so there are no jumps
+		if(this.cssPosition == 'relative' && !(this.scrollParent[0] != document && this.scrollParent[0] != this.offsetParent[0])) {
+			this.offset.relative = this._getRelativeOffset();
+		}
+
+		var pageX = event.pageX;
+		var pageY = event.pageY;
+
+		/*
+		 * - Position constraining -
+		 * Constrain the position to a mix of grid, containment.
+		 */
+
+		if(this.originalPosition) { //If we are not dragging yet, we won't check for options
+
+			if(this.containment) {
+				if(event.pageX - this.offset.click.left < this.containment[0]) pageX = this.containment[0] + this.offset.click.left;
+				if(event.pageY - this.offset.click.top < this.containment[1]) pageY = this.containment[1] + this.offset.click.top;
+				if(event.pageX - this.offset.click.left > this.containment[2]) pageX = this.containment[2] + this.offset.click.left;
+				if(event.pageY - this.offset.click.top > this.containment[3]) pageY = this.containment[3] + this.offset.click.top;
+			}
+
+			if(o.grid) {
+				var top = this.originalPageY + Math.round((pageY - this.originalPageY) / o.grid[1]) * o.grid[1];
+				pageY = this.containment ? (!(top - this.offset.click.top < this.containment[1] || top - this.offset.click.top > this.containment[3]) ? top : (!(top - this.offset.click.top < this.containment[1]) ? top - o.grid[1] : top + o.grid[1])) : top;
+
+				var left = this.originalPageX + Math.round((pageX - this.originalPageX) / o.grid[0]) * o.grid[0];
+				pageX = this.containment ? (!(left - this.offset.click.left < this.containment[0] || left - this.offset.click.left > this.containment[2]) ? left : (!(left - this.offset.click.left < this.containment[0]) ? left - o.grid[0] : left + o.grid[0])) : left;
+			}
+
+		}
+
+		return {
+			top: (
+				pageY																// The absolute mouse position
+				- this.offset.click.top													// Click offset (relative to the element)
+				- this.offset.relative.top												// Only for relative positioned nodes: Relative offset from element to offset parent
+				- this.offset.parent.top												// The offsetParent's offset without borders (offset + border)
+				+ ($.browser.safari && this.cssPosition == 'fixed' ? 0 : ( this.cssPosition == 'fixed' ? -this.scrollParent.scrollTop() : ( scrollIsRootNode ? 0 : scroll.scrollTop() ) ))
+			),
+			left: (
+				pageX																// The absolute mouse position
+				- this.offset.click.left												// Click offset (relative to the element)
+				- this.offset.relative.left												// Only for relative positioned nodes: Relative offset from element to offset parent
+				- this.offset.parent.left												// The offsetParent's offset without borders (offset + border)
+				+ ($.browser.safari && this.cssPosition == 'fixed' ? 0 : ( this.cssPosition == 'fixed' ? -this.scrollParent.scrollLeft() : scrollIsRootNode ? 0 : scroll.scrollLeft() ))
+			)
+		};
+
+	},
+
+	_rearrange: function(event, i, a, hardRefresh) {
+
+		a ? a[0].appendChild(this.placeholder[0]) : i.item[0].parentNode.insertBefore(this.placeholder[0], (this.direction == 'down' ? i.item[0] : i.item[0].nextSibling));
+
+		//Various things done here to improve the performance:
+		// 1. we create a setTimeout, that calls refreshPositions
+		// 2. on the instance, we have a counter variable, that get's higher after every append
+		// 3. on the local scope, we copy the counter variable, and check in the timeout, if it's still the same
+		// 4. this lets only the last addition to the timeout stack through
+		this.counter = this.counter ? ++this.counter : 1;
+		var self = this, counter = this.counter;
+
+		window.setTimeout(function() {
+			if(counter == self.counter) self.refreshPositions(!hardRefresh); //Precompute after each DOM insertion, NOT on mousemove
+		},0);
+
+	},
+
+	_clear: function(event, noPropagation) {
+
+		this.reverting = false;
+		// We delay all events that have to be triggered to after the point where the placeholder has been removed and
+		// everything else normalized again
+		var delayedTriggers = [], self = this;
+
+		// We first have to update the dom position of the actual currentItem
+		// Note: don't do it if the current item is already removed (by a user), or it gets reappended (see #4088)
+		if(!this._noFinalSort && this.currentItem[0].parentNode) this.placeholder.before(this.currentItem);
+		this._noFinalSort = null;
+
+		if(this.helper[0] == this.currentItem[0]) {
+			for(var i in this._storedCSS) {
+				if(this._storedCSS[i] == 'auto' || this._storedCSS[i] == 'static') this._storedCSS[i] = '';
+			}
+			this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper");
+		} else {
+			this.currentItem.show();
+		}
+
+		if(this.fromOutside && !noPropagation) delayedTriggers.push(function(event) { this._trigger("receive", event, this._uiHash(this.fromOutside)); });
+		if((this.fromOutside || this.domPosition.prev != this.currentItem.prev().not(".ui-sortable-helper")[0] || this.domPosition.parent != this.currentItem.parent()[0]) && !noPropagation) delayedTriggers.push(function(event) { this._trigger("update", event, this._uiHash()); }); //Trigger update callback if the DOM position has changed
+		if(!$.ui.contains(this.element[0], this.currentItem[0])) { //Node was moved out of the current element
+			if(!noPropagation) delayedTriggers.push(function(event) { this._trigger("remove", event, this._uiHash()); });
+			for (var i = this.containers.length - 1; i >= 0; i--){
+				if($.ui.contains(this.containers[i].element[0], this.currentItem[0]) && !noPropagation) {
+					delayedTriggers.push((function(c) { return function(event) { c._trigger("receive", event, this._uiHash(this)); };  }).call(this, this.containers[i]));
+					delayedTriggers.push((function(c) { return function(event) { c._trigger("update", event, this._uiHash(this));  }; }).call(this, this.containers[i]));
+				}
+			};
+		};
+
+		//Post events to containers
+		for (var i = this.containers.length - 1; i >= 0; i--){
+			if(!noPropagation) delayedTriggers.push((function(c) { return function(event) { c._trigger("deactivate", event, this._uiHash(this)); };  }).call(this, this.containers[i]));
+			if(this.containers[i].containerCache.over) {
+				delayedTriggers.push((function(c) { return function(event) { c._trigger("out", event, this._uiHash(this)); };  }).call(this, this.containers[i]));
+				this.containers[i].containerCache.over = 0;
+			}
+		}
+
+		//Do what was originally in plugins
+		if(this._storedCursor) $('body').css("cursor", this._storedCursor); //Reset cursor
+		if(this._storedOpacity) this.helper.css("opacity", this._storedOpacity); //Reset opacity
+		if(this._storedZIndex) this.helper.css("zIndex", this._storedZIndex == 'auto' ? '' : this._storedZIndex); //Reset z-index
+
+		this.dragging = false;
+		if(this.cancelHelperRemoval) {
+			if(!noPropagation) {
+				this._trigger("beforeStop", event, this._uiHash());
+				for (var i=0; i < delayedTriggers.length; i++) { delayedTriggers[i].call(this, event); }; //Trigger all delayed events
+				this._trigger("stop", event, this._uiHash());
+			}
+			return false;
+		}
+
+		if(!noPropagation) this._trigger("beforeStop", event, this._uiHash());
+
+		//$(this.placeholder[0]).remove(); would have been the jQuery way - unfortunately, it unbinds ALL events from the original node!
+		this.placeholder[0].parentNode.removeChild(this.placeholder[0]);
+
+		if(this.helper[0] != this.currentItem[0]) this.helper.remove(); this.helper = null;
+
+		if(!noPropagation) {
+			for (var i=0; i < delayedTriggers.length; i++) { delayedTriggers[i].call(this, event); }; //Trigger all delayed events
+			this._trigger("stop", event, this._uiHash());
+		}
+
+		this.fromOutside = false;
+		return true;
+
+	},
+
+	_trigger: function() {
+		if ($.Widget.prototype._trigger.apply(this, arguments) === false) {
+			this.cancel();
+		}
+	},
+
+	_uiHash: function(inst) {
+		var self = inst || this;
+		return {
+			helper: self.helper,
+			placeholder: self.placeholder || $([]),
+			position: self.position,
+			originalPosition: self.originalPosition,
+			offset: self.positionAbs,
+			item: self.currentItem,
+			sender: inst ? inst.element : null
+		};
+	}
+
+});
+
+$.extend($.ui.sortable, {
+	version: "1.8.10"
+});
+
+})(jQuery);
+/*
+ * jQuery UI Accordion 1.8.10
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Accordion
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ *	jquery.ui.widget.js
+ */
+(function( $, undefined ) {
+
+$.widget( "ui.accordion", {
+	options: {
+		active: 0,
+		animated: "slide",
+		autoHeight: true,
+		clearStyle: false,
+		collapsible: false,
+		event: "click",
+		fillSpace: false,
+		header: "> li > :first-child,> :not(li):even",
+		icons: {
+			header: "ui-icon-triangle-1-e",
+			headerSelected: "ui-icon-triangle-1-s"
+		},
+		navigation: false,
+		navigationFilter: function() {
+			return this.href.toLowerCase() === location.href.toLowerCase();
+		}
+	},
+
+	_create: function() {
+		var self = this,
+			options = self.options;
+
+		self.running = 0;
+
+		self.element
+			.addClass( "ui-accordion ui-widget ui-helper-reset" )
+			// in lack of child-selectors in CSS
+			// we need to mark top-LIs in a UL-accordion for some IE-fix
+			.children( "li" )
+				.addClass( "ui-accordion-li-fix" );
+
+		self.headers = self.element.find( options.header )
+			.addClass( "ui-accordion-header ui-helper-reset ui-state-default ui-corner-all" )
+			.bind( "mouseenter.accordion", function() {
+				if ( options.disabled ) {
+					return;
+				}
+				$( this ).addClass( "ui-state-hover" );
+			})
+			.bind( "mouseleave.accordion", function() {
+				if ( options.disabled ) {
+					return;
+				}
+				$( this ).removeClass( "ui-state-hover" );
+			})
+			.bind( "focus.accordion", function() {
+				if ( options.disabled ) {
+					return;
+				}
+				$( this ).addClass( "ui-state-focus" );
+			})
+			.bind( "blur.accordion", function() {
+				if ( options.disabled ) {
+					return;
+				}
+				$( this ).removeClass( "ui-state-focus" );
+			});
+
+		self.headers.next()
+			.addClass( "ui-accordion-content ui-helper-reset ui-widget-content ui-corner-bottom" );
+
+		if ( options.navigation ) {
+			var current = self.element.find( "a" ).filter( options.navigationFilter ).eq( 0 );
+			if ( current.length ) {
+				var header = current.closest( ".ui-accordion-header" );
+				if ( header.length ) {
+					// anchor within header
+					self.active = header;
+				} else {
+					// anchor within content
+					self.active = current.closest( ".ui-accordion-content" ).prev();
+				}
+			}
+		}
+
+		self.active = self._findActive( self.active || options.active )
+			.addClass( "ui-state-default ui-state-active" )
+			.toggleClass( "ui-corner-all" )
+			.toggleClass( "ui-corner-top" );
+		self.active.next().addClass( "ui-accordion-content-active" );
+
+		self._createIcons();
+		self.resize();
+		
+		// ARIA
+		self.element.attr( "role", "tablist" );
+
+		self.headers
+			.attr( "role", "tab" )
+			.bind( "keydown.accordion", function( event ) {
+				return self._keydown( event );
+			})
+			.next()
+				.attr( "role", "tabpanel" );
+
+		self.headers
+			.not( self.active || "" )
+			.attr({
+				"aria-expanded": "false",
+				tabIndex: -1
+			})
+			.next()
+				.hide();
+
+		// make sure at least one header is in the tab order
+		if ( !self.active.length ) {
+			self.headers.eq( 0 ).attr( "tabIndex", 0 );
+		} else {
+			self.active
+				.attr({
+					"aria-expanded": "true",
+					tabIndex: 0
+				});
+		}
+
+		// only need links in tab order for Safari
+		if ( !$.browser.safari ) {
+			self.headers.find( "a" ).attr( "tabIndex", -1 );
+		}
+
+		if ( options.event ) {
+			self.headers.bind( options.event.split(" ").join(".accordion ") + ".accordion", function(event) {
+				self._clickHandler.call( self, event, this );
+				event.preventDefault();
+			});
+		}
+	},
+
+	_createIcons: function() {
+		var options = this.options;
+		if ( options.icons ) {
+			$( "<span></span>" )
+				.addClass( "ui-icon " + options.icons.header )
+				.prependTo( this.headers );
+			this.active.children( ".ui-icon" )
+				.toggleClass(options.icons.header)
+				.toggleClass(options.icons.headerSelected);
+			this.element.addClass( "ui-accordion-icons" );
+		}
+	},
+
+	_destroyIcons: function() {
+		this.headers.children( ".ui-icon" ).remove();
+		this.element.removeClass( "ui-accordion-icons" );
+	},
+
+	destroy: function() {
+		var options = this.options;
+
+		this.element
+			.removeClass( "ui-accordion ui-widget ui-helper-reset" )
+			.removeAttr( "role" );
+
+		this.headers
+			.unbind( ".accordion" )
+			.removeClass( "ui-accordion-header ui-accordion-disabled ui-helper-reset ui-state-default ui-corner-all ui-state-active ui-state-disabled ui-corner-top" )
+			.removeAttr( "role" )
+			.removeAttr( "aria-expanded" )
+			.removeAttr( "tabIndex" );
+
+		this.headers.find( "a" ).removeAttr( "tabIndex" );
+		this._destroyIcons();
+		var contents = this.headers.next()
+			.css( "display", "" )
+			.removeAttr( "role" )
+			.removeClass( "ui-helper-reset ui-widget-content ui-corner-bottom ui-accordion-content ui-accordion-content-active ui-accordion-disabled ui-state-disabled" );
+		if ( options.autoHeight || options.fillHeight ) {
+			contents.css( "height", "" );
+		}
+
+		return $.Widget.prototype.destroy.call( this );
+	},
+
+	_setOption: function( key, value ) {
+		$.Widget.prototype._setOption.apply( this, arguments );
+			
+		if ( key == "active" ) {
+			this.activate( value );
+		}
+		if ( key == "icons" ) {
+			this._destroyIcons();
+			if ( value ) {
+				this._createIcons();
+			}
+		}
+		// #5332 - opacity doesn't cascade to positioned elements in IE
+		// so we need to add the disabled class to the headers and panels
+		if ( key == "disabled" ) {
+			this.headers.add(this.headers.next())
+				[ value ? "addClass" : "removeClass" ](
+					"ui-accordion-disabled ui-state-disabled" );
+		}
+	},
+
+	_keydown: function( event ) {
+		if ( this.options.disabled || event.altKey || event.ctrlKey ) {
+			return;
+		}
+
+		var keyCode = $.ui.keyCode,
+			length = this.headers.length,
+			currentIndex = this.headers.index( event.target ),
+			toFocus = false;
+
+		switch ( event.keyCode ) {
+			case keyCode.RIGHT:
+			case keyCode.DOWN:
+				toFocus = this.headers[ ( currentIndex + 1 ) % length ];
+				break;
+			case keyCode.LEFT:
+			case keyCode.UP:
+				toFocus = this.headers[ ( currentIndex - 1 + length ) % length ];
+				break;
+			case keyCode.SPACE:
+			case keyCode.ENTER:
+				this._clickHandler( { target: event.target }, event.target );
+				event.preventDefault();
+		}
+
+		if ( toFocus ) {
+			$( event.target ).attr( "tabIndex", -1 );
+			$( toFocus ).attr( "tabIndex", 0 );
+			toFocus.focus();
+			return false;
+		}
+
+		return true;
+	},
+
+	resize: function() {
+		var options = this.options,
+			maxHeight;
+
+		if ( options.fillSpace ) {
+			if ( $.browser.msie ) {
+				var defOverflow = this.element.parent().css( "overflow" );
+				this.element.parent().css( "overflow", "hidden");
+			}
+			maxHeight = this.element.parent().height();
+			if ($.browser.msie) {
+				this.element.parent().css( "overflow", defOverflow );
+			}
+
+			this.headers.each(function() {
+				maxHeight -= $( this ).outerHeight( true );
+			});
+
+			this.headers.next()
+				.each(function() {
+					$( this ).height( Math.max( 0, maxHeight -
+						$( this ).innerHeight() + $( this ).height() ) );
+				})
+				.css( "overflow", "auto" );
+		} else if ( options.autoHeight ) {
+			maxHeight = 0;
+			this.headers.next()
+				.each(function() {
+					maxHeight = Math.max( maxHeight, $( this ).height( "" ).height() );
+				})
+				.height( maxHeight );
+		}
+
+		return this;
+	},
+
+	activate: function( index ) {
+		// TODO this gets called on init, changing the option without an explicit call for that
+		this.options.active = index;
+		// call clickHandler with custom event
+		var active = this._findActive( index )[ 0 ];
+		this._clickHandler( { target: active }, active );
+
+		return this;
+	},
+
+	_findActive: function( selector ) {
+		return selector
+			? typeof selector === "number"
+				? this.headers.filter( ":eq(" + selector + ")" )
+				: this.headers.not( this.headers.not( selector ) )
+			: selector === false
+				? $( [] )
+				: this.headers.filter( ":eq(0)" );
+	},
+
+	// TODO isn't event.target enough? why the separate target argument?
+	_clickHandler: function( event, target ) {
+		var options = this.options;
+		if ( options.disabled ) {
+			return;
+		}
+
+		// called only when using activate(false) to close all parts programmatically
+		if ( !event.target ) {
+			if ( !options.collapsible ) {
+				return;
+			}
+			this.active
+				.removeClass( "ui-state-active ui-corner-top" )
+				.addClass( "ui-state-default ui-corner-all" )
+				.children( ".ui-icon" )
+					.removeClass( options.icons.headerSelected )
+					.addClass( options.icons.header );
+			this.active.next().addClass( "ui-accordion-content-active" );
+			var toHide = this.active.next(),
+				data = {
+					options: options,
+					newHeader: $( [] ),
+					oldHeader: options.active,
+					newContent: $( [] ),
+					oldContent: toHide
+				},
+				toShow = ( this.active = $( [] ) );
+			this._toggle( toShow, toHide, data );
+			return;
+		}
+
+		// get the click target
+		var clicked = $( event.currentTarget || target ),
+			clickedIsActive = clicked[0] === this.active[0];
+
+		// TODO the option is changed, is that correct?
+		// TODO if it is correct, shouldn't that happen after determining that the click is valid?
+		options.active = options.collapsible && clickedIsActive ?
+			false :
+			this.headers.index( clicked );
+
+		// if animations are still active, or the active header is the target, ignore click
+		if ( this.running || ( !options.collapsible && clickedIsActive ) ) {
+			return;
+		}
+
+		// find elements to show and hide
+		var active = this.active,
+			toShow = clicked.next(),
+			toHide = this.active.next(),
+			data = {
+				options: options,
+				newHeader: clickedIsActive && options.collapsible ? $([]) : clicked,
+				oldHeader: this.active,
+				newContent: clickedIsActive && options.collapsible ? $([]) : toShow,
+				oldContent: toHide
+			},
+			down = this.headers.index( this.active[0] ) > this.headers.index( clicked[0] );
+
+		// when the call to ._toggle() comes after the class changes
+		// it causes a very odd bug in IE 8 (see #6720)
+		this.active = clickedIsActive ? $([]) : clicked;
+		this._toggle( toShow, toHide, data, clickedIsActive, down );
+
+		// switch classes
+		active
+			.removeClass( "ui-state-active ui-corner-top" )
+			.addClass( "ui-state-default ui-corner-all" )
+			.children( ".ui-icon" )
+				.removeClass( options.icons.headerSelected )
+				.addClass( options.icons.header );
+		if ( !clickedIsActive ) {
+			clicked
+				.removeClass( "ui-state-default ui-corner-all" )
+				.addClass( "ui-state-active ui-corner-top" )
+				.children( ".ui-icon" )
+					.removeClass( options.icons.header )
+					.addClass( options.icons.headerSelected );
+			clicked
+				.next()
+				.addClass( "ui-accordion-content-active" );
+		}
+
+		return;
+	},
+
+	_toggle: function( toShow, toHide, data, clickedIsActive, down ) {
+		var self = this,
+			options = self.options;
+
+		self.toShow = toShow;
+		self.toHide = toHide;
+		self.data = data;
+
+		var complete = function() {
+			if ( !self ) {
+				return;
+			}
+			return self._completed.apply( self, arguments );
+		};
+
+		// trigger changestart event
+		self._trigger( "changestart", null, self.data );
+
+		// count elements to animate
+		self.running = toHide.size() === 0 ? toShow.size() : toHide.size();
+
+		if ( options.animated ) {
+			var animOptions = {};
+
+			if ( options.collapsible && clickedIsActive ) {
+				animOptions = {
+					toShow: $( [] ),
+					toHide: toHide,
+					complete: complete,
+					down: down,
+					autoHeight: options.autoHeight || options.fillSpace
+				};
+			} else {
+				animOptions = {
+					toShow: toShow,
+					toHide: toHide,
+					complete: complete,
+					down: down,
+					autoHeight: options.autoHeight || options.fillSpace
+				};
+			}
+
+			if ( !options.proxied ) {
+				options.proxied = options.animated;
+			}
+
+			if ( !options.proxiedDuration ) {
+				options.proxiedDuration = options.duration;
+			}
+
+			options.animated = $.isFunction( options.proxied ) ?
+				options.proxied( animOptions ) :
+				options.proxied;
+
+			options.duration = $.isFunction( options.proxiedDuration ) ?
+				options.proxiedDuration( animOptions ) :
+				options.proxiedDuration;
+
+			var animations = $.ui.accordion.animations,
+				duration = options.duration,
+				easing = options.animated;
+
+			if ( easing && !animations[ easing ] && !$.easing[ easing ] ) {
+				easing = "slide";
+			}
+			if ( !animations[ easing ] ) {
+				animations[ easing ] = function( options ) {
+					this.slide( options, {
+						easing: easing,
+						duration: duration || 700
+					});
+				};
+			}
+
+			animations[ easing ]( animOptions );
+		} else {
+			if ( options.collapsible && clickedIsActive ) {
+				toShow.toggle();
+			} else {
+				toHide.hide();
+				toShow.show();
+			}
+
+			complete( true );
+		}
+
+		// TODO assert that the blur and focus triggers are really necessary, remove otherwise
+		toHide.prev()
+			.attr({
+				"aria-expanded": "false",
+				tabIndex: -1
+			})
+			.blur();
+		toShow.prev()
+			.attr({
+				"aria-expanded": "true",
+				tabIndex: 0
+			})
+			.focus();
+	},
+
+	_completed: function( cancel ) {
+		this.running = cancel ? 0 : --this.running;
+		if ( this.running ) {
+			return;
+		}
+
+		if ( this.options.clearStyle ) {
+			this.toShow.add( this.toHide ).css({
+				height: "",
+				overflow: ""
+			});
+		}
+
+		// other classes are removed before the animation; this one needs to stay until completed
+		this.toHide.removeClass( "ui-accordion-content-active" );
+		// Work around for rendering bug in IE (#5421)
+		if ( this.toHide.length ) {
+			this.toHide.parent()[0].className = this.toHide.parent()[0].className;
+		}
+
+		this._trigger( "change", null, this.data );
+	}
+});
+
+$.extend( $.ui.accordion, {
+	version: "1.8.10",
+	animations: {
+		slide: function( options, additions ) {
+			options = $.extend({
+				easing: "swing",
+				duration: 300
+			}, options, additions );
+			if ( !options.toHide.size() ) {
+				options.toShow.animate({
+					height: "show",
+					paddingTop: "show",
+					paddingBottom: "show"
+				}, options );
+				return;
+			}
+			if ( !options.toShow.size() ) {
+				options.toHide.animate({
+					height: "hide",
+					paddingTop: "hide",
+					paddingBottom: "hide"
+				}, options );
+				return;
+			}
+			var overflow = options.toShow.css( "overflow" ),
+				percentDone = 0,
+				showProps = {},
+				hideProps = {},
+				fxAttrs = [ "height", "paddingTop", "paddingBottom" ],
+				originalWidth;
+			// fix width before calculating height of hidden element
+			var s = options.toShow;
+			originalWidth = s[0].style.width;
+			s.width( parseInt( s.parent().width(), 10 )
+				- parseInt( s.css( "paddingLeft" ), 10 )
+				- parseInt( s.css( "paddingRight" ), 10 )
+				- ( parseInt( s.css( "borderLeftWidth" ), 10 ) || 0 )
+				- ( parseInt( s.css( "borderRightWidth" ), 10) || 0 ) );
+
+			$.each( fxAttrs, function( i, prop ) {
+				hideProps[ prop ] = "hide";
+
+				var parts = ( "" + $.css( options.toShow[0], prop ) ).match( /^([\d+-.]+)(.*)$/ );
+				showProps[ prop ] = {
+					value: parts[ 1 ],
+					unit: parts[ 2 ] || "px"
+				};
+			});
+			options.toShow.css({ height: 0, overflow: "hidden" }).show();
+			options.toHide
+				.filter( ":hidden" )
+					.each( options.complete )
+				.end()
+				.filter( ":visible" )
+				.animate( hideProps, {
+				step: function( now, settings ) {
+					// only calculate the percent when animating height
+					// IE gets very inconsistent results when animating elements
+					// with small values, which is common for padding
+					if ( settings.prop == "height" ) {
+						percentDone = ( settings.end - settings.start === 0 ) ? 0 :
+							( settings.now - settings.start ) / ( settings.end - settings.start );
+					}
+
+					options.toShow[ 0 ].style[ settings.prop ] =
+						( percentDone * showProps[ settings.prop ].value )
+						+ showProps[ settings.prop ].unit;
+				},
+				duration: options.duration,
+				easing: options.easing,
+				complete: function() {
+					if ( !options.autoHeight ) {
+						options.toShow.css( "height", "" );
+					}
+					options.toShow.css({
+						width: originalWidth,
+						overflow: overflow
+					});
+					options.complete();
+				}
+			});
+		},
+		bounceslide: function( options ) {
+			this.slide( options, {
+				easing: options.down ? "easeOutBounce" : "swing",
+				duration: options.down ? 1000 : 200
+			});
+		}
+	}
+});
+
+})( jQuery );
+/*
+ * jQuery UI Autocomplete 1.8.10
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Autocomplete
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ *	jquery.ui.widget.js
+ *	jquery.ui.position.js
+ */
+(function( $, undefined ) {
+
+// used to prevent race conditions with remote data sources
+var requestIndex = 0;
+
+$.widget( "ui.autocomplete", {
+	options: {
+		appendTo: "body",
+		delay: 300,
+		minLength: 1,
+		position: {
+			my: "left top",
+			at: "left bottom",
+			collision: "none"
+		},
+		source: null
+	},
+
+	pending: 0,
+
+	_create: function() {
+		var self = this,
+			doc = this.element[ 0 ].ownerDocument,
+			suppressKeyPress;
+
+		this.element
+			.addClass( "ui-autocomplete-input" )
+			.attr( "autocomplete", "off" )
+			// TODO verify these actually work as intended
+			.attr({
+				role: "textbox",
+				"aria-autocomplete": "list",
+				"aria-haspopup": "true"
+			})
+			.bind( "keydown.autocomplete", function( event ) {
+				if ( self.options.disabled || self.element.attr( "readonly" ) ) {
+					return;
+				}
+
+				suppressKeyPress = false;
+				var keyCode = $.ui.keyCode;
+				switch( event.keyCode ) {
+				case keyCode.PAGE_UP:
+					self._move( "previousPage", event );
+					break;
+				case keyCode.PAGE_DOWN:
+					self._move( "nextPage", event );
+					break;
+				case keyCode.UP:
+					self._move( "previous", event );
+					// prevent moving cursor to beginning of text field in some browsers
+					event.preventDefault();
+					break;
+				case keyCode.DOWN:
+					self._move( "next", event );
+					// prevent moving cursor to end of text field in some browsers
+					event.preventDefault();
+					break;
+				case keyCode.ENTER:
+				case keyCode.NUMPAD_ENTER:
+					// when menu is open and has focus
+					if ( self.menu.active ) {
+						// #6055 - Opera still allows the keypress to occur
+						// which causes forms to submit
+						suppressKeyPress = true;
+						event.preventDefault();
+					}
+					//passthrough - ENTER and TAB both select the current element
+				case keyCode.TAB:
+					if ( !self.menu.active ) {
+						return;
+					}
+					self.menu.select( event );
+					break;
+				case keyCode.ESCAPE:
+					self.element.val( self.term );
+					self.close( event );
+					break;
+				default:
+					// keypress is triggered before the input value is changed
+					clearTimeout( self.searching );
+					self.searching = setTimeout(function() {
+						// only search if the value has changed
+						if ( self.term != self.element.val() ) {
+							self.selectedItem = null;
+							self.search( null, event );
+						}
+					}, self.options.delay );
+					break;
+				}
+			})
+			.bind( "keypress.autocomplete", function( event ) {
+				if ( suppressKeyPress ) {
+					suppressKeyPress = false;
+					event.preventDefault();
+				}
+			})
+			.bind( "focus.autocomplete", function() {
+				if ( self.options.disabled ) {
+					return;
+				}
+
+				self.selectedItem = null;
+				self.previous = self.element.val();
+			})
+			.bind( "blur.autocomplete", function( event ) {
+				if ( self.options.disabled ) {
+					return;
+				}
+
+				clearTimeout( self.searching );
+				// clicks on the menu (or a button to trigger a search) will cause a blur event
+				self.closing = setTimeout(function() {
+					self.close( event );
+					self._change( event );
+				}, 150 );
+			});
+		this._initSource();
+		this.response = function() {
+			return self._response.apply( self, arguments );
+		};
+		this.menu = $( "<ul></ul>" )
+			.addClass( "ui-autocomplete" )
+			.appendTo( $( this.options.appendTo || "body", doc )[0] )
+			// prevent the close-on-blur in case of a "slow" click on the menu (long mousedown)
+			.mousedown(function( event ) {
+				// clicking on the scrollbar causes focus to shift to the body
+				// but we can't detect a mouseup or a click immediately afterward
+				// so we have to track the next mousedown and close the menu if
+				// the user clicks somewhere outside of the autocomplete
+				var menuElement = self.menu.element[ 0 ];
+				if ( !$( event.target ).closest( ".ui-menu-item" ).length ) {
+					setTimeout(function() {
+						$( document ).one( 'mousedown', function( event ) {
+							if ( event.target !== self.element[ 0 ] &&
+								event.target !== menuElement &&
+								!$.ui.contains( menuElement, event.target ) ) {
+								self.close();
+							}
+						});
+					}, 1 );
+				}
+
+				// use another timeout to make sure the blur-event-handler on the input was already triggered
+				setTimeout(function() {
+					clearTimeout( self.closing );
+				}, 13);
+			})
+			.menu({
+				focus: function( event, ui ) {
+					var item = ui.item.data( "item.autocomplete" );
+					if ( false !== self._trigger( "focus", event, { item: item } ) ) {
+						// use value to match what will end up in the input, if it was a key event
+						if ( /^key/.test(event.originalEvent.type) ) {
+							self.element.val( item.value );
+						}
+					}
+				},
+				selected: function( event, ui ) {
+					var item = ui.item.data( "item.autocomplete" ),
+						previous = self.previous;
+
+					// only trigger when focus was lost (click on menu)
+					if ( self.element[0] !== doc.activeElement ) {
+						self.element.focus();
+						self.previous = previous;
+						// #6109 - IE triggers two focus events and the second
+						// is asynchronous, so we need to reset the previous
+						// term synchronously and asynchronously :-(
+						setTimeout(function() {
+							self.previous = previous;
+							self.selectedItem = item;
+						}, 1);
+					}
+
+					if ( false !== self._trigger( "select", event, { item: item } ) ) {
+						self.element.val( item.value );
+					}
+					// reset the term after the select event
+					// this allows custom select handling to work properly
+					self.term = self.element.val();
+
+					self.close( event );
+					self.selectedItem = item;
+				},
+				blur: function( event, ui ) {
+					// don't set the value of the text field if it's already correct
+					// this prevents moving the cursor unnecessarily
+					if ( self.menu.element.is(":visible") &&
+						( self.element.val() !== self.term ) ) {
+						self.element.val( self.term );
+					}
+				}
+			})
+			.zIndex( this.element.zIndex() + 1 )
+			// workaround for jQuery bug #5781 http://dev.jquery.com/ticket/5781
+			.css({ top: 0, left: 0 })
+			.hide()
+			.data( "menu" );
+		if ( $.fn.bgiframe ) {
+			 this.menu.element.bgiframe();
+		}
+	},
+
+	destroy: function() {
+		this.element
+			.removeClass( "ui-autocomplete-input" )
+			.removeAttr( "autocomplete" )
+			.removeAttr( "role" )
+			.removeAttr( "aria-autocomplete" )
+			.removeAttr( "aria-haspopup" );
+		this.menu.element.remove();
+		$.Widget.prototype.destroy.call( this );
+	},
+
+	_setOption: function( key, value ) {
+		$.Widget.prototype._setOption.apply( this, arguments );
+		if ( key === "source" ) {
+			this._initSource();
+		}
+		if ( key === "appendTo" ) {
+			this.menu.element.appendTo( $( value || "body", this.element[0].ownerDocument )[0] )
+		}
+		if ( key === "disabled" && value && this.xhr ) {
+			this.xhr.abort();
+		}
+	},
+
+	_initSource: function() {
+		var self = this,
+			array,
+			url;
+		if ( $.isArray(this.options.source) ) {
+			array = this.options.source;
+			this.source = function( request, response ) {
+				response( $.ui.autocomplete.filter(array, request.term) );
+			};
+		} else if ( typeof this.options.source === "string" ) {
+			url = this.options.source;
+			this.source = function( request, response ) {
+				if ( self.xhr ) {
+					self.xhr.abort();
+				}
+				self.xhr = $.ajax({
+					url: url,
+					data: request,
+					dataType: "json",
+					autocompleteRequest: ++requestIndex,
+					success: function( data, status ) {
+						if ( this.autocompleteRequest === requestIndex ) {
+							response( data );
+						}
+					},
+					error: function() {
+						if ( this.autocompleteRequest === requestIndex ) {
+							response( [] );
+						}
+					}
+				});
+			};
+		} else {
+			this.source = this.options.source;
+		}
+	},
+
+	search: function( value, event ) {
+		value = value != null ? value : this.element.val();
+
+		// always save the actual value, not the one passed as an argument
+		this.term = this.element.val();
+
+		if ( value.length < this.options.minLength ) {
+			return this.close( event );
+		}
+
+		clearTimeout( this.closing );
+		if ( this._trigger( "search", event ) === false ) {
+			return;
+		}
+
+		return this._search( value );
+	},
+
+	_search: function( value ) {
+		this.pending++;
+		this.element.addClass( "ui-autocomplete-loading" );
+
+		this.source( { term: value }, this.response );
+	},
+
+	_response: function( content ) {
+		if ( !this.options.disabled && content && content.length ) {
+			content = this._normalize( content );
+			this._suggest( content );
+			this._trigger( "open" );
+		} else {
+			this.close();
+		}
+		this.pending--;
+		if ( !this.pending ) {
+			this.element.removeClass( "ui-autocomplete-loading" );
+		}
+	},
+
+	close: function( event ) {
+		clearTimeout( this.closing );
+		if ( this.menu.element.is(":visible") ) {
+			this.menu.element.hide();
+			this.menu.deactivate();
+			this._trigger( "close", event );
+		}
+	},
+	
+	_change: function( event ) {
+		if ( this.previous !== this.element.val() ) {
+			this._trigger( "change", event, { item: this.selectedItem } );
+		}
+	},
+
+	_normalize: function( items ) {
+		// assume all items have the right format when the first item is complete
+		if ( items.length && items[0].label && items[0].value ) {
+			return items;
+		}
+		return $.map( items, function(item) {
+			if ( typeof item === "string" ) {
+				return {
+					label: item,
+					value: item
+				};
+			}
+			return $.extend({
+				label: item.label || item.value,
+				value: item.value || item.label
+			}, item );
+		});
+	},
+
+	_suggest: function( items ) {
+		var ul = this.menu.element
+			.empty()
+			.zIndex( this.element.zIndex() + 1 );
+		this._renderMenu( ul, items );
+		// TODO refresh should check if the active item is still in the dom, removing the need for a manual deactivate
+		this.menu.deactivate();
+		this.menu.refresh();
+
+		// size and position menu
+		ul.show();
+		this._resizeMenu();
+		ul.position( $.extend({
+			of: this.element
+		}, this.options.position ));
+	},
+
+	_resizeMenu: function() {
+		var ul = this.menu.element;
+		ul.outerWidth( Math.max(
+			ul.width( "" ).outerWidth(),
+			this.element.outerWidth()
+		) );
+	},
+
+	_renderMenu: function( ul, items ) {
+		var self = this;
+		$.each( items, function( index, item ) {
+			self._renderItem( ul, item );
+		});
+	},
+
+	_renderItem: function( ul, item) {
+		return $( "<li></li>" )
+			.data( "item.autocomplete", item )
+			.append( $( "<a></a>" ).text( item.label ) )
+			.appendTo( ul );
+	},
+
+	_move: function( direction, event ) {
+		if ( !this.menu.element.is(":visible") ) {
+			this.search( null, event );
+			return;
+		}
+		if ( this.menu.first() && /^previous/.test(direction) ||
+				this.menu.last() && /^next/.test(direction) ) {
+			this.element.val( this.term );
+			this.menu.deactivate();
+			return;
+		}
+		this.menu[ direction ]( event );
+	},
+
+	widget: function() {
+		return this.menu.element;
+	}
+});
+
+$.extend( $.ui.autocomplete, {
+	escapeRegex: function( value ) {
+		return value.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, "\\$&");
+	},
+	filter: function(array, term) {
+		var matcher = new RegExp( $.ui.autocomplete.escapeRegex(term), "i" );
+		return $.grep( array, function(value) {
+			return matcher.test( value.label || value.value || value );
+		});
+	}
+});
+
+}( jQuery ));
+
+/*
+ * jQuery UI Menu (not officially released)
+ * 
+ * This widget isn't yet finished and the API is subject to change. We plan to finish
+ * it for the next release. You're welcome to give it a try anyway and give us feedback,
+ * as long as you're okay with migrating your code later on. We can help with that, too.
+ *
+ * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Menu
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ *  jquery.ui.widget.js
+ */
+(function($) {
+
+$.widget("ui.menu", {
+	_create: function() {
+		var self = this;
+		this.element
+			.addClass("ui-menu ui-widget ui-widget-content ui-corner-all")
+			.attr({
+				role: "listbox",
+				"aria-activedescendant": "ui-active-menuitem"
+			})
+			.click(function( event ) {
+				if ( !$( event.target ).closest( ".ui-menu-item a" ).length ) {
+					return;
+				}
+				// temporary
+				event.preventDefault();
+				self.select( event );
+			});
+		this.refresh();
+	},
+	
+	refresh: function() {
+		var self = this;
+
+		// don't refresh list items that are already adapted
+		var items = this.element.children("li:not(.ui-menu-item):has(a)")
+			.addClass("ui-menu-item")
+			.attr("role", "menuitem");
+		
+		items.children("a")
+			.addClass("ui-corner-all")
+			.attr("tabindex", -1)
+			// mouseenter doesn't work with event delegation
+			.mouseenter(function( event ) {
+				self.activate( event, $(this).parent() );
+			})
+			.mouseleave(function() {
+				self.deactivate();
+			});
+	},
+
+	activate: function( event, item ) {
+		this.deactivate();
+		if (this.hasScroll()) {
+			var offset = item.offset().top - this.element.offset().top,
+				scroll = this.element.attr("scrollTop"),
+				elementHeight = this.element.height();
+			if (offset < 0) {
+				this.element.attr("scrollTop", scroll + offset);
+			} else if (offset >= elementHeight) {
+				this.element.attr("scrollTop", scroll + offset - elementHeight + item.height());
+			}
+		}
+		this.active = item.eq(0)
+			.children("a")
+				.addClass("ui-state-hover")
+				.attr("id", "ui-active-menuitem")
+			.end();
+		this._trigger("focus", event, { item: item });
+	},
+
+	deactivate: function() {
+		if (!this.active) { return; }
+
+		this.active.children("a")
+			.removeClass("ui-state-hover")
+			.removeAttr("id");
+		this._trigger("blur");
+		this.active = null;
+	},
+
+	next: function(event) {
+		this.move("next", ".ui-menu-item:first", event);
+	},
+
+	previous: function(event) {
+		this.move("prev", ".ui-menu-item:last", event);
+	},
+
+	first: function() {
+		return this.active && !this.active.prevAll(".ui-menu-item").length;
+	},
+
+	last: function() {
+		return this.active && !this.active.nextAll(".ui-menu-item").length;
+	},
+
+	move: function(direction, edge, event) {
+		if (!this.active) {
+			this.activate(event, this.element.children(edge));
+			return;
+		}
+		var next = this.active[direction + "All"](".ui-menu-item").eq(0);
+		if (next.length) {
+			this.activate(event, next);
+		} else {
+			this.activate(event, this.element.children(edge));
+		}
+	},
+
+	// TODO merge with previousPage
+	nextPage: function(event) {
+		if (this.hasScroll()) {
+			// TODO merge with no-scroll-else
+			if (!this.active || this.last()) {
+				this.activate(event, this.element.children(".ui-menu-item:first"));
+				return;
+			}
+			var base = this.active.offset().top,
+				height = this.element.height(),
+				result = this.element.children(".ui-menu-item").filter(function() {
+					var close = $(this).offset().top - base - height + $(this).height();
+					// TODO improve approximation
+					return close < 10 && close > -10;
+				});
+
+			// TODO try to catch this earlier when scrollTop indicates the last page anyway
+			if (!result.length) {
+				result = this.element.children(".ui-menu-item:last");
+			}
+			this.activate(event, result);
+		} else {
+			this.activate(event, this.element.children(".ui-menu-item")
+				.filter(!this.active || this.last() ? ":first" : ":last"));
+		}
+	},
+
+	// TODO merge with nextPage
+	previousPage: function(event) {
+		if (this.hasScroll()) {
+			// TODO merge with no-scroll-else
+			if (!this.active || this.first()) {
+				this.activate(event, this.element.children(".ui-menu-item:last"));
+				return;
+			}
+
+			var base = this.active.offset().top,
+				height = this.element.height();
+				result = this.element.children(".ui-menu-item").filter(function() {
+					var close = $(this).offset().top - base + height - $(this).height();
+					// TODO improve approximation
+					return close < 10 && close > -10;
+				});
+
+			// TODO try to catch this earlier when scrollTop indicates the last page anyway
+			if (!result.length) {
+				result = this.element.children(".ui-menu-item:first");
+			}
+			this.activate(event, result);
+		} else {
+			this.activate(event, this.element.children(".ui-menu-item")
+				.filter(!this.active || this.first() ? ":last" : ":first"));
+		}
+	},
+
+	hasScroll: function() {
+		return this.element.height() < this.element.attr("scrollHeight");
+	},
+
+	select: function( event ) {
+		this._trigger("selected", event, { item: this.active });
+	}
+});
+
+}(jQuery));
+/*
+ * jQuery UI Button 1.8.10
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Button
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ *	jquery.ui.widget.js
+ */
+(function( $, undefined ) {
+
+var lastActive,
+	baseClasses = "ui-button ui-widget ui-state-default ui-corner-all",
+	stateClasses = "ui-state-hover ui-state-active ",
+	typeClasses = "ui-button-icons-only ui-button-icon-only ui-button-text-icons ui-button-text-icon-primary ui-button-text-icon-secondary ui-button-text-only",
+	formResetHandler = function( event ) {
+		$( ":ui-button", event.target.form ).each(function() {
+			var inst = $( this ).data( "button" );
+			setTimeout(function() {
+				inst.refresh();
+			}, 1 );
+		});
+	},
+	radioGroup = function( radio ) {
+		var name = radio.name,
+			form = radio.form,
+			radios = $( [] );
+		if ( name ) {
+			if ( form ) {
+				radios = $( form ).find( "[name='" + name + "']" );
+			} else {
+				radios = $( "[name='" + name + "']", radio.ownerDocument )
+					.filter(function() {
+						return !this.form;
+					});
+			}
+		}
+		return radios;
+	};
+
+$.widget( "ui.button", {
+	options: {
+		disabled: null,
+		text: true,
+		label: null,
+		icons: {
+			primary: null,
+			secondary: null
+		}
+	},
+	_create: function() {
+		this.element.closest( "form" )
+			.unbind( "reset.button" )
+			.bind( "reset.button", formResetHandler );
+
+		if ( typeof this.options.disabled !== "boolean" ) {
+			this.options.disabled = this.element.attr( "disabled" );
+		}
+
+		this._determineButtonType();
+		this.hasTitle = !!this.buttonElement.attr( "title" );
+
+		var self = this,
+			options = this.options,
+			toggleButton = this.type === "checkbox" || this.type === "radio",
+			hoverClass = "ui-state-hover" + ( !toggleButton ? " ui-state-active" : "" ),
+			focusClass = "ui-state-focus";
+
+		if ( options.label === null ) {
+			options.label = this.buttonElement.html();
+		}
+
+		if ( this.element.is( ":disabled" ) ) {
+			options.disabled = true;
+		}
+
+		this.buttonElement
+			.addClass( baseClasses )
+			.attr( "role", "button" )
+			.bind( "mouseenter.button", function() {
+				if ( options.disabled ) {
+					return;
+				}
+				$( this ).addClass( "ui-state-hover" );
+				if ( this === lastActive ) {
+					$( this ).addClass( "ui-state-active" );
+				}
+			})
+			.bind( "mouseleave.button", function() {
+				if ( options.disabled ) {
+					return;
+				}
+				$( this ).removeClass( hoverClass );
+			})
+			.bind( "focus.button", function() {
+				// no need to check disabled, focus won't be triggered anyway
+				$( this ).addClass( focusClass );
+			})
+			.bind( "blur.button", function() {
+				$( this ).removeClass( focusClass );
+			});
+
+		if ( toggleButton ) {
+			this.element.bind( "change.button", function() {
+				self.refresh();
+			});
+		}
+
+		if ( this.type === "checkbox" ) {
+			this.buttonElement.bind( "click.button", function() {
+				if ( options.disabled ) {
+					return false;
+				}
+				$( this ).toggleClass( "ui-state-active" );
+				self.buttonElement.attr( "aria-pressed", self.element[0].checked );
+			});
+		} else if ( this.type === "radio" ) {
+			this.buttonElement.bind( "click.button", function() {
+				if ( options.disabled ) {
+					return false;
+				}
+				$( this ).addClass( "ui-state-active" );
+				self.buttonElement.attr( "aria-pressed", true );
+
+				var radio = self.element[ 0 ];
+				radioGroup( radio )
+					.not( radio )
+					.map(function() {
+						return $( this ).button( "widget" )[ 0 ];
+					})
+					.removeClass( "ui-state-active" )
+					.attr( "aria-pressed", false );
+			});
+		} else {
+			this.buttonElement
+				.bind( "mousedown.button", function() {
+					if ( options.disabled ) {
+						return false;
+					}
+					$( this ).addClass( "ui-state-active" );
+					lastActive = this;
+					$( document ).one( "mouseup", function() {
+						lastActive = null;
+					});
+				})
+				.bind( "mouseup.button", function() {
+					if ( options.disabled ) {
+						return false;
+					}
+					$( this ).removeClass( "ui-state-active" );
+				})
+				.bind( "keydown.button", function(event) {
+					if ( options.disabled ) {
+						return false;
+					}
+					if ( event.keyCode == $.ui.keyCode.SPACE || event.keyCode == $.ui.keyCode.ENTER ) {
+						$( this ).addClass( "ui-state-active" );
+					}
+				})
+				.bind( "keyup.button", function() {
+					$( this ).removeClass( "ui-state-active" );
+				});
+
+			if ( this.buttonElement.is("a") ) {
+				this.buttonElement.keyup(function(event) {
+					if ( event.keyCode === $.ui.keyCode.SPACE ) {
+						// TODO pass through original event correctly (just as 2nd argument doesn't work)
+						$( this ).click();
+					}
+				});
+			}
+		}
+
+		// TODO: pull out $.Widget's handling for the disabled option into
+		// $.Widget.prototype._setOptionDisabled so it's easy to proxy and can
+		// be overridden by individual plugins
+		this._setOption( "disabled", options.disabled );
+	},
+
+	_determineButtonType: function() {
+		
+		if ( this.element.is(":checkbox") ) {
+			this.type = "checkbox";
+		} else {
+			if ( this.element.is(":radio") ) {
+				this.type = "radio";
+			} else {
+				if ( this.element.is("input") ) {
+					this.type = "input";
+				} else {
+					this.type = "button";
+				}
+			}
+		}
+		
+		if ( this.type === "checkbox" || this.type === "radio" ) {
+			// we don't search against the document in case the element
+			// is disconnected from the DOM
+			this.buttonElement = this.element.parents().last()
+				.find( "label[for=" + this.element.attr("id") + "]" );
+			this.element.addClass( "ui-helper-hidden-accessible" );
+
+			var checked = this.element.is( ":checked" );
+			if ( checked ) {
+				this.buttonElement.addClass( "ui-state-active" );
+			}
+			this.buttonElement.attr( "aria-pressed", checked );
+		} else {
+			this.buttonElement = this.element;
+		}
+	},
+
+	widget: function() {
+		return this.buttonElement;
+	},
+
+	destroy: function() {
+		this.element
+			.removeClass( "ui-helper-hidden-accessible" );
+		this.buttonElement
+			.removeClass( baseClasses + " " + stateClasses + " " + typeClasses )
+			.removeAttr( "role" )
+			.removeAttr( "aria-pressed" )
+			.html( this.buttonElement.find(".ui-button-text").html() );
+
+		if ( !this.hasTitle ) {
+			this.buttonElement.removeAttr( "title" );
+		}
+
+		$.Widget.prototype.destroy.call( this );
+	},
+
+	_setOption: function( key, value ) {
+		$.Widget.prototype._setOption.apply( this, arguments );
+		if ( key === "disabled" ) {
+			if ( value ) {
+				this.element.attr( "disabled", true );
+			} else {
+				this.element.removeAttr( "disabled" );
+			}
+		}
+		this._resetButton();
+	},
+
+	refresh: function() {
+		var isDisabled = this.element.is( ":disabled" );
+		if ( isDisabled !== this.options.disabled ) {
+			this._setOption( "disabled", isDisabled );
+		}
+		if ( this.type === "radio" ) {
+			radioGroup( this.element[0] ).each(function() {
+				if ( $( this ).is( ":checked" ) ) {
+					$( this ).button( "widget" )
+						.addClass( "ui-state-active" )
+						.attr( "aria-pressed", true );
+				} else {
+					$( this ).button( "widget" )
+						.removeClass( "ui-state-active" )
+						.attr( "aria-pressed", false );
+				}
+			});
+		} else if ( this.type === "checkbox" ) {
+			if ( this.element.is( ":checked" ) ) {
+				this.buttonElement
+					.addClass( "ui-state-active" )
+					.attr( "aria-pressed", true );
+			} else {
+				this.buttonElement
+					.removeClass( "ui-state-active" )
+					.attr( "aria-pressed", false );
+			}
+		}
+	},
+
+	_resetButton: function() {
+		if ( this.type === "input" ) {
+			if ( this.options.label ) {
+				this.element.val( this.options.label );
+			}
+			return;
+		}
+		var buttonElement = this.buttonElement.removeClass( typeClasses ),
+			buttonText = $( "<span></span>" )
+				.addClass( "ui-button-text" )
+				.html( this.options.label )
+				.appendTo( buttonElement.empty() )
+				.text(),
+			icons = this.options.icons,
+			multipleIcons = icons.primary && icons.secondary,
+			buttonClasses = [];  
+
+		if ( icons.primary || icons.secondary ) {
+			buttonClasses.push( "ui-button-text-icon" + ( multipleIcons ? "s" : ( icons.primary ? "-primary" : "-secondary" ) ) );
+
+			if ( icons.primary ) {
+				buttonElement.prepend( "<span class='ui-button-icon-primary ui-icon " + icons.primary + "'></span>" );
+			}
+
+			if ( icons.secondary ) {
+				buttonElement.append( "<span class='ui-button-icon-secondary ui-icon " + icons.secondary + "'></span>" );
+			}
+
+			if ( !this.options.text ) {
+				buttonClasses.push( multipleIcons ? "ui-button-icons-only" : "ui-button-icon-only" );
+				buttonElement.removeClass( "ui-button-text-icons ui-button-text-icon-primary ui-button-text-icon-secondary" );
+
+				if ( !this.hasTitle ) {
+					buttonElement.attr( "title", buttonText );
+				}
+			}
+		} else {
+			buttonClasses.push( "ui-button-text-only" );
+		}
+		buttonElement.addClass( buttonClasses.join( " " ) );
+	}
+});
+
+$.widget( "ui.buttonset", {
+	options: {
+		items: ":button, :submit, :reset, :checkbox, :radio, a, :data(button)"
+	},
+
+	_create: function() {
+		this.element.addClass( "ui-buttonset" );
+	},
+	
+	_init: function() {
+		this.refresh();
+	},
+
+	_setOption: function( key, value ) {
+		if ( key === "disabled" ) {
+			this.buttons.button( "option", key, value );
+		}
+
+		$.Widget.prototype._setOption.apply( this, arguments );
+	},
+	
+	refresh: function() {
+		this.buttons = this.element.find( this.options.items )
+			.filter( ":ui-button" )
+				.button( "refresh" )
+			.end()
+			.not( ":ui-button" )
+				.button()
+			.end()
+			.map(function() {
+				return $( this ).button( "widget" )[ 0 ];
+			})
+				.removeClass( "ui-corner-all ui-corner-left ui-corner-right" )
+				.filter( ":first" )
+					.addClass( "ui-corner-left" )
+				.end()
+				.filter( ":last" )
+					.addClass( "ui-corner-right" )
+				.end()
+			.end();
+	},
+
+	destroy: function() {
+		this.element.removeClass( "ui-buttonset" );
+		this.buttons
+			.map(function() {
+				return $( this ).button( "widget" )[ 0 ];
+			})
+				.removeClass( "ui-corner-left ui-corner-right" )
+			.end()
+			.button( "destroy" );
+
+		$.Widget.prototype.destroy.call( this );
+	}
+});
+
+}( jQuery ) );
+/*
+ * jQuery UI Dialog 1.8.10
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Dialog
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ *	jquery.ui.widget.js
+ *  jquery.ui.button.js
+ *	jquery.ui.draggable.js
+ *	jquery.ui.mouse.js
+ *	jquery.ui.position.js
+ *	jquery.ui.resizable.js
+ */
+(function( $, undefined ) {
+
+var uiDialogClasses =
+		'ui-dialog ' +
+		'ui-widget ' +
+		'ui-widget-content ' +
+		'ui-corner-all ',
+	sizeRelatedOptions = {
+		buttons: true,
+		height: true,
+		maxHeight: true,
+		maxWidth: true,
+		minHeight: true,
+		minWidth: true,
+		width: true
+	},
+	resizableRelatedOptions = {
+		maxHeight: true,
+		maxWidth: true,
+		minHeight: true,
+		minWidth: true
+	};
+
+$.widget("ui.dialog", {
+	options: {
+		autoOpen: true,
+		buttons: {},
+		closeOnEscape: true,
+		closeText: 'close',
+		dialogClass: '',
+		draggable: true,
+		hide: null,
+		height: 'auto',
+		maxHeight: false,
+		maxWidth: false,
+		minHeight: 150,
+		minWidth: 150,
+		modal: false,
+		position: {
+			my: 'center',
+			at: 'center',
+			collision: 'fit',
+			// ensure that the titlebar is never outside the document
+			using: function(pos) {
+				var topOffset = $(this).css(pos).offset().top;
+				if (topOffset < 0) {
+					$(this).css('top', pos.top - topOffset);
+				}
+			}
+		},
+		resizable: true,
+		show: null,
+		stack: true,
+		title: '',
+		width: 300,
+		zIndex: 1000
+	},
+
+	_create: function() {
+		this.originalTitle = this.element.attr('title');
+		// #5742 - .attr() might return a DOMElement
+		if ( typeof this.originalTitle !== "string" ) {
+			this.originalTitle = "";
+		}
+
+		this.options.title = this.options.title || this.originalTitle;
+		var self = this,
+			options = self.options,
+
+			title = options.title || '&#160;',
+			titleId = $.ui.dialog.getTitleId(self.element),
+
+			uiDialog = (self.uiDialog = $('<div></div>'))
+				.appendTo(document.body)
+				.hide()
+				.addClass(uiDialogClasses + options.dialogClass)
+				.css({
+					zIndex: options.zIndex
+				})
+				// setting tabIndex makes the div focusable
+				// setting outline to 0 prevents a border on focus in Mozilla
+				.attr('tabIndex', -1).css('outline', 0).keydown(function(event) {
+					if (options.closeOnEscape && event.keyCode &&
+						event.keyCode === $.ui.keyCode.ESCAPE) {
+						
+						self.close(event);
+						event.preventDefault();
+					}
+				})
+				.attr({
+					role: 'dialog',
+					'aria-labelledby': titleId
+				})
+				.mousedown(function(event) {
+					self.moveToTop(false, event);
+				}),
+
+			uiDialogContent = self.element
+				.show()
+				.removeAttr('title')
+				.addClass(
+					'ui-dialog-content ' +
+					'ui-widget-content')
+				.appendTo(uiDialog),
+
+			uiDialogTitlebar = (self.uiDialogTitlebar = $('<div></div>'))
+				.addClass(
+					'ui-dialog-titlebar ' +
+					'ui-widget-header ' +
+					'ui-corner-all ' +
+					'ui-helper-clearfix'
+				)
+				.prependTo(uiDialog),
+
+			uiDialogTitlebarClose = $('<a href="#"></a>')
+				.addClass(
+					'ui-dialog-titlebar-close ' +
+					'ui-corner-all'
+				)
+				.attr('role', 'button')
+				.hover(
+					function() {
+						uiDialogTitlebarClose.addClass('ui-state-hover');
+					},
+					function() {
+						uiDialogTitlebarClose.removeClass('ui-state-hover');
+					}
+				)
+				.focus(function() {
+					uiDialogTitlebarClose.addClass('ui-state-focus');
+				})
+				.blur(function() {
+					uiDialogTitlebarClose.removeClass('ui-state-focus');
+				})
+				.click(function(event) {
+					self.close(event);
+					return false;
+				})
+				.appendTo(uiDialogTitlebar),
+
+			uiDialogTitlebarCloseText = (self.uiDialogTitlebarCloseText = $('<span></span>'))
+				.addClass(
+					'ui-icon ' +
+					'ui-icon-closethick'
+				)
+				.text(options.closeText)
+				.appendTo(uiDialogTitlebarClose),
+
+			uiDialogTitle = $('<span></span>')
+				.addClass('ui-dialog-title')
+				.attr('id', titleId)
+				.html(title)
+				.prependTo(uiDialogTitlebar);
+
+		//handling of deprecated beforeclose (vs beforeClose) option
+		//Ticket #4669 http://dev.jqueryui.com/ticket/4669
+		//TODO: remove in 1.9pre
+		if ($.isFunction(options.beforeclose) && !$.isFunction(options.beforeClose)) {
+			options.beforeClose = options.beforeclose;
+		}
+
+		uiDialogTitlebar.find("*").add(uiDialogTitlebar).disableSelection();
+
+		if (options.draggable && $.fn.draggable) {
+			self._makeDraggable();
+		}
+		if (options.resizable && $.fn.resizable) {
+			self._makeResizable();
+		}
+
+		self._createButtons(options.buttons);
+		self._isOpen = false;
+
+		if ($.fn.bgiframe) {
+			uiDialog.bgiframe();
+		}
+	},
+
+	_init: function() {
+		if ( this.options.autoOpen ) {
+			this.open();
+		}
+	},
+
+	destroy: function() {
+		var self = this;
+		
+		if (self.overlay) {
+			self.overlay.destroy();
+		}
+		self.uiDialog.hide();
+		self.element
+			.unbind('.dialog')
+			.removeData('dialog')
+			.removeClass('ui-dialog-content ui-widget-content')
+			.hide().appendTo('body');
+		self.uiDialog.remove();
+
+		if (self.originalTitle) {
+			self.element.attr('title', self.originalTitle);
+		}
+
+		return self;
+	},
+
+	widget: function() {
+		return this.uiDialog;
+	},
+
+	close: function(event) {
+		var self = this,
+			maxZ, thisZ;
+		
+		if (false === self._trigger('beforeClose', event)) {
+			return;
+		}
+
+		if (self.overlay) {
+			self.overlay.destroy();
+		}
+		self.uiDialog.unbind('keypress.ui-dialog');
+
+		self._isOpen = false;
+
+		if (self.options.hide) {
+			self.uiDialog.hide(self.options.hide, function() {
+				self._trigger('close', event);
+			});
+		} else {
+			self.uiDialog.hide();
+			self._trigger('close', event);
+		}
+
+		$.ui.dialog.overlay.resize();
+
+		// adjust the maxZ to allow other modal dialogs to continue to work (see #4309)
+		if (self.options.modal) {
+			maxZ = 0;
+			$('.ui-dialog').each(function() {
+				if (this !== self.uiDialog[0]) {
+					thisZ = $(this).css('z-index');
+					if(!isNaN(thisZ)) {
+						maxZ = Math.max(maxZ, thisZ);
+					}
+				}
+			});
+			$.ui.dialog.maxZ = maxZ;
+		}
+
+		return self;
+	},
+
+	isOpen: function() {
+		return this._isOpen;
+	},
+
+	// the force parameter allows us to move modal dialogs to their correct
+	// position on open
+	moveToTop: function(force, event) {
+		var self = this,
+			options = self.options,
+			saveScroll;
+
+		if ((options.modal && !force) ||
+			(!options.stack && !options.modal)) {
+			return self._trigger('focus', event);
+		}
+
+		if (options.zIndex > $.ui.dialog.maxZ) {
+			$.ui.dialog.maxZ = options.zIndex;
+		}
+		if (self.overlay) {
+			$.ui.dialog.maxZ += 1;
+			self.overlay.$el.css('z-index', $.ui.dialog.overlay.maxZ = $.ui.dialog.maxZ);
+		}
+
+		//Save and then restore scroll since Opera 9.5+ resets when parent z-Index is changed.
+		//  http://ui.jquery.com/bugs/ticket/3193
+		saveScroll = { scrollTop: self.element.attr('scrollTop'), scrollLeft: self.element.attr('scrollLeft') };
+		$.ui.dialog.maxZ += 1;
+		self.uiDialog.css('z-index', $.ui.dialog.maxZ);
+		self.element.attr(saveScroll);
+		self._trigger('focus', event);
+
+		return self;
+	},
+
+	open: function() {
+		if (this._isOpen) { return; }
+
+		var self = this,
+			options = self.options,
+			uiDialog = self.uiDialog;
+
+		self.overlay = options.modal ? new $.ui.dialog.overlay(self) : null;
+		self._size();
+		self._position(options.position);
+		uiDialog.show(options.show);
+		self.moveToTop(true);
+
+		// prevent tabbing out of modal dialogs
+		if (options.modal) {
+			uiDialog.bind('keypress.ui-dialog', function(event) {
+				if (event.keyCode !== $.ui.keyCode.TAB) {
+					return;
+				}
+
+				var tabbables = $(':tabbable', this),
+					first = tabbables.filter(':first'),
+					last  = tabbables.filter(':last');
+
+				if (event.target === last[0] && !event.shiftKey) {
+					first.focus(1);
+					return false;
+				} else if (event.target === first[0] && event.shiftKey) {
+					last.focus(1);
+					return false;
+				}
+			});
+		}
+
+		// set focus to the first tabbable element in the content area or the first button
+		// if there are no tabbable elements, set focus on the dialog itself
+		$(self.element.find(':tabbable').get().concat(
+			uiDialog.find('.ui-dialog-buttonpane :tabbable').get().concat(
+				uiDialog.get()))).eq(0).focus();
+
+		self._isOpen = true;
+		self._trigger('open');
+
+		return self;
+	},
+
+	_createButtons: function(buttons) {
+		var self = this,
+			hasButtons = false,
+			uiDialogButtonPane = $('<div></div>')
+				.addClass(
+					'ui-dialog-buttonpane ' +
+					'ui-widget-content ' +
+					'ui-helper-clearfix'
+				),
+			uiButtonSet = $( "<div></div>" )
+				.addClass( "ui-dialog-buttonset" )
+				.appendTo( uiDialogButtonPane );
+
+		// if we already have a button pane, remove it
+		self.uiDialog.find('.ui-dialog-buttonpane').remove();
+
+		if (typeof buttons === 'object' && buttons !== null) {
+			$.each(buttons, function() {
+				return !(hasButtons = true);
+			});
+		}
+		if (hasButtons) {
+			$.each(buttons, function(name, props) {
+				props = $.isFunction( props ) ?
+					{ click: props, text: name } :
+					props;
+				var button = $('<button type="button"></button>')
+					.attr( props, true )
+					.unbind('click')
+					.click(function() {
+						props.click.apply(self.element[0], arguments);
+					})
+					.appendTo(uiButtonSet);
+				if ($.fn.button) {
+					button.button();
+				}
+			});
+			uiDialogButtonPane.appendTo(self.uiDialog);
+		}
+	},
+
+	_makeDraggable: function() {
+		var self = this,
+			options = self.options,
+			doc = $(document),
+			heightBeforeDrag;
+
+		function filteredUi(ui) {
+			return {
+				position: ui.position,
+				offset: ui.offset
+			};
+		}
+
+		self.uiDialog.draggable({
+			cancel: '.ui-dialog-content, .ui-dialog-titlebar-close',
+			handle: '.ui-dialog-titlebar',
+			containment: 'document',
+			start: function(event, ui) {
+				heightBeforeDrag = options.height === "auto" ? "auto" : $(this).height();
+				$(this).height($(this).height()).addClass("ui-dialog-dragging");
+				self._trigger('dragStart', event, filteredUi(ui));
+			},
+			drag: function(event, ui) {
+				self._trigger('drag', event, filteredUi(ui));
+			},
+			stop: function(event, ui) {
+				options.position = [ui.position.left - doc.scrollLeft(),
+					ui.position.top - doc.scrollTop()];
+				$(this).removeClass("ui-dialog-dragging").height(heightBeforeDrag);
+				self._trigger('dragStop', event, filteredUi(ui));
+				$.ui.dialog.overlay.resize();
+			}
+		});
+	},
+
+	_makeResizable: function(handles) {
+		handles = (handles === undefined ? this.options.resizable : handles);
+		var self = this,
+			options = self.options,
+			// .ui-resizable has position: relative defined in the stylesheet
+			// but dialogs have to use absolute or fixed positioning
+			position = self.uiDialog.css('position'),
+			resizeHandles = (typeof handles === 'string' ?
+				handles	:
+				'n,e,s,w,se,sw,ne,nw'
+			);
+
+		function filteredUi(ui) {
+			return {
+				originalPosition: ui.originalPosition,
+				originalSize: ui.originalSize,
+				position: ui.position,
+				size: ui.size
+			};
+		}
+
+		self.uiDialog.resizable({
+			cancel: '.ui-dialog-content',
+			containment: 'document',
+			alsoResize: self.element,
+			maxWidth: options.maxWidth,
+			maxHeight: options.maxHeight,
+			minWidth: options.minWidth,
+			minHeight: self._minHeight(),
+			handles: resizeHandles,
+			start: function(event, ui) {
+				$(this).addClass("ui-dialog-resizing");
+				self._trigger('resizeStart', event, filteredUi(ui));
+			},
+			resize: function(event, ui) {
+				self._trigger('resize', event, filteredUi(ui));
+			},
+			stop: function(event, ui) {
+				$(this).removeClass("ui-dialog-resizing");
+				options.height = $(this).height();
+				options.width = $(this).width();
+				self._trigger('resizeStop', event, filteredUi(ui));
+				$.ui.dialog.overlay.resize();
+			}
+		})
+		.css('position', position)
+		.find('.ui-resizable-se').addClass('ui-icon ui-icon-grip-diagonal-se');
+	},
+
+	_minHeight: function() {
+		var options = this.options;
+
+		if (options.height === 'auto') {
+			return options.minHeight;
+		} else {
+			return Math.min(options.minHeight, options.height);
+		}
+	},
+
+	_position: function(position) {
+		var myAt = [],
+			offset = [0, 0],
+			isVisible;
+
+		if (position) {
+			// deep extending converts arrays to objects in jQuery <= 1.3.2 :-(
+	//		if (typeof position == 'string' || $.isArray(position)) {
+	//			myAt = $.isArray(position) ? position : position.split(' ');
+
+			if (typeof position === 'string' || (typeof position === 'object' && '0' in position)) {
+				myAt = position.split ? position.split(' ') : [position[0], position[1]];
+				if (myAt.length === 1) {
+					myAt[1] = myAt[0];
+				}
+
+				$.each(['left', 'top'], function(i, offsetPosition) {
+					if (+myAt[i] === myAt[i]) {
+						offset[i] = myAt[i];
+						myAt[i] = offsetPosition;
+					}
+				});
+
+				position = {
+					my: myAt.join(" "),
+					at: myAt.join(" "),
+					offset: offset.join(" ")
+				};
+			} 
+
+			position = $.extend({}, $.ui.dialog.prototype.options.position, position);
+		} else {
+			position = $.ui.dialog.prototype.options.position;
+		}
+
+		// need to show the dialog to get the actual offset in the position plugin
+		isVisible = this.uiDialog.is(':visible');
+		if (!isVisible) {
+			this.uiDialog.show();
+		}
+		this.uiDialog
+			// workaround for jQuery bug #5781 http://dev.jquery.com/ticket/5781
+			.css({ top: 0, left: 0 })
+			.position($.extend({ of: window }, position));
+		if (!isVisible) {
+			this.uiDialog.hide();
+		}
+	},
+
+	_setOptions: function( options ) {
+		var self = this,
+			resizableOptions = {},
+			resize = false;
+
+		$.each( options, function( key, value ) {
+			self._setOption( key, value );
+			
+			if ( key in sizeRelatedOptions ) {
+				resize = true;
+			}
+			if ( key in resizableRelatedOptions ) {
+				resizableOptions[ key ] = value;
+			}
+		});
+
+		if ( resize ) {
+			this._size();
+		}
+		if ( this.uiDialog.is( ":data(resizable)" ) ) {
+			this.uiDialog.resizable( "option", resizableOptions );
+		}
+	},
+
+	_setOption: function(key, value){
+		var self = this,
+			uiDialog = self.uiDialog;
+
+		switch (key) {
+			//handling of deprecated beforeclose (vs beforeClose) option
+			//Ticket #4669 http://dev.jqueryui.com/ticket/4669
+			//TODO: remove in 1.9pre
+			case "beforeclose":
+				key = "beforeClose";
+				break;
+			case "buttons":
+				self._createButtons(value);
+				break;
+			case "closeText":
+				// ensure that we always pass a string
+				self.uiDialogTitlebarCloseText.text("" + value);
+				break;
+			case "dialogClass":
+				uiDialog
+					.removeClass(self.options.dialogClass)
+					.addClass(uiDialogClasses + value);
+				break;
+			case "disabled":
+				if (value) {
+					uiDialog.addClass('ui-dialog-disabled');
+				} else {
+					uiDialog.removeClass('ui-dialog-disabled');
+				}
+				break;
+			case "draggable":
+				var isDraggable = uiDialog.is( ":data(draggable)" );
+				if ( isDraggable && !value ) {
+					uiDialog.draggable( "destroy" );
+				}
+				
+				if ( !isDraggable && value ) {
+					self._makeDraggable();
+				}
+				break;
+			case "position":
+				self._position(value);
+				break;
+			case "resizable":
+				// currently resizable, becoming non-resizable
+				var isResizable = uiDialog.is( ":data(resizable)" );
+				if (isResizable && !value) {
+					uiDialog.resizable('destroy');
+				}
+
+				// currently resizable, changing handles
+				if (isResizable && typeof value === 'string') {
+					uiDialog.resizable('option', 'handles', value);
+				}
+
+				// currently non-resizable, becoming resizable
+				if (!isResizable && value !== false) {
+					self._makeResizable(value);
+				}
+				break;
+			case "title":
+				// convert whatever was passed in o a string, for html() to not throw up
+				$(".ui-dialog-title", self.uiDialogTitlebar).html("" + (value || '&#160;'));
+				break;
+		}
+
+		$.Widget.prototype._setOption.apply(self, arguments);
+	},
+
+	_size: function() {
+		/* If the user has resized the dialog, the .ui-dialog and .ui-dialog-content
+		 * divs will both have width and height set, so we need to reset them
+		 */
+		var options = this.options,
+			nonContentHeight,
+			minContentHeight,
+			isVisible = this.uiDialog.is( ":visible" );
+
+		// reset content sizing
+		this.element.show().css({
+			width: 'auto',
+			minHeight: 0,
+			height: 0
+		});
+
+		if (options.minWidth > options.width) {
+			options.width = options.minWidth;
+		}
+
+		// reset wrapper sizing
+		// determine the height of all the non-content elements
+		nonContentHeight = this.uiDialog.css({
+				height: 'auto',
+				width: options.width
+			})
+			.height();
+		minContentHeight = Math.max( 0, options.minHeight - nonContentHeight );
+		
+		if ( options.height === "auto" ) {
+			// only needed for IE6 support
+			if ( $.support.minHeight ) {
+				this.element.css({
+					minHeight: minContentHeight,
+					height: "auto"
+				});
+			} else {
+				this.uiDialog.show();
+				var autoHeight = this.element.css( "height", "auto" ).height();
+				if ( !isVisible ) {
+					this.uiDialog.hide();
+				}
+				this.element.height( Math.max( autoHeight, minContentHeight ) );
+			}
+		} else {
+			this.element.height( Math.max( options.height - nonContentHeight, 0 ) );
+		}
+
+		if (this.uiDialog.is(':data(resizable)')) {
+			this.uiDialog.resizable('option', 'minHeight', this._minHeight());
+		}
+	}
+});
+
+$.extend($.ui.dialog, {
+	version: "1.8.10",
+
+	uuid: 0,
+	maxZ: 0,
+
+	getTitleId: function($el) {
+		var id = $el.attr('id');
+		if (!id) {
+			this.uuid += 1;
+			id = this.uuid;
+		}
+		return 'ui-dialog-title-' + id;
+	},
+
+	overlay: function(dialog) {
+		this.$el = $.ui.dialog.overlay.create(dialog);
+	}
+});
+
+$.extend($.ui.dialog.overlay, {
+	instances: [],
+	// reuse old instances due to IE memory leak with alpha transparency (see #5185)
+	oldInstances: [],
+	maxZ: 0,
+	events: $.map('focus,mousedown,mouseup,keydown,keypress,click'.split(','),
+		function(event) { return event + '.dialog-overlay'; }).join(' '),
+	create: function(dialog) {
+		if (this.instances.length === 0) {
+			// prevent use of anchors and inputs
+			// we use a setTimeout in case the overlay is created from an
+			// event that we're going to be cancelling (see #2804)
+			setTimeout(function() {
+				// handle $(el).dialog().dialog('close') (see #4065)
+				if ($.ui.dialog.overlay.instances.length) {
+					$(document).bind($.ui.dialog.overlay.events, function(event) {
+						// stop events if the z-index of the target is < the z-index of the overlay
+						// we cannot return true when we don't want to cancel the event (#3523)
+						if ($(event.target).zIndex() < $.ui.dialog.overlay.maxZ) {
+							return false;
+						}
+					});
+				}
+			}, 1);
+
+			// allow closing by pressing the escape key
+			$(document).bind('keydown.dialog-overlay', function(event) {
+				if (dialog.options.closeOnEscape && event.keyCode &&
+					event.keyCode === $.ui.keyCode.ESCAPE) {
+					
+					dialog.close(event);
+					event.preventDefault();
+				}
+			});
+
+			// handle window resize
+			$(window).bind('resize.dialog-overlay', $.ui.dialog.overlay.resize);
+		}
+
+		var $el = (this.oldInstances.pop() || $('<div></div>').addClass('ui-widget-overlay'))
+			.appendTo(document.body)
+			.css({
+				width: this.width(),
+				height: this.height()
+			});
+
+		if ($.fn.bgiframe) {
+			$el.bgiframe();
+		}
+
+		this.instances.push($el);
+		return $el;
+	},
+
+	destroy: function($el) {
+		var indexOf = $.inArray($el, this.instances);
+		if (indexOf != -1){
+			this.oldInstances.push(this.instances.splice(indexOf, 1)[0]);
+		}
+
+		if (this.instances.length === 0) {
+			$([document, window]).unbind('.dialog-overlay');
+		}
+
+		$el.remove();
+		
+		// adjust the maxZ to allow other modal dialogs to continue to work (see #4309)
+		var maxZ = 0;
+		$.each(this.instances, function() {
+			maxZ = Math.max(maxZ, this.css('z-index'));
+		});
+		this.maxZ = maxZ;
+	},
+
+	height: function() {
+		var scrollHeight,
+			offsetHeight;
+		// handle IE 6
+		if ($.browser.msie && $.browser.version < 7) {
+			scrollHeight = Math.max(
+				document.documentElement.scrollHeight,
+				document.body.scrollHeight
+			);
+			offsetHeight = Math.max(
+				document.documentElement.offsetHeight,
+				document.body.offsetHeight
+			);
+
+			if (scrollHeight < offsetHeight) {
+				return $(window).height() + 'px';
+			} else {
+				return scrollHeight + 'px';
+			}
+		// handle "good" browsers
+		} else {
+			return $(document).height() + 'px';
+		}
+	},
+
+	width: function() {
+		var scrollWidth,
+			offsetWidth;
+		// handle IE 6
+		if ($.browser.msie && $.browser.version < 7) {
+			scrollWidth = Math.max(
+				document.documentElement.scrollWidth,
+				document.body.scrollWidth
+			);
+			offsetWidth = Math.max(
+				document.documentElement.offsetWidth,
+				document.body.offsetWidth
+			);
+
+			if (scrollWidth < offsetWidth) {
+				return $(window).width() + 'px';
+			} else {
+				return scrollWidth + 'px';
+			}
+		// handle "good" browsers
+		} else {
+			return $(document).width() + 'px';
+		}
+	},
+
+	resize: function() {
+		/* If the dialog is draggable and the user drags it past the
+		 * right edge of the window, the document becomes wider so we
+		 * need to stretch the overlay. If the user then drags the
+		 * dialog back to the left, the document will become narrower,
+		 * so we need to shrink the overlay to the appropriate size.
+		 * This is handled by shrinking the overlay before setting it
+		 * to the full document size.
+		 */
+		var $overlays = $([]);
+		$.each($.ui.dialog.overlay.instances, function() {
+			$overlays = $overlays.add(this);
+		});
+
+		$overlays.css({
+			width: 0,
+			height: 0
+		}).css({
+			width: $.ui.dialog.overlay.width(),
+			height: $.ui.dialog.overlay.height()
+		});
+	}
+});
+
+$.extend($.ui.dialog.overlay.prototype, {
+	destroy: function() {
+		$.ui.dialog.overlay.destroy(this.$el);
+	}
+});
+
+}(jQuery));
+/*
+ * jQuery UI Slider 1.8.10
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Slider
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ *	jquery.ui.mouse.js
+ *	jquery.ui.widget.js
+ */
+(function( $, undefined ) {
+
+// number of pages in a slider
+// (how many times can you page up/down to go through the whole range)
+var numPages = 5;
+
+$.widget( "ui.slider", $.ui.mouse, {
+
+	widgetEventPrefix: "slide",
+
+	options: {
+		animate: false,
+		distance: 0,
+		max: 100,
+		min: 0,
+		orientation: "horizontal",
+		range: false,
+		step: 1,
+		value: 0,
+		values: null
+	},
+
+	_create: function() {
+		var self = this,
+			o = this.options;
+
+		this._keySliding = false;
+		this._mouseSliding = false;
+		this._animateOff = true;
+		this._handleIndex = null;
+		this._detectOrientation();
+		this._mouseInit();
+
+		this.element
+			.addClass( "ui-slider" +
+				" ui-slider-" + this.orientation +
+				" ui-widget" +
+				" ui-widget-content" +
+				" ui-corner-all" );
+		
+		if ( o.disabled ) {
+			this.element.addClass( "ui-slider-disabled ui-disabled" );
+		}
+
+		this.range = $([]);
+
+		if ( o.range ) {
+			if ( o.range === true ) {
+				this.range = $( "<div></div>" );
+				if ( !o.values ) {
+					o.values = [ this._valueMin(), this._valueMin() ];
+				}
+				if ( o.values.length && o.values.length !== 2 ) {
+					o.values = [ o.values[0], o.values[0] ];
+				}
+			} else {
+				this.range = $( "<div></div>" );
+			}
+
+			this.range
+				.appendTo( this.element )
+				.addClass( "ui-slider-range" );
+
+			if ( o.range === "min" || o.range === "max" ) {
+				this.range.addClass( "ui-slider-range-" + o.range );
+			}
+
+			// note: this isn't the most fittingly semantic framework class for this element,
+			// but worked best visually with a variety of themes
+			this.range.addClass( "ui-widget-header" );
+		}
+
+		if ( $( ".ui-slider-handle", this.element ).length === 0 ) {
+			$( "<a href='#'></a>" )
+				.appendTo( this.element )
+				.addClass( "ui-slider-handle" );
+		}
+
+		if ( o.values && o.values.length ) {
+			while ( $(".ui-slider-handle", this.element).length < o.values.length ) {
+				$( "<a href='#'></a>" )
+					.appendTo( this.element )
+					.addClass( "ui-slider-handle" );
+			}
+		}
+
+		this.handles = $( ".ui-slider-handle", this.element )
+			.addClass( "ui-state-default" +
+				" ui-corner-all" );
+
+		this.handle = this.handles.eq( 0 );
+
+		this.handles.add( this.range ).filter( "a" )
+			.click(function( event ) {
+				event.preventDefault();
+			})
+			.hover(function() {
+				if ( !o.disabled ) {
+					$( this ).addClass( "ui-state-hover" );
+				}
+			}, function() {
+				$( this ).removeClass( "ui-state-hover" );
+			})
+			.focus(function() {
+				if ( !o.disabled ) {
+					$( ".ui-slider .ui-state-focus" ).removeClass( "ui-state-focus" );
+					$( this ).addClass( "ui-state-focus" );
+				} else {
+					$( this ).blur();
+				}
+			})
+			.blur(function() {
+				$( this ).removeClass( "ui-state-focus" );
+			});
+
+		this.handles.each(function( i ) {
+			$( this ).data( "index.ui-slider-handle", i );
+		});
+
+		this.handles
+			.keydown(function( event ) {
+				var ret = true,
+					index = $( this ).data( "index.ui-slider-handle" ),
+					allowed,
+					curVal,
+					newVal,
+					step;
+	
+				if ( self.options.disabled ) {
+					return;
+				}
+	
+				switch ( event.keyCode ) {
+					case $.ui.keyCode.HOME:
+					case $.ui.keyCode.END:
+					case $.ui.keyCode.PAGE_UP:
+					case $.ui.keyCode.PAGE_DOWN:
+					case $.ui.keyCode.UP:
+					case $.ui.keyCode.RIGHT:
+					case $.ui.keyCode.DOWN:
+					case $.ui.keyCode.LEFT:
+						ret = false;
+						if ( !self._keySliding ) {
+							self._keySliding = true;
+							$( this ).addClass( "ui-state-active" );
+							allowed = self._start( event, index );
+							if ( allowed === false ) {
+								return;
+							}
+						}
+						break;
+				}
+	
+				step = self.options.step;
+				if ( self.options.values && self.options.values.length ) {
+					curVal = newVal = self.values( index );
+				} else {
+					curVal = newVal = self.value();
+				}
+	
+				switch ( event.keyCode ) {
+					case $.ui.keyCode.HOME:
+						newVal = self._valueMin();
+						break;
+					case $.ui.keyCode.END:
+						newVal = self._valueMax();
+						break;
+					case $.ui.keyCode.PAGE_UP:
+						newVal = self._trimAlignValue( curVal + ( (self._valueMax() - self._valueMin()) / numPages ) );
+						break;
+					case $.ui.keyCode.PAGE_DOWN:
+						newVal = self._trimAlignValue( curVal - ( (self._valueMax() - self._valueMin()) / numPages ) );
+						break;
+					case $.ui.keyCode.UP:
+					case $.ui.keyCode.RIGHT:
+						if ( curVal === self._valueMax() ) {
+							return;
+						}
+						newVal = self._trimAlignValue( curVal + step );
+						break;
+					case $.ui.keyCode.DOWN:
+					case $.ui.keyCode.LEFT:
+						if ( curVal === self._valueMin() ) {
+							return;
+						}
+						newVal = self._trimAlignValue( curVal - step );
+						break;
+				}
+	
+				self._slide( event, index, newVal );
+	
+				return ret;
+	
+			})
+			.keyup(function( event ) {
+				var index = $( this ).data( "index.ui-slider-handle" );
+	
+				if ( self._keySliding ) {
+					self._keySliding = false;
+					self._stop( event, index );
+					self._change( event, index );
+					$( this ).removeClass( "ui-state-active" );
+				}
+	
+			});
+
+		this._refreshValue();
+
+		this._animateOff = false;
+	},
+
+	destroy: function() {
+		this.handles.remove();
+		this.range.remove();
+
+		this.element
+			.removeClass( "ui-slider" +
+				" ui-slider-horizontal" +
+				" ui-slider-vertical" +
+				" ui-slider-disabled" +
+				" ui-widget" +
+				" ui-widget-content" +
+				" ui-corner-all" )
+			.removeData( "slider" )
+			.unbind( ".slider" );
+
+		this._mouseDestroy();
+
+		return this;
+	},
+
+	_mouseCapture: function( event ) {
+		var o = this.options,
+			position,
+			normValue,
+			distance,
+			closestHandle,
+			self,
+			index,
+			allowed,
+			offset,
+			mouseOverHandle;
+
+		if ( o.disabled ) {
+			return false;
+		}
+
+		this.elementSize = {
+			width: this.element.outerWidth(),
+			height: this.element.outerHeight()
+		};
+		this.elementOffset = this.element.offset();
+
+		position = { x: event.pageX, y: event.pageY };
+		normValue = this._normValueFromMouse( position );
+		distance = this._valueMax() - this._valueMin() + 1;
+		self = this;
+		this.handles.each(function( i ) {
+			var thisDistance = Math.abs( normValue - self.values(i) );
+			if ( distance > thisDistance ) {
+				distance = thisDistance;
+				closestHandle = $( this );
+				index = i;
+			}
+		});
+
+		// workaround for bug #3736 (if both handles of a range are at 0,
+		// the first is always used as the one with least distance,
+		// and moving it is obviously prevented by preventing negative ranges)
+		if( o.range === true && this.values(1) === o.min ) {
+			index += 1;
+			closestHandle = $( this.handles[index] );
+		}
+
+		allowed = this._start( event, index );
+		if ( allowed === false ) {
+			return false;
+		}
+		this._mouseSliding = true;
+
+		self._handleIndex = index;
+
+		closestHandle
+			.addClass( "ui-state-active" )
+			.focus();
+		
+		offset = closestHandle.offset();
+		mouseOverHandle = !$( event.target ).parents().andSelf().is( ".ui-slider-handle" );
+		this._clickOffset = mouseOverHandle ? { left: 0, top: 0 } : {
+			left: event.pageX - offset.left - ( closestHandle.width() / 2 ),
+			top: event.pageY - offset.top -
+				( closestHandle.height() / 2 ) -
+				( parseInt( closestHandle.css("borderTopWidth"), 10 ) || 0 ) -
+				( parseInt( closestHandle.css("borderBottomWidth"), 10 ) || 0) +
+				( parseInt( closestHandle.css("marginTop"), 10 ) || 0)
+		};
+
+		if ( !this.handles.hasClass( "ui-state-hover" ) ) {
+			this._slide( event, index, normValue );
+		}
+		this._animateOff = true;
+		return true;
+	},
+
+	_mouseStart: function( event ) {
+		return true;
+	},
+
+	_mouseDrag: function( event ) {
+		var position = { x: event.pageX, y: event.pageY },
+			normValue = this._normValueFromMouse( position );
+		
+		this._slide( event, this._handleIndex, normValue );
+
+		return false;
+	},
+
+	_mouseStop: function( event ) {
+		this.handles.removeClass( "ui-state-active" );
+		this._mouseSliding = false;
+
+		this._stop( event, this._handleIndex );
+		this._change( event, this._handleIndex );
+
+		this._handleIndex = null;
+		this._clickOffset = null;
+		this._animateOff = false;
+
+		return false;
+	},
+	
+	_detectOrientation: function() {
+		this.orientation = ( this.options.orientation === "vertical" ) ? "vertical" : "horizontal";
+	},
+
+	_normValueFromMouse: function( position ) {
+		var pixelTotal,
+			pixelMouse,
+			percentMouse,
+			valueTotal,
+			valueMouse;
+
+		if ( this.orientation === "horizontal" ) {
+			pixelTotal = this.elementSize.width;
+			pixelMouse = position.x - this.elementOffset.left - ( this._clickOffset ? this._clickOffset.left : 0 );
+		} else {
+			pixelTotal = this.elementSize.height;
+			pixelMouse = position.y - this.elementOffset.top - ( this._clickOffset ? this._clickOffset.top : 0 );
+		}
+
+		percentMouse = ( pixelMouse / pixelTotal );
+		if ( percentMouse > 1 ) {
+			percentMouse = 1;
+		}
+		if ( percentMouse < 0 ) {
+			percentMouse = 0;
+		}
+		if ( this.orientation === "vertical" ) {
+			percentMouse = 1 - percentMouse;
+		}
+
+		valueTotal = this._valueMax() - this._valueMin();
+		valueMouse = this._valueMin() + percentMouse * valueTotal;
+
+		return this._trimAlignValue( valueMouse );
+	},
+
+	_start: function( event, index ) {
+		var uiHash = {
+			handle: this.handles[ index ],
+			value: this.value()
+		};
+		if ( this.options.values && this.options.values.length ) {
+			uiHash.value = this.values( index );
+			uiHash.values = this.values();
+		}
+		return this._trigger( "start", event, uiHash );
+	},
+
+	_slide: function( event, index, newVal ) {
+		var otherVal,
+			newValues,
+			allowed;
+
+		if ( this.options.values && this.options.values.length ) {
+			otherVal = this.values( index ? 0 : 1 );
+
+			if ( ( this.options.values.length === 2 && this.options.range === true ) && 
+					( ( index === 0 && newVal > otherVal) || ( index === 1 && newVal < otherVal ) )
+				) {
+				newVal = otherVal;
+			}
+
+			if ( newVal !== this.values( index ) ) {
+				newValues = this.values();
+				newValues[ index ] = newVal;
+				// A slide can be canceled by returning false from the slide callback
+				allowed = this._trigger( "slide", event, {
+					handle: this.handles[ index ],
+					value: newVal,
+					values: newValues
+				} );
+				otherVal = this.values( index ? 0 : 1 );
+				if ( allowed !== false ) {
+					this.values( index, newVal, true );
+				}
+			}
+		} else {
+			if ( newVal !== this.value() ) {
+				// A slide can be canceled by returning false from the slide callback
+				allowed = this._trigger( "slide", event, {
+					handle: this.handles[ index ],
+					value: newVal
+				} );
+				if ( allowed !== false ) {
+					this.value( newVal );
+				}
+			}
+		}
+	},
+
+	_stop: function( event, index ) {
+		var uiHash = {
+			handle: this.handles[ index ],
+			value: this.value()
+		};
+		if ( this.options.values && this.options.values.length ) {
+			uiHash.value = this.values( index );
+			uiHash.values = this.values();
+		}
+
+		this._trigger( "stop", event, uiHash );
+	},
+
+	_change: function( event, index ) {
+		if ( !this._keySliding && !this._mouseSliding ) {
+			var uiHash = {
+				handle: this.handles[ index ],
+				value: this.value()
+			};
+			if ( this.options.values && this.options.values.length ) {
+				uiHash.value = this.values( index );
+				uiHash.values = this.values();
+			}
+
+			this._trigger( "change", event, uiHash );
+		}
+	},
+
+	value: function( newValue ) {
+		if ( arguments.length ) {
+			this.options.value = this._trimAlignValue( newValue );
+			this._refreshValue();
+			this._change( null, 0 );
+		}
+
+		return this._value();
+	},
+
+	values: function( index, newValue ) {
+		var vals,
+			newValues,
+			i;
+
+		if ( arguments.length > 1 ) {
+			this.options.values[ index ] = this._trimAlignValue( newValue );
+			this._refreshValue();
+			this._change( null, index );
+		}
+
+		if ( arguments.length ) {
+			if ( $.isArray( arguments[ 0 ] ) ) {
+				vals = this.options.values;
+				newValues = arguments[ 0 ];
+				for ( i = 0; i < vals.length; i += 1 ) {
+					vals[ i ] = this._trimAlignValue( newValues[ i ] );
+					this._change( null, i );
+				}
+				this._refreshValue();
+			} else {
+				if ( this.options.values && this.options.values.length ) {
+					return this._values( index );
+				} else {
+					return this.value();
+				}
+			}
+		} else {
+			return this._values();
+		}
+	},
+
+	_setOption: function( key, value ) {
+		var i,
+			valsLength = 0;
+
+		if ( $.isArray( this.options.values ) ) {
+			valsLength = this.options.values.length;
+		}
+
+		$.Widget.prototype._setOption.apply( this, arguments );
+
+		switch ( key ) {
+			case "disabled":
+				if ( value ) {
+					this.handles.filter( ".ui-state-focus" ).blur();
+					this.handles.removeClass( "ui-state-hover" );
+					this.handles.attr( "disabled", "disabled" );
+					this.element.addClass( "ui-disabled" );
+				} else {
+					this.handles.removeAttr( "disabled" );
+					this.element.removeClass( "ui-disabled" );
+				}
+				break;
+			case "orientation":
+				this._detectOrientation();
+				this.element
+					.removeClass( "ui-slider-horizontal ui-slider-vertical" )
+					.addClass( "ui-slider-" + this.orientation );
+				this._refreshValue();
+				break;
+			case "value":
+				this._animateOff = true;
+				this._refreshValue();
+				this._change( null, 0 );
+				this._animateOff = false;
+				break;
+			case "values":
+				this._animateOff = true;
+				this._refreshValue();
+				for ( i = 0; i < valsLength; i += 1 ) {
+					this._change( null, i );
+				}
+				this._animateOff = false;
+				break;
+		}
+	},
+
+	//internal value getter
+	// _value() returns value trimmed by min and max, aligned by step
+	_value: function() {
+		var val = this.options.value;
+		val = this._trimAlignValue( val );
+
+		return val;
+	},
+
+	//internal values getter
+	// _values() returns array of values trimmed by min and max, aligned by step
+	// _values( index ) returns single value trimmed by min and max, aligned by step
+	_values: function( index ) {
+		var val,
+			vals,
+			i;
+
+		if ( arguments.length ) {
+			val = this.options.values[ index ];
+			val = this._trimAlignValue( val );
+
+			return val;
+		} else {
+			// .slice() creates a copy of the array
+			// this copy gets trimmed by min and max and then returned
+			vals = this.options.values.slice();
+			for ( i = 0; i < vals.length; i+= 1) {
+				vals[ i ] = this._trimAlignValue( vals[ i ] );
+			}
+
+			return vals;
+		}
+	},
+	
+	// returns the step-aligned value that val is closest to, between (inclusive) min and max
+	_trimAlignValue: function( val ) {
+		if ( val <= this._valueMin() ) {
+			return this._valueMin();
+		}
+		if ( val >= this._valueMax() ) {
+			return this._valueMax();
+		}
+		var step = ( this.options.step > 0 ) ? this.options.step : 1,
+			valModStep = (val - this._valueMin()) % step;
+			alignValue = val - valModStep;
+
+		if ( Math.abs(valModStep) * 2 >= step ) {
+			alignValue += ( valModStep > 0 ) ? step : ( -step );
+		}
+
+		// Since JavaScript has problems with large floats, round
+		// the final value to 5 digits after the decimal point (see #4124)
+		return parseFloat( alignValue.toFixed(5) );
+	},
+
+	_valueMin: function() {
+		return this.options.min;
+	},
+
+	_valueMax: function() {
+		return this.options.max;
+	},
+	
+	_refreshValue: function() {
+		var oRange = this.options.range,
+			o = this.options,
+			self = this,
+			animate = ( !this._animateOff ) ? o.animate : false,
+			valPercent,
+			_set = {},
+			lastValPercent,
+			value,
+			valueMin,
+			valueMax;
+
+		if ( this.options.values && this.options.values.length ) {
+			this.handles.each(function( i, j ) {
+				valPercent = ( self.values(i) - self._valueMin() ) / ( self._valueMax() - self._valueMin() ) * 100;
+				_set[ self.orientation === "horizontal" ? "left" : "bottom" ] = valPercent + "%";
+				$( this ).stop( 1, 1 )[ animate ? "animate" : "css" ]( _set, o.animate );
+				if ( self.options.range === true ) {
+					if ( self.orientation === "horizontal" ) {
+						if ( i === 0 ) {
+							self.range.stop( 1, 1 )[ animate ? "animate" : "css" ]( { left: valPercent + "%" }, o.animate );
+						}
+						if ( i === 1 ) {
+							self.range[ animate ? "animate" : "css" ]( { width: ( valPercent - lastValPercent ) + "%" }, { queue: false, duration: o.animate } );
+						}
+					} else {
+						if ( i === 0 ) {
+							self.range.stop( 1, 1 )[ animate ? "animate" : "css" ]( { bottom: ( valPercent ) + "%" }, o.animate );
+						}
+						if ( i === 1 ) {
+							self.range[ animate ? "animate" : "css" ]( { height: ( valPercent - lastValPercent ) + "%" }, { queue: false, duration: o.animate } );
+						}
+					}
+				}
+				lastValPercent = valPercent;
+			});
+		} else {
+			value = this.value();
+			valueMin = this._valueMin();
+			valueMax = this._valueMax();
+			valPercent = ( valueMax !== valueMin ) ?
+					( value - valueMin ) / ( valueMax - valueMin ) * 100 :
+					0;
+			_set[ self.orientation === "horizontal" ? "left" : "bottom" ] = valPercent + "%";
+			this.handle.stop( 1, 1 )[ animate ? "animate" : "css" ]( _set, o.animate );
+
+			if ( oRange === "min" && this.orientation === "horizontal" ) {
+				this.range.stop( 1, 1 )[ animate ? "animate" : "css" ]( { width: valPercent + "%" }, o.animate );
+			}
+			if ( oRange === "max" && this.orientation === "horizontal" ) {
+				this.range[ animate ? "animate" : "css" ]( { width: ( 100 - valPercent ) + "%" }, { queue: false, duration: o.animate } );
+			}
+			if ( oRange === "min" && this.orientation === "vertical" ) {
+				this.range.stop( 1, 1 )[ animate ? "animate" : "css" ]( { height: valPercent + "%" }, o.animate );
+			}
+			if ( oRange === "max" && this.orientation === "vertical" ) {
+				this.range[ animate ? "animate" : "css" ]( { height: ( 100 - valPercent ) + "%" }, { queue: false, duration: o.animate } );
+			}
+		}
+	}
+
+});
+
+$.extend( $.ui.slider, {
+	version: "1.8.10"
+});
+
+}(jQuery));
+/*
+ * jQuery UI Tabs 1.8.10
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Tabs
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ *	jquery.ui.widget.js
+ */
+(function( $, undefined ) {
+
+var tabId = 0,
+	listId = 0;
+
+function getNextTabId() {
+	return ++tabId;
+}
+
+function getNextListId() {
+	return ++listId;
+}
+
+$.widget( "ui.tabs", {
+	options: {
+		add: null,
+		ajaxOptions: null,
+		cache: false,
+		cookie: null, // e.g. { expires: 7, path: '/', domain: 'jquery.com', secure: true }
+		collapsible: false,
+		disable: null,
+		disabled: [],
+		enable: null,
+		event: "click",
+		fx: null, // e.g. { height: 'toggle', opacity: 'toggle', duration: 200 }
+		idPrefix: "ui-tabs-",
+		load: null,
+		panelTemplate: "<div></div>",
+		remove: null,
+		select: null,
+		show: null,
+		spinner: "<em>Loading&#8230;</em>",
+		tabTemplate: "<li><a href='#{href}'><span>#{label}</span></a></li>"
+	},
+
+	_create: function() {
+		this._tabify( true );
+	},
+
+	_setOption: function( key, value ) {
+		if ( key == "selected" ) {
+			if (this.options.collapsible && value == this.options.selected ) {
+				return;
+			}
+			this.select( value );
+		} else {
+			this.options[ key ] = value;
+			this._tabify();
+		}
+	},
+
+	_tabId: function( a ) {
+		return a.title && a.title.replace( /\s/g, "_" ).replace( /[^\w\u00c0-\uFFFF-]/g, "" ) ||
+			this.options.idPrefix + getNextTabId();
+	},
+
+	_sanitizeSelector: function( hash ) {
+		// we need this because an id may contain a ":"
+		return hash.replace( /:/g, "\\:" );
+	},
+
+	_cookie: function() {
+		var cookie = this.cookie ||
+			( this.cookie = this.options.cookie.name || "ui-tabs-" + getNextListId() );
+		return $.cookie.apply( null, [ cookie ].concat( $.makeArray( arguments ) ) );
+	},
+
+	_ui: function( tab, panel ) {
+		return {
+			tab: tab,
+			panel: panel,
+			index: this.anchors.index( tab )
+		};
+	},
+
+	_cleanup: function() {
+		// restore all former loading tabs labels
+		this.lis.filter( ".ui-state-processing" )
+			.removeClass( "ui-state-processing" )
+			.find( "span:data(label.tabs)" )
+				.each(function() {
+					var el = $( this );
+					el.html( el.data( "label.tabs" ) ).removeData( "label.tabs" );
+				});
+	},
+
+	_tabify: function( init ) {
+		var self = this,
+			o = this.options,
+			fragmentId = /^#.+/; // Safari 2 reports '#' for an empty hash
+
+		this.list = this.element.find( "ol,ul" ).eq( 0 );
+		this.lis = $( " > li:has(a[href])", this.list );
+		this.anchors = this.lis.map(function() {
+			return $( "a", this )[ 0 ];
+		});
+		this.panels = $( [] );
+
+		this.anchors.each(function( i, a ) {
+			var href = $( a ).attr( "href" );
+			// For dynamically created HTML that contains a hash as href IE < 8 expands
+			// such href to the full page url with hash and then misinterprets tab as ajax.
+			// Same consideration applies for an added tab with a fragment identifier
+			// since a[href=#fragment-identifier] does unexpectedly not match.
+			// Thus normalize href attribute...
+			var hrefBase = href.split( "#" )[ 0 ],
+				baseEl;
+			if ( hrefBase && ( hrefBase === location.toString().split( "#" )[ 0 ] ||
+					( baseEl = $( "base" )[ 0 ]) && hrefBase === baseEl.href ) ) {
+				href = a.hash;
+				a.href = href;
+			}
+
+			// inline tab
+			if ( fragmentId.test( href ) ) {
+				self.panels = self.panels.add( self.element.find( self._sanitizeSelector( href ) ) );
+			// remote tab
+			// prevent loading the page itself if href is just "#"
+			} else if ( href && href !== "#" ) {
+				// required for restore on destroy
+				$.data( a, "href.tabs", href );
+
+				// TODO until #3808 is fixed strip fragment identifier from url
+				// (IE fails to load from such url)
+				$.data( a, "load.tabs", href.replace( /#.*$/, "" ) );
+
+				var id = self._tabId( a );
+				a.href = "#" + id;
+				var $panel = self.element.find( "#" + id );
+				if ( !$panel.length ) {
+					$panel = $( o.panelTemplate )
+						.attr( "id", id )
+						.addClass( "ui-tabs-panel ui-widget-content ui-corner-bottom" )
+						.insertAfter( self.panels[ i - 1 ] || self.list );
+					$panel.data( "destroy.tabs", true );
+				}
+				self.panels = self.panels.add( $panel );
+			// invalid tab href
+			} else {
+				o.disabled.push( i );
+			}
+		});
+
+		// initialization from scratch
+		if ( init ) {
+			// attach necessary classes for styling
+			this.element.addClass( "ui-tabs ui-widget ui-widget-content ui-corner-all" );
+			this.list.addClass( "ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all" );
+			this.lis.addClass( "ui-state-default ui-corner-top" );
+			this.panels.addClass( "ui-tabs-panel ui-widget-content ui-corner-bottom" );
+
+			// Selected tab
+			// use "selected" option or try to retrieve:
+			// 1. from fragment identifier in url
+			// 2. from cookie
+			// 3. from selected class attribute on <li>
+			if ( o.selected === undefined ) {
+				if ( location.hash ) {
+					this.anchors.each(function( i, a ) {
+						if ( a.hash == location.hash ) {
+							o.selected = i;
+							return false;
+						}
+					});
+				}
+				if ( typeof o.selected !== "number" && o.cookie ) {
+					o.selected = parseInt( self._cookie(), 10 );
+				}
+				if ( typeof o.selected !== "number" && this.lis.filter( ".ui-tabs-selected" ).length ) {
+					o.selected = this.lis.index( this.lis.filter( ".ui-tabs-selected" ) );
+				}
+				o.selected = o.selected || ( this.lis.length ? 0 : -1 );
+			} else if ( o.selected === null ) { // usage of null is deprecated, TODO remove in next release
+				o.selected = -1;
+			}
+
+			// sanity check - default to first tab...
+			o.selected = ( ( o.selected >= 0 && this.anchors[ o.selected ] ) || o.selected < 0 )
+				? o.selected
+				: 0;
+
+			// Take disabling tabs via class attribute from HTML
+			// into account and update option properly.
+			// A selected tab cannot become disabled.
+			o.disabled = $.unique( o.disabled.concat(
+				$.map( this.lis.filter( ".ui-state-disabled" ), function( n, i ) {
+					return self.lis.index( n );
+				})
+			) ).sort();
+
+			if ( $.inArray( o.selected, o.disabled ) != -1 ) {
+				o.disabled.splice( $.inArray( o.selected, o.disabled ), 1 );
+			}
+
+			// highlight selected tab
+			this.panels.addClass( "ui-tabs-hide" );
+			this.lis.removeClass( "ui-tabs-selected ui-state-active" );
+			// check for length avoids error when initializing empty list
+			if ( o.selected >= 0 && this.anchors.length ) {
+				self.element.find( self._sanitizeSelector( self.anchors[ o.selected ].hash ) ).removeClass( "ui-tabs-hide" );
+				this.lis.eq( o.selected ).addClass( "ui-tabs-selected ui-state-active" );
+
+				// seems to be expected behavior that the show callback is fired
+				self.element.queue( "tabs", function() {
+					self._trigger( "show", null,
+						self._ui( self.anchors[ o.selected ], self.element.find( self._sanitizeSelector( self.anchors[ o.selected ].hash ) )[ 0 ] ) );
+				});
+
+				this.load( o.selected );
+			}
+
+			// clean up to avoid memory leaks in certain versions of IE 6
+			// TODO: namespace this event
+			$( window ).bind( "unload", function() {
+				self.lis.add( self.anchors ).unbind( ".tabs" );
+				self.lis = self.anchors = self.panels = null;
+			});
+		// update selected after add/remove
+		} else {
+			o.selected = this.lis.index( this.lis.filter( ".ui-tabs-selected" ) );
+		}
+
+		// update collapsible
+		// TODO: use .toggleClass()
+		this.element[ o.collapsible ? "addClass" : "removeClass" ]( "ui-tabs-collapsible" );
+
+		// set or update cookie after init and add/remove respectively
+		if ( o.cookie ) {
+			this._cookie( o.selected, o.cookie );
+		}
+
+		// disable tabs
+		for ( var i = 0, li; ( li = this.lis[ i ] ); i++ ) {
+			$( li )[ $.inArray( i, o.disabled ) != -1 &&
+				// TODO: use .toggleClass()
+				!$( li ).hasClass( "ui-tabs-selected" ) ? "addClass" : "removeClass" ]( "ui-state-disabled" );
+		}
+
+		// reset cache if switching from cached to not cached
+		if ( o.cache === false ) {
+			this.anchors.removeData( "cache.tabs" );
+		}
+
+		// remove all handlers before, tabify may run on existing tabs after add or option change
+		this.lis.add( this.anchors ).unbind( ".tabs" );
+
+		if ( o.event !== "mouseover" ) {
+			var addState = function( state, el ) {
+				if ( el.is( ":not(.ui-state-disabled)" ) ) {
+					el.addClass( "ui-state-" + state );
+				}
+			};
+			var removeState = function( state, el ) {
+				el.removeClass( "ui-state-" + state );
+			};
+			this.lis.bind( "mouseover.tabs" , function() {
+				addState( "hover", $( this ) );
+			});
+			this.lis.bind( "mouseout.tabs", function() {
+				removeState( "hover", $( this ) );
+			});
+			this.anchors.bind( "focus.tabs", function() {
+				addState( "focus", $( this ).closest( "li" ) );
+			});
+			this.anchors.bind( "blur.tabs", function() {
+				removeState( "focus", $( this ).closest( "li" ) );
+			});
+		}
+
+		// set up animations
+		var hideFx, showFx;
+		if ( o.fx ) {
+			if ( $.isArray( o.fx ) ) {
+				hideFx = o.fx[ 0 ];
+				showFx = o.fx[ 1 ];
+			} else {
+				hideFx = showFx = o.fx;
+			}
+		}
+
+		// Reset certain styles left over from animation
+		// and prevent IE's ClearType bug...
+		function resetStyle( $el, fx ) {
+			$el.css( "display", "" );
+			if ( !$.support.opacity && fx.opacity ) {
+				$el[ 0 ].style.removeAttribute( "filter" );
+			}
+		}
+
+		// Show a tab...
+		var showTab = showFx
+			? function( clicked, $show ) {
+				$( clicked ).closest( "li" ).addClass( "ui-tabs-selected ui-state-active" );
+				$show.hide().removeClass( "ui-tabs-hide" ) // avoid flicker that way
+					.animate( showFx, showFx.duration || "normal", function() {
+						resetStyle( $show, showFx );
+						self._trigger( "show", null, self._ui( clicked, $show[ 0 ] ) );
+					});
+			}
+			: function( clicked, $show ) {
+				$( clicked ).closest( "li" ).addClass( "ui-tabs-selected ui-state-active" );
+				$show.removeClass( "ui-tabs-hide" );
+				self._trigger( "show", null, self._ui( clicked, $show[ 0 ] ) );
+			};
+
+		// Hide a tab, $show is optional...
+		var hideTab = hideFx
+			? function( clicked, $hide ) {
+				$hide.animate( hideFx, hideFx.duration || "normal", function() {
+					self.lis.removeClass( "ui-tabs-selected ui-state-active" );
+					$hide.addClass( "ui-tabs-hide" );
+					resetStyle( $hide, hideFx );
+					self.element.dequeue( "tabs" );
+				});
+			}
+			: function( clicked, $hide, $show ) {
+				self.lis.removeClass( "ui-tabs-selected ui-state-active" );
+				$hide.addClass( "ui-tabs-hide" );
+				self.element.dequeue( "tabs" );
+			};
+
+		// attach tab event handler, unbind to avoid duplicates from former tabifying...
+		this.anchors.bind( o.event + ".tabs", function() {
+			var el = this,
+				$li = $(el).closest( "li" ),
+				$hide = self.panels.filter( ":not(.ui-tabs-hide)" ),
+				$show = self.element.find( self._sanitizeSelector( el.hash ) );
+
+			// If tab is already selected and not collapsible or tab disabled or
+			// or is already loading or click callback returns false stop here.
+			// Check if click handler returns false last so that it is not executed
+			// for a disabled or loading tab!
+			if ( ( $li.hasClass( "ui-tabs-selected" ) && !o.collapsible) ||
+				$li.hasClass( "ui-state-disabled" ) ||
+				$li.hasClass( "ui-state-processing" ) ||
+				self.panels.filter( ":animated" ).length ||
+				self._trigger( "select", null, self._ui( this, $show[ 0 ] ) ) === false ) {
+				this.blur();
+				return false;
+			}
+
+			o.selected = self.anchors.index( this );
+
+			self.abort();
+
+			// if tab may be closed
+			if ( o.collapsible ) {
+				if ( $li.hasClass( "ui-tabs-selected" ) ) {
+					o.selected = -1;
+
+					if ( o.cookie ) {
+						self._cookie( o.selected, o.cookie );
+					}
+
+					self.element.queue( "tabs", function() {
+						hideTab( el, $hide );
+					}).dequeue( "tabs" );
+
+					this.blur();
+					return false;
+				} else if ( !$hide.length ) {
+					if ( o.cookie ) {
+						self._cookie( o.selected, o.cookie );
+					}
+
+					self.element.queue( "tabs", function() {
+						showTab( el, $show );
+					});
+
+					// TODO make passing in node possible, see also http://dev.jqueryui.com/ticket/3171
+					self.load( self.anchors.index( this ) );
+
+					this.blur();
+					return false;
+				}
+			}
+
+			if ( o.cookie ) {
+				self._cookie( o.selected, o.cookie );
+			}
+
+			// show new tab
+			if ( $show.length ) {
+				if ( $hide.length ) {
+					self.element.queue( "tabs", function() {
+						hideTab( el, $hide );
+					});
+				}
+				self.element.queue( "tabs", function() {
+					showTab( el, $show );
+				});
+
+				self.load( self.anchors.index( this ) );
+			} else {
+				throw "jQuery UI Tabs: Mismatching fragment identifier.";
+			}
+
+			// Prevent IE from keeping other link focussed when using the back button
+			// and remove dotted border from clicked link. This is controlled via CSS
+			// in modern browsers; blur() removes focus from address bar in Firefox
+			// which can become a usability and annoying problem with tabs('rotate').
+			if ( $.browser.msie ) {
+				this.blur();
+			}
+		});
+
+		// disable click in any case
+		this.anchors.bind( "click.tabs", function(){
+			return false;
+		});
+	},
+
+    _getIndex: function( index ) {
+		// meta-function to give users option to provide a href string instead of a numerical index.
+		// also sanitizes numerical indexes to valid values.
+		if ( typeof index == "string" ) {
+			index = this.anchors.index( this.anchors.filter( "[href$=" + index + "]" ) );
+		}
+
+		return index;
+	},
+
+	destroy: function() {
+		var o = this.options;
+
+		this.abort();
+
+		this.element
+			.unbind( ".tabs" )
+			.removeClass( "ui-tabs ui-widget ui-widget-content ui-corner-all ui-tabs-collapsible" )
+			.removeData( "tabs" );
+
+		this.list.removeClass( "ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all" );
+
+		this.anchors.each(function() {
+			var href = $.data( this, "href.tabs" );
+			if ( href ) {
+				this.href = href;
+			}
+			var $this = $( this ).unbind( ".tabs" );
+			$.each( [ "href", "load", "cache" ], function( i, prefix ) {
+				$this.removeData( prefix + ".tabs" );
+			});
+		});
+
+		this.lis.unbind( ".tabs" ).add( this.panels ).each(function() {
+			if ( $.data( this, "destroy.tabs" ) ) {
+				$( this ).remove();
+			} else {
+				$( this ).removeClass([
+					"ui-state-default",
+					"ui-corner-top",
+					"ui-tabs-selected",
+					"ui-state-active",
+					"ui-state-hover",
+					"ui-state-focus",
+					"ui-state-disabled",
+					"ui-tabs-panel",
+					"ui-widget-content",
+					"ui-corner-bottom",
+					"ui-tabs-hide"
+				].join( " " ) );
+			}
+		});
+
+		if ( o.cookie ) {
+			this._cookie( null, o.cookie );
+		}
+
+		return this;
+	},
+
+	add: function( url, label, index ) {
+		if ( index === undefined ) {
+			index = this.anchors.length;
+		}
+
+		var self = this,
+			o = this.options,
+			$li = $( o.tabTemplate.replace( /#\{href\}/g, url ).replace( /#\{label\}/g, label ) ),
+			id = !url.indexOf( "#" ) ? url.replace( "#", "" ) : this._tabId( $( "a", $li )[ 0 ] );
+
+		$li.addClass( "ui-state-default ui-corner-top" ).data( "destroy.tabs", true );
+
+		// try to find an existing element before creating a new one
+		var $panel = self.element.find( "#" + id );
+		if ( !$panel.length ) {
+			$panel = $( o.panelTemplate )
+				.attr( "id", id )
+				.data( "destroy.tabs", true );
+		}
+		$panel.addClass( "ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide" );
+
+		if ( index >= this.lis.length ) {
+			$li.appendTo( this.list );
+			$panel.appendTo( this.list[ 0 ].parentNode );
+		} else {
+			$li.insertBefore( this.lis[ index ] );
+			$panel.insertBefore( this.panels[ index ] );
+		}
+
+		o.disabled = $.map( o.disabled, function( n, i ) {
+			return n >= index ? ++n : n;
+		});
+
+		this._tabify();
+
+		if ( this.anchors.length == 1 ) {
+			o.selected = 0;
+			$li.addClass( "ui-tabs-selected ui-state-active" );
+			$panel.removeClass( "ui-tabs-hide" );
+			this.element.queue( "tabs", function() {
+				self._trigger( "show", null, self._ui( self.anchors[ 0 ], self.panels[ 0 ] ) );
+			});
+
+			this.load( 0 );
+		}
+
+		this._trigger( "add", null, this._ui( this.anchors[ index ], this.panels[ index ] ) );
+		return this;
+	},
+
+	remove: function( index ) {
+		index = this._getIndex( index );
+		var o = this.options,
+			$li = this.lis.eq( index ).remove(),
+			$panel = this.panels.eq( index ).remove();
+
+		// If selected tab was removed focus tab to the right or
+		// in case the last tab was removed the tab to the left.
+		if ( $li.hasClass( "ui-tabs-selected" ) && this.anchors.length > 1) {
+			this.select( index + ( index + 1 < this.anchors.length ? 1 : -1 ) );
+		}
+
+		o.disabled = $.map(
+			$.grep( o.disabled, function(n, i) {
+				return n != index;
+			}),
+			function( n, i ) {
+				return n >= index ? --n : n;
+			});
+
+		this._tabify();
+
+		this._trigger( "remove", null, this._ui( $li.find( "a" )[ 0 ], $panel[ 0 ] ) );
+		return this;
+	},
+
+	enable: function( index ) {
+		index = this._getIndex( index );
+		var o = this.options;
+		if ( $.inArray( index, o.disabled ) == -1 ) {
+			return;
+		}
+
+		this.lis.eq( index ).removeClass( "ui-state-disabled" );
+		o.disabled = $.grep( o.disabled, function( n, i ) {
+			return n != index;
+		});
+
+		this._trigger( "enable", null, this._ui( this.anchors[ index ], this.panels[ index ] ) );
+		return this;
+	},
+
+	disable: function( index ) {
+		index = this._getIndex( index );
+		var self = this, o = this.options;
+		// cannot disable already selected tab
+		if ( index != o.selected ) {
+			this.lis.eq( index ).addClass( "ui-state-disabled" );
+
+			o.disabled.push( index );
+			o.disabled.sort();
+
+			this._trigger( "disable", null, this._ui( this.anchors[ index ], this.panels[ index ] ) );
+		}
+
+		return this;
+	},
+
+	select: function( index ) {
+		index = this._getIndex( index );
+		if ( index == -1 ) {
+			if ( this.options.collapsible && this.options.selected != -1 ) {
+				index = this.options.selected;
+			} else {
+				return this;
+			}
+		}
+		this.anchors.eq( index ).trigger( this.options.event + ".tabs" );
+		return this;
+	},
+
+	load: function( index ) {
+		index = this._getIndex( index );
+		var self = this,
+			o = this.options,
+			a = this.anchors.eq( index )[ 0 ],
+			url = $.data( a, "load.tabs" );
+
+		this.abort();
+
+		// not remote or from cache
+		if ( !url || this.element.queue( "tabs" ).length !== 0 && $.data( a, "cache.tabs" ) ) {
+			this.element.dequeue( "tabs" );
+			return;
+		}
+
+		// load remote from here on
+		this.lis.eq( index ).addClass( "ui-state-processing" );
+
+		if ( o.spinner ) {
+			var span = $( "span", a );
+			span.data( "label.tabs", span.html() ).html( o.spinner );
+		}
+
+		this.xhr = $.ajax( $.extend( {}, o.ajaxOptions, {
+			url: url,
+			success: function( r, s ) {
+				self.element.find( self._sanitizeSelector( a.hash ) ).html( r );
+
+				// take care of tab labels
+				self._cleanup();
+
+				if ( o.cache ) {
+					$.data( a, "cache.tabs", true );
+				}
+
+				self._trigger( "load", null, self._ui( self.anchors[ index ], self.panels[ index ] ) );
+				try {
+					o.ajaxOptions.success( r, s );
+				}
+				catch ( e ) {}
+			},
+			error: function( xhr, s, e ) {
+				// take care of tab labels
+				self._cleanup();
+
+				self._trigger( "load", null, self._ui( self.anchors[ index ], self.panels[ index ] ) );
+				try {
+					// Passing index avoid a race condition when this method is
+					// called after the user has selected another tab.
+					// Pass the anchor that initiated this request allows
+					// loadError to manipulate the tab content panel via $(a.hash)
+					o.ajaxOptions.error( xhr, s, index, a );
+				}
+				catch ( e ) {}
+			}
+		} ) );
+
+		// last, so that load event is fired before show...
+		self.element.dequeue( "tabs" );
+
+		return this;
+	},
+
+	abort: function() {
+		// stop possibly running animations
+		this.element.queue( [] );
+		this.panels.stop( false, true );
+
+		// "tabs" queue must not contain more than two elements,
+		// which are the callbacks for the latest clicked tab...
+		this.element.queue( "tabs", this.element.queue( "tabs" ).splice( -2, 2 ) );
+
+		// terminate pending requests from other tabs
+		if ( this.xhr ) {
+			this.xhr.abort();
+			delete this.xhr;
+		}
+
+		// take care of tab labels
+		this._cleanup();
+		return this;
+	},
+
+	url: function( index, url ) {
+		this.anchors.eq( index ).removeData( "cache.tabs" ).data( "load.tabs", url );
+		return this;
+	},
+
+	length: function() {
+		return this.anchors.length;
+	}
+});
+
+$.extend( $.ui.tabs, {
+	version: "1.8.10"
+});
+
+/*
+ * Tabs Extensions
+ */
+
+/*
+ * Rotate
+ */
+$.extend( $.ui.tabs.prototype, {
+	rotation: null,
+	rotate: function( ms, continuing ) {
+		var self = this,
+			o = this.options;
+
+		var rotate = self._rotate || ( self._rotate = function( e ) {
+			clearTimeout( self.rotation );
+			self.rotation = setTimeout(function() {
+				var t = o.selected;
+				self.select( ++t < self.anchors.length ? t : 0 );
+			}, ms );
+			
+			if ( e ) {
+				e.stopPropagation();
+			}
+		});
+
+		var stop = self._unrotate || ( self._unrotate = !continuing
+			? function(e) {
+				if (e.clientX) { // in case of a true click
+					self.rotate(null);
+				}
+			}
+			: function( e ) {
+				t = o.selected;
+				rotate();
+			});
+
+		// start rotation
+		if ( ms ) {
+			this.element.bind( "tabsshow", rotate );
+			this.anchors.bind( o.event + ".tabs", stop );
+			rotate();
+		// stop rotation
+		} else {
+			clearTimeout( self.rotation );
+			this.element.unbind( "tabsshow", rotate );
+			this.anchors.unbind( o.event + ".tabs", stop );
+			delete this._rotate;
+			delete this._unrotate;
+		}
+
+		return this;
+	}
+});
+
+})( jQuery );
+/*
+ * jQuery UI Datepicker 1.8.10
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Datepicker
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ */
+(function( $, undefined ) {
+
+$.extend($.ui, { datepicker: { version: "1.8.10" } });
+
+var PROP_NAME = 'datepicker';
+var dpuuid = new Date().getTime();
+
+/* Date picker manager.
+   Use the singleton instance of this class, $.datepicker, to interact with the date picker.
+   Settings for (groups of) date pickers are maintained in an instance object,
+   allowing multiple different settings on the same page. */
+
+function Datepicker() {
+	this.debug = false; // Change this to true to start debugging
+	this._curInst = null; // The current instance in use
+	this._keyEvent = false; // If the last event was a key event
+	this._disabledInputs = []; // List of date picker inputs that have been disabled
+	this._datepickerShowing = false; // True if the popup picker is showing , false if not
+	this._inDialog = false; // True if showing within a "dialog", false if not
+	this._mainDivId = 'ui-datepicker-div'; // The ID of the main datepicker division
+	this._inlineClass = 'ui-datepicker-inline'; // The name of the inline marker class
+	this._appendClass = 'ui-datepicker-append'; // The name of the append marker class
+	this._triggerClass = 'ui-datepicker-trigger'; // The name of the trigger marker class
+	this._dialogClass = 'ui-datepicker-dialog'; // The name of the dialog marker class
+	this._disableClass = 'ui-datepicker-disabled'; // The name of the disabled covering marker class
+	this._unselectableClass = 'ui-datepicker-unselectable'; // The name of the unselectable cell marker class
+	this._currentClass = 'ui-datepicker-current-day'; // The name of the current day marker class
+	this._dayOverClass = 'ui-datepicker-days-cell-over'; // The name of the day hover marker class
+	this.regional = []; // Available regional settings, indexed by language code
+	this.regional[''] = { // Default regional settings
+		closeText: 'Done', // Display text for close link
+		prevText: 'Prev', // Display text for previous month link
+		nextText: 'Next', // Display text for next month link
+		currentText: 'Today', // Display text for current month link
+		monthNames: ['January','February','March','April','May','June',
+			'July','August','September','October','November','December'], // Names of months for drop-down and formatting
+		monthNamesShort: ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'], // For formatting
+		dayNames: ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'], // For formatting
+		dayNamesShort: ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'], // For formatting
+		dayNamesMin: ['Su','Mo','Tu','We','Th','Fr','Sa'], // Column headings for days starting at Sunday
+		weekHeader: 'Wk', // Column header for week of the year
+		dateFormat: 'mm/dd/yy', // See format options on parseDate
+		firstDay: 0, // The first day of the week, Sun = 0, Mon = 1, ...
+		isRTL: false, // True if right-to-left language, false if left-to-right
+		showMonthAfterYear: false, // True if the year select precedes month, false for month then year
+		yearSuffix: '' // Additional text to append to the year in the month headers
+	};
+	this._defaults = { // Global defaults for all the date picker instances
+		showOn: 'focus', // 'focus' for popup on focus,
+			// 'button' for trigger button, or 'both' for either
+		showAnim: 'fadeIn', // Name of jQuery animation for popup
+		showOptions: {}, // Options for enhanced animations
+		defaultDate: null, // Used when field is blank: actual date,
+			// +/-number for offset from today, null for today
+		appendText: '', // Display text following the input box, e.g. showing the format
+		buttonText: '...', // Text for trigger button
+		buttonImage: '', // URL for trigger button image
+		buttonImageOnly: false, // True if the image appears alone, false if it appears on a button
+		hideIfNoPrevNext: false, // True to hide next/previous month links
+			// if not applicable, false to just disable them
+		navigationAsDateFormat: false, // True if date formatting applied to prev/today/next links
+		gotoCurrent: false, // True if today link goes back to current selection instead
+		changeMonth: false, // True if month can be selected directly, false if only prev/next
+		changeYear: false, // True if year can be selected directly, false if only prev/next
+		yearRange: 'c-10:c+10', // Range of years to display in drop-down,
+			// either relative to today's year (-nn:+nn), relative to currently displayed year
+			// (c-nn:c+nn), absolute (nnnn:nnnn), or a combination of the above (nnnn:-n)
+		showOtherMonths: false, // True to show dates in other months, false to leave blank
+		selectOtherMonths: false, // True to allow selection of dates in other months, false for unselectable
+		showWeek: false, // True to show week of the year, false to not show it
+		calculateWeek: this.iso8601Week, // How to calculate the week of the year,
+			// takes a Date and returns the number of the week for it
+		shortYearCutoff: '+10', // Short year values < this are in the current century,
+			// > this are in the previous century,
+			// string value starting with '+' for current year + value
+		minDate: null, // The earliest selectable date, or null for no limit
+		maxDate: null, // The latest selectable date, or null for no limit
+		duration: 'fast', // Duration of display/closure
+		beforeShowDay: null, // Function that takes a date and returns an array with
+			// [0] = true if selectable, false if not, [1] = custom CSS class name(s) or '',
+			// [2] = cell title (optional), e.g. $.datepicker.noWeekends
+		beforeShow: null, // Function that takes an input field and
+			// returns a set of custom settings for the date picker
+		onSelect: null, // Define a callback function when a date is selected
+		onChangeMonthYear: null, // Define a callback function when the month or year is changed
+		onClose: null, // Define a callback function when the datepicker is closed
+		numberOfMonths: 1, // Number of months to show at a time
+		showCurrentAtPos: 0, // The position in multipe months at which to show the current month (starting at 0)
+		stepMonths: 1, // Number of months to step back/forward
+		stepBigMonths: 12, // Number of months to step back/forward for the big links
+		altField: '', // Selector for an alternate field to store selected dates into
+		altFormat: '', // The date format to use for the alternate field
+		constrainInput: true, // The input is constrained by the current date format
+		showButtonPanel: false, // True to show button panel, false to not show it
+		autoSize: false // True to size the input for the date format, false to leave as is
+	};
+	$.extend(this._defaults, this.regional['']);
+	this.dpDiv = $('<div id="' + this._mainDivId + '" class="ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all"></div>');
+}
+
+$.extend(Datepicker.prototype, {
+	/* Class name added to elements to indicate already configured with a date picker. */
+	markerClassName: 'hasDatepicker',
+
+	/* Debug logging (if enabled). */
+	log: function () {
+		if (this.debug)
+			console.log.apply('', arguments);
+	},
+	
+	// TODO rename to "widget" when switching to widget factory
+	_widgetDatepicker: function() {
+		return this.dpDiv;
+	},
+
+	/* Override the default settings for all instances of the date picker.
+	   @param  settings  object - the new settings to use as defaults (anonymous object)
+	   @return the manager object */
+	setDefaults: function(settings) {
+		extendRemove(this._defaults, settings || {});
+		return this;
+	},
+
+	/* Attach the date picker to a jQuery selection.
+	   @param  target    element - the target input field or division or span
+	   @param  settings  object - the new settings to use for this date picker instance (anonymous) */
+	_attachDatepicker: function(target, settings) {
+		// check for settings on the control itself - in namespace 'date:'
+		var inlineSettings = null;
+		for (var attrName in this._defaults) {
+			var attrValue = target.getAttribute('date:' + attrName);
+			if (attrValue) {
+				inlineSettings = inlineSettings || {};
+				try {
+					inlineSettings[attrName] = eval(attrValue);
+				} catch (err) {
+					inlineSettings[attrName] = attrValue;
+				}
+			}
+		}
+		var nodeName = target.nodeName.toLowerCase();
+		var inline = (nodeName == 'div' || nodeName == 'span');
+		if (!target.id) {
+			this.uuid += 1;
+			target.id = 'dp' + this.uuid;
+		}
+		var inst = this._newInst($(target), inline);
+		inst.settings = $.extend({}, settings || {}, inlineSettings || {});
+		if (nodeName == 'input') {
+			this._connectDatepicker(target, inst);
+		} else if (inline) {
+			this._inlineDatepicker(target, inst);
+		}
+	},
+
+	/* Create a new instance object. */
+	_newInst: function(target, inline) {
+		var id = target[0].id.replace(/([^A-Za-z0-9_-])/g, '\\\\$1'); // escape jQuery meta chars
+		return {id: id, input: target, // associated target
+			selectedDay: 0, selectedMonth: 0, selectedYear: 0, // current selection
+			drawMonth: 0, drawYear: 0, // month being drawn
+			inline: inline, // is datepicker inline or not
+			dpDiv: (!inline ? this.dpDiv : // presentation div
+			$('<div class="' + this._inlineClass + ' ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all"></div>'))};
+	},
+
+	/* Attach the date picker to an input field. */
+	_connectDatepicker: function(target, inst) {
+		var input = $(target);
+		inst.append = $([]);
+		inst.trigger = $([]);
+		if (input.hasClass(this.markerClassName))
+			return;
+		this._attachments(input, inst);
+		input.addClass(this.markerClassName).keydown(this._doKeyDown).
+			keypress(this._doKeyPress).keyup(this._doKeyUp).
+			bind("setData.datepicker", function(event, key, value) {
+				inst.settings[key] = value;
+			}).bind("getData.datepicker", function(event, key) {
+				return this._get(inst, key);
+			});
+		this._autoSize(inst);
+		$.data(target, PROP_NAME, inst);
+	},
+
+	/* Make attachments based on settings. */
+	_attachments: function(input, inst) {
+		var appendText = this._get(inst, 'appendText');
+		var isRTL = this._get(inst, 'isRTL');
+		if (inst.append)
+			inst.append.remove();
+		if (appendText) {
+			inst.append = $('<span class="' + this._appendClass + '">' + appendText + '</span>');
+			input[isRTL ? 'before' : 'after'](inst.append);
+		}
+		input.unbind('focus', this._showDatepicker);
+		if (inst.trigger)
+			inst.trigger.remove();
+		var showOn = this._get(inst, 'showOn');
+		if (showOn == 'focus' || showOn == 'both') // pop-up date picker when in the marked field
+			input.focus(this._showDatepicker);
+		if (showOn == 'button' || showOn == 'both') { // pop-up date picker when button clicked
+			var buttonText = this._get(inst, 'buttonText');
+			var buttonImage = this._get(inst, 'buttonImage');
+			inst.trigger = $(this._get(inst, 'buttonImageOnly') ?
+				$('<img/>').addClass(this._triggerClass).
+					attr({ src: buttonImage, alt: buttonText, title: buttonText }) :
+				$('<button type="button"></button>').addClass(this._triggerClass).
+					html(buttonImage == '' ? buttonText : $('<img/>').attr(
+					{ src:buttonImage, alt:buttonText, title:buttonText })));
+			input[isRTL ? 'before' : 'after'](inst.trigger);
+			inst.trigger.click(function() {
+				if ($.datepicker._datepickerShowing && $.datepicker._lastInput == input[0])
+					$.datepicker._hideDatepicker();
+				else
+					$.datepicker._showDatepicker(input[0]);
+				return false;
+			});
+		}
+	},
+
+	/* Apply the maximum length for the date format. */
+	_autoSize: function(inst) {
+		if (this._get(inst, 'autoSize') && !inst.inline) {
+			var date = new Date(2009, 12 - 1, 20); // Ensure double digits
+			var dateFormat = this._get(inst, 'dateFormat');
+			if (dateFormat.match(/[DM]/)) {
+				var findMax = function(names) {
+					var max = 0;
+					var maxI = 0;
+					for (var i = 0; i < names.length; i++) {
+						if (names[i].length > max) {
+							max = names[i].length;
+							maxI = i;
+						}
+					}
+					return maxI;
+				};
+				date.setMonth(findMax(this._get(inst, (dateFormat.match(/MM/) ?
+					'monthNames' : 'monthNamesShort'))));
+				date.setDate(findMax(this._get(inst, (dateFormat.match(/DD/) ?
+					'dayNames' : 'dayNamesShort'))) + 20 - date.getDay());
+			}
+			inst.input.attr('size', this._formatDate(inst, date).length);
+		}
+	},
+
+	/* Attach an inline date picker to a div. */
+	_inlineDatepicker: function(target, inst) {
+		var divSpan = $(target);
+		if (divSpan.hasClass(this.markerClassName))
+			return;
+		divSpan.addClass(this.markerClassName).append(inst.dpDiv).
+			bind("setData.datepicker", function(event, key, value){
+				inst.settings[key] = value;
+			}).bind("getData.datepicker", function(event, key){
+				return this._get(inst, key);
+			});
+		$.data(target, PROP_NAME, inst);
+		this._setDate(inst, this._getDefaultDate(inst), true);
+		this._updateDatepicker(inst);
+		this._updateAlternate(inst);
+		inst.dpDiv.show();
+	},
+
+	/* Pop-up the date picker in a "dialog" box.
+	   @param  input     element - ignored
+	   @param  date      string or Date - the initial date to display
+	   @param  onSelect  function - the function to call when a date is selected
+	   @param  settings  object - update the dialog date picker instance's settings (anonymous object)
+	   @param  pos       int[2] - coordinates for the dialog's position within the screen or
+	                     event - with x/y coordinates or
+	                     leave empty for default (screen centre)
+	   @return the manager object */
+	_dialogDatepicker: function(input, date, onSelect, settings, pos) {
+		var inst = this._dialogInst; // internal instance
+		if (!inst) {
+			this.uuid += 1;
+			var id = 'dp' + this.uuid;
+			this._dialogInput = $('<input type="text" id="' + id +
+				'" style="position: absolute; top: -100px; width: 0px; z-index: -10;"/>');
+			this._dialogInput.keydown(this._doKeyDown);
+			$('body').append(this._dialogInput);
+			inst = this._dialogInst = this._newInst(this._dialogInput, false);
+			inst.settings = {};
+			$.data(this._dialogInput[0], PROP_NAME, inst);
+		}
+		extendRemove(inst.settings, settings || {});
+		date = (date && date.constructor == Date ? this._formatDate(inst, date) : date);
+		this._dialogInput.val(date);
+
+		this._pos = (pos ? (pos.length ? pos : [pos.pageX, pos.pageY]) : null);
+		if (!this._pos) {
+			var browserWidth = document.documentElement.clientWidth;
+			var browserHeight = document.documentElement.clientHeight;
+			var scrollX = document.documentElement.scrollLeft || document.body.scrollLeft;
+			var scrollY = document.documentElement.scrollTop || document.body.scrollTop;
+			this._pos = // should use actual width/height below
+				[(browserWidth / 2) - 100 + scrollX, (browserHeight / 2) - 150 + scrollY];
+		}
+
+		// move input on screen for focus, but hidden behind dialog
+		this._dialogInput.css('left', (this._pos[0] + 20) + 'px').css('top', this._pos[1] + 'px');
+		inst.settings.onSelect = onSelect;
+		this._inDialog = true;
+		this.dpDiv.addClass(this._dialogClass);
+		this._showDatepicker(this._dialogInput[0]);
+		if ($.blockUI)
+			$.blockUI(this.dpDiv);
+		$.data(this._dialogInput[0], PROP_NAME, inst);
+		return this;
+	},
+
+	/* Detach a datepicker from its control.
+	   @param  target    element - the target input field or division or span */
+	_destroyDatepicker: function(target) {
+		var $target = $(target);
+		var inst = $.data(target, PROP_NAME);
+		if (!$target.hasClass(this.markerClassName)) {
+			return;
+		}
+		var nodeName = target.nodeName.toLowerCase();
+		$.removeData(target, PROP_NAME);
+		if (nodeName == 'input') {
+			inst.append.remove();
+			inst.trigger.remove();
+			$target.removeClass(this.markerClassName).
+				unbind('focus', this._showDatepicker).
+				unbind('keydown', this._doKeyDown).
+				unbind('keypress', this._doKeyPress).
+				unbind('keyup', this._doKeyUp);
+		} else if (nodeName == 'div' || nodeName == 'span')
+			$target.removeClass(this.markerClassName).empty();
+	},
+
+	/* Enable the date picker to a jQuery selection.
+	   @param  target    element - the target input field or division or span */
+	_enableDatepicker: function(target) {
+		var $target = $(target);
+		var inst = $.data(target, PROP_NAME);
+		if (!$target.hasClass(this.markerClassName)) {
+			return;
+		}
+		var nodeName = target.nodeName.toLowerCase();
+		if (nodeName == 'input') {
+			target.disabled = false;
+			inst.trigger.filter('button').
+				each(function() { this.disabled = false; }).end().
+				filter('img').css({opacity: '1.0', cursor: ''});
+		}
+		else if (nodeName == 'div' || nodeName == 'span') {
+			var inline = $target.children('.' + this._inlineClass);
+			inline.children().removeClass('ui-state-disabled');
+		}
+		this._disabledInputs = $.map(this._disabledInputs,
+			function(value) { return (value == target ? null : value); }); // delete entry
+	},
+
+	/* Disable the date picker to a jQuery selection.
+	   @param  target    element - the target input field or division or span */
+	_disableDatepicker: function(target) {
+		var $target = $(target);
+		var inst = $.data(target, PROP_NAME);
+		if (!$target.hasClass(this.markerClassName)) {
+			return;
+		}
+		var nodeName = target.nodeName.toLowerCase();
+		if (nodeName == 'input') {
+			target.disabled = true;
+			inst.trigger.filter('button').
+				each(function() { this.disabled = true; }).end().
+				filter('img').css({opacity: '0.5', cursor: 'default'});
+		}
+		else if (nodeName == 'div' || nodeName == 'span') {
+			var inline = $target.children('.' + this._inlineClass);
+			inline.children().addClass('ui-state-disabled');
+		}
+		this._disabledInputs = $.map(this._disabledInputs,
+			function(value) { return (value == target ? null : value); }); // delete entry
+		this._disabledInputs[this._disabledInputs.length] = target;
+	},
+
+	/* Is the first field in a jQuery collection disabled as a datepicker?
+	   @param  target    element - the target input field or division or span
+	   @return boolean - true if disabled, false if enabled */
+	_isDisabledDatepicker: function(target) {
+		if (!target) {
+			return false;
+		}
+		for (var i = 0; i < this._disabledInputs.length; i++) {
+			if (this._disabledInputs[i] == target)
+				return true;
+		}
+		return false;
+	},
+
+	/* Retrieve the instance data for the target control.
+	   @param  target  element - the target input field or division or span
+	   @return  object - the associated instance data
+	   @throws  error if a jQuery problem getting data */
+	_getInst: function(target) {
+		try {
+			return $.data(target, PROP_NAME);
+		}
+		catch (err) {
+			throw 'Missing instance data for this datepicker';
+		}
+	},
+
+	/* Update or retrieve the settings for a date picker attached to an input field or division.
+	   @param  target  element - the target input field or division or span
+	   @param  name    object - the new settings to update or
+	                   string - the name of the setting to change or retrieve,
+	                   when retrieving also 'all' for all instance settings or
+	                   'defaults' for all global defaults
+	   @param  value   any - the new value for the setting
+	                   (omit if above is an object or to retrieve a value) */
+	_optionDatepicker: function(target, name, value) {
+		var inst = this._getInst(target);
+		if (arguments.length == 2 && typeof name == 'string') {
+			return (name == 'defaults' ? $.extend({}, $.datepicker._defaults) :
+				(inst ? (name == 'all' ? $.extend({}, inst.settings) :
+				this._get(inst, name)) : null));
+		}
+		var settings = name || {};
+		if (typeof name == 'string') {
+			settings = {};
+			settings[name] = value;
+		}
+		if (inst) {
+			if (this._curInst == inst) {
+				this._hideDatepicker();
+			}
+			var date = this._getDateDatepicker(target, true);
+			extendRemove(inst.settings, settings);
+			this._attachments($(target), inst);
+			this._autoSize(inst);
+			this._setDateDatepicker(target, date);
+			this._updateDatepicker(inst);
+		}
+	},
+
+	// change method deprecated
+	_changeDatepicker: function(target, name, value) {
+		this._optionDatepicker(target, name, value);
+	},
+
+	/* Redraw the date picker attached to an input field or division.
+	   @param  target  element - the target input field or division or span */
+	_refreshDatepicker: function(target) {
+		var inst = this._getInst(target);
+		if (inst) {
+			this._updateDatepicker(inst);
+		}
+	},
+
+	/* Set the dates for a jQuery selection.
+	   @param  target   element - the target input field or division or span
+	   @param  date     Date - the new date */
+	_setDateDatepicker: function(target, date) {
+		var inst = this._getInst(target);
+		if (inst) {
+			this._setDate(inst, date);
+			this._updateDatepicker(inst);
+			this._updateAlternate(inst);
+		}
+	},
+
+	/* Get the date(s) for the first entry in a jQuery selection.
+	   @param  target     element - the target input field or division or span
+	   @param  noDefault  boolean - true if no default date is to be used
+	   @return Date - the current date */
+	_getDateDatepicker: function(target, noDefault) {
+		var inst = this._getInst(target);
+		if (inst && !inst.inline)
+			this._setDateFromField(inst, noDefault);
+		return (inst ? this._getDate(inst) : null);
+	},
+
+	/* Handle keystrokes. */
+	_doKeyDown: function(event) {
+		var inst = $.datepicker._getInst(event.target);
+		var handled = true;
+		var isRTL = inst.dpDiv.is('.ui-datepicker-rtl');
+		inst._keyEvent = true;
+		if ($.datepicker._datepickerShowing)
+			switch (event.keyCode) {
+				case 9: $.datepicker._hideDatepicker();
+						handled = false;
+						break; // hide on tab out
+				case 13: var sel = $('td.' + $.datepicker._dayOverClass + ':not(.' + 
+									$.datepicker._currentClass + ')', inst.dpDiv);
+						if (sel[0])
+							$.datepicker._selectDay(event.target, inst.selectedMonth, inst.selectedYear, sel[0]);
+						else
+							$.datepicker._hideDatepicker();
+						return false; // don't submit the form
+						break; // select the value on enter
+				case 27: $.datepicker._hideDatepicker();
+						break; // hide on escape
+				case 33: $.datepicker._adjustDate(event.target, (event.ctrlKey ?
+							-$.datepicker._get(inst, 'stepBigMonths') :
+							-$.datepicker._get(inst, 'stepMonths')), 'M');
+						break; // previous month/year on page up/+ ctrl
+				case 34: $.datepicker._adjustDate(event.target, (event.ctrlKey ?
+							+$.datepicker._get(inst, 'stepBigMonths') :
+							+$.datepicker._get(inst, 'stepMonths')), 'M');
+						break; // next month/year on page down/+ ctrl
+				case 35: if (event.ctrlKey || event.metaKey) $.datepicker._clearDate(event.target);
+						handled = event.ctrlKey || event.metaKey;
+						break; // clear on ctrl or command +end
+				case 36: if (event.ctrlKey || event.metaKey) $.datepicker._gotoToday(event.target);
+						handled = event.ctrlKey || event.metaKey;
+						break; // current on ctrl or command +home
+				case 37: if (event.ctrlKey || event.metaKey) $.datepicker._adjustDate(event.target, (isRTL ? +1 : -1), 'D');
+						handled = event.ctrlKey || event.metaKey;
+						// -1 day on ctrl or command +left
+						if (event.originalEvent.altKey) $.datepicker._adjustDate(event.target, (event.ctrlKey ?
+									-$.datepicker._get(inst, 'stepBigMonths') :
+									-$.datepicker._get(inst, 'stepMonths')), 'M');
+						// next month/year on alt +left on Mac
+						break;
+				case 38: if (event.ctrlKey || event.metaKey) $.datepicker._adjustDate(event.target, -7, 'D');
+						handled = event.ctrlKey || event.metaKey;
+						break; // -1 week on ctrl or command +up
+				case 39: if (event.ctrlKey || event.metaKey) $.datepicker._adjustDate(event.target, (isRTL ? -1 : +1), 'D');
+						handled = event.ctrlKey || event.metaKey;
+						// +1 day on ctrl or command +right
+						if (event.originalEvent.altKey) $.datepicker._adjustDate(event.target, (event.ctrlKey ?
+									+$.datepicker._get(inst, 'stepBigMonths') :
+									+$.datepicker._get(inst, 'stepMonths')), 'M');
+						// next month/year on alt +right
+						break;
+				case 40: if (event.ctrlKey || event.metaKey) $.datepicker._adjustDate(event.target, +7, 'D');
+						handled = event.ctrlKey || event.metaKey;
+						break; // +1 week on ctrl or command +down
+				default: handled = false;
+			}
+		else if (event.keyCode == 36 && event.ctrlKey) // display the date picker on ctrl+home
+			$.datepicker._showDatepicker(this);
+		else {
+			handled = false;
+		}
+		if (handled) {
+			event.preventDefault();
+			event.stopPropagation();
+		}
+	},
+
+	/* Filter entered characters - based on date format. */
+	_doKeyPress: function(event) {
+		var inst = $.datepicker._getInst(event.target);
+		if ($.datepicker._get(inst, 'constrainInput')) {
+			var chars = $.datepicker._possibleChars($.datepicker._get(inst, 'dateFormat'));
+			var chr = String.fromCharCode(event.charCode == undefined ? event.keyCode : event.charCode);
+			return event.ctrlKey || event.metaKey || (chr < ' ' || !chars || chars.indexOf(chr) > -1);
+		}
+	},
+
+	/* Synchronise manual entry and field/alternate field. */
+	_doKeyUp: function(event) {
+		var inst = $.datepicker._getInst(event.target);
+		if (inst.input.val() != inst.lastVal) {
+			try {
+				var date = $.datepicker.parseDate($.datepicker._get(inst, 'dateFormat'),
+					(inst.input ? inst.input.val() : null),
+					$.datepicker._getFormatConfig(inst));
+				if (date) { // only if valid
+					$.datepicker._setDateFromField(inst);
+					$.datepicker._updateAlternate(inst);
+					$.datepicker._updateDatepicker(inst);
+				}
+			}
+			catch (event) {
+				$.datepicker.log(event);
+			}
+		}
+		return true;
+	},
+
+	/* Pop-up the date picker for a given input field.
+	   @param  input  element - the input field attached to the date picker or
+	                  event - if triggered by focus */
+	_showDatepicker: function(input) {
+		input = input.target || input;
+		if (input.nodeName.toLowerCase() != 'input') // find from button/image trigger
+			input = $('input', input.parentNode)[0];
+		if ($.datepicker._isDisabledDatepicker(input) || $.datepicker._lastInput == input) // already here
+			return;
+		var inst = $.datepicker._getInst(input);
+		if ($.datepicker._curInst && $.datepicker._curInst != inst) {
+			$.datepicker._curInst.dpDiv.stop(true, true);
+		}
+		var beforeShow = $.datepicker._get(inst, 'beforeShow');
+		extendRemove(inst.settings, (beforeShow ? beforeShow.apply(input, [input, inst]) : {}));
+		inst.lastVal = null;
+		$.datepicker._lastInput = input;
+		$.datepicker._setDateFromField(inst);
+		if ($.datepicker._inDialog) // hide cursor
+			input.value = '';
+		if (!$.datepicker._pos) { // position below input
+			$.datepicker._pos = $.datepicker._findPos(input);
+			$.datepicker._pos[1] += input.offsetHeight; // add the height
+		}
+		var isFixed = false;
+		$(input).parents().each(function() {
+			isFixed |= $(this).css('position') == 'fixed';
+			return !isFixed;
+		});
+		if (isFixed && $.browser.opera) { // correction for Opera when fixed and scrolled
+			$.datepicker._pos[0] -= document.documentElement.scrollLeft;
+			$.datepicker._pos[1] -= document.documentElement.scrollTop;
+		}
+		var offset = {left: $.datepicker._pos[0], top: $.datepicker._pos[1]};
+		$.datepicker._pos = null;
+		//to avoid flashes on Firefox
+		inst.dpDiv.empty();
+		// determine sizing offscreen
+		inst.dpDiv.css({position: 'absolute', display: 'block', top: '-1000px'});
+		$.datepicker._updateDatepicker(inst);
+		// fix width for dynamic number of date pickers
+		// and adjust position before showing
+		offset = $.datepicker._checkOffset(inst, offset, isFixed);
+		inst.dpDiv.css({position: ($.datepicker._inDialog && $.blockUI ?
+			'static' : (isFixed ? 'fixed' : 'absolute')), display: 'none',
+			left: offset.left + 'px', top: offset.top + 'px'});
+		if (!inst.inline) {
+			var showAnim = $.datepicker._get(inst, 'showAnim');
+			var duration = $.datepicker._get(inst, 'duration');
+			var postProcess = function() {
+				$.datepicker._datepickerShowing = true;
+				var cover = inst.dpDiv.find('iframe.ui-datepicker-cover'); // IE6- only
+				if( !! cover.length ){
+					var borders = $.datepicker._getBorders(inst.dpDiv);
+					cover.css({left: -borders[0], top: -borders[1],
+						width: inst.dpDiv.outerWidth(), height: inst.dpDiv.outerHeight()});
+				}
+			};
+			inst.dpDiv.zIndex($(input).zIndex()+1);
+			if ($.effects && $.effects[showAnim])
+				inst.dpDiv.show(showAnim, $.datepicker._get(inst, 'showOptions'), duration, postProcess);
+			else
+				inst.dpDiv[showAnim || 'show']((showAnim ? duration : null), postProcess);
+			if (!showAnim || !duration)
+				postProcess();
+			if (inst.input.is(':visible') && !inst.input.is(':disabled'))
+				inst.input.focus();
+			$.datepicker._curInst = inst;
+		}
+	},
+
+	/* Generate the date picker content. */
+	_updateDatepicker: function(inst) {
+		var self = this;
+		var borders = $.datepicker._getBorders(inst.dpDiv);
+		inst.dpDiv.empty().append(this._generateHTML(inst));
+		var cover = inst.dpDiv.find('iframe.ui-datepicker-cover'); // IE6- only
+		if( !!cover.length ){ //avoid call to outerXXXX() when not in IE6
+			cover.css({left: -borders[0], top: -borders[1], width: inst.dpDiv.outerWidth(), height: inst.dpDiv.outerHeight()})
+		}
+		inst.dpDiv.find('button, .ui-datepicker-prev, .ui-datepicker-next, .ui-datepicker-calendar td a')
+				.bind('mouseout', function(){
+					$(this).removeClass('ui-state-hover');
+					if(this.className.indexOf('ui-datepicker-prev') != -1) $(this).removeClass('ui-datepicker-prev-hover');
+					if(this.className.indexOf('ui-datepicker-next') != -1) $(this).removeClass('ui-datepicker-next-hover');
+				})
+				.bind('mouseover', function(){
+					if (!self._isDisabledDatepicker( inst.inline ? inst.dpDiv.parent()[0] : inst.input[0])) {
+						$(this).parents('.ui-datepicker-calendar').find('a').removeClass('ui-state-hover');
+						$(this).addClass('ui-state-hover');
+						if(this.className.indexOf('ui-datepicker-prev') != -1) $(this).addClass('ui-datepicker-prev-hover');
+						if(this.className.indexOf('ui-datepicker-next') != -1) $(this).addClass('ui-datepicker-next-hover');
+					}
+				})
+			.end()
+			.find('.' + this._dayOverClass + ' a')
+				.trigger('mouseover')
+			.end();
+		var numMonths = this._getNumberOfMonths(inst);
+		var cols = numMonths[1];
+		var width = 17;
+		if (cols > 1)
+			inst.dpDiv.addClass('ui-datepicker-multi-' + cols).css('width', (width * cols) + 'em');
+		else
+			inst.dpDiv.removeClass('ui-datepicker-multi-2 ui-datepicker-multi-3 ui-datepicker-multi-4').width('');
+		inst.dpDiv[(numMonths[0] != 1 || numMonths[1] != 1 ? 'add' : 'remove') +
+			'Class']('ui-datepicker-multi');
+		inst.dpDiv[(this._get(inst, 'isRTL') ? 'add' : 'remove') +
+			'Class']('ui-datepicker-rtl');
+		if (inst == $.datepicker._curInst && $.datepicker._datepickerShowing && inst.input &&
+				// #6694 - don't focus the input if it's already focused
+				// this breaks the change event in IE
+				inst.input.is(':visible') && !inst.input.is(':disabled') && inst.input[0] != document.activeElement)
+			inst.input.focus();
+		// deffered render of the years select (to avoid flashes on Firefox) 
+		if( inst.yearshtml ){
+			var origyearshtml = inst.yearshtml;
+			setTimeout(function(){
+				//assure that inst.yearshtml didn't change.
+				if( origyearshtml === inst.yearshtml ){
+					inst.dpDiv.find('select.ui-datepicker-year:first').replaceWith(inst.yearshtml);
+				}
+				origyearshtml = inst.yearshtml = null;
+			}, 0);
+		}
+	},
+
+	/* Retrieve the size of left and top borders for an element.
+	   @param  elem  (jQuery object) the element of interest
+	   @return  (number[2]) the left and top borders */
+	_getBorders: function(elem) {
+		var convert = function(value) {
+			return {thin: 1, medium: 2, thick: 3}[value] || value;
+		};
+		return [parseFloat(convert(elem.css('border-left-width'))),
+			parseFloat(convert(elem.css('border-top-width')))];
+	},
+
+	/* Check positioning to remain on screen. */
+	_checkOffset: function(inst, offset, isFixed) {
+		var dpWidth = inst.dpDiv.outerWidth();
+		var dpHeight = inst.dpDiv.outerHeight();
+		var inputWidth = inst.input ? inst.input.outerWidth() : 0;
+		var inputHeight = inst.input ? inst.input.outerHeight() : 0;
+		var viewWidth = document.documentElement.clientWidth + $(document).scrollLeft();
+		var viewHeight = document.documentElement.clientHeight + $(document).scrollTop();
+
+		offset.left -= (this._get(inst, 'isRTL') ? (dpWidth - inputWidth) : 0);
+		offset.left -= (isFixed && offset.left == inst.input.offset().left) ? $(document).scrollLeft() : 0;
+		offset.top -= (isFixed && offset.top == (inst.input.offset().top + inputHeight)) ? $(document).scrollTop() : 0;
+
+		// now check if datepicker is showing outside window viewport - move to a better place if so.
+		offset.left -= Math.min(offset.left, (offset.left + dpWidth > viewWidth && viewWidth > dpWidth) ?
+			Math.abs(offset.left + dpWidth - viewWidth) : 0);
+		offset.top -= Math.min(offset.top, (offset.top + dpHeight > viewHeight && viewHeight > dpHeight) ?
+			Math.abs(dpHeight + inputHeight) : 0);
+
+		return offset;
+	},
+
+	/* Find an object's position on the screen. */
+	_findPos: function(obj) {
+		var inst = this._getInst(obj);
+		var isRTL = this._get(inst, 'isRTL');
+        while (obj && (obj.type == 'hidden' || obj.nodeType != 1 || $.expr.filters.hidden(obj))) {
+            obj = obj[isRTL ? 'previousSibling' : 'nextSibling'];
+        }
+        var position = $(obj).offset();
+	    return [position.left, position.top];
+	},
+
+	/* Hide the date picker from view.
+	   @param  input  element - the input field attached to the date picker */
+	_hideDatepicker: function(input) {
+		var inst = this._curInst;
+		if (!inst || (input && inst != $.data(input, PROP_NAME)))
+			return;
+		if (this._datepickerShowing) {
+			var showAnim = this._get(inst, 'showAnim');
+			var duration = this._get(inst, 'duration');
+			var postProcess = function() {
+				$.datepicker._tidyDialog(inst);
+				this._curInst = null;
+			};
+			if ($.effects && $.effects[showAnim])
+				inst.dpDiv.hide(showAnim, $.datepicker._get(inst, 'showOptions'), duration, postProcess);
+			else
+				inst.dpDiv[(showAnim == 'slideDown' ? 'slideUp' :
+					(showAnim == 'fadeIn' ? 'fadeOut' : 'hide'))]((showAnim ? duration : null), postProcess);
+			if (!showAnim)
+				postProcess();
+			var onClose = this._get(inst, 'onClose');
+			if (onClose)
+				onClose.apply((inst.input ? inst.input[0] : null),
+					[(inst.input ? inst.input.val() : ''), inst]);  // trigger custom callback
+			this._datepickerShowing = false;
+			this._lastInput = null;
+			if (this._inDialog) {
+				this._dialogInput.css({ position: 'absolute', left: '0', top: '-100px' });
+				if ($.blockUI) {
+					$.unblockUI();
+					$('body').append(this.dpDiv);
+				}
+			}
+			this._inDialog = false;
+		}
+	},
+
+	/* Tidy up after a dialog display. */
+	_tidyDialog: function(inst) {
+		inst.dpDiv.removeClass(this._dialogClass).unbind('.ui-datepicker-calendar');
+	},
+
+	/* Close date picker if clicked elsewhere. */
+	_checkExternalClick: function(event) {
+		if (!$.datepicker._curInst)
+			return;
+		var $target = $(event.target);
+		if ($target[0].id != $.datepicker._mainDivId &&
+				$target.parents('#' + $.datepicker._mainDivId).length == 0 &&
+				!$target.hasClass($.datepicker.markerClassName) &&
+				!$target.hasClass($.datepicker._triggerClass) &&
+				$.datepicker._datepickerShowing && !($.datepicker._inDialog && $.blockUI))
+			$.datepicker._hideDatepicker();
+	},
+
+	/* Adjust one of the date sub-fields. */
+	_adjustDate: function(id, offset, period) {
+		var target = $(id);
+		var inst = this._getInst(target[0]);
+		if (this._isDisabledDatepicker(target[0])) {
+			return;
+		}
+		this._adjustInstDate(inst, offset +
+			(period == 'M' ? this._get(inst, 'showCurrentAtPos') : 0), // undo positioning
+			period);
+		this._updateDatepicker(inst);
+	},
+
+	/* Action for current link. */
+	_gotoToday: function(id) {
+		var target = $(id);
+		var inst = this._getInst(target[0]);
+		if (this._get(inst, 'gotoCurrent') && inst.currentDay) {
+			inst.selectedDay = inst.currentDay;
+			inst.drawMonth = inst.selectedMonth = inst.currentMonth;
+			inst.drawYear = inst.selectedYear = inst.currentYear;
+		}
+		else {
+			var date = new Date();
+			inst.selectedDay = date.getDate();
+			inst.drawMonth = inst.selectedMonth = date.getMonth();
+			inst.drawYear = inst.selectedYear = date.getFullYear();
+		}
+		this._notifyChange(inst);
+		this._adjustDate(target);
+	},
+
+	/* Action for selecting a new month/year. */
+	_selectMonthYear: function(id, select, period) {
+		var target = $(id);
+		var inst = this._getInst(target[0]);
+		inst._selectingMonthYear = false;
+		inst['selected' + (period == 'M' ? 'Month' : 'Year')] =
+		inst['draw' + (period == 'M' ? 'Month' : 'Year')] =
+			parseInt(select.options[select.selectedIndex].value,10);
+		this._notifyChange(inst);
+		this._adjustDate(target);
+	},
+
+	/* Restore input focus after not changing month/year. */
+	_clickMonthYear: function(id) {
+		var target = $(id);
+		var inst = this._getInst(target[0]);
+		if (inst.input && inst._selectingMonthYear) {
+			setTimeout(function() {
+				inst.input.focus();
+			}, 0);
+		}
+		inst._selectingMonthYear = !inst._selectingMonthYear;
+	},
+
+	/* Action for selecting a day. */
+	_selectDay: function(id, month, year, td) {
+		var target = $(id);
+		if ($(td).hasClass(this._unselectableClass) || this._isDisabledDatepicker(target[0])) {
+			return;
+		}
+		var inst = this._getInst(target[0]);
+		inst.selectedDay = inst.currentDay = $('a', td).html();
+		inst.selectedMonth = inst.currentMonth = month;
+		inst.selectedYear = inst.currentYear = year;
+		this._selectDate(id, this._formatDate(inst,
+			inst.currentDay, inst.currentMonth, inst.currentYear));
+	},
+
+	/* Erase the input field and hide the date picker. */
+	_clearDate: function(id) {
+		var target = $(id);
+		var inst = this._getInst(target[0]);
+		this._selectDate(target, '');
+	},
+
+	/* Update the input field with the selected date. */
+	_selectDate: function(id, dateStr) {
+		var target = $(id);
+		var inst = this._getInst(target[0]);
+		dateStr = (dateStr != null ? dateStr : this._formatDate(inst));
+		if (inst.input)
+			inst.input.val(dateStr);
+		this._updateAlternate(inst);
+		var onSelect = this._get(inst, 'onSelect');
+		if (onSelect)
+			onSelect.apply((inst.input ? inst.input[0] : null), [dateStr, inst]);  // trigger custom callback
+		else if (inst.input)
+			inst.input.trigger('change'); // fire the change event
+		if (inst.inline)
+			this._updateDatepicker(inst);
+		else {
+			this._hideDatepicker();
+			this._lastInput = inst.input[0];
+			if (typeof(inst.input[0]) != 'object')
+				inst.input.focus(); // restore focus
+			this._lastInput = null;
+		}
+	},
+
+	/* Update any alternate field to synchronise with the main field. */
+	_updateAlternate: function(inst) {
+		var altField = this._get(inst, 'altField');
+		if (altField) { // update alternate field too
+			var altFormat = this._get(inst, 'altFormat') || this._get(inst, 'dateFormat');
+			var date = this._getDate(inst);
+			var dateStr = this.formatDate(altFormat, date, this._getFormatConfig(inst));
+			$(altField).each(function() { $(this).val(dateStr); });
+		}
+	},
+
+	/* Set as beforeShowDay function to prevent selection of weekends.
+	   @param  date  Date - the date to customise
+	   @return [boolean, string] - is this date selectable?, what is its CSS class? */
+	noWeekends: function(date) {
+		var day = date.getDay();
+		return [(day > 0 && day < 6), ''];
+	},
+
+	/* Set as calculateWeek to determine the week of the year based on the ISO 8601 definition.
+	   @param  date  Date - the date to get the week for
+	   @return  number - the number of the week within the year that contains this date */
+	iso8601Week: function(date) {
+		var checkDate = new Date(date.getTime());
+		// Find Thursday of this week starting on Monday
+		checkDate.setDate(checkDate.getDate() + 4 - (checkDate.getDay() || 7));
+		var time = checkDate.getTime();
+		checkDate.setMonth(0); // Compare with Jan 1
+		checkDate.setDate(1);
+		return Math.floor(Math.round((time - checkDate) / 86400000) / 7) + 1;
+	},
+
+	/* Parse a string value into a date object.
+	   See formatDate below for the possible formats.
+
+	   @param  format    string - the expected format of the date
+	   @param  value     string - the date in the above format
+	   @param  settings  Object - attributes include:
+	                     shortYearCutoff  number - the cutoff year for determining the century (optional)
+	                     dayNamesShort    string[7] - abbreviated names of the days from Sunday (optional)
+	                     dayNames         string[7] - names of the days from Sunday (optional)
+	                     monthNamesShort  string[12] - abbreviated names of the months (optional)
+	                     monthNames       string[12] - names of the months (optional)
+	   @return  Date - the extracted date value or null if value is blank */
+	parseDate: function (format, value, settings) {
+		if (format == null || value == null)
+			throw 'Invalid arguments';
+		value = (typeof value == 'object' ? value.toString() : value + '');
+		if (value == '')
+			return null;
+		var shortYearCutoff = (settings ? settings.shortYearCutoff : null) || this._defaults.shortYearCutoff;
+		shortYearCutoff = (typeof shortYearCutoff != 'string' ? shortYearCutoff :
+				new Date().getFullYear() % 100 + parseInt(shortYearCutoff, 10));
+		var dayNamesShort = (settings ? settings.dayNamesShort : null) || this._defaults.dayNamesShort;
+		var dayNames = (settings ? settings.dayNames : null) || this._defaults.dayNames;
+		var monthNamesShort = (settings ? settings.monthNamesShort : null) || this._defaults.monthNamesShort;
+		var monthNames = (settings ? settings.monthNames : null) || this._defaults.monthNames;
+		var year = -1;
+		var month = -1;
+		var day = -1;
+		var doy = -1;
+		var literal = false;
+		// Check whether a format character is doubled
+		var lookAhead = function(match) {
+			var matches = (iFormat + 1 < format.length && format.charAt(iFormat + 1) == match);
+			if (matches)
+				iFormat++;
+			return matches;
+		};
+		// Extract a number from the string value
+		var getNumber = function(match) {
+			var isDoubled = lookAhead(match);
+			var size = (match == '@' ? 14 : (match == '!' ? 20 :
+				(match == 'y' && isDoubled ? 4 : (match == 'o' ? 3 : 2))));
+			var digits = new RegExp('^\\d{1,' + size + '}');
+			var num = value.substring(iValue).match(digits);
+			if (!num)
+				throw 'Missing number at position ' + iValue;
+			iValue += num[0].length;
+			return parseInt(num[0], 10);
+		};
+		// Extract a name from the string value and convert to an index
+		var getName = function(match, shortNames, longNames) {
+			var names = (lookAhead(match) ? longNames : shortNames);
+			for (var i = 0; i < names.length; i++) {
+				if (value.substr(iValue, names[i].length).toLowerCase() == names[i].toLowerCase()) {
+					iValue += names[i].length;
+					return i + 1;
+				}
+			}
+			throw 'Unknown name at position ' + iValue;
+		};
+		// Confirm that a literal character matches the string value
+		var checkLiteral = function() {
+			if (value.charAt(iValue) != format.charAt(iFormat))
+				throw 'Unexpected literal at position ' + iValue;
+			iValue++;
+		};
+		var iValue = 0;
+		for (var iFormat = 0; iFormat < format.length; iFormat++) {
+			if (literal)
+				if (format.charAt(iFormat) == "'" && !lookAhead("'"))
+					literal = false;
+				else
+					checkLiteral();
+			else
+				switch (format.charAt(iFormat)) {
+					case 'd':
+						day = getNumber('d');
+						break;
+					case 'D':
+						getName('D', dayNamesShort, dayNames);
+						break;
+					case 'o':
+						doy = getNumber('o');
+						break;
+					case 'm':
+						month = getNumber('m');
+						break;
+					case 'M':
+						month = getName('M', monthNamesShort, monthNames);
+						break;
+					case 'y':
+						year = getNumber('y');
+						break;
+					case '@':
+						var date = new Date(getNumber('@'));
+						year = date.getFullYear();
+						month = date.getMonth() + 1;
+						day = date.getDate();
+						break;
+					case '!':
+						var date = new Date((getNumber('!') - this._ticksTo1970) / 10000);
+						year = date.getFullYear();
+						month = date.getMonth() + 1;
+						day = date.getDate();
+						break;
+					case "'":
+						if (lookAhead("'"))
+							checkLiteral();
+						else
+							literal = true;
+						break;
+					default:
+						checkLiteral();
+				}
+		}
+		if (year == -1)
+			year = new Date().getFullYear();
+		else if (year < 100)
+			year += new Date().getFullYear() - new Date().getFullYear() % 100 +
+				(year <= shortYearCutoff ? 0 : -100);
+		if (doy > -1) {
+			month = 1;
+			day = doy;
+			do {
+				var dim = this._getDaysInMonth(year, month - 1);
+				if (day <= dim)
+					break;
+				month++;
+				day -= dim;
+			} while (true);
+		}
+		var date = this._daylightSavingAdjust(new Date(year, month - 1, day));
+		if (date.getFullYear() != year || date.getMonth() + 1 != month || date.getDate() != day)
+			throw 'Invalid date'; // E.g. 31/02/*
+		return date;
+	},
+
+	/* Standard date formats. */
+	ATOM: 'yy-mm-dd', // RFC 3339 (ISO 8601)
+	COOKIE: 'D, dd M yy',
+	ISO_8601: 'yy-mm-dd',
+	RFC_822: 'D, d M y',
+	RFC_850: 'DD, dd-M-y',
+	RFC_1036: 'D, d M y',
+	RFC_1123: 'D, d M yy',
+	RFC_2822: 'D, d M yy',
+	RSS: 'D, d M y', // RFC 822
+	TICKS: '!',
+	TIMESTAMP: '@',
+	W3C: 'yy-mm-dd', // ISO 8601
+
+	_ticksTo1970: (((1970 - 1) * 365 + Math.floor(1970 / 4) - Math.floor(1970 / 100) +
+		Math.floor(1970 / 400)) * 24 * 60 * 60 * 10000000),
+
+	/* Format a date object into a string value.
+	   The format can be combinations of the following:
+	   d  - day of month (no leading zero)
+	   dd - day of month (two digit)
+	   o  - day of year (no leading zeros)
+	   oo - day of year (three digit)
+	   D  - day name short
+	   DD - day name long
+	   m  - month of year (no leading zero)
+	   mm - month of year (two digit)
+	   M  - month name short
+	   MM - month name long
+	   y  - year (two digit)
+	   yy - year (four digit)
+	   @ - Unix timestamp (ms since 01/01/1970)
+	   ! - Windows ticks (100ns since 01/01/0001)
+	   '...' - literal text
+	   '' - single quote
+
+	   @param  format    string - the desired format of the date
+	   @param  date      Date - the date value to format
+	   @param  settings  Object - attributes include:
+	                     dayNamesShort    string[7] - abbreviated names of the days from Sunday (optional)
+	                     dayNames         string[7] - names of the days from Sunday (optional)
+	                     monthNamesShort  string[12] - abbreviated names of the months (optional)
+	                     monthNames       string[12] - names of the months (optional)
+	   @return  string - the date in the above format */
+	formatDate: function (format, date, settings) {
+		if (!date)
+			return '';
+		var dayNamesShort = (settings ? settings.dayNamesShort : null) || this._defaults.dayNamesShort;
+		var dayNames = (settings ? settings.dayNames : null) || this._defaults.dayNames;
+		var monthNamesShort = (settings ? settings.monthNamesShort : null) || this._defaults.monthNamesShort;
+		var monthNames = (settings ? settings.monthNames : null) || this._defaults.monthNames;
+		// Check whether a format character is doubled
+		var lookAhead = function(match) {
+			var matches = (iFormat + 1 < format.length && format.charAt(iFormat + 1) == match);
+			if (matches)
+				iFormat++;
+			return matches;
+		};
+		// Format a number, with leading zero if necessary
+		var formatNumber = function(match, value, len) {
+			var num = '' + value;
+			if (lookAhead(match))
+				while (num.length < len)
+					num = '0' + num;
+			return num;
+		};
+		// Format a name, short or long as requested
+		var formatName = function(match, value, shortNames, longNames) {
+			return (lookAhead(match) ? longNames[value] : shortNames[value]);
+		};
+		var output = '';
+		var literal = false;
+		if (date)
+			for (var iFormat = 0; iFormat < format.length; iFormat++) {
+				if (literal)
+					if (format.charAt(iFormat) == "'" && !lookAhead("'"))
+						literal = false;
+					else
+						output += format.charAt(iFormat);
+				else
+					switch (format.charAt(iFormat)) {
+						case 'd':
+							output += formatNumber('d', date.getDate(), 2);
+							break;
+						case 'D':
+							output += formatName('D', date.getDay(), dayNamesShort, dayNames);
+							break;
+						case 'o':
+							output += formatNumber('o',
+								(date.getTime() - new Date(date.getFullYear(), 0, 0).getTime()) / 86400000, 3);
+							break;
+						case 'm':
+							output += formatNumber('m', date.getMonth() + 1, 2);
+							break;
+						case 'M':
+							output += formatName('M', date.getMonth(), monthNamesShort, monthNames);
+							break;
+						case 'y':
+							output += (lookAhead('y') ? date.getFullYear() :
+								(date.getYear() % 100 < 10 ? '0' : '') + date.getYear() % 100);
+							break;
+						case '@':
+							output += date.getTime();
+							break;
+						case '!':
+							output += date.getTime() * 10000 + this._ticksTo1970;
+							break;
+						case "'":
+							if (lookAhead("'"))
+								output += "'";
+							else
+								literal = true;
+							break;
+						default:
+							output += format.charAt(iFormat);
+					}
+			}
+		return output;
+	},
+
+	/* Extract all possible characters from the date format. */
+	_possibleChars: function (format) {
+		var chars = '';
+		var literal = false;
+		// Check whether a format character is doubled
+		var lookAhead = function(match) {
+			var matches = (iFormat + 1 < format.length && format.charAt(iFormat + 1) == match);
+			if (matches)
+				iFormat++;
+			return matches;
+		};
+		for (var iFormat = 0; iFormat < format.length; iFormat++)
+			if (literal)
+				if (format.charAt(iFormat) == "'" && !lookAhead("'"))
+					literal = false;
+				else
+					chars += format.charAt(iFormat);
+			else
+				switch (format.charAt(iFormat)) {
+					case 'd': case 'm': case 'y': case '@':
+						chars += '0123456789';
+						break;
+					case 'D': case 'M':
+						return null; // Accept anything
+					case "'":
+						if (lookAhead("'"))
+							chars += "'";
+						else
+							literal = true;
+						break;
+					default:
+						chars += format.charAt(iFormat);
+				}
+		return chars;
+	},
+
+	/* Get a setting value, defaulting if necessary. */
+	_get: function(inst, name) {
+		return inst.settings[name] !== undefined ?
+			inst.settings[name] : this._defaults[name];
+	},
+
+	/* Parse existing date and initialise date picker. */
+	_setDateFromField: function(inst, noDefault) {
+		if (inst.input.val() == inst.lastVal) {
+			return;
+		}
+		var dateFormat = this._get(inst, 'dateFormat');
+		var dates = inst.lastVal = inst.input ? inst.input.val() : null;
+		var date, defaultDate;
+		date = defaultDate = this._getDefaultDate(inst);
+		var settings = this._getFormatConfig(inst);
+		try {
+			date = this.parseDate(dateFormat, dates, settings) || defaultDate;
+		} catch (event) {
+			this.log(event);
+			dates = (noDefault ? '' : dates);
+		}
+		inst.selectedDay = date.getDate();
+		inst.drawMonth = inst.selectedMonth = date.getMonth();
+		inst.drawYear = inst.selectedYear = date.getFullYear();
+		inst.currentDay = (dates ? date.getDate() : 0);
+		inst.currentMonth = (dates ? date.getMonth() : 0);
+		inst.currentYear = (dates ? date.getFullYear() : 0);
+		this._adjustInstDate(inst);
+	},
+
+	/* Retrieve the default date shown on opening. */
+	_getDefaultDate: function(inst) {
+		return this._restrictMinMax(inst,
+			this._determineDate(inst, this._get(inst, 'defaultDate'), new Date()));
+	},
+
+	/* A date may be specified as an exact value or a relative one. */
+	_determineDate: function(inst, date, defaultDate) {
+		var offsetNumeric = function(offset) {
+			var date = new Date();
+			date.setDate(date.getDate() + offset);
+			return date;
+		};
+		var offsetString = function(offset) {
+			try {
+				return $.datepicker.parseDate($.datepicker._get(inst, 'dateFormat'),
+					offset, $.datepicker._getFormatConfig(inst));
+			}
+			catch (e) {
+				// Ignore
+			}
+			var date = (offset.toLowerCase().match(/^c/) ?
+				$.datepicker._getDate(inst) : null) || new Date();
+			var year = date.getFullYear();
+			var month = date.getMonth();
+			var day = date.getDate();
+			var pattern = /([+-]?[0-9]+)\s*(d|D|w|W|m|M|y|Y)?/g;
+			var matches = pattern.exec(offset);
+			while (matches) {
+				switch (matches[2] || 'd') {
+					case 'd' : case 'D' :
+						day += parseInt(matches[1],10); break;
+					case 'w' : case 'W' :
+						day += parseInt(matches[1],10) * 7; break;
+					case 'm' : case 'M' :
+						month += parseInt(matches[1],10);
+						day = Math.min(day, $.datepicker._getDaysInMonth(year, month));
+						break;
+					case 'y': case 'Y' :
+						year += parseInt(matches[1],10);
+						day = Math.min(day, $.datepicker._getDaysInMonth(year, month));
+						break;
+				}
+				matches = pattern.exec(offset);
+			}
+			return new Date(year, month, day);
+		};
+		var newDate = (date == null || date === '' ? defaultDate : (typeof date == 'string' ? offsetString(date) :
+			(typeof date == 'number' ? (isNaN(date) ? defaultDate : offsetNumeric(date)) : new Date(date.getTime()))));
+		newDate = (newDate && newDate.toString() == 'Invalid Date' ? defaultDate : newDate);
+		if (newDate) {
+			newDate.setHours(0);
+			newDate.setMinutes(0);
+			newDate.setSeconds(0);
+			newDate.setMilliseconds(0);
+		}
+		return this._daylightSavingAdjust(newDate);
+	},
+
+	/* Handle switch to/from daylight saving.
+	   Hours may be non-zero on daylight saving cut-over:
+	   > 12 when midnight changeover, but then cannot generate
+	   midnight datetime, so jump to 1AM, otherwise reset.
+	   @param  date  (Date) the date to check
+	   @return  (Date) the corrected date */
+	_daylightSavingAdjust: function(date) {
+		if (!date) return null;
+		date.setHours(date.getHours() > 12 ? date.getHours() + 2 : 0);
+		return date;
+	},
+
+	/* Set the date(s) directly. */
+	_setDate: function(inst, date, noChange) {
+		var clear = !date;
+		var origMonth = inst.selectedMonth;
+		var origYear = inst.selectedYear;
+		var newDate = this._restrictMinMax(inst, this._determineDate(inst, date, new Date()));
+		inst.selectedDay = inst.currentDay = newDate.getDate();
+		inst.drawMonth = inst.selectedMonth = inst.currentMonth = newDate.getMonth();
+		inst.drawYear = inst.selectedYear = inst.currentYear = newDate.getFullYear();
+		if ((origMonth != inst.selectedMonth || origYear != inst.selectedYear) && !noChange)
+			this._notifyChange(inst);
+		this._adjustInstDate(inst);
+		if (inst.input) {
+			inst.input.val(clear ? '' : this._formatDate(inst));
+		}
+	},
+
+	/* Retrieve the date(s) directly. */
+	_getDate: function(inst) {
+		var startDate = (!inst.currentYear || (inst.input && inst.input.val() == '') ? null :
+			this._daylightSavingAdjust(new Date(
+			inst.currentYear, inst.currentMonth, inst.currentDay)));
+			return startDate;
+	},
+
+	/* Generate the HTML for the current state of the date picker. */
+	_generateHTML: function(inst) {
+		var today = new Date();
+		today = this._daylightSavingAdjust(
+			new Date(today.getFullYear(), today.getMonth(), today.getDate())); // clear time
+		var isRTL = this._get(inst, 'isRTL');
+		var showButtonPanel = this._get(inst, 'showButtonPanel');
+		var hideIfNoPrevNext = this._get(inst, 'hideIfNoPrevNext');
+		var navigationAsDateFormat = this._get(inst, 'navigationAsDateFormat');
+		var numMonths = this._getNumberOfMonths(inst);
+		var showCurrentAtPos = this._get(inst, 'showCurrentAtPos');
+		var stepMonths = this._get(inst, 'stepMonths');
+		var isMultiMonth = (numMonths[0] != 1 || numMonths[1] != 1);
+		var currentDate = this._daylightSavingAdjust((!inst.currentDay ? new Date(9999, 9, 9) :
+			new Date(inst.currentYear, inst.currentMonth, inst.currentDay)));
+		var minDate = this._getMinMaxDate(inst, 'min');
+		var maxDate = this._getMinMaxDate(inst, 'max');
+		var drawMonth = inst.drawMonth - showCurrentAtPos;
+		var drawYear = inst.drawYear;
+		if (drawMonth < 0) {
+			drawMonth += 12;
+			drawYear--;
+		}
+		if (maxDate) {
+			var maxDraw = this._daylightSavingAdjust(new Date(maxDate.getFullYear(),
+				maxDate.getMonth() - (numMonths[0] * numMonths[1]) + 1, maxDate.getDate()));
+			maxDraw = (minDate && maxDraw < minDate ? minDate : maxDraw);
+			while (this._daylightSavingAdjust(new Date(drawYear, drawMonth, 1)) > maxDraw) {
+				drawMonth--;
+				if (drawMonth < 0) {
+					drawMonth = 11;
+					drawYear--;
+				}
+			}
+		}
+		inst.drawMonth = drawMonth;
+		inst.drawYear = drawYear;
+		var prevText = this._get(inst, 'prevText');
+		prevText = (!navigationAsDateFormat ? prevText : this.formatDate(prevText,
+			this._daylightSavingAdjust(new Date(drawYear, drawMonth - stepMonths, 1)),
+			this._getFormatConfig(inst)));
+		var prev = (this._canAdjustMonth(inst, -1, drawYear, drawMonth) ?
+			'<a class="ui-datepicker-prev ui-corner-all" onclick="DP_jQuery_' + dpuuid +
+			'.datepicker._adjustDate(\'#' + inst.id + '\', -' + stepMonths + ', \'M\');"' +
+			' title="' + prevText + '"><span class="ui-icon ui-icon-circle-triangle-' + ( isRTL ? 'e' : 'w') + '">' + prevText + '</span></a>' :
+			(hideIfNoPrevNext ? '' : '<a class="ui-datepicker-prev ui-corner-all ui-state-disabled" title="'+ prevText +'"><span class="ui-icon ui-icon-circle-triangle-' + ( isRTL ? 'e' : 'w') + '">' + prevText + '</span></a>'));
+		var nextText = this._get(inst, 'nextText');
+		nextText = (!navigationAsDateFormat ? nextText : this.formatDate(nextText,
+			this._daylightSavingAdjust(new Date(drawYear, drawMonth + stepMonths, 1)),
+			this._getFormatConfig(inst)));
+		var next = (this._canAdjustMonth(inst, +1, drawYear, drawMonth) ?
+			'<a class="ui-datepicker-next ui-corner-all" onclick="DP_jQuery_' + dpuuid +
+			'.datepicker._adjustDate(\'#' + inst.id + '\', +' + stepMonths + ', \'M\');"' +
+			' title="' + nextText + '"><span class="ui-icon ui-icon-circle-triangle-' + ( isRTL ? 'w' : 'e') + '">' + nextText + '</span></a>' :
+			(hideIfNoPrevNext ? '' : '<a class="ui-datepicker-next ui-corner-all ui-state-disabled" title="'+ nextText + '"><span class="ui-icon ui-icon-circle-triangle-' + ( isRTL ? 'w' : 'e') + '">' + nextText + '</span></a>'));
+		var currentText = this._get(inst, 'currentText');
+		var gotoDate = (this._get(inst, 'gotoCurrent') && inst.currentDay ? currentDate : today);
+		currentText = (!navigationAsDateFormat ? currentText :
+			this.formatDate(currentText, gotoDate, this._getFormatConfig(inst)));
+		var controls = (!inst.inline ? '<button type="button" class="ui-datepicker-close ui-state-default ui-priority-primary ui-corner-all" onclick="DP_jQuery_' + dpuuid +
+			'.datepicker._hideDatepicker();">' + this._get(inst, 'closeText') + '</button>' : '');
+		var buttonPanel = (showButtonPanel) ? '<div class="ui-datepicker-buttonpane ui-widget-content">' + (isRTL ? controls : '') +
+			(this._isInRange(inst, gotoDate) ? '<button type="button" class="ui-datepicker-current ui-state-default ui-priority-secondary ui-corner-all" onclick="DP_jQuery_' + dpuuid +
+			'.datepicker._gotoToday(\'#' + inst.id + '\');"' +
+			'>' + currentText + '</button>' : '') + (isRTL ? '' : controls) + '</div>' : '';
+		var firstDay = parseInt(this._get(inst, 'firstDay'),10);
+		firstDay = (isNaN(firstDay) ? 0 : firstDay);
+		var showWeek = this._get(inst, 'showWeek');
+		var dayNames = this._get(inst, 'dayNames');
+		var dayNamesShort = this._get(inst, 'dayNamesShort');
+		var dayNamesMin = this._get(inst, 'dayNamesMin');
+		var monthNames = this._get(inst, 'monthNames');
+		var monthNamesShort = this._get(inst, 'monthNamesShort');
+		var beforeShowDay = this._get(inst, 'beforeShowDay');
+		var showOtherMonths = this._get(inst, 'showOtherMonths');
+		var selectOtherMonths = this._get(inst, 'selectOtherMonths');
+		var calculateWeek = this._get(inst, 'calculateWeek') || this.iso8601Week;
+		var defaultDate = this._getDefaultDate(inst);
+		var html = '';
+		for (var row = 0; row < numMonths[0]; row++) {
+			var group = '';
+			for (var col = 0; col < numMonths[1]; col++) {
+				var selectedDate = this._daylightSavingAdjust(new Date(drawYear, drawMonth, inst.selectedDay));
+				var cornerClass = ' ui-corner-all';
+				var calender = '';
+				if (isMultiMonth) {
+					calender += '<div class="ui-datepicker-group';
+					if (numMonths[1] > 1)
+						switch (col) {
+							case 0: calender += ' ui-datepicker-group-first';
+								cornerClass = ' ui-corner-' + (isRTL ? 'right' : 'left'); break;
+							case numMonths[1]-1: calender += ' ui-datepicker-group-last';
+								cornerClass = ' ui-corner-' + (isRTL ? 'left' : 'right'); break;
+							default: calender += ' ui-datepicker-group-middle'; cornerClass = ''; break;
+						}
+					calender += '">';
+				}
+				calender += '<div class="ui-datepicker-header ui-widget-header ui-helper-clearfix' + cornerClass + '">' +
+					(/all|left/.test(cornerClass) && row == 0 ? (isRTL ? next : prev) : '') +
+					(/all|right/.test(cornerClass) && row == 0 ? (isRTL ? prev : next) : '') +
+					this._generateMonthYearHeader(inst, drawMonth, drawYear, minDate, maxDate,
+					row > 0 || col > 0, monthNames, monthNamesShort) + // draw month headers
+					'</div><table class="ui-datepicker-calendar"><thead>' +
+					'<tr>';
+				var thead = (showWeek ? '<th class="ui-datepicker-week-col">' + this._get(inst, 'weekHeader') + '</th>' : '');
+				for (var dow = 0; dow < 7; dow++) { // days of the week
+					var day = (dow + firstDay) % 7;
+					thead += '<th' + ((dow + firstDay + 6) % 7 >= 5 ? ' class="ui-datepicker-week-end"' : '') + '>' +
+						'<span title="' + dayNames[day] + '">' + dayNamesMin[day] + '</span></th>';
+				}
+				calender += thead + '</tr></thead><tbody>';
+				var daysInMonth = this._getDaysInMonth(drawYear, drawMonth);
+				if (drawYear == inst.selectedYear && drawMonth == inst.selectedMonth)
+					inst.selectedDay = Math.min(inst.selectedDay, daysInMonth);
+				var leadDays = (this._getFirstDayOfMonth(drawYear, drawMonth) - firstDay + 7) % 7;
+				var numRows = (isMultiMonth ? 6 : Math.ceil((leadDays + daysInMonth) / 7)); // calculate the number of rows to generate
+				var printDate = this._daylightSavingAdjust(new Date(drawYear, drawMonth, 1 - leadDays));
+				for (var dRow = 0; dRow < numRows; dRow++) { // create date picker rows
+					calender += '<tr>';
+					var tbody = (!showWeek ? '' : '<td class="ui-datepicker-week-col">' +
+						this._get(inst, 'calculateWeek')(printDate) + '</td>');
+					for (var dow = 0; dow < 7; dow++) { // create date picker days
+						var daySettings = (beforeShowDay ?
+							beforeShowDay.apply((inst.input ? inst.input[0] : null), [printDate]) : [true, '']);
+						var otherMonth = (printDate.getMonth() != drawMonth);
+						var unselectable = (otherMonth && !selectOtherMonths) || !daySettings[0] ||
+							(minDate && printDate < minDate) || (maxDate && printDate > maxDate);
+						tbody += '<td class="' +
+							((dow + firstDay + 6) % 7 >= 5 ? ' ui-datepicker-week-end' : '') + // highlight weekends
+							(otherMonth ? ' ui-datepicker-other-month' : '') + // highlight days from other months
+							((printDate.getTime() == selectedDate.getTime() && drawMonth == inst.selectedMonth && inst._keyEvent) || // user pressed key
+							(defaultDate.getTime() == printDate.getTime() && defaultDate.getTime() == selectedDate.getTime()) ?
+							// or defaultDate is current printedDate and defaultDate is selectedDate
+							' ' + this._dayOverClass : '') + // highlight selected day
+							(unselectable ? ' ' + this._unselectableClass + ' ui-state-disabled': '') +  // highlight unselectable days
+							(otherMonth && !showOtherMonths ? '' : ' ' + daySettings[1] + // highlight custom dates
+							(printDate.getTime() == currentDate.getTime() ? ' ' + this._currentClass : '') + // highlight selected day
+							(printDate.getTime() == today.getTime() ? ' ui-datepicker-today' : '')) + '"' + // highlight today (if different)
+							((!otherMonth || showOtherMonths) && daySettings[2] ? ' title="' + daySettings[2] + '"' : '') + // cell title
+							(unselectable ? '' : ' onclick="DP_jQuery_' + dpuuid + '.datepicker._selectDay(\'#' +
+							inst.id + '\',' + printDate.getMonth() + ',' + printDate.getFullYear() + ', this);return false;"') + '>' + // actions
+							(otherMonth && !showOtherMonths ? '&#xa0;' : // display for other months
+							(unselectable ? '<span class="ui-state-default">' + printDate.getDate() + '</span>' : '<a class="ui-state-default' +
+							(printDate.getTime() == today.getTime() ? ' ui-state-highlight' : '') +
+							(printDate.getTime() == currentDate.getTime() ? ' ui-state-active' : '') + // highlight selected day
+							(otherMonth ? ' ui-priority-secondary' : '') + // distinguish dates from other months
+							'" href="#">' + printDate.getDate() + '</a>')) + '</td>'; // display selectable date
+						printDate.setDate(printDate.getDate() + 1);
+						printDate = this._daylightSavingAdjust(printDate);
+					}
+					calender += tbody + '</tr>';
+				}
+				drawMonth++;
+				if (drawMonth > 11) {
+					drawMonth = 0;
+					drawYear++;
+				}
+				calender += '</tbody></table>' + (isMultiMonth ? '</div>' + 
+							((numMonths[0] > 0 && col == numMonths[1]-1) ? '<div class="ui-datepicker-row-break"></div>' : '') : '');
+				group += calender;
+			}
+			html += group;
+		}
+		html += buttonPanel + ($.browser.msie && parseInt($.browser.version,10) < 7 && !inst.inline ?
+			'<iframe src="javascript:false;" class="ui-datepicker-cover" frameborder="0"></iframe>' : '');
+		inst._keyEvent = false;
+		return html;
+	},
+
+	/* Generate the month and year header. */
+	_generateMonthYearHeader: function(inst, drawMonth, drawYear, minDate, maxDate,
+			secondary, monthNames, monthNamesShort) {
+		var changeMonth = this._get(inst, 'changeMonth');
+		var changeYear = this._get(inst, 'changeYear');
+		var showMonthAfterYear = this._get(inst, 'showMonthAfterYear');
+		var html = '<div class="ui-datepicker-title">';
+		var monthHtml = '';
+		// month selection
+		if (secondary || !changeMonth)
+			monthHtml += '<span class="ui-datepicker-month">' + monthNames[drawMonth] + '</span>';
+		else {
+			var inMinYear = (minDate && minDate.getFullYear() == drawYear);
+			var inMaxYear = (maxDate && maxDate.getFullYear() == drawYear);
+			monthHtml += '<select class="ui-datepicker-month" ' +
+				'onchange="DP_jQuery_' + dpuuid + '.datepicker._selectMonthYear(\'#' + inst.id + '\', this, \'M\');" ' +
+				'onclick="DP_jQuery_' + dpuuid + '.datepicker._clickMonthYear(\'#' + inst.id + '\');"' +
+			 	'>';
+			for (var month = 0; month < 12; month++) {
+				if ((!inMinYear || month >= minDate.getMonth()) &&
+						(!inMaxYear || month <= maxDate.getMonth()))
+					monthHtml += '<option value="' + month + '"' +
+						(month == drawMonth ? ' selected="selected"' : '') +
+						'>' + monthNamesShort[month] + '</option>';
+			}
+			monthHtml += '</select>';
+		}
+		if (!showMonthAfterYear)
+			html += monthHtml + (secondary || !(changeMonth && changeYear) ? '&#xa0;' : '');
+		// year selection
+		inst.yearshtml = '';
+		if (secondary || !changeYear)
+			html += '<span class="ui-datepicker-year">' + drawYear + '</span>';
+		else {
+			// determine range of years to display
+			var years = this._get(inst, 'yearRange').split(':');
+			var thisYear = new Date().getFullYear();
+			var determineYear = function(value) {
+				var year = (value.match(/c[+-].*/) ? drawYear + parseInt(value.substring(1), 10) :
+					(value.match(/[+-].*/) ? thisYear + parseInt(value, 10) :
+					parseInt(value, 10)));
+				return (isNaN(year) ? thisYear : year);
+			};
+			var year = determineYear(years[0]);
+			var endYear = Math.max(year, determineYear(years[1] || ''));
+			year = (minDate ? Math.max(year, minDate.getFullYear()) : year);
+			endYear = (maxDate ? Math.min(endYear, maxDate.getFullYear()) : endYear);
+			inst.yearshtml += '<select class="ui-datepicker-year" ' +
+				'onchange="DP_jQuery_' + dpuuid + '.datepicker._selectMonthYear(\'#' + inst.id + '\', this, \'Y\');" ' +
+				'onclick="DP_jQuery_' + dpuuid + '.datepicker._clickMonthYear(\'#' + inst.id + '\');"' +
+				'>';
+			for (; year <= endYear; year++) {
+				inst.yearshtml += '<option value="' + year + '"' +
+					(year == drawYear ? ' selected="selected"' : '') +
+					'>' + year + '</option>';
+			}
+			inst.yearshtml += '</select>';
+			//when showing there is no need for later update
+			if( ! $.browser.mozilla ){
+				html += inst.yearshtml;
+				inst.yearshtml = null;
+			} else {
+				// will be replaced later with inst.yearshtml
+				html += '<select class="ui-datepicker-year"><option value="' + drawYear + '" selected="selected">' + drawYear + '</option></select>';
+			}
+		}
+		html += this._get(inst, 'yearSuffix');
+		if (showMonthAfterYear)
+			html += (secondary || !(changeMonth && changeYear) ? '&#xa0;' : '') + monthHtml;
+		html += '</div>'; // Close datepicker_header
+		return html;
+	},
+
+	/* Adjust one of the date sub-fields. */
+	_adjustInstDate: function(inst, offset, period) {
+		var year = inst.drawYear + (period == 'Y' ? offset : 0);
+		var month = inst.drawMonth + (period == 'M' ? offset : 0);
+		var day = Math.min(inst.selectedDay, this._getDaysInMonth(year, month)) +
+			(period == 'D' ? offset : 0);
+		var date = this._restrictMinMax(inst,
+			this._daylightSavingAdjust(new Date(year, month, day)));
+		inst.selectedDay = date.getDate();
+		inst.drawMonth = inst.selectedMonth = date.getMonth();
+		inst.drawYear = inst.selectedYear = date.getFullYear();
+		if (period == 'M' || period == 'Y')
+			this._notifyChange(inst);
+	},
+
+	/* Ensure a date is within any min/max bounds. */
+	_restrictMinMax: function(inst, date) {
+		var minDate = this._getMinMaxDate(inst, 'min');
+		var maxDate = this._getMinMaxDate(inst, 'max');
+		var newDate = (minDate && date < minDate ? minDate : date);
+		newDate = (maxDate && newDate > maxDate ? maxDate : newDate);
+		return newDate;
+	},
+
+	/* Notify change of month/year. */
+	_notifyChange: function(inst) {
+		var onChange = this._get(inst, 'onChangeMonthYear');
+		if (onChange)
+			onChange.apply((inst.input ? inst.input[0] : null),
+				[inst.selectedYear, inst.selectedMonth + 1, inst]);
+	},
+
+	/* Determine the number of months to show. */
+	_getNumberOfMonths: function(inst) {
+		var numMonths = this._get(inst, 'numberOfMonths');
+		return (numMonths == null ? [1, 1] : (typeof numMonths == 'number' ? [1, numMonths] : numMonths));
+	},
+
+	/* Determine the current maximum date - ensure no time components are set. */
+	_getMinMaxDate: function(inst, minMax) {
+		return this._determineDate(inst, this._get(inst, minMax + 'Date'), null);
+	},
+
+	/* Find the number of days in a given month. */
+	_getDaysInMonth: function(year, month) {
+		return 32 - this._daylightSavingAdjust(new Date(year, month, 32)).getDate();
+	},
+
+	/* Find the day of the week of the first of a month. */
+	_getFirstDayOfMonth: function(year, month) {
+		return new Date(year, month, 1).getDay();
+	},
+
+	/* Determines if we should allow a "next/prev" month display change. */
+	_canAdjustMonth: function(inst, offset, curYear, curMonth) {
+		var numMonths = this._getNumberOfMonths(inst);
+		var date = this._daylightSavingAdjust(new Date(curYear,
+			curMonth + (offset < 0 ? offset : numMonths[0] * numMonths[1]), 1));
+		if (offset < 0)
+			date.setDate(this._getDaysInMonth(date.getFullYear(), date.getMonth()));
+		return this._isInRange(inst, date);
+	},
+
+	/* Is the given date in the accepted range? */
+	_isInRange: function(inst, date) {
+		var minDate = this._getMinMaxDate(inst, 'min');
+		var maxDate = this._getMinMaxDate(inst, 'max');
+		return ((!minDate || date.getTime() >= minDate.getTime()) &&
+			(!maxDate || date.getTime() <= maxDate.getTime()));
+	},
+
+	/* Provide the configuration settings for formatting/parsing. */
+	_getFormatConfig: function(inst) {
+		var shortYearCutoff = this._get(inst, 'shortYearCutoff');
+		shortYearCutoff = (typeof shortYearCutoff != 'string' ? shortYearCutoff :
+			new Date().getFullYear() % 100 + parseInt(shortYearCutoff, 10));
+		return {shortYearCutoff: shortYearCutoff,
+			dayNamesShort: this._get(inst, 'dayNamesShort'), dayNames: this._get(inst, 'dayNames'),
+			monthNamesShort: this._get(inst, 'monthNamesShort'), monthNames: this._get(inst, 'monthNames')};
+	},
+
+	/* Format the given date for display. */
+	_formatDate: function(inst, day, month, year) {
+		if (!day) {
+			inst.currentDay = inst.selectedDay;
+			inst.currentMonth = inst.selectedMonth;
+			inst.currentYear = inst.selectedYear;
+		}
+		var date = (day ? (typeof day == 'object' ? day :
+			this._daylightSavingAdjust(new Date(year, month, day))) :
+			this._daylightSavingAdjust(new Date(inst.currentYear, inst.currentMonth, inst.currentDay)));
+		return this.formatDate(this._get(inst, 'dateFormat'), date, this._getFormatConfig(inst));
+	}
+});
+
+/* jQuery extend now ignores nulls! */
+function extendRemove(target, props) {
+	$.extend(target, props);
+	for (var name in props)
+		if (props[name] == null || props[name] == undefined)
+			target[name] = props[name];
+	return target;
+};
+
+/* Determine whether an object is an array. */
+function isArray(a) {
+	return (a && (($.browser.safari && typeof a == 'object' && a.length) ||
+		(a.constructor && a.constructor.toString().match(/\Array\(\)/))));
+};
+
+/* Invoke the datepicker functionality.
+   @param  options  string - a command, optionally followed by additional parameters or
+                    Object - settings for attaching new datepicker functionality
+   @return  jQuery object */
+$.fn.datepicker = function(options){
+	
+	/* Verify an empty collection wasn't passed - Fixes #6976 */
+	if ( !this.length ) {
+		return this;
+	}
+	
+	/* Initialise the date picker. */
+	if (!$.datepicker.initialized) {
+		$(document).mousedown($.datepicker._checkExternalClick).
+			find('body').append($.datepicker.dpDiv);
+		$.datepicker.initialized = true;
+	}
+
+	var otherArgs = Array.prototype.slice.call(arguments, 1);
+	if (typeof options == 'string' && (options == 'isDisabled' || options == 'getDate' || options == 'widget'))
+		return $.datepicker['_' + options + 'Datepicker'].
+			apply($.datepicker, [this[0]].concat(otherArgs));
+	if (options == 'option' && arguments.length == 2 && typeof arguments[1] == 'string')
+		return $.datepicker['_' + options + 'Datepicker'].
+			apply($.datepicker, [this[0]].concat(otherArgs));
+	return this.each(function() {
+		typeof options == 'string' ?
+			$.datepicker['_' + options + 'Datepicker'].
+				apply($.datepicker, [this].concat(otherArgs)) :
+			$.datepicker._attachDatepicker(this, options);
+	});
+};
+
+$.datepicker = new Datepicker(); // singleton instance
+$.datepicker.initialized = false;
+$.datepicker.uuid = new Date().getTime();
+$.datepicker.version = "1.8.10";
+
+// Workaround for #4055
+// Add another global to avoid noConflict issues with inline event handlers
+window['DP_jQuery_' + dpuuid] = $;
+
+})(jQuery);
+/*
+ * jQuery UI Progressbar 1.8.10
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Progressbar
+ *
+ * Depends:
+ *   jquery.ui.core.js
+ *   jquery.ui.widget.js
+ */
+(function( $, undefined ) {
+
+$.widget( "ui.progressbar", {
+	options: {
+		value: 0,
+		max: 100
+	},
+
+	min: 0,
+
+	_create: function() {
+		this.element
+			.addClass( "ui-progressbar ui-widget ui-widget-content ui-corner-all" )
+			.attr({
+				role: "progressbar",
+				"aria-valuemin": this.min,
+				"aria-valuemax": this.options.max,
+				"aria-valuenow": this._value()
+			});
+
+		this.valueDiv = $( "<div class='ui-progressbar-value ui-widget-header ui-corner-left'></div>" )
+			.appendTo( this.element );
+
+		this.oldValue = this._value();
+		this._refreshValue();
+	},
+
+	destroy: function() {
+		this.element
+			.removeClass( "ui-progressbar ui-widget ui-widget-content ui-corner-all" )
+			.removeAttr( "role" )
+			.removeAttr( "aria-valuemin" )
+			.removeAttr( "aria-valuemax" )
+			.removeAttr( "aria-valuenow" );
+
+		this.valueDiv.remove();
+
+		$.Widget.prototype.destroy.apply( this, arguments );
+	},
+
+	value: function( newValue ) {
+		if ( newValue === undefined ) {
+			return this._value();
+		}
+
+		this._setOption( "value", newValue );
+		return this;
+	},
+
+	_setOption: function( key, value ) {
+		if ( key === "value" ) {
+			this.options.value = value;
+			this._refreshValue();
+			if ( this._value() === this.options.max ) {
+				this._trigger( "complete" );
+			}
+		}
+
+		$.Widget.prototype._setOption.apply( this, arguments );
+	},
+
+	_value: function() {
+		var val = this.options.value;
+		// normalize invalid value
+		if ( typeof val !== "number" ) {
+			val = 0;
+		}
+		return Math.min( this.options.max, Math.max( this.min, val ) );
+	},
+
+	_percentage: function() {
+		return 100 * this._value() / this.options.max;
+	},
+
+	_refreshValue: function() {
+		var value = this.value();
+		var percentage = this._percentage();
+
+		if ( this.oldValue !== value ) {
+			this.oldValue = value;
+			this._trigger( "change" );
+		}
+
+		this.valueDiv
+			.toggleClass( "ui-corner-right", value === this.options.max )
+			.width( percentage.toFixed(0) + "%" );
+		this.element.attr( "aria-valuenow", value );
+	}
+});
+
+$.extend( $.ui.progressbar, {
+	version: "1.8.10"
+});
+
+})( jQuery );
+/*
+ * jQuery UI Effects 1.8.10
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/
+ */
+;jQuery.effects || (function($, undefined) {
+
+$.effects = {};
+
+
+
+/******************************************************************************/
+/****************************** COLOR ANIMATIONS ******************************/
+/******************************************************************************/
+
+// override the animation for color styles
+$.each(['backgroundColor', 'borderBottomColor', 'borderLeftColor',
+	'borderRightColor', 'borderTopColor', 'borderColor', 'color', 'outlineColor'],
+function(i, attr) {
+	$.fx.step[attr] = function(fx) {
+		if (!fx.colorInit) {
+			fx.start = getColor(fx.elem, attr);
+			fx.end = getRGB(fx.end);
+			fx.colorInit = true;
+		}
+
+		fx.elem.style[attr] = 'rgb(' +
+			Math.max(Math.min(parseInt((fx.pos * (fx.end[0] - fx.start[0])) + fx.start[0], 10), 255), 0) + ',' +
+			Math.max(Math.min(parseInt((fx.pos * (fx.end[1] - fx.start[1])) + fx.start[1], 10), 255), 0) + ',' +
+			Math.max(Math.min(parseInt((fx.pos * (fx.end[2] - fx.start[2])) + fx.start[2], 10), 255), 0) + ')';
+	};
+});
+
+// Color Conversion functions from highlightFade
+// By Blair Mitchelmore
+// http://jquery.offput.ca/highlightFade/
+
+// Parse strings looking for color tuples [255,255,255]
+function getRGB(color) {
+		var result;
+
+		// Check if we're already dealing with an array of colors
+		if ( color && color.constructor == Array && color.length == 3 )
+				return color;
+
+		// Look for rgb(num,num,num)
+		if (result = /rgb\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*\)/.exec(color))
+				return [parseInt(result[1],10), parseInt(result[2],10), parseInt(result[3],10)];
+
+		// Look for rgb(num%,num%,num%)
+		if (result = /rgb\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*\)/.exec(color))
+				return [parseFloat(result[1])*2.55, parseFloat(result[2])*2.55, parseFloat(result[3])*2.55];
+
+		// Look for #a0b1c2
+		if (result = /#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/.exec(color))
+				return [parseInt(result[1],16), parseInt(result[2],16), parseInt(result[3],16)];
+
+		// Look for #fff
+		if (result = /#([a-fA-F0-9])([a-fA-F0-9])([a-fA-F0-9])/.exec(color))
+				return [parseInt(result[1]+result[1],16), parseInt(result[2]+result[2],16), parseInt(result[3]+result[3],16)];
+
+		// Look for rgba(0, 0, 0, 0) == transparent in Safari 3
+		if (result = /rgba\(0, 0, 0, 0\)/.exec(color))
+				return colors['transparent'];
+
+		// Otherwise, we're most likely dealing with a named color
+		return colors[$.trim(color).toLowerCase()];
+}
+
+function getColor(elem, attr) {
+		var color;
+
+		do {
+				color = $.curCSS(elem, attr);
+
+				// Keep going until we find an element that has color, or we hit the body
+				if ( color != '' && color != 'transparent' || $.nodeName(elem, "body") )
+						break;
+
+				attr = "backgroundColor";
+		} while ( elem = elem.parentNode );
+
+		return getRGB(color);
+};
+
+// Some named colors to work with
+// From Interface by Stefan Petre
+// http://interface.eyecon.ro/
+
+var colors = {
+	aqua:[0,255,255],
+	azure:[240,255,255],
+	beige:[245,245,220],
+	black:[0,0,0],
+	blue:[0,0,255],
+	brown:[165,42,42],
+	cyan:[0,255,255],
+	darkblue:[0,0,139],
+	darkcyan:[0,139,139],
+	darkgrey:[169,169,169],
+	darkgreen:[0,100,0],
+	darkkhaki:[189,183,107],
+	darkmagenta:[139,0,139],
+	darkolivegreen:[85,107,47],
+	darkorange:[255,140,0],
+	darkorchid:[153,50,204],
+	darkred:[139,0,0],
+	darksalmon:[233,150,122],
+	darkviolet:[148,0,211],
+	fuchsia:[255,0,255],
+	gold:[255,215,0],
+	green:[0,128,0],
+	indigo:[75,0,130],
+	khaki:[240,230,140],
+	lightblue:[173,216,230],
+	lightcyan:[224,255,255],
+	lightgreen:[144,238,144],
+	lightgrey:[211,211,211],
+	lightpink:[255,182,193],
+	lightyellow:[255,255,224],
+	lime:[0,255,0],
+	magenta:[255,0,255],
+	maroon:[128,0,0],
+	navy:[0,0,128],
+	olive:[128,128,0],
+	orange:[255,165,0],
+	pink:[255,192,203],
+	purple:[128,0,128],
+	violet:[128,0,128],
+	red:[255,0,0],
+	silver:[192,192,192],
+	white:[255,255,255],
+	yellow:[255,255,0],
+	transparent: [255,255,255]
+};
+
+
+
+/******************************************************************************/
+/****************************** CLASS ANIMATIONS ******************************/
+/******************************************************************************/
+
+var classAnimationActions = ['add', 'remove', 'toggle'],
+	shorthandStyles = {
+		border: 1,
+		borderBottom: 1,
+		borderColor: 1,
+		borderLeft: 1,
+		borderRight: 1,
+		borderTop: 1,
+		borderWidth: 1,
+		margin: 1,
+		padding: 1
+	};
+
+function getElementStyles() {
+	var style = document.defaultView
+			? document.defaultView.getComputedStyle(this, null)
+			: this.currentStyle,
+		newStyle = {},
+		key,
+		camelCase;
+
+	// webkit enumerates style porperties
+	if (style && style.length && style[0] && style[style[0]]) {
+		var len = style.length;
+		while (len--) {
+			key = style[len];
+			if (typeof style[key] == 'string') {
+				camelCase = key.replace(/\-(\w)/g, function(all, letter){
+					return letter.toUpperCase();
+				});
+				newStyle[camelCase] = style[key];
+			}
+		}
+	} else {
+		for (key in style) {
+			if (typeof style[key] === 'string') {
+				newStyle[key] = style[key];
+			}
+		}
+	}
+	
+	return newStyle;
+}
+
+function filterStyles(styles) {
+	var name, value;
+	for (name in styles) {
+		value = styles[name];
+		if (
+			// ignore null and undefined values
+			value == null ||
+			// ignore functions (when does this occur?)
+			$.isFunction(value) ||
+			// shorthand styles that need to be expanded
+			name in shorthandStyles ||
+			// ignore scrollbars (break in IE)
+			(/scrollbar/).test(name) ||
+
+			// only colors or values that can be converted to numbers
+			(!(/color/i).test(name) && isNaN(parseFloat(value)))
+		) {
+			delete styles[name];
+		}
+	}
+	
+	return styles;
+}
+
+function styleDifference(oldStyle, newStyle) {
+	var diff = { _: 0 }, // http://dev.jquery.com/ticket/5459
+		name;
+
+	for (name in newStyle) {
+		if (oldStyle[name] != newStyle[name]) {
+			diff[name] = newStyle[name];
+		}
+	}
+
+	return diff;
+}
+
+$.effects.animateClass = function(value, duration, easing, callback) {
+	if ($.isFunction(easing)) {
+		callback = easing;
+		easing = null;
+	}
+
+	return this.queue('fx', function() {
+		var that = $(this),
+			originalStyleAttr = that.attr('style') || ' ',
+			originalStyle = filterStyles(getElementStyles.call(this)),
+			newStyle,
+			className = that.attr('className');
+
+		$.each(classAnimationActions, function(i, action) {
+			if (value[action]) {
+				that[action + 'Class'](value[action]);
+			}
+		});
+		newStyle = filterStyles(getElementStyles.call(this));
+		that.attr('className', className);
+
+		that.animate(styleDifference(originalStyle, newStyle), duration, easing, function() {
+			$.each(classAnimationActions, function(i, action) {
+				if (value[action]) { that[action + 'Class'](value[action]); }
+			});
+			// work around bug in IE by clearing the cssText before setting it
+			if (typeof that.attr('style') == 'object') {
+				that.attr('style').cssText = '';
+				that.attr('style').cssText = originalStyleAttr;
+			} else {
+				that.attr('style', originalStyleAttr);
+			}
+			if (callback) { callback.apply(this, arguments); }
+		});
+
+		// $.animate adds a function to the end of the queue
+		// but we want it at the front
+		var queue = $.queue(this),
+			anim = queue.splice(queue.length - 1, 1)[0];
+		queue.splice(1, 0, anim);
+		$.dequeue(this);
+	});
+};
+
+$.fn.extend({
+	_addClass: $.fn.addClass,
+	addClass: function(classNames, speed, easing, callback) {
+		return speed ? $.effects.animateClass.apply(this, [{ add: classNames },speed,easing,callback]) : this._addClass(classNames);
+	},
+
+	_removeClass: $.fn.removeClass,
+	removeClass: function(classNames,speed,easing,callback) {
+		return speed ? $.effects.animateClass.apply(this, [{ remove: classNames },speed,easing,callback]) : this._removeClass(classNames);
+	},
+
+	_toggleClass: $.fn.toggleClass,
+	toggleClass: function(classNames, force, speed, easing, callback) {
+		if ( typeof force == "boolean" || force === undefined ) {
+			if ( !speed ) {
+				// without speed parameter;
+				return this._toggleClass(classNames, force);
+			} else {
+				return $.effects.animateClass.apply(this, [(force?{add:classNames}:{remove:classNames}),speed,easing,callback]);
+			}
+		} else {
+			// without switch parameter;
+			return $.effects.animateClass.apply(this, [{ toggle: classNames },force,speed,easing]);
+		}
+	},
+
+	switchClass: function(remove,add,speed,easing,callback) {
+		return $.effects.animateClass.apply(this, [{ add: add, remove: remove },speed,easing,callback]);
+	}
+});
+
+
+
+/******************************************************************************/
+/*********************************** EFFECTS **********************************/
+/******************************************************************************/
+
+$.extend($.effects, {
+	version: "1.8.10",
+
+	// Saves a set of properties in a data storage
+	save: function(element, set) {
+		for(var i=0; i < set.length; i++) {
+			if(set[i] !== null) element.data("ec.storage."+set[i], element[0].style[set[i]]);
+		}
+	},
+
+	// Restores a set of previously saved properties from a data storage
+	restore: function(element, set) {
+		for(var i=0; i < set.length; i++) {
+			if(set[i] !== null) element.css(set[i], element.data("ec.storage."+set[i]));
+		}
+	},
+
+	setMode: function(el, mode) {
+		if (mode == 'toggle') mode = el.is(':hidden') ? 'show' : 'hide'; // Set for toggle
+		return mode;
+	},
+
+	getBaseline: function(origin, original) { // Translates a [top,left] array into a baseline value
+		// this should be a little more flexible in the future to handle a string & hash
+		var y, x;
+		switch (origin[0]) {
+			case 'top': y = 0; break;
+			case 'middle': y = 0.5; break;
+			case 'bottom': y = 1; break;
+			default: y = origin[0] / original.height;
+		};
+		switch (origin[1]) {
+			case 'left': x = 0; break;
+			case 'center': x = 0.5; break;
+			case 'right': x = 1; break;
+			default: x = origin[1] / original.width;
+		};
+		return {x: x, y: y};
+	},
+
+	// Wraps the element around a wrapper that copies position properties
+	createWrapper: function(element) {
+
+		// if the element is already wrapped, return it
+		if (element.parent().is('.ui-effects-wrapper')) {
+			return element.parent();
+		}
+
+		// wrap the element
+		var props = {
+				width: element.outerWidth(true),
+				height: element.outerHeight(true),
+				'float': element.css('float')
+			},
+			wrapper = $('<div></div>')
+				.addClass('ui-effects-wrapper')
+				.css({
+					fontSize: '100%',
+					background: 'transparent',
+					border: 'none',
+					margin: 0,
+					padding: 0
+				});
+
+		element.wrap(wrapper);
+		wrapper = element.parent(); //Hotfix for jQuery 1.4 since some change in wrap() seems to actually loose the reference to the wrapped element
+
+		// transfer positioning properties to the wrapper
+		if (element.css('position') == 'static') {
+			wrapper.css({ position: 'relative' });
+			element.css({ position: 'relative' });
+		} else {
+			$.extend(props, {
+				position: element.css('position'),
+				zIndex: element.css('z-index')
+			});
+			$.each(['top', 'left', 'bottom', 'right'], function(i, pos) {
+				props[pos] = element.css(pos);
+				if (isNaN(parseInt(props[pos], 10))) {
+					props[pos] = 'auto';
+				}
+			});
+			element.css({position: 'relative', top: 0, left: 0, right: 'auto', bottom: 'auto' });
+		}
+
+		return wrapper.css(props).show();
+	},
+
+	removeWrapper: function(element) {
+		if (element.parent().is('.ui-effects-wrapper'))
+			return element.parent().replaceWith(element);
+		return element;
+	},
+
+	setTransition: function(element, list, factor, value) {
+		value = value || {};
+		$.each(list, function(i, x){
+			unit = element.cssUnit(x);
+			if (unit[0] > 0) value[x] = unit[0] * factor + unit[1];
+		});
+		return value;
+	}
+});
+
+
+function _normalizeArguments(effect, options, speed, callback) {
+	// shift params for method overloading
+	if (typeof effect == 'object') {
+		callback = options;
+		speed = null;
+		options = effect;
+		effect = options.effect;
+	}
+	if ($.isFunction(options)) {
+		callback = options;
+		speed = null;
+		options = {};
+	}
+        if (typeof options == 'number' || $.fx.speeds[options]) {
+		callback = speed;
+		speed = options;
+		options = {};
+	}
+	if ($.isFunction(speed)) {
+		callback = speed;
+		speed = null;
+	}
+
+	options = options || {};
+
+	speed = speed || options.duration;
+	speed = $.fx.off ? 0 : typeof speed == 'number'
+		? speed : speed in $.fx.speeds ? $.fx.speeds[speed] : $.fx.speeds._default;
+
+	callback = callback || options.complete;
+
+	return [effect, options, speed, callback];
+}
+
+function standardSpeed( speed ) {
+	// valid standard speeds
+	if ( !speed || typeof speed === "number" || $.fx.speeds[ speed ] ) {
+		return true;
+	}
+	
+	// invalid strings - treat as "normal" speed
+	if ( typeof speed === "string" && !$.effects[ speed ] ) {
+		return true;
+	}
+	
+	return false;
+}
+
+$.fn.extend({
+	effect: function(effect, options, speed, callback) {
+		var args = _normalizeArguments.apply(this, arguments),
+			// TODO: make effects take actual parameters instead of a hash
+			args2 = {
+				options: args[1],
+				duration: args[2],
+				callback: args[3]
+			},
+			mode = args2.options.mode,
+			effectMethod = $.effects[effect];
+		
+		if ( $.fx.off || !effectMethod ) {
+			// delegate to the original method (e.g., .show()) if possible
+			if ( mode ) {
+				return this[ mode ]( args2.duration, args2.callback );
+			} else {
+				return this.each(function() {
+					if ( args2.callback ) {
+						args2.callback.call( this );
+					}
+				});
+			}
+		}
+		
+		return effectMethod.call(this, args2);
+	},
+
+	_show: $.fn.show,
+	show: function(speed) {
+		if ( standardSpeed( speed ) ) {
+			return this._show.apply(this, arguments);
+		} else {
+			var args = _normalizeArguments.apply(this, arguments);
+			args[1].mode = 'show';
+			return this.effect.apply(this, args);
+		}
+	},
+
+	_hide: $.fn.hide,
+	hide: function(speed) {
+		if ( standardSpeed( speed ) ) {
+			return this._hide.apply(this, arguments);
+		} else {
+			var args = _normalizeArguments.apply(this, arguments);
+			args[1].mode = 'hide';
+			return this.effect.apply(this, args);
+		}
+	},
+
+	// jQuery core overloads toggle and creates _toggle
+	__toggle: $.fn.toggle,
+	toggle: function(speed) {
+		if ( standardSpeed( speed ) || typeof speed === "boolean" || $.isFunction( speed ) ) {
+			return this.__toggle.apply(this, arguments);
+		} else {
+			var args = _normalizeArguments.apply(this, arguments);
+			args[1].mode = 'toggle';
+			return this.effect.apply(this, args);
+		}
+	},
+
+	// helper functions
+	cssUnit: function(key) {
+		var style = this.css(key), val = [];
+		$.each( ['em','px','%','pt'], function(i, unit){
+			if(style.indexOf(unit) > 0)
+				val = [parseFloat(style), unit];
+		});
+		return val;
+	}
+});
+
+
+
+/******************************************************************************/
+/*********************************** EASING ***********************************/
+/******************************************************************************/
+
+/*
+ * jQuery Easing v1.3 - http://gsgd.co.uk/sandbox/jquery/easing/
+ *
+ * Uses the built in easing capabilities added In jQuery 1.1
+ * to offer multiple easing options
+ *
+ * TERMS OF USE - jQuery Easing
+ *
+ * Open source under the BSD License.
+ *
+ * Copyright 2008 George McGinley Smith
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this list of
+ * conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright notice, this list
+ * of conditions and the following disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+ *
+ * Neither the name of the author nor the names of contributors may be used to endorse
+ * or promote products derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+ * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+*/
+
+// t: current time, b: begInnIng value, c: change In value, d: duration
+$.easing.jswing = $.easing.swing;
+
+$.extend($.easing,
+{
+	def: 'easeOutQuad',
+	swing: function (x, t, b, c, d) {
+		//alert($.easing.default);
+		return $.easing[$.easing.def](x, t, b, c, d);
+	},
+	easeInQuad: function (x, t, b, c, d) {
+		return c*(t/=d)*t + b;
+	},
+	easeOutQuad: function (x, t, b, c, d) {
+		return -c *(t/=d)*(t-2) + b;
+	},
+	easeInOutQuad: function (x, t, b, c, d) {
+		if ((t/=d/2) < 1) return c/2*t*t + b;
+		return -c/2 * ((--t)*(t-2) - 1) + b;
+	},
+	easeInCubic: function (x, t, b, c, d) {
+		return c*(t/=d)*t*t + b;
+	},
+	easeOutCubic: function (x, t, b, c, d) {
+		return c*((t=t/d-1)*t*t + 1) + b;
+	},
+	easeInOutCubic: function (x, t, b, c, d) {
+		if ((t/=d/2) < 1) return c/2*t*t*t + b;
+		return c/2*((t-=2)*t*t + 2) + b;
+	},
+	easeInQuart: function (x, t, b, c, d) {
+		return c*(t/=d)*t*t*t + b;
+	},
+	easeOutQuart: function (x, t, b, c, d) {
+		return -c * ((t=t/d-1)*t*t*t - 1) + b;
+	},
+	easeInOutQuart: function (x, t, b, c, d) {
+		if ((t/=d/2) < 1) return c/2*t*t*t*t + b;
+		return -c/2 * ((t-=2)*t*t*t - 2) + b;
+	},
+	easeInQuint: function (x, t, b, c, d) {
+		return c*(t/=d)*t*t*t*t + b;
+	},
+	easeOutQuint: function (x, t, b, c, d) {
+		return c*((t=t/d-1)*t*t*t*t + 1) + b;
+	},
+	easeInOutQuint: function (x, t, b, c, d) {
+		if ((t/=d/2) < 1) return c/2*t*t*t*t*t + b;
+		return c/2*((t-=2)*t*t*t*t + 2) + b;
+	},
+	easeInSine: function (x, t, b, c, d) {
+		return -c * Math.cos(t/d * (Math.PI/2)) + c + b;
+	},
+	easeOutSine: function (x, t, b, c, d) {
+		return c * Math.sin(t/d * (Math.PI/2)) + b;
+	},
+	easeInOutSine: function (x, t, b, c, d) {
+		return -c/2 * (Math.cos(Math.PI*t/d) - 1) + b;
+	},
+	easeInExpo: function (x, t, b, c, d) {
+		return (t==0) ? b : c * Math.pow(2, 10 * (t/d - 1)) + b;
+	},
+	easeOutExpo: function (x, t, b, c, d) {
+		return (t==d) ? b+c : c * (-Math.pow(2, -10 * t/d) + 1) + b;
+	},
+	easeInOutExpo: function (x, t, b, c, d) {
+		if (t==0) return b;
+		if (t==d) return b+c;
+		if ((t/=d/2) < 1) return c/2 * Math.pow(2, 10 * (t - 1)) + b;
+		return c/2 * (-Math.pow(2, -10 * --t) + 2) + b;
+	},
+	easeInCirc: function (x, t, b, c, d) {
+		return -c * (Math.sqrt(1 - (t/=d)*t) - 1) + b;
+	},
+	easeOutCirc: function (x, t, b, c, d) {
+		return c * Math.sqrt(1 - (t=t/d-1)*t) + b;
+	},
+	easeInOutCirc: function (x, t, b, c, d) {
+		if ((t/=d/2) < 1) return -c/2 * (Math.sqrt(1 - t*t) - 1) + b;
+		return c/2 * (Math.sqrt(1 - (t-=2)*t) + 1) + b;
+	},
+	easeInElastic: function (x, t, b, c, d) {
+		var s=1.70158;var p=0;var a=c;
+		if (t==0) return b;  if ((t/=d)==1) return b+c;  if (!p) p=d*.3;
+		if (a < Math.abs(c)) { a=c; var s=p/4; }
+		else var s = p/(2*Math.PI) * Math.asin (c/a);
+		return -(a*Math.pow(2,10*(t-=1)) * Math.sin( (t*d-s)*(2*Math.PI)/p )) + b;
+	},
+	easeOutElastic: function (x, t, b, c, d) {
+		var s=1.70158;var p=0;var a=c;
+		if (t==0) return b;  if ((t/=d)==1) return b+c;  if (!p) p=d*.3;
+		if (a < Math.abs(c)) { a=c; var s=p/4; }
+		else var s = p/(2*Math.PI) * Math.asin (c/a);
+		return a*Math.pow(2,-10*t) * Math.sin( (t*d-s)*(2*Math.PI)/p ) + c + b;
+	},
+	easeInOutElastic: function (x, t, b, c, d) {
+		var s=1.70158;var p=0;var a=c;
+		if (t==0) return b;  if ((t/=d/2)==2) return b+c;  if (!p) p=d*(.3*1.5);
+		if (a < Math.abs(c)) { a=c; var s=p/4; }
+		else var s = p/(2*Math.PI) * Math.asin (c/a);
+		if (t < 1) return -.5*(a*Math.pow(2,10*(t-=1)) * Math.sin( (t*d-s)*(2*Math.PI)/p )) + b;
+		return a*Math.pow(2,-10*(t-=1)) * Math.sin( (t*d-s)*(2*Math.PI)/p )*.5 + c + b;
+	},
+	easeInBack: function (x, t, b, c, d, s) {
+		if (s == undefined) s = 1.70158;
+		return c*(t/=d)*t*((s+1)*t - s) + b;
+	},
+	easeOutBack: function (x, t, b, c, d, s) {
+		if (s == undefined) s = 1.70158;
+		return c*((t=t/d-1)*t*((s+1)*t + s) + 1) + b;
+	},
+	easeInOutBack: function (x, t, b, c, d, s) {
+		if (s == undefined) s = 1.70158;
+		if ((t/=d/2) < 1) return c/2*(t*t*(((s*=(1.525))+1)*t - s)) + b;
+		return c/2*((t-=2)*t*(((s*=(1.525))+1)*t + s) + 2) + b;
+	},
+	easeInBounce: function (x, t, b, c, d) {
+		return c - $.easing.easeOutBounce (x, d-t, 0, c, d) + b;
+	},
+	easeOutBounce: function (x, t, b, c, d) {
+		if ((t/=d) < (1/2.75)) {
+			return c*(7.5625*t*t) + b;
+		} else if (t < (2/2.75)) {
+			return c*(7.5625*(t-=(1.5/2.75))*t + .75) + b;
+		} else if (t < (2.5/2.75)) {
+			return c*(7.5625*(t-=(2.25/2.75))*t + .9375) + b;
+		} else {
+			return c*(7.5625*(t-=(2.625/2.75))*t + .984375) + b;
+		}
+	},
+	easeInOutBounce: function (x, t, b, c, d) {
+		if (t < d/2) return $.easing.easeInBounce (x, t*2, 0, c, d) * .5 + b;
+		return $.easing.easeOutBounce (x, t*2-d, 0, c, d) * .5 + c*.5 + b;
+	}
+});
+
+/*
+ *
+ * TERMS OF USE - EASING EQUATIONS
+ *
+ * Open source under the BSD License.
+ *
+ * Copyright 2001 Robert Penner
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this list of
+ * conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright notice, this list
+ * of conditions and the following disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+ *
+ * Neither the name of the author nor the names of contributors may be used to endorse
+ * or promote products derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+ * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+})(jQuery);
+/*
+ * jQuery UI Effects Blind 1.8.10
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/Blind
+ *
+ * Depends:
+ *	jquery.effects.core.js
+ */
+(function( $, undefined ) {
+
+$.effects.blind = function(o) {
+
+	return this.queue(function() {
+
+		// Create element
+		var el = $(this), props = ['position','top','bottom','left','right'];
+
+		// Set options
+		var mode = $.effects.setMode(el, o.options.mode || 'hide'); // Set Mode
+		var direction = o.options.direction || 'vertical'; // Default direction
+
+		// Adjust
+		$.effects.save(el, props); el.show(); // Save & Show
+		var wrapper = $.effects.createWrapper(el).css({overflow:'hidden'}); // Create Wrapper
+		var ref = (direction == 'vertical') ? 'height' : 'width';
+		var distance = (direction == 'vertical') ? wrapper.height() : wrapper.width();
+		if(mode == 'show') wrapper.css(ref, 0); // Shift
+
+		// Animation
+		var animation = {};
+		animation[ref] = mode == 'show' ? distance : 0;
+
+		// Animate
+		wrapper.animate(animation, o.duration, o.options.easing, function() {
+			if(mode == 'hide') el.hide(); // Hide
+			$.effects.restore(el, props); $.effects.removeWrapper(el); // Restore
+			if(o.callback) o.callback.apply(el[0], arguments); // Callback
+			el.dequeue();
+		});
+
+	});
+
+};
+
+})(jQuery);
+/*
+ * jQuery UI Effects Bounce 1.8.10
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/Bounce
+ *
+ * Depends:
+ *	jquery.effects.core.js
+ */
+(function( $, undefined ) {
+
+$.effects.bounce = function(o) {
+
+	return this.queue(function() {
+
+		// Create element
+		var el = $(this), props = ['position','top','bottom','left','right'];
+
+		// Set options
+		var mode = $.effects.setMode(el, o.options.mode || 'effect'); // Set Mode
+		var direction = o.options.direction || 'up'; // Default direction
+		var distance = o.options.distance || 20; // Default distance
+		var times = o.options.times || 5; // Default # of times
+		var speed = o.duration || 250; // Default speed per bounce
+		if (/show|hide/.test(mode)) props.push('opacity'); // Avoid touching opacity to prevent clearType and PNG issues in IE
+
+		// Adjust
+		$.effects.save(el, props); el.show(); // Save & Show
+		$.effects.createWrapper(el); // Create Wrapper
+		var ref = (direction == 'up' || direction == 'down') ? 'top' : 'left';
+		var motion = (direction == 'up' || direction == 'left') ? 'pos' : 'neg';
+		var distance = o.options.distance || (ref == 'top' ? el.outerHeight({margin:true}) / 3 : el.outerWidth({margin:true}) / 3);
+		if (mode == 'show') el.css('opacity', 0).css(ref, motion == 'pos' ? -distance : distance); // Shift
+		if (mode == 'hide') distance = distance / (times * 2);
+		if (mode != 'hide') times--;
+
+		// Animate
+		if (mode == 'show') { // Show Bounce
+			var animation = {opacity: 1};
+			animation[ref] = (motion == 'pos' ? '+=' : '-=') + distance;
+			el.animate(animation, speed / 2, o.options.easing);
+			distance = distance / 2;
+			times--;
+		};
+		for (var i = 0; i < times; i++) { // Bounces
+			var animation1 = {}, animation2 = {};
+			animation1[ref] = (motion == 'pos' ? '-=' : '+=') + distance;
+			animation2[ref] = (motion == 'pos' ? '+=' : '-=') + distance;
+			el.animate(animation1, speed / 2, o.options.easing).animate(animation2, speed / 2, o.options.easing);
+			distance = (mode == 'hide') ? distance * 2 : distance / 2;
+		};
+		if (mode == 'hide') { // Last Bounce
+			var animation = {opacity: 0};
+			animation[ref] = (motion == 'pos' ? '-=' : '+=')  + distance;
+			el.animate(animation, speed / 2, o.options.easing, function(){
+				el.hide(); // Hide
+				$.effects.restore(el, props); $.effects.removeWrapper(el); // Restore
+				if(o.callback) o.callback.apply(this, arguments); // Callback
+			});
+		} else {
+			var animation1 = {}, animation2 = {};
+			animation1[ref] = (motion == 'pos' ? '-=' : '+=') + distance;
+			animation2[ref] = (motion == 'pos' ? '+=' : '-=') + distance;
+			el.animate(animation1, speed / 2, o.options.easing).animate(animation2, speed / 2, o.options.easing, function(){
+				$.effects.restore(el, props); $.effects.removeWrapper(el); // Restore
+				if(o.callback) o.callback.apply(this, arguments); // Callback
+			});
+		};
+		el.queue('fx', function() { el.dequeue(); });
+		el.dequeue();
+	});
+
+};
+
+})(jQuery);
+/*
+ * jQuery UI Effects Clip 1.8.10
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/Clip
+ *
+ * Depends:
+ *	jquery.effects.core.js
+ */
+(function( $, undefined ) {
+
+$.effects.clip = function(o) {
+
+	return this.queue(function() {
+
+		// Create element
+		var el = $(this), props = ['position','top','bottom','left','right','height','width'];
+
+		// Set options
+		var mode = $.effects.setMode(el, o.options.mode || 'hide'); // Set Mode
+		var direction = o.options.direction || 'vertical'; // Default direction
+
+		// Adjust
+		$.effects.save(el, props); el.show(); // Save & Show
+		var wrapper = $.effects.createWrapper(el).css({overflow:'hidden'}); // Create Wrapper
+		var animate = el[0].tagName == 'IMG' ? wrapper : el;
+		var ref = {
+			size: (direction == 'vertical') ? 'height' : 'width',
+			position: (direction == 'vertical') ? 'top' : 'left'
+		};
+		var distance = (direction == 'vertical') ? animate.height() : animate.width();
+		if(mode == 'show') { animate.css(ref.size, 0); animate.css(ref.position, distance / 2); } // Shift
+
+		// Animation
+		var animation = {};
+		animation[ref.size] = mode == 'show' ? distance : 0;
+		animation[ref.position] = mode == 'show' ? 0 : distance / 2;
+
+		// Animate
+		animate.animate(animation, { queue: false, duration: o.duration, easing: o.options.easing, complete: function() {
+			if(mode == 'hide') el.hide(); // Hide
+			$.effects.restore(el, props); $.effects.removeWrapper(el); // Restore
+			if(o.callback) o.callback.apply(el[0], arguments); // Callback
+			el.dequeue();
+		}});
+
+	});
+
+};
+
+})(jQuery);
+/*
+ * jQuery UI Effects Drop 1.8.10
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/Drop
+ *
+ * Depends:
+ *	jquery.effects.core.js
+ */
+(function( $, undefined ) {
+
+$.effects.drop = function(o) {
+
+	return this.queue(function() {
+
+		// Create element
+		var el = $(this), props = ['position','top','bottom','left','right','opacity'];
+
+		// Set options
+		var mode = $.effects.setMode(el, o.options.mode || 'hide'); // Set Mode
+		var direction = o.options.direction || 'left'; // Default Direction
+
+		// Adjust
+		$.effects.save(el, props); el.show(); // Save & Show
+		$.effects.createWrapper(el); // Create Wrapper
+		var ref = (direction == 'up' || direction == 'down') ? 'top' : 'left';
+		var motion = (direction == 'up' || direction == 'left') ? 'pos' : 'neg';
+		var distance = o.options.distance || (ref == 'top' ? el.outerHeight({margin:true}) / 2 : el.outerWidth({margin:true}) / 2);
+		if (mode == 'show') el.css('opacity', 0).css(ref, motion == 'pos' ? -distance : distance); // Shift
+
+		// Animation
+		var animation = {opacity: mode == 'show' ? 1 : 0};
+		animation[ref] = (mode == 'show' ? (motion == 'pos' ? '+=' : '-=') : (motion == 'pos' ? '-=' : '+=')) + distance;
+
+		// Animate
+		el.animate(animation, { queue: false, duration: o.duration, easing: o.options.easing, complete: function() {
+			if(mode == 'hide') el.hide(); // Hide
+			$.effects.restore(el, props); $.effects.removeWrapper(el); // Restore
+			if(o.callback) o.callback.apply(this, arguments); // Callback
+			el.dequeue();
+		}});
+
+	});
+
+};
+
+})(jQuery);
+/*
+ * jQuery UI Effects Explode 1.8.10
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/Explode
+ *
+ * Depends:
+ *	jquery.effects.core.js
+ */
+(function( $, undefined ) {
+
+$.effects.explode = function(o) {
+
+	return this.queue(function() {
+
+	var rows = o.options.pieces ? Math.round(Math.sqrt(o.options.pieces)) : 3;
+	var cells = o.options.pieces ? Math.round(Math.sqrt(o.options.pieces)) : 3;
+
+	o.options.mode = o.options.mode == 'toggle' ? ($(this).is(':visible') ? 'hide' : 'show') : o.options.mode;
+	var el = $(this).show().css('visibility', 'hidden');
+	var offset = el.offset();
+
+	//Substract the margins - not fixing the problem yet.
+	offset.top -= parseInt(el.css("marginTop"),10) || 0;
+	offset.left -= parseInt(el.css("marginLeft"),10) || 0;
+
+	var width = el.outerWidth(true);
+	var height = el.outerHeight(true);
+
+	for(var i=0;i<rows;i++) { // =
+		for(var j=0;j<cells;j++) { // ||
+			el
+				.clone()
+				.appendTo('body')
+				.wrap('<div></div>')
+				.css({
+					position: 'absolute',
+					visibility: 'visible',
+					left: -j*(width/cells),
+					top: -i*(height/rows)
+				})
+				.parent()
+				.addClass('ui-effects-explode')
+				.css({
+					position: 'absolute',
+					overflow: 'hidden',
+					width: width/cells,
+					height: height/rows,
+					left: offset.left + j*(width/cells) + (o.options.mode == 'show' ? (j-Math.floor(cells/2))*(width/cells) : 0),
+					top: offset.top + i*(height/rows) + (o.options.mode == 'show' ? (i-Math.floor(rows/2))*(height/rows) : 0),
+					opacity: o.options.mode == 'show' ? 0 : 1
+				}).animate({
+					left: offset.left + j*(width/cells) + (o.options.mode == 'show' ? 0 : (j-Math.floor(cells/2))*(width/cells)),
+					top: offset.top + i*(height/rows) + (o.options.mode == 'show' ? 0 : (i-Math.floor(rows/2))*(height/rows)),
+					opacity: o.options.mode == 'show' ? 1 : 0
+				}, o.duration || 500);
+		}
+	}
+
+	// Set a timeout, to call the callback approx. when the other animations have finished
+	setTimeout(function() {
+
+		o.options.mode == 'show' ? el.css({ visibility: 'visible' }) : el.css({ visibility: 'visible' }).hide();
+				if(o.callback) o.callback.apply(el[0]); // Callback
+				el.dequeue();
+
+				$('div.ui-effects-explode').remove();
+
+	}, o.duration || 500);
+
+
+	});
+
+};
+
+})(jQuery);
+/*
+ * jQuery UI Effects Fade 1.8.10
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/Fade
+ *
+ * Depends:
+ *	jquery.effects.core.js
+ */
+(function( $, undefined ) {
+
+$.effects.fade = function(o) {
+	return this.queue(function() {
+		var elem = $(this),
+			mode = $.effects.setMode(elem, o.options.mode || 'hide');
+
+		elem.animate({ opacity: mode }, {
+			queue: false,
+			duration: o.duration,
+			easing: o.options.easing,
+			complete: function() {
+				(o.callback && o.callback.apply(this, arguments));
+				elem.dequeue();
+			}
+		});
+	});
+};
+
+})(jQuery);
+/*
+ * jQuery UI Effects Fold 1.8.10
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/Fold
+ *
+ * Depends:
+ *	jquery.effects.core.js
+ */
+(function( $, undefined ) {
+
+$.effects.fold = function(o) {
+
+	return this.queue(function() {
+
+		// Create element
+		var el = $(this), props = ['position','top','bottom','left','right'];
+
+		// Set options
+		var mode = $.effects.setMode(el, o.options.mode || 'hide'); // Set Mode
+		var size = o.options.size || 15; // Default fold size
+		var horizFirst = !(!o.options.horizFirst); // Ensure a boolean value
+		var duration = o.duration ? o.duration / 2 : $.fx.speeds._default / 2;
+
+		// Adjust
+		$.effects.save(el, props); el.show(); // Save & Show
+		var wrapper = $.effects.createWrapper(el).css({overflow:'hidden'}); // Create Wrapper
+		var widthFirst = ((mode == 'show') != horizFirst);
+		var ref = widthFirst ? ['width', 'height'] : ['height', 'width'];
+		var distance = widthFirst ? [wrapper.width(), wrapper.height()] : [wrapper.height(), wrapper.width()];
+		var percent = /([0-9]+)%/.exec(size);
+		if(percent) size = parseInt(percent[1],10) / 100 * distance[mode == 'hide' ? 0 : 1];
+		if(mode == 'show') wrapper.css(horizFirst ? {height: 0, width: size} : {height: size, width: 0}); // Shift
+
+		// Animation
+		var animation1 = {}, animation2 = {};
+		animation1[ref[0]] = mode == 'show' ? distance[0] : size;
+		animation2[ref[1]] = mode == 'show' ? distance[1] : 0;
+
+		// Animate
+		wrapper.animate(animation1, duration, o.options.easing)
+		.animate(animation2, duration, o.options.easing, function() {
+			if(mode == 'hide') el.hide(); // Hide
+			$.effects.restore(el, props); $.effects.removeWrapper(el); // Restore
+			if(o.callback) o.callback.apply(el[0], arguments); // Callback
+			el.dequeue();
+		});
+
+	});
+
+};
+
+})(jQuery);
+/*
+ * jQuery UI Effects Highlight 1.8.10
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/Highlight
+ *
+ * Depends:
+ *	jquery.effects.core.js
+ */
+(function( $, undefined ) {
+
+$.effects.highlight = function(o) {
+	return this.queue(function() {
+		var elem = $(this),
+			props = ['backgroundImage', 'backgroundColor', 'opacity'],
+			mode = $.effects.setMode(elem, o.options.mode || 'show'),
+			animation = {
+				backgroundColor: elem.css('backgroundColor')
+			};
+
+		if (mode == 'hide') {
+			animation.opacity = 0;
+		}
+
+		$.effects.save(elem, props);
+		elem
+			.show()
+			.css({
+				backgroundImage: 'none',
+				backgroundColor: o.options.color || '#ffff99'
+			})
+			.animate(animation, {
+				queue: false,
+				duration: o.duration,
+				easing: o.options.easing,
+				complete: function() {
+					(mode == 'hide' && elem.hide());
+					$.effects.restore(elem, props);
+					(mode == 'show' && !$.support.opacity && this.style.removeAttribute('filter'));
+					(o.callback && o.callback.apply(this, arguments));
+					elem.dequeue();
+				}
+			});
+	});
+};
+
+})(jQuery);
+/*
+ * jQuery UI Effects Pulsate 1.8.10
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/Pulsate
+ *
+ * Depends:
+ *	jquery.effects.core.js
+ */
+(function( $, undefined ) {
+
+$.effects.pulsate = function(o) {
+	return this.queue(function() {
+		var elem = $(this),
+			mode = $.effects.setMode(elem, o.options.mode || 'show');
+			times = ((o.options.times || 5) * 2) - 1;
+			duration = o.duration ? o.duration / 2 : $.fx.speeds._default / 2,
+			isVisible = elem.is(':visible'),
+			animateTo = 0;
+
+		if (!isVisible) {
+			elem.css('opacity', 0).show();
+			animateTo = 1;
+		}
+
+		if ((mode == 'hide' && isVisible) || (mode == 'show' && !isVisible)) {
+			times--;
+		}
+
+		for (var i = 0; i < times; i++) {
+			elem.animate({ opacity: animateTo }, duration, o.options.easing);
+			animateTo = (animateTo + 1) % 2;
+		}
+
+		elem.animate({ opacity: animateTo }, duration, o.options.easing, function() {
+			if (animateTo == 0) {
+				elem.hide();
+			}
+			(o.callback && o.callback.apply(this, arguments));
+		});
+
+		elem
+			.queue('fx', function() { elem.dequeue(); })
+			.dequeue();
+	});
+};
+
+})(jQuery);
+/*
+ * jQuery UI Effects Scale 1.8.10
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/Scale
+ *
+ * Depends:
+ *	jquery.effects.core.js
+ */
+(function( $, undefined ) {
+
+$.effects.puff = function(o) {
+	return this.queue(function() {
+		var elem = $(this),
+			mode = $.effects.setMode(elem, o.options.mode || 'hide'),
+			percent = parseInt(o.options.percent, 10) || 150,
+			factor = percent / 100,
+			original = { height: elem.height(), width: elem.width() };
+
+		$.extend(o.options, {
+			fade: true,
+			mode: mode,
+			percent: mode == 'hide' ? percent : 100,
+			from: mode == 'hide'
+				? original
+				: {
+					height: original.height * factor,
+					width: original.width * factor
+				}
+		});
+
+		elem.effect('scale', o.options, o.duration, o.callback);
+		elem.dequeue();
+	});
+};
+
+$.effects.scale = function(o) {
+
+	return this.queue(function() {
+
+		// Create element
+		var el = $(this);
+
+		// Set options
+		var options = $.extend(true, {}, o.options);
+		var mode = $.effects.setMode(el, o.options.mode || 'effect'); // Set Mode
+		var percent = parseInt(o.options.percent,10) || (parseInt(o.options.percent,10) == 0 ? 0 : (mode == 'hide' ? 0 : 100)); // Set default scaling percent
+		var direction = o.options.direction || 'both'; // Set default axis
+		var origin = o.options.origin; // The origin of the scaling
+		if (mode != 'effect') { // Set default origin and restore for show/hide
+			options.origin = origin || ['middle','center'];
+			options.restore = true;
+		}
+		var original = {height: el.height(), width: el.width()}; // Save original
+		el.from = o.options.from || (mode == 'show' ? {height: 0, width: 0} : original); // Default from state
+
+		// Adjust
+		var factor = { // Set scaling factor
+			y: direction != 'horizontal' ? (percent / 100) : 1,
+			x: direction != 'vertical' ? (percent / 100) : 1
+		};
+		el.to = {height: original.height * factor.y, width: original.width * factor.x}; // Set to state
+
+		if (o.options.fade) { // Fade option to support puff
+			if (mode == 'show') {el.from.opacity = 0; el.to.opacity = 1;};
+			if (mode == 'hide') {el.from.opacity = 1; el.to.opacity = 0;};
+		};
+
+		// Animation
+		options.from = el.from; options.to = el.to; options.mode = mode;
+
+		// Animate
+		el.effect('size', options, o.duration, o.callback);
+		el.dequeue();
+	});
+
+};
+
+$.effects.size = function(o) {
+
+	return this.queue(function() {
+
+		// Create element
+		var el = $(this), props = ['position','top','bottom','left','right','width','height','overflow','opacity'];
+		var props1 = ['position','top','bottom','left','right','overflow','opacity']; // Always restore
+		var props2 = ['width','height','overflow']; // Copy for children
+		var cProps = ['fontSize'];
+		var vProps = ['borderTopWidth', 'borderBottomWidth', 'paddingTop', 'paddingBottom'];
+		var hProps = ['borderLeftWidth', 'borderRightWidth', 'paddingLeft', 'paddingRight'];
+
+		// Set options
+		var mode = $.effects.setMode(el, o.options.mode || 'effect'); // Set Mode
+		var restore = o.options.restore || false; // Default restore
+		var scale = o.options.scale || 'both'; // Default scale mode
+		var origin = o.options.origin; // The origin of the sizing
+		var original = {height: el.height(), width: el.width()}; // Save original
+		el.from = o.options.from || original; // Default from state
+		el.to = o.options.to || original; // Default to state
+		// Adjust
+		if (origin) { // Calculate baseline shifts
+			var baseline = $.effects.getBaseline(origin, original);
+			el.from.top = (original.height - el.from.height) * baseline.y;
+			el.from.left = (original.width - el.from.width) * baseline.x;
+			el.to.top = (original.height - el.to.height) * baseline.y;
+			el.to.left = (original.width - el.to.width) * baseline.x;
+		};
+		var factor = { // Set scaling factor
+			from: {y: el.from.height / original.height, x: el.from.width / original.width},
+			to: {y: el.to.height / original.height, x: el.to.width / original.width}
+		};
+		if (scale == 'box' || scale == 'both') { // Scale the css box
+			if (factor.from.y != factor.to.y) { // Vertical props scaling
+				props = props.concat(vProps);
+				el.from = $.effects.setTransition(el, vProps, factor.from.y, el.from);
+				el.to = $.effects.setTransition(el, vProps, factor.to.y, el.to);
+			};
+			if (factor.from.x != factor.to.x) { // Horizontal props scaling
+				props = props.concat(hProps);
+				el.from = $.effects.setTransition(el, hProps, factor.from.x, el.from);
+				el.to = $.effects.setTransition(el, hProps, factor.to.x, el.to);
+			};
+		};
+		if (scale == 'content' || scale == 'both') { // Scale the content
+			if (factor.from.y != factor.to.y) { // Vertical props scaling
+				props = props.concat(cProps);
+				el.from = $.effects.setTransition(el, cProps, factor.from.y, el.from);
+				el.to = $.effects.setTransition(el, cProps, factor.to.y, el.to);
+			};
+		};
+		$.effects.save(el, restore ? props : props1); el.show(); // Save & Show
+		$.effects.createWrapper(el); // Create Wrapper
+		el.css('overflow','hidden').css(el.from); // Shift
+
+		// Animate
+		if (scale == 'content' || scale == 'both') { // Scale the children
+			vProps = vProps.concat(['marginTop','marginBottom']).concat(cProps); // Add margins/font-size
+			hProps = hProps.concat(['marginLeft','marginRight']); // Add margins
+			props2 = props.concat(vProps).concat(hProps); // Concat
+			el.find("*[width]").each(function(){
+				child = $(this);
+				if (restore) $.effects.save(child, props2);
+				var c_original = {height: child.height(), width: child.width()}; // Save original
+				child.from = {height: c_original.height * factor.from.y, width: c_original.width * factor.from.x};
+				child.to = {height: c_original.height * factor.to.y, width: c_original.width * factor.to.x};
+				if (factor.from.y != factor.to.y) { // Vertical props scaling
+					child.from = $.effects.setTransition(child, vProps, factor.from.y, child.from);
+					child.to = $.effects.setTransition(child, vProps, factor.to.y, child.to);
+				};
+				if (factor.from.x != factor.to.x) { // Horizontal props scaling
+					child.from = $.effects.setTransition(child, hProps, factor.from.x, child.from);
+					child.to = $.effects.setTransition(child, hProps, factor.to.x, child.to);
+				};
+				child.css(child.from); // Shift children
+				child.animate(child.to, o.duration, o.options.easing, function(){
+					if (restore) $.effects.restore(child, props2); // Restore children
+				}); // Animate children
+			});
+		};
+
+		// Animate
+		el.animate(el.to, { queue: false, duration: o.duration, easing: o.options.easing, complete: function() {
+			if (el.to.opacity === 0) {
+				el.css('opacity', el.from.opacity);
+			}
+			if(mode == 'hide') el.hide(); // Hide
+			$.effects.restore(el, restore ? props : props1); $.effects.removeWrapper(el); // Restore
+			if(o.callback) o.callback.apply(this, arguments); // Callback
+			el.dequeue();
+		}});
+
+	});
+
+};
+
+})(jQuery);
+/*
+ * jQuery UI Effects Shake 1.8.10
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/Shake
+ *
+ * Depends:
+ *	jquery.effects.core.js
+ */
+(function( $, undefined ) {
+
+$.effects.shake = function(o) {
+
+	return this.queue(function() {
+
+		// Create element
+		var el = $(this), props = ['position','top','bottom','left','right'];
+
+		// Set options
+		var mode = $.effects.setMode(el, o.options.mode || 'effect'); // Set Mode
+		var direction = o.options.direction || 'left'; // Default direction
+		var distance = o.options.distance || 20; // Default distance
+		var times = o.options.times || 3; // Default # of times
+		var speed = o.duration || o.options.duration || 140; // Default speed per shake
+
+		// Adjust
+		$.effects.save(el, props); el.show(); // Save & Show
+		$.effects.createWrapper(el); // Create Wrapper
+		var ref = (direction == 'up' || direction == 'down') ? 'top' : 'left';
+		var motion = (direction == 'up' || direction == 'left') ? 'pos' : 'neg';
+
+		// Animation
+		var animation = {}, animation1 = {}, animation2 = {};
+		animation[ref] = (motion == 'pos' ? '-=' : '+=')  + distance;
+		animation1[ref] = (motion == 'pos' ? '+=' : '-=')  + distance * 2;
+		animation2[ref] = (motion == 'pos' ? '-=' : '+=')  + distance * 2;
+
+		// Animate
+		el.animate(animation, speed, o.options.easing);
+		for (var i = 1; i < times; i++) { // Shakes
+			el.animate(animation1, speed, o.options.easing).animate(animation2, speed, o.options.easing);
+		};
+		el.animate(animation1, speed, o.options.easing).
+		animate(animation, speed / 2, o.options.easing, function(){ // Last shake
+			$.effects.restore(el, props); $.effects.removeWrapper(el); // Restore
+			if(o.callback) o.callback.apply(this, arguments); // Callback
+		});
+		el.queue('fx', function() { el.dequeue(); });
+		el.dequeue();
+	});
+
+};
+
+})(jQuery);
+/*
+ * jQuery UI Effects Slide 1.8.10
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/Slide
+ *
+ * Depends:
+ *	jquery.effects.core.js
+ */
+(function( $, undefined ) {
+
+$.effects.slide = function(o) {
+
+	return this.queue(function() {
+
+		// Create element
+		var el = $(this), props = ['position','top','bottom','left','right'];
+
+		// Set options
+		var mode = $.effects.setMode(el, o.options.mode || 'show'); // Set Mode
+		var direction = o.options.direction || 'left'; // Default Direction
+
+		// Adjust
+		$.effects.save(el, props); el.show(); // Save & Show
+		$.effects.createWrapper(el).css({overflow:'hidden'}); // Create Wrapper
+		var ref = (direction == 'up' || direction == 'down') ? 'top' : 'left';
+		var motion = (direction == 'up' || direction == 'left') ? 'pos' : 'neg';
+		var distance = o.options.distance || (ref == 'top' ? el.outerHeight({margin:true}) : el.outerWidth({margin:true}));
+		if (mode == 'show') el.css(ref, motion == 'pos' ? (isNaN(distance) ? "-" + distance : -distance) : distance); // Shift
+
+		// Animation
+		var animation = {};
+		animation[ref] = (mode == 'show' ? (motion == 'pos' ? '+=' : '-=') : (motion == 'pos' ? '-=' : '+=')) + distance;
+
+		// Animate
+		el.animate(animation, { queue: false, duration: o.duration, easing: o.options.easing, complete: function() {
+			if(mode == 'hide') el.hide(); // Hide
+			$.effects.restore(el, props); $.effects.removeWrapper(el); // Restore
+			if(o.callback) o.callback.apply(this, arguments); // Callback
+			el.dequeue();
+		}});
+
+	});
+
+};
+
+})(jQuery);
+/*
+ * jQuery UI Effects Transfer 1.8.10
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/Transfer
+ *
+ * Depends:
+ *	jquery.effects.core.js
+ */
+(function( $, undefined ) {
+
+$.effects.transfer = function(o) {
+	return this.queue(function() {
+		var elem = $(this),
+			target = $(o.options.to),
+			endPosition = target.offset(),
+			animation = {
+				top: endPosition.top,
+				left: endPosition.left,
+				height: target.innerHeight(),
+				width: target.innerWidth()
+			},
+			startPosition = elem.offset(),
+			transfer = $('<div class="ui-effects-transfer"></div>')
+				.appendTo(document.body)
+				.addClass(o.options.className)
+				.css({
+					top: startPosition.top,
+					left: startPosition.left,
+					height: elem.innerHeight(),
+					width: elem.innerWidth(),
+					position: 'absolute'
+				})
+				.animate(animation, o.duration, o.options.easing, function() {
+					transfer.remove();
+					(o.callback && o.callback.apply(elem[0], arguments));
+					elem.dequeue();
+				});
+	});
+};
+
+})(jQuery);
diff --git a/js/ui/jquery.effects.blind.js b/js/ui/jquery.effects.blind.js
new file mode 100644
index 0000000000..6c40f7241c
--- /dev/null
+++ b/js/ui/jquery.effects.blind.js
@@ -0,0 +1,49 @@
+/*
+ * jQuery UI Effects Blind 1.8.10
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/Blind
+ *
+ * Depends:
+ *	jquery.effects.core.js
+ */
+(function( $, undefined ) {
+
+$.effects.blind = function(o) {
+
+	return this.queue(function() {
+
+		// Create element
+		var el = $(this), props = ['position','top','bottom','left','right'];
+
+		// Set options
+		var mode = $.effects.setMode(el, o.options.mode || 'hide'); // Set Mode
+		var direction = o.options.direction || 'vertical'; // Default direction
+
+		// Adjust
+		$.effects.save(el, props); el.show(); // Save & Show
+		var wrapper = $.effects.createWrapper(el).css({overflow:'hidden'}); // Create Wrapper
+		var ref = (direction == 'vertical') ? 'height' : 'width';
+		var distance = (direction == 'vertical') ? wrapper.height() : wrapper.width();
+		if(mode == 'show') wrapper.css(ref, 0); // Shift
+
+		// Animation
+		var animation = {};
+		animation[ref] = mode == 'show' ? distance : 0;
+
+		// Animate
+		wrapper.animate(animation, o.duration, o.options.easing, function() {
+			if(mode == 'hide') el.hide(); // Hide
+			$.effects.restore(el, props); $.effects.removeWrapper(el); // Restore
+			if(o.callback) o.callback.apply(el[0], arguments); // Callback
+			el.dequeue();
+		});
+
+	});
+
+};
+
+})(jQuery);
diff --git a/js/ui/jquery.effects.bounce.js b/js/ui/jquery.effects.bounce.js
new file mode 100644
index 0000000000..6994641bc8
--- /dev/null
+++ b/js/ui/jquery.effects.bounce.js
@@ -0,0 +1,78 @@
+/*
+ * jQuery UI Effects Bounce 1.8.10
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/Bounce
+ *
+ * Depends:
+ *	jquery.effects.core.js
+ */
+(function( $, undefined ) {
+
+$.effects.bounce = function(o) {
+
+	return this.queue(function() {
+
+		// Create element
+		var el = $(this), props = ['position','top','bottom','left','right'];
+
+		// Set options
+		var mode = $.effects.setMode(el, o.options.mode || 'effect'); // Set Mode
+		var direction = o.options.direction || 'up'; // Default direction
+		var distance = o.options.distance || 20; // Default distance
+		var times = o.options.times || 5; // Default # of times
+		var speed = o.duration || 250; // Default speed per bounce
+		if (/show|hide/.test(mode)) props.push('opacity'); // Avoid touching opacity to prevent clearType and PNG issues in IE
+
+		// Adjust
+		$.effects.save(el, props); el.show(); // Save & Show
+		$.effects.createWrapper(el); // Create Wrapper
+		var ref = (direction == 'up' || direction == 'down') ? 'top' : 'left';
+		var motion = (direction == 'up' || direction == 'left') ? 'pos' : 'neg';
+		var distance = o.options.distance || (ref == 'top' ? el.outerHeight({margin:true}) / 3 : el.outerWidth({margin:true}) / 3);
+		if (mode == 'show') el.css('opacity', 0).css(ref, motion == 'pos' ? -distance : distance); // Shift
+		if (mode == 'hide') distance = distance / (times * 2);
+		if (mode != 'hide') times--;
+
+		// Animate
+		if (mode == 'show') { // Show Bounce
+			var animation = {opacity: 1};
+			animation[ref] = (motion == 'pos' ? '+=' : '-=') + distance;
+			el.animate(animation, speed / 2, o.options.easing);
+			distance = distance / 2;
+			times--;
+		};
+		for (var i = 0; i < times; i++) { // Bounces
+			var animation1 = {}, animation2 = {};
+			animation1[ref] = (motion == 'pos' ? '-=' : '+=') + distance;
+			animation2[ref] = (motion == 'pos' ? '+=' : '-=') + distance;
+			el.animate(animation1, speed / 2, o.options.easing).animate(animation2, speed / 2, o.options.easing);
+			distance = (mode == 'hide') ? distance * 2 : distance / 2;
+		};
+		if (mode == 'hide') { // Last Bounce
+			var animation = {opacity: 0};
+			animation[ref] = (motion == 'pos' ? '-=' : '+=')  + distance;
+			el.animate(animation, speed / 2, o.options.easing, function(){
+				el.hide(); // Hide
+				$.effects.restore(el, props); $.effects.removeWrapper(el); // Restore
+				if(o.callback) o.callback.apply(this, arguments); // Callback
+			});
+		} else {
+			var animation1 = {}, animation2 = {};
+			animation1[ref] = (motion == 'pos' ? '-=' : '+=') + distance;
+			animation2[ref] = (motion == 'pos' ? '+=' : '-=') + distance;
+			el.animate(animation1, speed / 2, o.options.easing).animate(animation2, speed / 2, o.options.easing, function(){
+				$.effects.restore(el, props); $.effects.removeWrapper(el); // Restore
+				if(o.callback) o.callback.apply(this, arguments); // Callback
+			});
+		};
+		el.queue('fx', function() { el.dequeue(); });
+		el.dequeue();
+	});
+
+};
+
+})(jQuery);
diff --git a/js/ui/jquery.effects.clip.js b/js/ui/jquery.effects.clip.js
new file mode 100644
index 0000000000..41004e5428
--- /dev/null
+++ b/js/ui/jquery.effects.clip.js
@@ -0,0 +1,54 @@
+/*
+ * jQuery UI Effects Clip 1.8.10
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/Clip
+ *
+ * Depends:
+ *	jquery.effects.core.js
+ */
+(function( $, undefined ) {
+
+$.effects.clip = function(o) {
+
+	return this.queue(function() {
+
+		// Create element
+		var el = $(this), props = ['position','top','bottom','left','right','height','width'];
+
+		// Set options
+		var mode = $.effects.setMode(el, o.options.mode || 'hide'); // Set Mode
+		var direction = o.options.direction || 'vertical'; // Default direction
+
+		// Adjust
+		$.effects.save(el, props); el.show(); // Save & Show
+		var wrapper = $.effects.createWrapper(el).css({overflow:'hidden'}); // Create Wrapper
+		var animate = el[0].tagName == 'IMG' ? wrapper : el;
+		var ref = {
+			size: (direction == 'vertical') ? 'height' : 'width',
+			position: (direction == 'vertical') ? 'top' : 'left'
+		};
+		var distance = (direction == 'vertical') ? animate.height() : animate.width();
+		if(mode == 'show') { animate.css(ref.size, 0); animate.css(ref.position, distance / 2); } // Shift
+
+		// Animation
+		var animation = {};
+		animation[ref.size] = mode == 'show' ? distance : 0;
+		animation[ref.position] = mode == 'show' ? 0 : distance / 2;
+
+		// Animate
+		animate.animate(animation, { queue: false, duration: o.duration, easing: o.options.easing, complete: function() {
+			if(mode == 'hide') el.hide(); // Hide
+			$.effects.restore(el, props); $.effects.removeWrapper(el); // Restore
+			if(o.callback) o.callback.apply(el[0], arguments); // Callback
+			el.dequeue();
+		}});
+
+	});
+
+};
+
+})(jQuery);
diff --git a/js/ui/jquery.effects.core.js b/js/ui/jquery.effects.core.js
new file mode 100644
index 0000000000..9f0ba0533c
--- /dev/null
+++ b/js/ui/jquery.effects.core.js
@@ -0,0 +1,747 @@
+/*
+ * jQuery UI Effects 1.8.10
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/
+ */
+;jQuery.effects || (function($, undefined) {
+
+$.effects = {};
+
+
+
+/******************************************************************************/
+/****************************** COLOR ANIMATIONS ******************************/
+/******************************************************************************/
+
+// override the animation for color styles
+$.each(['backgroundColor', 'borderBottomColor', 'borderLeftColor',
+	'borderRightColor', 'borderTopColor', 'borderColor', 'color', 'outlineColor'],
+function(i, attr) {
+	$.fx.step[attr] = function(fx) {
+		if (!fx.colorInit) {
+			fx.start = getColor(fx.elem, attr);
+			fx.end = getRGB(fx.end);
+			fx.colorInit = true;
+		}
+
+		fx.elem.style[attr] = 'rgb(' +
+			Math.max(Math.min(parseInt((fx.pos * (fx.end[0] - fx.start[0])) + fx.start[0], 10), 255), 0) + ',' +
+			Math.max(Math.min(parseInt((fx.pos * (fx.end[1] - fx.start[1])) + fx.start[1], 10), 255), 0) + ',' +
+			Math.max(Math.min(parseInt((fx.pos * (fx.end[2] - fx.start[2])) + fx.start[2], 10), 255), 0) + ')';
+	};
+});
+
+// Color Conversion functions from highlightFade
+// By Blair Mitchelmore
+// http://jquery.offput.ca/highlightFade/
+
+// Parse strings looking for color tuples [255,255,255]
+function getRGB(color) {
+		var result;
+
+		// Check if we're already dealing with an array of colors
+		if ( color && color.constructor == Array && color.length == 3 )
+				return color;
+
+		// Look for rgb(num,num,num)
+		if (result = /rgb\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*\)/.exec(color))
+				return [parseInt(result[1],10), parseInt(result[2],10), parseInt(result[3],10)];
+
+		// Look for rgb(num%,num%,num%)
+		if (result = /rgb\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*\)/.exec(color))
+				return [parseFloat(result[1])*2.55, parseFloat(result[2])*2.55, parseFloat(result[3])*2.55];
+
+		// Look for #a0b1c2
+		if (result = /#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/.exec(color))
+				return [parseInt(result[1],16), parseInt(result[2],16), parseInt(result[3],16)];
+
+		// Look for #fff
+		if (result = /#([a-fA-F0-9])([a-fA-F0-9])([a-fA-F0-9])/.exec(color))
+				return [parseInt(result[1]+result[1],16), parseInt(result[2]+result[2],16), parseInt(result[3]+result[3],16)];
+
+		// Look for rgba(0, 0, 0, 0) == transparent in Safari 3
+		if (result = /rgba\(0, 0, 0, 0\)/.exec(color))
+				return colors['transparent'];
+
+		// Otherwise, we're most likely dealing with a named color
+		return colors[$.trim(color).toLowerCase()];
+}
+
+function getColor(elem, attr) {
+		var color;
+
+		do {
+				color = $.curCSS(elem, attr);
+
+				// Keep going until we find an element that has color, or we hit the body
+				if ( color != '' && color != 'transparent' || $.nodeName(elem, "body") )
+						break;
+
+				attr = "backgroundColor";
+		} while ( elem = elem.parentNode );
+
+		return getRGB(color);
+};
+
+// Some named colors to work with
+// From Interface by Stefan Petre
+// http://interface.eyecon.ro/
+
+var colors = {
+	aqua:[0,255,255],
+	azure:[240,255,255],
+	beige:[245,245,220],
+	black:[0,0,0],
+	blue:[0,0,255],
+	brown:[165,42,42],
+	cyan:[0,255,255],
+	darkblue:[0,0,139],
+	darkcyan:[0,139,139],
+	darkgrey:[169,169,169],
+	darkgreen:[0,100,0],
+	darkkhaki:[189,183,107],
+	darkmagenta:[139,0,139],
+	darkolivegreen:[85,107,47],
+	darkorange:[255,140,0],
+	darkorchid:[153,50,204],
+	darkred:[139,0,0],
+	darksalmon:[233,150,122],
+	darkviolet:[148,0,211],
+	fuchsia:[255,0,255],
+	gold:[255,215,0],
+	green:[0,128,0],
+	indigo:[75,0,130],
+	khaki:[240,230,140],
+	lightblue:[173,216,230],
+	lightcyan:[224,255,255],
+	lightgreen:[144,238,144],
+	lightgrey:[211,211,211],
+	lightpink:[255,182,193],
+	lightyellow:[255,255,224],
+	lime:[0,255,0],
+	magenta:[255,0,255],
+	maroon:[128,0,0],
+	navy:[0,0,128],
+	olive:[128,128,0],
+	orange:[255,165,0],
+	pink:[255,192,203],
+	purple:[128,0,128],
+	violet:[128,0,128],
+	red:[255,0,0],
+	silver:[192,192,192],
+	white:[255,255,255],
+	yellow:[255,255,0],
+	transparent: [255,255,255]
+};
+
+
+
+/******************************************************************************/
+/****************************** CLASS ANIMATIONS ******************************/
+/******************************************************************************/
+
+var classAnimationActions = ['add', 'remove', 'toggle'],
+	shorthandStyles = {
+		border: 1,
+		borderBottom: 1,
+		borderColor: 1,
+		borderLeft: 1,
+		borderRight: 1,
+		borderTop: 1,
+		borderWidth: 1,
+		margin: 1,
+		padding: 1
+	};
+
+function getElementStyles() {
+	var style = document.defaultView
+			? document.defaultView.getComputedStyle(this, null)
+			: this.currentStyle,
+		newStyle = {},
+		key,
+		camelCase;
+
+	// webkit enumerates style porperties
+	if (style && style.length && style[0] && style[style[0]]) {
+		var len = style.length;
+		while (len--) {
+			key = style[len];
+			if (typeof style[key] == 'string') {
+				camelCase = key.replace(/\-(\w)/g, function(all, letter){
+					return letter.toUpperCase();
+				});
+				newStyle[camelCase] = style[key];
+			}
+		}
+	} else {
+		for (key in style) {
+			if (typeof style[key] === 'string') {
+				newStyle[key] = style[key];
+			}
+		}
+	}
+	
+	return newStyle;
+}
+
+function filterStyles(styles) {
+	var name, value;
+	for (name in styles) {
+		value = styles[name];
+		if (
+			// ignore null and undefined values
+			value == null ||
+			// ignore functions (when does this occur?)
+			$.isFunction(value) ||
+			// shorthand styles that need to be expanded
+			name in shorthandStyles ||
+			// ignore scrollbars (break in IE)
+			(/scrollbar/).test(name) ||
+
+			// only colors or values that can be converted to numbers
+			(!(/color/i).test(name) && isNaN(parseFloat(value)))
+		) {
+			delete styles[name];
+		}
+	}
+	
+	return styles;
+}
+
+function styleDifference(oldStyle, newStyle) {
+	var diff = { _: 0 }, // http://dev.jquery.com/ticket/5459
+		name;
+
+	for (name in newStyle) {
+		if (oldStyle[name] != newStyle[name]) {
+			diff[name] = newStyle[name];
+		}
+	}
+
+	return diff;
+}
+
+$.effects.animateClass = function(value, duration, easing, callback) {
+	if ($.isFunction(easing)) {
+		callback = easing;
+		easing = null;
+	}
+
+	return this.queue('fx', function() {
+		var that = $(this),
+			originalStyleAttr = that.attr('style') || ' ',
+			originalStyle = filterStyles(getElementStyles.call(this)),
+			newStyle,
+			className = that.attr('className');
+
+		$.each(classAnimationActions, function(i, action) {
+			if (value[action]) {
+				that[action + 'Class'](value[action]);
+			}
+		});
+		newStyle = filterStyles(getElementStyles.call(this));
+		that.attr('className', className);
+
+		that.animate(styleDifference(originalStyle, newStyle), duration, easing, function() {
+			$.each(classAnimationActions, function(i, action) {
+				if (value[action]) { that[action + 'Class'](value[action]); }
+			});
+			// work around bug in IE by clearing the cssText before setting it
+			if (typeof that.attr('style') == 'object') {
+				that.attr('style').cssText = '';
+				that.attr('style').cssText = originalStyleAttr;
+			} else {
+				that.attr('style', originalStyleAttr);
+			}
+			if (callback) { callback.apply(this, arguments); }
+		});
+
+		// $.animate adds a function to the end of the queue
+		// but we want it at the front
+		var queue = $.queue(this),
+			anim = queue.splice(queue.length - 1, 1)[0];
+		queue.splice(1, 0, anim);
+		$.dequeue(this);
+	});
+};
+
+$.fn.extend({
+	_addClass: $.fn.addClass,
+	addClass: function(classNames, speed, easing, callback) {
+		return speed ? $.effects.animateClass.apply(this, [{ add: classNames },speed,easing,callback]) : this._addClass(classNames);
+	},
+
+	_removeClass: $.fn.removeClass,
+	removeClass: function(classNames,speed,easing,callback) {
+		return speed ? $.effects.animateClass.apply(this, [{ remove: classNames },speed,easing,callback]) : this._removeClass(classNames);
+	},
+
+	_toggleClass: $.fn.toggleClass,
+	toggleClass: function(classNames, force, speed, easing, callback) {
+		if ( typeof force == "boolean" || force === undefined ) {
+			if ( !speed ) {
+				// without speed parameter;
+				return this._toggleClass(classNames, force);
+			} else {
+				return $.effects.animateClass.apply(this, [(force?{add:classNames}:{remove:classNames}),speed,easing,callback]);
+			}
+		} else {
+			// without switch parameter;
+			return $.effects.animateClass.apply(this, [{ toggle: classNames },force,speed,easing]);
+		}
+	},
+
+	switchClass: function(remove,add,speed,easing,callback) {
+		return $.effects.animateClass.apply(this, [{ add: add, remove: remove },speed,easing,callback]);
+	}
+});
+
+
+
+/******************************************************************************/
+/*********************************** EFFECTS **********************************/
+/******************************************************************************/
+
+$.extend($.effects, {
+	version: "1.8.10",
+
+	// Saves a set of properties in a data storage
+	save: function(element, set) {
+		for(var i=0; i < set.length; i++) {
+			if(set[i] !== null) element.data("ec.storage."+set[i], element[0].style[set[i]]);
+		}
+	},
+
+	// Restores a set of previously saved properties from a data storage
+	restore: function(element, set) {
+		for(var i=0; i < set.length; i++) {
+			if(set[i] !== null) element.css(set[i], element.data("ec.storage."+set[i]));
+		}
+	},
+
+	setMode: function(el, mode) {
+		if (mode == 'toggle') mode = el.is(':hidden') ? 'show' : 'hide'; // Set for toggle
+		return mode;
+	},
+
+	getBaseline: function(origin, original) { // Translates a [top,left] array into a baseline value
+		// this should be a little more flexible in the future to handle a string & hash
+		var y, x;
+		switch (origin[0]) {
+			case 'top': y = 0; break;
+			case 'middle': y = 0.5; break;
+			case 'bottom': y = 1; break;
+			default: y = origin[0] / original.height;
+		};
+		switch (origin[1]) {
+			case 'left': x = 0; break;
+			case 'center': x = 0.5; break;
+			case 'right': x = 1; break;
+			default: x = origin[1] / original.width;
+		};
+		return {x: x, y: y};
+	},
+
+	// Wraps the element around a wrapper that copies position properties
+	createWrapper: function(element) {
+
+		// if the element is already wrapped, return it
+		if (element.parent().is('.ui-effects-wrapper')) {
+			return element.parent();
+		}
+
+		// wrap the element
+		var props = {
+				width: element.outerWidth(true),
+				height: element.outerHeight(true),
+				'float': element.css('float')
+			},
+			wrapper = $('<div></div>')
+				.addClass('ui-effects-wrapper')
+				.css({
+					fontSize: '100%',
+					background: 'transparent',
+					border: 'none',
+					margin: 0,
+					padding: 0
+				});
+
+		element.wrap(wrapper);
+		wrapper = element.parent(); //Hotfix for jQuery 1.4 since some change in wrap() seems to actually loose the reference to the wrapped element
+
+		// transfer positioning properties to the wrapper
+		if (element.css('position') == 'static') {
+			wrapper.css({ position: 'relative' });
+			element.css({ position: 'relative' });
+		} else {
+			$.extend(props, {
+				position: element.css('position'),
+				zIndex: element.css('z-index')
+			});
+			$.each(['top', 'left', 'bottom', 'right'], function(i, pos) {
+				props[pos] = element.css(pos);
+				if (isNaN(parseInt(props[pos], 10))) {
+					props[pos] = 'auto';
+				}
+			});
+			element.css({position: 'relative', top: 0, left: 0, right: 'auto', bottom: 'auto' });
+		}
+
+		return wrapper.css(props).show();
+	},
+
+	removeWrapper: function(element) {
+		if (element.parent().is('.ui-effects-wrapper'))
+			return element.parent().replaceWith(element);
+		return element;
+	},
+
+	setTransition: function(element, list, factor, value) {
+		value = value || {};
+		$.each(list, function(i, x){
+			unit = element.cssUnit(x);
+			if (unit[0] > 0) value[x] = unit[0] * factor + unit[1];
+		});
+		return value;
+	}
+});
+
+
+function _normalizeArguments(effect, options, speed, callback) {
+	// shift params for method overloading
+	if (typeof effect == 'object') {
+		callback = options;
+		speed = null;
+		options = effect;
+		effect = options.effect;
+	}
+	if ($.isFunction(options)) {
+		callback = options;
+		speed = null;
+		options = {};
+	}
+        if (typeof options == 'number' || $.fx.speeds[options]) {
+		callback = speed;
+		speed = options;
+		options = {};
+	}
+	if ($.isFunction(speed)) {
+		callback = speed;
+		speed = null;
+	}
+
+	options = options || {};
+
+	speed = speed || options.duration;
+	speed = $.fx.off ? 0 : typeof speed == 'number'
+		? speed : speed in $.fx.speeds ? $.fx.speeds[speed] : $.fx.speeds._default;
+
+	callback = callback || options.complete;
+
+	return [effect, options, speed, callback];
+}
+
+function standardSpeed( speed ) {
+	// valid standard speeds
+	if ( !speed || typeof speed === "number" || $.fx.speeds[ speed ] ) {
+		return true;
+	}
+	
+	// invalid strings - treat as "normal" speed
+	if ( typeof speed === "string" && !$.effects[ speed ] ) {
+		return true;
+	}
+	
+	return false;
+}
+
+$.fn.extend({
+	effect: function(effect, options, speed, callback) {
+		var args = _normalizeArguments.apply(this, arguments),
+			// TODO: make effects take actual parameters instead of a hash
+			args2 = {
+				options: args[1],
+				duration: args[2],
+				callback: args[3]
+			},
+			mode = args2.options.mode,
+			effectMethod = $.effects[effect];
+		
+		if ( $.fx.off || !effectMethod ) {
+			// delegate to the original method (e.g., .show()) if possible
+			if ( mode ) {
+				return this[ mode ]( args2.duration, args2.callback );
+			} else {
+				return this.each(function() {
+					if ( args2.callback ) {
+						args2.callback.call( this );
+					}
+				});
+			}
+		}
+		
+		return effectMethod.call(this, args2);
+	},
+
+	_show: $.fn.show,
+	show: function(speed) {
+		if ( standardSpeed( speed ) ) {
+			return this._show.apply(this, arguments);
+		} else {
+			var args = _normalizeArguments.apply(this, arguments);
+			args[1].mode = 'show';
+			return this.effect.apply(this, args);
+		}
+	},
+
+	_hide: $.fn.hide,
+	hide: function(speed) {
+		if ( standardSpeed( speed ) ) {
+			return this._hide.apply(this, arguments);
+		} else {
+			var args = _normalizeArguments.apply(this, arguments);
+			args[1].mode = 'hide';
+			return this.effect.apply(this, args);
+		}
+	},
+
+	// jQuery core overloads toggle and creates _toggle
+	__toggle: $.fn.toggle,
+	toggle: function(speed) {
+		if ( standardSpeed( speed ) || typeof speed === "boolean" || $.isFunction( speed ) ) {
+			return this.__toggle.apply(this, arguments);
+		} else {
+			var args = _normalizeArguments.apply(this, arguments);
+			args[1].mode = 'toggle';
+			return this.effect.apply(this, args);
+		}
+	},
+
+	// helper functions
+	cssUnit: function(key) {
+		var style = this.css(key), val = [];
+		$.each( ['em','px','%','pt'], function(i, unit){
+			if(style.indexOf(unit) > 0)
+				val = [parseFloat(style), unit];
+		});
+		return val;
+	}
+});
+
+
+
+/******************************************************************************/
+/*********************************** EASING ***********************************/
+/******************************************************************************/
+
+/*
+ * jQuery Easing v1.3 - http://gsgd.co.uk/sandbox/jquery/easing/
+ *
+ * Uses the built in easing capabilities added In jQuery 1.1
+ * to offer multiple easing options
+ *
+ * TERMS OF USE - jQuery Easing
+ *
+ * Open source under the BSD License.
+ *
+ * Copyright 2008 George McGinley Smith
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this list of
+ * conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright notice, this list
+ * of conditions and the following disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+ *
+ * Neither the name of the author nor the names of contributors may be used to endorse
+ * or promote products derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+ * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+*/
+
+// t: current time, b: begInnIng value, c: change In value, d: duration
+$.easing.jswing = $.easing.swing;
+
+$.extend($.easing,
+{
+	def: 'easeOutQuad',
+	swing: function (x, t, b, c, d) {
+		//alert($.easing.default);
+		return $.easing[$.easing.def](x, t, b, c, d);
+	},
+	easeInQuad: function (x, t, b, c, d) {
+		return c*(t/=d)*t + b;
+	},
+	easeOutQuad: function (x, t, b, c, d) {
+		return -c *(t/=d)*(t-2) + b;
+	},
+	easeInOutQuad: function (x, t, b, c, d) {
+		if ((t/=d/2) < 1) return c/2*t*t + b;
+		return -c/2 * ((--t)*(t-2) - 1) + b;
+	},
+	easeInCubic: function (x, t, b, c, d) {
+		return c*(t/=d)*t*t + b;
+	},
+	easeOutCubic: function (x, t, b, c, d) {
+		return c*((t=t/d-1)*t*t + 1) + b;
+	},
+	easeInOutCubic: function (x, t, b, c, d) {
+		if ((t/=d/2) < 1) return c/2*t*t*t + b;
+		return c/2*((t-=2)*t*t + 2) + b;
+	},
+	easeInQuart: function (x, t, b, c, d) {
+		return c*(t/=d)*t*t*t + b;
+	},
+	easeOutQuart: function (x, t, b, c, d) {
+		return -c * ((t=t/d-1)*t*t*t - 1) + b;
+	},
+	easeInOutQuart: function (x, t, b, c, d) {
+		if ((t/=d/2) < 1) return c/2*t*t*t*t + b;
+		return -c/2 * ((t-=2)*t*t*t - 2) + b;
+	},
+	easeInQuint: function (x, t, b, c, d) {
+		return c*(t/=d)*t*t*t*t + b;
+	},
+	easeOutQuint: function (x, t, b, c, d) {
+		return c*((t=t/d-1)*t*t*t*t + 1) + b;
+	},
+	easeInOutQuint: function (x, t, b, c, d) {
+		if ((t/=d/2) < 1) return c/2*t*t*t*t*t + b;
+		return c/2*((t-=2)*t*t*t*t + 2) + b;
+	},
+	easeInSine: function (x, t, b, c, d) {
+		return -c * Math.cos(t/d * (Math.PI/2)) + c + b;
+	},
+	easeOutSine: function (x, t, b, c, d) {
+		return c * Math.sin(t/d * (Math.PI/2)) + b;
+	},
+	easeInOutSine: function (x, t, b, c, d) {
+		return -c/2 * (Math.cos(Math.PI*t/d) - 1) + b;
+	},
+	easeInExpo: function (x, t, b, c, d) {
+		return (t==0) ? b : c * Math.pow(2, 10 * (t/d - 1)) + b;
+	},
+	easeOutExpo: function (x, t, b, c, d) {
+		return (t==d) ? b+c : c * (-Math.pow(2, -10 * t/d) + 1) + b;
+	},
+	easeInOutExpo: function (x, t, b, c, d) {
+		if (t==0) return b;
+		if (t==d) return b+c;
+		if ((t/=d/2) < 1) return c/2 * Math.pow(2, 10 * (t - 1)) + b;
+		return c/2 * (-Math.pow(2, -10 * --t) + 2) + b;
+	},
+	easeInCirc: function (x, t, b, c, d) {
+		return -c * (Math.sqrt(1 - (t/=d)*t) - 1) + b;
+	},
+	easeOutCirc: function (x, t, b, c, d) {
+		return c * Math.sqrt(1 - (t=t/d-1)*t) + b;
+	},
+	easeInOutCirc: function (x, t, b, c, d) {
+		if ((t/=d/2) < 1) return -c/2 * (Math.sqrt(1 - t*t) - 1) + b;
+		return c/2 * (Math.sqrt(1 - (t-=2)*t) + 1) + b;
+	},
+	easeInElastic: function (x, t, b, c, d) {
+		var s=1.70158;var p=0;var a=c;
+		if (t==0) return b;  if ((t/=d)==1) return b+c;  if (!p) p=d*.3;
+		if (a < Math.abs(c)) { a=c; var s=p/4; }
+		else var s = p/(2*Math.PI) * Math.asin (c/a);
+		return -(a*Math.pow(2,10*(t-=1)) * Math.sin( (t*d-s)*(2*Math.PI)/p )) + b;
+	},
+	easeOutElastic: function (x, t, b, c, d) {
+		var s=1.70158;var p=0;var a=c;
+		if (t==0) return b;  if ((t/=d)==1) return b+c;  if (!p) p=d*.3;
+		if (a < Math.abs(c)) { a=c; var s=p/4; }
+		else var s = p/(2*Math.PI) * Math.asin (c/a);
+		return a*Math.pow(2,-10*t) * Math.sin( (t*d-s)*(2*Math.PI)/p ) + c + b;
+	},
+	easeInOutElastic: function (x, t, b, c, d) {
+		var s=1.70158;var p=0;var a=c;
+		if (t==0) return b;  if ((t/=d/2)==2) return b+c;  if (!p) p=d*(.3*1.5);
+		if (a < Math.abs(c)) { a=c; var s=p/4; }
+		else var s = p/(2*Math.PI) * Math.asin (c/a);
+		if (t < 1) return -.5*(a*Math.pow(2,10*(t-=1)) * Math.sin( (t*d-s)*(2*Math.PI)/p )) + b;
+		return a*Math.pow(2,-10*(t-=1)) * Math.sin( (t*d-s)*(2*Math.PI)/p )*.5 + c + b;
+	},
+	easeInBack: function (x, t, b, c, d, s) {
+		if (s == undefined) s = 1.70158;
+		return c*(t/=d)*t*((s+1)*t - s) + b;
+	},
+	easeOutBack: function (x, t, b, c, d, s) {
+		if (s == undefined) s = 1.70158;
+		return c*((t=t/d-1)*t*((s+1)*t + s) + 1) + b;
+	},
+	easeInOutBack: function (x, t, b, c, d, s) {
+		if (s == undefined) s = 1.70158;
+		if ((t/=d/2) < 1) return c/2*(t*t*(((s*=(1.525))+1)*t - s)) + b;
+		return c/2*((t-=2)*t*(((s*=(1.525))+1)*t + s) + 2) + b;
+	},
+	easeInBounce: function (x, t, b, c, d) {
+		return c - $.easing.easeOutBounce (x, d-t, 0, c, d) + b;
+	},
+	easeOutBounce: function (x, t, b, c, d) {
+		if ((t/=d) < (1/2.75)) {
+			return c*(7.5625*t*t) + b;
+		} else if (t < (2/2.75)) {
+			return c*(7.5625*(t-=(1.5/2.75))*t + .75) + b;
+		} else if (t < (2.5/2.75)) {
+			return c*(7.5625*(t-=(2.25/2.75))*t + .9375) + b;
+		} else {
+			return c*(7.5625*(t-=(2.625/2.75))*t + .984375) + b;
+		}
+	},
+	easeInOutBounce: function (x, t, b, c, d) {
+		if (t < d/2) return $.easing.easeInBounce (x, t*2, 0, c, d) * .5 + b;
+		return $.easing.easeOutBounce (x, t*2-d, 0, c, d) * .5 + c*.5 + b;
+	}
+});
+
+/*
+ *
+ * TERMS OF USE - EASING EQUATIONS
+ *
+ * Open source under the BSD License.
+ *
+ * Copyright 2001 Robert Penner
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this list of
+ * conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright notice, this list
+ * of conditions and the following disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+ *
+ * Neither the name of the author nor the names of contributors may be used to endorse
+ * or promote products derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+ * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+})(jQuery);
diff --git a/js/ui/jquery.effects.drop.js b/js/ui/jquery.effects.drop.js
new file mode 100644
index 0000000000..0ee2a9793f
--- /dev/null
+++ b/js/ui/jquery.effects.drop.js
@@ -0,0 +1,50 @@
+/*
+ * jQuery UI Effects Drop 1.8.10
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/Drop
+ *
+ * Depends:
+ *	jquery.effects.core.js
+ */
+(function( $, undefined ) {
+
+$.effects.drop = function(o) {
+
+	return this.queue(function() {
+
+		// Create element
+		var el = $(this), props = ['position','top','bottom','left','right','opacity'];
+
+		// Set options
+		var mode = $.effects.setMode(el, o.options.mode || 'hide'); // Set Mode
+		var direction = o.options.direction || 'left'; // Default Direction
+
+		// Adjust
+		$.effects.save(el, props); el.show(); // Save & Show
+		$.effects.createWrapper(el); // Create Wrapper
+		var ref = (direction == 'up' || direction == 'down') ? 'top' : 'left';
+		var motion = (direction == 'up' || direction == 'left') ? 'pos' : 'neg';
+		var distance = o.options.distance || (ref == 'top' ? el.outerHeight({margin:true}) / 2 : el.outerWidth({margin:true}) / 2);
+		if (mode == 'show') el.css('opacity', 0).css(ref, motion == 'pos' ? -distance : distance); // Shift
+
+		// Animation
+		var animation = {opacity: mode == 'show' ? 1 : 0};
+		animation[ref] = (mode == 'show' ? (motion == 'pos' ? '+=' : '-=') : (motion == 'pos' ? '-=' : '+=')) + distance;
+
+		// Animate
+		el.animate(animation, { queue: false, duration: o.duration, easing: o.options.easing, complete: function() {
+			if(mode == 'hide') el.hide(); // Hide
+			$.effects.restore(el, props); $.effects.removeWrapper(el); // Restore
+			if(o.callback) o.callback.apply(this, arguments); // Callback
+			el.dequeue();
+		}});
+
+	});
+
+};
+
+})(jQuery);
diff --git a/js/ui/jquery.effects.explode.js b/js/ui/jquery.effects.explode.js
new file mode 100644
index 0000000000..5b3f7b450f
--- /dev/null
+++ b/js/ui/jquery.effects.explode.js
@@ -0,0 +1,79 @@
+/*
+ * jQuery UI Effects Explode 1.8.10
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/Explode
+ *
+ * Depends:
+ *	jquery.effects.core.js
+ */
+(function( $, undefined ) {
+
+$.effects.explode = function(o) {
+
+	return this.queue(function() {
+
+	var rows = o.options.pieces ? Math.round(Math.sqrt(o.options.pieces)) : 3;
+	var cells = o.options.pieces ? Math.round(Math.sqrt(o.options.pieces)) : 3;
+
+	o.options.mode = o.options.mode == 'toggle' ? ($(this).is(':visible') ? 'hide' : 'show') : o.options.mode;
+	var el = $(this).show().css('visibility', 'hidden');
+	var offset = el.offset();
+
+	//Substract the margins - not fixing the problem yet.
+	offset.top -= parseInt(el.css("marginTop"),10) || 0;
+	offset.left -= parseInt(el.css("marginLeft"),10) || 0;
+
+	var width = el.outerWidth(true);
+	var height = el.outerHeight(true);
+
+	for(var i=0;i<rows;i++) { // =
+		for(var j=0;j<cells;j++) { // ||
+			el
+				.clone()
+				.appendTo('body')
+				.wrap('<div></div>')
+				.css({
+					position: 'absolute',
+					visibility: 'visible',
+					left: -j*(width/cells),
+					top: -i*(height/rows)
+				})
+				.parent()
+				.addClass('ui-effects-explode')
+				.css({
+					position: 'absolute',
+					overflow: 'hidden',
+					width: width/cells,
+					height: height/rows,
+					left: offset.left + j*(width/cells) + (o.options.mode == 'show' ? (j-Math.floor(cells/2))*(width/cells) : 0),
+					top: offset.top + i*(height/rows) + (o.options.mode == 'show' ? (i-Math.floor(rows/2))*(height/rows) : 0),
+					opacity: o.options.mode == 'show' ? 0 : 1
+				}).animate({
+					left: offset.left + j*(width/cells) + (o.options.mode == 'show' ? 0 : (j-Math.floor(cells/2))*(width/cells)),
+					top: offset.top + i*(height/rows) + (o.options.mode == 'show' ? 0 : (i-Math.floor(rows/2))*(height/rows)),
+					opacity: o.options.mode == 'show' ? 1 : 0
+				}, o.duration || 500);
+		}
+	}
+
+	// Set a timeout, to call the callback approx. when the other animations have finished
+	setTimeout(function() {
+
+		o.options.mode == 'show' ? el.css({ visibility: 'visible' }) : el.css({ visibility: 'visible' }).hide();
+				if(o.callback) o.callback.apply(el[0]); // Callback
+				el.dequeue();
+
+				$('div.ui-effects-explode').remove();
+
+	}, o.duration || 500);
+
+
+	});
+
+};
+
+})(jQuery);
diff --git a/js/ui/jquery.effects.fade.js b/js/ui/jquery.effects.fade.js
new file mode 100644
index 0000000000..325fb6d472
--- /dev/null
+++ b/js/ui/jquery.effects.fade.js
@@ -0,0 +1,32 @@
+/*
+ * jQuery UI Effects Fade 1.8.10
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/Fade
+ *
+ * Depends:
+ *	jquery.effects.core.js
+ */
+(function( $, undefined ) {
+
+$.effects.fade = function(o) {
+	return this.queue(function() {
+		var elem = $(this),
+			mode = $.effects.setMode(elem, o.options.mode || 'hide');
+
+		elem.animate({ opacity: mode }, {
+			queue: false,
+			duration: o.duration,
+			easing: o.options.easing,
+			complete: function() {
+				(o.callback && o.callback.apply(this, arguments));
+				elem.dequeue();
+			}
+		});
+	});
+};
+
+})(jQuery);
diff --git a/js/ui/jquery.effects.fold.js b/js/ui/jquery.effects.fold.js
new file mode 100644
index 0000000000..e5f403c87e
--- /dev/null
+++ b/js/ui/jquery.effects.fold.js
@@ -0,0 +1,56 @@
+/*
+ * jQuery UI Effects Fold 1.8.10
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/Fold
+ *
+ * Depends:
+ *	jquery.effects.core.js
+ */
+(function( $, undefined ) {
+
+$.effects.fold = function(o) {
+
+	return this.queue(function() {
+
+		// Create element
+		var el = $(this), props = ['position','top','bottom','left','right'];
+
+		// Set options
+		var mode = $.effects.setMode(el, o.options.mode || 'hide'); // Set Mode
+		var size = o.options.size || 15; // Default fold size
+		var horizFirst = !(!o.options.horizFirst); // Ensure a boolean value
+		var duration = o.duration ? o.duration / 2 : $.fx.speeds._default / 2;
+
+		// Adjust
+		$.effects.save(el, props); el.show(); // Save & Show
+		var wrapper = $.effects.createWrapper(el).css({overflow:'hidden'}); // Create Wrapper
+		var widthFirst = ((mode == 'show') != horizFirst);
+		var ref = widthFirst ? ['width', 'height'] : ['height', 'width'];
+		var distance = widthFirst ? [wrapper.width(), wrapper.height()] : [wrapper.height(), wrapper.width()];
+		var percent = /([0-9]+)%/.exec(size);
+		if(percent) size = parseInt(percent[1],10) / 100 * distance[mode == 'hide' ? 0 : 1];
+		if(mode == 'show') wrapper.css(horizFirst ? {height: 0, width: size} : {height: size, width: 0}); // Shift
+
+		// Animation
+		var animation1 = {}, animation2 = {};
+		animation1[ref[0]] = mode == 'show' ? distance[0] : size;
+		animation2[ref[1]] = mode == 'show' ? distance[1] : 0;
+
+		// Animate
+		wrapper.animate(animation1, duration, o.options.easing)
+		.animate(animation2, duration, o.options.easing, function() {
+			if(mode == 'hide') el.hide(); // Hide
+			$.effects.restore(el, props); $.effects.removeWrapper(el); // Restore
+			if(o.callback) o.callback.apply(el[0], arguments); // Callback
+			el.dequeue();
+		});
+
+	});
+
+};
+
+})(jQuery);
diff --git a/js/ui/jquery.effects.highlight.js b/js/ui/jquery.effects.highlight.js
new file mode 100644
index 0000000000..9f0890ebb5
--- /dev/null
+++ b/js/ui/jquery.effects.highlight.js
@@ -0,0 +1,50 @@
+/*
+ * jQuery UI Effects Highlight 1.8.10
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/Highlight
+ *
+ * Depends:
+ *	jquery.effects.core.js
+ */
+(function( $, undefined ) {
+
+$.effects.highlight = function(o) {
+	return this.queue(function() {
+		var elem = $(this),
+			props = ['backgroundImage', 'backgroundColor', 'opacity'],
+			mode = $.effects.setMode(elem, o.options.mode || 'show'),
+			animation = {
+				backgroundColor: elem.css('backgroundColor')
+			};
+
+		if (mode == 'hide') {
+			animation.opacity = 0;
+		}
+
+		$.effects.save(elem, props);
+		elem
+			.show()
+			.css({
+				backgroundImage: 'none',
+				backgroundColor: o.options.color || '#ffff99'
+			})
+			.animate(animation, {
+				queue: false,
+				duration: o.duration,
+				easing: o.options.easing,
+				complete: function() {
+					(mode == 'hide' && elem.hide());
+					$.effects.restore(elem, props);
+					(mode == 'show' && !$.support.opacity && this.style.removeAttribute('filter'));
+					(o.callback && o.callback.apply(this, arguments));
+					elem.dequeue();
+				}
+			});
+	});
+};
+
+})(jQuery);
diff --git a/js/ui/jquery.effects.pulsate.js b/js/ui/jquery.effects.pulsate.js
new file mode 100644
index 0000000000..922e018ec5
--- /dev/null
+++ b/js/ui/jquery.effects.pulsate.js
@@ -0,0 +1,51 @@
+/*
+ * jQuery UI Effects Pulsate 1.8.10
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/Pulsate
+ *
+ * Depends:
+ *	jquery.effects.core.js
+ */
+(function( $, undefined ) {
+
+$.effects.pulsate = function(o) {
+	return this.queue(function() {
+		var elem = $(this),
+			mode = $.effects.setMode(elem, o.options.mode || 'show');
+			times = ((o.options.times || 5) * 2) - 1;
+			duration = o.duration ? o.duration / 2 : $.fx.speeds._default / 2,
+			isVisible = elem.is(':visible'),
+			animateTo = 0;
+
+		if (!isVisible) {
+			elem.css('opacity', 0).show();
+			animateTo = 1;
+		}
+
+		if ((mode == 'hide' && isVisible) || (mode == 'show' && !isVisible)) {
+			times--;
+		}
+
+		for (var i = 0; i < times; i++) {
+			elem.animate({ opacity: animateTo }, duration, o.options.easing);
+			animateTo = (animateTo + 1) % 2;
+		}
+
+		elem.animate({ opacity: animateTo }, duration, o.options.easing, function() {
+			if (animateTo == 0) {
+				elem.hide();
+			}
+			(o.callback && o.callback.apply(this, arguments));
+		});
+
+		elem
+			.queue('fx', function() { elem.dequeue(); })
+			.dequeue();
+	});
+};
+
+})(jQuery);
diff --git a/js/ui/jquery.effects.scale.js b/js/ui/jquery.effects.scale.js
new file mode 100644
index 0000000000..8ad72bcbf1
--- /dev/null
+++ b/js/ui/jquery.effects.scale.js
@@ -0,0 +1,178 @@
+/*
+ * jQuery UI Effects Scale 1.8.10
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/Scale
+ *
+ * Depends:
+ *	jquery.effects.core.js
+ */
+(function( $, undefined ) {
+
+$.effects.puff = function(o) {
+	return this.queue(function() {
+		var elem = $(this),
+			mode = $.effects.setMode(elem, o.options.mode || 'hide'),
+			percent = parseInt(o.options.percent, 10) || 150,
+			factor = percent / 100,
+			original = { height: elem.height(), width: elem.width() };
+
+		$.extend(o.options, {
+			fade: true,
+			mode: mode,
+			percent: mode == 'hide' ? percent : 100,
+			from: mode == 'hide'
+				? original
+				: {
+					height: original.height * factor,
+					width: original.width * factor
+				}
+		});
+
+		elem.effect('scale', o.options, o.duration, o.callback);
+		elem.dequeue();
+	});
+};
+
+$.effects.scale = function(o) {
+
+	return this.queue(function() {
+
+		// Create element
+		var el = $(this);
+
+		// Set options
+		var options = $.extend(true, {}, o.options);
+		var mode = $.effects.setMode(el, o.options.mode || 'effect'); // Set Mode
+		var percent = parseInt(o.options.percent,10) || (parseInt(o.options.percent,10) == 0 ? 0 : (mode == 'hide' ? 0 : 100)); // Set default scaling percent
+		var direction = o.options.direction || 'both'; // Set default axis
+		var origin = o.options.origin; // The origin of the scaling
+		if (mode != 'effect') { // Set default origin and restore for show/hide
+			options.origin = origin || ['middle','center'];
+			options.restore = true;
+		}
+		var original = {height: el.height(), width: el.width()}; // Save original
+		el.from = o.options.from || (mode == 'show' ? {height: 0, width: 0} : original); // Default from state
+
+		// Adjust
+		var factor = { // Set scaling factor
+			y: direction != 'horizontal' ? (percent / 100) : 1,
+			x: direction != 'vertical' ? (percent / 100) : 1
+		};
+		el.to = {height: original.height * factor.y, width: original.width * factor.x}; // Set to state
+
+		if (o.options.fade) { // Fade option to support puff
+			if (mode == 'show') {el.from.opacity = 0; el.to.opacity = 1;};
+			if (mode == 'hide') {el.from.opacity = 1; el.to.opacity = 0;};
+		};
+
+		// Animation
+		options.from = el.from; options.to = el.to; options.mode = mode;
+
+		// Animate
+		el.effect('size', options, o.duration, o.callback);
+		el.dequeue();
+	});
+
+};
+
+$.effects.size = function(o) {
+
+	return this.queue(function() {
+
+		// Create element
+		var el = $(this), props = ['position','top','bottom','left','right','width','height','overflow','opacity'];
+		var props1 = ['position','top','bottom','left','right','overflow','opacity']; // Always restore
+		var props2 = ['width','height','overflow']; // Copy for children
+		var cProps = ['fontSize'];
+		var vProps = ['borderTopWidth', 'borderBottomWidth', 'paddingTop', 'paddingBottom'];
+		var hProps = ['borderLeftWidth', 'borderRightWidth', 'paddingLeft', 'paddingRight'];
+
+		// Set options
+		var mode = $.effects.setMode(el, o.options.mode || 'effect'); // Set Mode
+		var restore = o.options.restore || false; // Default restore
+		var scale = o.options.scale || 'both'; // Default scale mode
+		var origin = o.options.origin; // The origin of the sizing
+		var original = {height: el.height(), width: el.width()}; // Save original
+		el.from = o.options.from || original; // Default from state
+		el.to = o.options.to || original; // Default to state
+		// Adjust
+		if (origin) { // Calculate baseline shifts
+			var baseline = $.effects.getBaseline(origin, original);
+			el.from.top = (original.height - el.from.height) * baseline.y;
+			el.from.left = (original.width - el.from.width) * baseline.x;
+			el.to.top = (original.height - el.to.height) * baseline.y;
+			el.to.left = (original.width - el.to.width) * baseline.x;
+		};
+		var factor = { // Set scaling factor
+			from: {y: el.from.height / original.height, x: el.from.width / original.width},
+			to: {y: el.to.height / original.height, x: el.to.width / original.width}
+		};
+		if (scale == 'box' || scale == 'both') { // Scale the css box
+			if (factor.from.y != factor.to.y) { // Vertical props scaling
+				props = props.concat(vProps);
+				el.from = $.effects.setTransition(el, vProps, factor.from.y, el.from);
+				el.to = $.effects.setTransition(el, vProps, factor.to.y, el.to);
+			};
+			if (factor.from.x != factor.to.x) { // Horizontal props scaling
+				props = props.concat(hProps);
+				el.from = $.effects.setTransition(el, hProps, factor.from.x, el.from);
+				el.to = $.effects.setTransition(el, hProps, factor.to.x, el.to);
+			};
+		};
+		if (scale == 'content' || scale == 'both') { // Scale the content
+			if (factor.from.y != factor.to.y) { // Vertical props scaling
+				props = props.concat(cProps);
+				el.from = $.effects.setTransition(el, cProps, factor.from.y, el.from);
+				el.to = $.effects.setTransition(el, cProps, factor.to.y, el.to);
+			};
+		};
+		$.effects.save(el, restore ? props : props1); el.show(); // Save & Show
+		$.effects.createWrapper(el); // Create Wrapper
+		el.css('overflow','hidden').css(el.from); // Shift
+
+		// Animate
+		if (scale == 'content' || scale == 'both') { // Scale the children
+			vProps = vProps.concat(['marginTop','marginBottom']).concat(cProps); // Add margins/font-size
+			hProps = hProps.concat(['marginLeft','marginRight']); // Add margins
+			props2 = props.concat(vProps).concat(hProps); // Concat
+			el.find("*[width]").each(function(){
+				child = $(this);
+				if (restore) $.effects.save(child, props2);
+				var c_original = {height: child.height(), width: child.width()}; // Save original
+				child.from = {height: c_original.height * factor.from.y, width: c_original.width * factor.from.x};
+				child.to = {height: c_original.height * factor.to.y, width: c_original.width * factor.to.x};
+				if (factor.from.y != factor.to.y) { // Vertical props scaling
+					child.from = $.effects.setTransition(child, vProps, factor.from.y, child.from);
+					child.to = $.effects.setTransition(child, vProps, factor.to.y, child.to);
+				};
+				if (factor.from.x != factor.to.x) { // Horizontal props scaling
+					child.from = $.effects.setTransition(child, hProps, factor.from.x, child.from);
+					child.to = $.effects.setTransition(child, hProps, factor.to.x, child.to);
+				};
+				child.css(child.from); // Shift children
+				child.animate(child.to, o.duration, o.options.easing, function(){
+					if (restore) $.effects.restore(child, props2); // Restore children
+				}); // Animate children
+			});
+		};
+
+		// Animate
+		el.animate(el.to, { queue: false, duration: o.duration, easing: o.options.easing, complete: function() {
+			if (el.to.opacity === 0) {
+				el.css('opacity', el.from.opacity);
+			}
+			if(mode == 'hide') el.hide(); // Hide
+			$.effects.restore(el, restore ? props : props1); $.effects.removeWrapper(el); // Restore
+			if(o.callback) o.callback.apply(this, arguments); // Callback
+			el.dequeue();
+		}});
+
+	});
+
+};
+
+})(jQuery);
diff --git a/js/ui/jquery.effects.shake.js b/js/ui/jquery.effects.shake.js
new file mode 100644
index 0000000000..554286ff9a
--- /dev/null
+++ b/js/ui/jquery.effects.shake.js
@@ -0,0 +1,57 @@
+/*
+ * jQuery UI Effects Shake 1.8.10
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/Shake
+ *
+ * Depends:
+ *	jquery.effects.core.js
+ */
+(function( $, undefined ) {
+
+$.effects.shake = function(o) {
+
+	return this.queue(function() {
+
+		// Create element
+		var el = $(this), props = ['position','top','bottom','left','right'];
+
+		// Set options
+		var mode = $.effects.setMode(el, o.options.mode || 'effect'); // Set Mode
+		var direction = o.options.direction || 'left'; // Default direction
+		var distance = o.options.distance || 20; // Default distance
+		var times = o.options.times || 3; // Default # of times
+		var speed = o.duration || o.options.duration || 140; // Default speed per shake
+
+		// Adjust
+		$.effects.save(el, props); el.show(); // Save & Show
+		$.effects.createWrapper(el); // Create Wrapper
+		var ref = (direction == 'up' || direction == 'down') ? 'top' : 'left';
+		var motion = (direction == 'up' || direction == 'left') ? 'pos' : 'neg';
+
+		// Animation
+		var animation = {}, animation1 = {}, animation2 = {};
+		animation[ref] = (motion == 'pos' ? '-=' : '+=')  + distance;
+		animation1[ref] = (motion == 'pos' ? '+=' : '-=')  + distance * 2;
+		animation2[ref] = (motion == 'pos' ? '-=' : '+=')  + distance * 2;
+
+		// Animate
+		el.animate(animation, speed, o.options.easing);
+		for (var i = 1; i < times; i++) { // Shakes
+			el.animate(animation1, speed, o.options.easing).animate(animation2, speed, o.options.easing);
+		};
+		el.animate(animation1, speed, o.options.easing).
+		animate(animation, speed / 2, o.options.easing, function(){ // Last shake
+			$.effects.restore(el, props); $.effects.removeWrapper(el); // Restore
+			if(o.callback) o.callback.apply(this, arguments); // Callback
+		});
+		el.queue('fx', function() { el.dequeue(); });
+		el.dequeue();
+	});
+
+};
+
+})(jQuery);
diff --git a/js/ui/jquery.effects.slide.js b/js/ui/jquery.effects.slide.js
new file mode 100644
index 0000000000..55d8adb7eb
--- /dev/null
+++ b/js/ui/jquery.effects.slide.js
@@ -0,0 +1,50 @@
+/*
+ * jQuery UI Effects Slide 1.8.10
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/Slide
+ *
+ * Depends:
+ *	jquery.effects.core.js
+ */
+(function( $, undefined ) {
+
+$.effects.slide = function(o) {
+
+	return this.queue(function() {
+
+		// Create element
+		var el = $(this), props = ['position','top','bottom','left','right'];
+
+		// Set options
+		var mode = $.effects.setMode(el, o.options.mode || 'show'); // Set Mode
+		var direction = o.options.direction || 'left'; // Default Direction
+
+		// Adjust
+		$.effects.save(el, props); el.show(); // Save & Show
+		$.effects.createWrapper(el).css({overflow:'hidden'}); // Create Wrapper
+		var ref = (direction == 'up' || direction == 'down') ? 'top' : 'left';
+		var motion = (direction == 'up' || direction == 'left') ? 'pos' : 'neg';
+		var distance = o.options.distance || (ref == 'top' ? el.outerHeight({margin:true}) : el.outerWidth({margin:true}));
+		if (mode == 'show') el.css(ref, motion == 'pos' ? (isNaN(distance) ? "-" + distance : -distance) : distance); // Shift
+
+		// Animation
+		var animation = {};
+		animation[ref] = (mode == 'show' ? (motion == 'pos' ? '+=' : '-=') : (motion == 'pos' ? '-=' : '+=')) + distance;
+
+		// Animate
+		el.animate(animation, { queue: false, duration: o.duration, easing: o.options.easing, complete: function() {
+			if(mode == 'hide') el.hide(); // Hide
+			$.effects.restore(el, props); $.effects.removeWrapper(el); // Restore
+			if(o.callback) o.callback.apply(this, arguments); // Callback
+			el.dequeue();
+		}});
+
+	});
+
+};
+
+})(jQuery);
diff --git a/js/ui/jquery.effects.transfer.js b/js/ui/jquery.effects.transfer.js
new file mode 100644
index 0000000000..b65146d1b0
--- /dev/null
+++ b/js/ui/jquery.effects.transfer.js
@@ -0,0 +1,45 @@
+/*
+ * jQuery UI Effects Transfer 1.8.10
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/Transfer
+ *
+ * Depends:
+ *	jquery.effects.core.js
+ */
+(function( $, undefined ) {
+
+$.effects.transfer = function(o) {
+	return this.queue(function() {
+		var elem = $(this),
+			target = $(o.options.to),
+			endPosition = target.offset(),
+			animation = {
+				top: endPosition.top,
+				left: endPosition.left,
+				height: target.innerHeight(),
+				width: target.innerWidth()
+			},
+			startPosition = elem.offset(),
+			transfer = $('<div class="ui-effects-transfer"></div>')
+				.appendTo(document.body)
+				.addClass(o.options.className)
+				.css({
+					top: startPosition.top,
+					left: startPosition.left,
+					height: elem.innerHeight(),
+					width: elem.innerWidth(),
+					position: 'absolute'
+				})
+				.animate(animation, o.duration, o.options.easing, function() {
+					transfer.remove();
+					(o.callback && o.callback.apply(elem[0], arguments));
+					elem.dequeue();
+				});
+	});
+};
+
+})(jQuery);
diff --git a/js/ui/jquery.ui.accordion.js b/js/ui/jquery.ui.accordion.js
new file mode 100644
index 0000000000..db9d24bc6e
--- /dev/null
+++ b/js/ui/jquery.ui.accordion.js
@@ -0,0 +1,606 @@
+/*
+ * jQuery UI Accordion 1.8.10
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Accordion
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ *	jquery.ui.widget.js
+ */
+(function( $, undefined ) {
+
+$.widget( "ui.accordion", {
+	options: {
+		active: 0,
+		animated: "slide",
+		autoHeight: true,
+		clearStyle: false,
+		collapsible: false,
+		event: "click",
+		fillSpace: false,
+		header: "> li > :first-child,> :not(li):even",
+		icons: {
+			header: "ui-icon-triangle-1-e",
+			headerSelected: "ui-icon-triangle-1-s"
+		},
+		navigation: false,
+		navigationFilter: function() {
+			return this.href.toLowerCase() === location.href.toLowerCase();
+		}
+	},
+
+	_create: function() {
+		var self = this,
+			options = self.options;
+
+		self.running = 0;
+
+		self.element
+			.addClass( "ui-accordion ui-widget ui-helper-reset" )
+			// in lack of child-selectors in CSS
+			// we need to mark top-LIs in a UL-accordion for some IE-fix
+			.children( "li" )
+				.addClass( "ui-accordion-li-fix" );
+
+		self.headers = self.element.find( options.header )
+			.addClass( "ui-accordion-header ui-helper-reset ui-state-default ui-corner-all" )
+			.bind( "mouseenter.accordion", function() {
+				if ( options.disabled ) {
+					return;
+				}
+				$( this ).addClass( "ui-state-hover" );
+			})
+			.bind( "mouseleave.accordion", function() {
+				if ( options.disabled ) {
+					return;
+				}
+				$( this ).removeClass( "ui-state-hover" );
+			})
+			.bind( "focus.accordion", function() {
+				if ( options.disabled ) {
+					return;
+				}
+				$( this ).addClass( "ui-state-focus" );
+			})
+			.bind( "blur.accordion", function() {
+				if ( options.disabled ) {
+					return;
+				}
+				$( this ).removeClass( "ui-state-focus" );
+			});
+
+		self.headers.next()
+			.addClass( "ui-accordion-content ui-helper-reset ui-widget-content ui-corner-bottom" );
+
+		if ( options.navigation ) {
+			var current = self.element.find( "a" ).filter( options.navigationFilter ).eq( 0 );
+			if ( current.length ) {
+				var header = current.closest( ".ui-accordion-header" );
+				if ( header.length ) {
+					// anchor within header
+					self.active = header;
+				} else {
+					// anchor within content
+					self.active = current.closest( ".ui-accordion-content" ).prev();
+				}
+			}
+		}
+
+		self.active = self._findActive( self.active || options.active )
+			.addClass( "ui-state-default ui-state-active" )
+			.toggleClass( "ui-corner-all" )
+			.toggleClass( "ui-corner-top" );
+		self.active.next().addClass( "ui-accordion-content-active" );
+
+		self._createIcons();
+		self.resize();
+		
+		// ARIA
+		self.element.attr( "role", "tablist" );
+
+		self.headers
+			.attr( "role", "tab" )
+			.bind( "keydown.accordion", function( event ) {
+				return self._keydown( event );
+			})
+			.next()
+				.attr( "role", "tabpanel" );
+
+		self.headers
+			.not( self.active || "" )
+			.attr({
+				"aria-expanded": "false",
+				tabIndex: -1
+			})
+			.next()
+				.hide();
+
+		// make sure at least one header is in the tab order
+		if ( !self.active.length ) {
+			self.headers.eq( 0 ).attr( "tabIndex", 0 );
+		} else {
+			self.active
+				.attr({
+					"aria-expanded": "true",
+					tabIndex: 0
+				});
+		}
+
+		// only need links in tab order for Safari
+		if ( !$.browser.safari ) {
+			self.headers.find( "a" ).attr( "tabIndex", -1 );
+		}
+
+		if ( options.event ) {
+			self.headers.bind( options.event.split(" ").join(".accordion ") + ".accordion", function(event) {
+				self._clickHandler.call( self, event, this );
+				event.preventDefault();
+			});
+		}
+	},
+
+	_createIcons: function() {
+		var options = this.options;
+		if ( options.icons ) {
+			$( "<span></span>" )
+				.addClass( "ui-icon " + options.icons.header )
+				.prependTo( this.headers );
+			this.active.children( ".ui-icon" )
+				.toggleClass(options.icons.header)
+				.toggleClass(options.icons.headerSelected);
+			this.element.addClass( "ui-accordion-icons" );
+		}
+	},
+
+	_destroyIcons: function() {
+		this.headers.children( ".ui-icon" ).remove();
+		this.element.removeClass( "ui-accordion-icons" );
+	},
+
+	destroy: function() {
+		var options = this.options;
+
+		this.element
+			.removeClass( "ui-accordion ui-widget ui-helper-reset" )
+			.removeAttr( "role" );
+
+		this.headers
+			.unbind( ".accordion" )
+			.removeClass( "ui-accordion-header ui-accordion-disabled ui-helper-reset ui-state-default ui-corner-all ui-state-active ui-state-disabled ui-corner-top" )
+			.removeAttr( "role" )
+			.removeAttr( "aria-expanded" )
+			.removeAttr( "tabIndex" );
+
+		this.headers.find( "a" ).removeAttr( "tabIndex" );
+		this._destroyIcons();
+		var contents = this.headers.next()
+			.css( "display", "" )
+			.removeAttr( "role" )
+			.removeClass( "ui-helper-reset ui-widget-content ui-corner-bottom ui-accordion-content ui-accordion-content-active ui-accordion-disabled ui-state-disabled" );
+		if ( options.autoHeight || options.fillHeight ) {
+			contents.css( "height", "" );
+		}
+
+		return $.Widget.prototype.destroy.call( this );
+	},
+
+	_setOption: function( key, value ) {
+		$.Widget.prototype._setOption.apply( this, arguments );
+			
+		if ( key == "active" ) {
+			this.activate( value );
+		}
+		if ( key == "icons" ) {
+			this._destroyIcons();
+			if ( value ) {
+				this._createIcons();
+			}
+		}
+		// #5332 - opacity doesn't cascade to positioned elements in IE
+		// so we need to add the disabled class to the headers and panels
+		if ( key == "disabled" ) {
+			this.headers.add(this.headers.next())
+				[ value ? "addClass" : "removeClass" ](
+					"ui-accordion-disabled ui-state-disabled" );
+		}
+	},
+
+	_keydown: function( event ) {
+		if ( this.options.disabled || event.altKey || event.ctrlKey ) {
+			return;
+		}
+
+		var keyCode = $.ui.keyCode,
+			length = this.headers.length,
+			currentIndex = this.headers.index( event.target ),
+			toFocus = false;
+
+		switch ( event.keyCode ) {
+			case keyCode.RIGHT:
+			case keyCode.DOWN:
+				toFocus = this.headers[ ( currentIndex + 1 ) % length ];
+				break;
+			case keyCode.LEFT:
+			case keyCode.UP:
+				toFocus = this.headers[ ( currentIndex - 1 + length ) % length ];
+				break;
+			case keyCode.SPACE:
+			case keyCode.ENTER:
+				this._clickHandler( { target: event.target }, event.target );
+				event.preventDefault();
+		}
+
+		if ( toFocus ) {
+			$( event.target ).attr( "tabIndex", -1 );
+			$( toFocus ).attr( "tabIndex", 0 );
+			toFocus.focus();
+			return false;
+		}
+
+		return true;
+	},
+
+	resize: function() {
+		var options = this.options,
+			maxHeight;
+
+		if ( options.fillSpace ) {
+			if ( $.browser.msie ) {
+				var defOverflow = this.element.parent().css( "overflow" );
+				this.element.parent().css( "overflow", "hidden");
+			}
+			maxHeight = this.element.parent().height();
+			if ($.browser.msie) {
+				this.element.parent().css( "overflow", defOverflow );
+			}
+
+			this.headers.each(function() {
+				maxHeight -= $( this ).outerHeight( true );
+			});
+
+			this.headers.next()
+				.each(function() {
+					$( this ).height( Math.max( 0, maxHeight -
+						$( this ).innerHeight() + $( this ).height() ) );
+				})
+				.css( "overflow", "auto" );
+		} else if ( options.autoHeight ) {
+			maxHeight = 0;
+			this.headers.next()
+				.each(function() {
+					maxHeight = Math.max( maxHeight, $( this ).height( "" ).height() );
+				})
+				.height( maxHeight );
+		}
+
+		return this;
+	},
+
+	activate: function( index ) {
+		// TODO this gets called on init, changing the option without an explicit call for that
+		this.options.active = index;
+		// call clickHandler with custom event
+		var active = this._findActive( index )[ 0 ];
+		this._clickHandler( { target: active }, active );
+
+		return this;
+	},
+
+	_findActive: function( selector ) {
+		return selector
+			? typeof selector === "number"
+				? this.headers.filter( ":eq(" + selector + ")" )
+				: this.headers.not( this.headers.not( selector ) )
+			: selector === false
+				? $( [] )
+				: this.headers.filter( ":eq(0)" );
+	},
+
+	// TODO isn't event.target enough? why the separate target argument?
+	_clickHandler: function( event, target ) {
+		var options = this.options;
+		if ( options.disabled ) {
+			return;
+		}
+
+		// called only when using activate(false) to close all parts programmatically
+		if ( !event.target ) {
+			if ( !options.collapsible ) {
+				return;
+			}
+			this.active
+				.removeClass( "ui-state-active ui-corner-top" )
+				.addClass( "ui-state-default ui-corner-all" )
+				.children( ".ui-icon" )
+					.removeClass( options.icons.headerSelected )
+					.addClass( options.icons.header );
+			this.active.next().addClass( "ui-accordion-content-active" );
+			var toHide = this.active.next(),
+				data = {
+					options: options,
+					newHeader: $( [] ),
+					oldHeader: options.active,
+					newContent: $( [] ),
+					oldContent: toHide
+				},
+				toShow = ( this.active = $( [] ) );
+			this._toggle( toShow, toHide, data );
+			return;
+		}
+
+		// get the click target
+		var clicked = $( event.currentTarget || target ),
+			clickedIsActive = clicked[0] === this.active[0];
+
+		// TODO the option is changed, is that correct?
+		// TODO if it is correct, shouldn't that happen after determining that the click is valid?
+		options.active = options.collapsible && clickedIsActive ?
+			false :
+			this.headers.index( clicked );
+
+		// if animations are still active, or the active header is the target, ignore click
+		if ( this.running || ( !options.collapsible && clickedIsActive ) ) {
+			return;
+		}
+
+		// find elements to show and hide
+		var active = this.active,
+			toShow = clicked.next(),
+			toHide = this.active.next(),
+			data = {
+				options: options,
+				newHeader: clickedIsActive && options.collapsible ? $([]) : clicked,
+				oldHeader: this.active,
+				newContent: clickedIsActive && options.collapsible ? $([]) : toShow,
+				oldContent: toHide
+			},
+			down = this.headers.index( this.active[0] ) > this.headers.index( clicked[0] );
+
+		// when the call to ._toggle() comes after the class changes
+		// it causes a very odd bug in IE 8 (see #6720)
+		this.active = clickedIsActive ? $([]) : clicked;
+		this._toggle( toShow, toHide, data, clickedIsActive, down );
+
+		// switch classes
+		active
+			.removeClass( "ui-state-active ui-corner-top" )
+			.addClass( "ui-state-default ui-corner-all" )
+			.children( ".ui-icon" )
+				.removeClass( options.icons.headerSelected )
+				.addClass( options.icons.header );
+		if ( !clickedIsActive ) {
+			clicked
+				.removeClass( "ui-state-default ui-corner-all" )
+				.addClass( "ui-state-active ui-corner-top" )
+				.children( ".ui-icon" )
+					.removeClass( options.icons.header )
+					.addClass( options.icons.headerSelected );
+			clicked
+				.next()
+				.addClass( "ui-accordion-content-active" );
+		}
+
+		return;
+	},
+
+	_toggle: function( toShow, toHide, data, clickedIsActive, down ) {
+		var self = this,
+			options = self.options;
+
+		self.toShow = toShow;
+		self.toHide = toHide;
+		self.data = data;
+
+		var complete = function() {
+			if ( !self ) {
+				return;
+			}
+			return self._completed.apply( self, arguments );
+		};
+
+		// trigger changestart event
+		self._trigger( "changestart", null, self.data );
+
+		// count elements to animate
+		self.running = toHide.size() === 0 ? toShow.size() : toHide.size();
+
+		if ( options.animated ) {
+			var animOptions = {};
+
+			if ( options.collapsible && clickedIsActive ) {
+				animOptions = {
+					toShow: $( [] ),
+					toHide: toHide,
+					complete: complete,
+					down: down,
+					autoHeight: options.autoHeight || options.fillSpace
+				};
+			} else {
+				animOptions = {
+					toShow: toShow,
+					toHide: toHide,
+					complete: complete,
+					down: down,
+					autoHeight: options.autoHeight || options.fillSpace
+				};
+			}
+
+			if ( !options.proxied ) {
+				options.proxied = options.animated;
+			}
+
+			if ( !options.proxiedDuration ) {
+				options.proxiedDuration = options.duration;
+			}
+
+			options.animated = $.isFunction( options.proxied ) ?
+				options.proxied( animOptions ) :
+				options.proxied;
+
+			options.duration = $.isFunction( options.proxiedDuration ) ?
+				options.proxiedDuration( animOptions ) :
+				options.proxiedDuration;
+
+			var animations = $.ui.accordion.animations,
+				duration = options.duration,
+				easing = options.animated;
+
+			if ( easing && !animations[ easing ] && !$.easing[ easing ] ) {
+				easing = "slide";
+			}
+			if ( !animations[ easing ] ) {
+				animations[ easing ] = function( options ) {
+					this.slide( options, {
+						easing: easing,
+						duration: duration || 700
+					});
+				};
+			}
+
+			animations[ easing ]( animOptions );
+		} else {
+			if ( options.collapsible && clickedIsActive ) {
+				toShow.toggle();
+			} else {
+				toHide.hide();
+				toShow.show();
+			}
+
+			complete( true );
+		}
+
+		// TODO assert that the blur and focus triggers are really necessary, remove otherwise
+		toHide.prev()
+			.attr({
+				"aria-expanded": "false",
+				tabIndex: -1
+			})
+			.blur();
+		toShow.prev()
+			.attr({
+				"aria-expanded": "true",
+				tabIndex: 0
+			})
+			.focus();
+	},
+
+	_completed: function( cancel ) {
+		this.running = cancel ? 0 : --this.running;
+		if ( this.running ) {
+			return;
+		}
+
+		if ( this.options.clearStyle ) {
+			this.toShow.add( this.toHide ).css({
+				height: "",
+				overflow: ""
+			});
+		}
+
+		// other classes are removed before the animation; this one needs to stay until completed
+		this.toHide.removeClass( "ui-accordion-content-active" );
+		// Work around for rendering bug in IE (#5421)
+		if ( this.toHide.length ) {
+			this.toHide.parent()[0].className = this.toHide.parent()[0].className;
+		}
+
+		this._trigger( "change", null, this.data );
+	}
+});
+
+$.extend( $.ui.accordion, {
+	version: "1.8.10",
+	animations: {
+		slide: function( options, additions ) {
+			options = $.extend({
+				easing: "swing",
+				duration: 300
+			}, options, additions );
+			if ( !options.toHide.size() ) {
+				options.toShow.animate({
+					height: "show",
+					paddingTop: "show",
+					paddingBottom: "show"
+				}, options );
+				return;
+			}
+			if ( !options.toShow.size() ) {
+				options.toHide.animate({
+					height: "hide",
+					paddingTop: "hide",
+					paddingBottom: "hide"
+				}, options );
+				return;
+			}
+			var overflow = options.toShow.css( "overflow" ),
+				percentDone = 0,
+				showProps = {},
+				hideProps = {},
+				fxAttrs = [ "height", "paddingTop", "paddingBottom" ],
+				originalWidth;
+			// fix width before calculating height of hidden element
+			var s = options.toShow;
+			originalWidth = s[0].style.width;
+			s.width( parseInt( s.parent().width(), 10 )
+				- parseInt( s.css( "paddingLeft" ), 10 )
+				- parseInt( s.css( "paddingRight" ), 10 )
+				- ( parseInt( s.css( "borderLeftWidth" ), 10 ) || 0 )
+				- ( parseInt( s.css( "borderRightWidth" ), 10) || 0 ) );
+
+			$.each( fxAttrs, function( i, prop ) {
+				hideProps[ prop ] = "hide";
+
+				var parts = ( "" + $.css( options.toShow[0], prop ) ).match( /^([\d+-.]+)(.*)$/ );
+				showProps[ prop ] = {
+					value: parts[ 1 ],
+					unit: parts[ 2 ] || "px"
+				};
+			});
+			options.toShow.css({ height: 0, overflow: "hidden" }).show();
+			options.toHide
+				.filter( ":hidden" )
+					.each( options.complete )
+				.end()
+				.filter( ":visible" )
+				.animate( hideProps, {
+				step: function( now, settings ) {
+					// only calculate the percent when animating height
+					// IE gets very inconsistent results when animating elements
+					// with small values, which is common for padding
+					if ( settings.prop == "height" ) {
+						percentDone = ( settings.end - settings.start === 0 ) ? 0 :
+							( settings.now - settings.start ) / ( settings.end - settings.start );
+					}
+
+					options.toShow[ 0 ].style[ settings.prop ] =
+						( percentDone * showProps[ settings.prop ].value )
+						+ showProps[ settings.prop ].unit;
+				},
+				duration: options.duration,
+				easing: options.easing,
+				complete: function() {
+					if ( !options.autoHeight ) {
+						options.toShow.css( "height", "" );
+					}
+					options.toShow.css({
+						width: originalWidth,
+						overflow: overflow
+					});
+					options.complete();
+				}
+			});
+		},
+		bounceslide: function( options ) {
+			this.slide( options, {
+				easing: options.down ? "easeOutBounce" : "swing",
+				duration: options.down ? 1000 : 200
+			});
+		}
+	}
+});
+
+})( jQuery );
diff --git a/js/ui/jquery.ui.autocomplete.js b/js/ui/jquery.ui.autocomplete.js
new file mode 100644
index 0000000000..718bfe5b98
--- /dev/null
+++ b/js/ui/jquery.ui.autocomplete.js
@@ -0,0 +1,607 @@
+/*
+ * jQuery UI Autocomplete 1.8.10
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Autocomplete
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ *	jquery.ui.widget.js
+ *	jquery.ui.position.js
+ */
+(function( $, undefined ) {
+
+// used to prevent race conditions with remote data sources
+var requestIndex = 0;
+
+$.widget( "ui.autocomplete", {
+	options: {
+		appendTo: "body",
+		delay: 300,
+		minLength: 1,
+		position: {
+			my: "left top",
+			at: "left bottom",
+			collision: "none"
+		},
+		source: null
+	},
+
+	pending: 0,
+
+	_create: function() {
+		var self = this,
+			doc = this.element[ 0 ].ownerDocument,
+			suppressKeyPress;
+
+		this.element
+			.addClass( "ui-autocomplete-input" )
+			.attr( "autocomplete", "off" )
+			// TODO verify these actually work as intended
+			.attr({
+				role: "textbox",
+				"aria-autocomplete": "list",
+				"aria-haspopup": "true"
+			})
+			.bind( "keydown.autocomplete", function( event ) {
+				if ( self.options.disabled || self.element.attr( "readonly" ) ) {
+					return;
+				}
+
+				suppressKeyPress = false;
+				var keyCode = $.ui.keyCode;
+				switch( event.keyCode ) {
+				case keyCode.PAGE_UP:
+					self._move( "previousPage", event );
+					break;
+				case keyCode.PAGE_DOWN:
+					self._move( "nextPage", event );
+					break;
+				case keyCode.UP:
+					self._move( "previous", event );
+					// prevent moving cursor to beginning of text field in some browsers
+					event.preventDefault();
+					break;
+				case keyCode.DOWN:
+					self._move( "next", event );
+					// prevent moving cursor to end of text field in some browsers
+					event.preventDefault();
+					break;
+				case keyCode.ENTER:
+				case keyCode.NUMPAD_ENTER:
+					// when menu is open and has focus
+					if ( self.menu.active ) {
+						// #6055 - Opera still allows the keypress to occur
+						// which causes forms to submit
+						suppressKeyPress = true;
+						event.preventDefault();
+					}
+					//passthrough - ENTER and TAB both select the current element
+				case keyCode.TAB:
+					if ( !self.menu.active ) {
+						return;
+					}
+					self.menu.select( event );
+					break;
+				case keyCode.ESCAPE:
+					self.element.val( self.term );
+					self.close( event );
+					break;
+				default:
+					// keypress is triggered before the input value is changed
+					clearTimeout( self.searching );
+					self.searching = setTimeout(function() {
+						// only search if the value has changed
+						if ( self.term != self.element.val() ) {
+							self.selectedItem = null;
+							self.search( null, event );
+						}
+					}, self.options.delay );
+					break;
+				}
+			})
+			.bind( "keypress.autocomplete", function( event ) {
+				if ( suppressKeyPress ) {
+					suppressKeyPress = false;
+					event.preventDefault();
+				}
+			})
+			.bind( "focus.autocomplete", function() {
+				if ( self.options.disabled ) {
+					return;
+				}
+
+				self.selectedItem = null;
+				self.previous = self.element.val();
+			})
+			.bind( "blur.autocomplete", function( event ) {
+				if ( self.options.disabled ) {
+					return;
+				}
+
+				clearTimeout( self.searching );
+				// clicks on the menu (or a button to trigger a search) will cause a blur event
+				self.closing = setTimeout(function() {
+					self.close( event );
+					self._change( event );
+				}, 150 );
+			});
+		this._initSource();
+		this.response = function() {
+			return self._response.apply( self, arguments );
+		};
+		this.menu = $( "<ul></ul>" )
+			.addClass( "ui-autocomplete" )
+			.appendTo( $( this.options.appendTo || "body", doc )[0] )
+			// prevent the close-on-blur in case of a "slow" click on the menu (long mousedown)
+			.mousedown(function( event ) {
+				// clicking on the scrollbar causes focus to shift to the body
+				// but we can't detect a mouseup or a click immediately afterward
+				// so we have to track the next mousedown and close the menu if
+				// the user clicks somewhere outside of the autocomplete
+				var menuElement = self.menu.element[ 0 ];
+				if ( !$( event.target ).closest( ".ui-menu-item" ).length ) {
+					setTimeout(function() {
+						$( document ).one( 'mousedown', function( event ) {
+							if ( event.target !== self.element[ 0 ] &&
+								event.target !== menuElement &&
+								!$.ui.contains( menuElement, event.target ) ) {
+								self.close();
+							}
+						});
+					}, 1 );
+				}
+
+				// use another timeout to make sure the blur-event-handler on the input was already triggered
+				setTimeout(function() {
+					clearTimeout( self.closing );
+				}, 13);
+			})
+			.menu({
+				focus: function( event, ui ) {
+					var item = ui.item.data( "item.autocomplete" );
+					if ( false !== self._trigger( "focus", event, { item: item } ) ) {
+						// use value to match what will end up in the input, if it was a key event
+						if ( /^key/.test(event.originalEvent.type) ) {
+							self.element.val( item.value );
+						}
+					}
+				},
+				selected: function( event, ui ) {
+					var item = ui.item.data( "item.autocomplete" ),
+						previous = self.previous;
+
+					// only trigger when focus was lost (click on menu)
+					if ( self.element[0] !== doc.activeElement ) {
+						self.element.focus();
+						self.previous = previous;
+						// #6109 - IE triggers two focus events and the second
+						// is asynchronous, so we need to reset the previous
+						// term synchronously and asynchronously :-(
+						setTimeout(function() {
+							self.previous = previous;
+							self.selectedItem = item;
+						}, 1);
+					}
+
+					if ( false !== self._trigger( "select", event, { item: item } ) ) {
+						self.element.val( item.value );
+					}
+					// reset the term after the select event
+					// this allows custom select handling to work properly
+					self.term = self.element.val();
+
+					self.close( event );
+					self.selectedItem = item;
+				},
+				blur: function( event, ui ) {
+					// don't set the value of the text field if it's already correct
+					// this prevents moving the cursor unnecessarily
+					if ( self.menu.element.is(":visible") &&
+						( self.element.val() !== self.term ) ) {
+						self.element.val( self.term );
+					}
+				}
+			})
+			.zIndex( this.element.zIndex() + 1 )
+			// workaround for jQuery bug #5781 http://dev.jquery.com/ticket/5781
+			.css({ top: 0, left: 0 })
+			.hide()
+			.data( "menu" );
+		if ( $.fn.bgiframe ) {
+			 this.menu.element.bgiframe();
+		}
+	},
+
+	destroy: function() {
+		this.element
+			.removeClass( "ui-autocomplete-input" )
+			.removeAttr( "autocomplete" )
+			.removeAttr( "role" )
+			.removeAttr( "aria-autocomplete" )
+			.removeAttr( "aria-haspopup" );
+		this.menu.element.remove();
+		$.Widget.prototype.destroy.call( this );
+	},
+
+	_setOption: function( key, value ) {
+		$.Widget.prototype._setOption.apply( this, arguments );
+		if ( key === "source" ) {
+			this._initSource();
+		}
+		if ( key === "appendTo" ) {
+			this.menu.element.appendTo( $( value || "body", this.element[0].ownerDocument )[0] )
+		}
+		if ( key === "disabled" && value && this.xhr ) {
+			this.xhr.abort();
+		}
+	},
+
+	_initSource: function() {
+		var self = this,
+			array,
+			url;
+		if ( $.isArray(this.options.source) ) {
+			array = this.options.source;
+			this.source = function( request, response ) {
+				response( $.ui.autocomplete.filter(array, request.term) );
+			};
+		} else if ( typeof this.options.source === "string" ) {
+			url = this.options.source;
+			this.source = function( request, response ) {
+				if ( self.xhr ) {
+					self.xhr.abort();
+				}
+				self.xhr = $.ajax({
+					url: url,
+					data: request,
+					dataType: "json",
+					autocompleteRequest: ++requestIndex,
+					success: function( data, status ) {
+						if ( this.autocompleteRequest === requestIndex ) {
+							response( data );
+						}
+					},
+					error: function() {
+						if ( this.autocompleteRequest === requestIndex ) {
+							response( [] );
+						}
+					}
+				});
+			};
+		} else {
+			this.source = this.options.source;
+		}
+	},
+
+	search: function( value, event ) {
+		value = value != null ? value : this.element.val();
+
+		// always save the actual value, not the one passed as an argument
+		this.term = this.element.val();
+
+		if ( value.length < this.options.minLength ) {
+			return this.close( event );
+		}
+
+		clearTimeout( this.closing );
+		if ( this._trigger( "search", event ) === false ) {
+			return;
+		}
+
+		return this._search( value );
+	},
+
+	_search: function( value ) {
+		this.pending++;
+		this.element.addClass( "ui-autocomplete-loading" );
+
+		this.source( { term: value }, this.response );
+	},
+
+	_response: function( content ) {
+		if ( !this.options.disabled && content && content.length ) {
+			content = this._normalize( content );
+			this._suggest( content );
+			this._trigger( "open" );
+		} else {
+			this.close();
+		}
+		this.pending--;
+		if ( !this.pending ) {
+			this.element.removeClass( "ui-autocomplete-loading" );
+		}
+	},
+
+	close: function( event ) {
+		clearTimeout( this.closing );
+		if ( this.menu.element.is(":visible") ) {
+			this.menu.element.hide();
+			this.menu.deactivate();
+			this._trigger( "close", event );
+		}
+	},
+	
+	_change: function( event ) {
+		if ( this.previous !== this.element.val() ) {
+			this._trigger( "change", event, { item: this.selectedItem } );
+		}
+	},
+
+	_normalize: function( items ) {
+		// assume all items have the right format when the first item is complete
+		if ( items.length && items[0].label && items[0].value ) {
+			return items;
+		}
+		return $.map( items, function(item) {
+			if ( typeof item === "string" ) {
+				return {
+					label: item,
+					value: item
+				};
+			}
+			return $.extend({
+				label: item.label || item.value,
+				value: item.value || item.label
+			}, item );
+		});
+	},
+
+	_suggest: function( items ) {
+		var ul = this.menu.element
+			.empty()
+			.zIndex( this.element.zIndex() + 1 );
+		this._renderMenu( ul, items );
+		// TODO refresh should check if the active item is still in the dom, removing the need for a manual deactivate
+		this.menu.deactivate();
+		this.menu.refresh();
+
+		// size and position menu
+		ul.show();
+		this._resizeMenu();
+		ul.position( $.extend({
+			of: this.element
+		}, this.options.position ));
+	},
+
+	_resizeMenu: function() {
+		var ul = this.menu.element;
+		ul.outerWidth( Math.max(
+			ul.width( "" ).outerWidth(),
+			this.element.outerWidth()
+		) );
+	},
+
+	_renderMenu: function( ul, items ) {
+		var self = this;
+		$.each( items, function( index, item ) {
+			self._renderItem( ul, item );
+		});
+	},
+
+	_renderItem: function( ul, item) {
+		return $( "<li></li>" )
+			.data( "item.autocomplete", item )
+			.append( $( "<a></a>" ).text( item.label ) )
+			.appendTo( ul );
+	},
+
+	_move: function( direction, event ) {
+		if ( !this.menu.element.is(":visible") ) {
+			this.search( null, event );
+			return;
+		}
+		if ( this.menu.first() && /^previous/.test(direction) ||
+				this.menu.last() && /^next/.test(direction) ) {
+			this.element.val( this.term );
+			this.menu.deactivate();
+			return;
+		}
+		this.menu[ direction ]( event );
+	},
+
+	widget: function() {
+		return this.menu.element;
+	}
+});
+
+$.extend( $.ui.autocomplete, {
+	escapeRegex: function( value ) {
+		return value.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, "\\$&");
+	},
+	filter: function(array, term) {
+		var matcher = new RegExp( $.ui.autocomplete.escapeRegex(term), "i" );
+		return $.grep( array, function(value) {
+			return matcher.test( value.label || value.value || value );
+		});
+	}
+});
+
+}( jQuery ));
+
+/*
+ * jQuery UI Menu (not officially released)
+ * 
+ * This widget isn't yet finished and the API is subject to change. We plan to finish
+ * it for the next release. You're welcome to give it a try anyway and give us feedback,
+ * as long as you're okay with migrating your code later on. We can help with that, too.
+ *
+ * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Menu
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ *  jquery.ui.widget.js
+ */
+(function($) {
+
+$.widget("ui.menu", {
+	_create: function() {
+		var self = this;
+		this.element
+			.addClass("ui-menu ui-widget ui-widget-content ui-corner-all")
+			.attr({
+				role: "listbox",
+				"aria-activedescendant": "ui-active-menuitem"
+			})
+			.click(function( event ) {
+				if ( !$( event.target ).closest( ".ui-menu-item a" ).length ) {
+					return;
+				}
+				// temporary
+				event.preventDefault();
+				self.select( event );
+			});
+		this.refresh();
+	},
+	
+	refresh: function() {
+		var self = this;
+
+		// don't refresh list items that are already adapted
+		var items = this.element.children("li:not(.ui-menu-item):has(a)")
+			.addClass("ui-menu-item")
+			.attr("role", "menuitem");
+		
+		items.children("a")
+			.addClass("ui-corner-all")
+			.attr("tabindex", -1)
+			// mouseenter doesn't work with event delegation
+			.mouseenter(function( event ) {
+				self.activate( event, $(this).parent() );
+			})
+			.mouseleave(function() {
+				self.deactivate();
+			});
+	},
+
+	activate: function( event, item ) {
+		this.deactivate();
+		if (this.hasScroll()) {
+			var offset = item.offset().top - this.element.offset().top,
+				scroll = this.element.attr("scrollTop"),
+				elementHeight = this.element.height();
+			if (offset < 0) {
+				this.element.attr("scrollTop", scroll + offset);
+			} else if (offset >= elementHeight) {
+				this.element.attr("scrollTop", scroll + offset - elementHeight + item.height());
+			}
+		}
+		this.active = item.eq(0)
+			.children("a")
+				.addClass("ui-state-hover")
+				.attr("id", "ui-active-menuitem")
+			.end();
+		this._trigger("focus", event, { item: item });
+	},
+
+	deactivate: function() {
+		if (!this.active) { return; }
+
+		this.active.children("a")
+			.removeClass("ui-state-hover")
+			.removeAttr("id");
+		this._trigger("blur");
+		this.active = null;
+	},
+
+	next: function(event) {
+		this.move("next", ".ui-menu-item:first", event);
+	},
+
+	previous: function(event) {
+		this.move("prev", ".ui-menu-item:last", event);
+	},
+
+	first: function() {
+		return this.active && !this.active.prevAll(".ui-menu-item").length;
+	},
+
+	last: function() {
+		return this.active && !this.active.nextAll(".ui-menu-item").length;
+	},
+
+	move: function(direction, edge, event) {
+		if (!this.active) {
+			this.activate(event, this.element.children(edge));
+			return;
+		}
+		var next = this.active[direction + "All"](".ui-menu-item").eq(0);
+		if (next.length) {
+			this.activate(event, next);
+		} else {
+			this.activate(event, this.element.children(edge));
+		}
+	},
+
+	// TODO merge with previousPage
+	nextPage: function(event) {
+		if (this.hasScroll()) {
+			// TODO merge with no-scroll-else
+			if (!this.active || this.last()) {
+				this.activate(event, this.element.children(".ui-menu-item:first"));
+				return;
+			}
+			var base = this.active.offset().top,
+				height = this.element.height(),
+				result = this.element.children(".ui-menu-item").filter(function() {
+					var close = $(this).offset().top - base - height + $(this).height();
+					// TODO improve approximation
+					return close < 10 && close > -10;
+				});
+
+			// TODO try to catch this earlier when scrollTop indicates the last page anyway
+			if (!result.length) {
+				result = this.element.children(".ui-menu-item:last");
+			}
+			this.activate(event, result);
+		} else {
+			this.activate(event, this.element.children(".ui-menu-item")
+				.filter(!this.active || this.last() ? ":first" : ":last"));
+		}
+	},
+
+	// TODO merge with nextPage
+	previousPage: function(event) {
+		if (this.hasScroll()) {
+			// TODO merge with no-scroll-else
+			if (!this.active || this.first()) {
+				this.activate(event, this.element.children(".ui-menu-item:last"));
+				return;
+			}
+
+			var base = this.active.offset().top,
+				height = this.element.height();
+				result = this.element.children(".ui-menu-item").filter(function() {
+					var close = $(this).offset().top - base + height - $(this).height();
+					// TODO improve approximation
+					return close < 10 && close > -10;
+				});
+
+			// TODO try to catch this earlier when scrollTop indicates the last page anyway
+			if (!result.length) {
+				result = this.element.children(".ui-menu-item:first");
+			}
+			this.activate(event, result);
+		} else {
+			this.activate(event, this.element.children(".ui-menu-item")
+				.filter(!this.active || this.first() ? ":last" : ":first"));
+		}
+	},
+
+	hasScroll: function() {
+		return this.element.height() < this.element.attr("scrollHeight");
+	},
+
+	select: function( event ) {
+		this._trigger("selected", event, { item: this.active });
+	}
+});
+
+}(jQuery));
diff --git a/js/ui/jquery.ui.button.js b/js/ui/jquery.ui.button.js
new file mode 100644
index 0000000000..f0a5deca3f
--- /dev/null
+++ b/js/ui/jquery.ui.button.js
@@ -0,0 +1,378 @@
+/*
+ * jQuery UI Button 1.8.10
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Button
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ *	jquery.ui.widget.js
+ */
+(function( $, undefined ) {
+
+var lastActive,
+	baseClasses = "ui-button ui-widget ui-state-default ui-corner-all",
+	stateClasses = "ui-state-hover ui-state-active ",
+	typeClasses = "ui-button-icons-only ui-button-icon-only ui-button-text-icons ui-button-text-icon-primary ui-button-text-icon-secondary ui-button-text-only",
+	formResetHandler = function( event ) {
+		$( ":ui-button", event.target.form ).each(function() {
+			var inst = $( this ).data( "button" );
+			setTimeout(function() {
+				inst.refresh();
+			}, 1 );
+		});
+	},
+	radioGroup = function( radio ) {
+		var name = radio.name,
+			form = radio.form,
+			radios = $( [] );
+		if ( name ) {
+			if ( form ) {
+				radios = $( form ).find( "[name='" + name + "']" );
+			} else {
+				radios = $( "[name='" + name + "']", radio.ownerDocument )
+					.filter(function() {
+						return !this.form;
+					});
+			}
+		}
+		return radios;
+	};
+
+$.widget( "ui.button", {
+	options: {
+		disabled: null,
+		text: true,
+		label: null,
+		icons: {
+			primary: null,
+			secondary: null
+		}
+	},
+	_create: function() {
+		this.element.closest( "form" )
+			.unbind( "reset.button" )
+			.bind( "reset.button", formResetHandler );
+
+		if ( typeof this.options.disabled !== "boolean" ) {
+			this.options.disabled = this.element.attr( "disabled" );
+		}
+
+		this._determineButtonType();
+		this.hasTitle = !!this.buttonElement.attr( "title" );
+
+		var self = this,
+			options = this.options,
+			toggleButton = this.type === "checkbox" || this.type === "radio",
+			hoverClass = "ui-state-hover" + ( !toggleButton ? " ui-state-active" : "" ),
+			focusClass = "ui-state-focus";
+
+		if ( options.label === null ) {
+			options.label = this.buttonElement.html();
+		}
+
+		if ( this.element.is( ":disabled" ) ) {
+			options.disabled = true;
+		}
+
+		this.buttonElement
+			.addClass( baseClasses )
+			.attr( "role", "button" )
+			.bind( "mouseenter.button", function() {
+				if ( options.disabled ) {
+					return;
+				}
+				$( this ).addClass( "ui-state-hover" );
+				if ( this === lastActive ) {
+					$( this ).addClass( "ui-state-active" );
+				}
+			})
+			.bind( "mouseleave.button", function() {
+				if ( options.disabled ) {
+					return;
+				}
+				$( this ).removeClass( hoverClass );
+			})
+			.bind( "focus.button", function() {
+				// no need to check disabled, focus won't be triggered anyway
+				$( this ).addClass( focusClass );
+			})
+			.bind( "blur.button", function() {
+				$( this ).removeClass( focusClass );
+			});
+
+		if ( toggleButton ) {
+			this.element.bind( "change.button", function() {
+				self.refresh();
+			});
+		}
+
+		if ( this.type === "checkbox" ) {
+			this.buttonElement.bind( "click.button", function() {
+				if ( options.disabled ) {
+					return false;
+				}
+				$( this ).toggleClass( "ui-state-active" );
+				self.buttonElement.attr( "aria-pressed", self.element[0].checked );
+			});
+		} else if ( this.type === "radio" ) {
+			this.buttonElement.bind( "click.button", function() {
+				if ( options.disabled ) {
+					return false;
+				}
+				$( this ).addClass( "ui-state-active" );
+				self.buttonElement.attr( "aria-pressed", true );
+
+				var radio = self.element[ 0 ];
+				radioGroup( radio )
+					.not( radio )
+					.map(function() {
+						return $( this ).button( "widget" )[ 0 ];
+					})
+					.removeClass( "ui-state-active" )
+					.attr( "aria-pressed", false );
+			});
+		} else {
+			this.buttonElement
+				.bind( "mousedown.button", function() {
+					if ( options.disabled ) {
+						return false;
+					}
+					$( this ).addClass( "ui-state-active" );
+					lastActive = this;
+					$( document ).one( "mouseup", function() {
+						lastActive = null;
+					});
+				})
+				.bind( "mouseup.button", function() {
+					if ( options.disabled ) {
+						return false;
+					}
+					$( this ).removeClass( "ui-state-active" );
+				})
+				.bind( "keydown.button", function(event) {
+					if ( options.disabled ) {
+						return false;
+					}
+					if ( event.keyCode == $.ui.keyCode.SPACE || event.keyCode == $.ui.keyCode.ENTER ) {
+						$( this ).addClass( "ui-state-active" );
+					}
+				})
+				.bind( "keyup.button", function() {
+					$( this ).removeClass( "ui-state-active" );
+				});
+
+			if ( this.buttonElement.is("a") ) {
+				this.buttonElement.keyup(function(event) {
+					if ( event.keyCode === $.ui.keyCode.SPACE ) {
+						// TODO pass through original event correctly (just as 2nd argument doesn't work)
+						$( this ).click();
+					}
+				});
+			}
+		}
+
+		// TODO: pull out $.Widget's handling for the disabled option into
+		// $.Widget.prototype._setOptionDisabled so it's easy to proxy and can
+		// be overridden by individual plugins
+		this._setOption( "disabled", options.disabled );
+	},
+
+	_determineButtonType: function() {
+		
+		if ( this.element.is(":checkbox") ) {
+			this.type = "checkbox";
+		} else {
+			if ( this.element.is(":radio") ) {
+				this.type = "radio";
+			} else {
+				if ( this.element.is("input") ) {
+					this.type = "input";
+				} else {
+					this.type = "button";
+				}
+			}
+		}
+		
+		if ( this.type === "checkbox" || this.type === "radio" ) {
+			// we don't search against the document in case the element
+			// is disconnected from the DOM
+			this.buttonElement = this.element.parents().last()
+				.find( "label[for=" + this.element.attr("id") + "]" );
+			this.element.addClass( "ui-helper-hidden-accessible" );
+
+			var checked = this.element.is( ":checked" );
+			if ( checked ) {
+				this.buttonElement.addClass( "ui-state-active" );
+			}
+			this.buttonElement.attr( "aria-pressed", checked );
+		} else {
+			this.buttonElement = this.element;
+		}
+	},
+
+	widget: function() {
+		return this.buttonElement;
+	},
+
+	destroy: function() {
+		this.element
+			.removeClass( "ui-helper-hidden-accessible" );
+		this.buttonElement
+			.removeClass( baseClasses + " " + stateClasses + " " + typeClasses )
+			.removeAttr( "role" )
+			.removeAttr( "aria-pressed" )
+			.html( this.buttonElement.find(".ui-button-text").html() );
+
+		if ( !this.hasTitle ) {
+			this.buttonElement.removeAttr( "title" );
+		}
+
+		$.Widget.prototype.destroy.call( this );
+	},
+
+	_setOption: function( key, value ) {
+		$.Widget.prototype._setOption.apply( this, arguments );
+		if ( key === "disabled" ) {
+			if ( value ) {
+				this.element.attr( "disabled", true );
+			} else {
+				this.element.removeAttr( "disabled" );
+			}
+		}
+		this._resetButton();
+	},
+
+	refresh: function() {
+		var isDisabled = this.element.is( ":disabled" );
+		if ( isDisabled !== this.options.disabled ) {
+			this._setOption( "disabled", isDisabled );
+		}
+		if ( this.type === "radio" ) {
+			radioGroup( this.element[0] ).each(function() {
+				if ( $( this ).is( ":checked" ) ) {
+					$( this ).button( "widget" )
+						.addClass( "ui-state-active" )
+						.attr( "aria-pressed", true );
+				} else {
+					$( this ).button( "widget" )
+						.removeClass( "ui-state-active" )
+						.attr( "aria-pressed", false );
+				}
+			});
+		} else if ( this.type === "checkbox" ) {
+			if ( this.element.is( ":checked" ) ) {
+				this.buttonElement
+					.addClass( "ui-state-active" )
+					.attr( "aria-pressed", true );
+			} else {
+				this.buttonElement
+					.removeClass( "ui-state-active" )
+					.attr( "aria-pressed", false );
+			}
+		}
+	},
+
+	_resetButton: function() {
+		if ( this.type === "input" ) {
+			if ( this.options.label ) {
+				this.element.val( this.options.label );
+			}
+			return;
+		}
+		var buttonElement = this.buttonElement.removeClass( typeClasses ),
+			buttonText = $( "<span></span>" )
+				.addClass( "ui-button-text" )
+				.html( this.options.label )
+				.appendTo( buttonElement.empty() )
+				.text(),
+			icons = this.options.icons,
+			multipleIcons = icons.primary && icons.secondary,
+			buttonClasses = [];  
+
+		if ( icons.primary || icons.secondary ) {
+			buttonClasses.push( "ui-button-text-icon" + ( multipleIcons ? "s" : ( icons.primary ? "-primary" : "-secondary" ) ) );
+
+			if ( icons.primary ) {
+				buttonElement.prepend( "<span class='ui-button-icon-primary ui-icon " + icons.primary + "'></span>" );
+			}
+
+			if ( icons.secondary ) {
+				buttonElement.append( "<span class='ui-button-icon-secondary ui-icon " + icons.secondary + "'></span>" );
+			}
+
+			if ( !this.options.text ) {
+				buttonClasses.push( multipleIcons ? "ui-button-icons-only" : "ui-button-icon-only" );
+				buttonElement.removeClass( "ui-button-text-icons ui-button-text-icon-primary ui-button-text-icon-secondary" );
+
+				if ( !this.hasTitle ) {
+					buttonElement.attr( "title", buttonText );
+				}
+			}
+		} else {
+			buttonClasses.push( "ui-button-text-only" );
+		}
+		buttonElement.addClass( buttonClasses.join( " " ) );
+	}
+});
+
+$.widget( "ui.buttonset", {
+	options: {
+		items: ":button, :submit, :reset, :checkbox, :radio, a, :data(button)"
+	},
+
+	_create: function() {
+		this.element.addClass( "ui-buttonset" );
+	},
+	
+	_init: function() {
+		this.refresh();
+	},
+
+	_setOption: function( key, value ) {
+		if ( key === "disabled" ) {
+			this.buttons.button( "option", key, value );
+		}
+
+		$.Widget.prototype._setOption.apply( this, arguments );
+	},
+	
+	refresh: function() {
+		this.buttons = this.element.find( this.options.items )
+			.filter( ":ui-button" )
+				.button( "refresh" )
+			.end()
+			.not( ":ui-button" )
+				.button()
+			.end()
+			.map(function() {
+				return $( this ).button( "widget" )[ 0 ];
+			})
+				.removeClass( "ui-corner-all ui-corner-left ui-corner-right" )
+				.filter( ":first" )
+					.addClass( "ui-corner-left" )
+				.end()
+				.filter( ":last" )
+					.addClass( "ui-corner-right" )
+				.end()
+			.end();
+	},
+
+	destroy: function() {
+		this.element.removeClass( "ui-buttonset" );
+		this.buttons
+			.map(function() {
+				return $( this ).button( "widget" )[ 0 ];
+			})
+				.removeClass( "ui-corner-left ui-corner-right" )
+			.end()
+			.button( "destroy" );
+
+		$.Widget.prototype.destroy.call( this );
+	}
+});
+
+}( jQuery ) );
diff --git a/js/ui/jquery.ui.core.js b/js/ui/jquery.ui.core.js
new file mode 100644
index 0000000000..1dbfd6358e
--- /dev/null
+++ b/js/ui/jquery.ui.core.js
@@ -0,0 +1,308 @@
+/*!
+ * jQuery UI 1.8.10
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI
+ */
+(function( $, undefined ) {
+
+// prevent duplicate loading
+// this is only a problem because we proxy existing functions
+// and we don't want to double proxy them
+$.ui = $.ui || {};
+if ( $.ui.version ) {
+	return;
+}
+
+$.extend( $.ui, {
+	version: "1.8.10",
+
+	keyCode: {
+		ALT: 18,
+		BACKSPACE: 8,
+		CAPS_LOCK: 20,
+		COMMA: 188,
+		COMMAND: 91,
+		COMMAND_LEFT: 91, // COMMAND
+		COMMAND_RIGHT: 93,
+		CONTROL: 17,
+		DELETE: 46,
+		DOWN: 40,
+		END: 35,
+		ENTER: 13,
+		ESCAPE: 27,
+		HOME: 36,
+		INSERT: 45,
+		LEFT: 37,
+		MENU: 93, // COMMAND_RIGHT
+		NUMPAD_ADD: 107,
+		NUMPAD_DECIMAL: 110,
+		NUMPAD_DIVIDE: 111,
+		NUMPAD_ENTER: 108,
+		NUMPAD_MULTIPLY: 106,
+		NUMPAD_SUBTRACT: 109,
+		PAGE_DOWN: 34,
+		PAGE_UP: 33,
+		PERIOD: 190,
+		RIGHT: 39,
+		SHIFT: 16,
+		SPACE: 32,
+		TAB: 9,
+		UP: 38,
+		WINDOWS: 91 // COMMAND
+	}
+});
+
+// plugins
+$.fn.extend({
+	_focus: $.fn.focus,
+	focus: function( delay, fn ) {
+		return typeof delay === "number" ?
+			this.each(function() {
+				var elem = this;
+				setTimeout(function() {
+					$( elem ).focus();
+					if ( fn ) {
+						fn.call( elem );
+					}
+				}, delay );
+			}) :
+			this._focus.apply( this, arguments );
+	},
+
+	scrollParent: function() {
+		var scrollParent;
+		if (($.browser.msie && (/(static|relative)/).test(this.css('position'))) || (/absolute/).test(this.css('position'))) {
+			scrollParent = this.parents().filter(function() {
+				return (/(relative|absolute|fixed)/).test($.curCSS(this,'position',1)) && (/(auto|scroll)/).test($.curCSS(this,'overflow',1)+$.curCSS(this,'overflow-y',1)+$.curCSS(this,'overflow-x',1));
+			}).eq(0);
+		} else {
+			scrollParent = this.parents().filter(function() {
+				return (/(auto|scroll)/).test($.curCSS(this,'overflow',1)+$.curCSS(this,'overflow-y',1)+$.curCSS(this,'overflow-x',1));
+			}).eq(0);
+		}
+
+		return (/fixed/).test(this.css('position')) || !scrollParent.length ? $(document) : scrollParent;
+	},
+
+	zIndex: function( zIndex ) {
+		if ( zIndex !== undefined ) {
+			return this.css( "zIndex", zIndex );
+		}
+
+		if ( this.length ) {
+			var elem = $( this[ 0 ] ), position, value;
+			while ( elem.length && elem[ 0 ] !== document ) {
+				// Ignore z-index if position is set to a value where z-index is ignored by the browser
+				// This makes behavior of this function consistent across browsers
+				// WebKit always returns auto if the element is positioned
+				position = elem.css( "position" );
+				if ( position === "absolute" || position === "relative" || position === "fixed" ) {
+					// IE returns 0 when zIndex is not specified
+					// other browsers return a string
+					// we ignore the case of nested elements with an explicit value of 0
+					// <div style="z-index: -10;"><div style="z-index: 0;"></div></div>
+					value = parseInt( elem.css( "zIndex" ), 10 );
+					if ( !isNaN( value ) && value !== 0 ) {
+						return value;
+					}
+				}
+				elem = elem.parent();
+			}
+		}
+
+		return 0;
+	},
+
+	disableSelection: function() {
+		return this.bind( ( $.support.selectstart ? "selectstart" : "mousedown" ) +
+			".ui-disableSelection", function( event ) {
+				event.preventDefault();
+			});
+	},
+
+	enableSelection: function() {
+		return this.unbind( ".ui-disableSelection" );
+	}
+});
+
+$.each( [ "Width", "Height" ], function( i, name ) {
+	var side = name === "Width" ? [ "Left", "Right" ] : [ "Top", "Bottom" ],
+		type = name.toLowerCase(),
+		orig = {
+			innerWidth: $.fn.innerWidth,
+			innerHeight: $.fn.innerHeight,
+			outerWidth: $.fn.outerWidth,
+			outerHeight: $.fn.outerHeight
+		};
+
+	function reduce( elem, size, border, margin ) {
+		$.each( side, function() {
+			size -= parseFloat( $.curCSS( elem, "padding" + this, true) ) || 0;
+			if ( border ) {
+				size -= parseFloat( $.curCSS( elem, "border" + this + "Width", true) ) || 0;
+			}
+			if ( margin ) {
+				size -= parseFloat( $.curCSS( elem, "margin" + this, true) ) || 0;
+			}
+		});
+		return size;
+	}
+
+	$.fn[ "inner" + name ] = function( size ) {
+		if ( size === undefined ) {
+			return orig[ "inner" + name ].call( this );
+		}
+
+		return this.each(function() {
+			$( this ).css( type, reduce( this, size ) + "px" );
+		});
+	};
+
+	$.fn[ "outer" + name] = function( size, margin ) {
+		if ( typeof size !== "number" ) {
+			return orig[ "outer" + name ].call( this, size );
+		}
+
+		return this.each(function() {
+			$( this).css( type, reduce( this, size, true, margin ) + "px" );
+		});
+	};
+});
+
+// selectors
+function visible( element ) {
+	return !$( element ).parents().andSelf().filter(function() {
+		return $.curCSS( this, "visibility" ) === "hidden" ||
+			$.expr.filters.hidden( this );
+	}).length;
+}
+
+$.extend( $.expr[ ":" ], {
+	data: function( elem, i, match ) {
+		return !!$.data( elem, match[ 3 ] );
+	},
+
+	focusable: function( element ) {
+		var nodeName = element.nodeName.toLowerCase(),
+			tabIndex = $.attr( element, "tabindex" );
+		if ( "area" === nodeName ) {
+			var map = element.parentNode,
+				mapName = map.name,
+				img;
+			if ( !element.href || !mapName || map.nodeName.toLowerCase() !== "map" ) {
+				return false;
+			}
+			img = $( "img[usemap=#" + mapName + "]" )[0];
+			return !!img && visible( img );
+		}
+		return ( /input|select|textarea|button|object/.test( nodeName )
+			? !element.disabled
+			: "a" == nodeName
+				? element.href || !isNaN( tabIndex )
+				: !isNaN( tabIndex ))
+			// the element and all of its ancestors must be visible
+			&& visible( element );
+	},
+
+	tabbable: function( element ) {
+		var tabIndex = $.attr( element, "tabindex" );
+		return ( isNaN( tabIndex ) || tabIndex >= 0 ) && $( element ).is( ":focusable" );
+	}
+});
+
+// support
+$(function() {
+	var body = document.body,
+		div = body.appendChild( div = document.createElement( "div" ) );
+
+	$.extend( div.style, {
+		minHeight: "100px",
+		height: "auto",
+		padding: 0,
+		borderWidth: 0
+	});
+
+	$.support.minHeight = div.offsetHeight === 100;
+	$.support.selectstart = "onselectstart" in div;
+
+	// set display to none to avoid a layout bug in IE
+	// http://dev.jquery.com/ticket/4014
+	body.removeChild( div ).style.display = "none";
+});
+
+
+
+
+
+// deprecated
+$.extend( $.ui, {
+	// $.ui.plugin is deprecated.  Use the proxy pattern instead.
+	plugin: {
+		add: function( module, option, set ) {
+			var proto = $.ui[ module ].prototype;
+			for ( var i in set ) {
+				proto.plugins[ i ] = proto.plugins[ i ] || [];
+				proto.plugins[ i ].push( [ option, set[ i ] ] );
+			}
+		},
+		call: function( instance, name, args ) {
+			var set = instance.plugins[ name ];
+			if ( !set || !instance.element[ 0 ].parentNode ) {
+				return;
+			}
+	
+			for ( var i = 0; i < set.length; i++ ) {
+				if ( instance.options[ set[ i ][ 0 ] ] ) {
+					set[ i ][ 1 ].apply( instance.element, args );
+				}
+			}
+		}
+	},
+	
+	// will be deprecated when we switch to jQuery 1.4 - use jQuery.contains()
+	contains: function( a, b ) {
+		return document.compareDocumentPosition ?
+			a.compareDocumentPosition( b ) & 16 :
+			a !== b && a.contains( b );
+	},
+	
+	// only used by resizable
+	hasScroll: function( el, a ) {
+	
+		//If overflow is hidden, the element might have extra content, but the user wants to hide it
+		if ( $( el ).css( "overflow" ) === "hidden") {
+			return false;
+		}
+	
+		var scroll = ( a && a === "left" ) ? "scrollLeft" : "scrollTop",
+			has = false;
+	
+		if ( el[ scroll ] > 0 ) {
+			return true;
+		}
+	
+		// TODO: determine which cases actually cause this to happen
+		// if the element doesn't have the scroll set, see if it's possible to
+		// set the scroll
+		el[ scroll ] = 1;
+		has = ( el[ scroll ] > 0 );
+		el[ scroll ] = 0;
+		return has;
+	},
+	
+	// these are odd functions, fix the API or move into individual plugins
+	isOverAxis: function( x, reference, size ) {
+		//Determines when x coordinate is over "b" element axis
+		return ( x > reference ) && ( x < ( reference + size ) );
+	},
+	isOver: function( y, x, top, left, height, width ) {
+		//Determines when x, y coordinates is over "b" element
+		return $.ui.isOverAxis( y, top, height ) && $.ui.isOverAxis( x, left, width );
+	}
+});
+
+})( jQuery );
diff --git a/js/ui/jquery.ui.datepicker.js b/js/ui/jquery.ui.datepicker.js
new file mode 100644
index 0000000000..0e896462c0
--- /dev/null
+++ b/js/ui/jquery.ui.datepicker.js
@@ -0,0 +1,1766 @@
+/*
+ * jQuery UI Datepicker 1.8.10
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Datepicker
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ */
+(function( $, undefined ) {
+
+$.extend($.ui, { datepicker: { version: "1.8.10" } });
+
+var PROP_NAME = 'datepicker';
+var dpuuid = new Date().getTime();
+
+/* Date picker manager.
+   Use the singleton instance of this class, $.datepicker, to interact with the date picker.
+   Settings for (groups of) date pickers are maintained in an instance object,
+   allowing multiple different settings on the same page. */
+
+function Datepicker() {
+	this.debug = false; // Change this to true to start debugging
+	this._curInst = null; // The current instance in use
+	this._keyEvent = false; // If the last event was a key event
+	this._disabledInputs = []; // List of date picker inputs that have been disabled
+	this._datepickerShowing = false; // True if the popup picker is showing , false if not
+	this._inDialog = false; // True if showing within a "dialog", false if not
+	this._mainDivId = 'ui-datepicker-div'; // The ID of the main datepicker division
+	this._inlineClass = 'ui-datepicker-inline'; // The name of the inline marker class
+	this._appendClass = 'ui-datepicker-append'; // The name of the append marker class
+	this._triggerClass = 'ui-datepicker-trigger'; // The name of the trigger marker class
+	this._dialogClass = 'ui-datepicker-dialog'; // The name of the dialog marker class
+	this._disableClass = 'ui-datepicker-disabled'; // The name of the disabled covering marker class
+	this._unselectableClass = 'ui-datepicker-unselectable'; // The name of the unselectable cell marker class
+	this._currentClass = 'ui-datepicker-current-day'; // The name of the current day marker class
+	this._dayOverClass = 'ui-datepicker-days-cell-over'; // The name of the day hover marker class
+	this.regional = []; // Available regional settings, indexed by language code
+	this.regional[''] = { // Default regional settings
+		closeText: 'Done', // Display text for close link
+		prevText: 'Prev', // Display text for previous month link
+		nextText: 'Next', // Display text for next month link
+		currentText: 'Today', // Display text for current month link
+		monthNames: ['January','February','March','April','May','June',
+			'July','August','September','October','November','December'], // Names of months for drop-down and formatting
+		monthNamesShort: ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'], // For formatting
+		dayNames: ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'], // For formatting
+		dayNamesShort: ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'], // For formatting
+		dayNamesMin: ['Su','Mo','Tu','We','Th','Fr','Sa'], // Column headings for days starting at Sunday
+		weekHeader: 'Wk', // Column header for week of the year
+		dateFormat: 'mm/dd/yy', // See format options on parseDate
+		firstDay: 0, // The first day of the week, Sun = 0, Mon = 1, ...
+		isRTL: false, // True if right-to-left language, false if left-to-right
+		showMonthAfterYear: false, // True if the year select precedes month, false for month then year
+		yearSuffix: '' // Additional text to append to the year in the month headers
+	};
+	this._defaults = { // Global defaults for all the date picker instances
+		showOn: 'focus', // 'focus' for popup on focus,
+			// 'button' for trigger button, or 'both' for either
+		showAnim: 'fadeIn', // Name of jQuery animation for popup
+		showOptions: {}, // Options for enhanced animations
+		defaultDate: null, // Used when field is blank: actual date,
+			// +/-number for offset from today, null for today
+		appendText: '', // Display text following the input box, e.g. showing the format
+		buttonText: '...', // Text for trigger button
+		buttonImage: '', // URL for trigger button image
+		buttonImageOnly: false, // True if the image appears alone, false if it appears on a button
+		hideIfNoPrevNext: false, // True to hide next/previous month links
+			// if not applicable, false to just disable them
+		navigationAsDateFormat: false, // True if date formatting applied to prev/today/next links
+		gotoCurrent: false, // True if today link goes back to current selection instead
+		changeMonth: false, // True if month can be selected directly, false if only prev/next
+		changeYear: false, // True if year can be selected directly, false if only prev/next
+		yearRange: 'c-10:c+10', // Range of years to display in drop-down,
+			// either relative to today's year (-nn:+nn), relative to currently displayed year
+			// (c-nn:c+nn), absolute (nnnn:nnnn), or a combination of the above (nnnn:-n)
+		showOtherMonths: false, // True to show dates in other months, false to leave blank
+		selectOtherMonths: false, // True to allow selection of dates in other months, false for unselectable
+		showWeek: false, // True to show week of the year, false to not show it
+		calculateWeek: this.iso8601Week, // How to calculate the week of the year,
+			// takes a Date and returns the number of the week for it
+		shortYearCutoff: '+10', // Short year values < this are in the current century,
+			// > this are in the previous century,
+			// string value starting with '+' for current year + value
+		minDate: null, // The earliest selectable date, or null for no limit
+		maxDate: null, // The latest selectable date, or null for no limit
+		duration: 'fast', // Duration of display/closure
+		beforeShowDay: null, // Function that takes a date and returns an array with
+			// [0] = true if selectable, false if not, [1] = custom CSS class name(s) or '',
+			// [2] = cell title (optional), e.g. $.datepicker.noWeekends
+		beforeShow: null, // Function that takes an input field and
+			// returns a set of custom settings for the date picker
+		onSelect: null, // Define a callback function when a date is selected
+		onChangeMonthYear: null, // Define a callback function when the month or year is changed
+		onClose: null, // Define a callback function when the datepicker is closed
+		numberOfMonths: 1, // Number of months to show at a time
+		showCurrentAtPos: 0, // The position in multipe months at which to show the current month (starting at 0)
+		stepMonths: 1, // Number of months to step back/forward
+		stepBigMonths: 12, // Number of months to step back/forward for the big links
+		altField: '', // Selector for an alternate field to store selected dates into
+		altFormat: '', // The date format to use for the alternate field
+		constrainInput: true, // The input is constrained by the current date format
+		showButtonPanel: false, // True to show button panel, false to not show it
+		autoSize: false // True to size the input for the date format, false to leave as is
+	};
+	$.extend(this._defaults, this.regional['']);
+	this.dpDiv = $('<div id="' + this._mainDivId + '" class="ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all"></div>');
+}
+
+$.extend(Datepicker.prototype, {
+	/* Class name added to elements to indicate already configured with a date picker. */
+	markerClassName: 'hasDatepicker',
+
+	/* Debug logging (if enabled). */
+	log: function () {
+		if (this.debug)
+			console.log.apply('', arguments);
+	},
+	
+	// TODO rename to "widget" when switching to widget factory
+	_widgetDatepicker: function() {
+		return this.dpDiv;
+	},
+
+	/* Override the default settings for all instances of the date picker.
+	   @param  settings  object - the new settings to use as defaults (anonymous object)
+	   @return the manager object */
+	setDefaults: function(settings) {
+		extendRemove(this._defaults, settings || {});
+		return this;
+	},
+
+	/* Attach the date picker to a jQuery selection.
+	   @param  target    element - the target input field or division or span
+	   @param  settings  object - the new settings to use for this date picker instance (anonymous) */
+	_attachDatepicker: function(target, settings) {
+		// check for settings on the control itself - in namespace 'date:'
+		var inlineSettings = null;
+		for (var attrName in this._defaults) {
+			var attrValue = target.getAttribute('date:' + attrName);
+			if (attrValue) {
+				inlineSettings = inlineSettings || {};
+				try {
+					inlineSettings[attrName] = eval(attrValue);
+				} catch (err) {
+					inlineSettings[attrName] = attrValue;
+				}
+			}
+		}
+		var nodeName = target.nodeName.toLowerCase();
+		var inline = (nodeName == 'div' || nodeName == 'span');
+		if (!target.id) {
+			this.uuid += 1;
+			target.id = 'dp' + this.uuid;
+		}
+		var inst = this._newInst($(target), inline);
+		inst.settings = $.extend({}, settings || {}, inlineSettings || {});
+		if (nodeName == 'input') {
+			this._connectDatepicker(target, inst);
+		} else if (inline) {
+			this._inlineDatepicker(target, inst);
+		}
+	},
+
+	/* Create a new instance object. */
+	_newInst: function(target, inline) {
+		var id = target[0].id.replace(/([^A-Za-z0-9_-])/g, '\\\\$1'); // escape jQuery meta chars
+		return {id: id, input: target, // associated target
+			selectedDay: 0, selectedMonth: 0, selectedYear: 0, // current selection
+			drawMonth: 0, drawYear: 0, // month being drawn
+			inline: inline, // is datepicker inline or not
+			dpDiv: (!inline ? this.dpDiv : // presentation div
+			$('<div class="' + this._inlineClass + ' ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all"></div>'))};
+	},
+
+	/* Attach the date picker to an input field. */
+	_connectDatepicker: function(target, inst) {
+		var input = $(target);
+		inst.append = $([]);
+		inst.trigger = $([]);
+		if (input.hasClass(this.markerClassName))
+			return;
+		this._attachments(input, inst);
+		input.addClass(this.markerClassName).keydown(this._doKeyDown).
+			keypress(this._doKeyPress).keyup(this._doKeyUp).
+			bind("setData.datepicker", function(event, key, value) {
+				inst.settings[key] = value;
+			}).bind("getData.datepicker", function(event, key) {
+				return this._get(inst, key);
+			});
+		this._autoSize(inst);
+		$.data(target, PROP_NAME, inst);
+	},
+
+	/* Make attachments based on settings. */
+	_attachments: function(input, inst) {
+		var appendText = this._get(inst, 'appendText');
+		var isRTL = this._get(inst, 'isRTL');
+		if (inst.append)
+			inst.append.remove();
+		if (appendText) {
+			inst.append = $('<span class="' + this._appendClass + '">' + appendText + '</span>');
+			input[isRTL ? 'before' : 'after'](inst.append);
+		}
+		input.unbind('focus', this._showDatepicker);
+		if (inst.trigger)
+			inst.trigger.remove();
+		var showOn = this._get(inst, 'showOn');
+		if (showOn == 'focus' || showOn == 'both') // pop-up date picker when in the marked field
+			input.focus(this._showDatepicker);
+		if (showOn == 'button' || showOn == 'both') { // pop-up date picker when button clicked
+			var buttonText = this._get(inst, 'buttonText');
+			var buttonImage = this._get(inst, 'buttonImage');
+			inst.trigger = $(this._get(inst, 'buttonImageOnly') ?
+				$('<img/>').addClass(this._triggerClass).
+					attr({ src: buttonImage, alt: buttonText, title: buttonText }) :
+				$('<button type="button"></button>').addClass(this._triggerClass).
+					html(buttonImage == '' ? buttonText : $('<img/>').attr(
+					{ src:buttonImage, alt:buttonText, title:buttonText })));
+			input[isRTL ? 'before' : 'after'](inst.trigger);
+			inst.trigger.click(function() {
+				if ($.datepicker._datepickerShowing && $.datepicker._lastInput == input[0])
+					$.datepicker._hideDatepicker();
+				else
+					$.datepicker._showDatepicker(input[0]);
+				return false;
+			});
+		}
+	},
+
+	/* Apply the maximum length for the date format. */
+	_autoSize: function(inst) {
+		if (this._get(inst, 'autoSize') && !inst.inline) {
+			var date = new Date(2009, 12 - 1, 20); // Ensure double digits
+			var dateFormat = this._get(inst, 'dateFormat');
+			if (dateFormat.match(/[DM]/)) {
+				var findMax = function(names) {
+					var max = 0;
+					var maxI = 0;
+					for (var i = 0; i < names.length; i++) {
+						if (names[i].length > max) {
+							max = names[i].length;
+							maxI = i;
+						}
+					}
+					return maxI;
+				};
+				date.setMonth(findMax(this._get(inst, (dateFormat.match(/MM/) ?
+					'monthNames' : 'monthNamesShort'))));
+				date.setDate(findMax(this._get(inst, (dateFormat.match(/DD/) ?
+					'dayNames' : 'dayNamesShort'))) + 20 - date.getDay());
+			}
+			inst.input.attr('size', this._formatDate(inst, date).length);
+		}
+	},
+
+	/* Attach an inline date picker to a div. */
+	_inlineDatepicker: function(target, inst) {
+		var divSpan = $(target);
+		if (divSpan.hasClass(this.markerClassName))
+			return;
+		divSpan.addClass(this.markerClassName).append(inst.dpDiv).
+			bind("setData.datepicker", function(event, key, value){
+				inst.settings[key] = value;
+			}).bind("getData.datepicker", function(event, key){
+				return this._get(inst, key);
+			});
+		$.data(target, PROP_NAME, inst);
+		this._setDate(inst, this._getDefaultDate(inst), true);
+		this._updateDatepicker(inst);
+		this._updateAlternate(inst);
+		inst.dpDiv.show();
+	},
+
+	/* Pop-up the date picker in a "dialog" box.
+	   @param  input     element - ignored
+	   @param  date      string or Date - the initial date to display
+	   @param  onSelect  function - the function to call when a date is selected
+	   @param  settings  object - update the dialog date picker instance's settings (anonymous object)
+	   @param  pos       int[2] - coordinates for the dialog's position within the screen or
+	                     event - with x/y coordinates or
+	                     leave empty for default (screen centre)
+	   @return the manager object */
+	_dialogDatepicker: function(input, date, onSelect, settings, pos) {
+		var inst = this._dialogInst; // internal instance
+		if (!inst) {
+			this.uuid += 1;
+			var id = 'dp' + this.uuid;
+			this._dialogInput = $('<input type="text" id="' + id +
+				'" style="position: absolute; top: -100px; width: 0px; z-index: -10;"/>');
+			this._dialogInput.keydown(this._doKeyDown);
+			$('body').append(this._dialogInput);
+			inst = this._dialogInst = this._newInst(this._dialogInput, false);
+			inst.settings = {};
+			$.data(this._dialogInput[0], PROP_NAME, inst);
+		}
+		extendRemove(inst.settings, settings || {});
+		date = (date && date.constructor == Date ? this._formatDate(inst, date) : date);
+		this._dialogInput.val(date);
+
+		this._pos = (pos ? (pos.length ? pos : [pos.pageX, pos.pageY]) : null);
+		if (!this._pos) {
+			var browserWidth = document.documentElement.clientWidth;
+			var browserHeight = document.documentElement.clientHeight;
+			var scrollX = document.documentElement.scrollLeft || document.body.scrollLeft;
+			var scrollY = document.documentElement.scrollTop || document.body.scrollTop;
+			this._pos = // should use actual width/height below
+				[(browserWidth / 2) - 100 + scrollX, (browserHeight / 2) - 150 + scrollY];
+		}
+
+		// move input on screen for focus, but hidden behind dialog
+		this._dialogInput.css('left', (this._pos[0] + 20) + 'px').css('top', this._pos[1] + 'px');
+		inst.settings.onSelect = onSelect;
+		this._inDialog = true;
+		this.dpDiv.addClass(this._dialogClass);
+		this._showDatepicker(this._dialogInput[0]);
+		if ($.blockUI)
+			$.blockUI(this.dpDiv);
+		$.data(this._dialogInput[0], PROP_NAME, inst);
+		return this;
+	},
+
+	/* Detach a datepicker from its control.
+	   @param  target    element - the target input field or division or span */
+	_destroyDatepicker: function(target) {
+		var $target = $(target);
+		var inst = $.data(target, PROP_NAME);
+		if (!$target.hasClass(this.markerClassName)) {
+			return;
+		}
+		var nodeName = target.nodeName.toLowerCase();
+		$.removeData(target, PROP_NAME);
+		if (nodeName == 'input') {
+			inst.append.remove();
+			inst.trigger.remove();
+			$target.removeClass(this.markerClassName).
+				unbind('focus', this._showDatepicker).
+				unbind('keydown', this._doKeyDown).
+				unbind('keypress', this._doKeyPress).
+				unbind('keyup', this._doKeyUp);
+		} else if (nodeName == 'div' || nodeName == 'span')
+			$target.removeClass(this.markerClassName).empty();
+	},
+
+	/* Enable the date picker to a jQuery selection.
+	   @param  target    element - the target input field or division or span */
+	_enableDatepicker: function(target) {
+		var $target = $(target);
+		var inst = $.data(target, PROP_NAME);
+		if (!$target.hasClass(this.markerClassName)) {
+			return;
+		}
+		var nodeName = target.nodeName.toLowerCase();
+		if (nodeName == 'input') {
+			target.disabled = false;
+			inst.trigger.filter('button').
+				each(function() { this.disabled = false; }).end().
+				filter('img').css({opacity: '1.0', cursor: ''});
+		}
+		else if (nodeName == 'div' || nodeName == 'span') {
+			var inline = $target.children('.' + this._inlineClass);
+			inline.children().removeClass('ui-state-disabled');
+		}
+		this._disabledInputs = $.map(this._disabledInputs,
+			function(value) { return (value == target ? null : value); }); // delete entry
+	},
+
+	/* Disable the date picker to a jQuery selection.
+	   @param  target    element - the target input field or division or span */
+	_disableDatepicker: function(target) {
+		var $target = $(target);
+		var inst = $.data(target, PROP_NAME);
+		if (!$target.hasClass(this.markerClassName)) {
+			return;
+		}
+		var nodeName = target.nodeName.toLowerCase();
+		if (nodeName == 'input') {
+			target.disabled = true;
+			inst.trigger.filter('button').
+				each(function() { this.disabled = true; }).end().
+				filter('img').css({opacity: '0.5', cursor: 'default'});
+		}
+		else if (nodeName == 'div' || nodeName == 'span') {
+			var inline = $target.children('.' + this._inlineClass);
+			inline.children().addClass('ui-state-disabled');
+		}
+		this._disabledInputs = $.map(this._disabledInputs,
+			function(value) { return (value == target ? null : value); }); // delete entry
+		this._disabledInputs[this._disabledInputs.length] = target;
+	},
+
+	/* Is the first field in a jQuery collection disabled as a datepicker?
+	   @param  target    element - the target input field or division or span
+	   @return boolean - true if disabled, false if enabled */
+	_isDisabledDatepicker: function(target) {
+		if (!target) {
+			return false;
+		}
+		for (var i = 0; i < this._disabledInputs.length; i++) {
+			if (this._disabledInputs[i] == target)
+				return true;
+		}
+		return false;
+	},
+
+	/* Retrieve the instance data for the target control.
+	   @param  target  element - the target input field or division or span
+	   @return  object - the associated instance data
+	   @throws  error if a jQuery problem getting data */
+	_getInst: function(target) {
+		try {
+			return $.data(target, PROP_NAME);
+		}
+		catch (err) {
+			throw 'Missing instance data for this datepicker';
+		}
+	},
+
+	/* Update or retrieve the settings for a date picker attached to an input field or division.
+	   @param  target  element - the target input field or division or span
+	   @param  name    object - the new settings to update or
+	                   string - the name of the setting to change or retrieve,
+	                   when retrieving also 'all' for all instance settings or
+	                   'defaults' for all global defaults
+	   @param  value   any - the new value for the setting
+	                   (omit if above is an object or to retrieve a value) */
+	_optionDatepicker: function(target, name, value) {
+		var inst = this._getInst(target);
+		if (arguments.length == 2 && typeof name == 'string') {
+			return (name == 'defaults' ? $.extend({}, $.datepicker._defaults) :
+				(inst ? (name == 'all' ? $.extend({}, inst.settings) :
+				this._get(inst, name)) : null));
+		}
+		var settings = name || {};
+		if (typeof name == 'string') {
+			settings = {};
+			settings[name] = value;
+		}
+		if (inst) {
+			if (this._curInst == inst) {
+				this._hideDatepicker();
+			}
+			var date = this._getDateDatepicker(target, true);
+			extendRemove(inst.settings, settings);
+			this._attachments($(target), inst);
+			this._autoSize(inst);
+			this._setDateDatepicker(target, date);
+			this._updateDatepicker(inst);
+		}
+	},
+
+	// change method deprecated
+	_changeDatepicker: function(target, name, value) {
+		this._optionDatepicker(target, name, value);
+	},
+
+	/* Redraw the date picker attached to an input field or division.
+	   @param  target  element - the target input field or division or span */
+	_refreshDatepicker: function(target) {
+		var inst = this._getInst(target);
+		if (inst) {
+			this._updateDatepicker(inst);
+		}
+	},
+
+	/* Set the dates for a jQuery selection.
+	   @param  target   element - the target input field or division or span
+	   @param  date     Date - the new date */
+	_setDateDatepicker: function(target, date) {
+		var inst = this._getInst(target);
+		if (inst) {
+			this._setDate(inst, date);
+			this._updateDatepicker(inst);
+			this._updateAlternate(inst);
+		}
+	},
+
+	/* Get the date(s) for the first entry in a jQuery selection.
+	   @param  target     element - the target input field or division or span
+	   @param  noDefault  boolean - true if no default date is to be used
+	   @return Date - the current date */
+	_getDateDatepicker: function(target, noDefault) {
+		var inst = this._getInst(target);
+		if (inst && !inst.inline)
+			this._setDateFromField(inst, noDefault);
+		return (inst ? this._getDate(inst) : null);
+	},
+
+	/* Handle keystrokes. */
+	_doKeyDown: function(event) {
+		var inst = $.datepicker._getInst(event.target);
+		var handled = true;
+		var isRTL = inst.dpDiv.is('.ui-datepicker-rtl');
+		inst._keyEvent = true;
+		if ($.datepicker._datepickerShowing)
+			switch (event.keyCode) {
+				case 9: $.datepicker._hideDatepicker();
+						handled = false;
+						break; // hide on tab out
+				case 13: var sel = $('td.' + $.datepicker._dayOverClass + ':not(.' + 
+									$.datepicker._currentClass + ')', inst.dpDiv);
+						if (sel[0])
+							$.datepicker._selectDay(event.target, inst.selectedMonth, inst.selectedYear, sel[0]);
+						else
+							$.datepicker._hideDatepicker();
+						return false; // don't submit the form
+						break; // select the value on enter
+				case 27: $.datepicker._hideDatepicker();
+						break; // hide on escape
+				case 33: $.datepicker._adjustDate(event.target, (event.ctrlKey ?
+							-$.datepicker._get(inst, 'stepBigMonths') :
+							-$.datepicker._get(inst, 'stepMonths')), 'M');
+						break; // previous month/year on page up/+ ctrl
+				case 34: $.datepicker._adjustDate(event.target, (event.ctrlKey ?
+							+$.datepicker._get(inst, 'stepBigMonths') :
+							+$.datepicker._get(inst, 'stepMonths')), 'M');
+						break; // next month/year on page down/+ ctrl
+				case 35: if (event.ctrlKey || event.metaKey) $.datepicker._clearDate(event.target);
+						handled = event.ctrlKey || event.metaKey;
+						break; // clear on ctrl or command +end
+				case 36: if (event.ctrlKey || event.metaKey) $.datepicker._gotoToday(event.target);
+						handled = event.ctrlKey || event.metaKey;
+						break; // current on ctrl or command +home
+				case 37: if (event.ctrlKey || event.metaKey) $.datepicker._adjustDate(event.target, (isRTL ? +1 : -1), 'D');
+						handled = event.ctrlKey || event.metaKey;
+						// -1 day on ctrl or command +left
+						if (event.originalEvent.altKey) $.datepicker._adjustDate(event.target, (event.ctrlKey ?
+									-$.datepicker._get(inst, 'stepBigMonths') :
+									-$.datepicker._get(inst, 'stepMonths')), 'M');
+						// next month/year on alt +left on Mac
+						break;
+				case 38: if (event.ctrlKey || event.metaKey) $.datepicker._adjustDate(event.target, -7, 'D');
+						handled = event.ctrlKey || event.metaKey;
+						break; // -1 week on ctrl or command +up
+				case 39: if (event.ctrlKey || event.metaKey) $.datepicker._adjustDate(event.target, (isRTL ? -1 : +1), 'D');
+						handled = event.ctrlKey || event.metaKey;
+						// +1 day on ctrl or command +right
+						if (event.originalEvent.altKey) $.datepicker._adjustDate(event.target, (event.ctrlKey ?
+									+$.datepicker._get(inst, 'stepBigMonths') :
+									+$.datepicker._get(inst, 'stepMonths')), 'M');
+						// next month/year on alt +right
+						break;
+				case 40: if (event.ctrlKey || event.metaKey) $.datepicker._adjustDate(event.target, +7, 'D');
+						handled = event.ctrlKey || event.metaKey;
+						break; // +1 week on ctrl or command +down
+				default: handled = false;
+			}
+		else if (event.keyCode == 36 && event.ctrlKey) // display the date picker on ctrl+home
+			$.datepicker._showDatepicker(this);
+		else {
+			handled = false;
+		}
+		if (handled) {
+			event.preventDefault();
+			event.stopPropagation();
+		}
+	},
+
+	/* Filter entered characters - based on date format. */
+	_doKeyPress: function(event) {
+		var inst = $.datepicker._getInst(event.target);
+		if ($.datepicker._get(inst, 'constrainInput')) {
+			var chars = $.datepicker._possibleChars($.datepicker._get(inst, 'dateFormat'));
+			var chr = String.fromCharCode(event.charCode == undefined ? event.keyCode : event.charCode);
+			return event.ctrlKey || event.metaKey || (chr < ' ' || !chars || chars.indexOf(chr) > -1);
+		}
+	},
+
+	/* Synchronise manual entry and field/alternate field. */
+	_doKeyUp: function(event) {
+		var inst = $.datepicker._getInst(event.target);
+		if (inst.input.val() != inst.lastVal) {
+			try {
+				var date = $.datepicker.parseDate($.datepicker._get(inst, 'dateFormat'),
+					(inst.input ? inst.input.val() : null),
+					$.datepicker._getFormatConfig(inst));
+				if (date) { // only if valid
+					$.datepicker._setDateFromField(inst);
+					$.datepicker._updateAlternate(inst);
+					$.datepicker._updateDatepicker(inst);
+				}
+			}
+			catch (event) {
+				$.datepicker.log(event);
+			}
+		}
+		return true;
+	},
+
+	/* Pop-up the date picker for a given input field.
+	   @param  input  element - the input field attached to the date picker or
+	                  event - if triggered by focus */
+	_showDatepicker: function(input) {
+		input = input.target || input;
+		if (input.nodeName.toLowerCase() != 'input') // find from button/image trigger
+			input = $('input', input.parentNode)[0];
+		if ($.datepicker._isDisabledDatepicker(input) || $.datepicker._lastInput == input) // already here
+			return;
+		var inst = $.datepicker._getInst(input);
+		if ($.datepicker._curInst && $.datepicker._curInst != inst) {
+			$.datepicker._curInst.dpDiv.stop(true, true);
+		}
+		var beforeShow = $.datepicker._get(inst, 'beforeShow');
+		extendRemove(inst.settings, (beforeShow ? beforeShow.apply(input, [input, inst]) : {}));
+		inst.lastVal = null;
+		$.datepicker._lastInput = input;
+		$.datepicker._setDateFromField(inst);
+		if ($.datepicker._inDialog) // hide cursor
+			input.value = '';
+		if (!$.datepicker._pos) { // position below input
+			$.datepicker._pos = $.datepicker._findPos(input);
+			$.datepicker._pos[1] += input.offsetHeight; // add the height
+		}
+		var isFixed = false;
+		$(input).parents().each(function() {
+			isFixed |= $(this).css('position') == 'fixed';
+			return !isFixed;
+		});
+		if (isFixed && $.browser.opera) { // correction for Opera when fixed and scrolled
+			$.datepicker._pos[0] -= document.documentElement.scrollLeft;
+			$.datepicker._pos[1] -= document.documentElement.scrollTop;
+		}
+		var offset = {left: $.datepicker._pos[0], top: $.datepicker._pos[1]};
+		$.datepicker._pos = null;
+		//to avoid flashes on Firefox
+		inst.dpDiv.empty();
+		// determine sizing offscreen
+		inst.dpDiv.css({position: 'absolute', display: 'block', top: '-1000px'});
+		$.datepicker._updateDatepicker(inst);
+		// fix width for dynamic number of date pickers
+		// and adjust position before showing
+		offset = $.datepicker._checkOffset(inst, offset, isFixed);
+		inst.dpDiv.css({position: ($.datepicker._inDialog && $.blockUI ?
+			'static' : (isFixed ? 'fixed' : 'absolute')), display: 'none',
+			left: offset.left + 'px', top: offset.top + 'px'});
+		if (!inst.inline) {
+			var showAnim = $.datepicker._get(inst, 'showAnim');
+			var duration = $.datepicker._get(inst, 'duration');
+			var postProcess = function() {
+				$.datepicker._datepickerShowing = true;
+				var cover = inst.dpDiv.find('iframe.ui-datepicker-cover'); // IE6- only
+				if( !! cover.length ){
+					var borders = $.datepicker._getBorders(inst.dpDiv);
+					cover.css({left: -borders[0], top: -borders[1],
+						width: inst.dpDiv.outerWidth(), height: inst.dpDiv.outerHeight()});
+				}
+			};
+			inst.dpDiv.zIndex($(input).zIndex()+1);
+			if ($.effects && $.effects[showAnim])
+				inst.dpDiv.show(showAnim, $.datepicker._get(inst, 'showOptions'), duration, postProcess);
+			else
+				inst.dpDiv[showAnim || 'show']((showAnim ? duration : null), postProcess);
+			if (!showAnim || !duration)
+				postProcess();
+			if (inst.input.is(':visible') && !inst.input.is(':disabled'))
+				inst.input.focus();
+			$.datepicker._curInst = inst;
+		}
+	},
+
+	/* Generate the date picker content. */
+	_updateDatepicker: function(inst) {
+		var self = this;
+		var borders = $.datepicker._getBorders(inst.dpDiv);
+		inst.dpDiv.empty().append(this._generateHTML(inst));
+		var cover = inst.dpDiv.find('iframe.ui-datepicker-cover'); // IE6- only
+		if( !!cover.length ){ //avoid call to outerXXXX() when not in IE6
+			cover.css({left: -borders[0], top: -borders[1], width: inst.dpDiv.outerWidth(), height: inst.dpDiv.outerHeight()})
+		}
+		inst.dpDiv.find('button, .ui-datepicker-prev, .ui-datepicker-next, .ui-datepicker-calendar td a')
+				.bind('mouseout', function(){
+					$(this).removeClass('ui-state-hover');
+					if(this.className.indexOf('ui-datepicker-prev') != -1) $(this).removeClass('ui-datepicker-prev-hover');
+					if(this.className.indexOf('ui-datepicker-next') != -1) $(this).removeClass('ui-datepicker-next-hover');
+				})
+				.bind('mouseover', function(){
+					if (!self._isDisabledDatepicker( inst.inline ? inst.dpDiv.parent()[0] : inst.input[0])) {
+						$(this).parents('.ui-datepicker-calendar').find('a').removeClass('ui-state-hover');
+						$(this).addClass('ui-state-hover');
+						if(this.className.indexOf('ui-datepicker-prev') != -1) $(this).addClass('ui-datepicker-prev-hover');
+						if(this.className.indexOf('ui-datepicker-next') != -1) $(this).addClass('ui-datepicker-next-hover');
+					}
+				})
+			.end()
+			.find('.' + this._dayOverClass + ' a')
+				.trigger('mouseover')
+			.end();
+		var numMonths = this._getNumberOfMonths(inst);
+		var cols = numMonths[1];
+		var width = 17;
+		if (cols > 1)
+			inst.dpDiv.addClass('ui-datepicker-multi-' + cols).css('width', (width * cols) + 'em');
+		else
+			inst.dpDiv.removeClass('ui-datepicker-multi-2 ui-datepicker-multi-3 ui-datepicker-multi-4').width('');
+		inst.dpDiv[(numMonths[0] != 1 || numMonths[1] != 1 ? 'add' : 'remove') +
+			'Class']('ui-datepicker-multi');
+		inst.dpDiv[(this._get(inst, 'isRTL') ? 'add' : 'remove') +
+			'Class']('ui-datepicker-rtl');
+		if (inst == $.datepicker._curInst && $.datepicker._datepickerShowing && inst.input &&
+				// #6694 - don't focus the input if it's already focused
+				// this breaks the change event in IE
+				inst.input.is(':visible') && !inst.input.is(':disabled') && inst.input[0] != document.activeElement)
+			inst.input.focus();
+		// deffered render of the years select (to avoid flashes on Firefox) 
+		if( inst.yearshtml ){
+			var origyearshtml = inst.yearshtml;
+			setTimeout(function(){
+				//assure that inst.yearshtml didn't change.
+				if( origyearshtml === inst.yearshtml ){
+					inst.dpDiv.find('select.ui-datepicker-year:first').replaceWith(inst.yearshtml);
+				}
+				origyearshtml = inst.yearshtml = null;
+			}, 0);
+		}
+	},
+
+	/* Retrieve the size of left and top borders for an element.
+	   @param  elem  (jQuery object) the element of interest
+	   @return  (number[2]) the left and top borders */
+	_getBorders: function(elem) {
+		var convert = function(value) {
+			return {thin: 1, medium: 2, thick: 3}[value] || value;
+		};
+		return [parseFloat(convert(elem.css('border-left-width'))),
+			parseFloat(convert(elem.css('border-top-width')))];
+	},
+
+	/* Check positioning to remain on screen. */
+	_checkOffset: function(inst, offset, isFixed) {
+		var dpWidth = inst.dpDiv.outerWidth();
+		var dpHeight = inst.dpDiv.outerHeight();
+		var inputWidth = inst.input ? inst.input.outerWidth() : 0;
+		var inputHeight = inst.input ? inst.input.outerHeight() : 0;
+		var viewWidth = document.documentElement.clientWidth + $(document).scrollLeft();
+		var viewHeight = document.documentElement.clientHeight + $(document).scrollTop();
+
+		offset.left -= (this._get(inst, 'isRTL') ? (dpWidth - inputWidth) : 0);
+		offset.left -= (isFixed && offset.left == inst.input.offset().left) ? $(document).scrollLeft() : 0;
+		offset.top -= (isFixed && offset.top == (inst.input.offset().top + inputHeight)) ? $(document).scrollTop() : 0;
+
+		// now check if datepicker is showing outside window viewport - move to a better place if so.
+		offset.left -= Math.min(offset.left, (offset.left + dpWidth > viewWidth && viewWidth > dpWidth) ?
+			Math.abs(offset.left + dpWidth - viewWidth) : 0);
+		offset.top -= Math.min(offset.top, (offset.top + dpHeight > viewHeight && viewHeight > dpHeight) ?
+			Math.abs(dpHeight + inputHeight) : 0);
+
+		return offset;
+	},
+
+	/* Find an object's position on the screen. */
+	_findPos: function(obj) {
+		var inst = this._getInst(obj);
+		var isRTL = this._get(inst, 'isRTL');
+        while (obj && (obj.type == 'hidden' || obj.nodeType != 1 || $.expr.filters.hidden(obj))) {
+            obj = obj[isRTL ? 'previousSibling' : 'nextSibling'];
+        }
+        var position = $(obj).offset();
+	    return [position.left, position.top];
+	},
+
+	/* Hide the date picker from view.
+	   @param  input  element - the input field attached to the date picker */
+	_hideDatepicker: function(input) {
+		var inst = this._curInst;
+		if (!inst || (input && inst != $.data(input, PROP_NAME)))
+			return;
+		if (this._datepickerShowing) {
+			var showAnim = this._get(inst, 'showAnim');
+			var duration = this._get(inst, 'duration');
+			var postProcess = function() {
+				$.datepicker._tidyDialog(inst);
+				this._curInst = null;
+			};
+			if ($.effects && $.effects[showAnim])
+				inst.dpDiv.hide(showAnim, $.datepicker._get(inst, 'showOptions'), duration, postProcess);
+			else
+				inst.dpDiv[(showAnim == 'slideDown' ? 'slideUp' :
+					(showAnim == 'fadeIn' ? 'fadeOut' : 'hide'))]((showAnim ? duration : null), postProcess);
+			if (!showAnim)
+				postProcess();
+			var onClose = this._get(inst, 'onClose');
+			if (onClose)
+				onClose.apply((inst.input ? inst.input[0] : null),
+					[(inst.input ? inst.input.val() : ''), inst]);  // trigger custom callback
+			this._datepickerShowing = false;
+			this._lastInput = null;
+			if (this._inDialog) {
+				this._dialogInput.css({ position: 'absolute', left: '0', top: '-100px' });
+				if ($.blockUI) {
+					$.unblockUI();
+					$('body').append(this.dpDiv);
+				}
+			}
+			this._inDialog = false;
+		}
+	},
+
+	/* Tidy up after a dialog display. */
+	_tidyDialog: function(inst) {
+		inst.dpDiv.removeClass(this._dialogClass).unbind('.ui-datepicker-calendar');
+	},
+
+	/* Close date picker if clicked elsewhere. */
+	_checkExternalClick: function(event) {
+		if (!$.datepicker._curInst)
+			return;
+		var $target = $(event.target);
+		if ($target[0].id != $.datepicker._mainDivId &&
+				$target.parents('#' + $.datepicker._mainDivId).length == 0 &&
+				!$target.hasClass($.datepicker.markerClassName) &&
+				!$target.hasClass($.datepicker._triggerClass) &&
+				$.datepicker._datepickerShowing && !($.datepicker._inDialog && $.blockUI))
+			$.datepicker._hideDatepicker();
+	},
+
+	/* Adjust one of the date sub-fields. */
+	_adjustDate: function(id, offset, period) {
+		var target = $(id);
+		var inst = this._getInst(target[0]);
+		if (this._isDisabledDatepicker(target[0])) {
+			return;
+		}
+		this._adjustInstDate(inst, offset +
+			(period == 'M' ? this._get(inst, 'showCurrentAtPos') : 0), // undo positioning
+			period);
+		this._updateDatepicker(inst);
+	},
+
+	/* Action for current link. */
+	_gotoToday: function(id) {
+		var target = $(id);
+		var inst = this._getInst(target[0]);
+		if (this._get(inst, 'gotoCurrent') && inst.currentDay) {
+			inst.selectedDay = inst.currentDay;
+			inst.drawMonth = inst.selectedMonth = inst.currentMonth;
+			inst.drawYear = inst.selectedYear = inst.currentYear;
+		}
+		else {
+			var date = new Date();
+			inst.selectedDay = date.getDate();
+			inst.drawMonth = inst.selectedMonth = date.getMonth();
+			inst.drawYear = inst.selectedYear = date.getFullYear();
+		}
+		this._notifyChange(inst);
+		this._adjustDate(target);
+	},
+
+	/* Action for selecting a new month/year. */
+	_selectMonthYear: function(id, select, period) {
+		var target = $(id);
+		var inst = this._getInst(target[0]);
+		inst._selectingMonthYear = false;
+		inst['selected' + (period == 'M' ? 'Month' : 'Year')] =
+		inst['draw' + (period == 'M' ? 'Month' : 'Year')] =
+			parseInt(select.options[select.selectedIndex].value,10);
+		this._notifyChange(inst);
+		this._adjustDate(target);
+	},
+
+	/* Restore input focus after not changing month/year. */
+	_clickMonthYear: function(id) {
+		var target = $(id);
+		var inst = this._getInst(target[0]);
+		if (inst.input && inst._selectingMonthYear) {
+			setTimeout(function() {
+				inst.input.focus();
+			}, 0);
+		}
+		inst._selectingMonthYear = !inst._selectingMonthYear;
+	},
+
+	/* Action for selecting a day. */
+	_selectDay: function(id, month, year, td) {
+		var target = $(id);
+		if ($(td).hasClass(this._unselectableClass) || this._isDisabledDatepicker(target[0])) {
+			return;
+		}
+		var inst = this._getInst(target[0]);
+		inst.selectedDay = inst.currentDay = $('a', td).html();
+		inst.selectedMonth = inst.currentMonth = month;
+		inst.selectedYear = inst.currentYear = year;
+		this._selectDate(id, this._formatDate(inst,
+			inst.currentDay, inst.currentMonth, inst.currentYear));
+	},
+
+	/* Erase the input field and hide the date picker. */
+	_clearDate: function(id) {
+		var target = $(id);
+		var inst = this._getInst(target[0]);
+		this._selectDate(target, '');
+	},
+
+	/* Update the input field with the selected date. */
+	_selectDate: function(id, dateStr) {
+		var target = $(id);
+		var inst = this._getInst(target[0]);
+		dateStr = (dateStr != null ? dateStr : this._formatDate(inst));
+		if (inst.input)
+			inst.input.val(dateStr);
+		this._updateAlternate(inst);
+		var onSelect = this._get(inst, 'onSelect');
+		if (onSelect)
+			onSelect.apply((inst.input ? inst.input[0] : null), [dateStr, inst]);  // trigger custom callback
+		else if (inst.input)
+			inst.input.trigger('change'); // fire the change event
+		if (inst.inline)
+			this._updateDatepicker(inst);
+		else {
+			this._hideDatepicker();
+			this._lastInput = inst.input[0];
+			if (typeof(inst.input[0]) != 'object')
+				inst.input.focus(); // restore focus
+			this._lastInput = null;
+		}
+	},
+
+	/* Update any alternate field to synchronise with the main field. */
+	_updateAlternate: function(inst) {
+		var altField = this._get(inst, 'altField');
+		if (altField) { // update alternate field too
+			var altFormat = this._get(inst, 'altFormat') || this._get(inst, 'dateFormat');
+			var date = this._getDate(inst);
+			var dateStr = this.formatDate(altFormat, date, this._getFormatConfig(inst));
+			$(altField).each(function() { $(this).val(dateStr); });
+		}
+	},
+
+	/* Set as beforeShowDay function to prevent selection of weekends.
+	   @param  date  Date - the date to customise
+	   @return [boolean, string] - is this date selectable?, what is its CSS class? */
+	noWeekends: function(date) {
+		var day = date.getDay();
+		return [(day > 0 && day < 6), ''];
+	},
+
+	/* Set as calculateWeek to determine the week of the year based on the ISO 8601 definition.
+	   @param  date  Date - the date to get the week for
+	   @return  number - the number of the week within the year that contains this date */
+	iso8601Week: function(date) {
+		var checkDate = new Date(date.getTime());
+		// Find Thursday of this week starting on Monday
+		checkDate.setDate(checkDate.getDate() + 4 - (checkDate.getDay() || 7));
+		var time = checkDate.getTime();
+		checkDate.setMonth(0); // Compare with Jan 1
+		checkDate.setDate(1);
+		return Math.floor(Math.round((time - checkDate) / 86400000) / 7) + 1;
+	},
+
+	/* Parse a string value into a date object.
+	   See formatDate below for the possible formats.
+
+	   @param  format    string - the expected format of the date
+	   @param  value     string - the date in the above format
+	   @param  settings  Object - attributes include:
+	                     shortYearCutoff  number - the cutoff year for determining the century (optional)
+	                     dayNamesShort    string[7] - abbreviated names of the days from Sunday (optional)
+	                     dayNames         string[7] - names of the days from Sunday (optional)
+	                     monthNamesShort  string[12] - abbreviated names of the months (optional)
+	                     monthNames       string[12] - names of the months (optional)
+	   @return  Date - the extracted date value or null if value is blank */
+	parseDate: function (format, value, settings) {
+		if (format == null || value == null)
+			throw 'Invalid arguments';
+		value = (typeof value == 'object' ? value.toString() : value + '');
+		if (value == '')
+			return null;
+		var shortYearCutoff = (settings ? settings.shortYearCutoff : null) || this._defaults.shortYearCutoff;
+		shortYearCutoff = (typeof shortYearCutoff != 'string' ? shortYearCutoff :
+				new Date().getFullYear() % 100 + parseInt(shortYearCutoff, 10));
+		var dayNamesShort = (settings ? settings.dayNamesShort : null) || this._defaults.dayNamesShort;
+		var dayNames = (settings ? settings.dayNames : null) || this._defaults.dayNames;
+		var monthNamesShort = (settings ? settings.monthNamesShort : null) || this._defaults.monthNamesShort;
+		var monthNames = (settings ? settings.monthNames : null) || this._defaults.monthNames;
+		var year = -1;
+		var month = -1;
+		var day = -1;
+		var doy = -1;
+		var literal = false;
+		// Check whether a format character is doubled
+		var lookAhead = function(match) {
+			var matches = (iFormat + 1 < format.length && format.charAt(iFormat + 1) == match);
+			if (matches)
+				iFormat++;
+			return matches;
+		};
+		// Extract a number from the string value
+		var getNumber = function(match) {
+			var isDoubled = lookAhead(match);
+			var size = (match == '@' ? 14 : (match == '!' ? 20 :
+				(match == 'y' && isDoubled ? 4 : (match == 'o' ? 3 : 2))));
+			var digits = new RegExp('^\\d{1,' + size + '}');
+			var num = value.substring(iValue).match(digits);
+			if (!num)
+				throw 'Missing number at position ' + iValue;
+			iValue += num[0].length;
+			return parseInt(num[0], 10);
+		};
+		// Extract a name from the string value and convert to an index
+		var getName = function(match, shortNames, longNames) {
+			var names = (lookAhead(match) ? longNames : shortNames);
+			for (var i = 0; i < names.length; i++) {
+				if (value.substr(iValue, names[i].length).toLowerCase() == names[i].toLowerCase()) {
+					iValue += names[i].length;
+					return i + 1;
+				}
+			}
+			throw 'Unknown name at position ' + iValue;
+		};
+		// Confirm that a literal character matches the string value
+		var checkLiteral = function() {
+			if (value.charAt(iValue) != format.charAt(iFormat))
+				throw 'Unexpected literal at position ' + iValue;
+			iValue++;
+		};
+		var iValue = 0;
+		for (var iFormat = 0; iFormat < format.length; iFormat++) {
+			if (literal)
+				if (format.charAt(iFormat) == "'" && !lookAhead("'"))
+					literal = false;
+				else
+					checkLiteral();
+			else
+				switch (format.charAt(iFormat)) {
+					case 'd':
+						day = getNumber('d');
+						break;
+					case 'D':
+						getName('D', dayNamesShort, dayNames);
+						break;
+					case 'o':
+						doy = getNumber('o');
+						break;
+					case 'm':
+						month = getNumber('m');
+						break;
+					case 'M':
+						month = getName('M', monthNamesShort, monthNames);
+						break;
+					case 'y':
+						year = getNumber('y');
+						break;
+					case '@':
+						var date = new Date(getNumber('@'));
+						year = date.getFullYear();
+						month = date.getMonth() + 1;
+						day = date.getDate();
+						break;
+					case '!':
+						var date = new Date((getNumber('!') - this._ticksTo1970) / 10000);
+						year = date.getFullYear();
+						month = date.getMonth() + 1;
+						day = date.getDate();
+						break;
+					case "'":
+						if (lookAhead("'"))
+							checkLiteral();
+						else
+							literal = true;
+						break;
+					default:
+						checkLiteral();
+				}
+		}
+		if (year == -1)
+			year = new Date().getFullYear();
+		else if (year < 100)
+			year += new Date().getFullYear() - new Date().getFullYear() % 100 +
+				(year <= shortYearCutoff ? 0 : -100);
+		if (doy > -1) {
+			month = 1;
+			day = doy;
+			do {
+				var dim = this._getDaysInMonth(year, month - 1);
+				if (day <= dim)
+					break;
+				month++;
+				day -= dim;
+			} while (true);
+		}
+		var date = this._daylightSavingAdjust(new Date(year, month - 1, day));
+		if (date.getFullYear() != year || date.getMonth() + 1 != month || date.getDate() != day)
+			throw 'Invalid date'; // E.g. 31/02/*
+		return date;
+	},
+
+	/* Standard date formats. */
+	ATOM: 'yy-mm-dd', // RFC 3339 (ISO 8601)
+	COOKIE: 'D, dd M yy',
+	ISO_8601: 'yy-mm-dd',
+	RFC_822: 'D, d M y',
+	RFC_850: 'DD, dd-M-y',
+	RFC_1036: 'D, d M y',
+	RFC_1123: 'D, d M yy',
+	RFC_2822: 'D, d M yy',
+	RSS: 'D, d M y', // RFC 822
+	TICKS: '!',
+	TIMESTAMP: '@',
+	W3C: 'yy-mm-dd', // ISO 8601
+
+	_ticksTo1970: (((1970 - 1) * 365 + Math.floor(1970 / 4) - Math.floor(1970 / 100) +
+		Math.floor(1970 / 400)) * 24 * 60 * 60 * 10000000),
+
+	/* Format a date object into a string value.
+	   The format can be combinations of the following:
+	   d  - day of month (no leading zero)
+	   dd - day of month (two digit)
+	   o  - day of year (no leading zeros)
+	   oo - day of year (three digit)
+	   D  - day name short
+	   DD - day name long
+	   m  - month of year (no leading zero)
+	   mm - month of year (two digit)
+	   M  - month name short
+	   MM - month name long
+	   y  - year (two digit)
+	   yy - year (four digit)
+	   @ - Unix timestamp (ms since 01/01/1970)
+	   ! - Windows ticks (100ns since 01/01/0001)
+	   '...' - literal text
+	   '' - single quote
+
+	   @param  format    string - the desired format of the date
+	   @param  date      Date - the date value to format
+	   @param  settings  Object - attributes include:
+	                     dayNamesShort    string[7] - abbreviated names of the days from Sunday (optional)
+	                     dayNames         string[7] - names of the days from Sunday (optional)
+	                     monthNamesShort  string[12] - abbreviated names of the months (optional)
+	                     monthNames       string[12] - names of the months (optional)
+	   @return  string - the date in the above format */
+	formatDate: function (format, date, settings) {
+		if (!date)
+			return '';
+		var dayNamesShort = (settings ? settings.dayNamesShort : null) || this._defaults.dayNamesShort;
+		var dayNames = (settings ? settings.dayNames : null) || this._defaults.dayNames;
+		var monthNamesShort = (settings ? settings.monthNamesShort : null) || this._defaults.monthNamesShort;
+		var monthNames = (settings ? settings.monthNames : null) || this._defaults.monthNames;
+		// Check whether a format character is doubled
+		var lookAhead = function(match) {
+			var matches = (iFormat + 1 < format.length && format.charAt(iFormat + 1) == match);
+			if (matches)
+				iFormat++;
+			return matches;
+		};
+		// Format a number, with leading zero if necessary
+		var formatNumber = function(match, value, len) {
+			var num = '' + value;
+			if (lookAhead(match))
+				while (num.length < len)
+					num = '0' + num;
+			return num;
+		};
+		// Format a name, short or long as requested
+		var formatName = function(match, value, shortNames, longNames) {
+			return (lookAhead(match) ? longNames[value] : shortNames[value]);
+		};
+		var output = '';
+		var literal = false;
+		if (date)
+			for (var iFormat = 0; iFormat < format.length; iFormat++) {
+				if (literal)
+					if (format.charAt(iFormat) == "'" && !lookAhead("'"))
+						literal = false;
+					else
+						output += format.charAt(iFormat);
+				else
+					switch (format.charAt(iFormat)) {
+						case 'd':
+							output += formatNumber('d', date.getDate(), 2);
+							break;
+						case 'D':
+							output += formatName('D', date.getDay(), dayNamesShort, dayNames);
+							break;
+						case 'o':
+							output += formatNumber('o',
+								(date.getTime() - new Date(date.getFullYear(), 0, 0).getTime()) / 86400000, 3);
+							break;
+						case 'm':
+							output += formatNumber('m', date.getMonth() + 1, 2);
+							break;
+						case 'M':
+							output += formatName('M', date.getMonth(), monthNamesShort, monthNames);
+							break;
+						case 'y':
+							output += (lookAhead('y') ? date.getFullYear() :
+								(date.getYear() % 100 < 10 ? '0' : '') + date.getYear() % 100);
+							break;
+						case '@':
+							output += date.getTime();
+							break;
+						case '!':
+							output += date.getTime() * 10000 + this._ticksTo1970;
+							break;
+						case "'":
+							if (lookAhead("'"))
+								output += "'";
+							else
+								literal = true;
+							break;
+						default:
+							output += format.charAt(iFormat);
+					}
+			}
+		return output;
+	},
+
+	/* Extract all possible characters from the date format. */
+	_possibleChars: function (format) {
+		var chars = '';
+		var literal = false;
+		// Check whether a format character is doubled
+		var lookAhead = function(match) {
+			var matches = (iFormat + 1 < format.length && format.charAt(iFormat + 1) == match);
+			if (matches)
+				iFormat++;
+			return matches;
+		};
+		for (var iFormat = 0; iFormat < format.length; iFormat++)
+			if (literal)
+				if (format.charAt(iFormat) == "'" && !lookAhead("'"))
+					literal = false;
+				else
+					chars += format.charAt(iFormat);
+			else
+				switch (format.charAt(iFormat)) {
+					case 'd': case 'm': case 'y': case '@':
+						chars += '0123456789';
+						break;
+					case 'D': case 'M':
+						return null; // Accept anything
+					case "'":
+						if (lookAhead("'"))
+							chars += "'";
+						else
+							literal = true;
+						break;
+					default:
+						chars += format.charAt(iFormat);
+				}
+		return chars;
+	},
+
+	/* Get a setting value, defaulting if necessary. */
+	_get: function(inst, name) {
+		return inst.settings[name] !== undefined ?
+			inst.settings[name] : this._defaults[name];
+	},
+
+	/* Parse existing date and initialise date picker. */
+	_setDateFromField: function(inst, noDefault) {
+		if (inst.input.val() == inst.lastVal) {
+			return;
+		}
+		var dateFormat = this._get(inst, 'dateFormat');
+		var dates = inst.lastVal = inst.input ? inst.input.val() : null;
+		var date, defaultDate;
+		date = defaultDate = this._getDefaultDate(inst);
+		var settings = this._getFormatConfig(inst);
+		try {
+			date = this.parseDate(dateFormat, dates, settings) || defaultDate;
+		} catch (event) {
+			this.log(event);
+			dates = (noDefault ? '' : dates);
+		}
+		inst.selectedDay = date.getDate();
+		inst.drawMonth = inst.selectedMonth = date.getMonth();
+		inst.drawYear = inst.selectedYear = date.getFullYear();
+		inst.currentDay = (dates ? date.getDate() : 0);
+		inst.currentMonth = (dates ? date.getMonth() : 0);
+		inst.currentYear = (dates ? date.getFullYear() : 0);
+		this._adjustInstDate(inst);
+	},
+
+	/* Retrieve the default date shown on opening. */
+	_getDefaultDate: function(inst) {
+		return this._restrictMinMax(inst,
+			this._determineDate(inst, this._get(inst, 'defaultDate'), new Date()));
+	},
+
+	/* A date may be specified as an exact value or a relative one. */
+	_determineDate: function(inst, date, defaultDate) {
+		var offsetNumeric = function(offset) {
+			var date = new Date();
+			date.setDate(date.getDate() + offset);
+			return date;
+		};
+		var offsetString = function(offset) {
+			try {
+				return $.datepicker.parseDate($.datepicker._get(inst, 'dateFormat'),
+					offset, $.datepicker._getFormatConfig(inst));
+			}
+			catch (e) {
+				// Ignore
+			}
+			var date = (offset.toLowerCase().match(/^c/) ?
+				$.datepicker._getDate(inst) : null) || new Date();
+			var year = date.getFullYear();
+			var month = date.getMonth();
+			var day = date.getDate();
+			var pattern = /([+-]?[0-9]+)\s*(d|D|w|W|m|M|y|Y)?/g;
+			var matches = pattern.exec(offset);
+			while (matches) {
+				switch (matches[2] || 'd') {
+					case 'd' : case 'D' :
+						day += parseInt(matches[1],10); break;
+					case 'w' : case 'W' :
+						day += parseInt(matches[1],10) * 7; break;
+					case 'm' : case 'M' :
+						month += parseInt(matches[1],10);
+						day = Math.min(day, $.datepicker._getDaysInMonth(year, month));
+						break;
+					case 'y': case 'Y' :
+						year += parseInt(matches[1],10);
+						day = Math.min(day, $.datepicker._getDaysInMonth(year, month));
+						break;
+				}
+				matches = pattern.exec(offset);
+			}
+			return new Date(year, month, day);
+		};
+		var newDate = (date == null || date === '' ? defaultDate : (typeof date == 'string' ? offsetString(date) :
+			(typeof date == 'number' ? (isNaN(date) ? defaultDate : offsetNumeric(date)) : new Date(date.getTime()))));
+		newDate = (newDate && newDate.toString() == 'Invalid Date' ? defaultDate : newDate);
+		if (newDate) {
+			newDate.setHours(0);
+			newDate.setMinutes(0);
+			newDate.setSeconds(0);
+			newDate.setMilliseconds(0);
+		}
+		return this._daylightSavingAdjust(newDate);
+	},
+
+	/* Handle switch to/from daylight saving.
+	   Hours may be non-zero on daylight saving cut-over:
+	   > 12 when midnight changeover, but then cannot generate
+	   midnight datetime, so jump to 1AM, otherwise reset.
+	   @param  date  (Date) the date to check
+	   @return  (Date) the corrected date */
+	_daylightSavingAdjust: function(date) {
+		if (!date) return null;
+		date.setHours(date.getHours() > 12 ? date.getHours() + 2 : 0);
+		return date;
+	},
+
+	/* Set the date(s) directly. */
+	_setDate: function(inst, date, noChange) {
+		var clear = !date;
+		var origMonth = inst.selectedMonth;
+		var origYear = inst.selectedYear;
+		var newDate = this._restrictMinMax(inst, this._determineDate(inst, date, new Date()));
+		inst.selectedDay = inst.currentDay = newDate.getDate();
+		inst.drawMonth = inst.selectedMonth = inst.currentMonth = newDate.getMonth();
+		inst.drawYear = inst.selectedYear = inst.currentYear = newDate.getFullYear();
+		if ((origMonth != inst.selectedMonth || origYear != inst.selectedYear) && !noChange)
+			this._notifyChange(inst);
+		this._adjustInstDate(inst);
+		if (inst.input) {
+			inst.input.val(clear ? '' : this._formatDate(inst));
+		}
+	},
+
+	/* Retrieve the date(s) directly. */
+	_getDate: function(inst) {
+		var startDate = (!inst.currentYear || (inst.input && inst.input.val() == '') ? null :
+			this._daylightSavingAdjust(new Date(
+			inst.currentYear, inst.currentMonth, inst.currentDay)));
+			return startDate;
+	},
+
+	/* Generate the HTML for the current state of the date picker. */
+	_generateHTML: function(inst) {
+		var today = new Date();
+		today = this._daylightSavingAdjust(
+			new Date(today.getFullYear(), today.getMonth(), today.getDate())); // clear time
+		var isRTL = this._get(inst, 'isRTL');
+		var showButtonPanel = this._get(inst, 'showButtonPanel');
+		var hideIfNoPrevNext = this._get(inst, 'hideIfNoPrevNext');
+		var navigationAsDateFormat = this._get(inst, 'navigationAsDateFormat');
+		var numMonths = this._getNumberOfMonths(inst);
+		var showCurrentAtPos = this._get(inst, 'showCurrentAtPos');
+		var stepMonths = this._get(inst, 'stepMonths');
+		var isMultiMonth = (numMonths[0] != 1 || numMonths[1] != 1);
+		var currentDate = this._daylightSavingAdjust((!inst.currentDay ? new Date(9999, 9, 9) :
+			new Date(inst.currentYear, inst.currentMonth, inst.currentDay)));
+		var minDate = this._getMinMaxDate(inst, 'min');
+		var maxDate = this._getMinMaxDate(inst, 'max');
+		var drawMonth = inst.drawMonth - showCurrentAtPos;
+		var drawYear = inst.drawYear;
+		if (drawMonth < 0) {
+			drawMonth += 12;
+			drawYear--;
+		}
+		if (maxDate) {
+			var maxDraw = this._daylightSavingAdjust(new Date(maxDate.getFullYear(),
+				maxDate.getMonth() - (numMonths[0] * numMonths[1]) + 1, maxDate.getDate()));
+			maxDraw = (minDate && maxDraw < minDate ? minDate : maxDraw);
+			while (this._daylightSavingAdjust(new Date(drawYear, drawMonth, 1)) > maxDraw) {
+				drawMonth--;
+				if (drawMonth < 0) {
+					drawMonth = 11;
+					drawYear--;
+				}
+			}
+		}
+		inst.drawMonth = drawMonth;
+		inst.drawYear = drawYear;
+		var prevText = this._get(inst, 'prevText');
+		prevText = (!navigationAsDateFormat ? prevText : this.formatDate(prevText,
+			this._daylightSavingAdjust(new Date(drawYear, drawMonth - stepMonths, 1)),
+			this._getFormatConfig(inst)));
+		var prev = (this._canAdjustMonth(inst, -1, drawYear, drawMonth) ?
+			'<a class="ui-datepicker-prev ui-corner-all" onclick="DP_jQuery_' + dpuuid +
+			'.datepicker._adjustDate(\'#' + inst.id + '\', -' + stepMonths + ', \'M\');"' +
+			' title="' + prevText + '"><span class="ui-icon ui-icon-circle-triangle-' + ( isRTL ? 'e' : 'w') + '">' + prevText + '</span></a>' :
+			(hideIfNoPrevNext ? '' : '<a class="ui-datepicker-prev ui-corner-all ui-state-disabled" title="'+ prevText +'"><span class="ui-icon ui-icon-circle-triangle-' + ( isRTL ? 'e' : 'w') + '">' + prevText + '</span></a>'));
+		var nextText = this._get(inst, 'nextText');
+		nextText = (!navigationAsDateFormat ? nextText : this.formatDate(nextText,
+			this._daylightSavingAdjust(new Date(drawYear, drawMonth + stepMonths, 1)),
+			this._getFormatConfig(inst)));
+		var next = (this._canAdjustMonth(inst, +1, drawYear, drawMonth) ?
+			'<a class="ui-datepicker-next ui-corner-all" onclick="DP_jQuery_' + dpuuid +
+			'.datepicker._adjustDate(\'#' + inst.id + '\', +' + stepMonths + ', \'M\');"' +
+			' title="' + nextText + '"><span class="ui-icon ui-icon-circle-triangle-' + ( isRTL ? 'w' : 'e') + '">' + nextText + '</span></a>' :
+			(hideIfNoPrevNext ? '' : '<a class="ui-datepicker-next ui-corner-all ui-state-disabled" title="'+ nextText + '"><span class="ui-icon ui-icon-circle-triangle-' + ( isRTL ? 'w' : 'e') + '">' + nextText + '</span></a>'));
+		var currentText = this._get(inst, 'currentText');
+		var gotoDate = (this._get(inst, 'gotoCurrent') && inst.currentDay ? currentDate : today);
+		currentText = (!navigationAsDateFormat ? currentText :
+			this.formatDate(currentText, gotoDate, this._getFormatConfig(inst)));
+		var controls = (!inst.inline ? '<button type="button" class="ui-datepicker-close ui-state-default ui-priority-primary ui-corner-all" onclick="DP_jQuery_' + dpuuid +
+			'.datepicker._hideDatepicker();">' + this._get(inst, 'closeText') + '</button>' : '');
+		var buttonPanel = (showButtonPanel) ? '<div class="ui-datepicker-buttonpane ui-widget-content">' + (isRTL ? controls : '') +
+			(this._isInRange(inst, gotoDate) ? '<button type="button" class="ui-datepicker-current ui-state-default ui-priority-secondary ui-corner-all" onclick="DP_jQuery_' + dpuuid +
+			'.datepicker._gotoToday(\'#' + inst.id + '\');"' +
+			'>' + currentText + '</button>' : '') + (isRTL ? '' : controls) + '</div>' : '';
+		var firstDay = parseInt(this._get(inst, 'firstDay'),10);
+		firstDay = (isNaN(firstDay) ? 0 : firstDay);
+		var showWeek = this._get(inst, 'showWeek');
+		var dayNames = this._get(inst, 'dayNames');
+		var dayNamesShort = this._get(inst, 'dayNamesShort');
+		var dayNamesMin = this._get(inst, 'dayNamesMin');
+		var monthNames = this._get(inst, 'monthNames');
+		var monthNamesShort = this._get(inst, 'monthNamesShort');
+		var beforeShowDay = this._get(inst, 'beforeShowDay');
+		var showOtherMonths = this._get(inst, 'showOtherMonths');
+		var selectOtherMonths = this._get(inst, 'selectOtherMonths');
+		var calculateWeek = this._get(inst, 'calculateWeek') || this.iso8601Week;
+		var defaultDate = this._getDefaultDate(inst);
+		var html = '';
+		for (var row = 0; row < numMonths[0]; row++) {
+			var group = '';
+			for (var col = 0; col < numMonths[1]; col++) {
+				var selectedDate = this._daylightSavingAdjust(new Date(drawYear, drawMonth, inst.selectedDay));
+				var cornerClass = ' ui-corner-all';
+				var calender = '';
+				if (isMultiMonth) {
+					calender += '<div class="ui-datepicker-group';
+					if (numMonths[1] > 1)
+						switch (col) {
+							case 0: calender += ' ui-datepicker-group-first';
+								cornerClass = ' ui-corner-' + (isRTL ? 'right' : 'left'); break;
+							case numMonths[1]-1: calender += ' ui-datepicker-group-last';
+								cornerClass = ' ui-corner-' + (isRTL ? 'left' : 'right'); break;
+							default: calender += ' ui-datepicker-group-middle'; cornerClass = ''; break;
+						}
+					calender += '">';
+				}
+				calender += '<div class="ui-datepicker-header ui-widget-header ui-helper-clearfix' + cornerClass + '">' +
+					(/all|left/.test(cornerClass) && row == 0 ? (isRTL ? next : prev) : '') +
+					(/all|right/.test(cornerClass) && row == 0 ? (isRTL ? prev : next) : '') +
+					this._generateMonthYearHeader(inst, drawMonth, drawYear, minDate, maxDate,
+					row > 0 || col > 0, monthNames, monthNamesShort) + // draw month headers
+					'</div><table class="ui-datepicker-calendar"><thead>' +
+					'<tr>';
+				var thead = (showWeek ? '<th class="ui-datepicker-week-col">' + this._get(inst, 'weekHeader') + '</th>' : '');
+				for (var dow = 0; dow < 7; dow++) { // days of the week
+					var day = (dow + firstDay) % 7;
+					thead += '<th' + ((dow + firstDay + 6) % 7 >= 5 ? ' class="ui-datepicker-week-end"' : '') + '>' +
+						'<span title="' + dayNames[day] + '">' + dayNamesMin[day] + '</span></th>';
+				}
+				calender += thead + '</tr></thead><tbody>';
+				var daysInMonth = this._getDaysInMonth(drawYear, drawMonth);
+				if (drawYear == inst.selectedYear && drawMonth == inst.selectedMonth)
+					inst.selectedDay = Math.min(inst.selectedDay, daysInMonth);
+				var leadDays = (this._getFirstDayOfMonth(drawYear, drawMonth) - firstDay + 7) % 7;
+				var numRows = (isMultiMonth ? 6 : Math.ceil((leadDays + daysInMonth) / 7)); // calculate the number of rows to generate
+				var printDate = this._daylightSavingAdjust(new Date(drawYear, drawMonth, 1 - leadDays));
+				for (var dRow = 0; dRow < numRows; dRow++) { // create date picker rows
+					calender += '<tr>';
+					var tbody = (!showWeek ? '' : '<td class="ui-datepicker-week-col">' +
+						this._get(inst, 'calculateWeek')(printDate) + '</td>');
+					for (var dow = 0; dow < 7; dow++) { // create date picker days
+						var daySettings = (beforeShowDay ?
+							beforeShowDay.apply((inst.input ? inst.input[0] : null), [printDate]) : [true, '']);
+						var otherMonth = (printDate.getMonth() != drawMonth);
+						var unselectable = (otherMonth && !selectOtherMonths) || !daySettings[0] ||
+							(minDate && printDate < minDate) || (maxDate && printDate > maxDate);
+						tbody += '<td class="' +
+							((dow + firstDay + 6) % 7 >= 5 ? ' ui-datepicker-week-end' : '') + // highlight weekends
+							(otherMonth ? ' ui-datepicker-other-month' : '') + // highlight days from other months
+							((printDate.getTime() == selectedDate.getTime() && drawMonth == inst.selectedMonth && inst._keyEvent) || // user pressed key
+							(defaultDate.getTime() == printDate.getTime() && defaultDate.getTime() == selectedDate.getTime()) ?
+							// or defaultDate is current printedDate and defaultDate is selectedDate
+							' ' + this._dayOverClass : '') + // highlight selected day
+							(unselectable ? ' ' + this._unselectableClass + ' ui-state-disabled': '') +  // highlight unselectable days
+							(otherMonth && !showOtherMonths ? '' : ' ' + daySettings[1] + // highlight custom dates
+							(printDate.getTime() == currentDate.getTime() ? ' ' + this._currentClass : '') + // highlight selected day
+							(printDate.getTime() == today.getTime() ? ' ui-datepicker-today' : '')) + '"' + // highlight today (if different)
+							((!otherMonth || showOtherMonths) && daySettings[2] ? ' title="' + daySettings[2] + '"' : '') + // cell title
+							(unselectable ? '' : ' onclick="DP_jQuery_' + dpuuid + '.datepicker._selectDay(\'#' +
+							inst.id + '\',' + printDate.getMonth() + ',' + printDate.getFullYear() + ', this);return false;"') + '>' + // actions
+							(otherMonth && !showOtherMonths ? '&#xa0;' : // display for other months
+							(unselectable ? '<span class="ui-state-default">' + printDate.getDate() + '</span>' : '<a class="ui-state-default' +
+							(printDate.getTime() == today.getTime() ? ' ui-state-highlight' : '') +
+							(printDate.getTime() == currentDate.getTime() ? ' ui-state-active' : '') + // highlight selected day
+							(otherMonth ? ' ui-priority-secondary' : '') + // distinguish dates from other months
+							'" href="#">' + printDate.getDate() + '</a>')) + '</td>'; // display selectable date
+						printDate.setDate(printDate.getDate() + 1);
+						printDate = this._daylightSavingAdjust(printDate);
+					}
+					calender += tbody + '</tr>';
+				}
+				drawMonth++;
+				if (drawMonth > 11) {
+					drawMonth = 0;
+					drawYear++;
+				}
+				calender += '</tbody></table>' + (isMultiMonth ? '</div>' + 
+							((numMonths[0] > 0 && col == numMonths[1]-1) ? '<div class="ui-datepicker-row-break"></div>' : '') : '');
+				group += calender;
+			}
+			html += group;
+		}
+		html += buttonPanel + ($.browser.msie && parseInt($.browser.version,10) < 7 && !inst.inline ?
+			'<iframe src="javascript:false;" class="ui-datepicker-cover" frameborder="0"></iframe>' : '');
+		inst._keyEvent = false;
+		return html;
+	},
+
+	/* Generate the month and year header. */
+	_generateMonthYearHeader: function(inst, drawMonth, drawYear, minDate, maxDate,
+			secondary, monthNames, monthNamesShort) {
+		var changeMonth = this._get(inst, 'changeMonth');
+		var changeYear = this._get(inst, 'changeYear');
+		var showMonthAfterYear = this._get(inst, 'showMonthAfterYear');
+		var html = '<div class="ui-datepicker-title">';
+		var monthHtml = '';
+		// month selection
+		if (secondary || !changeMonth)
+			monthHtml += '<span class="ui-datepicker-month">' + monthNames[drawMonth] + '</span>';
+		else {
+			var inMinYear = (minDate && minDate.getFullYear() == drawYear);
+			var inMaxYear = (maxDate && maxDate.getFullYear() == drawYear);
+			monthHtml += '<select class="ui-datepicker-month" ' +
+				'onchange="DP_jQuery_' + dpuuid + '.datepicker._selectMonthYear(\'#' + inst.id + '\', this, \'M\');" ' +
+				'onclick="DP_jQuery_' + dpuuid + '.datepicker._clickMonthYear(\'#' + inst.id + '\');"' +
+			 	'>';
+			for (var month = 0; month < 12; month++) {
+				if ((!inMinYear || month >= minDate.getMonth()) &&
+						(!inMaxYear || month <= maxDate.getMonth()))
+					monthHtml += '<option value="' + month + '"' +
+						(month == drawMonth ? ' selected="selected"' : '') +
+						'>' + monthNamesShort[month] + '</option>';
+			}
+			monthHtml += '</select>';
+		}
+		if (!showMonthAfterYear)
+			html += monthHtml + (secondary || !(changeMonth && changeYear) ? '&#xa0;' : '');
+		// year selection
+		inst.yearshtml = '';
+		if (secondary || !changeYear)
+			html += '<span class="ui-datepicker-year">' + drawYear + '</span>';
+		else {
+			// determine range of years to display
+			var years = this._get(inst, 'yearRange').split(':');
+			var thisYear = new Date().getFullYear();
+			var determineYear = function(value) {
+				var year = (value.match(/c[+-].*/) ? drawYear + parseInt(value.substring(1), 10) :
+					(value.match(/[+-].*/) ? thisYear + parseInt(value, 10) :
+					parseInt(value, 10)));
+				return (isNaN(year) ? thisYear : year);
+			};
+			var year = determineYear(years[0]);
+			var endYear = Math.max(year, determineYear(years[1] || ''));
+			year = (minDate ? Math.max(year, minDate.getFullYear()) : year);
+			endYear = (maxDate ? Math.min(endYear, maxDate.getFullYear()) : endYear);
+			inst.yearshtml += '<select class="ui-datepicker-year" ' +
+				'onchange="DP_jQuery_' + dpuuid + '.datepicker._selectMonthYear(\'#' + inst.id + '\', this, \'Y\');" ' +
+				'onclick="DP_jQuery_' + dpuuid + '.datepicker._clickMonthYear(\'#' + inst.id + '\');"' +
+				'>';
+			for (; year <= endYear; year++) {
+				inst.yearshtml += '<option value="' + year + '"' +
+					(year == drawYear ? ' selected="selected"' : '') +
+					'>' + year + '</option>';
+			}
+			inst.yearshtml += '</select>';
+			//when showing there is no need for later update
+			if( ! $.browser.mozilla ){
+				html += inst.yearshtml;
+				inst.yearshtml = null;
+			} else {
+				// will be replaced later with inst.yearshtml
+				html += '<select class="ui-datepicker-year"><option value="' + drawYear + '" selected="selected">' + drawYear + '</option></select>';
+			}
+		}
+		html += this._get(inst, 'yearSuffix');
+		if (showMonthAfterYear)
+			html += (secondary || !(changeMonth && changeYear) ? '&#xa0;' : '') + monthHtml;
+		html += '</div>'; // Close datepicker_header
+		return html;
+	},
+
+	/* Adjust one of the date sub-fields. */
+	_adjustInstDate: function(inst, offset, period) {
+		var year = inst.drawYear + (period == 'Y' ? offset : 0);
+		var month = inst.drawMonth + (period == 'M' ? offset : 0);
+		var day = Math.min(inst.selectedDay, this._getDaysInMonth(year, month)) +
+			(period == 'D' ? offset : 0);
+		var date = this._restrictMinMax(inst,
+			this._daylightSavingAdjust(new Date(year, month, day)));
+		inst.selectedDay = date.getDate();
+		inst.drawMonth = inst.selectedMonth = date.getMonth();
+		inst.drawYear = inst.selectedYear = date.getFullYear();
+		if (period == 'M' || period == 'Y')
+			this._notifyChange(inst);
+	},
+
+	/* Ensure a date is within any min/max bounds. */
+	_restrictMinMax: function(inst, date) {
+		var minDate = this._getMinMaxDate(inst, 'min');
+		var maxDate = this._getMinMaxDate(inst, 'max');
+		var newDate = (minDate && date < minDate ? minDate : date);
+		newDate = (maxDate && newDate > maxDate ? maxDate : newDate);
+		return newDate;
+	},
+
+	/* Notify change of month/year. */
+	_notifyChange: function(inst) {
+		var onChange = this._get(inst, 'onChangeMonthYear');
+		if (onChange)
+			onChange.apply((inst.input ? inst.input[0] : null),
+				[inst.selectedYear, inst.selectedMonth + 1, inst]);
+	},
+
+	/* Determine the number of months to show. */
+	_getNumberOfMonths: function(inst) {
+		var numMonths = this._get(inst, 'numberOfMonths');
+		return (numMonths == null ? [1, 1] : (typeof numMonths == 'number' ? [1, numMonths] : numMonths));
+	},
+
+	/* Determine the current maximum date - ensure no time components are set. */
+	_getMinMaxDate: function(inst, minMax) {
+		return this._determineDate(inst, this._get(inst, minMax + 'Date'), null);
+	},
+
+	/* Find the number of days in a given month. */
+	_getDaysInMonth: function(year, month) {
+		return 32 - this._daylightSavingAdjust(new Date(year, month, 32)).getDate();
+	},
+
+	/* Find the day of the week of the first of a month. */
+	_getFirstDayOfMonth: function(year, month) {
+		return new Date(year, month, 1).getDay();
+	},
+
+	/* Determines if we should allow a "next/prev" month display change. */
+	_canAdjustMonth: function(inst, offset, curYear, curMonth) {
+		var numMonths = this._getNumberOfMonths(inst);
+		var date = this._daylightSavingAdjust(new Date(curYear,
+			curMonth + (offset < 0 ? offset : numMonths[0] * numMonths[1]), 1));
+		if (offset < 0)
+			date.setDate(this._getDaysInMonth(date.getFullYear(), date.getMonth()));
+		return this._isInRange(inst, date);
+	},
+
+	/* Is the given date in the accepted range? */
+	_isInRange: function(inst, date) {
+		var minDate = this._getMinMaxDate(inst, 'min');
+		var maxDate = this._getMinMaxDate(inst, 'max');
+		return ((!minDate || date.getTime() >= minDate.getTime()) &&
+			(!maxDate || date.getTime() <= maxDate.getTime()));
+	},
+
+	/* Provide the configuration settings for formatting/parsing. */
+	_getFormatConfig: function(inst) {
+		var shortYearCutoff = this._get(inst, 'shortYearCutoff');
+		shortYearCutoff = (typeof shortYearCutoff != 'string' ? shortYearCutoff :
+			new Date().getFullYear() % 100 + parseInt(shortYearCutoff, 10));
+		return {shortYearCutoff: shortYearCutoff,
+			dayNamesShort: this._get(inst, 'dayNamesShort'), dayNames: this._get(inst, 'dayNames'),
+			monthNamesShort: this._get(inst, 'monthNamesShort'), monthNames: this._get(inst, 'monthNames')};
+	},
+
+	/* Format the given date for display. */
+	_formatDate: function(inst, day, month, year) {
+		if (!day) {
+			inst.currentDay = inst.selectedDay;
+			inst.currentMonth = inst.selectedMonth;
+			inst.currentYear = inst.selectedYear;
+		}
+		var date = (day ? (typeof day == 'object' ? day :
+			this._daylightSavingAdjust(new Date(year, month, day))) :
+			this._daylightSavingAdjust(new Date(inst.currentYear, inst.currentMonth, inst.currentDay)));
+		return this.formatDate(this._get(inst, 'dateFormat'), date, this._getFormatConfig(inst));
+	}
+});
+
+/* jQuery extend now ignores nulls! */
+function extendRemove(target, props) {
+	$.extend(target, props);
+	for (var name in props)
+		if (props[name] == null || props[name] == undefined)
+			target[name] = props[name];
+	return target;
+};
+
+/* Determine whether an object is an array. */
+function isArray(a) {
+	return (a && (($.browser.safari && typeof a == 'object' && a.length) ||
+		(a.constructor && a.constructor.toString().match(/\Array\(\)/))));
+};
+
+/* Invoke the datepicker functionality.
+   @param  options  string - a command, optionally followed by additional parameters or
+                    Object - settings for attaching new datepicker functionality
+   @return  jQuery object */
+$.fn.datepicker = function(options){
+	
+	/* Verify an empty collection wasn't passed - Fixes #6976 */
+	if ( !this.length ) {
+		return this;
+	}
+	
+	/* Initialise the date picker. */
+	if (!$.datepicker.initialized) {
+		$(document).mousedown($.datepicker._checkExternalClick).
+			find('body').append($.datepicker.dpDiv);
+		$.datepicker.initialized = true;
+	}
+
+	var otherArgs = Array.prototype.slice.call(arguments, 1);
+	if (typeof options == 'string' && (options == 'isDisabled' || options == 'getDate' || options == 'widget'))
+		return $.datepicker['_' + options + 'Datepicker'].
+			apply($.datepicker, [this[0]].concat(otherArgs));
+	if (options == 'option' && arguments.length == 2 && typeof arguments[1] == 'string')
+		return $.datepicker['_' + options + 'Datepicker'].
+			apply($.datepicker, [this[0]].concat(otherArgs));
+	return this.each(function() {
+		typeof options == 'string' ?
+			$.datepicker['_' + options + 'Datepicker'].
+				apply($.datepicker, [this].concat(otherArgs)) :
+			$.datepicker._attachDatepicker(this, options);
+	});
+};
+
+$.datepicker = new Datepicker(); // singleton instance
+$.datepicker.initialized = false;
+$.datepicker.uuid = new Date().getTime();
+$.datepicker.version = "1.8.10";
+
+// Workaround for #4055
+// Add another global to avoid noConflict issues with inline event handlers
+window['DP_jQuery_' + dpuuid] = $;
+
+})(jQuery);
diff --git a/js/ui/jquery.ui.dialog.js b/js/ui/jquery.ui.dialog.js
new file mode 100644
index 0000000000..af9fafb528
--- /dev/null
+++ b/js/ui/jquery.ui.dialog.js
@@ -0,0 +1,857 @@
+/*
+ * jQuery UI Dialog 1.8.10
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Dialog
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ *	jquery.ui.widget.js
+ *  jquery.ui.button.js
+ *	jquery.ui.draggable.js
+ *	jquery.ui.mouse.js
+ *	jquery.ui.position.js
+ *	jquery.ui.resizable.js
+ */
+(function( $, undefined ) {
+
+var uiDialogClasses =
+		'ui-dialog ' +
+		'ui-widget ' +
+		'ui-widget-content ' +
+		'ui-corner-all ',
+	sizeRelatedOptions = {
+		buttons: true,
+		height: true,
+		maxHeight: true,
+		maxWidth: true,
+		minHeight: true,
+		minWidth: true,
+		width: true
+	},
+	resizableRelatedOptions = {
+		maxHeight: true,
+		maxWidth: true,
+		minHeight: true,
+		minWidth: true
+	};
+
+$.widget("ui.dialog", {
+	options: {
+		autoOpen: true,
+		buttons: {},
+		closeOnEscape: true,
+		closeText: 'close',
+		dialogClass: '',
+		draggable: true,
+		hide: null,
+		height: 'auto',
+		maxHeight: false,
+		maxWidth: false,
+		minHeight: 150,
+		minWidth: 150,
+		modal: false,
+		position: {
+			my: 'center',
+			at: 'center',
+			collision: 'fit',
+			// ensure that the titlebar is never outside the document
+			using: function(pos) {
+				var topOffset = $(this).css(pos).offset().top;
+				if (topOffset < 0) {
+					$(this).css('top', pos.top - topOffset);
+				}
+			}
+		},
+		resizable: true,
+		show: null,
+		stack: true,
+		title: '',
+		width: 300,
+		zIndex: 1000
+	},
+
+	_create: function() {
+		this.originalTitle = this.element.attr('title');
+		// #5742 - .attr() might return a DOMElement
+		if ( typeof this.originalTitle !== "string" ) {
+			this.originalTitle = "";
+		}
+
+		this.options.title = this.options.title || this.originalTitle;
+		var self = this,
+			options = self.options,
+
+			title = options.title || '&#160;',
+			titleId = $.ui.dialog.getTitleId(self.element),
+
+			uiDialog = (self.uiDialog = $('<div></div>'))
+				.appendTo(document.body)
+				.hide()
+				.addClass(uiDialogClasses + options.dialogClass)
+				.css({
+					zIndex: options.zIndex
+				})
+				// setting tabIndex makes the div focusable
+				// setting outline to 0 prevents a border on focus in Mozilla
+				.attr('tabIndex', -1).css('outline', 0).keydown(function(event) {
+					if (options.closeOnEscape && event.keyCode &&
+						event.keyCode === $.ui.keyCode.ESCAPE) {
+						
+						self.close(event);
+						event.preventDefault();
+					}
+				})
+				.attr({
+					role: 'dialog',
+					'aria-labelledby': titleId
+				})
+				.mousedown(function(event) {
+					self.moveToTop(false, event);
+				}),
+
+			uiDialogContent = self.element
+				.show()
+				.removeAttr('title')
+				.addClass(
+					'ui-dialog-content ' +
+					'ui-widget-content')
+				.appendTo(uiDialog),
+
+			uiDialogTitlebar = (self.uiDialogTitlebar = $('<div></div>'))
+				.addClass(
+					'ui-dialog-titlebar ' +
+					'ui-widget-header ' +
+					'ui-corner-all ' +
+					'ui-helper-clearfix'
+				)
+				.prependTo(uiDialog),
+
+			uiDialogTitlebarClose = $('<a href="#"></a>')
+				.addClass(
+					'ui-dialog-titlebar-close ' +
+					'ui-corner-all'
+				)
+				.attr('role', 'button')
+				.hover(
+					function() {
+						uiDialogTitlebarClose.addClass('ui-state-hover');
+					},
+					function() {
+						uiDialogTitlebarClose.removeClass('ui-state-hover');
+					}
+				)
+				.focus(function() {
+					uiDialogTitlebarClose.addClass('ui-state-focus');
+				})
+				.blur(function() {
+					uiDialogTitlebarClose.removeClass('ui-state-focus');
+				})
+				.click(function(event) {
+					self.close(event);
+					return false;
+				})
+				.appendTo(uiDialogTitlebar),
+
+			uiDialogTitlebarCloseText = (self.uiDialogTitlebarCloseText = $('<span></span>'))
+				.addClass(
+					'ui-icon ' +
+					'ui-icon-closethick'
+				)
+				.text(options.closeText)
+				.appendTo(uiDialogTitlebarClose),
+
+			uiDialogTitle = $('<span></span>')
+				.addClass('ui-dialog-title')
+				.attr('id', titleId)
+				.html(title)
+				.prependTo(uiDialogTitlebar);
+
+		//handling of deprecated beforeclose (vs beforeClose) option
+		//Ticket #4669 http://dev.jqueryui.com/ticket/4669
+		//TODO: remove in 1.9pre
+		if ($.isFunction(options.beforeclose) && !$.isFunction(options.beforeClose)) {
+			options.beforeClose = options.beforeclose;
+		}
+
+		uiDialogTitlebar.find("*").add(uiDialogTitlebar).disableSelection();
+
+		if (options.draggable && $.fn.draggable) {
+			self._makeDraggable();
+		}
+		if (options.resizable && $.fn.resizable) {
+			self._makeResizable();
+		}
+
+		self._createButtons(options.buttons);
+		self._isOpen = false;
+
+		if ($.fn.bgiframe) {
+			uiDialog.bgiframe();
+		}
+	},
+
+	_init: function() {
+		if ( this.options.autoOpen ) {
+			this.open();
+		}
+	},
+
+	destroy: function() {
+		var self = this;
+		
+		if (self.overlay) {
+			self.overlay.destroy();
+		}
+		self.uiDialog.hide();
+		self.element
+			.unbind('.dialog')
+			.removeData('dialog')
+			.removeClass('ui-dialog-content ui-widget-content')
+			.hide().appendTo('body');
+		self.uiDialog.remove();
+
+		if (self.originalTitle) {
+			self.element.attr('title', self.originalTitle);
+		}
+
+		return self;
+	},
+
+	widget: function() {
+		return this.uiDialog;
+	},
+
+	close: function(event) {
+		var self = this,
+			maxZ, thisZ;
+		
+		if (false === self._trigger('beforeClose', event)) {
+			return;
+		}
+
+		if (self.overlay) {
+			self.overlay.destroy();
+		}
+		self.uiDialog.unbind('keypress.ui-dialog');
+
+		self._isOpen = false;
+
+		if (self.options.hide) {
+			self.uiDialog.hide(self.options.hide, function() {
+				self._trigger('close', event);
+			});
+		} else {
+			self.uiDialog.hide();
+			self._trigger('close', event);
+		}
+
+		$.ui.dialog.overlay.resize();
+
+		// adjust the maxZ to allow other modal dialogs to continue to work (see #4309)
+		if (self.options.modal) {
+			maxZ = 0;
+			$('.ui-dialog').each(function() {
+				if (this !== self.uiDialog[0]) {
+					thisZ = $(this).css('z-index');
+					if(!isNaN(thisZ)) {
+						maxZ = Math.max(maxZ, thisZ);
+					}
+				}
+			});
+			$.ui.dialog.maxZ = maxZ;
+		}
+
+		return self;
+	},
+
+	isOpen: function() {
+		return this._isOpen;
+	},
+
+	// the force parameter allows us to move modal dialogs to their correct
+	// position on open
+	moveToTop: function(force, event) {
+		var self = this,
+			options = self.options,
+			saveScroll;
+
+		if ((options.modal && !force) ||
+			(!options.stack && !options.modal)) {
+			return self._trigger('focus', event);
+		}
+
+		if (options.zIndex > $.ui.dialog.maxZ) {
+			$.ui.dialog.maxZ = options.zIndex;
+		}
+		if (self.overlay) {
+			$.ui.dialog.maxZ += 1;
+			self.overlay.$el.css('z-index', $.ui.dialog.overlay.maxZ = $.ui.dialog.maxZ);
+		}
+
+		//Save and then restore scroll since Opera 9.5+ resets when parent z-Index is changed.
+		//  http://ui.jquery.com/bugs/ticket/3193
+		saveScroll = { scrollTop: self.element.attr('scrollTop'), scrollLeft: self.element.attr('scrollLeft') };
+		$.ui.dialog.maxZ += 1;
+		self.uiDialog.css('z-index', $.ui.dialog.maxZ);
+		self.element.attr(saveScroll);
+		self._trigger('focus', event);
+
+		return self;
+	},
+
+	open: function() {
+		if (this._isOpen) { return; }
+
+		var self = this,
+			options = self.options,
+			uiDialog = self.uiDialog;
+
+		self.overlay = options.modal ? new $.ui.dialog.overlay(self) : null;
+		self._size();
+		self._position(options.position);
+		uiDialog.show(options.show);
+		self.moveToTop(true);
+
+		// prevent tabbing out of modal dialogs
+		if (options.modal) {
+			uiDialog.bind('keypress.ui-dialog', function(event) {
+				if (event.keyCode !== $.ui.keyCode.TAB) {
+					return;
+				}
+
+				var tabbables = $(':tabbable', this),
+					first = tabbables.filter(':first'),
+					last  = tabbables.filter(':last');
+
+				if (event.target === last[0] && !event.shiftKey) {
+					first.focus(1);
+					return false;
+				} else if (event.target === first[0] && event.shiftKey) {
+					last.focus(1);
+					return false;
+				}
+			});
+		}
+
+		// set focus to the first tabbable element in the content area or the first button
+		// if there are no tabbable elements, set focus on the dialog itself
+		$(self.element.find(':tabbable').get().concat(
+			uiDialog.find('.ui-dialog-buttonpane :tabbable').get().concat(
+				uiDialog.get()))).eq(0).focus();
+
+		self._isOpen = true;
+		self._trigger('open');
+
+		return self;
+	},
+
+	_createButtons: function(buttons) {
+		var self = this,
+			hasButtons = false,
+			uiDialogButtonPane = $('<div></div>')
+				.addClass(
+					'ui-dialog-buttonpane ' +
+					'ui-widget-content ' +
+					'ui-helper-clearfix'
+				),
+			uiButtonSet = $( "<div></div>" )
+				.addClass( "ui-dialog-buttonset" )
+				.appendTo( uiDialogButtonPane );
+
+		// if we already have a button pane, remove it
+		self.uiDialog.find('.ui-dialog-buttonpane').remove();
+
+		if (typeof buttons === 'object' && buttons !== null) {
+			$.each(buttons, function() {
+				return !(hasButtons = true);
+			});
+		}
+		if (hasButtons) {
+			$.each(buttons, function(name, props) {
+				props = $.isFunction( props ) ?
+					{ click: props, text: name } :
+					props;
+				var button = $('<button type="button"></button>')
+					.attr( props, true )
+					.unbind('click')
+					.click(function() {
+						props.click.apply(self.element[0], arguments);
+					})
+					.appendTo(uiButtonSet);
+				if ($.fn.button) {
+					button.button();
+				}
+			});
+			uiDialogButtonPane.appendTo(self.uiDialog);
+		}
+	},
+
+	_makeDraggable: function() {
+		var self = this,
+			options = self.options,
+			doc = $(document),
+			heightBeforeDrag;
+
+		function filteredUi(ui) {
+			return {
+				position: ui.position,
+				offset: ui.offset
+			};
+		}
+
+		self.uiDialog.draggable({
+			cancel: '.ui-dialog-content, .ui-dialog-titlebar-close',
+			handle: '.ui-dialog-titlebar',
+			containment: 'document',
+			start: function(event, ui) {
+				heightBeforeDrag = options.height === "auto" ? "auto" : $(this).height();
+				$(this).height($(this).height()).addClass("ui-dialog-dragging");
+				self._trigger('dragStart', event, filteredUi(ui));
+			},
+			drag: function(event, ui) {
+				self._trigger('drag', event, filteredUi(ui));
+			},
+			stop: function(event, ui) {
+				options.position = [ui.position.left - doc.scrollLeft(),
+					ui.position.top - doc.scrollTop()];
+				$(this).removeClass("ui-dialog-dragging").height(heightBeforeDrag);
+				self._trigger('dragStop', event, filteredUi(ui));
+				$.ui.dialog.overlay.resize();
+			}
+		});
+	},
+
+	_makeResizable: function(handles) {
+		handles = (handles === undefined ? this.options.resizable : handles);
+		var self = this,
+			options = self.options,
+			// .ui-resizable has position: relative defined in the stylesheet
+			// but dialogs have to use absolute or fixed positioning
+			position = self.uiDialog.css('position'),
+			resizeHandles = (typeof handles === 'string' ?
+				handles	:
+				'n,e,s,w,se,sw,ne,nw'
+			);
+
+		function filteredUi(ui) {
+			return {
+				originalPosition: ui.originalPosition,
+				originalSize: ui.originalSize,
+				position: ui.position,
+				size: ui.size
+			};
+		}
+
+		self.uiDialog.resizable({
+			cancel: '.ui-dialog-content',
+			containment: 'document',
+			alsoResize: self.element,
+			maxWidth: options.maxWidth,
+			maxHeight: options.maxHeight,
+			minWidth: options.minWidth,
+			minHeight: self._minHeight(),
+			handles: resizeHandles,
+			start: function(event, ui) {
+				$(this).addClass("ui-dialog-resizing");
+				self._trigger('resizeStart', event, filteredUi(ui));
+			},
+			resize: function(event, ui) {
+				self._trigger('resize', event, filteredUi(ui));
+			},
+			stop: function(event, ui) {
+				$(this).removeClass("ui-dialog-resizing");
+				options.height = $(this).height();
+				options.width = $(this).width();
+				self._trigger('resizeStop', event, filteredUi(ui));
+				$.ui.dialog.overlay.resize();
+			}
+		})
+		.css('position', position)
+		.find('.ui-resizable-se').addClass('ui-icon ui-icon-grip-diagonal-se');
+	},
+
+	_minHeight: function() {
+		var options = this.options;
+
+		if (options.height === 'auto') {
+			return options.minHeight;
+		} else {
+			return Math.min(options.minHeight, options.height);
+		}
+	},
+
+	_position: function(position) {
+		var myAt = [],
+			offset = [0, 0],
+			isVisible;
+
+		if (position) {
+			// deep extending converts arrays to objects in jQuery <= 1.3.2 :-(
+	//		if (typeof position == 'string' || $.isArray(position)) {
+	//			myAt = $.isArray(position) ? position : position.split(' ');
+
+			if (typeof position === 'string' || (typeof position === 'object' && '0' in position)) {
+				myAt = position.split ? position.split(' ') : [position[0], position[1]];
+				if (myAt.length === 1) {
+					myAt[1] = myAt[0];
+				}
+
+				$.each(['left', 'top'], function(i, offsetPosition) {
+					if (+myAt[i] === myAt[i]) {
+						offset[i] = myAt[i];
+						myAt[i] = offsetPosition;
+					}
+				});
+
+				position = {
+					my: myAt.join(" "),
+					at: myAt.join(" "),
+					offset: offset.join(" ")
+				};
+			} 
+
+			position = $.extend({}, $.ui.dialog.prototype.options.position, position);
+		} else {
+			position = $.ui.dialog.prototype.options.position;
+		}
+
+		// need to show the dialog to get the actual offset in the position plugin
+		isVisible = this.uiDialog.is(':visible');
+		if (!isVisible) {
+			this.uiDialog.show();
+		}
+		this.uiDialog
+			// workaround for jQuery bug #5781 http://dev.jquery.com/ticket/5781
+			.css({ top: 0, left: 0 })
+			.position($.extend({ of: window }, position));
+		if (!isVisible) {
+			this.uiDialog.hide();
+		}
+	},
+
+	_setOptions: function( options ) {
+		var self = this,
+			resizableOptions = {},
+			resize = false;
+
+		$.each( options, function( key, value ) {
+			self._setOption( key, value );
+			
+			if ( key in sizeRelatedOptions ) {
+				resize = true;
+			}
+			if ( key in resizableRelatedOptions ) {
+				resizableOptions[ key ] = value;
+			}
+		});
+
+		if ( resize ) {
+			this._size();
+		}
+		if ( this.uiDialog.is( ":data(resizable)" ) ) {
+			this.uiDialog.resizable( "option", resizableOptions );
+		}
+	},
+
+	_setOption: function(key, value){
+		var self = this,
+			uiDialog = self.uiDialog;
+
+		switch (key) {
+			//handling of deprecated beforeclose (vs beforeClose) option
+			//Ticket #4669 http://dev.jqueryui.com/ticket/4669
+			//TODO: remove in 1.9pre
+			case "beforeclose":
+				key = "beforeClose";
+				break;
+			case "buttons":
+				self._createButtons(value);
+				break;
+			case "closeText":
+				// ensure that we always pass a string
+				self.uiDialogTitlebarCloseText.text("" + value);
+				break;
+			case "dialogClass":
+				uiDialog
+					.removeClass(self.options.dialogClass)
+					.addClass(uiDialogClasses + value);
+				break;
+			case "disabled":
+				if (value) {
+					uiDialog.addClass('ui-dialog-disabled');
+				} else {
+					uiDialog.removeClass('ui-dialog-disabled');
+				}
+				break;
+			case "draggable":
+				var isDraggable = uiDialog.is( ":data(draggable)" );
+				if ( isDraggable && !value ) {
+					uiDialog.draggable( "destroy" );
+				}
+				
+				if ( !isDraggable && value ) {
+					self._makeDraggable();
+				}
+				break;
+			case "position":
+				self._position(value);
+				break;
+			case "resizable":
+				// currently resizable, becoming non-resizable
+				var isResizable = uiDialog.is( ":data(resizable)" );
+				if (isResizable && !value) {
+					uiDialog.resizable('destroy');
+				}
+
+				// currently resizable, changing handles
+				if (isResizable && typeof value === 'string') {
+					uiDialog.resizable('option', 'handles', value);
+				}
+
+				// currently non-resizable, becoming resizable
+				if (!isResizable && value !== false) {
+					self._makeResizable(value);
+				}
+				break;
+			case "title":
+				// convert whatever was passed in o a string, for html() to not throw up
+				$(".ui-dialog-title", self.uiDialogTitlebar).html("" + (value || '&#160;'));
+				break;
+		}
+
+		$.Widget.prototype._setOption.apply(self, arguments);
+	},
+
+	_size: function() {
+		/* If the user has resized the dialog, the .ui-dialog and .ui-dialog-content
+		 * divs will both have width and height set, so we need to reset them
+		 */
+		var options = this.options,
+			nonContentHeight,
+			minContentHeight,
+			isVisible = this.uiDialog.is( ":visible" );
+
+		// reset content sizing
+		this.element.show().css({
+			width: 'auto',
+			minHeight: 0,
+			height: 0
+		});
+
+		if (options.minWidth > options.width) {
+			options.width = options.minWidth;
+		}
+
+		// reset wrapper sizing
+		// determine the height of all the non-content elements
+		nonContentHeight = this.uiDialog.css({
+				height: 'auto',
+				width: options.width
+			})
+			.height();
+		minContentHeight = Math.max( 0, options.minHeight - nonContentHeight );
+		
+		if ( options.height === "auto" ) {
+			// only needed for IE6 support
+			if ( $.support.minHeight ) {
+				this.element.css({
+					minHeight: minContentHeight,
+					height: "auto"
+				});
+			} else {
+				this.uiDialog.show();
+				var autoHeight = this.element.css( "height", "auto" ).height();
+				if ( !isVisible ) {
+					this.uiDialog.hide();
+				}
+				this.element.height( Math.max( autoHeight, minContentHeight ) );
+			}
+		} else {
+			this.element.height( Math.max( options.height - nonContentHeight, 0 ) );
+		}
+
+		if (this.uiDialog.is(':data(resizable)')) {
+			this.uiDialog.resizable('option', 'minHeight', this._minHeight());
+		}
+	}
+});
+
+$.extend($.ui.dialog, {
+	version: "1.8.10",
+
+	uuid: 0,
+	maxZ: 0,
+
+	getTitleId: function($el) {
+		var id = $el.attr('id');
+		if (!id) {
+			this.uuid += 1;
+			id = this.uuid;
+		}
+		return 'ui-dialog-title-' + id;
+	},
+
+	overlay: function(dialog) {
+		this.$el = $.ui.dialog.overlay.create(dialog);
+	}
+});
+
+$.extend($.ui.dialog.overlay, {
+	instances: [],
+	// reuse old instances due to IE memory leak with alpha transparency (see #5185)
+	oldInstances: [],
+	maxZ: 0,
+	events: $.map('focus,mousedown,mouseup,keydown,keypress,click'.split(','),
+		function(event) { return event + '.dialog-overlay'; }).join(' '),
+	create: function(dialog) {
+		if (this.instances.length === 0) {
+			// prevent use of anchors and inputs
+			// we use a setTimeout in case the overlay is created from an
+			// event that we're going to be cancelling (see #2804)
+			setTimeout(function() {
+				// handle $(el).dialog().dialog('close') (see #4065)
+				if ($.ui.dialog.overlay.instances.length) {
+					$(document).bind($.ui.dialog.overlay.events, function(event) {
+						// stop events if the z-index of the target is < the z-index of the overlay
+						// we cannot return true when we don't want to cancel the event (#3523)
+						if ($(event.target).zIndex() < $.ui.dialog.overlay.maxZ) {
+							return false;
+						}
+					});
+				}
+			}, 1);
+
+			// allow closing by pressing the escape key
+			$(document).bind('keydown.dialog-overlay', function(event) {
+				if (dialog.options.closeOnEscape && event.keyCode &&
+					event.keyCode === $.ui.keyCode.ESCAPE) {
+					
+					dialog.close(event);
+					event.preventDefault();
+				}
+			});
+
+			// handle window resize
+			$(window).bind('resize.dialog-overlay', $.ui.dialog.overlay.resize);
+		}
+
+		var $el = (this.oldInstances.pop() || $('<div></div>').addClass('ui-widget-overlay'))
+			.appendTo(document.body)
+			.css({
+				width: this.width(),
+				height: this.height()
+			});
+
+		if ($.fn.bgiframe) {
+			$el.bgiframe();
+		}
+
+		this.instances.push($el);
+		return $el;
+	},
+
+	destroy: function($el) {
+		var indexOf = $.inArray($el, this.instances);
+		if (indexOf != -1){
+			this.oldInstances.push(this.instances.splice(indexOf, 1)[0]);
+		}
+
+		if (this.instances.length === 0) {
+			$([document, window]).unbind('.dialog-overlay');
+		}
+
+		$el.remove();
+		
+		// adjust the maxZ to allow other modal dialogs to continue to work (see #4309)
+		var maxZ = 0;
+		$.each(this.instances, function() {
+			maxZ = Math.max(maxZ, this.css('z-index'));
+		});
+		this.maxZ = maxZ;
+	},
+
+	height: function() {
+		var scrollHeight,
+			offsetHeight;
+		// handle IE 6
+		if ($.browser.msie && $.browser.version < 7) {
+			scrollHeight = Math.max(
+				document.documentElement.scrollHeight,
+				document.body.scrollHeight
+			);
+			offsetHeight = Math.max(
+				document.documentElement.offsetHeight,
+				document.body.offsetHeight
+			);
+
+			if (scrollHeight < offsetHeight) {
+				return $(window).height() + 'px';
+			} else {
+				return scrollHeight + 'px';
+			}
+		// handle "good" browsers
+		} else {
+			return $(document).height() + 'px';
+		}
+	},
+
+	width: function() {
+		var scrollWidth,
+			offsetWidth;
+		// handle IE 6
+		if ($.browser.msie && $.browser.version < 7) {
+			scrollWidth = Math.max(
+				document.documentElement.scrollWidth,
+				document.body.scrollWidth
+			);
+			offsetWidth = Math.max(
+				document.documentElement.offsetWidth,
+				document.body.offsetWidth
+			);
+
+			if (scrollWidth < offsetWidth) {
+				return $(window).width() + 'px';
+			} else {
+				return scrollWidth + 'px';
+			}
+		// handle "good" browsers
+		} else {
+			return $(document).width() + 'px';
+		}
+	},
+
+	resize: function() {
+		/* If the dialog is draggable and the user drags it past the
+		 * right edge of the window, the document becomes wider so we
+		 * need to stretch the overlay. If the user then drags the
+		 * dialog back to the left, the document will become narrower,
+		 * so we need to shrink the overlay to the appropriate size.
+		 * This is handled by shrinking the overlay before setting it
+		 * to the full document size.
+		 */
+		var $overlays = $([]);
+		$.each($.ui.dialog.overlay.instances, function() {
+			$overlays = $overlays.add(this);
+		});
+
+		$overlays.css({
+			width: 0,
+			height: 0
+		}).css({
+			width: $.ui.dialog.overlay.width(),
+			height: $.ui.dialog.overlay.height()
+		});
+	}
+});
+
+$.extend($.ui.dialog.overlay.prototype, {
+	destroy: function() {
+		$.ui.dialog.overlay.destroy(this.$el);
+	}
+});
+
+}(jQuery));
diff --git a/js/ui/jquery.ui.draggable.js b/js/ui/jquery.ui.draggable.js
new file mode 100644
index 0000000000..245d079a12
--- /dev/null
+++ b/js/ui/jquery.ui.draggable.js
@@ -0,0 +1,797 @@
+/*
+ * jQuery UI Draggable 1.8.10
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Draggables
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ *	jquery.ui.mouse.js
+ *	jquery.ui.widget.js
+ */
+(function( $, undefined ) {
+
+$.widget("ui.draggable", $.ui.mouse, {
+	widgetEventPrefix: "drag",
+	options: {
+		addClasses: true,
+		appendTo: "parent",
+		axis: false,
+		connectToSortable: false,
+		containment: false,
+		cursor: "auto",
+		cursorAt: false,
+		grid: false,
+		handle: false,
+		helper: "original",
+		iframeFix: false,
+		opacity: false,
+		refreshPositions: false,
+		revert: false,
+		revertDuration: 500,
+		scope: "default",
+		scroll: true,
+		scrollSensitivity: 20,
+		scrollSpeed: 20,
+		snap: false,
+		snapMode: "both",
+		snapTolerance: 20,
+		stack: false,
+		zIndex: false
+	},
+	_create: function() {
+
+		if (this.options.helper == 'original' && !(/^(?:r|a|f)/).test(this.element.css("position")))
+			this.element[0].style.position = 'relative';
+
+		(this.options.addClasses && this.element.addClass("ui-draggable"));
+		(this.options.disabled && this.element.addClass("ui-draggable-disabled"));
+
+		this._mouseInit();
+
+	},
+
+	destroy: function() {
+		if(!this.element.data('draggable')) return;
+		this.element
+			.removeData("draggable")
+			.unbind(".draggable")
+			.removeClass("ui-draggable"
+				+ " ui-draggable-dragging"
+				+ " ui-draggable-disabled");
+		this._mouseDestroy();
+
+		return this;
+	},
+
+	_mouseCapture: function(event) {
+
+		var o = this.options;
+
+		// among others, prevent a drag on a resizable-handle
+		if (this.helper || o.disabled || $(event.target).is('.ui-resizable-handle'))
+			return false;
+
+		//Quit if we're not on a valid handle
+		this.handle = this._getHandle(event);
+		if (!this.handle)
+			return false;
+
+		return true;
+
+	},
+
+	_mouseStart: function(event) {
+
+		var o = this.options;
+
+		//Create and append the visible helper
+		this.helper = this._createHelper(event);
+
+		//Cache the helper size
+		this._cacheHelperProportions();
+
+		//If ddmanager is used for droppables, set the global draggable
+		if($.ui.ddmanager)
+			$.ui.ddmanager.current = this;
+
+		/*
+		 * - Position generation -
+		 * This block generates everything position related - it's the core of draggables.
+		 */
+
+		//Cache the margins of the original element
+		this._cacheMargins();
+
+		//Store the helper's css position
+		this.cssPosition = this.helper.css("position");
+		this.scrollParent = this.helper.scrollParent();
+
+		//The element's absolute position on the page minus margins
+		this.offset = this.positionAbs = this.element.offset();
+		this.offset = {
+			top: this.offset.top - this.margins.top,
+			left: this.offset.left - this.margins.left
+		};
+
+		$.extend(this.offset, {
+			click: { //Where the click happened, relative to the element
+				left: event.pageX - this.offset.left,
+				top: event.pageY - this.offset.top
+			},
+			parent: this._getParentOffset(),
+			relative: this._getRelativeOffset() //This is a relative to absolute position minus the actual position calculation - only used for relative positioned helper
+		});
+
+		//Generate the original position
+		this.originalPosition = this.position = this._generatePosition(event);
+		this.originalPageX = event.pageX;
+		this.originalPageY = event.pageY;
+
+		//Adjust the mouse offset relative to the helper if 'cursorAt' is supplied
+		(o.cursorAt && this._adjustOffsetFromHelper(o.cursorAt));
+
+		//Set a containment if given in the options
+		if(o.containment)
+			this._setContainment();
+
+		//Trigger event + callbacks
+		if(this._trigger("start", event) === false) {
+			this._clear();
+			return false;
+		}
+
+		//Recache the helper size
+		this._cacheHelperProportions();
+
+		//Prepare the droppable offsets
+		if ($.ui.ddmanager && !o.dropBehaviour)
+			$.ui.ddmanager.prepareOffsets(this, event);
+
+		this.helper.addClass("ui-draggable-dragging");
+		this._mouseDrag(event, true); //Execute the drag once - this causes the helper not to be visible before getting its correct position
+		return true;
+	},
+
+	_mouseDrag: function(event, noPropagation) {
+
+		//Compute the helpers position
+		this.position = this._generatePosition(event);
+		this.positionAbs = this._convertPositionTo("absolute");
+
+		//Call plugins and callbacks and use the resulting position if something is returned
+		if (!noPropagation) {
+			var ui = this._uiHash();
+			if(this._trigger('drag', event, ui) === false) {
+				this._mouseUp({});
+				return false;
+			}
+			this.position = ui.position;
+		}
+
+		if(!this.options.axis || this.options.axis != "y") this.helper[0].style.left = this.position.left+'px';
+		if(!this.options.axis || this.options.axis != "x") this.helper[0].style.top = this.position.top+'px';
+		if($.ui.ddmanager) $.ui.ddmanager.drag(this, event);
+
+		return false;
+	},
+
+	_mouseStop: function(event) {
+
+		//If we are using droppables, inform the manager about the drop
+		var dropped = false;
+		if ($.ui.ddmanager && !this.options.dropBehaviour)
+			dropped = $.ui.ddmanager.drop(this, event);
+
+		//if a drop comes from outside (a sortable)
+		if(this.dropped) {
+			dropped = this.dropped;
+			this.dropped = false;
+		}
+		
+		//if the original element is removed, don't bother to continue if helper is set to "original"
+		if((!this.element[0] || !this.element[0].parentNode) && this.options.helper == "original")
+			return false;
+
+		if((this.options.revert == "invalid" && !dropped) || (this.options.revert == "valid" && dropped) || this.options.revert === true || ($.isFunction(this.options.revert) && this.options.revert.call(this.element, dropped))) {
+			var self = this;
+			$(this.helper).animate(this.originalPosition, parseInt(this.options.revertDuration, 10), function() {
+				if(self._trigger("stop", event) !== false) {
+					self._clear();
+				}
+			});
+		} else {
+			if(this._trigger("stop", event) !== false) {
+				this._clear();
+			}
+		}
+
+		return false;
+	},
+	
+	cancel: function() {
+		
+		if(this.helper.is(".ui-draggable-dragging")) {
+			this._mouseUp({});
+		} else {
+			this._clear();
+		}
+		
+		return this;
+		
+	},
+
+	_getHandle: function(event) {
+
+		var handle = !this.options.handle || !$(this.options.handle, this.element).length ? true : false;
+		$(this.options.handle, this.element)
+			.find("*")
+			.andSelf()
+			.each(function() {
+				if(this == event.target) handle = true;
+			});
+
+		return handle;
+
+	},
+
+	_createHelper: function(event) {
+
+		var o = this.options;
+		var helper = $.isFunction(o.helper) ? $(o.helper.apply(this.element[0], [event])) : (o.helper == 'clone' ? this.element.clone() : this.element);
+
+		if(!helper.parents('body').length)
+			helper.appendTo((o.appendTo == 'parent' ? this.element[0].parentNode : o.appendTo));
+
+		if(helper[0] != this.element[0] && !(/(fixed|absolute)/).test(helper.css("position")))
+			helper.css("position", "absolute");
+
+		return helper;
+
+	},
+
+	_adjustOffsetFromHelper: function(obj) {
+		if (typeof obj == 'string') {
+			obj = obj.split(' ');
+		}
+		if ($.isArray(obj)) {
+			obj = {left: +obj[0], top: +obj[1] || 0};
+		}
+		if ('left' in obj) {
+			this.offset.click.left = obj.left + this.margins.left;
+		}
+		if ('right' in obj) {
+			this.offset.click.left = this.helperProportions.width - obj.right + this.margins.left;
+		}
+		if ('top' in obj) {
+			this.offset.click.top = obj.top + this.margins.top;
+		}
+		if ('bottom' in obj) {
+			this.offset.click.top = this.helperProportions.height - obj.bottom + this.margins.top;
+		}
+	},
+
+	_getParentOffset: function() {
+
+		//Get the offsetParent and cache its position
+		this.offsetParent = this.helper.offsetParent();
+		var po = this.offsetParent.offset();
+
+		// This is a special case where we need to modify a offset calculated on start, since the following happened:
+		// 1. The position of the helper is absolute, so it's position is calculated based on the next positioned parent
+		// 2. The actual offset parent is a child of the scroll parent, and the scroll parent isn't the document, which means that
+		//    the scroll is included in the initial calculation of the offset of the parent, and never recalculated upon drag
+		if(this.cssPosition == 'absolute' && this.scrollParent[0] != document && $.ui.contains(this.scrollParent[0], this.offsetParent[0])) {
+			po.left += this.scrollParent.scrollLeft();
+			po.top += this.scrollParent.scrollTop();
+		}
+
+		if((this.offsetParent[0] == document.body) //This needs to be actually done for all browsers, since pageX/pageY includes this information
+		|| (this.offsetParent[0].tagName && this.offsetParent[0].tagName.toLowerCase() == 'html' && $.browser.msie)) //Ugly IE fix
+			po = { top: 0, left: 0 };
+
+		return {
+			top: po.top + (parseInt(this.offsetParent.css("borderTopWidth"),10) || 0),
+			left: po.left + (parseInt(this.offsetParent.css("borderLeftWidth"),10) || 0)
+		};
+
+	},
+
+	_getRelativeOffset: function() {
+
+		if(this.cssPosition == "relative") {
+			var p = this.element.position();
+			return {
+				top: p.top - (parseInt(this.helper.css("top"),10) || 0) + this.scrollParent.scrollTop(),
+				left: p.left - (parseInt(this.helper.css("left"),10) || 0) + this.scrollParent.scrollLeft()
+			};
+		} else {
+			return { top: 0, left: 0 };
+		}
+
+	},
+
+	_cacheMargins: function() {
+		this.margins = {
+			left: (parseInt(this.element.css("marginLeft"),10) || 0),
+			top: (parseInt(this.element.css("marginTop"),10) || 0)
+		};
+	},
+
+	_cacheHelperProportions: function() {
+		this.helperProportions = {
+			width: this.helper.outerWidth(),
+			height: this.helper.outerHeight()
+		};
+	},
+
+	_setContainment: function() {
+
+		var o = this.options;
+		if(o.containment == 'parent') o.containment = this.helper[0].parentNode;
+		if(o.containment == 'document' || o.containment == 'window') this.containment = [
+			(o.containment == 'document' ? 0 : $(window).scrollLeft()) - this.offset.relative.left - this.offset.parent.left,
+			(o.containment == 'document' ? 0 : $(window).scrollTop()) - this.offset.relative.top - this.offset.parent.top,
+			(o.containment == 'document' ? 0 : $(window).scrollLeft()) + $(o.containment == 'document' ? document : window).width() - this.helperProportions.width - this.margins.left,
+			(o.containment == 'document' ? 0 : $(window).scrollTop()) + ($(o.containment == 'document' ? document : window).height() || document.body.parentNode.scrollHeight) - this.helperProportions.height - this.margins.top
+		];
+
+		if(!(/^(document|window|parent)$/).test(o.containment) && o.containment.constructor != Array) {
+			var ce = $(o.containment)[0]; if(!ce) return;
+			var co = $(o.containment).offset();
+			var over = ($(ce).css("overflow") != 'hidden');
+
+			this.containment = [
+				co.left + (parseInt($(ce).css("borderLeftWidth"),10) || 0) + (parseInt($(ce).css("paddingLeft"),10) || 0) - this.margins.left,
+				co.top + (parseInt($(ce).css("borderTopWidth"),10) || 0) + (parseInt($(ce).css("paddingTop"),10) || 0) - this.margins.top,
+				co.left+(over ? Math.max(ce.scrollWidth,ce.offsetWidth) : ce.offsetWidth) - (parseInt($(ce).css("borderLeftWidth"),10) || 0) - (parseInt($(ce).css("paddingRight"),10) || 0) - this.helperProportions.width - this.margins.left,
+				co.top+(over ? Math.max(ce.scrollHeight,ce.offsetHeight) : ce.offsetHeight) - (parseInt($(ce).css("borderTopWidth"),10) || 0) - (parseInt($(ce).css("paddingBottom"),10) || 0) - this.helperProportions.height - this.margins.top
+			];
+		} else if(o.containment.constructor == Array) {
+			this.containment = o.containment;
+		}
+
+	},
+
+	_convertPositionTo: function(d, pos) {
+
+		if(!pos) pos = this.position;
+		var mod = d == "absolute" ? 1 : -1;
+		var o = this.options, scroll = this.cssPosition == 'absolute' && !(this.scrollParent[0] != document && $.ui.contains(this.scrollParent[0], this.offsetParent[0])) ? this.offsetParent : this.scrollParent, scrollIsRootNode = (/(html|body)/i).test(scroll[0].tagName);
+
+		return {
+			top: (
+				pos.top																	// The absolute mouse position
+				+ this.offset.relative.top * mod										// Only for relative positioned nodes: Relative offset from element to offset parent
+				+ this.offset.parent.top * mod											// The offsetParent's offset without borders (offset + border)
+				- ($.browser.safari && $.browser.version < 526 && this.cssPosition == 'fixed' ? 0 : ( this.cssPosition == 'fixed' ? -this.scrollParent.scrollTop() : ( scrollIsRootNode ? 0 : scroll.scrollTop() ) ) * mod)
+			),
+			left: (
+				pos.left																// The absolute mouse position
+				+ this.offset.relative.left * mod										// Only for relative positioned nodes: Relative offset from element to offset parent
+				+ this.offset.parent.left * mod											// The offsetParent's offset without borders (offset + border)
+				- ($.browser.safari && $.browser.version < 526 && this.cssPosition == 'fixed' ? 0 : ( this.cssPosition == 'fixed' ? -this.scrollParent.scrollLeft() : scrollIsRootNode ? 0 : scroll.scrollLeft() ) * mod)
+			)
+		};
+
+	},
+
+	_generatePosition: function(event) {
+
+		var o = this.options, scroll = this.cssPosition == 'absolute' && !(this.scrollParent[0] != document && $.ui.contains(this.scrollParent[0], this.offsetParent[0])) ? this.offsetParent : this.scrollParent, scrollIsRootNode = (/(html|body)/i).test(scroll[0].tagName);
+		var pageX = event.pageX;
+		var pageY = event.pageY;
+
+		/*
+		 * - Position constraining -
+		 * Constrain the position to a mix of grid, containment.
+		 */
+
+		if(this.originalPosition) { //If we are not dragging yet, we won't check for options
+
+			if(this.containment) {
+				if(event.pageX - this.offset.click.left < this.containment[0]) pageX = this.containment[0] + this.offset.click.left;
+				if(event.pageY - this.offset.click.top < this.containment[1]) pageY = this.containment[1] + this.offset.click.top;
+				if(event.pageX - this.offset.click.left > this.containment[2]) pageX = this.containment[2] + this.offset.click.left;
+				if(event.pageY - this.offset.click.top > this.containment[3]) pageY = this.containment[3] + this.offset.click.top;
+			}
+
+			if(o.grid) {
+				var top = this.originalPageY + Math.round((pageY - this.originalPageY) / o.grid[1]) * o.grid[1];
+				pageY = this.containment ? (!(top - this.offset.click.top < this.containment[1] || top - this.offset.click.top > this.containment[3]) ? top : (!(top - this.offset.click.top < this.containment[1]) ? top - o.grid[1] : top + o.grid[1])) : top;
+
+				var left = this.originalPageX + Math.round((pageX - this.originalPageX) / o.grid[0]) * o.grid[0];
+				pageX = this.containment ? (!(left - this.offset.click.left < this.containment[0] || left - this.offset.click.left > this.containment[2]) ? left : (!(left - this.offset.click.left < this.containment[0]) ? left - o.grid[0] : left + o.grid[0])) : left;
+			}
+
+		}
+
+		return {
+			top: (
+				pageY																// The absolute mouse position
+				- this.offset.click.top													// Click offset (relative to the element)
+				- this.offset.relative.top												// Only for relative positioned nodes: Relative offset from element to offset parent
+				- this.offset.parent.top												// The offsetParent's offset without borders (offset + border)
+				+ ($.browser.safari && $.browser.version < 526 && this.cssPosition == 'fixed' ? 0 : ( this.cssPosition == 'fixed' ? -this.scrollParent.scrollTop() : ( scrollIsRootNode ? 0 : scroll.scrollTop() ) ))
+			),
+			left: (
+				pageX																// The absolute mouse position
+				- this.offset.click.left												// Click offset (relative to the element)
+				- this.offset.relative.left												// Only for relative positioned nodes: Relative offset from element to offset parent
+				- this.offset.parent.left												// The offsetParent's offset without borders (offset + border)
+				+ ($.browser.safari && $.browser.version < 526 && this.cssPosition == 'fixed' ? 0 : ( this.cssPosition == 'fixed' ? -this.scrollParent.scrollLeft() : scrollIsRootNode ? 0 : scroll.scrollLeft() ))
+			)
+		};
+
+	},
+
+	_clear: function() {
+		this.helper.removeClass("ui-draggable-dragging");
+		if(this.helper[0] != this.element[0] && !this.cancelHelperRemoval) this.helper.remove();
+		//if($.ui.ddmanager) $.ui.ddmanager.current = null;
+		this.helper = null;
+		this.cancelHelperRemoval = false;
+	},
+
+	// From now on bulk stuff - mainly helpers
+
+	_trigger: function(type, event, ui) {
+		ui = ui || this._uiHash();
+		$.ui.plugin.call(this, type, [event, ui]);
+		if(type == "drag") this.positionAbs = this._convertPositionTo("absolute"); //The absolute position has to be recalculated after plugins
+		return $.Widget.prototype._trigger.call(this, type, event, ui);
+	},
+
+	plugins: {},
+
+	_uiHash: function(event) {
+		return {
+			helper: this.helper,
+			position: this.position,
+			originalPosition: this.originalPosition,
+			offset: this.positionAbs
+		};
+	}
+
+});
+
+$.extend($.ui.draggable, {
+	version: "1.8.10"
+});
+
+$.ui.plugin.add("draggable", "connectToSortable", {
+	start: function(event, ui) {
+
+		var inst = $(this).data("draggable"), o = inst.options,
+			uiSortable = $.extend({}, ui, { item: inst.element });
+		inst.sortables = [];
+		$(o.connectToSortable).each(function() {
+			var sortable = $.data(this, 'sortable');
+			if (sortable && !sortable.options.disabled) {
+				inst.sortables.push({
+					instance: sortable,
+					shouldRevert: sortable.options.revert
+				});
+				sortable._refreshItems();	//Do a one-time refresh at start to refresh the containerCache
+				sortable._trigger("activate", event, uiSortable);
+			}
+		});
+
+	},
+	stop: function(event, ui) {
+
+		//If we are still over the sortable, we fake the stop event of the sortable, but also remove helper
+		var inst = $(this).data("draggable"),
+			uiSortable = $.extend({}, ui, { item: inst.element });
+
+		$.each(inst.sortables, function() {
+			if(this.instance.isOver) {
+
+				this.instance.isOver = 0;
+
+				inst.cancelHelperRemoval = true; //Don't remove the helper in the draggable instance
+				this.instance.cancelHelperRemoval = false; //Remove it in the sortable instance (so sortable plugins like revert still work)
+
+				//The sortable revert is supported, and we have to set a temporary dropped variable on the draggable to support revert: 'valid/invalid'
+				if(this.shouldRevert) this.instance.options.revert = true;
+
+				//Trigger the stop of the sortable
+				this.instance._mouseStop(event);
+
+				this.instance.options.helper = this.instance.options._helper;
+
+				//If the helper has been the original item, restore properties in the sortable
+				if(inst.options.helper == 'original')
+					this.instance.currentItem.css({ top: 'auto', left: 'auto' });
+
+			} else {
+				this.instance.cancelHelperRemoval = false; //Remove the helper in the sortable instance
+				this.instance._trigger("deactivate", event, uiSortable);
+			}
+
+		});
+
+	},
+	drag: function(event, ui) {
+
+		var inst = $(this).data("draggable"), self = this;
+
+		var checkPos = function(o) {
+			var dyClick = this.offset.click.top, dxClick = this.offset.click.left;
+			var helperTop = this.positionAbs.top, helperLeft = this.positionAbs.left;
+			var itemHeight = o.height, itemWidth = o.width;
+			var itemTop = o.top, itemLeft = o.left;
+
+			return $.ui.isOver(helperTop + dyClick, helperLeft + dxClick, itemTop, itemLeft, itemHeight, itemWidth);
+		};
+
+		$.each(inst.sortables, function(i) {
+			
+			//Copy over some variables to allow calling the sortable's native _intersectsWith
+			this.instance.positionAbs = inst.positionAbs;
+			this.instance.helperProportions = inst.helperProportions;
+			this.instance.offset.click = inst.offset.click;
+			
+			if(this.instance._intersectsWith(this.instance.containerCache)) {
+
+				//If it intersects, we use a little isOver variable and set it once, so our move-in stuff gets fired only once
+				if(!this.instance.isOver) {
+
+					this.instance.isOver = 1;
+					//Now we fake the start of dragging for the sortable instance,
+					//by cloning the list group item, appending it to the sortable and using it as inst.currentItem
+					//We can then fire the start event of the sortable with our passed browser event, and our own helper (so it doesn't create a new one)
+					this.instance.currentItem = $(self).clone().appendTo(this.instance.element).data("sortable-item", true);
+					this.instance.options._helper = this.instance.options.helper; //Store helper option to later restore it
+					this.instance.options.helper = function() { return ui.helper[0]; };
+
+					event.target = this.instance.currentItem[0];
+					this.instance._mouseCapture(event, true);
+					this.instance._mouseStart(event, true, true);
+
+					//Because the browser event is way off the new appended portlet, we modify a couple of variables to reflect the changes
+					this.instance.offset.click.top = inst.offset.click.top;
+					this.instance.offset.click.left = inst.offset.click.left;
+					this.instance.offset.parent.left -= inst.offset.parent.left - this.instance.offset.parent.left;
+					this.instance.offset.parent.top -= inst.offset.parent.top - this.instance.offset.parent.top;
+
+					inst._trigger("toSortable", event);
+					inst.dropped = this.instance.element; //draggable revert needs that
+					//hack so receive/update callbacks work (mostly)
+					inst.currentItem = inst.element;
+					this.instance.fromOutside = inst;
+
+				}
+
+				//Provided we did all the previous steps, we can fire the drag event of the sortable on every draggable drag, when it intersects with the sortable
+				if(this.instance.currentItem) this.instance._mouseDrag(event);
+
+			} else {
+
+				//If it doesn't intersect with the sortable, and it intersected before,
+				//we fake the drag stop of the sortable, but make sure it doesn't remove the helper by using cancelHelperRemoval
+				if(this.instance.isOver) {
+
+					this.instance.isOver = 0;
+					this.instance.cancelHelperRemoval = true;
+					
+					//Prevent reverting on this forced stop
+					this.instance.options.revert = false;
+					
+					// The out event needs to be triggered independently
+					this.instance._trigger('out', event, this.instance._uiHash(this.instance));
+					
+					this.instance._mouseStop(event, true);
+					this.instance.options.helper = this.instance.options._helper;
+
+					//Now we remove our currentItem, the list group clone again, and the placeholder, and animate the helper back to it's original size
+					this.instance.currentItem.remove();
+					if(this.instance.placeholder) this.instance.placeholder.remove();
+
+					inst._trigger("fromSortable", event);
+					inst.dropped = false; //draggable revert needs that
+				}
+
+			};
+
+		});
+
+	}
+});
+
+$.ui.plugin.add("draggable", "cursor", {
+	start: function(event, ui) {
+		var t = $('body'), o = $(this).data('draggable').options;
+		if (t.css("cursor")) o._cursor = t.css("cursor");
+		t.css("cursor", o.cursor);
+	},
+	stop: function(event, ui) {
+		var o = $(this).data('draggable').options;
+		if (o._cursor) $('body').css("cursor", o._cursor);
+	}
+});
+
+$.ui.plugin.add("draggable", "iframeFix", {
+	start: function(event, ui) {
+		var o = $(this).data('draggable').options;
+		$(o.iframeFix === true ? "iframe" : o.iframeFix).each(function() {
+			$('<div class="ui-draggable-iframeFix" style="background: #fff;"></div>')
+			.css({
+				width: this.offsetWidth+"px", height: this.offsetHeight+"px",
+				position: "absolute", opacity: "0.001", zIndex: 1000
+			})
+			.css($(this).offset())
+			.appendTo("body");
+		});
+	},
+	stop: function(event, ui) {
+		$("div.ui-draggable-iframeFix").each(function() { this.parentNode.removeChild(this); }); //Remove frame helpers
+	}
+});
+
+$.ui.plugin.add("draggable", "opacity", {
+	start: function(event, ui) {
+		var t = $(ui.helper), o = $(this).data('draggable').options;
+		if(t.css("opacity")) o._opacity = t.css("opacity");
+		t.css('opacity', o.opacity);
+	},
+	stop: function(event, ui) {
+		var o = $(this).data('draggable').options;
+		if(o._opacity) $(ui.helper).css('opacity', o._opacity);
+	}
+});
+
+$.ui.plugin.add("draggable", "scroll", {
+	start: function(event, ui) {
+		var i = $(this).data("draggable");
+		if(i.scrollParent[0] != document && i.scrollParent[0].tagName != 'HTML') i.overflowOffset = i.scrollParent.offset();
+	},
+	drag: function(event, ui) {
+
+		var i = $(this).data("draggable"), o = i.options, scrolled = false;
+
+		if(i.scrollParent[0] != document && i.scrollParent[0].tagName != 'HTML') {
+
+			if(!o.axis || o.axis != 'x') {
+				if((i.overflowOffset.top + i.scrollParent[0].offsetHeight) - event.pageY < o.scrollSensitivity)
+					i.scrollParent[0].scrollTop = scrolled = i.scrollParent[0].scrollTop + o.scrollSpeed;
+				else if(event.pageY - i.overflowOffset.top < o.scrollSensitivity)
+					i.scrollParent[0].scrollTop = scrolled = i.scrollParent[0].scrollTop - o.scrollSpeed;
+			}
+
+			if(!o.axis || o.axis != 'y') {
+				if((i.overflowOffset.left + i.scrollParent[0].offsetWidth) - event.pageX < o.scrollSensitivity)
+					i.scrollParent[0].scrollLeft = scrolled = i.scrollParent[0].scrollLeft + o.scrollSpeed;
+				else if(event.pageX - i.overflowOffset.left < o.scrollSensitivity)
+					i.scrollParent[0].scrollLeft = scrolled = i.scrollParent[0].scrollLeft - o.scrollSpeed;
+			}
+
+		} else {
+
+			if(!o.axis || o.axis != 'x') {
+				if(event.pageY - $(document).scrollTop() < o.scrollSensitivity)
+					scrolled = $(document).scrollTop($(document).scrollTop() - o.scrollSpeed);
+				else if($(window).height() - (event.pageY - $(document).scrollTop()) < o.scrollSensitivity)
+					scrolled = $(document).scrollTop($(document).scrollTop() + o.scrollSpeed);
+			}
+
+			if(!o.axis || o.axis != 'y') {
+				if(event.pageX - $(document).scrollLeft() < o.scrollSensitivity)
+					scrolled = $(document).scrollLeft($(document).scrollLeft() - o.scrollSpeed);
+				else if($(window).width() - (event.pageX - $(document).scrollLeft()) < o.scrollSensitivity)
+					scrolled = $(document).scrollLeft($(document).scrollLeft() + o.scrollSpeed);
+			}
+
+		}
+
+		if(scrolled !== false && $.ui.ddmanager && !o.dropBehaviour)
+			$.ui.ddmanager.prepareOffsets(i, event);
+
+	}
+});
+
+$.ui.plugin.add("draggable", "snap", {
+	start: function(event, ui) {
+
+		var i = $(this).data("draggable"), o = i.options;
+		i.snapElements = [];
+
+		$(o.snap.constructor != String ? ( o.snap.items || ':data(draggable)' ) : o.snap).each(function() {
+			var $t = $(this); var $o = $t.offset();
+			if(this != i.element[0]) i.snapElements.push({
+				item: this,
+				width: $t.outerWidth(), height: $t.outerHeight(),
+				top: $o.top, left: $o.left
+			});
+		});
+
+	},
+	drag: function(event, ui) {
+
+		var inst = $(this).data("draggable"), o = inst.options;
+		var d = o.snapTolerance;
+
+		var x1 = ui.offset.left, x2 = x1 + inst.helperProportions.width,
+			y1 = ui.offset.top, y2 = y1 + inst.helperProportions.height;
+
+		for (var i = inst.snapElements.length - 1; i >= 0; i--){
+
+			var l = inst.snapElements[i].left, r = l + inst.snapElements[i].width,
+				t = inst.snapElements[i].top, b = t + inst.snapElements[i].height;
+
+			//Yes, I know, this is insane ;)
+			if(!((l-d < x1 && x1 < r+d && t-d < y1 && y1 < b+d) || (l-d < x1 && x1 < r+d && t-d < y2 && y2 < b+d) || (l-d < x2 && x2 < r+d && t-d < y1 && y1 < b+d) || (l-d < x2 && x2 < r+d && t-d < y2 && y2 < b+d))) {
+				if(inst.snapElements[i].snapping) (inst.options.snap.release && inst.options.snap.release.call(inst.element, event, $.extend(inst._uiHash(), { snapItem: inst.snapElements[i].item })));
+				inst.snapElements[i].snapping = false;
+				continue;
+			}
+
+			if(o.snapMode != 'inner') {
+				var ts = Math.abs(t - y2) <= d;
+				var bs = Math.abs(b - y1) <= d;
+				var ls = Math.abs(l - x2) <= d;
+				var rs = Math.abs(r - x1) <= d;
+				if(ts) ui.position.top = inst._convertPositionTo("relative", { top: t - inst.helperProportions.height, left: 0 }).top - inst.margins.top;
+				if(bs) ui.position.top = inst._convertPositionTo("relative", { top: b, left: 0 }).top - inst.margins.top;
+				if(ls) ui.position.left = inst._convertPositionTo("relative", { top: 0, left: l - inst.helperProportions.width }).left - inst.margins.left;
+				if(rs) ui.position.left = inst._convertPositionTo("relative", { top: 0, left: r }).left - inst.margins.left;
+			}
+
+			var first = (ts || bs || ls || rs);
+
+			if(o.snapMode != 'outer') {
+				var ts = Math.abs(t - y1) <= d;
+				var bs = Math.abs(b - y2) <= d;
+				var ls = Math.abs(l - x1) <= d;
+				var rs = Math.abs(r - x2) <= d;
+				if(ts) ui.position.top = inst._convertPositionTo("relative", { top: t, left: 0 }).top - inst.margins.top;
+				if(bs) ui.position.top = inst._convertPositionTo("relative", { top: b - inst.helperProportions.height, left: 0 }).top - inst.margins.top;
+				if(ls) ui.position.left = inst._convertPositionTo("relative", { top: 0, left: l }).left - inst.margins.left;
+				if(rs) ui.position.left = inst._convertPositionTo("relative", { top: 0, left: r - inst.helperProportions.width }).left - inst.margins.left;
+			}
+
+			if(!inst.snapElements[i].snapping && (ts || bs || ls || rs || first))
+				(inst.options.snap.snap && inst.options.snap.snap.call(inst.element, event, $.extend(inst._uiHash(), { snapItem: inst.snapElements[i].item })));
+			inst.snapElements[i].snapping = (ts || bs || ls || rs || first);
+
+		};
+
+	}
+});
+
+$.ui.plugin.add("draggable", "stack", {
+	start: function(event, ui) {
+
+		var o = $(this).data("draggable").options;
+
+		var group = $.makeArray($(o.stack)).sort(function(a,b) {
+			return (parseInt($(a).css("zIndex"),10) || 0) - (parseInt($(b).css("zIndex"),10) || 0);
+		});
+		if (!group.length) { return; }
+		
+		var min = parseInt(group[0].style.zIndex) || 0;
+		$(group).each(function(i) {
+			this.style.zIndex = min + i;
+		});
+
+		this[0].style.zIndex = min + group.length;
+
+	}
+});
+
+$.ui.plugin.add("draggable", "zIndex", {
+	start: function(event, ui) {
+		var t = $(ui.helper), o = $(this).data("draggable").options;
+		if(t.css("zIndex")) o._zIndex = t.css("zIndex");
+		t.css('zIndex', o.zIndex);
+	},
+	stop: function(event, ui) {
+		var o = $(this).data("draggable").options;
+		if(o._zIndex) $(ui.helper).css('zIndex', o._zIndex);
+	}
+});
+
+})(jQuery);
diff --git a/js/ui/jquery.ui.droppable.js b/js/ui/jquery.ui.droppable.js
new file mode 100644
index 0000000000..62bd7b0e55
--- /dev/null
+++ b/js/ui/jquery.ui.droppable.js
@@ -0,0 +1,285 @@
+/*
+ * jQuery UI Droppable 1.8.10
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Droppables
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ *	jquery.ui.widget.js
+ *	jquery.ui.mouse.js
+ *	jquery.ui.draggable.js
+ */
+(function( $, undefined ) {
+
+$.widget("ui.droppable", {
+	widgetEventPrefix: "drop",
+	options: {
+		accept: '*',
+		activeClass: false,
+		addClasses: true,
+		greedy: false,
+		hoverClass: false,
+		scope: 'default',
+		tolerance: 'intersect'
+	},
+	_create: function() {
+
+		var o = this.options, accept = o.accept;
+		this.isover = 0; this.isout = 1;
+
+		this.accept = $.isFunction(accept) ? accept : function(d) {
+			return d.is(accept);
+		};
+
+		//Store the droppable's proportions
+		this.proportions = { width: this.element[0].offsetWidth, height: this.element[0].offsetHeight };
+
+		// Add the reference and positions to the manager
+		$.ui.ddmanager.droppables[o.scope] = $.ui.ddmanager.droppables[o.scope] || [];
+		$.ui.ddmanager.droppables[o.scope].push(this);
+
+		(o.addClasses && this.element.addClass("ui-droppable"));
+
+	},
+
+	destroy: function() {
+		var drop = $.ui.ddmanager.droppables[this.options.scope];
+		for ( var i = 0; i < drop.length; i++ )
+			if ( drop[i] == this )
+				drop.splice(i, 1);
+
+		this.element
+			.removeClass("ui-droppable ui-droppable-disabled")
+			.removeData("droppable")
+			.unbind(".droppable");
+
+		return this;
+	},
+
+	_setOption: function(key, value) {
+
+		if(key == 'accept') {
+			this.accept = $.isFunction(value) ? value : function(d) {
+				return d.is(value);
+			};
+		}
+		$.Widget.prototype._setOption.apply(this, arguments);
+	},
+
+	_activate: function(event) {
+		var draggable = $.ui.ddmanager.current;
+		if(this.options.activeClass) this.element.addClass(this.options.activeClass);
+		(draggable && this._trigger('activate', event, this.ui(draggable)));
+	},
+
+	_deactivate: function(event) {
+		var draggable = $.ui.ddmanager.current;
+		if(this.options.activeClass) this.element.removeClass(this.options.activeClass);
+		(draggable && this._trigger('deactivate', event, this.ui(draggable)));
+	},
+
+	_over: function(event) {
+
+		var draggable = $.ui.ddmanager.current;
+		if (!draggable || (draggable.currentItem || draggable.element)[0] == this.element[0]) return; // Bail if draggable and droppable are same element
+
+		if (this.accept.call(this.element[0],(draggable.currentItem || draggable.element))) {
+			if(this.options.hoverClass) this.element.addClass(this.options.hoverClass);
+			this._trigger('over', event, this.ui(draggable));
+		}
+
+	},
+
+	_out: function(event) {
+
+		var draggable = $.ui.ddmanager.current;
+		if (!draggable || (draggable.currentItem || draggable.element)[0] == this.element[0]) return; // Bail if draggable and droppable are same element
+
+		if (this.accept.call(this.element[0],(draggable.currentItem || draggable.element))) {
+			if(this.options.hoverClass) this.element.removeClass(this.options.hoverClass);
+			this._trigger('out', event, this.ui(draggable));
+		}
+
+	},
+
+	_drop: function(event,custom) {
+
+		var draggable = custom || $.ui.ddmanager.current;
+		if (!draggable || (draggable.currentItem || draggable.element)[0] == this.element[0]) return false; // Bail if draggable and droppable are same element
+
+		var childrenIntersection = false;
+		this.element.find(":data(droppable)").not(".ui-draggable-dragging").each(function() {
+			var inst = $.data(this, 'droppable');
+			if(
+				inst.options.greedy
+				&& !inst.options.disabled
+				&& inst.options.scope == draggable.options.scope
+				&& inst.accept.call(inst.element[0], (draggable.currentItem || draggable.element))
+				&& $.ui.intersect(draggable, $.extend(inst, { offset: inst.element.offset() }), inst.options.tolerance)
+			) { childrenIntersection = true; return false; }
+		});
+		if(childrenIntersection) return false;
+
+		if(this.accept.call(this.element[0],(draggable.currentItem || draggable.element))) {
+			if(this.options.activeClass) this.element.removeClass(this.options.activeClass);
+			if(this.options.hoverClass) this.element.removeClass(this.options.hoverClass);
+			this._trigger('drop', event, this.ui(draggable));
+			return this.element;
+		}
+
+		return false;
+
+	},
+
+	ui: function(c) {
+		return {
+			draggable: (c.currentItem || c.element),
+			helper: c.helper,
+			position: c.position,
+			offset: c.positionAbs
+		};
+	}
+
+});
+
+$.extend($.ui.droppable, {
+	version: "1.8.10"
+});
+
+$.ui.intersect = function(draggable, droppable, toleranceMode) {
+
+	if (!droppable.offset) return false;
+
+	var x1 = (draggable.positionAbs || draggable.position.absolute).left, x2 = x1 + draggable.helperProportions.width,
+		y1 = (draggable.positionAbs || draggable.position.absolute).top, y2 = y1 + draggable.helperProportions.height;
+	var l = droppable.offset.left, r = l + droppable.proportions.width,
+		t = droppable.offset.top, b = t + droppable.proportions.height;
+
+	switch (toleranceMode) {
+		case 'fit':
+			return (l <= x1 && x2 <= r
+				&& t <= y1 && y2 <= b);
+			break;
+		case 'intersect':
+			return (l < x1 + (draggable.helperProportions.width / 2) // Right Half
+				&& x2 - (draggable.helperProportions.width / 2) < r // Left Half
+				&& t < y1 + (draggable.helperProportions.height / 2) // Bottom Half
+				&& y2 - (draggable.helperProportions.height / 2) < b ); // Top Half
+			break;
+		case 'pointer':
+			var draggableLeft = ((draggable.positionAbs || draggable.position.absolute).left + (draggable.clickOffset || draggable.offset.click).left),
+				draggableTop = ((draggable.positionAbs || draggable.position.absolute).top + (draggable.clickOffset || draggable.offset.click).top),
+				isOver = $.ui.isOver(draggableTop, draggableLeft, t, l, droppable.proportions.height, droppable.proportions.width);
+			return isOver;
+			break;
+		case 'touch':
+			return (
+					(y1 >= t && y1 <= b) ||	// Top edge touching
+					(y2 >= t && y2 <= b) ||	// Bottom edge touching
+					(y1 < t && y2 > b)		// Surrounded vertically
+				) && (
+					(x1 >= l && x1 <= r) ||	// Left edge touching
+					(x2 >= l && x2 <= r) ||	// Right edge touching
+					(x1 < l && x2 > r)		// Surrounded horizontally
+				);
+			break;
+		default:
+			return false;
+			break;
+		}
+
+};
+
+/*
+	This manager tracks offsets of draggables and droppables
+*/
+$.ui.ddmanager = {
+	current: null,
+	droppables: { 'default': [] },
+	prepareOffsets: function(t, event) {
+
+		var m = $.ui.ddmanager.droppables[t.options.scope] || [];
+		var type = event ? event.type : null; // workaround for #2317
+		var list = (t.currentItem || t.element).find(":data(droppable)").andSelf();
+
+		droppablesLoop: for (var i = 0; i < m.length; i++) {
+
+			if(m[i].options.disabled || (t && !m[i].accept.call(m[i].element[0],(t.currentItem || t.element)))) continue;	//No disabled and non-accepted
+			for (var j=0; j < list.length; j++) { if(list[j] == m[i].element[0]) { m[i].proportions.height = 0; continue droppablesLoop; } }; //Filter out elements in the current dragged item
+			m[i].visible = m[i].element.css("display") != "none"; if(!m[i].visible) continue; 									//If the element is not visible, continue
+
+			m[i].offset = m[i].element.offset();
+			m[i].proportions = { width: m[i].element[0].offsetWidth, height: m[i].element[0].offsetHeight };
+
+			if(type == "mousedown") m[i]._activate.call(m[i], event); //Activate the droppable if used directly from draggables
+
+		}
+
+	},
+	drop: function(draggable, event) {
+
+		var dropped = false;
+		$.each($.ui.ddmanager.droppables[draggable.options.scope] || [], function() {
+
+			if(!this.options) return;
+			if (!this.options.disabled && this.visible && $.ui.intersect(draggable, this, this.options.tolerance))
+				dropped = dropped || this._drop.call(this, event);
+
+			if (!this.options.disabled && this.visible && this.accept.call(this.element[0],(draggable.currentItem || draggable.element))) {
+				this.isout = 1; this.isover = 0;
+				this._deactivate.call(this, event);
+			}
+
+		});
+		return dropped;
+
+	},
+	drag: function(draggable, event) {
+
+		//If you have a highly dynamic page, you might try this option. It renders positions every time you move the mouse.
+		if(draggable.options.refreshPositions) $.ui.ddmanager.prepareOffsets(draggable, event);
+
+		//Run through all droppables and check their positions based on specific tolerance options
+		$.each($.ui.ddmanager.droppables[draggable.options.scope] || [], function() {
+
+			if(this.options.disabled || this.greedyChild || !this.visible) return;
+			var intersects = $.ui.intersect(draggable, this, this.options.tolerance);
+
+			var c = !intersects && this.isover == 1 ? 'isout' : (intersects && this.isover == 0 ? 'isover' : null);
+			if(!c) return;
+
+			var parentInstance;
+			if (this.options.greedy) {
+				var parent = this.element.parents(':data(droppable):eq(0)');
+				if (parent.length) {
+					parentInstance = $.data(parent[0], 'droppable');
+					parentInstance.greedyChild = (c == 'isover' ? 1 : 0);
+				}
+			}
+
+			// we just moved into a greedy child
+			if (parentInstance && c == 'isover') {
+				parentInstance['isover'] = 0;
+				parentInstance['isout'] = 1;
+				parentInstance._out.call(parentInstance, event);
+			}
+
+			this[c] = 1; this[c == 'isout' ? 'isover' : 'isout'] = 0;
+			this[c == "isover" ? "_over" : "_out"].call(this, event);
+
+			// we just moved out of a greedy child
+			if (parentInstance && c == 'isout') {
+				parentInstance['isout'] = 0;
+				parentInstance['isover'] = 1;
+				parentInstance._over.call(parentInstance, event);
+			}
+		});
+
+	}
+};
+
+})(jQuery);
diff --git a/js/ui/jquery.ui.mouse.js b/js/ui/jquery.ui.mouse.js
new file mode 100644
index 0000000000..3c3e7970a0
--- /dev/null
+++ b/js/ui/jquery.ui.mouse.js
@@ -0,0 +1,151 @@
+/*!
+ * jQuery UI Mouse 1.8.10
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Mouse
+ *
+ * Depends:
+ *	jquery.ui.widget.js
+ */
+(function( $, undefined ) {
+
+$.widget("ui.mouse", {
+	options: {
+		cancel: ':input,option',
+		distance: 1,
+		delay: 0
+	},
+	_mouseInit: function() {
+		var self = this;
+
+		this.element
+			.bind('mousedown.'+this.widgetName, function(event) {
+				return self._mouseDown(event);
+			})
+			.bind('click.'+this.widgetName, function(event) {
+				if (true === $.data(event.target, self.widgetName + '.preventClickEvent')) {
+				    $.removeData(event.target, self.widgetName + '.preventClickEvent');
+					event.stopImmediatePropagation();
+					return false;
+				}
+			});
+
+		this.started = false;
+	},
+
+	// TODO: make sure destroying one instance of mouse doesn't mess with
+	// other instances of mouse
+	_mouseDestroy: function() {
+		this.element.unbind('.'+this.widgetName);
+	},
+
+	_mouseDown: function(event) {
+		// don't let more than one widget handle mouseStart
+		// TODO: figure out why we have to use originalEvent
+		event.originalEvent = event.originalEvent || {};
+		if (event.originalEvent.mouseHandled) { return; }
+
+		// we may have missed mouseup (out of window)
+		(this._mouseStarted && this._mouseUp(event));
+
+		this._mouseDownEvent = event;
+
+		var self = this,
+			btnIsLeft = (event.which == 1),
+			elIsCancel = (typeof this.options.cancel == "string" ? $(event.target).parents().add(event.target).filter(this.options.cancel).length : false);
+		if (!btnIsLeft || elIsCancel || !this._mouseCapture(event)) {
+			return true;
+		}
+
+		this.mouseDelayMet = !this.options.delay;
+		if (!this.mouseDelayMet) {
+			this._mouseDelayTimer = setTimeout(function() {
+				self.mouseDelayMet = true;
+			}, this.options.delay);
+		}
+
+		if (this._mouseDistanceMet(event) && this._mouseDelayMet(event)) {
+			this._mouseStarted = (this._mouseStart(event) !== false);
+			if (!this._mouseStarted) {
+				event.preventDefault();
+				return true;
+			}
+		}
+
+		// these delegates are required to keep context
+		this._mouseMoveDelegate = function(event) {
+			return self._mouseMove(event);
+		};
+		this._mouseUpDelegate = function(event) {
+			return self._mouseUp(event);
+		};
+		$(document)
+			.bind('mousemove.'+this.widgetName, this._mouseMoveDelegate)
+			.bind('mouseup.'+this.widgetName, this._mouseUpDelegate);
+
+		event.preventDefault();
+		event.originalEvent.mouseHandled = true;
+		return true;
+	},
+
+	_mouseMove: function(event) {
+		// IE mouseup check - mouseup happened when mouse was out of window
+		if ($.browser.msie && !(document.documentMode >= 9) && !event.button) {
+			return this._mouseUp(event);
+		}
+
+		if (this._mouseStarted) {
+			this._mouseDrag(event);
+			return event.preventDefault();
+		}
+
+		if (this._mouseDistanceMet(event) && this._mouseDelayMet(event)) {
+			this._mouseStarted =
+				(this._mouseStart(this._mouseDownEvent, event) !== false);
+			(this._mouseStarted ? this._mouseDrag(event) : this._mouseUp(event));
+		}
+
+		return !this._mouseStarted;
+	},
+
+	_mouseUp: function(event) {
+		$(document)
+			.unbind('mousemove.'+this.widgetName, this._mouseMoveDelegate)
+			.unbind('mouseup.'+this.widgetName, this._mouseUpDelegate);
+
+		if (this._mouseStarted) {
+			this._mouseStarted = false;
+
+			if (event.target == this._mouseDownEvent.target) {
+			    $.data(event.target, this.widgetName + '.preventClickEvent', true);
+			}
+
+			this._mouseStop(event);
+		}
+
+		return false;
+	},
+
+	_mouseDistanceMet: function(event) {
+		return (Math.max(
+				Math.abs(this._mouseDownEvent.pageX - event.pageX),
+				Math.abs(this._mouseDownEvent.pageY - event.pageY)
+			) >= this.options.distance
+		);
+	},
+
+	_mouseDelayMet: function(event) {
+		return this.mouseDelayMet;
+	},
+
+	// These are placeholder methods, to be overriden by extending plugin
+	_mouseStart: function(event) {},
+	_mouseDrag: function(event) {},
+	_mouseStop: function(event) {},
+	_mouseCapture: function(event) { return true; }
+});
+
+})(jQuery);
diff --git a/js/ui/jquery.ui.position.js b/js/ui/jquery.ui.position.js
new file mode 100644
index 0000000000..b6ad10caef
--- /dev/null
+++ b/js/ui/jquery.ui.position.js
@@ -0,0 +1,252 @@
+/*
+ * jQuery UI Position 1.8.10
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Position
+ */
+(function( $, undefined ) {
+
+$.ui = $.ui || {};
+
+var horizontalPositions = /left|center|right/,
+	verticalPositions = /top|center|bottom/,
+	center = "center",
+	_position = $.fn.position,
+	_offset = $.fn.offset;
+
+$.fn.position = function( options ) {
+	if ( !options || !options.of ) {
+		return _position.apply( this, arguments );
+	}
+
+	// make a copy, we don't want to modify arguments
+	options = $.extend( {}, options );
+
+	var target = $( options.of ),
+		targetElem = target[0],
+		collision = ( options.collision || "flip" ).split( " " ),
+		offset = options.offset ? options.offset.split( " " ) : [ 0, 0 ],
+		targetWidth,
+		targetHeight,
+		basePosition;
+
+	if ( targetElem.nodeType === 9 ) {
+		targetWidth = target.width();
+		targetHeight = target.height();
+		basePosition = { top: 0, left: 0 };
+	// TODO: use $.isWindow() in 1.9
+	} else if ( targetElem.setTimeout ) {
+		targetWidth = target.width();
+		targetHeight = target.height();
+		basePosition = { top: target.scrollTop(), left: target.scrollLeft() };
+	} else if ( targetElem.preventDefault ) {
+		// force left top to allow flipping
+		options.at = "left top";
+		targetWidth = targetHeight = 0;
+		basePosition = { top: options.of.pageY, left: options.of.pageX };
+	} else {
+		targetWidth = target.outerWidth();
+		targetHeight = target.outerHeight();
+		basePosition = target.offset();
+	}
+
+	// force my and at to have valid horizontal and veritcal positions
+	// if a value is missing or invalid, it will be converted to center 
+	$.each( [ "my", "at" ], function() {
+		var pos = ( options[this] || "" ).split( " " );
+		if ( pos.length === 1) {
+			pos = horizontalPositions.test( pos[0] ) ?
+				pos.concat( [center] ) :
+				verticalPositions.test( pos[0] ) ?
+					[ center ].concat( pos ) :
+					[ center, center ];
+		}
+		pos[ 0 ] = horizontalPositions.test( pos[0] ) ? pos[ 0 ] : center;
+		pos[ 1 ] = verticalPositions.test( pos[1] ) ? pos[ 1 ] : center;
+		options[ this ] = pos;
+	});
+
+	// normalize collision option
+	if ( collision.length === 1 ) {
+		collision[ 1 ] = collision[ 0 ];
+	}
+
+	// normalize offset option
+	offset[ 0 ] = parseInt( offset[0], 10 ) || 0;
+	if ( offset.length === 1 ) {
+		offset[ 1 ] = offset[ 0 ];
+	}
+	offset[ 1 ] = parseInt( offset[1], 10 ) || 0;
+
+	if ( options.at[0] === "right" ) {
+		basePosition.left += targetWidth;
+	} else if ( options.at[0] === center ) {
+		basePosition.left += targetWidth / 2;
+	}
+
+	if ( options.at[1] === "bottom" ) {
+		basePosition.top += targetHeight;
+	} else if ( options.at[1] === center ) {
+		basePosition.top += targetHeight / 2;
+	}
+
+	basePosition.left += offset[ 0 ];
+	basePosition.top += offset[ 1 ];
+
+	return this.each(function() {
+		var elem = $( this ),
+			elemWidth = elem.outerWidth(),
+			elemHeight = elem.outerHeight(),
+			marginLeft = parseInt( $.curCSS( this, "marginLeft", true ) ) || 0,
+			marginTop = parseInt( $.curCSS( this, "marginTop", true ) ) || 0,
+			collisionWidth = elemWidth + marginLeft +
+				( parseInt( $.curCSS( this, "marginRight", true ) ) || 0 ),
+			collisionHeight = elemHeight + marginTop +
+				( parseInt( $.curCSS( this, "marginBottom", true ) ) || 0 ),
+			position = $.extend( {}, basePosition ),
+			collisionPosition;
+
+		if ( options.my[0] === "right" ) {
+			position.left -= elemWidth;
+		} else if ( options.my[0] === center ) {
+			position.left -= elemWidth / 2;
+		}
+
+		if ( options.my[1] === "bottom" ) {
+			position.top -= elemHeight;
+		} else if ( options.my[1] === center ) {
+			position.top -= elemHeight / 2;
+		}
+
+		// prevent fractions (see #5280)
+		position.left = Math.round( position.left );
+		position.top = Math.round( position.top );
+
+		collisionPosition = {
+			left: position.left - marginLeft,
+			top: position.top - marginTop
+		};
+
+		$.each( [ "left", "top" ], function( i, dir ) {
+			if ( $.ui.position[ collision[i] ] ) {
+				$.ui.position[ collision[i] ][ dir ]( position, {
+					targetWidth: targetWidth,
+					targetHeight: targetHeight,
+					elemWidth: elemWidth,
+					elemHeight: elemHeight,
+					collisionPosition: collisionPosition,
+					collisionWidth: collisionWidth,
+					collisionHeight: collisionHeight,
+					offset: offset,
+					my: options.my,
+					at: options.at
+				});
+			}
+		});
+
+		if ( $.fn.bgiframe ) {
+			elem.bgiframe();
+		}
+		elem.offset( $.extend( position, { using: options.using } ) );
+	});
+};
+
+$.ui.position = {
+	fit: {
+		left: function( position, data ) {
+			var win = $( window ),
+				over = data.collisionPosition.left + data.collisionWidth - win.width() - win.scrollLeft();
+			position.left = over > 0 ? position.left - over : Math.max( position.left - data.collisionPosition.left, position.left );
+		},
+		top: function( position, data ) {
+			var win = $( window ),
+				over = data.collisionPosition.top + data.collisionHeight - win.height() - win.scrollTop();
+			position.top = over > 0 ? position.top - over : Math.max( position.top - data.collisionPosition.top, position.top );
+		}
+	},
+
+	flip: {
+		left: function( position, data ) {
+			if ( data.at[0] === center ) {
+				return;
+			}
+			var win = $( window ),
+				over = data.collisionPosition.left + data.collisionWidth - win.width() - win.scrollLeft(),
+				myOffset = data.my[ 0 ] === "left" ?
+					-data.elemWidth :
+					data.my[ 0 ] === "right" ?
+						data.elemWidth :
+						0,
+				atOffset = data.at[ 0 ] === "left" ?
+					data.targetWidth :
+					-data.targetWidth,
+				offset = -2 * data.offset[ 0 ];
+			position.left += data.collisionPosition.left < 0 ?
+				myOffset + atOffset + offset :
+				over > 0 ?
+					myOffset + atOffset + offset :
+					0;
+		},
+		top: function( position, data ) {
+			if ( data.at[1] === center ) {
+				return;
+			}
+			var win = $( window ),
+				over = data.collisionPosition.top + data.collisionHeight - win.height() - win.scrollTop(),
+				myOffset = data.my[ 1 ] === "top" ?
+					-data.elemHeight :
+					data.my[ 1 ] === "bottom" ?
+						data.elemHeight :
+						0,
+				atOffset = data.at[ 1 ] === "top" ?
+					data.targetHeight :
+					-data.targetHeight,
+				offset = -2 * data.offset[ 1 ];
+			position.top += data.collisionPosition.top < 0 ?
+				myOffset + atOffset + offset :
+				over > 0 ?
+					myOffset + atOffset + offset :
+					0;
+		}
+	}
+};
+
+// offset setter from jQuery 1.4
+if ( !$.offset.setOffset ) {
+	$.offset.setOffset = function( elem, options ) {
+		// set position first, in-case top/left are set even on static elem
+		if ( /static/.test( $.curCSS( elem, "position" ) ) ) {
+			elem.style.position = "relative";
+		}
+		var curElem   = $( elem ),
+			curOffset = curElem.offset(),
+			curTop    = parseInt( $.curCSS( elem, "top",  true ), 10 ) || 0,
+			curLeft   = parseInt( $.curCSS( elem, "left", true ), 10)  || 0,
+			props     = {
+				top:  (options.top  - curOffset.top)  + curTop,
+				left: (options.left - curOffset.left) + curLeft
+			};
+		
+		if ( 'using' in options ) {
+			options.using.call( elem, props );
+		} else {
+			curElem.css( props );
+		}
+	};
+
+	$.fn.offset = function( options ) {
+		var elem = this[ 0 ];
+		if ( !elem || !elem.ownerDocument ) { return null; }
+		if ( options ) { 
+			return this.each(function() {
+				$.offset.setOffset( this, options );
+			});
+		}
+		return _offset.call( this );
+	};
+}
+
+}( jQuery ));
diff --git a/js/ui/jquery.ui.progressbar.js b/js/ui/jquery.ui.progressbar.js
new file mode 100644
index 0000000000..d54e583f56
--- /dev/null
+++ b/js/ui/jquery.ui.progressbar.js
@@ -0,0 +1,108 @@
+/*
+ * jQuery UI Progressbar 1.8.10
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Progressbar
+ *
+ * Depends:
+ *   jquery.ui.core.js
+ *   jquery.ui.widget.js
+ */
+(function( $, undefined ) {
+
+$.widget( "ui.progressbar", {
+	options: {
+		value: 0,
+		max: 100
+	},
+
+	min: 0,
+
+	_create: function() {
+		this.element
+			.addClass( "ui-progressbar ui-widget ui-widget-content ui-corner-all" )
+			.attr({
+				role: "progressbar",
+				"aria-valuemin": this.min,
+				"aria-valuemax": this.options.max,
+				"aria-valuenow": this._value()
+			});
+
+		this.valueDiv = $( "<div class='ui-progressbar-value ui-widget-header ui-corner-left'></div>" )
+			.appendTo( this.element );
+
+		this.oldValue = this._value();
+		this._refreshValue();
+	},
+
+	destroy: function() {
+		this.element
+			.removeClass( "ui-progressbar ui-widget ui-widget-content ui-corner-all" )
+			.removeAttr( "role" )
+			.removeAttr( "aria-valuemin" )
+			.removeAttr( "aria-valuemax" )
+			.removeAttr( "aria-valuenow" );
+
+		this.valueDiv.remove();
+
+		$.Widget.prototype.destroy.apply( this, arguments );
+	},
+
+	value: function( newValue ) {
+		if ( newValue === undefined ) {
+			return this._value();
+		}
+
+		this._setOption( "value", newValue );
+		return this;
+	},
+
+	_setOption: function( key, value ) {
+		if ( key === "value" ) {
+			this.options.value = value;
+			this._refreshValue();
+			if ( this._value() === this.options.max ) {
+				this._trigger( "complete" );
+			}
+		}
+
+		$.Widget.prototype._setOption.apply( this, arguments );
+	},
+
+	_value: function() {
+		var val = this.options.value;
+		// normalize invalid value
+		if ( typeof val !== "number" ) {
+			val = 0;
+		}
+		return Math.min( this.options.max, Math.max( this.min, val ) );
+	},
+
+	_percentage: function() {
+		return 100 * this._value() / this.options.max;
+	},
+
+	_refreshValue: function() {
+		var value = this.value();
+		var percentage = this._percentage();
+
+		if ( this.oldValue !== value ) {
+			this.oldValue = value;
+			this._trigger( "change" );
+		}
+
+		this.valueDiv
+			.toggleClass( "ui-corner-right", value === this.options.max )
+			.width( percentage.toFixed(0) + "%" );
+		this.element.attr( "aria-valuenow", value );
+	}
+});
+
+$.extend( $.ui.progressbar, {
+	version: "1.8.10"
+});
+
+})( jQuery );
diff --git a/js/ui/jquery.ui.resizable.js b/js/ui/jquery.ui.resizable.js
new file mode 100644
index 0000000000..1d7648a0c4
--- /dev/null
+++ b/js/ui/jquery.ui.resizable.js
@@ -0,0 +1,812 @@
+/*
+ * jQuery UI Resizable 1.8.10
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Resizables
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ *	jquery.ui.mouse.js
+ *	jquery.ui.widget.js
+ */
+(function( $, undefined ) {
+
+$.widget("ui.resizable", $.ui.mouse, {
+	widgetEventPrefix: "resize",
+	options: {
+		alsoResize: false,
+		animate: false,
+		animateDuration: "slow",
+		animateEasing: "swing",
+		aspectRatio: false,
+		autoHide: false,
+		containment: false,
+		ghost: false,
+		grid: false,
+		handles: "e,s,se",
+		helper: false,
+		maxHeight: null,
+		maxWidth: null,
+		minHeight: 10,
+		minWidth: 10,
+		zIndex: 1000
+	},
+	_create: function() {
+
+		var self = this, o = this.options;
+		this.element.addClass("ui-resizable");
+
+		$.extend(this, {
+			_aspectRatio: !!(o.aspectRatio),
+			aspectRatio: o.aspectRatio,
+			originalElement: this.element,
+			_proportionallyResizeElements: [],
+			_helper: o.helper || o.ghost || o.animate ? o.helper || 'ui-resizable-helper' : null
+		});
+
+		//Wrap the element if it cannot hold child nodes
+		if(this.element[0].nodeName.match(/canvas|textarea|input|select|button|img/i)) {
+
+			//Opera fix for relative positioning
+			if (/relative/.test(this.element.css('position')) && $.browser.opera)
+				this.element.css({ position: 'relative', top: 'auto', left: 'auto' });
+
+			//Create a wrapper element and set the wrapper to the new current internal element
+			this.element.wrap(
+				$('<div class="ui-wrapper" style="overflow: hidden;"></div>').css({
+					position: this.element.css('position'),
+					width: this.element.outerWidth(),
+					height: this.element.outerHeight(),
+					top: this.element.css('top'),
+					left: this.element.css('left')
+				})
+			);
+
+			//Overwrite the original this.element
+			this.element = this.element.parent().data(
+				"resizable", this.element.data('resizable')
+			);
+
+			this.elementIsWrapper = true;
+
+			//Move margins to the wrapper
+			this.element.css({ marginLeft: this.originalElement.css("marginLeft"), marginTop: this.originalElement.css("marginTop"), marginRight: this.originalElement.css("marginRight"), marginBottom: this.originalElement.css("marginBottom") });
+			this.originalElement.css({ marginLeft: 0, marginTop: 0, marginRight: 0, marginBottom: 0});
+
+			//Prevent Safari textarea resize
+			this.originalResizeStyle = this.originalElement.css('resize');
+			this.originalElement.css('resize', 'none');
+
+			//Push the actual element to our proportionallyResize internal array
+			this._proportionallyResizeElements.push(this.originalElement.css({ position: 'static', zoom: 1, display: 'block' }));
+
+			// avoid IE jump (hard set the margin)
+			this.originalElement.css({ margin: this.originalElement.css('margin') });
+
+			// fix handlers offset
+			this._proportionallyResize();
+
+		}
+
+		this.handles = o.handles || (!$('.ui-resizable-handle', this.element).length ? "e,s,se" : { n: '.ui-resizable-n', e: '.ui-resizable-e', s: '.ui-resizable-s', w: '.ui-resizable-w', se: '.ui-resizable-se', sw: '.ui-resizable-sw', ne: '.ui-resizable-ne', nw: '.ui-resizable-nw' });
+		if(this.handles.constructor == String) {
+
+			if(this.handles == 'all') this.handles = 'n,e,s,w,se,sw,ne,nw';
+			var n = this.handles.split(","); this.handles = {};
+
+			for(var i = 0; i < n.length; i++) {
+
+				var handle = $.trim(n[i]), hname = 'ui-resizable-'+handle;
+				var axis = $('<div class="ui-resizable-handle ' + hname + '"></div>');
+
+				// increase zIndex of sw, se, ne, nw axis
+				//TODO : this modifies original option
+				if(/sw|se|ne|nw/.test(handle)) axis.css({ zIndex: ++o.zIndex });
+
+				//TODO : What's going on here?
+				if ('se' == handle) {
+					axis.addClass('ui-icon ui-icon-gripsmall-diagonal-se');
+				};
+
+				//Insert into internal handles object and append to element
+				this.handles[handle] = '.ui-resizable-'+handle;
+				this.element.append(axis);
+			}
+
+		}
+
+		this._renderAxis = function(target) {
+
+			target = target || this.element;
+
+			for(var i in this.handles) {
+
+				if(this.handles[i].constructor == String)
+					this.handles[i] = $(this.handles[i], this.element).show();
+
+				//Apply pad to wrapper element, needed to fix axis position (textarea, inputs, scrolls)
+				if (this.elementIsWrapper && this.originalElement[0].nodeName.match(/textarea|input|select|button/i)) {
+
+					var axis = $(this.handles[i], this.element), padWrapper = 0;
+
+					//Checking the correct pad and border
+					padWrapper = /sw|ne|nw|se|n|s/.test(i) ? axis.outerHeight() : axis.outerWidth();
+
+					//The padding type i have to apply...
+					var padPos = [ 'padding',
+						/ne|nw|n/.test(i) ? 'Top' :
+						/se|sw|s/.test(i) ? 'Bottom' :
+						/^e$/.test(i) ? 'Right' : 'Left' ].join("");
+
+					target.css(padPos, padWrapper);
+
+					this._proportionallyResize();
+
+				}
+
+				//TODO: What's that good for? There's not anything to be executed left
+				if(!$(this.handles[i]).length)
+					continue;
+
+			}
+		};
+
+		//TODO: make renderAxis a prototype function
+		this._renderAxis(this.element);
+
+		this._handles = $('.ui-resizable-handle', this.element)
+			.disableSelection();
+
+		//Matching axis name
+		this._handles.mouseover(function() {
+			if (!self.resizing) {
+				if (this.className)
+					var axis = this.className.match(/ui-resizable-(se|sw|ne|nw|n|e|s|w)/i);
+				//Axis, default = se
+				self.axis = axis && axis[1] ? axis[1] : 'se';
+			}
+		});
+
+		//If we want to auto hide the elements
+		if (o.autoHide) {
+			this._handles.hide();
+			$(this.element)
+				.addClass("ui-resizable-autohide")
+				.hover(function() {
+					$(this).removeClass("ui-resizable-autohide");
+					self._handles.show();
+				},
+				function(){
+					if (!self.resizing) {
+						$(this).addClass("ui-resizable-autohide");
+						self._handles.hide();
+					}
+				});
+		}
+
+		//Initialize the mouse interaction
+		this._mouseInit();
+
+	},
+
+	destroy: function() {
+
+		this._mouseDestroy();
+
+		var _destroy = function(exp) {
+			$(exp).removeClass("ui-resizable ui-resizable-disabled ui-resizable-resizing")
+				.removeData("resizable").unbind(".resizable").find('.ui-resizable-handle').remove();
+		};
+
+		//TODO: Unwrap at same DOM position
+		if (this.elementIsWrapper) {
+			_destroy(this.element);
+			var wrapper = this.element;
+			wrapper.after(
+				this.originalElement.css({
+					position: wrapper.css('position'),
+					width: wrapper.outerWidth(),
+					height: wrapper.outerHeight(),
+					top: wrapper.css('top'),
+					left: wrapper.css('left')
+				})
+			).remove();
+		}
+
+		this.originalElement.css('resize', this.originalResizeStyle);
+		_destroy(this.originalElement);
+
+		return this;
+	},
+
+	_mouseCapture: function(event) {
+		var handle = false;
+		for (var i in this.handles) {
+			if ($(this.handles[i])[0] == event.target) {
+				handle = true;
+			}
+		}
+
+		return !this.options.disabled && handle;
+	},
+
+	_mouseStart: function(event) {
+
+		var o = this.options, iniPos = this.element.position(), el = this.element;
+
+		this.resizing = true;
+		this.documentScroll = { top: $(document).scrollTop(), left: $(document).scrollLeft() };
+
+		// bugfix for http://dev.jquery.com/ticket/1749
+		if (el.is('.ui-draggable') || (/absolute/).test(el.css('position'))) {
+			el.css({ position: 'absolute', top: iniPos.top, left: iniPos.left });
+		}
+
+		//Opera fixing relative position
+		if ($.browser.opera && (/relative/).test(el.css('position')))
+			el.css({ position: 'relative', top: 'auto', left: 'auto' });
+
+		this._renderProxy();
+
+		var curleft = num(this.helper.css('left')), curtop = num(this.helper.css('top'));
+
+		if (o.containment) {
+			curleft += $(o.containment).scrollLeft() || 0;
+			curtop += $(o.containment).scrollTop() || 0;
+		}
+
+		//Store needed variables
+		this.offset = this.helper.offset();
+		this.position = { left: curleft, top: curtop };
+		this.size = this._helper ? { width: el.outerWidth(), height: el.outerHeight() } : { width: el.width(), height: el.height() };
+		this.originalSize = this._helper ? { width: el.outerWidth(), height: el.outerHeight() } : { width: el.width(), height: el.height() };
+		this.originalPosition = { left: curleft, top: curtop };
+		this.sizeDiff = { width: el.outerWidth() - el.width(), height: el.outerHeight() - el.height() };
+		this.originalMousePosition = { left: event.pageX, top: event.pageY };
+
+		//Aspect Ratio
+		this.aspectRatio = (typeof o.aspectRatio == 'number') ? o.aspectRatio : ((this.originalSize.width / this.originalSize.height) || 1);
+
+	    var cursor = $('.ui-resizable-' + this.axis).css('cursor');
+	    $('body').css('cursor', cursor == 'auto' ? this.axis + '-resize' : cursor);
+
+		el.addClass("ui-resizable-resizing");
+		this._propagate("start", event);
+		return true;
+	},
+
+	_mouseDrag: function(event) {
+
+		//Increase performance, avoid regex
+		var el = this.helper, o = this.options, props = {},
+			self = this, smp = this.originalMousePosition, a = this.axis;
+
+		var dx = (event.pageX-smp.left)||0, dy = (event.pageY-smp.top)||0;
+		var trigger = this._change[a];
+		if (!trigger) return false;
+
+		// Calculate the attrs that will be change
+		var data = trigger.apply(this, [event, dx, dy]), ie6 = $.browser.msie && $.browser.version < 7, csdif = this.sizeDiff;
+
+		if (this._aspectRatio || event.shiftKey)
+			data = this._updateRatio(data, event);
+
+		data = this._respectSize(data, event);
+
+		// plugins callbacks need to be called first
+		this._propagate("resize", event);
+
+		el.css({
+			top: this.position.top + "px", left: this.position.left + "px",
+			width: this.size.width + "px", height: this.size.height + "px"
+		});
+
+		if (!this._helper && this._proportionallyResizeElements.length)
+			this._proportionallyResize();
+
+		this._updateCache(data);
+
+		// calling the user callback at the end
+		this._trigger('resize', event, this.ui());
+
+		return false;
+	},
+
+	_mouseStop: function(event) {
+
+		this.resizing = false;
+		var o = this.options, self = this;
+
+		if(this._helper) {
+			var pr = this._proportionallyResizeElements, ista = pr.length && (/textarea/i).test(pr[0].nodeName),
+				soffseth = ista && $.ui.hasScroll(pr[0], 'left') /* TODO - jump height */ ? 0 : self.sizeDiff.height,
+				soffsetw = ista ? 0 : self.sizeDiff.width;
+
+			var s = { width: (self.helper.width()  - soffsetw), height: (self.helper.height() - soffseth) },
+				left = (parseInt(self.element.css('left'), 10) + (self.position.left - self.originalPosition.left)) || null,
+				top = (parseInt(self.element.css('top'), 10) + (self.position.top - self.originalPosition.top)) || null;
+
+			if (!o.animate)
+				this.element.css($.extend(s, { top: top, left: left }));
+
+			self.helper.height(self.size.height);
+			self.helper.width(self.size.width);
+
+			if (this._helper && !o.animate) this._proportionallyResize();
+		}
+
+		$('body').css('cursor', 'auto');
+
+		this.element.removeClass("ui-resizable-resizing");
+
+		this._propagate("stop", event);
+
+		if (this._helper) this.helper.remove();
+		return false;
+
+	},
+
+	_updateCache: function(data) {
+		var o = this.options;
+		this.offset = this.helper.offset();
+		if (isNumber(data.left)) this.position.left = data.left;
+		if (isNumber(data.top)) this.position.top = data.top;
+		if (isNumber(data.height)) this.size.height = data.height;
+		if (isNumber(data.width)) this.size.width = data.width;
+	},
+
+	_updateRatio: function(data, event) {
+
+		var o = this.options, cpos = this.position, csize = this.size, a = this.axis;
+
+		if (data.height) data.width = (csize.height * this.aspectRatio);
+		else if (data.width) data.height = (csize.width / this.aspectRatio);
+
+		if (a == 'sw') {
+			data.left = cpos.left + (csize.width - data.width);
+			data.top = null;
+		}
+		if (a == 'nw') {
+			data.top = cpos.top + (csize.height - data.height);
+			data.left = cpos.left + (csize.width - data.width);
+		}
+
+		return data;
+	},
+
+	_respectSize: function(data, event) {
+
+		var el = this.helper, o = this.options, pRatio = this._aspectRatio || event.shiftKey, a = this.axis,
+				ismaxw = isNumber(data.width) && o.maxWidth && (o.maxWidth < data.width), ismaxh = isNumber(data.height) && o.maxHeight && (o.maxHeight < data.height),
+					isminw = isNumber(data.width) && o.minWidth && (o.minWidth > data.width), isminh = isNumber(data.height) && o.minHeight && (o.minHeight > data.height);
+
+		if (isminw) data.width = o.minWidth;
+		if (isminh) data.height = o.minHeight;
+		if (ismaxw) data.width = o.maxWidth;
+		if (ismaxh) data.height = o.maxHeight;
+
+		var dw = this.originalPosition.left + this.originalSize.width, dh = this.position.top + this.size.height;
+		var cw = /sw|nw|w/.test(a), ch = /nw|ne|n/.test(a);
+
+		if (isminw && cw) data.left = dw - o.minWidth;
+		if (ismaxw && cw) data.left = dw - o.maxWidth;
+		if (isminh && ch)	data.top = dh - o.minHeight;
+		if (ismaxh && ch)	data.top = dh - o.maxHeight;
+
+		// fixing jump error on top/left - bug #2330
+		var isNotwh = !data.width && !data.height;
+		if (isNotwh && !data.left && data.top) data.top = null;
+		else if (isNotwh && !data.top && data.left) data.left = null;
+
+		return data;
+	},
+
+	_proportionallyResize: function() {
+
+		var o = this.options;
+		if (!this._proportionallyResizeElements.length) return;
+		var element = this.helper || this.element;
+
+		for (var i=0; i < this._proportionallyResizeElements.length; i++) {
+
+			var prel = this._proportionallyResizeElements[i];
+
+			if (!this.borderDif) {
+				var b = [prel.css('borderTopWidth'), prel.css('borderRightWidth'), prel.css('borderBottomWidth'), prel.css('borderLeftWidth')],
+					p = [prel.css('paddingTop'), prel.css('paddingRight'), prel.css('paddingBottom'), prel.css('paddingLeft')];
+
+				this.borderDif = $.map(b, function(v, i) {
+					var border = parseInt(v,10)||0, padding = parseInt(p[i],10)||0;
+					return border + padding;
+				});
+			}
+
+			if ($.browser.msie && !(!($(element).is(':hidden') || $(element).parents(':hidden').length)))
+				continue;
+
+			prel.css({
+				height: (element.height() - this.borderDif[0] - this.borderDif[2]) || 0,
+				width: (element.width() - this.borderDif[1] - this.borderDif[3]) || 0
+			});
+
+		};
+
+	},
+
+	_renderProxy: function() {
+
+		var el = this.element, o = this.options;
+		this.elementOffset = el.offset();
+
+		if(this._helper) {
+
+			this.helper = this.helper || $('<div style="overflow:hidden;"></div>');
+
+			// fix ie6 offset TODO: This seems broken
+			var ie6 = $.browser.msie && $.browser.version < 7, ie6offset = (ie6 ? 1 : 0),
+			pxyoffset = ( ie6 ? 2 : -1 );
+
+			this.helper.addClass(this._helper).css({
+				width: this.element.outerWidth() + pxyoffset,
+				height: this.element.outerHeight() + pxyoffset,
+				position: 'absolute',
+				left: this.elementOffset.left - ie6offset +'px',
+				top: this.elementOffset.top - ie6offset +'px',
+				zIndex: ++o.zIndex //TODO: Don't modify option
+			});
+
+			this.helper
+				.appendTo("body")
+				.disableSelection();
+
+		} else {
+			this.helper = this.element;
+		}
+
+	},
+
+	_change: {
+		e: function(event, dx, dy) {
+			return { width: this.originalSize.width + dx };
+		},
+		w: function(event, dx, dy) {
+			var o = this.options, cs = this.originalSize, sp = this.originalPosition;
+			return { left: sp.left + dx, width: cs.width - dx };
+		},
+		n: function(event, dx, dy) {
+			var o = this.options, cs = this.originalSize, sp = this.originalPosition;
+			return { top: sp.top + dy, height: cs.height - dy };
+		},
+		s: function(event, dx, dy) {
+			return { height: this.originalSize.height + dy };
+		},
+		se: function(event, dx, dy) {
+			return $.extend(this._change.s.apply(this, arguments), this._change.e.apply(this, [event, dx, dy]));
+		},
+		sw: function(event, dx, dy) {
+			return $.extend(this._change.s.apply(this, arguments), this._change.w.apply(this, [event, dx, dy]));
+		},
+		ne: function(event, dx, dy) {
+			return $.extend(this._change.n.apply(this, arguments), this._change.e.apply(this, [event, dx, dy]));
+		},
+		nw: function(event, dx, dy) {
+			return $.extend(this._change.n.apply(this, arguments), this._change.w.apply(this, [event, dx, dy]));
+		}
+	},
+
+	_propagate: function(n, event) {
+		$.ui.plugin.call(this, n, [event, this.ui()]);
+		(n != "resize" && this._trigger(n, event, this.ui()));
+	},
+
+	plugins: {},
+
+	ui: function() {
+		return {
+			originalElement: this.originalElement,
+			element: this.element,
+			helper: this.helper,
+			position: this.position,
+			size: this.size,
+			originalSize: this.originalSize,
+			originalPosition: this.originalPosition
+		};
+	}
+
+});
+
+$.extend($.ui.resizable, {
+	version: "1.8.10"
+});
+
+/*
+ * Resizable Extensions
+ */
+
+$.ui.plugin.add("resizable", "alsoResize", {
+
+	start: function (event, ui) {
+		var self = $(this).data("resizable"), o = self.options;
+
+		var _store = function (exp) {
+			$(exp).each(function() {
+				var el = $(this);
+				el.data("resizable-alsoresize", {
+					width: parseInt(el.width(), 10), height: parseInt(el.height(), 10),
+					left: parseInt(el.css('left'), 10), top: parseInt(el.css('top'), 10),
+					position: el.css('position') // to reset Opera on stop()
+				});
+			});
+		};
+
+		if (typeof(o.alsoResize) == 'object' && !o.alsoResize.parentNode) {
+			if (o.alsoResize.length) { o.alsoResize = o.alsoResize[0]; _store(o.alsoResize); }
+			else { $.each(o.alsoResize, function (exp) { _store(exp); }); }
+		}else{
+			_store(o.alsoResize);
+		}
+	},
+
+	resize: function (event, ui) {
+		var self = $(this).data("resizable"), o = self.options, os = self.originalSize, op = self.originalPosition;
+
+		var delta = {
+			height: (self.size.height - os.height) || 0, width: (self.size.width - os.width) || 0,
+			top: (self.position.top - op.top) || 0, left: (self.position.left - op.left) || 0
+		},
+
+		_alsoResize = function (exp, c) {
+			$(exp).each(function() {
+				var el = $(this), start = $(this).data("resizable-alsoresize"), style = {}, 
+					css = c && c.length ? c : el.parents(ui.originalElement[0]).length ? ['width', 'height'] : ['width', 'height', 'top', 'left'];
+
+				$.each(css, function (i, prop) {
+					var sum = (start[prop]||0) + (delta[prop]||0);
+					if (sum && sum >= 0)
+						style[prop] = sum || null;
+				});
+
+				// Opera fixing relative position
+				if ($.browser.opera && /relative/.test(el.css('position'))) {
+					self._revertToRelativePosition = true;
+					el.css({ position: 'absolute', top: 'auto', left: 'auto' });
+				}
+
+				el.css(style);
+			});
+		};
+
+		if (typeof(o.alsoResize) == 'object' && !o.alsoResize.nodeType) {
+			$.each(o.alsoResize, function (exp, c) { _alsoResize(exp, c); });
+		}else{
+			_alsoResize(o.alsoResize);
+		}
+	},
+
+	stop: function (event, ui) {
+		var self = $(this).data("resizable"), o = self.options;
+
+		var _reset = function (exp) {
+			$(exp).each(function() {
+				var el = $(this);
+				// reset position for Opera - no need to verify it was changed
+				el.css({ position: el.data("resizable-alsoresize").position });
+			});
+		};
+
+		if (self._revertToRelativePosition) {
+			self._revertToRelativePosition = false;
+			if (typeof(o.alsoResize) == 'object' && !o.alsoResize.nodeType) {
+				$.each(o.alsoResize, function (exp) { _reset(exp); });
+			}else{
+				_reset(o.alsoResize);
+			}
+		}
+
+		$(this).removeData("resizable-alsoresize");
+	}
+});
+
+$.ui.plugin.add("resizable", "animate", {
+
+	stop: function(event, ui) {
+		var self = $(this).data("resizable"), o = self.options;
+
+		var pr = self._proportionallyResizeElements, ista = pr.length && (/textarea/i).test(pr[0].nodeName),
+					soffseth = ista && $.ui.hasScroll(pr[0], 'left') /* TODO - jump height */ ? 0 : self.sizeDiff.height,
+						soffsetw = ista ? 0 : self.sizeDiff.width;
+
+		var style = { width: (self.size.width - soffsetw), height: (self.size.height - soffseth) },
+					left = (parseInt(self.element.css('left'), 10) + (self.position.left - self.originalPosition.left)) || null,
+						top = (parseInt(self.element.css('top'), 10) + (self.position.top - self.originalPosition.top)) || null;
+
+		self.element.animate(
+			$.extend(style, top && left ? { top: top, left: left } : {}), {
+				duration: o.animateDuration,
+				easing: o.animateEasing,
+				step: function() {
+
+					var data = {
+						width: parseInt(self.element.css('width'), 10),
+						height: parseInt(self.element.css('height'), 10),
+						top: parseInt(self.element.css('top'), 10),
+						left: parseInt(self.element.css('left'), 10)
+					};
+
+					if (pr && pr.length) $(pr[0]).css({ width: data.width, height: data.height });
+
+					// propagating resize, and updating values for each animation step
+					self._updateCache(data);
+					self._propagate("resize", event);
+
+				}
+			}
+		);
+	}
+
+});
+
+$.ui.plugin.add("resizable", "containment", {
+
+	start: function(event, ui) {
+		var self = $(this).data("resizable"), o = self.options, el = self.element;
+		var oc = o.containment,	ce = (oc instanceof $) ? oc.get(0) : (/parent/.test(oc)) ? el.parent().get(0) : oc;
+		if (!ce) return;
+
+		self.containerElement = $(ce);
+
+		if (/document/.test(oc) || oc == document) {
+			self.containerOffset = { left: 0, top: 0 };
+			self.containerPosition = { left: 0, top: 0 };
+
+			self.parentData = {
+				element: $(document), left: 0, top: 0,
+				width: $(document).width(), height: $(document).height() || document.body.parentNode.scrollHeight
+			};
+		}
+
+		// i'm a node, so compute top, left, right, bottom
+		else {
+			var element = $(ce), p = [];
+			$([ "Top", "Right", "Left", "Bottom" ]).each(function(i, name) { p[i] = num(element.css("padding" + name)); });
+
+			self.containerOffset = element.offset();
+			self.containerPosition = element.position();
+			self.containerSize = { height: (element.innerHeight() - p[3]), width: (element.innerWidth() - p[1]) };
+
+			var co = self.containerOffset, ch = self.containerSize.height,	cw = self.containerSize.width,
+						width = ($.ui.hasScroll(ce, "left") ? ce.scrollWidth : cw ), height = ($.ui.hasScroll(ce) ? ce.scrollHeight : ch);
+
+			self.parentData = {
+				element: ce, left: co.left, top: co.top, width: width, height: height
+			};
+		}
+	},
+
+	resize: function(event, ui) {
+		var self = $(this).data("resizable"), o = self.options,
+				ps = self.containerSize, co = self.containerOffset, cs = self.size, cp = self.position,
+				pRatio = self._aspectRatio || event.shiftKey, cop = { top:0, left:0 }, ce = self.containerElement;
+
+		if (ce[0] != document && (/static/).test(ce.css('position'))) cop = co;
+
+		if (cp.left < (self._helper ? co.left : 0)) {
+			self.size.width = self.size.width + (self._helper ? (self.position.left - co.left) : (self.position.left - cop.left));
+			if (pRatio) self.size.height = self.size.width / o.aspectRatio;
+			self.position.left = o.helper ? co.left : 0;
+		}
+
+		if (cp.top < (self._helper ? co.top : 0)) {
+			self.size.height = self.size.height + (self._helper ? (self.position.top - co.top) : self.position.top);
+			if (pRatio) self.size.width = self.size.height * o.aspectRatio;
+			self.position.top = self._helper ? co.top : 0;
+		}
+
+		self.offset.left = self.parentData.left+self.position.left;
+		self.offset.top = self.parentData.top+self.position.top;
+
+		var woset = Math.abs( (self._helper ? self.offset.left - cop.left : (self.offset.left - cop.left)) + self.sizeDiff.width ),
+					hoset = Math.abs( (self._helper ? self.offset.top - cop.top : (self.offset.top - co.top)) + self.sizeDiff.height );
+
+		var isParent = self.containerElement.get(0) == self.element.parent().get(0),
+		    isOffsetRelative = /relative|absolute/.test(self.containerElement.css('position'));
+
+		if(isParent && isOffsetRelative) woset -= self.parentData.left;
+
+		if (woset + self.size.width >= self.parentData.width) {
+			self.size.width = self.parentData.width - woset;
+			if (pRatio) self.size.height = self.size.width / self.aspectRatio;
+		}
+
+		if (hoset + self.size.height >= self.parentData.height) {
+			self.size.height = self.parentData.height - hoset;
+			if (pRatio) self.size.width = self.size.height * self.aspectRatio;
+		}
+	},
+
+	stop: function(event, ui){
+		var self = $(this).data("resizable"), o = self.options, cp = self.position,
+				co = self.containerOffset, cop = self.containerPosition, ce = self.containerElement;
+
+		var helper = $(self.helper), ho = helper.offset(), w = helper.outerWidth() - self.sizeDiff.width, h = helper.outerHeight() - self.sizeDiff.height;
+
+		if (self._helper && !o.animate && (/relative/).test(ce.css('position')))
+			$(this).css({ left: ho.left - cop.left - co.left, width: w, height: h });
+
+		if (self._helper && !o.animate && (/static/).test(ce.css('position')))
+			$(this).css({ left: ho.left - cop.left - co.left, width: w, height: h });
+
+	}
+});
+
+$.ui.plugin.add("resizable", "ghost", {
+
+	start: function(event, ui) {
+
+		var self = $(this).data("resizable"), o = self.options, cs = self.size;
+
+		self.ghost = self.originalElement.clone();
+		self.ghost
+			.css({ opacity: .25, display: 'block', position: 'relative', height: cs.height, width: cs.width, margin: 0, left: 0, top: 0 })
+			.addClass('ui-resizable-ghost')
+			.addClass(typeof o.ghost == 'string' ? o.ghost : '');
+
+		self.ghost.appendTo(self.helper);
+
+	},
+
+	resize: function(event, ui){
+		var self = $(this).data("resizable"), o = self.options;
+		if (self.ghost) self.ghost.css({ position: 'relative', height: self.size.height, width: self.size.width });
+	},
+
+	stop: function(event, ui){
+		var self = $(this).data("resizable"), o = self.options;
+		if (self.ghost && self.helper) self.helper.get(0).removeChild(self.ghost.get(0));
+	}
+
+});
+
+$.ui.plugin.add("resizable", "grid", {
+
+	resize: function(event, ui) {
+		var self = $(this).data("resizable"), o = self.options, cs = self.size, os = self.originalSize, op = self.originalPosition, a = self.axis, ratio = o._aspectRatio || event.shiftKey;
+		o.grid = typeof o.grid == "number" ? [o.grid, o.grid] : o.grid;
+		var ox = Math.round((cs.width - os.width) / (o.grid[0]||1)) * (o.grid[0]||1), oy = Math.round((cs.height - os.height) / (o.grid[1]||1)) * (o.grid[1]||1);
+
+		if (/^(se|s|e)$/.test(a)) {
+			self.size.width = os.width + ox;
+			self.size.height = os.height + oy;
+		}
+		else if (/^(ne)$/.test(a)) {
+			self.size.width = os.width + ox;
+			self.size.height = os.height + oy;
+			self.position.top = op.top - oy;
+		}
+		else if (/^(sw)$/.test(a)) {
+			self.size.width = os.width + ox;
+			self.size.height = os.height + oy;
+			self.position.left = op.left - ox;
+		}
+		else {
+			self.size.width = os.width + ox;
+			self.size.height = os.height + oy;
+			self.position.top = op.top - oy;
+			self.position.left = op.left - ox;
+		}
+	}
+
+});
+
+var num = function(v) {
+	return parseInt(v, 10) || 0;
+};
+
+var isNumber = function(value) {
+	return !isNaN(parseInt(value, 10));
+};
+
+})(jQuery);
diff --git a/js/ui/jquery.ui.selectable.js b/js/ui/jquery.ui.selectable.js
new file mode 100644
index 0000000000..9ada93b96d
--- /dev/null
+++ b/js/ui/jquery.ui.selectable.js
@@ -0,0 +1,266 @@
+/*
+ * jQuery UI Selectable 1.8.10
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Selectables
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ *	jquery.ui.mouse.js
+ *	jquery.ui.widget.js
+ */
+(function( $, undefined ) {
+
+$.widget("ui.selectable", $.ui.mouse, {
+	options: {
+		appendTo: 'body',
+		autoRefresh: true,
+		distance: 0,
+		filter: '*',
+		tolerance: 'touch'
+	},
+	_create: function() {
+		var self = this;
+
+		this.element.addClass("ui-selectable");
+
+		this.dragged = false;
+
+		// cache selectee children based on filter
+		var selectees;
+		this.refresh = function() {
+			selectees = $(self.options.filter, self.element[0]);
+			selectees.each(function() {
+				var $this = $(this);
+				var pos = $this.offset();
+				$.data(this, "selectable-item", {
+					element: this,
+					$element: $this,
+					left: pos.left,
+					top: pos.top,
+					right: pos.left + $this.outerWidth(),
+					bottom: pos.top + $this.outerHeight(),
+					startselected: false,
+					selected: $this.hasClass('ui-selected'),
+					selecting: $this.hasClass('ui-selecting'),
+					unselecting: $this.hasClass('ui-unselecting')
+				});
+			});
+		};
+		this.refresh();
+
+		this.selectees = selectees.addClass("ui-selectee");
+
+		this._mouseInit();
+
+		this.helper = $("<div class='ui-selectable-helper'></div>");
+	},
+
+	destroy: function() {
+		this.selectees
+			.removeClass("ui-selectee")
+			.removeData("selectable-item");
+		this.element
+			.removeClass("ui-selectable ui-selectable-disabled")
+			.removeData("selectable")
+			.unbind(".selectable");
+		this._mouseDestroy();
+
+		return this;
+	},
+
+	_mouseStart: function(event) {
+		var self = this;
+
+		this.opos = [event.pageX, event.pageY];
+
+		if (this.options.disabled)
+			return;
+
+		var options = this.options;
+
+		this.selectees = $(options.filter, this.element[0]);
+
+		this._trigger("start", event);
+
+		$(options.appendTo).append(this.helper);
+		// position helper (lasso)
+		this.helper.css({
+			"left": event.clientX,
+			"top": event.clientY,
+			"width": 0,
+			"height": 0
+		});
+
+		if (options.autoRefresh) {
+			this.refresh();
+		}
+
+		this.selectees.filter('.ui-selected').each(function() {
+			var selectee = $.data(this, "selectable-item");
+			selectee.startselected = true;
+			if (!event.metaKey) {
+				selectee.$element.removeClass('ui-selected');
+				selectee.selected = false;
+				selectee.$element.addClass('ui-unselecting');
+				selectee.unselecting = true;
+				// selectable UNSELECTING callback
+				self._trigger("unselecting", event, {
+					unselecting: selectee.element
+				});
+			}
+		});
+
+		$(event.target).parents().andSelf().each(function() {
+			var selectee = $.data(this, "selectable-item");
+			if (selectee) {
+				var doSelect = !event.metaKey || !selectee.$element.hasClass('ui-selected');
+				selectee.$element
+					.removeClass(doSelect ? "ui-unselecting" : "ui-selected")
+					.addClass(doSelect ? "ui-selecting" : "ui-unselecting");
+				selectee.unselecting = !doSelect;
+				selectee.selecting = doSelect;
+				selectee.selected = doSelect;
+				// selectable (UN)SELECTING callback
+				if (doSelect) {
+					self._trigger("selecting", event, {
+						selecting: selectee.element
+					});
+				} else {
+					self._trigger("unselecting", event, {
+						unselecting: selectee.element
+					});
+				}
+				return false;
+			}
+		});
+
+	},
+
+	_mouseDrag: function(event) {
+		var self = this;
+		this.dragged = true;
+
+		if (this.options.disabled)
+			return;
+
+		var options = this.options;
+
+		var x1 = this.opos[0], y1 = this.opos[1], x2 = event.pageX, y2 = event.pageY;
+		if (x1 > x2) { var tmp = x2; x2 = x1; x1 = tmp; }
+		if (y1 > y2) { var tmp = y2; y2 = y1; y1 = tmp; }
+		this.helper.css({left: x1, top: y1, width: x2-x1, height: y2-y1});
+
+		this.selectees.each(function() {
+			var selectee = $.data(this, "selectable-item");
+			//prevent helper from being selected if appendTo: selectable
+			if (!selectee || selectee.element == self.element[0])
+				return;
+			var hit = false;
+			if (options.tolerance == 'touch') {
+				hit = ( !(selectee.left > x2 || selectee.right < x1 || selectee.top > y2 || selectee.bottom < y1) );
+			} else if (options.tolerance == 'fit') {
+				hit = (selectee.left > x1 && selectee.right < x2 && selectee.top > y1 && selectee.bottom < y2);
+			}
+
+			if (hit) {
+				// SELECT
+				if (selectee.selected) {
+					selectee.$element.removeClass('ui-selected');
+					selectee.selected = false;
+				}
+				if (selectee.unselecting) {
+					selectee.$element.removeClass('ui-unselecting');
+					selectee.unselecting = false;
+				}
+				if (!selectee.selecting) {
+					selectee.$element.addClass('ui-selecting');
+					selectee.selecting = true;
+					// selectable SELECTING callback
+					self._trigger("selecting", event, {
+						selecting: selectee.element
+					});
+				}
+			} else {
+				// UNSELECT
+				if (selectee.selecting) {
+					if (event.metaKey && selectee.startselected) {
+						selectee.$element.removeClass('ui-selecting');
+						selectee.selecting = false;
+						selectee.$element.addClass('ui-selected');
+						selectee.selected = true;
+					} else {
+						selectee.$element.removeClass('ui-selecting');
+						selectee.selecting = false;
+						if (selectee.startselected) {
+							selectee.$element.addClass('ui-unselecting');
+							selectee.unselecting = true;
+						}
+						// selectable UNSELECTING callback
+						self._trigger("unselecting", event, {
+							unselecting: selectee.element
+						});
+					}
+				}
+				if (selectee.selected) {
+					if (!event.metaKey && !selectee.startselected) {
+						selectee.$element.removeClass('ui-selected');
+						selectee.selected = false;
+
+						selectee.$element.addClass('ui-unselecting');
+						selectee.unselecting = true;
+						// selectable UNSELECTING callback
+						self._trigger("unselecting", event, {
+							unselecting: selectee.element
+						});
+					}
+				}
+			}
+		});
+
+		return false;
+	},
+
+	_mouseStop: function(event) {
+		var self = this;
+
+		this.dragged = false;
+
+		var options = this.options;
+
+		$('.ui-unselecting', this.element[0]).each(function() {
+			var selectee = $.data(this, "selectable-item");
+			selectee.$element.removeClass('ui-unselecting');
+			selectee.unselecting = false;
+			selectee.startselected = false;
+			self._trigger("unselected", event, {
+				unselected: selectee.element
+			});
+		});
+		$('.ui-selecting', this.element[0]).each(function() {
+			var selectee = $.data(this, "selectable-item");
+			selectee.$element.removeClass('ui-selecting').addClass('ui-selected');
+			selectee.selecting = false;
+			selectee.selected = true;
+			selectee.startselected = true;
+			self._trigger("selected", event, {
+				selected: selectee.element
+			});
+		});
+		this._trigger("stop", event);
+
+		this.helper.remove();
+
+		return false;
+	}
+
+});
+
+$.extend($.ui.selectable, {
+	version: "1.8.10"
+});
+
+})(jQuery);
diff --git a/js/ui/jquery.ui.slider.js b/js/ui/jquery.ui.slider.js
new file mode 100644
index 0000000000..fa571a9645
--- /dev/null
+++ b/js/ui/jquery.ui.slider.js
@@ -0,0 +1,682 @@
+/*
+ * jQuery UI Slider 1.8.10
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Slider
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ *	jquery.ui.mouse.js
+ *	jquery.ui.widget.js
+ */
+(function( $, undefined ) {
+
+// number of pages in a slider
+// (how many times can you page up/down to go through the whole range)
+var numPages = 5;
+
+$.widget( "ui.slider", $.ui.mouse, {
+
+	widgetEventPrefix: "slide",
+
+	options: {
+		animate: false,
+		distance: 0,
+		max: 100,
+		min: 0,
+		orientation: "horizontal",
+		range: false,
+		step: 1,
+		value: 0,
+		values: null
+	},
+
+	_create: function() {
+		var self = this,
+			o = this.options;
+
+		this._keySliding = false;
+		this._mouseSliding = false;
+		this._animateOff = true;
+		this._handleIndex = null;
+		this._detectOrientation();
+		this._mouseInit();
+
+		this.element
+			.addClass( "ui-slider" +
+				" ui-slider-" + this.orientation +
+				" ui-widget" +
+				" ui-widget-content" +
+				" ui-corner-all" );
+		
+		if ( o.disabled ) {
+			this.element.addClass( "ui-slider-disabled ui-disabled" );
+		}
+
+		this.range = $([]);
+
+		if ( o.range ) {
+			if ( o.range === true ) {
+				this.range = $( "<div></div>" );
+				if ( !o.values ) {
+					o.values = [ this._valueMin(), this._valueMin() ];
+				}
+				if ( o.values.length && o.values.length !== 2 ) {
+					o.values = [ o.values[0], o.values[0] ];
+				}
+			} else {
+				this.range = $( "<div></div>" );
+			}
+
+			this.range
+				.appendTo( this.element )
+				.addClass( "ui-slider-range" );
+
+			if ( o.range === "min" || o.range === "max" ) {
+				this.range.addClass( "ui-slider-range-" + o.range );
+			}
+
+			// note: this isn't the most fittingly semantic framework class for this element,
+			// but worked best visually with a variety of themes
+			this.range.addClass( "ui-widget-header" );
+		}
+
+		if ( $( ".ui-slider-handle", this.element ).length === 0 ) {
+			$( "<a href='#'></a>" )
+				.appendTo( this.element )
+				.addClass( "ui-slider-handle" );
+		}
+
+		if ( o.values && o.values.length ) {
+			while ( $(".ui-slider-handle", this.element).length < o.values.length ) {
+				$( "<a href='#'></a>" )
+					.appendTo( this.element )
+					.addClass( "ui-slider-handle" );
+			}
+		}
+
+		this.handles = $( ".ui-slider-handle", this.element )
+			.addClass( "ui-state-default" +
+				" ui-corner-all" );
+
+		this.handle = this.handles.eq( 0 );
+
+		this.handles.add( this.range ).filter( "a" )
+			.click(function( event ) {
+				event.preventDefault();
+			})
+			.hover(function() {
+				if ( !o.disabled ) {
+					$( this ).addClass( "ui-state-hover" );
+				}
+			}, function() {
+				$( this ).removeClass( "ui-state-hover" );
+			})
+			.focus(function() {
+				if ( !o.disabled ) {
+					$( ".ui-slider .ui-state-focus" ).removeClass( "ui-state-focus" );
+					$( this ).addClass( "ui-state-focus" );
+				} else {
+					$( this ).blur();
+				}
+			})
+			.blur(function() {
+				$( this ).removeClass( "ui-state-focus" );
+			});
+
+		this.handles.each(function( i ) {
+			$( this ).data( "index.ui-slider-handle", i );
+		});
+
+		this.handles
+			.keydown(function( event ) {
+				var ret = true,
+					index = $( this ).data( "index.ui-slider-handle" ),
+					allowed,
+					curVal,
+					newVal,
+					step;
+	
+				if ( self.options.disabled ) {
+					return;
+				}
+	
+				switch ( event.keyCode ) {
+					case $.ui.keyCode.HOME:
+					case $.ui.keyCode.END:
+					case $.ui.keyCode.PAGE_UP:
+					case $.ui.keyCode.PAGE_DOWN:
+					case $.ui.keyCode.UP:
+					case $.ui.keyCode.RIGHT:
+					case $.ui.keyCode.DOWN:
+					case $.ui.keyCode.LEFT:
+						ret = false;
+						if ( !self._keySliding ) {
+							self._keySliding = true;
+							$( this ).addClass( "ui-state-active" );
+							allowed = self._start( event, index );
+							if ( allowed === false ) {
+								return;
+							}
+						}
+						break;
+				}
+	
+				step = self.options.step;
+				if ( self.options.values && self.options.values.length ) {
+					curVal = newVal = self.values( index );
+				} else {
+					curVal = newVal = self.value();
+				}
+	
+				switch ( event.keyCode ) {
+					case $.ui.keyCode.HOME:
+						newVal = self._valueMin();
+						break;
+					case $.ui.keyCode.END:
+						newVal = self._valueMax();
+						break;
+					case $.ui.keyCode.PAGE_UP:
+						newVal = self._trimAlignValue( curVal + ( (self._valueMax() - self._valueMin()) / numPages ) );
+						break;
+					case $.ui.keyCode.PAGE_DOWN:
+						newVal = self._trimAlignValue( curVal - ( (self._valueMax() - self._valueMin()) / numPages ) );
+						break;
+					case $.ui.keyCode.UP:
+					case $.ui.keyCode.RIGHT:
+						if ( curVal === self._valueMax() ) {
+							return;
+						}
+						newVal = self._trimAlignValue( curVal + step );
+						break;
+					case $.ui.keyCode.DOWN:
+					case $.ui.keyCode.LEFT:
+						if ( curVal === self._valueMin() ) {
+							return;
+						}
+						newVal = self._trimAlignValue( curVal - step );
+						break;
+				}
+	
+				self._slide( event, index, newVal );
+	
+				return ret;
+	
+			})
+			.keyup(function( event ) {
+				var index = $( this ).data( "index.ui-slider-handle" );
+	
+				if ( self._keySliding ) {
+					self._keySliding = false;
+					self._stop( event, index );
+					self._change( event, index );
+					$( this ).removeClass( "ui-state-active" );
+				}
+	
+			});
+
+		this._refreshValue();
+
+		this._animateOff = false;
+	},
+
+	destroy: function() {
+		this.handles.remove();
+		this.range.remove();
+
+		this.element
+			.removeClass( "ui-slider" +
+				" ui-slider-horizontal" +
+				" ui-slider-vertical" +
+				" ui-slider-disabled" +
+				" ui-widget" +
+				" ui-widget-content" +
+				" ui-corner-all" )
+			.removeData( "slider" )
+			.unbind( ".slider" );
+
+		this._mouseDestroy();
+
+		return this;
+	},
+
+	_mouseCapture: function( event ) {
+		var o = this.options,
+			position,
+			normValue,
+			distance,
+			closestHandle,
+			self,
+			index,
+			allowed,
+			offset,
+			mouseOverHandle;
+
+		if ( o.disabled ) {
+			return false;
+		}
+
+		this.elementSize = {
+			width: this.element.outerWidth(),
+			height: this.element.outerHeight()
+		};
+		this.elementOffset = this.element.offset();
+
+		position = { x: event.pageX, y: event.pageY };
+		normValue = this._normValueFromMouse( position );
+		distance = this._valueMax() - this._valueMin() + 1;
+		self = this;
+		this.handles.each(function( i ) {
+			var thisDistance = Math.abs( normValue - self.values(i) );
+			if ( distance > thisDistance ) {
+				distance = thisDistance;
+				closestHandle = $( this );
+				index = i;
+			}
+		});
+
+		// workaround for bug #3736 (if both handles of a range are at 0,
+		// the first is always used as the one with least distance,
+		// and moving it is obviously prevented by preventing negative ranges)
+		if( o.range === true && this.values(1) === o.min ) {
+			index += 1;
+			closestHandle = $( this.handles[index] );
+		}
+
+		allowed = this._start( event, index );
+		if ( allowed === false ) {
+			return false;
+		}
+		this._mouseSliding = true;
+
+		self._handleIndex = index;
+
+		closestHandle
+			.addClass( "ui-state-active" )
+			.focus();
+		
+		offset = closestHandle.offset();
+		mouseOverHandle = !$( event.target ).parents().andSelf().is( ".ui-slider-handle" );
+		this._clickOffset = mouseOverHandle ? { left: 0, top: 0 } : {
+			left: event.pageX - offset.left - ( closestHandle.width() / 2 ),
+			top: event.pageY - offset.top -
+				( closestHandle.height() / 2 ) -
+				( parseInt( closestHandle.css("borderTopWidth"), 10 ) || 0 ) -
+				( parseInt( closestHandle.css("borderBottomWidth"), 10 ) || 0) +
+				( parseInt( closestHandle.css("marginTop"), 10 ) || 0)
+		};
+
+		if ( !this.handles.hasClass( "ui-state-hover" ) ) {
+			this._slide( event, index, normValue );
+		}
+		this._animateOff = true;
+		return true;
+	},
+
+	_mouseStart: function( event ) {
+		return true;
+	},
+
+	_mouseDrag: function( event ) {
+		var position = { x: event.pageX, y: event.pageY },
+			normValue = this._normValueFromMouse( position );
+		
+		this._slide( event, this._handleIndex, normValue );
+
+		return false;
+	},
+
+	_mouseStop: function( event ) {
+		this.handles.removeClass( "ui-state-active" );
+		this._mouseSliding = false;
+
+		this._stop( event, this._handleIndex );
+		this._change( event, this._handleIndex );
+
+		this._handleIndex = null;
+		this._clickOffset = null;
+		this._animateOff = false;
+
+		return false;
+	},
+	
+	_detectOrientation: function() {
+		this.orientation = ( this.options.orientation === "vertical" ) ? "vertical" : "horizontal";
+	},
+
+	_normValueFromMouse: function( position ) {
+		var pixelTotal,
+			pixelMouse,
+			percentMouse,
+			valueTotal,
+			valueMouse;
+
+		if ( this.orientation === "horizontal" ) {
+			pixelTotal = this.elementSize.width;
+			pixelMouse = position.x - this.elementOffset.left - ( this._clickOffset ? this._clickOffset.left : 0 );
+		} else {
+			pixelTotal = this.elementSize.height;
+			pixelMouse = position.y - this.elementOffset.top - ( this._clickOffset ? this._clickOffset.top : 0 );
+		}
+
+		percentMouse = ( pixelMouse / pixelTotal );
+		if ( percentMouse > 1 ) {
+			percentMouse = 1;
+		}
+		if ( percentMouse < 0 ) {
+			percentMouse = 0;
+		}
+		if ( this.orientation === "vertical" ) {
+			percentMouse = 1 - percentMouse;
+		}
+
+		valueTotal = this._valueMax() - this._valueMin();
+		valueMouse = this._valueMin() + percentMouse * valueTotal;
+
+		return this._trimAlignValue( valueMouse );
+	},
+
+	_start: function( event, index ) {
+		var uiHash = {
+			handle: this.handles[ index ],
+			value: this.value()
+		};
+		if ( this.options.values && this.options.values.length ) {
+			uiHash.value = this.values( index );
+			uiHash.values = this.values();
+		}
+		return this._trigger( "start", event, uiHash );
+	},
+
+	_slide: function( event, index, newVal ) {
+		var otherVal,
+			newValues,
+			allowed;
+
+		if ( this.options.values && this.options.values.length ) {
+			otherVal = this.values( index ? 0 : 1 );
+
+			if ( ( this.options.values.length === 2 && this.options.range === true ) && 
+					( ( index === 0 && newVal > otherVal) || ( index === 1 && newVal < otherVal ) )
+				) {
+				newVal = otherVal;
+			}
+
+			if ( newVal !== this.values( index ) ) {
+				newValues = this.values();
+				newValues[ index ] = newVal;
+				// A slide can be canceled by returning false from the slide callback
+				allowed = this._trigger( "slide", event, {
+					handle: this.handles[ index ],
+					value: newVal,
+					values: newValues
+				} );
+				otherVal = this.values( index ? 0 : 1 );
+				if ( allowed !== false ) {
+					this.values( index, newVal, true );
+				}
+			}
+		} else {
+			if ( newVal !== this.value() ) {
+				// A slide can be canceled by returning false from the slide callback
+				allowed = this._trigger( "slide", event, {
+					handle: this.handles[ index ],
+					value: newVal
+				} );
+				if ( allowed !== false ) {
+					this.value( newVal );
+				}
+			}
+		}
+	},
+
+	_stop: function( event, index ) {
+		var uiHash = {
+			handle: this.handles[ index ],
+			value: this.value()
+		};
+		if ( this.options.values && this.options.values.length ) {
+			uiHash.value = this.values( index );
+			uiHash.values = this.values();
+		}
+
+		this._trigger( "stop", event, uiHash );
+	},
+
+	_change: function( event, index ) {
+		if ( !this._keySliding && !this._mouseSliding ) {
+			var uiHash = {
+				handle: this.handles[ index ],
+				value: this.value()
+			};
+			if ( this.options.values && this.options.values.length ) {
+				uiHash.value = this.values( index );
+				uiHash.values = this.values();
+			}
+
+			this._trigger( "change", event, uiHash );
+		}
+	},
+
+	value: function( newValue ) {
+		if ( arguments.length ) {
+			this.options.value = this._trimAlignValue( newValue );
+			this._refreshValue();
+			this._change( null, 0 );
+		}
+
+		return this._value();
+	},
+
+	values: function( index, newValue ) {
+		var vals,
+			newValues,
+			i;
+
+		if ( arguments.length > 1 ) {
+			this.options.values[ index ] = this._trimAlignValue( newValue );
+			this._refreshValue();
+			this._change( null, index );
+		}
+
+		if ( arguments.length ) {
+			if ( $.isArray( arguments[ 0 ] ) ) {
+				vals = this.options.values;
+				newValues = arguments[ 0 ];
+				for ( i = 0; i < vals.length; i += 1 ) {
+					vals[ i ] = this._trimAlignValue( newValues[ i ] );
+					this._change( null, i );
+				}
+				this._refreshValue();
+			} else {
+				if ( this.options.values && this.options.values.length ) {
+					return this._values( index );
+				} else {
+					return this.value();
+				}
+			}
+		} else {
+			return this._values();
+		}
+	},
+
+	_setOption: function( key, value ) {
+		var i,
+			valsLength = 0;
+
+		if ( $.isArray( this.options.values ) ) {
+			valsLength = this.options.values.length;
+		}
+
+		$.Widget.prototype._setOption.apply( this, arguments );
+
+		switch ( key ) {
+			case "disabled":
+				if ( value ) {
+					this.handles.filter( ".ui-state-focus" ).blur();
+					this.handles.removeClass( "ui-state-hover" );
+					this.handles.attr( "disabled", "disabled" );
+					this.element.addClass( "ui-disabled" );
+				} else {
+					this.handles.removeAttr( "disabled" );
+					this.element.removeClass( "ui-disabled" );
+				}
+				break;
+			case "orientation":
+				this._detectOrientation();
+				this.element
+					.removeClass( "ui-slider-horizontal ui-slider-vertical" )
+					.addClass( "ui-slider-" + this.orientation );
+				this._refreshValue();
+				break;
+			case "value":
+				this._animateOff = true;
+				this._refreshValue();
+				this._change( null, 0 );
+				this._animateOff = false;
+				break;
+			case "values":
+				this._animateOff = true;
+				this._refreshValue();
+				for ( i = 0; i < valsLength; i += 1 ) {
+					this._change( null, i );
+				}
+				this._animateOff = false;
+				break;
+		}
+	},
+
+	//internal value getter
+	// _value() returns value trimmed by min and max, aligned by step
+	_value: function() {
+		var val = this.options.value;
+		val = this._trimAlignValue( val );
+
+		return val;
+	},
+
+	//internal values getter
+	// _values() returns array of values trimmed by min and max, aligned by step
+	// _values( index ) returns single value trimmed by min and max, aligned by step
+	_values: function( index ) {
+		var val,
+			vals,
+			i;
+
+		if ( arguments.length ) {
+			val = this.options.values[ index ];
+			val = this._trimAlignValue( val );
+
+			return val;
+		} else {
+			// .slice() creates a copy of the array
+			// this copy gets trimmed by min and max and then returned
+			vals = this.options.values.slice();
+			for ( i = 0; i < vals.length; i+= 1) {
+				vals[ i ] = this._trimAlignValue( vals[ i ] );
+			}
+
+			return vals;
+		}
+	},
+	
+	// returns the step-aligned value that val is closest to, between (inclusive) min and max
+	_trimAlignValue: function( val ) {
+		if ( val <= this._valueMin() ) {
+			return this._valueMin();
+		}
+		if ( val >= this._valueMax() ) {
+			return this._valueMax();
+		}
+		var step = ( this.options.step > 0 ) ? this.options.step : 1,
+			valModStep = (val - this._valueMin()) % step;
+			alignValue = val - valModStep;
+
+		if ( Math.abs(valModStep) * 2 >= step ) {
+			alignValue += ( valModStep > 0 ) ? step : ( -step );
+		}
+
+		// Since JavaScript has problems with large floats, round
+		// the final value to 5 digits after the decimal point (see #4124)
+		return parseFloat( alignValue.toFixed(5) );
+	},
+
+	_valueMin: function() {
+		return this.options.min;
+	},
+
+	_valueMax: function() {
+		return this.options.max;
+	},
+	
+	_refreshValue: function() {
+		var oRange = this.options.range,
+			o = this.options,
+			self = this,
+			animate = ( !this._animateOff ) ? o.animate : false,
+			valPercent,
+			_set = {},
+			lastValPercent,
+			value,
+			valueMin,
+			valueMax;
+
+		if ( this.options.values && this.options.values.length ) {
+			this.handles.each(function( i, j ) {
+				valPercent = ( self.values(i) - self._valueMin() ) / ( self._valueMax() - self._valueMin() ) * 100;
+				_set[ self.orientation === "horizontal" ? "left" : "bottom" ] = valPercent + "%";
+				$( this ).stop( 1, 1 )[ animate ? "animate" : "css" ]( _set, o.animate );
+				if ( self.options.range === true ) {
+					if ( self.orientation === "horizontal" ) {
+						if ( i === 0 ) {
+							self.range.stop( 1, 1 )[ animate ? "animate" : "css" ]( { left: valPercent + "%" }, o.animate );
+						}
+						if ( i === 1 ) {
+							self.range[ animate ? "animate" : "css" ]( { width: ( valPercent - lastValPercent ) + "%" }, { queue: false, duration: o.animate } );
+						}
+					} else {
+						if ( i === 0 ) {
+							self.range.stop( 1, 1 )[ animate ? "animate" : "css" ]( { bottom: ( valPercent ) + "%" }, o.animate );
+						}
+						if ( i === 1 ) {
+							self.range[ animate ? "animate" : "css" ]( { height: ( valPercent - lastValPercent ) + "%" }, { queue: false, duration: o.animate } );
+						}
+					}
+				}
+				lastValPercent = valPercent;
+			});
+		} else {
+			value = this.value();
+			valueMin = this._valueMin();
+			valueMax = this._valueMax();
+			valPercent = ( valueMax !== valueMin ) ?
+					( value - valueMin ) / ( valueMax - valueMin ) * 100 :
+					0;
+			_set[ self.orientation === "horizontal" ? "left" : "bottom" ] = valPercent + "%";
+			this.handle.stop( 1, 1 )[ animate ? "animate" : "css" ]( _set, o.animate );
+
+			if ( oRange === "min" && this.orientation === "horizontal" ) {
+				this.range.stop( 1, 1 )[ animate ? "animate" : "css" ]( { width: valPercent + "%" }, o.animate );
+			}
+			if ( oRange === "max" && this.orientation === "horizontal" ) {
+				this.range[ animate ? "animate" : "css" ]( { width: ( 100 - valPercent ) + "%" }, { queue: false, duration: o.animate } );
+			}
+			if ( oRange === "min" && this.orientation === "vertical" ) {
+				this.range.stop( 1, 1 )[ animate ? "animate" : "css" ]( { height: valPercent + "%" }, o.animate );
+			}
+			if ( oRange === "max" && this.orientation === "vertical" ) {
+				this.range[ animate ? "animate" : "css" ]( { height: ( 100 - valPercent ) + "%" }, { queue: false, duration: o.animate } );
+			}
+		}
+	}
+
+});
+
+$.extend( $.ui.slider, {
+	version: "1.8.10"
+});
+
+}(jQuery));
diff --git a/js/ui/jquery.ui.sortable.js b/js/ui/jquery.ui.sortable.js
new file mode 100644
index 0000000000..9665b77dd0
--- /dev/null
+++ b/js/ui/jquery.ui.sortable.js
@@ -0,0 +1,1073 @@
+/*
+ * jQuery UI Sortable 1.8.10
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Sortables
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ *	jquery.ui.mouse.js
+ *	jquery.ui.widget.js
+ */
+(function( $, undefined ) {
+
+$.widget("ui.sortable", $.ui.mouse, {
+	widgetEventPrefix: "sort",
+	options: {
+		appendTo: "parent",
+		axis: false,
+		connectWith: false,
+		containment: false,
+		cursor: 'auto',
+		cursorAt: false,
+		dropOnEmpty: true,
+		forcePlaceholderSize: false,
+		forceHelperSize: false,
+		grid: false,
+		handle: false,
+		helper: "original",
+		items: '> *',
+		opacity: false,
+		placeholder: false,
+		revert: false,
+		scroll: true,
+		scrollSensitivity: 20,
+		scrollSpeed: 20,
+		scope: "default",
+		tolerance: "intersect",
+		zIndex: 1000
+	},
+	_create: function() {
+
+		var o = this.options;
+		this.containerCache = {};
+		this.element.addClass("ui-sortable");
+
+		//Get the items
+		this.refresh();
+
+		//Let's determine if the items are floating
+		this.floating = this.items.length ? (/left|right/).test(this.items[0].item.css('float')) : false;
+
+		//Let's determine the parent's offset
+		this.offset = this.element.offset();
+
+		//Initialize mouse events for interaction
+		this._mouseInit();
+
+	},
+
+	destroy: function() {
+		this.element
+			.removeClass("ui-sortable ui-sortable-disabled")
+			.removeData("sortable")
+			.unbind(".sortable");
+		this._mouseDestroy();
+
+		for ( var i = this.items.length - 1; i >= 0; i-- )
+			this.items[i].item.removeData("sortable-item");
+
+		return this;
+	},
+
+	_setOption: function(key, value){
+		if ( key === "disabled" ) {
+			this.options[ key ] = value;
+	
+			this.widget()
+				[ value ? "addClass" : "removeClass"]( "ui-sortable-disabled" );
+		} else {
+			// Don't call widget base _setOption for disable as it adds ui-state-disabled class
+			$.Widget.prototype._setOption.apply(this, arguments);
+		}
+	},
+
+	_mouseCapture: function(event, overrideHandle) {
+
+		if (this.reverting) {
+			return false;
+		}
+
+		if(this.options.disabled || this.options.type == 'static') return false;
+
+		//We have to refresh the items data once first
+		this._refreshItems(event);
+
+		//Find out if the clicked node (or one of its parents) is a actual item in this.items
+		var currentItem = null, self = this, nodes = $(event.target).parents().each(function() {
+			if($.data(this, 'sortable-item') == self) {
+				currentItem = $(this);
+				return false;
+			}
+		});
+		if($.data(event.target, 'sortable-item') == self) currentItem = $(event.target);
+
+		if(!currentItem) return false;
+		if(this.options.handle && !overrideHandle) {
+			var validHandle = false;
+
+			$(this.options.handle, currentItem).find("*").andSelf().each(function() { if(this == event.target) validHandle = true; });
+			if(!validHandle) return false;
+		}
+
+		this.currentItem = currentItem;
+		this._removeCurrentsFromItems();
+		return true;
+
+	},
+
+	_mouseStart: function(event, overrideHandle, noActivation) {
+
+		var o = this.options, self = this;
+		this.currentContainer = this;
+
+		//We only need to call refreshPositions, because the refreshItems call has been moved to mouseCapture
+		this.refreshPositions();
+
+		//Create and append the visible helper
+		this.helper = this._createHelper(event);
+
+		//Cache the helper size
+		this._cacheHelperProportions();
+
+		/*
+		 * - Position generation -
+		 * This block generates everything position related - it's the core of draggables.
+		 */
+
+		//Cache the margins of the original element
+		this._cacheMargins();
+
+		//Get the next scrolling parent
+		this.scrollParent = this.helper.scrollParent();
+
+		//The element's absolute position on the page minus margins
+		this.offset = this.currentItem.offset();
+		this.offset = {
+			top: this.offset.top - this.margins.top,
+			left: this.offset.left - this.margins.left
+		};
+
+		// Only after we got the offset, we can change the helper's position to absolute
+		// TODO: Still need to figure out a way to make relative sorting possible
+		this.helper.css("position", "absolute");
+		this.cssPosition = this.helper.css("position");
+
+		$.extend(this.offset, {
+			click: { //Where the click happened, relative to the element
+				left: event.pageX - this.offset.left,
+				top: event.pageY - this.offset.top
+			},
+			parent: this._getParentOffset(),
+			relative: this._getRelativeOffset() //This is a relative to absolute position minus the actual position calculation - only used for relative positioned helper
+		});
+
+		//Generate the original position
+		this.originalPosition = this._generatePosition(event);
+		this.originalPageX = event.pageX;
+		this.originalPageY = event.pageY;
+
+		//Adjust the mouse offset relative to the helper if 'cursorAt' is supplied
+		(o.cursorAt && this._adjustOffsetFromHelper(o.cursorAt));
+
+		//Cache the former DOM position
+		this.domPosition = { prev: this.currentItem.prev()[0], parent: this.currentItem.parent()[0] };
+
+		//If the helper is not the original, hide the original so it's not playing any role during the drag, won't cause anything bad this way
+		if(this.helper[0] != this.currentItem[0]) {
+			this.currentItem.hide();
+		}
+
+		//Create the placeholder
+		this._createPlaceholder();
+
+		//Set a containment if given in the options
+		if(o.containment)
+			this._setContainment();
+
+		if(o.cursor) { // cursor option
+			if ($('body').css("cursor")) this._storedCursor = $('body').css("cursor");
+			$('body').css("cursor", o.cursor);
+		}
+
+		if(o.opacity) { // opacity option
+			if (this.helper.css("opacity")) this._storedOpacity = this.helper.css("opacity");
+			this.helper.css("opacity", o.opacity);
+		}
+
+		if(o.zIndex) { // zIndex option
+			if (this.helper.css("zIndex")) this._storedZIndex = this.helper.css("zIndex");
+			this.helper.css("zIndex", o.zIndex);
+		}
+
+		//Prepare scrolling
+		if(this.scrollParent[0] != document && this.scrollParent[0].tagName != 'HTML')
+			this.overflowOffset = this.scrollParent.offset();
+
+		//Call callbacks
+		this._trigger("start", event, this._uiHash());
+
+		//Recache the helper size
+		if(!this._preserveHelperProportions)
+			this._cacheHelperProportions();
+
+
+		//Post 'activate' events to possible containers
+		if(!noActivation) {
+			 for (var i = this.containers.length - 1; i >= 0; i--) { this.containers[i]._trigger("activate", event, self._uiHash(this)); }
+		}
+
+		//Prepare possible droppables
+		if($.ui.ddmanager)
+			$.ui.ddmanager.current = this;
+
+		if ($.ui.ddmanager && !o.dropBehaviour)
+			$.ui.ddmanager.prepareOffsets(this, event);
+
+		this.dragging = true;
+
+		this.helper.addClass("ui-sortable-helper");
+		this._mouseDrag(event); //Execute the drag once - this causes the helper not to be visible before getting its correct position
+		return true;
+
+	},
+
+	_mouseDrag: function(event) {
+
+		//Compute the helpers position
+		this.position = this._generatePosition(event);
+		this.positionAbs = this._convertPositionTo("absolute");
+
+		if (!this.lastPositionAbs) {
+			this.lastPositionAbs = this.positionAbs;
+		}
+
+		//Do scrolling
+		if(this.options.scroll) {
+			var o = this.options, scrolled = false;
+			if(this.scrollParent[0] != document && this.scrollParent[0].tagName != 'HTML') {
+
+				if((this.overflowOffset.top + this.scrollParent[0].offsetHeight) - event.pageY < o.scrollSensitivity)
+					this.scrollParent[0].scrollTop = scrolled = this.scrollParent[0].scrollTop + o.scrollSpeed;
+				else if(event.pageY - this.overflowOffset.top < o.scrollSensitivity)
+					this.scrollParent[0].scrollTop = scrolled = this.scrollParent[0].scrollTop - o.scrollSpeed;
+
+				if((this.overflowOffset.left + this.scrollParent[0].offsetWidth) - event.pageX < o.scrollSensitivity)
+					this.scrollParent[0].scrollLeft = scrolled = this.scrollParent[0].scrollLeft + o.scrollSpeed;
+				else if(event.pageX - this.overflowOffset.left < o.scrollSensitivity)
+					this.scrollParent[0].scrollLeft = scrolled = this.scrollParent[0].scrollLeft - o.scrollSpeed;
+
+			} else {
+
+				if(event.pageY - $(document).scrollTop() < o.scrollSensitivity)
+					scrolled = $(document).scrollTop($(document).scrollTop() - o.scrollSpeed);
+				else if($(window).height() - (event.pageY - $(document).scrollTop()) < o.scrollSensitivity)
+					scrolled = $(document).scrollTop($(document).scrollTop() + o.scrollSpeed);
+
+				if(event.pageX - $(document).scrollLeft() < o.scrollSensitivity)
+					scrolled = $(document).scrollLeft($(document).scrollLeft() - o.scrollSpeed);
+				else if($(window).width() - (event.pageX - $(document).scrollLeft()) < o.scrollSensitivity)
+					scrolled = $(document).scrollLeft($(document).scrollLeft() + o.scrollSpeed);
+
+			}
+
+			if(scrolled !== false && $.ui.ddmanager && !o.dropBehaviour)
+				$.ui.ddmanager.prepareOffsets(this, event);
+		}
+
+		//Regenerate the absolute position used for position checks
+		this.positionAbs = this._convertPositionTo("absolute");
+
+		//Set the helper position
+		if(!this.options.axis || this.options.axis != "y") this.helper[0].style.left = this.position.left+'px';
+		if(!this.options.axis || this.options.axis != "x") this.helper[0].style.top = this.position.top+'px';
+
+		//Rearrange
+		for (var i = this.items.length - 1; i >= 0; i--) {
+
+			//Cache variables and intersection, continue if no intersection
+			var item = this.items[i], itemElement = item.item[0], intersection = this._intersectsWithPointer(item);
+			if (!intersection) continue;
+
+			if(itemElement != this.currentItem[0] //cannot intersect with itself
+				&&	this.placeholder[intersection == 1 ? "next" : "prev"]()[0] != itemElement //no useless actions that have been done before
+				&&	!$.ui.contains(this.placeholder[0], itemElement) //no action if the item moved is the parent of the item checked
+				&& (this.options.type == 'semi-dynamic' ? !$.ui.contains(this.element[0], itemElement) : true)
+				//&& itemElement.parentNode == this.placeholder[0].parentNode // only rearrange items within the same container
+			) {
+
+				this.direction = intersection == 1 ? "down" : "up";
+
+				if (this.options.tolerance == "pointer" || this._intersectsWithSides(item)) {
+					this._rearrange(event, item);
+				} else {
+					break;
+				}
+
+				this._trigger("change", event, this._uiHash());
+				break;
+			}
+		}
+
+		//Post events to containers
+		this._contactContainers(event);
+
+		//Interconnect with droppables
+		if($.ui.ddmanager) $.ui.ddmanager.drag(this, event);
+
+		//Call callbacks
+		this._trigger('sort', event, this._uiHash());
+
+		this.lastPositionAbs = this.positionAbs;
+		return false;
+
+	},
+
+	_mouseStop: function(event, noPropagation) {
+
+		if(!event) return;
+
+		//If we are using droppables, inform the manager about the drop
+		if ($.ui.ddmanager && !this.options.dropBehaviour)
+			$.ui.ddmanager.drop(this, event);
+
+		if(this.options.revert) {
+			var self = this;
+			var cur = self.placeholder.offset();
+
+			self.reverting = true;
+
+			$(this.helper).animate({
+				left: cur.left - this.offset.parent.left - self.margins.left + (this.offsetParent[0] == document.body ? 0 : this.offsetParent[0].scrollLeft),
+				top: cur.top - this.offset.parent.top - self.margins.top + (this.offsetParent[0] == document.body ? 0 : this.offsetParent[0].scrollTop)
+			}, parseInt(this.options.revert, 10) || 500, function() {
+				self._clear(event);
+			});
+		} else {
+			this._clear(event, noPropagation);
+		}
+
+		return false;
+
+	},
+
+	cancel: function() {
+
+		var self = this;
+
+		if(this.dragging) {
+
+			this._mouseUp({ target: null });
+
+			if(this.options.helper == "original")
+				this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper");
+			else
+				this.currentItem.show();
+
+			//Post deactivating events to containers
+			for (var i = this.containers.length - 1; i >= 0; i--){
+				this.containers[i]._trigger("deactivate", null, self._uiHash(this));
+				if(this.containers[i].containerCache.over) {
+					this.containers[i]._trigger("out", null, self._uiHash(this));
+					this.containers[i].containerCache.over = 0;
+				}
+			}
+
+		}
+
+		if (this.placeholder) {
+			//$(this.placeholder[0]).remove(); would have been the jQuery way - unfortunately, it unbinds ALL events from the original node!
+			if(this.placeholder[0].parentNode) this.placeholder[0].parentNode.removeChild(this.placeholder[0]);
+			if(this.options.helper != "original" && this.helper && this.helper[0].parentNode) this.helper.remove();
+
+			$.extend(this, {
+				helper: null,
+				dragging: false,
+				reverting: false,
+				_noFinalSort: null
+			});
+
+			if(this.domPosition.prev) {
+				$(this.domPosition.prev).after(this.currentItem);
+			} else {
+				$(this.domPosition.parent).prepend(this.currentItem);
+			}
+		}
+
+		return this;
+
+	},
+
+	serialize: function(o) {
+
+		var items = this._getItemsAsjQuery(o && o.connected);
+		var str = []; o = o || {};
+
+		$(items).each(function() {
+			var res = ($(o.item || this).attr(o.attribute || 'id') || '').match(o.expression || (/(.+)[-=_](.+)/));
+			if(res) str.push((o.key || res[1]+'[]')+'='+(o.key && o.expression ? res[1] : res[2]));
+		});
+
+		if(!str.length && o.key) {
+			str.push(o.key + '=');
+		}
+
+		return str.join('&');
+
+	},
+
+	toArray: function(o) {
+
+		var items = this._getItemsAsjQuery(o && o.connected);
+		var ret = []; o = o || {};
+
+		items.each(function() { ret.push($(o.item || this).attr(o.attribute || 'id') || ''); });
+		return ret;
+
+	},
+
+	/* Be careful with the following core functions */
+	_intersectsWith: function(item) {
+
+		var x1 = this.positionAbs.left,
+			x2 = x1 + this.helperProportions.width,
+			y1 = this.positionAbs.top,
+			y2 = y1 + this.helperProportions.height;
+
+		var l = item.left,
+			r = l + item.width,
+			t = item.top,
+			b = t + item.height;
+
+		var dyClick = this.offset.click.top,
+			dxClick = this.offset.click.left;
+
+		var isOverElement = (y1 + dyClick) > t && (y1 + dyClick) < b && (x1 + dxClick) > l && (x1 + dxClick) < r;
+
+		if(	   this.options.tolerance == "pointer"
+			|| this.options.forcePointerForContainers
+			|| (this.options.tolerance != "pointer" && this.helperProportions[this.floating ? 'width' : 'height'] > item[this.floating ? 'width' : 'height'])
+		) {
+			return isOverElement;
+		} else {
+
+			return (l < x1 + (this.helperProportions.width / 2) // Right Half
+				&& x2 - (this.helperProportions.width / 2) < r // Left Half
+				&& t < y1 + (this.helperProportions.height / 2) // Bottom Half
+				&& y2 - (this.helperProportions.height / 2) < b ); // Top Half
+
+		}
+	},
+
+	_intersectsWithPointer: function(item) {
+
+		var isOverElementHeight = $.ui.isOverAxis(this.positionAbs.top + this.offset.click.top, item.top, item.height),
+			isOverElementWidth = $.ui.isOverAxis(this.positionAbs.left + this.offset.click.left, item.left, item.width),
+			isOverElement = isOverElementHeight && isOverElementWidth,
+			verticalDirection = this._getDragVerticalDirection(),
+			horizontalDirection = this._getDragHorizontalDirection();
+
+		if (!isOverElement)
+			return false;
+
+		return this.floating ?
+			( ((horizontalDirection && horizontalDirection == "right") || verticalDirection == "down") ? 2 : 1 )
+			: ( verticalDirection && (verticalDirection == "down" ? 2 : 1) );
+
+	},
+
+	_intersectsWithSides: function(item) {
+
+		var isOverBottomHalf = $.ui.isOverAxis(this.positionAbs.top + this.offset.click.top, item.top + (item.height/2), item.height),
+			isOverRightHalf = $.ui.isOverAxis(this.positionAbs.left + this.offset.click.left, item.left + (item.width/2), item.width),
+			verticalDirection = this._getDragVerticalDirection(),
+			horizontalDirection = this._getDragHorizontalDirection();
+
+		if (this.floating && horizontalDirection) {
+			return ((horizontalDirection == "right" && isOverRightHalf) || (horizontalDirection == "left" && !isOverRightHalf));
+		} else {
+			return verticalDirection && ((verticalDirection == "down" && isOverBottomHalf) || (verticalDirection == "up" && !isOverBottomHalf));
+		}
+
+	},
+
+	_getDragVerticalDirection: function() {
+		var delta = this.positionAbs.top - this.lastPositionAbs.top;
+		return delta != 0 && (delta > 0 ? "down" : "up");
+	},
+
+	_getDragHorizontalDirection: function() {
+		var delta = this.positionAbs.left - this.lastPositionAbs.left;
+		return delta != 0 && (delta > 0 ? "right" : "left");
+	},
+
+	refresh: function(event) {
+		this._refreshItems(event);
+		this.refreshPositions();
+		return this;
+	},
+
+	_connectWith: function() {
+		var options = this.options;
+		return options.connectWith.constructor == String
+			? [options.connectWith]
+			: options.connectWith;
+	},
+	
+	_getItemsAsjQuery: function(connected) {
+
+		var self = this;
+		var items = [];
+		var queries = [];
+		var connectWith = this._connectWith();
+
+		if(connectWith && connected) {
+			for (var i = connectWith.length - 1; i >= 0; i--){
+				var cur = $(connectWith[i]);
+				for (var j = cur.length - 1; j >= 0; j--){
+					var inst = $.data(cur[j], 'sortable');
+					if(inst && inst != this && !inst.options.disabled) {
+						queries.push([$.isFunction(inst.options.items) ? inst.options.items.call(inst.element) : $(inst.options.items, inst.element).not(".ui-sortable-helper").not('.ui-sortable-placeholder'), inst]);
+					}
+				};
+			};
+		}
+
+		queries.push([$.isFunction(this.options.items) ? this.options.items.call(this.element, null, { options: this.options, item: this.currentItem }) : $(this.options.items, this.element).not(".ui-sortable-helper").not('.ui-sortable-placeholder'), this]);
+
+		for (var i = queries.length - 1; i >= 0; i--){
+			queries[i][0].each(function() {
+				items.push(this);
+			});
+		};
+
+		return $(items);
+
+	},
+
+	_removeCurrentsFromItems: function() {
+
+		var list = this.currentItem.find(":data(sortable-item)");
+
+		for (var i=0; i < this.items.length; i++) {
+
+			for (var j=0; j < list.length; j++) {
+				if(list[j] == this.items[i].item[0])
+					this.items.splice(i,1);
+			};
+
+		};
+
+	},
+
+	_refreshItems: function(event) {
+
+		this.items = [];
+		this.containers = [this];
+		var items = this.items;
+		var self = this;
+		var queries = [[$.isFunction(this.options.items) ? this.options.items.call(this.element[0], event, { item: this.currentItem }) : $(this.options.items, this.element), this]];
+		var connectWith = this._connectWith();
+
+		if(connectWith) {
+			for (var i = connectWith.length - 1; i >= 0; i--){
+				var cur = $(connectWith[i]);
+				for (var j = cur.length - 1; j >= 0; j--){
+					var inst = $.data(cur[j], 'sortable');
+					if(inst && inst != this && !inst.options.disabled) {
+						queries.push([$.isFunction(inst.options.items) ? inst.options.items.call(inst.element[0], event, { item: this.currentItem }) : $(inst.options.items, inst.element), inst]);
+						this.containers.push(inst);
+					}
+				};
+			};
+		}
+
+		for (var i = queries.length - 1; i >= 0; i--) {
+			var targetData = queries[i][1];
+			var _queries = queries[i][0];
+
+			for (var j=0, queriesLength = _queries.length; j < queriesLength; j++) {
+				var item = $(_queries[j]);
+
+				item.data('sortable-item', targetData); // Data for target checking (mouse manager)
+
+				items.push({
+					item: item,
+					instance: targetData,
+					width: 0, height: 0,
+					left: 0, top: 0
+				});
+			};
+		};
+
+	},
+
+	refreshPositions: function(fast) {
+
+		//This has to be redone because due to the item being moved out/into the offsetParent, the offsetParent's position will change
+		if(this.offsetParent && this.helper) {
+			this.offset.parent = this._getParentOffset();
+		}
+
+		for (var i = this.items.length - 1; i >= 0; i--){
+			var item = this.items[i];
+
+			var t = this.options.toleranceElement ? $(this.options.toleranceElement, item.item) : item.item;
+
+			if (!fast) {
+				item.width = t.outerWidth();
+				item.height = t.outerHeight();
+			}
+
+			var p = t.offset();
+			item.left = p.left;
+			item.top = p.top;
+		};
+
+		if(this.options.custom && this.options.custom.refreshContainers) {
+			this.options.custom.refreshContainers.call(this);
+		} else {
+			for (var i = this.containers.length - 1; i >= 0; i--){
+				var p = this.containers[i].element.offset();
+				this.containers[i].containerCache.left = p.left;
+				this.containers[i].containerCache.top = p.top;
+				this.containers[i].containerCache.width	= this.containers[i].element.outerWidth();
+				this.containers[i].containerCache.height = this.containers[i].element.outerHeight();
+			};
+		}
+
+		return this;
+	},
+
+	_createPlaceholder: function(that) {
+
+		var self = that || this, o = self.options;
+
+		if(!o.placeholder || o.placeholder.constructor == String) {
+			var className = o.placeholder;
+			o.placeholder = {
+				element: function() {
+
+					var el = $(document.createElement(self.currentItem[0].nodeName))
+						.addClass(className || self.currentItem[0].className+" ui-sortable-placeholder")
+						.removeClass("ui-sortable-helper")[0];
+
+					if(!className)
+						el.style.visibility = "hidden";
+
+					return el;
+				},
+				update: function(container, p) {
+
+					// 1. If a className is set as 'placeholder option, we don't force sizes - the class is responsible for that
+					// 2. The option 'forcePlaceholderSize can be enabled to force it even if a class name is specified
+					if(className && !o.forcePlaceholderSize) return;
+
+					//If the element doesn't have a actual height by itself (without styles coming from a stylesheet), it receives the inline height from the dragged item
+					if(!p.height()) { p.height(self.currentItem.innerHeight() - parseInt(self.currentItem.css('paddingTop')||0, 10) - parseInt(self.currentItem.css('paddingBottom')||0, 10)); };
+					if(!p.width()) { p.width(self.currentItem.innerWidth() - parseInt(self.currentItem.css('paddingLeft')||0, 10) - parseInt(self.currentItem.css('paddingRight')||0, 10)); };
+				}
+			};
+		}
+
+		//Create the placeholder
+		self.placeholder = $(o.placeholder.element.call(self.element, self.currentItem));
+
+		//Append it after the actual current item
+		self.currentItem.after(self.placeholder);
+
+		//Update the size of the placeholder (TODO: Logic to fuzzy, see line 316/317)
+		o.placeholder.update(self, self.placeholder);
+
+	},
+
+	_contactContainers: function(event) {
+		
+		// get innermost container that intersects with item 
+		var innermostContainer = null, innermostIndex = null;		
+		
+		
+		for (var i = this.containers.length - 1; i >= 0; i--){
+
+			// never consider a container that's located within the item itself 
+			if($.ui.contains(this.currentItem[0], this.containers[i].element[0]))
+				continue;
+
+			if(this._intersectsWith(this.containers[i].containerCache)) {
+
+				// if we've already found a container and it's more "inner" than this, then continue 
+				if(innermostContainer && $.ui.contains(this.containers[i].element[0], innermostContainer.element[0]))
+					continue;
+
+				innermostContainer = this.containers[i]; 
+				innermostIndex = i;
+					
+			} else {
+				// container doesn't intersect. trigger "out" event if necessary 
+				if(this.containers[i].containerCache.over) {
+					this.containers[i]._trigger("out", event, this._uiHash(this));
+					this.containers[i].containerCache.over = 0;
+				}
+			}
+
+		}
+		
+		// if no intersecting containers found, return 
+		if(!innermostContainer) return; 
+
+		// move the item into the container if it's not there already
+		if(this.containers.length === 1) {
+			this.containers[innermostIndex]._trigger("over", event, this._uiHash(this));
+			this.containers[innermostIndex].containerCache.over = 1;
+		} else if(this.currentContainer != this.containers[innermostIndex]) { 
+
+			//When entering a new container, we will find the item with the least distance and append our item near it 
+			var dist = 10000; var itemWithLeastDistance = null; var base = this.positionAbs[this.containers[innermostIndex].floating ? 'left' : 'top']; 
+			for (var j = this.items.length - 1; j >= 0; j--) { 
+				if(!$.ui.contains(this.containers[innermostIndex].element[0], this.items[j].item[0])) continue; 
+				var cur = this.items[j][this.containers[innermostIndex].floating ? 'left' : 'top']; 
+				if(Math.abs(cur - base) < dist) { 
+					dist = Math.abs(cur - base); itemWithLeastDistance = this.items[j]; 
+				} 
+			} 
+
+			if(!itemWithLeastDistance && !this.options.dropOnEmpty) //Check if dropOnEmpty is enabled 
+				return; 
+
+			this.currentContainer = this.containers[innermostIndex]; 
+			itemWithLeastDistance ? this._rearrange(event, itemWithLeastDistance, null, true) : this._rearrange(event, null, this.containers[innermostIndex].element, true); 
+			this._trigger("change", event, this._uiHash()); 
+			this.containers[innermostIndex]._trigger("change", event, this._uiHash(this)); 
+
+			//Update the placeholder 
+			this.options.placeholder.update(this.currentContainer, this.placeholder); 
+		
+			this.containers[innermostIndex]._trigger("over", event, this._uiHash(this)); 
+			this.containers[innermostIndex].containerCache.over = 1;
+		} 
+	
+		
+	},
+
+	_createHelper: function(event) {
+
+		var o = this.options;
+		var helper = $.isFunction(o.helper) ? $(o.helper.apply(this.element[0], [event, this.currentItem])) : (o.helper == 'clone' ? this.currentItem.clone() : this.currentItem);
+
+		if(!helper.parents('body').length) //Add the helper to the DOM if that didn't happen already
+			$(o.appendTo != 'parent' ? o.appendTo : this.currentItem[0].parentNode)[0].appendChild(helper[0]);
+
+		if(helper[0] == this.currentItem[0])
+			this._storedCSS = { width: this.currentItem[0].style.width, height: this.currentItem[0].style.height, position: this.currentItem.css("position"), top: this.currentItem.css("top"), left: this.currentItem.css("left") };
+
+		if(helper[0].style.width == '' || o.forceHelperSize) helper.width(this.currentItem.width());
+		if(helper[0].style.height == '' || o.forceHelperSize) helper.height(this.currentItem.height());
+
+		return helper;
+
+	},
+
+	_adjustOffsetFromHelper: function(obj) {
+		if (typeof obj == 'string') {
+			obj = obj.split(' ');
+		}
+		if ($.isArray(obj)) {
+			obj = {left: +obj[0], top: +obj[1] || 0};
+		}
+		if ('left' in obj) {
+			this.offset.click.left = obj.left + this.margins.left;
+		}
+		if ('right' in obj) {
+			this.offset.click.left = this.helperProportions.width - obj.right + this.margins.left;
+		}
+		if ('top' in obj) {
+			this.offset.click.top = obj.top + this.margins.top;
+		}
+		if ('bottom' in obj) {
+			this.offset.click.top = this.helperProportions.height - obj.bottom + this.margins.top;
+		}
+	},
+
+	_getParentOffset: function() {
+
+
+		//Get the offsetParent and cache its position
+		this.offsetParent = this.helper.offsetParent();
+		var po = this.offsetParent.offset();
+
+		// This is a special case where we need to modify a offset calculated on start, since the following happened:
+		// 1. The position of the helper is absolute, so it's position is calculated based on the next positioned parent
+		// 2. The actual offset parent is a child of the scroll parent, and the scroll parent isn't the document, which means that
+		//    the scroll is included in the initial calculation of the offset of the parent, and never recalculated upon drag
+		if(this.cssPosition == 'absolute' && this.scrollParent[0] != document && $.ui.contains(this.scrollParent[0], this.offsetParent[0])) {
+			po.left += this.scrollParent.scrollLeft();
+			po.top += this.scrollParent.scrollTop();
+		}
+
+		if((this.offsetParent[0] == document.body) //This needs to be actually done for all browsers, since pageX/pageY includes this information
+		|| (this.offsetParent[0].tagName && this.offsetParent[0].tagName.toLowerCase() == 'html' && $.browser.msie)) //Ugly IE fix
+			po = { top: 0, left: 0 };
+
+		return {
+			top: po.top + (parseInt(this.offsetParent.css("borderTopWidth"),10) || 0),
+			left: po.left + (parseInt(this.offsetParent.css("borderLeftWidth"),10) || 0)
+		};
+
+	},
+
+	_getRelativeOffset: function() {
+
+		if(this.cssPosition == "relative") {
+			var p = this.currentItem.position();
+			return {
+				top: p.top - (parseInt(this.helper.css("top"),10) || 0) + this.scrollParent.scrollTop(),
+				left: p.left - (parseInt(this.helper.css("left"),10) || 0) + this.scrollParent.scrollLeft()
+			};
+		} else {
+			return { top: 0, left: 0 };
+		}
+
+	},
+
+	_cacheMargins: function() {
+		this.margins = {
+			left: (parseInt(this.currentItem.css("marginLeft"),10) || 0),
+			top: (parseInt(this.currentItem.css("marginTop"),10) || 0)
+		};
+	},
+
+	_cacheHelperProportions: function() {
+		this.helperProportions = {
+			width: this.helper.outerWidth(),
+			height: this.helper.outerHeight()
+		};
+	},
+
+	_setContainment: function() {
+
+		var o = this.options;
+		if(o.containment == 'parent') o.containment = this.helper[0].parentNode;
+		if(o.containment == 'document' || o.containment == 'window') this.containment = [
+			0 - this.offset.relative.left - this.offset.parent.left,
+			0 - this.offset.relative.top - this.offset.parent.top,
+			$(o.containment == 'document' ? document : window).width() - this.helperProportions.width - this.margins.left,
+			($(o.containment == 'document' ? document : window).height() || document.body.parentNode.scrollHeight) - this.helperProportions.height - this.margins.top
+		];
+
+		if(!(/^(document|window|parent)$/).test(o.containment)) {
+			var ce = $(o.containment)[0];
+			var co = $(o.containment).offset();
+			var over = ($(ce).css("overflow") != 'hidden');
+
+			this.containment = [
+				co.left + (parseInt($(ce).css("borderLeftWidth"),10) || 0) + (parseInt($(ce).css("paddingLeft"),10) || 0) - this.margins.left,
+				co.top + (parseInt($(ce).css("borderTopWidth"),10) || 0) + (parseInt($(ce).css("paddingTop"),10) || 0) - this.margins.top,
+				co.left+(over ? Math.max(ce.scrollWidth,ce.offsetWidth) : ce.offsetWidth) - (parseInt($(ce).css("borderLeftWidth"),10) || 0) - (parseInt($(ce).css("paddingRight"),10) || 0) - this.helperProportions.width - this.margins.left,
+				co.top+(over ? Math.max(ce.scrollHeight,ce.offsetHeight) : ce.offsetHeight) - (parseInt($(ce).css("borderTopWidth"),10) || 0) - (parseInt($(ce).css("paddingBottom"),10) || 0) - this.helperProportions.height - this.margins.top
+			];
+		}
+
+	},
+
+	_convertPositionTo: function(d, pos) {
+
+		if(!pos) pos = this.position;
+		var mod = d == "absolute" ? 1 : -1;
+		var o = this.options, scroll = this.cssPosition == 'absolute' && !(this.scrollParent[0] != document && $.ui.contains(this.scrollParent[0], this.offsetParent[0])) ? this.offsetParent : this.scrollParent, scrollIsRootNode = (/(html|body)/i).test(scroll[0].tagName);
+
+		return {
+			top: (
+				pos.top																	// The absolute mouse position
+				+ this.offset.relative.top * mod										// Only for relative positioned nodes: Relative offset from element to offset parent
+				+ this.offset.parent.top * mod											// The offsetParent's offset without borders (offset + border)
+				- ($.browser.safari && this.cssPosition == 'fixed' ? 0 : ( this.cssPosition == 'fixed' ? -this.scrollParent.scrollTop() : ( scrollIsRootNode ? 0 : scroll.scrollTop() ) ) * mod)
+			),
+			left: (
+				pos.left																// The absolute mouse position
+				+ this.offset.relative.left * mod										// Only for relative positioned nodes: Relative offset from element to offset parent
+				+ this.offset.parent.left * mod											// The offsetParent's offset without borders (offset + border)
+				- ($.browser.safari && this.cssPosition == 'fixed' ? 0 : ( this.cssPosition == 'fixed' ? -this.scrollParent.scrollLeft() : scrollIsRootNode ? 0 : scroll.scrollLeft() ) * mod)
+			)
+		};
+
+	},
+
+	_generatePosition: function(event) {
+
+		var o = this.options, scroll = this.cssPosition == 'absolute' && !(this.scrollParent[0] != document && $.ui.contains(this.scrollParent[0], this.offsetParent[0])) ? this.offsetParent : this.scrollParent, scrollIsRootNode = (/(html|body)/i).test(scroll[0].tagName);
+
+		// This is another very weird special case that only happens for relative elements:
+		// 1. If the css position is relative
+		// 2. and the scroll parent is the document or similar to the offset parent
+		// we have to refresh the relative offset during the scroll so there are no jumps
+		if(this.cssPosition == 'relative' && !(this.scrollParent[0] != document && this.scrollParent[0] != this.offsetParent[0])) {
+			this.offset.relative = this._getRelativeOffset();
+		}
+
+		var pageX = event.pageX;
+		var pageY = event.pageY;
+
+		/*
+		 * - Position constraining -
+		 * Constrain the position to a mix of grid, containment.
+		 */
+
+		if(this.originalPosition) { //If we are not dragging yet, we won't check for options
+
+			if(this.containment) {
+				if(event.pageX - this.offset.click.left < this.containment[0]) pageX = this.containment[0] + this.offset.click.left;
+				if(event.pageY - this.offset.click.top < this.containment[1]) pageY = this.containment[1] + this.offset.click.top;
+				if(event.pageX - this.offset.click.left > this.containment[2]) pageX = this.containment[2] + this.offset.click.left;
+				if(event.pageY - this.offset.click.top > this.containment[3]) pageY = this.containment[3] + this.offset.click.top;
+			}
+
+			if(o.grid) {
+				var top = this.originalPageY + Math.round((pageY - this.originalPageY) / o.grid[1]) * o.grid[1];
+				pageY = this.containment ? (!(top - this.offset.click.top < this.containment[1] || top - this.offset.click.top > this.containment[3]) ? top : (!(top - this.offset.click.top < this.containment[1]) ? top - o.grid[1] : top + o.grid[1])) : top;
+
+				var left = this.originalPageX + Math.round((pageX - this.originalPageX) / o.grid[0]) * o.grid[0];
+				pageX = this.containment ? (!(left - this.offset.click.left < this.containment[0] || left - this.offset.click.left > this.containment[2]) ? left : (!(left - this.offset.click.left < this.containment[0]) ? left - o.grid[0] : left + o.grid[0])) : left;
+			}
+
+		}
+
+		return {
+			top: (
+				pageY																// The absolute mouse position
+				- this.offset.click.top													// Click offset (relative to the element)
+				- this.offset.relative.top												// Only for relative positioned nodes: Relative offset from element to offset parent
+				- this.offset.parent.top												// The offsetParent's offset without borders (offset + border)
+				+ ($.browser.safari && this.cssPosition == 'fixed' ? 0 : ( this.cssPosition == 'fixed' ? -this.scrollParent.scrollTop() : ( scrollIsRootNode ? 0 : scroll.scrollTop() ) ))
+			),
+			left: (
+				pageX																// The absolute mouse position
+				- this.offset.click.left												// Click offset (relative to the element)
+				- this.offset.relative.left												// Only for relative positioned nodes: Relative offset from element to offset parent
+				- this.offset.parent.left												// The offsetParent's offset without borders (offset + border)
+				+ ($.browser.safari && this.cssPosition == 'fixed' ? 0 : ( this.cssPosition == 'fixed' ? -this.scrollParent.scrollLeft() : scrollIsRootNode ? 0 : scroll.scrollLeft() ))
+			)
+		};
+
+	},
+
+	_rearrange: function(event, i, a, hardRefresh) {
+
+		a ? a[0].appendChild(this.placeholder[0]) : i.item[0].parentNode.insertBefore(this.placeholder[0], (this.direction == 'down' ? i.item[0] : i.item[0].nextSibling));
+
+		//Various things done here to improve the performance:
+		// 1. we create a setTimeout, that calls refreshPositions
+		// 2. on the instance, we have a counter variable, that get's higher after every append
+		// 3. on the local scope, we copy the counter variable, and check in the timeout, if it's still the same
+		// 4. this lets only the last addition to the timeout stack through
+		this.counter = this.counter ? ++this.counter : 1;
+		var self = this, counter = this.counter;
+
+		window.setTimeout(function() {
+			if(counter == self.counter) self.refreshPositions(!hardRefresh); //Precompute after each DOM insertion, NOT on mousemove
+		},0);
+
+	},
+
+	_clear: function(event, noPropagation) {
+
+		this.reverting = false;
+		// We delay all events that have to be triggered to after the point where the placeholder has been removed and
+		// everything else normalized again
+		var delayedTriggers = [], self = this;
+
+		// We first have to update the dom position of the actual currentItem
+		// Note: don't do it if the current item is already removed (by a user), or it gets reappended (see #4088)
+		if(!this._noFinalSort && this.currentItem[0].parentNode) this.placeholder.before(this.currentItem);
+		this._noFinalSort = null;
+
+		if(this.helper[0] == this.currentItem[0]) {
+			for(var i in this._storedCSS) {
+				if(this._storedCSS[i] == 'auto' || this._storedCSS[i] == 'static') this._storedCSS[i] = '';
+			}
+			this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper");
+		} else {
+			this.currentItem.show();
+		}
+
+		if(this.fromOutside && !noPropagation) delayedTriggers.push(function(event) { this._trigger("receive", event, this._uiHash(this.fromOutside)); });
+		if((this.fromOutside || this.domPosition.prev != this.currentItem.prev().not(".ui-sortable-helper")[0] || this.domPosition.parent != this.currentItem.parent()[0]) && !noPropagation) delayedTriggers.push(function(event) { this._trigger("update", event, this._uiHash()); }); //Trigger update callback if the DOM position has changed
+		if(!$.ui.contains(this.element[0], this.currentItem[0])) { //Node was moved out of the current element
+			if(!noPropagation) delayedTriggers.push(function(event) { this._trigger("remove", event, this._uiHash()); });
+			for (var i = this.containers.length - 1; i >= 0; i--){
+				if($.ui.contains(this.containers[i].element[0], this.currentItem[0]) && !noPropagation) {
+					delayedTriggers.push((function(c) { return function(event) { c._trigger("receive", event, this._uiHash(this)); };  }).call(this, this.containers[i]));
+					delayedTriggers.push((function(c) { return function(event) { c._trigger("update", event, this._uiHash(this));  }; }).call(this, this.containers[i]));
+				}
+			};
+		};
+
+		//Post events to containers
+		for (var i = this.containers.length - 1; i >= 0; i--){
+			if(!noPropagation) delayedTriggers.push((function(c) { return function(event) { c._trigger("deactivate", event, this._uiHash(this)); };  }).call(this, this.containers[i]));
+			if(this.containers[i].containerCache.over) {
+				delayedTriggers.push((function(c) { return function(event) { c._trigger("out", event, this._uiHash(this)); };  }).call(this, this.containers[i]));
+				this.containers[i].containerCache.over = 0;
+			}
+		}
+
+		//Do what was originally in plugins
+		if(this._storedCursor) $('body').css("cursor", this._storedCursor); //Reset cursor
+		if(this._storedOpacity) this.helper.css("opacity", this._storedOpacity); //Reset opacity
+		if(this._storedZIndex) this.helper.css("zIndex", this._storedZIndex == 'auto' ? '' : this._storedZIndex); //Reset z-index
+
+		this.dragging = false;
+		if(this.cancelHelperRemoval) {
+			if(!noPropagation) {
+				this._trigger("beforeStop", event, this._uiHash());
+				for (var i=0; i < delayedTriggers.length; i++) { delayedTriggers[i].call(this, event); }; //Trigger all delayed events
+				this._trigger("stop", event, this._uiHash());
+			}
+			return false;
+		}
+
+		if(!noPropagation) this._trigger("beforeStop", event, this._uiHash());
+
+		//$(this.placeholder[0]).remove(); would have been the jQuery way - unfortunately, it unbinds ALL events from the original node!
+		this.placeholder[0].parentNode.removeChild(this.placeholder[0]);
+
+		if(this.helper[0] != this.currentItem[0]) this.helper.remove(); this.helper = null;
+
+		if(!noPropagation) {
+			for (var i=0; i < delayedTriggers.length; i++) { delayedTriggers[i].call(this, event); }; //Trigger all delayed events
+			this._trigger("stop", event, this._uiHash());
+		}
+
+		this.fromOutside = false;
+		return true;
+
+	},
+
+	_trigger: function() {
+		if ($.Widget.prototype._trigger.apply(this, arguments) === false) {
+			this.cancel();
+		}
+	},
+
+	_uiHash: function(inst) {
+		var self = inst || this;
+		return {
+			helper: self.helper,
+			placeholder: self.placeholder || $([]),
+			position: self.position,
+			originalPosition: self.originalPosition,
+			offset: self.positionAbs,
+			item: self.currentItem,
+			sender: inst ? inst.element : null
+		};
+	}
+
+});
+
+$.extend($.ui.sortable, {
+	version: "1.8.10"
+});
+
+})(jQuery);
diff --git a/js/ui/jquery.ui.tabs.js b/js/ui/jquery.ui.tabs.js
new file mode 100644
index 0000000000..c985230d1b
--- /dev/null
+++ b/js/ui/jquery.ui.tabs.js
@@ -0,0 +1,758 @@
+/*
+ * jQuery UI Tabs 1.8.10
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Tabs
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ *	jquery.ui.widget.js
+ */
+(function( $, undefined ) {
+
+var tabId = 0,
+	listId = 0;
+
+function getNextTabId() {
+	return ++tabId;
+}
+
+function getNextListId() {
+	return ++listId;
+}
+
+$.widget( "ui.tabs", {
+	options: {
+		add: null,
+		ajaxOptions: null,
+		cache: false,
+		cookie: null, // e.g. { expires: 7, path: '/', domain: 'jquery.com', secure: true }
+		collapsible: false,
+		disable: null,
+		disabled: [],
+		enable: null,
+		event: "click",
+		fx: null, // e.g. { height: 'toggle', opacity: 'toggle', duration: 200 }
+		idPrefix: "ui-tabs-",
+		load: null,
+		panelTemplate: "<div></div>",
+		remove: null,
+		select: null,
+		show: null,
+		spinner: "<em>Loading&#8230;</em>",
+		tabTemplate: "<li><a href='#{href}'><span>#{label}</span></a></li>"
+	},
+
+	_create: function() {
+		this._tabify( true );
+	},
+
+	_setOption: function( key, value ) {
+		if ( key == "selected" ) {
+			if (this.options.collapsible && value == this.options.selected ) {
+				return;
+			}
+			this.select( value );
+		} else {
+			this.options[ key ] = value;
+			this._tabify();
+		}
+	},
+
+	_tabId: function( a ) {
+		return a.title && a.title.replace( /\s/g, "_" ).replace( /[^\w\u00c0-\uFFFF-]/g, "" ) ||
+			this.options.idPrefix + getNextTabId();
+	},
+
+	_sanitizeSelector: function( hash ) {
+		// we need this because an id may contain a ":"
+		return hash.replace( /:/g, "\\:" );
+	},
+
+	_cookie: function() {
+		var cookie = this.cookie ||
+			( this.cookie = this.options.cookie.name || "ui-tabs-" + getNextListId() );
+		return $.cookie.apply( null, [ cookie ].concat( $.makeArray( arguments ) ) );
+	},
+
+	_ui: function( tab, panel ) {
+		return {
+			tab: tab,
+			panel: panel,
+			index: this.anchors.index( tab )
+		};
+	},
+
+	_cleanup: function() {
+		// restore all former loading tabs labels
+		this.lis.filter( ".ui-state-processing" )
+			.removeClass( "ui-state-processing" )
+			.find( "span:data(label.tabs)" )
+				.each(function() {
+					var el = $( this );
+					el.html( el.data( "label.tabs" ) ).removeData( "label.tabs" );
+				});
+	},
+
+	_tabify: function( init ) {
+		var self = this,
+			o = this.options,
+			fragmentId = /^#.+/; // Safari 2 reports '#' for an empty hash
+
+		this.list = this.element.find( "ol,ul" ).eq( 0 );
+		this.lis = $( " > li:has(a[href])", this.list );
+		this.anchors = this.lis.map(function() {
+			return $( "a", this )[ 0 ];
+		});
+		this.panels = $( [] );
+
+		this.anchors.each(function( i, a ) {
+			var href = $( a ).attr( "href" );
+			// For dynamically created HTML that contains a hash as href IE < 8 expands
+			// such href to the full page url with hash and then misinterprets tab as ajax.
+			// Same consideration applies for an added tab with a fragment identifier
+			// since a[href=#fragment-identifier] does unexpectedly not match.
+			// Thus normalize href attribute...
+			var hrefBase = href.split( "#" )[ 0 ],
+				baseEl;
+			if ( hrefBase && ( hrefBase === location.toString().split( "#" )[ 0 ] ||
+					( baseEl = $( "base" )[ 0 ]) && hrefBase === baseEl.href ) ) {
+				href = a.hash;
+				a.href = href;
+			}
+
+			// inline tab
+			if ( fragmentId.test( href ) ) {
+				self.panels = self.panels.add( self.element.find( self._sanitizeSelector( href ) ) );
+			// remote tab
+			// prevent loading the page itself if href is just "#"
+			} else if ( href && href !== "#" ) {
+				// required for restore on destroy
+				$.data( a, "href.tabs", href );
+
+				// TODO until #3808 is fixed strip fragment identifier from url
+				// (IE fails to load from such url)
+				$.data( a, "load.tabs", href.replace( /#.*$/, "" ) );
+
+				var id = self._tabId( a );
+				a.href = "#" + id;
+				var $panel = self.element.find( "#" + id );
+				if ( !$panel.length ) {
+					$panel = $( o.panelTemplate )
+						.attr( "id", id )
+						.addClass( "ui-tabs-panel ui-widget-content ui-corner-bottom" )
+						.insertAfter( self.panels[ i - 1 ] || self.list );
+					$panel.data( "destroy.tabs", true );
+				}
+				self.panels = self.panels.add( $panel );
+			// invalid tab href
+			} else {
+				o.disabled.push( i );
+			}
+		});
+
+		// initialization from scratch
+		if ( init ) {
+			// attach necessary classes for styling
+			this.element.addClass( "ui-tabs ui-widget ui-widget-content ui-corner-all" );
+			this.list.addClass( "ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all" );
+			this.lis.addClass( "ui-state-default ui-corner-top" );
+			this.panels.addClass( "ui-tabs-panel ui-widget-content ui-corner-bottom" );
+
+			// Selected tab
+			// use "selected" option or try to retrieve:
+			// 1. from fragment identifier in url
+			// 2. from cookie
+			// 3. from selected class attribute on <li>
+			if ( o.selected === undefined ) {
+				if ( location.hash ) {
+					this.anchors.each(function( i, a ) {
+						if ( a.hash == location.hash ) {
+							o.selected = i;
+							return false;
+						}
+					});
+				}
+				if ( typeof o.selected !== "number" && o.cookie ) {
+					o.selected = parseInt( self._cookie(), 10 );
+				}
+				if ( typeof o.selected !== "number" && this.lis.filter( ".ui-tabs-selected" ).length ) {
+					o.selected = this.lis.index( this.lis.filter( ".ui-tabs-selected" ) );
+				}
+				o.selected = o.selected || ( this.lis.length ? 0 : -1 );
+			} else if ( o.selected === null ) { // usage of null is deprecated, TODO remove in next release
+				o.selected = -1;
+			}
+
+			// sanity check - default to first tab...
+			o.selected = ( ( o.selected >= 0 && this.anchors[ o.selected ] ) || o.selected < 0 )
+				? o.selected
+				: 0;
+
+			// Take disabling tabs via class attribute from HTML
+			// into account and update option properly.
+			// A selected tab cannot become disabled.
+			o.disabled = $.unique( o.disabled.concat(
+				$.map( this.lis.filter( ".ui-state-disabled" ), function( n, i ) {
+					return self.lis.index( n );
+				})
+			) ).sort();
+
+			if ( $.inArray( o.selected, o.disabled ) != -1 ) {
+				o.disabled.splice( $.inArray( o.selected, o.disabled ), 1 );
+			}
+
+			// highlight selected tab
+			this.panels.addClass( "ui-tabs-hide" );
+			this.lis.removeClass( "ui-tabs-selected ui-state-active" );
+			// check for length avoids error when initializing empty list
+			if ( o.selected >= 0 && this.anchors.length ) {
+				self.element.find( self._sanitizeSelector( self.anchors[ o.selected ].hash ) ).removeClass( "ui-tabs-hide" );
+				this.lis.eq( o.selected ).addClass( "ui-tabs-selected ui-state-active" );
+
+				// seems to be expected behavior that the show callback is fired
+				self.element.queue( "tabs", function() {
+					self._trigger( "show", null,
+						self._ui( self.anchors[ o.selected ], self.element.find( self._sanitizeSelector( self.anchors[ o.selected ].hash ) )[ 0 ] ) );
+				});
+
+				this.load( o.selected );
+			}
+
+			// clean up to avoid memory leaks in certain versions of IE 6
+			// TODO: namespace this event
+			$( window ).bind( "unload", function() {
+				self.lis.add( self.anchors ).unbind( ".tabs" );
+				self.lis = self.anchors = self.panels = null;
+			});
+		// update selected after add/remove
+		} else {
+			o.selected = this.lis.index( this.lis.filter( ".ui-tabs-selected" ) );
+		}
+
+		// update collapsible
+		// TODO: use .toggleClass()
+		this.element[ o.collapsible ? "addClass" : "removeClass" ]( "ui-tabs-collapsible" );
+
+		// set or update cookie after init and add/remove respectively
+		if ( o.cookie ) {
+			this._cookie( o.selected, o.cookie );
+		}
+
+		// disable tabs
+		for ( var i = 0, li; ( li = this.lis[ i ] ); i++ ) {
+			$( li )[ $.inArray( i, o.disabled ) != -1 &&
+				// TODO: use .toggleClass()
+				!$( li ).hasClass( "ui-tabs-selected" ) ? "addClass" : "removeClass" ]( "ui-state-disabled" );
+		}
+
+		// reset cache if switching from cached to not cached
+		if ( o.cache === false ) {
+			this.anchors.removeData( "cache.tabs" );
+		}
+
+		// remove all handlers before, tabify may run on existing tabs after add or option change
+		this.lis.add( this.anchors ).unbind( ".tabs" );
+
+		if ( o.event !== "mouseover" ) {
+			var addState = function( state, el ) {
+				if ( el.is( ":not(.ui-state-disabled)" ) ) {
+					el.addClass( "ui-state-" + state );
+				}
+			};
+			var removeState = function( state, el ) {
+				el.removeClass( "ui-state-" + state );
+			};
+			this.lis.bind( "mouseover.tabs" , function() {
+				addState( "hover", $( this ) );
+			});
+			this.lis.bind( "mouseout.tabs", function() {
+				removeState( "hover", $( this ) );
+			});
+			this.anchors.bind( "focus.tabs", function() {
+				addState( "focus", $( this ).closest( "li" ) );
+			});
+			this.anchors.bind( "blur.tabs", function() {
+				removeState( "focus", $( this ).closest( "li" ) );
+			});
+		}
+
+		// set up animations
+		var hideFx, showFx;
+		if ( o.fx ) {
+			if ( $.isArray( o.fx ) ) {
+				hideFx = o.fx[ 0 ];
+				showFx = o.fx[ 1 ];
+			} else {
+				hideFx = showFx = o.fx;
+			}
+		}
+
+		// Reset certain styles left over from animation
+		// and prevent IE's ClearType bug...
+		function resetStyle( $el, fx ) {
+			$el.css( "display", "" );
+			if ( !$.support.opacity && fx.opacity ) {
+				$el[ 0 ].style.removeAttribute( "filter" );
+			}
+		}
+
+		// Show a tab...
+		var showTab = showFx
+			? function( clicked, $show ) {
+				$( clicked ).closest( "li" ).addClass( "ui-tabs-selected ui-state-active" );
+				$show.hide().removeClass( "ui-tabs-hide" ) // avoid flicker that way
+					.animate( showFx, showFx.duration || "normal", function() {
+						resetStyle( $show, showFx );
+						self._trigger( "show", null, self._ui( clicked, $show[ 0 ] ) );
+					});
+			}
+			: function( clicked, $show ) {
+				$( clicked ).closest( "li" ).addClass( "ui-tabs-selected ui-state-active" );
+				$show.removeClass( "ui-tabs-hide" );
+				self._trigger( "show", null, self._ui( clicked, $show[ 0 ] ) );
+			};
+
+		// Hide a tab, $show is optional...
+		var hideTab = hideFx
+			? function( clicked, $hide ) {
+				$hide.animate( hideFx, hideFx.duration || "normal", function() {
+					self.lis.removeClass( "ui-tabs-selected ui-state-active" );
+					$hide.addClass( "ui-tabs-hide" );
+					resetStyle( $hide, hideFx );
+					self.element.dequeue( "tabs" );
+				});
+			}
+			: function( clicked, $hide, $show ) {
+				self.lis.removeClass( "ui-tabs-selected ui-state-active" );
+				$hide.addClass( "ui-tabs-hide" );
+				self.element.dequeue( "tabs" );
+			};
+
+		// attach tab event handler, unbind to avoid duplicates from former tabifying...
+		this.anchors.bind( o.event + ".tabs", function() {
+			var el = this,
+				$li = $(el).closest( "li" ),
+				$hide = self.panels.filter( ":not(.ui-tabs-hide)" ),
+				$show = self.element.find( self._sanitizeSelector( el.hash ) );
+
+			// If tab is already selected and not collapsible or tab disabled or
+			// or is already loading or click callback returns false stop here.
+			// Check if click handler returns false last so that it is not executed
+			// for a disabled or loading tab!
+			if ( ( $li.hasClass( "ui-tabs-selected" ) && !o.collapsible) ||
+				$li.hasClass( "ui-state-disabled" ) ||
+				$li.hasClass( "ui-state-processing" ) ||
+				self.panels.filter( ":animated" ).length ||
+				self._trigger( "select", null, self._ui( this, $show[ 0 ] ) ) === false ) {
+				this.blur();
+				return false;
+			}
+
+			o.selected = self.anchors.index( this );
+
+			self.abort();
+
+			// if tab may be closed
+			if ( o.collapsible ) {
+				if ( $li.hasClass( "ui-tabs-selected" ) ) {
+					o.selected = -1;
+
+					if ( o.cookie ) {
+						self._cookie( o.selected, o.cookie );
+					}
+
+					self.element.queue( "tabs", function() {
+						hideTab( el, $hide );
+					}).dequeue( "tabs" );
+
+					this.blur();
+					return false;
+				} else if ( !$hide.length ) {
+					if ( o.cookie ) {
+						self._cookie( o.selected, o.cookie );
+					}
+
+					self.element.queue( "tabs", function() {
+						showTab( el, $show );
+					});
+
+					// TODO make passing in node possible, see also http://dev.jqueryui.com/ticket/3171
+					self.load( self.anchors.index( this ) );
+
+					this.blur();
+					return false;
+				}
+			}
+
+			if ( o.cookie ) {
+				self._cookie( o.selected, o.cookie );
+			}
+
+			// show new tab
+			if ( $show.length ) {
+				if ( $hide.length ) {
+					self.element.queue( "tabs", function() {
+						hideTab( el, $hide );
+					});
+				}
+				self.element.queue( "tabs", function() {
+					showTab( el, $show );
+				});
+
+				self.load( self.anchors.index( this ) );
+			} else {
+				throw "jQuery UI Tabs: Mismatching fragment identifier.";
+			}
+
+			// Prevent IE from keeping other link focussed when using the back button
+			// and remove dotted border from clicked link. This is controlled via CSS
+			// in modern browsers; blur() removes focus from address bar in Firefox
+			// which can become a usability and annoying problem with tabs('rotate').
+			if ( $.browser.msie ) {
+				this.blur();
+			}
+		});
+
+		// disable click in any case
+		this.anchors.bind( "click.tabs", function(){
+			return false;
+		});
+	},
+
+    _getIndex: function( index ) {
+		// meta-function to give users option to provide a href string instead of a numerical index.
+		// also sanitizes numerical indexes to valid values.
+		if ( typeof index == "string" ) {
+			index = this.anchors.index( this.anchors.filter( "[href$=" + index + "]" ) );
+		}
+
+		return index;
+	},
+
+	destroy: function() {
+		var o = this.options;
+
+		this.abort();
+
+		this.element
+			.unbind( ".tabs" )
+			.removeClass( "ui-tabs ui-widget ui-widget-content ui-corner-all ui-tabs-collapsible" )
+			.removeData( "tabs" );
+
+		this.list.removeClass( "ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all" );
+
+		this.anchors.each(function() {
+			var href = $.data( this, "href.tabs" );
+			if ( href ) {
+				this.href = href;
+			}
+			var $this = $( this ).unbind( ".tabs" );
+			$.each( [ "href", "load", "cache" ], function( i, prefix ) {
+				$this.removeData( prefix + ".tabs" );
+			});
+		});
+
+		this.lis.unbind( ".tabs" ).add( this.panels ).each(function() {
+			if ( $.data( this, "destroy.tabs" ) ) {
+				$( this ).remove();
+			} else {
+				$( this ).removeClass([
+					"ui-state-default",
+					"ui-corner-top",
+					"ui-tabs-selected",
+					"ui-state-active",
+					"ui-state-hover",
+					"ui-state-focus",
+					"ui-state-disabled",
+					"ui-tabs-panel",
+					"ui-widget-content",
+					"ui-corner-bottom",
+					"ui-tabs-hide"
+				].join( " " ) );
+			}
+		});
+
+		if ( o.cookie ) {
+			this._cookie( null, o.cookie );
+		}
+
+		return this;
+	},
+
+	add: function( url, label, index ) {
+		if ( index === undefined ) {
+			index = this.anchors.length;
+		}
+
+		var self = this,
+			o = this.options,
+			$li = $( o.tabTemplate.replace( /#\{href\}/g, url ).replace( /#\{label\}/g, label ) ),
+			id = !url.indexOf( "#" ) ? url.replace( "#", "" ) : this._tabId( $( "a", $li )[ 0 ] );
+
+		$li.addClass( "ui-state-default ui-corner-top" ).data( "destroy.tabs", true );
+
+		// try to find an existing element before creating a new one
+		var $panel = self.element.find( "#" + id );
+		if ( !$panel.length ) {
+			$panel = $( o.panelTemplate )
+				.attr( "id", id )
+				.data( "destroy.tabs", true );
+		}
+		$panel.addClass( "ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide" );
+
+		if ( index >= this.lis.length ) {
+			$li.appendTo( this.list );
+			$panel.appendTo( this.list[ 0 ].parentNode );
+		} else {
+			$li.insertBefore( this.lis[ index ] );
+			$panel.insertBefore( this.panels[ index ] );
+		}
+
+		o.disabled = $.map( o.disabled, function( n, i ) {
+			return n >= index ? ++n : n;
+		});
+
+		this._tabify();
+
+		if ( this.anchors.length == 1 ) {
+			o.selected = 0;
+			$li.addClass( "ui-tabs-selected ui-state-active" );
+			$panel.removeClass( "ui-tabs-hide" );
+			this.element.queue( "tabs", function() {
+				self._trigger( "show", null, self._ui( self.anchors[ 0 ], self.panels[ 0 ] ) );
+			});
+
+			this.load( 0 );
+		}
+
+		this._trigger( "add", null, this._ui( this.anchors[ index ], this.panels[ index ] ) );
+		return this;
+	},
+
+	remove: function( index ) {
+		index = this._getIndex( index );
+		var o = this.options,
+			$li = this.lis.eq( index ).remove(),
+			$panel = this.panels.eq( index ).remove();
+
+		// If selected tab was removed focus tab to the right or
+		// in case the last tab was removed the tab to the left.
+		if ( $li.hasClass( "ui-tabs-selected" ) && this.anchors.length > 1) {
+			this.select( index + ( index + 1 < this.anchors.length ? 1 : -1 ) );
+		}
+
+		o.disabled = $.map(
+			$.grep( o.disabled, function(n, i) {
+				return n != index;
+			}),
+			function( n, i ) {
+				return n >= index ? --n : n;
+			});
+
+		this._tabify();
+
+		this._trigger( "remove", null, this._ui( $li.find( "a" )[ 0 ], $panel[ 0 ] ) );
+		return this;
+	},
+
+	enable: function( index ) {
+		index = this._getIndex( index );
+		var o = this.options;
+		if ( $.inArray( index, o.disabled ) == -1 ) {
+			return;
+		}
+
+		this.lis.eq( index ).removeClass( "ui-state-disabled" );
+		o.disabled = $.grep( o.disabled, function( n, i ) {
+			return n != index;
+		});
+
+		this._trigger( "enable", null, this._ui( this.anchors[ index ], this.panels[ index ] ) );
+		return this;
+	},
+
+	disable: function( index ) {
+		index = this._getIndex( index );
+		var self = this, o = this.options;
+		// cannot disable already selected tab
+		if ( index != o.selected ) {
+			this.lis.eq( index ).addClass( "ui-state-disabled" );
+
+			o.disabled.push( index );
+			o.disabled.sort();
+
+			this._trigger( "disable", null, this._ui( this.anchors[ index ], this.panels[ index ] ) );
+		}
+
+		return this;
+	},
+
+	select: function( index ) {
+		index = this._getIndex( index );
+		if ( index == -1 ) {
+			if ( this.options.collapsible && this.options.selected != -1 ) {
+				index = this.options.selected;
+			} else {
+				return this;
+			}
+		}
+		this.anchors.eq( index ).trigger( this.options.event + ".tabs" );
+		return this;
+	},
+
+	load: function( index ) {
+		index = this._getIndex( index );
+		var self = this,
+			o = this.options,
+			a = this.anchors.eq( index )[ 0 ],
+			url = $.data( a, "load.tabs" );
+
+		this.abort();
+
+		// not remote or from cache
+		if ( !url || this.element.queue( "tabs" ).length !== 0 && $.data( a, "cache.tabs" ) ) {
+			this.element.dequeue( "tabs" );
+			return;
+		}
+
+		// load remote from here on
+		this.lis.eq( index ).addClass( "ui-state-processing" );
+
+		if ( o.spinner ) {
+			var span = $( "span", a );
+			span.data( "label.tabs", span.html() ).html( o.spinner );
+		}
+
+		this.xhr = $.ajax( $.extend( {}, o.ajaxOptions, {
+			url: url,
+			success: function( r, s ) {
+				self.element.find( self._sanitizeSelector( a.hash ) ).html( r );
+
+				// take care of tab labels
+				self._cleanup();
+
+				if ( o.cache ) {
+					$.data( a, "cache.tabs", true );
+				}
+
+				self._trigger( "load", null, self._ui( self.anchors[ index ], self.panels[ index ] ) );
+				try {
+					o.ajaxOptions.success( r, s );
+				}
+				catch ( e ) {}
+			},
+			error: function( xhr, s, e ) {
+				// take care of tab labels
+				self._cleanup();
+
+				self._trigger( "load", null, self._ui( self.anchors[ index ], self.panels[ index ] ) );
+				try {
+					// Passing index avoid a race condition when this method is
+					// called after the user has selected another tab.
+					// Pass the anchor that initiated this request allows
+					// loadError to manipulate the tab content panel via $(a.hash)
+					o.ajaxOptions.error( xhr, s, index, a );
+				}
+				catch ( e ) {}
+			}
+		} ) );
+
+		// last, so that load event is fired before show...
+		self.element.dequeue( "tabs" );
+
+		return this;
+	},
+
+	abort: function() {
+		// stop possibly running animations
+		this.element.queue( [] );
+		this.panels.stop( false, true );
+
+		// "tabs" queue must not contain more than two elements,
+		// which are the callbacks for the latest clicked tab...
+		this.element.queue( "tabs", this.element.queue( "tabs" ).splice( -2, 2 ) );
+
+		// terminate pending requests from other tabs
+		if ( this.xhr ) {
+			this.xhr.abort();
+			delete this.xhr;
+		}
+
+		// take care of tab labels
+		this._cleanup();
+		return this;
+	},
+
+	url: function( index, url ) {
+		this.anchors.eq( index ).removeData( "cache.tabs" ).data( "load.tabs", url );
+		return this;
+	},
+
+	length: function() {
+		return this.anchors.length;
+	}
+});
+
+$.extend( $.ui.tabs, {
+	version: "1.8.10"
+});
+
+/*
+ * Tabs Extensions
+ */
+
+/*
+ * Rotate
+ */
+$.extend( $.ui.tabs.prototype, {
+	rotation: null,
+	rotate: function( ms, continuing ) {
+		var self = this,
+			o = this.options;
+
+		var rotate = self._rotate || ( self._rotate = function( e ) {
+			clearTimeout( self.rotation );
+			self.rotation = setTimeout(function() {
+				var t = o.selected;
+				self.select( ++t < self.anchors.length ? t : 0 );
+			}, ms );
+			
+			if ( e ) {
+				e.stopPropagation();
+			}
+		});
+
+		var stop = self._unrotate || ( self._unrotate = !continuing
+			? function(e) {
+				if (e.clientX) { // in case of a true click
+					self.rotate(null);
+				}
+			}
+			: function( e ) {
+				t = o.selected;
+				rotate();
+			});
+
+		// start rotation
+		if ( ms ) {
+			this.element.bind( "tabsshow", rotate );
+			this.anchors.bind( o.event + ".tabs", stop );
+			rotate();
+		// stop rotation
+		} else {
+			clearTimeout( self.rotation );
+			this.element.unbind( "tabsshow", rotate );
+			this.anchors.unbind( o.event + ".tabs", stop );
+			delete this._rotate;
+			delete this._unrotate;
+		}
+
+		return this;
+	}
+});
+
+})( jQuery );
diff --git a/js/ui/jquery.ui.widget.js b/js/ui/jquery.ui.widget.js
new file mode 100644
index 0000000000..e8f4e9854b
--- /dev/null
+++ b/js/ui/jquery.ui.widget.js
@@ -0,0 +1,262 @@
+/*!
+ * jQuery UI Widget 1.8.10
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Widget
+ */
+(function( $, undefined ) {
+
+// jQuery 1.4+
+if ( $.cleanData ) {
+	var _cleanData = $.cleanData;
+	$.cleanData = function( elems ) {
+		for ( var i = 0, elem; (elem = elems[i]) != null; i++ ) {
+			$( elem ).triggerHandler( "remove" );
+		}
+		_cleanData( elems );
+	};
+} else {
+	var _remove = $.fn.remove;
+	$.fn.remove = function( selector, keepData ) {
+		return this.each(function() {
+			if ( !keepData ) {
+				if ( !selector || $.filter( selector, [ this ] ).length ) {
+					$( "*", this ).add( [ this ] ).each(function() {
+						$( this ).triggerHandler( "remove" );
+					});
+				}
+			}
+			return _remove.call( $(this), selector, keepData );
+		});
+	};
+}
+
+$.widget = function( name, base, prototype ) {
+	var namespace = name.split( "." )[ 0 ],
+		fullName;
+	name = name.split( "." )[ 1 ];
+	fullName = namespace + "-" + name;
+
+	if ( !prototype ) {
+		prototype = base;
+		base = $.Widget;
+	}
+
+	// create selector for plugin
+	$.expr[ ":" ][ fullName ] = function( elem ) {
+		return !!$.data( elem, name );
+	};
+
+	$[ namespace ] = $[ namespace ] || {};
+	$[ namespace ][ name ] = function( options, element ) {
+		// allow instantiation without initializing for simple inheritance
+		if ( arguments.length ) {
+			this._createWidget( options, element );
+		}
+	};
+
+	var basePrototype = new base();
+	// we need to make the options hash a property directly on the new instance
+	// otherwise we'll modify the options hash on the prototype that we're
+	// inheriting from
+//	$.each( basePrototype, function( key, val ) {
+//		if ( $.isPlainObject(val) ) {
+//			basePrototype[ key ] = $.extend( {}, val );
+//		}
+//	});
+	basePrototype.options = $.extend( true, {}, basePrototype.options );
+	$[ namespace ][ name ].prototype = $.extend( true, basePrototype, {
+		namespace: namespace,
+		widgetName: name,
+		widgetEventPrefix: $[ namespace ][ name ].prototype.widgetEventPrefix || name,
+		widgetBaseClass: fullName
+	}, prototype );
+
+	$.widget.bridge( name, $[ namespace ][ name ] );
+};
+
+$.widget.bridge = function( name, object ) {
+	$.fn[ name ] = function( options ) {
+		var isMethodCall = typeof options === "string",
+			args = Array.prototype.slice.call( arguments, 1 ),
+			returnValue = this;
+
+		// allow multiple hashes to be passed on init
+		options = !isMethodCall && args.length ?
+			$.extend.apply( null, [ true, options ].concat(args) ) :
+			options;
+
+		// prevent calls to internal methods
+		if ( isMethodCall && options.charAt( 0 ) === "_" ) {
+			return returnValue;
+		}
+
+		if ( isMethodCall ) {
+			this.each(function() {
+				var instance = $.data( this, name ),
+					methodValue = instance && $.isFunction( instance[options] ) ?
+						instance[ options ].apply( instance, args ) :
+						instance;
+				// TODO: add this back in 1.9 and use $.error() (see #5972)
+//				if ( !instance ) {
+//					throw "cannot call methods on " + name + " prior to initialization; " +
+//						"attempted to call method '" + options + "'";
+//				}
+//				if ( !$.isFunction( instance[options] ) ) {
+//					throw "no such method '" + options + "' for " + name + " widget instance";
+//				}
+//				var methodValue = instance[ options ].apply( instance, args );
+				if ( methodValue !== instance && methodValue !== undefined ) {
+					returnValue = methodValue;
+					return false;
+				}
+			});
+		} else {
+			this.each(function() {
+				var instance = $.data( this, name );
+				if ( instance ) {
+					instance.option( options || {} )._init();
+				} else {
+					$.data( this, name, new object( options, this ) );
+				}
+			});
+		}
+
+		return returnValue;
+	};
+};
+
+$.Widget = function( options, element ) {
+	// allow instantiation without initializing for simple inheritance
+	if ( arguments.length ) {
+		this._createWidget( options, element );
+	}
+};
+
+$.Widget.prototype = {
+	widgetName: "widget",
+	widgetEventPrefix: "",
+	options: {
+		disabled: false
+	},
+	_createWidget: function( options, element ) {
+		// $.widget.bridge stores the plugin instance, but we do it anyway
+		// so that it's stored even before the _create function runs
+		$.data( element, this.widgetName, this );
+		this.element = $( element );
+		this.options = $.extend( true, {},
+			this.options,
+			this._getCreateOptions(),
+			options );
+
+		var self = this;
+		this.element.bind( "remove." + this.widgetName, function() {
+			self.destroy();
+		});
+
+		this._create();
+		this._trigger( "create" );
+		this._init();
+	},
+	_getCreateOptions: function() {
+		return $.metadata && $.metadata.get( this.element[0] )[ this.widgetName ];
+	},
+	_create: function() {},
+	_init: function() {},
+
+	destroy: function() {
+		this.element
+			.unbind( "." + this.widgetName )
+			.removeData( this.widgetName );
+		this.widget()
+			.unbind( "." + this.widgetName )
+			.removeAttr( "aria-disabled" )
+			.removeClass(
+				this.widgetBaseClass + "-disabled " +
+				"ui-state-disabled" );
+	},
+
+	widget: function() {
+		return this.element;
+	},
+
+	option: function( key, value ) {
+		var options = key;
+
+		if ( arguments.length === 0 ) {
+			// don't return a reference to the internal hash
+			return $.extend( {}, this.options );
+		}
+
+		if  (typeof key === "string" ) {
+			if ( value === undefined ) {
+				return this.options[ key ];
+			}
+			options = {};
+			options[ key ] = value;
+		}
+
+		this._setOptions( options );
+
+		return this;
+	},
+	_setOptions: function( options ) {
+		var self = this;
+		$.each( options, function( key, value ) {
+			self._setOption( key, value );
+		});
+
+		return this;
+	},
+	_setOption: function( key, value ) {
+		this.options[ key ] = value;
+
+		if ( key === "disabled" ) {
+			this.widget()
+				[ value ? "addClass" : "removeClass"](
+					this.widgetBaseClass + "-disabled" + " " +
+					"ui-state-disabled" )
+				.attr( "aria-disabled", value );
+		}
+
+		return this;
+	},
+
+	enable: function() {
+		return this._setOption( "disabled", false );
+	},
+	disable: function() {
+		return this._setOption( "disabled", true );
+	},
+
+	_trigger: function( type, event, data ) {
+		var callback = this.options[ type ];
+
+		event = $.Event( event );
+		event.type = ( type === this.widgetEventPrefix ?
+			type :
+			this.widgetEventPrefix + type ).toLowerCase();
+		data = data || {};
+
+		// copy original event properties over to the new event
+		// this would happen if we could call $.event.fix instead of $.Event
+		// but we don't have a way to force an event to be fixed multiple times
+		if ( event.originalEvent ) {
+			for ( var i = $.event.props.length, prop; i; ) {
+				prop = $.event.props[ --i ];
+				event[ prop ] = event.originalEvent[ prop ];
+			}
+		}
+
+		this.element.trigger( event, data );
+
+		return !( $.isFunction(callback) &&
+			callback.call( this.element[0], event, data ) === false ||
+			event.isDefaultPrevented() );
+	}
+};
+
+})( jQuery );

From 5c26f36a7c8106ffce82940c09e9af0deb2e29c1 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Thu, 10 Mar 2011 10:19:50 -0600
Subject: [PATCH 494/655] slim down the name of the jquery file

---
 js/{jquery-ui-1.8.10.custom.min.js => jquery-ui.min.js} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename js/{jquery-ui-1.8.10.custom.min.js => jquery-ui.min.js} (100%)

diff --git a/js/jquery-ui-1.8.10.custom.min.js b/js/jquery-ui.min.js
similarity index 100%
rename from js/jquery-ui-1.8.10.custom.min.js
rename to js/jquery-ui.min.js

From a5daed0aa816c4ecbb6857cf747cb2cbf45c8db5 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Thu, 10 Mar 2011 10:28:08 -0600
Subject: [PATCH 495/655] load jquery-ui css and js by default

---
 .../smoothness/{jquery-ui-1.8.10.custom.css => jquery-ui.css}  | 0
 lib/action.php                                                 | 3 +++
 2 files changed, 3 insertions(+)
 rename js/css/smoothness/{jquery-ui-1.8.10.custom.css => jquery-ui.css} (100%)

diff --git a/js/css/smoothness/jquery-ui-1.8.10.custom.css b/js/css/smoothness/jquery-ui.css
similarity index 100%
rename from js/css/smoothness/jquery-ui-1.8.10.custom.css
rename to js/css/smoothness/jquery-ui.css
diff --git a/lib/action.php b/lib/action.php
index 0ba4b8b8ff..7614f4be3a 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -222,6 +222,8 @@ class Action extends HTMLOutputter // lawsuit
                 Event::handle('EndShowLaconicaStyles', array($this));
             }
 
+            $this->cssLink(common_path('js/css/smoothness/jquery-ui.css'));
+
             if (Event::handle('StartShowUAStyles', array($this))) {
                 $this->comment('[if IE]><link rel="stylesheet" type="text/css" '.
                                'href="'.Theme::path('css/ie.css', 'base').'?version='.STATUSNET_VERSION.'" /><![endif]');
@@ -295,6 +297,7 @@ class Action extends HTMLOutputter // lawsuit
             if (Event::handle('StartShowJQueryScripts', array($this))) {
                 $this->script('jquery.min.js');
                 $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->script('jquery.joverlay.min.js');

From c4bada902296ec8d77c232a0a638b0dd60aa1bd0 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Thu, 10 Mar 2011 10:53:11 -0600
Subject: [PATCH 496/655] use jquery-ui for input_forms tabset

---
 js/util.js                   | 16 ----------------
 lib/action.php               |  7 ++++---
 theme/rebase/css/display.css | 12 ------------
 3 files changed, 4 insertions(+), 31 deletions(-)

diff --git a/js/util.js b/js/util.js
index cc95a08bf5..67e28485e4 100644
--- a/js/util.js
+++ b/js/util.js
@@ -1276,22 +1276,6 @@ var SN = { // StatusNet
 
             return false;
         },
-
-        /**
-         * Switch to another active input sub-form.
-         * This will hide the current form (if any), show the new one, and
-         * update the input type tab selection state.
-         *
-         * @param {String} tag
-         */
-	switchInputFormTab: function(tag) {
-	    // The one that's current isn't current anymore
-	    $('.input_form_nav_tab.current').removeClass('current');
-	    $('#input_form_nav_'+tag).addClass('current');
-
-	    $('.input_form.current').removeClass('current');
-	    $('#input_form_'+tag).addClass('current');
-	}
     },
 
     Init: {
diff --git a/lib/action.php b/lib/action.php
index 7614f4be3a..686b512a2c 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -315,6 +315,7 @@ class Action extends HTMLOutputter // lawsuit
                 $this->showScriptMessages();
                 // Frame-busting code to avoid clickjacking attacks.
                 $this->inlineScript('if (window.top !== window.self) { window.top.location.href = window.self.location.href; }');
+                $this->inlineScript('$(document).ready(function(){ $(\'#input_forms\').tabs(); });');
                 Event::handle('EndShowStatusNetScripts', array($this));
                 Event::handle('EndShowLaconicaScripts', array($this));
             }
@@ -592,7 +593,7 @@ class Action extends HTMLOutputter // lawsuit
     {
         $tabs = array('status' => _('Status'));
 
-        $this->elementStart('div', 'input_forms');
+        $this->elementStart('div', array('id' => 'input_forms'));
 
         if (Event::handle('StartShowEntryForms', array(&$tabs))) {
 
@@ -611,7 +612,7 @@ class Action extends HTMLOutputter // lawsuit
                 $this->elementStart('li', $attrs);
 
                 $this->element('a',
-                               array('href' => 'javascript:SN.U.switchInputFormTab("'.$tag.'")'),
+                               array('href' => '#input_forms-'.$tag),
                                $title);
                 $this->elementEnd('li');
             }
@@ -621,7 +622,7 @@ class Action extends HTMLOutputter // lawsuit
             foreach ($tabs as $tag => $title) {
 
                 $attrs = array('class' => 'input_form',
-                               'id' => 'input_form_'.$tag);
+                               'id' => 'input_forms-'.$tag);
 
                 if ($tag == 'status') {
                     $attrs['class'] .= ' current';
diff --git a/theme/rebase/css/display.css b/theme/rebase/css/display.css
index c1ac1e8f4d..f7a9486f24 100644
--- a/theme/rebase/css/display.css
+++ b/theme/rebase/css/display.css
@@ -1962,18 +1962,6 @@ margin-bottom:18px;
 padding-left:20px;
 }
 
-#input_form_nav { 
-    list-style-type: none;
-}
-
-#input_form_nav li { 
-    display:inline;
-}
-
-.input_form_nav_tab.current {
-    text-decoration: underline;
-}
-
 .input_form { 
     display: none;
 }

From 39f8d2c72830d7bc3c08f60d1df38d19c846a74b Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Thu, 10 Mar 2011 11:25:34 -0600
Subject: [PATCH 497/655] date picker for event form

---
 plugins/Event/EventPlugin.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/plugins/Event/EventPlugin.php b/plugins/Event/EventPlugin.php
index 5c2fd35d74..4159641d08 100644
--- a/plugins/Event/EventPlugin.php
+++ b/plugins/Event/EventPlugin.php
@@ -435,4 +435,9 @@ class EventPlugin extends MicroappPlugin
             common_log(LOG_DEBUG, "Not deleting related, wtf...");
         }
     }
+
+    function onEndShowScripts($action)
+    {
+        $action->inlineScript('$(document).ready(function() { $("#startdate").datepicker(); $("#enddate").datepicker(); });');
+    }
 }

From 2567474ddd255bf755b1edda9eb191be058ea1e5 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Thu, 10 Mar 2011 11:22:08 -0800
Subject: [PATCH 498/655] Work in progress: fixing Poll posting URLs, working
 on AS input

---
 plugins/Poll/PollPlugin.php | 33 +++++++++++++++++++++++++++++++--
 1 file changed, 31 insertions(+), 2 deletions(-)

diff --git a/plugins/Poll/PollPlugin.php b/plugins/Poll/PollPlugin.php
index 6fa95aa0e7..193b0b17a2 100644
--- a/plugins/Poll/PollPlugin.php
+++ b/plugins/Poll/PollPlugin.php
@@ -124,8 +124,11 @@ class PollPlugin extends MicroAppPlugin
     function onRouterInitialized($m)
     {
         $m->connect('main/poll/new',
-                    array('action' => 'newpoll'),
-                    array('id' => '[0-9]+'));
+                    array('action' => 'newpoll'));
+
+        $m->connect('main/poll/:id',
+                    array('action' => 'showpoll'),
+                    array('id' => '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}'));
 
         $m->connect('main/poll/:id/respond',
                     array('action' => 'respondpoll'),
@@ -190,6 +193,32 @@ class PollPlugin extends MicroAppPlugin
     function saveNoticeFromActivity($activity, $profile, $options=array())
     {
         // @fixme
+        common_log(LOG_DEBUG, "XXX activity: " . var_export($activity, true));
+        common_log(LOG_DEBUG, "XXX options: " . var_export($options, true));
+
+        // Ok for now, we can grab stuff from the XML entry directly.
+        // This won't work when reading from JSON source
+        if ($activity->entry) {
+            $elements = $activity->entry->getElementsByTagNameNS(self::POLL_OBJECT, 'data');
+            if ($elements->length) {
+                $data = $elements->item(0);
+                $question = $data->getAttribute('question');
+                $opts = array();
+                foreach ($data->attributes as $node) {
+                    $name = $node->nodeName;
+                    if (substr($name, 0, 6) == 'option') {
+                        $n = intval(substr($name, 6));
+                        if ($n > 0) {
+                            $opts[$n - 1] = $node->nodeValue;
+                        }
+                    }
+                }
+                common_log(LOG_DEBUG, "YYY question: $question");
+                common_log(LOG_DEBUG, "YYY opts: " . var_export($opts, true));
+            } else {
+                common_log(LOG_DEBUG, "YYY no poll data");
+            }
+        }
     }
 
     function activityObjectFromNotice($notice)

From 051180035102f5ab02e0913801a716e1291b9469 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Thu, 10 Mar 2011 11:35:04 -0800
Subject: [PATCH 499/655] Provisional tweak for polls to go through atom feeds
 / ostatus

Had to fix some calls to MicroAppPlugin->saveNoticeFromActivity() which passed an OStatus_profile instead of a Profile...
Imported polls don't get data from upstream or send it back currently.
---
 lib/microappplugin.php      | 10 +++++++---
 plugins/Poll/PollPlugin.php |  8 ++++++++
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/lib/microappplugin.php b/lib/microappplugin.php
index 93b70a0324..7e8a124d1e 100644
--- a/lib/microappplugin.php
+++ b/lib/microappplugin.php
@@ -308,8 +308,9 @@ abstract class MicroAppPlugin extends Plugin
                              'url' => $object->link,
                              'is_local' => Notice::REMOTE_OMB,
                              'source' => 'ostatus');
-            
-            $this->saveNoticeFromActivity($activity, $actor);
+
+            // $actor is an ostatus_profile
+            $this->saveNoticeFromActivity($activity, $actor->localProfile());
 
             return false;
         }
@@ -365,7 +366,8 @@ abstract class MicroAppPlugin extends Plugin
                              'is_local' => Notice::REMOTE_OMB,
                              'source' => 'ostatus');
 
-            $this->saveNoticeFromActivity($activity, $actor, $options);
+            // $actor is an ostatus_profile
+            $this->saveNoticeFromActivity($activity, $actor->localProfile(), $options);
 
             return false;
         }
@@ -389,6 +391,7 @@ abstract class MicroAppPlugin extends Plugin
 
             $options = array('source' => 'atompub');
 
+            // $user->getProfile() is a Profile
             $this->saveNoticeFromActivity($activity,
                                           $user->getProfile(),
                                           $options);
@@ -421,6 +424,7 @@ abstract class MicroAppPlugin extends Plugin
                              'url' => $object->link,
                              'source' => 'restore');
 
+            // $user->getProfile() is a Profile
             $saved = $this->saveNoticeFromActivity($activity,
                                                    $user->getProfile(),
                                                    $options);
diff --git a/plugins/Poll/PollPlugin.php b/plugins/Poll/PollPlugin.php
index 193b0b17a2..8a69ccd225 100644
--- a/plugins/Poll/PollPlugin.php
+++ b/plugins/Poll/PollPlugin.php
@@ -194,6 +194,7 @@ class PollPlugin extends MicroAppPlugin
     {
         // @fixme
         common_log(LOG_DEBUG, "XXX activity: " . var_export($activity, true));
+        common_log(LOG_DEBUG, "XXX profile: " . var_export($profile, true));
         common_log(LOG_DEBUG, "XXX options: " . var_export($options, true));
 
         // Ok for now, we can grab stuff from the XML entry directly.
@@ -215,6 +216,13 @@ class PollPlugin extends MicroAppPlugin
                 }
                 common_log(LOG_DEBUG, "YYY question: $question");
                 common_log(LOG_DEBUG, "YYY opts: " . var_export($opts, true));
+                try {
+                    $notice = Poll::saveNew($profile, $question, $opts, $options);
+                    common_log(LOG_DEBUG, "YYY ok: " . $notice->id);
+                    return $notice;
+                } catch (Exception $e) {
+                    common_log(LOG_DEBUG, "YYY fail: " . $e->getMessage());
+                }
             } else {
                 common_log(LOG_DEBUG, "YYY no poll data");
             }

From acd3f957ba0ea24ba83ce7f1b3c658b94d709da3 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Thu, 10 Mar 2011 12:05:25 -0800
Subject: [PATCH 500/655] Micro-app fix: pass foreign options (remote source &
 original URI) with OStatus input

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

diff --git a/lib/microappplugin.php b/lib/microappplugin.php
index 7e8a124d1e..fbead58cc5 100644
--- a/lib/microappplugin.php
+++ b/lib/microappplugin.php
@@ -310,7 +310,7 @@ abstract class MicroAppPlugin extends Plugin
                              'source' => 'ostatus');
 
             // $actor is an ostatus_profile
-            $this->saveNoticeFromActivity($activity, $actor->localProfile());
+            $this->saveNoticeFromActivity($activity, $actor->localProfile(), $options);
 
             return false;
         }

From e085ef5ef5c9f8f5a13877bce84bc094eb6a5a34 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Thu, 10 Mar 2011 12:38:25 -0800
Subject: [PATCH 501/655] Work on turning poll responses into activities so we
 can send them over ostatus bridge. Not yet bridging.

---
 plugins/Poll/Poll.php          |   1 +
 plugins/Poll/PollPlugin.php    |  35 ++++++++++-
 plugins/Poll/Poll_response.php | 112 ++++++++++++++++++++++++++++++++-
 plugins/Poll/respondpoll.php   |  15 +++--
 4 files changed, 151 insertions(+), 12 deletions(-)

diff --git a/plugins/Poll/Poll.php b/plugins/Poll/Poll.php
index 65aad4830e..f5143c3e57 100644
--- a/plugins/Poll/Poll.php
+++ b/plugins/Poll/Poll.php
@@ -47,6 +47,7 @@ class Poll extends Managed_DataObject
 {
     public $__table = 'poll'; // table name
     public $id;          // char(36) primary key not null -> UUID
+    public $uri;
     public $profile_id;  // int -> profile.id
     public $question;    // text
     public $options;     // text; newline(?)-delimited
diff --git a/plugins/Poll/PollPlugin.php b/plugins/Poll/PollPlugin.php
index 8a69ccd225..be1dd58d59 100644
--- a/plugins/Poll/PollPlugin.php
+++ b/plugins/Poll/PollPlugin.php
@@ -47,7 +47,10 @@ if (!defined('STATUSNET')) {
 class PollPlugin extends MicroAppPlugin
 {
     const VERSION         = '0.1';
-    const POLL_OBJECT     = 'http://apinamespace.org/activitystreams/object/poll';
+
+    // @fixme which domain should we use for these namespaces?
+    const POLL_OBJECT          = 'http://apinamespace.org/activitystreams/object/poll';
+    const POLL_RESPONSE_OBJECT = 'http://apinamespace.org/activitystreams/object/poll-response';
 
     /**
      * Database schema setup
@@ -130,6 +133,10 @@ class PollPlugin extends MicroAppPlugin
                     array('action' => 'showpoll'),
                     array('id' => '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}'));
 
+        $m->connect('main/poll/response/:id',
+                    array('action' => 'showpollresponse'),
+                    array('id' => '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}'));
+
         $m->connect('main/poll/:id/respond',
                     array('action' => 'respondpoll'),
                     array('id' => '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}'));
@@ -158,7 +165,7 @@ class PollPlugin extends MicroAppPlugin
 
     function types()
     {
-        return array(self::POLL_OBJECT);
+        return array(self::POLL_OBJECT, self::POLL_RESPONSE_OBJECT);
     }
 
     /**
@@ -282,6 +289,18 @@ class PollPlugin extends MicroAppPlugin
      * and Bookmark plugin for if that's right.
      */
     function showNotice($notice, $out)
+    {
+        switch ($notice->object_type) {
+        case self::POLL_OBJECT:
+            return $this->showNoticePoll($notice, $out);
+        case self::POLL_RESPONSE_OBJECT:
+            return $this->showNoticePollResponse($notice, $out);
+        default:
+            throw new Exception('Unexpected type for poll plugin: ' . $notice->object_type);
+        }
+    }
+
+    function showNoticePoll($notice, $out)
     {
         $user = common_current_user();
 
@@ -312,6 +331,18 @@ class PollPlugin extends MicroAppPlugin
         $out->elementStart('div', array('class' => 'entry-content'));
     }
 
+    function showNoticePollResponse($notice, $out)
+    {
+        $user = common_current_user();
+
+        // @hack we want regular rendering, then just add stuff after that
+        $nli = new NoticeListItem($notice, $out);
+        $nli->showNotice();
+
+        // @fixme
+        $out->elementStart('div', array('class' => 'entry-content'));
+    }
+
     function entryForm($out)
     {
         return new NewPollForm($out);
diff --git a/plugins/Poll/Poll_response.php b/plugins/Poll/Poll_response.php
index 44bc421c22..b5204c71f0 100644
--- a/plugins/Poll/Poll_response.php
+++ b/plugins/Poll/Poll_response.php
@@ -46,7 +46,8 @@ if (!defined('STATUSNET')) {
 class Poll_response extends Managed_DataObject
 {
     public $__table = 'poll_response'; // table name
-    public $poll_id;     // char(36) primary key not null -> UUID
+    public $id;          // char(36) primary key not null -> UUID
+    public $poll_id;     // char(36) -> poll.id UUID
     public $profile_id;  // int -> profile.id
     public $selection;   // int -> choice #
     public $created;     // datetime
@@ -94,12 +95,16 @@ class Poll_response extends Managed_DataObject
         return array(
             'description' => 'Record of responses to polls',
             'fields' => array(
-                'poll_id' => array('type' => 'char', 'length' => 36, 'not null' => true, 'description' => 'UUID'),
+                'id' => array('type' => 'char', 'length' => 36, 'not null' => true, 'description' => 'UUID of the response'),
+                'uri' => array('type' => 'varchar', 'length' => 255, 'not null' => true, 'description' => 'UUID to the response notice'),
+                'poll_id' => array('type' => 'char', 'length' => 36, 'not null' => true, 'description' => 'UUID of poll being responded to'),
                 'profile_id' => array('type' => 'int'),
                 'selection' => array('type' => 'int'),
                 'created' => array('type' => 'datetime', 'not null' => true),
             ),
+            'primary key' => array('id'),
             'unique keys' => array(
+                'poll_uri_key' => array('uri'),
                 'poll_response_poll_id_profile_id_key' => array('poll_id', 'profile_id'),
             ),
             'indexes' => array(
@@ -107,4 +112,107 @@ class Poll_response extends Managed_DataObject
             )
         );
     }
+
+    /**
+     * Get a poll response based on a notice
+     *
+     * @param Notice $notice Notice to check for
+     *
+     * @return Poll_response found response or null
+     */
+
+    function getByNotice($notice)
+    {
+        return self::staticGet('uri', $notice->uri);
+    }
+
+    /**
+     * Get the notice that belongs to this response...
+     *
+     * @return Notice
+     */
+    function getNotice()
+    {
+        return Notice::staticGet('uri', $this->uri);
+    }
+
+    function bestUrl()
+    {
+        return $this->getNotice()->bestUrl();
+    }
+
+    /**
+     * Save a new poll notice
+     *
+     * @param Profile $profile
+     * @param Poll    $poll the poll being responded to
+     * @param int     $selection (1-based)
+     * @param array   $opts (poll responses)
+     *
+     * @return Notice saved notice
+     */
+
+    static function saveNew($profile, $poll, $selection, $options=null)
+    {
+        if (empty($options)) {
+            $options = array();
+        }
+
+        $opts = $poll->getOptions();
+        if ($selection < 1 || $selection > count($opts)) {
+            throw new ClientException(_m('Invalid poll selection.'));
+        }
+        $answer = $opts[$selection - 1];
+
+        $pr = new Poll_response();
+        $pr->id          = UUID::gen();
+        $pr->profile_id  = $profile->id;
+        $pr->poll_id     = $poll->id;
+        $pr->selection   = $selection;
+
+        if (array_key_exists('created', $options)) {
+            $pr->created = $options['created'];
+        } else {
+            $pr->created = common_sql_now();
+        }
+
+        if (array_key_exists('uri', $options)) {
+            $pr->uri = $options['uri'];
+        } else {
+            $pr->uri = common_local_url('showpollresponse',
+                                        array('id' => $pr->id));
+        }
+
+        common_log(LOG_DEBUG, "Saving poll response: $pr->id $pr->uri");
+        $pr->insert();
+
+        $content  = sprintf(_m('voted for "%s"'),
+                            $answer);
+        $rendered = sprintf(_m('voted for “<a href="%s">%s</a>”'),
+                            htmlspecialchars($poll->uri),
+                            htmlspecialchars($answer));
+
+        $tags    = array();
+        $replies = array();
+
+        $options = array_merge(array('urls' => array(),
+                                     'rendered' => $rendered,
+                                     'tags' => $tags,
+                                     'replies' => $replies,
+                                     'reply_to' => $poll->getNotice()->id,
+                                     'object_type' => PollPlugin::POLL_RESPONSE_OBJECT),
+                               $options);
+
+        if (!array_key_exists('uri', $options)) {
+            $options['uri'] = $pr->uri;
+        }
+
+        $saved = Notice::saveNew($profile->id,
+                                 $content,
+                                 array_key_exists('source', $options) ?
+                                 $options['source'] : 'web',
+                                 $options);
+
+        return $saved;
+    }
 }
diff --git a/plugins/Poll/respondpoll.php b/plugins/Poll/respondpoll.php
index 07a5235406..e521a2a68f 100644
--- a/plugins/Poll/respondpoll.php
+++ b/plugins/Poll/respondpoll.php
@@ -75,6 +75,9 @@ class RespondPollAction extends Action
     function prepare($argarray)
     {
         parent::prepare($argarray);
+        if ($this->boolean('ajax')) {
+            StatusNet::setApi(true);
+        }
 
         $this->user = common_current_user();
 
@@ -132,20 +135,16 @@ class RespondPollAction extends Action
     function respondPoll()
     {
         try {
-            $response = new Poll_response();
-            $response->poll_id = $this->poll->id;
-            $response->profile_id = $this->user->id;
-            $response->selection = $this->selection;
-            $response->created = common_sql_now();
-            $response->insert();
-
+            $notice = Poll_response::saveNew($this->user->getProfile(),
+                                             $this->poll,
+                                             $this->selection);
         } catch (ClientException $ce) {
             $this->error = $ce->getMessage();
             $this->showPage();
             return;
         }
 
-        if ($this->arg('ajax')) {
+        if ($this->boolean('ajax')) {
             header('Content-Type: text/xml;charset=utf-8');
             $this->xw->startDocument('1.0', 'UTF-8');
             $this->elementStart('html');

From d6c8c61076f744fbcf96f7edb5b50732515af04e Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Thu, 10 Mar 2011 13:41:23 -0800
Subject: [PATCH 502/655] AS output/input for poll responses

---
 plugins/Poll/Poll.php          | 17 +++++++
 plugins/Poll/PollPlugin.php    | 84 +++++++++++++++++++++++++++++++---
 plugins/Poll/Poll_response.php |  4 +-
 3 files changed, 96 insertions(+), 9 deletions(-)

diff --git a/plugins/Poll/Poll.php b/plugins/Poll/Poll.php
index f5143c3e57..1f26bbf6e4 100644
--- a/plugins/Poll/Poll.php
+++ b/plugins/Poll/Poll.php
@@ -128,6 +128,23 @@ class Poll extends Managed_DataObject
         return explode("\n", $this->options);
     }
 
+    /**
+     * Is this a valid selection index?
+     *
+     * @param numeric $selection (1-based)
+     * @return boolean
+     */
+    function isValidSelection($selection)
+    {
+        if ($selection != intval($selection)) {
+            return false;
+        }
+        if ($selection < 1 || $selection > count($this->getOptions())) {
+            return false;
+        }
+        return true;
+    }
+
     function getNotice()
     {
         return Notice::staticGet('uri', $this->uri);
diff --git a/plugins/Poll/PollPlugin.php b/plugins/Poll/PollPlugin.php
index be1dd58d59..49f7011156 100644
--- a/plugins/Poll/PollPlugin.php
+++ b/plugins/Poll/PollPlugin.php
@@ -207,9 +207,10 @@ class PollPlugin extends MicroAppPlugin
         // Ok for now, we can grab stuff from the XML entry directly.
         // This won't work when reading from JSON source
         if ($activity->entry) {
-            $elements = $activity->entry->getElementsByTagNameNS(self::POLL_OBJECT, 'data');
-            if ($elements->length) {
-                $data = $elements->item(0);
+            $pollElements = $activity->entry->getElementsByTagNameNS(self::POLL_OBJECT, 'poll');
+            $responseElements = $activity->entry->getElementsByTagNameNS(self::POLL_OBJECT, 'response');
+            if ($dataElements->length) {
+                $data = $dataElements->item(0);
                 $question = $data->getAttribute('question');
                 $opts = array();
                 foreach ($data->attributes as $node) {
@@ -230,6 +231,25 @@ class PollPlugin extends MicroAppPlugin
                 } catch (Exception $e) {
                     common_log(LOG_DEBUG, "YYY fail: " . $e->getMessage());
                 }
+            } else if ($responseElements->length) {
+                $data = $responseElements->item(0);
+                $pollUri = $data->getAttribute('poll');
+                $selection = intval($data->getAttribute('selection'));
+
+                if (!$pollUri) {
+                    throw new Exception('Invalid poll response: no poll reference.');
+                }
+                $poll = Poll::staticGet('uri', $pollUri);
+                if (!$poll) {
+                    throw new Exception('Invalid poll response: poll is unknown.');
+                }
+                try {
+                    $notice = Poll_response::saveNew($profile, $poll, $selection, $options);
+                    common_log(LOG_DEBUG, "YYY response ok: " . $notice->id);
+                    return $notice;
+                } catch (Exception $e) {
+                    common_log(LOG_DEBUG, "YYY response fail: " . $e->getMessage());
+                }
             } else {
                 common_log(LOG_DEBUG, "YYY no poll data");
             }
@@ -240,11 +260,61 @@ class PollPlugin extends MicroAppPlugin
     {
         assert($this->isMyNotice($notice));
 
+        switch ($notice->object_type) {
+        case self::POLL_OBJECT:
+            return $this->activityObjectFromNoticePoll($notice);
+        case self::POLL_RESPONSE_OBJECT:
+            return $this->activityObjectFromNoticePollResponse($notice);
+        default:
+            throw new Exception('Unexpected type for poll plugin: ' . $notice->object_type);
+        }
+    }
+
+    function activityObjectFromNoticePoll($notice)
+    {
         $object = new ActivityObject();
         $object->id      = $notice->uri;
         $object->type    = self::POLL_OBJECT;
-        $object->title   = 'Poll title';
-        $object->summary = 'Poll summary';
+        $object->title   = $notice->content;
+        $object->summary = $notice->content;
+        $object->link    = $notice->bestUrl();
+
+        $response = Poll_response::getByNotice($notice);
+        $poll = $response->getPoll();
+
+        /**
+         * For the moment, using a kind of icky-looking schema that happens to
+         * work with out code for generating both Atom and JSON forms, though
+         * I don't like it:
+         *
+         * <poll:response xmlns:poll="http://apinamespace.org/activitystreams/object/poll"
+         *                poll="http://..../poll/...."
+         *                selection="3" />
+         *
+         * "poll:response": {
+         *     "xmlns:poll": http://apinamespace.org/activitystreams/object/poll
+         *     "uri": "http://..../poll/...."
+         *     "selection": 3
+         * }
+         *
+         */
+        // @fixme there's no way to specify an XML node tree here, like <poll><option/><option/></poll>
+        // @fixme there's no way to specify a JSON array or multi-level tree unless you break the XML attribs
+        // @fixme XML node contents don't get shown in JSON
+        $data = array('xmlns:poll' => self::POLL_OBJECT,
+                      'poll'       => $poll->uri,
+                      'selection'  => intval($response->selection));
+        $object->extra[] = array('poll:response', $data, '');
+        return $object;
+    }
+
+    function activityObjectFromNoticePollResponse($notice)
+    {
+        $object = new ActivityObject();
+        $object->id      = $notice->uri;
+        $object->type    = self::POLL_RESPONSE_OBJECT;
+        $object->title   = $notice->content;
+        $object->summary = $notice->content;
         $object->link    = $notice->bestUrl();
 
         $poll = Poll::getByNotice($notice);
@@ -262,7 +332,7 @@ class PollPlugin extends MicroAppPlugin
          *            option2="Option two"
          *            option3="Option three"></poll:data>
          *
-         * "poll:data": {
+         * "poll:response": {
          *     "xmlns:poll": http://apinamespace.org/activitystreams/object/poll
          *     "question": "Who wants a poll question?"
          *     "option1": "Option one"
@@ -279,7 +349,7 @@ class PollPlugin extends MicroAppPlugin
         foreach ($poll->getOptions() as $i => $opt) {
             $data['option' . ($i + 1)] = $opt;
         }
-        $object->extra[] = array('poll:data', $data, '');
+        $object->extra[] = array('poll:poll', $data, '');
         return $object;
     }
 
diff --git a/plugins/Poll/Poll_response.php b/plugins/Poll/Poll_response.php
index b5204c71f0..03dd6f60b5 100644
--- a/plugins/Poll/Poll_response.php
+++ b/plugins/Poll/Poll_response.php
@@ -158,10 +158,10 @@ class Poll_response extends Managed_DataObject
             $options = array();
         }
 
-        $opts = $poll->getOptions();
-        if ($selection < 1 || $selection > count($opts)) {
+        if (!$poll->isValidSelection($selection)) {
             throw new ClientException(_m('Invalid poll selection.'));
         }
+        $opts = $poll->getOptions();
         $answer = $opts[$selection - 1];
 
         $pr = new Poll_response();

From e54eb9117f99416a4000399027654279d1e8512a Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Thu, 10 Mar 2011 13:45:31 -0800
Subject: [PATCH 503/655] backwards

---
 plugins/Poll/PollPlugin.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/Poll/PollPlugin.php b/plugins/Poll/PollPlugin.php
index 49f7011156..5714653fb0 100644
--- a/plugins/Poll/PollPlugin.php
+++ b/plugins/Poll/PollPlugin.php
@@ -270,7 +270,7 @@ class PollPlugin extends MicroAppPlugin
         }
     }
 
-    function activityObjectFromNoticePoll($notice)
+    function activityObjectFromNoticePollResponse($notice)
     {
         $object = new ActivityObject();
         $object->id      = $notice->uri;
@@ -279,7 +279,7 @@ class PollPlugin extends MicroAppPlugin
         $object->summary = $notice->content;
         $object->link    = $notice->bestUrl();
 
-        $response = Poll_response::getByNotice($notice);
+        $response = Poll_response:getByNotice($notice);
         $poll = $response->getPoll();
 
         /**
@@ -308,7 +308,7 @@ class PollPlugin extends MicroAppPlugin
         return $object;
     }
 
-    function activityObjectFromNoticePollResponse($notice)
+    function activityObjectFromNoticePoll($notice)
     {
         $object = new ActivityObject();
         $object->id      = $notice->uri;

From 97df2f394fbb4c178e6b8d4da469b51625dfb45c Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Thu, 10 Mar 2011 13:46:20 -0800
Subject: [PATCH 504/655] typo.... maybe that coffee's wearing off?

---
 plugins/Poll/PollPlugin.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/Poll/PollPlugin.php b/plugins/Poll/PollPlugin.php
index 5714653fb0..6b8bf9608e 100644
--- a/plugins/Poll/PollPlugin.php
+++ b/plugins/Poll/PollPlugin.php
@@ -279,7 +279,7 @@ class PollPlugin extends MicroAppPlugin
         $object->summary = $notice->content;
         $object->link    = $notice->bestUrl();
 
-        $response = Poll_response:getByNotice($notice);
+        $response = Poll_response::getByNotice($notice);
         $poll = $response->getPoll();
 
         /**

From 6416f5ea4113cdc2e32132d387ce1cf526f35062 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Thu, 10 Mar 2011 13:47:44 -0800
Subject: [PATCH 505/655] fix

---
 plugins/Poll/PollPlugin.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/Poll/PollPlugin.php b/plugins/Poll/PollPlugin.php
index 6b8bf9608e..f76faedb05 100644
--- a/plugins/Poll/PollPlugin.php
+++ b/plugins/Poll/PollPlugin.php
@@ -209,8 +209,8 @@ class PollPlugin extends MicroAppPlugin
         if ($activity->entry) {
             $pollElements = $activity->entry->getElementsByTagNameNS(self::POLL_OBJECT, 'poll');
             $responseElements = $activity->entry->getElementsByTagNameNS(self::POLL_OBJECT, 'response');
-            if ($dataElements->length) {
-                $data = $dataElements->item(0);
+            if ($pollElements->length) {
+                $data = $pollElements->item(0);
                 $question = $data->getAttribute('question');
                 $opts = array();
                 foreach ($data->attributes as $node) {

From eccadb4a7b672685215dc6d9e481577e9fe92d9c Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Thu, 10 Mar 2011 13:55:47 -0800
Subject: [PATCH 506/655] cleanup... Poll main & response events seem to sorta
 work over ostatus now

---
 plugins/Poll/PollPlugin.php    | 53 ++++++++++++++++++----------------
 plugins/Poll/Poll_response.php |  8 +++++
 2 files changed, 36 insertions(+), 25 deletions(-)

diff --git a/plugins/Poll/PollPlugin.php b/plugins/Poll/PollPlugin.php
index f76faedb05..a2e9814555 100644
--- a/plugins/Poll/PollPlugin.php
+++ b/plugins/Poll/PollPlugin.php
@@ -280,31 +280,34 @@ class PollPlugin extends MicroAppPlugin
         $object->link    = $notice->bestUrl();
 
         $response = Poll_response::getByNotice($notice);
-        $poll = $response->getPoll();
-
-        /**
-         * For the moment, using a kind of icky-looking schema that happens to
-         * work with out code for generating both Atom and JSON forms, though
-         * I don't like it:
-         *
-         * <poll:response xmlns:poll="http://apinamespace.org/activitystreams/object/poll"
-         *                poll="http://..../poll/...."
-         *                selection="3" />
-         *
-         * "poll:response": {
-         *     "xmlns:poll": http://apinamespace.org/activitystreams/object/poll
-         *     "uri": "http://..../poll/...."
-         *     "selection": 3
-         * }
-         *
-         */
-        // @fixme there's no way to specify an XML node tree here, like <poll><option/><option/></poll>
-        // @fixme there's no way to specify a JSON array or multi-level tree unless you break the XML attribs
-        // @fixme XML node contents don't get shown in JSON
-        $data = array('xmlns:poll' => self::POLL_OBJECT,
-                      'poll'       => $poll->uri,
-                      'selection'  => intval($response->selection));
-        $object->extra[] = array('poll:response', $data, '');
+        if (!$response) {
+            common_log(LOG_DEBUG, "QQQ notice uri: $notice->uri");
+        } else {
+            $poll = $response->getPoll();
+            /**
+             * For the moment, using a kind of icky-looking schema that happens to
+             * work with out code for generating both Atom and JSON forms, though
+             * I don't like it:
+             *
+             * <poll:response xmlns:poll="http://apinamespace.org/activitystreams/object/poll"
+             *                poll="http://..../poll/...."
+             *                selection="3" />
+             *
+             * "poll:response": {
+             *     "xmlns:poll": http://apinamespace.org/activitystreams/object/poll
+             *     "uri": "http://..../poll/...."
+             *     "selection": 3
+             * }
+             *
+             */
+            // @fixme there's no way to specify an XML node tree here, like <poll><option/><option/></poll>
+            // @fixme there's no way to specify a JSON array or multi-level tree unless you break the XML attribs
+            // @fixme XML node contents don't get shown in JSON
+            $data = array('xmlns:poll' => self::POLL_OBJECT,
+                          'poll'       => $poll->uri,
+                          'selection'  => intval($response->selection));
+            $object->extra[] = array('poll:response', $data, '');
+        }
         return $object;
     }
 
diff --git a/plugins/Poll/Poll_response.php b/plugins/Poll/Poll_response.php
index 03dd6f60b5..88e6ea890c 100644
--- a/plugins/Poll/Poll_response.php
+++ b/plugins/Poll/Poll_response.php
@@ -141,6 +141,14 @@ class Poll_response extends Managed_DataObject
         return $this->getNotice()->bestUrl();
     }
 
+    /**
+     *
+     * @return Poll
+     */
+    function getPoll()
+    {
+        return Poll::staticGet('id', $this->poll_id);
+    }
     /**
      * Save a new poll notice
      *

From c456e998c7de9b70171db4524dc7ac90e908b7ad Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Thu, 10 Mar 2011 14:14:21 -0800
Subject: [PATCH 507/655] Make phone numbers save

---
 plugins/ExtendedProfile/extendedprofile.php   |  24 ++--
 .../ExtendedProfile/extendedprofilewidget.php |  48 ++++++++
 .../profiledetailsettingsaction.php           | 109 +++++++++++++++---
 3 files changed, 155 insertions(+), 26 deletions(-)

diff --git a/plugins/ExtendedProfile/extendedprofile.php b/plugins/ExtendedProfile/extendedprofile.php
index 5ad6db114f..908f0bc721 100644
--- a/plugins/ExtendedProfile/extendedprofile.php
+++ b/plugins/ExtendedProfile/extendedprofile.php
@@ -39,7 +39,7 @@ class ExtendedProfile
         $this->user     = $profile->getUser();
         $this->sections = $this->getSections();
         $this->fields   = $this->loadFields();
-        common_debug(var_export($this->fields, true));
+        //common_debug(var_export($this->fields, true));
     }
 
     /**
@@ -96,6 +96,21 @@ class ExtendedProfile
         }
     }
 
+
+    function getPhones()
+    {
+        return array(
+                'label' => _m('Phone'),
+                'type'  => 'phone',
+                'multi' => true,
+                'index' => 8123,
+                'rel'   => 'home',
+                'value' => '510-528-0079',
+                'vcard' => 'tel'
+
+        );
+    }
+
     /**
      *  Return all the sections of the extended profile
      *
@@ -140,12 +155,7 @@ class ExtendedProfile
             'contact' => array(
                 'label' => _m('Contact'),
                 'fields' => array(
-                    'phone' => array(
-                        'label' => _m('Phone'),
-                        'type' => 'phone',
-                        'multi' => true,
-                        'vcard' => 'tel',
-                    ),
+                    'phone' => $this->getPhones(),
                     'im' => array(
                         'label' => _m('IM'),
                         'type' => 'im',
diff --git a/plugins/ExtendedProfile/extendedprofilewidget.php b/plugins/ExtendedProfile/extendedprofilewidget.php
index fbb3ff3c23..f5685e9981 100644
--- a/plugins/ExtendedProfile/extendedprofilewidget.php
+++ b/plugins/ExtendedProfile/extendedprofilewidget.php
@@ -150,10 +150,55 @@ class ExtendedProfileWidget extends Form
         case 'tags':
             $this->out->text($this->ext->getTags());
             break;
+        case 'phone':
+            common_debug("GOT a PHONE!");
+            $this->showPhone($field);
+            break;
         default:
             $this->out->text("TYPE: $type");
         }
+    }
 
+    protected function showPhone($field)
+    {
+        $this->out->elementStart('div', array('class' => 'phone-display'));
+        $this->out->text($field['value']);
+        $this->out->text(' (' . $field['rel'] . ')');
+        $this->out->elementEnd('div');
+    }
+
+    protected function showEditablePhone($name, $field)
+    {
+        $index = $field['index'];
+        $id    = "extprofile-$name-$index";
+        $rel   = $id . '-rel';
+
+        $this->out->elementStart('div', array('class' => 'phone-edit'));
+        $this->out->input($id, null, $field['value']);
+        $this->out->dropdown(
+            $id . '-rel',
+            'Type',
+            array(
+                'office' => 'Office',
+                'mobile' => 'Mobile',
+                'home'   => 'Home',
+                'pager'  => 'Pager',
+                'other'  => 'Other'
+            ),
+            null,
+            false,
+            $field['rel']
+        );
+        if ($field['multi']) {
+            $this->out->element(
+                'a',
+                array(
+                    'name' => $name,
+                    'href' => 'javascript://'),
+                    '+'
+                );
+        }
+        $this->out->elementEnd('div');
     }
 
     /**
@@ -182,6 +227,9 @@ class ExtendedProfileWidget extends Form
         case 'tags':
             $out->input($id, null, $this->ext->getTags());
             break;
+        case 'phone':
+            $this->showEditablePhone($name, $field);
+            break;
         default:
             $out->input($id, null, "TYPE: $type");
         }
diff --git a/plugins/ExtendedProfile/profiledetailsettingsaction.php b/plugins/ExtendedProfile/profiledetailsettingsaction.php
index 0f84dc0582..c18732c058 100644
--- a/plugins/ExtendedProfile/profiledetailsettingsaction.php
+++ b/plugins/ExtendedProfile/profiledetailsettingsaction.php
@@ -101,51 +101,122 @@ class ProfileDetailSettingsAction extends SettingsAction
 
         foreach ($simpleFieldNames as $name) {
             $value = $this->trimmed('extprofile-' . $name);
-            $this->saveSimpleField($user, $name, $value);
+            $this->saveField($user, $name, $value);
         }
 
+        $this->savePhoneNumbers($user);
+
         $this->showForm(_('Details saved.'), true);
 
     }
 
-    function saveSimpleField($user, $name, $value)
+    function savePhoneNumbers($user) {
+        $phones = $this->findPhoneNumbers();
+
+        foreach ($phones as $phone) {
+            $this->saveField(
+                $user,
+                'phone',
+                $phone['value'],
+                $phone['rel'],
+                $phone['index']
+            );
+        }
+    }
+
+    function findPhoneNumbers() {
+        $phones      = array();
+        $phoneParams = $this->findMultiParams('phone');
+        ksort($phoneParams); // this sorts them into pairs
+        $phones = $this->arraySplit($phoneParams, sizeof($phoneParams) / 2);
+
+        $phoneTuples = array();
+
+        foreach($phones as $phone) {
+            $firstkey           = array_shift(array_keys($phone));
+            $index              = substr($firstkey, strrpos($firstkey, '-') + 1);
+            list($number, $rel) = array_values($phone);
+
+            $phoneTuples[] = array(
+                'value' => $number,
+                'index' => $index,
+                'rel'   => $rel
+            );
+
+            return $phoneTuples;
+        }
+
+        return $phones;
+    }
+
+    function arraySplit($array, $pieces)
+    {
+        if ($pieces < 2) {
+            return array($array);
+        }
+
+        $newCount = ceil(count($array) / $pieces);
+        $a = array_slice($array, 0, $newCount);
+        $b = array_split(array_slice($array, $newCount), $pieces - 1);
+
+        return array_merge(array($a), $b);
+    }
+
+    function findMultiParams($type) {
+        $formVals = array();
+        $target   = $type;
+        foreach ($_POST as $key => $val) {
+            if (strrpos('extprofile-' . $key, $target) !== false) {
+                $formVals[$key] = $val;
+            }
+        }
+        return $formVals;
+    }
+
+    /**
+     * Save an extended profile field as a Profile_detail
+     *
+     * @param User   $user    the current user
+     * @param string $name    field name
+     * @param string $value   field value
+     * @param string $rel     field rel (type)
+     * @param int    $index   index (fields can have multiple values)
+     */
+    function saveField($user, $name, $value, $rel = null, $index = null)
     {
         $profile = $user->getProfile();
-
-        $detail = new Profile_detail();
+        $detail  = new Profile_detail();
 
         $detail->profile_id  = $profile->id;
         $detail->field_name  = $name;
+        $detail->value_index = $index;
 
         $result = $detail->find(true);
 
-
         if (empty($result)) {
-
+            $detial->value_index = $index;
+            $detail->rel         = $rel;
             $detail->field_value = $value;
-
-            $detail->created = common_sql_now();
-
-            common_debug("XXXXXXXXXXXXXXX not found");
-
+            $detail->created     = common_sql_now();
             $result = $detail->insert();
-
             if (empty($result)) {
                 common_log_db_error($detail, 'INSERT', __FILE__);
                 $this->serverError(_m('Could not save profile details.'));
             }
-
         } else {
-
-            common_debug('zzzzz FOUND');
             $orig = clone($detail);
-            $detail->field_value = $value;
-            $result = $detail->update($orig);
 
+            $detail->field_value = $value;
+            $detail->rel         = $rel;
+
+            $result = $detail->update($orig);
+            if (empty($result)) {
+                common_log_db_error($detail, 'UPDATE', __FILE__);
+                $this->serverError(_m('Could not save profile details.'));
+            }
         }
 
         $detail->free();
-
     }
 
     /**
@@ -189,7 +260,7 @@ class ProfileDetailSettingsAction extends SettingsAction
             || $location != $profile->location
             || !empty($newTags)
             || $bio      != $profile->bio) {
- 
+
             $orig = clone($profile);
 
             $profile->nickname = $user->nickname;

From 24d00941925b0064c1a55cbcdd501ca471c08590 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Thu, 10 Mar 2011 14:20:35 -0800
Subject: [PATCH 508/655] User Directory - set class current on "All" if there
 is no selected filter

---
 plugins/Directory/lib/alphanav.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/Directory/lib/alphanav.php b/plugins/Directory/lib/alphanav.php
index dadb589094..87e2f18f18 100644
--- a/plugins/Directory/lib/alphanav.php
+++ b/plugins/Directory/lib/alphanav.php
@@ -128,8 +128,8 @@ class AlphaNav extends Widget
             $current = $this->action->arg('filter');
 
             // Highlight the selected filter. If there is no selected
-            // filter, highlight the first filter in the list
-            if (!isset($current) && $i == 0
+            // filter, highlight the last filter in the list (all)
+            if (!isset($current) && $i == ($size - 1)
                 || $current === strtolower($filter)) {
                 $classes .= 'current ';
             }

From b07227b9d26995431c2d3f1eb3b2f18e3f31d34c Mon Sep 17 00:00:00 2001
From: Samantha Doherty <sammy@status.net>
Date: Thu, 10 Mar 2011 18:05:04 -0500
Subject: [PATCH 509/655] Big update for neo theme (and a couple wee fixes for
 rebase).

---
 theme/neo/css/display.css           | 576 ++++++++++++++++++++--------
 theme/neo/images/brdr_black_dot.png | Bin 0 -> 115 bytes
 theme/neo/images/brdr_white_dot.png | Bin 0 -> 114 bytes
 theme/neo/logo.png                  | Bin 1633 -> 11740 bytes
 theme/neo/theme.ini                 |   4 +
 theme/rebase/css/display.css        |  22 +-
 6 files changed, 427 insertions(+), 175 deletions(-)
 create mode 100644 theme/neo/images/brdr_black_dot.png
 create mode 100644 theme/neo/images/brdr_white_dot.png

diff --git a/theme/neo/css/display.css b/theme/neo/css/display.css
index d230fc0a42..cdc33bd308 100644
--- a/theme/neo/css/display.css
+++ b/theme/neo/css/display.css
@@ -13,11 +13,19 @@
 body {
     background-color: #C6C8CC;
     background-image: url(../images/bg.png);
-    font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; 
-    font-size: 82%;
+    font-family: 'Lato', "Helvetica Neue", Helvetica, Arial, sans-serif; 
+    font-size: 14px;
+    line-height: 1.6;
+    color: #222;
+}
+
+input, textarea, select, option {
+    font-family: 'Lato', "Helvetica Neue", Helvetica, Arial, sans-serif; 
+    font-size: 1em;
 }
 
 a {color: #3e3e8c;}
+a:hover {color: blue;}
 
 h1 {font-size: 1.6em;}
 h2 {font-size: 1.6em;}
@@ -27,59 +35,48 @@ h5 {font-size: 1.2em;}
 h6 {font-size: 1em;}
 
 #wrap {
-    width: 930px;
+    width: 960px;
     margin: 0px auto;
-    padding: 0px 15px 10px 15px;
-    background-color: #fff;
-    border-left: 10px solid #E0E0E0;
-    border-right: 10px solid #E0E0E0;
+    background: #fff url('../images/brdr_black_dot.png') repeat-x 0px 10px;
+    border-left: 10px solid #fff;
+    border-right: 10px solid #fff;
+    padding-top: 10px;
 }
 
 #header {
-    width: 940px;
+    width: 960px;
     padding: 0px;
-    padding-top: 50px;
+    padding-top: 12px;
 }
 
 address {
     float: left;
-    margin-right: 20px;
-    margin-top: 0px;
-}
-
-.poweredby {
-    background: url(../images/sn-tiny.png) no-repeat top left;
-    height: 40px;
-    font-size: 0.8em;
-    color: #fff;
-    line-height: 42px;
-    padding-left: 50px;
-    position: absolute;
-    top: 6px;
-    left: 0;
+    position: relative;
+    top: 1px;
+    left: 2px;
+    margin: 0px;
+    padding: 0px;
+    height: 24px;
+    width: 148px;
     z-index: 99;
-    font-style: normal;
-}
-
-.poweredby a {
-    color: #fff !important;
-    font-weight: bold;
 }
 
 #site_nav_global_primary {
     display: block;
     position: absolute;
-    top: 0;
-    left: 0;
-    z-index: 98;
-    background-color: #364A84;
-    width: 960px;
-    margin-left: -15px; 
-    margin-top: 0px;
+    top: 10px;
+    right: 0;
+    width: 800px;
+    margin: 0px;
     height: 24px;
     line-height: 20px;
-    border-top: 10px solid #fff;
-    border-bottom: 1px solid #fff;
+    -webkit-border-top-right-radius: 6px;
+    -moz-border-radius-topright: 6px;
+    border-top-right-radius: 6px;
+    background: #364A84;
+    background: -moz-linear-gradient(top, #516499 , #364a84);
+    background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#516499), color-stop(100%,#364a84));
+    filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#516499', endColorstr='#364a84',GradientType=0 ); /* XXX move all to ie.css */ 
 }
 
 #site_nav_global_primary ul {
@@ -91,13 +88,13 @@ address {
 }
 
 #site_nav_global_primary li:last-child {
-    margin-right: 16px;
+    margin-right: 10px;
 }
 
 #site_nav_global_primary a {
     color: #fff !important;
     text-shadow: 0px 1px 1px rgba(0, 0, 0, 0.5);
-    padding: 2px 12px 2px 12px;
+    padding: 2px 10px 2px 10px;
     height: 20px;
     display: block;
     float: left;
@@ -137,92 +134,40 @@ address {
     color: #3e3e8c;
 }
 
-.form_notice {
-    float: left;
-    margin-top: 0px;
-    width: 510px;
-    padding: 10px;
-    -webkit-border-radius: 6px;
-    -moz-border-radius: 6px;
-    border-radius: 6px;
-    background: #cdd1dd;
-}
-
-.form_notice fieldset {
-    width: 100%;
-}
-
-.form_notice textarea {
-    width: 378px;
-    height: 54px;
-    -webkit-border-radius: 6px;
-    -moz-border-radius: 6px;
-    border-radius: 6px;
-}
-
-.form_notice label.notice_data-attach {
-    top: 27px;
-    right: 86px;
-}
-
-.form_notice #notice_data-geo_wrap label,
-.form_notice #notice_data-geo_wrap input {
-    top: 52px;
-    right: 86px;
-}
-
-.form_notice #notice_action-submit {
-    font-size: 0.9em;
-    top: 80px;
-	right: -2px;
-    height: 2.4em;
-    width: 106px;
-}
-
-.form_notice .error,
-.form_notice .success,
-.form_notice .notice-status {
-    width: 341px;
-}
-
-.form_notice .error {
-    margin-left: 0px;
-}
-
 #core {
     clear: both;
     margin: 0px;
-    width: 930px;
-    margin-left: 0px;
-    margin-top: 8px;
-}
-
-#content {
-    width: 530px;
-    margin-right: 0px;
-    padding-left: 30px;
-    padding-right: 30px;
+    width: 960px;
+    border-top: 5px solid #FB6104;
 }
 
 #site_nav_local_views {
     display: block;
     float: left;
-    width: 130px;
-    margin-top: 5px;
+    width: 138px;
+    margin-top: 0px;
+    padding: 10px;
+    padding-top: 22px;
+    background-color: #ececf2; 
+    border-left: 1px solid #d8dae6;
+    border-right: 1px solid #d8dae6;
+    min-height: 800px; /* XXX set up equal column heights! */
 }
 
 #site_nav_local_views H3 {
-    border-bottom: 3px solid #A6ADBF;
-    color: #A6ADBF;
+    margin-bottom: 10px;
+    padding-bottom: 6px;
+    background: url('../images/brdr_black_dot.png') repeat-x bottom left;
+    color: #7a7c87;
     font-size: 1.1em;
     letter-spacing: 2px;
-    margin-bottom: 10px;
+    text-shadow: 0px 1px 1px rgba(255, 255, 255, 0.5);
     text-transform: uppercase;
 }
 
 #site_nav_local_views li {
     display: block;
-    margin: 0px 0px 6px 0px;
+    margin: 0px 0px 8px 0px;
 }
 
 #site_nav_local_views li ul {
@@ -230,52 +175,214 @@ address {
 }
 
 #site_nav_local_views a {
-    padding: 2px 0px 2px 10px;
     display: block;
-    -webkit-border-radius: 6px;
-    -moz-border-radius: 6px;
-    border-radius: 6px;
+    padding: 0px 0px 1px 10px;
+    -webkit-border-radius: 4px;
+    -moz-border-radius: 4px;
+    border-radius: 4px;
+    text-transform: uppercase;
+    text-shadow: 0px 1px 1px rgba(255, 255, 255, 0.5);
 }
 
-#site_nav_local_views a:hover {
-    background: #8e98b4 !important;
-    color: #fff !important;
+#site_nav_local_views a:hover, #site_nav_local_views .current a {
+    color: #fff;
     text-decoration: none;
     text-shadow: 0px 1px 1px rgba(0, 0, 0, 0.5);
+    background: #364a84;
+    background: -moz-linear-gradient(top, #7b8dbb , #364a84);
+    background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#7b8dbb), color-stop(100%,#364a84));
+    filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#7b8dbb', endColorstr='#364a84',GradientType=0 );
 }
 
-#site_nav_local_views .current a {
-    text-decoration: none;
-    background: #8e98b4 !important;
-    color: #fff !important;
-    text-shadow: 0px 1px 1px rgba(0, 0, 0, 0.5);
+#content {
+    width: 520px;
+    margin-right: 0px;
+    padding: 20px;
+}
+
+/* Input forms */
+
+.input_forms {
+    float: left;
+    position: relative;
+    top: -20px;
+    left: -20px;
+    padding: 18px 20px 0px 20px;
+    background: #fafafa url('../images/brdr_black_dot.png') repeat-x bottom left;
+}
+
+#input_form_nav {
+    float: left;
+    margin-bottom: 10px;
+}
+
+#input_form_nav li a {
+    display: block;
+    float: left;
+    padding: 0px 10px 1px 10px;
+    margin-right: 10px;
+    -webkit-border-radius: 4px;
+    -moz-border-radius: 4px;
+    border-radius: 4px;
+    border: 1px solid #ECECF2;
+    font-weight: bold;
+    line-height: 1.4em;
+    text-shadow: 0px 1px 0px rgba(255, 255, 255, 0.9);
+    background: #ececf2;
+    background: -moz-linear-gradient(top, #fff , #ececf2);
+    background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#fff), color-stop(100%,#ececf2));
+    filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#fff', endColorstr='#ececf2',GradientType=0 );
+}
+
+#input_form_nav li:hover a, #input_form_nav li.current a {
+    color: #fff;
+    text-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
+    border: 1px solid #ececf2;
+    background: #364a84;
+    background: -moz-linear-gradient(top, #7b8dbb , #364a84);
+    background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#7b8dbb), color-stop(100%,#364a84));
+    filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#7b8dbb', endColorstr='#364a84',GradientType=0 );
+}
+
+.input_form_nav_tab a, .input_form_nav_tab.current {
+    text-decoration: none !important; /* XXX cf rebase */
+}
+
+.input_form {
+    position: relative;
+    float: left;
+    width: 520px;
+    padding-bottom: 15px;
+}
+
+#input_form_status {
+    padding-bottom: 45px;
+}
+
+.form_notice {
+    padding: 0px;
+    background: none;
+}
+
+.form_notice fieldset {
+    width: auto;
+    position: static;
+}
+
+.form_notice #notice_data-text-label {
+    display: none; /* XXX move into input with js */
+}
+
+.form_notice textarea {
+    width: 473px;
+    height: 42px;
+    padding: 6px 10px 18px 10px;
+    border: 1px solid #a6a6a6;
+    -webkit-border-radius: 4px;
+    -moz-border-radius: 4px;
+    border-radius: 4px;
+    box-shadow: 0px 0px 4px rgba(0, 0, 0, 0.2);
+    -moz-box-shadow: 0px 0px 4px rgba(0, 0, 0, 0.2);
+    -webkit-box-shadow: 0px 0px 4px rgba(0, 0, 0, 0.2);
+    z-index: 97;
+    font-size: 1.2em;
+}
+
+.form_notice label.notice_data-attach {
+    top: 0px;
+    right: 0px;
+    z-index: 96;
+}
+
+.form_notice .notice_data-geo_wrap label,
+.form_notice .notice_data-geo_wrap input {
+    top: 26px;
+    right: 0px;
+    z-index: 99;
+}
+
+.form_notice .count {
+    position: absolute;
+    top: 50px;
+    right: 35px;
+    font-size: 0.8em; 
+    height: 1em;
+    z-index: 99;
+}
+
+.form_notice #notice_action-submit {
+    position: absolute;
+    top: 100%;
+    left: 0px;
+    margin-top: -44px;
+    float: left;
+    width: 90px;
+    padding: 0px;
+    z-index: 99;
+}
+
+.form_notice .error,
+.form_notice .success.
+.form_notice .notice-status {
+    width: 478px; 
+    position: relative;
+    top: 0px;
+    float: none;
+    clear: none;
+    margin-left: 0px;
+    margin-top: 5px;
+    padding: 5px 5px 5px 10px;
+    border: 1px solid #ccc;
+}
+
+.form_notice .error {
+    border: 1px solid #d05858;
+}
+
+.form_notice .attach-status code {
+    font-size: 1em;
+}
+
+.input_form fieldset {
+    margin: 0px;
+    padding: 0px;
+}
+
+.input_form fieldset fieldset {
+    margin-bottom: 10px !important;
 }
 
 #aside_primary {
-    background: none;
-    width: 210px;
-    padding-top: 0px;
-    margin-top: 5px;
+    width: 218px;
+    padding: 10px;
+    padding-top: 22px;
+    margin-top: 0px;
+    background-color: #ececf2; 
+    border-left: 1px solid #d8dae6;
+    border-right: 1px solid #d8dae6;
+    min-height: 800px; /* XXX set up equal column heights! */
 }
 
 #aside_primary .section {
     width: 100%;
     margin-left: 0px;
     margin-right: 0px;
+    font-size: 0.88em;
 }
 
 #aside_primary h2 {
-    border-bottom: 3px solid #A6ADBF;
-    color: #A6ADBF;
-    font-size: 1.1em;
-    letter-spacing: 2px;
     margin-bottom: 10px;
+    padding-bottom: 6px;
+    background: url('../images/brdr_black_dot.png') repeat-x bottom left;
+    color: #7a7c87;
+    font-size: 1.25em;
+    letter-spacing: 2px;
+    text-shadow: 0px 1px 1px rgba(255, 255, 255, 0.5);
     text-transform: uppercase;
-    text-align: right;
 }
 
 .section ul.entities {
-    width: 290px;
+    width: 220px;
 }
 
 .section .entities li {
@@ -286,8 +393,8 @@ address {
 
 #popular_notices .avatar {
     position: relative;
-    top: 2px;
-    margin-bottom: 4px;
+    top: 4px;
+    margin-bottom: 6px;
 }
 
 #aside_primary td {
@@ -310,7 +417,7 @@ address {
     color: #A6ADBF;
     font-size: 1.4em;
     letter-spacing: 4px;
-    text-transform: uppercase;
+    text-transform: none;
 }
 
 #notices_primary {
@@ -323,17 +430,17 @@ address {
 }
 
 .notice {
-    line-height: 1.35em;
+    line-height: 1.36em;
     margin-bottom: 10px;
 }
 
 #content .notice .author .photo {
     left: 0px;
-    top: 6px;
+    top: 9px;
 }
 
 #content .notice .entry-title {
-    min-height: 34px;
+    min-height: 35px;
 }
 
 #showstream .notice .entry-title {
@@ -345,7 +452,7 @@ address {
 }
 
 .notice div.entry-content {
-    font-size: 0.9em;
+    font-size: 0.88em;
     line-height: 1.2em;
     margin-top: 6px;
     opacity: 0.6;
@@ -371,6 +478,96 @@ div.entry-content a.response:after {
     margin-top: 4px;
 }
 
+.threaded-replies {
+    clear: both;
+    float: left;
+    width: 458px;
+    margin-left: 59px;
+    margin-top: 10px;
+    padding-right: 2px;
+    border-left: 3px solid #ECECF2;
+    background: #fafafa;
+    font-size: 1em;
+}
+
+#content .notice .threaded-replies .notice {
+    padding-bottom: 14px;
+    padding-top: 5px;
+    border-bottom: 2px dotted #eee;
+    line-height: 1.36em;
+    margin-top: 0px;
+    margin-bottom: 0px;
+    margin-left: 10px;
+    background: none;
+}
+
+#content .threaded-replies .notice .author .photo {
+    height: 24px;
+    width: 24px;
+    top: 14px;
+}
+
+#content .notice .threaded-replies .notice .entry-title {
+    margin: 2px 7px 0px 35px;
+}
+
+#content .notice .threaded-replies .notice div.entry-content {
+    clear:left;
+    float:left;
+    margin-left: 35px;
+    margin-top: 10px;
+}
+
+.threaded-replies li {
+    list-style-type: none;
+}
+
+.threaded-replies .notice-reply-comments {
+    margin: 2px 0px 4px 10px;
+}
+
+.threaded-replies .placeholder {
+    margin: 10px;
+    width: 426px;
+}
+
+.threaded-replies .notice-reply {
+    clear: left;
+    position: relative;
+    padding: 10px;
+    padding-bottom: 44px;
+}
+
+.threaded-replies .form_notice textarea {
+    width: 385px;
+}
+
+.threaded-replies .form_notice label.notice_data-attach {
+    top: 10px;
+    right: 10px;
+}
+
+.threaded-replies .form_notice .notice_data-geo_wrap label,
+.threaded-replies .form_notice .notice_data-geo_wrap input {
+    top: 36px;
+    right: 10px;
+}
+
+.threaded-replies .form_notice .count {
+    top: 60px;
+    right: 50px;
+}
+
+.threaded-replies .form_notice #notice_action-submit {
+    left: 10px;
+}
+
+.threaded-replies .form_notice .error,
+.threaded-replies .form_notice .success,
+.threaded-replies .form_notice .notice-status {
+    width: 390px; 
+}
+
 .pagination {
     height: 1.2em;
 }
@@ -382,14 +579,10 @@ div.entry-content a.response:after {
 
 .entity_profile {
     float: left;
-    width: 435px;
+    width: 360px;
     margin-top: 4px;
 }
 
-td.entity_profile { /* cf directory table */
-    width: auto;
-}
-
 .entity_profile .entity_depiction {
     margin-top: 4px;
 }
@@ -453,7 +646,7 @@ td.entity_profile { /* cf directory table */
   top: -3px;
 }
 
-.pagination {
+#pagination {
     height: 1.2em;
     padding-bottom: 12px;
     -webkit-border-radius: 6px;
@@ -493,29 +686,29 @@ td.entity_profile { /* cf directory table */
 }
 
 .form_notice input.submit, .form_settings input.submit, .form_settings input.cancel {
-    border-radius: 3px;
-    -moz-border-radius: 3px;
-    -webkit-border-radius: 3px;
-    text-shadow: 0px 1px 1px rgba(0, 0, 0, 0.5);
+    height: 1.9em;
+    padding: 0px 10px;
     color:#fff;
-    font-weight: normal;
-    font-size: 1em;
-    height: 2.2em;
-    padding-left: 1em;
-    padding-right: 1em;
-    background: #7080aa;
-    background: -moz-linear-gradient(top, #7b8dbb , #7080aa);
-    background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#7b8dbb), color-stop(100%,#7080aa)); 
-    filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#7b8dbb', endColorstr='#7080aa',GradientType=0 );
-    border-width: 1px;
+    font-weight: bold;
+    text-transform: uppercase;
+    font-size: 1.2em;
+    text-shadow: 0px -1px 0px rgba(0, 0, 0, 0.2);
+    border: 1px solid #d7621c;
+    border-radius: 4px;
+    -moz-border-radius: 4px;
+    -webkit-border-radius: 4px;
+    background: #FB6104;
+    background: -moz-linear-gradient(top, #ff9d63 , #FB6104);
+    background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ff9d63), color-stop(100%,#FB6104)); 
+    filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ff9d63', endColorstr='#FB6104',GradientType=0 );
 }
 
 .form_notice input.submit:hover, .form_settings input.submit:hover, .form_settings input.cancel:hover {
-    text-shadow: 0px 1px 1px rgba(0, 0, 0, 0.8);
-    background: #7b8dbb;
-    background: -moz-linear-gradient(top, #7080aa , #7b8dbb);
-    background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#7080aa), color-stop(100%,#7b8dbb));
-    filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#7080aa', endColorstr='#7b8dbb',GradientType=0 );
+    text-shadow: 0px -1px 0px rgba(0, 0, 0, 0.6);
+    background: #ff9d63;
+    background: -moz-linear-gradient(top, #FB6104 , #fc8035);
+    background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#FB6104), color-stop(100%,#fc8035));
+    filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#FB6104', endColorstr='#fc8035',GradientType=0 );
 }
 
 .form_settings input#settings_design_reset, .form_settings input.cancel {
@@ -825,4 +1018,63 @@ ul.bookmark-tags a:hover {
     margin-right: 0px;
 }
 
+/* Directory specific styles */
+
+td.entity_profile {
+    width: auto;
+}
+
+#user_directory {
+    position: relative;
+    top: -20px;
+}
+
+div#user_directory div.alpha_nav > a {
+    border-left: 1px solid #ccc !important;
+    padding-left: 3.5px !important;
+    padding-right: 4px !important;
+    margin-right: 0px;
+    float: left;
+    line-height: 1.4em;
+}
+
+div#user_directory div.alpha_nav > a.first {
+    border-left: none !important;
+}
+
+div#user_directory div.alpha_nav a.current {
+    background-color: #ECECF2 !important;
+}
+
+table.profile_list {
+    margin-top: 10px;
+}
+
+.profile_list th#created {
+    width: 100px;
+}
+
+.profile_list th#subscriptions {
+    width: 120px;
+}
+
+table.profile_list tr.alt {
+    background-color: #fafafa !important;
+}
+
+.profile_list .entity_actions {
+    width: 30px;
+    height: 26px;
+    margin-right: 5px;
+}
+
+.profile_list .entity_actions input {
+    width: 26px;
+    height: 26px;
+    display: block;
+    overflow: hidden;
+    font-size: 0em;
+}
+
+
 }/*end of @media screen, projection, tv*/
diff --git a/theme/neo/images/brdr_black_dot.png b/theme/neo/images/brdr_black_dot.png
new file mode 100644
index 0000000000000000000000000000000000000000..8a300b1e93d35fffb2c4fb849fa59de8edf6a657
GIT binary patch
literal 115
zcmeAS@N?(olHy`uVBq!ia0vp^Y(UJ&0V4mNy#E16NtU=qlmzFem6RtIr7}3C<R_&n
zc;+Uirv{}arc@T5Otk?j67_U(45_%4l#r0{;qU+d_RLmn90m-lj`G_l<hF1E6)<?Z
L`njxgN@xNA&;TLW

literal 0
HcmV?d00001

diff --git a/theme/neo/images/brdr_white_dot.png b/theme/neo/images/brdr_white_dot.png
new file mode 100644
index 0000000000000000000000000000000000000000..cdb2d5b20557ae0ab658a9b76bddb7adc8ed1591
GIT binary patch
literal 114
zcmeAS@N?(olHy`uVBq!ia0vp^Y(UJ&0V4mNy#E16NtU=qlmzFem6RtIr7}3C<R_&n
zc;+Uirv{}arc@T5Otk?j67h6#45_%4^yB~kdMN?p1<4Hz%nToUg+dojX1fKHXYh3O
Kb6Mw<&;$Uw86r#o

literal 0
HcmV?d00001

diff --git a/theme/neo/logo.png b/theme/neo/logo.png
index 61a445a61a952eb71507419aa052774c96603c72..389197953086b2d6b50dddd4bc6d7e7dddea6e6c 100644
GIT binary patch
literal 11740
zcmd6t3zU^r702&9c;=waK;Z~DqAb8t3c+{?1G9$5R3egy4;GISBp0aJ3zo*SRY2mh
zTDg=ghkO93fVENrL5NJ$0HN>^6(vc=LJUJ53QWKMxo02GeSkA}2By8%zWaIh-e-U3
zJKwqAz4L|-8&cG=v}GcZD5@G-IRbh=Skk;HpL4#oybzN2wGl%q63aHX`*$KymZ+*6
zc=e<vc{47axh)T4fRfT~XVlcxOw7y6y8&hQU`Qm6qu+u4G3dk49ndqdKLy`6@~bV|
z;_cmA51TW2hrq8inb^Dc{cGE~CL6`C#`xM$;v}eVE3|@m`-;!Gqz2gyl?`|veV;fM
zIj+LC%>1xv?hEkyruh*^LArqI)o^GT=)lKahkhk|HFOVityA3=i#!*@f1emd#8QkV
z@XKKzh93t`K<)rd$PE8H^ls>{$$3cnY``3~Hb&q(209RI&KQgF67nP19%0UV;R7)4
zuLvE3qLxg)`7xnN0{;zp0oWZrGzM0FouPL^Ujt`TRD19^d_%ykmJX_gP)a>17r!Br
zG+>O|iM5qFZ=>8Y_|Ply=m$XOLbpOEgE;}?TQRUNIr_l&1uugi34IBigRKLy<rdo;
zoi>6+EC_7^89-kz#l8;1Vq#Q5wZK9Q<euO?;0wg4fYuw_A|r8c5-kDSSVCy>mM4W+
zk8UTR$Xh^7!ivke5GK-|SpA9bVnJPA$jqFBp2C6DJC*QvQC}0N?Tm4+9M7CIpHF~#
zw&V(man!d&JB?&LVcLq79<+Xmx*kGDf_H-{z;$kiViiMrCqpH#ExI^{%Y#oxe4b#;
zwJAYz5b|kSGXmbk*b<Gm<Q7YEq*F0R!JdqH1=?JGkzHZ{^ls83=@^_6iR+1_?b}UM
zdhdHVwVfIHnLa(AH8$ui7jZRQu^R+vcvE6)2N8t1IUzY!XV3?^m0Y{NjvfsHiV0|*
zDY<=cEqLX$g+GCMJESFk5|`r0C!=RRw1z3iS@{2mIJ#NntNCY)kxhUt)Mb96I<RS>
zd|pl-@-X~|;B%o*qdNw#^U-bKrC?v4)qi0D<YU(=Z;2g}IEvg4UUyKD6!0?4fh?8m
zp@3?Rh$n^?Ko#S3*6?OG&L(s#%GqYXryKk+$&67mhrxbNvIpG&_ks6dYmSR*IE=jC
z+v`P$^<@I6X96qu@8p?=yv5g~W5;BCk3p}dSG%3J|2Q(XpcS^^*kZNg(HEkBrrDxn
zZ)6yg3e0XT9fCfFY8iMY{1m8ed|PNq??hrOjJqlPj^vI(_?i7}_$i#<7E6Io1#&g<
z+Dn!nycXpQ@MdH^KJBJGf~+0$yP$#A&I1VZv6){&lhU@|8ngmMpC$1;8wuS`0nef@
zLcdRXsLo?M#T&3_O5xoiFdcLkzS|=?u;l(UF*|`l7cm9!gTb)Kh_fxSt0~>m#}e}`
zF02lyrvkbX-!)&s#RE5!PdB5%pJDE$7Z>VgG-X6f8Mi3C?#O-({D~HsHR>i}>+o;z
z5WRSjxLRmV=WFX>4(P{w-eRc!D&pv%?*M)+bywp19JbazRz9>B`nL3chxv-4+ZD_5
zXWSm*r1&X-^Gl;$DO%6|01W(qByNEPWhSGA5hfusNu|pG3Y1?zPzzIj0<i*PI^idu
z6G1^V#x8#TiJa@JCzp2hlrYFQQsa3kN(6e9ZGoxA<LNPMte=Z^<E$V%W3^+hN_Rj%
zJv}b6i^a9nvEvfZ`l^1fi5Hl~qi)?KPnax<uWpPBVx8wx`j3y)8U5Ez_5p@>pl7Q{
zsJhr0{zZz@fKA{(LEWuODXc*rJ>=2E-D87Xwu`C`?S$G{1s_Kq2;JbM#{bak5L?Vf
z^~&Q)dZj*YXD)w2{uOjN7p$SaeTSJ7`#tq5C_IB+N1SxE$rr)s@#P%wRqe&pe5W}W
zRcxSbB#UhUX8pEmekY?kUmOBg5PZB(E`JqMpoGvK=zGBHebD_Bwh(?Q4SWZ=K2S=W
z%Y6Xl(*@BtTs^*Tl-}1<PR?Q$_ebrb8gfd3+8!stz0}nLUcFJ>uz5P4>Q#VV59r)F
z7J85!PG_Zu=#>^=g8{KKVv##T7b*1qQ`gg}pbGFAkC9ul=U!p+lh_Ij3(wnYP4c;T
z@00W{irDE##WQeKsW|LT4?hw1asRlhb)qbeiX*i`3-o1RF?2iVE{e}vfxe?08yi?G
z2dM29)dAHl?^r%4HC#ZaL)Po@pMqngXk^fnB9x%Ig|RLeKV;ne%oiFC@*ld?j&sjX
zny1$hLrMAzg1Ks<;BFOQGrc<73;bg3Qe=Ah1v=ha6k4#CIyOL8qj!&FYOv<S-+nU#
zo<<Ef<pb1MPRcFNu-L3$=<U(3@>SVFeKaOer`-@%hOXs)>U$m2M<Tv&fH^<8^tg0D
z^K{@FC1erk(Wp1SpA=Hah0w6rC{A~&4&-`#)EO9m9Wh%$bro#!zD(Xe$lAqhC$r}0
zC!JZ~=>SS|CAnP55>wN1GyE1!ck0!z9{upS2&!X+dUm$PC<vgQ<@31jLw|oCN0CoD
z$o~|<0b=W{8vuC)^B5Ntr;rJYEY3ml705ydG*gRj2^e?bV@Ye>KbfF=R6;GDI(`L>
zzal*vE~sl-Qo~T{TA6OIi|o_6g)N@Amt`4W7VCWe1F_C{>e&VVsL7(#`Af!xdH6hC
zG1(&1JFfN8rvrMO_4cOg>njuY72>{6oG^Fz{?wY!9I}2n;l^mHqf~u!YkXK_1RX*l
zM@hOSJupT7A=YJUP;5ULPo6Hs(@R@7VegBW+4R`Pm|4iRU1SqGE&L9zgy-wO04FNv
zH4OTZ+ji&zYMV-9=Ss%~P@T7nS8edBR~JOPSOCV{fUt#eI&!3gbYa1Hqh5YHXj*+#
zi*!IzIz6A%xu3b|edAzd^z%9&c7{i(12Dg0=0Be?8(15Qf+0u7EjWUGmhlSKk^~!}
z%Socc_*?J;z{#K*9~KF=T%XrpQY^r2SHyIWM@UlZKa<xtdDiiKPwMQ<q+d^Qtb;(D
z`*7DU1MUpv<4z~;1oV2eoCUU#9SU)^9fX8MMt|mDn}%)=ylzhIR%?-qiT4F?5<IGK
zF(ufJ=Jbv6L0u1$SBosnojRv6hyLh(4C<VwcWl?<I|}R!KL&ei7U=@`oS~2)T^PNZ
zphYB6a|b~OWr--8!G3(!nowIxt|ELDJ6~gnp$p(HBKh4*MCk!Fq7Aec`p^{E>(R}S
zLoPtGen1W1CQeB*wacUTK^-lg*XwR~D&*<*cwsTJRVMDhCO8M%XynoG&fmuRSPFp3
z{q1Lq*EJep?n{{aH>k(GaEGcs{j@iL`UhBHnhQFKvTGBX$Gi{I11-dyppbw%hw0*H
zG|DG)fqf&Bw`lSO?bFUsw~v0fm-!)tbn9n56Zl+u7#gA%#d=TXa>9#_)`iC3eMv|k
zQyZBugUS0O*v`jxi^0aC7prv2QBAHNN<rRA$X8`gmLhEu(q&VN;y=dA{|{ssMf?WT
zmpi+bDf97jp=@_;RP%daz0PUcQS@(&H3|+|V%KT(0b~Ot&*HAom<*sW{hHtwY-H4n
zR$Zh5h+diKktDEO%ada2Cw}juSs!bOU50$6>F`PUkzM(*H8XoQ%A(nfUav>0z1`Kp
z*l?2(_XTX)p}yjMWZMW%!S*IPt6logEAfCE0^Nh}IB>Pa$bmB4{eT{7BSv_^8pk7F
z#ysR3`*7Xf#7}eAP3B@oc2q%U^ZOn4Vf5@LkzdTF^q*Q~3+GRBEF{2sc8!fVl%t#g
z_6E;22PFnx#l8amXV9Hy%R)C{*CKEW3#y&czCh?V(<Q`Mhu#H6*1r~>L(Tx|I!0ZS
zFnkKsdCA~aW1!D~*MRO(OT6RoI^3TWX!bT1{UmaK9mhf71&r0>S!XAm`F4>1AT$7D
z4p7g7D3&qqD(FbYl!JP;;{aY=-UL1h`*ULKO<HpPeAoBKjxt&_FQd~gn*!w1O}QC*
zNCte=@9im02+ZRj%zYH>`JlcbmE+q9-}Au#!fyiq2)`7%RrAK@M6e3Oh{&k=;_Kr~
Y-8z@7pZU}s*GZ@vG^}!2#kkr31NNyZ3jhEB

literal 1633
zcmV-n2A=teP)<h;3K|Lk000e1NJLTq006xJ000;W1^@s6uLk^W0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU&14%?dRCwC#T-|NsI1pwG;a*q3z1@?p
zg2)xbt{_SUkt;}CL6Qn=S74_COBF<0L6i!jeYv*-^n6%gmt&0fcm#(cDbkjJ8-Q?N
zNz@GI<NR@)h$-mzKdy8Bamz=hxZLtl@lo<o{QcKQi_a|h#~T|+e7-9MKfuRP`nu-#
z&I$g1u;H}i^H-YrDt>*bcsI2U%KL?9?)iYvMD;Al%g2t-(J+t1-@V}<sp8U_4|rFO
zyvg?fKd*coIt&=TufrC|8Y||kbaML8?M#|5<>Qn8xhDY6kkJh9`9wg5rd!2#z-z)L
zOq~Cik0Wl9oB%vSfIQ-QZ{RtPY@|59YP|D7ZHg4Hy#sCxWR<ZM6LWTQK8ITOnaC6_
zz73Fo@grJ`V8B2?s3@N@;BmcejmD!7k7__0LoC2OZ#n~n*8SZQTTlGCeK61q3UIL?
zExNf-qyxqMgbn?ku%ISXj!c#q<xyIA>Y4%NA%H&<ET${qA@;2UE~pOJiHU0+p_NY@
zEPO{0LqCsDtOcQqp`gt%=kZ37CT8vuiybC3-HyJ+O(FvxK9>Y&b0Sfy4ZzVS@B<$!
zISJLopeh;H#P^{n*BFr<CUasw(-|cI{7UuUKY0|Jc#hu=-z!UAyP^f~cGDA5X5zYG
zSVQr&6%$sxcS9Io_<pX@ErqdzDhi2&M2V_k$eDS;8H9;i(Zb_>6;YW`Zm6z0;uzY9
z_pGD}kctn|TN&`-n<!@1oR@<PI?nqGD3xE^_9UbxvHq0>pKIxz2hPh5<8u|=7!)8>
z^McM`?wSa*Aqh?aZ-j0sjD1txKhp@@P^BoCC~!z)6SK!>sv!A}ft71ctasZ3_z+a9
z-idne<puM^jKI~Fkh4bX>}mk*sy9TuyuVag5aYwt<K`F>QFZOjh&FIJFp;KoS2(`+
z+ILJ}6HMlqNObprvc94fC;~6~y(Z6)dCkDG*c_5vm_7*01#%s6y<3#E!8I=?B%coS
zsbdX3_6_>dz^bNV{LdK&1-t}wyVPm$iijyQjcXhmfx&n(Q1U`BKHzn?xaLy;KLyf-
zL2<%n6FG-BTaC-r3AG7PM@1K}3abi?``RgoI4FZl@_ag&@_ZsY^*qQ8^k_Mj4!~zD
zKpj<+^_QBsa51sAggfR|7EKMj#Q$Uv-khut2hAK8G`F1R!O?QrWc{s>N0bDQnMq|~
zB-S1b%pBv}duDe;4;FttQOq@rs8XFB^r(miW9AiFZx~<Dx+F~B5alzLSGlrU@F=Zj
z^KGYu06blN7OGVVRw@!*91Cl4f%63$qIC3n=@aEhql`+n-b9P9*LX`4+L$CjNq2~G
z!Rkcp2>x0QcQ9O|ngGWh%27JFzBFTzrD6&^H4D=3GO#B_OlZ#m`k1h`)TaIFun`(O
z{eJ2LJ+>EIO#t*zUQYUc7ZB2uiLJ$;MCgrv?1{HSHhB3sn8^e1MV(1(#N-**E;j`M
z9{%lnsxdd3*m&$Y3$<>?o>pY22)>1CEsg{*zagOE@ZbR%{w64E!RWG}F9rB0JD%DS
zJRhEwj6O{I)b#a;@olA0Y%W+oxc(vBm$H9<VPs=T$3(hy0|R?N57-J`QY=@W4o0aa
zJ7>^KfEQioqX$c96WUO12dzfIl;^qi!INOMpc(3EKpedj50oUpcXDJnOv;hXnerAN
z>-IqCC`OF+;mkYmBL(1Hvh<gLR=%JFMi==>EY#Zb$>kk$`=L!GRx9vVW<x`;DU~Z%
z%>4&SzdVD_Hj~*vH`(>n`(P&1xJWY5(<MxvtycGY0UKElxLHK{U~Y$izvetc-_xbn
zO%CIhJ`LCmt>~RYT;4G=*v(@7T@^aC1`2)+m>;MV_$PWcof0Zso0Y6A?3Z6M`@_6b
z-;wY5_Kd)vTgu$^cFleF8b!zy0ILxGJwr->utCO43u|*Agsr7{mxSOZ^Vg=E)bSm1
zRRY45XJNA@0@$0ra$INq@cAxTO*I>+WS0MG!_s)!7AIN*ovOU@QYcH`u>UsI4e2VS
fFs78@rvL*0?F*Xy<Y62900000NkvXXu0mjfTnPt3

diff --git a/theme/neo/theme.ini b/theme/neo/theme.ini
index 0209008d40..b85ceca0b4 100644
--- a/theme/neo/theme.ini
+++ b/theme/neo/theme.ini
@@ -1 +1,5 @@
+external[]="http://fonts.googleapis.com/css?family=Lato:100,100italic,300,300italic,400,400italic,700,700italic,900,900italic"
+external[]="http://fonts.googleapis.com/css?family=Cabin:400,500,600,bold"
+external[]="http://fonts.googleapis.com/css?family=Puritan:regular,italic,bold,bolditalic"
+external[]="http://fonts.googleapis.com/css?family=Cantarell:regular,italic,bold,bolditalic"
 include=rebase
diff --git a/theme/rebase/css/display.css b/theme/rebase/css/display.css
index c1ac1e8f4d..ee88b312a7 100644
--- a/theme/rebase/css/display.css
+++ b/theme/rebase/css/display.css
@@ -928,7 +928,7 @@ outline:none;
 text-indent:-9999px;
 }
 
-.pagination {
+#pagination {
     background-color: #f2f2f2;
     clear: left;
     margin-top: 20px;
@@ -936,19 +936,15 @@ text-indent:-9999px;
     height: 1em;
 }
 
-.pagination dt {
-    display: none;
-}
-
-.pagination li {
+#pagination li {
     display: inline;
 }
 
-.pagination .nav_prev {
+#pagination .nav_prev {
     float: left;
 }
 
-.pagination .nav_next {
+#pagination .nav_next {
     float: right;
 }
 
@@ -1737,7 +1733,7 @@ body.realtime-popup {
     right: 70px;
 }
 
-.realtime-popup .form_notice .notice_data-geo_wrap label, .form_notice .notice_data-geo_wrap input {
+.realtime-popup .form_notice .notice_data-geo_wrap label, .realtime-popup .form_notice .notice_data-geo_wrap input {
     right: 2px;
 }
 
@@ -1763,8 +1759,8 @@ body.realtime-popup {
 .notice-options .notice_delete,
 .notice-options form.form_repeat input.submit,
 #new_group a,
-.pagination .nav_prev a,
-.pagination .nav_next a,
+#pagination .nav_prev a,
+#pagination .nav_next a,
 button.close,
 .form_group_leave input.submit,
 .form_user_unsubscribe input.submit,
@@ -1940,12 +1936,12 @@ background-position:0 -1054px;
     background-position: 0 -1846px;
 }
 
-.pagination .nav_prev a {
+#pagination .nav_prev a {
     padding-top: 8px;
     padding-left: 25px;
     background-position:0 -187px;
 }
-.pagination .nav_next a { 
+#pagination .nav_next a { 
     padding-top: 9px;
     padding-right: 25px;
     background-position: 115% -252px;

From ac880bd6ea8160d577ef02420238e822506cb18a Mon Sep 17 00:00:00 2001
From: Samantha Doherty <sammy@status.net>
Date: Thu, 10 Mar 2011 18:12:14 -0500
Subject: [PATCH 510/655] Stupid tiny typo in neo.

---
 theme/neo/css/display.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/theme/neo/css/display.css b/theme/neo/css/display.css
index cdc33bd308..528537b029 100644
--- a/theme/neo/css/display.css
+++ b/theme/neo/css/display.css
@@ -322,7 +322,7 @@ address {
 }
 
 .form_notice .error,
-.form_notice .success.
+.form_notice .success,
 .form_notice .notice-status {
     width: 478px; 
     position: relative;

From a984aae56499466220b25c43c24637273005f4d7 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Thu, 10 Mar 2011 18:08:14 +0000
Subject: [PATCH 511/655] Show a reasonable error message when an image is bad,
 instead of letting the exception continue bubbling up.

---
 actions/newapplication.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/actions/newapplication.php b/actions/newapplication.php
index eb13593536..657c7bcb71 100644
--- a/actions/newapplication.php
+++ b/actions/newapplication.php
@@ -22,7 +22,7 @@
  * @category  Applications
  * @package   StatusNet
  * @author    Zach Copley <zach@status.net>
- * @copyright 2008-2009 StatusNet, Inc.
+ * @copyright 2008-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/
  */
@@ -290,7 +290,13 @@ class NewApplicationAction extends OwnerDesignAction
             $app->query('ROLLBACK');
         }
 
-        $app->uploadLogo();
+	try {
+            $app->uploadLogo();
+        } catch (Exception $e) {
+            $app->query('ROLLBACK');
+            $this->showForm(_('Invalid image.'));
+	    return;	 
+	}
 
         $app->query('COMMIT');
 

From 6b5b6d072b57bc21e4ac82f58275d39070c23309 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Thu, 10 Mar 2011 16:06:01 -0800
Subject: [PATCH 512/655] Make inline reply forms close when clicking outside
 them if there's no text again. (That went away when we switched to reusing
 the main notice form)

---
 js/util.js     | 22 ++++++++++++++++++++++
 js/util.min.js |  2 +-
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/js/util.js b/js/util.js
index cc95a08bf5..29fdfe2a98 100644
--- a/js/util.js
+++ b/js/util.js
@@ -640,6 +640,7 @@ var SN = { // StatusNet
                                 '</li>');
             placeholder.click(function() {
                 SN.U.NoticeInlineReplyTrigger(notice);
+                return false;
             });
             placeholder.find('input').val(SN.msg('reply_placeholder'));
             list.append(placeholder);
@@ -1309,6 +1310,27 @@ var SN = { // StatusNet
                     var form = $(this);
                     SN.Init.NoticeFormSetup(form);
                 });
+
+                // Make inline reply forms self-close when clicking out.
+                $('body').bind('click', function(e) {
+                    var openReplies = $('li.notice-reply');
+                    if (openReplies.length > 0) {
+                        var target = $(e.target).closest('li.notice-reply');
+                        if (target.length == 0) {
+                            // There are inline replies open, and we
+                            // clicked outside of one...
+                            openReplies.each(function() {
+                                var replyItem = $(this);
+                                // Only close if there's been no edit.
+                                if (replyItem.find('.notice_data-text:first').val() == '') {
+                                    var parentNotice = replyItem.closest('li.notice');
+                                    replyItem.remove();
+                                    SN.U.NoticeInlineReplyPlaceholder(parentNotice);
+                                }
+                            });
+                        }
+                    }
+                });
             }
         },
 
diff --git a/js/util.min.js b/js/util.min.js
index 32a893355f..a9e92db492 100644
--- a/js/util.min.js
+++ b/js/util.min.js
@@ -1 +1 @@
-var SN={C:{I:{CounterBlackout:false,MaxLength:140,PatternUsername:/^[0-9a-zA-Z\-_.]*$/,HTTP20x30x:[200,201,202,203,204,205,206,300,301,302,303,304,305,306,307],NoticeFormMaster:null},S:{Disabled:"disabled",Warning:"warning",Error:"error",Success:"success",Processing:"processing",CommandResult:"command_result",FormNotice:"form_notice",NoticeDataGeo:"notice_data-geo",NoticeDataGeoCookie:"NoticeDataGeo",NoticeDataGeoSelected:"notice_data-geo_selected",StatusNetInstance:"StatusNetInstance"}},messages:{},msg:function(a){if(typeof SN.messages[a]=="undefined"){return"["+a+"]"}else{return SN.messages[a]}},U:{FormNoticeEnhancements:function(b){if(jQuery.data(b[0],"ElementData")===undefined){MaxLength=b.find(".count").text();if(typeof(MaxLength)=="undefined"){MaxLength=SN.C.I.MaxLength}jQuery.data(b[0],"ElementData",{MaxLength:MaxLength});SN.U.Counter(b);NDT=b.find(".notice_data-text:first");NDT.bind("keyup",function(c){SN.U.Counter(b)});var a=function(c){window.setTimeout(function(){SN.U.Counter(b)},50)};NDT.bind("cut",a).bind("paste",a)}else{b.find(".count").text(jQuery.data(b[0],"ElementData").MaxLength)}},Counter:function(d){SN.C.I.FormNoticeCurrent=d;var b=jQuery.data(d[0],"ElementData").MaxLength;if(b<=0){return}var c=b-SN.U.CharacterCount(d);var a=d.find(".count");if(c.toString()!=a.text()){if(!SN.C.I.CounterBlackout||c===0){if(a.text()!=String(c)){a.text(c)}if(c<0){d.addClass(SN.C.S.Warning)}else{d.removeClass(SN.C.S.Warning)}if(!SN.C.I.CounterBlackout){SN.C.I.CounterBlackout=true;SN.C.I.FormNoticeCurrent=d;window.setTimeout("SN.U.ClearCounterBlackout(SN.C.I.FormNoticeCurrent);",500)}}}},CharacterCount:function(a){return a.find(".notice_data-text:first").val().length},ClearCounterBlackout:function(a){SN.C.I.CounterBlackout=false;SN.U.Counter(a)},RewriteAjaxAction:function(a){if(document.location.protocol=="https:"&&a.substr(0,5)=="http:"){return a.replace(/^http:\/\/[^:\/]+/,"https://"+document.location.host)}else{return a}},FormXHR:function(a){$.ajax({type:"POST",dataType:"xml",url:SN.U.RewriteAjaxAction(a.attr("action")),data:a.serialize()+"&ajax=1",beforeSend:function(b){a.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(c,d,b){alert(b||d)},success:function(b,c){if(typeof($("form",b)[0])!="undefined"){form_new=document._importNode($("form",b)[0],true);a.replaceWith(form_new)}else{a.replaceWith(document._importNode($("p",b)[0],true))}}})},FormNoticeXHR:function(b){SN.C.I.NoticeDataGeo={};b.append('<input type="hidden" name="ajax" value="1"/>');b.attr("action",SN.U.RewriteAjaxAction(b.attr("action")));var c=function(d,e){b.append($('<p class="form_response"></p>').addClass(d).text(e))};var a=function(){b.find(".form_response").remove()};b.ajaxForm({dataType:"xml",timeout:"60000",beforeSend:function(d){if(b.find(".notice_data-text:first").val()==""){b.addClass(SN.C.S.Warning);return false}b.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled);SN.U.normalizeGeoData(b);return true},error:function(f,g,e){b.removeClass(SN.C.S.Processing).find(".submit").removeClass(SN.C.S.Disabled).removeAttr(SN.C.S.Disabled,SN.C.S.Disabled);a();if(g=="timeout"){c("error","Sorry! We had trouble sending your notice. The servers are overloaded. Please try again, and contact the site administrator if this problem persists.")}else{var d=SN.U.GetResponseXML(f);if($("."+SN.C.S.Error,d).length>0){b.append(document._importNode($("."+SN.C.S.Error,d)[0],true))}else{if(parseInt(f.status)===0||jQuery.inArray(parseInt(f.status),SN.C.I.HTTP20x30x)>=0){b.resetForm().find(".attach-status").remove();SN.U.FormNoticeEnhancements(b)}else{c("error","(Sorry! We had trouble sending your notice ("+f.status+" "+f.statusText+"). Please report the problem to the site administrator if this happens again.")}}}},success:function(i,f){a();var n=$("#"+SN.C.S.Error,i);if(n.length>0){c("error",n.text())}else{if($("body")[0].id=="bookmarklet"){self.close()}var d=$("#"+SN.C.S.CommandResult,i);if(d.length>0){c("success",d.text())}else{var m=document._importNode($("li",i)[0],true);var k=$("#notices_primary .notices:first");var l=b.closest("li.notice-reply");if(l.length>0){var e=$(m).attr("id");if($("#"+e).length==0){var j=l.closest("li.notice");l.replaceWith(m);SN.U.NoticeInlineReplyPlaceholder(j)}else{l.remove()}}else{if(k.length>0&&SN.U.belongsOnTimeline(m)){if($("#"+m.id).length===0){var h=b.find("[name=inreplyto]").val();var g="#notices_primary #notice-"+h;if($("body")[0].id=="conversation"){if(h.length>0&&$(g+" .notices").length<1){$(g).append('<ul class="notices"></ul>')}$($(g+" .notices")[0]).append(m)}else{k.prepend(m)}$("#"+m.id).css({display:"none"}).fadeIn(2500);SN.U.NoticeWithAttachment($("#"+m.id));SN.U.NoticeReplyTo($("#"+m.id))}}else{c("success",$("title",i).text())}}}b.resetForm();b.find("[name=inreplyto]").val("");b.find(".attach-status").remove();SN.U.FormNoticeEnhancements(b)}},complete:function(d,e){b.removeClass(SN.C.S.Processing).find(".submit").removeAttr(SN.C.S.Disabled).removeClass(SN.C.S.Disabled);b.find("[name=lat]").val(SN.C.I.NoticeDataGeo.NLat);b.find("[name=lon]").val(SN.C.I.NoticeDataGeo.NLon);b.find("[name=location_ns]").val(SN.C.I.NoticeDataGeo.NLNS);b.find("[name=location_id]").val(SN.C.I.NoticeDataGeo.NLID);b.find("[name=notice_data-geo]").attr("checked",SN.C.I.NoticeDataGeo.NDG)}})},normalizeGeoData:function(a){SN.C.I.NoticeDataGeo.NLat=a.find("[name=lat]").val();SN.C.I.NoticeDataGeo.NLon=a.find("[name=lon]").val();SN.C.I.NoticeDataGeo.NLNS=a.find("[name=location_ns]").val();SN.C.I.NoticeDataGeo.NLID=a.find("[name=location_id]").val();SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked");var b=$.cookie(SN.C.S.NoticeDataGeoCookie);if(b!==null&&b!="disabled"){b=JSON.parse(b);SN.C.I.NoticeDataGeo.NLat=a.find("[name=lat]").val(b.NLat).val();SN.C.I.NoticeDataGeo.NLon=a.find("[name=lon]").val(b.NLon).val();if(b.NLNS){SN.C.I.NoticeDataGeo.NLNS=a.find("[name=location_ns]").val(b.NLNS).val();SN.C.I.NoticeDataGeo.NLID=a.find("[name=location_id]").val(b.NLID).val()}else{a.find("[name=location_ns]").val("");a.find("[name=location_id]").val("")}}if(b=="disabled"){SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked",false).attr("checked")}else{SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked",true).attr("checked")}},GetResponseXML:function(b){try{return b.responseXML}catch(a){return(new DOMParser()).parseFromString(b.responseText,"text/xml")}},NoticeReply:function(){if($("#content .notice_reply").length>0){$("#content .notice").each(function(){SN.U.NoticeReplyTo($(this))})}},NoticeReplyTo:function(a){a.find(".notice_reply").live("click",function(c){c.preventDefault();var b=($(".author .nickname",a).length>0)?$($(".author .nickname",a)[0]):$(".author .nickname.uid");SN.U.NoticeInlineReplyTrigger(a,"@"+b.text());return false})},NoticeInlineReplyTrigger:function(h,i){var b=$($(".notice_id",h)[0]).text();var e=h;var f=h.closest(".notices");if(f.hasClass("threaded-replies")){e=f.closest(".notice")}else{f=$("ul.threaded-replies",h);if(f.length==0){f=$('<ul class="notices threaded-replies xoxo"></ul>');h.append(f)}}var j=$(".notice-reply-form",f);var d=function(){j.find("input[name=inreplyto]").val(b);var m=j.find("textarea");if(m.length==0){throw"No textarea"}var l="";if(i){l=i+" "}m.val(l+m.val().replace(RegExp(l,"i"),""));m.data("initialText",$.trim(i+""));m.focus();if(m[0].setSelectionRange){var k=m.val().length;m[0].setSelectionRange(k,k)}};if(j.length>0){d()}else{$("li.notice-reply-placeholder").remove();var g=$("li.notice-reply",f);if(g.length==0){g=$('<li class="notice-reply"></li>');var c=function(k){var l=document._importNode(k,true);g.append(l);f.append(g);var m=j=$(l);SN.Init.NoticeFormSetup(m);d()};if(SN.C.I.NoticeFormMaster){c(SN.C.I.NoticeFormMaster)}else{var a=$("#form_notice").attr("action");$.get(a,{ajax:1},function(k,m,l){c($("form",k)[0])})}}}},NoticeInlineReplyPlaceholder:function(b){var a=b.find("ul.threaded-replies");var c=$('<li class="notice-reply-placeholder"><input class="placeholder"></li>');c.click(function(){SN.U.NoticeInlineReplyTrigger(b)});c.find("input").val(SN.msg("reply_placeholder"));a.append(c)},NoticeInlineReplySetup:function(){$(".threaded-replies").each(function(){var b=$(this);var a=b.closest(".notice");SN.U.NoticeInlineReplyPlaceholder(a)})},NoticeRepeat:function(){$(".form_repeat").live("click",function(a){a.preventDefault();SN.U.NoticeRepeatConfirmation($(this));return false})},NoticeRepeatConfirmation:function(a){var c=a.find(".submit");var b=c.clone();b.addClass("submit_dialogbox").removeClass("submit");a.append(b);b.bind("click",function(){SN.U.FormXHR(a);return false});c.hide();a.addClass("dialogbox").append('<button class="close">&#215;</button>').closest(".notice-options").addClass("opaque");a.find("button.close").click(function(){$(this).remove();a.removeClass("dialogbox").closest(".notice-options").removeClass("opaque");a.find(".submit_dialogbox").remove();a.find(".submit").show();return false})},NoticeAttachments:function(){$(".notice a.attachment").each(function(){SN.U.NoticeWithAttachment($(this).closest(".notice"))})},NoticeWithAttachment:function(b){if(b.find(".attachment").length===0){return}var a=b.find(".attachment.more");if(a.length>0){$(a[0]).click(function(){var c=$(this);c.addClass(SN.C.S.Processing);$.get(c.attr("href")+"/ajax",null,function(d){c.parent(".entry-content").html($(d).find("#attachment_view .entry-content").html())});return false}).attr("title",SN.msg("showmore_tooltip"))}},NoticeDataAttach:function(b){var a=b.find("input[type=file]");a.change(function(f){b.find(".attach-status").remove();var d=$(this).val();if(!d){return false}var c=$('<div class="attach-status '+SN.C.S.Success+'"><code></code> <button class="close">&#215;</button></div>');c.find("code").text(d);c.find("button").click(function(){c.remove();a.val("");return false});b.append(c);if(typeof this.files=="object"){for(var e=0;e<this.files.length;e++){SN.U.PreviewAttach(b,this.files[e])}}})},maxFileSize:function(b){var a=$(b).find("input[name=MAX_FILE_SIZE]").attr("value");if(a){return parseInt(a)}else{return 0}},PreviewAttach:function(d,c){var e=c.type+" "+Math.round(c.size/1024)+"KB";var f=true;var h;if(typeof window.createObjectURL!="undefined"){h=function(i,j){j(window.createObjectURL(i))}}else{if(typeof window.FileReader!="undefined"){h=function(j,k){var i=new FileReader();i.onload=function(l){k(i.result)};i.readAsDataURL(j)}}else{f=false}}var a=["image/png","image/jpeg","image/gif","image/svg+xml"];if($.inArray(c.type,a)==-1){f=false}var g=8*1024*1024;if(c.size>g){f=false}if(f){h(c,function(j){var i=$("<img>").attr("title",e).attr("alt",e).attr("src",j).attr("style","height: 120px");d.find(".attach-status").append(i)})}else{var b=$("<div></div>").text(e);d.find(".attach-status").append(b)}},NoticeLocationAttach:function(a){var e=a.find("[name=lat]");var k=a.find("[name=lon]");var g=a.find("[name=location_ns]").val();var l=a.find("[name=location_id]").val();var b="";var d=a.find("[name=notice_data-geo]");var c=a.find("[name=notice_data-geo]");var j=a.find("label.notice_data-geo");function f(n){j.attr("title",jQuery.trim(j.text())).removeClass("checked");a.find("[name=lat]").val("");a.find("[name=lon]").val("");a.find("[name=location_ns]").val("");a.find("[name=location_id]").val("");a.find("[name=notice_data-geo]").attr("checked",false);$.cookie(SN.C.S.NoticeDataGeoCookie,"disabled",{path:"/"});if(n){a.find(".geo_status_wrapper").removeClass("success").addClass("error");a.find(".geo_status_wrapper .geo_status").text(n)}else{a.find(".geo_status_wrapper").remove()}}function m(n,o){SN.U.NoticeGeoStatus(a,"Looking up place name...");$.getJSON(n,o,function(p){var q,r;if(typeof(p.location_ns)!="undefined"){a.find("[name=location_ns]").val(p.location_ns);q=p.location_ns}if(typeof(p.location_id)!="undefined"){a.find("[name=location_id]").val(p.location_id);r=p.location_id}if(typeof(p.name)=="undefined"){NLN_text=o.lat+";"+o.lon}else{NLN_text=p.name}SN.U.NoticeGeoStatus(a,NLN_text,o.lat,o.lon,p.url);j.attr("title",NoticeDataGeo_text.ShareDisable+" ("+NLN_text+")");a.find("[name=lat]").val(o.lat);a.find("[name=lon]").val(o.lon);a.find("[name=location_ns]").val(q);a.find("[name=location_id]").val(r);a.find("[name=notice_data-geo]").attr("checked",true);var s={NLat:o.lat,NLon:o.lon,NLNS:q,NLID:r,NLN:NLN_text,NLNU:p.url,NDG:true};$.cookie(SN.C.S.NoticeDataGeoCookie,JSON.stringify(s),{path:"/"})})}if(c.length>0){if($.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){c.attr("checked",false)}else{c.attr("checked",true)}var h=a.find(".notice_data-geo_wrap");var i=h.attr("title");h.removeAttr("title");j.attr("title",j.text());c.change(function(){if(c.attr("checked")===true||$.cookie(SN.C.S.NoticeDataGeoCookie)===null){j.attr("title",NoticeDataGeo_text.ShareDisable).addClass("checked");if($.cookie(SN.C.S.NoticeDataGeoCookie)===null||$.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){if(navigator.geolocation){SN.U.NoticeGeoStatus(a,"Requesting location from browser...");navigator.geolocation.getCurrentPosition(function(p){a.find("[name=lat]").val(p.coords.latitude);a.find("[name=lon]").val(p.coords.longitude);var q={lat:p.coords.latitude,lon:p.coords.longitude,token:$("#token").val()};m(i,q)},function(p){switch(p.code){case p.PERMISSION_DENIED:f("Location permission denied.");break;case p.TIMEOUT:f("Location lookup timeout.");break}},{timeout:10000})}else{if(e.length>0&&k.length>0){var n={lat:e,lon:k,token:$("#token").val()};m(i,n)}else{f();c.remove();j.remove()}}}else{var o=JSON.parse($.cookie(SN.C.S.NoticeDataGeoCookie));a.find("[name=lat]").val(o.NLat);a.find("[name=lon]").val(o.NLon);a.find("[name=location_ns]").val(o.NLNS);a.find("[name=location_id]").val(o.NLID);a.find("[name=notice_data-geo]").attr("checked",o.NDG);SN.U.NoticeGeoStatus(a,o.NLN,o.NLat,o.NLon,o.NLNU);j.attr("title",NoticeDataGeo_text.ShareDisable+" ("+o.NLN+")").addClass("checked")}}else{f()}}).change()}},NoticeGeoStatus:function(e,a,f,g,c){var h=e.find(".geo_status_wrapper");if(h.length==0){h=$('<div class="'+SN.C.S.Success+' geo_status_wrapper"><button class="close" style="float:right">&#215;</button><div class="geo_status"></div></div>');h.find("button.close").click(function(){e.find("[name=notice_data-geo]").removeAttr("checked").change()});e.append(h)}var b;if(c){b=$("<a></a>").attr("href",c)}else{b=$("<span></span>")}b.text(a);if(f||g){var d=f+";"+g;b.attr("title",d);if(!a){b.text(d)}}h.find(".geo_status").empty().append(b)},NewDirectMessage:function(){NDM=$(".entity_send-a-message a");NDM.attr({href:NDM.attr("href")+"&ajax=1"});NDM.bind("click",function(){var a=$(".entity_send-a-message form");if(a.length===0){$(this).addClass(SN.C.S.Processing);$.get(NDM.attr("href"),null,function(b){$(".entity_send-a-message").append(document._importNode($("form",b)[0],true));a=$(".entity_send-a-message .form_notice");SN.U.FormNoticeXHR(a);SN.U.FormNoticeEnhancements(a);a.append('<button class="close">&#215;</button>');$(".entity_send-a-message button").click(function(){a.hide();return false});NDM.removeClass(SN.C.S.Processing)})}else{a.show();$(".entity_send-a-message textarea").focus()}return false})},GetFullYear:function(c,d,a){var b=new Date();b.setFullYear(c,d,a);return b},StatusNetInstance:{Set:function(b){var a=SN.U.StatusNetInstance.Get();if(a!==null){b=$.extend(a,b)}$.cookie(SN.C.S.StatusNetInstance,JSON.stringify(b),{path:"/",expires:SN.U.GetFullYear(2029,0,1)})},Get:function(){var a=$.cookie(SN.C.S.StatusNetInstance);if(a!==null){return JSON.parse(a)}return null},Delete:function(){$.cookie(SN.C.S.StatusNetInstance,null)}},belongsOnTimeline:function(b){var a=$("body").attr("id");if(a=="public"){return true}var c=$("#nav_profile a").attr("href");if(c){var d=$(b).find(".vcard.author a.url").attr("href");if(d==c){if(a=="all"||a=="showstream"){return true}}}return false},switchInputFormTab:function(a){$(".input_form_nav_tab.current").removeClass("current");$("#input_form_nav_"+a).addClass("current");$(".input_form.current").removeClass("current");$("#input_form_"+a).addClass("current")}},Init:{NoticeForm:function(){if($("body.user_in").length>0){$(".ajax-notice").each(function(){var a=$(this);SN.Init.NoticeFormSetup(a)})}},NoticeFormSetup:function(a){SN.U.NoticeLocationAttach(a);SN.U.FormNoticeXHR(a);SN.U.FormNoticeEnhancements(a);SN.U.NoticeDataAttach(a)},Notices:function(){if($("body.user_in").length>0){var a=$(".form_notice:first");if(a.length>0){SN.C.I.NoticeFormMaster=document._importNode(a[0],true)}SN.U.NoticeRepeat();SN.U.NoticeReply();SN.U.NoticeInlineReplySetup()}SN.U.NoticeAttachments()},EntityActions:function(){if($("body.user_in").length>0){SN.U.NewDirectMessage()}},Login:function(){if(SN.U.StatusNetInstance.Get()!==null){var a=SN.U.StatusNetInstance.Get().Nickname;if(a!==null){$("#form_login #nickname").val(a)}}$("#form_login").bind("submit",function(){SN.U.StatusNetInstance.Set({Nickname:$("#form_login #nickname").val()});return true})},AjaxForms:function(){$("form.ajax").live("submit",function(){SN.U.FormXHR($(this));return false})},UploadForms:function(){$("input[type=file]").change(function(d){if(typeof this.files=="object"&&this.files.length>0){var c=0;for(var b=0;b<this.files.length;b++){c+=this.files[b].size}var a=SN.U.maxFileSize($(this.form));if(a>0&&c>a){var e="File too large: maximum upload size is %d bytes.";alert(e.replace("%d",a));$(this).val("");d.preventDefault();return false}}})}}};$(document).ready(function(){SN.Init.AjaxForms();SN.Init.UploadForms();if($("."+SN.C.S.FormNotice).length>0){SN.Init.NoticeForm()}if($("#content .notices").length>0){SN.Init.Notices()}if($("#content .entity_actions").length>0){SN.Init.EntityActions()}if($("#form_login").length>0){SN.Init.Login()}});if(!document.ELEMENT_NODE){document.ELEMENT_NODE=1;document.ATTRIBUTE_NODE=2;document.TEXT_NODE=3;document.CDATA_SECTION_NODE=4;document.ENTITY_REFERENCE_NODE=5;document.ENTITY_NODE=6;document.PROCESSING_INSTRUCTION_NODE=7;document.COMMENT_NODE=8;document.DOCUMENT_NODE=9;document.DOCUMENT_TYPE_NODE=10;document.DOCUMENT_FRAGMENT_NODE=11;document.NOTATION_NODE=12}document._importNode=function(e,a){switch(e.nodeType){case document.ELEMENT_NODE:var d=document.createElement(e.nodeName);if(e.attributes&&e.attributes.length>0){for(var c=0,b=e.attributes.length;c<b;){if(e.attributes[c].nodeName=="class"){d.className=e.getAttribute(e.attributes[c++].nodeName)}else{d.setAttribute(e.attributes[c].nodeName,e.getAttribute(e.attributes[c++].nodeName))}}}if(a&&e.childNodes&&e.childNodes.length>0){for(var c=0,b=e.childNodes.length;c<b;){d.appendChild(document._importNode(e.childNodes[c++],a))}}return d;break;case document.TEXT_NODE:case document.CDATA_SECTION_NODE:case document.COMMENT_NODE:return document.createTextNode(e.nodeValue);break}};if(typeof navigator.geolocation=="undefined"||navigator.geolocation.shim){(function(){(function(){if(window.google&&google.gears){return}var c=null;if(typeof GearsFactory!="undefined"){c=new GearsFactory()}else{try{c=new ActiveXObject("Gears.Factory");if(c.getBuildInfo().indexOf("ie_mobile")!=-1){c.privateSetGlobalObject(this)}}catch(d){if((typeof navigator.mimeTypes!="undefined")&&navigator.mimeTypes["application/x-googlegears"]){c=document.createElement("object");c.style.display="none";c.width=0;c.height=0;c.type="application/x-googlegears";document.documentElement.appendChild(c)}}}if(!c){return}if(!window.google){google={}}if(!google.gears){google.gears={factory:c}}})();var a=(function(){var d=google.gears.factory.create("beta.geolocation");var c=function(f,e){return function(g){f(g);e.lastPosition=g}};return{shim:true,type:"Gears",lastPosition:null,getCurrentPosition:function(e,g,h){var f=this;var i=c(e,f);d.getCurrentPosition(i,g,h)},watchPosition:function(e,f,g){d.watchPosition(e,f,g)},clearWatch:function(e){d.clearWatch(e)},getPermission:function(g,e,f){d.getPermission(g,e,f)}}});var b=(function(){var i=false;var e=function(){if(!d()&&!i){i=true;var j=document.createElement("script");j.src=(document.location.protocol=="https:"?"https://":"http://")+"www.google.com/jsapi?callback=_google_loader_apiLoaded";j.type="text/javascript";document.getElementsByTagName("body")[0].appendChild(j)}};var c=[];var h=function(j){c.push(j)};var f=function(){if(d()){while(c.length>0){var j=c.pop();j()}}};window._google_loader_apiLoaded=function(){f()};var d=function(){return(window.google&&google.loader)};var g=function(j){if(d()){return true}h(j);e();return false};e();return{shim:true,type:"ClientLocation",lastPosition:null,getCurrentPosition:function(k,n,o){var m=this;if(!g(function(){m.getCurrentPosition(k,n,o)})){return}if(google.loader.ClientLocation){var l=google.loader.ClientLocation;var j={coords:{latitude:l.latitude,longitude:l.longitude,altitude:null,accuracy:43000,altitudeAccuracy:null,heading:null,speed:null},address:{city:l.address.city,country:l.address.country,country_code:l.address.country_code,region:l.address.region},timestamp:new Date()};k(j);this.lastPosition=j}else{if(n==="function"){n({code:3,message:"Using the Google ClientLocation API and it is not able to calculate a location."})}}},watchPosition:function(j,l,m){this.getCurrentPosition(j,l,m);var k=this;var n=setInterval(function(){k.getCurrentPosition(j,l,m)},10000);return n},clearWatch:function(j){clearInterval(j)},getPermission:function(l,j,k){return true}}});navigator.geolocation=(window.google&&google.gears)?a():b()})()};
\ No newline at end of file
+var SN={C:{I:{CounterBlackout:false,MaxLength:140,PatternUsername:/^[0-9a-zA-Z\-_.]*$/,HTTP20x30x:[200,201,202,203,204,205,206,300,301,302,303,304,305,306,307],NoticeFormMaster:null},S:{Disabled:"disabled",Warning:"warning",Error:"error",Success:"success",Processing:"processing",CommandResult:"command_result",FormNotice:"form_notice",NoticeDataGeo:"notice_data-geo",NoticeDataGeoCookie:"NoticeDataGeo",NoticeDataGeoSelected:"notice_data-geo_selected",StatusNetInstance:"StatusNetInstance"}},messages:{},msg:function(a){if(typeof SN.messages[a]=="undefined"){return"["+a+"]"}else{return SN.messages[a]}},U:{FormNoticeEnhancements:function(b){if(jQuery.data(b[0],"ElementData")===undefined){MaxLength=b.find(".count").text();if(typeof(MaxLength)=="undefined"){MaxLength=SN.C.I.MaxLength}jQuery.data(b[0],"ElementData",{MaxLength:MaxLength});SN.U.Counter(b);NDT=b.find(".notice_data-text:first");NDT.bind("keyup",function(c){SN.U.Counter(b)});var a=function(c){window.setTimeout(function(){SN.U.Counter(b)},50)};NDT.bind("cut",a).bind("paste",a)}else{b.find(".count").text(jQuery.data(b[0],"ElementData").MaxLength)}},Counter:function(d){SN.C.I.FormNoticeCurrent=d;var b=jQuery.data(d[0],"ElementData").MaxLength;if(b<=0){return}var c=b-SN.U.CharacterCount(d);var a=d.find(".count");if(c.toString()!=a.text()){if(!SN.C.I.CounterBlackout||c===0){if(a.text()!=String(c)){a.text(c)}if(c<0){d.addClass(SN.C.S.Warning)}else{d.removeClass(SN.C.S.Warning)}if(!SN.C.I.CounterBlackout){SN.C.I.CounterBlackout=true;SN.C.I.FormNoticeCurrent=d;window.setTimeout("SN.U.ClearCounterBlackout(SN.C.I.FormNoticeCurrent);",500)}}}},CharacterCount:function(a){return a.find(".notice_data-text:first").val().length},ClearCounterBlackout:function(a){SN.C.I.CounterBlackout=false;SN.U.Counter(a)},RewriteAjaxAction:function(a){if(document.location.protocol=="https:"&&a.substr(0,5)=="http:"){return a.replace(/^http:\/\/[^:\/]+/,"https://"+document.location.host)}else{return a}},FormXHR:function(a){$.ajax({type:"POST",dataType:"xml",url:SN.U.RewriteAjaxAction(a.attr("action")),data:a.serialize()+"&ajax=1",beforeSend:function(b){a.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(c,d,b){alert(b||d)},success:function(b,c){if(typeof($("form",b)[0])!="undefined"){form_new=document._importNode($("form",b)[0],true);a.replaceWith(form_new)}else{a.replaceWith(document._importNode($("p",b)[0],true))}}})},FormNoticeXHR:function(b){SN.C.I.NoticeDataGeo={};b.append('<input type="hidden" name="ajax" value="1"/>');b.attr("action",SN.U.RewriteAjaxAction(b.attr("action")));var c=function(d,e){b.append($('<p class="form_response"></p>').addClass(d).text(e))};var a=function(){b.find(".form_response").remove()};b.ajaxForm({dataType:"xml",timeout:"60000",beforeSend:function(d){if(b.find(".notice_data-text:first").val()==""){b.addClass(SN.C.S.Warning);return false}b.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled);SN.U.normalizeGeoData(b);return true},error:function(f,g,e){b.removeClass(SN.C.S.Processing).find(".submit").removeClass(SN.C.S.Disabled).removeAttr(SN.C.S.Disabled,SN.C.S.Disabled);a();if(g=="timeout"){c("error","Sorry! We had trouble sending your notice. The servers are overloaded. Please try again, and contact the site administrator if this problem persists.")}else{var d=SN.U.GetResponseXML(f);if($("."+SN.C.S.Error,d).length>0){b.append(document._importNode($("."+SN.C.S.Error,d)[0],true))}else{if(parseInt(f.status)===0||jQuery.inArray(parseInt(f.status),SN.C.I.HTTP20x30x)>=0){b.resetForm().find(".attach-status").remove();SN.U.FormNoticeEnhancements(b)}else{c("error","(Sorry! We had trouble sending your notice ("+f.status+" "+f.statusText+"). Please report the problem to the site administrator if this happens again.")}}}},success:function(i,f){a();var n=$("#"+SN.C.S.Error,i);if(n.length>0){c("error",n.text())}else{if($("body")[0].id=="bookmarklet"){self.close()}var d=$("#"+SN.C.S.CommandResult,i);if(d.length>0){c("success",d.text())}else{var m=document._importNode($("li",i)[0],true);var k=$("#notices_primary .notices:first");var l=b.closest("li.notice-reply");if(l.length>0){var e=$(m).attr("id");if($("#"+e).length==0){var j=l.closest("li.notice");l.replaceWith(m);SN.U.NoticeInlineReplyPlaceholder(j)}else{l.remove()}}else{if(k.length>0&&SN.U.belongsOnTimeline(m)){if($("#"+m.id).length===0){var h=b.find("[name=inreplyto]").val();var g="#notices_primary #notice-"+h;if($("body")[0].id=="conversation"){if(h.length>0&&$(g+" .notices").length<1){$(g).append('<ul class="notices"></ul>')}$($(g+" .notices")[0]).append(m)}else{k.prepend(m)}$("#"+m.id).css({display:"none"}).fadeIn(2500);SN.U.NoticeWithAttachment($("#"+m.id));SN.U.NoticeReplyTo($("#"+m.id))}}else{c("success",$("title",i).text())}}}b.resetForm();b.find("[name=inreplyto]").val("");b.find(".attach-status").remove();SN.U.FormNoticeEnhancements(b)}},complete:function(d,e){b.removeClass(SN.C.S.Processing).find(".submit").removeAttr(SN.C.S.Disabled).removeClass(SN.C.S.Disabled);b.find("[name=lat]").val(SN.C.I.NoticeDataGeo.NLat);b.find("[name=lon]").val(SN.C.I.NoticeDataGeo.NLon);b.find("[name=location_ns]").val(SN.C.I.NoticeDataGeo.NLNS);b.find("[name=location_id]").val(SN.C.I.NoticeDataGeo.NLID);b.find("[name=notice_data-geo]").attr("checked",SN.C.I.NoticeDataGeo.NDG)}})},normalizeGeoData:function(a){SN.C.I.NoticeDataGeo.NLat=a.find("[name=lat]").val();SN.C.I.NoticeDataGeo.NLon=a.find("[name=lon]").val();SN.C.I.NoticeDataGeo.NLNS=a.find("[name=location_ns]").val();SN.C.I.NoticeDataGeo.NLID=a.find("[name=location_id]").val();SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked");var b=$.cookie(SN.C.S.NoticeDataGeoCookie);if(b!==null&&b!="disabled"){b=JSON.parse(b);SN.C.I.NoticeDataGeo.NLat=a.find("[name=lat]").val(b.NLat).val();SN.C.I.NoticeDataGeo.NLon=a.find("[name=lon]").val(b.NLon).val();if(b.NLNS){SN.C.I.NoticeDataGeo.NLNS=a.find("[name=location_ns]").val(b.NLNS).val();SN.C.I.NoticeDataGeo.NLID=a.find("[name=location_id]").val(b.NLID).val()}else{a.find("[name=location_ns]").val("");a.find("[name=location_id]").val("")}}if(b=="disabled"){SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked",false).attr("checked")}else{SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked",true).attr("checked")}},GetResponseXML:function(b){try{return b.responseXML}catch(a){return(new DOMParser()).parseFromString(b.responseText,"text/xml")}},NoticeReply:function(){if($("#content .notice_reply").length>0){$("#content .notice").each(function(){SN.U.NoticeReplyTo($(this))})}},NoticeReplyTo:function(a){a.find(".notice_reply").live("click",function(c){c.preventDefault();var b=($(".author .nickname",a).length>0)?$($(".author .nickname",a)[0]):$(".author .nickname.uid");SN.U.NoticeInlineReplyTrigger(a,"@"+b.text());return false})},NoticeInlineReplyTrigger:function(h,i){var b=$($(".notice_id",h)[0]).text();var e=h;var f=h.closest(".notices");if(f.hasClass("threaded-replies")){e=f.closest(".notice")}else{f=$("ul.threaded-replies",h);if(f.length==0){f=$('<ul class="notices threaded-replies xoxo"></ul>');h.append(f)}}var j=$(".notice-reply-form",f);var d=function(){j.find("input[name=inreplyto]").val(b);var m=j.find("textarea");if(m.length==0){throw"No textarea"}var l="";if(i){l=i+" "}m.val(l+m.val().replace(RegExp(l,"i"),""));m.data("initialText",$.trim(i+""));m.focus();if(m[0].setSelectionRange){var k=m.val().length;m[0].setSelectionRange(k,k)}};if(j.length>0){d()}else{$("li.notice-reply-placeholder").remove();var g=$("li.notice-reply",f);if(g.length==0){g=$('<li class="notice-reply"></li>');var c=function(k){var l=document._importNode(k,true);g.append(l);f.append(g);var m=j=$(l);SN.Init.NoticeFormSetup(m);d()};if(SN.C.I.NoticeFormMaster){c(SN.C.I.NoticeFormMaster)}else{var a=$("#form_notice").attr("action");$.get(a,{ajax:1},function(k,m,l){c($("form",k)[0])})}}}},NoticeInlineReplyPlaceholder:function(b){var a=b.find("ul.threaded-replies");var c=$('<li class="notice-reply-placeholder"><input class="placeholder"></li>');c.click(function(){SN.U.NoticeInlineReplyTrigger(b);return false});c.find("input").val(SN.msg("reply_placeholder"));a.append(c)},NoticeInlineReplySetup:function(){$(".threaded-replies").each(function(){var b=$(this);var a=b.closest(".notice");SN.U.NoticeInlineReplyPlaceholder(a)})},NoticeRepeat:function(){$(".form_repeat").live("click",function(a){a.preventDefault();SN.U.NoticeRepeatConfirmation($(this));return false})},NoticeRepeatConfirmation:function(a){var c=a.find(".submit");var b=c.clone();b.addClass("submit_dialogbox").removeClass("submit");a.append(b);b.bind("click",function(){SN.U.FormXHR(a);return false});c.hide();a.addClass("dialogbox").append('<button class="close">&#215;</button>').closest(".notice-options").addClass("opaque");a.find("button.close").click(function(){$(this).remove();a.removeClass("dialogbox").closest(".notice-options").removeClass("opaque");a.find(".submit_dialogbox").remove();a.find(".submit").show();return false})},NoticeAttachments:function(){$(".notice a.attachment").each(function(){SN.U.NoticeWithAttachment($(this).closest(".notice"))})},NoticeWithAttachment:function(b){if(b.find(".attachment").length===0){return}var a=b.find(".attachment.more");if(a.length>0){$(a[0]).click(function(){var c=$(this);c.addClass(SN.C.S.Processing);$.get(c.attr("href")+"/ajax",null,function(d){c.parent(".entry-content").html($(d).find("#attachment_view .entry-content").html())});return false}).attr("title",SN.msg("showmore_tooltip"))}},NoticeDataAttach:function(b){var a=b.find("input[type=file]");a.change(function(f){b.find(".attach-status").remove();var d=$(this).val();if(!d){return false}var c=$('<div class="attach-status '+SN.C.S.Success+'"><code></code> <button class="close">&#215;</button></div>');c.find("code").text(d);c.find("button").click(function(){c.remove();a.val("");return false});b.append(c);if(typeof this.files=="object"){for(var e=0;e<this.files.length;e++){SN.U.PreviewAttach(b,this.files[e])}}})},maxFileSize:function(b){var a=$(b).find("input[name=MAX_FILE_SIZE]").attr("value");if(a){return parseInt(a)}else{return 0}},PreviewAttach:function(d,c){var e=c.type+" "+Math.round(c.size/1024)+"KB";var f=true;var h;if(typeof window.createObjectURL!="undefined"){h=function(i,j){j(window.createObjectURL(i))}}else{if(typeof window.FileReader!="undefined"){h=function(j,k){var i=new FileReader();i.onload=function(l){k(i.result)};i.readAsDataURL(j)}}else{f=false}}var a=["image/png","image/jpeg","image/gif","image/svg+xml"];if($.inArray(c.type,a)==-1){f=false}var g=8*1024*1024;if(c.size>g){f=false}if(f){h(c,function(j){var i=$("<img>").attr("title",e).attr("alt",e).attr("src",j).attr("style","height: 120px");d.find(".attach-status").append(i)})}else{var b=$("<div></div>").text(e);d.find(".attach-status").append(b)}},NoticeLocationAttach:function(a){var e=a.find("[name=lat]");var k=a.find("[name=lon]");var g=a.find("[name=location_ns]").val();var l=a.find("[name=location_id]").val();var b="";var d=a.find("[name=notice_data-geo]");var c=a.find("[name=notice_data-geo]");var j=a.find("label.notice_data-geo");function f(n){j.attr("title",jQuery.trim(j.text())).removeClass("checked");a.find("[name=lat]").val("");a.find("[name=lon]").val("");a.find("[name=location_ns]").val("");a.find("[name=location_id]").val("");a.find("[name=notice_data-geo]").attr("checked",false);$.cookie(SN.C.S.NoticeDataGeoCookie,"disabled",{path:"/"});if(n){a.find(".geo_status_wrapper").removeClass("success").addClass("error");a.find(".geo_status_wrapper .geo_status").text(n)}else{a.find(".geo_status_wrapper").remove()}}function m(n,o){SN.U.NoticeGeoStatus(a,"Looking up place name...");$.getJSON(n,o,function(p){var q,r;if(typeof(p.location_ns)!="undefined"){a.find("[name=location_ns]").val(p.location_ns);q=p.location_ns}if(typeof(p.location_id)!="undefined"){a.find("[name=location_id]").val(p.location_id);r=p.location_id}if(typeof(p.name)=="undefined"){NLN_text=o.lat+";"+o.lon}else{NLN_text=p.name}SN.U.NoticeGeoStatus(a,NLN_text,o.lat,o.lon,p.url);j.attr("title",NoticeDataGeo_text.ShareDisable+" ("+NLN_text+")");a.find("[name=lat]").val(o.lat);a.find("[name=lon]").val(o.lon);a.find("[name=location_ns]").val(q);a.find("[name=location_id]").val(r);a.find("[name=notice_data-geo]").attr("checked",true);var s={NLat:o.lat,NLon:o.lon,NLNS:q,NLID:r,NLN:NLN_text,NLNU:p.url,NDG:true};$.cookie(SN.C.S.NoticeDataGeoCookie,JSON.stringify(s),{path:"/"})})}if(c.length>0){if($.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){c.attr("checked",false)}else{c.attr("checked",true)}var h=a.find(".notice_data-geo_wrap");var i=h.attr("title");h.removeAttr("title");j.attr("title",j.text());c.change(function(){if(c.attr("checked")===true||$.cookie(SN.C.S.NoticeDataGeoCookie)===null){j.attr("title",NoticeDataGeo_text.ShareDisable).addClass("checked");if($.cookie(SN.C.S.NoticeDataGeoCookie)===null||$.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){if(navigator.geolocation){SN.U.NoticeGeoStatus(a,"Requesting location from browser...");navigator.geolocation.getCurrentPosition(function(p){a.find("[name=lat]").val(p.coords.latitude);a.find("[name=lon]").val(p.coords.longitude);var q={lat:p.coords.latitude,lon:p.coords.longitude,token:$("#token").val()};m(i,q)},function(p){switch(p.code){case p.PERMISSION_DENIED:f("Location permission denied.");break;case p.TIMEOUT:f("Location lookup timeout.");break}},{timeout:10000})}else{if(e.length>0&&k.length>0){var n={lat:e,lon:k,token:$("#token").val()};m(i,n)}else{f();c.remove();j.remove()}}}else{var o=JSON.parse($.cookie(SN.C.S.NoticeDataGeoCookie));a.find("[name=lat]").val(o.NLat);a.find("[name=lon]").val(o.NLon);a.find("[name=location_ns]").val(o.NLNS);a.find("[name=location_id]").val(o.NLID);a.find("[name=notice_data-geo]").attr("checked",o.NDG);SN.U.NoticeGeoStatus(a,o.NLN,o.NLat,o.NLon,o.NLNU);j.attr("title",NoticeDataGeo_text.ShareDisable+" ("+o.NLN+")").addClass("checked")}}else{f()}}).change()}},NoticeGeoStatus:function(e,a,f,g,c){var h=e.find(".geo_status_wrapper");if(h.length==0){h=$('<div class="'+SN.C.S.Success+' geo_status_wrapper"><button class="close" style="float:right">&#215;</button><div class="geo_status"></div></div>');h.find("button.close").click(function(){e.find("[name=notice_data-geo]").removeAttr("checked").change()});e.append(h)}var b;if(c){b=$("<a></a>").attr("href",c)}else{b=$("<span></span>")}b.text(a);if(f||g){var d=f+";"+g;b.attr("title",d);if(!a){b.text(d)}}h.find(".geo_status").empty().append(b)},NewDirectMessage:function(){NDM=$(".entity_send-a-message a");NDM.attr({href:NDM.attr("href")+"&ajax=1"});NDM.bind("click",function(){var a=$(".entity_send-a-message form");if(a.length===0){$(this).addClass(SN.C.S.Processing);$.get(NDM.attr("href"),null,function(b){$(".entity_send-a-message").append(document._importNode($("form",b)[0],true));a=$(".entity_send-a-message .form_notice");SN.U.FormNoticeXHR(a);SN.U.FormNoticeEnhancements(a);a.append('<button class="close">&#215;</button>');$(".entity_send-a-message button").click(function(){a.hide();return false});NDM.removeClass(SN.C.S.Processing)})}else{a.show();$(".entity_send-a-message textarea").focus()}return false})},GetFullYear:function(c,d,a){var b=new Date();b.setFullYear(c,d,a);return b},StatusNetInstance:{Set:function(b){var a=SN.U.StatusNetInstance.Get();if(a!==null){b=$.extend(a,b)}$.cookie(SN.C.S.StatusNetInstance,JSON.stringify(b),{path:"/",expires:SN.U.GetFullYear(2029,0,1)})},Get:function(){var a=$.cookie(SN.C.S.StatusNetInstance);if(a!==null){return JSON.parse(a)}return null},Delete:function(){$.cookie(SN.C.S.StatusNetInstance,null)}},belongsOnTimeline:function(b){var a=$("body").attr("id");if(a=="public"){return true}var c=$("#nav_profile a").attr("href");if(c){var d=$(b).find(".vcard.author a.url").attr("href");if(d==c){if(a=="all"||a=="showstream"){return true}}}return false},switchInputFormTab:function(a){$(".input_form_nav_tab.current").removeClass("current");$("#input_form_nav_"+a).addClass("current");$(".input_form.current").removeClass("current");$("#input_form_"+a).addClass("current")}},Init:{NoticeForm:function(){if($("body.user_in").length>0){$(".ajax-notice").each(function(){var a=$(this);SN.Init.NoticeFormSetup(a)});$("body").bind("click",function(c){var a=$("li.notice-reply");if(a.length>0){var b=$(c.target).closest("li.notice-reply");if(b.length==0){a.each(function(){var e=$(this);if(e.find(".notice_data-text:first").val()==""){var d=e.closest("li.notice");e.remove();SN.U.NoticeInlineReplyPlaceholder(d)}})}}})}},NoticeFormSetup:function(a){SN.U.NoticeLocationAttach(a);SN.U.FormNoticeXHR(a);SN.U.FormNoticeEnhancements(a);SN.U.NoticeDataAttach(a)},Notices:function(){if($("body.user_in").length>0){var a=$(".form_notice:first");if(a.length>0){SN.C.I.NoticeFormMaster=document._importNode(a[0],true)}SN.U.NoticeRepeat();SN.U.NoticeReply();SN.U.NoticeInlineReplySetup()}SN.U.NoticeAttachments()},EntityActions:function(){if($("body.user_in").length>0){SN.U.NewDirectMessage()}},Login:function(){if(SN.U.StatusNetInstance.Get()!==null){var a=SN.U.StatusNetInstance.Get().Nickname;if(a!==null){$("#form_login #nickname").val(a)}}$("#form_login").bind("submit",function(){SN.U.StatusNetInstance.Set({Nickname:$("#form_login #nickname").val()});return true})},AjaxForms:function(){$("form.ajax").live("submit",function(){SN.U.FormXHR($(this));return false})},UploadForms:function(){$("input[type=file]").change(function(d){if(typeof this.files=="object"&&this.files.length>0){var c=0;for(var b=0;b<this.files.length;b++){c+=this.files[b].size}var a=SN.U.maxFileSize($(this.form));if(a>0&&c>a){var e="File too large: maximum upload size is %d bytes.";alert(e.replace("%d",a));$(this).val("");d.preventDefault();return false}}})}}};$(document).ready(function(){SN.Init.AjaxForms();SN.Init.UploadForms();if($("."+SN.C.S.FormNotice).length>0){SN.Init.NoticeForm()}if($("#content .notices").length>0){SN.Init.Notices()}if($("#content .entity_actions").length>0){SN.Init.EntityActions()}if($("#form_login").length>0){SN.Init.Login()}});if(!document.ELEMENT_NODE){document.ELEMENT_NODE=1;document.ATTRIBUTE_NODE=2;document.TEXT_NODE=3;document.CDATA_SECTION_NODE=4;document.ENTITY_REFERENCE_NODE=5;document.ENTITY_NODE=6;document.PROCESSING_INSTRUCTION_NODE=7;document.COMMENT_NODE=8;document.DOCUMENT_NODE=9;document.DOCUMENT_TYPE_NODE=10;document.DOCUMENT_FRAGMENT_NODE=11;document.NOTATION_NODE=12}document._importNode=function(e,a){switch(e.nodeType){case document.ELEMENT_NODE:var d=document.createElement(e.nodeName);if(e.attributes&&e.attributes.length>0){for(var c=0,b=e.attributes.length;c<b;){if(e.attributes[c].nodeName=="class"){d.className=e.getAttribute(e.attributes[c++].nodeName)}else{d.setAttribute(e.attributes[c].nodeName,e.getAttribute(e.attributes[c++].nodeName))}}}if(a&&e.childNodes&&e.childNodes.length>0){for(var c=0,b=e.childNodes.length;c<b;){d.appendChild(document._importNode(e.childNodes[c++],a))}}return d;break;case document.TEXT_NODE:case document.CDATA_SECTION_NODE:case document.COMMENT_NODE:return document.createTextNode(e.nodeValue);break}};if(typeof navigator.geolocation=="undefined"||navigator.geolocation.shim){(function(){(function(){if(window.google&&google.gears){return}var c=null;if(typeof GearsFactory!="undefined"){c=new GearsFactory()}else{try{c=new ActiveXObject("Gears.Factory");if(c.getBuildInfo().indexOf("ie_mobile")!=-1){c.privateSetGlobalObject(this)}}catch(d){if((typeof navigator.mimeTypes!="undefined")&&navigator.mimeTypes["application/x-googlegears"]){c=document.createElement("object");c.style.display="none";c.width=0;c.height=0;c.type="application/x-googlegears";document.documentElement.appendChild(c)}}}if(!c){return}if(!window.google){google={}}if(!google.gears){google.gears={factory:c}}})();var a=(function(){var d=google.gears.factory.create("beta.geolocation");var c=function(f,e){return function(g){f(g);e.lastPosition=g}};return{shim:true,type:"Gears",lastPosition:null,getCurrentPosition:function(e,g,h){var f=this;var i=c(e,f);d.getCurrentPosition(i,g,h)},watchPosition:function(e,f,g){d.watchPosition(e,f,g)},clearWatch:function(e){d.clearWatch(e)},getPermission:function(g,e,f){d.getPermission(g,e,f)}}});var b=(function(){var i=false;var e=function(){if(!d()&&!i){i=true;var j=document.createElement("script");j.src=(document.location.protocol=="https:"?"https://":"http://")+"www.google.com/jsapi?callback=_google_loader_apiLoaded";j.type="text/javascript";document.getElementsByTagName("body")[0].appendChild(j)}};var c=[];var h=function(j){c.push(j)};var f=function(){if(d()){while(c.length>0){var j=c.pop();j()}}};window._google_loader_apiLoaded=function(){f()};var d=function(){return(window.google&&google.loader)};var g=function(j){if(d()){return true}h(j);e();return false};e();return{shim:true,type:"ClientLocation",lastPosition:null,getCurrentPosition:function(k,n,o){var m=this;if(!g(function(){m.getCurrentPosition(k,n,o)})){return}if(google.loader.ClientLocation){var l=google.loader.ClientLocation;var j={coords:{latitude:l.latitude,longitude:l.longitude,altitude:null,accuracy:43000,altitudeAccuracy:null,heading:null,speed:null},address:{city:l.address.city,country:l.address.country,country_code:l.address.country_code,region:l.address.region},timestamp:new Date()};k(j);this.lastPosition=j}else{if(n==="function"){n({code:3,message:"Using the Google ClientLocation API and it is not able to calculate a location."})}}},watchPosition:function(j,l,m){this.getCurrentPosition(j,l,m);var k=this;var n=setInterval(function(){k.getCurrentPosition(j,l,m)},10000);return n},clearWatch:function(j){clearInterval(j)},getPermission:function(l,j,k){return true}}});navigator.geolocation=(window.google&&google.gears)?a():b()})()};
\ No newline at end of file

From acca8a24b462b9959c83937f832842bb08edf293 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Thu, 10 Mar 2011 16:08:28 -0800
Subject: [PATCH 513/655] Fix for inline reply placeholders: only remove the
 one we're clicking in, not all of them!

---
 js/util.js     | 2 +-
 js/util.min.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/js/util.js b/js/util.js
index 29fdfe2a98..818ad87f68 100644
--- a/js/util.js
+++ b/js/util.js
@@ -599,7 +599,7 @@ var SN = { // StatusNet
                 nextStep();
             } else {
                 // Remove placeholder if any
-                $('li.notice-reply-placeholder').remove();
+                list.find('li.notice-reply-placeholder').remove();
 
                 // Create the reply form entry at the end
                 var replyItem = $('li.notice-reply', list);
diff --git a/js/util.min.js b/js/util.min.js
index a9e92db492..bf010d7b80 100644
--- a/js/util.min.js
+++ b/js/util.min.js
@@ -1 +1 @@
-var SN={C:{I:{CounterBlackout:false,MaxLength:140,PatternUsername:/^[0-9a-zA-Z\-_.]*$/,HTTP20x30x:[200,201,202,203,204,205,206,300,301,302,303,304,305,306,307],NoticeFormMaster:null},S:{Disabled:"disabled",Warning:"warning",Error:"error",Success:"success",Processing:"processing",CommandResult:"command_result",FormNotice:"form_notice",NoticeDataGeo:"notice_data-geo",NoticeDataGeoCookie:"NoticeDataGeo",NoticeDataGeoSelected:"notice_data-geo_selected",StatusNetInstance:"StatusNetInstance"}},messages:{},msg:function(a){if(typeof SN.messages[a]=="undefined"){return"["+a+"]"}else{return SN.messages[a]}},U:{FormNoticeEnhancements:function(b){if(jQuery.data(b[0],"ElementData")===undefined){MaxLength=b.find(".count").text();if(typeof(MaxLength)=="undefined"){MaxLength=SN.C.I.MaxLength}jQuery.data(b[0],"ElementData",{MaxLength:MaxLength});SN.U.Counter(b);NDT=b.find(".notice_data-text:first");NDT.bind("keyup",function(c){SN.U.Counter(b)});var a=function(c){window.setTimeout(function(){SN.U.Counter(b)},50)};NDT.bind("cut",a).bind("paste",a)}else{b.find(".count").text(jQuery.data(b[0],"ElementData").MaxLength)}},Counter:function(d){SN.C.I.FormNoticeCurrent=d;var b=jQuery.data(d[0],"ElementData").MaxLength;if(b<=0){return}var c=b-SN.U.CharacterCount(d);var a=d.find(".count");if(c.toString()!=a.text()){if(!SN.C.I.CounterBlackout||c===0){if(a.text()!=String(c)){a.text(c)}if(c<0){d.addClass(SN.C.S.Warning)}else{d.removeClass(SN.C.S.Warning)}if(!SN.C.I.CounterBlackout){SN.C.I.CounterBlackout=true;SN.C.I.FormNoticeCurrent=d;window.setTimeout("SN.U.ClearCounterBlackout(SN.C.I.FormNoticeCurrent);",500)}}}},CharacterCount:function(a){return a.find(".notice_data-text:first").val().length},ClearCounterBlackout:function(a){SN.C.I.CounterBlackout=false;SN.U.Counter(a)},RewriteAjaxAction:function(a){if(document.location.protocol=="https:"&&a.substr(0,5)=="http:"){return a.replace(/^http:\/\/[^:\/]+/,"https://"+document.location.host)}else{return a}},FormXHR:function(a){$.ajax({type:"POST",dataType:"xml",url:SN.U.RewriteAjaxAction(a.attr("action")),data:a.serialize()+"&ajax=1",beforeSend:function(b){a.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(c,d,b){alert(b||d)},success:function(b,c){if(typeof($("form",b)[0])!="undefined"){form_new=document._importNode($("form",b)[0],true);a.replaceWith(form_new)}else{a.replaceWith(document._importNode($("p",b)[0],true))}}})},FormNoticeXHR:function(b){SN.C.I.NoticeDataGeo={};b.append('<input type="hidden" name="ajax" value="1"/>');b.attr("action",SN.U.RewriteAjaxAction(b.attr("action")));var c=function(d,e){b.append($('<p class="form_response"></p>').addClass(d).text(e))};var a=function(){b.find(".form_response").remove()};b.ajaxForm({dataType:"xml",timeout:"60000",beforeSend:function(d){if(b.find(".notice_data-text:first").val()==""){b.addClass(SN.C.S.Warning);return false}b.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled);SN.U.normalizeGeoData(b);return true},error:function(f,g,e){b.removeClass(SN.C.S.Processing).find(".submit").removeClass(SN.C.S.Disabled).removeAttr(SN.C.S.Disabled,SN.C.S.Disabled);a();if(g=="timeout"){c("error","Sorry! We had trouble sending your notice. The servers are overloaded. Please try again, and contact the site administrator if this problem persists.")}else{var d=SN.U.GetResponseXML(f);if($("."+SN.C.S.Error,d).length>0){b.append(document._importNode($("."+SN.C.S.Error,d)[0],true))}else{if(parseInt(f.status)===0||jQuery.inArray(parseInt(f.status),SN.C.I.HTTP20x30x)>=0){b.resetForm().find(".attach-status").remove();SN.U.FormNoticeEnhancements(b)}else{c("error","(Sorry! We had trouble sending your notice ("+f.status+" "+f.statusText+"). Please report the problem to the site administrator if this happens again.")}}}},success:function(i,f){a();var n=$("#"+SN.C.S.Error,i);if(n.length>0){c("error",n.text())}else{if($("body")[0].id=="bookmarklet"){self.close()}var d=$("#"+SN.C.S.CommandResult,i);if(d.length>0){c("success",d.text())}else{var m=document._importNode($("li",i)[0],true);var k=$("#notices_primary .notices:first");var l=b.closest("li.notice-reply");if(l.length>0){var e=$(m).attr("id");if($("#"+e).length==0){var j=l.closest("li.notice");l.replaceWith(m);SN.U.NoticeInlineReplyPlaceholder(j)}else{l.remove()}}else{if(k.length>0&&SN.U.belongsOnTimeline(m)){if($("#"+m.id).length===0){var h=b.find("[name=inreplyto]").val();var g="#notices_primary #notice-"+h;if($("body")[0].id=="conversation"){if(h.length>0&&$(g+" .notices").length<1){$(g).append('<ul class="notices"></ul>')}$($(g+" .notices")[0]).append(m)}else{k.prepend(m)}$("#"+m.id).css({display:"none"}).fadeIn(2500);SN.U.NoticeWithAttachment($("#"+m.id));SN.U.NoticeReplyTo($("#"+m.id))}}else{c("success",$("title",i).text())}}}b.resetForm();b.find("[name=inreplyto]").val("");b.find(".attach-status").remove();SN.U.FormNoticeEnhancements(b)}},complete:function(d,e){b.removeClass(SN.C.S.Processing).find(".submit").removeAttr(SN.C.S.Disabled).removeClass(SN.C.S.Disabled);b.find("[name=lat]").val(SN.C.I.NoticeDataGeo.NLat);b.find("[name=lon]").val(SN.C.I.NoticeDataGeo.NLon);b.find("[name=location_ns]").val(SN.C.I.NoticeDataGeo.NLNS);b.find("[name=location_id]").val(SN.C.I.NoticeDataGeo.NLID);b.find("[name=notice_data-geo]").attr("checked",SN.C.I.NoticeDataGeo.NDG)}})},normalizeGeoData:function(a){SN.C.I.NoticeDataGeo.NLat=a.find("[name=lat]").val();SN.C.I.NoticeDataGeo.NLon=a.find("[name=lon]").val();SN.C.I.NoticeDataGeo.NLNS=a.find("[name=location_ns]").val();SN.C.I.NoticeDataGeo.NLID=a.find("[name=location_id]").val();SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked");var b=$.cookie(SN.C.S.NoticeDataGeoCookie);if(b!==null&&b!="disabled"){b=JSON.parse(b);SN.C.I.NoticeDataGeo.NLat=a.find("[name=lat]").val(b.NLat).val();SN.C.I.NoticeDataGeo.NLon=a.find("[name=lon]").val(b.NLon).val();if(b.NLNS){SN.C.I.NoticeDataGeo.NLNS=a.find("[name=location_ns]").val(b.NLNS).val();SN.C.I.NoticeDataGeo.NLID=a.find("[name=location_id]").val(b.NLID).val()}else{a.find("[name=location_ns]").val("");a.find("[name=location_id]").val("")}}if(b=="disabled"){SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked",false).attr("checked")}else{SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked",true).attr("checked")}},GetResponseXML:function(b){try{return b.responseXML}catch(a){return(new DOMParser()).parseFromString(b.responseText,"text/xml")}},NoticeReply:function(){if($("#content .notice_reply").length>0){$("#content .notice").each(function(){SN.U.NoticeReplyTo($(this))})}},NoticeReplyTo:function(a){a.find(".notice_reply").live("click",function(c){c.preventDefault();var b=($(".author .nickname",a).length>0)?$($(".author .nickname",a)[0]):$(".author .nickname.uid");SN.U.NoticeInlineReplyTrigger(a,"@"+b.text());return false})},NoticeInlineReplyTrigger:function(h,i){var b=$($(".notice_id",h)[0]).text();var e=h;var f=h.closest(".notices");if(f.hasClass("threaded-replies")){e=f.closest(".notice")}else{f=$("ul.threaded-replies",h);if(f.length==0){f=$('<ul class="notices threaded-replies xoxo"></ul>');h.append(f)}}var j=$(".notice-reply-form",f);var d=function(){j.find("input[name=inreplyto]").val(b);var m=j.find("textarea");if(m.length==0){throw"No textarea"}var l="";if(i){l=i+" "}m.val(l+m.val().replace(RegExp(l,"i"),""));m.data("initialText",$.trim(i+""));m.focus();if(m[0].setSelectionRange){var k=m.val().length;m[0].setSelectionRange(k,k)}};if(j.length>0){d()}else{$("li.notice-reply-placeholder").remove();var g=$("li.notice-reply",f);if(g.length==0){g=$('<li class="notice-reply"></li>');var c=function(k){var l=document._importNode(k,true);g.append(l);f.append(g);var m=j=$(l);SN.Init.NoticeFormSetup(m);d()};if(SN.C.I.NoticeFormMaster){c(SN.C.I.NoticeFormMaster)}else{var a=$("#form_notice").attr("action");$.get(a,{ajax:1},function(k,m,l){c($("form",k)[0])})}}}},NoticeInlineReplyPlaceholder:function(b){var a=b.find("ul.threaded-replies");var c=$('<li class="notice-reply-placeholder"><input class="placeholder"></li>');c.click(function(){SN.U.NoticeInlineReplyTrigger(b);return false});c.find("input").val(SN.msg("reply_placeholder"));a.append(c)},NoticeInlineReplySetup:function(){$(".threaded-replies").each(function(){var b=$(this);var a=b.closest(".notice");SN.U.NoticeInlineReplyPlaceholder(a)})},NoticeRepeat:function(){$(".form_repeat").live("click",function(a){a.preventDefault();SN.U.NoticeRepeatConfirmation($(this));return false})},NoticeRepeatConfirmation:function(a){var c=a.find(".submit");var b=c.clone();b.addClass("submit_dialogbox").removeClass("submit");a.append(b);b.bind("click",function(){SN.U.FormXHR(a);return false});c.hide();a.addClass("dialogbox").append('<button class="close">&#215;</button>').closest(".notice-options").addClass("opaque");a.find("button.close").click(function(){$(this).remove();a.removeClass("dialogbox").closest(".notice-options").removeClass("opaque");a.find(".submit_dialogbox").remove();a.find(".submit").show();return false})},NoticeAttachments:function(){$(".notice a.attachment").each(function(){SN.U.NoticeWithAttachment($(this).closest(".notice"))})},NoticeWithAttachment:function(b){if(b.find(".attachment").length===0){return}var a=b.find(".attachment.more");if(a.length>0){$(a[0]).click(function(){var c=$(this);c.addClass(SN.C.S.Processing);$.get(c.attr("href")+"/ajax",null,function(d){c.parent(".entry-content").html($(d).find("#attachment_view .entry-content").html())});return false}).attr("title",SN.msg("showmore_tooltip"))}},NoticeDataAttach:function(b){var a=b.find("input[type=file]");a.change(function(f){b.find(".attach-status").remove();var d=$(this).val();if(!d){return false}var c=$('<div class="attach-status '+SN.C.S.Success+'"><code></code> <button class="close">&#215;</button></div>');c.find("code").text(d);c.find("button").click(function(){c.remove();a.val("");return false});b.append(c);if(typeof this.files=="object"){for(var e=0;e<this.files.length;e++){SN.U.PreviewAttach(b,this.files[e])}}})},maxFileSize:function(b){var a=$(b).find("input[name=MAX_FILE_SIZE]").attr("value");if(a){return parseInt(a)}else{return 0}},PreviewAttach:function(d,c){var e=c.type+" "+Math.round(c.size/1024)+"KB";var f=true;var h;if(typeof window.createObjectURL!="undefined"){h=function(i,j){j(window.createObjectURL(i))}}else{if(typeof window.FileReader!="undefined"){h=function(j,k){var i=new FileReader();i.onload=function(l){k(i.result)};i.readAsDataURL(j)}}else{f=false}}var a=["image/png","image/jpeg","image/gif","image/svg+xml"];if($.inArray(c.type,a)==-1){f=false}var g=8*1024*1024;if(c.size>g){f=false}if(f){h(c,function(j){var i=$("<img>").attr("title",e).attr("alt",e).attr("src",j).attr("style","height: 120px");d.find(".attach-status").append(i)})}else{var b=$("<div></div>").text(e);d.find(".attach-status").append(b)}},NoticeLocationAttach:function(a){var e=a.find("[name=lat]");var k=a.find("[name=lon]");var g=a.find("[name=location_ns]").val();var l=a.find("[name=location_id]").val();var b="";var d=a.find("[name=notice_data-geo]");var c=a.find("[name=notice_data-geo]");var j=a.find("label.notice_data-geo");function f(n){j.attr("title",jQuery.trim(j.text())).removeClass("checked");a.find("[name=lat]").val("");a.find("[name=lon]").val("");a.find("[name=location_ns]").val("");a.find("[name=location_id]").val("");a.find("[name=notice_data-geo]").attr("checked",false);$.cookie(SN.C.S.NoticeDataGeoCookie,"disabled",{path:"/"});if(n){a.find(".geo_status_wrapper").removeClass("success").addClass("error");a.find(".geo_status_wrapper .geo_status").text(n)}else{a.find(".geo_status_wrapper").remove()}}function m(n,o){SN.U.NoticeGeoStatus(a,"Looking up place name...");$.getJSON(n,o,function(p){var q,r;if(typeof(p.location_ns)!="undefined"){a.find("[name=location_ns]").val(p.location_ns);q=p.location_ns}if(typeof(p.location_id)!="undefined"){a.find("[name=location_id]").val(p.location_id);r=p.location_id}if(typeof(p.name)=="undefined"){NLN_text=o.lat+";"+o.lon}else{NLN_text=p.name}SN.U.NoticeGeoStatus(a,NLN_text,o.lat,o.lon,p.url);j.attr("title",NoticeDataGeo_text.ShareDisable+" ("+NLN_text+")");a.find("[name=lat]").val(o.lat);a.find("[name=lon]").val(o.lon);a.find("[name=location_ns]").val(q);a.find("[name=location_id]").val(r);a.find("[name=notice_data-geo]").attr("checked",true);var s={NLat:o.lat,NLon:o.lon,NLNS:q,NLID:r,NLN:NLN_text,NLNU:p.url,NDG:true};$.cookie(SN.C.S.NoticeDataGeoCookie,JSON.stringify(s),{path:"/"})})}if(c.length>0){if($.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){c.attr("checked",false)}else{c.attr("checked",true)}var h=a.find(".notice_data-geo_wrap");var i=h.attr("title");h.removeAttr("title");j.attr("title",j.text());c.change(function(){if(c.attr("checked")===true||$.cookie(SN.C.S.NoticeDataGeoCookie)===null){j.attr("title",NoticeDataGeo_text.ShareDisable).addClass("checked");if($.cookie(SN.C.S.NoticeDataGeoCookie)===null||$.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){if(navigator.geolocation){SN.U.NoticeGeoStatus(a,"Requesting location from browser...");navigator.geolocation.getCurrentPosition(function(p){a.find("[name=lat]").val(p.coords.latitude);a.find("[name=lon]").val(p.coords.longitude);var q={lat:p.coords.latitude,lon:p.coords.longitude,token:$("#token").val()};m(i,q)},function(p){switch(p.code){case p.PERMISSION_DENIED:f("Location permission denied.");break;case p.TIMEOUT:f("Location lookup timeout.");break}},{timeout:10000})}else{if(e.length>0&&k.length>0){var n={lat:e,lon:k,token:$("#token").val()};m(i,n)}else{f();c.remove();j.remove()}}}else{var o=JSON.parse($.cookie(SN.C.S.NoticeDataGeoCookie));a.find("[name=lat]").val(o.NLat);a.find("[name=lon]").val(o.NLon);a.find("[name=location_ns]").val(o.NLNS);a.find("[name=location_id]").val(o.NLID);a.find("[name=notice_data-geo]").attr("checked",o.NDG);SN.U.NoticeGeoStatus(a,o.NLN,o.NLat,o.NLon,o.NLNU);j.attr("title",NoticeDataGeo_text.ShareDisable+" ("+o.NLN+")").addClass("checked")}}else{f()}}).change()}},NoticeGeoStatus:function(e,a,f,g,c){var h=e.find(".geo_status_wrapper");if(h.length==0){h=$('<div class="'+SN.C.S.Success+' geo_status_wrapper"><button class="close" style="float:right">&#215;</button><div class="geo_status"></div></div>');h.find("button.close").click(function(){e.find("[name=notice_data-geo]").removeAttr("checked").change()});e.append(h)}var b;if(c){b=$("<a></a>").attr("href",c)}else{b=$("<span></span>")}b.text(a);if(f||g){var d=f+";"+g;b.attr("title",d);if(!a){b.text(d)}}h.find(".geo_status").empty().append(b)},NewDirectMessage:function(){NDM=$(".entity_send-a-message a");NDM.attr({href:NDM.attr("href")+"&ajax=1"});NDM.bind("click",function(){var a=$(".entity_send-a-message form");if(a.length===0){$(this).addClass(SN.C.S.Processing);$.get(NDM.attr("href"),null,function(b){$(".entity_send-a-message").append(document._importNode($("form",b)[0],true));a=$(".entity_send-a-message .form_notice");SN.U.FormNoticeXHR(a);SN.U.FormNoticeEnhancements(a);a.append('<button class="close">&#215;</button>');$(".entity_send-a-message button").click(function(){a.hide();return false});NDM.removeClass(SN.C.S.Processing)})}else{a.show();$(".entity_send-a-message textarea").focus()}return false})},GetFullYear:function(c,d,a){var b=new Date();b.setFullYear(c,d,a);return b},StatusNetInstance:{Set:function(b){var a=SN.U.StatusNetInstance.Get();if(a!==null){b=$.extend(a,b)}$.cookie(SN.C.S.StatusNetInstance,JSON.stringify(b),{path:"/",expires:SN.U.GetFullYear(2029,0,1)})},Get:function(){var a=$.cookie(SN.C.S.StatusNetInstance);if(a!==null){return JSON.parse(a)}return null},Delete:function(){$.cookie(SN.C.S.StatusNetInstance,null)}},belongsOnTimeline:function(b){var a=$("body").attr("id");if(a=="public"){return true}var c=$("#nav_profile a").attr("href");if(c){var d=$(b).find(".vcard.author a.url").attr("href");if(d==c){if(a=="all"||a=="showstream"){return true}}}return false},switchInputFormTab:function(a){$(".input_form_nav_tab.current").removeClass("current");$("#input_form_nav_"+a).addClass("current");$(".input_form.current").removeClass("current");$("#input_form_"+a).addClass("current")}},Init:{NoticeForm:function(){if($("body.user_in").length>0){$(".ajax-notice").each(function(){var a=$(this);SN.Init.NoticeFormSetup(a)});$("body").bind("click",function(c){var a=$("li.notice-reply");if(a.length>0){var b=$(c.target).closest("li.notice-reply");if(b.length==0){a.each(function(){var e=$(this);if(e.find(".notice_data-text:first").val()==""){var d=e.closest("li.notice");e.remove();SN.U.NoticeInlineReplyPlaceholder(d)}})}}})}},NoticeFormSetup:function(a){SN.U.NoticeLocationAttach(a);SN.U.FormNoticeXHR(a);SN.U.FormNoticeEnhancements(a);SN.U.NoticeDataAttach(a)},Notices:function(){if($("body.user_in").length>0){var a=$(".form_notice:first");if(a.length>0){SN.C.I.NoticeFormMaster=document._importNode(a[0],true)}SN.U.NoticeRepeat();SN.U.NoticeReply();SN.U.NoticeInlineReplySetup()}SN.U.NoticeAttachments()},EntityActions:function(){if($("body.user_in").length>0){SN.U.NewDirectMessage()}},Login:function(){if(SN.U.StatusNetInstance.Get()!==null){var a=SN.U.StatusNetInstance.Get().Nickname;if(a!==null){$("#form_login #nickname").val(a)}}$("#form_login").bind("submit",function(){SN.U.StatusNetInstance.Set({Nickname:$("#form_login #nickname").val()});return true})},AjaxForms:function(){$("form.ajax").live("submit",function(){SN.U.FormXHR($(this));return false})},UploadForms:function(){$("input[type=file]").change(function(d){if(typeof this.files=="object"&&this.files.length>0){var c=0;for(var b=0;b<this.files.length;b++){c+=this.files[b].size}var a=SN.U.maxFileSize($(this.form));if(a>0&&c>a){var e="File too large: maximum upload size is %d bytes.";alert(e.replace("%d",a));$(this).val("");d.preventDefault();return false}}})}}};$(document).ready(function(){SN.Init.AjaxForms();SN.Init.UploadForms();if($("."+SN.C.S.FormNotice).length>0){SN.Init.NoticeForm()}if($("#content .notices").length>0){SN.Init.Notices()}if($("#content .entity_actions").length>0){SN.Init.EntityActions()}if($("#form_login").length>0){SN.Init.Login()}});if(!document.ELEMENT_NODE){document.ELEMENT_NODE=1;document.ATTRIBUTE_NODE=2;document.TEXT_NODE=3;document.CDATA_SECTION_NODE=4;document.ENTITY_REFERENCE_NODE=5;document.ENTITY_NODE=6;document.PROCESSING_INSTRUCTION_NODE=7;document.COMMENT_NODE=8;document.DOCUMENT_NODE=9;document.DOCUMENT_TYPE_NODE=10;document.DOCUMENT_FRAGMENT_NODE=11;document.NOTATION_NODE=12}document._importNode=function(e,a){switch(e.nodeType){case document.ELEMENT_NODE:var d=document.createElement(e.nodeName);if(e.attributes&&e.attributes.length>0){for(var c=0,b=e.attributes.length;c<b;){if(e.attributes[c].nodeName=="class"){d.className=e.getAttribute(e.attributes[c++].nodeName)}else{d.setAttribute(e.attributes[c].nodeName,e.getAttribute(e.attributes[c++].nodeName))}}}if(a&&e.childNodes&&e.childNodes.length>0){for(var c=0,b=e.childNodes.length;c<b;){d.appendChild(document._importNode(e.childNodes[c++],a))}}return d;break;case document.TEXT_NODE:case document.CDATA_SECTION_NODE:case document.COMMENT_NODE:return document.createTextNode(e.nodeValue);break}};if(typeof navigator.geolocation=="undefined"||navigator.geolocation.shim){(function(){(function(){if(window.google&&google.gears){return}var c=null;if(typeof GearsFactory!="undefined"){c=new GearsFactory()}else{try{c=new ActiveXObject("Gears.Factory");if(c.getBuildInfo().indexOf("ie_mobile")!=-1){c.privateSetGlobalObject(this)}}catch(d){if((typeof navigator.mimeTypes!="undefined")&&navigator.mimeTypes["application/x-googlegears"]){c=document.createElement("object");c.style.display="none";c.width=0;c.height=0;c.type="application/x-googlegears";document.documentElement.appendChild(c)}}}if(!c){return}if(!window.google){google={}}if(!google.gears){google.gears={factory:c}}})();var a=(function(){var d=google.gears.factory.create("beta.geolocation");var c=function(f,e){return function(g){f(g);e.lastPosition=g}};return{shim:true,type:"Gears",lastPosition:null,getCurrentPosition:function(e,g,h){var f=this;var i=c(e,f);d.getCurrentPosition(i,g,h)},watchPosition:function(e,f,g){d.watchPosition(e,f,g)},clearWatch:function(e){d.clearWatch(e)},getPermission:function(g,e,f){d.getPermission(g,e,f)}}});var b=(function(){var i=false;var e=function(){if(!d()&&!i){i=true;var j=document.createElement("script");j.src=(document.location.protocol=="https:"?"https://":"http://")+"www.google.com/jsapi?callback=_google_loader_apiLoaded";j.type="text/javascript";document.getElementsByTagName("body")[0].appendChild(j)}};var c=[];var h=function(j){c.push(j)};var f=function(){if(d()){while(c.length>0){var j=c.pop();j()}}};window._google_loader_apiLoaded=function(){f()};var d=function(){return(window.google&&google.loader)};var g=function(j){if(d()){return true}h(j);e();return false};e();return{shim:true,type:"ClientLocation",lastPosition:null,getCurrentPosition:function(k,n,o){var m=this;if(!g(function(){m.getCurrentPosition(k,n,o)})){return}if(google.loader.ClientLocation){var l=google.loader.ClientLocation;var j={coords:{latitude:l.latitude,longitude:l.longitude,altitude:null,accuracy:43000,altitudeAccuracy:null,heading:null,speed:null},address:{city:l.address.city,country:l.address.country,country_code:l.address.country_code,region:l.address.region},timestamp:new Date()};k(j);this.lastPosition=j}else{if(n==="function"){n({code:3,message:"Using the Google ClientLocation API and it is not able to calculate a location."})}}},watchPosition:function(j,l,m){this.getCurrentPosition(j,l,m);var k=this;var n=setInterval(function(){k.getCurrentPosition(j,l,m)},10000);return n},clearWatch:function(j){clearInterval(j)},getPermission:function(l,j,k){return true}}});navigator.geolocation=(window.google&&google.gears)?a():b()})()};
\ No newline at end of file
+var SN={C:{I:{CounterBlackout:false,MaxLength:140,PatternUsername:/^[0-9a-zA-Z\-_.]*$/,HTTP20x30x:[200,201,202,203,204,205,206,300,301,302,303,304,305,306,307],NoticeFormMaster:null},S:{Disabled:"disabled",Warning:"warning",Error:"error",Success:"success",Processing:"processing",CommandResult:"command_result",FormNotice:"form_notice",NoticeDataGeo:"notice_data-geo",NoticeDataGeoCookie:"NoticeDataGeo",NoticeDataGeoSelected:"notice_data-geo_selected",StatusNetInstance:"StatusNetInstance"}},messages:{},msg:function(a){if(typeof SN.messages[a]=="undefined"){return"["+a+"]"}else{return SN.messages[a]}},U:{FormNoticeEnhancements:function(b){if(jQuery.data(b[0],"ElementData")===undefined){MaxLength=b.find(".count").text();if(typeof(MaxLength)=="undefined"){MaxLength=SN.C.I.MaxLength}jQuery.data(b[0],"ElementData",{MaxLength:MaxLength});SN.U.Counter(b);NDT=b.find(".notice_data-text:first");NDT.bind("keyup",function(c){SN.U.Counter(b)});var a=function(c){window.setTimeout(function(){SN.U.Counter(b)},50)};NDT.bind("cut",a).bind("paste",a)}else{b.find(".count").text(jQuery.data(b[0],"ElementData").MaxLength)}},Counter:function(d){SN.C.I.FormNoticeCurrent=d;var b=jQuery.data(d[0],"ElementData").MaxLength;if(b<=0){return}var c=b-SN.U.CharacterCount(d);var a=d.find(".count");if(c.toString()!=a.text()){if(!SN.C.I.CounterBlackout||c===0){if(a.text()!=String(c)){a.text(c)}if(c<0){d.addClass(SN.C.S.Warning)}else{d.removeClass(SN.C.S.Warning)}if(!SN.C.I.CounterBlackout){SN.C.I.CounterBlackout=true;SN.C.I.FormNoticeCurrent=d;window.setTimeout("SN.U.ClearCounterBlackout(SN.C.I.FormNoticeCurrent);",500)}}}},CharacterCount:function(a){return a.find(".notice_data-text:first").val().length},ClearCounterBlackout:function(a){SN.C.I.CounterBlackout=false;SN.U.Counter(a)},RewriteAjaxAction:function(a){if(document.location.protocol=="https:"&&a.substr(0,5)=="http:"){return a.replace(/^http:\/\/[^:\/]+/,"https://"+document.location.host)}else{return a}},FormXHR:function(a){$.ajax({type:"POST",dataType:"xml",url:SN.U.RewriteAjaxAction(a.attr("action")),data:a.serialize()+"&ajax=1",beforeSend:function(b){a.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(c,d,b){alert(b||d)},success:function(b,c){if(typeof($("form",b)[0])!="undefined"){form_new=document._importNode($("form",b)[0],true);a.replaceWith(form_new)}else{a.replaceWith(document._importNode($("p",b)[0],true))}}})},FormNoticeXHR:function(b){SN.C.I.NoticeDataGeo={};b.append('<input type="hidden" name="ajax" value="1"/>');b.attr("action",SN.U.RewriteAjaxAction(b.attr("action")));var c=function(d,e){b.append($('<p class="form_response"></p>').addClass(d).text(e))};var a=function(){b.find(".form_response").remove()};b.ajaxForm({dataType:"xml",timeout:"60000",beforeSend:function(d){if(b.find(".notice_data-text:first").val()==""){b.addClass(SN.C.S.Warning);return false}b.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled);SN.U.normalizeGeoData(b);return true},error:function(f,g,e){b.removeClass(SN.C.S.Processing).find(".submit").removeClass(SN.C.S.Disabled).removeAttr(SN.C.S.Disabled,SN.C.S.Disabled);a();if(g=="timeout"){c("error","Sorry! We had trouble sending your notice. The servers are overloaded. Please try again, and contact the site administrator if this problem persists.")}else{var d=SN.U.GetResponseXML(f);if($("."+SN.C.S.Error,d).length>0){b.append(document._importNode($("."+SN.C.S.Error,d)[0],true))}else{if(parseInt(f.status)===0||jQuery.inArray(parseInt(f.status),SN.C.I.HTTP20x30x)>=0){b.resetForm().find(".attach-status").remove();SN.U.FormNoticeEnhancements(b)}else{c("error","(Sorry! We had trouble sending your notice ("+f.status+" "+f.statusText+"). Please report the problem to the site administrator if this happens again.")}}}},success:function(i,f){a();var n=$("#"+SN.C.S.Error,i);if(n.length>0){c("error",n.text())}else{if($("body")[0].id=="bookmarklet"){self.close()}var d=$("#"+SN.C.S.CommandResult,i);if(d.length>0){c("success",d.text())}else{var m=document._importNode($("li",i)[0],true);var k=$("#notices_primary .notices:first");var l=b.closest("li.notice-reply");if(l.length>0){var e=$(m).attr("id");if($("#"+e).length==0){var j=l.closest("li.notice");l.replaceWith(m);SN.U.NoticeInlineReplyPlaceholder(j)}else{l.remove()}}else{if(k.length>0&&SN.U.belongsOnTimeline(m)){if($("#"+m.id).length===0){var h=b.find("[name=inreplyto]").val();var g="#notices_primary #notice-"+h;if($("body")[0].id=="conversation"){if(h.length>0&&$(g+" .notices").length<1){$(g).append('<ul class="notices"></ul>')}$($(g+" .notices")[0]).append(m)}else{k.prepend(m)}$("#"+m.id).css({display:"none"}).fadeIn(2500);SN.U.NoticeWithAttachment($("#"+m.id));SN.U.NoticeReplyTo($("#"+m.id))}}else{c("success",$("title",i).text())}}}b.resetForm();b.find("[name=inreplyto]").val("");b.find(".attach-status").remove();SN.U.FormNoticeEnhancements(b)}},complete:function(d,e){b.removeClass(SN.C.S.Processing).find(".submit").removeAttr(SN.C.S.Disabled).removeClass(SN.C.S.Disabled);b.find("[name=lat]").val(SN.C.I.NoticeDataGeo.NLat);b.find("[name=lon]").val(SN.C.I.NoticeDataGeo.NLon);b.find("[name=location_ns]").val(SN.C.I.NoticeDataGeo.NLNS);b.find("[name=location_id]").val(SN.C.I.NoticeDataGeo.NLID);b.find("[name=notice_data-geo]").attr("checked",SN.C.I.NoticeDataGeo.NDG)}})},normalizeGeoData:function(a){SN.C.I.NoticeDataGeo.NLat=a.find("[name=lat]").val();SN.C.I.NoticeDataGeo.NLon=a.find("[name=lon]").val();SN.C.I.NoticeDataGeo.NLNS=a.find("[name=location_ns]").val();SN.C.I.NoticeDataGeo.NLID=a.find("[name=location_id]").val();SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked");var b=$.cookie(SN.C.S.NoticeDataGeoCookie);if(b!==null&&b!="disabled"){b=JSON.parse(b);SN.C.I.NoticeDataGeo.NLat=a.find("[name=lat]").val(b.NLat).val();SN.C.I.NoticeDataGeo.NLon=a.find("[name=lon]").val(b.NLon).val();if(b.NLNS){SN.C.I.NoticeDataGeo.NLNS=a.find("[name=location_ns]").val(b.NLNS).val();SN.C.I.NoticeDataGeo.NLID=a.find("[name=location_id]").val(b.NLID).val()}else{a.find("[name=location_ns]").val("");a.find("[name=location_id]").val("")}}if(b=="disabled"){SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked",false).attr("checked")}else{SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked",true).attr("checked")}},GetResponseXML:function(b){try{return b.responseXML}catch(a){return(new DOMParser()).parseFromString(b.responseText,"text/xml")}},NoticeReply:function(){if($("#content .notice_reply").length>0){$("#content .notice").each(function(){SN.U.NoticeReplyTo($(this))})}},NoticeReplyTo:function(a){a.find(".notice_reply").live("click",function(c){c.preventDefault();var b=($(".author .nickname",a).length>0)?$($(".author .nickname",a)[0]):$(".author .nickname.uid");SN.U.NoticeInlineReplyTrigger(a,"@"+b.text());return false})},NoticeInlineReplyTrigger:function(h,i){var b=$($(".notice_id",h)[0]).text();var e=h;var f=h.closest(".notices");if(f.hasClass("threaded-replies")){e=f.closest(".notice")}else{f=$("ul.threaded-replies",h);if(f.length==0){f=$('<ul class="notices threaded-replies xoxo"></ul>');h.append(f)}}var j=$(".notice-reply-form",f);var d=function(){j.find("input[name=inreplyto]").val(b);var m=j.find("textarea");if(m.length==0){throw"No textarea"}var l="";if(i){l=i+" "}m.val(l+m.val().replace(RegExp(l,"i"),""));m.data("initialText",$.trim(i+""));m.focus();if(m[0].setSelectionRange){var k=m.val().length;m[0].setSelectionRange(k,k)}};if(j.length>0){d()}else{f.find("li.notice-reply-placeholder").remove();var g=$("li.notice-reply",f);if(g.length==0){g=$('<li class="notice-reply"></li>');var c=function(k){var l=document._importNode(k,true);g.append(l);f.append(g);var m=j=$(l);SN.Init.NoticeFormSetup(m);d()};if(SN.C.I.NoticeFormMaster){c(SN.C.I.NoticeFormMaster)}else{var a=$("#form_notice").attr("action");$.get(a,{ajax:1},function(k,m,l){c($("form",k)[0])})}}}},NoticeInlineReplyPlaceholder:function(b){var a=b.find("ul.threaded-replies");var c=$('<li class="notice-reply-placeholder"><input class="placeholder"></li>');c.click(function(){SN.U.NoticeInlineReplyTrigger(b);return false});c.find("input").val(SN.msg("reply_placeholder"));a.append(c)},NoticeInlineReplySetup:function(){$(".threaded-replies").each(function(){var b=$(this);var a=b.closest(".notice");SN.U.NoticeInlineReplyPlaceholder(a)})},NoticeRepeat:function(){$(".form_repeat").live("click",function(a){a.preventDefault();SN.U.NoticeRepeatConfirmation($(this));return false})},NoticeRepeatConfirmation:function(a){var c=a.find(".submit");var b=c.clone();b.addClass("submit_dialogbox").removeClass("submit");a.append(b);b.bind("click",function(){SN.U.FormXHR(a);return false});c.hide();a.addClass("dialogbox").append('<button class="close">&#215;</button>').closest(".notice-options").addClass("opaque");a.find("button.close").click(function(){$(this).remove();a.removeClass("dialogbox").closest(".notice-options").removeClass("opaque");a.find(".submit_dialogbox").remove();a.find(".submit").show();return false})},NoticeAttachments:function(){$(".notice a.attachment").each(function(){SN.U.NoticeWithAttachment($(this).closest(".notice"))})},NoticeWithAttachment:function(b){if(b.find(".attachment").length===0){return}var a=b.find(".attachment.more");if(a.length>0){$(a[0]).click(function(){var c=$(this);c.addClass(SN.C.S.Processing);$.get(c.attr("href")+"/ajax",null,function(d){c.parent(".entry-content").html($(d).find("#attachment_view .entry-content").html())});return false}).attr("title",SN.msg("showmore_tooltip"))}},NoticeDataAttach:function(b){var a=b.find("input[type=file]");a.change(function(f){b.find(".attach-status").remove();var d=$(this).val();if(!d){return false}var c=$('<div class="attach-status '+SN.C.S.Success+'"><code></code> <button class="close">&#215;</button></div>');c.find("code").text(d);c.find("button").click(function(){c.remove();a.val("");return false});b.append(c);if(typeof this.files=="object"){for(var e=0;e<this.files.length;e++){SN.U.PreviewAttach(b,this.files[e])}}})},maxFileSize:function(b){var a=$(b).find("input[name=MAX_FILE_SIZE]").attr("value");if(a){return parseInt(a)}else{return 0}},PreviewAttach:function(d,c){var e=c.type+" "+Math.round(c.size/1024)+"KB";var f=true;var h;if(typeof window.createObjectURL!="undefined"){h=function(i,j){j(window.createObjectURL(i))}}else{if(typeof window.FileReader!="undefined"){h=function(j,k){var i=new FileReader();i.onload=function(l){k(i.result)};i.readAsDataURL(j)}}else{f=false}}var a=["image/png","image/jpeg","image/gif","image/svg+xml"];if($.inArray(c.type,a)==-1){f=false}var g=8*1024*1024;if(c.size>g){f=false}if(f){h(c,function(j){var i=$("<img>").attr("title",e).attr("alt",e).attr("src",j).attr("style","height: 120px");d.find(".attach-status").append(i)})}else{var b=$("<div></div>").text(e);d.find(".attach-status").append(b)}},NoticeLocationAttach:function(a){var e=a.find("[name=lat]");var k=a.find("[name=lon]");var g=a.find("[name=location_ns]").val();var l=a.find("[name=location_id]").val();var b="";var d=a.find("[name=notice_data-geo]");var c=a.find("[name=notice_data-geo]");var j=a.find("label.notice_data-geo");function f(n){j.attr("title",jQuery.trim(j.text())).removeClass("checked");a.find("[name=lat]").val("");a.find("[name=lon]").val("");a.find("[name=location_ns]").val("");a.find("[name=location_id]").val("");a.find("[name=notice_data-geo]").attr("checked",false);$.cookie(SN.C.S.NoticeDataGeoCookie,"disabled",{path:"/"});if(n){a.find(".geo_status_wrapper").removeClass("success").addClass("error");a.find(".geo_status_wrapper .geo_status").text(n)}else{a.find(".geo_status_wrapper").remove()}}function m(n,o){SN.U.NoticeGeoStatus(a,"Looking up place name...");$.getJSON(n,o,function(p){var q,r;if(typeof(p.location_ns)!="undefined"){a.find("[name=location_ns]").val(p.location_ns);q=p.location_ns}if(typeof(p.location_id)!="undefined"){a.find("[name=location_id]").val(p.location_id);r=p.location_id}if(typeof(p.name)=="undefined"){NLN_text=o.lat+";"+o.lon}else{NLN_text=p.name}SN.U.NoticeGeoStatus(a,NLN_text,o.lat,o.lon,p.url);j.attr("title",NoticeDataGeo_text.ShareDisable+" ("+NLN_text+")");a.find("[name=lat]").val(o.lat);a.find("[name=lon]").val(o.lon);a.find("[name=location_ns]").val(q);a.find("[name=location_id]").val(r);a.find("[name=notice_data-geo]").attr("checked",true);var s={NLat:o.lat,NLon:o.lon,NLNS:q,NLID:r,NLN:NLN_text,NLNU:p.url,NDG:true};$.cookie(SN.C.S.NoticeDataGeoCookie,JSON.stringify(s),{path:"/"})})}if(c.length>0){if($.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){c.attr("checked",false)}else{c.attr("checked",true)}var h=a.find(".notice_data-geo_wrap");var i=h.attr("title");h.removeAttr("title");j.attr("title",j.text());c.change(function(){if(c.attr("checked")===true||$.cookie(SN.C.S.NoticeDataGeoCookie)===null){j.attr("title",NoticeDataGeo_text.ShareDisable).addClass("checked");if($.cookie(SN.C.S.NoticeDataGeoCookie)===null||$.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){if(navigator.geolocation){SN.U.NoticeGeoStatus(a,"Requesting location from browser...");navigator.geolocation.getCurrentPosition(function(p){a.find("[name=lat]").val(p.coords.latitude);a.find("[name=lon]").val(p.coords.longitude);var q={lat:p.coords.latitude,lon:p.coords.longitude,token:$("#token").val()};m(i,q)},function(p){switch(p.code){case p.PERMISSION_DENIED:f("Location permission denied.");break;case p.TIMEOUT:f("Location lookup timeout.");break}},{timeout:10000})}else{if(e.length>0&&k.length>0){var n={lat:e,lon:k,token:$("#token").val()};m(i,n)}else{f();c.remove();j.remove()}}}else{var o=JSON.parse($.cookie(SN.C.S.NoticeDataGeoCookie));a.find("[name=lat]").val(o.NLat);a.find("[name=lon]").val(o.NLon);a.find("[name=location_ns]").val(o.NLNS);a.find("[name=location_id]").val(o.NLID);a.find("[name=notice_data-geo]").attr("checked",o.NDG);SN.U.NoticeGeoStatus(a,o.NLN,o.NLat,o.NLon,o.NLNU);j.attr("title",NoticeDataGeo_text.ShareDisable+" ("+o.NLN+")").addClass("checked")}}else{f()}}).change()}},NoticeGeoStatus:function(e,a,f,g,c){var h=e.find(".geo_status_wrapper");if(h.length==0){h=$('<div class="'+SN.C.S.Success+' geo_status_wrapper"><button class="close" style="float:right">&#215;</button><div class="geo_status"></div></div>');h.find("button.close").click(function(){e.find("[name=notice_data-geo]").removeAttr("checked").change()});e.append(h)}var b;if(c){b=$("<a></a>").attr("href",c)}else{b=$("<span></span>")}b.text(a);if(f||g){var d=f+";"+g;b.attr("title",d);if(!a){b.text(d)}}h.find(".geo_status").empty().append(b)},NewDirectMessage:function(){NDM=$(".entity_send-a-message a");NDM.attr({href:NDM.attr("href")+"&ajax=1"});NDM.bind("click",function(){var a=$(".entity_send-a-message form");if(a.length===0){$(this).addClass(SN.C.S.Processing);$.get(NDM.attr("href"),null,function(b){$(".entity_send-a-message").append(document._importNode($("form",b)[0],true));a=$(".entity_send-a-message .form_notice");SN.U.FormNoticeXHR(a);SN.U.FormNoticeEnhancements(a);a.append('<button class="close">&#215;</button>');$(".entity_send-a-message button").click(function(){a.hide();return false});NDM.removeClass(SN.C.S.Processing)})}else{a.show();$(".entity_send-a-message textarea").focus()}return false})},GetFullYear:function(c,d,a){var b=new Date();b.setFullYear(c,d,a);return b},StatusNetInstance:{Set:function(b){var a=SN.U.StatusNetInstance.Get();if(a!==null){b=$.extend(a,b)}$.cookie(SN.C.S.StatusNetInstance,JSON.stringify(b),{path:"/",expires:SN.U.GetFullYear(2029,0,1)})},Get:function(){var a=$.cookie(SN.C.S.StatusNetInstance);if(a!==null){return JSON.parse(a)}return null},Delete:function(){$.cookie(SN.C.S.StatusNetInstance,null)}},belongsOnTimeline:function(b){var a=$("body").attr("id");if(a=="public"){return true}var c=$("#nav_profile a").attr("href");if(c){var d=$(b).find(".vcard.author a.url").attr("href");if(d==c){if(a=="all"||a=="showstream"){return true}}}return false},switchInputFormTab:function(a){$(".input_form_nav_tab.current").removeClass("current");$("#input_form_nav_"+a).addClass("current");$(".input_form.current").removeClass("current");$("#input_form_"+a).addClass("current")}},Init:{NoticeForm:function(){if($("body.user_in").length>0){$(".ajax-notice").each(function(){var a=$(this);SN.Init.NoticeFormSetup(a)});$("body").bind("click",function(c){var a=$("li.notice-reply");if(a.length>0){var b=$(c.target).closest("li.notice-reply");if(b.length==0){a.each(function(){var e=$(this);if(e.find(".notice_data-text:first").val()==""){var d=e.closest("li.notice");e.remove();SN.U.NoticeInlineReplyPlaceholder(d)}})}}})}},NoticeFormSetup:function(a){SN.U.NoticeLocationAttach(a);SN.U.FormNoticeXHR(a);SN.U.FormNoticeEnhancements(a);SN.U.NoticeDataAttach(a)},Notices:function(){if($("body.user_in").length>0){var a=$(".form_notice:first");if(a.length>0){SN.C.I.NoticeFormMaster=document._importNode(a[0],true)}SN.U.NoticeRepeat();SN.U.NoticeReply();SN.U.NoticeInlineReplySetup()}SN.U.NoticeAttachments()},EntityActions:function(){if($("body.user_in").length>0){SN.U.NewDirectMessage()}},Login:function(){if(SN.U.StatusNetInstance.Get()!==null){var a=SN.U.StatusNetInstance.Get().Nickname;if(a!==null){$("#form_login #nickname").val(a)}}$("#form_login").bind("submit",function(){SN.U.StatusNetInstance.Set({Nickname:$("#form_login #nickname").val()});return true})},AjaxForms:function(){$("form.ajax").live("submit",function(){SN.U.FormXHR($(this));return false})},UploadForms:function(){$("input[type=file]").change(function(d){if(typeof this.files=="object"&&this.files.length>0){var c=0;for(var b=0;b<this.files.length;b++){c+=this.files[b].size}var a=SN.U.maxFileSize($(this.form));if(a>0&&c>a){var e="File too large: maximum upload size is %d bytes.";alert(e.replace("%d",a));$(this).val("");d.preventDefault();return false}}})}}};$(document).ready(function(){SN.Init.AjaxForms();SN.Init.UploadForms();if($("."+SN.C.S.FormNotice).length>0){SN.Init.NoticeForm()}if($("#content .notices").length>0){SN.Init.Notices()}if($("#content .entity_actions").length>0){SN.Init.EntityActions()}if($("#form_login").length>0){SN.Init.Login()}});if(!document.ELEMENT_NODE){document.ELEMENT_NODE=1;document.ATTRIBUTE_NODE=2;document.TEXT_NODE=3;document.CDATA_SECTION_NODE=4;document.ENTITY_REFERENCE_NODE=5;document.ENTITY_NODE=6;document.PROCESSING_INSTRUCTION_NODE=7;document.COMMENT_NODE=8;document.DOCUMENT_NODE=9;document.DOCUMENT_TYPE_NODE=10;document.DOCUMENT_FRAGMENT_NODE=11;document.NOTATION_NODE=12}document._importNode=function(e,a){switch(e.nodeType){case document.ELEMENT_NODE:var d=document.createElement(e.nodeName);if(e.attributes&&e.attributes.length>0){for(var c=0,b=e.attributes.length;c<b;){if(e.attributes[c].nodeName=="class"){d.className=e.getAttribute(e.attributes[c++].nodeName)}else{d.setAttribute(e.attributes[c].nodeName,e.getAttribute(e.attributes[c++].nodeName))}}}if(a&&e.childNodes&&e.childNodes.length>0){for(var c=0,b=e.childNodes.length;c<b;){d.appendChild(document._importNode(e.childNodes[c++],a))}}return d;break;case document.TEXT_NODE:case document.CDATA_SECTION_NODE:case document.COMMENT_NODE:return document.createTextNode(e.nodeValue);break}};if(typeof navigator.geolocation=="undefined"||navigator.geolocation.shim){(function(){(function(){if(window.google&&google.gears){return}var c=null;if(typeof GearsFactory!="undefined"){c=new GearsFactory()}else{try{c=new ActiveXObject("Gears.Factory");if(c.getBuildInfo().indexOf("ie_mobile")!=-1){c.privateSetGlobalObject(this)}}catch(d){if((typeof navigator.mimeTypes!="undefined")&&navigator.mimeTypes["application/x-googlegears"]){c=document.createElement("object");c.style.display="none";c.width=0;c.height=0;c.type="application/x-googlegears";document.documentElement.appendChild(c)}}}if(!c){return}if(!window.google){google={}}if(!google.gears){google.gears={factory:c}}})();var a=(function(){var d=google.gears.factory.create("beta.geolocation");var c=function(f,e){return function(g){f(g);e.lastPosition=g}};return{shim:true,type:"Gears",lastPosition:null,getCurrentPosition:function(e,g,h){var f=this;var i=c(e,f);d.getCurrentPosition(i,g,h)},watchPosition:function(e,f,g){d.watchPosition(e,f,g)},clearWatch:function(e){d.clearWatch(e)},getPermission:function(g,e,f){d.getPermission(g,e,f)}}});var b=(function(){var i=false;var e=function(){if(!d()&&!i){i=true;var j=document.createElement("script");j.src=(document.location.protocol=="https:"?"https://":"http://")+"www.google.com/jsapi?callback=_google_loader_apiLoaded";j.type="text/javascript";document.getElementsByTagName("body")[0].appendChild(j)}};var c=[];var h=function(j){c.push(j)};var f=function(){if(d()){while(c.length>0){var j=c.pop();j()}}};window._google_loader_apiLoaded=function(){f()};var d=function(){return(window.google&&google.loader)};var g=function(j){if(d()){return true}h(j);e();return false};e();return{shim:true,type:"ClientLocation",lastPosition:null,getCurrentPosition:function(k,n,o){var m=this;if(!g(function(){m.getCurrentPosition(k,n,o)})){return}if(google.loader.ClientLocation){var l=google.loader.ClientLocation;var j={coords:{latitude:l.latitude,longitude:l.longitude,altitude:null,accuracy:43000,altitudeAccuracy:null,heading:null,speed:null},address:{city:l.address.city,country:l.address.country,country_code:l.address.country_code,region:l.address.region},timestamp:new Date()};k(j);this.lastPosition=j}else{if(n==="function"){n({code:3,message:"Using the Google ClientLocation API and it is not able to calculate a location."})}}},watchPosition:function(j,l,m){this.getCurrentPosition(j,l,m);var k=this;var n=setInterval(function(){k.getCurrentPosition(j,l,m)},10000);return n},clearWatch:function(j){clearInterval(j)},getPermission:function(l,j,k){return true}}});navigator.geolocation=(window.google&&google.gears)?a():b()})()};
\ No newline at end of file

From 4e1ce4e5bbc43869dc7c85463f9a733da9f5fda4 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Thu, 10 Mar 2011 16:10:58 -0800
Subject: [PATCH 514/655] Remove inline reply forms on click-away if they have
 initial text as well as if empty (plus whitespace stripping)

---
 js/util.js     | 4 +++-
 js/util.min.js | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/js/util.js b/js/util.js
index 818ad87f68..5abad8f253 100644
--- a/js/util.js
+++ b/js/util.js
@@ -1321,8 +1321,10 @@ var SN = { // StatusNet
                             // clicked outside of one...
                             openReplies.each(function() {
                                 var replyItem = $(this);
+                                var textarea = replyItem.find('.notice_data-text:first');
+                                var cur = $.trim(textarea.val());
                                 // Only close if there's been no edit.
-                                if (replyItem.find('.notice_data-text:first').val() == '') {
+                                if (cur == '' || cur == textarea.data('initialText')) {
                                     var parentNotice = replyItem.closest('li.notice');
                                     replyItem.remove();
                                     SN.U.NoticeInlineReplyPlaceholder(parentNotice);
diff --git a/js/util.min.js b/js/util.min.js
index bf010d7b80..5ec831a578 100644
--- a/js/util.min.js
+++ b/js/util.min.js
@@ -1 +1 @@
-var SN={C:{I:{CounterBlackout:false,MaxLength:140,PatternUsername:/^[0-9a-zA-Z\-_.]*$/,HTTP20x30x:[200,201,202,203,204,205,206,300,301,302,303,304,305,306,307],NoticeFormMaster:null},S:{Disabled:"disabled",Warning:"warning",Error:"error",Success:"success",Processing:"processing",CommandResult:"command_result",FormNotice:"form_notice",NoticeDataGeo:"notice_data-geo",NoticeDataGeoCookie:"NoticeDataGeo",NoticeDataGeoSelected:"notice_data-geo_selected",StatusNetInstance:"StatusNetInstance"}},messages:{},msg:function(a){if(typeof SN.messages[a]=="undefined"){return"["+a+"]"}else{return SN.messages[a]}},U:{FormNoticeEnhancements:function(b){if(jQuery.data(b[0],"ElementData")===undefined){MaxLength=b.find(".count").text();if(typeof(MaxLength)=="undefined"){MaxLength=SN.C.I.MaxLength}jQuery.data(b[0],"ElementData",{MaxLength:MaxLength});SN.U.Counter(b);NDT=b.find(".notice_data-text:first");NDT.bind("keyup",function(c){SN.U.Counter(b)});var a=function(c){window.setTimeout(function(){SN.U.Counter(b)},50)};NDT.bind("cut",a).bind("paste",a)}else{b.find(".count").text(jQuery.data(b[0],"ElementData").MaxLength)}},Counter:function(d){SN.C.I.FormNoticeCurrent=d;var b=jQuery.data(d[0],"ElementData").MaxLength;if(b<=0){return}var c=b-SN.U.CharacterCount(d);var a=d.find(".count");if(c.toString()!=a.text()){if(!SN.C.I.CounterBlackout||c===0){if(a.text()!=String(c)){a.text(c)}if(c<0){d.addClass(SN.C.S.Warning)}else{d.removeClass(SN.C.S.Warning)}if(!SN.C.I.CounterBlackout){SN.C.I.CounterBlackout=true;SN.C.I.FormNoticeCurrent=d;window.setTimeout("SN.U.ClearCounterBlackout(SN.C.I.FormNoticeCurrent);",500)}}}},CharacterCount:function(a){return a.find(".notice_data-text:first").val().length},ClearCounterBlackout:function(a){SN.C.I.CounterBlackout=false;SN.U.Counter(a)},RewriteAjaxAction:function(a){if(document.location.protocol=="https:"&&a.substr(0,5)=="http:"){return a.replace(/^http:\/\/[^:\/]+/,"https://"+document.location.host)}else{return a}},FormXHR:function(a){$.ajax({type:"POST",dataType:"xml",url:SN.U.RewriteAjaxAction(a.attr("action")),data:a.serialize()+"&ajax=1",beforeSend:function(b){a.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(c,d,b){alert(b||d)},success:function(b,c){if(typeof($("form",b)[0])!="undefined"){form_new=document._importNode($("form",b)[0],true);a.replaceWith(form_new)}else{a.replaceWith(document._importNode($("p",b)[0],true))}}})},FormNoticeXHR:function(b){SN.C.I.NoticeDataGeo={};b.append('<input type="hidden" name="ajax" value="1"/>');b.attr("action",SN.U.RewriteAjaxAction(b.attr("action")));var c=function(d,e){b.append($('<p class="form_response"></p>').addClass(d).text(e))};var a=function(){b.find(".form_response").remove()};b.ajaxForm({dataType:"xml",timeout:"60000",beforeSend:function(d){if(b.find(".notice_data-text:first").val()==""){b.addClass(SN.C.S.Warning);return false}b.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled);SN.U.normalizeGeoData(b);return true},error:function(f,g,e){b.removeClass(SN.C.S.Processing).find(".submit").removeClass(SN.C.S.Disabled).removeAttr(SN.C.S.Disabled,SN.C.S.Disabled);a();if(g=="timeout"){c("error","Sorry! We had trouble sending your notice. The servers are overloaded. Please try again, and contact the site administrator if this problem persists.")}else{var d=SN.U.GetResponseXML(f);if($("."+SN.C.S.Error,d).length>0){b.append(document._importNode($("."+SN.C.S.Error,d)[0],true))}else{if(parseInt(f.status)===0||jQuery.inArray(parseInt(f.status),SN.C.I.HTTP20x30x)>=0){b.resetForm().find(".attach-status").remove();SN.U.FormNoticeEnhancements(b)}else{c("error","(Sorry! We had trouble sending your notice ("+f.status+" "+f.statusText+"). Please report the problem to the site administrator if this happens again.")}}}},success:function(i,f){a();var n=$("#"+SN.C.S.Error,i);if(n.length>0){c("error",n.text())}else{if($("body")[0].id=="bookmarklet"){self.close()}var d=$("#"+SN.C.S.CommandResult,i);if(d.length>0){c("success",d.text())}else{var m=document._importNode($("li",i)[0],true);var k=$("#notices_primary .notices:first");var l=b.closest("li.notice-reply");if(l.length>0){var e=$(m).attr("id");if($("#"+e).length==0){var j=l.closest("li.notice");l.replaceWith(m);SN.U.NoticeInlineReplyPlaceholder(j)}else{l.remove()}}else{if(k.length>0&&SN.U.belongsOnTimeline(m)){if($("#"+m.id).length===0){var h=b.find("[name=inreplyto]").val();var g="#notices_primary #notice-"+h;if($("body")[0].id=="conversation"){if(h.length>0&&$(g+" .notices").length<1){$(g).append('<ul class="notices"></ul>')}$($(g+" .notices")[0]).append(m)}else{k.prepend(m)}$("#"+m.id).css({display:"none"}).fadeIn(2500);SN.U.NoticeWithAttachment($("#"+m.id));SN.U.NoticeReplyTo($("#"+m.id))}}else{c("success",$("title",i).text())}}}b.resetForm();b.find("[name=inreplyto]").val("");b.find(".attach-status").remove();SN.U.FormNoticeEnhancements(b)}},complete:function(d,e){b.removeClass(SN.C.S.Processing).find(".submit").removeAttr(SN.C.S.Disabled).removeClass(SN.C.S.Disabled);b.find("[name=lat]").val(SN.C.I.NoticeDataGeo.NLat);b.find("[name=lon]").val(SN.C.I.NoticeDataGeo.NLon);b.find("[name=location_ns]").val(SN.C.I.NoticeDataGeo.NLNS);b.find("[name=location_id]").val(SN.C.I.NoticeDataGeo.NLID);b.find("[name=notice_data-geo]").attr("checked",SN.C.I.NoticeDataGeo.NDG)}})},normalizeGeoData:function(a){SN.C.I.NoticeDataGeo.NLat=a.find("[name=lat]").val();SN.C.I.NoticeDataGeo.NLon=a.find("[name=lon]").val();SN.C.I.NoticeDataGeo.NLNS=a.find("[name=location_ns]").val();SN.C.I.NoticeDataGeo.NLID=a.find("[name=location_id]").val();SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked");var b=$.cookie(SN.C.S.NoticeDataGeoCookie);if(b!==null&&b!="disabled"){b=JSON.parse(b);SN.C.I.NoticeDataGeo.NLat=a.find("[name=lat]").val(b.NLat).val();SN.C.I.NoticeDataGeo.NLon=a.find("[name=lon]").val(b.NLon).val();if(b.NLNS){SN.C.I.NoticeDataGeo.NLNS=a.find("[name=location_ns]").val(b.NLNS).val();SN.C.I.NoticeDataGeo.NLID=a.find("[name=location_id]").val(b.NLID).val()}else{a.find("[name=location_ns]").val("");a.find("[name=location_id]").val("")}}if(b=="disabled"){SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked",false).attr("checked")}else{SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked",true).attr("checked")}},GetResponseXML:function(b){try{return b.responseXML}catch(a){return(new DOMParser()).parseFromString(b.responseText,"text/xml")}},NoticeReply:function(){if($("#content .notice_reply").length>0){$("#content .notice").each(function(){SN.U.NoticeReplyTo($(this))})}},NoticeReplyTo:function(a){a.find(".notice_reply").live("click",function(c){c.preventDefault();var b=($(".author .nickname",a).length>0)?$($(".author .nickname",a)[0]):$(".author .nickname.uid");SN.U.NoticeInlineReplyTrigger(a,"@"+b.text());return false})},NoticeInlineReplyTrigger:function(h,i){var b=$($(".notice_id",h)[0]).text();var e=h;var f=h.closest(".notices");if(f.hasClass("threaded-replies")){e=f.closest(".notice")}else{f=$("ul.threaded-replies",h);if(f.length==0){f=$('<ul class="notices threaded-replies xoxo"></ul>');h.append(f)}}var j=$(".notice-reply-form",f);var d=function(){j.find("input[name=inreplyto]").val(b);var m=j.find("textarea");if(m.length==0){throw"No textarea"}var l="";if(i){l=i+" "}m.val(l+m.val().replace(RegExp(l,"i"),""));m.data("initialText",$.trim(i+""));m.focus();if(m[0].setSelectionRange){var k=m.val().length;m[0].setSelectionRange(k,k)}};if(j.length>0){d()}else{f.find("li.notice-reply-placeholder").remove();var g=$("li.notice-reply",f);if(g.length==0){g=$('<li class="notice-reply"></li>');var c=function(k){var l=document._importNode(k,true);g.append(l);f.append(g);var m=j=$(l);SN.Init.NoticeFormSetup(m);d()};if(SN.C.I.NoticeFormMaster){c(SN.C.I.NoticeFormMaster)}else{var a=$("#form_notice").attr("action");$.get(a,{ajax:1},function(k,m,l){c($("form",k)[0])})}}}},NoticeInlineReplyPlaceholder:function(b){var a=b.find("ul.threaded-replies");var c=$('<li class="notice-reply-placeholder"><input class="placeholder"></li>');c.click(function(){SN.U.NoticeInlineReplyTrigger(b);return false});c.find("input").val(SN.msg("reply_placeholder"));a.append(c)},NoticeInlineReplySetup:function(){$(".threaded-replies").each(function(){var b=$(this);var a=b.closest(".notice");SN.U.NoticeInlineReplyPlaceholder(a)})},NoticeRepeat:function(){$(".form_repeat").live("click",function(a){a.preventDefault();SN.U.NoticeRepeatConfirmation($(this));return false})},NoticeRepeatConfirmation:function(a){var c=a.find(".submit");var b=c.clone();b.addClass("submit_dialogbox").removeClass("submit");a.append(b);b.bind("click",function(){SN.U.FormXHR(a);return false});c.hide();a.addClass("dialogbox").append('<button class="close">&#215;</button>').closest(".notice-options").addClass("opaque");a.find("button.close").click(function(){$(this).remove();a.removeClass("dialogbox").closest(".notice-options").removeClass("opaque");a.find(".submit_dialogbox").remove();a.find(".submit").show();return false})},NoticeAttachments:function(){$(".notice a.attachment").each(function(){SN.U.NoticeWithAttachment($(this).closest(".notice"))})},NoticeWithAttachment:function(b){if(b.find(".attachment").length===0){return}var a=b.find(".attachment.more");if(a.length>0){$(a[0]).click(function(){var c=$(this);c.addClass(SN.C.S.Processing);$.get(c.attr("href")+"/ajax",null,function(d){c.parent(".entry-content").html($(d).find("#attachment_view .entry-content").html())});return false}).attr("title",SN.msg("showmore_tooltip"))}},NoticeDataAttach:function(b){var a=b.find("input[type=file]");a.change(function(f){b.find(".attach-status").remove();var d=$(this).val();if(!d){return false}var c=$('<div class="attach-status '+SN.C.S.Success+'"><code></code> <button class="close">&#215;</button></div>');c.find("code").text(d);c.find("button").click(function(){c.remove();a.val("");return false});b.append(c);if(typeof this.files=="object"){for(var e=0;e<this.files.length;e++){SN.U.PreviewAttach(b,this.files[e])}}})},maxFileSize:function(b){var a=$(b).find("input[name=MAX_FILE_SIZE]").attr("value");if(a){return parseInt(a)}else{return 0}},PreviewAttach:function(d,c){var e=c.type+" "+Math.round(c.size/1024)+"KB";var f=true;var h;if(typeof window.createObjectURL!="undefined"){h=function(i,j){j(window.createObjectURL(i))}}else{if(typeof window.FileReader!="undefined"){h=function(j,k){var i=new FileReader();i.onload=function(l){k(i.result)};i.readAsDataURL(j)}}else{f=false}}var a=["image/png","image/jpeg","image/gif","image/svg+xml"];if($.inArray(c.type,a)==-1){f=false}var g=8*1024*1024;if(c.size>g){f=false}if(f){h(c,function(j){var i=$("<img>").attr("title",e).attr("alt",e).attr("src",j).attr("style","height: 120px");d.find(".attach-status").append(i)})}else{var b=$("<div></div>").text(e);d.find(".attach-status").append(b)}},NoticeLocationAttach:function(a){var e=a.find("[name=lat]");var k=a.find("[name=lon]");var g=a.find("[name=location_ns]").val();var l=a.find("[name=location_id]").val();var b="";var d=a.find("[name=notice_data-geo]");var c=a.find("[name=notice_data-geo]");var j=a.find("label.notice_data-geo");function f(n){j.attr("title",jQuery.trim(j.text())).removeClass("checked");a.find("[name=lat]").val("");a.find("[name=lon]").val("");a.find("[name=location_ns]").val("");a.find("[name=location_id]").val("");a.find("[name=notice_data-geo]").attr("checked",false);$.cookie(SN.C.S.NoticeDataGeoCookie,"disabled",{path:"/"});if(n){a.find(".geo_status_wrapper").removeClass("success").addClass("error");a.find(".geo_status_wrapper .geo_status").text(n)}else{a.find(".geo_status_wrapper").remove()}}function m(n,o){SN.U.NoticeGeoStatus(a,"Looking up place name...");$.getJSON(n,o,function(p){var q,r;if(typeof(p.location_ns)!="undefined"){a.find("[name=location_ns]").val(p.location_ns);q=p.location_ns}if(typeof(p.location_id)!="undefined"){a.find("[name=location_id]").val(p.location_id);r=p.location_id}if(typeof(p.name)=="undefined"){NLN_text=o.lat+";"+o.lon}else{NLN_text=p.name}SN.U.NoticeGeoStatus(a,NLN_text,o.lat,o.lon,p.url);j.attr("title",NoticeDataGeo_text.ShareDisable+" ("+NLN_text+")");a.find("[name=lat]").val(o.lat);a.find("[name=lon]").val(o.lon);a.find("[name=location_ns]").val(q);a.find("[name=location_id]").val(r);a.find("[name=notice_data-geo]").attr("checked",true);var s={NLat:o.lat,NLon:o.lon,NLNS:q,NLID:r,NLN:NLN_text,NLNU:p.url,NDG:true};$.cookie(SN.C.S.NoticeDataGeoCookie,JSON.stringify(s),{path:"/"})})}if(c.length>0){if($.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){c.attr("checked",false)}else{c.attr("checked",true)}var h=a.find(".notice_data-geo_wrap");var i=h.attr("title");h.removeAttr("title");j.attr("title",j.text());c.change(function(){if(c.attr("checked")===true||$.cookie(SN.C.S.NoticeDataGeoCookie)===null){j.attr("title",NoticeDataGeo_text.ShareDisable).addClass("checked");if($.cookie(SN.C.S.NoticeDataGeoCookie)===null||$.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){if(navigator.geolocation){SN.U.NoticeGeoStatus(a,"Requesting location from browser...");navigator.geolocation.getCurrentPosition(function(p){a.find("[name=lat]").val(p.coords.latitude);a.find("[name=lon]").val(p.coords.longitude);var q={lat:p.coords.latitude,lon:p.coords.longitude,token:$("#token").val()};m(i,q)},function(p){switch(p.code){case p.PERMISSION_DENIED:f("Location permission denied.");break;case p.TIMEOUT:f("Location lookup timeout.");break}},{timeout:10000})}else{if(e.length>0&&k.length>0){var n={lat:e,lon:k,token:$("#token").val()};m(i,n)}else{f();c.remove();j.remove()}}}else{var o=JSON.parse($.cookie(SN.C.S.NoticeDataGeoCookie));a.find("[name=lat]").val(o.NLat);a.find("[name=lon]").val(o.NLon);a.find("[name=location_ns]").val(o.NLNS);a.find("[name=location_id]").val(o.NLID);a.find("[name=notice_data-geo]").attr("checked",o.NDG);SN.U.NoticeGeoStatus(a,o.NLN,o.NLat,o.NLon,o.NLNU);j.attr("title",NoticeDataGeo_text.ShareDisable+" ("+o.NLN+")").addClass("checked")}}else{f()}}).change()}},NoticeGeoStatus:function(e,a,f,g,c){var h=e.find(".geo_status_wrapper");if(h.length==0){h=$('<div class="'+SN.C.S.Success+' geo_status_wrapper"><button class="close" style="float:right">&#215;</button><div class="geo_status"></div></div>');h.find("button.close").click(function(){e.find("[name=notice_data-geo]").removeAttr("checked").change()});e.append(h)}var b;if(c){b=$("<a></a>").attr("href",c)}else{b=$("<span></span>")}b.text(a);if(f||g){var d=f+";"+g;b.attr("title",d);if(!a){b.text(d)}}h.find(".geo_status").empty().append(b)},NewDirectMessage:function(){NDM=$(".entity_send-a-message a");NDM.attr({href:NDM.attr("href")+"&ajax=1"});NDM.bind("click",function(){var a=$(".entity_send-a-message form");if(a.length===0){$(this).addClass(SN.C.S.Processing);$.get(NDM.attr("href"),null,function(b){$(".entity_send-a-message").append(document._importNode($("form",b)[0],true));a=$(".entity_send-a-message .form_notice");SN.U.FormNoticeXHR(a);SN.U.FormNoticeEnhancements(a);a.append('<button class="close">&#215;</button>');$(".entity_send-a-message button").click(function(){a.hide();return false});NDM.removeClass(SN.C.S.Processing)})}else{a.show();$(".entity_send-a-message textarea").focus()}return false})},GetFullYear:function(c,d,a){var b=new Date();b.setFullYear(c,d,a);return b},StatusNetInstance:{Set:function(b){var a=SN.U.StatusNetInstance.Get();if(a!==null){b=$.extend(a,b)}$.cookie(SN.C.S.StatusNetInstance,JSON.stringify(b),{path:"/",expires:SN.U.GetFullYear(2029,0,1)})},Get:function(){var a=$.cookie(SN.C.S.StatusNetInstance);if(a!==null){return JSON.parse(a)}return null},Delete:function(){$.cookie(SN.C.S.StatusNetInstance,null)}},belongsOnTimeline:function(b){var a=$("body").attr("id");if(a=="public"){return true}var c=$("#nav_profile a").attr("href");if(c){var d=$(b).find(".vcard.author a.url").attr("href");if(d==c){if(a=="all"||a=="showstream"){return true}}}return false},switchInputFormTab:function(a){$(".input_form_nav_tab.current").removeClass("current");$("#input_form_nav_"+a).addClass("current");$(".input_form.current").removeClass("current");$("#input_form_"+a).addClass("current")}},Init:{NoticeForm:function(){if($("body.user_in").length>0){$(".ajax-notice").each(function(){var a=$(this);SN.Init.NoticeFormSetup(a)});$("body").bind("click",function(c){var a=$("li.notice-reply");if(a.length>0){var b=$(c.target).closest("li.notice-reply");if(b.length==0){a.each(function(){var e=$(this);if(e.find(".notice_data-text:first").val()==""){var d=e.closest("li.notice");e.remove();SN.U.NoticeInlineReplyPlaceholder(d)}})}}})}},NoticeFormSetup:function(a){SN.U.NoticeLocationAttach(a);SN.U.FormNoticeXHR(a);SN.U.FormNoticeEnhancements(a);SN.U.NoticeDataAttach(a)},Notices:function(){if($("body.user_in").length>0){var a=$(".form_notice:first");if(a.length>0){SN.C.I.NoticeFormMaster=document._importNode(a[0],true)}SN.U.NoticeRepeat();SN.U.NoticeReply();SN.U.NoticeInlineReplySetup()}SN.U.NoticeAttachments()},EntityActions:function(){if($("body.user_in").length>0){SN.U.NewDirectMessage()}},Login:function(){if(SN.U.StatusNetInstance.Get()!==null){var a=SN.U.StatusNetInstance.Get().Nickname;if(a!==null){$("#form_login #nickname").val(a)}}$("#form_login").bind("submit",function(){SN.U.StatusNetInstance.Set({Nickname:$("#form_login #nickname").val()});return true})},AjaxForms:function(){$("form.ajax").live("submit",function(){SN.U.FormXHR($(this));return false})},UploadForms:function(){$("input[type=file]").change(function(d){if(typeof this.files=="object"&&this.files.length>0){var c=0;for(var b=0;b<this.files.length;b++){c+=this.files[b].size}var a=SN.U.maxFileSize($(this.form));if(a>0&&c>a){var e="File too large: maximum upload size is %d bytes.";alert(e.replace("%d",a));$(this).val("");d.preventDefault();return false}}})}}};$(document).ready(function(){SN.Init.AjaxForms();SN.Init.UploadForms();if($("."+SN.C.S.FormNotice).length>0){SN.Init.NoticeForm()}if($("#content .notices").length>0){SN.Init.Notices()}if($("#content .entity_actions").length>0){SN.Init.EntityActions()}if($("#form_login").length>0){SN.Init.Login()}});if(!document.ELEMENT_NODE){document.ELEMENT_NODE=1;document.ATTRIBUTE_NODE=2;document.TEXT_NODE=3;document.CDATA_SECTION_NODE=4;document.ENTITY_REFERENCE_NODE=5;document.ENTITY_NODE=6;document.PROCESSING_INSTRUCTION_NODE=7;document.COMMENT_NODE=8;document.DOCUMENT_NODE=9;document.DOCUMENT_TYPE_NODE=10;document.DOCUMENT_FRAGMENT_NODE=11;document.NOTATION_NODE=12}document._importNode=function(e,a){switch(e.nodeType){case document.ELEMENT_NODE:var d=document.createElement(e.nodeName);if(e.attributes&&e.attributes.length>0){for(var c=0,b=e.attributes.length;c<b;){if(e.attributes[c].nodeName=="class"){d.className=e.getAttribute(e.attributes[c++].nodeName)}else{d.setAttribute(e.attributes[c].nodeName,e.getAttribute(e.attributes[c++].nodeName))}}}if(a&&e.childNodes&&e.childNodes.length>0){for(var c=0,b=e.childNodes.length;c<b;){d.appendChild(document._importNode(e.childNodes[c++],a))}}return d;break;case document.TEXT_NODE:case document.CDATA_SECTION_NODE:case document.COMMENT_NODE:return document.createTextNode(e.nodeValue);break}};if(typeof navigator.geolocation=="undefined"||navigator.geolocation.shim){(function(){(function(){if(window.google&&google.gears){return}var c=null;if(typeof GearsFactory!="undefined"){c=new GearsFactory()}else{try{c=new ActiveXObject("Gears.Factory");if(c.getBuildInfo().indexOf("ie_mobile")!=-1){c.privateSetGlobalObject(this)}}catch(d){if((typeof navigator.mimeTypes!="undefined")&&navigator.mimeTypes["application/x-googlegears"]){c=document.createElement("object");c.style.display="none";c.width=0;c.height=0;c.type="application/x-googlegears";document.documentElement.appendChild(c)}}}if(!c){return}if(!window.google){google={}}if(!google.gears){google.gears={factory:c}}})();var a=(function(){var d=google.gears.factory.create("beta.geolocation");var c=function(f,e){return function(g){f(g);e.lastPosition=g}};return{shim:true,type:"Gears",lastPosition:null,getCurrentPosition:function(e,g,h){var f=this;var i=c(e,f);d.getCurrentPosition(i,g,h)},watchPosition:function(e,f,g){d.watchPosition(e,f,g)},clearWatch:function(e){d.clearWatch(e)},getPermission:function(g,e,f){d.getPermission(g,e,f)}}});var b=(function(){var i=false;var e=function(){if(!d()&&!i){i=true;var j=document.createElement("script");j.src=(document.location.protocol=="https:"?"https://":"http://")+"www.google.com/jsapi?callback=_google_loader_apiLoaded";j.type="text/javascript";document.getElementsByTagName("body")[0].appendChild(j)}};var c=[];var h=function(j){c.push(j)};var f=function(){if(d()){while(c.length>0){var j=c.pop();j()}}};window._google_loader_apiLoaded=function(){f()};var d=function(){return(window.google&&google.loader)};var g=function(j){if(d()){return true}h(j);e();return false};e();return{shim:true,type:"ClientLocation",lastPosition:null,getCurrentPosition:function(k,n,o){var m=this;if(!g(function(){m.getCurrentPosition(k,n,o)})){return}if(google.loader.ClientLocation){var l=google.loader.ClientLocation;var j={coords:{latitude:l.latitude,longitude:l.longitude,altitude:null,accuracy:43000,altitudeAccuracy:null,heading:null,speed:null},address:{city:l.address.city,country:l.address.country,country_code:l.address.country_code,region:l.address.region},timestamp:new Date()};k(j);this.lastPosition=j}else{if(n==="function"){n({code:3,message:"Using the Google ClientLocation API and it is not able to calculate a location."})}}},watchPosition:function(j,l,m){this.getCurrentPosition(j,l,m);var k=this;var n=setInterval(function(){k.getCurrentPosition(j,l,m)},10000);return n},clearWatch:function(j){clearInterval(j)},getPermission:function(l,j,k){return true}}});navigator.geolocation=(window.google&&google.gears)?a():b()})()};
\ No newline at end of file
+var SN={C:{I:{CounterBlackout:false,MaxLength:140,PatternUsername:/^[0-9a-zA-Z\-_.]*$/,HTTP20x30x:[200,201,202,203,204,205,206,300,301,302,303,304,305,306,307],NoticeFormMaster:null},S:{Disabled:"disabled",Warning:"warning",Error:"error",Success:"success",Processing:"processing",CommandResult:"command_result",FormNotice:"form_notice",NoticeDataGeo:"notice_data-geo",NoticeDataGeoCookie:"NoticeDataGeo",NoticeDataGeoSelected:"notice_data-geo_selected",StatusNetInstance:"StatusNetInstance"}},messages:{},msg:function(a){if(typeof SN.messages[a]=="undefined"){return"["+a+"]"}else{return SN.messages[a]}},U:{FormNoticeEnhancements:function(b){if(jQuery.data(b[0],"ElementData")===undefined){MaxLength=b.find(".count").text();if(typeof(MaxLength)=="undefined"){MaxLength=SN.C.I.MaxLength}jQuery.data(b[0],"ElementData",{MaxLength:MaxLength});SN.U.Counter(b);NDT=b.find(".notice_data-text:first");NDT.bind("keyup",function(c){SN.U.Counter(b)});var a=function(c){window.setTimeout(function(){SN.U.Counter(b)},50)};NDT.bind("cut",a).bind("paste",a)}else{b.find(".count").text(jQuery.data(b[0],"ElementData").MaxLength)}},Counter:function(d){SN.C.I.FormNoticeCurrent=d;var b=jQuery.data(d[0],"ElementData").MaxLength;if(b<=0){return}var c=b-SN.U.CharacterCount(d);var a=d.find(".count");if(c.toString()!=a.text()){if(!SN.C.I.CounterBlackout||c===0){if(a.text()!=String(c)){a.text(c)}if(c<0){d.addClass(SN.C.S.Warning)}else{d.removeClass(SN.C.S.Warning)}if(!SN.C.I.CounterBlackout){SN.C.I.CounterBlackout=true;SN.C.I.FormNoticeCurrent=d;window.setTimeout("SN.U.ClearCounterBlackout(SN.C.I.FormNoticeCurrent);",500)}}}},CharacterCount:function(a){return a.find(".notice_data-text:first").val().length},ClearCounterBlackout:function(a){SN.C.I.CounterBlackout=false;SN.U.Counter(a)},RewriteAjaxAction:function(a){if(document.location.protocol=="https:"&&a.substr(0,5)=="http:"){return a.replace(/^http:\/\/[^:\/]+/,"https://"+document.location.host)}else{return a}},FormXHR:function(a){$.ajax({type:"POST",dataType:"xml",url:SN.U.RewriteAjaxAction(a.attr("action")),data:a.serialize()+"&ajax=1",beforeSend:function(b){a.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(c,d,b){alert(b||d)},success:function(b,c){if(typeof($("form",b)[0])!="undefined"){form_new=document._importNode($("form",b)[0],true);a.replaceWith(form_new)}else{a.replaceWith(document._importNode($("p",b)[0],true))}}})},FormNoticeXHR:function(b){SN.C.I.NoticeDataGeo={};b.append('<input type="hidden" name="ajax" value="1"/>');b.attr("action",SN.U.RewriteAjaxAction(b.attr("action")));var c=function(d,e){b.append($('<p class="form_response"></p>').addClass(d).text(e))};var a=function(){b.find(".form_response").remove()};b.ajaxForm({dataType:"xml",timeout:"60000",beforeSend:function(d){if(b.find(".notice_data-text:first").val()==""){b.addClass(SN.C.S.Warning);return false}b.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled);SN.U.normalizeGeoData(b);return true},error:function(f,g,e){b.removeClass(SN.C.S.Processing).find(".submit").removeClass(SN.C.S.Disabled).removeAttr(SN.C.S.Disabled,SN.C.S.Disabled);a();if(g=="timeout"){c("error","Sorry! We had trouble sending your notice. The servers are overloaded. Please try again, and contact the site administrator if this problem persists.")}else{var d=SN.U.GetResponseXML(f);if($("."+SN.C.S.Error,d).length>0){b.append(document._importNode($("."+SN.C.S.Error,d)[0],true))}else{if(parseInt(f.status)===0||jQuery.inArray(parseInt(f.status),SN.C.I.HTTP20x30x)>=0){b.resetForm().find(".attach-status").remove();SN.U.FormNoticeEnhancements(b)}else{c("error","(Sorry! We had trouble sending your notice ("+f.status+" "+f.statusText+"). Please report the problem to the site administrator if this happens again.")}}}},success:function(i,f){a();var n=$("#"+SN.C.S.Error,i);if(n.length>0){c("error",n.text())}else{if($("body")[0].id=="bookmarklet"){self.close()}var d=$("#"+SN.C.S.CommandResult,i);if(d.length>0){c("success",d.text())}else{var m=document._importNode($("li",i)[0],true);var k=$("#notices_primary .notices:first");var l=b.closest("li.notice-reply");if(l.length>0){var e=$(m).attr("id");if($("#"+e).length==0){var j=l.closest("li.notice");l.replaceWith(m);SN.U.NoticeInlineReplyPlaceholder(j)}else{l.remove()}}else{if(k.length>0&&SN.U.belongsOnTimeline(m)){if($("#"+m.id).length===0){var h=b.find("[name=inreplyto]").val();var g="#notices_primary #notice-"+h;if($("body")[0].id=="conversation"){if(h.length>0&&$(g+" .notices").length<1){$(g).append('<ul class="notices"></ul>')}$($(g+" .notices")[0]).append(m)}else{k.prepend(m)}$("#"+m.id).css({display:"none"}).fadeIn(2500);SN.U.NoticeWithAttachment($("#"+m.id));SN.U.NoticeReplyTo($("#"+m.id))}}else{c("success",$("title",i).text())}}}b.resetForm();b.find("[name=inreplyto]").val("");b.find(".attach-status").remove();SN.U.FormNoticeEnhancements(b)}},complete:function(d,e){b.removeClass(SN.C.S.Processing).find(".submit").removeAttr(SN.C.S.Disabled).removeClass(SN.C.S.Disabled);b.find("[name=lat]").val(SN.C.I.NoticeDataGeo.NLat);b.find("[name=lon]").val(SN.C.I.NoticeDataGeo.NLon);b.find("[name=location_ns]").val(SN.C.I.NoticeDataGeo.NLNS);b.find("[name=location_id]").val(SN.C.I.NoticeDataGeo.NLID);b.find("[name=notice_data-geo]").attr("checked",SN.C.I.NoticeDataGeo.NDG)}})},normalizeGeoData:function(a){SN.C.I.NoticeDataGeo.NLat=a.find("[name=lat]").val();SN.C.I.NoticeDataGeo.NLon=a.find("[name=lon]").val();SN.C.I.NoticeDataGeo.NLNS=a.find("[name=location_ns]").val();SN.C.I.NoticeDataGeo.NLID=a.find("[name=location_id]").val();SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked");var b=$.cookie(SN.C.S.NoticeDataGeoCookie);if(b!==null&&b!="disabled"){b=JSON.parse(b);SN.C.I.NoticeDataGeo.NLat=a.find("[name=lat]").val(b.NLat).val();SN.C.I.NoticeDataGeo.NLon=a.find("[name=lon]").val(b.NLon).val();if(b.NLNS){SN.C.I.NoticeDataGeo.NLNS=a.find("[name=location_ns]").val(b.NLNS).val();SN.C.I.NoticeDataGeo.NLID=a.find("[name=location_id]").val(b.NLID).val()}else{a.find("[name=location_ns]").val("");a.find("[name=location_id]").val("")}}if(b=="disabled"){SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked",false).attr("checked")}else{SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked",true).attr("checked")}},GetResponseXML:function(b){try{return b.responseXML}catch(a){return(new DOMParser()).parseFromString(b.responseText,"text/xml")}},NoticeReply:function(){if($("#content .notice_reply").length>0){$("#content .notice").each(function(){SN.U.NoticeReplyTo($(this))})}},NoticeReplyTo:function(a){a.find(".notice_reply").live("click",function(c){c.preventDefault();var b=($(".author .nickname",a).length>0)?$($(".author .nickname",a)[0]):$(".author .nickname.uid");SN.U.NoticeInlineReplyTrigger(a,"@"+b.text());return false})},NoticeInlineReplyTrigger:function(h,i){var b=$($(".notice_id",h)[0]).text();var e=h;var f=h.closest(".notices");if(f.hasClass("threaded-replies")){e=f.closest(".notice")}else{f=$("ul.threaded-replies",h);if(f.length==0){f=$('<ul class="notices threaded-replies xoxo"></ul>');h.append(f)}}var j=$(".notice-reply-form",f);var d=function(){j.find("input[name=inreplyto]").val(b);var m=j.find("textarea");if(m.length==0){throw"No textarea"}var l="";if(i){l=i+" "}m.val(l+m.val().replace(RegExp(l,"i"),""));m.data("initialText",$.trim(i+""));m.focus();if(m[0].setSelectionRange){var k=m.val().length;m[0].setSelectionRange(k,k)}};if(j.length>0){d()}else{f.find("li.notice-reply-placeholder").remove();var g=$("li.notice-reply",f);if(g.length==0){g=$('<li class="notice-reply"></li>');var c=function(k){var l=document._importNode(k,true);g.append(l);f.append(g);var m=j=$(l);SN.Init.NoticeFormSetup(m);d()};if(SN.C.I.NoticeFormMaster){c(SN.C.I.NoticeFormMaster)}else{var a=$("#form_notice").attr("action");$.get(a,{ajax:1},function(k,m,l){c($("form",k)[0])})}}}},NoticeInlineReplyPlaceholder:function(b){var a=b.find("ul.threaded-replies");var c=$('<li class="notice-reply-placeholder"><input class="placeholder"></li>');c.click(function(){SN.U.NoticeInlineReplyTrigger(b);return false});c.find("input").val(SN.msg("reply_placeholder"));a.append(c)},NoticeInlineReplySetup:function(){$(".threaded-replies").each(function(){var b=$(this);var a=b.closest(".notice");SN.U.NoticeInlineReplyPlaceholder(a)})},NoticeRepeat:function(){$(".form_repeat").live("click",function(a){a.preventDefault();SN.U.NoticeRepeatConfirmation($(this));return false})},NoticeRepeatConfirmation:function(a){var c=a.find(".submit");var b=c.clone();b.addClass("submit_dialogbox").removeClass("submit");a.append(b);b.bind("click",function(){SN.U.FormXHR(a);return false});c.hide();a.addClass("dialogbox").append('<button class="close">&#215;</button>').closest(".notice-options").addClass("opaque");a.find("button.close").click(function(){$(this).remove();a.removeClass("dialogbox").closest(".notice-options").removeClass("opaque");a.find(".submit_dialogbox").remove();a.find(".submit").show();return false})},NoticeAttachments:function(){$(".notice a.attachment").each(function(){SN.U.NoticeWithAttachment($(this).closest(".notice"))})},NoticeWithAttachment:function(b){if(b.find(".attachment").length===0){return}var a=b.find(".attachment.more");if(a.length>0){$(a[0]).click(function(){var c=$(this);c.addClass(SN.C.S.Processing);$.get(c.attr("href")+"/ajax",null,function(d){c.parent(".entry-content").html($(d).find("#attachment_view .entry-content").html())});return false}).attr("title",SN.msg("showmore_tooltip"))}},NoticeDataAttach:function(b){var a=b.find("input[type=file]");a.change(function(f){b.find(".attach-status").remove();var d=$(this).val();if(!d){return false}var c=$('<div class="attach-status '+SN.C.S.Success+'"><code></code> <button class="close">&#215;</button></div>');c.find("code").text(d);c.find("button").click(function(){c.remove();a.val("");return false});b.append(c);if(typeof this.files=="object"){for(var e=0;e<this.files.length;e++){SN.U.PreviewAttach(b,this.files[e])}}})},maxFileSize:function(b){var a=$(b).find("input[name=MAX_FILE_SIZE]").attr("value");if(a){return parseInt(a)}else{return 0}},PreviewAttach:function(d,c){var e=c.type+" "+Math.round(c.size/1024)+"KB";var f=true;var h;if(typeof window.createObjectURL!="undefined"){h=function(i,j){j(window.createObjectURL(i))}}else{if(typeof window.FileReader!="undefined"){h=function(j,k){var i=new FileReader();i.onload=function(l){k(i.result)};i.readAsDataURL(j)}}else{f=false}}var a=["image/png","image/jpeg","image/gif","image/svg+xml"];if($.inArray(c.type,a)==-1){f=false}var g=8*1024*1024;if(c.size>g){f=false}if(f){h(c,function(j){var i=$("<img>").attr("title",e).attr("alt",e).attr("src",j).attr("style","height: 120px");d.find(".attach-status").append(i)})}else{var b=$("<div></div>").text(e);d.find(".attach-status").append(b)}},NoticeLocationAttach:function(a){var e=a.find("[name=lat]");var k=a.find("[name=lon]");var g=a.find("[name=location_ns]").val();var l=a.find("[name=location_id]").val();var b="";var d=a.find("[name=notice_data-geo]");var c=a.find("[name=notice_data-geo]");var j=a.find("label.notice_data-geo");function f(n){j.attr("title",jQuery.trim(j.text())).removeClass("checked");a.find("[name=lat]").val("");a.find("[name=lon]").val("");a.find("[name=location_ns]").val("");a.find("[name=location_id]").val("");a.find("[name=notice_data-geo]").attr("checked",false);$.cookie(SN.C.S.NoticeDataGeoCookie,"disabled",{path:"/"});if(n){a.find(".geo_status_wrapper").removeClass("success").addClass("error");a.find(".geo_status_wrapper .geo_status").text(n)}else{a.find(".geo_status_wrapper").remove()}}function m(n,o){SN.U.NoticeGeoStatus(a,"Looking up place name...");$.getJSON(n,o,function(p){var q,r;if(typeof(p.location_ns)!="undefined"){a.find("[name=location_ns]").val(p.location_ns);q=p.location_ns}if(typeof(p.location_id)!="undefined"){a.find("[name=location_id]").val(p.location_id);r=p.location_id}if(typeof(p.name)=="undefined"){NLN_text=o.lat+";"+o.lon}else{NLN_text=p.name}SN.U.NoticeGeoStatus(a,NLN_text,o.lat,o.lon,p.url);j.attr("title",NoticeDataGeo_text.ShareDisable+" ("+NLN_text+")");a.find("[name=lat]").val(o.lat);a.find("[name=lon]").val(o.lon);a.find("[name=location_ns]").val(q);a.find("[name=location_id]").val(r);a.find("[name=notice_data-geo]").attr("checked",true);var s={NLat:o.lat,NLon:o.lon,NLNS:q,NLID:r,NLN:NLN_text,NLNU:p.url,NDG:true};$.cookie(SN.C.S.NoticeDataGeoCookie,JSON.stringify(s),{path:"/"})})}if(c.length>0){if($.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){c.attr("checked",false)}else{c.attr("checked",true)}var h=a.find(".notice_data-geo_wrap");var i=h.attr("title");h.removeAttr("title");j.attr("title",j.text());c.change(function(){if(c.attr("checked")===true||$.cookie(SN.C.S.NoticeDataGeoCookie)===null){j.attr("title",NoticeDataGeo_text.ShareDisable).addClass("checked");if($.cookie(SN.C.S.NoticeDataGeoCookie)===null||$.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){if(navigator.geolocation){SN.U.NoticeGeoStatus(a,"Requesting location from browser...");navigator.geolocation.getCurrentPosition(function(p){a.find("[name=lat]").val(p.coords.latitude);a.find("[name=lon]").val(p.coords.longitude);var q={lat:p.coords.latitude,lon:p.coords.longitude,token:$("#token").val()};m(i,q)},function(p){switch(p.code){case p.PERMISSION_DENIED:f("Location permission denied.");break;case p.TIMEOUT:f("Location lookup timeout.");break}},{timeout:10000})}else{if(e.length>0&&k.length>0){var n={lat:e,lon:k,token:$("#token").val()};m(i,n)}else{f();c.remove();j.remove()}}}else{var o=JSON.parse($.cookie(SN.C.S.NoticeDataGeoCookie));a.find("[name=lat]").val(o.NLat);a.find("[name=lon]").val(o.NLon);a.find("[name=location_ns]").val(o.NLNS);a.find("[name=location_id]").val(o.NLID);a.find("[name=notice_data-geo]").attr("checked",o.NDG);SN.U.NoticeGeoStatus(a,o.NLN,o.NLat,o.NLon,o.NLNU);j.attr("title",NoticeDataGeo_text.ShareDisable+" ("+o.NLN+")").addClass("checked")}}else{f()}}).change()}},NoticeGeoStatus:function(e,a,f,g,c){var h=e.find(".geo_status_wrapper");if(h.length==0){h=$('<div class="'+SN.C.S.Success+' geo_status_wrapper"><button class="close" style="float:right">&#215;</button><div class="geo_status"></div></div>');h.find("button.close").click(function(){e.find("[name=notice_data-geo]").removeAttr("checked").change()});e.append(h)}var b;if(c){b=$("<a></a>").attr("href",c)}else{b=$("<span></span>")}b.text(a);if(f||g){var d=f+";"+g;b.attr("title",d);if(!a){b.text(d)}}h.find(".geo_status").empty().append(b)},NewDirectMessage:function(){NDM=$(".entity_send-a-message a");NDM.attr({href:NDM.attr("href")+"&ajax=1"});NDM.bind("click",function(){var a=$(".entity_send-a-message form");if(a.length===0){$(this).addClass(SN.C.S.Processing);$.get(NDM.attr("href"),null,function(b){$(".entity_send-a-message").append(document._importNode($("form",b)[0],true));a=$(".entity_send-a-message .form_notice");SN.U.FormNoticeXHR(a);SN.U.FormNoticeEnhancements(a);a.append('<button class="close">&#215;</button>');$(".entity_send-a-message button").click(function(){a.hide();return false});NDM.removeClass(SN.C.S.Processing)})}else{a.show();$(".entity_send-a-message textarea").focus()}return false})},GetFullYear:function(c,d,a){var b=new Date();b.setFullYear(c,d,a);return b},StatusNetInstance:{Set:function(b){var a=SN.U.StatusNetInstance.Get();if(a!==null){b=$.extend(a,b)}$.cookie(SN.C.S.StatusNetInstance,JSON.stringify(b),{path:"/",expires:SN.U.GetFullYear(2029,0,1)})},Get:function(){var a=$.cookie(SN.C.S.StatusNetInstance);if(a!==null){return JSON.parse(a)}return null},Delete:function(){$.cookie(SN.C.S.StatusNetInstance,null)}},belongsOnTimeline:function(b){var a=$("body").attr("id");if(a=="public"){return true}var c=$("#nav_profile a").attr("href");if(c){var d=$(b).find(".vcard.author a.url").attr("href");if(d==c){if(a=="all"||a=="showstream"){return true}}}return false},switchInputFormTab:function(a){$(".input_form_nav_tab.current").removeClass("current");$("#input_form_nav_"+a).addClass("current");$(".input_form.current").removeClass("current");$("#input_form_"+a).addClass("current")}},Init:{NoticeForm:function(){if($("body.user_in").length>0){$(".ajax-notice").each(function(){var a=$(this);SN.Init.NoticeFormSetup(a)});$("body").bind("click",function(c){var a=$("li.notice-reply");if(a.length>0){var b=$(c.target).closest("li.notice-reply");if(b.length==0){a.each(function(){var g=$(this);var e=g.find(".notice_data-text:first");var f=$.trim(e.val());if(f==""||f==e.data("initialText")){var d=g.closest("li.notice");g.remove();SN.U.NoticeInlineReplyPlaceholder(d)}})}}})}},NoticeFormSetup:function(a){SN.U.NoticeLocationAttach(a);SN.U.FormNoticeXHR(a);SN.U.FormNoticeEnhancements(a);SN.U.NoticeDataAttach(a)},Notices:function(){if($("body.user_in").length>0){var a=$(".form_notice:first");if(a.length>0){SN.C.I.NoticeFormMaster=document._importNode(a[0],true)}SN.U.NoticeRepeat();SN.U.NoticeReply();SN.U.NoticeInlineReplySetup()}SN.U.NoticeAttachments()},EntityActions:function(){if($("body.user_in").length>0){SN.U.NewDirectMessage()}},Login:function(){if(SN.U.StatusNetInstance.Get()!==null){var a=SN.U.StatusNetInstance.Get().Nickname;if(a!==null){$("#form_login #nickname").val(a)}}$("#form_login").bind("submit",function(){SN.U.StatusNetInstance.Set({Nickname:$("#form_login #nickname").val()});return true})},AjaxForms:function(){$("form.ajax").live("submit",function(){SN.U.FormXHR($(this));return false})},UploadForms:function(){$("input[type=file]").change(function(d){if(typeof this.files=="object"&&this.files.length>0){var c=0;for(var b=0;b<this.files.length;b++){c+=this.files[b].size}var a=SN.U.maxFileSize($(this.form));if(a>0&&c>a){var e="File too large: maximum upload size is %d bytes.";alert(e.replace("%d",a));$(this).val("");d.preventDefault();return false}}})}}};$(document).ready(function(){SN.Init.AjaxForms();SN.Init.UploadForms();if($("."+SN.C.S.FormNotice).length>0){SN.Init.NoticeForm()}if($("#content .notices").length>0){SN.Init.Notices()}if($("#content .entity_actions").length>0){SN.Init.EntityActions()}if($("#form_login").length>0){SN.Init.Login()}});if(!document.ELEMENT_NODE){document.ELEMENT_NODE=1;document.ATTRIBUTE_NODE=2;document.TEXT_NODE=3;document.CDATA_SECTION_NODE=4;document.ENTITY_REFERENCE_NODE=5;document.ENTITY_NODE=6;document.PROCESSING_INSTRUCTION_NODE=7;document.COMMENT_NODE=8;document.DOCUMENT_NODE=9;document.DOCUMENT_TYPE_NODE=10;document.DOCUMENT_FRAGMENT_NODE=11;document.NOTATION_NODE=12}document._importNode=function(e,a){switch(e.nodeType){case document.ELEMENT_NODE:var d=document.createElement(e.nodeName);if(e.attributes&&e.attributes.length>0){for(var c=0,b=e.attributes.length;c<b;){if(e.attributes[c].nodeName=="class"){d.className=e.getAttribute(e.attributes[c++].nodeName)}else{d.setAttribute(e.attributes[c].nodeName,e.getAttribute(e.attributes[c++].nodeName))}}}if(a&&e.childNodes&&e.childNodes.length>0){for(var c=0,b=e.childNodes.length;c<b;){d.appendChild(document._importNode(e.childNodes[c++],a))}}return d;break;case document.TEXT_NODE:case document.CDATA_SECTION_NODE:case document.COMMENT_NODE:return document.createTextNode(e.nodeValue);break}};if(typeof navigator.geolocation=="undefined"||navigator.geolocation.shim){(function(){(function(){if(window.google&&google.gears){return}var c=null;if(typeof GearsFactory!="undefined"){c=new GearsFactory()}else{try{c=new ActiveXObject("Gears.Factory");if(c.getBuildInfo().indexOf("ie_mobile")!=-1){c.privateSetGlobalObject(this)}}catch(d){if((typeof navigator.mimeTypes!="undefined")&&navigator.mimeTypes["application/x-googlegears"]){c=document.createElement("object");c.style.display="none";c.width=0;c.height=0;c.type="application/x-googlegears";document.documentElement.appendChild(c)}}}if(!c){return}if(!window.google){google={}}if(!google.gears){google.gears={factory:c}}})();var a=(function(){var d=google.gears.factory.create("beta.geolocation");var c=function(f,e){return function(g){f(g);e.lastPosition=g}};return{shim:true,type:"Gears",lastPosition:null,getCurrentPosition:function(e,g,h){var f=this;var i=c(e,f);d.getCurrentPosition(i,g,h)},watchPosition:function(e,f,g){d.watchPosition(e,f,g)},clearWatch:function(e){d.clearWatch(e)},getPermission:function(g,e,f){d.getPermission(g,e,f)}}});var b=(function(){var i=false;var e=function(){if(!d()&&!i){i=true;var j=document.createElement("script");j.src=(document.location.protocol=="https:"?"https://":"http://")+"www.google.com/jsapi?callback=_google_loader_apiLoaded";j.type="text/javascript";document.getElementsByTagName("body")[0].appendChild(j)}};var c=[];var h=function(j){c.push(j)};var f=function(){if(d()){while(c.length>0){var j=c.pop();j()}}};window._google_loader_apiLoaded=function(){f()};var d=function(){return(window.google&&google.loader)};var g=function(j){if(d()){return true}h(j);e();return false};e();return{shim:true,type:"ClientLocation",lastPosition:null,getCurrentPosition:function(k,n,o){var m=this;if(!g(function(){m.getCurrentPosition(k,n,o)})){return}if(google.loader.ClientLocation){var l=google.loader.ClientLocation;var j={coords:{latitude:l.latitude,longitude:l.longitude,altitude:null,accuracy:43000,altitudeAccuracy:null,heading:null,speed:null},address:{city:l.address.city,country:l.address.country,country_code:l.address.country_code,region:l.address.region},timestamp:new Date()};k(j);this.lastPosition=j}else{if(n==="function"){n({code:3,message:"Using the Google ClientLocation API and it is not able to calculate a location."})}}},watchPosition:function(j,l,m){this.getCurrentPosition(j,l,m);var k=this;var n=setInterval(function(){k.getCurrentPosition(j,l,m)},10000);return n},clearWatch:function(j){clearInterval(j)},getPermission:function(l,j,k){return true}}});navigator.geolocation=(window.google&&google.gears)?a():b()})()};
\ No newline at end of file

From d107164aecec7b0f0b787616e89ac7fe42ccb4af Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Thu, 10 Mar 2011 16:15:44 -0800
Subject: [PATCH 515/655] Tweaks for closing

---
 js/util.js     | 15 +++++++--------
 js/util.min.js |  2 +-
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/js/util.js b/js/util.js
index 5abad8f253..94103f9776 100644
--- a/js/util.js
+++ b/js/util.js
@@ -1315,12 +1315,11 @@ var SN = { // StatusNet
                 $('body').bind('click', function(e) {
                     var openReplies = $('li.notice-reply');
                     if (openReplies.length > 0) {
-                        var target = $(e.target).closest('li.notice-reply');
-                        if (target.length == 0) {
-                            // There are inline replies open, and we
-                            // clicked outside of one...
-                            openReplies.each(function() {
-                                var replyItem = $(this);
+                        var target = $(e.target);
+                        openReplies.each(function() {
+                            // Did we click outside this one?
+                            var replyItem = $(this);
+                            if (replyItem.has(e.target).length == 0) {
                                 var textarea = replyItem.find('.notice_data-text:first');
                                 var cur = $.trim(textarea.val());
                                 // Only close if there's been no edit.
@@ -1329,8 +1328,8 @@ var SN = { // StatusNet
                                     replyItem.remove();
                                     SN.U.NoticeInlineReplyPlaceholder(parentNotice);
                                 }
-                            });
-                        }
+                            }
+                        });
                     }
                 });
             }
diff --git a/js/util.min.js b/js/util.min.js
index 5ec831a578..e72eec7114 100644
--- a/js/util.min.js
+++ b/js/util.min.js
@@ -1 +1 @@
-var SN={C:{I:{CounterBlackout:false,MaxLength:140,PatternUsername:/^[0-9a-zA-Z\-_.]*$/,HTTP20x30x:[200,201,202,203,204,205,206,300,301,302,303,304,305,306,307],NoticeFormMaster:null},S:{Disabled:"disabled",Warning:"warning",Error:"error",Success:"success",Processing:"processing",CommandResult:"command_result",FormNotice:"form_notice",NoticeDataGeo:"notice_data-geo",NoticeDataGeoCookie:"NoticeDataGeo",NoticeDataGeoSelected:"notice_data-geo_selected",StatusNetInstance:"StatusNetInstance"}},messages:{},msg:function(a){if(typeof SN.messages[a]=="undefined"){return"["+a+"]"}else{return SN.messages[a]}},U:{FormNoticeEnhancements:function(b){if(jQuery.data(b[0],"ElementData")===undefined){MaxLength=b.find(".count").text();if(typeof(MaxLength)=="undefined"){MaxLength=SN.C.I.MaxLength}jQuery.data(b[0],"ElementData",{MaxLength:MaxLength});SN.U.Counter(b);NDT=b.find(".notice_data-text:first");NDT.bind("keyup",function(c){SN.U.Counter(b)});var a=function(c){window.setTimeout(function(){SN.U.Counter(b)},50)};NDT.bind("cut",a).bind("paste",a)}else{b.find(".count").text(jQuery.data(b[0],"ElementData").MaxLength)}},Counter:function(d){SN.C.I.FormNoticeCurrent=d;var b=jQuery.data(d[0],"ElementData").MaxLength;if(b<=0){return}var c=b-SN.U.CharacterCount(d);var a=d.find(".count");if(c.toString()!=a.text()){if(!SN.C.I.CounterBlackout||c===0){if(a.text()!=String(c)){a.text(c)}if(c<0){d.addClass(SN.C.S.Warning)}else{d.removeClass(SN.C.S.Warning)}if(!SN.C.I.CounterBlackout){SN.C.I.CounterBlackout=true;SN.C.I.FormNoticeCurrent=d;window.setTimeout("SN.U.ClearCounterBlackout(SN.C.I.FormNoticeCurrent);",500)}}}},CharacterCount:function(a){return a.find(".notice_data-text:first").val().length},ClearCounterBlackout:function(a){SN.C.I.CounterBlackout=false;SN.U.Counter(a)},RewriteAjaxAction:function(a){if(document.location.protocol=="https:"&&a.substr(0,5)=="http:"){return a.replace(/^http:\/\/[^:\/]+/,"https://"+document.location.host)}else{return a}},FormXHR:function(a){$.ajax({type:"POST",dataType:"xml",url:SN.U.RewriteAjaxAction(a.attr("action")),data:a.serialize()+"&ajax=1",beforeSend:function(b){a.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(c,d,b){alert(b||d)},success:function(b,c){if(typeof($("form",b)[0])!="undefined"){form_new=document._importNode($("form",b)[0],true);a.replaceWith(form_new)}else{a.replaceWith(document._importNode($("p",b)[0],true))}}})},FormNoticeXHR:function(b){SN.C.I.NoticeDataGeo={};b.append('<input type="hidden" name="ajax" value="1"/>');b.attr("action",SN.U.RewriteAjaxAction(b.attr("action")));var c=function(d,e){b.append($('<p class="form_response"></p>').addClass(d).text(e))};var a=function(){b.find(".form_response").remove()};b.ajaxForm({dataType:"xml",timeout:"60000",beforeSend:function(d){if(b.find(".notice_data-text:first").val()==""){b.addClass(SN.C.S.Warning);return false}b.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled);SN.U.normalizeGeoData(b);return true},error:function(f,g,e){b.removeClass(SN.C.S.Processing).find(".submit").removeClass(SN.C.S.Disabled).removeAttr(SN.C.S.Disabled,SN.C.S.Disabled);a();if(g=="timeout"){c("error","Sorry! We had trouble sending your notice. The servers are overloaded. Please try again, and contact the site administrator if this problem persists.")}else{var d=SN.U.GetResponseXML(f);if($("."+SN.C.S.Error,d).length>0){b.append(document._importNode($("."+SN.C.S.Error,d)[0],true))}else{if(parseInt(f.status)===0||jQuery.inArray(parseInt(f.status),SN.C.I.HTTP20x30x)>=0){b.resetForm().find(".attach-status").remove();SN.U.FormNoticeEnhancements(b)}else{c("error","(Sorry! We had trouble sending your notice ("+f.status+" "+f.statusText+"). Please report the problem to the site administrator if this happens again.")}}}},success:function(i,f){a();var n=$("#"+SN.C.S.Error,i);if(n.length>0){c("error",n.text())}else{if($("body")[0].id=="bookmarklet"){self.close()}var d=$("#"+SN.C.S.CommandResult,i);if(d.length>0){c("success",d.text())}else{var m=document._importNode($("li",i)[0],true);var k=$("#notices_primary .notices:first");var l=b.closest("li.notice-reply");if(l.length>0){var e=$(m).attr("id");if($("#"+e).length==0){var j=l.closest("li.notice");l.replaceWith(m);SN.U.NoticeInlineReplyPlaceholder(j)}else{l.remove()}}else{if(k.length>0&&SN.U.belongsOnTimeline(m)){if($("#"+m.id).length===0){var h=b.find("[name=inreplyto]").val();var g="#notices_primary #notice-"+h;if($("body")[0].id=="conversation"){if(h.length>0&&$(g+" .notices").length<1){$(g).append('<ul class="notices"></ul>')}$($(g+" .notices")[0]).append(m)}else{k.prepend(m)}$("#"+m.id).css({display:"none"}).fadeIn(2500);SN.U.NoticeWithAttachment($("#"+m.id));SN.U.NoticeReplyTo($("#"+m.id))}}else{c("success",$("title",i).text())}}}b.resetForm();b.find("[name=inreplyto]").val("");b.find(".attach-status").remove();SN.U.FormNoticeEnhancements(b)}},complete:function(d,e){b.removeClass(SN.C.S.Processing).find(".submit").removeAttr(SN.C.S.Disabled).removeClass(SN.C.S.Disabled);b.find("[name=lat]").val(SN.C.I.NoticeDataGeo.NLat);b.find("[name=lon]").val(SN.C.I.NoticeDataGeo.NLon);b.find("[name=location_ns]").val(SN.C.I.NoticeDataGeo.NLNS);b.find("[name=location_id]").val(SN.C.I.NoticeDataGeo.NLID);b.find("[name=notice_data-geo]").attr("checked",SN.C.I.NoticeDataGeo.NDG)}})},normalizeGeoData:function(a){SN.C.I.NoticeDataGeo.NLat=a.find("[name=lat]").val();SN.C.I.NoticeDataGeo.NLon=a.find("[name=lon]").val();SN.C.I.NoticeDataGeo.NLNS=a.find("[name=location_ns]").val();SN.C.I.NoticeDataGeo.NLID=a.find("[name=location_id]").val();SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked");var b=$.cookie(SN.C.S.NoticeDataGeoCookie);if(b!==null&&b!="disabled"){b=JSON.parse(b);SN.C.I.NoticeDataGeo.NLat=a.find("[name=lat]").val(b.NLat).val();SN.C.I.NoticeDataGeo.NLon=a.find("[name=lon]").val(b.NLon).val();if(b.NLNS){SN.C.I.NoticeDataGeo.NLNS=a.find("[name=location_ns]").val(b.NLNS).val();SN.C.I.NoticeDataGeo.NLID=a.find("[name=location_id]").val(b.NLID).val()}else{a.find("[name=location_ns]").val("");a.find("[name=location_id]").val("")}}if(b=="disabled"){SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked",false).attr("checked")}else{SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked",true).attr("checked")}},GetResponseXML:function(b){try{return b.responseXML}catch(a){return(new DOMParser()).parseFromString(b.responseText,"text/xml")}},NoticeReply:function(){if($("#content .notice_reply").length>0){$("#content .notice").each(function(){SN.U.NoticeReplyTo($(this))})}},NoticeReplyTo:function(a){a.find(".notice_reply").live("click",function(c){c.preventDefault();var b=($(".author .nickname",a).length>0)?$($(".author .nickname",a)[0]):$(".author .nickname.uid");SN.U.NoticeInlineReplyTrigger(a,"@"+b.text());return false})},NoticeInlineReplyTrigger:function(h,i){var b=$($(".notice_id",h)[0]).text();var e=h;var f=h.closest(".notices");if(f.hasClass("threaded-replies")){e=f.closest(".notice")}else{f=$("ul.threaded-replies",h);if(f.length==0){f=$('<ul class="notices threaded-replies xoxo"></ul>');h.append(f)}}var j=$(".notice-reply-form",f);var d=function(){j.find("input[name=inreplyto]").val(b);var m=j.find("textarea");if(m.length==0){throw"No textarea"}var l="";if(i){l=i+" "}m.val(l+m.val().replace(RegExp(l,"i"),""));m.data("initialText",$.trim(i+""));m.focus();if(m[0].setSelectionRange){var k=m.val().length;m[0].setSelectionRange(k,k)}};if(j.length>0){d()}else{f.find("li.notice-reply-placeholder").remove();var g=$("li.notice-reply",f);if(g.length==0){g=$('<li class="notice-reply"></li>');var c=function(k){var l=document._importNode(k,true);g.append(l);f.append(g);var m=j=$(l);SN.Init.NoticeFormSetup(m);d()};if(SN.C.I.NoticeFormMaster){c(SN.C.I.NoticeFormMaster)}else{var a=$("#form_notice").attr("action");$.get(a,{ajax:1},function(k,m,l){c($("form",k)[0])})}}}},NoticeInlineReplyPlaceholder:function(b){var a=b.find("ul.threaded-replies");var c=$('<li class="notice-reply-placeholder"><input class="placeholder"></li>');c.click(function(){SN.U.NoticeInlineReplyTrigger(b);return false});c.find("input").val(SN.msg("reply_placeholder"));a.append(c)},NoticeInlineReplySetup:function(){$(".threaded-replies").each(function(){var b=$(this);var a=b.closest(".notice");SN.U.NoticeInlineReplyPlaceholder(a)})},NoticeRepeat:function(){$(".form_repeat").live("click",function(a){a.preventDefault();SN.U.NoticeRepeatConfirmation($(this));return false})},NoticeRepeatConfirmation:function(a){var c=a.find(".submit");var b=c.clone();b.addClass("submit_dialogbox").removeClass("submit");a.append(b);b.bind("click",function(){SN.U.FormXHR(a);return false});c.hide();a.addClass("dialogbox").append('<button class="close">&#215;</button>').closest(".notice-options").addClass("opaque");a.find("button.close").click(function(){$(this).remove();a.removeClass("dialogbox").closest(".notice-options").removeClass("opaque");a.find(".submit_dialogbox").remove();a.find(".submit").show();return false})},NoticeAttachments:function(){$(".notice a.attachment").each(function(){SN.U.NoticeWithAttachment($(this).closest(".notice"))})},NoticeWithAttachment:function(b){if(b.find(".attachment").length===0){return}var a=b.find(".attachment.more");if(a.length>0){$(a[0]).click(function(){var c=$(this);c.addClass(SN.C.S.Processing);$.get(c.attr("href")+"/ajax",null,function(d){c.parent(".entry-content").html($(d).find("#attachment_view .entry-content").html())});return false}).attr("title",SN.msg("showmore_tooltip"))}},NoticeDataAttach:function(b){var a=b.find("input[type=file]");a.change(function(f){b.find(".attach-status").remove();var d=$(this).val();if(!d){return false}var c=$('<div class="attach-status '+SN.C.S.Success+'"><code></code> <button class="close">&#215;</button></div>');c.find("code").text(d);c.find("button").click(function(){c.remove();a.val("");return false});b.append(c);if(typeof this.files=="object"){for(var e=0;e<this.files.length;e++){SN.U.PreviewAttach(b,this.files[e])}}})},maxFileSize:function(b){var a=$(b).find("input[name=MAX_FILE_SIZE]").attr("value");if(a){return parseInt(a)}else{return 0}},PreviewAttach:function(d,c){var e=c.type+" "+Math.round(c.size/1024)+"KB";var f=true;var h;if(typeof window.createObjectURL!="undefined"){h=function(i,j){j(window.createObjectURL(i))}}else{if(typeof window.FileReader!="undefined"){h=function(j,k){var i=new FileReader();i.onload=function(l){k(i.result)};i.readAsDataURL(j)}}else{f=false}}var a=["image/png","image/jpeg","image/gif","image/svg+xml"];if($.inArray(c.type,a)==-1){f=false}var g=8*1024*1024;if(c.size>g){f=false}if(f){h(c,function(j){var i=$("<img>").attr("title",e).attr("alt",e).attr("src",j).attr("style","height: 120px");d.find(".attach-status").append(i)})}else{var b=$("<div></div>").text(e);d.find(".attach-status").append(b)}},NoticeLocationAttach:function(a){var e=a.find("[name=lat]");var k=a.find("[name=lon]");var g=a.find("[name=location_ns]").val();var l=a.find("[name=location_id]").val();var b="";var d=a.find("[name=notice_data-geo]");var c=a.find("[name=notice_data-geo]");var j=a.find("label.notice_data-geo");function f(n){j.attr("title",jQuery.trim(j.text())).removeClass("checked");a.find("[name=lat]").val("");a.find("[name=lon]").val("");a.find("[name=location_ns]").val("");a.find("[name=location_id]").val("");a.find("[name=notice_data-geo]").attr("checked",false);$.cookie(SN.C.S.NoticeDataGeoCookie,"disabled",{path:"/"});if(n){a.find(".geo_status_wrapper").removeClass("success").addClass("error");a.find(".geo_status_wrapper .geo_status").text(n)}else{a.find(".geo_status_wrapper").remove()}}function m(n,o){SN.U.NoticeGeoStatus(a,"Looking up place name...");$.getJSON(n,o,function(p){var q,r;if(typeof(p.location_ns)!="undefined"){a.find("[name=location_ns]").val(p.location_ns);q=p.location_ns}if(typeof(p.location_id)!="undefined"){a.find("[name=location_id]").val(p.location_id);r=p.location_id}if(typeof(p.name)=="undefined"){NLN_text=o.lat+";"+o.lon}else{NLN_text=p.name}SN.U.NoticeGeoStatus(a,NLN_text,o.lat,o.lon,p.url);j.attr("title",NoticeDataGeo_text.ShareDisable+" ("+NLN_text+")");a.find("[name=lat]").val(o.lat);a.find("[name=lon]").val(o.lon);a.find("[name=location_ns]").val(q);a.find("[name=location_id]").val(r);a.find("[name=notice_data-geo]").attr("checked",true);var s={NLat:o.lat,NLon:o.lon,NLNS:q,NLID:r,NLN:NLN_text,NLNU:p.url,NDG:true};$.cookie(SN.C.S.NoticeDataGeoCookie,JSON.stringify(s),{path:"/"})})}if(c.length>0){if($.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){c.attr("checked",false)}else{c.attr("checked",true)}var h=a.find(".notice_data-geo_wrap");var i=h.attr("title");h.removeAttr("title");j.attr("title",j.text());c.change(function(){if(c.attr("checked")===true||$.cookie(SN.C.S.NoticeDataGeoCookie)===null){j.attr("title",NoticeDataGeo_text.ShareDisable).addClass("checked");if($.cookie(SN.C.S.NoticeDataGeoCookie)===null||$.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){if(navigator.geolocation){SN.U.NoticeGeoStatus(a,"Requesting location from browser...");navigator.geolocation.getCurrentPosition(function(p){a.find("[name=lat]").val(p.coords.latitude);a.find("[name=lon]").val(p.coords.longitude);var q={lat:p.coords.latitude,lon:p.coords.longitude,token:$("#token").val()};m(i,q)},function(p){switch(p.code){case p.PERMISSION_DENIED:f("Location permission denied.");break;case p.TIMEOUT:f("Location lookup timeout.");break}},{timeout:10000})}else{if(e.length>0&&k.length>0){var n={lat:e,lon:k,token:$("#token").val()};m(i,n)}else{f();c.remove();j.remove()}}}else{var o=JSON.parse($.cookie(SN.C.S.NoticeDataGeoCookie));a.find("[name=lat]").val(o.NLat);a.find("[name=lon]").val(o.NLon);a.find("[name=location_ns]").val(o.NLNS);a.find("[name=location_id]").val(o.NLID);a.find("[name=notice_data-geo]").attr("checked",o.NDG);SN.U.NoticeGeoStatus(a,o.NLN,o.NLat,o.NLon,o.NLNU);j.attr("title",NoticeDataGeo_text.ShareDisable+" ("+o.NLN+")").addClass("checked")}}else{f()}}).change()}},NoticeGeoStatus:function(e,a,f,g,c){var h=e.find(".geo_status_wrapper");if(h.length==0){h=$('<div class="'+SN.C.S.Success+' geo_status_wrapper"><button class="close" style="float:right">&#215;</button><div class="geo_status"></div></div>');h.find("button.close").click(function(){e.find("[name=notice_data-geo]").removeAttr("checked").change()});e.append(h)}var b;if(c){b=$("<a></a>").attr("href",c)}else{b=$("<span></span>")}b.text(a);if(f||g){var d=f+";"+g;b.attr("title",d);if(!a){b.text(d)}}h.find(".geo_status").empty().append(b)},NewDirectMessage:function(){NDM=$(".entity_send-a-message a");NDM.attr({href:NDM.attr("href")+"&ajax=1"});NDM.bind("click",function(){var a=$(".entity_send-a-message form");if(a.length===0){$(this).addClass(SN.C.S.Processing);$.get(NDM.attr("href"),null,function(b){$(".entity_send-a-message").append(document._importNode($("form",b)[0],true));a=$(".entity_send-a-message .form_notice");SN.U.FormNoticeXHR(a);SN.U.FormNoticeEnhancements(a);a.append('<button class="close">&#215;</button>');$(".entity_send-a-message button").click(function(){a.hide();return false});NDM.removeClass(SN.C.S.Processing)})}else{a.show();$(".entity_send-a-message textarea").focus()}return false})},GetFullYear:function(c,d,a){var b=new Date();b.setFullYear(c,d,a);return b},StatusNetInstance:{Set:function(b){var a=SN.U.StatusNetInstance.Get();if(a!==null){b=$.extend(a,b)}$.cookie(SN.C.S.StatusNetInstance,JSON.stringify(b),{path:"/",expires:SN.U.GetFullYear(2029,0,1)})},Get:function(){var a=$.cookie(SN.C.S.StatusNetInstance);if(a!==null){return JSON.parse(a)}return null},Delete:function(){$.cookie(SN.C.S.StatusNetInstance,null)}},belongsOnTimeline:function(b){var a=$("body").attr("id");if(a=="public"){return true}var c=$("#nav_profile a").attr("href");if(c){var d=$(b).find(".vcard.author a.url").attr("href");if(d==c){if(a=="all"||a=="showstream"){return true}}}return false},switchInputFormTab:function(a){$(".input_form_nav_tab.current").removeClass("current");$("#input_form_nav_"+a).addClass("current");$(".input_form.current").removeClass("current");$("#input_form_"+a).addClass("current")}},Init:{NoticeForm:function(){if($("body.user_in").length>0){$(".ajax-notice").each(function(){var a=$(this);SN.Init.NoticeFormSetup(a)});$("body").bind("click",function(c){var a=$("li.notice-reply");if(a.length>0){var b=$(c.target).closest("li.notice-reply");if(b.length==0){a.each(function(){var g=$(this);var e=g.find(".notice_data-text:first");var f=$.trim(e.val());if(f==""||f==e.data("initialText")){var d=g.closest("li.notice");g.remove();SN.U.NoticeInlineReplyPlaceholder(d)}})}}})}},NoticeFormSetup:function(a){SN.U.NoticeLocationAttach(a);SN.U.FormNoticeXHR(a);SN.U.FormNoticeEnhancements(a);SN.U.NoticeDataAttach(a)},Notices:function(){if($("body.user_in").length>0){var a=$(".form_notice:first");if(a.length>0){SN.C.I.NoticeFormMaster=document._importNode(a[0],true)}SN.U.NoticeRepeat();SN.U.NoticeReply();SN.U.NoticeInlineReplySetup()}SN.U.NoticeAttachments()},EntityActions:function(){if($("body.user_in").length>0){SN.U.NewDirectMessage()}},Login:function(){if(SN.U.StatusNetInstance.Get()!==null){var a=SN.U.StatusNetInstance.Get().Nickname;if(a!==null){$("#form_login #nickname").val(a)}}$("#form_login").bind("submit",function(){SN.U.StatusNetInstance.Set({Nickname:$("#form_login #nickname").val()});return true})},AjaxForms:function(){$("form.ajax").live("submit",function(){SN.U.FormXHR($(this));return false})},UploadForms:function(){$("input[type=file]").change(function(d){if(typeof this.files=="object"&&this.files.length>0){var c=0;for(var b=0;b<this.files.length;b++){c+=this.files[b].size}var a=SN.U.maxFileSize($(this.form));if(a>0&&c>a){var e="File too large: maximum upload size is %d bytes.";alert(e.replace("%d",a));$(this).val("");d.preventDefault();return false}}})}}};$(document).ready(function(){SN.Init.AjaxForms();SN.Init.UploadForms();if($("."+SN.C.S.FormNotice).length>0){SN.Init.NoticeForm()}if($("#content .notices").length>0){SN.Init.Notices()}if($("#content .entity_actions").length>0){SN.Init.EntityActions()}if($("#form_login").length>0){SN.Init.Login()}});if(!document.ELEMENT_NODE){document.ELEMENT_NODE=1;document.ATTRIBUTE_NODE=2;document.TEXT_NODE=3;document.CDATA_SECTION_NODE=4;document.ENTITY_REFERENCE_NODE=5;document.ENTITY_NODE=6;document.PROCESSING_INSTRUCTION_NODE=7;document.COMMENT_NODE=8;document.DOCUMENT_NODE=9;document.DOCUMENT_TYPE_NODE=10;document.DOCUMENT_FRAGMENT_NODE=11;document.NOTATION_NODE=12}document._importNode=function(e,a){switch(e.nodeType){case document.ELEMENT_NODE:var d=document.createElement(e.nodeName);if(e.attributes&&e.attributes.length>0){for(var c=0,b=e.attributes.length;c<b;){if(e.attributes[c].nodeName=="class"){d.className=e.getAttribute(e.attributes[c++].nodeName)}else{d.setAttribute(e.attributes[c].nodeName,e.getAttribute(e.attributes[c++].nodeName))}}}if(a&&e.childNodes&&e.childNodes.length>0){for(var c=0,b=e.childNodes.length;c<b;){d.appendChild(document._importNode(e.childNodes[c++],a))}}return d;break;case document.TEXT_NODE:case document.CDATA_SECTION_NODE:case document.COMMENT_NODE:return document.createTextNode(e.nodeValue);break}};if(typeof navigator.geolocation=="undefined"||navigator.geolocation.shim){(function(){(function(){if(window.google&&google.gears){return}var c=null;if(typeof GearsFactory!="undefined"){c=new GearsFactory()}else{try{c=new ActiveXObject("Gears.Factory");if(c.getBuildInfo().indexOf("ie_mobile")!=-1){c.privateSetGlobalObject(this)}}catch(d){if((typeof navigator.mimeTypes!="undefined")&&navigator.mimeTypes["application/x-googlegears"]){c=document.createElement("object");c.style.display="none";c.width=0;c.height=0;c.type="application/x-googlegears";document.documentElement.appendChild(c)}}}if(!c){return}if(!window.google){google={}}if(!google.gears){google.gears={factory:c}}})();var a=(function(){var d=google.gears.factory.create("beta.geolocation");var c=function(f,e){return function(g){f(g);e.lastPosition=g}};return{shim:true,type:"Gears",lastPosition:null,getCurrentPosition:function(e,g,h){var f=this;var i=c(e,f);d.getCurrentPosition(i,g,h)},watchPosition:function(e,f,g){d.watchPosition(e,f,g)},clearWatch:function(e){d.clearWatch(e)},getPermission:function(g,e,f){d.getPermission(g,e,f)}}});var b=(function(){var i=false;var e=function(){if(!d()&&!i){i=true;var j=document.createElement("script");j.src=(document.location.protocol=="https:"?"https://":"http://")+"www.google.com/jsapi?callback=_google_loader_apiLoaded";j.type="text/javascript";document.getElementsByTagName("body")[0].appendChild(j)}};var c=[];var h=function(j){c.push(j)};var f=function(){if(d()){while(c.length>0){var j=c.pop();j()}}};window._google_loader_apiLoaded=function(){f()};var d=function(){return(window.google&&google.loader)};var g=function(j){if(d()){return true}h(j);e();return false};e();return{shim:true,type:"ClientLocation",lastPosition:null,getCurrentPosition:function(k,n,o){var m=this;if(!g(function(){m.getCurrentPosition(k,n,o)})){return}if(google.loader.ClientLocation){var l=google.loader.ClientLocation;var j={coords:{latitude:l.latitude,longitude:l.longitude,altitude:null,accuracy:43000,altitudeAccuracy:null,heading:null,speed:null},address:{city:l.address.city,country:l.address.country,country_code:l.address.country_code,region:l.address.region},timestamp:new Date()};k(j);this.lastPosition=j}else{if(n==="function"){n({code:3,message:"Using the Google ClientLocation API and it is not able to calculate a location."})}}},watchPosition:function(j,l,m){this.getCurrentPosition(j,l,m);var k=this;var n=setInterval(function(){k.getCurrentPosition(j,l,m)},10000);return n},clearWatch:function(j){clearInterval(j)},getPermission:function(l,j,k){return true}}});navigator.geolocation=(window.google&&google.gears)?a():b()})()};
\ No newline at end of file
+var SN={C:{I:{CounterBlackout:false,MaxLength:140,PatternUsername:/^[0-9a-zA-Z\-_.]*$/,HTTP20x30x:[200,201,202,203,204,205,206,300,301,302,303,304,305,306,307],NoticeFormMaster:null},S:{Disabled:"disabled",Warning:"warning",Error:"error",Success:"success",Processing:"processing",CommandResult:"command_result",FormNotice:"form_notice",NoticeDataGeo:"notice_data-geo",NoticeDataGeoCookie:"NoticeDataGeo",NoticeDataGeoSelected:"notice_data-geo_selected",StatusNetInstance:"StatusNetInstance"}},messages:{},msg:function(a){if(typeof SN.messages[a]=="undefined"){return"["+a+"]"}else{return SN.messages[a]}},U:{FormNoticeEnhancements:function(b){if(jQuery.data(b[0],"ElementData")===undefined){MaxLength=b.find(".count").text();if(typeof(MaxLength)=="undefined"){MaxLength=SN.C.I.MaxLength}jQuery.data(b[0],"ElementData",{MaxLength:MaxLength});SN.U.Counter(b);NDT=b.find(".notice_data-text:first");NDT.bind("keyup",function(c){SN.U.Counter(b)});var a=function(c){window.setTimeout(function(){SN.U.Counter(b)},50)};NDT.bind("cut",a).bind("paste",a)}else{b.find(".count").text(jQuery.data(b[0],"ElementData").MaxLength)}},Counter:function(d){SN.C.I.FormNoticeCurrent=d;var b=jQuery.data(d[0],"ElementData").MaxLength;if(b<=0){return}var c=b-SN.U.CharacterCount(d);var a=d.find(".count");if(c.toString()!=a.text()){if(!SN.C.I.CounterBlackout||c===0){if(a.text()!=String(c)){a.text(c)}if(c<0){d.addClass(SN.C.S.Warning)}else{d.removeClass(SN.C.S.Warning)}if(!SN.C.I.CounterBlackout){SN.C.I.CounterBlackout=true;SN.C.I.FormNoticeCurrent=d;window.setTimeout("SN.U.ClearCounterBlackout(SN.C.I.FormNoticeCurrent);",500)}}}},CharacterCount:function(a){return a.find(".notice_data-text:first").val().length},ClearCounterBlackout:function(a){SN.C.I.CounterBlackout=false;SN.U.Counter(a)},RewriteAjaxAction:function(a){if(document.location.protocol=="https:"&&a.substr(0,5)=="http:"){return a.replace(/^http:\/\/[^:\/]+/,"https://"+document.location.host)}else{return a}},FormXHR:function(a){$.ajax({type:"POST",dataType:"xml",url:SN.U.RewriteAjaxAction(a.attr("action")),data:a.serialize()+"&ajax=1",beforeSend:function(b){a.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(c,d,b){alert(b||d)},success:function(b,c){if(typeof($("form",b)[0])!="undefined"){form_new=document._importNode($("form",b)[0],true);a.replaceWith(form_new)}else{a.replaceWith(document._importNode($("p",b)[0],true))}}})},FormNoticeXHR:function(b){SN.C.I.NoticeDataGeo={};b.append('<input type="hidden" name="ajax" value="1"/>');b.attr("action",SN.U.RewriteAjaxAction(b.attr("action")));var c=function(d,e){b.append($('<p class="form_response"></p>').addClass(d).text(e))};var a=function(){b.find(".form_response").remove()};b.ajaxForm({dataType:"xml",timeout:"60000",beforeSend:function(d){if(b.find(".notice_data-text:first").val()==""){b.addClass(SN.C.S.Warning);return false}b.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled);SN.U.normalizeGeoData(b);return true},error:function(f,g,e){b.removeClass(SN.C.S.Processing).find(".submit").removeClass(SN.C.S.Disabled).removeAttr(SN.C.S.Disabled,SN.C.S.Disabled);a();if(g=="timeout"){c("error","Sorry! We had trouble sending your notice. The servers are overloaded. Please try again, and contact the site administrator if this problem persists.")}else{var d=SN.U.GetResponseXML(f);if($("."+SN.C.S.Error,d).length>0){b.append(document._importNode($("."+SN.C.S.Error,d)[0],true))}else{if(parseInt(f.status)===0||jQuery.inArray(parseInt(f.status),SN.C.I.HTTP20x30x)>=0){b.resetForm().find(".attach-status").remove();SN.U.FormNoticeEnhancements(b)}else{c("error","(Sorry! We had trouble sending your notice ("+f.status+" "+f.statusText+"). Please report the problem to the site administrator if this happens again.")}}}},success:function(i,f){a();var n=$("#"+SN.C.S.Error,i);if(n.length>0){c("error",n.text())}else{if($("body")[0].id=="bookmarklet"){self.close()}var d=$("#"+SN.C.S.CommandResult,i);if(d.length>0){c("success",d.text())}else{var m=document._importNode($("li",i)[0],true);var k=$("#notices_primary .notices:first");var l=b.closest("li.notice-reply");if(l.length>0){var e=$(m).attr("id");if($("#"+e).length==0){var j=l.closest("li.notice");l.replaceWith(m);SN.U.NoticeInlineReplyPlaceholder(j)}else{l.remove()}}else{if(k.length>0&&SN.U.belongsOnTimeline(m)){if($("#"+m.id).length===0){var h=b.find("[name=inreplyto]").val();var g="#notices_primary #notice-"+h;if($("body")[0].id=="conversation"){if(h.length>0&&$(g+" .notices").length<1){$(g).append('<ul class="notices"></ul>')}$($(g+" .notices")[0]).append(m)}else{k.prepend(m)}$("#"+m.id).css({display:"none"}).fadeIn(2500);SN.U.NoticeWithAttachment($("#"+m.id));SN.U.NoticeReplyTo($("#"+m.id))}}else{c("success",$("title",i).text())}}}b.resetForm();b.find("[name=inreplyto]").val("");b.find(".attach-status").remove();SN.U.FormNoticeEnhancements(b)}},complete:function(d,e){b.removeClass(SN.C.S.Processing).find(".submit").removeAttr(SN.C.S.Disabled).removeClass(SN.C.S.Disabled);b.find("[name=lat]").val(SN.C.I.NoticeDataGeo.NLat);b.find("[name=lon]").val(SN.C.I.NoticeDataGeo.NLon);b.find("[name=location_ns]").val(SN.C.I.NoticeDataGeo.NLNS);b.find("[name=location_id]").val(SN.C.I.NoticeDataGeo.NLID);b.find("[name=notice_data-geo]").attr("checked",SN.C.I.NoticeDataGeo.NDG)}})},normalizeGeoData:function(a){SN.C.I.NoticeDataGeo.NLat=a.find("[name=lat]").val();SN.C.I.NoticeDataGeo.NLon=a.find("[name=lon]").val();SN.C.I.NoticeDataGeo.NLNS=a.find("[name=location_ns]").val();SN.C.I.NoticeDataGeo.NLID=a.find("[name=location_id]").val();SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked");var b=$.cookie(SN.C.S.NoticeDataGeoCookie);if(b!==null&&b!="disabled"){b=JSON.parse(b);SN.C.I.NoticeDataGeo.NLat=a.find("[name=lat]").val(b.NLat).val();SN.C.I.NoticeDataGeo.NLon=a.find("[name=lon]").val(b.NLon).val();if(b.NLNS){SN.C.I.NoticeDataGeo.NLNS=a.find("[name=location_ns]").val(b.NLNS).val();SN.C.I.NoticeDataGeo.NLID=a.find("[name=location_id]").val(b.NLID).val()}else{a.find("[name=location_ns]").val("");a.find("[name=location_id]").val("")}}if(b=="disabled"){SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked",false).attr("checked")}else{SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked",true).attr("checked")}},GetResponseXML:function(b){try{return b.responseXML}catch(a){return(new DOMParser()).parseFromString(b.responseText,"text/xml")}},NoticeReply:function(){if($("#content .notice_reply").length>0){$("#content .notice").each(function(){SN.U.NoticeReplyTo($(this))})}},NoticeReplyTo:function(a){a.find(".notice_reply").live("click",function(c){c.preventDefault();var b=($(".author .nickname",a).length>0)?$($(".author .nickname",a)[0]):$(".author .nickname.uid");SN.U.NoticeInlineReplyTrigger(a,"@"+b.text());return false})},NoticeInlineReplyTrigger:function(h,i){var b=$($(".notice_id",h)[0]).text();var e=h;var f=h.closest(".notices");if(f.hasClass("threaded-replies")){e=f.closest(".notice")}else{f=$("ul.threaded-replies",h);if(f.length==0){f=$('<ul class="notices threaded-replies xoxo"></ul>');h.append(f)}}var j=$(".notice-reply-form",f);var d=function(){j.find("input[name=inreplyto]").val(b);var m=j.find("textarea");if(m.length==0){throw"No textarea"}var l="";if(i){l=i+" "}m.val(l+m.val().replace(RegExp(l,"i"),""));m.data("initialText",$.trim(i+""));m.focus();if(m[0].setSelectionRange){var k=m.val().length;m[0].setSelectionRange(k,k)}};if(j.length>0){d()}else{f.find("li.notice-reply-placeholder").remove();var g=$("li.notice-reply",f);if(g.length==0){g=$('<li class="notice-reply"></li>');var c=function(k){var l=document._importNode(k,true);g.append(l);f.append(g);var m=j=$(l);SN.Init.NoticeFormSetup(m);d()};if(SN.C.I.NoticeFormMaster){c(SN.C.I.NoticeFormMaster)}else{var a=$("#form_notice").attr("action");$.get(a,{ajax:1},function(k,m,l){c($("form",k)[0])})}}}},NoticeInlineReplyPlaceholder:function(b){var a=b.find("ul.threaded-replies");var c=$('<li class="notice-reply-placeholder"><input class="placeholder"></li>');c.click(function(){SN.U.NoticeInlineReplyTrigger(b);return false});c.find("input").val(SN.msg("reply_placeholder"));a.append(c)},NoticeInlineReplySetup:function(){$(".threaded-replies").each(function(){var b=$(this);var a=b.closest(".notice");SN.U.NoticeInlineReplyPlaceholder(a)})},NoticeRepeat:function(){$(".form_repeat").live("click",function(a){a.preventDefault();SN.U.NoticeRepeatConfirmation($(this));return false})},NoticeRepeatConfirmation:function(a){var c=a.find(".submit");var b=c.clone();b.addClass("submit_dialogbox").removeClass("submit");a.append(b);b.bind("click",function(){SN.U.FormXHR(a);return false});c.hide();a.addClass("dialogbox").append('<button class="close">&#215;</button>').closest(".notice-options").addClass("opaque");a.find("button.close").click(function(){$(this).remove();a.removeClass("dialogbox").closest(".notice-options").removeClass("opaque");a.find(".submit_dialogbox").remove();a.find(".submit").show();return false})},NoticeAttachments:function(){$(".notice a.attachment").each(function(){SN.U.NoticeWithAttachment($(this).closest(".notice"))})},NoticeWithAttachment:function(b){if(b.find(".attachment").length===0){return}var a=b.find(".attachment.more");if(a.length>0){$(a[0]).click(function(){var c=$(this);c.addClass(SN.C.S.Processing);$.get(c.attr("href")+"/ajax",null,function(d){c.parent(".entry-content").html($(d).find("#attachment_view .entry-content").html())});return false}).attr("title",SN.msg("showmore_tooltip"))}},NoticeDataAttach:function(b){var a=b.find("input[type=file]");a.change(function(f){b.find(".attach-status").remove();var d=$(this).val();if(!d){return false}var c=$('<div class="attach-status '+SN.C.S.Success+'"><code></code> <button class="close">&#215;</button></div>');c.find("code").text(d);c.find("button").click(function(){c.remove();a.val("");return false});b.append(c);if(typeof this.files=="object"){for(var e=0;e<this.files.length;e++){SN.U.PreviewAttach(b,this.files[e])}}})},maxFileSize:function(b){var a=$(b).find("input[name=MAX_FILE_SIZE]").attr("value");if(a){return parseInt(a)}else{return 0}},PreviewAttach:function(d,c){var e=c.type+" "+Math.round(c.size/1024)+"KB";var f=true;var h;if(typeof window.createObjectURL!="undefined"){h=function(i,j){j(window.createObjectURL(i))}}else{if(typeof window.FileReader!="undefined"){h=function(j,k){var i=new FileReader();i.onload=function(l){k(i.result)};i.readAsDataURL(j)}}else{f=false}}var a=["image/png","image/jpeg","image/gif","image/svg+xml"];if($.inArray(c.type,a)==-1){f=false}var g=8*1024*1024;if(c.size>g){f=false}if(f){h(c,function(j){var i=$("<img>").attr("title",e).attr("alt",e).attr("src",j).attr("style","height: 120px");d.find(".attach-status").append(i)})}else{var b=$("<div></div>").text(e);d.find(".attach-status").append(b)}},NoticeLocationAttach:function(a){var e=a.find("[name=lat]");var k=a.find("[name=lon]");var g=a.find("[name=location_ns]").val();var l=a.find("[name=location_id]").val();var b="";var d=a.find("[name=notice_data-geo]");var c=a.find("[name=notice_data-geo]");var j=a.find("label.notice_data-geo");function f(n){j.attr("title",jQuery.trim(j.text())).removeClass("checked");a.find("[name=lat]").val("");a.find("[name=lon]").val("");a.find("[name=location_ns]").val("");a.find("[name=location_id]").val("");a.find("[name=notice_data-geo]").attr("checked",false);$.cookie(SN.C.S.NoticeDataGeoCookie,"disabled",{path:"/"});if(n){a.find(".geo_status_wrapper").removeClass("success").addClass("error");a.find(".geo_status_wrapper .geo_status").text(n)}else{a.find(".geo_status_wrapper").remove()}}function m(n,o){SN.U.NoticeGeoStatus(a,"Looking up place name...");$.getJSON(n,o,function(p){var q,r;if(typeof(p.location_ns)!="undefined"){a.find("[name=location_ns]").val(p.location_ns);q=p.location_ns}if(typeof(p.location_id)!="undefined"){a.find("[name=location_id]").val(p.location_id);r=p.location_id}if(typeof(p.name)=="undefined"){NLN_text=o.lat+";"+o.lon}else{NLN_text=p.name}SN.U.NoticeGeoStatus(a,NLN_text,o.lat,o.lon,p.url);j.attr("title",NoticeDataGeo_text.ShareDisable+" ("+NLN_text+")");a.find("[name=lat]").val(o.lat);a.find("[name=lon]").val(o.lon);a.find("[name=location_ns]").val(q);a.find("[name=location_id]").val(r);a.find("[name=notice_data-geo]").attr("checked",true);var s={NLat:o.lat,NLon:o.lon,NLNS:q,NLID:r,NLN:NLN_text,NLNU:p.url,NDG:true};$.cookie(SN.C.S.NoticeDataGeoCookie,JSON.stringify(s),{path:"/"})})}if(c.length>0){if($.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){c.attr("checked",false)}else{c.attr("checked",true)}var h=a.find(".notice_data-geo_wrap");var i=h.attr("title");h.removeAttr("title");j.attr("title",j.text());c.change(function(){if(c.attr("checked")===true||$.cookie(SN.C.S.NoticeDataGeoCookie)===null){j.attr("title",NoticeDataGeo_text.ShareDisable).addClass("checked");if($.cookie(SN.C.S.NoticeDataGeoCookie)===null||$.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){if(navigator.geolocation){SN.U.NoticeGeoStatus(a,"Requesting location from browser...");navigator.geolocation.getCurrentPosition(function(p){a.find("[name=lat]").val(p.coords.latitude);a.find("[name=lon]").val(p.coords.longitude);var q={lat:p.coords.latitude,lon:p.coords.longitude,token:$("#token").val()};m(i,q)},function(p){switch(p.code){case p.PERMISSION_DENIED:f("Location permission denied.");break;case p.TIMEOUT:f("Location lookup timeout.");break}},{timeout:10000})}else{if(e.length>0&&k.length>0){var n={lat:e,lon:k,token:$("#token").val()};m(i,n)}else{f();c.remove();j.remove()}}}else{var o=JSON.parse($.cookie(SN.C.S.NoticeDataGeoCookie));a.find("[name=lat]").val(o.NLat);a.find("[name=lon]").val(o.NLon);a.find("[name=location_ns]").val(o.NLNS);a.find("[name=location_id]").val(o.NLID);a.find("[name=notice_data-geo]").attr("checked",o.NDG);SN.U.NoticeGeoStatus(a,o.NLN,o.NLat,o.NLon,o.NLNU);j.attr("title",NoticeDataGeo_text.ShareDisable+" ("+o.NLN+")").addClass("checked")}}else{f()}}).change()}},NoticeGeoStatus:function(e,a,f,g,c){var h=e.find(".geo_status_wrapper");if(h.length==0){h=$('<div class="'+SN.C.S.Success+' geo_status_wrapper"><button class="close" style="float:right">&#215;</button><div class="geo_status"></div></div>');h.find("button.close").click(function(){e.find("[name=notice_data-geo]").removeAttr("checked").change()});e.append(h)}var b;if(c){b=$("<a></a>").attr("href",c)}else{b=$("<span></span>")}b.text(a);if(f||g){var d=f+";"+g;b.attr("title",d);if(!a){b.text(d)}}h.find(".geo_status").empty().append(b)},NewDirectMessage:function(){NDM=$(".entity_send-a-message a");NDM.attr({href:NDM.attr("href")+"&ajax=1"});NDM.bind("click",function(){var a=$(".entity_send-a-message form");if(a.length===0){$(this).addClass(SN.C.S.Processing);$.get(NDM.attr("href"),null,function(b){$(".entity_send-a-message").append(document._importNode($("form",b)[0],true));a=$(".entity_send-a-message .form_notice");SN.U.FormNoticeXHR(a);SN.U.FormNoticeEnhancements(a);a.append('<button class="close">&#215;</button>');$(".entity_send-a-message button").click(function(){a.hide();return false});NDM.removeClass(SN.C.S.Processing)})}else{a.show();$(".entity_send-a-message textarea").focus()}return false})},GetFullYear:function(c,d,a){var b=new Date();b.setFullYear(c,d,a);return b},StatusNetInstance:{Set:function(b){var a=SN.U.StatusNetInstance.Get();if(a!==null){b=$.extend(a,b)}$.cookie(SN.C.S.StatusNetInstance,JSON.stringify(b),{path:"/",expires:SN.U.GetFullYear(2029,0,1)})},Get:function(){var a=$.cookie(SN.C.S.StatusNetInstance);if(a!==null){return JSON.parse(a)}return null},Delete:function(){$.cookie(SN.C.S.StatusNetInstance,null)}},belongsOnTimeline:function(b){var a=$("body").attr("id");if(a=="public"){return true}var c=$("#nav_profile a").attr("href");if(c){var d=$(b).find(".vcard.author a.url").attr("href");if(d==c){if(a=="all"||a=="showstream"){return true}}}return false},switchInputFormTab:function(a){$(".input_form_nav_tab.current").removeClass("current");$("#input_form_nav_"+a).addClass("current");$(".input_form.current").removeClass("current");$("#input_form_"+a).addClass("current")}},Init:{NoticeForm:function(){if($("body.user_in").length>0){$(".ajax-notice").each(function(){var a=$(this);SN.Init.NoticeFormSetup(a)});$("body").bind("click",function(c){var a=$("li.notice-reply");if(a.length>0){var b=$(c.target);a.each(function(){var g=$(this);if(g.has(c.target).length==0){var e=g.find(".notice_data-text:first");var f=$.trim(e.val());if(f==""||f==e.data("initialText")){var d=g.closest("li.notice");g.remove();SN.U.NoticeInlineReplyPlaceholder(d)}}})}})}},NoticeFormSetup:function(a){SN.U.NoticeLocationAttach(a);SN.U.FormNoticeXHR(a);SN.U.FormNoticeEnhancements(a);SN.U.NoticeDataAttach(a)},Notices:function(){if($("body.user_in").length>0){var a=$(".form_notice:first");if(a.length>0){SN.C.I.NoticeFormMaster=document._importNode(a[0],true)}SN.U.NoticeRepeat();SN.U.NoticeReply();SN.U.NoticeInlineReplySetup()}SN.U.NoticeAttachments()},EntityActions:function(){if($("body.user_in").length>0){SN.U.NewDirectMessage()}},Login:function(){if(SN.U.StatusNetInstance.Get()!==null){var a=SN.U.StatusNetInstance.Get().Nickname;if(a!==null){$("#form_login #nickname").val(a)}}$("#form_login").bind("submit",function(){SN.U.StatusNetInstance.Set({Nickname:$("#form_login #nickname").val()});return true})},AjaxForms:function(){$("form.ajax").live("submit",function(){SN.U.FormXHR($(this));return false})},UploadForms:function(){$("input[type=file]").change(function(d){if(typeof this.files=="object"&&this.files.length>0){var c=0;for(var b=0;b<this.files.length;b++){c+=this.files[b].size}var a=SN.U.maxFileSize($(this.form));if(a>0&&c>a){var e="File too large: maximum upload size is %d bytes.";alert(e.replace("%d",a));$(this).val("");d.preventDefault();return false}}})}}};$(document).ready(function(){SN.Init.AjaxForms();SN.Init.UploadForms();if($("."+SN.C.S.FormNotice).length>0){SN.Init.NoticeForm()}if($("#content .notices").length>0){SN.Init.Notices()}if($("#content .entity_actions").length>0){SN.Init.EntityActions()}if($("#form_login").length>0){SN.Init.Login()}});if(!document.ELEMENT_NODE){document.ELEMENT_NODE=1;document.ATTRIBUTE_NODE=2;document.TEXT_NODE=3;document.CDATA_SECTION_NODE=4;document.ENTITY_REFERENCE_NODE=5;document.ENTITY_NODE=6;document.PROCESSING_INSTRUCTION_NODE=7;document.COMMENT_NODE=8;document.DOCUMENT_NODE=9;document.DOCUMENT_TYPE_NODE=10;document.DOCUMENT_FRAGMENT_NODE=11;document.NOTATION_NODE=12}document._importNode=function(e,a){switch(e.nodeType){case document.ELEMENT_NODE:var d=document.createElement(e.nodeName);if(e.attributes&&e.attributes.length>0){for(var c=0,b=e.attributes.length;c<b;){if(e.attributes[c].nodeName=="class"){d.className=e.getAttribute(e.attributes[c++].nodeName)}else{d.setAttribute(e.attributes[c].nodeName,e.getAttribute(e.attributes[c++].nodeName))}}}if(a&&e.childNodes&&e.childNodes.length>0){for(var c=0,b=e.childNodes.length;c<b;){d.appendChild(document._importNode(e.childNodes[c++],a))}}return d;break;case document.TEXT_NODE:case document.CDATA_SECTION_NODE:case document.COMMENT_NODE:return document.createTextNode(e.nodeValue);break}};if(typeof navigator.geolocation=="undefined"||navigator.geolocation.shim){(function(){(function(){if(window.google&&google.gears){return}var c=null;if(typeof GearsFactory!="undefined"){c=new GearsFactory()}else{try{c=new ActiveXObject("Gears.Factory");if(c.getBuildInfo().indexOf("ie_mobile")!=-1){c.privateSetGlobalObject(this)}}catch(d){if((typeof navigator.mimeTypes!="undefined")&&navigator.mimeTypes["application/x-googlegears"]){c=document.createElement("object");c.style.display="none";c.width=0;c.height=0;c.type="application/x-googlegears";document.documentElement.appendChild(c)}}}if(!c){return}if(!window.google){google={}}if(!google.gears){google.gears={factory:c}}})();var a=(function(){var d=google.gears.factory.create("beta.geolocation");var c=function(f,e){return function(g){f(g);e.lastPosition=g}};return{shim:true,type:"Gears",lastPosition:null,getCurrentPosition:function(e,g,h){var f=this;var i=c(e,f);d.getCurrentPosition(i,g,h)},watchPosition:function(e,f,g){d.watchPosition(e,f,g)},clearWatch:function(e){d.clearWatch(e)},getPermission:function(g,e,f){d.getPermission(g,e,f)}}});var b=(function(){var i=false;var e=function(){if(!d()&&!i){i=true;var j=document.createElement("script");j.src=(document.location.protocol=="https:"?"https://":"http://")+"www.google.com/jsapi?callback=_google_loader_apiLoaded";j.type="text/javascript";document.getElementsByTagName("body")[0].appendChild(j)}};var c=[];var h=function(j){c.push(j)};var f=function(){if(d()){while(c.length>0){var j=c.pop();j()}}};window._google_loader_apiLoaded=function(){f()};var d=function(){return(window.google&&google.loader)};var g=function(j){if(d()){return true}h(j);e();return false};e();return{shim:true,type:"ClientLocation",lastPosition:null,getCurrentPosition:function(k,n,o){var m=this;if(!g(function(){m.getCurrentPosition(k,n,o)})){return}if(google.loader.ClientLocation){var l=google.loader.ClientLocation;var j={coords:{latitude:l.latitude,longitude:l.longitude,altitude:null,accuracy:43000,altitudeAccuracy:null,heading:null,speed:null},address:{city:l.address.city,country:l.address.country,country_code:l.address.country_code,region:l.address.region},timestamp:new Date()};k(j);this.lastPosition=j}else{if(n==="function"){n({code:3,message:"Using the Google ClientLocation API and it is not able to calculate a location."})}}},watchPosition:function(j,l,m){this.getCurrentPosition(j,l,m);var k=this;var n=setInterval(function(){k.getCurrentPosition(j,l,m)},10000);return n},clearWatch:function(j){clearInterval(j)},getPermission:function(l,j,k){return true}}});navigator.geolocation=(window.google&&google.gears)?a():b()})()};
\ No newline at end of file

From eef9786e36dc8b22e3ee295e536697791b0f9069 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Thu, 10 Mar 2011 16:23:18 -0800
Subject: [PATCH 516/655] click -> focus for reply placeholder trigger; lets
 keyboarders use it though not super ideal :D

---
 js/util.js     | 11 ++++++-----
 js/util.min.js |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/js/util.js b/js/util.js
index 94103f9776..66ce3121d6 100644
--- a/js/util.js
+++ b/js/util.js
@@ -638,11 +638,12 @@ var SN = { // StatusNet
             var placeholder = $('<li class="notice-reply-placeholder">' +
                                     '<input class="placeholder">' +
                                 '</li>');
-            placeholder.click(function() {
-                SN.U.NoticeInlineReplyTrigger(notice);
-                return false;
-            });
-            placeholder.find('input').val(SN.msg('reply_placeholder'));
+            placeholder.find('input')
+                .val(SN.msg('reply_placeholder'))
+                .focus(function() {
+                    SN.U.NoticeInlineReplyTrigger(notice);
+                    return false;
+                });
             list.append(placeholder);
         },
 
diff --git a/js/util.min.js b/js/util.min.js
index e72eec7114..57e77fadc8 100644
--- a/js/util.min.js
+++ b/js/util.min.js
@@ -1 +1 @@
-var SN={C:{I:{CounterBlackout:false,MaxLength:140,PatternUsername:/^[0-9a-zA-Z\-_.]*$/,HTTP20x30x:[200,201,202,203,204,205,206,300,301,302,303,304,305,306,307],NoticeFormMaster:null},S:{Disabled:"disabled",Warning:"warning",Error:"error",Success:"success",Processing:"processing",CommandResult:"command_result",FormNotice:"form_notice",NoticeDataGeo:"notice_data-geo",NoticeDataGeoCookie:"NoticeDataGeo",NoticeDataGeoSelected:"notice_data-geo_selected",StatusNetInstance:"StatusNetInstance"}},messages:{},msg:function(a){if(typeof SN.messages[a]=="undefined"){return"["+a+"]"}else{return SN.messages[a]}},U:{FormNoticeEnhancements:function(b){if(jQuery.data(b[0],"ElementData")===undefined){MaxLength=b.find(".count").text();if(typeof(MaxLength)=="undefined"){MaxLength=SN.C.I.MaxLength}jQuery.data(b[0],"ElementData",{MaxLength:MaxLength});SN.U.Counter(b);NDT=b.find(".notice_data-text:first");NDT.bind("keyup",function(c){SN.U.Counter(b)});var a=function(c){window.setTimeout(function(){SN.U.Counter(b)},50)};NDT.bind("cut",a).bind("paste",a)}else{b.find(".count").text(jQuery.data(b[0],"ElementData").MaxLength)}},Counter:function(d){SN.C.I.FormNoticeCurrent=d;var b=jQuery.data(d[0],"ElementData").MaxLength;if(b<=0){return}var c=b-SN.U.CharacterCount(d);var a=d.find(".count");if(c.toString()!=a.text()){if(!SN.C.I.CounterBlackout||c===0){if(a.text()!=String(c)){a.text(c)}if(c<0){d.addClass(SN.C.S.Warning)}else{d.removeClass(SN.C.S.Warning)}if(!SN.C.I.CounterBlackout){SN.C.I.CounterBlackout=true;SN.C.I.FormNoticeCurrent=d;window.setTimeout("SN.U.ClearCounterBlackout(SN.C.I.FormNoticeCurrent);",500)}}}},CharacterCount:function(a){return a.find(".notice_data-text:first").val().length},ClearCounterBlackout:function(a){SN.C.I.CounterBlackout=false;SN.U.Counter(a)},RewriteAjaxAction:function(a){if(document.location.protocol=="https:"&&a.substr(0,5)=="http:"){return a.replace(/^http:\/\/[^:\/]+/,"https://"+document.location.host)}else{return a}},FormXHR:function(a){$.ajax({type:"POST",dataType:"xml",url:SN.U.RewriteAjaxAction(a.attr("action")),data:a.serialize()+"&ajax=1",beforeSend:function(b){a.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(c,d,b){alert(b||d)},success:function(b,c){if(typeof($("form",b)[0])!="undefined"){form_new=document._importNode($("form",b)[0],true);a.replaceWith(form_new)}else{a.replaceWith(document._importNode($("p",b)[0],true))}}})},FormNoticeXHR:function(b){SN.C.I.NoticeDataGeo={};b.append('<input type="hidden" name="ajax" value="1"/>');b.attr("action",SN.U.RewriteAjaxAction(b.attr("action")));var c=function(d,e){b.append($('<p class="form_response"></p>').addClass(d).text(e))};var a=function(){b.find(".form_response").remove()};b.ajaxForm({dataType:"xml",timeout:"60000",beforeSend:function(d){if(b.find(".notice_data-text:first").val()==""){b.addClass(SN.C.S.Warning);return false}b.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled);SN.U.normalizeGeoData(b);return true},error:function(f,g,e){b.removeClass(SN.C.S.Processing).find(".submit").removeClass(SN.C.S.Disabled).removeAttr(SN.C.S.Disabled,SN.C.S.Disabled);a();if(g=="timeout"){c("error","Sorry! We had trouble sending your notice. The servers are overloaded. Please try again, and contact the site administrator if this problem persists.")}else{var d=SN.U.GetResponseXML(f);if($("."+SN.C.S.Error,d).length>0){b.append(document._importNode($("."+SN.C.S.Error,d)[0],true))}else{if(parseInt(f.status)===0||jQuery.inArray(parseInt(f.status),SN.C.I.HTTP20x30x)>=0){b.resetForm().find(".attach-status").remove();SN.U.FormNoticeEnhancements(b)}else{c("error","(Sorry! We had trouble sending your notice ("+f.status+" "+f.statusText+"). Please report the problem to the site administrator if this happens again.")}}}},success:function(i,f){a();var n=$("#"+SN.C.S.Error,i);if(n.length>0){c("error",n.text())}else{if($("body")[0].id=="bookmarklet"){self.close()}var d=$("#"+SN.C.S.CommandResult,i);if(d.length>0){c("success",d.text())}else{var m=document._importNode($("li",i)[0],true);var k=$("#notices_primary .notices:first");var l=b.closest("li.notice-reply");if(l.length>0){var e=$(m).attr("id");if($("#"+e).length==0){var j=l.closest("li.notice");l.replaceWith(m);SN.U.NoticeInlineReplyPlaceholder(j)}else{l.remove()}}else{if(k.length>0&&SN.U.belongsOnTimeline(m)){if($("#"+m.id).length===0){var h=b.find("[name=inreplyto]").val();var g="#notices_primary #notice-"+h;if($("body")[0].id=="conversation"){if(h.length>0&&$(g+" .notices").length<1){$(g).append('<ul class="notices"></ul>')}$($(g+" .notices")[0]).append(m)}else{k.prepend(m)}$("#"+m.id).css({display:"none"}).fadeIn(2500);SN.U.NoticeWithAttachment($("#"+m.id));SN.U.NoticeReplyTo($("#"+m.id))}}else{c("success",$("title",i).text())}}}b.resetForm();b.find("[name=inreplyto]").val("");b.find(".attach-status").remove();SN.U.FormNoticeEnhancements(b)}},complete:function(d,e){b.removeClass(SN.C.S.Processing).find(".submit").removeAttr(SN.C.S.Disabled).removeClass(SN.C.S.Disabled);b.find("[name=lat]").val(SN.C.I.NoticeDataGeo.NLat);b.find("[name=lon]").val(SN.C.I.NoticeDataGeo.NLon);b.find("[name=location_ns]").val(SN.C.I.NoticeDataGeo.NLNS);b.find("[name=location_id]").val(SN.C.I.NoticeDataGeo.NLID);b.find("[name=notice_data-geo]").attr("checked",SN.C.I.NoticeDataGeo.NDG)}})},normalizeGeoData:function(a){SN.C.I.NoticeDataGeo.NLat=a.find("[name=lat]").val();SN.C.I.NoticeDataGeo.NLon=a.find("[name=lon]").val();SN.C.I.NoticeDataGeo.NLNS=a.find("[name=location_ns]").val();SN.C.I.NoticeDataGeo.NLID=a.find("[name=location_id]").val();SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked");var b=$.cookie(SN.C.S.NoticeDataGeoCookie);if(b!==null&&b!="disabled"){b=JSON.parse(b);SN.C.I.NoticeDataGeo.NLat=a.find("[name=lat]").val(b.NLat).val();SN.C.I.NoticeDataGeo.NLon=a.find("[name=lon]").val(b.NLon).val();if(b.NLNS){SN.C.I.NoticeDataGeo.NLNS=a.find("[name=location_ns]").val(b.NLNS).val();SN.C.I.NoticeDataGeo.NLID=a.find("[name=location_id]").val(b.NLID).val()}else{a.find("[name=location_ns]").val("");a.find("[name=location_id]").val("")}}if(b=="disabled"){SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked",false).attr("checked")}else{SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked",true).attr("checked")}},GetResponseXML:function(b){try{return b.responseXML}catch(a){return(new DOMParser()).parseFromString(b.responseText,"text/xml")}},NoticeReply:function(){if($("#content .notice_reply").length>0){$("#content .notice").each(function(){SN.U.NoticeReplyTo($(this))})}},NoticeReplyTo:function(a){a.find(".notice_reply").live("click",function(c){c.preventDefault();var b=($(".author .nickname",a).length>0)?$($(".author .nickname",a)[0]):$(".author .nickname.uid");SN.U.NoticeInlineReplyTrigger(a,"@"+b.text());return false})},NoticeInlineReplyTrigger:function(h,i){var b=$($(".notice_id",h)[0]).text();var e=h;var f=h.closest(".notices");if(f.hasClass("threaded-replies")){e=f.closest(".notice")}else{f=$("ul.threaded-replies",h);if(f.length==0){f=$('<ul class="notices threaded-replies xoxo"></ul>');h.append(f)}}var j=$(".notice-reply-form",f);var d=function(){j.find("input[name=inreplyto]").val(b);var m=j.find("textarea");if(m.length==0){throw"No textarea"}var l="";if(i){l=i+" "}m.val(l+m.val().replace(RegExp(l,"i"),""));m.data("initialText",$.trim(i+""));m.focus();if(m[0].setSelectionRange){var k=m.val().length;m[0].setSelectionRange(k,k)}};if(j.length>0){d()}else{f.find("li.notice-reply-placeholder").remove();var g=$("li.notice-reply",f);if(g.length==0){g=$('<li class="notice-reply"></li>');var c=function(k){var l=document._importNode(k,true);g.append(l);f.append(g);var m=j=$(l);SN.Init.NoticeFormSetup(m);d()};if(SN.C.I.NoticeFormMaster){c(SN.C.I.NoticeFormMaster)}else{var a=$("#form_notice").attr("action");$.get(a,{ajax:1},function(k,m,l){c($("form",k)[0])})}}}},NoticeInlineReplyPlaceholder:function(b){var a=b.find("ul.threaded-replies");var c=$('<li class="notice-reply-placeholder"><input class="placeholder"></li>');c.click(function(){SN.U.NoticeInlineReplyTrigger(b);return false});c.find("input").val(SN.msg("reply_placeholder"));a.append(c)},NoticeInlineReplySetup:function(){$(".threaded-replies").each(function(){var b=$(this);var a=b.closest(".notice");SN.U.NoticeInlineReplyPlaceholder(a)})},NoticeRepeat:function(){$(".form_repeat").live("click",function(a){a.preventDefault();SN.U.NoticeRepeatConfirmation($(this));return false})},NoticeRepeatConfirmation:function(a){var c=a.find(".submit");var b=c.clone();b.addClass("submit_dialogbox").removeClass("submit");a.append(b);b.bind("click",function(){SN.U.FormXHR(a);return false});c.hide();a.addClass("dialogbox").append('<button class="close">&#215;</button>').closest(".notice-options").addClass("opaque");a.find("button.close").click(function(){$(this).remove();a.removeClass("dialogbox").closest(".notice-options").removeClass("opaque");a.find(".submit_dialogbox").remove();a.find(".submit").show();return false})},NoticeAttachments:function(){$(".notice a.attachment").each(function(){SN.U.NoticeWithAttachment($(this).closest(".notice"))})},NoticeWithAttachment:function(b){if(b.find(".attachment").length===0){return}var a=b.find(".attachment.more");if(a.length>0){$(a[0]).click(function(){var c=$(this);c.addClass(SN.C.S.Processing);$.get(c.attr("href")+"/ajax",null,function(d){c.parent(".entry-content").html($(d).find("#attachment_view .entry-content").html())});return false}).attr("title",SN.msg("showmore_tooltip"))}},NoticeDataAttach:function(b){var a=b.find("input[type=file]");a.change(function(f){b.find(".attach-status").remove();var d=$(this).val();if(!d){return false}var c=$('<div class="attach-status '+SN.C.S.Success+'"><code></code> <button class="close">&#215;</button></div>');c.find("code").text(d);c.find("button").click(function(){c.remove();a.val("");return false});b.append(c);if(typeof this.files=="object"){for(var e=0;e<this.files.length;e++){SN.U.PreviewAttach(b,this.files[e])}}})},maxFileSize:function(b){var a=$(b).find("input[name=MAX_FILE_SIZE]").attr("value");if(a){return parseInt(a)}else{return 0}},PreviewAttach:function(d,c){var e=c.type+" "+Math.round(c.size/1024)+"KB";var f=true;var h;if(typeof window.createObjectURL!="undefined"){h=function(i,j){j(window.createObjectURL(i))}}else{if(typeof window.FileReader!="undefined"){h=function(j,k){var i=new FileReader();i.onload=function(l){k(i.result)};i.readAsDataURL(j)}}else{f=false}}var a=["image/png","image/jpeg","image/gif","image/svg+xml"];if($.inArray(c.type,a)==-1){f=false}var g=8*1024*1024;if(c.size>g){f=false}if(f){h(c,function(j){var i=$("<img>").attr("title",e).attr("alt",e).attr("src",j).attr("style","height: 120px");d.find(".attach-status").append(i)})}else{var b=$("<div></div>").text(e);d.find(".attach-status").append(b)}},NoticeLocationAttach:function(a){var e=a.find("[name=lat]");var k=a.find("[name=lon]");var g=a.find("[name=location_ns]").val();var l=a.find("[name=location_id]").val();var b="";var d=a.find("[name=notice_data-geo]");var c=a.find("[name=notice_data-geo]");var j=a.find("label.notice_data-geo");function f(n){j.attr("title",jQuery.trim(j.text())).removeClass("checked");a.find("[name=lat]").val("");a.find("[name=lon]").val("");a.find("[name=location_ns]").val("");a.find("[name=location_id]").val("");a.find("[name=notice_data-geo]").attr("checked",false);$.cookie(SN.C.S.NoticeDataGeoCookie,"disabled",{path:"/"});if(n){a.find(".geo_status_wrapper").removeClass("success").addClass("error");a.find(".geo_status_wrapper .geo_status").text(n)}else{a.find(".geo_status_wrapper").remove()}}function m(n,o){SN.U.NoticeGeoStatus(a,"Looking up place name...");$.getJSON(n,o,function(p){var q,r;if(typeof(p.location_ns)!="undefined"){a.find("[name=location_ns]").val(p.location_ns);q=p.location_ns}if(typeof(p.location_id)!="undefined"){a.find("[name=location_id]").val(p.location_id);r=p.location_id}if(typeof(p.name)=="undefined"){NLN_text=o.lat+";"+o.lon}else{NLN_text=p.name}SN.U.NoticeGeoStatus(a,NLN_text,o.lat,o.lon,p.url);j.attr("title",NoticeDataGeo_text.ShareDisable+" ("+NLN_text+")");a.find("[name=lat]").val(o.lat);a.find("[name=lon]").val(o.lon);a.find("[name=location_ns]").val(q);a.find("[name=location_id]").val(r);a.find("[name=notice_data-geo]").attr("checked",true);var s={NLat:o.lat,NLon:o.lon,NLNS:q,NLID:r,NLN:NLN_text,NLNU:p.url,NDG:true};$.cookie(SN.C.S.NoticeDataGeoCookie,JSON.stringify(s),{path:"/"})})}if(c.length>0){if($.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){c.attr("checked",false)}else{c.attr("checked",true)}var h=a.find(".notice_data-geo_wrap");var i=h.attr("title");h.removeAttr("title");j.attr("title",j.text());c.change(function(){if(c.attr("checked")===true||$.cookie(SN.C.S.NoticeDataGeoCookie)===null){j.attr("title",NoticeDataGeo_text.ShareDisable).addClass("checked");if($.cookie(SN.C.S.NoticeDataGeoCookie)===null||$.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){if(navigator.geolocation){SN.U.NoticeGeoStatus(a,"Requesting location from browser...");navigator.geolocation.getCurrentPosition(function(p){a.find("[name=lat]").val(p.coords.latitude);a.find("[name=lon]").val(p.coords.longitude);var q={lat:p.coords.latitude,lon:p.coords.longitude,token:$("#token").val()};m(i,q)},function(p){switch(p.code){case p.PERMISSION_DENIED:f("Location permission denied.");break;case p.TIMEOUT:f("Location lookup timeout.");break}},{timeout:10000})}else{if(e.length>0&&k.length>0){var n={lat:e,lon:k,token:$("#token").val()};m(i,n)}else{f();c.remove();j.remove()}}}else{var o=JSON.parse($.cookie(SN.C.S.NoticeDataGeoCookie));a.find("[name=lat]").val(o.NLat);a.find("[name=lon]").val(o.NLon);a.find("[name=location_ns]").val(o.NLNS);a.find("[name=location_id]").val(o.NLID);a.find("[name=notice_data-geo]").attr("checked",o.NDG);SN.U.NoticeGeoStatus(a,o.NLN,o.NLat,o.NLon,o.NLNU);j.attr("title",NoticeDataGeo_text.ShareDisable+" ("+o.NLN+")").addClass("checked")}}else{f()}}).change()}},NoticeGeoStatus:function(e,a,f,g,c){var h=e.find(".geo_status_wrapper");if(h.length==0){h=$('<div class="'+SN.C.S.Success+' geo_status_wrapper"><button class="close" style="float:right">&#215;</button><div class="geo_status"></div></div>');h.find("button.close").click(function(){e.find("[name=notice_data-geo]").removeAttr("checked").change()});e.append(h)}var b;if(c){b=$("<a></a>").attr("href",c)}else{b=$("<span></span>")}b.text(a);if(f||g){var d=f+";"+g;b.attr("title",d);if(!a){b.text(d)}}h.find(".geo_status").empty().append(b)},NewDirectMessage:function(){NDM=$(".entity_send-a-message a");NDM.attr({href:NDM.attr("href")+"&ajax=1"});NDM.bind("click",function(){var a=$(".entity_send-a-message form");if(a.length===0){$(this).addClass(SN.C.S.Processing);$.get(NDM.attr("href"),null,function(b){$(".entity_send-a-message").append(document._importNode($("form",b)[0],true));a=$(".entity_send-a-message .form_notice");SN.U.FormNoticeXHR(a);SN.U.FormNoticeEnhancements(a);a.append('<button class="close">&#215;</button>');$(".entity_send-a-message button").click(function(){a.hide();return false});NDM.removeClass(SN.C.S.Processing)})}else{a.show();$(".entity_send-a-message textarea").focus()}return false})},GetFullYear:function(c,d,a){var b=new Date();b.setFullYear(c,d,a);return b},StatusNetInstance:{Set:function(b){var a=SN.U.StatusNetInstance.Get();if(a!==null){b=$.extend(a,b)}$.cookie(SN.C.S.StatusNetInstance,JSON.stringify(b),{path:"/",expires:SN.U.GetFullYear(2029,0,1)})},Get:function(){var a=$.cookie(SN.C.S.StatusNetInstance);if(a!==null){return JSON.parse(a)}return null},Delete:function(){$.cookie(SN.C.S.StatusNetInstance,null)}},belongsOnTimeline:function(b){var a=$("body").attr("id");if(a=="public"){return true}var c=$("#nav_profile a").attr("href");if(c){var d=$(b).find(".vcard.author a.url").attr("href");if(d==c){if(a=="all"||a=="showstream"){return true}}}return false},switchInputFormTab:function(a){$(".input_form_nav_tab.current").removeClass("current");$("#input_form_nav_"+a).addClass("current");$(".input_form.current").removeClass("current");$("#input_form_"+a).addClass("current")}},Init:{NoticeForm:function(){if($("body.user_in").length>0){$(".ajax-notice").each(function(){var a=$(this);SN.Init.NoticeFormSetup(a)});$("body").bind("click",function(c){var a=$("li.notice-reply");if(a.length>0){var b=$(c.target);a.each(function(){var g=$(this);if(g.has(c.target).length==0){var e=g.find(".notice_data-text:first");var f=$.trim(e.val());if(f==""||f==e.data("initialText")){var d=g.closest("li.notice");g.remove();SN.U.NoticeInlineReplyPlaceholder(d)}}})}})}},NoticeFormSetup:function(a){SN.U.NoticeLocationAttach(a);SN.U.FormNoticeXHR(a);SN.U.FormNoticeEnhancements(a);SN.U.NoticeDataAttach(a)},Notices:function(){if($("body.user_in").length>0){var a=$(".form_notice:first");if(a.length>0){SN.C.I.NoticeFormMaster=document._importNode(a[0],true)}SN.U.NoticeRepeat();SN.U.NoticeReply();SN.U.NoticeInlineReplySetup()}SN.U.NoticeAttachments()},EntityActions:function(){if($("body.user_in").length>0){SN.U.NewDirectMessage()}},Login:function(){if(SN.U.StatusNetInstance.Get()!==null){var a=SN.U.StatusNetInstance.Get().Nickname;if(a!==null){$("#form_login #nickname").val(a)}}$("#form_login").bind("submit",function(){SN.U.StatusNetInstance.Set({Nickname:$("#form_login #nickname").val()});return true})},AjaxForms:function(){$("form.ajax").live("submit",function(){SN.U.FormXHR($(this));return false})},UploadForms:function(){$("input[type=file]").change(function(d){if(typeof this.files=="object"&&this.files.length>0){var c=0;for(var b=0;b<this.files.length;b++){c+=this.files[b].size}var a=SN.U.maxFileSize($(this.form));if(a>0&&c>a){var e="File too large: maximum upload size is %d bytes.";alert(e.replace("%d",a));$(this).val("");d.preventDefault();return false}}})}}};$(document).ready(function(){SN.Init.AjaxForms();SN.Init.UploadForms();if($("."+SN.C.S.FormNotice).length>0){SN.Init.NoticeForm()}if($("#content .notices").length>0){SN.Init.Notices()}if($("#content .entity_actions").length>0){SN.Init.EntityActions()}if($("#form_login").length>0){SN.Init.Login()}});if(!document.ELEMENT_NODE){document.ELEMENT_NODE=1;document.ATTRIBUTE_NODE=2;document.TEXT_NODE=3;document.CDATA_SECTION_NODE=4;document.ENTITY_REFERENCE_NODE=5;document.ENTITY_NODE=6;document.PROCESSING_INSTRUCTION_NODE=7;document.COMMENT_NODE=8;document.DOCUMENT_NODE=9;document.DOCUMENT_TYPE_NODE=10;document.DOCUMENT_FRAGMENT_NODE=11;document.NOTATION_NODE=12}document._importNode=function(e,a){switch(e.nodeType){case document.ELEMENT_NODE:var d=document.createElement(e.nodeName);if(e.attributes&&e.attributes.length>0){for(var c=0,b=e.attributes.length;c<b;){if(e.attributes[c].nodeName=="class"){d.className=e.getAttribute(e.attributes[c++].nodeName)}else{d.setAttribute(e.attributes[c].nodeName,e.getAttribute(e.attributes[c++].nodeName))}}}if(a&&e.childNodes&&e.childNodes.length>0){for(var c=0,b=e.childNodes.length;c<b;){d.appendChild(document._importNode(e.childNodes[c++],a))}}return d;break;case document.TEXT_NODE:case document.CDATA_SECTION_NODE:case document.COMMENT_NODE:return document.createTextNode(e.nodeValue);break}};if(typeof navigator.geolocation=="undefined"||navigator.geolocation.shim){(function(){(function(){if(window.google&&google.gears){return}var c=null;if(typeof GearsFactory!="undefined"){c=new GearsFactory()}else{try{c=new ActiveXObject("Gears.Factory");if(c.getBuildInfo().indexOf("ie_mobile")!=-1){c.privateSetGlobalObject(this)}}catch(d){if((typeof navigator.mimeTypes!="undefined")&&navigator.mimeTypes["application/x-googlegears"]){c=document.createElement("object");c.style.display="none";c.width=0;c.height=0;c.type="application/x-googlegears";document.documentElement.appendChild(c)}}}if(!c){return}if(!window.google){google={}}if(!google.gears){google.gears={factory:c}}})();var a=(function(){var d=google.gears.factory.create("beta.geolocation");var c=function(f,e){return function(g){f(g);e.lastPosition=g}};return{shim:true,type:"Gears",lastPosition:null,getCurrentPosition:function(e,g,h){var f=this;var i=c(e,f);d.getCurrentPosition(i,g,h)},watchPosition:function(e,f,g){d.watchPosition(e,f,g)},clearWatch:function(e){d.clearWatch(e)},getPermission:function(g,e,f){d.getPermission(g,e,f)}}});var b=(function(){var i=false;var e=function(){if(!d()&&!i){i=true;var j=document.createElement("script");j.src=(document.location.protocol=="https:"?"https://":"http://")+"www.google.com/jsapi?callback=_google_loader_apiLoaded";j.type="text/javascript";document.getElementsByTagName("body")[0].appendChild(j)}};var c=[];var h=function(j){c.push(j)};var f=function(){if(d()){while(c.length>0){var j=c.pop();j()}}};window._google_loader_apiLoaded=function(){f()};var d=function(){return(window.google&&google.loader)};var g=function(j){if(d()){return true}h(j);e();return false};e();return{shim:true,type:"ClientLocation",lastPosition:null,getCurrentPosition:function(k,n,o){var m=this;if(!g(function(){m.getCurrentPosition(k,n,o)})){return}if(google.loader.ClientLocation){var l=google.loader.ClientLocation;var j={coords:{latitude:l.latitude,longitude:l.longitude,altitude:null,accuracy:43000,altitudeAccuracy:null,heading:null,speed:null},address:{city:l.address.city,country:l.address.country,country_code:l.address.country_code,region:l.address.region},timestamp:new Date()};k(j);this.lastPosition=j}else{if(n==="function"){n({code:3,message:"Using the Google ClientLocation API and it is not able to calculate a location."})}}},watchPosition:function(j,l,m){this.getCurrentPosition(j,l,m);var k=this;var n=setInterval(function(){k.getCurrentPosition(j,l,m)},10000);return n},clearWatch:function(j){clearInterval(j)},getPermission:function(l,j,k){return true}}});navigator.geolocation=(window.google&&google.gears)?a():b()})()};
\ No newline at end of file
+var SN={C:{I:{CounterBlackout:false,MaxLength:140,PatternUsername:/^[0-9a-zA-Z\-_.]*$/,HTTP20x30x:[200,201,202,203,204,205,206,300,301,302,303,304,305,306,307],NoticeFormMaster:null},S:{Disabled:"disabled",Warning:"warning",Error:"error",Success:"success",Processing:"processing",CommandResult:"command_result",FormNotice:"form_notice",NoticeDataGeo:"notice_data-geo",NoticeDataGeoCookie:"NoticeDataGeo",NoticeDataGeoSelected:"notice_data-geo_selected",StatusNetInstance:"StatusNetInstance"}},messages:{},msg:function(a){if(typeof SN.messages[a]=="undefined"){return"["+a+"]"}else{return SN.messages[a]}},U:{FormNoticeEnhancements:function(b){if(jQuery.data(b[0],"ElementData")===undefined){MaxLength=b.find(".count").text();if(typeof(MaxLength)=="undefined"){MaxLength=SN.C.I.MaxLength}jQuery.data(b[0],"ElementData",{MaxLength:MaxLength});SN.U.Counter(b);NDT=b.find(".notice_data-text:first");NDT.bind("keyup",function(c){SN.U.Counter(b)});var a=function(c){window.setTimeout(function(){SN.U.Counter(b)},50)};NDT.bind("cut",a).bind("paste",a)}else{b.find(".count").text(jQuery.data(b[0],"ElementData").MaxLength)}},Counter:function(d){SN.C.I.FormNoticeCurrent=d;var b=jQuery.data(d[0],"ElementData").MaxLength;if(b<=0){return}var c=b-SN.U.CharacterCount(d);var a=d.find(".count");if(c.toString()!=a.text()){if(!SN.C.I.CounterBlackout||c===0){if(a.text()!=String(c)){a.text(c)}if(c<0){d.addClass(SN.C.S.Warning)}else{d.removeClass(SN.C.S.Warning)}if(!SN.C.I.CounterBlackout){SN.C.I.CounterBlackout=true;SN.C.I.FormNoticeCurrent=d;window.setTimeout("SN.U.ClearCounterBlackout(SN.C.I.FormNoticeCurrent);",500)}}}},CharacterCount:function(a){return a.find(".notice_data-text:first").val().length},ClearCounterBlackout:function(a){SN.C.I.CounterBlackout=false;SN.U.Counter(a)},RewriteAjaxAction:function(a){if(document.location.protocol=="https:"&&a.substr(0,5)=="http:"){return a.replace(/^http:\/\/[^:\/]+/,"https://"+document.location.host)}else{return a}},FormXHR:function(a){$.ajax({type:"POST",dataType:"xml",url:SN.U.RewriteAjaxAction(a.attr("action")),data:a.serialize()+"&ajax=1",beforeSend:function(b){a.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(c,d,b){alert(b||d)},success:function(b,c){if(typeof($("form",b)[0])!="undefined"){form_new=document._importNode($("form",b)[0],true);a.replaceWith(form_new)}else{a.replaceWith(document._importNode($("p",b)[0],true))}}})},FormNoticeXHR:function(b){SN.C.I.NoticeDataGeo={};b.append('<input type="hidden" name="ajax" value="1"/>');b.attr("action",SN.U.RewriteAjaxAction(b.attr("action")));var c=function(d,e){b.append($('<p class="form_response"></p>').addClass(d).text(e))};var a=function(){b.find(".form_response").remove()};b.ajaxForm({dataType:"xml",timeout:"60000",beforeSend:function(d){if(b.find(".notice_data-text:first").val()==""){b.addClass(SN.C.S.Warning);return false}b.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled);SN.U.normalizeGeoData(b);return true},error:function(f,g,e){b.removeClass(SN.C.S.Processing).find(".submit").removeClass(SN.C.S.Disabled).removeAttr(SN.C.S.Disabled,SN.C.S.Disabled);a();if(g=="timeout"){c("error","Sorry! We had trouble sending your notice. The servers are overloaded. Please try again, and contact the site administrator if this problem persists.")}else{var d=SN.U.GetResponseXML(f);if($("."+SN.C.S.Error,d).length>0){b.append(document._importNode($("."+SN.C.S.Error,d)[0],true))}else{if(parseInt(f.status)===0||jQuery.inArray(parseInt(f.status),SN.C.I.HTTP20x30x)>=0){b.resetForm().find(".attach-status").remove();SN.U.FormNoticeEnhancements(b)}else{c("error","(Sorry! We had trouble sending your notice ("+f.status+" "+f.statusText+"). Please report the problem to the site administrator if this happens again.")}}}},success:function(i,f){a();var n=$("#"+SN.C.S.Error,i);if(n.length>0){c("error",n.text())}else{if($("body")[0].id=="bookmarklet"){self.close()}var d=$("#"+SN.C.S.CommandResult,i);if(d.length>0){c("success",d.text())}else{var m=document._importNode($("li",i)[0],true);var k=$("#notices_primary .notices:first");var l=b.closest("li.notice-reply");if(l.length>0){var e=$(m).attr("id");if($("#"+e).length==0){var j=l.closest("li.notice");l.replaceWith(m);SN.U.NoticeInlineReplyPlaceholder(j)}else{l.remove()}}else{if(k.length>0&&SN.U.belongsOnTimeline(m)){if($("#"+m.id).length===0){var h=b.find("[name=inreplyto]").val();var g="#notices_primary #notice-"+h;if($("body")[0].id=="conversation"){if(h.length>0&&$(g+" .notices").length<1){$(g).append('<ul class="notices"></ul>')}$($(g+" .notices")[0]).append(m)}else{k.prepend(m)}$("#"+m.id).css({display:"none"}).fadeIn(2500);SN.U.NoticeWithAttachment($("#"+m.id));SN.U.NoticeReplyTo($("#"+m.id))}}else{c("success",$("title",i).text())}}}b.resetForm();b.find("[name=inreplyto]").val("");b.find(".attach-status").remove();SN.U.FormNoticeEnhancements(b)}},complete:function(d,e){b.removeClass(SN.C.S.Processing).find(".submit").removeAttr(SN.C.S.Disabled).removeClass(SN.C.S.Disabled);b.find("[name=lat]").val(SN.C.I.NoticeDataGeo.NLat);b.find("[name=lon]").val(SN.C.I.NoticeDataGeo.NLon);b.find("[name=location_ns]").val(SN.C.I.NoticeDataGeo.NLNS);b.find("[name=location_id]").val(SN.C.I.NoticeDataGeo.NLID);b.find("[name=notice_data-geo]").attr("checked",SN.C.I.NoticeDataGeo.NDG)}})},normalizeGeoData:function(a){SN.C.I.NoticeDataGeo.NLat=a.find("[name=lat]").val();SN.C.I.NoticeDataGeo.NLon=a.find("[name=lon]").val();SN.C.I.NoticeDataGeo.NLNS=a.find("[name=location_ns]").val();SN.C.I.NoticeDataGeo.NLID=a.find("[name=location_id]").val();SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked");var b=$.cookie(SN.C.S.NoticeDataGeoCookie);if(b!==null&&b!="disabled"){b=JSON.parse(b);SN.C.I.NoticeDataGeo.NLat=a.find("[name=lat]").val(b.NLat).val();SN.C.I.NoticeDataGeo.NLon=a.find("[name=lon]").val(b.NLon).val();if(b.NLNS){SN.C.I.NoticeDataGeo.NLNS=a.find("[name=location_ns]").val(b.NLNS).val();SN.C.I.NoticeDataGeo.NLID=a.find("[name=location_id]").val(b.NLID).val()}else{a.find("[name=location_ns]").val("");a.find("[name=location_id]").val("")}}if(b=="disabled"){SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked",false).attr("checked")}else{SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked",true).attr("checked")}},GetResponseXML:function(b){try{return b.responseXML}catch(a){return(new DOMParser()).parseFromString(b.responseText,"text/xml")}},NoticeReply:function(){if($("#content .notice_reply").length>0){$("#content .notice").each(function(){SN.U.NoticeReplyTo($(this))})}},NoticeReplyTo:function(a){a.find(".notice_reply").live("click",function(c){c.preventDefault();var b=($(".author .nickname",a).length>0)?$($(".author .nickname",a)[0]):$(".author .nickname.uid");SN.U.NoticeInlineReplyTrigger(a,"@"+b.text());return false})},NoticeInlineReplyTrigger:function(h,i){var b=$($(".notice_id",h)[0]).text();var e=h;var f=h.closest(".notices");if(f.hasClass("threaded-replies")){e=f.closest(".notice")}else{f=$("ul.threaded-replies",h);if(f.length==0){f=$('<ul class="notices threaded-replies xoxo"></ul>');h.append(f)}}var j=$(".notice-reply-form",f);var d=function(){j.find("input[name=inreplyto]").val(b);var m=j.find("textarea");if(m.length==0){throw"No textarea"}var l="";if(i){l=i+" "}m.val(l+m.val().replace(RegExp(l,"i"),""));m.data("initialText",$.trim(i+""));m.focus();if(m[0].setSelectionRange){var k=m.val().length;m[0].setSelectionRange(k,k)}};if(j.length>0){d()}else{f.find("li.notice-reply-placeholder").remove();var g=$("li.notice-reply",f);if(g.length==0){g=$('<li class="notice-reply"></li>');var c=function(k){var l=document._importNode(k,true);g.append(l);f.append(g);var m=j=$(l);SN.Init.NoticeFormSetup(m);d()};if(SN.C.I.NoticeFormMaster){c(SN.C.I.NoticeFormMaster)}else{var a=$("#form_notice").attr("action");$.get(a,{ajax:1},function(k,m,l){c($("form",k)[0])})}}}},NoticeInlineReplyPlaceholder:function(b){var a=b.find("ul.threaded-replies");var c=$('<li class="notice-reply-placeholder"><input class="placeholder"></li>');c.find("input").val(SN.msg("reply_placeholder")).focus(function(){SN.U.NoticeInlineReplyTrigger(b);return false});a.append(c)},NoticeInlineReplySetup:function(){$(".threaded-replies").each(function(){var b=$(this);var a=b.closest(".notice");SN.U.NoticeInlineReplyPlaceholder(a)})},NoticeRepeat:function(){$(".form_repeat").live("click",function(a){a.preventDefault();SN.U.NoticeRepeatConfirmation($(this));return false})},NoticeRepeatConfirmation:function(a){var c=a.find(".submit");var b=c.clone();b.addClass("submit_dialogbox").removeClass("submit");a.append(b);b.bind("click",function(){SN.U.FormXHR(a);return false});c.hide();a.addClass("dialogbox").append('<button class="close">&#215;</button>').closest(".notice-options").addClass("opaque");a.find("button.close").click(function(){$(this).remove();a.removeClass("dialogbox").closest(".notice-options").removeClass("opaque");a.find(".submit_dialogbox").remove();a.find(".submit").show();return false})},NoticeAttachments:function(){$(".notice a.attachment").each(function(){SN.U.NoticeWithAttachment($(this).closest(".notice"))})},NoticeWithAttachment:function(b){if(b.find(".attachment").length===0){return}var a=b.find(".attachment.more");if(a.length>0){$(a[0]).click(function(){var c=$(this);c.addClass(SN.C.S.Processing);$.get(c.attr("href")+"/ajax",null,function(d){c.parent(".entry-content").html($(d).find("#attachment_view .entry-content").html())});return false}).attr("title",SN.msg("showmore_tooltip"))}},NoticeDataAttach:function(b){var a=b.find("input[type=file]");a.change(function(f){b.find(".attach-status").remove();var d=$(this).val();if(!d){return false}var c=$('<div class="attach-status '+SN.C.S.Success+'"><code></code> <button class="close">&#215;</button></div>');c.find("code").text(d);c.find("button").click(function(){c.remove();a.val("");return false});b.append(c);if(typeof this.files=="object"){for(var e=0;e<this.files.length;e++){SN.U.PreviewAttach(b,this.files[e])}}})},maxFileSize:function(b){var a=$(b).find("input[name=MAX_FILE_SIZE]").attr("value");if(a){return parseInt(a)}else{return 0}},PreviewAttach:function(d,c){var e=c.type+" "+Math.round(c.size/1024)+"KB";var f=true;var h;if(typeof window.createObjectURL!="undefined"){h=function(i,j){j(window.createObjectURL(i))}}else{if(typeof window.FileReader!="undefined"){h=function(j,k){var i=new FileReader();i.onload=function(l){k(i.result)};i.readAsDataURL(j)}}else{f=false}}var a=["image/png","image/jpeg","image/gif","image/svg+xml"];if($.inArray(c.type,a)==-1){f=false}var g=8*1024*1024;if(c.size>g){f=false}if(f){h(c,function(j){var i=$("<img>").attr("title",e).attr("alt",e).attr("src",j).attr("style","height: 120px");d.find(".attach-status").append(i)})}else{var b=$("<div></div>").text(e);d.find(".attach-status").append(b)}},NoticeLocationAttach:function(a){var e=a.find("[name=lat]");var k=a.find("[name=lon]");var g=a.find("[name=location_ns]").val();var l=a.find("[name=location_id]").val();var b="";var d=a.find("[name=notice_data-geo]");var c=a.find("[name=notice_data-geo]");var j=a.find("label.notice_data-geo");function f(n){j.attr("title",jQuery.trim(j.text())).removeClass("checked");a.find("[name=lat]").val("");a.find("[name=lon]").val("");a.find("[name=location_ns]").val("");a.find("[name=location_id]").val("");a.find("[name=notice_data-geo]").attr("checked",false);$.cookie(SN.C.S.NoticeDataGeoCookie,"disabled",{path:"/"});if(n){a.find(".geo_status_wrapper").removeClass("success").addClass("error");a.find(".geo_status_wrapper .geo_status").text(n)}else{a.find(".geo_status_wrapper").remove()}}function m(n,o){SN.U.NoticeGeoStatus(a,"Looking up place name...");$.getJSON(n,o,function(p){var q,r;if(typeof(p.location_ns)!="undefined"){a.find("[name=location_ns]").val(p.location_ns);q=p.location_ns}if(typeof(p.location_id)!="undefined"){a.find("[name=location_id]").val(p.location_id);r=p.location_id}if(typeof(p.name)=="undefined"){NLN_text=o.lat+";"+o.lon}else{NLN_text=p.name}SN.U.NoticeGeoStatus(a,NLN_text,o.lat,o.lon,p.url);j.attr("title",NoticeDataGeo_text.ShareDisable+" ("+NLN_text+")");a.find("[name=lat]").val(o.lat);a.find("[name=lon]").val(o.lon);a.find("[name=location_ns]").val(q);a.find("[name=location_id]").val(r);a.find("[name=notice_data-geo]").attr("checked",true);var s={NLat:o.lat,NLon:o.lon,NLNS:q,NLID:r,NLN:NLN_text,NLNU:p.url,NDG:true};$.cookie(SN.C.S.NoticeDataGeoCookie,JSON.stringify(s),{path:"/"})})}if(c.length>0){if($.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){c.attr("checked",false)}else{c.attr("checked",true)}var h=a.find(".notice_data-geo_wrap");var i=h.attr("title");h.removeAttr("title");j.attr("title",j.text());c.change(function(){if(c.attr("checked")===true||$.cookie(SN.C.S.NoticeDataGeoCookie)===null){j.attr("title",NoticeDataGeo_text.ShareDisable).addClass("checked");if($.cookie(SN.C.S.NoticeDataGeoCookie)===null||$.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){if(navigator.geolocation){SN.U.NoticeGeoStatus(a,"Requesting location from browser...");navigator.geolocation.getCurrentPosition(function(p){a.find("[name=lat]").val(p.coords.latitude);a.find("[name=lon]").val(p.coords.longitude);var q={lat:p.coords.latitude,lon:p.coords.longitude,token:$("#token").val()};m(i,q)},function(p){switch(p.code){case p.PERMISSION_DENIED:f("Location permission denied.");break;case p.TIMEOUT:f("Location lookup timeout.");break}},{timeout:10000})}else{if(e.length>0&&k.length>0){var n={lat:e,lon:k,token:$("#token").val()};m(i,n)}else{f();c.remove();j.remove()}}}else{var o=JSON.parse($.cookie(SN.C.S.NoticeDataGeoCookie));a.find("[name=lat]").val(o.NLat);a.find("[name=lon]").val(o.NLon);a.find("[name=location_ns]").val(o.NLNS);a.find("[name=location_id]").val(o.NLID);a.find("[name=notice_data-geo]").attr("checked",o.NDG);SN.U.NoticeGeoStatus(a,o.NLN,o.NLat,o.NLon,o.NLNU);j.attr("title",NoticeDataGeo_text.ShareDisable+" ("+o.NLN+")").addClass("checked")}}else{f()}}).change()}},NoticeGeoStatus:function(e,a,f,g,c){var h=e.find(".geo_status_wrapper");if(h.length==0){h=$('<div class="'+SN.C.S.Success+' geo_status_wrapper"><button class="close" style="float:right">&#215;</button><div class="geo_status"></div></div>');h.find("button.close").click(function(){e.find("[name=notice_data-geo]").removeAttr("checked").change()});e.append(h)}var b;if(c){b=$("<a></a>").attr("href",c)}else{b=$("<span></span>")}b.text(a);if(f||g){var d=f+";"+g;b.attr("title",d);if(!a){b.text(d)}}h.find(".geo_status").empty().append(b)},NewDirectMessage:function(){NDM=$(".entity_send-a-message a");NDM.attr({href:NDM.attr("href")+"&ajax=1"});NDM.bind("click",function(){var a=$(".entity_send-a-message form");if(a.length===0){$(this).addClass(SN.C.S.Processing);$.get(NDM.attr("href"),null,function(b){$(".entity_send-a-message").append(document._importNode($("form",b)[0],true));a=$(".entity_send-a-message .form_notice");SN.U.FormNoticeXHR(a);SN.U.FormNoticeEnhancements(a);a.append('<button class="close">&#215;</button>');$(".entity_send-a-message button").click(function(){a.hide();return false});NDM.removeClass(SN.C.S.Processing)})}else{a.show();$(".entity_send-a-message textarea").focus()}return false})},GetFullYear:function(c,d,a){var b=new Date();b.setFullYear(c,d,a);return b},StatusNetInstance:{Set:function(b){var a=SN.U.StatusNetInstance.Get();if(a!==null){b=$.extend(a,b)}$.cookie(SN.C.S.StatusNetInstance,JSON.stringify(b),{path:"/",expires:SN.U.GetFullYear(2029,0,1)})},Get:function(){var a=$.cookie(SN.C.S.StatusNetInstance);if(a!==null){return JSON.parse(a)}return null},Delete:function(){$.cookie(SN.C.S.StatusNetInstance,null)}},belongsOnTimeline:function(b){var a=$("body").attr("id");if(a=="public"){return true}var c=$("#nav_profile a").attr("href");if(c){var d=$(b).find(".vcard.author a.url").attr("href");if(d==c){if(a=="all"||a=="showstream"){return true}}}return false},switchInputFormTab:function(a){$(".input_form_nav_tab.current").removeClass("current");$("#input_form_nav_"+a).addClass("current");$(".input_form.current").removeClass("current");$("#input_form_"+a).addClass("current")}},Init:{NoticeForm:function(){if($("body.user_in").length>0){$(".ajax-notice").each(function(){var a=$(this);SN.Init.NoticeFormSetup(a)});$("body").bind("click",function(c){var a=$("li.notice-reply");if(a.length>0){var b=$(c.target);a.each(function(){var g=$(this);if(g.has(c.target).length==0){var e=g.find(".notice_data-text:first");var f=$.trim(e.val());if(f==""||f==e.data("initialText")){var d=g.closest("li.notice");g.remove();SN.U.NoticeInlineReplyPlaceholder(d)}}})}})}},NoticeFormSetup:function(a){SN.U.NoticeLocationAttach(a);SN.U.FormNoticeXHR(a);SN.U.FormNoticeEnhancements(a);SN.U.NoticeDataAttach(a)},Notices:function(){if($("body.user_in").length>0){var a=$(".form_notice:first");if(a.length>0){SN.C.I.NoticeFormMaster=document._importNode(a[0],true)}SN.U.NoticeRepeat();SN.U.NoticeReply();SN.U.NoticeInlineReplySetup()}SN.U.NoticeAttachments()},EntityActions:function(){if($("body.user_in").length>0){SN.U.NewDirectMessage()}},Login:function(){if(SN.U.StatusNetInstance.Get()!==null){var a=SN.U.StatusNetInstance.Get().Nickname;if(a!==null){$("#form_login #nickname").val(a)}}$("#form_login").bind("submit",function(){SN.U.StatusNetInstance.Set({Nickname:$("#form_login #nickname").val()});return true})},AjaxForms:function(){$("form.ajax").live("submit",function(){SN.U.FormXHR($(this));return false})},UploadForms:function(){$("input[type=file]").change(function(d){if(typeof this.files=="object"&&this.files.length>0){var c=0;for(var b=0;b<this.files.length;b++){c+=this.files[b].size}var a=SN.U.maxFileSize($(this.form));if(a>0&&c>a){var e="File too large: maximum upload size is %d bytes.";alert(e.replace("%d",a));$(this).val("");d.preventDefault();return false}}})}}};$(document).ready(function(){SN.Init.AjaxForms();SN.Init.UploadForms();if($("."+SN.C.S.FormNotice).length>0){SN.Init.NoticeForm()}if($("#content .notices").length>0){SN.Init.Notices()}if($("#content .entity_actions").length>0){SN.Init.EntityActions()}if($("#form_login").length>0){SN.Init.Login()}});if(!document.ELEMENT_NODE){document.ELEMENT_NODE=1;document.ATTRIBUTE_NODE=2;document.TEXT_NODE=3;document.CDATA_SECTION_NODE=4;document.ENTITY_REFERENCE_NODE=5;document.ENTITY_NODE=6;document.PROCESSING_INSTRUCTION_NODE=7;document.COMMENT_NODE=8;document.DOCUMENT_NODE=9;document.DOCUMENT_TYPE_NODE=10;document.DOCUMENT_FRAGMENT_NODE=11;document.NOTATION_NODE=12}document._importNode=function(e,a){switch(e.nodeType){case document.ELEMENT_NODE:var d=document.createElement(e.nodeName);if(e.attributes&&e.attributes.length>0){for(var c=0,b=e.attributes.length;c<b;){if(e.attributes[c].nodeName=="class"){d.className=e.getAttribute(e.attributes[c++].nodeName)}else{d.setAttribute(e.attributes[c].nodeName,e.getAttribute(e.attributes[c++].nodeName))}}}if(a&&e.childNodes&&e.childNodes.length>0){for(var c=0,b=e.childNodes.length;c<b;){d.appendChild(document._importNode(e.childNodes[c++],a))}}return d;break;case document.TEXT_NODE:case document.CDATA_SECTION_NODE:case document.COMMENT_NODE:return document.createTextNode(e.nodeValue);break}};if(typeof navigator.geolocation=="undefined"||navigator.geolocation.shim){(function(){(function(){if(window.google&&google.gears){return}var c=null;if(typeof GearsFactory!="undefined"){c=new GearsFactory()}else{try{c=new ActiveXObject("Gears.Factory");if(c.getBuildInfo().indexOf("ie_mobile")!=-1){c.privateSetGlobalObject(this)}}catch(d){if((typeof navigator.mimeTypes!="undefined")&&navigator.mimeTypes["application/x-googlegears"]){c=document.createElement("object");c.style.display="none";c.width=0;c.height=0;c.type="application/x-googlegears";document.documentElement.appendChild(c)}}}if(!c){return}if(!window.google){google={}}if(!google.gears){google.gears={factory:c}}})();var a=(function(){var d=google.gears.factory.create("beta.geolocation");var c=function(f,e){return function(g){f(g);e.lastPosition=g}};return{shim:true,type:"Gears",lastPosition:null,getCurrentPosition:function(e,g,h){var f=this;var i=c(e,f);d.getCurrentPosition(i,g,h)},watchPosition:function(e,f,g){d.watchPosition(e,f,g)},clearWatch:function(e){d.clearWatch(e)},getPermission:function(g,e,f){d.getPermission(g,e,f)}}});var b=(function(){var i=false;var e=function(){if(!d()&&!i){i=true;var j=document.createElement("script");j.src=(document.location.protocol=="https:"?"https://":"http://")+"www.google.com/jsapi?callback=_google_loader_apiLoaded";j.type="text/javascript";document.getElementsByTagName("body")[0].appendChild(j)}};var c=[];var h=function(j){c.push(j)};var f=function(){if(d()){while(c.length>0){var j=c.pop();j()}}};window._google_loader_apiLoaded=function(){f()};var d=function(){return(window.google&&google.loader)};var g=function(j){if(d()){return true}h(j);e();return false};e();return{shim:true,type:"ClientLocation",lastPosition:null,getCurrentPosition:function(k,n,o){var m=this;if(!g(function(){m.getCurrentPosition(k,n,o)})){return}if(google.loader.ClientLocation){var l=google.loader.ClientLocation;var j={coords:{latitude:l.latitude,longitude:l.longitude,altitude:null,accuracy:43000,altitudeAccuracy:null,heading:null,speed:null},address:{city:l.address.city,country:l.address.country,country_code:l.address.country_code,region:l.address.region},timestamp:new Date()};k(j);this.lastPosition=j}else{if(n==="function"){n({code:3,message:"Using the Google ClientLocation API and it is not able to calculate a location."})}}},watchPosition:function(j,l,m){this.getCurrentPosition(j,l,m);var k=this;var n=setInterval(function(){k.getCurrentPosition(j,l,m)},10000);return n},clearWatch:function(j){clearInterval(j)},getPermission:function(l,j,k){return true}}});navigator.geolocation=(window.google&&google.gears)?a():b()})()};
\ No newline at end of file

From e43ee373ae2d92e6c2a5933264e276023c2640aa Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Thu, 10 Mar 2011 16:29:13 -0800
Subject: [PATCH 517/655] Fix disappearing reply forms when closing geo section

Missing default-cancel in the click handler allowed the event to bubble up to the body handler, where we think the click is outside of the form because the target is no longer in the form by the time we check
Now the event no longer bubbles up, as we cancel it when we're done.
---
 js/util.js     | 1 +
 js/util.min.js | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/js/util.js b/js/util.js
index 66ce3121d6..ad8ac8b53c 100644
--- a/js/util.js
+++ b/js/util.js
@@ -1118,6 +1118,7 @@ var SN = { // StatusNet
                 wrapper = $('<div class="'+SN.C.S.Success+' geo_status_wrapper"><button class="close" style="float:right">&#215;</button><div class="geo_status"></div></div>');
                 wrapper.find('button.close').click(function() {
                     form.find('[name=notice_data-geo]').removeAttr('checked').change();
+                    return false;
                 });
                 form.append(wrapper);
             }
diff --git a/js/util.min.js b/js/util.min.js
index 57e77fadc8..dd9e4b1e37 100644
--- a/js/util.min.js
+++ b/js/util.min.js
@@ -1 +1 @@
-var SN={C:{I:{CounterBlackout:false,MaxLength:140,PatternUsername:/^[0-9a-zA-Z\-_.]*$/,HTTP20x30x:[200,201,202,203,204,205,206,300,301,302,303,304,305,306,307],NoticeFormMaster:null},S:{Disabled:"disabled",Warning:"warning",Error:"error",Success:"success",Processing:"processing",CommandResult:"command_result",FormNotice:"form_notice",NoticeDataGeo:"notice_data-geo",NoticeDataGeoCookie:"NoticeDataGeo",NoticeDataGeoSelected:"notice_data-geo_selected",StatusNetInstance:"StatusNetInstance"}},messages:{},msg:function(a){if(typeof SN.messages[a]=="undefined"){return"["+a+"]"}else{return SN.messages[a]}},U:{FormNoticeEnhancements:function(b){if(jQuery.data(b[0],"ElementData")===undefined){MaxLength=b.find(".count").text();if(typeof(MaxLength)=="undefined"){MaxLength=SN.C.I.MaxLength}jQuery.data(b[0],"ElementData",{MaxLength:MaxLength});SN.U.Counter(b);NDT=b.find(".notice_data-text:first");NDT.bind("keyup",function(c){SN.U.Counter(b)});var a=function(c){window.setTimeout(function(){SN.U.Counter(b)},50)};NDT.bind("cut",a).bind("paste",a)}else{b.find(".count").text(jQuery.data(b[0],"ElementData").MaxLength)}},Counter:function(d){SN.C.I.FormNoticeCurrent=d;var b=jQuery.data(d[0],"ElementData").MaxLength;if(b<=0){return}var c=b-SN.U.CharacterCount(d);var a=d.find(".count");if(c.toString()!=a.text()){if(!SN.C.I.CounterBlackout||c===0){if(a.text()!=String(c)){a.text(c)}if(c<0){d.addClass(SN.C.S.Warning)}else{d.removeClass(SN.C.S.Warning)}if(!SN.C.I.CounterBlackout){SN.C.I.CounterBlackout=true;SN.C.I.FormNoticeCurrent=d;window.setTimeout("SN.U.ClearCounterBlackout(SN.C.I.FormNoticeCurrent);",500)}}}},CharacterCount:function(a){return a.find(".notice_data-text:first").val().length},ClearCounterBlackout:function(a){SN.C.I.CounterBlackout=false;SN.U.Counter(a)},RewriteAjaxAction:function(a){if(document.location.protocol=="https:"&&a.substr(0,5)=="http:"){return a.replace(/^http:\/\/[^:\/]+/,"https://"+document.location.host)}else{return a}},FormXHR:function(a){$.ajax({type:"POST",dataType:"xml",url:SN.U.RewriteAjaxAction(a.attr("action")),data:a.serialize()+"&ajax=1",beforeSend:function(b){a.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(c,d,b){alert(b||d)},success:function(b,c){if(typeof($("form",b)[0])!="undefined"){form_new=document._importNode($("form",b)[0],true);a.replaceWith(form_new)}else{a.replaceWith(document._importNode($("p",b)[0],true))}}})},FormNoticeXHR:function(b){SN.C.I.NoticeDataGeo={};b.append('<input type="hidden" name="ajax" value="1"/>');b.attr("action",SN.U.RewriteAjaxAction(b.attr("action")));var c=function(d,e){b.append($('<p class="form_response"></p>').addClass(d).text(e))};var a=function(){b.find(".form_response").remove()};b.ajaxForm({dataType:"xml",timeout:"60000",beforeSend:function(d){if(b.find(".notice_data-text:first").val()==""){b.addClass(SN.C.S.Warning);return false}b.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled);SN.U.normalizeGeoData(b);return true},error:function(f,g,e){b.removeClass(SN.C.S.Processing).find(".submit").removeClass(SN.C.S.Disabled).removeAttr(SN.C.S.Disabled,SN.C.S.Disabled);a();if(g=="timeout"){c("error","Sorry! We had trouble sending your notice. The servers are overloaded. Please try again, and contact the site administrator if this problem persists.")}else{var d=SN.U.GetResponseXML(f);if($("."+SN.C.S.Error,d).length>0){b.append(document._importNode($("."+SN.C.S.Error,d)[0],true))}else{if(parseInt(f.status)===0||jQuery.inArray(parseInt(f.status),SN.C.I.HTTP20x30x)>=0){b.resetForm().find(".attach-status").remove();SN.U.FormNoticeEnhancements(b)}else{c("error","(Sorry! We had trouble sending your notice ("+f.status+" "+f.statusText+"). Please report the problem to the site administrator if this happens again.")}}}},success:function(i,f){a();var n=$("#"+SN.C.S.Error,i);if(n.length>0){c("error",n.text())}else{if($("body")[0].id=="bookmarklet"){self.close()}var d=$("#"+SN.C.S.CommandResult,i);if(d.length>0){c("success",d.text())}else{var m=document._importNode($("li",i)[0],true);var k=$("#notices_primary .notices:first");var l=b.closest("li.notice-reply");if(l.length>0){var e=$(m).attr("id");if($("#"+e).length==0){var j=l.closest("li.notice");l.replaceWith(m);SN.U.NoticeInlineReplyPlaceholder(j)}else{l.remove()}}else{if(k.length>0&&SN.U.belongsOnTimeline(m)){if($("#"+m.id).length===0){var h=b.find("[name=inreplyto]").val();var g="#notices_primary #notice-"+h;if($("body")[0].id=="conversation"){if(h.length>0&&$(g+" .notices").length<1){$(g).append('<ul class="notices"></ul>')}$($(g+" .notices")[0]).append(m)}else{k.prepend(m)}$("#"+m.id).css({display:"none"}).fadeIn(2500);SN.U.NoticeWithAttachment($("#"+m.id));SN.U.NoticeReplyTo($("#"+m.id))}}else{c("success",$("title",i).text())}}}b.resetForm();b.find("[name=inreplyto]").val("");b.find(".attach-status").remove();SN.U.FormNoticeEnhancements(b)}},complete:function(d,e){b.removeClass(SN.C.S.Processing).find(".submit").removeAttr(SN.C.S.Disabled).removeClass(SN.C.S.Disabled);b.find("[name=lat]").val(SN.C.I.NoticeDataGeo.NLat);b.find("[name=lon]").val(SN.C.I.NoticeDataGeo.NLon);b.find("[name=location_ns]").val(SN.C.I.NoticeDataGeo.NLNS);b.find("[name=location_id]").val(SN.C.I.NoticeDataGeo.NLID);b.find("[name=notice_data-geo]").attr("checked",SN.C.I.NoticeDataGeo.NDG)}})},normalizeGeoData:function(a){SN.C.I.NoticeDataGeo.NLat=a.find("[name=lat]").val();SN.C.I.NoticeDataGeo.NLon=a.find("[name=lon]").val();SN.C.I.NoticeDataGeo.NLNS=a.find("[name=location_ns]").val();SN.C.I.NoticeDataGeo.NLID=a.find("[name=location_id]").val();SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked");var b=$.cookie(SN.C.S.NoticeDataGeoCookie);if(b!==null&&b!="disabled"){b=JSON.parse(b);SN.C.I.NoticeDataGeo.NLat=a.find("[name=lat]").val(b.NLat).val();SN.C.I.NoticeDataGeo.NLon=a.find("[name=lon]").val(b.NLon).val();if(b.NLNS){SN.C.I.NoticeDataGeo.NLNS=a.find("[name=location_ns]").val(b.NLNS).val();SN.C.I.NoticeDataGeo.NLID=a.find("[name=location_id]").val(b.NLID).val()}else{a.find("[name=location_ns]").val("");a.find("[name=location_id]").val("")}}if(b=="disabled"){SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked",false).attr("checked")}else{SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked",true).attr("checked")}},GetResponseXML:function(b){try{return b.responseXML}catch(a){return(new DOMParser()).parseFromString(b.responseText,"text/xml")}},NoticeReply:function(){if($("#content .notice_reply").length>0){$("#content .notice").each(function(){SN.U.NoticeReplyTo($(this))})}},NoticeReplyTo:function(a){a.find(".notice_reply").live("click",function(c){c.preventDefault();var b=($(".author .nickname",a).length>0)?$($(".author .nickname",a)[0]):$(".author .nickname.uid");SN.U.NoticeInlineReplyTrigger(a,"@"+b.text());return false})},NoticeInlineReplyTrigger:function(h,i){var b=$($(".notice_id",h)[0]).text();var e=h;var f=h.closest(".notices");if(f.hasClass("threaded-replies")){e=f.closest(".notice")}else{f=$("ul.threaded-replies",h);if(f.length==0){f=$('<ul class="notices threaded-replies xoxo"></ul>');h.append(f)}}var j=$(".notice-reply-form",f);var d=function(){j.find("input[name=inreplyto]").val(b);var m=j.find("textarea");if(m.length==0){throw"No textarea"}var l="";if(i){l=i+" "}m.val(l+m.val().replace(RegExp(l,"i"),""));m.data("initialText",$.trim(i+""));m.focus();if(m[0].setSelectionRange){var k=m.val().length;m[0].setSelectionRange(k,k)}};if(j.length>0){d()}else{f.find("li.notice-reply-placeholder").remove();var g=$("li.notice-reply",f);if(g.length==0){g=$('<li class="notice-reply"></li>');var c=function(k){var l=document._importNode(k,true);g.append(l);f.append(g);var m=j=$(l);SN.Init.NoticeFormSetup(m);d()};if(SN.C.I.NoticeFormMaster){c(SN.C.I.NoticeFormMaster)}else{var a=$("#form_notice").attr("action");$.get(a,{ajax:1},function(k,m,l){c($("form",k)[0])})}}}},NoticeInlineReplyPlaceholder:function(b){var a=b.find("ul.threaded-replies");var c=$('<li class="notice-reply-placeholder"><input class="placeholder"></li>');c.find("input").val(SN.msg("reply_placeholder")).focus(function(){SN.U.NoticeInlineReplyTrigger(b);return false});a.append(c)},NoticeInlineReplySetup:function(){$(".threaded-replies").each(function(){var b=$(this);var a=b.closest(".notice");SN.U.NoticeInlineReplyPlaceholder(a)})},NoticeRepeat:function(){$(".form_repeat").live("click",function(a){a.preventDefault();SN.U.NoticeRepeatConfirmation($(this));return false})},NoticeRepeatConfirmation:function(a){var c=a.find(".submit");var b=c.clone();b.addClass("submit_dialogbox").removeClass("submit");a.append(b);b.bind("click",function(){SN.U.FormXHR(a);return false});c.hide();a.addClass("dialogbox").append('<button class="close">&#215;</button>').closest(".notice-options").addClass("opaque");a.find("button.close").click(function(){$(this).remove();a.removeClass("dialogbox").closest(".notice-options").removeClass("opaque");a.find(".submit_dialogbox").remove();a.find(".submit").show();return false})},NoticeAttachments:function(){$(".notice a.attachment").each(function(){SN.U.NoticeWithAttachment($(this).closest(".notice"))})},NoticeWithAttachment:function(b){if(b.find(".attachment").length===0){return}var a=b.find(".attachment.more");if(a.length>0){$(a[0]).click(function(){var c=$(this);c.addClass(SN.C.S.Processing);$.get(c.attr("href")+"/ajax",null,function(d){c.parent(".entry-content").html($(d).find("#attachment_view .entry-content").html())});return false}).attr("title",SN.msg("showmore_tooltip"))}},NoticeDataAttach:function(b){var a=b.find("input[type=file]");a.change(function(f){b.find(".attach-status").remove();var d=$(this).val();if(!d){return false}var c=$('<div class="attach-status '+SN.C.S.Success+'"><code></code> <button class="close">&#215;</button></div>');c.find("code").text(d);c.find("button").click(function(){c.remove();a.val("");return false});b.append(c);if(typeof this.files=="object"){for(var e=0;e<this.files.length;e++){SN.U.PreviewAttach(b,this.files[e])}}})},maxFileSize:function(b){var a=$(b).find("input[name=MAX_FILE_SIZE]").attr("value");if(a){return parseInt(a)}else{return 0}},PreviewAttach:function(d,c){var e=c.type+" "+Math.round(c.size/1024)+"KB";var f=true;var h;if(typeof window.createObjectURL!="undefined"){h=function(i,j){j(window.createObjectURL(i))}}else{if(typeof window.FileReader!="undefined"){h=function(j,k){var i=new FileReader();i.onload=function(l){k(i.result)};i.readAsDataURL(j)}}else{f=false}}var a=["image/png","image/jpeg","image/gif","image/svg+xml"];if($.inArray(c.type,a)==-1){f=false}var g=8*1024*1024;if(c.size>g){f=false}if(f){h(c,function(j){var i=$("<img>").attr("title",e).attr("alt",e).attr("src",j).attr("style","height: 120px");d.find(".attach-status").append(i)})}else{var b=$("<div></div>").text(e);d.find(".attach-status").append(b)}},NoticeLocationAttach:function(a){var e=a.find("[name=lat]");var k=a.find("[name=lon]");var g=a.find("[name=location_ns]").val();var l=a.find("[name=location_id]").val();var b="";var d=a.find("[name=notice_data-geo]");var c=a.find("[name=notice_data-geo]");var j=a.find("label.notice_data-geo");function f(n){j.attr("title",jQuery.trim(j.text())).removeClass("checked");a.find("[name=lat]").val("");a.find("[name=lon]").val("");a.find("[name=location_ns]").val("");a.find("[name=location_id]").val("");a.find("[name=notice_data-geo]").attr("checked",false);$.cookie(SN.C.S.NoticeDataGeoCookie,"disabled",{path:"/"});if(n){a.find(".geo_status_wrapper").removeClass("success").addClass("error");a.find(".geo_status_wrapper .geo_status").text(n)}else{a.find(".geo_status_wrapper").remove()}}function m(n,o){SN.U.NoticeGeoStatus(a,"Looking up place name...");$.getJSON(n,o,function(p){var q,r;if(typeof(p.location_ns)!="undefined"){a.find("[name=location_ns]").val(p.location_ns);q=p.location_ns}if(typeof(p.location_id)!="undefined"){a.find("[name=location_id]").val(p.location_id);r=p.location_id}if(typeof(p.name)=="undefined"){NLN_text=o.lat+";"+o.lon}else{NLN_text=p.name}SN.U.NoticeGeoStatus(a,NLN_text,o.lat,o.lon,p.url);j.attr("title",NoticeDataGeo_text.ShareDisable+" ("+NLN_text+")");a.find("[name=lat]").val(o.lat);a.find("[name=lon]").val(o.lon);a.find("[name=location_ns]").val(q);a.find("[name=location_id]").val(r);a.find("[name=notice_data-geo]").attr("checked",true);var s={NLat:o.lat,NLon:o.lon,NLNS:q,NLID:r,NLN:NLN_text,NLNU:p.url,NDG:true};$.cookie(SN.C.S.NoticeDataGeoCookie,JSON.stringify(s),{path:"/"})})}if(c.length>0){if($.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){c.attr("checked",false)}else{c.attr("checked",true)}var h=a.find(".notice_data-geo_wrap");var i=h.attr("title");h.removeAttr("title");j.attr("title",j.text());c.change(function(){if(c.attr("checked")===true||$.cookie(SN.C.S.NoticeDataGeoCookie)===null){j.attr("title",NoticeDataGeo_text.ShareDisable).addClass("checked");if($.cookie(SN.C.S.NoticeDataGeoCookie)===null||$.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){if(navigator.geolocation){SN.U.NoticeGeoStatus(a,"Requesting location from browser...");navigator.geolocation.getCurrentPosition(function(p){a.find("[name=lat]").val(p.coords.latitude);a.find("[name=lon]").val(p.coords.longitude);var q={lat:p.coords.latitude,lon:p.coords.longitude,token:$("#token").val()};m(i,q)},function(p){switch(p.code){case p.PERMISSION_DENIED:f("Location permission denied.");break;case p.TIMEOUT:f("Location lookup timeout.");break}},{timeout:10000})}else{if(e.length>0&&k.length>0){var n={lat:e,lon:k,token:$("#token").val()};m(i,n)}else{f();c.remove();j.remove()}}}else{var o=JSON.parse($.cookie(SN.C.S.NoticeDataGeoCookie));a.find("[name=lat]").val(o.NLat);a.find("[name=lon]").val(o.NLon);a.find("[name=location_ns]").val(o.NLNS);a.find("[name=location_id]").val(o.NLID);a.find("[name=notice_data-geo]").attr("checked",o.NDG);SN.U.NoticeGeoStatus(a,o.NLN,o.NLat,o.NLon,o.NLNU);j.attr("title",NoticeDataGeo_text.ShareDisable+" ("+o.NLN+")").addClass("checked")}}else{f()}}).change()}},NoticeGeoStatus:function(e,a,f,g,c){var h=e.find(".geo_status_wrapper");if(h.length==0){h=$('<div class="'+SN.C.S.Success+' geo_status_wrapper"><button class="close" style="float:right">&#215;</button><div class="geo_status"></div></div>');h.find("button.close").click(function(){e.find("[name=notice_data-geo]").removeAttr("checked").change()});e.append(h)}var b;if(c){b=$("<a></a>").attr("href",c)}else{b=$("<span></span>")}b.text(a);if(f||g){var d=f+";"+g;b.attr("title",d);if(!a){b.text(d)}}h.find(".geo_status").empty().append(b)},NewDirectMessage:function(){NDM=$(".entity_send-a-message a");NDM.attr({href:NDM.attr("href")+"&ajax=1"});NDM.bind("click",function(){var a=$(".entity_send-a-message form");if(a.length===0){$(this).addClass(SN.C.S.Processing);$.get(NDM.attr("href"),null,function(b){$(".entity_send-a-message").append(document._importNode($("form",b)[0],true));a=$(".entity_send-a-message .form_notice");SN.U.FormNoticeXHR(a);SN.U.FormNoticeEnhancements(a);a.append('<button class="close">&#215;</button>');$(".entity_send-a-message button").click(function(){a.hide();return false});NDM.removeClass(SN.C.S.Processing)})}else{a.show();$(".entity_send-a-message textarea").focus()}return false})},GetFullYear:function(c,d,a){var b=new Date();b.setFullYear(c,d,a);return b},StatusNetInstance:{Set:function(b){var a=SN.U.StatusNetInstance.Get();if(a!==null){b=$.extend(a,b)}$.cookie(SN.C.S.StatusNetInstance,JSON.stringify(b),{path:"/",expires:SN.U.GetFullYear(2029,0,1)})},Get:function(){var a=$.cookie(SN.C.S.StatusNetInstance);if(a!==null){return JSON.parse(a)}return null},Delete:function(){$.cookie(SN.C.S.StatusNetInstance,null)}},belongsOnTimeline:function(b){var a=$("body").attr("id");if(a=="public"){return true}var c=$("#nav_profile a").attr("href");if(c){var d=$(b).find(".vcard.author a.url").attr("href");if(d==c){if(a=="all"||a=="showstream"){return true}}}return false},switchInputFormTab:function(a){$(".input_form_nav_tab.current").removeClass("current");$("#input_form_nav_"+a).addClass("current");$(".input_form.current").removeClass("current");$("#input_form_"+a).addClass("current")}},Init:{NoticeForm:function(){if($("body.user_in").length>0){$(".ajax-notice").each(function(){var a=$(this);SN.Init.NoticeFormSetup(a)});$("body").bind("click",function(c){var a=$("li.notice-reply");if(a.length>0){var b=$(c.target);a.each(function(){var g=$(this);if(g.has(c.target).length==0){var e=g.find(".notice_data-text:first");var f=$.trim(e.val());if(f==""||f==e.data("initialText")){var d=g.closest("li.notice");g.remove();SN.U.NoticeInlineReplyPlaceholder(d)}}})}})}},NoticeFormSetup:function(a){SN.U.NoticeLocationAttach(a);SN.U.FormNoticeXHR(a);SN.U.FormNoticeEnhancements(a);SN.U.NoticeDataAttach(a)},Notices:function(){if($("body.user_in").length>0){var a=$(".form_notice:first");if(a.length>0){SN.C.I.NoticeFormMaster=document._importNode(a[0],true)}SN.U.NoticeRepeat();SN.U.NoticeReply();SN.U.NoticeInlineReplySetup()}SN.U.NoticeAttachments()},EntityActions:function(){if($("body.user_in").length>0){SN.U.NewDirectMessage()}},Login:function(){if(SN.U.StatusNetInstance.Get()!==null){var a=SN.U.StatusNetInstance.Get().Nickname;if(a!==null){$("#form_login #nickname").val(a)}}$("#form_login").bind("submit",function(){SN.U.StatusNetInstance.Set({Nickname:$("#form_login #nickname").val()});return true})},AjaxForms:function(){$("form.ajax").live("submit",function(){SN.U.FormXHR($(this));return false})},UploadForms:function(){$("input[type=file]").change(function(d){if(typeof this.files=="object"&&this.files.length>0){var c=0;for(var b=0;b<this.files.length;b++){c+=this.files[b].size}var a=SN.U.maxFileSize($(this.form));if(a>0&&c>a){var e="File too large: maximum upload size is %d bytes.";alert(e.replace("%d",a));$(this).val("");d.preventDefault();return false}}})}}};$(document).ready(function(){SN.Init.AjaxForms();SN.Init.UploadForms();if($("."+SN.C.S.FormNotice).length>0){SN.Init.NoticeForm()}if($("#content .notices").length>0){SN.Init.Notices()}if($("#content .entity_actions").length>0){SN.Init.EntityActions()}if($("#form_login").length>0){SN.Init.Login()}});if(!document.ELEMENT_NODE){document.ELEMENT_NODE=1;document.ATTRIBUTE_NODE=2;document.TEXT_NODE=3;document.CDATA_SECTION_NODE=4;document.ENTITY_REFERENCE_NODE=5;document.ENTITY_NODE=6;document.PROCESSING_INSTRUCTION_NODE=7;document.COMMENT_NODE=8;document.DOCUMENT_NODE=9;document.DOCUMENT_TYPE_NODE=10;document.DOCUMENT_FRAGMENT_NODE=11;document.NOTATION_NODE=12}document._importNode=function(e,a){switch(e.nodeType){case document.ELEMENT_NODE:var d=document.createElement(e.nodeName);if(e.attributes&&e.attributes.length>0){for(var c=0,b=e.attributes.length;c<b;){if(e.attributes[c].nodeName=="class"){d.className=e.getAttribute(e.attributes[c++].nodeName)}else{d.setAttribute(e.attributes[c].nodeName,e.getAttribute(e.attributes[c++].nodeName))}}}if(a&&e.childNodes&&e.childNodes.length>0){for(var c=0,b=e.childNodes.length;c<b;){d.appendChild(document._importNode(e.childNodes[c++],a))}}return d;break;case document.TEXT_NODE:case document.CDATA_SECTION_NODE:case document.COMMENT_NODE:return document.createTextNode(e.nodeValue);break}};if(typeof navigator.geolocation=="undefined"||navigator.geolocation.shim){(function(){(function(){if(window.google&&google.gears){return}var c=null;if(typeof GearsFactory!="undefined"){c=new GearsFactory()}else{try{c=new ActiveXObject("Gears.Factory");if(c.getBuildInfo().indexOf("ie_mobile")!=-1){c.privateSetGlobalObject(this)}}catch(d){if((typeof navigator.mimeTypes!="undefined")&&navigator.mimeTypes["application/x-googlegears"]){c=document.createElement("object");c.style.display="none";c.width=0;c.height=0;c.type="application/x-googlegears";document.documentElement.appendChild(c)}}}if(!c){return}if(!window.google){google={}}if(!google.gears){google.gears={factory:c}}})();var a=(function(){var d=google.gears.factory.create("beta.geolocation");var c=function(f,e){return function(g){f(g);e.lastPosition=g}};return{shim:true,type:"Gears",lastPosition:null,getCurrentPosition:function(e,g,h){var f=this;var i=c(e,f);d.getCurrentPosition(i,g,h)},watchPosition:function(e,f,g){d.watchPosition(e,f,g)},clearWatch:function(e){d.clearWatch(e)},getPermission:function(g,e,f){d.getPermission(g,e,f)}}});var b=(function(){var i=false;var e=function(){if(!d()&&!i){i=true;var j=document.createElement("script");j.src=(document.location.protocol=="https:"?"https://":"http://")+"www.google.com/jsapi?callback=_google_loader_apiLoaded";j.type="text/javascript";document.getElementsByTagName("body")[0].appendChild(j)}};var c=[];var h=function(j){c.push(j)};var f=function(){if(d()){while(c.length>0){var j=c.pop();j()}}};window._google_loader_apiLoaded=function(){f()};var d=function(){return(window.google&&google.loader)};var g=function(j){if(d()){return true}h(j);e();return false};e();return{shim:true,type:"ClientLocation",lastPosition:null,getCurrentPosition:function(k,n,o){var m=this;if(!g(function(){m.getCurrentPosition(k,n,o)})){return}if(google.loader.ClientLocation){var l=google.loader.ClientLocation;var j={coords:{latitude:l.latitude,longitude:l.longitude,altitude:null,accuracy:43000,altitudeAccuracy:null,heading:null,speed:null},address:{city:l.address.city,country:l.address.country,country_code:l.address.country_code,region:l.address.region},timestamp:new Date()};k(j);this.lastPosition=j}else{if(n==="function"){n({code:3,message:"Using the Google ClientLocation API and it is not able to calculate a location."})}}},watchPosition:function(j,l,m){this.getCurrentPosition(j,l,m);var k=this;var n=setInterval(function(){k.getCurrentPosition(j,l,m)},10000);return n},clearWatch:function(j){clearInterval(j)},getPermission:function(l,j,k){return true}}});navigator.geolocation=(window.google&&google.gears)?a():b()})()};
\ No newline at end of file
+var SN={C:{I:{CounterBlackout:false,MaxLength:140,PatternUsername:/^[0-9a-zA-Z\-_.]*$/,HTTP20x30x:[200,201,202,203,204,205,206,300,301,302,303,304,305,306,307],NoticeFormMaster:null},S:{Disabled:"disabled",Warning:"warning",Error:"error",Success:"success",Processing:"processing",CommandResult:"command_result",FormNotice:"form_notice",NoticeDataGeo:"notice_data-geo",NoticeDataGeoCookie:"NoticeDataGeo",NoticeDataGeoSelected:"notice_data-geo_selected",StatusNetInstance:"StatusNetInstance"}},messages:{},msg:function(a){if(typeof SN.messages[a]=="undefined"){return"["+a+"]"}else{return SN.messages[a]}},U:{FormNoticeEnhancements:function(b){if(jQuery.data(b[0],"ElementData")===undefined){MaxLength=b.find(".count").text();if(typeof(MaxLength)=="undefined"){MaxLength=SN.C.I.MaxLength}jQuery.data(b[0],"ElementData",{MaxLength:MaxLength});SN.U.Counter(b);NDT=b.find(".notice_data-text:first");NDT.bind("keyup",function(c){SN.U.Counter(b)});var a=function(c){window.setTimeout(function(){SN.U.Counter(b)},50)};NDT.bind("cut",a).bind("paste",a)}else{b.find(".count").text(jQuery.data(b[0],"ElementData").MaxLength)}},Counter:function(d){SN.C.I.FormNoticeCurrent=d;var b=jQuery.data(d[0],"ElementData").MaxLength;if(b<=0){return}var c=b-SN.U.CharacterCount(d);var a=d.find(".count");if(c.toString()!=a.text()){if(!SN.C.I.CounterBlackout||c===0){if(a.text()!=String(c)){a.text(c)}if(c<0){d.addClass(SN.C.S.Warning)}else{d.removeClass(SN.C.S.Warning)}if(!SN.C.I.CounterBlackout){SN.C.I.CounterBlackout=true;SN.C.I.FormNoticeCurrent=d;window.setTimeout("SN.U.ClearCounterBlackout(SN.C.I.FormNoticeCurrent);",500)}}}},CharacterCount:function(a){return a.find(".notice_data-text:first").val().length},ClearCounterBlackout:function(a){SN.C.I.CounterBlackout=false;SN.U.Counter(a)},RewriteAjaxAction:function(a){if(document.location.protocol=="https:"&&a.substr(0,5)=="http:"){return a.replace(/^http:\/\/[^:\/]+/,"https://"+document.location.host)}else{return a}},FormXHR:function(a){$.ajax({type:"POST",dataType:"xml",url:SN.U.RewriteAjaxAction(a.attr("action")),data:a.serialize()+"&ajax=1",beforeSend:function(b){a.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(c,d,b){alert(b||d)},success:function(b,c){if(typeof($("form",b)[0])!="undefined"){form_new=document._importNode($("form",b)[0],true);a.replaceWith(form_new)}else{a.replaceWith(document._importNode($("p",b)[0],true))}}})},FormNoticeXHR:function(b){SN.C.I.NoticeDataGeo={};b.append('<input type="hidden" name="ajax" value="1"/>');b.attr("action",SN.U.RewriteAjaxAction(b.attr("action")));var c=function(d,e){b.append($('<p class="form_response"></p>').addClass(d).text(e))};var a=function(){b.find(".form_response").remove()};b.ajaxForm({dataType:"xml",timeout:"60000",beforeSend:function(d){if(b.find(".notice_data-text:first").val()==""){b.addClass(SN.C.S.Warning);return false}b.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled);SN.U.normalizeGeoData(b);return true},error:function(f,g,e){b.removeClass(SN.C.S.Processing).find(".submit").removeClass(SN.C.S.Disabled).removeAttr(SN.C.S.Disabled,SN.C.S.Disabled);a();if(g=="timeout"){c("error","Sorry! We had trouble sending your notice. The servers are overloaded. Please try again, and contact the site administrator if this problem persists.")}else{var d=SN.U.GetResponseXML(f);if($("."+SN.C.S.Error,d).length>0){b.append(document._importNode($("."+SN.C.S.Error,d)[0],true))}else{if(parseInt(f.status)===0||jQuery.inArray(parseInt(f.status),SN.C.I.HTTP20x30x)>=0){b.resetForm().find(".attach-status").remove();SN.U.FormNoticeEnhancements(b)}else{c("error","(Sorry! We had trouble sending your notice ("+f.status+" "+f.statusText+"). Please report the problem to the site administrator if this happens again.")}}}},success:function(i,f){a();var n=$("#"+SN.C.S.Error,i);if(n.length>0){c("error",n.text())}else{if($("body")[0].id=="bookmarklet"){self.close()}var d=$("#"+SN.C.S.CommandResult,i);if(d.length>0){c("success",d.text())}else{var m=document._importNode($("li",i)[0],true);var k=$("#notices_primary .notices:first");var l=b.closest("li.notice-reply");if(l.length>0){var e=$(m).attr("id");if($("#"+e).length==0){var j=l.closest("li.notice");l.replaceWith(m);SN.U.NoticeInlineReplyPlaceholder(j)}else{l.remove()}}else{if(k.length>0&&SN.U.belongsOnTimeline(m)){if($("#"+m.id).length===0){var h=b.find("[name=inreplyto]").val();var g="#notices_primary #notice-"+h;if($("body")[0].id=="conversation"){if(h.length>0&&$(g+" .notices").length<1){$(g).append('<ul class="notices"></ul>')}$($(g+" .notices")[0]).append(m)}else{k.prepend(m)}$("#"+m.id).css({display:"none"}).fadeIn(2500);SN.U.NoticeWithAttachment($("#"+m.id));SN.U.NoticeReplyTo($("#"+m.id))}}else{c("success",$("title",i).text())}}}b.resetForm();b.find("[name=inreplyto]").val("");b.find(".attach-status").remove();SN.U.FormNoticeEnhancements(b)}},complete:function(d,e){b.removeClass(SN.C.S.Processing).find(".submit").removeAttr(SN.C.S.Disabled).removeClass(SN.C.S.Disabled);b.find("[name=lat]").val(SN.C.I.NoticeDataGeo.NLat);b.find("[name=lon]").val(SN.C.I.NoticeDataGeo.NLon);b.find("[name=location_ns]").val(SN.C.I.NoticeDataGeo.NLNS);b.find("[name=location_id]").val(SN.C.I.NoticeDataGeo.NLID);b.find("[name=notice_data-geo]").attr("checked",SN.C.I.NoticeDataGeo.NDG)}})},normalizeGeoData:function(a){SN.C.I.NoticeDataGeo.NLat=a.find("[name=lat]").val();SN.C.I.NoticeDataGeo.NLon=a.find("[name=lon]").val();SN.C.I.NoticeDataGeo.NLNS=a.find("[name=location_ns]").val();SN.C.I.NoticeDataGeo.NLID=a.find("[name=location_id]").val();SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked");var b=$.cookie(SN.C.S.NoticeDataGeoCookie);if(b!==null&&b!="disabled"){b=JSON.parse(b);SN.C.I.NoticeDataGeo.NLat=a.find("[name=lat]").val(b.NLat).val();SN.C.I.NoticeDataGeo.NLon=a.find("[name=lon]").val(b.NLon).val();if(b.NLNS){SN.C.I.NoticeDataGeo.NLNS=a.find("[name=location_ns]").val(b.NLNS).val();SN.C.I.NoticeDataGeo.NLID=a.find("[name=location_id]").val(b.NLID).val()}else{a.find("[name=location_ns]").val("");a.find("[name=location_id]").val("")}}if(b=="disabled"){SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked",false).attr("checked")}else{SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked",true).attr("checked")}},GetResponseXML:function(b){try{return b.responseXML}catch(a){return(new DOMParser()).parseFromString(b.responseText,"text/xml")}},NoticeReply:function(){if($("#content .notice_reply").length>0){$("#content .notice").each(function(){SN.U.NoticeReplyTo($(this))})}},NoticeReplyTo:function(a){a.find(".notice_reply").live("click",function(c){c.preventDefault();var b=($(".author .nickname",a).length>0)?$($(".author .nickname",a)[0]):$(".author .nickname.uid");SN.U.NoticeInlineReplyTrigger(a,"@"+b.text());return false})},NoticeInlineReplyTrigger:function(h,i){var b=$($(".notice_id",h)[0]).text();var e=h;var f=h.closest(".notices");if(f.hasClass("threaded-replies")){e=f.closest(".notice")}else{f=$("ul.threaded-replies",h);if(f.length==0){f=$('<ul class="notices threaded-replies xoxo"></ul>');h.append(f)}}var j=$(".notice-reply-form",f);var d=function(){j.find("input[name=inreplyto]").val(b);var m=j.find("textarea");if(m.length==0){throw"No textarea"}var l="";if(i){l=i+" "}m.val(l+m.val().replace(RegExp(l,"i"),""));m.data("initialText",$.trim(i+""));m.focus();if(m[0].setSelectionRange){var k=m.val().length;m[0].setSelectionRange(k,k)}};if(j.length>0){d()}else{f.find("li.notice-reply-placeholder").remove();var g=$("li.notice-reply",f);if(g.length==0){g=$('<li class="notice-reply"></li>');var c=function(k){var l=document._importNode(k,true);g.append(l);f.append(g);var m=j=$(l);SN.Init.NoticeFormSetup(m);d()};if(SN.C.I.NoticeFormMaster){c(SN.C.I.NoticeFormMaster)}else{var a=$("#form_notice").attr("action");$.get(a,{ajax:1},function(k,m,l){c($("form",k)[0])})}}}},NoticeInlineReplyPlaceholder:function(b){var a=b.find("ul.threaded-replies");var c=$('<li class="notice-reply-placeholder"><input class="placeholder"></li>');c.find("input").val(SN.msg("reply_placeholder")).focus(function(){SN.U.NoticeInlineReplyTrigger(b);return false});a.append(c)},NoticeInlineReplySetup:function(){$(".threaded-replies").each(function(){var b=$(this);var a=b.closest(".notice");SN.U.NoticeInlineReplyPlaceholder(a)})},NoticeRepeat:function(){$(".form_repeat").live("click",function(a){a.preventDefault();SN.U.NoticeRepeatConfirmation($(this));return false})},NoticeRepeatConfirmation:function(a){var c=a.find(".submit");var b=c.clone();b.addClass("submit_dialogbox").removeClass("submit");a.append(b);b.bind("click",function(){SN.U.FormXHR(a);return false});c.hide();a.addClass("dialogbox").append('<button class="close">&#215;</button>').closest(".notice-options").addClass("opaque");a.find("button.close").click(function(){$(this).remove();a.removeClass("dialogbox").closest(".notice-options").removeClass("opaque");a.find(".submit_dialogbox").remove();a.find(".submit").show();return false})},NoticeAttachments:function(){$(".notice a.attachment").each(function(){SN.U.NoticeWithAttachment($(this).closest(".notice"))})},NoticeWithAttachment:function(b){if(b.find(".attachment").length===0){return}var a=b.find(".attachment.more");if(a.length>0){$(a[0]).click(function(){var c=$(this);c.addClass(SN.C.S.Processing);$.get(c.attr("href")+"/ajax",null,function(d){c.parent(".entry-content").html($(d).find("#attachment_view .entry-content").html())});return false}).attr("title",SN.msg("showmore_tooltip"))}},NoticeDataAttach:function(b){var a=b.find("input[type=file]");a.change(function(f){b.find(".attach-status").remove();var d=$(this).val();if(!d){return false}var c=$('<div class="attach-status '+SN.C.S.Success+'"><code></code> <button class="close">&#215;</button></div>');c.find("code").text(d);c.find("button").click(function(){c.remove();a.val("");return false});b.append(c);if(typeof this.files=="object"){for(var e=0;e<this.files.length;e++){SN.U.PreviewAttach(b,this.files[e])}}})},maxFileSize:function(b){var a=$(b).find("input[name=MAX_FILE_SIZE]").attr("value");if(a){return parseInt(a)}else{return 0}},PreviewAttach:function(d,c){var e=c.type+" "+Math.round(c.size/1024)+"KB";var f=true;var h;if(typeof window.createObjectURL!="undefined"){h=function(i,j){j(window.createObjectURL(i))}}else{if(typeof window.FileReader!="undefined"){h=function(j,k){var i=new FileReader();i.onload=function(l){k(i.result)};i.readAsDataURL(j)}}else{f=false}}var a=["image/png","image/jpeg","image/gif","image/svg+xml"];if($.inArray(c.type,a)==-1){f=false}var g=8*1024*1024;if(c.size>g){f=false}if(f){h(c,function(j){var i=$("<img>").attr("title",e).attr("alt",e).attr("src",j).attr("style","height: 120px");d.find(".attach-status").append(i)})}else{var b=$("<div></div>").text(e);d.find(".attach-status").append(b)}},NoticeLocationAttach:function(a){var e=a.find("[name=lat]");var k=a.find("[name=lon]");var g=a.find("[name=location_ns]").val();var l=a.find("[name=location_id]").val();var b="";var d=a.find("[name=notice_data-geo]");var c=a.find("[name=notice_data-geo]");var j=a.find("label.notice_data-geo");function f(n){j.attr("title",jQuery.trim(j.text())).removeClass("checked");a.find("[name=lat]").val("");a.find("[name=lon]").val("");a.find("[name=location_ns]").val("");a.find("[name=location_id]").val("");a.find("[name=notice_data-geo]").attr("checked",false);$.cookie(SN.C.S.NoticeDataGeoCookie,"disabled",{path:"/"});if(n){a.find(".geo_status_wrapper").removeClass("success").addClass("error");a.find(".geo_status_wrapper .geo_status").text(n)}else{a.find(".geo_status_wrapper").remove()}}function m(n,o){SN.U.NoticeGeoStatus(a,"Looking up place name...");$.getJSON(n,o,function(p){var q,r;if(typeof(p.location_ns)!="undefined"){a.find("[name=location_ns]").val(p.location_ns);q=p.location_ns}if(typeof(p.location_id)!="undefined"){a.find("[name=location_id]").val(p.location_id);r=p.location_id}if(typeof(p.name)=="undefined"){NLN_text=o.lat+";"+o.lon}else{NLN_text=p.name}SN.U.NoticeGeoStatus(a,NLN_text,o.lat,o.lon,p.url);j.attr("title",NoticeDataGeo_text.ShareDisable+" ("+NLN_text+")");a.find("[name=lat]").val(o.lat);a.find("[name=lon]").val(o.lon);a.find("[name=location_ns]").val(q);a.find("[name=location_id]").val(r);a.find("[name=notice_data-geo]").attr("checked",true);var s={NLat:o.lat,NLon:o.lon,NLNS:q,NLID:r,NLN:NLN_text,NLNU:p.url,NDG:true};$.cookie(SN.C.S.NoticeDataGeoCookie,JSON.stringify(s),{path:"/"})})}if(c.length>0){if($.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){c.attr("checked",false)}else{c.attr("checked",true)}var h=a.find(".notice_data-geo_wrap");var i=h.attr("title");h.removeAttr("title");j.attr("title",j.text());c.change(function(){if(c.attr("checked")===true||$.cookie(SN.C.S.NoticeDataGeoCookie)===null){j.attr("title",NoticeDataGeo_text.ShareDisable).addClass("checked");if($.cookie(SN.C.S.NoticeDataGeoCookie)===null||$.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){if(navigator.geolocation){SN.U.NoticeGeoStatus(a,"Requesting location from browser...");navigator.geolocation.getCurrentPosition(function(p){a.find("[name=lat]").val(p.coords.latitude);a.find("[name=lon]").val(p.coords.longitude);var q={lat:p.coords.latitude,lon:p.coords.longitude,token:$("#token").val()};m(i,q)},function(p){switch(p.code){case p.PERMISSION_DENIED:f("Location permission denied.");break;case p.TIMEOUT:f("Location lookup timeout.");break}},{timeout:10000})}else{if(e.length>0&&k.length>0){var n={lat:e,lon:k,token:$("#token").val()};m(i,n)}else{f();c.remove();j.remove()}}}else{var o=JSON.parse($.cookie(SN.C.S.NoticeDataGeoCookie));a.find("[name=lat]").val(o.NLat);a.find("[name=lon]").val(o.NLon);a.find("[name=location_ns]").val(o.NLNS);a.find("[name=location_id]").val(o.NLID);a.find("[name=notice_data-geo]").attr("checked",o.NDG);SN.U.NoticeGeoStatus(a,o.NLN,o.NLat,o.NLon,o.NLNU);j.attr("title",NoticeDataGeo_text.ShareDisable+" ("+o.NLN+")").addClass("checked")}}else{f()}}).change()}},NoticeGeoStatus:function(e,a,f,g,c){var h=e.find(".geo_status_wrapper");if(h.length==0){h=$('<div class="'+SN.C.S.Success+' geo_status_wrapper"><button class="close" style="float:right">&#215;</button><div class="geo_status"></div></div>');h.find("button.close").click(function(){e.find("[name=notice_data-geo]").removeAttr("checked").change();return false});e.append(h)}var b;if(c){b=$("<a></a>").attr("href",c)}else{b=$("<span></span>")}b.text(a);if(f||g){var d=f+";"+g;b.attr("title",d);if(!a){b.text(d)}}h.find(".geo_status").empty().append(b)},NewDirectMessage:function(){NDM=$(".entity_send-a-message a");NDM.attr({href:NDM.attr("href")+"&ajax=1"});NDM.bind("click",function(){var a=$(".entity_send-a-message form");if(a.length===0){$(this).addClass(SN.C.S.Processing);$.get(NDM.attr("href"),null,function(b){$(".entity_send-a-message").append(document._importNode($("form",b)[0],true));a=$(".entity_send-a-message .form_notice");SN.U.FormNoticeXHR(a);SN.U.FormNoticeEnhancements(a);a.append('<button class="close">&#215;</button>');$(".entity_send-a-message button").click(function(){a.hide();return false});NDM.removeClass(SN.C.S.Processing)})}else{a.show();$(".entity_send-a-message textarea").focus()}return false})},GetFullYear:function(c,d,a){var b=new Date();b.setFullYear(c,d,a);return b},StatusNetInstance:{Set:function(b){var a=SN.U.StatusNetInstance.Get();if(a!==null){b=$.extend(a,b)}$.cookie(SN.C.S.StatusNetInstance,JSON.stringify(b),{path:"/",expires:SN.U.GetFullYear(2029,0,1)})},Get:function(){var a=$.cookie(SN.C.S.StatusNetInstance);if(a!==null){return JSON.parse(a)}return null},Delete:function(){$.cookie(SN.C.S.StatusNetInstance,null)}},belongsOnTimeline:function(b){var a=$("body").attr("id");if(a=="public"){return true}var c=$("#nav_profile a").attr("href");if(c){var d=$(b).find(".vcard.author a.url").attr("href");if(d==c){if(a=="all"||a=="showstream"){return true}}}return false},switchInputFormTab:function(a){$(".input_form_nav_tab.current").removeClass("current");$("#input_form_nav_"+a).addClass("current");$(".input_form.current").removeClass("current");$("#input_form_"+a).addClass("current")}},Init:{NoticeForm:function(){if($("body.user_in").length>0){$(".ajax-notice").each(function(){var a=$(this);SN.Init.NoticeFormSetup(a)});$("body").bind("click",function(c){var a=$("li.notice-reply");if(a.length>0){var b=$(c.target);a.each(function(){var g=$(this);if(g.has(c.target).length==0){var e=g.find(".notice_data-text:first");var f=$.trim(e.val());if(f==""||f==e.data("initialText")){var d=g.closest("li.notice");g.remove();SN.U.NoticeInlineReplyPlaceholder(d)}}})}})}},NoticeFormSetup:function(a){SN.U.NoticeLocationAttach(a);SN.U.FormNoticeXHR(a);SN.U.FormNoticeEnhancements(a);SN.U.NoticeDataAttach(a)},Notices:function(){if($("body.user_in").length>0){var a=$(".form_notice:first");if(a.length>0){SN.C.I.NoticeFormMaster=document._importNode(a[0],true)}SN.U.NoticeRepeat();SN.U.NoticeReply();SN.U.NoticeInlineReplySetup()}SN.U.NoticeAttachments()},EntityActions:function(){if($("body.user_in").length>0){SN.U.NewDirectMessage()}},Login:function(){if(SN.U.StatusNetInstance.Get()!==null){var a=SN.U.StatusNetInstance.Get().Nickname;if(a!==null){$("#form_login #nickname").val(a)}}$("#form_login").bind("submit",function(){SN.U.StatusNetInstance.Set({Nickname:$("#form_login #nickname").val()});return true})},AjaxForms:function(){$("form.ajax").live("submit",function(){SN.U.FormXHR($(this));return false})},UploadForms:function(){$("input[type=file]").change(function(d){if(typeof this.files=="object"&&this.files.length>0){var c=0;for(var b=0;b<this.files.length;b++){c+=this.files[b].size}var a=SN.U.maxFileSize($(this.form));if(a>0&&c>a){var e="File too large: maximum upload size is %d bytes.";alert(e.replace("%d",a));$(this).val("");d.preventDefault();return false}}})}}};$(document).ready(function(){SN.Init.AjaxForms();SN.Init.UploadForms();if($("."+SN.C.S.FormNotice).length>0){SN.Init.NoticeForm()}if($("#content .notices").length>0){SN.Init.Notices()}if($("#content .entity_actions").length>0){SN.Init.EntityActions()}if($("#form_login").length>0){SN.Init.Login()}});if(!document.ELEMENT_NODE){document.ELEMENT_NODE=1;document.ATTRIBUTE_NODE=2;document.TEXT_NODE=3;document.CDATA_SECTION_NODE=4;document.ENTITY_REFERENCE_NODE=5;document.ENTITY_NODE=6;document.PROCESSING_INSTRUCTION_NODE=7;document.COMMENT_NODE=8;document.DOCUMENT_NODE=9;document.DOCUMENT_TYPE_NODE=10;document.DOCUMENT_FRAGMENT_NODE=11;document.NOTATION_NODE=12}document._importNode=function(e,a){switch(e.nodeType){case document.ELEMENT_NODE:var d=document.createElement(e.nodeName);if(e.attributes&&e.attributes.length>0){for(var c=0,b=e.attributes.length;c<b;){if(e.attributes[c].nodeName=="class"){d.className=e.getAttribute(e.attributes[c++].nodeName)}else{d.setAttribute(e.attributes[c].nodeName,e.getAttribute(e.attributes[c++].nodeName))}}}if(a&&e.childNodes&&e.childNodes.length>0){for(var c=0,b=e.childNodes.length;c<b;){d.appendChild(document._importNode(e.childNodes[c++],a))}}return d;break;case document.TEXT_NODE:case document.CDATA_SECTION_NODE:case document.COMMENT_NODE:return document.createTextNode(e.nodeValue);break}};if(typeof navigator.geolocation=="undefined"||navigator.geolocation.shim){(function(){(function(){if(window.google&&google.gears){return}var c=null;if(typeof GearsFactory!="undefined"){c=new GearsFactory()}else{try{c=new ActiveXObject("Gears.Factory");if(c.getBuildInfo().indexOf("ie_mobile")!=-1){c.privateSetGlobalObject(this)}}catch(d){if((typeof navigator.mimeTypes!="undefined")&&navigator.mimeTypes["application/x-googlegears"]){c=document.createElement("object");c.style.display="none";c.width=0;c.height=0;c.type="application/x-googlegears";document.documentElement.appendChild(c)}}}if(!c){return}if(!window.google){google={}}if(!google.gears){google.gears={factory:c}}})();var a=(function(){var d=google.gears.factory.create("beta.geolocation");var c=function(f,e){return function(g){f(g);e.lastPosition=g}};return{shim:true,type:"Gears",lastPosition:null,getCurrentPosition:function(e,g,h){var f=this;var i=c(e,f);d.getCurrentPosition(i,g,h)},watchPosition:function(e,f,g){d.watchPosition(e,f,g)},clearWatch:function(e){d.clearWatch(e)},getPermission:function(g,e,f){d.getPermission(g,e,f)}}});var b=(function(){var i=false;var e=function(){if(!d()&&!i){i=true;var j=document.createElement("script");j.src=(document.location.protocol=="https:"?"https://":"http://")+"www.google.com/jsapi?callback=_google_loader_apiLoaded";j.type="text/javascript";document.getElementsByTagName("body")[0].appendChild(j)}};var c=[];var h=function(j){c.push(j)};var f=function(){if(d()){while(c.length>0){var j=c.pop();j()}}};window._google_loader_apiLoaded=function(){f()};var d=function(){return(window.google&&google.loader)};var g=function(j){if(d()){return true}h(j);e();return false};e();return{shim:true,type:"ClientLocation",lastPosition:null,getCurrentPosition:function(k,n,o){var m=this;if(!g(function(){m.getCurrentPosition(k,n,o)})){return}if(google.loader.ClientLocation){var l=google.loader.ClientLocation;var j={coords:{latitude:l.latitude,longitude:l.longitude,altitude:null,accuracy:43000,altitudeAccuracy:null,heading:null,speed:null},address:{city:l.address.city,country:l.address.country,country_code:l.address.country_code,region:l.address.region},timestamp:new Date()};k(j);this.lastPosition=j}else{if(n==="function"){n({code:3,message:"Using the Google ClientLocation API and it is not able to calculate a location."})}}},watchPosition:function(j,l,m){this.getCurrentPosition(j,l,m);var k=this;var n=setInterval(function(){k.getCurrentPosition(j,l,m)},10000);return n},clearWatch:function(j){clearInterval(j)},getPermission:function(l,j,k){return true}}});navigator.geolocation=(window.google&&google.gears)?a():b()})()};
\ No newline at end of file

From 874804a0c4c7deb89ca9292a12f684ed9cda388a Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Thu, 10 Mar 2011 16:49:24 -0800
Subject: [PATCH 518/655] use a data attribute instead of 'title' for geo
 lookup api; fixes failure of cloned forms to work

---
 js/util.js         | 3 +--
 js/util.min.js     | 2 +-
 lib/noticeform.php | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/js/util.js b/js/util.js
index ad8ac8b53c..c690153abb 100644
--- a/js/util.js
+++ b/js/util.js
@@ -1017,8 +1017,7 @@ var SN = { // StatusNet
                 }
 
                 var NGW = form.find('.notice_data-geo_wrap');
-                var geocodeURL = NGW.attr('title');
-                NGW.removeAttr('title');
+                var geocodeURL = NGW.attr('data-api');
 
                 label
                     .attr('title', label.text());
diff --git a/js/util.min.js b/js/util.min.js
index dd9e4b1e37..9e3f15e9f0 100644
--- a/js/util.min.js
+++ b/js/util.min.js
@@ -1 +1 @@
-var SN={C:{I:{CounterBlackout:false,MaxLength:140,PatternUsername:/^[0-9a-zA-Z\-_.]*$/,HTTP20x30x:[200,201,202,203,204,205,206,300,301,302,303,304,305,306,307],NoticeFormMaster:null},S:{Disabled:"disabled",Warning:"warning",Error:"error",Success:"success",Processing:"processing",CommandResult:"command_result",FormNotice:"form_notice",NoticeDataGeo:"notice_data-geo",NoticeDataGeoCookie:"NoticeDataGeo",NoticeDataGeoSelected:"notice_data-geo_selected",StatusNetInstance:"StatusNetInstance"}},messages:{},msg:function(a){if(typeof SN.messages[a]=="undefined"){return"["+a+"]"}else{return SN.messages[a]}},U:{FormNoticeEnhancements:function(b){if(jQuery.data(b[0],"ElementData")===undefined){MaxLength=b.find(".count").text();if(typeof(MaxLength)=="undefined"){MaxLength=SN.C.I.MaxLength}jQuery.data(b[0],"ElementData",{MaxLength:MaxLength});SN.U.Counter(b);NDT=b.find(".notice_data-text:first");NDT.bind("keyup",function(c){SN.U.Counter(b)});var a=function(c){window.setTimeout(function(){SN.U.Counter(b)},50)};NDT.bind("cut",a).bind("paste",a)}else{b.find(".count").text(jQuery.data(b[0],"ElementData").MaxLength)}},Counter:function(d){SN.C.I.FormNoticeCurrent=d;var b=jQuery.data(d[0],"ElementData").MaxLength;if(b<=0){return}var c=b-SN.U.CharacterCount(d);var a=d.find(".count");if(c.toString()!=a.text()){if(!SN.C.I.CounterBlackout||c===0){if(a.text()!=String(c)){a.text(c)}if(c<0){d.addClass(SN.C.S.Warning)}else{d.removeClass(SN.C.S.Warning)}if(!SN.C.I.CounterBlackout){SN.C.I.CounterBlackout=true;SN.C.I.FormNoticeCurrent=d;window.setTimeout("SN.U.ClearCounterBlackout(SN.C.I.FormNoticeCurrent);",500)}}}},CharacterCount:function(a){return a.find(".notice_data-text:first").val().length},ClearCounterBlackout:function(a){SN.C.I.CounterBlackout=false;SN.U.Counter(a)},RewriteAjaxAction:function(a){if(document.location.protocol=="https:"&&a.substr(0,5)=="http:"){return a.replace(/^http:\/\/[^:\/]+/,"https://"+document.location.host)}else{return a}},FormXHR:function(a){$.ajax({type:"POST",dataType:"xml",url:SN.U.RewriteAjaxAction(a.attr("action")),data:a.serialize()+"&ajax=1",beforeSend:function(b){a.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(c,d,b){alert(b||d)},success:function(b,c){if(typeof($("form",b)[0])!="undefined"){form_new=document._importNode($("form",b)[0],true);a.replaceWith(form_new)}else{a.replaceWith(document._importNode($("p",b)[0],true))}}})},FormNoticeXHR:function(b){SN.C.I.NoticeDataGeo={};b.append('<input type="hidden" name="ajax" value="1"/>');b.attr("action",SN.U.RewriteAjaxAction(b.attr("action")));var c=function(d,e){b.append($('<p class="form_response"></p>').addClass(d).text(e))};var a=function(){b.find(".form_response").remove()};b.ajaxForm({dataType:"xml",timeout:"60000",beforeSend:function(d){if(b.find(".notice_data-text:first").val()==""){b.addClass(SN.C.S.Warning);return false}b.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled);SN.U.normalizeGeoData(b);return true},error:function(f,g,e){b.removeClass(SN.C.S.Processing).find(".submit").removeClass(SN.C.S.Disabled).removeAttr(SN.C.S.Disabled,SN.C.S.Disabled);a();if(g=="timeout"){c("error","Sorry! We had trouble sending your notice. The servers are overloaded. Please try again, and contact the site administrator if this problem persists.")}else{var d=SN.U.GetResponseXML(f);if($("."+SN.C.S.Error,d).length>0){b.append(document._importNode($("."+SN.C.S.Error,d)[0],true))}else{if(parseInt(f.status)===0||jQuery.inArray(parseInt(f.status),SN.C.I.HTTP20x30x)>=0){b.resetForm().find(".attach-status").remove();SN.U.FormNoticeEnhancements(b)}else{c("error","(Sorry! We had trouble sending your notice ("+f.status+" "+f.statusText+"). Please report the problem to the site administrator if this happens again.")}}}},success:function(i,f){a();var n=$("#"+SN.C.S.Error,i);if(n.length>0){c("error",n.text())}else{if($("body")[0].id=="bookmarklet"){self.close()}var d=$("#"+SN.C.S.CommandResult,i);if(d.length>0){c("success",d.text())}else{var m=document._importNode($("li",i)[0],true);var k=$("#notices_primary .notices:first");var l=b.closest("li.notice-reply");if(l.length>0){var e=$(m).attr("id");if($("#"+e).length==0){var j=l.closest("li.notice");l.replaceWith(m);SN.U.NoticeInlineReplyPlaceholder(j)}else{l.remove()}}else{if(k.length>0&&SN.U.belongsOnTimeline(m)){if($("#"+m.id).length===0){var h=b.find("[name=inreplyto]").val();var g="#notices_primary #notice-"+h;if($("body")[0].id=="conversation"){if(h.length>0&&$(g+" .notices").length<1){$(g).append('<ul class="notices"></ul>')}$($(g+" .notices")[0]).append(m)}else{k.prepend(m)}$("#"+m.id).css({display:"none"}).fadeIn(2500);SN.U.NoticeWithAttachment($("#"+m.id));SN.U.NoticeReplyTo($("#"+m.id))}}else{c("success",$("title",i).text())}}}b.resetForm();b.find("[name=inreplyto]").val("");b.find(".attach-status").remove();SN.U.FormNoticeEnhancements(b)}},complete:function(d,e){b.removeClass(SN.C.S.Processing).find(".submit").removeAttr(SN.C.S.Disabled).removeClass(SN.C.S.Disabled);b.find("[name=lat]").val(SN.C.I.NoticeDataGeo.NLat);b.find("[name=lon]").val(SN.C.I.NoticeDataGeo.NLon);b.find("[name=location_ns]").val(SN.C.I.NoticeDataGeo.NLNS);b.find("[name=location_id]").val(SN.C.I.NoticeDataGeo.NLID);b.find("[name=notice_data-geo]").attr("checked",SN.C.I.NoticeDataGeo.NDG)}})},normalizeGeoData:function(a){SN.C.I.NoticeDataGeo.NLat=a.find("[name=lat]").val();SN.C.I.NoticeDataGeo.NLon=a.find("[name=lon]").val();SN.C.I.NoticeDataGeo.NLNS=a.find("[name=location_ns]").val();SN.C.I.NoticeDataGeo.NLID=a.find("[name=location_id]").val();SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked");var b=$.cookie(SN.C.S.NoticeDataGeoCookie);if(b!==null&&b!="disabled"){b=JSON.parse(b);SN.C.I.NoticeDataGeo.NLat=a.find("[name=lat]").val(b.NLat).val();SN.C.I.NoticeDataGeo.NLon=a.find("[name=lon]").val(b.NLon).val();if(b.NLNS){SN.C.I.NoticeDataGeo.NLNS=a.find("[name=location_ns]").val(b.NLNS).val();SN.C.I.NoticeDataGeo.NLID=a.find("[name=location_id]").val(b.NLID).val()}else{a.find("[name=location_ns]").val("");a.find("[name=location_id]").val("")}}if(b=="disabled"){SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked",false).attr("checked")}else{SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked",true).attr("checked")}},GetResponseXML:function(b){try{return b.responseXML}catch(a){return(new DOMParser()).parseFromString(b.responseText,"text/xml")}},NoticeReply:function(){if($("#content .notice_reply").length>0){$("#content .notice").each(function(){SN.U.NoticeReplyTo($(this))})}},NoticeReplyTo:function(a){a.find(".notice_reply").live("click",function(c){c.preventDefault();var b=($(".author .nickname",a).length>0)?$($(".author .nickname",a)[0]):$(".author .nickname.uid");SN.U.NoticeInlineReplyTrigger(a,"@"+b.text());return false})},NoticeInlineReplyTrigger:function(h,i){var b=$($(".notice_id",h)[0]).text();var e=h;var f=h.closest(".notices");if(f.hasClass("threaded-replies")){e=f.closest(".notice")}else{f=$("ul.threaded-replies",h);if(f.length==0){f=$('<ul class="notices threaded-replies xoxo"></ul>');h.append(f)}}var j=$(".notice-reply-form",f);var d=function(){j.find("input[name=inreplyto]").val(b);var m=j.find("textarea");if(m.length==0){throw"No textarea"}var l="";if(i){l=i+" "}m.val(l+m.val().replace(RegExp(l,"i"),""));m.data("initialText",$.trim(i+""));m.focus();if(m[0].setSelectionRange){var k=m.val().length;m[0].setSelectionRange(k,k)}};if(j.length>0){d()}else{f.find("li.notice-reply-placeholder").remove();var g=$("li.notice-reply",f);if(g.length==0){g=$('<li class="notice-reply"></li>');var c=function(k){var l=document._importNode(k,true);g.append(l);f.append(g);var m=j=$(l);SN.Init.NoticeFormSetup(m);d()};if(SN.C.I.NoticeFormMaster){c(SN.C.I.NoticeFormMaster)}else{var a=$("#form_notice").attr("action");$.get(a,{ajax:1},function(k,m,l){c($("form",k)[0])})}}}},NoticeInlineReplyPlaceholder:function(b){var a=b.find("ul.threaded-replies");var c=$('<li class="notice-reply-placeholder"><input class="placeholder"></li>');c.find("input").val(SN.msg("reply_placeholder")).focus(function(){SN.U.NoticeInlineReplyTrigger(b);return false});a.append(c)},NoticeInlineReplySetup:function(){$(".threaded-replies").each(function(){var b=$(this);var a=b.closest(".notice");SN.U.NoticeInlineReplyPlaceholder(a)})},NoticeRepeat:function(){$(".form_repeat").live("click",function(a){a.preventDefault();SN.U.NoticeRepeatConfirmation($(this));return false})},NoticeRepeatConfirmation:function(a){var c=a.find(".submit");var b=c.clone();b.addClass("submit_dialogbox").removeClass("submit");a.append(b);b.bind("click",function(){SN.U.FormXHR(a);return false});c.hide();a.addClass("dialogbox").append('<button class="close">&#215;</button>').closest(".notice-options").addClass("opaque");a.find("button.close").click(function(){$(this).remove();a.removeClass("dialogbox").closest(".notice-options").removeClass("opaque");a.find(".submit_dialogbox").remove();a.find(".submit").show();return false})},NoticeAttachments:function(){$(".notice a.attachment").each(function(){SN.U.NoticeWithAttachment($(this).closest(".notice"))})},NoticeWithAttachment:function(b){if(b.find(".attachment").length===0){return}var a=b.find(".attachment.more");if(a.length>0){$(a[0]).click(function(){var c=$(this);c.addClass(SN.C.S.Processing);$.get(c.attr("href")+"/ajax",null,function(d){c.parent(".entry-content").html($(d).find("#attachment_view .entry-content").html())});return false}).attr("title",SN.msg("showmore_tooltip"))}},NoticeDataAttach:function(b){var a=b.find("input[type=file]");a.change(function(f){b.find(".attach-status").remove();var d=$(this).val();if(!d){return false}var c=$('<div class="attach-status '+SN.C.S.Success+'"><code></code> <button class="close">&#215;</button></div>');c.find("code").text(d);c.find("button").click(function(){c.remove();a.val("");return false});b.append(c);if(typeof this.files=="object"){for(var e=0;e<this.files.length;e++){SN.U.PreviewAttach(b,this.files[e])}}})},maxFileSize:function(b){var a=$(b).find("input[name=MAX_FILE_SIZE]").attr("value");if(a){return parseInt(a)}else{return 0}},PreviewAttach:function(d,c){var e=c.type+" "+Math.round(c.size/1024)+"KB";var f=true;var h;if(typeof window.createObjectURL!="undefined"){h=function(i,j){j(window.createObjectURL(i))}}else{if(typeof window.FileReader!="undefined"){h=function(j,k){var i=new FileReader();i.onload=function(l){k(i.result)};i.readAsDataURL(j)}}else{f=false}}var a=["image/png","image/jpeg","image/gif","image/svg+xml"];if($.inArray(c.type,a)==-1){f=false}var g=8*1024*1024;if(c.size>g){f=false}if(f){h(c,function(j){var i=$("<img>").attr("title",e).attr("alt",e).attr("src",j).attr("style","height: 120px");d.find(".attach-status").append(i)})}else{var b=$("<div></div>").text(e);d.find(".attach-status").append(b)}},NoticeLocationAttach:function(a){var e=a.find("[name=lat]");var k=a.find("[name=lon]");var g=a.find("[name=location_ns]").val();var l=a.find("[name=location_id]").val();var b="";var d=a.find("[name=notice_data-geo]");var c=a.find("[name=notice_data-geo]");var j=a.find("label.notice_data-geo");function f(n){j.attr("title",jQuery.trim(j.text())).removeClass("checked");a.find("[name=lat]").val("");a.find("[name=lon]").val("");a.find("[name=location_ns]").val("");a.find("[name=location_id]").val("");a.find("[name=notice_data-geo]").attr("checked",false);$.cookie(SN.C.S.NoticeDataGeoCookie,"disabled",{path:"/"});if(n){a.find(".geo_status_wrapper").removeClass("success").addClass("error");a.find(".geo_status_wrapper .geo_status").text(n)}else{a.find(".geo_status_wrapper").remove()}}function m(n,o){SN.U.NoticeGeoStatus(a,"Looking up place name...");$.getJSON(n,o,function(p){var q,r;if(typeof(p.location_ns)!="undefined"){a.find("[name=location_ns]").val(p.location_ns);q=p.location_ns}if(typeof(p.location_id)!="undefined"){a.find("[name=location_id]").val(p.location_id);r=p.location_id}if(typeof(p.name)=="undefined"){NLN_text=o.lat+";"+o.lon}else{NLN_text=p.name}SN.U.NoticeGeoStatus(a,NLN_text,o.lat,o.lon,p.url);j.attr("title",NoticeDataGeo_text.ShareDisable+" ("+NLN_text+")");a.find("[name=lat]").val(o.lat);a.find("[name=lon]").val(o.lon);a.find("[name=location_ns]").val(q);a.find("[name=location_id]").val(r);a.find("[name=notice_data-geo]").attr("checked",true);var s={NLat:o.lat,NLon:o.lon,NLNS:q,NLID:r,NLN:NLN_text,NLNU:p.url,NDG:true};$.cookie(SN.C.S.NoticeDataGeoCookie,JSON.stringify(s),{path:"/"})})}if(c.length>0){if($.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){c.attr("checked",false)}else{c.attr("checked",true)}var h=a.find(".notice_data-geo_wrap");var i=h.attr("title");h.removeAttr("title");j.attr("title",j.text());c.change(function(){if(c.attr("checked")===true||$.cookie(SN.C.S.NoticeDataGeoCookie)===null){j.attr("title",NoticeDataGeo_text.ShareDisable).addClass("checked");if($.cookie(SN.C.S.NoticeDataGeoCookie)===null||$.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){if(navigator.geolocation){SN.U.NoticeGeoStatus(a,"Requesting location from browser...");navigator.geolocation.getCurrentPosition(function(p){a.find("[name=lat]").val(p.coords.latitude);a.find("[name=lon]").val(p.coords.longitude);var q={lat:p.coords.latitude,lon:p.coords.longitude,token:$("#token").val()};m(i,q)},function(p){switch(p.code){case p.PERMISSION_DENIED:f("Location permission denied.");break;case p.TIMEOUT:f("Location lookup timeout.");break}},{timeout:10000})}else{if(e.length>0&&k.length>0){var n={lat:e,lon:k,token:$("#token").val()};m(i,n)}else{f();c.remove();j.remove()}}}else{var o=JSON.parse($.cookie(SN.C.S.NoticeDataGeoCookie));a.find("[name=lat]").val(o.NLat);a.find("[name=lon]").val(o.NLon);a.find("[name=location_ns]").val(o.NLNS);a.find("[name=location_id]").val(o.NLID);a.find("[name=notice_data-geo]").attr("checked",o.NDG);SN.U.NoticeGeoStatus(a,o.NLN,o.NLat,o.NLon,o.NLNU);j.attr("title",NoticeDataGeo_text.ShareDisable+" ("+o.NLN+")").addClass("checked")}}else{f()}}).change()}},NoticeGeoStatus:function(e,a,f,g,c){var h=e.find(".geo_status_wrapper");if(h.length==0){h=$('<div class="'+SN.C.S.Success+' geo_status_wrapper"><button class="close" style="float:right">&#215;</button><div class="geo_status"></div></div>');h.find("button.close").click(function(){e.find("[name=notice_data-geo]").removeAttr("checked").change();return false});e.append(h)}var b;if(c){b=$("<a></a>").attr("href",c)}else{b=$("<span></span>")}b.text(a);if(f||g){var d=f+";"+g;b.attr("title",d);if(!a){b.text(d)}}h.find(".geo_status").empty().append(b)},NewDirectMessage:function(){NDM=$(".entity_send-a-message a");NDM.attr({href:NDM.attr("href")+"&ajax=1"});NDM.bind("click",function(){var a=$(".entity_send-a-message form");if(a.length===0){$(this).addClass(SN.C.S.Processing);$.get(NDM.attr("href"),null,function(b){$(".entity_send-a-message").append(document._importNode($("form",b)[0],true));a=$(".entity_send-a-message .form_notice");SN.U.FormNoticeXHR(a);SN.U.FormNoticeEnhancements(a);a.append('<button class="close">&#215;</button>');$(".entity_send-a-message button").click(function(){a.hide();return false});NDM.removeClass(SN.C.S.Processing)})}else{a.show();$(".entity_send-a-message textarea").focus()}return false})},GetFullYear:function(c,d,a){var b=new Date();b.setFullYear(c,d,a);return b},StatusNetInstance:{Set:function(b){var a=SN.U.StatusNetInstance.Get();if(a!==null){b=$.extend(a,b)}$.cookie(SN.C.S.StatusNetInstance,JSON.stringify(b),{path:"/",expires:SN.U.GetFullYear(2029,0,1)})},Get:function(){var a=$.cookie(SN.C.S.StatusNetInstance);if(a!==null){return JSON.parse(a)}return null},Delete:function(){$.cookie(SN.C.S.StatusNetInstance,null)}},belongsOnTimeline:function(b){var a=$("body").attr("id");if(a=="public"){return true}var c=$("#nav_profile a").attr("href");if(c){var d=$(b).find(".vcard.author a.url").attr("href");if(d==c){if(a=="all"||a=="showstream"){return true}}}return false},switchInputFormTab:function(a){$(".input_form_nav_tab.current").removeClass("current");$("#input_form_nav_"+a).addClass("current");$(".input_form.current").removeClass("current");$("#input_form_"+a).addClass("current")}},Init:{NoticeForm:function(){if($("body.user_in").length>0){$(".ajax-notice").each(function(){var a=$(this);SN.Init.NoticeFormSetup(a)});$("body").bind("click",function(c){var a=$("li.notice-reply");if(a.length>0){var b=$(c.target);a.each(function(){var g=$(this);if(g.has(c.target).length==0){var e=g.find(".notice_data-text:first");var f=$.trim(e.val());if(f==""||f==e.data("initialText")){var d=g.closest("li.notice");g.remove();SN.U.NoticeInlineReplyPlaceholder(d)}}})}})}},NoticeFormSetup:function(a){SN.U.NoticeLocationAttach(a);SN.U.FormNoticeXHR(a);SN.U.FormNoticeEnhancements(a);SN.U.NoticeDataAttach(a)},Notices:function(){if($("body.user_in").length>0){var a=$(".form_notice:first");if(a.length>0){SN.C.I.NoticeFormMaster=document._importNode(a[0],true)}SN.U.NoticeRepeat();SN.U.NoticeReply();SN.U.NoticeInlineReplySetup()}SN.U.NoticeAttachments()},EntityActions:function(){if($("body.user_in").length>0){SN.U.NewDirectMessage()}},Login:function(){if(SN.U.StatusNetInstance.Get()!==null){var a=SN.U.StatusNetInstance.Get().Nickname;if(a!==null){$("#form_login #nickname").val(a)}}$("#form_login").bind("submit",function(){SN.U.StatusNetInstance.Set({Nickname:$("#form_login #nickname").val()});return true})},AjaxForms:function(){$("form.ajax").live("submit",function(){SN.U.FormXHR($(this));return false})},UploadForms:function(){$("input[type=file]").change(function(d){if(typeof this.files=="object"&&this.files.length>0){var c=0;for(var b=0;b<this.files.length;b++){c+=this.files[b].size}var a=SN.U.maxFileSize($(this.form));if(a>0&&c>a){var e="File too large: maximum upload size is %d bytes.";alert(e.replace("%d",a));$(this).val("");d.preventDefault();return false}}})}}};$(document).ready(function(){SN.Init.AjaxForms();SN.Init.UploadForms();if($("."+SN.C.S.FormNotice).length>0){SN.Init.NoticeForm()}if($("#content .notices").length>0){SN.Init.Notices()}if($("#content .entity_actions").length>0){SN.Init.EntityActions()}if($("#form_login").length>0){SN.Init.Login()}});if(!document.ELEMENT_NODE){document.ELEMENT_NODE=1;document.ATTRIBUTE_NODE=2;document.TEXT_NODE=3;document.CDATA_SECTION_NODE=4;document.ENTITY_REFERENCE_NODE=5;document.ENTITY_NODE=6;document.PROCESSING_INSTRUCTION_NODE=7;document.COMMENT_NODE=8;document.DOCUMENT_NODE=9;document.DOCUMENT_TYPE_NODE=10;document.DOCUMENT_FRAGMENT_NODE=11;document.NOTATION_NODE=12}document._importNode=function(e,a){switch(e.nodeType){case document.ELEMENT_NODE:var d=document.createElement(e.nodeName);if(e.attributes&&e.attributes.length>0){for(var c=0,b=e.attributes.length;c<b;){if(e.attributes[c].nodeName=="class"){d.className=e.getAttribute(e.attributes[c++].nodeName)}else{d.setAttribute(e.attributes[c].nodeName,e.getAttribute(e.attributes[c++].nodeName))}}}if(a&&e.childNodes&&e.childNodes.length>0){for(var c=0,b=e.childNodes.length;c<b;){d.appendChild(document._importNode(e.childNodes[c++],a))}}return d;break;case document.TEXT_NODE:case document.CDATA_SECTION_NODE:case document.COMMENT_NODE:return document.createTextNode(e.nodeValue);break}};if(typeof navigator.geolocation=="undefined"||navigator.geolocation.shim){(function(){(function(){if(window.google&&google.gears){return}var c=null;if(typeof GearsFactory!="undefined"){c=new GearsFactory()}else{try{c=new ActiveXObject("Gears.Factory");if(c.getBuildInfo().indexOf("ie_mobile")!=-1){c.privateSetGlobalObject(this)}}catch(d){if((typeof navigator.mimeTypes!="undefined")&&navigator.mimeTypes["application/x-googlegears"]){c=document.createElement("object");c.style.display="none";c.width=0;c.height=0;c.type="application/x-googlegears";document.documentElement.appendChild(c)}}}if(!c){return}if(!window.google){google={}}if(!google.gears){google.gears={factory:c}}})();var a=(function(){var d=google.gears.factory.create("beta.geolocation");var c=function(f,e){return function(g){f(g);e.lastPosition=g}};return{shim:true,type:"Gears",lastPosition:null,getCurrentPosition:function(e,g,h){var f=this;var i=c(e,f);d.getCurrentPosition(i,g,h)},watchPosition:function(e,f,g){d.watchPosition(e,f,g)},clearWatch:function(e){d.clearWatch(e)},getPermission:function(g,e,f){d.getPermission(g,e,f)}}});var b=(function(){var i=false;var e=function(){if(!d()&&!i){i=true;var j=document.createElement("script");j.src=(document.location.protocol=="https:"?"https://":"http://")+"www.google.com/jsapi?callback=_google_loader_apiLoaded";j.type="text/javascript";document.getElementsByTagName("body")[0].appendChild(j)}};var c=[];var h=function(j){c.push(j)};var f=function(){if(d()){while(c.length>0){var j=c.pop();j()}}};window._google_loader_apiLoaded=function(){f()};var d=function(){return(window.google&&google.loader)};var g=function(j){if(d()){return true}h(j);e();return false};e();return{shim:true,type:"ClientLocation",lastPosition:null,getCurrentPosition:function(k,n,o){var m=this;if(!g(function(){m.getCurrentPosition(k,n,o)})){return}if(google.loader.ClientLocation){var l=google.loader.ClientLocation;var j={coords:{latitude:l.latitude,longitude:l.longitude,altitude:null,accuracy:43000,altitudeAccuracy:null,heading:null,speed:null},address:{city:l.address.city,country:l.address.country,country_code:l.address.country_code,region:l.address.region},timestamp:new Date()};k(j);this.lastPosition=j}else{if(n==="function"){n({code:3,message:"Using the Google ClientLocation API and it is not able to calculate a location."})}}},watchPosition:function(j,l,m){this.getCurrentPosition(j,l,m);var k=this;var n=setInterval(function(){k.getCurrentPosition(j,l,m)},10000);return n},clearWatch:function(j){clearInterval(j)},getPermission:function(l,j,k){return true}}});navigator.geolocation=(window.google&&google.gears)?a():b()})()};
\ No newline at end of file
+var SN={C:{I:{CounterBlackout:false,MaxLength:140,PatternUsername:/^[0-9a-zA-Z\-_.]*$/,HTTP20x30x:[200,201,202,203,204,205,206,300,301,302,303,304,305,306,307],NoticeFormMaster:null},S:{Disabled:"disabled",Warning:"warning",Error:"error",Success:"success",Processing:"processing",CommandResult:"command_result",FormNotice:"form_notice",NoticeDataGeo:"notice_data-geo",NoticeDataGeoCookie:"NoticeDataGeo",NoticeDataGeoSelected:"notice_data-geo_selected",StatusNetInstance:"StatusNetInstance"}},messages:{},msg:function(a){if(typeof SN.messages[a]=="undefined"){return"["+a+"]"}else{return SN.messages[a]}},U:{FormNoticeEnhancements:function(b){if(jQuery.data(b[0],"ElementData")===undefined){MaxLength=b.find(".count").text();if(typeof(MaxLength)=="undefined"){MaxLength=SN.C.I.MaxLength}jQuery.data(b[0],"ElementData",{MaxLength:MaxLength});SN.U.Counter(b);NDT=b.find(".notice_data-text:first");NDT.bind("keyup",function(c){SN.U.Counter(b)});var a=function(c){window.setTimeout(function(){SN.U.Counter(b)},50)};NDT.bind("cut",a).bind("paste",a)}else{b.find(".count").text(jQuery.data(b[0],"ElementData").MaxLength)}},Counter:function(d){SN.C.I.FormNoticeCurrent=d;var b=jQuery.data(d[0],"ElementData").MaxLength;if(b<=0){return}var c=b-SN.U.CharacterCount(d);var a=d.find(".count");if(c.toString()!=a.text()){if(!SN.C.I.CounterBlackout||c===0){if(a.text()!=String(c)){a.text(c)}if(c<0){d.addClass(SN.C.S.Warning)}else{d.removeClass(SN.C.S.Warning)}if(!SN.C.I.CounterBlackout){SN.C.I.CounterBlackout=true;SN.C.I.FormNoticeCurrent=d;window.setTimeout("SN.U.ClearCounterBlackout(SN.C.I.FormNoticeCurrent);",500)}}}},CharacterCount:function(a){return a.find(".notice_data-text:first").val().length},ClearCounterBlackout:function(a){SN.C.I.CounterBlackout=false;SN.U.Counter(a)},RewriteAjaxAction:function(a){if(document.location.protocol=="https:"&&a.substr(0,5)=="http:"){return a.replace(/^http:\/\/[^:\/]+/,"https://"+document.location.host)}else{return a}},FormXHR:function(a){$.ajax({type:"POST",dataType:"xml",url:SN.U.RewriteAjaxAction(a.attr("action")),data:a.serialize()+"&ajax=1",beforeSend:function(b){a.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(c,d,b){alert(b||d)},success:function(b,c){if(typeof($("form",b)[0])!="undefined"){form_new=document._importNode($("form",b)[0],true);a.replaceWith(form_new)}else{a.replaceWith(document._importNode($("p",b)[0],true))}}})},FormNoticeXHR:function(b){SN.C.I.NoticeDataGeo={};b.append('<input type="hidden" name="ajax" value="1"/>');b.attr("action",SN.U.RewriteAjaxAction(b.attr("action")));var c=function(d,e){b.append($('<p class="form_response"></p>').addClass(d).text(e))};var a=function(){b.find(".form_response").remove()};b.ajaxForm({dataType:"xml",timeout:"60000",beforeSend:function(d){if(b.find(".notice_data-text:first").val()==""){b.addClass(SN.C.S.Warning);return false}b.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled);SN.U.normalizeGeoData(b);return true},error:function(f,g,e){b.removeClass(SN.C.S.Processing).find(".submit").removeClass(SN.C.S.Disabled).removeAttr(SN.C.S.Disabled,SN.C.S.Disabled);a();if(g=="timeout"){c("error","Sorry! We had trouble sending your notice. The servers are overloaded. Please try again, and contact the site administrator if this problem persists.")}else{var d=SN.U.GetResponseXML(f);if($("."+SN.C.S.Error,d).length>0){b.append(document._importNode($("."+SN.C.S.Error,d)[0],true))}else{if(parseInt(f.status)===0||jQuery.inArray(parseInt(f.status),SN.C.I.HTTP20x30x)>=0){b.resetForm().find(".attach-status").remove();SN.U.FormNoticeEnhancements(b)}else{c("error","(Sorry! We had trouble sending your notice ("+f.status+" "+f.statusText+"). Please report the problem to the site administrator if this happens again.")}}}},success:function(i,f){a();var n=$("#"+SN.C.S.Error,i);if(n.length>0){c("error",n.text())}else{if($("body")[0].id=="bookmarklet"){self.close()}var d=$("#"+SN.C.S.CommandResult,i);if(d.length>0){c("success",d.text())}else{var m=document._importNode($("li",i)[0],true);var k=$("#notices_primary .notices:first");var l=b.closest("li.notice-reply");if(l.length>0){var e=$(m).attr("id");if($("#"+e).length==0){var j=l.closest("li.notice");l.replaceWith(m);SN.U.NoticeInlineReplyPlaceholder(j)}else{l.remove()}}else{if(k.length>0&&SN.U.belongsOnTimeline(m)){if($("#"+m.id).length===0){var h=b.find("[name=inreplyto]").val();var g="#notices_primary #notice-"+h;if($("body")[0].id=="conversation"){if(h.length>0&&$(g+" .notices").length<1){$(g).append('<ul class="notices"></ul>')}$($(g+" .notices")[0]).append(m)}else{k.prepend(m)}$("#"+m.id).css({display:"none"}).fadeIn(2500);SN.U.NoticeWithAttachment($("#"+m.id));SN.U.NoticeReplyTo($("#"+m.id))}}else{c("success",$("title",i).text())}}}b.resetForm();b.find("[name=inreplyto]").val("");b.find(".attach-status").remove();SN.U.FormNoticeEnhancements(b)}},complete:function(d,e){b.removeClass(SN.C.S.Processing).find(".submit").removeAttr(SN.C.S.Disabled).removeClass(SN.C.S.Disabled);b.find("[name=lat]").val(SN.C.I.NoticeDataGeo.NLat);b.find("[name=lon]").val(SN.C.I.NoticeDataGeo.NLon);b.find("[name=location_ns]").val(SN.C.I.NoticeDataGeo.NLNS);b.find("[name=location_id]").val(SN.C.I.NoticeDataGeo.NLID);b.find("[name=notice_data-geo]").attr("checked",SN.C.I.NoticeDataGeo.NDG)}})},normalizeGeoData:function(a){SN.C.I.NoticeDataGeo.NLat=a.find("[name=lat]").val();SN.C.I.NoticeDataGeo.NLon=a.find("[name=lon]").val();SN.C.I.NoticeDataGeo.NLNS=a.find("[name=location_ns]").val();SN.C.I.NoticeDataGeo.NLID=a.find("[name=location_id]").val();SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked");var b=$.cookie(SN.C.S.NoticeDataGeoCookie);if(b!==null&&b!="disabled"){b=JSON.parse(b);SN.C.I.NoticeDataGeo.NLat=a.find("[name=lat]").val(b.NLat).val();SN.C.I.NoticeDataGeo.NLon=a.find("[name=lon]").val(b.NLon).val();if(b.NLNS){SN.C.I.NoticeDataGeo.NLNS=a.find("[name=location_ns]").val(b.NLNS).val();SN.C.I.NoticeDataGeo.NLID=a.find("[name=location_id]").val(b.NLID).val()}else{a.find("[name=location_ns]").val("");a.find("[name=location_id]").val("")}}if(b=="disabled"){SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked",false).attr("checked")}else{SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked",true).attr("checked")}},GetResponseXML:function(b){try{return b.responseXML}catch(a){return(new DOMParser()).parseFromString(b.responseText,"text/xml")}},NoticeReply:function(){if($("#content .notice_reply").length>0){$("#content .notice").each(function(){SN.U.NoticeReplyTo($(this))})}},NoticeReplyTo:function(a){a.find(".notice_reply").live("click",function(c){c.preventDefault();var b=($(".author .nickname",a).length>0)?$($(".author .nickname",a)[0]):$(".author .nickname.uid");SN.U.NoticeInlineReplyTrigger(a,"@"+b.text());return false})},NoticeInlineReplyTrigger:function(h,i){var b=$($(".notice_id",h)[0]).text();var e=h;var f=h.closest(".notices");if(f.hasClass("threaded-replies")){e=f.closest(".notice")}else{f=$("ul.threaded-replies",h);if(f.length==0){f=$('<ul class="notices threaded-replies xoxo"></ul>');h.append(f)}}var j=$(".notice-reply-form",f);var d=function(){j.find("input[name=inreplyto]").val(b);var m=j.find("textarea");if(m.length==0){throw"No textarea"}var l="";if(i){l=i+" "}m.val(l+m.val().replace(RegExp(l,"i"),""));m.data("initialText",$.trim(i+""));m.focus();if(m[0].setSelectionRange){var k=m.val().length;m[0].setSelectionRange(k,k)}};if(j.length>0){d()}else{f.find("li.notice-reply-placeholder").remove();var g=$("li.notice-reply",f);if(g.length==0){g=$('<li class="notice-reply"></li>');var c=function(k){var l=document._importNode(k,true);g.append(l);f.append(g);var m=j=$(l);SN.Init.NoticeFormSetup(m);d()};if(SN.C.I.NoticeFormMaster){c(SN.C.I.NoticeFormMaster)}else{var a=$("#form_notice").attr("action");$.get(a,{ajax:1},function(k,m,l){c($("form",k)[0])})}}}},NoticeInlineReplyPlaceholder:function(b){var a=b.find("ul.threaded-replies");var c=$('<li class="notice-reply-placeholder"><input class="placeholder"></li>');c.find("input").val(SN.msg("reply_placeholder")).focus(function(){SN.U.NoticeInlineReplyTrigger(b);return false});a.append(c)},NoticeInlineReplySetup:function(){$(".threaded-replies").each(function(){var b=$(this);var a=b.closest(".notice");SN.U.NoticeInlineReplyPlaceholder(a)})},NoticeRepeat:function(){$(".form_repeat").live("click",function(a){a.preventDefault();SN.U.NoticeRepeatConfirmation($(this));return false})},NoticeRepeatConfirmation:function(a){var c=a.find(".submit");var b=c.clone();b.addClass("submit_dialogbox").removeClass("submit");a.append(b);b.bind("click",function(){SN.U.FormXHR(a);return false});c.hide();a.addClass("dialogbox").append('<button class="close">&#215;</button>').closest(".notice-options").addClass("opaque");a.find("button.close").click(function(){$(this).remove();a.removeClass("dialogbox").closest(".notice-options").removeClass("opaque");a.find(".submit_dialogbox").remove();a.find(".submit").show();return false})},NoticeAttachments:function(){$(".notice a.attachment").each(function(){SN.U.NoticeWithAttachment($(this).closest(".notice"))})},NoticeWithAttachment:function(b){if(b.find(".attachment").length===0){return}var a=b.find(".attachment.more");if(a.length>0){$(a[0]).click(function(){var c=$(this);c.addClass(SN.C.S.Processing);$.get(c.attr("href")+"/ajax",null,function(d){c.parent(".entry-content").html($(d).find("#attachment_view .entry-content").html())});return false}).attr("title",SN.msg("showmore_tooltip"))}},NoticeDataAttach:function(b){var a=b.find("input[type=file]");a.change(function(f){b.find(".attach-status").remove();var d=$(this).val();if(!d){return false}var c=$('<div class="attach-status '+SN.C.S.Success+'"><code></code> <button class="close">&#215;</button></div>');c.find("code").text(d);c.find("button").click(function(){c.remove();a.val("");return false});b.append(c);if(typeof this.files=="object"){for(var e=0;e<this.files.length;e++){SN.U.PreviewAttach(b,this.files[e])}}})},maxFileSize:function(b){var a=$(b).find("input[name=MAX_FILE_SIZE]").attr("value");if(a){return parseInt(a)}else{return 0}},PreviewAttach:function(d,c){var e=c.type+" "+Math.round(c.size/1024)+"KB";var f=true;var h;if(typeof window.createObjectURL!="undefined"){h=function(i,j){j(window.createObjectURL(i))}}else{if(typeof window.FileReader!="undefined"){h=function(j,k){var i=new FileReader();i.onload=function(l){k(i.result)};i.readAsDataURL(j)}}else{f=false}}var a=["image/png","image/jpeg","image/gif","image/svg+xml"];if($.inArray(c.type,a)==-1){f=false}var g=8*1024*1024;if(c.size>g){f=false}if(f){h(c,function(j){var i=$("<img>").attr("title",e).attr("alt",e).attr("src",j).attr("style","height: 120px");d.find(".attach-status").append(i)})}else{var b=$("<div></div>").text(e);d.find(".attach-status").append(b)}},NoticeLocationAttach:function(a){var e=a.find("[name=lat]");var k=a.find("[name=lon]");var g=a.find("[name=location_ns]").val();var l=a.find("[name=location_id]").val();var b="";var d=a.find("[name=notice_data-geo]");var c=a.find("[name=notice_data-geo]");var j=a.find("label.notice_data-geo");function f(n){j.attr("title",jQuery.trim(j.text())).removeClass("checked");a.find("[name=lat]").val("");a.find("[name=lon]").val("");a.find("[name=location_ns]").val("");a.find("[name=location_id]").val("");a.find("[name=notice_data-geo]").attr("checked",false);$.cookie(SN.C.S.NoticeDataGeoCookie,"disabled",{path:"/"});if(n){a.find(".geo_status_wrapper").removeClass("success").addClass("error");a.find(".geo_status_wrapper .geo_status").text(n)}else{a.find(".geo_status_wrapper").remove()}}function m(n,o){SN.U.NoticeGeoStatus(a,"Looking up place name...");$.getJSON(n,o,function(p){var q,r;if(typeof(p.location_ns)!="undefined"){a.find("[name=location_ns]").val(p.location_ns);q=p.location_ns}if(typeof(p.location_id)!="undefined"){a.find("[name=location_id]").val(p.location_id);r=p.location_id}if(typeof(p.name)=="undefined"){NLN_text=o.lat+";"+o.lon}else{NLN_text=p.name}SN.U.NoticeGeoStatus(a,NLN_text,o.lat,o.lon,p.url);j.attr("title",NoticeDataGeo_text.ShareDisable+" ("+NLN_text+")");a.find("[name=lat]").val(o.lat);a.find("[name=lon]").val(o.lon);a.find("[name=location_ns]").val(q);a.find("[name=location_id]").val(r);a.find("[name=notice_data-geo]").attr("checked",true);var s={NLat:o.lat,NLon:o.lon,NLNS:q,NLID:r,NLN:NLN_text,NLNU:p.url,NDG:true};$.cookie(SN.C.S.NoticeDataGeoCookie,JSON.stringify(s),{path:"/"})})}if(c.length>0){if($.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){c.attr("checked",false)}else{c.attr("checked",true)}var h=a.find(".notice_data-geo_wrap");var i=h.attr("data-api");j.attr("title",j.text());c.change(function(){if(c.attr("checked")===true||$.cookie(SN.C.S.NoticeDataGeoCookie)===null){j.attr("title",NoticeDataGeo_text.ShareDisable).addClass("checked");if($.cookie(SN.C.S.NoticeDataGeoCookie)===null||$.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){if(navigator.geolocation){SN.U.NoticeGeoStatus(a,"Requesting location from browser...");navigator.geolocation.getCurrentPosition(function(p){a.find("[name=lat]").val(p.coords.latitude);a.find("[name=lon]").val(p.coords.longitude);var q={lat:p.coords.latitude,lon:p.coords.longitude,token:$("#token").val()};m(i,q)},function(p){switch(p.code){case p.PERMISSION_DENIED:f("Location permission denied.");break;case p.TIMEOUT:f("Location lookup timeout.");break}},{timeout:10000})}else{if(e.length>0&&k.length>0){var n={lat:e,lon:k,token:$("#token").val()};m(i,n)}else{f();c.remove();j.remove()}}}else{var o=JSON.parse($.cookie(SN.C.S.NoticeDataGeoCookie));a.find("[name=lat]").val(o.NLat);a.find("[name=lon]").val(o.NLon);a.find("[name=location_ns]").val(o.NLNS);a.find("[name=location_id]").val(o.NLID);a.find("[name=notice_data-geo]").attr("checked",o.NDG);SN.U.NoticeGeoStatus(a,o.NLN,o.NLat,o.NLon,o.NLNU);j.attr("title",NoticeDataGeo_text.ShareDisable+" ("+o.NLN+")").addClass("checked")}}else{f()}}).change()}},NoticeGeoStatus:function(e,a,f,g,c){var h=e.find(".geo_status_wrapper");if(h.length==0){h=$('<div class="'+SN.C.S.Success+' geo_status_wrapper"><button class="close" style="float:right">&#215;</button><div class="geo_status"></div></div>');h.find("button.close").click(function(){e.find("[name=notice_data-geo]").removeAttr("checked").change();return false});e.append(h)}var b;if(c){b=$("<a></a>").attr("href",c)}else{b=$("<span></span>")}b.text(a);if(f||g){var d=f+";"+g;b.attr("title",d);if(!a){b.text(d)}}h.find(".geo_status").empty().append(b)},NewDirectMessage:function(){NDM=$(".entity_send-a-message a");NDM.attr({href:NDM.attr("href")+"&ajax=1"});NDM.bind("click",function(){var a=$(".entity_send-a-message form");if(a.length===0){$(this).addClass(SN.C.S.Processing);$.get(NDM.attr("href"),null,function(b){$(".entity_send-a-message").append(document._importNode($("form",b)[0],true));a=$(".entity_send-a-message .form_notice");SN.U.FormNoticeXHR(a);SN.U.FormNoticeEnhancements(a);a.append('<button class="close">&#215;</button>');$(".entity_send-a-message button").click(function(){a.hide();return false});NDM.removeClass(SN.C.S.Processing)})}else{a.show();$(".entity_send-a-message textarea").focus()}return false})},GetFullYear:function(c,d,a){var b=new Date();b.setFullYear(c,d,a);return b},StatusNetInstance:{Set:function(b){var a=SN.U.StatusNetInstance.Get();if(a!==null){b=$.extend(a,b)}$.cookie(SN.C.S.StatusNetInstance,JSON.stringify(b),{path:"/",expires:SN.U.GetFullYear(2029,0,1)})},Get:function(){var a=$.cookie(SN.C.S.StatusNetInstance);if(a!==null){return JSON.parse(a)}return null},Delete:function(){$.cookie(SN.C.S.StatusNetInstance,null)}},belongsOnTimeline:function(b){var a=$("body").attr("id");if(a=="public"){return true}var c=$("#nav_profile a").attr("href");if(c){var d=$(b).find(".vcard.author a.url").attr("href");if(d==c){if(a=="all"||a=="showstream"){return true}}}return false},switchInputFormTab:function(a){$(".input_form_nav_tab.current").removeClass("current");$("#input_form_nav_"+a).addClass("current");$(".input_form.current").removeClass("current");$("#input_form_"+a).addClass("current")}},Init:{NoticeForm:function(){if($("body.user_in").length>0){$(".ajax-notice").each(function(){var a=$(this);SN.Init.NoticeFormSetup(a)});$("body").bind("click",function(c){var a=$("li.notice-reply");if(a.length>0){var b=$(c.target);a.each(function(){var g=$(this);if(g.has(c.target).length==0){var e=g.find(".notice_data-text:first");var f=$.trim(e.val());if(f==""||f==e.data("initialText")){var d=g.closest("li.notice");g.remove();SN.U.NoticeInlineReplyPlaceholder(d)}}})}})}},NoticeFormSetup:function(a){SN.U.NoticeLocationAttach(a);SN.U.FormNoticeXHR(a);SN.U.FormNoticeEnhancements(a);SN.U.NoticeDataAttach(a)},Notices:function(){if($("body.user_in").length>0){var a=$(".form_notice:first");if(a.length>0){SN.C.I.NoticeFormMaster=document._importNode(a[0],true)}SN.U.NoticeRepeat();SN.U.NoticeReply();SN.U.NoticeInlineReplySetup()}SN.U.NoticeAttachments()},EntityActions:function(){if($("body.user_in").length>0){SN.U.NewDirectMessage()}},Login:function(){if(SN.U.StatusNetInstance.Get()!==null){var a=SN.U.StatusNetInstance.Get().Nickname;if(a!==null){$("#form_login #nickname").val(a)}}$("#form_login").bind("submit",function(){SN.U.StatusNetInstance.Set({Nickname:$("#form_login #nickname").val()});return true})},AjaxForms:function(){$("form.ajax").live("submit",function(){SN.U.FormXHR($(this));return false})},UploadForms:function(){$("input[type=file]").change(function(d){if(typeof this.files=="object"&&this.files.length>0){var c=0;for(var b=0;b<this.files.length;b++){c+=this.files[b].size}var a=SN.U.maxFileSize($(this.form));if(a>0&&c>a){var e="File too large: maximum upload size is %d bytes.";alert(e.replace("%d",a));$(this).val("");d.preventDefault();return false}}})}}};$(document).ready(function(){SN.Init.AjaxForms();SN.Init.UploadForms();if($("."+SN.C.S.FormNotice).length>0){SN.Init.NoticeForm()}if($("#content .notices").length>0){SN.Init.Notices()}if($("#content .entity_actions").length>0){SN.Init.EntityActions()}if($("#form_login").length>0){SN.Init.Login()}});if(!document.ELEMENT_NODE){document.ELEMENT_NODE=1;document.ATTRIBUTE_NODE=2;document.TEXT_NODE=3;document.CDATA_SECTION_NODE=4;document.ENTITY_REFERENCE_NODE=5;document.ENTITY_NODE=6;document.PROCESSING_INSTRUCTION_NODE=7;document.COMMENT_NODE=8;document.DOCUMENT_NODE=9;document.DOCUMENT_TYPE_NODE=10;document.DOCUMENT_FRAGMENT_NODE=11;document.NOTATION_NODE=12}document._importNode=function(e,a){switch(e.nodeType){case document.ELEMENT_NODE:var d=document.createElement(e.nodeName);if(e.attributes&&e.attributes.length>0){for(var c=0,b=e.attributes.length;c<b;){if(e.attributes[c].nodeName=="class"){d.className=e.getAttribute(e.attributes[c++].nodeName)}else{d.setAttribute(e.attributes[c].nodeName,e.getAttribute(e.attributes[c++].nodeName))}}}if(a&&e.childNodes&&e.childNodes.length>0){for(var c=0,b=e.childNodes.length;c<b;){d.appendChild(document._importNode(e.childNodes[c++],a))}}return d;break;case document.TEXT_NODE:case document.CDATA_SECTION_NODE:case document.COMMENT_NODE:return document.createTextNode(e.nodeValue);break}};if(typeof navigator.geolocation=="undefined"||navigator.geolocation.shim){(function(){(function(){if(window.google&&google.gears){return}var c=null;if(typeof GearsFactory!="undefined"){c=new GearsFactory()}else{try{c=new ActiveXObject("Gears.Factory");if(c.getBuildInfo().indexOf("ie_mobile")!=-1){c.privateSetGlobalObject(this)}}catch(d){if((typeof navigator.mimeTypes!="undefined")&&navigator.mimeTypes["application/x-googlegears"]){c=document.createElement("object");c.style.display="none";c.width=0;c.height=0;c.type="application/x-googlegears";document.documentElement.appendChild(c)}}}if(!c){return}if(!window.google){google={}}if(!google.gears){google.gears={factory:c}}})();var a=(function(){var d=google.gears.factory.create("beta.geolocation");var c=function(f,e){return function(g){f(g);e.lastPosition=g}};return{shim:true,type:"Gears",lastPosition:null,getCurrentPosition:function(e,g,h){var f=this;var i=c(e,f);d.getCurrentPosition(i,g,h)},watchPosition:function(e,f,g){d.watchPosition(e,f,g)},clearWatch:function(e){d.clearWatch(e)},getPermission:function(g,e,f){d.getPermission(g,e,f)}}});var b=(function(){var i=false;var e=function(){if(!d()&&!i){i=true;var j=document.createElement("script");j.src=(document.location.protocol=="https:"?"https://":"http://")+"www.google.com/jsapi?callback=_google_loader_apiLoaded";j.type="text/javascript";document.getElementsByTagName("body")[0].appendChild(j)}};var c=[];var h=function(j){c.push(j)};var f=function(){if(d()){while(c.length>0){var j=c.pop();j()}}};window._google_loader_apiLoaded=function(){f()};var d=function(){return(window.google&&google.loader)};var g=function(j){if(d()){return true}h(j);e();return false};e();return{shim:true,type:"ClientLocation",lastPosition:null,getCurrentPosition:function(k,n,o){var m=this;if(!g(function(){m.getCurrentPosition(k,n,o)})){return}if(google.loader.ClientLocation){var l=google.loader.ClientLocation;var j={coords:{latitude:l.latitude,longitude:l.longitude,altitude:null,accuracy:43000,altitudeAccuracy:null,heading:null,speed:null},address:{city:l.address.city,country:l.address.country,country_code:l.address.country_code,region:l.address.region},timestamp:new Date()};k(j);this.lastPosition=j}else{if(n==="function"){n({code:3,message:"Using the Google ClientLocation API and it is not able to calculate a location."})}}},watchPosition:function(j,l,m){this.getCurrentPosition(j,l,m);var k=this;var n=setInterval(function(){k.getCurrentPosition(j,l,m)},10000);return n},clearWatch:function(j){clearInterval(j)},getPermission:function(l,j,k){return true}}});navigator.geolocation=(window.google&&google.gears)?a():b()})()};
\ No newline at end of file
diff --git a/lib/noticeform.php b/lib/noticeform.php
index 9d931b92ed..e604ee9fc4 100644
--- a/lib/noticeform.php
+++ b/lib/noticeform.php
@@ -208,7 +208,7 @@ class NoticeForm extends Form
                 $this->out->hidden('notice_data-location_ns', empty($this->location_ns) ? (empty($this->profile->location_ns) ? null : $this->profile->location_ns) : $this->location_ns, 'location_ns');
 
                 $this->out->elementStart('div', array('class' => 'notice_data-geo_wrap',
-                                                      'title' => common_local_url('geocode')));
+                                                      'data-api' => common_local_url('geocode')));
 
                 // @fixme checkbox method allows no way to change the id without changing the name
                 //$this->out->checkbox('notice_data-geo', _('Share my location'), true);

From 8efd2cf04dfb3343b88cb51f5740bb1688ba3c05 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Thu, 10 Mar 2011 16:57:41 -0800
Subject: [PATCH 519/655] Make phone number save and display from DB

---
 plugins/ExtendedProfile/extendedprofile.php   | 39 ++++++++++++++-----
 .../ExtendedProfile/extendedprofilewidget.php | 18 +++++++--
 2 files changed, 44 insertions(+), 13 deletions(-)

diff --git a/plugins/ExtendedProfile/extendedprofile.php b/plugins/ExtendedProfile/extendedprofile.php
index 908f0bc721..2a10759d91 100644
--- a/plugins/ExtendedProfile/extendedprofile.php
+++ b/plugins/ExtendedProfile/extendedprofile.php
@@ -37,8 +37,10 @@ class ExtendedProfile
     {
         $this->profile  = $profile;
         $this->user     = $profile->getUser();
-        $this->sections = $this->getSections();
         $this->fields   = $this->loadFields();
+        $this->sections = $this->getSections();
+        //common_debug(var_export($this->sections, true));
+
         //common_debug(var_export($this->fields, true));
     }
 
@@ -96,19 +98,36 @@ class ExtendedProfile
         }
     }
 
-
     function getPhones()
     {
-        return array(
+        $phones  = $this->fields['phone'];
+        $pArrays = array();
+
+        if (empty($phones)) {
+            $pArrays[] = array(
                 'label' => _m('Phone'),
                 'type'  => 'phone',
-                'multi' => true,
-                'index' => 8123,
-                'rel'   => 'home',
-                'value' => '510-528-0079',
-                'vcard' => 'tel'
-
-        );
+                'vcard' => 'tel',
+                'multi' => true
+            );
+        } else {
+            for ($i = 0; $i < sizeof($phones); $i++) {
+                $pa = array(
+                    'label' => _m('Phone'),
+                    'type'  => 'phone',
+                    'index' => $phones[$i]->value_index,
+                    'rel'   => $phones[$i]->rel,
+                    'value' => $phones[$i]->field_value,
+                    'vcard' => 'tel'
+                );
+                // Last phone record should allow adding more
+                if ($i == sizeof($phones) - 1) {
+                    $pa['multi'] = true;
+                }
+               $pArrays[] = $pa;
+            }
+        }
+        return $pArrays;
     }
 
     /**
diff --git a/plugins/ExtendedProfile/extendedprofilewidget.php b/plugins/ExtendedProfile/extendedprofilewidget.php
index f5685e9981..d31a34b1e2 100644
--- a/plugins/ExtendedProfile/extendedprofilewidget.php
+++ b/plugins/ExtendedProfile/extendedprofilewidget.php
@@ -101,8 +101,13 @@ class ExtendedProfileWidget extends Form
     {
         $this->out->element('h3', null, $section['label']);
         $this->out->elementStart('table', array('class' => 'extended-profile'));
+
         foreach ($section['fields'] as $fieldName => $field) {
-            $this->showExtendedProfileField($fieldName, $field);
+            if ($fieldName == 'phone') {
+                $this->showPhones($fieldName, $field);
+            } else {
+                $this->showExtendedProfileField($fieldName, $field);
+            }
         }
         $this->out->elementEnd('table');
     }
@@ -151,7 +156,6 @@ class ExtendedProfileWidget extends Form
             $this->out->text($this->ext->getTags());
             break;
         case 'phone':
-            common_debug("GOT a PHONE!");
             $this->showPhone($field);
             break;
         default:
@@ -159,11 +163,19 @@ class ExtendedProfileWidget extends Form
         }
     }
 
+    protected function showPhones($name, $field) {
+        foreach ($field as $phone) {
+            $this->showExtendedProfileField($name, $phone);
+        }
+    }
+
     protected function showPhone($field)
     {
         $this->out->elementStart('div', array('class' => 'phone-display'));
         $this->out->text($field['value']);
-        $this->out->text(' (' . $field['rel'] . ')');
+        if (!empty($field['rel'])) {
+            $this->out->text(' (' . $field['rel'] . ')');
+        }
         $this->out->elementEnd('div');
     }
 

From 302f0236bdee73afc9183f724432df2f43fb480a Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Thu, 10 Mar 2011 17:13:34 -0800
Subject: [PATCH 520/655] Make correct nav menus show

---
 plugins/ExtendedProfile/profiledetailaction.php     | 13 +------------
 .../ExtendedProfile/profiledetailsettingsaction.php |  2 +-
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/plugins/ExtendedProfile/profiledetailaction.php b/plugins/ExtendedProfile/profiledetailaction.php
index d2eb06775c..beac7d6321 100644
--- a/plugins/ExtendedProfile/profiledetailaction.php
+++ b/plugins/ExtendedProfile/profiledetailaction.php
@@ -21,7 +21,7 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-class ProfileDetailAction extends ProfileAction
+class ProfileDetailAction extends ShowstreamAction
 {
 
     function isReadOnly($args)
@@ -34,23 +34,12 @@ class ProfileDetailAction extends ProfileAction
         return $this->profile->getFancyName();
     }
 
-    function showLocalNav()
-    {
-        $nav = new PersonalGroupNav($this);
-        $nav->show();
-    }
-
     function showStylesheets() {
         parent::showStylesheets();
         $this->cssLink('plugins/ExtendedProfile/profiledetail.css');
         return true;
     }
 
-    function handle($args)
-    {
-        $this->showPage();
-    }
-
     function showContent()
     {
         $cur = common_current_user();
diff --git a/plugins/ExtendedProfile/profiledetailsettingsaction.php b/plugins/ExtendedProfile/profiledetailsettingsaction.php
index c18732c058..ec2c4935a2 100644
--- a/plugins/ExtendedProfile/profiledetailsettingsaction.php
+++ b/plugins/ExtendedProfile/profiledetailsettingsaction.php
@@ -21,7 +21,7 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-class ProfileDetailSettingsAction extends SettingsAction
+class ProfileDetailSettingsAction extends ProfileSettingsAction
 {
 
     function title()

From 78ecb17ba103c2b54b35f2d8de69db1a75017fa4 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Thu, 10 Mar 2011 17:15:56 -0800
Subject: [PATCH 521/655] User directory - fix nav

---
 plugins/Directory/actions/userdirectory.php | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/plugins/Directory/actions/userdirectory.php b/plugins/Directory/actions/userdirectory.php
index 24d91ad772..85835e2c1f 100644
--- a/plugins/Directory/actions/userdirectory.php
+++ b/plugins/Directory/actions/userdirectory.php
@@ -187,18 +187,6 @@ class UserdirectoryAction extends Action
         $this->elementEnd('div');
     }
 
-    /**
-     * Local navigation
-     *
-     * This page is part of the public group, so show that.
-     *
-     * @return void
-     */
-    function showLocalNav()
-    {
-        $nav = new PublicGroupNav($this);
-        $nav->show();
-    }
 
     /**
      * Content area

From 771682b6eb0054748800782462806d16572ab784 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Thu, 10 Mar 2011 17:31:01 -0800
Subject: [PATCH 522/655] Add placeholder status form for the top (needs to
 hook up to JS)

---
 lib/action.php                | 15 ++++-----
 lib/noticeplaceholderform.php | 60 +++++++++++++++++++++++++++++++++++
 theme/neo/css/display.css     |  5 ++-
 3 files changed, 71 insertions(+), 9 deletions(-)
 create mode 100644 lib/noticeplaceholderform.php

diff --git a/lib/action.php b/lib/action.php
index 0ba4b8b8ff..2997a5239d 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -601,10 +601,6 @@ class Action extends HTMLOutputter // lawsuit
                 $attrs = array('id' => 'input_form_nav_'.$tag,
                                'class' => 'input_form_nav_tab');
 
-                if ($tag == 'status') {
-                    $attrs['class'] .= ' current';
-                }
-
                 $this->elementStart('li', $attrs);
 
                 $this->element('a',
@@ -615,15 +611,18 @@ class Action extends HTMLOutputter // lawsuit
 
             $this->elementEnd('ul');
 
+            $attrs = array('class' => 'input_form current',
+                           'id' => 'input_form_placeholder');
+            $this->elementStart('div', $attrs);
+            $form = new NoticePlaceholderForm($this);
+            $form->show();
+            $this->elementEnd('div');
+
             foreach ($tabs as $tag => $title) {
 
                 $attrs = array('class' => 'input_form',
                                'id' => 'input_form_'.$tag);
 
-                if ($tag == 'status') {
-                    $attrs['class'] .= ' current';
-                }
-
                 $this->elementStart('div', $attrs);
 
                 $form = null;
diff --git a/lib/noticeplaceholderform.php b/lib/noticeplaceholderform.php
new file mode 100644
index 0000000000..788a2021d9
--- /dev/null
+++ b/lib/noticeplaceholderform.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Form for posting a notice
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Form
+ * @package   StatusNet
+ * @author   Brion Vibber <brion@status.net>
+ * @copyright 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/
+ */
+
+if (!defined('STATUSNET') && !defined('LACONICA')) {
+    exit(1);
+}
+
+require_once INSTALLDIR.'/lib/form.php';
+
+/**
+ * Placeholder form for posting a notice
+ *
+ * Frequently-used form for posting a notice
+ *
+ * @category Form
+ * @package  StatusNet
+ * @author   Brion Vibber <brion@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://status.net/
+ *
+ * @see      HTMLOutputter
+ */
+class NoticePlaceholderForm extends Widget
+{
+    function show()
+    {
+        // Similar to that for inline replies, but not quite!
+        $placeholder = _('Update your status...');
+        $this->out->elementStart('div', 'form_notice_placeholder');
+        $this->out->element('input', array('class' => 'placeholder',
+                                           'value' => $placeholder));
+        $this->out->elementEnd('div');
+    }
+}
diff --git a/theme/neo/css/display.css b/theme/neo/css/display.css
index 528537b029..d6a33ad0cb 100644
--- a/theme/neo/css/display.css
+++ b/theme/neo/css/display.css
@@ -273,8 +273,11 @@ address {
     display: none; /* XXX move into input with js */
 }
 
-.form_notice textarea {
+.form_notice textarea,
+.form_notice_placeholder .placeholder {
     width: 473px;
+}
+.form_notice textarea {
     height: 42px;
     padding: 6px 10px 18px 10px;
     border: 1px solid #a6a6a6;

From f88689cc8755fe2534491f72564b283cbde9a6fc Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Thu, 10 Mar 2011 17:40:39 -0800
Subject: [PATCH 523/655] Trigger status notice form when top placeholder form
 gets used. Delay initialization of notice ajax forms until they get shown.

---
 js/util.js     | 27 +++++++++++++++++++--------
 js/util.min.js |  2 +-
 2 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/js/util.js b/js/util.js
index c690153abb..2c8438e62a 100644
--- a/js/util.js
+++ b/js/util.js
@@ -1292,7 +1292,12 @@ var SN = { // StatusNet
 	    $('#input_form_nav_'+tag).addClass('current');
 
 	    $('.input_form.current').removeClass('current');
-	    $('#input_form_'+tag).addClass('current');
+	    $('#input_form_'+tag)
+                .addClass('current')
+                .find('.ajax-notice').each(function() {
+                    var form = $(this);
+                    SN.Init.NoticeFormSetup(form);
+                });
 	}
     },
 
@@ -1307,9 +1312,12 @@ var SN = { // StatusNet
          */
         NoticeForm: function() {
             if ($('body.user_in').length > 0) {
-                $('.ajax-notice').each(function() {
-                    var form = $(this);
-                    SN.Init.NoticeFormSetup(form);
+                // SN.Init.NoticeFormSetup() will get run
+                // when forms get displayed for the first time...
+
+                // Hack to initialize the placeholder at top
+                $('#input_form_placeholder input.placeholder').focus(function() {
+                    SN.U.switchInputFormTab("status");
                 });
 
                 // Make inline reply forms self-close when clicking out.
@@ -1344,10 +1352,13 @@ var SN = { // StatusNet
          * @param {jQuery} form
          */
         NoticeFormSetup: function(form) {
-            SN.U.NoticeLocationAttach(form);
-            SN.U.FormNoticeXHR(form);
-            SN.U.FormNoticeEnhancements(form);
-            SN.U.NoticeDataAttach(form);
+            if (!form.data('NoticeFormSetup')) {
+                SN.U.NoticeLocationAttach(form);
+                SN.U.FormNoticeXHR(form);
+                SN.U.FormNoticeEnhancements(form);
+                SN.U.NoticeDataAttach(form);
+                form.data('NoticeFormSetup', true);
+            }
         },
 
         /**
diff --git a/js/util.min.js b/js/util.min.js
index 9e3f15e9f0..a8b4fc0978 100644
--- a/js/util.min.js
+++ b/js/util.min.js
@@ -1 +1 @@
-var SN={C:{I:{CounterBlackout:false,MaxLength:140,PatternUsername:/^[0-9a-zA-Z\-_.]*$/,HTTP20x30x:[200,201,202,203,204,205,206,300,301,302,303,304,305,306,307],NoticeFormMaster:null},S:{Disabled:"disabled",Warning:"warning",Error:"error",Success:"success",Processing:"processing",CommandResult:"command_result",FormNotice:"form_notice",NoticeDataGeo:"notice_data-geo",NoticeDataGeoCookie:"NoticeDataGeo",NoticeDataGeoSelected:"notice_data-geo_selected",StatusNetInstance:"StatusNetInstance"}},messages:{},msg:function(a){if(typeof SN.messages[a]=="undefined"){return"["+a+"]"}else{return SN.messages[a]}},U:{FormNoticeEnhancements:function(b){if(jQuery.data(b[0],"ElementData")===undefined){MaxLength=b.find(".count").text();if(typeof(MaxLength)=="undefined"){MaxLength=SN.C.I.MaxLength}jQuery.data(b[0],"ElementData",{MaxLength:MaxLength});SN.U.Counter(b);NDT=b.find(".notice_data-text:first");NDT.bind("keyup",function(c){SN.U.Counter(b)});var a=function(c){window.setTimeout(function(){SN.U.Counter(b)},50)};NDT.bind("cut",a).bind("paste",a)}else{b.find(".count").text(jQuery.data(b[0],"ElementData").MaxLength)}},Counter:function(d){SN.C.I.FormNoticeCurrent=d;var b=jQuery.data(d[0],"ElementData").MaxLength;if(b<=0){return}var c=b-SN.U.CharacterCount(d);var a=d.find(".count");if(c.toString()!=a.text()){if(!SN.C.I.CounterBlackout||c===0){if(a.text()!=String(c)){a.text(c)}if(c<0){d.addClass(SN.C.S.Warning)}else{d.removeClass(SN.C.S.Warning)}if(!SN.C.I.CounterBlackout){SN.C.I.CounterBlackout=true;SN.C.I.FormNoticeCurrent=d;window.setTimeout("SN.U.ClearCounterBlackout(SN.C.I.FormNoticeCurrent);",500)}}}},CharacterCount:function(a){return a.find(".notice_data-text:first").val().length},ClearCounterBlackout:function(a){SN.C.I.CounterBlackout=false;SN.U.Counter(a)},RewriteAjaxAction:function(a){if(document.location.protocol=="https:"&&a.substr(0,5)=="http:"){return a.replace(/^http:\/\/[^:\/]+/,"https://"+document.location.host)}else{return a}},FormXHR:function(a){$.ajax({type:"POST",dataType:"xml",url:SN.U.RewriteAjaxAction(a.attr("action")),data:a.serialize()+"&ajax=1",beforeSend:function(b){a.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(c,d,b){alert(b||d)},success:function(b,c){if(typeof($("form",b)[0])!="undefined"){form_new=document._importNode($("form",b)[0],true);a.replaceWith(form_new)}else{a.replaceWith(document._importNode($("p",b)[0],true))}}})},FormNoticeXHR:function(b){SN.C.I.NoticeDataGeo={};b.append('<input type="hidden" name="ajax" value="1"/>');b.attr("action",SN.U.RewriteAjaxAction(b.attr("action")));var c=function(d,e){b.append($('<p class="form_response"></p>').addClass(d).text(e))};var a=function(){b.find(".form_response").remove()};b.ajaxForm({dataType:"xml",timeout:"60000",beforeSend:function(d){if(b.find(".notice_data-text:first").val()==""){b.addClass(SN.C.S.Warning);return false}b.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled);SN.U.normalizeGeoData(b);return true},error:function(f,g,e){b.removeClass(SN.C.S.Processing).find(".submit").removeClass(SN.C.S.Disabled).removeAttr(SN.C.S.Disabled,SN.C.S.Disabled);a();if(g=="timeout"){c("error","Sorry! We had trouble sending your notice. The servers are overloaded. Please try again, and contact the site administrator if this problem persists.")}else{var d=SN.U.GetResponseXML(f);if($("."+SN.C.S.Error,d).length>0){b.append(document._importNode($("."+SN.C.S.Error,d)[0],true))}else{if(parseInt(f.status)===0||jQuery.inArray(parseInt(f.status),SN.C.I.HTTP20x30x)>=0){b.resetForm().find(".attach-status").remove();SN.U.FormNoticeEnhancements(b)}else{c("error","(Sorry! We had trouble sending your notice ("+f.status+" "+f.statusText+"). Please report the problem to the site administrator if this happens again.")}}}},success:function(i,f){a();var n=$("#"+SN.C.S.Error,i);if(n.length>0){c("error",n.text())}else{if($("body")[0].id=="bookmarklet"){self.close()}var d=$("#"+SN.C.S.CommandResult,i);if(d.length>0){c("success",d.text())}else{var m=document._importNode($("li",i)[0],true);var k=$("#notices_primary .notices:first");var l=b.closest("li.notice-reply");if(l.length>0){var e=$(m).attr("id");if($("#"+e).length==0){var j=l.closest("li.notice");l.replaceWith(m);SN.U.NoticeInlineReplyPlaceholder(j)}else{l.remove()}}else{if(k.length>0&&SN.U.belongsOnTimeline(m)){if($("#"+m.id).length===0){var h=b.find("[name=inreplyto]").val();var g="#notices_primary #notice-"+h;if($("body")[0].id=="conversation"){if(h.length>0&&$(g+" .notices").length<1){$(g).append('<ul class="notices"></ul>')}$($(g+" .notices")[0]).append(m)}else{k.prepend(m)}$("#"+m.id).css({display:"none"}).fadeIn(2500);SN.U.NoticeWithAttachment($("#"+m.id));SN.U.NoticeReplyTo($("#"+m.id))}}else{c("success",$("title",i).text())}}}b.resetForm();b.find("[name=inreplyto]").val("");b.find(".attach-status").remove();SN.U.FormNoticeEnhancements(b)}},complete:function(d,e){b.removeClass(SN.C.S.Processing).find(".submit").removeAttr(SN.C.S.Disabled).removeClass(SN.C.S.Disabled);b.find("[name=lat]").val(SN.C.I.NoticeDataGeo.NLat);b.find("[name=lon]").val(SN.C.I.NoticeDataGeo.NLon);b.find("[name=location_ns]").val(SN.C.I.NoticeDataGeo.NLNS);b.find("[name=location_id]").val(SN.C.I.NoticeDataGeo.NLID);b.find("[name=notice_data-geo]").attr("checked",SN.C.I.NoticeDataGeo.NDG)}})},normalizeGeoData:function(a){SN.C.I.NoticeDataGeo.NLat=a.find("[name=lat]").val();SN.C.I.NoticeDataGeo.NLon=a.find("[name=lon]").val();SN.C.I.NoticeDataGeo.NLNS=a.find("[name=location_ns]").val();SN.C.I.NoticeDataGeo.NLID=a.find("[name=location_id]").val();SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked");var b=$.cookie(SN.C.S.NoticeDataGeoCookie);if(b!==null&&b!="disabled"){b=JSON.parse(b);SN.C.I.NoticeDataGeo.NLat=a.find("[name=lat]").val(b.NLat).val();SN.C.I.NoticeDataGeo.NLon=a.find("[name=lon]").val(b.NLon).val();if(b.NLNS){SN.C.I.NoticeDataGeo.NLNS=a.find("[name=location_ns]").val(b.NLNS).val();SN.C.I.NoticeDataGeo.NLID=a.find("[name=location_id]").val(b.NLID).val()}else{a.find("[name=location_ns]").val("");a.find("[name=location_id]").val("")}}if(b=="disabled"){SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked",false).attr("checked")}else{SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked",true).attr("checked")}},GetResponseXML:function(b){try{return b.responseXML}catch(a){return(new DOMParser()).parseFromString(b.responseText,"text/xml")}},NoticeReply:function(){if($("#content .notice_reply").length>0){$("#content .notice").each(function(){SN.U.NoticeReplyTo($(this))})}},NoticeReplyTo:function(a){a.find(".notice_reply").live("click",function(c){c.preventDefault();var b=($(".author .nickname",a).length>0)?$($(".author .nickname",a)[0]):$(".author .nickname.uid");SN.U.NoticeInlineReplyTrigger(a,"@"+b.text());return false})},NoticeInlineReplyTrigger:function(h,i){var b=$($(".notice_id",h)[0]).text();var e=h;var f=h.closest(".notices");if(f.hasClass("threaded-replies")){e=f.closest(".notice")}else{f=$("ul.threaded-replies",h);if(f.length==0){f=$('<ul class="notices threaded-replies xoxo"></ul>');h.append(f)}}var j=$(".notice-reply-form",f);var d=function(){j.find("input[name=inreplyto]").val(b);var m=j.find("textarea");if(m.length==0){throw"No textarea"}var l="";if(i){l=i+" "}m.val(l+m.val().replace(RegExp(l,"i"),""));m.data("initialText",$.trim(i+""));m.focus();if(m[0].setSelectionRange){var k=m.val().length;m[0].setSelectionRange(k,k)}};if(j.length>0){d()}else{f.find("li.notice-reply-placeholder").remove();var g=$("li.notice-reply",f);if(g.length==0){g=$('<li class="notice-reply"></li>');var c=function(k){var l=document._importNode(k,true);g.append(l);f.append(g);var m=j=$(l);SN.Init.NoticeFormSetup(m);d()};if(SN.C.I.NoticeFormMaster){c(SN.C.I.NoticeFormMaster)}else{var a=$("#form_notice").attr("action");$.get(a,{ajax:1},function(k,m,l){c($("form",k)[0])})}}}},NoticeInlineReplyPlaceholder:function(b){var a=b.find("ul.threaded-replies");var c=$('<li class="notice-reply-placeholder"><input class="placeholder"></li>');c.find("input").val(SN.msg("reply_placeholder")).focus(function(){SN.U.NoticeInlineReplyTrigger(b);return false});a.append(c)},NoticeInlineReplySetup:function(){$(".threaded-replies").each(function(){var b=$(this);var a=b.closest(".notice");SN.U.NoticeInlineReplyPlaceholder(a)})},NoticeRepeat:function(){$(".form_repeat").live("click",function(a){a.preventDefault();SN.U.NoticeRepeatConfirmation($(this));return false})},NoticeRepeatConfirmation:function(a){var c=a.find(".submit");var b=c.clone();b.addClass("submit_dialogbox").removeClass("submit");a.append(b);b.bind("click",function(){SN.U.FormXHR(a);return false});c.hide();a.addClass("dialogbox").append('<button class="close">&#215;</button>').closest(".notice-options").addClass("opaque");a.find("button.close").click(function(){$(this).remove();a.removeClass("dialogbox").closest(".notice-options").removeClass("opaque");a.find(".submit_dialogbox").remove();a.find(".submit").show();return false})},NoticeAttachments:function(){$(".notice a.attachment").each(function(){SN.U.NoticeWithAttachment($(this).closest(".notice"))})},NoticeWithAttachment:function(b){if(b.find(".attachment").length===0){return}var a=b.find(".attachment.more");if(a.length>0){$(a[0]).click(function(){var c=$(this);c.addClass(SN.C.S.Processing);$.get(c.attr("href")+"/ajax",null,function(d){c.parent(".entry-content").html($(d).find("#attachment_view .entry-content").html())});return false}).attr("title",SN.msg("showmore_tooltip"))}},NoticeDataAttach:function(b){var a=b.find("input[type=file]");a.change(function(f){b.find(".attach-status").remove();var d=$(this).val();if(!d){return false}var c=$('<div class="attach-status '+SN.C.S.Success+'"><code></code> <button class="close">&#215;</button></div>');c.find("code").text(d);c.find("button").click(function(){c.remove();a.val("");return false});b.append(c);if(typeof this.files=="object"){for(var e=0;e<this.files.length;e++){SN.U.PreviewAttach(b,this.files[e])}}})},maxFileSize:function(b){var a=$(b).find("input[name=MAX_FILE_SIZE]").attr("value");if(a){return parseInt(a)}else{return 0}},PreviewAttach:function(d,c){var e=c.type+" "+Math.round(c.size/1024)+"KB";var f=true;var h;if(typeof window.createObjectURL!="undefined"){h=function(i,j){j(window.createObjectURL(i))}}else{if(typeof window.FileReader!="undefined"){h=function(j,k){var i=new FileReader();i.onload=function(l){k(i.result)};i.readAsDataURL(j)}}else{f=false}}var a=["image/png","image/jpeg","image/gif","image/svg+xml"];if($.inArray(c.type,a)==-1){f=false}var g=8*1024*1024;if(c.size>g){f=false}if(f){h(c,function(j){var i=$("<img>").attr("title",e).attr("alt",e).attr("src",j).attr("style","height: 120px");d.find(".attach-status").append(i)})}else{var b=$("<div></div>").text(e);d.find(".attach-status").append(b)}},NoticeLocationAttach:function(a){var e=a.find("[name=lat]");var k=a.find("[name=lon]");var g=a.find("[name=location_ns]").val();var l=a.find("[name=location_id]").val();var b="";var d=a.find("[name=notice_data-geo]");var c=a.find("[name=notice_data-geo]");var j=a.find("label.notice_data-geo");function f(n){j.attr("title",jQuery.trim(j.text())).removeClass("checked");a.find("[name=lat]").val("");a.find("[name=lon]").val("");a.find("[name=location_ns]").val("");a.find("[name=location_id]").val("");a.find("[name=notice_data-geo]").attr("checked",false);$.cookie(SN.C.S.NoticeDataGeoCookie,"disabled",{path:"/"});if(n){a.find(".geo_status_wrapper").removeClass("success").addClass("error");a.find(".geo_status_wrapper .geo_status").text(n)}else{a.find(".geo_status_wrapper").remove()}}function m(n,o){SN.U.NoticeGeoStatus(a,"Looking up place name...");$.getJSON(n,o,function(p){var q,r;if(typeof(p.location_ns)!="undefined"){a.find("[name=location_ns]").val(p.location_ns);q=p.location_ns}if(typeof(p.location_id)!="undefined"){a.find("[name=location_id]").val(p.location_id);r=p.location_id}if(typeof(p.name)=="undefined"){NLN_text=o.lat+";"+o.lon}else{NLN_text=p.name}SN.U.NoticeGeoStatus(a,NLN_text,o.lat,o.lon,p.url);j.attr("title",NoticeDataGeo_text.ShareDisable+" ("+NLN_text+")");a.find("[name=lat]").val(o.lat);a.find("[name=lon]").val(o.lon);a.find("[name=location_ns]").val(q);a.find("[name=location_id]").val(r);a.find("[name=notice_data-geo]").attr("checked",true);var s={NLat:o.lat,NLon:o.lon,NLNS:q,NLID:r,NLN:NLN_text,NLNU:p.url,NDG:true};$.cookie(SN.C.S.NoticeDataGeoCookie,JSON.stringify(s),{path:"/"})})}if(c.length>0){if($.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){c.attr("checked",false)}else{c.attr("checked",true)}var h=a.find(".notice_data-geo_wrap");var i=h.attr("data-api");j.attr("title",j.text());c.change(function(){if(c.attr("checked")===true||$.cookie(SN.C.S.NoticeDataGeoCookie)===null){j.attr("title",NoticeDataGeo_text.ShareDisable).addClass("checked");if($.cookie(SN.C.S.NoticeDataGeoCookie)===null||$.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){if(navigator.geolocation){SN.U.NoticeGeoStatus(a,"Requesting location from browser...");navigator.geolocation.getCurrentPosition(function(p){a.find("[name=lat]").val(p.coords.latitude);a.find("[name=lon]").val(p.coords.longitude);var q={lat:p.coords.latitude,lon:p.coords.longitude,token:$("#token").val()};m(i,q)},function(p){switch(p.code){case p.PERMISSION_DENIED:f("Location permission denied.");break;case p.TIMEOUT:f("Location lookup timeout.");break}},{timeout:10000})}else{if(e.length>0&&k.length>0){var n={lat:e,lon:k,token:$("#token").val()};m(i,n)}else{f();c.remove();j.remove()}}}else{var o=JSON.parse($.cookie(SN.C.S.NoticeDataGeoCookie));a.find("[name=lat]").val(o.NLat);a.find("[name=lon]").val(o.NLon);a.find("[name=location_ns]").val(o.NLNS);a.find("[name=location_id]").val(o.NLID);a.find("[name=notice_data-geo]").attr("checked",o.NDG);SN.U.NoticeGeoStatus(a,o.NLN,o.NLat,o.NLon,o.NLNU);j.attr("title",NoticeDataGeo_text.ShareDisable+" ("+o.NLN+")").addClass("checked")}}else{f()}}).change()}},NoticeGeoStatus:function(e,a,f,g,c){var h=e.find(".geo_status_wrapper");if(h.length==0){h=$('<div class="'+SN.C.S.Success+' geo_status_wrapper"><button class="close" style="float:right">&#215;</button><div class="geo_status"></div></div>');h.find("button.close").click(function(){e.find("[name=notice_data-geo]").removeAttr("checked").change();return false});e.append(h)}var b;if(c){b=$("<a></a>").attr("href",c)}else{b=$("<span></span>")}b.text(a);if(f||g){var d=f+";"+g;b.attr("title",d);if(!a){b.text(d)}}h.find(".geo_status").empty().append(b)},NewDirectMessage:function(){NDM=$(".entity_send-a-message a");NDM.attr({href:NDM.attr("href")+"&ajax=1"});NDM.bind("click",function(){var a=$(".entity_send-a-message form");if(a.length===0){$(this).addClass(SN.C.S.Processing);$.get(NDM.attr("href"),null,function(b){$(".entity_send-a-message").append(document._importNode($("form",b)[0],true));a=$(".entity_send-a-message .form_notice");SN.U.FormNoticeXHR(a);SN.U.FormNoticeEnhancements(a);a.append('<button class="close">&#215;</button>');$(".entity_send-a-message button").click(function(){a.hide();return false});NDM.removeClass(SN.C.S.Processing)})}else{a.show();$(".entity_send-a-message textarea").focus()}return false})},GetFullYear:function(c,d,a){var b=new Date();b.setFullYear(c,d,a);return b},StatusNetInstance:{Set:function(b){var a=SN.U.StatusNetInstance.Get();if(a!==null){b=$.extend(a,b)}$.cookie(SN.C.S.StatusNetInstance,JSON.stringify(b),{path:"/",expires:SN.U.GetFullYear(2029,0,1)})},Get:function(){var a=$.cookie(SN.C.S.StatusNetInstance);if(a!==null){return JSON.parse(a)}return null},Delete:function(){$.cookie(SN.C.S.StatusNetInstance,null)}},belongsOnTimeline:function(b){var a=$("body").attr("id");if(a=="public"){return true}var c=$("#nav_profile a").attr("href");if(c){var d=$(b).find(".vcard.author a.url").attr("href");if(d==c){if(a=="all"||a=="showstream"){return true}}}return false},switchInputFormTab:function(a){$(".input_form_nav_tab.current").removeClass("current");$("#input_form_nav_"+a).addClass("current");$(".input_form.current").removeClass("current");$("#input_form_"+a).addClass("current")}},Init:{NoticeForm:function(){if($("body.user_in").length>0){$(".ajax-notice").each(function(){var a=$(this);SN.Init.NoticeFormSetup(a)});$("body").bind("click",function(c){var a=$("li.notice-reply");if(a.length>0){var b=$(c.target);a.each(function(){var g=$(this);if(g.has(c.target).length==0){var e=g.find(".notice_data-text:first");var f=$.trim(e.val());if(f==""||f==e.data("initialText")){var d=g.closest("li.notice");g.remove();SN.U.NoticeInlineReplyPlaceholder(d)}}})}})}},NoticeFormSetup:function(a){SN.U.NoticeLocationAttach(a);SN.U.FormNoticeXHR(a);SN.U.FormNoticeEnhancements(a);SN.U.NoticeDataAttach(a)},Notices:function(){if($("body.user_in").length>0){var a=$(".form_notice:first");if(a.length>0){SN.C.I.NoticeFormMaster=document._importNode(a[0],true)}SN.U.NoticeRepeat();SN.U.NoticeReply();SN.U.NoticeInlineReplySetup()}SN.U.NoticeAttachments()},EntityActions:function(){if($("body.user_in").length>0){SN.U.NewDirectMessage()}},Login:function(){if(SN.U.StatusNetInstance.Get()!==null){var a=SN.U.StatusNetInstance.Get().Nickname;if(a!==null){$("#form_login #nickname").val(a)}}$("#form_login").bind("submit",function(){SN.U.StatusNetInstance.Set({Nickname:$("#form_login #nickname").val()});return true})},AjaxForms:function(){$("form.ajax").live("submit",function(){SN.U.FormXHR($(this));return false})},UploadForms:function(){$("input[type=file]").change(function(d){if(typeof this.files=="object"&&this.files.length>0){var c=0;for(var b=0;b<this.files.length;b++){c+=this.files[b].size}var a=SN.U.maxFileSize($(this.form));if(a>0&&c>a){var e="File too large: maximum upload size is %d bytes.";alert(e.replace("%d",a));$(this).val("");d.preventDefault();return false}}})}}};$(document).ready(function(){SN.Init.AjaxForms();SN.Init.UploadForms();if($("."+SN.C.S.FormNotice).length>0){SN.Init.NoticeForm()}if($("#content .notices").length>0){SN.Init.Notices()}if($("#content .entity_actions").length>0){SN.Init.EntityActions()}if($("#form_login").length>0){SN.Init.Login()}});if(!document.ELEMENT_NODE){document.ELEMENT_NODE=1;document.ATTRIBUTE_NODE=2;document.TEXT_NODE=3;document.CDATA_SECTION_NODE=4;document.ENTITY_REFERENCE_NODE=5;document.ENTITY_NODE=6;document.PROCESSING_INSTRUCTION_NODE=7;document.COMMENT_NODE=8;document.DOCUMENT_NODE=9;document.DOCUMENT_TYPE_NODE=10;document.DOCUMENT_FRAGMENT_NODE=11;document.NOTATION_NODE=12}document._importNode=function(e,a){switch(e.nodeType){case document.ELEMENT_NODE:var d=document.createElement(e.nodeName);if(e.attributes&&e.attributes.length>0){for(var c=0,b=e.attributes.length;c<b;){if(e.attributes[c].nodeName=="class"){d.className=e.getAttribute(e.attributes[c++].nodeName)}else{d.setAttribute(e.attributes[c].nodeName,e.getAttribute(e.attributes[c++].nodeName))}}}if(a&&e.childNodes&&e.childNodes.length>0){for(var c=0,b=e.childNodes.length;c<b;){d.appendChild(document._importNode(e.childNodes[c++],a))}}return d;break;case document.TEXT_NODE:case document.CDATA_SECTION_NODE:case document.COMMENT_NODE:return document.createTextNode(e.nodeValue);break}};if(typeof navigator.geolocation=="undefined"||navigator.geolocation.shim){(function(){(function(){if(window.google&&google.gears){return}var c=null;if(typeof GearsFactory!="undefined"){c=new GearsFactory()}else{try{c=new ActiveXObject("Gears.Factory");if(c.getBuildInfo().indexOf("ie_mobile")!=-1){c.privateSetGlobalObject(this)}}catch(d){if((typeof navigator.mimeTypes!="undefined")&&navigator.mimeTypes["application/x-googlegears"]){c=document.createElement("object");c.style.display="none";c.width=0;c.height=0;c.type="application/x-googlegears";document.documentElement.appendChild(c)}}}if(!c){return}if(!window.google){google={}}if(!google.gears){google.gears={factory:c}}})();var a=(function(){var d=google.gears.factory.create("beta.geolocation");var c=function(f,e){return function(g){f(g);e.lastPosition=g}};return{shim:true,type:"Gears",lastPosition:null,getCurrentPosition:function(e,g,h){var f=this;var i=c(e,f);d.getCurrentPosition(i,g,h)},watchPosition:function(e,f,g){d.watchPosition(e,f,g)},clearWatch:function(e){d.clearWatch(e)},getPermission:function(g,e,f){d.getPermission(g,e,f)}}});var b=(function(){var i=false;var e=function(){if(!d()&&!i){i=true;var j=document.createElement("script");j.src=(document.location.protocol=="https:"?"https://":"http://")+"www.google.com/jsapi?callback=_google_loader_apiLoaded";j.type="text/javascript";document.getElementsByTagName("body")[0].appendChild(j)}};var c=[];var h=function(j){c.push(j)};var f=function(){if(d()){while(c.length>0){var j=c.pop();j()}}};window._google_loader_apiLoaded=function(){f()};var d=function(){return(window.google&&google.loader)};var g=function(j){if(d()){return true}h(j);e();return false};e();return{shim:true,type:"ClientLocation",lastPosition:null,getCurrentPosition:function(k,n,o){var m=this;if(!g(function(){m.getCurrentPosition(k,n,o)})){return}if(google.loader.ClientLocation){var l=google.loader.ClientLocation;var j={coords:{latitude:l.latitude,longitude:l.longitude,altitude:null,accuracy:43000,altitudeAccuracy:null,heading:null,speed:null},address:{city:l.address.city,country:l.address.country,country_code:l.address.country_code,region:l.address.region},timestamp:new Date()};k(j);this.lastPosition=j}else{if(n==="function"){n({code:3,message:"Using the Google ClientLocation API and it is not able to calculate a location."})}}},watchPosition:function(j,l,m){this.getCurrentPosition(j,l,m);var k=this;var n=setInterval(function(){k.getCurrentPosition(j,l,m)},10000);return n},clearWatch:function(j){clearInterval(j)},getPermission:function(l,j,k){return true}}});navigator.geolocation=(window.google&&google.gears)?a():b()})()};
\ No newline at end of file
+var SN={C:{I:{CounterBlackout:false,MaxLength:140,PatternUsername:/^[0-9a-zA-Z\-_.]*$/,HTTP20x30x:[200,201,202,203,204,205,206,300,301,302,303,304,305,306,307],NoticeFormMaster:null},S:{Disabled:"disabled",Warning:"warning",Error:"error",Success:"success",Processing:"processing",CommandResult:"command_result",FormNotice:"form_notice",NoticeDataGeo:"notice_data-geo",NoticeDataGeoCookie:"NoticeDataGeo",NoticeDataGeoSelected:"notice_data-geo_selected",StatusNetInstance:"StatusNetInstance"}},messages:{},msg:function(a){if(typeof SN.messages[a]=="undefined"){return"["+a+"]"}else{return SN.messages[a]}},U:{FormNoticeEnhancements:function(b){if(jQuery.data(b[0],"ElementData")===undefined){MaxLength=b.find(".count").text();if(typeof(MaxLength)=="undefined"){MaxLength=SN.C.I.MaxLength}jQuery.data(b[0],"ElementData",{MaxLength:MaxLength});SN.U.Counter(b);NDT=b.find(".notice_data-text:first");NDT.bind("keyup",function(c){SN.U.Counter(b)});var a=function(c){window.setTimeout(function(){SN.U.Counter(b)},50)};NDT.bind("cut",a).bind("paste",a)}else{b.find(".count").text(jQuery.data(b[0],"ElementData").MaxLength)}},Counter:function(d){SN.C.I.FormNoticeCurrent=d;var b=jQuery.data(d[0],"ElementData").MaxLength;if(b<=0){return}var c=b-SN.U.CharacterCount(d);var a=d.find(".count");if(c.toString()!=a.text()){if(!SN.C.I.CounterBlackout||c===0){if(a.text()!=String(c)){a.text(c)}if(c<0){d.addClass(SN.C.S.Warning)}else{d.removeClass(SN.C.S.Warning)}if(!SN.C.I.CounterBlackout){SN.C.I.CounterBlackout=true;SN.C.I.FormNoticeCurrent=d;window.setTimeout("SN.U.ClearCounterBlackout(SN.C.I.FormNoticeCurrent);",500)}}}},CharacterCount:function(a){return a.find(".notice_data-text:first").val().length},ClearCounterBlackout:function(a){SN.C.I.CounterBlackout=false;SN.U.Counter(a)},RewriteAjaxAction:function(a){if(document.location.protocol=="https:"&&a.substr(0,5)=="http:"){return a.replace(/^http:\/\/[^:\/]+/,"https://"+document.location.host)}else{return a}},FormXHR:function(a){$.ajax({type:"POST",dataType:"xml",url:SN.U.RewriteAjaxAction(a.attr("action")),data:a.serialize()+"&ajax=1",beforeSend:function(b){a.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(c,d,b){alert(b||d)},success:function(b,c){if(typeof($("form",b)[0])!="undefined"){form_new=document._importNode($("form",b)[0],true);a.replaceWith(form_new)}else{a.replaceWith(document._importNode($("p",b)[0],true))}}})},FormNoticeXHR:function(b){SN.C.I.NoticeDataGeo={};b.append('<input type="hidden" name="ajax" value="1"/>');b.attr("action",SN.U.RewriteAjaxAction(b.attr("action")));var c=function(d,e){b.append($('<p class="form_response"></p>').addClass(d).text(e))};var a=function(){b.find(".form_response").remove()};b.ajaxForm({dataType:"xml",timeout:"60000",beforeSend:function(d){if(b.find(".notice_data-text:first").val()==""){b.addClass(SN.C.S.Warning);return false}b.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled);SN.U.normalizeGeoData(b);return true},error:function(f,g,e){b.removeClass(SN.C.S.Processing).find(".submit").removeClass(SN.C.S.Disabled).removeAttr(SN.C.S.Disabled,SN.C.S.Disabled);a();if(g=="timeout"){c("error","Sorry! We had trouble sending your notice. The servers are overloaded. Please try again, and contact the site administrator if this problem persists.")}else{var d=SN.U.GetResponseXML(f);if($("."+SN.C.S.Error,d).length>0){b.append(document._importNode($("."+SN.C.S.Error,d)[0],true))}else{if(parseInt(f.status)===0||jQuery.inArray(parseInt(f.status),SN.C.I.HTTP20x30x)>=0){b.resetForm().find(".attach-status").remove();SN.U.FormNoticeEnhancements(b)}else{c("error","(Sorry! We had trouble sending your notice ("+f.status+" "+f.statusText+"). Please report the problem to the site administrator if this happens again.")}}}},success:function(i,f){a();var n=$("#"+SN.C.S.Error,i);if(n.length>0){c("error",n.text())}else{if($("body")[0].id=="bookmarklet"){self.close()}var d=$("#"+SN.C.S.CommandResult,i);if(d.length>0){c("success",d.text())}else{var m=document._importNode($("li",i)[0],true);var k=$("#notices_primary .notices:first");var l=b.closest("li.notice-reply");if(l.length>0){var e=$(m).attr("id");if($("#"+e).length==0){var j=l.closest("li.notice");l.replaceWith(m);SN.U.NoticeInlineReplyPlaceholder(j)}else{l.remove()}}else{if(k.length>0&&SN.U.belongsOnTimeline(m)){if($("#"+m.id).length===0){var h=b.find("[name=inreplyto]").val();var g="#notices_primary #notice-"+h;if($("body")[0].id=="conversation"){if(h.length>0&&$(g+" .notices").length<1){$(g).append('<ul class="notices"></ul>')}$($(g+" .notices")[0]).append(m)}else{k.prepend(m)}$("#"+m.id).css({display:"none"}).fadeIn(2500);SN.U.NoticeWithAttachment($("#"+m.id));SN.U.NoticeReplyTo($("#"+m.id))}}else{c("success",$("title",i).text())}}}b.resetForm();b.find("[name=inreplyto]").val("");b.find(".attach-status").remove();SN.U.FormNoticeEnhancements(b)}},complete:function(d,e){b.removeClass(SN.C.S.Processing).find(".submit").removeAttr(SN.C.S.Disabled).removeClass(SN.C.S.Disabled);b.find("[name=lat]").val(SN.C.I.NoticeDataGeo.NLat);b.find("[name=lon]").val(SN.C.I.NoticeDataGeo.NLon);b.find("[name=location_ns]").val(SN.C.I.NoticeDataGeo.NLNS);b.find("[name=location_id]").val(SN.C.I.NoticeDataGeo.NLID);b.find("[name=notice_data-geo]").attr("checked",SN.C.I.NoticeDataGeo.NDG)}})},normalizeGeoData:function(a){SN.C.I.NoticeDataGeo.NLat=a.find("[name=lat]").val();SN.C.I.NoticeDataGeo.NLon=a.find("[name=lon]").val();SN.C.I.NoticeDataGeo.NLNS=a.find("[name=location_ns]").val();SN.C.I.NoticeDataGeo.NLID=a.find("[name=location_id]").val();SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked");var b=$.cookie(SN.C.S.NoticeDataGeoCookie);if(b!==null&&b!="disabled"){b=JSON.parse(b);SN.C.I.NoticeDataGeo.NLat=a.find("[name=lat]").val(b.NLat).val();SN.C.I.NoticeDataGeo.NLon=a.find("[name=lon]").val(b.NLon).val();if(b.NLNS){SN.C.I.NoticeDataGeo.NLNS=a.find("[name=location_ns]").val(b.NLNS).val();SN.C.I.NoticeDataGeo.NLID=a.find("[name=location_id]").val(b.NLID).val()}else{a.find("[name=location_ns]").val("");a.find("[name=location_id]").val("")}}if(b=="disabled"){SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked",false).attr("checked")}else{SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked",true).attr("checked")}},GetResponseXML:function(b){try{return b.responseXML}catch(a){return(new DOMParser()).parseFromString(b.responseText,"text/xml")}},NoticeReply:function(){if($("#content .notice_reply").length>0){$("#content .notice").each(function(){SN.U.NoticeReplyTo($(this))})}},NoticeReplyTo:function(a){a.find(".notice_reply").live("click",function(c){c.preventDefault();var b=($(".author .nickname",a).length>0)?$($(".author .nickname",a)[0]):$(".author .nickname.uid");SN.U.NoticeInlineReplyTrigger(a,"@"+b.text());return false})},NoticeInlineReplyTrigger:function(h,i){var b=$($(".notice_id",h)[0]).text();var e=h;var f=h.closest(".notices");if(f.hasClass("threaded-replies")){e=f.closest(".notice")}else{f=$("ul.threaded-replies",h);if(f.length==0){f=$('<ul class="notices threaded-replies xoxo"></ul>');h.append(f)}}var j=$(".notice-reply-form",f);var d=function(){j.find("input[name=inreplyto]").val(b);var m=j.find("textarea");if(m.length==0){throw"No textarea"}var l="";if(i){l=i+" "}m.val(l+m.val().replace(RegExp(l,"i"),""));m.data("initialText",$.trim(i+""));m.focus();if(m[0].setSelectionRange){var k=m.val().length;m[0].setSelectionRange(k,k)}};if(j.length>0){d()}else{f.find("li.notice-reply-placeholder").remove();var g=$("li.notice-reply",f);if(g.length==0){g=$('<li class="notice-reply"></li>');var c=function(k){var l=document._importNode(k,true);g.append(l);f.append(g);var m=j=$(l);SN.Init.NoticeFormSetup(m);d()};if(SN.C.I.NoticeFormMaster){c(SN.C.I.NoticeFormMaster)}else{var a=$("#form_notice").attr("action");$.get(a,{ajax:1},function(k,m,l){c($("form",k)[0])})}}}},NoticeInlineReplyPlaceholder:function(b){var a=b.find("ul.threaded-replies");var c=$('<li class="notice-reply-placeholder"><input class="placeholder"></li>');c.find("input").val(SN.msg("reply_placeholder")).focus(function(){SN.U.NoticeInlineReplyTrigger(b);return false});a.append(c)},NoticeInlineReplySetup:function(){$(".threaded-replies").each(function(){var b=$(this);var a=b.closest(".notice");SN.U.NoticeInlineReplyPlaceholder(a)})},NoticeRepeat:function(){$(".form_repeat").live("click",function(a){a.preventDefault();SN.U.NoticeRepeatConfirmation($(this));return false})},NoticeRepeatConfirmation:function(a){var c=a.find(".submit");var b=c.clone();b.addClass("submit_dialogbox").removeClass("submit");a.append(b);b.bind("click",function(){SN.U.FormXHR(a);return false});c.hide();a.addClass("dialogbox").append('<button class="close">&#215;</button>').closest(".notice-options").addClass("opaque");a.find("button.close").click(function(){$(this).remove();a.removeClass("dialogbox").closest(".notice-options").removeClass("opaque");a.find(".submit_dialogbox").remove();a.find(".submit").show();return false})},NoticeAttachments:function(){$(".notice a.attachment").each(function(){SN.U.NoticeWithAttachment($(this).closest(".notice"))})},NoticeWithAttachment:function(b){if(b.find(".attachment").length===0){return}var a=b.find(".attachment.more");if(a.length>0){$(a[0]).click(function(){var c=$(this);c.addClass(SN.C.S.Processing);$.get(c.attr("href")+"/ajax",null,function(d){c.parent(".entry-content").html($(d).find("#attachment_view .entry-content").html())});return false}).attr("title",SN.msg("showmore_tooltip"))}},NoticeDataAttach:function(b){var a=b.find("input[type=file]");a.change(function(f){b.find(".attach-status").remove();var d=$(this).val();if(!d){return false}var c=$('<div class="attach-status '+SN.C.S.Success+'"><code></code> <button class="close">&#215;</button></div>');c.find("code").text(d);c.find("button").click(function(){c.remove();a.val("");return false});b.append(c);if(typeof this.files=="object"){for(var e=0;e<this.files.length;e++){SN.U.PreviewAttach(b,this.files[e])}}})},maxFileSize:function(b){var a=$(b).find("input[name=MAX_FILE_SIZE]").attr("value");if(a){return parseInt(a)}else{return 0}},PreviewAttach:function(d,c){var e=c.type+" "+Math.round(c.size/1024)+"KB";var f=true;var h;if(typeof window.createObjectURL!="undefined"){h=function(i,j){j(window.createObjectURL(i))}}else{if(typeof window.FileReader!="undefined"){h=function(j,k){var i=new FileReader();i.onload=function(l){k(i.result)};i.readAsDataURL(j)}}else{f=false}}var a=["image/png","image/jpeg","image/gif","image/svg+xml"];if($.inArray(c.type,a)==-1){f=false}var g=8*1024*1024;if(c.size>g){f=false}if(f){h(c,function(j){var i=$("<img>").attr("title",e).attr("alt",e).attr("src",j).attr("style","height: 120px");d.find(".attach-status").append(i)})}else{var b=$("<div></div>").text(e);d.find(".attach-status").append(b)}},NoticeLocationAttach:function(a){var e=a.find("[name=lat]");var k=a.find("[name=lon]");var g=a.find("[name=location_ns]").val();var l=a.find("[name=location_id]").val();var b="";var d=a.find("[name=notice_data-geo]");var c=a.find("[name=notice_data-geo]");var j=a.find("label.notice_data-geo");function f(n){j.attr("title",jQuery.trim(j.text())).removeClass("checked");a.find("[name=lat]").val("");a.find("[name=lon]").val("");a.find("[name=location_ns]").val("");a.find("[name=location_id]").val("");a.find("[name=notice_data-geo]").attr("checked",false);$.cookie(SN.C.S.NoticeDataGeoCookie,"disabled",{path:"/"});if(n){a.find(".geo_status_wrapper").removeClass("success").addClass("error");a.find(".geo_status_wrapper .geo_status").text(n)}else{a.find(".geo_status_wrapper").remove()}}function m(n,o){SN.U.NoticeGeoStatus(a,"Looking up place name...");$.getJSON(n,o,function(p){var q,r;if(typeof(p.location_ns)!="undefined"){a.find("[name=location_ns]").val(p.location_ns);q=p.location_ns}if(typeof(p.location_id)!="undefined"){a.find("[name=location_id]").val(p.location_id);r=p.location_id}if(typeof(p.name)=="undefined"){NLN_text=o.lat+";"+o.lon}else{NLN_text=p.name}SN.U.NoticeGeoStatus(a,NLN_text,o.lat,o.lon,p.url);j.attr("title",NoticeDataGeo_text.ShareDisable+" ("+NLN_text+")");a.find("[name=lat]").val(o.lat);a.find("[name=lon]").val(o.lon);a.find("[name=location_ns]").val(q);a.find("[name=location_id]").val(r);a.find("[name=notice_data-geo]").attr("checked",true);var s={NLat:o.lat,NLon:o.lon,NLNS:q,NLID:r,NLN:NLN_text,NLNU:p.url,NDG:true};$.cookie(SN.C.S.NoticeDataGeoCookie,JSON.stringify(s),{path:"/"})})}if(c.length>0){if($.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){c.attr("checked",false)}else{c.attr("checked",true)}var h=a.find(".notice_data-geo_wrap");var i=h.attr("data-api");j.attr("title",j.text());c.change(function(){if(c.attr("checked")===true||$.cookie(SN.C.S.NoticeDataGeoCookie)===null){j.attr("title",NoticeDataGeo_text.ShareDisable).addClass("checked");if($.cookie(SN.C.S.NoticeDataGeoCookie)===null||$.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){if(navigator.geolocation){SN.U.NoticeGeoStatus(a,"Requesting location from browser...");navigator.geolocation.getCurrentPosition(function(p){a.find("[name=lat]").val(p.coords.latitude);a.find("[name=lon]").val(p.coords.longitude);var q={lat:p.coords.latitude,lon:p.coords.longitude,token:$("#token").val()};m(i,q)},function(p){switch(p.code){case p.PERMISSION_DENIED:f("Location permission denied.");break;case p.TIMEOUT:f("Location lookup timeout.");break}},{timeout:10000})}else{if(e.length>0&&k.length>0){var n={lat:e,lon:k,token:$("#token").val()};m(i,n)}else{f();c.remove();j.remove()}}}else{var o=JSON.parse($.cookie(SN.C.S.NoticeDataGeoCookie));a.find("[name=lat]").val(o.NLat);a.find("[name=lon]").val(o.NLon);a.find("[name=location_ns]").val(o.NLNS);a.find("[name=location_id]").val(o.NLID);a.find("[name=notice_data-geo]").attr("checked",o.NDG);SN.U.NoticeGeoStatus(a,o.NLN,o.NLat,o.NLon,o.NLNU);j.attr("title",NoticeDataGeo_text.ShareDisable+" ("+o.NLN+")").addClass("checked")}}else{f()}}).change()}},NoticeGeoStatus:function(e,a,f,g,c){var h=e.find(".geo_status_wrapper");if(h.length==0){h=$('<div class="'+SN.C.S.Success+' geo_status_wrapper"><button class="close" style="float:right">&#215;</button><div class="geo_status"></div></div>');h.find("button.close").click(function(){e.find("[name=notice_data-geo]").removeAttr("checked").change();return false});e.append(h)}var b;if(c){b=$("<a></a>").attr("href",c)}else{b=$("<span></span>")}b.text(a);if(f||g){var d=f+";"+g;b.attr("title",d);if(!a){b.text(d)}}h.find(".geo_status").empty().append(b)},NewDirectMessage:function(){NDM=$(".entity_send-a-message a");NDM.attr({href:NDM.attr("href")+"&ajax=1"});NDM.bind("click",function(){var a=$(".entity_send-a-message form");if(a.length===0){$(this).addClass(SN.C.S.Processing);$.get(NDM.attr("href"),null,function(b){$(".entity_send-a-message").append(document._importNode($("form",b)[0],true));a=$(".entity_send-a-message .form_notice");SN.U.FormNoticeXHR(a);SN.U.FormNoticeEnhancements(a);a.append('<button class="close">&#215;</button>');$(".entity_send-a-message button").click(function(){a.hide();return false});NDM.removeClass(SN.C.S.Processing)})}else{a.show();$(".entity_send-a-message textarea").focus()}return false})},GetFullYear:function(c,d,a){var b=new Date();b.setFullYear(c,d,a);return b},StatusNetInstance:{Set:function(b){var a=SN.U.StatusNetInstance.Get();if(a!==null){b=$.extend(a,b)}$.cookie(SN.C.S.StatusNetInstance,JSON.stringify(b),{path:"/",expires:SN.U.GetFullYear(2029,0,1)})},Get:function(){var a=$.cookie(SN.C.S.StatusNetInstance);if(a!==null){return JSON.parse(a)}return null},Delete:function(){$.cookie(SN.C.S.StatusNetInstance,null)}},belongsOnTimeline:function(b){var a=$("body").attr("id");if(a=="public"){return true}var c=$("#nav_profile a").attr("href");if(c){var d=$(b).find(".vcard.author a.url").attr("href");if(d==c){if(a=="all"||a=="showstream"){return true}}}return false},switchInputFormTab:function(a){$(".input_form_nav_tab.current").removeClass("current");$("#input_form_nav_"+a).addClass("current");$(".input_form.current").removeClass("current");$("#input_form_"+a).addClass("current").find(".ajax-notice").each(function(){var b=$(this);SN.Init.NoticeFormSetup(b)})}},Init:{NoticeForm:function(){if($("body.user_in").length>0){$("#input_form_placeholder input.placeholder").focus(function(){SN.U.switchInputFormTab("status")});$("body").bind("click",function(c){var a=$("li.notice-reply");if(a.length>0){var b=$(c.target);a.each(function(){var g=$(this);if(g.has(c.target).length==0){var e=g.find(".notice_data-text:first");var f=$.trim(e.val());if(f==""||f==e.data("initialText")){var d=g.closest("li.notice");g.remove();SN.U.NoticeInlineReplyPlaceholder(d)}}})}})}},NoticeFormSetup:function(a){if(!a.data("NoticeFormSetup")){SN.U.NoticeLocationAttach(a);SN.U.FormNoticeXHR(a);SN.U.FormNoticeEnhancements(a);SN.U.NoticeDataAttach(a);a.data("NoticeFormSetup",true)}},Notices:function(){if($("body.user_in").length>0){var a=$(".form_notice:first");if(a.length>0){SN.C.I.NoticeFormMaster=document._importNode(a[0],true)}SN.U.NoticeRepeat();SN.U.NoticeReply();SN.U.NoticeInlineReplySetup()}SN.U.NoticeAttachments()},EntityActions:function(){if($("body.user_in").length>0){SN.U.NewDirectMessage()}},Login:function(){if(SN.U.StatusNetInstance.Get()!==null){var a=SN.U.StatusNetInstance.Get().Nickname;if(a!==null){$("#form_login #nickname").val(a)}}$("#form_login").bind("submit",function(){SN.U.StatusNetInstance.Set({Nickname:$("#form_login #nickname").val()});return true})},AjaxForms:function(){$("form.ajax").live("submit",function(){SN.U.FormXHR($(this));return false})},UploadForms:function(){$("input[type=file]").change(function(d){if(typeof this.files=="object"&&this.files.length>0){var c=0;for(var b=0;b<this.files.length;b++){c+=this.files[b].size}var a=SN.U.maxFileSize($(this.form));if(a>0&&c>a){var e="File too large: maximum upload size is %d bytes.";alert(e.replace("%d",a));$(this).val("");d.preventDefault();return false}}})}}};$(document).ready(function(){SN.Init.AjaxForms();SN.Init.UploadForms();if($("."+SN.C.S.FormNotice).length>0){SN.Init.NoticeForm()}if($("#content .notices").length>0){SN.Init.Notices()}if($("#content .entity_actions").length>0){SN.Init.EntityActions()}if($("#form_login").length>0){SN.Init.Login()}});if(!document.ELEMENT_NODE){document.ELEMENT_NODE=1;document.ATTRIBUTE_NODE=2;document.TEXT_NODE=3;document.CDATA_SECTION_NODE=4;document.ENTITY_REFERENCE_NODE=5;document.ENTITY_NODE=6;document.PROCESSING_INSTRUCTION_NODE=7;document.COMMENT_NODE=8;document.DOCUMENT_NODE=9;document.DOCUMENT_TYPE_NODE=10;document.DOCUMENT_FRAGMENT_NODE=11;document.NOTATION_NODE=12}document._importNode=function(e,a){switch(e.nodeType){case document.ELEMENT_NODE:var d=document.createElement(e.nodeName);if(e.attributes&&e.attributes.length>0){for(var c=0,b=e.attributes.length;c<b;){if(e.attributes[c].nodeName=="class"){d.className=e.getAttribute(e.attributes[c++].nodeName)}else{d.setAttribute(e.attributes[c].nodeName,e.getAttribute(e.attributes[c++].nodeName))}}}if(a&&e.childNodes&&e.childNodes.length>0){for(var c=0,b=e.childNodes.length;c<b;){d.appendChild(document._importNode(e.childNodes[c++],a))}}return d;break;case document.TEXT_NODE:case document.CDATA_SECTION_NODE:case document.COMMENT_NODE:return document.createTextNode(e.nodeValue);break}};if(typeof navigator.geolocation=="undefined"||navigator.geolocation.shim){(function(){(function(){if(window.google&&google.gears){return}var c=null;if(typeof GearsFactory!="undefined"){c=new GearsFactory()}else{try{c=new ActiveXObject("Gears.Factory");if(c.getBuildInfo().indexOf("ie_mobile")!=-1){c.privateSetGlobalObject(this)}}catch(d){if((typeof navigator.mimeTypes!="undefined")&&navigator.mimeTypes["application/x-googlegears"]){c=document.createElement("object");c.style.display="none";c.width=0;c.height=0;c.type="application/x-googlegears";document.documentElement.appendChild(c)}}}if(!c){return}if(!window.google){google={}}if(!google.gears){google.gears={factory:c}}})();var a=(function(){var d=google.gears.factory.create("beta.geolocation");var c=function(f,e){return function(g){f(g);e.lastPosition=g}};return{shim:true,type:"Gears",lastPosition:null,getCurrentPosition:function(e,g,h){var f=this;var i=c(e,f);d.getCurrentPosition(i,g,h)},watchPosition:function(e,f,g){d.watchPosition(e,f,g)},clearWatch:function(e){d.clearWatch(e)},getPermission:function(g,e,f){d.getPermission(g,e,f)}}});var b=(function(){var i=false;var e=function(){if(!d()&&!i){i=true;var j=document.createElement("script");j.src=(document.location.protocol=="https:"?"https://":"http://")+"www.google.com/jsapi?callback=_google_loader_apiLoaded";j.type="text/javascript";document.getElementsByTagName("body")[0].appendChild(j)}};var c=[];var h=function(j){c.push(j)};var f=function(){if(d()){while(c.length>0){var j=c.pop();j()}}};window._google_loader_apiLoaded=function(){f()};var d=function(){return(window.google&&google.loader)};var g=function(j){if(d()){return true}h(j);e();return false};e();return{shim:true,type:"ClientLocation",lastPosition:null,getCurrentPosition:function(k,n,o){var m=this;if(!g(function(){m.getCurrentPosition(k,n,o)})){return}if(google.loader.ClientLocation){var l=google.loader.ClientLocation;var j={coords:{latitude:l.latitude,longitude:l.longitude,altitude:null,accuracy:43000,altitudeAccuracy:null,heading:null,speed:null},address:{city:l.address.city,country:l.address.country,country_code:l.address.country_code,region:l.address.region},timestamp:new Date()};k(j);this.lastPosition=j}else{if(n==="function"){n({code:3,message:"Using the Google ClientLocation API and it is not able to calculate a location."})}}},watchPosition:function(j,l,m){this.getCurrentPosition(j,l,m);var k=this;var n=setInterval(function(){k.getCurrentPosition(j,l,m)},10000);return n},clearWatch:function(j){clearInterval(j)},getPermission:function(l,j,k){return true}}});navigator.geolocation=(window.google&&google.gears)?a():b()})()};
\ No newline at end of file

From b89b89ce895322cea666cd472b672184611a89cb Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Thu, 10 Mar 2011 17:44:17 -0800
Subject: [PATCH 524/655] Focus in textarea when popping up the status tab

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

diff --git a/js/util.js b/js/util.js
index 2c8438e62a..4ff2b661fe 100644
--- a/js/util.js
+++ b/js/util.js
@@ -1297,7 +1297,8 @@ var SN = { // StatusNet
                 .find('.ajax-notice').each(function() {
                     var form = $(this);
                     SN.Init.NoticeFormSetup(form);
-                });
+                })
+                .find('textarea:first').focus();
 	}
     },
 

From 6066bce02c87e1b543d1d9b5b1501342fcaba61b Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Thu, 10 Mar 2011 17:52:03 -0800
Subject: [PATCH 525/655] Clicking outside the active top posting form now
 returns to the placeholder if all textarea/input fields are empty

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

diff --git a/js/util.js b/js/util.js
index 4ff2b661fe..c4bcf81b88 100644
--- a/js/util.js
+++ b/js/util.js
@@ -1323,6 +1323,21 @@ var SN = { // StatusNet
 
                 // Make inline reply forms self-close when clicking out.
                 $('body').bind('click', function(e) {
+                    var currentForm = $('#content .input_forms div.current');
+                    if (currentForm.length > 0) {
+                        if ($('#content .input_forms').has(e.target).length == 0) {
+                            // If all fields are empty, switch back to the placeholder.
+                            var fields = currentForm.find('textarea, input[type=text], input[type=""]');
+                            var anything = false;
+                            fields.each(function() {
+                                anything = anything || $(this).val();
+                            });
+                            if (!anything) {
+                                SN.U.switchInputFormTab("placeholder");
+                            }
+                        }
+                    }
+
                     var openReplies = $('li.notice-reply');
                     if (openReplies.length > 0) {
                         var target = $(e.target);

From 0ee5d79739e4ae91b707a522bf85cdcfc5df035a Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Thu, 10 Mar 2011 17:54:07 -0800
Subject: [PATCH 526/655] Return to placeholder entry after successful post

---
 js/util.js     | 1 +
 js/util.min.js | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/js/util.js b/js/util.js
index c4bcf81b88..e9e5a90ce1 100644
--- a/js/util.js
+++ b/js/util.js
@@ -424,6 +424,7 @@ var SN = { // StatusNet
                                         .fadeIn(2500);
                                     SN.U.NoticeWithAttachment($('#'+notice.id));
                                     SN.U.NoticeReplyTo($('#'+notice.id));
+                                    SN.U.switchInputFormTab("placeholder");
                                 }
                             } else {
                                 // Not on a timeline that this belongs on?
diff --git a/js/util.min.js b/js/util.min.js
index a8b4fc0978..235ad00694 100644
--- a/js/util.min.js
+++ b/js/util.min.js
@@ -1 +1 @@
-var SN={C:{I:{CounterBlackout:false,MaxLength:140,PatternUsername:/^[0-9a-zA-Z\-_.]*$/,HTTP20x30x:[200,201,202,203,204,205,206,300,301,302,303,304,305,306,307],NoticeFormMaster:null},S:{Disabled:"disabled",Warning:"warning",Error:"error",Success:"success",Processing:"processing",CommandResult:"command_result",FormNotice:"form_notice",NoticeDataGeo:"notice_data-geo",NoticeDataGeoCookie:"NoticeDataGeo",NoticeDataGeoSelected:"notice_data-geo_selected",StatusNetInstance:"StatusNetInstance"}},messages:{},msg:function(a){if(typeof SN.messages[a]=="undefined"){return"["+a+"]"}else{return SN.messages[a]}},U:{FormNoticeEnhancements:function(b){if(jQuery.data(b[0],"ElementData")===undefined){MaxLength=b.find(".count").text();if(typeof(MaxLength)=="undefined"){MaxLength=SN.C.I.MaxLength}jQuery.data(b[0],"ElementData",{MaxLength:MaxLength});SN.U.Counter(b);NDT=b.find(".notice_data-text:first");NDT.bind("keyup",function(c){SN.U.Counter(b)});var a=function(c){window.setTimeout(function(){SN.U.Counter(b)},50)};NDT.bind("cut",a).bind("paste",a)}else{b.find(".count").text(jQuery.data(b[0],"ElementData").MaxLength)}},Counter:function(d){SN.C.I.FormNoticeCurrent=d;var b=jQuery.data(d[0],"ElementData").MaxLength;if(b<=0){return}var c=b-SN.U.CharacterCount(d);var a=d.find(".count");if(c.toString()!=a.text()){if(!SN.C.I.CounterBlackout||c===0){if(a.text()!=String(c)){a.text(c)}if(c<0){d.addClass(SN.C.S.Warning)}else{d.removeClass(SN.C.S.Warning)}if(!SN.C.I.CounterBlackout){SN.C.I.CounterBlackout=true;SN.C.I.FormNoticeCurrent=d;window.setTimeout("SN.U.ClearCounterBlackout(SN.C.I.FormNoticeCurrent);",500)}}}},CharacterCount:function(a){return a.find(".notice_data-text:first").val().length},ClearCounterBlackout:function(a){SN.C.I.CounterBlackout=false;SN.U.Counter(a)},RewriteAjaxAction:function(a){if(document.location.protocol=="https:"&&a.substr(0,5)=="http:"){return a.replace(/^http:\/\/[^:\/]+/,"https://"+document.location.host)}else{return a}},FormXHR:function(a){$.ajax({type:"POST",dataType:"xml",url:SN.U.RewriteAjaxAction(a.attr("action")),data:a.serialize()+"&ajax=1",beforeSend:function(b){a.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(c,d,b){alert(b||d)},success:function(b,c){if(typeof($("form",b)[0])!="undefined"){form_new=document._importNode($("form",b)[0],true);a.replaceWith(form_new)}else{a.replaceWith(document._importNode($("p",b)[0],true))}}})},FormNoticeXHR:function(b){SN.C.I.NoticeDataGeo={};b.append('<input type="hidden" name="ajax" value="1"/>');b.attr("action",SN.U.RewriteAjaxAction(b.attr("action")));var c=function(d,e){b.append($('<p class="form_response"></p>').addClass(d).text(e))};var a=function(){b.find(".form_response").remove()};b.ajaxForm({dataType:"xml",timeout:"60000",beforeSend:function(d){if(b.find(".notice_data-text:first").val()==""){b.addClass(SN.C.S.Warning);return false}b.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled);SN.U.normalizeGeoData(b);return true},error:function(f,g,e){b.removeClass(SN.C.S.Processing).find(".submit").removeClass(SN.C.S.Disabled).removeAttr(SN.C.S.Disabled,SN.C.S.Disabled);a();if(g=="timeout"){c("error","Sorry! We had trouble sending your notice. The servers are overloaded. Please try again, and contact the site administrator if this problem persists.")}else{var d=SN.U.GetResponseXML(f);if($("."+SN.C.S.Error,d).length>0){b.append(document._importNode($("."+SN.C.S.Error,d)[0],true))}else{if(parseInt(f.status)===0||jQuery.inArray(parseInt(f.status),SN.C.I.HTTP20x30x)>=0){b.resetForm().find(".attach-status").remove();SN.U.FormNoticeEnhancements(b)}else{c("error","(Sorry! We had trouble sending your notice ("+f.status+" "+f.statusText+"). Please report the problem to the site administrator if this happens again.")}}}},success:function(i,f){a();var n=$("#"+SN.C.S.Error,i);if(n.length>0){c("error",n.text())}else{if($("body")[0].id=="bookmarklet"){self.close()}var d=$("#"+SN.C.S.CommandResult,i);if(d.length>0){c("success",d.text())}else{var m=document._importNode($("li",i)[0],true);var k=$("#notices_primary .notices:first");var l=b.closest("li.notice-reply");if(l.length>0){var e=$(m).attr("id");if($("#"+e).length==0){var j=l.closest("li.notice");l.replaceWith(m);SN.U.NoticeInlineReplyPlaceholder(j)}else{l.remove()}}else{if(k.length>0&&SN.U.belongsOnTimeline(m)){if($("#"+m.id).length===0){var h=b.find("[name=inreplyto]").val();var g="#notices_primary #notice-"+h;if($("body")[0].id=="conversation"){if(h.length>0&&$(g+" .notices").length<1){$(g).append('<ul class="notices"></ul>')}$($(g+" .notices")[0]).append(m)}else{k.prepend(m)}$("#"+m.id).css({display:"none"}).fadeIn(2500);SN.U.NoticeWithAttachment($("#"+m.id));SN.U.NoticeReplyTo($("#"+m.id))}}else{c("success",$("title",i).text())}}}b.resetForm();b.find("[name=inreplyto]").val("");b.find(".attach-status").remove();SN.U.FormNoticeEnhancements(b)}},complete:function(d,e){b.removeClass(SN.C.S.Processing).find(".submit").removeAttr(SN.C.S.Disabled).removeClass(SN.C.S.Disabled);b.find("[name=lat]").val(SN.C.I.NoticeDataGeo.NLat);b.find("[name=lon]").val(SN.C.I.NoticeDataGeo.NLon);b.find("[name=location_ns]").val(SN.C.I.NoticeDataGeo.NLNS);b.find("[name=location_id]").val(SN.C.I.NoticeDataGeo.NLID);b.find("[name=notice_data-geo]").attr("checked",SN.C.I.NoticeDataGeo.NDG)}})},normalizeGeoData:function(a){SN.C.I.NoticeDataGeo.NLat=a.find("[name=lat]").val();SN.C.I.NoticeDataGeo.NLon=a.find("[name=lon]").val();SN.C.I.NoticeDataGeo.NLNS=a.find("[name=location_ns]").val();SN.C.I.NoticeDataGeo.NLID=a.find("[name=location_id]").val();SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked");var b=$.cookie(SN.C.S.NoticeDataGeoCookie);if(b!==null&&b!="disabled"){b=JSON.parse(b);SN.C.I.NoticeDataGeo.NLat=a.find("[name=lat]").val(b.NLat).val();SN.C.I.NoticeDataGeo.NLon=a.find("[name=lon]").val(b.NLon).val();if(b.NLNS){SN.C.I.NoticeDataGeo.NLNS=a.find("[name=location_ns]").val(b.NLNS).val();SN.C.I.NoticeDataGeo.NLID=a.find("[name=location_id]").val(b.NLID).val()}else{a.find("[name=location_ns]").val("");a.find("[name=location_id]").val("")}}if(b=="disabled"){SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked",false).attr("checked")}else{SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked",true).attr("checked")}},GetResponseXML:function(b){try{return b.responseXML}catch(a){return(new DOMParser()).parseFromString(b.responseText,"text/xml")}},NoticeReply:function(){if($("#content .notice_reply").length>0){$("#content .notice").each(function(){SN.U.NoticeReplyTo($(this))})}},NoticeReplyTo:function(a){a.find(".notice_reply").live("click",function(c){c.preventDefault();var b=($(".author .nickname",a).length>0)?$($(".author .nickname",a)[0]):$(".author .nickname.uid");SN.U.NoticeInlineReplyTrigger(a,"@"+b.text());return false})},NoticeInlineReplyTrigger:function(h,i){var b=$($(".notice_id",h)[0]).text();var e=h;var f=h.closest(".notices");if(f.hasClass("threaded-replies")){e=f.closest(".notice")}else{f=$("ul.threaded-replies",h);if(f.length==0){f=$('<ul class="notices threaded-replies xoxo"></ul>');h.append(f)}}var j=$(".notice-reply-form",f);var d=function(){j.find("input[name=inreplyto]").val(b);var m=j.find("textarea");if(m.length==0){throw"No textarea"}var l="";if(i){l=i+" "}m.val(l+m.val().replace(RegExp(l,"i"),""));m.data("initialText",$.trim(i+""));m.focus();if(m[0].setSelectionRange){var k=m.val().length;m[0].setSelectionRange(k,k)}};if(j.length>0){d()}else{f.find("li.notice-reply-placeholder").remove();var g=$("li.notice-reply",f);if(g.length==0){g=$('<li class="notice-reply"></li>');var c=function(k){var l=document._importNode(k,true);g.append(l);f.append(g);var m=j=$(l);SN.Init.NoticeFormSetup(m);d()};if(SN.C.I.NoticeFormMaster){c(SN.C.I.NoticeFormMaster)}else{var a=$("#form_notice").attr("action");$.get(a,{ajax:1},function(k,m,l){c($("form",k)[0])})}}}},NoticeInlineReplyPlaceholder:function(b){var a=b.find("ul.threaded-replies");var c=$('<li class="notice-reply-placeholder"><input class="placeholder"></li>');c.find("input").val(SN.msg("reply_placeholder")).focus(function(){SN.U.NoticeInlineReplyTrigger(b);return false});a.append(c)},NoticeInlineReplySetup:function(){$(".threaded-replies").each(function(){var b=$(this);var a=b.closest(".notice");SN.U.NoticeInlineReplyPlaceholder(a)})},NoticeRepeat:function(){$(".form_repeat").live("click",function(a){a.preventDefault();SN.U.NoticeRepeatConfirmation($(this));return false})},NoticeRepeatConfirmation:function(a){var c=a.find(".submit");var b=c.clone();b.addClass("submit_dialogbox").removeClass("submit");a.append(b);b.bind("click",function(){SN.U.FormXHR(a);return false});c.hide();a.addClass("dialogbox").append('<button class="close">&#215;</button>').closest(".notice-options").addClass("opaque");a.find("button.close").click(function(){$(this).remove();a.removeClass("dialogbox").closest(".notice-options").removeClass("opaque");a.find(".submit_dialogbox").remove();a.find(".submit").show();return false})},NoticeAttachments:function(){$(".notice a.attachment").each(function(){SN.U.NoticeWithAttachment($(this).closest(".notice"))})},NoticeWithAttachment:function(b){if(b.find(".attachment").length===0){return}var a=b.find(".attachment.more");if(a.length>0){$(a[0]).click(function(){var c=$(this);c.addClass(SN.C.S.Processing);$.get(c.attr("href")+"/ajax",null,function(d){c.parent(".entry-content").html($(d).find("#attachment_view .entry-content").html())});return false}).attr("title",SN.msg("showmore_tooltip"))}},NoticeDataAttach:function(b){var a=b.find("input[type=file]");a.change(function(f){b.find(".attach-status").remove();var d=$(this).val();if(!d){return false}var c=$('<div class="attach-status '+SN.C.S.Success+'"><code></code> <button class="close">&#215;</button></div>');c.find("code").text(d);c.find("button").click(function(){c.remove();a.val("");return false});b.append(c);if(typeof this.files=="object"){for(var e=0;e<this.files.length;e++){SN.U.PreviewAttach(b,this.files[e])}}})},maxFileSize:function(b){var a=$(b).find("input[name=MAX_FILE_SIZE]").attr("value");if(a){return parseInt(a)}else{return 0}},PreviewAttach:function(d,c){var e=c.type+" "+Math.round(c.size/1024)+"KB";var f=true;var h;if(typeof window.createObjectURL!="undefined"){h=function(i,j){j(window.createObjectURL(i))}}else{if(typeof window.FileReader!="undefined"){h=function(j,k){var i=new FileReader();i.onload=function(l){k(i.result)};i.readAsDataURL(j)}}else{f=false}}var a=["image/png","image/jpeg","image/gif","image/svg+xml"];if($.inArray(c.type,a)==-1){f=false}var g=8*1024*1024;if(c.size>g){f=false}if(f){h(c,function(j){var i=$("<img>").attr("title",e).attr("alt",e).attr("src",j).attr("style","height: 120px");d.find(".attach-status").append(i)})}else{var b=$("<div></div>").text(e);d.find(".attach-status").append(b)}},NoticeLocationAttach:function(a){var e=a.find("[name=lat]");var k=a.find("[name=lon]");var g=a.find("[name=location_ns]").val();var l=a.find("[name=location_id]").val();var b="";var d=a.find("[name=notice_data-geo]");var c=a.find("[name=notice_data-geo]");var j=a.find("label.notice_data-geo");function f(n){j.attr("title",jQuery.trim(j.text())).removeClass("checked");a.find("[name=lat]").val("");a.find("[name=lon]").val("");a.find("[name=location_ns]").val("");a.find("[name=location_id]").val("");a.find("[name=notice_data-geo]").attr("checked",false);$.cookie(SN.C.S.NoticeDataGeoCookie,"disabled",{path:"/"});if(n){a.find(".geo_status_wrapper").removeClass("success").addClass("error");a.find(".geo_status_wrapper .geo_status").text(n)}else{a.find(".geo_status_wrapper").remove()}}function m(n,o){SN.U.NoticeGeoStatus(a,"Looking up place name...");$.getJSON(n,o,function(p){var q,r;if(typeof(p.location_ns)!="undefined"){a.find("[name=location_ns]").val(p.location_ns);q=p.location_ns}if(typeof(p.location_id)!="undefined"){a.find("[name=location_id]").val(p.location_id);r=p.location_id}if(typeof(p.name)=="undefined"){NLN_text=o.lat+";"+o.lon}else{NLN_text=p.name}SN.U.NoticeGeoStatus(a,NLN_text,o.lat,o.lon,p.url);j.attr("title",NoticeDataGeo_text.ShareDisable+" ("+NLN_text+")");a.find("[name=lat]").val(o.lat);a.find("[name=lon]").val(o.lon);a.find("[name=location_ns]").val(q);a.find("[name=location_id]").val(r);a.find("[name=notice_data-geo]").attr("checked",true);var s={NLat:o.lat,NLon:o.lon,NLNS:q,NLID:r,NLN:NLN_text,NLNU:p.url,NDG:true};$.cookie(SN.C.S.NoticeDataGeoCookie,JSON.stringify(s),{path:"/"})})}if(c.length>0){if($.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){c.attr("checked",false)}else{c.attr("checked",true)}var h=a.find(".notice_data-geo_wrap");var i=h.attr("data-api");j.attr("title",j.text());c.change(function(){if(c.attr("checked")===true||$.cookie(SN.C.S.NoticeDataGeoCookie)===null){j.attr("title",NoticeDataGeo_text.ShareDisable).addClass("checked");if($.cookie(SN.C.S.NoticeDataGeoCookie)===null||$.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){if(navigator.geolocation){SN.U.NoticeGeoStatus(a,"Requesting location from browser...");navigator.geolocation.getCurrentPosition(function(p){a.find("[name=lat]").val(p.coords.latitude);a.find("[name=lon]").val(p.coords.longitude);var q={lat:p.coords.latitude,lon:p.coords.longitude,token:$("#token").val()};m(i,q)},function(p){switch(p.code){case p.PERMISSION_DENIED:f("Location permission denied.");break;case p.TIMEOUT:f("Location lookup timeout.");break}},{timeout:10000})}else{if(e.length>0&&k.length>0){var n={lat:e,lon:k,token:$("#token").val()};m(i,n)}else{f();c.remove();j.remove()}}}else{var o=JSON.parse($.cookie(SN.C.S.NoticeDataGeoCookie));a.find("[name=lat]").val(o.NLat);a.find("[name=lon]").val(o.NLon);a.find("[name=location_ns]").val(o.NLNS);a.find("[name=location_id]").val(o.NLID);a.find("[name=notice_data-geo]").attr("checked",o.NDG);SN.U.NoticeGeoStatus(a,o.NLN,o.NLat,o.NLon,o.NLNU);j.attr("title",NoticeDataGeo_text.ShareDisable+" ("+o.NLN+")").addClass("checked")}}else{f()}}).change()}},NoticeGeoStatus:function(e,a,f,g,c){var h=e.find(".geo_status_wrapper");if(h.length==0){h=$('<div class="'+SN.C.S.Success+' geo_status_wrapper"><button class="close" style="float:right">&#215;</button><div class="geo_status"></div></div>');h.find("button.close").click(function(){e.find("[name=notice_data-geo]").removeAttr("checked").change();return false});e.append(h)}var b;if(c){b=$("<a></a>").attr("href",c)}else{b=$("<span></span>")}b.text(a);if(f||g){var d=f+";"+g;b.attr("title",d);if(!a){b.text(d)}}h.find(".geo_status").empty().append(b)},NewDirectMessage:function(){NDM=$(".entity_send-a-message a");NDM.attr({href:NDM.attr("href")+"&ajax=1"});NDM.bind("click",function(){var a=$(".entity_send-a-message form");if(a.length===0){$(this).addClass(SN.C.S.Processing);$.get(NDM.attr("href"),null,function(b){$(".entity_send-a-message").append(document._importNode($("form",b)[0],true));a=$(".entity_send-a-message .form_notice");SN.U.FormNoticeXHR(a);SN.U.FormNoticeEnhancements(a);a.append('<button class="close">&#215;</button>');$(".entity_send-a-message button").click(function(){a.hide();return false});NDM.removeClass(SN.C.S.Processing)})}else{a.show();$(".entity_send-a-message textarea").focus()}return false})},GetFullYear:function(c,d,a){var b=new Date();b.setFullYear(c,d,a);return b},StatusNetInstance:{Set:function(b){var a=SN.U.StatusNetInstance.Get();if(a!==null){b=$.extend(a,b)}$.cookie(SN.C.S.StatusNetInstance,JSON.stringify(b),{path:"/",expires:SN.U.GetFullYear(2029,0,1)})},Get:function(){var a=$.cookie(SN.C.S.StatusNetInstance);if(a!==null){return JSON.parse(a)}return null},Delete:function(){$.cookie(SN.C.S.StatusNetInstance,null)}},belongsOnTimeline:function(b){var a=$("body").attr("id");if(a=="public"){return true}var c=$("#nav_profile a").attr("href");if(c){var d=$(b).find(".vcard.author a.url").attr("href");if(d==c){if(a=="all"||a=="showstream"){return true}}}return false},switchInputFormTab:function(a){$(".input_form_nav_tab.current").removeClass("current");$("#input_form_nav_"+a).addClass("current");$(".input_form.current").removeClass("current");$("#input_form_"+a).addClass("current").find(".ajax-notice").each(function(){var b=$(this);SN.Init.NoticeFormSetup(b)})}},Init:{NoticeForm:function(){if($("body.user_in").length>0){$("#input_form_placeholder input.placeholder").focus(function(){SN.U.switchInputFormTab("status")});$("body").bind("click",function(c){var a=$("li.notice-reply");if(a.length>0){var b=$(c.target);a.each(function(){var g=$(this);if(g.has(c.target).length==0){var e=g.find(".notice_data-text:first");var f=$.trim(e.val());if(f==""||f==e.data("initialText")){var d=g.closest("li.notice");g.remove();SN.U.NoticeInlineReplyPlaceholder(d)}}})}})}},NoticeFormSetup:function(a){if(!a.data("NoticeFormSetup")){SN.U.NoticeLocationAttach(a);SN.U.FormNoticeXHR(a);SN.U.FormNoticeEnhancements(a);SN.U.NoticeDataAttach(a);a.data("NoticeFormSetup",true)}},Notices:function(){if($("body.user_in").length>0){var a=$(".form_notice:first");if(a.length>0){SN.C.I.NoticeFormMaster=document._importNode(a[0],true)}SN.U.NoticeRepeat();SN.U.NoticeReply();SN.U.NoticeInlineReplySetup()}SN.U.NoticeAttachments()},EntityActions:function(){if($("body.user_in").length>0){SN.U.NewDirectMessage()}},Login:function(){if(SN.U.StatusNetInstance.Get()!==null){var a=SN.U.StatusNetInstance.Get().Nickname;if(a!==null){$("#form_login #nickname").val(a)}}$("#form_login").bind("submit",function(){SN.U.StatusNetInstance.Set({Nickname:$("#form_login #nickname").val()});return true})},AjaxForms:function(){$("form.ajax").live("submit",function(){SN.U.FormXHR($(this));return false})},UploadForms:function(){$("input[type=file]").change(function(d){if(typeof this.files=="object"&&this.files.length>0){var c=0;for(var b=0;b<this.files.length;b++){c+=this.files[b].size}var a=SN.U.maxFileSize($(this.form));if(a>0&&c>a){var e="File too large: maximum upload size is %d bytes.";alert(e.replace("%d",a));$(this).val("");d.preventDefault();return false}}})}}};$(document).ready(function(){SN.Init.AjaxForms();SN.Init.UploadForms();if($("."+SN.C.S.FormNotice).length>0){SN.Init.NoticeForm()}if($("#content .notices").length>0){SN.Init.Notices()}if($("#content .entity_actions").length>0){SN.Init.EntityActions()}if($("#form_login").length>0){SN.Init.Login()}});if(!document.ELEMENT_NODE){document.ELEMENT_NODE=1;document.ATTRIBUTE_NODE=2;document.TEXT_NODE=3;document.CDATA_SECTION_NODE=4;document.ENTITY_REFERENCE_NODE=5;document.ENTITY_NODE=6;document.PROCESSING_INSTRUCTION_NODE=7;document.COMMENT_NODE=8;document.DOCUMENT_NODE=9;document.DOCUMENT_TYPE_NODE=10;document.DOCUMENT_FRAGMENT_NODE=11;document.NOTATION_NODE=12}document._importNode=function(e,a){switch(e.nodeType){case document.ELEMENT_NODE:var d=document.createElement(e.nodeName);if(e.attributes&&e.attributes.length>0){for(var c=0,b=e.attributes.length;c<b;){if(e.attributes[c].nodeName=="class"){d.className=e.getAttribute(e.attributes[c++].nodeName)}else{d.setAttribute(e.attributes[c].nodeName,e.getAttribute(e.attributes[c++].nodeName))}}}if(a&&e.childNodes&&e.childNodes.length>0){for(var c=0,b=e.childNodes.length;c<b;){d.appendChild(document._importNode(e.childNodes[c++],a))}}return d;break;case document.TEXT_NODE:case document.CDATA_SECTION_NODE:case document.COMMENT_NODE:return document.createTextNode(e.nodeValue);break}};if(typeof navigator.geolocation=="undefined"||navigator.geolocation.shim){(function(){(function(){if(window.google&&google.gears){return}var c=null;if(typeof GearsFactory!="undefined"){c=new GearsFactory()}else{try{c=new ActiveXObject("Gears.Factory");if(c.getBuildInfo().indexOf("ie_mobile")!=-1){c.privateSetGlobalObject(this)}}catch(d){if((typeof navigator.mimeTypes!="undefined")&&navigator.mimeTypes["application/x-googlegears"]){c=document.createElement("object");c.style.display="none";c.width=0;c.height=0;c.type="application/x-googlegears";document.documentElement.appendChild(c)}}}if(!c){return}if(!window.google){google={}}if(!google.gears){google.gears={factory:c}}})();var a=(function(){var d=google.gears.factory.create("beta.geolocation");var c=function(f,e){return function(g){f(g);e.lastPosition=g}};return{shim:true,type:"Gears",lastPosition:null,getCurrentPosition:function(e,g,h){var f=this;var i=c(e,f);d.getCurrentPosition(i,g,h)},watchPosition:function(e,f,g){d.watchPosition(e,f,g)},clearWatch:function(e){d.clearWatch(e)},getPermission:function(g,e,f){d.getPermission(g,e,f)}}});var b=(function(){var i=false;var e=function(){if(!d()&&!i){i=true;var j=document.createElement("script");j.src=(document.location.protocol=="https:"?"https://":"http://")+"www.google.com/jsapi?callback=_google_loader_apiLoaded";j.type="text/javascript";document.getElementsByTagName("body")[0].appendChild(j)}};var c=[];var h=function(j){c.push(j)};var f=function(){if(d()){while(c.length>0){var j=c.pop();j()}}};window._google_loader_apiLoaded=function(){f()};var d=function(){return(window.google&&google.loader)};var g=function(j){if(d()){return true}h(j);e();return false};e();return{shim:true,type:"ClientLocation",lastPosition:null,getCurrentPosition:function(k,n,o){var m=this;if(!g(function(){m.getCurrentPosition(k,n,o)})){return}if(google.loader.ClientLocation){var l=google.loader.ClientLocation;var j={coords:{latitude:l.latitude,longitude:l.longitude,altitude:null,accuracy:43000,altitudeAccuracy:null,heading:null,speed:null},address:{city:l.address.city,country:l.address.country,country_code:l.address.country_code,region:l.address.region},timestamp:new Date()};k(j);this.lastPosition=j}else{if(n==="function"){n({code:3,message:"Using the Google ClientLocation API and it is not able to calculate a location."})}}},watchPosition:function(j,l,m){this.getCurrentPosition(j,l,m);var k=this;var n=setInterval(function(){k.getCurrentPosition(j,l,m)},10000);return n},clearWatch:function(j){clearInterval(j)},getPermission:function(l,j,k){return true}}});navigator.geolocation=(window.google&&google.gears)?a():b()})()};
\ No newline at end of file
+var SN={C:{I:{CounterBlackout:false,MaxLength:140,PatternUsername:/^[0-9a-zA-Z\-_.]*$/,HTTP20x30x:[200,201,202,203,204,205,206,300,301,302,303,304,305,306,307],NoticeFormMaster:null},S:{Disabled:"disabled",Warning:"warning",Error:"error",Success:"success",Processing:"processing",CommandResult:"command_result",FormNotice:"form_notice",NoticeDataGeo:"notice_data-geo",NoticeDataGeoCookie:"NoticeDataGeo",NoticeDataGeoSelected:"notice_data-geo_selected",StatusNetInstance:"StatusNetInstance"}},messages:{},msg:function(a){if(typeof SN.messages[a]=="undefined"){return"["+a+"]"}else{return SN.messages[a]}},U:{FormNoticeEnhancements:function(b){if(jQuery.data(b[0],"ElementData")===undefined){MaxLength=b.find(".count").text();if(typeof(MaxLength)=="undefined"){MaxLength=SN.C.I.MaxLength}jQuery.data(b[0],"ElementData",{MaxLength:MaxLength});SN.U.Counter(b);NDT=b.find(".notice_data-text:first");NDT.bind("keyup",function(c){SN.U.Counter(b)});var a=function(c){window.setTimeout(function(){SN.U.Counter(b)},50)};NDT.bind("cut",a).bind("paste",a)}else{b.find(".count").text(jQuery.data(b[0],"ElementData").MaxLength)}},Counter:function(d){SN.C.I.FormNoticeCurrent=d;var b=jQuery.data(d[0],"ElementData").MaxLength;if(b<=0){return}var c=b-SN.U.CharacterCount(d);var a=d.find(".count");if(c.toString()!=a.text()){if(!SN.C.I.CounterBlackout||c===0){if(a.text()!=String(c)){a.text(c)}if(c<0){d.addClass(SN.C.S.Warning)}else{d.removeClass(SN.C.S.Warning)}if(!SN.C.I.CounterBlackout){SN.C.I.CounterBlackout=true;SN.C.I.FormNoticeCurrent=d;window.setTimeout("SN.U.ClearCounterBlackout(SN.C.I.FormNoticeCurrent);",500)}}}},CharacterCount:function(a){return a.find(".notice_data-text:first").val().length},ClearCounterBlackout:function(a){SN.C.I.CounterBlackout=false;SN.U.Counter(a)},RewriteAjaxAction:function(a){if(document.location.protocol=="https:"&&a.substr(0,5)=="http:"){return a.replace(/^http:\/\/[^:\/]+/,"https://"+document.location.host)}else{return a}},FormXHR:function(a){$.ajax({type:"POST",dataType:"xml",url:SN.U.RewriteAjaxAction(a.attr("action")),data:a.serialize()+"&ajax=1",beforeSend:function(b){a.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(c,d,b){alert(b||d)},success:function(b,c){if(typeof($("form",b)[0])!="undefined"){form_new=document._importNode($("form",b)[0],true);a.replaceWith(form_new)}else{a.replaceWith(document._importNode($("p",b)[0],true))}}})},FormNoticeXHR:function(b){SN.C.I.NoticeDataGeo={};b.append('<input type="hidden" name="ajax" value="1"/>');b.attr("action",SN.U.RewriteAjaxAction(b.attr("action")));var c=function(d,e){b.append($('<p class="form_response"></p>').addClass(d).text(e))};var a=function(){b.find(".form_response").remove()};b.ajaxForm({dataType:"xml",timeout:"60000",beforeSend:function(d){if(b.find(".notice_data-text:first").val()==""){b.addClass(SN.C.S.Warning);return false}b.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled);SN.U.normalizeGeoData(b);return true},error:function(f,g,e){b.removeClass(SN.C.S.Processing).find(".submit").removeClass(SN.C.S.Disabled).removeAttr(SN.C.S.Disabled,SN.C.S.Disabled);a();if(g=="timeout"){c("error","Sorry! We had trouble sending your notice. The servers are overloaded. Please try again, and contact the site administrator if this problem persists.")}else{var d=SN.U.GetResponseXML(f);if($("."+SN.C.S.Error,d).length>0){b.append(document._importNode($("."+SN.C.S.Error,d)[0],true))}else{if(parseInt(f.status)===0||jQuery.inArray(parseInt(f.status),SN.C.I.HTTP20x30x)>=0){b.resetForm().find(".attach-status").remove();SN.U.FormNoticeEnhancements(b)}else{c("error","(Sorry! We had trouble sending your notice ("+f.status+" "+f.statusText+"). Please report the problem to the site administrator if this happens again.")}}}},success:function(i,f){a();var n=$("#"+SN.C.S.Error,i);if(n.length>0){c("error",n.text())}else{if($("body")[0].id=="bookmarklet"){self.close()}var d=$("#"+SN.C.S.CommandResult,i);if(d.length>0){c("success",d.text())}else{var m=document._importNode($("li",i)[0],true);var k=$("#notices_primary .notices:first");var l=b.closest("li.notice-reply");if(l.length>0){var e=$(m).attr("id");if($("#"+e).length==0){var j=l.closest("li.notice");l.replaceWith(m);SN.U.NoticeInlineReplyPlaceholder(j)}else{l.remove()}}else{if(k.length>0&&SN.U.belongsOnTimeline(m)){if($("#"+m.id).length===0){var h=b.find("[name=inreplyto]").val();var g="#notices_primary #notice-"+h;if($("body")[0].id=="conversation"){if(h.length>0&&$(g+" .notices").length<1){$(g).append('<ul class="notices"></ul>')}$($(g+" .notices")[0]).append(m)}else{k.prepend(m)}$("#"+m.id).css({display:"none"}).fadeIn(2500);SN.U.NoticeWithAttachment($("#"+m.id));SN.U.NoticeReplyTo($("#"+m.id));SN.U.switchInputFormTab("placeholder")}}else{c("success",$("title",i).text())}}}b.resetForm();b.find("[name=inreplyto]").val("");b.find(".attach-status").remove();SN.U.FormNoticeEnhancements(b)}},complete:function(d,e){b.removeClass(SN.C.S.Processing).find(".submit").removeAttr(SN.C.S.Disabled).removeClass(SN.C.S.Disabled);b.find("[name=lat]").val(SN.C.I.NoticeDataGeo.NLat);b.find("[name=lon]").val(SN.C.I.NoticeDataGeo.NLon);b.find("[name=location_ns]").val(SN.C.I.NoticeDataGeo.NLNS);b.find("[name=location_id]").val(SN.C.I.NoticeDataGeo.NLID);b.find("[name=notice_data-geo]").attr("checked",SN.C.I.NoticeDataGeo.NDG)}})},normalizeGeoData:function(a){SN.C.I.NoticeDataGeo.NLat=a.find("[name=lat]").val();SN.C.I.NoticeDataGeo.NLon=a.find("[name=lon]").val();SN.C.I.NoticeDataGeo.NLNS=a.find("[name=location_ns]").val();SN.C.I.NoticeDataGeo.NLID=a.find("[name=location_id]").val();SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked");var b=$.cookie(SN.C.S.NoticeDataGeoCookie);if(b!==null&&b!="disabled"){b=JSON.parse(b);SN.C.I.NoticeDataGeo.NLat=a.find("[name=lat]").val(b.NLat).val();SN.C.I.NoticeDataGeo.NLon=a.find("[name=lon]").val(b.NLon).val();if(b.NLNS){SN.C.I.NoticeDataGeo.NLNS=a.find("[name=location_ns]").val(b.NLNS).val();SN.C.I.NoticeDataGeo.NLID=a.find("[name=location_id]").val(b.NLID).val()}else{a.find("[name=location_ns]").val("");a.find("[name=location_id]").val("")}}if(b=="disabled"){SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked",false).attr("checked")}else{SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked",true).attr("checked")}},GetResponseXML:function(b){try{return b.responseXML}catch(a){return(new DOMParser()).parseFromString(b.responseText,"text/xml")}},NoticeReply:function(){if($("#content .notice_reply").length>0){$("#content .notice").each(function(){SN.U.NoticeReplyTo($(this))})}},NoticeReplyTo:function(a){a.find(".notice_reply").live("click",function(c){c.preventDefault();var b=($(".author .nickname",a).length>0)?$($(".author .nickname",a)[0]):$(".author .nickname.uid");SN.U.NoticeInlineReplyTrigger(a,"@"+b.text());return false})},NoticeInlineReplyTrigger:function(h,i){var b=$($(".notice_id",h)[0]).text();var e=h;var f=h.closest(".notices");if(f.hasClass("threaded-replies")){e=f.closest(".notice")}else{f=$("ul.threaded-replies",h);if(f.length==0){f=$('<ul class="notices threaded-replies xoxo"></ul>');h.append(f)}}var j=$(".notice-reply-form",f);var d=function(){j.find("input[name=inreplyto]").val(b);var m=j.find("textarea");if(m.length==0){throw"No textarea"}var l="";if(i){l=i+" "}m.val(l+m.val().replace(RegExp(l,"i"),""));m.data("initialText",$.trim(i+""));m.focus();if(m[0].setSelectionRange){var k=m.val().length;m[0].setSelectionRange(k,k)}};if(j.length>0){d()}else{f.find("li.notice-reply-placeholder").remove();var g=$("li.notice-reply",f);if(g.length==0){g=$('<li class="notice-reply"></li>');var c=function(k){var l=document._importNode(k,true);g.append(l);f.append(g);var m=j=$(l);SN.Init.NoticeFormSetup(m);d()};if(SN.C.I.NoticeFormMaster){c(SN.C.I.NoticeFormMaster)}else{var a=$("#form_notice").attr("action");$.get(a,{ajax:1},function(k,m,l){c($("form",k)[0])})}}}},NoticeInlineReplyPlaceholder:function(b){var a=b.find("ul.threaded-replies");var c=$('<li class="notice-reply-placeholder"><input class="placeholder"></li>');c.find("input").val(SN.msg("reply_placeholder")).focus(function(){SN.U.NoticeInlineReplyTrigger(b);return false});a.append(c)},NoticeInlineReplySetup:function(){$(".threaded-replies").each(function(){var b=$(this);var a=b.closest(".notice");SN.U.NoticeInlineReplyPlaceholder(a)})},NoticeRepeat:function(){$(".form_repeat").live("click",function(a){a.preventDefault();SN.U.NoticeRepeatConfirmation($(this));return false})},NoticeRepeatConfirmation:function(a){var c=a.find(".submit");var b=c.clone();b.addClass("submit_dialogbox").removeClass("submit");a.append(b);b.bind("click",function(){SN.U.FormXHR(a);return false});c.hide();a.addClass("dialogbox").append('<button class="close">&#215;</button>').closest(".notice-options").addClass("opaque");a.find("button.close").click(function(){$(this).remove();a.removeClass("dialogbox").closest(".notice-options").removeClass("opaque");a.find(".submit_dialogbox").remove();a.find(".submit").show();return false})},NoticeAttachments:function(){$(".notice a.attachment").each(function(){SN.U.NoticeWithAttachment($(this).closest(".notice"))})},NoticeWithAttachment:function(b){if(b.find(".attachment").length===0){return}var a=b.find(".attachment.more");if(a.length>0){$(a[0]).click(function(){var c=$(this);c.addClass(SN.C.S.Processing);$.get(c.attr("href")+"/ajax",null,function(d){c.parent(".entry-content").html($(d).find("#attachment_view .entry-content").html())});return false}).attr("title",SN.msg("showmore_tooltip"))}},NoticeDataAttach:function(b){var a=b.find("input[type=file]");a.change(function(f){b.find(".attach-status").remove();var d=$(this).val();if(!d){return false}var c=$('<div class="attach-status '+SN.C.S.Success+'"><code></code> <button class="close">&#215;</button></div>');c.find("code").text(d);c.find("button").click(function(){c.remove();a.val("");return false});b.append(c);if(typeof this.files=="object"){for(var e=0;e<this.files.length;e++){SN.U.PreviewAttach(b,this.files[e])}}})},maxFileSize:function(b){var a=$(b).find("input[name=MAX_FILE_SIZE]").attr("value");if(a){return parseInt(a)}else{return 0}},PreviewAttach:function(d,c){var e=c.type+" "+Math.round(c.size/1024)+"KB";var f=true;var h;if(typeof window.createObjectURL!="undefined"){h=function(i,j){j(window.createObjectURL(i))}}else{if(typeof window.FileReader!="undefined"){h=function(j,k){var i=new FileReader();i.onload=function(l){k(i.result)};i.readAsDataURL(j)}}else{f=false}}var a=["image/png","image/jpeg","image/gif","image/svg+xml"];if($.inArray(c.type,a)==-1){f=false}var g=8*1024*1024;if(c.size>g){f=false}if(f){h(c,function(j){var i=$("<img>").attr("title",e).attr("alt",e).attr("src",j).attr("style","height: 120px");d.find(".attach-status").append(i)})}else{var b=$("<div></div>").text(e);d.find(".attach-status").append(b)}},NoticeLocationAttach:function(a){var e=a.find("[name=lat]");var k=a.find("[name=lon]");var g=a.find("[name=location_ns]").val();var l=a.find("[name=location_id]").val();var b="";var d=a.find("[name=notice_data-geo]");var c=a.find("[name=notice_data-geo]");var j=a.find("label.notice_data-geo");function f(n){j.attr("title",jQuery.trim(j.text())).removeClass("checked");a.find("[name=lat]").val("");a.find("[name=lon]").val("");a.find("[name=location_ns]").val("");a.find("[name=location_id]").val("");a.find("[name=notice_data-geo]").attr("checked",false);$.cookie(SN.C.S.NoticeDataGeoCookie,"disabled",{path:"/"});if(n){a.find(".geo_status_wrapper").removeClass("success").addClass("error");a.find(".geo_status_wrapper .geo_status").text(n)}else{a.find(".geo_status_wrapper").remove()}}function m(n,o){SN.U.NoticeGeoStatus(a,"Looking up place name...");$.getJSON(n,o,function(p){var q,r;if(typeof(p.location_ns)!="undefined"){a.find("[name=location_ns]").val(p.location_ns);q=p.location_ns}if(typeof(p.location_id)!="undefined"){a.find("[name=location_id]").val(p.location_id);r=p.location_id}if(typeof(p.name)=="undefined"){NLN_text=o.lat+";"+o.lon}else{NLN_text=p.name}SN.U.NoticeGeoStatus(a,NLN_text,o.lat,o.lon,p.url);j.attr("title",NoticeDataGeo_text.ShareDisable+" ("+NLN_text+")");a.find("[name=lat]").val(o.lat);a.find("[name=lon]").val(o.lon);a.find("[name=location_ns]").val(q);a.find("[name=location_id]").val(r);a.find("[name=notice_data-geo]").attr("checked",true);var s={NLat:o.lat,NLon:o.lon,NLNS:q,NLID:r,NLN:NLN_text,NLNU:p.url,NDG:true};$.cookie(SN.C.S.NoticeDataGeoCookie,JSON.stringify(s),{path:"/"})})}if(c.length>0){if($.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){c.attr("checked",false)}else{c.attr("checked",true)}var h=a.find(".notice_data-geo_wrap");var i=h.attr("data-api");j.attr("title",j.text());c.change(function(){if(c.attr("checked")===true||$.cookie(SN.C.S.NoticeDataGeoCookie)===null){j.attr("title",NoticeDataGeo_text.ShareDisable).addClass("checked");if($.cookie(SN.C.S.NoticeDataGeoCookie)===null||$.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){if(navigator.geolocation){SN.U.NoticeGeoStatus(a,"Requesting location from browser...");navigator.geolocation.getCurrentPosition(function(p){a.find("[name=lat]").val(p.coords.latitude);a.find("[name=lon]").val(p.coords.longitude);var q={lat:p.coords.latitude,lon:p.coords.longitude,token:$("#token").val()};m(i,q)},function(p){switch(p.code){case p.PERMISSION_DENIED:f("Location permission denied.");break;case p.TIMEOUT:f("Location lookup timeout.");break}},{timeout:10000})}else{if(e.length>0&&k.length>0){var n={lat:e,lon:k,token:$("#token").val()};m(i,n)}else{f();c.remove();j.remove()}}}else{var o=JSON.parse($.cookie(SN.C.S.NoticeDataGeoCookie));a.find("[name=lat]").val(o.NLat);a.find("[name=lon]").val(o.NLon);a.find("[name=location_ns]").val(o.NLNS);a.find("[name=location_id]").val(o.NLID);a.find("[name=notice_data-geo]").attr("checked",o.NDG);SN.U.NoticeGeoStatus(a,o.NLN,o.NLat,o.NLon,o.NLNU);j.attr("title",NoticeDataGeo_text.ShareDisable+" ("+o.NLN+")").addClass("checked")}}else{f()}}).change()}},NoticeGeoStatus:function(e,a,f,g,c){var h=e.find(".geo_status_wrapper");if(h.length==0){h=$('<div class="'+SN.C.S.Success+' geo_status_wrapper"><button class="close" style="float:right">&#215;</button><div class="geo_status"></div></div>');h.find("button.close").click(function(){e.find("[name=notice_data-geo]").removeAttr("checked").change();return false});e.append(h)}var b;if(c){b=$("<a></a>").attr("href",c)}else{b=$("<span></span>")}b.text(a);if(f||g){var d=f+";"+g;b.attr("title",d);if(!a){b.text(d)}}h.find(".geo_status").empty().append(b)},NewDirectMessage:function(){NDM=$(".entity_send-a-message a");NDM.attr({href:NDM.attr("href")+"&ajax=1"});NDM.bind("click",function(){var a=$(".entity_send-a-message form");if(a.length===0){$(this).addClass(SN.C.S.Processing);$.get(NDM.attr("href"),null,function(b){$(".entity_send-a-message").append(document._importNode($("form",b)[0],true));a=$(".entity_send-a-message .form_notice");SN.U.FormNoticeXHR(a);SN.U.FormNoticeEnhancements(a);a.append('<button class="close">&#215;</button>');$(".entity_send-a-message button").click(function(){a.hide();return false});NDM.removeClass(SN.C.S.Processing)})}else{a.show();$(".entity_send-a-message textarea").focus()}return false})},GetFullYear:function(c,d,a){var b=new Date();b.setFullYear(c,d,a);return b},StatusNetInstance:{Set:function(b){var a=SN.U.StatusNetInstance.Get();if(a!==null){b=$.extend(a,b)}$.cookie(SN.C.S.StatusNetInstance,JSON.stringify(b),{path:"/",expires:SN.U.GetFullYear(2029,0,1)})},Get:function(){var a=$.cookie(SN.C.S.StatusNetInstance);if(a!==null){return JSON.parse(a)}return null},Delete:function(){$.cookie(SN.C.S.StatusNetInstance,null)}},belongsOnTimeline:function(b){var a=$("body").attr("id");if(a=="public"){return true}var c=$("#nav_profile a").attr("href");if(c){var d=$(b).find(".vcard.author a.url").attr("href");if(d==c){if(a=="all"||a=="showstream"){return true}}}return false},switchInputFormTab:function(a){$(".input_form_nav_tab.current").removeClass("current");$("#input_form_nav_"+a).addClass("current");$(".input_form.current").removeClass("current");$("#input_form_"+a).addClass("current").find(".ajax-notice").each(function(){var b=$(this);SN.Init.NoticeFormSetup(b)}).find("textarea:first").focus()}},Init:{NoticeForm:function(){if($("body.user_in").length>0){$("#input_form_placeholder input.placeholder").focus(function(){SN.U.switchInputFormTab("status")});$("body").bind("click",function(g){var d=$("#content .input_forms div.current");if(d.length>0){if($("#content .input_forms").has(g.target).length==0){var a=d.find('textarea, input[type=text], input[type=""]');var c=false;a.each(function(){c=c||$(this).val()});if(!c){SN.U.switchInputFormTab("placeholder")}}}var b=$("li.notice-reply");if(b.length>0){var f=$(g.target);b.each(function(){var j=$(this);if(j.has(g.target).length==0){var h=j.find(".notice_data-text:first");var i=$.trim(h.val());if(i==""||i==h.data("initialText")){var e=j.closest("li.notice");j.remove();SN.U.NoticeInlineReplyPlaceholder(e)}}})}})}},NoticeFormSetup:function(a){if(!a.data("NoticeFormSetup")){SN.U.NoticeLocationAttach(a);SN.U.FormNoticeXHR(a);SN.U.FormNoticeEnhancements(a);SN.U.NoticeDataAttach(a);a.data("NoticeFormSetup",true)}},Notices:function(){if($("body.user_in").length>0){var a=$(".form_notice:first");if(a.length>0){SN.C.I.NoticeFormMaster=document._importNode(a[0],true)}SN.U.NoticeRepeat();SN.U.NoticeReply();SN.U.NoticeInlineReplySetup()}SN.U.NoticeAttachments()},EntityActions:function(){if($("body.user_in").length>0){SN.U.NewDirectMessage()}},Login:function(){if(SN.U.StatusNetInstance.Get()!==null){var a=SN.U.StatusNetInstance.Get().Nickname;if(a!==null){$("#form_login #nickname").val(a)}}$("#form_login").bind("submit",function(){SN.U.StatusNetInstance.Set({Nickname:$("#form_login #nickname").val()});return true})},AjaxForms:function(){$("form.ajax").live("submit",function(){SN.U.FormXHR($(this));return false})},UploadForms:function(){$("input[type=file]").change(function(d){if(typeof this.files=="object"&&this.files.length>0){var c=0;for(var b=0;b<this.files.length;b++){c+=this.files[b].size}var a=SN.U.maxFileSize($(this.form));if(a>0&&c>a){var e="File too large: maximum upload size is %d bytes.";alert(e.replace("%d",a));$(this).val("");d.preventDefault();return false}}})}}};$(document).ready(function(){SN.Init.AjaxForms();SN.Init.UploadForms();if($("."+SN.C.S.FormNotice).length>0){SN.Init.NoticeForm()}if($("#content .notices").length>0){SN.Init.Notices()}if($("#content .entity_actions").length>0){SN.Init.EntityActions()}if($("#form_login").length>0){SN.Init.Login()}});if(!document.ELEMENT_NODE){document.ELEMENT_NODE=1;document.ATTRIBUTE_NODE=2;document.TEXT_NODE=3;document.CDATA_SECTION_NODE=4;document.ENTITY_REFERENCE_NODE=5;document.ENTITY_NODE=6;document.PROCESSING_INSTRUCTION_NODE=7;document.COMMENT_NODE=8;document.DOCUMENT_NODE=9;document.DOCUMENT_TYPE_NODE=10;document.DOCUMENT_FRAGMENT_NODE=11;document.NOTATION_NODE=12}document._importNode=function(e,a){switch(e.nodeType){case document.ELEMENT_NODE:var d=document.createElement(e.nodeName);if(e.attributes&&e.attributes.length>0){for(var c=0,b=e.attributes.length;c<b;){if(e.attributes[c].nodeName=="class"){d.className=e.getAttribute(e.attributes[c++].nodeName)}else{d.setAttribute(e.attributes[c].nodeName,e.getAttribute(e.attributes[c++].nodeName))}}}if(a&&e.childNodes&&e.childNodes.length>0){for(var c=0,b=e.childNodes.length;c<b;){d.appendChild(document._importNode(e.childNodes[c++],a))}}return d;break;case document.TEXT_NODE:case document.CDATA_SECTION_NODE:case document.COMMENT_NODE:return document.createTextNode(e.nodeValue);break}};if(typeof navigator.geolocation=="undefined"||navigator.geolocation.shim){(function(){(function(){if(window.google&&google.gears){return}var c=null;if(typeof GearsFactory!="undefined"){c=new GearsFactory()}else{try{c=new ActiveXObject("Gears.Factory");if(c.getBuildInfo().indexOf("ie_mobile")!=-1){c.privateSetGlobalObject(this)}}catch(d){if((typeof navigator.mimeTypes!="undefined")&&navigator.mimeTypes["application/x-googlegears"]){c=document.createElement("object");c.style.display="none";c.width=0;c.height=0;c.type="application/x-googlegears";document.documentElement.appendChild(c)}}}if(!c){return}if(!window.google){google={}}if(!google.gears){google.gears={factory:c}}})();var a=(function(){var d=google.gears.factory.create("beta.geolocation");var c=function(f,e){return function(g){f(g);e.lastPosition=g}};return{shim:true,type:"Gears",lastPosition:null,getCurrentPosition:function(e,g,h){var f=this;var i=c(e,f);d.getCurrentPosition(i,g,h)},watchPosition:function(e,f,g){d.watchPosition(e,f,g)},clearWatch:function(e){d.clearWatch(e)},getPermission:function(g,e,f){d.getPermission(g,e,f)}}});var b=(function(){var i=false;var e=function(){if(!d()&&!i){i=true;var j=document.createElement("script");j.src=(document.location.protocol=="https:"?"https://":"http://")+"www.google.com/jsapi?callback=_google_loader_apiLoaded";j.type="text/javascript";document.getElementsByTagName("body")[0].appendChild(j)}};var c=[];var h=function(j){c.push(j)};var f=function(){if(d()){while(c.length>0){var j=c.pop();j()}}};window._google_loader_apiLoaded=function(){f()};var d=function(){return(window.google&&google.loader)};var g=function(j){if(d()){return true}h(j);e();return false};e();return{shim:true,type:"ClientLocation",lastPosition:null,getCurrentPosition:function(k,n,o){var m=this;if(!g(function(){m.getCurrentPosition(k,n,o)})){return}if(google.loader.ClientLocation){var l=google.loader.ClientLocation;var j={coords:{latitude:l.latitude,longitude:l.longitude,altitude:null,accuracy:43000,altitudeAccuracy:null,heading:null,speed:null},address:{city:l.address.city,country:l.address.country,country_code:l.address.country_code,region:l.address.region},timestamp:new Date()};k(j);this.lastPosition=j}else{if(n==="function"){n({code:3,message:"Using the Google ClientLocation API and it is not able to calculate a location."})}}},watchPosition:function(j,l,m){this.getCurrentPosition(j,l,m);var k=this;var n=setInterval(function(){k.getCurrentPosition(j,l,m)},10000);return n},clearWatch:function(j){clearInterval(j)},getPermission:function(l,j,k){return true}}});navigator.geolocation=(window.google&&google.gears)?a():b()})()};
\ No newline at end of file

From 0f3af3e3b7ce7a1460a9c9851f812b657638d4bb Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Thu, 10 Mar 2011 18:01:40 -0800
Subject: [PATCH 527/655] Keep 'Status' tab current while showing the
 placeholder -- pretend like it's a mini version of the status notice form :D

---
 js/util.js     | 8 +++++++-
 js/util.min.js | 2 +-
 lib/action.php | 6 ++++++
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/js/util.js b/js/util.js
index e9e5a90ce1..a244f1ecfb 100644
--- a/js/util.js
+++ b/js/util.js
@@ -1290,7 +1290,13 @@ var SN = { // StatusNet
 	switchInputFormTab: function(tag) {
 	    // The one that's current isn't current anymore
 	    $('.input_form_nav_tab.current').removeClass('current');
-	    $('#input_form_nav_'+tag).addClass('current');
+            if (tag == 'placeholder') {
+                // Hack: when showing the placeholder, mark the tab
+                // as current for 'Status'.
+                $('#input_form_nav_status').addClass('current');
+            } else {
+                $('#input_form_nav_'+tag).addClass('current');
+            }
 
 	    $('.input_form.current').removeClass('current');
 	    $('#input_form_'+tag)
diff --git a/js/util.min.js b/js/util.min.js
index 235ad00694..efe3736e3e 100644
--- a/js/util.min.js
+++ b/js/util.min.js
@@ -1 +1 @@
-var SN={C:{I:{CounterBlackout:false,MaxLength:140,PatternUsername:/^[0-9a-zA-Z\-_.]*$/,HTTP20x30x:[200,201,202,203,204,205,206,300,301,302,303,304,305,306,307],NoticeFormMaster:null},S:{Disabled:"disabled",Warning:"warning",Error:"error",Success:"success",Processing:"processing",CommandResult:"command_result",FormNotice:"form_notice",NoticeDataGeo:"notice_data-geo",NoticeDataGeoCookie:"NoticeDataGeo",NoticeDataGeoSelected:"notice_data-geo_selected",StatusNetInstance:"StatusNetInstance"}},messages:{},msg:function(a){if(typeof SN.messages[a]=="undefined"){return"["+a+"]"}else{return SN.messages[a]}},U:{FormNoticeEnhancements:function(b){if(jQuery.data(b[0],"ElementData")===undefined){MaxLength=b.find(".count").text();if(typeof(MaxLength)=="undefined"){MaxLength=SN.C.I.MaxLength}jQuery.data(b[0],"ElementData",{MaxLength:MaxLength});SN.U.Counter(b);NDT=b.find(".notice_data-text:first");NDT.bind("keyup",function(c){SN.U.Counter(b)});var a=function(c){window.setTimeout(function(){SN.U.Counter(b)},50)};NDT.bind("cut",a).bind("paste",a)}else{b.find(".count").text(jQuery.data(b[0],"ElementData").MaxLength)}},Counter:function(d){SN.C.I.FormNoticeCurrent=d;var b=jQuery.data(d[0],"ElementData").MaxLength;if(b<=0){return}var c=b-SN.U.CharacterCount(d);var a=d.find(".count");if(c.toString()!=a.text()){if(!SN.C.I.CounterBlackout||c===0){if(a.text()!=String(c)){a.text(c)}if(c<0){d.addClass(SN.C.S.Warning)}else{d.removeClass(SN.C.S.Warning)}if(!SN.C.I.CounterBlackout){SN.C.I.CounterBlackout=true;SN.C.I.FormNoticeCurrent=d;window.setTimeout("SN.U.ClearCounterBlackout(SN.C.I.FormNoticeCurrent);",500)}}}},CharacterCount:function(a){return a.find(".notice_data-text:first").val().length},ClearCounterBlackout:function(a){SN.C.I.CounterBlackout=false;SN.U.Counter(a)},RewriteAjaxAction:function(a){if(document.location.protocol=="https:"&&a.substr(0,5)=="http:"){return a.replace(/^http:\/\/[^:\/]+/,"https://"+document.location.host)}else{return a}},FormXHR:function(a){$.ajax({type:"POST",dataType:"xml",url:SN.U.RewriteAjaxAction(a.attr("action")),data:a.serialize()+"&ajax=1",beforeSend:function(b){a.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(c,d,b){alert(b||d)},success:function(b,c){if(typeof($("form",b)[0])!="undefined"){form_new=document._importNode($("form",b)[0],true);a.replaceWith(form_new)}else{a.replaceWith(document._importNode($("p",b)[0],true))}}})},FormNoticeXHR:function(b){SN.C.I.NoticeDataGeo={};b.append('<input type="hidden" name="ajax" value="1"/>');b.attr("action",SN.U.RewriteAjaxAction(b.attr("action")));var c=function(d,e){b.append($('<p class="form_response"></p>').addClass(d).text(e))};var a=function(){b.find(".form_response").remove()};b.ajaxForm({dataType:"xml",timeout:"60000",beforeSend:function(d){if(b.find(".notice_data-text:first").val()==""){b.addClass(SN.C.S.Warning);return false}b.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled);SN.U.normalizeGeoData(b);return true},error:function(f,g,e){b.removeClass(SN.C.S.Processing).find(".submit").removeClass(SN.C.S.Disabled).removeAttr(SN.C.S.Disabled,SN.C.S.Disabled);a();if(g=="timeout"){c("error","Sorry! We had trouble sending your notice. The servers are overloaded. Please try again, and contact the site administrator if this problem persists.")}else{var d=SN.U.GetResponseXML(f);if($("."+SN.C.S.Error,d).length>0){b.append(document._importNode($("."+SN.C.S.Error,d)[0],true))}else{if(parseInt(f.status)===0||jQuery.inArray(parseInt(f.status),SN.C.I.HTTP20x30x)>=0){b.resetForm().find(".attach-status").remove();SN.U.FormNoticeEnhancements(b)}else{c("error","(Sorry! We had trouble sending your notice ("+f.status+" "+f.statusText+"). Please report the problem to the site administrator if this happens again.")}}}},success:function(i,f){a();var n=$("#"+SN.C.S.Error,i);if(n.length>0){c("error",n.text())}else{if($("body")[0].id=="bookmarklet"){self.close()}var d=$("#"+SN.C.S.CommandResult,i);if(d.length>0){c("success",d.text())}else{var m=document._importNode($("li",i)[0],true);var k=$("#notices_primary .notices:first");var l=b.closest("li.notice-reply");if(l.length>0){var e=$(m).attr("id");if($("#"+e).length==0){var j=l.closest("li.notice");l.replaceWith(m);SN.U.NoticeInlineReplyPlaceholder(j)}else{l.remove()}}else{if(k.length>0&&SN.U.belongsOnTimeline(m)){if($("#"+m.id).length===0){var h=b.find("[name=inreplyto]").val();var g="#notices_primary #notice-"+h;if($("body")[0].id=="conversation"){if(h.length>0&&$(g+" .notices").length<1){$(g).append('<ul class="notices"></ul>')}$($(g+" .notices")[0]).append(m)}else{k.prepend(m)}$("#"+m.id).css({display:"none"}).fadeIn(2500);SN.U.NoticeWithAttachment($("#"+m.id));SN.U.NoticeReplyTo($("#"+m.id));SN.U.switchInputFormTab("placeholder")}}else{c("success",$("title",i).text())}}}b.resetForm();b.find("[name=inreplyto]").val("");b.find(".attach-status").remove();SN.U.FormNoticeEnhancements(b)}},complete:function(d,e){b.removeClass(SN.C.S.Processing).find(".submit").removeAttr(SN.C.S.Disabled).removeClass(SN.C.S.Disabled);b.find("[name=lat]").val(SN.C.I.NoticeDataGeo.NLat);b.find("[name=lon]").val(SN.C.I.NoticeDataGeo.NLon);b.find("[name=location_ns]").val(SN.C.I.NoticeDataGeo.NLNS);b.find("[name=location_id]").val(SN.C.I.NoticeDataGeo.NLID);b.find("[name=notice_data-geo]").attr("checked",SN.C.I.NoticeDataGeo.NDG)}})},normalizeGeoData:function(a){SN.C.I.NoticeDataGeo.NLat=a.find("[name=lat]").val();SN.C.I.NoticeDataGeo.NLon=a.find("[name=lon]").val();SN.C.I.NoticeDataGeo.NLNS=a.find("[name=location_ns]").val();SN.C.I.NoticeDataGeo.NLID=a.find("[name=location_id]").val();SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked");var b=$.cookie(SN.C.S.NoticeDataGeoCookie);if(b!==null&&b!="disabled"){b=JSON.parse(b);SN.C.I.NoticeDataGeo.NLat=a.find("[name=lat]").val(b.NLat).val();SN.C.I.NoticeDataGeo.NLon=a.find("[name=lon]").val(b.NLon).val();if(b.NLNS){SN.C.I.NoticeDataGeo.NLNS=a.find("[name=location_ns]").val(b.NLNS).val();SN.C.I.NoticeDataGeo.NLID=a.find("[name=location_id]").val(b.NLID).val()}else{a.find("[name=location_ns]").val("");a.find("[name=location_id]").val("")}}if(b=="disabled"){SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked",false).attr("checked")}else{SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked",true).attr("checked")}},GetResponseXML:function(b){try{return b.responseXML}catch(a){return(new DOMParser()).parseFromString(b.responseText,"text/xml")}},NoticeReply:function(){if($("#content .notice_reply").length>0){$("#content .notice").each(function(){SN.U.NoticeReplyTo($(this))})}},NoticeReplyTo:function(a){a.find(".notice_reply").live("click",function(c){c.preventDefault();var b=($(".author .nickname",a).length>0)?$($(".author .nickname",a)[0]):$(".author .nickname.uid");SN.U.NoticeInlineReplyTrigger(a,"@"+b.text());return false})},NoticeInlineReplyTrigger:function(h,i){var b=$($(".notice_id",h)[0]).text();var e=h;var f=h.closest(".notices");if(f.hasClass("threaded-replies")){e=f.closest(".notice")}else{f=$("ul.threaded-replies",h);if(f.length==0){f=$('<ul class="notices threaded-replies xoxo"></ul>');h.append(f)}}var j=$(".notice-reply-form",f);var d=function(){j.find("input[name=inreplyto]").val(b);var m=j.find("textarea");if(m.length==0){throw"No textarea"}var l="";if(i){l=i+" "}m.val(l+m.val().replace(RegExp(l,"i"),""));m.data("initialText",$.trim(i+""));m.focus();if(m[0].setSelectionRange){var k=m.val().length;m[0].setSelectionRange(k,k)}};if(j.length>0){d()}else{f.find("li.notice-reply-placeholder").remove();var g=$("li.notice-reply",f);if(g.length==0){g=$('<li class="notice-reply"></li>');var c=function(k){var l=document._importNode(k,true);g.append(l);f.append(g);var m=j=$(l);SN.Init.NoticeFormSetup(m);d()};if(SN.C.I.NoticeFormMaster){c(SN.C.I.NoticeFormMaster)}else{var a=$("#form_notice").attr("action");$.get(a,{ajax:1},function(k,m,l){c($("form",k)[0])})}}}},NoticeInlineReplyPlaceholder:function(b){var a=b.find("ul.threaded-replies");var c=$('<li class="notice-reply-placeholder"><input class="placeholder"></li>');c.find("input").val(SN.msg("reply_placeholder")).focus(function(){SN.U.NoticeInlineReplyTrigger(b);return false});a.append(c)},NoticeInlineReplySetup:function(){$(".threaded-replies").each(function(){var b=$(this);var a=b.closest(".notice");SN.U.NoticeInlineReplyPlaceholder(a)})},NoticeRepeat:function(){$(".form_repeat").live("click",function(a){a.preventDefault();SN.U.NoticeRepeatConfirmation($(this));return false})},NoticeRepeatConfirmation:function(a){var c=a.find(".submit");var b=c.clone();b.addClass("submit_dialogbox").removeClass("submit");a.append(b);b.bind("click",function(){SN.U.FormXHR(a);return false});c.hide();a.addClass("dialogbox").append('<button class="close">&#215;</button>').closest(".notice-options").addClass("opaque");a.find("button.close").click(function(){$(this).remove();a.removeClass("dialogbox").closest(".notice-options").removeClass("opaque");a.find(".submit_dialogbox").remove();a.find(".submit").show();return false})},NoticeAttachments:function(){$(".notice a.attachment").each(function(){SN.U.NoticeWithAttachment($(this).closest(".notice"))})},NoticeWithAttachment:function(b){if(b.find(".attachment").length===0){return}var a=b.find(".attachment.more");if(a.length>0){$(a[0]).click(function(){var c=$(this);c.addClass(SN.C.S.Processing);$.get(c.attr("href")+"/ajax",null,function(d){c.parent(".entry-content").html($(d).find("#attachment_view .entry-content").html())});return false}).attr("title",SN.msg("showmore_tooltip"))}},NoticeDataAttach:function(b){var a=b.find("input[type=file]");a.change(function(f){b.find(".attach-status").remove();var d=$(this).val();if(!d){return false}var c=$('<div class="attach-status '+SN.C.S.Success+'"><code></code> <button class="close">&#215;</button></div>');c.find("code").text(d);c.find("button").click(function(){c.remove();a.val("");return false});b.append(c);if(typeof this.files=="object"){for(var e=0;e<this.files.length;e++){SN.U.PreviewAttach(b,this.files[e])}}})},maxFileSize:function(b){var a=$(b).find("input[name=MAX_FILE_SIZE]").attr("value");if(a){return parseInt(a)}else{return 0}},PreviewAttach:function(d,c){var e=c.type+" "+Math.round(c.size/1024)+"KB";var f=true;var h;if(typeof window.createObjectURL!="undefined"){h=function(i,j){j(window.createObjectURL(i))}}else{if(typeof window.FileReader!="undefined"){h=function(j,k){var i=new FileReader();i.onload=function(l){k(i.result)};i.readAsDataURL(j)}}else{f=false}}var a=["image/png","image/jpeg","image/gif","image/svg+xml"];if($.inArray(c.type,a)==-1){f=false}var g=8*1024*1024;if(c.size>g){f=false}if(f){h(c,function(j){var i=$("<img>").attr("title",e).attr("alt",e).attr("src",j).attr("style","height: 120px");d.find(".attach-status").append(i)})}else{var b=$("<div></div>").text(e);d.find(".attach-status").append(b)}},NoticeLocationAttach:function(a){var e=a.find("[name=lat]");var k=a.find("[name=lon]");var g=a.find("[name=location_ns]").val();var l=a.find("[name=location_id]").val();var b="";var d=a.find("[name=notice_data-geo]");var c=a.find("[name=notice_data-geo]");var j=a.find("label.notice_data-geo");function f(n){j.attr("title",jQuery.trim(j.text())).removeClass("checked");a.find("[name=lat]").val("");a.find("[name=lon]").val("");a.find("[name=location_ns]").val("");a.find("[name=location_id]").val("");a.find("[name=notice_data-geo]").attr("checked",false);$.cookie(SN.C.S.NoticeDataGeoCookie,"disabled",{path:"/"});if(n){a.find(".geo_status_wrapper").removeClass("success").addClass("error");a.find(".geo_status_wrapper .geo_status").text(n)}else{a.find(".geo_status_wrapper").remove()}}function m(n,o){SN.U.NoticeGeoStatus(a,"Looking up place name...");$.getJSON(n,o,function(p){var q,r;if(typeof(p.location_ns)!="undefined"){a.find("[name=location_ns]").val(p.location_ns);q=p.location_ns}if(typeof(p.location_id)!="undefined"){a.find("[name=location_id]").val(p.location_id);r=p.location_id}if(typeof(p.name)=="undefined"){NLN_text=o.lat+";"+o.lon}else{NLN_text=p.name}SN.U.NoticeGeoStatus(a,NLN_text,o.lat,o.lon,p.url);j.attr("title",NoticeDataGeo_text.ShareDisable+" ("+NLN_text+")");a.find("[name=lat]").val(o.lat);a.find("[name=lon]").val(o.lon);a.find("[name=location_ns]").val(q);a.find("[name=location_id]").val(r);a.find("[name=notice_data-geo]").attr("checked",true);var s={NLat:o.lat,NLon:o.lon,NLNS:q,NLID:r,NLN:NLN_text,NLNU:p.url,NDG:true};$.cookie(SN.C.S.NoticeDataGeoCookie,JSON.stringify(s),{path:"/"})})}if(c.length>0){if($.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){c.attr("checked",false)}else{c.attr("checked",true)}var h=a.find(".notice_data-geo_wrap");var i=h.attr("data-api");j.attr("title",j.text());c.change(function(){if(c.attr("checked")===true||$.cookie(SN.C.S.NoticeDataGeoCookie)===null){j.attr("title",NoticeDataGeo_text.ShareDisable).addClass("checked");if($.cookie(SN.C.S.NoticeDataGeoCookie)===null||$.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){if(navigator.geolocation){SN.U.NoticeGeoStatus(a,"Requesting location from browser...");navigator.geolocation.getCurrentPosition(function(p){a.find("[name=lat]").val(p.coords.latitude);a.find("[name=lon]").val(p.coords.longitude);var q={lat:p.coords.latitude,lon:p.coords.longitude,token:$("#token").val()};m(i,q)},function(p){switch(p.code){case p.PERMISSION_DENIED:f("Location permission denied.");break;case p.TIMEOUT:f("Location lookup timeout.");break}},{timeout:10000})}else{if(e.length>0&&k.length>0){var n={lat:e,lon:k,token:$("#token").val()};m(i,n)}else{f();c.remove();j.remove()}}}else{var o=JSON.parse($.cookie(SN.C.S.NoticeDataGeoCookie));a.find("[name=lat]").val(o.NLat);a.find("[name=lon]").val(o.NLon);a.find("[name=location_ns]").val(o.NLNS);a.find("[name=location_id]").val(o.NLID);a.find("[name=notice_data-geo]").attr("checked",o.NDG);SN.U.NoticeGeoStatus(a,o.NLN,o.NLat,o.NLon,o.NLNU);j.attr("title",NoticeDataGeo_text.ShareDisable+" ("+o.NLN+")").addClass("checked")}}else{f()}}).change()}},NoticeGeoStatus:function(e,a,f,g,c){var h=e.find(".geo_status_wrapper");if(h.length==0){h=$('<div class="'+SN.C.S.Success+' geo_status_wrapper"><button class="close" style="float:right">&#215;</button><div class="geo_status"></div></div>');h.find("button.close").click(function(){e.find("[name=notice_data-geo]").removeAttr("checked").change();return false});e.append(h)}var b;if(c){b=$("<a></a>").attr("href",c)}else{b=$("<span></span>")}b.text(a);if(f||g){var d=f+";"+g;b.attr("title",d);if(!a){b.text(d)}}h.find(".geo_status").empty().append(b)},NewDirectMessage:function(){NDM=$(".entity_send-a-message a");NDM.attr({href:NDM.attr("href")+"&ajax=1"});NDM.bind("click",function(){var a=$(".entity_send-a-message form");if(a.length===0){$(this).addClass(SN.C.S.Processing);$.get(NDM.attr("href"),null,function(b){$(".entity_send-a-message").append(document._importNode($("form",b)[0],true));a=$(".entity_send-a-message .form_notice");SN.U.FormNoticeXHR(a);SN.U.FormNoticeEnhancements(a);a.append('<button class="close">&#215;</button>');$(".entity_send-a-message button").click(function(){a.hide();return false});NDM.removeClass(SN.C.S.Processing)})}else{a.show();$(".entity_send-a-message textarea").focus()}return false})},GetFullYear:function(c,d,a){var b=new Date();b.setFullYear(c,d,a);return b},StatusNetInstance:{Set:function(b){var a=SN.U.StatusNetInstance.Get();if(a!==null){b=$.extend(a,b)}$.cookie(SN.C.S.StatusNetInstance,JSON.stringify(b),{path:"/",expires:SN.U.GetFullYear(2029,0,1)})},Get:function(){var a=$.cookie(SN.C.S.StatusNetInstance);if(a!==null){return JSON.parse(a)}return null},Delete:function(){$.cookie(SN.C.S.StatusNetInstance,null)}},belongsOnTimeline:function(b){var a=$("body").attr("id");if(a=="public"){return true}var c=$("#nav_profile a").attr("href");if(c){var d=$(b).find(".vcard.author a.url").attr("href");if(d==c){if(a=="all"||a=="showstream"){return true}}}return false},switchInputFormTab:function(a){$(".input_form_nav_tab.current").removeClass("current");$("#input_form_nav_"+a).addClass("current");$(".input_form.current").removeClass("current");$("#input_form_"+a).addClass("current").find(".ajax-notice").each(function(){var b=$(this);SN.Init.NoticeFormSetup(b)}).find("textarea:first").focus()}},Init:{NoticeForm:function(){if($("body.user_in").length>0){$("#input_form_placeholder input.placeholder").focus(function(){SN.U.switchInputFormTab("status")});$("body").bind("click",function(g){var d=$("#content .input_forms div.current");if(d.length>0){if($("#content .input_forms").has(g.target).length==0){var a=d.find('textarea, input[type=text], input[type=""]');var c=false;a.each(function(){c=c||$(this).val()});if(!c){SN.U.switchInputFormTab("placeholder")}}}var b=$("li.notice-reply");if(b.length>0){var f=$(g.target);b.each(function(){var j=$(this);if(j.has(g.target).length==0){var h=j.find(".notice_data-text:first");var i=$.trim(h.val());if(i==""||i==h.data("initialText")){var e=j.closest("li.notice");j.remove();SN.U.NoticeInlineReplyPlaceholder(e)}}})}})}},NoticeFormSetup:function(a){if(!a.data("NoticeFormSetup")){SN.U.NoticeLocationAttach(a);SN.U.FormNoticeXHR(a);SN.U.FormNoticeEnhancements(a);SN.U.NoticeDataAttach(a);a.data("NoticeFormSetup",true)}},Notices:function(){if($("body.user_in").length>0){var a=$(".form_notice:first");if(a.length>0){SN.C.I.NoticeFormMaster=document._importNode(a[0],true)}SN.U.NoticeRepeat();SN.U.NoticeReply();SN.U.NoticeInlineReplySetup()}SN.U.NoticeAttachments()},EntityActions:function(){if($("body.user_in").length>0){SN.U.NewDirectMessage()}},Login:function(){if(SN.U.StatusNetInstance.Get()!==null){var a=SN.U.StatusNetInstance.Get().Nickname;if(a!==null){$("#form_login #nickname").val(a)}}$("#form_login").bind("submit",function(){SN.U.StatusNetInstance.Set({Nickname:$("#form_login #nickname").val()});return true})},AjaxForms:function(){$("form.ajax").live("submit",function(){SN.U.FormXHR($(this));return false})},UploadForms:function(){$("input[type=file]").change(function(d){if(typeof this.files=="object"&&this.files.length>0){var c=0;for(var b=0;b<this.files.length;b++){c+=this.files[b].size}var a=SN.U.maxFileSize($(this.form));if(a>0&&c>a){var e="File too large: maximum upload size is %d bytes.";alert(e.replace("%d",a));$(this).val("");d.preventDefault();return false}}})}}};$(document).ready(function(){SN.Init.AjaxForms();SN.Init.UploadForms();if($("."+SN.C.S.FormNotice).length>0){SN.Init.NoticeForm()}if($("#content .notices").length>0){SN.Init.Notices()}if($("#content .entity_actions").length>0){SN.Init.EntityActions()}if($("#form_login").length>0){SN.Init.Login()}});if(!document.ELEMENT_NODE){document.ELEMENT_NODE=1;document.ATTRIBUTE_NODE=2;document.TEXT_NODE=3;document.CDATA_SECTION_NODE=4;document.ENTITY_REFERENCE_NODE=5;document.ENTITY_NODE=6;document.PROCESSING_INSTRUCTION_NODE=7;document.COMMENT_NODE=8;document.DOCUMENT_NODE=9;document.DOCUMENT_TYPE_NODE=10;document.DOCUMENT_FRAGMENT_NODE=11;document.NOTATION_NODE=12}document._importNode=function(e,a){switch(e.nodeType){case document.ELEMENT_NODE:var d=document.createElement(e.nodeName);if(e.attributes&&e.attributes.length>0){for(var c=0,b=e.attributes.length;c<b;){if(e.attributes[c].nodeName=="class"){d.className=e.getAttribute(e.attributes[c++].nodeName)}else{d.setAttribute(e.attributes[c].nodeName,e.getAttribute(e.attributes[c++].nodeName))}}}if(a&&e.childNodes&&e.childNodes.length>0){for(var c=0,b=e.childNodes.length;c<b;){d.appendChild(document._importNode(e.childNodes[c++],a))}}return d;break;case document.TEXT_NODE:case document.CDATA_SECTION_NODE:case document.COMMENT_NODE:return document.createTextNode(e.nodeValue);break}};if(typeof navigator.geolocation=="undefined"||navigator.geolocation.shim){(function(){(function(){if(window.google&&google.gears){return}var c=null;if(typeof GearsFactory!="undefined"){c=new GearsFactory()}else{try{c=new ActiveXObject("Gears.Factory");if(c.getBuildInfo().indexOf("ie_mobile")!=-1){c.privateSetGlobalObject(this)}}catch(d){if((typeof navigator.mimeTypes!="undefined")&&navigator.mimeTypes["application/x-googlegears"]){c=document.createElement("object");c.style.display="none";c.width=0;c.height=0;c.type="application/x-googlegears";document.documentElement.appendChild(c)}}}if(!c){return}if(!window.google){google={}}if(!google.gears){google.gears={factory:c}}})();var a=(function(){var d=google.gears.factory.create("beta.geolocation");var c=function(f,e){return function(g){f(g);e.lastPosition=g}};return{shim:true,type:"Gears",lastPosition:null,getCurrentPosition:function(e,g,h){var f=this;var i=c(e,f);d.getCurrentPosition(i,g,h)},watchPosition:function(e,f,g){d.watchPosition(e,f,g)},clearWatch:function(e){d.clearWatch(e)},getPermission:function(g,e,f){d.getPermission(g,e,f)}}});var b=(function(){var i=false;var e=function(){if(!d()&&!i){i=true;var j=document.createElement("script");j.src=(document.location.protocol=="https:"?"https://":"http://")+"www.google.com/jsapi?callback=_google_loader_apiLoaded";j.type="text/javascript";document.getElementsByTagName("body")[0].appendChild(j)}};var c=[];var h=function(j){c.push(j)};var f=function(){if(d()){while(c.length>0){var j=c.pop();j()}}};window._google_loader_apiLoaded=function(){f()};var d=function(){return(window.google&&google.loader)};var g=function(j){if(d()){return true}h(j);e();return false};e();return{shim:true,type:"ClientLocation",lastPosition:null,getCurrentPosition:function(k,n,o){var m=this;if(!g(function(){m.getCurrentPosition(k,n,o)})){return}if(google.loader.ClientLocation){var l=google.loader.ClientLocation;var j={coords:{latitude:l.latitude,longitude:l.longitude,altitude:null,accuracy:43000,altitudeAccuracy:null,heading:null,speed:null},address:{city:l.address.city,country:l.address.country,country_code:l.address.country_code,region:l.address.region},timestamp:new Date()};k(j);this.lastPosition=j}else{if(n==="function"){n({code:3,message:"Using the Google ClientLocation API and it is not able to calculate a location."})}}},watchPosition:function(j,l,m){this.getCurrentPosition(j,l,m);var k=this;var n=setInterval(function(){k.getCurrentPosition(j,l,m)},10000);return n},clearWatch:function(j){clearInterval(j)},getPermission:function(l,j,k){return true}}});navigator.geolocation=(window.google&&google.gears)?a():b()})()};
\ No newline at end of file
+var SN={C:{I:{CounterBlackout:false,MaxLength:140,PatternUsername:/^[0-9a-zA-Z\-_.]*$/,HTTP20x30x:[200,201,202,203,204,205,206,300,301,302,303,304,305,306,307],NoticeFormMaster:null},S:{Disabled:"disabled",Warning:"warning",Error:"error",Success:"success",Processing:"processing",CommandResult:"command_result",FormNotice:"form_notice",NoticeDataGeo:"notice_data-geo",NoticeDataGeoCookie:"NoticeDataGeo",NoticeDataGeoSelected:"notice_data-geo_selected",StatusNetInstance:"StatusNetInstance"}},messages:{},msg:function(a){if(typeof SN.messages[a]=="undefined"){return"["+a+"]"}else{return SN.messages[a]}},U:{FormNoticeEnhancements:function(b){if(jQuery.data(b[0],"ElementData")===undefined){MaxLength=b.find(".count").text();if(typeof(MaxLength)=="undefined"){MaxLength=SN.C.I.MaxLength}jQuery.data(b[0],"ElementData",{MaxLength:MaxLength});SN.U.Counter(b);NDT=b.find(".notice_data-text:first");NDT.bind("keyup",function(c){SN.U.Counter(b)});var a=function(c){window.setTimeout(function(){SN.U.Counter(b)},50)};NDT.bind("cut",a).bind("paste",a)}else{b.find(".count").text(jQuery.data(b[0],"ElementData").MaxLength)}},Counter:function(d){SN.C.I.FormNoticeCurrent=d;var b=jQuery.data(d[0],"ElementData").MaxLength;if(b<=0){return}var c=b-SN.U.CharacterCount(d);var a=d.find(".count");if(c.toString()!=a.text()){if(!SN.C.I.CounterBlackout||c===0){if(a.text()!=String(c)){a.text(c)}if(c<0){d.addClass(SN.C.S.Warning)}else{d.removeClass(SN.C.S.Warning)}if(!SN.C.I.CounterBlackout){SN.C.I.CounterBlackout=true;SN.C.I.FormNoticeCurrent=d;window.setTimeout("SN.U.ClearCounterBlackout(SN.C.I.FormNoticeCurrent);",500)}}}},CharacterCount:function(a){return a.find(".notice_data-text:first").val().length},ClearCounterBlackout:function(a){SN.C.I.CounterBlackout=false;SN.U.Counter(a)},RewriteAjaxAction:function(a){if(document.location.protocol=="https:"&&a.substr(0,5)=="http:"){return a.replace(/^http:\/\/[^:\/]+/,"https://"+document.location.host)}else{return a}},FormXHR:function(a){$.ajax({type:"POST",dataType:"xml",url:SN.U.RewriteAjaxAction(a.attr("action")),data:a.serialize()+"&ajax=1",beforeSend:function(b){a.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(c,d,b){alert(b||d)},success:function(b,c){if(typeof($("form",b)[0])!="undefined"){form_new=document._importNode($("form",b)[0],true);a.replaceWith(form_new)}else{a.replaceWith(document._importNode($("p",b)[0],true))}}})},FormNoticeXHR:function(b){SN.C.I.NoticeDataGeo={};b.append('<input type="hidden" name="ajax" value="1"/>');b.attr("action",SN.U.RewriteAjaxAction(b.attr("action")));var c=function(d,e){b.append($('<p class="form_response"></p>').addClass(d).text(e))};var a=function(){b.find(".form_response").remove()};b.ajaxForm({dataType:"xml",timeout:"60000",beforeSend:function(d){if(b.find(".notice_data-text:first").val()==""){b.addClass(SN.C.S.Warning);return false}b.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled);SN.U.normalizeGeoData(b);return true},error:function(f,g,e){b.removeClass(SN.C.S.Processing).find(".submit").removeClass(SN.C.S.Disabled).removeAttr(SN.C.S.Disabled,SN.C.S.Disabled);a();if(g=="timeout"){c("error","Sorry! We had trouble sending your notice. The servers are overloaded. Please try again, and contact the site administrator if this problem persists.")}else{var d=SN.U.GetResponseXML(f);if($("."+SN.C.S.Error,d).length>0){b.append(document._importNode($("."+SN.C.S.Error,d)[0],true))}else{if(parseInt(f.status)===0||jQuery.inArray(parseInt(f.status),SN.C.I.HTTP20x30x)>=0){b.resetForm().find(".attach-status").remove();SN.U.FormNoticeEnhancements(b)}else{c("error","(Sorry! We had trouble sending your notice ("+f.status+" "+f.statusText+"). Please report the problem to the site administrator if this happens again.")}}}},success:function(i,f){a();var n=$("#"+SN.C.S.Error,i);if(n.length>0){c("error",n.text())}else{if($("body")[0].id=="bookmarklet"){self.close()}var d=$("#"+SN.C.S.CommandResult,i);if(d.length>0){c("success",d.text())}else{var m=document._importNode($("li",i)[0],true);var k=$("#notices_primary .notices:first");var l=b.closest("li.notice-reply");if(l.length>0){var e=$(m).attr("id");if($("#"+e).length==0){var j=l.closest("li.notice");l.replaceWith(m);SN.U.NoticeInlineReplyPlaceholder(j)}else{l.remove()}}else{if(k.length>0&&SN.U.belongsOnTimeline(m)){if($("#"+m.id).length===0){var h=b.find("[name=inreplyto]").val();var g="#notices_primary #notice-"+h;if($("body")[0].id=="conversation"){if(h.length>0&&$(g+" .notices").length<1){$(g).append('<ul class="notices"></ul>')}$($(g+" .notices")[0]).append(m)}else{k.prepend(m)}$("#"+m.id).css({display:"none"}).fadeIn(2500);SN.U.NoticeWithAttachment($("#"+m.id));SN.U.NoticeReplyTo($("#"+m.id));SN.U.switchInputFormTab("placeholder")}}else{c("success",$("title",i).text())}}}b.resetForm();b.find("[name=inreplyto]").val("");b.find(".attach-status").remove();SN.U.FormNoticeEnhancements(b)}},complete:function(d,e){b.removeClass(SN.C.S.Processing).find(".submit").removeAttr(SN.C.S.Disabled).removeClass(SN.C.S.Disabled);b.find("[name=lat]").val(SN.C.I.NoticeDataGeo.NLat);b.find("[name=lon]").val(SN.C.I.NoticeDataGeo.NLon);b.find("[name=location_ns]").val(SN.C.I.NoticeDataGeo.NLNS);b.find("[name=location_id]").val(SN.C.I.NoticeDataGeo.NLID);b.find("[name=notice_data-geo]").attr("checked",SN.C.I.NoticeDataGeo.NDG)}})},normalizeGeoData:function(a){SN.C.I.NoticeDataGeo.NLat=a.find("[name=lat]").val();SN.C.I.NoticeDataGeo.NLon=a.find("[name=lon]").val();SN.C.I.NoticeDataGeo.NLNS=a.find("[name=location_ns]").val();SN.C.I.NoticeDataGeo.NLID=a.find("[name=location_id]").val();SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked");var b=$.cookie(SN.C.S.NoticeDataGeoCookie);if(b!==null&&b!="disabled"){b=JSON.parse(b);SN.C.I.NoticeDataGeo.NLat=a.find("[name=lat]").val(b.NLat).val();SN.C.I.NoticeDataGeo.NLon=a.find("[name=lon]").val(b.NLon).val();if(b.NLNS){SN.C.I.NoticeDataGeo.NLNS=a.find("[name=location_ns]").val(b.NLNS).val();SN.C.I.NoticeDataGeo.NLID=a.find("[name=location_id]").val(b.NLID).val()}else{a.find("[name=location_ns]").val("");a.find("[name=location_id]").val("")}}if(b=="disabled"){SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked",false).attr("checked")}else{SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked",true).attr("checked")}},GetResponseXML:function(b){try{return b.responseXML}catch(a){return(new DOMParser()).parseFromString(b.responseText,"text/xml")}},NoticeReply:function(){if($("#content .notice_reply").length>0){$("#content .notice").each(function(){SN.U.NoticeReplyTo($(this))})}},NoticeReplyTo:function(a){a.find(".notice_reply").live("click",function(c){c.preventDefault();var b=($(".author .nickname",a).length>0)?$($(".author .nickname",a)[0]):$(".author .nickname.uid");SN.U.NoticeInlineReplyTrigger(a,"@"+b.text());return false})},NoticeInlineReplyTrigger:function(h,i){var b=$($(".notice_id",h)[0]).text();var e=h;var f=h.closest(".notices");if(f.hasClass("threaded-replies")){e=f.closest(".notice")}else{f=$("ul.threaded-replies",h);if(f.length==0){f=$('<ul class="notices threaded-replies xoxo"></ul>');h.append(f)}}var j=$(".notice-reply-form",f);var d=function(){j.find("input[name=inreplyto]").val(b);var m=j.find("textarea");if(m.length==0){throw"No textarea"}var l="";if(i){l=i+" "}m.val(l+m.val().replace(RegExp(l,"i"),""));m.data("initialText",$.trim(i+""));m.focus();if(m[0].setSelectionRange){var k=m.val().length;m[0].setSelectionRange(k,k)}};if(j.length>0){d()}else{f.find("li.notice-reply-placeholder").remove();var g=$("li.notice-reply",f);if(g.length==0){g=$('<li class="notice-reply"></li>');var c=function(k){var l=document._importNode(k,true);g.append(l);f.append(g);var m=j=$(l);SN.Init.NoticeFormSetup(m);d()};if(SN.C.I.NoticeFormMaster){c(SN.C.I.NoticeFormMaster)}else{var a=$("#form_notice").attr("action");$.get(a,{ajax:1},function(k,m,l){c($("form",k)[0])})}}}},NoticeInlineReplyPlaceholder:function(b){var a=b.find("ul.threaded-replies");var c=$('<li class="notice-reply-placeholder"><input class="placeholder"></li>');c.find("input").val(SN.msg("reply_placeholder")).focus(function(){SN.U.NoticeInlineReplyTrigger(b);return false});a.append(c)},NoticeInlineReplySetup:function(){$(".threaded-replies").each(function(){var b=$(this);var a=b.closest(".notice");SN.U.NoticeInlineReplyPlaceholder(a)})},NoticeRepeat:function(){$(".form_repeat").live("click",function(a){a.preventDefault();SN.U.NoticeRepeatConfirmation($(this));return false})},NoticeRepeatConfirmation:function(a){var c=a.find(".submit");var b=c.clone();b.addClass("submit_dialogbox").removeClass("submit");a.append(b);b.bind("click",function(){SN.U.FormXHR(a);return false});c.hide();a.addClass("dialogbox").append('<button class="close">&#215;</button>').closest(".notice-options").addClass("opaque");a.find("button.close").click(function(){$(this).remove();a.removeClass("dialogbox").closest(".notice-options").removeClass("opaque");a.find(".submit_dialogbox").remove();a.find(".submit").show();return false})},NoticeAttachments:function(){$(".notice a.attachment").each(function(){SN.U.NoticeWithAttachment($(this).closest(".notice"))})},NoticeWithAttachment:function(b){if(b.find(".attachment").length===0){return}var a=b.find(".attachment.more");if(a.length>0){$(a[0]).click(function(){var c=$(this);c.addClass(SN.C.S.Processing);$.get(c.attr("href")+"/ajax",null,function(d){c.parent(".entry-content").html($(d).find("#attachment_view .entry-content").html())});return false}).attr("title",SN.msg("showmore_tooltip"))}},NoticeDataAttach:function(b){var a=b.find("input[type=file]");a.change(function(f){b.find(".attach-status").remove();var d=$(this).val();if(!d){return false}var c=$('<div class="attach-status '+SN.C.S.Success+'"><code></code> <button class="close">&#215;</button></div>');c.find("code").text(d);c.find("button").click(function(){c.remove();a.val("");return false});b.append(c);if(typeof this.files=="object"){for(var e=0;e<this.files.length;e++){SN.U.PreviewAttach(b,this.files[e])}}})},maxFileSize:function(b){var a=$(b).find("input[name=MAX_FILE_SIZE]").attr("value");if(a){return parseInt(a)}else{return 0}},PreviewAttach:function(d,c){var e=c.type+" "+Math.round(c.size/1024)+"KB";var f=true;var h;if(typeof window.createObjectURL!="undefined"){h=function(i,j){j(window.createObjectURL(i))}}else{if(typeof window.FileReader!="undefined"){h=function(j,k){var i=new FileReader();i.onload=function(l){k(i.result)};i.readAsDataURL(j)}}else{f=false}}var a=["image/png","image/jpeg","image/gif","image/svg+xml"];if($.inArray(c.type,a)==-1){f=false}var g=8*1024*1024;if(c.size>g){f=false}if(f){h(c,function(j){var i=$("<img>").attr("title",e).attr("alt",e).attr("src",j).attr("style","height: 120px");d.find(".attach-status").append(i)})}else{var b=$("<div></div>").text(e);d.find(".attach-status").append(b)}},NoticeLocationAttach:function(a){var e=a.find("[name=lat]");var k=a.find("[name=lon]");var g=a.find("[name=location_ns]").val();var l=a.find("[name=location_id]").val();var b="";var d=a.find("[name=notice_data-geo]");var c=a.find("[name=notice_data-geo]");var j=a.find("label.notice_data-geo");function f(n){j.attr("title",jQuery.trim(j.text())).removeClass("checked");a.find("[name=lat]").val("");a.find("[name=lon]").val("");a.find("[name=location_ns]").val("");a.find("[name=location_id]").val("");a.find("[name=notice_data-geo]").attr("checked",false);$.cookie(SN.C.S.NoticeDataGeoCookie,"disabled",{path:"/"});if(n){a.find(".geo_status_wrapper").removeClass("success").addClass("error");a.find(".geo_status_wrapper .geo_status").text(n)}else{a.find(".geo_status_wrapper").remove()}}function m(n,o){SN.U.NoticeGeoStatus(a,"Looking up place name...");$.getJSON(n,o,function(p){var q,r;if(typeof(p.location_ns)!="undefined"){a.find("[name=location_ns]").val(p.location_ns);q=p.location_ns}if(typeof(p.location_id)!="undefined"){a.find("[name=location_id]").val(p.location_id);r=p.location_id}if(typeof(p.name)=="undefined"){NLN_text=o.lat+";"+o.lon}else{NLN_text=p.name}SN.U.NoticeGeoStatus(a,NLN_text,o.lat,o.lon,p.url);j.attr("title",NoticeDataGeo_text.ShareDisable+" ("+NLN_text+")");a.find("[name=lat]").val(o.lat);a.find("[name=lon]").val(o.lon);a.find("[name=location_ns]").val(q);a.find("[name=location_id]").val(r);a.find("[name=notice_data-geo]").attr("checked",true);var s={NLat:o.lat,NLon:o.lon,NLNS:q,NLID:r,NLN:NLN_text,NLNU:p.url,NDG:true};$.cookie(SN.C.S.NoticeDataGeoCookie,JSON.stringify(s),{path:"/"})})}if(c.length>0){if($.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){c.attr("checked",false)}else{c.attr("checked",true)}var h=a.find(".notice_data-geo_wrap");var i=h.attr("data-api");j.attr("title",j.text());c.change(function(){if(c.attr("checked")===true||$.cookie(SN.C.S.NoticeDataGeoCookie)===null){j.attr("title",NoticeDataGeo_text.ShareDisable).addClass("checked");if($.cookie(SN.C.S.NoticeDataGeoCookie)===null||$.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){if(navigator.geolocation){SN.U.NoticeGeoStatus(a,"Requesting location from browser...");navigator.geolocation.getCurrentPosition(function(p){a.find("[name=lat]").val(p.coords.latitude);a.find("[name=lon]").val(p.coords.longitude);var q={lat:p.coords.latitude,lon:p.coords.longitude,token:$("#token").val()};m(i,q)},function(p){switch(p.code){case p.PERMISSION_DENIED:f("Location permission denied.");break;case p.TIMEOUT:f("Location lookup timeout.");break}},{timeout:10000})}else{if(e.length>0&&k.length>0){var n={lat:e,lon:k,token:$("#token").val()};m(i,n)}else{f();c.remove();j.remove()}}}else{var o=JSON.parse($.cookie(SN.C.S.NoticeDataGeoCookie));a.find("[name=lat]").val(o.NLat);a.find("[name=lon]").val(o.NLon);a.find("[name=location_ns]").val(o.NLNS);a.find("[name=location_id]").val(o.NLID);a.find("[name=notice_data-geo]").attr("checked",o.NDG);SN.U.NoticeGeoStatus(a,o.NLN,o.NLat,o.NLon,o.NLNU);j.attr("title",NoticeDataGeo_text.ShareDisable+" ("+o.NLN+")").addClass("checked")}}else{f()}}).change()}},NoticeGeoStatus:function(e,a,f,g,c){var h=e.find(".geo_status_wrapper");if(h.length==0){h=$('<div class="'+SN.C.S.Success+' geo_status_wrapper"><button class="close" style="float:right">&#215;</button><div class="geo_status"></div></div>');h.find("button.close").click(function(){e.find("[name=notice_data-geo]").removeAttr("checked").change();return false});e.append(h)}var b;if(c){b=$("<a></a>").attr("href",c)}else{b=$("<span></span>")}b.text(a);if(f||g){var d=f+";"+g;b.attr("title",d);if(!a){b.text(d)}}h.find(".geo_status").empty().append(b)},NewDirectMessage:function(){NDM=$(".entity_send-a-message a");NDM.attr({href:NDM.attr("href")+"&ajax=1"});NDM.bind("click",function(){var a=$(".entity_send-a-message form");if(a.length===0){$(this).addClass(SN.C.S.Processing);$.get(NDM.attr("href"),null,function(b){$(".entity_send-a-message").append(document._importNode($("form",b)[0],true));a=$(".entity_send-a-message .form_notice");SN.U.FormNoticeXHR(a);SN.U.FormNoticeEnhancements(a);a.append('<button class="close">&#215;</button>');$(".entity_send-a-message button").click(function(){a.hide();return false});NDM.removeClass(SN.C.S.Processing)})}else{a.show();$(".entity_send-a-message textarea").focus()}return false})},GetFullYear:function(c,d,a){var b=new Date();b.setFullYear(c,d,a);return b},StatusNetInstance:{Set:function(b){var a=SN.U.StatusNetInstance.Get();if(a!==null){b=$.extend(a,b)}$.cookie(SN.C.S.StatusNetInstance,JSON.stringify(b),{path:"/",expires:SN.U.GetFullYear(2029,0,1)})},Get:function(){var a=$.cookie(SN.C.S.StatusNetInstance);if(a!==null){return JSON.parse(a)}return null},Delete:function(){$.cookie(SN.C.S.StatusNetInstance,null)}},belongsOnTimeline:function(b){var a=$("body").attr("id");if(a=="public"){return true}var c=$("#nav_profile a").attr("href");if(c){var d=$(b).find(".vcard.author a.url").attr("href");if(d==c){if(a=="all"||a=="showstream"){return true}}}return false},switchInputFormTab:function(a){$(".input_form_nav_tab.current").removeClass("current");if(a=="placeholder"){$("#input_form_nav_status").addClass("current")}else{$("#input_form_nav_"+a).addClass("current")}$(".input_form.current").removeClass("current");$("#input_form_"+a).addClass("current").find(".ajax-notice").each(function(){var b=$(this);SN.Init.NoticeFormSetup(b)}).find("textarea:first").focus()}},Init:{NoticeForm:function(){if($("body.user_in").length>0){$("#input_form_placeholder input.placeholder").focus(function(){SN.U.switchInputFormTab("status")});$("body").bind("click",function(g){var d=$("#content .input_forms div.current");if(d.length>0){if($("#content .input_forms").has(g.target).length==0){var a=d.find('textarea, input[type=text], input[type=""]');var c=false;a.each(function(){c=c||$(this).val()});if(!c){SN.U.switchInputFormTab("placeholder")}}}var b=$("li.notice-reply");if(b.length>0){var f=$(g.target);b.each(function(){var j=$(this);if(j.has(g.target).length==0){var h=j.find(".notice_data-text:first");var i=$.trim(h.val());if(i==""||i==h.data("initialText")){var e=j.closest("li.notice");j.remove();SN.U.NoticeInlineReplyPlaceholder(e)}}})}})}},NoticeFormSetup:function(a){if(!a.data("NoticeFormSetup")){SN.U.NoticeLocationAttach(a);SN.U.FormNoticeXHR(a);SN.U.FormNoticeEnhancements(a);SN.U.NoticeDataAttach(a);a.data("NoticeFormSetup",true)}},Notices:function(){if($("body.user_in").length>0){var a=$(".form_notice:first");if(a.length>0){SN.C.I.NoticeFormMaster=document._importNode(a[0],true)}SN.U.NoticeRepeat();SN.U.NoticeReply();SN.U.NoticeInlineReplySetup()}SN.U.NoticeAttachments()},EntityActions:function(){if($("body.user_in").length>0){SN.U.NewDirectMessage()}},Login:function(){if(SN.U.StatusNetInstance.Get()!==null){var a=SN.U.StatusNetInstance.Get().Nickname;if(a!==null){$("#form_login #nickname").val(a)}}$("#form_login").bind("submit",function(){SN.U.StatusNetInstance.Set({Nickname:$("#form_login #nickname").val()});return true})},AjaxForms:function(){$("form.ajax").live("submit",function(){SN.U.FormXHR($(this));return false})},UploadForms:function(){$("input[type=file]").change(function(d){if(typeof this.files=="object"&&this.files.length>0){var c=0;for(var b=0;b<this.files.length;b++){c+=this.files[b].size}var a=SN.U.maxFileSize($(this.form));if(a>0&&c>a){var e="File too large: maximum upload size is %d bytes.";alert(e.replace("%d",a));$(this).val("");d.preventDefault();return false}}})}}};$(document).ready(function(){SN.Init.AjaxForms();SN.Init.UploadForms();if($("."+SN.C.S.FormNotice).length>0){SN.Init.NoticeForm()}if($("#content .notices").length>0){SN.Init.Notices()}if($("#content .entity_actions").length>0){SN.Init.EntityActions()}if($("#form_login").length>0){SN.Init.Login()}});if(!document.ELEMENT_NODE){document.ELEMENT_NODE=1;document.ATTRIBUTE_NODE=2;document.TEXT_NODE=3;document.CDATA_SECTION_NODE=4;document.ENTITY_REFERENCE_NODE=5;document.ENTITY_NODE=6;document.PROCESSING_INSTRUCTION_NODE=7;document.COMMENT_NODE=8;document.DOCUMENT_NODE=9;document.DOCUMENT_TYPE_NODE=10;document.DOCUMENT_FRAGMENT_NODE=11;document.NOTATION_NODE=12}document._importNode=function(e,a){switch(e.nodeType){case document.ELEMENT_NODE:var d=document.createElement(e.nodeName);if(e.attributes&&e.attributes.length>0){for(var c=0,b=e.attributes.length;c<b;){if(e.attributes[c].nodeName=="class"){d.className=e.getAttribute(e.attributes[c++].nodeName)}else{d.setAttribute(e.attributes[c].nodeName,e.getAttribute(e.attributes[c++].nodeName))}}}if(a&&e.childNodes&&e.childNodes.length>0){for(var c=0,b=e.childNodes.length;c<b;){d.appendChild(document._importNode(e.childNodes[c++],a))}}return d;break;case document.TEXT_NODE:case document.CDATA_SECTION_NODE:case document.COMMENT_NODE:return document.createTextNode(e.nodeValue);break}};if(typeof navigator.geolocation=="undefined"||navigator.geolocation.shim){(function(){(function(){if(window.google&&google.gears){return}var c=null;if(typeof GearsFactory!="undefined"){c=new GearsFactory()}else{try{c=new ActiveXObject("Gears.Factory");if(c.getBuildInfo().indexOf("ie_mobile")!=-1){c.privateSetGlobalObject(this)}}catch(d){if((typeof navigator.mimeTypes!="undefined")&&navigator.mimeTypes["application/x-googlegears"]){c=document.createElement("object");c.style.display="none";c.width=0;c.height=0;c.type="application/x-googlegears";document.documentElement.appendChild(c)}}}if(!c){return}if(!window.google){google={}}if(!google.gears){google.gears={factory:c}}})();var a=(function(){var d=google.gears.factory.create("beta.geolocation");var c=function(f,e){return function(g){f(g);e.lastPosition=g}};return{shim:true,type:"Gears",lastPosition:null,getCurrentPosition:function(e,g,h){var f=this;var i=c(e,f);d.getCurrentPosition(i,g,h)},watchPosition:function(e,f,g){d.watchPosition(e,f,g)},clearWatch:function(e){d.clearWatch(e)},getPermission:function(g,e,f){d.getPermission(g,e,f)}}});var b=(function(){var i=false;var e=function(){if(!d()&&!i){i=true;var j=document.createElement("script");j.src=(document.location.protocol=="https:"?"https://":"http://")+"www.google.com/jsapi?callback=_google_loader_apiLoaded";j.type="text/javascript";document.getElementsByTagName("body")[0].appendChild(j)}};var c=[];var h=function(j){c.push(j)};var f=function(){if(d()){while(c.length>0){var j=c.pop();j()}}};window._google_loader_apiLoaded=function(){f()};var d=function(){return(window.google&&google.loader)};var g=function(j){if(d()){return true}h(j);e();return false};e();return{shim:true,type:"ClientLocation",lastPosition:null,getCurrentPosition:function(k,n,o){var m=this;if(!g(function(){m.getCurrentPosition(k,n,o)})){return}if(google.loader.ClientLocation){var l=google.loader.ClientLocation;var j={coords:{latitude:l.latitude,longitude:l.longitude,altitude:null,accuracy:43000,altitudeAccuracy:null,heading:null,speed:null},address:{city:l.address.city,country:l.address.country,country_code:l.address.country_code,region:l.address.region},timestamp:new Date()};k(j);this.lastPosition=j}else{if(n==="function"){n({code:3,message:"Using the Google ClientLocation API and it is not able to calculate a location."})}}},watchPosition:function(j,l,m){this.getCurrentPosition(j,l,m);var k=this;var n=setInterval(function(){k.getCurrentPosition(j,l,m)},10000);return n},clearWatch:function(j){clearInterval(j)},getPermission:function(l,j,k){return true}}});navigator.geolocation=(window.google&&google.gears)?a():b()})()};
\ No newline at end of file
diff --git a/lib/action.php b/lib/action.php
index 2997a5239d..b1f16f5f16 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -601,6 +601,12 @@ class Action extends HTMLOutputter // lawsuit
                 $attrs = array('id' => 'input_form_nav_'.$tag,
                                'class' => 'input_form_nav_tab');
 
+                if ($tag == 'status') {
+                    // We're actually showing the placeholder form,
+                    // but we special-case the 'Status' tab as if
+                    // it were a small version of it.
+                    $attrs['class'] .= ' current';
+                }
                 $this->elementStart('li', $attrs);
 
                 $this->element('a',

From 589aeed7d66ed690ea7c8e5257a5289c22aa5ffb Mon Sep 17 00:00:00 2001
From: Samantha Doherty <sammy@status.net>
Date: Thu, 10 Mar 2011 23:57:29 -0500
Subject: [PATCH 528/655] Updating favicon.

---
 favicon.ico | Bin 1150 -> 1406 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/favicon.ico b/favicon.ico
index 74ff52bd6d80496709523f9d1f773b20909644e4..e2c6fb50088853d47a5f5dc8f12d2807732ffe7e 100644
GIT binary patch
literal 1406
zcmZQzU<5(|0R}M0U}azs1F|%L7$l?s#Ec9aKoZP=&}eLygkK2pQPyY(jE2By2;dF@
eMmT_|fpZxLCm**@fHMF8Bk%)u1_oj=OdkNrQ5LuW

literal 1150
zcmb7Eu};J=4D|^l1_ml2v67LIPv|G`2^|^x3HgI;Y^Wc=(3$COW8)?^q$2SFz>Wy-
zC3VlOa)<EAas2FOC(fxNEBvZTusXRt7P%0SD<~i!8HY)7ekwveEWwF{8tO+2UnRv_
z;5{@dnr-52GtSsdi4O}5HB>@a#FqS$-(+?=XDL3zoV$-zb!Rb*DBZ_mv28bTy?&1r
z+7O=OFnlH7@YiGS&YrvLUQ%9Z>HAmPXS{p(P=3=qmS_{kb7^k2Ji%_ptba&&Hk*(A
zwe|JR`)V+5^Rch3|5ty`(dJ|Cpo3y{{jjff!Wq|GSj>$we|ztriZwV}!{xpk`TP$|
zZ@?V(;jHxS7k$ZPzRP^B;fB0_XtU$$F4dTwqfn3W0(YvxyLjlZ;L;CJr<rPhzC}La
ZY*r$ERD4MI(I~1vLhgyk+ZlM5BEL7x;oATJ


From 11a183fe330d140afb027052f948f3df0aa3f35f Mon Sep 17 00:00:00 2001
From: Samantha Doherty <sammy@status.net>
Date: Thu, 10 Mar 2011 23:58:34 -0500
Subject: [PATCH 529/655] New interim default avatar images.

---
 theme/neo/README                     |   2 ++
 theme/neo/default-avatar-mini.png    | Bin 857 -> 1000 bytes
 theme/neo/default-avatar-profile.png | Bin 3737 -> 6350 bytes
 theme/neo/default-avatar-stream.png  | Bin 1791 -> 2545 bytes
 4 files changed, 2 insertions(+)
 create mode 100644 theme/neo/README

diff --git a/theme/neo/README b/theme/neo/README
new file mode 100644
index 0000000000..39d9e0f060
--- /dev/null
+++ b/theme/neo/README
@@ -0,0 +1,2 @@
+Default avatars are modified from an image by Francesco 'Architetto' Rollandin.
+http://www.openclipart.org/detail/34957
diff --git a/theme/neo/default-avatar-mini.png b/theme/neo/default-avatar-mini.png
index a3410e307ede7b70f4878fb83e7fd7c81353887e..3f3f026ab7056c2abb76a6bbc14c3b6e3d1c4c77 100644
GIT binary patch
delta 965
zcmV;$13LWK2IvQnF@K^-L_t(Y$DNi-ZyZGwg}>^q8GCvjb{<Y*?0`vt#B5@Tc)=qg
z3y?r;kyx<d53mUf_zU?V?Ad}MA;c>LAwl8@+c<H8ALGZ^GoI<`chzNKkL|H%5}702
zMOSy7Q+4jWRjoERcWxC5`P-m0eehtR%ED5OddnxtQk1n^9)CZ_&Ffdt+U+w-vM@}(
zRK6dko;RSCQpY|q#`4YgGh`xM96d#5EJ`UH1%EFrv9`X&=bygMP}w_9FG3K+nezQe
zip7DRYq)cFj>sx<u44AlDz$o(AP9)!gsImj7_O9fy0pd@pM5~D1-9EUPCr}H%&=1P
zvBomLxIq}Dhktfv`0?IDe!oA*W~0g6VznPle}N|}TU5#(^_{Tq<VR1cR7xIy%|1Q3
zK%*59#s*`BXW^g46<R@ja)HT97uasJcpgf{3S;L_^?k2989$0*VF0ZxNoE0XU6;aO
z0qts(a*30ab7#*|E)H^Yda@@6fb#uNyh08*UIm-mEq}iL_C8wYd)wG(a${<Ycc-uR
z>H~r>#SsJxSmaooIbGtTcU~oqe6lP%sIb&fU90lewHLTCeWmAI3kZTnK>8%I*^c>h
zc7?K+XYTP5tyYLJhBQr?7(d6%qcz6QpXTz#kv`1~8Uzt@%%EB$;O7U+Y}7-l>)WKU
zA&C>(et$?1My#%Ekk4r};JiJ_%VTGbas#q!QD>kN?J(h&hsz|^K~Uthi>qC<*5vXo
zIqj0q=P8v+JYKHx-EZ@3)cr0FIu?n5#dan6*O`C8$&qC#L&Iep*FkHIh~PL5!$TFk
z;vnTx5x*U<y1K=kyR&@q;Tv6hkd8&h9&9Sj41eqO2*=GIs&x;qFv#fW2x*d%q#0op
z69&6ozFFI$Que4d+MKF*T_TQ%fY|-`<KYseqQ^<GTCMTJy}2$f5kU(IBM0_u)B~(D
zaB_k5ZR*XjE-pdg94*i&F&HB!7O>XRYz4<E$wAm_irug$=iWyUrw2TpK9Ieq177>T
z1%L86jo8Dt8fXzg?7^r)Aqc9++4L+pj<cKCLtG-VXOWftn4CDvPP4t=D9?j2LJ&p_
z4G;0=wM$)GdlpG1hW$T^SH?$}f4aqXqe;0~z+{HZSd1}PYl)MTFbHV}A+2VcmfyxJ
zdc1gHn5nBTVGkFGkg3{c^A>Qsb2oJG(?0!07FO#BiUIACWf^gj5=9A76cNWMnX%;Z
n4zFDt;p6wNAHDc9;H&=tZrdGd)#LlF00000NkvXXu0mjfi!a&$

delta 821
zcmV-51Iqm92iXRYF@F<DL_t(Y$CZ`YZW~7sMNjqY9Im1q#Y=4D|9>SwfB=4QA{a7a
zDYO<YL(XtGOP3!gjx^$esGk~L)pe_G-|CXTK3}P|7Hh#65D|<q#GQcivku4B*KhaK
zR&k8*+lM!t4ZDr4tZKgeb4^iJxMfv0hS~xs)RtmVkt{RL$A5kLU7wRnkDJV?d$m=5
z+%33!NcU{M=Qci*+bNq(xy4fD>f0?vSpgt_{CTMWV&r&&s*DCPZ^rSnGq}9E+wQGm
z9E0aN)OAf&TSNr4iW_$V9M{3fHk+cT8uZ-~5#~uo97l9Q^LPfK@3PKI#0aX&rYN^`
zJ?1(bbP#K;ihn$1ze;l!Ny`00(qyu$BJe#veHgXC|NeU0@&V|CK7&C_FZOVs2M6fJ
zA>BA6@I7uOQ>yLDBO>H^L9#69_nscza~*a<@mz=TS+6CEqmO((?sM_Wi29kz#0blD
z-SX@AI;d5;ameo<$9sx9siN^&k8T_`rHcq@w%PNGqJMyQ7yZ}E)G@+n)I;r)(A6r>
zilVA5AKwoT-e2c6?kNBf!E>F1vfWAL;yiBICbuh=t4A7z(*OXDBMn8*fe)>#f2R~>
z)v})iP*t*ZaWvpdx$eMsjc4S408D4Ay)J*r+V`7ztFpKg(C>E$1OGI@Y>|@Z1;#N?
z%@%kqpMO<ak!Bl=V^CGjhF#vj9pn4%X%)@pDc`T}o8Y@&vm1vm{FcpE5k~=UFGfvp
z09RF89Orq#{WM`VPg`Hbu7bD|w57Nyx4f&;>qUfNyV2Y)m)8Wo*9?lHs3?jGRo&xW
zRf$4pe-;QBW126#1(2-^vUTyI0gg*?H~9_;qJOsfx=udSc<H)4tT?M|HsxN=ybiz!
z)7h$Z76e`sbiP<IUu10n5oyg-#|XaX5(OS{6wvENM1hB6wtiWbQ&vwG-u*fR-GW!O
z<@&z|7D-B3)mUqho5@tIwbZqOK;V1L)OyMN!z^XFTH`oQYw%3&RwT=;QIm+!?}kKS
zfG#9SqOYOJDolPPL{Y$K5VS#(tWln-qE`6{uAq@WFI4De00000NkvXXu0mjfQTvv;

diff --git a/theme/neo/default-avatar-profile.png b/theme/neo/default-avatar-profile.png
index 8f635d1aa657ecbab286f32ca274ba13f1f6c47c..f9addc06b4416eee5d372ac5fff9b6105d3b4255 100644
GIT binary patch
literal 6350
zcmV;<7%}IGP)<h;3K|Lk000e1NJLTq003YB003YJ1^@s6;+S_h00001b5ch_0Itp)
z=>Py2h)G02RCwCmo!N6-*LmQ7=iIIL4c%A??xaX9wq;3F$y?&sajfygsY=<Esj1AQ
zk_W%!Jyr8I|3n@p4|ei4HF=mV_KcIU6<JF}iV{gl6nBEezBGW|`>yBA!|iSWTq0X+
z05m?-EdaM~ci;1U=i8Sn*ap>V;}zg9f$srjo)S=6GrJM;&TWr-)c`k8c%i}zHBqFH
z0t`c72tn2noSCpWcRa~-(ZV#u)3S^z@KfNg%jMkr{ga}HcoX;=;Lo2Lq$|zswSa%T
z+GTblB2b#Be?*E%^^X4EQA89elm^p~q!Ttt+u->_4zItEWx8Y{#ZyC!p8!89mvdpC
z06*>{KasF-91Fvch<&)>AdI*(U*)Y2Zn3i7!m_L$K@^dS0I*Go<5<|XiD^h&&!^e$
z(rk9=bY1))B#I)!NRe=Ca+wT=#!GzXD`z=zsDfe0JzbO5@uu;-0M`u$L@1YYe<6Be
z=K?@3m%_4)ecKkR8%_T2+gF)gsgX(~5K^Ebg^+?mF2#5`N2!p(G$dN<hu$xxq~rR`
zFIBm9Z-K?-4P4JhDMc#jkk93K<@sZL>(w(9bE$n<V-Q3%8lC>X=R~#I_*>x55($fR
zI<YS|6-E)C-dW~nZ-0UmCaF{sr4*(inH<Y8UMXNmv13O)iaWQTmr~N|xLp49E>~~d
zr`hfTFkTs<RLJtj-+qxZ$Hp<F-1GIe+isr|{!Ub@jWwX0&!;fWz2E(=7x4C_JG_1A
zHl;!y$F|X0Q!FGoG*-Z|tw-+mKEeme>@nifFbvi<>b!IDDtGTM<9a@0<s#{Hnt%8D
zIlgdeYR}glh7t982cRmd)rJNrl`?xS^F2T0{Kqr=^85`-#RAEMgK0>n#`Bc&sT~N`
zTBGz9(v?#9K}gpPFr*-rN?>l2?LvqhTw@pp7eBhmyB}O<v)-g!%2Uke_~9SC!k5n;
z#@a(7Xsy}UXaQh;)(+ZDWqaxREdTW0bw)>uq*EzuOENW<C!2QAS`Uz}lwz~qW^uJf
zt<j<DdbplX7=|dN2qT5o8pkroq!Ogk38u$K7#}U+*cMVi6h)l-(iswt%^UAtVP$Ot
z!!Y>!pTAEoo#2^c<9lW$ZO8S114c%&drE*ib8Gzgf4oa&q(m{F!!iYjCkiAS6QyEv
z(sg~7s|}Xc>a^M}pauw6kwWRd`56t)_y6~UkbE}DbEl7R^5`VVgo6}dSr)hNE%MV}
zoM&~t#`NSUN2bR3(GPxyaxt@K>tA1Q#+><AfAydKGe9ck?Ae#sTV4M5n^*7x#pKv1
zh9Q`&WJxDu`R@f0vx}SDoLQyT=nzE;L{Ieeq>@$|jUI4H%q@Dr;!+5@UcjCE%Ur)b
zhaZF#^BFADpfXZG2v}TRXKka7VOmHjIW|?^Gf~v-`mwRF*Ge~v6gTfJb8m5j@k$xP
z5EOIHK<sq7K6mG;EUnfNLOii(v`hon^LgvSRet`f52$W72!eoDUp&h*C#R7D);DUr
zdGQ7dtF^}}{M~{*CqSd!<saYultL~`Hj^gdm{f{slv31MF1PPjsW-Yi6zVV_VVm5V
zS>pfw>O<Bx>V#p)AAI8_CPqhC->l(z9_K&0i|YpmmjFs@7T4;ux;~YW5<&_}x!Cup
zHC*n^ZQunFQp%z4M2*0<Om5FE^RqWDvRti^P9=Hqg;S)G36|G3c=z%xS{?7;62SLE
zKDo7kX_{m*vDK4F*|gn&rD~H%Y2+>%B3f%~%jDkNGQW8H66>3FUVQEZg<OVatBq2M
zPi`#`gweqyK-UYnc4vulv49kiOWOot#ColZ=SRDW{Ow>{Cf9DyaerYA$F_L(^kHn<
zq}6V7>Dqn#AUt>k&|0%zYteQ+iiJEv2+~Q5t{YHmxI3Jty#UjYy!*kYR5u&EaON1P
zgiWo{W@dghwz>`)0hH2g)LRHd?D6)#xz_X%?5*X|_l)n&EpzAI0>yk5+qQAtIFjo5
z2ap4l)->8KhG}40CZ;Ll$Y9&wm#{a0V_Up+{$o5ppj^zw4xmyjS8FJx4jKn2>dg+0
zWg*bmmc;eLJ-53b3<)f)ZBpH+F<LH=N~MUDW@WuWr1Zh#fM(mpFbpCUhmAXKh}`ES
zm1#(3=2nmb%B4c=EUE*j1JDpDO&BRcKO~AYT{mLCK}yN}`4#G|E~P>N!!WQ+6LHW8
zAf=#~OA!PCo*&?caqvv+bDma8$=u=^tyYIpsf1}rEK|ZB-Iv_Ug%+|Y{J_WcL)zVd
zrvZczv^p+cph+bXASB6zeE>N?2=dt^eh?Byigw4_clkdc0-8#>LbKgQMImD&`8`YA
z?->CMLsH76iJ}P4_i(*%&n%74vd)TyJfkCJ8jS|FWsuJ#4`wK0q>!PQOVMhz&|1@V
z_gM^Sg=w0cJ$;Hq!lvEr^6ZJJJxx#UDFG6W#cN+YL9NjM7>J|&grn1k7%3L<eV-r*
zc>dHOEXzEY1h6fW=T9A?)9K&`{(uX96G<d`Sug~HOjzt^Y{i^@-Q7P@9O2mEX>8kO
zc3~0QlstEGYUsI$r-lH1F?8ziD66ZhNGVZDJ=!A{4<LNoEgOb`Aq_0c!f_lN+aZ~7
za2yBQwlNH2N2>B6+-ps#Sm4>Sr*Rwy-}h-W8~pxPo+Fdm+uA5|uL+P!IDGrH=lC!G
z?G0Sl#c>>>D8kheQ^tvtzT*ZUq=A7zXamaxtp!5HsY)qjd<cosaiTs513F!oPPY>W
z*L<I@>!EcV=aEuUDi%0>@+9eG5-BD3=H{_YgRi`J8rw1tHUXp*JacS<uf6mPA6%Q~
z$f0Qj0<AQG0wFXS5hK25rwYW5{P3f8wIO1zux*=6I<9f@Jdb9(O}$>H-R+{3BAZS#
zIX;eU+Xx}3H5ydc*Z9GA&QZ*z_dXP|oh|oL7kum0vwU=Oj_P`qO1ZL4T!<Luf`^<T
zr9Rtp)>;p)Gfk6`Vv%yGL>PuWbJ!TH)%Shw%*=55=mfue?ktvR9Q>sGc3tp;-+zgE
zqeiV>L&~@s`(H!AuN$`5eqFy#sLw%B6vv-}FyP+oEV;D9fBgPeNhh6s!GpP91dvkl
zr87rpbv*vz&5tk)gG?q9i=)RB-+tau!*&ig3<KZynO&Gi67nCu|1~Bm#eFk_w-G?^
z0}%vY`|>HGDB@>teS+`%6!L`~R?IL6(f=GNCEae9xy2=f4*1hQ{0c9gJ+g1>-${Ud
ziV8>}`Nqp<0QmVkpWt~OBO@auoWvk2^?3==f1hC(L{UVo(O_<2fwW`rr{Di7UpjMS
z-_||g(0*-bv6yDR;riW0e)g-&tT$YoM5b4`mDpj=e-<$w>=95((du;AtkrS5O^!?y
z`J>-^nd8%=`?}W6&G!C_pa<d1@d=Oy|NWmXvb45Jz2T6}WXYscB%B0>VLW89JxCDQ
zYq;<{k9N09yWM89wn-2K9GNWh`Zr$W_;lr|SnmTIklMGK&{|V(dEB0>GPhcz+4g8Q
zn=CF@X?8rMVaDEWGKpnb*ro|mVn{Ji+M!Z}VXrqV3~4l5bh~YAOH#;Z7|CaeB26)$
z;mAaZ=T1&iDP{Jpac^_8v%gkQAA&GqcDcsgg>`0^HsW#>0SU)ua;(fot;OQ%25W1Z
zfFhAdVB03rFp*MX2!YaZvqs<RbvrImq{*Zb9GWPTPp8Re(>RVryW{cUr?b==9lmsS
znj@2?eQ8sAm;(xX&jGF%aQWsUGfNwEyDpX~2qWmYKCPC^My-YKhp1lNzZV1qK@jh9
z6{6IZ<E2&nI|?;X7;`}w#yN*#KFgu0GNYpfrY9@dwn@F&CGFUpJ~GOg;}aCJ$-U)(
zT4yH#3WdG90i`vYjV_n2&2eX8os?r@NI}<+XtzB!>K%MP?rsdjShR$_(6v%qO&DRM
zh=ORx|NYvY{t+on7>0OmKt7-5)QKsM9T{VMtQ1$})mluAmw4s*qZ~gpvS&H!TCKZ3
zBFGCuW*0ZOa$|wDT9ZsFfs~TA8&Yq1w0qr*|5}Cgj`K3sr$TMTiuzu!5CSPQrXi6@
zi%!?&!o};%&98CxnQ6{GbA<9pj+wbtR;qQr_1d#Me{$mBh9bf+;_~%*E_^!A%0`o1
zI<{=uZbZH15e6Y<uR*+@FBU>?L*~PwhV4N*DcEt%;5s1(O?!!?O?AD-JLj)*{^B*F
zC}MJ=gzHDV{ox(%&adwm0rajOS}QK!nCH`(HJpUQ*hm(nNyk;RyFrX#Ln3+@)DJ{J
z`yuG<$Tg(cvD>#JyMJ9Au8zan{qVKf3pro@_%`pncNG;WUi!ibK=9UwcUZ30cO4&l
z&H=aQs(g5Tky0tg^mq}&cJRWuAIvo5R)vI)cky<_KDf)bbHU(sV++}jdjEh3z1K}c
zVp}Fxuia;6b`9G$dFJF4>$Nuj{J|aSt?u4(fY!TrtgJVA=kg5sLWYTQ4%b(Bp#Uuh
zQP4*s>`_Dza^P$|O6K>k+3{I&ORO1&F)(2fl0#FYY}7kkxO5xKG&p-|iaT>vesTU5
zo*(WSPWCJq*KvK`c>gACPjUK02``9P+iVj>8r!i^S`A|LLiDm-Dn=rxUMxqTq8O2e
z)+n{5qzx%RgO(C)Xrzwc2Xc@X5NPOKueC;^K}gD#0u$pEEX!baeiflLUw!o~#}AM4
z(T#ZykLUUF+38)ijCNH7DXn?);%)9N)j4%^9K$eJ*=XZ>;Q+CY<KQ^f&fP2@-uXgq
zoj2qIJG-Bn+;$jp>-={4-w#PoOjI~}WRg@b2W%JycW0OR@Z-CjI6Ou!lj7}5Gt^t|
z9*LkKA4+Rxmp1v}+8onUWy*yVs~as`Hyj{BX^@5_nM{&OCE|J<9j73rV1UH!$bLvv
zZ96Ze9O!~Rq58z=LnfVKdU}HC=?U!KT#7yz(%{<7IhIy8dH&2{YK;zWUAl|XdY4r2
zE^<H=DSmPOI+=8eqmv`lTON(JKS2I~@JbJekj<vaWKtOY!YHwYe50>qjh#Dv@VeZR
z@xq8h(0!$>G^COVrl!U?adMiesWD75?#SOU@IwlMAmaSRYveKs4o{W2a($lJ<;^`1
zK||IuH}9=5zuM%)k#S7ZWUcmit3oS{kOC*+kjrH#<TGTmX>7}UDAFlKOoTqd9}+`7
z<=sbYGM!{{a+KpI4srCzB*j7=DIcE$H>6-?t<J^Ew>fk25JC#xIDZr04|hcio4cWc
zJwM==7j80IDKb&Xv%KCS2qVN}YL0~z10qO6lFp>DZJT5=iSPS#x-RW@7tiyEqL^Th
z@{W~`36f1FNhTeV$+%7^l}ccmCQ%p>sff?&zc37gD_3VYa;U<w!{c1LImfNpRn8tC
zAG$)`l~BZ$8w)f#0WY7b&~d}K59~7vzQy)|OiE*#CZ=hUN+n3AljO3QxO^~-h{9;l
zXVA|FY`66-)4)kM*p|6th{tbI@!<PD?|pEc?|tW0Zr@$t?Mrt#b8LL*Z3EjlU^qO`
z>Ug|)@fM|#0_8%6+2zLP&Jpy%vMemiLhCqS*pH3|VYHR+?TMbK7Zu%pe4bJh!!Wo%
zzsCAToukuZ+_|^J@_L<#O8)6JL$%gipIOEaHDje5T`zdz3h2Qklx+w_fMFWgwux<<
z7`@Sy+Y$b_vc%u?yDxlrlT*hg5JK?Ym3vROCk%prxjaKQlVNhKK(*EZ!Dot}&%+rz
zerpD1?J&WRf;%${G@EU5xePb&t<vgvL-mA*8jP!MHrc4RDHPHu1syjWD)RRO!box9
z!<(EuI*#i{T)n-7*6QgC#%Znj_|_t+RGPyRB{pgu4gwg4!POi0$)_C*)8PG2?hn-x
z8k#4J5L~=^pF|=-CY_+|1{@S{yFPOZYZP;7)@yBAUGM4hgy&Z_i6Tul<HSuD>cHS1
zLkh0loa5;9C{Y+OyR^9r9H8|R9UtFVAeBr~E@WtS4$kfe5QgCP-NksQpJ8zO{@N4c
zYv>#>v#^d92BkuVPH!OHfgykvbh<9f%Nsbh&Gng;r_T>qSlR5wU<6U5IcOlI<oc~y
za+wsZj!UEM4p{^}!Lixs^vcT<biIIs2m;OhxfLoSS<sq=mD<yzgqPOpWHM>;nIx_k
zaxf_%SzW79%%=%L&3dgp<Y3$rNR7pn8jj<Tuuc3>eP*Z2Z>>4%`RGVv7zXubcPJs`
zp@gI7mNyW+_R+{!9Av0Bnpn2QdaX5-@a0fMP<1n&1TGDEpph?xV58Q;Fbp>9!x2G4
z!B`l^b(z2Iai3oYHZ~dvA!xMRr-uMa$8#UHw}2j0=yzOpyy5sd+xmn*|A*)vd&+~)
z0GOtU5MUXSVeGZx2yLw}q=@sr;$Tyu-^@L%rjDU}N~AQFW#Re3f#(3xoBHV3!%3$P
z#SGP2BV{}rS_tc4>i`5wMdZ_or^gJfl(L{So_Fv$KxqhqfNXX+EnRYlCjFepu|pN2
zD8vg6HUXrR1d+ydT`I-QP%<(@3C0~eR3TCk8?_dec|eu0R*a9AkpkR~%d;mZha8N1
zf=@d<F~a6%jVRJI+MNR{dMaZhblM#p+hS}aKU@xY60j|kbkZi1PO`jOLrM;uIchsL
zwqsMTxB0@^>0K~GpRmy7`1B|$@bLVAW~<wKl+<s3><6IJ=`b->0Vz=`<mKm&4y`a~
zXjKuvbM6dx?$47-*lg6}c**ucDItD)LKOX~Yd;8SHriN@L!nq;eRZ8&F2Ui+kzJ^Y
zc*0LCWK#Uzt7nl!v^yTvjaod%q4)E&S4s2>d^MU**QK`Epw;XUh9O6eO~vypYIXkP
zyRTwOV`v>3a+nMF#w%x7tFBYZXIS5?(`>bS2E-%kJ9|5A(3ZLnV~qO+y%1MJ*J=%_
z>owY~Zd`>OMI1XhO}>z4d2y9zPEK+1$k=dWOT!4p^}(?$UjO<R_=h*IFgiNMN_7*{
zG)W|ERJ1jG3E1(75W^6NZAwi_P-?hYwLx1GaqE&+8ZQWGx4X34-FS*`7@{NHdjfXE
z^x+9Al@UDG0}=7>|Ltp-hQTlczC-Pj6arp2eTd7~?$PLWkfzPj>N->7@qmoS5g`oq
zpvZQ6gWiMfs1G8vUz)Ca`b7#*>}=9jN)ZMjt{0Cc_B;>I?G63t&5`K$4)pIUQkv26
zGL`WPVWe1IUgd|czrsi%&9J*k2g5q#5FMya*W<tbpZDklf*^{KF;dJ^$Y<iGp!N{|
zU@3Wj`iWrc*};!1YSIYM@%y(A@lZ+;1Q99<cRXD+isC6Maa-)RVIKY0`@{$$Mk+-r
z<MAlX*?aSR@0(xb+pj%0)S<2_)DIBA7_QCO?t1+F&oAIBi5CfiARv=YQ7PpIyZ1o?
zX!U5sZ?F6BH()$?UPWq0b4H&SQKSbuJPM=11eFH~5Jn0qV02=XbS90~nuYl#e)rsI
z{>|6Fh+_{o$f$a?Q@hrtno2tS@Vn=*4MnqACzDRmXmyxdTBFl-hw`M<!D7_T-hc;n
z$7g+yQi@zI!{OtH$>y_!LCEsbGT;8nv%LQGFJjx)uC=KSH~_Ib-mB{c{PM!5ym|3D
zr%oIjRFv74Nj{q<m9V$O(dXoVDB5|hzx%hp77ugU$pKLmVLLY2e3nGQ1}SOP8#I~?
ze(;@hy!7m`U701ly{SZ0tBp0F+*hKz5<^#tmGwIR>z^;t@in=8fkvx0GtH1>(@ByE
z2csvNBDK2&&}i(0O)8zi?6ty%fzSH-CWl7z{K<D;rCiMJ+B~^!3|bY{YU6K#KkIYB
zZh{|#T)8pJ|9s;^3WWl>T#k0v>wR_H8R^&-j%5u}f5RX^Kanm?iD{bHjy-4s55tgl
zD<1IoN8fyjm!3U3bb0?U1qOfpov2nDuK*YJEUK$DUC-z8^;yn;a))*|U~Fs*FAVYh
zaBF5nk066_1#Bh#cMvAphWNh2*BezIPhpR{=HuZXTjpyR_;lNCgiw6##b<c+g%hL_
z_Fe}O&k2BPwee%%&-dCBjg(@gTIbCVu5<bNJ(8(3W0f+B*lN<h221vXevfmc2eYG9
z6hB`e@K~vCa&)4^H_tuG*<+J?{>*?L{G?pY{Y9SuCh#}=L4<*__9JdAb+|Iy;>!Id
zGix5E<&eo_uxuMC4U~=%t<jJ4MnzwWYK>M3REXz!RO>A=HoSB^!^_8Wym&NAF>UVK
z%uwJbz>mu1T)5*7dgACWf$#Md^L{}XX%;qIZY*_JuKTRjeO4L)YYm_EW`GweY}3Fn
z1YxA{Lxp8PDPu8JbeJeOj2CRi@-}Cu(o}NRej*&83j7rK>vB2we*fhE2Txn+xR2P&
QPXGV_07*qoM6N<$f<Zo9RsaA1

delta 3725
zcmV;84s!9%F_|5ZFn<nHNkl<Zc-rk<XLB665q$tAY|ad#q&uBMl|T6Z{|ejXvt8wI
zNhd~e^Um&M0RAwG;VvbLJD5Q7?z)P_x)TR8=-1sq2Q<iEzx_d?M3PcM3W;XJ#&FO^
zy~av;&v?4QV&y_g2|~!@-y|je{HL!_t62v<bLd<r(-q!-xPJwu6ofwh9TX)KAq0dH
zY`g%MH*<`qn^N9m7zS{tC`mvHi6DpyVZM~fi(@XZ-uUU9zxa$uo+%vw1p=iMLI}*4
z8(ds3AVjh6=(cUp17|~M!l3JqbBOJSC?@8iFpRNWZ60NQ@)4*GfL+N00M`rg^TiZv
zH!f^wN&&`LCV!z=Z+uLqt6W;3o{eIT%j+p(E)Ld2LP)g$5K7XCMlr|r%^b6ZU)cDq
zX6;}`Dl>6;Ge;D0Z4DrVKuU?lVvW_xJ;?khVzgoac0W2%2#N7ziOI|@WZco9kuXHa
zgEdl0iSK^AzWb&OK&ZcsB90H2lZ5f|@aIf}Jq-Y<1b=R&Wjb>TTbwO}ruOwvjr4;M
z-~Q{TbOC*6*Yr7>Ojr2lzklA-szc}B?KYndfIU0NXkj1>huzGQOb9{D1^)ZpCC)F#
zkWxYjk&dB+MU5+jKooKO=YJP?|KWB|s}Chc2|6tc2A&BqgJC*zKnTHT(9j;IS!XZ}
zhA8IQZGSl=K2DaHE!OC?8|btfXf|z7lE^9N9M0OqV(G%!c#uMZGO8tXN25ego(%vB
zgz;nv+cwc|n%d*MeLchvKYavfHpx_f8*_o_%)w;3N_JR`0um5XfPerbo4MH~!37$1
zE1e(3Gb3g&TwTwQQGoZIG6u9;b*-I^GB=b_P=8AAB%C1qZ%XN&S<1qE+cxp`b^mVr
z{M-OglJ((Yl53o^(+()5xg0FDNbmmWlHdZS$?)}?!M^{(V-CT^r$5_8s0a^H2ZSi*
zIKQ0d8s}uxh2Y}Jg-Xg~t$6!-i2E3l%d4pbx!Y<<DG|p4eh?xEB192SkSEA31v*mG
z>wh+Ia@5uy<Nf&zK^TEj`ee+PQsS%Eqt6B+iA-qkkA(!{C`K5?2*Vhj7hvNiKleS_
zDkkviq_4dw3jzG^hZ|5vD;1vP-AP#D_1O@u#^?7tL>^#cqL_on92+;lbmm~?xRn7R
zrG#Y~c=vXoJ;r3_VmfoQwv4*pEVw|eW`E($*#O2DLR4P_;C_%wN{J}q2*L>C?S2^&
zrA|zJL%-Y1<sW?iegYvxB?2RbM8DU>@u>CqdM6KDWp}}lQi2N!&kOMW!!3d!Dh&kn
zd3m+K*+jU!njVxW$-{WY7+#(B(X1a9nLQYQhkyvf7?;;m%;xLTOp<zMw_QI-s(&7$
z?|vE=mi@XfAW}%Q+jX3sbh7y@I$K0F2|@^L+r+!Cj?rk;aCI{)e1f|Zb-ggx82xTD
z33o737~?6WXf|xTI@a5%W!8W%X~cBq;NohMBqcNgR7Kj>&ruKxygwgj-cCy)_adx>
z5Ksbi+6^2Ho4MwdI~KI75yL?nLVpNcUQfY=EL0m*u*~x#?J;bNqEWZty5YfEAmttN
zDWxzNMX%RFuWc1FFQYK#Y?*yD>LTU>A8+TygFp$wD2B6+&~EAZ1vNVX;Na>BA;AoW
zx@}@KY{RyS-E0&V4c!Id)kz;h2#hC7a8X<+gAfA21zgY92cTvhEct{G)PL(HhQlrz
zwQ_cOg@&VdK{z`d!1DsE)_&m&a~?BfFbZa{v>M_|i|e4*!k||x)o&;q)?E-zPX;iy
z{y|YeJwgeBAcC{e1Hm*I*aLpRF7wY$dZjbJ6aaQXXf<mX4%&rEzZ%PReN7EWwBVt{
zJpsYjZ-!{ptI1WB9vnG6?th_fn}z!Zd3*xOK26+9DM2a4@82E4G^z{Ql?H&)0>&6l
zPWpxB6$m8=!x&L4b7|3i=KtZ{2vtX|OMRW1XusQpWg3Micl<!FvToP>sIBH7-i`1S
zR65?fPFm5x20^6#O{zdw3W?vnJH}H{CDqXYFdBA}2^XjZVHE2Fuz&sC>ozL2`IQ5p
z$TAJ|x{brj1`h!s)B}KTV>`@Xxze343IG7;bz8-0*47`$N(z4|pU&==<_RAf29QGL
zPKpphAf!MLicImDC=!Tbj+3K)sdJ5Di6G>N<0P*hMI12~V3feJ449?~!=O(90Kvh<
zvxiX3CG1S=2H&PQ?SDe&wsZo_7aRC~_^HoB0LVmZrI6ToL0Uy!830mBFiK!sruO3b
zS(73JfWr@F#IeBfs8hgvfcetL%5nFY{#eTMei*zm0F-0as9Olas1VOsMMtv`V@XwV
z9@BF3ae<8+9L)4*vjzZwX_|*0raMFuGY+Q9{Fnpd>0L=qQGazt&#F3FYfH(?EuEAS
zn9Md<Iv#k;3oksV9Dt(35kiz#`{`^VOr|S@VGKe^DWx}+15hTzilo`X$850%=e*Ry
zv!~I30=J=M6y08bbg*{)G)nr5am32d09J67+xg`j-qypeqL{Z*KLAJ)DMd|8%A{hU
zD0+WBOMR58Du1afiv<xv5QLF-0PR5uD#$)xTrVnTe&r@;z4i;6V0zfu%&!5HnOmr4
zK05$ZQpQ<(g)YF!BAoAe&*zvgH>J$^*#Mxz5D%S1*OngBK;AXD$b#bgOjk9eYHY;^
z^|unFd;rwsTrVv29D$S)H7noef4G<xQn|Owcme{`WPdOiMZIpLQMX{21}xKn!6;%b
zz&S@83j|?QJ^%{+n~$?%4@OA9w)GElJDUh$oWF`&CG{zzsM{vm?K(Q`2HLIqLE{=#
zNWbrgSUO%3gd@d`od<x$VhtYW^K#Xp#%9Atr_;c&-`=Y|-R(8;(DRk70oNbr2^f?V
z3aqVZf`3-)5dJp4lh^Ew1|1xYx@b1+PniCg1`tx>8jwnV5Mt%Hg>UgplWCWVFP9q#
zA+*B`f(tN%;q<tNqfvLS{x$17jWU@J0GC(AAJ&jk!nX9x&vF&O3-l90f(sZ1#oIR{
z40^3kj%+<EPx$I)hULmDmiZzns%kX!Dwo$AKYu9-(D)t|NPKfP!m!`oWB#)VMW_#2
zt~Qv?oXi=k$G260VNkT1*)v-)M<V@HU;58Z2N?8QpX~CU1ptcqVHD%$ww&0CGCw-i
zY_1oAYxcnrTwpk8V>IlfYex~uC0aD|qnP9Te2n$RFNOJe_Wx<Gi;Ul-@&cn_2bO7Q
zFMqhD0gy_57~{kFE#|9oy5j=M{OH+#&kMB7j}#K4K@0V|U6|>~y$jlv0Of3bxSU|M
za?5L5AS5i?)apO&`5a*wXU-p}MoYb33#P#eKkuduz;3$&*9&oRHG$)J<@SsqfTiht
z?bh*RrFN^HN`KM*jG-&_KvJE&Sgvt-Gk?$R)*nKQG41VV5Jq~S1E|++m_|8W-;FGc
z-)%eWZhYK~7pcjqq8E?BsCMI~DAL>g*tUsA-70k9eH4KEFH#Oi5JU*V2+QRLlleMz
z$*ZC~3HUe`nHOLwB`nKGcU@&<%#6qEdl<$D!U*e)kM$-gMpc!*Rdt{$V&}m*&wsuH
zl1YE(EM3_%1K_N^y@_$o5k(wf6eErWq9{s}DZpLt{VFMqFzR}+GAV~Kn4tx_QD$M*
z`Neoox^^=*dmlo{lO(P8oEFXKWe{-fZ#Rr`oBbK-foF23c1p^hn&A&=LiQMtcy@D1
z0jS!J>)L+RP_}9+yOj0$bAQJK=6~5e>1q$>9Gvst0LWv4SPm`cLY8_4;Y9(UTSB4@
z0J-ZR{2KsUbKv>e&4Iz7)rg!B0xyW*2jOo3sQtX}>oG$oh^H2R&kOb{+J2pjFd+~^
zz}Kv<uGyA$n}m%UXaoO?(f~rp_WD5$0BU-tBMD6|d|T~Qb{DAyFA4x4>3@*2bbKuU
zR2gAb&>?~O+$lv1UYrI<A>q2&8PTjW7^b0B8mY8k_qNuewBW^Q0HH~>olbE>vtetk
z11gMhJ6_z~olp=6FAe}8Nv^2VHd#m|^K}?U8BIIID^v7rsv@d3Lm<FfqitooX~MQm
z?cES%6t0&PA1LQ6uNG9&Gk<RPrzj9yFNEt0Ei;t&-Ok#>k3Zd{iT*tED!ejIh$L#s
zV~#kAlfw%%x%^E1|K01dbT3<zLSjC5GCw=)H(}eRc4SqVosAdZ$M-i_EY?~#v8G;n
zE{1P=uPK!#grL=^ZBK}NIeETXhgffXY}_DaMwT3e+L?HMD^r~irGLp<kmovcCG}wx
z<L8Sp7AqHLr-Rhn&N43f>$g8h9Z6Te8Dr?S>lpT%xlSxz-#Ty{FFnX{$OP2YfI4@}
zs6*MgjwfvekPre!lh*wwN8P;~@<U*xl_r1r`}guOb-Vwd!6-WIMy^|p9-{d&z-+z(
z=Lryx9rF=f;Ox~PbAP$YV&!8zbsil*t57mZ&~DYy>$cGC)L|H3ZdgnH_KzR;{*~;M
zlPAZ3%<XAE6E(ZK5){`Lm`oOkVh$m{EJ=(K{Qlih=677)EVT=EAGHqKgL^g0fMFUi
z4F=0HAb1kbisKl*AA_t`tLiU{%t#kk3j|@5<^%3COK^eXqko=OBfc{GL+pZ~8u#rs
z@Ov?Sz?-ukjz>LMrjdq-_s-^0g4@YLYwV*@x3rctpSv1Y{Z9Ywr8r>iR<hU*dM#L%
zvDXG!1<ZcF$bS23v(EO;dR0v?&J!N?>-grYA^N>$;#+L5-KC7e_e0DU**)YzuZCWy
zp%pFtRmOq<;D313!r4g=wq>SXHf0p!=~63DcQkCG-)&ZYhw_UB000{G<bKIcyOA=E
z5Q2-VnKr2XUbFBn@4r|86umlb<Lq>hhA6@)#?5%G4Z`tJuQCvR5dZ*5r1Ov893`1A
rA>ph&?VFbRT^nbw2I&^JO!`0ex=MZ~vQ{$y0000<MFvhpu0mjfNW22-

diff --git a/theme/neo/default-avatar-stream.png b/theme/neo/default-avatar-stream.png
index a3024639f481200223f0640450f65d4d3ffae513..e542854e77d8a7655356b430c7ff96dad270cedb 100644
GIT binary patch
delta 2523
zcmV<12_*La4e=9@Fn<ZFNkl<ZXx_b=X>VNB8OML;+&i0RJd;`M#Bmloiy_1$G^7+%
z6<QHWD-bQ^MOCR1m8z;0Zz=?DDpgfK0Ekb}7gT~Sicnh+qG?M5A*2uz$VN&+>}+Gl
zGvgWG+3wu+^u--J4#Z>6SoM*P<$L8h=l_59=kW-DQmOi!Qh(}Mr5I+FYog?HCU0}%
zs>NKxrC~XsJOqOAO)>7-(#JQ)BCEPX2=YRRmvXt}i=tGjJ}0GkA(@P!X<E;R-Y6RU
z?VU5s)l4)AgV}!i`yxalI+pEV)S6tJ%yWHumSi%;Q{Vn75A7f8=`PRns8&sUUp+61
zMdNxp9UqobB7cPF>A-hST;PMV*Ga@<jBL!XejthG`6#6p&QwYf3h7j9P2PIv1e4ch
z*t=^R&;R66LV9<CQ%d3cK9x!%FA4=i4GbiEmi*!4pYh3s83r;*#zqGgB$S^qs5ea-
zO%tV{KOP~yuAiZSG`c1^arP3gA3DaK-8=ZrFP=cxWPjIp7mHQ&)!5=>zQl*;@@(BS
z$d1h!>ZZ-5D+Q(s6+F+yaXcK?!EtO_mW$bH5$}tzf6q?#?cRnaB?sR;!Ygka<LU2x
zy(bKEH3SYGI>DxmgN$rUF>5sW<kM@EjV79u2yyGtLJGnmjYiYr&9{&9r#Fu9mGSND
zxpRa=M}JR|pQ)@ZfveMH^l*&qx){~E#l_3Tn?BURl@t)tbuLa$@$$ic^7w)KDU`|_
zdjH(o68PZsB?hu-`ujp$y-`Kix(EOQq!gULc!g`zCHC$b<(=beOrTh<k?ilosN0}a
z53yVjjfDBjTkkQpZ8Noc1JknCjzF{J5D7_Y4S%cW@T(L|7b+;_6Ank1DH&@=!1X*V
z%cW&`t4OI3jfD8<^aY0252EYZ+7alFN0>Fto~1v(G)<#yG>JwcB;&EQBallcFsgNY
zKghT}YtnVud)HmmY6i)~8WMQ;YrCizbJUx5papfifElEHrP>Cs+7VW@-}{P@&6`NX
z<A3ZK8(!NeluIXx>Vf^6mWyhe()>?N(}~8Sq*5tz*&NwShG;B?5TZ>=F_6o$cYHTj
z^VfOmk^6eWp)W3wx?Mm0!GpZ?%3+2#3}HJ8ghnW=6OP>8FV+tX;y4aQwTeQK%Vep{
z&2i7z2GXf`R~Y7fPcBw>w`(Ai<k9<gQh%PSv=0;u5?-o;lv0vjw~lN&gV{1M8)csU
z{)4>);YAuys;6WG@X-D{a2%JzCng!%Fof^>w}76P)Z%C*rNpRJY1QZW?K4k;@_UQH
zfG89UmCYqq6-fa8J2A!YUOP%AlOvf(ph=1P0ttYo+2UG0&)C)s&;01XD!MYkY=5a9
z5Xj}?tOoy7vC5H?pJO>LlUJshD$Ws&L`fw2(De|W=TUDqG3IJS!-DZUM+oUU8*}UU
z&Np`V)C&j!rBVY?C>ko8j`ysABOgyNnJ?mcKGOw*a;1*zI5bU*mes<xU0kQ#8#oST
z%OVzyuxEUf@m(W0mdk+$cClqB(|^4NDh;Fn5bXfn#cs4L{(R^pm-9tT+h?j!$F@B*
zO`=p_=enk&X&O>WMBDZw;Sjd%aOCJ|{&4W$c*^J1H$UXu#B`S!RB&b>cm?<?-k$IB
z+S_MIrV?15q+z;&83=)t0wD!L1X9wZM9B7gA&^ocr6d}Q&@@}T{OTd@+<&o&_fAeS
zRh;VrN01<;5a9a?-)F`9;6F|?x@C}t1wv?OZP1zw0BV|s)&?r1K+|r0r)v^j)6k^G
z#^FKU{m*%Jj&9)hZyd*Lxhuq>5MpsAUZLvVKQ%!p8l_ydXjv}Nz9_L+<QC~_nnY?6
zO}2q*I$B6W*R}R@U{+hVZhz#Cu@QuTzyAFL_U#_!wSS#j8J5MRghJiS1s%5MdK^1*
zg<LvGwQeC0C|?ne#~B#N5RFFK1O&RSqw4`!U6X`#Eg+>y(wP+d_m49&GK}Z>?V`@-
z?5C5|S`OE5RF=h}+KEgQi-t<3RyHYn{qPy$sT75>iD-+#_kC#FyMOW(w(VdTHRg;O
zEz_c9S?!7y`upRgQVDcj$F^)N+r@EgEX&5W9E@6nCm(x&$*VW`<&VF$ES{=i1(`Tt
z(>aWqEr-vp&9X0*4*pbpxh_#kq3asi>^id9b@;xI>$)gEDBc`52&J~`-S)n4Naxt`
z^K2U(rckajkV!0?iGStII;FGIy#Mh8yLN1*Fk4@cey7Qq=XpVH5y7+T&G!vz$xkZ<
zlb5GRCSn{paj7Go`MkAaCq8xY2Ju)Vc<5>X(cQEn90@Zyndj7nsqUP3zDB>@F3eVm
zL_*Y>PFLW2U8l}XvVH3YrVGZ>xKN8tXqiH7@&-eLS?W!jwSQQRMvIndbADpF<3wYT
z20G`wS)+-jYil9=wlix~t2HL`<qmn6FKD0xgW0(jQfRB5K&-q_lQilk^`^BXrdu?y
zoD-KSb%d0x<tmj88m7Cf6YC4jSqDF`9T!cCH6>u%F1G6~?Vn<?29|MRO$uDsUsD31
zkd7|JaxL*q4S#gv5DAAcTQ-QbGb3LJqLC1OX9X;B;tqSu&^k=ZS~KuU`Gg};(uwer
zm~M6AWeBAEqs-NU|Gc37{{%c=kx2A0HZs&1+u~YCDSyd5zH^vju}s5kEzAbh|AB}m
z1g`6m&Zel=>)f|@v;!{nMGc50cP7=(U84iclq&7QPk*&ZD1_{Os;6!<VKZAT%4LIQ
z!(_wIAP?L<(h<{_G~h3@zx&|bRE;^VO%)JQ;CUXd>*Clho*PUa=7|U)7VY3!ikm&L
z@A+7^gV}6SsTj=6%u=m3a9oeQ`*zc6)_LN<zK(bn?kW}yrRgh+E;A*AKOQ=X(8COG
z$RR~Q#DDjFJTDj>2ETiFp1<(yxGs+4V%rY3?cg{Lj_u;Ofe<V^sIf-2Z>2I@=GQ-e
zoJ3!Ad0%n;Km!3QmfZu{6hC})A7-P*wdo?|x!NK#P`C603WewUxSosS`0c@gzfdYH
zj_{dmn(bqwnDrXJ`q^Xj#iA>~)7C(#RJ{&rxPRM9?X9C{IQ97qeSLAlA&pohOi0&*
z=EZe!JrCFQ@H`jW_VIlW+qQ9C565wXWEBk)Pb8=s26t~?&yx?|+odCkyeO5b&!Kps
zm#AU3Y~K6i0v~@qg_IhRu#O<GciHwc-wUFK=P7*UgA5ve$M&dHYutOsCLXzeyxlBy
zJyhR)UO@158{k>!{p&WDOBNqZ)R?L&N)4Dc9A;}ax~Ad!J`qhYlnOK0FUiFf_igWI
l&*r{fuge23<#Ndv{|9_7Ap$Pm-X{P6002ovPDHLkV1fa;^5Xyi

delta 1763
zcmV<91|0eE6aNj6Fn<QQNkl<ZXx_D2S##Ss68-=lqAu#NY$vfDC)uf;|NlFtW^1PQ
zVK<w}HF4rYCq?ll(fhzq)<Hs`65~ZBsT=ICyU`cOe*g15L2(fgNDvG|!^_JNbWM#<
z5b*xfcyF(UY2fPO1U<VAA_8Nq^0}TL;XiM`K-+jI5rLz|Vt<T*YaD4N@c!dHW{XgX
zkF%VYXj@ltlEQU^_1?SxZ+@T7+&zFKY692<!Z^cZy2Q7;r4moeGWYf%A}p3Z<_mBA
z+os^fcW3EgGFxr|C}@rXu-=>jD?h}|?cyN)^K-j&k0?rTdpE^&<|2;MEy1HG!Ts35
z-#3%|cfM@_(|^>V;|EruML&q~_0GY?vz~+&Xf_N4QL?2;#u@w|#?7}0I&BNhW&^s$
zk)#>IFvi010fv3;6EGZfz<&GJJKEIfrUvR9ZUE@pEu4)yQrfqF-LGA+EI{m@2gcc+
z@FWP`ZWAxgZE)Le!M0myw;E`e21pRHG|LHz)ZGby<9`Nl+(=4$GVGS_TLcKkb44=#
z{d<Y<t)__=-(8XgK}28x2*?B>%QE;ujD@qpY8CEj;E*MBjpNnT2wZZy{`xe55Tcf)
zH-*2t7(4=}5_Je6kR%yAKf>Mp41N$R0}+|Ppx>6dQV?eN{AIiq(+{~P01W#bjE1dk
z%WVSKO@Agtge1xE^>&K6<4Kdv?gQUkpGgzlhtCtFS+x~N5Ww=!PRGLYvtFrHOD(V)
zhXLTr*D=OZR|$m31nh1L&(FJ+Gz%xh{n!E5c%{4adTl&Al?Mf0nW%O$<JH9}2EBG^
z#@yrQ4DKqB()4>4gb<~I4+kCm`pfx2;SVOV-G9vZ`uZGA%Q$F(0;KCDQaatx*U^rM
zU>Z99`HwS<1}){o&Fdtr!V(}TSz)nQNoh>uF^@J(1Fx=zwUeoGDN%svv@Hz!Z6zK*
zh~*a0c^(=q6W5o6qpE@0)hGa*j(U3`t_rZsP-!Y)7#c2L^p7rQY8P{b6&j|Y1bF2q
z(to{1C-#q&W5*YBcDIG`)Hz5OMG3m?a<G<V!tR)AO_2biI76BVq)7@vxeL|?P`FXk
z%IhYkF)3}9Wl|+b!N&qCFM{uf@PoKC2OVtz(^Oz(d3{yg<dl1Gk`ktK4@=k2mBjPv
zl{5bHTu60^Ow^*E%zP}Ce$K~GnyG&ZfPcEBw#vGFa33=`Q{z1vKp3TmA3#v5I04}6
ztphKJYJ=8~(L7@eE7xClaEJPXL+fF(QWCz*>PJT**Nc?s8x48BaNG!srC%xhrqCn^
zrm4fSOlX`TNweczXgYHtNGMsW-IN1(7%vZMo-u~e(8kHIi&oRz3a9!p?(;BSD1Vuo
zF(z#-Co?~9Ejg2B{nyv$Fuzx>MX6uQg*F+dGk0$^QW@u)@+>=BtV&ze!fl5A4qjiM
zmv)QFwa_MG80PaEl@OY@f-R}<lb}lByPYOpy*!f&e-OYXV;raW^!EeORL%DRV9;w+
z(ztF=={lTqTwk89D_WVgxlDk9F@FdmeE4*ihdRXsV_9<d@%*ULa%UqOhM_6t1ie7G
ziM04k(hN)2$Nj?`L6|5f84`qUr&;-blIAVsZf#S@(6ig%T&>dAcZDV*L{S1ih~X?f
z%pDIR6SW6iG7HGEc+)c0t)|KZL@(y<MEO)MPErJ6f|VB{OSAQeuWpTGnSWf`BUD+=
zH1+k_P^yJ)zD*umyi7a}SZfMiHjS=YS(Zr;aIKCk-6?l}MCi?4I1`XxK@m!8DOvwe
z3b;s6yBY3BL4;9S`M;)V<r8Y2Uw9Nfgi5~Qc!I?kLm0+K6?kD7BTiD~Gw?J3IK#@T
zz5wjDjmkTMb+IVaI=LqSP=9DLt?uWc>D6vDox2FaMCp>{$y|srw!VEV9q!t#b;K)M
zA3xu($L}%_2Wue}EtJtQE(dTjXqWC?fREw???2okDKTTgLqvHgA?>~h&@=`^*U;@W
zVOa)rog)nMr0017k~Bjmwm~q)AcVkl9^hoqEQ$BPpx=JHh1|&tjDInBL4^PQ?*=a~
zN9cB%d(o0H2KL9lKTwqmn1&A9ZlTjU+%_zn5RRLJ**t(G2*3VvUdi|F<M`lf2E}E^
zu-`$u)!0gQ>|s1701(7r>I|IAyQss{iVV~F3ceqMK<f!y)n&zU731zf-r=oX=KGM#
zH1ze<k1dx=dWwU*TwKMNFFZtX0uqEbug+lT<pSQ1T{s)>Ow^f5JQ;vuji(+KOCK6%
zcym4a>2o2DCtjx~Z9F^egE1z3G34TT51qDEYw8C8{|Awj`>|Veoaq1n002ovPDHLk
FV1hg!S~&m!


From 3c6627518697858ac20a46e0ea8f96215e7da45c Mon Sep 17 00:00:00 2001
From: Samantha Doherty <sammy@status.net>
Date: Thu, 10 Mar 2011 23:59:45 -0500
Subject: [PATCH 530/655] Removing currently unused webfonts from theme.ini.

---
 theme/neo/theme.ini | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/theme/neo/theme.ini b/theme/neo/theme.ini
index b85ceca0b4..05d914c5e8 100644
--- a/theme/neo/theme.ini
+++ b/theme/neo/theme.ini
@@ -1,5 +1,2 @@
 external[]="http://fonts.googleapis.com/css?family=Lato:100,100italic,300,300italic,400,400italic,700,700italic,900,900italic"
-external[]="http://fonts.googleapis.com/css?family=Cabin:400,500,600,bold"
-external[]="http://fonts.googleapis.com/css?family=Puritan:regular,italic,bold,bolditalic"
-external[]="http://fonts.googleapis.com/css?family=Cantarell:regular,italic,bold,bolditalic"
 include=rebase

From dccd0ae6e1a74eb6558c2c0b9ad60bc0fa4cd0a3 Mon Sep 17 00:00:00 2001
From: Samantha Doherty <sammy@status.net>
Date: Fri, 11 Mar 2011 00:00:54 -0500
Subject: [PATCH 531/655] Couple of tiny theme changes for inline replies.

---
 theme/neo/css/display.css | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/theme/neo/css/display.css b/theme/neo/css/display.css
index d6a33ad0cb..22556bb891 100644
--- a/theme/neo/css/display.css
+++ b/theme/neo/css/display.css
@@ -504,10 +504,17 @@ div.entry-content a.response:after {
     background: none;
 }
 
+#content .notice .threaded-replies .entry-title {
+    min-height: 1px;
+}
+
 #content .threaded-replies .notice .author .photo {
     height: 24px;
     width: 24px;
     top: 14px;
+    box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.5);
+    -moz-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.5);
+    -webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.5);
 }
 
 #content .notice .threaded-replies .notice .entry-title {

From e2defc1f7c6986ab9c328d376148e9a54a4d6482 Mon Sep 17 00:00:00 2001
From: Siebrand Mazeland <s.mazeland@xs4all.nl>
Date: Fri, 11 Mar 2011 17:07:27 +0100
Subject: [PATCH 532/655] * update/add translator documentation. * remove
 superfluous whitespace. * minor updates to L10n/i18n.

---
 actions/passwordsettings.php  | 25 ++++++++++++++++++++-----
 actions/pathsadminpanel.php   | 19 ++++++++++++-------
 actions/peopletag.php         |  7 ++++---
 actions/plugindisable.php     |  3 ---
 actions/pluginenable.php      |  8 +++++---
 actions/pluginsadminpanel.php | 12 ++++--------
 actions/postnotice.php        |  8 +++++---
 actions/public.php            | 28 +++++++++++++++++++---------
 actions/publicxrds.php        |  1 -
 9 files changed, 69 insertions(+), 42 deletions(-)

diff --git a/actions/passwordsettings.php b/actions/passwordsettings.php
index 37877931ea..63acba7134 100644
--- a/actions/passwordsettings.php
+++ b/actions/passwordsettings.php
@@ -55,7 +55,8 @@ class PasswordsettingsAction extends SettingsAction
 
     function title()
     {
-        return _('Change password');
+        // TRANS: Title for page where to change password.
+        return _m('TITLE','Change password');
     }
 
     /**
@@ -66,6 +67,7 @@ class PasswordsettingsAction extends SettingsAction
 
     function getInstructions()
     {
+        // TRANS: Instructions for page where to change password.
         return _('Change your password.');
     }
 
@@ -93,6 +95,7 @@ class PasswordsettingsAction extends SettingsAction
                                           'action' =>
                                           common_local_url('passwordsettings')));
         $this->elementStart('fieldset');
+        // TRANS: Fieldset legend on page where to change password.
         $this->element('legend', null, _('Password change'));
         $this->hidden('token', common_session_token());
 
@@ -101,20 +104,26 @@ class PasswordsettingsAction extends SettingsAction
         // Users who logged in with OpenID won't have a pwd
         if ($user->password) {
             $this->elementStart('li');
+            // TRANS: Field label on page where to change password.
             $this->password('oldpassword', _('Old password'));
             $this->elementEnd('li');
         }
         $this->elementStart('li');
+        // TRANS: Field label on page where to change password.
         $this->password('newpassword', _('New password'),
+                        // TRANS: Field title on page where to change password.
                         _('6 or more characters.'));
         $this->elementEnd('li');
         $this->elementStart('li');
-        $this->password('confirm', _('Confirm'),
+        // TRANS: Field label on page where to change password. In this field the new password should be typed a second time.
+        $this->password('confirm', _m('LABEL','Confirm'),
+                        // TRANS: Field title on page where to change password.
                         _('Same as password above.'));
         $this->elementEnd('li');
         $this->elementEnd('ul');
 
-        $this->submit('changepass', _('Change'));
+        // TRANS: Button text on page where to change password.
+        $this->submit('changepass', _m('BUTTON','Change'));
 
         $this->elementEnd('fieldset');
         $this->elementEnd('form');
@@ -150,6 +159,7 @@ class PasswordsettingsAction extends SettingsAction
         # Some validation
 
         if (strlen($newpassword) < 6) {
+            // TRANS: Form validation error on page where to change password.
             $this->showForm(_('Password must be 6 or more characters.'));
             return;
         } else if (0 != strcmp($newpassword, $confirm)) {
@@ -161,7 +171,8 @@ class PasswordsettingsAction extends SettingsAction
             $oldpassword = $this->arg('oldpassword');
 
             if (!common_check_user($user->nickname, $oldpassword)) {
-                $this->showForm(_('Incorrect old password'));
+                // TRANS: Form validation error on page where to change password.
+                $this->showForm(_('Incorrect old password.'));
                 return;
             }
         }else{
@@ -177,17 +188,21 @@ class PasswordsettingsAction extends SettingsAction
 
             $val = $user->validate();
             if ($val !== true) {
+                // TRANS: Form validation error on page where to change password.
                 $this->showForm(_('Error saving user; invalid.'));
                 return;
             }
 
             if (!$user->update($original)) {
-                $this->serverError(_('Cannot save new password.'));
+            // TRANS: Server error displayed on page where to change password when password change
+            // TRANS: could not be made because of a server error.
+            $this->serverError(_('Cannot save new password.'));
                 return;
             }
             Event::handle('EndChangePassword', array($user));
         }
 
+        // TRANS: Form validation notice on page where to change password.
         $this->showForm(_('Password saved.'), true);
     }
 }
diff --git a/actions/pathsadminpanel.php b/actions/pathsadminpanel.php
index dd65a7a134..7bcc3f7811 100644
--- a/actions/pathsadminpanel.php
+++ b/actions/pathsadminpanel.php
@@ -152,7 +152,7 @@ class PathsadminpanelAction extends AdminPanelAction
         if (!empty($values['theme']['dir']) && !is_readable($values['theme']['dir'])) {
             // TRANS: Client error in Paths admin panel.
             // TRANS: %s is the directory that could not be read from.
-            $this->clientError(sprintf(_("Theme directory not readable: %s."), $values['theme']['dir']));
+            $this->clientError(sprintf(_('Theme directory not readable: %s.'), $values['theme']['dir']));
         }
 
         // Validate avatar dir
@@ -160,7 +160,7 @@ class PathsadminpanelAction extends AdminPanelAction
         if (empty($values['avatar']['dir']) || !is_writable($values['avatar']['dir'])) {
             // TRANS: Client error in Paths admin panel.
             // TRANS: %s is the avatar directory that could not be written to.
-            $this->clientError(sprintf(_("Avatar directory not writable: %s."), $values['avatar']['dir']));
+            $this->clientError(sprintf(_('Avatar directory not writable: %s.'), $values['avatar']['dir']));
         }
 
         // Validate background dir
@@ -168,7 +168,7 @@ class PathsadminpanelAction extends AdminPanelAction
         if (empty($values['background']['dir']) || !is_writable($values['background']['dir'])) {
             // TRANS: Client error in Paths admin panel.
             // TRANS: %s is the background directory that could not be written to.
-            $this->clientError(sprintf(_("Background directory not writable: %s."), $values['background']['dir']));
+            $this->clientError(sprintf(_('Background directory not writable: %s.'), $values['background']['dir']));
         }
 
         // Validate locales dir
@@ -178,7 +178,7 @@ class PathsadminpanelAction extends AdminPanelAction
         if (!empty($values['site']['locale_path']) && !is_readable($values['site']['locale_path'])) {
             // TRANS: Client error in Paths admin panel.
             // TRANS: %s is the locales directory that could not be read from.
-            $this->clientError(sprintf(_("Locales directory not readable: %s."), $values['site']['locale_path']));
+            $this->clientError(sprintf(_('Locales directory not readable: %s.'), $values['site']['locale_path']));
         }
 
         // Validate SSL setup
@@ -239,6 +239,7 @@ class PathsAdminPanelForm extends AdminForm
         $this->input('server',
                      // TRANS: Field label in Paths admin panel.
                      _('Server'),
+                     // TRANS: Field title in Paths admin panel.
                      _('Site\'s server hostname.'));
         $this->unli();
 
@@ -246,6 +247,7 @@ class PathsAdminPanelForm extends AdminForm
         $this->input('path',
                      // TRANS: Field label in Paths admin panel.
                      _('Path'),
+                     // TRANS: Field title in Paths admin panel.
                      _('Site path.'));
         $this->unli();
 
@@ -253,6 +255,7 @@ class PathsAdminPanelForm extends AdminForm
         $this->input('locale_path',
                      // TRANS: Field label in Paths admin panel.
                      _('Locale directory'),
+                     // TRANS: Field title in Paths admin panel.
                      _('Directory path to locales.'),
                      'site');
         $this->unli();
@@ -262,14 +265,16 @@ class PathsAdminPanelForm extends AdminForm
                              // TRANS: Checkbox label in Paths admin panel.
                              _('Fancy URLs'),
                              (bool) $this->value('fancy'),
-                             _('Use fancy (more readable and memorable) URLs?'));
+                             // TRANS: Field title in Paths admin panel.
+                             _('Use fancy URLs (more readable and memorable)?'));
         $this->unli();
 
         $this->out->elementEnd('ul');
         $this->out->elementEnd('fieldset');
 
         $this->out->elementStart('fieldset', array('id' => 'settings_paths_theme'));
-        $this->out->element('legend', null, _('Theme'));
+        // TRANS: Fieldset legend in Paths admin panel.
+        $this->out->element('legend', null, _m('LEGEND','Theme'));
 
         $this->out->elementStart('ul', 'form_data');
 
@@ -469,7 +474,7 @@ class PathsAdminPanelForm extends AdminForm
 
         $this->out->elementStart('fieldset', array('id' => 'settings_admin_ssl'));
         // TRANS: Fieldset legend in Paths admin panel.
-        $this->out->element('legend', null, _('SSL'));
+        $this->out->element('legend', null, _m('LEGEND','SSL'));
         $this->out->elementStart('ul', 'form_data');
         $this->li();
 
diff --git a/actions/peopletag.php b/actions/peopletag.php
index 7287cfbf99..2adc24ea66 100644
--- a/actions/peopletag.php
+++ b/actions/peopletag.php
@@ -44,7 +44,6 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
  *
  * @see      Action
  */
-
 class PeopletagAction extends Action
 {
 
@@ -65,6 +64,8 @@ class PeopletagAction extends Action
         $this->tag = $this->trimmed('tag');
 
         if (!common_valid_profile_tag($this->tag)) {
+            // TRANS: Client error displayed when trying to tag a profile with an invalid tag.
+            // TRANS: %s is the invalid tag.
             $this->clientError(sprintf(_('Not a valid people tag: %s.'),
                 $this->tag));
             return;
@@ -139,10 +140,11 @@ class PeopletagAction extends Action
      */
     function title()
     {
+        // TRANS: Page title for users with a certain self-tag.
+        // TRANS: %1$s is the tag, %2$s is the page number.
         return sprintf(_('Users self-tagged with %1$s - page %2$d'),
             $this->tag, $this->page);
     }
-
 }
 
 class PeopleTagList extends ProfileList
@@ -177,4 +179,3 @@ class PeopleTagListItem extends ProfileListItem
         return $aAttrs;
     }
 }
-
diff --git a/actions/plugindisable.php b/actions/plugindisable.php
index 7f107b3335..abda2a7395 100644
--- a/actions/plugindisable.php
+++ b/actions/plugindisable.php
@@ -52,7 +52,6 @@ if (!defined('STATUSNET')) {
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPLv3
  * @link      http://status.net/
  */
-
 class PluginDisableAction extends PluginEnableAction
 {
     /**
@@ -74,5 +73,3 @@ class PluginDisableAction extends PluginEnableAction
         return new EnablePluginForm($this, $this->plugin);
     }
 }
-
-
diff --git a/actions/pluginenable.php b/actions/pluginenable.php
index 2dbb3e3956..0f2b4ba670 100644
--- a/actions/pluginenable.php
+++ b/actions/pluginenable.php
@@ -52,7 +52,6 @@ if (!defined('STATUSNET')) {
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPLv3
  * @link      http://status.net/
  */
-
 class PluginEnableAction extends Action
 {
     var $user;
@@ -65,7 +64,6 @@ class PluginEnableAction extends Action
      *
      * @return boolean success flag
      */
-
     function prepare($args)
     {
         parent::prepare($args);
@@ -75,6 +73,8 @@ class PluginEnableAction extends Action
         // Only allow POST requests
 
         if ($_SERVER['REQUEST_METHOD'] != 'POST') {
+            // TRANS: Client error displayed when trying to use another method than POST.
+            // TRANS: Do not translate POST.
             $this->clientError(_('This action only accepts POST requests.'));
             return false;
         }
@@ -94,11 +94,13 @@ class PluginEnableAction extends Action
         $this->user = common_current_user();
 
         if (empty($this->user)) {
+            // TRANS: Client error displayed when trying to enable or disable a plugin while not logged in.
             $this->clientError(_('Not logged in.'));
             return false;
         }
 
         if (!AdminPanelAction::canAdmin('plugins')) {
+            // TRANS: Client error displayed when trying to enable or disable a plugin without access rights.
             $this->clientError(_('You cannot administer plugins.'));
             return false;
         }
@@ -106,6 +108,7 @@ class PluginEnableAction extends Action
         $this->plugin = $this->arg('plugin');
         $defaultPlugins = common_config('plugins', 'default');
         if (!array_key_exists($this->plugin, $defaultPlugins)) {
+            // TRANS: Client error displayed when trying to enable or disable a non-existing plugin.
             $this->clientError(_('No such plugin.'));
             return false;
         }
@@ -122,7 +125,6 @@ class PluginEnableAction extends Action
      *
      * @return void
      */
-
     function handle($args)
     {
         $key = 'disable-' . $this->plugin;
diff --git a/actions/pluginsadminpanel.php b/actions/pluginsadminpanel.php
index bc400bd514..ec8aed8a22 100644
--- a/actions/pluginsadminpanel.php
+++ b/actions/pluginsadminpanel.php
@@ -40,20 +40,17 @@ if (!defined('STATUSNET')) {
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
-
 class PluginsadminpanelAction extends AdminPanelAction
 {
-
     /**
      * Returns the page title
      *
      * @return string page title
      */
-
     function title()
     {
         // TRANS: Tab and title for plugins admin panel.
-        return _('Plugins');
+        return _m('TITLE','Plugins');
     }
 
     /**
@@ -61,11 +58,10 @@ class PluginsadminpanelAction extends AdminPanelAction
      *
      * @return string instructions
      */
-
     function getInstructions()
     {
         // TRANS: Instructions at top of plugin admin page.
-        return _('Additional plugins can be enabled and configured manually. ' . 
+        return _('Additional plugins can be enabled and configured manually. ' .
                  'See the <a href="http://status.net/wiki/Plugins">online plugin ' .
                  'documentation</a> for more details.');
     }
@@ -75,11 +71,10 @@ class PluginsadminpanelAction extends AdminPanelAction
      *
      * @return void
      */
-
     function showForm()
     {
         $this->elementStart('fieldset', array('id' => 'settings_plugins_default'));
-        
+
         // TRANS: Admin form section header
         $this->element('legend', null, _('Default plugins'), 'default');
 
@@ -103,6 +98,7 @@ class PluginsadminpanelAction extends AdminPanelAction
             $list->show();
         } else {
             $this->element('p', null,
+                           // TRANS: Text displayed on plugin admin page when no plugin are enabled.
                            _('All default plugins have been disabled from the ' .
                              'site\'s configuration file.'));
         }
diff --git a/actions/postnotice.php b/actions/postnotice.php
index 694c7808d9..43c764aa63 100644
--- a/actions/postnotice.php
+++ b/actions/postnotice.php
@@ -92,16 +92,18 @@ class PostnoticeAction extends Action
     {
         $content = common_shorten_links($_POST['omb_notice_content']);
         if (Notice::contentTooLong($content)) {
+            // TRANS: Client error displayed if the notice posted has too many characters.
             $this->clientError(_('Invalid notice content.'), 400);
             return false;
         }
         $license      = $_POST['omb_notice_license'];
         $site_license = common_config('license', 'url');
         if ($license && !common_compatible_license($license, $site_license)) {
-            throw new Exception(sprintf(_('Notice license ‘%1$s’ is not ' .
-                                          'compatible with site license ‘%2$s’.'),
+            // TRANS: Exception thrown if a notice's license is not compatible with the StatusNet site license.
+            // TRANS: %1$s is the notice license, %2$s is the StatusNet site's license.
+            throw new Exception(sprintf(_('Notice license "%1$s" is not ' .
+                                          'compatible with site license "%2$s".'),
                                         $license, $site_license));
         }
     }
 }
-?>
\ No newline at end of file
diff --git a/actions/public.php b/actions/public.php
index adeb58b0ee..b029407250 100644
--- a/actions/public.php
+++ b/actions/public.php
@@ -51,7 +51,6 @@ define('MAX_PUBLIC_PAGE', 100);
  * @see      PublicrssAction
  * @see      PublicxrdsAction
  */
-
 class PublicAction extends Action
 {
     /**
@@ -73,14 +72,15 @@ class PublicAction extends Action
      *
      * @return boolean success value
      */
-
     function prepare($args)
     {
         parent::prepare($args);
         $this->page = ($this->arg('page')) ? ($this->arg('page')+0) : 1;
 
         if ($this->page > MAX_PUBLIC_PAGE) {
-            $this->clientError(sprintf(_("Beyond the page limit (%s)."), MAX_PUBLIC_PAGE));
+            // TRANS: Client error displayed when requesting a public timeline page beyond the page limit.
+            // TRANS: %s is the page limit.
+            $this->clientError(sprintf(_('Beyond the page limit (%s).'), MAX_PUBLIC_PAGE));
         }
 
         common_set_returnto($this->selfUrl());
@@ -89,12 +89,13 @@ class PublicAction extends Action
                                        NOTICES_PER_PAGE + 1);
 
         if (!$this->notice) {
+            // TRANS: Server error displayed when a public timeline cannot be retrieved.
             $this->serverError(_('Could not retrieve public stream.'));
             return;
         }
 
         if($this->page > 1 && $this->notice->N == 0){
-            // TRANS: Server error when page not found (404)
+            // TRANS: Server error when page not found (404).
             $this->serverError(_('No such page.'),$code=404);
         }
 
@@ -110,7 +111,6 @@ class PublicAction extends Action
      *
      * @return void
      */
-
     function handle($args)
     {
         parent::handle($args);
@@ -123,12 +123,14 @@ class PublicAction extends Action
      *
      * @return page title, including page number if over 1
      */
-
     function title()
     {
         if ($this->page > 1) {
+            // TRANS: Title for all public timeline pages but the first.
+            // TRANS: %d is the page number.
             return sprintf(_('Public timeline, page %d'), $this->page);
         } else {
+            // TRANS: Title for the first public timeline page.
             return _('Public timeline');
         }
     }
@@ -153,33 +155,38 @@ class PublicAction extends Action
      *
      * @return void
      */
-
     function getFeeds()
     {
         return array(new Feed(Feed::RSS1, common_local_url('publicrss'),
+                              // TRANS: Link description for public timeline feed.
                               _('Public Stream Feed (RSS 1.0)')),
                      new Feed(Feed::RSS2,
                               common_local_url('ApiTimelinePublic',
                                                array('format' => 'rss')),
+                              // TRANS: Link description for public timeline feed.
                               _('Public Stream Feed (RSS 2.0)')),
                      new Feed(Feed::ATOM,
                               common_local_url('ApiTimelinePublic',
                                                array('format' => 'atom')),
+                              // TRANS: Link description for public timeline feed.
                               _('Public Stream Feed (Atom)')));
     }
 
     function showEmptyList()
     {
+        // TRANS: Text displayed for public feed when there are no public notices.
         $message = _('This is the public timeline for %%site.name%% but no one has posted anything yet.') . ' ';
 
         if (common_logged_in()) {
+            // TRANS: Additional text displayed for public feed when there are no public notices for a logged in user.
             $message .= _('Be the first to post!');
         }
         else {
             if (! (common_config('site','closed') || common_config('site','inviteonly'))) {
+                // TRANS: Additional text displayed for public feed when there are no public notices for a not logged in user.
                 $message .= _('Why not [register an account](%%action.register%%) and be the first to post!');
             }
-	}
+        }
 
         $this->elementStart('div', 'guide');
         $this->raw(common_markup_to_html($message));
@@ -194,7 +201,6 @@ class PublicAction extends Action
      *
      * @return void
      */
-
     function showContent()
     {
         $nl = new ThreadedNoticeList($this->notice, $this);
@@ -224,11 +230,15 @@ class PublicAction extends Action
     function showAnonymousMessage()
     {
         if (! (common_config('site','closed') || common_config('site','inviteonly'))) {
+            // TRANS: Message for not logged in users at an invite-only site trying to view the public feed of notices.
+            // TRANS: This message contains Markdown links. Please mind the formatting.
             $m = _('This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-blogging) service ' .
                    'based on the Free Software [StatusNet](http://status.net/) tool. ' .
                    '[Join now](%%action.register%%) to share notices about yourself with friends, family, and colleagues! ' .
                    '([Read more](%%doc.help%%))');
         } else {
+            // TRANS: Message for not logged in users at a closed site trying to view the public feed of notices.
+            // TRANS: This message contains Markdown links. Please mind the formatting.
             $m = _('This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-blogging) service ' .
                    'based on the Free Software [StatusNet](http://status.net/) tool.');
         }
diff --git a/actions/publicxrds.php b/actions/publicxrds.php
index 8f0337e4f7..aac6f423cf 100644
--- a/actions/publicxrds.php
+++ b/actions/publicxrds.php
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * Public XRDS for OpenID
  *

From 76bffe1a64a0d077492d577d11472492646f6c27 Mon Sep 17 00:00:00 2001
From: Siebrand Mazeland <s.mazeland@xs4all.nl>
Date: Fri, 11 Mar 2011 18:31:22 +0100
Subject: [PATCH 533/655] * Superfluous whitespace removed * Small L10n updates

---
 plugins/Poll/Poll.php             |  4 ----
 plugins/Poll/PollPlugin.php       |  8 --------
 plugins/Poll/Poll_response.php    |  5 -----
 plugins/Poll/newpoll.php          | 10 +---------
 plugins/Poll/newpollform.php      |  8 --------
 plugins/Poll/pollresponseform.php |  7 -------
 plugins/Poll/pollresultform.php   |  7 -------
 plugins/Poll/respondpoll.php      |  9 +--------
 plugins/Poll/showpoll.php         |  4 ----
 9 files changed, 2 insertions(+), 60 deletions(-)

diff --git a/plugins/Poll/Poll.php b/plugins/Poll/Poll.php
index 1f26bbf6e4..001648fd21 100644
--- a/plugins/Poll/Poll.php
+++ b/plugins/Poll/Poll.php
@@ -64,7 +64,6 @@ class Poll extends Managed_DataObject
      * @return User_greeting_count object found, or null for no hits
      *
      */
-
     function staticGet($k, $v=null)
     {
         return Memcached_DataObject::staticGet('Poll', $k, $v);
@@ -82,7 +81,6 @@ class Poll extends Managed_DataObject
      * @return Bookmark object found, or null for no hits
      *
      */
-
     function pkeyGet($kv)
     {
         return Memcached_DataObject::pkeyGet('Poll', $kv);
@@ -117,7 +115,6 @@ class Poll extends Managed_DataObject
      *
      * @return Poll found poll or null
      */
-
     function getByNotice($notice)
     {
         return self::staticGet('uri', $notice->uri);
@@ -209,7 +206,6 @@ class Poll extends Managed_DataObject
      *
      * @return Notice saved notice
      */
-
     static function saveNew($profile, $question, $opts, $options=null)
     {
         if (empty($options)) {
diff --git a/plugins/Poll/PollPlugin.php b/plugins/Poll/PollPlugin.php
index a2e9814555..b3de0634a9 100644
--- a/plugins/Poll/PollPlugin.php
+++ b/plugins/Poll/PollPlugin.php
@@ -43,7 +43,6 @@ if (!defined('STATUSNET')) {
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
  * @link      http://status.net/
  */
-
 class PollPlugin extends MicroAppPlugin
 {
     const VERSION         = '0.1';
@@ -60,7 +59,6 @@ class PollPlugin extends MicroAppPlugin
      *
      * @return boolean hook value; true means continue processing, false means stop.
      */
-
     function onCheckSchema()
     {
         $schema = Schema::get();
@@ -76,7 +74,6 @@ class PollPlugin extends MicroAppPlugin
      *
      * @return boolean hook value
      */
-
     function onEndShowStyles($action)
     {
         $action->cssLink($this->path('poll.css'));
@@ -90,7 +87,6 @@ class PollPlugin extends MicroAppPlugin
      *
      * @return boolean hook value; true means continue processing, false means stop.
      */
-
     function onAutoload($cls)
     {
         $dir = dirname(__FILE__);
@@ -123,7 +119,6 @@ class PollPlugin extends MicroAppPlugin
      *
      * @return boolean hook value; true means continue processing, false means stop.
      */
-
     function onRouterInitialized($m)
     {
         $m->connect('main/poll/new',
@@ -151,7 +146,6 @@ class PollPlugin extends MicroAppPlugin
      *
      * @return value
      */
-
     function onPluginVersion(&$versions)
     {
         $versions[] = array('name' => 'Poll',
@@ -175,7 +169,6 @@ class PollPlugin extends MicroAppPlugin
      *
      * @return boolean hook value
      */
-
     function deleteRelated($notice)
     {
         $p = Poll::getByNotice($notice);
@@ -196,7 +189,6 @@ class PollPlugin extends MicroAppPlugin
      *
      * @return Notice resulting notice
      */
-
     function saveNoticeFromActivity($activity, $profile, $options=array())
     {
         // @fixme
diff --git a/plugins/Poll/Poll_response.php b/plugins/Poll/Poll_response.php
index 88e6ea890c..8543d1c245 100644
--- a/plugins/Poll/Poll_response.php
+++ b/plugins/Poll/Poll_response.php
@@ -42,7 +42,6 @@ if (!defined('STATUSNET')) {
  *
  * @see      DB_DataObject
  */
-
 class Poll_response extends Managed_DataObject
 {
     public $__table = 'poll_response'; // table name
@@ -63,7 +62,6 @@ class Poll_response extends Managed_DataObject
      * @return User_greeting_count object found, or null for no hits
      *
      */
-
     function staticGet($k, $v=null)
     {
         return Memcached_DataObject::staticGet('Poll_response', $k, $v);
@@ -81,7 +79,6 @@ class Poll_response extends Managed_DataObject
      * @return Bookmark object found, or null for no hits
      *
      */
-
     function pkeyGet($kv)
     {
         return Memcached_DataObject::pkeyGet('Poll_response', $kv);
@@ -120,7 +117,6 @@ class Poll_response extends Managed_DataObject
      *
      * @return Poll_response found response or null
      */
-
     function getByNotice($notice)
     {
         return self::staticGet('uri', $notice->uri);
@@ -159,7 +155,6 @@ class Poll_response extends Managed_DataObject
      *
      * @return Notice saved notice
      */
-
     static function saveNew($profile, $poll, $selection, $options=null)
     {
         if (empty($options)) {
diff --git a/plugins/Poll/newpoll.php b/plugins/Poll/newpoll.php
index fa6eb798d7..585af1a7b5 100644
--- a/plugins/Poll/newpoll.php
+++ b/plugins/Poll/newpoll.php
@@ -43,7 +43,6 @@ if (!defined('STATUSNET')) {
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
  * @link      http://status.net/
  */
-
 class NewPollAction extends Action
 {
     protected $user        = null;
@@ -58,7 +57,6 @@ class NewPollAction extends Action
      *
      * @return string Action title
      */
-
     function title()
     {
         return _('New poll');
@@ -71,7 +69,6 @@ class NewPollAction extends Action
      *
      * @return boolean true
      */
-
     function prepare($argarray)
     {
         parent::prepare($argarray);
@@ -79,7 +76,7 @@ class NewPollAction extends Action
         $this->user = common_current_user();
 
         if (empty($this->user)) {
-            throw new ClientException(_("Must be logged in to post a poll."),
+            throw new ClientException(_("You must be logged in to post a poll."),
                                       403);
         }
 
@@ -105,7 +102,6 @@ class NewPollAction extends Action
      *
      * @return void
      */
-
     function handle($argarray=null)
     {
         parent::handle($argarray);
@@ -124,7 +120,6 @@ class NewPollAction extends Action
      *
      * @return void
      */
-
     function newPoll()
     {
         if ($this->boolean('ajax')) {
@@ -143,7 +138,6 @@ class NewPollAction extends Action
             $saved = Poll::saveNew($this->user->getProfile(),
                                               $this->question,
                                               $this->options);
-
         } catch (ClientException $ce) {
             $this->error = $ce->getMessage();
             $this->showPage();
@@ -188,7 +182,6 @@ class NewPollAction extends Action
      *
      * @return void
      */
-
     function showContent()
     {
         if (!empty($this->error)) {
@@ -213,7 +206,6 @@ class NewPollAction extends Action
      *
      * @return boolean is read only action?
      */
-
     function isReadOnly($args)
     {
         if ($_SERVER['REQUEST_METHOD'] == 'GET' ||
diff --git a/plugins/Poll/newpollform.php b/plugins/Poll/newpollform.php
index 73e516c891..d751ccd458 100644
--- a/plugins/Poll/newpollform.php
+++ b/plugins/Poll/newpollform.php
@@ -44,10 +44,8 @@ if (!defined('STATUSNET')) {
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
  * @link      http://status.net/
  */
-
 class NewpollForm extends Form
 {
-
     protected $question = null;
     protected $options = array();
 
@@ -58,7 +56,6 @@ class NewpollForm extends Form
      *
      * @return void
      */
-
     function __construct($out=null, $question=null, $options=null)
     {
         parent::__construct($out);
@@ -69,7 +66,6 @@ class NewpollForm extends Form
      *
      * @return int ID of the form
      */
-
     function id()
     {
         return 'newpoll-form';
@@ -80,7 +76,6 @@ class NewpollForm extends Form
      *
      * @return string class of the form
      */
-
     function formClass()
     {
         return 'form_settings ajax-notice';
@@ -91,7 +86,6 @@ class NewpollForm extends Form
      *
      * @return string URL of the action
      */
-
     function action()
     {
         return common_local_url('newpoll');
@@ -102,7 +96,6 @@ class NewpollForm extends Form
      *
      * @return void
      */
-
     function formData()
     {
         $this->out->elementStart('fieldset', array('id' => 'newpoll-data'));
@@ -142,7 +135,6 @@ class NewpollForm extends Form
      *
      * @return void
      */
-
     function formActions()
     {
         $this->out->submit('submit', _m('BUTTON', 'Save'));
diff --git a/plugins/Poll/pollresponseform.php b/plugins/Poll/pollresponseform.php
index 015dbb1b1f..a543906afb 100644
--- a/plugins/Poll/pollresponseform.php
+++ b/plugins/Poll/pollresponseform.php
@@ -44,7 +44,6 @@ if (!defined('STATUSNET')) {
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
  * @link      http://status.net/
  */
-
 class PollResponseForm extends Form
 {
     protected $poll;
@@ -57,7 +56,6 @@ class PollResponseForm extends Form
      *
      * @return void
      */
-
     function __construct(Poll $poll, HTMLOutputter $out)
     {
         parent::__construct($out);
@@ -69,7 +67,6 @@ class PollResponseForm extends Form
      *
      * @return int ID of the form
      */
-
     function id()
     {
         return 'pollresponse-form';
@@ -80,7 +77,6 @@ class PollResponseForm extends Form
      *
      * @return string class of the form
      */
-
     function formClass()
     {
         return 'form_settings ajax';
@@ -91,7 +87,6 @@ class PollResponseForm extends Form
      *
      * @return string URL of the action
      */
-
     function action()
     {
         return common_local_url('respondpoll', array('id' => $this->poll->id));
@@ -102,7 +97,6 @@ class PollResponseForm extends Form
      *
      * @return void
      */
-
     function formData()
     {
         $poll = $this->poll;
@@ -127,7 +121,6 @@ class PollResponseForm extends Form
      *
      * @return void
      */
-
     function formActions()
     {
         $this->out->submit('submit', _m('BUTTON', 'Submit'));
diff --git a/plugins/Poll/pollresultform.php b/plugins/Poll/pollresultform.php
index f4da10cb53..0701482e68 100644
--- a/plugins/Poll/pollresultform.php
+++ b/plugins/Poll/pollresultform.php
@@ -44,7 +44,6 @@ if (!defined('STATUSNET')) {
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
  * @link      http://status.net/
  */
-
 class PollResultForm extends Form
 {
     protected $poll;
@@ -57,7 +56,6 @@ class PollResultForm extends Form
      *
      * @return void
      */
-
     function __construct(Poll $poll, HTMLOutputter $out)
     {
         parent::__construct($out);
@@ -69,7 +67,6 @@ class PollResultForm extends Form
      *
      * @return int ID of the form
      */
-
     function id()
     {
         return 'pollresult-form';
@@ -80,7 +77,6 @@ class PollResultForm extends Form
      *
      * @return string class of the form
      */
-
     function formClass()
     {
         return 'form_settings ajax';
@@ -91,7 +87,6 @@ class PollResultForm extends Form
      *
      * @return string URL of the action
      */
-
     function action()
     {
         return common_local_url('respondpoll', array('id' => $this->poll->id));
@@ -102,7 +97,6 @@ class PollResultForm extends Form
      *
      * @return void
      */
-
     function formData()
     {
         $poll = $this->poll;
@@ -143,7 +137,6 @@ class PollResultForm extends Form
      *
      * @return void
      */
-
     function formActions()
     {
     }
diff --git a/plugins/Poll/respondpoll.php b/plugins/Poll/respondpoll.php
index e521a2a68f..0a6014699c 100644
--- a/plugins/Poll/respondpoll.php
+++ b/plugins/Poll/respondpoll.php
@@ -43,7 +43,6 @@ if (!defined('STATUSNET')) {
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
  * @link      http://status.net/
  */
-
 class RespondPollAction extends Action
 {
     protected $user        = null;
@@ -58,7 +57,6 @@ class RespondPollAction extends Action
      *
      * @return string Action title
      */
-
     function title()
     {
         return _m('Poll response');
@@ -71,7 +69,6 @@ class RespondPollAction extends Action
      *
      * @return boolean true
      */
-
     function prepare($argarray)
     {
         parent::prepare($argarray);
@@ -82,7 +79,7 @@ class RespondPollAction extends Action
         $this->user = common_current_user();
 
         if (empty($this->user)) {
-            throw new ClientException(_m("Must be logged in to respond to a poll."),
+            throw new ClientException(_m("You must be logged in to respond to a poll."),
                                       403);
         }
 
@@ -112,7 +109,6 @@ class RespondPollAction extends Action
      *
      * @return void
      */
-
     function handle($argarray=null)
     {
         parent::handle($argarray);
@@ -131,7 +127,6 @@ class RespondPollAction extends Action
      *
      * @return void
      */
-
     function respondPoll()
     {
         try {
@@ -167,7 +162,6 @@ class RespondPollAction extends Action
      *
      * @return void
      */
-
     function showContent()
     {
         if (!empty($this->error)) {
@@ -190,7 +184,6 @@ class RespondPollAction extends Action
      *
      * @return boolean is read only action?
      */
-
     function isReadOnly($args)
     {
         if ($_SERVER['REQUEST_METHOD'] == 'GET' ||
diff --git a/plugins/Poll/showpoll.php b/plugins/Poll/showpoll.php
index 21ac7647c0..5b22c06805 100644
--- a/plugins/Poll/showpoll.php
+++ b/plugins/Poll/showpoll.php
@@ -44,7 +44,6 @@ if (!defined('STATUSNET')) {
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
  * @link      http://status.net/
  */
-
 class ShowPollAction extends ShownoticeAction
 {
     protected $poll = null;
@@ -56,7 +55,6 @@ class ShowPollAction extends ShownoticeAction
      *
      * @return boolean true
      */
-
     function prepare($argarray)
     {
         OwnerDesignAction::prepare($argarray);
@@ -100,7 +98,6 @@ class ShowPollAction extends ShownoticeAction
      *
      * @return string page tile
      */
-
     function title()
     {
         return sprintf(_('%s\'s poll: %s'),
@@ -124,5 +121,4 @@ class ShowPollAction extends ShownoticeAction
     {
         return Action::etag();
     }
-
 }

From a70914cd579c9f600545cd5166ffbd36619aa856 Mon Sep 17 00:00:00 2001
From: Siebrand Mazeland <s.mazeland@xs4all.nl>
Date: Fri, 11 Mar 2011 18:33:19 +0100
Subject: [PATCH 534/655] i18n fixes: plugins should use _m(), not _().

---
 plugins/Poll/newpoll.php  | 10 +++++-----
 plugins/Poll/showpoll.php |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/plugins/Poll/newpoll.php b/plugins/Poll/newpoll.php
index 585af1a7b5..0386f3e3b8 100644
--- a/plugins/Poll/newpoll.php
+++ b/plugins/Poll/newpoll.php
@@ -59,7 +59,7 @@ class NewPollAction extends Action
      */
     function title()
     {
-        return _('New poll');
+        return _m('New poll');
     }
 
     /**
@@ -76,7 +76,7 @@ class NewPollAction extends Action
         $this->user = common_current_user();
 
         if (empty($this->user)) {
-            throw new ClientException(_("You must be logged in to post a poll."),
+            throw new ClientException(_m('You must be logged in to post a poll.'),
                                       403);
         }
 
@@ -127,11 +127,11 @@ class NewPollAction extends Action
         }
         try {
             if (empty($this->question)) {
-                throw new ClientException(_('Poll must have a question.'));
+                throw new ClientException(_m('Poll must have a question.'));
             }
 
             if (count($this->options) < 2) {
-                throw new ClientException(_('Poll must have at least two options.'));
+                throw new ClientException(_m('Poll must have at least two options.'));
             }
 
 
@@ -150,7 +150,7 @@ class NewPollAction extends Action
             $this->elementStart('html');
             $this->elementStart('head');
             // TRANS: Page title after sending a notice.
-            $this->element('title', null, _('Notice posted'));
+            $this->element('title', null, _m('Notice posted'));
             $this->elementEnd('head');
             $this->elementStart('body');
             $this->showNotice($saved);
diff --git a/plugins/Poll/showpoll.php b/plugins/Poll/showpoll.php
index 5b22c06805..60669f96ff 100644
--- a/plugins/Poll/showpoll.php
+++ b/plugins/Poll/showpoll.php
@@ -100,7 +100,7 @@ class ShowPollAction extends ShownoticeAction
      */
     function title()
     {
-        return sprintf(_('%s\'s poll: %s'),
+        return sprintf(_m('%s\'s poll: %s'),
                        $this->user->nickname,
                        $this->poll->question);
     }

From 843ace580d1ea2b05e15710c1b0714dad48dac6c Mon Sep 17 00:00:00 2001
From: Siebrand Mazeland <s.mazeland@xs4all.nl>
Date: Fri, 11 Mar 2011 19:05:28 +0100
Subject: [PATCH 535/655] i18n/L10n updates Translator documentation added

---
 plugins/Poll/Poll.php             | 11 +++++++----
 plugins/Poll/PollPlugin.php       | 20 ++++++++++++++------
 plugins/Poll/Poll_response.php    | 10 +++++++---
 plugins/Poll/newpoll.php          |  4 ++++
 plugins/Poll/newpollform.php      |  5 +++++
 plugins/Poll/pollresponseform.php |  1 +
 plugins/Poll/respondpoll.php      | 10 +++++++---
 plugins/Poll/showpoll.php         |  8 +++++++-
 8 files changed, 52 insertions(+), 17 deletions(-)

diff --git a/plugins/Poll/Poll.php b/plugins/Poll/Poll.php
index 001648fd21..f5fa9bade5 100644
--- a/plugins/Poll/Poll.php
+++ b/plugins/Poll/Poll.php
@@ -235,12 +235,15 @@ class Poll extends Managed_DataObject
         common_log(LOG_DEBUG, "Saving poll: $p->id $p->uri");
         $p->insert();
 
-        $content  = sprintf(_m('Poll: %s %s'),
+        // TRANS: Notice content creating a poll.
+        // TRANS: %1$s is the poll question, %2$s is a link to the poll.
+        $content  = sprintf(_m('Poll: %1$s %2$s'),
                             $question,
                             $p->uri);
-        $rendered = sprintf(_m('Poll: <a href="%s">%s</a>'),
-                            htmlspecialchars($p->uri),
-                            htmlspecialchars($question));
+        $link = '<a href="' . htmlspecialchars($p->uri) . '">' . htmlspecialchars($question) . '</a>';
+        // TRANS: Rendered version of the notice content creating a poll.
+        // TRANS: %s a link to the poll with the question as link description.
+        $rendered = sprintf(_m('Poll: %s'), $link);
 
         $tags    = array('poll');
         $replies = array();
diff --git a/plugins/Poll/PollPlugin.php b/plugins/Poll/PollPlugin.php
index b3de0634a9..34c37eb526 100644
--- a/plugins/Poll/PollPlugin.php
+++ b/plugins/Poll/PollPlugin.php
@@ -153,6 +153,7 @@ class PollPlugin extends MicroAppPlugin
                             'author' => 'Brion Vibber',
                             'homepage' => 'http://status.net/wiki/Plugin:Poll',
                             'rawdescription' =>
+                            // TRANS: Plugin description.
                             _m('Simple extension for supporting basic polls.'));
         return true;
     }
@@ -229,11 +230,13 @@ class PollPlugin extends MicroAppPlugin
                 $selection = intval($data->getAttribute('selection'));
 
                 if (!$pollUri) {
-                    throw new Exception('Invalid poll response: no poll reference.');
+                    // TRANS: Exception thrown trying to respond to a poll without a poll reference.
+                    throw new Exception(_m('Invalid poll response: no poll reference.'));
                 }
                 $poll = Poll::staticGet('uri', $pollUri);
                 if (!$poll) {
-                    throw new Exception('Invalid poll response: poll is unknown.');
+                    // TRANS: Exception thrown trying to respond to a non-existing poll.
+                    throw new Exception(_m('Invalid poll response: poll is unknown.'));
                 }
                 try {
                     $notice = Poll_response::saveNew($profile, $poll, $selection, $options);
@@ -258,7 +261,9 @@ class PollPlugin extends MicroAppPlugin
         case self::POLL_RESPONSE_OBJECT:
             return $this->activityObjectFromNoticePollResponse($notice);
         default:
-            throw new Exception('Unexpected type for poll plugin: ' . $notice->object_type);
+            // TRANS: Exception thrown when performing an unexpected action on a poll.
+            // TRANS: %s is the unpexpected object type.
+            throw new Exception(sprintf(_m('Unexpected type for poll plugin: %s.'), $notice->object_type));
         }
     }
 
@@ -361,7 +366,9 @@ class PollPlugin extends MicroAppPlugin
         case self::POLL_RESPONSE_OBJECT:
             return $this->showNoticePollResponse($notice, $out);
         default:
-            throw new Exception('Unexpected type for poll plugin: ' . $notice->object_type);
+            // TRANS: Exception thrown when performing an unexpected action on a poll.
+            // TRANS: %s is the unpexpected object type.
+            throw new Exception(sprintf(_m('Unexpected type for poll plugin: %s.'), $notice->object_type));
         }
     }
 
@@ -388,7 +395,7 @@ class PollPlugin extends MicroAppPlugin
                 $form->show();
             }
         } else {
-            $out->text('Poll data is missing');
+            $out->text(_('Poll data is missing'));
         }
         $out->elementEnd('div');
 
@@ -421,6 +428,7 @@ class PollPlugin extends MicroAppPlugin
 
     function appTitle()
     {
-        return _m('Poll');
+        // TRANS: Application title.
+        return _m('APPTITLE','Poll');
     }
 }
diff --git a/plugins/Poll/Poll_response.php b/plugins/Poll/Poll_response.php
index 8543d1c245..a4ea999933 100644
--- a/plugins/Poll/Poll_response.php
+++ b/plugins/Poll/Poll_response.php
@@ -162,6 +162,7 @@ class Poll_response extends Managed_DataObject
         }
 
         if (!$poll->isValidSelection($selection)) {
+            // TRANS: Client exception thrown when responding to a poll with an invalid option.
             throw new ClientException(_m('Invalid poll selection.'));
         }
         $opts = $poll->getOptions();
@@ -189,11 +190,14 @@ class Poll_response extends Managed_DataObject
         common_log(LOG_DEBUG, "Saving poll response: $pr->id $pr->uri");
         $pr->insert();
 
+        // TRANS: Notice content voting for a poll.
+        // TRANS: %s is the chosen option in the poll.
         $content  = sprintf(_m('voted for "%s"'),
                             $answer);
-        $rendered = sprintf(_m('voted for “<a href="%s">%s</a>”'),
-                            htmlspecialchars($poll->uri),
-                            htmlspecialchars($answer));
+        $link = '<a href="' . htmlspecialchars($poll->uri) . '">' . htmlspecialchars($answer) . '</a>';
+        // TRANS: Rendered version of the notice content voting for a poll.
+        // TRANS: %s a link to the poll with the chosen option as link description.
+        $rendered = sprintf(_m('voted for "%s"'), $link);
 
         $tags    = array();
         $replies = array();
diff --git a/plugins/Poll/newpoll.php b/plugins/Poll/newpoll.php
index 0386f3e3b8..1048b0a1ed 100644
--- a/plugins/Poll/newpoll.php
+++ b/plugins/Poll/newpoll.php
@@ -59,6 +59,7 @@ class NewPollAction extends Action
      */
     function title()
     {
+        // TRANS: Title for poll page.
         return _m('New poll');
     }
 
@@ -76,6 +77,7 @@ class NewPollAction extends Action
         $this->user = common_current_user();
 
         if (empty($this->user)) {
+            // TRANS: Client exception thrown trying to create a poll while not logged in.
             throw new ClientException(_m('You must be logged in to post a poll.'),
                                       403);
         }
@@ -127,10 +129,12 @@ class NewPollAction extends Action
         }
         try {
             if (empty($this->question)) {
+            // TRANS: Client exception thrown trying to create a poll without a question.
                 throw new ClientException(_m('Poll must have a question.'));
             }
 
             if (count($this->options) < 2) {
+                // TRANS: Client exception thrown trying to create a poll with fewer than two options.
                 throw new ClientException(_m('Poll must have at least two options.'));
             }
 
diff --git a/plugins/Poll/newpollform.php b/plugins/Poll/newpollform.php
index d751ccd458..295619b1b9 100644
--- a/plugins/Poll/newpollform.php
+++ b/plugins/Poll/newpollform.php
@@ -103,8 +103,10 @@ class NewpollForm extends Form
 
         $this->li();
         $this->out->input('question',
+                          // TRANS: Field label on the page to create a poll.
                           _m('Question'),
                           $this->question,
+                          // TRANS: Field title on the page to create a poll.
                           _m('What question are people answering?'));
         $this->unli();
 
@@ -121,6 +123,8 @@ class NewpollForm extends Form
             }
             $this->li();
             $this->out->input('option' . ($i + 1),
+                              // TRANS: Field label for an answer option on the page to create a poll.
+                              // TRANS: %d is the option number.
                               sprintf(_m('Option %d'), $i + 1),
                               $default);
             $this->unli();
@@ -137,6 +141,7 @@ class NewpollForm extends Form
      */
     function formActions()
     {
+        // TRANS: Button text for saving a new poll.
         $this->out->submit('submit', _m('BUTTON', 'Save'));
     }
 }
diff --git a/plugins/Poll/pollresponseform.php b/plugins/Poll/pollresponseform.php
index a543906afb..ce1c31f6c2 100644
--- a/plugins/Poll/pollresponseform.php
+++ b/plugins/Poll/pollresponseform.php
@@ -123,6 +123,7 @@ class PollResponseForm extends Form
      */
     function formActions()
     {
+        // TRANS: Button text for submitting a poll response.
         $this->out->submit('submit', _m('BUTTON', 'Submit'));
     }
 }
diff --git a/plugins/Poll/respondpoll.php b/plugins/Poll/respondpoll.php
index 0a6014699c..74629c3604 100644
--- a/plugins/Poll/respondpoll.php
+++ b/plugins/Poll/respondpoll.php
@@ -3,7 +3,7 @@
  * StatusNet - the distributed open-source microblogging tool
  * Copyright (C) 2011, StatusNet, Inc.
  *
- * Add a new Poll
+ * Respond to a Poll
  *
  * PHP version 5
  *
@@ -34,7 +34,7 @@ if (!defined('STATUSNET')) {
 }
 
 /**
- * Add a new Poll
+ * Respond to a Poll
  *
  * @category  Poll
  * @package   StatusNet
@@ -59,6 +59,7 @@ class RespondPollAction extends Action
      */
     function title()
     {
+        // TRANS: Page title for poll response.
         return _m('Poll response');
     }
 
@@ -79,6 +80,7 @@ class RespondPollAction extends Action
         $this->user = common_current_user();
 
         if (empty($this->user)) {
+            // TRANS: Client exception thrown trying to respond to a poll while not logged in.
             throw new ClientException(_m("You must be logged in to respond to a poll."),
                                       403);
         }
@@ -90,11 +92,13 @@ class RespondPollAction extends Action
         $id = $this->trimmed('id');
         $this->poll = Poll::staticGet('id', $id);
         if (empty($this->poll)) {
-            throw new ClientException(_m("Invalid or missing poll."), 404);
+            // TRANS: Client exception thrown trying to respond to a non-existing poll.
+            throw new ClientException(_m('Invalid or missing poll.'), 404);
         }
 
         $selection = intval($this->trimmed('pollselection'));
         if ($selection < 1 || $selection > count($this->poll->getOptions())) {
+            // TRANS: Client exception thrown responding to a poll with an invalid answer.
             throw new ClientException(_m('Invalid poll selection.'));
         }
         $this->selection = $selection;
diff --git a/plugins/Poll/showpoll.php b/plugins/Poll/showpoll.php
index 60669f96ff..d95b1c512e 100644
--- a/plugins/Poll/showpoll.php
+++ b/plugins/Poll/showpoll.php
@@ -64,6 +64,7 @@ class ShowPollAction extends ShownoticeAction
         $this->poll = Poll::staticGet('id', $this->id);
 
         if (empty($this->poll)) {
+            // TRANS: Client exception thrown trying to view a non-existing poll.
             throw new ClientException(_m('No such poll.'), 404);
         }
 
@@ -71,18 +72,21 @@ class ShowPollAction extends ShownoticeAction
 
         if (empty($this->notice)) {
             // Did we used to have it, and it got deleted?
+            // TRANS: Client exception thrown trying to view a non-existing poll notice.
             throw new ClientException(_m('No such poll notice.'), 404);
         }
 
         $this->user = User::staticGet('id', $this->poll->profile_id);
 
         if (empty($this->user)) {
+            // TRANS: Client exception thrown trying to view a poll of a non-existing user.
             throw new ClientException(_m('No such user.'), 404);
         }
 
         $this->profile = $this->user->getProfile();
 
         if (empty($this->profile)) {
+            // TRANS: Server exception thrown trying to view a poll for a user for which the profile could not be loaded.
             throw new ServerException(_m('User without a profile.'));
         }
 
@@ -100,7 +104,9 @@ class ShowPollAction extends ShownoticeAction
      */
     function title()
     {
-        return sprintf(_m('%s\'s poll: %s'),
+        // TRANS: Page title for a poll.
+        // TRANS: %1$s is the nickname of the user that created the poll, %2$s is the poll question.
+        return sprintf(_m('%1$s\'s poll: %2$s'),
                        $this->user->nickname,
                        $this->poll->question);
     }

From eff26421abe2cf6ca10ba32c204f8ff838f6438e Mon Sep 17 00:00:00 2001
From: Siebrand Mazeland <s.mazeland@xs4all.nl>
Date: Fri, 11 Mar 2011 19:32:35 +0100
Subject: [PATCH 536/655] Move translator documentation one line lower.
 Otherwise it will not be added to the POT file.

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

diff --git a/lib/noticeform.php b/lib/noticeform.php
index e604ee9fc4..3909b088d0 100644
--- a/lib/noticeform.php
+++ b/lib/noticeform.php
@@ -186,8 +186,8 @@ class NoticeForm extends Form
 
             if (common_config('attachments', 'uploads')) {
                 $this->out->hidden('MAX_FILE_SIZE', common_config('attachments', 'file_quota'));
-                // TRANS: Input label in notice form for adding an attachment.
                 $this->out->elementStart('label', array('class' => 'notice_data-attach'));
+                // TRANS: Input label in notice form for adding an attachment.
                 $this->out->text(_('Attach'));
                 $this->out->element('input', array('class' => 'notice_data-attach',
                                                    'type' => 'file',

From 69e11bb45e10d1b4f6fa58bef5522ac757fc52c0 Mon Sep 17 00:00:00 2001
From: Siebrand Mazeland <s.mazeland@xs4all.nl>
Date: Fri, 11 Mar 2011 19:33:52 +0100
Subject: [PATCH 537/655] Localisation updates from http://translatewiki.net.

---
 locale/ar/LC_MESSAGES/statusnet.po            | 109 +++-
 locale/arz/LC_MESSAGES/statusnet.po           | 108 +++-
 locale/bg/LC_MESSAGES/statusnet.po            | 107 +++-
 locale/br/LC_MESSAGES/statusnet.po            | 111 ++++-
 locale/ca/LC_MESSAGES/statusnet.po            | 110 ++++-
 locale/cs/LC_MESSAGES/statusnet.po            | 111 ++++-
 locale/de/LC_MESSAGES/statusnet.po            | 264 ++++++----
 locale/en_GB/LC_MESSAGES/statusnet.po         | 108 +++-
 locale/eo/LC_MESSAGES/statusnet.po            | 265 ++++++----
 locale/es/LC_MESSAGES/statusnet.po            | 112 ++++-
 locale/fa/LC_MESSAGES/statusnet.po            | 111 ++++-
 locale/fi/LC_MESSAGES/statusnet.po            | 106 +++-
 locale/fr/LC_MESSAGES/statusnet.po            | 111 ++++-
 locale/fur/LC_MESSAGES/statusnet.po           | 112 ++++-
 locale/gl/LC_MESSAGES/statusnet.po            | 113 ++++-
 locale/hsb/LC_MESSAGES/statusnet.po           | 107 +++-
 locale/hu/LC_MESSAGES/statusnet.po            | 109 +++-
 locale/ia/LC_MESSAGES/statusnet.po            | 123 +++--
 locale/it/LC_MESSAGES/statusnet.po            | 111 ++++-
 locale/ja/LC_MESSAGES/statusnet.po            | 111 ++++-
 locale/ka/LC_MESSAGES/statusnet.po            | 113 ++++-
 locale/ko/LC_MESSAGES/statusnet.po            | 108 +++-
 locale/mk/LC_MESSAGES/statusnet.po            | 123 +++--
 locale/ml/LC_MESSAGES/statusnet.po            | 114 ++++-
 locale/nb/LC_MESSAGES/statusnet.po            | 112 ++++-
 locale/nl/LC_MESSAGES/statusnet.po            | 123 +++--
 locale/pl/LC_MESSAGES/statusnet.po            | 112 ++++-
 locale/pt/LC_MESSAGES/statusnet.po            | 111 ++++-
 locale/pt_BR/LC_MESSAGES/statusnet.po         | 112 ++++-
 locale/ru/LC_MESSAGES/statusnet.po            | 112 ++++-
 locale/statusnet.pot                          | 464 ++++++++++--------
 locale/sv/LC_MESSAGES/statusnet.po            | 157 ++++--
 locale/te/LC_MESSAGES/statusnet.po            | 275 ++++++-----
 locale/tr/LC_MESSAGES/statusnet.po            | 106 +++-
 locale/uk/LC_MESSAGES/statusnet.po            | 123 +++--
 locale/zh_CN/LC_MESSAGES/statusnet.po         | 112 ++++-
 .../locale/de/LC_MESSAGES/AccountManager.po   |  27 +
 plugins/Aim/locale/sv/LC_MESSAGES/Aim.po      |  34 ++
 plugins/Autocomplete/locale/Autocomplete.pot  |   4 +-
 plugins/Bookmark/locale/Bookmark.pot          |   4 +-
 .../locale/ia/LC_MESSAGES/Bookmark.po         |  10 +-
 .../locale/mk/LC_MESSAGES/Bookmark.po         |  10 +-
 .../locale/nl/LC_MESSAGES/Bookmark.po         |  10 +-
 .../locale/uk/LC_MESSAGES/Bookmark.po         |  10 +-
 plugins/Directory/locale/Directory.pot        |  58 +++
 plugins/Event/locale/Event.pot                |  50 ++
 .../locale/sv/LC_MESSAGES/ExtendedProfile.po  |  97 ++++
 .../locale/te/LC_MESSAGES/ExtendedProfile.po  |  97 ++++
 plugins/Irc/locale/sv/LC_MESSAGES/Irc.po      |  39 ++
 .../locale/te/LC_MESSAGES/MobileProfile.po    |  12 +-
 plugins/Msn/locale/sv/LC_MESSAGES/Msn.po      |  31 ++
 plugins/OpenX/locale/de/LC_MESSAGES/OpenX.po  |  11 +-
 plugins/Poll/locale/Poll.pot                  | 175 +++++++
 .../locale/te/LC_MESSAGES/ShareNotice.po      |  19 +-
 plugins/SphinxSearch/locale/SphinxSearch.pot  |   4 +-
 plugins/UserFlag/locale/UserFlag.pot          |   4 +-
 .../locale/de/LC_MESSAGES/UserFlag.po         |  95 ++++
 plugins/Xmpp/locale/sv/LC_MESSAGES/Xmpp.po    |  35 ++
 58 files changed, 4411 insertions(+), 1321 deletions(-)
 create mode 100644 plugins/AccountManager/locale/de/LC_MESSAGES/AccountManager.po
 create mode 100644 plugins/Aim/locale/sv/LC_MESSAGES/Aim.po
 create mode 100644 plugins/Directory/locale/Directory.pot
 create mode 100644 plugins/Event/locale/Event.pot
 create mode 100644 plugins/ExtendedProfile/locale/sv/LC_MESSAGES/ExtendedProfile.po
 create mode 100644 plugins/ExtendedProfile/locale/te/LC_MESSAGES/ExtendedProfile.po
 create mode 100644 plugins/Irc/locale/sv/LC_MESSAGES/Irc.po
 create mode 100644 plugins/Msn/locale/sv/LC_MESSAGES/Msn.po
 create mode 100644 plugins/Poll/locale/Poll.pot
 create mode 100644 plugins/UserFlag/locale/de/LC_MESSAGES/UserFlag.po
 create mode 100644 plugins/Xmpp/locale/sv/LC_MESSAGES/Xmpp.po

diff --git a/locale/ar/LC_MESSAGES/statusnet.po b/locale/ar/LC_MESSAGES/statusnet.po
index 655d9cc767..17a4cb5b14 100644
--- a/locale/ar/LC_MESSAGES/statusnet.po
+++ b/locale/ar/LC_MESSAGES/statusnet.po
@@ -12,19 +12,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-08 01:03+0000\n"
-"PO-Revision-Date: 2011-03-08 01:04:58+0000\n"
+"POT-Creation-Date: 2011-03-11 18:15+0000\n"
+"PO-Revision-Date: 2011-03-11 18:16:53+0000\n"
 "Language-Team: Arabic <http://translatewiki.net/wiki/Portal:ar>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
+"X-Generator: MediaWiki 1.18alpha (r83703); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ar\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=6; plural=(n == 0) ? 0 : ( (n == 1) ? 1 : ( (n == "
 "2) ? 2 : ( (n%100 >= 3 && n%100 <= 10) ? 3 : ( (n%100 >= 11 && n%100 <= "
 "99) ? 4 : 5 ) ) ) );\n"
-"X-POT-Import-Date: 2011-03-06 02:16:47+0000\n"
+"X-POT-Import-Date: 2011-03-08 01:25:01+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -1056,7 +1056,7 @@ msgstr "ابحث عن محتويات في الإشعارات"
 
 #. TRANS: Client exception thrown when trying favorite a notice without content.
 #, fuzzy
-msgid "Unknown note."
+msgid "Unknown notice."
 msgstr "غير معروفة"
 
 #. TRANS: Client exception thrown when trying favorite an already favorited notice.
@@ -1635,6 +1635,7 @@ msgstr "احذف هذا المستخدم"
 #. TRANS: Client error displayed trying to create a new direct message while not logged in.
 #. TRANS: Client error displayed trying to send a notice while not logged in.
 #. TRANS: Client error displayed trying to nudge a user without being logged in.
+#. TRANS: Client error displayed when trying to enable or disable a plugin while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
@@ -3091,6 +3092,10 @@ msgstr "مسار المصدر ليس صحيحا."
 msgid "Could not create application."
 msgstr "لم يمكن إنشاء التطبيق."
 
+#, fuzzy
+msgid "Invalid image."
+msgstr "حجم غير صالح."
+
 #. TRANS: Title for form to create a group.
 msgid "New group"
 msgstr "مجموعة جديدة"
@@ -3366,52 +3371,77 @@ msgstr "صندوق %s الصادر"
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr "هذا صندوق بريدك الصادر، والذي يسرد الرسائل الخاصة التي أرسلتها."
 
+#. TRANS: Title for page where to change password.
+#, fuzzy
+msgctxt "TITLE"
 msgid "Change password"
 msgstr "تغيير كلمة السر"
 
+#. TRANS: Instructions for page where to change password.
 msgid "Change your password."
 msgstr "غيّر كلمة سرك."
 
+#. TRANS: Fieldset legend on page where to change password.
 #. TRANS: Fieldset legend for password reset form.
 msgid "Password change"
 msgstr "تغيير كلمة السر"
 
+#. TRANS: Field label on page where to change password.
 msgid "Old password"
 msgstr "كلمة السر القديمة"
 
+#. TRANS: Field label on page where to change password.
 #. TRANS: Field label for password reset form.
 msgid "New password"
 msgstr "كلمة السر الجديدة"
 
+#. TRANS: Field title on page where to change password.
 #, fuzzy
 msgid "6 or more characters."
 msgstr "6 أحرف أو أكثر"
 
+#. TRANS: Field label on page where to change password. In this field the new password should be typed a second time.
+#, fuzzy
+msgctxt "LABEL"
+msgid "Confirm"
+msgstr "أكّد"
+
+#. TRANS: Field title on page where to change password.
 #. TRANS: Ttile for field label for password reset form where the password has to be typed again.
 #, fuzzy
 msgid "Same as password above."
 msgstr "نفس كلمة السر أعلاه"
 
+#. TRANS: Button text on page where to change password.
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Change"
 msgstr "غيّر"
 
+#. TRANS: Form validation error on page where to change password.
 msgid "Password must be 6 or more characters."
 msgstr "يجب أن تكون كلمة السر 6 حروف أو أكثر."
 
 msgid "Passwords don't match."
 msgstr "كلمتا السر غير متطابقتين."
 
-msgid "Incorrect old password"
+#. TRANS: Form validation error on page where to change password.
+#, fuzzy
+msgid "Incorrect old password."
 msgstr "كلمة السر القديمة غير صحيحة"
 
+#. TRANS: Form validation error on page where to change password.
 msgid "Error saving user; invalid."
 msgstr "خطأ أثناء حفظ المستخدم؛ غير صالح."
 
+#. TRANS: Server error displayed on page where to change password when password change
+#. TRANS: could not be made because of a server error.
 #. TRANS: Reset password form validation error message.
 #, fuzzy
 msgid "Cannot save new password."
 msgstr "تعذّر حفظ كلمة السر الجديدة."
 
+#. TRANS: Form validation notice on page where to change password.
 msgid "Password saved."
 msgstr "حُفظت كلمة السر."
 
@@ -3462,6 +3492,7 @@ msgstr "الموقع"
 msgid "Server"
 msgstr "خادوم"
 
+#. TRANS: Field title in Paths admin panel.
 msgid "Site's server hostname."
 msgstr "اسم مضيف خادوم الموقع."
 
@@ -3469,6 +3500,7 @@ msgstr "اسم مضيف خادوم الموقع."
 msgid "Path"
 msgstr "المسار"
 
+#. TRANS: Field title in Paths admin panel.
 #, fuzzy
 msgid "Site path."
 msgstr "مسار الموقع"
@@ -3478,6 +3510,7 @@ msgstr "مسار الموقع"
 msgid "Locale directory"
 msgstr "دليل السمات"
 
+#. TRANS: Field title in Paths admin panel.
 #, fuzzy
 msgid "Directory path to locales."
 msgstr "مسار دليل المحليات"
@@ -3486,9 +3519,14 @@ msgstr "مسار دليل المحليات"
 msgid "Fancy URLs"
 msgstr "مسارات فاخرة"
 
-msgid "Use fancy (more readable and memorable) URLs?"
+#. TRANS: Field title in Paths admin panel.
+#, fuzzy
+msgid "Use fancy URLs (more readable and memorable)?"
 msgstr "أأستخدم مسارات فاخرة (يمكن قراءتها وتذكرها بسهولة أكبر)؟"
 
+#. TRANS: Fieldset legend in Paths admin panel.
+#, fuzzy
+msgctxt "LEGEND"
 msgid "Theme"
 msgstr "السمة"
 
@@ -3614,6 +3652,8 @@ msgid "Directory where attachments are located."
 msgstr "مسار دليل المحليات"
 
 #. TRANS: Fieldset legend in Paths admin panel.
+#, fuzzy
+msgctxt "LEGEND"
 msgid "SSL"
 msgstr "SSL"
 
@@ -3658,10 +3698,14 @@ msgstr ""
 msgid "People search"
 msgstr "بحث في الأشخاص"
 
+#. TRANS: Client error displayed when trying to tag a profile with an invalid tag.
+#. TRANS: %s is the invalid tag.
 #, php-format
 msgid "Not a valid people tag: %s."
 msgstr "ليس وسم أشخاص صالح: %s."
 
+#. TRANS: Page title for users with a certain self-tag.
+#. TRANS: %1$s is the tag, %2$s is the page number.
 #, php-format
 msgid "Users self-tagged with %1$s - page %2$d"
 msgstr "المستخدمون الذين وسموا أنفسهم ب%1$s - الصفحة %2$d"
@@ -3671,15 +3715,19 @@ msgctxt "plugin"
 msgid "Disabled"
 msgstr ""
 
+#. TRANS: Client error displayed when trying to use another method than POST.
+#. TRANS: Do not translate POST.
 #. TRANS: Client error displayed trying to perform any request method other than POST.
 #. TRANS: Do not translate POST.
 msgid "This action only accepts POST requests."
 msgstr "هذا الإجراء يقبل طلبات POST فقط."
 
+#. TRANS: Client error displayed when trying to enable or disable a plugin without access rights.
 #, fuzzy
 msgid "You cannot administer plugins."
 msgstr "لا يمكنك حذف المستخدمين."
 
+#. TRANS: Client error displayed when trying to enable or disable a non-existing plugin.
 #, fuzzy
 msgid "No such plugin."
 msgstr "لا صفحة كهذه."
@@ -3690,7 +3738,8 @@ msgid "Enabled"
 msgstr ""
 
 #. TRANS: Tab and title for plugins admin panel.
-#. TRANS: Menu item for site administration
+#, fuzzy
+msgctxt "TITLE"
 msgid "Plugins"
 msgstr "الملحقات"
 
@@ -3706,15 +3755,19 @@ msgstr ""
 msgid "Default plugins"
 msgstr "اللغة المبدئية"
 
+#. TRANS: Text displayed on plugin admin page when no plugin are enabled.
 msgid ""
 "All default plugins have been disabled from the site's configuration file."
 msgstr ""
 
+#. TRANS: Client error displayed if the notice posted has too many characters.
 msgid "Invalid notice content."
 msgstr "محتوى إشعار غير صالح."
 
+#. TRANS: Exception thrown if a notice's license is not compatible with the StatusNet site license.
+#. TRANS: %1$s is the notice license, %2$s is the StatusNet site's license.
 #, php-format
-msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’."
+msgid "Notice license \"%1$s\" is not compatible with site license \"%2$s\"."
 msgstr ""
 
 #. TRANS: Page title for profile settings.
@@ -3872,44 +3925,58 @@ msgstr "حُفظت الإعدادات."
 msgid "Restore account"
 msgstr "أنشئ حسابًا"
 
+#. TRANS: Client error displayed when requesting a public timeline page beyond the page limit.
+#. TRANS: %s is the page limit.
 #, php-format
 msgid "Beyond the page limit (%s)."
 msgstr "بعد حد الصفحة (%s)."
 
+#. TRANS: Server error displayed when a public timeline cannot be retrieved.
 #, fuzzy
 msgid "Could not retrieve public stream."
 msgstr "تعذّر إنشاء الكنى."
 
+#. TRANS: Title for all public timeline pages but the first.
+#. TRANS: %d is the page number.
 #, php-format
 msgid "Public timeline, page %d"
 msgstr "المسار الزمني العام، صفحة %d"
 
+#. TRANS: Title for the first public timeline page.
 msgid "Public timeline"
 msgstr "المسار الزمني العام"
 
+#. TRANS: Link description for public timeline feed.
 msgid "Public Stream Feed (RSS 1.0)"
 msgstr ""
 
+#. TRANS: Link description for public timeline feed.
 msgid "Public Stream Feed (RSS 2.0)"
 msgstr ""
 
+#. TRANS: Link description for public timeline feed.
 msgid "Public Stream Feed (Atom)"
 msgstr ""
 
+#. TRANS: Text displayed for public feed when there are no public notices.
 #, php-format
 msgid ""
 "This is the public timeline for %%site.name%% but no one has posted anything "
 "yet."
 msgstr ""
 
+#. TRANS: Additional text displayed for public feed when there are no public notices for a logged in user.
 msgid "Be the first to post!"
 msgstr "كن أول من يُرسل!"
 
+#. TRANS: Additional text displayed for public feed when there are no public notices for a not logged in user.
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post!"
 msgstr ""
 
+#. TRANS: Message for not logged in users at an invite-only site trying to view the public feed of notices.
+#. TRANS: This message contains Markdown links. Please mind the formatting.
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -3922,6 +3989,8 @@ msgstr ""
 "الآن](%%action.register%%) لتشارك اشعاراتك مع أصدقائك وعائلتك وزملائك! "
 "([اقرأ المزيد](%%doc.help%%))"
 
+#. TRANS: Message for not logged in users at a closed site trying to view the public feed of notices.
+#. TRANS: This message contains Markdown links. Please mind the formatting.
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -5571,6 +5640,10 @@ msgid ""
 "along with this program.  If not, see %s."
 msgstr ""
 
+#. TRANS: Menu item for site administration
+msgid "Plugins"
+msgstr "الملحقات"
+
 #. TRANS: Form input field label for application name.
 msgid "Name"
 msgstr "الاسم"
@@ -6080,6 +6153,9 @@ msgstr "الأمر لم يُجهزّ بعد."
 msgid "Unable to delete design setting."
 msgstr "تعذّر حذف إعدادات التصميم."
 
+msgid "Home"
+msgstr "الرئيسية"
+
 #. TRANS: Menu item title/tooltip
 msgid "Basic site configuration"
 msgstr "ضبط الموقع الأساسي"
@@ -6737,9 +6813,6 @@ msgstr "اذهب إلى المُثبّت."
 msgid "Database error"
 msgstr "خطأ قاعدة بيانات"
 
-msgid "Home"
-msgstr "الرئيسية"
-
 msgid "Public"
 msgstr "عام"
 
@@ -7487,7 +7560,6 @@ msgstr "أرسل إشعارًا"
 msgid "What's up, %s?"
 msgstr "ما الأخبار يا %s؟"
 
-#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr "أرفق"
 
@@ -7554,6 +7626,9 @@ msgstr "احذف هذا الإشعار"
 msgid "Notice repeated"
 msgstr "الإشعار مكرر"
 
+msgid "Update your status..."
+msgstr ""
+
 msgid "Nudge this user"
 msgstr "نبّه هذا المستخدم"
 
@@ -8086,11 +8161,3 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
-
-#, fuzzy
-#~ msgid "Friends timeline"
-#~ msgstr "مسار %s الزمني"
-
-#, fuzzy
-#~ msgid "Everyone on this site"
-#~ msgstr "ابحث عن أشخاص على هذا الموقع"
diff --git a/locale/arz/LC_MESSAGES/statusnet.po b/locale/arz/LC_MESSAGES/statusnet.po
index f0c94461f9..96a8a02c59 100644
--- a/locale/arz/LC_MESSAGES/statusnet.po
+++ b/locale/arz/LC_MESSAGES/statusnet.po
@@ -11,19 +11,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-08 01:03+0000\n"
-"PO-Revision-Date: 2011-03-08 01:04:59+0000\n"
+"POT-Creation-Date: 2011-03-11 18:15+0000\n"
+"PO-Revision-Date: 2011-03-11 18:16:54+0000\n"
 "Language-Team: Egyptian Spoken Arabic <http://translatewiki.net/wiki/Portal:"
 "arz>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
+"X-Generator: MediaWiki 1.18alpha (r83703); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: arz\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=6; plural= n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
 "&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
-"X-POT-Import-Date: 2011-03-06 02:16:47+0000\n"
+"X-POT-Import-Date: 2011-03-08 01:25:01+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -1076,7 +1076,7 @@ msgstr "ابحث عن محتويات فى الإشعارات"
 
 #. TRANS: Client exception thrown when trying favorite a notice without content.
 #, fuzzy
-msgid "Unknown note."
+msgid "Unknown notice."
 msgstr "مش معروف"
 
 #. TRANS: Client exception thrown when trying favorite an already favorited notice.
@@ -1664,6 +1664,7 @@ msgstr "احذف هذا المستخدم"
 #. TRANS: Client error displayed trying to create a new direct message while not logged in.
 #. TRANS: Client error displayed trying to send a notice while not logged in.
 #. TRANS: Client error displayed trying to nudge a user without being logged in.
+#. TRANS: Client error displayed when trying to enable or disable a plugin while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
@@ -3139,6 +3140,10 @@ msgstr "الSource URL مش مظبوط."
 msgid "Could not create application."
 msgstr "مش ممكن إنشاء الapplication."
 
+#, fuzzy
+msgid "Invalid image."
+msgstr "حجم غير صالح."
+
 #. TRANS: Title for form to create a group.
 msgid "New group"
 msgstr "مجموعه جديدة"
@@ -3413,52 +3418,77 @@ msgstr "صندوق الصادر"
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr ""
 
+#. TRANS: Title for page where to change password.
+#, fuzzy
+msgctxt "TITLE"
 msgid "Change password"
 msgstr "غيّر كلمه السر"
 
+#. TRANS: Instructions for page where to change password.
 msgid "Change your password."
 msgstr "غيّر كلمه سرك."
 
+#. TRANS: Fieldset legend on page where to change password.
 #. TRANS: Fieldset legend for password reset form.
 msgid "Password change"
 msgstr "تغيير كلمه السر"
 
+#. TRANS: Field label on page where to change password.
 msgid "Old password"
 msgstr "كلمه السر القديمة"
 
+#. TRANS: Field label on page where to change password.
 #. TRANS: Field label for password reset form.
 msgid "New password"
 msgstr "كلمه سر جديدة"
 
+#. TRANS: Field title on page where to change password.
 #, fuzzy
 msgid "6 or more characters."
 msgstr "6 حروف أو أكثر. مطلوب."
 
+#. TRANS: Field label on page where to change password. In this field the new password should be typed a second time.
+#, fuzzy
+msgctxt "LABEL"
+msgid "Confirm"
+msgstr "أكّد"
+
+#. TRANS: Field title on page where to change password.
 #. TRANS: Ttile for field label for password reset form where the password has to be typed again.
 #, fuzzy
 msgid "Same as password above."
 msgstr "نفس كلمه السر أعلاه"
 
+#. TRANS: Button text on page where to change password.
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Change"
 msgstr "غيّر"
 
+#. TRANS: Form validation error on page where to change password.
 msgid "Password must be 6 or more characters."
 msgstr "يجب أن تكون كلمه السر 6 حروف أو أكثر."
 
 msgid "Passwords don't match."
 msgstr "كلمتا السر غير متطابقتين."
 
-msgid "Incorrect old password"
+#. TRANS: Form validation error on page where to change password.
+#, fuzzy
+msgid "Incorrect old password."
 msgstr "كلمه السر القديمه غير صحيحة"
 
+#. TRANS: Form validation error on page where to change password.
 msgid "Error saving user; invalid."
 msgstr "خطأ أثناء حفظ المستخدم؛ غير صالح."
 
+#. TRANS: Server error displayed on page where to change password when password change
+#. TRANS: could not be made because of a server error.
 #. TRANS: Reset password form validation error message.
 #, fuzzy
 msgid "Cannot save new password."
 msgstr "تعذّر حفظ كلمه السر الجديده."
 
+#. TRANS: Form validation notice on page where to change password.
 msgid "Password saved."
 msgstr "حُفظت كلمه السر."
 
@@ -3509,6 +3539,7 @@ msgstr "الموقع"
 msgid "Server"
 msgstr "خادوم"
 
+#. TRANS: Field title in Paths admin panel.
 msgid "Site's server hostname."
 msgstr "اسم مضيف خادوم الموقع."
 
@@ -3516,6 +3547,7 @@ msgstr "اسم مضيف خادوم الموقع."
 msgid "Path"
 msgstr "المسار"
 
+#. TRANS: Field title in Paths admin panel.
 #, fuzzy
 msgid "Site path."
 msgstr "مسار الموقع"
@@ -3525,6 +3557,7 @@ msgstr "مسار الموقع"
 msgid "Locale directory"
 msgstr "دليل السمات"
 
+#. TRANS: Field title in Paths admin panel.
 #, fuzzy
 msgid "Directory path to locales."
 msgstr "مسار دليل المحليات"
@@ -3533,9 +3566,14 @@ msgstr "مسار دليل المحليات"
 msgid "Fancy URLs"
 msgstr "مسارات فاخرة"
 
-msgid "Use fancy (more readable and memorable) URLs?"
+#. TRANS: Field title in Paths admin panel.
+#, fuzzy
+msgid "Use fancy URLs (more readable and memorable)?"
 msgstr "أأستخدم مسارات فاخره (يمكن قراءتها وتذكرها بسهوله أكبر)؟"
 
+#. TRANS: Fieldset legend in Paths admin panel.
+#, fuzzy
+msgctxt "LEGEND"
 msgid "Theme"
 msgstr "السمة"
 
@@ -3661,6 +3699,8 @@ msgid "Directory where attachments are located."
 msgstr "مسار دليل المحليات"
 
 #. TRANS: Fieldset legend in Paths admin panel.
+#, fuzzy
+msgctxt "LEGEND"
 msgid "SSL"
 msgstr "SSL"
 
@@ -3703,10 +3743,14 @@ msgstr ""
 msgid "People search"
 msgstr "بحث فى الأشخاص"
 
+#. TRANS: Client error displayed when trying to tag a profile with an invalid tag.
+#. TRANS: %s is the invalid tag.
 #, php-format
 msgid "Not a valid people tag: %s."
 msgstr "ليس عنوان بريد صالح."
 
+#. TRANS: Page title for users with a certain self-tag.
+#. TRANS: %1$s is the tag, %2$s is the page number.
 #, php-format
 msgid "Users self-tagged with %1$s - page %2$d"
 msgstr ""
@@ -3716,15 +3760,19 @@ msgctxt "plugin"
 msgid "Disabled"
 msgstr ""
 
+#. TRANS: Client error displayed when trying to use another method than POST.
+#. TRANS: Do not translate POST.
 #. TRANS: Client error displayed trying to perform any request method other than POST.
 #. TRANS: Do not translate POST.
 msgid "This action only accepts POST requests."
 msgstr ""
 
+#. TRANS: Client error displayed when trying to enable or disable a plugin without access rights.
 #, fuzzy
 msgid "You cannot administer plugins."
 msgstr "لا يمكنك حذف المستخدمين."
 
+#. TRANS: Client error displayed when trying to enable or disable a non-existing plugin.
 #, fuzzy
 msgid "No such plugin."
 msgstr "لا وسم كهذا."
@@ -3735,7 +3783,7 @@ msgid "Enabled"
 msgstr ""
 
 #. TRANS: Tab and title for plugins admin panel.
-#. TRANS: Menu item for site administration
+msgctxt "TITLE"
 msgid "Plugins"
 msgstr ""
 
@@ -3751,15 +3799,19 @@ msgstr ""
 msgid "Default plugins"
 msgstr "اللغه المفضلة"
 
+#. TRANS: Text displayed on plugin admin page when no plugin are enabled.
 msgid ""
 "All default plugins have been disabled from the site's configuration file."
 msgstr ""
 
+#. TRANS: Client error displayed if the notice posted has too many characters.
 msgid "Invalid notice content."
 msgstr "حجم غير صالح."
 
+#. TRANS: Exception thrown if a notice's license is not compatible with the StatusNet site license.
+#. TRANS: %1$s is the notice license, %2$s is the StatusNet site's license.
 #, php-format
-msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’."
+msgid "Notice license \"%1$s\" is not compatible with site license \"%2$s\"."
 msgstr ""
 
 #. TRANS: Page title for profile settings.
@@ -3913,44 +3965,58 @@ msgstr "حُفظت الإعدادات."
 msgid "Restore account"
 msgstr "أنشئ مجموعه جديدة"
 
+#. TRANS: Client error displayed when requesting a public timeline page beyond the page limit.
+#. TRANS: %s is the page limit.
 #, fuzzy, php-format
 msgid "Beyond the page limit (%s)."
 msgstr "وراء حد الصفحه (%s)"
 
+#. TRANS: Server error displayed when a public timeline cannot be retrieved.
 #, fuzzy
 msgid "Could not retrieve public stream."
 msgstr "تعذّر إنشاء الكنى."
 
+#. TRANS: Title for all public timeline pages but the first.
+#. TRANS: %d is the page number.
 #, php-format
 msgid "Public timeline, page %d"
 msgstr "المسار الزمنى العام، صفحه %d"
 
+#. TRANS: Title for the first public timeline page.
 msgid "Public timeline"
 msgstr "المسار الزمنى العام"
 
+#. TRANS: Link description for public timeline feed.
 msgid "Public Stream Feed (RSS 1.0)"
 msgstr ""
 
+#. TRANS: Link description for public timeline feed.
 msgid "Public Stream Feed (RSS 2.0)"
 msgstr ""
 
+#. TRANS: Link description for public timeline feed.
 msgid "Public Stream Feed (Atom)"
 msgstr ""
 
+#. TRANS: Text displayed for public feed when there are no public notices.
 #, php-format
 msgid ""
 "This is the public timeline for %%site.name%% but no one has posted anything "
 "yet."
 msgstr ""
 
+#. TRANS: Additional text displayed for public feed when there are no public notices for a logged in user.
 msgid "Be the first to post!"
 msgstr "كن أول من يُرسل!"
 
+#. TRANS: Additional text displayed for public feed when there are no public notices for a not logged in user.
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post!"
 msgstr ""
 
+#. TRANS: Message for not logged in users at an invite-only site trying to view the public feed of notices.
+#. TRANS: This message contains Markdown links. Please mind the formatting.
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -3963,6 +4029,8 @@ msgstr ""
 "الآن](%%action.register%%) لتشارك اشعاراتك مع أصدقائك وعائلتك وزملائك! "
 "([اقرأ المزيد](%%doc.help%%))"
 
+#. TRANS: Message for not logged in users at a closed site trying to view the public feed of notices.
+#. TRANS: This message contains Markdown links. Please mind the formatting.
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -5606,6 +5674,10 @@ msgid ""
 "along with this program.  If not, see %s."
 msgstr ""
 
+#. TRANS: Menu item for site administration
+msgid "Plugins"
+msgstr ""
+
 #. TRANS: Form input field label for application name.
 msgid "Name"
 msgstr "الاسم"
@@ -6116,6 +6188,9 @@ msgstr "المستخدم ليس مُسكتًا."
 msgid "Unable to delete design setting."
 msgstr "تعذّر حذف إعدادات التصميم."
 
+msgid "Home"
+msgstr "الرئيسية"
+
 #. TRANS: Menu item title/tooltip
 msgid "Basic site configuration"
 msgstr "ضبط الموقع الأساسي"
@@ -6747,9 +6822,6 @@ msgstr "اذهب إلى المُثبّت."
 msgid "Database error"
 msgstr "خطأ قاعده بيانات"
 
-msgid "Home"
-msgstr "الرئيسية"
-
 msgid "Public"
 msgstr "عام"
 
@@ -7480,7 +7552,6 @@ msgstr "أرسل إشعارًا"
 msgid "What's up, %s?"
 msgstr "ما الأخبار يا %s؟"
 
-#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr "أرفق"
 
@@ -7547,6 +7618,9 @@ msgstr "احذف هذا الإشعار"
 msgid "Notice repeated"
 msgstr "الإشعار مكرر"
 
+msgid "Update your status..."
+msgstr ""
+
 msgid "Nudge this user"
 msgstr "نبّه هذا المستخدم"
 
@@ -8085,11 +8159,3 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
-
-#, fuzzy
-#~ msgid "Friends timeline"
-#~ msgstr "مسار %s الزمني"
-
-#, fuzzy
-#~ msgid "Everyone on this site"
-#~ msgstr "ابحث عن أشخاص على هذا الموقع"
diff --git a/locale/bg/LC_MESSAGES/statusnet.po b/locale/bg/LC_MESSAGES/statusnet.po
index e9a3b189d3..eaabeec93f 100644
--- a/locale/bg/LC_MESSAGES/statusnet.po
+++ b/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-03-08 01:03+0000\n"
-"PO-Revision-Date: 2011-03-08 01:05:00+0000\n"
+"POT-Creation-Date: 2011-03-11 18:15+0000\n"
+"PO-Revision-Date: 2011-03-11 18:16:55+0000\n"
 "Language-Team: Bulgarian <http://translatewiki.net/wiki/Portal:bg>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
+"X-Generator: MediaWiki 1.18alpha (r83703); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: bg\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-03-06 02:16:47+0000\n"
+"X-POT-Import-Date: 2011-03-08 01:25:01+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -1041,7 +1041,7 @@ msgstr "Търсене в съдържанието на бележките"
 
 #. TRANS: Client exception thrown when trying favorite a notice without content.
 #, fuzzy
-msgid "Unknown note."
+msgid "Unknown notice."
 msgstr "Непознато"
 
 #. TRANS: Client exception thrown when trying favorite an already favorited notice.
@@ -1621,6 +1621,7 @@ msgstr "Изтриване на този потребител"
 #. TRANS: Client error displayed trying to create a new direct message while not logged in.
 #. TRANS: Client error displayed trying to send a notice while not logged in.
 #. TRANS: Client error displayed trying to nudge a user without being logged in.
+#. TRANS: Client error displayed when trying to enable or disable a plugin while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
@@ -3140,6 +3141,10 @@ msgstr "Името е задължително."
 msgid "Could not create application."
 msgstr "Грешка при отбелязване като любима."
 
+#, fuzzy
+msgid "Invalid image."
+msgstr "Неправилен размер."
+
 #. TRANS: Title for form to create a group.
 msgid "New group"
 msgstr "Нова група"
@@ -3419,53 +3424,78 @@ msgstr "Изходяща кутия за %s"
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr "Това е изходящата ви кутия с лични съобщения до други потребители."
 
+#. TRANS: Title for page where to change password.
+#, fuzzy
+msgctxt "TITLE"
 msgid "Change password"
 msgstr "Смяна на паролата"
 
+#. TRANS: Instructions for page where to change password.
 msgid "Change your password."
 msgstr "Смяна на паролата."
 
+#. TRANS: Fieldset legend on page where to change password.
 #. TRANS: Fieldset legend for password reset form.
 #, fuzzy
 msgid "Password change"
 msgstr "Паролата е записана."
 
+#. TRANS: Field label on page where to change password.
 msgid "Old password"
 msgstr "Стара парола"
 
+#. TRANS: Field label on page where to change password.
 #. TRANS: Field label for password reset form.
 msgid "New password"
 msgstr "Нова парола"
 
+#. TRANS: Field title on page where to change password.
 #, fuzzy
 msgid "6 or more characters."
 msgstr "6 или повече знака"
 
+#. TRANS: Field label on page where to change password. In this field the new password should be typed a second time.
+#, fuzzy
+msgctxt "LABEL"
+msgid "Confirm"
+msgstr "Потвърждаване"
+
+#. TRANS: Field title on page where to change password.
 #. TRANS: Ttile for field label for password reset form where the password has to be typed again.
 #, fuzzy
 msgid "Same as password above."
 msgstr "Също като паролата по-горе"
 
+#. TRANS: Button text on page where to change password.
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Change"
 msgstr "Промяна"
 
+#. TRANS: Form validation error on page where to change password.
 msgid "Password must be 6 or more characters."
 msgstr "Паролата трябва да е 6 или повече знака."
 
 msgid "Passwords don't match."
 msgstr "Паролите не съвпадат."
 
-msgid "Incorrect old password"
+#. TRANS: Form validation error on page where to change password.
+#, fuzzy
+msgid "Incorrect old password."
 msgstr "Грешна стара парола"
 
+#. TRANS: Form validation error on page where to change password.
 msgid "Error saving user; invalid."
 msgstr "Грешка при запазване на потребител — невалидност."
 
+#. TRANS: Server error displayed on page where to change password when password change
+#. TRANS: could not be made because of a server error.
 #. TRANS: Reset password form validation error message.
 #, fuzzy
 msgid "Cannot save new password."
 msgstr "Грешка при запазване на новата парола."
 
+#. TRANS: Form validation notice on page where to change password.
 msgid "Password saved."
 msgstr "Паролата е записана."
 
@@ -3515,6 +3545,7 @@ msgstr "Сайт"
 msgid "Server"
 msgstr "Сървър"
 
+#. TRANS: Field title in Paths admin panel.
 msgid "Site's server hostname."
 msgstr ""
 
@@ -3522,6 +3553,7 @@ msgstr ""
 msgid "Path"
 msgstr "Път"
 
+#. TRANS: Field title in Paths admin panel.
 #, fuzzy
 msgid "Site path."
 msgstr "Път до сайта"
@@ -3531,6 +3563,7 @@ msgstr "Път до сайта"
 msgid "Locale directory"
 msgstr "Директория на аватара"
 
+#. TRANS: Field title in Paths admin panel.
 msgid "Directory path to locales."
 msgstr ""
 
@@ -3538,9 +3571,12 @@ msgstr ""
 msgid "Fancy URLs"
 msgstr "Кратки URL-адреси"
 
-msgid "Use fancy (more readable and memorable) URLs?"
+#. TRANS: Field title in Paths admin panel.
+msgid "Use fancy URLs (more readable and memorable)?"
 msgstr ""
 
+#. TRANS: Fieldset legend in Paths admin panel.
+msgctxt "LEGEND"
 msgid "Theme"
 msgstr ""
 
@@ -3663,6 +3699,8 @@ msgid "Directory where attachments are located."
 msgstr ""
 
 #. TRANS: Fieldset legend in Paths admin panel.
+#, fuzzy
+msgctxt "LEGEND"
 msgid "SSL"
 msgstr "SSL"
 
@@ -3708,10 +3746,14 @@ msgstr ""
 msgid "People search"
 msgstr "Търсене на хора"
 
+#. TRANS: Client error displayed when trying to tag a profile with an invalid tag.
+#. TRANS: %s is the invalid tag.
 #, php-format
 msgid "Not a valid people tag: %s."
 msgstr "Неправилен адрес на е-поща."
 
+#. TRANS: Page title for users with a certain self-tag.
+#. TRANS: %1$s is the tag, %2$s is the page number.
 #, fuzzy, php-format
 msgid "Users self-tagged with %1$s - page %2$d"
 msgstr "Бележки с етикет %s, страница %d"
@@ -3721,15 +3763,19 @@ msgctxt "plugin"
 msgid "Disabled"
 msgstr ""
 
+#. TRANS: Client error displayed when trying to use another method than POST.
+#. TRANS: Do not translate POST.
 #. TRANS: Client error displayed trying to perform any request method other than POST.
 #. TRANS: Do not translate POST.
 msgid "This action only accepts POST requests."
 msgstr ""
 
+#. TRANS: Client error displayed when trying to enable or disable a plugin without access rights.
 #, fuzzy
 msgid "You cannot administer plugins."
 msgstr "Не можете да изтривате потребители."
 
+#. TRANS: Client error displayed when trying to enable or disable a non-existing plugin.
 #, fuzzy
 msgid "No such plugin."
 msgstr "Няма такака страница."
@@ -3740,7 +3786,8 @@ msgid "Enabled"
 msgstr ""
 
 #. TRANS: Tab and title for plugins admin panel.
-#. TRANS: Menu item for site administration
+#, fuzzy
+msgctxt "TITLE"
 msgid "Plugins"
 msgstr "Приставки"
 
@@ -3756,15 +3803,19 @@ msgstr ""
 msgid "Default plugins"
 msgstr "Език по подразбиране"
 
+#. TRANS: Text displayed on plugin admin page when no plugin are enabled.
 msgid ""
 "All default plugins have been disabled from the site's configuration file."
 msgstr ""
 
+#. TRANS: Client error displayed if the notice posted has too many characters.
 msgid "Invalid notice content."
 msgstr "Неправилен размер."
 
+#. TRANS: Exception thrown if a notice's license is not compatible with the StatusNet site license.
+#. TRANS: %1$s is the notice license, %2$s is the StatusNet site's license.
 #, php-format
-msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’."
+msgid "Notice license \"%1$s\" is not compatible with site license \"%2$s\"."
 msgstr ""
 
 #. TRANS: Page title for profile settings.
@@ -3914,43 +3965,57 @@ msgstr "Настройките са запазени."
 msgid "Restore account"
 msgstr "Създаване на нова сметка"
 
+#. TRANS: Client error displayed when requesting a public timeline page beyond the page limit.
+#. TRANS: %s is the page limit.
 #, php-format
 msgid "Beyond the page limit (%s)."
 msgstr ""
 
+#. TRANS: Server error displayed when a public timeline cannot be retrieved.
 msgid "Could not retrieve public stream."
 msgstr "Грешка при изтегляне на общия поток"
 
+#. TRANS: Title for all public timeline pages but the first.
+#. TRANS: %d is the page number.
 #, php-format
 msgid "Public timeline, page %d"
 msgstr "Общ поток, страница %d"
 
+#. TRANS: Title for the first public timeline page.
 msgid "Public timeline"
 msgstr "Общ поток"
 
+#. TRANS: Link description for public timeline feed.
 msgid "Public Stream Feed (RSS 1.0)"
 msgstr "Емисия на общия поток (RSS 1.0)"
 
+#. TRANS: Link description for public timeline feed.
 msgid "Public Stream Feed (RSS 2.0)"
 msgstr "Емисия на общия поток (RSS 2.0)"
 
+#. TRANS: Link description for public timeline feed.
 msgid "Public Stream Feed (Atom)"
 msgstr "Емисия на общия поток (Atom)"
 
+#. TRANS: Text displayed for public feed when there are no public notices.
 #, php-format
 msgid ""
 "This is the public timeline for %%site.name%% but no one has posted anything "
 "yet."
 msgstr ""
 
+#. TRANS: Additional text displayed for public feed when there are no public notices for a logged in user.
 msgid "Be the first to post!"
 msgstr ""
 
+#. TRANS: Additional text displayed for public feed when there are no public notices for a not logged in user.
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post!"
 msgstr ""
 
+#. TRANS: Message for not logged in users at an invite-only site trying to view the public feed of notices.
+#. TRANS: This message contains Markdown links. Please mind the formatting.
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -3959,6 +4024,8 @@ msgid ""
 "friends, family, and colleagues! ([Read more](%%doc.help%%))"
 msgstr ""
 
+#. TRANS: Message for not logged in users at a closed site trying to view the public feed of notices.
+#. TRANS: This message contains Markdown links. Please mind the formatting.
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -5615,6 +5682,10 @@ msgid ""
 "along with this program.  If not, see %s."
 msgstr ""
 
+#. TRANS: Menu item for site administration
+msgid "Plugins"
+msgstr "Приставки"
+
 #. TRANS: Form input field label for application name.
 msgid "Name"
 msgstr "Име"
@@ -6125,6 +6196,9 @@ msgstr "Командата все още не се поддържа."
 msgid "Unable to delete design setting."
 msgstr "Грешка при записване настройките за Twitter"
 
+msgid "Home"
+msgstr "Лична страница"
+
 #. TRANS: Menu item title/tooltip
 msgid "Basic site configuration"
 msgstr "Основна настройка на сайта"
@@ -6737,9 +6811,6 @@ msgstr "Влизане в сайта"
 msgid "Database error"
 msgstr "Грешка в базата от данни"
 
-msgid "Home"
-msgstr "Лична страница"
-
 msgid "Public"
 msgstr "Общ поток"
 
@@ -7454,7 +7525,6 @@ msgstr "Изпращане на бележка"
 msgid "What's up, %s?"
 msgstr "Какво става, %s?"
 
-#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr "Прикрепяне"
 
@@ -7522,6 +7592,9 @@ msgstr "Изтриване на бележката"
 msgid "Notice repeated"
 msgstr "Бележката е повторена."
 
+msgid "Update your status..."
+msgstr ""
+
 msgid "Nudge this user"
 msgstr "Побутване на този потребител"
 
@@ -8037,11 +8110,3 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
-
-#, fuzzy
-#~ msgid "Friends timeline"
-#~ msgstr "Поток на %s"
-
-#, fuzzy
-#~ msgid "Everyone on this site"
-#~ msgstr "Търсене на хора в сайта"
diff --git a/locale/br/LC_MESSAGES/statusnet.po b/locale/br/LC_MESSAGES/statusnet.po
index b6aefb027d..8ca30f42c1 100644
--- a/locale/br/LC_MESSAGES/statusnet.po
+++ b/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-03-08 01:03+0000\n"
-"PO-Revision-Date: 2011-03-08 01:05:02+0000\n"
+"POT-Creation-Date: 2011-03-11 18:15+0000\n"
+"PO-Revision-Date: 2011-03-11 18:16:56+0000\n"
 "Language-Team: Breton <http://translatewiki.net/wiki/Portal:br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
+"X-Generator: MediaWiki 1.18alpha (r83703); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-POT-Import-Date: 2011-03-06 02:16:47+0000\n"
+"X-POT-Import-Date: 2011-03-08 01:25:01+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -1036,7 +1036,8 @@ msgid "Can only fave notices."
 msgstr "Klask alioù en danvez"
 
 #. TRANS: Client exception thrown when trying favorite a notice without content.
-msgid "Unknown note."
+#, fuzzy
+msgid "Unknown notice."
 msgstr "Notenn dianav."
 
 #. TRANS: Client exception thrown when trying favorite an already favorited notice.
@@ -1601,6 +1602,7 @@ msgstr "Dilemel ar strollad-mañ"
 #. TRANS: Client error displayed trying to create a new direct message while not logged in.
 #. TRANS: Client error displayed trying to send a notice while not logged in.
 #. TRANS: Client error displayed trying to nudge a user without being logged in.
+#. TRANS: Client error displayed when trying to enable or disable a plugin while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
@@ -3058,6 +3060,10 @@ msgstr "Ezhomm 'zo eus ar vammenn URL."
 msgid "Could not create application."
 msgstr "N'eo ket posubl krouiñ ar poellad."
 
+#, fuzzy
+msgid "Invalid image."
+msgstr "Ment direizh."
+
 #. TRANS: Title for form to create a group.
 msgid "New group"
 msgstr "Strollad nevez"
@@ -3342,52 +3348,77 @@ msgstr "Boest kas %s"
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr ""
 
+#. TRANS: Title for page where to change password.
+#, fuzzy
+msgctxt "TITLE"
 msgid "Change password"
 msgstr "Cheñch ger-tremen"
 
+#. TRANS: Instructions for page where to change password.
 msgid "Change your password."
 msgstr "Cheñch ger-tremen."
 
+#. TRANS: Fieldset legend on page where to change password.
 #. TRANS: Fieldset legend for password reset form.
 msgid "Password change"
 msgstr "Kemmañ ger-tremen"
 
+#. TRANS: Field label on page where to change password.
 msgid "Old password"
 msgstr "Ger-tremen kozh"
 
+#. TRANS: Field label on page where to change password.
 #. TRANS: Field label for password reset form.
 msgid "New password"
 msgstr "Ger-tremen nevez"
 
+#. TRANS: Field title on page where to change password.
 #, fuzzy
 msgid "6 or more characters."
 msgstr "6 arouezenn pe muioc'h"
 
+#. TRANS: Field label on page where to change password. In this field the new password should be typed a second time.
+#, fuzzy
+msgctxt "LABEL"
+msgid "Confirm"
+msgstr "Kadarnaat"
+
+#. TRANS: Field title on page where to change password.
 #. TRANS: Ttile for field label for password reset form where the password has to be typed again.
 #, fuzzy
 msgid "Same as password above."
 msgstr "Memestra eget ar ger tremen a-us"
 
+#. TRANS: Button text on page where to change password.
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Change"
 msgstr "Kemmañ"
 
+#. TRANS: Form validation error on page where to change password.
 msgid "Password must be 6 or more characters."
 msgstr "Rankout a ra ar ger-tremen bezañ gant 6 arouezenn d'an nebeutañ."
 
 msgid "Passwords don't match."
 msgstr "Ne glot ket ar gerioù-tremen."
 
-msgid "Incorrect old password"
+#. TRANS: Form validation error on page where to change password.
+#, fuzzy
+msgid "Incorrect old password."
 msgstr "Ger-termen kozh direizh"
 
+#. TRANS: Form validation error on page where to change password.
 msgid "Error saving user; invalid."
 msgstr "Ur fazi 'zo bet e-pad enolladenn an implijer ; diwiriek."
 
+#. TRANS: Server error displayed on page where to change password when password change
+#. TRANS: could not be made because of a server error.
 #. TRANS: Reset password form validation error message.
 #, fuzzy
 msgid "Cannot save new password."
 msgstr "Dibosupl eo enrollañ ar ger-tremen nevez."
 
+#. TRANS: Form validation notice on page where to change password.
 msgid "Password saved."
 msgstr "Ger-tremen enrollet."
 
@@ -3437,6 +3468,7 @@ msgstr "Lec'hienn"
 msgid "Server"
 msgstr "Servijer"
 
+#. TRANS: Field title in Paths admin panel.
 msgid "Site's server hostname."
 msgstr "Anv ostiz servijer al lec'hienn."
 
@@ -3444,6 +3476,7 @@ msgstr "Anv ostiz servijer al lec'hienn."
 msgid "Path"
 msgstr "Hent"
 
+#. TRANS: Field title in Paths admin panel.
 #, fuzzy
 msgid "Site path."
 msgstr "Hent al lec'hienn"
@@ -3453,6 +3486,7 @@ msgstr "Hent al lec'hienn"
 msgid "Locale directory"
 msgstr "Doser an temoù"
 
+#. TRANS: Field title in Paths admin panel.
 msgid "Directory path to locales."
 msgstr ""
 
@@ -3460,9 +3494,13 @@ msgstr ""
 msgid "Fancy URLs"
 msgstr "URLioù brav"
 
-msgid "Use fancy (more readable and memorable) URLs?"
+#. TRANS: Field title in Paths admin panel.
+msgid "Use fancy URLs (more readable and memorable)?"
 msgstr ""
 
+#. TRANS: Fieldset legend in Paths admin panel.
+#, fuzzy
+msgctxt "LEGEND"
 msgid "Theme"
 msgstr "Danvez"
 
@@ -3584,6 +3622,8 @@ msgid "Directory where attachments are located."
 msgstr ""
 
 #. TRANS: Fieldset legend in Paths admin panel.
+#, fuzzy
+msgctxt "LEGEND"
 msgid "SSL"
 msgstr "SSL"
 
@@ -3630,10 +3670,14 @@ msgstr ""
 msgid "People search"
 msgstr "Klask tud"
 
+#. TRANS: Client error displayed when trying to tag a profile with an invalid tag.
+#. TRANS: %s is the invalid tag.
 #, php-format
 msgid "Not a valid people tag: %s."
 msgstr "N'eo ket reizh ar merk-se : %s."
 
+#. TRANS: Page title for users with a certain self-tag.
+#. TRANS: %1$s is the tag, %2$s is the page number.
 #, php-format
 msgid "Users self-tagged with %1$s - page %2$d"
 msgstr "Implijerien bet merket drezo o unan gant %1$s - pajenn %2$d"
@@ -3643,15 +3687,19 @@ msgctxt "plugin"
 msgid "Disabled"
 msgstr ""
 
+#. TRANS: Client error displayed when trying to use another method than POST.
+#. TRANS: Do not translate POST.
 #. TRANS: Client error displayed trying to perform any request method other than POST.
 #. TRANS: Do not translate POST.
 msgid "This action only accepts POST requests."
 msgstr ""
 
+#. TRANS: Client error displayed when trying to enable or disable a plugin without access rights.
 #, fuzzy
 msgid "You cannot administer plugins."
 msgstr "N'hallit ket diverkañ implijerien."
 
+#. TRANS: Client error displayed when trying to enable or disable a non-existing plugin.
 #, fuzzy
 msgid "No such plugin."
 msgstr "N'eus ket eus ar bajenn-se."
@@ -3662,7 +3710,8 @@ msgid "Enabled"
 msgstr ""
 
 #. TRANS: Tab and title for plugins admin panel.
-#. TRANS: Menu item for site administration
+#, fuzzy
+msgctxt "TITLE"
 msgid "Plugins"
 msgstr "Pluginoù"
 
@@ -3678,15 +3727,19 @@ msgstr ""
 msgid "Default plugins"
 msgstr "Yezh dre ziouer"
 
+#. TRANS: Text displayed on plugin admin page when no plugin are enabled.
 msgid ""
 "All default plugins have been disabled from the site's configuration file."
 msgstr ""
 
+#. TRANS: Client error displayed if the notice posted has too many characters.
 msgid "Invalid notice content."
 msgstr "Danvez direizh an ali."
 
-#, php-format
-msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’."
+#. TRANS: Exception thrown if a notice's license is not compatible with the StatusNet site license.
+#. TRANS: %1$s is the notice license, %2$s is the StatusNet site's license.
+#, fuzzy, php-format
+msgid "Notice license \"%1$s\" is not compatible with site license \"%2$s\"."
 msgstr ""
 "Aotre-implijout ar menegoù \"%1$s\" ne ya ket gant aotre-implijout al "
 "lec'hienn \"%2$s\"."
@@ -3843,29 +3896,39 @@ msgstr "Enrollet eo bet an arventennoù."
 msgid "Restore account"
 msgstr "Krouiñ ur gont"
 
+#. TRANS: Client error displayed when requesting a public timeline page beyond the page limit.
+#. TRANS: %s is the page limit.
 #, php-format
 msgid "Beyond the page limit (%s)."
 msgstr "Dreist da bevennoù ar bajenn (%s)."
 
+#. TRANS: Server error displayed when a public timeline cannot be retrieved.
 msgid "Could not retrieve public stream."
 msgstr "Dibosupl eo adtapout al lanv foran."
 
+#. TRANS: Title for all public timeline pages but the first.
+#. TRANS: %d is the page number.
 #, php-format
 msgid "Public timeline, page %d"
 msgstr "Lanv foran - pajenn %d"
 
+#. TRANS: Title for the first public timeline page.
 msgid "Public timeline"
 msgstr "Lanv foran"
 
+#. TRANS: Link description for public timeline feed.
 msgid "Public Stream Feed (RSS 1.0)"
 msgstr "Neudenn gwazh foran (RSS 1.0)"
 
+#. TRANS: Link description for public timeline feed.
 msgid "Public Stream Feed (RSS 2.0)"
 msgstr "Neudenn gwazh foran (RSS 2.0)"
 
+#. TRANS: Link description for public timeline feed.
 msgid "Public Stream Feed (Atom)"
 msgstr "Neudenn gwazh foran (Atom)"
 
+#. TRANS: Text displayed for public feed when there are no public notices.
 #, php-format
 msgid ""
 "This is the public timeline for %%site.name%% but no one has posted anything "
@@ -3873,9 +3936,11 @@ msgid ""
 msgstr ""
 "Kronologiezh foran %%site.name%% eo, met den n'en deus skrivet tra ebet."
 
+#. TRANS: Additional text displayed for public feed when there are no public notices for a logged in user.
 msgid "Be the first to post!"
 msgstr "Bezit an hini gentañ da bostañ !"
 
+#. TRANS: Additional text displayed for public feed when there are no public notices for a not logged in user.
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post!"
@@ -3883,6 +3948,8 @@ msgstr ""
 "Perak ne [groufec'h ket ur gont](%%action.register%%) ha bezañ an hini "
 "gentañ da embann un dra !"
 
+#. TRANS: Message for not logged in users at an invite-only site trying to view the public feed of notices.
+#. TRANS: This message contains Markdown links. Please mind the formatting.
 #, fuzzy, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -3893,6 +3960,8 @@ msgstr ""
 "%%site.name%% a zo ur servij [micro-blogging](http://br.wikipedia.org/wiki/"
 "Microblog) diazezet war ar meziant frank [StatusNet](http://status.net/)."
 
+#. TRANS: Message for not logged in users at a closed site trying to view the public feed of notices.
+#. TRANS: This message contains Markdown links. Please mind the formatting.
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -5541,6 +5610,10 @@ msgid ""
 "along with this program.  If not, see %s."
 msgstr ""
 
+#. TRANS: Menu item for site administration
+msgid "Plugins"
+msgstr "Pluginoù"
+
 #. TRANS: Form input field label for application name.
 msgid "Name"
 msgstr "Anv"
@@ -6030,6 +6103,9 @@ msgstr "N'eo ket bet emplementet saveSettings()."
 msgid "Unable to delete design setting."
 msgstr "Dibosupl eo dilemel an arventennoù krouiñ."
 
+msgid "Home"
+msgstr "Degemer"
+
 #. TRANS: Menu item title/tooltip
 msgid "Basic site configuration"
 msgstr "Arventennoù diazez al lec'hienn"
@@ -6633,9 +6709,6 @@ msgstr "Mont d'ar meziant staliañ"
 msgid "Database error"
 msgstr "Fazi bank roadennoù"
 
-msgid "Home"
-msgstr "Degemer"
-
 msgid "Public"
 msgstr "Foran"
 
@@ -7345,7 +7418,6 @@ msgstr "Kas un ali"
 msgid "What's up, %s?"
 msgstr "Penaos 'mañ kont, %s ?"
 
-#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr "Stagañ"
 
@@ -7412,6 +7484,9 @@ msgstr "Dilemel ar c'hemenn-mañ"
 msgid "Notice repeated"
 msgstr "Ali adkemeret"
 
+msgid "Update your status..."
+msgstr ""
+
 msgid "Nudge this user"
 msgstr "Kas ur blinkadenn d'an implijer-mañ"
 
@@ -7923,11 +7998,3 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
-
-#, fuzzy
-#~ msgid "Friends timeline"
-#~ msgstr "Oberezhioù %s"
-
-#, fuzzy
-#~ msgid "Everyone on this site"
-#~ msgstr "Klask tud el lec'hienn-mañ"
diff --git a/locale/ca/LC_MESSAGES/statusnet.po b/locale/ca/LC_MESSAGES/statusnet.po
index 37f2527a9f..c8c23852bb 100644
--- a/locale/ca/LC_MESSAGES/statusnet.po
+++ b/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-03-08 01:03+0000\n"
-"PO-Revision-Date: 2011-03-08 01:05:03+0000\n"
+"POT-Creation-Date: 2011-03-11 18:15+0000\n"
+"PO-Revision-Date: 2011-03-11 18:16:57+0000\n"
 "Language-Team: Catalan <http://translatewiki.net/wiki/Portal:ca>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
+"X-Generator: MediaWiki 1.18alpha (r83703); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ca\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-03-06 02:16:47+0000\n"
+"X-POT-Import-Date: 2011-03-08 01:25:01+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -1047,7 +1047,8 @@ msgid "Can only fave notices."
 msgstr "Només es poden preferir els avisos."
 
 #. TRANS: Client exception thrown when trying favorite a notice without content.
-msgid "Unknown note."
+#, fuzzy
+msgid "Unknown notice."
 msgstr "Nota desconeguda."
 
 #. TRANS: Client exception thrown when trying favorite an already favorited notice.
@@ -1622,6 +1623,7 @@ msgstr "Elimina el grup."
 #. TRANS: Client error displayed trying to create a new direct message while not logged in.
 #. TRANS: Client error displayed trying to send a notice while not logged in.
 #. TRANS: Client error displayed trying to nudge a user without being logged in.
+#. TRANS: Client error displayed when trying to enable or disable a plugin while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
@@ -3113,6 +3115,10 @@ msgstr "URL d'origen requerida."
 msgid "Could not create application."
 msgstr "No s'ha pogut crear l'aplicació."
 
+#, fuzzy
+msgid "Invalid image."
+msgstr "La mida no és vàlida."
+
 #. TRANS: Title for form to create a group.
 msgid "New group"
 msgstr "Nou grup"
@@ -3398,49 +3404,74 @@ msgstr ""
 "Aquesta és la teva safata de sortida, que et mostrarà els missatges privats "
 "que has enviat."
 
+#. TRANS: Title for page where to change password.
+#, fuzzy
+msgctxt "TITLE"
 msgid "Change password"
 msgstr "Canvia la contrasenya"
 
+#. TRANS: Instructions for page where to change password.
 msgid "Change your password."
 msgstr "Canvieu la vostra contrasenya"
 
+#. TRANS: Fieldset legend on page where to change password.
 #. TRANS: Fieldset legend for password reset form.
 msgid "Password change"
 msgstr "Contrasenya canviada."
 
+#. TRANS: Field label on page where to change password.
 msgid "Old password"
 msgstr "Antiga contrasenya"
 
+#. TRANS: Field label on page where to change password.
 #. TRANS: Field label for password reset form.
 msgid "New password"
 msgstr "Nova contrasenya"
 
+#. TRANS: Field title on page where to change password.
 msgid "6 or more characters."
 msgstr "6 o més caràcters."
 
+#. TRANS: Field label on page where to change password. In this field the new password should be typed a second time.
+#, fuzzy
+msgctxt "LABEL"
+msgid "Confirm"
+msgstr "Confirma"
+
+#. TRANS: Field title on page where to change password.
 #. TRANS: Ttile for field label for password reset form where the password has to be typed again.
 msgid "Same as password above."
 msgstr "Igual que la contrasenya de dalt"
 
+#. TRANS: Button text on page where to change password.
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Change"
 msgstr "Canvia"
 
+#. TRANS: Form validation error on page where to change password.
 msgid "Password must be 6 or more characters."
 msgstr "La contrasenya hauria de ser d'entre 6 a més caràcters."
 
 msgid "Passwords don't match."
 msgstr "Les contrasenyes no coincideixen."
 
-msgid "Incorrect old password"
+#. TRANS: Form validation error on page where to change password.
+#, fuzzy
+msgid "Incorrect old password."
 msgstr "Contrasenya antiga incorrecta"
 
+#. TRANS: Form validation error on page where to change password.
 msgid "Error saving user; invalid."
 msgstr "S'ha produït un error en desar l'usuari; no és vàlid."
 
+#. TRANS: Server error displayed on page where to change password when password change
+#. TRANS: could not be made because of a server error.
 #. TRANS: Reset password form validation error message.
 msgid "Cannot save new password."
 msgstr "No es pot desar la nova contrasenya."
 
+#. TRANS: Form validation notice on page where to change password.
 msgid "Password saved."
 msgstr "Contrasenya guardada."
 
@@ -3490,6 +3521,7 @@ msgstr "Lloc"
 msgid "Server"
 msgstr "Servidor"
 
+#. TRANS: Field title in Paths admin panel.
 msgid "Site's server hostname."
 msgstr "Servidor central del lloc."
 
@@ -3497,6 +3529,7 @@ msgstr "Servidor central del lloc."
 msgid "Path"
 msgstr "Camí"
 
+#. TRANS: Field title in Paths admin panel.
 msgid "Site path."
 msgstr "Camí del lloc."
 
@@ -3504,6 +3537,7 @@ msgstr "Camí del lloc."
 msgid "Locale directory"
 msgstr "Directori de les traduccions"
 
+#. TRANS: Field title in Paths admin panel.
 msgid "Directory path to locales."
 msgstr "Camí del directori a les traduccions."
 
@@ -3511,9 +3545,14 @@ msgstr "Camí del directori a les traduccions."
 msgid "Fancy URLs"
 msgstr "URL atractius"
 
-msgid "Use fancy (more readable and memorable) URLs?"
+#. TRANS: Field title in Paths admin panel.
+#, fuzzy
+msgid "Use fancy URLs (more readable and memorable)?"
 msgstr "Voleu fer servir URL atractius (més fàcils de llegir i de recordar)?"
 
+#. TRANS: Fieldset legend in Paths admin panel.
+#, fuzzy
+msgctxt "LEGEND"
 msgid "Theme"
 msgstr "Tema"
 
@@ -3626,6 +3665,8 @@ msgid "Directory where attachments are located."
 msgstr "Directori on es troben les adjuncions."
 
 #. TRANS: Fieldset legend in Paths admin panel.
+#, fuzzy
+msgctxt "LEGEND"
 msgid "SSL"
 msgstr "SSL"
 
@@ -3670,10 +3711,14 @@ msgstr ""
 msgid "People search"
 msgstr "Cerca de gent"
 
+#. TRANS: Client error displayed when trying to tag a profile with an invalid tag.
+#. TRANS: %s is the invalid tag.
 #, php-format
 msgid "Not a valid people tag: %s."
 msgstr "No és una etiqueta de gent vàlida: %s"
 
+#. TRANS: Page title for users with a certain self-tag.
+#. TRANS: %1$s is the tag, %2$s is the page number.
 #, php-format
 msgid "Users self-tagged with %1$s - page %2$d"
 msgstr "Usuaris que s'han etiquetat amb %1$s - pàgina %2$d"
@@ -3683,14 +3728,18 @@ msgctxt "plugin"
 msgid "Disabled"
 msgstr "Inhabilitat"
 
+#. TRANS: Client error displayed when trying to use another method than POST.
+#. TRANS: Do not translate POST.
 #. TRANS: Client error displayed trying to perform any request method other than POST.
 #. TRANS: Do not translate POST.
 msgid "This action only accepts POST requests."
 msgstr "Aquesta acció només accepta sol·licituds POST."
 
+#. TRANS: Client error displayed when trying to enable or disable a plugin without access rights.
 msgid "You cannot administer plugins."
 msgstr "No es poden administrar els connectors."
 
+#. TRANS: Client error displayed when trying to enable or disable a non-existing plugin.
 #, fuzzy
 msgid "No such plugin."
 msgstr "No existeix la pàgina."
@@ -3701,7 +3750,8 @@ msgid "Enabled"
 msgstr "Habilitat"
 
 #. TRANS: Tab and title for plugins admin panel.
-#. TRANS: Menu item for site administration
+#, fuzzy
+msgctxt "TITLE"
 msgid "Plugins"
 msgstr "Connectors"
 
@@ -3719,17 +3769,21 @@ msgstr ""
 msgid "Default plugins"
 msgstr "Connectors per defecte"
 
+#. TRANS: Text displayed on plugin admin page when no plugin are enabled.
 msgid ""
 "All default plugins have been disabled from the site's configuration file."
 msgstr ""
 "S'han inhabilitat tots els connectors per defecte del fitxer de configuració "
 "del lloc."
 
+#. TRANS: Client error displayed if the notice posted has too many characters.
 msgid "Invalid notice content."
 msgstr "El contingut de l'avís no és vàlid."
 
-#, php-format
-msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’."
+#. TRANS: Exception thrown if a notice's license is not compatible with the StatusNet site license.
+#. TRANS: %1$s is the notice license, %2$s is the StatusNet site's license.
+#, fuzzy, php-format
+msgid "Notice license \"%1$s\" is not compatible with site license \"%2$s\"."
 msgstr ""
 "La llicència ‘%1$s’ de l'avís no és compatible amb la llicència ‘%2$s’ del "
 "lloc."
@@ -3878,29 +3932,39 @@ msgstr "S'ha desat la configuració."
 msgid "Restore account"
 msgstr "Restaura el compte"
 
+#. TRANS: Client error displayed when requesting a public timeline page beyond the page limit.
+#. TRANS: %s is the page limit.
 #, php-format
 msgid "Beyond the page limit (%s)."
 msgstr "Més enllà del límit de la pàgina (%s)"
 
+#. TRANS: Server error displayed when a public timeline cannot be retrieved.
 msgid "Could not retrieve public stream."
 msgstr "No s'ha pogut recuperar la conversa pública."
 
+#. TRANS: Title for all public timeline pages but the first.
+#. TRANS: %d is the page number.
 #, php-format
 msgid "Public timeline, page %d"
 msgstr "Línia temporal pública, pàgina %d"
 
+#. TRANS: Title for the first public timeline page.
 msgid "Public timeline"
 msgstr "Línia temporal pública"
 
+#. TRANS: Link description for public timeline feed.
 msgid "Public Stream Feed (RSS 1.0)"
 msgstr "Flux de canal públic (RSS 1.0)"
 
+#. TRANS: Link description for public timeline feed.
 msgid "Public Stream Feed (RSS 2.0)"
 msgstr "Flux de canal públic (RSS 2.0)"
 
+#. TRANS: Link description for public timeline feed.
 msgid "Public Stream Feed (Atom)"
 msgstr "Flux de canal públic (Atom)"
 
+#. TRANS: Text displayed for public feed when there are no public notices.
 #, php-format
 msgid ""
 "This is the public timeline for %%site.name%% but no one has posted anything "
@@ -3909,9 +3973,11 @@ msgstr ""
 "Aquesta és la línia temporal pública de %%site.name%%, però ningú no hi ha "
 "enviat res encara."
 
+#. TRANS: Additional text displayed for public feed when there are no public notices for a logged in user.
 msgid "Be the first to post!"
 msgstr "Sigueu el primer en escriure-hi!"
 
+#. TRANS: Additional text displayed for public feed when there are no public notices for a not logged in user.
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post!"
@@ -3919,6 +3985,8 @@ msgstr ""
 "Per què no [registreu un compte](%%action.register%%) i sou el primer en "
 "escriure-hi!"
 
+#. TRANS: Message for not logged in users at an invite-only site trying to view the public feed of notices.
+#. TRANS: This message contains Markdown links. Please mind the formatting.
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -3931,6 +3999,8 @@ msgstr ""
 "[Uniu-vos-hi ara](%%action.register%%) per compartir què feu amb els vostres "
 "amics, familiars, i companys! ([Més informació](%%doc.help%%))"
 
+#. TRANS: Message for not logged in users at a closed site trying to view the public feed of notices.
+#. TRANS: This message contains Markdown links. Please mind the formatting.
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -5635,6 +5705,10 @@ msgstr ""
 "Hauríeu d'haver rebut una còpia de la llicència GNU Affero General Public "
 "License juntament amb el programa. Si no és així, consulteu %s."
 
+#. TRANS: Menu item for site administration
+msgid "Plugins"
+msgstr "Connectors"
+
 #. TRANS: Form input field label for application name.
 msgid "Name"
 msgstr "Nom"
@@ -6144,6 +6218,9 @@ msgstr "El saveSettings() no està implementat."
 msgid "Unable to delete design setting."
 msgstr "No s'ha pogut eliminar el paràmetre de disseny."
 
+msgid "Home"
+msgstr "Pàgina personal"
+
 #. TRANS: Menu item title/tooltip
 msgid "Basic site configuration"
 msgstr "Configuració bàsica del lloc"
@@ -6771,9 +6848,6 @@ msgstr "Vés a l'instal·lador."
 msgid "Database error"
 msgstr "Error de la base de dades"
 
-msgid "Home"
-msgstr "Pàgina personal"
-
 msgid "Public"
 msgstr "Públic"
 
@@ -7573,7 +7647,6 @@ msgstr "Envia un avís"
 msgid "What's up, %s?"
 msgstr "Què tal, %s?"
 
-#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr "Adjunta"
 
@@ -7642,6 +7715,9 @@ msgstr "Elimina aquest avís"
 msgid "Notice repeated"
 msgstr "Avís repetit"
 
+msgid "Update your status..."
+msgstr ""
+
 msgid "Nudge this user"
 msgstr "Crida l'atenció a l'usuari"
 
@@ -8142,9 +8218,3 @@ msgstr "L'XML no és vàlid, hi manca l'arrel XRD."
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr "Es recupera la còpia de seguretat del fitxer '%s'."
-
-#~ msgid "Friends timeline"
-#~ msgstr "Línia temporal dels amics"
-
-#~ msgid "Everyone on this site"
-#~ msgstr "Tothom en aquest lloc"
diff --git a/locale/cs/LC_MESSAGES/statusnet.po b/locale/cs/LC_MESSAGES/statusnet.po
index e97d4980e0..ec922736f3 100644
--- a/locale/cs/LC_MESSAGES/statusnet.po
+++ b/locale/cs/LC_MESSAGES/statusnet.po
@@ -11,18 +11,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-08 01:03+0000\n"
-"PO-Revision-Date: 2011-03-08 01:05:04+0000\n"
+"POT-Creation-Date: 2011-03-11 18:15+0000\n"
+"PO-Revision-Date: 2011-03-11 18:16:59+0000\n"
 "Language-Team: Czech <http://translatewiki.net/wiki/Portal:cs>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
+"X-Generator: MediaWiki 1.18alpha (r83703); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: cs\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=3; plural=(n == 1) ? 0 : ( (n >= 2 && n <= 4) ? 1 : "
 "2 );\n"
-"X-POT-Import-Date: 2011-03-06 02:16:47+0000\n"
+"X-POT-Import-Date: 2011-03-08 01:25:01+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -1062,7 +1062,7 @@ msgstr "Najít v obsahu oznámení"
 
 #. TRANS: Client exception thrown when trying favorite a notice without content.
 #, fuzzy
-msgid "Unknown note."
+msgid "Unknown notice."
 msgstr "Neznámé"
 
 #. TRANS: Client exception thrown when trying favorite an already favorited notice.
@@ -1653,6 +1653,7 @@ msgstr "Odstranit tohoto uživatele"
 #. TRANS: Client error displayed trying to create a new direct message while not logged in.
 #. TRANS: Client error displayed trying to send a notice while not logged in.
 #. TRANS: Client error displayed trying to nudge a user without being logged in.
+#. TRANS: Client error displayed when trying to enable or disable a plugin while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
@@ -3164,6 +3165,10 @@ msgstr "Zdrojové URL je nutné."
 msgid "Could not create application."
 msgstr "Nelze vytvořit aplikaci."
 
+#, fuzzy
+msgid "Invalid image."
+msgstr "Neplatná velikost"
+
 #. TRANS: Title for form to create a group.
 msgid "New group"
 msgstr "Nová skupina"
@@ -3448,52 +3453,77 @@ msgstr ""
 "Toto je váš outbox, který obsahuje seznam soukromých zpráv které jste "
 "odeslali."
 
+#. TRANS: Title for page where to change password.
+#, fuzzy
+msgctxt "TITLE"
 msgid "Change password"
 msgstr "Změnit heslo"
 
+#. TRANS: Instructions for page where to change password.
 msgid "Change your password."
 msgstr "Změňte své heslo."
 
+#. TRANS: Fieldset legend on page where to change password.
 #. TRANS: Fieldset legend for password reset form.
 msgid "Password change"
 msgstr "Změna hesla"
 
+#. TRANS: Field label on page where to change password.
 msgid "Old password"
 msgstr "Staré heslo"
 
+#. TRANS: Field label on page where to change password.
 #. TRANS: Field label for password reset form.
 msgid "New password"
 msgstr "Nové heslo"
 
+#. TRANS: Field title on page where to change password.
 #, fuzzy
 msgid "6 or more characters."
 msgstr "6 a více znaků"
 
+#. TRANS: Field label on page where to change password. In this field the new password should be typed a second time.
+#, fuzzy
+msgctxt "LABEL"
+msgid "Confirm"
+msgstr "Potvrdit"
+
+#. TRANS: Field title on page where to change password.
 #. TRANS: Ttile for field label for password reset form where the password has to be typed again.
 #, fuzzy
 msgid "Same as password above."
 msgstr "Stejné jako heslo výše"
 
+#. TRANS: Button text on page where to change password.
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Change"
 msgstr "Změnit"
 
+#. TRANS: Form validation error on page where to change password.
 msgid "Password must be 6 or more characters."
 msgstr "Heslo musí být alespoň 6 znaků dlouhé"
 
 msgid "Passwords don't match."
 msgstr "Hesla nesouhlasí"
 
-msgid "Incorrect old password"
+#. TRANS: Form validation error on page where to change password.
+#, fuzzy
+msgid "Incorrect old password."
 msgstr "Nesprávné staré heslo"
 
+#. TRANS: Form validation error on page where to change password.
 msgid "Error saving user; invalid."
 msgstr "Chyba při ukládaní uživatele; neplatný."
 
+#. TRANS: Server error displayed on page where to change password when password change
+#. TRANS: could not be made because of a server error.
 #. TRANS: Reset password form validation error message.
 #, fuzzy
 msgid "Cannot save new password."
 msgstr "Nelze uložit nové heslo"
 
+#. TRANS: Form validation notice on page where to change password.
 msgid "Password saved."
 msgstr "Heslo uloženo"
 
@@ -3543,6 +3573,7 @@ msgstr "Stránky"
 msgid "Server"
 msgstr "Server"
 
+#. TRANS: Field title in Paths admin panel.
 msgid "Site's server hostname."
 msgstr "Hostname (jméno) serveru stránek."
 
@@ -3550,6 +3581,7 @@ msgstr "Hostname (jméno) serveru stránek."
 msgid "Path"
 msgstr "Cesta"
 
+#. TRANS: Field title in Paths admin panel.
 #, fuzzy
 msgid "Site path."
 msgstr "Cesta ke stránkám (za jménem serveru)"
@@ -3559,6 +3591,7 @@ msgstr "Cesta ke stránkám (za jménem serveru)"
 msgid "Locale directory"
 msgstr "adresář tématu"
 
+#. TRANS: Field title in Paths admin panel.
 #, fuzzy
 msgid "Directory path to locales."
 msgstr "Cesta k adresáři locales"
@@ -3567,9 +3600,14 @@ msgstr "Cesta k adresáři locales"
 msgid "Fancy URLs"
 msgstr "Hezké URL"
 
-msgid "Use fancy (more readable and memorable) URLs?"
+#. TRANS: Field title in Paths admin panel.
+#, fuzzy
+msgid "Use fancy URLs (more readable and memorable)?"
 msgstr "Použijte Fancy (více čitelné a zapamatovatelné) URL?"
 
+#. TRANS: Fieldset legend in Paths admin panel.
+#, fuzzy
+msgctxt "LEGEND"
 msgid "Theme"
 msgstr "Téma"
 
@@ -3695,6 +3733,8 @@ msgid "Directory where attachments are located."
 msgstr "Cesta k adresáři locales"
 
 #. TRANS: Fieldset legend in Paths admin panel.
+#, fuzzy
+msgctxt "LEGEND"
 msgid "SSL"
 msgstr "SSL"
 
@@ -3741,10 +3781,14 @@ msgstr ""
 msgid "People search"
 msgstr "Hledání lidí"
 
+#. TRANS: Client error displayed when trying to tag a profile with an invalid tag.
+#. TRANS: %s is the invalid tag.
 #, php-format
 msgid "Not a valid people tag: %s."
 msgstr "Není platný člověkotag: %s."
 
+#. TRANS: Page title for users with a certain self-tag.
+#. TRANS: %1$s is the tag, %2$s is the page number.
 #, php-format
 msgid "Users self-tagged with %1$s - page %2$d"
 msgstr "Uživatelé kteří se sami otagovali %1$s - strana %2$d"
@@ -3754,15 +3798,19 @@ msgctxt "plugin"
 msgid "Disabled"
 msgstr ""
 
+#. TRANS: Client error displayed when trying to use another method than POST.
+#. TRANS: Do not translate POST.
 #. TRANS: Client error displayed trying to perform any request method other than POST.
 #. TRANS: Do not translate POST.
 msgid "This action only accepts POST requests."
 msgstr "Tato akce přijímá pouze POST požadavky."
 
+#. TRANS: Client error displayed when trying to enable or disable a plugin without access rights.
 #, fuzzy
 msgid "You cannot administer plugins."
 msgstr "Nemůžete odstranit uživatele."
 
+#. TRANS: Client error displayed when trying to enable or disable a non-existing plugin.
 #, fuzzy
 msgid "No such plugin."
 msgstr "Tady žádná taková stránka není."
@@ -3773,7 +3821,8 @@ msgid "Enabled"
 msgstr ""
 
 #. TRANS: Tab and title for plugins admin panel.
-#. TRANS: Menu item for site administration
+#, fuzzy
+msgctxt "TITLE"
 msgid "Plugins"
 msgstr "Pluginy"
 
@@ -3789,15 +3838,19 @@ msgstr ""
 msgid "Default plugins"
 msgstr "Výchozí jazyk"
 
+#. TRANS: Text displayed on plugin admin page when no plugin are enabled.
 msgid ""
 "All default plugins have been disabled from the site's configuration file."
 msgstr ""
 
+#. TRANS: Client error displayed if the notice posted has too many characters.
 msgid "Invalid notice content."
 msgstr "Neplatná velikost"
 
-#, php-format
-msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’."
+#. TRANS: Exception thrown if a notice's license is not compatible with the StatusNet site license.
+#. TRANS: %1$s is the notice license, %2$s is the StatusNet site's license.
+#, fuzzy, php-format
+msgid "Notice license \"%1$s\" is not compatible with site license \"%2$s\"."
 msgstr "Licence hlášky ‘%1$s’ není kompatibilní s licencí webu ‘%2$s’."
 
 #. TRANS: Page title for profile settings.
@@ -3952,29 +4005,39 @@ msgstr "Nastavení uloženo"
 msgid "Restore account"
 msgstr "Zaregistrujte se"
 
+#. TRANS: Client error displayed when requesting a public timeline page beyond the page limit.
+#. TRANS: %s is the page limit.
 #, php-format
 msgid "Beyond the page limit (%s)."
 msgstr "Přes limit stránky (%s)."
 
+#. TRANS: Server error displayed when a public timeline cannot be retrieved.
 msgid "Could not retrieve public stream."
 msgstr "Nepodařilo se získat veřejný proud."
 
+#. TRANS: Title for all public timeline pages but the first.
+#. TRANS: %d is the page number.
 #, php-format
 msgid "Public timeline, page %d"
 msgstr "Veřejná časová osa, strana %d"
 
+#. TRANS: Title for the first public timeline page.
 msgid "Public timeline"
 msgstr "Veřejné zprávy"
 
+#. TRANS: Link description for public timeline feed.
 msgid "Public Stream Feed (RSS 1.0)"
 msgstr "Veřejný Stream Feed (RSS 1.0)"
 
+#. TRANS: Link description for public timeline feed.
 msgid "Public Stream Feed (RSS 2.0)"
 msgstr "Veřejný Stream Feed (RSS 2.0)"
 
+#. TRANS: Link description for public timeline feed.
 msgid "Public Stream Feed (Atom)"
 msgstr "Veřejný Stream Feed (Atom)"
 
+#. TRANS: Text displayed for public feed when there are no public notices.
 #, php-format
 msgid ""
 "This is the public timeline for %%site.name%% but no one has posted anything "
@@ -3982,15 +4045,19 @@ msgid ""
 msgstr ""
 "Tohle je veřejná časová osa %%site.name%%, ale nikdo zatím nic nenapsal."
 
+#. TRANS: Additional text displayed for public feed when there are no public notices for a logged in user.
 msgid "Be the first to post!"
 msgstr "Pošlete něco jako první!"
 
+#. TRANS: Additional text displayed for public feed when there are no public notices for a not logged in user.
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post!"
 msgstr ""
 "Proč ne [zaregistrovat účet](%%action.register%%) a poslat něco jako první!"
 
+#. TRANS: Message for not logged in users at an invite-only site trying to view the public feed of notices.
+#. TRANS: This message contains Markdown links. Please mind the formatting.
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -4003,6 +4070,8 @@ msgstr ""
 "status.net/). [Zaregistrujte se](%%action.register%%) a sdílejte hlášky o "
 "sobě s přáteli, rodinou a kolegy! ([Čtěte více](%%doc.help%%))"
 
+#. TRANS: Message for not logged in users at a closed site trying to view the public feed of notices.
+#. TRANS: This message contains Markdown links. Please mind the formatting.
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -5715,6 +5784,10 @@ msgstr ""
 "Měli byste obdržet kopii GNU Affero General Public License spolu s tímto "
 "programem. Pokud ne, jděte na %s."
 
+#. TRANS: Menu item for site administration
+msgid "Plugins"
+msgstr "Pluginy"
+
 #. TRANS: Form input field label for application name.
 msgid "Name"
 msgstr "Název"
@@ -6218,6 +6291,9 @@ msgstr "saveSettings () není implementována."
 msgid "Unable to delete design setting."
 msgstr "Nelze smazat nastavení vzhledu."
 
+msgid "Home"
+msgstr "Moje stránky"
+
 #. TRANS: Menu item title/tooltip
 msgid "Basic site configuration"
 msgstr "Základní konfigurace webu"
@@ -6854,9 +6930,6 @@ msgstr "Jdi na instalaci."
 msgid "Database error"
 msgstr "Chyba databáze"
 
-msgid "Home"
-msgstr "Moje stránky"
-
 msgid "Public"
 msgstr "Veřejné"
 
@@ -7666,7 +7739,6 @@ msgstr "Poslat oznámení"
 msgid "What's up, %s?"
 msgstr "Co se děje, %s?"
 
-#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr "Připojit"
 
@@ -7735,6 +7807,9 @@ msgstr "Odstranit toto oznámení"
 msgid "Notice repeated"
 msgstr "Sdělení opakováno"
 
+msgid "Update your status..."
+msgstr ""
+
 msgid "Nudge this user"
 msgstr "Pošťuchovat tohoto uživatele"
 
@@ -8252,11 +8327,3 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
-
-#, fuzzy
-#~ msgid "Friends timeline"
-#~ msgstr "časová osa %s"
-
-#, fuzzy
-#~ msgid "Everyone on this site"
-#~ msgstr "Najít lidi na této stránce"
diff --git a/locale/de/LC_MESSAGES/statusnet.po b/locale/de/LC_MESSAGES/statusnet.po
index 939acc989b..3fc5e059c2 100644
--- a/locale/de/LC_MESSAGES/statusnet.po
+++ b/locale/de/LC_MESSAGES/statusnet.po
@@ -5,6 +5,7 @@
 # Author: Bavatar
 # Author: Brion
 # Author: George Animal
+# Author: Habi
 # Author: Kghbln
 # Author: Lutzgh
 # Author: March
@@ -21,17 +22,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-08 01:03+0000\n"
-"PO-Revision-Date: 2011-03-08 01:05:05+0000\n"
+"POT-Creation-Date: 2011-03-11 18:15+0000\n"
+"PO-Revision-Date: 2011-03-11 18:17:00+0000\n"
 "Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
+"X-Generator: MediaWiki 1.18alpha (r83703); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-03-06 02:16:47+0000\n"
+"X-POT-Import-Date: 2011-03-08 01:25:01+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -312,7 +313,7 @@ msgstr "Konnte Benutzerdesign nicht aktualisieren."
 #. TRANS: Title for Atom feed.
 msgctxt "ATOM"
 msgid "Main"
-msgstr ""
+msgstr "Main"
 
 #. TRANS: Title for Atom feed. %s is a user nickname.
 #. TRANS: Message is used as link title. %s is a user nickname.
@@ -396,7 +397,6 @@ msgid "Recipient user not found."
 msgstr "Empfänger nicht gefunden."
 
 #. TRANS: Client error displayed trying to direct message another user who's not a friend (403).
-#, fuzzy
 msgid "Cannot send direct messages to users who aren't your friend."
 msgstr ""
 "Es können keine direkten Nachrichten an Benutzer geschickt werden mit denen "
@@ -651,9 +651,8 @@ msgstr ""
 
 #. TRANS: API validation exception thrown when alias is the same as nickname.
 #. TRANS: Group create form validation error.
-#, fuzzy
 msgid "Alias cannot be the same as nickname."
-msgstr "Alias kann nicht das gleiche wie der Spitzname sein."
+msgstr "Alias kann nicht gleich wie der Spitzname sein."
 
 #. TRANS: Client error displayed when uploading a media file has failed.
 msgid "Upload failed."
@@ -864,7 +863,7 @@ msgstr "Kein Status mit dieser ID gefunden."
 
 #. TRANS: Client error displayed when trying to delete a notice not using the Atom format.
 msgid "Can only delete using the Atom format."
-msgstr ""
+msgstr "Kann nur im Atom-Format gelöscht werden"
 
 #. TRANS: Client error displayed when a user has no rights to delete notices of other users.
 #. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
@@ -959,9 +958,9 @@ msgstr "Nicht unterstützte Methode."
 msgid "Repeated to %s"
 msgstr "Antworten an %s"
 
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s notices that were to repeated to %2$s / %3$s."
-msgstr "Nachrichten von %1$s, die auf Nachrichten von %2$s / %3$s antworten."
+msgstr "%1$s Nachrichten, die auf %2$s / %3$s wiederholt wurden."
 
 #. TRANS: Title of list of repeated notices of the logged in user.
 #. TRANS: %s is the nickname of the logged in user.
@@ -969,9 +968,9 @@ msgstr "Nachrichten von %1$s, die auf Nachrichten von %2$s / %3$s antworten."
 msgid "Repeats of %s"
 msgstr "Antworten von %s"
 
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s notices that %2$s / %3$s has repeated."
-msgstr "%1$s markierte Nachricht %2$s als Favorit."
+msgstr "%1$s Notizen wurden von %2$s / %3$s wiederholt."
 
 #. TRANS: Title for timeline with lastest notices with a given tag.
 #. TRANS: %s is the tag.
@@ -1015,7 +1014,7 @@ msgstr "Nur POST verwenden"
 #. TRANS: %s is the unsupported activity object type.
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
-msgstr ""
+msgstr "Aktivität mit Objekttyp \"%s\" kann nicht bearbeitet werden."
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
 #. TRANS: %d is the notice ID (number).
@@ -1045,28 +1044,28 @@ msgstr "Profil nicht gefunden."
 
 #. TRANS: Subtitle for Atom favorites feed.
 #. TRANS: %1$s is a user nickname, %2$s is the StatusNet sitename.
-#, fuzzy, php-format
+#, php-format
 msgid "Notices %1$s has favorited on %2$s"
-msgstr "Aktualisierungen von %1$s und Freunden auf %2$s!"
+msgstr "Notizen, die von %1$s auf %2$s favorisiert wurden."
 
 #. TRANS: Client exception thrown when trying to set a favorite for another user.
 #. TRANS: Client exception thrown when trying to subscribe another user.
-#, fuzzy
 msgid "Cannot add someone else's subscription."
 msgstr "Konnte neues Abonnement nicht eintragen."
 
 #. TRANS: Client exception thrown when trying use an incorrect activity verb for the Atom pub method.
 #, fuzzy
 msgid "Can only handle favorite activities."
-msgstr "Durchsuche den Inhalt der Nachrichten"
+msgstr "Kann nur Favoriten-Aktionen bearbeiten."
 
 #. TRANS: Client exception thrown when trying favorite an object that is not a notice.
 #, fuzzy
 msgid "Can only fave notices."
-msgstr "Durchsuche den Inhalt der Nachrichten"
+msgstr "Kann nur Notizen favorisieren."
 
 #. TRANS: Client exception thrown when trying favorite a notice without content.
-msgid "Unknown note."
+#, fuzzy
+msgid "Unknown notice."
 msgstr "Unbekannter Hinweis."
 
 #. TRANS: Client exception thrown when trying favorite an already favorited notice.
@@ -1083,18 +1082,18 @@ msgstr "%s Gruppen-Mitgliedschaften"
 #. TRANS: %1$s is a username, %2$s is the StatusNet sitename.
 #, fuzzy, php-format
 msgid "Groups %1$s is a member of on %2$s"
-msgstr "Gruppen, in denen „%s“ Mitglied ist"
+msgstr "Gruppen %1$s ist ein Mitglied von %2$s"
 
 #. TRANS: Client exception thrown when trying subscribe someone else to a group.
 #, fuzzy
 msgid "Cannot add someone else's membership."
-msgstr "Konnte neues Abonnement nicht eintragen."
+msgstr "Kann Abonnement von jemand  anderem nicht eintragen."
 
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
 #, fuzzy
 msgid "Can only handle join activities."
-msgstr "Durchsuche den Inhalt der Nachrichten"
+msgstr "Kann nur Beitritts-Aktivitäten durchführen."
 
 #. TRANS: Client exception thrown when trying to subscribe to a non-existing group.
 msgid "Unknown group."
@@ -1115,7 +1114,7 @@ msgstr "Favorit nicht gefunden."
 #. TRANS: Client exception thrown when trying to remove a favorite notice of another user.
 #, fuzzy
 msgid "Cannot delete someone else's favorite."
-msgstr "Konnte Favoriten nicht löschen."
+msgstr "Kann Favoriten von jemand anderem nicht löschen."
 
 #. TRANS: Client exception thrown when referencing a non-existing group.
 #. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
@@ -1154,7 +1153,7 @@ msgstr "Kein Mitglied"
 #. TRANS: Client exception thrown when deleting someone else's membership.
 #, fuzzy
 msgid "Cannot delete someone else's membership."
-msgstr "Konnte Selbst-Abonnement nicht löschen."
+msgstr "Konnte Abonnement von jemand anderem nicht löschen."
 
 #. TRANS: Client exception thrown when trying to display a subscription for a non-existing profile ID.
 #. TRANS: %d is the non-existing profile ID number.
@@ -1181,7 +1180,7 @@ msgstr "Leute, die „%s“ abonniert haben"
 
 #. TRANS: Client error displayed when not using the follow verb.
 msgid "Can only handle Follow activities."
-msgstr ""
+msgstr "Kann nur Abonnements-Funktionen bearbeiten."
 
 #. TRANS: Client exception thrown when subscribing to an object that is not a person.
 msgid "Can only follow people."
@@ -1195,9 +1194,9 @@ msgstr "Profil %s ist unbekannt"
 
 #. TRANS: Client error displayed trying to subscribe to an already subscribed profile.
 #. TRANS: %s is the profile the user already has a subscription on.
-#, fuzzy, php-format
+#, php-format
 msgid "Already subscribed to %s."
-msgstr "Bereits abonniert!"
+msgstr "%s ist bereits abonniert."
 
 #. TRANS: Client error displayed trying to get a non-existing attachment.
 msgid "No such attachment."
@@ -1284,8 +1283,7 @@ msgstr "Keine Datei hoch geladen."
 #. TRANS: Avatar upload form instruction after uploading a file.
 #, fuzzy
 msgid "Pick a square area of the image to be your avatar."
-msgstr ""
-"Wähle eine quadratische Fläche aus dem Bild, um dein Avatar zu speichern"
+msgstr "Wähle einen quadratischen Bereich aus dem Bild als dein Avatar."
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
 #. TRANS: Server error displayed trying to crop an uploaded group logo that is no longer present.
@@ -1316,7 +1314,7 @@ msgstr "Nur angemeldete Benutzer können Nachrichten wiederholen."
 
 #. TRANS: Client exception thrown when trying to backup an account without having backup rights.
 msgid "You may not backup your account."
-msgstr ""
+msgstr "Dein Konto kann nicht gesichert werden."
 
 #. TRANS: Information displayed on the backup account page.
 msgid ""
@@ -1326,6 +1324,11 @@ msgid ""
 "addresses is not backed up. Additionally, uploaded files and direct messages "
 "are not backed up."
 msgstr ""
+"Dein Konto kann im <a href=\"http://activitystrea.ms/\">Activity Streams</a>-"
+"Format gesichert werden. Dies ist eine experimentelle Funktion und stellt "
+"nur ein unvollständige Sicherung dar: private Kontoinformationen wie Email "
+"und IM-Adressen werden nicht gesichert. Zusätzlich werden hochgeladene "
+"Dateien und direkte Nachrichten nicht gesichert."
 
 #. TRANS: Submit button to backup an account on the backup account page.
 msgctxt "BUTTON"
@@ -1335,7 +1338,7 @@ msgstr "Backup"
 #. TRANS: Title for submit button to backup an account on the backup account page.
 #, fuzzy
 msgid "Backup your account."
-msgstr "Backup-Konto"
+msgstr "Sicherheitskopie des Konto erstellen."
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
 msgid "You already blocked that user."
@@ -1370,7 +1373,7 @@ msgstr "Nein"
 #. TRANS: Submit button title for 'No' when blocking a user.
 #, fuzzy
 msgid "Do not block this user."
-msgstr "Diesen Benutzer freigeben"
+msgstr "Diesen Benutzer nicht blokieren."
 
 #. TRANS: Button label on the user block form.
 #. TRANS: Button label on the delete application form.
@@ -1499,7 +1502,7 @@ msgstr "Ich bin mir sicher."
 #. TRANS: %s is the text that needs to be input.
 #, php-format
 msgid "You must write \"%s\" exactly in the box."
-msgstr ""
+msgstr "In der Box muss genau \"%s\" eingetragen werden."
 
 #. TRANS: Confirmation that a user account has been deleted.
 msgid "Account deleted."
@@ -1515,6 +1518,8 @@ msgid ""
 "This will <strong>permanently delete</strong> your account data from this "
 "server."
 msgstr ""
+"Dein Konto und alle Daten auf diesem Server werden <strong>unwiderruflich "
+"gelöscht</strong>."
 
 #. TRANS: Additional form text for user deletion form shown if a user has account backup rights.
 #. TRANS: %s is a URL to the backup page.
@@ -1523,6 +1528,8 @@ msgid ""
 "You are strongly advised to <a href=\"%s\">back up your data</a> before "
 "deletion."
 msgstr ""
+"Vor der Löschung raten wir dir dringend, <a href=\"%s\">eine Sicherungskopie "
+"deiner Daten zu erstellen</a>."
 
 #. TRANS: Field label for delete account confirmation entry.
 #. TRANS: Field label for password reset form where the password has to be typed again.
@@ -1642,6 +1649,7 @@ msgstr "Diese Gruppe löschen"
 #. TRANS: Client error displayed trying to create a new direct message while not logged in.
 #. TRANS: Client error displayed trying to send a notice while not logged in.
 #. TRANS: Client error displayed trying to nudge a user without being logged in.
+#. TRANS: Client error displayed when trying to enable or disable a plugin while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
@@ -1707,9 +1715,8 @@ msgid "Do not delete this user."
 msgstr "Diesen Benutzer nicht löschen"
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
-#, fuzzy
 msgid "Delete this user."
-msgstr "Diesen Benutzer löschen"
+msgstr "Diesen Benutzer löschen."
 
 #. TRANS: Message used as title for design settings for the site.
 msgid "Design"
@@ -2048,6 +2055,8 @@ msgid ""
 "To send notices via email, we need to create a unique email address for you "
 "on this server:"
 msgstr ""
+"Um Notizen per Email zu senden, müssen wir für dich eine eindeutige "
+"Emailadresse generieren."
 
 #. TRANS: Button label for adding an e-mail address to send notices from.
 #. TRANS: Button label for adding an SMS e-mail address to send notices from.
@@ -2096,7 +2105,7 @@ msgstr "Keine E-Mail-Adresse."
 #. TRANS: Message given saving e-mail address that cannot be normalised.
 #, fuzzy
 msgid "Cannot normalize that email address."
-msgstr "Konnte diese E-Mail-Adresse nicht normalisieren"
+msgstr "Diese e-Mail-Adresse kann nicht normalisiert werden."
 
 #. TRANS: Message given saving e-mail address that not valid.
 msgid "Not a valid email address."
@@ -2631,7 +2640,7 @@ msgstr "IM-Adresse"
 
 #, php-format
 msgid "%s screenname."
-msgstr ""
+msgstr "%s Benutzername."
 
 #. TRANS: Header for IM preferences form.
 #, fuzzy
@@ -3159,6 +3168,10 @@ msgstr "Quell-URL ist erforderlich."
 msgid "Could not create application."
 msgstr "Konnte das Programm nicht erstellen."
 
+#, fuzzy
+msgid "Invalid image."
+msgstr "Ungültige Größe."
+
 #. TRANS: Title for form to create a group.
 msgid "New group"
 msgstr "Neue Gruppe"
@@ -3385,9 +3398,9 @@ msgstr "Empfänger nicht gefunden."
 
 #. TRANS: Server error displayed in oEmbed request when a path is not supported.
 #. TRANS: %s is a path.
-#, php-format
+#, fuzzy, php-format
 msgid "\"%s\" not supported for oembed requests."
-msgstr ""
+msgstr "\"%s\" ist für Oembed-Anfragen nicht unterstützt."
 
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
 #, php-format
@@ -3448,50 +3461,75 @@ msgid "This is your outbox, which lists private messages you have sent."
 msgstr ""
 "Das hier ist dein Postausgang, er beinhaltet deine gesendeten Nachrichten."
 
+#. TRANS: Title for page where to change password.
+#, fuzzy
+msgctxt "TITLE"
 msgid "Change password"
 msgstr "Passwort ändern"
 
+#. TRANS: Instructions for page where to change password.
 msgid "Change your password."
 msgstr "Ändere dein Passwort."
 
+#. TRANS: Fieldset legend on page where to change password.
 #. TRANS: Fieldset legend for password reset form.
 msgid "Password change"
 msgstr "Passwort geändert"
 
+#. TRANS: Field label on page where to change password.
 msgid "Old password"
 msgstr "Altes Passwort"
 
+#. TRANS: Field label on page where to change password.
 #. TRANS: Field label for password reset form.
 msgid "New password"
 msgstr "Neues Passwort"
 
+#. TRANS: Field title on page where to change password.
 msgid "6 or more characters."
 msgstr "6 oder mehr Zeichen"
 
+#. TRANS: Field label on page where to change password. In this field the new password should be typed a second time.
+#, fuzzy
+msgctxt "LABEL"
+msgid "Confirm"
+msgstr "Bestätigen"
+
+#. TRANS: Field title on page where to change password.
 #. TRANS: Ttile for field label for password reset form where the password has to be typed again.
 msgid "Same as password above."
 msgstr "Gleiches Passwort wie zuvor"
 
+#. TRANS: Button text on page where to change password.
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Change"
 msgstr "Ändern"
 
+#. TRANS: Form validation error on page where to change password.
 msgid "Password must be 6 or more characters."
 msgstr "Das Passwort muss aus 6 oder mehr Zeichen bestehen."
 
 msgid "Passwords don't match."
 msgstr "Passwörter stimmen nicht überein."
 
-msgid "Incorrect old password"
+#. TRANS: Form validation error on page where to change password.
+#, fuzzy
+msgid "Incorrect old password."
 msgstr "Altes Passwort falsch"
 
+#. TRANS: Form validation error on page where to change password.
 msgid "Error saving user; invalid."
 msgstr "Fehler beim Speichern des Benutzers, ungültig."
 
+#. TRANS: Server error displayed on page where to change password when password change
+#. TRANS: could not be made because of a server error.
 #. TRANS: Reset password form validation error message.
 #, fuzzy
 msgid "Cannot save new password."
 msgstr "Konnte neues Passwort nicht speichern"
 
+#. TRANS: Form validation notice on page where to change password.
 msgid "Password saved."
 msgstr "Passwort gespeichert."
 
@@ -3541,6 +3579,7 @@ msgstr "Seite"
 msgid "Server"
 msgstr "Server"
 
+#. TRANS: Field title in Paths admin panel.
 msgid "Site's server hostname."
 msgstr "Server-Name der Seite"
 
@@ -3548,6 +3587,7 @@ msgstr "Server-Name der Seite"
 msgid "Path"
 msgstr "Pfad"
 
+#. TRANS: Field title in Paths admin panel.
 msgid "Site path."
 msgstr "Seitenpfad."
 
@@ -3555,6 +3595,7 @@ msgstr "Seitenpfad."
 msgid "Locale directory"
 msgstr "Sprachpfad"
 
+#. TRANS: Field title in Paths admin panel.
 msgid "Directory path to locales."
 msgstr "Pfad zu den Sprachen."
 
@@ -3562,9 +3603,14 @@ msgstr "Pfad zu den Sprachen."
 msgid "Fancy URLs"
 msgstr "Schicke URLs."
 
-msgid "Use fancy (more readable and memorable) URLs?"
+#. TRANS: Field title in Paths admin panel.
+#, fuzzy
+msgid "Use fancy URLs (more readable and memorable)?"
 msgstr "Schicke URLs (lesbarer und besser zu merken) verwenden?"
 
+#. TRANS: Fieldset legend in Paths admin panel.
+#, fuzzy
+msgctxt "LEGEND"
 msgid "Theme"
 msgstr "Motiv"
 
@@ -3677,6 +3723,8 @@ msgid "Directory where attachments are located."
 msgstr "Pfad, in dem sich die Themes befinden."
 
 #. TRANS: Fieldset legend in Paths admin panel.
+#, fuzzy
+msgctxt "LEGEND"
 msgid "SSL"
 msgstr "SSL"
 
@@ -3722,10 +3770,14 @@ msgstr ""
 msgid "People search"
 msgstr "Suche nach anderen Benutzern"
 
+#. TRANS: Client error displayed when trying to tag a profile with an invalid tag.
+#. TRANS: %s is the invalid tag.
 #, php-format
 msgid "Not a valid people tag: %s."
 msgstr "Ungültiger Personen-Tag: „%s“."
 
+#. TRANS: Page title for users with a certain self-tag.
+#. TRANS: %1$s is the tag, %2$s is the page number.
 #, php-format
 msgid "Users self-tagged with %1$s - page %2$d"
 msgstr "Benutzer, die sich selbst mit „%1$s“ getaggt haben - Seite %2$d"
@@ -3733,17 +3785,21 @@ msgstr "Benutzer, die sich selbst mit „%1$s“ getaggt haben - Seite %2$d"
 #. TRANS: Page title for AJAX form return when a disabling a plugin.
 msgctxt "plugin"
 msgid "Disabled"
-msgstr ""
+msgstr "Deaktiviert"
 
+#. TRANS: Client error displayed when trying to use another method than POST.
+#. TRANS: Do not translate POST.
 #. TRANS: Client error displayed trying to perform any request method other than POST.
 #. TRANS: Do not translate POST.
 msgid "This action only accepts POST requests."
 msgstr "Diese Aktion nimmt nur POST-Requests"
 
+#. TRANS: Client error displayed when trying to enable or disable a plugin without access rights.
 #, fuzzy
 msgid "You cannot administer plugins."
 msgstr "Du kannst keine Benutzer löschen."
 
+#. TRANS: Client error displayed when trying to enable or disable a non-existing plugin.
 #, fuzzy
 msgid "No such plugin."
 msgstr "Seite nicht vorhanden"
@@ -3751,10 +3807,11 @@ msgstr "Seite nicht vorhanden"
 #. TRANS: Page title for AJAX form return when enabling a plugin.
 msgctxt "plugin"
 msgid "Enabled"
-msgstr ""
+msgstr "Aktiviert"
 
 #. TRANS: Tab and title for plugins admin panel.
-#. TRANS: Menu item for site administration
+#, fuzzy
+msgctxt "TITLE"
 msgid "Plugins"
 msgstr "Erweiterungen"
 
@@ -3764,21 +3821,28 @@ msgid ""
 "\"http://status.net/wiki/Plugins\">online plugin documentation</a> for more "
 "details."
 msgstr ""
+"Zusätzliche Plugins können eingeschaltet und manuell konfiguriert werden. In "
+"der <a href=\"http://status.net/wiki/Plugins\">Plugin Dokumentation</a> "
+"findest du mehr Details."
 
 #. TRANS: Admin form section header
 #, fuzzy
 msgid "Default plugins"
 msgstr "Bevorzugte Sprache"
 
+#. TRANS: Text displayed on plugin admin page when no plugin are enabled.
 msgid ""
 "All default plugins have been disabled from the site's configuration file."
-msgstr ""
+msgstr "Alle Standard-Plugins der Konfigurationsdatei wurden deaktiviert."
 
+#. TRANS: Client error displayed if the notice posted has too many characters.
 msgid "Invalid notice content."
 msgstr "Ungültiger Nachrichteninhalt."
 
-#, php-format
-msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’."
+#. TRANS: Exception thrown if a notice's license is not compatible with the StatusNet site license.
+#. TRANS: %1$s is the notice license, %2$s is the StatusNet site's license.
+#, fuzzy, php-format
+msgid "Notice license \"%1$s\" is not compatible with site license \"%2$s\"."
 msgstr ""
 "Die Nachrichtenlizenz „%1$s“ ist nicht kompatibel mit der Lizenz der Seite „%"
 "2$s“."
@@ -3934,29 +3998,39 @@ msgstr "Einstellungen gespeichert."
 msgid "Restore account"
 msgstr "Neues Benutzerkonto erstellen"
 
+#. TRANS: Client error displayed when requesting a public timeline page beyond the page limit.
+#. TRANS: %s is the page limit.
 #, php-format
 msgid "Beyond the page limit (%s)."
 msgstr "Jenseits des Seitenlimits (%s)."
 
+#. TRANS: Server error displayed when a public timeline cannot be retrieved.
 msgid "Could not retrieve public stream."
 msgstr "Konnte öffentlichen Stream nicht abrufen."
 
+#. TRANS: Title for all public timeline pages but the first.
+#. TRANS: %d is the page number.
 #, php-format
 msgid "Public timeline, page %d"
 msgstr "Öffentliche Zeitleiste, Seite %d"
 
+#. TRANS: Title for the first public timeline page.
 msgid "Public timeline"
 msgstr "Öffentliche Zeitleiste"
 
+#. TRANS: Link description for public timeline feed.
 msgid "Public Stream Feed (RSS 1.0)"
 msgstr "Feed des öffentlichen Streams (RSS 1.0)"
 
+#. TRANS: Link description for public timeline feed.
 msgid "Public Stream Feed (RSS 2.0)"
 msgstr "Feed des öffentlichen Streams (RSS 2.0)"
 
+#. TRANS: Link description for public timeline feed.
 msgid "Public Stream Feed (Atom)"
 msgstr "Feed des öffentlichen Streams (Atom)"
 
+#. TRANS: Text displayed for public feed when there are no public notices.
 #, php-format
 msgid ""
 "This is the public timeline for %%site.name%% but no one has posted anything "
@@ -3965,9 +4039,11 @@ msgstr ""
 "Dies ist die öffentliche Zeitleiste von %%site.name%%, es wurde allerdings "
 "noch nichts gepostet."
 
+#. TRANS: Additional text displayed for public feed when there are no public notices for a logged in user.
 msgid "Be the first to post!"
 msgstr "Sei der erste, der etwas schreibt!"
 
+#. TRANS: Additional text displayed for public feed when there are no public notices for a not logged in user.
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post!"
@@ -3975,6 +4051,8 @@ msgstr ""
 "Warum nicht ein [Benutzerkonto anlegen](%%action.register%%) und den ersten "
 "Beitrag abschicken!"
 
+#. TRANS: Message for not logged in users at an invite-only site trying to view the public feed of notices.
+#. TRANS: This message contains Markdown links. Please mind the formatting.
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -3988,6 +4066,8 @@ msgstr ""
 "Nachrichten mit deinen Freunden, Familie oder Kollegen aus! ([Mehr "
 "Informationen](%%doc.help%%))"
 
+#. TRANS: Message for not logged in users at a closed site trying to view the public feed of notices.
+#. TRANS: This message contains Markdown links. Please mind the formatting.
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -4436,9 +4516,8 @@ msgstr "Du hast noch keine Programme registriert"
 
 #. TRANS: Client exception displayed trying to restore an account while something went wrong uploading a file.
 #. TRANS: Client exception. No file; probably just a non-AJAX submission.
-#, fuzzy
 msgid "No uploaded file."
-msgstr "Datei hochladen"
+msgstr "Datei hochladen."
 
 #. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
@@ -4486,16 +4565,20 @@ msgid ""
 "Feed has been restored. Your old posts should now appear in search and your "
 "profile page."
 msgstr ""
+"Dein Feed wurde reaktiviert. Deine alten Einträge sollten nun in der Suche "
+"und auf deiner Profilseite erscheinen."
 
 #. TRANS: Message when a feed restore is in progress.
 msgid "Feed will be restored. Please wait a few minutes for results."
-msgstr ""
+msgstr "Feed wird wiederhergestellt. Dies kann einige Minuten dauern."
 
 #. TRANS: Form instructions for feed restore.
 msgid ""
 "You can upload a backed-up stream in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format."
 msgstr ""
+"Eine Sicherungskopie kann im <a href=\"http://activitystrea.ms/\">Activity "
+"Streams</a>-Format hochgeladen werden."
 
 #. TRANS: Title for submit button to confirm upload of a user backup file for account restore.
 msgid "Upload the file"
@@ -5378,7 +5461,7 @@ msgid "[none]"
 msgstr "Nichts"
 
 msgid "[internal]"
-msgstr ""
+msgstr "[internal]"
 
 #. TRANS: Label for dropdown with URL shortener services.
 msgid "Shorten URLs with"
@@ -5389,31 +5472,30 @@ msgid "Automatic shortening service to use."
 msgstr "URL-Auto-Kürzungs-Dienst."
 
 msgid "URL longer than"
-msgstr ""
+msgstr "URL länger als"
 
 msgid "URLs longer than this will be shortened, 0 means always shorten."
-msgstr ""
+msgstr "längere URLs werden gekürzt. 0 bedeutet immer verkürzen."
 
 msgid "Text longer than"
-msgstr ""
+msgstr "Text länger als"
 
 msgid ""
 "URLs in notices longer than this will be shortened, 0 means always shorten."
-msgstr ""
+msgstr "längere URLs werden gekürzt. 0 bedeutet immer verkürzen."
 
 #. TRANS: Form validation error for form "Other settings" in user profile.
 msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr "URL-Auto-Kürzungs-Dienst ist zu lang (maximal 50 Zeichen)."
 
 msgid "Invalid number for max url length."
-msgstr ""
+msgstr "Ungültige Zahl für maximale URL-Länge."
 
-#, fuzzy
 msgid "Invalid number for max notice length."
-msgstr "Ungültiger Nachrichteninhalt."
+msgstr "Ungültige Zahl für maximale Nachrichten-Länge."
 
 msgid "Error saving user URL shortening preferences."
-msgstr ""
+msgstr "Fehler beim speichern der URL-Verkürzungs-Einstellungen."
 
 #. TRANS: User admin panel title
 msgctxt "TITLE"
@@ -5709,6 +5791,10 @@ msgstr ""
 "Du hast eine Kopie der GNU Affero General Public License zusammen mit diesem "
 "Programm erhalten. Wenn nicht, siehe %s."
 
+#. TRANS: Menu item for site administration
+msgid "Plugins"
+msgstr "Erweiterungen"
+
 #. TRANS: Form input field label for application name.
 msgid "Name"
 msgstr "Name"
@@ -5992,7 +6078,7 @@ msgstr "Kein einzelner Benutzer für den Ein-Benutzer-Modus ausgewählt."
 
 #. TRANS: Server exception.
 msgid "Single-user mode code called when not enabled."
-msgstr ""
+msgstr "Einzeluser-Modus aufgerufen, aber nicht aktiviert."
 
 #. TRANS: Server exception thrown when creating a group failed.
 msgid "Could not create group."
@@ -6014,19 +6100,19 @@ msgstr "Konnte die lokale Gruppen Information nicht speichern."
 #. TRANS: %s is the remote site.
 #, fuzzy, php-format
 msgid "Cannot locate account %s."
-msgstr "Du kannst keine Benutzer löschen."
+msgstr "Kann Konto %s nicht finden."
 
 #. TRANS: Exception thrown when a service document could not be located account move.
 #. TRANS: %s is the remote site.
 #, php-format
 msgid "Cannot find XRD for %s."
-msgstr ""
+msgstr "XRD für %s kann nicht gefunden werden."
 
 #. TRANS: Exception thrown when an account could not be located when it should be moved.
 #. TRANS: %s is the remote site.
 #, php-format
 msgid "No AtomPub API service for %s."
-msgstr ""
+msgstr "AtomPub API für %s kann nicht gefunden werden."
 
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
 #, php-format
@@ -6050,11 +6136,11 @@ msgstr "Antworten"
 
 #. TRANS: Placeholder text for inline reply form. Clicking in this box will turn it into a mini notice form.
 msgid "Write a reply..."
-msgstr ""
+msgstr "Antwort verfassen..."
 
 #, fuzzy
 msgid "Status"
-msgstr "StatusNet"
+msgstr "Status"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #. TRANS: Text between [] is a link description, text between () is the link itself.
@@ -6130,16 +6216,16 @@ msgstr "Root-Element eines Feeds erwartet, aber ganzes XML-Dokument erhalten."
 #. TRANS: Client exception thrown when using an unknown verb for the activity importer.
 #, fuzzy, php-format
 msgid "Unknown verb: \"%s\"."
-msgstr "Unbekannte Sprache „%s“"
+msgstr "Unbekanntes Verb: „%s“"
 
 #. TRANS: Client exception thrown when trying to force a subscription for an untrusted user.
 msgid "Cannot force subscription for untrusted user."
-msgstr ""
+msgstr "Abonnement für nicht vertrauten Benutzer kann nicht forciert werden."
 
 #. TRANS: Client exception thrown when trying to for a remote user to subscribe.
 #, fuzzy
 msgid "Cannot force remote user to subscribe."
-msgstr "Gib den Namen des Benutzers an, den du abonnieren möchtest."
+msgstr "Kann entfernten Benutzer nicht forciert abonnieren."
 
 #. TRANS: Client exception thrown when trying to subscribe to an unknown profile.
 #, fuzzy
@@ -6148,11 +6234,11 @@ msgstr "Profil %s ist unbekannt"
 
 #. TRANS: Client exception thrown when trying to import an event not related to the importing user.
 msgid "This activity seems unrelated to our user."
-msgstr ""
+msgstr "Diese Aktivität scheint nicht mit dem Benutzer zusammenzuhängen."
 
 #. TRANS: Client exception thrown when trying to join a remote group that is not a group.
 msgid "Remote profile is not a group!"
-msgstr ""
+msgstr "Entferntes Profil ist keine Gruppe!"
 
 #. TRANS: Client exception thrown when trying to join a group the importing user is already a member of.
 #, fuzzy
@@ -6163,11 +6249,11 @@ msgstr "Du bist bereits Mitglied dieser Gruppe"
 #. TRANS: %1$s is the source URI of the notice, %2$s is the URI of the author.
 #, php-format
 msgid "Already know about notice %1$s and  it has a different author %2$s."
-msgstr ""
+msgstr "Ich kennne Notz %1$s bereits. Diese hat einen anderen Autor: %2$s"
 
 #. TRANS: Client exception thrown when trying to overwrite the author information for a non-trusted user during import.
 msgid "Not overwriting author info for non-trusted user."
-msgstr ""
+msgstr "Autor für nicht-vertrauten Benutzer wird nicht überschrieben."
 
 #. TRANS: Client exception thrown when trying to import a notice without content.
 #. TRANS: %s is the notice URI.
@@ -6223,6 +6309,9 @@ msgstr "saveSettings() noch nicht implementiert."
 msgid "Unable to delete design setting."
 msgstr "Konnte die Design-Einstellungen nicht löschen."
 
+msgid "Home"
+msgstr "Homepage"
+
 #. TRANS: Menu item title/tooltip
 msgid "Basic site configuration"
 msgstr "Basis-Seiteneinstellungen"
@@ -6292,7 +6381,7 @@ msgid "No application for that consumer key."
 msgstr "Kein Programm mit diesem Anwender-Schlüssel."
 
 msgid "Not allowed to use API."
-msgstr ""
+msgstr "Darf API nicht verwenden."
 
 #. TRANS: OAuth exception given when an incorrect access token was given for a user.
 msgid "Bad access token."
@@ -6318,7 +6407,7 @@ msgstr "Anonyme OAuth-Anwendung konnte nicht erstellt werden."
 #. TRANS: Exception thrown when no token association could be found.
 msgid ""
 "Could not find a profile and application associated with the request token."
-msgstr ""
+msgstr "Konnte kein Profil und Anwendung für das Anfrage-Token finden."
 
 #. TRANS: Exception thrown when no access token can be issued.
 #, fuzzy
@@ -6850,9 +6939,6 @@ msgstr "Zur Installation gehen."
 msgid "Database error"
 msgstr "Datenbankfehler."
 
-msgid "Home"
-msgstr "Homepage"
-
 msgid "Public"
 msgstr "Zeitleiste"
 
@@ -7657,7 +7743,6 @@ msgstr "Nachricht senden"
 msgid "What's up, %s?"
 msgstr "Was geht, %s?"
 
-#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr "Anhängen"
 
@@ -7726,6 +7811,9 @@ msgstr "Nachricht löschen"
 msgid "Notice repeated"
 msgstr "Nachricht wiederholt"
 
+msgid "Update your status..."
+msgstr ""
+
 msgid "Nudge this user"
 msgstr "Gib diesem Benutzer einen Stups"
 
@@ -7773,16 +7861,16 @@ msgstr "Unbekannt"
 #. TRANS: Plugin admin panel controls
 msgctxt "plugin"
 msgid "Disable"
-msgstr ""
+msgstr "Deaktivieren"
 
 #. TRANS: Plugin admin panel controls
 msgctxt "plugin"
 msgid "Enable"
-msgstr ""
+msgstr "Aktivieren"
 
 msgctxt "plugin-description"
 msgid "(Plugin descriptions unavailable when disabled.)"
-msgstr ""
+msgstr "(Plugin Beschreibung nicht verfügbar wenn deaktiviert.)"
 
 msgid "Settings"
 msgstr "SMS-Einstellungen"
@@ -7977,7 +8065,7 @@ msgid "URL"
 msgstr "URL"
 
 msgid "URL shorteners"
-msgstr ""
+msgstr "URL-Verkürzer"
 
 msgid "Updates by instant messenger (IM)"
 msgstr "Aktualisierungen via Instant Messenger (IM)"
@@ -8228,17 +8316,9 @@ msgstr "Ungültiges XML."
 
 #. TRANS: Exception.
 msgid "Invalid XML, missing XRD root."
-msgstr ""
+msgstr "Ungültiges XML, XRD-Root fehlt."
 
 #. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr "Hole Backup von der Datei „%s“."
-
-#, fuzzy
-#~ msgid "Friends timeline"
-#~ msgstr "%s-Zeitleiste"
-
-#, fuzzy
-#~ msgid "Everyone on this site"
-#~ msgstr "Finde Leute auf dieser Seite"
diff --git a/locale/en_GB/LC_MESSAGES/statusnet.po b/locale/en_GB/LC_MESSAGES/statusnet.po
index b7c4366f53..c08f5a607f 100644
--- a/locale/en_GB/LC_MESSAGES/statusnet.po
+++ b/locale/en_GB/LC_MESSAGES/statusnet.po
@@ -13,17 +13,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-08 01:03+0000\n"
-"PO-Revision-Date: 2011-03-08 01:05:06+0000\n"
+"POT-Creation-Date: 2011-03-11 18:15+0000\n"
+"PO-Revision-Date: 2011-03-11 18:17:01+0000\n"
 "Language-Team: British English <http://translatewiki.net/wiki/Portal:en-gb>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
+"X-Generator: MediaWiki 1.18alpha (r83703); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: en-gb\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-03-06 02:16:47+0000\n"
+"X-POT-Import-Date: 2011-03-08 01:25:01+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -1050,7 +1050,7 @@ msgstr "Find content of notices"
 
 #. TRANS: Client exception thrown when trying favorite a notice without content.
 #, fuzzy
-msgid "Unknown note."
+msgid "Unknown notice."
 msgstr "Unknown"
 
 #. TRANS: Client exception thrown when trying favorite an already favorited notice.
@@ -1639,6 +1639,7 @@ msgstr "Delete this group"
 #. TRANS: Client error displayed trying to create a new direct message while not logged in.
 #. TRANS: Client error displayed trying to send a notice while not logged in.
 #. TRANS: Client error displayed trying to nudge a user without being logged in.
+#. TRANS: Client error displayed when trying to enable or disable a plugin while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
@@ -3144,6 +3145,10 @@ msgstr "Source URL is required."
 msgid "Could not create application."
 msgstr "Could not create application."
 
+#, fuzzy
+msgid "Invalid image."
+msgstr "Invalid size."
+
 #. TRANS: Title for form to create a group.
 msgid "New group"
 msgstr "New group"
@@ -3426,52 +3431,77 @@ msgstr "Outbox for %s"
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr "This is your outbox, which lists private messages you have sent."
 
+#. TRANS: Title for page where to change password.
+#, fuzzy
+msgctxt "TITLE"
 msgid "Change password"
 msgstr "Change password"
 
+#. TRANS: Instructions for page where to change password.
 msgid "Change your password."
 msgstr "Change your password."
 
+#. TRANS: Fieldset legend on page where to change password.
 #. TRANS: Fieldset legend for password reset form.
 msgid "Password change"
 msgstr "Password change"
 
+#. TRANS: Field label on page where to change password.
 msgid "Old password"
 msgstr "Old password"
 
+#. TRANS: Field label on page where to change password.
 #. TRANS: Field label for password reset form.
 msgid "New password"
 msgstr "New password"
 
+#. TRANS: Field title on page where to change password.
 #, fuzzy
 msgid "6 or more characters."
 msgstr "6 or more characters"
 
+#. TRANS: Field label on page where to change password. In this field the new password should be typed a second time.
+#, fuzzy
+msgctxt "LABEL"
+msgid "Confirm"
+msgstr "Confirm"
+
+#. TRANS: Field title on page where to change password.
 #. TRANS: Ttile for field label for password reset form where the password has to be typed again.
 #, fuzzy
 msgid "Same as password above."
 msgstr "Same as password above"
 
+#. TRANS: Button text on page where to change password.
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Change"
 msgstr "Change"
 
+#. TRANS: Form validation error on page where to change password.
 msgid "Password must be 6 or more characters."
 msgstr "Password must be 6 or more characters."
 
 msgid "Passwords don't match."
 msgstr "Passwords don't match."
 
-msgid "Incorrect old password"
+#. TRANS: Form validation error on page where to change password.
+#, fuzzy
+msgid "Incorrect old password."
 msgstr "Incorrect old password"
 
+#. TRANS: Form validation error on page where to change password.
 msgid "Error saving user; invalid."
 msgstr "Error saving user; invalid."
 
+#. TRANS: Server error displayed on page where to change password when password change
+#. TRANS: could not be made because of a server error.
 #. TRANS: Reset password form validation error message.
 #, fuzzy
 msgid "Cannot save new password."
 msgstr "Can't save new password."
 
+#. TRANS: Form validation notice on page where to change password.
 msgid "Password saved."
 msgstr "Password saved."
 
@@ -3521,6 +3551,7 @@ msgstr "Site"
 msgid "Server"
 msgstr "Server"
 
+#. TRANS: Field title in Paths admin panel.
 msgid "Site's server hostname."
 msgstr ""
 
@@ -3528,6 +3559,7 @@ msgstr ""
 msgid "Path"
 msgstr ""
 
+#. TRANS: Field title in Paths admin panel.
 #, fuzzy
 msgid "Site path."
 msgstr "Site path"
@@ -3537,6 +3569,7 @@ msgstr "Site path"
 msgid "Locale directory"
 msgstr "Locale Directory"
 
+#. TRANS: Field title in Paths admin panel.
 msgid "Directory path to locales."
 msgstr ""
 
@@ -3544,9 +3577,12 @@ msgstr ""
 msgid "Fancy URLs"
 msgstr ""
 
-msgid "Use fancy (more readable and memorable) URLs?"
+#. TRANS: Field title in Paths admin panel.
+msgid "Use fancy URLs (more readable and memorable)?"
 msgstr ""
 
+#. TRANS: Fieldset legend in Paths admin panel.
+msgctxt "LEGEND"
 msgid "Theme"
 msgstr ""
 
@@ -3666,6 +3702,8 @@ msgid "Directory where attachments are located."
 msgstr ""
 
 #. TRANS: Fieldset legend in Paths admin panel.
+#, fuzzy
+msgctxt "LEGEND"
 msgid "SSL"
 msgstr "SSL"
 
@@ -3710,10 +3748,14 @@ msgstr ""
 msgid "People search"
 msgstr "People search"
 
+#. TRANS: Client error displayed when trying to tag a profile with an invalid tag.
+#. TRANS: %s is the invalid tag.
 #, php-format
 msgid "Not a valid people tag: %s."
 msgstr "Not a valid people tag: %s."
 
+#. TRANS: Page title for users with a certain self-tag.
+#. TRANS: %1$s is the tag, %2$s is the page number.
 #, php-format
 msgid "Users self-tagged with %1$s - page %2$d"
 msgstr "Users self-tagged with %1$s - page %2$d"
@@ -3723,15 +3765,19 @@ msgctxt "plugin"
 msgid "Disabled"
 msgstr ""
 
+#. TRANS: Client error displayed when trying to use another method than POST.
+#. TRANS: Do not translate POST.
 #. TRANS: Client error displayed trying to perform any request method other than POST.
 #. TRANS: Do not translate POST.
 msgid "This action only accepts POST requests."
 msgstr ""
 
+#. TRANS: Client error displayed when trying to enable or disable a plugin without access rights.
 #, fuzzy
 msgid "You cannot administer plugins."
 msgstr "You cannot delete users."
 
+#. TRANS: Client error displayed when trying to enable or disable a non-existing plugin.
 #, fuzzy
 msgid "No such plugin."
 msgstr "No such page."
@@ -3742,7 +3788,7 @@ msgid "Enabled"
 msgstr ""
 
 #. TRANS: Tab and title for plugins admin panel.
-#. TRANS: Menu item for site administration
+msgctxt "TITLE"
 msgid "Plugins"
 msgstr ""
 
@@ -3758,15 +3804,19 @@ msgstr ""
 msgid "Default plugins"
 msgstr "Default language"
 
+#. TRANS: Text displayed on plugin admin page when no plugin are enabled.
 msgid ""
 "All default plugins have been disabled from the site's configuration file."
 msgstr ""
 
+#. TRANS: Client error displayed if the notice posted has too many characters.
 msgid "Invalid notice content."
 msgstr "Invalid notice content."
 
-#, php-format
-msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’."
+#. TRANS: Exception thrown if a notice's license is not compatible with the StatusNet site license.
+#. TRANS: %1$s is the notice license, %2$s is the StatusNet site's license.
+#, fuzzy, php-format
+msgid "Notice license \"%1$s\" is not compatible with site license \"%2$s\"."
 msgstr "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’."
 
 #. TRANS: Page title for profile settings.
@@ -3918,29 +3968,39 @@ msgstr "Settings saved."
 msgid "Restore account"
 msgstr "Create an account"
 
+#. TRANS: Client error displayed when requesting a public timeline page beyond the page limit.
+#. TRANS: %s is the page limit.
 #, php-format
 msgid "Beyond the page limit (%s)."
 msgstr ""
 
+#. TRANS: Server error displayed when a public timeline cannot be retrieved.
 msgid "Could not retrieve public stream."
 msgstr "Could not retrieve public stream."
 
+#. TRANS: Title for all public timeline pages but the first.
+#. TRANS: %d is the page number.
 #, php-format
 msgid "Public timeline, page %d"
 msgstr "Public timeline, page %d"
 
+#. TRANS: Title for the first public timeline page.
 msgid "Public timeline"
 msgstr "Public timeline"
 
+#. TRANS: Link description for public timeline feed.
 msgid "Public Stream Feed (RSS 1.0)"
 msgstr "Public Stream Feed (RSS 1.0)"
 
+#. TRANS: Link description for public timeline feed.
 msgid "Public Stream Feed (RSS 2.0)"
 msgstr "Public Stream Feed (RSS 2.0)"
 
+#. TRANS: Link description for public timeline feed.
 msgid "Public Stream Feed (Atom)"
 msgstr "Public Stream Feed (Atom)"
 
+#. TRANS: Text displayed for public feed when there are no public notices.
 #, php-format
 msgid ""
 "This is the public timeline for %%site.name%% but no one has posted anything "
@@ -3949,15 +4009,19 @@ msgstr ""
 "This is the public timeline for %%site.name%% but no one has posted anything "
 "yet."
 
+#. TRANS: Additional text displayed for public feed when there are no public notices for a logged in user.
 msgid "Be the first to post!"
 msgstr ""
 
+#. TRANS: Additional text displayed for public feed when there are no public notices for a not logged in user.
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post!"
 msgstr ""
 "Why not [register an account](%%action.register%%) and be the first to post!"
 
+#. TRANS: Message for not logged in users at an invite-only site trying to view the public feed of notices.
+#. TRANS: This message contains Markdown links. Please mind the formatting.
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -3970,6 +4034,8 @@ msgstr ""
 "tool. [Join now](%%action.register%%) to share notices about yourself with "
 "friends, family, and colleagues! ([Read more](%%doc.help%%))"
 
+#. TRANS: Message for not logged in users at a closed site trying to view the public feed of notices.
+#. TRANS: This message contains Markdown links. Please mind the formatting.
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -5654,6 +5720,10 @@ msgstr ""
 "You should have received a copy of the GNU Affero General Public License "
 "along with this program.  If not, see %s."
 
+#. TRANS: Menu item for site administration
+msgid "Plugins"
+msgstr ""
+
 #. TRANS: Form input field label for application name.
 msgid "Name"
 msgstr "Name"
@@ -6146,6 +6216,9 @@ msgstr "saveSettings() not implemented."
 msgid "Unable to delete design setting."
 msgstr "Unable to delete design setting."
 
+msgid "Home"
+msgstr "Homepage"
+
 #. TRANS: Menu item title/tooltip
 msgid "Basic site configuration"
 msgstr "Basic site configuration"
@@ -6765,9 +6838,6 @@ msgstr "Go to the installer."
 msgid "Database error"
 msgstr ""
 
-msgid "Home"
-msgstr "Homepage"
-
 msgid "Public"
 msgstr "Public"
 
@@ -7483,7 +7553,6 @@ msgstr "Send a notice"
 msgid "What's up, %s?"
 msgstr "What's up, %s?"
 
-#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr ""
 
@@ -7549,6 +7618,9 @@ msgstr "Delete this notice"
 msgid "Notice repeated"
 msgstr "Notice repeated"
 
+msgid "Update your status..."
+msgstr ""
+
 msgid "Nudge this user"
 msgstr "Nudge this user"
 
@@ -8054,11 +8126,3 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
-
-#, fuzzy
-#~ msgid "Friends timeline"
-#~ msgstr "%s timeline"
-
-#, fuzzy
-#~ msgid "Everyone on this site"
-#~ msgstr "Find people on this site"
diff --git a/locale/eo/LC_MESSAGES/statusnet.po b/locale/eo/LC_MESSAGES/statusnet.po
index fc4a68c796..2b24b835bf 100644
--- a/locale/eo/LC_MESSAGES/statusnet.po
+++ b/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-03-08 01:03+0000\n"
-"PO-Revision-Date: 2011-03-08 01:05:07+0000\n"
+"POT-Creation-Date: 2011-03-11 18:15+0000\n"
+"PO-Revision-Date: 2011-03-11 18:17:02+0000\n"
 "Language-Team: Esperanto <http://translatewiki.net/wiki/Portal:eo>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
+"X-Generator: MediaWiki 1.18alpha (r83703); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: eo\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-03-06 02:16:47+0000\n"
+"X-POT-Import-Date: 2011-03-08 01:25:01+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -784,7 +784,8 @@ msgid ""
 "Please return to the application and enter the following security code to "
 "complete the process."
 msgstr ""
-"Bonvolu reiri al %s kaj enigu la jenan sekureco-kodo por plenumi la procezon."
+"Bonvolu reiri al la aplikaĵo kaj enigi la jenan sekurecan kodon por "
+"kompletigi la procezon."
 
 #. TRANS: Title of the page notifying the user that the client application was successfully authorized to access the user's account with OAuth.
 #. TRANS: %s is the authorised application name.
@@ -872,10 +873,10 @@ msgstr "Kliento devas providi al \"stato\"-parametro valoron."
 
 #. TRANS: Client error displayed when the parameter "status" is missing.
 #. TRANS: %d is the maximum number of character for a notice.
-#, fuzzy, php-format
+#, php-format
 msgid "That's too long. Maximum notice size is %d character."
 msgid_plural "That's too long. Maximum notice size is %d characters."
-msgstr[0] "Tro longas. Longlimo por avizo estas %d signoj."
+msgstr[0] "Tro longa. Longlimo por avizo estas %d signo."
 msgstr[1] "Tro longas. Longlimo por avizo estas %d signoj."
 
 #. TRANS: Client error displayed when replying to a non-existing notice.
@@ -888,7 +889,7 @@ msgstr ""
 msgid "Maximum notice size is %d character, including attachment URL."
 msgid_plural "Maximum notice size is %d characters, including attachment URL."
 msgstr[0] ""
-"Longlimo por avizo estas %d signoj, enkalkulante ankaŭ la retadresojn."
+"Longlimo por avizo estas %d signo, enkalkulante ankaŭ la retadresojn."
 msgstr[1] ""
 "Longlimo por avizo estas %d signoj, enkalkulante ankaŭ la retadresojn."
 
@@ -956,7 +957,7 @@ msgstr "Ripetoj de %s"
 
 #, fuzzy, php-format
 msgid "%1$s notices that %2$s / %3$s has repeated."
-msgstr "%s (@%s) ŝatis vian avizon"
+msgstr "Avizoj ĉe %1$s, ripetitaj de %2$s / %3$s."
 
 #. TRANS: Title for timeline with lastest notices with a given tag.
 #. TRANS: %s is the tag.
@@ -975,7 +976,7 @@ msgstr "Ĝisdatigoj etikeditaj %1$s ĉe %2$s!"
 #. TRANS: Client error displayed trying to add a notice to another user's timeline.
 #, fuzzy
 msgid "Only the user can add to their own timeline."
-msgstr "Nur uzanto povas legi sian propran paŝton."
+msgstr "Oni ne povas aldoni al tempstrio de aliulo."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
 msgid "Only accept AtomPub for Atom feeds."
@@ -1031,7 +1032,7 @@ msgstr "Ne ekzistas tia profilo."
 
 #. TRANS: Subtitle for Atom favorites feed.
 #. TRANS: %1$s is a user nickname, %2$s is the StatusNet sitename.
-#, fuzzy, php-format
+#, php-format
 msgid "Notices %1$s has favorited on %2$s"
 msgstr "Avizoj, ŝatmarkitaj de %1$s ĉe %2$s"
 
@@ -1052,7 +1053,7 @@ msgstr "Nur avizoj estas ŝatmarkeblaj."
 
 #. TRANS: Client exception thrown when trying favorite a notice without content.
 #, fuzzy
-msgid "Unknown note."
+msgid "Unknown notice."
 msgstr "Nekonata"
 
 #. TRANS: Client exception thrown when trying favorite an already favorited notice.
@@ -1064,24 +1065,22 @@ msgstr "Jam en la ŝatolisto."
 #. TRANS: %s is a username.
 #, fuzzy, php-format
 msgid "%s group memberships"
-msgstr "%s grupanoj"
+msgstr "Grupanecoj de %s"
 
 #. TRANS: Subtitle for group membership feed.
 #. TRANS: %1$s is a username, %2$s is the StatusNet sitename.
-#, fuzzy, php-format
+#, php-format
 msgid "Groups %1$s is a member of on %2$s"
-msgstr "Grupoj de %s"
+msgstr "Grupoj, kies ano %1$s estas ĉe %2$s"
 
 #. TRANS: Client exception thrown when trying subscribe someone else to a group.
-#, fuzzy
 msgid "Cannot add someone else's membership."
 msgstr "Estas neeble aldoni anecon de aliulo."
 
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#, fuzzy
 msgid "Can only handle join activities."
-msgstr "Serĉi enhavon ĉe la retejo"
+msgstr ""
 
 #. TRANS: Client exception thrown when trying to subscribe to a non-existing group.
 msgid "Unknown group."
@@ -1143,9 +1142,8 @@ msgid "Not a member."
 msgstr "Ne estas ano."
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
-#, fuzzy
 msgid "Cannot delete someone else's membership."
-msgstr "Ne eblas forigi abonon al vi mem."
+msgstr "Estas neeble forigi anecon de aliulo."
 
 #. TRANS: Client exception thrown when trying to display a subscription for a non-existing profile ID.
 #. TRANS: %d is the non-existing profile ID number.
@@ -1186,9 +1184,9 @@ msgstr "Nekonata profilo %s."
 
 #. TRANS: Client error displayed trying to subscribe to an already subscribed profile.
 #. TRANS: %s is the profile the user already has a subscription on.
-#, fuzzy, php-format
+#, php-format
 msgid "Already subscribed to %s."
-msgstr "Jam abonato!"
+msgstr "%s jam abonitas de vi."
 
 #. TRANS: Client error displayed trying to get a non-existing attachment.
 msgid "No such attachment."
@@ -1252,7 +1250,6 @@ msgstr "Antaŭrigardo"
 
 #. TRANS: Button on avatar upload page to delete current avatar.
 #. TRANS: Button text for user account deletion.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Delete"
 msgstr "Forigi"
@@ -1640,6 +1637,7 @@ msgstr "Forigi ĉi tiun grupon."
 #. TRANS: Client error displayed trying to create a new direct message while not logged in.
 #. TRANS: Client error displayed trying to send a notice while not logged in.
 #. TRANS: Client error displayed trying to nudge a user without being logged in.
+#. TRANS: Client error displayed when trying to enable or disable a plugin while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
@@ -2544,13 +2542,13 @@ msgstr "Neniu rezulto."
 
 #. TRANS: Additional text on page where groups can be searched if no results were found for a query for a logged in user.
 #. TRANS: This message contains Markdown links in the form [link text](link).
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "If you cannot find the group you're looking for, you can [create it](%%"
 "action.newgroup%%) yourself."
 msgstr ""
-"Se vi ne trovas grupon, kiun vi serĉas, vi povas mem [krei ĝin](%%action."
-"newgroup%%)."
+"Se vi ne povas trovi grupon, kiun vi serĉas, vi povas mem [krei ĝin](%%"
+"action.newgroup%%)."
 
 #. TRANS: Additional text on page where groups can be searched if no results were found for a query for a not logged in user.
 #. TRANS: This message contains Markdown links in the form [link text](link).
@@ -2621,20 +2619,16 @@ msgid "IM Preferences"
 msgstr "Tujmesaĝilaj preferoj"
 
 #. TRANS: Checkbox label in IM preferences form.
-#, fuzzy
 msgid "Send me notices"
-msgstr "Sendi avizon"
+msgstr "Sendi al mi avizojn"
 
 #. TRANS: Checkbox label in IM preferences form.
-#, fuzzy
 msgid "Post a notice when my status changes."
-msgstr "Afiŝu avizon tiam, kiam mia Jabber/GTalk-stato ŝanĝiĝas."
+msgstr "Afiŝi avizon, kiam ŝanĝiĝas mia tujmesaĝila stato."
 
 #. TRANS: Checkbox label in IM preferences form.
-#, fuzzy
 msgid "Send me replies from people I'm not subscribed to."
-msgstr ""
-"Sendu al mi per Jabber/GTalk respondojn de personoj, kiujn mi ne abonas."
+msgstr "Sendi al mi respondojn de personoj, kiujn mi ne abonas."
 
 #. TRANS: Checkbox label in IM preferences form.
 #, fuzzy
@@ -2644,7 +2638,7 @@ msgstr "Publikigi MikroID por mia retpoŝtadreso."
 #. TRANS: Server error thrown on database error updating IM preferences.
 #, fuzzy
 msgid "Couldn't update IM preferences."
-msgstr "Malsukcesis ĝisdatigi uzanton"
+msgstr "Malsukcesis ĝisdatigi tujmesaĝajn agordojn."
 
 #. TRANS: Confirmation message for successful IM preferences save.
 #. TRANS: Confirmation message after saving preferences.
@@ -2676,20 +2670,16 @@ msgid "Screenname already belongs to another user."
 msgstr "Jabber-ID jam apartenas al alia uzanto."
 
 #. TRANS: Message given saving valid IM address that is to be confirmed.
-#, fuzzy
 msgid "A confirmation code was sent to the IM address you added."
-msgstr ""
-"Konfirmo-kodo senditas al la tujmesaĝila adreso aldonita. Vi devas permesi "
-"al %s sendi mesaĝojn al vi."
+msgstr "Konfirmo-kodo senditas al la tujmesaĝila adreso, kiun vi aldonis."
 
 #. TRANS: Message given canceling IM address confirmation for the wrong IM address.
 msgid "That is the wrong IM address."
 msgstr "Tiu tujmesaĝila adreso estas malĝusta."
 
 #. TRANS: Server error thrown on database error canceling IM address confirmation.
-#, fuzzy
 msgid "Couldn't delete confirmation."
-msgstr "Malsukcesis forigi tujmesaĝila agordo."
+msgstr "Malsukcesis forigo de adreskonfirmo."
 
 #. TRANS: Message given after successfully canceling IM address confirmation.
 msgid "IM confirmation cancelled."
@@ -2697,14 +2687,12 @@ msgstr "Tujmesaĝila konfirmo nuligita."
 
 #. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.
-#, fuzzy
 msgid "That is not your screenname."
-msgstr "Tio ne estas via telefonnumero."
+msgstr "Tio ne estas via tujmesaĝila adreso."
 
 #. TRANS: Server error thrown on database error removing a registered IM address.
-#, fuzzy
 msgid "Couldn't update user im prefs."
-msgstr "Malsukcesis ĝisdatigi uzantan informon."
+msgstr "Malsukcesis ĝisdatigo de tujmesaĝaj agordoj de uzanto."
 
 #. TRANS: Message given after successfully removing a registered Instant Messaging address.
 msgid "The IM address was removed."
@@ -2739,12 +2727,11 @@ msgstr "Ensalutu por inviti aliajn uzantojn al %s."
 
 #. TRANS: Form validation message when providing an e-mail address that does not validate.
 #. TRANS: %s is an invalid e-mail address.
-#, fuzzy, php-format
+#, php-format
 msgid "Invalid email address: %s."
-msgstr "Nevalida retpoŝtadreso:  %s"
+msgstr "Nevalida retpoŝtadreso: %s."
 
 #. TRANS: Page title when invitations have been sent.
-#, fuzzy
 msgid "Invitations sent"
 msgstr "Invito(j) senditas"
 
@@ -2943,19 +2930,22 @@ msgstr "Nevalida permesila titolo. La longlimo estas 255 literoj."
 
 #. TRANS: Client error displayed specifying an invalid license URL in the license admin panel.
 msgid "Invalid license URL."
-msgstr ""
+msgstr "Nevalida URL de permesilo."
 
 #. TRANS: Client error displayed specifying an invalid license image URL in the license admin panel.
+#, fuzzy
 msgid "Invalid license image URL."
-msgstr ""
+msgstr "Nevalida URL de bildo de permesilo."
 
 #. TRANS: Client error displayed specifying an invalid license URL in the license admin panel.
+#, fuzzy
 msgid "License URL must be blank or a valid URL."
-msgstr ""
+msgstr "URL de permesilo devas foresti aŭ esti valida URL."
 
 #. TRANS: Client error displayed specifying an invalid license image URL in the license admin panel.
+#, fuzzy
 msgid "License image must be blank or valid URL."
-msgstr ""
+msgstr "URL de bildo de permesilo devas foresti aŭ esti valida URL."
 
 #. TRANS: Form legend in the license admin panel.
 msgid "License selection"
@@ -3054,7 +3044,6 @@ msgid "Automatically login in the future; not for shared computers!"
 msgstr "Aŭtomate ensaluti estonte; ne taŭge por komuna komputilo!"
 
 #. TRANS: Button text for log in on login page.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Login"
 msgstr "Ensaluti"
@@ -3131,14 +3120,17 @@ msgstr "Fonta URL bezonata."
 msgid "Could not create application."
 msgstr "Malsukcesis krei aplikaĵon."
 
+#, fuzzy
+msgid "Invalid image."
+msgstr "Grando nevalida."
+
 #. TRANS: Title for form to create a group.
 msgid "New group"
 msgstr "Nova grupo"
 
 #. TRANS: Client exception thrown when a user tries to create a group while banned.
-#, fuzzy
 msgid "You are not allowed to create groups on this site."
-msgstr "Vi ne estas grupano."
+msgstr "Vi ne rajtas krei grupojn en ĉi tiu retpaĝaro."
 
 #. TRANS: Form instructions for group create form.
 msgid "Use this form to create a new group."
@@ -3151,9 +3143,8 @@ msgstr "Nova mesaĝo"
 
 #. TRANS: Client error displayed trying to send a direct message to a user while sender and
 #. TRANS: receiver are not subscribed to each other.
-#, fuzzy
 msgid "You cannot send a message to this user."
-msgstr "Vi ne povas sendi mesaĝon al la uzanto."
+msgstr "Vi ne povas sendi mesaĝon al tiu uzanto."
 
 #. TRANS: Form validator error displayed trying to send a direct message without content.
 #. TRANS: Client error displayed trying to send a notice without content.
@@ -3325,13 +3316,13 @@ msgstr ""
 #. TRANS: %s is a path.
 #, fuzzy, php-format
 msgid "\"%s\" not found."
-msgstr "Metodo de API ne troviĝas."
+msgstr "\"%s\" ne trovitas."
 
 #. TRANS: Server error displayed in oEmbed action when notice not found.
 #. TRANS: %s is a notice.
-#, fuzzy, php-format
+#, php-format
 msgid "Notice %s not found."
-msgstr "Metodo de API ne troviĝas."
+msgstr "Avizo %s ne trovitas."
 
 #. TRANS: Server error displayed in oEmbed action when notice has not profile.
 msgid "Notice has no profile."
@@ -3413,52 +3404,77 @@ msgid "This is your outbox, which lists private messages you have sent."
 msgstr ""
 "Tio ĉi estas via elirkesto, kie listiĝas privataj mesaĝoj, kiujn vi sendis."
 
+#. TRANS: Title for page where to change password.
+#, fuzzy
+msgctxt "TITLE"
 msgid "Change password"
 msgstr "Ŝanĝi pasvorton"
 
+#. TRANS: Instructions for page where to change password.
 msgid "Change your password."
 msgstr "Ŝanĝi vian pasvorton."
 
+#. TRANS: Fieldset legend on page where to change password.
 #. TRANS: Fieldset legend for password reset form.
 msgid "Password change"
 msgstr "Pasvorta ŝanĝo"
 
+#. TRANS: Field label on page where to change password.
 msgid "Old password"
 msgstr "Malnova pasvorto"
 
+#. TRANS: Field label on page where to change password.
 #. TRANS: Field label for password reset form.
 msgid "New password"
 msgstr "Nova pasvorto"
 
+#. TRANS: Field title on page where to change password.
 #, fuzzy
 msgid "6 or more characters."
 msgstr "6 aŭ pli da literoj"
 
+#. TRANS: Field label on page where to change password. In this field the new password should be typed a second time.
+#, fuzzy
+msgctxt "LABEL"
+msgid "Confirm"
+msgstr "Konfirmi"
+
+#. TRANS: Field title on page where to change password.
 #. TRANS: Ttile for field label for password reset form where the password has to be typed again.
 #, fuzzy
 msgid "Same as password above."
 msgstr "Same kiel pasvorto supra"
 
+#. TRANS: Button text on page where to change password.
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Change"
 msgstr "Ŝanĝi"
 
+#. TRANS: Form validation error on page where to change password.
 msgid "Password must be 6 or more characters."
 msgstr "Pasvorto devas esti 6-litera aŭ pli longa."
 
 msgid "Passwords don't match."
 msgstr "La pasvortoj diferencas."
 
-msgid "Incorrect old password"
+#. TRANS: Form validation error on page where to change password.
+#, fuzzy
+msgid "Incorrect old password."
 msgstr "Neĝusta malnova pasvorto"
 
+#. TRANS: Form validation error on page where to change password.
 msgid "Error saving user; invalid."
 msgstr "Eraris konservi uzanton: nevalida."
 
+#. TRANS: Server error displayed on page where to change password when password change
+#. TRANS: could not be made because of a server error.
 #. TRANS: Reset password form validation error message.
 #, fuzzy
 msgid "Cannot save new password."
 msgstr "Malsukcesis konservi novan pasvorton."
 
+#. TRANS: Form validation notice on page where to change password.
 msgid "Password saved."
 msgstr "Pasvorto konservitas."
 
@@ -3508,6 +3524,7 @@ msgstr "Retejo"
 msgid "Server"
 msgstr "Servilo"
 
+#. TRANS: Field title in Paths admin panel.
 msgid "Site's server hostname."
 msgstr "Gastigserva Nomo de la retejo"
 
@@ -3515,6 +3532,7 @@ msgstr "Gastigserva Nomo de la retejo"
 msgid "Path"
 msgstr "Vojo"
 
+#. TRANS: Field title in Paths admin panel.
 #, fuzzy
 msgid "Site path."
 msgstr "Reteja vojo"
@@ -3523,6 +3541,7 @@ msgstr "Reteja vojo"
 msgid "Locale directory"
 msgstr "Dosierujo de lokaĵaro"
 
+#. TRANS: Field title in Paths admin panel.
 msgid "Directory path to locales."
 msgstr "Vojo de dosierujo al lokaĵaroj."
 
@@ -3530,9 +3549,14 @@ msgstr "Vojo de dosierujo al lokaĵaroj."
 msgid "Fancy URLs"
 msgstr "Tajlora URL"
 
-msgid "Use fancy (more readable and memorable) URLs?"
+#. TRANS: Field title in Paths admin panel.
+#, fuzzy
+msgid "Use fancy URLs (more readable and memorable)?"
 msgstr "Ĉu uzi tajloran (pli facile legebla kaj memorebla) URL?"
 
+#. TRANS: Fieldset legend in Paths admin panel.
+#, fuzzy
+msgctxt "LEGEND"
 msgid "Theme"
 msgstr "Temo"
 
@@ -3645,6 +3669,8 @@ msgid "Directory where attachments are located."
 msgstr "Dosierujo kie aldonaĵoj estas."
 
 #. TRANS: Fieldset legend in Paths admin panel.
+#, fuzzy
+msgctxt "LEGEND"
 msgid "SSL"
 msgstr "\"SSL\""
 
@@ -3689,10 +3715,14 @@ msgstr ""
 msgid "People search"
 msgstr "Persona serĉado"
 
+#. TRANS: Client error displayed when trying to tag a profile with an invalid tag.
+#. TRANS: %s is the invalid tag.
 #, php-format
 msgid "Not a valid people tag: %s."
 msgstr "Ne valida persona markilo: %s."
 
+#. TRANS: Page title for users with a certain self-tag.
+#. TRANS: %1$s is the tag, %2$s is the page number.
 #, php-format
 msgid "Users self-tagged with %1$s - page %2$d"
 msgstr "Uzantoj sinmarkitaj per %1$s - paĝo %2$d"
@@ -3702,15 +3732,19 @@ msgctxt "plugin"
 msgid "Disabled"
 msgstr ""
 
+#. TRANS: Client error displayed when trying to use another method than POST.
+#. TRANS: Do not translate POST.
 #. TRANS: Client error displayed trying to perform any request method other than POST.
 #. TRANS: Do not translate POST.
 msgid "This action only accepts POST requests."
 msgstr "La ago akceptas nur POST-an peton."
 
+#. TRANS: Client error displayed when trying to enable or disable a plugin without access rights.
 #, fuzzy
 msgid "You cannot administer plugins."
 msgstr "Vi ne povas forigi uzantojn."
 
+#. TRANS: Client error displayed when trying to enable or disable a non-existing plugin.
 #, fuzzy
 msgid "No such plugin."
 msgstr "Ne estas tiu paĝo."
@@ -3721,7 +3755,8 @@ msgid "Enabled"
 msgstr ""
 
 #. TRANS: Tab and title for plugins admin panel.
-#. TRANS: Menu item for site administration
+#, fuzzy
+msgctxt "TITLE"
 msgid "Plugins"
 msgstr "Kromprogramo"
 
@@ -3737,15 +3772,19 @@ msgstr ""
 msgid "Default plugins"
 msgstr "Defaŭlta lingvo"
 
+#. TRANS: Text displayed on plugin admin page when no plugin are enabled.
 msgid ""
 "All default plugins have been disabled from the site's configuration file."
 msgstr ""
 
+#. TRANS: Client error displayed if the notice posted has too many characters.
 msgid "Invalid notice content."
 msgstr "Nevalida avizo-enhavo"
 
-#, php-format
-msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’."
+#. TRANS: Exception thrown if a notice's license is not compatible with the StatusNet site license.
+#. TRANS: %1$s is the notice license, %2$s is the StatusNet site's license.
+#, fuzzy, php-format
+msgid "Notice license \"%1$s\" is not compatible with site license \"%2$s\"."
 msgstr "Aviza permesilo ‘%1$s’ ne konformas al reteja permesilo ‘%2$s’."
 
 #. TRANS: Page title for profile settings.
@@ -3830,9 +3869,8 @@ msgid "Language"
 msgstr "Lingvo"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#, fuzzy
 msgid "Preferred language."
-msgstr "Preferata lingvo"
+msgstr "Preferata lingvo."
 
 #. TRANS: Dropdownlist label in form for profile settings.
 msgid "Timezone"
@@ -3898,29 +3936,39 @@ msgstr "Agordo konservitas."
 msgid "Restore account"
 msgstr "Krei konton"
 
+#. TRANS: Client error displayed when requesting a public timeline page beyond the page limit.
+#. TRANS: %s is the page limit.
 #, php-format
 msgid "Beyond the page limit (%s)."
 msgstr "Trans paĝolimo (%s)."
 
+#. TRANS: Server error displayed when a public timeline cannot be retrieved.
 msgid "Could not retrieve public stream."
 msgstr "Malsukcesis ricevi publikan fluon"
 
+#. TRANS: Title for all public timeline pages but the first.
+#. TRANS: %d is the page number.
 #, php-format
 msgid "Public timeline, page %d"
 msgstr "Publika tempstrio, paĝo %d"
 
+#. TRANS: Title for the first public timeline page.
 msgid "Public timeline"
 msgstr "Publika tempstrio"
 
+#. TRANS: Link description for public timeline feed.
 msgid "Public Stream Feed (RSS 1.0)"
 msgstr "Publika fluo (RSS 1.0)"
 
+#. TRANS: Link description for public timeline feed.
 msgid "Public Stream Feed (RSS 2.0)"
 msgstr "Publika fluo (RSS 2.0)"
 
+#. TRANS: Link description for public timeline feed.
 msgid "Public Stream Feed (Atom)"
 msgstr "Publika fluo (Atom)"
 
+#. TRANS: Text displayed for public feed when there are no public notices.
 #, php-format
 msgid ""
 "This is the public timeline for %%site.name%% but no one has posted anything "
@@ -3929,14 +3977,18 @@ msgstr ""
 "Tio ĉi estas la publika tempstrio de %%site.name%%, sed ankoraŭ neniu afiŝis "
 "ion ajn."
 
+#. TRANS: Additional text displayed for public feed when there are no public notices for a logged in user.
 msgid "Be the first to post!"
 msgstr "Estu la unua afiŝanto!"
 
+#. TRANS: Additional text displayed for public feed when there are no public notices for a not logged in user.
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post!"
 msgstr "Kial ne [krei konton](%%action.register%%) kaj esti la unua afiŝanto!"
 
+#. TRANS: Message for not logged in users at an invite-only site trying to view the public feed of notices.
+#. TRANS: This message contains Markdown links. Please mind the formatting.
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -3949,6 +4001,8 @@ msgstr ""
 "net/). [Aniĝu](%%action.register%%) por konigi novaĵon pri vi mem al viaj "
 "amikoj, familianoj, kaj kolegoj! ([Pli](%%doc.help%%))"
 
+#. TRANS: Message for not logged in users at a closed site trying to view the public feed of notices.
+#. TRANS: This message contains Markdown links. Please mind the formatting.
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -4313,7 +4367,6 @@ msgstr "Nur ensalutinto rajtas ripeti avizon."
 msgid "No notice specified."
 msgstr "Neniu profilo specifiĝas."
 
-#, fuzzy
 msgid "You cannot repeat your own notice."
 msgstr "Vi ne povas ripeti vian propran avizon."
 
@@ -4380,7 +4433,7 @@ msgstr "Respondoj al %1$s ĉe %2$s!"
 #. TRANS: Client exception displayed when trying to restore an account while not logged in.
 #, fuzzy
 msgid "Only logged-in users can restore their account."
-msgstr "Nur ensalutinto rajtas ripeti avizon."
+msgstr "Nur ensalutintoj rajtas restarigi sian konton."
 
 #. TRANS: Client exception displayed when trying to restore an account without having restore rights.
 #, fuzzy
@@ -4391,7 +4444,7 @@ msgstr "Vi ankoraŭ neniun aplikaĵon registris."
 #. TRANS: Client exception. No file; probably just a non-AJAX submission.
 #, fuzzy
 msgid "No uploaded file."
-msgstr "Alŝuti dosieron"
+msgstr "Malestas alŝutita dosiero."
 
 #. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
@@ -5315,7 +5368,7 @@ msgid "[none]"
 msgstr "Nenio"
 
 msgid "[internal]"
-msgstr ""
+msgstr "[interna]"
 
 #. TRANS: Label for dropdown with URL shortener services.
 msgid "Shorten URLs with"
@@ -5325,18 +5378,22 @@ msgstr "Mallongigu URLojn per"
 msgid "Automatic shortening service to use."
 msgstr "Uzota aŭtomata mallongigad-servo."
 
+#, fuzzy
 msgid "URL longer than"
-msgstr ""
+msgstr "URL pli longa, ol"
 
 msgid "URLs longer than this will be shortened, 0 means always shorten."
-msgstr ""
+msgstr "URLoj pli longaj ol tio mallongigatos, uzu «0» por ĉiam mallongigi."
 
+#, fuzzy
 msgid "Text longer than"
-msgstr ""
+msgstr "Teksto pli longa, ol"
 
 msgid ""
 "URLs in notices longer than this will be shortened, 0 means always shorten."
 msgstr ""
+"URLoj en avizoj pli longaj, ol tio, mallongigatos; uzu «0» por ĉiam "
+"mallongigi."
 
 #. TRANS: Form validation error for form "Other settings" in user profile.
 #, fuzzy
@@ -5641,6 +5698,10 @@ msgstr ""
 "Vi laŭe jam ricevis eldonon de la GNU Affero Ĝenerala Publika Permesilo. "
 "Nekaze, legu %s."
 
+#. TRANS: Menu item for site administration
+msgid "Plugins"
+msgstr "Kromprogramo"
+
 #. TRANS: Form input field label for application name.
 msgid "Name"
 msgstr "Nomo"
@@ -5744,7 +5805,7 @@ msgstr "Aniĝi"
 #. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
 #, php-format
 msgid "%1$s has joined group %2$s."
-msgstr ""
+msgstr "%1$s aniĝis grupon %2$s."
 
 #. TRANS: Server exception thrown when updating a local group fails.
 msgid "Could not update local group."
@@ -6140,6 +6201,10 @@ msgstr "saveSettings() ne jam realigita."
 msgid "Unable to delete design setting."
 msgstr "Malsukcesas forigi desegnan agordon."
 
+#, fuzzy
+msgid "Home"
+msgstr "Hejmpaĝo"
+
 #. TRANS: Menu item title/tooltip
 msgid "Basic site configuration"
 msgstr "Baza reteja agordo"
@@ -6364,7 +6429,7 @@ msgstr ""
 #. TRANS: Server exception thrown when using the method setActivitySubject() in the class Atom10Feed.
 #, fuzzy
 msgid "Do not use this method!"
-msgstr "Ne forigi la avizon"
+msgstr "Ne uzu ĉi tiun metodon!"
 
 #. TRANS: Title.
 msgid "Notices where this attachment appears"
@@ -6377,7 +6442,7 @@ msgstr "Etikedoj por ĉi tiu aldonaĵo"
 #. TRANS: Exception thrown when a password change fails.
 #, fuzzy
 msgid "Password changing failed."
-msgstr "La ŝanĝo de pasvorto maltrafis"
+msgstr "Ŝanĝo de pasvorto malsukcesis."
 
 #. TRANS: Exception thrown when a password change attempt fails because it is not allowed.
 #, fuzzy
@@ -6461,7 +6526,7 @@ msgstr ""
 #. TRANS: Error message text shown when a favorite could not be set because it has already been favorited.
 #, fuzzy
 msgid "Could not create favorite: already favorited."
-msgstr "Malsukcesis krei ŝataton."
+msgstr "Malsukcesis krei ŝatmarkon: jam ŝatmarkita."
 
 #. TRANS: Text shown when a notice has been marked as favourite successfully.
 msgid "Notice marked as fave."
@@ -6771,10 +6836,6 @@ msgstr "Al la instalilo."
 msgid "Database error"
 msgstr "Datumbaza eraro"
 
-#, fuzzy
-msgid "Home"
-msgstr "Hejmpaĝo"
-
 msgid "Public"
 msgstr "Publika"
 
@@ -7528,7 +7589,7 @@ msgstr "Elektu peranton"
 #. TRANS Entry in drop-down selection box in direct-message inbox/outbox when no one is available to message.
 #, fuzzy
 msgid "No mutual subscribers."
-msgstr "Ne abonato!"
+msgstr "Mankas abonantoj reciprokaj."
 
 msgid "To"
 msgstr "Al"
@@ -7578,7 +7639,6 @@ msgstr "Sendi avizon"
 msgid "What's up, %s?"
 msgstr "Kio novas, %s?"
 
-#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr "Aldoni"
 
@@ -7647,6 +7707,9 @@ msgstr "Forigi la avizon"
 msgid "Notice repeated"
 msgstr "Avizo ripetiĝas"
 
+msgid "Update your status..."
+msgstr ""
+
 msgid "Nudge this user"
 msgstr "Puŝeti la uzanton"
 
@@ -7672,9 +7735,8 @@ msgstr "Refoja avizo."
 msgid "Couldn't insert new subscription."
 msgstr "Eraris enmeti novan abonon."
 
-#, fuzzy
 msgid "Your profile"
-msgstr "Grupa profilo"
+msgstr "Via profilo"
 
 msgid "Replies"
 msgstr "Respondoj"
@@ -7705,36 +7767,30 @@ msgctxt "plugin-description"
 msgid "(Plugin descriptions unavailable when disabled.)"
 msgstr ""
 
-#, fuzzy
 msgid "Settings"
-msgstr "SMM-a agordo"
+msgstr "Agordoj"
 
-#, fuzzy
 msgid "Change your personal settings"
-msgstr "Ŝanĝi vian profilan agordon."
+msgstr "Ŝanĝi viajn personajn agordojn"
 
-#, fuzzy
 msgid "Site configuration"
-msgstr "Uzanta agordo"
+msgstr "Retej-agordo"
 
-#, fuzzy
 msgid "Logout"
-msgstr " Elsaluti"
+msgstr "Elsaluti"
 
-#, fuzzy
 msgid "Logout from the site"
-msgstr "Elsaluti el la retejo"
+msgstr "Elsaluti el la retpaĝaro"
 
 #, fuzzy
 msgid "Login to the site"
-msgstr "Ensaluti al la retejo"
+msgstr "Ensaluti al la retpaĝaro"
 
 msgid "Search"
 msgstr "Serĉi"
 
-#, fuzzy
 msgid "Search the site"
-msgstr "Serĉi ĉe retejo"
+msgstr "Serĉi en la retpaĝaro"
 
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
@@ -7810,9 +7866,8 @@ msgid "Revoke the \"%s\" role from this user"
 msgstr "Revoki rolon %s de la uzanto"
 
 #. TRANS: Client error on action trying to visit a non-existing page.
-#, fuzzy
 msgid "Page not found."
-msgstr "Metodo de API ne troviĝas."
+msgstr "Paĝo ne trovitas."
 
 msgid "Sandbox"
 msgstr "Provejo"
@@ -7904,7 +7959,7 @@ msgid "URL"
 msgstr "URL"
 
 msgid "URL shorteners"
-msgstr ""
+msgstr "Mallongigiloj de URLoj"
 
 msgid "Updates by instant messenger (IM)"
 msgstr "Ĝisdatiĝo per tujmesaĝilo."
@@ -8161,11 +8216,3 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
-
-#, fuzzy
-#~ msgid "Friends timeline"
-#~ msgstr "Tempstrio de %s"
-
-#, fuzzy
-#~ msgid "Everyone on this site"
-#~ msgstr "Serĉi homon ĉe la retejo"
diff --git a/locale/es/LC_MESSAGES/statusnet.po b/locale/es/LC_MESSAGES/statusnet.po
index 81bccda833..7319a67351 100644
--- a/locale/es/LC_MESSAGES/statusnet.po
+++ b/locale/es/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-03-08 01:03+0000\n"
-"PO-Revision-Date: 2011-03-08 01:05:08+0000\n"
+"POT-Creation-Date: 2011-03-11 18:15+0000\n"
+"PO-Revision-Date: 2011-03-11 18:17:03+0000\n"
 "Language-Team: Spanish <http://translatewiki.net/wiki/Portal:es>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
+"X-Generator: MediaWiki 1.18alpha (r83703); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-03-06 02:16:47+0000\n"
+"X-POT-Import-Date: 2011-03-08 01:25:01+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -1060,7 +1060,8 @@ msgid "Can only fave notices."
 msgstr "Sólo se pueden preferir los avisos."
 
 #. TRANS: Client exception thrown when trying favorite a notice without content.
-msgid "Unknown note."
+#, fuzzy
+msgid "Unknown notice."
 msgstr "Nota desconocida."
 
 #. TRANS: Client exception thrown when trying favorite an already favorited notice.
@@ -1648,6 +1649,7 @@ msgstr "Borrar este grupo"
 #. TRANS: Client error displayed trying to create a new direct message while not logged in.
 #. TRANS: Client error displayed trying to send a notice while not logged in.
 #. TRANS: Client error displayed trying to nudge a user without being logged in.
+#. TRANS: Client error displayed when trying to enable or disable a plugin while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
@@ -3165,6 +3167,10 @@ msgstr "Se requiere el URL fuente."
 msgid "Could not create application."
 msgstr "No se pudo crear la aplicación."
 
+#, fuzzy
+msgid "Invalid image."
+msgstr "Tamaño inválido."
+
 #. TRANS: Title for form to create a group.
 msgid "New group"
 msgstr "Grupo nuevo "
@@ -3449,52 +3455,77 @@ msgid "This is your outbox, which lists private messages you have sent."
 msgstr ""
 "Ésta es tu bandeja de salida, incluye la lista de mensajes privados enviados."
 
+#. TRANS: Title for page where to change password.
+#, fuzzy
+msgctxt "TITLE"
 msgid "Change password"
 msgstr "Cambiar contraseña"
 
+#. TRANS: Instructions for page where to change password.
 msgid "Change your password."
 msgstr "Cambia tu contraseña"
 
+#. TRANS: Fieldset legend on page where to change password.
 #. TRANS: Fieldset legend for password reset form.
 msgid "Password change"
 msgstr "Cambio de contraseña"
 
+#. TRANS: Field label on page where to change password.
 msgid "Old password"
 msgstr "Antigua contraseña"
 
+#. TRANS: Field label on page where to change password.
 #. TRANS: Field label for password reset form.
 msgid "New password"
 msgstr "Nueva contraseña"
 
+#. TRANS: Field title on page where to change password.
 #, fuzzy
 msgid "6 or more characters."
 msgstr "6 o más caracteres"
 
+#. TRANS: Field label on page where to change password. In this field the new password should be typed a second time.
+#, fuzzy
+msgctxt "LABEL"
+msgid "Confirm"
+msgstr "Confirmar"
+
+#. TRANS: Field title on page where to change password.
 #. TRANS: Ttile for field label for password reset form where the password has to be typed again.
 #, fuzzy
 msgid "Same as password above."
 msgstr "Igual a la contraseña de arriba"
 
+#. TRANS: Button text on page where to change password.
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Change"
 msgstr "Cambiar"
 
+#. TRANS: Form validation error on page where to change password.
 msgid "Password must be 6 or more characters."
 msgstr "La contraseña debe tener 6 o más caracteres."
 
 msgid "Passwords don't match."
 msgstr "Las contraseñas no coinciden"
 
-msgid "Incorrect old password"
+#. TRANS: Form validation error on page where to change password.
+#, fuzzy
+msgid "Incorrect old password."
 msgstr "Contraseña antigua incorrecta."
 
+#. TRANS: Form validation error on page where to change password.
 msgid "Error saving user; invalid."
 msgstr "Error al guardar el usuario; inválido."
 
+#. TRANS: Server error displayed on page where to change password when password change
+#. TRANS: could not be made because of a server error.
 #. TRANS: Reset password form validation error message.
 #, fuzzy
 msgid "Cannot save new password."
 msgstr "No se puede guardar la nueva contraseña."
 
+#. TRANS: Form validation notice on page where to change password.
 msgid "Password saved."
 msgstr "Se guardó la contraseña."
 
@@ -3544,6 +3575,7 @@ msgstr "Sitio"
 msgid "Server"
 msgstr "Servidor"
 
+#. TRANS: Field title in Paths admin panel.
 msgid "Site's server hostname."
 msgstr "Nombre del host del servidor del sitio."
 
@@ -3551,6 +3583,7 @@ msgstr "Nombre del host del servidor del sitio."
 msgid "Path"
 msgstr "Ruta"
 
+#. TRANS: Field title in Paths admin panel.
 #, fuzzy
 msgid "Site path."
 msgstr "Ruta del sitio"
@@ -3560,6 +3593,7 @@ msgstr "Ruta del sitio"
 msgid "Locale directory"
 msgstr "Directorio de temas"
 
+#. TRANS: Field title in Paths admin panel.
 #, fuzzy
 msgid "Directory path to locales."
 msgstr "Ruta del directorio de las configuraciones locales"
@@ -3568,9 +3602,14 @@ msgstr "Ruta del directorio de las configuraciones locales"
 msgid "Fancy URLs"
 msgstr "URL agradables"
 
-msgid "Use fancy (more readable and memorable) URLs?"
+#. TRANS: Field title in Paths admin panel.
+#, fuzzy
+msgid "Use fancy URLs (more readable and memorable)?"
 msgstr "¿Usar URL amigables (más legibles y memorizables)?"
 
+#. TRANS: Fieldset legend in Paths admin panel.
+#, fuzzy
+msgctxt "LEGEND"
 msgid "Theme"
 msgstr "Tema"
 
@@ -3696,6 +3735,8 @@ msgid "Directory where attachments are located."
 msgstr "Ruta del directorio de las configuraciones locales"
 
 #. TRANS: Fieldset legend in Paths admin panel.
+#, fuzzy
+msgctxt "LEGEND"
 msgid "SSL"
 msgstr "SSL"
 
@@ -3742,10 +3783,14 @@ msgstr ""
 msgid "People search"
 msgstr "Buscador de gente"
 
+#. TRANS: Client error displayed when trying to tag a profile with an invalid tag.
+#. TRANS: %s is the invalid tag.
 #, php-format
 msgid "Not a valid people tag: %s."
 msgstr "No es una etiqueta válida para personas: %s."
 
+#. TRANS: Page title for users with a certain self-tag.
+#. TRANS: %1$s is the tag, %2$s is the page number.
 #, php-format
 msgid "Users self-tagged with %1$s - page %2$d"
 msgstr "Usuarios auto etiquetados con %1$s - página %2$d"
@@ -3755,15 +3800,19 @@ msgctxt "plugin"
 msgid "Disabled"
 msgstr ""
 
+#. TRANS: Client error displayed when trying to use another method than POST.
+#. TRANS: Do not translate POST.
 #. TRANS: Client error displayed trying to perform any request method other than POST.
 #. TRANS: Do not translate POST.
 msgid "This action only accepts POST requests."
 msgstr "Esta acción sólo acepta solicitudes POST."
 
+#. TRANS: Client error displayed when trying to enable or disable a plugin without access rights.
 #, fuzzy
 msgid "You cannot administer plugins."
 msgstr "No puedes borrar usuarios."
 
+#. TRANS: Client error displayed when trying to enable or disable a non-existing plugin.
 #, fuzzy
 msgid "No such plugin."
 msgstr "No existe tal página."
@@ -3774,7 +3823,8 @@ msgid "Enabled"
 msgstr ""
 
 #. TRANS: Tab and title for plugins admin panel.
-#. TRANS: Menu item for site administration
+#, fuzzy
+msgctxt "TITLE"
 msgid "Plugins"
 msgstr "Complementos"
 
@@ -3790,15 +3840,19 @@ msgstr ""
 msgid "Default plugins"
 msgstr "!Idioma predeterminado"
 
+#. TRANS: Text displayed on plugin admin page when no plugin are enabled.
 msgid ""
 "All default plugins have been disabled from the site's configuration file."
 msgstr ""
 
+#. TRANS: Client error displayed if the notice posted has too many characters.
 msgid "Invalid notice content."
 msgstr "Contenido de mensaje inválido."
 
-#, php-format
-msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’."
+#. TRANS: Exception thrown if a notice's license is not compatible with the StatusNet site license.
+#. TRANS: %1$s is the notice license, %2$s is the StatusNet site's license.
+#, fuzzy, php-format
+msgid "Notice license \"%1$s\" is not compatible with site license \"%2$s\"."
 msgstr ""
 "La licencia del mensaje %1$s’ es incompatible con la licencia del sitio ‘%2"
 "$s’."
@@ -3956,29 +4010,39 @@ msgstr "Se guardó configuración."
 msgid "Restore account"
 msgstr "Crear una cuenta"
 
+#. TRANS: Client error displayed when requesting a public timeline page beyond the page limit.
+#. TRANS: %s is the page limit.
 #, php-format
 msgid "Beyond the page limit (%s)."
 msgstr "Más allá del límite de páginas (%s)."
 
+#. TRANS: Server error displayed when a public timeline cannot be retrieved.
 msgid "Could not retrieve public stream."
 msgstr "No se pudo acceder a corriente pública."
 
+#. TRANS: Title for all public timeline pages but the first.
+#. TRANS: %d is the page number.
 #, php-format
 msgid "Public timeline, page %d"
 msgstr "Línea temporal pública, página %d"
 
+#. TRANS: Title for the first public timeline page.
 msgid "Public timeline"
 msgstr "Línea temporal pública"
 
+#. TRANS: Link description for public timeline feed.
 msgid "Public Stream Feed (RSS 1.0)"
 msgstr "Canal público (RSS 1.0)"
 
+#. TRANS: Link description for public timeline feed.
 msgid "Public Stream Feed (RSS 2.0)"
 msgstr "Canal público (RSS 2.0)"
 
+#. TRANS: Link description for public timeline feed.
 msgid "Public Stream Feed (Atom)"
 msgstr "Canal público (Atom)"
 
+#. TRANS: Text displayed for public feed when there are no public notices.
 #, php-format
 msgid ""
 "This is the public timeline for %%site.name%% but no one has posted anything "
@@ -3987,9 +4051,11 @@ msgstr ""
 "Esta es la línea temporal pública de %%site.name%%, pero aún no se ha "
 "publicado nada."
 
+#. TRANS: Additional text displayed for public feed when there are no public notices for a logged in user.
 msgid "Be the first to post!"
 msgstr "¡Sé la primera persona en publicar algo!"
 
+#. TRANS: Additional text displayed for public feed when there are no public notices for a not logged in user.
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post!"
@@ -3997,6 +4063,8 @@ msgstr ""
 "¿Por qué no [registras una cuenta](%%action.register%%) y te conviertes en "
 "la primera persona en publicar?"
 
+#. TRANS: Message for not logged in users at an invite-only site trying to view the public feed of notices.
+#. TRANS: This message contains Markdown links. Please mind the formatting.
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -4010,6 +4078,8 @@ msgstr ""
 "para compartir notas acerca de tí con tus amistades, familiares y "
 "compañeros!! ([Más información](%%doc.help%%))"
 
+#. TRANS: Message for not logged in users at a closed site trying to view the public feed of notices.
+#. TRANS: This message contains Markdown links. Please mind the formatting.
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -5746,6 +5816,10 @@ msgstr ""
 "Debes haber recibido una copia de la Licencia Pública General de Affero GNU "
 "con este programa. Si no la recibiste, visita %s."
 
+#. TRANS: Menu item for site administration
+msgid "Plugins"
+msgstr "Complementos"
+
 #. TRANS: Form input field label for application name.
 msgid "Name"
 msgstr "Nombre"
@@ -6257,6 +6331,9 @@ msgstr "saveSettings() no implementada."
 msgid "Unable to delete design setting."
 msgstr "No se puede eliminar la configuración de diseño."
 
+msgid "Home"
+msgstr "Página de inicio"
+
 #. TRANS: Menu item title/tooltip
 msgid "Basic site configuration"
 msgstr "Configuración básica del sitio"
@@ -6892,9 +6969,6 @@ msgstr "Ir al instalador."
 msgid "Database error"
 msgstr "Error de la base de datos"
 
-msgid "Home"
-msgstr "Página de inicio"
-
 msgid "Public"
 msgstr "Público"
 
@@ -7707,7 +7781,6 @@ msgstr "Enviar un mensaje"
 msgid "What's up, %s?"
 msgstr "¿Qué tal, %s?"
 
-#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr "Adjuntar"
 
@@ -7776,6 +7849,9 @@ msgstr "Borrar este mensaje"
 msgid "Notice repeated"
 msgstr "Mensaje repetido"
 
+msgid "Update your status..."
+msgstr ""
+
 msgid "Nudge this user"
 msgstr "Dar un toque a este usuario"
 
@@ -8286,11 +8362,3 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
-
-#, fuzzy
-#~ msgid "Friends timeline"
-#~ msgstr "línea temporal de %s"
-
-#, fuzzy
-#~ msgid "Everyone on this site"
-#~ msgstr "Encontrar gente en este sitio"
diff --git a/locale/fa/LC_MESSAGES/statusnet.po b/locale/fa/LC_MESSAGES/statusnet.po
index d8bcba9d6d..443e410308 100644
--- a/locale/fa/LC_MESSAGES/statusnet.po
+++ b/locale/fa/LC_MESSAGES/statusnet.po
@@ -16,8 +16,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-08 01:03+0000\n"
-"PO-Revision-Date: 2011-03-08 01:05:10+0000\n"
+"POT-Creation-Date: 2011-03-11 18:15+0000\n"
+"PO-Revision-Date: 2011-03-11 18:17:04+0000\n"
 "Last-Translator: Ahmad Sufi Mahmudi\n"
 "Language-Team: Persian <http://translatewiki.net/wiki/Portal:fa>\n"
 "MIME-Version: 1.0\n"
@@ -26,9 +26,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.18alpha (r83429); Translate extension (2011-03-07)\n"
+"X-Generator: MediaWiki 1.18alpha (r83703); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
-"X-POT-Import-Date: 2011-03-06 02:16:47+0000\n"
+"X-POT-Import-Date: 2011-03-08 01:25:01+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -1052,7 +1052,7 @@ msgstr "پیدا کردن محتوای پیام‌ها"
 
 #. TRANS: Client exception thrown when trying favorite a notice without content.
 #, fuzzy
-msgid "Unknown note."
+msgid "Unknown notice."
 msgstr "ناشناخته"
 
 #. TRANS: Client exception thrown when trying favorite an already favorited notice.
@@ -1647,6 +1647,7 @@ msgstr "حذف این کاربر"
 #. TRANS: Client error displayed trying to create a new direct message while not logged in.
 #. TRANS: Client error displayed trying to send a notice while not logged in.
 #. TRANS: Client error displayed trying to nudge a user without being logged in.
+#. TRANS: Client error displayed when trying to enable or disable a plugin while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
@@ -3153,6 +3154,10 @@ msgstr "نشانی اینترنتی منبع مورد نیاز است."
 msgid "Could not create application."
 msgstr "نمی‌توان برنامه را ساخت."
 
+#, fuzzy
+msgid "Invalid image."
+msgstr "اندازه نادرست است."
+
 #. TRANS: Title for form to create a group.
 msgid "New group"
 msgstr "گروه جدید"
@@ -3436,52 +3441,77 @@ msgstr ""
 "این صندوق خروجی شماست، که پیام‌های خصوصی فرستاده شده به وسیلهٔ شما را فهرست "
 "می‌کند."
 
+#. TRANS: Title for page where to change password.
+#, fuzzy
+msgctxt "TITLE"
 msgid "Change password"
 msgstr "تغییر گذرواژه"
 
+#. TRANS: Instructions for page where to change password.
 msgid "Change your password."
 msgstr "تغییر گذرواژهٔ شما"
 
+#. TRANS: Fieldset legend on page where to change password.
 #. TRANS: Fieldset legend for password reset form.
 msgid "Password change"
 msgstr "تغییر گذرواژه"
 
+#. TRANS: Field label on page where to change password.
 msgid "Old password"
 msgstr "گذرواژهٔ پیشین"
 
+#. TRANS: Field label on page where to change password.
 #. TRANS: Field label for password reset form.
 msgid "New password"
 msgstr "گذرواژهٔ تازه"
 
+#. TRANS: Field title on page where to change password.
 #, fuzzy
 msgid "6 or more characters."
 msgstr "۶ نویسه یا بیش‌تر"
 
+#. TRANS: Field label on page where to change password. In this field the new password should be typed a second time.
+#, fuzzy
+msgctxt "LABEL"
+msgid "Confirm"
+msgstr "تایید"
+
+#. TRANS: Field title on page where to change password.
 #. TRANS: Ttile for field label for password reset form where the password has to be typed again.
 #, fuzzy
 msgid "Same as password above."
 msgstr "مانند گذرواژهٔ بالا"
 
+#. TRANS: Button text on page where to change password.
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Change"
 msgstr "تغییر"
 
+#. TRANS: Form validation error on page where to change password.
 msgid "Password must be 6 or more characters."
 msgstr "گذرواژه باید ۶ نویسه یا بیش‌تر باشد."
 
 msgid "Passwords don't match."
 msgstr "گذرواژه‌ها مطابقت ندارند."
 
-msgid "Incorrect old password"
+#. TRANS: Form validation error on page where to change password.
+#, fuzzy
+msgid "Incorrect old password."
 msgstr "گذرواژه پیشین اشتباه است"
 
+#. TRANS: Form validation error on page where to change password.
 msgid "Error saving user; invalid."
 msgstr "هنگام ذخیرهٔ کاربر خطا رخ داد؛ نامعتبر است."
 
+#. TRANS: Server error displayed on page where to change password when password change
+#. TRANS: could not be made because of a server error.
 #. TRANS: Reset password form validation error message.
 #, fuzzy
 msgid "Cannot save new password."
 msgstr "نمی‌توان گذرواژهٔ جدید را ذخیره کرد."
 
+#. TRANS: Form validation notice on page where to change password.
 msgid "Password saved."
 msgstr "گذرواژه ذخیره شد."
 
@@ -3531,6 +3561,7 @@ msgstr "وب‌گاه"
 msgid "Server"
 msgstr "کارگزار"
 
+#. TRANS: Field title in Paths admin panel.
 msgid "Site's server hostname."
 msgstr "نام میزبان کارگزار وب‌گاه."
 
@@ -3538,6 +3569,7 @@ msgstr "نام میزبان کارگزار وب‌گاه."
 msgid "Path"
 msgstr "مسیر"
 
+#. TRANS: Field title in Paths admin panel.
 #, fuzzy
 msgid "Site path."
 msgstr "مسیر وب‌گاه"
@@ -3547,6 +3579,7 @@ msgstr "مسیر وب‌گاه"
 msgid "Locale directory"
 msgstr "شاخهٔ پوسته"
 
+#. TRANS: Field title in Paths admin panel.
 #, fuzzy
 msgid "Directory path to locales."
 msgstr "مسیر پوشه برای زبان‌های محلی"
@@ -3555,9 +3588,14 @@ msgstr "مسیر پوشه برای زبان‌های محلی"
 msgid "Fancy URLs"
 msgstr "نشانی‌های تمیز"
 
-msgid "Use fancy (more readable and memorable) URLs?"
+#. TRANS: Field title in Paths admin panel.
+#, fuzzy
+msgid "Use fancy URLs (more readable and memorable)?"
 msgstr "از نشانی‌های تمیز (خواناتر و ماندگارتر در ذهن) استفاده شود؟"
 
+#. TRANS: Fieldset legend in Paths admin panel.
+#, fuzzy
+msgctxt "LEGEND"
 msgid "Theme"
 msgstr "پوسته"
 
@@ -3683,6 +3721,8 @@ msgid "Directory where attachments are located."
 msgstr "مسیر پوشه برای زبان‌های محلی"
 
 #. TRANS: Fieldset legend in Paths admin panel.
+#, fuzzy
+msgctxt "LEGEND"
 msgid "SSL"
 msgstr "SSL"
 
@@ -3729,10 +3769,14 @@ msgstr ""
 msgid "People search"
 msgstr "جست‌وجوی کاربران"
 
+#. TRANS: Client error displayed when trying to tag a profile with an invalid tag.
+#. TRANS: %s is the invalid tag.
 #, php-format
 msgid "Not a valid people tag: %s."
 msgstr "یک برچسب کاربری معتبر نیست: %s."
 
+#. TRANS: Page title for users with a certain self-tag.
+#. TRANS: %1$s is the tag, %2$s is the page number.
 #, php-format
 msgid "Users self-tagged with %1$s - page %2$d"
 msgstr "کاربران خود برچسب‌گذاری شده با %1$s - صفحهٔ %2$d"
@@ -3742,15 +3786,19 @@ msgctxt "plugin"
 msgid "Disabled"
 msgstr ""
 
+#. TRANS: Client error displayed when trying to use another method than POST.
+#. TRANS: Do not translate POST.
 #. TRANS: Client error displayed trying to perform any request method other than POST.
 #. TRANS: Do not translate POST.
 msgid "This action only accepts POST requests."
 msgstr "این عمل تنها درخواست‌های POST را می‌پذیرد."
 
+#. TRANS: Client error displayed when trying to enable or disable a plugin without access rights.
 #, fuzzy
 msgid "You cannot administer plugins."
 msgstr "شما نمی‌توانید کاربران را پاک کنید."
 
+#. TRANS: Client error displayed when trying to enable or disable a non-existing plugin.
 #, fuzzy
 msgid "No such plugin."
 msgstr "چنین صفحه‌ای وجود ندارد."
@@ -3761,7 +3809,8 @@ msgid "Enabled"
 msgstr ""
 
 #. TRANS: Tab and title for plugins admin panel.
-#. TRANS: Menu item for site administration
+#, fuzzy
+msgctxt "TITLE"
 msgid "Plugins"
 msgstr "افزونه‌ها"
 
@@ -3777,15 +3826,19 @@ msgstr ""
 msgid "Default plugins"
 msgstr "زبان پیش‌فرض"
 
+#. TRANS: Text displayed on plugin admin page when no plugin are enabled.
 msgid ""
 "All default plugins have been disabled from the site's configuration file."
 msgstr ""
 
+#. TRANS: Client error displayed if the notice posted has too many characters.
 msgid "Invalid notice content."
 msgstr "محتوای پیام نامعتبر است."
 
-#, php-format
-msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’."
+#. TRANS: Exception thrown if a notice's license is not compatible with the StatusNet site license.
+#. TRANS: %1$s is the notice license, %2$s is the StatusNet site's license.
+#, fuzzy, php-format
+msgid "Notice license \"%1$s\" is not compatible with site license \"%2$s\"."
 msgstr "مجوز پیام «%1$s» با مجوز وب‌گاه «%2$s» سازگار نیست."
 
 #. TRANS: Page title for profile settings.
@@ -3936,29 +3989,39 @@ msgstr "تنظیمات ذخیره شد."
 msgid "Restore account"
 msgstr "ساختن یک جساب‌کاربری"
 
+#. TRANS: Client error displayed when requesting a public timeline page beyond the page limit.
+#. TRANS: %s is the page limit.
 #, php-format
 msgid "Beyond the page limit (%s)."
 msgstr ""
 
+#. TRANS: Server error displayed when a public timeline cannot be retrieved.
 msgid "Could not retrieve public stream."
 msgstr "نمی‌توان جریان عمومی را دریافت کرد."
 
+#. TRANS: Title for all public timeline pages but the first.
+#. TRANS: %d is the page number.
 #, php-format
 msgid "Public timeline, page %d"
 msgstr "خط‌زمانی عمومی، صفحهٔ %d"
 
+#. TRANS: Title for the first public timeline page.
 msgid "Public timeline"
 msgstr "خط‌زمانی عمومی"
 
+#. TRANS: Link description for public timeline feed.
 msgid "Public Stream Feed (RSS 1.0)"
 msgstr "خوراک جریان عمومی (RSS 1.0)"
 
+#. TRANS: Link description for public timeline feed.
 msgid "Public Stream Feed (RSS 2.0)"
 msgstr "خوراک جریان عمومی (RSS 2.0)"
 
+#. TRANS: Link description for public timeline feed.
 msgid "Public Stream Feed (Atom)"
 msgstr "خوراک جریان عمومی (Atom)"
 
+#. TRANS: Text displayed for public feed when there are no public notices.
 #, php-format
 msgid ""
 "This is the public timeline for %%site.name%% but no one has posted anything "
@@ -3966,14 +4029,18 @@ msgid ""
 msgstr ""
 "این خط‌زمانی عمومی برای %%site.name%% است، اما هیچ‌کس هنوز چیزی نفرستاده است."
 
+#. TRANS: Additional text displayed for public feed when there are no public notices for a logged in user.
 msgid "Be the first to post!"
 msgstr "اولین کسی باشید که پیام می‌فرستد!"
 
+#. TRANS: Additional text displayed for public feed when there are no public notices for a not logged in user.
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post!"
 msgstr "چرا [ثبت نام](%%action.register%%) نمی‌کنید و اولین پیام را نمی‌فرستید؟"
 
+#. TRANS: Message for not logged in users at an invite-only site trying to view the public feed of notices.
+#. TRANS: This message contains Markdown links. Please mind the formatting.
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -3987,6 +4054,8 @@ msgstr ""
 "action.register%%) تا آگاهی‌هایی را دربارهٔ خودتان با دوستان، خانواده و "
 "همکاران‌تان به اشتراک بگذارید! ([بیش‌تر بخوانید](%%doc.help%%))"
 
+#. TRANS: Message for not logged in users at a closed site trying to view the public feed of notices.
+#. TRANS: This message contains Markdown links. Please mind the formatting.
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -5695,6 +5764,10 @@ msgstr ""
 "شما باید یک رونوشت از مجوز GNU Affero General Public License را همراه این "
 "برنامه دریافت کرده باشید. اگر چنین نیست، %s را ببینید."
 
+#. TRANS: Menu item for site administration
+msgid "Plugins"
+msgstr "افزونه‌ها"
+
 #. TRANS: Form input field label for application name.
 msgid "Name"
 msgstr "نام"
@@ -6195,6 +6268,9 @@ msgstr "saveSettings() پیاده نشده است."
 msgid "Unable to delete design setting."
 msgstr "نمی توان تنظیمات طراحی شده را پاک کرد ."
 
+msgid "Home"
+msgstr "خانه"
+
 #. TRANS: Menu item title/tooltip
 msgid "Basic site configuration"
 msgstr "پیکربندی اولیه وب‌گاه"
@@ -6824,9 +6900,6 @@ msgstr "برو به نصاب."
 msgid "Database error"
 msgstr "خطای پایگاه داده"
 
-msgid "Home"
-msgstr "خانه"
-
 msgid "Public"
 msgstr "عمومی"
 
@@ -7625,7 +7698,6 @@ msgstr "فرستادن یک پیام"
 msgid "What's up, %s?"
 msgstr "چه خبر، %s؟"
 
-#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr "پیوست کردن"
 
@@ -7695,6 +7767,9 @@ msgstr "این پیام را پاک کن"
 msgid "Notice repeated"
 msgstr "پیام تکرار شد"
 
+msgid "Update your status..."
+msgstr ""
+
 msgid "Nudge this user"
 msgstr "یادآوری‌کردن به این کاربر"
 
@@ -8201,11 +8276,3 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
-
-#, fuzzy
-#~ msgid "Friends timeline"
-#~ msgstr "خط‌زمانی %s"
-
-#, fuzzy
-#~ msgid "Everyone on this site"
-#~ msgstr "پیدا کردن افراد در این وب‌گاه"
diff --git a/locale/fi/LC_MESSAGES/statusnet.po b/locale/fi/LC_MESSAGES/statusnet.po
index 31e3ddcf16..98f6370d3e 100644
--- a/locale/fi/LC_MESSAGES/statusnet.po
+++ b/locale/fi/LC_MESSAGES/statusnet.po
@@ -15,17 +15,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-08 01:03+0000\n"
-"PO-Revision-Date: 2011-03-08 01:05:11+0000\n"
+"POT-Creation-Date: 2011-03-11 18:15+0000\n"
+"PO-Revision-Date: 2011-03-11 18:17:06+0000\n"
 "Language-Team: Finnish <http://translatewiki.net/wiki/Portal:fi>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
+"X-Generator: MediaWiki 1.18alpha (r83703); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fi\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-03-06 02:16:47+0000\n"
+"X-POT-Import-Date: 2011-03-08 01:25:01+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -1042,7 +1042,8 @@ msgid "Can only fave notices."
 msgstr "Vain päivityksiä voi merkitä suosikeiksi."
 
 #. TRANS: Client exception thrown when trying favorite a notice without content.
-msgid "Unknown note."
+#, fuzzy
+msgid "Unknown notice."
 msgstr "Tuntematon päivitys."
 
 #. TRANS: Client exception thrown when trying favorite an already favorited notice.
@@ -1617,6 +1618,7 @@ msgstr "Poista tämä ryhmä."
 #. TRANS: Client error displayed trying to create a new direct message while not logged in.
 #. TRANS: Client error displayed trying to send a notice while not logged in.
 #. TRANS: Client error displayed trying to nudge a user without being logged in.
+#. TRANS: Client error displayed when trying to enable or disable a plugin while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
@@ -3117,6 +3119,10 @@ msgstr ""
 msgid "Could not create application."
 msgstr "Ei voitu lisätä aliasta."
 
+#, fuzzy
+msgid "Invalid image."
+msgstr "Koko ei kelpaa."
+
 #. TRANS: Title for form to create a group.
 msgid "New group"
 msgstr "Uusi ryhmä"
@@ -3406,52 +3412,77 @@ msgstr "Käyttäjän %s lähetetyt viestit"
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr "Tämä on postilaatikkosi, jossa on lähettämäsi yksityisviestit."
 
+#. TRANS: Title for page where to change password.
+#, fuzzy
+msgctxt "TITLE"
 msgid "Change password"
 msgstr "Vaihda salasana"
 
+#. TRANS: Instructions for page where to change password.
 msgid "Change your password."
 msgstr "Vaihda salasanasi."
 
+#. TRANS: Fieldset legend on page where to change password.
 #. TRANS: Fieldset legend for password reset form.
 msgid "Password change"
 msgstr "Salasanan vaihto"
 
+#. TRANS: Field label on page where to change password.
 msgid "Old password"
 msgstr "Vanha salasana"
 
+#. TRANS: Field label on page where to change password.
 #. TRANS: Field label for password reset form.
 msgid "New password"
 msgstr "Uusi salasana"
 
+#. TRANS: Field title on page where to change password.
 #, fuzzy
 msgid "6 or more characters."
 msgstr "6 tai useampia merkkejä"
 
+#. TRANS: Field label on page where to change password. In this field the new password should be typed a second time.
+#, fuzzy
+msgctxt "LABEL"
+msgid "Confirm"
+msgstr "Vahvista"
+
+#. TRANS: Field title on page where to change password.
 #. TRANS: Ttile for field label for password reset form where the password has to be typed again.
 #, fuzzy
 msgid "Same as password above."
 msgstr "Sama kuin ylläoleva salasana"
 
+#. TRANS: Button text on page where to change password.
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Change"
 msgstr "Vaihda"
 
+#. TRANS: Form validation error on page where to change password.
 msgid "Password must be 6 or more characters."
 msgstr "Salasanassa pitää olla 6 tai useampia merkkejä."
 
 msgid "Passwords don't match."
 msgstr "Salasanat eivät täsmää."
 
-msgid "Incorrect old password"
+#. TRANS: Form validation error on page where to change password.
+#, fuzzy
+msgid "Incorrect old password."
 msgstr "Väärä vanha salasana"
 
+#. TRANS: Form validation error on page where to change password.
 msgid "Error saving user; invalid."
 msgstr "Virhe tapahtui käyttäjän tallentamisessa; epäkelpo."
 
+#. TRANS: Server error displayed on page where to change password when password change
+#. TRANS: could not be made because of a server error.
 #. TRANS: Reset password form validation error message.
 #, fuzzy
 msgid "Cannot save new password."
 msgstr "Uutta salasanaa ei voida tallentaa."
 
+#. TRANS: Form validation notice on page where to change password.
 msgid "Password saved."
 msgstr "Salasana tallennettu."
 
@@ -3503,6 +3534,7 @@ msgstr "Kutsu"
 msgid "Server"
 msgstr "Palauta"
 
+#. TRANS: Field title in Paths admin panel.
 msgid "Site's server hostname."
 msgstr ""
 
@@ -3511,6 +3543,7 @@ msgstr ""
 msgid "Path"
 msgstr "Polut"
 
+#. TRANS: Field title in Paths admin panel.
 #, fuzzy
 msgid "Site path."
 msgstr "Palvelun ilmoitus"
@@ -3520,6 +3553,7 @@ msgstr "Palvelun ilmoitus"
 msgid "Locale directory"
 msgstr "Taustakuvan hakemisto"
 
+#. TRANS: Field title in Paths admin panel.
 msgid "Directory path to locales."
 msgstr ""
 
@@ -3527,9 +3561,12 @@ msgstr ""
 msgid "Fancy URLs"
 msgstr ""
 
-msgid "Use fancy (more readable and memorable) URLs?"
+#. TRANS: Field title in Paths admin panel.
+msgid "Use fancy URLs (more readable and memorable)?"
 msgstr ""
 
+#. TRANS: Fieldset legend in Paths admin panel.
+msgctxt "LEGEND"
 msgid "Theme"
 msgstr ""
 
@@ -3656,6 +3693,7 @@ msgstr ""
 
 #. TRANS: Fieldset legend in Paths admin panel.
 #, fuzzy
+msgctxt "LEGEND"
 msgid "SSL"
 msgstr "SMS"
 
@@ -3705,10 +3743,14 @@ msgstr ""
 msgid "People search"
 msgstr "Etsi ihmisiä"
 
+#. TRANS: Client error displayed when trying to tag a profile with an invalid tag.
+#. TRANS: %s is the invalid tag.
 #, php-format
 msgid "Not a valid people tag: %s."
 msgstr "Tuo ei ole kelvollinen sähköpostiosoite."
 
+#. TRANS: Page title for users with a certain self-tag.
+#. TRANS: %1$s is the tag, %2$s is the page number.
 #, fuzzy, php-format
 msgid "Users self-tagged with %1$s - page %2$d"
 msgstr "Käyttäjät joilla henkilötagi %s - sivu %d"
@@ -3718,15 +3760,19 @@ msgctxt "plugin"
 msgid "Disabled"
 msgstr ""
 
+#. TRANS: Client error displayed when trying to use another method than POST.
+#. TRANS: Do not translate POST.
 #. TRANS: Client error displayed trying to perform any request method other than POST.
 #. TRANS: Do not translate POST.
 msgid "This action only accepts POST requests."
 msgstr ""
 
+#. TRANS: Client error displayed when trying to enable or disable a plugin without access rights.
 #, fuzzy
 msgid "You cannot administer plugins."
 msgstr "Sinä et voi poistaa käyttäjiä."
 
+#. TRANS: Client error displayed when trying to enable or disable a non-existing plugin.
 #, fuzzy
 msgid "No such plugin."
 msgstr "Sivua ei ole."
@@ -3737,7 +3783,7 @@ msgid "Enabled"
 msgstr ""
 
 #. TRANS: Tab and title for plugins admin panel.
-#. TRANS: Menu item for site administration
+msgctxt "TITLE"
 msgid "Plugins"
 msgstr ""
 
@@ -3753,15 +3799,19 @@ msgstr ""
 msgid "Default plugins"
 msgstr "Ensisijainen kieli"
 
+#. TRANS: Text displayed on plugin admin page when no plugin are enabled.
 msgid ""
 "All default plugins have been disabled from the site's configuration file."
 msgstr ""
 
+#. TRANS: Client error displayed if the notice posted has too many characters.
 msgid "Invalid notice content."
 msgstr "Koko ei kelpaa."
 
+#. TRANS: Exception thrown if a notice's license is not compatible with the StatusNet site license.
+#. TRANS: %1$s is the notice license, %2$s is the StatusNet site's license.
 #, php-format
-msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’."
+msgid "Notice license \"%1$s\" is not compatible with site license \"%2$s\"."
 msgstr ""
 
 #. TRANS: Page title for profile settings.
@@ -3919,29 +3969,39 @@ msgstr "Asetukset tallennettu."
 msgid "Restore account"
 msgstr "Luo uusi ryhmä"
 
+#. TRANS: Client error displayed when requesting a public timeline page beyond the page limit.
+#. TRANS: %s is the page limit.
 #, php-format
 msgid "Beyond the page limit (%s)."
 msgstr ""
 
+#. TRANS: Server error displayed when a public timeline cannot be retrieved.
 msgid "Could not retrieve public stream."
 msgstr "Julkista päivitysvirtaa ei saatu."
 
+#. TRANS: Title for all public timeline pages but the first.
+#. TRANS: %d is the page number.
 #, php-format
 msgid "Public timeline, page %d"
 msgstr "Julkinen aikajana, sivu %d"
 
+#. TRANS: Title for the first public timeline page.
 msgid "Public timeline"
 msgstr "Julkinen aikajana"
 
+#. TRANS: Link description for public timeline feed.
 msgid "Public Stream Feed (RSS 1.0)"
 msgstr "Julkinen syöte (RSS 1.0)"
 
+#. TRANS: Link description for public timeline feed.
 msgid "Public Stream Feed (RSS 2.0)"
 msgstr "Julkisen Aikajanan Syöte (RSS 2.0)"
 
+#. TRANS: Link description for public timeline feed.
 msgid "Public Stream Feed (Atom)"
 msgstr "Julkinen syöte (Atom)"
 
+#. TRANS: Text displayed for public feed when there are no public notices.
 #, fuzzy, php-format
 msgid ""
 "This is the public timeline for %%site.name%% but no one has posted anything "
@@ -3950,14 +4010,18 @@ msgstr ""
 "Tämä on käyttäjän %s ja kavereiden aikajana, mutta kukaan ei ole lähettyänyt "
 "vielä mitään."
 
+#. TRANS: Additional text displayed for public feed when there are no public notices for a logged in user.
 msgid "Be the first to post!"
 msgstr "Ole ensimmäinen joka lähettää päivityksen!"
 
+#. TRANS: Additional text displayed for public feed when there are no public notices for a not logged in user.
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post!"
 msgstr ""
 
+#. TRANS: Message for not logged in users at an invite-only site trying to view the public feed of notices.
+#. TRANS: This message contains Markdown links. Please mind the formatting.
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -3966,6 +4030,8 @@ msgid ""
 "friends, family, and colleagues! ([Read more](%%doc.help%%))"
 msgstr ""
 
+#. TRANS: Message for not logged in users at a closed site trying to view the public feed of notices.
+#. TRANS: This message contains Markdown links. Please mind the formatting.
 #, fuzzy, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -5670,6 +5736,10 @@ msgid ""
 "along with this program.  If not, see %s."
 msgstr ""
 
+#. TRANS: Menu item for site administration
+msgid "Plugins"
+msgstr ""
+
 #. TRANS: Form input field label for application name.
 #, fuzzy
 msgid "Name"
@@ -6183,6 +6253,9 @@ msgstr "Komentoa ei ole vielä toteutettu."
 msgid "Unable to delete design setting."
 msgstr "Twitter-asetuksia ei voitu tallentaa!"
 
+msgid "Home"
+msgstr "Kotisivu"
+
 #. TRANS: Menu item title/tooltip
 #, fuzzy
 msgid "Basic site configuration"
@@ -6796,9 +6869,6 @@ msgstr "Kirjaudu sisään palveluun"
 msgid "Database error"
 msgstr "Tietokantavirhe"
 
-msgid "Home"
-msgstr "Kotisivu"
-
 msgid "Public"
 msgstr "Julkinen"
 
@@ -7527,7 +7597,6 @@ msgstr "Lähetä päivitys"
 msgid "What's up, %s?"
 msgstr "Mitä teet juuri nyt, %s?"
 
-#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr ""
 
@@ -7599,6 +7668,9 @@ msgstr "Poista tämä päivitys"
 msgid "Notice repeated"
 msgstr "Päivitys on poistettu."
 
+msgid "Update your status..."
+msgstr ""
+
 msgid "Nudge this user"
 msgstr "Tönäise tätä käyttäjää"
 
@@ -8123,11 +8195,3 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
-
-#, fuzzy
-#~ msgid "Friends timeline"
-#~ msgstr "%s aikajana"
-
-#, fuzzy
-#~ msgid "Everyone on this site"
-#~ msgstr "Hae ihmisiä tältä sivustolta"
diff --git a/locale/fr/LC_MESSAGES/statusnet.po b/locale/fr/LC_MESSAGES/statusnet.po
index 4006bd8157..f63f26d5f4 100644
--- a/locale/fr/LC_MESSAGES/statusnet.po
+++ b/locale/fr/LC_MESSAGES/statusnet.po
@@ -21,17 +21,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-08 01:03+0000\n"
-"PO-Revision-Date: 2011-03-08 01:05:12+0000\n"
+"POT-Creation-Date: 2011-03-11 18:15+0000\n"
+"PO-Revision-Date: 2011-03-11 18:17:07+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
+"X-Generator: MediaWiki 1.18alpha (r83703); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-POT-Import-Date: 2011-03-06 02:16:47+0000\n"
+"X-POT-Import-Date: 2011-03-08 01:25:01+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -1071,7 +1071,7 @@ msgstr "Ne peut gérer que les activités de publication."
 
 #. TRANS: Client exception thrown when trying favorite a notice without content.
 #, fuzzy
-msgid "Unknown note."
+msgid "Unknown notice."
 msgstr "Inconnu"
 
 #. TRANS: Client exception thrown when trying favorite an already favorited notice.
@@ -1659,6 +1659,7 @@ msgstr "Supprimer ce groupe"
 #. TRANS: Client error displayed trying to create a new direct message while not logged in.
 #. TRANS: Client error displayed trying to send a notice while not logged in.
 #. TRANS: Client error displayed trying to nudge a user without being logged in.
+#. TRANS: Client error displayed when trying to enable or disable a plugin while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
@@ -3187,6 +3188,10 @@ msgstr "L’URL source est requise."
 msgid "Could not create application."
 msgstr "Impossible de créer l’application."
 
+#, fuzzy
+msgid "Invalid image."
+msgstr "Taille incorrecte."
+
 #. TRANS: Title for form to create a group.
 msgid "New group"
 msgstr "Nouveau groupe"
@@ -3475,52 +3480,77 @@ msgid "This is your outbox, which lists private messages you have sent."
 msgstr ""
 "Cette boîte d’envoi regroupe les messages personnels que vous avez envoyés."
 
+#. TRANS: Title for page where to change password.
+#, fuzzy
+msgctxt "TITLE"
 msgid "Change password"
 msgstr "Changer de mot de passe"
 
+#. TRANS: Instructions for page where to change password.
 msgid "Change your password."
 msgstr "Modifier votre mot de passe."
 
+#. TRANS: Fieldset legend on page where to change password.
 #. TRANS: Fieldset legend for password reset form.
 msgid "Password change"
 msgstr "Modification du mot de passe"
 
+#. TRANS: Field label on page where to change password.
 msgid "Old password"
 msgstr "Ancien mot de passe"
 
+#. TRANS: Field label on page where to change password.
 #. TRANS: Field label for password reset form.
 msgid "New password"
 msgstr "Nouveau mot de passe"
 
+#. TRANS: Field title on page where to change password.
 #, fuzzy
 msgid "6 or more characters."
 msgstr "6 caractères ou plus"
 
+#. TRANS: Field label on page where to change password. In this field the new password should be typed a second time.
+#, fuzzy
+msgctxt "LABEL"
+msgid "Confirm"
+msgstr "Confirmer"
+
+#. TRANS: Field title on page where to change password.
 #. TRANS: Ttile for field label for password reset form where the password has to be typed again.
 #, fuzzy
 msgid "Same as password above."
 msgstr "Identique au mot de passe ci-dessus"
 
+#. TRANS: Button text on page where to change password.
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Change"
 msgstr "Modifier"
 
+#. TRANS: Form validation error on page where to change password.
 msgid "Password must be 6 or more characters."
 msgstr "Votre mot de passe doit contenir au moins 6 caractères."
 
 msgid "Passwords don't match."
 msgstr "Les mots de passe ne correspondent pas."
 
-msgid "Incorrect old password"
+#. TRANS: Form validation error on page where to change password.
+#, fuzzy
+msgid "Incorrect old password."
 msgstr "Ancien mot de passe incorrect"
 
+#. TRANS: Form validation error on page where to change password.
 msgid "Error saving user; invalid."
 msgstr "Erreur lors de l’enregistrement de l’utilisateur ; invalide."
 
+#. TRANS: Server error displayed on page where to change password when password change
+#. TRANS: could not be made because of a server error.
 #. TRANS: Reset password form validation error message.
 #, fuzzy
 msgid "Cannot save new password."
 msgstr "Impossible de sauvegarder le nouveau mot de passe."
 
+#. TRANS: Form validation notice on page where to change password.
 msgid "Password saved."
 msgstr "Mot de passe enregistré."
 
@@ -3570,6 +3600,7 @@ msgstr "Site"
 msgid "Server"
 msgstr "Serveur"
 
+#. TRANS: Field title in Paths admin panel.
 msgid "Site's server hostname."
 msgstr "Nom d’hôte du serveur du site."
 
@@ -3577,6 +3608,7 @@ msgstr "Nom d’hôte du serveur du site."
 msgid "Path"
 msgstr "Chemin"
 
+#. TRANS: Field title in Paths admin panel.
 msgid "Site path."
 msgstr "Chemin du site."
 
@@ -3584,6 +3616,7 @@ msgstr "Chemin du site."
 msgid "Locale directory"
 msgstr "Dossier des données de localisation"
 
+#. TRANS: Field title in Paths admin panel.
 msgid "Directory path to locales."
 msgstr "Chemin du dossier vers les paramètres régionaux."
 
@@ -3591,9 +3624,14 @@ msgstr "Chemin du dossier vers les paramètres régionaux."
 msgid "Fancy URLs"
 msgstr "Jolies URL"
 
-msgid "Use fancy (more readable and memorable) URLs?"
+#. TRANS: Field title in Paths admin panel.
+#, fuzzy
+msgid "Use fancy URLs (more readable and memorable)?"
 msgstr "Utiliser des jolies URL (plus lisibles et faciles à mémoriser) ?"
 
+#. TRANS: Fieldset legend in Paths admin panel.
+#, fuzzy
+msgctxt "LEGEND"
 msgid "Theme"
 msgstr "Thème"
 
@@ -3706,6 +3744,8 @@ msgid "Directory where attachments are located."
 msgstr "Le répertoire où les pièces jointes sont stockées."
 
 #. TRANS: Fieldset legend in Paths admin panel.
+#, fuzzy
+msgctxt "LEGEND"
 msgid "SSL"
 msgstr "SSL"
 
@@ -3751,10 +3791,14 @@ msgstr ""
 msgid "People search"
 msgstr "Recherche de personnes"
 
+#. TRANS: Client error displayed when trying to tag a profile with an invalid tag.
+#. TRANS: %s is the invalid tag.
 #, php-format
 msgid "Not a valid people tag: %s."
 msgstr "Cette marque est invalide : %s."
 
+#. TRANS: Page title for users with a certain self-tag.
+#. TRANS: %1$s is the tag, %2$s is the page number.
 #, php-format
 msgid "Users self-tagged with %1$s - page %2$d"
 msgstr "Utilisateurs marqués par eux-mêmes avec %1$s - page %2$d"
@@ -3764,15 +3808,19 @@ msgctxt "plugin"
 msgid "Disabled"
 msgstr ""
 
+#. TRANS: Client error displayed when trying to use another method than POST.
+#. TRANS: Do not translate POST.
 #. TRANS: Client error displayed trying to perform any request method other than POST.
 #. TRANS: Do not translate POST.
 msgid "This action only accepts POST requests."
 msgstr "Cette action n'accepte que les requêtes de type POST."
 
+#. TRANS: Client error displayed when trying to enable or disable a plugin without access rights.
 #, fuzzy
 msgid "You cannot administer plugins."
 msgstr "Vous ne pouvez pas supprimer des utilisateurs."
 
+#. TRANS: Client error displayed when trying to enable or disable a non-existing plugin.
 #, fuzzy
 msgid "No such plugin."
 msgstr "Page non trouvée."
@@ -3783,7 +3831,8 @@ msgid "Enabled"
 msgstr ""
 
 #. TRANS: Tab and title for plugins admin panel.
-#. TRANS: Menu item for site administration
+#, fuzzy
+msgctxt "TITLE"
 msgid "Plugins"
 msgstr "Extensions"
 
@@ -3799,15 +3848,19 @@ msgstr ""
 msgid "Default plugins"
 msgstr "Langue par défaut"
 
+#. TRANS: Text displayed on plugin admin page when no plugin are enabled.
 msgid ""
 "All default plugins have been disabled from the site's configuration file."
 msgstr ""
 
+#. TRANS: Client error displayed if the notice posted has too many characters.
 msgid "Invalid notice content."
 msgstr "Contenu de l’avis invalide."
 
-#, php-format
-msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’."
+#. TRANS: Exception thrown if a notice's license is not compatible with the StatusNet site license.
+#. TRANS: %1$s is the notice license, %2$s is the StatusNet site's license.
+#, fuzzy, php-format
+msgid "Notice license \"%1$s\" is not compatible with site license \"%2$s\"."
 msgstr ""
 "La licence des avis « %1$s » n’est pas compatible avec la licence du site « %2"
 "$s »."
@@ -3962,29 +4015,39 @@ msgstr "Préférences enregistrées."
 msgid "Restore account"
 msgstr "Créer un compte"
 
+#. TRANS: Client error displayed when requesting a public timeline page beyond the page limit.
+#. TRANS: %s is the page limit.
 #, php-format
 msgid "Beyond the page limit (%s)."
 msgstr "Au-delà de la limite de page (%s)."
 
+#. TRANS: Server error displayed when a public timeline cannot be retrieved.
 msgid "Could not retrieve public stream."
 msgstr "Impossible de récupérer le flux public."
 
+#. TRANS: Title for all public timeline pages but the first.
+#. TRANS: %d is the page number.
 #, php-format
 msgid "Public timeline, page %d"
 msgstr "Flux public - page %d"
 
+#. TRANS: Title for the first public timeline page.
 msgid "Public timeline"
 msgstr "Flux public"
 
+#. TRANS: Link description for public timeline feed.
 msgid "Public Stream Feed (RSS 1.0)"
 msgstr "Fil du flux public (RSS 1.0)"
 
+#. TRANS: Link description for public timeline feed.
 msgid "Public Stream Feed (RSS 2.0)"
 msgstr "Fil du flux public (RSS 2.0)"
 
+#. TRANS: Link description for public timeline feed.
 msgid "Public Stream Feed (Atom)"
 msgstr "Fil du flux public (Atom)"
 
+#. TRANS: Text displayed for public feed when there are no public notices.
 #, php-format
 msgid ""
 "This is the public timeline for %%site.name%% but no one has posted anything "
@@ -3993,9 +4056,11 @@ msgstr ""
 "Ceci est la chronologie publique de %%site.name%% mais personne n’a encore "
 "rien posté."
 
+#. TRANS: Additional text displayed for public feed when there are no public notices for a logged in user.
 msgid "Be the first to post!"
 msgstr "Soyez le premier à poster !"
 
+#. TRANS: Additional text displayed for public feed when there are no public notices for a not logged in user.
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post!"
@@ -4003,6 +4068,8 @@ msgstr ""
 "Pourquoi ne pas [créer un compte](%%action.register%%) et être le premier à "
 "poster !"
 
+#. TRANS: Message for not logged in users at an invite-only site trying to view the public feed of notices.
+#. TRANS: This message contains Markdown links. Please mind the formatting.
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -4016,6 +4083,8 @@ msgstr ""
 "vous avec vos amis, famille et collègues ! ([Plus d’informations](%%doc.help%"
 "%))"
 
+#. TRANS: Message for not logged in users at a closed site trying to view the public feed of notices.
+#. TRANS: This message contains Markdown links. Please mind the formatting.
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -5757,6 +5826,10 @@ msgstr ""
 "Vous avez dû recevoir une copie de la Licence Publique Générale GNU Affero "
 "avec ce programme. Si ce n’est pas le cas, consultez %s."
 
+#. TRANS: Menu item for site administration
+msgid "Plugins"
+msgstr "Extensions"
+
 #. TRANS: Form input field label for application name.
 msgid "Name"
 msgstr "Nom"
@@ -6267,6 +6340,9 @@ msgstr "saveSettings() n’a pas été implémentée."
 msgid "Unable to delete design setting."
 msgstr "Impossible de supprimer les paramètres de conception."
 
+msgid "Home"
+msgstr "Site personnel"
+
 #. TRANS: Menu item title/tooltip
 msgid "Basic site configuration"
 msgstr "Configuration basique du site"
@@ -6908,9 +6984,6 @@ msgstr "Aller au programme d’installation"
 msgid "Database error"
 msgstr "Erreur de la base de données"
 
-msgid "Home"
-msgstr "Site personnel"
-
 msgid "Public"
 msgstr "Public"
 
@@ -7721,7 +7794,6 @@ msgstr "Envoyer un avis"
 msgid "What's up, %s?"
 msgstr "Quoi de neuf, %s ?"
 
-#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr "Attacher"
 
@@ -7790,6 +7862,9 @@ msgstr "Supprimer cet avis"
 msgid "Notice repeated"
 msgstr "Avis repris"
 
+msgid "Update your status..."
+msgstr ""
+
 msgid "Nudge this user"
 msgstr "Envoyer un clin d’œil à cet utilisateur"
 
@@ -8301,11 +8376,3 @@ msgstr "XML invalide, racine XRD manquante."
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr "Obtention de la sauvegarde depuis le fichier « %s »."
-
-#, fuzzy
-#~ msgid "Friends timeline"
-#~ msgstr "Activité de %s"
-
-#, fuzzy
-#~ msgid "Everyone on this site"
-#~ msgstr "Chercher des personnes sur ce site"
diff --git a/locale/fur/LC_MESSAGES/statusnet.po b/locale/fur/LC_MESSAGES/statusnet.po
index 8935ca9b3a..12cca595ec 100644
--- a/locale/fur/LC_MESSAGES/statusnet.po
+++ b/locale/fur/LC_MESSAGES/statusnet.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-08 01:03+0000\n"
-"PO-Revision-Date: 2011-03-08 01:05:13+0000\n"
+"POT-Creation-Date: 2011-03-11 18:15+0000\n"
+"PO-Revision-Date: 2011-03-11 18:17:08+0000\n"
 "Language-Team: Friulian <http://translatewiki.net/wiki/Portal:fur>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-06 02:16:47+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
+"X-POT-Import-Date: 2011-03-08 01:25:01+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83703); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fur\n"
 "X-Message-Group: #out-statusnet-core\n"
@@ -1013,8 +1013,9 @@ msgid "Can only fave notices."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying favorite a notice without content.
-msgid "Unknown note."
-msgstr ""
+#, fuzzy
+msgid "Unknown notice."
+msgstr "Gnûf avîs"
 
 #. TRANS: Client exception thrown when trying favorite an already favorited notice.
 msgid "Already a favorite."
@@ -1563,6 +1564,7 @@ msgstr "Elimine chest grup."
 #. TRANS: Client error displayed trying to create a new direct message while not logged in.
 #. TRANS: Client error displayed trying to send a notice while not logged in.
 #. TRANS: Client error displayed trying to nudge a user without being logged in.
+#. TRANS: Client error displayed when trying to enable or disable a plugin while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
@@ -2981,6 +2983,10 @@ msgstr ""
 msgid "Could not create application."
 msgstr ""
 
+#, fuzzy
+msgid "Invalid image."
+msgstr "La dimension no je valide."
+
 #. TRANS: Title for form to create a group.
 msgid "New group"
 msgstr "Gnûf grup"
@@ -3256,49 +3262,74 @@ msgstr ""
 "Cheste e je la tô pueste in jessude, dulà che tu cjatis i messaçs privâts "
 "che tu âs mandât."
 
+#. TRANS: Title for page where to change password.
+#, fuzzy
+msgctxt "TITLE"
 msgid "Change password"
 msgstr "Cambie la password"
 
+#. TRANS: Instructions for page where to change password.
 msgid "Change your password."
 msgstr "Cambie la tô password"
 
+#. TRANS: Fieldset legend on page where to change password.
 #. TRANS: Fieldset legend for password reset form.
 msgid "Password change"
 msgstr "Cambiament di password"
 
+#. TRANS: Field label on page where to change password.
 msgid "Old password"
 msgstr "Vecje password"
 
+#. TRANS: Field label on page where to change password.
 #. TRANS: Field label for password reset form.
 msgid "New password"
 msgstr "Gnove password"
 
+#. TRANS: Field title on page where to change password.
 msgid "6 or more characters."
 msgstr "6 o plui caratars."
 
+#. TRANS: Field label on page where to change password. In this field the new password should be typed a second time.
+#, fuzzy
+msgctxt "LABEL"
+msgid "Confirm"
+msgstr "Conferme"
+
+#. TRANS: Field title on page where to change password.
 #. TRANS: Ttile for field label for password reset form where the password has to be typed again.
 msgid "Same as password above."
 msgstr "Compagn che la password parsore"
 
+#. TRANS: Button text on page where to change password.
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Change"
 msgstr "Cambie"
 
+#. TRANS: Form validation error on page where to change password.
 msgid "Password must be 6 or more characters."
 msgstr "La password e à di sei di sîs o plui caratars."
 
 msgid "Passwords don't match."
 msgstr "Lis passwords no corispuindin."
 
-msgid "Incorrect old password"
+#. TRANS: Form validation error on page where to change password.
+#, fuzzy
+msgid "Incorrect old password."
 msgstr "La vecje password e je sbaliade"
 
+#. TRANS: Form validation error on page where to change password.
 msgid "Error saving user; invalid."
 msgstr ""
 
+#. TRANS: Server error displayed on page where to change password when password change
+#. TRANS: could not be made because of a server error.
 #. TRANS: Reset password form validation error message.
 msgid "Cannot save new password."
 msgstr ""
 
+#. TRANS: Form validation notice on page where to change password.
 msgid "Password saved."
 msgstr "Password salvade"
 
@@ -3348,6 +3379,7 @@ msgstr "Sît"
 msgid "Server"
 msgstr "Servidôr"
 
+#. TRANS: Field title in Paths admin panel.
 msgid "Site's server hostname."
 msgstr ""
 
@@ -3355,6 +3387,7 @@ msgstr ""
 msgid "Path"
 msgstr ""
 
+#. TRANS: Field title in Paths admin panel.
 msgid "Site path."
 msgstr ""
 
@@ -3362,6 +3395,7 @@ msgstr ""
 msgid "Locale directory"
 msgstr ""
 
+#. TRANS: Field title in Paths admin panel.
 msgid "Directory path to locales."
 msgstr ""
 
@@ -3369,9 +3403,13 @@ msgstr ""
 msgid "Fancy URLs"
 msgstr ""
 
-msgid "Use fancy (more readable and memorable) URLs?"
+#. TRANS: Field title in Paths admin panel.
+msgid "Use fancy URLs (more readable and memorable)?"
 msgstr ""
 
+#. TRANS: Fieldset legend in Paths admin panel.
+#, fuzzy
+msgctxt "LEGEND"
 msgid "Theme"
 msgstr "Teme"
 
@@ -3484,6 +3522,8 @@ msgid "Directory where attachments are located."
 msgstr ""
 
 #. TRANS: Fieldset legend in Paths admin panel.
+#, fuzzy
+msgctxt "LEGEND"
 msgid "SSL"
 msgstr "SSL"
 
@@ -3528,10 +3568,14 @@ msgstr ""
 msgid "People search"
 msgstr "Cîr personis"
 
+#. TRANS: Client error displayed when trying to tag a profile with an invalid tag.
+#. TRANS: %s is the invalid tag.
 #, php-format
 msgid "Not a valid people tag: %s."
 msgstr ""
 
+#. TRANS: Page title for users with a certain self-tag.
+#. TRANS: %1$s is the tag, %2$s is the page number.
 #, php-format
 msgid "Users self-tagged with %1$s - page %2$d"
 msgstr ""
@@ -3541,14 +3585,18 @@ msgctxt "plugin"
 msgid "Disabled"
 msgstr ""
 
+#. TRANS: Client error displayed when trying to use another method than POST.
+#. TRANS: Do not translate POST.
 #. TRANS: Client error displayed trying to perform any request method other than POST.
 #. TRANS: Do not translate POST.
 msgid "This action only accepts POST requests."
 msgstr ""
 
+#. TRANS: Client error displayed when trying to enable or disable a plugin without access rights.
 msgid "You cannot administer plugins."
 msgstr ""
 
+#. TRANS: Client error displayed when trying to enable or disable a non-existing plugin.
 #, fuzzy
 msgid "No such plugin."
 msgstr "La pagjine no esist."
@@ -3559,7 +3607,7 @@ msgid "Enabled"
 msgstr ""
 
 #. TRANS: Tab and title for plugins admin panel.
-#. TRANS: Menu item for site administration
+msgctxt "TITLE"
 msgid "Plugins"
 msgstr ""
 
@@ -3575,15 +3623,19 @@ msgstr ""
 msgid "Default plugins"
 msgstr "Lenghe predeterminade"
 
+#. TRANS: Text displayed on plugin admin page when no plugin are enabled.
 msgid ""
 "All default plugins have been disabled from the site's configuration file."
 msgstr ""
 
+#. TRANS: Client error displayed if the notice posted has too many characters.
 msgid "Invalid notice content."
 msgstr ""
 
+#. TRANS: Exception thrown if a notice's license is not compatible with the StatusNet site license.
+#. TRANS: %1$s is the notice license, %2$s is the StatusNet site's license.
 #, php-format
-msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’."
+msgid "Notice license \"%1$s\" is not compatible with site license \"%2$s\"."
 msgstr ""
 
 #. TRANS: Page title for profile settings.
@@ -3725,43 +3777,57 @@ msgstr "Impuestazions salvadis."
 msgid "Restore account"
 msgstr ""
 
+#. TRANS: Client error displayed when requesting a public timeline page beyond the page limit.
+#. TRANS: %s is the page limit.
 #, php-format
 msgid "Beyond the page limit (%s)."
 msgstr ""
 
+#. TRANS: Server error displayed when a public timeline cannot be retrieved.
 msgid "Could not retrieve public stream."
 msgstr ""
 
+#. TRANS: Title for all public timeline pages but the first.
+#. TRANS: %d is the page number.
 #, php-format
 msgid "Public timeline, page %d"
 msgstr "Ativitât publiche, pagjine %d"
 
+#. TRANS: Title for the first public timeline page.
 msgid "Public timeline"
 msgstr "Ativitât publiche"
 
+#. TRANS: Link description for public timeline feed.
 msgid "Public Stream Feed (RSS 1.0)"
 msgstr "Canâl de ativitât publiche (RSS 1.0)"
 
+#. TRANS: Link description for public timeline feed.
 msgid "Public Stream Feed (RSS 2.0)"
 msgstr "Canâl de ativitât publiche (RSS 2.0)"
 
+#. TRANS: Link description for public timeline feed.
 msgid "Public Stream Feed (Atom)"
 msgstr "Canâl de ativitât publiche (Atom)"
 
+#. TRANS: Text displayed for public feed when there are no public notices.
 #, php-format
 msgid ""
 "This is the public timeline for %%site.name%% but no one has posted anything "
 "yet."
 msgstr ""
 
+#. TRANS: Additional text displayed for public feed when there are no public notices for a logged in user.
 msgid "Be the first to post!"
 msgstr ""
 
+#. TRANS: Additional text displayed for public feed when there are no public notices for a not logged in user.
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post!"
 msgstr ""
 
+#. TRANS: Message for not logged in users at an invite-only site trying to view the public feed of notices.
+#. TRANS: This message contains Markdown links. Please mind the formatting.
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -3774,6 +3840,8 @@ msgstr ""
 "net/). [Unissiti cumò](%%action.register%%) par condividi chel che tu fasis "
 "cun amîs, famee e companie! ([Altris informazions](%%doc.help%%))"
 
+#. TRANS: Message for not logged in users at a closed site trying to view the public feed of notices.
+#. TRANS: This message contains Markdown links. Please mind the formatting.
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -5370,6 +5438,10 @@ msgstr ""
 "Tu varessis di vê ricevût une copie de GNU Affero General Public License "
 "insieme cun chest program. Se nol è cussì, cjale %s."
 
+#. TRANS: Menu item for site administration
+msgid "Plugins"
+msgstr ""
+
 #. TRANS: Form input field label for application name.
 msgid "Name"
 msgstr "Non"
@@ -5860,6 +5932,10 @@ msgstr ""
 msgid "Unable to delete design setting."
 msgstr ""
 
+#, fuzzy
+msgid "Home"
+msgstr "Pagjine web"
+
 #. TRANS: Menu item title/tooltip
 msgid "Basic site configuration"
 msgstr ""
@@ -6444,10 +6520,6 @@ msgstr ""
 msgid "Database error"
 msgstr "Erôr de base di dâts"
 
-#, fuzzy
-msgid "Home"
-msgstr "Pagjine web"
-
 msgid "Public"
 msgstr "Public"
 
@@ -7137,7 +7209,6 @@ msgstr "Mande un avîs"
 msgid "What's up, %s?"
 msgstr "Ce sucedial, %s?"
 
-#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr "Aleghe"
 
@@ -7204,6 +7275,9 @@ msgstr "Elimine chest avîs"
 msgid "Notice repeated"
 msgstr "Avîs ripetût"
 
+msgid "Update your status..."
+msgstr ""
+
 msgid "Nudge this user"
 msgstr ""
 
@@ -7713,11 +7787,3 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
-
-#, fuzzy
-#~ msgid "Friends timeline"
-#~ msgstr "Ativitât di %s"
-
-#, fuzzy
-#~ msgid "Everyone on this site"
-#~ msgstr "Cjate int in chest sît"
diff --git a/locale/gl/LC_MESSAGES/statusnet.po b/locale/gl/LC_MESSAGES/statusnet.po
index 82a1934778..f189cd13b7 100644
--- a/locale/gl/LC_MESSAGES/statusnet.po
+++ b/locale/gl/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-03-08 01:03+0000\n"
-"PO-Revision-Date: 2011-03-08 01:05:14+0000\n"
+"POT-Creation-Date: 2011-03-11 18:15+0000\n"
+"PO-Revision-Date: 2011-03-11 18:17:09+0000\n"
 "Language-Team: Galician <http://translatewiki.net/wiki/Portal:gl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
+"X-Generator: MediaWiki 1.18alpha (r83703); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: gl\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-03-06 02:16:47+0000\n"
+"X-POT-Import-Date: 2011-03-08 01:25:01+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -1050,7 +1050,7 @@ msgstr "Buscar nos contidos das notas"
 
 #. TRANS: Client exception thrown when trying favorite a notice without content.
 #, fuzzy
-msgid "Unknown note."
+msgid "Unknown notice."
 msgstr "Descoñecida"
 
 #. TRANS: Client exception thrown when trying favorite an already favorited notice.
@@ -1639,6 +1639,7 @@ msgstr "Borrar o usuario"
 #. TRANS: Client error displayed trying to create a new direct message while not logged in.
 #. TRANS: Client error displayed trying to send a notice while not logged in.
 #. TRANS: Client error displayed trying to nudge a user without being logged in.
+#. TRANS: Client error displayed when trying to enable or disable a plugin while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
@@ -3164,6 +3165,10 @@ msgstr "Necesítase o URL de orixe."
 msgid "Could not create application."
 msgstr "Non se puido crear a aplicación."
 
+#, fuzzy
+msgid "Invalid image."
+msgstr "Tamaño non válido."
+
 #. TRANS: Title for form to create a group.
 msgid "New group"
 msgstr "Novo grupo"
@@ -3447,52 +3452,77 @@ msgid "This is your outbox, which lists private messages you have sent."
 msgstr ""
 "Esta é a súa caixa de saída. Nela lístanse as mensaxes privadas que enviou."
 
+#. TRANS: Title for page where to change password.
+#, fuzzy
+msgctxt "TITLE"
 msgid "Change password"
 msgstr "Cambiar o contrasinal"
 
+#. TRANS: Instructions for page where to change password.
 msgid "Change your password."
 msgstr "Cambiar o seu contrasinal."
 
+#. TRANS: Fieldset legend on page where to change password.
 #. TRANS: Fieldset legend for password reset form.
 msgid "Password change"
 msgstr "Cambio de contrasinal"
 
+#. TRANS: Field label on page where to change password.
 msgid "Old password"
 msgstr "Contrasinal anterior"
 
+#. TRANS: Field label on page where to change password.
 #. TRANS: Field label for password reset form.
 msgid "New password"
 msgstr "Novo contrasinal"
 
+#. TRANS: Field title on page where to change password.
 #, fuzzy
 msgid "6 or more characters."
 msgstr "Seis ou máis caracteres"
 
+#. TRANS: Field label on page where to change password. In this field the new password should be typed a second time.
+#, fuzzy
+msgctxt "LABEL"
+msgid "Confirm"
+msgstr "Confirmar"
+
+#. TRANS: Field title on page where to change password.
 #. TRANS: Ttile for field label for password reset form where the password has to be typed again.
 #, fuzzy
 msgid "Same as password above."
 msgstr "Igual ao contrasinal anterior"
 
+#. TRANS: Button text on page where to change password.
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Change"
 msgstr "Cambiar"
 
+#. TRANS: Form validation error on page where to change password.
 msgid "Password must be 6 or more characters."
 msgstr "O contrasinal debe conter seis ou máis caracteres."
 
 msgid "Passwords don't match."
 msgstr "Os contrasinais non coinciden."
 
-msgid "Incorrect old password"
+#. TRANS: Form validation error on page where to change password.
+#, fuzzy
+msgid "Incorrect old password."
 msgstr "O contrasinal anterior non é correcto"
 
+#. TRANS: Form validation error on page where to change password.
 msgid "Error saving user; invalid."
 msgstr "Houbo un erro ao gardar o usuario. Incorrecto."
 
+#. TRANS: Server error displayed on page where to change password when password change
+#. TRANS: could not be made because of a server error.
 #. TRANS: Reset password form validation error message.
 #, fuzzy
 msgid "Cannot save new password."
 msgstr "Non se puido gardar o novo contrasinal."
 
+#. TRANS: Form validation notice on page where to change password.
 msgid "Password saved."
 msgstr "Gardouse o contrasinal."
 
@@ -3542,6 +3572,7 @@ msgstr "Sitio"
 msgid "Server"
 msgstr "Servidor"
 
+#. TRANS: Field title in Paths admin panel.
 msgid "Site's server hostname."
 msgstr "Nome do servidor do sitio."
 
@@ -3549,6 +3580,7 @@ msgstr "Nome do servidor do sitio."
 msgid "Path"
 msgstr "Ruta"
 
+#. TRANS: Field title in Paths admin panel.
 msgid "Site path."
 msgstr "Ruta do sitio."
 
@@ -3556,6 +3588,7 @@ msgstr "Ruta do sitio."
 msgid "Locale directory"
 msgstr "Directorio das traducións"
 
+#. TRANS: Field title in Paths admin panel.
 msgid "Directory path to locales."
 msgstr "Ruta do directorio das traducións."
 
@@ -3563,9 +3596,14 @@ msgstr "Ruta do directorio das traducións."
 msgid "Fancy URLs"
 msgstr "Enderezos URL elegantes"
 
-msgid "Use fancy (more readable and memorable) URLs?"
+#. TRANS: Field title in Paths admin panel.
+#, fuzzy
+msgid "Use fancy URLs (more readable and memorable)?"
 msgstr "Quere utilizar os enderezos URL elegantes (mellores de ler e lembrar)?"
 
+#. TRANS: Fieldset legend in Paths admin panel.
+#, fuzzy
+msgctxt "LEGEND"
 msgid "Theme"
 msgstr "Tema visual"
 
@@ -3689,6 +3727,8 @@ msgid "Directory where attachments are located."
 msgstr "Ruta do directorio das traducións"
 
 #. TRANS: Fieldset legend in Paths admin panel.
+#, fuzzy
+msgctxt "LEGEND"
 msgid "SSL"
 msgstr "SSL"
 
@@ -3735,10 +3775,14 @@ msgstr ""
 msgid "People search"
 msgstr "Busca de xente"
 
+#. TRANS: Client error displayed when trying to tag a profile with an invalid tag.
+#. TRANS: %s is the invalid tag.
 #, php-format
 msgid "Not a valid people tag: %s."
 msgstr "A etiqueta de persoa non é correcta: %s."
 
+#. TRANS: Page title for users with a certain self-tag.
+#. TRANS: %1$s is the tag, %2$s is the page number.
 #, php-format
 msgid "Users self-tagged with %1$s - page %2$d"
 msgstr "Usuarios etiquetados por si mesmos con %1$s - páxina %2$d"
@@ -3748,15 +3792,19 @@ msgctxt "plugin"
 msgid "Disabled"
 msgstr ""
 
+#. TRANS: Client error displayed when trying to use another method than POST.
+#. TRANS: Do not translate POST.
 #. TRANS: Client error displayed trying to perform any request method other than POST.
 #. TRANS: Do not translate POST.
 msgid "This action only accepts POST requests."
 msgstr "Esta acción só permite solicitudes POST."
 
+#. TRANS: Client error displayed when trying to enable or disable a plugin without access rights.
 #, fuzzy
 msgid "You cannot administer plugins."
 msgstr "Non pode borrar usuarios."
 
+#. TRANS: Client error displayed when trying to enable or disable a non-existing plugin.
 #, fuzzy
 msgid "No such plugin."
 msgstr "Esa páxina non existe."
@@ -3767,7 +3815,8 @@ msgid "Enabled"
 msgstr ""
 
 #. TRANS: Tab and title for plugins admin panel.
-#. TRANS: Menu item for site administration
+#, fuzzy
+msgctxt "TITLE"
 msgid "Plugins"
 msgstr "Complementos"
 
@@ -3783,15 +3832,19 @@ msgstr ""
 msgid "Default plugins"
 msgstr "Lingua por defecto"
 
+#. TRANS: Text displayed on plugin admin page when no plugin are enabled.
 msgid ""
 "All default plugins have been disabled from the site's configuration file."
 msgstr ""
 
+#. TRANS: Client error displayed if the notice posted has too many characters.
 msgid "Invalid notice content."
 msgstr "O contido da nota é incorrecto."
 
-#, php-format
-msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’."
+#. TRANS: Exception thrown if a notice's license is not compatible with the StatusNet site license.
+#. TRANS: %1$s is the notice license, %2$s is the StatusNet site's license.
+#, fuzzy, php-format
+msgid "Notice license \"%1$s\" is not compatible with site license \"%2$s\"."
 msgstr ""
 "A licenza \"%1$s\" da nota non é compatible coa licenza \"%2$s\" do sitio."
 
@@ -3949,29 +4002,39 @@ msgstr "Gardouse a configuración."
 msgid "Restore account"
 msgstr "Crear unha conta"
 
+#. TRANS: Client error displayed when requesting a public timeline page beyond the page limit.
+#. TRANS: %s is the page limit.
 #, php-format
 msgid "Beyond the page limit (%s)."
 msgstr "Alén do límite da páxina (%s)."
 
+#. TRANS: Server error displayed when a public timeline cannot be retrieved.
 msgid "Could not retrieve public stream."
 msgstr "Non se puido obter o fluxo público."
 
+#. TRANS: Title for all public timeline pages but the first.
+#. TRANS: %d is the page number.
 #, php-format
 msgid "Public timeline, page %d"
 msgstr "Liña do tempo pública, páxina %d"
 
+#. TRANS: Title for the first public timeline page.
 msgid "Public timeline"
 msgstr "Liña do tempo pública"
 
+#. TRANS: Link description for public timeline feed.
 msgid "Public Stream Feed (RSS 1.0)"
 msgstr "Fonte de novas no fluxo público (RSS 1.0)"
 
+#. TRANS: Link description for public timeline feed.
 msgid "Public Stream Feed (RSS 2.0)"
 msgstr "Fonte de novas no fluxo público (RSS 2.0)"
 
+#. TRANS: Link description for public timeline feed.
 msgid "Public Stream Feed (Atom)"
 msgstr "Fonte de novas no fluxo público (Atom)"
 
+#. TRANS: Text displayed for public feed when there are no public notices.
 #, php-format
 msgid ""
 "This is the public timeline for %%site.name%% but no one has posted anything "
@@ -3980,9 +4043,11 @@ msgstr ""
 "Esta é a liña do tempo pública para %%site.name%% pero ninguén publicou nada "
 "aínda."
 
+#. TRANS: Additional text displayed for public feed when there are no public notices for a logged in user.
 msgid "Be the first to post!"
 msgstr "Sexa o primeiro en publicar!"
 
+#. TRANS: Additional text displayed for public feed when there are no public notices for a not logged in user.
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post!"
@@ -3990,6 +4055,8 @@ msgstr ""
 "Por que non [rexistrar unha conta](%%action.register%%) e ser o primeiro en "
 "publicar?"
 
+#. TRANS: Message for not logged in users at an invite-only site trying to view the public feed of notices.
+#. TRANS: This message contains Markdown links. Please mind the formatting.
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -4003,6 +4070,8 @@ msgstr ""
 "register%%) para compartir notas persoais cos amigos, a familia e os "
 "compañeiros! ([Máis información](%%doc.help%%))"
 
+#. TRANS: Message for not logged in users at a closed site trying to view the public feed of notices.
+#. TRANS: This message contains Markdown links. Please mind the formatting.
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -5742,6 +5811,10 @@ msgstr ""
 "Debeu recibir unha copia da Licenza Pública Xeral Affero de GNU xunto co "
 "programa. En caso contrario, vexa %s."
 
+#. TRANS: Menu item for site administration
+msgid "Plugins"
+msgstr "Complementos"
+
 #. TRANS: Form input field label for application name.
 msgid "Name"
 msgstr "Nome"
@@ -6250,6 +6323,10 @@ msgstr "saveSettings() non está integrado."
 msgid "Unable to delete design setting."
 msgstr "Non se puido borrar a configuración do deseño."
 
+#, fuzzy
+msgid "Home"
+msgstr "Páxina persoal"
+
 #. TRANS: Menu item title/tooltip
 msgid "Basic site configuration"
 msgstr "Configuración básica do sitio"
@@ -6891,10 +6968,6 @@ msgstr "Ir ao instalador."
 msgid "Database error"
 msgstr "Houbo un erro na base de datos"
 
-#, fuzzy
-msgid "Home"
-msgstr "Páxina persoal"
-
 msgid "Public"
 msgstr "Públicas"
 
@@ -7708,7 +7781,6 @@ msgstr "Enviar unha nota"
 msgid "What's up, %s?"
 msgstr "Que hai de novo, %s?"
 
-#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr "Anexar"
 
@@ -7777,6 +7849,9 @@ msgstr "Borrar esta nota"
 msgid "Notice repeated"
 msgstr "Repetiuse a nota"
 
+msgid "Update your status..."
+msgstr ""
+
 msgid "Nudge this user"
 msgstr "Facerlle un aceno a este usuario"
 
@@ -8294,11 +8369,3 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
-
-#, fuzzy
-#~ msgid "Friends timeline"
-#~ msgstr "Liña do tempo de %s"
-
-#, fuzzy
-#~ msgid "Everyone on this site"
-#~ msgstr "Atopar xente neste sitio"
diff --git a/locale/hsb/LC_MESSAGES/statusnet.po b/locale/hsb/LC_MESSAGES/statusnet.po
index a5b1dc4d09..c878043d4b 100644
--- a/locale/hsb/LC_MESSAGES/statusnet.po
+++ b/locale/hsb/LC_MESSAGES/statusnet.po
@@ -11,18 +11,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-08 01:03+0000\n"
-"PO-Revision-Date: 2011-03-08 01:05:15+0000\n"
+"POT-Creation-Date: 2011-03-11 18:15+0000\n"
+"PO-Revision-Date: 2011-03-11 18:17:10+0000\n"
 "Language-Team: Upper Sorbian <http://translatewiki.net/wiki/Portal:hsb>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
+"X-Generator: MediaWiki 1.18alpha (r83703); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: hsb\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : (n%100==3 || "
 "n%100==4) ? 2 : 3)\n"
-"X-POT-Import-Date: 2011-03-06 02:16:47+0000\n"
+"X-POT-Import-Date: 2011-03-08 01:25:01+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -1027,7 +1027,8 @@ msgid "Can only fave notices."
 msgstr "Jenož zdźělenki dadźa so jako fawority składować."
 
 #. TRANS: Client exception thrown when trying favorite a notice without content.
-msgid "Unknown note."
+#, fuzzy
+msgid "Unknown notice."
 msgstr "Njeznata notica."
 
 #. TRANS: Client exception thrown when trying favorite an already favorited notice.
@@ -1581,6 +1582,7 @@ msgstr "Tutu skupinu zhašeć."
 #. TRANS: Client error displayed trying to create a new direct message while not logged in.
 #. TRANS: Client error displayed trying to send a notice while not logged in.
 #. TRANS: Client error displayed trying to nudge a user without being logged in.
+#. TRANS: Client error displayed when trying to enable or disable a plugin while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
@@ -3008,6 +3010,10 @@ msgstr "Žórłowy URL je trěbny."
 msgid "Could not create application."
 msgstr "Aplikacija njeda so wutworić."
 
+#, fuzzy
+msgid "Invalid image."
+msgstr "Njepłaćiwa wulkosć."
+
 #. TRANS: Title for form to create a group.
 msgid "New group"
 msgstr "Nowa skupina"
@@ -3282,49 +3288,74 @@ msgstr ""
 "To je twój wuchadny póst, kotryž twoje priwatne powěsće nalistuje, kotrež sy "
 "pósłał."
 
+#. TRANS: Title for page where to change password.
+#, fuzzy
+msgctxt "TITLE"
 msgid "Change password"
 msgstr "Hesło změnić"
 
+#. TRANS: Instructions for page where to change password.
 msgid "Change your password."
 msgstr "Změń swoje hesło."
 
+#. TRANS: Fieldset legend on page where to change password.
 #. TRANS: Fieldset legend for password reset form.
 msgid "Password change"
 msgstr "Hesło změnjene"
 
+#. TRANS: Field label on page where to change password.
 msgid "Old password"
 msgstr "Stare hesło"
 
+#. TRANS: Field label on page where to change password.
 #. TRANS: Field label for password reset form.
 msgid "New password"
 msgstr "Nowe hesło"
 
+#. TRANS: Field title on page where to change password.
 msgid "6 or more characters."
 msgstr "6 abo wjace znamješkow."
 
+#. TRANS: Field label on page where to change password. In this field the new password should be typed a second time.
+#, fuzzy
+msgctxt "LABEL"
+msgid "Confirm"
+msgstr "Wobkrućić"
+
+#. TRANS: Field title on page where to change password.
 #. TRANS: Ttile for field label for password reset form where the password has to be typed again.
 msgid "Same as password above."
 msgstr "Samsne hesło kaž horjeka."
 
+#. TRANS: Button text on page where to change password.
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Change"
 msgstr "Změnić"
 
+#. TRANS: Form validation error on page where to change password.
 msgid "Password must be 6 or more characters."
 msgstr "Hesło dyrbi 6 abo wjace znamješkow měć."
 
 msgid "Passwords don't match."
 msgstr "Hesle so njekryjetej."
 
-msgid "Incorrect old password"
+#. TRANS: Form validation error on page where to change password.
+#, fuzzy
+msgid "Incorrect old password."
 msgstr "Wopačne stare hesło"
 
+#. TRANS: Form validation error on page where to change password.
 msgid "Error saving user; invalid."
 msgstr "Zmylk při składowanju wužiwarja; njepłaćiwy."
 
+#. TRANS: Server error displayed on page where to change password when password change
+#. TRANS: could not be made because of a server error.
 #. TRANS: Reset password form validation error message.
 msgid "Cannot save new password."
 msgstr "Nowe hesło njeda so składować."
 
+#. TRANS: Form validation notice on page where to change password.
 msgid "Password saved."
 msgstr "Hesło składowane."
 
@@ -3374,6 +3405,7 @@ msgstr "Sydło"
 msgid "Server"
 msgstr "Serwer"
 
+#. TRANS: Field title in Paths admin panel.
 msgid "Site's server hostname."
 msgstr "Serwerowe mjeno sydła"
 
@@ -3381,6 +3413,7 @@ msgstr "Serwerowe mjeno sydła"
 msgid "Path"
 msgstr "Šćežka"
 
+#. TRANS: Field title in Paths admin panel.
 msgid "Site path."
 msgstr "Sydłowa šćežka."
 
@@ -3388,6 +3421,7 @@ msgstr "Sydłowa šćežka."
 msgid "Locale directory"
 msgstr "Zapis lokalow"
 
+#. TRANS: Field title in Paths admin panel.
 msgid "Directory path to locales."
 msgstr "Zapisowa šćežka k lokalam."
 
@@ -3395,9 +3429,13 @@ msgstr "Zapisowa šćežka k lokalam."
 msgid "Fancy URLs"
 msgstr "Šikwane URL"
 
-msgid "Use fancy (more readable and memorable) URLs?"
+#. TRANS: Field title in Paths admin panel.
+msgid "Use fancy URLs (more readable and memorable)?"
 msgstr ""
 
+#. TRANS: Fieldset legend in Paths admin panel.
+#, fuzzy
+msgctxt "LEGEND"
 msgid "Theme"
 msgstr "Šat"
 
@@ -3510,6 +3548,8 @@ msgid "Directory where attachments are located."
 msgstr "Zapis, hdźež přiwěški su."
 
 #. TRANS: Fieldset legend in Paths admin panel.
+#, fuzzy
+msgctxt "LEGEND"
 msgid "SSL"
 msgstr "SSL"
 
@@ -3552,10 +3592,14 @@ msgstr ""
 msgid "People search"
 msgstr "Za ludźimi pytać"
 
+#. TRANS: Client error displayed when trying to tag a profile with an invalid tag.
+#. TRANS: %s is the invalid tag.
 #, php-format
 msgid "Not a valid people tag: %s."
 msgstr "Njepłaćiwa wosobowa taflička: %s."
 
+#. TRANS: Page title for users with a certain self-tag.
+#. TRANS: %1$s is the tag, %2$s is the page number.
 #, php-format
 msgid "Users self-tagged with %1$s - page %2$d"
 msgstr ""
@@ -3565,15 +3609,19 @@ msgctxt "plugin"
 msgid "Disabled"
 msgstr ""
 
+#. TRANS: Client error displayed when trying to use another method than POST.
+#. TRANS: Do not translate POST.
 #. TRANS: Client error displayed trying to perform any request method other than POST.
 #. TRANS: Do not translate POST.
 msgid "This action only accepts POST requests."
 msgstr ""
 
+#. TRANS: Client error displayed when trying to enable or disable a plugin without access rights.
 #, fuzzy
 msgid "You cannot administer plugins."
 msgstr "Njemóžeš wužiwarjow wušmórnyć."
 
+#. TRANS: Client error displayed when trying to enable or disable a non-existing plugin.
 #, fuzzy
 msgid "No such plugin."
 msgstr "Strona njeeksistuje."
@@ -3584,7 +3632,8 @@ msgid "Enabled"
 msgstr ""
 
 #. TRANS: Tab and title for plugins admin panel.
-#. TRANS: Menu item for site administration
+#, fuzzy
+msgctxt "TITLE"
 msgid "Plugins"
 msgstr "Tykače"
 
@@ -3600,15 +3649,19 @@ msgstr ""
 msgid "Default plugins"
 msgstr "Standardna rěč"
 
+#. TRANS: Text displayed on plugin admin page when no plugin are enabled.
 msgid ""
 "All default plugins have been disabled from the site's configuration file."
 msgstr ""
 
+#. TRANS: Client error displayed if the notice posted has too many characters.
 msgid "Invalid notice content."
 msgstr "Njepłaćiwy wobsah zdźělenki."
 
+#. TRANS: Exception thrown if a notice's license is not compatible with the StatusNet site license.
+#. TRANS: %1$s is the notice license, %2$s is the StatusNet site's license.
 #, php-format
-msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’."
+msgid "Notice license \"%1$s\" is not compatible with site license \"%2$s\"."
 msgstr ""
 
 #. TRANS: Page title for profile settings.
@@ -3757,43 +3810,57 @@ msgstr "Nastajenja składowane."
 msgid "Restore account"
 msgstr "Konto wobnowić"
 
+#. TRANS: Client error displayed when requesting a public timeline page beyond the page limit.
+#. TRANS: %s is the page limit.
 #, php-format
 msgid "Beyond the page limit (%s)."
 msgstr "Limit stronow (%s) překročeny."
 
+#. TRANS: Server error displayed when a public timeline cannot be retrieved.
 msgid "Could not retrieve public stream."
 msgstr "Zjawny prud njeda so wotwołać."
 
+#. TRANS: Title for all public timeline pages but the first.
+#. TRANS: %d is the page number.
 #, php-format
 msgid "Public timeline, page %d"
 msgstr "Zjawna časowa lajsta, strona %d"
 
+#. TRANS: Title for the first public timeline page.
 msgid "Public timeline"
 msgstr ""
 
+#. TRANS: Link description for public timeline feed.
 msgid "Public Stream Feed (RSS 1.0)"
 msgstr "Kanal zjawneho pruda (RSS 1.0)"
 
+#. TRANS: Link description for public timeline feed.
 msgid "Public Stream Feed (RSS 2.0)"
 msgstr "Kanal zjawneho pruda (RSS 2.0)"
 
+#. TRANS: Link description for public timeline feed.
 msgid "Public Stream Feed (Atom)"
 msgstr "Kanal zjawneho pruda (Atom)"
 
+#. TRANS: Text displayed for public feed when there are no public notices.
 #, php-format
 msgid ""
 "This is the public timeline for %%site.name%% but no one has posted anything "
 "yet."
 msgstr ""
 
+#. TRANS: Additional text displayed for public feed when there are no public notices for a logged in user.
 msgid "Be the first to post!"
 msgstr "Budź prěni, kiž něšto pisa!"
 
+#. TRANS: Additional text displayed for public feed when there are no public notices for a not logged in user.
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post!"
 msgstr ""
 
+#. TRANS: Message for not logged in users at an invite-only site trying to view the public feed of notices.
+#. TRANS: This message contains Markdown links. Please mind the formatting.
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -3802,6 +3869,8 @@ msgid ""
 "friends, family, and colleagues! ([Read more](%%doc.help%%))"
 msgstr ""
 
+#. TRANS: Message for not logged in users at a closed site trying to view the public feed of notices.
+#. TRANS: This message contains Markdown links. Please mind the formatting.
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -5365,6 +5434,10 @@ msgid ""
 "along with this program.  If not, see %s."
 msgstr ""
 
+#. TRANS: Menu item for site administration
+msgid "Plugins"
+msgstr "Tykače"
+
 #. TRANS: Form input field label for application name.
 msgid "Name"
 msgstr "Mjeno"
@@ -5852,6 +5925,10 @@ msgstr "saveSettings() njeimplementowany."
 msgid "Unable to delete design setting."
 msgstr "Njeje móžno, designowe nastajenje zhašeć."
 
+#, fuzzy
+msgid "Home"
+msgstr "Startowa strona"
+
 #. TRANS: Menu item title/tooltip
 msgid "Basic site configuration"
 msgstr "Zakładna sydłowa konfiguracija"
@@ -6455,10 +6532,6 @@ msgstr "K instalaciji"
 msgid "Database error"
 msgstr "Zmylk w datowej bance"
 
-#, fuzzy
-msgid "Home"
-msgstr "Startowa strona"
-
 msgid "Public"
 msgstr "Zjawny"
 
@@ -7176,7 +7249,6 @@ msgstr "Zdźělenku pósłać"
 msgid "What's up, %s?"
 msgstr "Što je, %s?"
 
-#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr "Připowěsnyć"
 
@@ -7243,6 +7315,9 @@ msgstr "Tutu zdźělenku wušmórnyć"
 msgid "Notice repeated"
 msgstr "Zdźělenka wospjetowana"
 
+msgid "Update your status..."
+msgstr ""
+
 msgid "Nudge this user"
 msgstr "Tutoho wužiwarja storčić"
 
@@ -7761,7 +7836,3 @@ msgstr "Njepłaćiwy XML, korjeń XRD faluje."
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr "Wobstaruje so zawěsćenje z dataje \"%s\"-"
-
-#, fuzzy
-#~ msgid "Everyone on this site"
-#~ msgstr "Ludźi na tutym sydle pytać"
diff --git a/locale/hu/LC_MESSAGES/statusnet.po b/locale/hu/LC_MESSAGES/statusnet.po
index fa3776bd12..f05265f38e 100644
--- a/locale/hu/LC_MESSAGES/statusnet.po
+++ b/locale/hu/LC_MESSAGES/statusnet.po
@@ -12,13 +12,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-08 01:03+0000\n"
-"PO-Revision-Date: 2011-03-08 01:05:16+0000\n"
+"POT-Creation-Date: 2011-03-11 18:15+0000\n"
+"PO-Revision-Date: 2011-03-11 18:17:11+0000\n"
 "Language-Team: Hungarian <http://translatewiki.net/wiki/Portal:hu>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-06 02:16:47+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
+"X-POT-Import-Date: 2011-03-08 01:25:01+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83703); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: hu\n"
 "X-Message-Group: #out-statusnet-core\n"
@@ -1043,7 +1043,7 @@ msgstr "Keressünk a hírek tartalmában"
 
 #. TRANS: Client exception thrown when trying favorite a notice without content.
 #, fuzzy
-msgid "Unknown note."
+msgid "Unknown notice."
 msgstr "Ismeretlen művelet"
 
 #. TRANS: Client exception thrown when trying favorite an already favorited notice.
@@ -1629,6 +1629,7 @@ msgstr "Töröljük ezt a felhasználót"
 #. TRANS: Client error displayed trying to create a new direct message while not logged in.
 #. TRANS: Client error displayed trying to send a notice while not logged in.
 #. TRANS: Client error displayed trying to nudge a user without being logged in.
+#. TRANS: Client error displayed when trying to enable or disable a plugin while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
@@ -3091,6 +3092,10 @@ msgstr "Meg kell adnod forrás URL-t."
 msgid "Could not create application."
 msgstr "Nem sikerült létrehozni az alkalmazást."
 
+#, fuzzy
+msgid "Invalid image."
+msgstr "Érvénytelen méret."
+
 #. TRANS: Title for form to create a group.
 msgid "New group"
 msgstr "Új csoport"
@@ -3363,52 +3368,77 @@ msgstr "%s kimenő postafiókja"
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr "Ez az elküldött privát üzeneteid postafiókja."
 
+#. TRANS: Title for page where to change password.
+#, fuzzy
+msgctxt "TITLE"
 msgid "Change password"
 msgstr "Jelszó megváltoztatása"
 
+#. TRANS: Instructions for page where to change password.
 msgid "Change your password."
 msgstr "Változtasd meg a jelszavadat."
 
+#. TRANS: Fieldset legend on page where to change password.
 #. TRANS: Fieldset legend for password reset form.
 msgid "Password change"
 msgstr "Jelszó megváltoztatása"
 
+#. TRANS: Field label on page where to change password.
 msgid "Old password"
 msgstr "Régi jelszó"
 
+#. TRANS: Field label on page where to change password.
 #. TRANS: Field label for password reset form.
 msgid "New password"
 msgstr "Új jelszó"
 
+#. TRANS: Field title on page where to change password.
 #, fuzzy
 msgid "6 or more characters."
 msgstr "6 vagy több karakter"
 
+#. TRANS: Field label on page where to change password. In this field the new password should be typed a second time.
+#, fuzzy
+msgctxt "LABEL"
+msgid "Confirm"
+msgstr "Megerősítés"
+
+#. TRANS: Field title on page where to change password.
 #. TRANS: Ttile for field label for password reset form where the password has to be typed again.
 #, fuzzy
 msgid "Same as password above."
 msgstr "Ugyanaz mint a fenti jelszó"
 
+#. TRANS: Button text on page where to change password.
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Change"
 msgstr "Változtassunk"
 
+#. TRANS: Form validation error on page where to change password.
 msgid "Password must be 6 or more characters."
 msgstr "A jelszónak legalább 6 karakterből kell állnia."
 
 msgid "Passwords don't match."
 msgstr "A jelszavak nem egyeznek."
 
-msgid "Incorrect old password"
+#. TRANS: Form validation error on page where to change password.
+#, fuzzy
+msgid "Incorrect old password."
 msgstr "Érvénytelen a régi jelszó"
 
+#. TRANS: Form validation error on page where to change password.
 msgid "Error saving user; invalid."
 msgstr "Hiba a felhasználó mentésekor; érvénytelen."
 
+#. TRANS: Server error displayed on page where to change password when password change
+#. TRANS: could not be made because of a server error.
 #. TRANS: Reset password form validation error message.
 #, fuzzy
 msgid "Cannot save new password."
 msgstr "Az új jelszót nem sikerült elmenteni."
 
+#. TRANS: Form validation notice on page where to change password.
 msgid "Password saved."
 msgstr "Jelszó elmentve."
 
@@ -3458,6 +3488,7 @@ msgstr "Webhely"
 msgid "Server"
 msgstr "Szerver"
 
+#. TRANS: Field title in Paths admin panel.
 msgid "Site's server hostname."
 msgstr "A webhely kiszolgálójának neve."
 
@@ -3465,6 +3496,7 @@ msgstr "A webhely kiszolgálójának neve."
 msgid "Path"
 msgstr "Útvonal"
 
+#. TRANS: Field title in Paths admin panel.
 #, fuzzy
 msgid "Site path."
 msgstr "Webhely útvonala"
@@ -3474,6 +3506,7 @@ msgstr "Webhely útvonala"
 msgid "Locale directory"
 msgstr "Avatar-könyvtár"
 
+#. TRANS: Field title in Paths admin panel.
 #, fuzzy
 msgid "Directory path to locales."
 msgstr "A nyelvi fájlok elérési útvonala"
@@ -3482,9 +3515,13 @@ msgstr "A nyelvi fájlok elérési útvonala"
 msgid "Fancy URLs"
 msgstr ""
 
-msgid "Use fancy (more readable and memorable) URLs?"
+#. TRANS: Field title in Paths admin panel.
+msgid "Use fancy URLs (more readable and memorable)?"
 msgstr ""
 
+#. TRANS: Fieldset legend in Paths admin panel.
+#, fuzzy
+msgctxt "LEGEND"
 msgid "Theme"
 msgstr "Téma"
 
@@ -3610,6 +3647,8 @@ 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"
 
@@ -3656,10 +3695,14 @@ msgstr ""
 msgid "People search"
 msgstr "Emberkereső"
 
+#. TRANS: Client error displayed when trying to tag a profile with an invalid tag.
+#. TRANS: %s is the invalid tag.
 #, php-format
 msgid "Not a valid people tag: %s."
 msgstr ""
 
+#. TRANS: Page title for users with a certain self-tag.
+#. TRANS: %1$s is the tag, %2$s is the page number.
 #, php-format
 msgid "Users self-tagged with %1$s - page %2$d"
 msgstr ""
@@ -3669,15 +3712,19 @@ msgctxt "plugin"
 msgid "Disabled"
 msgstr ""
 
+#. TRANS: Client error displayed when trying to use another method than POST.
+#. TRANS: Do not translate POST.
 #. TRANS: Client error displayed trying to perform any request method other than POST.
 #. TRANS: Do not translate POST.
 msgid "This action only accepts POST requests."
 msgstr ""
 
+#. TRANS: Client error displayed when trying to enable or disable a plugin without access rights.
 #, fuzzy
 msgid "You cannot administer plugins."
 msgstr "Nem törölhetsz felhasználókat."
 
+#. TRANS: Client error displayed when trying to enable or disable a non-existing plugin.
 #, fuzzy
 msgid "No such plugin."
 msgstr "Nincs ilyen lap."
@@ -3688,7 +3735,7 @@ msgid "Enabled"
 msgstr ""
 
 #. TRANS: Tab and title for plugins admin panel.
-#. TRANS: Menu item for site administration
+msgctxt "TITLE"
 msgid "Plugins"
 msgstr ""
 
@@ -3704,15 +3751,19 @@ msgstr ""
 msgid "Default plugins"
 msgstr "Alapértelmezett nyelv"
 
+#. TRANS: Text displayed on plugin admin page when no plugin are enabled.
 msgid ""
 "All default plugins have been disabled from the site's configuration file."
 msgstr ""
 
+#. TRANS: Client error displayed if the notice posted has too many characters.
 msgid "Invalid notice content."
 msgstr "Érvénytelen megjegyzéstartalom."
 
-#, php-format
-msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’."
+#. TRANS: Exception thrown if a notice's license is not compatible with the StatusNet site license.
+#. TRANS: %1$s is the notice license, %2$s is the StatusNet site's license.
+#, fuzzy, php-format
+msgid "Notice license \"%1$s\" is not compatible with site license \"%2$s\"."
 msgstr "A hír licence ‘%1$s’ nem kompatibilis a webhely licencével ‘%2$s’."
 
 #. TRANS: Page title for profile settings.
@@ -3868,43 +3919,57 @@ msgstr "A beállításokat elmentettük."
 msgid "Restore account"
 msgstr ""
 
+#. TRANS: Client error displayed when requesting a public timeline page beyond the page limit.
+#. TRANS: %s is the page limit.
 #, php-format
 msgid "Beyond the page limit (%s)."
 msgstr ""
 
+#. TRANS: Server error displayed when a public timeline cannot be retrieved.
 msgid "Could not retrieve public stream."
 msgstr ""
 
+#. TRANS: Title for all public timeline pages but the first.
+#. TRANS: %d is the page number.
 #, php-format
 msgid "Public timeline, page %d"
 msgstr "Közösségi történet, %d. oldal"
 
+#. TRANS: Title for the first public timeline page.
 msgid "Public timeline"
 msgstr "Közösségi történet"
 
+#. TRANS: Link description for public timeline feed.
 msgid "Public Stream Feed (RSS 1.0)"
 msgstr ""
 
+#. TRANS: Link description for public timeline feed.
 msgid "Public Stream Feed (RSS 2.0)"
 msgstr ""
 
+#. TRANS: Link description for public timeline feed.
 msgid "Public Stream Feed (Atom)"
 msgstr ""
 
+#. TRANS: Text displayed for public feed when there are no public notices.
 #, php-format
 msgid ""
 "This is the public timeline for %%site.name%% but no one has posted anything "
 "yet."
 msgstr "Ez itt %%site.name%% közösségi története, de még senki nem írt semmit."
 
+#. TRANS: Additional text displayed for public feed when there are no public notices for a logged in user.
 msgid "Be the first to post!"
 msgstr "Légy az első aki ír!"
 
+#. TRANS: Additional text displayed for public feed when there are no public notices for a not logged in user.
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post!"
 msgstr "Ha [regisztrálnál](%%action.register%%), te írhatnád az első hírt!"
 
+#. TRANS: Message for not logged in users at an invite-only site trying to view the public feed of notices.
+#. TRANS: This message contains Markdown links. Please mind the formatting.
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -3918,6 +3983,8 @@ msgstr ""
 "[Csatlakozz](%%action.register%%), és küldj híreket magadról a barátaidnak, "
 "a családodnak, a munkatársaidnak! ([Tudj meg többet](%%doc.help%%))"
 
+#. TRANS: Message for not logged in users at a closed site trying to view the public feed of notices.
+#. TRANS: This message contains Markdown links. Please mind the formatting.
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -5519,6 +5586,10 @@ msgid ""
 "along with this program.  If not, see %s."
 msgstr ""
 
+#. TRANS: Menu item for site administration
+msgid "Plugins"
+msgstr ""
+
 #. TRANS: Form input field label for application name.
 msgid "Name"
 msgstr "Név"
@@ -6003,6 +6074,9 @@ msgstr ""
 msgid "Unable to delete design setting."
 msgstr "Nem sikerült törölni a megjelenés beállításait."
 
+msgid "Home"
+msgstr "Otthon"
+
 #. TRANS: Menu item title/tooltip
 msgid "Basic site configuration"
 msgstr "A webhely elemi beállításai"
@@ -6589,9 +6663,6 @@ msgstr "Menj a telepítőhöz."
 msgid "Database error"
 msgstr "Adatbázishiba"
 
-msgid "Home"
-msgstr "Otthon"
-
 msgid "Public"
 msgstr ""
 
@@ -7363,7 +7434,6 @@ msgstr "Küldjünk egy hírt"
 msgid "What's up, %s?"
 msgstr "Mi hír, %s?"
 
-#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr "Csatolás"
 
@@ -7430,6 +7500,9 @@ msgstr "Töröljük ezt a hírt"
 msgid "Notice repeated"
 msgstr "A hírt megismételtük"
 
+msgid "Update your status..."
+msgstr ""
+
 msgid "Nudge this user"
 msgstr "Bökjük meg ezt a felhasználót"
 
@@ -7936,11 +8009,3 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
-
-#, fuzzy
-#~ msgid "Friends timeline"
-#~ msgstr "%s története"
-
-#, fuzzy
-#~ msgid "Everyone on this site"
-#~ msgstr "Emberek keresése az oldalon"
diff --git a/locale/ia/LC_MESSAGES/statusnet.po b/locale/ia/LC_MESSAGES/statusnet.po
index fce258aa37..a56aa7c5c8 100644
--- a/locale/ia/LC_MESSAGES/statusnet.po
+++ b/locale/ia/LC_MESSAGES/statusnet.po
@@ -9,17 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-08 01:03+0000\n"
-"PO-Revision-Date: 2011-03-08 01:05:17+0000\n"
+"POT-Creation-Date: 2011-03-11 18:15+0000\n"
+"PO-Revision-Date: 2011-03-11 18:17:12+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
+"X-Generator: MediaWiki 1.18alpha (r83703); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-03-06 02:16:47+0000\n"
+"X-POT-Import-Date: 2011-03-08 01:25:01+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -1039,7 +1039,8 @@ msgid "Can only fave notices."
 msgstr "Solmente notas pote esser addite al favorites."
 
 #. TRANS: Client exception thrown when trying favorite a notice without content.
-msgid "Unknown note."
+#, fuzzy
+msgid "Unknown notice."
 msgstr "Nota incognite."
 
 #. TRANS: Client exception thrown when trying favorite an already favorited notice.
@@ -1608,6 +1609,7 @@ msgstr "Deler iste gruppo."
 #. TRANS: Client error displayed trying to create a new direct message while not logged in.
 #. TRANS: Client error displayed trying to send a notice while not logged in.
 #. TRANS: Client error displayed trying to nudge a user without being logged in.
+#. TRANS: Client error displayed when trying to enable or disable a plugin while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
@@ -3081,6 +3083,10 @@ msgstr "Le URL de origine es requirite."
 msgid "Could not create application."
 msgstr "Non poteva crear application."
 
+#, fuzzy
+msgid "Invalid image."
+msgstr "Dimension invalide."
+
 #. TRANS: Title for form to create a group.
 msgid "New group"
 msgstr "Nove gruppo"
@@ -3365,49 +3371,74 @@ msgid "This is your outbox, which lists private messages you have sent."
 msgstr ""
 "Isto es tu cassa de exito, que lista le messages private que tu ha inviate."
 
+#. TRANS: Title for page where to change password.
+#, fuzzy
+msgctxt "TITLE"
 msgid "Change password"
 msgstr "Cambiar contrasigno"
 
+#. TRANS: Instructions for page where to change password.
 msgid "Change your password."
 msgstr "Cambiar tu contrasigno."
 
+#. TRANS: Fieldset legend on page where to change password.
 #. TRANS: Fieldset legend for password reset form.
 msgid "Password change"
 msgstr "Cambio del contrasigno"
 
+#. TRANS: Field label on page where to change password.
 msgid "Old password"
 msgstr "Ancian contrasigno"
 
+#. TRANS: Field label on page where to change password.
 #. TRANS: Field label for password reset form.
 msgid "New password"
 msgstr "Nove contrasigno"
 
+#. TRANS: Field title on page where to change password.
 msgid "6 or more characters."
 msgstr "6 o plus characteres."
 
+#. TRANS: Field label on page where to change password. In this field the new password should be typed a second time.
+#, fuzzy
+msgctxt "LABEL"
+msgid "Confirm"
+msgstr "Confirmar"
+
+#. TRANS: Field title on page where to change password.
 #. TRANS: Ttile for field label for password reset form where the password has to be typed again.
 msgid "Same as password above."
 msgstr "Identic al contrasigno hic supra."
 
+#. TRANS: Button text on page where to change password.
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Change"
 msgstr "Cambiar"
 
+#. TRANS: Form validation error on page where to change password.
 msgid "Password must be 6 or more characters."
 msgstr "Le contrasigno debe haber al minus 6 characteres."
 
 msgid "Passwords don't match."
 msgstr "Le contrasignos non corresponde."
 
-msgid "Incorrect old password"
+#. TRANS: Form validation error on page where to change password.
+#, fuzzy
+msgid "Incorrect old password."
 msgstr "Ancian contrasigno incorrecte"
 
+#. TRANS: Form validation error on page where to change password.
 msgid "Error saving user; invalid."
 msgstr "Error de salveguardar le usator; invalide."
 
+#. TRANS: Server error displayed on page where to change password when password change
+#. TRANS: could not be made because of a server error.
 #. TRANS: Reset password form validation error message.
 msgid "Cannot save new password."
 msgstr "Non pote salveguardar le nove contrasigno."
 
+#. TRANS: Form validation notice on page where to change password.
 msgid "Password saved."
 msgstr "Contrasigno salveguardate."
 
@@ -3457,6 +3488,7 @@ msgstr "Sito"
 msgid "Server"
 msgstr "Servitor"
 
+#. TRANS: Field title in Paths admin panel.
 msgid "Site's server hostname."
 msgstr "Nomine de host del servitor del sito."
 
@@ -3464,6 +3496,7 @@ msgstr "Nomine de host del servitor del sito."
 msgid "Path"
 msgstr "Cammino"
 
+#. TRANS: Field title in Paths admin panel.
 msgid "Site path."
 msgstr "Cammino del sito."
 
@@ -3471,6 +3504,7 @@ msgstr "Cammino del sito."
 msgid "Locale directory"
 msgstr "Directorio de localisation"
 
+#. TRANS: Field title in Paths admin panel.
 msgid "Directory path to locales."
 msgstr "Cammino al directorio de localisation."
 
@@ -3478,9 +3512,14 @@ msgstr "Cammino al directorio de localisation."
 msgid "Fancy URLs"
 msgstr "URLs de luxo"
 
-msgid "Use fancy (more readable and memorable) URLs?"
+#. TRANS: Field title in Paths admin panel.
+#, fuzzy
+msgid "Use fancy URLs (more readable and memorable)?"
 msgstr "Usar URLs de luxo (plus legibile e memorabile)?"
 
+#. TRANS: Fieldset legend in Paths admin panel.
+#, fuzzy
+msgctxt "LEGEND"
 msgid "Theme"
 msgstr "Thema"
 
@@ -3593,6 +3632,8 @@ msgid "Directory where attachments are located."
 msgstr "Cammino a ubi se trova le annexos."
 
 #. TRANS: Fieldset legend in Paths admin panel.
+#, fuzzy
+msgctxt "LEGEND"
 msgid "SSL"
 msgstr "SSL"
 
@@ -3637,10 +3678,14 @@ msgstr ""
 msgid "People search"
 msgstr "Recerca de personas"
 
+#. TRANS: Client error displayed when trying to tag a profile with an invalid tag.
+#. TRANS: %s is the invalid tag.
 #, php-format
 msgid "Not a valid people tag: %s."
 msgstr "Etiquetta de personas invalide: %s."
 
+#. TRANS: Page title for users with a certain self-tag.
+#. TRANS: %1$s is the tag, %2$s is the page number.
 #, php-format
 msgid "Users self-tagged with %1$s - page %2$d"
 msgstr "Usatores auto-etiquettate con %1$s - pagina %2$d"
@@ -3650,14 +3695,18 @@ msgctxt "plugin"
 msgid "Disabled"
 msgstr "Disactivate"
 
+#. TRANS: Client error displayed when trying to use another method than POST.
+#. TRANS: Do not translate POST.
 #. TRANS: Client error displayed trying to perform any request method other than POST.
 #. TRANS: Do not translate POST.
 msgid "This action only accepts POST requests."
 msgstr "Iste action accepta solmente le requestas de typo POST."
 
+#. TRANS: Client error displayed when trying to enable or disable a plugin without access rights.
 msgid "You cannot administer plugins."
 msgstr "Tu non pote administrar plug-ins."
 
+#. TRANS: Client error displayed when trying to enable or disable a non-existing plugin.
 msgid "No such plugin."
 msgstr "Plug-in non existe."
 
@@ -3667,7 +3716,8 @@ msgid "Enabled"
 msgstr "Activate"
 
 #. TRANS: Tab and title for plugins admin panel.
-#. TRANS: Menu item for site administration
+#, fuzzy
+msgctxt "TITLE"
 msgid "Plugins"
 msgstr "Plug-ins"
 
@@ -3685,17 +3735,21 @@ msgstr ""
 msgid "Default plugins"
 msgstr "Plug-ins predefinite"
 
+#. TRANS: Text displayed on plugin admin page when no plugin are enabled.
 msgid ""
 "All default plugins have been disabled from the site's configuration file."
 msgstr ""
 "Tote le plug-ins predefinite ha essite disactivate in le file de "
 "configuration del sito."
 
+#. TRANS: Client error displayed if the notice posted has too many characters.
 msgid "Invalid notice content."
 msgstr "Le contento del nota es invalide."
 
-#, php-format
-msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’."
+#. TRANS: Exception thrown if a notice's license is not compatible with the StatusNet site license.
+#. TRANS: %1$s is the notice license, %2$s is the StatusNet site's license.
+#, fuzzy, php-format
+msgid "Notice license \"%1$s\" is not compatible with site license \"%2$s\"."
 msgstr ""
 "Le licentia del nota ‘%1$s’ non es compatibile con le licentia del sito ‘%2"
 "$s’."
@@ -3843,29 +3897,39 @@ msgstr "Preferentias confirmate."
 msgid "Restore account"
 msgstr "Restaurar conto"
 
+#. TRANS: Client error displayed when requesting a public timeline page beyond the page limit.
+#. TRANS: %s is the page limit.
 #, php-format
 msgid "Beyond the page limit (%s)."
 msgstr "Ultra le limite de pagina (%s)."
 
+#. TRANS: Server error displayed when a public timeline cannot be retrieved.
 msgid "Could not retrieve public stream."
 msgstr "Non poteva recuperar le fluxo public."
 
+#. TRANS: Title for all public timeline pages but the first.
+#. TRANS: %d is the page number.
 #, php-format
 msgid "Public timeline, page %d"
 msgstr "Chronologia public, pagina %d"
 
+#. TRANS: Title for the first public timeline page.
 msgid "Public timeline"
 msgstr "Chronologia public"
 
+#. TRANS: Link description for public timeline feed.
 msgid "Public Stream Feed (RSS 1.0)"
 msgstr "Syndication del fluxo public (RSS 1.0)"
 
+#. TRANS: Link description for public timeline feed.
 msgid "Public Stream Feed (RSS 2.0)"
 msgstr "Syndication del fluxo public (RSS 2.0)"
 
+#. TRANS: Link description for public timeline feed.
 msgid "Public Stream Feed (Atom)"
 msgstr "Syndication del fluxo public (Atom)"
 
+#. TRANS: Text displayed for public feed when there are no public notices.
 #, php-format
 msgid ""
 "This is the public timeline for %%site.name%% but no one has posted anything "
@@ -3874,9 +3938,11 @@ msgstr ""
 "Isto es le chronologia public pro %%site.name%%, ma nulle persona ha ancora "
 "scribite alique."
 
+#. TRANS: Additional text displayed for public feed when there are no public notices for a logged in user.
 msgid "Be the first to post!"
 msgstr "Sia le prime a publicar!"
 
+#. TRANS: Additional text displayed for public feed when there are no public notices for a not logged in user.
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post!"
@@ -3884,6 +3950,8 @@ msgstr ""
 "Proque non [registrar un conto](%%action.register%%) e devenir le prime a "
 "publicar?"
 
+#. TRANS: Message for not logged in users at an invite-only site trying to view the public feed of notices.
+#. TRANS: This message contains Markdown links. Please mind the formatting.
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -3896,6 +3964,8 @@ msgstr ""
 "[Inscribe te ora](%%action.register%%) pro condivider notas super te con "
 "amicos, familia e collegas! ([Leger plus](%%doc.help%%))"
 
+#. TRANS: Message for not logged in users at a closed site trying to view the public feed of notices.
+#. TRANS: This message contains Markdown links. Please mind the formatting.
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -5588,6 +5658,10 @@ msgstr ""
 "Un copia del GNU Affero General Public License deberea esser disponibile "
 "insimul con iste programma. Si non, vide %s."
 
+#. TRANS: Menu item for site administration
+msgid "Plugins"
+msgstr "Plug-ins"
+
 #. TRANS: Form input field label for application name.
 msgid "Name"
 msgstr "Nomine"
@@ -5919,9 +5993,8 @@ msgstr "Responder"
 msgid "Write a reply..."
 msgstr "Scriber un responsa..."
 
-#, fuzzy
 msgid "Status"
-msgstr "StatusNet"
+msgstr "Stato"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #. TRANS: Text between [] is a link description, text between () is the link itself.
@@ -6088,6 +6161,9 @@ msgstr "saveSettings() non implementate."
 msgid "Unable to delete design setting."
 msgstr "Impossibile deler configuration de apparentia."
 
+msgid "Home"
+msgstr "Initio"
+
 #. TRANS: Menu item title/tooltip
 msgid "Basic site configuration"
 msgstr "Configuration basic del sito"
@@ -6715,9 +6791,6 @@ msgstr "Ir al installator."
 msgid "Database error"
 msgstr "Error de base de datos"
 
-msgid "Home"
-msgstr "Initio"
-
 msgid "Public"
 msgstr "Public"
 
@@ -7486,18 +7559,16 @@ msgid "from"
 msgstr "via"
 
 msgid "Can't get author for activity."
-msgstr ""
+msgstr "Non pote determinar le autor pro le activitate."
 
-#, fuzzy
 msgid "Bookmark not posted to this group."
-msgstr "Tu non ha le permission de deler iste gruppo."
+msgstr "Le marcapaginas non es publicate in iste gruppo."
 
-#, fuzzy
 msgid "Object not posted to this user."
-msgstr "Non deler iste usator."
+msgstr "Le objecto non es inviate a iste usator."
 
 msgid "Don't know how to handle this kind of target."
-msgstr ""
+msgstr "Non sape manear iste typo de destination."
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 msgid "Nickname cannot be empty."
@@ -7519,7 +7590,6 @@ msgstr "Inviar un nota"
 msgid "What's up, %s?"
 msgstr "Como sta, %s?"
 
-#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr "Annexar"
 
@@ -7587,6 +7657,9 @@ msgstr "Deler iste nota"
 msgid "Notice repeated"
 msgstr "Nota repetite"
 
+msgid "Update your status..."
+msgstr ""
+
 msgid "Nudge this user"
 msgstr "Pulsar iste usator"
 
@@ -8093,9 +8166,3 @@ msgstr "XML invalide, radice XRD mancante."
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr "Obtene copia de reserva ex file '%s'."
-
-#~ msgid "Friends timeline"
-#~ msgstr "Chronologia de amicos"
-
-#~ msgid "Everyone on this site"
-#~ msgstr "Omnes in iste sito"
diff --git a/locale/it/LC_MESSAGES/statusnet.po b/locale/it/LC_MESSAGES/statusnet.po
index 472a3eb844..78b07bbdfc 100644
--- a/locale/it/LC_MESSAGES/statusnet.po
+++ b/locale/it/LC_MESSAGES/statusnet.po
@@ -11,17 +11,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-08 01:03+0000\n"
-"PO-Revision-Date: 2011-03-08 01:05:18+0000\n"
+"POT-Creation-Date: 2011-03-11 18:15+0000\n"
+"PO-Revision-Date: 2011-03-11 18:17:13+0000\n"
 "Language-Team: Italian <http://translatewiki.net/wiki/Portal:it>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
+"X-Generator: MediaWiki 1.18alpha (r83703); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: it\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-03-06 02:16:47+0000\n"
+"X-POT-Import-Date: 2011-03-08 01:25:01+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -1060,7 +1060,7 @@ msgstr "Trova contenuto dei messaggi"
 
 #. TRANS: Client exception thrown when trying favorite a notice without content.
 #, fuzzy
-msgid "Unknown note."
+msgid "Unknown notice."
 msgstr "Sconosciuto"
 
 #. TRANS: Client exception thrown when trying favorite an already favorited notice.
@@ -1652,6 +1652,7 @@ msgstr "Elimina questo utente"
 #. TRANS: Client error displayed trying to create a new direct message while not logged in.
 #. TRANS: Client error displayed trying to send a notice while not logged in.
 #. TRANS: Client error displayed trying to nudge a user without being logged in.
+#. TRANS: Client error displayed when trying to enable or disable a plugin while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
@@ -3173,6 +3174,10 @@ msgstr "L'URL sorgente è richiesto."
 msgid "Could not create application."
 msgstr "Impossibile creare l'applicazione."
 
+#, fuzzy
+msgid "Invalid image."
+msgstr "Dimensione non valida."
+
 #. TRANS: Title for form to create a group.
 msgid "New group"
 msgstr "Nuovo gruppo"
@@ -3457,52 +3462,77 @@ msgstr ""
 "Questa è la casella della tua posta inviata, contiene i messaggi privati che "
 "hai inviato."
 
+#. TRANS: Title for page where to change password.
+#, fuzzy
+msgctxt "TITLE"
 msgid "Change password"
 msgstr "Modifica password"
 
+#. TRANS: Instructions for page where to change password.
 msgid "Change your password."
 msgstr "Modifica la tua password."
 
+#. TRANS: Fieldset legend on page where to change password.
 #. TRANS: Fieldset legend for password reset form.
 msgid "Password change"
 msgstr "Modifica password"
 
+#. TRANS: Field label on page where to change password.
 msgid "Old password"
 msgstr "Vecchia password"
 
+#. TRANS: Field label on page where to change password.
 #. TRANS: Field label for password reset form.
 msgid "New password"
 msgstr "Nuova password"
 
+#. TRANS: Field title on page where to change password.
 #, fuzzy
 msgid "6 or more characters."
 msgstr "6 o più caratteri"
 
+#. TRANS: Field label on page where to change password. In this field the new password should be typed a second time.
+#, fuzzy
+msgctxt "LABEL"
+msgid "Confirm"
+msgstr "Conferma"
+
+#. TRANS: Field title on page where to change password.
 #. TRANS: Ttile for field label for password reset form where the password has to be typed again.
 #, fuzzy
 msgid "Same as password above."
 msgstr "Stessa password di sopra"
 
+#. TRANS: Button text on page where to change password.
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Change"
 msgstr "Modifica"
 
+#. TRANS: Form validation error on page where to change password.
 msgid "Password must be 6 or more characters."
 msgstr "La password deve essere di 6 o più caratteri."
 
 msgid "Passwords don't match."
 msgstr "Le password non corrispondono."
 
-msgid "Incorrect old password"
+#. TRANS: Form validation error on page where to change password.
+#, fuzzy
+msgid "Incorrect old password."
 msgstr "Vecchia password non corretta"
 
+#. TRANS: Form validation error on page where to change password.
 msgid "Error saving user; invalid."
 msgstr "Errore nel salvare l'utente; non valido."
 
+#. TRANS: Server error displayed on page where to change password when password change
+#. TRANS: could not be made because of a server error.
 #. TRANS: Reset password form validation error message.
 #, fuzzy
 msgid "Cannot save new password."
 msgstr "Impossibile salvare la nuova password."
 
+#. TRANS: Form validation notice on page where to change password.
 msgid "Password saved."
 msgstr "Password salvata."
 
@@ -3552,6 +3582,7 @@ msgstr "Sito"
 msgid "Server"
 msgstr "Server"
 
+#. TRANS: Field title in Paths admin panel.
 msgid "Site's server hostname."
 msgstr "Nome host del server"
 
@@ -3559,6 +3590,7 @@ msgstr "Nome host del server"
 msgid "Path"
 msgstr "Percorso"
 
+#. TRANS: Field title in Paths admin panel.
 #, fuzzy
 msgid "Site path."
 msgstr "Percorso del sito"
@@ -3568,6 +3600,7 @@ msgstr "Percorso del sito"
 msgid "Locale directory"
 msgstr "Directory del tema"
 
+#. TRANS: Field title in Paths admin panel.
 #, fuzzy
 msgid "Directory path to locales."
 msgstr "Percorso della directory alle localizzazioni"
@@ -3576,9 +3609,14 @@ msgstr "Percorso della directory alle localizzazioni"
 msgid "Fancy URLs"
 msgstr "URL semplici"
 
-msgid "Use fancy (more readable and memorable) URLs?"
+#. TRANS: Field title in Paths admin panel.
+#, fuzzy
+msgid "Use fancy URLs (more readable and memorable)?"
 msgstr "Usare gli URL semplici (più leggibili e facili da ricordare)?"
 
+#. TRANS: Fieldset legend in Paths admin panel.
+#, fuzzy
+msgctxt "LEGEND"
 msgid "Theme"
 msgstr "Tema"
 
@@ -3704,6 +3742,8 @@ msgid "Directory where attachments are located."
 msgstr "Percorso della directory alle localizzazioni"
 
 #. TRANS: Fieldset legend in Paths admin panel.
+#, fuzzy
+msgctxt "LEGEND"
 msgid "SSL"
 msgstr "SSL"
 
@@ -3750,10 +3790,14 @@ msgstr ""
 msgid "People search"
 msgstr "Cerca persone"
 
+#. TRANS: Client error displayed when trying to tag a profile with an invalid tag.
+#. TRANS: %s is the invalid tag.
 #, php-format
 msgid "Not a valid people tag: %s."
 msgstr "Non è un'etichetta valida di persona: %s."
 
+#. TRANS: Page title for users with a certain self-tag.
+#. TRANS: %1$s is the tag, %2$s is the page number.
 #, php-format
 msgid "Users self-tagged with %1$s - page %2$d"
 msgstr "Utenti auto-etichettati con %1$s - pagina %2$d"
@@ -3763,15 +3807,19 @@ msgctxt "plugin"
 msgid "Disabled"
 msgstr ""
 
+#. TRANS: Client error displayed when trying to use another method than POST.
+#. TRANS: Do not translate POST.
 #. TRANS: Client error displayed trying to perform any request method other than POST.
 #. TRANS: Do not translate POST.
 msgid "This action only accepts POST requests."
 msgstr "Quest'azione accetta solo richieste POST."
 
+#. TRANS: Client error displayed when trying to enable or disable a plugin without access rights.
 #, fuzzy
 msgid "You cannot administer plugins."
 msgstr "Non puoi eliminare utenti."
 
+#. TRANS: Client error displayed when trying to enable or disable a non-existing plugin.
 #, fuzzy
 msgid "No such plugin."
 msgstr "Pagina inesistente."
@@ -3782,7 +3830,8 @@ msgid "Enabled"
 msgstr ""
 
 #. TRANS: Tab and title for plugins admin panel.
-#. TRANS: Menu item for site administration
+#, fuzzy
+msgctxt "TITLE"
 msgid "Plugins"
 msgstr "Plugin"
 
@@ -3798,15 +3847,19 @@ msgstr ""
 msgid "Default plugins"
 msgstr "Lingua predefinita"
 
+#. TRANS: Text displayed on plugin admin page when no plugin are enabled.
 msgid ""
 "All default plugins have been disabled from the site's configuration file."
 msgstr ""
 
+#. TRANS: Client error displayed if the notice posted has too many characters.
 msgid "Invalid notice content."
 msgstr "Contenuto del messaggio non valido."
 
-#, php-format
-msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’."
+#. TRANS: Exception thrown if a notice's license is not compatible with the StatusNet site license.
+#. TRANS: %1$s is the notice license, %2$s is the StatusNet site's license.
+#, fuzzy, php-format
+msgid "Notice license \"%1$s\" is not compatible with site license \"%2$s\"."
 msgstr ""
 "La licenza \"%1$s\" del messaggio non è compatibile con la licenza del sito "
 "\"%2$s\"."
@@ -3963,29 +4016,39 @@ msgstr "Impostazioni salvate."
 msgid "Restore account"
 msgstr "Crea un account"
 
+#. TRANS: Client error displayed when requesting a public timeline page beyond the page limit.
+#. TRANS: %s is the page limit.
 #, php-format
 msgid "Beyond the page limit (%s)."
 msgstr "Oltre il limite della pagina (%s)."
 
+#. TRANS: Server error displayed when a public timeline cannot be retrieved.
 msgid "Could not retrieve public stream."
 msgstr "Impossibile recuperare l'attività pubblica."
 
+#. TRANS: Title for all public timeline pages but the first.
+#. TRANS: %d is the page number.
 #, php-format
 msgid "Public timeline, page %d"
 msgstr "Attività pubblica, pagina %d"
 
+#. TRANS: Title for the first public timeline page.
 msgid "Public timeline"
 msgstr "Attività pubblica"
 
+#. TRANS: Link description for public timeline feed.
 msgid "Public Stream Feed (RSS 1.0)"
 msgstr "Feed dell'attività pubblica (RSS 1.0)"
 
+#. TRANS: Link description for public timeline feed.
 msgid "Public Stream Feed (RSS 2.0)"
 msgstr "Feed dell'attività pubblica (RSS 2.0)"
 
+#. TRANS: Link description for public timeline feed.
 msgid "Public Stream Feed (Atom)"
 msgstr "Feed dell'attività pubblica (Atom)"
 
+#. TRANS: Text displayed for public feed when there are no public notices.
 #, php-format
 msgid ""
 "This is the public timeline for %%site.name%% but no one has posted anything "
@@ -3994,15 +4057,19 @@ msgstr ""
 "Questa è l'attività pubblica di %%site.name%%, ma nessuno ha ancora scritto "
 "qualche cosa."
 
+#. TRANS: Additional text displayed for public feed when there are no public notices for a logged in user.
 msgid "Be the first to post!"
 msgstr "Fallo tu!"
 
+#. TRANS: Additional text displayed for public feed when there are no public notices for a not logged in user.
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post!"
 msgstr ""
 "Perché non [crei un account](%%action.register%%) e scrivi qualche cosa!"
 
+#. TRANS: Message for not logged in users at an invite-only site trying to view the public feed of notices.
+#. TRANS: This message contains Markdown links. Please mind the formatting.
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -4015,6 +4082,8 @@ msgstr ""
 "net/). [Registrati](%%action.register%%) per condividere messaggi con i tuoi "
 "amici, i tuoi familiari e colleghi! ([Maggiori informazioni](%%doc.help%%))"
 
+#. TRANS: Message for not logged in users at a closed site trying to view the public feed of notices.
+#. TRANS: This message contains Markdown links. Please mind the formatting.
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -5735,6 +5804,10 @@ msgstr ""
 "Una copia della GNU Affero General Plublic License dovrebbe essere "
 "disponibile assieme a questo programma. Se così non fosse, consultare %s."
 
+#. TRANS: Menu item for site administration
+msgid "Plugins"
+msgstr "Plugin"
+
 #. TRANS: Form input field label for application name.
 msgid "Name"
 msgstr "Nome"
@@ -6245,6 +6318,9 @@ msgstr "saveSettings() non implementata."
 msgid "Unable to delete design setting."
 msgstr "Impossibile eliminare le impostazioni dell'aspetto."
 
+msgid "Home"
+msgstr "Pagina web"
+
 #. TRANS: Menu item title/tooltip
 msgid "Basic site configuration"
 msgstr "Configurazione di base"
@@ -6882,9 +6958,6 @@ msgstr "Vai al programma d'installazione."
 msgid "Database error"
 msgstr "Errore del database"
 
-msgid "Home"
-msgstr "Pagina web"
-
 msgid "Public"
 msgstr "Pubblico"
 
@@ -7694,7 +7767,6 @@ msgstr "Invia un messaggio"
 msgid "What's up, %s?"
 msgstr "Cosa succede, %s?"
 
-#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr "Allega"
 
@@ -7763,6 +7835,9 @@ msgstr "Elimina questo messaggio"
 msgid "Notice repeated"
 msgstr "Messaggio ripetuto"
 
+msgid "Update your status..."
+msgstr ""
+
 msgid "Nudge this user"
 msgstr "Richiama questo utente"
 
@@ -8274,11 +8349,3 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
-
-#, fuzzy
-#~ msgid "Friends timeline"
-#~ msgstr "Attività di %s"
-
-#, fuzzy
-#~ msgid "Everyone on this site"
-#~ msgstr "Trova persone in questo sito"
diff --git a/locale/ja/LC_MESSAGES/statusnet.po b/locale/ja/LC_MESSAGES/statusnet.po
index 3eec1131ea..00de07045f 100644
--- a/locale/ja/LC_MESSAGES/statusnet.po
+++ b/locale/ja/LC_MESSAGES/statusnet.po
@@ -14,17 +14,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-08 01:03+0000\n"
-"PO-Revision-Date: 2011-03-08 01:05:19+0000\n"
+"POT-Creation-Date: 2011-03-11 18:15+0000\n"
+"PO-Revision-Date: 2011-03-11 18:17:15+0000\n"
 "Language-Team: Japanese <http://translatewiki.net/wiki/Portal:ja>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
+"X-Generator: MediaWiki 1.18alpha (r83703); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ja\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-POT-Import-Date: 2011-03-06 02:16:47+0000\n"
+"X-POT-Import-Date: 2011-03-08 01:25:01+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -1050,7 +1050,7 @@ msgstr "つぶやきの内容を探す"
 
 #. TRANS: Client exception thrown when trying favorite a notice without content.
 #, fuzzy
-msgid "Unknown note."
+msgid "Unknown notice."
 msgstr "不明"
 
 #. TRANS: Client exception thrown when trying favorite an already favorited notice.
@@ -1645,6 +1645,7 @@ msgstr "このユーザを削除"
 #. TRANS: Client error displayed trying to create a new direct message while not logged in.
 #. TRANS: Client error displayed trying to send a notice while not logged in.
 #. TRANS: Client error displayed trying to nudge a user without being logged in.
+#. TRANS: Client error displayed when trying to enable or disable a plugin while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
@@ -3168,6 +3169,10 @@ msgstr "ソースURLが必要です。"
 msgid "Could not create application."
 msgstr "アプリケーションを作成できません。"
 
+#, fuzzy
+msgid "Invalid image."
+msgstr "不正なサイズ。"
+
 #. TRANS: Title for form to create a group.
 msgid "New group"
 msgstr "新しいグループ"
@@ -3453,52 +3458,77 @@ msgstr ""
 "これはあなたの送信箱です、あなたが送ったプライベート・メッセージをリストしま"
 "す。"
 
+#. TRANS: Title for page where to change password.
+#, fuzzy
+msgctxt "TITLE"
 msgid "Change password"
 msgstr "パスワードの変更"
 
+#. TRANS: Instructions for page where to change password.
 msgid "Change your password."
 msgstr "パスワードを変更します。"
 
+#. TRANS: Fieldset legend on page where to change password.
 #. TRANS: Fieldset legend for password reset form.
 msgid "Password change"
 msgstr "パスワード変更"
 
+#. TRANS: Field label on page where to change password.
 msgid "Old password"
 msgstr "古いパスワード"
 
+#. TRANS: Field label on page where to change password.
 #. TRANS: Field label for password reset form.
 msgid "New password"
 msgstr "新しいパスワード"
 
+#. TRANS: Field title on page where to change password.
 #, fuzzy
 msgid "6 or more characters."
 msgstr "6文字以上"
 
+#. TRANS: Field label on page where to change password. In this field the new password should be typed a second time.
+#, fuzzy
+msgctxt "LABEL"
+msgid "Confirm"
+msgstr "パスワード確認"
+
+#. TRANS: Field title on page where to change password.
 #. TRANS: Ttile for field label for password reset form where the password has to be typed again.
 #, fuzzy
 msgid "Same as password above."
 msgstr "上と同じパスワード"
 
+#. TRANS: Button text on page where to change password.
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Change"
 msgstr "変更"
 
+#. TRANS: Form validation error on page where to change password.
 msgid "Password must be 6 or more characters."
 msgstr "パスワードは6文字以上にする必要があります。"
 
 msgid "Passwords don't match."
 msgstr "パスワードが一致しません。"
 
-msgid "Incorrect old password"
+#. TRANS: Form validation error on page where to change password.
+#, fuzzy
+msgid "Incorrect old password."
 msgstr "古いパスワードが間違っています。"
 
+#. TRANS: Form validation error on page where to change password.
 msgid "Error saving user; invalid."
 msgstr "ユーザ保存エラー; 不正なユーザ"
 
+#. TRANS: Server error displayed on page where to change password when password change
+#. TRANS: could not be made because of a server error.
 #. TRANS: Reset password form validation error message.
 #, fuzzy
 msgid "Cannot save new password."
 msgstr "新しいパスワードを保存できません。"
 
+#. TRANS: Form validation notice on page where to change password.
 msgid "Password saved."
 msgstr "パスワードが保存されました。"
 
@@ -3548,6 +3578,7 @@ msgstr "サイト"
 msgid "Server"
 msgstr "サーバー"
 
+#. TRANS: Field title in Paths admin panel.
 msgid "Site's server hostname."
 msgstr "サイトのサーバーホスト名"
 
@@ -3555,6 +3586,7 @@ msgstr "サイトのサーバーホスト名"
 msgid "Path"
 msgstr "パス"
 
+#. TRANS: Field title in Paths admin panel.
 #, fuzzy
 msgid "Site path."
 msgstr "サイトパス"
@@ -3564,6 +3596,7 @@ msgstr "サイトパス"
 msgid "Locale directory"
 msgstr "テーマディレクトリ"
 
+#. TRANS: Field title in Paths admin panel.
 #, fuzzy
 msgid "Directory path to locales."
 msgstr "ロケールへのディレクトリパス"
@@ -3572,9 +3605,14 @@ msgstr "ロケールへのディレクトリパス"
 msgid "Fancy URLs"
 msgstr ""
 
-msgid "Use fancy (more readable and memorable) URLs?"
+#. TRANS: Field title in Paths admin panel.
+#, fuzzy
+msgid "Use fancy URLs (more readable and memorable)?"
 msgstr "Fancy URL (読みやすく忘れにくい) を使用しますか?"
 
+#. TRANS: Fieldset legend in Paths admin panel.
+#, fuzzy
+msgctxt "LEGEND"
 msgid "Theme"
 msgstr "テーマ"
 
@@ -3700,6 +3738,8 @@ msgid "Directory where attachments are located."
 msgstr "ロケールへのディレクトリパス"
 
 #. TRANS: Fieldset legend in Paths admin panel.
+#, fuzzy
+msgctxt "LEGEND"
 msgid "SSL"
 msgstr "SSL"
 
@@ -3746,10 +3786,14 @@ msgstr ""
 msgid "People search"
 msgstr "ピープルサーチ"
 
+#. TRANS: Client error displayed when trying to tag a profile with an invalid tag.
+#. TRANS: %s is the invalid tag.
 #, php-format
 msgid "Not a valid people tag: %s."
 msgstr "有効なメールアドレスではありません。"
 
+#. TRANS: Page title for users with a certain self-tag.
+#. TRANS: %1$s is the tag, %2$s is the page number.
 #, php-format
 msgid "Users self-tagged with %1$s - page %2$d"
 msgstr "ユーザ自身がつけたタグ %1$s  - ページ %2$d"
@@ -3759,15 +3803,19 @@ msgctxt "plugin"
 msgid "Disabled"
 msgstr ""
 
+#. TRANS: Client error displayed when trying to use another method than POST.
+#. TRANS: Do not translate POST.
 #. TRANS: Client error displayed trying to perform any request method other than POST.
 #. TRANS: Do not translate POST.
 msgid "This action only accepts POST requests."
 msgstr ""
 
+#. TRANS: Client error displayed when trying to enable or disable a plugin without access rights.
 #, fuzzy
 msgid "You cannot administer plugins."
 msgstr "ユーザを削除できません"
 
+#. TRANS: Client error displayed when trying to enable or disable a non-existing plugin.
 #, fuzzy
 msgid "No such plugin."
 msgstr "そのようなページはありません。"
@@ -3778,7 +3826,8 @@ msgid "Enabled"
 msgstr ""
 
 #. TRANS: Tab and title for plugins admin panel.
-#. TRANS: Menu item for site administration
+#, fuzzy
+msgctxt "TITLE"
 msgid "Plugins"
 msgstr "プラグイン"
 
@@ -3794,15 +3843,19 @@ msgstr ""
 msgid "Default plugins"
 msgstr "ご希望の言語"
 
+#. TRANS: Text displayed on plugin admin page when no plugin are enabled.
 msgid ""
 "All default plugins have been disabled from the site's configuration file."
 msgstr ""
 
+#. TRANS: Client error displayed if the notice posted has too many characters.
 msgid "Invalid notice content."
 msgstr "不正なトークン。"
 
-#, php-format
-msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’."
+#. TRANS: Exception thrown if a notice's license is not compatible with the StatusNet site license.
+#. TRANS: %1$s is the notice license, %2$s is the StatusNet site's license.
+#, fuzzy, php-format
+msgid "Notice license \"%1$s\" is not compatible with site license \"%2$s\"."
 msgstr ""
 "つぶやきライセンス ‘%1$s’ はサイトライセンス ‘%2$s’ と互換性がありません。"
 
@@ -3954,29 +4007,39 @@ msgstr "設定が保存されました。"
 msgid "Restore account"
 msgstr "新しいグループを作成"
 
+#. TRANS: Client error displayed when requesting a public timeline page beyond the page limit.
+#. TRANS: %s is the page limit.
 #, fuzzy, php-format
 msgid "Beyond the page limit (%s)."
 msgstr "ページ制限を超えました (%s)"
 
+#. TRANS: Server error displayed when a public timeline cannot be retrieved.
 msgid "Could not retrieve public stream."
 msgstr "パブリックストリームを検索できません。"
 
+#. TRANS: Title for all public timeline pages but the first.
+#. TRANS: %d is the page number.
 #, php-format
 msgid "Public timeline, page %d"
 msgstr "パブリックタイムライン、ページ %d"
 
+#. TRANS: Title for the first public timeline page.
 msgid "Public timeline"
 msgstr "パブリックタイムライン"
 
+#. TRANS: Link description for public timeline feed.
 msgid "Public Stream Feed (RSS 1.0)"
 msgstr "パブリックストリームフィード (RSS 1.0)"
 
+#. TRANS: Link description for public timeline feed.
 msgid "Public Stream Feed (RSS 2.0)"
 msgstr "パブリックストリームフィード (RSS 2.0)"
 
+#. TRANS: Link description for public timeline feed.
 msgid "Public Stream Feed (Atom)"
 msgstr "パブリックストリームフィード (Atom)"
 
+#. TRANS: Text displayed for public feed when there are no public notices.
 #, php-format
 msgid ""
 "This is the public timeline for %%site.name%% but no one has posted anything "
@@ -3985,9 +4048,11 @@ msgstr ""
 "これは %%site.name%% のパブリックタイムラインです、しかしまだ誰も投稿していま"
 "せん。"
 
+#. TRANS: Additional text displayed for public feed when there are no public notices for a logged in user.
 msgid "Be the first to post!"
 msgstr "投稿する1番目になってください!"
 
+#. TRANS: Additional text displayed for public feed when there are no public notices for a not logged in user.
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post!"
@@ -3995,6 +4060,8 @@ msgstr ""
 "なぜ [アカウント登録](%%action.register%%) しないのですか、そして最初の投稿を"
 "してください!"
 
+#. TRANS: Message for not logged in users at an invite-only site trying to view the public feed of notices.
+#. TRANS: This message contains Markdown links. Please mind the formatting.
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -4008,6 +4075,8 @@ msgstr ""
 "族そして同僚などについてのつぶやきを共有しましょう! ([もっと読む](%%doc.help%"
 "%))"
 
+#. TRANS: Message for not logged in users at a closed site trying to view the public feed of notices.
+#. TRANS: This message contains Markdown links. Please mind the formatting.
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -5730,6 +5799,10 @@ msgid ""
 "along with this program.  If not, see %s."
 msgstr ""
 
+#. TRANS: Menu item for site administration
+msgid "Plugins"
+msgstr "プラグイン"
+
 #. TRANS: Form input field label for application name.
 msgid "Name"
 msgstr "名前"
@@ -6228,6 +6301,9 @@ msgstr "saveSettings() は実装されていません。"
 msgid "Unable to delete design setting."
 msgstr "デザイン設定を削除できません。"
 
+msgid "Home"
+msgstr "ホームページ"
+
 #. TRANS: Menu item title/tooltip
 msgid "Basic site configuration"
 msgstr "基本サイト設定"
@@ -6827,9 +6903,6 @@ msgstr "インストーラへ。"
 msgid "Database error"
 msgstr "データベースエラー"
 
-msgid "Home"
-msgstr "ホームページ"
-
 msgid "Public"
 msgstr "パブリック"
 
@@ -7603,7 +7676,6 @@ msgstr "つぶやきを送る"
 msgid "What's up, %s?"
 msgstr "最近どう %s?"
 
-#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr "添付"
 
@@ -7676,6 +7748,9 @@ msgstr "このつぶやきを削除"
 msgid "Notice repeated"
 msgstr "つぶやきを繰り返しました"
 
+msgid "Update your status..."
+msgstr ""
+
 msgid "Nudge this user"
 msgstr "このユーザへ合図"
 
@@ -8179,11 +8254,3 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
-
-#, fuzzy
-#~ msgid "Friends timeline"
-#~ msgstr "%s のタイムライン"
-
-#, fuzzy
-#~ msgid "Everyone on this site"
-#~ msgstr "このサイトの人々を探す"
diff --git a/locale/ka/LC_MESSAGES/statusnet.po b/locale/ka/LC_MESSAGES/statusnet.po
index 2ee236d8e5..c282ae94ac 100644
--- a/locale/ka/LC_MESSAGES/statusnet.po
+++ b/locale/ka/LC_MESSAGES/statusnet.po
@@ -9,17 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-08 01:03+0000\n"
-"PO-Revision-Date: 2011-03-08 01:05:20+0000\n"
+"POT-Creation-Date: 2011-03-11 18:15+0000\n"
+"PO-Revision-Date: 2011-03-11 18:17:16+0000\n"
 "Language-Team: Georgian <http://translatewiki.net/wiki/Portal:ka>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
+"X-Generator: MediaWiki 1.18alpha (r83703); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ka\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-POT-Import-Date: 2011-03-06 02:16:47+0000\n"
+"X-POT-Import-Date: 2011-03-08 01:25:01+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -1034,7 +1034,7 @@ msgstr "მოძებნე შეტყობინებებში"
 
 #. TRANS: Client exception thrown when trying favorite a notice without content.
 #, fuzzy
-msgid "Unknown note."
+msgid "Unknown notice."
 msgstr "უცნობი"
 
 #. TRANS: Client exception thrown when trying favorite an already favorited notice.
@@ -1622,6 +1622,7 @@ msgstr "ამ მომხმარებლის წაშლა"
 #. TRANS: Client error displayed trying to create a new direct message while not logged in.
 #. TRANS: Client error displayed trying to send a notice while not logged in.
 #. TRANS: Client error displayed trying to nudge a user without being logged in.
+#. TRANS: Client error displayed when trying to enable or disable a plugin while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
@@ -3133,6 +3134,10 @@ msgstr "წყაროს URL სავალდებულოა."
 msgid "Could not create application."
 msgstr "აპლიკაციის შექმნა ვერ მოხერხდა."
 
+#, fuzzy
+msgid "Invalid image."
+msgstr "ზომა არასწორია."
+
 #. TRANS: Title for form to create a group.
 msgid "New group"
 msgstr "ახალი ჯგუფი"
@@ -3413,52 +3418,77 @@ msgstr ""
 "ეს არის თქვენი გამავალი ფოსტა, რომელშიც ჩამოთვლილია პირადი შეტყობინებები "
 "რომლებიც თქვენ გააგზავნეთ."
 
+#. TRANS: Title for page where to change password.
+#, fuzzy
+msgctxt "TITLE"
 msgid "Change password"
 msgstr "შეცვალეთ პაროლი"
 
+#. TRANS: Instructions for page where to change password.
 msgid "Change your password."
 msgstr "შეცვალეთ თქვენი პაროლი."
 
+#. TRANS: Fieldset legend on page where to change password.
 #. TRANS: Fieldset legend for password reset form.
 msgid "Password change"
 msgstr "პაროლის შეცვლა"
 
+#. TRANS: Field label on page where to change password.
 msgid "Old password"
 msgstr "ძველი პაროლი"
 
+#. TRANS: Field label on page where to change password.
 #. TRANS: Field label for password reset form.
 msgid "New password"
 msgstr "ახალი პაროლი"
 
+#. TRANS: Field title on page where to change password.
 #, fuzzy
 msgid "6 or more characters."
 msgstr "6 ან მეტი სიმბოლო"
 
+#. TRANS: Field label on page where to change password. In this field the new password should be typed a second time.
+#, fuzzy
+msgctxt "LABEL"
+msgid "Confirm"
+msgstr "ვადასტურებ"
+
+#. TRANS: Field title on page where to change password.
 #. TRANS: Ttile for field label for password reset form where the password has to be typed again.
 #, fuzzy
 msgid "Same as password above."
 msgstr "იგივე რაც ზედა პაროლი"
 
+#. TRANS: Button text on page where to change password.
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Change"
 msgstr "შეცვლა"
 
+#. TRANS: Form validation error on page where to change password.
 msgid "Password must be 6 or more characters."
 msgstr "პაროლი უნდა შედგებოდეს 6 ან მეტი სიმბოლოსგან."
 
 msgid "Passwords don't match."
 msgstr "პაროლები არ ემთხვევა."
 
-msgid "Incorrect old password"
+#. TRANS: Form validation error on page where to change password.
+#, fuzzy
+msgid "Incorrect old password."
 msgstr "არასწორი ძველი პაროლი"
 
+#. TRANS: Form validation error on page where to change password.
 msgid "Error saving user; invalid."
 msgstr "შეცდომა მომხმარებლის შენახვისას; არასწორი."
 
+#. TRANS: Server error displayed on page where to change password when password change
+#. TRANS: could not be made because of a server error.
 #. TRANS: Reset password form validation error message.
 #, fuzzy
 msgid "Cannot save new password."
 msgstr "ვერ ვინახავ ახალ პაროლს."
 
+#. TRANS: Form validation notice on page where to change password.
 msgid "Password saved."
 msgstr "პაროლი შენახულია."
 
@@ -3508,6 +3538,7 @@ msgstr "საიტი"
 msgid "Server"
 msgstr "სერვერი"
 
+#. TRANS: Field title in Paths admin panel.
 msgid "Site's server hostname."
 msgstr "საიტის სერვერის ჰოსტის სახელი."
 
@@ -3515,6 +3546,7 @@ msgstr "საიტის სერვერის ჰოსტის სახ
 msgid "Path"
 msgstr "გზა"
 
+#. TRANS: Field title in Paths admin panel.
 #, fuzzy
 msgid "Site path."
 msgstr "საიტის გზა"
@@ -3524,6 +3556,7 @@ msgstr "საიტის გზა"
 msgid "Locale directory"
 msgstr "იერსახის დირექტორია"
 
+#. TRANS: Field title in Paths admin panel.
 msgid "Directory path to locales."
 msgstr ""
 
@@ -3531,9 +3564,14 @@ msgstr ""
 msgid "Fancy URLs"
 msgstr "ლამაზი URL–ები"
 
-msgid "Use fancy (more readable and memorable) URLs?"
+#. TRANS: Field title in Paths admin panel.
+#, fuzzy
+msgid "Use fancy URLs (more readable and memorable)?"
 msgstr "გამოვიყენო ლამაზი (მეტად კითხვადი და დასამახსოვრებელი) URL–ები?"
 
+#. TRANS: Fieldset legend in Paths admin panel.
+#, fuzzy
+msgctxt "LEGEND"
 msgid "Theme"
 msgstr "იერსახე"
 
@@ -3655,6 +3693,8 @@ msgid "Directory where attachments are located."
 msgstr ""
 
 #. TRANS: Fieldset legend in Paths admin panel.
+#, fuzzy
+msgctxt "LEGEND"
 msgid "SSL"
 msgstr "SSL"
 
@@ -3702,10 +3742,14 @@ msgstr ""
 msgid "People search"
 msgstr "პიროვნებების ძიება"
 
+#. TRANS: Client error displayed when trying to tag a profile with an invalid tag.
+#. TRANS: %s is the invalid tag.
 #, php-format
 msgid "Not a valid people tag: %s."
 msgstr "პიროვნებების არასწორი სანიშნე: %s."
 
+#. TRANS: Page title for users with a certain self-tag.
+#. TRANS: %1$s is the tag, %2$s is the page number.
 #, php-format
 msgid "Users self-tagged with %1$s - page %2$d"
 msgstr ""
@@ -3716,15 +3760,19 @@ msgctxt "plugin"
 msgid "Disabled"
 msgstr ""
 
+#. TRANS: Client error displayed when trying to use another method than POST.
+#. TRANS: Do not translate POST.
 #. TRANS: Client error displayed trying to perform any request method other than POST.
 #. TRANS: Do not translate POST.
 msgid "This action only accepts POST requests."
 msgstr "ეს მოქმედება მხოლოდ POST მოთხოვნებს იღებს."
 
+#. TRANS: Client error displayed when trying to enable or disable a plugin without access rights.
 #, fuzzy
 msgid "You cannot administer plugins."
 msgstr "თქვენ ვერ შეძლებთ მომხმარებლების წაშლას."
 
+#. TRANS: Client error displayed when trying to enable or disable a non-existing plugin.
 #, fuzzy
 msgid "No such plugin."
 msgstr "ასეთი გვერდი არ არსებობს."
@@ -3735,7 +3783,8 @@ msgid "Enabled"
 msgstr ""
 
 #. TRANS: Tab and title for plugins admin panel.
-#. TRANS: Menu item for site administration
+#, fuzzy
+msgctxt "TITLE"
 msgid "Plugins"
 msgstr "დამატებები"
 
@@ -3751,15 +3800,19 @@ msgstr ""
 msgid "Default plugins"
 msgstr "პირვანდელი ენა"
 
+#. TRANS: Text displayed on plugin admin page when no plugin are enabled.
 msgid ""
 "All default plugins have been disabled from the site's configuration file."
 msgstr ""
 
+#. TRANS: Client error displayed if the notice posted has too many characters.
 msgid "Invalid notice content."
 msgstr "შეტყობინების არასწორი შიგთავსი."
 
-#, php-format
-msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’."
+#. TRANS: Exception thrown if a notice's license is not compatible with the StatusNet site license.
+#. TRANS: %1$s is the notice license, %2$s is the StatusNet site's license.
+#, fuzzy, php-format
+msgid "Notice license \"%1$s\" is not compatible with site license \"%2$s\"."
 msgstr "შეტყობინების ლიცენზია ‘%1$s’ შეუთავსებელია საიტის ლიცენზიასთან ‘%2$s’."
 
 #. TRANS: Page title for profile settings.
@@ -3911,29 +3964,39 @@ msgstr "პარამეტრები შენახულია."
 msgid "Restore account"
 msgstr "გახსენი ანგარიში"
 
+#. TRANS: Client error displayed when requesting a public timeline page beyond the page limit.
+#. TRANS: %s is the page limit.
 #, php-format
 msgid "Beyond the page limit (%s)."
 msgstr "გვერსიდ საზღვრის მიღმა (%s)."
 
+#. TRANS: Server error displayed when a public timeline cannot be retrieved.
 msgid "Could not retrieve public stream."
 msgstr "საჯარო ნაკადის გამოთხოვნა ვერ ხერხდება."
 
+#. TRANS: Title for all public timeline pages but the first.
+#. TRANS: %d is the page number.
 #, php-format
 msgid "Public timeline, page %d"
 msgstr "საჯარო განახლებების ნაკადი, გვერდი %d"
 
+#. TRANS: Title for the first public timeline page.
 msgid "Public timeline"
 msgstr "საჯარო განახლებების ნაკადი"
 
+#. TRANS: Link description for public timeline feed.
 msgid "Public Stream Feed (RSS 1.0)"
 msgstr ""
 
+#. TRANS: Link description for public timeline feed.
 msgid "Public Stream Feed (RSS 2.0)"
 msgstr ""
 
+#. TRANS: Link description for public timeline feed.
 msgid "Public Stream Feed (Atom)"
 msgstr ""
 
+#. TRANS: Text displayed for public feed when there are no public notices.
 #, php-format
 msgid ""
 "This is the public timeline for %%site.name%% but no one has posted anything "
@@ -3941,14 +4004,18 @@ msgid ""
 msgstr ""
 "ეს არის საჯარო განახლებების ნაკადი, მაგრამ ჯერჯერობით არავის დაუპოსტავს."
 
+#. TRANS: Additional text displayed for public feed when there are no public notices for a logged in user.
 msgid "Be the first to post!"
 msgstr "დაპოსტე პირველმა!"
 
+#. TRANS: Additional text displayed for public feed when there are no public notices for a not logged in user.
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post!"
 msgstr "[დარეგისტრირდი](%%action.register%%) და დაპოსტე პირველმა!"
 
+#. TRANS: Message for not logged in users at an invite-only site trying to view the public feed of notices.
+#. TRANS: This message contains Markdown links. Please mind the formatting.
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -3961,6 +4028,8 @@ msgstr ""
 "[შემოგვიერთდი ახლავე](%%action.register%%) და გაუზიარე შეტყობინებები "
 "მეგობრებს, ოჯახის წევრებს და კოლეგებს! ([გაიგე მეტი](%%doc.help%%))"
 
+#. TRANS: Message for not logged in users at a closed site trying to view the public feed of notices.
+#. TRANS: This message contains Markdown links. Please mind the formatting.
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -5659,6 +5728,10 @@ msgstr ""
 "თქვენ უნდა მიგეღოთ GNU Affero ძირითადი საჯარო ლიცენზიის ასლი ამ პროგრამასთან "
 "ერთად. თუ არა, იხილეთ %s."
 
+#. TRANS: Menu item for site administration
+msgid "Plugins"
+msgstr "დამატებები"
+
 #. TRANS: Form input field label for application name.
 msgid "Name"
 msgstr "დასახელება"
@@ -6159,6 +6232,10 @@ msgstr "saveSettings() არ არის განხორციელებ
 msgid "Unable to delete design setting."
 msgstr "დიზაინის პარამეტრების წაშლა ვერ ხერხდება."
 
+#, fuzzy
+msgid "Home"
+msgstr "ვებ. გვერსი"
+
 #. TRANS: Menu item title/tooltip
 msgid "Basic site configuration"
 msgstr "საიტის ძირითადი კონფიგურაცია"
@@ -6750,10 +6827,6 @@ msgstr "გადადი ამ ინსტალატორზე."
 msgid "Database error"
 msgstr "მონაცემთა ბაზის შეცდომა"
 
-#, fuzzy
-msgid "Home"
-msgstr "ვებ. გვერსი"
-
 msgid "Public"
 msgstr "საჯარო"
 
@@ -7534,7 +7607,6 @@ msgstr "შეტყობინების გაგზავნა"
 msgid "What's up, %s?"
 msgstr "რა არის ახალი %s?"
 
-#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr "ფაილის მიმაგრება"
 
@@ -7603,6 +7675,9 @@ msgstr "შეტყობინების წაშლა"
 msgid "Notice repeated"
 msgstr "შეტყობინება გამეორებულია"
 
+msgid "Update your status..."
+msgstr ""
+
 msgid "Nudge this user"
 msgstr ""
 
@@ -8111,11 +8186,3 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
-
-#, fuzzy
-#~ msgid "Friends timeline"
-#~ msgstr "%s-ის ნაკადი"
-
-#, fuzzy
-#~ msgid "Everyone on this site"
-#~ msgstr "მოძებნე ადამიანები ამ საიტზე"
diff --git a/locale/ko/LC_MESSAGES/statusnet.po b/locale/ko/LC_MESSAGES/statusnet.po
index 4a924d8d21..8d0a52c16f 100644
--- a/locale/ko/LC_MESSAGES/statusnet.po
+++ b/locale/ko/LC_MESSAGES/statusnet.po
@@ -11,17 +11,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-08 01:03+0000\n"
-"PO-Revision-Date: 2011-03-08 01:05:21+0000\n"
+"POT-Creation-Date: 2011-03-11 18:15+0000\n"
+"PO-Revision-Date: 2011-03-11 18:17:17+0000\n"
 "Language-Team: Korean <http://translatewiki.net/wiki/Portal:ko>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
+"X-Generator: MediaWiki 1.18alpha (r83703); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ko\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-POT-Import-Date: 2011-03-06 02:16:47+0000\n"
+"X-POT-Import-Date: 2011-03-08 01:25:01+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -1039,7 +1039,7 @@ msgstr "통지들의 내용 찾기"
 
 #. TRANS: Client exception thrown when trying favorite a notice without content.
 #, fuzzy
-msgid "Unknown note."
+msgid "Unknown notice."
 msgstr "알려지지 않은 행동"
 
 #. TRANS: Client exception thrown when trying favorite an already favorited notice.
@@ -1626,6 +1626,7 @@ msgstr "이 사용자 삭제"
 #. TRANS: Client error displayed trying to create a new direct message while not logged in.
 #. TRANS: Client error displayed trying to send a notice while not logged in.
 #. TRANS: Client error displayed trying to nudge a user without being logged in.
+#. TRANS: Client error displayed when trying to enable or disable a plugin while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
@@ -3116,6 +3117,10 @@ msgstr "소스 URL이 필요합니다."
 msgid "Could not create application."
 msgstr "관심소식을 생성할 수 없습니다."
 
+#, fuzzy
+msgid "Invalid image."
+msgstr "옳지 않은 크기"
+
 #. TRANS: Title for form to create a group.
 msgid "New group"
 msgstr "새로운 그룹"
@@ -3396,52 +3401,77 @@ msgstr "%s의 보낸쪽지함"
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr "당신의 보낸 쪽지함입니다. 이곳엔 당신이 보냈던 비밀 쪽지가 있습니다."
 
+#. TRANS: Title for page where to change password.
+#, fuzzy
+msgctxt "TITLE"
 msgid "Change password"
 msgstr "비밀번호 바꾸기"
 
+#. TRANS: Instructions for page where to change password.
 msgid "Change your password."
 msgstr "비밀번호를 변경하세요."
 
+#. TRANS: Fieldset legend on page where to change password.
 #. TRANS: Fieldset legend for password reset form.
 msgid "Password change"
 msgstr "비밀번호 변경"
 
+#. TRANS: Field label on page where to change password.
 msgid "Old password"
 msgstr "기존 비밀 번호"
 
+#. TRANS: Field label on page where to change password.
 #. TRANS: Field label for password reset form.
 msgid "New password"
 msgstr "새로운 비밀 번호"
 
+#. TRANS: Field title on page where to change password.
 #, fuzzy
 msgid "6 or more characters."
 msgstr "6글자 이상"
 
+#. TRANS: Field label on page where to change password. In this field the new password should be typed a second time.
+#, fuzzy
+msgctxt "LABEL"
+msgid "Confirm"
+msgstr "인증"
+
+#. TRANS: Field title on page where to change password.
 #. TRANS: Ttile for field label for password reset form where the password has to be typed again.
 #, fuzzy
 msgid "Same as password above."
 msgstr "위와 같은 비밀 번호"
 
+#. TRANS: Button text on page where to change password.
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Change"
 msgstr "변경"
 
+#. TRANS: Form validation error on page where to change password.
 msgid "Password must be 6 or more characters."
 msgstr "비밀번호는 6자리 이상이어야 합니다."
 
 msgid "Passwords don't match."
 msgstr "비밀 번호가 일치하지 않습니다."
 
-msgid "Incorrect old password"
+#. TRANS: Form validation error on page where to change password.
+#, fuzzy
+msgid "Incorrect old password."
 msgstr "기존 비밀 번호가 틀렸습니다"
 
+#. TRANS: Form validation error on page where to change password.
 msgid "Error saving user; invalid."
 msgstr "사용자 저장 오류; 무효한 사용자"
 
+#. TRANS: Server error displayed on page where to change password when password change
+#. TRANS: could not be made because of a server error.
 #. TRANS: Reset password form validation error message.
 #, fuzzy
 msgid "Cannot save new password."
 msgstr "새 비밀번호를 저장 할 수 없습니다."
 
+#. TRANS: Form validation notice on page where to change password.
 msgid "Password saved."
 msgstr "비밀 번호 저장"
 
@@ -3491,6 +3521,7 @@ msgstr "사이트"
 msgid "Server"
 msgstr "SSL 서버"
 
+#. TRANS: Field title in Paths admin panel.
 msgid "Site's server hostname."
 msgstr ""
 
@@ -3498,6 +3529,7 @@ msgstr ""
 msgid "Path"
 msgstr "경로"
 
+#. TRANS: Field title in Paths admin panel.
 #, fuzzy
 msgid "Site path."
 msgstr "사이트 테마"
@@ -3507,6 +3539,7 @@ msgstr "사이트 테마"
 msgid "Locale directory"
 msgstr "테마 디렉터리"
 
+#. TRANS: Field title in Paths admin panel.
 msgid "Directory path to locales."
 msgstr ""
 
@@ -3514,9 +3547,13 @@ msgstr ""
 msgid "Fancy URLs"
 msgstr ""
 
-msgid "Use fancy (more readable and memorable) URLs?"
+#. TRANS: Field title in Paths admin panel.
+msgid "Use fancy URLs (more readable and memorable)?"
 msgstr ""
 
+#. TRANS: Fieldset legend in Paths admin panel.
+#, fuzzy
+msgctxt "LEGEND"
 msgid "Theme"
 msgstr "테마"
 
@@ -3638,6 +3675,8 @@ msgid "Directory where attachments are located."
 msgstr ""
 
 #. TRANS: Fieldset legend in Paths admin panel.
+#, fuzzy
+msgctxt "LEGEND"
 msgid "SSL"
 msgstr "SSL"
 
@@ -3683,10 +3722,14 @@ msgstr ""
 msgid "People search"
 msgstr "사람 찾기"
 
+#. TRANS: Client error displayed when trying to tag a profile with an invalid tag.
+#. TRANS: %s is the invalid tag.
 #, php-format
 msgid "Not a valid people tag: %s."
 msgstr "올바른 메일 주소가 아닙니다."
 
+#. TRANS: Page title for users with a certain self-tag.
+#. TRANS: %1$s is the tag, %2$s is the page number.
 #, php-format
 msgid "Users self-tagged with %1$s - page %2$d"
 msgstr "%s 태그된 통지"
@@ -3696,15 +3739,19 @@ msgctxt "plugin"
 msgid "Disabled"
 msgstr ""
 
+#. TRANS: Client error displayed when trying to use another method than POST.
+#. TRANS: Do not translate POST.
 #. TRANS: Client error displayed trying to perform any request method other than POST.
 #. TRANS: Do not translate POST.
 msgid "This action only accepts POST requests."
 msgstr ""
 
+#. TRANS: Client error displayed when trying to enable or disable a plugin without access rights.
 #, fuzzy
 msgid "You cannot administer plugins."
 msgstr "이용자를 업데이트 할 수 없습니다."
 
+#. TRANS: Client error displayed when trying to enable or disable a non-existing plugin.
 #, fuzzy
 msgid "No such plugin."
 msgstr "해당하는 페이지 없음"
@@ -3715,7 +3762,8 @@ msgid "Enabled"
 msgstr ""
 
 #. TRANS: Tab and title for plugins admin panel.
-#. TRANS: Menu item for site administration
+#, fuzzy
+msgctxt "TITLE"
 msgid "Plugins"
 msgstr "플러그인"
 
@@ -3731,15 +3779,19 @@ msgstr ""
 msgid "Default plugins"
 msgstr "기본 언어"
 
+#. TRANS: Text displayed on plugin admin page when no plugin are enabled.
 msgid ""
 "All default plugins have been disabled from the site's configuration file."
 msgstr ""
 
+#. TRANS: Client error displayed if the notice posted has too many characters.
 msgid "Invalid notice content."
 msgstr "옳지 않은 크기"
 
+#. TRANS: Exception thrown if a notice's license is not compatible with the StatusNet site license.
+#. TRANS: %1$s is the notice license, %2$s is the StatusNet site's license.
 #, php-format
-msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’."
+msgid "Notice license \"%1$s\" is not compatible with site license \"%2$s\"."
 msgstr ""
 
 #. TRANS: Page title for profile settings.
@@ -3888,30 +3940,40 @@ msgstr "설정 저장"
 msgid "Restore account"
 msgstr "새 계정 만들기"
 
+#. TRANS: Client error displayed when requesting a public timeline page beyond the page limit.
+#. TRANS: %s is the page limit.
 #, php-format
 msgid "Beyond the page limit (%s)."
 msgstr ""
 
+#. TRANS: Server error displayed when a public timeline cannot be retrieved.
 msgid "Could not retrieve public stream."
 msgstr "공개 stream을 불러올 수 없습니다."
 
+#. TRANS: Title for all public timeline pages but the first.
+#. TRANS: %d is the page number.
 #, php-format
 msgid "Public timeline, page %d"
 msgstr "공개 타임라인, %d 페이지"
 
+#. TRANS: Title for the first public timeline page.
 msgid "Public timeline"
 msgstr "퍼블릭 타임라인"
 
+#. TRANS: Link description for public timeline feed.
 msgid "Public Stream Feed (RSS 1.0)"
 msgstr "%s 그룹을 위한 공지피드 (RSS 1.0)"
 
+#. TRANS: Link description for public timeline feed.
 msgid "Public Stream Feed (RSS 2.0)"
 msgstr "%s 그룹을 위한 공지피드 (RSS 2.0)"
 
+#. TRANS: Link description for public timeline feed.
 #, fuzzy
 msgid "Public Stream Feed (Atom)"
 msgstr "퍼블릭 스트림 피드"
 
+#. TRANS: Text displayed for public feed when there are no public notices.
 #, php-format
 msgid ""
 "This is the public timeline for %%site.name%% but no one has posted anything "
@@ -3919,15 +3981,19 @@ msgid ""
 msgstr ""
 "%%site.name%% 의 공개 타임라인이지만, 아직 아무도 글을 쓰지 않았습니다."
 
+#. TRANS: Additional text displayed for public feed when there are no public notices for a logged in user.
 #, fuzzy
 msgid "Be the first to post!"
 msgstr "글을 올린 첫번째 사람이 되세요!"
 
+#. TRANS: Additional text displayed for public feed when there are no public notices for a not logged in user.
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post!"
 msgstr ""
 
+#. TRANS: Message for not logged in users at an invite-only site trying to view the public feed of notices.
+#. TRANS: This message contains Markdown links. Please mind the formatting.
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -3936,6 +4002,8 @@ msgid ""
 "friends, family, and colleagues! ([Read more](%%doc.help%%))"
 msgstr ""
 
+#. TRANS: Message for not logged in users at a closed site trying to view the public feed of notices.
+#. TRANS: This message contains Markdown links. Please mind the formatting.
 #, fuzzy, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -5604,6 +5672,10 @@ msgstr ""
 "GNU 일반 공중 사용 허가서는 이 프로그램과 함께 제공됩니다. 만약, 이 문서가 누"
 "락되어 있다면 %s 페이지를 보십시오."
 
+#. TRANS: Menu item for site administration
+msgid "Plugins"
+msgstr "플러그인"
+
 #. TRANS: Form input field label for application name.
 msgid "Name"
 msgstr "이름"
@@ -6107,6 +6179,9 @@ msgstr "명령이 아직 실행되지 않았습니다."
 msgid "Unable to delete design setting."
 msgstr "디자인 설정을 저장할 수 없습니다."
 
+msgid "Home"
+msgstr "홈페이지"
+
 #. TRANS: Menu item title/tooltip
 msgid "Basic site configuration"
 msgstr "메일 주소 확인"
@@ -6697,9 +6772,6 @@ msgstr "이 사이트에 로그인"
 msgid "Database error"
 msgstr "데이터베이스 오류"
 
-msgid "Home"
-msgstr "홈페이지"
-
 msgid "Public"
 msgstr "공개"
 
@@ -7397,7 +7469,6 @@ msgstr "게시글 보내기"
 msgid "What's up, %s?"
 msgstr "뭐하세요 %s님?"
 
-#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr "첨부"
 
@@ -7465,6 +7536,9 @@ msgstr "이 게시글 삭제하기"
 msgid "Notice repeated"
 msgstr "게시글이 등록되었습니다."
 
+msgid "Update your status..."
+msgstr ""
+
 msgid "Nudge this user"
 msgstr "이 사용자 찔러 보기"
 
@@ -7975,11 +8049,3 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
-
-#, fuzzy
-#~ msgid "Friends timeline"
-#~ msgstr "%s 타임라인"
-
-#, fuzzy
-#~ msgid "Everyone on this site"
-#~ msgstr "이 사이트에 있는 사람 찾기"
diff --git a/locale/mk/LC_MESSAGES/statusnet.po b/locale/mk/LC_MESSAGES/statusnet.po
index 04eee7354c..330d0022dc 100644
--- a/locale/mk/LC_MESSAGES/statusnet.po
+++ b/locale/mk/LC_MESSAGES/statusnet.po
@@ -10,17 +10,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-08 01:03+0000\n"
-"PO-Revision-Date: 2011-03-08 01:05:22+0000\n"
+"POT-Creation-Date: 2011-03-11 18:15+0000\n"
+"PO-Revision-Date: 2011-03-11 18:17:18+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
+"X-Generator: MediaWiki 1.18alpha (r83703); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
-"X-POT-Import-Date: 2011-03-06 02:16:47+0000\n"
+"X-POT-Import-Date: 2011-03-08 01:25:01+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -1041,7 +1041,8 @@ msgid "Can only fave notices."
 msgstr "Може само да бендисува забелешки."
 
 #. TRANS: Client exception thrown when trying favorite a notice without content.
-msgid "Unknown note."
+#, fuzzy
+msgid "Unknown notice."
 msgstr "Непозната белешка."
 
 #. TRANS: Client exception thrown when trying favorite an already favorited notice.
@@ -1610,6 +1611,7 @@ msgstr "Избриши ја групава."
 #. TRANS: Client error displayed trying to create a new direct message while not logged in.
 #. TRANS: Client error displayed trying to send a notice while not logged in.
 #. TRANS: Client error displayed trying to nudge a user without being logged in.
+#. TRANS: Client error displayed when trying to enable or disable a plugin while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
@@ -3088,6 +3090,10 @@ msgstr "Треба изворна URL-адреса."
 msgid "Could not create application."
 msgstr "Не можеше да се создаде програмот."
 
+#, fuzzy
+msgid "Invalid image."
+msgstr "Погрешна големина."
+
 #. TRANS: Title for form to create a group.
 msgid "New group"
 msgstr "Нова група"
@@ -3374,49 +3380,74 @@ msgstr ""
 "Ова е Вашето излезно сандче, во кое се наведени приватните пораки кои ги "
 "имате испратено."
 
+#. TRANS: Title for page where to change password.
+#, fuzzy
+msgctxt "TITLE"
 msgid "Change password"
 msgstr "Промени ја лозинката"
 
+#. TRANS: Instructions for page where to change password.
 msgid "Change your password."
 msgstr "Променете си ја лозинката."
 
+#. TRANS: Fieldset legend on page where to change password.
 #. TRANS: Fieldset legend for password reset form.
 msgid "Password change"
 msgstr "Промена на лозинка"
 
+#. TRANS: Field label on page where to change password.
 msgid "Old password"
 msgstr "Стара лозинка"
 
+#. TRANS: Field label on page where to change password.
 #. TRANS: Field label for password reset form.
 msgid "New password"
 msgstr "Нова лозинка"
 
+#. TRANS: Field title on page where to change password.
 msgid "6 or more characters."
 msgstr "6 или повеќе знаци."
 
+#. TRANS: Field label on page where to change password. In this field the new password should be typed a second time.
+#, fuzzy
+msgctxt "LABEL"
+msgid "Confirm"
+msgstr "Потврди"
+
+#. TRANS: Field title on page where to change password.
 #. TRANS: Ttile for field label for password reset form where the password has to be typed again.
 msgid "Same as password above."
 msgstr "Исто како лозинката погоре."
 
+#. TRANS: Button text on page where to change password.
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Change"
 msgstr "Промени"
 
+#. TRANS: Form validation error on page where to change password.
 msgid "Password must be 6 or more characters."
 msgstr "Лозинката мора да содржи барем 6 знаци."
 
 msgid "Passwords don't match."
 msgstr "Лозинките не се совпаѓаат."
 
-msgid "Incorrect old password"
+#. TRANS: Form validation error on page where to change password.
+#, fuzzy
+msgid "Incorrect old password."
 msgstr "Неточна стара лозинка"
 
+#. TRANS: Form validation error on page where to change password.
 msgid "Error saving user; invalid."
 msgstr "Грешка во зачувувањето на корисникот; неправилен."
 
+#. TRANS: Server error displayed on page where to change password when password change
+#. TRANS: could not be made because of a server error.
 #. TRANS: Reset password form validation error message.
 msgid "Cannot save new password."
 msgstr "Не можам да ја зачувам новата лозинка."
 
+#. TRANS: Form validation notice on page where to change password.
 msgid "Password saved."
 msgstr "Лозинката е зачувана."
 
@@ -3466,6 +3497,7 @@ msgstr "Мреж. место"
 msgid "Server"
 msgstr "Опслужувач"
 
+#. TRANS: Field title in Paths admin panel.
 msgid "Site's server hostname."
 msgstr "Назив на домаќинот на опслужувачот на мрежното место"
 
@@ -3473,6 +3505,7 @@ msgstr "Назив на домаќинот на опслужувачот на м
 msgid "Path"
 msgstr "Патека"
 
+#. TRANS: Field title in Paths admin panel.
 msgid "Site path."
 msgstr "Патека на мреж. место."
 
@@ -3480,6 +3513,7 @@ msgstr "Патека на мреж. место."
 msgid "Locale directory"
 msgstr "Директориум на места"
 
+#. TRANS: Field title in Paths admin panel.
 msgid "Directory path to locales."
 msgstr "Патека на директориумот на местата."
 
@@ -3487,9 +3521,14 @@ msgstr "Патека на директориумот на местата."
 msgid "Fancy URLs"
 msgstr "Интересни URL-адреси"
 
-msgid "Use fancy (more readable and memorable) URLs?"
+#. TRANS: Field title in Paths admin panel.
+#, fuzzy
+msgid "Use fancy URLs (more readable and memorable)?"
 msgstr "Да користам интересни (почитливи и повпечатливи) URL-адреси?"
 
+#. TRANS: Fieldset legend in Paths admin panel.
+#, fuzzy
+msgctxt "LEGEND"
 msgid "Theme"
 msgstr "Изглед"
 
@@ -3602,6 +3641,8 @@ msgid "Directory where attachments are located."
 msgstr "Директориумот кадешто се сместени прилозите."
 
 #. TRANS: Fieldset legend in Paths admin panel.
+#, fuzzy
+msgctxt "LEGEND"
 msgid "SSL"
 msgstr "SSL"
 
@@ -3647,10 +3688,14 @@ msgstr ""
 msgid "People search"
 msgstr "Пребарување на луѓе"
 
+#. TRANS: Client error displayed when trying to tag a profile with an invalid tag.
+#. TRANS: %s is the invalid tag.
 #, php-format
 msgid "Not a valid people tag: %s."
 msgstr "Не е важечка ознака за луѓе: %s."
 
+#. TRANS: Page title for users with a certain self-tag.
+#. TRANS: %1$s is the tag, %2$s is the page number.
 #, php-format
 msgid "Users self-tagged with %1$s - page %2$d"
 msgstr "Користници самоозначени со %1$s - стр. %2$d"
@@ -3660,14 +3705,18 @@ msgctxt "plugin"
 msgid "Disabled"
 msgstr "Оневозможено"
 
+#. TRANS: Client error displayed when trying to use another method than POST.
+#. TRANS: Do not translate POST.
 #. TRANS: Client error displayed trying to perform any request method other than POST.
 #. TRANS: Do not translate POST.
 msgid "This action only accepts POST requests."
 msgstr "Ова дејство прифаќа само POST-барања"
 
+#. TRANS: Client error displayed when trying to enable or disable a plugin without access rights.
 msgid "You cannot administer plugins."
 msgstr "Не можете да раководите со приклучоци."
 
+#. TRANS: Client error displayed when trying to enable or disable a non-existing plugin.
 msgid "No such plugin."
 msgstr "Нема таков приклучок."
 
@@ -3677,7 +3726,8 @@ msgid "Enabled"
 msgstr "Овозможено"
 
 #. TRANS: Tab and title for plugins admin panel.
-#. TRANS: Menu item for site administration
+#, fuzzy
+msgctxt "TITLE"
 msgid "Plugins"
 msgstr "Приклучоци"
 
@@ -3695,16 +3745,20 @@ msgstr ""
 msgid "Default plugins"
 msgstr "Основни приклучоци"
 
+#. TRANS: Text displayed on plugin admin page when no plugin are enabled.
 msgid ""
 "All default plugins have been disabled from the site's configuration file."
 msgstr ""
 "Сите основни приклучоци се оневозможени во поставките на мрежното место."
 
+#. TRANS: Client error displayed if the notice posted has too many characters.
 msgid "Invalid notice content."
 msgstr "Неважечка содржина на забелешката."
 
-#, php-format
-msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’."
+#. TRANS: Exception thrown if a notice's license is not compatible with the StatusNet site license.
+#. TRANS: %1$s is the notice license, %2$s is the StatusNet site's license.
+#, fuzzy, php-format
+msgid "Notice license \"%1$s\" is not compatible with site license \"%2$s\"."
 msgstr ""
 "Лиценцата на забелешката „%1$s“ не е соодветна на лиценцата на мрежното "
 "место „%2$s“."
@@ -3854,29 +3908,39 @@ msgstr "Нагодувањата се зачувани"
 msgid "Restore account"
 msgstr "Врати сметка"
 
+#. TRANS: Client error displayed when requesting a public timeline page beyond the page limit.
+#. TRANS: %s is the page limit.
 #, php-format
 msgid "Beyond the page limit (%s)."
 msgstr "Надминато е ограничувањето на страницата (%s)."
 
+#. TRANS: Server error displayed when a public timeline cannot be retrieved.
 msgid "Could not retrieve public stream."
 msgstr "Не можам да го вратам јавниот поток."
 
+#. TRANS: Title for all public timeline pages but the first.
+#. TRANS: %d is the page number.
 #, php-format
 msgid "Public timeline, page %d"
 msgstr "Јавна историја, стр. %d"
 
+#. TRANS: Title for the first public timeline page.
 msgid "Public timeline"
 msgstr "Јавна историја"
 
+#. TRANS: Link description for public timeline feed.
 msgid "Public Stream Feed (RSS 1.0)"
 msgstr "Канал на јавниот поток (RSS 1.0)"
 
+#. TRANS: Link description for public timeline feed.
 msgid "Public Stream Feed (RSS 2.0)"
 msgstr "Канал на јавниот поток (RSS 2.0)"
 
+#. TRANS: Link description for public timeline feed.
 msgid "Public Stream Feed (Atom)"
 msgstr "Канал на јавниот поток (Atom)"
 
+#. TRANS: Text displayed for public feed when there are no public notices.
 #, php-format
 msgid ""
 "This is the public timeline for %%site.name%% but no one has posted anything "
@@ -3884,9 +3948,11 @@ msgid ""
 msgstr ""
 "Ова е јавната историја за %%site.name%%, но досега никој ништо нема објавено."
 
+#. TRANS: Additional text displayed for public feed when there are no public notices for a logged in user.
 msgid "Be the first to post!"
 msgstr "Создајте ја првата забелешка!"
 
+#. TRANS: Additional text displayed for public feed when there are no public notices for a not logged in user.
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post!"
@@ -3894,6 +3960,8 @@ msgstr ""
 "Зошто не [регистрирате сметка](%%action.register%%) и станете првиот "
 "објавувач!"
 
+#. TRANS: Message for not logged in users at an invite-only site trying to view the public feed of notices.
+#. TRANS: This message contains Markdown links. Please mind the formatting.
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -3907,6 +3975,8 @@ msgstr ""
 "си споделувате забелешки за себе со приајтелите, семејството и колегите! "
 "([Прочитајте повеќе](%%doc.help%%))"
 
+#. TRANS: Message for not logged in users at a closed site trying to view the public feed of notices.
+#. TRANS: This message contains Markdown links. Please mind the formatting.
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -5610,6 +5680,10 @@ msgstr ""
 "Треба да имате добиено примерок од Општата јавна лиценца ГНУ Аферо заедно со "
 "овој програм.  Ако ја немате, погледајте %s."
 
+#. TRANS: Menu item for site administration
+msgid "Plugins"
+msgstr "Приклучоци"
+
 #. TRANS: Form input field label for application name.
 msgid "Name"
 msgstr "Име"
@@ -5948,9 +6022,8 @@ msgstr "Одговори"
 msgid "Write a reply..."
 msgstr "Напишете одговор..."
 
-#, fuzzy
 msgid "Status"
-msgstr "StatusNet"
+msgstr "Статус"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #. TRANS: Text between [] is a link description, text between () is the link itself.
@@ -6116,6 +6189,9 @@ msgstr "saveSettings() не е имплементирано."
 msgid "Unable to delete design setting."
 msgstr "Не можам да ги избришам нагодувањата за изглед."
 
+msgid "Home"
+msgstr "Домашна страница"
+
 #. TRANS: Menu item title/tooltip
 msgid "Basic site configuration"
 msgstr "Основни нагодувања на мрежното место"
@@ -6742,9 +6818,6 @@ msgstr "Оди на инсталаторот."
 msgid "Database error"
 msgstr "Грешка во базата на податоци"
 
-msgid "Home"
-msgstr "Домашна страница"
-
 msgid "Public"
 msgstr "Јавен"
 
@@ -7517,18 +7590,16 @@ msgid "from"
 msgstr "од"
 
 msgid "Can't get author for activity."
-msgstr ""
+msgstr "Не можам да го добијам авторот за активноста."
 
-#, fuzzy
 msgid "Bookmark not posted to this group."
-msgstr "Не Ви е дозволено да ја избришете оваа група."
+msgstr "На оваа група не е објавен одбележувач."
 
-#, fuzzy
 msgid "Object not posted to this user."
-msgstr "Не го бриши корисников."
+msgstr "Објектот не му е испратен на овој корисник."
 
 msgid "Don't know how to handle this kind of target."
-msgstr ""
+msgstr "Не знам како да работам со ваква одредница."
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 msgid "Nickname cannot be empty."
@@ -7550,7 +7621,6 @@ msgstr "Испрати забелешка"
 msgid "What's up, %s?"
 msgstr "Што има ново, %s?"
 
-#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr "Приложи"
 
@@ -7618,6 +7688,9 @@ msgstr "Избриши ја оваа забелешка"
 msgid "Notice repeated"
 msgstr "Забелешката е повторена"
 
+msgid "Update your status..."
+msgstr ""
+
 msgid "Nudge this user"
 msgstr "Подбуцни го корисников"
 
@@ -8120,9 +8193,3 @@ msgstr "Неважечки XML. Нема XRD-корен."
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr "Земам резерва на податотеката „%s“."
-
-#~ msgid "Friends timeline"
-#~ msgstr "Историја на пријатели"
-
-#~ msgid "Everyone on this site"
-#~ msgstr "Сите на ова мрежно место"
diff --git a/locale/ml/LC_MESSAGES/statusnet.po b/locale/ml/LC_MESSAGES/statusnet.po
index 84a9210ef5..11c70d96e5 100644
--- a/locale/ml/LC_MESSAGES/statusnet.po
+++ b/locale/ml/LC_MESSAGES/statusnet.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-08 01:03+0000\n"
-"PO-Revision-Date: 2011-03-08 01:05:23+0000\n"
+"POT-Creation-Date: 2011-03-11 18:15+0000\n"
+"PO-Revision-Date: 2011-03-11 18:17:19+0000\n"
 "Language-Team: Malayalam <http://translatewiki.net/wiki/Portal:ml>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-06 02:16:47+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
+"X-POT-Import-Date: 2011-03-08 01:25:01+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83703); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ml\n"
 "X-Message-Group: #out-statusnet-core\n"
@@ -1010,7 +1010,8 @@ msgid "Can only fave notices."
 msgstr "അറിയിപ്പുകൾ മാത്രമേ പ്രിയങ്കരമാണെന്ന് കുറിക്കാനാവൂ."
 
 #. TRANS: Client exception thrown when trying favorite a notice without content.
-msgid "Unknown note."
+#, fuzzy
+msgid "Unknown notice."
 msgstr "അജ്ഞാതമായ കുറിപ്പ്."
 
 #. TRANS: Client exception thrown when trying favorite an already favorited notice.
@@ -1565,6 +1566,7 @@ msgstr "ഈ സംഘത്തെ മായ്ക്കുക."
 #. TRANS: Client error displayed trying to create a new direct message while not logged in.
 #. TRANS: Client error displayed trying to send a notice while not logged in.
 #. TRANS: Client error displayed trying to nudge a user without being logged in.
+#. TRANS: Client error displayed when trying to enable or disable a plugin while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
@@ -3015,6 +3017,10 @@ msgstr "സ്രോതസ്സ് യു.ആർ.എൽ. ആവശ്യമാ
 msgid "Could not create application."
 msgstr ""
 
+#, fuzzy
+msgid "Invalid image."
+msgstr "അസാധുവായ വലിപ്പം."
+
 #. TRANS: Title for form to create a group.
 msgid "New group"
 msgstr "പുതിയ സംഘം"
@@ -3289,49 +3295,74 @@ msgstr "%s എന്ന ഉപയോക്താവിന്റെ ഔട്ട
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr "ഇത് താങ്കളുടെ ഔട്ട്ബോക്സ് ആണ്, താങ്കൾ അയച്ച സ്വകാര്യ സന്ദേശങ്ങൾ ഇവിടെ കാണാം."
 
+#. TRANS: Title for page where to change password.
+#, fuzzy
+msgctxt "TITLE"
 msgid "Change password"
 msgstr "രഹസ്യവാക്ക് മാറ്റുക"
 
+#. TRANS: Instructions for page where to change password.
 msgid "Change your password."
 msgstr "താങ്കളുടെ രഹസ്യവാക്ക് മാറ്റുക."
 
+#. TRANS: Fieldset legend on page where to change password.
 #. TRANS: Fieldset legend for password reset form.
 msgid "Password change"
 msgstr "രഹസ്യവാക്ക് മാറ്റൽ"
 
+#. TRANS: Field label on page where to change password.
 msgid "Old password"
 msgstr "പഴയ രഹസ്യവാക്ക്"
 
+#. TRANS: Field label on page where to change password.
 #. TRANS: Field label for password reset form.
 msgid "New password"
 msgstr "പുതിയ രഹസ്യവാക്ക്"
 
+#. TRANS: Field title on page where to change password.
 msgid "6 or more characters."
 msgstr "ആറോ അതിലധികമോ അക്ഷരങ്ങൾ."
 
+#. TRANS: Field label on page where to change password. In this field the new password should be typed a second time.
+#, fuzzy
+msgctxt "LABEL"
+msgid "Confirm"
+msgstr "സ്ഥിരീകരിക്കുക"
+
+#. TRANS: Field title on page where to change password.
 #. TRANS: Ttile for field label for password reset form where the password has to be typed again.
 msgid "Same as password above."
 msgstr "മുകളിൽ നൽകിയ അതേ രഹസ്യവാക്ക്."
 
+#. TRANS: Button text on page where to change password.
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Change"
 msgstr "മാറ്റുക"
 
+#. TRANS: Form validation error on page where to change password.
 msgid "Password must be 6 or more characters."
 msgstr "രഹസ്യവാക്കിന് ആറോ അതിലധികമോ അക്ഷരങ്ങളുണ്ടായിരിക്കണം."
 
 msgid "Passwords don't match."
 msgstr "രഹസ്യവാക്കുകൾ തമ്മിൽ യോജിക്കുന്നില്ല"
 
-msgid "Incorrect old password"
+#. TRANS: Form validation error on page where to change password.
+#, fuzzy
+msgid "Incorrect old password."
 msgstr "പഴയ രഹസ്യവാക്ക് തെറ്റാണ്"
 
+#. TRANS: Form validation error on page where to change password.
 msgid "Error saving user; invalid."
 msgstr "ഉപയോക്താവിനെ സേവ് ചെയ്യുന്നതിൽ പിഴവുണ്ടായി; അസാധുവാണ്."
 
+#. TRANS: Server error displayed on page where to change password when password change
+#. TRANS: could not be made because of a server error.
 #. TRANS: Reset password form validation error message.
 msgid "Cannot save new password."
 msgstr "പുതിയ രഹസ്യവാക്ക് സേവ് ചെയ്യാനാവില്ല."
 
+#. TRANS: Form validation notice on page where to change password.
 msgid "Password saved."
 msgstr "രഹസ്യവാക്ക് സേവ് ചെയ്തിരിക്കുന്നു."
 
@@ -3381,6 +3412,7 @@ msgstr "സൈറ്റ്"
 msgid "Server"
 msgstr "സെർവർ"
 
+#. TRANS: Field title in Paths admin panel.
 msgid "Site's server hostname."
 msgstr ""
 
@@ -3388,6 +3420,7 @@ msgstr ""
 msgid "Path"
 msgstr ""
 
+#. TRANS: Field title in Paths admin panel.
 msgid "Site path."
 msgstr ""
 
@@ -3395,6 +3428,7 @@ msgstr ""
 msgid "Locale directory"
 msgstr ""
 
+#. TRANS: Field title in Paths admin panel.
 msgid "Directory path to locales."
 msgstr ""
 
@@ -3402,9 +3436,14 @@ msgstr ""
 msgid "Fancy URLs"
 msgstr "അലങ്കൃത യൂ.ആർ.എല്ലുകൾ"
 
-msgid "Use fancy (more readable and memorable) URLs?"
+#. TRANS: Field title in Paths admin panel.
+#, fuzzy
+msgid "Use fancy URLs (more readable and memorable)?"
 msgstr "അലങ്കൃത (വായിക്കാനും ഓർത്തിരിക്കാനും എളുപ്പമായവ) യൂ.ആർ.എല്ലുകൾ ഉപയോഗിക്കണോ?"
 
+#. TRANS: Fieldset legend in Paths admin panel.
+#, fuzzy
+msgctxt "LEGEND"
 msgid "Theme"
 msgstr "ദൃശ്യരൂപം"
 
@@ -3517,6 +3556,8 @@ msgid "Directory where attachments are located."
 msgstr ""
 
 #. TRANS: Fieldset legend in Paths admin panel.
+#, fuzzy
+msgctxt "LEGEND"
 msgid "SSL"
 msgstr "എസ്.എസ്.എൽ."
 
@@ -3559,10 +3600,14 @@ msgstr ""
 msgid "People search"
 msgstr "ആൾക്കാരെ തിരയുക"
 
+#. TRANS: Client error displayed when trying to tag a profile with an invalid tag.
+#. TRANS: %s is the invalid tag.
 #, php-format
 msgid "Not a valid people tag: %s."
 msgstr ""
 
+#. TRANS: Page title for users with a certain self-tag.
+#. TRANS: %1$s is the tag, %2$s is the page number.
 #, php-format
 msgid "Users self-tagged with %1$s - page %2$d"
 msgstr ""
@@ -3572,15 +3617,19 @@ msgctxt "plugin"
 msgid "Disabled"
 msgstr ""
 
+#. TRANS: Client error displayed when trying to use another method than POST.
+#. TRANS: Do not translate POST.
 #. TRANS: Client error displayed trying to perform any request method other than POST.
 #. TRANS: Do not translate POST.
 msgid "This action only accepts POST requests."
 msgstr ""
 
+#. TRANS: Client error displayed when trying to enable or disable a plugin without access rights.
 #, fuzzy
 msgid "You cannot administer plugins."
 msgstr "താങ്കൾക്ക് ഉപയോക്താക്കളെ നീക്കം ചെയ്യാൻ കഴിയില്ല."
 
+#. TRANS: Client error displayed when trying to enable or disable a non-existing plugin.
 #, fuzzy
 msgid "No such plugin."
 msgstr "അത്തരത്തിൽ ഒരു താളില്ല."
@@ -3591,7 +3640,8 @@ msgid "Enabled"
 msgstr ""
 
 #. TRANS: Tab and title for plugins admin panel.
-#. TRANS: Menu item for site administration
+#, fuzzy
+msgctxt "TITLE"
 msgid "Plugins"
 msgstr "പ്ലഗിനുകൾ"
 
@@ -3607,15 +3657,19 @@ msgstr ""
 msgid "Default plugins"
 msgstr "സ്വതേ വേണ്ട ഭാഷ"
 
+#. TRANS: Text displayed on plugin admin page when no plugin are enabled.
 msgid ""
 "All default plugins have been disabled from the site's configuration file."
 msgstr ""
 
+#. TRANS: Client error displayed if the notice posted has too many characters.
 msgid "Invalid notice content."
 msgstr "അറിയിപ്പിന്റെ ഉള്ളടക്കം അസാധുവാണ്."
 
-#, php-format
-msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’."
+#. TRANS: Exception thrown if a notice's license is not compatible with the StatusNet site license.
+#. TRANS: %1$s is the notice license, %2$s is the StatusNet site's license.
+#, fuzzy, php-format
+msgid "Notice license \"%1$s\" is not compatible with site license \"%2$s\"."
 msgstr ""
 "അറിയിപ്പിന്റെ ഉപയോഗാനുമതിയായ് ‘%1$s’ സൈറ്റിന്റെ ഉപയോഗാനുമതിയായ ‘%2$s’ എന്നതുമായി "
 "ചേർന്നു പോകുന്നില്ല."
@@ -3760,38 +3814,50 @@ msgstr "സജ്ജീകരണങ്ങൾ സേവ് ചെയ്തിര
 msgid "Restore account"
 msgstr "അംഗത്വം പുനഃക്രമീകരിക്കുക"
 
+#. TRANS: Client error displayed when requesting a public timeline page beyond the page limit.
+#. TRANS: %s is the page limit.
 #, php-format
 msgid "Beyond the page limit (%s)."
 msgstr "താളിന്റെ പരിധിയ്ക്ക് (%s) പുറത്താണ്."
 
+#. TRANS: Server error displayed when a public timeline cannot be retrieved.
 msgid "Could not retrieve public stream."
 msgstr ""
 
+#. TRANS: Title for all public timeline pages but the first.
+#. TRANS: %d is the page number.
 #, php-format
 msgid "Public timeline, page %d"
 msgstr "സാർവ്വജനിക സമയരേഖ, താൾ %d"
 
+#. TRANS: Title for the first public timeline page.
 msgid "Public timeline"
 msgstr "സാർവ്വജനിക സമയരേഖ"
 
+#. TRANS: Link description for public timeline feed.
 msgid "Public Stream Feed (RSS 1.0)"
 msgstr ""
 
+#. TRANS: Link description for public timeline feed.
 msgid "Public Stream Feed (RSS 2.0)"
 msgstr ""
 
+#. TRANS: Link description for public timeline feed.
 msgid "Public Stream Feed (Atom)"
 msgstr ""
 
+#. TRANS: Text displayed for public feed when there are no public notices.
 #, php-format
 msgid ""
 "This is the public timeline for %%site.name%% but no one has posted anything "
 "yet."
 msgstr ""
 
+#. TRANS: Additional text displayed for public feed when there are no public notices for a logged in user.
 msgid "Be the first to post!"
 msgstr "പ്രസിദ്ധീകരിക്കുന്ന ആദ്യ വ്യക്തിയാകുക!"
 
+#. TRANS: Additional text displayed for public feed when there are no public notices for a not logged in user.
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post!"
@@ -3799,6 +3865,8 @@ msgstr ""
 "എന്തുകൊണ്ട് [അംഗത്വമെടുക്കുകയും](%%action.register%%) പ്രസിദ്ധീകരിക്കുന്ന ആദ്യ വ്യക്തിയാകുകയും "
 "ചെയ്തുകൂട!"
 
+#. TRANS: Message for not logged in users at an invite-only site trying to view the public feed of notices.
+#. TRANS: This message contains Markdown links. Please mind the formatting.
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -3812,6 +3880,8 @@ msgstr ""
 "സഹപ്രവർത്തകരുമായും പങ്ക് വെയ്ക്കുവാൻ [ഇപ്പോൾ തന്നെ ചേരുക](%%action.register%%)! (കൂടുതൽ "
 "അറിയുക](%%doc.help%%))"
 
+#. TRANS: Message for not logged in users at a closed site trying to view the public feed of notices.
+#. TRANS: This message contains Markdown links. Please mind the formatting.
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -5408,6 +5478,10 @@ msgid ""
 "along with this program.  If not, see %s."
 msgstr ""
 
+#. TRANS: Menu item for site administration
+msgid "Plugins"
+msgstr "പ്ലഗിനുകൾ"
+
 #. TRANS: Form input field label for application name.
 msgid "Name"
 msgstr "പേര്"
@@ -5894,6 +5968,10 @@ msgstr ""
 msgid "Unable to delete design setting."
 msgstr "രൂപകല്പനാ സജ്ജീകരണങ്ങൾ മായ്ക്കാൻ കഴിഞ്ഞില്ല."
 
+#, fuzzy
+msgid "Home"
+msgstr "ഹോംപേജ്"
+
 #. TRANS: Menu item title/tooltip
 msgid "Basic site configuration"
 msgstr "സൈറ്റിന്റെ അടിസ്ഥാന ക്രമീകരണം"
@@ -6473,10 +6551,6 @@ msgstr ""
 msgid "Database error"
 msgstr "ഡാറ്റാബേസ് പിഴവ്"
 
-#, fuzzy
-msgid "Home"
-msgstr "ഹോംപേജ്"
-
 msgid "Public"
 msgstr "സാർവ്വജനികം"
 
@@ -7174,7 +7248,6 @@ msgstr "അറിയിപ്പ് അയയ്ക്കുക"
 msgid "What's up, %s?"
 msgstr "എന്തൊക്കെയുണ്ട്, %s?"
 
-#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr "ചേർത്തുവെയ്ക്കുക"
 
@@ -7243,6 +7316,9 @@ msgstr "ഈ അറിയിപ്പ് മായ്ക്കുക"
 msgid "Notice repeated"
 msgstr "അറിയിപ്പ് ആവർത്തിച്ചിരിക്കുന്നു"
 
+msgid "Update your status..."
+msgstr ""
+
 msgid "Nudge this user"
 msgstr ""
 
@@ -7751,11 +7827,3 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
-
-#, fuzzy
-#~ msgid "Friends timeline"
-#~ msgstr "%s എന്ന ഉപയോക്താവിന്റെ സമയരേഖ"
-
-#, fuzzy
-#~ msgid "Everyone on this site"
-#~ msgstr "ഈ സൈറ്റിലെ ആൾക്കാരെ കണ്ടെത്തുക"
diff --git a/locale/nb/LC_MESSAGES/statusnet.po b/locale/nb/LC_MESSAGES/statusnet.po
index 1fa8ea3e77..9898feb7be 100644
--- a/locale/nb/LC_MESSAGES/statusnet.po
+++ b/locale/nb/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-03-08 01:03+0000\n"
-"PO-Revision-Date: 2011-03-08 01:05:26+0000\n"
+"POT-Creation-Date: 2011-03-11 18:15+0000\n"
+"PO-Revision-Date: 2011-03-11 18:17:21+0000\n"
 "Language-Team: Norwegian (bokmål)‬ <http://translatewiki.net/wiki/Portal:no>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
+"X-Generator: MediaWiki 1.18alpha (r83703); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-03-06 02:16:47+0000\n"
+"X-POT-Import-Date: 2011-03-08 01:25:01+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -1041,7 +1041,8 @@ msgid "Can only fave notices."
 msgstr "Finn innhold i notiser"
 
 #. TRANS: Client exception thrown when trying favorite a notice without content.
-msgid "Unknown note."
+#, fuzzy
+msgid "Unknown notice."
 msgstr "Ukjent notat."
 
 #. TRANS: Client exception thrown when trying favorite an already favorited notice.
@@ -1626,6 +1627,7 @@ msgstr "Slett denne gruppen"
 #. TRANS: Client error displayed trying to create a new direct message while not logged in.
 #. TRANS: Client error displayed trying to send a notice while not logged in.
 #. TRANS: Client error displayed trying to nudge a user without being logged in.
+#. TRANS: Client error displayed when trying to enable or disable a plugin while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
@@ -3120,6 +3122,10 @@ msgstr "Nettadresse til kilde kreves."
 msgid "Could not create application."
 msgstr "Kunne ikke opprette program."
 
+#, fuzzy
+msgid "Invalid image."
+msgstr "Ugyldig størrelse"
+
 #. TRANS: Title for form to create a group.
 msgid "New group"
 msgstr "Ny gruppe"
@@ -3404,52 +3410,77 @@ msgstr "Utboks for %s"
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr "Dette er utboksen din som viser alle private meldinger du har sendt."
 
+#. TRANS: Title for page where to change password.
+#, fuzzy
+msgctxt "TITLE"
 msgid "Change password"
 msgstr "Endre passord"
 
+#. TRANS: Instructions for page where to change password.
 msgid "Change your password."
 msgstr "Endre passordet ditt."
 
+#. TRANS: Fieldset legend on page where to change password.
 #. TRANS: Fieldset legend for password reset form.
 msgid "Password change"
 msgstr "Endre passord"
 
+#. TRANS: Field label on page where to change password.
 msgid "Old password"
 msgstr "Gammelt passord"
 
+#. TRANS: Field label on page where to change password.
 #. TRANS: Field label for password reset form.
 msgid "New password"
 msgstr "Nytt passord"
 
+#. TRANS: Field title on page where to change password.
 #, fuzzy
 msgid "6 or more characters."
 msgstr "6 eller flere tegn"
 
+#. TRANS: Field label on page where to change password. In this field the new password should be typed a second time.
+#, fuzzy
+msgctxt "LABEL"
+msgid "Confirm"
+msgstr "Bekreft"
+
+#. TRANS: Field title on page where to change password.
 #. TRANS: Ttile for field label for password reset form where the password has to be typed again.
 #, fuzzy
 msgid "Same as password above."
 msgstr "Samme som passord ovenfor"
 
+#. TRANS: Button text on page where to change password.
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Change"
 msgstr "Endre"
 
+#. TRANS: Form validation error on page where to change password.
 msgid "Password must be 6 or more characters."
 msgstr "Passord må være minst 6 tegn."
 
 msgid "Passwords don't match."
 msgstr "Passordene var ikke like."
 
-msgid "Incorrect old password"
+#. TRANS: Form validation error on page where to change password.
+#, fuzzy
+msgid "Incorrect old password."
 msgstr "Feil gammelt passord"
 
+#. TRANS: Form validation error on page where to change password.
 msgid "Error saving user; invalid."
 msgstr "Feil ved lagring av bruker; ugyldig."
 
+#. TRANS: Server error displayed on page where to change password when password change
+#. TRANS: could not be made because of a server error.
 #. TRANS: Reset password form validation error message.
 #, fuzzy
 msgid "Cannot save new password."
 msgstr "Klarer ikke å lagre nytt passord."
 
+#. TRANS: Form validation notice on page where to change password.
 msgid "Password saved."
 msgstr "Passordet ble lagret"
 
@@ -3499,6 +3530,7 @@ msgstr "Nettsted"
 msgid "Server"
 msgstr "Tjener"
 
+#. TRANS: Field title in Paths admin panel.
 msgid "Site's server hostname."
 msgstr "Vertsnavn for nettstedets tjener."
 
@@ -3506,6 +3538,7 @@ msgstr "Vertsnavn for nettstedets tjener."
 msgid "Path"
 msgstr "Sti"
 
+#. TRANS: Field title in Paths admin panel.
 msgid "Site path."
 msgstr "Nettstedssti."
 
@@ -3514,6 +3547,7 @@ msgstr "Nettstedssti."
 msgid "Locale directory"
 msgstr "Temamappe"
 
+#. TRANS: Field title in Paths admin panel.
 #, fuzzy
 msgid "Directory path to locales."
 msgstr "Lokaliseringsmappesti"
@@ -3522,9 +3556,14 @@ msgstr "Lokaliseringsmappesti"
 msgid "Fancy URLs"
 msgstr "Pyntede nettadresser"
 
-msgid "Use fancy (more readable and memorable) URLs?"
+#. TRANS: Field title in Paths admin panel.
+#, fuzzy
+msgid "Use fancy URLs (more readable and memorable)?"
 msgstr "Bruk pyntede (mer lesbare og lettere å huske) nettadresser?"
 
+#. TRANS: Fieldset legend in Paths admin panel.
+#, fuzzy
+msgctxt "LEGEND"
 msgid "Theme"
 msgstr "Tema"
 
@@ -3637,6 +3676,8 @@ msgid "Directory where attachments are located."
 msgstr "Mappen vedlegg er plassert i."
 
 #. TRANS: Fieldset legend in Paths admin panel.
+#, fuzzy
+msgctxt "LEGEND"
 msgid "SSL"
 msgstr "SSL"
 
@@ -3681,10 +3722,14 @@ msgstr ""
 msgid "People search"
 msgstr "Personsøk"
 
+#. TRANS: Client error displayed when trying to tag a profile with an invalid tag.
+#. TRANS: %s is the invalid tag.
 #, php-format
 msgid "Not a valid people tag: %s."
 msgstr "Ikke en gyldig personmerkelapp: %s."
 
+#. TRANS: Page title for users with a certain self-tag.
+#. TRANS: %1$s is the tag, %2$s is the page number.
 #, php-format
 msgid "Users self-tagged with %1$s - page %2$d"
 msgstr "Brukere som har merket seg selv med %1$s - side %2$d"
@@ -3694,15 +3739,19 @@ msgctxt "plugin"
 msgid "Disabled"
 msgstr ""
 
+#. TRANS: Client error displayed when trying to use another method than POST.
+#. TRANS: Do not translate POST.
 #. TRANS: Client error displayed trying to perform any request method other than POST.
 #. TRANS: Do not translate POST.
 msgid "This action only accepts POST requests."
 msgstr ""
 
+#. TRANS: Client error displayed when trying to enable or disable a plugin without access rights.
 #, fuzzy
 msgid "You cannot administer plugins."
 msgstr "Du kan ikke slette brukere."
 
+#. TRANS: Client error displayed when trying to enable or disable a non-existing plugin.
 #, fuzzy
 msgid "No such plugin."
 msgstr "Ingen slik side."
@@ -3713,7 +3762,8 @@ msgid "Enabled"
 msgstr ""
 
 #. TRANS: Tab and title for plugins admin panel.
-#. TRANS: Menu item for site administration
+#, fuzzy
+msgctxt "TITLE"
 msgid "Plugins"
 msgstr "Programtillegg"
 
@@ -3729,15 +3779,19 @@ msgstr ""
 msgid "Default plugins"
 msgstr "Standardspråk"
 
+#. TRANS: Text displayed on plugin admin page when no plugin are enabled.
 msgid ""
 "All default plugins have been disabled from the site's configuration file."
 msgstr ""
 
+#. TRANS: Client error displayed if the notice posted has too many characters.
 msgid "Invalid notice content."
 msgstr "Ugyldig notisinnhold."
 
-#, php-format
-msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’."
+#. TRANS: Exception thrown if a notice's license is not compatible with the StatusNet site license.
+#. TRANS: %1$s is the notice license, %2$s is the StatusNet site's license.
+#, fuzzy, php-format
+msgid "Notice license \"%1$s\" is not compatible with site license \"%2$s\"."
 msgstr "Notislisensen ‘%1$s’ er ikke kompatibel med nettstedslisensen ‘%2$s’."
 
 #. TRANS: Page title for profile settings.
@@ -3888,29 +3942,39 @@ msgstr "Innstillinger lagret."
 msgid "Restore account"
 msgstr "Opprett en konto"
 
+#. TRANS: Client error displayed when requesting a public timeline page beyond the page limit.
+#. TRANS: %s is the page limit.
 #, php-format
 msgid "Beyond the page limit (%s)."
 msgstr "Over sidegrensen (%s)."
 
+#. TRANS: Server error displayed when a public timeline cannot be retrieved.
 msgid "Could not retrieve public stream."
 msgstr "Kunne ikke hente offentlig strøm."
 
+#. TRANS: Title for all public timeline pages but the first.
+#. TRANS: %d is the page number.
 #, php-format
 msgid "Public timeline, page %d"
 msgstr "Offentlig tidslinje, side %d"
 
+#. TRANS: Title for the first public timeline page.
 msgid "Public timeline"
 msgstr "Offentlig tidslinje"
 
+#. TRANS: Link description for public timeline feed.
 msgid "Public Stream Feed (RSS 1.0)"
 msgstr "Offentlig strømmating (RSS 1.0)"
 
+#. TRANS: Link description for public timeline feed.
 msgid "Public Stream Feed (RSS 2.0)"
 msgstr "Offentlig strømmating (RSS 2.0)"
 
+#. TRANS: Link description for public timeline feed.
 msgid "Public Stream Feed (Atom)"
 msgstr "Offentlig strømmating (Atom)"
 
+#. TRANS: Text displayed for public feed when there are no public notices.
 #, php-format
 msgid ""
 "This is the public timeline for %%site.name%% but no one has posted anything "
@@ -3919,9 +3983,11 @@ msgstr ""
 "Dette er den offentlige tidslinjen for %%site.name%% men ingen har postet "
 "noe ennå."
 
+#. TRANS: Additional text displayed for public feed when there are no public notices for a logged in user.
 msgid "Be the first to post!"
 msgstr "Vær den første til å poste!"
 
+#. TRANS: Additional text displayed for public feed when there are no public notices for a not logged in user.
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post!"
@@ -3929,6 +3995,8 @@ msgstr ""
 "Hvorfor ikke [registrere en konto](%%action.register%%) og vær den første "
 "til å poste!"
 
+#. TRANS: Message for not logged in users at an invite-only site trying to view the public feed of notices.
+#. TRANS: This message contains Markdown links. Please mind the formatting.
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -3941,6 +4009,8 @@ msgstr ""
 "(http://status.net). [Bli med nå](%%action.register%%) for å dele notiser om "
 "degselv med venner, familie og kollegaer! ([Les mer](%%doc.help%%))"
 
+#. TRANS: Message for not logged in users at a closed site trying to view the public feed of notices.
+#. TRANS: This message contains Markdown links. Please mind the formatting.
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -5632,6 +5702,10 @@ msgid ""
 "along with this program.  If not, see %s."
 msgstr ""
 
+#. TRANS: Menu item for site administration
+msgid "Plugins"
+msgstr "Programtillegg"
+
 #. TRANS: Form input field label for application name.
 msgid "Name"
 msgstr "Navn"
@@ -6127,6 +6201,9 @@ msgstr "saveSettings() ikke implementert."
 msgid "Unable to delete design setting."
 msgstr "Kunne ikke lagre dine innstillinger for utseende."
 
+msgid "Home"
+msgstr "Hjemmesiden"
+
 #. TRANS: Menu item title/tooltip
 #, fuzzy
 msgid "Basic site configuration"
@@ -6730,9 +6807,6 @@ msgstr "Log inn på nettstedet"
 msgid "Database error"
 msgstr "Databasefeil"
 
-msgid "Home"
-msgstr "Hjemmesiden"
-
 msgid "Public"
 msgstr "Offentlig"
 
@@ -7535,7 +7609,6 @@ msgstr "Send en notis"
 msgid "What's up, %s?"
 msgstr "Hva skjer %s?"
 
-#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr "Legg ved"
 
@@ -7605,6 +7678,9 @@ msgstr "Slett denne notisen"
 msgid "Notice repeated"
 msgstr "Notis repetert"
 
+msgid "Update your status..."
+msgstr ""
+
 msgid "Nudge this user"
 msgstr "Knuff denne brukeren"
 
@@ -8129,11 +8205,3 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
-
-#, fuzzy
-#~ msgid "Friends timeline"
-#~ msgstr "%s tidslinje"
-
-#, fuzzy
-#~ msgid "Everyone on this site"
-#~ msgstr "Finn personer på dette nettstedet"
diff --git a/locale/nl/LC_MESSAGES/statusnet.po b/locale/nl/LC_MESSAGES/statusnet.po
index a7d99e5410..e8907c1baf 100644
--- a/locale/nl/LC_MESSAGES/statusnet.po
+++ b/locale/nl/LC_MESSAGES/statusnet.po
@@ -12,17 +12,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-08 01:03+0000\n"
-"PO-Revision-Date: 2011-03-08 01:05:24+0000\n"
+"POT-Creation-Date: 2011-03-11 18:15+0000\n"
+"PO-Revision-Date: 2011-03-11 18:17:20+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
+"X-Generator: MediaWiki 1.18alpha (r83703); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-03-06 02:16:47+0000\n"
+"X-POT-Import-Date: 2011-03-08 01:25:01+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -1054,7 +1054,8 @@ msgid "Can only fave notices."
 msgstr "Het is alleen mogelijk om mededelingen als favoriet aan te merken."
 
 #. TRANS: Client exception thrown when trying favorite a notice without content.
-msgid "Unknown note."
+#, fuzzy
+msgid "Unknown notice."
 msgstr "Onbekend mededeling."
 
 #. TRANS: Client exception thrown when trying favorite an already favorited notice.
@@ -1632,6 +1633,7 @@ msgstr "Deze groep verwijderen."
 #. TRANS: Client error displayed trying to create a new direct message while not logged in.
 #. TRANS: Client error displayed trying to send a notice while not logged in.
 #. TRANS: Client error displayed trying to nudge a user without being logged in.
+#. TRANS: Client error displayed when trying to enable or disable a plugin while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
@@ -3114,6 +3116,10 @@ msgstr "Een bron-URL is verplicht."
 msgid "Could not create application."
 msgstr "Het was niet mogelijk de applicatie aan te maken."
 
+#, fuzzy
+msgid "Invalid image."
+msgstr "Ongeldige afmetingen."
+
 #. TRANS: Title for form to create a group.
 msgid "New group"
 msgstr "Nieuwe groep"
@@ -3402,49 +3408,74 @@ msgstr "Postvak UIT voor %s"
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr "Dit is uw Postvak UIT waarin de door u verzonden privéberichten staan."
 
+#. TRANS: Title for page where to change password.
+#, fuzzy
+msgctxt "TITLE"
 msgid "Change password"
 msgstr "Wachtwoord wijzigen"
 
+#. TRANS: Instructions for page where to change password.
 msgid "Change your password."
 msgstr "Wachtwoord wijzigen"
 
+#. TRANS: Fieldset legend on page where to change password.
 #. TRANS: Fieldset legend for password reset form.
 msgid "Password change"
 msgstr "Wachtwoord wijzigen"
 
+#. TRANS: Field label on page where to change password.
 msgid "Old password"
 msgstr "Huidige wachtwoord"
 
+#. TRANS: Field label on page where to change password.
 #. TRANS: Field label for password reset form.
 msgid "New password"
 msgstr "Nieuw wachtwoord"
 
+#. TRANS: Field title on page where to change password.
 msgid "6 or more characters."
 msgstr "Zes of meer tekens"
 
+#. TRANS: Field label on page where to change password. In this field the new password should be typed a second time.
+#, fuzzy
+msgctxt "LABEL"
+msgid "Confirm"
+msgstr "Bevestigen"
+
+#. TRANS: Field title on page where to change password.
 #. TRANS: Ttile for field label for password reset form where the password has to be typed again.
 msgid "Same as password above."
 msgstr "Gelijk aan het wachtwoord hierboven."
 
+#. TRANS: Button text on page where to change password.
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Change"
 msgstr "Wijzigen"
 
+#. TRANS: Form validation error on page where to change password.
 msgid "Password must be 6 or more characters."
 msgstr "Het wachtwoord moet zes of meer tekens bevatten."
 
 msgid "Passwords don't match."
 msgstr "De wachtwoorden komen niet overeen."
 
-msgid "Incorrect old password"
+#. TRANS: Form validation error on page where to change password.
+#, fuzzy
+msgid "Incorrect old password."
 msgstr "Het oude wachtwoord is onjuist"
 
+#. TRANS: Form validation error on page where to change password.
 msgid "Error saving user; invalid."
 msgstr "Fout bij opslaan gebruiker; ongeldig."
 
+#. TRANS: Server error displayed on page where to change password when password change
+#. TRANS: could not be made because of a server error.
 #. TRANS: Reset password form validation error message.
 msgid "Cannot save new password."
 msgstr "Het was niet mogelijk het nieuwe wachtwoord op te slaan."
 
+#. TRANS: Form validation notice on page where to change password.
 msgid "Password saved."
 msgstr "Het wachtwoord is opgeslagen."
 
@@ -3494,6 +3525,7 @@ msgstr "Website"
 msgid "Server"
 msgstr "Server"
 
+#. TRANS: Field title in Paths admin panel.
 msgid "Site's server hostname."
 msgstr "Hostnaam van de website server."
 
@@ -3501,6 +3533,7 @@ msgstr "Hostnaam van de website server."
 msgid "Path"
 msgstr "Pad"
 
+#. TRANS: Field title in Paths admin panel.
 msgid "Site path."
 msgstr "Websitepad."
 
@@ -3508,6 +3541,7 @@ msgstr "Websitepad."
 msgid "Locale directory"
 msgstr "Map voor taalondersteuning"
 
+#. TRANS: Field title in Paths admin panel.
 msgid "Directory path to locales."
 msgstr "Map voor taalondersteuning."
 
@@ -3515,9 +3549,14 @@ msgstr "Map voor taalondersteuning."
 msgid "Fancy URLs"
 msgstr "Nette URL's"
 
-msgid "Use fancy (more readable and memorable) URLs?"
+#. TRANS: Field title in Paths admin panel.
+#, fuzzy
+msgid "Use fancy URLs (more readable and memorable)?"
 msgstr "Nette URL's (meer leesbaar en beter te onthouden) gebruiken?"
 
+#. TRANS: Fieldset legend in Paths admin panel.
+#, fuzzy
+msgctxt "LEGEND"
 msgid "Theme"
 msgstr "Vormgeving"
 
@@ -3630,6 +3669,8 @@ msgid "Directory where attachments are located."
 msgstr "Map waar bijlagen worden opgeslagen."
 
 #. TRANS: Fieldset legend in Paths admin panel.
+#, fuzzy
+msgctxt "LEGEND"
 msgid "SSL"
 msgstr "SSL"
 
@@ -3675,10 +3716,14 @@ msgstr ""
 msgid "People search"
 msgstr "Gebruikers zoeken"
 
+#. TRANS: Client error displayed when trying to tag a profile with an invalid tag.
+#. TRANS: %s is the invalid tag.
 #, php-format
 msgid "Not a valid people tag: %s."
 msgstr "Geen geldig gebruikerslabel: %s."
 
+#. TRANS: Page title for users with a certain self-tag.
+#. TRANS: %1$s is the tag, %2$s is the page number.
 #, php-format
 msgid "Users self-tagged with %1$s - page %2$d"
 msgstr "Gebruikers die zichzelf met %1$s hebben gelabeld - pagina %2$d"
@@ -3688,14 +3733,18 @@ msgctxt "plugin"
 msgid "Disabled"
 msgstr "Uitgeschakeld"
 
+#. TRANS: Client error displayed when trying to use another method than POST.
+#. TRANS: Do not translate POST.
 #. TRANS: Client error displayed trying to perform any request method other than POST.
 #. TRANS: Do not translate POST.
 msgid "This action only accepts POST requests."
 msgstr "Deze handeling accepteert alleen POST-verzoeken."
 
+#. TRANS: Client error displayed when trying to enable or disable a plugin without access rights.
 msgid "You cannot administer plugins."
 msgstr "U kunt plug-ins niet beheren."
 
+#. TRANS: Client error displayed when trying to enable or disable a non-existing plugin.
 msgid "No such plugin."
 msgstr "Deze plug-in bestaat niet."
 
@@ -3705,7 +3754,8 @@ msgid "Enabled"
 msgstr "Ingeschakeld"
 
 #. TRANS: Tab and title for plugins admin panel.
-#. TRANS: Menu item for site administration
+#, fuzzy
+msgctxt "TITLE"
 msgid "Plugins"
 msgstr "Plug-ins"
 
@@ -3723,17 +3773,21 @@ msgstr ""
 msgid "Default plugins"
 msgstr "Standaard plug-ins"
 
+#. TRANS: Text displayed on plugin admin page when no plugin are enabled.
 msgid ""
 "All default plugins have been disabled from the site's configuration file."
 msgstr ""
 "Alle standaard plug-ins zijn uitgeschakeld in het bestand met "
 "siteinstellingen."
 
+#. TRANS: Client error displayed if the notice posted has too many characters.
 msgid "Invalid notice content."
 msgstr "Ongeldige mededelinginhoud."
 
-#, php-format
-msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’."
+#. TRANS: Exception thrown if a notice's license is not compatible with the StatusNet site license.
+#. TRANS: %1$s is the notice license, %2$s is the StatusNet site's license.
+#, fuzzy, php-format
+msgid "Notice license \"%1$s\" is not compatible with site license \"%2$s\"."
 msgstr ""
 "De mededelingenlicentie \"%1$s\" is niet compatibel met de licentie \"%2$s\" "
 "van deze site."
@@ -3883,29 +3937,39 @@ msgstr "De instellingen zijn opgeslagen."
 msgid "Restore account"
 msgstr "Gebruiker terugladen van back-up"
 
+#. TRANS: Client error displayed when requesting a public timeline page beyond the page limit.
+#. TRANS: %s is the page limit.
 #, php-format
 msgid "Beyond the page limit (%s)."
 msgstr "Meer dan de paginalimiet (%s)."
 
+#. TRANS: Server error displayed when a public timeline cannot be retrieved.
 msgid "Could not retrieve public stream."
 msgstr "Het was niet mogelijk de publieke stream op te halen."
 
+#. TRANS: Title for all public timeline pages but the first.
+#. TRANS: %d is the page number.
 #, php-format
 msgid "Public timeline, page %d"
 msgstr "Openbare tijdlijn, pagina %d"
 
+#. TRANS: Title for the first public timeline page.
 msgid "Public timeline"
 msgstr "Openbare tijdlijn"
 
+#. TRANS: Link description for public timeline feed.
 msgid "Public Stream Feed (RSS 1.0)"
 msgstr "Publieke streamfeed (RSS 1.0)"
 
+#. TRANS: Link description for public timeline feed.
 msgid "Public Stream Feed (RSS 2.0)"
 msgstr "Publieke streamfeed (RSS 1.0)"
 
+#. TRANS: Link description for public timeline feed.
 msgid "Public Stream Feed (Atom)"
 msgstr "Publieke streamfeed (Atom)"
 
+#. TRANS: Text displayed for public feed when there are no public notices.
 #, php-format
 msgid ""
 "This is the public timeline for %%site.name%% but no one has posted anything "
@@ -3914,9 +3978,11 @@ msgstr ""
 "Dit is de publieke tijdlijn voor %%site.name%%, maar niemand heeft nog "
 "berichten geplaatst."
 
+#. TRANS: Additional text displayed for public feed when there are no public notices for a logged in user.
 msgid "Be the first to post!"
 msgstr "U kunt de eerste zijn die een bericht plaatst!"
 
+#. TRANS: Additional text displayed for public feed when there are no public notices for a not logged in user.
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post!"
@@ -3924,6 +3990,8 @@ msgstr ""
 "Waarom [registreert u geen gebruiker](%%action.register%%) en plaatst u als "
 "eerste een bericht?"
 
+#. TRANS: Message for not logged in users at an invite-only site trying to view the public feed of notices.
+#. TRANS: This message contains Markdown links. Please mind the formatting.
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -3936,6 +4004,8 @@ msgstr ""
 "net/). [Registreer nu](%%action.register%%) om mededelingen over uzelf te "
 "delen met vrienden, familie en collega's! [Meer lezen...](%%doc.help%%)"
 
+#. TRANS: Message for not logged in users at a closed site trying to view the public feed of notices.
+#. TRANS: This message contains Markdown links. Please mind the formatting.
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -5646,6 +5716,10 @@ msgstr ""
 "Samen met dit programma hoort u een kopie van de GNU Affero General Public "
 "License te hebben ontvangen. Zo niet, zie dan %s."
 
+#. TRANS: Menu item for site administration
+msgid "Plugins"
+msgstr "Plug-ins"
+
 #. TRANS: Form input field label for application name.
 msgid "Name"
 msgstr "Naam"
@@ -5991,9 +6065,8 @@ msgstr "Antwoorden"
 msgid "Write a reply..."
 msgstr "Schrijf een antwoord..."
 
-#, fuzzy
 msgid "Status"
-msgstr "StatusNet"
+msgstr "Status"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #. TRANS: Text between [] is a link description, text between () is the link itself.
@@ -6165,6 +6238,9 @@ msgstr "saveSettings() is nog niet geïmplementeerd."
 msgid "Unable to delete design setting."
 msgstr "Het was niet mogelijk om de ontwerpinstellingen te verwijderen."
 
+msgid "Home"
+msgstr "Start"
+
 #. TRANS: Menu item title/tooltip
 msgid "Basic site configuration"
 msgstr "Basisinstellingen voor de website"
@@ -6805,9 +6881,6 @@ msgstr "Naar het installatieprogramma gaan."
 msgid "Database error"
 msgstr "Databasefout"
 
-msgid "Home"
-msgstr "Start"
-
 msgid "Public"
 msgstr "Openbaar"
 
@@ -7579,18 +7652,16 @@ msgid "from"
 msgstr "van"
 
 msgid "Can't get author for activity."
-msgstr ""
+msgstr "Het was niet mogelijk de auteur te achterhalen voor de activiteit."
 
-#, fuzzy
 msgid "Bookmark not posted to this group."
-msgstr "U mag deze groep niet verwijderen."
+msgstr "De bladwijzer is niet aan deze groep verzonden."
 
-#, fuzzy
 msgid "Object not posted to this user."
-msgstr "Deze gebruiker niet verwijderen."
+msgstr "Het object is niet aan deze gebruiker verzonden."
 
 msgid "Don't know how to handle this kind of target."
-msgstr ""
+msgstr "Het is niet bekend hoe dit doel afgehandeld moet worden."
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 msgid "Nickname cannot be empty."
@@ -7612,7 +7683,6 @@ msgstr "Mededeling verzenden"
 msgid "What's up, %s?"
 msgstr "Hallo, %s."
 
-#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr "Toevoegen"
 
@@ -7680,6 +7750,9 @@ msgstr "Deze mededeling verwijderen"
 msgid "Notice repeated"
 msgstr "Mededeling herhaald"
 
+msgid "Update your status..."
+msgstr ""
+
 msgid "Nudge this user"
 msgstr "Deze gebruiker porren"
 
@@ -8188,9 +8261,3 @@ msgstr "Ongeldige XML. De XRD-root mist."
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr "De back-up wordt uit het bestand \"%s\" geladen."
-
-#~ msgid "Friends timeline"
-#~ msgstr "Tijdlijn van vrienden"
-
-#~ msgid "Everyone on this site"
-#~ msgstr "Iedereen op deze site"
diff --git a/locale/pl/LC_MESSAGES/statusnet.po b/locale/pl/LC_MESSAGES/statusnet.po
index f2f776d44e..b874633a6e 100644
--- a/locale/pl/LC_MESSAGES/statusnet.po
+++ b/locale/pl/LC_MESSAGES/statusnet.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-08 01:03+0000\n"
-"PO-Revision-Date: 2011-03-08 01:05:27+0000\n"
+"POT-Creation-Date: 2011-03-11 18:15+0000\n"
+"PO-Revision-Date: 2011-03-11 18:17:23+0000\n"
 "Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
 "Language-Team: Polish <http://translatewiki.net/wiki/Portal:pl>\n"
 "MIME-Version: 1.0\n"
@@ -20,11 +20,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n == 1) ? 0 : ( (n%10 >= 2 && n%10 <= 4 && "
 "(n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
-"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
+"X-Generator: MediaWiki 1.18alpha (r83703); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pl\n"
 "X-Message-Group: #out-statusnet-core\n"
-"X-POT-Import-Date: 2011-03-06 02:16:47+0000\n"
+"X-POT-Import-Date: 2011-03-08 01:25:01+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -1050,7 +1050,8 @@ msgid "Can only fave notices."
 msgstr "Można tylko dodawać wpisy do ulubionych."
 
 #. TRANS: Client exception thrown when trying favorite a notice without content.
-msgid "Unknown note."
+#, fuzzy
+msgid "Unknown notice."
 msgstr "Nieznany wpis."
 
 #. TRANS: Client exception thrown when trying favorite an already favorited notice.
@@ -1627,6 +1628,7 @@ msgstr "Usuń tę grupę"
 #. TRANS: Client error displayed trying to create a new direct message while not logged in.
 #. TRANS: Client error displayed trying to send a notice while not logged in.
 #. TRANS: Client error displayed trying to nudge a user without being logged in.
+#. TRANS: Client error displayed when trying to enable or disable a plugin while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
@@ -3132,6 +3134,10 @@ msgstr "Źródłowy adres URL jest wymagany."
 msgid "Could not create application."
 msgstr "Nie można utworzyć aplikacji."
 
+#, fuzzy
+msgid "Invalid image."
+msgstr "Nieprawidłowy rozmiar."
+
 #. TRANS: Title for form to create a group.
 msgid "New group"
 msgstr "Nowa grupa"
@@ -3416,49 +3422,74 @@ msgstr "Wysłane wiadomości użytkownika %s"
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr "To są wiadomości wysłane, czyli prywatne wiadomości, które wysłałeś."
 
+#. TRANS: Title for page where to change password.
+#, fuzzy
+msgctxt "TITLE"
 msgid "Change password"
 msgstr "Zmień hasło"
 
+#. TRANS: Instructions for page where to change password.
 msgid "Change your password."
 msgstr "Zmień hasło."
 
+#. TRANS: Fieldset legend on page where to change password.
 #. TRANS: Fieldset legend for password reset form.
 msgid "Password change"
 msgstr "Zmiana hasła"
 
+#. TRANS: Field label on page where to change password.
 msgid "Old password"
 msgstr "Poprzednie hasło"
 
+#. TRANS: Field label on page where to change password.
 #. TRANS: Field label for password reset form.
 msgid "New password"
 msgstr "Nowe hasło"
 
+#. TRANS: Field title on page where to change password.
 msgid "6 or more characters."
 msgstr "6 lub więcej znaków."
 
+#. TRANS: Field label on page where to change password. In this field the new password should be typed a second time.
+#, fuzzy
+msgctxt "LABEL"
+msgid "Confirm"
+msgstr "Potwierdź"
+
+#. TRANS: Field title on page where to change password.
 #. TRANS: Ttile for field label for password reset form where the password has to be typed again.
 msgid "Same as password above."
 msgstr "Takie samo jak powyższe hasło."
 
+#. TRANS: Button text on page where to change password.
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Change"
 msgstr "Zmień"
 
+#. TRANS: Form validation error on page where to change password.
 msgid "Password must be 6 or more characters."
 msgstr "Hasło musi mieć sześć lub więcej znaków."
 
 msgid "Passwords don't match."
 msgstr "Hasła nie pasują do siebie."
 
-msgid "Incorrect old password"
+#. TRANS: Form validation error on page where to change password.
+#, fuzzy
+msgid "Incorrect old password."
 msgstr "Niepoprawne poprzednie hasło"
 
+#. TRANS: Form validation error on page where to change password.
 msgid "Error saving user; invalid."
 msgstr "Błąd podczas zapisywania użytkownika; nieprawidłowy."
 
+#. TRANS: Server error displayed on page where to change password when password change
+#. TRANS: could not be made because of a server error.
 #. TRANS: Reset password form validation error message.
 msgid "Cannot save new password."
 msgstr "Nie można zapisać nowego hasła."
 
+#. TRANS: Form validation notice on page where to change password.
 msgid "Password saved."
 msgstr "Zapisano hasło."
 
@@ -3508,6 +3539,7 @@ msgstr "Witryny"
 msgid "Server"
 msgstr "Serwer"
 
+#. TRANS: Field title in Paths admin panel.
 msgid "Site's server hostname."
 msgstr "Nazwa komputera serwera strony."
 
@@ -3515,6 +3547,7 @@ msgstr "Nazwa komputera serwera strony."
 msgid "Path"
 msgstr "Ścieżka"
 
+#. TRANS: Field title in Paths admin panel.
 msgid "Site path."
 msgstr "Ścieżka do witryny."
 
@@ -3522,6 +3555,7 @@ msgstr "Ścieżka do witryny."
 msgid "Locale directory"
 msgstr "Katalog lokalizacji"
 
+#. TRANS: Field title in Paths admin panel.
 msgid "Directory path to locales."
 msgstr "Ścieżka do katalogu lokalizacji."
 
@@ -3529,11 +3563,16 @@ msgstr "Ścieżka do katalogu lokalizacji."
 msgid "Fancy URLs"
 msgstr "Eleganckie adresu URL"
 
-msgid "Use fancy (more readable and memorable) URLs?"
+#. TRANS: Field title in Paths admin panel.
+#, fuzzy
+msgid "Use fancy URLs (more readable and memorable)?"
 msgstr ""
 "Używać eleganckich (bardziej czytelnych i łatwiejszych do zapamiętania) "
 "adresów URL?"
 
+#. TRANS: Fieldset legend in Paths admin panel.
+#, fuzzy
+msgctxt "LEGEND"
 msgid "Theme"
 msgstr "Motyw"
 
@@ -3646,6 +3685,8 @@ msgid "Directory where attachments are located."
 msgstr "Katalog, w którym położone są załączniki."
 
 #. TRANS: Fieldset legend in Paths admin panel.
+#, fuzzy
+msgctxt "LEGEND"
 msgid "SSL"
 msgstr "SSL"
 
@@ -3691,10 +3732,14 @@ msgstr ""
 msgid "People search"
 msgstr "Wyszukiwanie osób"
 
+#. TRANS: Client error displayed when trying to tag a profile with an invalid tag.
+#. TRANS: %s is the invalid tag.
 #, php-format
 msgid "Not a valid people tag: %s."
 msgstr "Nieprawidłowy znacznik osób: %s."
 
+#. TRANS: Page title for users with a certain self-tag.
+#. TRANS: %1$s is the tag, %2$s is the page number.
 #, php-format
 msgid "Users self-tagged with %1$s - page %2$d"
 msgstr "Użytkownicy używający znacznika %1$s - strona %2$d"
@@ -3704,15 +3749,19 @@ msgctxt "plugin"
 msgid "Disabled"
 msgstr ""
 
+#. TRANS: Client error displayed when trying to use another method than POST.
+#. TRANS: Do not translate POST.
 #. TRANS: Client error displayed trying to perform any request method other than POST.
 #. TRANS: Do not translate POST.
 msgid "This action only accepts POST requests."
 msgstr "Ta czynność przyjmuje tylko żądania POST."
 
+#. TRANS: Client error displayed when trying to enable or disable a plugin without access rights.
 #, fuzzy
 msgid "You cannot administer plugins."
 msgstr "Nie można usuwać użytkowników."
 
+#. TRANS: Client error displayed when trying to enable or disable a non-existing plugin.
 #, fuzzy
 msgid "No such plugin."
 msgstr "Nie ma takiej strony."
@@ -3723,7 +3772,8 @@ msgid "Enabled"
 msgstr ""
 
 #. TRANS: Tab and title for plugins admin panel.
-#. TRANS: Menu item for site administration
+#, fuzzy
+msgctxt "TITLE"
 msgid "Plugins"
 msgstr "Wtyczki"
 
@@ -3739,15 +3789,19 @@ msgstr ""
 msgid "Default plugins"
 msgstr "Domyślny język"
 
+#. TRANS: Text displayed on plugin admin page when no plugin are enabled.
 msgid ""
 "All default plugins have been disabled from the site's configuration file."
 msgstr ""
 
+#. TRANS: Client error displayed if the notice posted has too many characters.
 msgid "Invalid notice content."
 msgstr "Nieprawidłowa treść wpisu."
 
-#, php-format
-msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’."
+#. TRANS: Exception thrown if a notice's license is not compatible with the StatusNet site license.
+#. TRANS: %1$s is the notice license, %2$s is the StatusNet site's license.
+#, fuzzy, php-format
+msgid "Notice license \"%1$s\" is not compatible with site license \"%2$s\"."
 msgstr "Licencja wpisu \"%1$s\" nie jest zgodna z licencją witryny \"%2$s\"."
 
 #. TRANS: Page title for profile settings.
@@ -3897,29 +3951,39 @@ msgstr "Zapisano ustawienia."
 msgid "Restore account"
 msgstr "Przywróć konto"
 
+#. TRANS: Client error displayed when requesting a public timeline page beyond the page limit.
+#. TRANS: %s is the page limit.
 #, php-format
 msgid "Beyond the page limit (%s)."
 msgstr "Poza ograniczeniem strony (%s)."
 
+#. TRANS: Server error displayed when a public timeline cannot be retrieved.
 msgid "Could not retrieve public stream."
 msgstr "Nie można pobrać publicznego strumienia."
 
+#. TRANS: Title for all public timeline pages but the first.
+#. TRANS: %d is the page number.
 #, php-format
 msgid "Public timeline, page %d"
 msgstr "Publiczna oś czasu, strona %d"
 
+#. TRANS: Title for the first public timeline page.
 msgid "Public timeline"
 msgstr "Publiczna oś czasu"
 
+#. TRANS: Link description for public timeline feed.
 msgid "Public Stream Feed (RSS 1.0)"
 msgstr "Kanał publicznego strumienia (RSS 1.0)"
 
+#. TRANS: Link description for public timeline feed.
 msgid "Public Stream Feed (RSS 2.0)"
 msgstr "Kanał publicznego strumienia (RSS 2.0)"
 
+#. TRANS: Link description for public timeline feed.
 msgid "Public Stream Feed (Atom)"
 msgstr "Kanał publicznego strumienia (Atom)"
 
+#. TRANS: Text displayed for public feed when there are no public notices.
 #, php-format
 msgid ""
 "This is the public timeline for %%site.name%% but no one has posted anything "
@@ -3928,9 +3992,11 @@ msgstr ""
 "To jest publiczna oś czasu dla %%site.name%%, ale nikt jeszcze nic nie "
 "wysłał."
 
+#. TRANS: Additional text displayed for public feed when there are no public notices for a logged in user.
 msgid "Be the first to post!"
 msgstr "Zostań pierwszym, który coś wyśle."
 
+#. TRANS: Additional text displayed for public feed when there are no public notices for a not logged in user.
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post!"
@@ -3938,6 +4004,8 @@ msgstr ""
 "Dlaczego nie [zarejestrujesz konta](%%action.register%%) i zostaniesz "
 "pierwszym, który coś wyśle."
 
+#. TRANS: Message for not logged in users at an invite-only site trying to view the public feed of notices.
+#. TRANS: This message contains Markdown links. Please mind the formatting.
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -3950,6 +4018,8 @@ msgstr ""
 "[Dołącz teraz](%%action.register%%), aby dzielić się wpisami o sobie z "
 "przyjaciółmi, rodziną i kolegami. ([Przeczytaj więcej](%%doc.help%%))"
 
+#. TRANS: Message for not logged in users at a closed site trying to view the public feed of notices.
+#. TRANS: This message contains Markdown links. Please mind the formatting.
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -5658,6 +5728,10 @@ msgstr ""
 "Powszechnej Licencji Publicznej Affero GNU (GNU Affero General Public "
 "License); jeśli nie - proszę odwiedzić stronę internetową %s."
 
+#. TRANS: Menu item for site administration
+msgid "Plugins"
+msgstr "Wtyczki"
+
 #. TRANS: Form input field label for application name.
 msgid "Name"
 msgstr "Nazwa"
@@ -6175,6 +6249,9 @@ msgstr "saveSettings() nie jest zaimplementowane."
 msgid "Unable to delete design setting."
 msgstr "Nie można usunąć ustawienia wyglądu."
 
+msgid "Home"
+msgstr "Strona domowa"
+
 #. TRANS: Menu item title/tooltip
 msgid "Basic site configuration"
 msgstr "Podstawowa konfiguracja witryny"
@@ -6804,9 +6881,6 @@ msgstr "Przejdź do instalatora."
 msgid "Database error"
 msgstr "Błąd bazy danych"
 
-msgid "Home"
-msgstr "Strona domowa"
-
 msgid "Public"
 msgstr "Publiczny"
 
@@ -7615,7 +7689,6 @@ msgstr "Wyślij wpis"
 msgid "What's up, %s?"
 msgstr "Co słychać, %s?"
 
-#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr "Załącz"
 
@@ -7684,6 +7757,9 @@ msgstr "Usuń ten wpis"
 msgid "Notice repeated"
 msgstr "Powtórzono wpis"
 
+msgid "Update your status..."
+msgstr ""
+
 msgid "Nudge this user"
 msgstr "Szturchnij tego użytkownika"
 
@@ -8203,11 +8279,3 @@ msgstr "Nieprawidłowy kod XML, brak głównego XRD."
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr "Pobieranie kopii zapasowej z pliku \"%s\"."
-
-#, fuzzy
-#~ msgid "Friends timeline"
-#~ msgstr "Oś czasu użytkownika %s"
-
-#, fuzzy
-#~ msgid "Everyone on this site"
-#~ msgstr "Znajdź osoby na tej witrynie"
diff --git a/locale/pt/LC_MESSAGES/statusnet.po b/locale/pt/LC_MESSAGES/statusnet.po
index 715f73afa7..8cba1b643c 100644
--- a/locale/pt/LC_MESSAGES/statusnet.po
+++ b/locale/pt/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-03-08 01:03+0000\n"
-"PO-Revision-Date: 2011-03-08 01:05:28+0000\n"
+"POT-Creation-Date: 2011-03-11 18:15+0000\n"
+"PO-Revision-Date: 2011-03-11 18:17:24+0000\n"
 "Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
+"X-Generator: MediaWiki 1.18alpha (r83703); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-03-06 02:16:47+0000\n"
+"X-POT-Import-Date: 2011-03-08 01:25:01+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -1035,7 +1035,8 @@ msgid "Can only fave notices."
 msgstr "Só pode por actualizações nos favoritos."
 
 #. TRANS: Client exception thrown when trying favorite a notice without content.
-msgid "Unknown note."
+#, fuzzy
+msgid "Unknown notice."
 msgstr "Nota desconhecida."
 
 #. TRANS: Client exception thrown when trying favorite an already favorited notice.
@@ -1597,6 +1598,7 @@ msgstr "Apagar este grupo."
 #. TRANS: Client error displayed trying to create a new direct message while not logged in.
 #. TRANS: Client error displayed trying to send a notice while not logged in.
 #. TRANS: Client error displayed trying to nudge a user without being logged in.
+#. TRANS: Client error displayed when trying to enable or disable a plugin while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
@@ -3094,6 +3096,10 @@ msgstr "É necessária a URL de origem."
 msgid "Could not create application."
 msgstr "Não foi possível criar a aplicação."
 
+#, fuzzy
+msgid "Invalid image."
+msgstr "Tamanho inválido."
+
 #. TRANS: Title for form to create a group.
 msgid "New group"
 msgstr "Grupo novo"
@@ -3376,49 +3382,74 @@ msgid "This is your outbox, which lists private messages you have sent."
 msgstr ""
 "Esta é a sua caixa de saída, que apresenta as mensagens privadas que enviou."
 
+#. TRANS: Title for page where to change password.
+#, fuzzy
+msgctxt "TITLE"
 msgid "Change password"
 msgstr "Modificar senha"
 
+#. TRANS: Instructions for page where to change password.
 msgid "Change your password."
 msgstr "Modificar a sua senha."
 
+#. TRANS: Fieldset legend on page where to change password.
 #. TRANS: Fieldset legend for password reset form.
 msgid "Password change"
 msgstr "Mudança da senha"
 
+#. TRANS: Field label on page where to change password.
 msgid "Old password"
 msgstr "Antiga"
 
+#. TRANS: Field label on page where to change password.
 #. TRANS: Field label for password reset form.
 msgid "New password"
 msgstr "Nova"
 
+#. TRANS: Field title on page where to change password.
 msgid "6 or more characters."
 msgstr "6 ou mais caracteres."
 
+#. TRANS: Field label on page where to change password. In this field the new password should be typed a second time.
+#, fuzzy
+msgctxt "LABEL"
+msgid "Confirm"
+msgstr "Confirmação"
+
+#. TRANS: Field title on page where to change password.
 #. TRANS: Ttile for field label for password reset form where the password has to be typed again.
 msgid "Same as password above."
 msgstr "Repita a nova senha."
 
+#. TRANS: Button text on page where to change password.
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Change"
 msgstr "Modificar"
 
+#. TRANS: Form validation error on page where to change password.
 msgid "Password must be 6 or more characters."
 msgstr "Senha tem de ter 6 ou mais caracteres."
 
 msgid "Passwords don't match."
 msgstr "Senhas não coincidem."
 
-msgid "Incorrect old password"
+#. TRANS: Form validation error on page where to change password.
+#, fuzzy
+msgid "Incorrect old password."
 msgstr "Senha antiga incorrecta."
 
+#. TRANS: Form validation error on page where to change password.
 msgid "Error saving user; invalid."
 msgstr "Erro ao guardar utilizador; inválido."
 
+#. TRANS: Server error displayed on page where to change password when password change
+#. TRANS: could not be made because of a server error.
 #. TRANS: Reset password form validation error message.
 msgid "Cannot save new password."
 msgstr "Não é possível salvar a nova senha."
 
+#. TRANS: Form validation notice on page where to change password.
 msgid "Password saved."
 msgstr "Senha gravada."
 
@@ -3468,6 +3499,7 @@ msgstr "Site"
 msgid "Server"
 msgstr "Servidor"
 
+#. TRANS: Field title in Paths admin panel.
 msgid "Site's server hostname."
 msgstr "Nome do servidor do site."
 
@@ -3475,6 +3507,7 @@ msgstr "Nome do servidor do site."
 msgid "Path"
 msgstr "Localização"
 
+#. TRANS: Field title in Paths admin panel.
 msgid "Site path."
 msgstr "Localização do site."
 
@@ -3482,6 +3515,7 @@ msgstr "Localização do site."
 msgid "Locale directory"
 msgstr "Directório local"
 
+#. TRANS: Field title in Paths admin panel.
 #, fuzzy
 msgid "Directory path to locales."
 msgstr "Localização do directório das línguas"
@@ -3490,9 +3524,14 @@ msgstr "Localização do directório das línguas"
 msgid "Fancy URLs"
 msgstr "URLs bonitas"
 
-msgid "Use fancy (more readable and memorable) URLs?"
+#. TRANS: Field title in Paths admin panel.
+#, fuzzy
+msgid "Use fancy URLs (more readable and memorable)?"
 msgstr "Usar URLs bonitas (mais legíveis e memoráveis)"
 
+#. TRANS: Fieldset legend in Paths admin panel.
+#, fuzzy
+msgctxt "LEGEND"
 msgid "Theme"
 msgstr "Tema"
 
@@ -3613,6 +3652,8 @@ msgid "Directory where attachments are located."
 msgstr "Localização do directório das línguas"
 
 #. TRANS: Fieldset legend in Paths admin panel.
+#, fuzzy
+msgctxt "LEGEND"
 msgid "SSL"
 msgstr "SSL"
 
@@ -3660,10 +3701,14 @@ msgstr ""
 msgid "People search"
 msgstr "Pesquisa de pessoas"
 
+#. TRANS: Client error displayed when trying to tag a profile with an invalid tag.
+#. TRANS: %s is the invalid tag.
 #, php-format
 msgid "Not a valid people tag: %s."
 msgstr "Categoria de pessoas inválida: %s."
 
+#. TRANS: Page title for users with a certain self-tag.
+#. TRANS: %1$s is the tag, %2$s is the page number.
 #, php-format
 msgid "Users self-tagged with %1$s - page %2$d"
 msgstr "Utilizadores auto-categorizados com %1$s - página %2$d"
@@ -3673,15 +3718,19 @@ msgctxt "plugin"
 msgid "Disabled"
 msgstr "Desabilitado"
 
+#. TRANS: Client error displayed when trying to use another method than POST.
+#. TRANS: Do not translate POST.
 #. TRANS: Client error displayed trying to perform any request method other than POST.
 #. TRANS: Do not translate POST.
 msgid "This action only accepts POST requests."
 msgstr "Esta operação só aceita pedidos POST."
 
+#. TRANS: Client error displayed when trying to enable or disable a plugin without access rights.
 #, fuzzy
 msgid "You cannot administer plugins."
 msgstr "Não pode apagar utilizadores."
 
+#. TRANS: Client error displayed when trying to enable or disable a non-existing plugin.
 #, fuzzy
 msgid "No such plugin."
 msgstr "Página não foi encontrada."
@@ -3692,7 +3741,8 @@ msgid "Enabled"
 msgstr "Habilitado"
 
 #. TRANS: Tab and title for plugins admin panel.
-#. TRANS: Menu item for site administration
+#, fuzzy
+msgctxt "TITLE"
 msgid "Plugins"
 msgstr "Plugins"
 
@@ -3707,15 +3757,19 @@ msgstr ""
 msgid "Default plugins"
 msgstr "Plugins padrão"
 
+#. TRANS: Text displayed on plugin admin page when no plugin are enabled.
 msgid ""
 "All default plugins have been disabled from the site's configuration file."
 msgstr ""
 
+#. TRANS: Client error displayed if the notice posted has too many characters.
 msgid "Invalid notice content."
 msgstr "Conteúdo da nota é inválido."
 
-#, php-format
-msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’."
+#. TRANS: Exception thrown if a notice's license is not compatible with the StatusNet site license.
+#. TRANS: %1$s is the notice license, %2$s is the StatusNet site's license.
+#, fuzzy, php-format
+msgid "Notice license \"%1$s\" is not compatible with site license \"%2$s\"."
 msgstr ""
 "A licença ‘%1$s’ da nota não é compatível com a licença ‘%2$s’ do site."
 
@@ -3868,29 +3922,39 @@ msgstr "Configurações gravadas."
 msgid "Restore account"
 msgstr "Criar uma conta"
 
+#. TRANS: Client error displayed when requesting a public timeline page beyond the page limit.
+#. TRANS: %s is the page limit.
 #, php-format
 msgid "Beyond the page limit (%s)."
 msgstr "Além do limite de página (%s)."
 
+#. TRANS: Server error displayed when a public timeline cannot be retrieved.
 msgid "Could not retrieve public stream."
 msgstr "Não foi possível importar as notas públicas."
 
+#. TRANS: Title for all public timeline pages but the first.
+#. TRANS: %d is the page number.
 #, php-format
 msgid "Public timeline, page %d"
 msgstr "Notas públicas, página %d"
 
+#. TRANS: Title for the first public timeline page.
 msgid "Public timeline"
 msgstr "Notas públicas"
 
+#. TRANS: Link description for public timeline feed.
 msgid "Public Stream Feed (RSS 1.0)"
 msgstr "Fonte de Notas Públicas (RSS 1.0)"
 
+#. TRANS: Link description for public timeline feed.
 msgid "Public Stream Feed (RSS 2.0)"
 msgstr "Fonte de Notas Públicas (RSS 2.0)"
 
+#. TRANS: Link description for public timeline feed.
 msgid "Public Stream Feed (Atom)"
 msgstr "Fonte de Notas Públicas (Atom)"
 
+#. TRANS: Text displayed for public feed when there are no public notices.
 #, php-format
 msgid ""
 "This is the public timeline for %%site.name%% but no one has posted anything "
@@ -3899,9 +3963,11 @@ msgstr ""
 "Estas são as notas públicas do site %%site.name%% mas ninguém publicou nada "
 "ainda."
 
+#. TRANS: Additional text displayed for public feed when there are no public notices for a logged in user.
 msgid "Be the first to post!"
 msgstr "Seja a primeira pessoa a publicar!"
 
+#. TRANS: Additional text displayed for public feed when there are no public notices for a not logged in user.
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post!"
@@ -3909,6 +3975,8 @@ msgstr ""
 "Podia [registar uma conta](%%action.register%%) e ser a primeira pessoa a "
 "publicar!"
 
+#. TRANS: Message for not logged in users at an invite-only site trying to view the public feed of notices.
+#. TRANS: This message contains Markdown links. Please mind the formatting.
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -3921,6 +3989,8 @@ msgstr ""
 "[StatusNet](http://status.net/). [Registe-se agora](%%action.register%%) "
 "para partilhar notas sobre si, família e amigos! ([Saber mais](%%doc.help%%))"
 
+#. TRANS: Message for not logged in users at a closed site trying to view the public feed of notices.
+#. TRANS: This message contains Markdown links. Please mind the formatting.
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -5640,6 +5710,10 @@ msgstr ""
 "Juntamente com este programa deve ter recebido uma cópia da GNU Affero "
 "General Public License. Se não a tiver recebido, consulte %s."
 
+#. TRANS: Menu item for site administration
+msgid "Plugins"
+msgstr "Plugins"
+
 #. TRANS: Form input field label for application name.
 msgid "Name"
 msgstr "Nome"
@@ -6152,6 +6226,9 @@ msgstr "saveSettings() não implementado."
 msgid "Unable to delete design setting."
 msgstr "Não foi possível apagar a configuração do estilo."
 
+msgid "Home"
+msgstr "Página pessoal"
+
 #. TRANS: Menu item title/tooltip
 msgid "Basic site configuration"
 msgstr "Configuração básica do site"
@@ -6778,9 +6855,6 @@ msgstr "Ir para o instalador."
 msgid "Database error"
 msgstr "Erro de base de dados"
 
-msgid "Home"
-msgstr "Página pessoal"
-
 msgid "Public"
 msgstr "Público"
 
@@ -7587,7 +7661,6 @@ msgstr "Enviar uma nota"
 msgid "What's up, %s?"
 msgstr "Novidades, %s?"
 
-#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr "Anexar"
 
@@ -7656,6 +7729,9 @@ msgstr "Apagar esta nota"
 msgid "Notice repeated"
 msgstr "Nota repetida"
 
+msgid "Update your status..."
+msgstr ""
+
 msgid "Nudge this user"
 msgstr "Tocar este utilizador"
 
@@ -8167,10 +8243,3 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
-
-#, fuzzy
-#~ msgid "Friends timeline"
-#~ msgstr "Notas de %s"
-
-#~ msgid "Everyone on this site"
-#~ msgstr "Todos neste site"
diff --git a/locale/pt_BR/LC_MESSAGES/statusnet.po b/locale/pt_BR/LC_MESSAGES/statusnet.po
index ade9fcc57c..66957c90c9 100644
--- a/locale/pt_BR/LC_MESSAGES/statusnet.po
+++ b/locale/pt_BR/LC_MESSAGES/statusnet.po
@@ -15,18 +15,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-08 01:03+0000\n"
-"PO-Revision-Date: 2011-03-08 01:05:29+0000\n"
+"POT-Creation-Date: 2011-03-11 18:15+0000\n"
+"PO-Revision-Date: 2011-03-11 18:17:25+0000\n"
 "Language-Team: Brazilian Portuguese <http://translatewiki.net/wiki/Portal:pt-"
 "br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
+"X-Generator: MediaWiki 1.18alpha (r83703); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt-br\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-POT-Import-Date: 2011-03-06 02:16:47+0000\n"
+"X-POT-Import-Date: 2011-03-08 01:25:01+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -1051,7 +1051,8 @@ msgid "Can only fave notices."
 msgstr "Só é possível tornar favoritas as mensagens."
 
 #. TRANS: Client exception thrown when trying favorite a notice without content.
-msgid "Unknown note."
+#, fuzzy
+msgid "Unknown notice."
 msgstr "Mensagem desconhecida."
 
 #. TRANS: Client exception thrown when trying favorite an already favorited notice.
@@ -1639,6 +1640,7 @@ msgstr "Excluir este grupo"
 #. TRANS: Client error displayed trying to create a new direct message while not logged in.
 #. TRANS: Client error displayed trying to send a notice while not logged in.
 #. TRANS: Client error displayed trying to nudge a user without being logged in.
+#. TRANS: Client error displayed when trying to enable or disable a plugin while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
@@ -3163,6 +3165,10 @@ msgstr "A URL da fonte é obrigatória."
 msgid "Could not create application."
 msgstr "Não foi possível criar a aplicação."
 
+#, fuzzy
+msgid "Invalid image."
+msgstr "Tamanho inválido."
+
 #. TRANS: Title for form to create a group.
 msgid "New group"
 msgstr "Novo grupo"
@@ -3451,52 +3457,77 @@ msgstr ""
 "Essa é a sua caixa de mensagens enviadas, que lista as mensagens "
 "particulares que você enviou."
 
+#. TRANS: Title for page where to change password.
+#, fuzzy
+msgctxt "TITLE"
 msgid "Change password"
 msgstr "Alterar a senha"
 
+#. TRANS: Instructions for page where to change password.
 msgid "Change your password."
 msgstr "Altere a sua senha"
 
+#. TRANS: Fieldset legend on page where to change password.
 #. TRANS: Fieldset legend for password reset form.
 msgid "Password change"
 msgstr "Alterar a senha"
 
+#. TRANS: Field label on page where to change password.
 msgid "Old password"
 msgstr "Senha anterior"
 
+#. TRANS: Field label on page where to change password.
 #. TRANS: Field label for password reset form.
 msgid "New password"
 msgstr "Senha nova"
 
+#. TRANS: Field title on page where to change password.
 #, fuzzy
 msgid "6 or more characters."
 msgstr "No mínimo 6 caracteres"
 
+#. TRANS: Field label on page where to change password. In this field the new password should be typed a second time.
+#, fuzzy
+msgctxt "LABEL"
+msgid "Confirm"
+msgstr "Confirmar"
+
+#. TRANS: Field title on page where to change password.
 #. TRANS: Ttile for field label for password reset form where the password has to be typed again.
 #, fuzzy
 msgid "Same as password above."
 msgstr "Igual à senha acima"
 
+#. TRANS: Button text on page where to change password.
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Change"
 msgstr "Alterar"
 
+#. TRANS: Form validation error on page where to change password.
 msgid "Password must be 6 or more characters."
 msgstr "A senha deve ter, no mínimo, 6 caracteres."
 
 msgid "Passwords don't match."
 msgstr "As senhas não coincidem."
 
-msgid "Incorrect old password"
+#. TRANS: Form validation error on page where to change password.
+#, fuzzy
+msgid "Incorrect old password."
 msgstr "A senha anterior está errada"
 
+#. TRANS: Form validation error on page where to change password.
 msgid "Error saving user; invalid."
 msgstr "Erro ao salvar usuário; inválido."
 
+#. TRANS: Server error displayed on page where to change password when password change
+#. TRANS: could not be made because of a server error.
 #. TRANS: Reset password form validation error message.
 #, fuzzy
 msgid "Cannot save new password."
 msgstr "Não é possível salvar a nova senha."
 
+#. TRANS: Form validation notice on page where to change password.
 msgid "Password saved."
 msgstr "A senha foi salva."
 
@@ -3547,6 +3578,7 @@ msgstr "Site"
 msgid "Server"
 msgstr "Servidor"
 
+#. TRANS: Field title in Paths admin panel.
 msgid "Site's server hostname."
 msgstr "Nome de host do servidor do site."
 
@@ -3554,6 +3586,7 @@ msgstr "Nome de host do servidor do site."
 msgid "Path"
 msgstr "Caminho"
 
+#. TRANS: Field title in Paths admin panel.
 msgid "Site path."
 msgstr "Caminho do site."
 
@@ -3561,6 +3594,7 @@ msgstr "Caminho do site."
 msgid "Locale directory"
 msgstr "Diretório dos locales"
 
+#. TRANS: Field title in Paths admin panel.
 msgid "Directory path to locales."
 msgstr "Caminho do diretório de locales"
 
@@ -3568,9 +3602,14 @@ msgstr "Caminho do diretório de locales"
 msgid "Fancy URLs"
 msgstr "URLs limpas"
 
-msgid "Use fancy (more readable and memorable) URLs?"
+#. TRANS: Field title in Paths admin panel.
+#, fuzzy
+msgid "Use fancy URLs (more readable and memorable)?"
 msgstr "Utilizar URLs limpas (mais legíveis e memorizáveis)?"
 
+#. TRANS: Fieldset legend in Paths admin panel.
+#, fuzzy
+msgctxt "LEGEND"
 msgid "Theme"
 msgstr "Tema"
 
@@ -3683,6 +3722,8 @@ msgid "Directory where attachments are located."
 msgstr "Diretório onde os anexos estão localizados."
 
 #. TRANS: Fieldset legend in Paths admin panel.
+#, fuzzy
+msgctxt "LEGEND"
 msgid "SSL"
 msgstr "SSL"
 
@@ -3727,10 +3768,14 @@ msgstr ""
 msgid "People search"
 msgstr "Procurar pessoas"
 
+#. TRANS: Client error displayed when trying to tag a profile with an invalid tag.
+#. TRANS: %s is the invalid tag.
 #, php-format
 msgid "Not a valid people tag: %s."
 msgstr "Não é uma etiqueta de pessoa válida: %s."
 
+#. TRANS: Page title for users with a certain self-tag.
+#. TRANS: %1$s is the tag, %2$s is the page number.
 #, php-format
 msgid "Users self-tagged with %1$s - page %2$d"
 msgstr "Usuários auto-etiquetados com %1$s - pág. %2$d"
@@ -3740,15 +3785,19 @@ msgctxt "plugin"
 msgid "Disabled"
 msgstr ""
 
+#. TRANS: Client error displayed when trying to use another method than POST.
+#. TRANS: Do not translate POST.
 #. TRANS: Client error displayed trying to perform any request method other than POST.
 #. TRANS: Do not translate POST.
 msgid "This action only accepts POST requests."
 msgstr "Esta ação aceita somente requisições POST."
 
+#. TRANS: Client error displayed when trying to enable or disable a plugin without access rights.
 #, fuzzy
 msgid "You cannot administer plugins."
 msgstr "Você não pode excluir usuários."
 
+#. TRANS: Client error displayed when trying to enable or disable a non-existing plugin.
 #, fuzzy
 msgid "No such plugin."
 msgstr "Esta página não existe."
@@ -3759,7 +3808,8 @@ msgid "Enabled"
 msgstr ""
 
 #. TRANS: Tab and title for plugins admin panel.
-#. TRANS: Menu item for site administration
+#, fuzzy
+msgctxt "TITLE"
 msgid "Plugins"
 msgstr "Plugins"
 
@@ -3775,15 +3825,19 @@ msgstr ""
 msgid "Default plugins"
 msgstr "Idioma padrão"
 
+#. TRANS: Text displayed on plugin admin page when no plugin are enabled.
 msgid ""
 "All default plugins have been disabled from the site's configuration file."
 msgstr ""
 
+#. TRANS: Client error displayed if the notice posted has too many characters.
 msgid "Invalid notice content."
 msgstr "O conteúdo da mensagem é inválido."
 
-#, php-format
-msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’."
+#. TRANS: Exception thrown if a notice's license is not compatible with the StatusNet site license.
+#. TRANS: %1$s is the notice license, %2$s is the StatusNet site's license.
+#, fuzzy, php-format
+msgid "Notice license \"%1$s\" is not compatible with site license \"%2$s\"."
 msgstr ""
 "A licença ‘%1$s’ da mensagem não é compatível com a licença ‘%2$s’ do site."
 
@@ -3935,29 +3989,39 @@ msgstr "As configurações foram salvas."
 msgid "Restore account"
 msgstr "Criar uma conta"
 
+#. TRANS: Client error displayed when requesting a public timeline page beyond the page limit.
+#. TRANS: %s is the page limit.
 #, php-format
 msgid "Beyond the page limit (%s)."
 msgstr "Além do limite da página (%s)."
 
+#. TRANS: Server error displayed when a public timeline cannot be retrieved.
 msgid "Could not retrieve public stream."
 msgstr "Não foi possível recuperar o fluxo público."
 
+#. TRANS: Title for all public timeline pages but the first.
+#. TRANS: %d is the page number.
 #, php-format
 msgid "Public timeline, page %d"
 msgstr "Mensagens públicas, pág. %d"
 
+#. TRANS: Title for the first public timeline page.
 msgid "Public timeline"
 msgstr "Mensagens públicas"
 
+#. TRANS: Link description for public timeline feed.
 msgid "Public Stream Feed (RSS 1.0)"
 msgstr "Fonte de mensagens públicas (RSS 1.0)"
 
+#. TRANS: Link description for public timeline feed.
 msgid "Public Stream Feed (RSS 2.0)"
 msgstr "Fonte de mensagens públicas (RSS 2.0)"
 
+#. TRANS: Link description for public timeline feed.
 msgid "Public Stream Feed (Atom)"
 msgstr "Fonte de mensagens públicas (Atom)"
 
+#. TRANS: Text displayed for public feed when there are no public notices.
 #, php-format
 msgid ""
 "This is the public timeline for %%site.name%% but no one has posted anything "
@@ -3966,9 +4030,11 @@ msgstr ""
 "Esse é o fluxo de mensagens públicas de %%site.name%%, mas ninguém publicou "
 "nada ainda."
 
+#. TRANS: Additional text displayed for public feed when there are no public notices for a logged in user.
 msgid "Be the first to post!"
 msgstr "Seja o primeiro a publicar!"
 
+#. TRANS: Additional text displayed for public feed when there are no public notices for a not logged in user.
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post!"
@@ -3976,6 +4042,8 @@ msgstr ""
 "Por que você não [registra uma conta](%%action.register%%) pra ser o "
 "primeiro a publicar?"
 
+#. TRANS: Message for not logged in users at an invite-only site trying to view the public feed of notices.
+#. TRANS: This message contains Markdown links. Please mind the formatting.
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -3988,6 +4056,8 @@ msgstr ""
 "[Cadastre-se agora](%%action.register%%) para compartilhar notícias sobre "
 "você com seus amigos, família e colegas! ([Saiba mais](%%doc.help%%))"
 
+#. TRANS: Message for not logged in users at a closed site trying to view the public feed of notices.
+#. TRANS: This message contains Markdown links. Please mind the formatting.
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -5712,6 +5782,10 @@ msgstr ""
 "Você deve ter recebido uma cópia da GNU Affero General Public License com "
 "este programa. Caso contrário, veja %s."
 
+#. TRANS: Menu item for site administration
+msgid "Plugins"
+msgstr "Plugins"
+
 #. TRANS: Form input field label for application name.
 msgid "Name"
 msgstr "Nome"
@@ -6216,6 +6290,9 @@ msgstr "saveSettings() não implementado."
 msgid "Unable to delete design setting."
 msgstr "Não foi possível excluir as configurações da aparência."
 
+msgid "Home"
+msgstr "Site"
+
 #. TRANS: Menu item title/tooltip
 msgid "Basic site configuration"
 msgstr "Configuração básica do site"
@@ -6856,9 +6933,6 @@ msgstr "Ir para o instalador."
 msgid "Database error"
 msgstr "Erro no banco de dados"
 
-msgid "Home"
-msgstr "Site"
-
 msgid "Public"
 msgstr "Público"
 
@@ -7669,7 +7743,6 @@ msgstr "Enviar uma mensagem"
 msgid "What's up, %s?"
 msgstr "E aí, %s?"
 
-#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr "Anexo"
 
@@ -7738,6 +7811,9 @@ msgstr "Excluir esta mensagem"
 msgid "Notice repeated"
 msgstr "Mensagem repetida"
 
+msgid "Update your status..."
+msgstr ""
+
 msgid "Nudge this user"
 msgstr "Chamar a atenção deste usuário"
 
@@ -8247,11 +8323,3 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
-
-#, fuzzy
-#~ msgid "Friends timeline"
-#~ msgstr "Mensagens de %s"
-
-#, fuzzy
-#~ msgid "Everyone on this site"
-#~ msgstr "Encontre pessoas neste site"
diff --git a/locale/ru/LC_MESSAGES/statusnet.po b/locale/ru/LC_MESSAGES/statusnet.po
index e3319efb95..69cfbaaae3 100644
--- a/locale/ru/LC_MESSAGES/statusnet.po
+++ b/locale/ru/LC_MESSAGES/statusnet.po
@@ -18,18 +18,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-08 01:03+0000\n"
-"PO-Revision-Date: 2011-03-08 01:05:30+0000\n"
+"POT-Creation-Date: 2011-03-11 18:15+0000\n"
+"PO-Revision-Date: 2011-03-11 18:17:26+0000\n"
 "Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
+"X-Generator: MediaWiki 1.18alpha (r83703); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
-"X-POT-Import-Date: 2011-03-06 02:16:47+0000\n"
+"X-POT-Import-Date: 2011-03-08 01:25:01+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -1056,7 +1056,8 @@ msgid "Can only fave notices."
 msgstr "Возможно только добавление записей в число любимых."
 
 #. TRANS: Client exception thrown when trying favorite a notice without content.
-msgid "Unknown note."
+#, fuzzy
+msgid "Unknown notice."
 msgstr "Неизвестная запись"
 
 #. TRANS: Client exception thrown when trying favorite an already favorited notice.
@@ -1641,6 +1642,7 @@ msgstr "Удалить эту группу"
 #. TRANS: Client error displayed trying to create a new direct message while not logged in.
 #. TRANS: Client error displayed trying to send a notice while not logged in.
 #. TRANS: Client error displayed trying to nudge a user without being logged in.
+#. TRANS: Client error displayed when trying to enable or disable a plugin while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
@@ -3166,6 +3168,10 @@ msgstr "URL источника обязателен."
 msgid "Could not create application."
 msgstr "Не удаётся создать приложение."
 
+#, fuzzy
+msgid "Invalid image."
+msgstr "Неверный размер."
+
 #. TRANS: Title for form to create a group.
 msgid "New group"
 msgstr "Новая группа"
@@ -3451,52 +3457,77 @@ msgstr ""
 "Это список исходящих писем, в котором перечислены отправленные вами личные "
 "сообщения."
 
+#. TRANS: Title for page where to change password.
+#, fuzzy
+msgctxt "TITLE"
 msgid "Change password"
 msgstr "Изменение пароля"
 
+#. TRANS: Instructions for page where to change password.
 msgid "Change your password."
 msgstr "Измените ваш пароль."
 
+#. TRANS: Fieldset legend on page where to change password.
 #. TRANS: Fieldset legend for password reset form.
 msgid "Password change"
 msgstr "Пароль сохранён."
 
+#. TRANS: Field label on page where to change password.
 msgid "Old password"
 msgstr "Старый пароль"
 
+#. TRANS: Field label on page where to change password.
 #. TRANS: Field label for password reset form.
 msgid "New password"
 msgstr "Новый пароль"
 
+#. TRANS: Field title on page where to change password.
 #, fuzzy
 msgid "6 or more characters."
 msgstr "6 или больше знаков"
 
+#. TRANS: Field label on page where to change password. In this field the new password should be typed a second time.
+#, fuzzy
+msgctxt "LABEL"
+msgid "Confirm"
+msgstr "Подтверждение"
+
+#. TRANS: Field title on page where to change password.
 #. TRANS: Ttile for field label for password reset form where the password has to be typed again.
 #, fuzzy
 msgid "Same as password above."
 msgstr "Тот же пароль, что и выше"
 
+#. TRANS: Button text on page where to change password.
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Change"
 msgstr "Изменить"
 
+#. TRANS: Form validation error on page where to change password.
 msgid "Password must be 6 or more characters."
 msgstr "Пароль должен быть длиной не менее 6 символов."
 
 msgid "Passwords don't match."
 msgstr "Пароли не совпадают."
 
-msgid "Incorrect old password"
+#. TRANS: Form validation error on page where to change password.
+#, fuzzy
+msgid "Incorrect old password."
 msgstr "Некорректный старый пароль"
 
+#. TRANS: Form validation error on page where to change password.
 msgid "Error saving user; invalid."
 msgstr "Ошибка сохранения пользователя; неверное имя."
 
+#. TRANS: Server error displayed on page where to change password when password change
+#. TRANS: could not be made because of a server error.
 #. TRANS: Reset password form validation error message.
 #, fuzzy
 msgid "Cannot save new password."
 msgstr "Не удаётся сохранить новый пароль."
 
+#. TRANS: Form validation notice on page where to change password.
 msgid "Password saved."
 msgstr "Пароль сохранён."
 
@@ -3546,6 +3577,7 @@ msgstr "Сайт"
 msgid "Server"
 msgstr "Сервер"
 
+#. TRANS: Field title in Paths admin panel.
 msgid "Site's server hostname."
 msgstr "Имя хоста сервера сайта."
 
@@ -3553,6 +3585,7 @@ msgstr "Имя хоста сервера сайта."
 msgid "Path"
 msgstr "Путь"
 
+#. TRANS: Field title in Paths admin panel.
 msgid "Site path."
 msgstr "Путь к сайту."
 
@@ -3560,6 +3593,7 @@ msgstr "Путь к сайту."
 msgid "Locale directory"
 msgstr "Директория локализации"
 
+#. TRANS: Field title in Paths admin panel.
 msgid "Directory path to locales."
 msgstr "Путь к директории локализаций"
 
@@ -3567,9 +3601,14 @@ msgstr "Путь к директории локализаций"
 msgid "Fancy URLs"
 msgstr "Короткие URL"
 
-msgid "Use fancy (more readable and memorable) URLs?"
+#. TRANS: Field title in Paths admin panel.
+#, fuzzy
+msgid "Use fancy URLs (more readable and memorable)?"
 msgstr "Использовать ли короткие (более читаемые и запоминаемые) URL-адреса?"
 
+#. TRANS: Fieldset legend in Paths admin panel.
+#, fuzzy
+msgctxt "LEGEND"
 msgid "Theme"
 msgstr "Тема"
 
@@ -3682,6 +3721,8 @@ msgid "Directory where attachments are located."
 msgstr "Директория, в которой расположены вложения."
 
 #. TRANS: Fieldset legend in Paths admin panel.
+#, fuzzy
+msgctxt "LEGEND"
 msgid "SSL"
 msgstr "SSL"
 
@@ -3726,10 +3767,14 @@ msgstr ""
 msgid "People search"
 msgstr "Поиск людей"
 
+#. TRANS: Client error displayed when trying to tag a profile with an invalid tag.
+#. TRANS: %s is the invalid tag.
 #, php-format
 msgid "Not a valid people tag: %s."
 msgstr "Неверный тег человека: %s."
 
+#. TRANS: Page title for users with a certain self-tag.
+#. TRANS: %1$s is the tag, %2$s is the page number.
 #, php-format
 msgid "Users self-tagged with %1$s - page %2$d"
 msgstr "Пользователи, установившие себе тег %1$s — страница %2$d"
@@ -3739,15 +3784,19 @@ msgctxt "plugin"
 msgid "Disabled"
 msgstr ""
 
+#. TRANS: Client error displayed when trying to use another method than POST.
+#. TRANS: Do not translate POST.
 #. TRANS: Client error displayed trying to perform any request method other than POST.
 #. TRANS: Do not translate POST.
 msgid "This action only accepts POST requests."
 msgstr "Это действие принимает только POST-запросы."
 
+#. TRANS: Client error displayed when trying to enable or disable a plugin without access rights.
 #, fuzzy
 msgid "You cannot administer plugins."
 msgstr "Вы не можете удалять пользователей."
 
+#. TRANS: Client error displayed when trying to enable or disable a non-existing plugin.
 #, fuzzy
 msgid "No such plugin."
 msgstr "Нет такой страницы."
@@ -3758,7 +3807,8 @@ msgid "Enabled"
 msgstr ""
 
 #. TRANS: Tab and title for plugins admin panel.
-#. TRANS: Menu item for site administration
+#, fuzzy
+msgctxt "TITLE"
 msgid "Plugins"
 msgstr "Плагины"
 
@@ -3774,15 +3824,19 @@ msgstr ""
 msgid "Default plugins"
 msgstr "Язык по умолчанию"
 
+#. TRANS: Text displayed on plugin admin page when no plugin are enabled.
 msgid ""
 "All default plugins have been disabled from the site's configuration file."
 msgstr ""
 
+#. TRANS: Client error displayed if the notice posted has too many characters.
 msgid "Invalid notice content."
 msgstr "Ошибочное содержание записи."
 
-#, php-format
-msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’."
+#. TRANS: Exception thrown if a notice's license is not compatible with the StatusNet site license.
+#. TRANS: %1$s is the notice license, %2$s is the StatusNet site's license.
+#, fuzzy, php-format
+msgid "Notice license \"%1$s\" is not compatible with site license \"%2$s\"."
 msgstr "Лицензия записи «%1$s» не совместима с лицензией сайта «%2$s»."
 
 #. TRANS: Page title for profile settings.
@@ -3935,38 +3989,50 @@ msgstr "Настройки сохранены."
 msgid "Restore account"
 msgstr "Создать новый аккаунт"
 
+#. TRANS: Client error displayed when requesting a public timeline page beyond the page limit.
+#. TRANS: %s is the page limit.
 #, php-format
 msgid "Beyond the page limit (%s)."
 msgstr "Превышен предел страницы (%s)."
 
+#. TRANS: Server error displayed when a public timeline cannot be retrieved.
 msgid "Could not retrieve public stream."
 msgstr "Не удаётся вернуть публичный поток."
 
+#. TRANS: Title for all public timeline pages but the first.
+#. TRANS: %d is the page number.
 #, php-format
 msgid "Public timeline, page %d"
 msgstr "Общая лента, страница %d"
 
+#. TRANS: Title for the first public timeline page.
 msgid "Public timeline"
 msgstr "Общая лента"
 
+#. TRANS: Link description for public timeline feed.
 msgid "Public Stream Feed (RSS 1.0)"
 msgstr "Лента публичного потока (RSS 1.0)"
 
+#. TRANS: Link description for public timeline feed.
 msgid "Public Stream Feed (RSS 2.0)"
 msgstr "Лента публичного потока (RSS 2.0)"
 
+#. TRANS: Link description for public timeline feed.
 msgid "Public Stream Feed (Atom)"
 msgstr "Лента публичного потока (Atom)"
 
+#. TRANS: Text displayed for public feed when there are no public notices.
 #, php-format
 msgid ""
 "This is the public timeline for %%site.name%% but no one has posted anything "
 "yet."
 msgstr "Это общая лента %%site.name%%, однако пока никто ничего не отправил."
 
+#. TRANS: Additional text displayed for public feed when there are no public notices for a logged in user.
 msgid "Be the first to post!"
 msgstr "Создайте первую запись!"
 
+#. TRANS: Additional text displayed for public feed when there are no public notices for a not logged in user.
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post!"
@@ -3974,6 +4040,8 @@ msgstr ""
 "Почему бы не [зарегистрироваться](%%action.register%%), чтобы стать первым "
 "отправителем?"
 
+#. TRANS: Message for not logged in users at an invite-only site trying to view the public feed of notices.
+#. TRANS: This message contains Markdown links. Please mind the formatting.
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -3987,6 +4055,8 @@ msgstr ""
 "register%%), чтобы держать в курсе своих  событий  поклонников, друзей, "
 "родственников и коллег! ([Читать далее](%%doc.help%%))"
 
+#. TRANS: Message for not logged in users at a closed site trying to view the public feed of notices.
+#. TRANS: This message contains Markdown links. Please mind the formatting.
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -5704,6 +5774,10 @@ msgstr ""
 "Вы должны были получить копию GNU Affero General Public License вместе с "
 "этой программой. Если нет, см. %s."
 
+#. TRANS: Menu item for site administration
+msgid "Plugins"
+msgstr "Плагины"
+
 #. TRANS: Form input field label for application name.
 msgid "Name"
 msgstr "Имя"
@@ -6214,6 +6288,9 @@ msgstr "saveSettings() не реализована."
 msgid "Unable to delete design setting."
 msgstr "Не удаётся удалить настройки оформления."
 
+msgid "Home"
+msgstr "Главная"
+
 #. TRANS: Menu item title/tooltip
 msgid "Basic site configuration"
 msgstr "Основная конфигурация сайта"
@@ -6850,9 +6927,6 @@ msgstr "Перейти к установщику"
 msgid "Database error"
 msgstr "Ошибка базы данных"
 
-msgid "Home"
-msgstr "Главная"
-
 msgid "Public"
 msgstr "Общее"
 
@@ -7665,7 +7739,6 @@ msgstr "Послать запись"
 msgid "What's up, %s?"
 msgstr "Что нового, %s?"
 
-#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr "Прикрепить"
 
@@ -7734,6 +7807,9 @@ msgstr "Удалить эту запись"
 msgid "Notice repeated"
 msgstr "Запись повторена"
 
+msgid "Update your status..."
+msgstr ""
+
 msgid "Nudge this user"
 msgstr "«Подтолкнуть» этого пользователя"
 
@@ -8251,11 +8327,3 @@ msgstr "Неверный XML, отсутствует корень XRD."
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr "Получение резервной копии из файла «%s»."
-
-#, fuzzy
-#~ msgid "Friends timeline"
-#~ msgstr "Лента %s"
-
-#, fuzzy
-#~ msgid "Everyone on this site"
-#~ msgstr "Найти человека на этом сайте"
diff --git a/locale/statusnet.pot b/locale/statusnet.pot
index 81cdbaba1e..8ffd6aab4d 100644
--- a/locale/statusnet.pot
+++ b/locale/statusnet.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-08 01:03+0000\n"
+"POT-Creation-Date: 2011-03-11 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -19,7 +19,7 @@ msgstr ""
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
-#: actions/accessadminpanel.php:53 lib/adminpanelnav.php:92
+#: actions/accessadminpanel.php:53 lib/adminpanelnav.php:110
 msgid "Access"
 msgstr ""
 
@@ -85,7 +85,7 @@ msgstr ""
 #. TRANS: Button text on profile design page to save settings.
 #: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
 #: actions/emailsettings.php:251 actions/imsettings.php:199
-#: actions/licenseadminpanel.php:335 actions/pathsadminpanel.php:512
+#: actions/licenseadminpanel.php:335 actions/pathsadminpanel.php:517
 #: actions/profilesettings.php:198 actions/sitenoticeadminpanel.php:197
 #: actions/smssettings.php:204 actions/subscriptions.php:261
 #: actions/urlsettings.php:152 actions/useradminpanel.php:298
@@ -97,7 +97,7 @@ msgstr ""
 
 #. TRANS: Server error when page not found (404).
 #. TRANS: Server error when page not found (404)
-#: actions/all.php:68 actions/public.php:98 actions/replies.php:93
+#: actions/all.php:68 actions/public.php:99 actions/replies.php:93
 #: actions/showfavorites.php:140 actions/tag.php:52
 msgid "No such page."
 msgstr ""
@@ -176,7 +176,7 @@ msgstr ""
 #. TRANS: Timeline title for user and friends. %s is a user nickname.
 #: actions/all.php:94 actions/all.php:185 actions/allrss.php:117
 #: actions/apitimelinefriends.php:207 actions/apitimelinehome.php:113
-#: lib/personalgroupnav.php:72
+#: lib/adminpanelnav.php:70 lib/personalgroupnav.php:72 lib/settingsnav.php:71
 #, php-format
 msgid "%s and friends"
 msgstr ""
@@ -853,8 +853,8 @@ msgstr ""
 #: actions/invite.php:60 actions/makeadmin.php:67 actions/newmessage.php:140
 #: actions/newnotice.php:104 actions/nudge.php:81
 #: actions/oauthappssettings.php:162 actions/oauthconnectionssettings.php:135
-#: actions/passwordsettings.php:137 actions/pluginenable.php:87
-#: actions/profilesettings.php:218 actions/recoverpassword.php:383
+#: actions/passwordsettings.php:146 actions/pluginenable.php:87
+#: actions/profilesettings.php:218 actions/recoverpassword.php:387
 #: actions/register.php:157 actions/remotesubscribe.php:76
 #: actions/repeat.php:82 actions/smssettings.php:249 actions/subedit.php:40
 #: actions/subscribe.php:87 actions/tagother.php:145
@@ -943,7 +943,7 @@ msgstr ""
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Field label on login page.
 #: actions/apioauthauthorize.php:463 actions/login.php:235
-#: actions/register.php:415 lib/settingsnav.php:74
+#: actions/register.php:415 lib/settingsnav.php:93
 msgid "Password"
 msgstr ""
 
@@ -1311,7 +1311,7 @@ msgstr ""
 
 #. TRANS: Client exception thrown when trying favorite a notice without content.
 #: actions/atompubfavoritefeed.php:259
-msgid "Unknown note."
+msgid "Unknown notice."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying favorite an already favorited notice.
@@ -1505,7 +1505,7 @@ msgid "Invalid size."
 msgstr ""
 
 #. TRANS: Title for avatar upload page.
-#: actions/avatarsettings.php:66 lib/settingsnav.php:69
+#: actions/avatarsettings.php:66 lib/settingsnav.php:88
 msgid "Avatar"
 msgstr ""
 
@@ -1865,8 +1865,8 @@ msgstr ""
 
 #. TRANS: Field label for delete account confirmation entry.
 #. TRANS: Field label for password reset form where the password has to be typed again.
-#: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:262 actions/register.php:419
+#: actions/deleteaccount.php:300 actions/recoverpassword.php:262
+#: actions/register.php:419
 msgid "Confirm"
 msgstr ""
 
@@ -1902,7 +1902,7 @@ msgstr ""
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
 #: actions/newapplication.php:112 actions/showapplication.php:113
-#: lib/action.php:1388
+#: lib/action.php:1409
 msgid "There was a problem with your session token."
 msgstr ""
 
@@ -1996,6 +1996,7 @@ msgstr ""
 #. TRANS: Client error displayed trying to create a new direct message while not logged in.
 #. TRANS: Client error displayed trying to send a notice while not logged in.
 #. TRANS: Client error displayed trying to nudge a user without being logged in.
+#. TRANS: Client error displayed when trying to enable or disable a plugin while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
@@ -2003,7 +2004,7 @@ msgstr ""
 #: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
 #: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:62 actions/newmessage.php:89 actions/newnotice.php:87
-#: actions/nudge.php:64 actions/pluginenable.php:97 actions/subedit.php:33
+#: actions/nudge.php:64 actions/pluginenable.php:98 actions/subedit.php:33
 #: actions/subscribe.php:98 actions/tagother.php:33 actions/unsubscribe.php:52
 #: lib/adminpanelaction.php:71 lib/profileformaction.php:63
 #: lib/settingsaction.php:72
@@ -2077,7 +2078,7 @@ msgid "Delete this user."
 msgstr ""
 
 #. TRANS: Message used as title for design settings for the site.
-#: actions/designadminpanel.php:60 lib/settingsnav.php:84
+#: actions/designadminpanel.php:60 lib/settingsnav.php:103
 msgid "Design"
 msgstr ""
 
@@ -2969,7 +2970,7 @@ msgid "A list of the users in this group."
 msgstr ""
 
 #. TRANS: Indicator in group members list that this user is a group administrator.
-#: actions/groupmembers.php:190 lib/primarynav.php:63
+#: actions/groupmembers.php:190 lib/adminpanelnav.php:77 lib/primarynav.php:63
 msgid "Admin"
 msgstr ""
 
@@ -3355,7 +3356,7 @@ msgstr ""
 
 #. TRANS: Send button for inviting friends
 #. TRANS: Button text for sending notice.
-#: actions/invite.php:232 lib/noticeform.php:254
+#: actions/invite.php:232 lib/noticeform.php:256
 msgctxt "BUTTON"
 msgid "Send"
 msgstr ""
@@ -3688,6 +3689,10 @@ msgstr ""
 msgid "Could not create application."
 msgstr ""
 
+#: actions/newapplication.php:297
+msgid "Invalid image."
+msgstr ""
+
 #. TRANS: Title for form to create a group.
 #: actions/newgroup.php:53
 msgid "New group"
@@ -4013,70 +4018,92 @@ msgstr ""
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr ""
 
-#: actions/passwordsettings.php:58
+#. TRANS: Title for page where to change password.
+#: actions/passwordsettings.php:59
+msgctxt "TITLE"
 msgid "Change password"
 msgstr ""
 
-#: actions/passwordsettings.php:69
+#. TRANS: Instructions for page where to change password.
+#: actions/passwordsettings.php:71
 msgid "Change your password."
 msgstr ""
 
+#. TRANS: Fieldset legend on page where to change password.
 #. TRANS: Fieldset legend for password reset form.
-#: actions/passwordsettings.php:96 actions/recoverpassword.php:251
+#: actions/passwordsettings.php:99 actions/recoverpassword.php:251
 msgid "Password change"
 msgstr ""
 
-#: actions/passwordsettings.php:104
+#. TRANS: Field label on page where to change password.
+#: actions/passwordsettings.php:108
 msgid "Old password"
 msgstr ""
 
+#. TRANS: Field label on page where to change password.
 #. TRANS: Field label for password reset form.
-#: actions/passwordsettings.php:108 actions/recoverpassword.php:256
+#: actions/passwordsettings.php:113 actions/recoverpassword.php:256
 msgid "New password"
 msgstr ""
 
-#: actions/passwordsettings.php:109 actions/register.php:416
+#. TRANS: Field title on page where to change password.
+#: actions/passwordsettings.php:115 actions/register.php:416
 msgid "6 or more characters."
 msgstr ""
 
+#. TRANS: Field label on page where to change password. In this field the new password should be typed a second time.
+#: actions/passwordsettings.php:119
+msgctxt "LABEL"
+msgid "Confirm"
+msgstr ""
+
+#. TRANS: Field title on page where to change password.
 #. TRANS: Ttile for field label for password reset form where the password has to be typed again.
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:264
+#: actions/passwordsettings.php:121 actions/recoverpassword.php:264
 #: actions/register.php:420
 msgid "Same as password above."
 msgstr ""
 
-#: actions/passwordsettings.php:117
+#. TRANS: Button text on page where to change password.
+#: actions/passwordsettings.php:126
+msgctxt "BUTTON"
 msgid "Change"
 msgstr ""
 
-#: actions/passwordsettings.php:153 actions/register.php:223
+#. TRANS: Form validation error on page where to change password.
+#: actions/passwordsettings.php:163 actions/register.php:223
 msgid "Password must be 6 or more characters."
 msgstr ""
 
-#: actions/passwordsettings.php:156 actions/register.php:226
+#: actions/passwordsettings.php:166 actions/register.php:226
 msgid "Passwords don't match."
 msgstr ""
 
-#: actions/passwordsettings.php:164
-msgid "Incorrect old password"
+#. TRANS: Form validation error on page where to change password.
+#: actions/passwordsettings.php:175
+msgid "Incorrect old password."
 msgstr ""
 
-#: actions/passwordsettings.php:180
+#. TRANS: Form validation error on page where to change password.
+#: actions/passwordsettings.php:192
 msgid "Error saving user; invalid."
 msgstr ""
 
+#. TRANS: Server error displayed on page where to change password when password change
+#. TRANS: could not be made because of a server error.
 #. TRANS: Reset password form validation error message.
-#: actions/passwordsettings.php:185 actions/recoverpassword.php:418
+#: actions/passwordsettings.php:199 actions/recoverpassword.php:422
 msgid "Cannot save new password."
 msgstr ""
 
-#: actions/passwordsettings.php:191
+#. TRANS: Form validation notice on page where to change password.
+#: actions/passwordsettings.php:206
 msgid "Password saved."
 msgstr ""
 
 #. TRANS: Title for Paths admin panel.
 #. TRANS: Menu item for site administration
-#: actions/pathsadminpanel.php:58 lib/adminpanelnav.php:100
+#: actions/pathsadminpanel.php:58 lib/adminpanelnav.php:118
 msgid "Paths"
 msgstr ""
 
@@ -4125,221 +4152,228 @@ msgid "Site"
 msgstr ""
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:241 actions/pathsadminpanel.php:279
-#: actions/pathsadminpanel.php:370 actions/pathsadminpanel.php:425
+#: actions/pathsadminpanel.php:241 actions/pathsadminpanel.php:284
+#: actions/pathsadminpanel.php:375 actions/pathsadminpanel.php:430
 msgid "Server"
 msgstr ""
 
-#: actions/pathsadminpanel.php:242
+#. TRANS: Field title in Paths admin panel.
+#: actions/pathsadminpanel.php:243
 msgid "Site's server hostname."
 msgstr ""
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:248 actions/pathsadminpanel.php:288
-#: actions/pathsadminpanel.php:379 actions/pathsadminpanel.php:434
+#: actions/pathsadminpanel.php:249 actions/pathsadminpanel.php:293
+#: actions/pathsadminpanel.php:384 actions/pathsadminpanel.php:439
 msgid "Path"
 msgstr ""
 
-#: actions/pathsadminpanel.php:249
+#. TRANS: Field title in Paths admin panel.
+#: actions/pathsadminpanel.php:251
 msgid "Site path."
 msgstr ""
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:255
+#: actions/pathsadminpanel.php:257
 msgid "Locale directory"
 msgstr ""
 
-#: actions/pathsadminpanel.php:256
+#. TRANS: Field title in Paths admin panel.
+#: actions/pathsadminpanel.php:259
 msgid "Directory path to locales."
 msgstr ""
 
 #. TRANS: Checkbox label in Paths admin panel.
-#: actions/pathsadminpanel.php:263
+#: actions/pathsadminpanel.php:266
 msgid "Fancy URLs"
 msgstr ""
 
-#: actions/pathsadminpanel.php:265
-msgid "Use fancy (more readable and memorable) URLs?"
+#. TRANS: Field title in Paths admin panel.
+#: actions/pathsadminpanel.php:269
+msgid "Use fancy URLs (more readable and memorable)?"
 msgstr ""
 
-#: actions/pathsadminpanel.php:272
+#. TRANS: Fieldset legend in Paths admin panel.
+#: actions/pathsadminpanel.php:277
+msgctxt "LEGEND"
 msgid "Theme"
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:281
+#: actions/pathsadminpanel.php:286
 msgid "Server for themes."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:290
+#: actions/pathsadminpanel.php:295
 msgid "Web path to themes."
 msgstr ""
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:297 actions/pathsadminpanel.php:388
-#: actions/pathsadminpanel.php:443 actions/pathsadminpanel.php:495
+#: actions/pathsadminpanel.php:302 actions/pathsadminpanel.php:393
+#: actions/pathsadminpanel.php:448 actions/pathsadminpanel.php:500
 msgid "SSL server"
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:299
+#: actions/pathsadminpanel.php:304
 msgid "SSL server for themes (default: SSL server)."
 msgstr ""
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:306 actions/pathsadminpanel.php:397
-#: actions/pathsadminpanel.php:452
+#: actions/pathsadminpanel.php:311 actions/pathsadminpanel.php:402
+#: actions/pathsadminpanel.php:457
 msgid "SSL path"
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:308
+#: actions/pathsadminpanel.php:313
 msgid "SSL path to themes (default: /theme/)."
 msgstr ""
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:315 actions/pathsadminpanel.php:406
-#: actions/pathsadminpanel.php:461
+#: actions/pathsadminpanel.php:320 actions/pathsadminpanel.php:411
+#: actions/pathsadminpanel.php:466
 msgid "Directory"
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:317
+#: actions/pathsadminpanel.php:322
 msgid "Directory where themes are located."
 msgstr ""
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:326
+#: actions/pathsadminpanel.php:331
 msgid "Avatars"
 msgstr ""
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:333
+#: actions/pathsadminpanel.php:338
 msgid "Avatar server"
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:335
+#: actions/pathsadminpanel.php:340
 msgid "Server for avatars."
 msgstr ""
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:342
+#: actions/pathsadminpanel.php:347
 msgid "Avatar path"
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:344
+#: actions/pathsadminpanel.php:349
 msgid "Web path to avatars."
 msgstr ""
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:351
+#: actions/pathsadminpanel.php:356
 msgid "Avatar directory"
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:353
+#: actions/pathsadminpanel.php:358
 msgid "Directory where avatars are located."
 msgstr ""
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:364
+#: actions/pathsadminpanel.php:369
 msgid "Backgrounds"
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:372
+#: actions/pathsadminpanel.php:377
 msgid "Server for backgrounds."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:381
+#: actions/pathsadminpanel.php:386
 msgid "Web path to backgrounds."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:390
+#: actions/pathsadminpanel.php:395
 msgid "Server for backgrounds on SSL pages."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:399
+#: actions/pathsadminpanel.php:404
 msgid "Web path to backgrounds on SSL pages."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:408
+#: actions/pathsadminpanel.php:413
 msgid "Directory where backgrounds are located."
 msgstr ""
 
 #. TRANS: Fieldset legens in Paths admin panel.
-#: actions/pathsadminpanel.php:419
+#: actions/pathsadminpanel.php:424
 msgid "Attachments"
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:427
+#: actions/pathsadminpanel.php:432
 msgid "Server for attachments."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:436
+#: actions/pathsadminpanel.php:441
 msgid "Web path to attachments."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:445
+#: actions/pathsadminpanel.php:450
 msgid "Server for attachments on SSL pages."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:454
+#: actions/pathsadminpanel.php:459
 msgid "Web path to attachments on SSL pages."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:463
+#: actions/pathsadminpanel.php:468
 msgid "Directory where attachments are located."
 msgstr ""
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:472
+#: actions/pathsadminpanel.php:477
+msgctxt "LEGEND"
 msgid "SSL"
 msgstr ""
 
 #. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
-#: actions/pathsadminpanel.php:477 actions/snapshotadminpanel.php:202
+#: actions/pathsadminpanel.php:482 actions/snapshotadminpanel.php:202
 msgid "Never"
 msgstr ""
 
 #. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
-#: actions/pathsadminpanel.php:479
+#: actions/pathsadminpanel.php:484
 msgid "Sometimes"
 msgstr ""
 
 #. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
-#: actions/pathsadminpanel.php:481
+#: actions/pathsadminpanel.php:486
 msgid "Always"
 msgstr ""
 
-#: actions/pathsadminpanel.php:485
+#: actions/pathsadminpanel.php:490
 msgid "Use SSL"
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:487
+#: actions/pathsadminpanel.php:492
 msgid "When to use SSL."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:497
+#: actions/pathsadminpanel.php:502
 msgid "Server to direct SSL requests to."
 msgstr ""
 
 #. TRANS: Button title text to store form data in the Paths admin panel.
-#: actions/pathsadminpanel.php:514
+#: actions/pathsadminpanel.php:519
 msgid "Save paths"
 msgstr ""
 
@@ -4357,51 +4391,58 @@ msgstr ""
 msgid "People search"
 msgstr ""
 
-#: actions/peopletag.php:68
+#. TRANS: Client error displayed when trying to tag a profile with an invalid tag.
+#. TRANS: %s is the invalid tag.
+#: actions/peopletag.php:69
 #, php-format
 msgid "Not a valid people tag: %s."
 msgstr ""
 
-#: actions/peopletag.php:142
+#. TRANS: Page title for users with a certain self-tag.
+#. TRANS: %1$s is the tag, %2$s is the page number.
+#: actions/peopletag.php:145
 #, php-format
 msgid "Users self-tagged with %1$s - page %2$d"
 msgstr ""
 
 #. TRANS: Page title for AJAX form return when a disabling a plugin.
-#: actions/plugindisable.php:69
+#: actions/plugindisable.php:68
 msgctxt "plugin"
 msgid "Disabled"
 msgstr ""
 
+#. TRANS: Client error displayed when trying to use another method than POST.
+#. TRANS: Do not translate POST.
 #. TRANS: Client error displayed trying to perform any request method other than POST.
 #. TRANS: Do not translate POST.
 #: actions/pluginenable.php:78 actions/subscribe.php:77
 msgid "This action only accepts POST requests."
 msgstr ""
 
-#: actions/pluginenable.php:102
+#. TRANS: Client error displayed when trying to enable or disable a plugin without access rights.
+#: actions/pluginenable.php:104
 msgid "You cannot administer plugins."
 msgstr ""
 
-#: actions/pluginenable.php:109
+#. TRANS: Client error displayed when trying to enable or disable a non-existing plugin.
+#: actions/pluginenable.php:112
 msgid "No such plugin."
 msgstr ""
 
 #. TRANS: Page title for AJAX form return when enabling a plugin.
-#: actions/pluginenable.php:159
+#: actions/pluginenable.php:161
 msgctxt "plugin"
 msgid "Enabled"
 msgstr ""
 
 #. TRANS: Tab and title for plugins admin panel.
-#. TRANS: Menu item for site administration
-#: actions/pluginsadminpanel.php:56 actions/version.php:191
-#: lib/adminpanelnav.php:140
+#: actions/pluginsadminpanel.php:53
+msgctxt "TITLE"
 msgid "Plugins"
 msgstr ""
 
 #. TRANS: Instructions at top of plugin admin page.
-#: actions/pluginsadminpanel.php:68
+#: actions/pluginsadminpanel.php:64
 msgid ""
 "Additional plugins can be enabled and configured manually. See the <a href="
 "\"http://status.net/wiki/Plugins\">online plugin documentation</a> for more "
@@ -4409,22 +4450,26 @@ msgid ""
 msgstr ""
 
 #. TRANS: Admin form section header
-#: actions/pluginsadminpanel.php:84
+#: actions/pluginsadminpanel.php:79
 msgid "Default plugins"
 msgstr ""
 
-#: actions/pluginsadminpanel.php:106
+#. TRANS: Text displayed on plugin admin page when no plugin are enabled.
+#: actions/pluginsadminpanel.php:102
 msgid ""
 "All default plugins have been disabled from the site's configuration file."
 msgstr ""
 
-#: actions/postnotice.php:95
+#. TRANS: Client error displayed if the notice posted has too many characters.
+#: actions/postnotice.php:96
 msgid "Invalid notice content."
 msgstr ""
 
-#: actions/postnotice.php:101
+#. TRANS: Exception thrown if a notice's license is not compatible with the StatusNet site license.
+#. TRANS: %1$s is the notice license, %2$s is the StatusNet site's license.
+#: actions/postnotice.php:104
 #, php-format
-msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’."
+msgid "Notice license \"%1$s\" is not compatible with site license \"%2$s\"."
 msgstr ""
 
 #. TRANS: Page title for profile settings.
@@ -4598,54 +4643,68 @@ msgstr ""
 msgid "Restore account"
 msgstr ""
 
+#. TRANS: Client error displayed when requesting a public timeline page beyond the page limit.
+#. TRANS: %s is the page limit.
 #: actions/public.php:83
 #, php-format
 msgid "Beyond the page limit (%s)."
 msgstr ""
 
-#: actions/public.php:92
+#. TRANS: Server error displayed when a public timeline cannot be retrieved.
+#: actions/public.php:93
 msgid "Could not retrieve public stream."
 msgstr ""
 
-#: actions/public.php:130
+#. TRANS: Title for all public timeline pages but the first.
+#. TRANS: %d is the page number.
+#: actions/public.php:131
 #, php-format
 msgid "Public timeline, page %d"
 msgstr ""
 
-#: actions/public.php:132 lib/publicgroupnav.php:65
+#. TRANS: Title for the first public timeline page.
+#: actions/public.php:134 lib/publicgroupnav.php:65
 msgid "Public timeline"
 msgstr ""
 
-#: actions/public.php:160
+#. TRANS: Link description for public timeline feed.
+#: actions/public.php:162
 msgid "Public Stream Feed (RSS 1.0)"
 msgstr ""
 
-#: actions/public.php:164
+#. TRANS: Link description for public timeline feed.
+#: actions/public.php:167
 msgid "Public Stream Feed (RSS 2.0)"
 msgstr ""
 
-#: actions/public.php:168
+#. TRANS: Link description for public timeline feed.
+#: actions/public.php:172
 msgid "Public Stream Feed (Atom)"
 msgstr ""
 
-#: actions/public.php:173
+#. TRANS: Text displayed for public feed when there are no public notices.
+#: actions/public.php:178
 #, php-format
 msgid ""
 "This is the public timeline for %%site.name%% but no one has posted anything "
 "yet."
 msgstr ""
 
-#: actions/public.php:176
+#. TRANS: Additional text displayed for public feed when there are no public notices for a logged in user.
+#: actions/public.php:182
 msgid "Be the first to post!"
 msgstr ""
 
-#: actions/public.php:180
+#. TRANS: Additional text displayed for public feed when there are no public notices for a not logged in user.
+#: actions/public.php:187
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post!"
 msgstr ""
 
-#: actions/public.php:227
+#. TRANS: Message for not logged in users at an invite-only site trying to view the public feed of notices.
+#. TRANS: This message contains Markdown links. Please mind the formatting.
+#: actions/public.php:235
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -4654,7 +4713,9 @@ msgid ""
 "friends, family, and colleagues! ([Read more](%%doc.help%%))"
 msgstr ""
 
-#: actions/public.php:232
+#. TRANS: Message for not logged in users at a closed site trying to view the public feed of notices.
+#. TRANS: This message contains Markdown links. Please mind the formatting.
+#: actions/public.php:242
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -4790,7 +4851,7 @@ msgstr ""
 
 #. TRANS: Title for password recovery page in email sent mode.
 #. TRANS: Subject for password recovery e-mail.
-#: actions/recoverpassword.php:227 actions/recoverpassword.php:366
+#: actions/recoverpassword.php:227 actions/recoverpassword.php:370
 msgid "Password recovery requested"
 msgstr ""
 
@@ -4822,49 +4883,49 @@ msgid "Enter a nickname or email address."
 msgstr ""
 
 #. TRANS: Information on password recovery form if no known username or e-mail address was specified.
-#: actions/recoverpassword.php:309
+#: actions/recoverpassword.php:313
 msgid "No user with that email address or username."
 msgstr ""
 
 #. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
-#: actions/recoverpassword.php:327
+#: actions/recoverpassword.php:331
 msgid "No registered email address for that user."
 msgstr ""
 
 #. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
-#: actions/recoverpassword.php:342
+#: actions/recoverpassword.php:346
 msgid "Error saving address confirmation."
 msgstr ""
 
 #. TRANS: User notification after an e-mail with instructions was sent from the password recovery form.
-#: actions/recoverpassword.php:370
+#: actions/recoverpassword.php:374
 msgid ""
 "Instructions for recovering your password have been sent to the email "
 "address registered to your account."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to reset as password without providing a user.
-#: actions/recoverpassword.php:391
+#: actions/recoverpassword.php:395
 msgid "Unexpected password reset."
 msgstr ""
 
 #. TRANS: Reset password form validation error message.
-#: actions/recoverpassword.php:400
+#: actions/recoverpassword.php:404
 msgid "Password must be 6 characters or more."
 msgstr ""
 
 #. TRANS: Reset password form validation error message.
-#: actions/recoverpassword.php:405
+#: actions/recoverpassword.php:409
 msgid "Password and confirmation do not match."
 msgstr ""
 
 #. TRANS: Server error displayed when something does wrong with the user object during password reset.
-#: actions/recoverpassword.php:426 actions/register.php:241
+#: actions/recoverpassword.php:430 actions/register.php:241
 msgid "Error setting user."
 msgstr ""
 
 #. TRANS: Success message for user after password reset.
-#: actions/recoverpassword.php:434
+#: actions/recoverpassword.php:438
 msgid "New password successfully saved. You are now logged in."
 msgstr ""
 
@@ -4916,7 +4977,7 @@ msgid ""
 msgstr ""
 
 #: actions/register.php:424 actions/register.php:428
-#: actions/siteadminpanel.php:238 lib/settingsnav.php:79
+#: actions/siteadminpanel.php:238 lib/settingsnav.php:98
 msgid "Email"
 msgstr ""
 
@@ -5056,7 +5117,7 @@ msgstr ""
 msgid "You already repeated that notice."
 msgstr ""
 
-#: actions/repeat.php:112 lib/noticelist.php:697
+#: actions/repeat.php:112 lib/noticelistitem.php:602
 msgid "Repeated"
 msgstr ""
 
@@ -5225,7 +5286,7 @@ msgstr ""
 
 #. TRANS: Menu item for site administration
 #: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
-#: lib/adminpanelnav.php:108
+#: lib/adminpanelnav.php:126
 msgid "Sessions"
 msgstr ""
 
@@ -5283,7 +5344,7 @@ msgstr ""
 
 #. TRANS: Title of form for deleting a user.
 #: actions/showapplication.php:228 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:64 lib/noticelist.php:678
+#: lib/deleteuserform.php:64 lib/noticelistitem.php:583
 msgid "Delete"
 msgstr ""
 
@@ -5902,7 +5963,7 @@ msgstr ""
 
 #. TRANS: Menu item for site administration
 #: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
-#: lib/adminpanelnav.php:124
+#: lib/adminpanelnav.php:142
 msgid "Snapshots"
 msgstr ""
 
@@ -6082,12 +6143,12 @@ msgid "Subscription feed for %s (Atom)"
 msgstr ""
 
 #. TRANS: Checkbox label for enabling Jabber messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:241 lib/settingsnav.php:97
+#: actions/subscriptions.php:241 lib/settingsnav.php:116
 msgid "IM"
 msgstr ""
 
 #. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:256 lib/settingsnav.php:104
+#: actions/subscriptions.php:256 lib/settingsnav.php:123
 msgid "SMS"
 msgstr ""
 
@@ -6279,7 +6340,7 @@ msgid "Invalid default subscripton: \"%1$s\" is not a user."
 msgstr ""
 
 #: actions/useradminpanel.php:215 lib/personalgroupnav.php:76
-#: lib/settingsnav.php:64 lib/subgroupnav.php:79
+#: lib/settingsnav.php:83 lib/subgroupnav.php:79
 msgid "Profile"
 msgstr ""
 
@@ -6540,7 +6601,7 @@ msgid "Contributors"
 msgstr ""
 
 #. TRANS: Menu item for site administration
-#: actions/version.php:167 lib/adminpanelnav.php:132
+#: actions/version.php:167 lib/adminpanelnav.php:150
 msgid "License"
 msgstr ""
 
@@ -6567,6 +6628,11 @@ msgid ""
 "along with this program.  If not, see %s."
 msgstr ""
 
+#. TRANS: Menu item for site administration
+#: actions/version.php:191 lib/adminpanelnav.php:158
+msgid "Plugins"
+msgstr ""
+
 #. TRANS: Form input field label for application name.
 #: actions/version.php:197 lib/applicationeditform.php:190
 msgid "Name"
@@ -6939,23 +7005,23 @@ msgid "Untitled page"
 msgstr ""
 
 #. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.
-#: lib/action.php:331
+#: lib/action.php:338
 msgctxt "TOOLTIP"
 msgid "Show more"
 msgstr ""
 
 #. TRANS: Inline reply form submit button: submits a reply comment.
-#: lib/action.php:334
+#: lib/action.php:341
 msgctxt "BUTTON"
 msgid "Reply"
 msgstr ""
 
 #. TRANS: Placeholder text for inline reply form. Clicking in this box will turn it into a mini notice form.
-#: lib/action.php:337
+#: lib/action.php:344
 msgid "Write a reply..."
 msgstr ""
 
-#: lib/action.php:583
+#: lib/action.php:590
 msgid "Status"
 msgstr ""
 
@@ -6963,7 +7029,7 @@ msgstr ""
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:918
+#: lib/action.php:939
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -6971,7 +7037,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:921
+#: lib/action.php:942
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr ""
@@ -6980,7 +7046,7 @@ msgstr ""
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:928
+#: lib/action.php:949
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -6990,39 +7056,39 @@ msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:946
+#: lib/action.php:967
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:953
+#: lib/action.php:974
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:957
+#: lib/action.php:978
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:989
+#: lib/action.php:1010
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1332
+#: lib/action.php:1353
 msgid "After"
 msgstr ""
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1342
+#: lib/action.php:1363
 msgid "Before"
 msgstr ""
 
@@ -7144,76 +7210,82 @@ msgstr ""
 msgid "Unable to delete design setting."
 msgstr ""
 
+#: lib/adminpanelnav.php:65 lib/adminpanelnav.php:69
+#: lib/defaultlocalnav.php:58 lib/personalgroupnav.php:71
+#: lib/settingsnav.php:66 lib/settingsnav.php:70
+msgid "Home"
+msgstr ""
+
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelnav.php:66
+#: lib/adminpanelnav.php:84
 msgid "Basic site configuration"
 msgstr ""
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelnav.php:68
+#: lib/adminpanelnav.php:86
 msgctxt "MENU"
 msgid "Site"
 msgstr ""
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelnav.php:74
+#: lib/adminpanelnav.php:92
 msgid "Design configuration"
 msgstr ""
 
 #. TRANS: Menu item for site administration
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/adminpanelnav.php:76 lib/groupnav.php:133
+#: lib/adminpanelnav.php:94 lib/groupnav.php:133
 msgctxt "MENU"
 msgid "Design"
 msgstr ""
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelnav.php:82
+#: lib/adminpanelnav.php:100
 msgid "User configuration"
 msgstr ""
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelnav.php:84 lib/personalgroupnav.php:88
+#: lib/adminpanelnav.php:102 lib/personalgroupnav.php:88
 msgid "User"
 msgstr ""
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelnav.php:90
+#: lib/adminpanelnav.php:108
 msgid "Access configuration"
 msgstr ""
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelnav.php:98
+#: lib/adminpanelnav.php:116
 msgid "Paths configuration"
 msgstr ""
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelnav.php:106
+#: lib/adminpanelnav.php:124
 msgid "Sessions configuration"
 msgstr ""
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelnav.php:114
+#: lib/adminpanelnav.php:132
 msgid "Edit site notice"
 msgstr ""
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelnav.php:116
+#: lib/adminpanelnav.php:134
 msgid "Site notice"
 msgstr ""
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelnav.php:122
+#: lib/adminpanelnav.php:140
 msgid "Snapshots configuration"
 msgstr ""
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelnav.php:130
+#: lib/adminpanelnav.php:148
 msgid "Set site license"
 msgstr ""
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelnav.php:138
+#: lib/adminpanelnav.php:156
 msgid "Plugins configuration"
 msgstr ""
 
@@ -7830,10 +7902,6 @@ msgstr ""
 msgid "Database error"
 msgstr ""
 
-#: lib/defaultlocalnav.php:58 lib/personalgroupnav.php:71
-msgid "Home"
-msgstr ""
-
 #: lib/defaultlocalnav.php:62 lib/publicgroupnav.php:64
 msgid "Public"
 msgstr ""
@@ -8223,13 +8291,13 @@ msgid "Login with a username and password"
 msgstr ""
 
 #. TRANS: Menu item for registering with the StatusNet site.
-#: lib/logingroupnav.php:72
+#: lib/logingroupnav.php:73
 msgctxt "MENU"
 msgid "Register"
 msgstr ""
 
 #. TRANS: Title for menu item for registering with the StatusNet site.
-#: lib/logingroupnav.php:74
+#: lib/logingroupnav.php:75
 msgid "Sign up for a new account"
 msgstr ""
 
@@ -8594,7 +8662,7 @@ msgstr ""
 msgid "Messages"
 msgstr ""
 
-#: lib/messagelistitem.php:123 lib/noticelist.php:527
+#: lib/messagelistitem.php:123 lib/noticelistitem.php:432
 msgid "from"
 msgstr ""
 
@@ -8602,15 +8670,15 @@ msgstr ""
 msgid "Can't get author for activity."
 msgstr ""
 
-#: lib/microappplugin.php:338
+#: lib/microappplugin.php:339
 msgid "Bookmark not posted to this group."
 msgstr ""
 
-#: lib/microappplugin.php:351
+#: lib/microappplugin.php:352
 msgid "Object not posted to this user."
 msgstr ""
 
-#: lib/microappplugin.php:355
+#: lib/microappplugin.php:356
 msgid "Don't know how to handle this kind of target."
 msgstr ""
 
@@ -8639,89 +8707,93 @@ msgid "What's up, %s?"
 msgstr ""
 
 #. TRANS: Input label in notice form for adding an attachment.
-#: lib/noticeform.php:190
+#: lib/noticeform.php:191
 msgid "Attach"
 msgstr ""
 
 #. TRANS: Title for input field to attach a file to a notice.
-#: lib/noticeform.php:195
+#: lib/noticeform.php:196
 msgid "Attach a file."
 msgstr ""
 
 #. TRANS: Field label to add location to a notice.
-#: lib/noticeform.php:224
+#: lib/noticeform.php:225
 msgid "Share my location"
 msgstr ""
 
 #. TRANS: Text to not share location for a notice in notice form.
-#: lib/noticeform.php:228
+#: lib/noticeform.php:230
 msgid "Do not share my location"
 msgstr ""
 
 #. TRANS: Timeout error text for location retrieval in notice form.
-#: lib/noticeform.php:230
+#: lib/noticeform.php:232
 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
 "try again later"
 msgstr ""
 
 #. TRANS: Used in coordinates as abbreviation of north
-#: lib/noticelist.php:457
+#: lib/noticelistitem.php:362
 msgid "N"
 msgstr ""
 
 #. TRANS: Used in coordinates as abbreviation of south
-#: lib/noticelist.php:459
+#: lib/noticelistitem.php:364
 msgid "S"
 msgstr ""
 
 #. TRANS: Used in coordinates as abbreviation of east
-#: lib/noticelist.php:461
+#: lib/noticelistitem.php:366
 msgid "E"
 msgstr ""
 
 #. TRANS: Used in coordinates as abbreviation of west
-#: lib/noticelist.php:463
+#: lib/noticelistitem.php:368
 msgid "W"
 msgstr ""
 
-#: lib/noticelist.php:465
+#: lib/noticelistitem.php:370
 #, php-format
 msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgstr ""
 
-#: lib/noticelist.php:474
+#: lib/noticelistitem.php:379
 msgid "at"
 msgstr ""
 
-#: lib/noticelist.php:523
+#: lib/noticelistitem.php:428
 msgid "web"
 msgstr ""
 
-#: lib/noticelist.php:589
+#: lib/noticelistitem.php:494
 msgid "in context"
 msgstr ""
 
-#: lib/noticelist.php:624
+#: lib/noticelistitem.php:529
 msgid "Repeated by"
 msgstr ""
 
-#: lib/noticelist.php:651
+#: lib/noticelistitem.php:556
 msgid "Reply to this notice"
 msgstr ""
 
-#: lib/noticelist.php:652
+#: lib/noticelistitem.php:557
 msgid "Reply"
 msgstr ""
 
-#: lib/noticelist.php:678
+#: lib/noticelistitem.php:583
 msgid "Delete this notice"
 msgstr ""
 
-#: lib/noticelist.php:696
+#: lib/noticelistitem.php:601
 msgid "Notice repeated"
 msgstr ""
 
+#: lib/noticeplaceholderform.php:54
+msgid "Update your status..."
+msgstr ""
+
 #: lib/nudgeform.php:116
 msgid "Nudge this user"
 msgstr ""
@@ -8795,7 +8867,7 @@ msgctxt "plugin-description"
 msgid "(Plugin descriptions unavailable when disabled.)"
 msgstr ""
 
-#: lib/primarynav.php:57
+#: lib/primarynav.php:57 lib/settingsnav.php:78
 msgid "Settings"
 msgstr ""
 
@@ -9014,47 +9086,47 @@ msgstr ""
 msgid "More..."
 msgstr ""
 
-#: lib/settingsnav.php:65
+#: lib/settingsnav.php:84
 msgid "Change your profile settings"
 msgstr ""
 
-#: lib/settingsnav.php:70
+#: lib/settingsnav.php:89
 msgid "Upload an avatar"
 msgstr ""
 
-#: lib/settingsnav.php:75
+#: lib/settingsnav.php:94
 msgid "Change your password"
 msgstr ""
 
-#: lib/settingsnav.php:80
+#: lib/settingsnav.php:99
 msgid "Change email handling"
 msgstr ""
 
-#: lib/settingsnav.php:85
+#: lib/settingsnav.php:104
 msgid "Design your profile"
 msgstr ""
 
-#: lib/settingsnav.php:89
+#: lib/settingsnav.php:108
 msgid "URL"
 msgstr ""
 
-#: lib/settingsnav.php:90
+#: lib/settingsnav.php:109
 msgid "URL shorteners"
 msgstr ""
 
-#: lib/settingsnav.php:98
+#: lib/settingsnav.php:117
 msgid "Updates by instant messenger (IM)"
 msgstr ""
 
-#: lib/settingsnav.php:105
+#: lib/settingsnav.php:124
 msgid "Updates by SMS"
 msgstr ""
 
-#: lib/settingsnav.php:110
+#: lib/settingsnav.php:129
 msgid "Connections"
 msgstr ""
 
-#: lib/settingsnav.php:111
+#: lib/settingsnav.php:130
 msgid "Authorized connected applications"
 msgstr ""
 
@@ -9109,7 +9181,7 @@ msgid "None"
 msgstr ""
 
 #. TRANS: Server exception displayed if a theme name was invalid.
-#: lib/theme.php:74
+#: lib/theme.php:77
 msgid "Invalid theme name."
 msgstr ""
 
diff --git a/locale/sv/LC_MESSAGES/statusnet.po b/locale/sv/LC_MESSAGES/statusnet.po
index 54b5404f05..8550a1fdd8 100644
--- a/locale/sv/LC_MESSAGES/statusnet.po
+++ b/locale/sv/LC_MESSAGES/statusnet.po
@@ -13,17 +13,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-08 01:03+0000\n"
-"PO-Revision-Date: 2011-03-08 01:05:31+0000\n"
+"POT-Creation-Date: 2011-03-11 18:15+0000\n"
+"PO-Revision-Date: 2011-03-11 18:17:27+0000\n"
 "Language-Team: Swedish <http://translatewiki.net/wiki/Portal:sv>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
+"X-Generator: MediaWiki 1.18alpha (r83703); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: sv\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-03-06 02:16:47+0000\n"
+"X-POT-Import-Date: 2011-03-08 01:25:01+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -327,9 +327,9 @@ msgid "%s favorites"
 msgstr "%s favoriter"
 
 #. TRANS: Title for Atom feed with a user's memberships. %s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "%s memberships"
-msgstr "%s gruppmedlemmar"
+msgstr "%s medlemskap"
 
 #. TRANS: Client error displayed when users try to block themselves.
 msgid "You cannot block yourself!"
@@ -948,9 +948,9 @@ msgstr "%1$s uppdateringar med svar på uppdatering från %2$s / %3$s."
 msgid "Repeats of %s"
 msgstr "Upprepningar av %s"
 
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s notices that %2$s / %3$s has repeated."
-msgstr "%s (@%s) lade till din notis som en favorit"
+msgstr "%1$s meddelanden som %2$s / %3$s har upprepat."
 
 #. TRANS: Title for timeline with lastest notices with a given tag.
 #. TRANS: %s is the tag.
@@ -967,9 +967,8 @@ msgid "Updates tagged with %1$s on %2$s!"
 msgstr "Uppdateringar taggade med %1$s på %2$s!"
 
 #. TRANS: Client error displayed trying to add a notice to another user's timeline.
-#, fuzzy
 msgid "Only the user can add to their own timeline."
-msgstr "Bara användaren kan läsa sina egna brevlådor."
+msgstr "Bara användaren kan lägga till sin egen tidslinje."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
 msgid "Only accept AtomPub for Atom feeds."
@@ -1047,7 +1046,7 @@ msgstr "Hitta innehåll i notiser"
 
 #. TRANS: Client exception thrown when trying favorite a notice without content.
 #, fuzzy
-msgid "Unknown note."
+msgid "Unknown notice."
 msgstr "Okänd"
 
 #. TRANS: Client exception thrown when trying favorite an already favorited notice.
@@ -1079,28 +1078,24 @@ msgid "Can only handle join activities."
 msgstr "Hitta innehåll i notiser"
 
 #. TRANS: Client exception thrown when trying to subscribe to a non-existing group.
-#, fuzzy
 msgid "Unknown group."
-msgstr "Okänd"
+msgstr "Okänd grupp."
 
 #. TRANS: Client exception thrown when trying to subscribe to an already subscribed group.
-#, fuzzy
 msgid "Already a member."
-msgstr "Alla medlemmar"
+msgstr "Redan medlem."
 
 #. TRANS: Client exception thrown when trying to subscribe to group while blocked from that group.
 msgid "Blocked by admin."
-msgstr ""
+msgstr "Blockerad av admin."
 
 #. TRANS: Client exception thrown when referencing a non-existing favorite.
-#, fuzzy
 msgid "No such favorite."
-msgstr "Ingen sådan fil."
+msgstr "Ingen sådan favorit."
 
 #. TRANS: Client exception thrown when trying to remove a favorite notice of another user.
-#, fuzzy
 msgid "Cannot delete someone else's favorite."
-msgstr "Kunde inte ta bort favoriten."
+msgstr "Kan inte ta bort någon annans favoriter."
 
 #. TRANS: Client exception thrown when referencing a non-existing group.
 #. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
@@ -1133,20 +1128,18 @@ msgid "No such group."
 msgstr "Ingen sådan grupp."
 
 #. TRANS: Client exception thrown when trying to show membership of a non-subscribed group
-#, fuzzy
 msgid "Not a member."
-msgstr "Alla medlemmar"
+msgstr "Inte medlem."
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
-#, fuzzy
 msgid "Cannot delete someone else's membership."
-msgstr "Kunde inte spara prenumeration."
+msgstr "Kan inte ta bort någon annans medlemskap."
 
 #. TRANS: Client exception thrown when trying to display a subscription for a non-existing profile ID.
 #. TRANS: %d is the non-existing profile ID number.
-#, fuzzy, php-format
+#, php-format
 msgid "No such profile id: %d."
-msgstr "Ingen sådan profil."
+msgstr "Inget sådant profil-ID: %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.
@@ -1481,24 +1474,22 @@ msgstr "Du kan inte ta bort användare."
 
 #. TRANS: Confirmation text for user deletion. The user has to type this exactly the same, including punctuation.
 msgid "I am sure."
-msgstr ""
+msgstr "Jag är säker."
 
 #. TRANS: Notification for user about the text that must be input to be able to delete a user account.
 #. TRANS: %s is the text that needs to be input.
 #, php-format
 msgid "You must write \"%s\" exactly in the box."
-msgstr ""
+msgstr "Du måste skriva precis \"%s\" i rutan."
 
 #. TRANS: Confirmation that a user account has been deleted.
-#, fuzzy
 msgid "Account deleted."
-msgstr "Avatar borttagen."
+msgstr "Konto borttaget."
 
 #. TRANS: Page title for page on which a user account can be deleted.
 #. TRANS: Option in profile settings to delete the account of the currently logged in user.
-#, fuzzy
 msgid "Delete account"
-msgstr "Skapa ett konto"
+msgstr "Ta bort konto"
 
 #. TRANS: Form text for user deletion form.
 msgid ""
@@ -1633,6 +1624,7 @@ msgstr "Ta bort denna grupp"
 #. TRANS: Client error displayed trying to create a new direct message while not logged in.
 #. TRANS: Client error displayed trying to send a notice while not logged in.
 #. TRANS: Client error displayed trying to nudge a user without being logged in.
+#. TRANS: Client error displayed when trying to enable or disable a plugin while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
@@ -1796,7 +1788,6 @@ msgid "Tile background image"
 msgstr "Upprepa bakgrundsbild"
 
 #. TRANS: Fieldset legend for theme colors.
-#, fuzzy
 msgid "Change colors"
 msgstr "Byt färger"
 
@@ -3142,6 +3133,10 @@ msgstr "Webbadress till källa krävs."
 msgid "Could not create application."
 msgstr "Kunde inte skapa applikation."
 
+#, fuzzy
+msgid "Invalid image."
+msgstr "Ogiltig storlek."
+
 #. TRANS: Title for form to create a group.
 msgid "New group"
 msgstr "Ny grupp"
@@ -3425,52 +3420,77 @@ msgstr "Utkorg för %s"
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr "Detta är din utkorg som innehåller privata meddelanden du har skickat."
 
+#. TRANS: Title for page where to change password.
+#, fuzzy
+msgctxt "TITLE"
 msgid "Change password"
 msgstr "Byt lösenord"
 
+#. TRANS: Instructions for page where to change password.
 msgid "Change your password."
 msgstr "Byt ditt lösenord."
 
+#. TRANS: Fieldset legend on page where to change password.
 #. TRANS: Fieldset legend for password reset form.
 msgid "Password change"
 msgstr "Byte av lösenord"
 
+#. TRANS: Field label on page where to change password.
 msgid "Old password"
 msgstr "Gammalt lösenord"
 
+#. TRANS: Field label on page where to change password.
 #. TRANS: Field label for password reset form.
 msgid "New password"
 msgstr "Nytt lösenord"
 
+#. TRANS: Field title on page where to change password.
 #, fuzzy
 msgid "6 or more characters."
 msgstr "Minst 6 tecken"
 
+#. TRANS: Field label on page where to change password. In this field the new password should be typed a second time.
+#, fuzzy
+msgctxt "LABEL"
+msgid "Confirm"
+msgstr "Bekräfta"
+
+#. TRANS: Field title on page where to change password.
 #. TRANS: Ttile for field label for password reset form where the password has to be typed again.
 #, fuzzy
 msgid "Same as password above."
 msgstr "Samma som lösenordet ovan"
 
+#. TRANS: Button text on page where to change password.
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Change"
 msgstr "Ändra"
 
+#. TRANS: Form validation error on page where to change password.
 msgid "Password must be 6 or more characters."
 msgstr "Lösenordet måste vara minst 6 tecken."
 
 msgid "Passwords don't match."
 msgstr "Lösenorden matchar inte."
 
-msgid "Incorrect old password"
+#. TRANS: Form validation error on page where to change password.
+#, fuzzy
+msgid "Incorrect old password."
 msgstr "Felaktigt gammalt lösenord"
 
+#. TRANS: Form validation error on page where to change password.
 msgid "Error saving user; invalid."
 msgstr "Fel vid sparande av användare; ogiltig."
 
+#. TRANS: Server error displayed on page where to change password when password change
+#. TRANS: could not be made because of a server error.
 #. TRANS: Reset password form validation error message.
 #, fuzzy
 msgid "Cannot save new password."
 msgstr "Kan inte spara nytt lösenord."
 
+#. TRANS: Form validation notice on page where to change password.
 msgid "Password saved."
 msgstr "Lösenord sparat."
 
@@ -3520,6 +3540,7 @@ msgstr "Webbplats"
 msgid "Server"
 msgstr "Server"
 
+#. TRANS: Field title in Paths admin panel.
 msgid "Site's server hostname."
 msgstr "Värdnamn för webbplatsens server."
 
@@ -3527,6 +3548,7 @@ msgstr "Värdnamn för webbplatsens server."
 msgid "Path"
 msgstr "Sökväg"
 
+#. TRANS: Field title in Paths admin panel.
 msgid "Site path."
 msgstr "Sökväg till webbplats."
 
@@ -3534,6 +3556,7 @@ msgstr "Sökväg till webbplats."
 msgid "Locale directory"
 msgstr "Katalog med lokaliseringsfiler (locales)"
 
+#. TRANS: Field title in Paths admin panel.
 msgid "Directory path to locales."
 msgstr "Katalogsökväg till lokaliseringfiler (locales)."
 
@@ -3541,10 +3564,15 @@ msgstr "Katalogsökväg till lokaliseringfiler (locales)."
 msgid "Fancy URLs"
 msgstr "Utsmyckade URL:er"
 
-msgid "Use fancy (more readable and memorable) URLs?"
+#. TRANS: Field title in Paths admin panel.
+#, fuzzy
+msgid "Use fancy URLs (more readable and memorable)?"
 msgstr ""
 "Skall utsmyckade URL:er användas (mer läsbara och lättare att komma ihåg)?"
 
+#. TRANS: Fieldset legend in Paths admin panel.
+#, fuzzy
+msgctxt "LEGEND"
 msgid "Theme"
 msgstr "Teman"
 
@@ -3667,6 +3695,8 @@ msgid "Directory where attachments are located."
 msgstr "Katalogsökväg till lokaliseringfiler (locales)"
 
 #. TRANS: Fieldset legend in Paths admin panel.
+#, fuzzy
+msgctxt "LEGEND"
 msgid "SSL"
 msgstr "SSL"
 
@@ -3711,10 +3741,14 @@ msgstr ""
 msgid "People search"
 msgstr "Personsökning"
 
+#. TRANS: Client error displayed when trying to tag a profile with an invalid tag.
+#. TRANS: %s is the invalid tag.
 #, php-format
 msgid "Not a valid people tag: %s."
 msgstr "Inte en giltig persontagg: %s."
 
+#. TRANS: Page title for users with a certain self-tag.
+#. TRANS: %1$s is the tag, %2$s is the page number.
 #, php-format
 msgid "Users self-tagged with %1$s - page %2$d"
 msgstr "Användare som taggat sig själv med %1$s - sida %2$d"
@@ -3724,15 +3758,19 @@ msgctxt "plugin"
 msgid "Disabled"
 msgstr ""
 
+#. TRANS: Client error displayed when trying to use another method than POST.
+#. TRANS: Do not translate POST.
 #. TRANS: Client error displayed trying to perform any request method other than POST.
 #. TRANS: Do not translate POST.
 msgid "This action only accepts POST requests."
 msgstr "Denna åtgärd accepterar endast POST-begäran."
 
+#. TRANS: Client error displayed when trying to enable or disable a plugin without access rights.
 #, fuzzy
 msgid "You cannot administer plugins."
 msgstr "Du kan inte ta bort användare."
 
+#. TRANS: Client error displayed when trying to enable or disable a non-existing plugin.
 #, fuzzy
 msgid "No such plugin."
 msgstr "Ingen sådan sida"
@@ -3743,7 +3781,8 @@ msgid "Enabled"
 msgstr ""
 
 #. TRANS: Tab and title for plugins admin panel.
-#. TRANS: Menu item for site administration
+#, fuzzy
+msgctxt "TITLE"
 msgid "Plugins"
 msgstr "Insticksmoduler"
 
@@ -3759,15 +3798,19 @@ msgstr ""
 msgid "Default plugins"
 msgstr "Standardspråk"
 
+#. TRANS: Text displayed on plugin admin page when no plugin are enabled.
 msgid ""
 "All default plugins have been disabled from the site's configuration file."
 msgstr ""
 
+#. TRANS: Client error displayed if the notice posted has too many characters.
 msgid "Invalid notice content."
 msgstr "Ogiltigt notisinnehåll."
 
-#, php-format
-msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’."
+#. TRANS: Exception thrown if a notice's license is not compatible with the StatusNet site license.
+#. TRANS: %1$s is the notice license, %2$s is the StatusNet site's license.
+#, fuzzy, php-format
+msgid "Notice license \"%1$s\" is not compatible with site license \"%2$s\"."
 msgstr "Licensen för notiser ‘%1$s’ är inte förenlig webbplatslicensen ‘%2$s’."
 
 #. TRANS: Page title for profile settings.
@@ -3922,29 +3965,39 @@ msgstr "Inställningar sparade."
 msgid "Restore account"
 msgstr "Skapa ett konto"
 
+#. TRANS: Client error displayed when requesting a public timeline page beyond the page limit.
+#. TRANS: %s is the page limit.
 #, php-format
 msgid "Beyond the page limit (%s)."
 msgstr "Bortom sidbegränsningen (%s)."
 
+#. TRANS: Server error displayed when a public timeline cannot be retrieved.
 msgid "Could not retrieve public stream."
 msgstr "Kunde inte hämta publik ström."
 
+#. TRANS: Title for all public timeline pages but the first.
+#. TRANS: %d is the page number.
 #, php-format
 msgid "Public timeline, page %d"
 msgstr "Publik tidslinje, sida %d"
 
+#. TRANS: Title for the first public timeline page.
 msgid "Public timeline"
 msgstr "Publik tidslinje"
 
+#. TRANS: Link description for public timeline feed.
 msgid "Public Stream Feed (RSS 1.0)"
 msgstr "Publikt flöde av ström (RSS 1.0)"
 
+#. TRANS: Link description for public timeline feed.
 msgid "Public Stream Feed (RSS 2.0)"
 msgstr "Publikt flöde av ström (RSS 2.0)"
 
+#. TRANS: Link description for public timeline feed.
 msgid "Public Stream Feed (Atom)"
 msgstr "Publikt flöde av ström (Atom)"
 
+#. TRANS: Text displayed for public feed when there are no public notices.
 #, php-format
 msgid ""
 "This is the public timeline for %%site.name%% but no one has posted anything "
@@ -3953,9 +4006,11 @@ msgstr ""
 "Detta är den publika tidslinjen för %%site.name%% men ingen har postat något "
 "än."
 
+#. TRANS: Additional text displayed for public feed when there are no public notices for a logged in user.
 msgid "Be the first to post!"
 msgstr "Bli först att posta!"
 
+#. TRANS: Additional text displayed for public feed when there are no public notices for a not logged in user.
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post!"
@@ -3963,6 +4018,8 @@ msgstr ""
 "Varför inte [registrera ett konto](%%action.register%%) och bli först att "
 "posta!"
 
+#. TRANS: Message for not logged in users at an invite-only site trying to view the public feed of notices.
+#. TRANS: This message contains Markdown links. Please mind the formatting.
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -3975,6 +4032,8 @@ msgstr ""
 "net/). [Gå med nu](%%action.register%%) för att dela notiser om dig själv "
 "med vänner, familj och kollegor! ([Läs mer](%%doc.help%%))"
 
+#. TRANS: Message for not logged in users at a closed site trying to view the public feed of notices.
+#. TRANS: This message contains Markdown links. Please mind the formatting.
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -5695,6 +5754,10 @@ msgstr ""
 "Du bör ha fått en kopia av GNU Affero General Public License tillsammans med "
 "detta program. Om inte, se %s."
 
+#. TRANS: Menu item for site administration
+msgid "Plugins"
+msgstr "Insticksmoduler"
+
 #. TRANS: Form input field label for application name.
 msgid "Name"
 msgstr "Namn"
@@ -6196,6 +6259,9 @@ msgstr "saveSetting() är inte implementerat."
 msgid "Unable to delete design setting."
 msgstr "Kunde inte ta bort utseendeinställning."
 
+msgid "Home"
+msgstr "Hemsida"
+
 #. TRANS: Menu item title/tooltip
 msgid "Basic site configuration"
 msgstr "Grundläggande webbplatskonfiguration"
@@ -6823,9 +6889,6 @@ msgstr "Gå till installeraren."
 msgid "Database error"
 msgstr "Databasfel"
 
-msgid "Home"
-msgstr "Hemsida"
-
 msgid "Public"
 msgstr "Publikt"
 
@@ -7628,7 +7691,6 @@ msgstr "Skicka en notis"
 msgid "What's up, %s?"
 msgstr "Vad är på gång, %s?"
 
-#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr "Bifoga"
 
@@ -7697,6 +7759,9 @@ msgstr "Ta bort denna notis"
 msgid "Notice repeated"
 msgstr "Notis upprepad"
 
+msgid "Update your status..."
+msgstr ""
+
 msgid "Nudge this user"
 msgstr "Knuffa denna användare"
 
@@ -8204,11 +8269,3 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
-
-#, fuzzy
-#~ msgid "Friends timeline"
-#~ msgstr "%s tidslinje"
-
-#, fuzzy
-#~ msgid "Everyone on this site"
-#~ msgstr "Hitta personer på denna webbplats"
diff --git a/locale/te/LC_MESSAGES/statusnet.po b/locale/te/LC_MESSAGES/statusnet.po
index a79be5da68..a9718f4c01 100644
--- a/locale/te/LC_MESSAGES/statusnet.po
+++ b/locale/te/LC_MESSAGES/statusnet.po
@@ -10,17 +10,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-08 01:03+0000\n"
-"PO-Revision-Date: 2011-03-08 01:05:32+0000\n"
+"POT-Creation-Date: 2011-03-11 18:15+0000\n"
+"PO-Revision-Date: 2011-03-11 18:17:29+0000\n"
 "Language-Team: Telugu <http://translatewiki.net/wiki/Portal:te>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
+"X-Generator: MediaWiki 1.18alpha (r83703); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: te\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-03-06 02:16:47+0000\n"
+"X-POT-Import-Date: 2011-03-08 01:25:01+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -482,7 +482,7 @@ msgstr "పూర్తి పేరు చాలా పెద్దగా ఉ
 #. TRANS: %d is the maximum number of characters for the description.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed characters.
-#, fuzzy, php-format
+#, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."
 msgstr[0] "వివరణ చాలా పెద్దగా ఉంది (%d అక్షరాలు గరిష్ఠం)."
@@ -493,7 +493,6 @@ msgstr[1] "వివరణ చాలా పెద్దగా ఉంది (%d 
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#, fuzzy
 msgid "Location is too long (maximum 255 characters)."
 msgstr "ప్రాంతం పేరు మరీ పెద్దగా ఉంది (255 అక్షరాలు గరిష్ఠం)."
 
@@ -505,7 +504,7 @@ msgstr "ప్రాంతం పేరు మరీ పెద్దగా ఉ
 #. TRANS: %d is the maximum number of allowed aliases.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.
-#, fuzzy, php-format
+#, php-format
 msgid "Too many aliases! Maximum %d allowed."
 msgid_plural "Too many aliases! Maximum %d allowed."
 msgstr[0] "చాలా మారుపేర్లు! %d గరిష్ఠం."
@@ -1030,25 +1029,24 @@ msgstr "సైటు గమనికని భద్రపరచు"
 
 #. TRANS: Client exception thrown when trying favorite a notice without content.
 #, fuzzy
-msgid "Unknown note."
+msgid "Unknown notice."
 msgstr "తెలియని చర్య"
 
 #. TRANS: Client exception thrown when trying favorite an already favorited notice.
-#, fuzzy
 msgid "Already a favorite."
-msgstr "ఇష్టాంశాలకు చేర్చు"
+msgstr "అది ఇప్పటికే ఇష్టాంశం."
 
 #. TRANS: Title for group membership feed.
 #. TRANS: %s is a username.
-#, fuzzy, php-format
+#, php-format
 msgid "%s group memberships"
-msgstr "%s గుంపు సభ్యులు"
+msgstr "%s గుంపు సభ్యత్వాలు"
 
 #. TRANS: Subtitle for group membership feed.
 #. TRANS: %1$s is a username, %2$s is the StatusNet sitename.
-#, fuzzy, php-format
+#, php-format
 msgid "Groups %1$s is a member of on %2$s"
-msgstr "%s సభ్యులుగా ఉన్న గుంపులు"
+msgstr "%2$sలో %1$s సభ్యులుగా ఉన్న గుంపులు"
 
 #. TRANS: Client exception thrown when trying subscribe someone else to a group.
 #, fuzzy
@@ -1062,9 +1060,8 @@ msgid "Can only handle join activities."
 msgstr "సైటు గమనికని భద్రపరచు"
 
 #. TRANS: Client exception thrown when trying to subscribe to a non-existing group.
-#, fuzzy
 msgid "Unknown group."
-msgstr "తెలియని చర్య"
+msgstr "గుర్తుతెలియని గుంపు."
 
 #. TRANS: Client exception thrown when trying to subscribe to an already subscribed group.
 msgid "Already a member."
@@ -1072,17 +1069,15 @@ msgstr "ఇప్పటికే సభ్యులు."
 
 #. TRANS: Client exception thrown when trying to subscribe to group while blocked from that group.
 msgid "Blocked by admin."
-msgstr ""
+msgstr "నిర్వాహకులు నిరోధించారు."
 
 #. TRANS: Client exception thrown when referencing a non-existing favorite.
-#, fuzzy
 msgid "No such favorite."
-msgstr "అటువంటి ఫైలు లేదు."
+msgstr "అటువంటి ఇష్టాంశం లేదు."
 
 #. TRANS: Client exception thrown when trying to remove a favorite notice of another user.
-#, fuzzy
 msgid "Cannot delete someone else's favorite."
-msgstr "ఇష్టాంశాన్ని తొలగించలేకపోయాం."
+msgstr "మరొకరి ఇష్టాంశాన్ని తొలగించలేరు."
 
 #. TRANS: Client exception thrown when referencing a non-existing group.
 #. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
@@ -1142,9 +1137,9 @@ msgstr "కొత్త చందాని చేర్చలేకపోయా
 
 #. TRANS: Subtitle for Atom subscription feed.
 #. TRANS: %1$s is a user nickname, %s$s is the StatusNet sitename.
-#, fuzzy, php-format
+#, php-format
 msgid "People %1$s has subscribed to on %2$s"
-msgstr "%sకి చందాచేరిన వ్యక్తులు"
+msgstr "%2$sలో %1$s చందాచేరిన వ్యక్తులు"
 
 #. TRANS: Client error displayed when not using the follow verb.
 msgid "Can only handle Follow activities."
@@ -1333,9 +1328,8 @@ msgid "No"
 msgstr "కాదు"
 
 #. TRANS: Submit button title for 'No' when blocking a user.
-#, fuzzy
 msgid "Do not block this user."
-msgstr "ఈ వాడుకరిని నిరోధించకు"
+msgstr "ఈ వాడుకరిని నిరోధించవద్దు."
 
 #. TRANS: Button label on the user block form.
 #. TRANS: Button label on the delete application form.
@@ -1474,9 +1468,8 @@ msgstr "ఖాతాని తొలగించాం."
 
 #. TRANS: Page title for page on which a user account can be deleted.
 #. TRANS: Option in profile settings to delete the account of the currently logged in user.
-#, fuzzy
 msgid "Delete account"
-msgstr "ఖాతాని సృష్టించుకోండి"
+msgstr "ఖాతా తొలగింపు"
 
 #. TRANS: Form text for user deletion form.
 msgid ""
@@ -1539,14 +1532,12 @@ msgstr ""
 "వాడుకరుల అనుసంధానాలతో సహా, డాటాబేసు నుండి తొలగిస్తుంది."
 
 #. TRANS: Submit button title for 'No' when deleting an application.
-#, fuzzy
 msgid "Do not delete this application."
-msgstr "ఈ ఉపకరణాన్ని తొలగించకు"
+msgstr "ఈ ఉపకరణాన్ని తొలగించవద్దు."
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
-#, fuzzy
 msgid "Delete this application."
-msgstr "ఈ ఉపకరణాన్ని తొలగించు"
+msgstr "ఈ ఉపకరణాన్ని తొలగించు."
 
 #. TRANS: Client error when trying to delete group while not logged in.
 msgid "You must be logged in to delete a group."
@@ -1590,14 +1581,12 @@ msgstr ""
 "వెనక్కి తేలేకుండా."
 
 #. TRANS: Submit button title for 'No' when deleting a group.
-#, fuzzy
 msgid "Do not delete this group."
-msgstr "ఈ గుంపును తొలగించకు"
+msgstr "ఈ గుంపును తొలగించవద్దు."
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
-#, fuzzy
 msgid "Delete this group."
-msgstr "ఈ గుంపుని తొలగించు"
+msgstr "ఈ గుంపుని తొలగించు."
 
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
 #. TRANS: Client error displayed when trying to remove a favorite while not logged in.
@@ -1609,6 +1598,7 @@ msgstr "ఈ గుంపుని తొలగించు"
 #. TRANS: Client error displayed trying to create a new direct message while not logged in.
 #. TRANS: Client error displayed trying to send a notice while not logged in.
 #. TRANS: Client error displayed trying to nudge a user without being logged in.
+#. TRANS: Client error displayed when trying to enable or disable a plugin while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
@@ -1632,14 +1622,12 @@ msgid "Are you sure you want to delete this notice?"
 msgstr "మీరు నిజంగానే ఈ నోటీసుని తొలగించాలనుకుంటున్నారా?"
 
 #. TRANS: Submit button title for 'No' when deleting a notice.
-#, fuzzy
 msgid "Do not delete this notice."
-msgstr "ఈ నోటీసుని తొలగించకు"
+msgstr "ఈ నోటీసుని తొలగించవద్దు."
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#, fuzzy
 msgid "Delete this notice."
-msgstr "ఈ నోటీసుని తొలగించు"
+msgstr "ఈ నోటీసుని తొలగించు."
 
 #. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
 msgid "You cannot delete users."
@@ -1650,10 +1638,9 @@ msgid "You can only delete local users."
 msgstr "మీరు స్థానిక వాడుకరులను మాత్రమే తొలగించగలరు."
 
 #. TRANS: Title of delete user page.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Delete user"
-msgstr "వాడుకరిని తొలగించు"
+msgstr "వాడుకరి తొలగింపు"
 
 #. TRANS: Fieldset legend on delete user page.
 msgid "Delete user"
@@ -1722,9 +1709,8 @@ msgid "Theme for the site."
 msgstr "సైటుకి అలంకారం."
 
 #. TRANS: Field label for uploading a cutom theme.
-#, fuzzy
 msgid "Custom theme"
-msgstr "సైటు అలంకారం"
+msgstr "అభిమత అలంకారం"
 
 #. TRANS: Form instructions for uploading a cutom StatusNet theme.
 msgid "You can upload a custom StatusNet theme as a .ZIP archive."
@@ -1831,9 +1817,9 @@ msgstr "ఇష్టాంశాలకు చేర్చు"
 
 #. TRANS: Client exception thrown when requesting a document from the documentation that does not exist.
 #. TRANS: %s is the non-existing document.
-#, fuzzy, php-format
+#, php-format
 msgid "No such document \"%s\"."
-msgstr "అటువంటి జోడింపు లేదు."
+msgstr "\"%s\" అనే పత్రం లేదు."
 
 #. TRANS: Title for "Edit application" form.
 #. TRANS: Form legend.
@@ -1859,7 +1845,6 @@ msgstr "పేరు తప్పనిసరి."
 
 #. 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 "పేరు చాలా పెద్దగా ఉంది (గరిష్ఠంగా 255 అక్షరాలు)."
 
@@ -1889,7 +1874,6 @@ msgid "Organization is required."
 msgstr "సంస్థ తప్పనిసరి."
 
 #. 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 "సంస్థ పేరు మరీ పెద్దగా ఉంది (255 అక్షరాలు గరిష్ఠం)."
 
@@ -2344,9 +2328,8 @@ msgstr ""
 "తొలగిస్తాం, ఇక భవిష్యత్తులో వారు గుంపులో ప్రచురించలేరు, మరియు గుంపుకి చందాచేరలేరు."
 
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
-#, fuzzy
 msgid "Do not block this user from this group."
-msgstr "ఈ వాడుకరిని ఈ గుంపు నుండి నిరోధించకు"
+msgstr "ఈ వాడుకరిని ఈ గుంపు నుండి నిరోధించవద్దు."
 
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
 msgid "Block this user from this group."
@@ -2481,7 +2464,7 @@ msgstr "గుంపులు, పుట %d"
 #. TRANS: Page notice of group list. %%%%site.name%%%% is the StatusNet site name,
 #. TRANS: %%%%action.groupsearch%%%% and %%%%action.newgroup%%%% are URLs. Do not change them.
 #. TRANS: This message contains Markdown links in the form [link text](link).
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "%%%%site.name%%%% groups let you find and talk with people of similar "
 "interests. After you join a group you can send messages to all other members "
@@ -2491,8 +2474,8 @@ msgid ""
 msgstr ""
 "ఒకే రకమైన ఆసక్తులు ఉన్న వ్యక్తులు కలుసుకోడానికి మరియు మాట్లాడుకోడానికి %%%%site.name%%%% "
 "గుంపులు వీలుకల్పిస్తాయి. ఒక గుంపులో చేరిన తర్వాత మీరు \"!groupname\" అన్న సంకేతం ద్వారా ఆ "
-"గుంపు లోని సభ్యులందరికీ సందేశాలని పంపించవచ్చు. మీకు నచ్చిన గుంపు కనబడలేదా? [దాని కోసం వెతకండి](%%"
-"%%action.groupsearch%%%%) లేదా [మీరే కొత్తది సృష్టించండి!](%%%%action.newgroup%%%%)"
+"గుంపు లోని సభ్యులందరికీ సందేశాలను పంపించవచ్చు. మీకు నచ్చిన గుంపు కనబడలేదా? [దాని కోసం వెతకండి](%"
+"%%%action.groupsearch%%%%) లేదా [మీరే కొత్తది సృష్టించండి!](%%%%action.newgroup%%%%)"
 
 #. TRANS: Link to create a new group on the group list page.
 msgid "Create a new group"
@@ -2940,9 +2923,8 @@ msgid "Type"
 msgstr "రకం"
 
 #. TRANS: Dropdown field instructions in the license admin panel.
-#, fuzzy
 msgid "Select a license."
-msgstr "లైసెన్సును ఎంచుకోండి"
+msgstr "లైసెన్సును ఎంచుకోండి."
 
 #. TRANS: Form legend in the license admin panel.
 msgid "License details"
@@ -3016,7 +2998,6 @@ msgid "Automatically login in the future; not for shared computers!"
 msgstr "భవిష్యత్తులో ఆటోమెటిగ్గా లోనికి ప్రవేశించు; బయటి కంప్యూర్ల కొరకు కాదు!"
 
 #. TRANS: Button text for log in on login page.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Login"
 msgstr "ప్రవేశించండి"
@@ -3092,14 +3073,17 @@ msgstr "పేరు తప్పనిసరి."
 msgid "Could not create application."
 msgstr "ఉపకరణాన్ని సృష్టించలేకపోయాం."
 
+#, fuzzy
+msgid "Invalid image."
+msgstr "తప్పుడు పరిమాణం."
+
 #. TRANS: Title for form to create a group.
 msgid "New group"
 msgstr "కొత్త గుంపు"
 
 #. TRANS: Client exception thrown when a user tries to create a group while banned.
-#, fuzzy
 msgid "You are not allowed to create groups on this site."
-msgstr "ఈ గుంపును తొలగించడానికి మీకు అనుమతి లేదు."
+msgstr "ఈ సైటులో గుంపులను సృష్టించడానికి మీకు అనుమతి లేదు."
 
 #. TRANS: Form instructions for group create form.
 msgid "Use this form to create a new group."
@@ -3374,51 +3358,74 @@ msgstr "%sకి వచ్చినవి"
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr "ఇవి మీరు పంపివున్న అంతరంగిక సందేశాలు."
 
+#. TRANS: Title for page where to change password.
+#, fuzzy
+msgctxt "TITLE"
 msgid "Change password"
 msgstr "సంకేతపదం మార్చుకోండి"
 
+#. TRANS: Instructions for page where to change password.
 msgid "Change your password."
 msgstr "మీ సంకేతపదం మార్చుకోండి."
 
+#. TRANS: Fieldset legend on page where to change password.
 #. TRANS: Fieldset legend for password reset form.
 msgid "Password change"
 msgstr "సంకేతపదం మార్పు"
 
+#. TRANS: Field label on page where to change password.
 msgid "Old password"
 msgstr "పాత సంకేతపదం"
 
+#. TRANS: Field label on page where to change password.
 #. TRANS: Field label for password reset form.
 msgid "New password"
 msgstr "కొత్త సంకేతపదం"
 
+#. TRANS: Field title on page where to change password.
 msgid "6 or more characters."
 msgstr "6 లేదా అంతకంటే ఎక్కువ అక్షరాలు."
 
-#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#. TRANS: Field label on page where to change password. In this field the new password should be typed a second time.
 #, fuzzy
-msgid "Same as password above."
-msgstr "పై సంకేతపదం వలెనే"
+msgctxt "LABEL"
+msgid "Confirm"
+msgstr "నిర్థారించు"
 
+#. TRANS: Field title on page where to change password.
+#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+msgid "Same as password above."
+msgstr "పై సంకేతపదం వలెనే."
+
+#. TRANS: Button text on page where to change password.
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Change"
 msgstr "మార్చు"
 
+#. TRANS: Form validation error on page where to change password.
 msgid "Password must be 6 or more characters."
 msgstr "సంకేతపదం తప్పనిసరిగా 6 లేదా అంతకంటే ఎక్కువ అక్షరాలుండాలి."
 
 msgid "Passwords don't match."
 msgstr "సంకేతపదాలు సరిపోలలేదు."
 
-msgid "Incorrect old password"
+#. TRANS: Form validation error on page where to change password.
+#, fuzzy
+msgid "Incorrect old password."
 msgstr "పాత సంకేతపదం తప్పు"
 
+#. TRANS: Form validation error on page where to change password.
 msgid "Error saving user; invalid."
 msgstr "వాడుకరిని భద్రపరచడంలో పొరపాటు: సరికాదు."
 
+#. TRANS: Server error displayed on page where to change password when password change
+#. TRANS: could not be made because of a server error.
 #. TRANS: Reset password form validation error message.
-#, fuzzy
 msgid "Cannot save new password."
-msgstr "కొత్త సంకేతపదాన్ని భద్రపరచలేము."
+msgstr "కొత్త సంకేతపదాన్ని భద్రపరచలేకున్నాం."
 
+#. TRANS: Form validation notice on page where to change password.
 msgid "Password saved."
 msgstr "సంకేతపదం భద్రమయ్యింది."
 
@@ -3469,6 +3476,7 @@ msgstr "సైటు"
 msgid "Server"
 msgstr "సేవకి"
 
+#. TRANS: Field title in Paths admin panel.
 msgid "Site's server hostname."
 msgstr ""
 
@@ -3476,6 +3484,7 @@ msgstr ""
 msgid "Path"
 msgstr "త్రోవ"
 
+#. TRANS: Field title in Paths admin panel.
 #, fuzzy
 msgid "Site path."
 msgstr "సైటు అలంకారం"
@@ -3485,6 +3494,7 @@ msgstr "సైటు అలంకారం"
 msgid "Locale directory"
 msgstr "అలంకార సంచయం"
 
+#. TRANS: Field title in Paths admin panel.
 msgid "Directory path to locales."
 msgstr ""
 
@@ -3492,9 +3502,13 @@ msgstr ""
 msgid "Fancy URLs"
 msgstr ""
 
-msgid "Use fancy (more readable and memorable) URLs?"
+#. TRANS: Field title in Paths admin panel.
+msgid "Use fancy URLs (more readable and memorable)?"
 msgstr ""
 
+#. TRANS: Fieldset legend in Paths admin panel.
+#, fuzzy
+msgctxt "LEGEND"
 msgid "Theme"
 msgstr "అలంకారం"
 
@@ -3618,6 +3632,7 @@ msgstr ""
 
 #. TRANS: Fieldset legend in Paths admin panel.
 #, fuzzy
+msgctxt "LEGEND"
 msgid "SSL"
 msgstr "SSLని ఉపయోగించు"
 
@@ -3664,10 +3679,14 @@ msgstr ""
 msgid "People search"
 msgstr "వ్యక్తుల అన్వేషణ"
 
+#. TRANS: Client error displayed when trying to tag a profile with an invalid tag.
+#. TRANS: %s is the invalid tag.
 #, fuzzy, php-format
 msgid "Not a valid people tag: %s."
 msgstr "సరైన ఈమెయిల్ చిరునామా కాదు:"
 
+#. TRANS: Page title for users with a certain self-tag.
+#. TRANS: %1$s is the tag, %2$s is the page number.
 #, php-format
 msgid "Users self-tagged with %1$s - page %2$d"
 msgstr "%2$sలో %1$s అనే ట్యాగుతో ఉన్న నోటీసులు!"
@@ -3677,15 +3696,19 @@ msgctxt "plugin"
 msgid "Disabled"
 msgstr ""
 
+#. TRANS: Client error displayed when trying to use another method than POST.
+#. TRANS: Do not translate POST.
 #. TRANS: Client error displayed trying to perform any request method other than POST.
 #. TRANS: Do not translate POST.
 msgid "This action only accepts POST requests."
 msgstr ""
 
+#. TRANS: Client error displayed when trying to enable or disable a plugin without access rights.
 #, fuzzy
 msgid "You cannot administer plugins."
 msgstr "మీరు వాడుకరులని తొలగించలేరు."
 
+#. TRANS: Client error displayed when trying to enable or disable a non-existing plugin.
 #, fuzzy
 msgid "No such plugin."
 msgstr "అటువంటి పేజీ లేదు."
@@ -3696,7 +3719,8 @@ msgid "Enabled"
 msgstr ""
 
 #. TRANS: Tab and title for plugins admin panel.
-#. TRANS: Menu item for site administration
+#, fuzzy
+msgctxt "TITLE"
 msgid "Plugins"
 msgstr "ప్లగిన్లు"
 
@@ -3712,15 +3736,19 @@ msgstr ""
 msgid "Default plugins"
 msgstr "అప్రమేయ భాష"
 
+#. TRANS: Text displayed on plugin admin page when no plugin are enabled.
 msgid ""
 "All default plugins have been disabled from the site's configuration file."
 msgstr ""
 
+#. TRANS: Client error displayed if the notice posted has too many characters.
 msgid "Invalid notice content."
 msgstr "తప్పుడు దస్త్రపుపేరు.."
 
+#. TRANS: Exception thrown if a notice's license is not compatible with the StatusNet site license.
+#. TRANS: %1$s is the notice license, %2$s is the StatusNet site's license.
 #, php-format
-msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’."
+msgid "Notice license \"%1$s\" is not compatible with site license \"%2$s\"."
 msgstr ""
 
 #. TRANS: Page title for profile settings.
@@ -3839,9 +3867,9 @@ msgstr "భాష మరీ పెద్దగా ఉంది (50 అక్ష
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
-#, fuzzy, php-format
+#, php-format
 msgid "Invalid tag: \"%s\"."
-msgstr "తప్పుడు మారుపేరు: \"%s\""
+msgstr "చెల్లని ట్యాగు: \"%s\""
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
 #. TRANS: automatically subscribe to any subscriber.
@@ -3869,58 +3897,72 @@ msgstr "అమరికలు భద్రమయ్యాయి."
 msgid "Restore account"
 msgstr "ఖాతాని సృష్టించుకోండి"
 
+#. TRANS: Client error displayed when requesting a public timeline page beyond the page limit.
+#. TRANS: %s is the page limit.
 #, php-format
 msgid "Beyond the page limit (%s)."
 msgstr ""
 
+#. TRANS: Server error displayed when a public timeline cannot be retrieved.
 #, fuzzy
 msgid "Could not retrieve public stream."
 msgstr "మారుపేర్లని సృష్టించలేకపోయాం."
 
+#. TRANS: Title for all public timeline pages but the first.
+#. TRANS: %d is the page number.
 #, php-format
 msgid "Public timeline, page %d"
 msgstr "ప్రజా కాలరేఖ, పేజీ %d"
 
+#. TRANS: Title for the first public timeline page.
 msgid "Public timeline"
 msgstr "ప్రజా కాలరేఖ"
 
+#. TRANS: Link description for public timeline feed.
 msgid "Public Stream Feed (RSS 1.0)"
 msgstr "ప్రజా వాహిని ఫీడు (RSS 1.0)"
 
+#. TRANS: Link description for public timeline feed.
 msgid "Public Stream Feed (RSS 2.0)"
 msgstr "ప్రజా వాహిని ఫీడు (RSS 2.0)"
 
+#. TRANS: Link description for public timeline feed.
 msgid "Public Stream Feed (Atom)"
 msgstr "ప్రజా వాహిని ఫీడు (ఆటమ్)"
 
+#. TRANS: Text displayed for public feed when there are no public notices.
 #, fuzzy, php-format
 msgid ""
 "This is the public timeline for %%site.name%% but no one has posted anything "
 "yet."
 msgstr "ఇది %s మరియు మిత్రుల కాలరేఖ కానీ ఇంకా ఎవరూ ఏమీ రాయలేదు."
 
+#. TRANS: Additional text displayed for public feed when there are no public notices for a logged in user.
 msgid "Be the first to post!"
 msgstr ""
 
+#. TRANS: Additional text displayed for public feed when there are no public notices for a not logged in user.
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post!"
 msgstr "[ఖాతా నమోదు చేసుకుని](%%action.register%%) మొదటగా వ్రాసేది మీరే ఎందుకు కాకూడదు!"
 
-#, fuzzy, php-format
+#. TRANS: Message for not logged in users at an invite-only site trying to view the public feed of notices.
+#. TRANS: This message contains Markdown links. Please mind the formatting.
+#, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
 "blogging) service based on the Free Software [StatusNet](http://status.net/) "
 "tool. [Join now](%%action.register%%) to share notices about yourself with "
 "friends, family, and colleagues! ([Read more](%%doc.help%%))"
 msgstr ""
-"**%s** అనేది [స్టేటస్‌నెట్](http://status.net/) అనే స్వేచ్ఛా ఉపకరణ అధారిత [సూక్ష్మ-బ్లాగింగు]"
-"(http://en.wikipedia.org/wiki/Micro-blogging) సేవ అయిన %%%%site.name%%%%లో ఒక "
-"వాడుకరి గుంపు.\n"
-"దీని సభ్యులు వారి జీవితం మరియు ఆసక్తుల గురించి చిన్న సందేశాలని పంచుకుంటారు. ఈ గుంపు మరియు ఇంకా "
-"చాల వాటిలో భాగస్తులవ్వడానికి [ఇప్పుడే చేరండి](%%%%action.register%%%%)! ([మరింత చదవండి](%%%%"
-"doc.help%%%%))"
+"ఇది %%site.name%%, [స్టేటస్‌నెట్](http://status.net/) అనే స్వేచ్ఛా ఉపకరణ అధారిత [సూక్ష్మ-"
+"బ్లాగింగు](http://en.wikipedia.org/wiki/Micro-blogging) సేవ. మీ సంగతులను మీ "
+"మిత్రులతో, కుటుంబంతో మరియు సహోద్యోగులతో పంచుకోడానికి [ఇప్పుడే చేరండి](%%action.register%%)! "
+"([మరింత తెలుసుకోండి](%%doc.help%%))"
 
+#. TRANS: Message for not logged in users at a closed site trying to view the public feed of notices.
+#. TRANS: This message contains Markdown links. Please mind the formatting.
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -3931,9 +3973,9 @@ msgstr ""
 "ఆధారపడిన ఒక [మైక్రో-బ్లాగింగు](http://en.wikipedia.org/wiki/Micro-blogging) సేవ."
 
 #. TRANS: Public RSS feed description. %s is the StatusNet site name.
-#, fuzzy, php-format
+#, php-format
 msgid "%s updates from everyone."
-msgstr "అందరి నుండి %s తాజాకరణలు!"
+msgstr "అందరి నుండి %s తాజాకరణలు."
 
 #. TRANS: Title for public tag cloud.
 msgid "Public tag cloud"
@@ -4115,9 +4157,9 @@ msgstr "మీ కొత్త సంకేతపదం భద్రమైంద
 msgid "No id parameter"
 msgstr "జోడింపులు లేవు."
 
-#, fuzzy, php-format
+#, php-format
 msgid "No such file \"%d\""
-msgstr "అటువంటి ఫైలు లేదు."
+msgstr "\"%d\" అనే దస్త్రం లేదు"
 
 msgid "Sorry, only invited people can register."
 msgstr "క్షమించండి, ఆహ్వానితులు మాత్రమే నమోదుకాగలరు."
@@ -4160,9 +4202,8 @@ msgstr "తాజా విశేషాలు, ప్రకటనలు, మర
 msgid "Longer name, preferably your \"real\" name."
 msgstr "పొడుగాటి పేరు, మీ \"అసలు\" పేరైతే మంచిది"
 
-#, fuzzy
 msgid "Where you are, like \"City, State (or Region), Country\"."
-msgstr "మీరు ఎక్కడ నుండి, \"నగరం, రాష్ట్రం (లేదా ప్రాంతం), దేశం\""
+msgstr "మీరు ఎక్కడివారు, \"నగరం, రాష్ట్రం (లేదా ప్రాంతం), దేశం\"."
 
 #, php-format
 msgid ""
@@ -4260,9 +4301,8 @@ msgstr ""
 msgid "Subscribe"
 msgstr "చందాచేరు"
 
-#, fuzzy
 msgid "Invalid profile URL (bad format)."
-msgstr "ప్రొపైల్ URL తప్పు (చెడు ఫార్మాట్)"
+msgstr "ప్రొపైల్ URL తప్పు (చెల్లని ఫార్మాట్)."
 
 msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
 msgstr ""
@@ -4288,9 +4328,8 @@ msgstr "మీ నోటీసుని మీరే పునరావృతి
 msgid "You already repeated that notice."
 msgstr "మీరు ఇప్పటికే ఆ నోటీసుని పునరావృతించారు."
 
-#, fuzzy
 msgid "Repeated"
-msgstr "సృష్టితం"
+msgstr "పునరావృతం"
 
 msgid "Repeated!"
 msgstr "పునరావృతించారు!"
@@ -4413,9 +4452,8 @@ msgid ""
 msgstr ""
 
 #. TRANS: Title for submit button to confirm upload of a user backup file for account restore.
-#, fuzzy
 msgid "Upload the file"
-msgstr "ఫైలుని ఎక్కించు"
+msgstr "ఈ దస్త్రాన్ని ఎక్కించండి"
 
 msgid "You cannot revoke user roles on this site."
 msgstr "ఈ సైటులో మీరు వాడుకరలకి పాత్రలను ఇవ్వలేరు."
@@ -5265,9 +5303,8 @@ msgid ""
 "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
 msgstr ""
 
-#, fuzzy
 msgid "URL settings"
-msgstr "IM అమరికలు"
+msgstr "URL అమరికలు"
 
 #. TRANS: Instructions for tab "Other" in user profile settings.
 msgid "Manage various other options."
@@ -5391,9 +5428,8 @@ msgid "Whether to allow users to invite new users."
 msgstr "వాడుకరులను కొత్త వారిని ఆహ్వానించడానికి అనుమతించాలా వద్దా."
 
 #. TRANS: Title for button to save user settings in user admin panel.
-#, fuzzy
 msgid "Save user settings."
-msgstr "వాడుకరి అమరికలను భద్రపరచు"
+msgstr "వాడుకరి అమరికలను భద్రపరచు."
 
 #. TRANS: Page title.
 msgid "Authorize subscription"
@@ -5512,9 +5548,8 @@ msgstr "నేపథ్య చిత్రం మరియు రంగుల 
 msgid "Enjoy your hotdog!"
 msgstr ""
 
-#, fuzzy
 msgid "Design settings"
-msgstr "సైటు అమరికలను భద్రపరచు"
+msgstr "రూపురేఖల అమరికలు"
 
 msgid "View profile designs"
 msgstr "ఫ్రొఫైలు రూపురేఖలు"
@@ -5590,6 +5625,10 @@ msgid ""
 "along with this program.  If not, see %s."
 msgstr ""
 
+#. TRANS: Menu item for site administration
+msgid "Plugins"
+msgstr "ప్లగిన్లు"
+
 #. TRANS: Form input field label for application name.
 msgid "Name"
 msgstr "పేరు"
@@ -5909,18 +5948,16 @@ msgid "Show more"
 msgstr "మరింత చూపించు"
 
 #. TRANS: Inline reply form submit button: submits a reply comment.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Reply"
 msgstr "స్పందించండి"
 
 #. TRANS: Placeholder text for inline reply form. Clicking in this box will turn it into a mini notice form.
 msgid "Write a reply..."
-msgstr ""
+msgstr "మీ స్పందనని వ్రాయండి..."
 
-#, fuzzy
 msgid "Status"
-msgstr "స్టేటస్‌నెట్"
+msgstr "స్థితి"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #. TRANS: Text between [] is a link description, text between () is the link itself.
@@ -6086,6 +6123,9 @@ msgstr ""
 msgid "Unable to delete design setting."
 msgstr "మీ రూపురేఖల అమరికలని భద్రపరచలేకున్నాం."
 
+msgid "Home"
+msgstr "ముంగిలి"
+
 #. TRANS: Menu item title/tooltip
 msgid "Basic site configuration"
 msgstr "ప్రాథమిక సైటు స్వరూపణం"
@@ -6321,14 +6361,12 @@ msgid "Notices where this attachment appears"
 msgstr ""
 
 #. TRANS: Title.
-#, fuzzy
 msgid "Tags for this attachment"
-msgstr "అటువంటి జోడింపు లేదు."
+msgstr "ఈ జోడింపుకి ట్యాగులు"
 
 #. TRANS: Exception thrown when a password change fails.
-#, fuzzy
 msgid "Password changing failed."
-msgstr "సంకేతపదం మార్పు విఫలమైంది"
+msgstr "సంకేతపదపు మార్పు విఫలమైంది."
 
 #. TRANS: Exception thrown when a password change attempt fails because it is not allowed.
 msgid "Password changing is not allowed."
@@ -6685,9 +6723,6 @@ msgstr "సైటు లోనికి ప్రవేశించండి"
 msgid "Database error"
 msgstr ""
 
-msgid "Home"
-msgstr "ముంగిలి"
-
 msgid "Public"
 msgstr "ప్రజా"
 
@@ -6810,9 +6845,8 @@ msgstr "అన్నీ"
 msgid "Select tag to filter"
 msgstr ""
 
-#, fuzzy
 msgid "Tag"
-msgstr "ట్యాగులు"
+msgstr "ట్యాగు"
 
 msgid "Choose a tag to narrow list"
 msgstr ""
@@ -7476,7 +7510,6 @@ msgstr "సైటు గమనిక"
 msgid "What's up, %s?"
 msgstr "%s, ఏమిటి సంగతులు?"
 
-#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr "జోడించు"
 
@@ -7545,6 +7578,9 @@ msgstr "ఈ నోటీసుని తొలగించు"
 msgid "Notice repeated"
 msgstr "నోటీసుని పునరావృతించారు"
 
+msgid "Update your status..."
+msgstr ""
+
 #, fuzzy
 msgid "Nudge this user"
 msgstr "ఈ వాడుకరిని తొలగించు"
@@ -7613,9 +7649,8 @@ msgstr "SMS అమరికలు"
 msgid "Change your personal settings"
 msgstr "ఫ్రొఫైలు అమరికలని మార్చు"
 
-#, fuzzy
 msgid "Site configuration"
-msgstr "వాడుకరి స్వరూపణం"
+msgstr "సైటు స్వరూపణం"
 
 msgid "Logout"
 msgstr "నిష్క్రమించు"
@@ -7854,9 +7889,8 @@ msgid "None"
 msgstr "ఏమీలేదు"
 
 #. TRANS: Server exception displayed if a theme name was invalid.
-#, fuzzy
 msgid "Invalid theme name."
-msgstr "తప్పుడు దస్త్రపుపేరు.."
+msgstr "చెల్లని అలంకారపు పేరు."
 
 msgid "This server cannot handle theme uploads without ZIP support."
 msgstr ""
@@ -7864,9 +7898,8 @@ msgstr ""
 msgid "The theme file is missing or the upload failed."
 msgstr ""
 
-#, fuzzy
 msgid "Failed saving theme."
-msgstr "అవతారపు తాజాకరణ విఫలమైంది."
+msgstr "అలంకారాన్ని భద్రపరచడం విఫలమైంది."
 
 msgid "Invalid theme: bad directory structure."
 msgstr ""
@@ -7981,9 +8014,8 @@ msgctxt "role"
 msgid "Moderator"
 msgstr "సమన్వయకర్త"
 
-#, fuzzy
 msgid "Not allowed to log in."
-msgstr "లోనికి ప్రవేశించలేదు."
+msgstr "ప్రవేశించడానికి అనుమతి లేదు."
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 msgid "a few seconds ago"
@@ -8039,14 +8071,13 @@ msgstr "ఒక సంవత్సరం క్రితం"
 
 #. TRANS: Web color exception thrown when a hexadecimal color code does not validate.
 #. TRANS: %s is the provided (invalid) color code.
-#, fuzzy, php-format
+#, php-format
 msgid "%s is not a valid color! Use 3 or 6 hex characters."
 msgstr "%s అనేది సరైన రంగు కాదు! 3 లేదా 6 హెక్స్ అక్షరాలను వాడండి."
 
 #. TRANS: Exception.
-#, fuzzy
 msgid "Invalid XML."
-msgstr "తప్పుడు పరిమాణం."
+msgstr "చెల్లని XML."
 
 #. TRANS: Exception.
 msgid "Invalid XML, missing XRD root."
@@ -8056,11 +8087,3 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
-
-#, fuzzy
-#~ msgid "Friends timeline"
-#~ msgstr "%s కాలరేఖ"
-
-#, fuzzy
-#~ msgid "Everyone on this site"
-#~ msgstr "ఈ సైటులోని వ్యక్తులని కనుగొనండి"
diff --git a/locale/tr/LC_MESSAGES/statusnet.po b/locale/tr/LC_MESSAGES/statusnet.po
index a0278b8b99..89e5b94c84 100644
--- a/locale/tr/LC_MESSAGES/statusnet.po
+++ b/locale/tr/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-03-08 01:03+0000\n"
-"PO-Revision-Date: 2011-03-08 01:05:33+0000\n"
+"POT-Creation-Date: 2011-03-11 18:15+0000\n"
+"PO-Revision-Date: 2011-03-11 18:17:30+0000\n"
 "Language-Team: Turkish <http://translatewiki.net/wiki/Portal:tr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
+"X-Generator: MediaWiki 1.18alpha (r83703); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tr\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-POT-Import-Date: 2011-03-06 02:16:47+0000\n"
+"X-POT-Import-Date: 2011-03-08 01:25:01+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -1045,7 +1045,7 @@ msgstr "Durum mesajını kaydederken hata oluştu."
 
 #. TRANS: Client exception thrown when trying favorite a notice without content.
 #, fuzzy
-msgid "Unknown note."
+msgid "Unknown notice."
 msgstr "Böyle bir durum mesajı yok."
 
 #. TRANS: Client exception thrown when trying favorite an already favorited notice.
@@ -1637,6 +1637,7 @@ msgstr "Bu kullanıcıyı sil"
 #. TRANS: Client error displayed trying to create a new direct message while not logged in.
 #. TRANS: Client error displayed trying to send a notice while not logged in.
 #. TRANS: Client error displayed trying to nudge a user without being logged in.
+#. TRANS: Client error displayed when trying to enable or disable a plugin while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
@@ -3115,6 +3116,10 @@ msgstr ""
 msgid "Could not create application."
 msgstr "Eposta onayı silinemedi."
 
+#, fuzzy
+msgid "Invalid image."
+msgstr "Geçersiz büyüklük."
+
 #. TRANS: Title for form to create a group.
 msgid "New group"
 msgstr "Yeni grup"
@@ -3393,52 +3398,77 @@ msgstr ""
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr ""
 
+#. TRANS: Title for page where to change password.
+#, fuzzy
+msgctxt "TITLE"
 msgid "Change password"
 msgstr "Parolayı değiştir"
 
+#. TRANS: Instructions for page where to change password.
 msgid "Change your password."
 msgstr "Parolanızı değiştirin."
 
+#. TRANS: Fieldset legend on page where to change password.
 #. TRANS: Fieldset legend for password reset form.
 msgid "Password change"
 msgstr "Parola değiştirildi"
 
+#. TRANS: Field label on page where to change password.
 msgid "Old password"
 msgstr "Eski parola"
 
+#. TRANS: Field label on page where to change password.
 #. TRANS: Field label for password reset form.
 msgid "New password"
 msgstr "Yeni parola"
 
+#. TRANS: Field title on page where to change password.
 #, fuzzy
 msgid "6 or more characters."
 msgstr "6 veya daha fazla karakter"
 
+#. TRANS: Field label on page where to change password. In this field the new password should be typed a second time.
+#, fuzzy
+msgctxt "LABEL"
+msgid "Confirm"
+msgstr "Onayla"
+
+#. TRANS: Field title on page where to change password.
 #. TRANS: Ttile for field label for password reset form where the password has to be typed again.
 #, fuzzy
 msgid "Same as password above."
 msgstr "yukarıdaki parolanın aynısı"
 
+#. TRANS: Button text on page where to change password.
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Change"
 msgstr "Değiştir"
 
+#. TRANS: Form validation error on page where to change password.
 msgid "Password must be 6 or more characters."
 msgstr "Parola 6 veya daha fazla karakterden oluşmalıdır."
 
 msgid "Passwords don't match."
 msgstr "Parolalar birbirini tutmuyor."
 
-msgid "Incorrect old password"
+#. TRANS: Form validation error on page where to change password.
+#, fuzzy
+msgid "Incorrect old password."
 msgstr "Eski parola yanlış"
 
+#. TRANS: Form validation error on page where to change password.
 msgid "Error saving user; invalid."
 msgstr "Kullanıcıyı kaydetmede hata oluştu; geçersiz."
 
+#. TRANS: Server error displayed on page where to change password when password change
+#. TRANS: could not be made because of a server error.
 #. TRANS: Reset password form validation error message.
 #, fuzzy
 msgid "Cannot save new password."
 msgstr "Yeni parola kaydedilemedi."
 
+#. TRANS: Form validation notice on page where to change password.
 msgid "Password saved."
 msgstr "Parola kaydedildi."
 
@@ -3488,6 +3518,7 @@ msgstr "Site"
 msgid "Server"
 msgstr "Sunucu"
 
+#. TRANS: Field title in Paths admin panel.
 msgid "Site's server hostname."
 msgstr ""
 
@@ -3495,6 +3526,7 @@ msgstr ""
 msgid "Path"
 msgstr "Yol"
 
+#. TRANS: Field title in Paths admin panel.
 #, fuzzy
 msgid "Site path."
 msgstr "Site yolu"
@@ -3504,6 +3536,7 @@ msgstr "Site yolu"
 msgid "Locale directory"
 msgstr "Avatar güncellendi."
 
+#. TRANS: Field title in Paths admin panel.
 msgid "Directory path to locales."
 msgstr ""
 
@@ -3511,9 +3544,12 @@ msgstr ""
 msgid "Fancy URLs"
 msgstr ""
 
-msgid "Use fancy (more readable and memorable) URLs?"
+#. TRANS: Field title in Paths admin panel.
+msgid "Use fancy URLs (more readable and memorable)?"
 msgstr ""
 
+#. TRANS: Fieldset legend in Paths admin panel.
+msgctxt "LEGEND"
 msgid "Theme"
 msgstr ""
 
@@ -3638,6 +3674,7 @@ msgid "Directory where attachments are located."
 msgstr ""
 
 #. TRANS: Fieldset legend in Paths admin panel.
+msgctxt "LEGEND"
 msgid "SSL"
 msgstr ""
 
@@ -3685,10 +3722,14 @@ msgstr ""
 msgid "People search"
 msgstr "Kişi Arama"
 
+#. TRANS: Client error displayed when trying to tag a profile with an invalid tag.
+#. TRANS: %s is the invalid tag.
 #, fuzzy, php-format
 msgid "Not a valid people tag: %s."
 msgstr "Geçersiz bir eposta adresi."
 
+#. TRANS: Page title for users with a certain self-tag.
+#. TRANS: %1$s is the tag, %2$s is the page number.
 #, fuzzy, php-format
 msgid "Users self-tagged with %1$s - page %2$d"
 msgstr "%s adli kullanicinin durum mesajlari"
@@ -3698,15 +3739,19 @@ msgctxt "plugin"
 msgid "Disabled"
 msgstr ""
 
+#. TRANS: Client error displayed when trying to use another method than POST.
+#. TRANS: Do not translate POST.
 #. TRANS: Client error displayed trying to perform any request method other than POST.
 #. TRANS: Do not translate POST.
 msgid "This action only accepts POST requests."
 msgstr ""
 
+#. TRANS: Client error displayed when trying to enable or disable a plugin without access rights.
 #, fuzzy
 msgid "You cannot administer plugins."
 msgstr "Kullanıcıları silemezsiniz."
 
+#. TRANS: Client error displayed when trying to enable or disable a non-existing plugin.
 #, fuzzy
 msgid "No such plugin."
 msgstr "Böyle bir sayfa yok."
@@ -3717,7 +3762,8 @@ msgid "Enabled"
 msgstr ""
 
 #. TRANS: Tab and title for plugins admin panel.
-#. TRANS: Menu item for site administration
+#, fuzzy
+msgctxt "TITLE"
 msgid "Plugins"
 msgstr "Eklentiler"
 
@@ -3733,15 +3779,19 @@ msgstr ""
 msgid "Default plugins"
 msgstr "Öntanımlı dil"
 
+#. TRANS: Text displayed on plugin admin page when no plugin are enabled.
 msgid ""
 "All default plugins have been disabled from the site's configuration file."
 msgstr ""
 
+#. TRANS: Client error displayed if the notice posted has too many characters.
 msgid "Invalid notice content."
 msgstr "Geçersiz büyüklük."
 
+#. TRANS: Exception thrown if a notice's license is not compatible with the StatusNet site license.
+#. TRANS: %1$s is the notice license, %2$s is the StatusNet site's license.
 #, php-format
-msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’."
+msgid "Notice license \"%1$s\" is not compatible with site license \"%2$s\"."
 msgstr ""
 
 #. TRANS: Page title for profile settings.
@@ -3896,47 +3946,61 @@ msgstr "Ayarlar kaydedildi."
 msgid "Restore account"
 msgstr "Bir hesap oluştur"
 
+#. TRANS: Client error displayed when requesting a public timeline page beyond the page limit.
+#. TRANS: %s is the page limit.
 #, php-format
 msgid "Beyond the page limit (%s)."
 msgstr ""
 
+#. TRANS: Server error displayed when a public timeline cannot be retrieved.
 #, fuzzy
 msgid "Could not retrieve public stream."
 msgstr "Kullanıcı güncellenemedi."
 
+#. TRANS: Title for all public timeline pages but the first.
+#. TRANS: %d is the page number.
 #, fuzzy, php-format
 msgid "Public timeline, page %d"
 msgstr "Genel zaman çizgisi"
 
+#. TRANS: Title for the first public timeline page.
 msgid "Public timeline"
 msgstr "Genel zaman çizgisi"
 
+#. TRANS: Link description for public timeline feed.
 #, fuzzy
 msgid "Public Stream Feed (RSS 1.0)"
 msgstr "Genel Durum Akış RSS Beslemesi"
 
+#. TRANS: Link description for public timeline feed.
 #, fuzzy
 msgid "Public Stream Feed (RSS 2.0)"
 msgstr "Genel Durum Akış RSS Beslemesi"
 
+#. TRANS: Link description for public timeline feed.
 #, fuzzy
 msgid "Public Stream Feed (Atom)"
 msgstr "Genel Durum Akış RSS Beslemesi"
 
+#. TRANS: Text displayed for public feed when there are no public notices.
 #, php-format
 msgid ""
 "This is the public timeline for %%site.name%% but no one has posted anything "
 "yet."
 msgstr ""
 
+#. TRANS: Additional text displayed for public feed when there are no public notices for a logged in user.
 msgid "Be the first to post!"
 msgstr ""
 
+#. TRANS: Additional text displayed for public feed when there are no public notices for a not logged in user.
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post!"
 msgstr ""
 
+#. TRANS: Message for not logged in users at an invite-only site trying to view the public feed of notices.
+#. TRANS: This message contains Markdown links. Please mind the formatting.
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -3945,6 +4009,8 @@ msgid ""
 "friends, family, and colleagues! ([Read more](%%doc.help%%))"
 msgstr ""
 
+#. TRANS: Message for not logged in users at a closed site trying to view the public feed of notices.
+#. TRANS: This message contains Markdown links. Please mind the formatting.
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -5595,6 +5661,10 @@ msgid ""
 "along with this program.  If not, see %s."
 msgstr ""
 
+#. TRANS: Menu item for site administration
+msgid "Plugins"
+msgstr "Eklentiler"
+
 #. TRANS: Form input field label for application name.
 #, fuzzy
 msgid "Name"
@@ -6092,6 +6162,9 @@ msgstr "saveSettings() gerçeklenmemiş."
 msgid "Unable to delete design setting."
 msgstr "Dizayn ayarı silinemedi."
 
+msgid "Home"
+msgstr "Başlangıç Sayfası"
+
 #. TRANS: Menu item title/tooltip
 msgid "Basic site configuration"
 msgstr "Temel site yapılandırması"
@@ -6687,9 +6760,6 @@ msgstr ""
 msgid "Database error"
 msgstr ""
 
-msgid "Home"
-msgstr "Başlangıç Sayfası"
-
 msgid "Public"
 msgstr "Genel"
 
@@ -7399,7 +7469,6 @@ msgstr "Yeni durum mesajı"
 msgid "What's up, %s?"
 msgstr "N'aber %s?"
 
-#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr ""
 
@@ -7470,6 +7539,9 @@ msgstr "Bu durum mesajını sil"
 msgid "Notice repeated"
 msgstr "Durum mesajları"
 
+msgid "Update your status..."
+msgstr ""
+
 msgid "Nudge this user"
 msgstr ""
 
@@ -7990,11 +8062,3 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
-
-#, fuzzy
-#~ msgid "Friends timeline"
-#~ msgstr "%s zaman çizelgesi"
-
-#, fuzzy
-#~ msgid "Everyone on this site"
-#~ msgstr "Siteye giriş"
diff --git a/locale/uk/LC_MESSAGES/statusnet.po b/locale/uk/LC_MESSAGES/statusnet.po
index 3077a74597..f2f3cdd6df 100644
--- a/locale/uk/LC_MESSAGES/statusnet.po
+++ b/locale/uk/LC_MESSAGES/statusnet.po
@@ -12,18 +12,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-08 01:03+0000\n"
-"PO-Revision-Date: 2011-03-08 01:05:34+0000\n"
+"POT-Creation-Date: 2011-03-11 18:15+0000\n"
+"PO-Revision-Date: 2011-03-11 18:17:31+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
+"X-Generator: MediaWiki 1.18alpha (r83703); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
-"X-POT-Import-Date: 2011-03-06 02:16:47+0000\n"
+"X-POT-Import-Date: 2011-03-08 01:25:01+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -1060,7 +1060,8 @@ msgid "Can only fave notices."
 msgstr "Можна лише додавати дописи до обраних."
 
 #. TRANS: Client exception thrown when trying favorite a notice without content.
-msgid "Unknown note."
+#, fuzzy
+msgid "Unknown notice."
 msgstr "Невідома примітка"
 
 #. TRANS: Client exception thrown when trying favorite an already favorited notice.
@@ -1631,6 +1632,7 @@ msgstr "Видалити спільноту."
 #. TRANS: Client error displayed trying to create a new direct message while not logged in.
 #. TRANS: Client error displayed trying to send a notice while not logged in.
 #. TRANS: Client error displayed trying to nudge a user without being logged in.
+#. TRANS: Client error displayed when trying to enable or disable a plugin while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
@@ -3108,6 +3110,10 @@ msgstr "Потрібна URL-адреса."
 msgid "Could not create application."
 msgstr "Не вдалося створити додаток."
 
+#, fuzzy
+msgid "Invalid image."
+msgstr "Недійсний розмір."
+
 #. TRANS: Title for form to create a group.
 msgid "New group"
 msgstr "Нова спільнота"
@@ -3393,49 +3399,74 @@ msgstr ""
 "Це ваші вихідні повідомлення, тут містяться повідомлення, які ви надіслали "
 "приватно."
 
+#. TRANS: Title for page where to change password.
+#, fuzzy
+msgctxt "TITLE"
 msgid "Change password"
 msgstr "Змінити пароль"
 
+#. TRANS: Instructions for page where to change password.
 msgid "Change your password."
 msgstr "Змінити пароль."
 
+#. TRANS: Fieldset legend on page where to change password.
 #. TRANS: Fieldset legend for password reset form.
 msgid "Password change"
 msgstr "Пароль замінено"
 
+#. TRANS: Field label on page where to change password.
 msgid "Old password"
 msgstr "Старий пароль"
 
+#. TRANS: Field label on page where to change password.
 #. TRANS: Field label for password reset form.
 msgid "New password"
 msgstr "Новий пароль"
 
+#. TRANS: Field title on page where to change password.
 msgid "6 or more characters."
 msgstr "6 або більше знаків."
 
+#. TRANS: Field label on page where to change password. In this field the new password should be typed a second time.
+#, fuzzy
+msgctxt "LABEL"
+msgid "Confirm"
+msgstr "Підтвердити"
+
+#. TRANS: Field title on page where to change password.
 #. TRANS: Ttile for field label for password reset form where the password has to be typed again.
 msgid "Same as password above."
 msgstr "Такий само, як і пароль вище."
 
+#. TRANS: Button text on page where to change password.
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Change"
 msgstr "Змінити"
 
+#. TRANS: Form validation error on page where to change password.
 msgid "Password must be 6 or more characters."
 msgstr "Пароль має складатись з 6-ти або більше знаків."
 
 msgid "Passwords don't match."
 msgstr "Паролі не співпадають."
 
-msgid "Incorrect old password"
+#. TRANS: Form validation error on page where to change password.
+#, fuzzy
+msgid "Incorrect old password."
 msgstr "Старий пароль є неточним"
 
+#. TRANS: Form validation error on page where to change password.
 msgid "Error saving user; invalid."
 msgstr "Помилка при збереженні користувача; недійсний."
 
+#. TRANS: Server error displayed on page where to change password when password change
+#. TRANS: could not be made because of a server error.
 #. TRANS: Reset password form validation error message.
 msgid "Cannot save new password."
 msgstr "Не вдається зберегти новий пароль."
 
+#. TRANS: Form validation notice on page where to change password.
 msgid "Password saved."
 msgstr "Пароль збережено."
 
@@ -3485,6 +3516,7 @@ msgstr "Сайт"
 msgid "Server"
 msgstr "Сервер"
 
+#. TRANS: Field title in Paths admin panel.
 msgid "Site's server hostname."
 msgstr "Ім’я хосту сервера на якому знаходиться сайт."
 
@@ -3492,6 +3524,7 @@ msgstr "Ім’я хосту сервера на якому знаходитьс
 msgid "Path"
 msgstr "Шлях"
 
+#. TRANS: Field title in Paths admin panel.
 msgid "Site path."
 msgstr "Шлях до сайту."
 
@@ -3499,6 +3532,7 @@ msgstr "Шлях до сайту."
 msgid "Locale directory"
 msgstr "Директорія локалі"
 
+#. TRANS: Field title in Paths admin panel.
 msgid "Directory path to locales."
 msgstr "Шлях до директорії локалей."
 
@@ -3506,9 +3540,14 @@ msgstr "Шлях до директорії локалей."
 msgid "Fancy URLs"
 msgstr "Надзвичайні URL-адреси"
 
-msgid "Use fancy (more readable and memorable) URLs?"
+#. TRANS: Field title in Paths admin panel.
+#, fuzzy
+msgid "Use fancy URLs (more readable and memorable)?"
 msgstr "Використовувати надзвичайні (найбільш пам’ятні і визначні) URL-адреси?"
 
+#. TRANS: Fieldset legend in Paths admin panel.
+#, fuzzy
+msgctxt "LEGEND"
 msgid "Theme"
 msgstr "Тема"
 
@@ -3621,6 +3660,8 @@ msgid "Directory where attachments are located."
 msgstr "Директорія, в якій знаходяться вкладення."
 
 #. TRANS: Fieldset legend in Paths admin panel.
+#, fuzzy
+msgctxt "LEGEND"
 msgid "SSL"
 msgstr "SSL-шифрування"
 
@@ -3666,10 +3707,14 @@ msgstr ""
 msgid "People search"
 msgstr "Пошук людей"
 
+#. TRANS: Client error displayed when trying to tag a profile with an invalid tag.
+#. TRANS: %s is the invalid tag.
 #, php-format
 msgid "Not a valid people tag: %s."
 msgstr "Це недійсний особистий теґ: %s."
 
+#. TRANS: Page title for users with a certain self-tag.
+#. TRANS: %1$s is the tag, %2$s is the page number.
 #, php-format
 msgid "Users self-tagged with %1$s - page %2$d"
 msgstr "Користувачі з особистим теґом «%1$s» — сторінка %2$d"
@@ -3679,14 +3724,18 @@ msgctxt "plugin"
 msgid "Disabled"
 msgstr "Вимкнений"
 
+#. TRANS: Client error displayed when trying to use another method than POST.
+#. TRANS: Do not translate POST.
 #. TRANS: Client error displayed trying to perform any request method other than POST.
 #. TRANS: Do not translate POST.
 msgid "This action only accepts POST requests."
 msgstr "Ця дія приймає лише запити POST."
 
+#. TRANS: Client error displayed when trying to enable or disable a plugin without access rights.
 msgid "You cannot administer plugins."
 msgstr "Ви не можете керувати додатками."
 
+#. TRANS: Client error displayed when trying to enable or disable a non-existing plugin.
 msgid "No such plugin."
 msgstr "Немає такого додатку."
 
@@ -3696,7 +3745,8 @@ msgid "Enabled"
 msgstr "Увімкнений"
 
 #. TRANS: Tab and title for plugins admin panel.
-#. TRANS: Menu item for site administration
+#, fuzzy
+msgctxt "TITLE"
 msgid "Plugins"
 msgstr "Додатки"
 
@@ -3714,16 +3764,20 @@ msgstr ""
 msgid "Default plugins"
 msgstr "Додатки за замовчуванням"
 
+#. TRANS: Text displayed on plugin admin page when no plugin are enabled.
 msgid ""
 "All default plugins have been disabled from the site's configuration file."
 msgstr ""
 "Всі додатки за замовчуванням було вимкнено у файлі конфігурації даного сайту."
 
+#. TRANS: Client error displayed if the notice posted has too many characters.
 msgid "Invalid notice content."
 msgstr "Недійсний зміст допису."
 
-#, php-format
-msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’."
+#. TRANS: Exception thrown if a notice's license is not compatible with the StatusNet site license.
+#. TRANS: %1$s is the notice license, %2$s is the StatusNet site's license.
+#, fuzzy, php-format
+msgid "Notice license \"%1$s\" is not compatible with site license \"%2$s\"."
 msgstr "Ліцензія допису «%1$s» є несумісною з ліцензією сайту «%2$s»."
 
 #. TRANS: Page title for profile settings.
@@ -3869,29 +3923,39 @@ msgstr "Налаштування збережено."
 msgid "Restore account"
 msgstr "Відновити акаунт"
 
+#. TRANS: Client error displayed when requesting a public timeline page beyond the page limit.
+#. TRANS: %s is the page limit.
 #, php-format
 msgid "Beyond the page limit (%s)."
 msgstr "Перевищено ліміт сторінки (%s)."
 
+#. TRANS: Server error displayed when a public timeline cannot be retrieved.
 msgid "Could not retrieve public stream."
 msgstr "Не вдається відновити загальну стрічку."
 
+#. TRANS: Title for all public timeline pages but the first.
+#. TRANS: %d is the page number.
 #, php-format
 msgid "Public timeline, page %d"
 msgstr "Загальна стрічка, сторінка %d"
 
+#. TRANS: Title for the first public timeline page.
 msgid "Public timeline"
 msgstr "Загальна стрічка"
 
+#. TRANS: Link description for public timeline feed.
 msgid "Public Stream Feed (RSS 1.0)"
 msgstr "Стрічка публічних дописів (RSS 1.0)"
 
+#. TRANS: Link description for public timeline feed.
 msgid "Public Stream Feed (RSS 2.0)"
 msgstr "Стрічка публічних дописів (RSS 2.0)"
 
+#. TRANS: Link description for public timeline feed.
 msgid "Public Stream Feed (Atom)"
 msgstr "Стрічка публічних дописів (Atom)"
 
+#. TRANS: Text displayed for public feed when there are no public notices.
 #, php-format
 msgid ""
 "This is the public timeline for %%site.name%% but no one has posted anything "
@@ -3899,9 +3963,11 @@ msgid ""
 msgstr ""
 "Це публічна стрічка дописів сайту %%site.name%%, але вона поки що порожня."
 
+#. TRANS: Additional text displayed for public feed when there are no public notices for a logged in user.
 msgid "Be the first to post!"
 msgstr "Станьте першим! Напишіть щось!"
 
+#. TRANS: Additional text displayed for public feed when there are no public notices for a not logged in user.
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post!"
@@ -3909,6 +3975,8 @@ msgstr ""
 "Чому б не [зареєструватись](%%action.register%%) і не зробити свій перший "
 "допис!"
 
+#. TRANS: Message for not logged in users at an invite-only site trying to view the public feed of notices.
+#. TRANS: This message contains Markdown links. Please mind the formatting.
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -3922,6 +3990,8 @@ msgstr ""
 "розділити своє життя з друзями, родиною і колегами! ([Дізнатися більше](%%"
 "doc.help%%))"
 
+#. TRANS: Message for not logged in users at a closed site trying to view the public feed of notices.
+#. TRANS: This message contains Markdown links. Please mind the formatting.
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -5610,6 +5680,10 @@ msgstr ""
 "Разом з програмою ви маєте отримати копію ліцензійних умов GNU Affero "
 "General Public License. Якщо ні, перейдіть на %s."
 
+#. TRANS: Menu item for site administration
+msgid "Plugins"
+msgstr "Додатки"
+
 #. TRANS: Form input field label for application name.
 msgid "Name"
 msgstr "Ім’я"
@@ -5945,9 +6019,8 @@ msgstr "Відповісти"
 msgid "Write a reply..."
 msgstr "Пише відповідь..."
 
-#, fuzzy
 msgid "Status"
-msgstr "StatusNet"
+msgstr "Статус"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #. TRANS: Text between [] is a link description, text between () is the link itself.
@@ -6112,6 +6185,9 @@ msgstr "saveSettings() не виконано."
 msgid "Unable to delete design setting."
 msgstr "Немає можливості видалити налаштування дизайну."
 
+msgid "Home"
+msgstr "Веб-сторінка"
+
 #. TRANS: Menu item title/tooltip
 msgid "Basic site configuration"
 msgstr "Основна конфігурація сайту"
@@ -6743,9 +6819,6 @@ msgstr "Іти до файлу інсталяції."
 msgid "Database error"
 msgstr "Помилка бази даних"
 
-msgid "Home"
-msgstr "Веб-сторінка"
-
 msgid "Public"
 msgstr "Загал"
 
@@ -7525,18 +7598,16 @@ msgid "from"
 msgstr "з"
 
 msgid "Can't get author for activity."
-msgstr ""
+msgstr "Не вдається отримати автора для діяльності."
 
-#, fuzzy
 msgid "Bookmark not posted to this group."
-msgstr "Вам не дозволено видаляти цю спільноту."
+msgstr "Закладку не додано до цієї спільноти."
 
-#, fuzzy
 msgid "Object not posted to this user."
-msgstr "Не видаляти цього користувача."
+msgstr "Об’єкт не додано до цього користувача."
 
 msgid "Don't know how to handle this kind of target."
-msgstr ""
+msgstr "Не знаю, як обробити такого роду мету."
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 msgid "Nickname cannot be empty."
@@ -7559,7 +7630,6 @@ msgstr "Надіслати допис"
 msgid "What's up, %s?"
 msgstr "Що нового, %s?"
 
-#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr "Вкласти"
 
@@ -7627,6 +7697,9 @@ msgstr "Видалити допис"
 msgid "Notice repeated"
 msgstr "Допис повторили"
 
+msgid "Update your status..."
+msgstr ""
+
 msgid "Nudge this user"
 msgstr "«Розштовхати» користувача"
 
@@ -8139,9 +8212,3 @@ msgstr "Неправильний XML, корінь XRD відсутній."
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr "Отримання резервної копії файлу «%s»."
-
-#~ msgid "Friends timeline"
-#~ msgstr "Стрічка друзів"
-
-#~ msgid "Everyone on this site"
-#~ msgstr "Всі на цьому сайті"
diff --git a/locale/zh_CN/LC_MESSAGES/statusnet.po b/locale/zh_CN/LC_MESSAGES/statusnet.po
index c8367a9bd1..022e28922e 100644
--- a/locale/zh_CN/LC_MESSAGES/statusnet.po
+++ b/locale/zh_CN/LC_MESSAGES/statusnet.po
@@ -15,18 +15,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-08 01:03+0000\n"
-"PO-Revision-Date: 2011-03-08 01:05:35+0000\n"
+"POT-Creation-Date: 2011-03-11 18:15+0000\n"
+"PO-Revision-Date: 2011-03-11 18:17:32+0000\n"
 "Language-Team: Simplified Chinese <http://translatewiki.net/wiki/Portal:zh-"
 "hans>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
+"X-Generator: MediaWiki 1.18alpha (r83703); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-POT-Import-Date: 2011-03-06 02:16:47+0000\n"
+"X-POT-Import-Date: 2011-03-08 01:25:01+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -1017,7 +1017,8 @@ msgid "Can only fave notices."
 msgstr "可以只为心目中的绝对通知书。"
 
 #. TRANS: Client exception thrown when trying favorite a notice without content.
-msgid "Unknown note."
+#, fuzzy
+msgid "Unknown notice."
 msgstr "未知的注意。"
 
 #. TRANS: Client exception thrown when trying favorite an already favorited notice.
@@ -1577,6 +1578,7 @@ msgstr "删除此组。"
 #. TRANS: Client error displayed trying to create a new direct message while not logged in.
 #. TRANS: Client error displayed trying to send a notice while not logged in.
 #. TRANS: Client error displayed trying to nudge a user without being logged in.
+#. TRANS: Client error displayed when trying to enable or disable a plugin while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error displayed trying to subscribe when not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
@@ -3020,6 +3022,10 @@ msgstr "Source URL 必填。"
 msgid "Could not create application."
 msgstr "无法创建应用。"
 
+#, fuzzy
+msgid "Invalid image."
+msgstr "大小不正确。"
+
 #. TRANS: Title for form to create a group.
 msgid "New group"
 msgstr "新小组"
@@ -3298,49 +3304,74 @@ msgstr "%s 的发件箱"
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr "这是你的发件箱，包含你发送的私信。"
 
+#. TRANS: Title for page where to change password.
+#, fuzzy
+msgctxt "TITLE"
 msgid "Change password"
 msgstr "修改密码"
 
+#. TRANS: Instructions for page where to change password.
 msgid "Change your password."
 msgstr "修改你的密码"
 
+#. TRANS: Fieldset legend on page where to change password.
 #. TRANS: Fieldset legend for password reset form.
 msgid "Password change"
 msgstr "修改密码"
 
+#. TRANS: Field label on page where to change password.
 msgid "Old password"
 msgstr "旧密码"
 
+#. TRANS: Field label on page where to change password.
 #. TRANS: Field label for password reset form.
 msgid "New password"
 msgstr "新密码"
 
+#. TRANS: Field title on page where to change password.
 msgid "6 or more characters."
 msgstr "6 个或更多字符"
 
+#. TRANS: Field label on page where to change password. In this field the new password should be typed a second time.
+#, fuzzy
+msgctxt "LABEL"
+msgid "Confirm"
+msgstr "密码确认"
+
+#. TRANS: Field title on page where to change password.
 #. TRANS: Ttile for field label for password reset form where the password has to be typed again.
 msgid "Same as password above."
 msgstr "与上面相同的密码"
 
+#. TRANS: Button text on page where to change password.
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Change"
 msgstr "修改"
 
+#. TRANS: Form validation error on page where to change password.
 msgid "Password must be 6 or more characters."
 msgstr "密码必须包含 6 个或更多字符。"
 
 msgid "Passwords don't match."
 msgstr "密码不匹配。"
 
-msgid "Incorrect old password"
+#. TRANS: Form validation error on page where to change password.
+#, fuzzy
+msgid "Incorrect old password."
 msgstr "旧密码不正确"
 
+#. TRANS: Form validation error on page where to change password.
 msgid "Error saving user; invalid."
 msgstr "保存用户时出错；无效。"
 
+#. TRANS: Server error displayed on page where to change password when password change
+#. TRANS: could not be made because of a server error.
 #. TRANS: Reset password form validation error message.
 msgid "Cannot save new password."
 msgstr "无法保存新密码。"
 
+#. TRANS: Form validation notice on page where to change password.
 msgid "Password saved."
 msgstr "密码已保存。"
 
@@ -3390,6 +3421,7 @@ msgstr "网站"
 msgid "Server"
 msgstr "服务器"
 
+#. TRANS: Field title in Paths admin panel.
 msgid "Site's server hostname."
 msgstr "网站的服务器主机名。"
 
@@ -3397,6 +3429,7 @@ msgstr "网站的服务器主机名。"
 msgid "Path"
 msgstr "路径"
 
+#. TRANS: Field title in Paths admin panel.
 msgid "Site path."
 msgstr "网站路径"
 
@@ -3404,6 +3437,7 @@ msgstr "网站路径"
 msgid "Locale directory"
 msgstr "本地化目录"
 
+#. TRANS: Field title in Paths admin panel.
 msgid "Directory path to locales."
 msgstr "本地化文件的目录路径"
 
@@ -3411,9 +3445,14 @@ msgstr "本地化文件的目录路径"
 msgid "Fancy URLs"
 msgstr "优化 URLs"
 
-msgid "Use fancy (more readable and memorable) URLs?"
+#. TRANS: Field title in Paths admin panel.
+#, fuzzy
+msgid "Use fancy URLs (more readable and memorable)?"
 msgstr "使用优化的 URLs（更简洁易记）？"
 
+#. TRANS: Fieldset legend in Paths admin panel.
+#, fuzzy
+msgctxt "LEGEND"
 msgid "Theme"
 msgstr "主题"
 
@@ -3526,6 +3565,8 @@ msgid "Directory where attachments are located."
 msgstr "附件文件的目录。"
 
 #. TRANS: Fieldset legend in Paths admin panel.
+#, fuzzy
+msgctxt "LEGEND"
 msgid "SSL"
 msgstr "SSL"
 
@@ -3570,10 +3611,14 @@ msgstr ""
 msgid "People search"
 msgstr "搜索用户"
 
+#. TRANS: Client error displayed when trying to tag a profile with an invalid tag.
+#. TRANS: %s is the invalid tag.
 #, php-format
 msgid "Not a valid people tag: %s."
 msgstr "不是有效的标签：%s。"
 
+#. TRANS: Page title for users with a certain self-tag.
+#. TRANS: %1$s is the tag, %2$s is the page number.
 #, php-format
 msgid "Users self-tagged with %1$s - page %2$d"
 msgstr "用户自加标签%s - 第%d 页"
@@ -3583,15 +3628,19 @@ msgctxt "plugin"
 msgid "Disabled"
 msgstr ""
 
+#. TRANS: Client error displayed when trying to use another method than POST.
+#. TRANS: Do not translate POST.
 #. TRANS: Client error displayed trying to perform any request method other than POST.
 #. TRANS: Do not translate POST.
 msgid "This action only accepts POST requests."
 msgstr "这个动作只接受 POST 请求"
 
+#. TRANS: Client error displayed when trying to enable or disable a plugin without access rights.
 #, fuzzy
 msgid "You cannot administer plugins."
 msgstr "你不能删除用户。"
 
+#. TRANS: Client error displayed when trying to enable or disable a non-existing plugin.
 #, fuzzy
 msgid "No such plugin."
 msgstr "没有这个页面。"
@@ -3602,7 +3651,8 @@ msgid "Enabled"
 msgstr ""
 
 #. TRANS: Tab and title for plugins admin panel.
-#. TRANS: Menu item for site administration
+#, fuzzy
+msgctxt "TITLE"
 msgid "Plugins"
 msgstr "插件"
 
@@ -3618,15 +3668,19 @@ msgstr ""
 msgid "Default plugins"
 msgstr "默认语言"
 
+#. TRANS: Text displayed on plugin admin page when no plugin are enabled.
 msgid ""
 "All default plugins have been disabled from the site's configuration file."
 msgstr ""
 
+#. TRANS: Client error displayed if the notice posted has too many characters.
 msgid "Invalid notice content."
 msgstr "无效的消息内容。"
 
-#, php-format
-msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’."
+#. TRANS: Exception thrown if a notice's license is not compatible with the StatusNet site license.
+#. TRANS: %1$s is the notice license, %2$s is the StatusNet site's license.
+#, fuzzy, php-format
+msgid "Notice license \"%1$s\" is not compatible with site license \"%2$s\"."
 msgstr "消息许可证“%1$s”与这个网站的许可证“%2$s”不兼容。"
 
 #. TRANS: Page title for profile settings.
@@ -3765,43 +3819,57 @@ msgstr "设置已保存。"
 msgid "Restore account"
 msgstr "还原账户"
 
+#. TRANS: Client error displayed when requesting a public timeline page beyond the page limit.
+#. TRANS: %s is the page limit.
 #, php-format
 msgid "Beyond the page limit (%s)."
 msgstr "超出页面限制(%s)。"
 
+#. TRANS: Server error displayed when a public timeline cannot be retrieved.
 msgid "Could not retrieve public stream."
 msgstr "无法获取到公共的时间线。"
 
+#. TRANS: Title for all public timeline pages but the first.
+#. TRANS: %d is the page number.
 #, php-format
 msgid "Public timeline, page %d"
 msgstr "公共时间线，第%d页"
 
+#. TRANS: Title for the first public timeline page.
 msgid "Public timeline"
 msgstr "公共时间线"
 
+#. TRANS: Link description for public timeline feed.
 msgid "Public Stream Feed (RSS 1.0)"
 msgstr "公开的 RSS 聚合 (RSS 1.0)"
 
+#. TRANS: Link description for public timeline feed.
 msgid "Public Stream Feed (RSS 2.0)"
 msgstr "公开的 RSS 聚合 (RSS 2.0)"
 
+#. TRANS: Link description for public timeline feed.
 msgid "Public Stream Feed (Atom)"
 msgstr "公开的 RSS 聚合 (Atom)"
 
+#. TRANS: Text displayed for public feed when there are no public notices.
 #, php-format
 msgid ""
 "This is the public timeline for %%site.name%% but no one has posted anything "
 "yet."
 msgstr "这是%%site.name%%的公共时间线，但是还没有人发布任何内容。"
 
+#. TRANS: Additional text displayed for public feed when there are no public notices for a logged in user.
 msgid "Be the first to post!"
 msgstr "成为第一个发布消息的人！"
 
+#. TRANS: Additional text displayed for public feed when there are no public notices for a not logged in user.
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post!"
 msgstr "现在就 [注册](%%action.register%%) 并成为第一个发布消息的人！"
 
+#. TRANS: Message for not logged in users at an invite-only site trying to view the public feed of notices.
+#. TRANS: This message contains Markdown links. Please mind the formatting.
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -3814,6 +3882,8 @@ msgstr ""
 "务。[现在加入](%%action.register%%) 并与你的朋友、家人和同事们一起分享你的消"
 "息。([查看更多](%%doc.help%%))"
 
+#. TRANS: Message for not logged in users at a closed site trying to view the public feed of notices.
+#. TRANS: This message contains Markdown links. Please mind the formatting.
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -5434,6 +5504,10 @@ msgid ""
 "along with this program.  If not, see %s."
 msgstr "你应该在本程序中收到了一份 GNU Affero GPL 的副本，如果没有收到请看%s。"
 
+#. TRANS: Menu item for site administration
+msgid "Plugins"
+msgstr "插件"
+
 #. TRANS: Form input field label for application name.
 msgid "Name"
 msgstr "名称"
@@ -5916,6 +5990,9 @@ msgstr "saveSettings() 尚未实现。"
 msgid "Unable to delete design setting."
 msgstr "无法删除外观设置。"
 
+msgid "Home"
+msgstr "主页"
+
 #. TRANS: Menu item title/tooltip
 msgid "Basic site configuration"
 msgstr "基本网站配置"
@@ -6525,9 +6602,6 @@ msgstr "去安装程序。"
 msgid "Database error"
 msgstr "数据库错误"
 
-msgid "Home"
-msgstr "主页"
-
 msgid "Public"
 msgstr "公共"
 
@@ -7307,7 +7381,6 @@ msgstr "发送一个通知"
 msgid "What's up, %s?"
 msgstr "%s，最近怎么样？"
 
-#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr "附件"
 
@@ -7374,6 +7447,9 @@ msgstr "删除"
 msgid "Notice repeated"
 msgstr "消息已转发"
 
+msgid "Update your status..."
+msgstr ""
+
 msgid "Nudge this user"
 msgstr "呼叫用户"
 
@@ -7868,11 +7944,3 @@ msgstr "不合法的XML, 缺少XRD根"
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr "从文件'%s'获取备份。"
-
-#, fuzzy
-#~ msgid "Friends timeline"
-#~ msgstr "%s的时间线"
-
-#, fuzzy
-#~ msgid "Everyone on this site"
-#~ msgstr "搜索本站用户"
diff --git a/plugins/AccountManager/locale/de/LC_MESSAGES/AccountManager.po b/plugins/AccountManager/locale/de/LC_MESSAGES/AccountManager.po
new file mode 100644
index 0000000000..338a911f54
--- /dev/null
+++ b/plugins/AccountManager/locale/de/LC_MESSAGES/AccountManager.po
@@ -0,0 +1,27 @@
+# Translation of StatusNet - AccountManager to German (Deutsch)
+# Exported from translatewiki.net
+#
+# Author: Habi
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - AccountManager\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-11 18:15+0000\n"
+"PO-Revision-Date: 2011-03-11 18:17:33+0000\n"
+"Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-03-08 01:21:58+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83703); Translate extension (2011-03-11)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: de\n"
+"X-Message-Group: #out-statusnet-plugin-accountmanager\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid ""
+"The Account Manager plugin implements the Account Manager specification."
+msgstr ""
+"Das Account-Manager-Plugin implementiert die Account-Manager-Spezifikation."
diff --git a/plugins/Aim/locale/sv/LC_MESSAGES/Aim.po b/plugins/Aim/locale/sv/LC_MESSAGES/Aim.po
new file mode 100644
index 0000000000..d0799bcffb
--- /dev/null
+++ b/plugins/Aim/locale/sv/LC_MESSAGES/Aim.po
@@ -0,0 +1,34 @@
+# Translation of StatusNet - Aim to Swedish (Svenska)
+# Exported from translatewiki.net
+#
+# Author: WikiPhoenix
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Aim\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-11 18:15+0000\n"
+"PO-Revision-Date: 2011-03-11 18:17:36+0000\n"
+"Language-Team: Swedish <http://translatewiki.net/wiki/Portal:sv>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-03-08 01:22:52+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83703); Translate extension (2011-03-11)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: sv\n"
+"X-Message-Group: #out-statusnet-plugin-aim\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "Send me a message to post a notice"
+msgstr ""
+
+msgid "AIM"
+msgstr "AIM"
+
+msgid ""
+"The AIM plugin allows users to send and receive notices over the AIM network."
+msgstr ""
+"AIM-tillägget tillåter användare skicka och ta emot meddelanden över AIM-"
+"nätverket."
diff --git a/plugins/Autocomplete/locale/Autocomplete.pot b/plugins/Autocomplete/locale/Autocomplete.pot
index cc028a1f72..1c4b44c399 100644
--- a/plugins/Autocomplete/locale/Autocomplete.pot
+++ b/plugins/Autocomplete/locale/Autocomplete.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"POT-Creation-Date: 2011-03-11 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: AutocompletePlugin.php:80
+#: AutocompletePlugin.php:82
 msgid ""
 "The autocomplete plugin allows users to autocomplete screen names in @ "
 "replies. When an \"@\" is typed into the notice text area, an autocomplete "
diff --git a/plugins/Bookmark/locale/Bookmark.pot b/plugins/Bookmark/locale/Bookmark.pot
index c7fc76af60..34c2bf6121 100644
--- a/plugins/Bookmark/locale/Bookmark.pot
+++ b/plugins/Bookmark/locale/Bookmark.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-08 01:03+0000\n"
+"POT-Creation-Date: 2011-03-11 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -20,7 +20,7 @@ msgstr ""
 msgid "Simple extension for supporting bookmarks."
 msgstr ""
 
-#: BookmarkPlugin.php:639
+#: BookmarkPlugin.php:642
 msgid "Bookmark"
 msgstr ""
 
diff --git a/plugins/Bookmark/locale/ia/LC_MESSAGES/Bookmark.po b/plugins/Bookmark/locale/ia/LC_MESSAGES/Bookmark.po
index 7513e1830e..1302863820 100644
--- a/plugins/Bookmark/locale/ia/LC_MESSAGES/Bookmark.po
+++ b/plugins/Bookmark/locale/ia/LC_MESSAGES/Bookmark.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Bookmark\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-08 01:03+0000\n"
-"PO-Revision-Date: 2011-03-08 01:05:50+0000\n"
+"POT-Creation-Date: 2011-03-11 18:15+0000\n"
+"PO-Revision-Date: 2011-03-11 18:17:50+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-06 02:12:57+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
+"X-POT-Import-Date: 2011-03-08 01:22:22+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83703); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-bookmark\n"
@@ -25,7 +25,7 @@ msgid "Simple extension for supporting bookmarks."
 msgstr "Extension simple pro supportar marcapaginas."
 
 msgid "Bookmark"
-msgstr ""
+msgstr "Marcapaginas"
 
 msgctxt "BUTTON"
 msgid "Upload"
diff --git a/plugins/Bookmark/locale/mk/LC_MESSAGES/Bookmark.po b/plugins/Bookmark/locale/mk/LC_MESSAGES/Bookmark.po
index 8621cf3093..7b4b0d7da8 100644
--- a/plugins/Bookmark/locale/mk/LC_MESSAGES/Bookmark.po
+++ b/plugins/Bookmark/locale/mk/LC_MESSAGES/Bookmark.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Bookmark\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-08 01:03+0000\n"
-"PO-Revision-Date: 2011-03-08 01:05:50+0000\n"
+"POT-Creation-Date: 2011-03-11 18:15+0000\n"
+"PO-Revision-Date: 2011-03-11 18:17:50+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-06 02:12:57+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
+"X-POT-Import-Date: 2011-03-08 01:22:22+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83703); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-bookmark\n"
@@ -25,7 +25,7 @@ msgid "Simple extension for supporting bookmarks."
 msgstr "Прост додаток за поддршка на обележувачи."
 
 msgid "Bookmark"
-msgstr ""
+msgstr "Одбележи"
 
 msgctxt "BUTTON"
 msgid "Upload"
diff --git a/plugins/Bookmark/locale/nl/LC_MESSAGES/Bookmark.po b/plugins/Bookmark/locale/nl/LC_MESSAGES/Bookmark.po
index ca207809ec..33bc7c28e1 100644
--- a/plugins/Bookmark/locale/nl/LC_MESSAGES/Bookmark.po
+++ b/plugins/Bookmark/locale/nl/LC_MESSAGES/Bookmark.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Bookmark\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-08 01:03+0000\n"
-"PO-Revision-Date: 2011-03-08 01:05:50+0000\n"
+"POT-Creation-Date: 2011-03-11 18:15+0000\n"
+"PO-Revision-Date: 2011-03-11 18:17:50+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-06 02:12:57+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
+"X-POT-Import-Date: 2011-03-08 01:22:22+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83703); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-bookmark\n"
@@ -25,7 +25,7 @@ msgid "Simple extension for supporting bookmarks."
 msgstr "Eenvoudige extensie voor de ondersteuning van bladwijzers."
 
 msgid "Bookmark"
-msgstr ""
+msgstr "Bladwijzer"
 
 msgctxt "BUTTON"
 msgid "Upload"
diff --git a/plugins/Bookmark/locale/uk/LC_MESSAGES/Bookmark.po b/plugins/Bookmark/locale/uk/LC_MESSAGES/Bookmark.po
index b23106c113..d46085720d 100644
--- a/plugins/Bookmark/locale/uk/LC_MESSAGES/Bookmark.po
+++ b/plugins/Bookmark/locale/uk/LC_MESSAGES/Bookmark.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Bookmark\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-08 01:03+0000\n"
-"PO-Revision-Date: 2011-03-08 01:05:50+0000\n"
+"POT-Creation-Date: 2011-03-11 18:15+0000\n"
+"PO-Revision-Date: 2011-03-11 18:17:50+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-06 02:12:57+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
+"X-POT-Import-Date: 2011-03-08 01:22:22+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83703); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-bookmark\n"
@@ -26,7 +26,7 @@ msgid "Simple extension for supporting bookmarks."
 msgstr "Простий додаток, що підтримує додавання закладок."
 
 msgid "Bookmark"
-msgstr ""
+msgstr "Закладка"
 
 msgctxt "BUTTON"
 msgid "Upload"
diff --git a/plugins/Directory/locale/Directory.pot b/plugins/Directory/locale/Directory.pot
new file mode 100644
index 0000000000..6cc17de6c2
--- /dev/null
+++ b/plugins/Directory/locale/Directory.pot
@@ -0,0 +1,58 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-11 18:15+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: actions/userdirectory.php:94
+#, php-format
+msgid "User Directory, page %d"
+msgstr ""
+
+#: actions/userdirectory.php:96
+msgid "User directory"
+msgstr ""
+
+#: actions/userdirectory.php:99
+#, php-format
+msgid "User directory - %s"
+msgstr ""
+
+#: actions/userdirectory.php:104
+#, php-format
+msgid "User directory - %s, page %d"
+msgstr ""
+
+#: actions/userdirectory.php:265
+msgctxt "BUTTON"
+msgid "Search"
+msgstr ""
+
+#: actions/userdirectory.php:370
+#, php-format
+msgid "No users starting with %s"
+msgstr ""
+
+#: DirectoryPlugin.php:187
+msgid "Add a user directory."
+msgstr ""
+
+#: lib/sortablesubscriptionlist.php:66
+msgid "Nickname"
+msgstr ""
+
+#: lib/sortablesubscriptionlist.php:67
+msgid "Created"
+msgstr ""
diff --git a/plugins/Event/locale/Event.pot b/plugins/Event/locale/Event.pot
new file mode 100644
index 0000000000..5bc2222982
--- /dev/null
+++ b/plugins/Event/locale/Event.pot
@@ -0,0 +1,50 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-11 18:15+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: cancelrsvpform.php:126
+msgctxt "BUTTON"
+msgid "Cancel"
+msgstr ""
+
+#: rsvpform.php:116
+msgctxt "BUTTON"
+msgid "Yes"
+msgstr ""
+
+#: rsvpform.php:117
+msgctxt "BUTTON"
+msgid "No"
+msgstr ""
+
+#: rsvpform.php:118
+msgctxt "BUTTON"
+msgid "Maybe"
+msgstr ""
+
+#: eventform.php:162
+msgctxt "BUTTON"
+msgid "Save"
+msgstr ""
+
+#: EventPlugin.php:133
+msgid "Event invitations and RSVPs."
+msgstr ""
+
+#: EventPlugin.php:138
+msgid "Event"
+msgstr ""
diff --git a/plugins/ExtendedProfile/locale/sv/LC_MESSAGES/ExtendedProfile.po b/plugins/ExtendedProfile/locale/sv/LC_MESSAGES/ExtendedProfile.po
new file mode 100644
index 0000000000..98224ba955
--- /dev/null
+++ b/plugins/ExtendedProfile/locale/sv/LC_MESSAGES/ExtendedProfile.po
@@ -0,0 +1,97 @@
+# Translation of StatusNet - ExtendedProfile to Swedish (Svenska)
+# Exported from translatewiki.net
+#
+# Author: WikiPhoenix
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - ExtendedProfile\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-11 18:15+0000\n"
+"PO-Revision-Date: 2011-03-11 18:18:04+0000\n"
+"Language-Team: Swedish <http://translatewiki.net/wiki/Portal:sv>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-03-08 01:22:06+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83703); Translate extension (2011-03-11)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: sv\n"
+"X-Message-Group: #out-statusnet-plugin-extendedprofile\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "UI extensions for additional profile fields."
+msgstr ""
+
+#. TRANS: Link description in user account settings menu.
+msgid "Details"
+msgstr "Detaljer"
+
+msgid "More details..."
+msgstr "Mer detaljer..."
+
+msgid "Personal"
+msgstr "Personlig"
+
+msgid "Full name"
+msgstr "Fullt namn"
+
+msgid "Title"
+msgstr "Titel"
+
+msgid "Manager"
+msgstr ""
+
+msgid "Location"
+msgstr "Ort"
+
+msgid "Bio"
+msgstr ""
+
+msgid "Tags"
+msgstr "Taggar"
+
+msgid "Contact"
+msgstr "Kontakt"
+
+msgid "Phone"
+msgstr "Telefon"
+
+msgid "IM"
+msgstr ""
+
+msgid "Websites"
+msgstr "Webbsidor"
+
+msgid "Birthday"
+msgstr "Födelsedag"
+
+msgid "Spouse's name"
+msgstr "Partnerns namn"
+
+msgid "Kids' names"
+msgstr "Barnens namn"
+
+msgid "Work experience"
+msgstr "Arbetserfarenhet"
+
+msgid "Employer"
+msgstr "Arbetsgivare"
+
+msgid "Education"
+msgstr "Utbildning"
+
+msgid "Institution"
+msgstr "Institution"
+
+#. TRANS: Link title for link on user profile.
+msgid "Edit extended profile settings"
+msgstr "Redigera utökade profilinställningar"
+
+#. TRANS: Link text for link on user profile.
+msgid "Edit"
+msgstr "Redigera"
+
+msgid "Extended profile settings"
+msgstr "Utökade profilinställningar"
diff --git a/plugins/ExtendedProfile/locale/te/LC_MESSAGES/ExtendedProfile.po b/plugins/ExtendedProfile/locale/te/LC_MESSAGES/ExtendedProfile.po
new file mode 100644
index 0000000000..cda6454eaf
--- /dev/null
+++ b/plugins/ExtendedProfile/locale/te/LC_MESSAGES/ExtendedProfile.po
@@ -0,0 +1,97 @@
+# Translation of StatusNet - ExtendedProfile to Telugu (తెలుగు)
+# Exported from translatewiki.net
+#
+# Author: Veeven
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - ExtendedProfile\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-11 18:15+0000\n"
+"PO-Revision-Date: 2011-03-11 18:18:04+0000\n"
+"Language-Team: Telugu <http://translatewiki.net/wiki/Portal:te>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-03-08 01:22:06+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83703); Translate extension (2011-03-11)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: te\n"
+"X-Message-Group: #out-statusnet-plugin-extendedprofile\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "UI extensions for additional profile fields."
+msgstr ""
+
+#. TRANS: Link description in user account settings menu.
+msgid "Details"
+msgstr "వివరాలు"
+
+msgid "More details..."
+msgstr "మరిన్ని వివరాలు..."
+
+msgid "Personal"
+msgstr "వ్యక్తిగతం"
+
+msgid "Full name"
+msgstr "పూర్తి పేరు"
+
+msgid "Title"
+msgstr "శీర్షిక"
+
+msgid "Manager"
+msgstr ""
+
+msgid "Location"
+msgstr "ప్రాంతం"
+
+msgid "Bio"
+msgstr ""
+
+msgid "Tags"
+msgstr "ట్యాగులు"
+
+msgid "Contact"
+msgstr "సంప్రదించండి"
+
+msgid "Phone"
+msgstr ""
+
+msgid "IM"
+msgstr ""
+
+msgid "Websites"
+msgstr "జాలగూళ్ళు"
+
+msgid "Birthday"
+msgstr "పుట్టినరోజు"
+
+msgid "Spouse's name"
+msgstr ""
+
+msgid "Kids' names"
+msgstr "పిల్లల పేర్లు"
+
+msgid "Work experience"
+msgstr "ఉద్యోగ అనుభవం"
+
+msgid "Employer"
+msgstr ""
+
+msgid "Education"
+msgstr "చదువు"
+
+msgid "Institution"
+msgstr ""
+
+#. TRANS: Link title for link on user profile.
+msgid "Edit extended profile settings"
+msgstr ""
+
+#. TRANS: Link text for link on user profile.
+msgid "Edit"
+msgstr "మార్చు"
+
+msgid "Extended profile settings"
+msgstr ""
diff --git a/plugins/Irc/locale/sv/LC_MESSAGES/Irc.po b/plugins/Irc/locale/sv/LC_MESSAGES/Irc.po
new file mode 100644
index 0000000000..e554f17551
--- /dev/null
+++ b/plugins/Irc/locale/sv/LC_MESSAGES/Irc.po
@@ -0,0 +1,39 @@
+# Translation of StatusNet - Irc to Swedish (Svenska)
+# Exported from translatewiki.net
+#
+# Author: WikiPhoenix
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Irc\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-11 18:15+0000\n"
+"PO-Revision-Date: 2011-03-11 18:18:23+0000\n"
+"Language-Team: Swedish <http://translatewiki.net/wiki/Portal:sv>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-03-08 01:22:54+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83703); Translate extension (2011-03-11)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: sv\n"
+"X-Message-Group: #out-statusnet-plugin-irc\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "IRC"
+msgstr "IRC"
+
+msgid ""
+"The IRC plugin allows users to send and receive notices over an IRC network."
+msgstr ""
+"IRC-tillägget tillåter användare skicka och ta emot meddelanden över IRC-"
+"nätverket."
+
+#, php-format
+msgid "Could not increment attempts count for %d"
+msgstr ""
+
+msgid "Your nickname is not registered so IRC connectivity cannot be enabled"
+msgstr ""
+"Ditt smeknamn är inte registrerat, så IRC-anslutningar kan inte aktiveras"
diff --git a/plugins/MobileProfile/locale/te/LC_MESSAGES/MobileProfile.po b/plugins/MobileProfile/locale/te/LC_MESSAGES/MobileProfile.po
index 435688ea72..62b39f6ff9 100644
--- a/plugins/MobileProfile/locale/te/LC_MESSAGES/MobileProfile.po
+++ b/plugins/MobileProfile/locale/te/LC_MESSAGES/MobileProfile.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - MobileProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-06 02:34+0100\n"
-"PO-Revision-Date: 2011-03-06 01:37:37+0000\n"
+"POT-Creation-Date: 2011-03-11 18:15+0000\n"
+"PO-Revision-Date: 2011-03-11 18:18:38+0000\n"
 "Language-Team: Telugu <http://translatewiki.net/wiki/Portal:te>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-03 17:49:34+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-POT-Import-Date: 2011-03-08 01:22:09+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83703); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: te\n"
 "X-Message-Group: #out-statusnet-plugin-mobileprofile\n"
@@ -55,10 +55,10 @@ msgid "Search"
 msgstr "వెతుకు"
 
 msgid "Attach"
-msgstr ""
+msgstr "జోడించు"
 
 msgid "Attach a file"
-msgstr ""
+msgstr "ఒక దస్త్రాన్ని జోడించండి"
 
 #. TRANS: Link to switch site layout from mobile to desktop mode. Appears at very bottom of page.
 msgid "Switch to desktop site layout."
diff --git a/plugins/Msn/locale/sv/LC_MESSAGES/Msn.po b/plugins/Msn/locale/sv/LC_MESSAGES/Msn.po
new file mode 100644
index 0000000000..6077703e63
--- /dev/null
+++ b/plugins/Msn/locale/sv/LC_MESSAGES/Msn.po
@@ -0,0 +1,31 @@
+# Translation of StatusNet - Msn to Swedish (Svenska)
+# Exported from translatewiki.net
+#
+# Author: WikiPhoenix
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Msn\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-11 18:15+0000\n"
+"PO-Revision-Date: 2011-03-11 18:18:41+0000\n"
+"Language-Team: Swedish <http://translatewiki.net/wiki/Portal:sv>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-03-08 01:22:11+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83703); Translate extension (2011-03-11)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: sv\n"
+"X-Message-Group: #out-statusnet-plugin-msn\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "MSN"
+msgstr "MSN"
+
+msgid ""
+"The MSN plugin allows users to send and receive notices over the MSN network."
+msgstr ""
+"MSN-tillägget tillåter användare skicka och ta emot meddelanden över MSN-"
+"nätverket."
diff --git a/plugins/OpenX/locale/de/LC_MESSAGES/OpenX.po b/plugins/OpenX/locale/de/LC_MESSAGES/OpenX.po
index 6fbf6cc977..11048a707a 100644
--- a/plugins/OpenX/locale/de/LC_MESSAGES/OpenX.po
+++ b/plugins/OpenX/locale/de/LC_MESSAGES/OpenX.po
@@ -2,6 +2,7 @@
 # Exported from translatewiki.net
 #
 # Author: Fujnky
+# Author: George Animal
 # Author: The Evil IP address
 # --
 # This file is distributed under the same license as the StatusNet package.
@@ -10,13 +11,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OpenX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-06 02:34+0100\n"
-"PO-Revision-Date: 2011-03-06 01:37:51+0000\n"
+"POT-Creation-Date: 2011-03-11 18:15+0000\n"
+"PO-Revision-Date: 2011-03-11 18:18:54+0000\n"
 "Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-03 17:45:43+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-POT-Import-Date: 2011-03-06 02:18:35+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83703); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-openx\n"
@@ -61,7 +62,7 @@ msgstr ""
 
 #. TRANS: Form label in OpenX admin panel. Refers to advertisement format.
 msgid "Rectangle"
-msgstr ""
+msgstr "Rechteck"
 
 #. TRANS: Tooltip for form label in OpenX admin panel. Refers to advertisement format.
 msgid "Rectangle zone"
diff --git a/plugins/Poll/locale/Poll.pot b/plugins/Poll/locale/Poll.pot
new file mode 100644
index 0000000000..85b1b74dc1
--- /dev/null
+++ b/plugins/Poll/locale/Poll.pot
@@ -0,0 +1,175 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-11 18:15+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. TRANS: Client exception thrown trying to view a non-existing poll.
+#: showpoll.php:68
+msgid "No such poll."
+msgstr ""
+
+#. TRANS: Client exception thrown trying to view a non-existing poll notice.
+#: showpoll.php:76
+msgid "No such poll notice."
+msgstr ""
+
+#. TRANS: Client exception thrown trying to view a poll of a non-existing user.
+#: showpoll.php:83
+msgid "No such user."
+msgstr ""
+
+#. TRANS: Server exception thrown trying to view a poll for a user for which the profile could not be loaded.
+#: showpoll.php:90
+msgid "User without a profile."
+msgstr ""
+
+#. TRANS: Page title for a poll.
+#. TRANS: %1$s is the nickname of the user that created the poll, %2$s is the poll question.
+#: showpoll.php:109
+#, php-format
+msgid "%1$s's poll: %2$s"
+msgstr ""
+
+#. TRANS: Field label on the page to create a poll.
+#: newpollform.php:107
+msgid "Question"
+msgstr ""
+
+#. TRANS: Field title on the page to create a poll.
+#: newpollform.php:110
+msgid "What question are people answering?"
+msgstr ""
+
+#. TRANS: Field label for an answer option on the page to create a poll.
+#. TRANS: %d is the option number.
+#: newpollform.php:128
+#, php-format
+msgid "Option %d"
+msgstr ""
+
+#. TRANS: Button text for saving a new poll.
+#: newpollform.php:145
+msgctxt "BUTTON"
+msgid "Save"
+msgstr ""
+
+#. TRANS: Plugin description.
+#: PollPlugin.php:157
+msgid "Simple extension for supporting basic polls."
+msgstr ""
+
+#. TRANS: Exception thrown trying to respond to a poll without a poll reference.
+#: PollPlugin.php:234
+msgid "Invalid poll response: no poll reference."
+msgstr ""
+
+#. TRANS: Exception thrown trying to respond to a non-existing poll.
+#: PollPlugin.php:239
+msgid "Invalid poll response: poll is unknown."
+msgstr ""
+
+#. TRANS: Exception thrown when performing an unexpected action on a poll.
+#. TRANS: %s is the unpexpected object type.
+#: PollPlugin.php:266 PollPlugin.php:371
+#, php-format
+msgid "Unexpected type for poll plugin: %s."
+msgstr ""
+
+#. TRANS: Application title.
+#: PollPlugin.php:432
+msgctxt "APPTITLE"
+msgid "Poll"
+msgstr ""
+
+#. TRANS: Client exception thrown when responding to a poll with an invalid option.
+#. TRANS: Client exception thrown responding to a poll with an invalid answer.
+#: Poll_response.php:166 respondpoll.php:102
+msgid "Invalid poll selection."
+msgstr ""
+
+#. TRANS: Notice content voting for a poll.
+#. TRANS: %s is the chosen option in the poll.
+#. TRANS: Rendered version of the notice content voting for a poll.
+#. TRANS: %s a link to the poll with the chosen option as link description.
+#: Poll_response.php:195 Poll_response.php:200
+#, php-format
+msgid "voted for \"%s\""
+msgstr ""
+
+#. TRANS: Button text for submitting a poll response.
+#: pollresponseform.php:127
+msgctxt "BUTTON"
+msgid "Submit"
+msgstr ""
+
+#. TRANS: Notice content creating a poll.
+#. TRANS: %1$s is the poll question, %2$s is a link to the poll.
+#: Poll.php:240
+#, php-format
+msgid "Poll: %1$s %2$s"
+msgstr ""
+
+#. TRANS: Rendered version of the notice content creating a poll.
+#. TRANS: %s a link to the poll with the question as link description.
+#: Poll.php:246
+#, php-format
+msgid "Poll: %s"
+msgstr ""
+
+#. TRANS: Title for poll page.
+#: newpoll.php:63
+msgid "New poll"
+msgstr ""
+
+#. TRANS: Client exception thrown trying to create a poll while not logged in.
+#: newpoll.php:81
+msgid "You must be logged in to post a poll."
+msgstr ""
+
+#. TRANS: Client exception thrown trying to create a poll without a question.
+#: newpoll.php:133
+msgid "Poll must have a question."
+msgstr ""
+
+#. TRANS: Client exception thrown trying to create a poll with fewer than two options.
+#: newpoll.php:138
+msgid "Poll must have at least two options."
+msgstr ""
+
+#. TRANS: Page title after sending a notice.
+#: newpoll.php:157
+msgid "Notice posted"
+msgstr ""
+
+#. TRANS: Page title for poll response.
+#: respondpoll.php:63
+msgid "Poll response"
+msgstr ""
+
+#. TRANS: Client exception thrown trying to respond to a poll while not logged in.
+#: respondpoll.php:84
+msgid "You must be logged in to respond to a poll."
+msgstr ""
+
+#. TRANS: Client exception thrown trying to respond to a non-existing poll.
+#: respondpoll.php:96
+msgid "Invalid or missing poll."
+msgstr ""
+
+#. TRANS: Page title after sending a poll response.
+#: respondpoll.php:152
+msgid "Poll results"
+msgstr ""
diff --git a/plugins/ShareNotice/locale/te/LC_MESSAGES/ShareNotice.po b/plugins/ShareNotice/locale/te/LC_MESSAGES/ShareNotice.po
index 779d511c03..abf9d8f211 100644
--- a/plugins/ShareNotice/locale/te/LC_MESSAGES/ShareNotice.po
+++ b/plugins/ShareNotice/locale/te/LC_MESSAGES/ShareNotice.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - ShareNotice to Telugu (తెలుగు)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Veeven
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ShareNotice\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:54+0000\n"
+"POT-Creation-Date: 2011-03-11 18:15+0000\n"
+"PO-Revision-Date: 2011-03-11 18:19:17+0000\n"
 "Language-Team: Telugu <http://translatewiki.net/wiki/Portal:te>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-11-30 20:43:55+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-03-06 02:18:45+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83703); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: te\n"
 "X-Message-Group: #out-statusnet-plugin-sharenotice\n"
@@ -23,30 +23,25 @@ msgstr ""
 
 #. TRANS: Leave this message unchanged.
 #. TRANS: %s is notice content that is shared on Twitter, Facebook or another platform.
-#: ShareNoticePlugin.php:106 ShareNoticePlugin.php:194
 #, php-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
 #. TRANS: Tooltip for image to share a notice on Twitter.
-#: ShareNoticePlugin.php:130
 msgid "Share on Twitter"
-msgstr ""
+msgstr "ట్విట్టర్లో పంచుకోండి"
 
 #. TRANS: Tooltip for image to share a notice on another platform (other than Twitter or Facebook).
 #. TRANS: %s is a host name.
-#: ShareNoticePlugin.php:163
 #, php-format
 msgid "Share on %s"
 msgstr ""
 
 #. TRANS: Tooltip for image to share a notice on Facebook.
-#: ShareNoticePlugin.php:186
 msgid "Share on Facebook"
-msgstr ""
+msgstr "ఫేస్‌బుక్‌లో పంచుకోండి"
 
 #. TRANS: Plugin description.
-#: ShareNoticePlugin.php:219
 msgid ""
 "This plugin allows sharing of notices to Twitter, Facebook and other "
 "platforms."
diff --git a/plugins/SphinxSearch/locale/SphinxSearch.pot b/plugins/SphinxSearch/locale/SphinxSearch.pot
index 2748722d23..b91e5ba5cf 100644
--- a/plugins/SphinxSearch/locale/SphinxSearch.pot
+++ b/plugins/SphinxSearch/locale/SphinxSearch.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"POT-Creation-Date: 2011-03-11 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. TRANS: Server exception thrown when a database name cannot be identified.
-#: sphinxsearch.php:96
+#: sphinxsearch.php:126
 msgid "Sphinx search could not identify database name."
 msgstr ""
 
diff --git a/plugins/UserFlag/locale/UserFlag.pot b/plugins/UserFlag/locale/UserFlag.pot
index 8930e08c9e..0e06dd3a8a 100644
--- a/plugins/UserFlag/locale/UserFlag.pot
+++ b/plugins/UserFlag/locale/UserFlag.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"POT-Creation-Date: 2011-03-11 18:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -29,7 +29,7 @@ msgid "Flagged"
 msgstr ""
 
 #. TRANS: Plugin description.
-#: UserFlagPlugin.php:294
+#: UserFlagPlugin.php:279
 msgid ""
 "This plugin allows flagging of profiles for review and reviewing flagged "
 "profiles."
diff --git a/plugins/UserFlag/locale/de/LC_MESSAGES/UserFlag.po b/plugins/UserFlag/locale/de/LC_MESSAGES/UserFlag.po
new file mode 100644
index 0000000000..49506be5f5
--- /dev/null
+++ b/plugins/UserFlag/locale/de/LC_MESSAGES/UserFlag.po
@@ -0,0 +1,95 @@
+# Translation of StatusNet - UserFlag to German (Deutsch)
+# Exported from translatewiki.net
+#
+# Author: Habi
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - UserFlag\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-11 18:15+0000\n"
+"PO-Revision-Date: 2011-03-11 18:19:37+0000\n"
+"Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-03-06 02:19:38+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83703); Translate extension (2011-03-11)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: de\n"
+"X-Message-Group: #out-statusnet-plugin-userflag\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: AJAX form title for a flagged profile.
+msgid "Flagged for review"
+msgstr "Zum Überprüfen markiert"
+
+#. TRANS: Body text for AJAX form when a profile has been flagged for review.
+#. TRANS: Message added to a profile if it has been flagged for review.
+msgid "Flagged"
+msgstr "Markiert"
+
+#. TRANS: Plugin description.
+msgid ""
+"This plugin allows flagging of profiles for review and reviewing flagged "
+"profiles."
+msgstr ""
+"Dieser Plugin ermöglicht, Profile zur Überprüfung zu markieren und diese "
+"markierten Profile zu überprüfen."
+
+#. TRANS: Form title for flagging a profile for review.
+msgid "Flag"
+msgstr "Markieren"
+
+#. TRANS: Form description.
+msgid "Flag profile for review."
+msgstr "Profil zur Überprüfung markieren."
+
+#. TRANS: Form title for action on a profile.
+msgid "Clear"
+msgstr "Löschen"
+
+msgid "Clear all flags"
+msgstr "Alle Markierungen löschen"
+
+#. TRANS: Title for page with a list of profiles that were flagged for review.
+msgid "Flagged profiles"
+msgstr "Markierte Profile"
+
+#. TRANS: Header for moderation menu with action buttons for flagged profiles (like 'sandbox', 'silence', ...).
+msgid "Moderate"
+msgstr "Moderieren"
+
+#. TRANS: Message displayed on a profile if it has been flagged.
+#. TRANS: %1$s is a comma separated list of at most 5 user nicknames that flagged.
+#. TRANS: %2$d is a positive integer of additional flagging users. Also used for the plural.
+#, php-format
+msgid "Flagged by %1$s and %2$d other"
+msgid_plural "Flagged by %1$s and %2$d others"
+msgstr[0] "Markiert durch %1$s und %2$d weitere Konten"
+msgstr[1] "Markiert durch %1$s und %2$d Andere"
+
+#. TRANS: Message displayed on a profile if it has been flagged.
+#. TRANS: %s is a comma separated list of at most 5 user nicknames that flagged.
+#, php-format
+msgid "Flagged by %s"
+msgstr "Durch %s markiert"
+
+#. TRANS: Server exception given when flags could not be cleared.
+#, php-format
+msgid "Couldn't clear flags for profile \"%s\"."
+msgstr "Konnte Markierung für Profil \"%s\" nicht entfernen."
+
+#. TRANS: Title for AJAX form to indicated that flags were removed.
+msgid "Flags cleared"
+msgstr ""
+
+#. TRANS: Body element for "flags cleared" form.
+msgid "Cleared"
+msgstr ""
+
+#. TRANS: Server exception.
+#, php-format
+msgid "Couldn't flag profile \"%d\" for review."
+msgstr ""
diff --git a/plugins/Xmpp/locale/sv/LC_MESSAGES/Xmpp.po b/plugins/Xmpp/locale/sv/LC_MESSAGES/Xmpp.po
new file mode 100644
index 0000000000..ae1791d60a
--- /dev/null
+++ b/plugins/Xmpp/locale/sv/LC_MESSAGES/Xmpp.po
@@ -0,0 +1,35 @@
+# Translation of StatusNet - Xmpp to Swedish (Svenska)
+# Exported from translatewiki.net
+#
+# Author: WikiPhoenix
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Xmpp\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-11 18:15+0000\n"
+"PO-Revision-Date: 2011-03-11 18:19:44+0000\n"
+"Language-Team: Swedish <http://translatewiki.net/wiki/Portal:sv>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-03-08 01:22:14+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83703); Translate extension (2011-03-11)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: sv\n"
+"X-Message-Group: #out-statusnet-plugin-xmpp\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "Send me a message to post a notice"
+msgstr ""
+
+msgid "XMPP/Jabber/GTalk"
+msgstr "XMPP/Jabber/GTalk"
+
+msgid ""
+"The XMPP plugin allows users to send and receive notices over the XMPP/"
+"Jabber network."
+msgstr ""
+"XMPP-tillägget tillåter användare skicka och ta emot meddelanden över XMPP/"
+"Jabber-nätverket."

From 3146c9fae843a3f3ba0e840610b4a7607d29153e Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Fri, 11 Mar 2011 11:54:23 -0800
Subject: [PATCH 538/655] Add event hooks for customizing ActivityObject output
 to Atom and JSON, and helpers for MicroAppPlugin.

New hooks:
* StartActivityObjectOutputAtom
* EndActivityObjectOutputAtom
	$obj ActivityObject
	$out XMLOutputter

* StartActivityObjectOutputJson
* EndActivityObjectOutputJson
	$obj ActivityObject
	&$out array
---
 EVENTS.txt             |  16 +++
 lib/activityobject.php | 290 +++++++++++++++++++++--------------------
 lib/microappplugin.php |  78 +++++++++++
 3 files changed, 242 insertions(+), 142 deletions(-)

diff --git a/EVENTS.txt b/EVENTS.txt
index 6cc1a7fe1c..1443a94fbe 100644
--- a/EVENTS.txt
+++ b/EVENTS.txt
@@ -1115,3 +1115,19 @@ StartGroupProfileElements: Start showing stuff about the group on its profile pa
 EndGroupProfileElements: Start showing stuff about the group on its profile page
 - $action: action being executed (for output and params)
 - $group: group for the page
+
+StartActivityObjectOutputAtom: Called at start of Atom XML output generation for ActivityObject chunks, just inside the <activity:object>. Cancel the event to take over its output completely (you're responsible for calling the matching End event if so)
+- $obj: ActivityObject
+- $out: XMLOutputter to append custom output
+
+EndActivityObjectOutputAtom: Called at end of Atom XML output generation for ActivityObject chunks, just inside the </activity:object>
+- $obj: ActivityObject
+- $out: XMLOutputter to append custom output
+
+StartActivityObjectOutputJson: Called at start of JSON output generation for ActivityObject chunks: the array has not yet been filled out. Cancel the event to take over its output completely (you're responsible for calling the matching End event if so)
+- $obj ActivityObject
+- &$out: array to be serialized; you're free to modify it
+
+EndActivityObjectOutputJson: Called at end of JSON output generation for ActivityObject chunks: the array has not yet been filled out.
+- $obj ActivityObject
+- &$out: array to be serialized; you're free to modify it
diff --git a/lib/activityobject.php b/lib/activityobject.php
index d620bf27bb..241f99564f 100644
--- a/lib/activityobject.php
+++ b/lib/activityobject.php
@@ -533,91 +533,95 @@ class ActivityObject
 			$xo->elementStart($tag);
 		}
 
-        $xo->element('activity:object-type', null, $this->type);
+        if (Event::handle('StartActivityObjectOutputAtom', array($this, $xo))) {
+            $xo->element('activity:object-type', null, $this->type);
 
-        // <author> uses URI
+            // <author> uses URI
 
-        if ($tag == 'author') {
-            $xo->element(self::URI, null, $this->id);
-        } else {
-            $xo->element(self::ID, null, $this->id);
-        }
-
-        if (!empty($this->title)) {
-            $name = common_xml_safe_str($this->title);
             if ($tag == 'author') {
-                // XXX: Backward compatibility hack -- atom:name should contain
-                // full name here, instead of nickname, i.e.: $name. Change
-                // this in the next version.
-                $xo->element(self::NAME, null, $this->poco->preferredUsername);
+                $xo->element(self::URI, null, $this->id);
             } else {
-                $xo->element(self::TITLE, null, $name);
+                $xo->element(self::ID, null, $this->id);
             }
-        }
 
-        if (!empty($this->summary)) {
-            $xo->element(
-                self::SUMMARY,
-                null,
-                common_xml_safe_str($this->summary)
-            );
-        }
+            if (!empty($this->title)) {
+                $name = common_xml_safe_str($this->title);
+                if ($tag == 'author') {
+                    // XXX: Backward compatibility hack -- atom:name should contain
+                    // full name here, instead of nickname, i.e.: $name. Change
+                    // this in the next version.
+                    $xo->element(self::NAME, null, $this->poco->preferredUsername);
+                } else {
+                    $xo->element(self::TITLE, null, $name);
+                }
+            }
 
-        if (!empty($this->content)) {
-            // XXX: assuming HTML content here
-            $xo->element(
-                ActivityUtils::CONTENT,
-                array('type' => 'html'),
-                common_xml_safe_str($this->content)
-            );
-        }
-
-        if (!empty($this->link)) {
-            $xo->element(
-                'link',
-                array(
-                    'rel' => 'alternate',
-                    'type' => 'text/html',
-                    'href' => $this->link
-                ),
-                null
-            );
-        }
-
-        if ($this->type == ActivityObject::PERSON
-            || $this->type == ActivityObject::GROUP) {
-
-            foreach ($this->avatarLinks as $avatar) {
+            if (!empty($this->summary)) {
                 $xo->element(
-                    'link', array(
-                        'rel'  => 'avatar',
-                        'type'         => $avatar->type,
-                        'media:width'  => $avatar->width,
-                        'media:height' => $avatar->height,
-                        'href' => $avatar->url
+                    self::SUMMARY,
+                    null,
+                    common_xml_safe_str($this->summary)
+                );
+            }
+
+            if (!empty($this->content)) {
+                // XXX: assuming HTML content here
+                $xo->element(
+                    ActivityUtils::CONTENT,
+                    array('type' => 'html'),
+                    common_xml_safe_str($this->content)
+                );
+            }
+
+            if (!empty($this->link)) {
+                $xo->element(
+                    'link',
+                    array(
+                        'rel' => 'alternate',
+                        'type' => 'text/html',
+                        'href' => $this->link
                     ),
                     null
                 );
             }
-        }
 
-        if (!empty($this->geopoint)) {
-            $xo->element(
-                'georss:point',
-                null,
-                $this->geopoint
-            );
-        }
+            if ($this->type == ActivityObject::PERSON
+                || $this->type == ActivityObject::GROUP) {
 
-        if (!empty($this->poco)) {
-            $this->poco->outputTo($xo);
-        }
+                foreach ($this->avatarLinks as $avatar) {
+                    $xo->element(
+                        'link', array(
+                            'rel'  => 'avatar',
+                            'type'         => $avatar->type,
+                            'media:width'  => $avatar->width,
+                            'media:height' => $avatar->height,
+                            'href' => $avatar->url
+                        ),
+                        null
+                    );
+                }
+            }
 
-        // @fixme there's no way here to make a tree; elements can only contain plaintext
-        // @fixme these may collide with JSON extensions
-        foreach ($this->extra as $el) {
-            list($extraTag, $attrs, $content) = $el;
-            $xo->element($extraTag, $attrs, $content);
+            if (!empty($this->geopoint)) {
+                $xo->element(
+                    'georss:point',
+                    null,
+                    $this->geopoint
+                );
+            }
+
+            if (!empty($this->poco)) {
+                $this->poco->outputTo($xo);
+            }
+
+            // @fixme there's no way here to make a tree; elements can only contain plaintext
+            // @fixme these may collide with JSON extensions
+            foreach ($this->extra as $el) {
+                list($extraTag, $attrs, $content) = $el;
+                $xo->element($extraTag, $attrs, $content);
+            }
+
+            Event::handle('EndActivityObjectOutputAtom', array($this, $xo));
         }
 
 		if (!empty($tag)) {
@@ -647,94 +651,96 @@ class ActivityObject
     {
         $object = array();
 
-        // XXX: attachedObjects are added by Activity
+        if (Event::handle('StartActivityObjectOutputJson', array($this, &$object))) {
+            // XXX: attachedObjects are added by Activity
 
-        // displayName
-        $object['displayName'] = $this->title;
+            // displayName
+            $object['displayName'] = $this->title;
 
-        // TODO: downstreamDuplicates
+            // TODO: downstreamDuplicates
 
-        // embedCode (used for video)
+            // embedCode (used for video)
 
-        // id
-        //
-        // XXX: Should we use URL here? or a crazy tag URI?
-        $object['id'] = $this->id;
+            // 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) {
+            if ($this->type == ActivityObject::PERSON
+                || $this->type == ActivityObject::GROUP) {
 
-            // XXX: Not sure what the best avatar is to use for the
-            // author's "image". For now, I'm using the large size.
+                // XXX: Not sure what the best avatar is to use for the
+                // author's "image". For now, I'm using the large size.
 
-            $avatarLarge      = null;
-            $avatarMediaLinks = array();
+                $avatarLarge      = null;
+                $avatarMediaLinks = array();
 
-            foreach ($this->avatarLinks as $a) {
+                foreach ($this->avatarLinks as $a) {
 
-                // Make a MediaLink for every other Avatar
-                $avatar = new ActivityStreamsMediaLink(
-                    $a->url,
-                    $a->width,
-                    $a->height,
-                    $a->type,
-                    'avatar'
-                );
+                    // Make a MediaLink for every other Avatar
+                    $avatar = new ActivityStreamsMediaLink(
+                        $a->url,
+                        $a->width,
+                        $a->height,
+                        $a->type,
+                        'avatar'
+                    );
 
-                // Find the big avatar to use as the "image"
-                if ($a->height == AVATAR_PROFILE_SIZE) {
-                    $imgLink = $avatar;
+                    // Find the big avatar to use as the "image"
+                    if ($a->height == AVATAR_PROFILE_SIZE) {
+                        $imgLink = $avatar;
+                    }
+
+                    $avatarMediaLinks[] = $avatar->asArray();
                 }
 
-                $avatarMediaLinks[] = $avatar->asArray();
+                $object['avatarLinks'] = $avatarMediaLinks; // extension
+
+                // image
+                $object['image']  = $imgLink->asArray();
             }
 
-            $object['avatarLinks'] = $avatarMediaLinks; // extension
+            // objectType
+            //
+            // 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);
 
-            // image
-            $object['image']  = $imgLink->asArray();
+            // summary
+            $object['summary'] = $this->summary;
+
+            // TODO: upstreamDuplicates
+
+            // url (XXX: need to put the right thing here...)
+            $object['url'] = $this->id;
+
+            /* Extensions */
+            // @fixme these may collide with XML extensions
+            // @fixme multiple tags of same name will overwrite each other
+            // @fixme text content from XML extensions will be lost
+            foreach ($this->extra as $e) {
+                list($objectName, $props, $txt) = $e;
+                $object[$objectName] = $props;
+            }
+
+            // GeoJSON
+
+            if (!empty($this->geopoint)) {
+
+                list($lat, $long) = explode(' ', $this->geopoint);
+
+                $object['geopoint'] = array(
+                    'type'        => 'Point',
+                    'coordinates' => array($lat, $long)
+                );
+            }
+
+            if (!empty($this->poco)) {
+                $object['contact'] = $this->poco->asArray();
+            }
+            Event::handle('EndActivityObjectOutputJson', array($this, &$object));
         }
-
-        // objectType
-        //
-        // 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);
-
-        // summary
-        $object['summary'] = $this->summary;
-
-        // TODO: upstreamDuplicates
-
-        // url (XXX: need to put the right thing here...)
-        $object['url'] = $this->id;
-
-        /* Extensions */
-        // @fixme these may collide with XML extensions
-        // @fixme multiple tags of same name will overwrite each other
-        // @fixme text content from XML extensions will be lost
-        foreach ($this->extra as $e) {
-            list($objectName, $props, $txt) = $e;
-            $object[$objectName] = $props;
-        }
-
-        // GeoJSON
-
-        if (!empty($this->geopoint)) {
-
-            list($lat, $long) = explode(' ', $this->geopoint);
-
-            $object['geopoint'] = array(
-                'type'        => 'Point',
-                'coordinates' => array($lat, $long)
-            );
-        }
-
-        if (!empty($this->poco)) {
-            $object['contact'] = $this->poco->asArray();
-        }
-
         return array_filter($object);
     }
 }
diff --git a/lib/microappplugin.php b/lib/microappplugin.php
index fbead58cc5..86803b8ae3 100644
--- a/lib/microappplugin.php
+++ b/lib/microappplugin.php
@@ -212,6 +212,44 @@ abstract class MicroAppPlugin extends Plugin
                 in_array($activity->objects[0]->type, $types));
     }
 
+    /**
+     * Called when generating Atom XML ActivityStreams output from an
+     * ActivityObject belonging to this plugin. Gives the plugin
+     * a chance to add custom output.
+     *
+     * Note that you can only add output of additional XML elements,
+     * not change existing stuff here.
+     *
+     * If output is already handled by the base Activity classes,
+     * you can leave this base implementation as a no-op.
+     *
+     * @param ActivityObject $obj
+     * @param XMLOutputter $out to add elements at end of object
+     */
+    function activityObjectOutputAtom(ActivityObject $obj, XMLOutputter $out)
+    {
+        // default is a no-op
+    }
+
+    /**
+     * Called when generating JSON ActivityStreams output from an
+     * ActivityObject belonging to this plugin. Gives the plugin
+     * a chance to add custom output.
+     *
+     * Modify the array contents to your heart's content, and it'll
+     * all get serialized out as JSON.
+     *
+     * If output is already handled by the base Activity classes,
+     * you can leave this base implementation as a no-op.
+     *
+     * @param ActivityObject $obj
+     * @param array &$out JSON-targeted array which can be modified
+     */
+    public function activityObjectOutputJson(ActivityObject $obj, array &$out)
+    {
+        // default is a no-op
+    }
+
     /**
      * When a notice is deleted, delete the related objects
      * by calling the overridable $this->deleteRelated().
@@ -439,6 +477,46 @@ abstract class MicroAppPlugin extends Plugin
         return true;
     }
 
+    /**
+     * Event handler gives the plugin a chance to add custom
+     * Atom XML ActivityStreams output from a previously filled-out
+     * ActivityObject.
+     *
+     * The atomOutput method is called if it's one of
+     * our matching types.
+     *
+     * @param ActivityObject $obj
+     * @param XMLOutputter $out to add elements at end of object
+     * @return boolean hook return value
+     */
+    function onEndActivityObjectOutputAtom(ActivityObject $obj, XMLOutputter $out)
+    {
+        if (in_array($obj->type, $this->types())) {
+            $this->activityObjectOutputAtom($obj, $out);
+        }
+        return true;
+    }
+
+    /**
+     * Event handler gives the plugin a chance to add custom
+     * JSON ActivityStreams output from a previously filled-out
+     * ActivityObject.
+     *
+     * The activityObjectOutputJson method is called if it's one of
+     * our matching types.
+     *
+     * @param ActivityObject $obj
+     * @param array &$out JSON-targeted array which can be modified
+     * @return boolean hook return value
+     */
+    function onEndActivityObjectOutputJson(ActivityObject $obj, array &$out)
+    {
+        if (in_array($obj->type, $this->types())) {
+            $this->activityObjectOutputJson($obj, &$out);
+        }
+        return true;
+    }
+
     function onStartShowEntryForms(&$tabs)
     {
         $tabs[$this->tag()] = $this->appTitle();

From a9d589dbdcd19169a6e1900bf578fba6c5c5ec4e Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Fri, 11 Mar 2011 12:28:15 -0800
Subject: [PATCH 539/655] Poll plugin: switching Atom & JSON output to use new
 hooks & methods, much nicer output. Also switched types, which may break old
 entries. Beware! Input not yet updated.

---
 plugins/Poll/PollPlugin.php | 171 +++++++++++++++++++++++-------------
 1 file changed, 112 insertions(+), 59 deletions(-)

diff --git a/plugins/Poll/PollPlugin.php b/plugins/Poll/PollPlugin.php
index 34c37eb526..78357457a6 100644
--- a/plugins/Poll/PollPlugin.php
+++ b/plugins/Poll/PollPlugin.php
@@ -48,8 +48,8 @@ class PollPlugin extends MicroAppPlugin
     const VERSION         = '0.1';
 
     // @fixme which domain should we use for these namespaces?
-    const POLL_OBJECT          = 'http://apinamespace.org/activitystreams/object/poll';
-    const POLL_RESPONSE_OBJECT = 'http://apinamespace.org/activitystreams/object/poll-response';
+    const POLL_OBJECT          = 'http://activityschema.org/object/poll';
+    const POLL_RESPONSE_OBJECT = 'http://activityschema.org/object/poll-response';
 
     /**
      * Database schema setup
@@ -277,33 +277,15 @@ class PollPlugin extends MicroAppPlugin
         $object->link    = $notice->bestUrl();
 
         $response = Poll_response::getByNotice($notice);
-        if (!$response) {
-            common_log(LOG_DEBUG, "QQQ notice uri: $notice->uri");
-        } else {
+        if ($response) {
             $poll = $response->getPoll();
-            /**
-             * For the moment, using a kind of icky-looking schema that happens to
-             * work with out code for generating both Atom and JSON forms, though
-             * I don't like it:
-             *
-             * <poll:response xmlns:poll="http://apinamespace.org/activitystreams/object/poll"
-             *                poll="http://..../poll/...."
-             *                selection="3" />
-             *
-             * "poll:response": {
-             *     "xmlns:poll": http://apinamespace.org/activitystreams/object/poll
-             *     "uri": "http://..../poll/...."
-             *     "selection": 3
-             * }
-             *
-             */
-            // @fixme there's no way to specify an XML node tree here, like <poll><option/><option/></poll>
-            // @fixme there's no way to specify a JSON array or multi-level tree unless you break the XML attribs
-            // @fixme XML node contents don't get shown in JSON
-            $data = array('xmlns:poll' => self::POLL_OBJECT,
-                          'poll'       => $poll->uri,
-                          'selection'  => intval($response->selection));
-            $object->extra[] = array('poll:response', $data, '');
+            if ($poll) {
+                // Stash data to be formatted later by
+                // $this->activityObjectOutputAtom() or
+                // $this->activityObjectOutputJson()...
+                $object->pollSelection = intval($response->selection);
+                $object->pollUri = $poll->uri;
+            }
         }
         return $object;
     }
@@ -318,41 +300,112 @@ class PollPlugin extends MicroAppPlugin
         $object->link    = $notice->bestUrl();
 
         $poll = Poll::getByNotice($notice);
-        /**
-         * Adding the poll-specific data. There's no standard in AS for polls,
-         * so we're making stuff up.
-         *
-         * For the moment, using a kind of icky-looking schema that happens to
-         * work with out code for generating both Atom and JSON forms, though
-         * I don't like it:
-         *
-         * <poll:data xmlns:poll="http://apinamespace.org/activitystreams/object/poll"
-         *            question="Who wants a poll question?"
-         *            option1="Option one"
-         *            option2="Option two"
-         *            option3="Option three"></poll:data>
-         *
-         * "poll:response": {
-         *     "xmlns:poll": http://apinamespace.org/activitystreams/object/poll
-         *     "question": "Who wants a poll question?"
-         *     "option1": "Option one"
-         *     "option2": "Option two"
-         *     "option3": "Option three"
-         * }
-         *
-         */
-        // @fixme there's no way to specify an XML node tree here, like <poll><option/><option/></poll>
-        // @fixme there's no way to specify a JSON array or multi-level tree unless you break the XML attribs
-        // @fixme XML node contents don't get shown in JSON
-        $data = array('xmlns:poll' => self::POLL_OBJECT,
-                      'question'   => $poll->question);
-        foreach ($poll->getOptions() as $i => $opt) {
-            $data['option' . ($i + 1)] = $opt;
+        if ($poll) {
+            // Stash data to be formatted later by
+            // $this->activityObjectOutputAtom() or
+            // $this->activityObjectOutputJson()...
+            $object->pollQuestion = $poll->question;
+            $object->pollOptions = $poll->getOptions();
         }
-        $object->extra[] = array('poll:poll', $data, '');
+
         return $object;
     }
 
+    /**
+     * Called when generating Atom XML ActivityStreams output from an
+     * ActivityObject belonging to this plugin. Gives the plugin
+     * a chance to add custom output.
+     *
+     * Note that you can only add output of additional XML elements,
+     * not change existing stuff here.
+     *
+     * If output is already handled by the base Activity classes,
+     * you can leave this base implementation as a no-op.
+     *
+     * @param ActivityObject $obj
+     * @param XMLOutputter $out to add elements at end of object
+     */
+    function activityObjectOutputAtom(ActivityObject $obj, XMLOutputter $out)
+    {
+        if (isset($obj->pollQuestion)) {
+            /**
+             * <poll:poll xmlns:poll="http://apinamespace.org/activitystreams/object/poll">
+             *   <poll:question>Who wants a poll question?</poll:question>
+             *   <poll:option>Option one</poll:option>
+             *   <poll:option>Option two</poll:option>
+             *   <poll:option>Option three</poll:option>
+             * </poll:poll>
+             */
+            $data = array('xmlns:poll' => self::POLL_OBJECT);
+            $out->elementStart('poll:poll', $data);
+            $out->element('poll:question', array(), $obj->pollQuestion);
+            foreach ($obj->pollOptions as $opt) {
+                $out->element('poll:option', array(), $opt);
+            }
+            $out->elementEnd('poll:poll');
+        }
+        if (isset($obj->pollSelection)) {
+            /**
+             * <poll:response xmlns:poll="http://apinamespace.org/activitystreams/object/poll">
+             *                poll="http://..../poll/...."
+             *                selection="3" />
+             */
+            $data = array('xmlns:poll' => self::POLL_OBJECT,
+                          'poll'       => $obj->pollUri,
+                          'selection'  => $obj->pollSelection);
+            $out->element('poll:response', $data, '');
+        }
+    }
+
+    /**
+     * Called when generating JSON ActivityStreams output from an
+     * ActivityObject belonging to this plugin. Gives the plugin
+     * a chance to add custom output.
+     *
+     * Modify the array contents to your heart's content, and it'll
+     * all get serialized out as JSON.
+     *
+     * If output is already handled by the base Activity classes,
+     * you can leave this base implementation as a no-op.
+     *
+     * @param ActivityObject $obj
+     * @param array &$out JSON-targeted array which can be modified
+     */
+    public function activityObjectOutputJson(ActivityObject $obj, array &$out)
+    {
+        common_log(LOG_DEBUG, 'QQQ: ' . var_export($obj, true));
+        if (isset($obj->pollQuestion)) {
+            /**
+             * "poll": {
+             *   "question": "Who wants a poll question?",
+             *   "options": [
+             *     "Option 1",
+             *     "Option 2",
+             *     "Option 3"
+             *   ]
+             * }
+             */
+            $data = array('question' => $obj->pollQuestion,
+                          'options' => array());
+            foreach ($obj->pollOptions as $opt) {
+                $data['options'][] = $opt;
+            }
+            $out['poll'] = $data;
+        }
+        if (isset($obj->pollSelection)) {
+            /**
+             * "pollResponse": {
+             *   "poll": "http://..../poll/....",
+             *   "selection": 3
+             * }
+             */
+            $data = array('poll'       => $obj->pollUri,
+                          'selection'  => $obj->pollSelection);
+            $out['pollResponse'] = $data;
+        }
+    }
+
+
     /**
      * @fixme WARNING WARNING WARNING parent class closes the final div that we
      * open here, but we probably shouldn't open it here. Check parent class

From e1136bacaec721c08b830f52e80069f89b7a45e2 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Fri, 11 Mar 2011 12:41:11 -0800
Subject: [PATCH 540/655] Update PollPlugin Atom input

---
 plugins/Poll/PollPlugin.php | 28 ++++++++++++----------------
 1 file changed, 12 insertions(+), 16 deletions(-)

diff --git a/plugins/Poll/PollPlugin.php b/plugins/Poll/PollPlugin.php
index 78357457a6..490f39005f 100644
--- a/plugins/Poll/PollPlugin.php
+++ b/plugins/Poll/PollPlugin.php
@@ -203,26 +203,22 @@ class PollPlugin extends MicroAppPlugin
             $pollElements = $activity->entry->getElementsByTagNameNS(self::POLL_OBJECT, 'poll');
             $responseElements = $activity->entry->getElementsByTagNameNS(self::POLL_OBJECT, 'response');
             if ($pollElements->length) {
-                $data = $pollElements->item(0);
-                $question = $data->getAttribute('question');
+                $question = '';
                 $opts = array();
-                foreach ($data->attributes as $node) {
-                    $name = $node->nodeName;
-                    if (substr($name, 0, 6) == 'option') {
-                        $n = intval(substr($name, 6));
-                        if ($n > 0) {
-                            $opts[$n - 1] = $node->nodeValue;
-                        }
-                    }
+
+                $data = $pollElements->item(0);
+                foreach ($data->getElementsByTagNameNS(self::POLL_OBJECT, 'question') as $node) {
+                    $question = $node->textValue; // ?
+                }
+                foreach ($data->getElementsByTagNameNS(self::POLL_OBJECT, 'option') as $node) {
+                    $opts[] = $node->textValue;
                 }
-                common_log(LOG_DEBUG, "YYY question: $question");
-                common_log(LOG_DEBUG, "YYY opts: " . var_export($opts, true));
                 try {
                     $notice = Poll::saveNew($profile, $question, $opts, $options);
-                    common_log(LOG_DEBUG, "YYY ok: " . $notice->id);
+                    common_log(LOG_DEBUG, "Saved Poll from ActivityStream data ok: notice id " . $notice->id);
                     return $notice;
                 } catch (Exception $e) {
-                    common_log(LOG_DEBUG, "YYY fail: " . $e->getMessage());
+                    common_log(LOG_DEBUG, "Poll save from ActivityStream data failed: " . $e->getMessage());
                 }
             } else if ($responseElements->length) {
                 $data = $responseElements->item(0);
@@ -240,10 +236,10 @@ class PollPlugin extends MicroAppPlugin
                 }
                 try {
                     $notice = Poll_response::saveNew($profile, $poll, $selection, $options);
-                    common_log(LOG_DEBUG, "YYY response ok: " . $notice->id);
+                    common_log(LOG_DEBUG, "Saved Poll_response ok, notice id: " . $notice->id);
                     return $notice;
                 } catch (Exception $e) {
-                    common_log(LOG_DEBUG, "YYY response fail: " . $e->getMessage());
+                    common_log(LOG_DEBUG, "Poll response  save fail: " . $e->getMessage());
                 }
             } else {
                 common_log(LOG_DEBUG, "YYY no poll data");

From d5f5f769479e6e97d23875eb0705bd5cda1a0c1b Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Fri, 11 Mar 2011 12:45:55 -0800
Subject: [PATCH 541/655] durrrr s/textValue/textContent/

---
 plugins/Poll/PollPlugin.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/Poll/PollPlugin.php b/plugins/Poll/PollPlugin.php
index 490f39005f..ea6ab9ecd9 100644
--- a/plugins/Poll/PollPlugin.php
+++ b/plugins/Poll/PollPlugin.php
@@ -208,10 +208,10 @@ class PollPlugin extends MicroAppPlugin
 
                 $data = $pollElements->item(0);
                 foreach ($data->getElementsByTagNameNS(self::POLL_OBJECT, 'question') as $node) {
-                    $question = $node->textValue; // ?
+                    $question = $node->textContent;
                 }
                 foreach ($data->getElementsByTagNameNS(self::POLL_OBJECT, 'option') as $node) {
-                    $opts[] = $node->textValue;
+                    $opts[] = $node->textContent;
                 }
                 try {
                     $notice = Poll::saveNew($profile, $question, $opts, $options);

From d393ac4bbbee1c4021cb928ea16781a294978242 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Fri, 11 Mar 2011 14:08:48 -0800
Subject: [PATCH 542/655] remove stray close div from empty search results doc
 bits

---
 lib/searchaction.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/lib/searchaction.php b/lib/searchaction.php
index 73c287eef3..7038424fab 100644
--- a/lib/searchaction.php
+++ b/lib/searchaction.php
@@ -168,7 +168,5 @@ E_O_T
         $this->elementStart('div', 'help instructions');
         $this->raw(common_markup_to_html($message));
         $this->elementEnd('div');
-
-        $this->elementEnd('div');
     }
 }

From 717fed785efca5f589a293a045907264cb1bc67e Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Fri, 11 Mar 2011 14:25:57 -0800
Subject: [PATCH 543/655] Update PersonalGroupNav with fixed highlighting
 checks.

Couldn't use Menu::item() as its checks are only for the action name, so would have highlighted stuff for other users though it always links to self.
---
 lib/personalgroupnav.php | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/lib/personalgroupnav.php b/lib/personalgroupnav.php
index 3d6bb98fc0..2e15ca5f6a 100644
--- a/lib/personalgroupnav.php
+++ b/lib/personalgroupnav.php
@@ -63,6 +63,9 @@ class PersonalGroupNav extends Menu
         $nickname     = $user->nickname;
         $name         = $user_profile->getBestName();
 
+        $action = $this->actionName;
+        $mine = ($this->action->arg('nickname') == $nickname); // @fixme kinda vague
+
         $this->out->elementStart('ul', array('class' => 'nav'));
 
         if (Event::handle('StartPersonalGroupNav', array($this))) {
@@ -70,23 +73,23 @@ class PersonalGroupNav extends Menu
                                                                $nickname)),
                                  _('Home'),
                                  sprintf(_('%s and friends'), $name),
-                                 $this->action == 'all', 'nav_timeline_personal');
+                                 $mine && $action =='all', 'nav_timeline_personal');
             $this->out->menuItem(common_local_url('showstream', array('nickname' =>
                                                                       $nickname)),
                                  _('Profile'),
                                  _('Your profile'),
-                                 $this->action == 'showstream',
+                                 $mine && $action =='showstream',
                                  'nav_profile');
             $this->out->menuItem(common_local_url('replies', array('nickname' =>
                                                                    $nickname)),
                                  _('Replies'),
                                  sprintf(_('Replies to %s'), $name),
-                                 $this->action == 'replies', 'nav_timeline_replies');
+                                 $mine && $action =='replies', 'nav_timeline_replies');
             $this->out->menuItem(common_local_url('showfavorites', array('nickname' =>
                                                                          $nickname)),
                                  _('Favorites'),
                                  sprintf(_('%s\'s favorite notices'), ($user_profile) ? $name : _('User')),
-                                 $this->action == 'showfavorites', 'nav_timeline_favorites');
+                                 $mine && $action =='showfavorites', 'nav_timeline_favorites');
 
             $cur = common_current_user();
 
@@ -97,7 +100,7 @@ class PersonalGroupNav extends Menu
                                                                      $nickname)),
                                      _('Messages'),
                                      _('Your incoming messages'),
-                                     $this->action == 'inbox');
+                                     $mine && $action =='inbox');
             }
 
             Event::handle('EndPersonalGroupNav', array($this));

From 4e2a0e2fd0e3717541ed76e59631a0f4814eb311 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Fri, 11 Mar 2011 14:48:47 -0800
Subject: [PATCH 544/655] Use non-minified jQuery when
 $config['site']['minify'] is off; aids in debugging when something fails deep
 in jQuery-land.

---
 lib/action.php | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/lib/action.php b/lib/action.php
index b1f16f5f16..233ac78567 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -293,11 +293,19 @@ class Action extends HTMLOutputter // lawsuit
     {
         if (Event::handle('StartShowScripts', array($this))) {
             if (Event::handle('StartShowJQueryScripts', array($this))) {
-                $this->script('jquery.min.js');
-                $this->script('jquery.form.min.js');
-                $this->script('jquery.cookie.min.js');
-                $this->inlineScript('if (typeof window.JSON !== "object") { $.getScript("'.common_path('js/json2.min.js').'"); }');
-                $this->script('jquery.joverlay.min.js');
+                if (common_config('site', 'minify')) {
+                    $this->script('jquery.min.js');
+                    $this->script('jquery.form.min.js');
+                    $this->script('jquery.cookie.min.js');
+                    $this->inlineScript('if (typeof window.JSON !== "object") { $.getScript("'.common_path('js/json2.min.js').'"); }');
+                    $this->script('jquery.joverlay.min.js');
+                } else {
+                    $this->script('jquery.js');
+                    $this->script('jquery.form.js');
+                    $this->script('jquery.cookie.js');
+                    $this->inlineScript('if (typeof window.JSON !== "object") { $.getScript("'.common_path('js/json2.js').'"); }');
+                    $this->script('jquery.joverlay.js');
+                }
                 Event::handle('EndShowJQueryScripts', array($this));
             }
             if (Event::handle('StartShowStatusNetScripts', array($this)) &&

From 10e5cb482e8eefdc3dcbe5aa1983df336524c02d Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Fri, 11 Mar 2011 15:03:15 -0800
Subject: [PATCH 545/655] JS performance: speeding up initialization by
 consolidating event handlers for reply buttons

Saved about 60ms on my test system during page setup by using a single global 'live' click handler for reply links.
No longer need to seek out and attach event handlers on every notice, yay!
---
 js/util.js | 31 +++++++++----------------------
 1 file changed, 9 insertions(+), 22 deletions(-)

diff --git a/js/util.js b/js/util.js
index a244f1ecfb..d0d23d464d 100644
--- a/js/util.js
+++ b/js/util.js
@@ -423,7 +423,6 @@ var SN = { // StatusNet
                                         .css({display:'none'})
                                         .fadeIn(2500);
                                     SN.U.NoticeWithAttachment($('#'+notice.id));
-                                    SN.U.NoticeReplyTo($('#'+notice.id));
                                     SN.U.switchInputFormTab("placeholder");
                                 }
                             } else {
@@ -516,34 +515,22 @@ var SN = { // StatusNet
          * @access private
          */
         NoticeReply: function() {
-            if ($('#content .notice_reply').length > 0) {
-                $('#content .notice').each(function() { SN.U.NoticeReplyTo($(this)); });
-            }
-        },
-
-        /**
-         * Setup function -- DOES NOT trigger actions immediately.
-         *
-         * Sets up event handlers on the given notice's reply button to
-         * tweak the new-notice form with needed variables and focus it
-         * when pushed.
-         *
-         * (This replaces the default reply button behavior to submit
-         * directly to a form which comes back with a specialized page
-         * with the form data prefilled.)
-         *
-         * @param {jQuery} notice: jQuery object containing one or more notices
-         * @access private
-         */
-        NoticeReplyTo: function(notice) {
-            notice.find('.notice_reply').live('click', function(e) {
+            $('#content .notice_reply').live('click', function(e) {
                 e.preventDefault();
+                var notice = $(this).closest('li.notice');
                 var nickname = ($('.author .nickname', notice).length > 0) ? $($('.author .nickname', notice)[0]) : $('.author .nickname.uid');
                 SN.U.NoticeInlineReplyTrigger(notice, '@' + nickname.text());
                 return false;
             });
         },
 
+        /**
+         * Stub -- kept for compat with plugins for now.
+         * @access private
+         */
+        NoticeReplyTo: function(notice) {
+        },
+
         /**
          * Open up a notice's inline reply box.
          *

From 2bccd18d9a4f1ed2b74b854a7c1cffc707f961af Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Fri, 11 Mar 2011 15:20:20 -0800
Subject: [PATCH 546/655] JS optimization: move creation of inline reply
 placeholders to server-side so we don't have to create them client-side
 (which causes reflows and takes about 25-30ms on my test system) Using live
 instead of bind for the event handling, we don't have to play any games on
 the ones that we do add at runtime. Yay!

---
 js/util.js                 | 19 +++++------
 lib/threadednoticelist.php | 67 +++++++++++++++++++++++++++-----------
 2 files changed, 56 insertions(+), 30 deletions(-)

diff --git a/js/util.js b/js/util.js
index d0d23d464d..966df4d93f 100644
--- a/js/util.js
+++ b/js/util.js
@@ -627,26 +627,23 @@ var SN = { // StatusNet
                                     '<input class="placeholder">' +
                                 '</li>');
             placeholder.find('input')
-                .val(SN.msg('reply_placeholder'))
-                .focus(function() {
-                    SN.U.NoticeInlineReplyTrigger(notice);
-                    return false;
-                });
+                .val(SN.msg('reply_placeholder'));
             list.append(placeholder);
         },
 
         /**
          * Setup function -- DOES NOT apply immediately.
          *
-         * Sets up event handlers for favor/disfavor forms to submit via XHR.
+         * Sets up event handlers for inline reply mini-form placeholders.
          * Uses 'live' rather than 'bind', so applies to future as well as present items.
          */
         NoticeInlineReplySetup: function() {
-            $('.threaded-replies').each(function() {
-                var list = $(this);
-                var notice = list.closest('.notice');
-                SN.U.NoticeInlineReplyPlaceholder(notice);
-            });
+            $('li.notice-reply-placeholder input')
+                .live('focus', function() {
+                    var notice = $(this).closest('li.notice');
+                    SN.U.NoticeInlineReplyTrigger(notice);
+                    return false;
+                });
         },
 
         /**
diff --git a/lib/threadednoticelist.php b/lib/threadednoticelist.php
index 867ce28ed6..919c912831 100644
--- a/lib/threadednoticelist.php
+++ b/lib/threadednoticelist.php
@@ -191,6 +191,12 @@ class ThreadedNoticeListItem extends NoticeListItem
                     $item = new ThreadedNoticeListSubItem($notice, $this->out);
                     $item->show();
                 }
+                // @fixme do a proper can-post check that's consistent
+                // with the JS side
+                if (common_current_user()) {
+                    $item = new ThreadedNoticeListReplyItem($notice, $this->out);
+                    $item->show();
+                }
                 $this->out->elementEnd('ul');
             }
         }
@@ -253,10 +259,7 @@ class ThreadedNoticeListMoreItem extends NoticeListItem
 
     function showStart()
     {
-        if (Event::handle('StartOpenNoticeListItemElement', array($this))) {
-            $id = (empty($this->repeat)) ? $this->notice->id : $this->repeat->id;
-            $this->out->elementStart('li', array('class' => 'notice-reply-comments'));
-        }
+        $this->out->elementStart('li', array('class' => 'notice-reply-comments'));
     }
 
     function showMiniForm()
@@ -270,21 +273,47 @@ class ThreadedNoticeListMoreItem extends NoticeListItem
         $msg = sprintf(_m('Show %d reply', 'Show all %d replies', $n), $n);
 
         $this->out->element('a', array('href' => $url), $msg);
+    }
+}
 
-        // @fixme replace this with an ajax-friendly form pair?
-        /*
-        $this->out->elementStart('form',
-                                 array('id' => $id,
-                                       'class' => 'replyform',
-                                       'method' => 'post',
-                                       'action' => $url));
-        $this->out->hidden('token', common_session_token());
-        $this->out->hidden("$id-inreplyto", $replyToId, "inreplyto");
-        $this->out->element('textarea', array('name' => 'status_textarea'));
-        $this->out->elementStart('div', array('class' => 'controls'));
-        $this->out->submit("$id-submit", _m('Send reply'));
-        $this->out->elementEnd('div');
-        $this->out->elementEnd('form');
-         */
+
+/**
+ * Placeholder for reply form...
+ * Same as get added at runtime via SN.U.NoticeInlineReplyPlaceholder
+ */
+class ThreadedNoticeListReplyItem extends NoticeListItem
+{
+
+    /**
+     * recipe function for displaying a single notice.
+     *
+     * This uses all the other methods to correctly display a notice. Override
+     * it or one of the others to fine-tune the output.
+     *
+     * @return void
+     */
+
+    function show()
+    {
+        $this->showStart();
+        $this->showMiniForm();
+        $this->showEnd();
+    }
+
+    /**
+     * start a single notice.
+     *
+     * @return void
+     */
+
+    function showStart()
+    {
+        $this->out->elementStart('li', array('class' => 'notice-reply-placeholder'));
+    }
+
+    function showMiniForm()
+    {
+        $this->out->element('input', array('class' => 'placeholder',
+                                           'value' => _('Write a reply...')));
     }
 }
\ No newline at end of file

From 096f99be1615ff3a6ac4a8ae3b9f283f4aad36ad Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Fri, 11 Mar 2011 15:31:58 -0800
Subject: [PATCH 547/655] (update util.min.js for recent changes)

---
 js/util.min.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/util.min.js b/js/util.min.js
index efe3736e3e..26ae7494cb 100644
--- a/js/util.min.js
+++ b/js/util.min.js
@@ -1 +1 @@
-var SN={C:{I:{CounterBlackout:false,MaxLength:140,PatternUsername:/^[0-9a-zA-Z\-_.]*$/,HTTP20x30x:[200,201,202,203,204,205,206,300,301,302,303,304,305,306,307],NoticeFormMaster:null},S:{Disabled:"disabled",Warning:"warning",Error:"error",Success:"success",Processing:"processing",CommandResult:"command_result",FormNotice:"form_notice",NoticeDataGeo:"notice_data-geo",NoticeDataGeoCookie:"NoticeDataGeo",NoticeDataGeoSelected:"notice_data-geo_selected",StatusNetInstance:"StatusNetInstance"}},messages:{},msg:function(a){if(typeof SN.messages[a]=="undefined"){return"["+a+"]"}else{return SN.messages[a]}},U:{FormNoticeEnhancements:function(b){if(jQuery.data(b[0],"ElementData")===undefined){MaxLength=b.find(".count").text();if(typeof(MaxLength)=="undefined"){MaxLength=SN.C.I.MaxLength}jQuery.data(b[0],"ElementData",{MaxLength:MaxLength});SN.U.Counter(b);NDT=b.find(".notice_data-text:first");NDT.bind("keyup",function(c){SN.U.Counter(b)});var a=function(c){window.setTimeout(function(){SN.U.Counter(b)},50)};NDT.bind("cut",a).bind("paste",a)}else{b.find(".count").text(jQuery.data(b[0],"ElementData").MaxLength)}},Counter:function(d){SN.C.I.FormNoticeCurrent=d;var b=jQuery.data(d[0],"ElementData").MaxLength;if(b<=0){return}var c=b-SN.U.CharacterCount(d);var a=d.find(".count");if(c.toString()!=a.text()){if(!SN.C.I.CounterBlackout||c===0){if(a.text()!=String(c)){a.text(c)}if(c<0){d.addClass(SN.C.S.Warning)}else{d.removeClass(SN.C.S.Warning)}if(!SN.C.I.CounterBlackout){SN.C.I.CounterBlackout=true;SN.C.I.FormNoticeCurrent=d;window.setTimeout("SN.U.ClearCounterBlackout(SN.C.I.FormNoticeCurrent);",500)}}}},CharacterCount:function(a){return a.find(".notice_data-text:first").val().length},ClearCounterBlackout:function(a){SN.C.I.CounterBlackout=false;SN.U.Counter(a)},RewriteAjaxAction:function(a){if(document.location.protocol=="https:"&&a.substr(0,5)=="http:"){return a.replace(/^http:\/\/[^:\/]+/,"https://"+document.location.host)}else{return a}},FormXHR:function(a){$.ajax({type:"POST",dataType:"xml",url:SN.U.RewriteAjaxAction(a.attr("action")),data:a.serialize()+"&ajax=1",beforeSend:function(b){a.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(c,d,b){alert(b||d)},success:function(b,c){if(typeof($("form",b)[0])!="undefined"){form_new=document._importNode($("form",b)[0],true);a.replaceWith(form_new)}else{a.replaceWith(document._importNode($("p",b)[0],true))}}})},FormNoticeXHR:function(b){SN.C.I.NoticeDataGeo={};b.append('<input type="hidden" name="ajax" value="1"/>');b.attr("action",SN.U.RewriteAjaxAction(b.attr("action")));var c=function(d,e){b.append($('<p class="form_response"></p>').addClass(d).text(e))};var a=function(){b.find(".form_response").remove()};b.ajaxForm({dataType:"xml",timeout:"60000",beforeSend:function(d){if(b.find(".notice_data-text:first").val()==""){b.addClass(SN.C.S.Warning);return false}b.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled);SN.U.normalizeGeoData(b);return true},error:function(f,g,e){b.removeClass(SN.C.S.Processing).find(".submit").removeClass(SN.C.S.Disabled).removeAttr(SN.C.S.Disabled,SN.C.S.Disabled);a();if(g=="timeout"){c("error","Sorry! We had trouble sending your notice. The servers are overloaded. Please try again, and contact the site administrator if this problem persists.")}else{var d=SN.U.GetResponseXML(f);if($("."+SN.C.S.Error,d).length>0){b.append(document._importNode($("."+SN.C.S.Error,d)[0],true))}else{if(parseInt(f.status)===0||jQuery.inArray(parseInt(f.status),SN.C.I.HTTP20x30x)>=0){b.resetForm().find(".attach-status").remove();SN.U.FormNoticeEnhancements(b)}else{c("error","(Sorry! We had trouble sending your notice ("+f.status+" "+f.statusText+"). Please report the problem to the site administrator if this happens again.")}}}},success:function(i,f){a();var n=$("#"+SN.C.S.Error,i);if(n.length>0){c("error",n.text())}else{if($("body")[0].id=="bookmarklet"){self.close()}var d=$("#"+SN.C.S.CommandResult,i);if(d.length>0){c("success",d.text())}else{var m=document._importNode($("li",i)[0],true);var k=$("#notices_primary .notices:first");var l=b.closest("li.notice-reply");if(l.length>0){var e=$(m).attr("id");if($("#"+e).length==0){var j=l.closest("li.notice");l.replaceWith(m);SN.U.NoticeInlineReplyPlaceholder(j)}else{l.remove()}}else{if(k.length>0&&SN.U.belongsOnTimeline(m)){if($("#"+m.id).length===0){var h=b.find("[name=inreplyto]").val();var g="#notices_primary #notice-"+h;if($("body")[0].id=="conversation"){if(h.length>0&&$(g+" .notices").length<1){$(g).append('<ul class="notices"></ul>')}$($(g+" .notices")[0]).append(m)}else{k.prepend(m)}$("#"+m.id).css({display:"none"}).fadeIn(2500);SN.U.NoticeWithAttachment($("#"+m.id));SN.U.NoticeReplyTo($("#"+m.id));SN.U.switchInputFormTab("placeholder")}}else{c("success",$("title",i).text())}}}b.resetForm();b.find("[name=inreplyto]").val("");b.find(".attach-status").remove();SN.U.FormNoticeEnhancements(b)}},complete:function(d,e){b.removeClass(SN.C.S.Processing).find(".submit").removeAttr(SN.C.S.Disabled).removeClass(SN.C.S.Disabled);b.find("[name=lat]").val(SN.C.I.NoticeDataGeo.NLat);b.find("[name=lon]").val(SN.C.I.NoticeDataGeo.NLon);b.find("[name=location_ns]").val(SN.C.I.NoticeDataGeo.NLNS);b.find("[name=location_id]").val(SN.C.I.NoticeDataGeo.NLID);b.find("[name=notice_data-geo]").attr("checked",SN.C.I.NoticeDataGeo.NDG)}})},normalizeGeoData:function(a){SN.C.I.NoticeDataGeo.NLat=a.find("[name=lat]").val();SN.C.I.NoticeDataGeo.NLon=a.find("[name=lon]").val();SN.C.I.NoticeDataGeo.NLNS=a.find("[name=location_ns]").val();SN.C.I.NoticeDataGeo.NLID=a.find("[name=location_id]").val();SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked");var b=$.cookie(SN.C.S.NoticeDataGeoCookie);if(b!==null&&b!="disabled"){b=JSON.parse(b);SN.C.I.NoticeDataGeo.NLat=a.find("[name=lat]").val(b.NLat).val();SN.C.I.NoticeDataGeo.NLon=a.find("[name=lon]").val(b.NLon).val();if(b.NLNS){SN.C.I.NoticeDataGeo.NLNS=a.find("[name=location_ns]").val(b.NLNS).val();SN.C.I.NoticeDataGeo.NLID=a.find("[name=location_id]").val(b.NLID).val()}else{a.find("[name=location_ns]").val("");a.find("[name=location_id]").val("")}}if(b=="disabled"){SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked",false).attr("checked")}else{SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked",true).attr("checked")}},GetResponseXML:function(b){try{return b.responseXML}catch(a){return(new DOMParser()).parseFromString(b.responseText,"text/xml")}},NoticeReply:function(){if($("#content .notice_reply").length>0){$("#content .notice").each(function(){SN.U.NoticeReplyTo($(this))})}},NoticeReplyTo:function(a){a.find(".notice_reply").live("click",function(c){c.preventDefault();var b=($(".author .nickname",a).length>0)?$($(".author .nickname",a)[0]):$(".author .nickname.uid");SN.U.NoticeInlineReplyTrigger(a,"@"+b.text());return false})},NoticeInlineReplyTrigger:function(h,i){var b=$($(".notice_id",h)[0]).text();var e=h;var f=h.closest(".notices");if(f.hasClass("threaded-replies")){e=f.closest(".notice")}else{f=$("ul.threaded-replies",h);if(f.length==0){f=$('<ul class="notices threaded-replies xoxo"></ul>');h.append(f)}}var j=$(".notice-reply-form",f);var d=function(){j.find("input[name=inreplyto]").val(b);var m=j.find("textarea");if(m.length==0){throw"No textarea"}var l="";if(i){l=i+" "}m.val(l+m.val().replace(RegExp(l,"i"),""));m.data("initialText",$.trim(i+""));m.focus();if(m[0].setSelectionRange){var k=m.val().length;m[0].setSelectionRange(k,k)}};if(j.length>0){d()}else{f.find("li.notice-reply-placeholder").remove();var g=$("li.notice-reply",f);if(g.length==0){g=$('<li class="notice-reply"></li>');var c=function(k){var l=document._importNode(k,true);g.append(l);f.append(g);var m=j=$(l);SN.Init.NoticeFormSetup(m);d()};if(SN.C.I.NoticeFormMaster){c(SN.C.I.NoticeFormMaster)}else{var a=$("#form_notice").attr("action");$.get(a,{ajax:1},function(k,m,l){c($("form",k)[0])})}}}},NoticeInlineReplyPlaceholder:function(b){var a=b.find("ul.threaded-replies");var c=$('<li class="notice-reply-placeholder"><input class="placeholder"></li>');c.find("input").val(SN.msg("reply_placeholder")).focus(function(){SN.U.NoticeInlineReplyTrigger(b);return false});a.append(c)},NoticeInlineReplySetup:function(){$(".threaded-replies").each(function(){var b=$(this);var a=b.closest(".notice");SN.U.NoticeInlineReplyPlaceholder(a)})},NoticeRepeat:function(){$(".form_repeat").live("click",function(a){a.preventDefault();SN.U.NoticeRepeatConfirmation($(this));return false})},NoticeRepeatConfirmation:function(a){var c=a.find(".submit");var b=c.clone();b.addClass("submit_dialogbox").removeClass("submit");a.append(b);b.bind("click",function(){SN.U.FormXHR(a);return false});c.hide();a.addClass("dialogbox").append('<button class="close">&#215;</button>').closest(".notice-options").addClass("opaque");a.find("button.close").click(function(){$(this).remove();a.removeClass("dialogbox").closest(".notice-options").removeClass("opaque");a.find(".submit_dialogbox").remove();a.find(".submit").show();return false})},NoticeAttachments:function(){$(".notice a.attachment").each(function(){SN.U.NoticeWithAttachment($(this).closest(".notice"))})},NoticeWithAttachment:function(b){if(b.find(".attachment").length===0){return}var a=b.find(".attachment.more");if(a.length>0){$(a[0]).click(function(){var c=$(this);c.addClass(SN.C.S.Processing);$.get(c.attr("href")+"/ajax",null,function(d){c.parent(".entry-content").html($(d).find("#attachment_view .entry-content").html())});return false}).attr("title",SN.msg("showmore_tooltip"))}},NoticeDataAttach:function(b){var a=b.find("input[type=file]");a.change(function(f){b.find(".attach-status").remove();var d=$(this).val();if(!d){return false}var c=$('<div class="attach-status '+SN.C.S.Success+'"><code></code> <button class="close">&#215;</button></div>');c.find("code").text(d);c.find("button").click(function(){c.remove();a.val("");return false});b.append(c);if(typeof this.files=="object"){for(var e=0;e<this.files.length;e++){SN.U.PreviewAttach(b,this.files[e])}}})},maxFileSize:function(b){var a=$(b).find("input[name=MAX_FILE_SIZE]").attr("value");if(a){return parseInt(a)}else{return 0}},PreviewAttach:function(d,c){var e=c.type+" "+Math.round(c.size/1024)+"KB";var f=true;var h;if(typeof window.createObjectURL!="undefined"){h=function(i,j){j(window.createObjectURL(i))}}else{if(typeof window.FileReader!="undefined"){h=function(j,k){var i=new FileReader();i.onload=function(l){k(i.result)};i.readAsDataURL(j)}}else{f=false}}var a=["image/png","image/jpeg","image/gif","image/svg+xml"];if($.inArray(c.type,a)==-1){f=false}var g=8*1024*1024;if(c.size>g){f=false}if(f){h(c,function(j){var i=$("<img>").attr("title",e).attr("alt",e).attr("src",j).attr("style","height: 120px");d.find(".attach-status").append(i)})}else{var b=$("<div></div>").text(e);d.find(".attach-status").append(b)}},NoticeLocationAttach:function(a){var e=a.find("[name=lat]");var k=a.find("[name=lon]");var g=a.find("[name=location_ns]").val();var l=a.find("[name=location_id]").val();var b="";var d=a.find("[name=notice_data-geo]");var c=a.find("[name=notice_data-geo]");var j=a.find("label.notice_data-geo");function f(n){j.attr("title",jQuery.trim(j.text())).removeClass("checked");a.find("[name=lat]").val("");a.find("[name=lon]").val("");a.find("[name=location_ns]").val("");a.find("[name=location_id]").val("");a.find("[name=notice_data-geo]").attr("checked",false);$.cookie(SN.C.S.NoticeDataGeoCookie,"disabled",{path:"/"});if(n){a.find(".geo_status_wrapper").removeClass("success").addClass("error");a.find(".geo_status_wrapper .geo_status").text(n)}else{a.find(".geo_status_wrapper").remove()}}function m(n,o){SN.U.NoticeGeoStatus(a,"Looking up place name...");$.getJSON(n,o,function(p){var q,r;if(typeof(p.location_ns)!="undefined"){a.find("[name=location_ns]").val(p.location_ns);q=p.location_ns}if(typeof(p.location_id)!="undefined"){a.find("[name=location_id]").val(p.location_id);r=p.location_id}if(typeof(p.name)=="undefined"){NLN_text=o.lat+";"+o.lon}else{NLN_text=p.name}SN.U.NoticeGeoStatus(a,NLN_text,o.lat,o.lon,p.url);j.attr("title",NoticeDataGeo_text.ShareDisable+" ("+NLN_text+")");a.find("[name=lat]").val(o.lat);a.find("[name=lon]").val(o.lon);a.find("[name=location_ns]").val(q);a.find("[name=location_id]").val(r);a.find("[name=notice_data-geo]").attr("checked",true);var s={NLat:o.lat,NLon:o.lon,NLNS:q,NLID:r,NLN:NLN_text,NLNU:p.url,NDG:true};$.cookie(SN.C.S.NoticeDataGeoCookie,JSON.stringify(s),{path:"/"})})}if(c.length>0){if($.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){c.attr("checked",false)}else{c.attr("checked",true)}var h=a.find(".notice_data-geo_wrap");var i=h.attr("data-api");j.attr("title",j.text());c.change(function(){if(c.attr("checked")===true||$.cookie(SN.C.S.NoticeDataGeoCookie)===null){j.attr("title",NoticeDataGeo_text.ShareDisable).addClass("checked");if($.cookie(SN.C.S.NoticeDataGeoCookie)===null||$.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){if(navigator.geolocation){SN.U.NoticeGeoStatus(a,"Requesting location from browser...");navigator.geolocation.getCurrentPosition(function(p){a.find("[name=lat]").val(p.coords.latitude);a.find("[name=lon]").val(p.coords.longitude);var q={lat:p.coords.latitude,lon:p.coords.longitude,token:$("#token").val()};m(i,q)},function(p){switch(p.code){case p.PERMISSION_DENIED:f("Location permission denied.");break;case p.TIMEOUT:f("Location lookup timeout.");break}},{timeout:10000})}else{if(e.length>0&&k.length>0){var n={lat:e,lon:k,token:$("#token").val()};m(i,n)}else{f();c.remove();j.remove()}}}else{var o=JSON.parse($.cookie(SN.C.S.NoticeDataGeoCookie));a.find("[name=lat]").val(o.NLat);a.find("[name=lon]").val(o.NLon);a.find("[name=location_ns]").val(o.NLNS);a.find("[name=location_id]").val(o.NLID);a.find("[name=notice_data-geo]").attr("checked",o.NDG);SN.U.NoticeGeoStatus(a,o.NLN,o.NLat,o.NLon,o.NLNU);j.attr("title",NoticeDataGeo_text.ShareDisable+" ("+o.NLN+")").addClass("checked")}}else{f()}}).change()}},NoticeGeoStatus:function(e,a,f,g,c){var h=e.find(".geo_status_wrapper");if(h.length==0){h=$('<div class="'+SN.C.S.Success+' geo_status_wrapper"><button class="close" style="float:right">&#215;</button><div class="geo_status"></div></div>');h.find("button.close").click(function(){e.find("[name=notice_data-geo]").removeAttr("checked").change();return false});e.append(h)}var b;if(c){b=$("<a></a>").attr("href",c)}else{b=$("<span></span>")}b.text(a);if(f||g){var d=f+";"+g;b.attr("title",d);if(!a){b.text(d)}}h.find(".geo_status").empty().append(b)},NewDirectMessage:function(){NDM=$(".entity_send-a-message a");NDM.attr({href:NDM.attr("href")+"&ajax=1"});NDM.bind("click",function(){var a=$(".entity_send-a-message form");if(a.length===0){$(this).addClass(SN.C.S.Processing);$.get(NDM.attr("href"),null,function(b){$(".entity_send-a-message").append(document._importNode($("form",b)[0],true));a=$(".entity_send-a-message .form_notice");SN.U.FormNoticeXHR(a);SN.U.FormNoticeEnhancements(a);a.append('<button class="close">&#215;</button>');$(".entity_send-a-message button").click(function(){a.hide();return false});NDM.removeClass(SN.C.S.Processing)})}else{a.show();$(".entity_send-a-message textarea").focus()}return false})},GetFullYear:function(c,d,a){var b=new Date();b.setFullYear(c,d,a);return b},StatusNetInstance:{Set:function(b){var a=SN.U.StatusNetInstance.Get();if(a!==null){b=$.extend(a,b)}$.cookie(SN.C.S.StatusNetInstance,JSON.stringify(b),{path:"/",expires:SN.U.GetFullYear(2029,0,1)})},Get:function(){var a=$.cookie(SN.C.S.StatusNetInstance);if(a!==null){return JSON.parse(a)}return null},Delete:function(){$.cookie(SN.C.S.StatusNetInstance,null)}},belongsOnTimeline:function(b){var a=$("body").attr("id");if(a=="public"){return true}var c=$("#nav_profile a").attr("href");if(c){var d=$(b).find(".vcard.author a.url").attr("href");if(d==c){if(a=="all"||a=="showstream"){return true}}}return false},switchInputFormTab:function(a){$(".input_form_nav_tab.current").removeClass("current");if(a=="placeholder"){$("#input_form_nav_status").addClass("current")}else{$("#input_form_nav_"+a).addClass("current")}$(".input_form.current").removeClass("current");$("#input_form_"+a).addClass("current").find(".ajax-notice").each(function(){var b=$(this);SN.Init.NoticeFormSetup(b)}).find("textarea:first").focus()}},Init:{NoticeForm:function(){if($("body.user_in").length>0){$("#input_form_placeholder input.placeholder").focus(function(){SN.U.switchInputFormTab("status")});$("body").bind("click",function(g){var d=$("#content .input_forms div.current");if(d.length>0){if($("#content .input_forms").has(g.target).length==0){var a=d.find('textarea, input[type=text], input[type=""]');var c=false;a.each(function(){c=c||$(this).val()});if(!c){SN.U.switchInputFormTab("placeholder")}}}var b=$("li.notice-reply");if(b.length>0){var f=$(g.target);b.each(function(){var j=$(this);if(j.has(g.target).length==0){var h=j.find(".notice_data-text:first");var i=$.trim(h.val());if(i==""||i==h.data("initialText")){var e=j.closest("li.notice");j.remove();SN.U.NoticeInlineReplyPlaceholder(e)}}})}})}},NoticeFormSetup:function(a){if(!a.data("NoticeFormSetup")){SN.U.NoticeLocationAttach(a);SN.U.FormNoticeXHR(a);SN.U.FormNoticeEnhancements(a);SN.U.NoticeDataAttach(a);a.data("NoticeFormSetup",true)}},Notices:function(){if($("body.user_in").length>0){var a=$(".form_notice:first");if(a.length>0){SN.C.I.NoticeFormMaster=document._importNode(a[0],true)}SN.U.NoticeRepeat();SN.U.NoticeReply();SN.U.NoticeInlineReplySetup()}SN.U.NoticeAttachments()},EntityActions:function(){if($("body.user_in").length>0){SN.U.NewDirectMessage()}},Login:function(){if(SN.U.StatusNetInstance.Get()!==null){var a=SN.U.StatusNetInstance.Get().Nickname;if(a!==null){$("#form_login #nickname").val(a)}}$("#form_login").bind("submit",function(){SN.U.StatusNetInstance.Set({Nickname:$("#form_login #nickname").val()});return true})},AjaxForms:function(){$("form.ajax").live("submit",function(){SN.U.FormXHR($(this));return false})},UploadForms:function(){$("input[type=file]").change(function(d){if(typeof this.files=="object"&&this.files.length>0){var c=0;for(var b=0;b<this.files.length;b++){c+=this.files[b].size}var a=SN.U.maxFileSize($(this.form));if(a>0&&c>a){var e="File too large: maximum upload size is %d bytes.";alert(e.replace("%d",a));$(this).val("");d.preventDefault();return false}}})}}};$(document).ready(function(){SN.Init.AjaxForms();SN.Init.UploadForms();if($("."+SN.C.S.FormNotice).length>0){SN.Init.NoticeForm()}if($("#content .notices").length>0){SN.Init.Notices()}if($("#content .entity_actions").length>0){SN.Init.EntityActions()}if($("#form_login").length>0){SN.Init.Login()}});if(!document.ELEMENT_NODE){document.ELEMENT_NODE=1;document.ATTRIBUTE_NODE=2;document.TEXT_NODE=3;document.CDATA_SECTION_NODE=4;document.ENTITY_REFERENCE_NODE=5;document.ENTITY_NODE=6;document.PROCESSING_INSTRUCTION_NODE=7;document.COMMENT_NODE=8;document.DOCUMENT_NODE=9;document.DOCUMENT_TYPE_NODE=10;document.DOCUMENT_FRAGMENT_NODE=11;document.NOTATION_NODE=12}document._importNode=function(e,a){switch(e.nodeType){case document.ELEMENT_NODE:var d=document.createElement(e.nodeName);if(e.attributes&&e.attributes.length>0){for(var c=0,b=e.attributes.length;c<b;){if(e.attributes[c].nodeName=="class"){d.className=e.getAttribute(e.attributes[c++].nodeName)}else{d.setAttribute(e.attributes[c].nodeName,e.getAttribute(e.attributes[c++].nodeName))}}}if(a&&e.childNodes&&e.childNodes.length>0){for(var c=0,b=e.childNodes.length;c<b;){d.appendChild(document._importNode(e.childNodes[c++],a))}}return d;break;case document.TEXT_NODE:case document.CDATA_SECTION_NODE:case document.COMMENT_NODE:return document.createTextNode(e.nodeValue);break}};if(typeof navigator.geolocation=="undefined"||navigator.geolocation.shim){(function(){(function(){if(window.google&&google.gears){return}var c=null;if(typeof GearsFactory!="undefined"){c=new GearsFactory()}else{try{c=new ActiveXObject("Gears.Factory");if(c.getBuildInfo().indexOf("ie_mobile")!=-1){c.privateSetGlobalObject(this)}}catch(d){if((typeof navigator.mimeTypes!="undefined")&&navigator.mimeTypes["application/x-googlegears"]){c=document.createElement("object");c.style.display="none";c.width=0;c.height=0;c.type="application/x-googlegears";document.documentElement.appendChild(c)}}}if(!c){return}if(!window.google){google={}}if(!google.gears){google.gears={factory:c}}})();var a=(function(){var d=google.gears.factory.create("beta.geolocation");var c=function(f,e){return function(g){f(g);e.lastPosition=g}};return{shim:true,type:"Gears",lastPosition:null,getCurrentPosition:function(e,g,h){var f=this;var i=c(e,f);d.getCurrentPosition(i,g,h)},watchPosition:function(e,f,g){d.watchPosition(e,f,g)},clearWatch:function(e){d.clearWatch(e)},getPermission:function(g,e,f){d.getPermission(g,e,f)}}});var b=(function(){var i=false;var e=function(){if(!d()&&!i){i=true;var j=document.createElement("script");j.src=(document.location.protocol=="https:"?"https://":"http://")+"www.google.com/jsapi?callback=_google_loader_apiLoaded";j.type="text/javascript";document.getElementsByTagName("body")[0].appendChild(j)}};var c=[];var h=function(j){c.push(j)};var f=function(){if(d()){while(c.length>0){var j=c.pop();j()}}};window._google_loader_apiLoaded=function(){f()};var d=function(){return(window.google&&google.loader)};var g=function(j){if(d()){return true}h(j);e();return false};e();return{shim:true,type:"ClientLocation",lastPosition:null,getCurrentPosition:function(k,n,o){var m=this;if(!g(function(){m.getCurrentPosition(k,n,o)})){return}if(google.loader.ClientLocation){var l=google.loader.ClientLocation;var j={coords:{latitude:l.latitude,longitude:l.longitude,altitude:null,accuracy:43000,altitudeAccuracy:null,heading:null,speed:null},address:{city:l.address.city,country:l.address.country,country_code:l.address.country_code,region:l.address.region},timestamp:new Date()};k(j);this.lastPosition=j}else{if(n==="function"){n({code:3,message:"Using the Google ClientLocation API and it is not able to calculate a location."})}}},watchPosition:function(j,l,m){this.getCurrentPosition(j,l,m);var k=this;var n=setInterval(function(){k.getCurrentPosition(j,l,m)},10000);return n},clearWatch:function(j){clearInterval(j)},getPermission:function(l,j,k){return true}}});navigator.geolocation=(window.google&&google.gears)?a():b()})()};
\ No newline at end of file
+var SN={C:{I:{CounterBlackout:false,MaxLength:140,PatternUsername:/^[0-9a-zA-Z\-_.]*$/,HTTP20x30x:[200,201,202,203,204,205,206,300,301,302,303,304,305,306,307],NoticeFormMaster:null},S:{Disabled:"disabled",Warning:"warning",Error:"error",Success:"success",Processing:"processing",CommandResult:"command_result",FormNotice:"form_notice",NoticeDataGeo:"notice_data-geo",NoticeDataGeoCookie:"NoticeDataGeo",NoticeDataGeoSelected:"notice_data-geo_selected",StatusNetInstance:"StatusNetInstance"}},messages:{},msg:function(a){if(typeof SN.messages[a]=="undefined"){return"["+a+"]"}else{return SN.messages[a]}},U:{FormNoticeEnhancements:function(b){if(jQuery.data(b[0],"ElementData")===undefined){MaxLength=b.find(".count").text();if(typeof(MaxLength)=="undefined"){MaxLength=SN.C.I.MaxLength}jQuery.data(b[0],"ElementData",{MaxLength:MaxLength});SN.U.Counter(b);NDT=b.find(".notice_data-text:first");NDT.bind("keyup",function(c){SN.U.Counter(b)});var a=function(c){window.setTimeout(function(){SN.U.Counter(b)},50)};NDT.bind("cut",a).bind("paste",a)}else{b.find(".count").text(jQuery.data(b[0],"ElementData").MaxLength)}},Counter:function(d){SN.C.I.FormNoticeCurrent=d;var b=jQuery.data(d[0],"ElementData").MaxLength;if(b<=0){return}var c=b-SN.U.CharacterCount(d);var a=d.find(".count");if(c.toString()!=a.text()){if(!SN.C.I.CounterBlackout||c===0){if(a.text()!=String(c)){a.text(c)}if(c<0){d.addClass(SN.C.S.Warning)}else{d.removeClass(SN.C.S.Warning)}if(!SN.C.I.CounterBlackout){SN.C.I.CounterBlackout=true;SN.C.I.FormNoticeCurrent=d;window.setTimeout("SN.U.ClearCounterBlackout(SN.C.I.FormNoticeCurrent);",500)}}}},CharacterCount:function(a){return a.find(".notice_data-text:first").val().length},ClearCounterBlackout:function(a){SN.C.I.CounterBlackout=false;SN.U.Counter(a)},RewriteAjaxAction:function(a){if(document.location.protocol=="https:"&&a.substr(0,5)=="http:"){return a.replace(/^http:\/\/[^:\/]+/,"https://"+document.location.host)}else{return a}},FormXHR:function(a){$.ajax({type:"POST",dataType:"xml",url:SN.U.RewriteAjaxAction(a.attr("action")),data:a.serialize()+"&ajax=1",beforeSend:function(b){a.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(c,d,b){alert(b||d)},success:function(b,c){if(typeof($("form",b)[0])!="undefined"){form_new=document._importNode($("form",b)[0],true);a.replaceWith(form_new)}else{a.replaceWith(document._importNode($("p",b)[0],true))}}})},FormNoticeXHR:function(b){SN.C.I.NoticeDataGeo={};b.append('<input type="hidden" name="ajax" value="1"/>');b.attr("action",SN.U.RewriteAjaxAction(b.attr("action")));var c=function(d,e){b.append($('<p class="form_response"></p>').addClass(d).text(e))};var a=function(){b.find(".form_response").remove()};b.ajaxForm({dataType:"xml",timeout:"60000",beforeSend:function(d){if(b.find(".notice_data-text:first").val()==""){b.addClass(SN.C.S.Warning);return false}b.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled);SN.U.normalizeGeoData(b);return true},error:function(f,g,e){b.removeClass(SN.C.S.Processing).find(".submit").removeClass(SN.C.S.Disabled).removeAttr(SN.C.S.Disabled,SN.C.S.Disabled);a();if(g=="timeout"){c("error","Sorry! We had trouble sending your notice. The servers are overloaded. Please try again, and contact the site administrator if this problem persists.")}else{var d=SN.U.GetResponseXML(f);if($("."+SN.C.S.Error,d).length>0){b.append(document._importNode($("."+SN.C.S.Error,d)[0],true))}else{if(parseInt(f.status)===0||jQuery.inArray(parseInt(f.status),SN.C.I.HTTP20x30x)>=0){b.resetForm().find(".attach-status").remove();SN.U.FormNoticeEnhancements(b)}else{c("error","(Sorry! We had trouble sending your notice ("+f.status+" "+f.statusText+"). Please report the problem to the site administrator if this happens again.")}}}},success:function(i,f){a();var n=$("#"+SN.C.S.Error,i);if(n.length>0){c("error",n.text())}else{if($("body")[0].id=="bookmarklet"){self.close()}var d=$("#"+SN.C.S.CommandResult,i);if(d.length>0){c("success",d.text())}else{var m=document._importNode($("li",i)[0],true);var k=$("#notices_primary .notices:first");var l=b.closest("li.notice-reply");if(l.length>0){var e=$(m).attr("id");if($("#"+e).length==0){var j=l.closest("li.notice");l.replaceWith(m);SN.U.NoticeInlineReplyPlaceholder(j)}else{l.remove()}}else{if(k.length>0&&SN.U.belongsOnTimeline(m)){if($("#"+m.id).length===0){var h=b.find("[name=inreplyto]").val();var g="#notices_primary #notice-"+h;if($("body")[0].id=="conversation"){if(h.length>0&&$(g+" .notices").length<1){$(g).append('<ul class="notices"></ul>')}$($(g+" .notices")[0]).append(m)}else{k.prepend(m)}$("#"+m.id).css({display:"none"}).fadeIn(2500);SN.U.NoticeWithAttachment($("#"+m.id));SN.U.switchInputFormTab("placeholder")}}else{c("success",$("title",i).text())}}}b.resetForm();b.find("[name=inreplyto]").val("");b.find(".attach-status").remove();SN.U.FormNoticeEnhancements(b)}},complete:function(d,e){b.removeClass(SN.C.S.Processing).find(".submit").removeAttr(SN.C.S.Disabled).removeClass(SN.C.S.Disabled);b.find("[name=lat]").val(SN.C.I.NoticeDataGeo.NLat);b.find("[name=lon]").val(SN.C.I.NoticeDataGeo.NLon);b.find("[name=location_ns]").val(SN.C.I.NoticeDataGeo.NLNS);b.find("[name=location_id]").val(SN.C.I.NoticeDataGeo.NLID);b.find("[name=notice_data-geo]").attr("checked",SN.C.I.NoticeDataGeo.NDG)}})},normalizeGeoData:function(a){SN.C.I.NoticeDataGeo.NLat=a.find("[name=lat]").val();SN.C.I.NoticeDataGeo.NLon=a.find("[name=lon]").val();SN.C.I.NoticeDataGeo.NLNS=a.find("[name=location_ns]").val();SN.C.I.NoticeDataGeo.NLID=a.find("[name=location_id]").val();SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked");var b=$.cookie(SN.C.S.NoticeDataGeoCookie);if(b!==null&&b!="disabled"){b=JSON.parse(b);SN.C.I.NoticeDataGeo.NLat=a.find("[name=lat]").val(b.NLat).val();SN.C.I.NoticeDataGeo.NLon=a.find("[name=lon]").val(b.NLon).val();if(b.NLNS){SN.C.I.NoticeDataGeo.NLNS=a.find("[name=location_ns]").val(b.NLNS).val();SN.C.I.NoticeDataGeo.NLID=a.find("[name=location_id]").val(b.NLID).val()}else{a.find("[name=location_ns]").val("");a.find("[name=location_id]").val("")}}if(b=="disabled"){SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked",false).attr("checked")}else{SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked",true).attr("checked")}},GetResponseXML:function(b){try{return b.responseXML}catch(a){return(new DOMParser()).parseFromString(b.responseText,"text/xml")}},NoticeReply:function(){$("#content .notice_reply").live("click",function(c){c.preventDefault();var b=$(this).closest("li.notice");var a=($(".author .nickname",b).length>0)?$($(".author .nickname",b)[0]):$(".author .nickname.uid");SN.U.NoticeInlineReplyTrigger(b,"@"+a.text());return false})},NoticeReplyTo:function(a){},NoticeInlineReplyTrigger:function(h,i){var b=$($(".notice_id",h)[0]).text();var e=h;var f=h.closest(".notices");if(f.hasClass("threaded-replies")){e=f.closest(".notice")}else{f=$("ul.threaded-replies",h);if(f.length==0){f=$('<ul class="notices threaded-replies xoxo"></ul>');h.append(f)}}var j=$(".notice-reply-form",f);var d=function(){j.find("input[name=inreplyto]").val(b);var m=j.find("textarea");if(m.length==0){throw"No textarea"}var l="";if(i){l=i+" "}m.val(l+m.val().replace(RegExp(l,"i"),""));m.data("initialText",$.trim(i+""));m.focus();if(m[0].setSelectionRange){var k=m.val().length;m[0].setSelectionRange(k,k)}};if(j.length>0){d()}else{f.find("li.notice-reply-placeholder").remove();var g=$("li.notice-reply",f);if(g.length==0){g=$('<li class="notice-reply"></li>');var c=function(k){var l=document._importNode(k,true);g.append(l);f.append(g);var m=j=$(l);SN.Init.NoticeFormSetup(m);d()};if(SN.C.I.NoticeFormMaster){c(SN.C.I.NoticeFormMaster)}else{var a=$("#form_notice").attr("action");$.get(a,{ajax:1},function(k,m,l){c($("form",k)[0])})}}}},NoticeInlineReplyPlaceholder:function(b){var a=b.find("ul.threaded-replies");var c=$('<li class="notice-reply-placeholder"><input class="placeholder"></li>');c.find("input").val(SN.msg("reply_placeholder"));a.append(c)},NoticeInlineReplySetup:function(){$("li.notice-reply-placeholder input").live("focus",function(){var a=$(this).closest("li.notice");SN.U.NoticeInlineReplyTrigger(a);return false})},NoticeRepeat:function(){$(".form_repeat").live("click",function(a){a.preventDefault();SN.U.NoticeRepeatConfirmation($(this));return false})},NoticeRepeatConfirmation:function(a){var c=a.find(".submit");var b=c.clone();b.addClass("submit_dialogbox").removeClass("submit");a.append(b);b.bind("click",function(){SN.U.FormXHR(a);return false});c.hide();a.addClass("dialogbox").append('<button class="close">&#215;</button>').closest(".notice-options").addClass("opaque");a.find("button.close").click(function(){$(this).remove();a.removeClass("dialogbox").closest(".notice-options").removeClass("opaque");a.find(".submit_dialogbox").remove();a.find(".submit").show();return false})},NoticeAttachments:function(){$(".notice a.attachment").each(function(){SN.U.NoticeWithAttachment($(this).closest(".notice"))})},NoticeWithAttachment:function(b){if(b.find(".attachment").length===0){return}var a=b.find(".attachment.more");if(a.length>0){$(a[0]).click(function(){var c=$(this);c.addClass(SN.C.S.Processing);$.get(c.attr("href")+"/ajax",null,function(d){c.parent(".entry-content").html($(d).find("#attachment_view .entry-content").html())});return false}).attr("title",SN.msg("showmore_tooltip"))}},NoticeDataAttach:function(b){var a=b.find("input[type=file]");a.change(function(f){b.find(".attach-status").remove();var d=$(this).val();if(!d){return false}var c=$('<div class="attach-status '+SN.C.S.Success+'"><code></code> <button class="close">&#215;</button></div>');c.find("code").text(d);c.find("button").click(function(){c.remove();a.val("");return false});b.append(c);if(typeof this.files=="object"){for(var e=0;e<this.files.length;e++){SN.U.PreviewAttach(b,this.files[e])}}})},maxFileSize:function(b){var a=$(b).find("input[name=MAX_FILE_SIZE]").attr("value");if(a){return parseInt(a)}else{return 0}},PreviewAttach:function(d,c){var e=c.type+" "+Math.round(c.size/1024)+"KB";var f=true;var h;if(typeof window.createObjectURL!="undefined"){h=function(i,j){j(window.createObjectURL(i))}}else{if(typeof window.FileReader!="undefined"){h=function(j,k){var i=new FileReader();i.onload=function(l){k(i.result)};i.readAsDataURL(j)}}else{f=false}}var a=["image/png","image/jpeg","image/gif","image/svg+xml"];if($.inArray(c.type,a)==-1){f=false}var g=8*1024*1024;if(c.size>g){f=false}if(f){h(c,function(j){var i=$("<img>").attr("title",e).attr("alt",e).attr("src",j).attr("style","height: 120px");d.find(".attach-status").append(i)})}else{var b=$("<div></div>").text(e);d.find(".attach-status").append(b)}},NoticeLocationAttach:function(a){var e=a.find("[name=lat]");var k=a.find("[name=lon]");var g=a.find("[name=location_ns]").val();var l=a.find("[name=location_id]").val();var b="";var d=a.find("[name=notice_data-geo]");var c=a.find("[name=notice_data-geo]");var j=a.find("label.notice_data-geo");function f(n){j.attr("title",jQuery.trim(j.text())).removeClass("checked");a.find("[name=lat]").val("");a.find("[name=lon]").val("");a.find("[name=location_ns]").val("");a.find("[name=location_id]").val("");a.find("[name=notice_data-geo]").attr("checked",false);$.cookie(SN.C.S.NoticeDataGeoCookie,"disabled",{path:"/"});if(n){a.find(".geo_status_wrapper").removeClass("success").addClass("error");a.find(".geo_status_wrapper .geo_status").text(n)}else{a.find(".geo_status_wrapper").remove()}}function m(n,o){SN.U.NoticeGeoStatus(a,"Looking up place name...");$.getJSON(n,o,function(p){var q,r;if(typeof(p.location_ns)!="undefined"){a.find("[name=location_ns]").val(p.location_ns);q=p.location_ns}if(typeof(p.location_id)!="undefined"){a.find("[name=location_id]").val(p.location_id);r=p.location_id}if(typeof(p.name)=="undefined"){NLN_text=o.lat+";"+o.lon}else{NLN_text=p.name}SN.U.NoticeGeoStatus(a,NLN_text,o.lat,o.lon,p.url);j.attr("title",NoticeDataGeo_text.ShareDisable+" ("+NLN_text+")");a.find("[name=lat]").val(o.lat);a.find("[name=lon]").val(o.lon);a.find("[name=location_ns]").val(q);a.find("[name=location_id]").val(r);a.find("[name=notice_data-geo]").attr("checked",true);var s={NLat:o.lat,NLon:o.lon,NLNS:q,NLID:r,NLN:NLN_text,NLNU:p.url,NDG:true};$.cookie(SN.C.S.NoticeDataGeoCookie,JSON.stringify(s),{path:"/"})})}if(c.length>0){if($.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){c.attr("checked",false)}else{c.attr("checked",true)}var h=a.find(".notice_data-geo_wrap");var i=h.attr("data-api");j.attr("title",j.text());c.change(function(){if(c.attr("checked")===true||$.cookie(SN.C.S.NoticeDataGeoCookie)===null){j.attr("title",NoticeDataGeo_text.ShareDisable).addClass("checked");if($.cookie(SN.C.S.NoticeDataGeoCookie)===null||$.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){if(navigator.geolocation){SN.U.NoticeGeoStatus(a,"Requesting location from browser...");navigator.geolocation.getCurrentPosition(function(p){a.find("[name=lat]").val(p.coords.latitude);a.find("[name=lon]").val(p.coords.longitude);var q={lat:p.coords.latitude,lon:p.coords.longitude,token:$("#token").val()};m(i,q)},function(p){switch(p.code){case p.PERMISSION_DENIED:f("Location permission denied.");break;case p.TIMEOUT:f("Location lookup timeout.");break}},{timeout:10000})}else{if(e.length>0&&k.length>0){var n={lat:e,lon:k,token:$("#token").val()};m(i,n)}else{f();c.remove();j.remove()}}}else{var o=JSON.parse($.cookie(SN.C.S.NoticeDataGeoCookie));a.find("[name=lat]").val(o.NLat);a.find("[name=lon]").val(o.NLon);a.find("[name=location_ns]").val(o.NLNS);a.find("[name=location_id]").val(o.NLID);a.find("[name=notice_data-geo]").attr("checked",o.NDG);SN.U.NoticeGeoStatus(a,o.NLN,o.NLat,o.NLon,o.NLNU);j.attr("title",NoticeDataGeo_text.ShareDisable+" ("+o.NLN+")").addClass("checked")}}else{f()}}).change()}},NoticeGeoStatus:function(e,a,f,g,c){var h=e.find(".geo_status_wrapper");if(h.length==0){h=$('<div class="'+SN.C.S.Success+' geo_status_wrapper"><button class="close" style="float:right">&#215;</button><div class="geo_status"></div></div>');h.find("button.close").click(function(){e.find("[name=notice_data-geo]").removeAttr("checked").change();return false});e.append(h)}var b;if(c){b=$("<a></a>").attr("href",c)}else{b=$("<span></span>")}b.text(a);if(f||g){var d=f+";"+g;b.attr("title",d);if(!a){b.text(d)}}h.find(".geo_status").empty().append(b)},NewDirectMessage:function(){NDM=$(".entity_send-a-message a");NDM.attr({href:NDM.attr("href")+"&ajax=1"});NDM.bind("click",function(){var a=$(".entity_send-a-message form");if(a.length===0){$(this).addClass(SN.C.S.Processing);$.get(NDM.attr("href"),null,function(b){$(".entity_send-a-message").append(document._importNode($("form",b)[0],true));a=$(".entity_send-a-message .form_notice");SN.U.FormNoticeXHR(a);SN.U.FormNoticeEnhancements(a);a.append('<button class="close">&#215;</button>');$(".entity_send-a-message button").click(function(){a.hide();return false});NDM.removeClass(SN.C.S.Processing)})}else{a.show();$(".entity_send-a-message textarea").focus()}return false})},GetFullYear:function(c,d,a){var b=new Date();b.setFullYear(c,d,a);return b},StatusNetInstance:{Set:function(b){var a=SN.U.StatusNetInstance.Get();if(a!==null){b=$.extend(a,b)}$.cookie(SN.C.S.StatusNetInstance,JSON.stringify(b),{path:"/",expires:SN.U.GetFullYear(2029,0,1)})},Get:function(){var a=$.cookie(SN.C.S.StatusNetInstance);if(a!==null){return JSON.parse(a)}return null},Delete:function(){$.cookie(SN.C.S.StatusNetInstance,null)}},belongsOnTimeline:function(b){var a=$("body").attr("id");if(a=="public"){return true}var c=$("#nav_profile a").attr("href");if(c){var d=$(b).find(".vcard.author a.url").attr("href");if(d==c){if(a=="all"||a=="showstream"){return true}}}return false},switchInputFormTab:function(a){$(".input_form_nav_tab.current").removeClass("current");if(a=="placeholder"){$("#input_form_nav_status").addClass("current")}else{$("#input_form_nav_"+a).addClass("current")}$(".input_form.current").removeClass("current");$("#input_form_"+a).addClass("current").find(".ajax-notice").each(function(){var b=$(this);SN.Init.NoticeFormSetup(b)}).find("textarea:first").focus()}},Init:{NoticeForm:function(){if($("body.user_in").length>0){$("#input_form_placeholder input.placeholder").focus(function(){SN.U.switchInputFormTab("status")});$("body").bind("click",function(g){var d=$("#content .input_forms div.current");if(d.length>0){if($("#content .input_forms").has(g.target).length==0){var a=d.find('textarea, input[type=text], input[type=""]');var c=false;a.each(function(){c=c||$(this).val()});if(!c){SN.U.switchInputFormTab("placeholder")}}}var b=$("li.notice-reply");if(b.length>0){var f=$(g.target);b.each(function(){var j=$(this);if(j.has(g.target).length==0){var h=j.find(".notice_data-text:first");var i=$.trim(h.val());if(i==""||i==h.data("initialText")){var e=j.closest("li.notice");j.remove();SN.U.NoticeInlineReplyPlaceholder(e)}}})}})}},NoticeFormSetup:function(a){if(!a.data("NoticeFormSetup")){SN.U.NoticeLocationAttach(a);SN.U.FormNoticeXHR(a);SN.U.FormNoticeEnhancements(a);SN.U.NoticeDataAttach(a);a.data("NoticeFormSetup",true)}},Notices:function(){if($("body.user_in").length>0){var a=$(".form_notice:first");if(a.length>0){SN.C.I.NoticeFormMaster=document._importNode(a[0],true)}SN.U.NoticeRepeat();SN.U.NoticeReply();SN.U.NoticeInlineReplySetup()}SN.U.NoticeAttachments()},EntityActions:function(){if($("body.user_in").length>0){SN.U.NewDirectMessage()}},Login:function(){if(SN.U.StatusNetInstance.Get()!==null){var a=SN.U.StatusNetInstance.Get().Nickname;if(a!==null){$("#form_login #nickname").val(a)}}$("#form_login").bind("submit",function(){SN.U.StatusNetInstance.Set({Nickname:$("#form_login #nickname").val()});return true})},AjaxForms:function(){$("form.ajax").live("submit",function(){SN.U.FormXHR($(this));return false})},UploadForms:function(){$("input[type=file]").change(function(d){if(typeof this.files=="object"&&this.files.length>0){var c=0;for(var b=0;b<this.files.length;b++){c+=this.files[b].size}var a=SN.U.maxFileSize($(this.form));if(a>0&&c>a){var e="File too large: maximum upload size is %d bytes.";alert(e.replace("%d",a));$(this).val("");d.preventDefault();return false}}})}}};$(document).ready(function(){SN.Init.AjaxForms();SN.Init.UploadForms();if($("."+SN.C.S.FormNotice).length>0){SN.Init.NoticeForm()}if($("#content .notices").length>0){SN.Init.Notices()}if($("#content .entity_actions").length>0){SN.Init.EntityActions()}if($("#form_login").length>0){SN.Init.Login()}});if(!document.ELEMENT_NODE){document.ELEMENT_NODE=1;document.ATTRIBUTE_NODE=2;document.TEXT_NODE=3;document.CDATA_SECTION_NODE=4;document.ENTITY_REFERENCE_NODE=5;document.ENTITY_NODE=6;document.PROCESSING_INSTRUCTION_NODE=7;document.COMMENT_NODE=8;document.DOCUMENT_NODE=9;document.DOCUMENT_TYPE_NODE=10;document.DOCUMENT_FRAGMENT_NODE=11;document.NOTATION_NODE=12}document._importNode=function(e,a){switch(e.nodeType){case document.ELEMENT_NODE:var d=document.createElement(e.nodeName);if(e.attributes&&e.attributes.length>0){for(var c=0,b=e.attributes.length;c<b;){if(e.attributes[c].nodeName=="class"){d.className=e.getAttribute(e.attributes[c++].nodeName)}else{d.setAttribute(e.attributes[c].nodeName,e.getAttribute(e.attributes[c++].nodeName))}}}if(a&&e.childNodes&&e.childNodes.length>0){for(var c=0,b=e.childNodes.length;c<b;){d.appendChild(document._importNode(e.childNodes[c++],a))}}return d;break;case document.TEXT_NODE:case document.CDATA_SECTION_NODE:case document.COMMENT_NODE:return document.createTextNode(e.nodeValue);break}};if(typeof navigator.geolocation=="undefined"||navigator.geolocation.shim){(function(){(function(){if(window.google&&google.gears){return}var c=null;if(typeof GearsFactory!="undefined"){c=new GearsFactory()}else{try{c=new ActiveXObject("Gears.Factory");if(c.getBuildInfo().indexOf("ie_mobile")!=-1){c.privateSetGlobalObject(this)}}catch(d){if((typeof navigator.mimeTypes!="undefined")&&navigator.mimeTypes["application/x-googlegears"]){c=document.createElement("object");c.style.display="none";c.width=0;c.height=0;c.type="application/x-googlegears";document.documentElement.appendChild(c)}}}if(!c){return}if(!window.google){google={}}if(!google.gears){google.gears={factory:c}}})();var a=(function(){var d=google.gears.factory.create("beta.geolocation");var c=function(f,e){return function(g){f(g);e.lastPosition=g}};return{shim:true,type:"Gears",lastPosition:null,getCurrentPosition:function(e,g,h){var f=this;var i=c(e,f);d.getCurrentPosition(i,g,h)},watchPosition:function(e,f,g){d.watchPosition(e,f,g)},clearWatch:function(e){d.clearWatch(e)},getPermission:function(g,e,f){d.getPermission(g,e,f)}}});var b=(function(){var i=false;var e=function(){if(!d()&&!i){i=true;var j=document.createElement("script");j.src=(document.location.protocol=="https:"?"https://":"http://")+"www.google.com/jsapi?callback=_google_loader_apiLoaded";j.type="text/javascript";document.getElementsByTagName("body")[0].appendChild(j)}};var c=[];var h=function(j){c.push(j)};var f=function(){if(d()){while(c.length>0){var j=c.pop();j()}}};window._google_loader_apiLoaded=function(){f()};var d=function(){return(window.google&&google.loader)};var g=function(j){if(d()){return true}h(j);e();return false};e();return{shim:true,type:"ClientLocation",lastPosition:null,getCurrentPosition:function(k,n,o){var m=this;if(!g(function(){m.getCurrentPosition(k,n,o)})){return}if(google.loader.ClientLocation){var l=google.loader.ClientLocation;var j={coords:{latitude:l.latitude,longitude:l.longitude,altitude:null,accuracy:43000,altitudeAccuracy:null,heading:null,speed:null},address:{city:l.address.city,country:l.address.country,country_code:l.address.country_code,region:l.address.region},timestamp:new Date()};k(j);this.lastPosition=j}else{if(n==="function"){n({code:3,message:"Using the Google ClientLocation API and it is not able to calculate a location."})}}},watchPosition:function(j,l,m){this.getCurrentPosition(j,l,m);var k=this;var n=setInterval(function(){k.getCurrentPosition(j,l,m)},10000);return n},clearWatch:function(j){clearInterval(j)},getPermission:function(l,j,k){return true}}});navigator.geolocation=(window.google&&google.gears)?a():b()})()};
\ No newline at end of file

From deb40602d2bc61772eb0b2631f3f4d6c6b592aac Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Sun, 13 Mar 2011 16:32:13 -0700
Subject: [PATCH 548/655] Extended profile - more work on getting complex
 fields to save

---
 .../{ => css}/profiledetail.css               |  0
 plugins/ExtendedProfile/extendedprofile.php   |  3 +-
 .../ExtendedProfile/extendedprofilewidget.php | 19 ++++-
 plugins/ExtendedProfile/js/profiledetail.js   | 83 +++++++++++++++++++
 .../profiledetailsettingsaction.php           | 16 ++--
 5 files changed, 111 insertions(+), 10 deletions(-)
 rename plugins/ExtendedProfile/{ => css}/profiledetail.css (100%)
 create mode 100644 plugins/ExtendedProfile/js/profiledetail.js

diff --git a/plugins/ExtendedProfile/profiledetail.css b/plugins/ExtendedProfile/css/profiledetail.css
similarity index 100%
rename from plugins/ExtendedProfile/profiledetail.css
rename to plugins/ExtendedProfile/css/profiledetail.css
diff --git a/plugins/ExtendedProfile/extendedprofile.php b/plugins/ExtendedProfile/extendedprofile.php
index 2a10759d91..94a5ef4826 100644
--- a/plugins/ExtendedProfile/extendedprofile.php
+++ b/plugins/ExtendedProfile/extendedprofile.php
@@ -106,6 +106,7 @@ class ExtendedProfile
         if (empty($phones)) {
             $pArrays[] = array(
                 'label' => _m('Phone'),
+                'index' => 0,
                 'type'  => 'phone',
                 'vcard' => 'tel',
                 'multi' => true
@@ -115,7 +116,7 @@ class ExtendedProfile
                 $pa = array(
                     'label' => _m('Phone'),
                     'type'  => 'phone',
-                    'index' => $phones[$i]->value_index,
+                    'index' => intva($phones[$i]->value_index),
                     'rel'   => $phones[$i]->rel,
                     'value' => $phones[$i]->field_value,
                     'vcard' => 'tel'
diff --git a/plugins/ExtendedProfile/extendedprofilewidget.php b/plugins/ExtendedProfile/extendedprofilewidget.php
index d31a34b1e2..7eb195e369 100644
--- a/plugins/ExtendedProfile/extendedprofilewidget.php
+++ b/plugins/ExtendedProfile/extendedprofilewidget.php
@@ -184,8 +184,12 @@ class ExtendedProfileWidget extends Form
         $index = $field['index'];
         $id    = "extprofile-$name-$index";
         $rel   = $id . '-rel';
-
-        $this->out->elementStart('div', array('class' => 'phone-edit'));
+        $this->out->elementStart(
+            'div', array(
+                'id' => $id . '-edit',
+                'class' => 'phone-edit'
+            )
+        );
         $this->out->input($id, null, $field['value']);
         $this->out->dropdown(
             $id . '-rel',
@@ -205,10 +209,19 @@ class ExtendedProfileWidget extends Form
             $this->out->element(
                 'a',
                 array(
-                    'name' => $name,
+                    'class' => 'add_row',
                     'href' => 'javascript://'),
                     '+'
                 );
+            $this->out->element(
+                'a',
+                array(
+                    'class' => 'remove_row',
+                    'href' => 'javascript://',
+                    'style' => 'display: none; '
+                    ),
+                    '-'
+                );
         }
         $this->out->elementEnd('div');
     }
diff --git a/plugins/ExtendedProfile/js/profiledetail.js b/plugins/ExtendedProfile/js/profiledetail.js
new file mode 100644
index 0000000000..a021a32645
--- /dev/null
+++ b/plugins/ExtendedProfile/js/profiledetail.js
@@ -0,0 +1,83 @@
+var removeRow = function() {
+    var cnt = rowCount(this);
+    var table = $(this).closest('table');
+    console.log("row count = " + cnt);
+    if (cnt > 1) {
+        var target = $(this).closest('tr');
+        target.remove();
+        reorder(table);
+    }
+};
+
+var rowCount = function(row) {
+    var top = $(row).closest('table');
+    var trs = $(top).find('tr');
+    return trs.length - 1; // exclude th section header row
+};
+
+var reorder = function(table) {
+    var trs = $(table).find('tr').has('td');
+
+    $(trs).find('a').hide();
+
+    $(trs).each(function(i, tr) {
+        console.log("ROW " + i);
+        $(tr).find('a.remove_row').show();
+        replaceIndex(rowIndex(tr), i);
+    });
+
+    $(trs).last().find('a.add_row').show();
+
+    if (trs.length == 1) {
+        $(trs).find('a.remove_row').hide();
+    }
+
+};
+
+var rowIndex = function(elem) {
+    var idStr = $(elem).find('div').attr('id');
+    var id = idStr.match(/\d+/);
+    console.log("id = " + id);
+};
+
+var replaceIndex = function(elem, oldIndex, newIndex) {
+    $(elem).find('*').each(function() {
+        $.each(this.attributes, function(i, attrib) {
+            var regexp = /extprofile-.*-\d.*/;
+            var value = attrib.value;
+            var match = value.match(regexp);
+            if (match != null) {
+                attrib.value = value.replace("-" + oldIndex, "-" + newIndex);
+                console.log('match: oldIndex = ' + oldIndex + ' newIndex = ' + newIndex + ' name = ' + attrib.name + ' value = ' + attrib.value);
+            }
+        });
+    });
+}
+
+var resetRow = function(elem) {
+    $(elem).find('input').attr('value', '');
+    $(elem).find("select option[value='office']").attr("selected", true);
+}
+
+var addRow = function() {
+    var divId = $(this).closest('div').attr('id');
+    var index = divId.match(/\d+/);
+    console.log("Current row = " + index);
+    var tr = $(this).closest('tr');
+    var newtr = $(tr).clone();
+    var newIndex = parseInt(index) + 1;
+    replaceIndex(newtr, index, newIndex);
+    resetRow(newtr);
+    $(tr).after(newtr);
+    console.log("number of rows: " + rowCount(tr));
+    reorder($(this).closest('table'));
+};
+
+$(document).ready(
+
+function() {
+    $('.add_row').live('click', addRow);
+    $('.remove_row').live('click', removeRow);
+}
+
+);
\ No newline at end of file
diff --git a/plugins/ExtendedProfile/profiledetailsettingsaction.php b/plugins/ExtendedProfile/profiledetailsettingsaction.php
index ec2c4935a2..ee450118c3 100644
--- a/plugins/ExtendedProfile/profiledetailsettingsaction.php
+++ b/plugins/ExtendedProfile/profiledetailsettingsaction.php
@@ -43,7 +43,13 @@ class ProfileDetailSettingsAction extends ProfileSettingsAction
 
     function showStylesheets() {
         parent::showStylesheets();
-        $this->cssLink('plugins/ExtendedProfile/profiledetail.css');
+        $this->cssLink('plugins/ExtendedProfile/css/profiledetail.css');
+        return true;
+    }
+
+    function  showScripts() {
+        parent::showScripts();
+        $this->script('plugins/ExtendedProfile/js/profiledetail.js');
         return true;
     }
 
@@ -133,7 +139,7 @@ class ProfileDetailSettingsAction extends ProfileSettingsAction
         $phoneTuples = array();
 
         foreach($phones as $phone) {
-            $firstkey           = array_shift(array_keys($phone));
+            $firstkey           = current(array_keys($phone));
             $index              = substr($firstkey, strrpos($firstkey, '-') + 1);
             list($number, $rel) = array_values($phone);
 
@@ -142,11 +148,9 @@ class ProfileDetailSettingsAction extends ProfileSettingsAction
                 'index' => $index,
                 'rel'   => $rel
             );
-
-            return $phoneTuples;
         }
 
-        return $phones;
+        return $phoneTuples;
     }
 
     function arraySplit($array, $pieces)
@@ -157,7 +161,7 @@ class ProfileDetailSettingsAction extends ProfileSettingsAction
 
         $newCount = ceil(count($array) / $pieces);
         $a = array_slice($array, 0, $newCount);
-        $b = array_split(array_slice($array, $newCount), $pieces - 1);
+        $b = $this->arraySplit(array_slice($array, $newCount), $pieces - 1);
 
         return array_merge(array($a), $b);
     }

From 04c8bf2743db51cd724449b4cbec1aaef531597c Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Mon, 14 Mar 2011 01:49:46 -0700
Subject: [PATCH 549/655] Extended profile - finished basic pattern for
 adding/removing/saving multiple complex fields

---
 plugins/ExtendedProfile/extendedprofile.php   | 12 ++-
 .../ExtendedProfile/extendedprofilewidget.php | 53 ++++++------
 plugins/ExtendedProfile/js/profiledetail.js   | 80 +++++++++++--------
 .../profiledetailsettingsaction.php           | 36 ++++++---
 4 files changed, 107 insertions(+), 74 deletions(-)

diff --git a/plugins/ExtendedProfile/extendedprofile.php b/plugins/ExtendedProfile/extendedprofile.php
index 94a5ef4826..711fdcf1bb 100644
--- a/plugins/ExtendedProfile/extendedprofile.php
+++ b/plugins/ExtendedProfile/extendedprofile.php
@@ -100,7 +100,7 @@ class ExtendedProfile
 
     function getPhones()
     {
-        $phones  = $this->fields['phone'];
+        $phones = (isset($this->fields['phone'])) ? $this->fields['phone'] : null;
         $pArrays = array();
 
         if (empty($phones)) {
@@ -109,22 +109,20 @@ class ExtendedProfile
                 'index' => 0,
                 'type'  => 'phone',
                 'vcard' => 'tel',
-                'multi' => true
+                'rel'   => 'office',
+                'value' => null
             );
         } else {
             for ($i = 0; $i < sizeof($phones); $i++) {
                 $pa = array(
                     'label' => _m('Phone'),
                     'type'  => 'phone',
-                    'index' => intva($phones[$i]->value_index),
+                    'index' => intval($phones[$i]->value_index),
                     'rel'   => $phones[$i]->rel,
                     'value' => $phones[$i]->field_value,
                     'vcard' => 'tel'
                 );
-                // Last phone record should allow adding more
-                if ($i == sizeof($phones) - 1) {
-                    $pa['multi'] = true;
-                }
+
                $pArrays[] = $pa;
             }
         }
diff --git a/plugins/ExtendedProfile/extendedprofilewidget.php b/plugins/ExtendedProfile/extendedprofilewidget.php
index 7eb195e369..d8c42df6a3 100644
--- a/plugins/ExtendedProfile/extendedprofilewidget.php
+++ b/plugins/ExtendedProfile/extendedprofilewidget.php
@@ -156,7 +156,7 @@ class ExtendedProfileWidget extends Form
             $this->out->text($this->ext->getTags());
             break;
         case 'phone':
-            $this->showPhone($field);
+            $this->showPhone($name, $field);
             break;
         default:
             $this->out->text("TYPE: $type");
@@ -169,7 +169,7 @@ class ExtendedProfileWidget extends Form
         }
     }
 
-    protected function showPhone($field)
+    protected function showPhone($name, $field)
     {
         $this->out->elementStart('div', array('class' => 'phone-display'));
         $this->out->text($field['value']);
@@ -181,7 +181,7 @@ class ExtendedProfileWidget extends Form
 
     protected function showEditablePhone($name, $field)
     {
-        $index = $field['index'];
+        $index = isset($field['index']) ? $field['index'] : 0;
         $id    = "extprofile-$name-$index";
         $rel   = $id . '-rel';
         $this->out->elementStart(
@@ -190,7 +190,11 @@ class ExtendedProfileWidget extends Form
                 'class' => 'phone-edit'
             )
         );
-        $this->out->input($id, null, $field['value']);
+        $this->out->input(
+            $id,
+            null,
+            isset($field['value']) ? $field['value'] : null
+        );
         $this->out->dropdown(
             $id . '-rel',
             'Type',
@@ -203,26 +207,29 @@ class ExtendedProfileWidget extends Form
             ),
             null,
             false,
-            $field['rel']
+            isset($field['rel']) ? $field['rel'] : null
         );
-        if ($field['multi']) {
-            $this->out->element(
-                'a',
-                array(
-                    'class' => 'add_row',
-                    'href' => 'javascript://'),
-                    '+'
-                );
-            $this->out->element(
-                'a',
-                array(
-                    'class' => 'remove_row',
-                    'href' => 'javascript://',
-                    'style' => 'display: none; '
-                    ),
-                    '-'
-                );
-        }
+
+        $this->out->element(
+            'a',
+            array(
+                'class' => 'add_row',
+                'href' => 'javascript://',
+                'style' => 'display: none; '
+            ),
+            '+'
+        );
+
+        $this->out->element(
+            'a',
+            array(
+                'class' => 'remove_row',
+                'href' => 'javascript://',
+                'style' => 'display: none; '
+            ),
+            '-'
+        );
+
         $this->out->elementEnd('div');
     }
 
diff --git a/plugins/ExtendedProfile/js/profiledetail.js b/plugins/ExtendedProfile/js/profiledetail.js
index a021a32645..7d7eceddc1 100644
--- a/plugins/ExtendedProfile/js/profiledetail.js
+++ b/plugins/ExtendedProfile/js/profiledetail.js
@@ -1,43 +1,35 @@
-var removeRow = function() {
-    var cnt = rowCount(this);
-    var table = $(this).closest('table');
-    console.log("row count = " + cnt);
-    if (cnt > 1) {
-        var target = $(this).closest('tr');
-        target.remove();
-        reorder(table);
-    }
-};
+var reorder = function(class) {
+    console.log("QQQ Enter reorder");
 
-var rowCount = function(row) {
-    var top = $(row).closest('table');
-    var trs = $(top).find('tr');
-    return trs.length - 1; // exclude th section header row
-};
+    var divs = $.find('div[class=' + class + ']');
+    console.log('divs length = ' + divs.length);
 
-var reorder = function(table) {
-    var trs = $(table).find('tr').has('td');
+    $(divs).find('a').hide();
 
-    $(trs).find('a').hide();
-
-    $(trs).each(function(i, tr) {
+    $(divs).each(function(i, div) {
         console.log("ROW " + i);
-        $(tr).find('a.remove_row').show();
-        replaceIndex(rowIndex(tr), i);
+        $(div).find('a.remove_row').show();
+        replaceIndex(rowIndex(div), i);
     });
 
-    $(trs).last().find('a.add_row').show();
+    $(divs).last().find('a.add_row').show();
 
-    if (trs.length == 1) {
-        $(trs).find('a.remove_row').hide();
+    if (divs.length == 1) {
+        $(divs).find('a.remove_row').hide();
     }
 
 };
 
-var rowIndex = function(elem) {
-    var idStr = $(elem).find('div').attr('id');
-    var id = idStr.match(/\d+/);
+var rowIndex = function(div) {
+    var idstr = $(div).attr('id');
+    var id = idstr.match(/\d+/);
     console.log("id = " + id);
+    return id;
+};
+
+var rowCount = function(class) {
+    var divs = $.find('div[class=' + class + ']');
+    return divs.length;
 };
 
 var replaceIndex = function(elem, oldIndex, newIndex) {
@@ -46,7 +38,7 @@ var replaceIndex = function(elem, oldIndex, newIndex) {
             var regexp = /extprofile-.*-\d.*/;
             var value = attrib.value;
             var match = value.match(regexp);
-            if (match != null) {
+            if (match !== null) {
                 attrib.value = value.replace("-" + oldIndex, "-" + newIndex);
                 console.log('match: oldIndex = ' + oldIndex + ' newIndex = ' + newIndex + ' name = ' + attrib.name + ' value = ' + attrib.value);
             }
@@ -60,22 +52,42 @@ var resetRow = function(elem) {
 }
 
 var addRow = function() {
-    var divId = $(this).closest('div').attr('id');
-    var index = divId.match(/\d+/);
-    console.log("Current row = " + index);
+    var div = $(this).closest('div');
+    var id = $(div).attr('id');
+    var class = $(div).attr('class');
+    var index = id.match(/\d+/);
+    console.log("Current row = " + index + ', class = ' + class);
     var tr = $(this).closest('tr');
     var newtr = $(tr).clone();
     var newIndex = parseInt(index) + 1;
     replaceIndex(newtr, index, newIndex);
     resetRow(newtr);
     $(tr).after(newtr);
-    console.log("number of rows: " + rowCount(tr));
-    reorder($(this).closest('table'));
+    reorder(class);
 };
 
+var removeRow = function() {
+    var div = $(this).closest('div');
+    var id = $(div).attr('id');
+    var class = $(div).attr('class');
+
+    cnt = rowCount(class);
+    console.debug("removeRow - cnt = " + cnt);
+    if (cnt > 1) {
+        var target = $(this).closest('tr');
+        target.remove();
+        reorder(class);
+    }
+};
+
+var init = function() {
+    reorder('phone-edit');
+}
+
 $(document).ready(
 
 function() {
+    init();
     $('.add_row').live('click', addRow);
     $('.remove_row').live('click', removeRow);
 }
diff --git a/plugins/ExtendedProfile/profiledetailsettingsaction.php b/plugins/ExtendedProfile/profiledetailsettingsaction.php
index ee450118c3..89b8d61cf9 100644
--- a/plugins/ExtendedProfile/profiledetailsettingsaction.php
+++ b/plugins/ExtendedProfile/profiledetailsettingsaction.php
@@ -107,7 +107,9 @@ class ProfileDetailSettingsAction extends ProfileSettingsAction
 
         foreach ($simpleFieldNames as $name) {
             $value = $this->trimmed('extprofile-' . $name);
-            $this->saveField($user, $name, $value);
+            if (!empty($value)) {
+                $this->saveField($user, $name, $value);
+            }
         }
 
         $this->savePhoneNumbers($user);
@@ -118,15 +120,19 @@ class ProfileDetailSettingsAction extends ProfileSettingsAction
 
     function savePhoneNumbers($user) {
         $phones = $this->findPhoneNumbers();
-
-        foreach ($phones as $phone) {
-            $this->saveField(
-                $user,
-                'phone',
-                $phone['value'],
-                $phone['rel'],
-                $phone['index']
-            );
+        $this->removeAll($user, 'phone');
+        $i = 0;
+        foreach($phones as $phone) {
+            if (!empty($phone['value'])) {
+                ++$i;
+                $this->saveField(
+                    $user,
+                    'phone',
+                    $phone['value'],
+                    $phone['rel'],
+                    $i
+                );
+            }
         }
     }
 
@@ -223,6 +229,16 @@ class ProfileDetailSettingsAction extends ProfileSettingsAction
         $detail->free();
     }
 
+    function removeAll($user, $name)
+    {
+        $profile = $user->getProfile();
+        $detail  = new Profile_detail();
+        $detail->profile_id  = $profile->id;
+        $detail->field_name  = $name;
+        $detail->delete();
+        $detail->free();
+    }
+
     /**
      * Save fields that should be stored in the main profile object
      *

From eaef01233a9b0d1bf3f21ae4a0065d078238973f Mon Sep 17 00:00:00 2001
From: Siebrand Mazeland <s.mazeland@xs4all.nl>
Date: Mon, 14 Mar 2011 18:01:22 +0100
Subject: [PATCH 550/655] Fix incorrect parameter documentation. Spotted by
 Nikerabbit.

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

diff --git a/actions/apigrouplist.php b/actions/apigrouplist.php
index 1f6d44363f..f80fbce932 100644
--- a/actions/apigrouplist.php
+++ b/actions/apigrouplist.php
@@ -100,7 +100,7 @@ class ApiGroupListAction extends ApiBareAuthAction
         );
 
         $subtitle   = sprintf(
-            // TRANS: Used as subtitle in check for group membership. %1$s is a user name, %2$s is the site name.
+            // TRANS: Used as subtitle in check for group membership. %1$s is the site name, %2$s is a user name.
             _('%1$s groups %2$s is a member of.'),
             $sitename,
             $this->user->nickname

From ed2d224df5e52b2fe5ef5f076d147791e48c4dcf Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Mon, 14 Mar 2011 12:22:49 -0700
Subject: [PATCH 551/655] Check the site minifications etting for realtime
 plugin; debugging aid.

---
 plugins/Realtime/RealtimePlugin.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/plugins/Realtime/RealtimePlugin.php b/plugins/Realtime/RealtimePlugin.php
index 246b1f9735..f617c39060 100644
--- a/plugins/Realtime/RealtimePlugin.php
+++ b/plugins/Realtime/RealtimePlugin.php
@@ -323,7 +323,12 @@ class RealtimePlugin extends Plugin
 
     function _getScripts()
     {
-        return array(Plugin::staticPath('Realtime', 'realtimeupdate.min.js'));
+        if (common_config('site', 'minify')) {
+            $js = 'realtimeupdate.min.js';
+        } else {
+            $js = 'realtimeupdate.js';
+        }
+        return array(Plugin::staticPath('Realtime', $js));
     }
 
     /**

From 4334bb71326d8b8bcc78c636942fa4bdec21bd60 Mon Sep 17 00:00:00 2001
From: Samantha Doherty <sammy@status.net>
Date: Mon, 14 Mar 2011 15:30:51 -0400
Subject: [PATCH 552/655] Adding wrapper divs for equal height columns.

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

diff --git a/lib/action.php b/lib/action.php
index 233ac78567..fce59ba8a0 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -681,6 +681,9 @@ class Action extends HTMLOutputter // lawsuit
     function showCore()
     {
         $this->elementStart('div', array('id' => 'core'));
+        $this->elementStart('div', array('id' => 'aside_primary_wrapper'));
+        $this->elementStart('div', array('id' => 'content_wrapper'));
+        $this->elementStart('div', array('id' => 'site_nav_local_views_wrapper'));
         if (Event::handle('StartShowLocalNavBlock', array($this))) {
             $this->showLocalNavBlock();
             Event::handle('EndShowLocalNavBlock', array($this));
@@ -694,6 +697,9 @@ class Action extends HTMLOutputter // lawsuit
             Event::handle('EndShowAside', array($this));
         }
         $this->elementEnd('div');
+        $this->elementEnd('div');
+        $this->elementEnd('div');
+        $this->elementEnd('div');
     }
 
     /**

From 640a033f8b7d17352f19a30990c106522b0ccd7d Mon Sep 17 00:00:00 2001
From: Samantha Doherty <sammy@status.net>
Date: Mon, 14 Mar 2011 15:31:19 -0400
Subject: [PATCH 553/655] Style changes for equal column heights.

---
 theme/neo/css/display.css | 70 ++++++++++++++++++++++++++++-----------
 1 file changed, 50 insertions(+), 20 deletions(-)

diff --git a/theme/neo/css/display.css b/theme/neo/css/display.css
index 22556bb891..682b6dd6dc 100644
--- a/theme/neo/css/display.css
+++ b/theme/neo/css/display.css
@@ -137,21 +137,46 @@ address {
 #core {
     clear: both;
     margin: 0px;
-    width: 960px;
+    width: 958px;
     border-top: 5px solid #FB6104;
-}
-
-#site_nav_local_views {
-    display: block;
-    float: left;
-    width: 138px;
-    margin-top: 0px;
-    padding: 10px;
-    padding-top: 22px;
-    background-color: #ececf2; 
     border-left: 1px solid #d8dae6;
     border-right: 1px solid #d8dae6;
-    min-height: 800px; /* XXX set up equal column heights! */
+}
+
+#aside_primary_wrapper {
+    width: 100%;
+    float: left;
+    overflow: hidden;
+    position: relative;
+    background-color: #ececf2;  
+}    
+
+#content_wrapper  {  
+    width: 100%;  
+    float: left;
+    position: relative;  
+    right: 239px; 
+    background-color: #fff;  
+    border-right: 1px solid #d8dae6;
+}  
+
+#site_nav_local_views_wrapper  {  
+    width: 100%;  
+    float: left;
+    position: relative;  
+    right: 561px;
+    background-color: #ececf2;  
+    border-right: 1px solid #d8dae6;
+}  
+
+#site_nav_local_views {
+    width: 138px;
+    float: left;
+    overflow: hidden;
+    position: relative;
+    left: 800px;
+    margin-top: 0px;
+    padding: 22px 10px 40px 10px;
 }
 
 #site_nav_local_views H3 {
@@ -196,8 +221,12 @@ address {
 
 #content {
     width: 520px;
-    margin-right: 0px;
-    padding: 20px;
+    float: left;
+    overflow: hidden;
+    position: relative;
+    left: 801px;
+    margin: 0px;
+    padding: 20px 20px 40px 20px;
 }
 
 /* Input forms */
@@ -357,13 +386,12 @@ address {
 
 #aside_primary {
     width: 218px;
-    padding: 10px;
-    padding-top: 22px;
+    float: left;
+    overflow: hidden;
+    position: relative;
+    left: 802px;
+    padding: 22px 10px 40px 10px;
     margin-top: 0px;
-    background-color: #ececf2; 
-    border-left: 1px solid #d8dae6;
-    border-right: 1px solid #d8dae6;
-    min-height: 800px; /* XXX set up equal column heights! */
 }
 
 #aside_primary .section {
@@ -665,6 +693,8 @@ div.entry-content a.response:after {
 }
 
 #footer {
+    position: relative;
+    top: -6px;
     color: #000;
     margin-left: 0px;
     margin-right: 0px;

From 1e36593a23bd8e50e50d115c28a7f8fa024fb768 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Mon, 14 Mar 2011 12:32:39 -0700
Subject: [PATCH 554/655] Realtime work in progress: switch makeNoticeData to
 async -- next we'll load fresh copies from server, maintaining proper
 language and plugin enhancements.

---
 plugins/Realtime/realtimeupdate.js | 82 +++++++++++++++---------------
 1 file changed, 42 insertions(+), 40 deletions(-)

diff --git a/plugins/Realtime/realtimeupdate.js b/plugins/Realtime/realtimeupdate.js
index e615895cab..73516a8ed9 100644
--- a/plugins/Realtime/realtimeupdate.js
+++ b/plugins/Realtime/realtimeupdate.js
@@ -163,50 +163,51 @@ RealtimeUpdate = {
             return;
         }
 
-        var noticeItem = RealtimeUpdate.makeNoticeItem(data);
-        var noticeItemID = $(noticeItem).attr('id');
+        RealtimeUpdate.makeNoticeItem(data, function(noticeItem) {
+            var noticeItemID = $(noticeItem).attr('id');
 
-        var list = $("#notices_primary .notices:first")
-        var prepend = true;
+            var list = $("#notices_primary .notices:first")
+            var prepend = true;
 
-        var threaded = list.hasClass('threaded-notices');
-        if (threaded && data.in_reply_to_status_id) {
-            // aho!
-            var parent = $('#notice-' + data.in_reply_to_status_id);
-            if (parent.length == 0) {
-                // @todo fetch the original, insert it, and finish the rest
-            } else {
-                // Check the parent notice to make sure it's not a reply itself.
-                // If so, use it's parent as the parent.
-                var parentList = parent.closest('.notices');
-                if (parentList.hasClass('threaded-replies')) {
-                    parent = parentList.closest('.notice');
+            var threaded = list.hasClass('threaded-notices');
+            if (threaded && data.in_reply_to_status_id) {
+                // aho!
+                var parent = $('#notice-' + data.in_reply_to_status_id);
+                if (parent.length == 0) {
+                    // @todo fetch the original, insert it, and finish the rest
+                } else {
+                    // Check the parent notice to make sure it's not a reply itself.
+                    // If so, use it's parent as the parent.
+                    var parentList = parent.closest('.notices');
+                    if (parentList.hasClass('threaded-replies')) {
+                        parent = parentList.closest('.notice');
+                    }
+                    list = parent.find('.threaded-replies');
+                    if (list.length == 0) {
+                        list = $('<ul class="notices threaded-replies xoxo"></ul>');
+                        parent.append(list);
+                    }
+                    prepend = false;
                 }
-                list = parent.find('.threaded-replies');
-                if (list.length == 0) {
-                    list = $('<ul class="notices threaded-replies xoxo"></ul>');
-                    parent.append(list);
-                }
-                prepend = false;
             }
-        }
 
-        var newNotice = $(noticeItem);
-        if (prepend) {
-            list.prepend(newNotice);
-        } else {
-            var placeholder = list.find('li.notice-reply-placeholder')
-            if (placeholder.length > 0) {
-                newNotice.insertBefore(placeholder)
+            var newNotice = $(noticeItem);
+            if (prepend) {
+                list.prepend(newNotice);
             } else {
-                newNotice.appendTo(list);
-                SN.U.NoticeInlineReplyPlaceholder(parent);
+                var placeholder = list.find('li.notice-reply-placeholder')
+                if (placeholder.length > 0) {
+                    newNotice.insertBefore(placeholder)
+                } else {
+                    newNotice.appendTo(list);
+                    SN.U.NoticeInlineReplyPlaceholder(parent);
+                }
             }
-        }
-        newNotice.css({display:"none"}).fadeIn(1000);
+            newNotice.css({display:"none"}).fadeIn(1000);
 
-        SN.U.NoticeReplyTo($('#'+noticeItemID));
-        SN.U.NoticeWithAttachment($('#'+noticeItemID));
+            SN.U.NoticeReplyTo($('#'+noticeItemID));
+            SN.U.NoticeWithAttachment($('#'+noticeItemID));
+        });
      },
 
      /**
@@ -263,10 +264,11 @@ RealtimeUpdate = {
      },
 
      /**
-      * Builds a notice HTML block from JSON API-style data.
+      * Builds a notice HTML block from JSON API-style data;
+      * loads data from server, so runs async.
       *
       * @param {Object} data: extended JSON API-formatted notice
-      * @return {String} HTML fragment
+      * @param {function} callback: function(str) to receive HTML fragment
       *
       * @fixme this replicates core StatusNet code, making maintenance harder
       * @fixme sloppy HTML building (raw concat without escaping)
@@ -275,7 +277,7 @@ RealtimeUpdate = {
       *
       * @access private
       */
-     makeNoticeItem: function(data)
+     makeNoticeItem: function(data, callback)
      {
           if (data.hasOwnProperty('retweeted_status')) {
                original = data['retweeted_status'];
@@ -342,7 +344,7 @@ RealtimeUpdate = {
           ni = ni+"</div>";
 
           ni = ni+"</li>";
-          return ni;
+          callback(ni);
      },
 
      /**

From 894bcd3bcddfec63544aa1f95a6e3b7fcb1a3f5d Mon Sep 17 00:00:00 2001
From: Samantha Doherty <sammy@status.net>
Date: Mon, 14 Mar 2011 15:36:00 -0400
Subject: [PATCH 555/655] Whoops, need to reset the background color on the
 aside.

---
 theme/neo/css/display.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/theme/neo/css/display.css b/theme/neo/css/display.css
index 682b6dd6dc..7cb5e11911 100644
--- a/theme/neo/css/display.css
+++ b/theme/neo/css/display.css
@@ -392,6 +392,7 @@ address {
     left: 802px;
     padding: 22px 10px 40px 10px;
     margin-top: 0px;
+    background: none;
 }
 
 #aside_primary .section {

From f11b788b5af29d325f17ebb77c321309a41e5e70 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Mon, 14 Mar 2011 12:53:49 -0700
Subject: [PATCH 556/655] Extended profile - add a date value for fields

---
 plugins/ExtendedProfile/Profile_detail.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugins/ExtendedProfile/Profile_detail.php b/plugins/ExtendedProfile/Profile_detail.php
index f9f4d00098..96869b0e63 100644
--- a/plugins/ExtendedProfile/Profile_detail.php
+++ b/plugins/ExtendedProfile/Profile_detail.php
@@ -64,6 +64,7 @@ class Profile_detail extends Managed_DataObject
     public $field_name;  // name
     public $field_value; // primary text value
     public $value_index; // relative ordering of multiple values in the same field
+    public $date;        // related date
     public $ref_profile; // for people types, allows pointing to a known profile in the system
     public $created;
     public $modified;
@@ -118,6 +119,7 @@ class Profile_detail extends Managed_DataObject
                 ),
                 'value_index' => array('type' => 'int'),
                 'field_value' => array('type' => 'text'),
+                'date'        => array('type' => 'datetime'),
                 'rel'         => array('type' => 'varchar', 'length' => 16),
                 'rel_profile' => array('type' => 'int'),
                 'created'     => array(

From c7e7cc79da4255c42dbc8500fc5d6db25d1f90c3 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Mon, 14 Mar 2011 13:05:30 -0700
Subject: [PATCH 557/655] 'ajax' param on shownotice action so we can pull
 items in full html version for realtime

---
 actions/shownotice.php | 48 ++++++++++++++++++++++++++++++------------
 1 file changed, 34 insertions(+), 14 deletions(-)

diff --git a/actions/shownotice.php b/actions/shownotice.php
index 3978f03ea9..8d8ab326df 100644
--- a/actions/shownotice.php
+++ b/actions/shownotice.php
@@ -188,22 +188,27 @@ class ShownoticeAction extends OwnerDesignAction
     {
         parent::handle($args);
 
-        if ($this->notice->is_local == Notice::REMOTE_OMB) {
-            if (!empty($this->notice->url)) {
-                $target = $this->notice->url;
-            } else if (!empty($this->notice->uri) && preg_match('/^https?:/', $this->notice->uri)) {
-                // Old OMB posts saved the remote URL only into the URI field.
-                $target = $this->notice->uri;
-            } else {
-                // Shouldn't happen.
-                $target = false;
-            }
-            if ($target && $target != $this->selfUrl()) {
-                common_redirect($target, 301);
-                return false;
+        if ($this->boolean('ajax')) {
+            StatusNet::setApi(true);
+            $this->showAjax();
+        } else {
+            if ($this->notice->is_local == Notice::REMOTE_OMB) {
+                if (!empty($this->notice->url)) {
+                    $target = $this->notice->url;
+                } else if (!empty($this->notice->uri) && preg_match('/^https?:/', $this->notice->uri)) {
+                    // Old OMB posts saved the remote URL only into the URI field.
+                    $target = $this->notice->uri;
+                } else {
+                    // Shouldn't happen.
+                    $target = false;
+                }
+                if ($target && $target != $this->selfUrl()) {
+                    common_redirect($target, 301);
+                    return false;
+                }
             }
+            $this->showPage();
         }
-        $this->showPage();
     }
 
     /**
@@ -232,6 +237,21 @@ class ShownoticeAction extends OwnerDesignAction
         $this->elementEnd('ol');
     }
 
+    function showAjax()
+    {
+        header('Content-Type: text/xml;charset=utf-8');
+        $this->xw->startDocument('1.0', 'UTF-8');
+        $this->elementStart('html');
+        $this->elementStart('head');
+        $this->element('title', null, _('Notice'));
+        $this->elementEnd('head');
+        $this->elementStart('body');
+        $nli = new NoticeListItem($this->notice, $this);
+        $nli->show();
+        $this->elementEnd('body');
+        $this->elementEnd('html');
+    }
+
     /**
      * Don't show page notice
      *

From 90d35885aeed68b11a80225ff255b6ac70a349b9 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Mon, 14 Mar 2011 13:29:35 -0700
Subject: [PATCH 558/655] Realtime plugin: fix i18n, thumbnails, location
 display, OStatus server display, micro-apps display.

Switch from manual local formatting of notices (which lacks all the server-side goodness) to calling into the server-side with an AJAX variant of shownotice.
---
 plugins/Realtime/README                |  7 +-
 plugins/Realtime/RealtimePlugin.php    | 11 +--
 plugins/Realtime/realtimeupdate.js     | 98 ++++----------------------
 plugins/Realtime/realtimeupdate.min.js |  2 +-
 4 files changed, 22 insertions(+), 96 deletions(-)

diff --git a/plugins/Realtime/README b/plugins/Realtime/README
index 9b36d87f37..0c52427eb6 100644
--- a/plugins/Realtime/README
+++ b/plugins/Realtime/README
@@ -1,9 +1,12 @@
+As of StatusNet 1.0.x, actual formatting of the notices is done server-side,
+loaded by AJAX after the real-time notification comes in. This has the drawback
+that we may make extra HTTP requests and delay incoming notices a little, but
+means that formatting and internationalization is consistent.
+
 == TODO ==
-* i18n
 * Update mark behaviour (on notice send)
 * Pause, Send a notice ~ should not update counter
 * Pause ~ retain up to 50-100 most recent notices
-* Add geo data
 * Make it work for Conversation page (perhaps a little tricky)
 * IE is updating the counter in document title all the time (Not sure if this
   is still an issue)
diff --git a/plugins/Realtime/RealtimePlugin.php b/plugins/Realtime/RealtimePlugin.php
index f617c39060..108a6c3b60 100644
--- a/plugins/Realtime/RealtimePlugin.php
+++ b/plugins/Realtime/RealtimePlugin.php
@@ -45,9 +45,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
  */
 class RealtimePlugin extends Plugin
 {
-    protected $replyurl = null;
-    protected $favorurl = null;
-    protected $deleteurl = null;
+    protected $showurl = null;
 
     /**
      * When it's time to initialize the plugin, calculate and
@@ -56,11 +54,8 @@ class RealtimePlugin extends Plugin
 
     function onInitializePlugin()
     {
-        $this->replyurl = common_local_url('newnotice');
-        $this->favorurl = common_local_url('favor');
-        $this->repeaturl = common_local_url('repeat');
         // FIXME: need to find a better way to pass this pattern in
-        $this->deleteurl = common_local_url('deletenotice',
+        $this->showurl = common_local_url('shownotice',
                                             array('notice' => '0000000000'));
         return true;
     }
@@ -359,7 +354,7 @@ class RealtimePlugin extends Plugin
 
     function _updateInitialize($timeline, $user_id)
     {
-        return "RealtimeUpdate.init($user_id, \"$this->replyurl\", \"$this->favorurl\", \"$this->repeaturl\", \"$this->deleteurl\"); ";
+        return "RealtimeUpdate.init($user_id, \"$this->showurl\"); ";
     }
 
     function _connect()
diff --git a/plugins/Realtime/realtimeupdate.js b/plugins/Realtime/realtimeupdate.js
index 73516a8ed9..59e3fe72d7 100644
--- a/plugins/Realtime/realtimeupdate.js
+++ b/plugins/Realtime/realtimeupdate.js
@@ -44,10 +44,7 @@
  */
 RealtimeUpdate = {
      _userid: 0,
-     _replyurl: '',
-     _favorurl: '',
-     _repeaturl: '',
-     _deleteurl: '',
+     _showurl: '',
      _updatecounter: 0,
      _maxnotices: 50,
      _windowhasfocus: true,
@@ -66,21 +63,15 @@ RealtimeUpdate = {
       * feed data into the RealtimeUpdate object!
       *
       * @param {int} userid: local profile ID of the currently logged-in user
-      * @param {String} replyurl: URL for newnotice action, used when generating reply buttons
-      * @param {String} favorurl: URL for favor action, used when generating fave buttons
-      * @param {String} repeaturl: URL for repeat action, used when generating repeat buttons
-      * @param {String} deleteurl: URL template for deletenotice action, used when generating delete buttons.
+      * @param {String} showurl: URL for shownotice action, used when fetching formatting notices.
       *                            This URL contains a stub value of 0000000000 which will be replaced with the notice ID.
       *
       * @access public
       */
-     init: function(userid, replyurl, favorurl, repeaturl, deleteurl)
+     init: function(userid, showurl)
      {
         RealtimeUpdate._userid = userid;
-        RealtimeUpdate._replyurl = replyurl;
-        RealtimeUpdate._favorurl = favorurl;
-        RealtimeUpdate._repeaturl = repeaturl;
-        RealtimeUpdate._deleteurl = deleteurl;
+        RealtimeUpdate._showurl = showurl;
 
         RealtimeUpdate._documenttitle = document.title;
 
@@ -268,83 +259,20 @@ RealtimeUpdate = {
       * loads data from server, so runs async.
       *
       * @param {Object} data: extended JSON API-formatted notice
-      * @param {function} callback: function(str) to receive HTML fragment
-      *
-      * @fixme this replicates core StatusNet code, making maintenance harder
-      * @fixme sloppy HTML building (raw concat without escaping)
-      * @fixme no i18n support
-      * @fixme local variables pollute global namespace
+      * @param {function} callback: function(DOMNode) to receive new code
       *
       * @access private
       */
      makeNoticeItem: function(data, callback)
      {
-          if (data.hasOwnProperty('retweeted_status')) {
-               original = data['retweeted_status'];
-               repeat   = data;
-               data     = original;
-               unique   = repeat['id'];
-               responsible = repeat['user'];
-          } else {
-               original = null;
-               repeat = null;
-               unique = data['id'];
-               responsible = data['user'];
-          }
-
-          user = data['user'];
-          html = data['html'].replace(/&lt;/g,'<').replace(/&gt;/g,'>').replace(/&quot;/g,'"').replace(/&amp;/g,'&');
-          source = data['source'].replace(/&lt;/g,'<').replace(/&gt;/g,'>').replace(/&quot;/g,'"').replace(/&amp;/g,'&');
-
-          ni = "<li class=\"hentry notice\" id=\"notice-"+unique+"\">"+
-               "<div class=\"entry-title\">"+
-               "<span class=\"vcard author\">"+
-               "<a href=\""+user['profile_url']+"\" class=\"url\" title=\""+user['name']+"\">"+
-               "<img src=\""+user['profile_image_url']+"\" class=\"avatar photo\" width=\"48\" height=\"48\" alt=\""+user['screen_name']+"\"/>"+
-               "<span class=\"nickname fn\">"+user['screen_name']+"</span>"+
-               "</a>"+
-               "</span>"+
-               "<p class=\"entry-content\">"+html+"</p>"+
-               "</div>"+
-               "<div class=\"entry-content\">"+
-               "<a class=\"timestamp\" rel=\"bookmark\" href=\""+data['url']+"\" >"+
-               "<abbr class=\"published\" title=\""+data['created_at']+"\">a few seconds ago</abbr>"+
-               "</a> "+
-               "<span class=\"source\">"+
-               "from "+
-                "<span class=\"device\">"+source+"</span>"+ // may have a link
-               "</span>";
-          if (data['conversation_url']) {
-               ni = ni+" <a class=\"response\" href=\""+data['conversation_url']+"\">in context</a>";
-          }
-
-          if (repeat) {
-               ru = repeat['user'];
-               ni = ni + "<span class=\"repeat vcard\">Repeated by " +
-                    "<a href=\"" + ru['profile_url'] + "\" class=\"url\">" +
-                    "<span class=\"nickname\">"+ ru['screen_name'] + "</span></a></span>";
-          }
-
-          ni = ni+"</div>";
-
-          ni = ni + "<div class=\"notice-options\">";
-
-          if (RealtimeUpdate._userid != 0) {
-               var input = $("form#form_notice fieldset input#token");
-               var session_key = input.val();
-               ni = ni+RealtimeUpdate.makeFavoriteForm(data['id'], session_key);
-               ni = ni+RealtimeUpdate.makeReplyLink(data['id'], data['user']['screen_name']);
-               if (RealtimeUpdate._userid == responsible['id']) {
-                    ni = ni+RealtimeUpdate.makeDeleteLink(data['id']);
-               } else if (RealtimeUpdate._userid != user['id']) {
-                    ni = ni+RealtimeUpdate.makeRepeatForm(data['id'],  session_key);
-               }
-          }
-
-          ni = ni+"</div>";
-
-          ni = ni+"</li>";
-          callback(ni);
+         var url = RealtimeUpdate._showurl.replace('0000000000', data.id);
+         $.get(url, {ajax: 1}, function(data, textStatus, xhr) {
+             var notice = $('li.notice:first', data);
+             if (notice.length) {
+                 var node = document._importNode(notice[0], true);
+                 callback(node);
+             }
+         });
      },
 
      /**
diff --git a/plugins/Realtime/realtimeupdate.min.js b/plugins/Realtime/realtimeupdate.min.js
index 931de982ef..7e77f90709 100644
--- a/plugins/Realtime/realtimeupdate.min.js
+++ b/plugins/Realtime/realtimeupdate.min.js
@@ -1 +1 @@
-RealtimeUpdate={_userid:0,_replyurl:"",_favorurl:"",_repeaturl:"",_deleteurl:"",_updatecounter:0,_maxnotices:50,_windowhasfocus:true,_documenttitle:"",_paused:false,_queuedNotices:[],init:function(c,b,d,e,a){RealtimeUpdate._userid=c;RealtimeUpdate._replyurl=b;RealtimeUpdate._favorurl=d;RealtimeUpdate._repeaturl=e;RealtimeUpdate._deleteurl=a;RealtimeUpdate._documenttitle=document.title;$(window).bind("focus",function(){RealtimeUpdate._windowhasfocus=true;RealtimeUpdate._updatecounter=0;RealtimeUpdate.removeWindowCounter()});$(window).bind("blur",function(){$("#notices_primary .notice").removeClass("mark-top");$("#notices_primary .notice:first").addClass("mark-top");RealtimeUpdate._windowhasfocus=false;return false})},receive:function(a){if(RealtimeUpdate.isNoticeVisible(a.id)){return}if(RealtimeUpdate._paused===false){RealtimeUpdate.purgeLastNoticeItem();RealtimeUpdate.insertNoticeItem(a)}else{RealtimeUpdate._queuedNotices.push(a);RealtimeUpdate.updateQueuedCounter()}RealtimeUpdate.updateWindowCounter()},insertNoticeItem:function(b){if(RealtimeUpdate.isNoticeVisible(b.id)){return}var a=RealtimeUpdate.makeNoticeItem(b);var c=$(a).attr("id");var d=$("#notices_primary .notices:first");var j=true;var e=d.hasClass("threaded-notices");if(e&&b.in_reply_to_status_id){var g=$("#notice-"+b.in_reply_to_status_id);if(g.length==0){}else{var h=g.closest(".notices");if(h.hasClass("threaded-replies")){g=h.closest(".notice")}d=g.find(".threaded-replies");if(d.length==0){d=$('<ul class="notices threaded-replies xoxo"></ul>');g.append(d)}j=false}}var i=$(a);if(j){d.prepend(i)}else{var f=d.find("li.notice-reply-placeholder");if(f.length>0){i.insertBefore(f)}else{i.appendTo(d);SN.U.NoticeInlineReplyPlaceholder(g)}}i.css({display:"none"}).fadeIn(1000);SN.U.NoticeReplyTo($("#"+c));SN.U.NoticeWithAttachment($("#"+c))},isNoticeVisible:function(a){return($("#notice-"+a).length>0)},purgeLastNoticeItem:function(){if($("#notices_primary .notice").length>RealtimeUpdate._maxnotices){$("#notices_primary .notice:last").remove()}},updateWindowCounter:function(){if(RealtimeUpdate._windowhasfocus===false){RealtimeUpdate._updatecounter+=1;document.title="("+RealtimeUpdate._updatecounter+") "+RealtimeUpdate._documenttitle}},removeWindowCounter:function(){document.title=RealtimeUpdate._documenttitle},makeNoticeItem:function(c){if(c.hasOwnProperty("retweeted_status")){original=c.retweeted_status;repeat=c;c=original;unique=repeat.id;responsible=repeat.user}else{original=null;repeat=null;unique=c.id;responsible=c.user}user=c.user;html=c.html.replace(/&lt;/g,"<").replace(/&gt;/g,">").replace(/&quot;/g,'"').replace(/&amp;/g,"&");source=c.source.replace(/&lt;/g,"<").replace(/&gt;/g,">").replace(/&quot;/g,'"').replace(/&amp;/g,"&");ni='<li class="hentry notice" id="notice-'+unique+'"><div class="entry-title"><span class="vcard author"><a href="'+user.profile_url+'" class="url" title="'+user.name+'"><img src="'+user.profile_image_url+'" class="avatar photo" width="48" height="48" alt="'+user.screen_name+'"/><span class="nickname fn">'+user.screen_name+'</span></a></span><p class="entry-content">'+html+'</p></div><div class="entry-content"><a class="timestamp" rel="bookmark" href="'+c.url+'" ><abbr class="published" title="'+c.created_at+'">a few seconds ago</abbr></a> <span class="source">from <span class="device">'+source+"</span></span>";if(c.conversation_url){ni=ni+' <a class="response" href="'+c.conversation_url+'">in context</a>'}if(repeat){ru=repeat.user;ni=ni+'<span class="repeat vcard">Repeated by <a href="'+ru.profile_url+'" class="url"><span class="nickname">'+ru.screen_name+"</span></a></span>"}ni=ni+"</div>";ni=ni+'<div class="notice-options">';if(RealtimeUpdate._userid!=0){var a=$("form#form_notice fieldset input#token");var b=a.val();ni=ni+RealtimeUpdate.makeFavoriteForm(c.id,b);ni=ni+RealtimeUpdate.makeReplyLink(c.id,c.user["screen_name"]);if(RealtimeUpdate._userid==responsible.id){ni=ni+RealtimeUpdate.makeDeleteLink(c.id)}else{if(RealtimeUpdate._userid!=user.id){ni=ni+RealtimeUpdate.makeRepeatForm(c.id,b)}}}ni=ni+"</div>";ni=ni+"</li>";return ni},makeFavoriteForm:function(c,b){var a;a='<form id="favor-'+c+'" class="form_favor" method="post" action="'+RealtimeUpdate._favorurl+'"><fieldset><legend>Favor this notice</legend><input name="token-'+c+'" type="hidden" id="token-'+c+'" value="'+b+'"/><input name="notice" type="hidden" id="notice-n'+c+'" value="'+c+'"/><input type="submit" id="favor-submit-'+c+'" name="favor-submit-'+c+'" class="submit" value="Favor" title="Favor this notice"/></fieldset></form>';return a},makeReplyLink:function(c,a){var b;b='<a class="notice_reply" href="'+RealtimeUpdate._replyurl+"?replyto="+a+'" title="Reply to this notice">Reply <span class="notice_id">'+c+"</span></a>";return b},makeRepeatForm:function(c,b){var a;a='<form id="repeat-'+c+'" class="form_repeat" method="post" action="'+RealtimeUpdate._repeaturl+'"><fieldset><legend>Repeat this notice?</legend><input name="token-'+c+'" type="hidden" id="token-'+c+'" value="'+b+'"/><input name="notice" type="hidden" id="notice-'+c+'" value="'+c+'"/><input type="submit" id="repeat-submit-'+c+'" name="repeat-submit-'+c+'" class="submit" value="Yes" title="Repeat this notice"/></fieldset></form>';return a},makeDeleteLink:function(c){var b,a;a=RealtimeUpdate._deleteurl.replace("0000000000",c);b='<a class="notice_delete" href="'+a+'" title="Delete this notice">Delete</a>';return b},initActions:function(a,b,c){$("#notices_primary").prepend('<ul id="realtime_actions"><li id="realtime_playpause"></li><li id="realtime_timeline"></li></ul>');RealtimeUpdate._pluginPath=c;RealtimeUpdate.initPlayPause();RealtimeUpdate.initAddPopup(a,b,RealtimeUpdate._pluginPath)},initPlayPause:function(){if(typeof(localStorage)=="undefined"){RealtimeUpdate.showPause()}else{if(localStorage.getItem("RealtimeUpdate_paused")==="true"){RealtimeUpdate.showPlay()}else{RealtimeUpdate.showPause()}}},showPause:function(){RealtimeUpdate.setPause(false);RealtimeUpdate.showQueuedNotices();RealtimeUpdate.addNoticesHover();$("#realtime_playpause").remove();$("#realtime_actions").prepend('<li id="realtime_playpause"><button id="realtime_pause" class="pause"></button></li>');$("#realtime_pause").text(SN.msg("realtime_pause")).attr("title",SN.msg("realtime_pause_tooltip")).bind("click",function(){RealtimeUpdate.removeNoticesHover();RealtimeUpdate.showPlay();return false})},showPlay:function(){RealtimeUpdate.setPause(true);$("#realtime_playpause").remove();$("#realtime_actions").prepend('<li id="realtime_playpause"><span id="queued_counter"></span> <button id="realtime_play" class="play"></button></li>');$("#realtime_play").text(SN.msg("realtime_play")).attr("title",SN.msg("realtime_play_tooltip")).bind("click",function(){RealtimeUpdate.showPause();return false})},setPause:function(a){RealtimeUpdate._paused=a;if(typeof(localStorage)!="undefined"){localStorage.setItem("RealtimeUpdate_paused",RealtimeUpdate._paused)}},showQueuedNotices:function(){$.each(RealtimeUpdate._queuedNotices,function(a,b){RealtimeUpdate.insertNoticeItem(b)});RealtimeUpdate._queuedNotices=[];RealtimeUpdate.removeQueuedCounter()},updateQueuedCounter:function(){$("#realtime_playpause #queued_counter").html("("+RealtimeUpdate._queuedNotices.length+")")},removeQueuedCounter:function(){$("#realtime_playpause #queued_counter").empty()},addNoticesHover:function(){$("#notices_primary .notices").hover(function(){if(RealtimeUpdate._paused===false){RealtimeUpdate.showPlay()}},function(){if(RealtimeUpdate._paused===true){RealtimeUpdate.showPause()}})},removeNoticesHover:function(){$("#notices_primary .notices").unbind()},initAddPopup:function(a,b,c){$("#realtime_timeline").append('<button id="realtime_popup"></button>');$("#realtime_popup").text(SN.msg("realtime_popup")).attr("title",SN.msg("realtime_popup_tooltip")).bind("click",function(){window.open(a,"","toolbar=no,resizable=yes,scrollbars=yes,status=no,menubar=no,personalbar=no,location=no,width=500,height=550");return false})},initPopupWindow:function(){$(".notices .entry-title a, .notices .entry-content a").bind("click",function(){window.open(this.href,"");return false});$("#showstream .entity_profile").css({width:"69%"})}};
\ No newline at end of file
+RealtimeUpdate={_userid:0,_showurl:"",_updatecounter:0,_maxnotices:50,_windowhasfocus:true,_documenttitle:"",_paused:false,_queuedNotices:[],init:function(a,b){RealtimeUpdate._userid=a;RealtimeUpdate._showurl=b;RealtimeUpdate._documenttitle=document.title;$(window).bind("focus",function(){RealtimeUpdate._windowhasfocus=true;RealtimeUpdate._updatecounter=0;RealtimeUpdate.removeWindowCounter()});$(window).bind("blur",function(){$("#notices_primary .notice").removeClass("mark-top");$("#notices_primary .notice:first").addClass("mark-top");RealtimeUpdate._windowhasfocus=false;return false})},receive:function(a){if(RealtimeUpdate.isNoticeVisible(a.id)){return}if(RealtimeUpdate._paused===false){RealtimeUpdate.purgeLastNoticeItem();RealtimeUpdate.insertNoticeItem(a)}else{RealtimeUpdate._queuedNotices.push(a);RealtimeUpdate.updateQueuedCounter()}RealtimeUpdate.updateWindowCounter()},insertNoticeItem:function(a){if(RealtimeUpdate.isNoticeVisible(a.id)){return}RealtimeUpdate.makeNoticeItem(a,function(b){var c=$(b).attr("id");var d=$("#notices_primary .notices:first");var j=true;var e=d.hasClass("threaded-notices");if(e&&a.in_reply_to_status_id){var g=$("#notice-"+a.in_reply_to_status_id);if(g.length==0){}else{var h=g.closest(".notices");if(h.hasClass("threaded-replies")){g=h.closest(".notice")}d=g.find(".threaded-replies");if(d.length==0){d=$('<ul class="notices threaded-replies xoxo"></ul>');g.append(d)}j=false}}var i=$(b);if(j){d.prepend(i)}else{var f=d.find("li.notice-reply-placeholder");if(f.length>0){i.insertBefore(f)}else{i.appendTo(d);SN.U.NoticeInlineReplyPlaceholder(g)}}i.css({display:"none"}).fadeIn(1000);SN.U.NoticeReplyTo($("#"+c));SN.U.NoticeWithAttachment($("#"+c))})},isNoticeVisible:function(a){return($("#notice-"+a).length>0)},purgeLastNoticeItem:function(){if($("#notices_primary .notice").length>RealtimeUpdate._maxnotices){$("#notices_primary .notice:last").remove()}},updateWindowCounter:function(){if(RealtimeUpdate._windowhasfocus===false){RealtimeUpdate._updatecounter+=1;document.title="("+RealtimeUpdate._updatecounter+") "+RealtimeUpdate._documenttitle}},removeWindowCounter:function(){document.title=RealtimeUpdate._documenttitle},makeNoticeItem:function(b,c){var a=RealtimeUpdate._showurl.replace("0000000000",b.id);$.get(a,{ajax:1},function(f,h,g){var e=$("li.notice:first",f);if(e.length){var d=document._importNode(e[0],true);c(d)}})},makeFavoriteForm:function(c,b){var a;a='<form id="favor-'+c+'" class="form_favor" method="post" action="'+RealtimeUpdate._favorurl+'"><fieldset><legend>Favor this notice</legend><input name="token-'+c+'" type="hidden" id="token-'+c+'" value="'+b+'"/><input name="notice" type="hidden" id="notice-n'+c+'" value="'+c+'"/><input type="submit" id="favor-submit-'+c+'" name="favor-submit-'+c+'" class="submit" value="Favor" title="Favor this notice"/></fieldset></form>';return a},makeReplyLink:function(c,a){var b;b='<a class="notice_reply" href="'+RealtimeUpdate._replyurl+"?replyto="+a+'" title="Reply to this notice">Reply <span class="notice_id">'+c+"</span></a>";return b},makeRepeatForm:function(c,b){var a;a='<form id="repeat-'+c+'" class="form_repeat" method="post" action="'+RealtimeUpdate._repeaturl+'"><fieldset><legend>Repeat this notice?</legend><input name="token-'+c+'" type="hidden" id="token-'+c+'" value="'+b+'"/><input name="notice" type="hidden" id="notice-'+c+'" value="'+c+'"/><input type="submit" id="repeat-submit-'+c+'" name="repeat-submit-'+c+'" class="submit" value="Yes" title="Repeat this notice"/></fieldset></form>';return a},makeDeleteLink:function(c){var b,a;a=RealtimeUpdate._deleteurl.replace("0000000000",c);b='<a class="notice_delete" href="'+a+'" title="Delete this notice">Delete</a>';return b},initActions:function(a,b,c){$("#notices_primary").prepend('<ul id="realtime_actions"><li id="realtime_playpause"></li><li id="realtime_timeline"></li></ul>');RealtimeUpdate._pluginPath=c;RealtimeUpdate.initPlayPause();RealtimeUpdate.initAddPopup(a,b,RealtimeUpdate._pluginPath)},initPlayPause:function(){if(typeof(localStorage)=="undefined"){RealtimeUpdate.showPause()}else{if(localStorage.getItem("RealtimeUpdate_paused")==="true"){RealtimeUpdate.showPlay()}else{RealtimeUpdate.showPause()}}},showPause:function(){RealtimeUpdate.setPause(false);RealtimeUpdate.showQueuedNotices();RealtimeUpdate.addNoticesHover();$("#realtime_playpause").remove();$("#realtime_actions").prepend('<li id="realtime_playpause"><button id="realtime_pause" class="pause"></button></li>');$("#realtime_pause").text(SN.msg("realtime_pause")).attr("title",SN.msg("realtime_pause_tooltip")).bind("click",function(){RealtimeUpdate.removeNoticesHover();RealtimeUpdate.showPlay();return false})},showPlay:function(){RealtimeUpdate.setPause(true);$("#realtime_playpause").remove();$("#realtime_actions").prepend('<li id="realtime_playpause"><span id="queued_counter"></span> <button id="realtime_play" class="play"></button></li>');$("#realtime_play").text(SN.msg("realtime_play")).attr("title",SN.msg("realtime_play_tooltip")).bind("click",function(){RealtimeUpdate.showPause();return false})},setPause:function(a){RealtimeUpdate._paused=a;if(typeof(localStorage)!="undefined"){localStorage.setItem("RealtimeUpdate_paused",RealtimeUpdate._paused)}},showQueuedNotices:function(){$.each(RealtimeUpdate._queuedNotices,function(a,b){RealtimeUpdate.insertNoticeItem(b)});RealtimeUpdate._queuedNotices=[];RealtimeUpdate.removeQueuedCounter()},updateQueuedCounter:function(){$("#realtime_playpause #queued_counter").html("("+RealtimeUpdate._queuedNotices.length+")")},removeQueuedCounter:function(){$("#realtime_playpause #queued_counter").empty()},addNoticesHover:function(){$("#notices_primary .notices").hover(function(){if(RealtimeUpdate._paused===false){RealtimeUpdate.showPlay()}},function(){if(RealtimeUpdate._paused===true){RealtimeUpdate.showPause()}})},removeNoticesHover:function(){$("#notices_primary .notices").unbind()},initAddPopup:function(a,b,c){$("#realtime_timeline").append('<button id="realtime_popup"></button>');$("#realtime_popup").text(SN.msg("realtime_popup")).attr("title",SN.msg("realtime_popup_tooltip")).bind("click",function(){window.open(a,"","toolbar=no,resizable=yes,scrollbars=yes,status=no,menubar=no,personalbar=no,location=no,width=500,height=550");return false})},initPopupWindow:function(){$(".notices .entry-title a, .notices .entry-content a").bind("click",function(){window.open(this.href,"");return false});$("#showstream .entity_profile").css({width:"69%"})}};
\ No newline at end of file

From 34e7d8ddf2cc95de329789eb67513d77e6245b28 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Mon, 14 Mar 2011 13:44:39 -0700
Subject: [PATCH 559/655] For good measure; trip short error mode in earlier on
 ajax shownotice

---
 actions/shownotice.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/actions/shownotice.php b/actions/shownotice.php
index 8d8ab326df..b8927372bb 100644
--- a/actions/shownotice.php
+++ b/actions/shownotice.php
@@ -78,6 +78,9 @@ class ShownoticeAction extends OwnerDesignAction
     function prepare($args)
     {
         parent::prepare($args);
+        if ($this->boolean('ajax')) {
+            StatusNet::setApi(true);
+        }
 
         $id = $this->arg('notice');
 
@@ -189,7 +192,6 @@ class ShownoticeAction extends OwnerDesignAction
         parent::handle($args);
 
         if ($this->boolean('ajax')) {
-            StatusNet::setApi(true);
             $this->showAjax();
         } else {
             if ($this->notice->is_local == Notice::REMOTE_OMB) {

From 27c75dd4bb1092199c1604700f6e5a5a6dbcb61b Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Mon, 14 Mar 2011 15:29:11 -0700
Subject: [PATCH 560/655] Extended profile - show and edit experience

---
 plugins/ExtendedProfile/extendedprofile.php   |  28 +++-
 .../ExtendedProfile/extendedprofilewidget.php | 146 +++++++++++++-----
 plugins/ExtendedProfile/js/profiledetail.js   |   1 +
 .../profiledetailsettingsaction.php           |  93 ++++++++++-
 4 files changed, 222 insertions(+), 46 deletions(-)

diff --git a/plugins/ExtendedProfile/extendedprofile.php b/plugins/ExtendedProfile/extendedprofile.php
index 711fdcf1bb..2277e4d769 100644
--- a/plugins/ExtendedProfile/extendedprofile.php
+++ b/plugins/ExtendedProfile/extendedprofile.php
@@ -129,6 +129,29 @@ class ExtendedProfile
         return $pArrays;
     }
 
+    function getExperiences()
+    {
+        $companies = (isset($this->fields['companies'])) ? $this->fields['company'] : null;
+        $start = (isset($this->fields['start'])) ? $this->fields['start'] : null;
+        $end   = (isset($this->fields['end'])) ? $this->fields['end'] : null;
+
+        $cArrays = array();
+
+        if (empty($experiences)) {
+            $eArrays[] = array(
+                'label'   => _m('Employer'),
+                'type'    => 'experience',
+                'company' => "Bozotronix",
+                'start'   => '1/5/10',
+                'end'     => '2/3/11',
+                'current' => true,
+                'index'   => 0
+            );
+        }
+
+        return $eArrays;
+    }
+
     /**
      *  Return all the sections of the extended profile
      *
@@ -206,10 +229,7 @@ class ExtendedProfile
             'experience' => array(
                 'label' => _m('Work experience'),
                 'fields' => array(
-                    'experience' => array(
-                        'type' => 'experience',
-                        'label' => _m('Employer'),
-                    ),
+                    'experience' => $this->getExperiences(),
                 ),
             ),
             'education' => array(
diff --git a/plugins/ExtendedProfile/extendedprofilewidget.php b/plugins/ExtendedProfile/extendedprofilewidget.php
index d8c42df6a3..9dfbaa716e 100644
--- a/plugins/ExtendedProfile/extendedprofilewidget.php
+++ b/plugins/ExtendedProfile/extendedprofilewidget.php
@@ -103,9 +103,13 @@ class ExtendedProfileWidget extends Form
         $this->out->elementStart('table', array('class' => 'extended-profile'));
 
         foreach ($section['fields'] as $fieldName => $field) {
-            if ($fieldName == 'phone') {
-                $this->showPhones($fieldName, $field);
-            } else {
+
+            switch($fieldName) {
+            case 'phone':
+            case 'experience':
+                $this->showMultiple($fieldName, $field);
+                break;
+            default:
                 $this->showExtendedProfileField($fieldName, $field);
             }
         }
@@ -135,37 +139,9 @@ class ExtendedProfileWidget extends Form
         $this->out->elementEnd('tr');
     }
 
-    /**
-     * Outputs the value of a field
-     *
-     * @param string $name  name of the field
-     * @param array  $field set of key/value pairs for the field
-     */
-    protected function showFieldValue($name, $field)
-    {
-        $type = strval(@$field['type']);
-
-        switch($type)
-        {
-        case '':
-        case 'text':
-        case 'textarea':
-            $this->out->text($this->ext->getTextValue($name));
-            break;
-        case 'tags':
-            $this->out->text($this->ext->getTags());
-            break;
-        case 'phone':
-            $this->showPhone($name, $field);
-            break;
-        default:
-            $this->out->text("TYPE: $type");
-        }
-    }
-
-    protected function showPhones($name, $field) {
-        foreach ($field as $phone) {
-            $this->showExtendedProfileField($name, $phone);
+    protected function showMultiple($name, $fields) {
+        foreach ($fields as $field) {
+            $this->showExtendedProfileField($name, $field);
         }
     }
 
@@ -210,6 +186,74 @@ class ExtendedProfileWidget extends Form
             isset($field['rel']) ? $field['rel'] : null
         );
 
+        $this->showMultiControls();
+        $this->out->elementEnd('div');
+    }
+
+    protected function showExperience($name, $field)
+    {
+        $this->out->elementStart('div', array('class' => 'experience-display'));
+        $this->out->text($field['company']);
+        $this->out->elementStart('dl', 'experience-start-and-end');
+        $this->out->element('dt', null, _m('Start'));
+        $this->out->element('dd', null, $field['start']);
+        $this->out->element('dt', null, _m('End'));
+        if ($field['current']) {
+            $this->out->element('dd', null, '(' . _m('Current') . ')');
+        } else {
+            $this->out->element('dd', null, $field['end']);
+        }
+        $this->out->elementEnd('dl');
+        $this->out->elementEnd('div');
+    }
+
+    protected function showEditableExperience($name, $field)
+    {
+        $index = isset($field['index']) ? $field['index'] : 0;
+        $id    = "extprofile-$name-$index";
+        $this->out->elementStart(
+            'div', array(
+                'id' => $id . '-edit',
+                'class' => 'experience-edit'
+            )
+        );
+
+        $this->out->input(
+            $id,
+            null,
+            isset($field['company']) ? $field['company'] : null
+        );
+
+        $this->out->elementStart('ul', 'experience-start-and-end');
+        $this->out->elementStart('li');
+        $this->out->input(
+            $id . '-start',
+            _m('Start'),
+            isset($field['start']) ? $field['start'] : null
+        );
+        $this->out->elementEnd('li');
+
+        $this->out->elementStart('li');
+        $this->out->input(
+            $id . '-end',
+            _m('End'),
+            isset($field['end']) ? $field['end'] : null
+        );
+        $this->out->elementEnd('li');
+        $this->out->elementStart('li');
+        $this->out->checkbox(
+            $id . '-current',
+            _m('Current'),
+            $field['current']
+        );
+        $this->out->elementEnd('li');
+        $this->out->elementEnd('ul');
+        $this->showMultiControls();
+        $this->out->elementEnd('div');
+    }
+
+    function showMultiControls()
+    {
         $this->out->element(
             'a',
             array(
@@ -229,8 +273,37 @@ class ExtendedProfileWidget extends Form
             ),
             '-'
         );
+    }
 
-        $this->out->elementEnd('div');
+    /**
+     * Outputs the value of a field
+     *
+     * @param string $name  name of the field
+     * @param array  $field set of key/value pairs for the field
+     */
+    protected function showFieldValue($name, $field)
+    {
+        $type = strval(@$field['type']);
+
+        switch($type)
+        {
+        case '':
+        case 'text':
+        case 'textarea':
+            $this->out->text($this->ext->getTextValue($name));
+            break;
+        case 'tags':
+            $this->out->text($this->ext->getTags());
+            break;
+        case 'phone':
+            $this->showPhone($name, $field);
+            break;
+        case 'experience':
+            $this->showExperience($name, $field);
+            break;
+        default:
+            $this->out->text("TYPE: $type");
+        }
     }
 
     /**
@@ -262,6 +335,9 @@ class ExtendedProfileWidget extends Form
         case 'phone':
             $this->showEditablePhone($name, $field);
             break;
+        case 'experience':
+            $this->showEditableExperience($name, $field);
+            break;
         default:
             $out->input($id, null, "TYPE: $type");
         }
diff --git a/plugins/ExtendedProfile/js/profiledetail.js b/plugins/ExtendedProfile/js/profiledetail.js
index 7d7eceddc1..4dc2faf2aa 100644
--- a/plugins/ExtendedProfile/js/profiledetail.js
+++ b/plugins/ExtendedProfile/js/profiledetail.js
@@ -82,6 +82,7 @@ var removeRow = function() {
 
 var init = function() {
     reorder('phone-edit');
+    reorder('experience-edit');
 }
 
 $(document).ready(
diff --git a/plugins/ExtendedProfile/profiledetailsettingsaction.php b/plugins/ExtendedProfile/profiledetailsettingsaction.php
index 89b8d61cf9..5e505f6c28 100644
--- a/plugins/ExtendedProfile/profiledetailsettingsaction.php
+++ b/plugins/ExtendedProfile/profiledetailsettingsaction.php
@@ -113,6 +113,7 @@ class ProfileDetailSettingsAction extends ProfileSettingsAction
         }
 
         $this->savePhoneNumbers($user);
+        $this->saveExperiences($user);
 
         $this->showForm(_('Details saved.'), true);
 
@@ -141,17 +142,12 @@ class ProfileDetailSettingsAction extends ProfileSettingsAction
         $phoneParams = $this->findMultiParams('phone');
         ksort($phoneParams); // this sorts them into pairs
         $phones = $this->arraySplit($phoneParams, sizeof($phoneParams) / 2);
-
         $phoneTuples = array();
 
-        foreach($phones as $phone) {
-            $firstkey           = current(array_keys($phone));
-            $index              = substr($firstkey, strrpos($firstkey, '-') + 1);
+        foreach ($phones as $phone) {
             list($number, $rel) = array_values($phone);
-
             $phoneTuples[] = array(
                 'value' => $number,
-                'index' => $index,
                 'rel'   => $rel
             );
         }
@@ -159,6 +155,86 @@ class ProfileDetailSettingsAction extends ProfileSettingsAction
         return $phoneTuples;
     }
 
+    function findExperiences() {
+
+        // Form vals look like this:
+        // 'extprofile-experience-0'         => 'Bozotronix',
+        // 'extprofile-experience-0-current' => 'true'
+        // 'extprofile-experience-0-start'   => '1/5/10',
+        // 'extprofile-experience-0-end'     => '2/3/11',
+
+        $experiences = array();
+        $expParams = $this->findMultiParams('experience');
+        ksort($expParams);
+        $experiences = $this->arraySplit($expParams, sizeof($expParams) / 4);
+        $expArray = array();
+
+        foreach ($experiences as $exp) {
+            list($company, $current, $start, $end) = array_values($exp);
+            $expArray[] = array(
+                'company' => $company,
+                'start'   => $start,
+                'end'     => $end,
+                'current' => $current,
+            );
+        }
+
+        return $expArray;
+    }
+
+    function saveExperiences($user) {
+        common_debug('save experiences');
+        $experiences = $this->findExperiences();
+
+        $this->removeAll($user, 'company');
+        $this->removeAll($user, 'start');
+        $this->removeAll($user, 'end'); // also stores 'current'
+
+        $i = 0;
+        foreach($experiences as $experience) {
+            if (!empty($experience['company'])) {
+                ++$i;
+                $this->saveField(
+                    $user,
+                    'company',
+                    $experience['company'],
+                    null,
+                    $i
+                );
+           /*
+                $this->saveField(
+                    $user,
+                    'start',
+                    null,
+                    null,
+                    $i,
+                    $experience['start']
+                );
+
+                // Save "current" employer indicator in rel
+                if ($experience['current']) {
+                    $this->saveField(
+                        $user,
+                        'end',
+                        null,
+                        'current', // rel
+                        $i
+                    );
+                } else {
+                    $this->saveField(
+                        $user,
+                        'end',
+                        null,
+                        null,
+                        $i,
+                        $experience['end']
+                    );
+                }
+                */
+            }
+        }
+    }
+
     function arraySplit($array, $pieces)
     {
         if ($pieces < 2) {
@@ -191,8 +267,9 @@ class ProfileDetailSettingsAction extends ProfileSettingsAction
      * @param string $value   field value
      * @param string $rel     field rel (type)
      * @param int    $index   index (fields can have multiple values)
+     * @param date   $date    related date
      */
-    function saveField($user, $name, $value, $rel = null, $index = null)
+    function saveField($user, $name, $value, $rel = null, $index = null, $date = null)
     {
         $profile = $user->getProfile();
         $detail  = new Profile_detail();
@@ -207,6 +284,7 @@ class ProfileDetailSettingsAction extends ProfileSettingsAction
             $detial->value_index = $index;
             $detail->rel         = $rel;
             $detail->field_value = $value;
+            $detail->date        = $date;
             $detail->created     = common_sql_now();
             $result = $detail->insert();
             if (empty($result)) {
@@ -218,6 +296,7 @@ class ProfileDetailSettingsAction extends ProfileSettingsAction
 
             $detail->field_value = $value;
             $detail->rel         = $rel;
+            $detail->date        = $date;
 
             $result = $detail->update($orig);
             if (empty($result)) {

From 07ccb6a9f839f39ab6c1763dc4f49e6d29b98147 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Mon, 14 Mar 2011 17:27:50 -0700
Subject: [PATCH 561/655] Extended profile - make experience save and display

---
 plugins/ExtendedProfile/extendedprofile.php   | 28 ++++++---
 .../ExtendedProfile/extendedprofilewidget.php |  4 ++
 .../profiledetailsettingsaction.php           | 61 +++++++++++++------
 3 files changed, 65 insertions(+), 28 deletions(-)

diff --git a/plugins/ExtendedProfile/extendedprofile.php b/plugins/ExtendedProfile/extendedprofile.php
index 2277e4d769..b6844e205f 100644
--- a/plugins/ExtendedProfile/extendedprofile.php
+++ b/plugins/ExtendedProfile/extendedprofile.php
@@ -131,24 +131,36 @@ class ExtendedProfile
 
     function getExperiences()
     {
-        $companies = (isset($this->fields['companies'])) ? $this->fields['company'] : null;
+        $companies = (isset($this->fields['company'])) ? $this->fields['company'] : null;
         $start = (isset($this->fields['start'])) ? $this->fields['start'] : null;
         $end   = (isset($this->fields['end'])) ? $this->fields['end'] : null;
 
-        $cArrays = array();
+        $eArrays = array();
 
-        if (empty($experiences)) {
+        if (empty($companies)) {
             $eArrays[] = array(
                 'label'   => _m('Employer'),
                 'type'    => 'experience',
-                'company' => "Bozotronix",
-                'start'   => '1/5/10',
-                'end'     => '2/3/11',
-                'current' => true,
+                'company' => null,
+                'start'   => null,
+                'end'     => null,
+                'current' => false,
                 'index'   => 0
             );
+        } else {
+            for ($i = 0; $i < sizeof($companies); $i++) {
+                $ea = array(
+                    'label'   => _m('Employer'),
+                    'type'    => 'experience',
+                    'company' => $companies[$i]->field_value,
+                    'index'   => intval($companies[$i]->value_index),
+                    'current' => $end[$i]->rel,
+                    'start'   => $start[$i]->date,
+                    'end'     => $end[$i]->date
+                );
+               $eArrays[] = $ea;
+            }
         }
-
         return $eArrays;
     }
 
diff --git a/plugins/ExtendedProfile/extendedprofilewidget.php b/plugins/ExtendedProfile/extendedprofilewidget.php
index 9dfbaa716e..478990ac63 100644
--- a/plugins/ExtendedProfile/extendedprofilewidget.php
+++ b/plugins/ExtendedProfile/extendedprofilewidget.php
@@ -241,6 +241,10 @@ class ExtendedProfileWidget extends Form
         );
         $this->out->elementEnd('li');
         $this->out->elementStart('li');
+        $this->out->hidden(
+            $id . '-current',
+            'false'
+        );
         $this->out->checkbox(
             $id . '-current',
             _m('Current'),
diff --git a/plugins/ExtendedProfile/profiledetailsettingsaction.php b/plugins/ExtendedProfile/profiledetailsettingsaction.php
index 5e505f6c28..56f81d7a2d 100644
--- a/plugins/ExtendedProfile/profiledetailsettingsaction.php
+++ b/plugins/ExtendedProfile/profiledetailsettingsaction.php
@@ -95,26 +95,27 @@ class ProfileDetailSettingsAction extends ProfileSettingsAction
         $user = common_current_user();
 
         try {
-           $this->saveStandardProfileDetails($user);
+            $this->saveStandardProfileDetails($user);
+
+            $profile = $user->getProfile();
+
+            $simpleFieldNames = array('title', 'spouse', 'kids');
+
+            foreach ($simpleFieldNames as $name) {
+                $value = $this->trimmed('extprofile-' . $name);
+                if (!empty($value)) {
+                    $this->saveField($user, $name, $value);
+                }
+            }
+
+            $this->savePhoneNumbers($user);
+            $this->saveExperiences($user);
+
         } catch (Exception $e) {
             $this->showForm($e->getMessage(), false);
             return;
         }
 
-        $profile = $user->getProfile();
-
-        $simpleFieldNames = array('title', 'spouse', 'kids');
-
-        foreach ($simpleFieldNames as $name) {
-            $value = $this->trimmed('extprofile-' . $name);
-            if (!empty($value)) {
-                $this->saveField($user, $name, $value);
-            }
-        }
-
-        $this->savePhoneNumbers($user);
-        $this->saveExperiences($user);
-
         $this->showForm(_('Details saved.'), true);
 
     }
@@ -170,11 +171,31 @@ class ProfileDetailSettingsAction extends ProfileSettingsAction
         $expArray = array();
 
         foreach ($experiences as $exp) {
-            list($company, $current, $start, $end) = array_values($exp);
+
+            common_debug('Experience: ' . var_export($exp, true));
+
+            list($company, $current, $end, $start) = array_values($exp);
+
+            $startTs = strtotime($start);
+
+            if ($startTs === false) {
+                throw new Exception(
+                    sprintf(_m("Invalid start date: %s"), $start)
+                );
+            }
+
+            $endTs = strtotime($end);
+
+            if ($current === 'false' && $endTs === false) {
+                throw new Exception(
+                    sprintf(_m("Invalid end date: %s"), $start)
+                );
+            }
+
             $expArray[] = array(
                 'company' => $company,
-                'start'   => $start,
-                'end'     => $end,
+                'start'   => common_sql_date($startTs),
+                'end'     => common_sql_date($endTs),
                 'current' => $current,
             );
         }
@@ -201,7 +222,7 @@ class ProfileDetailSettingsAction extends ProfileSettingsAction
                     null,
                     $i
                 );
-           /*
+
                 $this->saveField(
                     $user,
                     'start',
@@ -230,7 +251,7 @@ class ProfileDetailSettingsAction extends ProfileSettingsAction
                         $experience['end']
                     );
                 }
-                */
+
             }
         }
     }

From 0fd4b84eb87b30fb2ab322225119c73195c144c2 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Mon, 14 Mar 2011 17:53:54 -0700
Subject: [PATCH 562/655] Extended profile - better error handling for bad
 dates

---
 .../profiledetailsettingsaction.php           | 33 ++++++++++---------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/plugins/ExtendedProfile/profiledetailsettingsaction.php b/plugins/ExtendedProfile/profiledetailsettingsaction.php
index 56f81d7a2d..74b2fa667b 100644
--- a/plugins/ExtendedProfile/profiledetailsettingsaction.php
+++ b/plugins/ExtendedProfile/profiledetailsettingsaction.php
@@ -139,10 +139,8 @@ class ProfileDetailSettingsAction extends ProfileSettingsAction
     }
 
     function findPhoneNumbers() {
-        $phones      = array();
-        $phoneParams = $this->findMultiParams('phone');
-        ksort($phoneParams); // this sorts them into pairs
-        $phones = $this->arraySplit($phoneParams, sizeof($phoneParams) / 2);
+
+        $phones = $this->sliceParams('phone', 2);
         $phoneTuples = array();
 
         foreach ($phones as $phone) {
@@ -156,6 +154,14 @@ class ProfileDetailSettingsAction extends ProfileSettingsAction
         return $phoneTuples;
     }
 
+    function sliceParams($key, $size) {
+        $slice = array();
+        $params = $this->findMultiParams($key);
+        ksort($params);
+        $slice = $this->arraySplit($params, sizeof($params) / $size);
+        return $slice;
+    }
+
     function findExperiences() {
 
         // Form vals look like this:
@@ -164,10 +170,7 @@ class ProfileDetailSettingsAction extends ProfileSettingsAction
         // 'extprofile-experience-0-start'   => '1/5/10',
         // 'extprofile-experience-0-end'     => '2/3/11',
 
-        $experiences = array();
-        $expParams = $this->findMultiParams('experience');
-        ksort($expParams);
-        $experiences = $this->arraySplit($expParams, sizeof($expParams) / 4);
+        $experiences = $this->sliceParams('experience', 4);
         $expArray = array();
 
         foreach ($experiences as $exp) {
@@ -179,24 +182,24 @@ class ProfileDetailSettingsAction extends ProfileSettingsAction
             $startTs = strtotime($start);
 
             if ($startTs === false) {
-                throw new Exception(
-                    sprintf(_m("Invalid start date: %s"), $start)
-                );
+                $msg = empty($start) ? _m('You must supply a start date.')
+                    : sprintf(_m("Invalid start date: %s"), $start);
+                throw new Exception($msg);
             }
 
             $endTs = strtotime($end);
 
             if ($current === 'false' && $endTs === false) {
-                throw new Exception(
-                    sprintf(_m("Invalid end date: %s"), $start)
-                );
+                $msg = empty($end) ? _m('You must supply an end date.')
+                    : sprintf(_m("Invalid end date: %s"), $end);
+                throw new Exception($msg);
             }
 
             $expArray[] = array(
                 'company' => $company,
                 'start'   => common_sql_date($startTs),
                 'end'     => common_sql_date($endTs),
-                'current' => $current,
+                'current' => ($current == 'false') ? false : true
             );
         }
 

From c6a6d41dab2286caa387e6a8a5c3ffc46b773f22 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Tue, 15 Mar 2011 02:09:22 +0000
Subject: [PATCH 563/655] Extended profile - change HTML output for displaying
 work experience

---
 .../ExtendedProfile/extendedprofilewidget.php | 21 ++++++++++---------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/plugins/ExtendedProfile/extendedprofilewidget.php b/plugins/ExtendedProfile/extendedprofilewidget.php
index 478990ac63..4c47987406 100644
--- a/plugins/ExtendedProfile/extendedprofilewidget.php
+++ b/plugins/ExtendedProfile/extendedprofilewidget.php
@@ -192,18 +192,19 @@ class ExtendedProfileWidget extends Form
 
     protected function showExperience($name, $field)
     {
-        $this->out->elementStart('div', array('class' => 'experience-display'));
-        $this->out->text($field['company']);
-        $this->out->elementStart('dl', 'experience-start-and-end');
-        $this->out->element('dt', null, _m('Start'));
-        $this->out->element('dd', null, $field['start']);
-        $this->out->element('dt', null, _m('End'));
+        $this->out->elementStart('div', 'experience-item');
+        $this->out->element('div', 'field', $field['company']);
+        $this->out->element('div', 'label', _m('Start'));
+        $this->out->element('div', array('class' => 'field date'), $field['start']);
+        $this->out->element('div', 'label', _m('End'));
+        $this->out->element('div', array('class' => 'field date'), $field['end']);
         if ($field['current']) {
-            $this->out->element('dd', null, '(' . _m('Current') . ')');
-        } else {
-            $this->out->element('dd', null, $field['end']);
+            $this->out->element(
+                'div',
+                array('class' => 'field current'),
+                '(' . _m('Current') . ')'
+            );
         }
-        $this->out->elementEnd('dl');
         $this->out->elementEnd('div');
     }
 

From 0ff7bf77e4c208030ece6de13e8488d3845e224c Mon Sep 17 00:00:00 2001
From: Samantha Doherty <sammy@status.net>
Date: Mon, 14 Mar 2011 22:40:31 -0400
Subject: [PATCH 564/655] Couple quick fixes for profile view.

---
 plugins/ExtendedProfile/profiledetailaction.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/plugins/ExtendedProfile/profiledetailaction.php b/plugins/ExtendedProfile/profiledetailaction.php
index beac7d6321..a777a28e03 100644
--- a/plugins/ExtendedProfile/profiledetailaction.php
+++ b/plugins/ExtendedProfile/profiledetailaction.php
@@ -36,7 +36,7 @@ class ProfileDetailAction extends ShowstreamAction
 
     function showStylesheets() {
         parent::showStylesheets();
-        $this->cssLink('plugins/ExtendedProfile/profiledetail.css');
+        $this->cssLink('plugins/ExtendedProfile/css/profiledetail.css');
         return true;
     }
 
@@ -45,6 +45,7 @@ class ProfileDetailAction extends ShowstreamAction
         $cur = common_current_user();
         if ($cur && $cur->id == $this->profile->id) { // your own page
             $this->elementStart('div', 'entity_actions');
+            $this->elementStart('ul');
             $this->elementStart('li', 'entity_edit');
             $this->element('a', array('href' => common_local_url('profiledetailsettings'),
                                       // TRANS: Link title for link on user profile.
@@ -52,6 +53,7 @@ class ProfileDetailAction extends ShowstreamAction
                            // TRANS: Link text for link on user profile.
                            _m('Edit'));
             $this->elementEnd('li');
+            $this->elementEnd('ul');
             $this->elementEnd('div');
         }
 

From bd238e9a4de7aafbb9dd70307e965b2ba9bab6e9 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Mon, 14 Mar 2011 20:58:35 -0700
Subject: [PATCH 565/655] Extended profile - HTML layout for education entries

---
 plugins/ExtendedProfile/extendedprofile.php   | 46 ++++++++++--
 .../ExtendedProfile/extendedprofilewidget.php | 75 +++++++++++++++++++
 .../profiledetailsettingsaction.php           | 32 ++++----
 3 files changed, 132 insertions(+), 21 deletions(-)

diff --git a/plugins/ExtendedProfile/extendedprofile.php b/plugins/ExtendedProfile/extendedprofile.php
index b6844e205f..713d5c601a 100644
--- a/plugins/ExtendedProfile/extendedprofile.php
+++ b/plugins/ExtendedProfile/extendedprofile.php
@@ -164,6 +164,45 @@ class ExtendedProfile
         return $eArrays;
     }
 
+    function getEducation()
+    {
+        $schools = (isset($this->fields['school'])) ? $this->fields['school'] : null;
+        $degrees = (isset($this->fields['degree'])) ? $this->fields['degree'] : null;
+        $descs = (isset($this->fields['degree_description'])) ? $this->fields['degree_description'] : null;
+        $start = (isset($this->fields['school_start'])) ? $this->fields['school_start'] : null;
+        $end = (isset($this->fields['school_end'])) ? $this->fields['school_end'] : null;
+        $iArrays = array();
+
+        if (empty($schools)) {
+            $iArrays[] = array(
+                'type' => 'education',
+                'label' => _m('Institution'),
+                'school' => null,
+                'degree' => null,
+                'description' => null,
+                'start' => null,
+                'end' => null,
+                'index' => 0
+            );
+        } else {
+            for ($i = 0; $i < sizeof($schools); $i++) {
+                $ia = array(
+                    'type'    => 'education',
+                    'label'   => _m('Institution'),
+                    'school'  => $schools[$i]->field_value,
+                    'degree'  => $degrees[$i]->field_value,
+                    'description' => $descs[$i]->field_value,
+                    'index'   => intval($schools[$i]->value_index),
+                    'start'   => $start[$i]->date,
+                    'end'     => $end[$i]->date
+                );
+               $iArrays[] = $ia;
+            }
+        }
+
+        return $iArrays;
+    }
+
     /**
      *  Return all the sections of the extended profile
      *
@@ -241,16 +280,13 @@ class ExtendedProfile
             'experience' => array(
                 'label' => _m('Work experience'),
                 'fields' => array(
-                    'experience' => $this->getExperiences(),
+                    'experience' => $this->getExperiences()
                 ),
             ),
             'education' => array(
                 'label' => _m('Education'),
                 'fields' => array(
-                    'education' => array(
-                        'type' => 'education',
-                        'label' => _m('Institution'),
-                    ),
+                    'education' => $this->getEducation()
                 ),
             ),
         );
diff --git a/plugins/ExtendedProfile/extendedprofilewidget.php b/plugins/ExtendedProfile/extendedprofilewidget.php
index 4c47987406..967cf6dd20 100644
--- a/plugins/ExtendedProfile/extendedprofilewidget.php
+++ b/plugins/ExtendedProfile/extendedprofilewidget.php
@@ -107,6 +107,7 @@ class ExtendedProfileWidget extends Form
             switch($fieldName) {
             case 'phone':
             case 'experience':
+            case 'education':
                 $this->showMultiple($fieldName, $field);
                 break;
             default:
@@ -257,6 +258,74 @@ class ExtendedProfileWidget extends Form
         $this->out->elementEnd('div');
     }
 
+    protected function showEducation($name, $field)
+    {
+        $this->out->elementStart('div', 'education-item');
+        $this->out->element('div', 'field', $field['school']);
+        $this->out->element('div', 'label', _m('Degree'));
+        $this->out->element('div', 'field', $field['degree']);
+        $this->out->element('div', 'label', _m('Description'));
+        $this->out->element('div', 'field', $field['description']);
+        $this->out->element('div', 'label', _m('Start'));
+        $this->out->element('div', array('class' => 'field date'), $field['start']);
+        $this->out->element('div', 'label', _m('End'));
+        $this->out->element('div', array('class' => 'field date'), $field['end']);
+        $this->out->elementEnd('div');
+    }
+
+    protected function showEditableEducation($name, $field)
+    {
+        $index = isset($field['index']) ? $field['index'] : 0;
+        $id    = "extprofile-$name-$index";
+        $this->out->elementStart(
+            'div', array(
+                'id' => $id . '-edit',
+                'class' => 'education-edit'
+            )
+        );
+        $this->out->input(
+            $id,
+            null,
+            isset($field['school']) ? $field['school'] : null
+        );
+
+        $this->out->element('div', 'label', _m('Degree'));
+        $this->out->input(
+            $id,
+            null,
+            isset($field['degree']) ? $field['degree'] : null
+        );
+
+        $this->out->element('div', 'label', _m('Description'));
+        $this->out->element('div', 'field', $field['description']);
+
+        $this->out->input(
+            $id,
+            null,
+            isset($field['description']) ? $field['description'] : null
+        );
+
+        $this->out->elementStart('ul', 'education-start-and-end');
+        $this->out->elementStart('li');
+        $this->out->input(
+            $id . '-start',
+            _m('Start'),
+            isset($field['start']) ? $field['start'] : null
+        );
+        $this->out->elementEnd('li');
+
+        $this->out->elementStart('li');
+        $this->out->input(
+            $id . '-end',
+            _m('End'),
+            isset($field['end']) ? $field['end'] : null
+        );
+        $this->out->elementEnd('ul');
+
+        $this->showMultiControls();
+        $this->out->elementEnd('div');
+    }
+
     function showMultiControls()
     {
         $this->out->element(
@@ -306,6 +375,9 @@ class ExtendedProfileWidget extends Form
         case 'experience':
             $this->showExperience($name, $field);
             break;
+        case 'education':
+            $this->showEducation($name, $field);
+            break;
         default:
             $this->out->text("TYPE: $type");
         }
@@ -343,6 +415,9 @@ class ExtendedProfileWidget extends Form
         case 'experience':
             $this->showEditableExperience($name, $field);
             break;
+        case 'education':
+            $this->showEditableEducation($name, $field);
+            break;
         default:
             $out->input($id, null, "TYPE: $type");
         }
diff --git a/plugins/ExtendedProfile/profiledetailsettingsaction.php b/plugins/ExtendedProfile/profiledetailsettingsaction.php
index 74b2fa667b..7870c273ba 100644
--- a/plugins/ExtendedProfile/profiledetailsettingsaction.php
+++ b/plugins/ExtendedProfile/profiledetailsettingsaction.php
@@ -140,26 +140,22 @@ class ProfileDetailSettingsAction extends ProfileSettingsAction
 
     function findPhoneNumbers() {
 
-        $phones = $this->sliceParams('phone', 2);
-        $phoneTuples = array();
+        // Form vals look like this:
+        // 'extprofile-phone-1' => '11332',
+        // 'extprofile-phone-1-rel' => 'mobile',
+
+        $phones     = $this->sliceParams('phone', 2);
+        $phoneArray = array();
 
         foreach ($phones as $phone) {
             list($number, $rel) = array_values($phone);
-            $phoneTuples[] = array(
+            $phoneArray[] = array(
                 'value' => $number,
                 'rel'   => $rel
             );
         }
 
-        return $phoneTuples;
-    }
-
-    function sliceParams($key, $size) {
-        $slice = array();
-        $params = $this->findMultiParams($key);
-        ksort($params);
-        $slice = $this->arraySplit($params, sizeof($params) / $size);
-        return $slice;
+        return $phoneArray;
     }
 
     function findExperiences() {
@@ -174,11 +170,7 @@ class ProfileDetailSettingsAction extends ProfileSettingsAction
         $expArray = array();
 
         foreach ($experiences as $exp) {
-
-            common_debug('Experience: ' . var_export($exp, true));
-
             list($company, $current, $end, $start) = array_values($exp);
-
             $startTs = strtotime($start);
 
             if ($startTs === false) {
@@ -283,6 +275,14 @@ class ProfileDetailSettingsAction extends ProfileSettingsAction
         return $formVals;
     }
 
+    function sliceParams($key, $size) {
+        $slice = array();
+        $params = $this->findMultiParams($key);
+        ksort($params);
+        $slice = $this->arraySplit($params, sizeof($params) / $size);
+        return $slice;
+    }
+
     /**
      * Save an extended profile field as a Profile_detail
      *

From 79c4af6073ab7aca718ec797c43bba957380164f Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Mon, 14 Mar 2011 21:07:14 -0700
Subject: [PATCH 566/655] Add in missing </li>

---
 plugins/ExtendedProfile/extendedprofilewidget.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/ExtendedProfile/extendedprofilewidget.php b/plugins/ExtendedProfile/extendedprofilewidget.php
index 967cf6dd20..a4913eed12 100644
--- a/plugins/ExtendedProfile/extendedprofilewidget.php
+++ b/plugins/ExtendedProfile/extendedprofilewidget.php
@@ -320,6 +320,7 @@ class ExtendedProfileWidget extends Form
             _m('End'),
             isset($field['end']) ? $field['end'] : null
         );
+        $this->out->elementEnd('li');
         $this->out->elementEnd('ul');
 
         $this->showMultiControls();

From 8559fbb2ca1f7f2e154be0ec0084a324d936f22c Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Mon, 14 Mar 2011 21:09:03 -0700
Subject: [PATCH 567/655] Extended profile - intialize controls for multiple
 education entries

---
 plugins/ExtendedProfile/js/profiledetail.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/ExtendedProfile/js/profiledetail.js b/plugins/ExtendedProfile/js/profiledetail.js
index 4dc2faf2aa..d491b46ba6 100644
--- a/plugins/ExtendedProfile/js/profiledetail.js
+++ b/plugins/ExtendedProfile/js/profiledetail.js
@@ -83,6 +83,7 @@ var removeRow = function() {
 var init = function() {
     reorder('phone-edit');
     reorder('experience-edit');
+    reorder('education-edit');
 }
 
 $(document).ready(

From 6d34818b5d9ca72dc1dbc2a9e484b1f7c0a45940 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Mon, 14 Mar 2011 22:02:24 -0700
Subject: [PATCH 568/655] Extended profile - make education entries save

---
 plugins/ExtendedProfile/extendedprofile.php   |   6 +-
 .../ExtendedProfile/extendedprofilewidget.php |   4 +-
 .../profiledetailsettingsaction.php           | 147 +++++++++++++++---
 3 files changed, 132 insertions(+), 25 deletions(-)

diff --git a/plugins/ExtendedProfile/extendedprofile.php b/plugins/ExtendedProfile/extendedprofile.php
index 713d5c601a..09d010b090 100644
--- a/plugins/ExtendedProfile/extendedprofile.php
+++ b/plugins/ExtendedProfile/extendedprofile.php
@@ -168,7 +168,7 @@ class ExtendedProfile
     {
         $schools = (isset($this->fields['school'])) ? $this->fields['school'] : null;
         $degrees = (isset($this->fields['degree'])) ? $this->fields['degree'] : null;
-        $descs = (isset($this->fields['degree_description'])) ? $this->fields['degree_description'] : null;
+        $descs = (isset($this->fields['degree_descr'])) ? $this->fields['degree_descr'] : null;
         $start = (isset($this->fields['school_start'])) ? $this->fields['school_start'] : null;
         $end = (isset($this->fields['school_end'])) ? $this->fields['school_end'] : null;
         $iArrays = array();
@@ -190,8 +190,8 @@ class ExtendedProfile
                     'type'    => 'education',
                     'label'   => _m('Institution'),
                     'school'  => $schools[$i]->field_value,
-                    'degree'  => $degrees[$i]->field_value,
-                    'description' => $descs[$i]->field_value,
+                    'degree'  => isset($degrees[$i]->field_value) ? $degrees[$i]->field_value : null,
+                    'description' => isset($descs[$i]->field_value) ? $descs[$i]->field_value : null,
                     'index'   => intval($schools[$i]->value_index),
                     'start'   => $start[$i]->date,
                     'end'     => $end[$i]->date
diff --git a/plugins/ExtendedProfile/extendedprofilewidget.php b/plugins/ExtendedProfile/extendedprofilewidget.php
index a4913eed12..03f70592fc 100644
--- a/plugins/ExtendedProfile/extendedprofilewidget.php
+++ b/plugins/ExtendedProfile/extendedprofilewidget.php
@@ -291,7 +291,7 @@ class ExtendedProfileWidget extends Form
 
         $this->out->element('div', 'label', _m('Degree'));
         $this->out->input(
-            $id,
+            $id . '-degree',
             null,
             isset($field['degree']) ? $field['degree'] : null
         );
@@ -300,7 +300,7 @@ class ExtendedProfileWidget extends Form
         $this->out->element('div', 'field', $field['description']);
 
         $this->out->input(
-            $id,
+            $id . '-description',
             null,
             isset($field['description']) ? $field['description'] : null
         );
diff --git a/plugins/ExtendedProfile/profiledetailsettingsaction.php b/plugins/ExtendedProfile/profiledetailsettingsaction.php
index 7870c273ba..3708f54d65 100644
--- a/plugins/ExtendedProfile/profiledetailsettingsaction.php
+++ b/plugins/ExtendedProfile/profiledetailsettingsaction.php
@@ -110,6 +110,7 @@ class ProfileDetailSettingsAction extends ProfileSettingsAction
 
             $this->savePhoneNumbers($user);
             $this->saveExperiences($user);
+            $this->saveEducations($user);
 
         } catch (Exception $e) {
             $this->showForm($e->getMessage(), false);
@@ -171,28 +172,30 @@ class ProfileDetailSettingsAction extends ProfileSettingsAction
 
         foreach ($experiences as $exp) {
             list($company, $current, $end, $start) = array_values($exp);
-            $startTs = strtotime($start);
+            if (!empty($company)) {
+                $startTs = strtotime($start);
 
-            if ($startTs === false) {
-                $msg = empty($start) ? _m('You must supply a start date.')
-                    : sprintf(_m("Invalid start date: %s"), $start);
-                throw new Exception($msg);
+                if ($startTs === false) {
+                    $msg = empty($start) ? _m('You must supply a start date.')
+                        : sprintf(_m("Invalid start date: %s"), $start);
+                    throw new Exception($msg);
+                }
+
+                $endTs = strtotime($end);
+
+                if ($current === 'false' && $endTs === false) {
+                    $msg = empty($end) ? _m('You must supply an end date.')
+                        : sprintf(_m("Invalid end date: %s"), $end);
+                    throw new Exception($msg);
+                }
+
+                $expArray[] = array(
+                    'company' => $company,
+                    'start'   => common_sql_date($startTs),
+                    'end'     => common_sql_date($endTs),
+                    'current' => ($current == 'false') ? false : true
+                );
             }
-
-            $endTs = strtotime($end);
-
-            if ($current === 'false' && $endTs === false) {
-                $msg = empty($end) ? _m('You must supply an end date.')
-                    : sprintf(_m("Invalid end date: %s"), $end);
-                throw new Exception($msg);
-            }
-
-            $expArray[] = array(
-                'company' => $company,
-                'start'   => common_sql_date($startTs),
-                'end'     => common_sql_date($endTs),
-                'current' => ($current == 'false') ? false : true
-            );
         }
 
         return $expArray;
@@ -251,6 +254,110 @@ class ProfileDetailSettingsAction extends ProfileSettingsAction
         }
     }
 
+    function findEducations() {
+
+        // Form vals look like this:
+        // 'extprofile-education-0-school' => 'Pigdog',
+        // 'extprofile-education-0-degree' => 'BA',
+        // 'extprofile-education-0-description' => 'Blar',
+        // 'extprofile-education-0-start' => '05/22/99',
+        // 'extprofile-education-0-end' => '05/22/05',
+
+        $edus = $this->sliceParams('education', 5);
+        $eduArray = array();
+
+        foreach ($edus as $edu) {
+            list($school, $degree, $description, $end, $start) = array_values($edu);
+
+            if (!empty($school)) {
+
+                $startTs = strtotime($start);
+
+                if ($startTs === false) {
+                    $msg = empty($start) ? _m('You must supply a start date.')
+                        : sprintf(_m("Invalid start date: %s"), $start);
+                    throw new Exception($msg);
+                }
+
+                $endTs = strtotime($end);
+
+                if ($endTs === false) {
+                    $msg = empty($end) ? _m('You must supply an end date.')
+                        : sprintf(_m("Invalid end date: %s"), $end);
+                    throw new Exception($msg);
+                }
+
+                $eduArray[] = array(
+                    'school'      => $school,
+                    'degree'      => $degree,
+                    'description' => $description,
+                    'start'       => common_sql_date($startTs),
+                    'end'         => common_sql_date($endTs)
+                );
+            }
+        }
+
+        return $eduArray;
+    }
+
+
+    function saveEducations($user) {
+         common_debug('save education');
+         $edus = $this->findEducations();
+         common_debug(var_export($edus, true));
+
+         $this->removeAll($user, 'school');
+         $this->removeAll($user, 'degree');
+         $this->removeAll($user, 'degree_descr');
+         $this->removeAll($user, 'school_start');
+         $this->removeAll($user, 'school_end');
+
+         $i = 0;
+         foreach($edus as $edu) {
+             if (!empty($edu['school'])) {
+                 ++$i;
+                 $this->saveField(
+                     $user,
+                     'school',
+                     $edu['school'],
+                     null,
+                     $i
+                 );
+                 $this->saveField(
+                     $user,
+                     'degree',
+                     $edu['degree'],
+                     null,
+                     $i
+                 );
+                 $this->saveField(
+                     $user,
+                     'degree_descr',
+                     $edu['description'],
+                     null,
+                     $i
+                 );
+                 $this->saveField(
+                     $user,
+                     'school_start',
+                     null,
+                     null,
+                     $i,
+                     $edu['start']
+                 );
+
+                 $this->saveField(
+                     $user,
+                     'school_end',
+                     null,
+                     null,
+                     $i,
+                     $edu['end']
+                 );
+            }
+         }
+     }
+
     function arraySplit($array, $pieces)
     {
         if ($pieces < 2) {

From cd82ff2dcf6a5c7f33778282c9840652829074c3 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Mon, 14 Mar 2011 22:38:34 -0700
Subject: [PATCH 569/655] Extended profile - make IMs display and save

---
 plugins/ExtendedProfile/extendedprofile.php   | 32 +++++++++--
 .../ExtendedProfile/extendedprofilewidget.php | 54 +++++++++++++++++++
 plugins/ExtendedProfile/js/profiledetail.js   |  1 +
 .../profiledetailsettingsaction.php           | 39 ++++++++++++++
 4 files changed, 121 insertions(+), 5 deletions(-)

diff --git a/plugins/ExtendedProfile/extendedprofile.php b/plugins/ExtendedProfile/extendedprofile.php
index 09d010b090..6d78ddd3d8 100644
--- a/plugins/ExtendedProfile/extendedprofile.php
+++ b/plugins/ExtendedProfile/extendedprofile.php
@@ -129,6 +129,32 @@ class ExtendedProfile
         return $pArrays;
     }
 
+    function getIms()
+    {
+        $ims = (isset($this->fields['im'])) ? $this->fields['im'] : null;
+        $iArrays = array();
+
+        if (empty($ims)) {
+            $iArrays[] = array(
+                'label' => _m('IM'),
+                'type' => 'im'
+            );
+        } else {
+            for ($i = 0; $i < sizeof($ims); $i++) {
+                $ia = array(
+                    'label' => _m('IM'),
+                    'type'  => 'im',
+                    'index' => intval($ims[$i]->value_index),
+                    'rel'   => $ims[$i]->rel,
+                    'value' => $ims[$i]->field_value,
+                );
+
+                $iArrays[] = $ia;
+            }
+        }
+        return $iArrays;
+    }
+
     function getExperiences()
     {
         $companies = (isset($this->fields['company'])) ? $this->fields['company'] : null;
@@ -248,11 +274,7 @@ class ExtendedProfile
                 'label' => _m('Contact'),
                 'fields' => array(
                     'phone' => $this->getPhones(),
-                    'im' => array(
-                        'label' => _m('IM'),
-                        'type' => 'im',
-                        'multi' => true,
-                    ),
+                    'im' => $this->getIms(),
                     'website' => array(
                         'label' => _m('Websites'),
                         'type' => 'website',
diff --git a/plugins/ExtendedProfile/extendedprofilewidget.php b/plugins/ExtendedProfile/extendedprofilewidget.php
index 03f70592fc..5d5f1b7ab9 100644
--- a/plugins/ExtendedProfile/extendedprofilewidget.php
+++ b/plugins/ExtendedProfile/extendedprofilewidget.php
@@ -106,6 +106,7 @@ class ExtendedProfileWidget extends Form
 
             switch($fieldName) {
             case 'phone':
+            case 'im':
             case 'experience':
             case 'education':
                 $this->showMultiple($fieldName, $field);
@@ -156,6 +157,53 @@ class ExtendedProfileWidget extends Form
         $this->out->elementEnd('div');
     }
 
+    protected function showIm($name, $field)
+    {
+        $this->out->elementStart('div', array('class' => 'im-display'));
+        $this->out->text($field['value']);
+        if (!empty($field['rel'])) {
+            $this->out->text(' (' . $field['rel'] . ')');
+        }
+        $this->out->elementEnd('div');
+    }
+
+    protected function showEditableIm($name, $field)
+    {
+        $index = isset($field['index']) ? $field['index'] : 0;
+        $id    = "extprofile-$name-$index";
+        $rel   = $id . '-rel';
+        $this->out->elementStart(
+            'div', array(
+                'id' => $id . '-edit',
+                'class' => 'im-edit'
+            )
+        );
+        $this->out->input(
+            $id,
+            null,
+            isset($field['value']) ? $field['value'] : null
+        );
+        $this->out->dropdown(
+            $id . '-rel',
+            'Type',
+            array(
+                'jabber' => 'Jabber',
+                'gtalk'  => 'GTalk',
+                'aim'    => 'AIM',
+                'yahoo'  => 'Yahoo! Messenger',
+                'msn'    => 'MSN',
+                'skype'  => 'Skype',
+                'other'  => 'Other'
+            ),
+            null,
+            false,
+            isset($field['rel']) ? $field['rel'] : null
+        );
+
+        $this->showMultiControls();
+        $this->out->elementEnd('div');
+    }
+
     protected function showEditablePhone($name, $field)
     {
         $index = isset($field['index']) ? $field['index'] : 0;
@@ -373,6 +421,9 @@ class ExtendedProfileWidget extends Form
         case 'phone':
             $this->showPhone($name, $field);
             break;
+        case 'im':
+            $this->showIm($name, $field);
+            break;
         case 'experience':
             $this->showExperience($name, $field);
             break;
@@ -413,6 +464,9 @@ class ExtendedProfileWidget extends Form
         case 'phone':
             $this->showEditablePhone($name, $field);
             break;
+        case 'im':
+            $this->showEditableIm($name, $field);
+            break;
         case 'experience':
             $this->showEditableExperience($name, $field);
             break;
diff --git a/plugins/ExtendedProfile/js/profiledetail.js b/plugins/ExtendedProfile/js/profiledetail.js
index d491b46ba6..cdd7467e93 100644
--- a/plugins/ExtendedProfile/js/profiledetail.js
+++ b/plugins/ExtendedProfile/js/profiledetail.js
@@ -84,6 +84,7 @@ var init = function() {
     reorder('phone-edit');
     reorder('experience-edit');
     reorder('education-edit');
+    reorder('im-edit');
 }
 
 $(document).ready(
diff --git a/plugins/ExtendedProfile/profiledetailsettingsaction.php b/plugins/ExtendedProfile/profiledetailsettingsaction.php
index 3708f54d65..baac80a482 100644
--- a/plugins/ExtendedProfile/profiledetailsettingsaction.php
+++ b/plugins/ExtendedProfile/profiledetailsettingsaction.php
@@ -109,6 +109,7 @@ class ProfileDetailSettingsAction extends ProfileSettingsAction
             }
 
             $this->savePhoneNumbers($user);
+            $this->saveIms($user);
             $this->saveExperiences($user);
             $this->saveEducations($user);
 
@@ -159,6 +160,44 @@ class ProfileDetailSettingsAction extends ProfileSettingsAction
         return $phoneArray;
     }
 
+    function findIms() {
+
+        //  Form vals look like this:
+        // 'extprofile-im-0' => 'jed',
+        // 'extprofile-im-0-rel' => 'yahoo',
+
+        $ims     = $this->sliceParams('im', 2);
+        $imArray = array();
+
+        foreach ($ims as $im) {
+            list($id, $rel) = array_values($im);
+            $imArray[] = array(
+                'value' => $id,
+                'rel'   => $rel
+            );
+        }
+
+        return $imArray;
+    }
+
+    function saveIms($user) {
+        $ims = $this->findIms();
+        $this->removeAll($user, 'im');
+        $i = 0;
+        foreach($ims as $im) {
+            if (!empty($im['value'])) {
+                ++$i;
+                $this->saveField(
+                    $user,
+                    'im',
+                    $im['value'],
+                    $im['rel'],
+                    $i
+                );
+            }
+        }
+    }
+
     function findExperiences() {
 
         // Form vals look like this:

From 7a7e0a2b69e9367c33e52e656c8e28cc9e78adaa Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Mon, 14 Mar 2011 22:47:20 -0700
Subject: [PATCH 570/655] Extended profile - change the name of divs used for
 sort order

---
 plugins/ExtendedProfile/js/profiledetail.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/plugins/ExtendedProfile/js/profiledetail.js b/plugins/ExtendedProfile/js/profiledetail.js
index cdd7467e93..c198132399 100644
--- a/plugins/ExtendedProfile/js/profiledetail.js
+++ b/plugins/ExtendedProfile/js/profiledetail.js
@@ -81,10 +81,10 @@ var removeRow = function() {
 };
 
 var init = function() {
-    reorder('phone-edit');
-    reorder('experience-edit');
-    reorder('education-edit');
-    reorder('im-edit');
+    reorder('phone-item');
+    reorder('experience-item');
+    reorder('education-item');
+    reorder('im-item');
 }
 
 $(document).ready(

From b37c33dea2d151dcabf84357b2ea2a0b4f36be3c Mon Sep 17 00:00:00 2001
From: Samantha Doherty <sammy@status.net>
Date: Tue, 15 Mar 2011 13:08:41 -0400
Subject: [PATCH 571/655] Whole bunch of style-related changes, including some
 tasty hackery for the experience and education fields.

---
 plugins/ExtendedProfile/css/profiledetail.css | 137 ++++++++++++++++--
 .../ExtendedProfile/extendedprofilewidget.php |  65 ++++-----
 plugins/ExtendedProfile/js/profiledetail.js   |   8 +-
 3 files changed, 164 insertions(+), 46 deletions(-)

diff --git a/plugins/ExtendedProfile/css/profiledetail.css b/plugins/ExtendedProfile/css/profiledetail.css
index 836b647a10..797d32d415 100644
--- a/plugins/ExtendedProfile/css/profiledetail.css
+++ b/plugins/ExtendedProfile/css/profiledetail.css
@@ -1,22 +1,139 @@
 /* Note the #content is only needed to override weird crap in default styles */
 
+#profiledetail .entity_actions {
+    margin-top: 0px;
+    margin-bottom: 0px;
+}
+
+#profiledetail #content h3 {
+    margin-bottom: 5px;
+}
+
 #content table.extended-profile {
     width: 100%;
     border-collapse: separate;
-    border-spacing: 8px;
+    border-spacing: 0px 8px;
+    margin-bottom: 10px;
 }
+
 #content table.extended-profile th {
     color: #777;
-    background-color: #eee;
+    background-color: #ECECF2;
     width: 150px;
-
-    padding-top: 0; /* override bizarre theme defaults */
-
     text-align: right;
-    padding-right: 8px;
+    padding: 2px 8px 2px 0px;
 }
-#content table.extended-profile td {
-    padding: 0; /* override bizarre theme defaults */
 
-    padding-left: 8px;
-}
\ No newline at end of file
+#content table.extended-profile th.employer, #content table.extended-profile th.institution {
+    display: none;
+}
+
+#content table.extended-profile td {
+    padding: 2px 0px 2px 8px;        
+}
+
+.experience-item, .education-item {
+    float: left;
+    padding-bottom: 4px;
+}
+
+.experience-item .label, .education-item .label {
+    float: left;
+    clear: left;
+    position: relative;
+    left: -8px;
+    margin-right: 2px;
+    margin-bottom: 8px;
+    color: #777;
+    background-color: #ECECF2;
+    width: 150px;
+    text-align: right;
+    padding: 2px 8px 2px 0px;
+}
+
+.experience-item .field, .education-item .field {
+    float: left;
+    padding-top: 2px;
+    padding-bottom: 2px;
+}
+
+#profiledetailsettings #content table.extended-profile td {
+    padding: 0px 0px 0px 8px;
+}
+
+#profiledetailsettings input {
+    margin-right: 8px;
+}
+
+.experience-item input[type=text], .education-item input[type=text] {
+    float: left;
+}
+
+.extended-profile .current-checkbox {
+    float: left;
+    position: relative;
+    top: 2px;
+}
+
+.form_settings .extended-profile input.checkbox {
+    margin-left: 0px;
+    left: 0px;
+    top: 2px;
+}
+
+.form_settings .extended-profile label.checkbox {
+    max-width: 100%;
+    float: none;
+    left: -20px;
+}
+
+.phone-item label, .im-item label {
+    display: none;
+}
+
+.extended-profile select {
+    padding-right: 2px;
+    font-size: 0.88em;
+}
+
+.extended-profile a.add_row, .extended-profile a.remove_row {
+    display: block;
+    height: 16px;
+    width: 16px;
+    line-height: 4em;
+    overflow: hidden;
+    background-image: url('../../../theme/rebase/images/icons/icons-01.gif');
+    background-repeat: no-repeat;
+}
+
+.extended-profile a.remove_row {
+    background-position: 0px -1252px;
+    float: right;
+    position: relative;
+    top: 6px;
+}
+
+.extended-profile a.add_row {
+    clear: both;
+    position: relative;
+    top: 6px;
+    left: 2px;
+    background-position: 0px -1186px;
+}
+
+#content table.extended-profile .supersizeme th {
+    border-bottom: 28px solid #fff;
+}
+
+#profiledetailsettings .experience-item, #profiledetailsettings .education-item {
+    margin-bottom: 10px;
+    width: 100%;
+}
+
+#profiledetailsettings tr:last-child .experience-item, #profiledetailsettings tr:last-child .education-item {
+    margin-bottom: 0px;
+}
+
+#profiledetailsettings .experience-item a.add_row, #profiledetailsettings .education-item a.add_row {
+    left: 160px;
+}
diff --git a/plugins/ExtendedProfile/extendedprofilewidget.php b/plugins/ExtendedProfile/extendedprofilewidget.php
index 5d5f1b7ab9..161a524f94 100644
--- a/plugins/ExtendedProfile/extendedprofilewidget.php
+++ b/plugins/ExtendedProfile/extendedprofilewidget.php
@@ -128,7 +128,7 @@ class ExtendedProfileWidget extends Form
     {
         $this->out->elementStart('tr');
 
-        $this->out->element('th', null, $field['label']);
+        $this->out->element('th', str_replace(' ','_',strtolower($field['label'])), $field['label']);
 
         $this->out->elementStart('td');
         if ($this->editable) {
@@ -175,7 +175,7 @@ class ExtendedProfileWidget extends Form
         $this->out->elementStart(
             'div', array(
                 'id' => $id . '-edit',
-                'class' => 'im-edit'
+                'class' => 'im-item'
             )
         );
         $this->out->input(
@@ -212,7 +212,7 @@ class ExtendedProfileWidget extends Form
         $this->out->elementStart(
             'div', array(
                 'id' => $id . '-edit',
-                'class' => 'phone-edit'
+                'class' => 'phone-item'
             )
         );
         $this->out->input(
@@ -242,6 +242,7 @@ class ExtendedProfileWidget extends Form
     protected function showExperience($name, $field)
     {
         $this->out->elementStart('div', 'experience-item');
+        $this->out->element('div', 'label', _m('Company'));
         $this->out->element('div', 'field', $field['company']);
         $this->out->element('div', 'label', _m('Start'));
         $this->out->element('div', array('class' => 'field date'), $field['start']);
@@ -264,44 +265,42 @@ class ExtendedProfileWidget extends Form
         $this->out->elementStart(
             'div', array(
                 'id' => $id . '-edit',
-                'class' => 'experience-edit'
+                'class' => 'experience-item'
             )
         );
 
+        $this->out->element('div', 'label', _m('Company'));
         $this->out->input(
             $id,
             null,
             isset($field['company']) ? $field['company'] : null
         );
 
-        $this->out->elementStart('ul', 'experience-start-and-end');
-        $this->out->elementStart('li');
+        $this->out->element('div', 'label', _m('Start'));
         $this->out->input(
             $id . '-start',
-            _m('Start'),
+            null,
             isset($field['start']) ? $field['start'] : null
         );
-        $this->out->elementEnd('li');
 
-        $this->out->elementStart('li');
+        $this->out->element('div', 'label', _m('End'));
         $this->out->input(
             $id . '-end',
-            _m('End'),
+            null,
             isset($field['end']) ? $field['end'] : null
         );
-        $this->out->elementEnd('li');
-        $this->out->elementStart('li');
         $this->out->hidden(
             $id . '-current',
             'false'
         );
+        $this->out->elementStart('div', 'current-checkbox');
         $this->out->checkbox(
             $id . '-current',
             _m('Current'),
             $field['current']
         );
-        $this->out->elementEnd('li');
-        $this->out->elementEnd('ul');
+        $this->out->elementEnd('div');
+
         $this->showMultiControls();
         $this->out->elementEnd('div');
     }
@@ -309,6 +308,7 @@ class ExtendedProfileWidget extends Form
     protected function showEducation($name, $field)
     {
         $this->out->elementStart('div', 'education-item');
+        $this->out->element('div', 'label', _m('Institution'));
         $this->out->element('div', 'field', $field['school']);
         $this->out->element('div', 'label', _m('Degree'));
         $this->out->element('div', 'field', $field['degree']);
@@ -328,9 +328,10 @@ class ExtendedProfileWidget extends Form
         $this->out->elementStart(
             'div', array(
                 'id' => $id . '-edit',
-                'class' => 'education-edit'
+                'class' => 'education-item'
             )
         );
+        $this->out->element('div', 'label', _m('Institution'));
         $this->out->input(
             $id,
             null,
@@ -353,23 +354,19 @@ class ExtendedProfileWidget extends Form
             isset($field['description']) ? $field['description'] : null
         );
 
-        $this->out->elementStart('ul', 'education-start-and-end');
-        $this->out->elementStart('li');
+        $this->out->element('div', 'label', _m('Start'));
         $this->out->input(
             $id . '-start',
-            _m('Start'),
+            null,
             isset($field['start']) ? $field['start'] : null
         );
-        $this->out->elementEnd('li');
 
-        $this->out->elementStart('li');
+        $this->out->element('div', 'label', _m('End'));
         $this->out->input(
             $id . '-end',
-            _m('End'),
+            null,
             isset($field['end']) ? $field['end'] : null
         );
-        $this->out->elementEnd('li');
-        $this->out->elementEnd('ul');
 
         $this->showMultiControls();
         $this->out->elementEnd('div');
@@ -377,16 +374,6 @@ class ExtendedProfileWidget extends Form
 
     function showMultiControls()
     {
-        $this->out->element(
-            'a',
-            array(
-                'class' => 'add_row',
-                'href' => 'javascript://',
-                'style' => 'display: none; '
-            ),
-            '+'
-        );
-
         $this->out->element(
             'a',
             array(
@@ -396,6 +383,16 @@ class ExtendedProfileWidget extends Form
             ),
             '-'
         );
+
+        $this->out->element(
+            'a',
+            array(
+                'class' => 'add_row',
+                'href' => 'javascript://',
+                'style' => 'display: none; '
+            ),
+            '+'
+        );
     }
 
     /**
@@ -514,7 +511,7 @@ class ExtendedProfileWidget extends Form
 
     function formClass()
     {
-        return 'form_profile_details';
+        return 'form_profile_details form_settings';
     }
 
     /**
diff --git a/plugins/ExtendedProfile/js/profiledetail.js b/plugins/ExtendedProfile/js/profiledetail.js
index c198132399..2821bed275 100644
--- a/plugins/ExtendedProfile/js/profiledetail.js
+++ b/plugins/ExtendedProfile/js/profiledetail.js
@@ -12,6 +12,9 @@ var reorder = function(class) {
         replaceIndex(rowIndex(div), i);
     });
 
+    $this = $(divs).last().closest('tr');
+    $this.addClass('supersizeme');
+
     $(divs).last().find('a.add_row').show();
 
     if (divs.length == 1) {
@@ -57,7 +60,8 @@ var addRow = function() {
     var class = $(div).attr('class');
     var index = id.match(/\d+/);
     console.log("Current row = " + index + ', class = ' + class);
-    var tr = $(this).closest('tr');
+    var trold = $(this).closest('tr');
+    var tr = $(trold).removeClass('supersizeme');
     var newtr = $(tr).clone();
     var newIndex = parseInt(index) + 1;
     replaceIndex(newtr, index, newIndex);
@@ -95,4 +99,4 @@ function() {
     $('.remove_row').live('click', removeRow);
 }
 
-);
\ No newline at end of file
+);

From 9e9cbdf505e9ec66c7e9d60bfe170f8d41a146e2 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Tue, 15 Mar 2011 10:09:20 -0700
Subject: [PATCH 572/655] Suppress PHP warnings/notices during AtomPub XML
 parsing to avoid HTTP header problems when given bad input.

If display_errors is on, typical settings would cause PHP error messages to spew to output before the HTTP headers for setting a 400 error go through.
Also switched from deprecated static DOMDocument::loadXML() to non-static call.
---
 actions/apitimelineuser.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/actions/apitimelineuser.php b/actions/apitimelineuser.php
index 66984b5abd..3fe73c691c 100644
--- a/actions/apitimelineuser.php
+++ b/actions/apitimelineuser.php
@@ -322,8 +322,11 @@ class ApiTimelineUserAction extends ApiBareAuthAction
             $this->clientError(_('Atom post must not be empty.'));
         }
 
-        $dom = DOMDocument::loadXML($xml);
-        if (!$dom) {
+        $old = error_reporting(error_reporting() & ~(E_WARNING | E_NOTICE));
+        $dom = new DOMDocument();
+        $ok = $dom->loadXML($xml);
+        error_reporting($old);
+        if (!$ok) {
             // TRANS: Client error displayed attempting to post an API that is not well-formed XML.
             $this->clientError(_('Atom post must be well-formed XML.'));
         }

From a6ae9ddd418a4bee2173a4188d5c382168f5d51e Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Tue, 15 Mar 2011 10:10:18 -0700
Subject: [PATCH 573/655] Extended profile - make websites save

---
 plugins/ExtendedProfile/extendedprofile.php   | 38 ++++++++++---
 .../ExtendedProfile/extendedprofilewidget.php | 57 +++++++++++++++++++
 .../profiledetailsettingsaction.php           | 37 ++++++++++++
 3 files changed, 125 insertions(+), 7 deletions(-)

diff --git a/plugins/ExtendedProfile/extendedprofile.php b/plugins/ExtendedProfile/extendedprofile.php
index 6d78ddd3d8..673680f027 100644
--- a/plugins/ExtendedProfile/extendedprofile.php
+++ b/plugins/ExtendedProfile/extendedprofile.php
@@ -98,6 +98,8 @@ class ExtendedProfile
         }
     }
 
+    // XXX: getPhones, getIms, and getWebsites pretty much do the same thing,
+    //      so refactor.
     function getPhones()
     {
         $phones = (isset($this->fields['phone'])) ? $this->fields['phone'] : null;
@@ -155,6 +157,32 @@ class ExtendedProfile
         return $iArrays;
     }
 
+    function getWebsites()
+    {
+        $sites = (isset($this->fields['website'])) ? $this->fields['website'] : null;
+        $wArrays = array();
+
+        if (empty($sites)) {
+            $wArrays[] = array(
+                'label' => _m('Website'),
+                'type' => 'website'
+            );
+        } else {
+            for ($i = 0; $i < sizeof($sites); $i++) {
+                $wa = array(
+                    'label' => _m('Website'),
+                    'type'  => 'website',
+                    'index' => intval($sites[$i]->value_index),
+                    'rel'   => $sites[$i]->rel,
+                    'value' => $sites[$i]->field_value,
+                );
+
+                $wArrays[] = $wa;
+            }
+        }
+        return $wArrays;
+    }
+
     function getExperiences()
     {
         $companies = (isset($this->fields['company'])) ? $this->fields['company'] : null;
@@ -273,13 +301,9 @@ class ExtendedProfile
             'contact' => array(
                 'label' => _m('Contact'),
                 'fields' => array(
-                    'phone' => $this->getPhones(),
-                    'im' => $this->getIms(),
-                    'website' => array(
-                        'label' => _m('Websites'),
-                        'type' => 'website',
-                        'multi' => true,
-                    ),
+                    'phone'   => $this->getPhones(),
+                    'im'      => $this->getIms(),
+                    'website' => $this->getWebsites()
                 ),
             ),
             'personal' => array(
diff --git a/plugins/ExtendedProfile/extendedprofilewidget.php b/plugins/ExtendedProfile/extendedprofilewidget.php
index 5d5f1b7ab9..99d5852276 100644
--- a/plugins/ExtendedProfile/extendedprofilewidget.php
+++ b/plugins/ExtendedProfile/extendedprofilewidget.php
@@ -107,6 +107,7 @@ class ExtendedProfileWidget extends Form
             switch($fieldName) {
             case 'phone':
             case 'im':
+            case 'website':
             case 'experience':
             case 'education':
                 $this->showMultiple($fieldName, $field);
@@ -147,6 +148,8 @@ class ExtendedProfileWidget extends Form
         }
     }
 
+    // XXX: showPhone, showIm and showWebsite all work the same, so
+    //      combine
     protected function showPhone($name, $field)
     {
         $this->out->elementStart('div', array('class' => 'phone-display'));
@@ -167,6 +170,16 @@ class ExtendedProfileWidget extends Form
         $this->out->elementEnd('div');
     }
 
+    protected function showWebsite($name, $field)
+    {
+        $this->out->elementStart('div', array('class' => 'website-display'));
+        $this->out->text($field['value']);
+        if (!empty($field['rel'])) {
+            $this->out->text(' (' . $field['rel'] . ')');
+        }
+        $this->out->elementEnd('div');
+    }
+
     protected function showEditableIm($name, $field)
     {
         $index = isset($field['index']) ? $field['index'] : 0;
@@ -239,6 +252,44 @@ class ExtendedProfileWidget extends Form
         $this->out->elementEnd('div');
     }
 
+    protected function showEditableWebsite($name, $field)
+    {
+        $index = isset($field['index']) ? $field['index'] : 0;
+        $id    = "extprofile-$name-$index";
+        $rel   = $id . '-rel';
+        $this->out->elementStart(
+            'div', array(
+                'id' => $id . '-edit',
+                'class' => 'website-edit'
+            )
+        );
+        $this->out->input(
+            $id,
+            null,
+            isset($field['value']) ? $field['value'] : null
+        );
+        $this->out->dropdown(
+            $id . '-rel',
+            'Type',
+            array(
+                'blog'     => 'Blog',
+                'homepage' => 'Homepage',
+                'facebook' => 'Facebook',
+                'linkedin' => 'LinkedIn',
+                'flickr'   => 'Flickr',
+                'google'   => 'Google Profile',
+                'other'    => 'Other',
+                'twitter'  => 'Twitter'
+            ),
+            null,
+            false,
+            isset($field['rel']) ? $field['rel'] : null
+        );
+
+        $this->showMultiControls();
+        $this->out->elementEnd('div');
+    }
+
     protected function showExperience($name, $field)
     {
         $this->out->elementStart('div', 'experience-item');
@@ -421,6 +472,9 @@ class ExtendedProfileWidget extends Form
         case 'phone':
             $this->showPhone($name, $field);
             break;
+        case 'website':
+            $this->showWebsite($name, $field);
+            break;
         case 'im':
             $this->showIm($name, $field);
             break;
@@ -467,6 +521,9 @@ class ExtendedProfileWidget extends Form
         case 'im':
             $this->showEditableIm($name, $field);
             break;
+        case 'website':
+            $this->showEditableWebsite($name, $field);
+            break;
         case 'experience':
             $this->showEditableExperience($name, $field);
             break;
diff --git a/plugins/ExtendedProfile/profiledetailsettingsaction.php b/plugins/ExtendedProfile/profiledetailsettingsaction.php
index baac80a482..2357860884 100644
--- a/plugins/ExtendedProfile/profiledetailsettingsaction.php
+++ b/plugins/ExtendedProfile/profiledetailsettingsaction.php
@@ -110,6 +110,7 @@ class ProfileDetailSettingsAction extends ProfileSettingsAction
 
             $this->savePhoneNumbers($user);
             $this->saveIms($user);
+            $this->saveWebsites($user);
             $this->saveExperiences($user);
             $this->saveEducations($user);
 
@@ -198,6 +199,42 @@ class ProfileDetailSettingsAction extends ProfileSettingsAction
         }
     }
 
+    function findWebsites() {
+
+        //  Form vals look like this:
+
+        $sites = $this->sliceParams('website', 2);
+        $wsArray = array();
+
+        foreach ($sites as $site) {
+            list($id, $rel) = array_values($site);
+            $wsArray[] = array(
+                'value' => $id,
+                'rel'   => $rel
+            );
+        }
+
+        return $wsArray;
+    }
+
+    function saveWebsites($user) {
+        $sites = $this->findWebsites();
+        $this->removeAll($user, 'website');
+        $i = 0;
+        foreach($sites as $site) {
+            if (!empty($site['value'])) {
+                ++$i;
+                $this->saveField(
+                    $user,
+                    'website',
+                    $site['value'],
+                    $site['rel'],
+                    $i
+                );
+            }
+        }
+    }
+
     function findExperiences() {
 
         // Form vals look like this:

From b66250c6aa2d04aa1a7c15bf385a73397589e78d Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Tue, 15 Mar 2011 12:49:17 -0700
Subject: [PATCH 574/655] Add StartNoticeWhoGets, EndNoticeWhoGets events to
 allow upcoming TagSub plugin to do extra inbox delivery.

---
 EVENTS.txt         |  8 +++++++
 classes/Notice.php | 59 ++++++++++++++++++++++++++--------------------
 2 files changed, 41 insertions(+), 26 deletions(-)

diff --git a/EVENTS.txt b/EVENTS.txt
index 1443a94fbe..54d06655ee 100644
--- a/EVENTS.txt
+++ b/EVENTS.txt
@@ -1131,3 +1131,11 @@ StartActivityObjectOutputJson: Called at start of JSON output generation for Act
 EndActivityObjectOutputJson: Called at end of JSON output generation for ActivityObject chunks: the array has not yet been filled out.
 - $obj ActivityObject
 - &$out: array to be serialized; you're free to modify it
+
+StartNoticeWhoGets: Called at start of inbox delivery prep; plugins can schedule notices to go to particular profiles that would otherwise not have reached them. Canceling will take over the entire addressing operation. Be aware that output can be cached or used several times, so should remain idempotent.
+- $notice Notice
+- &$ni: in/out array mapping profile IDs to constants: NOTICE_INBOX_SOURCE_SUB etc
+
+EndNoticeWhoGets: Called at end of inbox delivery prep; plugins can filter out profiles from receiving inbox delivery here.  Be aware that output can be cached or used several times, so should remain idempotent.
+- $notice Notice
+- &$ni: in/out array mapping profile IDs to constants: NOTICE_INBOX_SOURCE_SUB etc
diff --git a/classes/Notice.php b/classes/Notice.php
index d520f4728f..e5c758005d 100644
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -812,41 +812,48 @@ class Notice extends Memcached_DataObject
 
         $ni = array();
 
-        foreach ($users as $id) {
-            $ni[$id] = NOTICE_INBOX_SOURCE_SUB;
-        }
+        // Give plugins a chance to add folks in at start...
+        if (Event::handle('StartNoticeWhoGets', array($this, &$ni))) {
 
-        foreach ($groups as $group) {
-            $users = $group->getUserMembers();
             foreach ($users as $id) {
-                if (!array_key_exists($id, $ni)) {
-                    $ni[$id] = NOTICE_INBOX_SOURCE_GROUP;
+                $ni[$id] = NOTICE_INBOX_SOURCE_SUB;
+            }
+
+            foreach ($groups as $group) {
+                $users = $group->getUserMembers();
+                foreach ($users as $id) {
+                    if (!array_key_exists($id, $ni)) {
+                        $ni[$id] = NOTICE_INBOX_SOURCE_GROUP;
+                    }
                 }
             }
-        }
 
-        foreach ($recipients as $recipient) {
-            if (!array_key_exists($recipient, $ni)) {
-                $ni[$recipient] = NOTICE_INBOX_SOURCE_REPLY;
+            foreach ($recipients as $recipient) {
+                if (!array_key_exists($recipient, $ni)) {
+                    $ni[$recipient] = NOTICE_INBOX_SOURCE_REPLY;
+                }
             }
-        }
 
-        // Exclude any deleted, non-local, or blocking recipients.
-        $profile = $this->getProfile();
-        $originalProfile = null;
-        if ($this->repeat_of) {
-            // Check blocks against the original notice's poster as well.
-            $original = Notice::staticGet('id', $this->repeat_of);
-            if ($original) {
-                $originalProfile = $original->getProfile();
+            // Exclude any deleted, non-local, or blocking recipients.
+            $profile = $this->getProfile();
+            $originalProfile = null;
+            if ($this->repeat_of) {
+                // Check blocks against the original notice's poster as well.
+                $original = Notice::staticGet('id', $this->repeat_of);
+                if ($original) {
+                    $originalProfile = $original->getProfile();
+                }
             }
-        }
-        foreach ($ni as $id => $source) {
-            $user = User::staticGet('id', $id);
-            if (empty($user) || $user->hasBlocked($profile) ||
-                ($originalProfile && $user->hasBlocked($originalProfile))) {
-                unset($ni[$id]);
+            foreach ($ni as $id => $source) {
+                $user = User::staticGet('id', $id);
+                if (empty($user) || $user->hasBlocked($profile) ||
+                    ($originalProfile && $user->hasBlocked($originalProfile))) {
+                    unset($ni[$id]);
+                }
             }
+
+            // Give plugins a chance to filter out...
+            Event::handle('EndNoticeWhoGets', array($this, &$ni));
         }
 
         if (!empty($c)) {

From 8de24335d2e65ada6f32e15b919c552b74c0039d Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Tue, 15 Mar 2011 12:51:29 -0700
Subject: [PATCH 575/655] Doc comment on Notice->getTags() to clarify the
 return data type

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

diff --git a/classes/Notice.php b/classes/Notice.php
index e5c758005d..664e5dab9f 100644
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -2006,6 +2006,11 @@ class Notice extends Memcached_DataObject
                 $this->is_local == Notice::LOCAL_NONPUBLIC);
     }
 
+    /**
+     * Get the list of hash tags saved with this notice.
+     *
+     * @return array of strings
+     */
     public function getTags()
     {
         $tags = array();

From 119885d964f6f5402471f4874c7482c4d6a22fc0 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Tue, 15 Mar 2011 12:57:11 -0700
Subject: [PATCH 576/655] Stub TagSubPlugin: plugin guts with no UI to setup
 subs

---
 plugins/TagSub/TagSub.php       | 109 ++++++++++++++++++++++
 plugins/TagSub/TagSubPlugin.php | 156 ++++++++++++++++++++++++++++++++
 2 files changed, 265 insertions(+)
 create mode 100644 plugins/TagSub/TagSub.php
 create mode 100644 plugins/TagSub/TagSubPlugin.php

diff --git a/plugins/TagSub/TagSub.php b/plugins/TagSub/TagSub.php
new file mode 100644
index 0000000000..fdae3e2db0
--- /dev/null
+++ b/plugins/TagSub/TagSub.php
@@ -0,0 +1,109 @@
+<?php
+/**
+ * Data class to store local tag subscriptions
+ *
+ * PHP version 5
+ *
+ * @category TagSubPlugin
+ * @package  StatusNet
+ * @author   Brion Vibber <brion@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
+ * @link     http://status.net/
+ *
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2011, StatusNet, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.     See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
+/**
+ * For storing the tag subscriptions
+ *
+ * @category PollPlugin
+ * @package  StatusNet
+ * @author   Brion Vibber <brion@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
+ * @link     http://status.net/
+ *
+ * @see      DB_DataObject
+ */
+
+class TagSub extends Managed_DataObject
+{
+    public $__table = 'tagsub'; // table name
+    public $tag;         // text
+    public $profile_id;  // int -> profile.id
+    public $created;     // datetime
+
+    /**
+     * Get an instance by key
+     *
+     * This is a utility method to get a single instance with a given key value.
+     *
+     * @param string $k Key to use to lookup (usually 'user_id' for this class)
+     * @param mixed  $v Value to lookup
+     *
+     * @return TagSub object found, or null for no hits
+     *
+     */
+    function staticGet($k, $v=null)
+    {
+        return Memcached_DataObject::staticGet('TagSub', $k, $v);
+    }
+
+    /**
+     * Get an instance by compound key
+     *
+     * This is a utility method to get a single instance with a given set of
+     * key-value pairs. Usually used for the primary key for a compound key; thus
+     * the name.
+     *
+     * @param array $kv array of key-value mappings
+     *
+     * @return TagSub object found, or null for no hits
+     *
+     */
+    function pkeyGet($kv)
+    {
+        return Memcached_DataObject::pkeyGet('TagSub', $kv);
+    }
+
+    /**
+     * The One True Thingy that must be defined and declared.
+     */
+    public static function schemaDef()
+    {
+        return array(
+            'description' => 'TagSubPlugin tag subscription records',
+            'fields' => array(
+                'tag' => array('type' => 'varchar', 'length' => 64, 'not null' => true, 'description' => 'hash tag associated with this subscription'),
+                'profile_id' => array('type' => 'int', 'not null' => true, 'description' => 'profile ID of subscribing user'),
+                'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
+            ),
+            'primary key' => array('tag', 'profile_id'),
+            'foreign keys' => array(
+                'tagsub_profile_id_fkey' => array('profile', array('profile_id' => 'id')),
+            ),
+            'indexes' => array(
+                'tagsub_created_idx' => array('created'),
+                'tagsub_profile_id_tag_idx' => array('profile_id', 'tag'),
+            ),
+        );
+    }
+
+}
diff --git a/plugins/TagSub/TagSubPlugin.php b/plugins/TagSub/TagSubPlugin.php
new file mode 100644
index 0000000000..b43fcf32ba
--- /dev/null
+++ b/plugins/TagSub/TagSubPlugin.php
@@ -0,0 +1,156 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2011, StatusNet, Inc.
+ *
+ * A plugin to enable local tab subscription
+ *
+ * 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  TagSubPlugin
+ * @package   StatusNet
+ * @author    Brion Vibber <brion@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')) {
+    exit(1);
+}
+
+/**
+ * TagSub plugin main class
+ *
+ * @category  TagSubPlugin
+ * @package   StatusNet
+ * @author    Brion Vibber <brionv@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 TagSubPlugin extends Plugin
+{
+    const VERSION         = '0.1';
+
+    /**
+     * Database schema setup
+     *
+     * @see Schema
+     *
+     * @return boolean hook value; true means continue processing, false means stop.
+     */
+    function onCheckSchema()
+    {
+        $schema = Schema::get();
+        $schema->ensureTable('tagsub', TagSub::schemaDef());
+        return true;
+    }
+
+    /**
+     * Load related modules when needed
+     *
+     * @param string $cls Name of the class to be loaded
+     *
+     * @return boolean hook value; true means continue processing, false means stop.
+     */
+    function onAutoload($cls)
+    {
+        $dir = dirname(__FILE__);
+
+        switch ($cls)
+        {
+        case 'TagsubAction':
+        case 'TagunsubAction':
+            include_once $dir . '/' . strtolower(mb_substr($cls, 0, -6)) . '.php';
+            return false;
+        case 'TagSub':
+            include_once $dir.'/'.$cls.'.php';
+            return false;
+        case 'TagSubForm':
+        case 'TagUnsubForm':
+            include_once $dir.'/'.strtolower($cls).'.php';
+            return false;
+        default:
+            return true;
+        }
+    }
+
+    /**
+     * Map URLs to actions
+     *
+     * @param Net_URL_Mapper $m path-to-action mapper
+     *
+     * @return boolean hook value; true means continue processing, false means stop.
+     */
+    function onRouterInitialized($m)
+    {
+        $m->connect('tag/:tag/subscribe',
+                    array('action' => 'tagsub'),
+                    array('tag' => Router::REGEX_TAG));
+        $m->connect('tag/:tag/unsubscribe',
+                    array('action' => 'tagunsub'),
+                    array('tag' => Router::REGEX_TAG));
+
+        return true;
+    }
+
+    /**
+     * Plugin version data
+     *
+     * @param array &$versions array of version data
+     *
+     * @return value
+     */
+    function onPluginVersion(&$versions)
+    {
+        $versions[] = array('name' => 'TagSub',
+                            'version' => self::VERSION,
+                            'author' => 'Brion Vibber',
+                            'homepage' => 'http://status.net/wiki/Plugin:TagSub',
+                            'rawdescription' =>
+                            // TRANS: Plugin description.
+                            _m('Plugin to allow following all messages with a given tag.'));
+        return true;
+    }
+
+    /**
+     * Hook inbox delivery setup so tag subscribers receive all
+     * notices with that tag in their inbox.
+     *
+     * Currently makes no distinction between local messages and
+     * remote ones which happen to come in to the system. Remote
+     * notices that don't come in at all won't ever reach this.
+     *
+     * @param Notice $notice
+     * @param array $ni in/out map of profile IDs to inbox constants
+     * @return boolean hook result
+     */
+    function onStartNoticeWhoGets(Notice $notice, array &$ni)
+    {
+        foreach ($notice->getTags() as $tag) {
+            $tagsub = new TagSub();
+            $tagsub->tag = $tag;
+            $tagsub->find();
+
+            while ($tagsub->fetch()) {
+                // These constants are currently not actually used, iirc
+                $ni[$tagsub->profile_id] = NOTICE_INBOX_SOURCE_SUB;
+            }
+        }
+        return true;
+    }
+}

From 0bb2f1470474f3818f6c3357581ea04efa23a15f Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Tue, 15 Mar 2011 13:17:06 -0700
Subject: [PATCH 577/655] AJAX submit actions for tag subscribe/unsubscribe

---
 plugins/TagSub/TagSub.php         |  31 +++++++
 plugins/TagSub/TagSubPlugin.php   |  34 ++++++-
 plugins/TagSub/tagsubaction.php   | 149 ++++++++++++++++++++++++++++++
 plugins/TagSub/tagsubform.php     | 142 ++++++++++++++++++++++++++++
 plugins/TagSub/tagunsubaction.php |  89 ++++++++++++++++++
 plugins/TagSub/tagunsubform.php   | 109 ++++++++++++++++++++++
 6 files changed, 550 insertions(+), 4 deletions(-)
 create mode 100644 plugins/TagSub/tagsubaction.php
 create mode 100644 plugins/TagSub/tagsubform.php
 create mode 100644 plugins/TagSub/tagunsubaction.php
 create mode 100644 plugins/TagSub/tagunsubform.php

diff --git a/plugins/TagSub/TagSub.php b/plugins/TagSub/TagSub.php
index fdae3e2db0..a734b4fc5f 100644
--- a/plugins/TagSub/TagSub.php
+++ b/plugins/TagSub/TagSub.php
@@ -106,4 +106,35 @@ class TagSub extends Managed_DataObject
         );
     }
 
+    /**
+     * Start a tag subscription!
+     *
+     * @param profile $profile subscriber
+     * @param string $tag subscribee
+     * @return TagSub
+     */
+    static function start(Profile $profile, $tag)
+    {
+        $ts = new TagSub();
+        $ts->tag = $tag;
+        $ts->profile_id = $profile->id;
+        $ts->created = common_sql_now();
+        $ts->insert();
+        return $ts;
+    }
+
+    /**
+     * End a tag subscription!
+     *
+     * @param profile $profile subscriber
+     * @param string $tag subscribee
+     */
+    static function cancel(Profile $profile, $tag)
+    {
+        $ts = TagSub::pkeyGet(array('tag' => $tag,
+                                    'profile_id' => $profile->id));
+        if ($ts) {
+            $ts->delete();
+        }
+    }
 }
diff --git a/plugins/TagSub/TagSubPlugin.php b/plugins/TagSub/TagSubPlugin.php
index b43fcf32ba..e51a7a8b39 100644
--- a/plugins/TagSub/TagSubPlugin.php
+++ b/plugins/TagSub/TagSubPlugin.php
@@ -73,13 +73,11 @@ class TagSubPlugin extends Plugin
 
         switch ($cls)
         {
-        case 'TagsubAction':
-        case 'TagunsubAction':
-            include_once $dir . '/' . strtolower(mb_substr($cls, 0, -6)) . '.php';
-            return false;
         case 'TagSub':
             include_once $dir.'/'.$cls.'.php';
             return false;
+        case 'TagsubAction':
+        case 'TagunsubAction':
         case 'TagSubForm':
         case 'TagUnsubForm':
             include_once $dir.'/'.strtolower($cls).'.php';
@@ -153,4 +151,32 @@ class TagSubPlugin extends Plugin
         }
         return true;
     }
+
+    /**
+     *
+     * @param TagAction $action
+     * @return boolean hook result
+     */
+    function onStartTagShowContent(TagAction $action)
+    {
+        $user = common_current_user();
+        if ($user) {
+            $tag = $action->trimmed('tag');
+            $tagsub = TagSub::pkeyGet(array('tag' => $tag,
+                                            'profile_id' => $user->id));
+            if ($tagsub) {
+                $form = new TagUnsubForm($action, $tag);
+            } else {
+                $form = new TagSubForm($action, $tag);
+            }
+            $action->elementStart('div', 'entity_actions');
+            $action->elementStart('ul');
+            $action->elementStart('li', 'entity_subscribe');
+            $form->show();
+            $action->elementEnd('li');
+            $action->elementEnd('ul');
+            $action->elementEnd('div');
+        }
+        return true;
+    }
 }
diff --git a/plugins/TagSub/tagsubaction.php b/plugins/TagSub/tagsubaction.php
new file mode 100644
index 0000000000..2e4e25d6e1
--- /dev/null
+++ b/plugins/TagSub/tagsubaction.php
@@ -0,0 +1,149 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2008-2011, StatusNet, Inc.
+ *
+ * Tag subscription action.
+ *
+ * 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/>.
+ *
+ * PHP version 5
+ *
+ * @category  Action
+ * @package   StatusNet
+ * @author    Brion Vibber <brion@status.net>
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2008-2010 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPLv3
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
+/**
+ * Tag subscription action
+ *
+ * Takes parameters:
+ *
+ *    - token: session token to prevent CSRF attacks
+ *    - ajax: boolean; whether to return Ajax or full-browser results
+ *
+ * Only works if the current user is logged in.
+ *
+ * @category  Action
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @author    Brion Vibber <brion@status.net>
+ * @copyright 2008-2011 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPLv3
+ * @link      http://status.net/
+ */
+class TagsubAction extends Action
+{
+    var $user;
+    var $tag;
+
+    /**
+     * Check pre-requisites and instantiate attributes
+     *
+     * @param Array $args array of arguments (URL, GET, POST)
+     *
+     * @return boolean success flag
+     */
+    function prepare($args)
+    {
+        parent::prepare($args);
+        if ($this->boolean('ajax')) {
+            StatusNet::setApi(true);
+        }
+
+        // Only allow POST requests
+
+        if ($_SERVER['REQUEST_METHOD'] != 'POST') {
+            // TRANS: Client error displayed trying to perform any request method other than POST.
+            // TRANS: Do not translate POST.
+            $this->clientError(_('This action only accepts POST requests.'));
+            return false;
+        }
+
+        // CSRF protection
+
+        $token = $this->trimmed('token');
+
+        if (!$token || $token != common_session_token()) {
+            // TRANS: Client error displayed when the session token is not okay.
+            $this->clientError(_('There was a problem with your session token.'.
+                                 ' Try again, please.'));
+            return false;
+        }
+
+        // Only for logged-in users
+
+        $this->user = common_current_user();
+
+        if (empty($this->user)) {
+            // TRANS: Client error displayed trying to subscribe when not logged in.
+            $this->clientError(_('Not logged in.'));
+            return false;
+        }
+
+        // Profile to subscribe to
+
+        $this->tag = $this->arg('tag');
+
+        if (empty($this->tag)) {
+            // TRANS: Client error displayed trying to subscribe to a non-existing profile.
+            $this->clientError(_('No such profile.'));
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Handle request
+     *
+     * Does the subscription and returns results.
+     *
+     * @param Array $args unused.
+     *
+     * @return void
+     */
+    function handle($args)
+    {
+        // Throws exception on error
+
+        TagSub::start($this->user->getProfile(),
+                      $this->tag);
+
+        if ($this->boolean('ajax')) {
+            $this->startHTML('text/xml;charset=utf-8');
+            $this->elementStart('head');
+            // TRANS: Page title when tag subscription succeeded.
+            $this->element('title', null, _m('Subscribed'));
+            $this->elementEnd('head');
+            $this->elementStart('body');
+            $unsubscribe = new TagUnsubForm($this, $this->tag);
+            $unsubscribe->show();
+            $this->elementEnd('body');
+            $this->elementEnd('html');
+        } else {
+            $url = common_local_url('tag',
+                                    array('tag' => $this->tag));
+            common_redirect($url, 303);
+        }
+    }
+}
diff --git a/plugins/TagSub/tagsubform.php b/plugins/TagSub/tagsubform.php
new file mode 100644
index 0000000000..108558be24
--- /dev/null
+++ b/plugins/TagSub/tagsubform.php
@@ -0,0 +1,142 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Form for subscribing to a tag
+ *
+ * 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  TagSubPlugin
+ * @package   StatusNet
+ * @author    Brion Vibber <brion@status.net>
+ * @author    Evan Prodromou <evan@status.net>
+ * @author    Sarven Capadisli <csarven@status.net>
+ * @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/
+ */
+
+if (!defined('STATUSNET') && !defined('LACONICA')) {
+    exit(1);
+}
+
+/**
+ * Form for subscribing to a user
+ *
+ * @category TagSubPlugin
+ * @package  StatusNet
+ * @author   Brion Vibber <brion@status.net>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Sarven Capadisli <csarven@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://status.net/
+ *
+ * @see      UnsubscribeForm
+ */
+
+class TagSubForm extends Form
+{
+    /**
+     * Name of tag to subscribe to
+     */
+
+    var $tag = '';
+
+    /**
+     * Constructor
+     *
+     * @param HTMLOutputter $out     output channel
+     * @param string        $tag     name of tag to subscribe to
+     */
+
+    function __construct($out=null, $tag=null)
+    {
+        parent::__construct($out);
+
+        $this->tag = $tag;
+    }
+
+    /**
+     * ID of the form
+     *
+     * @return int ID of the form
+     */
+
+    function id()
+    {
+        return 'tag-subscribe-' . $this->tag;
+    }
+
+
+    /**
+     * class of the form
+     *
+     * @return string of the form class
+     */
+
+    function formClass()
+    {
+        // class to match existing styles...
+        return 'form_user_subscribe ajax';
+    }
+
+
+    /**
+     * Action of the form
+     *
+     * @return string URL of the action
+     */
+
+    function action()
+    {
+        return common_local_url('tagsub', array('tag' => $this->tag));
+    }
+
+
+    /**
+     * Legend of the Form
+     *
+     * @return void
+     */
+    function formLegend()
+    {
+        $this->out->element('legend', null, _m('Subscribe to this tag'));
+    }
+
+    /**
+     * Data elements of the form
+     *
+     * @return void
+     */
+
+    function formData()
+    {
+        $this->out->hidden('subscribeto-' . $this->tag,
+                           $this->tag,
+                           'subscribeto');
+    }
+
+    /**
+     * Action elements
+     *
+     * @return void
+     */
+
+    function formActions()
+    {
+        $this->out->submit('submit', _('Subscribe'), 'submit', null, _m('Subscribe to this tag'));
+    }
+}
diff --git a/plugins/TagSub/tagunsubaction.php b/plugins/TagSub/tagunsubaction.php
new file mode 100644
index 0000000000..26fb9ffec8
--- /dev/null
+++ b/plugins/TagSub/tagunsubaction.php
@@ -0,0 +1,89 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2008-2011, StatusNet, Inc.
+ *
+ * Tag subscription action.
+ *
+ * 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/>.
+ *
+ * PHP version 5
+ *
+ * @category  Action
+ * @package   StatusNet
+ * @author    Brion Vibber <brion@status.net>
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2008-2010 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPLv3
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
+/**
+ * Tag unsubscription action
+ *
+ * Takes parameters:
+ *
+ *    - token: session token to prevent CSRF attacks
+ *    - ajax: boolean; whether to return Ajax or full-browser results
+ *
+ * Only works if the current user is logged in.
+ *
+ * @category  Action
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @author    Brion Vibber <brion@status.net>
+ * @copyright 2008-2011 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPLv3
+ * @link      http://status.net/
+ */
+class TagunsubAction extends TagsubAction
+{
+    /**
+     * Handle request
+     *
+     * Does the subscription and returns results.
+     *
+     * @param Array $args unused.
+     *
+     * @return void
+     */
+    function handle($args)
+    {
+        // Throws exception on error
+
+        TagSub::cancel($this->user->getProfile(),
+                       $this->tag);
+
+        if ($this->boolean('ajax')) {
+            $this->startHTML('text/xml;charset=utf-8');
+            $this->elementStart('head');
+            // TRANS: Page title when tag unsubscription succeeded.
+            $this->element('title', null, _m('Unsubscribed'));
+            $this->elementEnd('head');
+            $this->elementStart('body');
+            $subscribe = new TagSubForm($this, $this->tag);
+            $subscribe->show();
+            $this->elementEnd('body');
+            $this->elementEnd('html');
+        } else {
+            $url = common_local_url('tag',
+                                    array('tag' => $this->tag));
+            common_redirect($url, 303);
+        }
+    }
+}
diff --git a/plugins/TagSub/tagunsubform.php b/plugins/TagSub/tagunsubform.php
new file mode 100644
index 0000000000..0b44648071
--- /dev/null
+++ b/plugins/TagSub/tagunsubform.php
@@ -0,0 +1,109 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Form for subscribing to a tag
+ *
+ * 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  TagSubPlugin
+ * @package   StatusNet
+ * @author    Brion Vibber <brion@status.net>
+ * @author    Evan Prodromou <evan@status.net>
+ * @author    Sarven Capadisli <csarven@status.net>
+ * @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/
+ */
+
+if (!defined('STATUSNET') && !defined('LACONICA')) {
+    exit(1);
+}
+
+/**
+ * Form for subscribing to a user
+ *
+ * @category TagSubPlugin
+ * @package  StatusNet
+ * @author   Brion Vibber <brion@status.net>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Sarven Capadisli <csarven@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://status.net/
+ *
+ * @see      UnsubscribeForm
+ */
+
+class TagUnsubForm extends TagSubForm
+{
+    /**
+     * ID of the form
+     *
+     * @return int ID of the form
+     */
+
+    function id()
+    {
+        return 'tag-unsubscribe-' . $this->tag;
+    }
+
+
+    /**
+     * class of the form
+     *
+     * @return string of the form class
+     */
+
+    function formClass()
+    {
+        // class to match existing styles...
+        return 'form_user_unsubscribe ajax';
+    }
+
+
+    /**
+     * Action of the form
+     *
+     * @return string URL of the action
+     */
+
+    function action()
+    {
+        return common_local_url('tagunsub', array('tag' => $this->tag));
+    }
+
+
+    /**
+     * Legend of the Form
+     *
+     * @return void
+     */
+    function formLegend()
+    {
+        $this->out->element('legend', null, _m('Unsubscribe from this tag'));
+    }
+
+    /**
+     * Action elements
+     *
+     * @return void
+     */
+
+    function formActions()
+    {
+        $this->out->submit('submit', _('Unsubscribe'), 'submit', null, _m('Unsubscribe from this tag'));
+    }
+}

From 579fc11862173c8be3a623ebc3248ce9d61835a8 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Tue, 15 Mar 2011 14:58:09 -0700
Subject: [PATCH 578/655] copy-paste TagSub to SearchSub :D

---
 plugins/SearchSub/SearchSub.php         | 140 ++++++++++++++++++
 plugins/SearchSub/SearchSubPlugin.php   | 182 ++++++++++++++++++++++++
 plugins/SearchSub/searchsubaction.php   | 149 +++++++++++++++++++
 plugins/SearchSub/searchsubform.php     | 142 ++++++++++++++++++
 plugins/SearchSub/searchunsubaction.php |  89 ++++++++++++
 plugins/SearchSub/searchunsubform.php   | 109 ++++++++++++++
 6 files changed, 811 insertions(+)
 create mode 100644 plugins/SearchSub/SearchSub.php
 create mode 100644 plugins/SearchSub/SearchSubPlugin.php
 create mode 100644 plugins/SearchSub/searchsubaction.php
 create mode 100644 plugins/SearchSub/searchsubform.php
 create mode 100644 plugins/SearchSub/searchunsubaction.php
 create mode 100644 plugins/SearchSub/searchunsubform.php

diff --git a/plugins/SearchSub/SearchSub.php b/plugins/SearchSub/SearchSub.php
new file mode 100644
index 0000000000..cbf64d39cc
--- /dev/null
+++ b/plugins/SearchSub/SearchSub.php
@@ -0,0 +1,140 @@
+<?php
+/**
+ * Data class to store local search subscriptions
+ *
+ * PHP version 5
+ *
+ * @category SearchSubPlugin
+ * @package  StatusNet
+ * @author   Brion Vibber <brion@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
+ * @link     http://status.net/
+ *
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2011, StatusNet, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.     See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
+/**
+ * For storing the search subscriptions
+ *
+ * @category PollPlugin
+ * @package  StatusNet
+ * @author   Brion Vibber <brion@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
+ * @link     http://status.net/
+ *
+ * @see      DB_DataObject
+ */
+
+class SearchSub extends Managed_DataObject
+{
+    public $__table = 'searchsub'; // table name
+    public $search;         // text
+    public $profile_id;  // int -> profile.id
+    public $created;     // datetime
+
+    /**
+     * Get an instance by key
+     *
+     * This is a utility method to get a single instance with a given key value.
+     *
+     * @param string $k Key to use to lookup (usually 'user_id' for this class)
+     * @param mixed  $v Value to lookup
+     *
+     * @return SearchSub object found, or null for no hits
+     *
+     */
+    function staticGet($k, $v=null)
+    {
+        return Memcached_DataObject::staticGet('SearchSub', $k, $v);
+    }
+
+    /**
+     * Get an instance by compound key
+     *
+     * This is a utility method to get a single instance with a given set of
+     * key-value pairs. Usually used for the primary key for a compound key; thus
+     * the name.
+     *
+     * @param array $kv array of key-value mappings
+     *
+     * @return SearchSub object found, or null for no hits
+     *
+     */
+    function pkeyGet($kv)
+    {
+        return Memcached_DataObject::pkeyGet('SearchSub', $kv);
+    }
+
+    /**
+     * The One True Thingy that must be defined and declared.
+     */
+    public static function schemaDef()
+    {
+        return array(
+            'description' => 'SearchSubPlugin search subscription records',
+            'fields' => array(
+                'search' => array('type' => 'varchar', 'length' => 64, 'not null' => true, 'description' => 'hash search associated with this subscription'),
+                'profile_id' => array('type' => 'int', 'not null' => true, 'description' => 'profile ID of subscribing user'),
+                'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
+            ),
+            'primary key' => array('search', 'profile_id'),
+            'foreign keys' => array(
+                'searchsub_profile_id_fkey' => array('profile', array('profile_id' => 'id')),
+            ),
+            'indexes' => array(
+                'searchsub_created_idx' => array('created'),
+                'searchsub_profile_id_tag_idx' => array('profile_id', 'search'),
+            ),
+        );
+    }
+
+    /**
+     * Start a search subscription!
+     *
+     * @param profile $profile subscriber
+     * @param string $search subscribee
+     * @return SearchSub
+     */
+    static function start(Profile $profile, $search)
+    {
+        $ts = new SearchSub();
+        $ts->search = $search;
+        $ts->profile_id = $profile->id;
+        $ts->created = common_sql_now();
+        $ts->insert();
+        return $ts;
+    }
+
+    /**
+     * End a search subscription!
+     *
+     * @param profile $profile subscriber
+     * @param string $search subscribee
+     */
+    static function cancel(Profile $profile, $search)
+    {
+        $ts = SearchSub::pkeyGet(array('search' => $search,
+                                    'profile_id' => $profile->id));
+        if ($ts) {
+            $ts->delete();
+        }
+    }
+}
diff --git a/plugins/SearchSub/SearchSubPlugin.php b/plugins/SearchSub/SearchSubPlugin.php
new file mode 100644
index 0000000000..59db0ffcbb
--- /dev/null
+++ b/plugins/SearchSub/SearchSubPlugin.php
@@ -0,0 +1,182 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2011, StatusNet, Inc.
+ *
+ * A plugin to enable local tab subscription
+ *
+ * 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  SearchSubPlugin
+ * @package   StatusNet
+ * @author    Brion Vibber <brion@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')) {
+    exit(1);
+}
+
+/**
+ * SearchSub plugin main class
+ *
+ * @category  SearchSubPlugin
+ * @package   StatusNet
+ * @author    Brion Vibber <brionv@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 SearchSubPlugin extends Plugin
+{
+    const VERSION         = '0.1';
+
+    /**
+     * Database schema setup
+     *
+     * @see Schema
+     *
+     * @return boolean hook value; true means continue processing, false means stop.
+     */
+    function onCheckSchema()
+    {
+        $schema = Schema::get();
+        $schema->ensureTable('searchsub', SearchSub::schemaDef());
+        return true;
+    }
+
+    /**
+     * Load related modules when needed
+     *
+     * @param string $cls Name of the class to be loaded
+     *
+     * @return boolean hook value; true means continue processing, false means stop.
+     */
+    function onAutoload($cls)
+    {
+        $dir = dirname(__FILE__);
+
+        switch ($cls)
+        {
+        case 'SearchSub':
+            include_once $dir.'/'.$cls.'.php';
+            return false;
+        case 'SearchsubAction':
+        case 'SearchunsubAction':
+        case 'SearchSubForm':
+        case 'SearchUnsubForm':
+            include_once $dir.'/'.strtolower($cls).'.php';
+            return false;
+        default:
+            return true;
+        }
+    }
+
+    /**
+     * Map URLs to actions
+     *
+     * @param Net_URL_Mapper $m path-to-action mapper
+     *
+     * @return boolean hook value; true means continue processing, false means stop.
+     */
+    function onRouterInitialized($m)
+    {
+        $m->connect('search/:search/subscribe',
+                    array('action' => 'searchsub'),
+                    array('search' => Router::REGEX_TAG));
+        $m->connect('search/:search/unsubscribe',
+                    array('action' => 'searchunsub'),
+                    array('search' => Router::REGEX_TAG));
+
+        return true;
+    }
+
+    /**
+     * Plugin version data
+     *
+     * @param array &$versions array of version data
+     *
+     * @return value
+     */
+    function onPluginVersion(&$versions)
+    {
+        $versions[] = array('name' => 'SearchSub',
+                            'version' => self::VERSION,
+                            'author' => 'Brion Vibber',
+                            'homepage' => 'http://status.net/wiki/Plugin:SearchSub',
+                            'rawdescription' =>
+                            // TRANS: Plugin description.
+                            _m('Plugin to allow following all messages with a given search.'));
+        return true;
+    }
+
+    /**
+     * Hook inbox delivery setup so search subscribers receive all
+     * notices with that search in their inbox.
+     *
+     * Currently makes no distinction between local messages and
+     * remote ones which happen to come in to the system. Remote
+     * notices that don't come in at all won't ever reach this.
+     *
+     * @param Notice $notice
+     * @param array $ni in/out map of profile IDs to inbox constants
+     * @return boolean hook result
+     */
+    function onStartNoticeWhoGets(Notice $notice, array &$ni)
+    {
+        foreach ($notice->getTags() as $search) {
+            $searchsub = new SearchSub();
+            $searchsub->search = $search;
+            $searchsub->find();
+
+            while ($searchsub->fetch()) {
+                // These constants are currently not actually used, iirc
+                $ni[$searchsub->profile_id] = NOTICE_INBOX_SOURCE_SUB;
+            }
+        }
+        return true;
+    }
+
+    /**
+     *
+     * @param SearchAction $action
+     * @return boolean hook result
+     */
+    function onStartTagShowContent(SearchAction $action)
+    {
+        $user = common_current_user();
+        if ($user) {
+            $search = $action->trimmed('search');
+            $searchsub = SearchSub::pkeyGet(array('search' => $search,
+                                            'profile_id' => $user->id));
+            if ($searchsub) {
+                $form = new SearchUnsubForm($action, $search);
+            } else {
+                $form = new SearchSubForm($action, $search);
+            }
+            $action->elementStart('div', 'entity_actions');
+            $action->elementStart('ul');
+            $action->elementStart('li', 'entity_subscribe');
+            $form->show();
+            $action->elementEnd('li');
+            $action->elementEnd('ul');
+            $action->elementEnd('div');
+        }
+        return true;
+    }
+}
diff --git a/plugins/SearchSub/searchsubaction.php b/plugins/SearchSub/searchsubaction.php
new file mode 100644
index 0000000000..67bc178df6
--- /dev/null
+++ b/plugins/SearchSub/searchsubaction.php
@@ -0,0 +1,149 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2008-2011, StatusNet, Inc.
+ *
+ * Search subscription action.
+ *
+ * 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/>.
+ *
+ * PHP version 5
+ *
+ * @category  Action
+ * @package   StatusNet
+ * @author    Brion Vibber <brion@status.net>
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2008-2010 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPLv3
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
+/**
+ * Search subscription action
+ *
+ * Takes parameters:
+ *
+ *    - token: session token to prevent CSRF attacks
+ *    - ajax: boolean; whether to return Ajax or full-browser results
+ *
+ * Only works if the current user is logged in.
+ *
+ * @category  Action
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @author    Brion Vibber <brion@status.net>
+ * @copyright 2008-2011 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPLv3
+ * @link      http://status.net/
+ */
+class SearchsubAction extends Action
+{
+    var $user;
+    var $search;
+
+    /**
+     * Check pre-requisites and instantiate attributes
+     *
+     * @param Array $args array of arguments (URL, GET, POST)
+     *
+     * @return boolean success flag
+     */
+    function prepare($args)
+    {
+        parent::prepare($args);
+        if ($this->boolean('ajax')) {
+            StatusNet::setApi(true);
+        }
+
+        // Only allow POST requests
+
+        if ($_SERVER['REQUEST_METHOD'] != 'POST') {
+            // TRANS: Client error displayed trying to perform any request method other than POST.
+            // TRANS: Do not translate POST.
+            $this->clientError(_('This action only accepts POST requests.'));
+            return false;
+        }
+
+        // CSRF protection
+
+        $token = $this->trimmed('token');
+
+        if (!$token || $token != common_session_token()) {
+            // TRANS: Client error displayed when the session token is not okay.
+            $this->clientError(_('There was a problem with your session token.'.
+                                 ' Try again, please.'));
+            return false;
+        }
+
+        // Only for logged-in users
+
+        $this->user = common_current_user();
+
+        if (empty($this->user)) {
+            // TRANS: Client error displayed trying to subscribe when not logged in.
+            $this->clientError(_('Not logged in.'));
+            return false;
+        }
+
+        // Profile to subscribe to
+
+        $this->search = $this->arg('search');
+
+        if (empty($this->search)) {
+            // TRANS: Client error displayed trying to subscribe to a non-existing profile.
+            $this->clientError(_('No such profile.'));
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Handle request
+     *
+     * Does the subscription and returns results.
+     *
+     * @param Array $args unused.
+     *
+     * @return void
+     */
+    function handle($args)
+    {
+        // Throws exception on error
+
+        SearchSub::start($this->user->getProfile(),
+                      $this->search);
+
+        if ($this->boolean('ajax')) {
+            $this->startHTML('text/xml;charset=utf-8');
+            $this->elementStart('head');
+            // TRANS: Page title when search subscription succeeded.
+            $this->element('title', null, _m('Subscribed'));
+            $this->elementEnd('head');
+            $this->elementStart('body');
+            $unsubscribe = new SearchUnsubForm($this, $this->search);
+            $unsubscribe->show();
+            $this->elementEnd('body');
+            $this->elementEnd('html');
+        } else {
+            $url = common_local_url('search',
+                                    array('search' => $this->search));
+            common_redirect($url, 303);
+        }
+    }
+}
diff --git a/plugins/SearchSub/searchsubform.php b/plugins/SearchSub/searchsubform.php
new file mode 100644
index 0000000000..8078cdde1b
--- /dev/null
+++ b/plugins/SearchSub/searchsubform.php
@@ -0,0 +1,142 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Form for subscribing to a search
+ *
+ * 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  SearchSubPlugin
+ * @package   StatusNet
+ * @author    Brion Vibber <brion@status.net>
+ * @author    Evan Prodromou <evan@status.net>
+ * @author    Sarven Capadisli <csarven@status.net>
+ * @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/
+ */
+
+if (!defined('STATUSNET') && !defined('LACONICA')) {
+    exit(1);
+}
+
+/**
+ * Form for subscribing to a user
+ *
+ * @category SearchSubPlugin
+ * @package  StatusNet
+ * @author   Brion Vibber <brion@status.net>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Sarven Capadisli <csarven@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://status.net/
+ *
+ * @see      UnsubscribeForm
+ */
+
+class SearchSubForm extends Form
+{
+    /**
+     * Name of search to subscribe to
+     */
+
+    var $search = '';
+
+    /**
+     * Constructor
+     *
+     * @param HTMLOutputter $out     output channel
+     * @param string        $search     name of search to subscribe to
+     */
+
+    function __construct($out=null, $search=null)
+    {
+        parent::__construct($out);
+
+        $this->search = $search;
+    }
+
+    /**
+     * ID of the form
+     *
+     * @return int ID of the form
+     */
+
+    function id()
+    {
+        return 'search-subscribe-' . $this->search;
+    }
+
+
+    /**
+     * class of the form
+     *
+     * @return string of the form class
+     */
+
+    function formClass()
+    {
+        // class to match existing styles...
+        return 'form_user_subscribe ajax';
+    }
+
+
+    /**
+     * Action of the form
+     *
+     * @return string URL of the action
+     */
+
+    function action()
+    {
+        return common_local_url('searchsub', array('search' => $this->search));
+    }
+
+
+    /**
+     * Legend of the Form
+     *
+     * @return void
+     */
+    function formLegend()
+    {
+        $this->out->element('legend', null, _m('Subscribe to this search'));
+    }
+
+    /**
+     * Data elements of the form
+     *
+     * @return void
+     */
+
+    function formData()
+    {
+        $this->out->hidden('subscribeto-' . $this->search,
+                           $this->search,
+                           'subscribeto');
+    }
+
+    /**
+     * Action elements
+     *
+     * @return void
+     */
+
+    function formActions()
+    {
+        $this->out->submit('submit', _('Subscribe'), 'submit', null, _m('Subscribe to this search'));
+    }
+}
diff --git a/plugins/SearchSub/searchunsubaction.php b/plugins/SearchSub/searchunsubaction.php
new file mode 100644
index 0000000000..f7f006e21c
--- /dev/null
+++ b/plugins/SearchSub/searchunsubaction.php
@@ -0,0 +1,89 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2008-2011, StatusNet, Inc.
+ *
+ * Search subscription action.
+ *
+ * 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/>.
+ *
+ * PHP version 5
+ *
+ * @category  Action
+ * @package   StatusNet
+ * @author    Brion Vibber <brion@status.net>
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2008-2010 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPLv3
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
+/**
+ * Search unsubscription action
+ *
+ * Takes parameters:
+ *
+ *    - token: session token to prevent CSRF attacks
+ *    - ajax: boolean; whether to return Ajax or full-browser results
+ *
+ * Only works if the current user is logged in.
+ *
+ * @category  Action
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @author    Brion Vibber <brion@status.net>
+ * @copyright 2008-2011 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPLv3
+ * @link      http://status.net/
+ */
+class SearchunsubAction extends SearchsubAction
+{
+    /**
+     * Handle request
+     *
+     * Does the subscription and returns results.
+     *
+     * @param Array $args unused.
+     *
+     * @return void
+     */
+    function handle($args)
+    {
+        // Throws exception on error
+
+        SearchSub::cancel($this->user->getProfile(),
+                       $this->search);
+
+        if ($this->boolean('ajax')) {
+            $this->startHTML('text/xml;charset=utf-8');
+            $this->elementStart('head');
+            // TRANS: Page title when search unsubscription succeeded.
+            $this->element('title', null, _m('Unsubscribed'));
+            $this->elementEnd('head');
+            $this->elementStart('body');
+            $subscribe = new SearchSubForm($this, $this->search);
+            $subscribe->show();
+            $this->elementEnd('body');
+            $this->elementEnd('html');
+        } else {
+            $url = common_local_url('search',
+                                    array('search' => $this->search));
+            common_redirect($url, 303);
+        }
+    }
+}
diff --git a/plugins/SearchSub/searchunsubform.php b/plugins/SearchSub/searchunsubform.php
new file mode 100644
index 0000000000..296b74f4a1
--- /dev/null
+++ b/plugins/SearchSub/searchunsubform.php
@@ -0,0 +1,109 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Form for subscribing to a search
+ *
+ * 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  SearchSubPlugin
+ * @package   StatusNet
+ * @author    Brion Vibber <brion@status.net>
+ * @author    Evan Prodromou <evan@status.net>
+ * @author    Sarven Capadisli <csarven@status.net>
+ * @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/
+ */
+
+if (!defined('STATUSNET') && !defined('LACONICA')) {
+    exit(1);
+}
+
+/**
+ * Form for subscribing to a user
+ *
+ * @category SearchSubPlugin
+ * @package  StatusNet
+ * @author   Brion Vibber <brion@status.net>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Sarven Capadisli <csarven@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://status.net/
+ *
+ * @see      UnsubscribeForm
+ */
+
+class SearchUnsubForm extends SearchSubForm
+{
+    /**
+     * ID of the form
+     *
+     * @return int ID of the form
+     */
+
+    function id()
+    {
+        return 'search-unsubscribe-' . $this->search;
+    }
+
+
+    /**
+     * class of the form
+     *
+     * @return string of the form class
+     */
+
+    function formClass()
+    {
+        // class to match existing styles...
+        return 'form_user_unsubscribe ajax';
+    }
+
+
+    /**
+     * Action of the form
+     *
+     * @return string URL of the action
+     */
+
+    function action()
+    {
+        return common_local_url('searchunsub', array('search' => $this->search));
+    }
+
+
+    /**
+     * Legend of the Form
+     *
+     * @return void
+     */
+    function formLegend()
+    {
+        $this->out->element('legend', null, _m('Unsubscribe from this search'));
+    }
+
+    /**
+     * Action elements
+     *
+     * @return void
+     */
+
+    function formActions()
+    {
+        $this->out->submit('submit', _('Unsubscribe'), 'submit', null, _m('Unsubscribe from this search'));
+    }
+}

From 08b430a24736e3bd92c2b8464f825c3ec00f6b79 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Tue, 15 Mar 2011 15:33:37 -0700
Subject: [PATCH 579/655] Event hook for notice search pages

---
 actions/noticesearch.php | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/actions/noticesearch.php b/actions/noticesearch.php
index 4f4c7a05ba..1f43af800d 100644
--- a/actions/noticesearch.php
+++ b/actions/noticesearch.php
@@ -138,11 +138,14 @@ class NoticesearchAction extends SearchAction
             $this->elementEnd('div');
             return;
         }
-        $terms = preg_split('/[\s,]+/', $q);
-        $nl = new SearchNoticeList($notice, $this, $terms);
-        $cnt = $nl->show();
-        $this->pagination($page > 1, $cnt > NOTICES_PER_PAGE,
-                          $page, 'noticesearch', array('q' => $q));
+        if (Event::handle('StartNoticeSearchShowResults', array($this, $q, $notice))) {
+            $terms = preg_split('/[\s,]+/', $q);
+            $nl = new SearchNoticeList($notice, $this, $terms);
+            $cnt = $nl->show();
+            $this->pagination($page > 1, $cnt > NOTICES_PER_PAGE,
+                              $page, 'noticesearch', array('q' => $q));
+            Event::handle('EndNoticeSearchShowResults', array($this, $q, $notice));
+        }
     }
 
     function showScripts()

From 341bef5e017d655a6c098639f08f46bc6efc6d60 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Tue, 15 Mar 2011 15:34:06 -0700
Subject: [PATCH 580/655] tag -> search stuff: basic search subscription
 implementation in SearchSub

---
 plugins/SearchSub/SearchSubPlugin.php | 52 +++++++++++++++++++++------
 1 file changed, 41 insertions(+), 11 deletions(-)

diff --git a/plugins/SearchSub/SearchSubPlugin.php b/plugins/SearchSub/SearchSubPlugin.php
index 59db0ffcbb..130600a41a 100644
--- a/plugins/SearchSub/SearchSubPlugin.php
+++ b/plugins/SearchSub/SearchSubPlugin.php
@@ -139,31 +139,61 @@ class SearchSubPlugin extends Plugin
      */
     function onStartNoticeWhoGets(Notice $notice, array &$ni)
     {
-        foreach ($notice->getTags() as $search) {
-            $searchsub = new SearchSub();
-            $searchsub->search = $search;
-            $searchsub->find();
+        // Warning: this is potentially very slow
+        // with a lot of searches!
+        $sub = new SearchSub();
+        $sub->groupBy('search');
+        $sub->find();
+        while ($sub->fetch()) {
+            $search = $sub->search;
 
-            while ($searchsub->fetch()) {
-                // These constants are currently not actually used, iirc
-                $ni[$searchsub->profile_id] = NOTICE_INBOX_SOURCE_SUB;
+            if ($this->matchSearch($notice, $search)) {
+                // Match? Find all those who subscribed to this
+                // search term and get our delivery on...
+                $searchsub = new SearchSub();
+                $searchsub->search = $search;
+                $searchsub->find();
+
+                while ($searchsub->fetch()) {
+                    // These constants are currently not actually used, iirc
+                    $ni[$searchsub->profile_id] = NOTICE_INBOX_SOURCE_SUB;
+                }
             }
         }
         return true;
     }
 
     /**
+     * Does the given notice match the given fulltext search query?
      *
-     * @param SearchAction $action
+     * Warning: not guaranteed to match other search engine behavior, etc.
+     * Currently using a basic case-insensitive substring match, which
+     * probably fits with the 'LIKE' search but not the default MySQL
+     * or Sphinx search backends.
+     *
+     * @param Notice $notice
+     * @param string $search 
+     * @return boolean
+     */
+    function matchSearch(Notice $notice, $search)
+    {
+        return (mb_stripos($notice->content, $search) !== false);
+    }
+
+    /**
+     *
+     * @param NoticeSearchAction $action
+     * @param string $q
+     * @param Notice $notice
      * @return boolean hook result
      */
-    function onStartTagShowContent(SearchAction $action)
+    function onStartNoticeSearchShowResults($action, $q, $notice)
     {
         $user = common_current_user();
         if ($user) {
-            $search = $action->trimmed('search');
+            $search = $q;
             $searchsub = SearchSub::pkeyGet(array('search' => $search,
-                                            'profile_id' => $user->id));
+                                                  'profile_id' => $user->id));
             if ($searchsub) {
                 $form = new SearchUnsubForm($action, $search);
             } else {

From e4eb6719a5e270430b57425bcb344f0c7971254b Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Tue, 15 Mar 2011 15:35:00 -0700
Subject: [PATCH 581/655] Extended profile - make birthday save

---
 .../ExtendedProfile/extendedprofilewidget.php |  8 +-
 .../profiledetailsettingsaction.php           | 76 +++++++++----------
 2 files changed, 45 insertions(+), 39 deletions(-)

diff --git a/plugins/ExtendedProfile/extendedprofilewidget.php b/plugins/ExtendedProfile/extendedprofilewidget.php
index 05cfadacc3..fc3d7ca51d 100644
--- a/plugins/ExtendedProfile/extendedprofilewidget.php
+++ b/plugins/ExtendedProfile/extendedprofilewidget.php
@@ -399,7 +399,7 @@ class ExtendedProfileWidget extends Form
         $this->out->element('div', 'label', _m('Description'));
         $this->out->element('div', 'field', $field['description']);
 
-        $this->out->input(
+        $this->out->textarea(
             $id . '-description',
             null,
             isset($field['description']) ? $field['description'] : null
@@ -463,6 +463,9 @@ class ExtendedProfileWidget extends Form
         case 'textarea':
             $this->out->text($this->ext->getTextValue($name));
             break;
+        case 'date':
+            $this->out->text($this->ext->getTextValue($name));
+            break;
         case 'tags':
             $this->out->text($this->ext->getTags());
             break;
@@ -506,6 +509,9 @@ class ExtendedProfileWidget extends Form
         case 'text':
             $out->input($id, null, $this->ext->getTextValue($name));
             break;
+        case 'date':
+            $out->input($id, null, $this->ext->getTextValue($name));
+            break;
         case 'textarea':
             $out->textarea($id, null,  $this->ext->getTextValue($name));
             break;
diff --git a/plugins/ExtendedProfile/profiledetailsettingsaction.php b/plugins/ExtendedProfile/profiledetailsettingsaction.php
index 2357860884..d3b653bad2 100644
--- a/plugins/ExtendedProfile/profiledetailsettingsaction.php
+++ b/plugins/ExtendedProfile/profiledetailsettingsaction.php
@@ -100,6 +100,7 @@ class ProfileDetailSettingsAction extends ProfileSettingsAction
             $profile = $user->getProfile();
 
             $simpleFieldNames = array('title', 'spouse', 'kids');
+            $dateFieldNames   = array('birthday');
 
             foreach ($simpleFieldNames as $name) {
                 $value = $this->trimmed('extprofile-' . $name);
@@ -108,6 +109,15 @@ class ProfileDetailSettingsAction extends ProfileSettingsAction
                 }
             }
 
+            foreach ($dateFieldNames as $name) {
+                $value = $this->trimmed('extprofile-' . $name);
+                $this->saveField(
+                    $user,
+                    $name,
+                    $this->parseDate($name, $value)
+                );
+            }
+
             $this->savePhoneNumbers($user);
             $this->saveIms($user);
             $this->saveWebsites($user);
@@ -123,6 +133,30 @@ class ProfileDetailSettingsAction extends ProfileSettingsAction
 
     }
 
+    function parseDate($fieldname, $datestr, $required = false)
+    {
+        if (empty($datestr) && $required) {
+            $msg = sprintf(
+                _m('You must supply a date for "%s".'),
+                $fieldname
+            );
+            throw new Exception($msg);
+        } else {
+            $ts = strtotime($datestr);
+            if ($ts === false) {
+                throw new Exception(
+                    sprintf(
+                        _m('Invalid date entered for "%s": %s'),
+                        $fieldname,
+                        $ts
+                    )
+                );
+            }
+            return common_sql_date($ts);
+        }
+        return null;
+    }
+
     function savePhoneNumbers($user) {
         $phones = $this->findPhoneNumbers();
         $this->removeAll($user, 'phone');
@@ -249,26 +283,10 @@ class ProfileDetailSettingsAction extends ProfileSettingsAction
         foreach ($experiences as $exp) {
             list($company, $current, $end, $start) = array_values($exp);
             if (!empty($company)) {
-                $startTs = strtotime($start);
-
-                if ($startTs === false) {
-                    $msg = empty($start) ? _m('You must supply a start date.')
-                        : sprintf(_m("Invalid start date: %s"), $start);
-                    throw new Exception($msg);
-                }
-
-                $endTs = strtotime($end);
-
-                if ($current === 'false' && $endTs === false) {
-                    $msg = empty($end) ? _m('You must supply an end date.')
-                        : sprintf(_m("Invalid end date: %s"), $end);
-                    throw new Exception($msg);
-                }
-
                 $expArray[] = array(
                     'company' => $company,
-                    'start'   => common_sql_date($startTs),
-                    'end'     => common_sql_date($endTs),
+                    'start'   => $this->parseDate('Start', $start, true),
+                    'end'     => $this->parseDate('End', $end, true),
                     'current' => ($current == 'false') ? false : true
                 );
             }
@@ -344,31 +362,13 @@ class ProfileDetailSettingsAction extends ProfileSettingsAction
 
         foreach ($edus as $edu) {
             list($school, $degree, $description, $end, $start) = array_values($edu);
-
             if (!empty($school)) {
-
-                $startTs = strtotime($start);
-
-                if ($startTs === false) {
-                    $msg = empty($start) ? _m('You must supply a start date.')
-                        : sprintf(_m("Invalid start date: %s"), $start);
-                    throw new Exception($msg);
-                }
-
-                $endTs = strtotime($end);
-
-                if ($endTs === false) {
-                    $msg = empty($end) ? _m('You must supply an end date.')
-                        : sprintf(_m("Invalid end date: %s"), $end);
-                    throw new Exception($msg);
-                }
-
                 $eduArray[] = array(
                     'school'      => $school,
                     'degree'      => $degree,
                     'description' => $description,
-                    'start'       => common_sql_date($startTs),
-                    'end'         => common_sql_date($endTs)
+                    'start'       => $this->parseDate('Start', $start, true),
+                    'end'         => $this->parseDate('End', $end, true)
                 );
             }
         }

From ce05a78d0843b7d6f1664d128d0cfd3eac5e2801 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Tue, 15 Mar 2011 17:15:25 -0700
Subject: [PATCH 582/655] SubMirror wizard work in progress: Twitter option now
 lets you type in a username and picks the feed. Should in theory work via
 superfeedr or other compatible hub

---
 plugins/SubMirror/actions/addmirror.php       | 18 +++++-
 plugins/SubMirror/actions/basemirror.php      |  2 +-
 plugins/SubMirror/actions/mirrorsettings.php  | 15 ++++-
 plugins/SubMirror/lib/addmirrorform.php       |  3 +-
 .../SubMirror/lib/addtwittermirrorform.php    | 60 +++++++++++++++++++
 5 files changed, 94 insertions(+), 4 deletions(-)
 create mode 100644 plugins/SubMirror/lib/addtwittermirrorform.php

diff --git a/plugins/SubMirror/actions/addmirror.php b/plugins/SubMirror/actions/addmirror.php
index 8c3a9740f3..31805c1669 100644
--- a/plugins/SubMirror/actions/addmirror.php
+++ b/plugins/SubMirror/actions/addmirror.php
@@ -59,11 +59,27 @@ class AddMirrorAction extends BaseMirrorAction
     function prepare($args)
     {
         parent::prepare($args);
-        $this->feedurl = $this->validateFeedUrl($this->trimmed('feedurl'));
+        $feedurl = $this->getFeedUrl();
+        $this->feedurl = $this->validateFeedUrl($feedurl);
         $this->profile = $this->profileForFeed($this->feedurl);
         return true;
     }
 
+    function getFeedUrl()
+    {
+        $provider = $this->trimmed('provider');
+        switch ($provider) {
+        case 'feed':
+            return $this->trimmed('feedurl');
+        case 'twitter':
+            $screenie = $this->trimmed('screen_name');
+            $base = 'http://api.twitter.com/1/statuses/user_timeline.atom?screen_name=';
+            return $base . urlencode($screenie);
+        default:
+            throw new Exception('Internal form error: unrecognized feed provider.');
+        }
+    }
+
     function saveMirror()
     {
         if ($this->oprofile->subscribe()) {
diff --git a/plugins/SubMirror/actions/basemirror.php b/plugins/SubMirror/actions/basemirror.php
index 3e3431103f..843dfb92e1 100644
--- a/plugins/SubMirror/actions/basemirror.php
+++ b/plugins/SubMirror/actions/basemirror.php
@@ -68,7 +68,7 @@ abstract class BaseMirrorAction extends Action
         if (common_valid_http_url($url)) {
             return $url;
         } else {
-            $this->clientError(_m("Invalid feed URL."));
+            $this->clientError(sprintf(_m("Invalid feed URL: %s"), $url));
         }
     }
 
diff --git a/plugins/SubMirror/actions/mirrorsettings.php b/plugins/SubMirror/actions/mirrorsettings.php
index ae09111ec4..90bbf3dffb 100644
--- a/plugins/SubMirror/actions/mirrorsettings.php
+++ b/plugins/SubMirror/actions/mirrorsettings.php
@@ -100,7 +100,20 @@ class MirrorSettingsAction extends SettingsAction
 
     function showAddFeedForm()
     {
-        $form = new AddMirrorForm($this);
+        switch ($this->arg('provider')) {
+        case 'statusnet':
+            break;
+        case 'twitter':
+            $form = new AddTwitterMirrorForm($this);
+            break;
+        case 'wordpress':
+            break;
+        case 'linkedin':
+            break;
+        case 'feed':
+        default:
+            $form = new AddMirrorForm($this);
+        }
         $form->show();
     }
 
diff --git a/plugins/SubMirror/lib/addmirrorform.php b/plugins/SubMirror/lib/addmirrorform.php
index e1d50c272c..17edbd5e96 100644
--- a/plugins/SubMirror/lib/addmirrorform.php
+++ b/plugins/SubMirror/lib/addmirrorform.php
@@ -49,6 +49,7 @@ class AddMirrorForm extends Form
      */
     function formData()
     {
+        $this->out->hidden('provider', 'feed');
         $this->out->elementStart('fieldset');
 
         $this->out->elementStart('ul');
@@ -67,7 +68,7 @@ class AddMirrorForm extends Form
         $this->out->elementEnd('fieldset');
     }
 
-    private function doInput($id, $name, $label, $value=null, $instructions=null)
+    protected function doInput($id, $name, $label, $value=null, $instructions=null)
     {
         $this->out->element('label', array('for' => $id), $label);
         $attrs = array('name' => $name,
diff --git a/plugins/SubMirror/lib/addtwittermirrorform.php b/plugins/SubMirror/lib/addtwittermirrorform.php
new file mode 100644
index 0000000000..eb28aa038f
--- /dev/null
+++ b/plugins/SubMirror/lib/addtwittermirrorform.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @package   StatusNet
+ * @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);
+}
+
+class AddTwitterMirrorForm extends AddMirrorForm
+{
+
+    /**
+     * Visible or invisible data elements
+     *
+     * Display the form fields that make up the data of the form.
+     * Sub-classes should overload this to show their data.
+     *
+     * @return void
+     */
+    function formData()
+    {
+        $this->out->hidden('provider', 'twitter');
+        $this->out->elementStart('fieldset');
+
+        $this->out->elementStart('ul');
+
+        $this->li();
+        $this->doInput('addmirror-feedurl',
+                       'screen_name',
+                       _m('Twitter username:'),
+                       $this->out->trimmed('screen_name'));
+        $this->unli();
+
+        $this->li();
+        $this->out->submit('addmirror-save', _m('BUTTON','Add feed'));
+        $this->unli();
+        $this->out->elementEnd('ul');
+        $this->out->elementEnd('fieldset');
+    }
+}

From 7345de120221da277fff253e59a7259ae3b0e9cb Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Tue, 15 Mar 2011 17:32:25 -0700
Subject: [PATCH 583/655] Add layout divs to InfoAction's core block; fixes
 error display layout in Neo skin

---
 lib/info.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lib/info.php b/lib/info.php
index 395c6522ec..f72bed59d6 100644
--- a/lib/info.php
+++ b/lib/info.php
@@ -93,8 +93,14 @@ class InfoAction extends Action
     function showCore()
     {
         $this->elementStart('div', array('id' => 'core'));
+        $this->elementStart('div', array('id' => 'aside_primary_wrapper'));
+        $this->elementStart('div', array('id' => 'content_wrapper'));
+        $this->elementStart('div', array('id' => 'site_nav_local_views_wrapper'));
         $this->showContentBlock();
         $this->elementEnd('div');
+        $this->elementEnd('div');
+        $this->elementEnd('div');
+        $this->elementEnd('div');
     }
 
     function showHeader()

From 73b5821fc33225978e51cb04c9e5ad1434bc018c Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Tue, 15 Mar 2011 17:32:09 -0700
Subject: [PATCH 584/655] Submirror wizard updates... commenting out Wordpress
 (not sure what to do with it), LinkedIn (can't find documentation on any
 public RSS/Atom feeds from it, it seems that a feed of your updates doesn't
 currently exist?), and StatusNet (we'd need to know what to do with it; could
 take webfinger-style addresses or such.) Also added a commented-out Facebook
 section; it seems that there may not be a current way to get at public
 updates via RSS/Atom either, or if it is it seems really inconsistent and
 undocumented. (You can get at your friends updates by jumping through some
 hoops, but it seems we'd want to mirror a single account's own update feed?)

---
 plugins/SubMirror/lib/addmirrorwizard.php | 28 +++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/plugins/SubMirror/lib/addmirrorwizard.php b/plugins/SubMirror/lib/addmirrorwizard.php
index 7a63f8366b..920db0bc9c 100644
--- a/plugins/SubMirror/lib/addmirrorwizard.php
+++ b/plugins/SubMirror/lib/addmirrorwizard.php
@@ -60,22 +60,50 @@ class AddMirrorWizard extends Widget
     function providers()
     {
         return array(
+            /*
+            // We could accept hostname & username combos here, or
+            // webfingery combinations as for remote users.
             array(
                 'id' => 'statusnet',
                 'name' => _m('StatusNet'),
             ),
+             */
+            // Accepts a Twitter username and pulls their user timeline as a
+            // public Atom feed. Requires a working alternate hub which, one
+            // hopes, is getting timely updates.
             array(
                 'id' => 'twitter',
                 'name' => _m('Twitter'),
             ),
+            /*
+            // WordPress was on our list some whiles ago, but not sure
+            // what we can actually do here. Search on Wordpress.com hosted
+            // sites, or ?
             array(
                 'id' => 'wordpress',
                 'name' => _m('WordPress'),
             ),
+             */
+            /*
+            // In theory, Facebook lets you pull public updates over RSS,
+            // but the URLs for your own update feed that I can find from
+            // 2009-era websites no longer seem to work and there's no
+            // good current documentation. May not still be available...
+            // Mirroring from an FB account is probably better done with
+            // the dedicated plugin. (As of March 2011)
+            array(
+                'id' => 'facebook',
+                'name' => _m('Facebook'),
+            ),
+             */
+            /*
+            // LinkedIn doesn't currently seem to have public feeds
+            // for users or groups (March 2011)
             array(
                 'id' => 'linkedin',
                 'name' => _m('LinkedIn'),
             ),
+             */
             array(
                 'id' => 'feed',
                 'name' => _m('RSS or Atom feed'),

From 903ce7d10cff41b91f6fb83adc3f32bfdfc62acd Mon Sep 17 00:00:00 2001
From: Samantha Doherty <sammy@status.net>
Date: Tue, 15 Mar 2011 21:43:28 -0400
Subject: [PATCH 585/655] Hide all unnecessarylabels from profile edit view.

---
 plugins/ExtendedProfile/css/profiledetail.css | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/plugins/ExtendedProfile/css/profiledetail.css b/plugins/ExtendedProfile/css/profiledetail.css
index 797d32d415..e0650d40a1 100644
--- a/plugins/ExtendedProfile/css/profiledetail.css
+++ b/plugins/ExtendedProfile/css/profiledetail.css
@@ -65,6 +65,10 @@
     margin-right: 8px;
 }
 
+.form_settings .extended-profile label {
+    display: none;
+}
+
 .experience-item input[type=text], .education-item input[type=text] {
     float: left;
 }
@@ -84,13 +88,10 @@
 .form_settings .extended-profile label.checkbox {
     max-width: 100%;
     float: none;
+    display: inline;
     left: -20px;
 }
 
-.phone-item label, .im-item label {
-    display: none;
-}
-
 .extended-profile select {
     padding-right: 2px;
     font-size: 0.88em;

From 95d03e74e940ef8f50e26d8e7a3a4b68509dd9c2 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Tue, 15 Mar 2011 18:45:08 -0700
Subject: [PATCH 586/655] Extended profile - autocomplete for manager

---
 .../ExtendedProfile/ExtendedProfilePlugin.php |  22 +++-
 .../action/userautocomplete.php               | 113 ++++++++++++++++++
 .../ExtendedProfile/extendedprofilewidget.php |   6 +
 plugins/ExtendedProfile/js/profiledetail.js   |   5 +
 .../profiledetailsettingsaction.php           |   4 +-
 5 files changed, 144 insertions(+), 6 deletions(-)
 create mode 100644 plugins/ExtendedProfile/action/userautocomplete.php

diff --git a/plugins/ExtendedProfile/ExtendedProfilePlugin.php b/plugins/ExtendedProfile/ExtendedProfilePlugin.php
index 933b43cad7..d1572ce9fd 100644
--- a/plugins/ExtendedProfile/ExtendedProfilePlugin.php
+++ b/plugins/ExtendedProfile/ExtendedProfilePlugin.php
@@ -54,6 +54,7 @@ class ExtendedProfilePlugin extends Plugin
     function onAutoload($cls)
     {
         $lower = strtolower($cls);
+
         switch ($lower)
         {
         case 'extendedprofile':
@@ -62,6 +63,9 @@ class ExtendedProfilePlugin extends Plugin
         case 'profiledetailsettingsaction':
             require_once dirname(__FILE__) . '/' . $lower . '.php';
             return false;
+        case 'userautocompleteaction':
+            require_once dirname(__FILE__) . '/action/' . mb_substr($lower, 0, -6) . '.php';
+            return false;
         case 'profile_detail':
             require_once dirname(__FILE__) . '/' . ucfirst($lower) . '.php';
             return false;
@@ -81,11 +85,19 @@ class ExtendedProfilePlugin extends Plugin
      */
     function onStartInitializeRouter($m)
     {
-        $m->connect(':nickname/detail',
-                array('action' => 'profiledetail'),
-                array('nickname' => Nickname::DISPLAY_FMT));
-        $m->connect('settings/profile/detail',
-                array('action' => 'profiledetailsettings'));
+        $m->connect(
+            ':nickname/detail',
+            array('action' => 'profiledetail'),
+            array('nickname' => Nickname::DISPLAY_FMT)
+        );
+        $m->connect(
+            '/settings/profile/finduser',
+            array('action' => 'Userautocomplete')
+        );
+        $m->connect(
+            'settings/profile/detail',
+            array('action' => 'profiledetailsettings')
+        );
 
         return true;
     }
diff --git a/plugins/ExtendedProfile/action/userautocomplete.php b/plugins/ExtendedProfile/action/userautocomplete.php
new file mode 100644
index 0000000000..d4857429e0
--- /dev/null
+++ b/plugins/ExtendedProfile/action/userautocomplete.php
@@ -0,0 +1,113 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Action for showing Twitter-like JSON search results
+ *
+ * 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  Search
+ * @package   StatusNet
+ * @author    Zach Copley <zach@status.net>
+ * @copyright 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/
+ */
+
+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
+
+class UserautocompleteAction extends Action
+{
+    var $query;
+
+    /**
+     * Initialization.
+     *
+     * @param array $args Web and URL arguments
+     *
+     * @return boolean true if nothing goes wrong
+     */
+    function prepare($args)
+    {
+        parent::prepare($args);
+        $this->query = $this->trimmed('term');
+        return true;
+    }
+
+    /**
+     * Handle a request
+     *
+     * @param array $args Arguments from $_REQUEST
+     *
+     * @return void
+     */
+    function handle($args)
+    {
+        parent::handle($args);
+        $this->showResults();
+    }
+
+    /**
+     * Search for users matching the query and spit the results out
+     * as a quick-n-dirty JSON document
+     *
+     * @return void
+     */
+    function showResults()
+    {
+        $people = array();
+
+        $profile = new Profile();
+
+        $search_engine = $profile->getSearchEngine('profile');
+        $search_engine->set_sort_mode('nickname_desc');
+        $search_engine->limit(0, 10);
+        $search_engine->query(strtolower($this->query . '*'));
+
+        $cnt = $profile->find();
+
+        if ($cnt > 0) {
+
+            $sql = 'SELECT profile.* FROM profile, user WHERE profile.id = user.id '
+                . ' AND LEFT(LOWER(profile.nickname), '
+                . strlen($this->query)
+                . ') = \'%s\' '
+                . ' LIMIT 0, 10';
+
+            $profile->query(sprintf($sql, $this->query));
+        }
+        
+        while ($profile->fetch()) {
+             $people[] = $profile->nickname;
+        }
+
+        header('Content-Type: application/json; charset=utf-8');
+        print json_encode($people);
+    }
+
+    /**
+     * Do we need to write to the database?
+     *
+     * @return boolean true
+     */
+    function isReadOnly($args)
+    {
+        return true;
+    }
+}
diff --git a/plugins/ExtendedProfile/extendedprofilewidget.php b/plugins/ExtendedProfile/extendedprofilewidget.php
index fc3d7ca51d..dec0512be4 100644
--- a/plugins/ExtendedProfile/extendedprofilewidget.php
+++ b/plugins/ExtendedProfile/extendedprofilewidget.php
@@ -466,6 +466,9 @@ class ExtendedProfileWidget extends Form
         case 'date':
             $this->out->text($this->ext->getTextValue($name));
             break;
+        case 'person':
+            $this->out->text($this->ext->getTextValue($name));
+            break;
         case 'tags':
             $this->out->text($this->ext->getTags());
             break;
@@ -512,6 +515,9 @@ class ExtendedProfileWidget extends Form
         case 'date':
             $out->input($id, null, $this->ext->getTextValue($name));
             break;
+        case 'person':
+            $out->input($id, null, $this->ext->getTextValue($name));
+            break;
         case 'textarea':
             $out->textarea($id, null,  $this->ext->getTextValue($name));
             break;
diff --git a/plugins/ExtendedProfile/js/profiledetail.js b/plugins/ExtendedProfile/js/profiledetail.js
index 2821bed275..7510323a43 100644
--- a/plugins/ExtendedProfile/js/profiledetail.js
+++ b/plugins/ExtendedProfile/js/profiledetail.js
@@ -89,6 +89,11 @@ var init = function() {
     reorder('experience-item');
     reorder('education-item');
     reorder('im-item');
+
+    $("input#extprofile-manager").autocomplete({
+        source: 'finduser',
+        minLength: 2 });
+
 }
 
 $(document).ready(
diff --git a/plugins/ExtendedProfile/profiledetailsettingsaction.php b/plugins/ExtendedProfile/profiledetailsettingsaction.php
index d3b653bad2..b0590f7316 100644
--- a/plugins/ExtendedProfile/profiledetailsettingsaction.php
+++ b/plugins/ExtendedProfile/profiledetailsettingsaction.php
@@ -44,12 +44,14 @@ class ProfileDetailSettingsAction extends ProfileSettingsAction
     function showStylesheets() {
         parent::showStylesheets();
         $this->cssLink('plugins/ExtendedProfile/css/profiledetail.css');
+        $this->cssLink('http://ajax.googleapis.com/ajax/libs/jqueryui/1.8/themes/base/jquery-ui.css');
         return true;
     }
 
     function  showScripts() {
         parent::showScripts();
         $this->script('plugins/ExtendedProfile/js/profiledetail.js');
+        $this->script('http://ajax.googleapis.com/ajax/libs/jqueryui/1.8/jquery-ui.min.js');
         return true;
     }
 
@@ -99,7 +101,7 @@ class ProfileDetailSettingsAction extends ProfileSettingsAction
 
             $profile = $user->getProfile();
 
-            $simpleFieldNames = array('title', 'spouse', 'kids');
+            $simpleFieldNames = array('title', 'spouse', 'kids', 'manager');
             $dateFieldNames   = array('birthday');
 
             foreach ($simpleFieldNames as $name) {

From b11a2faf5412a73690535df66034a06467e4208e Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Tue, 15 Mar 2011 19:33:05 -0700
Subject: [PATCH 587/655] Extended profile - namespace JavaScript functions

---
 plugins/ExtendedProfile/js/profiledetail.js | 55 ++++++++++-----------
 1 file changed, 27 insertions(+), 28 deletions(-)

diff --git a/plugins/ExtendedProfile/js/profiledetail.js b/plugins/ExtendedProfile/js/profiledetail.js
index 7510323a43..98594a46b7 100644
--- a/plugins/ExtendedProfile/js/profiledetail.js
+++ b/plugins/ExtendedProfile/js/profiledetail.js
@@ -1,4 +1,6 @@
-var reorder = function(class) {
+var SN_EXTENDED = SN_EXTENDED || {};
+
+SN_EXTENDED.reorder = function(class) {
     console.log("QQQ Enter reorder");
 
     var divs = $.find('div[class=' + class + ']');
@@ -9,7 +11,7 @@ var reorder = function(class) {
     $(divs).each(function(i, div) {
         console.log("ROW " + i);
         $(div).find('a.remove_row').show();
-        replaceIndex(rowIndex(div), i);
+        SN_EXTENDED.replaceIndex(SN_EXTENDED.rowIndex(div), i);
     });
 
     $this = $(divs).last().closest('tr');
@@ -23,19 +25,19 @@ var reorder = function(class) {
 
 };
 
-var rowIndex = function(div) {
+SN_EXTENDED.rowIndex = function(div) {
     var idstr = $(div).attr('id');
     var id = idstr.match(/\d+/);
     console.log("id = " + id);
     return id;
 };
 
-var rowCount = function(class) {
+SN_EXTENDED.rowCount = function(class) {
     var divs = $.find('div[class=' + class + ']');
     return divs.length;
 };
 
-var replaceIndex = function(elem, oldIndex, newIndex) {
+SN_EXTENDED.replaceIndex = function(elem, oldIndex, newIndex) {
     $(elem).find('*').each(function() {
         $.each(this.attributes, function(i, attrib) {
             var regexp = /extprofile-.*-\d.*/;
@@ -49,12 +51,12 @@ var replaceIndex = function(elem, oldIndex, newIndex) {
     });
 }
 
-var resetRow = function(elem) {
+SN_EXTENDED.resetRow = function(elem) {
     $(elem).find('input').attr('value', '');
     $(elem).find("select option[value='office']").attr("selected", true);
 }
 
-var addRow = function() {
+SN_EXTENDED.addRow = function() {
     var div = $(this).closest('div');
     var id = $(div).attr('id');
     var class = $(div).attr('class');
@@ -64,44 +66,41 @@ var addRow = function() {
     var tr = $(trold).removeClass('supersizeme');
     var newtr = $(tr).clone();
     var newIndex = parseInt(index) + 1;
-    replaceIndex(newtr, index, newIndex);
-    resetRow(newtr);
+    SN_EXTENDED.replaceIndex(newtr, index, newIndex);
+    SN_EXTENDED.resetRow(newtr);
     $(tr).after(newtr);
-    reorder(class);
+    SN_EXTENDED.reorder(class);
 };
 
-var removeRow = function() {
+SN_EXTENDED.removeRow = function() {
     var div = $(this).closest('div');
     var id = $(div).attr('id');
     var class = $(div).attr('class');
 
-    cnt = rowCount(class);
+    cnt = SN_EXTENDED.rowCount(class);
     console.debug("removeRow - cnt = " + cnt);
     if (cnt > 1) {
         var target = $(this).closest('tr');
         target.remove();
-        reorder(class);
+        SN_EXTENDED.reorder(class);
     }
 };
 
-var init = function() {
-    reorder('phone-item');
-    reorder('experience-item');
-    reorder('education-item');
-    reorder('im-item');
+$(document).ready(
+
+function() {
+
+    var multifields = ["phone-item", "experience-item", "education-item", "im-item"];
+
+    for (f in multifields) {
+        SN_EXTENDED.reorder(multifields[f]);
+    }
 
     $("input#extprofile-manager").autocomplete({
         source: 'finduser',
         minLength: 2 });
 
-}
+    $('.add_row').live('click', SN_EXTENDED.addRow);
+    $('.remove_row').live('click', SN_EXTENDED.removeRow);
 
-$(document).ready(
-
-function() {
-    init();
-    $('.add_row').live('click', addRow);
-    $('.remove_row').live('click', removeRow);
-}
-
-);
+});

From bde85a668551251493ab5343d3a8a02db29bb87e Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Tue, 15 Mar 2011 21:23:34 -0700
Subject: [PATCH 588/655] Extended profile - fix issue with JavaScript not
 executing in Firefox

---
 .../ExtendedProfile/extendedprofilewidget.php |  4 +-
 plugins/ExtendedProfile/js/profiledetail.js   | 49 ++++++++-----------
 2 files changed, 22 insertions(+), 31 deletions(-)

diff --git a/plugins/ExtendedProfile/extendedprofilewidget.php b/plugins/ExtendedProfile/extendedprofilewidget.php
index dec0512be4..5a9eb7e4f9 100644
--- a/plugins/ExtendedProfile/extendedprofilewidget.php
+++ b/plugins/ExtendedProfile/extendedprofilewidget.php
@@ -430,7 +430,7 @@ class ExtendedProfileWidget extends Form
             array(
                 'class' => 'remove_row',
                 'href' => 'javascript://',
-                'style' => 'display: none; '
+                'style' => 'display: none;'
             ),
             '-'
         );
@@ -440,7 +440,7 @@ class ExtendedProfileWidget extends Form
             array(
                 'class' => 'add_row',
                 'href' => 'javascript://',
-                'style' => 'display: none; '
+                'style' => 'display: none;'
             ),
             '+'
         );
diff --git a/plugins/ExtendedProfile/js/profiledetail.js b/plugins/ExtendedProfile/js/profiledetail.js
index 98594a46b7..9fb935f153 100644
--- a/plugins/ExtendedProfile/js/profiledetail.js
+++ b/plugins/ExtendedProfile/js/profiledetail.js
@@ -1,39 +1,32 @@
 var SN_EXTENDED = SN_EXTENDED || {};
 
-SN_EXTENDED.reorder = function(class) {
-    console.log("QQQ Enter reorder");
+SN_EXTENDED.reorder = function(cls) {
 
-    var divs = $.find('div[class=' + class + ']');
-    console.log('divs length = ' + divs.length);
-
-    $(divs).find('a').hide();
+    var divs = $('div[class=' + cls + ']');
 
     $(divs).each(function(i, div) {
-        console.log("ROW " + i);
         $(div).find('a.remove_row').show();
         SN_EXTENDED.replaceIndex(SN_EXTENDED.rowIndex(div), i);
     });
 
-    $this = $(divs).last().closest('tr');
-    $this.addClass('supersizeme');
+    var lastDiv = $(divs).last().closest('tr');
+    lastDiv.addClass('supersizeme');
 
     $(divs).last().find('a.add_row').show();
 
     if (divs.length == 1) {
         $(divs).find('a.remove_row').hide();
     }
-
 };
 
 SN_EXTENDED.rowIndex = function(div) {
     var idstr = $(div).attr('id');
     var id = idstr.match(/\d+/);
-    console.log("id = " + id);
     return id;
 };
 
-SN_EXTENDED.rowCount = function(class) {
-    var divs = $.find('div[class=' + class + ']');
+SN_EXTENDED.rowCount = function(cls) {
+    var divs = $.find('div[class=' + cls + ']');
     return divs.length;
 };
 
@@ -45,7 +38,6 @@ SN_EXTENDED.replaceIndex = function(elem, oldIndex, newIndex) {
             var match = value.match(regexp);
             if (match !== null) {
                 attrib.value = value.replace("-" + oldIndex, "-" + newIndex);
-                console.log('match: oldIndex = ' + oldIndex + ' newIndex = ' + newIndex + ' name = ' + attrib.name + ' value = ' + attrib.value);
             }
         });
     });
@@ -54,41 +46,40 @@ SN_EXTENDED.replaceIndex = function(elem, oldIndex, newIndex) {
 SN_EXTENDED.resetRow = function(elem) {
     $(elem).find('input').attr('value', '');
     $(elem).find("select option[value='office']").attr("selected", true);
-}
+};
 
 SN_EXTENDED.addRow = function() {
     var div = $(this).closest('div');
-    var id = $(div).attr('id');
-    var class = $(div).attr('class');
+    var id = div.attr('id');
+    var cls = div.attr('class');
     var index = id.match(/\d+/);
-    console.log("Current row = " + index + ', class = ' + class);
-    var trold = $(this).closest('tr');
-    var tr = $(trold).removeClass('supersizeme');
-    var newtr = $(tr).clone();
     var newIndex = parseInt(index) + 1;
+    var newtr = $(div).closest('tr').clone();
     SN_EXTENDED.replaceIndex(newtr, index, newIndex);
+    $(newtr).removeClass('supersizeme');
     SN_EXTENDED.resetRow(newtr);
-    $(tr).after(newtr);
-    SN_EXTENDED.reorder(class);
+    $(div).closest('tr').after(newtr);
+    SN_EXTENDED.reorder(cls);
 };
 
 SN_EXTENDED.removeRow = function() {
     var div = $(this).closest('div');
     var id = $(div).attr('id');
-    var class = $(div).attr('class');
+    var cls = $(div).attr('class');
 
-    cnt = SN_EXTENDED.rowCount(class);
-    console.debug("removeRow - cnt = " + cnt);
+    var cnt = SN_EXTENDED.rowCount(cls);
     if (cnt > 1) {
         var target = $(this).closest('tr');
         target.remove();
-        SN_EXTENDED.reorder(class);
+        SN_EXTENDED.reorder(cls);
     }
 };
 
-$(document).ready(
+$(document).ready(function() {
 
-function() {
+    $("input#extprofile-manager").autocomplete({
+        source: 'finduser',
+        minLength: 2 });
 
     var multifields = ["phone-item", "experience-item", "education-item", "im-item"];
 

From 40e1fc82466cf370d05ff7e380e3a99964a851c2 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Tue, 15 Mar 2011 21:55:47 -0700
Subject: [PATCH 589/655] Extended profile - prettier date formatting

---
 .../ExtendedProfile/extendedprofilewidget.php | 50 +++++++++++++++----
 1 file changed, 40 insertions(+), 10 deletions(-)

diff --git a/plugins/ExtendedProfile/extendedprofilewidget.php b/plugins/ExtendedProfile/extendedprofilewidget.php
index 5a9eb7e4f9..ebf4c0422c 100644
--- a/plugins/ExtendedProfile/extendedprofilewidget.php
+++ b/plugins/ExtendedProfile/extendedprofilewidget.php
@@ -295,10 +295,22 @@ class ExtendedProfileWidget extends Form
         $this->out->elementStart('div', 'experience-item');
         $this->out->element('div', 'label', _m('Company'));
         $this->out->element('div', 'field', $field['company']);
+
         $this->out->element('div', 'label', _m('Start'));
-        $this->out->element('div', array('class' => 'field date'), $field['start']);
+        $this->out->element(
+            'div',
+            array('class' => 'field date'),
+            date('j M Y', strtotime($field['start'])
+            )
+        );
         $this->out->element('div', 'label', _m('End'));
-        $this->out->element('div', array('class' => 'field date'), $field['end']);
+        $this->out->element(
+            'div',
+            array('class' => 'field date'),
+            date('j M Y', strtotime($field['end'])
+            )
+        );
+
         if ($field['current']) {
             $this->out->element(
                 'div',
@@ -331,14 +343,14 @@ class ExtendedProfileWidget extends Form
         $this->out->input(
             $id . '-start',
             null,
-            isset($field['start']) ? $field['start'] : null
+            isset($field['start']) ? date('j M Y', strtotime($field['start'])) : null
         );
 
         $this->out->element('div', 'label', _m('End'));
         $this->out->input(
             $id . '-end',
             null,
-            isset($field['end']) ? $field['end'] : null
+            isset($field['end']) ? date('j M Y', strtotime($field['end'])) : null
         );
         $this->out->hidden(
             $id . '-current',
@@ -366,9 +378,19 @@ class ExtendedProfileWidget extends Form
         $this->out->element('div', 'label', _m('Description'));
         $this->out->element('div', 'field', $field['description']);
         $this->out->element('div', 'label', _m('Start'));
-        $this->out->element('div', array('class' => 'field date'), $field['start']);
+        $this->out->element(
+            'div',
+            array('class' => 'field date'),
+            date('j M Y', strtotime($field['start'])
+            )
+        );
         $this->out->element('div', 'label', _m('End'));
-        $this->out->element('div', array('class' => 'field date'), $field['end']);
+        $this->out->element(
+            'div',
+            array('class' => 'field date'),
+            date('j M Y', strtotime($field['end'])
+            )
+        );
         $this->out->elementEnd('div');
     }
 
@@ -409,14 +431,14 @@ class ExtendedProfileWidget extends Form
         $this->out->input(
             $id . '-start',
             null,
-            isset($field['start']) ? $field['start'] : null
+            isset($field['start']) ? date('j M Y', strtotime($field['start'])) : null
         );
 
         $this->out->element('div', 'label', _m('End'));
         $this->out->input(
             $id . '-end',
             null,
-            isset($field['end']) ? $field['end'] : null
+            isset($field['end']) ? date('j M Y', strtotime($field['end'])) : null
         );
 
         $this->showMultiControls();
@@ -464,7 +486,11 @@ class ExtendedProfileWidget extends Form
             $this->out->text($this->ext->getTextValue($name));
             break;
         case 'date':
-            $this->out->text($this->ext->getTextValue($name));
+            $this->out->element(
+                'div',
+                array('class' => 'field date'),
+                date('j M Y', strtotime($this->ext->getTextValue($name)))
+            );
             break;
         case 'person':
             $this->out->text($this->ext->getTextValue($name));
@@ -513,7 +539,11 @@ class ExtendedProfileWidget extends Form
             $out->input($id, null, $this->ext->getTextValue($name));
             break;
         case 'date':
-            $out->input($id, null, $this->ext->getTextValue($name));
+            $out->input(
+                $id,
+                null,
+                date('j M Y', strtotime($this->ext->getTextValue($name)))
+            );
             break;
         case 'person':
             $out->input($id, null, $this->ext->getTextValue($name));

From b9065d7bc19e55309204e8beb485b9cad496f0da Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Tue, 15 Mar 2011 23:02:05 -0700
Subject: [PATCH 590/655] Extended profile - add fancy datepicker widgets

---
 plugins/ExtendedProfile/js/profiledetail.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/plugins/ExtendedProfile/js/profiledetail.js b/plugins/ExtendedProfile/js/profiledetail.js
index 9fb935f153..d24b4aabe8 100644
--- a/plugins/ExtendedProfile/js/profiledetail.js
+++ b/plugins/ExtendedProfile/js/profiledetail.js
@@ -81,6 +81,10 @@ $(document).ready(function() {
         source: 'finduser',
         minLength: 2 });
 
+    $.datepicker.formatDate('yy-mm-dd');
+
+	$("input[name$=-start], input[name$=-end], #extprofile-birthday").datepicker({ dateFormat: 'd M yy' });
+
     var multifields = ["phone-item", "experience-item", "education-item", "im-item"];
 
     for (f in multifields) {

From bda9d43c56c2282583bd3a870219a4bb7a128800 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Tue, 15 Mar 2011 23:51:28 -0700
Subject: [PATCH 591/655] Extended profile - add fancy JQuery UI confirm dialog
 when deleting items

---
 .../ExtendedProfile/extendedprofilewidget.php |  7 ++++
 plugins/ExtendedProfile/js/profiledetail.js   | 36 ++++++++++++++-----
 2 files changed, 35 insertions(+), 8 deletions(-)

diff --git a/plugins/ExtendedProfile/extendedprofilewidget.php b/plugins/ExtendedProfile/extendedprofilewidget.php
index ebf4c0422c..5be149a0cb 100644
--- a/plugins/ExtendedProfile/extendedprofilewidget.php
+++ b/plugins/ExtendedProfile/extendedprofilewidget.php
@@ -77,6 +77,13 @@ class ExtendedProfileWidget extends Form
      */
     public function formData()
     {
+        // For JQuery UI modal dialog
+        $this->out->elementStart(
+            'div', 
+            array('id' => 'confirm-dialog', 'title' => 'Confirmation Required')
+        );
+        $this->out->text('Really delete this entry?');
+        $this->out->elementEnd('div');
         $this->showSections();
     }
 
diff --git a/plugins/ExtendedProfile/js/profiledetail.js b/plugins/ExtendedProfile/js/profiledetail.js
index d24b4aabe8..fbcefe730d 100644
--- a/plugins/ExtendedProfile/js/profiledetail.js
+++ b/plugins/ExtendedProfile/js/profiledetail.js
@@ -44,7 +44,7 @@ SN_EXTENDED.replaceIndex = function(elem, oldIndex, newIndex) {
 }
 
 SN_EXTENDED.resetRow = function(elem) {
-    $(elem).find('input').attr('value', '');
+    $(elem).find('input, textarea').attr('value', '');
     $(elem).find("select option[value='office']").attr("selected", true);
 };
 
@@ -63,27 +63,47 @@ SN_EXTENDED.addRow = function() {
 };
 
 SN_EXTENDED.removeRow = function() {
+
     var div = $(this).closest('div');
     var id = $(div).attr('id');
     var cls = $(div).attr('class');
-
     var cnt = SN_EXTENDED.rowCount(cls);
+
+    var that = this;
+
+    $("#confirm-dialog").dialog({
+        buttons : {
+            "Confirm" : function() {
+                var target = $(that).closest('tr');
+                target.fadeOut("slow", function() {
+                    $(that).remove();
+                });
+                SN_EXTENDED.reorder(cls);
+                $(this).dialog("close");
+            },
+            "Cancel" : function() {
+                $(this).dialog("close");
+            }
+        }
+    });
+
     if (cnt > 1) {
-        var target = $(this).closest('tr');
-        target.remove();
-        SN_EXTENDED.reorder(cls);
+        $("#confirm-dialog").dialog("open");
     }
 };
 
 $(document).ready(function() {
 
+    $("#confirm-dialog").dialog({
+        autoOpen: false,
+        modal: true
+    });
+
     $("input#extprofile-manager").autocomplete({
         source: 'finduser',
         minLength: 2 });
 
-    $.datepicker.formatDate('yy-mm-dd');
-
-	$("input[name$=-start], input[name$=-end], #extprofile-birthday").datepicker({ dateFormat: 'd M yy' });
+    $("input[name$=-start], input[name$=-end], #extprofile-birthday").datepicker({ dateFormat: 'd M yy' });
 
     var multifields = ["phone-item", "experience-item", "education-item", "im-item"];
 

From d51625ab3ddc26a8819c3eb0e1682b4767ca057f Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Tue, 15 Mar 2011 23:58:45 -0700
Subject: [PATCH 592/655] Extended profile - hide add button when not needed
 (regression)

---
 plugins/ExtendedProfile/js/profiledetail.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/ExtendedProfile/js/profiledetail.js b/plugins/ExtendedProfile/js/profiledetail.js
index fbcefe730d..7960cee83f 100644
--- a/plugins/ExtendedProfile/js/profiledetail.js
+++ b/plugins/ExtendedProfile/js/profiledetail.js
@@ -5,6 +5,7 @@ SN_EXTENDED.reorder = function(cls) {
     var divs = $('div[class=' + cls + ']');
 
     $(divs).each(function(i, div) {
+        $(div).find('a.add_row').hide();
         $(div).find('a.remove_row').show();
         SN_EXTENDED.replaceIndex(SN_EXTENDED.rowIndex(div), i);
     });

From 665dd1de78785e6a9176c5533f5a29bbc33166d5 Mon Sep 17 00:00:00 2001
From: Samantha Doherty <sammy@status.net>
Date: Wed, 16 Mar 2011 03:09:06 -0400
Subject: [PATCH 593/655] Remove supersizeme class as appropriate.

---
 plugins/ExtendedProfile/js/profiledetail.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/plugins/ExtendedProfile/js/profiledetail.js b/plugins/ExtendedProfile/js/profiledetail.js
index 7960cee83f..24191d4ad9 100644
--- a/plugins/ExtendedProfile/js/profiledetail.js
+++ b/plugins/ExtendedProfile/js/profiledetail.js
@@ -55,9 +55,8 @@ SN_EXTENDED.addRow = function() {
     var cls = div.attr('class');
     var index = id.match(/\d+/);
     var newIndex = parseInt(index) + 1;
-    var newtr = $(div).closest('tr').clone();
+    var newtr = $(div).closest('tr').removeClass('supersizeme').clone();
     SN_EXTENDED.replaceIndex(newtr, index, newIndex);
-    $(newtr).removeClass('supersizeme');
     SN_EXTENDED.resetRow(newtr);
     $(div).closest('tr').after(newtr);
     SN_EXTENDED.reorder(cls);

From a715b133ffcda328f4dbc67e9490ccedfe4c0f77 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Wed, 16 Mar 2011 00:23:34 -0700
Subject: [PATCH 594/655] Extended profile - fix regression whereby if there
 was only one item, you could still delete it!

---
 plugins/ExtendedProfile/js/profiledetail.js            | 10 +++++-----
 .../ExtendedProfile/profiledetailsettingsaction.php    |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/plugins/ExtendedProfile/js/profiledetail.js b/plugins/ExtendedProfile/js/profiledetail.js
index 7960cee83f..f475046385 100644
--- a/plugins/ExtendedProfile/js/profiledetail.js
+++ b/plugins/ExtendedProfile/js/profiledetail.js
@@ -68,19 +68,17 @@ SN_EXTENDED.removeRow = function() {
     var div = $(this).closest('div');
     var id = $(div).attr('id');
     var cls = $(div).attr('class');
-    var cnt = SN_EXTENDED.rowCount(cls);
-
     var that = this;
 
     $("#confirm-dialog").dialog({
         buttons : {
             "Confirm" : function() {
+                $(this).dialog("close");
                 var target = $(that).closest('tr');
                 target.fadeOut("slow", function() {
-                    $(that).remove();
+                    $(target).remove();
+                    SN_EXTENDED.reorder(cls);
                 });
-                SN_EXTENDED.reorder(cls);
-                $(this).dialog("close");
             },
             "Cancel" : function() {
                 $(this).dialog("close");
@@ -88,6 +86,8 @@ SN_EXTENDED.removeRow = function() {
         }
     });
 
+    var cnt = SN_EXTENDED.rowCount(cls);
+
     if (cnt > 1) {
         $("#confirm-dialog").dialog("open");
     }
diff --git a/plugins/ExtendedProfile/profiledetailsettingsaction.php b/plugins/ExtendedProfile/profiledetailsettingsaction.php
index b0590f7316..01a8fa9c7b 100644
--- a/plugins/ExtendedProfile/profiledetailsettingsaction.php
+++ b/plugins/ExtendedProfile/profiledetailsettingsaction.php
@@ -60,7 +60,7 @@ class ProfileDetailSettingsAction extends ProfileSettingsAction
         // CSRF protection
         $token = $this->trimmed('token');
         if (!$token || $token != common_session_token()) {
-            $this->show_form(
+            $this->showForm(
                 _m(
                     'There was a problem with your session token. '
                     .   'Try again, please.'

From b80b9f31fc3c2941c38d1977a554ff777c7e3399 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Wed, 16 Mar 2011 00:25:02 -0700
Subject: [PATCH 595/655] Small smattering of pixie dust

---
 plugins/ExtendedProfile/js/profiledetail.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/ExtendedProfile/js/profiledetail.js b/plugins/ExtendedProfile/js/profiledetail.js
index ecc89f8151..c96732b835 100644
--- a/plugins/ExtendedProfile/js/profiledetail.js
+++ b/plugins/ExtendedProfile/js/profiledetail.js
@@ -16,7 +16,7 @@ SN_EXTENDED.reorder = function(cls) {
     $(divs).last().find('a.add_row').show();
 
     if (divs.length == 1) {
-        $(divs).find('a.remove_row').hide();
+        $(divs).find('a.remove_row').fadeOut("slow");
     }
 };
 

From 724dba668af45690a9122f49e24d89f8c3e6ede7 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Wed, 16 Mar 2011 00:34:00 -0700
Subject: [PATCH 596/655] Extended profile - allow adding more than one website

---
 plugins/ExtendedProfile/extendedprofilewidget.php | 2 +-
 plugins/ExtendedProfile/js/profiledetail.js       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/ExtendedProfile/extendedprofilewidget.php b/plugins/ExtendedProfile/extendedprofilewidget.php
index 5be149a0cb..25a0ab8b20 100644
--- a/plugins/ExtendedProfile/extendedprofilewidget.php
+++ b/plugins/ExtendedProfile/extendedprofilewidget.php
@@ -267,7 +267,7 @@ class ExtendedProfileWidget extends Form
         $this->out->elementStart(
             'div', array(
                 'id' => $id . '-edit',
-                'class' => 'website-edit'
+                'class' => 'website-item'
             )
         );
         $this->out->input(
diff --git a/plugins/ExtendedProfile/js/profiledetail.js b/plugins/ExtendedProfile/js/profiledetail.js
index c96732b835..e1b06562e0 100644
--- a/plugins/ExtendedProfile/js/profiledetail.js
+++ b/plugins/ExtendedProfile/js/profiledetail.js
@@ -105,7 +105,7 @@ $(document).ready(function() {
 
     $("input[name$=-start], input[name$=-end], #extprofile-birthday").datepicker({ dateFormat: 'd M yy' });
 
-    var multifields = ["phone-item", "experience-item", "education-item", "im-item"];
+    var multifields = ["phone-item", "experience-item", "education-item", "im-item", 'website-item'];
 
     for (f in multifields) {
         SN_EXTENDED.reorder(multifields[f]);

From 974d0c48f6234a99b0d28f6c54033434cace877c Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Wed, 16 Mar 2011 00:50:43 -0700
Subject: [PATCH 597/655] Extended profile - don't check end date if experience
 entry has current checked

---
 plugins/ExtendedProfile/profiledetailsettingsaction.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/ExtendedProfile/profiledetailsettingsaction.php b/plugins/ExtendedProfile/profiledetailsettingsaction.php
index 01a8fa9c7b..13bf43b927 100644
--- a/plugins/ExtendedProfile/profiledetailsettingsaction.php
+++ b/plugins/ExtendedProfile/profiledetailsettingsaction.php
@@ -288,7 +288,7 @@ class ProfileDetailSettingsAction extends ProfileSettingsAction
                 $expArray[] = array(
                     'company' => $company,
                     'start'   => $this->parseDate('Start', $start, true),
-                    'end'     => $this->parseDate('End', $end, true),
+                    'end'     => ($current == 'false') ? $this->parseDate('End', $end, true) : null,
                     'current' => ($current == 'false') ? false : true
                 );
             }

From bb087a965009fd93a5c02a9e10ab90adcc6b7963 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Wed, 16 Mar 2011 01:09:38 -0700
Subject: [PATCH 598/655] Extended profile - fix some issues saving and
 displaying dates

---
 plugins/ExtendedProfile/extendedprofile.php       |  9 +++++++++
 plugins/ExtendedProfile/extendedprofilewidget.php | 15 +++++++++------
 .../profiledetailsettingsaction.php               |  6 +++++-
 3 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/plugins/ExtendedProfile/extendedprofile.php b/plugins/ExtendedProfile/extendedprofile.php
index 673680f027..fa632e5073 100644
--- a/plugins/ExtendedProfile/extendedprofile.php
+++ b/plugins/ExtendedProfile/extendedprofile.php
@@ -98,6 +98,15 @@ class ExtendedProfile
         }
     }
 
+    function getDateValue($name) {
+        $key = strtolower($name);
+        if (array_key_exists($key, $this->fields)) {
+            return $this->fields[$key][0]->date;
+        } else {
+            return null;
+        }
+    }
+
     // XXX: getPhones, getIms, and getWebsites pretty much do the same thing,
     //      so refactor.
     function getPhones()
diff --git a/plugins/ExtendedProfile/extendedprofilewidget.php b/plugins/ExtendedProfile/extendedprofilewidget.php
index 25a0ab8b20..622beff32f 100644
--- a/plugins/ExtendedProfile/extendedprofilewidget.php
+++ b/plugins/ExtendedProfile/extendedprofilewidget.php
@@ -493,11 +493,14 @@ class ExtendedProfileWidget extends Form
             $this->out->text($this->ext->getTextValue($name));
             break;
         case 'date':
-            $this->out->element(
-                'div',
-                array('class' => 'field date'),
-                date('j M Y', strtotime($this->ext->getTextValue($name)))
-            );
+            $value = $this->ext->getDateValue($name);
+            if (!empty($value)) {
+                $this->out->element(
+                    'div',
+                    array('class' => 'field date'),
+                    date('j M Y', strtotime($value))
+                );
+            }
             break;
         case 'person':
             $this->out->text($this->ext->getTextValue($name));
@@ -549,7 +552,7 @@ class ExtendedProfileWidget extends Form
             $out->input(
                 $id,
                 null,
-                date('j M Y', strtotime($this->ext->getTextValue($name)))
+                date('j M Y', strtotime($this->ext->getDateValue($name)))
             );
             break;
         case 'person':
diff --git a/plugins/ExtendedProfile/profiledetailsettingsaction.php b/plugins/ExtendedProfile/profiledetailsettingsaction.php
index 13bf43b927..719717e088 100644
--- a/plugins/ExtendedProfile/profiledetailsettingsaction.php
+++ b/plugins/ExtendedProfile/profiledetailsettingsaction.php
@@ -113,10 +113,14 @@ class ProfileDetailSettingsAction extends ProfileSettingsAction
 
             foreach ($dateFieldNames as $name) {
                 $value = $this->trimmed('extprofile-' . $name);
+                $dateVal = $this->parseDate($name, $value);
                 $this->saveField(
                     $user,
                     $name,
-                    $this->parseDate($name, $value)
+                    null,
+                    null,
+                    null,
+                    $dateVal
                 );
             }
 

From 17afe068059f426db04c4b2bf85d31bf4e03953a Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Wed, 16 Mar 2011 01:23:47 -0700
Subject: [PATCH 599/655] Extended profile - linkify related URLs added by the
 user

---
 .../ExtendedProfile/extendedprofilewidget.php    | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/plugins/ExtendedProfile/extendedprofilewidget.php b/plugins/ExtendedProfile/extendedprofilewidget.php
index 622beff32f..d4a3f21a52 100644
--- a/plugins/ExtendedProfile/extendedprofilewidget.php
+++ b/plugins/ExtendedProfile/extendedprofilewidget.php
@@ -79,7 +79,7 @@ class ExtendedProfileWidget extends Form
     {
         // For JQuery UI modal dialog
         $this->out->elementStart(
-            'div', 
+            'div',
             array('id' => 'confirm-dialog', 'title' => 'Confirmation Required')
         );
         $this->out->text('Really delete this entry?');
@@ -180,7 +180,19 @@ class ExtendedProfileWidget extends Form
     protected function showWebsite($name, $field)
     {
         $this->out->elementStart('div', array('class' => 'website-display'));
-        $this->out->text($field['value']);
+
+        $url = $field['value'];
+
+        $this->out->element(
+            "a",
+            array(
+                'href'   => $url,
+                'class'  => 'extended-profile-link',
+                'target' => "_blank"
+            ),
+            $url
+        );
+
         if (!empty($field['rel'])) {
             $this->out->text(' (' . $field['rel'] . ')');
         }

From 82023d388a5a060b2b10964bf0cace27fa0a1ae5 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Wed, 16 Mar 2011 01:26:53 -0700
Subject: [PATCH 600/655] Extended profile - don't show empty company entry in
 view

---
 .../ExtendedProfile/extendedprofilewidget.php | 39 ++++++++++---------
 1 file changed, 21 insertions(+), 18 deletions(-)

diff --git a/plugins/ExtendedProfile/extendedprofilewidget.php b/plugins/ExtendedProfile/extendedprofilewidget.php
index d4a3f21a52..fb519cfffc 100644
--- a/plugins/ExtendedProfile/extendedprofilewidget.php
+++ b/plugins/ExtendedProfile/extendedprofilewidget.php
@@ -313,29 +313,32 @@ class ExtendedProfileWidget extends Form
     {
         $this->out->elementStart('div', 'experience-item');
         $this->out->element('div', 'label', _m('Company'));
-        $this->out->element('div', 'field', $field['company']);
 
-        $this->out->element('div', 'label', _m('Start'));
-        $this->out->element(
-            'div',
-            array('class' => 'field date'),
-            date('j M Y', strtotime($field['start'])
-            )
-        );
-        $this->out->element('div', 'label', _m('End'));
-        $this->out->element(
-            'div',
-            array('class' => 'field date'),
-            date('j M Y', strtotime($field['end'])
-            )
-        );
+        if (!empty($field['company'])) {
+            $this->out->element('div', 'field', $field['company']);
 
-        if ($field['current']) {
+            $this->out->element('div', 'label', _m('Start'));
             $this->out->element(
                 'div',
-                array('class' => 'field current'),
-                '(' . _m('Current') . ')'
+                array('class' => 'field date'),
+                date('j M Y', strtotime($field['start'])
+                )
             );
+            $this->out->element('div', 'label', _m('End'));
+            $this->out->element(
+                'div',
+                array('class' => 'field date'),
+                date('j M Y', strtotime($field['end'])
+                )
+            );
+
+            if ($field['current']) {
+                $this->out->element(
+                    'div',
+                    array('class' => 'field current'),
+                    '(' . _m('Current') . ')'
+                );
+            }
         }
         $this->out->elementEnd('div');
     }

From 365b7ab56ea70f6fa70ab46358cd794c7892683b Mon Sep 17 00:00:00 2001
From: Samantha Doherty <sammy@status.net>
Date: Wed, 16 Mar 2011 04:32:33 -0400
Subject: [PATCH 601/655] More style for profile edit.

---
 plugins/ExtendedProfile/css/profiledetail.css | 28 +++++++++++++++++--
 .../ExtendedProfile/extendedprofilewidget.php |  2 +-
 2 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/plugins/ExtendedProfile/css/profiledetail.css b/plugins/ExtendedProfile/css/profiledetail.css
index e0650d40a1..3af9bcba4a 100644
--- a/plugins/ExtendedProfile/css/profiledetail.css
+++ b/plugins/ExtendedProfile/css/profiledetail.css
@@ -69,6 +69,22 @@
     display: none;
 }
 
+.extended-profile textarea {
+    width: 280px;
+}
+
+.extended-profile input[type=text] {
+    width: 280px;
+}
+
+.extended-profile .phone-item input[type=text], .extended-profile .im-item input[type=text], .extended-profile .website-item input[type=text] {
+    width: 175px;
+}
+
+.extended-profile input.hasDatepicker {
+    width: 100px;
+}
+
 .experience-item input[type=text], .education-item input[type=text] {
     float: left;
 }
@@ -101,7 +117,6 @@
     display: block;
     height: 16px;
     width: 16px;
-    line-height: 4em;
     overflow: hidden;
     background-image: url('../../../theme/rebase/images/icons/icons-01.gif');
     background-repeat: no-repeat;
@@ -112,14 +127,18 @@
     float: right;
     position: relative;
     top: 6px;
+    line-height: 4em;
 }
 
 .extended-profile a.add_row {
     clear: both;
     position: relative;
     top: 6px;
-    left: 2px;
+    left: 2px; 
     background-position: 0px -1186px;
+    width: 120px;
+    padding-left: 20px;
+    line-height: 1.2em;
 }
 
 #content table.extended-profile .supersizeme th {
@@ -131,6 +150,11 @@
     width: 100%;
 }
 
+#profiledetailsettings .education-item textarea {
+    float: left;
+    margin-bottom: 8px;
+}
+
 #profiledetailsettings tr:last-child .experience-item, #profiledetailsettings tr:last-child .education-item {
     margin-bottom: 0px;
 }
diff --git a/plugins/ExtendedProfile/extendedprofilewidget.php b/plugins/ExtendedProfile/extendedprofilewidget.php
index fb519cfffc..7f62d3eae4 100644
--- a/plugins/ExtendedProfile/extendedprofilewidget.php
+++ b/plugins/ExtendedProfile/extendedprofilewidget.php
@@ -486,7 +486,7 @@ class ExtendedProfileWidget extends Form
                 'href' => 'javascript://',
                 'style' => 'display: none;'
             ),
-            '+'
+            'Add another item'
         );
     }
 

From 368cfd8facac4e69a00b1d6c0e7eb43299e61cf4 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Wed, 16 Mar 2011 02:41:32 -0700
Subject: [PATCH 602/655] * Extended profile - make cloned datefields work
 correctly with calendar popup * Validate URLs

---
 .../ExtendedProfile/extendedprofilewidget.php |  1 +
 plugins/ExtendedProfile/js/profiledetail.js   | 23 +++++++++++++++++++
 .../profiledetailsettingsaction.php           | 15 +++++++++++-
 3 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/plugins/ExtendedProfile/extendedprofilewidget.php b/plugins/ExtendedProfile/extendedprofilewidget.php
index 7f62d3eae4..1ef6440ed6 100644
--- a/plugins/ExtendedProfile/extendedprofilewidget.php
+++ b/plugins/ExtendedProfile/extendedprofilewidget.php
@@ -369,6 +369,7 @@ class ExtendedProfileWidget extends Form
         );
 
         $this->out->element('div', 'label', _m('End'));
+
         $this->out->input(
             $id . '-end',
             null,
diff --git a/plugins/ExtendedProfile/js/profiledetail.js b/plugins/ExtendedProfile/js/profiledetail.js
index e1b06562e0..99a3f78a43 100644
--- a/plugins/ExtendedProfile/js/profiledetail.js
+++ b/plugins/ExtendedProfile/js/profiledetail.js
@@ -46,7 +46,13 @@ SN_EXTENDED.replaceIndex = function(elem, oldIndex, newIndex) {
 
 SN_EXTENDED.resetRow = function(elem) {
     $(elem).find('input, textarea').attr('value', '');
+    $(elem).find('input').removeAttr('disabled');
     $(elem).find("select option[value='office']").attr("selected", true);
+    $(elem).find("input:checkbox").attr('checked', false);
+    $(elem).find("input[name$=-start], input[name$=-end]").each(function() {
+        $(this).removeClass('hasDatepicker');
+        $(this).datepicker({ dateFormat: 'd M yy' });
+    });
 };
 
 SN_EXTENDED.addRow = function() {
@@ -118,4 +124,21 @@ $(document).ready(function() {
     $('.add_row').live('click', SN_EXTENDED.addRow);
     $('.remove_row').live('click', SN_EXTENDED.removeRow);
 
+    $('input:checkbox[name$=current]').each(function() {
+        var input = $(this).parent().siblings('input[id$=-end]');
+        if ($(this).is(':checked')) {
+            $(input).attr('disabled', 'true');
+        }
+    });
+
+    $('input:checkbox[name$=current]').live('click', function()  {
+        var input = $(this).parent().siblings('input[id$=-end]');
+        if ($(this).is(':checked')) {
+            $(input).val('');
+            $(input).attr('disabled', 'true');
+        } else {
+            $(input).removeAttr('disabled');
+        }
+    });
+
 });
diff --git a/plugins/ExtendedProfile/profiledetailsettingsaction.php b/plugins/ExtendedProfile/profiledetailsettingsaction.php
index 719717e088..7b03f247ed 100644
--- a/plugins/ExtendedProfile/profiledetailsettingsaction.php
+++ b/plugins/ExtendedProfile/profiledetailsettingsaction.php
@@ -262,6 +262,14 @@ class ProfileDetailSettingsAction extends ProfileSettingsAction
         $this->removeAll($user, 'website');
         $i = 0;
         foreach($sites as $site) {
+
+            if (!Validate::uri(
+                $site['value'],
+                array('allowed_schemes' => array('http', 'https')))
+            ) {
+                throw new Exception(sprintf(_m('Invalid URL: %s'), $site['value']));
+            }
+
             if (!empty($site['value'])) {
                 ++$i;
                 $this->saveField(
@@ -287,7 +295,12 @@ class ProfileDetailSettingsAction extends ProfileSettingsAction
         $expArray = array();
 
         foreach ($experiences as $exp) {
-            list($company, $current, $end, $start) = array_values($exp);
+            if (sizeof($experiences) == 4) {
+                list($company, $current, $end, $start) = array_values($exp);
+            } else {
+                $end = null;
+                list($company, $current, $start) = array_values($exp);
+            }
             if (!empty($company)) {
                 $expArray[] = array(
                     'company' => $company,

From afa1aa6c9b129b292b46c94936498196a4785cca Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Wed, 16 Mar 2011 09:53:27 -0400
Subject: [PATCH 603/655] Revert "use jquery-ui for input_forms tabset"

This reverts commit c4bada902296ec8d77c232a0a638b0dd60aa1bd0.
---
 js/util.js                   | 16 ++++++++++++++++
 lib/action.php               |  7 +++----
 theme/rebase/css/display.css | 12 ++++++++++++
 3 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/js/util.js b/js/util.js
index 67e28485e4..cc95a08bf5 100644
--- a/js/util.js
+++ b/js/util.js
@@ -1276,6 +1276,22 @@ var SN = { // StatusNet
 
             return false;
         },
+
+        /**
+         * Switch to another active input sub-form.
+         * This will hide the current form (if any), show the new one, and
+         * update the input type tab selection state.
+         *
+         * @param {String} tag
+         */
+	switchInputFormTab: function(tag) {
+	    // The one that's current isn't current anymore
+	    $('.input_form_nav_tab.current').removeClass('current');
+	    $('#input_form_nav_'+tag).addClass('current');
+
+	    $('.input_form.current').removeClass('current');
+	    $('#input_form_'+tag).addClass('current');
+	}
     },
 
     Init: {
diff --git a/lib/action.php b/lib/action.php
index 686b512a2c..7614f4be3a 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -315,7 +315,6 @@ class Action extends HTMLOutputter // lawsuit
                 $this->showScriptMessages();
                 // Frame-busting code to avoid clickjacking attacks.
                 $this->inlineScript('if (window.top !== window.self) { window.top.location.href = window.self.location.href; }');
-                $this->inlineScript('$(document).ready(function(){ $(\'#input_forms\').tabs(); });');
                 Event::handle('EndShowStatusNetScripts', array($this));
                 Event::handle('EndShowLaconicaScripts', array($this));
             }
@@ -593,7 +592,7 @@ class Action extends HTMLOutputter // lawsuit
     {
         $tabs = array('status' => _('Status'));
 
-        $this->elementStart('div', array('id' => 'input_forms'));
+        $this->elementStart('div', 'input_forms');
 
         if (Event::handle('StartShowEntryForms', array(&$tabs))) {
 
@@ -612,7 +611,7 @@ class Action extends HTMLOutputter // lawsuit
                 $this->elementStart('li', $attrs);
 
                 $this->element('a',
-                               array('href' => '#input_forms-'.$tag),
+                               array('href' => 'javascript:SN.U.switchInputFormTab("'.$tag.'")'),
                                $title);
                 $this->elementEnd('li');
             }
@@ -622,7 +621,7 @@ class Action extends HTMLOutputter // lawsuit
             foreach ($tabs as $tag => $title) {
 
                 $attrs = array('class' => 'input_form',
-                               'id' => 'input_forms-'.$tag);
+                               'id' => 'input_form_'.$tag);
 
                 if ($tag == 'status') {
                     $attrs['class'] .= ' current';
diff --git a/theme/rebase/css/display.css b/theme/rebase/css/display.css
index f7a9486f24..c1ac1e8f4d 100644
--- a/theme/rebase/css/display.css
+++ b/theme/rebase/css/display.css
@@ -1962,6 +1962,18 @@ margin-bottom:18px;
 padding-left:20px;
 }
 
+#input_form_nav { 
+    list-style-type: none;
+}
+
+#input_form_nav li { 
+    display:inline;
+}
+
+.input_form_nav_tab.current {
+    text-decoration: underline;
+}
+
 .input_form { 
     display: none;
 }

From a72dbc1aff774446c0c31bb219d748484453b59e Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Mon, 14 Mar 2011 10:58:19 -0500
Subject: [PATCH 604/655] add a profile block to left column

---
 lib/action.php              |  16 ++++++
 lib/defaultprofileblock.php | 112 ++++++++++++++++++++++++++++++++++++
 lib/profileblock.php        | 109 +++++++++++++++++++++++++++++++++++
 3 files changed, 237 insertions(+)
 create mode 100644 lib/defaultprofileblock.php
 create mode 100644 lib/profileblock.php

diff --git a/lib/action.php b/lib/action.php
index 12464c2c68..aa85c40f22 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -716,10 +716,26 @@ class Action extends HTMLOutputter // lawsuit
         // Need to have this ID for CSS; I'm too lazy to add it to
         // all menus
         $this->elementStart('div', array('id' => 'site_nav_local_views'));
+        // Cheat cheat cheat!
+        $this->showProfileBlock();
         $this->showLocalNav();
         $this->elementEnd('div');
     }
 
+    /**
+     * If there's a logged-in user, show a bit of login context
+     *
+     * @return nothing
+     */
+
+    function showProfileBlock()
+    {
+        if (common_logged_in()) {
+            $block = new DefaultProfileBlock($this);
+            $block->show();
+        }
+    }
+
     /**
      * Show local navigation.
      *
diff --git a/lib/defaultprofileblock.php b/lib/defaultprofileblock.php
new file mode 100644
index 0000000000..a072b56f16
--- /dev/null
+++ b/lib/defaultprofileblock.php
@@ -0,0 +1,112 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2011, StatusNet, Inc.
+ *
+ * Default profile block to show current user's info
+ * 
+ * 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  Widget
+ * @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);
+}
+
+/**
+ * Default profile block
+ *
+ * @category  Widget
+ * @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 DefaultProfileBlock extends ProfileBlock
+{
+    protected $profile = null;
+
+    function __construct($out)
+    {
+        parent::__construct($out);
+        $user = common_current_user();
+        if (empty($user)) {
+            throw new Exception("DefaultProfileBlock with no user.");
+        }
+        $this->profile = $user->getProfile();
+    }
+
+    function avatar()
+    {
+        $avatar = $this->profile->getAvatar(AVATAR_PROFILE_SIZE);
+        if (empty($avatar)) {
+            $avatar = $this->profile->getAvatar(73);
+        }
+        return (!empty($avatar)) ? 
+            $avatar->displayUrl() : 
+            Avatar::defaultImage(AVATAR_PROFILE_SIZE);
+    }
+
+    function name()
+    {
+        return $this->profile->getBestName();
+    }
+
+    function url()
+    {
+        return $this->profile->profileurl;
+    }
+
+    function canEdit()
+    {
+        return true;
+    }
+
+    function editUrl()
+    {
+        return common_local_url('profilesettings');
+    }
+
+    function editText()
+    {
+        return _('Edit');
+    }
+
+    function location()
+    {
+        return $this->profile->location;
+    }
+
+    function homepage()
+    {
+        return $this->profile->homepage;
+    }
+
+    function description()
+    {
+        return $this->profile->bio;
+    }
+}
\ No newline at end of file
diff --git a/lib/profileblock.php b/lib/profileblock.php
new file mode 100644
index 0000000000..3e8e929821
--- /dev/null
+++ b/lib/profileblock.php
@@ -0,0 +1,109 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2011, StatusNet, Inc.
+ *
+ * Superclass for profile blocks
+ * 
+ * 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  Widget
+ * @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);
+}
+
+/**
+ * Class comment
+ *
+ * @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/
+ */
+
+abstract class ProfileBlock extends Widget
+{
+    abstract function avatar();
+    abstract function name();
+    abstract function url();
+    abstract function canEdit();
+    abstract function editUrl();
+    abstract function editText();
+    abstract function location();
+    abstract function homepage();
+    abstract function description();
+
+    function show()
+    {
+        $this->out->elementStart('div', 'profile_block');
+
+        $this->out->element('img', array('src' => $this->avatar(),
+                                         'class' => 'profile_block_avatar',
+                                         'alt' => $this->name(),
+                                         'width' => AVATAR_PROFILE_SIZE,
+                                         'height' => AVATAR_PROFILE_SIZE));
+
+        if ($this->canEdit()) {
+            $this->out->element('a', array('href' => $this->editUrl()),
+                                $this->editText());
+        }
+
+        $name = $this->name();
+
+        if (!empty($name)) {
+            $url = $this->url();
+            if (!empty($url)) {
+                $this->out->element('a', array('href' => $url),
+                                    $name);
+            } else {
+                $this->out->element('span', 'profile_block_name', $name);
+            }
+        }
+
+        $location = $this->location();
+
+        if (!empty($location)) {
+            $this->out->element('span', 'profile_block_location', $location);
+        }
+
+        $homepage = $this->homepage();
+
+        if (!empty($homepage)) {
+            $this->out->element('a', 'profile_block_homepage', $homepage);
+        }
+
+        $description = $this->description();
+
+        if (!empty($description)) {
+            $this->out->element('p',
+                                'profile_block_description',
+                                $description);
+        }
+
+        $this->out->elementEnd('div');
+    }
+}

From d0317d96e18c21f1ae38e95bfa66a03328ded0ed Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Mon, 14 Mar 2011 11:00:07 -0500
Subject: [PATCH 605/655] hide profile block on settings and admin panels

---
 lib/adminpanelaction.php | 4 ++++
 lib/settingsaction.php   | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/lib/adminpanelaction.php b/lib/adminpanelaction.php
index a085fcd5dc..5e7e284b5c 100644
--- a/lib/adminpanelaction.php
+++ b/lib/adminpanelaction.php
@@ -290,4 +290,8 @@ class AdminPanelAction extends Action
 
         return $isOK;
     }
+
+    function showProfileBlock()
+    {
+    }
 }
diff --git a/lib/settingsaction.php b/lib/settingsaction.php
index dc60137ab4..c7113d15c2 100644
--- a/lib/settingsaction.php
+++ b/lib/settingsaction.php
@@ -174,4 +174,8 @@ class SettingsAction extends CurrentUserDesignAction
     {
         return;
     }
+
+    function showProfileBlock()
+    {
+    }
 }

From e5133f8150910fa30a7f1f122be34a37478e938d Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Mon, 14 Mar 2011 11:04:51 -0500
Subject: [PATCH 606/655] add accountprofileblock and make defaultprofileblock
 use it

---
 lib/accountprofileblock.php | 109 ++++++++++++++++++++++++++++++++++++
 lib/defaultprofileblock.php |  44 ++-------------
 2 files changed, 114 insertions(+), 39 deletions(-)
 create mode 100644 lib/accountprofileblock.php

diff --git a/lib/accountprofileblock.php b/lib/accountprofileblock.php
new file mode 100644
index 0000000000..61aff13d41
--- /dev/null
+++ b/lib/accountprofileblock.php
@@ -0,0 +1,109 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2011, StatusNet, Inc.
+ *
+ * Profile block to show for an account
+ * 
+ * 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  Widget
+ * @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);
+}
+
+/**
+ * Profile block to show for an account
+ *
+ * @category  Widget
+ * @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 AccountProfileBlock extends ProfileBlock
+{
+    protected $profile = null;
+
+    function __construct($out, $profile)
+    {
+        parent::__construct($out);
+        $this->profile = $profile;
+    }
+
+    function avatar()
+    {
+        $avatar = $this->profile->getAvatar(AVATAR_PROFILE_SIZE);
+        if (empty($avatar)) {
+            $avatar = $this->profile->getAvatar(73);
+        }
+        return (!empty($avatar)) ? 
+            $avatar->displayUrl() : 
+            Avatar::defaultImage(AVATAR_PROFILE_SIZE);
+    }
+
+    function name()
+    {
+        return $this->profile->getBestName();
+    }
+
+    function url()
+    {
+        return $this->profile->profileurl;
+    }
+
+    function canEdit()
+    {
+        $user = common_current_user();
+        return ((!empty($user)) && ($user->id == $profile->id));
+    }
+
+    function editUrl()
+    {
+        return common_local_url('profilesettings');
+    }
+
+    function editText()
+    {
+        return _('Edit');
+    }
+
+    function location()
+    {
+        return $this->profile->location;
+    }
+
+    function homepage()
+    {
+        return $this->profile->homepage;
+    }
+
+    function description()
+    {
+        return $this->profile->bio;
+    }
+}
\ No newline at end of file
diff --git a/lib/defaultprofileblock.php b/lib/defaultprofileblock.php
index a072b56f16..18a32a0951 100644
--- a/lib/defaultprofileblock.php
+++ b/lib/defaultprofileblock.php
@@ -45,39 +45,15 @@ if (!defined('STATUSNET')) {
  * @link      http://status.net/
  */
 
-class DefaultProfileBlock extends ProfileBlock
+class DefaultProfileBlock extends AccountProfileBlock
 {
-    protected $profile = null;
-
     function __construct($out)
     {
-        parent::__construct($out);
         $user = common_current_user();
         if (empty($user)) {
             throw new Exception("DefaultProfileBlock with no user.");
         }
-        $this->profile = $user->getProfile();
-    }
-
-    function avatar()
-    {
-        $avatar = $this->profile->getAvatar(AVATAR_PROFILE_SIZE);
-        if (empty($avatar)) {
-            $avatar = $this->profile->getAvatar(73);
-        }
-        return (!empty($avatar)) ? 
-            $avatar->displayUrl() : 
-            Avatar::defaultImage(AVATAR_PROFILE_SIZE);
-    }
-
-    function name()
-    {
-        return $this->profile->getBestName();
-    }
-
-    function url()
-    {
-        return $this->profile->profileurl;
+        parent::__construct($out, $user->getProfile());
     }
 
     function canEdit()
@@ -85,28 +61,18 @@ class DefaultProfileBlock extends ProfileBlock
         return true;
     }
 
-    function editUrl()
-    {
-        return common_local_url('profilesettings');
-    }
-
-    function editText()
-    {
-        return _('Edit');
-    }
-
     function location()
     {
-        return $this->profile->location;
+        return null;
     }
 
     function homepage()
     {
-        return $this->profile->homepage;
+        return null;
     }
 
     function description()
     {
-        return $this->profile->bio;
+        return null;
     }
 }
\ No newline at end of file

From 561458650f746c548097adcd9f470cc2486b0191 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Mon, 14 Mar 2011 11:10:07 -0500
Subject: [PATCH 607/655] profile group uses account profile block

---
 actions/showstream.php | 6 ++++++
 actions/usergroups.php | 6 ++++++
 lib/galleryaction.php  | 6 ++++++
 3 files changed, 18 insertions(+)

diff --git a/actions/showstream.php b/actions/showstream.php
index afde49ecea..25aa670e4f 100644
--- a/actions/showstream.php
+++ b/actions/showstream.php
@@ -110,6 +110,12 @@ class ShowstreamAction extends ProfileAction
         $nav->show();
     }
 
+    function showProfileBlock()
+    {
+        $block = new AccountProfileBlock($this, $this->profile);
+        $block->show();
+    }
+
     function showPageNoticeBlock()
     {
         return;
diff --git a/actions/usergroups.php b/actions/usergroups.php
index cf904bc929..b0514bec4b 100644
--- a/actions/usergroups.php
+++ b/actions/usergroups.php
@@ -168,4 +168,10 @@ class UsergroupsAction extends OwnerDesignAction
         $this->raw(common_markup_to_html($message));
         $this->elementEnd('div');
     }
+
+    function showProfileBlock()
+    {
+        $block = new AccountProfileBlock($this, $this->profile);
+        $block->show();
+    }
 }
diff --git a/lib/galleryaction.php b/lib/galleryaction.php
index 107134a09b..3db46dd09c 100644
--- a/lib/galleryaction.php
+++ b/lib/galleryaction.php
@@ -168,4 +168,10 @@ class GalleryAction extends OwnerDesignAction
     {
         return array();
     }
+
+    function showProfileBlock()
+    {
+        $block = new AccountProfileBlock($this, $this->profile);
+        $block->show();
+    }
 }

From 66b505a341c3f2b2fc842355bb55bdadd9cbff23 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Mon, 14 Mar 2011 11:29:06 -0500
Subject: [PATCH 608/655] show group profile block for group pages

---
 lib/groupdesignaction.php |   6 +++
 lib/groupprofileblock.php | 104 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 110 insertions(+)
 create mode 100644 lib/groupprofileblock.php

diff --git a/lib/groupdesignaction.php b/lib/groupdesignaction.php
index 3eb3964e87..44f35f6299 100644
--- a/lib/groupdesignaction.php
+++ b/lib/groupdesignaction.php
@@ -68,4 +68,10 @@ class GroupDesignAction extends Action {
         }
         return parent::getDesign();
     }
+
+    function showProfileBlock()
+    {
+        $block = new GroupProfileBlock($this, $this->group);
+        $block->show();
+    }
 }
diff --git a/lib/groupprofileblock.php b/lib/groupprofileblock.php
new file mode 100644
index 0000000000..f54f82e9e5
--- /dev/null
+++ b/lib/groupprofileblock.php
@@ -0,0 +1,104 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2011, StatusNet, Inc.
+ *
+ * Profile block to show for a group
+ * 
+ * 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  Widget
+ * @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);
+}
+
+/**
+ * Profile block to show for a group
+ *
+ * @category  Widget
+ * @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 GroupProfileBlock extends ProfileBlock
+{
+    protected $group = null;
+
+    function __construct($out, $group)
+    {
+        parent::__construct($out);
+        $this->group = $group;
+    }
+
+    function avatar()
+    {
+        return ($this->group->homepage_logo) ?
+          $this->group->homepage_logo : User_group::defaultLogo(AVATAR_PROFILE_SIZE);
+    }
+
+    function name()
+    {
+        return $this->group->getBestName();
+    }
+
+    function url()
+    {
+        return $this->group->mainpage;
+    }
+
+    function canEdit()
+    {
+        $user = common_current_user();
+        return ((!empty($user)) && ($user->isAdmin($this->group)));
+    }
+
+    function editUrl()
+    {
+        return common_local_url('editgroup', array('nickname' => $this->group->nickname));
+    }
+
+    function editText()
+    {
+        return _('Edit');
+    }
+
+    function location()
+    {
+        return $this->group->location;
+    }
+
+    function homepage()
+    {
+        return $this->group->homepage;
+    }
+
+    function description()
+    {
+        return $this->group->description;
+    }
+}
\ No newline at end of file

From f23184a8d6778b8aecfb5dca2c8de9dfb850bf15 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Mon, 14 Mar 2011 11:34:59 -0500
Subject: [PATCH 609/655] add newline to group profile block

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

diff --git a/lib/groupprofileblock.php b/lib/groupprofileblock.php
index f54f82e9e5..8d2686085f 100644
--- a/lib/groupprofileblock.php
+++ b/lib/groupprofileblock.php
@@ -101,4 +101,4 @@ class GroupProfileBlock extends ProfileBlock
     {
         return $this->group->description;
     }
-}
\ No newline at end of file
+}

From f242cf0e58bc169c51dac6a6486df01b436add23 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Mon, 14 Mar 2011 15:18:03 -0500
Subject: [PATCH 610/655] move profile block to the aside

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

diff --git a/lib/action.php b/lib/action.php
index aa85c40f22..51d7e8923e 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -717,7 +717,6 @@ class Action extends HTMLOutputter // lawsuit
         // all menus
         $this->elementStart('div', array('id' => 'site_nav_local_views'));
         // Cheat cheat cheat!
-        $this->showProfileBlock();
         $this->showLocalNav();
         $this->elementEnd('div');
     }
@@ -879,6 +878,7 @@ class Action extends HTMLOutputter // lawsuit
     {
         $this->elementStart('div', array('id' => 'aside_primary',
                                          'class' => 'aside'));
+        $this->showProfileBlock();
         if (Event::handle('StartShowObjectNavBlock', array($this))) {
             $this->showObjectNavBlock();
             Event::handle('EndShowObjectNavBlock', array($this));

From fbc11b72d7e2f51033f4d331fdfdeb6ebfbe7437 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Mon, 14 Mar 2011 15:19:37 -0500
Subject: [PATCH 611/655] Allow profileblock subclasses to show different sized
 avatars

---
 lib/profileblock.php | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/lib/profileblock.php b/lib/profileblock.php
index 3e8e929821..26d38ee349 100644
--- a/lib/profileblock.php
+++ b/lib/profileblock.php
@@ -61,11 +61,13 @@ abstract class ProfileBlock extends Widget
     {
         $this->out->elementStart('div', 'profile_block');
 
+        $size = $this->avatarSize();
+
         $this->out->element('img', array('src' => $this->avatar(),
                                          'class' => 'profile_block_avatar',
                                          'alt' => $this->name(),
-                                         'width' => AVATAR_PROFILE_SIZE,
-                                         'height' => AVATAR_PROFILE_SIZE));
+                                         'width' => $size,
+                                         'height' => $size));
 
         if ($this->canEdit()) {
             $this->out->element('a', array('href' => $this->editUrl()),
@@ -106,4 +108,10 @@ abstract class ProfileBlock extends Widget
 
         $this->out->elementEnd('div');
     }
+
+    function avatarSize()
+    {
+        return AVATAR_PROFILE_SIZE;
+    }
+
 }

From a661b22fada7a3b698b570d6bc1d1103b361a574 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Mon, 14 Mar 2011 15:19:56 -0500
Subject: [PATCH 612/655] use stream-sized avatar for default profileblock

---
 lib/defaultprofileblock.php | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/lib/defaultprofileblock.php b/lib/defaultprofileblock.php
index 18a32a0951..18eff49432 100644
--- a/lib/defaultprofileblock.php
+++ b/lib/defaultprofileblock.php
@@ -56,6 +56,22 @@ class DefaultProfileBlock extends AccountProfileBlock
         parent::__construct($out, $user->getProfile());
     }
 
+    function avatarSize()
+    {
+        return AVATAR_STREAM_SIZE;
+    }
+
+    function avatar()
+    {
+        $avatar = $this->profile->getAvatar(AVATAR_STREAM_SIZE);
+        if (empty($avatar)) {
+            $avatar = $this->profile->getAvatar(73);
+        }
+        return (!empty($avatar)) ? 
+            $avatar->displayUrl() : 
+            Avatar::defaultImage(AVATAR_STREAM_SIZE);
+    }
+
     function canEdit()
     {
         return true;

From 051e374792ae24467632282c7c0c30279f6dc9c0 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Mon, 14 Mar 2011 16:39:14 -0400
Subject: [PATCH 613/655] profile block can have actions

---
 lib/profileblock.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lib/profileblock.php b/lib/profileblock.php
index 26d38ee349..7fcc11ef1a 100644
--- a/lib/profileblock.php
+++ b/lib/profileblock.php
@@ -106,6 +106,8 @@ abstract class ProfileBlock extends Widget
                                 $description);
         }
 
+        $this->showActions();
+
         $this->out->elementEnd('div');
     }
 
@@ -114,4 +116,7 @@ abstract class ProfileBlock extends Widget
         return AVATAR_PROFILE_SIZE;
     }
 
+    function showActions()
+    {
+    }
 }

From 3d68474e1449621da879776c7f5467fdc16fb954 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Mon, 14 Mar 2011 16:39:45 -0400
Subject: [PATCH 614/655] move UserProfile actions to account profile block

---
 lib/accountprofileblock.php | 196 ++++++++++++++++++++++++++++++++++++
 1 file changed, 196 insertions(+)

diff --git a/lib/accountprofileblock.php b/lib/accountprofileblock.php
index 61aff13d41..e75527b288 100644
--- a/lib/accountprofileblock.php
+++ b/lib/accountprofileblock.php
@@ -48,11 +48,13 @@ if (!defined('STATUSNET')) {
 class AccountProfileBlock extends ProfileBlock
 {
     protected $profile = null;
+    protected $user    = null;
 
     function __construct($out, $profile)
     {
         parent::__construct($out);
         $this->profile = $profile;
+        $this->user    = User::staticGet('id', $profile->id);
     }
 
     function avatar()
@@ -106,4 +108,198 @@ class AccountProfileBlock extends ProfileBlock
     {
         return $this->profile->bio;
     }
+
+    function showActions()
+    {
+        if ($this->profile->hasRole(Profile_role::DELETED)) {
+            $this->out->elementStart('div', 'entity_actions');
+            // TRANS: H2 for user actions in a profile.
+            $this->out->element('h2', null, _('User actions'));
+            $this->out->elementStart('ul');
+            $this->out->elementStart('p', array('class' => 'profile_deleted'));
+            // TRANS: Text shown in user profile of not yet compeltely deleted users.
+            $this->out->text(_('User deletion in progress...'));
+            $this->out->elementEnd('p');
+            $this->out->elementEnd('ul');
+            $this->out->elementEnd('div');
+            return;
+        }
+        if (Event::handle('StartProfilePageActionsSection', array($this->out, $this->profile))) {
+
+            $cur = common_current_user();
+
+            $this->out->elementStart('div', 'entity_actions');
+            // TRANS: H2 for entity actions in a profile.
+            $this->out->element('h2', null, _('User actions'));
+            $this->out->elementStart('ul');
+
+            if (Event::handle('StartProfilePageActionsElements', array($this->out, $this->profile))) {
+                if (empty($cur)) { // not logged in
+                    if (Event::handle('StartProfileRemoteSubscribe', array($this->out, $this->profile))) {
+                        $this->out->elementStart('li', 'entity_subscribe');
+                        $this->showRemoteSubscribeLink();
+                        $this->out->elementEnd('li');
+                        Event::handle('EndProfileRemoteSubscribe', array($this->out, $this->profile));
+                    }
+                } else {
+                    if ($cur->id == $this->profile->id) { // your own page
+                        $this->out->elementStart('li', 'entity_edit');
+                        $this->out->element('a', array('href' => common_local_url('profilesettings'),
+                                                  // TRANS: Link title for link on user profile.
+                                                  'title' => _('Edit profile settings')),
+                                       // TRANS: Link text for link on user profile.
+                                       _('Edit'));
+                        $this->out->elementEnd('li');
+                    } else { // someone else's page
+
+                        // subscribe/unsubscribe button
+
+                        $this->out->elementStart('li', 'entity_subscribe');
+
+                        if ($cur->isSubscribed($this->profile)) {
+                            $usf = new UnsubscribeForm($this->out, $this->profile);
+                            $usf->show();
+                        } else {
+                            $sf = new SubscribeForm($this->out, $this->profile);
+                            $sf->show();
+                        }
+                        $this->out->elementEnd('li');
+
+                        if ($cur->mutuallySubscribed($this->profile)) {
+
+                            // message
+
+                            $this->out->elementStart('li', 'entity_send-a-message');
+                            $this->out->element('a', array('href' => common_local_url('newmessage', array('to' => $this->user->id)),
+                                                      // TRANS: Link title for link on user profile.
+                                                      'title' => _('Send a direct message to this user')),
+                                           // TRANS: Link text for link on user profile.
+                                           _('Message'));
+                            $this->out->elementEnd('li');
+
+                            // nudge
+
+                            if ($this->user && $this->user->email && $this->user->emailnotifynudge) {
+                                $this->out->elementStart('li', 'entity_nudge');
+                                $nf = new NudgeForm($this->out, $this->user);
+                                $nf->show();
+                                $this->out->elementEnd('li');
+                            }
+                        }
+
+                        // return-to args, so we don't have to keep re-writing them
+
+                        list($action, $r2args) = $this->out->returnToArgs();
+
+                        // push the action into the list
+
+                        $r2args['action'] = $action;
+
+                        // block/unblock
+
+                        $blocked = $cur->hasBlocked($this->profile);
+                        $this->out->elementStart('li', 'entity_block');
+                        if ($blocked) {
+                            $ubf = new UnblockForm($this->out, $this->profile, $r2args);
+                            $ubf->show();
+                        } else {
+                            $bf = new BlockForm($this->out, $this->profile, $r2args);
+                            $bf->show();
+                        }
+                        $this->out->elementEnd('li');
+
+                        // Some actions won't be applicable to non-local users.
+                        $isLocal = !empty($this->user);
+
+                        if ($cur->hasRight(Right::SANDBOXUSER) ||
+                            $cur->hasRight(Right::SILENCEUSER) ||
+                            $cur->hasRight(Right::DELETEUSER)) {
+                            $this->out->elementStart('li', 'entity_moderation');
+                            // TRANS: Label text on user profile to select a user role.
+                            $this->out->element('p', null, _('Moderate'));
+                            $this->out->elementStart('ul');
+                            if ($cur->hasRight(Right::SANDBOXUSER)) {
+                                $this->out->elementStart('li', 'entity_sandbox');
+                                if ($this->profile->isSandboxed()) {
+                                    $usf = new UnSandboxForm($this->out, $this->profile, $r2args);
+                                    $usf->show();
+                                } else {
+                                    $sf = new SandboxForm($this->out, $this->profile, $r2args);
+                                    $sf->show();
+                                }
+                                $this->out->elementEnd('li');
+                            }
+
+                            if ($cur->hasRight(Right::SILENCEUSER)) {
+                                $this->out->elementStart('li', 'entity_silence');
+                                if ($this->profile->isSilenced()) {
+                                    $usf = new UnSilenceForm($this->out, $this->profile, $r2args);
+                                    $usf->show();
+                                } else {
+                                    $sf = new SilenceForm($this->out, $this->profile, $r2args);
+                                    $sf->show();
+                                }
+                                $this->out->elementEnd('li');
+                            }
+
+                            if ($isLocal && $cur->hasRight(Right::DELETEUSER)) {
+                                $this->out->elementStart('li', 'entity_delete');
+                                $df = new DeleteUserForm($this->out, $this->profile, $r2args);
+                                $df->show();
+                                $this->out->elementEnd('li');
+                            }
+                            $this->out->elementEnd('ul');
+                            $this->out->elementEnd('li');
+                        }
+
+                        if ($isLocal && $cur->hasRight(Right::GRANTROLE)) {
+                            $this->out->elementStart('li', 'entity_role');
+                            // TRANS: Label text on user profile to select a user role.
+                            $this->out->element('p', null, _('User role'));
+                            $this->out->elementStart('ul');
+                            // TRANS: Role that can be set for a user profile.
+                            $this->roleButton('administrator', _m('role', 'Administrator'));
+                            // TRANS: Role that can be set for a user profile.
+                            $this->roleButton('moderator', _m('role', 'Moderator'));
+                            $this->out->elementEnd('ul');
+                            $this->out->elementEnd('li');
+                        }
+                    }
+                }
+
+                Event::handle('EndProfilePageActionsElements', array($this->out, $this->profile));
+            }
+
+            $this->out->elementEnd('ul');
+            $this->out->elementEnd('div');
+
+            Event::handle('EndProfilePageActionsSection', array($this->out, $this->profile));
+        }
+    }
+
+    function roleButton($role, $label)
+    {
+        list($action, $r2args) = $this->out->returnToArgs();
+        $r2args['action'] = $action;
+
+        $this->out->elementStart('li', "entity_role_$role");
+        if ($this->profile->hasRole($role)) {
+            $rf = new RevokeRoleForm($role, $label, $this->out, $this->profile, $r2args);
+            $rf->show();
+        } else {
+            $rf = new GrantRoleForm($role, $label, $this->out, $this->profile, $r2args);
+            $rf->show();
+        }
+        $this->out->elementEnd('li');
+    }
+
+    function showRemoteSubscribeLink()
+    {
+        $url = common_local_url('remotesubscribe',
+                                array('nickname' => $this->profile->nickname));
+        $this->out->element('a', array('href' => $url,
+                                  'class' => 'entity_remote_subscribe'),
+                       // TRANS: Link text for link that will subscribe to a remote profile.
+                       _('Subscribe'));
+    }
 }
\ No newline at end of file

From 2d4554ea038d94862d164441d549a42473f00b2c Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Mon, 14 Mar 2011 16:40:56 -0400
Subject: [PATCH 615/655] Remove UserProfile class

---
 actions/showstream.php |   8 -
 lib/userprofile.php    | 408 -----------------------------------------
 2 files changed, 416 deletions(-)
 delete mode 100644 lib/userprofile.php

diff --git a/actions/showstream.php b/actions/showstream.php
index 25aa670e4f..08f8a3e80e 100644
--- a/actions/showstream.php
+++ b/actions/showstream.php
@@ -33,7 +33,6 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
 }
 
 require_once INSTALLDIR.'/lib/personalgroupnav.php';
-require_once INSTALLDIR.'/lib/userprofile.php';
 require_once INSTALLDIR.'/lib/noticelist.php';
 require_once INSTALLDIR.'/lib/profileminilist.php';
 require_once INSTALLDIR.'/lib/groupminilist.php';
@@ -100,7 +99,6 @@ class ShowstreamAction extends ProfileAction
 
     function showContent()
     {
-        $this->showProfile();
         $this->showNotices();
     }
 
@@ -199,12 +197,6 @@ class ShowstreamAction extends ProfileAction
                                      'href' => $rsd));
     }
 
-    function showProfile()
-    {
-        $profile = new UserProfile($this, $this->user, $this->profile);
-        $profile->show();
-    }
-
     function showEmptyListMessage()
     {
         // TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
diff --git a/lib/userprofile.php b/lib/userprofile.php
deleted file mode 100644
index 9c563db5d0..0000000000
--- a/lib/userprofile.php
+++ /dev/null
@@ -1,408 +0,0 @@
-<?php
-/**
- * StatusNet, the distributed open-source microblogging tool
- *
- * Profile for a particular user
- *
- * PHP version 5
- *
- * LICENCE: This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * @category  Action
- * @package   StatusNet
- * @author    Evan Prodromou <evan@status.net>
- * @author    Sarven Capadisli <csarven@status.net>
- * @copyright 2008 StatusNet, Inc.
- * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://status.net/
- */
-
-if (!defined('STATUSNET') && !defined('LACONICA')) {
-    exit(1);
-}
-
-require_once INSTALLDIR.'/lib/widget.php';
-
-/**
- * Profile of a user
- *
- * Shows profile information about a particular user
- *
- * @category Output
- * @package  StatusNet
- * @author   Evan Prodromou <evan@status.net>
- * @author   Sarven Capadisli <csarven@status.net>
- * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://status.net/
- *
- * @see      HTMLOutputter
- */
-class UserProfile extends Widget
-{
-    var $user = null;
-    var $profile = null;
-
-    function __construct($action=null, $user=null, $profile=null)
-    {
-        parent::__construct($action);
-        $this->user = $user;
-        $this->profile = $profile;
-    }
-
-    function show()
-    {
-        $this->showProfileData();
-        $this->showEntityActions();
-    }
-
-    function showProfileData()
-    {
-        if (Event::handle('StartProfilePageProfileSection', array(&$this->out, $this->profile))) {
-
-            $this->out->elementStart('div', array('id' => 'i',
-                                                  'class' => 'entity_profile vcard author'));
-            // TRANS: H2 for user profile information.
-            $this->out->element('h2', null, _('User profile'));
-
-            if (Event::handle('StartProfilePageProfileElements', array(&$this->out, $this->profile))) {
-
-                $this->showAvatar();
-                $this->showNickname();
-                $this->showFullName();
-                $this->showLocation();
-                $this->showHomepage();
-                $this->showBio();
-                $this->showProfileTags();
-
-                Event::handle('EndProfilePageProfileElements', array(&$this->out, $this->profile));
-            }
-
-            $this->out->elementEnd('div');
-            Event::handle('EndProfilePageProfileSection', array(&$this->out, $this->profile));
-        }
-    }
-
-    function showAvatar()
-    {
-        $this->out->elementStart('div', 'ur_face');
-
-        if (Event::handle('StartProfilePageAvatar', array($this->out, $this->profile))) {
-
-            $avatar = $this->profile->getAvatar(AVATAR_PROFILE_SIZE);
-            if (!$avatar) {
-                // hack for remote Twitter users: no 96px, but large Twitter size is 73px
-                $avatar = $this->profile->getAvatar(73);
-            }
-
-            $this->out->element('img', 
-                                array('src' => ($avatar) ? $avatar->displayUrl() : Avatar::defaultImage(AVATAR_PROFILE_SIZE),
-                                      'class' => 'photo avatar entity_depiction',
-                                      'width' => AVATAR_PROFILE_SIZE,
-                                      'height' => AVATAR_PROFILE_SIZE,
-                                      'alt' => $this->profile->nickname));
-            
-            $cur = common_current_user();
-
-            if ($cur && $cur->id == $this->profile->id) {
-                $this->out->element('a', array('href' => common_local_url('avatarsettings')), _('Edit Avatar'));
-            }
-
-            Event::handle('EndProfilePageAvatar',
-                          array($this->out, $this->profile));
-        }
-
-        $this->out->elementEnd('div');
-    }
-
-    function showNickname()
-    {
-        if (Event::handle('StartProfilePageNickname', array($this->out, $this->profile))) {
-
-            $hasFN = ($this->profile->fullname) ? 'entity_nickname nickname url uid' : 'entity_nickname fn nickname url uid';
-            $this->out->element('a',
-                                array('href' => $this->profile->profileurl,
-                                      'rel' => 'me',
-                                      'class' => $hasFN),
-                           $this->profile->nickname);
-
-            Event::handle('EndProfilePageNickname', array($this->out, $this->profile));
-        }
-    }
-
-    function showFullName()
-    {
-        if (Event::handle('StartProfilePageFullName', array($this->out, $this->profile))) {
-            if ($this->profile->fullname) {
-                $this->out->element('span',
-                                    'entity_fn fn',
-                                    $this->profile->fullname);
-            }
-            Event::handle('EndProfilePageFullName', array($this->out, $this->profile));
-        }
-    }
-
-    function showLocation()
-    {
-        if (Event::handle('StartProfilePageLocation', array($this->out, $this->profile))) {
-            if ($this->profile->location) {
-                $this->out->element('span',
-                                    'entity_location label',
-                                    $this->profile->location);
-            }
-            Event::handle('EndProfilePageLocation', array($this->out, $this->profile));
-        }
-    }
-
-    function showHomepage()
-    {
-        if (Event::handle('StartProfilePageHomepage', array($this->out, $this->profile))) {
-            if ($this->profile->homepage) {
-                $this->out->element('a',
-                                    array('href' => $this->profile->homepage,
-                                          'rel' => 'me',
-                                          'class' => 'url entity_url'),
-                               $this->profile->homepage);
-            }
-            Event::handle('EndProfilePageHomepage', array($this->out, $this->profile));
-        }
-    }
-
-    function showBio()
-    {
-        if (Event::handle('StartProfilePageBio', array($this->out, $this->profile))) {
-            if ($this->profile->bio) {
-                $this->out->element('div',
-                                    'note entity_note',
-                                    $this->profile->bio);
-            }
-            Event::handle('EndProfilePageBio', array($this->out, $this->profile));
-        }
-    }
-
-    function showProfileTags()
-    {
-        if (Event::handle('StartProfilePageProfileTags', array($this->out, $this->profile))) {
-            $tags = Profile_tag::getTags($this->profile->id, $this->profile->id);
-
-            if (count($tags) > 0) {
-                $this->out->elementStart('ul', 'tags xoxo entity_tags');
-                foreach ($tags as $tag) {
-                    $this->out->elementStart('li');
-                    // Avoid space by using raw output.
-                    $pt = '<span class="mark_hash">#</span><a rel="tag" href="' .
-                      common_local_url('peopletag', array('tag' => $tag)) .
-                      '">' . $tag . '</a>';
-                    $this->out->raw($pt);
-                    $this->out->elementEnd('li');
-                }
-                $this->out->elementEnd('ul');
-            }
-            Event::handle('EndProfilePageProfileTags', array($this->out, $this->profile));
-        }
-    }
-
-    function showEntityActions()
-    {
-        if ($this->profile->hasRole(Profile_role::DELETED)) {
-            $this->out->elementStart('div', 'entity_actions');
-            // TRANS: H2 for user actions in a profile.
-            $this->out->element('h2', null, _('User actions'));
-            $this->out->elementStart('ul');
-            $this->out->elementStart('p', array('class' => 'profile_deleted'));
-            // TRANS: Text shown in user profile of not yet compeltely deleted users.
-            $this->out->text(_('User deletion in progress...'));
-            $this->out->elementEnd('p');
-            $this->out->elementEnd('ul');
-            $this->out->elementEnd('div');
-            return;
-        }
-        if (Event::handle('StartProfilePageActionsSection', array($this->out, $this->profile))) {
-
-            $cur = common_current_user();
-
-            $this->out->elementStart('div', 'entity_actions');
-            // TRANS: H2 for entity actions in a profile.
-            $this->out->element('h2', null, _('User actions'));
-            $this->out->elementStart('ul');
-
-            if (Event::handle('StartProfilePageActionsElements', array($this->out, $this->profile))) {
-                if (empty($cur)) { // not logged in
-                    if (Event::handle('StartProfileRemoteSubscribe', array($this->out, $this->profile))) {
-                        $this->out->elementStart('li', 'entity_subscribe');
-                        $this->showRemoteSubscribeLink();
-                        $this->out->elementEnd('li');
-                        Event::handle('EndProfileRemoteSubscribe', array($this->out, $this->profile));
-                    }
-                } else {
-                    if ($cur->id == $this->profile->id) { // your own page
-                        $this->out->elementStart('li', 'entity_edit');
-                        $this->out->element('a', array('href' => common_local_url('profilesettings'),
-                                                  // TRANS: Link title for link on user profile.
-                                                  'title' => _('Edit profile settings')),
-                                       // TRANS: Link text for link on user profile.
-                                       _('Edit'));
-                        $this->out->elementEnd('li');
-                    } else { // someone else's page
-
-                        // subscribe/unsubscribe button
-
-                        $this->out->elementStart('li', 'entity_subscribe');
-
-                        if ($cur->isSubscribed($this->profile)) {
-                            $usf = new UnsubscribeForm($this->out, $this->profile);
-                            $usf->show();
-                        } else {
-                            $sf = new SubscribeForm($this->out, $this->profile);
-                            $sf->show();
-                        }
-                        $this->out->elementEnd('li');
-
-                        if ($cur->mutuallySubscribed($this->profile)) {
-
-                            // message
-
-                            $this->out->elementStart('li', 'entity_send-a-message');
-                            $this->out->element('a', array('href' => common_local_url('newmessage', array('to' => $this->user->id)),
-                                                      // TRANS: Link title for link on user profile.
-                                                      'title' => _('Send a direct message to this user')),
-                                           // TRANS: Link text for link on user profile.
-                                           _('Message'));
-                            $this->out->elementEnd('li');
-
-                            // nudge
-
-                            if ($this->user && $this->user->email && $this->user->emailnotifynudge) {
-                                $this->out->elementStart('li', 'entity_nudge');
-                                $nf = new NudgeForm($this->out, $this->user);
-                                $nf->show();
-                                $this->out->elementEnd('li');
-                            }
-                        }
-
-                        // return-to args, so we don't have to keep re-writing them
-
-                        list($action, $r2args) = $this->out->returnToArgs();
-
-                        // push the action into the list
-
-                        $r2args['action'] = $action;
-
-                        // block/unblock
-
-                        $blocked = $cur->hasBlocked($this->profile);
-                        $this->out->elementStart('li', 'entity_block');
-                        if ($blocked) {
-                            $ubf = new UnblockForm($this->out, $this->profile, $r2args);
-                            $ubf->show();
-                        } else {
-                            $bf = new BlockForm($this->out, $this->profile, $r2args);
-                            $bf->show();
-                        }
-                        $this->out->elementEnd('li');
-
-                        // Some actions won't be applicable to non-local users.
-                        $isLocal = !empty($this->user);
-
-                        if ($cur->hasRight(Right::SANDBOXUSER) ||
-                            $cur->hasRight(Right::SILENCEUSER) ||
-                            $cur->hasRight(Right::DELETEUSER)) {
-                            $this->out->elementStart('li', 'entity_moderation');
-                            // TRANS: Label text on user profile to select a user role.
-                            $this->out->element('p', null, _('Moderate'));
-                            $this->out->elementStart('ul');
-                            if ($cur->hasRight(Right::SANDBOXUSER)) {
-                                $this->out->elementStart('li', 'entity_sandbox');
-                                if ($this->profile->isSandboxed()) {
-                                    $usf = new UnSandboxForm($this->out, $this->profile, $r2args);
-                                    $usf->show();
-                                } else {
-                                    $sf = new SandboxForm($this->out, $this->profile, $r2args);
-                                    $sf->show();
-                                }
-                                $this->out->elementEnd('li');
-                            }
-
-                            if ($cur->hasRight(Right::SILENCEUSER)) {
-                                $this->out->elementStart('li', 'entity_silence');
-                                if ($this->profile->isSilenced()) {
-                                    $usf = new UnSilenceForm($this->out, $this->profile, $r2args);
-                                    $usf->show();
-                                } else {
-                                    $sf = new SilenceForm($this->out, $this->profile, $r2args);
-                                    $sf->show();
-                                }
-                                $this->out->elementEnd('li');
-                            }
-
-                            if ($isLocal && $cur->hasRight(Right::DELETEUSER)) {
-                                $this->out->elementStart('li', 'entity_delete');
-                                $df = new DeleteUserForm($this->out, $this->profile, $r2args);
-                                $df->show();
-                                $this->out->elementEnd('li');
-                            }
-                            $this->out->elementEnd('ul');
-                            $this->out->elementEnd('li');
-                        }
-
-                        if ($isLocal && $cur->hasRight(Right::GRANTROLE)) {
-                            $this->out->elementStart('li', 'entity_role');
-                            // TRANS: Label text on user profile to select a user role.
-                            $this->out->element('p', null, _('User role'));
-                            $this->out->elementStart('ul');
-                            // TRANS: Role that can be set for a user profile.
-                            $this->roleButton('administrator', _m('role', 'Administrator'));
-                            // TRANS: Role that can be set for a user profile.
-                            $this->roleButton('moderator', _m('role', 'Moderator'));
-                            $this->out->elementEnd('ul');
-                            $this->out->elementEnd('li');
-                        }
-                    }
-                }
-
-                Event::handle('EndProfilePageActionsElements', array($this->out, $this->profile));
-            }
-
-            $this->out->elementEnd('ul');
-            $this->out->elementEnd('div');
-
-            Event::handle('EndProfilePageActionsSection', array($this->out, $this->profile));
-        }
-    }
-
-    function roleButton($role, $label)
-    {
-        list($action, $r2args) = $this->out->returnToArgs();
-        $r2args['action'] = $action;
-
-        $this->out->elementStart('li', "entity_role_$role");
-        if ($this->profile->hasRole($role)) {
-            $rf = new RevokeRoleForm($role, $label, $this->out, $this->profile, $r2args);
-            $rf->show();
-        } else {
-            $rf = new GrantRoleForm($role, $label, $this->out, $this->profile, $r2args);
-            $rf->show();
-        }
-        $this->out->elementEnd('li');
-    }
-
-    function showRemoteSubscribeLink()
-    {
-        $url = common_local_url('remotesubscribe',
-                                array('nickname' => $this->profile->nickname));
-        $this->out->element('a', array('href' => $url,
-                                  'class' => 'entity_remote_subscribe'),
-                       // TRANS: Link text for link that will subscribe to a remote profile.
-                       _('Subscribe'));
-    }
-}

From bbba1f6e168463b6994460568778e7a7df5941a1 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Mon, 14 Mar 2011 16:55:33 -0400
Subject: [PATCH 616/655] Show group actions in profile block

---
 actions/showgroup.php     | 117 --------------------------------------
 lib/groupprofileblock.php |  36 +++++++++++-
 2 files changed, 35 insertions(+), 118 deletions(-)

diff --git a/actions/showgroup.php b/actions/showgroup.php
index 411940ef9a..b198352cb0 100644
--- a/actions/showgroup.php
+++ b/actions/showgroup.php
@@ -180,8 +180,6 @@ class ShowgroupAction extends GroupDesignAction
      */
     function showContent()
     {
-        $this->showGroupProfile();
-        $this->showGroupActions();
         $this->showGroupNotices();
     }
 
@@ -205,121 +203,6 @@ class ShowgroupAction extends GroupDesignAction
                           array('nickname' => $this->group->nickname));
     }
 
-    /**
-     * Show the group profile
-     *
-     * Information about the group
-     *
-     * @return void
-     */
-    function showGroupProfile()
-    {
-        $this->elementStart('div', array('id' => 'i',
-                                         'class' => 'entity_profile vcard author'));
-
-        $logo = ($this->group->homepage_logo) ?
-          $this->group->homepage_logo : User_group::defaultLogo(AVATAR_PROFILE_SIZE);
-
-        $this->element('img', array('src' => $logo,
-                                    'class' => 'photo avatar entity_depiction',
-                                    'width' => AVATAR_PROFILE_SIZE,
-                                    'height' => AVATAR_PROFILE_SIZE,
-                                    'alt' => $this->group->nickname));
-
-        $hasFN = ($this->group->fullname) ? 'entity_nickname nickname url uid' :
-            'entity_nickname fn org nickname url uid';
-        $this->element('a', array('href' => $this->group->homeUrl(),
-                                  'rel' => 'me', 'class' => $hasFN),
-                            $this->group->nickname);
-
-        if ($this->group->fullname) {
-            $this->element('div', 'entity_fn fn org', $this->group->fullname);
-        }
-
-        if ($this->group->location) {
-            $this->element('div', 'entity_location label', $this->group->location);
-        }
-
-        if ($this->group->homepage) {
-            $this->element('a', array('href' => $this->group->homepage,
-                                      'rel' => 'me',
-                                      'class' => 'url entity_url'),
-                           $this->group->homepage);
-        }
-
-        if ($this->group->description) {
-            $this->element('div', 'note entity_note', $this->group->description);
-        }
-
-        if (common_config('group', 'maxaliases') > 0) {
-            $aliases = $this->group->getAliases();
-
-            if (!empty($aliases)) {
-                $this->element('div',
-                               'aliases entity_aliases',
-                               implode(' ', $aliases));
-            }
-
-            if ($this->group->description) {
-                $this->elementStart('dl', 'entity_note');
-                // TRANS: Label for group description or group note (dt). Text hidden by default.
-                $this->element('dt', null, _('Note'));
-                $this->element('dd', 'note', $this->group->description);
-                $this->elementEnd('dl');
-            }
-
-            if (common_config('group', 'maxaliases') > 0) {
-                $aliases = $this->group->getAliases();
-
-                if (!empty($aliases)) {
-                    $this->elementStart('dl', 'entity_aliases');
-                    // TRANS: Label for group aliases (dt). Text hidden by default.
-                    $this->element('dt', null, _('Aliases'));
-                    $this->element('dd', 'aliases', implode(' ', $aliases));
-                    $this->elementEnd('dl');
-                }
-            }
-
-            Event::handle('EndGroupProfileElements', array($this, $this->group));
-        }
-
-        $this->elementEnd('div');
-    }
-
-    function showGroupActions()
-    {
-        $cur = common_current_user();
-        $this->elementStart('div', 'entity_actions');
-        // TRANS: Group actions header (h2). Text hidden by default.
-        $this->element('h2', null, _('Group actions'));
-        $this->elementStart('ul');
-        if (Event::handle('StartGroupActionsList', array($this, $this->group))) {
-            $this->elementStart('li', 'entity_subscribe');
-            if (Event::handle('StartGroupSubscribe', array($this, $this->group))) {
-                if ($cur) {
-                    if ($cur->isMember($this->group)) {
-                        $lf = new LeaveForm($this, $this->group);
-                        $lf->show();
-                    } else if (!Group_block::isBlocked($this->group, $cur->getProfile())) {
-                        $jf = new JoinForm($this, $this->group);
-                        $jf->show();
-                    }
-                }
-                Event::handle('EndGroupSubscribe', array($this, $this->group));
-            }
-            $this->elementEnd('li');
-            if ($cur && $cur->hasRight(Right::DELETEGROUP)) {
-                $this->elementStart('li', 'entity_delete');
-                $df = new DeleteGroupForm($this, $this->group);
-                $df->show();
-                $this->elementEnd('li');
-            }
-            Event::handle('EndGroupActionsList', array($this, $this->group));
-        }
-        $this->elementEnd('ul');
-        $this->elementEnd('div');
-    }
-
     /**
      * Get a list of the feeds for this page
      *
diff --git a/lib/groupprofileblock.php b/lib/groupprofileblock.php
index 8d2686085f..32526b0458 100644
--- a/lib/groupprofileblock.php
+++ b/lib/groupprofileblock.php
@@ -58,7 +58,7 @@ class GroupProfileBlock extends ProfileBlock
     function avatar()
     {
         return ($this->group->homepage_logo) ?
-          $this->group->homepage_logo : User_group::defaultLogo(AVATAR_PROFILE_SIZE);
+            $this->group->homepage_logo : User_group::defaultLogo(AVATAR_PROFILE_SIZE);
     }
 
     function name()
@@ -101,4 +101,38 @@ class GroupProfileBlock extends ProfileBlock
     {
         return $this->group->description;
     }
+
+    function showActions()
+    {
+        $cur = common_current_user();
+        $this->out->elementStart('div', 'entity_actions');
+        // TRANS: Group actions header (h2). Text hidden by default.
+        $this->out->element('h2', null, _('Group actions'));
+        $this->out->elementStart('ul');
+        if (Event::handle('StartGroupActionsList', array($this, $this->group))) {
+            $this->out->elementStart('li', 'entity_subscribe');
+            if (Event::handle('StartGroupSubscribe', array($this, $this->group))) {
+                if ($cur) {
+                    if ($cur->isMember($this->group)) {
+                        $lf = new LeaveForm($this->out, $this->group);
+                        $lf->show();
+                    } else if (!Group_block::isBlocked($this->group, $cur->getProfile())) {
+                        $jf = new JoinForm($this->out, $this->group);
+                        $jf->show();
+                    }
+                }
+                Event::handle('EndGroupSubscribe', array($this, $this->group));
+            }
+            $this->out->elementEnd('li');
+            if ($cur && $cur->hasRight(Right::DELETEGROUP)) {
+                $this->out->elementStart('li', 'entity_delete');
+                $df = new DeleteGroupForm($this->out, $this->group);
+                $df->show();
+                $this->out->elementEnd('li');
+            }
+            Event::handle('EndGroupActionsList', array($this, $this->group));
+        }
+        $this->out->elementEnd('ul');
+        $this->out->elementEnd('div');
+    }
 }

From 07d9cca0040e8124ed7c5c35965c76932aed3272 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Mon, 14 Mar 2011 16:55:55 -0400
Subject: [PATCH 617/655] fix bug with undefined variable

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

diff --git a/lib/accountprofileblock.php b/lib/accountprofileblock.php
index e75527b288..f31503353d 100644
--- a/lib/accountprofileblock.php
+++ b/lib/accountprofileblock.php
@@ -81,7 +81,7 @@ class AccountProfileBlock extends ProfileBlock
     function canEdit()
     {
         $user = common_current_user();
-        return ((!empty($user)) && ($user->id == $profile->id));
+        return ((!empty($user)) && ($user->id == $this->profile->id));
     }
 
     function editUrl()

From 410ca34ce992814cce1f8becd7076481bedbf141 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Wed, 16 Mar 2011 09:59:36 -0400
Subject: [PATCH 618/655] remove edit link from profileblock

---
 lib/accountprofileblock.php | 16 ----------------
 lib/defaultprofileblock.php |  5 -----
 lib/groupprofileblock.php   | 16 ----------------
 lib/profileblock.php        |  8 --------
 4 files changed, 45 deletions(-)

diff --git a/lib/accountprofileblock.php b/lib/accountprofileblock.php
index f31503353d..ea6e27ac76 100644
--- a/lib/accountprofileblock.php
+++ b/lib/accountprofileblock.php
@@ -78,22 +78,6 @@ class AccountProfileBlock extends ProfileBlock
         return $this->profile->profileurl;
     }
 
-    function canEdit()
-    {
-        $user = common_current_user();
-        return ((!empty($user)) && ($user->id == $this->profile->id));
-    }
-
-    function editUrl()
-    {
-        return common_local_url('profilesettings');
-    }
-
-    function editText()
-    {
-        return _('Edit');
-    }
-
     function location()
     {
         return $this->profile->location;
diff --git a/lib/defaultprofileblock.php b/lib/defaultprofileblock.php
index 18eff49432..b8af14ac21 100644
--- a/lib/defaultprofileblock.php
+++ b/lib/defaultprofileblock.php
@@ -72,11 +72,6 @@ class DefaultProfileBlock extends AccountProfileBlock
             Avatar::defaultImage(AVATAR_STREAM_SIZE);
     }
 
-    function canEdit()
-    {
-        return true;
-    }
-
     function location()
     {
         return null;
diff --git a/lib/groupprofileblock.php b/lib/groupprofileblock.php
index 32526b0458..9df541e343 100644
--- a/lib/groupprofileblock.php
+++ b/lib/groupprofileblock.php
@@ -71,22 +71,6 @@ class GroupProfileBlock extends ProfileBlock
         return $this->group->mainpage;
     }
 
-    function canEdit()
-    {
-        $user = common_current_user();
-        return ((!empty($user)) && ($user->isAdmin($this->group)));
-    }
-
-    function editUrl()
-    {
-        return common_local_url('editgroup', array('nickname' => $this->group->nickname));
-    }
-
-    function editText()
-    {
-        return _('Edit');
-    }
-
     function location()
     {
         return $this->group->location;
diff --git a/lib/profileblock.php b/lib/profileblock.php
index 7fcc11ef1a..716149dfeb 100644
--- a/lib/profileblock.php
+++ b/lib/profileblock.php
@@ -50,9 +50,6 @@ abstract class ProfileBlock extends Widget
     abstract function avatar();
     abstract function name();
     abstract function url();
-    abstract function canEdit();
-    abstract function editUrl();
-    abstract function editText();
     abstract function location();
     abstract function homepage();
     abstract function description();
@@ -69,11 +66,6 @@ abstract class ProfileBlock extends Widget
                                          'width' => $size,
                                          'height' => $size));
 
-        if ($this->canEdit()) {
-            $this->out->element('a', array('href' => $this->editUrl()),
-                                $this->editText());
-        }
-
         $name = $this->name();
 
         if (!empty($name)) {

From 519bbfb2e973169e52d6802fdca7f49930d2dabb Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Wed, 16 Mar 2011 10:03:28 -0400
Subject: [PATCH 619/655] use <p> to keep stuff in profile block from bunching

---
 lib/profileblock.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/profileblock.php b/lib/profileblock.php
index 716149dfeb..dca0814437 100644
--- a/lib/profileblock.php
+++ b/lib/profileblock.php
@@ -69,19 +69,21 @@ abstract class ProfileBlock extends Widget
         $name = $this->name();
 
         if (!empty($name)) {
+            $this->out->elementStart('p', 'profile_block_name');
             $url = $this->url();
             if (!empty($url)) {
                 $this->out->element('a', array('href' => $url),
                                     $name);
             } else {
-                $this->out->element('span', 'profile_block_name', $name);
+                $this->out->text($name);
             }
+            $this->out->elementEnd('p');
         }
 
         $location = $this->location();
 
         if (!empty($location)) {
-            $this->out->element('span', 'profile_block_location', $location);
+            $this->out->element('p', 'profile_block_location', $location);
         }
 
         $homepage = $this->homepage();

From 9b4533058cc7aaccff62ec8d4b073bf270a2bf21 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Wed, 16 Mar 2011 10:05:07 -0400
Subject: [PATCH 620/655] no profileblock on login actions

---
 actions/login.php              | 4 ++++
 actions/register.php           | 4 ++++
 plugins/OpenID/openidlogin.php | 4 ++++
 3 files changed, 12 insertions(+)

diff --git a/actions/login.php b/actions/login.php
index 547374a12e..7ec9c32139 100644
--- a/actions/login.php
+++ b/actions/login.php
@@ -301,4 +301,8 @@ class LoginAction extends Action
     function showNoticeForm()
     {
     }
+
+    function showProfileBlock()
+    {
+    }
 }
diff --git a/actions/register.php b/actions/register.php
index d0dbceeb81..1bcd3edc17 100644
--- a/actions/register.php
+++ b/actions/register.php
@@ -610,4 +610,8 @@ class RegisterAction extends Action
     function showNoticeForm()
     {
     }
+
+    function showProfileBlock()
+    {
+    }
 }
diff --git a/plugins/OpenID/openidlogin.php b/plugins/OpenID/openidlogin.php
index 850b68e63a..918a79ccd1 100644
--- a/plugins/OpenID/openidlogin.php
+++ b/plugins/OpenID/openidlogin.php
@@ -178,4 +178,8 @@ class OpenidloginAction extends Action
     function showNoticeForm()
     {
     }
+
+    function showProfileBlock()
+    {
+    }
 }

From 32aa061c17d04658bd8780914dad4ba7b3851365 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Wed, 16 Mar 2011 10:16:29 -0400
Subject: [PATCH 621/655] remove debugging code for microapp

---
 lib/microappplugin.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/lib/microappplugin.php b/lib/microappplugin.php
index 86803b8ae3..ab6d565157 100644
--- a/lib/microappplugin.php
+++ b/lib/microappplugin.php
@@ -525,8 +525,6 @@ abstract class MicroAppPlugin extends Plugin
 
     function onStartMakeEntryForm($tag, $out, &$form)
     {
-        $this->log(LOG_INFO, "onStartMakeEntryForm() called for tag '$tag'");
-
         if ($tag == $this->tag()) {
             $form = $this->entryForm($out);
             return false;

From c99f6f6afcc2667467d0e1140f634bbc3bd4a7de Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Wed, 16 Mar 2011 10:26:14 -0400
Subject: [PATCH 622/655] remove a bunch of common_debug() calls for url
 shortening

---
 lib/util.php | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/lib/util.php b/lib/util.php
index 9f84e3120a..536fff4dec 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -1031,19 +1031,13 @@ function common_linkify($url) {
  */
 function common_shorten_links($text, $always = false, User $user=null)
 {
-    common_debug("common_shorten_links() called");
-
     $user = common_current_user();
 
     $maxLength = User_urlshortener_prefs::maxNoticeLength($user);
 
-    common_debug("maxLength = $maxLength");
-
     if ($always || mb_strlen($text) > $maxLength) {
-        common_debug("Forcing shortening");
         return common_replace_urls_callback($text, array('File_redirection', 'forceShort'), $user);
     } else {
-        common_debug("Not forcing shortening");
         return common_replace_urls_callback($text, array('File_redirection', 'makeShort'), $user);
     }
 }
@@ -2066,27 +2060,21 @@ function common_database_tablename($tablename)
  */
 function common_shorten_url($long_url, User $user=null, $force = false)
 {
-    common_debug("Shortening URL '$long_url' (force = $force)");
-
     $long_url = trim($long_url);
 
     $user = common_current_user();
 
     $maxUrlLength = User_urlshortener_prefs::maxUrlLength($user);
-    common_debug("maxUrlLength = $maxUrlLength");
 
     // $force forces shortening even if it's not strictly needed
     // I doubt URL shortening is ever 'strictly' needed. - ESP
 
     if (mb_strlen($long_url) < $maxUrlLength && !$force) {
-        common_debug("Skipped shortening URL.");
         return $long_url;
     }
 
     $shortenerName = User_urlshortener_prefs::urlShorteningService($user);
 
-    common_debug("Shortener name = '$shortenerName'");
-
     if (Event::handle('StartShortenUrl', 
                       array($long_url, $shortenerName, &$shortenedUrl))) {
         if ($shortenerName == 'internal') {

From 0666c6f8b269c5e73d0d4f33824a5cbf110ffe29 Mon Sep 17 00:00:00 2001
From: Samantha Doherty <sammy@status.net>
Date: Wed, 16 Mar 2011 13:05:55 -0400
Subject: [PATCH 623/655] Fix for education description fields in extended
 profile.

---
 plugins/ExtendedProfile/css/profiledetail.css     | 1 +
 plugins/ExtendedProfile/extendedprofilewidget.php | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/ExtendedProfile/css/profiledetail.css b/plugins/ExtendedProfile/css/profiledetail.css
index 3af9bcba4a..7de7e88ff5 100644
--- a/plugins/ExtendedProfile/css/profiledetail.css
+++ b/plugins/ExtendedProfile/css/profiledetail.css
@@ -55,6 +55,7 @@
     float: left;
     padding-top: 2px;
     padding-bottom: 2px;
+    max-width: 350px;
 }
 
 #profiledetailsettings #content table.extended-profile td {
diff --git a/plugins/ExtendedProfile/extendedprofilewidget.php b/plugins/ExtendedProfile/extendedprofilewidget.php
index 1ef6440ed6..80d88a9599 100644
--- a/plugins/ExtendedProfile/extendedprofilewidget.php
+++ b/plugins/ExtendedProfile/extendedprofilewidget.php
@@ -442,7 +442,6 @@ class ExtendedProfileWidget extends Form
         );
 
         $this->out->element('div', 'label', _m('Description'));
-        $this->out->element('div', 'field', $field['description']);
 
         $this->out->textarea(
             $id . '-description',

From 3692a0909534009659f722f429815ecc0398c56c Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Wed, 16 Mar 2011 10:30:57 -0700
Subject: [PATCH 624/655] Extended profile - add nav link to new profile block

---
 lib/accountprofileblock.php                   | 33 ++++++++++---------
 .../ExtendedProfile/ExtendedProfilePlugin.php | 15 ++-------
 .../profiledetailsettingsaction.php           |  2 --
 3 files changed, 20 insertions(+), 30 deletions(-)

diff --git a/lib/accountprofileblock.php b/lib/accountprofileblock.php
index ea6e27ac76..a8bdb4715b 100644
--- a/lib/accountprofileblock.php
+++ b/lib/accountprofileblock.php
@@ -4,7 +4,7 @@
  * Copyright (C) 2011, StatusNet, Inc.
  *
  * Profile block to show for an account
- * 
+ *
  * PHP version 5
  *
  * This program is free software: you can redistribute it and/or modify
@@ -63,8 +63,8 @@ class AccountProfileBlock extends ProfileBlock
         if (empty($avatar)) {
             $avatar = $this->profile->getAvatar(73);
         }
-        return (!empty($avatar)) ? 
-            $avatar->displayUrl() : 
+        return (!empty($avatar)) ?
+            $avatar->displayUrl() :
             Avatar::defaultImage(AVATAR_PROFILE_SIZE);
     }
 
@@ -95,21 +95,22 @@ class AccountProfileBlock extends ProfileBlock
 
     function showActions()
     {
-        if ($this->profile->hasRole(Profile_role::DELETED)) {
-            $this->out->elementStart('div', 'entity_actions');
-            // TRANS: H2 for user actions in a profile.
-            $this->out->element('h2', null, _('User actions'));
-            $this->out->elementStart('ul');
-            $this->out->elementStart('p', array('class' => 'profile_deleted'));
-            // TRANS: Text shown in user profile of not yet compeltely deleted users.
-            $this->out->text(_('User deletion in progress...'));
-            $this->out->elementEnd('p');
-            $this->out->elementEnd('ul');
-            $this->out->elementEnd('div');
-            return;
-        }
         if (Event::handle('StartProfilePageActionsSection', array($this->out, $this->profile))) {
 
+            if ($this->profile->hasRole(Profile_role::DELETED)) {
+                $this->out->elementStart('div', 'entity_actions');
+                // TRANS: H2 for user actions in a profile.
+                $this->out->element('h2', null, _('User actions'));
+                $this->out->elementStart('ul');
+                $this->out->elementStart('p', array('class' => 'profile_deleted'));
+                // TRANS: Text shown in user profile of not yet compeltely deleted users.
+                $this->out->text(_('User deletion in progress...'));
+                $this->out->elementEnd('p');
+                $this->out->elementEnd('ul');
+                $this->out->elementEnd('div');
+                return;
+            }
+
             $cur = common_current_user();
 
             $this->out->elementStart('div', 'entity_actions');
diff --git a/plugins/ExtendedProfile/ExtendedProfilePlugin.php b/plugins/ExtendedProfile/ExtendedProfilePlugin.php
index d1572ce9fd..b69c65df1f 100644
--- a/plugins/ExtendedProfile/ExtendedProfilePlugin.php
+++ b/plugins/ExtendedProfile/ExtendedProfilePlugin.php
@@ -34,7 +34,7 @@ class ExtendedProfilePlugin extends Plugin
     {
         $versions[] = array('name' => 'ExtendedProfile',
                             'version' => STATUSNET_VERSION,
-                            'author' => 'Brion Vibber',
+                            'author' => 'Brion Vibber, Zach Copley',
                             'homepage' => 'http://status.net/wiki/Plugin:ExtendedProfile',
                             'rawdescription' =>
                             _m('UI extensions for additional profile fields.'));
@@ -110,22 +110,13 @@ class ExtendedProfilePlugin extends Plugin
         return true;
     }
 
-    function onEndAccountSettingsProfileMenuItem($widget, $menu)
-    {
-        // TRANS: Link title attribute in user account settings menu.
-        $title = _('Change additional profile settings');
-        // TRANS: Link description in user account settings menu.
-        $widget->showMenuItem('profiledetailsettings',_m('Details'),$title);
-        return true;
-    }
-
-    function onEndProfilePageProfileElements(HTMLOutputter $out, Profile $profile) {
+    function onStartProfilePageActionsSection(HTMLOutputter $out, Profile $profile) {
         $user = User::staticGet('id', $profile->id);
         if ($user) {
             $url = common_local_url('profiledetail', array('nickname' => $user->nickname));
             $out->element('a', array('href' => $url), _m('More details...'));
         }
-        return;
+        return true;
     }
 
 }
diff --git a/plugins/ExtendedProfile/profiledetailsettingsaction.php b/plugins/ExtendedProfile/profiledetailsettingsaction.php
index 7b03f247ed..4d716ec32c 100644
--- a/plugins/ExtendedProfile/profiledetailsettingsaction.php
+++ b/plugins/ExtendedProfile/profiledetailsettingsaction.php
@@ -44,14 +44,12 @@ class ProfileDetailSettingsAction extends ProfileSettingsAction
     function showStylesheets() {
         parent::showStylesheets();
         $this->cssLink('plugins/ExtendedProfile/css/profiledetail.css');
-        $this->cssLink('http://ajax.googleapis.com/ajax/libs/jqueryui/1.8/themes/base/jquery-ui.css');
         return true;
     }
 
     function  showScripts() {
         parent::showScripts();
         $this->script('plugins/ExtendedProfile/js/profiledetail.js');
-        $this->script('http://ajax.googleapis.com/ajax/libs/jqueryui/1.8/jquery-ui.min.js');
         return true;
     }
 

From 5e40450efd6e17cd27c07d5a009d95044f01744e Mon Sep 17 00:00:00 2001
From: Samantha Doherty <sammy@status.net>
Date: Wed, 16 Mar 2011 13:50:24 -0400
Subject: [PATCH 625/655] Quick style update for profile blocks.

---
 lib/profileblock.php                          |  2 +-
 .../ExtendedProfile/ExtendedProfilePlugin.php |  2 +-
 theme/neo/css/display.css                     | 27 +++++++++++++++++++
 3 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/lib/profileblock.php b/lib/profileblock.php
index dca0814437..19e5a386ba 100644
--- a/lib/profileblock.php
+++ b/lib/profileblock.php
@@ -56,7 +56,7 @@ abstract class ProfileBlock extends Widget
 
     function show()
     {
-        $this->out->elementStart('div', 'profile_block');
+        $this->out->elementStart('div', 'profile_block section');
 
         $size = $this->avatarSize();
 
diff --git a/plugins/ExtendedProfile/ExtendedProfilePlugin.php b/plugins/ExtendedProfile/ExtendedProfilePlugin.php
index b69c65df1f..127c91a543 100644
--- a/plugins/ExtendedProfile/ExtendedProfilePlugin.php
+++ b/plugins/ExtendedProfile/ExtendedProfilePlugin.php
@@ -114,7 +114,7 @@ class ExtendedProfilePlugin extends Plugin
         $user = User::staticGet('id', $profile->id);
         if ($user) {
             $url = common_local_url('profiledetail', array('nickname' => $user->nickname));
-            $out->element('a', array('href' => $url), _m('More details...'));
+            $out->element('a', array('href' => $url, 'class' => 'profiledetail'), _m('More details...'));
         }
         return true;
     }
diff --git a/theme/neo/css/display.css b/theme/neo/css/display.css
index 7cb5e11911..92da5977ef 100644
--- a/theme/neo/css/display.css
+++ b/theme/neo/css/display.css
@@ -413,6 +413,33 @@ address {
     text-transform: uppercase;
 }
 
+.profile_block_name {
+    font-size: 14px;
+    font-weight: bold;
+}
+
+.profile_block_location {
+    font-weight: bold;
+}
+
+.profile_block_description {
+    line-height: 1.2em;
+}
+
+.profile_block .entity_actions {
+    float: left;
+    margin-left: 0px;
+}
+
+.profile_block .entity_moderation:hover ul,
+.profile_block .entity_role:hover ul {
+    left: 20px;
+}
+
+.profile_block a.profiledetail {
+    display: block;
+}
+
 .section ul.entities {
     width: 220px;
 }

From 405dae87b12d3177a628172c1e91295c09cbb505 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Wed, 16 Mar 2011 10:58:13 -0700
Subject: [PATCH 626/655] Extended profile - fix for unix epoc getting
 displayed for empty birthday and some validation issues

---
 .../ExtendedProfile/extendedprofilewidget.php | 44 ++++++++++---------
 .../profiledetailsettingsaction.php           |  3 +-
 2 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/plugins/ExtendedProfile/extendedprofilewidget.php b/plugins/ExtendedProfile/extendedprofilewidget.php
index 80d88a9599..b507713f06 100644
--- a/plugins/ExtendedProfile/extendedprofilewidget.php
+++ b/plugins/ExtendedProfile/extendedprofilewidget.php
@@ -395,25 +395,28 @@ class ExtendedProfileWidget extends Form
     {
         $this->out->elementStart('div', 'education-item');
         $this->out->element('div', 'label', _m('Institution'));
-        $this->out->element('div', 'field', $field['school']);
-        $this->out->element('div', 'label', _m('Degree'));
-        $this->out->element('div', 'field', $field['degree']);
-        $this->out->element('div', 'label', _m('Description'));
-        $this->out->element('div', 'field', $field['description']);
-        $this->out->element('div', 'label', _m('Start'));
-        $this->out->element(
-            'div',
-            array('class' => 'field date'),
-            date('j M Y', strtotime($field['start'])
-            )
-        );
-        $this->out->element('div', 'label', _m('End'));
-        $this->out->element(
-            'div',
-            array('class' => 'field date'),
-            date('j M Y', strtotime($field['end'])
-            )
-        );
+        if (!empty($field['school'])) {
+
+            $this->out->element('div', 'field', $field['school']);
+            $this->out->element('div', 'label', _m('Degree'));
+            $this->out->element('div', 'field', $field['degree']);
+            $this->out->element('div', 'label', _m('Description'));
+            $this->out->element('div', 'field', $field['description']);
+            $this->out->element('div', 'label', _m('Start'));
+            $this->out->element(
+                'div',
+                array('class' => 'field date'),
+                date('j M Y', strtotime($field['start'])
+                )
+            );
+            $this->out->element('div', 'label', _m('End'));
+            $this->out->element(
+                'div',
+                array('class' => 'field date'),
+                date('j M Y', strtotime($field['end'])
+                )
+            );
+        }
         $this->out->elementEnd('div');
     }
 
@@ -564,10 +567,11 @@ class ExtendedProfileWidget extends Form
             $out->input($id, null, $this->ext->getTextValue($name));
             break;
         case 'date':
+            $value = $this->ext->getDateValue($name);
             $out->input(
                 $id,
                 null,
-                date('j M Y', strtotime($this->ext->getDateValue($name)))
+                empty($value) ? null : date('j M Y', strtotime($value))
             );
             break;
         case 'person':
diff --git a/plugins/ExtendedProfile/profiledetailsettingsaction.php b/plugins/ExtendedProfile/profiledetailsettingsaction.php
index 4d716ec32c..4a2045cefb 100644
--- a/plugins/ExtendedProfile/profiledetailsettingsaction.php
+++ b/plugins/ExtendedProfile/profiledetailsettingsaction.php
@@ -260,8 +260,7 @@ class ProfileDetailSettingsAction extends ProfileSettingsAction
         $this->removeAll($user, 'website');
         $i = 0;
         foreach($sites as $site) {
-
-            if (!Validate::uri(
+            if (!empty($site['value']) && !Validate::uri(
                 $site['value'],
                 array('allowed_schemes' => array('http', 'https')))
             ) {

From 5ec018ca19407e34ecd8ba9909731503b1aee51c Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Wed, 16 Mar 2011 10:58:18 -0700
Subject: [PATCH 627/655] Fix tag nesting bug on group page

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

diff --git a/actions/showgroup.php b/actions/showgroup.php
index b198352cb0..aa1f620880 100644
--- a/actions/showgroup.php
+++ b/actions/showgroup.php
@@ -323,7 +323,7 @@ class ShowgroupAction extends GroupDesignAction
         // TRANS: Header for group statistics on a group page (h2).
         $this->element('h2', null, _('Statistics'));
 
-        $this->elementEnd('dl');
+        $this->elementStart('dl');
         $this->element('dt', null, _m('LABEL','Created'));
         $this->element('dd', 'entity_created', date('j M Y',
                                                  strtotime($this->group->created)));

From a81a599d8afb5143e4268eb4f658ef6731c7b18a Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Wed, 16 Mar 2011 11:11:06 -0700
Subject: [PATCH 628/655] MESSAGES_PER_PAGE constant missing (merge error?)

---
 lib/framework.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/framework.php b/lib/framework.php
index 350a1c268d..da96c8e1d4 100644
--- a/lib/framework.php
+++ b/lib/framework.php
@@ -33,6 +33,7 @@ define('AVATAR_MINI_SIZE', 24);
 
 define('NOTICES_PER_PAGE', 20);
 define('PROFILES_PER_PAGE', 20);
+define('MESSAGES_PER_PAGE', 20);
 
 define('FOREIGN_NOTICE_SEND', 1);
 define('FOREIGN_NOTICE_RECV', 2);

From 9966c51625766b16cc673d3eb630017f5c975382 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Wed, 16 Mar 2011 14:55:19 -0400
Subject: [PATCH 629/655] use Y,N,? instead of 1,0,null for 3vl in RSVPs

---
 plugins/Event/RSVP.php           | 31 ++++++++++++++++++-------------
 plugins/Event/cancelrsvpform.php |  2 +-
 plugins/Event/newrsvp.php        | 25 +++++++++++++++++--------
 plugins/Event/rsvpform.php       | 18 +++++++++++++++---
 4 files changed, 51 insertions(+), 25 deletions(-)

diff --git a/plugins/Event/RSVP.php b/plugins/Event/RSVP.php
index dc7166b9ce..8bb2d2855d 100644
--- a/plugins/Event/RSVP.php
+++ b/plugins/Event/RSVP.php
@@ -54,7 +54,7 @@ class RSVP extends Managed_DataObject
     public $uri;               // varchar(255)
     public $profile_id;        // int
     public $event_id;          // varchar(36) UUID
-    public $result;            // tinyint
+    public $response;            // tinyint
     public $created;           // datetime
 
     /**
@@ -119,8 +119,9 @@ class RSVP extends Managed_DataObject
                               'length' => 36,
                               'not null' => true,
                               'description' => 'UUID'),
-                'result' => array('type' => 'tinyint',
-                                  'description' => '1, 0, or null for three-state yes, no, maybe'),
+                'response' => array('type' => 'char',
+                                  'length' => '1',
+                                  'description' => 'Y, N, or ? for three-state yes, no, maybe'),
                 'created' => array('type' => 'datetime',
                                    'not null' => true),
             ),
@@ -135,8 +136,10 @@ class RSVP extends Managed_DataObject
         );
     }
 
-    function saveNew($profile, $event, $result, $options=array())
+    function saveNew($profile, $event, $verb, $options=array())
     {
+        common_debug("RSVP::saveNew({$profile->id}, {$event->id}, '$verb', 'some options');");
+
         if (array_key_exists('uri', $options)) {
             $other = RSVP::staticGet('uri', $options['uri']);
             if (!empty($other)) {
@@ -156,7 +159,7 @@ class RSVP extends Managed_DataObject
         $rsvp->id          = UUID::gen();
         $rsvp->profile_id  = $profile->id;
         $rsvp->event_id    = $event->id;
-        $rsvp->result      = self::codeFor($result);
+        $rsvp->response      = self::codeFor($verb);
 
         if (array_key_exists('created', $options)) {
             $rsvp->created = $options['created'];
@@ -176,13 +179,13 @@ class RSVP extends Managed_DataObject
         // XXX: come up with something sexier
 
         $content = sprintf(_('RSVPed %s for an event.'),
-                           ($result == RSVP::POSITIVE) ? _('positively') :
-                           ($result == RSVP::NEGATIVE) ? _('negatively') :
+                           ($verb == RSVP::POSITIVE) ? _('positively') :
+                           ($verb == RSVP::NEGATIVE) ? _('negatively') :
                            _('possibly'));
         
         $rendered = $content;
 
-        $options = array_merge(array('object_type' => $result),
+        $options = array_merge(array('object_type' => $verb),
                                $options);
 
         if (!array_key_exists('uri', $options)) {
@@ -206,14 +209,16 @@ class RSVP extends Managed_DataObject
 
     function codeFor($verb)
     {
-        return ($verb == RSVP::POSITIVE) ? 1 :
-            ($verb == RSVP::NEGATIVE) ? 0 : null;
+        return ($verb == RSVP::POSITIVE) ? 'Y' :
+            ($verb == RSVP::NEGATIVE) ? 'N' :
+            ($verb == RSVP::POSSIBLE) ? '?' : null;
     }
 
     static function verbFor($code)
     {
-        return ($code == 1) ? RSVP::POSITIVE :
-            ($code == 0) ? RSVP::NEGATIVE : null;
+        return ($code == 'Y') ? RSVP::POSITIVE :
+            ($code == 'N') ? RSVP::NEGATIVE :
+            ($code == '?') ? RSVP::POSSIBLE : null;
     }
 
     function getNotice()
@@ -242,7 +247,7 @@ class RSVP extends Managed_DataObject
 
         if ($rsvp->find()) {
             while ($rsvp->fetch()) {
-                $verb = self::verbFor($rsvp->result);
+                $verb = self::verbFor($rsvp->response);
                 $rsvps[$verb][] = clone($rsvp);
             }
         }
diff --git a/plugins/Event/cancelrsvpform.php b/plugins/Event/cancelrsvpform.php
index 8cccbdb661..955a782e62 100644
--- a/plugins/Event/cancelrsvpform.php
+++ b/plugins/Event/cancelrsvpform.php
@@ -100,7 +100,7 @@ class CancelRSVPForm extends Form
 
         $this->out->hidden('rsvp', $this->rsvp->id);
 
-        switch (RSVP::verbFor($this->rsvp->result)) {
+        switch (RSVP::verbFor($this->rsvp->response)) {
         case RSVP::POSITIVE:
             $this->out->text(_('You will attend this event.'));
             break;
diff --git a/plugins/Event/newrsvp.php b/plugins/Event/newrsvp.php
index 4bacd129f4..2b28580b1d 100644
--- a/plugins/Event/newrsvp.php
+++ b/plugins/Event/newrsvp.php
@@ -48,7 +48,7 @@ class NewrsvpAction extends Action
 {
     protected $user  = null;
     protected $event = null;
-    protected $type  = null;
+    protected $verb  = null;
 
     /**
      * Returns the title of the action
@@ -94,13 +94,22 @@ class NewrsvpAction extends Action
             throw new ClientException(_('You must be logged in to RSVP for an event.'));
         }
 
-        if ($this->arg('yes')) {
-            $this->type = RSVP::POSITIVE;
-        } else if ($this->arg('no')) {
-            $this->type = RSVP::NEGATIVE;
-        } else {
-            $this->type = RSVP::POSSIBLE;
+        common_debug(print_r($this->args, true));
+
+        switch (strtolower($this->trimmed('submitvalue'))) {
+        case 'yes':
+            $this->verb = RSVP::POSITIVE;
+            break;
+        case 'no':
+            $this->verb = RSVP::NEGATIVE;
+            break;
+        case 'maybe':
+            $this->verb = RSVP::POSSIBLE;
+            break;
+        default:
+            throw new ClientException('Unknown submit value.');
         }
+
         return true;
     }
 
@@ -136,7 +145,7 @@ class NewrsvpAction extends Action
         try {
             $saved = RSVP::saveNew($this->user->getProfile(),
                                    $this->event,
-                                   $this->type);
+                                   $this->verb);
         } catch (ClientException $ce) {
             $this->error = $ce->getMessage();
             $this->showPage();
diff --git a/plugins/Event/rsvpform.php b/plugins/Event/rsvpform.php
index ad30f6a36e..acc8cd8d12 100644
--- a/plugins/Event/rsvpform.php
+++ b/plugins/Event/rsvpform.php
@@ -101,6 +101,7 @@ class RSVPForm extends Form
         $this->out->text(_('RSVP: '));
 
         $this->out->hidden('event', $this->event->id);
+        $this->out->hidden('submitvalue', '');
 
         $this->out->elementEnd('fieldset');
     }
@@ -113,8 +114,19 @@ class RSVPForm extends Form
 
     function formActions()
     {
-        $this->out->submit('yes', _m('BUTTON', 'Yes'));
-        $this->out->submit('no', _m('BUTTON', 'No'));
-        $this->out->submit('maybe', _m('BUTTON', 'Maybe'));
+        $this->submitButton('yes', _m('BUTTON', 'Yes'));
+        $this->submitButton('no', _m('BUTTON', 'No'));
+        $this->submitButton('maybe', _m('BUTTON', 'Maybe'));
+    }
+    
+    function submitButton($id, $label)
+    {
+        $this->out->element('input', array('type' => 'submit',
+                                           'id' => $id,
+                                           'name' => $id,
+                                           'class' => 'submit',
+                                           'value' => $label,
+                                           'title' => $label,
+                                           'onClick' => 'this.form.submitvalue.value = this.name; return true;'));
     }
 }

From 47cd5f311cebb25335d986faff52f363f7320184 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Wed, 16 Mar 2011 15:22:15 -0400
Subject: [PATCH 630/655] my code-to-verb logic was ab0rken; fixed

---
 plugins/Event/RSVP.php | 34 ++++++++++++++++++++++++++++------
 1 file changed, 28 insertions(+), 6 deletions(-)

diff --git a/plugins/Event/RSVP.php b/plugins/Event/RSVP.php
index 8bb2d2855d..fad87aabc8 100644
--- a/plugins/Event/RSVP.php
+++ b/plugins/Event/RSVP.php
@@ -161,6 +161,8 @@ class RSVP extends Managed_DataObject
         $rsvp->event_id    = $event->id;
         $rsvp->response      = self::codeFor($verb);
 
+        common_debug("Got value {$rsvp->response} for verb {$verb}");
+
         if (array_key_exists('created', $options)) {
             $rsvp->created = $options['created'];
         } else {
@@ -209,16 +211,36 @@ class RSVP extends Managed_DataObject
 
     function codeFor($verb)
     {
-        return ($verb == RSVP::POSITIVE) ? 'Y' :
-            ($verb == RSVP::NEGATIVE) ? 'N' :
-            ($verb == RSVP::POSSIBLE) ? '?' : null;
+        switch ($verb) {
+        case RSVP::POSITIVE:
+            return 'Y';
+            break;
+        case RSVP::NEGATIVE:
+            return 'N';
+            break;
+        case RSVP::POSSIBLE:
+            return '?';
+            break;
+        default:
+            throw new Exception("Unknown verb {$verb}");
+        }
     }
 
     static function verbFor($code)
     {
-        return ($code == 'Y') ? RSVP::POSITIVE :
-            ($code == 'N') ? RSVP::NEGATIVE :
-            ($code == '?') ? RSVP::POSSIBLE : null;
+        switch ($code) {
+        case 'Y':
+            return RSVP::POSITIVE;
+            break;
+        case 'N':
+            return RSVP::NEGATIVE;
+            break;
+        case '?':
+            return RSVP::POSSIBLE;
+            break;
+        default:
+            throw new Exception("Unknown code {$code}");
+        }
     }
 
     function getNotice()

From c211b1a38ee88e94f35465c001e5739480360d50 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Wed, 16 Mar 2011 12:28:26 -0700
Subject: [PATCH 631/655] Work in progress: adding link for managing tag
 subscriptions. Needs the action still to be functional.

---
 plugins/TagSub/TagSubPlugin.php | 56 +++++++++++++++++++++++++++++++++
 1 file changed, 56 insertions(+)

diff --git a/plugins/TagSub/TagSubPlugin.php b/plugins/TagSub/TagSubPlugin.php
index e51a7a8b39..e3c11ac1ef 100644
--- a/plugins/TagSub/TagSubPlugin.php
+++ b/plugins/TagSub/TagSubPlugin.php
@@ -179,4 +179,60 @@ class TagSubPlugin extends Plugin
         }
         return true;
     }
+
+    /**
+     * Menu item for personal subscriptions/groups area
+     *
+     * @param Widget $widget Widget being executed
+     *
+     * @return boolean hook return
+     */
+
+    function onEndSubGroupNav($widget)
+    {
+        $action = $widget->out;
+        $action_name = $action->trimmed('action');
+
+        $widget->item('tagsubs',
+                      array(),
+                      // TRANS: SubMirror plugin menu item on user settings page.
+                      _m('MENU', 'Tags'),
+                      // TRANS: SubMirror plugin tooltip for user settings menu item.
+                      _m('Configure tag subscriptions'));
+
+        return true;
+    }
+
+    /**
+     * Add a count of mirrored feeds into a user's profile sidebar stats.
+     *
+     * @param Profile $profile
+     * @param array $stats
+     * @return boolean hook return value
+     */
+    function onProfileStats($profile, &$stats)
+    {
+        $cur = common_current_user();
+        if (!empty($cur) && $cur->id == $profile->id) {
+            $tagsub = new TagSub();
+            $tagsub->profile_id = $profile->id;
+            $entry = array(
+                'id' => 'tagsubs',
+                'label' => _m('Tag subscriptions'),
+                'link' => common_local_url('tagsubs'),
+                'value' => $tagsub->count(),
+            );
+
+            $insertAt = count($stats);
+            foreach ($stats as $i => $row) {
+                if ($row['id'] == 'groups') {
+                    // Slip us in after them.
+                    $insertAt = $i + 1;
+                    break;
+                }
+            }
+            array_splice($stats, $insertAt, 0, array($entry));
+        }
+        return true;
+    }
 }

From ba2a246951e5ab9884b0969a6955bae14d6c772d Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Wed, 16 Mar 2011 17:13:34 -0400
Subject: [PATCH 632/655] slightly better formatting on events

---
 plugins/Event/EventPlugin.php | 60 ++++++++++++++++++++++++++---------
 plugins/Event/event.css       |  9 ++++++
 2 files changed, 54 insertions(+), 15 deletions(-)
 create mode 100644 plugins/Event/event.css

diff --git a/plugins/Event/EventPlugin.php b/plugins/Event/EventPlugin.php
index 4159641d08..1a43bac348 100644
--- a/plugins/Event/EventPlugin.php
+++ b/plugins/Event/EventPlugin.php
@@ -297,7 +297,7 @@ class EventPlugin extends MicroappPlugin
         }
 
         // @fixme we have to start the name/avatar and open this div
-        $out->elementStart('div', array('class' => 'event-info entry-content')); // EVENT-INFO.ENTRY-CONTENT IN
+        $out->elementStart('div', array('class' => 'event-info')); // EVENT-INFO.ENTRY-CONTENT IN
 
         $profile = $notice->getProfile();
         $avatar = $profile->getAvatar(AVATAR_MINI_SIZE);
@@ -336,7 +336,7 @@ class EventPlugin extends MicroappPlugin
         assert(!empty($event));
         assert(!empty($profile));
 
-        $out->elementStart('div', 'vevent'); // VEVENT IN
+        $out->elementStart('div', 'vevent event'); // VEVENT IN
 
         $out->elementStart('h3');  // VEVENT/H3 IN
 
@@ -351,39 +351,63 @@ class EventPlugin extends MicroappPlugin
 
         $out->elementEnd('h3'); // VEVENT/H3 OUT
 
+        $startDate = strftime("%x", $event->start_time);
+        $startTime = strftime("%R", $event->start_time);
+
+        $endDate = strftime("%x", $event->end_time);
+        $endTime = strftime("%R", $event->end_time);
+
         // FIXME: better dates
 
         $out->elementStart('div', 'event-times'); // VEVENT/EVENT-TIMES IN
-        $out->element('abbr', array('class' => 'dtstart',
-                                    'title' => common_date_iso8601($event->start_time)),
-                      common_exact_date($event->start_time));
-        $out->text(' - ');
-        $out->element('span', array('class' => 'dtend',
-                                    'title' => common_date_iso8601($event->end_time)),
-                      common_exact_date($event->end_time));
-        $out->elementEnd('div'); // VEVENT/EVENT-TIMES OUT
 
-        if (!empty($event->description)) {
-            $out->element('div', 'description', $event->description);
+        $out->element('strong', null, _('Time:'));
+
+        $out->element('abbr', array('class' => 'dtstart',
+                                    'title' => common_date_iso8601()),
+                      $startDate . ' ' . $startTime);
+        $out->text(' - ');
+        if ($startDate == $endDate) {
+            $out->element('span', array('class' => 'dtend',
+                                        'title' => common_date_iso8601($event->end_time)),
+                          $endTime);
+        } else {
+            $out->element('span', array('class' => 'dtend',
+                                        'title' => common_date_iso8601($event->end_time)),
+                          $endDate . ' ' . $endTime);
         }
 
+        $out->elementEnd('div'); // VEVENT/EVENT-TIMES OUT
+
         if (!empty($event->location)) {
-            $out->element('div', 'location', $event->location);
+            $out->elementStart('div', 'event-location');
+            $out->element('strong', null, _('Location: '));
+            $out->element('span', 'location', $event->location);
+            $out->elementEnd('div');
+        }
+
+        if (!empty($event->description)) {
+            $out->elementStart('div', 'event-description');
+            $out->element('strong', null, _('Description: '));
+            $out->element('span', 'description', $event->description);
+            $out->elementEnd('div');
         }
 
         $rsvps = $event->getRSVPs();
 
-        $out->element('div', 'event-rsvps',
+        $out->elementStart('div', 'event-rsvps');
+        $out->element('strong', null, _('Attending: '));
+        $out->element('span', 'event-rsvps',
                       sprintf(_('Yes: %d No: %d Maybe: %d'),
                               count($rsvps[RSVP::POSITIVE]),
                               count($rsvps[RSVP::NEGATIVE]),
                               count($rsvps[RSVP::POSSIBLE])));
+        $out->elementEnd('div');
 
         $user = common_current_user();
 
         if (!empty($user)) {
             $rsvp = $event->getRSVP($user->getProfile());
-            common_log(LOG_DEBUG, "RSVP is: " . ($rsvp ? $rsvp->id : 'none'));
 
             if (empty($rsvp)) {
                 $form = new RSVPForm($event, $out);
@@ -440,4 +464,10 @@ class EventPlugin extends MicroappPlugin
     {
         $action->inlineScript('$(document).ready(function() { $("#startdate").datepicker(); $("#enddate").datepicker(); });');
     }
+
+    function onEndShowStyles($action)
+    {
+        $action->cssLink($this->path('event.css'));
+        return true;
+    }
 }
diff --git a/plugins/Event/event.css b/plugins/Event/event.css
new file mode 100644
index 0000000000..a922bb5791
--- /dev/null
+++ b/plugins/Event/event.css
@@ -0,0 +1,9 @@
+.event-tags li { display: inline; }
+.event-mentions li { display: inline; }
+.event-avatar { float: left; }
+.event-notice-count { float: right; }
+.event-info { float: left; }
+.event-title { margin-left: 0px; }
+#content .event .entry-title { margin-left: 0px; }
+#content .event .entry-content { margin-left: 0px; }
+

From 7785407c65274fac632b52acc84c3a045f7dfeeb Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Wed, 16 Mar 2011 14:49:27 -0700
Subject: [PATCH 633/655] Work in progress: tagsub editing ui

---
 plugins/TagSub/TagSubPlugin.php  |   3 +
 plugins/TagSub/tagsubsaction.php | 173 +++++++++++++++++++++++++++++++
 2 files changed, 176 insertions(+)
 create mode 100644 plugins/TagSub/tagsubsaction.php

diff --git a/plugins/TagSub/TagSubPlugin.php b/plugins/TagSub/TagSubPlugin.php
index e3c11ac1ef..ff6c038bc3 100644
--- a/plugins/TagSub/TagSubPlugin.php
+++ b/plugins/TagSub/TagSubPlugin.php
@@ -103,6 +103,9 @@ class TagSubPlugin extends Plugin
                     array('action' => 'tagunsub'),
                     array('tag' => Router::REGEX_TAG));
 
+        $m->connect(':nickname/tag-subscriptions',
+                    array('action' => 'tagsubs'),
+                    array('nickname' => Nickname::DISPLAY_FMT));
         return true;
     }
 
diff --git a/plugins/TagSub/tagsubsaction.php b/plugins/TagSub/tagsubsaction.php
new file mode 100644
index 0000000000..78156fa7b0
--- /dev/null
+++ b/plugins/TagSub/tagsubsaction.php
@@ -0,0 +1,173 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * List of a user's subscriptions
+ *
+ * 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  Social
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @author    Sarven Capadisli <csarven@status.net>
+ * @copyright 2008-2009 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET') && !defined('LACONICA')) {
+    exit(1);
+}
+
+/**
+ * A list of the user's subscriptions
+ *
+ * @category Social
+ * @package  StatusNet
+ * @author   Evan Prodromou <evan@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://status.net/
+ */
+class TagSubsAction extends GalleryAction
+{
+    function title()
+    {
+        if ($this->page == 1) {
+            // TRANS: Header for subscriptions overview for a user (first page).
+            // TRANS: %s is a user nickname.
+            return sprintf(_m('%s\'s tag subscriptions'), $this->user->nickname);
+        } else {
+            // TRANS: Header for subscriptions overview for a user (not first page).
+            // TRANS: %1$s is a user nickname, %2$d is the page number.
+            return sprintf(_m('%1$s\'s tag subscriptions, page %2$d'),
+                           $this->user->nickname,
+                           $this->page);
+        }
+    }
+
+    function showPageNotice()
+    {
+        $user = common_current_user();
+        if ($user && ($user->id == $this->profile->id)) {
+            $this->element('p', null,
+                           // TRANS: Page notice for page with an overview of all tag subscriptions
+                           // TRANS: of the logged in user's own profile.
+                           _m('You have subscribed to receive all notices on this site containing the following tags.'));
+        } else {
+            $this->element('p', null,
+                           // TRANS: Page notice for page with an overview of all subscriptions of a user other
+                           // TRANS: than the logged in user. %s is the user nickname.
+                           sprintf(_m('%s has subscribed to receive all notices on this site containing the following tags.'),
+                                   $this->profile->nickname));
+        }
+    }
+
+    function showContent()
+    {
+        if (Event::handle('StartShowTagSubscriptionsContent', array($this))) {
+            parent::showContent();
+
+            $offset = ($this->page-1) * PROFILES_PER_PAGE;
+            $limit =  PROFILES_PER_PAGE + 1;
+
+            $cnt = 0;
+
+            $tagsub = new TagSub();
+            $tagsub->profile_id = $this->user->id;
+            $tagsub->limit($limit);
+            $tagsub->offset($offset);
+            $tagsub->find();
+
+            if ($tagsub->N) {
+                $list = new TagSubscriptionsList($tagsub, $this->user, $this);
+                $cnt = $list->show();
+                if (0 == $cnt) {
+                    $this->showEmptyListMessage();
+                }
+            }
+
+            $this->pagination($this->page > 1, $cnt > PROFILES_PER_PAGE,
+                              $this->page, 'tagsubs',
+                              array('nickname' => $this->user->nickname));
+
+
+            Event::handle('EndShowTagSubscriptionsContent', array($this));
+        }
+    }
+
+    function showEmptyListMessage()
+    {
+        if (common_logged_in()) {
+            $current_user = common_current_user();
+            if ($this->user->id === $current_user->id) {
+                // TRANS: Subscription list text when the logged in user has no subscriptions.
+                // 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.
+                $message = _('You\'re not listening to anyone\'s notices right now, try subscribing to people you know. '.
+                             'Try [people search](%%action.peoplesearch%%), look for members in groups you\'re interested '.
+                             'in and in our [featured users](%%action.featured%%). '.
+                             'If you\'re a [Twitter user](%%action.twittersettings%%), you can automatically subscribe to '.
+                             'people you already follow there.');
+            } 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.
+                $message = sprintf(_('%s is not listening to any tags.'), $this->user->nickname);
+            }
+        }
+        else {
+            // TRANS: Subscription list text when looking at the subscriptions for a of a user that has none
+            // TRANS: as an anonymous user. %s is the user nickname.
+            $message = sprintf(_m('%s is not listening to any tags.'), $this->user->nickname);
+        }
+
+        $this->elementStart('div', 'guide');
+        $this->raw(common_markup_to_html($message));
+        $this->elementEnd('div');
+    }
+}
+
+// XXX SubscriptionsList and SubscriptionList are dangerously close
+
+class TagSubscriptionsList extends SubscriptionList
+{
+    function newListItem($tagsub)
+    {
+        return new TagSubscriptionsListItem($tagsub, $this->owner, $this->action);
+    }
+}
+
+class TagSubscriptionsListItem extends SubscriptionListItem
+{
+    function showProfile()
+    {
+        $this->startProfile();
+        // Relevant portion!
+        $cur = common_current_user();
+        if (!empty($cur) && $cur->id == $this->owner->id) {
+            $this->showOwnerControls();
+        }
+        $this->endProfile();
+    }
+
+    function showOwnerControls()
+    {
+        $tagsub = $this->profile; // ?
+        $form = new TagSubForm($this->out, $tagsub->tag);
+        $form->show();
+        return;
+    }
+}

From 29a4bb4d9159ef337b3a80615c8a9f9f70f3b9bd Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Wed, 16 Mar 2011 17:51:27 -0400
Subject: [PATCH 634/655] better formatting for RSVPs

---
 plugins/Event/EventPlugin.php |  6 ++-
 plugins/Event/RSVP.php        | 93 +++++++++++++++++++++++++++++++++--
 theme/rebase/css/display.css  |  4 ++
 3 files changed, 97 insertions(+), 6 deletions(-)

diff --git a/plugins/Event/EventPlugin.php b/plugins/Event/EventPlugin.php
index 1a43bac348..038e110627 100644
--- a/plugins/Event/EventPlugin.php
+++ b/plugins/Event/EventPlugin.php
@@ -324,7 +324,11 @@ class EventPlugin extends MicroappPlugin
 
     function showRSVPNotice($notice, $out)
     {
-        $out->raw($notice->rendered);
+        $rsvp = RSVP::fromNotice($notice);
+
+        $out->elementStart('div', 'rsvp');
+        $out->raw($rsvp->asHTML());
+        $out->elementEnd('div');
         return;
     }
 
diff --git a/plugins/Event/RSVP.php b/plugins/Event/RSVP.php
index fad87aabc8..7b61cc34ad 100644
--- a/plugins/Event/RSVP.php
+++ b/plugins/Event/RSVP.php
@@ -180,12 +180,9 @@ class RSVP extends Managed_DataObject
 
         // XXX: come up with something sexier
 
-        $content = sprintf(_('RSVPed %s for an event.'),
-                           ($verb == RSVP::POSITIVE) ? _('positively') :
-                           ($verb == RSVP::NEGATIVE) ? _('negatively') :
-                           _('possibly'));
+        $content = $rsvp->asString();
         
-        $rendered = $content;
+        $rendered = $rsvp->asHTML();
 
         $options = array_merge(array('object_type' => $verb),
                                $options);
@@ -276,4 +273,90 @@ class RSVP extends Managed_DataObject
 
         return $rsvps;
     }
+
+    function getProfile()
+    {
+        $profile = Profile::staticGet('id', $this->profile_id);
+        if (empty($profile)) {
+            throw new Exception("No profile with ID {$this->profile_id}");
+        }
+        return $profile;
+    }
+
+    function getEvent()
+    {
+        $event = Happening::staticGet('id', $this->event_id);
+        if (empty($event)) {
+            throw new Exception("No event with ID {$this->event_id}");
+        }
+        return $event;
+    }
+
+    function asHTML()
+    {
+        return self::toHTML($this->getProfile(),
+                            $this->getEvent(),
+                            $this->response);
+    }
+
+    function asString()
+    {
+        return self::toString($this->getProfile(),
+                              $this->getEvent(),
+                              $this->response);
+    }
+
+    static function toHTML($profile, $event, $response)
+    {
+        $fmt = null;
+
+        $notice = $event->getNotice();
+
+        switch ($response) {
+        case 'Y':
+            $fmt = _("<span class='automatic event-rsvp'><a href='%1s'>%2s</a> is attending <a href='%3s'>%4s</a>.</span>");
+            break;
+        case 'N':
+            $fmt = _("<span class='automatic event-rsvp'><a href='%1s'>%2s</a> is not attending <a href='%3s'>%4s</a>.</span>");
+            break;
+        case '?':
+            $fmt = _("<span class='automatic event-rsvp'><a href='%1s'>%2s</a> might attend <a href='%3s'>%4s</a>.</span>");
+            break;
+        default:
+            throw new Exception("Unknown response code {$response}");
+            break;
+        }
+
+        return sprintf($fmt,
+                       htmlspecialchars($profile->profileurl),
+                       htmlspecialchars($profile->getBestName()),
+                       htmlspecialchars($notice->bestUrl()),
+                       htmlspecialchars($event->title));
+    }
+
+    static function toString($profile, $event, $response)
+    {
+        $fmt = null;
+
+        $notice = $event->getNotice();
+
+        switch ($response) {
+        case 'Y':
+            $fmt = _("%1s is attending %2s.");
+            break;
+        case 'N':
+            $fmt = _("%1s is not attending %2s.");
+            break;
+        case '?':
+            $fmt = _("%1s might attend %2s.>");
+            break;
+        default:
+            throw new Exception("Unknown response code {$response}");
+            break;
+        }
+
+        return sprintf($fmt,
+                       $profile->getBestName(),
+                       $event->title);
+    }
 }
diff --git a/theme/rebase/css/display.css b/theme/rebase/css/display.css
index ee88b312a7..6c3c9e6296 100644
--- a/theme/rebase/css/display.css
+++ b/theme/rebase/css/display.css
@@ -451,6 +451,10 @@ address .poweredby {
 overflow:visible;
 }
 
+.notice .automatic { 
+font-style:italic;
+}
+
 #showstream h1 { 
     display:none;
 }

From 59515d5976504bd5b08598ef0b3e3160c52bece6 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Wed, 16 Mar 2011 14:52:42 -0700
Subject: [PATCH 635/655] Extended profile - don't show rel for empty phone
 number

---
 plugins/ExtendedProfile/extendedprofilewidget.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/plugins/ExtendedProfile/extendedprofilewidget.php b/plugins/ExtendedProfile/extendedprofilewidget.php
index b507713f06..53cb5d3b87 100644
--- a/plugins/ExtendedProfile/extendedprofilewidget.php
+++ b/plugins/ExtendedProfile/extendedprofilewidget.php
@@ -160,9 +160,11 @@ class ExtendedProfileWidget extends Form
     protected function showPhone($name, $field)
     {
         $this->out->elementStart('div', array('class' => 'phone-display'));
-        $this->out->text($field['value']);
-        if (!empty($field['rel'])) {
-            $this->out->text(' (' . $field['rel'] . ')');
+        if (!empty($field['value'])) {
+            $this->out->text($field['value']);
+            if (!empty($field['rel'])) {
+               $this->out->text(' (' . $field['rel'] . ')');
+            }
         }
         $this->out->elementEnd('div');
     }

From 0bf40bd74807cdb1a62a6d7f073fe4bf83edf6fb Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Wed, 16 Mar 2011 14:54:14 -0700
Subject: [PATCH 636/655] Output avatar/author along with ProfileNoticeListItem
 items on ShowProfileAction -- they get hidden in CSS anyway, and we need the
 author data for the inline reply form if you end up replying to
 yourself/someone else from a profile stream view.

Note that the other modification -- of the repeat line -- is still going to be inconsistent between things originally on the page and anything that comes over Realtime.
---
 actions/showstream.php | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/actions/showstream.php b/actions/showstream.php
index 08f8a3e80e..10085d94d7 100644
--- a/actions/showstream.php
+++ b/actions/showstream.php
@@ -279,6 +279,18 @@ class ShowstreamAction extends ProfileAction
 
 // We don't show the author for a profile, since we already know who it is!
 
+/**
+ * Slightly modified from standard list; the author & avatar are hidden
+ * in CSS. We used to remove them here too, but as it turns out that
+ * confuses the inline reply code... and we hide them in CSS anyway
+ * since realtime updates come through in original form.
+ *
+ * Remaining customization right now is for the repeat marker, where
+ * it'll list who the original poster was instead of who did the repeat
+ * (since the repeater is you, and the repeatee isn't shown!)
+ * This will remain inconsistent if realtime updates come through,
+ * since those'll get rendered as a regular NoticeListItem.
+ */
 class ProfileNoticeList extends NoticeList
 {
     function newListItem($notice)
@@ -289,11 +301,6 @@ class ProfileNoticeList extends NoticeList
 
 class ProfileNoticeListItem extends DoFollowListItem
 {
-    function showAuthor()
-    {
-        return;
-    }
-
     /**
      * show a link to the author of repeat
      *

From 09a4cebd477d0531bba2d1fb9234d01ddba29bfa Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Wed, 16 Mar 2011 15:01:58 -0700
Subject: [PATCH 637/655] fix flushrouter.php -- tried to call Cache::delete
 statically

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

diff --git a/scripts/flushrouter.php b/scripts/flushrouter.php
index 79493eae49..51178a725c 100644
--- a/scripts/flushrouter.php
+++ b/scripts/flushrouter.php
@@ -28,6 +28,7 @@ END_OF_FLUSHROUTER_HELP;
 
 require_once INSTALLDIR.'/scripts/commandline.inc';
 
-Cache::delete(Router::cacheKey());
+$cache = Cache::instance();
+$cache->delete(Router::cacheKey());
 
 print "OK.\n";
\ No newline at end of file

From 42a4b1d90cdb45384c1787df2bb690f166e30216 Mon Sep 17 00:00:00 2001
From: Samantha Doherty <sammy@status.net>
Date: Wed, 16 Mar 2011 18:20:40 -0400
Subject: [PATCH 638/655] Bit of quick styling for Events.

---
 theme/neo/css/display.css | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/theme/neo/css/display.css b/theme/neo/css/display.css
index 92da5977ef..b13a74d667 100644
--- a/theme/neo/css/display.css
+++ b/theme/neo/css/display.css
@@ -1144,5 +1144,38 @@ table.profile_list tr.alt {
     font-size: 0em;
 }
 
+/* Event specific styles */
+
+#form_event_rsvp #new_rsvp_data {
+    display: inline;
+    margin: 10px 0px;
+}
+
+#form_event_rsvp input.submit {
+    height: 1.6em;
+    padding: 0px 10px;
+    margin-left: 10px;
+    color:#fff;
+    font-weight: bold;
+    text-transform: uppercase;
+    font-size: 1.1em;
+    text-shadow: 0px -1px 0px rgba(0, 0, 0, 0.2);
+    border: 1px solid #d7621c;
+    border-radius: 4px;
+    -moz-border-radius: 4px;
+    -webkit-border-radius: 4px;
+    background: #FB6104;
+    background: -moz-linear-gradient(top, #ff9d63 , #FB6104);
+    background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ff9d63), color-stop(100%,#FB6104)); 
+    filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ff9d63', endColorstr='#FB6104',GradientType=0 );
+}
+
+#form_event_rsvp .notice input.submit:hover {
+    text-shadow: 0px -1px 0px rgba(0, 0, 0, 0.6);
+    background: #ff9d63;
+    background: -moz-linear-gradient(top, #FB6104 , #fc8035);
+    background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#FB6104), color-stop(100%,#fc8035));
+    filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#FB6104', endColorstr='#fc8035',GradientType=0 );
+}
 
 }/*end of @media screen, projection, tv*/

From 0791d0034fae2699b616b27c307010a061b17b29 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Wed, 16 Mar 2011 18:53:46 -0400
Subject: [PATCH 639/655] return Ajax-y XML on exceptions

---
 lib/action.php    |  5 +++++
 lib/error.php     | 29 ++++++++++++++++++++++++++++-
 lib/statusnet.php | 11 +++++++++++
 3 files changed, 44 insertions(+), 1 deletion(-)

diff --git a/lib/action.php b/lib/action.php
index 51d7e8923e..20de71aec1 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -83,6 +83,11 @@ class Action extends HTMLOutputter // lawsuit
     function prepare($argarray)
     {
         $this->args =& common_copy_args($argarray);
+
+        if ($this->boolean('ajax')) {
+            StatusNet::setAjax(true);
+        }
+
         return true;
     }
 
diff --git a/lib/error.php b/lib/error.php
index d234ab92b2..4024a9affc 100644
--- a/lib/error.php
+++ b/lib/error.php
@@ -68,7 +68,11 @@ class ErrorAction extends InfoAction
 
     function showPage()
     {
-        if ($this->minimal) {
+        if (StatusNet::isAjax()) {
+            $this->extraHeaders();
+            $this->ajaxErrorMsg();
+            exit();
+        } if ($this->minimal) {
             // Even more minimal -- we're in a machine API
             // and don't want to flood the output.
             $this->extraHeaders();
@@ -94,4 +98,27 @@ class ErrorAction extends InfoAction
     function showNoticeForm()
     {
     }
+
+    /**
+     * Show an Ajax-y error message
+     *
+     * Goes back to the browser, where it's shown in a popup.
+     *
+     * @param string $msg Message to show
+     *
+     * @return void
+     */
+
+    function ajaxErrorMsg()
+    {
+        $this->startHTML('text/xml;charset=utf-8', true);
+        $this->elementStart('head');
+        // TRANS: Page title after an AJAX error occurs on the send notice page.
+        $this->element('title', null, _('Ajax Error'));
+        $this->elementEnd('head');
+        $this->elementStart('body');
+        $this->element('p', array('id' => 'error'), $this->message);
+        $this->elementEnd('body');
+        $this->elementEnd('html');
+    }
 }
diff --git a/lib/statusnet.php b/lib/statusnet.php
index 4c2aacd8f7..648369ec44 100644
--- a/lib/statusnet.php
+++ b/lib/statusnet.php
@@ -31,6 +31,7 @@ class StatusNet
 {
     protected static $have_config;
     protected static $is_api;
+    protected static $is_ajax;
     protected static $plugins = array();
 
     /**
@@ -230,6 +231,16 @@ class StatusNet
         self::$is_api = $mode;
     }
 
+    public function isAjax()
+    {
+        return self::$is_ajax;
+    }
+
+    public function setAjax($mode)
+    {
+        self::$is_ajax = $mode;
+    }
+
     /**
      * Build default configuration array
      * @return array

From f8859aa3aa30bc5f9cce62675cf4a94e9c8a3dad Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Wed, 16 Mar 2011 15:55:40 -0700
Subject: [PATCH 640/655] Tag subscriptions management UI for TagSub plugin

---
 plugins/TagSub/TagSubPlugin.php  | 15 +++++----
 plugins/TagSub/tagsubsaction.php | 57 ++++++++++++++++++++++----------
 2 files changed, 47 insertions(+), 25 deletions(-)

diff --git a/plugins/TagSub/TagSubPlugin.php b/plugins/TagSub/TagSubPlugin.php
index ff6c038bc3..53a06ab5bf 100644
--- a/plugins/TagSub/TagSubPlugin.php
+++ b/plugins/TagSub/TagSubPlugin.php
@@ -78,6 +78,7 @@ class TagSubPlugin extends Plugin
             return false;
         case 'TagsubAction':
         case 'TagunsubAction':
+        case 'TagsubsAction':
         case 'TagSubForm':
         case 'TagUnsubForm':
             include_once $dir.'/'.strtolower($cls).'.php';
@@ -196,12 +197,12 @@ class TagSubPlugin extends Plugin
         $action = $widget->out;
         $action_name = $action->trimmed('action');
 
-        $widget->item('tagsubs',
-                      array(),
-                      // TRANS: SubMirror plugin menu item on user settings page.
-                      _m('MENU', 'Tags'),
-                      // TRANS: SubMirror plugin tooltip for user settings menu item.
-                      _m('Configure tag subscriptions'));
+        $action->menuItem(common_local_url('tagsubs', array('nickname' => $action->user->nickname)),
+                          // TRANS: SubMirror plugin menu item on user settings page.
+                          _m('MENU', 'Tags'),
+                          // TRANS: SubMirror plugin tooltip for user settings menu item.
+                          _m('Configure tag subscriptions'),
+                          $action_name == 'tagsubs' && $action->arg('nickname') == $action->user->nickname);
 
         return true;
     }
@@ -222,7 +223,7 @@ class TagSubPlugin extends Plugin
             $entry = array(
                 'id' => 'tagsubs',
                 'label' => _m('Tag subscriptions'),
-                'link' => common_local_url('tagsubs'),
+                'link' => common_local_url('tagsubs', array('nickname' => $profile->nickname)),
                 'value' => $tagsub->count(),
             );
 
diff --git a/plugins/TagSub/tagsubsaction.php b/plugins/TagSub/tagsubsaction.php
index 78156fa7b0..f11935229b 100644
--- a/plugins/TagSub/tagsubsaction.php
+++ b/plugins/TagSub/tagsubsaction.php
@@ -65,12 +65,12 @@ class TagSubsAction extends GalleryAction
             $this->element('p', null,
                            // TRANS: Page notice for page with an overview of all tag subscriptions
                            // TRANS: of the logged in user's own profile.
-                           _m('You have subscribed to receive all notices on this site containing the following tags.'));
+                           _m('You have subscribed to receive all notices on this site containing the following tags:'));
         } else {
             $this->element('p', null,
                            // TRANS: Page notice for page with an overview of all subscriptions of a user other
                            // TRANS: than the logged in user. %s is the user nickname.
-                           sprintf(_m('%s has subscribed to receive all notices on this site containing the following tags.'),
+                           sprintf(_m('%s has subscribed to receive all notices on this site containing the following tags:'),
                                    $this->profile->nickname));
         }
     }
@@ -87,8 +87,7 @@ class TagSubsAction extends GalleryAction
 
             $tagsub = new TagSub();
             $tagsub->profile_id = $this->user->id;
-            $tagsub->limit($limit);
-            $tagsub->offset($offset);
+            $tagsub->limit($limit, $offset);
             $tagsub->find();
 
             if ($tagsub->N) {
@@ -97,6 +96,8 @@ class TagSubsAction extends GalleryAction
                 if (0 == $cnt) {
                     $this->showEmptyListMessage();
                 }
+            } else {
+                $this->showEmptyListMessage();
             }
 
             $this->pagination($this->page > 1, $cnt > PROFILES_PER_PAGE,
@@ -113,18 +114,13 @@ class TagSubsAction extends GalleryAction
         if (common_logged_in()) {
             $current_user = common_current_user();
             if ($this->user->id === $current_user->id) {
-                // TRANS: Subscription list text when the logged in user has no subscriptions.
-                // 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.
-                $message = _('You\'re not listening to anyone\'s notices right now, try subscribing to people you know. '.
-                             'Try [people search](%%action.peoplesearch%%), look for members in groups you\'re interested '.
-                             'in and in our [featured users](%%action.featured%%). '.
-                             'If you\'re a [Twitter user](%%action.twittersettings%%), you can automatically subscribe to '.
-                             'people you already follow there.');
+                // TRANS: Tag subscription list text when the logged in user has no tag subscriptions.
+                $message = _('You\'re not listening to any hash tags right now. You can push the "Subscribe" button ' .
+                             'on any hashtag page to automatically receive any public messages on this site that use that ' .
+                             'tag, even if you\'re not subscribed to the poster.');
             } 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.
+                // TRANS: Tag subscription list text when looking at the subscriptions for a of a user other
+                // TRANS: than the logged in user that has no tag subscriptions. %s is the user nickname.
                 $message = sprintf(_('%s is not listening to any tags.'), $this->user->nickname);
             }
         }
@@ -152,22 +148,47 @@ class TagSubscriptionsList extends SubscriptionList
 
 class TagSubscriptionsListItem extends SubscriptionListItem
 {
+    function startItem()
+    {
+        $this->out->elementStart('li', array('class' => 'tagsub'));
+    }
+
     function showProfile()
     {
-        $this->startProfile();
+        $tagsub = $this->profile;
+        $tag = $tagsub->tag;
+
         // Relevant portion!
         $cur = common_current_user();
         if (!empty($cur) && $cur->id == $this->owner->id) {
             $this->showOwnerControls();
         }
-        $this->endProfile();
+        
+        $url = common_local_url('tag', array('tag' => $tag));
+        $linkline = sprintf(_m('#<a href="%s">%s</a> since %s'),
+                            htmlspecialchars($url),
+                            htmlspecialchars($tag),
+                            common_date_string($tagsub->created));
+
+        $this->out->elementStart('div', 'tagsub-item');
+        $this->out->raw($linkline);
+        $this->out->element('div', array('style' => 'clear: both'));
+        $this->out->elementEnd('div');
+    }
+
+    function showActions()
+    {
     }
 
     function showOwnerControls()
     {
+        $this->out->elementStart('div', 'entity_actions');
+
         $tagsub = $this->profile; // ?
-        $form = new TagSubForm($this->out, $tagsub->tag);
+        $form = new TagUnsubForm($this->out, $tagsub->tag);
         $form->show();
+
+        $this->out->elementEnd('div');
         return;
     }
 }

From 1b82589b8f12d75fecf7c5bac80094eae37070ac Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Wed, 16 Mar 2011 19:08:35 -0400
Subject: [PATCH 641/655] better date handling in events

---
 plugins/Event/EventPlugin.php | 14 ++++----
 plugins/Event/newevent.php    | 67 ++++++++++++++++++++++++++++-------
 2 files changed, 62 insertions(+), 19 deletions(-)

diff --git a/plugins/Event/EventPlugin.php b/plugins/Event/EventPlugin.php
index 038e110627..5a6add9385 100644
--- a/plugins/Event/EventPlugin.php
+++ b/plugins/Event/EventPlugin.php
@@ -246,11 +246,11 @@ class EventPlugin extends MicroappPlugin
 
         $obj->extra[] = array('dtstart',
                               array('xmlns' => 'urn:ietf:params:xml:ns:xcal'),
-                              common_date_iso8601($happening->start_date));
+                              common_date_iso8601($happening->start_time));
 
         $obj->extra[] = array('dtend',
                               array('xmlns' => 'urn:ietf:params:xml:ns:xcal'),
-                              common_date_iso8601($happening->end_date));
+                              common_date_iso8601($happening->end_time));
 
         // XXX: probably need other stuff here
 
@@ -355,11 +355,11 @@ class EventPlugin extends MicroappPlugin
 
         $out->elementEnd('h3'); // VEVENT/H3 OUT
 
-        $startDate = strftime("%x", $event->start_time);
-        $startTime = strftime("%R", $event->start_time);
+        $startDate = strftime("%x", strtotime($event->start_time));
+        $startTime = strftime("%R", strtotime($event->start_time));
 
-        $endDate = strftime("%x", $event->end_time);
-        $endTime = strftime("%R", $event->end_time);
+        $endDate = strftime("%x", strtotime($event->end_time));
+        $endTime = strftime("%R", strtotime($event->end_time));
 
         // FIXME: better dates
 
@@ -368,7 +368,7 @@ class EventPlugin extends MicroappPlugin
         $out->element('strong', null, _('Time:'));
 
         $out->element('abbr', array('class' => 'dtstart',
-                                    'title' => common_date_iso8601()),
+                                    'title' => common_date_iso8601($event->start_time)),
                       $startDate . ' ' . $startTime);
         $out->text(' - ');
         if ($startDate == $endDate) {
diff --git a/plugins/Event/newevent.php b/plugins/Event/newevent.php
index 0f5635487b..5551e0ce2c 100644
--- a/plugins/Event/newevent.php
+++ b/plugins/Event/newevent.php
@@ -52,8 +52,8 @@ class NeweventAction extends Action
     protected $title       = null;
     protected $location    = null;
     protected $description = null;
-    protected $start_time  = null;
-    protected $end_time    = null;
+    protected $startTime  = null;
+    protected $endTime    = null;
 
     /**
      * Returns the title of the action
@@ -90,17 +90,60 @@ class NeweventAction extends Action
         }
 
         $this->title       = $this->trimmed('title');
+
+        if (empty($this->title)) {
+            throw new ClientException(_('Title required.'));
+        }
+
         $this->location    = $this->trimmed('location');
         $this->url         = $this->trimmed('url');
         $this->description = $this->trimmed('description');
 
-        $start_date = $this->trimmed('start_date');
-        $start_time = $this->trimmed('start_time');
-        $end_date   = $this->trimmed('end_date');
-        $end_time   = $this->trimmed('end_time');
+        $startDate = $this->trimmed('startdate');
 
-        $this->start_time = strtotime($start_date . ' ' . $start_time);
-        $this->end_time   = strtotime($end_date . ' ' . $end_time);
+        if (empty($startDate)) {
+            throw new ClientException(_('Start date required.'));
+        }
+
+        $startTime = $this->trimmed('starttime');
+
+        if (empty($startTime)) {
+            $startTime = '00:00';
+        }
+
+        $endDate   = $this->trimmed('enddate');
+
+        if (empty($endDate)) {
+            throw new ClientException(_('End date required.'));
+        }
+
+        $endTime   = $this->trimmed('endtime');
+
+        if (empty($endTime)) {
+            $endTime = '00:00';
+        }
+
+        $start = $startDate . ' ' . $startTime;
+
+        common_debug("Event start: '$start'");
+
+        $end = $endDate . ' ' . $endTime;
+
+        common_debug("Event start: '$end'");
+
+        $this->startTime = strtotime($start);
+        $this->endTime   = strtotime($end);
+
+        if ($this->startTime == 0) {
+            throw new Exception(sprintf(_('Could not parse date "%s"'),
+                                        $start));
+        }
+
+
+        if ($this->endTime == 0) {
+            throw new Exception(sprintf(_('Could not parse date "%s"'),
+                                        $end));
+        }
 
         return true;
     }
@@ -139,19 +182,19 @@ class NeweventAction extends Action
                 throw new ClientException(_('Event must have a title.'));
             }
 
-            if (empty($this->start_time)) {
+            if (empty($this->startTime)) {
                 throw new ClientException(_('Event must have a start time.'));
             }
 
-            if (empty($this->end_time)) {
+            if (empty($this->endTime)) {
                 throw new ClientException(_('Event must have an end time.'));
             }
 
             $profile = $this->user->getProfile();
 
             $saved = Happening::saveNew($profile,
-                                        $this->start_time,
-                                        $this->end_time,
+                                        $this->startTime,
+                                        $this->endTime,
                                         $this->title,
                                         $this->location,
                                         $this->description,

From 88d31a793398fca66b50e588c573153b8d402da6 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Wed, 16 Mar 2011 16:08:49 -0700
Subject: [PATCH 642/655] Extended profile - move some files around and rename
 stuff to follow plugin conventions

---
 .../ExtendedProfile/ExtendedProfilePlugin.php | 20 +++++++++++--------
 .../profiledetail.php}                        |  0
 .../profiledetailsettings.php}                | 14 +++++++------
 .../{action => actions}/userautocomplete.php  |  0
 .../{ => classes}/Profile_detail.php          |  0
 .../{ => lib}/extendedprofile.php             |  0
 .../{ => lib}/extendedprofilewidget.php       |  0
 7 files changed, 20 insertions(+), 14 deletions(-)
 rename plugins/ExtendedProfile/{profiledetailaction.php => actions/profiledetail.php} (100%)
 rename plugins/ExtendedProfile/{profiledetailsettingsaction.php => actions/profiledetailsettings.php} (98%)
 rename plugins/ExtendedProfile/{action => actions}/userautocomplete.php (100%)
 rename plugins/ExtendedProfile/{ => classes}/Profile_detail.php (100%)
 rename plugins/ExtendedProfile/{ => lib}/extendedprofile.php (100%)
 rename plugins/ExtendedProfile/{ => lib}/extendedprofilewidget.php (100%)

diff --git a/plugins/ExtendedProfile/ExtendedProfilePlugin.php b/plugins/ExtendedProfile/ExtendedProfilePlugin.php
index 127c91a543..3e6aa5f860 100644
--- a/plugins/ExtendedProfile/ExtendedProfilePlugin.php
+++ b/plugins/ExtendedProfile/ExtendedProfilePlugin.php
@@ -53,22 +53,26 @@ class ExtendedProfilePlugin extends Plugin
      */
     function onAutoload($cls)
     {
-        $lower = strtolower($cls);
+        $dir = dirname(__FILE__);
 
-        switch ($lower)
+        switch (strtolower($cls))
         {
-        case 'extendedprofile':
-        case 'extendedprofilewidget':
         case 'profiledetailaction':
         case 'profiledetailsettingsaction':
-            require_once dirname(__FILE__) . '/' . $lower . '.php';
-            return false;
         case 'userautocompleteaction':
-            require_once dirname(__FILE__) . '/action/' . mb_substr($lower, 0, -6) . '.php';
+            include_once $dir . '/actions/'
+                . strtolower(mb_substr($cls, 0, -6)) . '.php';
             return false;
+            break; // Safety first!
+        case 'extendedprofile':
+        case 'extendedprofilewidget':
+            include_once $dir . '/lib/' . strtolower($cls) . '.php';
+            return false;
+            break;
         case 'profile_detail':
-            require_once dirname(__FILE__) . '/' . ucfirst($lower) . '.php';
+            include_once $dir . '/classes/' . ucfirst($cls) . '.php';
             return false;
+            break;
         default:
             return true;
         }
diff --git a/plugins/ExtendedProfile/profiledetailaction.php b/plugins/ExtendedProfile/actions/profiledetail.php
similarity index 100%
rename from plugins/ExtendedProfile/profiledetailaction.php
rename to plugins/ExtendedProfile/actions/profiledetail.php
diff --git a/plugins/ExtendedProfile/profiledetailsettingsaction.php b/plugins/ExtendedProfile/actions/profiledetailsettings.php
similarity index 98%
rename from plugins/ExtendedProfile/profiledetailsettingsaction.php
rename to plugins/ExtendedProfile/actions/profiledetailsettings.php
index 4a2045cefb..23a6ce5d65 100644
--- a/plugins/ExtendedProfile/profiledetailsettingsaction.php
+++ b/plugins/ExtendedProfile/actions/profiledetailsettings.php
@@ -139,12 +139,14 @@ class ProfileDetailSettingsAction extends ProfileSettingsAction
 
     function parseDate($fieldname, $datestr, $required = false)
     {
-        if (empty($datestr) && $required) {
-            $msg = sprintf(
-                _m('You must supply a date for "%s".'),
-                $fieldname
-            );
-            throw new Exception($msg);
+        if (empty($datestr)) {
+            if ($required) {
+                $msg = sprintf(
+                    _m('You must supply a date for "%s".'),
+                    $fieldname
+                );
+                throw new Exception($msg);
+            }
         } else {
             $ts = strtotime($datestr);
             if ($ts === false) {
diff --git a/plugins/ExtendedProfile/action/userautocomplete.php b/plugins/ExtendedProfile/actions/userautocomplete.php
similarity index 100%
rename from plugins/ExtendedProfile/action/userautocomplete.php
rename to plugins/ExtendedProfile/actions/userautocomplete.php
diff --git a/plugins/ExtendedProfile/Profile_detail.php b/plugins/ExtendedProfile/classes/Profile_detail.php
similarity index 100%
rename from plugins/ExtendedProfile/Profile_detail.php
rename to plugins/ExtendedProfile/classes/Profile_detail.php
diff --git a/plugins/ExtendedProfile/extendedprofile.php b/plugins/ExtendedProfile/lib/extendedprofile.php
similarity index 100%
rename from plugins/ExtendedProfile/extendedprofile.php
rename to plugins/ExtendedProfile/lib/extendedprofile.php
diff --git a/plugins/ExtendedProfile/extendedprofilewidget.php b/plugins/ExtendedProfile/lib/extendedprofilewidget.php
similarity index 100%
rename from plugins/ExtendedProfile/extendedprofilewidget.php
rename to plugins/ExtendedProfile/lib/extendedprofilewidget.php

From 7d202e9c616775ab9e79b910af2061200d245a14 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Wed, 16 Mar 2011 16:10:43 -0700
Subject: [PATCH 643/655] Detect and show AJAX errors on FormXHR submission
 handling.

Previously we threw away errore reported by the actual AJAX submission and only used whatever error the browser reported to us; this didn't help if we reached the server ok but had a problem there.
We now extract the #error if given and use that in the alert().
Also should now show 'Unknown error' instead of a crappy generic 'something died in jQuery' when we get a 200 response but bogus return data.
---
 js/util.js     | 22 ++++++++++++++++++++--
 js/util.min.js |  2 +-
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/js/util.js b/js/util.js
index 966df4d93f..31e574a3a8 100644
--- a/js/util.js
+++ b/js/util.js
@@ -253,16 +253,34 @@ var SN = { // StatusNet
                             .attr(SN.C.S.Disabled, SN.C.S.Disabled);
                 },
                 error: function (xhr, textStatus, errorThrown) {
-                    alert(errorThrown || textStatus);
+                    // If the server end reported an error from StatusNet,
+                    // find it -- otherwise we'll see what was reported
+                    // from the browser.
+                    var errorReported = null;
+                    if (xhr.responseXML) {
+                        errorReported = $('#error', xhr.responseXML).text();
+                    }
+                    alert(errorReported || errorThrown || textStatus);
+                    
+                    // Restore the form to original state.
+                    // Hopefully. :D
+                    form
+                        .removeClass(SN.C.S.Processing)
+                        .find('.submit')
+                            .removeClass(SN.C.S.Disabled)
+                            .removeAttr(SN.C.S.Disabled);
                 },
                 success: function(data, textStatus) {
                     if (typeof($('form', data)[0]) != 'undefined') {
                         form_new = document._importNode($('form', data)[0], true);
                         form.replaceWith(form_new);
                     }
-                    else {
+                    else if (typeof($('p', data)[0]) != 'undefined') {
                         form.replaceWith(document._importNode($('p', data)[0], true));
                     }
+                    else {
+                        alert('Unknown error.');
+                    }
                 }
             });
         },
diff --git a/js/util.min.js b/js/util.min.js
index 26ae7494cb..afc41802d0 100644
--- a/js/util.min.js
+++ b/js/util.min.js
@@ -1 +1 @@
-var SN={C:{I:{CounterBlackout:false,MaxLength:140,PatternUsername:/^[0-9a-zA-Z\-_.]*$/,HTTP20x30x:[200,201,202,203,204,205,206,300,301,302,303,304,305,306,307],NoticeFormMaster:null},S:{Disabled:"disabled",Warning:"warning",Error:"error",Success:"success",Processing:"processing",CommandResult:"command_result",FormNotice:"form_notice",NoticeDataGeo:"notice_data-geo",NoticeDataGeoCookie:"NoticeDataGeo",NoticeDataGeoSelected:"notice_data-geo_selected",StatusNetInstance:"StatusNetInstance"}},messages:{},msg:function(a){if(typeof SN.messages[a]=="undefined"){return"["+a+"]"}else{return SN.messages[a]}},U:{FormNoticeEnhancements:function(b){if(jQuery.data(b[0],"ElementData")===undefined){MaxLength=b.find(".count").text();if(typeof(MaxLength)=="undefined"){MaxLength=SN.C.I.MaxLength}jQuery.data(b[0],"ElementData",{MaxLength:MaxLength});SN.U.Counter(b);NDT=b.find(".notice_data-text:first");NDT.bind("keyup",function(c){SN.U.Counter(b)});var a=function(c){window.setTimeout(function(){SN.U.Counter(b)},50)};NDT.bind("cut",a).bind("paste",a)}else{b.find(".count").text(jQuery.data(b[0],"ElementData").MaxLength)}},Counter:function(d){SN.C.I.FormNoticeCurrent=d;var b=jQuery.data(d[0],"ElementData").MaxLength;if(b<=0){return}var c=b-SN.U.CharacterCount(d);var a=d.find(".count");if(c.toString()!=a.text()){if(!SN.C.I.CounterBlackout||c===0){if(a.text()!=String(c)){a.text(c)}if(c<0){d.addClass(SN.C.S.Warning)}else{d.removeClass(SN.C.S.Warning)}if(!SN.C.I.CounterBlackout){SN.C.I.CounterBlackout=true;SN.C.I.FormNoticeCurrent=d;window.setTimeout("SN.U.ClearCounterBlackout(SN.C.I.FormNoticeCurrent);",500)}}}},CharacterCount:function(a){return a.find(".notice_data-text:first").val().length},ClearCounterBlackout:function(a){SN.C.I.CounterBlackout=false;SN.U.Counter(a)},RewriteAjaxAction:function(a){if(document.location.protocol=="https:"&&a.substr(0,5)=="http:"){return a.replace(/^http:\/\/[^:\/]+/,"https://"+document.location.host)}else{return a}},FormXHR:function(a){$.ajax({type:"POST",dataType:"xml",url:SN.U.RewriteAjaxAction(a.attr("action")),data:a.serialize()+"&ajax=1",beforeSend:function(b){a.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(c,d,b){alert(b||d)},success:function(b,c){if(typeof($("form",b)[0])!="undefined"){form_new=document._importNode($("form",b)[0],true);a.replaceWith(form_new)}else{a.replaceWith(document._importNode($("p",b)[0],true))}}})},FormNoticeXHR:function(b){SN.C.I.NoticeDataGeo={};b.append('<input type="hidden" name="ajax" value="1"/>');b.attr("action",SN.U.RewriteAjaxAction(b.attr("action")));var c=function(d,e){b.append($('<p class="form_response"></p>').addClass(d).text(e))};var a=function(){b.find(".form_response").remove()};b.ajaxForm({dataType:"xml",timeout:"60000",beforeSend:function(d){if(b.find(".notice_data-text:first").val()==""){b.addClass(SN.C.S.Warning);return false}b.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled);SN.U.normalizeGeoData(b);return true},error:function(f,g,e){b.removeClass(SN.C.S.Processing).find(".submit").removeClass(SN.C.S.Disabled).removeAttr(SN.C.S.Disabled,SN.C.S.Disabled);a();if(g=="timeout"){c("error","Sorry! We had trouble sending your notice. The servers are overloaded. Please try again, and contact the site administrator if this problem persists.")}else{var d=SN.U.GetResponseXML(f);if($("."+SN.C.S.Error,d).length>0){b.append(document._importNode($("."+SN.C.S.Error,d)[0],true))}else{if(parseInt(f.status)===0||jQuery.inArray(parseInt(f.status),SN.C.I.HTTP20x30x)>=0){b.resetForm().find(".attach-status").remove();SN.U.FormNoticeEnhancements(b)}else{c("error","(Sorry! We had trouble sending your notice ("+f.status+" "+f.statusText+"). Please report the problem to the site administrator if this happens again.")}}}},success:function(i,f){a();var n=$("#"+SN.C.S.Error,i);if(n.length>0){c("error",n.text())}else{if($("body")[0].id=="bookmarklet"){self.close()}var d=$("#"+SN.C.S.CommandResult,i);if(d.length>0){c("success",d.text())}else{var m=document._importNode($("li",i)[0],true);var k=$("#notices_primary .notices:first");var l=b.closest("li.notice-reply");if(l.length>0){var e=$(m).attr("id");if($("#"+e).length==0){var j=l.closest("li.notice");l.replaceWith(m);SN.U.NoticeInlineReplyPlaceholder(j)}else{l.remove()}}else{if(k.length>0&&SN.U.belongsOnTimeline(m)){if($("#"+m.id).length===0){var h=b.find("[name=inreplyto]").val();var g="#notices_primary #notice-"+h;if($("body")[0].id=="conversation"){if(h.length>0&&$(g+" .notices").length<1){$(g).append('<ul class="notices"></ul>')}$($(g+" .notices")[0]).append(m)}else{k.prepend(m)}$("#"+m.id).css({display:"none"}).fadeIn(2500);SN.U.NoticeWithAttachment($("#"+m.id));SN.U.switchInputFormTab("placeholder")}}else{c("success",$("title",i).text())}}}b.resetForm();b.find("[name=inreplyto]").val("");b.find(".attach-status").remove();SN.U.FormNoticeEnhancements(b)}},complete:function(d,e){b.removeClass(SN.C.S.Processing).find(".submit").removeAttr(SN.C.S.Disabled).removeClass(SN.C.S.Disabled);b.find("[name=lat]").val(SN.C.I.NoticeDataGeo.NLat);b.find("[name=lon]").val(SN.C.I.NoticeDataGeo.NLon);b.find("[name=location_ns]").val(SN.C.I.NoticeDataGeo.NLNS);b.find("[name=location_id]").val(SN.C.I.NoticeDataGeo.NLID);b.find("[name=notice_data-geo]").attr("checked",SN.C.I.NoticeDataGeo.NDG)}})},normalizeGeoData:function(a){SN.C.I.NoticeDataGeo.NLat=a.find("[name=lat]").val();SN.C.I.NoticeDataGeo.NLon=a.find("[name=lon]").val();SN.C.I.NoticeDataGeo.NLNS=a.find("[name=location_ns]").val();SN.C.I.NoticeDataGeo.NLID=a.find("[name=location_id]").val();SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked");var b=$.cookie(SN.C.S.NoticeDataGeoCookie);if(b!==null&&b!="disabled"){b=JSON.parse(b);SN.C.I.NoticeDataGeo.NLat=a.find("[name=lat]").val(b.NLat).val();SN.C.I.NoticeDataGeo.NLon=a.find("[name=lon]").val(b.NLon).val();if(b.NLNS){SN.C.I.NoticeDataGeo.NLNS=a.find("[name=location_ns]").val(b.NLNS).val();SN.C.I.NoticeDataGeo.NLID=a.find("[name=location_id]").val(b.NLID).val()}else{a.find("[name=location_ns]").val("");a.find("[name=location_id]").val("")}}if(b=="disabled"){SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked",false).attr("checked")}else{SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked",true).attr("checked")}},GetResponseXML:function(b){try{return b.responseXML}catch(a){return(new DOMParser()).parseFromString(b.responseText,"text/xml")}},NoticeReply:function(){$("#content .notice_reply").live("click",function(c){c.preventDefault();var b=$(this).closest("li.notice");var a=($(".author .nickname",b).length>0)?$($(".author .nickname",b)[0]):$(".author .nickname.uid");SN.U.NoticeInlineReplyTrigger(b,"@"+a.text());return false})},NoticeReplyTo:function(a){},NoticeInlineReplyTrigger:function(h,i){var b=$($(".notice_id",h)[0]).text();var e=h;var f=h.closest(".notices");if(f.hasClass("threaded-replies")){e=f.closest(".notice")}else{f=$("ul.threaded-replies",h);if(f.length==0){f=$('<ul class="notices threaded-replies xoxo"></ul>');h.append(f)}}var j=$(".notice-reply-form",f);var d=function(){j.find("input[name=inreplyto]").val(b);var m=j.find("textarea");if(m.length==0){throw"No textarea"}var l="";if(i){l=i+" "}m.val(l+m.val().replace(RegExp(l,"i"),""));m.data("initialText",$.trim(i+""));m.focus();if(m[0].setSelectionRange){var k=m.val().length;m[0].setSelectionRange(k,k)}};if(j.length>0){d()}else{f.find("li.notice-reply-placeholder").remove();var g=$("li.notice-reply",f);if(g.length==0){g=$('<li class="notice-reply"></li>');var c=function(k){var l=document._importNode(k,true);g.append(l);f.append(g);var m=j=$(l);SN.Init.NoticeFormSetup(m);d()};if(SN.C.I.NoticeFormMaster){c(SN.C.I.NoticeFormMaster)}else{var a=$("#form_notice").attr("action");$.get(a,{ajax:1},function(k,m,l){c($("form",k)[0])})}}}},NoticeInlineReplyPlaceholder:function(b){var a=b.find("ul.threaded-replies");var c=$('<li class="notice-reply-placeholder"><input class="placeholder"></li>');c.find("input").val(SN.msg("reply_placeholder"));a.append(c)},NoticeInlineReplySetup:function(){$("li.notice-reply-placeholder input").live("focus",function(){var a=$(this).closest("li.notice");SN.U.NoticeInlineReplyTrigger(a);return false})},NoticeRepeat:function(){$(".form_repeat").live("click",function(a){a.preventDefault();SN.U.NoticeRepeatConfirmation($(this));return false})},NoticeRepeatConfirmation:function(a){var c=a.find(".submit");var b=c.clone();b.addClass("submit_dialogbox").removeClass("submit");a.append(b);b.bind("click",function(){SN.U.FormXHR(a);return false});c.hide();a.addClass("dialogbox").append('<button class="close">&#215;</button>').closest(".notice-options").addClass("opaque");a.find("button.close").click(function(){$(this).remove();a.removeClass("dialogbox").closest(".notice-options").removeClass("opaque");a.find(".submit_dialogbox").remove();a.find(".submit").show();return false})},NoticeAttachments:function(){$(".notice a.attachment").each(function(){SN.U.NoticeWithAttachment($(this).closest(".notice"))})},NoticeWithAttachment:function(b){if(b.find(".attachment").length===0){return}var a=b.find(".attachment.more");if(a.length>0){$(a[0]).click(function(){var c=$(this);c.addClass(SN.C.S.Processing);$.get(c.attr("href")+"/ajax",null,function(d){c.parent(".entry-content").html($(d).find("#attachment_view .entry-content").html())});return false}).attr("title",SN.msg("showmore_tooltip"))}},NoticeDataAttach:function(b){var a=b.find("input[type=file]");a.change(function(f){b.find(".attach-status").remove();var d=$(this).val();if(!d){return false}var c=$('<div class="attach-status '+SN.C.S.Success+'"><code></code> <button class="close">&#215;</button></div>');c.find("code").text(d);c.find("button").click(function(){c.remove();a.val("");return false});b.append(c);if(typeof this.files=="object"){for(var e=0;e<this.files.length;e++){SN.U.PreviewAttach(b,this.files[e])}}})},maxFileSize:function(b){var a=$(b).find("input[name=MAX_FILE_SIZE]").attr("value");if(a){return parseInt(a)}else{return 0}},PreviewAttach:function(d,c){var e=c.type+" "+Math.round(c.size/1024)+"KB";var f=true;var h;if(typeof window.createObjectURL!="undefined"){h=function(i,j){j(window.createObjectURL(i))}}else{if(typeof window.FileReader!="undefined"){h=function(j,k){var i=new FileReader();i.onload=function(l){k(i.result)};i.readAsDataURL(j)}}else{f=false}}var a=["image/png","image/jpeg","image/gif","image/svg+xml"];if($.inArray(c.type,a)==-1){f=false}var g=8*1024*1024;if(c.size>g){f=false}if(f){h(c,function(j){var i=$("<img>").attr("title",e).attr("alt",e).attr("src",j).attr("style","height: 120px");d.find(".attach-status").append(i)})}else{var b=$("<div></div>").text(e);d.find(".attach-status").append(b)}},NoticeLocationAttach:function(a){var e=a.find("[name=lat]");var k=a.find("[name=lon]");var g=a.find("[name=location_ns]").val();var l=a.find("[name=location_id]").val();var b="";var d=a.find("[name=notice_data-geo]");var c=a.find("[name=notice_data-geo]");var j=a.find("label.notice_data-geo");function f(n){j.attr("title",jQuery.trim(j.text())).removeClass("checked");a.find("[name=lat]").val("");a.find("[name=lon]").val("");a.find("[name=location_ns]").val("");a.find("[name=location_id]").val("");a.find("[name=notice_data-geo]").attr("checked",false);$.cookie(SN.C.S.NoticeDataGeoCookie,"disabled",{path:"/"});if(n){a.find(".geo_status_wrapper").removeClass("success").addClass("error");a.find(".geo_status_wrapper .geo_status").text(n)}else{a.find(".geo_status_wrapper").remove()}}function m(n,o){SN.U.NoticeGeoStatus(a,"Looking up place name...");$.getJSON(n,o,function(p){var q,r;if(typeof(p.location_ns)!="undefined"){a.find("[name=location_ns]").val(p.location_ns);q=p.location_ns}if(typeof(p.location_id)!="undefined"){a.find("[name=location_id]").val(p.location_id);r=p.location_id}if(typeof(p.name)=="undefined"){NLN_text=o.lat+";"+o.lon}else{NLN_text=p.name}SN.U.NoticeGeoStatus(a,NLN_text,o.lat,o.lon,p.url);j.attr("title",NoticeDataGeo_text.ShareDisable+" ("+NLN_text+")");a.find("[name=lat]").val(o.lat);a.find("[name=lon]").val(o.lon);a.find("[name=location_ns]").val(q);a.find("[name=location_id]").val(r);a.find("[name=notice_data-geo]").attr("checked",true);var s={NLat:o.lat,NLon:o.lon,NLNS:q,NLID:r,NLN:NLN_text,NLNU:p.url,NDG:true};$.cookie(SN.C.S.NoticeDataGeoCookie,JSON.stringify(s),{path:"/"})})}if(c.length>0){if($.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){c.attr("checked",false)}else{c.attr("checked",true)}var h=a.find(".notice_data-geo_wrap");var i=h.attr("data-api");j.attr("title",j.text());c.change(function(){if(c.attr("checked")===true||$.cookie(SN.C.S.NoticeDataGeoCookie)===null){j.attr("title",NoticeDataGeo_text.ShareDisable).addClass("checked");if($.cookie(SN.C.S.NoticeDataGeoCookie)===null||$.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){if(navigator.geolocation){SN.U.NoticeGeoStatus(a,"Requesting location from browser...");navigator.geolocation.getCurrentPosition(function(p){a.find("[name=lat]").val(p.coords.latitude);a.find("[name=lon]").val(p.coords.longitude);var q={lat:p.coords.latitude,lon:p.coords.longitude,token:$("#token").val()};m(i,q)},function(p){switch(p.code){case p.PERMISSION_DENIED:f("Location permission denied.");break;case p.TIMEOUT:f("Location lookup timeout.");break}},{timeout:10000})}else{if(e.length>0&&k.length>0){var n={lat:e,lon:k,token:$("#token").val()};m(i,n)}else{f();c.remove();j.remove()}}}else{var o=JSON.parse($.cookie(SN.C.S.NoticeDataGeoCookie));a.find("[name=lat]").val(o.NLat);a.find("[name=lon]").val(o.NLon);a.find("[name=location_ns]").val(o.NLNS);a.find("[name=location_id]").val(o.NLID);a.find("[name=notice_data-geo]").attr("checked",o.NDG);SN.U.NoticeGeoStatus(a,o.NLN,o.NLat,o.NLon,o.NLNU);j.attr("title",NoticeDataGeo_text.ShareDisable+" ("+o.NLN+")").addClass("checked")}}else{f()}}).change()}},NoticeGeoStatus:function(e,a,f,g,c){var h=e.find(".geo_status_wrapper");if(h.length==0){h=$('<div class="'+SN.C.S.Success+' geo_status_wrapper"><button class="close" style="float:right">&#215;</button><div class="geo_status"></div></div>');h.find("button.close").click(function(){e.find("[name=notice_data-geo]").removeAttr("checked").change();return false});e.append(h)}var b;if(c){b=$("<a></a>").attr("href",c)}else{b=$("<span></span>")}b.text(a);if(f||g){var d=f+";"+g;b.attr("title",d);if(!a){b.text(d)}}h.find(".geo_status").empty().append(b)},NewDirectMessage:function(){NDM=$(".entity_send-a-message a");NDM.attr({href:NDM.attr("href")+"&ajax=1"});NDM.bind("click",function(){var a=$(".entity_send-a-message form");if(a.length===0){$(this).addClass(SN.C.S.Processing);$.get(NDM.attr("href"),null,function(b){$(".entity_send-a-message").append(document._importNode($("form",b)[0],true));a=$(".entity_send-a-message .form_notice");SN.U.FormNoticeXHR(a);SN.U.FormNoticeEnhancements(a);a.append('<button class="close">&#215;</button>');$(".entity_send-a-message button").click(function(){a.hide();return false});NDM.removeClass(SN.C.S.Processing)})}else{a.show();$(".entity_send-a-message textarea").focus()}return false})},GetFullYear:function(c,d,a){var b=new Date();b.setFullYear(c,d,a);return b},StatusNetInstance:{Set:function(b){var a=SN.U.StatusNetInstance.Get();if(a!==null){b=$.extend(a,b)}$.cookie(SN.C.S.StatusNetInstance,JSON.stringify(b),{path:"/",expires:SN.U.GetFullYear(2029,0,1)})},Get:function(){var a=$.cookie(SN.C.S.StatusNetInstance);if(a!==null){return JSON.parse(a)}return null},Delete:function(){$.cookie(SN.C.S.StatusNetInstance,null)}},belongsOnTimeline:function(b){var a=$("body").attr("id");if(a=="public"){return true}var c=$("#nav_profile a").attr("href");if(c){var d=$(b).find(".vcard.author a.url").attr("href");if(d==c){if(a=="all"||a=="showstream"){return true}}}return false},switchInputFormTab:function(a){$(".input_form_nav_tab.current").removeClass("current");if(a=="placeholder"){$("#input_form_nav_status").addClass("current")}else{$("#input_form_nav_"+a).addClass("current")}$(".input_form.current").removeClass("current");$("#input_form_"+a).addClass("current").find(".ajax-notice").each(function(){var b=$(this);SN.Init.NoticeFormSetup(b)}).find("textarea:first").focus()}},Init:{NoticeForm:function(){if($("body.user_in").length>0){$("#input_form_placeholder input.placeholder").focus(function(){SN.U.switchInputFormTab("status")});$("body").bind("click",function(g){var d=$("#content .input_forms div.current");if(d.length>0){if($("#content .input_forms").has(g.target).length==0){var a=d.find('textarea, input[type=text], input[type=""]');var c=false;a.each(function(){c=c||$(this).val()});if(!c){SN.U.switchInputFormTab("placeholder")}}}var b=$("li.notice-reply");if(b.length>0){var f=$(g.target);b.each(function(){var j=$(this);if(j.has(g.target).length==0){var h=j.find(".notice_data-text:first");var i=$.trim(h.val());if(i==""||i==h.data("initialText")){var e=j.closest("li.notice");j.remove();SN.U.NoticeInlineReplyPlaceholder(e)}}})}})}},NoticeFormSetup:function(a){if(!a.data("NoticeFormSetup")){SN.U.NoticeLocationAttach(a);SN.U.FormNoticeXHR(a);SN.U.FormNoticeEnhancements(a);SN.U.NoticeDataAttach(a);a.data("NoticeFormSetup",true)}},Notices:function(){if($("body.user_in").length>0){var a=$(".form_notice:first");if(a.length>0){SN.C.I.NoticeFormMaster=document._importNode(a[0],true)}SN.U.NoticeRepeat();SN.U.NoticeReply();SN.U.NoticeInlineReplySetup()}SN.U.NoticeAttachments()},EntityActions:function(){if($("body.user_in").length>0){SN.U.NewDirectMessage()}},Login:function(){if(SN.U.StatusNetInstance.Get()!==null){var a=SN.U.StatusNetInstance.Get().Nickname;if(a!==null){$("#form_login #nickname").val(a)}}$("#form_login").bind("submit",function(){SN.U.StatusNetInstance.Set({Nickname:$("#form_login #nickname").val()});return true})},AjaxForms:function(){$("form.ajax").live("submit",function(){SN.U.FormXHR($(this));return false})},UploadForms:function(){$("input[type=file]").change(function(d){if(typeof this.files=="object"&&this.files.length>0){var c=0;for(var b=0;b<this.files.length;b++){c+=this.files[b].size}var a=SN.U.maxFileSize($(this.form));if(a>0&&c>a){var e="File too large: maximum upload size is %d bytes.";alert(e.replace("%d",a));$(this).val("");d.preventDefault();return false}}})}}};$(document).ready(function(){SN.Init.AjaxForms();SN.Init.UploadForms();if($("."+SN.C.S.FormNotice).length>0){SN.Init.NoticeForm()}if($("#content .notices").length>0){SN.Init.Notices()}if($("#content .entity_actions").length>0){SN.Init.EntityActions()}if($("#form_login").length>0){SN.Init.Login()}});if(!document.ELEMENT_NODE){document.ELEMENT_NODE=1;document.ATTRIBUTE_NODE=2;document.TEXT_NODE=3;document.CDATA_SECTION_NODE=4;document.ENTITY_REFERENCE_NODE=5;document.ENTITY_NODE=6;document.PROCESSING_INSTRUCTION_NODE=7;document.COMMENT_NODE=8;document.DOCUMENT_NODE=9;document.DOCUMENT_TYPE_NODE=10;document.DOCUMENT_FRAGMENT_NODE=11;document.NOTATION_NODE=12}document._importNode=function(e,a){switch(e.nodeType){case document.ELEMENT_NODE:var d=document.createElement(e.nodeName);if(e.attributes&&e.attributes.length>0){for(var c=0,b=e.attributes.length;c<b;){if(e.attributes[c].nodeName=="class"){d.className=e.getAttribute(e.attributes[c++].nodeName)}else{d.setAttribute(e.attributes[c].nodeName,e.getAttribute(e.attributes[c++].nodeName))}}}if(a&&e.childNodes&&e.childNodes.length>0){for(var c=0,b=e.childNodes.length;c<b;){d.appendChild(document._importNode(e.childNodes[c++],a))}}return d;break;case document.TEXT_NODE:case document.CDATA_SECTION_NODE:case document.COMMENT_NODE:return document.createTextNode(e.nodeValue);break}};if(typeof navigator.geolocation=="undefined"||navigator.geolocation.shim){(function(){(function(){if(window.google&&google.gears){return}var c=null;if(typeof GearsFactory!="undefined"){c=new GearsFactory()}else{try{c=new ActiveXObject("Gears.Factory");if(c.getBuildInfo().indexOf("ie_mobile")!=-1){c.privateSetGlobalObject(this)}}catch(d){if((typeof navigator.mimeTypes!="undefined")&&navigator.mimeTypes["application/x-googlegears"]){c=document.createElement("object");c.style.display="none";c.width=0;c.height=0;c.type="application/x-googlegears";document.documentElement.appendChild(c)}}}if(!c){return}if(!window.google){google={}}if(!google.gears){google.gears={factory:c}}})();var a=(function(){var d=google.gears.factory.create("beta.geolocation");var c=function(f,e){return function(g){f(g);e.lastPosition=g}};return{shim:true,type:"Gears",lastPosition:null,getCurrentPosition:function(e,g,h){var f=this;var i=c(e,f);d.getCurrentPosition(i,g,h)},watchPosition:function(e,f,g){d.watchPosition(e,f,g)},clearWatch:function(e){d.clearWatch(e)},getPermission:function(g,e,f){d.getPermission(g,e,f)}}});var b=(function(){var i=false;var e=function(){if(!d()&&!i){i=true;var j=document.createElement("script");j.src=(document.location.protocol=="https:"?"https://":"http://")+"www.google.com/jsapi?callback=_google_loader_apiLoaded";j.type="text/javascript";document.getElementsByTagName("body")[0].appendChild(j)}};var c=[];var h=function(j){c.push(j)};var f=function(){if(d()){while(c.length>0){var j=c.pop();j()}}};window._google_loader_apiLoaded=function(){f()};var d=function(){return(window.google&&google.loader)};var g=function(j){if(d()){return true}h(j);e();return false};e();return{shim:true,type:"ClientLocation",lastPosition:null,getCurrentPosition:function(k,n,o){var m=this;if(!g(function(){m.getCurrentPosition(k,n,o)})){return}if(google.loader.ClientLocation){var l=google.loader.ClientLocation;var j={coords:{latitude:l.latitude,longitude:l.longitude,altitude:null,accuracy:43000,altitudeAccuracy:null,heading:null,speed:null},address:{city:l.address.city,country:l.address.country,country_code:l.address.country_code,region:l.address.region},timestamp:new Date()};k(j);this.lastPosition=j}else{if(n==="function"){n({code:3,message:"Using the Google ClientLocation API and it is not able to calculate a location."})}}},watchPosition:function(j,l,m){this.getCurrentPosition(j,l,m);var k=this;var n=setInterval(function(){k.getCurrentPosition(j,l,m)},10000);return n},clearWatch:function(j){clearInterval(j)},getPermission:function(l,j,k){return true}}});navigator.geolocation=(window.google&&google.gears)?a():b()})()};
\ No newline at end of file
+var SN={C:{I:{CounterBlackout:false,MaxLength:140,PatternUsername:/^[0-9a-zA-Z\-_.]*$/,HTTP20x30x:[200,201,202,203,204,205,206,300,301,302,303,304,305,306,307],NoticeFormMaster:null},S:{Disabled:"disabled",Warning:"warning",Error:"error",Success:"success",Processing:"processing",CommandResult:"command_result",FormNotice:"form_notice",NoticeDataGeo:"notice_data-geo",NoticeDataGeoCookie:"NoticeDataGeo",NoticeDataGeoSelected:"notice_data-geo_selected",StatusNetInstance:"StatusNetInstance"}},messages:{},msg:function(a){if(typeof SN.messages[a]=="undefined"){return"["+a+"]"}else{return SN.messages[a]}},U:{FormNoticeEnhancements:function(b){if(jQuery.data(b[0],"ElementData")===undefined){MaxLength=b.find(".count").text();if(typeof(MaxLength)=="undefined"){MaxLength=SN.C.I.MaxLength}jQuery.data(b[0],"ElementData",{MaxLength:MaxLength});SN.U.Counter(b);NDT=b.find(".notice_data-text:first");NDT.bind("keyup",function(c){SN.U.Counter(b)});var a=function(c){window.setTimeout(function(){SN.U.Counter(b)},50)};NDT.bind("cut",a).bind("paste",a)}else{b.find(".count").text(jQuery.data(b[0],"ElementData").MaxLength)}},Counter:function(d){SN.C.I.FormNoticeCurrent=d;var b=jQuery.data(d[0],"ElementData").MaxLength;if(b<=0){return}var c=b-SN.U.CharacterCount(d);var a=d.find(".count");if(c.toString()!=a.text()){if(!SN.C.I.CounterBlackout||c===0){if(a.text()!=String(c)){a.text(c)}if(c<0){d.addClass(SN.C.S.Warning)}else{d.removeClass(SN.C.S.Warning)}if(!SN.C.I.CounterBlackout){SN.C.I.CounterBlackout=true;SN.C.I.FormNoticeCurrent=d;window.setTimeout("SN.U.ClearCounterBlackout(SN.C.I.FormNoticeCurrent);",500)}}}},CharacterCount:function(a){return a.find(".notice_data-text:first").val().length},ClearCounterBlackout:function(a){SN.C.I.CounterBlackout=false;SN.U.Counter(a)},RewriteAjaxAction:function(a){if(document.location.protocol=="https:"&&a.substr(0,5)=="http:"){return a.replace(/^http:\/\/[^:\/]+/,"https://"+document.location.host)}else{return a}},FormXHR:function(a){$.ajax({type:"POST",dataType:"xml",url:SN.U.RewriteAjaxAction(a.attr("action")),data:a.serialize()+"&ajax=1",beforeSend:function(b){a.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(d,e,c){var b=null;if(d.responseXML){b=$("#error",d.responseXML).text()}alert(b||c||e);a.removeClass(SN.C.S.Processing).find(".submit").removeClass(SN.C.S.Disabled).removeAttr(SN.C.S.Disabled)},success:function(b,c){if(typeof($("form",b)[0])!="undefined"){form_new=document._importNode($("form",b)[0],true);a.replaceWith(form_new)}else{if(typeof($("p",b)[0])!="undefined"){a.replaceWith(document._importNode($("p",b)[0],true))}else{alert("Unknown error.")}}}})},FormNoticeXHR:function(b){SN.C.I.NoticeDataGeo={};b.append('<input type="hidden" name="ajax" value="1"/>');b.attr("action",SN.U.RewriteAjaxAction(b.attr("action")));var c=function(d,e){b.append($('<p class="form_response"></p>').addClass(d).text(e))};var a=function(){b.find(".form_response").remove()};b.ajaxForm({dataType:"xml",timeout:"60000",beforeSend:function(d){if(b.find(".notice_data-text:first").val()==""){b.addClass(SN.C.S.Warning);return false}b.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled);SN.U.normalizeGeoData(b);return true},error:function(f,g,e){b.removeClass(SN.C.S.Processing).find(".submit").removeClass(SN.C.S.Disabled).removeAttr(SN.C.S.Disabled,SN.C.S.Disabled);a();if(g=="timeout"){c("error","Sorry! We had trouble sending your notice. The servers are overloaded. Please try again, and contact the site administrator if this problem persists.")}else{var d=SN.U.GetResponseXML(f);if($("."+SN.C.S.Error,d).length>0){b.append(document._importNode($("."+SN.C.S.Error,d)[0],true))}else{if(parseInt(f.status)===0||jQuery.inArray(parseInt(f.status),SN.C.I.HTTP20x30x)>=0){b.resetForm().find(".attach-status").remove();SN.U.FormNoticeEnhancements(b)}else{c("error","(Sorry! We had trouble sending your notice ("+f.status+" "+f.statusText+"). Please report the problem to the site administrator if this happens again.")}}}},success:function(i,f){a();var n=$("#"+SN.C.S.Error,i);if(n.length>0){c("error",n.text())}else{if($("body")[0].id=="bookmarklet"){self.close()}var d=$("#"+SN.C.S.CommandResult,i);if(d.length>0){c("success",d.text())}else{var m=document._importNode($("li",i)[0],true);var k=$("#notices_primary .notices:first");var l=b.closest("li.notice-reply");if(l.length>0){var e=$(m).attr("id");if($("#"+e).length==0){var j=l.closest("li.notice");l.replaceWith(m);SN.U.NoticeInlineReplyPlaceholder(j)}else{l.remove()}}else{if(k.length>0&&SN.U.belongsOnTimeline(m)){if($("#"+m.id).length===0){var h=b.find("[name=inreplyto]").val();var g="#notices_primary #notice-"+h;if($("body")[0].id=="conversation"){if(h.length>0&&$(g+" .notices").length<1){$(g).append('<ul class="notices"></ul>')}$($(g+" .notices")[0]).append(m)}else{k.prepend(m)}$("#"+m.id).css({display:"none"}).fadeIn(2500);SN.U.NoticeWithAttachment($("#"+m.id));SN.U.switchInputFormTab("placeholder")}}else{c("success",$("title",i).text())}}}b.resetForm();b.find("[name=inreplyto]").val("");b.find(".attach-status").remove();SN.U.FormNoticeEnhancements(b)}},complete:function(d,e){b.removeClass(SN.C.S.Processing).find(".submit").removeAttr(SN.C.S.Disabled).removeClass(SN.C.S.Disabled);b.find("[name=lat]").val(SN.C.I.NoticeDataGeo.NLat);b.find("[name=lon]").val(SN.C.I.NoticeDataGeo.NLon);b.find("[name=location_ns]").val(SN.C.I.NoticeDataGeo.NLNS);b.find("[name=location_id]").val(SN.C.I.NoticeDataGeo.NLID);b.find("[name=notice_data-geo]").attr("checked",SN.C.I.NoticeDataGeo.NDG)}})},normalizeGeoData:function(a){SN.C.I.NoticeDataGeo.NLat=a.find("[name=lat]").val();SN.C.I.NoticeDataGeo.NLon=a.find("[name=lon]").val();SN.C.I.NoticeDataGeo.NLNS=a.find("[name=location_ns]").val();SN.C.I.NoticeDataGeo.NLID=a.find("[name=location_id]").val();SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked");var b=$.cookie(SN.C.S.NoticeDataGeoCookie);if(b!==null&&b!="disabled"){b=JSON.parse(b);SN.C.I.NoticeDataGeo.NLat=a.find("[name=lat]").val(b.NLat).val();SN.C.I.NoticeDataGeo.NLon=a.find("[name=lon]").val(b.NLon).val();if(b.NLNS){SN.C.I.NoticeDataGeo.NLNS=a.find("[name=location_ns]").val(b.NLNS).val();SN.C.I.NoticeDataGeo.NLID=a.find("[name=location_id]").val(b.NLID).val()}else{a.find("[name=location_ns]").val("");a.find("[name=location_id]").val("")}}if(b=="disabled"){SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked",false).attr("checked")}else{SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked",true).attr("checked")}},GetResponseXML:function(b){try{return b.responseXML}catch(a){return(new DOMParser()).parseFromString(b.responseText,"text/xml")}},NoticeReply:function(){$("#content .notice_reply").live("click",function(c){c.preventDefault();var b=$(this).closest("li.notice");var a=($(".author .nickname",b).length>0)?$($(".author .nickname",b)[0]):$(".author .nickname.uid");SN.U.NoticeInlineReplyTrigger(b,"@"+a.text());return false})},NoticeReplyTo:function(a){},NoticeInlineReplyTrigger:function(h,i){var b=$($(".notice_id",h)[0]).text();var e=h;var f=h.closest(".notices");if(f.hasClass("threaded-replies")){e=f.closest(".notice")}else{f=$("ul.threaded-replies",h);if(f.length==0){f=$('<ul class="notices threaded-replies xoxo"></ul>');h.append(f)}}var j=$(".notice-reply-form",f);var d=function(){j.find("input[name=inreplyto]").val(b);var m=j.find("textarea");if(m.length==0){throw"No textarea"}var l="";if(i){l=i+" "}m.val(l+m.val().replace(RegExp(l,"i"),""));m.data("initialText",$.trim(i+""));m.focus();if(m[0].setSelectionRange){var k=m.val().length;m[0].setSelectionRange(k,k)}};if(j.length>0){d()}else{f.find("li.notice-reply-placeholder").remove();var g=$("li.notice-reply",f);if(g.length==0){g=$('<li class="notice-reply"></li>');var c=function(k){var l=document._importNode(k,true);g.append(l);f.append(g);var m=j=$(l);SN.Init.NoticeFormSetup(m);d()};if(SN.C.I.NoticeFormMaster){c(SN.C.I.NoticeFormMaster)}else{var a=$("#form_notice").attr("action");$.get(a,{ajax:1},function(k,m,l){c($("form",k)[0])})}}}},NoticeInlineReplyPlaceholder:function(b){var a=b.find("ul.threaded-replies");var c=$('<li class="notice-reply-placeholder"><input class="placeholder"></li>');c.find("input").val(SN.msg("reply_placeholder"));a.append(c)},NoticeInlineReplySetup:function(){$("li.notice-reply-placeholder input").live("focus",function(){var a=$(this).closest("li.notice");SN.U.NoticeInlineReplyTrigger(a);return false})},NoticeRepeat:function(){$(".form_repeat").live("click",function(a){a.preventDefault();SN.U.NoticeRepeatConfirmation($(this));return false})},NoticeRepeatConfirmation:function(a){var c=a.find(".submit");var b=c.clone();b.addClass("submit_dialogbox").removeClass("submit");a.append(b);b.bind("click",function(){SN.U.FormXHR(a);return false});c.hide();a.addClass("dialogbox").append('<button class="close">&#215;</button>').closest(".notice-options").addClass("opaque");a.find("button.close").click(function(){$(this).remove();a.removeClass("dialogbox").closest(".notice-options").removeClass("opaque");a.find(".submit_dialogbox").remove();a.find(".submit").show();return false})},NoticeAttachments:function(){$(".notice a.attachment").each(function(){SN.U.NoticeWithAttachment($(this).closest(".notice"))})},NoticeWithAttachment:function(b){if(b.find(".attachment").length===0){return}var a=b.find(".attachment.more");if(a.length>0){$(a[0]).click(function(){var c=$(this);c.addClass(SN.C.S.Processing);$.get(c.attr("href")+"/ajax",null,function(d){c.parent(".entry-content").html($(d).find("#attachment_view .entry-content").html())});return false}).attr("title",SN.msg("showmore_tooltip"))}},NoticeDataAttach:function(b){var a=b.find("input[type=file]");a.change(function(f){b.find(".attach-status").remove();var d=$(this).val();if(!d){return false}var c=$('<div class="attach-status '+SN.C.S.Success+'"><code></code> <button class="close">&#215;</button></div>');c.find("code").text(d);c.find("button").click(function(){c.remove();a.val("");return false});b.append(c);if(typeof this.files=="object"){for(var e=0;e<this.files.length;e++){SN.U.PreviewAttach(b,this.files[e])}}})},maxFileSize:function(b){var a=$(b).find("input[name=MAX_FILE_SIZE]").attr("value");if(a){return parseInt(a)}else{return 0}},PreviewAttach:function(d,c){var e=c.type+" "+Math.round(c.size/1024)+"KB";var f=true;var h;if(typeof window.createObjectURL!="undefined"){h=function(i,j){j(window.createObjectURL(i))}}else{if(typeof window.FileReader!="undefined"){h=function(j,k){var i=new FileReader();i.onload=function(l){k(i.result)};i.readAsDataURL(j)}}else{f=false}}var a=["image/png","image/jpeg","image/gif","image/svg+xml"];if($.inArray(c.type,a)==-1){f=false}var g=8*1024*1024;if(c.size>g){f=false}if(f){h(c,function(j){var i=$("<img>").attr("title",e).attr("alt",e).attr("src",j).attr("style","height: 120px");d.find(".attach-status").append(i)})}else{var b=$("<div></div>").text(e);d.find(".attach-status").append(b)}},NoticeLocationAttach:function(a){var e=a.find("[name=lat]");var k=a.find("[name=lon]");var g=a.find("[name=location_ns]").val();var l=a.find("[name=location_id]").val();var b="";var d=a.find("[name=notice_data-geo]");var c=a.find("[name=notice_data-geo]");var j=a.find("label.notice_data-geo");function f(n){j.attr("title",jQuery.trim(j.text())).removeClass("checked");a.find("[name=lat]").val("");a.find("[name=lon]").val("");a.find("[name=location_ns]").val("");a.find("[name=location_id]").val("");a.find("[name=notice_data-geo]").attr("checked",false);$.cookie(SN.C.S.NoticeDataGeoCookie,"disabled",{path:"/"});if(n){a.find(".geo_status_wrapper").removeClass("success").addClass("error");a.find(".geo_status_wrapper .geo_status").text(n)}else{a.find(".geo_status_wrapper").remove()}}function m(n,o){SN.U.NoticeGeoStatus(a,"Looking up place name...");$.getJSON(n,o,function(p){var q,r;if(typeof(p.location_ns)!="undefined"){a.find("[name=location_ns]").val(p.location_ns);q=p.location_ns}if(typeof(p.location_id)!="undefined"){a.find("[name=location_id]").val(p.location_id);r=p.location_id}if(typeof(p.name)=="undefined"){NLN_text=o.lat+";"+o.lon}else{NLN_text=p.name}SN.U.NoticeGeoStatus(a,NLN_text,o.lat,o.lon,p.url);j.attr("title",NoticeDataGeo_text.ShareDisable+" ("+NLN_text+")");a.find("[name=lat]").val(o.lat);a.find("[name=lon]").val(o.lon);a.find("[name=location_ns]").val(q);a.find("[name=location_id]").val(r);a.find("[name=notice_data-geo]").attr("checked",true);var s={NLat:o.lat,NLon:o.lon,NLNS:q,NLID:r,NLN:NLN_text,NLNU:p.url,NDG:true};$.cookie(SN.C.S.NoticeDataGeoCookie,JSON.stringify(s),{path:"/"})})}if(c.length>0){if($.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){c.attr("checked",false)}else{c.attr("checked",true)}var h=a.find(".notice_data-geo_wrap");var i=h.attr("data-api");j.attr("title",j.text());c.change(function(){if(c.attr("checked")===true||$.cookie(SN.C.S.NoticeDataGeoCookie)===null){j.attr("title",NoticeDataGeo_text.ShareDisable).addClass("checked");if($.cookie(SN.C.S.NoticeDataGeoCookie)===null||$.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){if(navigator.geolocation){SN.U.NoticeGeoStatus(a,"Requesting location from browser...");navigator.geolocation.getCurrentPosition(function(p){a.find("[name=lat]").val(p.coords.latitude);a.find("[name=lon]").val(p.coords.longitude);var q={lat:p.coords.latitude,lon:p.coords.longitude,token:$("#token").val()};m(i,q)},function(p){switch(p.code){case p.PERMISSION_DENIED:f("Location permission denied.");break;case p.TIMEOUT:f("Location lookup timeout.");break}},{timeout:10000})}else{if(e.length>0&&k.length>0){var n={lat:e,lon:k,token:$("#token").val()};m(i,n)}else{f();c.remove();j.remove()}}}else{var o=JSON.parse($.cookie(SN.C.S.NoticeDataGeoCookie));a.find("[name=lat]").val(o.NLat);a.find("[name=lon]").val(o.NLon);a.find("[name=location_ns]").val(o.NLNS);a.find("[name=location_id]").val(o.NLID);a.find("[name=notice_data-geo]").attr("checked",o.NDG);SN.U.NoticeGeoStatus(a,o.NLN,o.NLat,o.NLon,o.NLNU);j.attr("title",NoticeDataGeo_text.ShareDisable+" ("+o.NLN+")").addClass("checked")}}else{f()}}).change()}},NoticeGeoStatus:function(e,a,f,g,c){var h=e.find(".geo_status_wrapper");if(h.length==0){h=$('<div class="'+SN.C.S.Success+' geo_status_wrapper"><button class="close" style="float:right">&#215;</button><div class="geo_status"></div></div>');h.find("button.close").click(function(){e.find("[name=notice_data-geo]").removeAttr("checked").change();return false});e.append(h)}var b;if(c){b=$("<a></a>").attr("href",c)}else{b=$("<span></span>")}b.text(a);if(f||g){var d=f+";"+g;b.attr("title",d);if(!a){b.text(d)}}h.find(".geo_status").empty().append(b)},NewDirectMessage:function(){NDM=$(".entity_send-a-message a");NDM.attr({href:NDM.attr("href")+"&ajax=1"});NDM.bind("click",function(){var a=$(".entity_send-a-message form");if(a.length===0){$(this).addClass(SN.C.S.Processing);$.get(NDM.attr("href"),null,function(b){$(".entity_send-a-message").append(document._importNode($("form",b)[0],true));a=$(".entity_send-a-message .form_notice");SN.U.FormNoticeXHR(a);SN.U.FormNoticeEnhancements(a);a.append('<button class="close">&#215;</button>');$(".entity_send-a-message button").click(function(){a.hide();return false});NDM.removeClass(SN.C.S.Processing)})}else{a.show();$(".entity_send-a-message textarea").focus()}return false})},GetFullYear:function(c,d,a){var b=new Date();b.setFullYear(c,d,a);return b},StatusNetInstance:{Set:function(b){var a=SN.U.StatusNetInstance.Get();if(a!==null){b=$.extend(a,b)}$.cookie(SN.C.S.StatusNetInstance,JSON.stringify(b),{path:"/",expires:SN.U.GetFullYear(2029,0,1)})},Get:function(){var a=$.cookie(SN.C.S.StatusNetInstance);if(a!==null){return JSON.parse(a)}return null},Delete:function(){$.cookie(SN.C.S.StatusNetInstance,null)}},belongsOnTimeline:function(b){var a=$("body").attr("id");if(a=="public"){return true}var c=$("#nav_profile a").attr("href");if(c){var d=$(b).find(".vcard.author a.url").attr("href");if(d==c){if(a=="all"||a=="showstream"){return true}}}return false},switchInputFormTab:function(a){$(".input_form_nav_tab.current").removeClass("current");if(a=="placeholder"){$("#input_form_nav_status").addClass("current")}else{$("#input_form_nav_"+a).addClass("current")}$(".input_form.current").removeClass("current");$("#input_form_"+a).addClass("current").find(".ajax-notice").each(function(){var b=$(this);SN.Init.NoticeFormSetup(b)}).find("textarea:first").focus()}},Init:{NoticeForm:function(){if($("body.user_in").length>0){$("#input_form_placeholder input.placeholder").focus(function(){SN.U.switchInputFormTab("status")});$("body").bind("click",function(g){var d=$("#content .input_forms div.current");if(d.length>0){if($("#content .input_forms").has(g.target).length==0){var a=d.find('textarea, input[type=text], input[type=""]');var c=false;a.each(function(){c=c||$(this).val()});if(!c){SN.U.switchInputFormTab("placeholder")}}}var b=$("li.notice-reply");if(b.length>0){var f=$(g.target);b.each(function(){var j=$(this);if(j.has(g.target).length==0){var h=j.find(".notice_data-text:first");var i=$.trim(h.val());if(i==""||i==h.data("initialText")){var e=j.closest("li.notice");j.remove();SN.U.NoticeInlineReplyPlaceholder(e)}}})}})}},NoticeFormSetup:function(a){if(!a.data("NoticeFormSetup")){SN.U.NoticeLocationAttach(a);SN.U.FormNoticeXHR(a);SN.U.FormNoticeEnhancements(a);SN.U.NoticeDataAttach(a);a.data("NoticeFormSetup",true)}},Notices:function(){if($("body.user_in").length>0){var a=$(".form_notice:first");if(a.length>0){SN.C.I.NoticeFormMaster=document._importNode(a[0],true)}SN.U.NoticeRepeat();SN.U.NoticeReply();SN.U.NoticeInlineReplySetup()}SN.U.NoticeAttachments()},EntityActions:function(){if($("body.user_in").length>0){SN.U.NewDirectMessage()}},Login:function(){if(SN.U.StatusNetInstance.Get()!==null){var a=SN.U.StatusNetInstance.Get().Nickname;if(a!==null){$("#form_login #nickname").val(a)}}$("#form_login").bind("submit",function(){SN.U.StatusNetInstance.Set({Nickname:$("#form_login #nickname").val()});return true})},AjaxForms:function(){$("form.ajax").live("submit",function(){SN.U.FormXHR($(this));return false})},UploadForms:function(){$("input[type=file]").change(function(d){if(typeof this.files=="object"&&this.files.length>0){var c=0;for(var b=0;b<this.files.length;b++){c+=this.files[b].size}var a=SN.U.maxFileSize($(this.form));if(a>0&&c>a){var e="File too large: maximum upload size is %d bytes.";alert(e.replace("%d",a));$(this).val("");d.preventDefault();return false}}})}}};$(document).ready(function(){SN.Init.AjaxForms();SN.Init.UploadForms();if($("."+SN.C.S.FormNotice).length>0){SN.Init.NoticeForm()}if($("#content .notices").length>0){SN.Init.Notices()}if($("#content .entity_actions").length>0){SN.Init.EntityActions()}if($("#form_login").length>0){SN.Init.Login()}});if(!document.ELEMENT_NODE){document.ELEMENT_NODE=1;document.ATTRIBUTE_NODE=2;document.TEXT_NODE=3;document.CDATA_SECTION_NODE=4;document.ENTITY_REFERENCE_NODE=5;document.ENTITY_NODE=6;document.PROCESSING_INSTRUCTION_NODE=7;document.COMMENT_NODE=8;document.DOCUMENT_NODE=9;document.DOCUMENT_TYPE_NODE=10;document.DOCUMENT_FRAGMENT_NODE=11;document.NOTATION_NODE=12}document._importNode=function(e,a){switch(e.nodeType){case document.ELEMENT_NODE:var d=document.createElement(e.nodeName);if(e.attributes&&e.attributes.length>0){for(var c=0,b=e.attributes.length;c<b;){if(e.attributes[c].nodeName=="class"){d.className=e.getAttribute(e.attributes[c++].nodeName)}else{d.setAttribute(e.attributes[c].nodeName,e.getAttribute(e.attributes[c++].nodeName))}}}if(a&&e.childNodes&&e.childNodes.length>0){for(var c=0,b=e.childNodes.length;c<b;){d.appendChild(document._importNode(e.childNodes[c++],a))}}return d;break;case document.TEXT_NODE:case document.CDATA_SECTION_NODE:case document.COMMENT_NODE:return document.createTextNode(e.nodeValue);break}};if(typeof navigator.geolocation=="undefined"||navigator.geolocation.shim){(function(){(function(){if(window.google&&google.gears){return}var c=null;if(typeof GearsFactory!="undefined"){c=new GearsFactory()}else{try{c=new ActiveXObject("Gears.Factory");if(c.getBuildInfo().indexOf("ie_mobile")!=-1){c.privateSetGlobalObject(this)}}catch(d){if((typeof navigator.mimeTypes!="undefined")&&navigator.mimeTypes["application/x-googlegears"]){c=document.createElement("object");c.style.display="none";c.width=0;c.height=0;c.type="application/x-googlegears";document.documentElement.appendChild(c)}}}if(!c){return}if(!window.google){google={}}if(!google.gears){google.gears={factory:c}}})();var a=(function(){var d=google.gears.factory.create("beta.geolocation");var c=function(f,e){return function(g){f(g);e.lastPosition=g}};return{shim:true,type:"Gears",lastPosition:null,getCurrentPosition:function(e,g,h){var f=this;var i=c(e,f);d.getCurrentPosition(i,g,h)},watchPosition:function(e,f,g){d.watchPosition(e,f,g)},clearWatch:function(e){d.clearWatch(e)},getPermission:function(g,e,f){d.getPermission(g,e,f)}}});var b=(function(){var i=false;var e=function(){if(!d()&&!i){i=true;var j=document.createElement("script");j.src=(document.location.protocol=="https:"?"https://":"http://")+"www.google.com/jsapi?callback=_google_loader_apiLoaded";j.type="text/javascript";document.getElementsByTagName("body")[0].appendChild(j)}};var c=[];var h=function(j){c.push(j)};var f=function(){if(d()){while(c.length>0){var j=c.pop();j()}}};window._google_loader_apiLoaded=function(){f()};var d=function(){return(window.google&&google.loader)};var g=function(j){if(d()){return true}h(j);e();return false};e();return{shim:true,type:"ClientLocation",lastPosition:null,getCurrentPosition:function(k,n,o){var m=this;if(!g(function(){m.getCurrentPosition(k,n,o)})){return}if(google.loader.ClientLocation){var l=google.loader.ClientLocation;var j={coords:{latitude:l.latitude,longitude:l.longitude,altitude:null,accuracy:43000,altitudeAccuracy:null,heading:null,speed:null},address:{city:l.address.city,country:l.address.country,country_code:l.address.country_code,region:l.address.region},timestamp:new Date()};k(j);this.lastPosition=j}else{if(n==="function"){n({code:3,message:"Using the Google ClientLocation API and it is not able to calculate a location."})}}},watchPosition:function(j,l,m){this.getCurrentPosition(j,l,m);var k=this;var n=setInterval(function(){k.getCurrentPosition(j,l,m)},10000);return n},clearWatch:function(j){clearInterval(j)},getPermission:function(l,j,k){return true}}});navigator.geolocation=(window.google&&google.gears)?a():b()})()};
\ No newline at end of file

From 262126bd54627e37244185fbedce3e50cc41cf2f Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Wed, 16 Mar 2011 16:17:02 -0700
Subject: [PATCH 644/655] Extended profile - Add sammdy to author credits in
 version info

---
 plugins/ExtendedProfile/ExtendedProfilePlugin.php | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/plugins/ExtendedProfile/ExtendedProfilePlugin.php b/plugins/ExtendedProfile/ExtendedProfilePlugin.php
index 3e6aa5f860..ce1593dad5 100644
--- a/plugins/ExtendedProfile/ExtendedProfilePlugin.php
+++ b/plugins/ExtendedProfile/ExtendedProfilePlugin.php
@@ -32,12 +32,14 @@ class ExtendedProfilePlugin extends Plugin
 
     function onPluginVersion(&$versions)
     {
-        $versions[] = array('name' => 'ExtendedProfile',
-                            'version' => STATUSNET_VERSION,
-                            'author' => 'Brion Vibber, Zach Copley',
-                            'homepage' => 'http://status.net/wiki/Plugin:ExtendedProfile',
-                            'rawdescription' =>
-                            _m('UI extensions for additional profile fields.'));
+        $versions[] = array(
+            'name' => 'ExtendedProfile',
+            'version' => STATUSNET_VERSION,
+            'author' => 'Brion Vibber, Samantha Doherty, Zach Copley',
+            'homepage' => 'http://status.net/wiki/Plugin:ExtendedProfile',
+            'rawdescription' => _m(
+                'UI extensions for additional profile fields.')
+        );
 
         return true;
     }

From 390881e8176c920427b19d4299b7629ed2f3900a Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Wed, 16 Mar 2011 16:41:02 -0700
Subject: [PATCH 645/655] SearchSub plugin: add management UI for subscribed
 searches

---
 plugins/SearchSub/SearchSubPlugin.php  |  60 ++++++++
 plugins/SearchSub/searchsubsaction.php | 194 +++++++++++++++++++++++++
 2 files changed, 254 insertions(+)
 create mode 100644 plugins/SearchSub/searchsubsaction.php

diff --git a/plugins/SearchSub/SearchSubPlugin.php b/plugins/SearchSub/SearchSubPlugin.php
index 130600a41a..f7da8c44d9 100644
--- a/plugins/SearchSub/SearchSubPlugin.php
+++ b/plugins/SearchSub/SearchSubPlugin.php
@@ -78,6 +78,7 @@ class SearchSubPlugin extends Plugin
             return false;
         case 'SearchsubAction':
         case 'SearchunsubAction':
+        case 'SearchsubsAction':
         case 'SearchSubForm':
         case 'SearchUnsubForm':
             include_once $dir.'/'.strtolower($cls).'.php';
@@ -103,6 +104,9 @@ class SearchSubPlugin extends Plugin
                     array('action' => 'searchunsub'),
                     array('search' => Router::REGEX_TAG));
 
+        $m->connect(':nickname/search-subscriptions',
+                    array('action' => 'searchsubs'),
+                    array('nickname' => Nickname::DISPLAY_FMT));
         return true;
     }
 
@@ -209,4 +213,60 @@ class SearchSubPlugin extends Plugin
         }
         return true;
     }
+
+    /**
+     * Menu item for personal subscriptions/groups area
+     *
+     * @param Widget $widget Widget being executed
+     *
+     * @return boolean hook return
+     */
+
+    function onEndSubGroupNav($widget)
+    {
+        $action = $widget->out;
+        $action_name = $action->trimmed('action');
+
+        $action->menuItem(common_local_url('searchsubs', array('nickname' => $action->user->nickname)),
+                          // TRANS: SearchSub plugin menu item on user settings page.
+                          _m('MENU', 'Searches'),
+                          // TRANS: SearchSub plugin tooltip for user settings menu item.
+                          _m('Configure search subscriptions'),
+                          $action_name == 'searchsubs' && $action->arg('nickname') == $action->user->nickname);
+
+        return true;
+    }
+
+    /**
+     * Add a count of mirrored feeds into a user's profile sidebar stats.
+     *
+     * @param Profile $profile
+     * @param array $stats
+     * @return boolean hook return value
+     */
+    function onProfileStats($profile, &$stats)
+    {
+        $cur = common_current_user();
+        if (!empty($cur) && $cur->id == $profile->id) {
+            $searchsub = new SearchSub();
+            $searchsub ->profile_id = $profile->id;
+            $entry = array(
+                'id' => 'searchsubs',
+                'label' => _m('Search subscriptions'),
+                'link' => common_local_url('searchsubs', array('nickname' => $profile->nickname)),
+                'value' => $searchsub->count(),
+            );
+
+            $insertAt = count($stats);
+            foreach ($stats as $i => $row) {
+                if ($row['id'] == 'groups') {
+                    // Slip us in after them.
+                    $insertAt = $i + 1;
+                    break;
+                }
+            }
+            array_splice($stats, $insertAt, 0, array($entry));
+        }
+        return true;
+    }
 }
diff --git a/plugins/SearchSub/searchsubsaction.php b/plugins/SearchSub/searchsubsaction.php
new file mode 100644
index 0000000000..f888613349
--- /dev/null
+++ b/plugins/SearchSub/searchsubsaction.php
@@ -0,0 +1,194 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * List of a user's subscriptions
+ *
+ * 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  Social
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @author    Sarven Capadisli <csarven@status.net>
+ * @copyright 2008-2009 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET') && !defined('LACONICA')) {
+    exit(1);
+}
+
+/**
+ * A list of the user's subscriptions
+ *
+ * @category Social
+ * @package  StatusNet
+ * @author   Evan Prodromou <evan@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://status.net/
+ */
+class SearchSubsAction extends GalleryAction
+{
+    function title()
+    {
+        if ($this->page == 1) {
+            // TRANS: Header for subscriptions overview for a user (first page).
+            // TRANS: %s is a user nickname.
+            return sprintf(_m('%s\'s search subscriptions'), $this->user->nickname);
+        } else {
+            // TRANS: Header for subscriptions overview for a user (not first page).
+            // TRANS: %1$s is a user nickname, %2$d is the page number.
+            return sprintf(_m('%1$s\'s search subscriptions, page %2$d'),
+                           $this->user->nickname,
+                           $this->page);
+        }
+    }
+
+    function showPageNotice()
+    {
+        $user = common_current_user();
+        if ($user && ($user->id == $this->profile->id)) {
+            $this->element('p', null,
+                           // TRANS: Page notice for page with an overview of all search subscriptions
+                           // TRANS: of the logged in user's own profile.
+                           _m('You have subscribed to receive all notices on this site matching the following searches:'));
+        } else {
+            $this->element('p', null,
+                           // TRANS: Page notice for page with an overview of all subscriptions of a user other
+                           // TRANS: than the logged in user. %s is the user nickname.
+                           sprintf(_m('%s has subscribed to receive all notices on this site matching the following searches:'),
+                                   $this->profile->nickname));
+        }
+    }
+
+    function showContent()
+    {
+        if (Event::handle('StartShowTagSubscriptionsContent', array($this))) {
+            parent::showContent();
+
+            $offset = ($this->page-1) * PROFILES_PER_PAGE;
+            $limit =  PROFILES_PER_PAGE + 1;
+
+            $cnt = 0;
+
+            $searchsub = new SearchSub();
+            $searchsub->profile_id = $this->user->id;
+            $searchsub->limit($limit, $offset);
+            $searchsub->find();
+
+            if ($searchsub->N) {
+                $list = new SearchSubscriptionsList($searchsub, $this->user, $this);
+                $cnt = $list->show();
+                if (0 == $cnt) {
+                    $this->showEmptyListMessage();
+                }
+            } else {
+                $this->showEmptyListMessage();
+            }
+
+            $this->pagination($this->page > 1, $cnt > PROFILES_PER_PAGE,
+                              $this->page, 'searchsubs',
+                              array('nickname' => $this->user->nickname));
+
+
+            Event::handle('EndShowTagSubscriptionsContent', array($this));
+        }
+    }
+
+    function showEmptyListMessage()
+    {
+        if (common_logged_in()) {
+            $current_user = common_current_user();
+            if ($this->user->id === $current_user->id) {
+                // TRANS: Search subscription list text when the logged in user has no search subscriptions.
+                $message = _('You\'re not subscribed to any text searches right now. You can push the "Subscribe" button ' .
+                             'on any notice text search to automatically receive any public messages on this site that match that ' .
+                             'search, even if you\'re not subscribed to the poster.');
+            } else {
+                // TRANS: Search subscription list text when looking at the subscriptions for a of a user other
+                // TRANS: than the logged in user that has no search subscriptions. %s is the user nickname.
+                $message = sprintf(_('%s is not subscribed to any searches.'), $this->user->nickname);
+            }
+        }
+        else {
+            // TRANS: Subscription list text when looking at the subscriptions for a of a user that has none
+            // TRANS: as an anonymous user. %s is the user nickname.
+            $message = sprintf(_m('%s is not subscribed to any searches.'), $this->user->nickname);
+        }
+
+        $this->elementStart('div', 'guide');
+        $this->raw(common_markup_to_html($message));
+        $this->elementEnd('div');
+    }
+}
+
+// XXX SubscriptionsList and SubscriptionList are dangerously close
+
+class SearchSubscriptionsList extends SubscriptionList
+{
+    function newListItem($searchsub)
+    {
+        return new SearchSubscriptionsListItem($searchsub, $this->owner, $this->action);
+    }
+}
+
+class SearchSubscriptionsListItem extends SubscriptionListItem
+{
+    function startItem()
+    {
+        $this->out->elementStart('li', array('class' => 'searchsub'));
+    }
+
+    function showProfile()
+    {
+        $searchsub = $this->profile;
+        $search = $searchsub->search;
+
+        // Relevant portion!
+        $cur = common_current_user();
+        if (!empty($cur) && $cur->id == $this->owner->id) {
+            $this->showOwnerControls();
+        }
+
+        $url = common_local_url('noticesearch', array('q' => $search));
+        $linkline = sprintf(_m('"<a href="%s">%s</a>" since %s'),
+                            htmlspecialchars($url),
+                            htmlspecialchars($search),
+                            common_date_string($searchsub->created));
+
+        $this->out->elementStart('div', 'searchsub-item');
+        $this->out->raw($linkline);
+        $this->out->element('div', array('style' => 'clear: both'));
+        $this->out->elementEnd('div');
+    }
+
+    function showActions()
+    {
+    }
+
+    function showOwnerControls()
+    {
+        $this->out->elementStart('div', 'entity_actions');
+
+        $searchsub = $this->profile; // ?
+        $form = new SearchUnsubForm($this->out, $searchsub->search);
+        $form->show();
+
+        $this->out->elementEnd('div');
+        return;
+    }
+}

From bd12546984296047c125742670d0c6f7c24651dd Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Wed, 16 Mar 2011 16:52:37 -0700
Subject: [PATCH 646/655] Allow plugins to modify or append command help text;
 broke the command help down into pieces which also will aid translators in
 future, as the entire message blob won't change every time something gets
 fiddled with.

---
 lib/command.php            | 123 +++++++++++++++++++++++++------------
 lib/commandinterpreter.php |   2 +-
 2 files changed, 84 insertions(+), 41 deletions(-)

diff --git a/lib/command.php b/lib/command.php
index 39fb283dd8..03baa8212d 100644
--- a/lib/command.php
+++ b/lib/command.php
@@ -911,45 +911,88 @@ class HelpCommand extends Command
 {
     function handle($channel)
     {
-        $channel->output($this->user,
-                         // TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-                         _("Commands:\n".
-                           "on - turn on notifications\n".
-                           "off - turn off notifications\n".
-                           "help - show this help\n".
-                           "follow <nickname> - subscribe to user\n".
-                           "groups - lists the groups you have joined\n".
-                           "subscriptions - list the people you follow\n".
-                           "subscribers - list the people that follow you\n".
-                           "leave <nickname> - unsubscribe from user\n".
-                           "d <nickname> <text> - direct message to user\n".
-                           "get <nickname> - get last notice from user\n".
-                           "whois <nickname> - get profile info on user\n".
-                           "lose <nickname> - force user to stop following you\n".
-                           "fav <nickname> - add user's last notice as a 'fave'\n".
-                           "fav #<notice_id> - add notice with the given id as a 'fave'\n".
-                           "repeat #<notice_id> - repeat a notice with a given id\n".
-                           "repeat <nickname> - repeat the last notice from user\n".
-                           "reply #<notice_id> - reply to notice with a given id\n".
-                           "reply <nickname> - reply to the last notice from user\n".
-                           "join <group> - join group\n".
-                           "login - Get a link to login to the web interface\n".
-                           "drop <group> - leave group\n".
-                           "stats - get your stats\n".
-                           "stop - same as 'off'\n".
-                           "quit - same as 'off'\n".
-                           "sub <nickname> - same as 'follow'\n".
-                           "unsub <nickname> - same as 'leave'\n".
-                           "last <nickname> - same as 'get'\n".
-                           "on <nickname> - not yet implemented.\n".
-                           "off <nickname> - not yet implemented.\n".
-                           "nudge <nickname> - remind a user to update.\n".
-                           "invite <phone number> - not yet implemented.\n".
-                           "track <word> - not yet implemented.\n".
-                           "untrack <word> - not yet implemented.\n".
-                           "track off - not yet implemented.\n".
-                           "untrack all - not yet implemented.\n".
-                           "tracks - not yet implemented.\n".
-                           "tracking - not yet implemented.\n"));
+        // TRANS: Header line of help text for commands.
+        $out = array(_m('COMMANDHELP', "Commands:"));
+        $commands = array(// TRANS: Help message for IM/SMS command "on"
+                          "on" => _m('COMMANDHELP', "turn on notifications"),
+                          // TRANS: Help message for IM/SMS command "off"
+                          "off" => _m('COMMANDHELP', "turn off notifications"),
+                          // TRANS: Help message for IM/SMS command "help"
+                          "help" => _m('COMMANDHELP', "show this help"),
+                          // TRANS: Help message for IM/SMS command "follow <nickname>"
+                          "follow <nickname>" => _m('COMMANDHELP', "subscribe to user"),
+                          // TRANS: Help message for IM/SMS command "groups"
+                          "groups" => _m('COMMANDHELP', "lists the groups you have joined"),
+                          // TRANS: Help message for IM/SMS command "subscriptions"
+                          "subscriptions" => _m('COMMANDHELP', "list the people you follow"),
+                          // TRANS: Help message for IM/SMS command "subscribers"
+                          "subscribers" => _m('COMMANDHELP', "list the people that follow you"),
+                          // TRANS: Help message for IM/SMS command "leave <nickname>"
+                          "leave <nickname>" => _m('COMMANDHELP', "unsubscribe from user"),
+                          // TRANS: Help message for IM/SMS command "d <nickname> <text>"
+                          "d <nickname> <text>" => _m('COMMANDHELP', "direct message to user"),
+                          // TRANS: Help message for IM/SMS command "get <nickname>"
+                          "get <nickname>" => _m('COMMANDHELP', "get last notice from user"),
+                          // TRANS: Help message for IM/SMS command "whois <nickname>"
+                          "whois <nickname>" => _m('COMMANDHELP', "get profile info on user"),
+                          // TRANS: Help message for IM/SMS command "lose <nickname>"
+                          "lose <nickname>" => _m('COMMANDHELP', "force user to stop following you"),
+                          // TRANS: Help message for IM/SMS command "fav <nickname>"
+                          "fav <nickname>" => _m('COMMANDHELP', "add user's last notice as a 'fave'"),
+                          // TRANS: Help message for IM/SMS command "fav #<notice_id>"
+                          "fav #<notice_id>" => _m('COMMANDHELP', "add notice with the given id as a 'fave'"),
+                          // TRANS: Help message for IM/SMS command "repeat #<notice_id>"
+                          "repeat #<notice_id>" => _m('COMMANDHELP', "repeat a notice with a given id"),
+                          // TRANS: Help message for IM/SMS command "repeat <nickname>"
+                          "repeat <nickname>" => _m('COMMANDHELP', "repeat the last notice from user"),
+                          // TRANS: Help message for IM/SMS command "reply #<notice_id>"
+                          "reply #<notice_id>" => _m('COMMANDHELP', "reply to notice with a given id"),
+                          // TRANS: Help message for IM/SMS command "reply <nickname>"
+                          "reply <nickname>" => _m('COMMANDHELP', "reply to the last notice from user"),
+                          // TRANS: Help message for IM/SMS command "join <group>"
+                          "join <group>" => _m('COMMANDHELP', "join group"),
+                          // TRANS: Help message for IM/SMS command "login"
+                          "login" => _m('COMMANDHELP', "Get a link to login to the web interface"),
+                          // TRANS: Help message for IM/SMS command "drop <group>"
+                          "drop <group>" => _m('COMMANDHELP', "leave group"),
+                          // TRANS: Help message for IM/SMS command "stats"
+                          "stats" => _m('COMMANDHELP', "get your stats"),
+                          // TRANS: Help message for IM/SMS command "stop"
+                          "stop" => _m('COMMANDHELP', "same as 'off'"),
+                          // TRANS: Help message for IM/SMS command "quit"
+                          "quit" => _m('COMMANDHELP', "same as 'off'"),
+                          // TRANS: Help message for IM/SMS command "sub <nickname>"
+                          "sub <nickname>" => _m('COMMANDHELP', "same as 'follow'"),
+                          // TRANS: Help message for IM/SMS command "unsub <nickname>"
+                          "unsub <nickname>" => _m('COMMANDHELP', "same as 'leave'"),
+                          // TRANS: Help message for IM/SMS command "last <nickname>"
+                          "last <nickname>" => _m('COMMANDHELP', "same as 'get'"),
+                          // TRANS: Help message for IM/SMS command "on <nickname>"
+                          "on <nickname>" => _m('COMMANDHELP', "not yet implemented."),
+                          // TRANS: Help message for IM/SMS command "off <nickname>"
+                          "off <nickname>" => _m('COMMANDHELP', "not yet implemented."),
+                          // TRANS: Help message for IM/SMS command "nudge <nickname>"
+                          "nudge <nickname>" => _m('COMMANDHELP', "remind a user to update."),
+                          // TRANS: Help message for IM/SMS command "invite <phone number>"
+                          "invite <phone number>" => _m('COMMANDHELP', "not yet implemented."),
+                          // TRANS: Help message for IM/SMS command "track <word>"
+                          "track <word>" => _m('COMMANDHELP', "not yet implemented."),
+                          // TRANS: Help message for IM/SMS command "untrack <word>"
+                          "untrack <word>" => _m('COMMANDHELP', "not yet implemented."),
+                          // TRANS: Help message for IM/SMS command "track off"
+                          "track off" => _m('COMMANDHELP', "not yet implemented."),
+                          // TRANS: Help message for IM/SMS command "untrack all"
+                          "untrack all" => _m('COMMANDHELP', "not yet implemented."),
+                          // TRANS: Help message for IM/SMS command "tracks"
+                          "tracks" => _m('COMMANDHELP', "not yet implemented."),
+                          // TRANS: Help message for IM/SMS command "tracking"
+                          "tracking" => _m('COMMANDHELP', "not yet implemented."));
+
+        // Give plugins a chance to add or override...
+        Event::handle('HelpCommandMessages', array($this, &$commands));
+        foreach ($commands as $command => $help) {
+            $out[] = "$command - $help";
+        }
+        $channel->output($this->user, implode("\n", $out));
     }
 }
diff --git a/lib/commandinterpreter.php b/lib/commandinterpreter.php
index fe426f1fcd..6b1b70055e 100644
--- a/lib/commandinterpreter.php
+++ b/lib/commandinterpreter.php
@@ -314,7 +314,7 @@ class CommandInterpreter
                 $result = false;
             }
                 
-            Event::handle('EndInterpretCommand', array($cmd, $arg, $user, $result));
+            Event::handle('EndInterpretCommand', array($cmd, $arg, $user, &$result));
         }
 
         return $result;

From 0754edf9a24983e8a9ec48baf0086e8437e3f399 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Wed, 16 Mar 2011 17:08:09 -0700
Subject: [PATCH 647/655] SearchSub plugin: 'track X', 'untrack X', 'tracking',
 'track off' commands now overridden :D

---
 plugins/SearchSub/SearchSubPlugin.php         | 49 +++++++++++++++++++
 plugins/SearchSub/searchsubtrackcommand.php   | 38 ++++++++++++++
 .../SearchSub/searchsubtrackingcommand.php    | 27 ++++++++++
 .../SearchSub/searchsubtrackoffcommand.php    | 33 +++++++++++++
 plugins/SearchSub/searchsubuntrackcommand.php | 38 ++++++++++++++
 5 files changed, 185 insertions(+)
 create mode 100644 plugins/SearchSub/searchsubtrackcommand.php
 create mode 100644 plugins/SearchSub/searchsubtrackingcommand.php
 create mode 100644 plugins/SearchSub/searchsubtrackoffcommand.php
 create mode 100644 plugins/SearchSub/searchsubuntrackcommand.php

diff --git a/plugins/SearchSub/SearchSubPlugin.php b/plugins/SearchSub/SearchSubPlugin.php
index f7da8c44d9..c07f7695da 100644
--- a/plugins/SearchSub/SearchSubPlugin.php
+++ b/plugins/SearchSub/SearchSubPlugin.php
@@ -81,6 +81,10 @@ class SearchSubPlugin extends Plugin
         case 'SearchsubsAction':
         case 'SearchSubForm':
         case 'SearchUnsubForm':
+        case 'SearchSubTrackCommand':
+        case 'SearchSubTrackOffCommand':
+        case 'SearchSubTrackingCommand':
+        case 'SearchSubUntrackCommand':
             include_once $dir.'/'.strtolower($cls).'.php';
             return false;
         default:
@@ -269,4 +273,49 @@ class SearchSubPlugin extends Plugin
         }
         return true;
     }
+
+    /**
+     * Replace the built-in stub track commands with ones that control
+     * search subscriptions.
+     *
+     * @param CommandInterpreter $cmd
+     * @param string $arg
+     * @param User $user
+     * @param Command $result
+     * @return boolean hook result
+     */
+    function onEndInterpretCommand($cmd, $arg, $user, &$result)
+    {
+        if ($result instanceof TrackCommand) {
+            $result = new SearchSubTrackCommand($user, $arg);
+            return false;
+        } else if ($result instanceof TrackOffCommand) {
+            $result = new SearchSubTrackOffCommand($user);
+            return false;
+        } else if ($result instanceof TrackingCommand) {
+            $result = new SearchSubTrackingCommand($user);
+            return false;
+        } else if ($result instanceof UntrackCommand) {
+            $result = new SearchSubUntrackCommand($user, $arg);
+            return false;
+        } else {
+            return true;
+        }
+    }
+
+    function onHelpCommandMessages($cmd, &$commands)
+    {
+        // TRANS: Help message for IM/SMS command "track <word>"
+        $commands["track <word>"] = _m('COMMANDHELP', "Start following notices matching the given search query.");
+        // TRANS: Help message for IM/SMS command "untrack <word>"
+        $commands["untrack <word>"] = _m('COMMANDHELP', "Stop following notices matching the given search query.");
+        // TRANS: Help message for IM/SMS command "track off"
+        $commands["track off"] = _m('COMMANDHELP', "Disable all tracked search subscriptions.");
+        // TRANS: Help message for IM/SMS command "untrack all"
+        $commands["untrack all"] = _m('COMMANDHELP', "Disable all tracked search subscriptions.");
+        // TRANS: Help message for IM/SMS command "tracks"
+        $commands["tracks"] = _m('COMMANDHELP', "List all your search subscriptions.");
+        // TRANS: Help message for IM/SMS command "tracking"
+        $commands["tracking"] = _m('COMMANDHELP', "List all your search subscriptions.");
+    }
 }
diff --git a/plugins/SearchSub/searchsubtrackcommand.php b/plugins/SearchSub/searchsubtrackcommand.php
new file mode 100644
index 0000000000..bba2cb36e7
--- /dev/null
+++ b/plugins/SearchSub/searchsubtrackcommand.php
@@ -0,0 +1,38 @@
+<?php
+
+class SearchSubTrackCommand extends Command
+{
+    var $keyword = null;
+
+    function __construct($user, $keyword)
+    {
+        parent::__construct($user);
+        $this->keyword = $keyword;
+    }
+
+    function handle($channel)
+    {
+        $cur = $this->user;
+        $searchsub = SearchSub::pkeyGet(array('search' => $this->keyword,
+                                              'profile_id' => $cur->id));
+
+        if ($searchsub) {
+            // TRANS: Error text shown a user tries to track a search query they're already subscribed to.
+            $channel->error($cur, sprintf(_m('You are already tracking the search "%s".'), $this->keyword));
+            return;
+        }
+
+        try {
+            SearchSub::start($cur->getProfile(), $this->keyword);
+        } catch (Exception $e) {
+            // TRANS: Message given having failed to set up a search subscription by track command.
+            $channel->error($cur, sprintf(_m('Could not start a search subscription for query "%s".'),
+                                          $this->keyword));
+            return;
+        }
+
+        // TRANS: Message given having added a search subscription by track command.
+        $channel->output($cur, sprintf(_m('You are subscribed to the search "%s".'),
+                                              $this->keyword));
+    }
+}
\ No newline at end of file
diff --git a/plugins/SearchSub/searchsubtrackingcommand.php b/plugins/SearchSub/searchsubtrackingcommand.php
new file mode 100644
index 0000000000..385a22b8ba
--- /dev/null
+++ b/plugins/SearchSub/searchsubtrackingcommand.php
@@ -0,0 +1,27 @@
+<?php
+
+class SearchSubTrackingCommand extends Command
+{
+    function handle($channel)
+    {
+        $cur = $this->user;
+        $all = new SearchSub();
+        $all->profile_id = $cur->id;
+        $all->find();
+
+        if ($all->N == 0) {
+            // TRANS: Error text shown a user tries to disable all a search subscriptions with track off command, but has none.
+            $channel->error($cur, _m('You are not tracking any searches.'));
+            return;
+        }
+
+        $list = array();
+        while ($all->fetch()) {
+            $list[] = $all->search;
+        }
+
+        // TRANS: Message given having disabled all search subscriptions with 'track off'.
+        $channel->output($cur, sprintf(_m('You are tracking searches for: %s'),
+                                       '"' . implode('", "', $list) . '"'));
+    }
+}
\ No newline at end of file
diff --git a/plugins/SearchSub/searchsubtrackoffcommand.php b/plugins/SearchSub/searchsubtrackoffcommand.php
new file mode 100644
index 0000000000..1e5eb97ebc
--- /dev/null
+++ b/plugins/SearchSub/searchsubtrackoffcommand.php
@@ -0,0 +1,33 @@
+<?php
+
+class SearchSubTrackoffCommand extends Command
+{
+    function handle($channel)
+    {
+        $cur = $this->user;
+        $all = new SearchSub();
+        $all->profile_id = $cur->id;
+        $all->find();
+
+        if ($all->N == 0) {
+            // TRANS: Error text shown a user tries to disable all a search subscriptions with track off command, but has none.
+            $channel->error($cur, _m('You are not tracking any searches.'));
+            return;
+        }
+
+        $profile = $cur->getProfile();
+        while ($all->fetch()) {
+            try {
+                SearchSub::cancel($profile, $all->search);
+            } catch (Exception $e) {
+                // TRANS: Message given having failed to cancel one of the search subs with 'track off' command.
+                $channel->error($cur, sprintf(_m('Error disabling search subscription for query "%s".'),
+                                              $all->search));
+                return;
+            }
+        }
+
+        // TRANS: Message given having disabled all search subscriptions with 'track off'.
+        $channel->output($cur, _m('Disabled all your search subscriptions.'));
+    }
+}
\ No newline at end of file
diff --git a/plugins/SearchSub/searchsubuntrackcommand.php b/plugins/SearchSub/searchsubuntrackcommand.php
new file mode 100644
index 0000000000..9fb84cd130
--- /dev/null
+++ b/plugins/SearchSub/searchsubuntrackcommand.php
@@ -0,0 +1,38 @@
+<?php
+
+class SearchSubUntrackCommand extends Command
+{
+    var $keyword = null;
+
+    function __construct($user, $keyword)
+    {
+        parent::__construct($user);
+        $this->keyword = $keyword;
+    }
+
+    function handle($channel)
+    {
+        $cur = $this->user;
+        $searchsub = SearchSub::pkeyGet(array('search' => $this->keyword,
+                                              'profile_id' => $cur->id));
+
+        if (!$searchsub) {
+            // TRANS: Error text shown a user tries to untrack a search query they're not subscribed to.
+            $channel->error($cur, sprintf(_m('You are not tracking the search "%s".'), $this->keyword));
+            return;
+        }
+
+        try {
+            SearchSub::cancel($cur->getProfile(), $this->keyword);
+        } catch (Exception $e) {
+            // TRANS: Message given having failed to cancel a search subscription by untrack command.
+            $channel->error($cur, sprintf(_m('Could not end a search subscription for query "%s".'),
+                                          $this->keyword));
+            return;
+        }
+
+        // TRANS: Message given having removed a search subscription by untrack command.
+        $channel->output($cur, sprintf(_m('You are no longer subscribed to the search "%s".'),
+                                              $this->keyword));
+    }
+}
\ No newline at end of file

From 199e05f9deba36092748997cfbb870146ac4d4ce Mon Sep 17 00:00:00 2001
From: Siebrand Mazeland <s.mazeland@xs4all.nl>
Date: Thu, 17 Mar 2011 11:17:22 +0100
Subject: [PATCH 648/655] Localisation updates from http://translatewiki.net.

---
 locale/ar/LC_MESSAGES/statusnet.po            | 453 ++++++----
 locale/arz/LC_MESSAGES/statusnet.po           | 340 +++++---
 locale/bg/LC_MESSAGES/statusnet.po            | 338 +++++---
 locale/br/LC_MESSAGES/statusnet.po            | 334 +++++---
 locale/ca/LC_MESSAGES/statusnet.po            | 456 ++++++----
 locale/cs/LC_MESSAGES/statusnet.po            | 451 ++++++----
 locale/de/LC_MESSAGES/statusnet.po            | 451 ++++++----
 locale/en_GB/LC_MESSAGES/statusnet.po         | 451 ++++++----
 locale/eo/LC_MESSAGES/statusnet.po            | 451 ++++++----
 locale/es/LC_MESSAGES/statusnet.po            | 792 ++++++++++--------
 locale/fa/LC_MESSAGES/statusnet.po            | 489 +++++++----
 locale/fi/LC_MESSAGES/statusnet.po            | 363 +++++---
 locale/fr/LC_MESSAGES/statusnet.po            | 453 ++++++----
 locale/fur/LC_MESSAGES/statusnet.po           | 330 +++++---
 locale/gl/LC_MESSAGES/statusnet.po            | 451 ++++++----
 locale/hsb/LC_MESSAGES/statusnet.po           | 335 +++++---
 locale/hu/LC_MESSAGES/statusnet.po            | 327 +++++---
 locale/ia/LC_MESSAGES/statusnet.po            | 474 +++++++----
 locale/it/LC_MESSAGES/statusnet.po            | 456 ++++++----
 locale/ja/LC_MESSAGES/statusnet.po            | 342 +++++---
 locale/ka/LC_MESSAGES/statusnet.po            | 332 +++++---
 locale/ko/LC_MESSAGES/statusnet.po            | 336 +++++---
 locale/mk/LC_MESSAGES/statusnet.po            | 475 +++++++----
 locale/ml/LC_MESSAGES/statusnet.po            | 327 +++++---
 locale/nb/LC_MESSAGES/statusnet.po            | 338 +++++---
 locale/nl/LC_MESSAGES/statusnet.po            | 479 +++++++----
 locale/pl/LC_MESSAGES/statusnet.po            | 456 ++++++----
 locale/pt/LC_MESSAGES/statusnet.po            | 451 ++++++----
 locale/pt_BR/LC_MESSAGES/statusnet.po         | 453 ++++++----
 locale/ru/LC_MESSAGES/statusnet.po            | 453 ++++++----
 locale/statusnet.pot                          | 543 +++++++-----
 locale/sv/LC_MESSAGES/statusnet.po            | 451 ++++++----
 locale/te/LC_MESSAGES/statusnet.po            | 342 +++++---
 locale/tr/LC_MESSAGES/statusnet.po            | 337 +++++---
 locale/uk/LC_MESSAGES/statusnet.po            | 471 +++++++----
 locale/zh_CN/LC_MESSAGES/statusnet.po         | 451 ++++++----
 .../locale/ia/LC_MESSAGES/Directory.po        |  54 ++
 .../locale/mk/LC_MESSAGES/Directory.po        |  54 ++
 .../locale/nl/LC_MESSAGES/Directory.po        |  55 ++
 .../locale/uk/LC_MESSAGES/Directory.po        |  55 ++
 plugins/Event/locale/Event.pot                |   8 +-
 plugins/Event/locale/ia/LC_MESSAGES/Event.po  |  48 ++
 plugins/Event/locale/mk/LC_MESSAGES/Event.po  |  48 ++
 plugins/Event/locale/nl/LC_MESSAGES/Event.po  |  48 ++
 plugins/Event/locale/te/LC_MESSAGES/Event.po  |  48 ++
 plugins/Event/locale/uk/LC_MESSAGES/Event.po  |  49 ++
 .../locale/ExtendedProfile.pot                | 210 +++--
 .../locale/br/LC_MESSAGES/ExtendedProfile.po  | 116 ++-
 .../locale/ia/LC_MESSAGES/ExtendedProfile.po  | 116 ++-
 .../locale/mk/LC_MESSAGES/ExtendedProfile.po  | 116 ++-
 .../locale/nl/LC_MESSAGES/ExtendedProfile.po  | 116 ++-
 .../locale/sv/LC_MESSAGES/ExtendedProfile.po  | 116 ++-
 .../locale/te/LC_MESSAGES/ExtendedProfile.po  | 116 ++-
 .../locale/uk/LC_MESSAGES/ExtendedProfile.po  | 116 ++-
 plugins/Msn/locale/el/LC_MESSAGES/Msn.po      |  29 +
 plugins/Poll/locale/Poll.pot                  |  10 +-
 plugins/Poll/locale/ia/LC_MESSAGES/Poll.po    | 152 ++++
 plugins/Poll/locale/mk/LC_MESSAGES/Poll.po    | 152 ++++
 plugins/Poll/locale/nl/LC_MESSAGES/Poll.po    | 152 ++++
 plugins/Poll/locale/uk/LC_MESSAGES/Poll.po    | 153 ++++
 plugins/SearchSub/locale/SearchSub.pot        | 182 ++++
 plugins/SubMirror/locale/SubMirror.pot        |  35 +-
 .../locale/de/LC_MESSAGES/SubMirror.po        |  23 +-
 .../locale/fr/LC_MESSAGES/SubMirror.po        |  23 +-
 .../locale/ia/LC_MESSAGES/SubMirror.po        |  23 +-
 .../locale/mk/LC_MESSAGES/SubMirror.po        |  23 +-
 .../locale/nl/LC_MESSAGES/SubMirror.po        |  23 +-
 .../locale/tl/LC_MESSAGES/SubMirror.po        |  23 +-
 .../locale/uk/LC_MESSAGES/SubMirror.po        |  23 +-
 plugins/TagSub/locale/TagSub.pot              |  98 +++
 .../locale/fa/LC_MESSAGES/UserLimit.po        |  25 +
 .../locale/ru/LC_MESSAGES/YammerImport.po     |  12 +-
 72 files changed, 12540 insertions(+), 5342 deletions(-)
 create mode 100644 plugins/Directory/locale/ia/LC_MESSAGES/Directory.po
 create mode 100644 plugins/Directory/locale/mk/LC_MESSAGES/Directory.po
 create mode 100644 plugins/Directory/locale/nl/LC_MESSAGES/Directory.po
 create mode 100644 plugins/Directory/locale/uk/LC_MESSAGES/Directory.po
 create mode 100644 plugins/Event/locale/ia/LC_MESSAGES/Event.po
 create mode 100644 plugins/Event/locale/mk/LC_MESSAGES/Event.po
 create mode 100644 plugins/Event/locale/nl/LC_MESSAGES/Event.po
 create mode 100644 plugins/Event/locale/te/LC_MESSAGES/Event.po
 create mode 100644 plugins/Event/locale/uk/LC_MESSAGES/Event.po
 create mode 100644 plugins/Msn/locale/el/LC_MESSAGES/Msn.po
 create mode 100644 plugins/Poll/locale/ia/LC_MESSAGES/Poll.po
 create mode 100644 plugins/Poll/locale/mk/LC_MESSAGES/Poll.po
 create mode 100644 plugins/Poll/locale/nl/LC_MESSAGES/Poll.po
 create mode 100644 plugins/Poll/locale/uk/LC_MESSAGES/Poll.po
 create mode 100644 plugins/SearchSub/locale/SearchSub.pot
 create mode 100644 plugins/TagSub/locale/TagSub.pot
 create mode 100644 plugins/UserLimit/locale/fa/LC_MESSAGES/UserLimit.po

diff --git a/locale/ar/LC_MESSAGES/statusnet.po b/locale/ar/LC_MESSAGES/statusnet.po
index 17a4cb5b14..9650e26148 100644
--- a/locale/ar/LC_MESSAGES/statusnet.po
+++ b/locale/ar/LC_MESSAGES/statusnet.po
@@ -12,19 +12,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-11 18:15+0000\n"
-"PO-Revision-Date: 2011-03-11 18:16:53+0000\n"
+"POT-Creation-Date: 2011-03-17 09:47+0000\n"
+"PO-Revision-Date: 2011-03-17 09:49:21+0000\n"
 "Language-Team: Arabic <http://translatewiki.net/wiki/Portal:ar>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83703); Translate extension (2011-03-11)\n"
+"X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ar\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=6; plural=(n == 0) ? 0 : ( (n == 1) ? 1 : ( (n == "
 "2) ? 2 : ( (n%100 >= 3 && n%100 <= 10) ? 3 : ( (n%100 >= 11 && n%100 <= "
 "99) ? 4 : 5 ) ) ) );\n"
-"X-POT-Import-Date: 2011-03-08 01:25:01+0000\n"
+"X-POT-Import-Date: 2011-03-11 18:52:41+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -600,7 +600,7 @@ msgstr "لم يمكن إزالة المستخدم %1$s من المجموعة %2$
 msgid "%s's groups"
 msgstr "مجموعات %s"
 
-#. TRANS: Used as subtitle in check for group membership. %1$s is a user name, %2$s is the site name.
+#. TRANS: Used as subtitle in check for group membership. %1$s is the site name, %2$s is a user name.
 #, php-format
 msgid "%1$s groups %2$s is a member of."
 msgstr "مجموعات %1$s التي %2$s عضو فيها."
@@ -4606,19 +4606,6 @@ msgstr "مجموعة %s"
 msgid "%1$s group, page %2$d"
 msgstr "مجموعة %1$s، الصفحة %2$d"
 
-#. TRANS: Label for group description or group note (dt). Text hidden by default.
-msgid "Note"
-msgstr "ملاحظة"
-
-#. TRANS: Label for group aliases (dt). Text hidden by default.
-msgid "Aliases"
-msgstr "الكنى"
-
-#. TRANS: Group actions header (h2). Text hidden by default.
-#, fuzzy
-msgid "Group actions"
-msgstr "تصرفات المستخدم"
-
 #. TRANS: Tooltip for feed link. %s is a group nickname.
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
@@ -4729,6 +4716,10 @@ msgstr "نتائج البحث ل\"%1$s\" على %2$s"
 msgid "Notice deleted."
 msgstr "حُذف الإشعار."
 
+#, fuzzy
+msgid "Notice"
+msgstr "الإشعارات"
+
 #. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
 #, fuzzy, php-format
 msgid "%1$s tagged %2$s"
@@ -5253,7 +5244,6 @@ msgstr "لا مدخل هوية."
 msgid "Tag %s"
 msgstr "الوسوم"
 
-#. TRANS: H2 for user profile information.
 msgid "User profile"
 msgstr "ملف المستخدم الشخصي"
 
@@ -5960,6 +5950,49 @@ msgstr ""
 msgid "No AtomPub API service for %s."
 msgstr ""
 
+#. TRANS: H2 for user actions in a profile.
+#. TRANS: H2 for entity actions in a profile.
+msgid "User actions"
+msgstr "تصرفات المستخدم"
+
+#. TRANS: Text shown in user profile of not yet compeltely deleted users.
+msgid "User deletion in progress..."
+msgstr "حذف المستخدم قيد التنفيذ..."
+
+#. TRANS: Link title for link on user profile.
+msgid "Edit profile settings"
+msgstr "عدّل إعدادات الملف الشخصي"
+
+#. TRANS: Link text for link on user profile.
+msgid "Edit"
+msgstr "عدّل"
+
+#. TRANS: Link title for link on user profile.
+msgid "Send a direct message to this user"
+msgstr "أرسل رسالة مباشرة إلى هذا المستخدم"
+
+#. TRANS: Link text for link on user profile.
+msgid "Message"
+msgstr "رسالة"
+
+#. TRANS: Label text on user profile to select a user role.
+msgid "Moderate"
+msgstr "راقب"
+
+#. TRANS: Label text on user profile to select a user role.
+msgid "User role"
+msgstr "دور المستخدم"
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Administrator"
+msgstr "إداري"
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Moderator"
+msgstr "مراقب"
+
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
 #, php-format
 msgid "%1$s - %2$s"
@@ -6711,85 +6744,171 @@ msgstr[3] "أنت عضو في هذه المجموعات:"
 msgstr[4] ""
 msgstr[5] ""
 
-#. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-msgid ""
-"Commands:\n"
-"on - turn on notifications\n"
-"off - turn off notifications\n"
-"help - show this help\n"
-"follow <nickname> - subscribe to user\n"
-"groups - lists the groups you have joined\n"
-"subscriptions - list the people you follow\n"
-"subscribers - list the people that follow you\n"
-"leave <nickname> - unsubscribe from user\n"
-"d <nickname> <text> - direct message to user\n"
-"get <nickname> - get last notice from user\n"
-"whois <nickname> - get profile info on user\n"
-"lose <nickname> - force user to stop following you\n"
-"fav <nickname> - add user's last notice as a 'fave'\n"
-"fav #<notice_id> - add notice with the given id as a 'fave'\n"
-"repeat #<notice_id> - repeat a notice with a given id\n"
-"repeat <nickname> - repeat the last notice from user\n"
-"reply #<notice_id> - reply to notice with a given id\n"
-"reply <nickname> - reply to the last notice from user\n"
-"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
-"drop <group> - leave group\n"
-"stats - get your stats\n"
-"stop - same as 'off'\n"
-"quit - same as 'off'\n"
-"sub <nickname> - same as 'follow'\n"
-"unsub <nickname> - same as 'leave'\n"
-"last <nickname> - same as 'get'\n"
-"on <nickname> - not yet implemented.\n"
-"off <nickname> - not yet implemented.\n"
-"nudge <nickname> - remind a user to update.\n"
-"invite <phone number> - not yet implemented.\n"
-"track <word> - not yet implemented.\n"
-"untrack <word> - not yet implemented.\n"
-"track off - not yet implemented.\n"
-"untrack all - not yet implemented.\n"
-"tracks - not yet implemented.\n"
-"tracking - not yet implemented.\n"
+#. TRANS: Header line of help text for commands.
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "Commands:"
+msgstr "نتائج الأمر"
+
+#. TRANS: Help message for IM/SMS command "on"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "turn on notifications"
+msgstr "تعذّر تشغيل الإشعار."
+
+#. TRANS: Help message for IM/SMS command "off"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "turn off notifications"
+msgstr "تعذّر إطفاء الإشعارات."
+
+#. TRANS: Help message for IM/SMS command "help"
+msgctxt "COMMANDHELP"
+msgid "show this help"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "follow <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "subscribe to user"
+msgstr "اشترك بهذا المستخدم"
+
+#. TRANS: Help message for IM/SMS command "groups"
+msgctxt "COMMANDHELP"
+msgid "lists the groups you have joined"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscriptions"
+msgctxt "COMMANDHELP"
+msgid "list the people you follow"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscribers"
+msgctxt "COMMANDHELP"
+msgid "list the people that follow you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "leave <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "unsubscribe from user"
+msgstr "ألغِ الاشتراك مع هذا المستخدم"
+
+#. TRANS: Help message for IM/SMS command "d <nickname> <text>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "direct message to user"
+msgstr "رسالة مباشرة %s"
+
+#. TRANS: Help message for IM/SMS command "get <nickname>"
+msgctxt "COMMANDHELP"
+msgid "get last notice from user"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "whois <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "get profile info on user"
+msgstr "معلومات الملف الشخصي"
+
+#. TRANS: Help message for IM/SMS command "lose <nickname>"
+msgctxt "COMMANDHELP"
+msgid "force user to stop following you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav <nickname>"
+msgctxt "COMMANDHELP"
+msgid "add user's last notice as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "add notice with the given id as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "repeat a notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "repeat the last notice from user"
+msgstr "كرّر هذا الإشعار"
+
+#. TRANS: Help message for IM/SMS command "reply #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "reply to notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "reply <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "reply to the last notice from user"
+msgstr "رُد على هذا الإشعار"
+
+#. TRANS: Help message for IM/SMS command "join <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "join group"
+msgstr "غير معروفة"
+
+#. TRANS: Help message for IM/SMS command "login"
+msgctxt "COMMANDHELP"
+msgid "Get a link to login to the web interface"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "drop <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "leave group"
+msgstr "احذف المستخدم"
+
+#. TRANS: Help message for IM/SMS command "stats"
+msgctxt "COMMANDHELP"
+msgid "get your stats"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "stop"
+#. TRANS: Help message for IM/SMS command "quit"
+msgctxt "COMMANDHELP"
+msgid "same as 'off'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "sub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'follow'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "unsub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'leave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "last <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'get'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "on <nickname>"
+#. TRANS: Help message for IM/SMS command "off <nickname>"
+#. TRANS: Help message for IM/SMS command "invite <phone number>"
+#. TRANS: Help message for IM/SMS command "track <word>"
+#. TRANS: Help message for IM/SMS command "untrack <word>"
+#. TRANS: Help message for IM/SMS command "track off"
+#. TRANS: Help message for IM/SMS command "untrack all"
+#. TRANS: Help message for IM/SMS command "tracks"
+#. TRANS: Help message for IM/SMS command "tracking"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "not yet implemented."
+msgstr "الأمر لم يُجهزّ بعد."
+
+#. TRANS: Help message for IM/SMS command "nudge <nickname>"
+msgctxt "COMMANDHELP"
+msgid "remind a user to update."
 msgstr ""
-"الأوامر:\n"
-"on - شغّل الإشعار\n"
-"off - أطفئ الإشعار\n"
-"help - أظهر هذه المساعدة\n"
-"follow <nickname> - اشترك بالمستخدم\n"
-"groups - اسرد المجموعات التي أنا عضو فيها\n"
-"subscriptions - اسرد الذين أتابعهم\n"
-"subscribers - اسرد الذين يتابعونني\n"
-"leave <nickname> - ألغِ الاشتراك بمستخدم\n"
-"d <nickname> <text> - وجّه رسالة مباشرة إلى مستخدم\n"
-"get <nickname> - اجلب آخر رسالة من مستخدم\n"
-"whois <nickname> - اجلب معلومات ملف المستخدم\n"
-"lose <nickname> - أجبر المستخدم على عدم تتبعك\n"
-"fav <nickname> - اجعل آخر إشعار من المستخدم مفضلًا\n"
-"fav #<notice_id> - اجعل الإشعار ذا رقم الهوية المعطى مفضلا\n"
-"repeat #<notice_id> - كرّر الإشعار ذا رقم الهوية المعطى\n"
-"repeat <nickname> - كرّر آخر إشعار من المستخدم\n"
-"reply #<notice_id> - رُد على الإشعار ذي رقم الهوية المعطى\n"
-"reply <nickname> - رُد على آخر إشعار من المستخدم\n"
-"join <group> - انضم إلى مجموعة\n"
-"login - اجلب وصلة الولوج إلى واجهة الوب\n"
-"drop <group> - اترك المجموعة\n"
-"stats - اجلب إحصاءاتك\n"
-"stop - مثل 'off'\n"
-"quit - مثل 'off'\n"
-"sub <nickname> - مثل 'follow'\n"
-"unsub <nickname> - مثل 'leave'\n"
-"last <nickname> - مثل 'get'\n"
-"on <nickname> - لم يطبق بعد.\n"
-"off <nickname> - لم يطبق بعد.\n"
-"nudge <nickname> - ذكّر مستخدمًا بإشعار أرسلته.\n"
-"invite <phone number> - لم يطبق بعد.\n"
-"track <word> - لم يطبق بعد.\n"
-"untrack <word> - لم يطبق بعد.\n"
-"track off - لم يطبق بعد.\n"
-"untrack all - لم يطبق بعد.\n"
-"tracks - لم يطبق بعد.\n"
-"tracking - لم يطبق بعد.\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #, fuzzy
@@ -6973,6 +7092,9 @@ msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\"."
 msgstr "مكان تواجدك، على سبيل المثال \"المدينة، الولاية (أو المنطقة)، الدولة\""
 
+msgid "Aliases"
+msgstr "الكنى"
+
 #, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -7054,6 +7176,11 @@ msgctxt "TOOLTIP"
 msgid "Add or edit %s design"
 msgstr ""
 
+#. TRANS: Group actions header (h2). Text hidden by default.
+#, fuzzy
+msgid "Group actions"
+msgstr "تصرفات المستخدم"
+
 #. TRANS: Title for groups with the most members section.
 msgid "Groups with most members"
 msgstr "المجموعات الأكثر أعضاءً"
@@ -7560,6 +7687,7 @@ msgstr "أرسل إشعارًا"
 msgid "What's up, %s?"
 msgstr "ما الأخبار يا %s؟"
 
+#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr "أرفق"
 
@@ -8024,52 +8152,6 @@ msgstr "ألغِ الاشتراك"
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "ليس للمستخدم ملف شخصي."
 
-msgid "Edit Avatar"
-msgstr "عدّل الأفتار"
-
-#. TRANS: H2 for user actions in a profile.
-#. TRANS: H2 for entity actions in a profile.
-msgid "User actions"
-msgstr "تصرفات المستخدم"
-
-#. TRANS: Text shown in user profile of not yet compeltely deleted users.
-msgid "User deletion in progress..."
-msgstr "حذف المستخدم قيد التنفيذ..."
-
-#. TRANS: Link title for link on user profile.
-msgid "Edit profile settings"
-msgstr "عدّل إعدادات الملف الشخصي"
-
-#. TRANS: Link text for link on user profile.
-msgid "Edit"
-msgstr "عدّل"
-
-#. TRANS: Link title for link on user profile.
-msgid "Send a direct message to this user"
-msgstr "أرسل رسالة مباشرة إلى هذا المستخدم"
-
-#. TRANS: Link text for link on user profile.
-msgid "Message"
-msgstr "رسالة"
-
-#. TRANS: Label text on user profile to select a user role.
-msgid "Moderate"
-msgstr "راقب"
-
-#. TRANS: Label text on user profile to select a user role.
-msgid "User role"
-msgstr "دور المستخدم"
-
-#. TRANS: Role that can be set for a user profile.
-msgctxt "role"
-msgid "Administrator"
-msgstr "إداري"
-
-#. TRANS: Role that can be set for a user profile.
-msgctxt "role"
-msgid "Moderator"
-msgstr "مراقب"
-
 #, fuzzy
 msgid "Not allowed to log in."
 msgstr "لست والجًا."
@@ -8161,3 +8243,88 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#~ msgid "Note"
+#~ msgstr "ملاحظة"
+
+#~ msgid ""
+#~ "Commands:\n"
+#~ "on - turn on notifications\n"
+#~ "off - turn off notifications\n"
+#~ "help - show this help\n"
+#~ "follow <nickname> - subscribe to user\n"
+#~ "groups - lists the groups you have joined\n"
+#~ "subscriptions - list the people you follow\n"
+#~ "subscribers - list the people that follow you\n"
+#~ "leave <nickname> - unsubscribe from user\n"
+#~ "d <nickname> <text> - direct message to user\n"
+#~ "get <nickname> - get last notice from user\n"
+#~ "whois <nickname> - get profile info on user\n"
+#~ "lose <nickname> - force user to stop following you\n"
+#~ "fav <nickname> - add user's last notice as a 'fave'\n"
+#~ "fav #<notice_id> - add notice with the given id as a 'fave'\n"
+#~ "repeat #<notice_id> - repeat a notice with a given id\n"
+#~ "repeat <nickname> - repeat the last notice from user\n"
+#~ "reply #<notice_id> - reply to notice with a given id\n"
+#~ "reply <nickname> - reply to the last notice from user\n"
+#~ "join <group> - join group\n"
+#~ "login - Get a link to login to the web interface\n"
+#~ "drop <group> - leave group\n"
+#~ "stats - get your stats\n"
+#~ "stop - same as 'off'\n"
+#~ "quit - same as 'off'\n"
+#~ "sub <nickname> - same as 'follow'\n"
+#~ "unsub <nickname> - same as 'leave'\n"
+#~ "last <nickname> - same as 'get'\n"
+#~ "on <nickname> - not yet implemented.\n"
+#~ "off <nickname> - not yet implemented.\n"
+#~ "nudge <nickname> - remind a user to update.\n"
+#~ "invite <phone number> - not yet implemented.\n"
+#~ "track <word> - not yet implemented.\n"
+#~ "untrack <word> - not yet implemented.\n"
+#~ "track off - not yet implemented.\n"
+#~ "untrack all - not yet implemented.\n"
+#~ "tracks - not yet implemented.\n"
+#~ "tracking - not yet implemented.\n"
+#~ msgstr ""
+#~ "الأوامر:\n"
+#~ "on - شغّل الإشعار\n"
+#~ "off - أطفئ الإشعار\n"
+#~ "help - أظهر هذه المساعدة\n"
+#~ "follow <nickname> - اشترك بالمستخدم\n"
+#~ "groups - اسرد المجموعات التي أنا عضو فيها\n"
+#~ "subscriptions - اسرد الذين أتابعهم\n"
+#~ "subscribers - اسرد الذين يتابعونني\n"
+#~ "leave <nickname> - ألغِ الاشتراك بمستخدم\n"
+#~ "d <nickname> <text> - وجّه رسالة مباشرة إلى مستخدم\n"
+#~ "get <nickname> - اجلب آخر رسالة من مستخدم\n"
+#~ "whois <nickname> - اجلب معلومات ملف المستخدم\n"
+#~ "lose <nickname> - أجبر المستخدم على عدم تتبعك\n"
+#~ "fav <nickname> - اجعل آخر إشعار من المستخدم مفضلًا\n"
+#~ "fav #<notice_id> - اجعل الإشعار ذا رقم الهوية المعطى مفضلا\n"
+#~ "repeat #<notice_id> - كرّر الإشعار ذا رقم الهوية المعطى\n"
+#~ "repeat <nickname> - كرّر آخر إشعار من المستخدم\n"
+#~ "reply #<notice_id> - رُد على الإشعار ذي رقم الهوية المعطى\n"
+#~ "reply <nickname> - رُد على آخر إشعار من المستخدم\n"
+#~ "join <group> - انضم إلى مجموعة\n"
+#~ "login - اجلب وصلة الولوج إلى واجهة الوب\n"
+#~ "drop <group> - اترك المجموعة\n"
+#~ "stats - اجلب إحصاءاتك\n"
+#~ "stop - مثل 'off'\n"
+#~ "quit - مثل 'off'\n"
+#~ "sub <nickname> - مثل 'follow'\n"
+#~ "unsub <nickname> - مثل 'leave'\n"
+#~ "last <nickname> - مثل 'get'\n"
+#~ "on <nickname> - لم يطبق بعد.\n"
+#~ "off <nickname> - لم يطبق بعد.\n"
+#~ "nudge <nickname> - ذكّر مستخدمًا بإشعار أرسلته.\n"
+#~ "invite <phone number> - لم يطبق بعد.\n"
+#~ "track <word> - لم يطبق بعد.\n"
+#~ "untrack <word> - لم يطبق بعد.\n"
+#~ "track off - لم يطبق بعد.\n"
+#~ "untrack all - لم يطبق بعد.\n"
+#~ "tracks - لم يطبق بعد.\n"
+#~ "tracking - لم يطبق بعد.\n"
+
+#~ msgid "Edit Avatar"
+#~ msgstr "عدّل الأفتار"
diff --git a/locale/arz/LC_MESSAGES/statusnet.po b/locale/arz/LC_MESSAGES/statusnet.po
index 96a8a02c59..ece9e2217b 100644
--- a/locale/arz/LC_MESSAGES/statusnet.po
+++ b/locale/arz/LC_MESSAGES/statusnet.po
@@ -11,19 +11,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-11 18:15+0000\n"
-"PO-Revision-Date: 2011-03-11 18:16:54+0000\n"
+"POT-Creation-Date: 2011-03-17 09:47+0000\n"
+"PO-Revision-Date: 2011-03-17 09:49:22+0000\n"
 "Language-Team: Egyptian Spoken Arabic <http://translatewiki.net/wiki/Portal:"
 "arz>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83703); Translate extension (2011-03-11)\n"
+"X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: arz\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=6; plural= n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
 "&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
-"X-POT-Import-Date: 2011-03-08 01:25:01+0000\n"
+"X-POT-Import-Date: 2011-03-11 18:52:41+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -609,7 +609,7 @@ msgstr "ما نفعش يتشال اليوزر %1$s من الجروپ %2$s."
 msgid "%s's groups"
 msgstr "مجموعات %s"
 
-#. TRANS: Used as subtitle in check for group membership. %1$s is a user name, %2$s is the site name.
+#. TRANS: Used as subtitle in check for group membership. %1$s is the site name, %2$s is a user name.
 #, fuzzy, php-format
 msgid "%1$s groups %2$s is a member of."
 msgstr "المجموعات التى %s عضو فيها"
@@ -4647,19 +4647,6 @@ msgstr "مجموعه %s"
 msgid "%1$s group, page %2$d"
 msgstr "%1$s اعضاء الجروپ, صفحه %2$d"
 
-#. TRANS: Label for group description or group note (dt). Text hidden by default.
-msgid "Note"
-msgstr "ملاحظة"
-
-#. TRANS: Label for group aliases (dt). Text hidden by default.
-msgid "Aliases"
-msgstr "الكنى"
-
-#. TRANS: Group actions header (h2). Text hidden by default.
-#, fuzzy
-msgid "Group actions"
-msgstr "تصرفات المستخدم"
-
 #. TRANS: Tooltip for feed link. %s is a group nickname.
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
@@ -4768,6 +4755,10 @@ msgstr "نتايج التدوير لـ\"%1$s\" على %2$s"
 msgid "Notice deleted."
 msgstr "حُذف الإشعار."
 
+#, fuzzy
+msgid "Notice"
+msgstr "الإشعارات"
+
 #. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
 #, fuzzy, php-format
 msgid "%1$s tagged %2$s"
@@ -5294,7 +5285,6 @@ msgstr "لا مدخل هويه."
 msgid "Tag %s"
 msgstr "الوسوم"
 
-#. TRANS: H2 for user profile information.
 msgid "User profile"
 msgstr "ملف المستخدم الشخصي"
 
@@ -5995,6 +5985,51 @@ msgstr ""
 msgid "No AtomPub API service for %s."
 msgstr ""
 
+#. TRANS: H2 for user actions in a profile.
+#. TRANS: H2 for entity actions in a profile.
+msgid "User actions"
+msgstr "تصرفات المستخدم"
+
+#. TRANS: Text shown in user profile of not yet compeltely deleted users.
+msgid "User deletion in progress..."
+msgstr ""
+
+#. TRANS: Link title for link on user profile.
+msgid "Edit profile settings"
+msgstr "عدّل إعدادات الملف الشخصي"
+
+#. TRANS: Link text for link on user profile.
+msgid "Edit"
+msgstr "عدّل"
+
+#. TRANS: Link title for link on user profile.
+msgid "Send a direct message to this user"
+msgstr "أرسل رساله مباشره إلى هذا المستخدم"
+
+#. TRANS: Link text for link on user profile.
+msgid "Message"
+msgstr "رسالة"
+
+#. TRANS: Label text on user profile to select a user role.
+msgid "Moderate"
+msgstr ""
+
+#. TRANS: Label text on user profile to select a user role.
+#, fuzzy
+msgid "User role"
+msgstr "ملف المستخدم الشخصي"
+
+#. TRANS: Role that can be set for a user profile.
+#, fuzzy
+msgctxt "role"
+msgid "Administrator"
+msgstr "الإداريون"
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Moderator"
+msgstr ""
+
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
 #, php-format
 msgid "%1$s - %2$s"
@@ -6758,46 +6793,170 @@ msgstr[3] "أنت عضو فى هذه المجموعات:"
 msgstr[4] ""
 msgstr[5] ""
 
-#. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-msgid ""
-"Commands:\n"
-"on - turn on notifications\n"
-"off - turn off notifications\n"
-"help - show this help\n"
-"follow <nickname> - subscribe to user\n"
-"groups - lists the groups you have joined\n"
-"subscriptions - list the people you follow\n"
-"subscribers - list the people that follow you\n"
-"leave <nickname> - unsubscribe from user\n"
-"d <nickname> <text> - direct message to user\n"
-"get <nickname> - get last notice from user\n"
-"whois <nickname> - get profile info on user\n"
-"lose <nickname> - force user to stop following you\n"
-"fav <nickname> - add user's last notice as a 'fave'\n"
-"fav #<notice_id> - add notice with the given id as a 'fave'\n"
-"repeat #<notice_id> - repeat a notice with a given id\n"
-"repeat <nickname> - repeat the last notice from user\n"
-"reply #<notice_id> - reply to notice with a given id\n"
-"reply <nickname> - reply to the last notice from user\n"
-"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
-"drop <group> - leave group\n"
-"stats - get your stats\n"
-"stop - same as 'off'\n"
-"quit - same as 'off'\n"
-"sub <nickname> - same as 'follow'\n"
-"unsub <nickname> - same as 'leave'\n"
-"last <nickname> - same as 'get'\n"
-"on <nickname> - not yet implemented.\n"
-"off <nickname> - not yet implemented.\n"
-"nudge <nickname> - remind a user to update.\n"
-"invite <phone number> - not yet implemented.\n"
-"track <word> - not yet implemented.\n"
-"untrack <word> - not yet implemented.\n"
-"track off - not yet implemented.\n"
-"untrack all - not yet implemented.\n"
-"tracks - not yet implemented.\n"
-"tracking - not yet implemented.\n"
+#. TRANS: Header line of help text for commands.
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "Commands:"
+msgstr "نتائج الأمر"
+
+#. TRANS: Help message for IM/SMS command "on"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "turn on notifications"
+msgstr "مش نافعه تتكرر الملاحظتك بتاعتك."
+
+#. TRANS: Help message for IM/SMS command "off"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "turn off notifications"
+msgstr "مش نافعه تتكرر الملاحظتك بتاعتك."
+
+#. TRANS: Help message for IM/SMS command "help"
+msgctxt "COMMANDHELP"
+msgid "show this help"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "follow <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "subscribe to user"
+msgstr "اشترك بهذا المستخدم"
+
+#. TRANS: Help message for IM/SMS command "groups"
+msgctxt "COMMANDHELP"
+msgid "lists the groups you have joined"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscriptions"
+msgctxt "COMMANDHELP"
+msgid "list the people you follow"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscribers"
+msgctxt "COMMANDHELP"
+msgid "list the people that follow you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "leave <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "unsubscribe from user"
+msgstr "ألغِ الاشتراك مع هذا المستخدم"
+
+#. TRANS: Help message for IM/SMS command "d <nickname> <text>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "direct message to user"
+msgstr "رساله مباشره %s"
+
+#. TRANS: Help message for IM/SMS command "get <nickname>"
+msgctxt "COMMANDHELP"
+msgid "get last notice from user"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "whois <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "get profile info on user"
+msgstr "معلومات الملف الشخصي"
+
+#. TRANS: Help message for IM/SMS command "lose <nickname>"
+msgctxt "COMMANDHELP"
+msgid "force user to stop following you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav <nickname>"
+msgctxt "COMMANDHELP"
+msgid "add user's last notice as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "add notice with the given id as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "repeat a notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "repeat the last notice from user"
+msgstr "كرر هذا الإشعار"
+
+#. TRANS: Help message for IM/SMS command "reply #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "reply to notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "reply <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "reply to the last notice from user"
+msgstr "رُد على هذا الإشعار"
+
+#. TRANS: Help message for IM/SMS command "join <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "join group"
+msgstr "مش معروف"
+
+#. TRANS: Help message for IM/SMS command "login"
+msgctxt "COMMANDHELP"
+msgid "Get a link to login to the web interface"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "drop <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "leave group"
+msgstr "احذف المستخدم"
+
+#. TRANS: Help message for IM/SMS command "stats"
+msgctxt "COMMANDHELP"
+msgid "get your stats"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "stop"
+#. TRANS: Help message for IM/SMS command "quit"
+msgctxt "COMMANDHELP"
+msgid "same as 'off'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "sub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'follow'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "unsub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'leave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "last <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'get'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "on <nickname>"
+#. TRANS: Help message for IM/SMS command "off <nickname>"
+#. TRANS: Help message for IM/SMS command "invite <phone number>"
+#. TRANS: Help message for IM/SMS command "track <word>"
+#. TRANS: Help message for IM/SMS command "untrack <word>"
+#. TRANS: Help message for IM/SMS command "track off"
+#. TRANS: Help message for IM/SMS command "untrack all"
+#. TRANS: Help message for IM/SMS command "tracks"
+#. TRANS: Help message for IM/SMS command "tracking"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "not yet implemented."
+msgstr "اكتمل الأمر"
+
+#. TRANS: Help message for IM/SMS command "nudge <nickname>"
+msgctxt "COMMANDHELP"
+msgid "remind a user to update."
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
@@ -6982,6 +7141,9 @@ msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\"."
 msgstr ""
 
+msgid "Aliases"
+msgstr "الكنى"
+
 #, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -7064,6 +7226,11 @@ msgctxt "TOOLTIP"
 msgid "Add or edit %s design"
 msgstr ""
 
+#. TRANS: Group actions header (h2). Text hidden by default.
+#, fuzzy
+msgid "Group actions"
+msgstr "تصرفات المستخدم"
+
 #. TRANS: Title for groups with the most members section.
 msgid "Groups with most members"
 msgstr "المجموعات الأكثر أعضاءً"
@@ -7552,6 +7719,7 @@ msgstr "أرسل إشعارًا"
 msgid "What's up, %s?"
 msgstr "ما الأخبار يا %s؟"
 
+#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr "أرفق"
 
@@ -8020,54 +8188,6 @@ msgstr "ألغِ الاشتراك"
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "ليس للمستخدم ملف شخصى."
 
-msgid "Edit Avatar"
-msgstr "عدّل الأفتار"
-
-#. TRANS: H2 for user actions in a profile.
-#. TRANS: H2 for entity actions in a profile.
-msgid "User actions"
-msgstr "تصرفات المستخدم"
-
-#. TRANS: Text shown in user profile of not yet compeltely deleted users.
-msgid "User deletion in progress..."
-msgstr ""
-
-#. TRANS: Link title for link on user profile.
-msgid "Edit profile settings"
-msgstr "عدّل إعدادات الملف الشخصي"
-
-#. TRANS: Link text for link on user profile.
-msgid "Edit"
-msgstr "عدّل"
-
-#. TRANS: Link title for link on user profile.
-msgid "Send a direct message to this user"
-msgstr "أرسل رساله مباشره إلى هذا المستخدم"
-
-#. TRANS: Link text for link on user profile.
-msgid "Message"
-msgstr "رسالة"
-
-#. TRANS: Label text on user profile to select a user role.
-msgid "Moderate"
-msgstr ""
-
-#. TRANS: Label text on user profile to select a user role.
-#, fuzzy
-msgid "User role"
-msgstr "ملف المستخدم الشخصي"
-
-#. TRANS: Role that can be set for a user profile.
-#, fuzzy
-msgctxt "role"
-msgid "Administrator"
-msgstr "الإداريون"
-
-#. TRANS: Role that can be set for a user profile.
-msgctxt "role"
-msgid "Moderator"
-msgstr ""
-
 #, fuzzy
 msgid "Not allowed to log in."
 msgstr "لست والجًا."
@@ -8159,3 +8279,9 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#~ msgid "Note"
+#~ msgstr "ملاحظة"
+
+#~ msgid "Edit Avatar"
+#~ msgstr "عدّل الأفتار"
diff --git a/locale/bg/LC_MESSAGES/statusnet.po b/locale/bg/LC_MESSAGES/statusnet.po
index eaabeec93f..4d1cf6906c 100644
--- a/locale/bg/LC_MESSAGES/statusnet.po
+++ b/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-03-11 18:15+0000\n"
-"PO-Revision-Date: 2011-03-11 18:16:55+0000\n"
+"POT-Creation-Date: 2011-03-17 09:47+0000\n"
+"PO-Revision-Date: 2011-03-17 09:49:23+0000\n"
 "Language-Team: Bulgarian <http://translatewiki.net/wiki/Portal:bg>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83703); Translate extension (2011-03-11)\n"
+"X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: bg\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-03-08 01:25:01+0000\n"
+"X-POT-Import-Date: 2011-03-11 18:52:41+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -587,7 +587,7 @@ msgstr "Грешка при създаване на групата."
 msgid "%s's groups"
 msgstr "Групи на %s"
 
-#. TRANS: Used as subtitle in check for group membership. %1$s is a user name, %2$s is the site name.
+#. TRANS: Used as subtitle in check for group membership. %1$s is the site name, %2$s is a user name.
 #, fuzzy, php-format
 msgid "%1$s groups %2$s is a member of."
 msgstr "Групи, в които участва %s"
@@ -4658,19 +4658,6 @@ msgstr "Група %s"
 msgid "%1$s group, page %2$d"
 msgstr "%1$s, страница %2$d"
 
-#. TRANS: Label for group description or group note (dt). Text hidden by default.
-msgid "Note"
-msgstr "Бележка"
-
-#. TRANS: Label for group aliases (dt). Text hidden by default.
-msgid "Aliases"
-msgstr "Псевдоними"
-
-#. TRANS: Group actions header (h2). Text hidden by default.
-#, fuzzy
-msgid "Group actions"
-msgstr "Потребителски действия"
-
 #. TRANS: Tooltip for feed link. %s is a group nickname.
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
@@ -4773,6 +4760,10 @@ msgstr "Съобщение от %1$s в %2$s"
 msgid "Notice deleted."
 msgstr "Бележката е изтрита."
 
+#, fuzzy
+msgid "Notice"
+msgstr "Бележки"
+
 #. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
 #, fuzzy, php-format
 msgid "%1$s tagged %2$s"
@@ -5292,7 +5283,6 @@ msgstr "Липсват аргументи return-to."
 msgid "Tag %s"
 msgstr "Етикети"
 
-#. TRANS: H2 for user profile information.
 msgid "User profile"
 msgstr "Потребителски профил"
 
@@ -6001,6 +5991,50 @@ msgstr ""
 msgid "No AtomPub API service for %s."
 msgstr ""
 
+#. TRANS: H2 for user actions in a profile.
+#. TRANS: H2 for entity actions in a profile.
+msgid "User actions"
+msgstr "Потребителски действия"
+
+#. TRANS: Text shown in user profile of not yet compeltely deleted users.
+msgid "User deletion in progress..."
+msgstr ""
+
+#. TRANS: Link title for link on user profile.
+msgid "Edit profile settings"
+msgstr "Редактиране на профила"
+
+#. TRANS: Link text for link on user profile.
+msgid "Edit"
+msgstr "Редактиране"
+
+#. TRANS: Link title for link on user profile.
+msgid "Send a direct message to this user"
+msgstr "Изпращате на пряко съобщение до този потребител."
+
+#. TRANS: Link text for link on user profile.
+msgid "Message"
+msgstr "Съобщение"
+
+#. TRANS: Label text on user profile to select a user role.
+#, fuzzy
+msgid "Moderate"
+msgstr "Модератор"
+
+#. TRANS: Label text on user profile to select a user role.
+msgid "User role"
+msgstr "Потребителска роля"
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Administrator"
+msgstr "Администратор"
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Moderator"
+msgstr "Модератор"
+
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
 #, php-format
 msgid "%1$s - %2$s"
@@ -6745,46 +6779,170 @@ msgid_plural "You are a member of these groups:"
 msgstr[0] "Не членувате в тази група."
 msgstr[1] "Не членувате в тази група."
 
-#. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-msgid ""
-"Commands:\n"
-"on - turn on notifications\n"
-"off - turn off notifications\n"
-"help - show this help\n"
-"follow <nickname> - subscribe to user\n"
-"groups - lists the groups you have joined\n"
-"subscriptions - list the people you follow\n"
-"subscribers - list the people that follow you\n"
-"leave <nickname> - unsubscribe from user\n"
-"d <nickname> <text> - direct message to user\n"
-"get <nickname> - get last notice from user\n"
-"whois <nickname> - get profile info on user\n"
-"lose <nickname> - force user to stop following you\n"
-"fav <nickname> - add user's last notice as a 'fave'\n"
-"fav #<notice_id> - add notice with the given id as a 'fave'\n"
-"repeat #<notice_id> - repeat a notice with a given id\n"
-"repeat <nickname> - repeat the last notice from user\n"
-"reply #<notice_id> - reply to notice with a given id\n"
-"reply <nickname> - reply to the last notice from user\n"
-"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
-"drop <group> - leave group\n"
-"stats - get your stats\n"
-"stop - same as 'off'\n"
-"quit - same as 'off'\n"
-"sub <nickname> - same as 'follow'\n"
-"unsub <nickname> - same as 'leave'\n"
-"last <nickname> - same as 'get'\n"
-"on <nickname> - not yet implemented.\n"
-"off <nickname> - not yet implemented.\n"
-"nudge <nickname> - remind a user to update.\n"
-"invite <phone number> - not yet implemented.\n"
-"track <word> - not yet implemented.\n"
-"untrack <word> - not yet implemented.\n"
-"track off - not yet implemented.\n"
-"untrack all - not yet implemented.\n"
-"tracks - not yet implemented.\n"
-"tracking - not yet implemented.\n"
+#. TRANS: Header line of help text for commands.
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "Commands:"
+msgstr "Резултат от командата"
+
+#. TRANS: Help message for IM/SMS command "on"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "turn on notifications"
+msgstr "Грешка при включване на уведомлението."
+
+#. TRANS: Help message for IM/SMS command "off"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "turn off notifications"
+msgstr "Грешка при изключване на уведомлението."
+
+#. TRANS: Help message for IM/SMS command "help"
+msgctxt "COMMANDHELP"
+msgid "show this help"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "follow <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "subscribe to user"
+msgstr "Абониране за този потребител"
+
+#. TRANS: Help message for IM/SMS command "groups"
+msgctxt "COMMANDHELP"
+msgid "lists the groups you have joined"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscriptions"
+msgctxt "COMMANDHELP"
+msgid "list the people you follow"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscribers"
+msgctxt "COMMANDHELP"
+msgid "list the people that follow you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "leave <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "unsubscribe from user"
+msgstr "Отписване от този потребител"
+
+#. TRANS: Help message for IM/SMS command "d <nickname> <text>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "direct message to user"
+msgstr "Преки съобщения до %s"
+
+#. TRANS: Help message for IM/SMS command "get <nickname>"
+msgctxt "COMMANDHELP"
+msgid "get last notice from user"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "whois <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "get profile info on user"
+msgstr "Данни на профила"
+
+#. TRANS: Help message for IM/SMS command "lose <nickname>"
+msgctxt "COMMANDHELP"
+msgid "force user to stop following you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav <nickname>"
+msgctxt "COMMANDHELP"
+msgid "add user's last notice as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "add notice with the given id as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "repeat a notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "repeat the last notice from user"
+msgstr "Повтаряне на тази бележка"
+
+#. TRANS: Help message for IM/SMS command "reply #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "reply to notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "reply <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "reply to the last notice from user"
+msgstr "Отговаряне на тази бележка"
+
+#. TRANS: Help message for IM/SMS command "join <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "join group"
+msgstr "Непозната група."
+
+#. TRANS: Help message for IM/SMS command "login"
+msgctxt "COMMANDHELP"
+msgid "Get a link to login to the web interface"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "drop <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "leave group"
+msgstr "Изтриване на потребител"
+
+#. TRANS: Help message for IM/SMS command "stats"
+msgctxt "COMMANDHELP"
+msgid "get your stats"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "stop"
+#. TRANS: Help message for IM/SMS command "quit"
+msgctxt "COMMANDHELP"
+msgid "same as 'off'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "sub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'follow'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "unsub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'leave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "last <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'get'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "on <nickname>"
+#. TRANS: Help message for IM/SMS command "off <nickname>"
+#. TRANS: Help message for IM/SMS command "invite <phone number>"
+#. TRANS: Help message for IM/SMS command "track <word>"
+#. TRANS: Help message for IM/SMS command "untrack <word>"
+#. TRANS: Help message for IM/SMS command "track off"
+#. TRANS: Help message for IM/SMS command "untrack all"
+#. TRANS: Help message for IM/SMS command "tracks"
+#. TRANS: Help message for IM/SMS command "tracking"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "not yet implemented."
+msgstr "Командата все още не се поддържа."
+
+#. TRANS: Help message for IM/SMS command "nudge <nickname>"
+msgctxt "COMMANDHELP"
+msgid "remind a user to update."
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
@@ -6972,6 +7130,9 @@ msgid ""
 msgstr ""
 "Къде се намира групата — град, община, държава и т.н. (ако е приложимо)"
 
+msgid "Aliases"
+msgstr "Псевдоними"
+
 #, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -7050,6 +7211,11 @@ msgctxt "TOOLTIP"
 msgid "Add or edit %s design"
 msgstr ""
 
+#. TRANS: Group actions header (h2). Text hidden by default.
+#, fuzzy
+msgid "Group actions"
+msgstr "Потребителски действия"
+
 #. TRANS: Title for groups with the most members section.
 msgid "Groups with most members"
 msgstr "Групи с най-много членове"
@@ -7525,6 +7691,7 @@ msgstr "Изпращане на бележка"
 msgid "What's up, %s?"
 msgstr "Какво става, %s?"
 
+#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr "Прикрепяне"
 
@@ -7988,53 +8155,6 @@ msgstr "Отписване"
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "Потребителят няма профил."
 
-msgid "Edit Avatar"
-msgstr "Редактиране на аватара"
-
-#. TRANS: H2 for user actions in a profile.
-#. TRANS: H2 for entity actions in a profile.
-msgid "User actions"
-msgstr "Потребителски действия"
-
-#. TRANS: Text shown in user profile of not yet compeltely deleted users.
-msgid "User deletion in progress..."
-msgstr ""
-
-#. TRANS: Link title for link on user profile.
-msgid "Edit profile settings"
-msgstr "Редактиране на профила"
-
-#. TRANS: Link text for link on user profile.
-msgid "Edit"
-msgstr "Редактиране"
-
-#. TRANS: Link title for link on user profile.
-msgid "Send a direct message to this user"
-msgstr "Изпращате на пряко съобщение до този потребител."
-
-#. TRANS: Link text for link on user profile.
-msgid "Message"
-msgstr "Съобщение"
-
-#. TRANS: Label text on user profile to select a user role.
-#, fuzzy
-msgid "Moderate"
-msgstr "Модератор"
-
-#. TRANS: Label text on user profile to select a user role.
-msgid "User role"
-msgstr "Потребителска роля"
-
-#. TRANS: Role that can be set for a user profile.
-msgctxt "role"
-msgid "Administrator"
-msgstr "Администратор"
-
-#. TRANS: Role that can be set for a user profile.
-msgctxt "role"
-msgid "Moderator"
-msgstr "Модератор"
-
 #, fuzzy
 msgid "Not allowed to log in."
 msgstr "Не сте влезли в системата."
@@ -8110,3 +8230,9 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#~ msgid "Note"
+#~ msgstr "Бележка"
+
+#~ msgid "Edit Avatar"
+#~ msgstr "Редактиране на аватара"
diff --git a/locale/br/LC_MESSAGES/statusnet.po b/locale/br/LC_MESSAGES/statusnet.po
index 8ca30f42c1..6bf976f0fd 100644
--- a/locale/br/LC_MESSAGES/statusnet.po
+++ b/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-03-11 18:15+0000\n"
-"PO-Revision-Date: 2011-03-11 18:16:56+0000\n"
+"POT-Creation-Date: 2011-03-17 09:47+0000\n"
+"PO-Revision-Date: 2011-03-17 09:49:25+0000\n"
 "Language-Team: Breton <http://translatewiki.net/wiki/Portal:br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83703); Translate extension (2011-03-11)\n"
+"X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-POT-Import-Date: 2011-03-08 01:25:01+0000\n"
+"X-POT-Import-Date: 2011-03-11 18:52:41+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -589,7 +589,7 @@ msgstr "Dibosupl eo dilemel an implijer %1$s deus ar strollad %2$s."
 msgid "%s's groups"
 msgstr "Strollad %s"
 
-#. TRANS: Used as subtitle in check for group membership. %1$s is a user name, %2$s is the site name.
+#. TRANS: Used as subtitle in check for group membership. %1$s is the site name, %2$s is a user name.
 #, php-format
 msgid "%1$s groups %2$s is a member of."
 msgstr "Strolladoù %1s m'eo ezel %2s."
@@ -4582,18 +4582,6 @@ msgstr "strollad %s"
 msgid "%1$s group, page %2$d"
 msgstr "Strollad %1$s, pajenn %2$d"
 
-#. TRANS: Label for group description or group note (dt). Text hidden by default.
-msgid "Note"
-msgstr "Notenn"
-
-#. TRANS: Label for group aliases (dt). Text hidden by default.
-msgid "Aliases"
-msgstr "Aliasoù"
-
-#. TRANS: Group actions header (h2). Text hidden by default.
-msgid "Group actions"
-msgstr "Obererezh ar strollad"
-
 #. TRANS: Tooltip for feed link. %s is a group nickname.
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
@@ -4700,6 +4688,10 @@ msgstr "Kemenadenn resevet eus %1$s d'an %2$s"
 msgid "Notice deleted."
 msgstr "Ali dilammet."
 
+#, fuzzy
+msgid "Notice"
+msgstr "Ali"
+
 #. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
 #, fuzzy, php-format
 msgid "%1$s tagged %2$s"
@@ -5225,7 +5217,6 @@ msgstr "Arguzenn ID ebet."
 msgid "Tag %s"
 msgstr "Merk %s"
 
-#. TRANS: H2 for user profile information.
 msgid "User profile"
 msgstr "Profil an implijer"
 
@@ -5916,6 +5907,49 @@ msgstr ""
 msgid "No AtomPub API service for %s."
 msgstr ""
 
+#. TRANS: H2 for user actions in a profile.
+#. TRANS: H2 for entity actions in a profile.
+msgid "User actions"
+msgstr "Obererezh an implijer"
+
+#. TRANS: Text shown in user profile of not yet compeltely deleted users.
+msgid "User deletion in progress..."
+msgstr "Diverkadenn an implijer o vont war-raok..."
+
+#. TRANS: Link title for link on user profile.
+msgid "Edit profile settings"
+msgstr "Kemmañ arventennoù ar profil"
+
+#. TRANS: Link text for link on user profile.
+msgid "Edit"
+msgstr "Aozañ"
+
+#. TRANS: Link title for link on user profile.
+msgid "Send a direct message to this user"
+msgstr "Kas ur gemennadenn war-eeun d'an implijer-mañ"
+
+#. TRANS: Link text for link on user profile.
+msgid "Message"
+msgstr "Kemennadenn"
+
+#. TRANS: Label text on user profile to select a user role.
+msgid "Moderate"
+msgstr "Habaskaat"
+
+#. TRANS: Label text on user profile to select a user role.
+msgid "User role"
+msgstr "Rol an implijer"
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Administrator"
+msgstr "Merour"
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Moderator"
+msgstr "Habasker"
+
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
 #, php-format
 msgid "%1$s - %2$s"
@@ -6644,46 +6678,170 @@ msgid_plural "You are a member of these groups:"
 msgstr[0] "You are a member of this group:"
 msgstr[1] "You are a member of these groups:"
 
-#. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-msgid ""
-"Commands:\n"
-"on - turn on notifications\n"
-"off - turn off notifications\n"
-"help - show this help\n"
-"follow <nickname> - subscribe to user\n"
-"groups - lists the groups you have joined\n"
-"subscriptions - list the people you follow\n"
-"subscribers - list the people that follow you\n"
-"leave <nickname> - unsubscribe from user\n"
-"d <nickname> <text> - direct message to user\n"
-"get <nickname> - get last notice from user\n"
-"whois <nickname> - get profile info on user\n"
-"lose <nickname> - force user to stop following you\n"
-"fav <nickname> - add user's last notice as a 'fave'\n"
-"fav #<notice_id> - add notice with the given id as a 'fave'\n"
-"repeat #<notice_id> - repeat a notice with a given id\n"
-"repeat <nickname> - repeat the last notice from user\n"
-"reply #<notice_id> - reply to notice with a given id\n"
-"reply <nickname> - reply to the last notice from user\n"
-"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
-"drop <group> - leave group\n"
-"stats - get your stats\n"
-"stop - same as 'off'\n"
-"quit - same as 'off'\n"
-"sub <nickname> - same as 'follow'\n"
-"unsub <nickname> - same as 'leave'\n"
-"last <nickname> - same as 'get'\n"
-"on <nickname> - not yet implemented.\n"
-"off <nickname> - not yet implemented.\n"
-"nudge <nickname> - remind a user to update.\n"
-"invite <phone number> - not yet implemented.\n"
-"track <word> - not yet implemented.\n"
-"untrack <word> - not yet implemented.\n"
-"track off - not yet implemented.\n"
-"untrack all - not yet implemented.\n"
-"tracks - not yet implemented.\n"
-"tracking - not yet implemented.\n"
+#. TRANS: Header line of help text for commands.
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "Commands:"
+msgstr "Disoc'hoù an urzhiad"
+
+#. TRANS: Help message for IM/SMS command "on"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "turn on notifications"
+msgstr "Dibosupl eo gweredekaat ar c'hemennoù."
+
+#. TRANS: Help message for IM/SMS command "off"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "turn off notifications"
+msgstr "Dibosupl eo diweredekaat ar c'hemennoù."
+
+#. TRANS: Help message for IM/SMS command "help"
+msgctxt "COMMANDHELP"
+msgid "show this help"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "follow <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "subscribe to user"
+msgstr "En em goumanantiñ d'an implijer-mañ"
+
+#. TRANS: Help message for IM/SMS command "groups"
+msgctxt "COMMANDHELP"
+msgid "lists the groups you have joined"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscriptions"
+msgctxt "COMMANDHELP"
+msgid "list the people you follow"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscribers"
+msgctxt "COMMANDHELP"
+msgid "list the people that follow you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "leave <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "unsubscribe from user"
+msgstr "En em zigoumanantiñ eus an implijer-mañ"
+
+#. TRANS: Help message for IM/SMS command "d <nickname> <text>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "direct message to user"
+msgstr "Kemennadennoù war-eeun kaset da %s"
+
+#. TRANS: Help message for IM/SMS command "get <nickname>"
+msgctxt "COMMANDHELP"
+msgid "get last notice from user"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "whois <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "get profile info on user"
+msgstr "Titouroù ar profil"
+
+#. TRANS: Help message for IM/SMS command "lose <nickname>"
+msgctxt "COMMANDHELP"
+msgid "force user to stop following you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav <nickname>"
+msgctxt "COMMANDHELP"
+msgid "add user's last notice as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "add notice with the given id as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "repeat a notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "repeat the last notice from user"
+msgstr "Adkregiñ gant ar c'hemenn-mañ"
+
+#. TRANS: Help message for IM/SMS command "reply #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "reply to notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "reply <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "reply to the last notice from user"
+msgstr "Respont d'ar c'hemenn-mañ"
+
+#. TRANS: Help message for IM/SMS command "join <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "join group"
+msgstr "Strollad dianav."
+
+#. TRANS: Help message for IM/SMS command "login"
+msgctxt "COMMANDHELP"
+msgid "Get a link to login to the web interface"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "drop <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "leave group"
+msgstr "Dilemel ar strollad"
+
+#. TRANS: Help message for IM/SMS command "stats"
+msgctxt "COMMANDHELP"
+msgid "get your stats"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "stop"
+#. TRANS: Help message for IM/SMS command "quit"
+msgctxt "COMMANDHELP"
+msgid "same as 'off'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "sub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'follow'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "unsub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'leave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "last <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'get'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "on <nickname>"
+#. TRANS: Help message for IM/SMS command "off <nickname>"
+#. TRANS: Help message for IM/SMS command "invite <phone number>"
+#. TRANS: Help message for IM/SMS command "track <word>"
+#. TRANS: Help message for IM/SMS command "untrack <word>"
+#. TRANS: Help message for IM/SMS command "track off"
+#. TRANS: Help message for IM/SMS command "untrack all"
+#. TRANS: Help message for IM/SMS command "tracks"
+#. TRANS: Help message for IM/SMS command "tracking"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "not yet implemented."
+msgstr "Digarezit, n'eo ket bet emplementet an urzhiad-mañ c'hoazh."
+
+#. TRANS: Help message for IM/SMS command "nudge <nickname>"
+msgctxt "COMMANDHELP"
+msgid "remind a user to update."
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
@@ -6867,6 +7025,9 @@ msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\"."
 msgstr "El lec'h m'emaoc'h, da skouer \"Kêr, Stad (pe Rannvro), Bro\""
 
+msgid "Aliases"
+msgstr "Aliasoù"
+
 #, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -6944,6 +7105,10 @@ msgctxt "TOOLTIP"
 msgid "Add or edit %s design"
 msgstr "Ouzhpennañ pe kemmañ tres ar strollad %s"
 
+#. TRANS: Group actions header (h2). Text hidden by default.
+msgid "Group actions"
+msgstr "Obererezh ar strollad"
+
 #. TRANS: Title for groups with the most members section.
 #, fuzzy
 msgid "Groups with most members"
@@ -7418,6 +7583,7 @@ msgstr "Kas un ali"
 msgid "What's up, %s?"
 msgstr "Penaos 'mañ kont, %s ?"
 
+#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr "Stagañ"
 
@@ -7877,52 +8043,6 @@ msgstr "Digoumanantiñ"
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "An implijer-mañ n'eus profil ebet dezhañ."
 
-msgid "Edit Avatar"
-msgstr "Kemmañ an Avatar"
-
-#. TRANS: H2 for user actions in a profile.
-#. TRANS: H2 for entity actions in a profile.
-msgid "User actions"
-msgstr "Obererezh an implijer"
-
-#. TRANS: Text shown in user profile of not yet compeltely deleted users.
-msgid "User deletion in progress..."
-msgstr "Diverkadenn an implijer o vont war-raok..."
-
-#. TRANS: Link title for link on user profile.
-msgid "Edit profile settings"
-msgstr "Kemmañ arventennoù ar profil"
-
-#. TRANS: Link text for link on user profile.
-msgid "Edit"
-msgstr "Aozañ"
-
-#. TRANS: Link title for link on user profile.
-msgid "Send a direct message to this user"
-msgstr "Kas ur gemennadenn war-eeun d'an implijer-mañ"
-
-#. TRANS: Link text for link on user profile.
-msgid "Message"
-msgstr "Kemennadenn"
-
-#. TRANS: Label text on user profile to select a user role.
-msgid "Moderate"
-msgstr "Habaskaat"
-
-#. TRANS: Label text on user profile to select a user role.
-msgid "User role"
-msgstr "Rol an implijer"
-
-#. TRANS: Role that can be set for a user profile.
-msgctxt "role"
-msgid "Administrator"
-msgstr "Merour"
-
-#. TRANS: Role that can be set for a user profile.
-msgctxt "role"
-msgid "Moderator"
-msgstr "Habasker"
-
 #, fuzzy
 msgid "Not allowed to log in."
 msgstr "Nann-kevreet."
@@ -7998,3 +8118,9 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#~ msgid "Note"
+#~ msgstr "Notenn"
+
+#~ msgid "Edit Avatar"
+#~ msgstr "Kemmañ an Avatar"
diff --git a/locale/ca/LC_MESSAGES/statusnet.po b/locale/ca/LC_MESSAGES/statusnet.po
index c8c23852bb..be175cd65b 100644
--- a/locale/ca/LC_MESSAGES/statusnet.po
+++ b/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-03-11 18:15+0000\n"
-"PO-Revision-Date: 2011-03-11 18:16:57+0000\n"
+"POT-Creation-Date: 2011-03-17 09:47+0000\n"
+"PO-Revision-Date: 2011-03-17 09:49:26+0000\n"
 "Language-Team: Catalan <http://translatewiki.net/wiki/Portal:ca>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83703); Translate extension (2011-03-11)\n"
+"X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ca\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-03-08 01:25:01+0000\n"
+"X-POT-Import-Date: 2011-03-11 18:52:41+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -598,7 +598,7 @@ msgstr "No s'ha pogut eliminar l'usuari %1$s del grup %2$s."
 msgid "%s's groups"
 msgstr "Grups de %s"
 
-#. TRANS: Used as subtitle in check for group membership. %1$s is a user name, %2$s is the site name.
+#. TRANS: Used as subtitle in check for group membership. %1$s is the site name, %2$s is a user name.
 #, php-format
 msgid "%1$s groups %2$s is a member of."
 msgstr "%1$s grups dels que %2$s és membre."
@@ -3433,7 +3433,6 @@ msgid "6 or more characters."
 msgstr "6 o més caràcters."
 
 #. TRANS: Field label on page where to change password. In this field the new password should be typed a second time.
-#, fuzzy
 msgctxt "LABEL"
 msgid "Confirm"
 msgstr "Confirma"
@@ -3444,7 +3443,6 @@ msgid "Same as password above."
 msgstr "Igual que la contrasenya de dalt"
 
 #. TRANS: Button text on page where to change password.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Change"
 msgstr "Canvia"
@@ -3457,9 +3455,8 @@ msgid "Passwords don't match."
 msgstr "Les contrasenyes no coincideixen."
 
 #. TRANS: Form validation error on page where to change password.
-#, fuzzy
 msgid "Incorrect old password."
-msgstr "Contrasenya antiga incorrecta"
+msgstr "La contrasenya antiga no és correcta"
 
 #. TRANS: Form validation error on page where to change password.
 msgid "Error saving user; invalid."
@@ -4646,18 +4643,6 @@ msgstr "%s grup"
 msgid "%1$s group, page %2$d"
 msgstr "grup %1$s, pàgina %2$d"
 
-#. TRANS: Label for group description or group note (dt). Text hidden by default.
-msgid "Note"
-msgstr "Avisos"
-
-#. TRANS: Label for group aliases (dt). Text hidden by default.
-msgid "Aliases"
-msgstr "Àlies"
-
-#. TRANS: Group actions header (h2). Text hidden by default.
-msgid "Group actions"
-msgstr "Accions del grup"
-
 #. TRANS: Tooltip for feed link. %s is a group nickname.
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
@@ -4768,6 +4753,10 @@ msgstr "Missatge de %1$s a %2$s"
 msgid "Notice deleted."
 msgstr "S'ha eliminat l'avís."
 
+#, fuzzy
+msgid "Notice"
+msgstr "Avisos"
+
 #. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
 #, php-format
 msgid "%1$s tagged %2$s"
@@ -5303,7 +5292,6 @@ msgstr "No hi ha cap argument ID."
 msgid "Tag %s"
 msgstr "Etiqueta %s"
 
-#. TRANS: H2 for user profile information.
 msgid "User profile"
 msgstr "Perfil de l'usuari"
 
@@ -6022,6 +6010,49 @@ msgstr "No es pot trobar l'XRD de %s."
 msgid "No AtomPub API service for %s."
 msgstr "No hi ha cap servei API d'AtomPub de %s."
 
+#. TRANS: H2 for user actions in a profile.
+#. TRANS: H2 for entity actions in a profile.
+msgid "User actions"
+msgstr "Accions de l'usuari"
+
+#. TRANS: Text shown in user profile of not yet compeltely deleted users.
+msgid "User deletion in progress..."
+msgstr "S'està eliminant l'usuari..."
+
+#. TRANS: Link title for link on user profile.
+msgid "Edit profile settings"
+msgstr "Edita la configuració del perfil"
+
+#. TRANS: Link text for link on user profile.
+msgid "Edit"
+msgstr "Edita"
+
+#. TRANS: Link title for link on user profile.
+msgid "Send a direct message to this user"
+msgstr "Envia un missatge directe a aquest usuari"
+
+#. TRANS: Link text for link on user profile.
+msgid "Message"
+msgstr "Missatge"
+
+#. TRANS: Label text on user profile to select a user role.
+msgid "Moderate"
+msgstr "Modera"
+
+#. TRANS: Label text on user profile to select a user role.
+msgid "User role"
+msgstr "Rol de l'usuari"
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Administrator"
+msgstr "Administrador"
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Moderator"
+msgstr "Moderador"
+
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
 #, php-format
 msgid "%1$s - %2$s"
@@ -6747,85 +6778,171 @@ msgid_plural "You are a member of these groups:"
 msgstr[0] "Sou un membre d'aquest grup:"
 msgstr[1] "Sou un membre d'aquests grups:"
 
-#. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-msgid ""
-"Commands:\n"
-"on - turn on notifications\n"
-"off - turn off notifications\n"
-"help - show this help\n"
-"follow <nickname> - subscribe to user\n"
-"groups - lists the groups you have joined\n"
-"subscriptions - list the people you follow\n"
-"subscribers - list the people that follow you\n"
-"leave <nickname> - unsubscribe from user\n"
-"d <nickname> <text> - direct message to user\n"
-"get <nickname> - get last notice from user\n"
-"whois <nickname> - get profile info on user\n"
-"lose <nickname> - force user to stop following you\n"
-"fav <nickname> - add user's last notice as a 'fave'\n"
-"fav #<notice_id> - add notice with the given id as a 'fave'\n"
-"repeat #<notice_id> - repeat a notice with a given id\n"
-"repeat <nickname> - repeat the last notice from user\n"
-"reply #<notice_id> - reply to notice with a given id\n"
-"reply <nickname> - reply to the last notice from user\n"
-"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
-"drop <group> - leave group\n"
-"stats - get your stats\n"
-"stop - same as 'off'\n"
-"quit - same as 'off'\n"
-"sub <nickname> - same as 'follow'\n"
-"unsub <nickname> - same as 'leave'\n"
-"last <nickname> - same as 'get'\n"
-"on <nickname> - not yet implemented.\n"
-"off <nickname> - not yet implemented.\n"
-"nudge <nickname> - remind a user to update.\n"
-"invite <phone number> - not yet implemented.\n"
-"track <word> - not yet implemented.\n"
-"untrack <word> - not yet implemented.\n"
-"track off - not yet implemented.\n"
-"untrack all - not yet implemented.\n"
-"tracks - not yet implemented.\n"
-"tracking - not yet implemented.\n"
+#. TRANS: Header line of help text for commands.
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "Commands:"
+msgstr "Resultats de les comandes"
+
+#. TRANS: Help message for IM/SMS command "on"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "turn on notifications"
+msgstr "No es poden activar els avisos."
+
+#. TRANS: Help message for IM/SMS command "off"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "turn off notifications"
+msgstr "No es poden desactivar els avisos."
+
+#. TRANS: Help message for IM/SMS command "help"
+msgctxt "COMMANDHELP"
+msgid "show this help"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "follow <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "subscribe to user"
+msgstr "Subscriu-me a aquest usuari"
+
+#. TRANS: Help message for IM/SMS command "groups"
+msgctxt "COMMANDHELP"
+msgid "lists the groups you have joined"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscriptions"
+msgctxt "COMMANDHELP"
+msgid "list the people you follow"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscribers"
+msgctxt "COMMANDHELP"
+msgid "list the people that follow you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "leave <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "unsubscribe from user"
+msgstr "Cancel·la la subscripció d'aquest usuari"
+
+#. TRANS: Help message for IM/SMS command "d <nickname> <text>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "direct message to user"
+msgstr "Missatges directes a %s"
+
+#. TRANS: Help message for IM/SMS command "get <nickname>"
+msgctxt "COMMANDHELP"
+msgid "get last notice from user"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "whois <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "get profile info on user"
+msgstr "El perfil remot no és un grup!"
+
+#. TRANS: Help message for IM/SMS command "lose <nickname>"
+msgctxt "COMMANDHELP"
+msgid "force user to stop following you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav <nickname>"
+msgctxt "COMMANDHELP"
+msgid "add user's last notice as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "add notice with the given id as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "repeat a notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "repeat the last notice from user"
+msgstr "Repeteix l'avís"
+
+#. TRANS: Help message for IM/SMS command "reply #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "reply to notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "reply <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "reply to the last notice from user"
+msgstr "Respon a aquest avís"
+
+#. TRANS: Help message for IM/SMS command "join <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "join group"
+msgstr "Grup desconegut."
+
+#. TRANS: Help message for IM/SMS command "login"
+msgctxt "COMMANDHELP"
+msgid "Get a link to login to the web interface"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "drop <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "leave group"
+msgstr "Elimina el grup"
+
+#. TRANS: Help message for IM/SMS command "stats"
+msgctxt "COMMANDHELP"
+msgid "get your stats"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "stop"
+#. TRANS: Help message for IM/SMS command "quit"
+msgctxt "COMMANDHELP"
+msgid "same as 'off'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "sub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'follow'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "unsub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'leave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "last <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'get'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "on <nickname>"
+#. TRANS: Help message for IM/SMS command "off <nickname>"
+#. TRANS: Help message for IM/SMS command "invite <phone number>"
+#. TRANS: Help message for IM/SMS command "track <word>"
+#. TRANS: Help message for IM/SMS command "untrack <word>"
+#. TRANS: Help message for IM/SMS command "track off"
+#. TRANS: Help message for IM/SMS command "untrack all"
+#. TRANS: Help message for IM/SMS command "tracks"
+#. TRANS: Help message for IM/SMS command "tracking"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "not yet implemented."
+msgstr "Comanda encara no implementada."
+
+#. TRANS: Help message for IM/SMS command "nudge <nickname>"
+msgctxt "COMMANDHELP"
+msgid "remind a user to update."
 msgstr ""
-"Ordres:\n"
-"on - activeu els avisos\n"
-"off - desactiveu els avisos\n"
-"help - mostra aquesta ajuda\n"
-"follow <nickname> - se subscriu a l'usuari\n"
-"groups - llista els grups on us heu unit\n"
-"subscriptions - llista la gent que seguiu\n"
-"subscribers - llista la gent que us segueix\n"
-"leave <nickname> - cancel·la la subscripció de l'usuari\n"
-"d <nickname> <text> - missatge directe a l'usuari\n"
-"get <nickname> - s'obté el darrer avís de l'usuari\n"
-"whois <nickname> - s'obté la informació del perfil de l'usuari\n"
-"lose <nickname> - es força l'usuari a deixar de seguir-vos\n"
-"fav <nickname> - afegeix el darrer avís de l'usuari com a «preferit»\n"
-"fav #<notice_id> - afegeix l'avís amb l'id donat com a «preferit»\n"
-"repeat #<notice_id> - repeteix l'avís amb l'id donat\n"
-"repeat <nickname> - repeteix el darrer avís de l'usari\n"
-"reply #<notice_id> - respon l'avís amb l'id donat\n"
-"reply <nickname> - respon el darrer avís de l'usuari\n"
-"join <group> - s'uneix al grup\n"
-"login - s'obté un enllaç per iniciar una sessió des de la interfície web\n"
-"drop <group> - es deixa el grup\n"
-"stats - s'obté el vostre estat\n"
-"stop - el mateix que «off»\n"
-"quit - el mateix que «off»\n"
-"sub <nickname> - el mateix que «follow»\n"
-"unsub <nickname> - el mateix que «leave»\n"
-"last <nickname> - el mateix que «get»\n"
-"on <nickname> - no s'ha implementat encara.\n"
-"off <nickname> - no s'ha implementat encara.\n"
-"nudge <nickname> - es recorda a l'usuari que actualitzi.\n"
-"invite <phone number> - no s'ha implementat encara.\n"
-"track <word> - no s'ha implementat encara.\n"
-"untrack <word> - no s'ha implementat encara.\n"
-"track off - no s'ha implementat encara.\n"
-"untrack all - no s'ha implementat encara.\n"
-"tracks - no s'ha implementat encara.\n"
-"tracking - no s'ha implementat encara.\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 msgid "No configuration file found."
@@ -6999,6 +7116,9 @@ msgid ""
 msgstr ""
 "Ubicació del grup, si s'hi adiu cap, com ara «ciutat, comarca (o illa), país»."
 
+msgid "Aliases"
+msgstr "Àlies"
+
 #, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -7080,6 +7200,10 @@ msgctxt "TOOLTIP"
 msgid "Add or edit %s design"
 msgstr "Afegeix o edita el disseny de %s"
 
+#. TRANS: Group actions header (h2). Text hidden by default.
+msgid "Group actions"
+msgstr "Accions del grup"
+
 #. TRANS: Title for groups with the most members section.
 msgid "Groups with most members"
 msgstr "Grups amb més membres"
@@ -7647,6 +7771,7 @@ msgstr "Envia un avís"
 msgid "What's up, %s?"
 msgstr "Què tal, %s?"
 
+#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr "Adjunta"
 
@@ -8099,52 +8224,6 @@ msgstr "Cancel·la la subscripció"
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "L'usuari %1$s (%2$d) no té un registre de perfil."
 
-msgid "Edit Avatar"
-msgstr "Edita l'avatar"
-
-#. TRANS: H2 for user actions in a profile.
-#. TRANS: H2 for entity actions in a profile.
-msgid "User actions"
-msgstr "Accions de l'usuari"
-
-#. TRANS: Text shown in user profile of not yet compeltely deleted users.
-msgid "User deletion in progress..."
-msgstr "S'està eliminant l'usuari..."
-
-#. TRANS: Link title for link on user profile.
-msgid "Edit profile settings"
-msgstr "Edita la configuració del perfil"
-
-#. TRANS: Link text for link on user profile.
-msgid "Edit"
-msgstr "Edita"
-
-#. TRANS: Link title for link on user profile.
-msgid "Send a direct message to this user"
-msgstr "Envia un missatge directe a aquest usuari"
-
-#. TRANS: Link text for link on user profile.
-msgid "Message"
-msgstr "Missatge"
-
-#. TRANS: Label text on user profile to select a user role.
-msgid "Moderate"
-msgstr "Modera"
-
-#. TRANS: Label text on user profile to select a user role.
-msgid "User role"
-msgstr "Rol de l'usuari"
-
-#. TRANS: Role that can be set for a user profile.
-msgctxt "role"
-msgid "Administrator"
-msgstr "Administrador"
-
-#. TRANS: Role that can be set for a user profile.
-msgctxt "role"
-msgid "Moderator"
-msgstr "Moderador"
-
 msgid "Not allowed to log in."
 msgstr "No es permet iniciar una sessió."
 
@@ -8218,3 +8297,88 @@ msgstr "L'XML no és vàlid, hi manca l'arrel XRD."
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr "Es recupera la còpia de seguretat del fitxer '%s'."
+
+#~ msgid "Note"
+#~ msgstr "Avisos"
+
+#~ msgid ""
+#~ "Commands:\n"
+#~ "on - turn on notifications\n"
+#~ "off - turn off notifications\n"
+#~ "help - show this help\n"
+#~ "follow <nickname> - subscribe to user\n"
+#~ "groups - lists the groups you have joined\n"
+#~ "subscriptions - list the people you follow\n"
+#~ "subscribers - list the people that follow you\n"
+#~ "leave <nickname> - unsubscribe from user\n"
+#~ "d <nickname> <text> - direct message to user\n"
+#~ "get <nickname> - get last notice from user\n"
+#~ "whois <nickname> - get profile info on user\n"
+#~ "lose <nickname> - force user to stop following you\n"
+#~ "fav <nickname> - add user's last notice as a 'fave'\n"
+#~ "fav #<notice_id> - add notice with the given id as a 'fave'\n"
+#~ "repeat #<notice_id> - repeat a notice with a given id\n"
+#~ "repeat <nickname> - repeat the last notice from user\n"
+#~ "reply #<notice_id> - reply to notice with a given id\n"
+#~ "reply <nickname> - reply to the last notice from user\n"
+#~ "join <group> - join group\n"
+#~ "login - Get a link to login to the web interface\n"
+#~ "drop <group> - leave group\n"
+#~ "stats - get your stats\n"
+#~ "stop - same as 'off'\n"
+#~ "quit - same as 'off'\n"
+#~ "sub <nickname> - same as 'follow'\n"
+#~ "unsub <nickname> - same as 'leave'\n"
+#~ "last <nickname> - same as 'get'\n"
+#~ "on <nickname> - not yet implemented.\n"
+#~ "off <nickname> - not yet implemented.\n"
+#~ "nudge <nickname> - remind a user to update.\n"
+#~ "invite <phone number> - not yet implemented.\n"
+#~ "track <word> - not yet implemented.\n"
+#~ "untrack <word> - not yet implemented.\n"
+#~ "track off - not yet implemented.\n"
+#~ "untrack all - not yet implemented.\n"
+#~ "tracks - not yet implemented.\n"
+#~ "tracking - not yet implemented.\n"
+#~ msgstr ""
+#~ "Ordres:\n"
+#~ "on - activeu els avisos\n"
+#~ "off - desactiveu els avisos\n"
+#~ "help - mostra aquesta ajuda\n"
+#~ "follow <nickname> - se subscriu a l'usuari\n"
+#~ "groups - llista els grups on us heu unit\n"
+#~ "subscriptions - llista la gent que seguiu\n"
+#~ "subscribers - llista la gent que us segueix\n"
+#~ "leave <nickname> - cancel·la la subscripció de l'usuari\n"
+#~ "d <nickname> <text> - missatge directe a l'usuari\n"
+#~ "get <nickname> - s'obté el darrer avís de l'usuari\n"
+#~ "whois <nickname> - s'obté la informació del perfil de l'usuari\n"
+#~ "lose <nickname> - es força l'usuari a deixar de seguir-vos\n"
+#~ "fav <nickname> - afegeix el darrer avís de l'usuari com a «preferit»\n"
+#~ "fav #<notice_id> - afegeix l'avís amb l'id donat com a «preferit»\n"
+#~ "repeat #<notice_id> - repeteix l'avís amb l'id donat\n"
+#~ "repeat <nickname> - repeteix el darrer avís de l'usari\n"
+#~ "reply #<notice_id> - respon l'avís amb l'id donat\n"
+#~ "reply <nickname> - respon el darrer avís de l'usuari\n"
+#~ "join <group> - s'uneix al grup\n"
+#~ "login - s'obté un enllaç per iniciar una sessió des de la interfície web\n"
+#~ "drop <group> - es deixa el grup\n"
+#~ "stats - s'obté el vostre estat\n"
+#~ "stop - el mateix que «off»\n"
+#~ "quit - el mateix que «off»\n"
+#~ "sub <nickname> - el mateix que «follow»\n"
+#~ "unsub <nickname> - el mateix que «leave»\n"
+#~ "last <nickname> - el mateix que «get»\n"
+#~ "on <nickname> - no s'ha implementat encara.\n"
+#~ "off <nickname> - no s'ha implementat encara.\n"
+#~ "nudge <nickname> - es recorda a l'usuari que actualitzi.\n"
+#~ "invite <phone number> - no s'ha implementat encara.\n"
+#~ "track <word> - no s'ha implementat encara.\n"
+#~ "untrack <word> - no s'ha implementat encara.\n"
+#~ "track off - no s'ha implementat encara.\n"
+#~ "untrack all - no s'ha implementat encara.\n"
+#~ "tracks - no s'ha implementat encara.\n"
+#~ "tracking - no s'ha implementat encara.\n"
+
+#~ msgid "Edit Avatar"
+#~ msgstr "Edita l'avatar"
diff --git a/locale/cs/LC_MESSAGES/statusnet.po b/locale/cs/LC_MESSAGES/statusnet.po
index ec922736f3..6dc8c4efc7 100644
--- a/locale/cs/LC_MESSAGES/statusnet.po
+++ b/locale/cs/LC_MESSAGES/statusnet.po
@@ -11,18 +11,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-11 18:15+0000\n"
-"PO-Revision-Date: 2011-03-11 18:16:59+0000\n"
+"POT-Creation-Date: 2011-03-17 09:47+0000\n"
+"PO-Revision-Date: 2011-03-17 09:49:27+0000\n"
 "Language-Team: Czech <http://translatewiki.net/wiki/Portal:cs>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83703); Translate extension (2011-03-11)\n"
+"X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: cs\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=3; plural=(n == 1) ? 0 : ( (n >= 2 && n <= 4) ? 1 : "
 "2 );\n"
-"X-POT-Import-Date: 2011-03-08 01:25:01+0000\n"
+"X-POT-Import-Date: 2011-03-11 18:52:41+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -600,7 +600,7 @@ msgstr "Nelze odebrat uživatele %1$S ze skupiny %2$s."
 msgid "%s's groups"
 msgstr "skupiny uživatele %s"
 
-#. TRANS: Used as subtitle in check for group membership. %1$s is a user name, %2$s is the site name.
+#. TRANS: Used as subtitle in check for group membership. %1$s is the site name, %2$s is a user name.
 #, php-format
 msgid "%1$s groups %2$s is a member of."
 msgstr "skupiny na %1$s, kterych je %2$s členem."
@@ -4725,18 +4725,6 @@ msgstr "skupina %s"
 msgid "%1$s group, page %2$d"
 msgstr "skupina %1$s, str. %2$d"
 
-#. TRANS: Label for group description or group note (dt). Text hidden by default.
-msgid "Note"
-msgstr "Poznámka"
-
-#. TRANS: Label for group aliases (dt). Text hidden by default.
-msgid "Aliases"
-msgstr "Aliasy"
-
-#. TRANS: Group actions header (h2). Text hidden by default.
-msgid "Group actions"
-msgstr "Akce skupiny"
-
 #. TRANS: Tooltip for feed link. %s is a group nickname.
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
@@ -4848,6 +4836,10 @@ msgstr "Zpráva od %1$s na %2$s"
 msgid "Notice deleted."
 msgstr "Oznámení smazáno."
 
+#, fuzzy
+msgid "Notice"
+msgstr "Sdělení"
+
 #. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
 #, fuzzy, php-format
 msgid "%1$s tagged %2$s"
@@ -5379,7 +5371,6 @@ msgstr "Žádný argument ID."
 msgid "Tag %s"
 msgstr "Otagujte %s"
 
-#. TRANS: H2 for user profile information.
 msgid "User profile"
 msgstr "Uživatelský profil"
 
@@ -6100,6 +6091,49 @@ msgstr ""
 msgid "No AtomPub API service for %s."
 msgstr ""
 
+#. TRANS: H2 for user actions in a profile.
+#. TRANS: H2 for entity actions in a profile.
+msgid "User actions"
+msgstr "Akce uživatele"
+
+#. TRANS: Text shown in user profile of not yet compeltely deleted users.
+msgid "User deletion in progress..."
+msgstr "Probíhá mazání uživatele..."
+
+#. TRANS: Link title for link on user profile.
+msgid "Edit profile settings"
+msgstr "Upravit nastavení profilu"
+
+#. TRANS: Link text for link on user profile.
+msgid "Edit"
+msgstr "Editovat"
+
+#. TRANS: Link title for link on user profile.
+msgid "Send a direct message to this user"
+msgstr "Odeslat přímou zprávu tomuto uživateli"
+
+#. TRANS: Link text for link on user profile.
+msgid "Message"
+msgstr "Zpráva"
+
+#. TRANS: Label text on user profile to select a user role.
+msgid "Moderate"
+msgstr "Moderovat"
+
+#. TRANS: Label text on user profile to select a user role.
+msgid "User role"
+msgstr "Role uživatele"
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Administrator"
+msgstr "Administrátor"
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Moderator"
+msgstr "Moderátor"
+
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
 #, php-format
 msgid "%1$s - %2$s"
@@ -6827,85 +6861,171 @@ msgstr[0] "Jste členem této skupiny:"
 msgstr[1] "Jste členem těchto skupin:"
 msgstr[2] ""
 
-#. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-msgid ""
-"Commands:\n"
-"on - turn on notifications\n"
-"off - turn off notifications\n"
-"help - show this help\n"
-"follow <nickname> - subscribe to user\n"
-"groups - lists the groups you have joined\n"
-"subscriptions - list the people you follow\n"
-"subscribers - list the people that follow you\n"
-"leave <nickname> - unsubscribe from user\n"
-"d <nickname> <text> - direct message to user\n"
-"get <nickname> - get last notice from user\n"
-"whois <nickname> - get profile info on user\n"
-"lose <nickname> - force user to stop following you\n"
-"fav <nickname> - add user's last notice as a 'fave'\n"
-"fav #<notice_id> - add notice with the given id as a 'fave'\n"
-"repeat #<notice_id> - repeat a notice with a given id\n"
-"repeat <nickname> - repeat the last notice from user\n"
-"reply #<notice_id> - reply to notice with a given id\n"
-"reply <nickname> - reply to the last notice from user\n"
-"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
-"drop <group> - leave group\n"
-"stats - get your stats\n"
-"stop - same as 'off'\n"
-"quit - same as 'off'\n"
-"sub <nickname> - same as 'follow'\n"
-"unsub <nickname> - same as 'leave'\n"
-"last <nickname> - same as 'get'\n"
-"on <nickname> - not yet implemented.\n"
-"off <nickname> - not yet implemented.\n"
-"nudge <nickname> - remind a user to update.\n"
-"invite <phone number> - not yet implemented.\n"
-"track <word> - not yet implemented.\n"
-"untrack <word> - not yet implemented.\n"
-"track off - not yet implemented.\n"
-"untrack all - not yet implemented.\n"
-"tracks - not yet implemented.\n"
-"tracking - not yet implemented.\n"
+#. TRANS: Header line of help text for commands.
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "Commands:"
+msgstr "Výsledky příkazu"
+
+#. TRANS: Help message for IM/SMS command "on"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "turn on notifications"
+msgstr "Nelze zapnout oznámení."
+
+#. TRANS: Help message for IM/SMS command "off"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "turn off notifications"
+msgstr "Nelze vypnout oznámení."
+
+#. TRANS: Help message for IM/SMS command "help"
+msgctxt "COMMANDHELP"
+msgid "show this help"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "follow <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "subscribe to user"
+msgstr "Přihlásit se k tomuto uživateli"
+
+#. TRANS: Help message for IM/SMS command "groups"
+msgctxt "COMMANDHELP"
+msgid "lists the groups you have joined"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscriptions"
+msgctxt "COMMANDHELP"
+msgid "list the people you follow"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscribers"
+msgctxt "COMMANDHELP"
+msgid "list the people that follow you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "leave <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "unsubscribe from user"
+msgstr "Odhlásit se od tohoto uživatele"
+
+#. TRANS: Help message for IM/SMS command "d <nickname> <text>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "direct message to user"
+msgstr "Přímé zprávy uživateli %s"
+
+#. TRANS: Help message for IM/SMS command "get <nickname>"
+msgctxt "COMMANDHELP"
+msgid "get last notice from user"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "whois <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "get profile info on user"
+msgstr "Nastavené Profilu"
+
+#. TRANS: Help message for IM/SMS command "lose <nickname>"
+msgctxt "COMMANDHELP"
+msgid "force user to stop following you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav <nickname>"
+msgctxt "COMMANDHELP"
+msgid "add user's last notice as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "add notice with the given id as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "repeat a notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "repeat the last notice from user"
+msgstr "Opakovat toto oznámení"
+
+#. TRANS: Help message for IM/SMS command "reply #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "reply to notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "reply <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "reply to the last notice from user"
+msgstr "Odpovědět na toto oznámení"
+
+#. TRANS: Help message for IM/SMS command "join <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "join group"
+msgstr "Neznámé"
+
+#. TRANS: Help message for IM/SMS command "login"
+msgctxt "COMMANDHELP"
+msgid "Get a link to login to the web interface"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "drop <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "leave group"
+msgstr "Smazat uživatele"
+
+#. TRANS: Help message for IM/SMS command "stats"
+msgctxt "COMMANDHELP"
+msgid "get your stats"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "stop"
+#. TRANS: Help message for IM/SMS command "quit"
+msgctxt "COMMANDHELP"
+msgid "same as 'off'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "sub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'follow'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "unsub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'leave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "last <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'get'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "on <nickname>"
+#. TRANS: Help message for IM/SMS command "off <nickname>"
+#. TRANS: Help message for IM/SMS command "invite <phone number>"
+#. TRANS: Help message for IM/SMS command "track <word>"
+#. TRANS: Help message for IM/SMS command "untrack <word>"
+#. TRANS: Help message for IM/SMS command "track off"
+#. TRANS: Help message for IM/SMS command "untrack all"
+#. TRANS: Help message for IM/SMS command "tracks"
+#. TRANS: Help message for IM/SMS command "tracking"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "not yet implemented."
+msgstr "Příkaz ještě nebyl implementován."
+
+#. TRANS: Help message for IM/SMS command "nudge <nickname>"
+msgctxt "COMMANDHELP"
+msgid "remind a user to update."
 msgstr ""
-"Příkazy:\n"
-"on - zapnout oznámení\n"
-"off - vypnout oznámení\n"
-"help - zobrazí tuto nápovědu\n"
-"follow <nickname> - Přihlásit se k uživatel\n"
-"groups - seznam skupin, ke kterým jste připojen\n"
-"subscriptions - seznam lidí, které sledujete\n"
-"subscribers - seznam osob, které vás sledují\n"
-"leave <přezdívka> - Odhlásit se od uživatele\n"
-"d <přezdívka> <text> - Přímá zpráva uživateli\n"
-"get <přezdívka> - Dostanete poslední upozornění od uživatele\n"
-"whois <přezdívka> - Získat informace o profilu uživatele\n"
-"lose <přezdívka> - Donutit uživatele přestat vás sledovat\n"
-"fav <přezdívka> - Přidejte uživatelovo poslední oznámení jako 'Oblíbené'\n"
-"fav #<notice_id> - Přidat upozornění s daným id jako 'Oblíbené'\n"
-"repeat #<notice_id> - Opakovat oznámení s daným id\n"
-"repeat <přezdívka> - Opakovat poslední oznámení od uživatele\n"
-"reply #<notice_id> - Odpověď na oznámení s daným id\n"
-"reply <přezdívka> - Odpověď na poslední oznámení od uživatele\n"
-"join <skupina> - Připojit se ke skupině\n"
-"login - Získat odkaz pro přihlášení k webovému rozhraní\n"
-"drop <skupina> - Opustit skupinu\n"
-"stats - získejte Vaše statistiky\n"
-"stop - stejné jako 'off'\n"
-"quit - stejné jako 'off'\n"
-"sub <přezdívka> - Stejné jako 'follow'\n"
-"unsub <přezdívka> - Stejné jako 'leave'\n"
-"last <přezdívka> - Stejné jako 'get'\n"
-"on <přezdívka> - Dosud neimplementován.\n"
-"off <přezdívka> - Dosud neimplementován.\n"
-"nudge <přezdívka> - Připomenout uživateli aby něco poslal.\n"
-"invite <telefonní číslo> - Dosud neimplementován.\n"
-"track <word> - Dosud neimplementován.\n"
-"untrack <word> -Dosud neimplementován.\n"
-"track off - Dosud neimplementován.\n"
-"untrack all - Dosud neimplementován.\n"
-"tracks -  Dosud neimplementován.\n"
-"tracking - Dosud neimplementován.\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #, fuzzy
@@ -7091,6 +7211,9 @@ msgstr ""
 "Umístění skupiny, pokud je nějaké, ve stylu \"město, stát (nebo region), země"
 "\""
 
+msgid "Aliases"
+msgstr "Aliasy"
+
 #, fuzzy, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -7169,6 +7292,10 @@ msgctxt "TOOLTIP"
 msgid "Add or edit %s design"
 msgstr ""
 
+#. TRANS: Group actions header (h2). Text hidden by default.
+msgid "Group actions"
+msgstr "Akce skupiny"
+
 #. TRANS: Title for groups with the most members section.
 msgid "Groups with most members"
 msgstr "Skupiny s nejvíce členy"
@@ -7739,6 +7866,7 @@ msgstr "Poslat oznámení"
 msgid "What's up, %s?"
 msgstr "Co se děje, %s?"
 
+#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr "Připojit"
 
@@ -8202,52 +8330,6 @@ msgstr "Odhlásit"
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "Uživatel nemá profil."
 
-msgid "Edit Avatar"
-msgstr "Upravit avatar"
-
-#. TRANS: H2 for user actions in a profile.
-#. TRANS: H2 for entity actions in a profile.
-msgid "User actions"
-msgstr "Akce uživatele"
-
-#. TRANS: Text shown in user profile of not yet compeltely deleted users.
-msgid "User deletion in progress..."
-msgstr "Probíhá mazání uživatele..."
-
-#. TRANS: Link title for link on user profile.
-msgid "Edit profile settings"
-msgstr "Upravit nastavení profilu"
-
-#. TRANS: Link text for link on user profile.
-msgid "Edit"
-msgstr "Editovat"
-
-#. TRANS: Link title for link on user profile.
-msgid "Send a direct message to this user"
-msgstr "Odeslat přímou zprávu tomuto uživateli"
-
-#. TRANS: Link text for link on user profile.
-msgid "Message"
-msgstr "Zpráva"
-
-#. TRANS: Label text on user profile to select a user role.
-msgid "Moderate"
-msgstr "Moderovat"
-
-#. TRANS: Label text on user profile to select a user role.
-msgid "User role"
-msgstr "Role uživatele"
-
-#. TRANS: Role that can be set for a user profile.
-msgctxt "role"
-msgid "Administrator"
-msgstr "Administrátor"
-
-#. TRANS: Role that can be set for a user profile.
-msgctxt "role"
-msgid "Moderator"
-msgstr "Moderátor"
-
 #, fuzzy
 msgid "Not allowed to log in."
 msgstr "Nejste přihlášen(a)."
@@ -8327,3 +8409,88 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#~ msgid "Note"
+#~ msgstr "Poznámka"
+
+#~ msgid ""
+#~ "Commands:\n"
+#~ "on - turn on notifications\n"
+#~ "off - turn off notifications\n"
+#~ "help - show this help\n"
+#~ "follow <nickname> - subscribe to user\n"
+#~ "groups - lists the groups you have joined\n"
+#~ "subscriptions - list the people you follow\n"
+#~ "subscribers - list the people that follow you\n"
+#~ "leave <nickname> - unsubscribe from user\n"
+#~ "d <nickname> <text> - direct message to user\n"
+#~ "get <nickname> - get last notice from user\n"
+#~ "whois <nickname> - get profile info on user\n"
+#~ "lose <nickname> - force user to stop following you\n"
+#~ "fav <nickname> - add user's last notice as a 'fave'\n"
+#~ "fav #<notice_id> - add notice with the given id as a 'fave'\n"
+#~ "repeat #<notice_id> - repeat a notice with a given id\n"
+#~ "repeat <nickname> - repeat the last notice from user\n"
+#~ "reply #<notice_id> - reply to notice with a given id\n"
+#~ "reply <nickname> - reply to the last notice from user\n"
+#~ "join <group> - join group\n"
+#~ "login - Get a link to login to the web interface\n"
+#~ "drop <group> - leave group\n"
+#~ "stats - get your stats\n"
+#~ "stop - same as 'off'\n"
+#~ "quit - same as 'off'\n"
+#~ "sub <nickname> - same as 'follow'\n"
+#~ "unsub <nickname> - same as 'leave'\n"
+#~ "last <nickname> - same as 'get'\n"
+#~ "on <nickname> - not yet implemented.\n"
+#~ "off <nickname> - not yet implemented.\n"
+#~ "nudge <nickname> - remind a user to update.\n"
+#~ "invite <phone number> - not yet implemented.\n"
+#~ "track <word> - not yet implemented.\n"
+#~ "untrack <word> - not yet implemented.\n"
+#~ "track off - not yet implemented.\n"
+#~ "untrack all - not yet implemented.\n"
+#~ "tracks - not yet implemented.\n"
+#~ "tracking - not yet implemented.\n"
+#~ msgstr ""
+#~ "Příkazy:\n"
+#~ "on - zapnout oznámení\n"
+#~ "off - vypnout oznámení\n"
+#~ "help - zobrazí tuto nápovědu\n"
+#~ "follow <nickname> - Přihlásit se k uživatel\n"
+#~ "groups - seznam skupin, ke kterým jste připojen\n"
+#~ "subscriptions - seznam lidí, které sledujete\n"
+#~ "subscribers - seznam osob, které vás sledují\n"
+#~ "leave <přezdívka> - Odhlásit se od uživatele\n"
+#~ "d <přezdívka> <text> - Přímá zpráva uživateli\n"
+#~ "get <přezdívka> - Dostanete poslední upozornění od uživatele\n"
+#~ "whois <přezdívka> - Získat informace o profilu uživatele\n"
+#~ "lose <přezdívka> - Donutit uživatele přestat vás sledovat\n"
+#~ "fav <přezdívka> - Přidejte uživatelovo poslední oznámení jako 'Oblíbené'\n"
+#~ "fav #<notice_id> - Přidat upozornění s daným id jako 'Oblíbené'\n"
+#~ "repeat #<notice_id> - Opakovat oznámení s daným id\n"
+#~ "repeat <přezdívka> - Opakovat poslední oznámení od uživatele\n"
+#~ "reply #<notice_id> - Odpověď na oznámení s daným id\n"
+#~ "reply <přezdívka> - Odpověď na poslední oznámení od uživatele\n"
+#~ "join <skupina> - Připojit se ke skupině\n"
+#~ "login - Získat odkaz pro přihlášení k webovému rozhraní\n"
+#~ "drop <skupina> - Opustit skupinu\n"
+#~ "stats - získejte Vaše statistiky\n"
+#~ "stop - stejné jako 'off'\n"
+#~ "quit - stejné jako 'off'\n"
+#~ "sub <přezdívka> - Stejné jako 'follow'\n"
+#~ "unsub <přezdívka> - Stejné jako 'leave'\n"
+#~ "last <přezdívka> - Stejné jako 'get'\n"
+#~ "on <přezdívka> - Dosud neimplementován.\n"
+#~ "off <přezdívka> - Dosud neimplementován.\n"
+#~ "nudge <přezdívka> - Připomenout uživateli aby něco poslal.\n"
+#~ "invite <telefonní číslo> - Dosud neimplementován.\n"
+#~ "track <word> - Dosud neimplementován.\n"
+#~ "untrack <word> -Dosud neimplementován.\n"
+#~ "track off - Dosud neimplementován.\n"
+#~ "untrack all - Dosud neimplementován.\n"
+#~ "tracks -  Dosud neimplementován.\n"
+#~ "tracking - Dosud neimplementován.\n"
+
+#~ msgid "Edit Avatar"
+#~ msgstr "Upravit avatar"
diff --git a/locale/de/LC_MESSAGES/statusnet.po b/locale/de/LC_MESSAGES/statusnet.po
index 3fc5e059c2..0ef7232dc1 100644
--- a/locale/de/LC_MESSAGES/statusnet.po
+++ b/locale/de/LC_MESSAGES/statusnet.po
@@ -22,17 +22,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-11 18:15+0000\n"
-"PO-Revision-Date: 2011-03-11 18:17:00+0000\n"
+"POT-Creation-Date: 2011-03-17 09:47+0000\n"
+"PO-Revision-Date: 2011-03-17 09:49:28+0000\n"
 "Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83703); Translate extension (2011-03-11)\n"
+"X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-03-08 01:25:01+0000\n"
+"X-POT-Import-Date: 2011-03-11 18:52:41+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -608,7 +608,7 @@ msgstr "Konnte Benutzer %1$s nicht aus der Gruppe %2$s entfernen."
 msgid "%s's groups"
 msgstr "Gruppen von %s"
 
-#. TRANS: Used as subtitle in check for group membership. %1$s is a user name, %2$s is the site name.
+#. TRANS: Used as subtitle in check for group membership. %1$s is the site name, %2$s is a user name.
 #, php-format
 msgid "%1$s groups %2$s is a member of."
 msgstr "%1$s Gruppen in denen %2$s Mitglied ist"
@@ -4730,18 +4730,6 @@ msgstr "%s-Gruppe"
 msgid "%1$s group, page %2$d"
 msgstr "%1$s Gruppe, Seite %d"
 
-#. TRANS: Label for group description or group note (dt). Text hidden by default.
-msgid "Note"
-msgstr "Nachricht"
-
-#. TRANS: Label for group aliases (dt). Text hidden by default.
-msgid "Aliases"
-msgstr "Pseudonyme"
-
-#. TRANS: Group actions header (h2). Text hidden by default.
-msgid "Group actions"
-msgstr "Gruppenaktionen"
-
 #. TRANS: Tooltip for feed link. %s is a group nickname.
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
@@ -4851,6 +4839,10 @@ msgstr "Nachricht von %1$s auf %2$s"
 msgid "Notice deleted."
 msgstr "Nachricht gelöscht."
 
+#, fuzzy
+msgid "Notice"
+msgstr "Nachrichten"
+
 #. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
 #, php-format
 msgid "%1$s tagged %2$s"
@@ -5387,7 +5379,6 @@ msgstr "Kein ID-Argument."
 msgid "Tag %s"
 msgstr "Tag „%s“"
 
-#. TRANS: H2 for user profile information.
 msgid "User profile"
 msgstr "Benutzerprofil"
 
@@ -6114,6 +6105,49 @@ msgstr "XRD für %s kann nicht gefunden werden."
 msgid "No AtomPub API service for %s."
 msgstr "AtomPub API für %s kann nicht gefunden werden."
 
+#. TRANS: H2 for user actions in a profile.
+#. TRANS: H2 for entity actions in a profile.
+msgid "User actions"
+msgstr "Benutzeraktionen"
+
+#. TRANS: Text shown in user profile of not yet compeltely deleted users.
+msgid "User deletion in progress..."
+msgstr "Löschung des Benutzers in Arbeit …"
+
+#. TRANS: Link title for link on user profile.
+msgid "Edit profile settings"
+msgstr "Profil-Einstellungen ändern"
+
+#. TRANS: Link text for link on user profile.
+msgid "Edit"
+msgstr "Bearbeiten"
+
+#. TRANS: Link title for link on user profile.
+msgid "Send a direct message to this user"
+msgstr "Direkte Nachricht an Benutzer versenden"
+
+#. TRANS: Link text for link on user profile.
+msgid "Message"
+msgstr "Nachricht"
+
+#. TRANS: Label text on user profile to select a user role.
+msgid "Moderate"
+msgstr "Moderieren"
+
+#. TRANS: Label text on user profile to select a user role.
+msgid "User role"
+msgstr "Benutzerrolle"
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Administrator"
+msgstr "Administrator"
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Moderator"
+msgstr "Moderator"
+
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
 #, php-format
 msgid "%1$s - %2$s"
@@ -6838,85 +6872,171 @@ msgid_plural "You are a member of these groups:"
 msgstr[0] "Du bist Mitglied dieser Gruppe:"
 msgstr[1] "Du bist Mitglied dieser Gruppen:"
 
-#. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-msgid ""
-"Commands:\n"
-"on - turn on notifications\n"
-"off - turn off notifications\n"
-"help - show this help\n"
-"follow <nickname> - subscribe to user\n"
-"groups - lists the groups you have joined\n"
-"subscriptions - list the people you follow\n"
-"subscribers - list the people that follow you\n"
-"leave <nickname> - unsubscribe from user\n"
-"d <nickname> <text> - direct message to user\n"
-"get <nickname> - get last notice from user\n"
-"whois <nickname> - get profile info on user\n"
-"lose <nickname> - force user to stop following you\n"
-"fav <nickname> - add user's last notice as a 'fave'\n"
-"fav #<notice_id> - add notice with the given id as a 'fave'\n"
-"repeat #<notice_id> - repeat a notice with a given id\n"
-"repeat <nickname> - repeat the last notice from user\n"
-"reply #<notice_id> - reply to notice with a given id\n"
-"reply <nickname> - reply to the last notice from user\n"
-"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
-"drop <group> - leave group\n"
-"stats - get your stats\n"
-"stop - same as 'off'\n"
-"quit - same as 'off'\n"
-"sub <nickname> - same as 'follow'\n"
-"unsub <nickname> - same as 'leave'\n"
-"last <nickname> - same as 'get'\n"
-"on <nickname> - not yet implemented.\n"
-"off <nickname> - not yet implemented.\n"
-"nudge <nickname> - remind a user to update.\n"
-"invite <phone number> - not yet implemented.\n"
-"track <word> - not yet implemented.\n"
-"untrack <word> - not yet implemented.\n"
-"track off - not yet implemented.\n"
-"untrack all - not yet implemented.\n"
-"tracks - not yet implemented.\n"
-"tracking - not yet implemented.\n"
+#. TRANS: Header line of help text for commands.
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "Commands:"
+msgstr "Befehl-Ergebnisse"
+
+#. TRANS: Help message for IM/SMS command "on"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "turn on notifications"
+msgstr "Konnte Benachrichtigung nicht aktivieren."
+
+#. TRANS: Help message for IM/SMS command "off"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "turn off notifications"
+msgstr "Konnte Benachrichtigung nicht deaktivieren."
+
+#. TRANS: Help message for IM/SMS command "help"
+msgctxt "COMMANDHELP"
+msgid "show this help"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "follow <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "subscribe to user"
+msgstr "Abonniere diesen Benutzer"
+
+#. TRANS: Help message for IM/SMS command "groups"
+msgctxt "COMMANDHELP"
+msgid "lists the groups you have joined"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscriptions"
+msgctxt "COMMANDHELP"
+msgid "list the people you follow"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscribers"
+msgctxt "COMMANDHELP"
+msgid "list the people that follow you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "leave <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "unsubscribe from user"
+msgstr "Abonnement von diesem Benutzer abbestellen"
+
+#. TRANS: Help message for IM/SMS command "d <nickname> <text>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "direct message to user"
+msgstr "Direkte Nachrichten an %s"
+
+#. TRANS: Help message for IM/SMS command "get <nickname>"
+msgctxt "COMMANDHELP"
+msgid "get last notice from user"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "whois <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "get profile info on user"
+msgstr "Entferntes Profil ist keine Gruppe!"
+
+#. TRANS: Help message for IM/SMS command "lose <nickname>"
+msgctxt "COMMANDHELP"
+msgid "force user to stop following you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav <nickname>"
+msgctxt "COMMANDHELP"
+msgid "add user's last notice as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "add notice with the given id as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "repeat a notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "repeat the last notice from user"
+msgstr "Diese Nachricht wiederholen"
+
+#. TRANS: Help message for IM/SMS command "reply #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "reply to notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "reply <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "reply to the last notice from user"
+msgstr "Auf diese Nachricht antworten"
+
+#. TRANS: Help message for IM/SMS command "join <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "join group"
+msgstr "Unbekannte Gruppe."
+
+#. TRANS: Help message for IM/SMS command "login"
+msgctxt "COMMANDHELP"
+msgid "Get a link to login to the web interface"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "drop <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "leave group"
+msgstr "Gruppe löschen"
+
+#. TRANS: Help message for IM/SMS command "stats"
+msgctxt "COMMANDHELP"
+msgid "get your stats"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "stop"
+#. TRANS: Help message for IM/SMS command "quit"
+msgctxt "COMMANDHELP"
+msgid "same as 'off'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "sub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'follow'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "unsub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'leave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "last <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'get'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "on <nickname>"
+#. TRANS: Help message for IM/SMS command "off <nickname>"
+#. TRANS: Help message for IM/SMS command "invite <phone number>"
+#. TRANS: Help message for IM/SMS command "track <word>"
+#. TRANS: Help message for IM/SMS command "untrack <word>"
+#. TRANS: Help message for IM/SMS command "track off"
+#. TRANS: Help message for IM/SMS command "untrack all"
+#. TRANS: Help message for IM/SMS command "tracks"
+#. TRANS: Help message for IM/SMS command "tracking"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "not yet implemented."
+msgstr "Befehl noch nicht implementiert."
+
+#. TRANS: Help message for IM/SMS command "nudge <nickname>"
+msgctxt "COMMANDHELP"
+msgid "remind a user to update."
 msgstr ""
-"Befehle:\n"
-"on - Benachrichtigung einschalten\n"
-"off - Benachrichtigung ausschalten\n"
-"help - diese Hilfe anzeigen\n"
-"follow <nickname> - einem Benutzer folgen\n"
-"groups - Gruppen auflisten in denen du Mitglied bist\n"
-"subscriptions - Leute auflisten denen du folgst\n"
-"subscribers - Leute auflisten die dir folgen\n"
-"leave <nickname> - einem Benutzer nicht mehr folgen\n"
-"d <nickname> <text> - Direkte Nachricht an einen Benutzer schicken\n"
-"get <nickname> - letzte Nachricht eines Benutzers abrufen\n"
-"whois <nickname> - Profil eines Benutzers abrufen\n"
-"lose <nickname> - Benutzer zwingen dir nicht mehr zu folgen\n"
-"fav <nickname> - letzte Nachricht eines Benutzers als Favorit markieren\n"
-"fav #<notice_id> - Nachricht mit bestimmter ID als Favorit markieren\n"
-"repeat #<notice_id> - Nachricht mit bestimmter ID wiederholen\n"
-"repeat <nickname> - letzte Nachricht eines Benutzers wiederholen\n"
-"reply #<notice_id> - Nachricht mit bestimmter ID beantworten\n"
-"reply <nickname> - letzte Nachricht eines Benutzers beantworten\n"
-"join <group> - Gruppe beitreten\n"
-"login - Link zum Anmelden auf der Webseite anfordern\n"
-"drop <group> - Gruppe verlassen\n"
-"stats - deine Statistik abrufen\n"
-"stop - Äquivalent zu „off“\n"
-"quit - Äquivalent zu „off“\n"
-"sub <nickname> - Äquivalent zu „follow“\n"
-"unsub <nickname> - Äquivalent zu „leave“\n"
-"last <nickname> - Äquivalent zu „get“\n"
-"on <nickname> - noch nicht implementiert\n"
-"off <nickname> - noch nicht implementiert\n"
-"nudge <nickname> - einen Benutzer ans Aktualisieren erinnern\n"
-"invite <phone number> - noch nicht implementiert\n"
-"track <word> - noch nicht implementiert\n"
-"untrack <word> - noch nicht implementiert\n"
-"track off - noch nicht implementiert\n"
-"untrack all - noch nicht implementiert\n"
-"tracks - noch nicht implementiert\n"
-"tracking - noch nicht implementiert\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 msgid "No configuration file found."
@@ -7093,6 +7213,9 @@ msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\"."
 msgstr "Ort der Gruppe, optional, beispielsweise „Stadt, Region, Land“."
 
+msgid "Aliases"
+msgstr "Pseudonyme"
+
 #, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -7174,6 +7297,10 @@ msgctxt "TOOLTIP"
 msgid "Add or edit %s design"
 msgstr "%s-Design hinzufügen oder bearbeiten"
 
+#. TRANS: Group actions header (h2). Text hidden by default.
+msgid "Group actions"
+msgstr "Gruppenaktionen"
+
 #. TRANS: Title for groups with the most members section.
 msgid "Groups with most members"
 msgstr "Gruppen mit den meisten Mitgliedern"
@@ -7743,6 +7870,7 @@ msgstr "Nachricht senden"
 msgid "What's up, %s?"
 msgstr "Was geht, %s?"
 
+#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr "Anhängen"
 
@@ -8202,52 +8330,6 @@ msgstr "Abbestellen"
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "Benutzer „%1$s“ (%2$d) hat kein Profil."
 
-msgid "Edit Avatar"
-msgstr "Avatar bearbeiten"
-
-#. TRANS: H2 for user actions in a profile.
-#. TRANS: H2 for entity actions in a profile.
-msgid "User actions"
-msgstr "Benutzeraktionen"
-
-#. TRANS: Text shown in user profile of not yet compeltely deleted users.
-msgid "User deletion in progress..."
-msgstr "Löschung des Benutzers in Arbeit …"
-
-#. TRANS: Link title for link on user profile.
-msgid "Edit profile settings"
-msgstr "Profil-Einstellungen ändern"
-
-#. TRANS: Link text for link on user profile.
-msgid "Edit"
-msgstr "Bearbeiten"
-
-#. TRANS: Link title for link on user profile.
-msgid "Send a direct message to this user"
-msgstr "Direkte Nachricht an Benutzer versenden"
-
-#. TRANS: Link text for link on user profile.
-msgid "Message"
-msgstr "Nachricht"
-
-#. TRANS: Label text on user profile to select a user role.
-msgid "Moderate"
-msgstr "Moderieren"
-
-#. TRANS: Label text on user profile to select a user role.
-msgid "User role"
-msgstr "Benutzerrolle"
-
-#. TRANS: Role that can be set for a user profile.
-msgctxt "role"
-msgid "Administrator"
-msgstr "Administrator"
-
-#. TRANS: Role that can be set for a user profile.
-msgctxt "role"
-msgid "Moderator"
-msgstr "Moderator"
-
 #, fuzzy
 msgid "Not allowed to log in."
 msgstr "Nicht angemeldet."
@@ -8322,3 +8404,88 @@ msgstr "Ungültiges XML, XRD-Root fehlt."
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr "Hole Backup von der Datei „%s“."
+
+#~ msgid "Note"
+#~ msgstr "Nachricht"
+
+#~ msgid ""
+#~ "Commands:\n"
+#~ "on - turn on notifications\n"
+#~ "off - turn off notifications\n"
+#~ "help - show this help\n"
+#~ "follow <nickname> - subscribe to user\n"
+#~ "groups - lists the groups you have joined\n"
+#~ "subscriptions - list the people you follow\n"
+#~ "subscribers - list the people that follow you\n"
+#~ "leave <nickname> - unsubscribe from user\n"
+#~ "d <nickname> <text> - direct message to user\n"
+#~ "get <nickname> - get last notice from user\n"
+#~ "whois <nickname> - get profile info on user\n"
+#~ "lose <nickname> - force user to stop following you\n"
+#~ "fav <nickname> - add user's last notice as a 'fave'\n"
+#~ "fav #<notice_id> - add notice with the given id as a 'fave'\n"
+#~ "repeat #<notice_id> - repeat a notice with a given id\n"
+#~ "repeat <nickname> - repeat the last notice from user\n"
+#~ "reply #<notice_id> - reply to notice with a given id\n"
+#~ "reply <nickname> - reply to the last notice from user\n"
+#~ "join <group> - join group\n"
+#~ "login - Get a link to login to the web interface\n"
+#~ "drop <group> - leave group\n"
+#~ "stats - get your stats\n"
+#~ "stop - same as 'off'\n"
+#~ "quit - same as 'off'\n"
+#~ "sub <nickname> - same as 'follow'\n"
+#~ "unsub <nickname> - same as 'leave'\n"
+#~ "last <nickname> - same as 'get'\n"
+#~ "on <nickname> - not yet implemented.\n"
+#~ "off <nickname> - not yet implemented.\n"
+#~ "nudge <nickname> - remind a user to update.\n"
+#~ "invite <phone number> - not yet implemented.\n"
+#~ "track <word> - not yet implemented.\n"
+#~ "untrack <word> - not yet implemented.\n"
+#~ "track off - not yet implemented.\n"
+#~ "untrack all - not yet implemented.\n"
+#~ "tracks - not yet implemented.\n"
+#~ "tracking - not yet implemented.\n"
+#~ msgstr ""
+#~ "Befehle:\n"
+#~ "on - Benachrichtigung einschalten\n"
+#~ "off - Benachrichtigung ausschalten\n"
+#~ "help - diese Hilfe anzeigen\n"
+#~ "follow <nickname> - einem Benutzer folgen\n"
+#~ "groups - Gruppen auflisten in denen du Mitglied bist\n"
+#~ "subscriptions - Leute auflisten denen du folgst\n"
+#~ "subscribers - Leute auflisten die dir folgen\n"
+#~ "leave <nickname> - einem Benutzer nicht mehr folgen\n"
+#~ "d <nickname> <text> - Direkte Nachricht an einen Benutzer schicken\n"
+#~ "get <nickname> - letzte Nachricht eines Benutzers abrufen\n"
+#~ "whois <nickname> - Profil eines Benutzers abrufen\n"
+#~ "lose <nickname> - Benutzer zwingen dir nicht mehr zu folgen\n"
+#~ "fav <nickname> - letzte Nachricht eines Benutzers als Favorit markieren\n"
+#~ "fav #<notice_id> - Nachricht mit bestimmter ID als Favorit markieren\n"
+#~ "repeat #<notice_id> - Nachricht mit bestimmter ID wiederholen\n"
+#~ "repeat <nickname> - letzte Nachricht eines Benutzers wiederholen\n"
+#~ "reply #<notice_id> - Nachricht mit bestimmter ID beantworten\n"
+#~ "reply <nickname> - letzte Nachricht eines Benutzers beantworten\n"
+#~ "join <group> - Gruppe beitreten\n"
+#~ "login - Link zum Anmelden auf der Webseite anfordern\n"
+#~ "drop <group> - Gruppe verlassen\n"
+#~ "stats - deine Statistik abrufen\n"
+#~ "stop - Äquivalent zu „off“\n"
+#~ "quit - Äquivalent zu „off“\n"
+#~ "sub <nickname> - Äquivalent zu „follow“\n"
+#~ "unsub <nickname> - Äquivalent zu „leave“\n"
+#~ "last <nickname> - Äquivalent zu „get“\n"
+#~ "on <nickname> - noch nicht implementiert\n"
+#~ "off <nickname> - noch nicht implementiert\n"
+#~ "nudge <nickname> - einen Benutzer ans Aktualisieren erinnern\n"
+#~ "invite <phone number> - noch nicht implementiert\n"
+#~ "track <word> - noch nicht implementiert\n"
+#~ "untrack <word> - noch nicht implementiert\n"
+#~ "track off - noch nicht implementiert\n"
+#~ "untrack all - noch nicht implementiert\n"
+#~ "tracks - noch nicht implementiert\n"
+#~ "tracking - noch nicht implementiert\n"
+
+#~ msgid "Edit Avatar"
+#~ msgstr "Avatar bearbeiten"
diff --git a/locale/en_GB/LC_MESSAGES/statusnet.po b/locale/en_GB/LC_MESSAGES/statusnet.po
index c08f5a607f..7289070638 100644
--- a/locale/en_GB/LC_MESSAGES/statusnet.po
+++ b/locale/en_GB/LC_MESSAGES/statusnet.po
@@ -13,17 +13,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-11 18:15+0000\n"
-"PO-Revision-Date: 2011-03-11 18:17:01+0000\n"
+"POT-Creation-Date: 2011-03-17 09:47+0000\n"
+"PO-Revision-Date: 2011-03-17 09:49:29+0000\n"
 "Language-Team: British English <http://translatewiki.net/wiki/Portal:en-gb>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83703); Translate extension (2011-03-11)\n"
+"X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: en-gb\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-03-08 01:25:01+0000\n"
+"X-POT-Import-Date: 2011-03-11 18:52:41+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -595,7 +595,7 @@ msgstr "Could not remove user %1$s from group %2$s."
 msgid "%s's groups"
 msgstr "%s's groups"
 
-#. TRANS: Used as subtitle in check for group membership. %1$s is a user name, %2$s is the site name.
+#. TRANS: Used as subtitle in check for group membership. %1$s is the site name, %2$s is a user name.
 #, php-format
 msgid "%1$s groups %2$s is a member of."
 msgstr "%1$s groups %2$s is a member of."
@@ -4678,18 +4678,6 @@ msgstr "%s group"
 msgid "%1$s group, page %2$d"
 msgstr "%1$s group, page %2$d"
 
-#. TRANS: Label for group description or group note (dt). Text hidden by default.
-msgid "Note"
-msgstr "Note"
-
-#. TRANS: Label for group aliases (dt). Text hidden by default.
-msgid "Aliases"
-msgstr ""
-
-#. TRANS: Group actions header (h2). Text hidden by default.
-msgid "Group actions"
-msgstr "Group actions"
-
 #. TRANS: Tooltip for feed link. %s is a group nickname.
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
@@ -4801,6 +4789,10 @@ msgstr "Message from %1$s on %2$s"
 msgid "Notice deleted."
 msgstr "Notice deleted."
 
+#, fuzzy
+msgid "Notice"
+msgstr "Notices"
+
 #. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
 #, fuzzy, php-format
 msgid "%1$s tagged %2$s"
@@ -5321,7 +5313,6 @@ msgstr "No ID argument."
 msgid "Tag %s"
 msgstr "Tag %s"
 
-#. TRANS: H2 for user profile information.
 msgid "User profile"
 msgstr "User profile"
 
@@ -6025,6 +6016,49 @@ msgstr ""
 msgid "No AtomPub API service for %s."
 msgstr ""
 
+#. TRANS: H2 for user actions in a profile.
+#. TRANS: H2 for entity actions in a profile.
+msgid "User actions"
+msgstr "User actions"
+
+#. TRANS: Text shown in user profile of not yet compeltely deleted users.
+msgid "User deletion in progress..."
+msgstr ""
+
+#. TRANS: Link title for link on user profile.
+msgid "Edit profile settings"
+msgstr "Edit profile settings"
+
+#. TRANS: Link text for link on user profile.
+msgid "Edit"
+msgstr "Edit"
+
+#. TRANS: Link title for link on user profile.
+msgid "Send a direct message to this user"
+msgstr "Send a direct message to this user"
+
+#. TRANS: Link text for link on user profile.
+msgid "Message"
+msgstr "Message"
+
+#. TRANS: Label text on user profile to select a user role.
+msgid "Moderate"
+msgstr "Moderate"
+
+#. TRANS: Label text on user profile to select a user role.
+msgid "User role"
+msgstr "User role"
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Administrator"
+msgstr "Administrator"
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Moderator"
+msgstr "Moderator"
+
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
 #, php-format
 msgid "%1$s - %2$s"
@@ -6735,85 +6769,171 @@ msgid_plural "You are a member of these groups:"
 msgstr[0] "You are a member of this group:"
 msgstr[1] "You are a member of these groups:"
 
-#. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-msgid ""
-"Commands:\n"
-"on - turn on notifications\n"
-"off - turn off notifications\n"
-"help - show this help\n"
-"follow <nickname> - subscribe to user\n"
-"groups - lists the groups you have joined\n"
-"subscriptions - list the people you follow\n"
-"subscribers - list the people that follow you\n"
-"leave <nickname> - unsubscribe from user\n"
-"d <nickname> <text> - direct message to user\n"
-"get <nickname> - get last notice from user\n"
-"whois <nickname> - get profile info on user\n"
-"lose <nickname> - force user to stop following you\n"
-"fav <nickname> - add user's last notice as a 'fave'\n"
-"fav #<notice_id> - add notice with the given id as a 'fave'\n"
-"repeat #<notice_id> - repeat a notice with a given id\n"
-"repeat <nickname> - repeat the last notice from user\n"
-"reply #<notice_id> - reply to notice with a given id\n"
-"reply <nickname> - reply to the last notice from user\n"
-"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
-"drop <group> - leave group\n"
-"stats - get your stats\n"
-"stop - same as 'off'\n"
-"quit - same as 'off'\n"
-"sub <nickname> - same as 'follow'\n"
-"unsub <nickname> - same as 'leave'\n"
-"last <nickname> - same as 'get'\n"
-"on <nickname> - not yet implemented.\n"
-"off <nickname> - not yet implemented.\n"
-"nudge <nickname> - remind a user to update.\n"
-"invite <phone number> - not yet implemented.\n"
-"track <word> - not yet implemented.\n"
-"untrack <word> - not yet implemented.\n"
-"track off - not yet implemented.\n"
-"untrack all - not yet implemented.\n"
-"tracks - not yet implemented.\n"
-"tracking - not yet implemented.\n"
+#. TRANS: Header line of help text for commands.
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "Commands:"
+msgstr "Command results"
+
+#. TRANS: Help message for IM/SMS command "on"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "turn on notifications"
+msgstr "Can't turn on notification."
+
+#. TRANS: Help message for IM/SMS command "off"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "turn off notifications"
+msgstr "Can't turn off notification."
+
+#. TRANS: Help message for IM/SMS command "help"
+msgctxt "COMMANDHELP"
+msgid "show this help"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "follow <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "subscribe to user"
+msgstr "Subscribe to this user"
+
+#. TRANS: Help message for IM/SMS command "groups"
+msgctxt "COMMANDHELP"
+msgid "lists the groups you have joined"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscriptions"
+msgctxt "COMMANDHELP"
+msgid "list the people you follow"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscribers"
+msgctxt "COMMANDHELP"
+msgid "list the people that follow you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "leave <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "unsubscribe from user"
+msgstr "Unsubscribe from this user"
+
+#. TRANS: Help message for IM/SMS command "d <nickname> <text>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "direct message to user"
+msgstr "Direct messages to %s"
+
+#. TRANS: Help message for IM/SMS command "get <nickname>"
+msgctxt "COMMANDHELP"
+msgid "get last notice from user"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "whois <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "get profile info on user"
+msgstr "Profile information"
+
+#. TRANS: Help message for IM/SMS command "lose <nickname>"
+msgctxt "COMMANDHELP"
+msgid "force user to stop following you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav <nickname>"
+msgctxt "COMMANDHELP"
+msgid "add user's last notice as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "add notice with the given id as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "repeat a notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "repeat the last notice from user"
+msgstr "Repeat this notice"
+
+#. TRANS: Help message for IM/SMS command "reply #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "reply to notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "reply <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "reply to the last notice from user"
+msgstr "Reply to this notice"
+
+#. TRANS: Help message for IM/SMS command "join <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "join group"
+msgstr "Unknown"
+
+#. TRANS: Help message for IM/SMS command "login"
+msgctxt "COMMANDHELP"
+msgid "Get a link to login to the web interface"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "drop <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "leave group"
+msgstr "Delete group"
+
+#. TRANS: Help message for IM/SMS command "stats"
+msgctxt "COMMANDHELP"
+msgid "get your stats"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "stop"
+#. TRANS: Help message for IM/SMS command "quit"
+msgctxt "COMMANDHELP"
+msgid "same as 'off'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "sub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'follow'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "unsub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'leave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "last <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'get'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "on <nickname>"
+#. TRANS: Help message for IM/SMS command "off <nickname>"
+#. TRANS: Help message for IM/SMS command "invite <phone number>"
+#. TRANS: Help message for IM/SMS command "track <word>"
+#. TRANS: Help message for IM/SMS command "untrack <word>"
+#. TRANS: Help message for IM/SMS command "track off"
+#. TRANS: Help message for IM/SMS command "untrack all"
+#. TRANS: Help message for IM/SMS command "tracks"
+#. TRANS: Help message for IM/SMS command "tracking"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "not yet implemented."
+msgstr "Command not yet implemented."
+
+#. TRANS: Help message for IM/SMS command "nudge <nickname>"
+msgctxt "COMMANDHELP"
+msgid "remind a user to update."
 msgstr ""
-"Commands:\n"
-"on - turn on notifications\n"
-"off - turn off notifications\n"
-"help - show this help\n"
-"follow <nickname> - subscribe to user\n"
-"groups - lists the groups you have joined\n"
-"subscriptions - list the people you follow\n"
-"subscribers - list the people that follow you\n"
-"leave <nickname> - unsubscribe from user\n"
-"d <nickname> <text> - direct message to user\n"
-"get <nickname> - get last notice from user\n"
-"whois <nickname> - get profile info on user\n"
-"lose <nickname> - force user to stop following you\n"
-"fav <nickname> - add user's last notice as a 'fave'\n"
-"fav #<notice_id> - add notice with the given id as a 'fave'\n"
-"repeat #<notice_id> - repeat a notice with a given id\n"
-"repeat <nickname> - repeat the last notice from user\n"
-"reply #<notice_id> - reply to notice with a given id\n"
-"reply <nickname> - reply to the last notice from user\n"
-"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
-"drop <group> - leave group\n"
-"stats - get your stats\n"
-"stop - same as 'off'\n"
-"quit - same as 'off'\n"
-"sub <nickname> - same as 'follow'\n"
-"unsub <nickname> - same as 'leave'\n"
-"last <nickname> - same as 'get'\n"
-"on <nickname> - not yet implemented.\n"
-"off <nickname> - not yet implemented.\n"
-"nudge <nickname> - remind a user to update.\n"
-"invite <phone number> - not yet implemented.\n"
-"track <word> - not yet implemented.\n"
-"untrack <word> - not yet implemented.\n"
-"track off - not yet implemented.\n"
-"untrack all - not yet implemented.\n"
-"tracks - not yet implemented.\n"
-"tracking - not yet implemented.\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #, fuzzy
@@ -6996,6 +7116,9 @@ msgid ""
 msgstr ""
 "Location for the group, if any, like \"City, State (or Region), Country\""
 
+msgid "Aliases"
+msgstr ""
+
 #, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -7073,6 +7196,10 @@ msgctxt "TOOLTIP"
 msgid "Add or edit %s design"
 msgstr ""
 
+#. TRANS: Group actions header (h2). Text hidden by default.
+msgid "Group actions"
+msgstr "Group actions"
+
 #. TRANS: Title for groups with the most members section.
 msgid "Groups with most members"
 msgstr "Groups with most members"
@@ -7553,6 +7680,7 @@ msgstr "Send a notice"
 msgid "What's up, %s?"
 msgstr "What's up, %s?"
 
+#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr ""
 
@@ -8005,52 +8133,6 @@ msgstr "Unsubscribe"
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "User %1$s (%2$d) has no profile record."
 
-msgid "Edit Avatar"
-msgstr "Edit Avatar"
-
-#. TRANS: H2 for user actions in a profile.
-#. TRANS: H2 for entity actions in a profile.
-msgid "User actions"
-msgstr "User actions"
-
-#. TRANS: Text shown in user profile of not yet compeltely deleted users.
-msgid "User deletion in progress..."
-msgstr ""
-
-#. TRANS: Link title for link on user profile.
-msgid "Edit profile settings"
-msgstr "Edit profile settings"
-
-#. TRANS: Link text for link on user profile.
-msgid "Edit"
-msgstr "Edit"
-
-#. TRANS: Link title for link on user profile.
-msgid "Send a direct message to this user"
-msgstr "Send a direct message to this user"
-
-#. TRANS: Link text for link on user profile.
-msgid "Message"
-msgstr "Message"
-
-#. TRANS: Label text on user profile to select a user role.
-msgid "Moderate"
-msgstr "Moderate"
-
-#. TRANS: Label text on user profile to select a user role.
-msgid "User role"
-msgstr "User role"
-
-#. TRANS: Role that can be set for a user profile.
-msgctxt "role"
-msgid "Administrator"
-msgstr "Administrator"
-
-#. TRANS: Role that can be set for a user profile.
-msgctxt "role"
-msgid "Moderator"
-msgstr "Moderator"
-
 #, fuzzy
 msgid "Not allowed to log in."
 msgstr "Not logged in."
@@ -8126,3 +8208,88 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#~ msgid "Note"
+#~ msgstr "Note"
+
+#~ msgid ""
+#~ "Commands:\n"
+#~ "on - turn on notifications\n"
+#~ "off - turn off notifications\n"
+#~ "help - show this help\n"
+#~ "follow <nickname> - subscribe to user\n"
+#~ "groups - lists the groups you have joined\n"
+#~ "subscriptions - list the people you follow\n"
+#~ "subscribers - list the people that follow you\n"
+#~ "leave <nickname> - unsubscribe from user\n"
+#~ "d <nickname> <text> - direct message to user\n"
+#~ "get <nickname> - get last notice from user\n"
+#~ "whois <nickname> - get profile info on user\n"
+#~ "lose <nickname> - force user to stop following you\n"
+#~ "fav <nickname> - add user's last notice as a 'fave'\n"
+#~ "fav #<notice_id> - add notice with the given id as a 'fave'\n"
+#~ "repeat #<notice_id> - repeat a notice with a given id\n"
+#~ "repeat <nickname> - repeat the last notice from user\n"
+#~ "reply #<notice_id> - reply to notice with a given id\n"
+#~ "reply <nickname> - reply to the last notice from user\n"
+#~ "join <group> - join group\n"
+#~ "login - Get a link to login to the web interface\n"
+#~ "drop <group> - leave group\n"
+#~ "stats - get your stats\n"
+#~ "stop - same as 'off'\n"
+#~ "quit - same as 'off'\n"
+#~ "sub <nickname> - same as 'follow'\n"
+#~ "unsub <nickname> - same as 'leave'\n"
+#~ "last <nickname> - same as 'get'\n"
+#~ "on <nickname> - not yet implemented.\n"
+#~ "off <nickname> - not yet implemented.\n"
+#~ "nudge <nickname> - remind a user to update.\n"
+#~ "invite <phone number> - not yet implemented.\n"
+#~ "track <word> - not yet implemented.\n"
+#~ "untrack <word> - not yet implemented.\n"
+#~ "track off - not yet implemented.\n"
+#~ "untrack all - not yet implemented.\n"
+#~ "tracks - not yet implemented.\n"
+#~ "tracking - not yet implemented.\n"
+#~ msgstr ""
+#~ "Commands:\n"
+#~ "on - turn on notifications\n"
+#~ "off - turn off notifications\n"
+#~ "help - show this help\n"
+#~ "follow <nickname> - subscribe to user\n"
+#~ "groups - lists the groups you have joined\n"
+#~ "subscriptions - list the people you follow\n"
+#~ "subscribers - list the people that follow you\n"
+#~ "leave <nickname> - unsubscribe from user\n"
+#~ "d <nickname> <text> - direct message to user\n"
+#~ "get <nickname> - get last notice from user\n"
+#~ "whois <nickname> - get profile info on user\n"
+#~ "lose <nickname> - force user to stop following you\n"
+#~ "fav <nickname> - add user's last notice as a 'fave'\n"
+#~ "fav #<notice_id> - add notice with the given id as a 'fave'\n"
+#~ "repeat #<notice_id> - repeat a notice with a given id\n"
+#~ "repeat <nickname> - repeat the last notice from user\n"
+#~ "reply #<notice_id> - reply to notice with a given id\n"
+#~ "reply <nickname> - reply to the last notice from user\n"
+#~ "join <group> - join group\n"
+#~ "login - Get a link to login to the web interface\n"
+#~ "drop <group> - leave group\n"
+#~ "stats - get your stats\n"
+#~ "stop - same as 'off'\n"
+#~ "quit - same as 'off'\n"
+#~ "sub <nickname> - same as 'follow'\n"
+#~ "unsub <nickname> - same as 'leave'\n"
+#~ "last <nickname> - same as 'get'\n"
+#~ "on <nickname> - not yet implemented.\n"
+#~ "off <nickname> - not yet implemented.\n"
+#~ "nudge <nickname> - remind a user to update.\n"
+#~ "invite <phone number> - not yet implemented.\n"
+#~ "track <word> - not yet implemented.\n"
+#~ "untrack <word> - not yet implemented.\n"
+#~ "track off - not yet implemented.\n"
+#~ "untrack all - not yet implemented.\n"
+#~ "tracks - not yet implemented.\n"
+#~ "tracking - not yet implemented.\n"
+
+#~ msgid "Edit Avatar"
+#~ msgstr "Edit Avatar"
diff --git a/locale/eo/LC_MESSAGES/statusnet.po b/locale/eo/LC_MESSAGES/statusnet.po
index 2b24b835bf..029c3231b7 100644
--- a/locale/eo/LC_MESSAGES/statusnet.po
+++ b/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-03-11 18:15+0000\n"
-"PO-Revision-Date: 2011-03-11 18:17:02+0000\n"
+"POT-Creation-Date: 2011-03-17 09:47+0000\n"
+"PO-Revision-Date: 2011-03-17 09:49:30+0000\n"
 "Language-Team: Esperanto <http://translatewiki.net/wiki/Portal:eo>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83703); Translate extension (2011-03-11)\n"
+"X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: eo\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-03-08 01:25:01+0000\n"
+"X-POT-Import-Date: 2011-03-11 18:52:41+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -596,7 +596,7 @@ msgstr "Malsukcesis forigi uzanton %1$s de grupo %2$s."
 msgid "%s's groups"
 msgstr "Grupoj de %s"
 
-#. TRANS: Used as subtitle in check for group membership. %1$s is a user name, %2$s is the site name.
+#. TRANS: Used as subtitle in check for group membership. %1$s is the site name, %2$s is a user name.
 #, php-format
 msgid "%1$s groups %2$s is a member of."
 msgstr "Grupoj de %2$s ĉe %1$s."
@@ -4651,18 +4651,6 @@ msgstr "Grupo %s"
 msgid "%1$s group, page %2$d"
 msgstr "Grupo %1$s, paĝo %2$d"
 
-#. TRANS: Label for group description or group note (dt). Text hidden by default.
-msgid "Note"
-msgstr "Noto"
-
-#. TRANS: Label for group aliases (dt). Text hidden by default.
-msgid "Aliases"
-msgstr "Alnomo"
-
-#. TRANS: Group actions header (h2). Text hidden by default.
-msgid "Group actions"
-msgstr "Grupaj agoj"
-
 #. TRANS: Tooltip for feed link. %s is a group nickname.
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
@@ -4773,6 +4761,10 @@ msgstr "Mesaĝo de %1$s ĉe %2$s"
 msgid "Notice deleted."
 msgstr "Avizo viŝiĝas"
 
+#, fuzzy
+msgid "Notice"
+msgstr "Avizoj"
+
 #. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
 #, fuzzy, php-format
 msgid "%1$s tagged %2$s"
@@ -5299,7 +5291,6 @@ msgstr "Neniu ID-argumento"
 msgid "Tag %s"
 msgstr "Etikedo %s"
 
-#. TRANS: H2 for user profile information.
 msgid "User profile"
 msgstr "Uzanta profilo"
 
@@ -6007,6 +5998,49 @@ msgstr ""
 msgid "No AtomPub API service for %s."
 msgstr ""
 
+#. TRANS: H2 for user actions in a profile.
+#. TRANS: H2 for entity actions in a profile.
+msgid "User actions"
+msgstr "Nekonata ago"
+
+#. TRANS: Text shown in user profile of not yet compeltely deleted users.
+msgid "User deletion in progress..."
+msgstr "Forigante uzanton..."
+
+#. TRANS: Link title for link on user profile.
+msgid "Edit profile settings"
+msgstr "Redakti profilan agordon"
+
+#. TRANS: Link text for link on user profile.
+msgid "Edit"
+msgstr "Redakti"
+
+#. TRANS: Link title for link on user profile.
+msgid "Send a direct message to this user"
+msgstr "Sendi rektan mesaĝon a ĉi tiu uzanto"
+
+#. TRANS: Link text for link on user profile.
+msgid "Message"
+msgstr "Mesaĝo"
+
+#. TRANS: Label text on user profile to select a user role.
+msgid "Moderate"
+msgstr "Moderigi"
+
+#. TRANS: Label text on user profile to select a user role.
+msgid "User role"
+msgstr "Uzanta rolo"
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Administrator"
+msgstr "Administranto"
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Moderator"
+msgstr "Moderanto"
+
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
 #, php-format
 msgid "%1$s - %2$s"
@@ -6733,85 +6767,171 @@ msgid_plural "You are a member of these groups:"
 msgstr[0] "Vi estas grupano de jena grupo:"
 msgstr[1] "Vi estas grupano de jenaj grupoj:"
 
-#. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-msgid ""
-"Commands:\n"
-"on - turn on notifications\n"
-"off - turn off notifications\n"
-"help - show this help\n"
-"follow <nickname> - subscribe to user\n"
-"groups - lists the groups you have joined\n"
-"subscriptions - list the people you follow\n"
-"subscribers - list the people that follow you\n"
-"leave <nickname> - unsubscribe from user\n"
-"d <nickname> <text> - direct message to user\n"
-"get <nickname> - get last notice from user\n"
-"whois <nickname> - get profile info on user\n"
-"lose <nickname> - force user to stop following you\n"
-"fav <nickname> - add user's last notice as a 'fave'\n"
-"fav #<notice_id> - add notice with the given id as a 'fave'\n"
-"repeat #<notice_id> - repeat a notice with a given id\n"
-"repeat <nickname> - repeat the last notice from user\n"
-"reply #<notice_id> - reply to notice with a given id\n"
-"reply <nickname> - reply to the last notice from user\n"
-"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
-"drop <group> - leave group\n"
-"stats - get your stats\n"
-"stop - same as 'off'\n"
-"quit - same as 'off'\n"
-"sub <nickname> - same as 'follow'\n"
-"unsub <nickname> - same as 'leave'\n"
-"last <nickname> - same as 'get'\n"
-"on <nickname> - not yet implemented.\n"
-"off <nickname> - not yet implemented.\n"
-"nudge <nickname> - remind a user to update.\n"
-"invite <phone number> - not yet implemented.\n"
-"track <word> - not yet implemented.\n"
-"untrack <word> - not yet implemented.\n"
-"track off - not yet implemented.\n"
-"untrack all - not yet implemented.\n"
-"tracks - not yet implemented.\n"
-"tracking - not yet implemented.\n"
+#. TRANS: Header line of help text for commands.
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "Commands:"
+msgstr "Komandaj rezultoj"
+
+#. TRANS: Help message for IM/SMS command "on"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "turn on notifications"
+msgstr "Malsukcesis ŝalti sciigon."
+
+#. TRANS: Help message for IM/SMS command "off"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "turn off notifications"
+msgstr "Malsukcesis malŝalti sciigon."
+
+#. TRANS: Help message for IM/SMS command "help"
+msgctxt "COMMANDHELP"
+msgid "show this help"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "follow <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "subscribe to user"
+msgstr "Aboni la uzanton"
+
+#. TRANS: Help message for IM/SMS command "groups"
+msgctxt "COMMANDHELP"
+msgid "lists the groups you have joined"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscriptions"
+msgctxt "COMMANDHELP"
+msgid "list the people you follow"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscribers"
+msgctxt "COMMANDHELP"
+msgid "list the people that follow you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "leave <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "unsubscribe from user"
+msgstr "Malaboni la uzanton"
+
+#. TRANS: Help message for IM/SMS command "d <nickname> <text>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "direct message to user"
+msgstr "Rektaj mesaĝoj al %s"
+
+#. TRANS: Help message for IM/SMS command "get <nickname>"
+msgctxt "COMMANDHELP"
+msgid "get last notice from user"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "whois <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "get profile info on user"
+msgstr "Profila informo"
+
+#. TRANS: Help message for IM/SMS command "lose <nickname>"
+msgctxt "COMMANDHELP"
+msgid "force user to stop following you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav <nickname>"
+msgctxt "COMMANDHELP"
+msgid "add user's last notice as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "add notice with the given id as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "repeat a notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "repeat the last notice from user"
+msgstr "Ripeti la avizon"
+
+#. TRANS: Help message for IM/SMS command "reply #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "reply to notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "reply <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "reply to the last notice from user"
+msgstr "Respondi ĉi tiun avizon"
+
+#. TRANS: Help message for IM/SMS command "join <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "join group"
+msgstr "Nekonata grupo."
+
+#. TRANS: Help message for IM/SMS command "login"
+msgctxt "COMMANDHELP"
+msgid "Get a link to login to the web interface"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "drop <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "leave group"
+msgstr "Forigo de grupo"
+
+#. TRANS: Help message for IM/SMS command "stats"
+msgctxt "COMMANDHELP"
+msgid "get your stats"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "stop"
+#. TRANS: Help message for IM/SMS command "quit"
+msgctxt "COMMANDHELP"
+msgid "same as 'off'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "sub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'follow'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "unsub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'leave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "last <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'get'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "on <nickname>"
+#. TRANS: Help message for IM/SMS command "off <nickname>"
+#. TRANS: Help message for IM/SMS command "invite <phone number>"
+#. TRANS: Help message for IM/SMS command "track <word>"
+#. TRANS: Help message for IM/SMS command "untrack <word>"
+#. TRANS: Help message for IM/SMS command "track off"
+#. TRANS: Help message for IM/SMS command "untrack all"
+#. TRANS: Help message for IM/SMS command "tracks"
+#. TRANS: Help message for IM/SMS command "tracking"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "not yet implemented."
+msgstr "Komando ankoraŭ ne realigita."
+
+#. TRANS: Help message for IM/SMS command "nudge <nickname>"
+msgctxt "COMMANDHELP"
+msgid "remind a user to update."
 msgstr ""
-"Komandoj:\n"
-"on — ŝalti sciigon;\n"
-"off — malŝalti sciigon;\n"
-"help — montri ĉi tiun helpon;\n"
-"follow <nickname> — aboni uzanton;\n"
-"groups — listigi grupojn, kiujn vi aniĝis;\n"
-"subscriptions — listigi viajn abonatojn;\n"
-"subscribers — listigi viajn abonantojn;\n"
-"leave <nickname> — malaboni uzanton;\n"
-"d <nickname> <text> — sendi rektan mesaĝon al uzanto;\n"
-"get <nickname> — legi la lastan avizon de uzanto;\n"
-"whois <nickname> — legi profilan informon pri uzanto;\n"
-"lose <nickname> — ĉesigi la uzanton de sekvi vin;\n"
-"fav <nickname> — ŝati la lastan avizon de uzanto;\n"
-"fav #<notice_id> — ŝati la avizon kun la ID;\n"
-"repeat #<notice_id> — ripeti la avizon kun la ID;\n"
-"repeat <nickname> — ripeti la lastan avizon de uzanto;\n"
-"reply #<notice_id> — respondi la avizon kun la ID;\n"
-"reply <nickname> — respondi la lastan avizon de uzanto;\n"
-"join <group> — aniĝi al grupo;\n"
-"login — havi ligilon por ensaluti al reta interfaco;\n"
-"drop <group> — foriri el grupo;\n"
-"stats — legi vian staton;\n"
-"stop — same kiel «off»;\n"
-"quit — same kiel «off»;\n"
-"sub <nickname> — same kiel «follow»;\n"
-"unsub <nickname> — same kiel «leave»;\n"
-"last <nickname> — same kiel «get»;\n"
-"on <nickname> — ankoraŭ ne realigita;\n"
-"off <nickname> — ankoraŭ ne realigita;\n"
-"nudge <nickname> — puŝeti la uzanton, ke li ĝisdatigu!\n"
-"invite <phone number> — ankoraŭ ne realigita;\n"
-"track <word> — ankoraŭ ne realigita;\n"
-"untrack <word> — ankoraŭ ne realigita;\n"
-"track off — ankoraŭ ne realigita;\n"
-"untrack all — ankoraŭ ne realigita;\n"
-"tracks — ankoraŭ ne realigita;\n"
-"tracking — ankoraŭ ne realigita;\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #, fuzzy
@@ -6994,6 +7114,9 @@ msgid ""
 msgstr ""
 "Loko de la grupo, se iu ajn, ekzemple \"Urbo, Stato (aŭ Regiono), Lando\""
 
+msgid "Aliases"
+msgstr "Alnomo"
+
 #, fuzzy, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -7073,6 +7196,10 @@ msgctxt "TOOLTIP"
 msgid "Add or edit %s design"
 msgstr "Aldoni aŭ redakti desegnon de %s"
 
+#. TRANS: Group actions header (h2). Text hidden by default.
+msgid "Group actions"
+msgstr "Grupaj agoj"
+
 #. TRANS: Title for groups with the most members section.
 msgid "Groups with most members"
 msgstr "Grupoj kun plej multe da membroj"
@@ -7639,6 +7766,7 @@ msgstr "Sendi avizon"
 msgid "What's up, %s?"
 msgstr "Kio novas, %s?"
 
+#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr "Aldoni"
 
@@ -8095,52 +8223,6 @@ msgstr "Malaboni"
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "La uzanto ne havas profilon."
 
-msgid "Edit Avatar"
-msgstr "Redakti vizaĝbildon"
-
-#. TRANS: H2 for user actions in a profile.
-#. TRANS: H2 for entity actions in a profile.
-msgid "User actions"
-msgstr "Nekonata ago"
-
-#. TRANS: Text shown in user profile of not yet compeltely deleted users.
-msgid "User deletion in progress..."
-msgstr "Forigante uzanton..."
-
-#. TRANS: Link title for link on user profile.
-msgid "Edit profile settings"
-msgstr "Redakti profilan agordon"
-
-#. TRANS: Link text for link on user profile.
-msgid "Edit"
-msgstr "Redakti"
-
-#. TRANS: Link title for link on user profile.
-msgid "Send a direct message to this user"
-msgstr "Sendi rektan mesaĝon a ĉi tiu uzanto"
-
-#. TRANS: Link text for link on user profile.
-msgid "Message"
-msgstr "Mesaĝo"
-
-#. TRANS: Label text on user profile to select a user role.
-msgid "Moderate"
-msgstr "Moderigi"
-
-#. TRANS: Label text on user profile to select a user role.
-msgid "User role"
-msgstr "Uzanta rolo"
-
-#. TRANS: Role that can be set for a user profile.
-msgctxt "role"
-msgid "Administrator"
-msgstr "Administranto"
-
-#. TRANS: Role that can be set for a user profile.
-msgctxt "role"
-msgid "Moderator"
-msgstr "Moderanto"
-
 #, fuzzy
 msgid "Not allowed to log in."
 msgstr "Ne konektita."
@@ -8216,3 +8298,88 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#~ msgid "Note"
+#~ msgstr "Noto"
+
+#~ msgid ""
+#~ "Commands:\n"
+#~ "on - turn on notifications\n"
+#~ "off - turn off notifications\n"
+#~ "help - show this help\n"
+#~ "follow <nickname> - subscribe to user\n"
+#~ "groups - lists the groups you have joined\n"
+#~ "subscriptions - list the people you follow\n"
+#~ "subscribers - list the people that follow you\n"
+#~ "leave <nickname> - unsubscribe from user\n"
+#~ "d <nickname> <text> - direct message to user\n"
+#~ "get <nickname> - get last notice from user\n"
+#~ "whois <nickname> - get profile info on user\n"
+#~ "lose <nickname> - force user to stop following you\n"
+#~ "fav <nickname> - add user's last notice as a 'fave'\n"
+#~ "fav #<notice_id> - add notice with the given id as a 'fave'\n"
+#~ "repeat #<notice_id> - repeat a notice with a given id\n"
+#~ "repeat <nickname> - repeat the last notice from user\n"
+#~ "reply #<notice_id> - reply to notice with a given id\n"
+#~ "reply <nickname> - reply to the last notice from user\n"
+#~ "join <group> - join group\n"
+#~ "login - Get a link to login to the web interface\n"
+#~ "drop <group> - leave group\n"
+#~ "stats - get your stats\n"
+#~ "stop - same as 'off'\n"
+#~ "quit - same as 'off'\n"
+#~ "sub <nickname> - same as 'follow'\n"
+#~ "unsub <nickname> - same as 'leave'\n"
+#~ "last <nickname> - same as 'get'\n"
+#~ "on <nickname> - not yet implemented.\n"
+#~ "off <nickname> - not yet implemented.\n"
+#~ "nudge <nickname> - remind a user to update.\n"
+#~ "invite <phone number> - not yet implemented.\n"
+#~ "track <word> - not yet implemented.\n"
+#~ "untrack <word> - not yet implemented.\n"
+#~ "track off - not yet implemented.\n"
+#~ "untrack all - not yet implemented.\n"
+#~ "tracks - not yet implemented.\n"
+#~ "tracking - not yet implemented.\n"
+#~ msgstr ""
+#~ "Komandoj:\n"
+#~ "on — ŝalti sciigon;\n"
+#~ "off — malŝalti sciigon;\n"
+#~ "help — montri ĉi tiun helpon;\n"
+#~ "follow <nickname> — aboni uzanton;\n"
+#~ "groups — listigi grupojn, kiujn vi aniĝis;\n"
+#~ "subscriptions — listigi viajn abonatojn;\n"
+#~ "subscribers — listigi viajn abonantojn;\n"
+#~ "leave <nickname> — malaboni uzanton;\n"
+#~ "d <nickname> <text> — sendi rektan mesaĝon al uzanto;\n"
+#~ "get <nickname> — legi la lastan avizon de uzanto;\n"
+#~ "whois <nickname> — legi profilan informon pri uzanto;\n"
+#~ "lose <nickname> — ĉesigi la uzanton de sekvi vin;\n"
+#~ "fav <nickname> — ŝati la lastan avizon de uzanto;\n"
+#~ "fav #<notice_id> — ŝati la avizon kun la ID;\n"
+#~ "repeat #<notice_id> — ripeti la avizon kun la ID;\n"
+#~ "repeat <nickname> — ripeti la lastan avizon de uzanto;\n"
+#~ "reply #<notice_id> — respondi la avizon kun la ID;\n"
+#~ "reply <nickname> — respondi la lastan avizon de uzanto;\n"
+#~ "join <group> — aniĝi al grupo;\n"
+#~ "login — havi ligilon por ensaluti al reta interfaco;\n"
+#~ "drop <group> — foriri el grupo;\n"
+#~ "stats — legi vian staton;\n"
+#~ "stop — same kiel «off»;\n"
+#~ "quit — same kiel «off»;\n"
+#~ "sub <nickname> — same kiel «follow»;\n"
+#~ "unsub <nickname> — same kiel «leave»;\n"
+#~ "last <nickname> — same kiel «get»;\n"
+#~ "on <nickname> — ankoraŭ ne realigita;\n"
+#~ "off <nickname> — ankoraŭ ne realigita;\n"
+#~ "nudge <nickname> — puŝeti la uzanton, ke li ĝisdatigu!\n"
+#~ "invite <phone number> — ankoraŭ ne realigita;\n"
+#~ "track <word> — ankoraŭ ne realigita;\n"
+#~ "untrack <word> — ankoraŭ ne realigita;\n"
+#~ "track off — ankoraŭ ne realigita;\n"
+#~ "untrack all — ankoraŭ ne realigita;\n"
+#~ "tracks — ankoraŭ ne realigita;\n"
+#~ "tracking — ankoraŭ ne realigita;\n"
+
+#~ msgid "Edit Avatar"
+#~ msgstr "Redakti vizaĝbildon"
diff --git a/locale/es/LC_MESSAGES/statusnet.po b/locale/es/LC_MESSAGES/statusnet.po
index 7319a67351..5ece490d2e 100644
--- a/locale/es/LC_MESSAGES/statusnet.po
+++ b/locale/es/LC_MESSAGES/statusnet.po
@@ -4,6 +4,7 @@
 # Author: Brion
 # Author: Crazymadlover
 # Author: Fitoschido
+# Author: Johnarupire
 # Author: Locos epraix
 # Author: McDutchie
 # Author: Ovruni
@@ -18,17 +19,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-11 18:15+0000\n"
-"PO-Revision-Date: 2011-03-11 18:17:03+0000\n"
+"POT-Creation-Date: 2011-03-17 09:47+0000\n"
+"PO-Revision-Date: 2011-03-17 09:49:32+0000\n"
 "Language-Team: Spanish <http://translatewiki.net/wiki/Portal:es>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83703); Translate extension (2011-03-11)\n"
+"X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-03-08 01:25:01+0000\n"
+"X-POT-Import-Date: 2011-03-11 18:52:41+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -278,7 +279,7 @@ msgstr "No se pudo guardar el perfil."
 #. TRANS: Client error displayed when the number of bytes in a POST request exceeds a limit.
 #. TRANS: %s is the number of bytes of the CONTENT_LENGTH.
 #. TRANS: Form validation error in design settings form. POST should remain untranslated.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s byte) due to its "
 "current configuration."
@@ -286,10 +287,10 @@ msgid_plural ""
 "The server was unable to handle that much POST data (%s bytes) due to its "
 "current configuration."
 msgstr[0] ""
-"El servidor no ha podido manejar tanta información del tipo POST (% de "
+"El servidor no ha podido manejar tanta información del tipo POST (%s de "
 "bytes) a causa de su configuración actual."
 msgstr[1] ""
-"El servidor no ha podido manejar tanta información del tipo POST (% de "
+"El servidor no ha podido manejar tanta información del tipo POST (%s de "
 "bytes) a causa de su configuración actual."
 
 #. TRANS: Client error displayed when saving design settings fails because of an empty id.
@@ -308,7 +309,7 @@ msgstr "No se pudo actualizar tu diseño."
 #. TRANS: Title for Atom feed.
 msgctxt "ATOM"
 msgid "Main"
-msgstr ""
+msgstr "Principal"
 
 #. TRANS: Title for Atom feed. %s is a user nickname.
 #. TRANS: Message is used as link title. %s is a user nickname.
@@ -330,14 +331,14 @@ msgstr "Suscripciones %s"
 #. TRANS: Title for Atom feed with a user's favorite notices. %s is a user nickname.
 #. TRANS: Title for Atom favorites feed.
 #. TRANS: %s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "%s favorites"
-msgstr "Favoritos"
+msgstr "%s Favoritos"
 
 #. TRANS: Title for Atom feed with a user's memberships. %s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "%s memberships"
-msgstr "Miembros del grupo %s"
+msgstr "%s miembros del grupo"
 
 #. TRANS: Client error displayed when users try to block themselves.
 msgid "You cannot block yourself!"
@@ -379,26 +380,24 @@ msgstr "¡Sin texto de mensaje!"
 #. TRANS: %d is the maximum number of characters for a message.
 #. TRANS: Form validation error displayed when message content is too long.
 #. TRANS: %d is the maximum number of characters for a message.
-#, fuzzy, php-format
+#, php-format
 msgid "That's too long. Maximum message size is %d character."
 msgid_plural "That's too long. Maximum message size is %d characters."
-msgstr[0] "Demasiado largo. Tamaño máx. de los mensajes es %d caracteres."
-msgstr[1] "Demasiado largo. Tamaño máx. de los mensajes es %d caracteres."
+msgstr[0] "Muy largo. El tamaño máx. por mensaje es de %d caracteres."
+msgstr[1] "Muy largo. El tamaño máx. por mensaje es de %d caracteres."
 
 #. TRANS: Client error displayed if a recipient user could not be found (403).
 msgid "Recipient user not found."
 msgstr "No se encuentra usuario receptor."
 
 #. TRANS: Client error displayed trying to direct message another user who's not a friend (403).
-#, fuzzy
 msgid "Cannot send direct messages to users who aren't your friend."
-msgstr "No se puede enviar mensajes directos a usuarios que no son tu amigo."
+msgstr "No puedes enviar mensajes directos a usuarios que no son tus amigos."
 
 #. TRANS: Client error displayed trying to direct message self (403).
-#, fuzzy
 msgid ""
 "Do not send a message to yourself; just say it to yourself quietly instead."
-msgstr "No te auto envíes un mensaje; dícetelo a ti mismo."
+msgstr "No te envíes un mensaje a ti mismo; sólo dilo para ti en voz baja."
 
 #. 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.
@@ -444,9 +443,8 @@ msgid "You cannot unfollow yourself."
 msgstr "No puedes dejar de seguirte a ti mismo."
 
 #. TRANS: Client error displayed when supplying invalid parameters to an API call checking if a friendship exists.
-#, fuzzy
 msgid "Two valid IDs or nick names must be supplied."
-msgstr "Deben proveerse dos IDs válidos o nombres en pantalla."
+msgstr "Son necesarios dos nombres de usuario o IDs válidos."
 
 #. TRANS: Client error displayed when a source user could not be determined showing friendship.
 msgid "Could not determine source user."
@@ -487,9 +485,8 @@ msgstr "La página de inicio no es un URL válido."
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
-msgstr "Tu nombre es demasiado largo (max. 255 carac.)"
+msgstr "Nombre demasiado largo (max. 255 carac.)"
 
 #. TRANS: Client error shown when providing too long a description during group creation.
 #. TRANS: %d is the maximum number of allowed characters.
@@ -502,20 +499,19 @@ msgstr "Tu nombre es demasiado largo (max. 255 carac.)"
 #. TRANS: %d is the maximum number of characters for the description.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed characters.
-#, fuzzy, php-format
+#, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."
-msgstr[0] "La descripción es demasiado larga (máx. %d caracteres)."
-msgstr[1] "La descripción es demasiado larga (máx. %d caracteres)."
+msgstr[0] "Descripción demasiado larga (máx. %d caracteres)."
+msgstr[1] "Descripción demasiado larga (máx. %d caracteres)."
 
 #. TRANS: Client error shown when providing too long a location during group creation.
 #. TRANS: API validation exception thrown when location does not validate.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#, fuzzy
 msgid "Location is too long (maximum 255 characters)."
-msgstr "La ubicación es demasiado larga (máx. 255 caracteres)."
+msgstr "Ubicación demasiado larga (máx. 255 caracteres)."
 
 #. TRANS: Client error shown when providing too many aliases during group creation.
 #. TRANS: %d is the maximum number of allowed aliases.
@@ -525,11 +521,11 @@ msgstr "La ubicación es demasiado larga (máx. 255 caracteres)."
 #. TRANS: %d is the maximum number of allowed aliases.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.
-#, fuzzy, php-format
+#, php-format
 msgid "Too many aliases! Maximum %d allowed."
 msgid_plural "Too many aliases! Maximum %d allowed."
-msgstr[0] "¡Muchos seudónimos! El máximo es %d."
-msgstr[1] "¡Muchos seudónimos! El máximo es %d."
+msgstr[0] "¡Muchos seudónimos! el máximo es %d."
+msgstr[1] "¡Muchos seudónimos! el máximo permitido es %d."
 
 #. TRANS: Client error shown when providing an invalid alias during group creation.
 #. TRANS: %s is the invalid alias.
@@ -601,8 +597,8 @@ msgstr "No se pudo eliminar al usuario %1$s del grupo %2$s."
 msgid "%s's groups"
 msgstr "Grupos de %s"
 
-#. TRANS: Used as subtitle in check for group membership. %1$s is a user name, %2$s is the site name.
-#, php-format
+#. TRANS: Used as subtitle in check for group membership. %1$s is the site name, %2$s is a user name.
+#, fuzzy, php-format
 msgid "%1$s groups %2$s is a member of."
 msgstr "%1$s grupos %2$s es un miembro de."
 
@@ -644,9 +640,8 @@ msgstr ""
 
 #. TRANS: API validation exception thrown when alias is the same as nickname.
 #. TRANS: Group create form validation error.
-#, fuzzy
 msgid "Alias cannot be the same as nickname."
-msgstr "El alias no puede ser el mismo que el usuario."
+msgstr "El alias no puede ser el igual al nombre de usuario."
 
 #. TRANS: Client error displayed when uploading a media file has failed.
 msgid "Upload failed."
@@ -765,20 +760,17 @@ msgid "Cancel"
 msgstr "Cancelar"
 
 #. TRANS: Button text that when clicked will allow access to an account by an external application.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Allow"
 msgstr "Permitir"
 
 #. TRANS: Form instructions.
-#, fuzzy
 msgid "Authorize access to your account information."
-msgstr "Permitir o denegar el acceso a la información de tu cuenta."
+msgstr "Permitir el acceso a la información de tu cuenta."
 
 #. TRANS: Header for user notification after revoking OAuth access to an application.
-#, fuzzy
 msgid "Authorization canceled."
-msgstr "Confirmación de mensajería instantánea cancelada."
+msgstr "Autorización cancelada"
 
 #. TRANS: User notification after revoking OAuth access to an application.
 #. TRANS: %s is an OAuth token.
@@ -787,21 +779,22 @@ msgid "The request token %s has been revoked."
 msgstr "El token de solicitud %2 ha sido denegado y revocado."
 
 #. TRANS: Title of the page notifying the user that an anonymous client application was successfully authorized to access the user's account with OAuth.
-#, fuzzy
 msgid "You have successfully authorized the application"
-msgstr "No estás autorizado."
+msgstr "Has autorizado satisfactoriamente la aplicación."
 
 #. TRANS: Message notifying the user that an anonymous client application was successfully authorized to access the user's account with OAuth.
 msgid ""
 "Please return to the application and enter the following security code to "
 "complete the process."
 msgstr ""
+"Por favor, vuelva a la aplicación e introduzca el siguiente código de "
+"seguridad para terminar el proceso."
 
 #. TRANS: Title of the page notifying the user that the client application was successfully authorized to access the user's account with OAuth.
 #. TRANS: %s is the authorised application name.
-#, fuzzy, php-format
+#, php-format
 msgid "You have successfully authorized %s"
-msgstr "No estás autorizado."
+msgstr "Has sido autorizado correctamente %s"
 
 #. TRANS: Message notifying the user that the client application was successfully authorized to access the user's account with OAuth.
 #. TRANS: %s is the authorised application name.
@@ -810,6 +803,8 @@ msgid ""
 "Please return to %s and enter the following security code to complete the "
 "process."
 msgstr ""
+"Por favor, regrese a %s e ingrese el siguiente código de seguridad para "
+"completar el proceso."
 
 #. TRANS: Client error displayed trying to delete a status not using POST or DELETE.
 #. TRANS: POST and DELETE should not be translated.
@@ -849,9 +844,9 @@ msgstr "Método de API no encontrado."
 
 #. 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 "Formato no soportado."
+msgstr "Formato no soportado: %s"
 
 #. TRANS: Client error displayed requesting a deleted status.
 msgid "Status deleted."
@@ -863,18 +858,17 @@ msgstr "No hay estado para ese ID"
 
 #. TRANS: Client error displayed when trying to delete a notice not using the Atom format.
 msgid "Can only delete using the Atom format."
-msgstr ""
+msgstr "Sólo se puede eliminar usando el formato Atom."
 
 #. TRANS: Client error displayed when a user has no rights to delete notices of other users.
 #. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
-#, fuzzy
 msgid "Cannot delete this notice."
 msgstr "No se puede eliminar este mensaje."
 
 #. TRANS: Confirmation of notice deletion in API. %d is the ID (number) of the deleted notice.
-#, fuzzy, php-format
+#, php-format
 msgid "Deleted notice %d"
-msgstr "Borrar mensaje"
+msgstr "Aviso eliminado %d"
 
 #. TRANS: Client error displayed when the parameter "status" is missing.
 msgid "Client must provide a 'status' parameter with a value."
@@ -882,11 +876,11 @@ msgstr "El cliente debe proveer un parámetro de 'status' con un valor."
 
 #. TRANS: Client error displayed when the parameter "status" is missing.
 #. TRANS: %d is the maximum number of character for a notice.
-#, fuzzy, php-format
+#, php-format
 msgid "That's too long. Maximum notice size is %d character."
 msgid_plural "That's too long. Maximum notice size is %d characters."
-msgstr[0] "El mensaje es muy largo. El tamaño máximo es de %d caracteres."
-msgstr[1] "El mensaje es muy largo. El tamaño máximo es de %d caracteres."
+msgstr[0] "Demasiado largo. El tamaño máximo es de %d caracteres."
+msgstr[1] "Demasiado largo. El tamaño máximo es de %d caracteres."
 
 #. TRANS: Client error displayed when replying to a non-existing notice.
 #, fuzzy
@@ -984,9 +978,8 @@ msgid "Updates tagged with %1$s on %2$s!"
 msgstr "Actualizaciones etiquetadas con %1$s en %2$s!"
 
 #. TRANS: Client error displayed trying to add a notice to another user's timeline.
-#, fuzzy
 msgid "Only the user can add to their own timeline."
-msgstr "Sólo el usuario puede leer sus bandejas de correo."
+msgstr "Sólo el usuario puede leer su línea de tiempo."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
 msgid "Only accept AtomPub for Atom feeds."
@@ -1006,7 +999,7 @@ msgstr "La publicación Atom debe ser una entrada Atom."
 
 #. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
 msgid "Can only handle POST activities."
-msgstr ""
+msgstr "Solo se puede gestionar las actividades en POST"
 
 #. TRANS: Client error displayed when using an unsupported activity object type.
 #. TRANS: %s is the unsupported activity object type.
@@ -1060,9 +1053,8 @@ msgid "Can only fave notices."
 msgstr "Sólo se pueden preferir los avisos."
 
 #. TRANS: Client exception thrown when trying favorite a notice without content.
-#, fuzzy
 msgid "Unknown notice."
-msgstr "Nota desconocida."
+msgstr "Aviso desconocido."
 
 #. TRANS: Client exception thrown when trying favorite an already favorited notice.
 msgid "Already a favorite."
@@ -1103,7 +1095,7 @@ msgstr "Todos los miembros"
 
 #. TRANS: Client exception thrown when trying to subscribe to group while blocked from that group.
 msgid "Blocked by admin."
-msgstr ""
+msgstr "Bloqueado por el administrador"
 
 #. TRANS: Client exception thrown when referencing a non-existing favorite.
 #, fuzzy
@@ -1180,11 +1172,11 @@ msgstr "Personas suscritas a %s"
 
 #. TRANS: Client error displayed when not using the follow verb.
 msgid "Can only handle Follow activities."
-msgstr ""
+msgstr "Sólo es posible gestionar las actividades que sigues"
 
 #. TRANS: Client exception thrown when subscribing to an object that is not a person.
 msgid "Can only follow people."
-msgstr ""
+msgstr "Sólo puede seguir personas"
 
 #. TRANS: Client exception thrown when subscribing to a non-existing profile.
 #. TRANS: %s is the unknown profile ID.
@@ -1194,9 +1186,9 @@ msgstr "Tipo de archivo desconocido"
 
 #. TRANS: Client error displayed trying to subscribe to an already subscribed profile.
 #. TRANS: %s is the profile the user already has a subscription on.
-#, fuzzy, php-format
+#, php-format
 msgid "Already subscribed to %s."
-msgstr "¡Ya te has suscrito!"
+msgstr "Ya está suscrito a %s"
 
 #. TRANS: Client error displayed trying to get a non-existing attachment.
 msgid "No such attachment."
@@ -1281,9 +1273,8 @@ msgid "No file uploaded."
 msgstr "Ningún archivo fue subido."
 
 #. TRANS: Avatar upload form instruction after uploading a file.
-#, fuzzy
 msgid "Pick a square area of the image to be your avatar."
-msgstr "Elige un área cuadrada para que sea tu imagen"
+msgstr "Selecciona un área de la imagen para que sea tu avatar."
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
 #. TRANS: Server error displayed trying to crop an uploaded group logo that is no longer present.
@@ -1305,12 +1296,13 @@ msgstr "Imagen borrada."
 #. TRANS: Title for backup account page.
 #. TRANS: Option in profile settings to create a backup of the account of the currently logged in user.
 msgid "Backup account"
-msgstr ""
+msgstr "Cuenta de respaldo (backup)"
 
 #. TRANS: Client exception thrown when trying to backup an account while not logged in.
-#, fuzzy
 msgid "Only logged-in users can backup their account."
-msgstr "Sólo los usuarios que hayan accedido pueden repetir mensajes."
+msgstr ""
+"Sólo los usuarios que hayan accedido pueden hacer una copia de seguridad "
+"(backup) de sus cuentas."
 
 #. TRANS: Client exception thrown when trying to backup an account without having backup rights.
 msgid "You may not backup your account."
@@ -1333,7 +1325,7 @@ msgstr "Fondo"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
 msgid "Backup your account."
-msgstr ""
+msgstr "Hacer una copia de seguridad de su cuenta"
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
 msgid "You already blocked that user."
@@ -1366,7 +1358,6 @@ msgid "No"
 msgstr "No"
 
 #. TRANS: Submit button title for 'No' when blocking a user.
-#, fuzzy
 msgid "Do not block this user."
 msgstr "No bloquear a este usuario"
 
@@ -1411,7 +1402,6 @@ msgid "Unblock user from group"
 msgstr "Desbloquear usuario de grupo"
 
 #. TRANS: Button text for unblocking a user from a group.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Unblock"
 msgstr "Desbloquear"
@@ -1635,9 +1625,8 @@ msgid "Do not delete this group."
 msgstr "No eliminar este grupo"
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
-#, fuzzy
 msgid "Delete this group."
-msgstr "Borrar este grupo"
+msgstr "Eliminar este grupo."
 
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
 #. TRANS: Client error displayed when trying to remove a favorite while not logged in.
@@ -1675,14 +1664,12 @@ msgid "Are you sure you want to delete this notice?"
 msgstr "¿Estás seguro de que quieres eliminar este aviso?"
 
 #. TRANS: Submit button title for 'No' when deleting a notice.
-#, fuzzy
 msgid "Do not delete this notice."
-msgstr "No eliminar este mensaje"
+msgstr "No eliminar este mensaje."
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#, fuzzy
 msgid "Delete this notice."
-msgstr "Borrar este mensaje"
+msgstr "Eliminar este mensaje"
 
 #. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
 msgid "You cannot delete users."
@@ -2054,6 +2041,8 @@ msgid ""
 "To send notices via email, we need to create a unique email address for you "
 "on this server:"
 msgstr ""
+"Para enviar avisos vía correo electrónico, necesitamos crear una dirección "
+"de correo electrónico exclusiva para usted en este servidor."
 
 #. TRANS: Button label for adding an e-mail address to send notices from.
 #. TRANS: Button label for adding an SMS e-mail address to send notices from.
@@ -2493,7 +2482,7 @@ msgstr "Bloquear"
 #. TRANS: Submit button title.
 msgctxt "TOOLTIP"
 msgid "Block this user"
-msgstr ""
+msgstr "Bloquear a este usuario"
 
 #. TRANS: Form legend for form to make a user a group admin.
 msgid "Make user an admin of the group"
@@ -2515,7 +2504,6 @@ msgid "Updates from members of %1$s on %2$s!"
 msgstr "¡Actualizaciones de miembros de %1$s en %2$s!"
 
 #. TRANS: Title for first page of the groups list.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Groups"
 msgstr "Grupos"
@@ -2569,13 +2557,13 @@ msgstr "No se obtuvo resultados."
 
 #. TRANS: Additional text on page where groups can be searched if no results were found for a query for a logged in user.
 #. TRANS: This message contains Markdown links in the form [link text](link).
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "If you cannot find the group you're looking for, you can [create it](%%"
 "action.newgroup%%) yourself."
 msgstr ""
-"Si no puedes encontrar el grupo que estás buscando, puedes [crearlo](%%"
-"action.newgroup%%) tú mismo."
+"Si no encuentras el grupo que estás buscando, puedes [crearlo](%%action."
+"newgroup%%) tú mismo."
 
 #. TRANS: Additional text on page where groups can be searched if no results were found for a query for a not logged in user.
 #. TRANS: This message contains Markdown links in the form [link text](link).
@@ -2607,32 +2595,31 @@ msgstr "Configuración de mensajería instantánea"
 #. 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 [instant messages]"
 "(%%doc.im%%). Configure your addresses and settings below."
 msgstr ""
-"Puedes enviar y recibir avisos vía [mensajes instantáneos](%%doc.im%%) de "
+"Puedes enviar y recibir mensajes vía [mensajería instantána](%%doc.im%%) de "
 "Jabber/GTalk. Configura tu dirección y opciones abajo."
 
 #. TRANS: Message given in the IM settings if IM is not enabled on the site.
 msgid "IM is not available."
 msgstr "La mensajería instantánea no está disponible."
 
-#, fuzzy, php-format
+#, php-format
 msgid "Current confirmed %s address."
-msgstr "Actual dirección de correo electrónico confirmada"
+msgstr "Actual dirección de correo electrónico %s confirmada"
 
 #. TRANS: Form note in IM settings form.
 #. TRANS: %s is the IM address set for the site.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your %s account for a message "
 "with further instructions. (Did you add %s to your buddy list?)"
 msgstr ""
-"A la espera de una confirmación para esta dirección. Busca en tu cuenta "
-"Jabber/GTalk un mensaje con más instrucciones. (¿Has añadido a %s a tu lista "
-"de amigos?)"
+"Esperando confirmación para esta dirección. Revisa tu cuenta Jabber/GTalk un "
+"mensaje con más instrucciones. (¿Has añadido a %s a tu lista de amigos?)"
 
 msgid "IM address"
 msgstr "Dirección de mensajería instantánea"
@@ -2766,14 +2753,13 @@ msgstr "Debes estar conectado para invitar otros usuarios a usar %s."
 
 #. TRANS: Form validation message when providing an e-mail address that does not validate.
 #. TRANS: %s is an invalid e-mail address.
-#, fuzzy, php-format
+#, php-format
 msgid "Invalid email address: %s."
 msgstr "Dirección de correo electrónico inválida: %s"
 
 #. TRANS: Page title when invitations have been sent.
-#, fuzzy
 msgid "Invitations sent"
-msgstr "Invitacion(es) enviada(s)"
+msgstr "Invitación(es) enviada(s)"
 
 #. TRANS: Page title when inviting potential users.
 msgid "Invite new users"
@@ -2955,11 +2941,11 @@ msgstr "Licencia"
 
 #. TRANS: Form instructions for the site license admin panel.
 msgid "License for this StatusNet site"
-msgstr ""
+msgstr "Licencia para este sitio de StatusNet"
 
 #. TRANS: Client error displayed selecting an invalid license in the license admin panel.
 msgid "Invalid license selection."
-msgstr ""
+msgstr "Selección de licencia incorrecta"
 
 #. TRANS: Client error displayed when not specifying an owner for the all rights reserved license in the license admin panel.
 msgid ""
@@ -2990,7 +2976,7 @@ msgstr ""
 
 #. TRANS: Form legend in the license admin panel.
 msgid "License selection"
-msgstr ""
+msgstr "Selección de Licencia"
 
 #. TRANS: License option in the license admin panel.
 msgid "Private"
@@ -2998,11 +2984,11 @@ msgstr "Privado"
 
 #. TRANS: License option in the license admin panel.
 msgid "All Rights Reserved"
-msgstr ""
+msgstr "Todos los derechos reservados"
 
 #. TRANS: License option in the license admin panel.
 msgid "Creative Commons"
-msgstr ""
+msgstr "Creative Commons"
 
 #. TRANS: Dropdown field label in the license admin panel.
 msgid "Type"
@@ -3015,11 +3001,11 @@ msgstr "Seleccione un operador móvil"
 
 #. TRANS: Form legend in the license admin panel.
 msgid "License details"
-msgstr ""
+msgstr "Detalles de la licencia"
 
 #. TRANS: Field label in the license admin panel.
 msgid "Owner"
-msgstr ""
+msgstr "Propietario"
 
 #. TRANS: Field title in the license admin panel.
 msgid "Name of the owner of the site's content (if applicable)."
@@ -3087,10 +3073,9 @@ msgstr ""
 "compartidos! "
 
 #. TRANS: Button text for log in on login page.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Login"
-msgstr "Inicio de sesión"
+msgstr "Iniciar sesión"
 
 #. TRANS: Link text for link to "reset password" on login page.
 msgid "Lost or forgotten password?"
@@ -3456,7 +3441,6 @@ msgstr ""
 "Ésta es tu bandeja de salida, incluye la lista de mensajes privados enviados."
 
 #. TRANS: Title for page where to change password.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Change password"
 msgstr "Cambiar contraseña"
@@ -3480,24 +3464,20 @@ msgid "New password"
 msgstr "Nueva contraseña"
 
 #. TRANS: Field title on page where to change password.
-#, fuzzy
 msgid "6 or more characters."
-msgstr "6 o más caracteres"
+msgstr "6 o más caracteres."
 
 #. TRANS: Field label on page where to change password. In this field the new password should be typed a second time.
-#, fuzzy
 msgctxt "LABEL"
 msgid "Confirm"
 msgstr "Confirmar"
 
 #. TRANS: Field title on page where to change password.
 #. TRANS: Ttile for field label for password reset form where the password has to be typed again.
-#, fuzzy
 msgid "Same as password above."
-msgstr "Igual a la contraseña de arriba"
+msgstr "Igual a la contraseña de arriba."
 
 #. TRANS: Button text on page where to change password.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Change"
 msgstr "Cambiar"
@@ -3510,7 +3490,6 @@ msgid "Passwords don't match."
 msgstr "Las contraseñas no coinciden"
 
 #. TRANS: Form validation error on page where to change password.
-#, fuzzy
 msgid "Incorrect old password."
 msgstr "Contraseña antigua incorrecta."
 
@@ -3521,7 +3500,6 @@ msgstr "Error al guardar el usuario; inválido."
 #. TRANS: Server error displayed on page where to change password when password change
 #. TRANS: could not be made because of a server error.
 #. TRANS: Reset password form validation error message.
-#, fuzzy
 msgid "Cannot save new password."
 msgstr "No se puede guardar la nueva contraseña."
 
@@ -3608,7 +3586,6 @@ msgid "Use fancy URLs (more readable and memorable)?"
 msgstr "¿Usar URL amigables (más legibles y memorizables)?"
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "Theme"
 msgstr "Tema"
@@ -3716,9 +3693,8 @@ msgid "Server for attachments."
 msgstr "Tema para el sitio."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#, fuzzy
 msgid "Web path to attachments."
-msgstr "Sin archivo adjunto"
+msgstr "Ruta de acceso a los adjuntos"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
 #, fuzzy
@@ -3735,7 +3711,6 @@ msgid "Directory where attachments are located."
 msgstr "Ruta del directorio de las configuraciones locales"
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "SSL"
 msgstr "SSL"
@@ -3756,14 +3731,12 @@ msgid "Use SSL"
 msgstr "Usar SSL"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#, fuzzy
 msgid "When to use SSL."
-msgstr "Cuándo utilizar SSL"
+msgstr "Cuándo utilizar SSL."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#, fuzzy
 msgid "Server to direct SSL requests to."
-msgstr "Servidor hacia el cual dirigir las solicitudes SSL"
+msgstr "Servidor hacia el cual dirigir las solicitudes SSL."
 
 #. TRANS: Button title text to store form data in the Paths admin panel.
 msgid "Save paths"
@@ -3798,7 +3771,7 @@ msgstr "Usuarios auto etiquetados con %1$s - página %2$d"
 #. TRANS: Page title for AJAX form return when a disabling a plugin.
 msgctxt "plugin"
 msgid "Disabled"
-msgstr ""
+msgstr "Deshabilitado"
 
 #. TRANS: Client error displayed when trying to use another method than POST.
 #. TRANS: Do not translate POST.
@@ -3808,25 +3781,22 @@ msgid "This action only accepts POST requests."
 msgstr "Esta acción sólo acepta solicitudes POST."
 
 #. TRANS: Client error displayed when trying to enable or disable a plugin without access rights.
-#, fuzzy
 msgid "You cannot administer plugins."
-msgstr "No puedes borrar usuarios."
+msgstr "Usted no puede administrar los plugins."
 
 #. TRANS: Client error displayed when trying to enable or disable a non-existing plugin.
-#, fuzzy
 msgid "No such plugin."
-msgstr "No existe tal página."
+msgstr "El plugin no existe."
 
 #. TRANS: Page title for AJAX form return when enabling a plugin.
 msgctxt "plugin"
 msgid "Enabled"
-msgstr ""
+msgstr "Habilitado"
 
 #. TRANS: Tab and title for plugins admin panel.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Plugins"
-msgstr "Complementos"
+msgstr "Plugins"
 
 #. TRANS: Instructions at top of plugin admin page.
 msgid ""
@@ -4006,9 +3976,8 @@ msgstr "Se guardó configuración."
 
 #. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
 #. TRANS: Page title for page where a user account can be restored from backup.
-#, fuzzy
 msgid "Restore account"
-msgstr "Crear una cuenta"
+msgstr "Restaurar cuenta"
 
 #. TRANS: Client error displayed when requesting a public timeline page beyond the page limit.
 #. TRANS: %s is the page limit.
@@ -4101,9 +4070,9 @@ msgstr "Nube de etiquetas pública"
 
 #. TRANS: Instructions (more used like an explanation/header).
 #. TRANS: %s is the StatusNet sitename.
-#, fuzzy, php-format
+#, php-format
 msgid "These are most popular recent tags on %s"
-msgstr "Estas son las etiquetas recientes más populares en %s "
+msgstr "Estas son las etiquetas recientes más populares en %s"
 
 #. TRANS: This message contains a Markdown URL. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
@@ -4193,7 +4162,6 @@ msgid "Recover"
 msgstr "Recuperar"
 
 #. TRANS: Button text on password recovery page.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Recover"
 msgstr "Recuperar"
@@ -4212,22 +4180,19 @@ msgid "Password recovery requested"
 msgstr "Recuperación de contraseña solicitada"
 
 #. TRANS: Title for password recovery page in password saved mode.
-#, fuzzy
 msgid "Password saved"
-msgstr "Se guardó la contraseña."
+msgstr "Contraseña guardada."
 
 #. TRANS: Title for password recovery page when an unknown action has been specified.
 msgid "Unknown action"
 msgstr "Acción desconocida"
 
 #. TRANS: Title for field label for password reset form.
-#, fuzzy
 msgid "6 or more characters, and do not forget it!"
-msgstr "6 o más caracteres, ¡no te olvides!"
+msgstr "6 o más caracteres, ¡y no la olvides!"
 
 #. TRANS: Button text for password reset form.
 #. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Reset"
 msgstr "Restablecer"
@@ -4261,7 +4226,6 @@ msgid "Unexpected password reset."
 msgstr "Restablecimiento de contraseña inesperado."
 
 #. TRANS: Reset password form validation error message.
-#, fuzzy
 msgid "Password must be 6 characters or more."
 msgstr "La contraseña debe tener 6 o más caracteres."
 
@@ -4281,9 +4245,9 @@ msgstr "Nueva contraseña guardada correctamente. Has iniciado una sesión."
 msgid "No id parameter"
 msgstr "No existe argumento de ID."
 
-#, fuzzy, php-format
+#, php-format
 msgid "No such file \"%d\""
-msgstr "No existe tal archivo."
+msgstr "No existe el archivo %d"
 
 msgid "Sorry, only invited people can register."
 msgstr "Disculpa, sólo personas invitadas pueden registrarse."
@@ -4300,7 +4264,6 @@ msgstr "Registrarse"
 msgid "Registration not allowed."
 msgstr "Registro de usuario no permitido."
 
-#, fuzzy
 msgid "You cannot register if you don't agree to the license."
 msgstr "No puedes registrarte si no estás de acuerdo con la licencia."
 
@@ -4310,27 +4273,23 @@ msgstr "La dirección de correo electrónico ya existe."
 msgid "Invalid username or password."
 msgstr "Usuario o contraseña inválidos."
 
-#, fuzzy
 msgid ""
 "With this form you can create a new account. You can then post notices and "
 "link up to friends and colleagues."
 msgstr ""
 "Con este formulario puedes crear una nueva cuenta. Después podrás publicar "
-"avisos y enviar vínculos de ellos a tus amigos y colegas. "
+"mensajes y enviar vínculos de ellos a tus amigos y colegas."
 
 msgid "Email"
 msgstr "Correo electrónico"
 
-#, fuzzy
 msgid "Used only for updates, announcements, and password recovery."
 msgstr ""
-"Se usa sólo para actualizaciones, anuncios y recuperación de contraseñas"
+"Sólo se usa para actualizaciones, anuncios y recuperación de contraseñas"
 
-#, fuzzy
 msgid "Longer name, preferably your \"real\" name."
-msgstr "Nombre más largo, preferiblemente tu nombre \"real\""
+msgstr "Nombre largo, preferiblemente tu nombre \"real\""
 
-#, fuzzy
 msgid "Where you are, like \"City, State (or Region), Country\"."
 msgstr "Dónde estás, por ejemplo \"Ciudad, Estado (o Región), País\""
 
@@ -4422,7 +4381,6 @@ msgstr "Suscribirse a un usuario remoto"
 msgid "User nickname"
 msgstr "Usuario"
 
-#, fuzzy
 msgid "Nickname of the user you want to follow."
 msgstr "Usuario a quien quieres seguir"
 
@@ -4597,9 +4555,8 @@ msgid ""
 msgstr ""
 
 #. TRANS: Title for submit button to confirm upload of a user backup file for account restore.
-#, fuzzy
 msgid "Upload the file"
-msgstr "Subir archivo"
+msgstr "Subir el archivo"
 
 msgid "You cannot revoke user roles on this site."
 msgstr "No puedes revocar funciones de usuario en este sitio."
@@ -4746,18 +4703,6 @@ msgstr "Grupo %s"
 msgid "%1$s group, page %2$d"
 msgstr "grupo %1$s, página %2$d"
 
-#. TRANS: Label for group description or group note (dt). Text hidden by default.
-msgid "Note"
-msgstr "Nota"
-
-#. TRANS: Label for group aliases (dt). Text hidden by default.
-msgid "Aliases"
-msgstr "Alias"
-
-#. TRANS: Group actions header (h2). Text hidden by default.
-msgid "Group actions"
-msgstr "Acciones del grupo"
-
 #. TRANS: Tooltip for feed link. %s is a group nickname.
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
@@ -4798,7 +4743,6 @@ msgstr "Todos los miembros"
 msgid "Statistics"
 msgstr "Estadísticas"
 
-#, fuzzy
 msgctxt "LABEL"
 msgid "Created"
 msgstr "Creado"
@@ -4869,6 +4813,10 @@ msgstr "Mensaje de %1$s en %2$s"
 msgid "Notice deleted."
 msgstr "Mensaje borrado"
 
+#, fuzzy
+msgid "Notice"
+msgstr "Mensajes"
+
 #. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
 #, fuzzy, php-format
 msgid "%1$s tagged %2$s"
@@ -5212,9 +5160,8 @@ msgstr ""
 "informarnos al %s."
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
-#, fuzzy
 msgid "No code entered."
-msgstr "No ingresó código"
+msgstr "No ingresó el código"
 
 #. TRANS: Menu item for site administration
 msgid "Snapshots"
@@ -5300,13 +5247,12 @@ msgid "These are the people who listen to %s's notices."
 msgstr "Estas son las personas que escuchan los avisos de %s."
 
 #. TRANS: Subscriber list text when the logged in user has no subscribers.
-#, fuzzy
 msgid ""
 "You have no subscribers. Try subscribing to people you know and they might "
 "return the favor."
 msgstr ""
 "No tienes suscriptores. Intenta suscribirte a gente que conozcas y puede que "
-"te devuelvan el favor"
+"te devuelvan el favor."
 
 #. TRANS: Subscriber list text when looking at the subscribers for a of a user other
 #. TRANS: than the logged in user that has no subscribers. %s is the user nickname.
@@ -5409,7 +5355,6 @@ msgstr "No existe argumento de ID."
 msgid "Tag %s"
 msgstr "%s etiqueta"
 
-#. TRANS: H2 for user profile information.
 msgid "User profile"
 msgstr "Perfil de usuario"
 
@@ -5610,26 +5555,22 @@ msgstr ""
 "haz clic en \"Cancelar\"."
 
 #. TRANS: Button text on Authorise Subscription page.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Accept"
 msgstr "Aceptar"
 
 #. TRANS: Title for button on Authorise Subscription page.
-#, fuzzy
 msgid "Subscribe to this user."
-msgstr "Suscribirse a este usuario"
+msgstr "Suscribirse a este usuario."
 
 #. TRANS: Button text on Authorise Subscription page.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Reject"
 msgstr "Rechazar"
 
 #. TRANS: Title for button on Authorise Subscription page.
-#, fuzzy
 msgid "Reject this subscription."
-msgstr "Rechazar esta suscripción"
+msgstr "Rechazar esta suscripción."
 
 #. TRANS: Client error displayed for an empty authorisation request.
 msgid "No authorization request!"
@@ -6133,6 +6074,49 @@ msgstr ""
 msgid "No AtomPub API service for %s."
 msgstr ""
 
+#. TRANS: H2 for user actions in a profile.
+#. TRANS: H2 for entity actions in a profile.
+msgid "User actions"
+msgstr "Acciones de usuario"
+
+#. TRANS: Text shown in user profile of not yet compeltely deleted users.
+msgid "User deletion in progress..."
+msgstr "Eliminación de usuario en curso..."
+
+#. TRANS: Link title for link on user profile.
+msgid "Edit profile settings"
+msgstr "Editar configuración del perfil"
+
+#. TRANS: Link text for link on user profile.
+msgid "Edit"
+msgstr "Editar"
+
+#. TRANS: Link title for link on user profile.
+msgid "Send a direct message to this user"
+msgstr "Enviar un mensaje directo a este usuario"
+
+#. TRANS: Link text for link on user profile.
+msgid "Message"
+msgstr "Mensaje"
+
+#. TRANS: Label text on user profile to select a user role.
+msgid "Moderate"
+msgstr "Moderar"
+
+#. TRANS: Label text on user profile to select a user role.
+msgid "User role"
+msgstr "Rol de usuario"
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Administrator"
+msgstr "Administrador"
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Moderator"
+msgstr "Moderador"
+
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
 #, php-format
 msgid "%1$s - %2$s"
@@ -6145,10 +6129,9 @@ msgstr "Página sin título"
 #. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.
 msgctxt "TOOLTIP"
 msgid "Show more"
-msgstr ""
+msgstr "Ver más"
 
 #. TRANS: Inline reply form submit button: submits a reply comment.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Reply"
 msgstr "Responder"
@@ -6157,9 +6140,8 @@ msgstr "Responder"
 msgid "Write a reply..."
 msgstr ""
 
-#, fuzzy
 msgid "Status"
-msgstr "StatusNet"
+msgstr "Estado"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #. TRANS: Text between [] is a link description, text between () is the link itself.
@@ -6283,9 +6265,9 @@ msgstr ""
 msgid "No content for notice %s."
 msgstr "Buscar en el contenido de mensajes"
 
-#, fuzzy, php-format
+#, php-format
 msgid "No such user %s."
-msgstr "No existe ese usuario."
+msgstr "Este usuario no existe %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.
@@ -6293,10 +6275,10 @@ msgstr "No existe ese usuario."
 #. TRANS: %1$s is a URL, %2$s is the status, %s$s is the fail reason.
 #. TRANS: Exception thrown when post to collection fails with a status that is not handled.
 #. TRANS: %1$s is a URL, %2$s is the status, %s$s is the fail reason.
-#, fuzzy, php-format
+#, php-format
 msgctxt "URLSTATUSREASON"
 msgid "%1$s %2$s %3$s"
-msgstr "%1$s - %2$s"
+msgstr "%1$s %2$s %3$s"
 
 #. TRANS: Client exception thrown when there is no source attribute.
 msgid "Can't handle remote content yet."
@@ -6390,9 +6372,8 @@ msgid "Set site license"
 msgstr ""
 
 #. TRANS: Menu item title/tooltip
-#, fuzzy
 msgid "Plugins configuration"
-msgstr "Configuración de rutas"
+msgstr "Configuración de plugins"
 
 #. TRANS: Client error 401.
 msgid "API resource requires read-write access, but you only have read access."
@@ -6421,9 +6402,8 @@ msgid "Could not authenticate you."
 msgstr "No ha sido posible autenticarte."
 
 #. TRANS: Server error displayed when trying to create an anynymous OAuth consumer.
-#, fuzzy
 msgid "Could not create anonymous consumer."
-msgstr "No fue posible crear alias."
+msgstr "No fue posible crear usuario anónimo."
 
 #. TRANS: Server error displayed when trying to create an anynymous OAuth application.
 #, fuzzy
@@ -6529,7 +6509,7 @@ msgid "Cancel"
 msgstr "Cancelar"
 
 msgid " by "
-msgstr ""
+msgstr "por "
 
 #. TRANS: Application access type
 msgid "read-write"
@@ -6577,9 +6557,8 @@ msgid "Password changing failed."
 msgstr "El cambio de contraseña ha fallado"
 
 #. TRANS: Exception thrown when a password change attempt fails because it is not allowed.
-#, fuzzy
 msgid "Password changing is not allowed."
-msgstr "No está permitido cambiar la contraseña"
+msgstr "El cambio de contraseña no está permitido"
 
 #. TRANS: Title for the form to block a user.
 msgid "Block"
@@ -6866,85 +6845,172 @@ msgid_plural "You are a member of these groups:"
 msgstr[0] "Eres miembro de este grupo:"
 msgstr[1] "Eres miembro de estos grupos:"
 
-#. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-msgid ""
-"Commands:\n"
-"on - turn on notifications\n"
-"off - turn off notifications\n"
-"help - show this help\n"
-"follow <nickname> - subscribe to user\n"
-"groups - lists the groups you have joined\n"
-"subscriptions - list the people you follow\n"
-"subscribers - list the people that follow you\n"
-"leave <nickname> - unsubscribe from user\n"
-"d <nickname> <text> - direct message to user\n"
-"get <nickname> - get last notice from user\n"
-"whois <nickname> - get profile info on user\n"
-"lose <nickname> - force user to stop following you\n"
-"fav <nickname> - add user's last notice as a 'fave'\n"
-"fav #<notice_id> - add notice with the given id as a 'fave'\n"
-"repeat #<notice_id> - repeat a notice with a given id\n"
-"repeat <nickname> - repeat the last notice from user\n"
-"reply #<notice_id> - reply to notice with a given id\n"
-"reply <nickname> - reply to the last notice from user\n"
-"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
-"drop <group> - leave group\n"
-"stats - get your stats\n"
-"stop - same as 'off'\n"
-"quit - same as 'off'\n"
-"sub <nickname> - same as 'follow'\n"
-"unsub <nickname> - same as 'leave'\n"
-"last <nickname> - same as 'get'\n"
-"on <nickname> - not yet implemented.\n"
-"off <nickname> - not yet implemented.\n"
-"nudge <nickname> - remind a user to update.\n"
-"invite <phone number> - not yet implemented.\n"
-"track <word> - not yet implemented.\n"
-"untrack <word> - not yet implemented.\n"
-"track off - not yet implemented.\n"
-"untrack all - not yet implemented.\n"
-"tracks - not yet implemented.\n"
-"tracking - not yet implemented.\n"
+#. TRANS: Header line of help text for commands.
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "Commands:"
+msgstr "Resultados de comando"
+
+#. TRANS: Help message for IM/SMS command "on"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "turn on notifications"
+msgstr "No se puede activar notificación."
+
+#. TRANS: Help message for IM/SMS command "off"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "turn off notifications"
+msgstr "No se puede desactivar notificación."
+
+#. TRANS: Help message for IM/SMS command "help"
+msgctxt "COMMANDHELP"
+msgid "show this help"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "follow <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "subscribe to user"
+msgstr "Suscribirse a este usuario"
+
+#. TRANS: Help message for IM/SMS command "groups"
+msgctxt "COMMANDHELP"
+msgid "lists the groups you have joined"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscriptions"
+msgctxt "COMMANDHELP"
+msgid "list the people you follow"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscribers"
+msgctxt "COMMANDHELP"
+msgid "list the people that follow you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "leave <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "unsubscribe from user"
+msgstr "Desuscribirse de este usuario"
+
+#. TRANS: Help message for IM/SMS command "d <nickname> <text>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "direct message to user"
+msgstr "Mensajes directos a %s"
+
+#. TRANS: Help message for IM/SMS command "get <nickname>"
+msgctxt "COMMANDHELP"
+msgid "get last notice from user"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "whois <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "get profile info on user"
+msgstr "Información del perfil"
+
+#. TRANS: Help message for IM/SMS command "lose <nickname>"
+msgctxt "COMMANDHELP"
+msgid "force user to stop following you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav <nickname>"
+msgctxt "COMMANDHELP"
+msgid "add user's last notice as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "add notice with the given id as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "repeat a notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "repeat the last notice from user"
+msgstr "Repetir este mensaje."
+
+#. TRANS: Help message for IM/SMS command "reply #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "reply to notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "reply <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "reply to the last notice from user"
+msgstr "Responder a este mensaje."
+
+#. TRANS: Help message for IM/SMS command "join <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "join group"
+msgstr "Desconocido"
+
+#. TRANS: Help message for IM/SMS command "login"
+msgctxt "COMMANDHELP"
+msgid "Get a link to login to the web interface"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "drop <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "leave group"
+msgstr "Borrar grupo"
+
+#. TRANS: Help message for IM/SMS command "stats"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "get your stats"
+msgstr "Actualiza tu estado."
+
+#. TRANS: Help message for IM/SMS command "stop"
+#. TRANS: Help message for IM/SMS command "quit"
+msgctxt "COMMANDHELP"
+msgid "same as 'off'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "sub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'follow'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "unsub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'leave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "last <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'get'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "on <nickname>"
+#. TRANS: Help message for IM/SMS command "off <nickname>"
+#. TRANS: Help message for IM/SMS command "invite <phone number>"
+#. TRANS: Help message for IM/SMS command "track <word>"
+#. TRANS: Help message for IM/SMS command "untrack <word>"
+#. TRANS: Help message for IM/SMS command "track off"
+#. TRANS: Help message for IM/SMS command "untrack all"
+#. TRANS: Help message for IM/SMS command "tracks"
+#. TRANS: Help message for IM/SMS command "tracking"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "not yet implemented."
+msgstr "Todavía no se implementa comando."
+
+#. TRANS: Help message for IM/SMS command "nudge <nickname>"
+msgctxt "COMMANDHELP"
+msgid "remind a user to update."
 msgstr ""
-"comandos:\n"
-"on - activar notificaciones\n"
-"off - desactivar notificaciones\n"
-"help - mostrar esta ayuda\n"
-"follow <usuario> - suscribirse al usuario\n"
-"groups - listar los grupos que sigues\n"
-"subscriptions - listar las personas que sigues\n"
-"subscribers - listar los grupos que te siguen\n"
-"leave <usuario> - cancelar la suscripción al usuario\n"
-"d <usuario> <text> - dirigir mensaje al usuario\n"
-"get <usuario> - obtener último aviso del usuario\n"
-"whois <usuario> - obtener información del perfil del usuario\n"
-"lose <usuario> - obligar al usuario a que deje de seguirte\n"
-"fav <usuario> - añadir el último aviso del usario a tus favoritos\n"
-"fav #<id_aviso> - añadir el aviso con el ID dado a tus favoritos\n"
-"repeat #<id_aviso> - repetir el aviso con el ID dado\n"
-"repeat <usuario> - repetir el último aviso del usuario\n"
-"reply #<id_aviso> - responder al aviso del ID dado\n"
-"reply <usuario> - responder al último aviso del usuario\n"
-"join <grupo> - unirse a un grupo\n"
-"login - obtener un vínculo para iniciar sesión en la interfaz Web\n"
-"drop <grupo> - abandonar el grupo\n"
-"stats - obtener tus estadísticas\n"
-"stop - igual que 'desactivar'\n"
-"quit - igual que 'desactivar'\n"
-"sub <usuario> - igual que 'seguir'\n"
-"unsub <usuario> - igual que 'abandonar'\n"
-"last <usuario> - igual que 'obtener'\n"
-"on <usuario> - aún sin implementar.\n"
-"off <usuario> - aún sin implementar.\n"
-"nudge <usuario> - recordarle a un ausuario que actualice.\n"
-"invite <phone number> - aún sin implementar.\n"
-"track <word> - aún sin implementar.\n"
-"untrack <word> - aún sin implementar.\n"
-"track off - aún sin implementar.\n"
-"untrack all - aún sin implementar.\n"
-"tracks - aún sin implementar.\n"
-"tracking - aún sin implementar.\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #, fuzzy
@@ -7010,13 +7076,11 @@ msgstr ""
 "permitido es 2 MB."
 
 #. TRANS: Radio button on profile design page that will enable use of the uploaded profile image.
-#, fuzzy
 msgctxt "RADIO"
 msgid "On"
 msgstr "Activar"
 
 #. TRANS: Radio button on profile design page that will disable use of the uploaded profile image.
-#, fuzzy
 msgctxt "RADIO"
 msgid "Off"
 msgstr "Desactivar"
@@ -7085,7 +7149,7 @@ msgstr ""
 
 #. TRANS: Header for feed links (h2).
 msgid "Feeds"
-msgstr ""
+msgstr "Feeds"
 
 msgid "All"
 msgstr "Todo"
@@ -7130,6 +7194,9 @@ msgstr ""
 "Ubicación del grupo, si existe, por ejemplo \"Ciudad, Estado (o Región), País"
 "\""
 
+msgid "Aliases"
+msgstr "Alias"
+
 #, fuzzy, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -7209,6 +7276,10 @@ msgctxt "TOOLTIP"
 msgid "Add or edit %s design"
 msgstr "Añadir o modificar el diseño %s"
 
+#. TRANS: Group actions header (h2). Text hidden by default.
+msgid "Group actions"
+msgstr "Acciones del grupo"
+
 #. TRANS: Title for groups with the most members section.
 msgid "Groups with most members"
 msgstr "Grupos con mayor cantidad de miembros"
@@ -7320,7 +7391,7 @@ msgstr "Confirmación de correo electrónico"
 #. TRANS: Body for address confirmation email.
 #. TRANS: %1$s is the addressed user's nickname, %2$s is the StatusNet sitename,
 #. TRANS: %3$s is the URL to confirm at.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Hey, %1$s.\n"
 "\n"
@@ -7335,19 +7406,19 @@ msgid ""
 "Thanks for your time, \n"
 "%2$s\n"
 msgstr ""
-"¡Hola, %s!\n"
+"Hola, %1$s !\n"
 "\n"
-"Hace un momento, alguien introdujo esta dirección de correo electrónico en %"
-"s.\n"
+"Hace un momento, alguien introdujo esta dirección de correo electrónico en %2"
+"$s.\n"
 "\n"
-"Si has sido tú y deseas confirmarlo, haz clic en el vínculo de abajo:\n"
+"Si fuiste tú y deseas confirmarlo, haz clic en el vínculo de abajo:\n"
 "\n"
-"%s\n"
+"%3$s\n"
 "\n"
 "Si no, simplemente ignora este mensaje.\n"
 "\n"
 "Gracias por tu tiempo, \n"
-"%s\n"
+"%2$s\n"
 
 #. TRANS: Subject of new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
@@ -7371,7 +7442,7 @@ msgstr ""
 #. TRANS: %3$s is the subscriber's profile URL, %4$s is the subscriber's location (or empty)
 #. TRANS: %5$s is the subscriber's homepage URL (or empty), %6%s is the subscriber's bio (or empty)
 #. TRANS: %7$s is a link to the addressed user's e-mail settings.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
 "\n"
@@ -7395,7 +7466,7 @@ msgstr ""
 "%7$s.\n"
 "\n"
 "----\n"
-"Cambia tus preferencias de notificaciones a tu correo electrónico en  %8$s\n"
+"Cambia tu correo electrónico o las opciones de notificación en  %7$s\n"
 
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is biographical information.
@@ -7450,7 +7521,7 @@ msgstr "%s: Confirma que este es tu número de teléfono mediante este código:"
 
 #. TRANS: Subject for 'nudge' notification email.
 #. TRANS: %s is the nudging user.
-#, fuzzy, php-format
+#, php-format
 msgid "You have been nudged by %s"
 msgstr "%s te ha dado un toque"
 
@@ -7527,9 +7598,9 @@ msgstr ""
 
 #. TRANS: Subject for favorite notification e-mail.
 #. TRANS: %1$s is the adding user's long name, %2$s is the adding user's nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s (@%2$s) added your notice as a favorite"
-msgstr "%s (@%s) agregó tu mensaje a los favoritos"
+msgstr "%1$s (@%2$s) agregó tu mensaje como favorito."
 
 #. TRANS: Body for favorite notification e-mail.
 #. TRANS: %1$s is the adding user's long name, $2$s is the date the notice was created,
@@ -7585,9 +7656,9 @@ msgstr ""
 
 #. TRANS: E-mail subject for notice notification.
 #. TRANS: %1$s is the sending user's long name, %2$s is the adding user's nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s (@%2$s) sent a notice to your attention"
-msgstr "%s (@%s) ha enviado un aviso a tu atención"
+msgstr "%1$s (@%2$s) ha enviado un aviso para tu atención"
 
 #. TRANS: Body of @-reply notification e-mail.
 #. TRANS: %1$s is the sending user's long name, $2$s is the StatusNet sitename,
@@ -7729,9 +7800,8 @@ msgid "Select recipient:"
 msgstr "Seleccione un operador móvil"
 
 #. TRANS Entry in drop-down selection box in direct-message inbox/outbox when no one is available to message.
-#, fuzzy
 msgid "No mutual subscribers."
-msgstr "¡No estás suscrito!"
+msgstr "Sin suscripción mutua"
 
 msgid "To"
 msgstr "Para"
@@ -7740,9 +7810,8 @@ msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr "Enviar"
 
-#, fuzzy
 msgid "Messages"
-msgstr "Mensaje"
+msgstr "Mensajes"
 
 msgid "from"
 msgstr "desde"
@@ -7781,13 +7850,13 @@ msgstr "Enviar un mensaje"
 msgid "What's up, %s?"
 msgstr "¿Qué tal, %s?"
 
+#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr "Adjuntar"
 
 #. TRANS: Title for input field to attach a file to a notice.
-#, fuzzy
 msgid "Attach a file."
-msgstr "Adjuntar un archivo"
+msgstr "Adjuntar archivo"
 
 #. TRANS: Field label to add location to a notice.
 msgid "Share my location"
@@ -7850,7 +7919,7 @@ msgid "Notice repeated"
 msgstr "Mensaje repetido"
 
 msgid "Update your status..."
-msgstr ""
+msgstr "Actualiza tu estado."
 
 msgid "Nudge this user"
 msgstr "Dar un toque a este usuario"
@@ -7898,12 +7967,12 @@ msgstr "Desconocido"
 #. TRANS: Plugin admin panel controls
 msgctxt "plugin"
 msgid "Disable"
-msgstr ""
+msgstr "Deshabilitado"
 
 #. TRANS: Plugin admin panel controls
 msgctxt "plugin"
 msgid "Enable"
-msgstr ""
+msgstr "Habilitado"
 
 msgctxt "plugin-description"
 msgid "(Plugin descriptions unavailable when disabled.)"
@@ -7932,9 +8001,8 @@ msgstr "Iniciar sesión en el sitio"
 msgid "Search"
 msgstr "Buscar"
 
-#, fuzzy
 msgid "Search the site"
-msgstr "Buscar sitio"
+msgstr "Buscar en el sitio"
 
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
@@ -8212,7 +8280,6 @@ msgid "Top posters"
 msgstr "Principales posteadores"
 
 #. TRANS: Title for the form to unblock a user.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Unblock"
 msgstr "Desbloquear"
@@ -8241,52 +8308,6 @@ msgstr "Cancelar suscripción"
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "El usuario no tiene un perfil."
 
-msgid "Edit Avatar"
-msgstr "Editar imagen"
-
-#. TRANS: H2 for user actions in a profile.
-#. TRANS: H2 for entity actions in a profile.
-msgid "User actions"
-msgstr "Acciones de usuario"
-
-#. TRANS: Text shown in user profile of not yet compeltely deleted users.
-msgid "User deletion in progress..."
-msgstr "Eliminación de usuario en curso..."
-
-#. TRANS: Link title for link on user profile.
-msgid "Edit profile settings"
-msgstr "Editar configuración del perfil"
-
-#. TRANS: Link text for link on user profile.
-msgid "Edit"
-msgstr "Editar"
-
-#. TRANS: Link title for link on user profile.
-msgid "Send a direct message to this user"
-msgstr "Enviar un mensaje directo a este usuario"
-
-#. TRANS: Link text for link on user profile.
-msgid "Message"
-msgstr "Mensaje"
-
-#. TRANS: Label text on user profile to select a user role.
-msgid "Moderate"
-msgstr "Moderar"
-
-#. TRANS: Label text on user profile to select a user role.
-msgid "User role"
-msgstr "Rol de usuario"
-
-#. TRANS: Role that can be set for a user profile.
-msgctxt "role"
-msgid "Administrator"
-msgstr "Administrador"
-
-#. TRANS: Role that can be set for a user profile.
-msgctxt "role"
-msgid "Moderator"
-msgstr "Moderador"
-
 #, fuzzy
 msgid "Not allowed to log in."
 msgstr "No conectado."
@@ -8362,3 +8383,88 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#~ msgid "Note"
+#~ msgstr "Nota"
+
+#~ msgid ""
+#~ "Commands:\n"
+#~ "on - turn on notifications\n"
+#~ "off - turn off notifications\n"
+#~ "help - show this help\n"
+#~ "follow <nickname> - subscribe to user\n"
+#~ "groups - lists the groups you have joined\n"
+#~ "subscriptions - list the people you follow\n"
+#~ "subscribers - list the people that follow you\n"
+#~ "leave <nickname> - unsubscribe from user\n"
+#~ "d <nickname> <text> - direct message to user\n"
+#~ "get <nickname> - get last notice from user\n"
+#~ "whois <nickname> - get profile info on user\n"
+#~ "lose <nickname> - force user to stop following you\n"
+#~ "fav <nickname> - add user's last notice as a 'fave'\n"
+#~ "fav #<notice_id> - add notice with the given id as a 'fave'\n"
+#~ "repeat #<notice_id> - repeat a notice with a given id\n"
+#~ "repeat <nickname> - repeat the last notice from user\n"
+#~ "reply #<notice_id> - reply to notice with a given id\n"
+#~ "reply <nickname> - reply to the last notice from user\n"
+#~ "join <group> - join group\n"
+#~ "login - Get a link to login to the web interface\n"
+#~ "drop <group> - leave group\n"
+#~ "stats - get your stats\n"
+#~ "stop - same as 'off'\n"
+#~ "quit - same as 'off'\n"
+#~ "sub <nickname> - same as 'follow'\n"
+#~ "unsub <nickname> - same as 'leave'\n"
+#~ "last <nickname> - same as 'get'\n"
+#~ "on <nickname> - not yet implemented.\n"
+#~ "off <nickname> - not yet implemented.\n"
+#~ "nudge <nickname> - remind a user to update.\n"
+#~ "invite <phone number> - not yet implemented.\n"
+#~ "track <word> - not yet implemented.\n"
+#~ "untrack <word> - not yet implemented.\n"
+#~ "track off - not yet implemented.\n"
+#~ "untrack all - not yet implemented.\n"
+#~ "tracks - not yet implemented.\n"
+#~ "tracking - not yet implemented.\n"
+#~ msgstr ""
+#~ "comandos:\n"
+#~ "on - activar notificaciones\n"
+#~ "off - desactivar notificaciones\n"
+#~ "help - mostrar esta ayuda\n"
+#~ "follow <usuario> - suscribirse al usuario\n"
+#~ "groups - listar los grupos que sigues\n"
+#~ "subscriptions - listar las personas que sigues\n"
+#~ "subscribers - listar los grupos que te siguen\n"
+#~ "leave <usuario> - cancelar la suscripción al usuario\n"
+#~ "d <usuario> <text> - dirigir mensaje al usuario\n"
+#~ "get <usuario> - obtener último aviso del usuario\n"
+#~ "whois <usuario> - obtener información del perfil del usuario\n"
+#~ "lose <usuario> - obligar al usuario a que deje de seguirte\n"
+#~ "fav <usuario> - añadir el último aviso del usario a tus favoritos\n"
+#~ "fav #<id_aviso> - añadir el aviso con el ID dado a tus favoritos\n"
+#~ "repeat #<id_aviso> - repetir el aviso con el ID dado\n"
+#~ "repeat <usuario> - repetir el último aviso del usuario\n"
+#~ "reply #<id_aviso> - responder al aviso del ID dado\n"
+#~ "reply <usuario> - responder al último aviso del usuario\n"
+#~ "join <grupo> - unirse a un grupo\n"
+#~ "login - obtener un vínculo para iniciar sesión en la interfaz Web\n"
+#~ "drop <grupo> - abandonar el grupo\n"
+#~ "stats - obtener tus estadísticas\n"
+#~ "stop - igual que 'desactivar'\n"
+#~ "quit - igual que 'desactivar'\n"
+#~ "sub <usuario> - igual que 'seguir'\n"
+#~ "unsub <usuario> - igual que 'abandonar'\n"
+#~ "last <usuario> - igual que 'obtener'\n"
+#~ "on <usuario> - aún sin implementar.\n"
+#~ "off <usuario> - aún sin implementar.\n"
+#~ "nudge <usuario> - recordarle a un ausuario que actualice.\n"
+#~ "invite <phone number> - aún sin implementar.\n"
+#~ "track <word> - aún sin implementar.\n"
+#~ "untrack <word> - aún sin implementar.\n"
+#~ "track off - aún sin implementar.\n"
+#~ "untrack all - aún sin implementar.\n"
+#~ "tracks - aún sin implementar.\n"
+#~ "tracking - aún sin implementar.\n"
+
+#~ msgid "Edit Avatar"
+#~ msgstr "Editar imagen"
diff --git a/locale/fa/LC_MESSAGES/statusnet.po b/locale/fa/LC_MESSAGES/statusnet.po
index 443e410308..5dc14bc11d 100644
--- a/locale/fa/LC_MESSAGES/statusnet.po
+++ b/locale/fa/LC_MESSAGES/statusnet.po
@@ -4,6 +4,7 @@
 # Author: ArianHT
 # Author: Brion
 # Author: Choxos
+# Author: Ebraminio
 # Author: Everplays
 # Author: Mjbmr
 # Author: Narcissus
@@ -16,8 +17,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-11 18:15+0000\n"
-"PO-Revision-Date: 2011-03-11 18:17:04+0000\n"
+"POT-Creation-Date: 2011-03-17 09:47+0000\n"
+"PO-Revision-Date: 2011-03-17 09:49:33+0000\n"
 "Last-Translator: Ahmad Sufi Mahmudi\n"
 "Language-Team: Persian <http://translatewiki.net/wiki/Portal:fa>\n"
 "MIME-Version: 1.0\n"
@@ -26,9 +27,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.18alpha (r83703); Translate extension (2011-03-11)\n"
+"X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
-"X-POT-Import-Date: 2011-03-08 01:25:01+0000\n"
+"X-POT-Import-Date: 2011-03-11 18:52:41+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -299,7 +300,6 @@ msgid "Could not update your design."
 msgstr "نمی‌توان طرح‌تان به‌هنگام‌سازی کرد."
 
 #. TRANS: Title for Atom feed.
-#, fuzzy
 msgctxt "ATOM"
 msgid "Main"
 msgstr "اصلی"
@@ -324,14 +324,14 @@ msgstr "%s اشتراک"
 #. TRANS: Title for Atom feed with a user's favorite notices. %s is a user nickname.
 #. TRANS: Title for Atom favorites feed.
 #. TRANS: %s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "%s favorites"
-msgstr "برگزیده‌ها"
+msgstr "%s مورد علاقهٔ شما"
 
 #. TRANS: Title for Atom feed with a user's memberships. %s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "%s memberships"
-msgstr "اعضای گروه %s"
+msgstr "%s عضو"
 
 #. TRANS: Client error displayed when users try to block themselves.
 msgid "You cannot block yourself!"
@@ -592,7 +592,7 @@ msgstr "خارج شدن %s از گروه %s نا موفق بود"
 msgid "%s's groups"
 msgstr "گروه‌های %s"
 
-#. TRANS: Used as subtitle in check for group membership. %1$s is a user name, %2$s is the site name.
+#. TRANS: Used as subtitle in check for group membership. %1$s is the site name, %2$s is a user name.
 #, fuzzy, php-format
 msgid "%1$s groups %2$s is a member of."
 msgstr "هست عضو %s گروه"
@@ -1051,9 +1051,8 @@ msgid "Can only fave notices."
 msgstr "پیدا کردن محتوای پیام‌ها"
 
 #. TRANS: Client exception thrown when trying favorite a notice without content.
-#, fuzzy
 msgid "Unknown notice."
-msgstr "ناشناخته"
+msgstr "اعلان ناشناخته."
 
 #. TRANS: Client exception thrown when trying favorite an already favorited notice.
 #, fuzzy
@@ -1084,9 +1083,8 @@ msgid "Can only handle join activities."
 msgstr "پیدا کردن محتوای پیام‌ها"
 
 #. TRANS: Client exception thrown when trying to subscribe to a non-existing group.
-#, fuzzy
 msgid "Unknown group."
-msgstr "ناشناخته"
+msgstr "گروه ناشناخته."
 
 #. TRANS: Client exception thrown when trying to subscribe to an already subscribed group.
 #, fuzzy
@@ -1260,13 +1258,11 @@ msgstr "حذف"
 
 #. TRANS: Button on avatar upload page to upload an avatar.
 #. TRANS: Submit button to confirm upload of a user backup file for account restore.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Upload"
-msgstr "پایین‌گذاری"
+msgstr "بارگذاری"
 
 #. TRANS: Button on avatar upload crop form to confirm a selected crop as avatar.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Crop"
 msgstr "برش"
@@ -1322,10 +1318,9 @@ msgid ""
 msgstr ""
 
 #. TRANS: Submit button to backup an account on the backup account page.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Backup"
-msgstr "پیش‌زمینه"
+msgstr "پشتیبان‌گیری"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
 msgid "Backup your account."
@@ -1492,7 +1487,7 @@ msgstr "شما نمی‌توانید کاربران را پاک کنید."
 
 #. TRANS: Confirmation text for user deletion. The user has to type this exactly the same, including punctuation.
 msgid "I am sure."
-msgstr ""
+msgstr "من مطمئن هستم."
 
 #. TRANS: Notification for user about the text that must be input to be able to delete a user account.
 #. TRANS: %s is the text that needs to be input.
@@ -1501,15 +1496,13 @@ msgid "You must write \"%s\" exactly in the box."
 msgstr ""
 
 #. TRANS: Confirmation that a user account has been deleted.
-#, fuzzy
 msgid "Account deleted."
-msgstr "چهره پاک شد."
+msgstr "حساب کاربری حذف شد."
 
 #. TRANS: Page title for page on which a user account can be deleted.
 #. TRANS: Option in profile settings to delete the account of the currently logged in user.
-#, fuzzy
 msgid "Delete account"
-msgstr "ساختن یک جساب‌کاربری"
+msgstr "حذف حساب کاربری"
 
 #. TRANS: Form text for user deletion form.
 msgid ""
@@ -1532,9 +1525,9 @@ msgstr "تایید"
 
 #. TRANS: Input title for the delete account field.
 #. TRANS: %s is the text that needs to be input.
-#, fuzzy, php-format
+#, php-format
 msgid "Enter \"%s\" to confirm that you want to delete your account."
-msgstr "شما نمی‌توانید کاربران را پاک کنید."
+msgstr "«%s» را برای تأیید اینکه می‌خواهید حسابتان حذف شود وارد کنید."
 
 #. TRANS: Button title for user account deletion.
 #, fuzzy
@@ -1613,9 +1606,8 @@ msgstr "%1$s گروه %2$s را ترک کرد"
 
 #. TRANS: Title of delete group page.
 #. TRANS: Form legend for deleting a group.
-#, fuzzy
 msgid "Delete group"
-msgstr "حذف کاربر"
+msgstr "حذف گروه"
 
 #. TRANS: Warning in form for deleleting a group.
 #, fuzzy
@@ -4710,18 +4702,6 @@ msgstr "گروه %s"
 msgid "%1$s group, page %2$d"
 msgstr "گروه %1$s، صفحهٔ %2$d"
 
-#. TRANS: Label for group description or group note (dt). Text hidden by default.
-msgid "Note"
-msgstr "یادداشت"
-
-#. TRANS: Label for group aliases (dt). Text hidden by default.
-msgid "Aliases"
-msgstr "نام های مستعار"
-
-#. TRANS: Group actions header (h2). Text hidden by default.
-msgid "Group actions"
-msgstr "اعمال گروه"
-
 #. TRANS: Tooltip for feed link. %s is a group nickname.
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
@@ -4835,6 +4815,10 @@ msgstr "پیام از %1$s در %2$s"
 msgid "Notice deleted."
 msgstr "پیام پاک شد."
 
+#, fuzzy
+msgid "Notice"
+msgstr "پیام‌ها"
+
 #. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
 #, fuzzy, php-format
 msgid "%1$s tagged %2$s"
@@ -5371,7 +5355,6 @@ msgstr "هیچ پیوستی وجود ندارد."
 msgid "Tag %s"
 msgstr "برچسب %s"
 
-#. TRANS: H2 for user profile information.
 msgid "User profile"
 msgstr "نمایهٔ کاربر"
 
@@ -6076,6 +6059,49 @@ msgstr ""
 msgid "No AtomPub API service for %s."
 msgstr ""
 
+#. TRANS: H2 for user actions in a profile.
+#. TRANS: H2 for entity actions in a profile.
+msgid "User actions"
+msgstr "اعمال کاربر"
+
+#. TRANS: Text shown in user profile of not yet compeltely deleted users.
+msgid "User deletion in progress..."
+msgstr "پاک‌کردن کاربر در حالت اجرا است..."
+
+#. TRANS: Link title for link on user profile.
+msgid "Edit profile settings"
+msgstr "ویرایش تنظیمات نمایه"
+
+#. TRANS: Link text for link on user profile.
+msgid "Edit"
+msgstr "ویرایش"
+
+#. TRANS: Link title for link on user profile.
+msgid "Send a direct message to this user"
+msgstr "پیام مستقیم به این کاربر بفرستید"
+
+#. TRANS: Link text for link on user profile.
+msgid "Message"
+msgstr "پیام"
+
+#. TRANS: Label text on user profile to select a user role.
+msgid "Moderate"
+msgstr "اداره کردن"
+
+#. TRANS: Label text on user profile to select a user role.
+msgid "User role"
+msgstr "وظیفهٔ کاربر"
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Administrator"
+msgstr "رئیس"
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Moderator"
+msgstr "مدیر"
+
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
 #, php-format
 msgid "%1$s - %2$s"
@@ -6797,85 +6823,171 @@ msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "شما یک عضو این گروه هستید:"
 
-#. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-msgid ""
-"Commands:\n"
-"on - turn on notifications\n"
-"off - turn off notifications\n"
-"help - show this help\n"
-"follow <nickname> - subscribe to user\n"
-"groups - lists the groups you have joined\n"
-"subscriptions - list the people you follow\n"
-"subscribers - list the people that follow you\n"
-"leave <nickname> - unsubscribe from user\n"
-"d <nickname> <text> - direct message to user\n"
-"get <nickname> - get last notice from user\n"
-"whois <nickname> - get profile info on user\n"
-"lose <nickname> - force user to stop following you\n"
-"fav <nickname> - add user's last notice as a 'fave'\n"
-"fav #<notice_id> - add notice with the given id as a 'fave'\n"
-"repeat #<notice_id> - repeat a notice with a given id\n"
-"repeat <nickname> - repeat the last notice from user\n"
-"reply #<notice_id> - reply to notice with a given id\n"
-"reply <nickname> - reply to the last notice from user\n"
-"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
-"drop <group> - leave group\n"
-"stats - get your stats\n"
-"stop - same as 'off'\n"
-"quit - same as 'off'\n"
-"sub <nickname> - same as 'follow'\n"
-"unsub <nickname> - same as 'leave'\n"
-"last <nickname> - same as 'get'\n"
-"on <nickname> - not yet implemented.\n"
-"off <nickname> - not yet implemented.\n"
-"nudge <nickname> - remind a user to update.\n"
-"invite <phone number> - not yet implemented.\n"
-"track <word> - not yet implemented.\n"
-"untrack <word> - not yet implemented.\n"
-"track off - not yet implemented.\n"
-"untrack all - not yet implemented.\n"
-"tracks - not yet implemented.\n"
-"tracking - not yet implemented.\n"
+#. TRANS: Header line of help text for commands.
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "Commands:"
+msgstr "نتیجه دستور"
+
+#. TRANS: Help message for IM/SMS command "on"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "turn on notifications"
+msgstr "ناتوان در روشن کردن آگاه سازی."
+
+#. TRANS: Help message for IM/SMS command "off"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "turn off notifications"
+msgstr "ناتوان در خاموش کردن آگاه سازی."
+
+#. TRANS: Help message for IM/SMS command "help"
+msgctxt "COMMANDHELP"
+msgid "show this help"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "follow <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "subscribe to user"
+msgstr "مشترک شدن این کاربر"
+
+#. TRANS: Help message for IM/SMS command "groups"
+msgctxt "COMMANDHELP"
+msgid "lists the groups you have joined"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscriptions"
+msgctxt "COMMANDHELP"
+msgid "list the people you follow"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscribers"
+msgctxt "COMMANDHELP"
+msgid "list the people that follow you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "leave <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "unsubscribe from user"
+msgstr "لغو مشترک‌شدن از این کاربر"
+
+#. TRANS: Help message for IM/SMS command "d <nickname> <text>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "direct message to user"
+msgstr "پیام‌های مستقیم به %s"
+
+#. TRANS: Help message for IM/SMS command "get <nickname>"
+msgctxt "COMMANDHELP"
+msgid "get last notice from user"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "whois <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "get profile info on user"
+msgstr "اطلاعات نمایه"
+
+#. TRANS: Help message for IM/SMS command "lose <nickname>"
+msgctxt "COMMANDHELP"
+msgid "force user to stop following you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav <nickname>"
+msgctxt "COMMANDHELP"
+msgid "add user's last notice as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "add notice with the given id as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "repeat a notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "repeat the last notice from user"
+msgstr "تکرار این پیام"
+
+#. TRANS: Help message for IM/SMS command "reply #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "reply to notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "reply <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "reply to the last notice from user"
+msgstr "به این پیام پاسخ دهید"
+
+#. TRANS: Help message for IM/SMS command "join <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "join group"
+msgstr "گروه ناشناخته."
+
+#. TRANS: Help message for IM/SMS command "login"
+msgctxt "COMMANDHELP"
+msgid "Get a link to login to the web interface"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "drop <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "leave group"
+msgstr "حذف گروه"
+
+#. TRANS: Help message for IM/SMS command "stats"
+msgctxt "COMMANDHELP"
+msgid "get your stats"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "stop"
+#. TRANS: Help message for IM/SMS command "quit"
+msgctxt "COMMANDHELP"
+msgid "same as 'off'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "sub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'follow'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "unsub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'leave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "last <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'get'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "on <nickname>"
+#. TRANS: Help message for IM/SMS command "off <nickname>"
+#. TRANS: Help message for IM/SMS command "invite <phone number>"
+#. TRANS: Help message for IM/SMS command "track <word>"
+#. TRANS: Help message for IM/SMS command "untrack <word>"
+#. TRANS: Help message for IM/SMS command "track off"
+#. TRANS: Help message for IM/SMS command "untrack all"
+#. TRANS: Help message for IM/SMS command "tracks"
+#. TRANS: Help message for IM/SMS command "tracking"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "not yet implemented."
+msgstr "دستور هنوز پیاده نشده است."
+
+#. TRANS: Help message for IM/SMS command "nudge <nickname>"
+msgctxt "COMMANDHELP"
+msgid "remind a user to update."
 msgstr ""
-"دستورات:\n"
-"on - روشن‌کردن آگاه‌سازی‌ها\n"
-"off - خاموش‌کردن آگاه‌سازی‌ها\n"
-"help - نشان دادن این کمک\n"
-"follow <nickname> - مشترک کاربر شدن\n"
-"groups - گروه‌هایی را که به آن‌ها پیوسته‌اید، فهرست می‌کند\n"
-"subscriptions - افرادی را که دنبال می‌کنید، فهرست می‌کند\n"
-"subscribers - کاربرانی را که شما را دنبال می‌کنند، فهرست می‌کند\n"
-"leave <nickname> - لغو اشتراک از کاربر\n"
-"d <nickname> <text> - پیام مستقیم به کاربر\n"
-"get <nickname> - دریافت آخرین پیام از کاربر\n"
-"whois <nickname> - دریافت اطلاعات نمایهٔ کاربر\n"
-"lose <nickname> - وادار کردن کاربر به توقف دنبال‌کردن شما\n"
-"fav <nickname> - افزودن آخرین پیام کاربر به عنوان برگزیده\n"
-"fav #<notice_id> - افزودن پیام با یک شناسهٔ داده‌شده به عنوان برگزیده\n"
-"repeat #<notice_id> - تکرار کردن یک پیام با یک شناسهٔ داده‌شده\n"
-"repeat <nickname> - تکرار کردن آخرین پیام از کاربر\n"
-"reply #<notice_id> - پاسخ‌دادن به یک پیام با یک شناسهٔ داده‌شده\n"
-"reply <nickname> - پاسخ‌دادن به آخرین پیام از کاربر\n"
-"join <group> - پیوستن به گروه\n"
-"login - دریافت یک پیوند برای واردشدن به رابط وب\n"
-"drop <group> - ترک‌کردن گروه\n"
-"stats - دریافت آمار شما\n"
-"stop - مانند «off»\n"
-"quit - مانند «off»\n"
-"sub <nickname> - مانند «follow»\n"
-"unsub <nickname> - مانند «leave»\n"
-"last <nickname> - مانند «get»\n"
-"on <nickname> - هنوز پیاده نشده است.\n"
-"off <nickname> - هنوز پیاده نشده است.\n"
-"nudge <nickname> - یادآوری‌کردن به یک کاربر برای به‌روز کردن\n"
-"invite <phone number> - هنوز پیاده نشده است.\n"
-"track <word> - هنوز پیاده نشده است.\n"
-"untrack <word> - هنوز پیاده نشده است.\n"
-"track off - هنوز پیاده نشده است.\n"
-"untrack all - هنوز پیاده نشده است.\n"
-"tracks - هنوز پیاده نشده است.\n"
-"tracking - هنوز پیاده نشده است.\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #, fuzzy
@@ -7058,6 +7170,9 @@ msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\"."
 msgstr "مکان گروه، در صورت وجود داشتن، مانند «شهر، ایالت (یا استان)، کشور»"
 
+msgid "Aliases"
+msgstr "نام های مستعار"
+
 #, fuzzy, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -7135,6 +7250,10 @@ msgctxt "TOOLTIP"
 msgid "Add or edit %s design"
 msgstr ""
 
+#. TRANS: Group actions header (h2). Text hidden by default.
+msgid "Group actions"
+msgstr "اعمال گروه"
+
 #. TRANS: Title for groups with the most members section.
 msgid "Groups with most members"
 msgstr "گروه های با اعضاء بیشتر"
@@ -7698,6 +7817,7 @@ msgstr "فرستادن یک پیام"
 msgid "What's up, %s?"
 msgstr "چه خبر، %s؟"
 
+#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr "پیوست کردن"
 
@@ -8159,52 +8279,6 @@ msgstr "لغو اشتراک"
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "کاربر هیچ نمایه‌ای ندارد."
 
-msgid "Edit Avatar"
-msgstr "ویرایش اواتور"
-
-#. TRANS: H2 for user actions in a profile.
-#. TRANS: H2 for entity actions in a profile.
-msgid "User actions"
-msgstr "اعمال کاربر"
-
-#. TRANS: Text shown in user profile of not yet compeltely deleted users.
-msgid "User deletion in progress..."
-msgstr "پاک‌کردن کاربر در حالت اجرا است..."
-
-#. TRANS: Link title for link on user profile.
-msgid "Edit profile settings"
-msgstr "ویرایش تنظیمات نمایه"
-
-#. TRANS: Link text for link on user profile.
-msgid "Edit"
-msgstr "ویرایش"
-
-#. TRANS: Link title for link on user profile.
-msgid "Send a direct message to this user"
-msgstr "پیام مستقیم به این کاربر بفرستید"
-
-#. TRANS: Link text for link on user profile.
-msgid "Message"
-msgstr "پیام"
-
-#. TRANS: Label text on user profile to select a user role.
-msgid "Moderate"
-msgstr "اداره کردن"
-
-#. TRANS: Label text on user profile to select a user role.
-msgid "User role"
-msgstr "وظیفهٔ کاربر"
-
-#. TRANS: Role that can be set for a user profile.
-msgctxt "role"
-msgid "Administrator"
-msgstr "رئیس"
-
-#. TRANS: Role that can be set for a user profile.
-msgctxt "role"
-msgid "Moderator"
-msgstr "مدیر"
-
 #, fuzzy
 msgid "Not allowed to log in."
 msgstr "شما به سیستم وارد نشده اید."
@@ -8276,3 +8350,88 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#~ msgid "Note"
+#~ msgstr "یادداشت"
+
+#~ msgid ""
+#~ "Commands:\n"
+#~ "on - turn on notifications\n"
+#~ "off - turn off notifications\n"
+#~ "help - show this help\n"
+#~ "follow <nickname> - subscribe to user\n"
+#~ "groups - lists the groups you have joined\n"
+#~ "subscriptions - list the people you follow\n"
+#~ "subscribers - list the people that follow you\n"
+#~ "leave <nickname> - unsubscribe from user\n"
+#~ "d <nickname> <text> - direct message to user\n"
+#~ "get <nickname> - get last notice from user\n"
+#~ "whois <nickname> - get profile info on user\n"
+#~ "lose <nickname> - force user to stop following you\n"
+#~ "fav <nickname> - add user's last notice as a 'fave'\n"
+#~ "fav #<notice_id> - add notice with the given id as a 'fave'\n"
+#~ "repeat #<notice_id> - repeat a notice with a given id\n"
+#~ "repeat <nickname> - repeat the last notice from user\n"
+#~ "reply #<notice_id> - reply to notice with a given id\n"
+#~ "reply <nickname> - reply to the last notice from user\n"
+#~ "join <group> - join group\n"
+#~ "login - Get a link to login to the web interface\n"
+#~ "drop <group> - leave group\n"
+#~ "stats - get your stats\n"
+#~ "stop - same as 'off'\n"
+#~ "quit - same as 'off'\n"
+#~ "sub <nickname> - same as 'follow'\n"
+#~ "unsub <nickname> - same as 'leave'\n"
+#~ "last <nickname> - same as 'get'\n"
+#~ "on <nickname> - not yet implemented.\n"
+#~ "off <nickname> - not yet implemented.\n"
+#~ "nudge <nickname> - remind a user to update.\n"
+#~ "invite <phone number> - not yet implemented.\n"
+#~ "track <word> - not yet implemented.\n"
+#~ "untrack <word> - not yet implemented.\n"
+#~ "track off - not yet implemented.\n"
+#~ "untrack all - not yet implemented.\n"
+#~ "tracks - not yet implemented.\n"
+#~ "tracking - not yet implemented.\n"
+#~ msgstr ""
+#~ "دستورات:\n"
+#~ "on - روشن‌کردن آگاه‌سازی‌ها\n"
+#~ "off - خاموش‌کردن آگاه‌سازی‌ها\n"
+#~ "help - نشان دادن این کمک\n"
+#~ "follow <nickname> - مشترک کاربر شدن\n"
+#~ "groups - گروه‌هایی را که به آن‌ها پیوسته‌اید، فهرست می‌کند\n"
+#~ "subscriptions - افرادی را که دنبال می‌کنید، فهرست می‌کند\n"
+#~ "subscribers - کاربرانی را که شما را دنبال می‌کنند، فهرست می‌کند\n"
+#~ "leave <nickname> - لغو اشتراک از کاربر\n"
+#~ "d <nickname> <text> - پیام مستقیم به کاربر\n"
+#~ "get <nickname> - دریافت آخرین پیام از کاربر\n"
+#~ "whois <nickname> - دریافت اطلاعات نمایهٔ کاربر\n"
+#~ "lose <nickname> - وادار کردن کاربر به توقف دنبال‌کردن شما\n"
+#~ "fav <nickname> - افزودن آخرین پیام کاربر به عنوان برگزیده\n"
+#~ "fav #<notice_id> - افزودن پیام با یک شناسهٔ داده‌شده به عنوان برگزیده\n"
+#~ "repeat #<notice_id> - تکرار کردن یک پیام با یک شناسهٔ داده‌شده\n"
+#~ "repeat <nickname> - تکرار کردن آخرین پیام از کاربر\n"
+#~ "reply #<notice_id> - پاسخ‌دادن به یک پیام با یک شناسهٔ داده‌شده\n"
+#~ "reply <nickname> - پاسخ‌دادن به آخرین پیام از کاربر\n"
+#~ "join <group> - پیوستن به گروه\n"
+#~ "login - دریافت یک پیوند برای واردشدن به رابط وب\n"
+#~ "drop <group> - ترک‌کردن گروه\n"
+#~ "stats - دریافت آمار شما\n"
+#~ "stop - مانند «off»\n"
+#~ "quit - مانند «off»\n"
+#~ "sub <nickname> - مانند «follow»\n"
+#~ "unsub <nickname> - مانند «leave»\n"
+#~ "last <nickname> - مانند «get»\n"
+#~ "on <nickname> - هنوز پیاده نشده است.\n"
+#~ "off <nickname> - هنوز پیاده نشده است.\n"
+#~ "nudge <nickname> - یادآوری‌کردن به یک کاربر برای به‌روز کردن\n"
+#~ "invite <phone number> - هنوز پیاده نشده است.\n"
+#~ "track <word> - هنوز پیاده نشده است.\n"
+#~ "untrack <word> - هنوز پیاده نشده است.\n"
+#~ "track off - هنوز پیاده نشده است.\n"
+#~ "untrack all - هنوز پیاده نشده است.\n"
+#~ "tracks - هنوز پیاده نشده است.\n"
+#~ "tracking - هنوز پیاده نشده است.\n"
+
+#~ msgid "Edit Avatar"
+#~ msgstr "ویرایش اواتور"
diff --git a/locale/fi/LC_MESSAGES/statusnet.po b/locale/fi/LC_MESSAGES/statusnet.po
index 98f6370d3e..fcde77fab6 100644
--- a/locale/fi/LC_MESSAGES/statusnet.po
+++ b/locale/fi/LC_MESSAGES/statusnet.po
@@ -15,17 +15,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-11 18:15+0000\n"
-"PO-Revision-Date: 2011-03-11 18:17:06+0000\n"
+"POT-Creation-Date: 2011-03-17 09:47+0000\n"
+"PO-Revision-Date: 2011-03-17 09:49:34+0000\n"
 "Language-Team: Finnish <http://translatewiki.net/wiki/Portal:fi>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83703); Translate extension (2011-03-11)\n"
+"X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fi\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-03-08 01:25:01+0000\n"
+"X-POT-Import-Date: 2011-03-11 18:52:41+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -388,7 +388,7 @@ msgstr ""
 #. TRANS: Client error displayed trying to direct message self (403).
 msgid ""
 "Do not send a message to yourself; just say it to yourself quietly instead."
-msgstr "Älä lähetä viestiä itsellesi, vaan kuiskaa se vain hiljaa itsellesi."
+msgstr "Et voi lähettää viestiä itsellesi. Kuiskaa se hiljaa itsellesi."
 
 #. 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.
@@ -588,10 +588,10 @@ msgstr "Käyttäjä %s ei voinut liittyä ryhmään %s."
 msgid "%s's groups"
 msgstr "Käyttäjän %s ryhmät"
 
-#. TRANS: Used as subtitle in check for group membership. %1$s is a user name, %2$s is the site name.
+#. TRANS: Used as subtitle in check for group membership. %1$s is the site name, %2$s is a user name.
 #, php-format
 msgid "%1$s groups %2$s is a member of."
-msgstr "%1$s ryhmät, joiden jäsen %2$s on."
+msgstr "Sivuston %1$s ryhmät, joiden jäsen %2$s on."
 
 #. TRANS: Message is used as a title when listing the lastest 20 groups. %s is a site name.
 #. TRANS: Message is used as a page title. %s is a nick name.
@@ -1244,7 +1244,7 @@ msgstr "Poista"
 #. TRANS: Submit button to confirm upload of a user backup file for account restore.
 msgctxt "BUTTON"
 msgid "Upload"
-msgstr "Lataa"
+msgstr "Tallenna"
 
 #. TRANS: Button on avatar upload crop form to confirm a selected crop as avatar.
 msgctxt "BUTTON"
@@ -1512,11 +1512,11 @@ msgstr "Vahvista"
 #. TRANS: %s is the text that needs to be input.
 #, php-format
 msgid "Enter \"%s\" to confirm that you want to delete your account."
-msgstr "Anna \"%s\" varmistaaksesi että haluat todella poistaa käyttäjätilisi."
+msgstr "Kirjoita ”%s”, jos haluat todella poistaa käyttäjätilisi."
 
 #. TRANS: Button title for user account deletion.
 msgid "Permanently delete your account"
-msgstr "Poista käyttäjätilisi lopullisesti"
+msgstr "Poista käyttäjätilini lopullisesti"
 
 #. TRANS: Client error displayed trying to delete an application while not logged in.
 msgid "You must be logged in to delete an application."
@@ -1839,7 +1839,7 @@ msgstr "Lisää suosikkeihin"
 #. TRANS: %s is the non-existing document.
 #, php-format
 msgid "No such document \"%s\"."
-msgstr "Dokumenttia \"%s\" ei ole."
+msgstr "Dokumenttia ”%s” ei ole."
 
 #. TRANS: Title for "Edit application" form.
 #. TRANS: Form legend.
@@ -1858,7 +1858,7 @@ msgstr "Sovellusta ei ole."
 
 #. TRANS: Instructions for "Edit application" form.
 msgid "Use this form to edit your application."
-msgstr "Käytä tätä lomaketta muokataksesi sovellustasi."
+msgstr "Käytä tätä lomaketta sovelluksesi muokkaamiseen."
 
 #. TRANS: Validation error shown when not providing a name in the "Edit application" form.
 #. TRANS: Validation error shown when not providing a name in the "New application" form.
@@ -2339,9 +2339,8 @@ msgid ""
 "will be removed from the group, unable to post, and unable to subscribe to "
 "the group in the future."
 msgstr ""
-"Haluatko varmasti estää käyttäjän \"%1$s\" ryhmästä \"%2$s\"? Heidät "
-"poistetaan ryhmästä, eivät voi lähettää päivityksiä, ja eivät voi enää "
-"liittyä ryhmään."
+"Haluatko varmasti estää käyttäjän %1$s ryhmästä %2$s? Estetty käyttäjä "
+"poistetaan ryhmästä, hän ei voi lähettää päivityksiä, eikä liittyä ryhmään."
 
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
 msgid "Do not block this user from this group."
@@ -2395,7 +2394,7 @@ msgstr "Ryhmän logo"
 #, php-format
 msgid ""
 "You can upload a logo image for your group. The maximum file size is %s."
-msgstr "Voit ladata ryhmälle logokuvan. Maksimikoko on %s."
+msgstr "Voit ladata ryhmälle logokuvan. Kuvan enimmäiskoko on %s."
 
 #. TRANS: Submit button for uploading a group logo.
 msgid "Upload"
@@ -4688,18 +4687,6 @@ msgstr "Ryhmä %s"
 msgid "%1$s group, page %2$d"
 msgstr "Ryhmät, sivu %d"
 
-#. TRANS: Label for group description or group note (dt). Text hidden by default.
-msgid "Note"
-msgstr "Huomaa"
-
-#. TRANS: Label for group aliases (dt). Text hidden by default.
-msgid "Aliases"
-msgstr "Aliakset"
-
-#. TRANS: Group actions header (h2). Text hidden by default.
-msgid "Group actions"
-msgstr "Ryhmän toiminnot"
-
 #. TRANS: Tooltip for feed link. %s is a group nickname.
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
@@ -4805,6 +4792,10 @@ msgstr "Viesti käyttäjältä %1$s, %2$s"
 msgid "Notice deleted."
 msgstr "Päivitys on poistettu."
 
+#, fuzzy
+msgid "Notice"
+msgstr "Päivitykset"
+
 #. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
 #, fuzzy, php-format
 msgid "%1$s tagged %2$s"
@@ -5336,7 +5327,6 @@ msgstr "Ei id parametria."
 msgid "Tag %s"
 msgstr "Tagi %s"
 
-#. TRANS: H2 for user profile information.
 msgid "User profile"
 msgstr "Käyttäjän profiili"
 
@@ -6057,6 +6047,52 @@ msgstr ""
 msgid "No AtomPub API service for %s."
 msgstr ""
 
+#. TRANS: H2 for user actions in a profile.
+#. TRANS: H2 for entity actions in a profile.
+msgid "User actions"
+msgstr "Käyttäjän toiminnot"
+
+#. TRANS: Text shown in user profile of not yet compeltely deleted users.
+msgid "User deletion in progress..."
+msgstr ""
+
+#. TRANS: Link title for link on user profile.
+#, fuzzy
+msgid "Edit profile settings"
+msgstr "Profiiliasetukset"
+
+#. TRANS: Link text for link on user profile.
+msgid "Edit"
+msgstr ""
+
+#. TRANS: Link title for link on user profile.
+msgid "Send a direct message to this user"
+msgstr "Lähetä suora viesti tälle käyttäjälle"
+
+#. TRANS: Link text for link on user profile.
+msgid "Message"
+msgstr "Viesti"
+
+#. TRANS: Label text on user profile to select a user role.
+msgid "Moderate"
+msgstr ""
+
+#. TRANS: Label text on user profile to select a user role.
+#, fuzzy
+msgid "User role"
+msgstr "Käyttäjän profiili"
+
+#. TRANS: Role that can be set for a user profile.
+#, fuzzy
+msgctxt "role"
+msgid "Administrator"
+msgstr "Ylläpitäjät"
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Moderator"
+msgstr ""
+
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
 #, fuzzy, php-format
 msgid "%1$s - %2$s"
@@ -6803,46 +6839,170 @@ msgid_plural "You are a member of these groups:"
 msgstr[0] "Sinä et kuulu tähän ryhmään."
 msgstr[1] "Sinä et kuulu tähän ryhmään."
 
-#. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-msgid ""
-"Commands:\n"
-"on - turn on notifications\n"
-"off - turn off notifications\n"
-"help - show this help\n"
-"follow <nickname> - subscribe to user\n"
-"groups - lists the groups you have joined\n"
-"subscriptions - list the people you follow\n"
-"subscribers - list the people that follow you\n"
-"leave <nickname> - unsubscribe from user\n"
-"d <nickname> <text> - direct message to user\n"
-"get <nickname> - get last notice from user\n"
-"whois <nickname> - get profile info on user\n"
-"lose <nickname> - force user to stop following you\n"
-"fav <nickname> - add user's last notice as a 'fave'\n"
-"fav #<notice_id> - add notice with the given id as a 'fave'\n"
-"repeat #<notice_id> - repeat a notice with a given id\n"
-"repeat <nickname> - repeat the last notice from user\n"
-"reply #<notice_id> - reply to notice with a given id\n"
-"reply <nickname> - reply to the last notice from user\n"
-"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
-"drop <group> - leave group\n"
-"stats - get your stats\n"
-"stop - same as 'off'\n"
-"quit - same as 'off'\n"
-"sub <nickname> - same as 'follow'\n"
-"unsub <nickname> - same as 'leave'\n"
-"last <nickname> - same as 'get'\n"
-"on <nickname> - not yet implemented.\n"
-"off <nickname> - not yet implemented.\n"
-"nudge <nickname> - remind a user to update.\n"
-"invite <phone number> - not yet implemented.\n"
-"track <word> - not yet implemented.\n"
-"untrack <word> - not yet implemented.\n"
-"track off - not yet implemented.\n"
-"untrack all - not yet implemented.\n"
-"tracks - not yet implemented.\n"
-"tracking - not yet implemented.\n"
+#. TRANS: Header line of help text for commands.
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "Commands:"
+msgstr "Komennon tulos"
+
+#. TRANS: Help message for IM/SMS command "on"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "turn on notifications"
+msgstr "Ilmoituksia ei voi pistää päälle."
+
+#. TRANS: Help message for IM/SMS command "off"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "turn off notifications"
+msgstr "Ilmoituksia ei voi pistää pois päältä."
+
+#. TRANS: Help message for IM/SMS command "help"
+msgctxt "COMMANDHELP"
+msgid "show this help"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "follow <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "subscribe to user"
+msgstr "Tilaa tämä käyttäjä"
+
+#. TRANS: Help message for IM/SMS command "groups"
+msgctxt "COMMANDHELP"
+msgid "lists the groups you have joined"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscriptions"
+msgctxt "COMMANDHELP"
+msgid "list the people you follow"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscribers"
+msgctxt "COMMANDHELP"
+msgid "list the people that follow you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "leave <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "unsubscribe from user"
+msgstr "Peruuta tämän käyttäjän tilaus"
+
+#. TRANS: Help message for IM/SMS command "d <nickname> <text>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "direct message to user"
+msgstr "Suorat viestit käyttäjälle %s"
+
+#. TRANS: Help message for IM/SMS command "get <nickname>"
+msgctxt "COMMANDHELP"
+msgid "get last notice from user"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "whois <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "get profile info on user"
+msgstr "Profiilitieto"
+
+#. TRANS: Help message for IM/SMS command "lose <nickname>"
+msgctxt "COMMANDHELP"
+msgid "force user to stop following you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav <nickname>"
+msgctxt "COMMANDHELP"
+msgid "add user's last notice as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "add notice with the given id as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "repeat a notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "repeat the last notice from user"
+msgstr "Vastaa tähän päivitykseen"
+
+#. TRANS: Help message for IM/SMS command "reply #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "reply to notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "reply <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "reply to the last notice from user"
+msgstr "Vastaa tähän päivitykseen"
+
+#. TRANS: Help message for IM/SMS command "join <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "join group"
+msgstr "Tuntematon ryhmä."
+
+#. TRANS: Help message for IM/SMS command "login"
+msgctxt "COMMANDHELP"
+msgid "Get a link to login to the web interface"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "drop <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "leave group"
+msgstr "Poista ryhmä"
+
+#. TRANS: Help message for IM/SMS command "stats"
+msgctxt "COMMANDHELP"
+msgid "get your stats"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "stop"
+#. TRANS: Help message for IM/SMS command "quit"
+msgctxt "COMMANDHELP"
+msgid "same as 'off'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "sub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'follow'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "unsub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'leave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "last <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'get'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "on <nickname>"
+#. TRANS: Help message for IM/SMS command "off <nickname>"
+#. TRANS: Help message for IM/SMS command "invite <phone number>"
+#. TRANS: Help message for IM/SMS command "track <word>"
+#. TRANS: Help message for IM/SMS command "untrack <word>"
+#. TRANS: Help message for IM/SMS command "track off"
+#. TRANS: Help message for IM/SMS command "untrack all"
+#. TRANS: Help message for IM/SMS command "tracks"
+#. TRANS: Help message for IM/SMS command "tracking"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "not yet implemented."
+msgstr "Komentoa ei ole vielä toteutettu."
+
+#. TRANS: Help message for IM/SMS command "nudge <nickname>"
+msgctxt "COMMANDHELP"
+msgid "remind a user to update."
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
@@ -7036,6 +7196,9 @@ msgstr ""
 "Ryhmän paikka, jos sellainen on, kuten \"Kaupunki, Maakunta (tai Lääni), Maa"
 "\""
 
+msgid "Aliases"
+msgstr "Aliakset"
+
 #, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -7114,6 +7277,10 @@ msgctxt "TOOLTIP"
 msgid "Add or edit %s design"
 msgstr ""
 
+#. TRANS: Group actions header (h2). Text hidden by default.
+msgid "Group actions"
+msgstr "Ryhmän toiminnot"
+
 #. TRANS: Title for groups with the most members section.
 msgid "Groups with most members"
 msgstr "Ryhmät, joissa eniten jäseniä"
@@ -7597,6 +7764,7 @@ msgstr "Lähetä päivitys"
 msgid "What's up, %s?"
 msgstr "Mitä teet juuri nyt, %s?"
 
+#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr ""
 
@@ -8070,56 +8238,6 @@ msgstr "Peruuta tilaus"
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "Käyttäjällä ei ole profiilia."
 
-#, fuzzy
-msgid "Edit Avatar"
-msgstr "Kuva"
-
-#. TRANS: H2 for user actions in a profile.
-#. TRANS: H2 for entity actions in a profile.
-msgid "User actions"
-msgstr "Käyttäjän toiminnot"
-
-#. TRANS: Text shown in user profile of not yet compeltely deleted users.
-msgid "User deletion in progress..."
-msgstr ""
-
-#. TRANS: Link title for link on user profile.
-#, fuzzy
-msgid "Edit profile settings"
-msgstr "Profiiliasetukset"
-
-#. TRANS: Link text for link on user profile.
-msgid "Edit"
-msgstr ""
-
-#. TRANS: Link title for link on user profile.
-msgid "Send a direct message to this user"
-msgstr "Lähetä suora viesti tälle käyttäjälle"
-
-#. TRANS: Link text for link on user profile.
-msgid "Message"
-msgstr "Viesti"
-
-#. TRANS: Label text on user profile to select a user role.
-msgid "Moderate"
-msgstr ""
-
-#. TRANS: Label text on user profile to select a user role.
-#, fuzzy
-msgid "User role"
-msgstr "Käyttäjän profiili"
-
-#. TRANS: Role that can be set for a user profile.
-#, fuzzy
-msgctxt "role"
-msgid "Administrator"
-msgstr "Ylläpitäjät"
-
-#. TRANS: Role that can be set for a user profile.
-msgctxt "role"
-msgid "Moderator"
-msgstr ""
-
 #, fuzzy
 msgid "Not allowed to log in."
 msgstr "Et ole kirjautunut sisään."
@@ -8195,3 +8313,10 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#~ msgid "Note"
+#~ msgstr "Huomaa"
+
+#, fuzzy
+#~ msgid "Edit Avatar"
+#~ msgstr "Kuva"
diff --git a/locale/fr/LC_MESSAGES/statusnet.po b/locale/fr/LC_MESSAGES/statusnet.po
index f63f26d5f4..cba78330be 100644
--- a/locale/fr/LC_MESSAGES/statusnet.po
+++ b/locale/fr/LC_MESSAGES/statusnet.po
@@ -21,17 +21,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-11 18:15+0000\n"
-"PO-Revision-Date: 2011-03-11 18:17:07+0000\n"
+"POT-Creation-Date: 2011-03-17 09:47+0000\n"
+"PO-Revision-Date: 2011-03-17 09:49:35+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83703); Translate extension (2011-03-11)\n"
+"X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-POT-Import-Date: 2011-03-08 01:25:01+0000\n"
+"X-POT-Import-Date: 2011-03-11 18:52:41+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -605,7 +605,7 @@ msgstr "Impossible de retirer l’utilisateur %1$s du groupe %2$s."
 msgid "%s's groups"
 msgstr "Groupes de %s"
 
-#. TRANS: Used as subtitle in check for group membership. %1$s is a user name, %2$s is the site name.
+#. TRANS: Used as subtitle in check for group membership. %1$s is the site name, %2$s is a user name.
 #, php-format
 msgid "%1$s groups %2$s is a member of."
 msgstr "Groupes de %1$s dont %2$s est membre."
@@ -4750,18 +4750,6 @@ msgstr "Groupe %s"
 msgid "%1$s group, page %2$d"
 msgstr "Groupe %1$s, page %2$d"
 
-#. TRANS: Label for group description or group note (dt). Text hidden by default.
-msgid "Note"
-msgstr "Note"
-
-#. TRANS: Label for group aliases (dt). Text hidden by default.
-msgid "Aliases"
-msgstr "Alias"
-
-#. TRANS: Group actions header (h2). Text hidden by default.
-msgid "Group actions"
-msgstr "Actions du groupe"
-
 #. TRANS: Tooltip for feed link. %s is a group nickname.
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
@@ -4874,6 +4862,10 @@ msgstr "Message reçu de %1$s le %2$s"
 msgid "Notice deleted."
 msgstr "Avis supprimé."
 
+#, fuzzy
+msgid "Notice"
+msgstr "Avis"
+
 #. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
 #, php-format
 msgid "%1$s tagged %2$s"
@@ -5418,7 +5410,6 @@ msgstr "Aucun argument d’identifiant."
 msgid "Tag %s"
 msgstr "Marque %s"
 
-#. TRANS: H2 for user profile information.
 msgid "User profile"
 msgstr "Profil de l’utilisateur"
 
@@ -6144,6 +6135,49 @@ msgstr ""
 msgid "No AtomPub API service for %s."
 msgstr ""
 
+#. TRANS: H2 for user actions in a profile.
+#. TRANS: H2 for entity actions in a profile.
+msgid "User actions"
+msgstr "Actions de l’utilisateur"
+
+#. TRANS: Text shown in user profile of not yet compeltely deleted users.
+msgid "User deletion in progress..."
+msgstr "Suppression de l'utilisateur en cours..."
+
+#. TRANS: Link title for link on user profile.
+msgid "Edit profile settings"
+msgstr "Modifier les paramètres du profil"
+
+#. TRANS: Link text for link on user profile.
+msgid "Edit"
+msgstr "Modifier"
+
+#. TRANS: Link title for link on user profile.
+msgid "Send a direct message to this user"
+msgstr "Envoyer un message à cet utilisateur"
+
+#. TRANS: Link text for link on user profile.
+msgid "Message"
+msgstr "Message"
+
+#. TRANS: Label text on user profile to select a user role.
+msgid "Moderate"
+msgstr "Modérer"
+
+#. TRANS: Label text on user profile to select a user role.
+msgid "User role"
+msgstr "Rôle de l'utilisateur"
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Administrator"
+msgstr "Administrateur"
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Moderator"
+msgstr "Modérateur"
+
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
 #, php-format
 msgid "%1$s - %2$s"
@@ -6881,86 +6915,171 @@ msgid_plural "You are a member of these groups:"
 msgstr[0] "Vous êtes membre de ce groupe :"
 msgstr[1] "Vous êtes membre de ces groupes :"
 
-#. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-msgid ""
-"Commands:\n"
-"on - turn on notifications\n"
-"off - turn off notifications\n"
-"help - show this help\n"
-"follow <nickname> - subscribe to user\n"
-"groups - lists the groups you have joined\n"
-"subscriptions - list the people you follow\n"
-"subscribers - list the people that follow you\n"
-"leave <nickname> - unsubscribe from user\n"
-"d <nickname> <text> - direct message to user\n"
-"get <nickname> - get last notice from user\n"
-"whois <nickname> - get profile info on user\n"
-"lose <nickname> - force user to stop following you\n"
-"fav <nickname> - add user's last notice as a 'fave'\n"
-"fav #<notice_id> - add notice with the given id as a 'fave'\n"
-"repeat #<notice_id> - repeat a notice with a given id\n"
-"repeat <nickname> - repeat the last notice from user\n"
-"reply #<notice_id> - reply to notice with a given id\n"
-"reply <nickname> - reply to the last notice from user\n"
-"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
-"drop <group> - leave group\n"
-"stats - get your stats\n"
-"stop - same as 'off'\n"
-"quit - same as 'off'\n"
-"sub <nickname> - same as 'follow'\n"
-"unsub <nickname> - same as 'leave'\n"
-"last <nickname> - same as 'get'\n"
-"on <nickname> - not yet implemented.\n"
-"off <nickname> - not yet implemented.\n"
-"nudge <nickname> - remind a user to update.\n"
-"invite <phone number> - not yet implemented.\n"
-"track <word> - not yet implemented.\n"
-"untrack <word> - not yet implemented.\n"
-"track off - not yet implemented.\n"
-"untrack all - not yet implemented.\n"
-"tracks - not yet implemented.\n"
-"tracking - not yet implemented.\n"
+#. TRANS: Header line of help text for commands.
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "Commands:"
+msgstr "Résultats de la commande"
+
+#. TRANS: Help message for IM/SMS command "on"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "turn on notifications"
+msgstr "Impossible d’activer les avertissements."
+
+#. TRANS: Help message for IM/SMS command "off"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "turn off notifications"
+msgstr "Impossible de désactiver les avertissements."
+
+#. TRANS: Help message for IM/SMS command "help"
+msgctxt "COMMANDHELP"
+msgid "show this help"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "follow <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "subscribe to user"
+msgstr "S’abonner à cet utilisateur"
+
+#. TRANS: Help message for IM/SMS command "groups"
+msgctxt "COMMANDHELP"
+msgid "lists the groups you have joined"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscriptions"
+msgctxt "COMMANDHELP"
+msgid "list the people you follow"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscribers"
+msgctxt "COMMANDHELP"
+msgid "list the people that follow you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "leave <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "unsubscribe from user"
+msgstr "Ne plus suivre cet utilisateur"
+
+#. TRANS: Help message for IM/SMS command "d <nickname> <text>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "direct message to user"
+msgstr "Messages directs envoyés à %s"
+
+#. TRANS: Help message for IM/SMS command "get <nickname>"
+msgctxt "COMMANDHELP"
+msgid "get last notice from user"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "whois <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "get profile info on user"
+msgstr "Information de profil"
+
+#. TRANS: Help message for IM/SMS command "lose <nickname>"
+msgctxt "COMMANDHELP"
+msgid "force user to stop following you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav <nickname>"
+msgctxt "COMMANDHELP"
+msgid "add user's last notice as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "add notice with the given id as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "repeat a notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "repeat the last notice from user"
+msgstr "Reprendre cet avis"
+
+#. TRANS: Help message for IM/SMS command "reply #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "reply to notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "reply <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "reply to the last notice from user"
+msgstr "Répondre à cet avis"
+
+#. TRANS: Help message for IM/SMS command "join <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "join group"
+msgstr "Inconnu"
+
+#. TRANS: Help message for IM/SMS command "login"
+msgctxt "COMMANDHELP"
+msgid "Get a link to login to the web interface"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "drop <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "leave group"
+msgstr "Supprimer le groupe"
+
+#. TRANS: Help message for IM/SMS command "stats"
+msgctxt "COMMANDHELP"
+msgid "get your stats"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "stop"
+#. TRANS: Help message for IM/SMS command "quit"
+msgctxt "COMMANDHELP"
+msgid "same as 'off'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "sub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'follow'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "unsub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'leave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "last <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'get'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "on <nickname>"
+#. TRANS: Help message for IM/SMS command "off <nickname>"
+#. TRANS: Help message for IM/SMS command "invite <phone number>"
+#. TRANS: Help message for IM/SMS command "track <word>"
+#. TRANS: Help message for IM/SMS command "untrack <word>"
+#. TRANS: Help message for IM/SMS command "track off"
+#. TRANS: Help message for IM/SMS command "untrack all"
+#. TRANS: Help message for IM/SMS command "tracks"
+#. TRANS: Help message for IM/SMS command "tracking"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "not yet implemented."
+msgstr "Cette commande n’a pas encore été implémentée."
+
+#. TRANS: Help message for IM/SMS command "nudge <nickname>"
+msgctxt "COMMANDHELP"
+msgid "remind a user to update."
 msgstr ""
-"Commandes :\n"
-"on - activer les notifications\n"
-"off - désactiver les notifications\n"
-"help - montrer cette aide\n"
-"follow <nickname> - s’abonner à l’utilisateur\n"
-"groups - lister les groupes que vous avez rejoints\n"
-"subscriptions - lister les personnes que vous suivez\n"
-"subscribers - lister les personnes qui vous suivent\n"
-"leave <nickname> - se désabonner de l’utilisateur\n"
-"d <nickname> <text> - message direct à l’utilisateur\n"
-"get <nickname> - obtenir le dernier avis de l’utilisateur\n"
-"whois <nickname> - obtenir le profil de l’utilisateur\n"
-"lose <nickname> - forcer un utilisateur à arrêter de vous suivre\n"
-"fav <nickname> - ajouter de dernier avis de l’utilisateur comme favori\n"
-"fav #<notice_id> - ajouter l’avis correspondant à l’identifiant comme "
-"favori\n"
-"repeat #<notice_id> - reprendre l’avis correspondant à l’identifiant\n"
-"repeat <nickname> - reprendre le dernier avis de l’utilisateur\n"
-"reply #<notice_id> - répondre à l’avis correspondant à l’identifiant\n"
-"reply <nickname> - répondre au dernier avis de l’utilisateur\n"
-"join <group> - rejoindre le groupe\n"
-"login - Obtenir un lien pour s’identifier sur l’interface web\n"
-"drop <group> - quitter le groupe\n"
-"stats - obtenir vos statistiques\n"
-"stop - même effet que 'off'\n"
-"quit - même effet que 'off'\n"
-"sub <nickname> - même effet que 'follow'\n"
-"unsub <nickname> - même effet que 'leave'\n"
-"last <nickname> - même effet que 'get'\n"
-"on <nickname> - pas encore implémenté.\n"
-"off <nickname> - pas encore implémenté.\n"
-"nudge <nickname> - envoyer un clin d’œil à l’utilisateur.\n"
-"invite <phone number> - pas encore implémenté.\n"
-"track <word> - pas encore implémenté.\n"
-"untrack <word> - pas encore implémenté.\n"
-"track off - pas encore implémenté.\n"
-"untrack all - pas encore implémenté.\n"
-"tracks - pas encore implémenté.\n"
-"tracking - pas encore implémenté.\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 msgid "No configuration file found."
@@ -7139,6 +7258,9 @@ msgstr ""
 "Emplacement du groupe, s’il y a lieu, de la forme « Ville, État (ou région), "
 "pays »"
 
+msgid "Aliases"
+msgstr "Alias"
+
 #, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -7220,6 +7342,10 @@ msgctxt "TOOLTIP"
 msgid "Add or edit %s design"
 msgstr "Ajouter ou modifier l’apparence du groupe « %s »"
 
+#. TRANS: Group actions header (h2). Text hidden by default.
+msgid "Group actions"
+msgstr "Actions du groupe"
+
 #. TRANS: Title for groups with the most members section.
 msgid "Groups with most members"
 msgstr "Groupes avec le plus de membres"
@@ -7794,6 +7920,7 @@ msgstr "Envoyer un avis"
 msgid "What's up, %s?"
 msgstr "Quoi de neuf, %s ?"
 
+#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr "Attacher"
 
@@ -8255,52 +8382,6 @@ msgstr "Désabonnement"
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "L’utilisateur %1$s (%2$d) n’a pas de profil."
 
-msgid "Edit Avatar"
-msgstr "Modifier l’avatar"
-
-#. TRANS: H2 for user actions in a profile.
-#. TRANS: H2 for entity actions in a profile.
-msgid "User actions"
-msgstr "Actions de l’utilisateur"
-
-#. TRANS: Text shown in user profile of not yet compeltely deleted users.
-msgid "User deletion in progress..."
-msgstr "Suppression de l'utilisateur en cours..."
-
-#. TRANS: Link title for link on user profile.
-msgid "Edit profile settings"
-msgstr "Modifier les paramètres du profil"
-
-#. TRANS: Link text for link on user profile.
-msgid "Edit"
-msgstr "Modifier"
-
-#. TRANS: Link title for link on user profile.
-msgid "Send a direct message to this user"
-msgstr "Envoyer un message à cet utilisateur"
-
-#. TRANS: Link text for link on user profile.
-msgid "Message"
-msgstr "Message"
-
-#. TRANS: Label text on user profile to select a user role.
-msgid "Moderate"
-msgstr "Modérer"
-
-#. TRANS: Label text on user profile to select a user role.
-msgid "User role"
-msgstr "Rôle de l'utilisateur"
-
-#. TRANS: Role that can be set for a user profile.
-msgctxt "role"
-msgid "Administrator"
-msgstr "Administrateur"
-
-#. TRANS: Role that can be set for a user profile.
-msgctxt "role"
-msgid "Moderator"
-msgstr "Modérateur"
-
 #, fuzzy
 msgid "Not allowed to log in."
 msgstr "Non connecté."
@@ -8376,3 +8457,89 @@ msgstr "XML invalide, racine XRD manquante."
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr "Obtention de la sauvegarde depuis le fichier « %s »."
+
+#~ msgid "Note"
+#~ msgstr "Note"
+
+#~ msgid ""
+#~ "Commands:\n"
+#~ "on - turn on notifications\n"
+#~ "off - turn off notifications\n"
+#~ "help - show this help\n"
+#~ "follow <nickname> - subscribe to user\n"
+#~ "groups - lists the groups you have joined\n"
+#~ "subscriptions - list the people you follow\n"
+#~ "subscribers - list the people that follow you\n"
+#~ "leave <nickname> - unsubscribe from user\n"
+#~ "d <nickname> <text> - direct message to user\n"
+#~ "get <nickname> - get last notice from user\n"
+#~ "whois <nickname> - get profile info on user\n"
+#~ "lose <nickname> - force user to stop following you\n"
+#~ "fav <nickname> - add user's last notice as a 'fave'\n"
+#~ "fav #<notice_id> - add notice with the given id as a 'fave'\n"
+#~ "repeat #<notice_id> - repeat a notice with a given id\n"
+#~ "repeat <nickname> - repeat the last notice from user\n"
+#~ "reply #<notice_id> - reply to notice with a given id\n"
+#~ "reply <nickname> - reply to the last notice from user\n"
+#~ "join <group> - join group\n"
+#~ "login - Get a link to login to the web interface\n"
+#~ "drop <group> - leave group\n"
+#~ "stats - get your stats\n"
+#~ "stop - same as 'off'\n"
+#~ "quit - same as 'off'\n"
+#~ "sub <nickname> - same as 'follow'\n"
+#~ "unsub <nickname> - same as 'leave'\n"
+#~ "last <nickname> - same as 'get'\n"
+#~ "on <nickname> - not yet implemented.\n"
+#~ "off <nickname> - not yet implemented.\n"
+#~ "nudge <nickname> - remind a user to update.\n"
+#~ "invite <phone number> - not yet implemented.\n"
+#~ "track <word> - not yet implemented.\n"
+#~ "untrack <word> - not yet implemented.\n"
+#~ "track off - not yet implemented.\n"
+#~ "untrack all - not yet implemented.\n"
+#~ "tracks - not yet implemented.\n"
+#~ "tracking - not yet implemented.\n"
+#~ msgstr ""
+#~ "Commandes :\n"
+#~ "on - activer les notifications\n"
+#~ "off - désactiver les notifications\n"
+#~ "help - montrer cette aide\n"
+#~ "follow <nickname> - s’abonner à l’utilisateur\n"
+#~ "groups - lister les groupes que vous avez rejoints\n"
+#~ "subscriptions - lister les personnes que vous suivez\n"
+#~ "subscribers - lister les personnes qui vous suivent\n"
+#~ "leave <nickname> - se désabonner de l’utilisateur\n"
+#~ "d <nickname> <text> - message direct à l’utilisateur\n"
+#~ "get <nickname> - obtenir le dernier avis de l’utilisateur\n"
+#~ "whois <nickname> - obtenir le profil de l’utilisateur\n"
+#~ "lose <nickname> - forcer un utilisateur à arrêter de vous suivre\n"
+#~ "fav <nickname> - ajouter de dernier avis de l’utilisateur comme favori\n"
+#~ "fav #<notice_id> - ajouter l’avis correspondant à l’identifiant comme "
+#~ "favori\n"
+#~ "repeat #<notice_id> - reprendre l’avis correspondant à l’identifiant\n"
+#~ "repeat <nickname> - reprendre le dernier avis de l’utilisateur\n"
+#~ "reply #<notice_id> - répondre à l’avis correspondant à l’identifiant\n"
+#~ "reply <nickname> - répondre au dernier avis de l’utilisateur\n"
+#~ "join <group> - rejoindre le groupe\n"
+#~ "login - Obtenir un lien pour s’identifier sur l’interface web\n"
+#~ "drop <group> - quitter le groupe\n"
+#~ "stats - obtenir vos statistiques\n"
+#~ "stop - même effet que 'off'\n"
+#~ "quit - même effet que 'off'\n"
+#~ "sub <nickname> - même effet que 'follow'\n"
+#~ "unsub <nickname> - même effet que 'leave'\n"
+#~ "last <nickname> - même effet que 'get'\n"
+#~ "on <nickname> - pas encore implémenté.\n"
+#~ "off <nickname> - pas encore implémenté.\n"
+#~ "nudge <nickname> - envoyer un clin d’œil à l’utilisateur.\n"
+#~ "invite <phone number> - pas encore implémenté.\n"
+#~ "track <word> - pas encore implémenté.\n"
+#~ "untrack <word> - pas encore implémenté.\n"
+#~ "track off - pas encore implémenté.\n"
+#~ "untrack all - pas encore implémenté.\n"
+#~ "tracks - pas encore implémenté.\n"
+#~ "tracking - pas encore implémenté.\n"
+
+#~ msgid "Edit Avatar"
+#~ msgstr "Modifier l’avatar"
diff --git a/locale/fur/LC_MESSAGES/statusnet.po b/locale/fur/LC_MESSAGES/statusnet.po
index 12cca595ec..94f77eb11c 100644
--- a/locale/fur/LC_MESSAGES/statusnet.po
+++ b/locale/fur/LC_MESSAGES/statusnet.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-11 18:15+0000\n"
-"PO-Revision-Date: 2011-03-11 18:17:08+0000\n"
+"POT-Creation-Date: 2011-03-17 09:47+0000\n"
+"PO-Revision-Date: 2011-03-17 09:49:36+0000\n"
 "Language-Team: Friulian <http://translatewiki.net/wiki/Portal:fur>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-08 01:25:01+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83703); Translate extension (2011-03-11)\n"
+"X-POT-Import-Date: 2011-03-11 18:52:41+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fur\n"
 "X-Message-Group: #out-statusnet-core\n"
@@ -577,7 +577,7 @@ msgstr ""
 msgid "%s's groups"
 msgstr "Grups di %s"
 
-#. TRANS: Used as subtitle in check for group membership. %1$s is a user name, %2$s is the site name.
+#. TRANS: Used as subtitle in check for group membership. %1$s is the site name, %2$s is a user name.
 #, php-format
 msgid "%1$s groups %2$s is a member of."
 msgstr ""
@@ -4441,18 +4441,6 @@ msgstr "Grup %s"
 msgid "%1$s group, page %2$d"
 msgstr "Grup %1$s, pagjine %2$d"
 
-#. TRANS: Label for group description or group note (dt). Text hidden by default.
-msgid "Note"
-msgstr "Note"
-
-#. TRANS: Label for group aliases (dt). Text hidden by default.
-msgid "Aliases"
-msgstr ""
-
-#. TRANS: Group actions header (h2). Text hidden by default.
-msgid "Group actions"
-msgstr "Azions dal grup"
-
 #. TRANS: Tooltip for feed link. %s is a group nickname.
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
@@ -4563,6 +4551,10 @@ msgstr "Messaç di %1$s su %2$s"
 msgid "Notice deleted."
 msgstr "L'avîs al è stât eliminât."
 
+#, fuzzy
+msgid "Notice"
+msgstr "Avîs"
+
 #. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
 #, php-format
 msgid "%1$s tagged %2$s"
@@ -5072,7 +5064,6 @@ msgstr ""
 msgid "Tag %s"
 msgstr "Etichete %s"
 
-#. TRANS: H2 for user profile information.
 msgid "User profile"
 msgstr "Profîl dal utent"
 
@@ -5740,6 +5731,49 @@ msgstr ""
 msgid "No AtomPub API service for %s."
 msgstr ""
 
+#. TRANS: H2 for user actions in a profile.
+#. TRANS: H2 for entity actions in a profile.
+msgid "User actions"
+msgstr "Azions dal utent"
+
+#. TRANS: Text shown in user profile of not yet compeltely deleted users.
+msgid "User deletion in progress..."
+msgstr ""
+
+#. TRANS: Link title for link on user profile.
+msgid "Edit profile settings"
+msgstr "Cambie lis impuestazions dal profîl"
+
+#. TRANS: Link text for link on user profile.
+msgid "Edit"
+msgstr "Cambie"
+
+#. TRANS: Link title for link on user profile.
+msgid "Send a direct message to this user"
+msgstr "Mande un messaç diret a chest utent"
+
+#. TRANS: Link text for link on user profile.
+msgid "Message"
+msgstr "Messaç"
+
+#. TRANS: Label text on user profile to select a user role.
+msgid "Moderate"
+msgstr ""
+
+#. TRANS: Label text on user profile to select a user role.
+msgid "User role"
+msgstr "Rûl dal utent"
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Administrator"
+msgstr "Aministradôr"
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Moderator"
+msgstr "Moderatôr"
+
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
 #, php-format
 msgid "%1$s - %2$s"
@@ -6457,46 +6491,166 @@ msgid_plural "You are a member of these groups:"
 msgstr[0] "Tu sês un membri di chest grup:"
 msgstr[1] "Tu sês un membri di chescj grups:"
 
-#. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-msgid ""
-"Commands:\n"
-"on - turn on notifications\n"
-"off - turn off notifications\n"
-"help - show this help\n"
-"follow <nickname> - subscribe to user\n"
-"groups - lists the groups you have joined\n"
-"subscriptions - list the people you follow\n"
-"subscribers - list the people that follow you\n"
-"leave <nickname> - unsubscribe from user\n"
-"d <nickname> <text> - direct message to user\n"
-"get <nickname> - get last notice from user\n"
-"whois <nickname> - get profile info on user\n"
-"lose <nickname> - force user to stop following you\n"
-"fav <nickname> - add user's last notice as a 'fave'\n"
-"fav #<notice_id> - add notice with the given id as a 'fave'\n"
-"repeat #<notice_id> - repeat a notice with a given id\n"
-"repeat <nickname> - repeat the last notice from user\n"
-"reply #<notice_id> - reply to notice with a given id\n"
-"reply <nickname> - reply to the last notice from user\n"
-"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
-"drop <group> - leave group\n"
-"stats - get your stats\n"
-"stop - same as 'off'\n"
-"quit - same as 'off'\n"
-"sub <nickname> - same as 'follow'\n"
-"unsub <nickname> - same as 'leave'\n"
-"last <nickname> - same as 'get'\n"
-"on <nickname> - not yet implemented.\n"
-"off <nickname> - not yet implemented.\n"
-"nudge <nickname> - remind a user to update.\n"
-"invite <phone number> - not yet implemented.\n"
-"track <word> - not yet implemented.\n"
-"untrack <word> - not yet implemented.\n"
-"track off - not yet implemented.\n"
-"untrack all - not yet implemented.\n"
-"tracks - not yet implemented.\n"
-"tracking - not yet implemented.\n"
+#. TRANS: Header line of help text for commands.
+msgctxt "COMMANDHELP"
+msgid "Commands:"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "on"
+msgctxt "COMMANDHELP"
+msgid "turn on notifications"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "off"
+msgctxt "COMMANDHELP"
+msgid "turn off notifications"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "help"
+msgctxt "COMMANDHELP"
+msgid "show this help"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "follow <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "subscribe to user"
+msgstr "Sotscrivimi a chest utent"
+
+#. TRANS: Help message for IM/SMS command "groups"
+msgctxt "COMMANDHELP"
+msgid "lists the groups you have joined"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscriptions"
+msgctxt "COMMANDHELP"
+msgid "list the people you follow"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscribers"
+msgctxt "COMMANDHELP"
+msgid "list the people that follow you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "leave <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "unsubscribe from user"
+msgstr "No tu sês plui sotscrit a %s."
+
+#. TRANS: Help message for IM/SMS command "d <nickname> <text>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "direct message to user"
+msgstr "Messaçs direts par %s"
+
+#. TRANS: Help message for IM/SMS command "get <nickname>"
+msgctxt "COMMANDHELP"
+msgid "get last notice from user"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "whois <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "get profile info on user"
+msgstr "Informazions sul profîl"
+
+#. TRANS: Help message for IM/SMS command "lose <nickname>"
+msgctxt "COMMANDHELP"
+msgid "force user to stop following you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav <nickname>"
+msgctxt "COMMANDHELP"
+msgid "add user's last notice as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "add notice with the given id as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "repeat a notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "repeat the last notice from user"
+msgstr "Ripet chest avîs"
+
+#. TRANS: Help message for IM/SMS command "reply #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "reply to notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "reply <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "reply to the last notice from user"
+msgstr "Rispuint a chest avîs"
+
+#. TRANS: Help message for IM/SMS command "join <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "join group"
+msgstr "Grup %s"
+
+#. TRANS: Help message for IM/SMS command "login"
+msgctxt "COMMANDHELP"
+msgid "Get a link to login to the web interface"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "drop <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "leave group"
+msgstr "Elimine il grup"
+
+#. TRANS: Help message for IM/SMS command "stats"
+msgctxt "COMMANDHELP"
+msgid "get your stats"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "stop"
+#. TRANS: Help message for IM/SMS command "quit"
+msgctxt "COMMANDHELP"
+msgid "same as 'off'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "sub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'follow'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "unsub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'leave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "last <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'get'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "on <nickname>"
+#. TRANS: Help message for IM/SMS command "off <nickname>"
+#. TRANS: Help message for IM/SMS command "invite <phone number>"
+#. TRANS: Help message for IM/SMS command "track <word>"
+#. TRANS: Help message for IM/SMS command "untrack <word>"
+#. TRANS: Help message for IM/SMS command "track off"
+#. TRANS: Help message for IM/SMS command "untrack all"
+#. TRANS: Help message for IM/SMS command "tracks"
+#. TRANS: Help message for IM/SMS command "tracking"
+msgctxt "COMMANDHELP"
+msgid "not yet implemented."
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "nudge <nickname>"
+msgctxt "COMMANDHELP"
+msgid "remind a user to update."
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
@@ -6670,6 +6824,9 @@ msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\"."
 msgstr "Lûc dal grup, se al esist, come \"Citât, Regjon, Stât\"."
 
+msgid "Aliases"
+msgstr ""
+
 #, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -6747,6 +6904,10 @@ msgctxt "TOOLTIP"
 msgid "Add or edit %s design"
 msgstr ""
 
+#. TRANS: Group actions header (h2). Text hidden by default.
+msgid "Group actions"
+msgstr "Azions dal grup"
+
 #. TRANS: Title for groups with the most members section.
 msgid "Groups with most members"
 msgstr "Grups cun plui membris"
@@ -7209,6 +7370,7 @@ msgstr "Mande un avîs"
 msgid "What's up, %s?"
 msgstr "Ce sucedial, %s?"
 
+#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr "Aleghe"
 
@@ -7667,52 +7829,6 @@ msgstr ""
 msgid "User %1$s (%2$d) has no profile record."
 msgstr ""
 
-msgid "Edit Avatar"
-msgstr "Modifiche l'avatar"
-
-#. TRANS: H2 for user actions in a profile.
-#. TRANS: H2 for entity actions in a profile.
-msgid "User actions"
-msgstr "Azions dal utent"
-
-#. TRANS: Text shown in user profile of not yet compeltely deleted users.
-msgid "User deletion in progress..."
-msgstr ""
-
-#. TRANS: Link title for link on user profile.
-msgid "Edit profile settings"
-msgstr "Cambie lis impuestazions dal profîl"
-
-#. TRANS: Link text for link on user profile.
-msgid "Edit"
-msgstr "Cambie"
-
-#. TRANS: Link title for link on user profile.
-msgid "Send a direct message to this user"
-msgstr "Mande un messaç diret a chest utent"
-
-#. TRANS: Link text for link on user profile.
-msgid "Message"
-msgstr "Messaç"
-
-#. TRANS: Label text on user profile to select a user role.
-msgid "Moderate"
-msgstr ""
-
-#. TRANS: Label text on user profile to select a user role.
-msgid "User role"
-msgstr "Rûl dal utent"
-
-#. TRANS: Role that can be set for a user profile.
-msgctxt "role"
-msgid "Administrator"
-msgstr "Aministradôr"
-
-#. TRANS: Role that can be set for a user profile.
-msgctxt "role"
-msgid "Moderator"
-msgstr "Moderatôr"
-
 #, fuzzy
 msgid "Not allowed to log in."
 msgstr "No tu sês jentrât."
@@ -7787,3 +7903,9 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#~ msgid "Note"
+#~ msgstr "Note"
+
+#~ msgid "Edit Avatar"
+#~ msgstr "Modifiche l'avatar"
diff --git a/locale/gl/LC_MESSAGES/statusnet.po b/locale/gl/LC_MESSAGES/statusnet.po
index f189cd13b7..98903771ff 100644
--- a/locale/gl/LC_MESSAGES/statusnet.po
+++ b/locale/gl/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-03-11 18:15+0000\n"
-"PO-Revision-Date: 2011-03-11 18:17:09+0000\n"
+"POT-Creation-Date: 2011-03-17 09:47+0000\n"
+"PO-Revision-Date: 2011-03-17 09:49:37+0000\n"
 "Language-Team: Galician <http://translatewiki.net/wiki/Portal:gl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83703); Translate extension (2011-03-11)\n"
+"X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: gl\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-03-08 01:25:01+0000\n"
+"X-POT-Import-Date: 2011-03-11 18:52:41+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -593,7 +593,7 @@ msgstr "O usuario %1$s non se puido eliminar do grupo %2$s."
 msgid "%s's groups"
 msgstr "Os grupos de %s"
 
-#. TRANS: Used as subtitle in check for group membership. %1$s is a user name, %2$s is the site name.
+#. TRANS: Used as subtitle in check for group membership. %1$s is the site name, %2$s is a user name.
 #, php-format
 msgid "%1$s groups %2$s is a member of."
 msgstr "Grupos de %1$s aos que pertence %2$s."
@@ -4739,18 +4739,6 @@ msgstr "Grupo %s"
 msgid "%1$s group, page %2$d"
 msgstr "Grupo %1$s, páxina %2$d"
 
-#. TRANS: Label for group description or group note (dt). Text hidden by default.
-msgid "Note"
-msgstr "Nota"
-
-#. TRANS: Label for group aliases (dt). Text hidden by default.
-msgid "Aliases"
-msgstr "Pseudónimos"
-
-#. TRANS: Group actions header (h2). Text hidden by default.
-msgid "Group actions"
-msgstr "Accións do grupo"
-
 #. TRANS: Tooltip for feed link. %s is a group nickname.
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
@@ -4862,6 +4850,10 @@ msgstr "Mensaxe de %1$s en %2$s"
 msgid "Notice deleted."
 msgstr "Borrouse a nota."
 
+#, fuzzy
+msgid "Notice"
+msgstr "Notas"
+
 #. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
 #, fuzzy, php-format
 msgid "%1$s tagged %2$s"
@@ -5402,7 +5394,6 @@ msgstr "Sen argumento ID."
 msgid "Tag %s"
 msgstr "Etiqueta %s"
 
-#. TRANS: H2 for user profile information.
 msgid "User profile"
 msgstr "Perfil do usuario"
 
@@ -6126,6 +6117,49 @@ msgstr ""
 msgid "No AtomPub API service for %s."
 msgstr ""
 
+#. TRANS: H2 for user actions in a profile.
+#. TRANS: H2 for entity actions in a profile.
+msgid "User actions"
+msgstr "Accións do usuario"
+
+#. TRANS: Text shown in user profile of not yet compeltely deleted users.
+msgid "User deletion in progress..."
+msgstr "Procedendo a borrar o usuario..."
+
+#. TRANS: Link title for link on user profile.
+msgid "Edit profile settings"
+msgstr "Modificar a configuración do perfil"
+
+#. TRANS: Link text for link on user profile.
+msgid "Edit"
+msgstr "Modificar"
+
+#. TRANS: Link title for link on user profile.
+msgid "Send a direct message to this user"
+msgstr "Enviarlle unha mensaxe directa a este usuario"
+
+#. TRANS: Link text for link on user profile.
+msgid "Message"
+msgstr "Mensaxe"
+
+#. TRANS: Label text on user profile to select a user role.
+msgid "Moderate"
+msgstr "Moderar"
+
+#. TRANS: Label text on user profile to select a user role.
+msgid "User role"
+msgstr "Rol do usuario"
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Administrator"
+msgstr "Administrador"
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Moderator"
+msgstr "Moderador"
+
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
 #, php-format
 msgid "%1$s - %2$s"
@@ -6865,85 +6899,171 @@ msgid_plural "You are a member of these groups:"
 msgstr[0] "Vostede pertence a este grupo:"
 msgstr[1] "Vostede pertence a estes grupos:"
 
-#. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-msgid ""
-"Commands:\n"
-"on - turn on notifications\n"
-"off - turn off notifications\n"
-"help - show this help\n"
-"follow <nickname> - subscribe to user\n"
-"groups - lists the groups you have joined\n"
-"subscriptions - list the people you follow\n"
-"subscribers - list the people that follow you\n"
-"leave <nickname> - unsubscribe from user\n"
-"d <nickname> <text> - direct message to user\n"
-"get <nickname> - get last notice from user\n"
-"whois <nickname> - get profile info on user\n"
-"lose <nickname> - force user to stop following you\n"
-"fav <nickname> - add user's last notice as a 'fave'\n"
-"fav #<notice_id> - add notice with the given id as a 'fave'\n"
-"repeat #<notice_id> - repeat a notice with a given id\n"
-"repeat <nickname> - repeat the last notice from user\n"
-"reply #<notice_id> - reply to notice with a given id\n"
-"reply <nickname> - reply to the last notice from user\n"
-"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
-"drop <group> - leave group\n"
-"stats - get your stats\n"
-"stop - same as 'off'\n"
-"quit - same as 'off'\n"
-"sub <nickname> - same as 'follow'\n"
-"unsub <nickname> - same as 'leave'\n"
-"last <nickname> - same as 'get'\n"
-"on <nickname> - not yet implemented.\n"
-"off <nickname> - not yet implemented.\n"
-"nudge <nickname> - remind a user to update.\n"
-"invite <phone number> - not yet implemented.\n"
-"track <word> - not yet implemented.\n"
-"untrack <word> - not yet implemented.\n"
-"track off - not yet implemented.\n"
-"untrack all - not yet implemented.\n"
-"tracks - not yet implemented.\n"
-"tracking - not yet implemented.\n"
+#. TRANS: Header line of help text for commands.
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "Commands:"
+msgstr "Resultados da orde"
+
+#. TRANS: Help message for IM/SMS command "on"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "turn on notifications"
+msgstr "Non se pode activar a notificación."
+
+#. TRANS: Help message for IM/SMS command "off"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "turn off notifications"
+msgstr "Non se pode desactivar a notificación."
+
+#. TRANS: Help message for IM/SMS command "help"
+msgctxt "COMMANDHELP"
+msgid "show this help"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "follow <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "subscribe to user"
+msgstr "Subscribirse a este usuario"
+
+#. TRANS: Help message for IM/SMS command "groups"
+msgctxt "COMMANDHELP"
+msgid "lists the groups you have joined"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscriptions"
+msgctxt "COMMANDHELP"
+msgid "list the people you follow"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscribers"
+msgctxt "COMMANDHELP"
+msgid "list the people that follow you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "leave <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "unsubscribe from user"
+msgstr "Cancelar a subscrición a este usuario"
+
+#. TRANS: Help message for IM/SMS command "d <nickname> <text>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "direct message to user"
+msgstr "Mensaxes directas a %s"
+
+#. TRANS: Help message for IM/SMS command "get <nickname>"
+msgctxt "COMMANDHELP"
+msgid "get last notice from user"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "whois <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "get profile info on user"
+msgstr "Información do perfil"
+
+#. TRANS: Help message for IM/SMS command "lose <nickname>"
+msgctxt "COMMANDHELP"
+msgid "force user to stop following you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav <nickname>"
+msgctxt "COMMANDHELP"
+msgid "add user's last notice as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "add notice with the given id as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "repeat a notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "repeat the last notice from user"
+msgstr "Repetir esta nota"
+
+#. TRANS: Help message for IM/SMS command "reply #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "reply to notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "reply <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "reply to the last notice from user"
+msgstr "Responder a esta nota"
+
+#. TRANS: Help message for IM/SMS command "join <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "join group"
+msgstr "Descoñecida"
+
+#. TRANS: Help message for IM/SMS command "login"
+msgctxt "COMMANDHELP"
+msgid "Get a link to login to the web interface"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "drop <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "leave group"
+msgstr "Borrar un grupo"
+
+#. TRANS: Help message for IM/SMS command "stats"
+msgctxt "COMMANDHELP"
+msgid "get your stats"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "stop"
+#. TRANS: Help message for IM/SMS command "quit"
+msgctxt "COMMANDHELP"
+msgid "same as 'off'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "sub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'follow'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "unsub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'leave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "last <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'get'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "on <nickname>"
+#. TRANS: Help message for IM/SMS command "off <nickname>"
+#. TRANS: Help message for IM/SMS command "invite <phone number>"
+#. TRANS: Help message for IM/SMS command "track <word>"
+#. TRANS: Help message for IM/SMS command "untrack <word>"
+#. TRANS: Help message for IM/SMS command "track off"
+#. TRANS: Help message for IM/SMS command "untrack all"
+#. TRANS: Help message for IM/SMS command "tracks"
+#. TRANS: Help message for IM/SMS command "tracking"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "not yet implemented."
+msgstr "Aínda non se integrou esa orde."
+
+#. TRANS: Help message for IM/SMS command "nudge <nickname>"
+msgctxt "COMMANDHELP"
+msgid "remind a user to update."
 msgstr ""
-"Ordes:\n"
-"on - activa as notificacións\n"
-"off - desactiva as notificacións\n"
-"help - amosa esta axuda\n"
-"follow <alcume> - subscribirse ao usuario\n"
-"groups - lista os grupos nos que está\n"
-"subscriptions - lista a xente á que segue\n"
-"subscribers - lista a xente que o segue\n"
-"leave <alcume> - cancela a subscrición ao usuario\n"
-"d <alcume> <texto> - mensaxe directa a un usuario\n"
-"get <alcume> - obter a última nota do usuario\n"
-"whois <alcume> - obtén a información do perfil do usuario\n"
-"lose <alcume> - facer que o usuario deixe de seguilo\n"
-"fav <alcume> - marcar como \"favorita\" a última nota do usuario\n"
-"fav #<id da nota> - marcar como \"favorita\" a nota coa id indicada\n"
-"repeat #<id da nota> - repetir a nota doa id indicada\n"
-"repeat <alcume> - repetir a última nota do usuario\n"
-"reply #<id da nota> - responder a unha nota coa id indicada\n"
-"reply <alcume> - responder á última nota do usuario\n"
-"join <grupo> - unirse ao grupo indicado\n"
-"login - obter un enderezo para identificarse na interface web\n"
-"drop <grupo> - deixar o grupo indicado\n"
-"stats - obter as súas estatísticas\n"
-"stop - idéntico a \"off\"\n"
-"quit - idéntico a \"off\"\n"
-"sub <alcume> - idéntico a \"follow\"\n"
-"unsub <alcume> - idéntico a \"leave\"\n"
-"last <alcume> - idéntico a \"get\"\n"
-"on <alcume> - aínda non se integrou\n"
-"off <alcume> - aínda non se integrou\n"
-"nudge <alcume> - facerlle un aceno ao usuario indicado\n"
-"invite <número de teléfono> - aínda non se integrou\n"
-"track <palabra> - aínda non se integrou\n"
-"untrack <palabra> - aínda non se integrou\n"
-"track off - aínda non se integrou\n"
-"untrack all - aínda non se integrou\n"
-"tracks - aínda non se integrou\n"
-"tracking - aínda non se integrou\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #, fuzzy
@@ -7130,6 +7250,9 @@ msgstr ""
 "Localidade do grupo, se a ten, como por exemplo \"Cidade, Provincia, "
 "Comunidade, País\""
 
+msgid "Aliases"
+msgstr "Pseudónimos"
+
 #, fuzzy, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -7211,6 +7334,10 @@ msgctxt "TOOLTIP"
 msgid "Add or edit %s design"
 msgstr "Engadir ou modificar o deseño de %s"
 
+#. TRANS: Group actions header (h2). Text hidden by default.
+msgid "Group actions"
+msgstr "Accións do grupo"
+
 #. TRANS: Title for groups with the most members section.
 msgid "Groups with most members"
 msgstr "Grupos con máis membros"
@@ -7781,6 +7908,7 @@ msgstr "Enviar unha nota"
 msgid "What's up, %s?"
 msgstr "Que hai de novo, %s?"
 
+#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr "Anexar"
 
@@ -8248,52 +8376,6 @@ msgstr "Cancelar a subscrición"
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "O usuario %1$s (%2$d) non ten perfil."
 
-msgid "Edit Avatar"
-msgstr "Modificar o avatar"
-
-#. TRANS: H2 for user actions in a profile.
-#. TRANS: H2 for entity actions in a profile.
-msgid "User actions"
-msgstr "Accións do usuario"
-
-#. TRANS: Text shown in user profile of not yet compeltely deleted users.
-msgid "User deletion in progress..."
-msgstr "Procedendo a borrar o usuario..."
-
-#. TRANS: Link title for link on user profile.
-msgid "Edit profile settings"
-msgstr "Modificar a configuración do perfil"
-
-#. TRANS: Link text for link on user profile.
-msgid "Edit"
-msgstr "Modificar"
-
-#. TRANS: Link title for link on user profile.
-msgid "Send a direct message to this user"
-msgstr "Enviarlle unha mensaxe directa a este usuario"
-
-#. TRANS: Link text for link on user profile.
-msgid "Message"
-msgstr "Mensaxe"
-
-#. TRANS: Label text on user profile to select a user role.
-msgid "Moderate"
-msgstr "Moderar"
-
-#. TRANS: Label text on user profile to select a user role.
-msgid "User role"
-msgstr "Rol do usuario"
-
-#. TRANS: Role that can be set for a user profile.
-msgctxt "role"
-msgid "Administrator"
-msgstr "Administrador"
-
-#. TRANS: Role that can be set for a user profile.
-msgctxt "role"
-msgid "Moderator"
-msgstr "Moderador"
-
 #, fuzzy
 msgid "Not allowed to log in."
 msgstr "Non iniciou sesión."
@@ -8369,3 +8451,88 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#~ msgid "Note"
+#~ msgstr "Nota"
+
+#~ msgid ""
+#~ "Commands:\n"
+#~ "on - turn on notifications\n"
+#~ "off - turn off notifications\n"
+#~ "help - show this help\n"
+#~ "follow <nickname> - subscribe to user\n"
+#~ "groups - lists the groups you have joined\n"
+#~ "subscriptions - list the people you follow\n"
+#~ "subscribers - list the people that follow you\n"
+#~ "leave <nickname> - unsubscribe from user\n"
+#~ "d <nickname> <text> - direct message to user\n"
+#~ "get <nickname> - get last notice from user\n"
+#~ "whois <nickname> - get profile info on user\n"
+#~ "lose <nickname> - force user to stop following you\n"
+#~ "fav <nickname> - add user's last notice as a 'fave'\n"
+#~ "fav #<notice_id> - add notice with the given id as a 'fave'\n"
+#~ "repeat #<notice_id> - repeat a notice with a given id\n"
+#~ "repeat <nickname> - repeat the last notice from user\n"
+#~ "reply #<notice_id> - reply to notice with a given id\n"
+#~ "reply <nickname> - reply to the last notice from user\n"
+#~ "join <group> - join group\n"
+#~ "login - Get a link to login to the web interface\n"
+#~ "drop <group> - leave group\n"
+#~ "stats - get your stats\n"
+#~ "stop - same as 'off'\n"
+#~ "quit - same as 'off'\n"
+#~ "sub <nickname> - same as 'follow'\n"
+#~ "unsub <nickname> - same as 'leave'\n"
+#~ "last <nickname> - same as 'get'\n"
+#~ "on <nickname> - not yet implemented.\n"
+#~ "off <nickname> - not yet implemented.\n"
+#~ "nudge <nickname> - remind a user to update.\n"
+#~ "invite <phone number> - not yet implemented.\n"
+#~ "track <word> - not yet implemented.\n"
+#~ "untrack <word> - not yet implemented.\n"
+#~ "track off - not yet implemented.\n"
+#~ "untrack all - not yet implemented.\n"
+#~ "tracks - not yet implemented.\n"
+#~ "tracking - not yet implemented.\n"
+#~ msgstr ""
+#~ "Ordes:\n"
+#~ "on - activa as notificacións\n"
+#~ "off - desactiva as notificacións\n"
+#~ "help - amosa esta axuda\n"
+#~ "follow <alcume> - subscribirse ao usuario\n"
+#~ "groups - lista os grupos nos que está\n"
+#~ "subscriptions - lista a xente á que segue\n"
+#~ "subscribers - lista a xente que o segue\n"
+#~ "leave <alcume> - cancela a subscrición ao usuario\n"
+#~ "d <alcume> <texto> - mensaxe directa a un usuario\n"
+#~ "get <alcume> - obter a última nota do usuario\n"
+#~ "whois <alcume> - obtén a información do perfil do usuario\n"
+#~ "lose <alcume> - facer que o usuario deixe de seguilo\n"
+#~ "fav <alcume> - marcar como \"favorita\" a última nota do usuario\n"
+#~ "fav #<id da nota> - marcar como \"favorita\" a nota coa id indicada\n"
+#~ "repeat #<id da nota> - repetir a nota doa id indicada\n"
+#~ "repeat <alcume> - repetir a última nota do usuario\n"
+#~ "reply #<id da nota> - responder a unha nota coa id indicada\n"
+#~ "reply <alcume> - responder á última nota do usuario\n"
+#~ "join <grupo> - unirse ao grupo indicado\n"
+#~ "login - obter un enderezo para identificarse na interface web\n"
+#~ "drop <grupo> - deixar o grupo indicado\n"
+#~ "stats - obter as súas estatísticas\n"
+#~ "stop - idéntico a \"off\"\n"
+#~ "quit - idéntico a \"off\"\n"
+#~ "sub <alcume> - idéntico a \"follow\"\n"
+#~ "unsub <alcume> - idéntico a \"leave\"\n"
+#~ "last <alcume> - idéntico a \"get\"\n"
+#~ "on <alcume> - aínda non se integrou\n"
+#~ "off <alcume> - aínda non se integrou\n"
+#~ "nudge <alcume> - facerlle un aceno ao usuario indicado\n"
+#~ "invite <número de teléfono> - aínda non se integrou\n"
+#~ "track <palabra> - aínda non se integrou\n"
+#~ "untrack <palabra> - aínda non se integrou\n"
+#~ "track off - aínda non se integrou\n"
+#~ "untrack all - aínda non se integrou\n"
+#~ "tracks - aínda non se integrou\n"
+#~ "tracking - aínda non se integrou\n"
+
+#~ msgid "Edit Avatar"
+#~ msgstr "Modificar o avatar"
diff --git a/locale/hsb/LC_MESSAGES/statusnet.po b/locale/hsb/LC_MESSAGES/statusnet.po
index c878043d4b..c61a1d5452 100644
--- a/locale/hsb/LC_MESSAGES/statusnet.po
+++ b/locale/hsb/LC_MESSAGES/statusnet.po
@@ -11,18 +11,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-11 18:15+0000\n"
-"PO-Revision-Date: 2011-03-11 18:17:10+0000\n"
+"POT-Creation-Date: 2011-03-17 09:47+0000\n"
+"PO-Revision-Date: 2011-03-17 09:49:39+0000\n"
 "Language-Team: Upper Sorbian <http://translatewiki.net/wiki/Portal:hsb>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83703); Translate extension (2011-03-11)\n"
+"X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: hsb\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : (n%100==3 || "
 "n%100==4) ? 2 : 3)\n"
-"X-POT-Import-Date: 2011-03-08 01:25:01+0000\n"
+"X-POT-Import-Date: 2011-03-11 18:52:41+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -588,7 +588,7 @@ msgstr "Njebě móžno wužiwarja %1$s ze skupiny %2$s wotstronić."
 msgid "%s's groups"
 msgstr "Skupiny wužiwarja %s"
 
-#. TRANS: Used as subtitle in check for group membership. %1$s is a user name, %2$s is the site name.
+#. TRANS: Used as subtitle in check for group membership. %1$s is the site name, %2$s is a user name.
 #, php-format
 msgid "%1$s groups %2$s is a member of."
 msgstr "Skupiny na %1$s, w kotrychž wužiwar %2$s je čłon."
@@ -1027,7 +1027,6 @@ msgid "Can only fave notices."
 msgstr "Jenož zdźělenki dadźa so jako fawority składować."
 
 #. TRANS: Client exception thrown when trying favorite a notice without content.
-#, fuzzy
 msgid "Unknown notice."
 msgstr "Njeznata notica."
 
@@ -4455,18 +4454,6 @@ msgstr "skupina %s"
 msgid "%1$s group, page %2$d"
 msgstr "%1$s skupina, strona %2$d"
 
-#. TRANS: Label for group description or group note (dt). Text hidden by default.
-msgid "Note"
-msgstr "Přispomnjenka"
-
-#. TRANS: Label for group aliases (dt). Text hidden by default.
-msgid "Aliases"
-msgstr "Aliasy"
-
-#. TRANS: Group actions header (h2). Text hidden by default.
-msgid "Group actions"
-msgstr "Skupinske akcije"
-
 #. TRANS: Tooltip for feed link. %s is a group nickname.
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
@@ -4567,6 +4554,10 @@ msgstr "Powěsć wot %1$s na %2$s"
 msgid "Notice deleted."
 msgstr "Zdźělenka zničena."
 
+#, fuzzy
+msgid "Notice"
+msgstr "Zdźělenki"
+
 #. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
 #, php-format
 msgid "%1$s tagged %2$s"
@@ -5068,7 +5059,6 @@ msgstr "Žadyn argument ID."
 msgid "Tag %s"
 msgstr ""
 
-#. TRANS: H2 for user profile information.
 msgid "User profile"
 msgstr "Wužiwarski profil"
 
@@ -5742,6 +5732,49 @@ msgstr "XRD za %s njeda so namakać."
 msgid "No AtomPub API service for %s."
 msgstr "Žana słužba AtomPub API za %s."
 
+#. TRANS: H2 for user actions in a profile.
+#. TRANS: H2 for entity actions in a profile.
+msgid "User actions"
+msgstr "Wužiwarske akcije"
+
+#. TRANS: Text shown in user profile of not yet compeltely deleted users.
+msgid "User deletion in progress..."
+msgstr "Wužiwar so haša..."
+
+#. TRANS: Link title for link on user profile.
+msgid "Edit profile settings"
+msgstr "Profilowe nastajenja wobdźěłać"
+
+#. TRANS: Link text for link on user profile.
+msgid "Edit"
+msgstr "Wobdźěłać"
+
+#. TRANS: Link title for link on user profile.
+msgid "Send a direct message to this user"
+msgstr "Tutomu wužiwarja direktnu powěsć pósłać"
+
+#. TRANS: Link text for link on user profile.
+msgid "Message"
+msgstr "Powěsć"
+
+#. TRANS: Label text on user profile to select a user role.
+msgid "Moderate"
+msgstr "Moderěrować"
+
+#. TRANS: Label text on user profile to select a user role.
+msgid "User role"
+msgstr "Wužiwarska róla"
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Administrator"
+msgstr "Administrator"
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Moderator"
+msgstr "Moderator"
+
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
 #, php-format
 msgid "%1$s - %2$s"
@@ -6469,46 +6502,170 @@ msgstr[1] "Sy čłon tuteju skupinow:"
 msgstr[2] "Sy čłon tutych skupinow:"
 msgstr[3] "Sy čłon tutych skupinow:"
 
-#. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-msgid ""
-"Commands:\n"
-"on - turn on notifications\n"
-"off - turn off notifications\n"
-"help - show this help\n"
-"follow <nickname> - subscribe to user\n"
-"groups - lists the groups you have joined\n"
-"subscriptions - list the people you follow\n"
-"subscribers - list the people that follow you\n"
-"leave <nickname> - unsubscribe from user\n"
-"d <nickname> <text> - direct message to user\n"
-"get <nickname> - get last notice from user\n"
-"whois <nickname> - get profile info on user\n"
-"lose <nickname> - force user to stop following you\n"
-"fav <nickname> - add user's last notice as a 'fave'\n"
-"fav #<notice_id> - add notice with the given id as a 'fave'\n"
-"repeat #<notice_id> - repeat a notice with a given id\n"
-"repeat <nickname> - repeat the last notice from user\n"
-"reply #<notice_id> - reply to notice with a given id\n"
-"reply <nickname> - reply to the last notice from user\n"
-"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
-"drop <group> - leave group\n"
-"stats - get your stats\n"
-"stop - same as 'off'\n"
-"quit - same as 'off'\n"
-"sub <nickname> - same as 'follow'\n"
-"unsub <nickname> - same as 'leave'\n"
-"last <nickname> - same as 'get'\n"
-"on <nickname> - not yet implemented.\n"
-"off <nickname> - not yet implemented.\n"
-"nudge <nickname> - remind a user to update.\n"
-"invite <phone number> - not yet implemented.\n"
-"track <word> - not yet implemented.\n"
-"untrack <word> - not yet implemented.\n"
-"track off - not yet implemented.\n"
-"untrack all - not yet implemented.\n"
-"tracks - not yet implemented.\n"
-"tracking - not yet implemented.\n"
+#. TRANS: Header line of help text for commands.
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "Commands:"
+msgstr "Přikazowe wuslědki"
+
+#. TRANS: Help message for IM/SMS command "on"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "turn on notifications"
+msgstr "Zdźělenje njeda so zmóžnić."
+
+#. TRANS: Help message for IM/SMS command "off"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "turn off notifications"
+msgstr "Zdźělenje njeda so znjemóžnić."
+
+#. TRANS: Help message for IM/SMS command "help"
+msgctxt "COMMANDHELP"
+msgid "show this help"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "follow <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "subscribe to user"
+msgstr "Tutoho wužiwarja abonować"
+
+#. TRANS: Help message for IM/SMS command "groups"
+msgctxt "COMMANDHELP"
+msgid "lists the groups you have joined"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscriptions"
+msgctxt "COMMANDHELP"
+msgid "list the people you follow"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscribers"
+msgctxt "COMMANDHELP"
+msgid "list the people that follow you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "leave <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "unsubscribe from user"
+msgstr "Tutoho wužiwarja wotskazać"
+
+#. TRANS: Help message for IM/SMS command "d <nickname> <text>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "direct message to user"
+msgstr "Direktne powěsće do %s"
+
+#. TRANS: Help message for IM/SMS command "get <nickname>"
+msgctxt "COMMANDHELP"
+msgid "get last notice from user"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "whois <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "get profile info on user"
+msgstr "Zdaleny profil skupina njeje!"
+
+#. TRANS: Help message for IM/SMS command "lose <nickname>"
+msgctxt "COMMANDHELP"
+msgid "force user to stop following you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav <nickname>"
+msgctxt "COMMANDHELP"
+msgid "add user's last notice as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "add notice with the given id as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "repeat a notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "repeat the last notice from user"
+msgstr "Tutu zdźělenku wospjetować"
+
+#. TRANS: Help message for IM/SMS command "reply #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "reply to notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "reply <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "reply to the last notice from user"
+msgstr "Na tutu zdźělenku wotmołwić"
+
+#. TRANS: Help message for IM/SMS command "join <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "join group"
+msgstr "Njeznata skupina"
+
+#. TRANS: Help message for IM/SMS command "login"
+msgctxt "COMMANDHELP"
+msgid "Get a link to login to the web interface"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "drop <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "leave group"
+msgstr "Skupinu zhašeć"
+
+#. TRANS: Help message for IM/SMS command "stats"
+msgctxt "COMMANDHELP"
+msgid "get your stats"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "stop"
+#. TRANS: Help message for IM/SMS command "quit"
+msgctxt "COMMANDHELP"
+msgid "same as 'off'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "sub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'follow'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "unsub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'leave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "last <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'get'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "on <nickname>"
+#. TRANS: Help message for IM/SMS command "off <nickname>"
+#. TRANS: Help message for IM/SMS command "invite <phone number>"
+#. TRANS: Help message for IM/SMS command "track <word>"
+#. TRANS: Help message for IM/SMS command "untrack <word>"
+#. TRANS: Help message for IM/SMS command "track off"
+#. TRANS: Help message for IM/SMS command "untrack all"
+#. TRANS: Help message for IM/SMS command "tracks"
+#. TRANS: Help message for IM/SMS command "tracking"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "not yet implemented."
+msgstr "Přikaz hišće njeimplementowany."
+
+#. TRANS: Help message for IM/SMS command "nudge <nickname>"
+msgctxt "COMMANDHELP"
+msgid "remind a user to update."
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
@@ -6689,6 +6846,9 @@ msgstr ""
 "Městno za skupinu, jeli eksistuje, na př. \"město, zwjazkowy kraj (abo "
 "region), kraj\"."
 
+msgid "Aliases"
+msgstr "Aliasy"
+
 #, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -6768,6 +6928,10 @@ msgctxt "TOOLTIP"
 msgid "Add or edit %s design"
 msgstr "Design skupiny %s přidać abo wobdźěłać"
 
+#. TRANS: Group actions header (h2). Text hidden by default.
+msgid "Group actions"
+msgstr "Skupinske akcije"
+
 #. TRANS: Title for groups with the most members section.
 msgid "Groups with most members"
 msgstr "Skupiny z najwjace čłonami"
@@ -7249,6 +7413,7 @@ msgstr "Zdźělenku pósłać"
 msgid "What's up, %s?"
 msgstr "Što je, %s?"
 
+#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr "Připowěsnyć"
 
@@ -7707,52 +7872,6 @@ msgstr "Wotskazać"
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "Wužiwar %1$s (%2$d) nima profilowu datowu sadźbu."
 
-msgid "Edit Avatar"
-msgstr "Awatar wobdźěłać"
-
-#. TRANS: H2 for user actions in a profile.
-#. TRANS: H2 for entity actions in a profile.
-msgid "User actions"
-msgstr "Wužiwarske akcije"
-
-#. TRANS: Text shown in user profile of not yet compeltely deleted users.
-msgid "User deletion in progress..."
-msgstr "Wužiwar so haša..."
-
-#. TRANS: Link title for link on user profile.
-msgid "Edit profile settings"
-msgstr "Profilowe nastajenja wobdźěłać"
-
-#. TRANS: Link text for link on user profile.
-msgid "Edit"
-msgstr "Wobdźěłać"
-
-#. TRANS: Link title for link on user profile.
-msgid "Send a direct message to this user"
-msgstr "Tutomu wužiwarja direktnu powěsć pósłać"
-
-#. TRANS: Link text for link on user profile.
-msgid "Message"
-msgstr "Powěsć"
-
-#. TRANS: Label text on user profile to select a user role.
-msgid "Moderate"
-msgstr "Moderěrować"
-
-#. TRANS: Label text on user profile to select a user role.
-msgid "User role"
-msgstr "Wužiwarska róla"
-
-#. TRANS: Role that can be set for a user profile.
-msgctxt "role"
-msgid "Administrator"
-msgstr "Administrator"
-
-#. TRANS: Role that can be set for a user profile.
-msgctxt "role"
-msgid "Moderator"
-msgstr "Moderator"
-
 msgid "Not allowed to log in."
 msgstr "Přizjewjenje njedowolene."
 
@@ -7836,3 +7955,9 @@ msgstr "Njepłaćiwy XML, korjeń XRD faluje."
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr "Wobstaruje so zawěsćenje z dataje \"%s\"-"
+
+#~ msgid "Note"
+#~ msgstr "Přispomnjenka"
+
+#~ msgid "Edit Avatar"
+#~ msgstr "Awatar wobdźěłać"
diff --git a/locale/hu/LC_MESSAGES/statusnet.po b/locale/hu/LC_MESSAGES/statusnet.po
index f05265f38e..a3515effa3 100644
--- a/locale/hu/LC_MESSAGES/statusnet.po
+++ b/locale/hu/LC_MESSAGES/statusnet.po
@@ -12,13 +12,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-11 18:15+0000\n"
-"PO-Revision-Date: 2011-03-11 18:17:11+0000\n"
+"POT-Creation-Date: 2011-03-17 09:47+0000\n"
+"PO-Revision-Date: 2011-03-17 09:49:40+0000\n"
 "Language-Team: Hungarian <http://translatewiki.net/wiki/Portal:hu>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-08 01:25:01+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83703); Translate extension (2011-03-11)\n"
+"X-POT-Import-Date: 2011-03-11 18:52:41+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: hu\n"
 "X-Message-Group: #out-statusnet-core\n"
@@ -591,7 +591,7 @@ msgstr "Nem sikerült %1$s felhasználót eltávolítani a %2$s csoportból."
 msgid "%s's groups"
 msgstr "%s csoportjai"
 
-#. TRANS: Used as subtitle in check for group membership. %1$s is a user name, %2$s is the site name.
+#. TRANS: Used as subtitle in check for group membership. %1$s is the site name, %2$s is a user name.
 #, php-format
 msgid "%1$s groups %2$s is a member of."
 msgstr ""
@@ -4586,18 +4586,6 @@ msgstr "%s csoport"
 msgid "%1$s group, page %2$d"
 msgstr "%1$s csoport, %2$d. oldal"
 
-#. TRANS: Label for group description or group note (dt). Text hidden by default.
-msgid "Note"
-msgstr "Megjegyzés"
-
-#. TRANS: Label for group aliases (dt). Text hidden by default.
-msgid "Aliases"
-msgstr "Álnevek"
-
-#. TRANS: Group actions header (h2). Text hidden by default.
-msgid "Group actions"
-msgstr "Csoport-tevékenységek"
-
 #. TRANS: Tooltip for feed link. %s is a group nickname.
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
@@ -4706,6 +4694,10 @@ msgstr ""
 msgid "Notice deleted."
 msgstr "A hírt töröltük."
 
+#, fuzzy
+msgid "Notice"
+msgstr "Hírek"
+
 #. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
 #, fuzzy, php-format
 msgid "%1$s tagged %2$s"
@@ -5214,7 +5206,6 @@ msgstr ""
 msgid "Tag %s"
 msgstr ""
 
-#. TRANS: H2 for user profile information.
 msgid "User profile"
 msgstr "Felhasználói profil"
 
@@ -5888,6 +5879,49 @@ msgstr ""
 msgid "No AtomPub API service for %s."
 msgstr ""
 
+#. TRANS: H2 for user actions in a profile.
+#. TRANS: H2 for entity actions in a profile.
+msgid "User actions"
+msgstr "Felhasználói műveletek"
+
+#. TRANS: Text shown in user profile of not yet compeltely deleted users.
+msgid "User deletion in progress..."
+msgstr ""
+
+#. TRANS: Link title for link on user profile.
+msgid "Edit profile settings"
+msgstr ""
+
+#. TRANS: Link text for link on user profile.
+msgid "Edit"
+msgstr "Szerkesztés"
+
+#. TRANS: Link title for link on user profile.
+msgid "Send a direct message to this user"
+msgstr ""
+
+#. TRANS: Link text for link on user profile.
+msgid "Message"
+msgstr "Üzenet"
+
+#. TRANS: Label text on user profile to select a user role.
+msgid "Moderate"
+msgstr "Moderálás"
+
+#. TRANS: Label text on user profile to select a user role.
+msgid "User role"
+msgstr "Felhasználói szerepkör"
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Administrator"
+msgstr "Adminisztrátor"
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Moderator"
+msgstr "Moderátor"
+
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
 #, php-format
 msgid "%1$s - %2$s"
@@ -6598,46 +6632,166 @@ msgid_plural "You are a member of these groups:"
 msgstr[0] "Ennek a csoportnak vagy tagja:"
 msgstr[1] "Ezeknek a csoportoknak vagy tagja:"
 
-#. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-msgid ""
-"Commands:\n"
-"on - turn on notifications\n"
-"off - turn off notifications\n"
-"help - show this help\n"
-"follow <nickname> - subscribe to user\n"
-"groups - lists the groups you have joined\n"
-"subscriptions - list the people you follow\n"
-"subscribers - list the people that follow you\n"
-"leave <nickname> - unsubscribe from user\n"
-"d <nickname> <text> - direct message to user\n"
-"get <nickname> - get last notice from user\n"
-"whois <nickname> - get profile info on user\n"
-"lose <nickname> - force user to stop following you\n"
-"fav <nickname> - add user's last notice as a 'fave'\n"
-"fav #<notice_id> - add notice with the given id as a 'fave'\n"
-"repeat #<notice_id> - repeat a notice with a given id\n"
-"repeat <nickname> - repeat the last notice from user\n"
-"reply #<notice_id> - reply to notice with a given id\n"
-"reply <nickname> - reply to the last notice from user\n"
-"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
-"drop <group> - leave group\n"
-"stats - get your stats\n"
-"stop - same as 'off'\n"
-"quit - same as 'off'\n"
-"sub <nickname> - same as 'follow'\n"
-"unsub <nickname> - same as 'leave'\n"
-"last <nickname> - same as 'get'\n"
-"on <nickname> - not yet implemented.\n"
-"off <nickname> - not yet implemented.\n"
-"nudge <nickname> - remind a user to update.\n"
-"invite <phone number> - not yet implemented.\n"
-"track <word> - not yet implemented.\n"
-"untrack <word> - not yet implemented.\n"
-"track off - not yet implemented.\n"
-"untrack all - not yet implemented.\n"
-"tracks - not yet implemented.\n"
-"tracking - not yet implemented.\n"
+#. TRANS: Header line of help text for commands.
+msgctxt "COMMANDHELP"
+msgid "Commands:"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "on"
+msgctxt "COMMANDHELP"
+msgid "turn on notifications"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "off"
+msgctxt "COMMANDHELP"
+msgid "turn off notifications"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "help"
+msgctxt "COMMANDHELP"
+msgid "show this help"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "follow <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "subscribe to user"
+msgstr "Ezen felhasználók híreire már feliratkoztál:"
+
+#. TRANS: Help message for IM/SMS command "groups"
+msgctxt "COMMANDHELP"
+msgid "lists the groups you have joined"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscriptions"
+msgctxt "COMMANDHELP"
+msgid "list the people you follow"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscribers"
+msgctxt "COMMANDHELP"
+msgid "list the people that follow you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "leave <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "unsubscribe from user"
+msgstr "Ezen felhasználók híreire már feliratkoztál:"
+
+#. TRANS: Help message for IM/SMS command "d <nickname> <text>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "direct message to user"
+msgstr "Közvetlen üzenetek neki: %s"
+
+#. TRANS: Help message for IM/SMS command "get <nickname>"
+msgctxt "COMMANDHELP"
+msgid "get last notice from user"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "whois <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "get profile info on user"
+msgstr "Személyes profil"
+
+#. TRANS: Help message for IM/SMS command "lose <nickname>"
+msgctxt "COMMANDHELP"
+msgid "force user to stop following you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav <nickname>"
+msgctxt "COMMANDHELP"
+msgid "add user's last notice as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "add notice with the given id as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "repeat a notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "repeat the last notice from user"
+msgstr "Ismételjük meg ezt a hírt"
+
+#. TRANS: Help message for IM/SMS command "reply #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "reply to notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "reply <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "reply to the last notice from user"
+msgstr "Válaszoljunk erre a hírre"
+
+#. TRANS: Help message for IM/SMS command "join <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "join group"
+msgstr "Ismeretlen művelet"
+
+#. TRANS: Help message for IM/SMS command "login"
+msgctxt "COMMANDHELP"
+msgid "Get a link to login to the web interface"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "drop <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "leave group"
+msgstr "Felhasználó törlése"
+
+#. TRANS: Help message for IM/SMS command "stats"
+msgctxt "COMMANDHELP"
+msgid "get your stats"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "stop"
+#. TRANS: Help message for IM/SMS command "quit"
+msgctxt "COMMANDHELP"
+msgid "same as 'off'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "sub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'follow'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "unsub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'leave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "last <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'get'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "on <nickname>"
+#. TRANS: Help message for IM/SMS command "off <nickname>"
+#. TRANS: Help message for IM/SMS command "invite <phone number>"
+#. TRANS: Help message for IM/SMS command "track <word>"
+#. TRANS: Help message for IM/SMS command "untrack <word>"
+#. TRANS: Help message for IM/SMS command "track off"
+#. TRANS: Help message for IM/SMS command "untrack all"
+#. TRANS: Help message for IM/SMS command "tracks"
+#. TRANS: Help message for IM/SMS command "tracking"
+msgctxt "COMMANDHELP"
+msgid "not yet implemented."
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "nudge <nickname>"
+msgctxt "COMMANDHELP"
+msgid "remind a user to update."
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
@@ -6821,6 +6975,9 @@ msgstr ""
 "A csoport földrajzi elhelyezkedése, ha van ilyen, pl. \"Város, Megye, Ország"
 "\""
 
+msgid "Aliases"
+msgstr "Álnevek"
+
 #, fuzzy, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -6902,6 +7059,10 @@ msgctxt "TOOLTIP"
 msgid "Add or edit %s design"
 msgstr ""
 
+#. TRANS: Group actions header (h2). Text hidden by default.
+msgid "Group actions"
+msgstr "Csoport-tevékenységek"
+
 #. TRANS: Title for groups with the most members section.
 msgid "Groups with most members"
 msgstr "A legtöbb tagból álló csoportok"
@@ -7434,6 +7595,7 @@ msgstr "Küldjünk egy hírt"
 msgid "What's up, %s?"
 msgstr "Mi hír, %s?"
 
+#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr "Csatolás"
 
@@ -7888,52 +8050,6 @@ msgstr ""
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "A felhasználónak nincs profilja."
 
-msgid "Edit Avatar"
-msgstr ""
-
-#. TRANS: H2 for user actions in a profile.
-#. TRANS: H2 for entity actions in a profile.
-msgid "User actions"
-msgstr "Felhasználói műveletek"
-
-#. TRANS: Text shown in user profile of not yet compeltely deleted users.
-msgid "User deletion in progress..."
-msgstr ""
-
-#. TRANS: Link title for link on user profile.
-msgid "Edit profile settings"
-msgstr ""
-
-#. TRANS: Link text for link on user profile.
-msgid "Edit"
-msgstr "Szerkesztés"
-
-#. TRANS: Link title for link on user profile.
-msgid "Send a direct message to this user"
-msgstr ""
-
-#. TRANS: Link text for link on user profile.
-msgid "Message"
-msgstr "Üzenet"
-
-#. TRANS: Label text on user profile to select a user role.
-msgid "Moderate"
-msgstr "Moderálás"
-
-#. TRANS: Label text on user profile to select a user role.
-msgid "User role"
-msgstr "Felhasználói szerepkör"
-
-#. TRANS: Role that can be set for a user profile.
-msgctxt "role"
-msgid "Administrator"
-msgstr "Adminisztrátor"
-
-#. TRANS: Role that can be set for a user profile.
-msgctxt "role"
-msgid "Moderator"
-msgstr "Moderátor"
-
 #, fuzzy
 msgid "Not allowed to log in."
 msgstr "Nem vagy bejelentkezve."
@@ -8009,3 +8125,6 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#~ msgid "Note"
+#~ msgstr "Megjegyzés"
diff --git a/locale/ia/LC_MESSAGES/statusnet.po b/locale/ia/LC_MESSAGES/statusnet.po
index a56aa7c5c8..653cf949bd 100644
--- a/locale/ia/LC_MESSAGES/statusnet.po
+++ b/locale/ia/LC_MESSAGES/statusnet.po
@@ -9,17 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-11 18:15+0000\n"
-"PO-Revision-Date: 2011-03-11 18:17:12+0000\n"
+"POT-Creation-Date: 2011-03-17 09:47+0000\n"
+"PO-Revision-Date: 2011-03-17 09:49:41+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83703); Translate extension (2011-03-11)\n"
+"X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-03-08 01:25:01+0000\n"
+"X-POT-Import-Date: 2011-03-11 18:52:41+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -589,7 +589,7 @@ msgstr "Non poteva remover le usator %1$s del gruppo %2$s."
 msgid "%s's groups"
 msgstr "Gruppos de %s"
 
-#. TRANS: Used as subtitle in check for group membership. %1$s is a user name, %2$s is the site name.
+#. TRANS: Used as subtitle in check for group membership. %1$s is the site name, %2$s is a user name.
 #, php-format
 msgid "%1$s groups %2$s is a member of."
 msgstr "Gruppos de %1$s del quales %2$s es membro."
@@ -1039,7 +1039,6 @@ msgid "Can only fave notices."
 msgstr "Solmente notas pote esser addite al favorites."
 
 #. TRANS: Client exception thrown when trying favorite a notice without content.
-#, fuzzy
 msgid "Unknown notice."
 msgstr "Nota incognite."
 
@@ -3083,9 +3082,8 @@ msgstr "Le URL de origine es requirite."
 msgid "Could not create application."
 msgstr "Non poteva crear application."
 
-#, fuzzy
 msgid "Invalid image."
-msgstr "Dimension invalide."
+msgstr "Imagine invalide."
 
 #. TRANS: Title for form to create a group.
 msgid "New group"
@@ -3372,7 +3370,6 @@ msgstr ""
 "Isto es tu cassa de exito, que lista le messages private que tu ha inviate."
 
 #. TRANS: Title for page where to change password.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Change password"
 msgstr "Cambiar contrasigno"
@@ -3400,7 +3397,6 @@ msgid "6 or more characters."
 msgstr "6 o plus characteres."
 
 #. TRANS: Field label on page where to change password. In this field the new password should be typed a second time.
-#, fuzzy
 msgctxt "LABEL"
 msgid "Confirm"
 msgstr "Confirmar"
@@ -3411,7 +3407,6 @@ msgid "Same as password above."
 msgstr "Identic al contrasigno hic supra."
 
 #. TRANS: Button text on page where to change password.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Change"
 msgstr "Cambiar"
@@ -3424,9 +3419,8 @@ msgid "Passwords don't match."
 msgstr "Le contrasignos non corresponde."
 
 #. TRANS: Form validation error on page where to change password.
-#, fuzzy
 msgid "Incorrect old password."
-msgstr "Ancian contrasigno incorrecte"
+msgstr "Ancian contrasigno incorrecte."
 
 #. TRANS: Form validation error on page where to change password.
 msgid "Error saving user; invalid."
@@ -3513,12 +3507,10 @@ msgid "Fancy URLs"
 msgstr "URLs de luxo"
 
 #. TRANS: Field title in Paths admin panel.
-#, fuzzy
 msgid "Use fancy URLs (more readable and memorable)?"
 msgstr "Usar URLs de luxo (plus legibile e memorabile)?"
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "Theme"
 msgstr "Thema"
@@ -3632,7 +3624,6 @@ msgid "Directory where attachments are located."
 msgstr "Cammino a ubi se trova le annexos."
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "SSL"
 msgstr "SSL"
@@ -3716,7 +3707,6 @@ msgid "Enabled"
 msgstr "Activate"
 
 #. TRANS: Tab and title for plugins admin panel.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Plugins"
 msgstr "Plug-ins"
@@ -3748,11 +3738,11 @@ msgstr "Le contento del nota es invalide."
 
 #. TRANS: Exception thrown if a notice's license is not compatible with the StatusNet site license.
 #. TRANS: %1$s is the notice license, %2$s is the StatusNet site's license.
-#, fuzzy, php-format
+#, php-format
 msgid "Notice license \"%1$s\" is not compatible with site license \"%2$s\"."
 msgstr ""
-"Le licentia del nota ‘%1$s’ non es compatibile con le licentia del sito ‘%2"
-"$s’."
+"Le licentia del nota \"%1$s\" non es compatibile con le licentia del sito \"%"
+"2$s\"."
 
 #. TRANS: Page title for profile settings.
 msgid "Profile settings"
@@ -4606,18 +4596,6 @@ msgstr "Gruppo %s"
 msgid "%1$s group, page %2$d"
 msgstr "Gruppo %1$s, pagina %2$d"
 
-#. TRANS: Label for group description or group note (dt). Text hidden by default.
-msgid "Note"
-msgstr "Nota"
-
-#. TRANS: Label for group aliases (dt). Text hidden by default.
-msgid "Aliases"
-msgstr "Aliases"
-
-#. TRANS: Group actions header (h2). Text hidden by default.
-msgid "Group actions"
-msgstr "Actiones del gruppo"
-
 #. TRANS: Tooltip for feed link. %s is a group nickname.
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
@@ -4727,6 +4705,10 @@ msgstr "Message de %1$s in %2$s"
 msgid "Notice deleted."
 msgstr "Nota delite."
 
+#, fuzzy
+msgid "Notice"
+msgstr "Notas"
+
 #. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
 #, php-format
 msgid "%1$s tagged %2$s"
@@ -5259,7 +5241,6 @@ msgstr "Nulle parametro de ID."
 msgid "Tag %s"
 msgstr "Etiquetta %s"
 
-#. TRANS: H2 for user profile information.
 msgid "User profile"
 msgstr "Profilo del usator"
 
@@ -5970,6 +5951,49 @@ msgstr "Non pote trovar XRD pro %s."
 msgid "No AtomPub API service for %s."
 msgstr "Il non ha un servicio API AtomPub pro %s."
 
+#. TRANS: H2 for user actions in a profile.
+#. TRANS: H2 for entity actions in a profile.
+msgid "User actions"
+msgstr "Actiones de usator"
+
+#. TRANS: Text shown in user profile of not yet compeltely deleted users.
+msgid "User deletion in progress..."
+msgstr "Deletion del usator in curso…"
+
+#. TRANS: Link title for link on user profile.
+msgid "Edit profile settings"
+msgstr "Modificar configuration de profilo"
+
+#. TRANS: Link text for link on user profile.
+msgid "Edit"
+msgstr "Modificar"
+
+#. TRANS: Link title for link on user profile.
+msgid "Send a direct message to this user"
+msgstr "Inviar un message directe a iste usator"
+
+#. TRANS: Link text for link on user profile.
+msgid "Message"
+msgstr "Message"
+
+#. TRANS: Label text on user profile to select a user role.
+msgid "Moderate"
+msgstr "Moderar"
+
+#. TRANS: Label text on user profile to select a user role.
+msgid "User role"
+msgstr "Rolo de usator"
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Administrator"
+msgstr "Administrator"
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Moderator"
+msgstr "Moderator"
+
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
 #, php-format
 msgid "%1$s - %2$s"
@@ -6690,85 +6714,172 @@ msgid_plural "You are a member of these groups:"
 msgstr[0] "Tu es membro de iste gruppo:"
 msgstr[1] "Tu es membro de iste gruppos:"
 
-#. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-msgid ""
-"Commands:\n"
-"on - turn on notifications\n"
-"off - turn off notifications\n"
-"help - show this help\n"
-"follow <nickname> - subscribe to user\n"
-"groups - lists the groups you have joined\n"
-"subscriptions - list the people you follow\n"
-"subscribers - list the people that follow you\n"
-"leave <nickname> - unsubscribe from user\n"
-"d <nickname> <text> - direct message to user\n"
-"get <nickname> - get last notice from user\n"
-"whois <nickname> - get profile info on user\n"
-"lose <nickname> - force user to stop following you\n"
-"fav <nickname> - add user's last notice as a 'fave'\n"
-"fav #<notice_id> - add notice with the given id as a 'fave'\n"
-"repeat #<notice_id> - repeat a notice with a given id\n"
-"repeat <nickname> - repeat the last notice from user\n"
-"reply #<notice_id> - reply to notice with a given id\n"
-"reply <nickname> - reply to the last notice from user\n"
-"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
-"drop <group> - leave group\n"
-"stats - get your stats\n"
-"stop - same as 'off'\n"
-"quit - same as 'off'\n"
-"sub <nickname> - same as 'follow'\n"
-"unsub <nickname> - same as 'leave'\n"
-"last <nickname> - same as 'get'\n"
-"on <nickname> - not yet implemented.\n"
-"off <nickname> - not yet implemented.\n"
-"nudge <nickname> - remind a user to update.\n"
-"invite <phone number> - not yet implemented.\n"
-"track <word> - not yet implemented.\n"
-"untrack <word> - not yet implemented.\n"
-"track off - not yet implemented.\n"
-"untrack all - not yet implemented.\n"
-"tracks - not yet implemented.\n"
-"tracking - not yet implemented.\n"
+#. TRANS: Header line of help text for commands.
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "Commands:"
+msgstr "Resultatos del commando"
+
+#. TRANS: Help message for IM/SMS command "on"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "turn on notifications"
+msgstr "Non pote activar notification."
+
+#. TRANS: Help message for IM/SMS command "off"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "turn off notifications"
+msgstr "Non pote disactivar notification."
+
+#. TRANS: Help message for IM/SMS command "help"
+msgctxt "COMMANDHELP"
+msgid "show this help"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "follow <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "subscribe to user"
+msgstr "Subscriber a iste usator"
+
+#. TRANS: Help message for IM/SMS command "groups"
+msgctxt "COMMANDHELP"
+msgid "lists the groups you have joined"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscriptions"
+msgctxt "COMMANDHELP"
+msgid "list the people you follow"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscribers"
+msgctxt "COMMANDHELP"
+msgid "list the people that follow you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "leave <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "unsubscribe from user"
+msgstr "Cancellar subscription a iste usator"
+
+#. TRANS: Help message for IM/SMS command "d <nickname> <text>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "direct message to user"
+msgstr "Messages directe a %s"
+
+#. TRANS: Help message for IM/SMS command "get <nickname>"
+msgctxt "COMMANDHELP"
+msgid "get last notice from user"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "whois <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "get profile info on user"
+msgstr "Le profilo remote non es un gruppo!"
+
+#. TRANS: Help message for IM/SMS command "lose <nickname>"
+msgctxt "COMMANDHELP"
+msgid "force user to stop following you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav <nickname>"
+msgctxt "COMMANDHELP"
+msgid "add user's last notice as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "add notice with the given id as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "repeat a notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "repeat the last notice from user"
+msgstr "Repeter iste nota"
+
+#. TRANS: Help message for IM/SMS command "reply #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "reply to notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "reply <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "reply to the last notice from user"
+msgstr "Responder a iste nota"
+
+#. TRANS: Help message for IM/SMS command "join <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "join group"
+msgstr "Gruppo incognite."
+
+#. TRANS: Help message for IM/SMS command "login"
+msgctxt "COMMANDHELP"
+msgid "Get a link to login to the web interface"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "drop <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "leave group"
+msgstr "Deler gruppo"
+
+#. TRANS: Help message for IM/SMS command "stats"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "get your stats"
+msgstr "Actualisar tu stato..."
+
+#. TRANS: Help message for IM/SMS command "stop"
+#. TRANS: Help message for IM/SMS command "quit"
+msgctxt "COMMANDHELP"
+msgid "same as 'off'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "sub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'follow'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "unsub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'leave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "last <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'get'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "on <nickname>"
+#. TRANS: Help message for IM/SMS command "off <nickname>"
+#. TRANS: Help message for IM/SMS command "invite <phone number>"
+#. TRANS: Help message for IM/SMS command "track <word>"
+#. TRANS: Help message for IM/SMS command "untrack <word>"
+#. TRANS: Help message for IM/SMS command "track off"
+#. TRANS: Help message for IM/SMS command "untrack all"
+#. TRANS: Help message for IM/SMS command "tracks"
+#. TRANS: Help message for IM/SMS command "tracking"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "not yet implemented."
+msgstr "Commando non ancora implementate."
+
+#. TRANS: Help message for IM/SMS command "nudge <nickname>"
+msgctxt "COMMANDHELP"
+msgid "remind a user to update."
 msgstr ""
-"Commandos:\n"
-"on - activar notificationes\n"
-"off - disactivar notificationes\n"
-"help - monstrar iste adjuta\n"
-"follow <pseudonymo> - subscriber te al usator\n"
-"groups - listar le gruppos del quales tu es membro\n"
-"subscriptions - listar le personas que tu seque\n"
-"subscribers - listar le personas qui te seque\n"
-"leave <pseudonymo> - cancellar subscription al usator\n"
-"d <pseudonymo> <texto> - diriger un message al usator\n"
-"get <pseudonymo> - obtener le ultime nota del usator\n"
-"whois <pseudonymo> - obtener info de profilo del usator\n"
-"lose <pseudonymo> - fortiar le usator de cessar de sequer te\n"
-"fav <pseudonymo> - adder ultime nota del usator como favorite\n"
-"fav #<id_de_nota> - adder nota con le ID date como favorite\n"
-"repeat #<id_de_nota> - repeter le nota con le ID date\n"
-"repeat <pseudonymo> - repeter le ultime nota del usator\n"
-"reply #<id_de_nota> - responder al nota con le ID date\n"
-"reply <pseudonymo> - responder al ultime nota del usator\n"
-"join <gruppo> - facer te membro del gruppo\n"
-"login - obtener ligamine pro aperir session al interfacie web\n"
-"drop <gruppo> - quitar gruppo\n"
-"stats - obtener tu statisticas\n"
-"stop - como 'off'\n"
-"quit - como 'off'\n"
-"sub <pseudonymo> - como 'follow'\n"
-"unsub <pseudonymo> - como 'leave'\n"
-"last <pseudonymo> - como 'get'\n"
-"on <pseudonymo> - non ancora implementate.\n"
-"off <pseudonymo> - non ancora implementate.\n"
-"nudge <pseudonymo> - rememorar un usator de scriber alique.\n"
-"invite <numero de telephono> - non ancora implementate.\n"
-"track <parola> - non ancora implementate.\n"
-"untrack <parola> - non ancora implementate.\n"
-"track off - non ancora implementate.\n"
-"untrack all - non ancora implementate.\n"
-"tracks - non ancora implementate.\n"
-"tracking - non ancora implementate.\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 msgid "No configuration file found."
@@ -6941,6 +7052,9 @@ msgid ""
 msgstr ""
 "Loco del gruppo, si existe, como \"Citate, Provincia (o Region), Pais\"."
 
+msgid "Aliases"
+msgstr "Aliases"
+
 #, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -7021,6 +7135,10 @@ msgctxt "TOOLTIP"
 msgid "Add or edit %s design"
 msgstr "Adder o modificar apparentia de %s"
 
+#. TRANS: Group actions header (h2). Text hidden by default.
+msgid "Group actions"
+msgstr "Actiones del gruppo"
+
 #. TRANS: Title for groups with the most members section.
 msgid "Groups with most members"
 msgstr "Gruppos con le plus membros"
@@ -7590,6 +7708,7 @@ msgstr "Inviar un nota"
 msgid "What's up, %s?"
 msgstr "Como sta, %s?"
 
+#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr "Annexar"
 
@@ -7658,7 +7777,7 @@ msgid "Notice repeated"
 msgstr "Nota repetite"
 
 msgid "Update your status..."
-msgstr ""
+msgstr "Actualisar tu stato..."
 
 msgid "Nudge this user"
 msgstr "Pulsar iste usator"
@@ -8047,52 +8166,6 @@ msgstr "Cancellar subscription"
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "Le usator %1$s (%2$d) non ha un registro de profilo."
 
-msgid "Edit Avatar"
-msgstr "Modificar avatar"
-
-#. TRANS: H2 for user actions in a profile.
-#. TRANS: H2 for entity actions in a profile.
-msgid "User actions"
-msgstr "Actiones de usator"
-
-#. TRANS: Text shown in user profile of not yet compeltely deleted users.
-msgid "User deletion in progress..."
-msgstr "Deletion del usator in curso…"
-
-#. TRANS: Link title for link on user profile.
-msgid "Edit profile settings"
-msgstr "Modificar configuration de profilo"
-
-#. TRANS: Link text for link on user profile.
-msgid "Edit"
-msgstr "Modificar"
-
-#. TRANS: Link title for link on user profile.
-msgid "Send a direct message to this user"
-msgstr "Inviar un message directe a iste usator"
-
-#. TRANS: Link text for link on user profile.
-msgid "Message"
-msgstr "Message"
-
-#. TRANS: Label text on user profile to select a user role.
-msgid "Moderate"
-msgstr "Moderar"
-
-#. TRANS: Label text on user profile to select a user role.
-msgid "User role"
-msgstr "Rolo de usator"
-
-#. TRANS: Role that can be set for a user profile.
-msgctxt "role"
-msgid "Administrator"
-msgstr "Administrator"
-
-#. TRANS: Role that can be set for a user profile.
-msgctxt "role"
-msgid "Moderator"
-msgstr "Moderator"
-
 msgid "Not allowed to log in."
 msgstr "Apertura de session non permittite."
 
@@ -8166,3 +8239,88 @@ msgstr "XML invalide, radice XRD mancante."
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr "Obtene copia de reserva ex file '%s'."
+
+#~ msgid "Note"
+#~ msgstr "Nota"
+
+#~ msgid ""
+#~ "Commands:\n"
+#~ "on - turn on notifications\n"
+#~ "off - turn off notifications\n"
+#~ "help - show this help\n"
+#~ "follow <nickname> - subscribe to user\n"
+#~ "groups - lists the groups you have joined\n"
+#~ "subscriptions - list the people you follow\n"
+#~ "subscribers - list the people that follow you\n"
+#~ "leave <nickname> - unsubscribe from user\n"
+#~ "d <nickname> <text> - direct message to user\n"
+#~ "get <nickname> - get last notice from user\n"
+#~ "whois <nickname> - get profile info on user\n"
+#~ "lose <nickname> - force user to stop following you\n"
+#~ "fav <nickname> - add user's last notice as a 'fave'\n"
+#~ "fav #<notice_id> - add notice with the given id as a 'fave'\n"
+#~ "repeat #<notice_id> - repeat a notice with a given id\n"
+#~ "repeat <nickname> - repeat the last notice from user\n"
+#~ "reply #<notice_id> - reply to notice with a given id\n"
+#~ "reply <nickname> - reply to the last notice from user\n"
+#~ "join <group> - join group\n"
+#~ "login - Get a link to login to the web interface\n"
+#~ "drop <group> - leave group\n"
+#~ "stats - get your stats\n"
+#~ "stop - same as 'off'\n"
+#~ "quit - same as 'off'\n"
+#~ "sub <nickname> - same as 'follow'\n"
+#~ "unsub <nickname> - same as 'leave'\n"
+#~ "last <nickname> - same as 'get'\n"
+#~ "on <nickname> - not yet implemented.\n"
+#~ "off <nickname> - not yet implemented.\n"
+#~ "nudge <nickname> - remind a user to update.\n"
+#~ "invite <phone number> - not yet implemented.\n"
+#~ "track <word> - not yet implemented.\n"
+#~ "untrack <word> - not yet implemented.\n"
+#~ "track off - not yet implemented.\n"
+#~ "untrack all - not yet implemented.\n"
+#~ "tracks - not yet implemented.\n"
+#~ "tracking - not yet implemented.\n"
+#~ msgstr ""
+#~ "Commandos:\n"
+#~ "on - activar notificationes\n"
+#~ "off - disactivar notificationes\n"
+#~ "help - monstrar iste adjuta\n"
+#~ "follow <pseudonymo> - subscriber te al usator\n"
+#~ "groups - listar le gruppos del quales tu es membro\n"
+#~ "subscriptions - listar le personas que tu seque\n"
+#~ "subscribers - listar le personas qui te seque\n"
+#~ "leave <pseudonymo> - cancellar subscription al usator\n"
+#~ "d <pseudonymo> <texto> - diriger un message al usator\n"
+#~ "get <pseudonymo> - obtener le ultime nota del usator\n"
+#~ "whois <pseudonymo> - obtener info de profilo del usator\n"
+#~ "lose <pseudonymo> - fortiar le usator de cessar de sequer te\n"
+#~ "fav <pseudonymo> - adder ultime nota del usator como favorite\n"
+#~ "fav #<id_de_nota> - adder nota con le ID date como favorite\n"
+#~ "repeat #<id_de_nota> - repeter le nota con le ID date\n"
+#~ "repeat <pseudonymo> - repeter le ultime nota del usator\n"
+#~ "reply #<id_de_nota> - responder al nota con le ID date\n"
+#~ "reply <pseudonymo> - responder al ultime nota del usator\n"
+#~ "join <gruppo> - facer te membro del gruppo\n"
+#~ "login - obtener ligamine pro aperir session al interfacie web\n"
+#~ "drop <gruppo> - quitar gruppo\n"
+#~ "stats - obtener tu statisticas\n"
+#~ "stop - como 'off'\n"
+#~ "quit - como 'off'\n"
+#~ "sub <pseudonymo> - como 'follow'\n"
+#~ "unsub <pseudonymo> - como 'leave'\n"
+#~ "last <pseudonymo> - como 'get'\n"
+#~ "on <pseudonymo> - non ancora implementate.\n"
+#~ "off <pseudonymo> - non ancora implementate.\n"
+#~ "nudge <pseudonymo> - rememorar un usator de scriber alique.\n"
+#~ "invite <numero de telephono> - non ancora implementate.\n"
+#~ "track <parola> - non ancora implementate.\n"
+#~ "untrack <parola> - non ancora implementate.\n"
+#~ "track off - non ancora implementate.\n"
+#~ "untrack all - non ancora implementate.\n"
+#~ "tracks - non ancora implementate.\n"
+#~ "tracking - non ancora implementate.\n"
+
+#~ msgid "Edit Avatar"
+#~ msgstr "Modificar avatar"
diff --git a/locale/it/LC_MESSAGES/statusnet.po b/locale/it/LC_MESSAGES/statusnet.po
index 78b07bbdfc..3306a48eaa 100644
--- a/locale/it/LC_MESSAGES/statusnet.po
+++ b/locale/it/LC_MESSAGES/statusnet.po
@@ -11,17 +11,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-11 18:15+0000\n"
-"PO-Revision-Date: 2011-03-11 18:17:13+0000\n"
+"POT-Creation-Date: 2011-03-17 09:47+0000\n"
+"PO-Revision-Date: 2011-03-17 09:49:42+0000\n"
 "Language-Team: Italian <http://translatewiki.net/wiki/Portal:it>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83703); Translate extension (2011-03-11)\n"
+"X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: it\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-03-08 01:25:01+0000\n"
+"X-POT-Import-Date: 2011-03-11 18:52:41+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -596,7 +596,7 @@ msgstr "Impossibile rimuovere l'utente %1$s dal gruppo %2$s."
 msgid "%s's groups"
 msgstr "Gruppi di %s"
 
-#. TRANS: Used as subtitle in check for group membership. %1$s is a user name, %2$s is the site name.
+#. TRANS: Used as subtitle in check for group membership. %1$s is the site name, %2$s is a user name.
 #, php-format
 msgid "%1$s groups %2$s is a member of."
 msgstr "Gruppi del sito %1$s a cui %2$s è iscritto."
@@ -4738,18 +4738,6 @@ msgstr "Gruppo %s"
 msgid "%1$s group, page %2$d"
 msgstr "Gruppi di %1$s, pagina %2$d"
 
-#. TRANS: Label for group description or group note (dt). Text hidden by default.
-msgid "Note"
-msgstr "Nota"
-
-#. TRANS: Label for group aliases (dt). Text hidden by default.
-msgid "Aliases"
-msgstr "Alias"
-
-#. TRANS: Group actions header (h2). Text hidden by default.
-msgid "Group actions"
-msgstr "Azioni dei gruppi"
-
 #. TRANS: Tooltip for feed link. %s is a group nickname.
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
@@ -4861,6 +4849,10 @@ msgstr "Messaggio da %1$s su %2$s"
 msgid "Notice deleted."
 msgstr "Messaggio eliminato."
 
+#, fuzzy
+msgid "Notice"
+msgstr "Messaggi"
+
 #. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
 #, fuzzy, php-format
 msgid "%1$s tagged %2$s"
@@ -5397,7 +5389,6 @@ msgstr "Nessun argomento ID."
 msgid "Tag %s"
 msgstr "Etichetta %s"
 
-#. TRANS: H2 for user profile information.
 msgid "User profile"
 msgstr "Profilo utente"
 
@@ -6122,6 +6113,49 @@ msgstr ""
 msgid "No AtomPub API service for %s."
 msgstr ""
 
+#. TRANS: H2 for user actions in a profile.
+#. TRANS: H2 for entity actions in a profile.
+msgid "User actions"
+msgstr "Azioni utente"
+
+#. TRANS: Text shown in user profile of not yet compeltely deleted users.
+msgid "User deletion in progress..."
+msgstr "Eliminazione utente..."
+
+#. TRANS: Link title for link on user profile.
+msgid "Edit profile settings"
+msgstr "Modifica impostazioni del profilo"
+
+#. TRANS: Link text for link on user profile.
+msgid "Edit"
+msgstr "Modifica"
+
+#. TRANS: Link title for link on user profile.
+msgid "Send a direct message to this user"
+msgstr "Invia un messaggio diretto a questo utente"
+
+#. TRANS: Link text for link on user profile.
+msgid "Message"
+msgstr "Messaggio"
+
+#. TRANS: Label text on user profile to select a user role.
+msgid "Moderate"
+msgstr "Modera"
+
+#. TRANS: Label text on user profile to select a user role.
+msgid "User role"
+msgstr "Ruolo dell'utente"
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Administrator"
+msgstr "Amministratore"
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Moderator"
+msgstr "Moderatore"
+
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
 #, php-format
 msgid "%1$s - %2$s"
@@ -6851,87 +6885,171 @@ msgid_plural "You are a member of these groups:"
 msgstr[0] "Non fai parte di questo gruppo:"
 msgstr[1] "Non fai parte di questi gruppi:"
 
-#. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-msgid ""
-"Commands:\n"
-"on - turn on notifications\n"
-"off - turn off notifications\n"
-"help - show this help\n"
-"follow <nickname> - subscribe to user\n"
-"groups - lists the groups you have joined\n"
-"subscriptions - list the people you follow\n"
-"subscribers - list the people that follow you\n"
-"leave <nickname> - unsubscribe from user\n"
-"d <nickname> <text> - direct message to user\n"
-"get <nickname> - get last notice from user\n"
-"whois <nickname> - get profile info on user\n"
-"lose <nickname> - force user to stop following you\n"
-"fav <nickname> - add user's last notice as a 'fave'\n"
-"fav #<notice_id> - add notice with the given id as a 'fave'\n"
-"repeat #<notice_id> - repeat a notice with a given id\n"
-"repeat <nickname> - repeat the last notice from user\n"
-"reply #<notice_id> - reply to notice with a given id\n"
-"reply <nickname> - reply to the last notice from user\n"
-"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
-"drop <group> - leave group\n"
-"stats - get your stats\n"
-"stop - same as 'off'\n"
-"quit - same as 'off'\n"
-"sub <nickname> - same as 'follow'\n"
-"unsub <nickname> - same as 'leave'\n"
-"last <nickname> - same as 'get'\n"
-"on <nickname> - not yet implemented.\n"
-"off <nickname> - not yet implemented.\n"
-"nudge <nickname> - remind a user to update.\n"
-"invite <phone number> - not yet implemented.\n"
-"track <word> - not yet implemented.\n"
-"untrack <word> - not yet implemented.\n"
-"track off - not yet implemented.\n"
-"untrack all - not yet implemented.\n"
-"tracks - not yet implemented.\n"
-"tracking - not yet implemented.\n"
+#. TRANS: Header line of help text for commands.
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "Commands:"
+msgstr "Risultati comando"
+
+#. TRANS: Help message for IM/SMS command "on"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "turn on notifications"
+msgstr "Impossibile attivare le notifiche."
+
+#. TRANS: Help message for IM/SMS command "off"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "turn off notifications"
+msgstr "Impossibile disattivare le notifiche."
+
+#. TRANS: Help message for IM/SMS command "help"
+msgctxt "COMMANDHELP"
+msgid "show this help"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "follow <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "subscribe to user"
+msgstr "Abbonati a questo utente"
+
+#. TRANS: Help message for IM/SMS command "groups"
+msgctxt "COMMANDHELP"
+msgid "lists the groups you have joined"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscriptions"
+msgctxt "COMMANDHELP"
+msgid "list the people you follow"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscribers"
+msgctxt "COMMANDHELP"
+msgid "list the people that follow you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "leave <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "unsubscribe from user"
+msgstr "Annulla l'abbonamento da questo utente"
+
+#. TRANS: Help message for IM/SMS command "d <nickname> <text>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "direct message to user"
+msgstr "Messaggi diretti a %s"
+
+#. TRANS: Help message for IM/SMS command "get <nickname>"
+msgctxt "COMMANDHELP"
+msgid "get last notice from user"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "whois <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "get profile info on user"
+msgstr "Informazioni sul profilo"
+
+#. TRANS: Help message for IM/SMS command "lose <nickname>"
+msgctxt "COMMANDHELP"
+msgid "force user to stop following you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav <nickname>"
+msgctxt "COMMANDHELP"
+msgid "add user's last notice as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "add notice with the given id as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "repeat a notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "repeat the last notice from user"
+msgstr "Ripeti questo messaggio"
+
+#. TRANS: Help message for IM/SMS command "reply #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "reply to notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "reply <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "reply to the last notice from user"
+msgstr "Rispondi a questo messaggio"
+
+#. TRANS: Help message for IM/SMS command "join <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "join group"
+msgstr "Sconosciuto"
+
+#. TRANS: Help message for IM/SMS command "login"
+msgctxt "COMMANDHELP"
+msgid "Get a link to login to the web interface"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "drop <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "leave group"
+msgstr "Elimina utente"
+
+#. TRANS: Help message for IM/SMS command "stats"
+msgctxt "COMMANDHELP"
+msgid "get your stats"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "stop"
+#. TRANS: Help message for IM/SMS command "quit"
+msgctxt "COMMANDHELP"
+msgid "same as 'off'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "sub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'follow'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "unsub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'leave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "last <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'get'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "on <nickname>"
+#. TRANS: Help message for IM/SMS command "off <nickname>"
+#. TRANS: Help message for IM/SMS command "invite <phone number>"
+#. TRANS: Help message for IM/SMS command "track <word>"
+#. TRANS: Help message for IM/SMS command "untrack <word>"
+#. TRANS: Help message for IM/SMS command "track off"
+#. TRANS: Help message for IM/SMS command "untrack all"
+#. TRANS: Help message for IM/SMS command "tracks"
+#. TRANS: Help message for IM/SMS command "tracking"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "not yet implemented."
+msgstr "Comando non ancora implementato."
+
+#. TRANS: Help message for IM/SMS command "nudge <nickname>"
+msgctxt "COMMANDHELP"
+msgid "remind a user to update."
 msgstr ""
-"Comandi:\n"
-"on - abilita le notifiche\n"
-"off - disabilita le notifiche\n"
-"help - mostra questo aiuto\n"
-"follow <soprannome> - ti abbona all'utente\n"
-"groups - elenca i gruppi di cui fai parte\n"
-"subscriptions - elenca le persone che segui\n"
-"subscribers - elenca le persone che ti seguono\n"
-"leave <soprannome> - annulla l'abbonamento dall'utente\n"
-"d <soprannome> <testo> - invia un messaggio diretto all'utente\n"
-"get <soprannome> - recupera l'ultimo messaggio dell'utente\n"
-"whois <soprannome> - recupera le informazioni del profilo dell'utente\n"
-"lose <soprannome> - forza un utente nel non seguirti più\n"
-"fav <soprannome> - aggiunge l'ultimo messaggio dell'utente tra i tuoi "
-"preferiti\n"
-"fav #<ID_messaggio> - aggiunge un messaggio con quell'ID tra i tuoi "
-"preferiti\n"
-"repeat #<ID_messaggio> - ripete un messaggio con quell'ID\n"
-"repeat <soprannome> - ripete l'ultimo messaggio dell'utente\n"
-"reply #<ID_messaggio> - risponde al messaggio con quell'ID\n"
-"reply <soprannome> - risponde all'ultimo messaggio dell'utente\n"
-"join <gruppo> - ti iscrive al gruppo\n"
-"login - recupera un collegamento all'interfaccia web per eseguire l'accesso\n"
-"drop <gruppo> - annulla la tua iscrizione al gruppo\n"
-"stats - recupera il tuo stato\n"
-"stop - stessa azione del comando \"off\"\n"
-"quit - stessa azione del comando \"on\"\n"
-"sub <soprannome> - stessa azione del comando \"follow\"\n"
-"unsub <soprannome> - stessa azione del comando \"leave\"\n"
-"last <soprannome> - stessa azione del comando \"get\"\n"
-"on <soprannome> -non ancora implementato\n"
-"off <soprannome> - non ancora implementato\n"
-"nudge <soprannome> - ricorda a un utente di scrivere qualche cosa\n"
-"invite <numero di telefono> - non ancora implementato\n"
-"track <parola> - non ancora implementato\n"
-"untrack <parola> - non ancora implementato\n"
-"track off - non ancora implementato\n"
-"untrack all - non ancora implementato\n"
-"tracks - non ancora implementato\n"
-"tracking - non ancora implementato\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #, fuzzy
@@ -7117,6 +7235,9 @@ msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\"."
 msgstr "Dove è situato il gruppo, tipo \"città, regione, stato\""
 
+msgid "Aliases"
+msgstr "Alias"
+
 #, fuzzy, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -7196,6 +7317,10 @@ msgctxt "TOOLTIP"
 msgid "Add or edit %s design"
 msgstr "Aggiungi o modifica l'aspetto di %s"
 
+#. TRANS: Group actions header (h2). Text hidden by default.
+msgid "Group actions"
+msgstr "Azioni dei gruppi"
+
 #. TRANS: Title for groups with the most members section.
 msgid "Groups with most members"
 msgstr "I gruppi più numerosi"
@@ -7767,6 +7892,7 @@ msgstr "Invia un messaggio"
 msgid "What's up, %s?"
 msgstr "Cosa succede, %s?"
 
+#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr "Allega"
 
@@ -8228,52 +8354,6 @@ msgstr "Disabbonati"
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "L'utente non ha un profilo."
 
-msgid "Edit Avatar"
-msgstr "Modifica immagine"
-
-#. TRANS: H2 for user actions in a profile.
-#. TRANS: H2 for entity actions in a profile.
-msgid "User actions"
-msgstr "Azioni utente"
-
-#. TRANS: Text shown in user profile of not yet compeltely deleted users.
-msgid "User deletion in progress..."
-msgstr "Eliminazione utente..."
-
-#. TRANS: Link title for link on user profile.
-msgid "Edit profile settings"
-msgstr "Modifica impostazioni del profilo"
-
-#. TRANS: Link text for link on user profile.
-msgid "Edit"
-msgstr "Modifica"
-
-#. TRANS: Link title for link on user profile.
-msgid "Send a direct message to this user"
-msgstr "Invia un messaggio diretto a questo utente"
-
-#. TRANS: Link text for link on user profile.
-msgid "Message"
-msgstr "Messaggio"
-
-#. TRANS: Label text on user profile to select a user role.
-msgid "Moderate"
-msgstr "Modera"
-
-#. TRANS: Label text on user profile to select a user role.
-msgid "User role"
-msgstr "Ruolo dell'utente"
-
-#. TRANS: Role that can be set for a user profile.
-msgctxt "role"
-msgid "Administrator"
-msgstr "Amministratore"
-
-#. TRANS: Role that can be set for a user profile.
-msgctxt "role"
-msgid "Moderator"
-msgstr "Moderatore"
-
 #, fuzzy
 msgid "Not allowed to log in."
 msgstr "Accesso non effettuato."
@@ -8349,3 +8429,91 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#~ msgid "Note"
+#~ msgstr "Nota"
+
+#~ msgid ""
+#~ "Commands:\n"
+#~ "on - turn on notifications\n"
+#~ "off - turn off notifications\n"
+#~ "help - show this help\n"
+#~ "follow <nickname> - subscribe to user\n"
+#~ "groups - lists the groups you have joined\n"
+#~ "subscriptions - list the people you follow\n"
+#~ "subscribers - list the people that follow you\n"
+#~ "leave <nickname> - unsubscribe from user\n"
+#~ "d <nickname> <text> - direct message to user\n"
+#~ "get <nickname> - get last notice from user\n"
+#~ "whois <nickname> - get profile info on user\n"
+#~ "lose <nickname> - force user to stop following you\n"
+#~ "fav <nickname> - add user's last notice as a 'fave'\n"
+#~ "fav #<notice_id> - add notice with the given id as a 'fave'\n"
+#~ "repeat #<notice_id> - repeat a notice with a given id\n"
+#~ "repeat <nickname> - repeat the last notice from user\n"
+#~ "reply #<notice_id> - reply to notice with a given id\n"
+#~ "reply <nickname> - reply to the last notice from user\n"
+#~ "join <group> - join group\n"
+#~ "login - Get a link to login to the web interface\n"
+#~ "drop <group> - leave group\n"
+#~ "stats - get your stats\n"
+#~ "stop - same as 'off'\n"
+#~ "quit - same as 'off'\n"
+#~ "sub <nickname> - same as 'follow'\n"
+#~ "unsub <nickname> - same as 'leave'\n"
+#~ "last <nickname> - same as 'get'\n"
+#~ "on <nickname> - not yet implemented.\n"
+#~ "off <nickname> - not yet implemented.\n"
+#~ "nudge <nickname> - remind a user to update.\n"
+#~ "invite <phone number> - not yet implemented.\n"
+#~ "track <word> - not yet implemented.\n"
+#~ "untrack <word> - not yet implemented.\n"
+#~ "track off - not yet implemented.\n"
+#~ "untrack all - not yet implemented.\n"
+#~ "tracks - not yet implemented.\n"
+#~ "tracking - not yet implemented.\n"
+#~ msgstr ""
+#~ "Comandi:\n"
+#~ "on - abilita le notifiche\n"
+#~ "off - disabilita le notifiche\n"
+#~ "help - mostra questo aiuto\n"
+#~ "follow <soprannome> - ti abbona all'utente\n"
+#~ "groups - elenca i gruppi di cui fai parte\n"
+#~ "subscriptions - elenca le persone che segui\n"
+#~ "subscribers - elenca le persone che ti seguono\n"
+#~ "leave <soprannome> - annulla l'abbonamento dall'utente\n"
+#~ "d <soprannome> <testo> - invia un messaggio diretto all'utente\n"
+#~ "get <soprannome> - recupera l'ultimo messaggio dell'utente\n"
+#~ "whois <soprannome> - recupera le informazioni del profilo dell'utente\n"
+#~ "lose <soprannome> - forza un utente nel non seguirti più\n"
+#~ "fav <soprannome> - aggiunge l'ultimo messaggio dell'utente tra i tuoi "
+#~ "preferiti\n"
+#~ "fav #<ID_messaggio> - aggiunge un messaggio con quell'ID tra i tuoi "
+#~ "preferiti\n"
+#~ "repeat #<ID_messaggio> - ripete un messaggio con quell'ID\n"
+#~ "repeat <soprannome> - ripete l'ultimo messaggio dell'utente\n"
+#~ "reply #<ID_messaggio> - risponde al messaggio con quell'ID\n"
+#~ "reply <soprannome> - risponde all'ultimo messaggio dell'utente\n"
+#~ "join <gruppo> - ti iscrive al gruppo\n"
+#~ "login - recupera un collegamento all'interfaccia web per eseguire "
+#~ "l'accesso\n"
+#~ "drop <gruppo> - annulla la tua iscrizione al gruppo\n"
+#~ "stats - recupera il tuo stato\n"
+#~ "stop - stessa azione del comando \"off\"\n"
+#~ "quit - stessa azione del comando \"on\"\n"
+#~ "sub <soprannome> - stessa azione del comando \"follow\"\n"
+#~ "unsub <soprannome> - stessa azione del comando \"leave\"\n"
+#~ "last <soprannome> - stessa azione del comando \"get\"\n"
+#~ "on <soprannome> -non ancora implementato\n"
+#~ "off <soprannome> - non ancora implementato\n"
+#~ "nudge <soprannome> - ricorda a un utente di scrivere qualche cosa\n"
+#~ "invite <numero di telefono> - non ancora implementato\n"
+#~ "track <parola> - non ancora implementato\n"
+#~ "untrack <parola> - non ancora implementato\n"
+#~ "track off - non ancora implementato\n"
+#~ "untrack all - non ancora implementato\n"
+#~ "tracks - non ancora implementato\n"
+#~ "tracking - non ancora implementato\n"
+
+#~ msgid "Edit Avatar"
+#~ msgstr "Modifica immagine"
diff --git a/locale/ja/LC_MESSAGES/statusnet.po b/locale/ja/LC_MESSAGES/statusnet.po
index 00de07045f..2f58935de5 100644
--- a/locale/ja/LC_MESSAGES/statusnet.po
+++ b/locale/ja/LC_MESSAGES/statusnet.po
@@ -14,17 +14,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-11 18:15+0000\n"
-"PO-Revision-Date: 2011-03-11 18:17:15+0000\n"
+"POT-Creation-Date: 2011-03-17 09:47+0000\n"
+"PO-Revision-Date: 2011-03-17 09:49:43+0000\n"
 "Language-Team: Japanese <http://translatewiki.net/wiki/Portal:ja>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83703); Translate extension (2011-03-11)\n"
+"X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ja\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-POT-Import-Date: 2011-03-08 01:25:01+0000\n"
+"X-POT-Import-Date: 2011-03-11 18:52:41+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -593,7 +593,7 @@ msgstr "ユーザ %1$s をグループ %2$s から削除できません。"
 msgid "%s's groups"
 msgstr "%s のグループ"
 
-#. TRANS: Used as subtitle in check for group membership. %1$s is a user name, %2$s is the site name.
+#. TRANS: Used as subtitle in check for group membership. %1$s is the site name, %2$s is a user name.
 #, fuzzy, php-format
 msgid "%1$s groups %2$s is a member of."
 msgstr "グループ %s はメンバー"
@@ -4732,18 +4732,6 @@ msgstr "%s グループ"
 msgid "%1$s group, page %2$d"
 msgstr "%1$s グループ、ページ %2$d"
 
-#. TRANS: Label for group description or group note (dt). Text hidden by default.
-msgid "Note"
-msgstr "ノート"
-
-#. TRANS: Label for group aliases (dt). Text hidden by default.
-msgid "Aliases"
-msgstr "別名"
-
-#. TRANS: Group actions header (h2). Text hidden by default.
-msgid "Group actions"
-msgstr "グループアクション"
-
 #. TRANS: Tooltip for feed link. %s is a group nickname.
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
@@ -4855,6 +4843,10 @@ msgstr "%2$s 上の %1$s からのメッセージ"
 msgid "Notice deleted."
 msgstr "つぶやきを削除しました。"
 
+#, fuzzy
+msgid "Notice"
+msgstr "つぶやき"
+
 #. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
 #, fuzzy, php-format
 msgid "%1$s tagged %2$s"
@@ -5404,7 +5396,6 @@ msgstr "ID引数がありません。"
 msgid "Tag %s"
 msgstr "タグ %s"
 
-#. TRANS: H2 for user profile information.
 msgid "User profile"
 msgstr "ユーザプロファイル"
 
@@ -6110,6 +6101,53 @@ msgstr ""
 msgid "No AtomPub API service for %s."
 msgstr ""
 
+#. TRANS: H2 for user actions in a profile.
+#. TRANS: H2 for entity actions in a profile.
+msgid "User actions"
+msgstr "利用者アクション"
+
+#. TRANS: Text shown in user profile of not yet compeltely deleted users.
+msgid "User deletion in progress..."
+msgstr ""
+
+#. TRANS: Link title for link on user profile.
+msgid "Edit profile settings"
+msgstr "プロファイル設定編集"
+
+#. TRANS: Link text for link on user profile.
+msgid "Edit"
+msgstr "編集"
+
+#. TRANS: Link title for link on user profile.
+msgid "Send a direct message to this user"
+msgstr "この利用者にダイレクトメッセージを送る"
+
+#. TRANS: Link text for link on user profile.
+msgid "Message"
+msgstr "メッセージ"
+
+#. TRANS: Label text on user profile to select a user role.
+#, fuzzy
+msgid "Moderate"
+msgstr "管理"
+
+#. TRANS: Label text on user profile to select a user role.
+#, fuzzy
+msgid "User role"
+msgstr "ユーザプロファイル"
+
+#. TRANS: Role that can be set for a user profile.
+#, fuzzy
+msgctxt "role"
+msgid "Administrator"
+msgstr "管理者"
+
+#. TRANS: Role that can be set for a user profile.
+#, fuzzy
+msgctxt "role"
+msgid "Moderator"
+msgstr "管理"
+
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
 #, php-format
 msgid "%1$s - %2$s"
@@ -6836,46 +6874,170 @@ msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "あなたはこのグループのメンバーではありません:"
 
-#. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-msgid ""
-"Commands:\n"
-"on - turn on notifications\n"
-"off - turn off notifications\n"
-"help - show this help\n"
-"follow <nickname> - subscribe to user\n"
-"groups - lists the groups you have joined\n"
-"subscriptions - list the people you follow\n"
-"subscribers - list the people that follow you\n"
-"leave <nickname> - unsubscribe from user\n"
-"d <nickname> <text> - direct message to user\n"
-"get <nickname> - get last notice from user\n"
-"whois <nickname> - get profile info on user\n"
-"lose <nickname> - force user to stop following you\n"
-"fav <nickname> - add user's last notice as a 'fave'\n"
-"fav #<notice_id> - add notice with the given id as a 'fave'\n"
-"repeat #<notice_id> - repeat a notice with a given id\n"
-"repeat <nickname> - repeat the last notice from user\n"
-"reply #<notice_id> - reply to notice with a given id\n"
-"reply <nickname> - reply to the last notice from user\n"
-"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
-"drop <group> - leave group\n"
-"stats - get your stats\n"
-"stop - same as 'off'\n"
-"quit - same as 'off'\n"
-"sub <nickname> - same as 'follow'\n"
-"unsub <nickname> - same as 'leave'\n"
-"last <nickname> - same as 'get'\n"
-"on <nickname> - not yet implemented.\n"
-"off <nickname> - not yet implemented.\n"
-"nudge <nickname> - remind a user to update.\n"
-"invite <phone number> - not yet implemented.\n"
-"track <word> - not yet implemented.\n"
-"untrack <word> - not yet implemented.\n"
-"track off - not yet implemented.\n"
-"untrack all - not yet implemented.\n"
-"tracks - not yet implemented.\n"
-"tracking - not yet implemented.\n"
+#. TRANS: Header line of help text for commands.
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "Commands:"
+msgstr "コマンド結果"
+
+#. TRANS: Help message for IM/SMS command "on"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "turn on notifications"
+msgstr "通知をオンできません。"
+
+#. TRANS: Help message for IM/SMS command "off"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "turn off notifications"
+msgstr "通知をオフできません。"
+
+#. TRANS: Help message for IM/SMS command "help"
+msgctxt "COMMANDHELP"
+msgid "show this help"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "follow <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "subscribe to user"
+msgstr "このユーザーをフォロー"
+
+#. TRANS: Help message for IM/SMS command "groups"
+msgctxt "COMMANDHELP"
+msgid "lists the groups you have joined"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscriptions"
+msgctxt "COMMANDHELP"
+msgid "list the people you follow"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscribers"
+msgctxt "COMMANDHELP"
+msgid "list the people that follow you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "leave <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "unsubscribe from user"
+msgstr "この利用者からのフォローを解除する"
+
+#. TRANS: Help message for IM/SMS command "d <nickname> <text>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "direct message to user"
+msgstr "%s へのダイレクトメッセージ"
+
+#. TRANS: Help message for IM/SMS command "get <nickname>"
+msgctxt "COMMANDHELP"
+msgid "get last notice from user"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "whois <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "get profile info on user"
+msgstr "プロファイル情報"
+
+#. TRANS: Help message for IM/SMS command "lose <nickname>"
+msgctxt "COMMANDHELP"
+msgid "force user to stop following you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav <nickname>"
+msgctxt "COMMANDHELP"
+msgid "add user's last notice as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "add notice with the given id as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "repeat a notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "repeat the last notice from user"
+msgstr "このつぶやきを繰り返す"
+
+#. TRANS: Help message for IM/SMS command "reply #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "reply to notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "reply <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "reply to the last notice from user"
+msgstr "このつぶやきへ返信"
+
+#. TRANS: Help message for IM/SMS command "join <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "join group"
+msgstr "不明"
+
+#. TRANS: Help message for IM/SMS command "login"
+msgctxt "COMMANDHELP"
+msgid "Get a link to login to the web interface"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "drop <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "leave group"
+msgstr "ユーザ削除"
+
+#. TRANS: Help message for IM/SMS command "stats"
+msgctxt "COMMANDHELP"
+msgid "get your stats"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "stop"
+#. TRANS: Help message for IM/SMS command "quit"
+msgctxt "COMMANDHELP"
+msgid "same as 'off'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "sub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'follow'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "unsub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'leave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "last <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'get'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "on <nickname>"
+#. TRANS: Help message for IM/SMS command "off <nickname>"
+#. TRANS: Help message for IM/SMS command "invite <phone number>"
+#. TRANS: Help message for IM/SMS command "track <word>"
+#. TRANS: Help message for IM/SMS command "untrack <word>"
+#. TRANS: Help message for IM/SMS command "track off"
+#. TRANS: Help message for IM/SMS command "untrack all"
+#. TRANS: Help message for IM/SMS command "tracks"
+#. TRANS: Help message for IM/SMS command "tracking"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "not yet implemented."
+msgstr "コマンドはまだ実装されていません。"
+
+#. TRANS: Help message for IM/SMS command "nudge <nickname>"
+msgctxt "COMMANDHELP"
+msgid "remind a user to update."
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
@@ -7060,6 +7222,9 @@ msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\"."
 msgstr "グループの場所, 例えば \"都市, 都道府県 (または 地域), 国\""
 
+msgid "Aliases"
+msgstr "別名"
+
 #, fuzzy, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -7138,6 +7303,10 @@ msgctxt "TOOLTIP"
 msgid "Add or edit %s design"
 msgstr ""
 
+#. TRANS: Group actions header (h2). Text hidden by default.
+msgid "Group actions"
+msgstr "グループアクション"
+
 #. TRANS: Title for groups with the most members section.
 msgid "Groups with most members"
 msgstr "メンバー数が多いグループ"
@@ -7676,6 +7845,7 @@ msgstr "つぶやきを送る"
 msgid "What's up, %s?"
 msgstr "最近どう %s?"
 
+#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr "添付"
 
@@ -8133,56 +8303,6 @@ msgstr "フォロー解除"
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "ユーザはプロフィールをもっていません。"
 
-msgid "Edit Avatar"
-msgstr "アバターを編集する"
-
-#. TRANS: H2 for user actions in a profile.
-#. TRANS: H2 for entity actions in a profile.
-msgid "User actions"
-msgstr "利用者アクション"
-
-#. TRANS: Text shown in user profile of not yet compeltely deleted users.
-msgid "User deletion in progress..."
-msgstr ""
-
-#. TRANS: Link title for link on user profile.
-msgid "Edit profile settings"
-msgstr "プロファイル設定編集"
-
-#. TRANS: Link text for link on user profile.
-msgid "Edit"
-msgstr "編集"
-
-#. TRANS: Link title for link on user profile.
-msgid "Send a direct message to this user"
-msgstr "この利用者にダイレクトメッセージを送る"
-
-#. TRANS: Link text for link on user profile.
-msgid "Message"
-msgstr "メッセージ"
-
-#. TRANS: Label text on user profile to select a user role.
-#, fuzzy
-msgid "Moderate"
-msgstr "管理"
-
-#. TRANS: Label text on user profile to select a user role.
-#, fuzzy
-msgid "User role"
-msgstr "ユーザプロファイル"
-
-#. TRANS: Role that can be set for a user profile.
-#, fuzzy
-msgctxt "role"
-msgid "Administrator"
-msgstr "管理者"
-
-#. TRANS: Role that can be set for a user profile.
-#, fuzzy
-msgctxt "role"
-msgid "Moderator"
-msgstr "管理"
-
 #, fuzzy
 msgid "Not allowed to log in."
 msgstr "ログインしていません。"
@@ -8254,3 +8374,9 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#~ msgid "Note"
+#~ msgstr "ノート"
+
+#~ msgid "Edit Avatar"
+#~ msgstr "アバターを編集する"
diff --git a/locale/ka/LC_MESSAGES/statusnet.po b/locale/ka/LC_MESSAGES/statusnet.po
index c282ae94ac..2b54bf0f85 100644
--- a/locale/ka/LC_MESSAGES/statusnet.po
+++ b/locale/ka/LC_MESSAGES/statusnet.po
@@ -9,17 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-11 18:15+0000\n"
-"PO-Revision-Date: 2011-03-11 18:17:16+0000\n"
+"POT-Creation-Date: 2011-03-17 09:47+0000\n"
+"PO-Revision-Date: 2011-03-17 09:49:45+0000\n"
 "Language-Team: Georgian <http://translatewiki.net/wiki/Portal:ka>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83703); Translate extension (2011-03-11)\n"
+"X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ka\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-POT-Import-Date: 2011-03-08 01:25:01+0000\n"
+"X-POT-Import-Date: 2011-03-11 18:52:41+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -584,7 +584,7 @@ msgstr "მომხმარებლ %1$s-ის გარიცხვა ჯ
 msgid "%s's groups"
 msgstr "%s-ს ჯგუფები"
 
-#. TRANS: Used as subtitle in check for group membership. %1$s is a user name, %2$s is the site name.
+#. TRANS: Used as subtitle in check for group membership. %1$s is the site name, %2$s is a user name.
 #, php-format
 msgid "%1$s groups %2$s is a member of."
 msgstr "%1$s-ს ის ჯგუფები რომლებშიც გაერთიანებულია %2$s."
@@ -4680,18 +4680,6 @@ msgstr ""
 msgid "%1$s group, page %2$d"
 msgstr ""
 
-#. TRANS: Label for group description or group note (dt). Text hidden by default.
-msgid "Note"
-msgstr "შენიშვნა"
-
-#. TRANS: Label for group aliases (dt). Text hidden by default.
-msgid "Aliases"
-msgstr ""
-
-#. TRANS: Group actions header (h2). Text hidden by default.
-msgid "Group actions"
-msgstr ""
-
 #. TRANS: Tooltip for feed link. %s is a group nickname.
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
@@ -4794,6 +4782,10 @@ msgstr ""
 msgid "Notice deleted."
 msgstr ""
 
+#, fuzzy
+msgid "Notice"
+msgstr "შეტყობინებები"
+
 #. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
 #, fuzzy, php-format
 msgid "%1$s tagged %2$s"
@@ -5321,7 +5313,6 @@ msgstr ""
 msgid "Tag %s"
 msgstr "სანიშნე %s"
 
-#. TRANS: H2 for user profile information.
 msgid "User profile"
 msgstr "მომხმარებლის პროფილი"
 
@@ -6040,6 +6031,49 @@ msgstr ""
 msgid "No AtomPub API service for %s."
 msgstr ""
 
+#. TRANS: H2 for user actions in a profile.
+#. TRANS: H2 for entity actions in a profile.
+msgid "User actions"
+msgstr "მომხმარებლის მოქმედებები"
+
+#. TRANS: Text shown in user profile of not yet compeltely deleted users.
+msgid "User deletion in progress..."
+msgstr "მომხმარებლის წაშლა პროგრესშია..."
+
+#. TRANS: Link title for link on user profile.
+msgid "Edit profile settings"
+msgstr "პროფილის პარამეტრების რედაქტირება"
+
+#. TRANS: Link text for link on user profile.
+msgid "Edit"
+msgstr "რედაქტირება"
+
+#. TRANS: Link title for link on user profile.
+msgid "Send a direct message to this user"
+msgstr "გაუგზავნე პირდაპირი შეტყობინება ამ მომხმარებელს"
+
+#. TRANS: Link text for link on user profile.
+msgid "Message"
+msgstr "შეტყობინება"
+
+#. TRANS: Label text on user profile to select a user role.
+msgid "Moderate"
+msgstr "მოდერაცია"
+
+#. TRANS: Label text on user profile to select a user role.
+msgid "User role"
+msgstr "მომხმარებლის როლი"
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Administrator"
+msgstr "ადმინისტრატორი"
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Moderator"
+msgstr "მოდერატორი"
+
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
 #, php-format
 msgid "%1$s - %2$s"
@@ -6762,46 +6796,168 @@ msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] ""
 
-#. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-msgid ""
-"Commands:\n"
-"on - turn on notifications\n"
-"off - turn off notifications\n"
-"help - show this help\n"
-"follow <nickname> - subscribe to user\n"
-"groups - lists the groups you have joined\n"
-"subscriptions - list the people you follow\n"
-"subscribers - list the people that follow you\n"
-"leave <nickname> - unsubscribe from user\n"
-"d <nickname> <text> - direct message to user\n"
-"get <nickname> - get last notice from user\n"
-"whois <nickname> - get profile info on user\n"
-"lose <nickname> - force user to stop following you\n"
-"fav <nickname> - add user's last notice as a 'fave'\n"
-"fav #<notice_id> - add notice with the given id as a 'fave'\n"
-"repeat #<notice_id> - repeat a notice with a given id\n"
-"repeat <nickname> - repeat the last notice from user\n"
-"reply #<notice_id> - reply to notice with a given id\n"
-"reply <nickname> - reply to the last notice from user\n"
-"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
-"drop <group> - leave group\n"
-"stats - get your stats\n"
-"stop - same as 'off'\n"
-"quit - same as 'off'\n"
-"sub <nickname> - same as 'follow'\n"
-"unsub <nickname> - same as 'leave'\n"
-"last <nickname> - same as 'get'\n"
-"on <nickname> - not yet implemented.\n"
-"off <nickname> - not yet implemented.\n"
-"nudge <nickname> - remind a user to update.\n"
-"invite <phone number> - not yet implemented.\n"
-"track <word> - not yet implemented.\n"
-"untrack <word> - not yet implemented.\n"
-"track off - not yet implemented.\n"
-"untrack all - not yet implemented.\n"
-"tracks - not yet implemented.\n"
-"tracking - not yet implemented.\n"
+#. TRANS: Header line of help text for commands.
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "Commands:"
+msgstr "ბრძანების შედეგები"
+
+#. TRANS: Help message for IM/SMS command "on"
+msgctxt "COMMANDHELP"
+msgid "turn on notifications"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "off"
+msgctxt "COMMANDHELP"
+msgid "turn off notifications"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "help"
+msgctxt "COMMANDHELP"
+msgid "show this help"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "follow <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "subscribe to user"
+msgstr "გამოიწერე ეს მომხმარებელი"
+
+#. TRANS: Help message for IM/SMS command "groups"
+msgctxt "COMMANDHELP"
+msgid "lists the groups you have joined"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscriptions"
+msgctxt "COMMANDHELP"
+msgid "list the people you follow"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscribers"
+msgctxt "COMMANDHELP"
+msgid "list the people that follow you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "leave <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "unsubscribe from user"
+msgstr "ამ მომხმარებლის გამოწერის გაუქმება"
+
+#. TRANS: Help message for IM/SMS command "d <nickname> <text>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "direct message to user"
+msgstr "%s-სთვის გაგზავნილი პირდაპირი შეტყობინებები"
+
+#. TRANS: Help message for IM/SMS command "get <nickname>"
+msgctxt "COMMANDHELP"
+msgid "get last notice from user"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "whois <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "get profile info on user"
+msgstr "ინფორმაცია პროფილზე"
+
+#. TRANS: Help message for IM/SMS command "lose <nickname>"
+msgctxt "COMMANDHELP"
+msgid "force user to stop following you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav <nickname>"
+msgctxt "COMMANDHELP"
+msgid "add user's last notice as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "add notice with the given id as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "repeat a notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "repeat the last notice from user"
+msgstr "შეტყობინების გამეორება"
+
+#. TRANS: Help message for IM/SMS command "reply #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "reply to notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "reply <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "reply to the last notice from user"
+msgstr "უპასუხე ამ შეტყობინებას"
+
+#. TRANS: Help message for IM/SMS command "join <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "join group"
+msgstr "უცნობი"
+
+#. TRANS: Help message for IM/SMS command "login"
+msgctxt "COMMANDHELP"
+msgid "Get a link to login to the web interface"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "drop <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "leave group"
+msgstr "მომხმარებლის წაშლა"
+
+#. TRANS: Help message for IM/SMS command "stats"
+msgctxt "COMMANDHELP"
+msgid "get your stats"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "stop"
+#. TRANS: Help message for IM/SMS command "quit"
+msgctxt "COMMANDHELP"
+msgid "same as 'off'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "sub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'follow'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "unsub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'leave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "last <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'get'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "on <nickname>"
+#. TRANS: Help message for IM/SMS command "off <nickname>"
+#. TRANS: Help message for IM/SMS command "invite <phone number>"
+#. TRANS: Help message for IM/SMS command "track <word>"
+#. TRANS: Help message for IM/SMS command "untrack <word>"
+#. TRANS: Help message for IM/SMS command "track off"
+#. TRANS: Help message for IM/SMS command "untrack all"
+#. TRANS: Help message for IM/SMS command "tracks"
+#. TRANS: Help message for IM/SMS command "tracking"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "not yet implemented."
+msgstr "ბრძანება ჯერ არ არის შემუშავებული."
+
+#. TRANS: Help message for IM/SMS command "nudge <nickname>"
+msgctxt "COMMANDHELP"
+msgid "remind a user to update."
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
@@ -6985,6 +7141,9 @@ msgstr ""
 "ჯგუფის მდებარეობა არსებობის შემთხვევაში. მაგ.: \"ქალაქი, ქვეყანა (ან რეგიონი)"
 "\""
 
+msgid "Aliases"
+msgstr ""
+
 #, fuzzy, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -7063,6 +7222,10 @@ msgctxt "TOOLTIP"
 msgid "Add or edit %s design"
 msgstr ""
 
+#. TRANS: Group actions header (h2). Text hidden by default.
+msgid "Group actions"
+msgstr ""
+
 #. TRANS: Title for groups with the most members section.
 msgid "Groups with most members"
 msgstr "ჯგუფები უმეტესი მომხმარებლებით"
@@ -7607,6 +7770,7 @@ msgstr "შეტყობინების გაგზავნა"
 msgid "What's up, %s?"
 msgstr "რა არის ახალი %s?"
 
+#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr "ფაილის მიმაგრება"
 
@@ -8068,52 +8232,6 @@ msgstr "გამოწერის გაუქმება"
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "მომხმარებელს პროფილი არ გააჩნია."
 
-msgid "Edit Avatar"
-msgstr "ავატარის რედაქტირება"
-
-#. TRANS: H2 for user actions in a profile.
-#. TRANS: H2 for entity actions in a profile.
-msgid "User actions"
-msgstr "მომხმარებლის მოქმედებები"
-
-#. TRANS: Text shown in user profile of not yet compeltely deleted users.
-msgid "User deletion in progress..."
-msgstr "მომხმარებლის წაშლა პროგრესშია..."
-
-#. TRANS: Link title for link on user profile.
-msgid "Edit profile settings"
-msgstr "პროფილის პარამეტრების რედაქტირება"
-
-#. TRANS: Link text for link on user profile.
-msgid "Edit"
-msgstr "რედაქტირება"
-
-#. TRANS: Link title for link on user profile.
-msgid "Send a direct message to this user"
-msgstr "გაუგზავნე პირდაპირი შეტყობინება ამ მომხმარებელს"
-
-#. TRANS: Link text for link on user profile.
-msgid "Message"
-msgstr "შეტყობინება"
-
-#. TRANS: Label text on user profile to select a user role.
-msgid "Moderate"
-msgstr "მოდერაცია"
-
-#. TRANS: Label text on user profile to select a user role.
-msgid "User role"
-msgstr "მომხმარებლის როლი"
-
-#. TRANS: Role that can be set for a user profile.
-msgctxt "role"
-msgid "Administrator"
-msgstr "ადმინისტრატორი"
-
-#. TRANS: Role that can be set for a user profile.
-msgctxt "role"
-msgid "Moderator"
-msgstr "მოდერატორი"
-
 #, fuzzy
 msgid "Not allowed to log in."
 msgstr "ავტორიზებული არ ხართ."
@@ -8186,3 +8304,9 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#~ msgid "Note"
+#~ msgstr "შენიშვნა"
+
+#~ msgid "Edit Avatar"
+#~ msgstr "ავატარის რედაქტირება"
diff --git a/locale/ko/LC_MESSAGES/statusnet.po b/locale/ko/LC_MESSAGES/statusnet.po
index 8d0a52c16f..faead36164 100644
--- a/locale/ko/LC_MESSAGES/statusnet.po
+++ b/locale/ko/LC_MESSAGES/statusnet.po
@@ -11,17 +11,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-11 18:15+0000\n"
-"PO-Revision-Date: 2011-03-11 18:17:17+0000\n"
+"POT-Creation-Date: 2011-03-17 09:47+0000\n"
+"PO-Revision-Date: 2011-03-17 09:49:46+0000\n"
 "Language-Team: Korean <http://translatewiki.net/wiki/Portal:ko>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83703); Translate extension (2011-03-11)\n"
+"X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ko\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-POT-Import-Date: 2011-03-08 01:25:01+0000\n"
+"X-POT-Import-Date: 2011-03-11 18:52:41+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -581,7 +581,7 @@ msgstr "이용자 %1$s 의 그룹 %2$s 가입에 실패했습니다."
 msgid "%s's groups"
 msgstr "%s의 그룹"
 
-#. TRANS: Used as subtitle in check for group membership. %1$s is a user name, %2$s is the site name.
+#. TRANS: Used as subtitle in check for group membership. %1$s is the site name, %2$s is a user name.
 #, php-format
 msgid "%1$s groups %2$s is a member of."
 msgstr "%1$s 사이트의 그룹에 %2$s 사용자가 멤버입니다."
@@ -4635,18 +4635,6 @@ msgstr "%s 그룹"
 msgid "%1$s group, page %2$d"
 msgstr "그룹, %d페이지"
 
-#. TRANS: Label for group description or group note (dt). Text hidden by default.
-msgid "Note"
-msgstr "설명"
-
-#. TRANS: Label for group aliases (dt). Text hidden by default.
-msgid "Aliases"
-msgstr ""
-
-#. TRANS: Group actions header (h2). Text hidden by default.
-msgid "Group actions"
-msgstr "그룹 행동"
-
 #. TRANS: Tooltip for feed link. %s is a group nickname.
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
@@ -4753,6 +4741,10 @@ msgstr "%1$s에서 %2$s까지 메시지"
 msgid "Notice deleted."
 msgstr "게시글이 등록되었습니다."
 
+#, fuzzy
+msgid "Notice"
+msgstr "통지"
+
 #. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
 #, fuzzy, php-format
 msgid "%1$s tagged %2$s"
@@ -5272,7 +5264,6 @@ msgstr "첨부문서 없음"
 msgid "Tag %s"
 msgstr "태그 %s"
 
-#. TRANS: H2 for user profile information.
 msgid "User profile"
 msgstr "이용자 프로필"
 
@@ -5984,6 +5975,50 @@ msgstr ""
 msgid "No AtomPub API service for %s."
 msgstr ""
 
+#. TRANS: H2 for user actions in a profile.
+#. TRANS: H2 for entity actions in a profile.
+msgid "User actions"
+msgstr "사용자 동작"
+
+#. TRANS: Text shown in user profile of not yet compeltely deleted users.
+msgid "User deletion in progress..."
+msgstr ""
+
+#. TRANS: Link title for link on user profile.
+msgid "Edit profile settings"
+msgstr "프로필 설정"
+
+#. TRANS: Link text for link on user profile.
+msgid "Edit"
+msgstr "편집"
+
+#. TRANS: Link title for link on user profile.
+msgid "Send a direct message to this user"
+msgstr "이 회원에게 직접 메시지를 보냅니다."
+
+#. TRANS: Link text for link on user profile.
+msgid "Message"
+msgstr "메시지"
+
+#. TRANS: Label text on user profile to select a user role.
+msgid "Moderate"
+msgstr ""
+
+#. TRANS: Label text on user profile to select a user role.
+#, fuzzy
+msgid "User role"
+msgstr "이용자 프로필"
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Administrator"
+msgstr "관리자"
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Moderator"
+msgstr ""
+
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
 #, php-format
 msgid "%1$s - %2$s"
@@ -6707,46 +6742,170 @@ msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "당신은 해당 그룹의 멤버가 아닙니다."
 
-#. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-msgid ""
-"Commands:\n"
-"on - turn on notifications\n"
-"off - turn off notifications\n"
-"help - show this help\n"
-"follow <nickname> - subscribe to user\n"
-"groups - lists the groups you have joined\n"
-"subscriptions - list the people you follow\n"
-"subscribers - list the people that follow you\n"
-"leave <nickname> - unsubscribe from user\n"
-"d <nickname> <text> - direct message to user\n"
-"get <nickname> - get last notice from user\n"
-"whois <nickname> - get profile info on user\n"
-"lose <nickname> - force user to stop following you\n"
-"fav <nickname> - add user's last notice as a 'fave'\n"
-"fav #<notice_id> - add notice with the given id as a 'fave'\n"
-"repeat #<notice_id> - repeat a notice with a given id\n"
-"repeat <nickname> - repeat the last notice from user\n"
-"reply #<notice_id> - reply to notice with a given id\n"
-"reply <nickname> - reply to the last notice from user\n"
-"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
-"drop <group> - leave group\n"
-"stats - get your stats\n"
-"stop - same as 'off'\n"
-"quit - same as 'off'\n"
-"sub <nickname> - same as 'follow'\n"
-"unsub <nickname> - same as 'leave'\n"
-"last <nickname> - same as 'get'\n"
-"on <nickname> - not yet implemented.\n"
-"off <nickname> - not yet implemented.\n"
-"nudge <nickname> - remind a user to update.\n"
-"invite <phone number> - not yet implemented.\n"
-"track <word> - not yet implemented.\n"
-"untrack <word> - not yet implemented.\n"
-"track off - not yet implemented.\n"
-"untrack all - not yet implemented.\n"
-"tracks - not yet implemented.\n"
-"tracking - not yet implemented.\n"
+#. TRANS: Header line of help text for commands.
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "Commands:"
+msgstr "실행결과"
+
+#. TRANS: Help message for IM/SMS command "on"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "turn on notifications"
+msgstr "알림을 켤 수 없습니다."
+
+#. TRANS: Help message for IM/SMS command "off"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "turn off notifications"
+msgstr "알림을 끌 수 없습니다."
+
+#. TRANS: Help message for IM/SMS command "help"
+msgctxt "COMMANDHELP"
+msgid "show this help"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "follow <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "subscribe to user"
+msgstr "이 회원을 구독합니다."
+
+#. TRANS: Help message for IM/SMS command "groups"
+msgctxt "COMMANDHELP"
+msgid "lists the groups you have joined"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscriptions"
+msgctxt "COMMANDHELP"
+msgid "list the people you follow"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscribers"
+msgctxt "COMMANDHELP"
+msgid "list the people that follow you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "leave <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "unsubscribe from user"
+msgstr "이 사용자로부터 구독취소합니다."
+
+#. TRANS: Help message for IM/SMS command "d <nickname> <text>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "direct message to user"
+msgstr "%s에게 직접 메시지"
+
+#. TRANS: Help message for IM/SMS command "get <nickname>"
+msgctxt "COMMANDHELP"
+msgid "get last notice from user"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "whois <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "get profile info on user"
+msgstr "프로필 정보"
+
+#. TRANS: Help message for IM/SMS command "lose <nickname>"
+msgctxt "COMMANDHELP"
+msgid "force user to stop following you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav <nickname>"
+msgctxt "COMMANDHELP"
+msgid "add user's last notice as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "add notice with the given id as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "repeat a notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "repeat the last notice from user"
+msgstr "이 게시글에 대해 답장하기"
+
+#. TRANS: Help message for IM/SMS command "reply #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "reply to notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "reply <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "reply to the last notice from user"
+msgstr "이 게시글에 대해 답장하기"
+
+#. TRANS: Help message for IM/SMS command "join <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "join group"
+msgstr "알려지지 않은 행동"
+
+#. TRANS: Help message for IM/SMS command "login"
+msgctxt "COMMANDHELP"
+msgid "Get a link to login to the web interface"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "drop <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "leave group"
+msgstr "이용자 삭제"
+
+#. TRANS: Help message for IM/SMS command "stats"
+msgctxt "COMMANDHELP"
+msgid "get your stats"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "stop"
+#. TRANS: Help message for IM/SMS command "quit"
+msgctxt "COMMANDHELP"
+msgid "same as 'off'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "sub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'follow'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "unsub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'leave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "last <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'get'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "on <nickname>"
+#. TRANS: Help message for IM/SMS command "off <nickname>"
+#. TRANS: Help message for IM/SMS command "invite <phone number>"
+#. TRANS: Help message for IM/SMS command "track <word>"
+#. TRANS: Help message for IM/SMS command "untrack <word>"
+#. TRANS: Help message for IM/SMS command "track off"
+#. TRANS: Help message for IM/SMS command "untrack all"
+#. TRANS: Help message for IM/SMS command "tracks"
+#. TRANS: Help message for IM/SMS command "tracking"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "not yet implemented."
+msgstr "명령이 아직 실행되지 않았습니다."
+
+#. TRANS: Help message for IM/SMS command "nudge <nickname>"
+msgctxt "COMMANDHELP"
+msgid "remind a user to update."
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
@@ -6929,6 +7088,9 @@ msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\"."
 msgstr "그룹의 위치, \"시/군/구, 도, 국가\""
 
+msgid "Aliases"
+msgstr ""
+
 #, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -7005,6 +7167,10 @@ msgctxt "TOOLTIP"
 msgid "Add or edit %s design"
 msgstr ""
 
+#. TRANS: Group actions header (h2). Text hidden by default.
+msgid "Group actions"
+msgstr "그룹 행동"
+
 #. TRANS: Title for groups with the most members section.
 msgid "Groups with most members"
 msgstr "가장 많은 회원수를 가진 그룹들"
@@ -7469,6 +7635,7 @@ msgstr "게시글 보내기"
 msgid "What's up, %s?"
 msgstr "뭐하세요 %s님?"
 
+#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr "첨부"
 
@@ -7931,53 +8098,6 @@ msgstr "구독 해제"
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "이용자가 프로필을 가지고 있지 않습니다."
 
-msgid "Edit Avatar"
-msgstr "아바타 편집"
-
-#. TRANS: H2 for user actions in a profile.
-#. TRANS: H2 for entity actions in a profile.
-msgid "User actions"
-msgstr "사용자 동작"
-
-#. TRANS: Text shown in user profile of not yet compeltely deleted users.
-msgid "User deletion in progress..."
-msgstr ""
-
-#. TRANS: Link title for link on user profile.
-msgid "Edit profile settings"
-msgstr "프로필 설정"
-
-#. TRANS: Link text for link on user profile.
-msgid "Edit"
-msgstr "편집"
-
-#. TRANS: Link title for link on user profile.
-msgid "Send a direct message to this user"
-msgstr "이 회원에게 직접 메시지를 보냅니다."
-
-#. TRANS: Link text for link on user profile.
-msgid "Message"
-msgstr "메시지"
-
-#. TRANS: Label text on user profile to select a user role.
-msgid "Moderate"
-msgstr ""
-
-#. TRANS: Label text on user profile to select a user role.
-#, fuzzy
-msgid "User role"
-msgstr "이용자 프로필"
-
-#. TRANS: Role that can be set for a user profile.
-msgctxt "role"
-msgid "Administrator"
-msgstr "관리자"
-
-#. TRANS: Role that can be set for a user profile.
-msgctxt "role"
-msgid "Moderator"
-msgstr ""
-
 #, fuzzy
 msgid "Not allowed to log in."
 msgstr "로그인하고 있지 않습니다."
@@ -8049,3 +8169,9 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#~ msgid "Note"
+#~ msgstr "설명"
+
+#~ msgid "Edit Avatar"
+#~ msgstr "아바타 편집"
diff --git a/locale/mk/LC_MESSAGES/statusnet.po b/locale/mk/LC_MESSAGES/statusnet.po
index 330d0022dc..f5298423de 100644
--- a/locale/mk/LC_MESSAGES/statusnet.po
+++ b/locale/mk/LC_MESSAGES/statusnet.po
@@ -10,17 +10,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-11 18:15+0000\n"
-"PO-Revision-Date: 2011-03-11 18:17:18+0000\n"
+"POT-Creation-Date: 2011-03-17 09:47+0000\n"
+"PO-Revision-Date: 2011-03-17 09:49:47+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83703); Translate extension (2011-03-11)\n"
+"X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
-"X-POT-Import-Date: 2011-03-08 01:25:01+0000\n"
+"X-POT-Import-Date: 2011-03-11 18:52:41+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -593,7 +593,7 @@ msgstr "Не можев да го отстранам корисникот %1$s 
 msgid "%s's groups"
 msgstr "%s групи"
 
-#. TRANS: Used as subtitle in check for group membership. %1$s is a user name, %2$s is the site name.
+#. TRANS: Used as subtitle in check for group membership. %1$s is the site name, %2$s is a user name.
 #, php-format
 msgid "%1$s groups %2$s is a member of."
 msgstr "%1$s групи кадешто членува %2$s."
@@ -1041,9 +1041,8 @@ msgid "Can only fave notices."
 msgstr "Може само да бендисува забелешки."
 
 #. TRANS: Client exception thrown when trying favorite a notice without content.
-#, fuzzy
 msgid "Unknown notice."
-msgstr "Непозната белешка."
+msgstr "Непозната забелешка."
 
 #. TRANS: Client exception thrown when trying favorite an already favorited notice.
 msgid "Already a favorite."
@@ -3090,9 +3089,8 @@ msgstr "Треба изворна URL-адреса."
 msgid "Could not create application."
 msgstr "Не можеше да се создаде програмот."
 
-#, fuzzy
 msgid "Invalid image."
-msgstr "Погрешна големина."
+msgstr "Неважечка слика."
 
 #. TRANS: Title for form to create a group.
 msgid "New group"
@@ -3381,10 +3379,9 @@ msgstr ""
 "имате испратено."
 
 #. TRANS: Title for page where to change password.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Change password"
-msgstr "Промени ја лозинката"
+msgstr "Смени лозинка"
 
 #. TRANS: Instructions for page where to change password.
 msgid "Change your password."
@@ -3409,7 +3406,6 @@ msgid "6 or more characters."
 msgstr "6 или повеќе знаци."
 
 #. TRANS: Field label on page where to change password. In this field the new password should be typed a second time.
-#, fuzzy
 msgctxt "LABEL"
 msgid "Confirm"
 msgstr "Потврди"
@@ -3420,10 +3416,9 @@ msgid "Same as password above."
 msgstr "Исто како лозинката погоре."
 
 #. TRANS: Button text on page where to change password.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Change"
-msgstr "Промени"
+msgstr "Измени"
 
 #. TRANS: Form validation error on page where to change password.
 msgid "Password must be 6 or more characters."
@@ -3433,9 +3428,8 @@ msgid "Passwords don't match."
 msgstr "Лозинките не се совпаѓаат."
 
 #. TRANS: Form validation error on page where to change password.
-#, fuzzy
 msgid "Incorrect old password."
-msgstr "Неточна стара лозинка"
+msgstr "Погрешна стара лозинка."
 
 #. TRANS: Form validation error on page where to change password.
 msgid "Error saving user; invalid."
@@ -3522,12 +3516,10 @@ msgid "Fancy URLs"
 msgstr "Интересни URL-адреси"
 
 #. TRANS: Field title in Paths admin panel.
-#, fuzzy
 msgid "Use fancy URLs (more readable and memorable)?"
 msgstr "Да користам интересни (почитливи и повпечатливи) URL-адреси?"
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "Theme"
 msgstr "Изглед"
@@ -3641,7 +3633,6 @@ msgid "Directory where attachments are located."
 msgstr "Директориумот кадешто се сместени прилозите."
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "SSL"
 msgstr "SSL"
@@ -3726,7 +3717,6 @@ msgid "Enabled"
 msgstr "Овозможено"
 
 #. TRANS: Tab and title for plugins admin panel.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Plugins"
 msgstr "Приклучоци"
@@ -3757,7 +3747,7 @@ msgstr "Неважечка содржина на забелешката."
 
 #. TRANS: Exception thrown if a notice's license is not compatible with the StatusNet site license.
 #. TRANS: %1$s is the notice license, %2$s is the StatusNet site's license.
-#, fuzzy, php-format
+#, php-format
 msgid "Notice license \"%1$s\" is not compatible with site license \"%2$s\"."
 msgstr ""
 "Лиценцата на забелешката „%1$s“ не е соодветна на лиценцата на мрежното "
@@ -4624,18 +4614,6 @@ msgstr "Група %s"
 msgid "%1$s group, page %2$d"
 msgstr "Група %1$s, стр. %2$d"
 
-#. TRANS: Label for group description or group note (dt). Text hidden by default.
-msgid "Note"
-msgstr "Забелешка"
-
-#. TRANS: Label for group aliases (dt). Text hidden by default.
-msgid "Aliases"
-msgstr "Алијаси"
-
-#. TRANS: Group actions header (h2). Text hidden by default.
-msgid "Group actions"
-msgstr "Групни дејства"
-
 #. TRANS: Tooltip for feed link. %s is a group nickname.
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
@@ -4746,6 +4724,10 @@ msgstr "Порака од %1$s на %2$s"
 msgid "Notice deleted."
 msgstr "Избришана забелешка"
 
+#, fuzzy
+msgid "Notice"
+msgstr "Забелешки"
+
 #. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
 #, php-format
 msgid "%1$s tagged %2$s"
@@ -5282,7 +5264,6 @@ msgstr "Нема ID-аргумент."
 msgid "Tag %s"
 msgstr "Означи %s"
 
-#. TRANS: H2 for user profile information.
 msgid "User profile"
 msgstr "Кориснички профил"
 
@@ -5999,6 +5980,49 @@ msgstr "Не можам да најдам XRD за %s."
 msgid "No AtomPub API service for %s."
 msgstr "Нема служба за API на AtomPub за %s."
 
+#. TRANS: H2 for user actions in a profile.
+#. TRANS: H2 for entity actions in a profile.
+msgid "User actions"
+msgstr "Кориснички дејства"
+
+#. TRANS: Text shown in user profile of not yet compeltely deleted users.
+msgid "User deletion in progress..."
+msgstr "Бришењето на корисникот е во тек..."
+
+#. TRANS: Link title for link on user profile.
+msgid "Edit profile settings"
+msgstr "Уреди нагодувања на профилот"
+
+#. TRANS: Link text for link on user profile.
+msgid "Edit"
+msgstr "Уреди"
+
+#. TRANS: Link title for link on user profile.
+msgid "Send a direct message to this user"
+msgstr "Испрати му директна порака на корисников"
+
+#. TRANS: Link text for link on user profile.
+msgid "Message"
+msgstr "Порака"
+
+#. TRANS: Label text on user profile to select a user role.
+msgid "Moderate"
+msgstr "Модерирај"
+
+#. TRANS: Label text on user profile to select a user role.
+msgid "User role"
+msgstr "Корисничка улога"
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Administrator"
+msgstr "Администратор"
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Moderator"
+msgstr "Модератор"
+
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
 #, php-format
 msgid "%1$s - %2$s"
@@ -6718,84 +6742,172 @@ msgid_plural "You are a member of these groups:"
 msgstr[0] "Не ни го испративте тој профил."
 msgstr[1] "Не ни го испративте тој профил."
 
-#. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-msgid ""
-"Commands:\n"
-"on - turn on notifications\n"
-"off - turn off notifications\n"
-"help - show this help\n"
-"follow <nickname> - subscribe to user\n"
-"groups - lists the groups you have joined\n"
-"subscriptions - list the people you follow\n"
-"subscribers - list the people that follow you\n"
-"leave <nickname> - unsubscribe from user\n"
-"d <nickname> <text> - direct message to user\n"
-"get <nickname> - get last notice from user\n"
-"whois <nickname> - get profile info on user\n"
-"lose <nickname> - force user to stop following you\n"
-"fav <nickname> - add user's last notice as a 'fave'\n"
-"fav #<notice_id> - add notice with the given id as a 'fave'\n"
-"repeat #<notice_id> - repeat a notice with a given id\n"
-"repeat <nickname> - repeat the last notice from user\n"
-"reply #<notice_id> - reply to notice with a given id\n"
-"reply <nickname> - reply to the last notice from user\n"
-"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
-"drop <group> - leave group\n"
-"stats - get your stats\n"
-"stop - same as 'off'\n"
-"quit - same as 'off'\n"
-"sub <nickname> - same as 'follow'\n"
-"unsub <nickname> - same as 'leave'\n"
-"last <nickname> - same as 'get'\n"
-"on <nickname> - not yet implemented.\n"
-"off <nickname> - not yet implemented.\n"
-"nudge <nickname> - remind a user to update.\n"
-"invite <phone number> - not yet implemented.\n"
-"track <word> - not yet implemented.\n"
-"untrack <word> - not yet implemented.\n"
-"track off - not yet implemented.\n"
-"untrack all - not yet implemented.\n"
-"tracks - not yet implemented.\n"
-"tracking - not yet implemented.\n"
+#. TRANS: Header line of help text for commands.
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "Commands:"
+msgstr "Резултати од наредбата"
+
+#. TRANS: Help message for IM/SMS command "on"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "turn on notifications"
+msgstr "Не можам да вклучам известување."
+
+#. TRANS: Help message for IM/SMS command "off"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "turn off notifications"
+msgstr "Не можам да исклучам известување."
+
+#. TRANS: Help message for IM/SMS command "help"
+msgctxt "COMMANDHELP"
+msgid "show this help"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "follow <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "subscribe to user"
+msgstr "Претплати се на корисников"
+
+#. TRANS: Help message for IM/SMS command "groups"
+msgctxt "COMMANDHELP"
+msgid "lists the groups you have joined"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscriptions"
+msgctxt "COMMANDHELP"
+msgid "list the people you follow"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscribers"
+msgctxt "COMMANDHELP"
+msgid "list the people that follow you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "leave <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "unsubscribe from user"
+msgstr "Откажи претплата од овој корсиник"
+
+#. TRANS: Help message for IM/SMS command "d <nickname> <text>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "direct message to user"
+msgstr "Директни пораки до %s"
+
+#. TRANS: Help message for IM/SMS command "get <nickname>"
+msgctxt "COMMANDHELP"
+msgid "get last notice from user"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "whois <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "get profile info on user"
+msgstr "Далечинскиот профил не е група!"
+
+#. TRANS: Help message for IM/SMS command "lose <nickname>"
+msgctxt "COMMANDHELP"
+msgid "force user to stop following you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav <nickname>"
+msgctxt "COMMANDHELP"
+msgid "add user's last notice as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "add notice with the given id as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "repeat a notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "repeat the last notice from user"
+msgstr "Повтори ја забелешкава"
+
+#. TRANS: Help message for IM/SMS command "reply #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "reply to notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "reply <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "reply to the last notice from user"
+msgstr "Одговори на забелешкава"
+
+#. TRANS: Help message for IM/SMS command "join <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "join group"
+msgstr "Непозната група."
+
+#. TRANS: Help message for IM/SMS command "login"
+msgctxt "COMMANDHELP"
+msgid "Get a link to login to the web interface"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "drop <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "leave group"
+msgstr "Избриши група"
+
+#. TRANS: Help message for IM/SMS command "stats"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "get your stats"
+msgstr "Подновете си го статусот..."
+
+#. TRANS: Help message for IM/SMS command "stop"
+#. TRANS: Help message for IM/SMS command "quit"
+msgctxt "COMMANDHELP"
+msgid "same as 'off'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "sub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'follow'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "unsub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'leave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "last <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'get'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "on <nickname>"
+#. TRANS: Help message for IM/SMS command "off <nickname>"
+#. TRANS: Help message for IM/SMS command "invite <phone number>"
+#. TRANS: Help message for IM/SMS command "track <word>"
+#. TRANS: Help message for IM/SMS command "untrack <word>"
+#. TRANS: Help message for IM/SMS command "track off"
+#. TRANS: Help message for IM/SMS command "untrack all"
+#. TRANS: Help message for IM/SMS command "tracks"
+#. TRANS: Help message for IM/SMS command "tracking"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "not yet implemented."
+msgstr "Наредбата сè уште не е имплементирана."
+
+#. TRANS: Help message for IM/SMS command "nudge <nickname>"
+msgctxt "COMMANDHELP"
+msgid "remind a user to update."
 msgstr ""
-"Наредби:\n"
-"on - вклучи известувања\n"
-"off - исклучи известувања\n"
-"help - прикажи ја оваа помош\n"
-"follow <nickname> - претплати се на корисник\n"
-"groups - список на групи кадешто членувате\n"
-"subscriptions - список на луѓе кои ги следите\n"
-"subscribers - список на луѓе кои Ве следат\n"
-"leave <nickname> - откажи претплата на корисник\n"
-"d <nickname> <text> - директна порака за корисник\n"
-"get <nickname> - прикажи последна забелешка на корисник\n"
-"whois <nickname> - прикажи профилни информации за корисник\n"
-"fav <nickname> - додај ја последната забелешка на корисникот во бендисани\n"
-"fav #<notice_id> - додај забелешка со даден id како бендисана\n"
-"repeat #<notice_id> - повтори забелешка со даден id\n"
-"repeat <nickname> - повтори последна забелешка на корисник\n"
-"reply #<notice_id> - одговори на забелешка со даден id\n"
-"reply <nickname> - одговори на последна забелешка на корисник\n"
-"join <group> - зачлени се во група\n"
-"login - Дај врска за најавување на посредникот\n"
-"drop <group> - напушти група\n"
-"stats - прикажи мои статистики\n"
-"stop - исто што и 'off'\n"
-"quit - исто што и 'off'\n"
-"sub <nickname> - исто што и 'follow'\n"
-"unsub <nickname> - исто што и 'leave'\n"
-"last <nickname> - исто што и 'get'\n"
-"on <nickname> - сè уште не е имплементирано.\n"
-"off <nickname> - сè уште не е имплементирано.\n"
-"nudge <nickname> - потсети корисник да поднови.\n"
-"invite <phone number> - сè уште не е имплементирано.\n"
-"track <word> - сè уште не е имплементирано.\n"
-"untrack <word> - сè уште не е имплементирано.\n"
-"track off - сè уште не е имплементирано.\n"
-"untrack all - сè уште не е имплементирано.\n"
-"tracks - сè уште не е имплементирано.\n"
-"tracking - сè уште не е имплементирано.\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 msgid "No configuration file found."
@@ -6968,6 +7080,9 @@ msgid ""
 msgstr ""
 "Местоположба на групата (ако има). На пр. „Град, Сој. држава/област, Земја“"
 
+msgid "Aliases"
+msgstr "Алијаси"
+
 #, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -7049,6 +7164,10 @@ msgctxt "TOOLTIP"
 msgid "Add or edit %s design"
 msgstr "Додавање или уредување на изгледот на групата „%s“"
 
+#. TRANS: Group actions header (h2). Text hidden by default.
+msgid "Group actions"
+msgstr "Групни дејства"
+
 #. TRANS: Title for groups with the most members section.
 msgid "Groups with most members"
 msgstr "Групи со највеќе членови"
@@ -7621,6 +7740,7 @@ msgstr "Испрати забелешка"
 msgid "What's up, %s?"
 msgstr "Што има ново, %s?"
 
+#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr "Приложи"
 
@@ -7689,7 +7809,7 @@ msgid "Notice repeated"
 msgstr "Забелешката е повторена"
 
 msgid "Update your status..."
-msgstr ""
+msgstr "Подновете си го статусот..."
 
 msgid "Nudge this user"
 msgstr "Подбуцни го корисников"
@@ -8073,52 +8193,6 @@ msgstr "Откажи ја претплатата"
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "Корисникот %1$s (%2$d) нема профилен запис."
 
-msgid "Edit Avatar"
-msgstr "Уреди аватар"
-
-#. TRANS: H2 for user actions in a profile.
-#. TRANS: H2 for entity actions in a profile.
-msgid "User actions"
-msgstr "Кориснички дејства"
-
-#. TRANS: Text shown in user profile of not yet compeltely deleted users.
-msgid "User deletion in progress..."
-msgstr "Бришењето на корисникот е во тек..."
-
-#. TRANS: Link title for link on user profile.
-msgid "Edit profile settings"
-msgstr "Уреди нагодувања на профилот"
-
-#. TRANS: Link text for link on user profile.
-msgid "Edit"
-msgstr "Уреди"
-
-#. TRANS: Link title for link on user profile.
-msgid "Send a direct message to this user"
-msgstr "Испрати му директна порака на корисников"
-
-#. TRANS: Link text for link on user profile.
-msgid "Message"
-msgstr "Порака"
-
-#. TRANS: Label text on user profile to select a user role.
-msgid "Moderate"
-msgstr "Модерирај"
-
-#. TRANS: Label text on user profile to select a user role.
-msgid "User role"
-msgstr "Корисничка улога"
-
-#. TRANS: Role that can be set for a user profile.
-msgctxt "role"
-msgid "Administrator"
-msgstr "Администратор"
-
-#. TRANS: Role that can be set for a user profile.
-msgctxt "role"
-msgid "Moderator"
-msgstr "Модератор"
-
 msgid "Not allowed to log in."
 msgstr "Не Ви е дозволено да се најавите."
 
@@ -8193,3 +8267,88 @@ msgstr "Неважечки XML. Нема XRD-корен."
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr "Земам резерва на податотеката „%s“."
+
+#~ msgid "Note"
+#~ msgstr "Забелешка"
+
+#~ msgid ""
+#~ "Commands:\n"
+#~ "on - turn on notifications\n"
+#~ "off - turn off notifications\n"
+#~ "help - show this help\n"
+#~ "follow <nickname> - subscribe to user\n"
+#~ "groups - lists the groups you have joined\n"
+#~ "subscriptions - list the people you follow\n"
+#~ "subscribers - list the people that follow you\n"
+#~ "leave <nickname> - unsubscribe from user\n"
+#~ "d <nickname> <text> - direct message to user\n"
+#~ "get <nickname> - get last notice from user\n"
+#~ "whois <nickname> - get profile info on user\n"
+#~ "lose <nickname> - force user to stop following you\n"
+#~ "fav <nickname> - add user's last notice as a 'fave'\n"
+#~ "fav #<notice_id> - add notice with the given id as a 'fave'\n"
+#~ "repeat #<notice_id> - repeat a notice with a given id\n"
+#~ "repeat <nickname> - repeat the last notice from user\n"
+#~ "reply #<notice_id> - reply to notice with a given id\n"
+#~ "reply <nickname> - reply to the last notice from user\n"
+#~ "join <group> - join group\n"
+#~ "login - Get a link to login to the web interface\n"
+#~ "drop <group> - leave group\n"
+#~ "stats - get your stats\n"
+#~ "stop - same as 'off'\n"
+#~ "quit - same as 'off'\n"
+#~ "sub <nickname> - same as 'follow'\n"
+#~ "unsub <nickname> - same as 'leave'\n"
+#~ "last <nickname> - same as 'get'\n"
+#~ "on <nickname> - not yet implemented.\n"
+#~ "off <nickname> - not yet implemented.\n"
+#~ "nudge <nickname> - remind a user to update.\n"
+#~ "invite <phone number> - not yet implemented.\n"
+#~ "track <word> - not yet implemented.\n"
+#~ "untrack <word> - not yet implemented.\n"
+#~ "track off - not yet implemented.\n"
+#~ "untrack all - not yet implemented.\n"
+#~ "tracks - not yet implemented.\n"
+#~ "tracking - not yet implemented.\n"
+#~ msgstr ""
+#~ "Наредби:\n"
+#~ "on - вклучи известувања\n"
+#~ "off - исклучи известувања\n"
+#~ "help - прикажи ја оваа помош\n"
+#~ "follow <nickname> - претплати се на корисник\n"
+#~ "groups - список на групи кадешто членувате\n"
+#~ "subscriptions - список на луѓе кои ги следите\n"
+#~ "subscribers - список на луѓе кои Ве следат\n"
+#~ "leave <nickname> - откажи претплата на корисник\n"
+#~ "d <nickname> <text> - директна порака за корисник\n"
+#~ "get <nickname> - прикажи последна забелешка на корисник\n"
+#~ "whois <nickname> - прикажи профилни информации за корисник\n"
+#~ "fav <nickname> - додај ја последната забелешка на корисникот во "
+#~ "бендисани\n"
+#~ "fav #<notice_id> - додај забелешка со даден id како бендисана\n"
+#~ "repeat #<notice_id> - повтори забелешка со даден id\n"
+#~ "repeat <nickname> - повтори последна забелешка на корисник\n"
+#~ "reply #<notice_id> - одговори на забелешка со даден id\n"
+#~ "reply <nickname> - одговори на последна забелешка на корисник\n"
+#~ "join <group> - зачлени се во група\n"
+#~ "login - Дај врска за најавување на посредникот\n"
+#~ "drop <group> - напушти група\n"
+#~ "stats - прикажи мои статистики\n"
+#~ "stop - исто што и 'off'\n"
+#~ "quit - исто што и 'off'\n"
+#~ "sub <nickname> - исто што и 'follow'\n"
+#~ "unsub <nickname> - исто што и 'leave'\n"
+#~ "last <nickname> - исто што и 'get'\n"
+#~ "on <nickname> - сè уште не е имплементирано.\n"
+#~ "off <nickname> - сè уште не е имплементирано.\n"
+#~ "nudge <nickname> - потсети корисник да поднови.\n"
+#~ "invite <phone number> - сè уште не е имплементирано.\n"
+#~ "track <word> - сè уште не е имплементирано.\n"
+#~ "untrack <word> - сè уште не е имплементирано.\n"
+#~ "track off - сè уште не е имплементирано.\n"
+#~ "untrack all - сè уште не е имплементирано.\n"
+#~ "tracks - сè уште не е имплементирано.\n"
+#~ "tracking - сè уште не е имплементирано.\n"
+
+#~ msgid "Edit Avatar"
+#~ msgstr "Уреди аватар"
diff --git a/locale/ml/LC_MESSAGES/statusnet.po b/locale/ml/LC_MESSAGES/statusnet.po
index 11c70d96e5..a3e79892f0 100644
--- a/locale/ml/LC_MESSAGES/statusnet.po
+++ b/locale/ml/LC_MESSAGES/statusnet.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-11 18:15+0000\n"
-"PO-Revision-Date: 2011-03-11 18:17:19+0000\n"
+"POT-Creation-Date: 2011-03-17 09:47+0000\n"
+"PO-Revision-Date: 2011-03-17 09:49:48+0000\n"
 "Language-Team: Malayalam <http://translatewiki.net/wiki/Portal:ml>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-08 01:25:01+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83703); Translate extension (2011-03-11)\n"
+"X-POT-Import-Date: 2011-03-11 18:52:41+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ml\n"
 "X-Message-Group: #out-statusnet-core\n"
@@ -573,7 +573,7 @@ msgstr "%2$s എന്ന സംഘത്തിൽ നിന്നും %1$s  
 msgid "%s's groups"
 msgstr "%s എന്ന ഉപയോക്താവിന്റെ സംഘങ്ങൾ"
 
-#. TRANS: Used as subtitle in check for group membership. %1$s is a user name, %2$s is the site name.
+#. TRANS: Used as subtitle in check for group membership. %1$s is the site name, %2$s is a user name.
 #, php-format
 msgid "%1$s groups %2$s is a member of."
 msgstr "%2$s അംഗമായ %1$s സംഘങ്ങൾ."
@@ -4482,18 +4482,6 @@ msgstr "%s സംഘം"
 msgid "%1$s group, page %2$d"
 msgstr "%1$s സംഘം, താൾ %2$d"
 
-#. TRANS: Label for group description or group note (dt). Text hidden by default.
-msgid "Note"
-msgstr "കുറിപ്പ്"
-
-#. TRANS: Label for group aliases (dt). Text hidden by default.
-msgid "Aliases"
-msgstr ""
-
-#. TRANS: Group actions header (h2). Text hidden by default.
-msgid "Group actions"
-msgstr "സംഘത്തിന്റെ പ്രവൃത്തികൾ"
-
 #. TRANS: Tooltip for feed link. %s is a group nickname.
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
@@ -4594,6 +4582,10 @@ msgstr "%2$s സംരംഭത്തിൽ %1$s അയച്ച സന്ദേ
 msgid "Notice deleted."
 msgstr "അറിയിപ്പ് മായ്ച്ചിരിക്കുന്നു."
 
+#, fuzzy
+msgid "Notice"
+msgstr "അറിയിപ്പുകൾ"
+
 #. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
 #, php-format
 msgid "%1$s tagged %2$s"
@@ -5111,7 +5103,6 @@ msgstr ""
 msgid "Tag %s"
 msgstr "റ്റാഗ് %s"
 
-#. TRANS: H2 for user profile information.
 msgid "User profile"
 msgstr ""
 
@@ -5784,6 +5775,49 @@ msgstr ""
 msgid "No AtomPub API service for %s."
 msgstr ""
 
+#. TRANS: H2 for user actions in a profile.
+#. TRANS: H2 for entity actions in a profile.
+msgid "User actions"
+msgstr "ഉപയോക്തൃ പ്രവൃത്തികൾ"
+
+#. TRANS: Text shown in user profile of not yet compeltely deleted users.
+msgid "User deletion in progress..."
+msgstr "ഉപയോക്താവിനെ നീക്കം ചെയ്യൽ പുരോഗമിക്കുന്നു..."
+
+#. TRANS: Link title for link on user profile.
+msgid "Edit profile settings"
+msgstr "ക്രമീകരണങ്ങളുടെ സജ്ജീകരണം മാറ്റുക"
+
+#. TRANS: Link text for link on user profile.
+msgid "Edit"
+msgstr "തിരുത്തുക"
+
+#. TRANS: Link title for link on user profile.
+msgid "Send a direct message to this user"
+msgstr "ഈ ഉപയോക്താവിന് നേരിട്ട് സന്ദേശമയയ്ക്കുക"
+
+#. TRANS: Link text for link on user profile.
+msgid "Message"
+msgstr "സന്ദേശം"
+
+#. TRANS: Label text on user profile to select a user role.
+msgid "Moderate"
+msgstr "മാദ്ധ്യസ്ഥം വഹിക്കുക"
+
+#. TRANS: Label text on user profile to select a user role.
+msgid "User role"
+msgstr ""
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Administrator"
+msgstr "കാര്യനിർവ്വാഹക(ൻ)"
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Moderator"
+msgstr "മദ്ധ്യസ്ഥ(ൻ)"
+
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
 #, php-format
 msgid "%1$s - %2$s"
@@ -6488,46 +6522,166 @@ msgid_plural "You are a member of these groups:"
 msgstr[0] "താങ്കൾ ഈ സംഘത്തിലെ അംഗമാണ്:"
 msgstr[1] "താങ്കൾ ഈ സംഘങ്ങളിലെ അംഗമാണ്:"
 
-#. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-msgid ""
-"Commands:\n"
-"on - turn on notifications\n"
-"off - turn off notifications\n"
-"help - show this help\n"
-"follow <nickname> - subscribe to user\n"
-"groups - lists the groups you have joined\n"
-"subscriptions - list the people you follow\n"
-"subscribers - list the people that follow you\n"
-"leave <nickname> - unsubscribe from user\n"
-"d <nickname> <text> - direct message to user\n"
-"get <nickname> - get last notice from user\n"
-"whois <nickname> - get profile info on user\n"
-"lose <nickname> - force user to stop following you\n"
-"fav <nickname> - add user's last notice as a 'fave'\n"
-"fav #<notice_id> - add notice with the given id as a 'fave'\n"
-"repeat #<notice_id> - repeat a notice with a given id\n"
-"repeat <nickname> - repeat the last notice from user\n"
-"reply #<notice_id> - reply to notice with a given id\n"
-"reply <nickname> - reply to the last notice from user\n"
-"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
-"drop <group> - leave group\n"
-"stats - get your stats\n"
-"stop - same as 'off'\n"
-"quit - same as 'off'\n"
-"sub <nickname> - same as 'follow'\n"
-"unsub <nickname> - same as 'leave'\n"
-"last <nickname> - same as 'get'\n"
-"on <nickname> - not yet implemented.\n"
-"off <nickname> - not yet implemented.\n"
-"nudge <nickname> - remind a user to update.\n"
-"invite <phone number> - not yet implemented.\n"
-"track <word> - not yet implemented.\n"
-"untrack <word> - not yet implemented.\n"
-"track off - not yet implemented.\n"
-"untrack all - not yet implemented.\n"
-"tracks - not yet implemented.\n"
-"tracking - not yet implemented.\n"
+#. TRANS: Header line of help text for commands.
+msgctxt "COMMANDHELP"
+msgid "Commands:"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "on"
+msgctxt "COMMANDHELP"
+msgid "turn on notifications"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "off"
+msgctxt "COMMANDHELP"
+msgid "turn off notifications"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "help"
+msgctxt "COMMANDHELP"
+msgid "show this help"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "follow <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "subscribe to user"
+msgstr "ഈ ഉപയോക്താവിന്റെ വരിക്കാരൻ/വരിക്കാരി ആകുക"
+
+#. TRANS: Help message for IM/SMS command "groups"
+msgctxt "COMMANDHELP"
+msgid "lists the groups you have joined"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscriptions"
+msgctxt "COMMANDHELP"
+msgid "list the people you follow"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscribers"
+msgctxt "COMMANDHELP"
+msgid "list the people that follow you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "leave <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "unsubscribe from user"
+msgstr "ഈ ഉപയോക്താവിന്റെ വരിക്കാരൻ/വരിക്കാരി ആകുക"
+
+#. TRANS: Help message for IM/SMS command "d <nickname> <text>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "direct message to user"
+msgstr "%s എന്ന ഉപയോക്താവിന് നേരിട്ടുള്ള സന്ദേശങ്ങൾ"
+
+#. TRANS: Help message for IM/SMS command "get <nickname>"
+msgctxt "COMMANDHELP"
+msgid "get last notice from user"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "whois <nickname>"
+msgctxt "COMMANDHELP"
+msgid "get profile info on user"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "lose <nickname>"
+msgctxt "COMMANDHELP"
+msgid "force user to stop following you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav <nickname>"
+msgctxt "COMMANDHELP"
+msgid "add user's last notice as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "add notice with the given id as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "repeat a notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "repeat the last notice from user"
+msgstr "ഈ അറിയിപ്പ് ആവർത്തിക്കുക"
+
+#. TRANS: Help message for IM/SMS command "reply #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "reply to notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "reply <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "reply to the last notice from user"
+msgstr "ഈ അറിയിപ്പിന് മറുപടിയിടുക"
+
+#. TRANS: Help message for IM/SMS command "join <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "join group"
+msgstr "അജ്ഞാത സംഘം."
+
+#. TRANS: Help message for IM/SMS command "login"
+msgctxt "COMMANDHELP"
+msgid "Get a link to login to the web interface"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "drop <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "leave group"
+msgstr "സംഘം മായ്ക്കുക"
+
+#. TRANS: Help message for IM/SMS command "stats"
+msgctxt "COMMANDHELP"
+msgid "get your stats"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "stop"
+#. TRANS: Help message for IM/SMS command "quit"
+msgctxt "COMMANDHELP"
+msgid "same as 'off'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "sub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'follow'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "unsub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'leave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "last <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'get'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "on <nickname>"
+#. TRANS: Help message for IM/SMS command "off <nickname>"
+#. TRANS: Help message for IM/SMS command "invite <phone number>"
+#. TRANS: Help message for IM/SMS command "track <word>"
+#. TRANS: Help message for IM/SMS command "untrack <word>"
+#. TRANS: Help message for IM/SMS command "track off"
+#. TRANS: Help message for IM/SMS command "untrack all"
+#. TRANS: Help message for IM/SMS command "tracks"
+#. TRANS: Help message for IM/SMS command "tracking"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "not yet implemented."
+msgstr "പ്രാവർത്തികമാക്കിയിട്ടില്ല."
+
+#. TRANS: Help message for IM/SMS command "nudge <nickname>"
+msgctxt "COMMANDHELP"
+msgid "remind a user to update."
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
@@ -6704,6 +6858,9 @@ msgstr ""
 "സംഘത്തിന്റെ പ്രദേശം, അങ്ങനെയൊന്നുണ്ടെങ്കിൽ - ഉദാ: \"പട്ടണം, സംസ്ഥാനം (അഥവാ പ്രദേശം), "
 "രാജ്യം\"."
 
+msgid "Aliases"
+msgstr ""
+
 #, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -6781,6 +6938,10 @@ msgctxt "TOOLTIP"
 msgid "Add or edit %s design"
 msgstr "%s എന്ന സംഘത്തിനു രൂപകല്പന കൂട്ടിച്ചേർക്കുക അല്ലെങ്കിൽ മാറ്റം വരുത്തുക"
 
+#. TRANS: Group actions header (h2). Text hidden by default.
+msgid "Group actions"
+msgstr "സംഘത്തിന്റെ പ്രവൃത്തികൾ"
+
 #. TRANS: Title for groups with the most members section.
 msgid "Groups with most members"
 msgstr ""
@@ -7248,6 +7409,7 @@ msgstr "അറിയിപ്പ് അയയ്ക്കുക"
 msgid "What's up, %s?"
 msgstr "എന്തൊക്കെയുണ്ട്, %s?"
 
+#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr "ചേർത്തുവെയ്ക്കുക"
 
@@ -7707,52 +7869,6 @@ msgstr ""
 msgid "User %1$s (%2$d) has no profile record."
 msgstr ""
 
-msgid "Edit Avatar"
-msgstr ""
-
-#. TRANS: H2 for user actions in a profile.
-#. TRANS: H2 for entity actions in a profile.
-msgid "User actions"
-msgstr "ഉപയോക്തൃ പ്രവൃത്തികൾ"
-
-#. TRANS: Text shown in user profile of not yet compeltely deleted users.
-msgid "User deletion in progress..."
-msgstr "ഉപയോക്താവിനെ നീക്കം ചെയ്യൽ പുരോഗമിക്കുന്നു..."
-
-#. TRANS: Link title for link on user profile.
-msgid "Edit profile settings"
-msgstr "ക്രമീകരണങ്ങളുടെ സജ്ജീകരണം മാറ്റുക"
-
-#. TRANS: Link text for link on user profile.
-msgid "Edit"
-msgstr "തിരുത്തുക"
-
-#. TRANS: Link title for link on user profile.
-msgid "Send a direct message to this user"
-msgstr "ഈ ഉപയോക്താവിന് നേരിട്ട് സന്ദേശമയയ്ക്കുക"
-
-#. TRANS: Link text for link on user profile.
-msgid "Message"
-msgstr "സന്ദേശം"
-
-#. TRANS: Label text on user profile to select a user role.
-msgid "Moderate"
-msgstr "മാദ്ധ്യസ്ഥം വഹിക്കുക"
-
-#. TRANS: Label text on user profile to select a user role.
-msgid "User role"
-msgstr ""
-
-#. TRANS: Role that can be set for a user profile.
-msgctxt "role"
-msgid "Administrator"
-msgstr "കാര്യനിർവ്വാഹക(ൻ)"
-
-#. TRANS: Role that can be set for a user profile.
-msgctxt "role"
-msgid "Moderator"
-msgstr "മദ്ധ്യസ്ഥ(ൻ)"
-
 #, fuzzy
 msgid "Not allowed to log in."
 msgstr "ലോഗിൻ ചെയ്തിട്ടില്ല"
@@ -7827,3 +7943,6 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#~ msgid "Note"
+#~ msgstr "കുറിപ്പ്"
diff --git a/locale/nb/LC_MESSAGES/statusnet.po b/locale/nb/LC_MESSAGES/statusnet.po
index 9898feb7be..55d575a366 100644
--- a/locale/nb/LC_MESSAGES/statusnet.po
+++ b/locale/nb/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-03-11 18:15+0000\n"
-"PO-Revision-Date: 2011-03-11 18:17:21+0000\n"
+"POT-Creation-Date: 2011-03-17 09:47+0000\n"
+"PO-Revision-Date: 2011-03-17 09:49:51+0000\n"
 "Language-Team: Norwegian (bokmål)‬ <http://translatewiki.net/wiki/Portal:no>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83703); Translate extension (2011-03-11)\n"
+"X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-03-08 01:25:01+0000\n"
+"X-POT-Import-Date: 2011-03-11 18:52:41+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -589,7 +589,7 @@ msgstr "Kunne ikke fjerne bruker %1$s fra gruppe %2$s."
 msgid "%s's groups"
 msgstr "%s sine grupper"
 
-#. TRANS: Used as subtitle in check for group membership. %1$s is a user name, %2$s is the site name.
+#. TRANS: Used as subtitle in check for group membership. %1$s is the site name, %2$s is a user name.
 #, php-format
 msgid "%1$s groups %2$s is a member of."
 msgstr "%1$s grupper %2$s er et medlem av."
@@ -4662,18 +4662,6 @@ msgstr "%s gruppe"
 msgid "%1$s group, page %2$d"
 msgstr "%1$s gruppe, side %2$d"
 
-#. TRANS: Label for group description or group note (dt). Text hidden by default.
-msgid "Note"
-msgstr "Merk"
-
-#. TRANS: Label for group aliases (dt). Text hidden by default.
-msgid "Aliases"
-msgstr "Alias"
-
-#. TRANS: Group actions header (h2). Text hidden by default.
-msgid "Group actions"
-msgstr "Gruppehandlinger"
-
 #. TRANS: Tooltip for feed link. %s is a group nickname.
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
@@ -4784,6 +4772,10 @@ msgstr "Melding fra %1$s på %2$s"
 msgid "Notice deleted."
 msgstr "Notis slettet."
 
+#, fuzzy
+msgid "Notice"
+msgstr "Notiser"
+
 #. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
 #, fuzzy, php-format
 msgid "%1$s tagged %2$s"
@@ -5314,7 +5306,6 @@ msgstr "Ingen vedlegg."
 msgid "Tag %s"
 msgstr "Merk %s"
 
-#. TRANS: H2 for user profile information.
 msgid "User profile"
 msgstr "Brukerprofil"
 
@@ -6011,6 +6002,50 @@ msgstr ""
 msgid "No AtomPub API service for %s."
 msgstr ""
 
+#. TRANS: H2 for user actions in a profile.
+#. TRANS: H2 for entity actions in a profile.
+#, fuzzy
+msgid "User actions"
+msgstr "Gruppehandlinger"
+
+#. TRANS: Text shown in user profile of not yet compeltely deleted users.
+msgid "User deletion in progress..."
+msgstr ""
+
+#. TRANS: Link title for link on user profile.
+msgid "Edit profile settings"
+msgstr "Endre profilinnstillinger"
+
+#. TRANS: Link text for link on user profile.
+msgid "Edit"
+msgstr "Rediger"
+
+#. TRANS: Link title for link on user profile.
+msgid "Send a direct message to this user"
+msgstr "Send en direktemelding til denne brukeren"
+
+#. TRANS: Link text for link on user profile.
+msgid "Message"
+msgstr "Melding"
+
+#. TRANS: Label text on user profile to select a user role.
+msgid "Moderate"
+msgstr "Moderer"
+
+#. TRANS: Label text on user profile to select a user role.
+msgid "User role"
+msgstr "Brukerrolle"
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Administrator"
+msgstr "Administrator"
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Moderator"
+msgstr "Moderator"
+
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
 #, php-format
 msgid "%1$s - %2$s"
@@ -6741,46 +6776,170 @@ msgid_plural "You are a member of these groups:"
 msgstr[0] "Du er allerede logget inn!"
 msgstr[1] "Du er allerede logget inn!"
 
-#. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-msgid ""
-"Commands:\n"
-"on - turn on notifications\n"
-"off - turn off notifications\n"
-"help - show this help\n"
-"follow <nickname> - subscribe to user\n"
-"groups - lists the groups you have joined\n"
-"subscriptions - list the people you follow\n"
-"subscribers - list the people that follow you\n"
-"leave <nickname> - unsubscribe from user\n"
-"d <nickname> <text> - direct message to user\n"
-"get <nickname> - get last notice from user\n"
-"whois <nickname> - get profile info on user\n"
-"lose <nickname> - force user to stop following you\n"
-"fav <nickname> - add user's last notice as a 'fave'\n"
-"fav #<notice_id> - add notice with the given id as a 'fave'\n"
-"repeat #<notice_id> - repeat a notice with a given id\n"
-"repeat <nickname> - repeat the last notice from user\n"
-"reply #<notice_id> - reply to notice with a given id\n"
-"reply <nickname> - reply to the last notice from user\n"
-"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
-"drop <group> - leave group\n"
-"stats - get your stats\n"
-"stop - same as 'off'\n"
-"quit - same as 'off'\n"
-"sub <nickname> - same as 'follow'\n"
-"unsub <nickname> - same as 'leave'\n"
-"last <nickname> - same as 'get'\n"
-"on <nickname> - not yet implemented.\n"
-"off <nickname> - not yet implemented.\n"
-"nudge <nickname> - remind a user to update.\n"
-"invite <phone number> - not yet implemented.\n"
-"track <word> - not yet implemented.\n"
-"untrack <word> - not yet implemented.\n"
-"track off - not yet implemented.\n"
-"untrack all - not yet implemented.\n"
-"tracks - not yet implemented.\n"
-"tracking - not yet implemented.\n"
+#. TRANS: Header line of help text for commands.
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "Commands:"
+msgstr "Kommandoresultat"
+
+#. TRANS: Help message for IM/SMS command "on"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "turn on notifications"
+msgstr "Kan ikke gjenta din egen notis."
+
+#. TRANS: Help message for IM/SMS command "off"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "turn off notifications"
+msgstr "Kan ikke gjenta din egen notis."
+
+#. TRANS: Help message for IM/SMS command "help"
+msgctxt "COMMANDHELP"
+msgid "show this help"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "follow <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "subscribe to user"
+msgstr "Abonner på denne brukeren"
+
+#. TRANS: Help message for IM/SMS command "groups"
+msgctxt "COMMANDHELP"
+msgid "lists the groups you have joined"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscriptions"
+msgctxt "COMMANDHELP"
+msgid "list the people you follow"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscribers"
+msgctxt "COMMANDHELP"
+msgid "list the people that follow you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "leave <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "unsubscribe from user"
+msgstr "Abonner på denne brukeren"
+
+#. TRANS: Help message for IM/SMS command "d <nickname> <text>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "direct message to user"
+msgstr "Direktemeldinger til %s"
+
+#. TRANS: Help message for IM/SMS command "get <nickname>"
+msgctxt "COMMANDHELP"
+msgid "get last notice from user"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "whois <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "get profile info on user"
+msgstr "Profilinformasjon"
+
+#. TRANS: Help message for IM/SMS command "lose <nickname>"
+msgctxt "COMMANDHELP"
+msgid "force user to stop following you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav <nickname>"
+msgctxt "COMMANDHELP"
+msgid "add user's last notice as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "add notice with the given id as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "repeat a notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "repeat the last notice from user"
+msgstr "Repeter denne notisen"
+
+#. TRANS: Help message for IM/SMS command "reply #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "reply to notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "reply <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "reply to the last notice from user"
+msgstr "Svar på denne notisen"
+
+#. TRANS: Help message for IM/SMS command "join <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "join group"
+msgstr "Ukjent"
+
+#. TRANS: Help message for IM/SMS command "login"
+msgctxt "COMMANDHELP"
+msgid "Get a link to login to the web interface"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "drop <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "leave group"
+msgstr "Slett gruppe"
+
+#. TRANS: Help message for IM/SMS command "stats"
+msgctxt "COMMANDHELP"
+msgid "get your stats"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "stop"
+#. TRANS: Help message for IM/SMS command "quit"
+msgctxt "COMMANDHELP"
+msgid "same as 'off'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "sub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'follow'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "unsub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'leave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "last <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'get'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "on <nickname>"
+#. TRANS: Help message for IM/SMS command "off <nickname>"
+#. TRANS: Help message for IM/SMS command "invite <phone number>"
+#. TRANS: Help message for IM/SMS command "track <word>"
+#. TRANS: Help message for IM/SMS command "untrack <word>"
+#. TRANS: Help message for IM/SMS command "track off"
+#. TRANS: Help message for IM/SMS command "untrack all"
+#. TRANS: Help message for IM/SMS command "tracks"
+#. TRANS: Help message for IM/SMS command "tracking"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "not yet implemented."
+msgstr "Beklager, denne kommandoen er ikke implementert ennå."
+
+#. TRANS: Help message for IM/SMS command "nudge <nickname>"
+msgctxt "COMMANDHELP"
+msgid "remind a user to update."
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
@@ -6968,6 +7127,9 @@ msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\"."
 msgstr "Hvor du er, for eksempel «By, fylke (eller region), land»"
 
+msgid "Aliases"
+msgstr "Alias"
+
 #, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -7045,6 +7207,10 @@ msgctxt "TOOLTIP"
 msgid "Add or edit %s design"
 msgstr ""
 
+#. TRANS: Group actions header (h2). Text hidden by default.
+msgid "Group actions"
+msgstr "Gruppehandlinger"
+
 #. TRANS: Title for groups with the most members section.
 msgid "Groups with most members"
 msgstr "Grupper med flest medlemmer"
@@ -7609,6 +7775,7 @@ msgstr "Send en notis"
 msgid "What's up, %s?"
 msgstr "Hva skjer %s?"
 
+#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr "Legg ved"
 
@@ -8082,54 +8249,6 @@ msgstr "Abonner"
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "Brukeren har ingen profil."
 
-#, fuzzy
-msgid "Edit Avatar"
-msgstr "Brukerbilde"
-
-#. TRANS: H2 for user actions in a profile.
-#. TRANS: H2 for entity actions in a profile.
-#, fuzzy
-msgid "User actions"
-msgstr "Gruppehandlinger"
-
-#. TRANS: Text shown in user profile of not yet compeltely deleted users.
-msgid "User deletion in progress..."
-msgstr ""
-
-#. TRANS: Link title for link on user profile.
-msgid "Edit profile settings"
-msgstr "Endre profilinnstillinger"
-
-#. TRANS: Link text for link on user profile.
-msgid "Edit"
-msgstr "Rediger"
-
-#. TRANS: Link title for link on user profile.
-msgid "Send a direct message to this user"
-msgstr "Send en direktemelding til denne brukeren"
-
-#. TRANS: Link text for link on user profile.
-msgid "Message"
-msgstr "Melding"
-
-#. TRANS: Label text on user profile to select a user role.
-msgid "Moderate"
-msgstr "Moderer"
-
-#. TRANS: Label text on user profile to select a user role.
-msgid "User role"
-msgstr "Brukerrolle"
-
-#. TRANS: Role that can be set for a user profile.
-msgctxt "role"
-msgid "Administrator"
-msgstr "Administrator"
-
-#. TRANS: Role that can be set for a user profile.
-msgctxt "role"
-msgid "Moderator"
-msgstr "Moderator"
-
 #, fuzzy
 msgid "Not allowed to log in."
 msgstr "Ikke logget inn."
@@ -8205,3 +8324,10 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#~ msgid "Note"
+#~ msgstr "Merk"
+
+#, fuzzy
+#~ msgid "Edit Avatar"
+#~ msgstr "Brukerbilde"
diff --git a/locale/nl/LC_MESSAGES/statusnet.po b/locale/nl/LC_MESSAGES/statusnet.po
index e8907c1baf..c427d1e703 100644
--- a/locale/nl/LC_MESSAGES/statusnet.po
+++ b/locale/nl/LC_MESSAGES/statusnet.po
@@ -12,17 +12,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-11 18:15+0000\n"
-"PO-Revision-Date: 2011-03-11 18:17:20+0000\n"
+"POT-Creation-Date: 2011-03-17 09:47+0000\n"
+"PO-Revision-Date: 2011-03-17 09:49:49+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83703); Translate extension (2011-03-11)\n"
+"X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-03-08 01:25:01+0000\n"
+"X-POT-Import-Date: 2011-03-11 18:52:41+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -597,7 +597,7 @@ msgstr "Het was niet mogelijk gebruiker %1$s uit de groep %2$s te verwijderen."
 msgid "%s's groups"
 msgstr "Groepen van %s"
 
-#. TRANS: Used as subtitle in check for group membership. %1$s is a user name, %2$s is the site name.
+#. TRANS: Used as subtitle in check for group membership. %1$s is the site name, %2$s is a user name.
 #, php-format
 msgid "%1$s groups %2$s is a member of."
 msgstr "Groepen op de site %1$s waar %2$s lid van is."
@@ -1054,9 +1054,8 @@ msgid "Can only fave notices."
 msgstr "Het is alleen mogelijk om mededelingen als favoriet aan te merken."
 
 #. TRANS: Client exception thrown when trying favorite a notice without content.
-#, fuzzy
 msgid "Unknown notice."
-msgstr "Onbekend mededeling."
+msgstr "Onbekende mededeling."
 
 #. TRANS: Client exception thrown when trying favorite an already favorited notice.
 msgid "Already a favorite."
@@ -3116,9 +3115,8 @@ msgstr "Een bron-URL is verplicht."
 msgid "Could not create application."
 msgstr "Het was niet mogelijk de applicatie aan te maken."
 
-#, fuzzy
 msgid "Invalid image."
-msgstr "Ongeldige afmetingen."
+msgstr "Ongeldige afbeelding."
 
 #. TRANS: Title for form to create a group.
 msgid "New group"
@@ -3409,7 +3407,6 @@ msgid "This is your outbox, which lists private messages you have sent."
 msgstr "Dit is uw Postvak UIT waarin de door u verzonden privéberichten staan."
 
 #. TRANS: Title for page where to change password.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Change password"
 msgstr "Wachtwoord wijzigen"
@@ -3437,7 +3434,6 @@ msgid "6 or more characters."
 msgstr "Zes of meer tekens"
 
 #. TRANS: Field label on page where to change password. In this field the new password should be typed a second time.
-#, fuzzy
 msgctxt "LABEL"
 msgid "Confirm"
 msgstr "Bevestigen"
@@ -3448,7 +3444,6 @@ msgid "Same as password above."
 msgstr "Gelijk aan het wachtwoord hierboven."
 
 #. TRANS: Button text on page where to change password.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Change"
 msgstr "Wijzigen"
@@ -3461,9 +3456,8 @@ msgid "Passwords don't match."
 msgstr "De wachtwoorden komen niet overeen."
 
 #. TRANS: Form validation error on page where to change password.
-#, fuzzy
 msgid "Incorrect old password."
-msgstr "Het oude wachtwoord is onjuist"
+msgstr "Het oude wachtwoord is onjuist."
 
 #. TRANS: Form validation error on page where to change password.
 msgid "Error saving user; invalid."
@@ -3550,12 +3544,10 @@ msgid "Fancy URLs"
 msgstr "Nette URL's"
 
 #. TRANS: Field title in Paths admin panel.
-#, fuzzy
 msgid "Use fancy URLs (more readable and memorable)?"
-msgstr "Nette URL's (meer leesbaar en beter te onthouden) gebruiken?"
+msgstr "Nette URL's gebruiken (beter leesbaar en beter te onthouden)?"
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "Theme"
 msgstr "Vormgeving"
@@ -3669,7 +3661,6 @@ msgid "Directory where attachments are located."
 msgstr "Map waar bijlagen worden opgeslagen."
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "SSL"
 msgstr "SSL"
@@ -3754,7 +3745,6 @@ msgid "Enabled"
 msgstr "Ingeschakeld"
 
 #. TRANS: Tab and title for plugins admin panel.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Plugins"
 msgstr "Plug-ins"
@@ -3786,7 +3776,7 @@ msgstr "Ongeldige mededelinginhoud."
 
 #. TRANS: Exception thrown if a notice's license is not compatible with the StatusNet site license.
 #. TRANS: %1$s is the notice license, %2$s is the StatusNet site's license.
-#, fuzzy, php-format
+#, php-format
 msgid "Notice license \"%1$s\" is not compatible with site license \"%2$s\"."
 msgstr ""
 "De mededelingenlicentie \"%1$s\" is niet compatibel met de licentie \"%2$s\" "
@@ -4656,18 +4646,6 @@ msgstr "%s groep"
 msgid "%1$s group, page %2$d"
 msgstr "Groep %1$s, pagina %2$d"
 
-#. TRANS: Label for group description or group note (dt). Text hidden by default.
-msgid "Note"
-msgstr "Opmerking"
-
-#. TRANS: Label for group aliases (dt). Text hidden by default.
-msgid "Aliases"
-msgstr "Aliassen"
-
-#. TRANS: Group actions header (h2). Text hidden by default.
-msgid "Group actions"
-msgstr "Groepshandelingen"
-
 #. TRANS: Tooltip for feed link. %s is a group nickname.
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
@@ -4778,6 +4756,10 @@ msgstr "Bericht van %1$s op %2$s"
 msgid "Notice deleted."
 msgstr "Deze mededeling is verwijderd."
 
+#, fuzzy
+msgid "Notice"
+msgstr "Mededelingen"
+
 #. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
 #, php-format
 msgid "%1$s tagged %2$s"
@@ -5319,7 +5301,6 @@ msgstr "Geen ID-argument."
 msgid "Tag %s"
 msgstr "Label %s"
 
-#. TRANS: H2 for user profile information.
 msgid "User profile"
 msgstr "Gebruikersprofiel"
 
@@ -6042,6 +6023,49 @@ msgstr "Er is geen XSD aangetroffen voor %s."
 msgid "No AtomPub API service for %s."
 msgstr "Er is geen AtomPub API-dienst voor %s."
 
+#. TRANS: H2 for user actions in a profile.
+#. TRANS: H2 for entity actions in a profile.
+msgid "User actions"
+msgstr "Gebruikershandelingen"
+
+#. TRANS: Text shown in user profile of not yet compeltely deleted users.
+msgid "User deletion in progress..."
+msgstr "Bezig met het verwijderen van de gebruiker..."
+
+#. TRANS: Link title for link on user profile.
+msgid "Edit profile settings"
+msgstr "Profielinstellingen bewerken"
+
+#. TRANS: Link text for link on user profile.
+msgid "Edit"
+msgstr "Bewerken"
+
+#. TRANS: Link title for link on user profile.
+msgid "Send a direct message to this user"
+msgstr "Deze gebruiker een direct bericht zenden"
+
+#. TRANS: Link text for link on user profile.
+msgid "Message"
+msgstr "Bericht"
+
+#. TRANS: Label text on user profile to select a user role.
+msgid "Moderate"
+msgstr "Modereren"
+
+#. TRANS: Label text on user profile to select a user role.
+msgid "User role"
+msgstr "Gebruikersrol"
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Administrator"
+msgstr "Beheerder"
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Moderator"
+msgstr "Moderator"
+
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
 #, php-format
 msgid "%1$s - %2$s"
@@ -6777,87 +6801,172 @@ msgid_plural "You are a member of these groups:"
 msgstr[0] "U bent lid van deze groep:"
 msgstr[1] "U bent lid van deze groepen:"
 
-#. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-msgid ""
-"Commands:\n"
-"on - turn on notifications\n"
-"off - turn off notifications\n"
-"help - show this help\n"
-"follow <nickname> - subscribe to user\n"
-"groups - lists the groups you have joined\n"
-"subscriptions - list the people you follow\n"
-"subscribers - list the people that follow you\n"
-"leave <nickname> - unsubscribe from user\n"
-"d <nickname> <text> - direct message to user\n"
-"get <nickname> - get last notice from user\n"
-"whois <nickname> - get profile info on user\n"
-"lose <nickname> - force user to stop following you\n"
-"fav <nickname> - add user's last notice as a 'fave'\n"
-"fav #<notice_id> - add notice with the given id as a 'fave'\n"
-"repeat #<notice_id> - repeat a notice with a given id\n"
-"repeat <nickname> - repeat the last notice from user\n"
-"reply #<notice_id> - reply to notice with a given id\n"
-"reply <nickname> - reply to the last notice from user\n"
-"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
-"drop <group> - leave group\n"
-"stats - get your stats\n"
-"stop - same as 'off'\n"
-"quit - same as 'off'\n"
-"sub <nickname> - same as 'follow'\n"
-"unsub <nickname> - same as 'leave'\n"
-"last <nickname> - same as 'get'\n"
-"on <nickname> - not yet implemented.\n"
-"off <nickname> - not yet implemented.\n"
-"nudge <nickname> - remind a user to update.\n"
-"invite <phone number> - not yet implemented.\n"
-"track <word> - not yet implemented.\n"
-"untrack <word> - not yet implemented.\n"
-"track off - not yet implemented.\n"
-"untrack all - not yet implemented.\n"
-"tracks - not yet implemented.\n"
-"tracking - not yet implemented.\n"
+#. TRANS: Header line of help text for commands.
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "Commands:"
+msgstr "Commandoresultaten"
+
+#. TRANS: Help message for IM/SMS command "on"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "turn on notifications"
+msgstr "Het is niet mogelijk de notificatie uit te schakelen."
+
+#. TRANS: Help message for IM/SMS command "off"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "turn off notifications"
+msgstr "Het is niet mogelijk de mededelingen uit te schakelen."
+
+#. TRANS: Help message for IM/SMS command "help"
+msgctxt "COMMANDHELP"
+msgid "show this help"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "follow <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "subscribe to user"
+msgstr "Abonneren op deze gebruiker"
+
+#. TRANS: Help message for IM/SMS command "groups"
+msgctxt "COMMANDHELP"
+msgid "lists the groups you have joined"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscriptions"
+msgctxt "COMMANDHELP"
+msgid "list the people you follow"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscribers"
+msgctxt "COMMANDHELP"
+msgid "list the people that follow you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "leave <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "unsubscribe from user"
+msgstr "Uitschrijven van deze gebruiker"
+
+#. TRANS: Help message for IM/SMS command "d <nickname> <text>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "direct message to user"
+msgstr "Privéberichten aan %s"
+
+#. TRANS: Help message for IM/SMS command "get <nickname>"
+msgctxt "COMMANDHELP"
+msgid "get last notice from user"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "whois <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "get profile info on user"
+msgstr "Het profiel op de andere server is geen groep!"
+
+#. TRANS: Help message for IM/SMS command "lose <nickname>"
+msgctxt "COMMANDHELP"
+msgid "force user to stop following you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav <nickname>"
+msgctxt "COMMANDHELP"
+msgid "add user's last notice as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "add notice with the given id as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "repeat a notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "repeat the last notice from user"
+msgstr "Deze mededeling herhalen"
+
+#. TRANS: Help message for IM/SMS command "reply #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "reply to notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "reply <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "reply to the last notice from user"
+msgstr "Op deze mededeling antwoorden"
+
+#. TRANS: Help message for IM/SMS command "join <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "join group"
+msgstr "Onbekende groep."
+
+#. TRANS: Help message for IM/SMS command "login"
+msgctxt "COMMANDHELP"
+msgid "Get a link to login to the web interface"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "drop <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "leave group"
+msgstr "Groep verwijderen"
+
+#. TRANS: Help message for IM/SMS command "stats"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "get your stats"
+msgstr "Werk uw status bij..."
+
+#. TRANS: Help message for IM/SMS command "stop"
+#. TRANS: Help message for IM/SMS command "quit"
+msgctxt "COMMANDHELP"
+msgid "same as 'off'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "sub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'follow'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "unsub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'leave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "last <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'get'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "on <nickname>"
+#. TRANS: Help message for IM/SMS command "off <nickname>"
+#. TRANS: Help message for IM/SMS command "invite <phone number>"
+#. TRANS: Help message for IM/SMS command "track <word>"
+#. TRANS: Help message for IM/SMS command "untrack <word>"
+#. TRANS: Help message for IM/SMS command "track off"
+#. TRANS: Help message for IM/SMS command "untrack all"
+#. TRANS: Help message for IM/SMS command "tracks"
+#. TRANS: Help message for IM/SMS command "tracking"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "not yet implemented."
+msgstr "Dit commando is nog niet geïmplementeerd."
+
+#. TRANS: Help message for IM/SMS command "nudge <nickname>"
+msgctxt "COMMANDHELP"
+msgid "remind a user to update."
 msgstr ""
-"Commando's:\n"
-"on - notificaties inschakelen\n"
-"off - notificaties uitschakelen\n"
-"help - deze hulptekst weergeven\n"
-"follow <gebruiker> - abonneren op gebruiker\n"
-"groups - geef uw groepslidmaatschappen weer\n"
-"subscriptions - geeft uw gebruikersabonnenmenten weer\n"
-"subscribers - geeft de gebruikers die een abonnement op u hebben weer\n"
-"leave <gebruiker> - abonnement op gebruiker opzeggen\n"
-"d <gebruiker> <tekst> - direct bericht aan gebruiker\n"
-"get <gebruiker> - laatste mededeling van gebruiker opvragen\n"
-"whois <gebruiker> - profielinformatie van gebruiker opvragen\n"
-"lose <gebruiker> - zorgt ervoor dat de gebruiker u niet meer volgt\n"
-"fav <gebruiker> - laatste mededeling van gebruiker op favorietenlijst "
-"zetten\n"
-"fav #<mededeling-ID> - mededelingen met aangegeven ID op favorietenlijst "
-"zetten\n"
-"repeat #<mededeling-ID> - herhaal een mededelingen met een opgegeven ID\n"
-"repeat <gebruiker> - herhaal de laatste mededelingen van gebruiker\n"
-"reply #<mededeling-ID> - antwoorden op de mededeling met het aangegeven ID\n"
-"reply <gebruiker> - antwoorden op de laatste mededeling van gebruiker\n"
-"join <groep> - lid worden van groep\n"
-"login - verwijzing opvragen naar de webpagina voor aanmelden\n"
-"drop <groep> - groepslidmaatschap opzeggen\n"
-"stats - uw statistieken opvragen\n"
-"stop - zelfde als 'off'\n"
-"quit - zelfde als 'off'\n"
-"sub <gebruiker> - zelfde als 'follow'\n"
-"unsub <gebruiker> - zelfde als 'leave'\n"
-"last <gebruiker> - zelfde als 'get'\n"
-"on <gebruiker> - nog niet beschikbaar\n"
-"off <gebruiker> - nog niet beschikbaar\n"
-"nudge <gebruiker> - gebruiker porren\n"
-"invite <phone number> - nog niet beschikbaar\n"
-"track <word> - nog niet beschikbaar\n"
-"untrack <word> - nog niet beschikbaar\n"
-"track off - nog niet beschikbaar\n"
-"untrack all - nog niet beschikbaar\n"
-"tracks - nog niet beschikbaar\n"
-"tracking - nog niet beschikbaar\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 msgid "No configuration file found."
@@ -7031,6 +7140,9 @@ msgid ""
 msgstr ""
 "Locatie voor de groep - als relevant. Iets als \"Plaats, regio, land\"."
 
+msgid "Aliases"
+msgstr "Aliassen"
+
 #, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -7110,6 +7222,10 @@ msgctxt "TOOLTIP"
 msgid "Add or edit %s design"
 msgstr "Vormgeving van de groep %s toevoegen of aanpassen"
 
+#. TRANS: Group actions header (h2). Text hidden by default.
+msgid "Group actions"
+msgstr "Groepshandelingen"
+
 #. TRANS: Title for groups with the most members section.
 msgid "Groups with most members"
 msgstr "Groepen met de meeste leden"
@@ -7683,6 +7799,7 @@ msgstr "Mededeling verzenden"
 msgid "What's up, %s?"
 msgstr "Hallo, %s."
 
+#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr "Toevoegen"
 
@@ -7751,7 +7868,7 @@ msgid "Notice repeated"
 msgstr "Mededeling herhaald"
 
 msgid "Update your status..."
-msgstr ""
+msgstr "Werk uw status bij..."
 
 msgid "Nudge this user"
 msgstr "Deze gebruiker porren"
@@ -8142,52 +8259,6 @@ msgstr "Abonnement opheffen"
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "Gebruiker %1$s (%2$d) heeft geen profielrecord."
 
-msgid "Edit Avatar"
-msgstr "Avatar bewerken"
-
-#. TRANS: H2 for user actions in a profile.
-#. TRANS: H2 for entity actions in a profile.
-msgid "User actions"
-msgstr "Gebruikershandelingen"
-
-#. TRANS: Text shown in user profile of not yet compeltely deleted users.
-msgid "User deletion in progress..."
-msgstr "Bezig met het verwijderen van de gebruiker..."
-
-#. TRANS: Link title for link on user profile.
-msgid "Edit profile settings"
-msgstr "Profielinstellingen bewerken"
-
-#. TRANS: Link text for link on user profile.
-msgid "Edit"
-msgstr "Bewerken"
-
-#. TRANS: Link title for link on user profile.
-msgid "Send a direct message to this user"
-msgstr "Deze gebruiker een direct bericht zenden"
-
-#. TRANS: Link text for link on user profile.
-msgid "Message"
-msgstr "Bericht"
-
-#. TRANS: Label text on user profile to select a user role.
-msgid "Moderate"
-msgstr "Modereren"
-
-#. TRANS: Label text on user profile to select a user role.
-msgid "User role"
-msgstr "Gebruikersrol"
-
-#. TRANS: Role that can be set for a user profile.
-msgctxt "role"
-msgid "Administrator"
-msgstr "Beheerder"
-
-#. TRANS: Role that can be set for a user profile.
-msgctxt "role"
-msgid "Moderator"
-msgstr "Moderator"
-
 msgid "Not allowed to log in."
 msgstr "Aanmelden is niet toegestaan."
 
@@ -8261,3 +8332,91 @@ msgstr "Ongeldige XML. De XRD-root mist."
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr "De back-up wordt uit het bestand \"%s\" geladen."
+
+#~ msgid "Note"
+#~ msgstr "Opmerking"
+
+#~ msgid ""
+#~ "Commands:\n"
+#~ "on - turn on notifications\n"
+#~ "off - turn off notifications\n"
+#~ "help - show this help\n"
+#~ "follow <nickname> - subscribe to user\n"
+#~ "groups - lists the groups you have joined\n"
+#~ "subscriptions - list the people you follow\n"
+#~ "subscribers - list the people that follow you\n"
+#~ "leave <nickname> - unsubscribe from user\n"
+#~ "d <nickname> <text> - direct message to user\n"
+#~ "get <nickname> - get last notice from user\n"
+#~ "whois <nickname> - get profile info on user\n"
+#~ "lose <nickname> - force user to stop following you\n"
+#~ "fav <nickname> - add user's last notice as a 'fave'\n"
+#~ "fav #<notice_id> - add notice with the given id as a 'fave'\n"
+#~ "repeat #<notice_id> - repeat a notice with a given id\n"
+#~ "repeat <nickname> - repeat the last notice from user\n"
+#~ "reply #<notice_id> - reply to notice with a given id\n"
+#~ "reply <nickname> - reply to the last notice from user\n"
+#~ "join <group> - join group\n"
+#~ "login - Get a link to login to the web interface\n"
+#~ "drop <group> - leave group\n"
+#~ "stats - get your stats\n"
+#~ "stop - same as 'off'\n"
+#~ "quit - same as 'off'\n"
+#~ "sub <nickname> - same as 'follow'\n"
+#~ "unsub <nickname> - same as 'leave'\n"
+#~ "last <nickname> - same as 'get'\n"
+#~ "on <nickname> - not yet implemented.\n"
+#~ "off <nickname> - not yet implemented.\n"
+#~ "nudge <nickname> - remind a user to update.\n"
+#~ "invite <phone number> - not yet implemented.\n"
+#~ "track <word> - not yet implemented.\n"
+#~ "untrack <word> - not yet implemented.\n"
+#~ "track off - not yet implemented.\n"
+#~ "untrack all - not yet implemented.\n"
+#~ "tracks - not yet implemented.\n"
+#~ "tracking - not yet implemented.\n"
+#~ msgstr ""
+#~ "Commando's:\n"
+#~ "on - notificaties inschakelen\n"
+#~ "off - notificaties uitschakelen\n"
+#~ "help - deze hulptekst weergeven\n"
+#~ "follow <gebruiker> - abonneren op gebruiker\n"
+#~ "groups - geef uw groepslidmaatschappen weer\n"
+#~ "subscriptions - geeft uw gebruikersabonnenmenten weer\n"
+#~ "subscribers - geeft de gebruikers die een abonnement op u hebben weer\n"
+#~ "leave <gebruiker> - abonnement op gebruiker opzeggen\n"
+#~ "d <gebruiker> <tekst> - direct bericht aan gebruiker\n"
+#~ "get <gebruiker> - laatste mededeling van gebruiker opvragen\n"
+#~ "whois <gebruiker> - profielinformatie van gebruiker opvragen\n"
+#~ "lose <gebruiker> - zorgt ervoor dat de gebruiker u niet meer volgt\n"
+#~ "fav <gebruiker> - laatste mededeling van gebruiker op favorietenlijst "
+#~ "zetten\n"
+#~ "fav #<mededeling-ID> - mededelingen met aangegeven ID op favorietenlijst "
+#~ "zetten\n"
+#~ "repeat #<mededeling-ID> - herhaal een mededelingen met een opgegeven ID\n"
+#~ "repeat <gebruiker> - herhaal de laatste mededelingen van gebruiker\n"
+#~ "reply #<mededeling-ID> - antwoorden op de mededeling met het aangegeven "
+#~ "ID\n"
+#~ "reply <gebruiker> - antwoorden op de laatste mededeling van gebruiker\n"
+#~ "join <groep> - lid worden van groep\n"
+#~ "login - verwijzing opvragen naar de webpagina voor aanmelden\n"
+#~ "drop <groep> - groepslidmaatschap opzeggen\n"
+#~ "stats - uw statistieken opvragen\n"
+#~ "stop - zelfde als 'off'\n"
+#~ "quit - zelfde als 'off'\n"
+#~ "sub <gebruiker> - zelfde als 'follow'\n"
+#~ "unsub <gebruiker> - zelfde als 'leave'\n"
+#~ "last <gebruiker> - zelfde als 'get'\n"
+#~ "on <gebruiker> - nog niet beschikbaar\n"
+#~ "off <gebruiker> - nog niet beschikbaar\n"
+#~ "nudge <gebruiker> - gebruiker porren\n"
+#~ "invite <phone number> - nog niet beschikbaar\n"
+#~ "track <word> - nog niet beschikbaar\n"
+#~ "untrack <word> - nog niet beschikbaar\n"
+#~ "track off - nog niet beschikbaar\n"
+#~ "untrack all - nog niet beschikbaar\n"
+#~ "tracks - nog niet beschikbaar\n"
+#~ "tracking - nog niet beschikbaar\n"
+
+#~ msgid "Edit Avatar"
+#~ msgstr "Avatar bewerken"
diff --git a/locale/pl/LC_MESSAGES/statusnet.po b/locale/pl/LC_MESSAGES/statusnet.po
index b874633a6e..c656fd64bd 100644
--- a/locale/pl/LC_MESSAGES/statusnet.po
+++ b/locale/pl/LC_MESSAGES/statusnet.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-11 18:15+0000\n"
-"PO-Revision-Date: 2011-03-11 18:17:23+0000\n"
+"POT-Creation-Date: 2011-03-17 09:47+0000\n"
+"PO-Revision-Date: 2011-03-17 09:49:52+0000\n"
 "Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
 "Language-Team: Polish <http://translatewiki.net/wiki/Portal:pl>\n"
 "MIME-Version: 1.0\n"
@@ -20,11 +20,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n == 1) ? 0 : ( (n%10 >= 2 && n%10 <= 4 && "
 "(n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
-"X-Generator: MediaWiki 1.18alpha (r83703); Translate extension (2011-03-11)\n"
+"X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pl\n"
 "X-Message-Group: #out-statusnet-core\n"
-"X-POT-Import-Date: 2011-03-08 01:25:01+0000\n"
+"X-POT-Import-Date: 2011-03-11 18:52:41+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -601,7 +601,7 @@ msgstr "Nie można usunąć użytkownika %1$s z grupy %2$s."
 msgid "%s's groups"
 msgstr "Grupy użytkownika %s"
 
-#. TRANS: Used as subtitle in check for group membership. %1$s is a user name, %2$s is the site name.
+#. TRANS: Used as subtitle in check for group membership. %1$s is the site name, %2$s is a user name.
 #, php-format
 msgid "%1$s groups %2$s is a member of."
 msgstr "%2$s jest członkiem grup %1$s."
@@ -4667,18 +4667,6 @@ msgstr "Grupa %s"
 msgid "%1$s group, page %2$d"
 msgstr "Grupa %1$s, strona %2$d"
 
-#. TRANS: Label for group description or group note (dt). Text hidden by default.
-msgid "Note"
-msgstr "Wpis"
-
-#. TRANS: Label for group aliases (dt). Text hidden by default.
-msgid "Aliases"
-msgstr "Aliasy"
-
-#. TRANS: Group actions header (h2). Text hidden by default.
-msgid "Group actions"
-msgstr "Działania grupy"
-
 #. TRANS: Tooltip for feed link. %s is a group nickname.
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
@@ -4789,6 +4777,10 @@ msgstr "Wiadomość od użytkownika %1$s na %2$s"
 msgid "Notice deleted."
 msgstr "Usunięto wpis."
 
+#, fuzzy
+msgid "Notice"
+msgstr "Wpisy"
+
 #. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
 #, php-format
 msgid "%1$s tagged %2$s"
@@ -5326,7 +5318,6 @@ msgstr "Brak parametru identyfikatora."
 msgid "Tag %s"
 msgstr "Znacznik %s"
 
-#. TRANS: H2 for user profile information.
 msgid "User profile"
 msgstr "Profil użytkownika"
 
@@ -6054,6 +6045,49 @@ msgstr "Nie można odnaleźć XRD dla %s."
 msgid "No AtomPub API service for %s."
 msgstr "Brak API usługi AtomPub dla %s."
 
+#. TRANS: H2 for user actions in a profile.
+#. TRANS: H2 for entity actions in a profile.
+msgid "User actions"
+msgstr "Czynności użytkownika"
+
+#. TRANS: Text shown in user profile of not yet compeltely deleted users.
+msgid "User deletion in progress..."
+msgstr "Trwa usuwanie użytkownika..."
+
+#. TRANS: Link title for link on user profile.
+msgid "Edit profile settings"
+msgstr "Zmodyfikuj ustawienia profilu"
+
+#. TRANS: Link text for link on user profile.
+msgid "Edit"
+msgstr "Edycja"
+
+#. TRANS: Link title for link on user profile.
+msgid "Send a direct message to this user"
+msgstr "Wyślij bezpośrednią wiadomość do tego użytkownika"
+
+#. TRANS: Link text for link on user profile.
+msgid "Message"
+msgstr "Wiadomość"
+
+#. TRANS: Label text on user profile to select a user role.
+msgid "Moderate"
+msgstr "Moderuj"
+
+#. TRANS: Label text on user profile to select a user role.
+msgid "User role"
+msgstr "Rola użytkownika"
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Administrator"
+msgstr "Administrator"
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Moderator"
+msgstr "Moderator"
+
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
 #, php-format
 msgid "%1$s - %2$s"
@@ -6778,87 +6812,171 @@ msgstr[0] "Jesteś członkiem tej grupy:"
 msgstr[1] "Jesteś członkiem tych grup:"
 msgstr[2] "Jesteś członkiem tych grup:"
 
-#. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-msgid ""
-"Commands:\n"
-"on - turn on notifications\n"
-"off - turn off notifications\n"
-"help - show this help\n"
-"follow <nickname> - subscribe to user\n"
-"groups - lists the groups you have joined\n"
-"subscriptions - list the people you follow\n"
-"subscribers - list the people that follow you\n"
-"leave <nickname> - unsubscribe from user\n"
-"d <nickname> <text> - direct message to user\n"
-"get <nickname> - get last notice from user\n"
-"whois <nickname> - get profile info on user\n"
-"lose <nickname> - force user to stop following you\n"
-"fav <nickname> - add user's last notice as a 'fave'\n"
-"fav #<notice_id> - add notice with the given id as a 'fave'\n"
-"repeat #<notice_id> - repeat a notice with a given id\n"
-"repeat <nickname> - repeat the last notice from user\n"
-"reply #<notice_id> - reply to notice with a given id\n"
-"reply <nickname> - reply to the last notice from user\n"
-"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
-"drop <group> - leave group\n"
-"stats - get your stats\n"
-"stop - same as 'off'\n"
-"quit - same as 'off'\n"
-"sub <nickname> - same as 'follow'\n"
-"unsub <nickname> - same as 'leave'\n"
-"last <nickname> - same as 'get'\n"
-"on <nickname> - not yet implemented.\n"
-"off <nickname> - not yet implemented.\n"
-"nudge <nickname> - remind a user to update.\n"
-"invite <phone number> - not yet implemented.\n"
-"track <word> - not yet implemented.\n"
-"untrack <word> - not yet implemented.\n"
-"track off - not yet implemented.\n"
-"untrack all - not yet implemented.\n"
-"tracks - not yet implemented.\n"
-"tracking - not yet implemented.\n"
+#. TRANS: Header line of help text for commands.
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "Commands:"
+msgstr "Wyniki polecenia"
+
+#. TRANS: Help message for IM/SMS command "on"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "turn on notifications"
+msgstr "Nie można włączyć powiadomień."
+
+#. TRANS: Help message for IM/SMS command "off"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "turn off notifications"
+msgstr "Nie można wyłączyć powiadomień."
+
+#. TRANS: Help message for IM/SMS command "help"
+msgctxt "COMMANDHELP"
+msgid "show this help"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "follow <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "subscribe to user"
+msgstr "Subskrybuj tego użytkownika"
+
+#. TRANS: Help message for IM/SMS command "groups"
+msgctxt "COMMANDHELP"
+msgid "lists the groups you have joined"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscriptions"
+msgctxt "COMMANDHELP"
+msgid "list the people you follow"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscribers"
+msgctxt "COMMANDHELP"
+msgid "list the people that follow you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "leave <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "unsubscribe from user"
+msgstr "Zrezygnuj z subskrypcji tego użytkownika"
+
+#. TRANS: Help message for IM/SMS command "d <nickname> <text>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "direct message to user"
+msgstr "Bezpośrednia wiadomość do użytkownika %s"
+
+#. TRANS: Help message for IM/SMS command "get <nickname>"
+msgctxt "COMMANDHELP"
+msgid "get last notice from user"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "whois <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "get profile info on user"
+msgstr "Zdalny profil nie jest grupą."
+
+#. TRANS: Help message for IM/SMS command "lose <nickname>"
+msgctxt "COMMANDHELP"
+msgid "force user to stop following you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav <nickname>"
+msgctxt "COMMANDHELP"
+msgid "add user's last notice as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "add notice with the given id as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "repeat a notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "repeat the last notice from user"
+msgstr "Powtórz ten wpis"
+
+#. TRANS: Help message for IM/SMS command "reply #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "reply to notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "reply <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "reply to the last notice from user"
+msgstr "Odpowiedz na ten wpis"
+
+#. TRANS: Help message for IM/SMS command "join <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "join group"
+msgstr "Nieznana grupa."
+
+#. TRANS: Help message for IM/SMS command "login"
+msgctxt "COMMANDHELP"
+msgid "Get a link to login to the web interface"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "drop <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "leave group"
+msgstr "Usuń grupę"
+
+#. TRANS: Help message for IM/SMS command "stats"
+msgctxt "COMMANDHELP"
+msgid "get your stats"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "stop"
+#. TRANS: Help message for IM/SMS command "quit"
+msgctxt "COMMANDHELP"
+msgid "same as 'off'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "sub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'follow'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "unsub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'leave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "last <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'get'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "on <nickname>"
+#. TRANS: Help message for IM/SMS command "off <nickname>"
+#. TRANS: Help message for IM/SMS command "invite <phone number>"
+#. TRANS: Help message for IM/SMS command "track <word>"
+#. TRANS: Help message for IM/SMS command "untrack <word>"
+#. TRANS: Help message for IM/SMS command "track off"
+#. TRANS: Help message for IM/SMS command "untrack all"
+#. TRANS: Help message for IM/SMS command "tracks"
+#. TRANS: Help message for IM/SMS command "tracking"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "not yet implemented."
+msgstr "Nie zaimplementowano polecenia."
+
+#. TRANS: Help message for IM/SMS command "nudge <nickname>"
+msgctxt "COMMANDHELP"
+msgid "remind a user to update."
 msgstr ""
-"Polecenia:\n"
-"on - włącza powiadomienia\n"
-"off - wyłącza powiadomienia\n"
-"help - wyświetla tę pomoc\n"
-"follow <pseudonim> - subskrybuje użytkownika\n"
-"groups - wyświetla listę grup, do których dołączyłeś\n"
-"subscriptions - wyświetla listę obserwowanych osób\n"
-"subscribers - wyświetla listę osób, które cię obserwują\n"
-"leave <pseudonim> - usuwa subskrypcję użytkownika\n"
-"d <pseudonim> <tekst> - bezpośrednia wiadomość do użytkownika\n"
-"get <pseudonim> - zwraca ostatni wpis użytkownika\n"
-"whois <pseudonim> - zwraca informacje o profilu użytkownika\n"
-"lose <pseudonim> - wymusza użytkownika do zatrzymania obserwowania cię\n"
-"fav <pseudonim> - dodaje ostatni wpis użytkownika jako \"ulubiony\"\n"
-"fav #<identyfikator_wpisu> - dodaje wpis z podanym identyfikatorem jako "
-"\"ulubiony\"\n"
-"repeat #<identyfikator_wpisu> - powtarza wiadomość z zadanym "
-"identyfikatorem\n"
-"repeat <pseudonim> - powtarza ostatnią wiadomość od użytkownika\n"
-"reply #<identyfikator_wpisu> - odpowiada na wpis z podanym identyfikatorem\n"
-"reply <pseudonim> - odpowiada na ostatni wpis użytkownika\n"
-"join <grupa> - dołącza do grupy\n"
-"login - pobiera odnośnik do zalogowania się do interfejsu WWW\n"
-"drop <grupa> - opuszcza grupę\n"
-"stats - pobiera statystyki\n"
-"stop - to samo co \"off\"\n"
-"quit - to samo co \"off\"\n"
-"sub <pseudonim> - to samo co \"follow\"\n"
-"unsub <pseudonim> - to samo co \"leave\"\n"
-"last <pseudonim> - to samo co \"get\"\n"
-"on <pseudonim> - jeszcze nie zaimplementowano\n"
-"off <pseudonim> - jeszcze nie zaimplementowano\n"
-"nudge <pseudonim> - przypomina użytkownikowi o aktualizacji\n"
-"invite <numer telefonu> - jeszcze nie zaimplementowano\n"
-"track <wyraz> - jeszcze nie zaimplementowano\n"
-"untrack <wyraz> - jeszcze nie zaimplementowano\n"
-"track off - jeszcze nie zaimplementowano\n"
-"untrack all - jeszcze nie zaimplementowano\n"
-"tracks - jeszcze nie zaimplementowano\n"
-"tracking - jeszcze nie zaimplementowano\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 msgid "No configuration file found."
@@ -7034,6 +7152,9 @@ msgstr ""
 "Położenie grupy, jeśli istnieje, np. \"miasto, województwo (lub region), kraj"
 "\"."
 
+msgid "Aliases"
+msgstr "Aliasy"
+
 #, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -7118,6 +7239,10 @@ msgctxt "TOOLTIP"
 msgid "Add or edit %s design"
 msgstr "Dodanie lub modyfikacja wyglądu grupy %s"
 
+#. TRANS: Group actions header (h2). Text hidden by default.
+msgid "Group actions"
+msgstr "Działania grupy"
+
 #. TRANS: Title for groups with the most members section.
 msgid "Groups with most members"
 msgstr "Grupy z największą liczbą członków"
@@ -7689,6 +7814,7 @@ msgstr "Wyślij wpis"
 msgid "What's up, %s?"
 msgstr "Co słychać, %s?"
 
+#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr "Załącz"
 
@@ -8153,52 +8279,6 @@ msgstr "Zrezygnuj z subskrypcji"
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "Użytkownik%1$s (%2$d) nie posiada wpisu profilu."
 
-msgid "Edit Avatar"
-msgstr "Zmodyfikuj awatar"
-
-#. TRANS: H2 for user actions in a profile.
-#. TRANS: H2 for entity actions in a profile.
-msgid "User actions"
-msgstr "Czynności użytkownika"
-
-#. TRANS: Text shown in user profile of not yet compeltely deleted users.
-msgid "User deletion in progress..."
-msgstr "Trwa usuwanie użytkownika..."
-
-#. TRANS: Link title for link on user profile.
-msgid "Edit profile settings"
-msgstr "Zmodyfikuj ustawienia profilu"
-
-#. TRANS: Link text for link on user profile.
-msgid "Edit"
-msgstr "Edycja"
-
-#. TRANS: Link title for link on user profile.
-msgid "Send a direct message to this user"
-msgstr "Wyślij bezpośrednią wiadomość do tego użytkownika"
-
-#. TRANS: Link text for link on user profile.
-msgid "Message"
-msgstr "Wiadomość"
-
-#. TRANS: Label text on user profile to select a user role.
-msgid "Moderate"
-msgstr "Moderuj"
-
-#. TRANS: Label text on user profile to select a user role.
-msgid "User role"
-msgstr "Rola użytkownika"
-
-#. TRANS: Role that can be set for a user profile.
-msgctxt "role"
-msgid "Administrator"
-msgstr "Administrator"
-
-#. TRANS: Role that can be set for a user profile.
-msgctxt "role"
-msgid "Moderator"
-msgstr "Moderator"
-
 #, fuzzy
 msgid "Not allowed to log in."
 msgstr "Niezalogowany."
@@ -8279,3 +8359,91 @@ msgstr "Nieprawidłowy kod XML, brak głównego XRD."
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr "Pobieranie kopii zapasowej z pliku \"%s\"."
+
+#~ msgid "Note"
+#~ msgstr "Wpis"
+
+#~ msgid ""
+#~ "Commands:\n"
+#~ "on - turn on notifications\n"
+#~ "off - turn off notifications\n"
+#~ "help - show this help\n"
+#~ "follow <nickname> - subscribe to user\n"
+#~ "groups - lists the groups you have joined\n"
+#~ "subscriptions - list the people you follow\n"
+#~ "subscribers - list the people that follow you\n"
+#~ "leave <nickname> - unsubscribe from user\n"
+#~ "d <nickname> <text> - direct message to user\n"
+#~ "get <nickname> - get last notice from user\n"
+#~ "whois <nickname> - get profile info on user\n"
+#~ "lose <nickname> - force user to stop following you\n"
+#~ "fav <nickname> - add user's last notice as a 'fave'\n"
+#~ "fav #<notice_id> - add notice with the given id as a 'fave'\n"
+#~ "repeat #<notice_id> - repeat a notice with a given id\n"
+#~ "repeat <nickname> - repeat the last notice from user\n"
+#~ "reply #<notice_id> - reply to notice with a given id\n"
+#~ "reply <nickname> - reply to the last notice from user\n"
+#~ "join <group> - join group\n"
+#~ "login - Get a link to login to the web interface\n"
+#~ "drop <group> - leave group\n"
+#~ "stats - get your stats\n"
+#~ "stop - same as 'off'\n"
+#~ "quit - same as 'off'\n"
+#~ "sub <nickname> - same as 'follow'\n"
+#~ "unsub <nickname> - same as 'leave'\n"
+#~ "last <nickname> - same as 'get'\n"
+#~ "on <nickname> - not yet implemented.\n"
+#~ "off <nickname> - not yet implemented.\n"
+#~ "nudge <nickname> - remind a user to update.\n"
+#~ "invite <phone number> - not yet implemented.\n"
+#~ "track <word> - not yet implemented.\n"
+#~ "untrack <word> - not yet implemented.\n"
+#~ "track off - not yet implemented.\n"
+#~ "untrack all - not yet implemented.\n"
+#~ "tracks - not yet implemented.\n"
+#~ "tracking - not yet implemented.\n"
+#~ msgstr ""
+#~ "Polecenia:\n"
+#~ "on - włącza powiadomienia\n"
+#~ "off - wyłącza powiadomienia\n"
+#~ "help - wyświetla tę pomoc\n"
+#~ "follow <pseudonim> - subskrybuje użytkownika\n"
+#~ "groups - wyświetla listę grup, do których dołączyłeś\n"
+#~ "subscriptions - wyświetla listę obserwowanych osób\n"
+#~ "subscribers - wyświetla listę osób, które cię obserwują\n"
+#~ "leave <pseudonim> - usuwa subskrypcję użytkownika\n"
+#~ "d <pseudonim> <tekst> - bezpośrednia wiadomość do użytkownika\n"
+#~ "get <pseudonim> - zwraca ostatni wpis użytkownika\n"
+#~ "whois <pseudonim> - zwraca informacje o profilu użytkownika\n"
+#~ "lose <pseudonim> - wymusza użytkownika do zatrzymania obserwowania cię\n"
+#~ "fav <pseudonim> - dodaje ostatni wpis użytkownika jako \"ulubiony\"\n"
+#~ "fav #<identyfikator_wpisu> - dodaje wpis z podanym identyfikatorem jako "
+#~ "\"ulubiony\"\n"
+#~ "repeat #<identyfikator_wpisu> - powtarza wiadomość z zadanym "
+#~ "identyfikatorem\n"
+#~ "repeat <pseudonim> - powtarza ostatnią wiadomość od użytkownika\n"
+#~ "reply #<identyfikator_wpisu> - odpowiada na wpis z podanym "
+#~ "identyfikatorem\n"
+#~ "reply <pseudonim> - odpowiada na ostatni wpis użytkownika\n"
+#~ "join <grupa> - dołącza do grupy\n"
+#~ "login - pobiera odnośnik do zalogowania się do interfejsu WWW\n"
+#~ "drop <grupa> - opuszcza grupę\n"
+#~ "stats - pobiera statystyki\n"
+#~ "stop - to samo co \"off\"\n"
+#~ "quit - to samo co \"off\"\n"
+#~ "sub <pseudonim> - to samo co \"follow\"\n"
+#~ "unsub <pseudonim> - to samo co \"leave\"\n"
+#~ "last <pseudonim> - to samo co \"get\"\n"
+#~ "on <pseudonim> - jeszcze nie zaimplementowano\n"
+#~ "off <pseudonim> - jeszcze nie zaimplementowano\n"
+#~ "nudge <pseudonim> - przypomina użytkownikowi o aktualizacji\n"
+#~ "invite <numer telefonu> - jeszcze nie zaimplementowano\n"
+#~ "track <wyraz> - jeszcze nie zaimplementowano\n"
+#~ "untrack <wyraz> - jeszcze nie zaimplementowano\n"
+#~ "track off - jeszcze nie zaimplementowano\n"
+#~ "untrack all - jeszcze nie zaimplementowano\n"
+#~ "tracks - jeszcze nie zaimplementowano\n"
+#~ "tracking - jeszcze nie zaimplementowano\n"
+
+#~ msgid "Edit Avatar"
+#~ msgstr "Zmodyfikuj awatar"
diff --git a/locale/pt/LC_MESSAGES/statusnet.po b/locale/pt/LC_MESSAGES/statusnet.po
index 8cba1b643c..1b1e41be95 100644
--- a/locale/pt/LC_MESSAGES/statusnet.po
+++ b/locale/pt/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-03-11 18:15+0000\n"
-"PO-Revision-Date: 2011-03-11 18:17:24+0000\n"
+"POT-Creation-Date: 2011-03-17 09:47+0000\n"
+"PO-Revision-Date: 2011-03-17 09:49:53+0000\n"
 "Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83703); Translate extension (2011-03-11)\n"
+"X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-03-08 01:25:01+0000\n"
+"X-POT-Import-Date: 2011-03-11 18:52:41+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -595,7 +595,7 @@ msgstr "Não foi possível remover %1$s do grupo %2$s."
 msgid "%s's groups"
 msgstr "Grupos de %s"
 
-#. TRANS: Used as subtitle in check for group membership. %1$s is a user name, %2$s is the site name.
+#. TRANS: Used as subtitle in check for group membership. %1$s is the site name, %2$s is a user name.
 #, php-format
 msgid "%1$s groups %2$s is a member of."
 msgstr "Grupos de %1$s de que %2$s é membro."
@@ -4652,18 +4652,6 @@ msgstr "Grupo %s"
 msgid "%1$s group, page %2$d"
 msgstr "Grupo %1$s, página %2$d"
 
-#. TRANS: Label for group description or group note (dt). Text hidden by default.
-msgid "Note"
-msgstr "Anotação"
-
-#. TRANS: Label for group aliases (dt). Text hidden by default.
-msgid "Aliases"
-msgstr "Nomes alternativos"
-
-#. TRANS: Group actions header (h2). Text hidden by default.
-msgid "Group actions"
-msgstr "Acções do grupo"
-
 #. TRANS: Tooltip for feed link. %s is a group nickname.
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
@@ -4774,6 +4762,10 @@ msgstr "Mensagem de %1$s a %2$s"
 msgid "Notice deleted."
 msgstr "Avatar actualizado."
 
+#, fuzzy
+msgid "Notice"
+msgstr "Notas"
+
 #. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
 #, php-format
 msgid "%1$s tagged %2$s"
@@ -5310,7 +5302,6 @@ msgstr "Argumento de identificação (ID) em falta."
 msgid "Tag %s"
 msgstr "Categoria %s"
 
-#. TRANS: H2 for user profile information.
 msgid "User profile"
 msgstr "Perfil"
 
@@ -6028,6 +6019,49 @@ msgstr ""
 msgid "No AtomPub API service for %s."
 msgstr ""
 
+#. TRANS: H2 for user actions in a profile.
+#. TRANS: H2 for entity actions in a profile.
+msgid "User actions"
+msgstr "Acções do utilizador"
+
+#. TRANS: Text shown in user profile of not yet compeltely deleted users.
+msgid "User deletion in progress..."
+msgstr "A apagar o utilizador..."
+
+#. TRANS: Link title for link on user profile.
+msgid "Edit profile settings"
+msgstr "Editar configurações do perfil"
+
+#. TRANS: Link text for link on user profile.
+msgid "Edit"
+msgstr "Editar"
+
+#. TRANS: Link title for link on user profile.
+msgid "Send a direct message to this user"
+msgstr "Enviar mensagem directa a este utilizador"
+
+#. TRANS: Link text for link on user profile.
+msgid "Message"
+msgstr "Mensagem"
+
+#. TRANS: Label text on user profile to select a user role.
+msgid "Moderate"
+msgstr "Moderar"
+
+#. TRANS: Label text on user profile to select a user role.
+msgid "User role"
+msgstr "Função"
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Administrator"
+msgstr "Gestor"
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Moderator"
+msgstr "Moderador"
+
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
 #, php-format
 msgid "%1$s - %2$s"
@@ -6752,85 +6786,171 @@ msgid_plural "You are a member of these groups:"
 msgstr[0] "Está no grupo:"
 msgstr[1] "Está nos grupos:"
 
-#. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-msgid ""
-"Commands:\n"
-"on - turn on notifications\n"
-"off - turn off notifications\n"
-"help - show this help\n"
-"follow <nickname> - subscribe to user\n"
-"groups - lists the groups you have joined\n"
-"subscriptions - list the people you follow\n"
-"subscribers - list the people that follow you\n"
-"leave <nickname> - unsubscribe from user\n"
-"d <nickname> <text> - direct message to user\n"
-"get <nickname> - get last notice from user\n"
-"whois <nickname> - get profile info on user\n"
-"lose <nickname> - force user to stop following you\n"
-"fav <nickname> - add user's last notice as a 'fave'\n"
-"fav #<notice_id> - add notice with the given id as a 'fave'\n"
-"repeat #<notice_id> - repeat a notice with a given id\n"
-"repeat <nickname> - repeat the last notice from user\n"
-"reply #<notice_id> - reply to notice with a given id\n"
-"reply <nickname> - reply to the last notice from user\n"
-"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
-"drop <group> - leave group\n"
-"stats - get your stats\n"
-"stop - same as 'off'\n"
-"quit - same as 'off'\n"
-"sub <nickname> - same as 'follow'\n"
-"unsub <nickname> - same as 'leave'\n"
-"last <nickname> - same as 'get'\n"
-"on <nickname> - not yet implemented.\n"
-"off <nickname> - not yet implemented.\n"
-"nudge <nickname> - remind a user to update.\n"
-"invite <phone number> - not yet implemented.\n"
-"track <word> - not yet implemented.\n"
-"untrack <word> - not yet implemented.\n"
-"track off - not yet implemented.\n"
-"untrack all - not yet implemented.\n"
-"tracks - not yet implemented.\n"
-"tracking - not yet implemented.\n"
+#. TRANS: Header line of help text for commands.
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "Commands:"
+msgstr "Resultados do comando"
+
+#. TRANS: Help message for IM/SMS command "on"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "turn on notifications"
+msgstr "Não foi possível ligar a notificação."
+
+#. TRANS: Help message for IM/SMS command "off"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "turn off notifications"
+msgstr "Não foi possível desligar a notificação."
+
+#. TRANS: Help message for IM/SMS command "help"
+msgctxt "COMMANDHELP"
+msgid "show this help"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "follow <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "subscribe to user"
+msgstr "Subscrever este utilizador"
+
+#. TRANS: Help message for IM/SMS command "groups"
+msgctxt "COMMANDHELP"
+msgid "lists the groups you have joined"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscriptions"
+msgctxt "COMMANDHELP"
+msgid "list the people you follow"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscribers"
+msgctxt "COMMANDHELP"
+msgid "list the people that follow you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "leave <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "unsubscribe from user"
+msgstr "Deixar de subscrever este utilizador"
+
+#. TRANS: Help message for IM/SMS command "d <nickname> <text>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "direct message to user"
+msgstr "Mensagens directas para %s"
+
+#. TRANS: Help message for IM/SMS command "get <nickname>"
+msgctxt "COMMANDHELP"
+msgid "get last notice from user"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "whois <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "get profile info on user"
+msgstr "Informação do perfil"
+
+#. TRANS: Help message for IM/SMS command "lose <nickname>"
+msgctxt "COMMANDHELP"
+msgid "force user to stop following you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav <nickname>"
+msgctxt "COMMANDHELP"
+msgid "add user's last notice as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "add notice with the given id as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "repeat a notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "repeat the last notice from user"
+msgstr "Repetir esta nota"
+
+#. TRANS: Help message for IM/SMS command "reply #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "reply to notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "reply <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "reply to the last notice from user"
+msgstr "Responder a esta nota"
+
+#. TRANS: Help message for IM/SMS command "join <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "join group"
+msgstr "Grupo desconhecido."
+
+#. TRANS: Help message for IM/SMS command "login"
+msgctxt "COMMANDHELP"
+msgid "Get a link to login to the web interface"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "drop <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "leave group"
+msgstr "Apagar grupo"
+
+#. TRANS: Help message for IM/SMS command "stats"
+msgctxt "COMMANDHELP"
+msgid "get your stats"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "stop"
+#. TRANS: Help message for IM/SMS command "quit"
+msgctxt "COMMANDHELP"
+msgid "same as 'off'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "sub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'follow'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "unsub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'leave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "last <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'get'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "on <nickname>"
+#. TRANS: Help message for IM/SMS command "off <nickname>"
+#. TRANS: Help message for IM/SMS command "invite <phone number>"
+#. TRANS: Help message for IM/SMS command "track <word>"
+#. TRANS: Help message for IM/SMS command "untrack <word>"
+#. TRANS: Help message for IM/SMS command "track off"
+#. TRANS: Help message for IM/SMS command "untrack all"
+#. TRANS: Help message for IM/SMS command "tracks"
+#. TRANS: Help message for IM/SMS command "tracking"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "not yet implemented."
+msgstr "Comando ainda não implementado."
+
+#. TRANS: Help message for IM/SMS command "nudge <nickname>"
+msgctxt "COMMANDHELP"
+msgid "remind a user to update."
 msgstr ""
-"Comandos:\n"
-"on - ligar notificações\n"
-"off - desligar notificações\n"
-"help - mostrar esta ajuda\n"
-"follow <utilizador> - subscrever este utilizador\n"
-"groups - lista os grupos a que se juntou\n"
-"subscriptions - lista as pessoas que está a seguir\n"
-"subscribers - lista as pessoas que estão a segui-lo(a)\n"
-"leave <utilizador> - deixar de subscrever este utilizador\n"
-"d <utilizador> <texto> - mensagem directa para o utilizador\n"
-"get <utilizador> - receber última nota do utilizador\n"
-"whois <utilizador> - receber perfil do utilizador\n"
-"lose <utilizador> - obrigar o utilizador a deixar de subscrevê-lo\n"
-"fav <utilizador> - adicionar última nota do utilizador às favoritas\n"
-"fav #<id_da_nota> - adicionar nota com esta identificação às favoritas\n"
-"repeat #<id_da_nota> - repetir uma nota com uma certa identificação\n"
-"repeat <utilizador> - repetir a última nota do utilizador\n"
-"reply #<id_da_nota> - responder à nota com esta identificação\n"
-"reply <utilizador> - responder à última nota do utilizador\n"
-"join <grupo> - juntar-se ao grupo\n"
-"login - Receber uma ligação para iniciar sessão na interface web\n"
-"drop <grupo> - afastar-se do grupo\n"
-"stats - receber as suas estatísticas\n"
-"stop - o mesmo que 'off'\n"
-"quit - o mesmo que 'off'\n"
-"sub <utilizador> - o mesmo que 'follow'\n"
-"unsub <utilizador> - o mesmo que 'leave'\n"
-"last <utilizador> - o mesmo que 'get'\n"
-"on <utilizador> - ainda não implementado.\n"
-"off <utilizador> - ainda não implementado.\n"
-"nudge <utilizador> - relembrar um utilizador para actualizar.\n"
-"invite <número de telefone> - ainda não implementado.\n"
-"track <palavra> - ainda não implementado.\n"
-"untrack <palavra> - ainda não implementado.\n"
-"track off - ainda não implementado.\n"
-"untrack all - ainda não implementado.\n"
-"tracks - ainda não implementado.\n"
-"tracking - ainda não implementado.\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #, fuzzy
@@ -7012,6 +7132,9 @@ msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\"."
 msgstr "Localidade do grupo, se aplicável, por ex. \"Cidade, Região, País\""
 
+msgid "Aliases"
+msgstr "Nomes alternativos"
+
 #, fuzzy, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -7091,6 +7214,10 @@ msgctxt "TOOLTIP"
 msgid "Add or edit %s design"
 msgstr "Adicionar ou editar o design de %s"
 
+#. TRANS: Group actions header (h2). Text hidden by default.
+msgid "Group actions"
+msgstr "Acções do grupo"
+
 #. TRANS: Title for groups with the most members section.
 msgid "Groups with most members"
 msgstr "Grupos com mais membros"
@@ -7661,6 +7788,7 @@ msgstr "Enviar uma nota"
 msgid "What's up, %s?"
 msgstr "Novidades, %s?"
 
+#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr "Anexar"
 
@@ -8122,52 +8250,6 @@ msgstr "Abandonar"
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "Utilizador não tem perfil."
 
-msgid "Edit Avatar"
-msgstr "Editar Avatar"
-
-#. TRANS: H2 for user actions in a profile.
-#. TRANS: H2 for entity actions in a profile.
-msgid "User actions"
-msgstr "Acções do utilizador"
-
-#. TRANS: Text shown in user profile of not yet compeltely deleted users.
-msgid "User deletion in progress..."
-msgstr "A apagar o utilizador..."
-
-#. TRANS: Link title for link on user profile.
-msgid "Edit profile settings"
-msgstr "Editar configurações do perfil"
-
-#. TRANS: Link text for link on user profile.
-msgid "Edit"
-msgstr "Editar"
-
-#. TRANS: Link title for link on user profile.
-msgid "Send a direct message to this user"
-msgstr "Enviar mensagem directa a este utilizador"
-
-#. TRANS: Link text for link on user profile.
-msgid "Message"
-msgstr "Mensagem"
-
-#. TRANS: Label text on user profile to select a user role.
-msgid "Moderate"
-msgstr "Moderar"
-
-#. TRANS: Label text on user profile to select a user role.
-msgid "User role"
-msgstr "Função"
-
-#. TRANS: Role that can be set for a user profile.
-msgctxt "role"
-msgid "Administrator"
-msgstr "Gestor"
-
-#. TRANS: Role that can be set for a user profile.
-msgctxt "role"
-msgid "Moderator"
-msgstr "Moderador"
-
 #, fuzzy
 msgid "Not allowed to log in."
 msgstr "Não iniciou sessão."
@@ -8243,3 +8325,88 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#~ msgid "Note"
+#~ msgstr "Anotação"
+
+#~ msgid ""
+#~ "Commands:\n"
+#~ "on - turn on notifications\n"
+#~ "off - turn off notifications\n"
+#~ "help - show this help\n"
+#~ "follow <nickname> - subscribe to user\n"
+#~ "groups - lists the groups you have joined\n"
+#~ "subscriptions - list the people you follow\n"
+#~ "subscribers - list the people that follow you\n"
+#~ "leave <nickname> - unsubscribe from user\n"
+#~ "d <nickname> <text> - direct message to user\n"
+#~ "get <nickname> - get last notice from user\n"
+#~ "whois <nickname> - get profile info on user\n"
+#~ "lose <nickname> - force user to stop following you\n"
+#~ "fav <nickname> - add user's last notice as a 'fave'\n"
+#~ "fav #<notice_id> - add notice with the given id as a 'fave'\n"
+#~ "repeat #<notice_id> - repeat a notice with a given id\n"
+#~ "repeat <nickname> - repeat the last notice from user\n"
+#~ "reply #<notice_id> - reply to notice with a given id\n"
+#~ "reply <nickname> - reply to the last notice from user\n"
+#~ "join <group> - join group\n"
+#~ "login - Get a link to login to the web interface\n"
+#~ "drop <group> - leave group\n"
+#~ "stats - get your stats\n"
+#~ "stop - same as 'off'\n"
+#~ "quit - same as 'off'\n"
+#~ "sub <nickname> - same as 'follow'\n"
+#~ "unsub <nickname> - same as 'leave'\n"
+#~ "last <nickname> - same as 'get'\n"
+#~ "on <nickname> - not yet implemented.\n"
+#~ "off <nickname> - not yet implemented.\n"
+#~ "nudge <nickname> - remind a user to update.\n"
+#~ "invite <phone number> - not yet implemented.\n"
+#~ "track <word> - not yet implemented.\n"
+#~ "untrack <word> - not yet implemented.\n"
+#~ "track off - not yet implemented.\n"
+#~ "untrack all - not yet implemented.\n"
+#~ "tracks - not yet implemented.\n"
+#~ "tracking - not yet implemented.\n"
+#~ msgstr ""
+#~ "Comandos:\n"
+#~ "on - ligar notificações\n"
+#~ "off - desligar notificações\n"
+#~ "help - mostrar esta ajuda\n"
+#~ "follow <utilizador> - subscrever este utilizador\n"
+#~ "groups - lista os grupos a que se juntou\n"
+#~ "subscriptions - lista as pessoas que está a seguir\n"
+#~ "subscribers - lista as pessoas que estão a segui-lo(a)\n"
+#~ "leave <utilizador> - deixar de subscrever este utilizador\n"
+#~ "d <utilizador> <texto> - mensagem directa para o utilizador\n"
+#~ "get <utilizador> - receber última nota do utilizador\n"
+#~ "whois <utilizador> - receber perfil do utilizador\n"
+#~ "lose <utilizador> - obrigar o utilizador a deixar de subscrevê-lo\n"
+#~ "fav <utilizador> - adicionar última nota do utilizador às favoritas\n"
+#~ "fav #<id_da_nota> - adicionar nota com esta identificação às favoritas\n"
+#~ "repeat #<id_da_nota> - repetir uma nota com uma certa identificação\n"
+#~ "repeat <utilizador> - repetir a última nota do utilizador\n"
+#~ "reply #<id_da_nota> - responder à nota com esta identificação\n"
+#~ "reply <utilizador> - responder à última nota do utilizador\n"
+#~ "join <grupo> - juntar-se ao grupo\n"
+#~ "login - Receber uma ligação para iniciar sessão na interface web\n"
+#~ "drop <grupo> - afastar-se do grupo\n"
+#~ "stats - receber as suas estatísticas\n"
+#~ "stop - o mesmo que 'off'\n"
+#~ "quit - o mesmo que 'off'\n"
+#~ "sub <utilizador> - o mesmo que 'follow'\n"
+#~ "unsub <utilizador> - o mesmo que 'leave'\n"
+#~ "last <utilizador> - o mesmo que 'get'\n"
+#~ "on <utilizador> - ainda não implementado.\n"
+#~ "off <utilizador> - ainda não implementado.\n"
+#~ "nudge <utilizador> - relembrar um utilizador para actualizar.\n"
+#~ "invite <número de telefone> - ainda não implementado.\n"
+#~ "track <palavra> - ainda não implementado.\n"
+#~ "untrack <palavra> - ainda não implementado.\n"
+#~ "track off - ainda não implementado.\n"
+#~ "untrack all - ainda não implementado.\n"
+#~ "tracks - ainda não implementado.\n"
+#~ "tracking - ainda não implementado.\n"
+
+#~ msgid "Edit Avatar"
+#~ msgstr "Editar Avatar"
diff --git a/locale/pt_BR/LC_MESSAGES/statusnet.po b/locale/pt_BR/LC_MESSAGES/statusnet.po
index 66957c90c9..fc2eacbe50 100644
--- a/locale/pt_BR/LC_MESSAGES/statusnet.po
+++ b/locale/pt_BR/LC_MESSAGES/statusnet.po
@@ -15,18 +15,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-11 18:15+0000\n"
-"PO-Revision-Date: 2011-03-11 18:17:25+0000\n"
+"POT-Creation-Date: 2011-03-17 09:47+0000\n"
+"PO-Revision-Date: 2011-03-17 09:49:54+0000\n"
 "Language-Team: Brazilian Portuguese <http://translatewiki.net/wiki/Portal:pt-"
 "br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83703); Translate extension (2011-03-11)\n"
+"X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt-br\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-POT-Import-Date: 2011-03-08 01:25:01+0000\n"
+"X-POT-Import-Date: 2011-03-11 18:52:41+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -601,7 +601,7 @@ msgstr "Não foi possível remover o usuário %1$s do grupo %2$s."
 msgid "%s's groups"
 msgstr "Grupos de %s"
 
-#. TRANS: Used as subtitle in check for group membership. %1$s is a user name, %2$s is the site name.
+#. TRANS: Used as subtitle in check for group membership. %1$s is the site name, %2$s is a user name.
 #, php-format
 msgid "%1$s groups %2$s is a member of."
 msgstr "Grupos de %1$s nos quais %2$s é membro."
@@ -4720,18 +4720,6 @@ msgstr "Grupo %s"
 msgid "%1$s group, page %2$d"
 msgstr "Grupo %1$s, pág. %2$d"
 
-#. TRANS: Label for group description or group note (dt). Text hidden by default.
-msgid "Note"
-msgstr "Mensagem"
-
-#. TRANS: Label for group aliases (dt). Text hidden by default.
-msgid "Aliases"
-msgstr "Apelidos"
-
-#. TRANS: Group actions header (h2). Text hidden by default.
-msgid "Group actions"
-msgstr "Ações do grupo"
-
 #. TRANS: Tooltip for feed link. %s is a group nickname.
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
@@ -4842,6 +4830,10 @@ msgstr "Mensagem de %1$s no %2$s"
 msgid "Notice deleted."
 msgstr "A mensagem excluída."
 
+#, fuzzy
+msgid "Notice"
+msgstr "Mensagens"
+
 #. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
 #, php-format
 msgid "%1$s tagged %2$s"
@@ -5377,7 +5369,6 @@ msgstr "Nenhum argumento de ID."
 msgid "Tag %s"
 msgstr "Etiqueta %s"
 
-#. TRANS: H2 for user profile information.
 msgid "User profile"
 msgstr "Perfil do usuário"
 
@@ -6095,6 +6086,49 @@ msgstr ""
 msgid "No AtomPub API service for %s."
 msgstr ""
 
+#. TRANS: H2 for user actions in a profile.
+#. TRANS: H2 for entity actions in a profile.
+msgid "User actions"
+msgstr "Ações do usuário"
+
+#. TRANS: Text shown in user profile of not yet compeltely deleted users.
+msgid "User deletion in progress..."
+msgstr "Exclusão do usuário em andamento..."
+
+#. TRANS: Link title for link on user profile.
+msgid "Edit profile settings"
+msgstr "Editar as configurações do perfil"
+
+#. TRANS: Link text for link on user profile.
+msgid "Edit"
+msgstr "Editar"
+
+#. TRANS: Link title for link on user profile.
+msgid "Send a direct message to this user"
+msgstr "Enviar uma mensagem para este usuário."
+
+#. TRANS: Link text for link on user profile.
+msgid "Message"
+msgstr "Mensagem"
+
+#. TRANS: Label text on user profile to select a user role.
+msgid "Moderate"
+msgstr "Moderar"
+
+#. TRANS: Label text on user profile to select a user role.
+msgid "User role"
+msgstr "Papel do usuário"
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Administrator"
+msgstr "Administrador"
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Moderator"
+msgstr "Moderador"
+
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
 #, php-format
 msgid "%1$s - %2$s"
@@ -6829,86 +6863,171 @@ msgid_plural "You are a member of these groups:"
 msgstr[0] "Você é membro deste grupo:"
 msgstr[1] "Você é membro destes grupos:"
 
-#. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-msgid ""
-"Commands:\n"
-"on - turn on notifications\n"
-"off - turn off notifications\n"
-"help - show this help\n"
-"follow <nickname> - subscribe to user\n"
-"groups - lists the groups you have joined\n"
-"subscriptions - list the people you follow\n"
-"subscribers - list the people that follow you\n"
-"leave <nickname> - unsubscribe from user\n"
-"d <nickname> <text> - direct message to user\n"
-"get <nickname> - get last notice from user\n"
-"whois <nickname> - get profile info on user\n"
-"lose <nickname> - force user to stop following you\n"
-"fav <nickname> - add user's last notice as a 'fave'\n"
-"fav #<notice_id> - add notice with the given id as a 'fave'\n"
-"repeat #<notice_id> - repeat a notice with a given id\n"
-"repeat <nickname> - repeat the last notice from user\n"
-"reply #<notice_id> - reply to notice with a given id\n"
-"reply <nickname> - reply to the last notice from user\n"
-"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
-"drop <group> - leave group\n"
-"stats - get your stats\n"
-"stop - same as 'off'\n"
-"quit - same as 'off'\n"
-"sub <nickname> - same as 'follow'\n"
-"unsub <nickname> - same as 'leave'\n"
-"last <nickname> - same as 'get'\n"
-"on <nickname> - not yet implemented.\n"
-"off <nickname> - not yet implemented.\n"
-"nudge <nickname> - remind a user to update.\n"
-"invite <phone number> - not yet implemented.\n"
-"track <word> - not yet implemented.\n"
-"untrack <word> - not yet implemented.\n"
-"track off - not yet implemented.\n"
-"untrack all - not yet implemented.\n"
-"tracks - not yet implemented.\n"
-"tracking - not yet implemented.\n"
+#. TRANS: Header line of help text for commands.
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "Commands:"
+msgstr "Resultados do comando"
+
+#. TRANS: Help message for IM/SMS command "on"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "turn on notifications"
+msgstr "Não é possível ligar a notificação."
+
+#. TRANS: Help message for IM/SMS command "off"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "turn off notifications"
+msgstr "Não é possível desligar a notificação."
+
+#. TRANS: Help message for IM/SMS command "help"
+msgctxt "COMMANDHELP"
+msgid "show this help"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "follow <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "subscribe to user"
+msgstr "Assinar este usuário"
+
+#. TRANS: Help message for IM/SMS command "groups"
+msgctxt "COMMANDHELP"
+msgid "lists the groups you have joined"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscriptions"
+msgctxt "COMMANDHELP"
+msgid "list the people you follow"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscribers"
+msgctxt "COMMANDHELP"
+msgid "list the people that follow you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "leave <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "unsubscribe from user"
+msgstr "Cancelar a assinatura deste usuário"
+
+#. TRANS: Help message for IM/SMS command "d <nickname> <text>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "direct message to user"
+msgstr "Mensagens diretas para %s"
+
+#. TRANS: Help message for IM/SMS command "get <nickname>"
+msgctxt "COMMANDHELP"
+msgid "get last notice from user"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "whois <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "get profile info on user"
+msgstr "Informações do perfil"
+
+#. TRANS: Help message for IM/SMS command "lose <nickname>"
+msgctxt "COMMANDHELP"
+msgid "force user to stop following you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav <nickname>"
+msgctxt "COMMANDHELP"
+msgid "add user's last notice as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "add notice with the given id as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "repeat a notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "repeat the last notice from user"
+msgstr "Repetir esta mensagem"
+
+#. TRANS: Help message for IM/SMS command "reply #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "reply to notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "reply <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "reply to the last notice from user"
+msgstr "Responder a esta mensagem"
+
+#. TRANS: Help message for IM/SMS command "join <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "join group"
+msgstr "Grupo desconhecido."
+
+#. TRANS: Help message for IM/SMS command "login"
+msgctxt "COMMANDHELP"
+msgid "Get a link to login to the web interface"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "drop <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "leave group"
+msgstr "Excluir o grupo"
+
+#. TRANS: Help message for IM/SMS command "stats"
+msgctxt "COMMANDHELP"
+msgid "get your stats"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "stop"
+#. TRANS: Help message for IM/SMS command "quit"
+msgctxt "COMMANDHELP"
+msgid "same as 'off'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "sub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'follow'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "unsub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'leave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "last <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'get'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "on <nickname>"
+#. TRANS: Help message for IM/SMS command "off <nickname>"
+#. TRANS: Help message for IM/SMS command "invite <phone number>"
+#. TRANS: Help message for IM/SMS command "track <word>"
+#. TRANS: Help message for IM/SMS command "untrack <word>"
+#. TRANS: Help message for IM/SMS command "track off"
+#. TRANS: Help message for IM/SMS command "untrack all"
+#. TRANS: Help message for IM/SMS command "tracks"
+#. TRANS: Help message for IM/SMS command "tracking"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "not yet implemented."
+msgstr "O comando não foi implementado ainda."
+
+#. TRANS: Help message for IM/SMS command "nudge <nickname>"
+msgctxt "COMMANDHELP"
+msgid "remind a user to update."
 msgstr ""
-"Comandos:\n"
-"on - ativa as notificações\n"
-"off - desativa as notificações\n"
-"help - exibe esta ajuda\n"
-"follow <identificação> - assina o usuário\n"
-"groups - lista os grupos aos quais você se associou\n"
-"subscriptions - lista as pessoas que você segue\n"
-"subscribers - lista as pessoas que seguem você\n"
-"leave <identificação> - deixa de assinar o usuário\n"
-"d <identificação> <texto> - mensagem direta para o usuário\n"
-"get <identificação> - obtém a última mensagem do usuário\n"
-"whois <identificação> - obtém as informações do perfil do usuário\n"
-"lose <identificação> - obriga o usuário a deixar de segui-lo\n"
-"fav <identificação> - adiciona a último mensagem do usuário como uma "
-"'favorita'\n"
-"fav #<id_da_mensagem> - adiciona a mensagem identificada como 'favorita'\n"
-"repeat #<id_da_mensagem> - repete a mensagem identificada\n"
-"repeat <identificação> - repete a última mensagem do usuário\n"
-"reply #<id_da_mensagem> - responde a mensagem identificada\n"
-"reply <identificação> - responde a última mensagem do usuário\n"
-"join <grupo> - associa-se ao grupo\n"
-"login - obtém um link para se autenticar na interface web\n"
-"drop <grupo> - deixa o grupo\n"
-"stats - obtém suas estatísticas\n"
-"stop - o mesmo que 'off'\n"
-"quit - o mesmo que 'off'\n"
-"sub <identificação> - o mesmo que 'follow'\n"
-"unsub <identificação> - o mesmo que 'leave'\n"
-"last <identificação> - o mesmo que 'get'\n"
-"on <identificação> - não implementado ainda\n"
-"off <identificação> - não implementado ainda\n"
-"nudge <identificação> - chama a atenção do usuário\n"
-"invite <número_de_ telefone> - não implementado ainda\n"
-"track <palavra> - não implementado ainda\n"
-"untrack <palavra> - não implementado ainda\n"
-"track off -  não implementado ainda\n"
-"untrack all -  não implementado ainda\n"
-"tracks -  não implementado ainda\n"
-"tracking -  não implementado ainda\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #, fuzzy
@@ -7092,6 +7211,9 @@ msgstr ""
 "Localização do grupo, caso tenha alguma, como \"cidade, estado (ou região), "
 "país\""
 
+msgid "Aliases"
+msgstr "Apelidos"
+
 #, fuzzy, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -7171,6 +7293,10 @@ msgctxt "TOOLTIP"
 msgid "Add or edit %s design"
 msgstr "Adicionar ou editar a aparência de %s"
 
+#. TRANS: Group actions header (h2). Text hidden by default.
+msgid "Group actions"
+msgstr "Ações do grupo"
+
 #. TRANS: Title for groups with the most members section.
 msgid "Groups with most members"
 msgstr "Grupos com mais membros"
@@ -7743,6 +7869,7 @@ msgstr "Enviar uma mensagem"
 msgid "What's up, %s?"
 msgstr "E aí, %s?"
 
+#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr "Anexo"
 
@@ -8202,52 +8329,6 @@ msgstr "Cancelar"
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "O usuário não tem perfil."
 
-msgid "Edit Avatar"
-msgstr "Editar o avatar"
-
-#. TRANS: H2 for user actions in a profile.
-#. TRANS: H2 for entity actions in a profile.
-msgid "User actions"
-msgstr "Ações do usuário"
-
-#. TRANS: Text shown in user profile of not yet compeltely deleted users.
-msgid "User deletion in progress..."
-msgstr "Exclusão do usuário em andamento..."
-
-#. TRANS: Link title for link on user profile.
-msgid "Edit profile settings"
-msgstr "Editar as configurações do perfil"
-
-#. TRANS: Link text for link on user profile.
-msgid "Edit"
-msgstr "Editar"
-
-#. TRANS: Link title for link on user profile.
-msgid "Send a direct message to this user"
-msgstr "Enviar uma mensagem para este usuário."
-
-#. TRANS: Link text for link on user profile.
-msgid "Message"
-msgstr "Mensagem"
-
-#. TRANS: Label text on user profile to select a user role.
-msgid "Moderate"
-msgstr "Moderar"
-
-#. TRANS: Label text on user profile to select a user role.
-msgid "User role"
-msgstr "Papel do usuário"
-
-#. TRANS: Role that can be set for a user profile.
-msgctxt "role"
-msgid "Administrator"
-msgstr "Administrador"
-
-#. TRANS: Role that can be set for a user profile.
-msgctxt "role"
-msgid "Moderator"
-msgstr "Moderador"
-
 #, fuzzy
 msgid "Not allowed to log in."
 msgstr "Você não está autenticado."
@@ -8323,3 +8404,89 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#~ msgid "Note"
+#~ msgstr "Mensagem"
+
+#~ msgid ""
+#~ "Commands:\n"
+#~ "on - turn on notifications\n"
+#~ "off - turn off notifications\n"
+#~ "help - show this help\n"
+#~ "follow <nickname> - subscribe to user\n"
+#~ "groups - lists the groups you have joined\n"
+#~ "subscriptions - list the people you follow\n"
+#~ "subscribers - list the people that follow you\n"
+#~ "leave <nickname> - unsubscribe from user\n"
+#~ "d <nickname> <text> - direct message to user\n"
+#~ "get <nickname> - get last notice from user\n"
+#~ "whois <nickname> - get profile info on user\n"
+#~ "lose <nickname> - force user to stop following you\n"
+#~ "fav <nickname> - add user's last notice as a 'fave'\n"
+#~ "fav #<notice_id> - add notice with the given id as a 'fave'\n"
+#~ "repeat #<notice_id> - repeat a notice with a given id\n"
+#~ "repeat <nickname> - repeat the last notice from user\n"
+#~ "reply #<notice_id> - reply to notice with a given id\n"
+#~ "reply <nickname> - reply to the last notice from user\n"
+#~ "join <group> - join group\n"
+#~ "login - Get a link to login to the web interface\n"
+#~ "drop <group> - leave group\n"
+#~ "stats - get your stats\n"
+#~ "stop - same as 'off'\n"
+#~ "quit - same as 'off'\n"
+#~ "sub <nickname> - same as 'follow'\n"
+#~ "unsub <nickname> - same as 'leave'\n"
+#~ "last <nickname> - same as 'get'\n"
+#~ "on <nickname> - not yet implemented.\n"
+#~ "off <nickname> - not yet implemented.\n"
+#~ "nudge <nickname> - remind a user to update.\n"
+#~ "invite <phone number> - not yet implemented.\n"
+#~ "track <word> - not yet implemented.\n"
+#~ "untrack <word> - not yet implemented.\n"
+#~ "track off - not yet implemented.\n"
+#~ "untrack all - not yet implemented.\n"
+#~ "tracks - not yet implemented.\n"
+#~ "tracking - not yet implemented.\n"
+#~ msgstr ""
+#~ "Comandos:\n"
+#~ "on - ativa as notificações\n"
+#~ "off - desativa as notificações\n"
+#~ "help - exibe esta ajuda\n"
+#~ "follow <identificação> - assina o usuário\n"
+#~ "groups - lista os grupos aos quais você se associou\n"
+#~ "subscriptions - lista as pessoas que você segue\n"
+#~ "subscribers - lista as pessoas que seguem você\n"
+#~ "leave <identificação> - deixa de assinar o usuário\n"
+#~ "d <identificação> <texto> - mensagem direta para o usuário\n"
+#~ "get <identificação> - obtém a última mensagem do usuário\n"
+#~ "whois <identificação> - obtém as informações do perfil do usuário\n"
+#~ "lose <identificação> - obriga o usuário a deixar de segui-lo\n"
+#~ "fav <identificação> - adiciona a último mensagem do usuário como uma "
+#~ "'favorita'\n"
+#~ "fav #<id_da_mensagem> - adiciona a mensagem identificada como 'favorita'\n"
+#~ "repeat #<id_da_mensagem> - repete a mensagem identificada\n"
+#~ "repeat <identificação> - repete a última mensagem do usuário\n"
+#~ "reply #<id_da_mensagem> - responde a mensagem identificada\n"
+#~ "reply <identificação> - responde a última mensagem do usuário\n"
+#~ "join <grupo> - associa-se ao grupo\n"
+#~ "login - obtém um link para se autenticar na interface web\n"
+#~ "drop <grupo> - deixa o grupo\n"
+#~ "stats - obtém suas estatísticas\n"
+#~ "stop - o mesmo que 'off'\n"
+#~ "quit - o mesmo que 'off'\n"
+#~ "sub <identificação> - o mesmo que 'follow'\n"
+#~ "unsub <identificação> - o mesmo que 'leave'\n"
+#~ "last <identificação> - o mesmo que 'get'\n"
+#~ "on <identificação> - não implementado ainda\n"
+#~ "off <identificação> - não implementado ainda\n"
+#~ "nudge <identificação> - chama a atenção do usuário\n"
+#~ "invite <número_de_ telefone> - não implementado ainda\n"
+#~ "track <palavra> - não implementado ainda\n"
+#~ "untrack <palavra> - não implementado ainda\n"
+#~ "track off -  não implementado ainda\n"
+#~ "untrack all -  não implementado ainda\n"
+#~ "tracks -  não implementado ainda\n"
+#~ "tracking -  não implementado ainda\n"
+
+#~ msgid "Edit Avatar"
+#~ msgstr "Editar o avatar"
diff --git a/locale/ru/LC_MESSAGES/statusnet.po b/locale/ru/LC_MESSAGES/statusnet.po
index 69cfbaaae3..115aad39de 100644
--- a/locale/ru/LC_MESSAGES/statusnet.po
+++ b/locale/ru/LC_MESSAGES/statusnet.po
@@ -18,18 +18,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-11 18:15+0000\n"
-"PO-Revision-Date: 2011-03-11 18:17:26+0000\n"
+"POT-Creation-Date: 2011-03-17 09:47+0000\n"
+"PO-Revision-Date: 2011-03-17 09:49:55+0000\n"
 "Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83703); Translate extension (2011-03-11)\n"
+"X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
-"X-POT-Import-Date: 2011-03-08 01:25:01+0000\n"
+"X-POT-Import-Date: 2011-03-11 18:52:41+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -607,7 +607,7 @@ msgstr "Не удаётся удалить пользователя %1$s из г
 msgid "%s's groups"
 msgstr "Группы %s"
 
-#. TRANS: Used as subtitle in check for group membership. %1$s is a user name, %2$s is the site name.
+#. TRANS: Used as subtitle in check for group membership. %1$s is the site name, %2$s is a user name.
 #, php-format
 msgid "%1$s groups %2$s is a member of."
 msgstr "Группы %1$s, в которых состоит %2$s."
@@ -4712,18 +4712,6 @@ msgstr "Группа %s"
 msgid "%1$s group, page %2$d"
 msgstr "Группа %1$s, страница %2$d"
 
-#. TRANS: Label for group description or group note (dt). Text hidden by default.
-msgid "Note"
-msgstr "Запись"
-
-#. TRANS: Label for group aliases (dt). Text hidden by default.
-msgid "Aliases"
-msgstr "Алиасы"
-
-#. TRANS: Group actions header (h2). Text hidden by default.
-msgid "Group actions"
-msgstr "Действия группы"
-
 #. TRANS: Tooltip for feed link. %s is a group nickname.
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
@@ -4834,6 +4822,10 @@ msgstr "Сообщение от %1$s на %2$s"
 msgid "Notice deleted."
 msgstr "Запись удалена."
 
+#, fuzzy
+msgid "Notice"
+msgstr "Записи"
+
 #. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
 #, php-format
 msgid "%1$s tagged %2$s"
@@ -5373,7 +5365,6 @@ msgstr "Нет аргумента ID."
 msgid "Tag %s"
 msgstr "Теги %s"
 
-#. TRANS: H2 for user profile information.
 msgid "User profile"
 msgstr "Профиль пользователя"
 
@@ -6093,6 +6084,49 @@ msgstr ""
 msgid "No AtomPub API service for %s."
 msgstr ""
 
+#. TRANS: H2 for user actions in a profile.
+#. TRANS: H2 for entity actions in a profile.
+msgid "User actions"
+msgstr "Действия пользователя"
+
+#. TRANS: Text shown in user profile of not yet compeltely deleted users.
+msgid "User deletion in progress..."
+msgstr "Идёт удаление пользователя…"
+
+#. TRANS: Link title for link on user profile.
+msgid "Edit profile settings"
+msgstr "Изменение настроек профиля"
+
+#. TRANS: Link text for link on user profile.
+msgid "Edit"
+msgstr "Редактировать"
+
+#. TRANS: Link title for link on user profile.
+msgid "Send a direct message to this user"
+msgstr "Послать приватное сообщение этому пользователю."
+
+#. TRANS: Link text for link on user profile.
+msgid "Message"
+msgstr "Сообщение"
+
+#. TRANS: Label text on user profile to select a user role.
+msgid "Moderate"
+msgstr "Модерировать"
+
+#. TRANS: Label text on user profile to select a user role.
+msgid "User role"
+msgstr "Роль пользователя"
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Administrator"
+msgstr "Администратор"
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Moderator"
+msgstr "Модератор"
+
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
 #, php-format
 msgid "%1$s - %2$s"
@@ -6826,85 +6860,171 @@ msgstr[0] "Вы являетесь участником следующих гр
 msgstr[1] "Вы являетесь участником следующих групп:"
 msgstr[2] "Вы являетесь участником следующих групп:"
 
-#. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-msgid ""
-"Commands:\n"
-"on - turn on notifications\n"
-"off - turn off notifications\n"
-"help - show this help\n"
-"follow <nickname> - subscribe to user\n"
-"groups - lists the groups you have joined\n"
-"subscriptions - list the people you follow\n"
-"subscribers - list the people that follow you\n"
-"leave <nickname> - unsubscribe from user\n"
-"d <nickname> <text> - direct message to user\n"
-"get <nickname> - get last notice from user\n"
-"whois <nickname> - get profile info on user\n"
-"lose <nickname> - force user to stop following you\n"
-"fav <nickname> - add user's last notice as a 'fave'\n"
-"fav #<notice_id> - add notice with the given id as a 'fave'\n"
-"repeat #<notice_id> - repeat a notice with a given id\n"
-"repeat <nickname> - repeat the last notice from user\n"
-"reply #<notice_id> - reply to notice with a given id\n"
-"reply <nickname> - reply to the last notice from user\n"
-"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
-"drop <group> - leave group\n"
-"stats - get your stats\n"
-"stop - same as 'off'\n"
-"quit - same as 'off'\n"
-"sub <nickname> - same as 'follow'\n"
-"unsub <nickname> - same as 'leave'\n"
-"last <nickname> - same as 'get'\n"
-"on <nickname> - not yet implemented.\n"
-"off <nickname> - not yet implemented.\n"
-"nudge <nickname> - remind a user to update.\n"
-"invite <phone number> - not yet implemented.\n"
-"track <word> - not yet implemented.\n"
-"untrack <word> - not yet implemented.\n"
-"track off - not yet implemented.\n"
-"untrack all - not yet implemented.\n"
-"tracks - not yet implemented.\n"
-"tracking - not yet implemented.\n"
+#. TRANS: Header line of help text for commands.
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "Commands:"
+msgstr "Команда исполнена"
+
+#. TRANS: Help message for IM/SMS command "on"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "turn on notifications"
+msgstr "Есть оповещение."
+
+#. TRANS: Help message for IM/SMS command "off"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "turn off notifications"
+msgstr "Нет оповещения."
+
+#. TRANS: Help message for IM/SMS command "help"
+msgctxt "COMMANDHELP"
+msgid "show this help"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "follow <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "subscribe to user"
+msgstr "Подписаться на этого пользователя"
+
+#. TRANS: Help message for IM/SMS command "groups"
+msgctxt "COMMANDHELP"
+msgid "lists the groups you have joined"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscriptions"
+msgctxt "COMMANDHELP"
+msgid "list the people you follow"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscribers"
+msgctxt "COMMANDHELP"
+msgid "list the people that follow you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "leave <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "unsubscribe from user"
+msgstr "Отписаться от этого пользователя"
+
+#. TRANS: Help message for IM/SMS command "d <nickname> <text>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "direct message to user"
+msgstr "Прямые сообщения для %s"
+
+#. TRANS: Help message for IM/SMS command "get <nickname>"
+msgctxt "COMMANDHELP"
+msgid "get last notice from user"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "whois <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "get profile info on user"
+msgstr "Информация профиля"
+
+#. TRANS: Help message for IM/SMS command "lose <nickname>"
+msgctxt "COMMANDHELP"
+msgid "force user to stop following you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav <nickname>"
+msgctxt "COMMANDHELP"
+msgid "add user's last notice as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "add notice with the given id as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "repeat a notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "repeat the last notice from user"
+msgstr "Повторить эту запись"
+
+#. TRANS: Help message for IM/SMS command "reply #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "reply to notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "reply <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "reply to the last notice from user"
+msgstr "Ответить на эту запись"
+
+#. TRANS: Help message for IM/SMS command "join <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "join group"
+msgstr "Неизвестно"
+
+#. TRANS: Help message for IM/SMS command "login"
+msgctxt "COMMANDHELP"
+msgid "Get a link to login to the web interface"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "drop <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "leave group"
+msgstr "Удалить группу"
+
+#. TRANS: Help message for IM/SMS command "stats"
+msgctxt "COMMANDHELP"
+msgid "get your stats"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "stop"
+#. TRANS: Help message for IM/SMS command "quit"
+msgctxt "COMMANDHELP"
+msgid "same as 'off'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "sub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'follow'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "unsub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'leave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "last <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'get'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "on <nickname>"
+#. TRANS: Help message for IM/SMS command "off <nickname>"
+#. TRANS: Help message for IM/SMS command "invite <phone number>"
+#. TRANS: Help message for IM/SMS command "track <word>"
+#. TRANS: Help message for IM/SMS command "untrack <word>"
+#. TRANS: Help message for IM/SMS command "track off"
+#. TRANS: Help message for IM/SMS command "untrack all"
+#. TRANS: Help message for IM/SMS command "tracks"
+#. TRANS: Help message for IM/SMS command "tracking"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "not yet implemented."
+msgstr "Команда ещё не выполнена."
+
+#. TRANS: Help message for IM/SMS command "nudge <nickname>"
+msgctxt "COMMANDHELP"
+msgid "remind a user to update."
 msgstr ""
-"Команды:\n"
-"on — включить уведомления\n"
-"off — отключить уведомления\n"
-"help — показать эту справку\n"
-"follow <nickname> — подписаться на пользователя\n"
-"groups — список групп, к которым вы присоединены\n"
-"subscriptions — список людей, за которыми вы следите\n"
-"subscribers — список людей, следящих на вами\n"
-"leave <nickname> — отписаться от пользователя\n"
-"d <nickname> <text> — прямое сообщение пользователю\n"
-"get <nickname> — получить последнюю запись от пользователя\n"
-"whois <nickname> — получить информацию из профиля пользователя\n"
-"lose <nickname> — отменить подписку пользователя на вас\n"
-"fav <nickname> — добавить последнюю запись пользователя в число любимых\n"
-"fav #<notice_id> — добавить запись с заданным id в число любимых\n"
-"repeat #<notice_id> — повторить уведомление с заданным id\n"
-"repeat <nickname> — повторить последнее уведомление от пользователя\n"
-"reply #<notice_id> — ответить на запись с заданным id\n"
-"reply <nickname> — ответить на последнюю запись пользователя\n"
-"join <group> — присоединиться к группе\n"
-"login — получить ссылку на вход в веб-интрефейсе\n"
-"drop <group> — покинуть группу\n"
-"stats — получить свою статистику\n"
-"stop — то же, что и 'off'\n"
-"quit — то же, что и 'off'\n"
-"sub <nickname> — то же, что и 'follow'\n"
-"unsub <nickname> — то же, что и 'leave'\n"
-"last <nickname> — то же, что и 'get'\n"
-"on <nickname> — пока не реализовано.\n"
-"off <nickname> — пока не реализовано.\n"
-"nudge <nickname> — напомнить пользователю обновиться.\n"
-"invite <phone number> — пока не реализовано.\n"
-"track <word> — пока не реализовано.\n"
-"untrack <word> — пока не реализовано.\n"
-"track off — пока не реализовано.\n"
-"untrack all — пока не реализовано.\n"
-"tracks — пока не реализовано.\n"
-"tracking — пока не реализовано.\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 msgid "No configuration file found."
@@ -7083,6 +7203,9 @@ msgstr ""
 "Местонахождение группы, если есть, например «Город, область (или регион), "
 "страна»."
 
+msgid "Aliases"
+msgstr "Алиасы"
+
 #, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -7167,6 +7290,10 @@ msgctxt "TOOLTIP"
 msgid "Add or edit %s design"
 msgstr "Добавить или изменить оформление %s"
 
+#. TRANS: Group actions header (h2). Text hidden by default.
+msgid "Group actions"
+msgstr "Действия группы"
+
 #. TRANS: Title for groups with the most members section.
 msgid "Groups with most members"
 msgstr "Группы с наибольшим количеством участников"
@@ -7234,7 +7361,7 @@ msgid "%dB"
 msgid_plural "%dB"
 msgstr[0] "%dБ"
 msgstr[1] "%dБ"
-msgstr[2] ""
+msgstr[2] "%dБ"
 
 #, php-format
 msgid ""
@@ -7739,6 +7866,7 @@ msgstr "Послать запись"
 msgid "What's up, %s?"
 msgstr "Что нового, %s?"
 
+#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr "Прикрепить"
 
@@ -8201,52 +8329,6 @@ msgstr "Отписаться"
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "У пользователя %1$s (%2$d) нет записи профиля."
 
-msgid "Edit Avatar"
-msgstr "Изменить аватару"
-
-#. TRANS: H2 for user actions in a profile.
-#. TRANS: H2 for entity actions in a profile.
-msgid "User actions"
-msgstr "Действия пользователя"
-
-#. TRANS: Text shown in user profile of not yet compeltely deleted users.
-msgid "User deletion in progress..."
-msgstr "Идёт удаление пользователя…"
-
-#. TRANS: Link title for link on user profile.
-msgid "Edit profile settings"
-msgstr "Изменение настроек профиля"
-
-#. TRANS: Link text for link on user profile.
-msgid "Edit"
-msgstr "Редактировать"
-
-#. TRANS: Link title for link on user profile.
-msgid "Send a direct message to this user"
-msgstr "Послать приватное сообщение этому пользователю."
-
-#. TRANS: Link text for link on user profile.
-msgid "Message"
-msgstr "Сообщение"
-
-#. TRANS: Label text on user profile to select a user role.
-msgid "Moderate"
-msgstr "Модерировать"
-
-#. TRANS: Label text on user profile to select a user role.
-msgid "User role"
-msgstr "Роль пользователя"
-
-#. TRANS: Role that can be set for a user profile.
-msgctxt "role"
-msgid "Administrator"
-msgstr "Администратор"
-
-#. TRANS: Role that can be set for a user profile.
-msgctxt "role"
-msgid "Moderator"
-msgstr "Модератор"
-
 #, fuzzy
 msgid "Not allowed to log in."
 msgstr "Не авторизован."
@@ -8327,3 +8409,88 @@ msgstr "Неверный XML, отсутствует корень XRD."
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr "Получение резервной копии из файла «%s»."
+
+#~ msgid "Note"
+#~ msgstr "Запись"
+
+#~ msgid ""
+#~ "Commands:\n"
+#~ "on - turn on notifications\n"
+#~ "off - turn off notifications\n"
+#~ "help - show this help\n"
+#~ "follow <nickname> - subscribe to user\n"
+#~ "groups - lists the groups you have joined\n"
+#~ "subscriptions - list the people you follow\n"
+#~ "subscribers - list the people that follow you\n"
+#~ "leave <nickname> - unsubscribe from user\n"
+#~ "d <nickname> <text> - direct message to user\n"
+#~ "get <nickname> - get last notice from user\n"
+#~ "whois <nickname> - get profile info on user\n"
+#~ "lose <nickname> - force user to stop following you\n"
+#~ "fav <nickname> - add user's last notice as a 'fave'\n"
+#~ "fav #<notice_id> - add notice with the given id as a 'fave'\n"
+#~ "repeat #<notice_id> - repeat a notice with a given id\n"
+#~ "repeat <nickname> - repeat the last notice from user\n"
+#~ "reply #<notice_id> - reply to notice with a given id\n"
+#~ "reply <nickname> - reply to the last notice from user\n"
+#~ "join <group> - join group\n"
+#~ "login - Get a link to login to the web interface\n"
+#~ "drop <group> - leave group\n"
+#~ "stats - get your stats\n"
+#~ "stop - same as 'off'\n"
+#~ "quit - same as 'off'\n"
+#~ "sub <nickname> - same as 'follow'\n"
+#~ "unsub <nickname> - same as 'leave'\n"
+#~ "last <nickname> - same as 'get'\n"
+#~ "on <nickname> - not yet implemented.\n"
+#~ "off <nickname> - not yet implemented.\n"
+#~ "nudge <nickname> - remind a user to update.\n"
+#~ "invite <phone number> - not yet implemented.\n"
+#~ "track <word> - not yet implemented.\n"
+#~ "untrack <word> - not yet implemented.\n"
+#~ "track off - not yet implemented.\n"
+#~ "untrack all - not yet implemented.\n"
+#~ "tracks - not yet implemented.\n"
+#~ "tracking - not yet implemented.\n"
+#~ msgstr ""
+#~ "Команды:\n"
+#~ "on — включить уведомления\n"
+#~ "off — отключить уведомления\n"
+#~ "help — показать эту справку\n"
+#~ "follow <nickname> — подписаться на пользователя\n"
+#~ "groups — список групп, к которым вы присоединены\n"
+#~ "subscriptions — список людей, за которыми вы следите\n"
+#~ "subscribers — список людей, следящих на вами\n"
+#~ "leave <nickname> — отписаться от пользователя\n"
+#~ "d <nickname> <text> — прямое сообщение пользователю\n"
+#~ "get <nickname> — получить последнюю запись от пользователя\n"
+#~ "whois <nickname> — получить информацию из профиля пользователя\n"
+#~ "lose <nickname> — отменить подписку пользователя на вас\n"
+#~ "fav <nickname> — добавить последнюю запись пользователя в число любимых\n"
+#~ "fav #<notice_id> — добавить запись с заданным id в число любимых\n"
+#~ "repeat #<notice_id> — повторить уведомление с заданным id\n"
+#~ "repeat <nickname> — повторить последнее уведомление от пользователя\n"
+#~ "reply #<notice_id> — ответить на запись с заданным id\n"
+#~ "reply <nickname> — ответить на последнюю запись пользователя\n"
+#~ "join <group> — присоединиться к группе\n"
+#~ "login — получить ссылку на вход в веб-интрефейсе\n"
+#~ "drop <group> — покинуть группу\n"
+#~ "stats — получить свою статистику\n"
+#~ "stop — то же, что и 'off'\n"
+#~ "quit — то же, что и 'off'\n"
+#~ "sub <nickname> — то же, что и 'follow'\n"
+#~ "unsub <nickname> — то же, что и 'leave'\n"
+#~ "last <nickname> — то же, что и 'get'\n"
+#~ "on <nickname> — пока не реализовано.\n"
+#~ "off <nickname> — пока не реализовано.\n"
+#~ "nudge <nickname> — напомнить пользователю обновиться.\n"
+#~ "invite <phone number> — пока не реализовано.\n"
+#~ "track <word> — пока не реализовано.\n"
+#~ "untrack <word> — пока не реализовано.\n"
+#~ "track off — пока не реализовано.\n"
+#~ "untrack all — пока не реализовано.\n"
+#~ "tracks — пока не реализовано.\n"
+#~ "tracking — пока не реализовано.\n"
+
+#~ msgid "Edit Avatar"
+#~ msgstr "Изменить аватару"
diff --git a/locale/statusnet.pot b/locale/statusnet.pot
index 8ffd6aab4d..ad93b2765c 100644
--- a/locale/statusnet.pot
+++ b/locale/statusnet.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-11 18:15+0000\n"
+"POT-Creation-Date: 2011-03-17 09:47+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -176,7 +176,7 @@ msgstr ""
 #. TRANS: Timeline title for user and friends. %s is a user nickname.
 #: actions/all.php:94 actions/all.php:185 actions/allrss.php:117
 #: actions/apitimelinefriends.php:207 actions/apitimelinehome.php:113
-#: lib/adminpanelnav.php:70 lib/personalgroupnav.php:72 lib/settingsnav.php:71
+#: lib/adminpanelnav.php:70 lib/personalgroupnav.php:75 lib/settingsnav.php:71
 #, php-format
 msgid "%s and friends"
 msgstr ""
@@ -228,7 +228,7 @@ msgstr ""
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
 #. TRANS: Second sentence of empty message for anonymous users. %s is a user nickname.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/all.php:149 actions/replies.php:198 actions/showstream.php:221
+#: actions/all.php:149 actions/replies.php:198 actions/showstream.php:219
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -759,7 +759,7 @@ msgstr ""
 msgid "%s's groups"
 msgstr ""
 
-#. TRANS: Used as subtitle in check for group membership. %1$s is a user name, %2$s is the site name.
+#. TRANS: Used as subtitle in check for group membership. %1$s is the site name, %2$s is a user name.
 #: actions/apigrouplist.php:104
 #, php-format
 msgid "%1$s groups %2$s is a member of."
@@ -1028,7 +1028,7 @@ msgstr ""
 #. TRANS: Error message displayed trying to delete a non-existing notice.
 #: actions/apistatusesretweet.php:74 actions/apistatusesretweets.php:70
 #: actions/atompubshowfavorite.php:82 actions/deletenotice.php:61
-#: actions/shownotice.php:92
+#: actions/shownotice.php:95
 msgid "No such notice."
 msgstr ""
 
@@ -1230,39 +1230,39 @@ msgid "Atom post must not be empty."
 msgstr ""
 
 #. TRANS: Client error displayed attempting to post an API that is not well-formed XML.
-#: actions/apitimelineuser.php:328
+#: actions/apitimelineuser.php:331
 msgid "Atom post must be well-formed XML."
 msgstr ""
 
 #. TRANS: Client error displayed when not using an Atom entry.
-#: actions/apitimelineuser.php:334 actions/atompubfavoritefeed.php:228
+#: actions/apitimelineuser.php:337 actions/atompubfavoritefeed.php:228
 #: actions/atompubmembershipfeed.php:230
 #: actions/atompubsubscriptionfeed.php:236
 msgid "Atom post must be an Atom entry."
 msgstr ""
 
 #. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
-#: actions/apitimelineuser.php:345
+#: actions/apitimelineuser.php:348
 msgid "Can only handle POST activities."
 msgstr ""
 
 #. TRANS: Client error displayed when using an unsupported activity object type.
 #. TRANS: %s is the unsupported activity object type.
-#: actions/apitimelineuser.php:356
+#: actions/apitimelineuser.php:359
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
 #. TRANS: %d is the notice ID (number).
-#: actions/apitimelineuser.php:390
+#: actions/apitimelineuser.php:393
 #, php-format
 msgid "No content for notice %d."
 msgstr ""
 
 #. TRANS: Client error displayed when using another format than AtomPub.
 #. TRANS: %s is the notice URI.
-#: actions/apitimelineuser.php:419
+#: actions/apitimelineuser.php:422
 #, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr ""
@@ -1902,7 +1902,7 @@ msgstr ""
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
 #: actions/newapplication.php:112 actions/showapplication.php:113
-#: lib/action.php:1409
+#: lib/action.php:1448
 msgid "There was a problem with your session token."
 msgstr ""
 
@@ -2679,7 +2679,7 @@ msgstr ""
 #. TRANS: Title for first page of favourite notices of a user.
 #. TRANS: %s is the user for whom the favourite notices are displayed.
 #: actions/favoritesrss.php:111 actions/showfavorites.php:76
-#: lib/personalgroupnav.php:88
+#: lib/personalgroupnav.php:91
 #, php-format
 msgid "%s's favorite notices"
 msgstr ""
@@ -3757,7 +3757,7 @@ msgstr ""
 
 #. TRANS: Page title after an AJAX error occurred on the "send direct message" page.
 #. TRANS: Page title after an AJAX error occurs on the send notice page.
-#: actions/newmessage.php:227 actions/newnotice.php:264
+#: actions/newmessage.php:227 actions/newnotice.php:264 lib/error.php:117
 msgid "Ajax Error"
 msgstr ""
 
@@ -3922,12 +3922,12 @@ msgid "Notice %s not found."
 msgstr ""
 
 #. TRANS: Server error displayed in oEmbed action when notice has not profile.
-#: actions/oembed.php:85 actions/shownotice.php:100
+#: actions/oembed.php:85 actions/shownotice.php:103
 msgid "Notice has no profile."
 msgstr ""
 
 #. TRANS: oEmbed title. %1$s is the author name, %2$s is the creation date.
-#: actions/oembed.php:89 actions/shownotice.php:172
+#: actions/oembed.php:89 actions/shownotice.php:175
 #, php-format
 msgid "%1$s's status on %2$s"
 msgstr ""
@@ -5080,8 +5080,8 @@ msgid "URL of your profile on another compatible microblogging service."
 msgstr ""
 
 #. TRANS: Link text for link that will subscribe to a remote profile.
-#: actions/remotesubscribe.php:136 lib/subscribeform.php:139
-#: lib/userprofile.php:406
+#: actions/remotesubscribe.php:136 lib/accountprofileblock.php:288
+#: lib/subscribeform.php:139
 msgid "Subscribe"
 msgstr ""
 
@@ -5127,7 +5127,7 @@ msgstr ""
 
 #. TRANS: RSS reply feed title. %s is a user nickname.
 #: actions/replies.php:126 actions/repliesrss.php:68
-#: lib/personalgroupnav.php:83
+#: lib/personalgroupnav.php:86
 #, php-format
 msgid "Replies to %s"
 msgstr ""
@@ -5437,47 +5437,32 @@ msgstr ""
 msgid "%1$s group, page %2$d"
 msgstr ""
 
-#. TRANS: Label for group description or group note (dt). Text hidden by default.
-#: actions/showgroup.php:266
-msgid "Note"
-msgstr ""
-
-#. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:277 lib/groupeditform.php:180
-msgid "Aliases"
-msgstr ""
-
-#. TRANS: Group actions header (h2). Text hidden by default.
-#: actions/showgroup.php:294
-msgid "Group actions"
-msgstr ""
-
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:338
+#: actions/showgroup.php:221
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
 msgstr ""
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:345
+#: actions/showgroup.php:228
 #, php-format
 msgid "Notice feed for %s group (RSS 2.0)"
 msgstr ""
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:352
+#: actions/showgroup.php:235
 #, php-format
 msgid "Notice feed for %s group (Atom)"
 msgstr ""
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:358
+#: actions/showgroup.php:241
 #, php-format
 msgid "FOAF for %s group"
 msgstr ""
 
 #. TRANS: Header for mini list of group members on a group page (h2).
-#: actions/showgroup.php:395
+#: actions/showgroup.php:278
 msgid "Members"
 msgstr ""
 
@@ -5485,30 +5470,30 @@ msgstr ""
 #. TRANS: Text for user subscription statistics if the user has no subscriptions.
 #. TRANS: Text for user subscriber statistics if user has no subscribers.
 #. TRANS: Text for user user group membership statistics if user is not a member of any group.
-#: actions/showgroup.php:401 lib/profileaction.php:137
+#: actions/showgroup.php:284 lib/profileaction.php:137
 #: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
 #: lib/subscriptionlist.php:123 lib/tagcloudsection.php:71
 msgid "(None)"
 msgstr ""
 
 #. TRANS: Link to all group members from mini list of group members if group has more than n members.
-#: actions/showgroup.php:410
+#: actions/showgroup.php:293
 msgid "All members"
 msgstr ""
 
 #. TRANS: Header for group statistics on a group page (h2).
 #. TRANS: H2 text for user statistics.
-#: actions/showgroup.php:441 lib/profileaction.php:205
+#: actions/showgroup.php:324 lib/profileaction.php:205
 msgid "Statistics"
 msgstr ""
 
-#: actions/showgroup.php:444
+#: actions/showgroup.php:327
 msgctxt "LABEL"
 msgid "Created"
 msgstr ""
 
 #. TRANS: Label for member count in statistics on group page.
-#: actions/showgroup.php:449
+#: actions/showgroup.php:332
 msgctxt "LABEL"
 msgid "Members"
 msgstr ""
@@ -5517,7 +5502,7 @@ msgstr ""
 #. TRANS: **%s** is the group alias, %%%%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).
-#: actions/showgroup.php:464
+#: actions/showgroup.php:347
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5530,7 +5515,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: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
-#: actions/showgroup.php:474
+#: actions/showgroup.php:357
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5540,7 +5525,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: Header for list of group administrators on a group page (h2).
-#: actions/showgroup.php:503
+#: actions/showgroup.php:386
 msgid "Admins"
 msgstr ""
 
@@ -5568,71 +5553,75 @@ msgstr ""
 msgid "Message from %1$s on %2$s"
 msgstr ""
 
-#: actions/shownotice.php:90
+#: actions/shownotice.php:93
 msgid "Notice deleted."
 msgstr ""
 
+#: actions/shownotice.php:248
+msgid "Notice"
+msgstr ""
+
 #. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
-#: actions/showstream.php:70
+#: actions/showstream.php:69
 #, php-format
 msgid "%1$s tagged %2$s"
 msgstr ""
 
 #. TRANS: Page title showing tagged notices in one user's stream.
 #. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
-#: actions/showstream.php:74
+#: actions/showstream.php:73
 #, php-format
 msgid "%1$s tagged %2$s, page %3$d"
 msgstr ""
 
 #. TRANS: Extended page title showing tagged notices in one user's stream.
 #. TRANS: %1$s is the username, %2$d is the page number.
-#: actions/showstream.php:82
+#: actions/showstream.php:81
 #, php-format
 msgid "%1$s, page %2$d"
 msgstr ""
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %1$s is a user nickname, %2$s is a hashtag.
-#: actions/showstream.php:127
+#: actions/showstream.php:131
 #, php-format
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
 msgstr ""
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.
-#: actions/showstream.php:136
+#: actions/showstream.php:140
 #, php-format
 msgid "Notice feed for %s (RSS 1.0)"
 msgstr ""
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.
-#: actions/showstream.php:145
+#: actions/showstream.php:149
 #, php-format
 msgid "Notice feed for %s (RSS 2.0)"
 msgstr ""
 
-#: actions/showstream.php:152
+#: actions/showstream.php:156
 #, php-format
 msgid "Notice feed for %s (Atom)"
 msgstr ""
 
 #. TRANS: Title for link to notice feed. FOAF stands for Friend of a Friend.
 #. TRANS: More information at http://www.foaf-project.org. %s is a user nickname.
-#: actions/showstream.php:159
+#: actions/showstream.php:163
 #, php-format
 msgid "FOAF for %s"
 msgstr ""
 
 #. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
-#: actions/showstream.php:205
+#: actions/showstream.php:203
 #, php-format
 msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr ""
 
 #. TRANS: Second sentence of empty list message for a stream for the user themselves.
-#: actions/showstream.php:211
+#: actions/showstream.php:209
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
@@ -5640,7 +5629,7 @@ msgstr ""
 
 #. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:215
+#: actions/showstream.php:213
 #, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
@@ -5649,7 +5638,7 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:258
+#: actions/showstream.php:256
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5660,7 +5649,7 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:265
+#: actions/showstream.php:263
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5669,7 +5658,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
-#: actions/showstream.php:322
+#: actions/showstream.php:327
 #, php-format
 msgid "Repeat of %s"
 msgstr ""
@@ -6183,8 +6172,7 @@ msgstr ""
 msgid "Tag %s"
 msgstr ""
 
-#. TRANS: H2 for user profile information.
-#: actions/tagother.php:77 lib/userprofile.php:76
+#: actions/tagother.php:77
 msgid "User profile"
 msgstr ""
 
@@ -6339,7 +6327,7 @@ msgstr ""
 msgid "Invalid default subscripton: \"%1$s\" is not a user."
 msgstr ""
 
-#: actions/useradminpanel.php:215 lib/personalgroupnav.php:76
+#: actions/useradminpanel.php:215 lib/personalgroupnav.php:79
 #: lib/settingsnav.php:83 lib/subgroupnav.php:79
 msgid "Profile"
 msgstr ""
@@ -6834,25 +6822,25 @@ msgid "Problem saving notice."
 msgstr ""
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:937
+#: classes/Notice.php:944
 msgid "Bad type provided to saveKnownGroups."
 msgstr ""
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:1036
+#: classes/Notice.php:1043
 msgid "Problem saving group inbox."
 msgstr ""
 
 #. TRANS: Server exception thrown when a reply cannot be saved.
 #. TRANS: %1$d is a notice ID, %2$d is the ID of the mentioned user.
-#: classes/Notice.php:1152
+#: classes/Notice.php:1159
 #, php-format
 msgid "Could not save reply for %1$d, %2$d."
 msgstr ""
 
 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1671
+#: classes/Notice.php:1678
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr ""
@@ -6993,35 +6981,88 @@ msgstr ""
 msgid "No AtomPub API service for %s."
 msgstr ""
 
+#. TRANS: H2 for user actions in a profile.
+#. TRANS: H2 for entity actions in a profile.
+#: lib/accountprofileblock.php:103 lib/accountprofileblock.php:118
+msgid "User actions"
+msgstr ""
+
+#. TRANS: Text shown in user profile of not yet compeltely deleted users.
+#: lib/accountprofileblock.php:107
+msgid "User deletion in progress..."
+msgstr ""
+
+#. TRANS: Link title for link on user profile.
+#: lib/accountprofileblock.php:134
+msgid "Edit profile settings"
+msgstr ""
+
+#. TRANS: Link text for link on user profile.
+#: lib/accountprofileblock.php:136
+msgid "Edit"
+msgstr ""
+
+#. TRANS: Link title for link on user profile.
+#: lib/accountprofileblock.php:160
+msgid "Send a direct message to this user"
+msgstr ""
+
+#. TRANS: Link text for link on user profile.
+#: lib/accountprofileblock.php:162
+msgid "Message"
+msgstr ""
+
+#. TRANS: Label text on user profile to select a user role.
+#: lib/accountprofileblock.php:204
+msgid "Moderate"
+msgstr ""
+
+#. TRANS: Label text on user profile to select a user role.
+#: lib/accountprofileblock.php:243
+msgid "User role"
+msgstr ""
+
+#. TRANS: Role that can be set for a user profile.
+#: lib/accountprofileblock.php:246
+msgctxt "role"
+msgid "Administrator"
+msgstr ""
+
+#. TRANS: Role that can be set for a user profile.
+#: lib/accountprofileblock.php:248
+msgctxt "role"
+msgid "Moderator"
+msgstr ""
+
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: lib/action.php:161
+#: lib/action.php:166
 #, php-format
 msgid "%1$s - %2$s"
 msgstr ""
 
 #. TRANS: Page title for a page without a title set.
-#: lib/action.php:177
+#: lib/action.php:182
 msgid "Untitled page"
 msgstr ""
 
 #. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.
-#: lib/action.php:338
+#: lib/action.php:355
 msgctxt "TOOLTIP"
 msgid "Show more"
 msgstr ""
 
 #. TRANS: Inline reply form submit button: submits a reply comment.
-#: lib/action.php:341
+#: lib/action.php:358
 msgctxt "BUTTON"
 msgid "Reply"
 msgstr ""
 
 #. TRANS: Placeholder text for inline reply form. Clicking in this box will turn it into a mini notice form.
-#: lib/action.php:344
+#: lib/action.php:361 lib/threadednoticelist.php:317
 msgid "Write a reply..."
 msgstr ""
 
-#: lib/action.php:590
+#: lib/action.php:607
 msgid "Status"
 msgstr ""
 
@@ -7029,7 +7070,7 @@ msgstr ""
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:939
+#: lib/action.php:978
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7037,7 +7078,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:942
+#: lib/action.php:981
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr ""
@@ -7046,7 +7087,7 @@ msgstr ""
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:949
+#: lib/action.php:988
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7056,39 +7097,39 @@ msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:967
+#: lib/action.php:1006
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:974
+#: lib/action.php:1013
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:978
+#: lib/action.php:1017
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:1010
+#: lib/action.php:1049
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1353
+#: lib/action.php:1392
 msgid "After"
 msgstr ""
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1363
+#: lib/action.php:1402
 msgid "Before"
 msgstr ""
 
@@ -7211,7 +7252,7 @@ msgid "Unable to delete design setting."
 msgstr ""
 
 #: lib/adminpanelnav.php:65 lib/adminpanelnav.php:69
-#: lib/defaultlocalnav.php:58 lib/personalgroupnav.php:71
+#: lib/defaultlocalnav.php:58 lib/personalgroupnav.php:74
 #: lib/settingsnav.php:66 lib/settingsnav.php:70
 msgid "Home"
 msgstr ""
@@ -7245,7 +7286,7 @@ msgid "User configuration"
 msgstr ""
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelnav.php:102 lib/personalgroupnav.php:88
+#: lib/adminpanelnav.php:102 lib/personalgroupnav.php:91
 msgid "User"
 msgstr ""
 
@@ -7833,47 +7874,189 @@ msgid_plural "You are a member of these groups:"
 msgstr[0] ""
 msgstr[1] ""
 
-#. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-#: lib/command.php:916
-msgid ""
-"Commands:\n"
-"on - turn on notifications\n"
-"off - turn off notifications\n"
-"help - show this help\n"
-"follow <nickname> - subscribe to user\n"
-"groups - lists the groups you have joined\n"
-"subscriptions - list the people you follow\n"
-"subscribers - list the people that follow you\n"
-"leave <nickname> - unsubscribe from user\n"
-"d <nickname> <text> - direct message to user\n"
-"get <nickname> - get last notice from user\n"
-"whois <nickname> - get profile info on user\n"
-"lose <nickname> - force user to stop following you\n"
-"fav <nickname> - add user's last notice as a 'fave'\n"
-"fav #<notice_id> - add notice with the given id as a 'fave'\n"
-"repeat #<notice_id> - repeat a notice with a given id\n"
-"repeat <nickname> - repeat the last notice from user\n"
-"reply #<notice_id> - reply to notice with a given id\n"
-"reply <nickname> - reply to the last notice from user\n"
-"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
-"drop <group> - leave group\n"
-"stats - get your stats\n"
-"stop - same as 'off'\n"
-"quit - same as 'off'\n"
-"sub <nickname> - same as 'follow'\n"
-"unsub <nickname> - same as 'leave'\n"
-"last <nickname> - same as 'get'\n"
-"on <nickname> - not yet implemented.\n"
-"off <nickname> - not yet implemented.\n"
-"nudge <nickname> - remind a user to update.\n"
-"invite <phone number> - not yet implemented.\n"
-"track <word> - not yet implemented.\n"
-"untrack <word> - not yet implemented.\n"
-"track off - not yet implemented.\n"
-"untrack all - not yet implemented.\n"
-"tracks - not yet implemented.\n"
-"tracking - not yet implemented.\n"
+#. TRANS: Header line of help text for commands.
+#: lib/command.php:915
+msgctxt "COMMANDHELP"
+msgid "Commands:"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "on"
+#: lib/command.php:917
+msgctxt "COMMANDHELP"
+msgid "turn on notifications"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "off"
+#: lib/command.php:919
+msgctxt "COMMANDHELP"
+msgid "turn off notifications"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "help"
+#: lib/command.php:921
+msgctxt "COMMANDHELP"
+msgid "show this help"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "follow <nickname>"
+#: lib/command.php:923
+msgctxt "COMMANDHELP"
+msgid "subscribe to user"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "groups"
+#: lib/command.php:925
+msgctxt "COMMANDHELP"
+msgid "lists the groups you have joined"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscriptions"
+#: lib/command.php:927
+msgctxt "COMMANDHELP"
+msgid "list the people you follow"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscribers"
+#: lib/command.php:929
+msgctxt "COMMANDHELP"
+msgid "list the people that follow you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "leave <nickname>"
+#: lib/command.php:931
+msgctxt "COMMANDHELP"
+msgid "unsubscribe from user"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "d <nickname> <text>"
+#: lib/command.php:933
+msgctxt "COMMANDHELP"
+msgid "direct message to user"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "get <nickname>"
+#: lib/command.php:935
+msgctxt "COMMANDHELP"
+msgid "get last notice from user"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "whois <nickname>"
+#: lib/command.php:937
+msgctxt "COMMANDHELP"
+msgid "get profile info on user"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "lose <nickname>"
+#: lib/command.php:939
+msgctxt "COMMANDHELP"
+msgid "force user to stop following you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav <nickname>"
+#: lib/command.php:941
+msgctxt "COMMANDHELP"
+msgid "add user's last notice as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav #<notice_id>"
+#: lib/command.php:943
+msgctxt "COMMANDHELP"
+msgid "add notice with the given id as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat #<notice_id>"
+#: lib/command.php:945
+msgctxt "COMMANDHELP"
+msgid "repeat a notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat <nickname>"
+#: lib/command.php:947
+msgctxt "COMMANDHELP"
+msgid "repeat the last notice from user"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "reply #<notice_id>"
+#: lib/command.php:949
+msgctxt "COMMANDHELP"
+msgid "reply to notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "reply <nickname>"
+#: lib/command.php:951
+msgctxt "COMMANDHELP"
+msgid "reply to the last notice from user"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "join <group>"
+#: lib/command.php:953
+msgctxt "COMMANDHELP"
+msgid "join group"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "login"
+#: lib/command.php:955
+msgctxt "COMMANDHELP"
+msgid "Get a link to login to the web interface"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "drop <group>"
+#: lib/command.php:957
+msgctxt "COMMANDHELP"
+msgid "leave group"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "stats"
+#: lib/command.php:959
+msgctxt "COMMANDHELP"
+msgid "get your stats"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "stop"
+#. TRANS: Help message for IM/SMS command "quit"
+#: lib/command.php:961 lib/command.php:963
+msgctxt "COMMANDHELP"
+msgid "same as 'off'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "sub <nickname>"
+#: lib/command.php:965
+msgctxt "COMMANDHELP"
+msgid "same as 'follow'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "unsub <nickname>"
+#: lib/command.php:967
+msgctxt "COMMANDHELP"
+msgid "same as 'leave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "last <nickname>"
+#: lib/command.php:969
+msgctxt "COMMANDHELP"
+msgid "same as 'get'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "on <nickname>"
+#. TRANS: Help message for IM/SMS command "off <nickname>"
+#. TRANS: Help message for IM/SMS command "invite <phone number>"
+#. TRANS: Help message for IM/SMS command "track <word>"
+#. TRANS: Help message for IM/SMS command "untrack <word>"
+#. TRANS: Help message for IM/SMS command "track off"
+#. TRANS: Help message for IM/SMS command "untrack all"
+#. TRANS: Help message for IM/SMS command "tracks"
+#. TRANS: Help message for IM/SMS command "tracking"
+#: lib/command.php:971 lib/command.php:973 lib/command.php:977
+#: lib/command.php:979 lib/command.php:981 lib/command.php:983
+#: lib/command.php:985 lib/command.php:987 lib/command.php:989
+msgctxt "COMMANDHELP"
+msgid "not yet implemented."
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "nudge <nickname>"
+#: lib/command.php:975
+msgctxt "COMMANDHELP"
+msgid "remind a user to update."
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
@@ -8087,6 +8270,10 @@ msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\"."
 msgstr ""
 
+#: lib/groupeditform.php:180
+msgid "Aliases"
+msgstr ""
+
 #: lib/groupeditform.php:183
 #, php-format
 msgid ""
@@ -8176,6 +8363,11 @@ msgctxt "TOOLTIP"
 msgid "Add or edit %s design"
 msgstr ""
 
+#. TRANS: Group actions header (h2). Text hidden by default.
+#: lib/groupprofileblock.php:94
+msgid "Group actions"
+msgstr ""
+
 #. TRANS: Title for groups with the most members section.
 #: lib/groupsbymemberssection.php:71
 msgid "Groups with most members"
@@ -8563,7 +8755,7 @@ msgstr ""
 msgid "Inbox"
 msgstr ""
 
-#: lib/mailboxmenu.php:60 lib/personalgroupnav.php:99
+#: lib/mailboxmenu.php:60 lib/personalgroupnav.php:102
 msgid "Your incoming messages"
 msgstr ""
 
@@ -8658,7 +8850,7 @@ msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr ""
 
-#: lib/messagelist.php:77 lib/personalgroupnav.php:98
+#: lib/messagelist.php:77 lib/personalgroupnav.php:101
 msgid "Messages"
 msgstr ""
 
@@ -8666,19 +8858,19 @@ msgstr ""
 msgid "from"
 msgstr ""
 
-#: lib/microappplugin.php:302
+#: lib/microappplugin.php:340
 msgid "Can't get author for activity."
 msgstr ""
 
-#: lib/microappplugin.php:339
+#: lib/microappplugin.php:377
 msgid "Bookmark not posted to this group."
 msgstr ""
 
-#: lib/microappplugin.php:352
+#: lib/microappplugin.php:390
 msgid "Object not posted to this user."
 msgstr ""
 
-#: lib/microappplugin.php:356
+#: lib/microappplugin.php:394
 msgid "Don't know how to handle this kind of target."
 msgstr ""
 
@@ -8827,15 +9019,15 @@ msgstr ""
 msgid "Couldn't insert new subscription."
 msgstr ""
 
-#: lib/personalgroupnav.php:77
+#: lib/personalgroupnav.php:80
 msgid "Your profile"
 msgstr ""
 
-#: lib/personalgroupnav.php:82
+#: lib/personalgroupnav.php:85
 msgid "Replies"
 msgstr ""
 
-#: lib/personalgroupnav.php:87
+#: lib/personalgroupnav.php:90
 msgid "Favorites"
 msgstr ""
 
@@ -9234,7 +9426,7 @@ msgstr ""
 msgid "Error opening theme archive."
 msgstr ""
 
-#: lib/threadednoticelist.php:270
+#: lib/threadednoticelist.php:273
 #, php-format
 msgid "Show %d reply"
 msgid_plural "Show all %d replies"
@@ -9282,79 +9474,22 @@ msgstr ""
 msgid "User %1$s (%2$d) has no profile record."
 msgstr ""
 
-#: lib/userprofile.php:118
-msgid "Edit Avatar"
-msgstr ""
-
-#. TRANS: H2 for user actions in a profile.
-#. TRANS: H2 for entity actions in a profile.
-#: lib/userprofile.php:220 lib/userprofile.php:236
-msgid "User actions"
-msgstr ""
-
-#. TRANS: Text shown in user profile of not yet compeltely deleted users.
-#: lib/userprofile.php:224
-msgid "User deletion in progress..."
-msgstr ""
-
-#. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:252
-msgid "Edit profile settings"
-msgstr ""
-
-#. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:254
-msgid "Edit"
-msgstr ""
-
-#. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:278
-msgid "Send a direct message to this user"
-msgstr ""
-
-#. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:280
-msgid "Message"
-msgstr ""
-
-#. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:322
-msgid "Moderate"
-msgstr ""
-
-#. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:361
-msgid "User role"
-msgstr ""
-
-#. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:364
-msgctxt "role"
-msgid "Administrator"
-msgstr ""
-
-#. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:366
-msgctxt "role"
-msgid "Moderator"
-msgstr ""
-
 #: lib/util.php:321
 msgid "Not allowed to log in."
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1337
+#: lib/util.php:1331
 msgid "a few seconds ago"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1340
+#: lib/util.php:1334
 msgid "about a minute ago"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1344
+#: lib/util.php:1338
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
@@ -9362,12 +9497,12 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1347
+#: lib/util.php:1341
 msgid "about an hour ago"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1351
+#: lib/util.php:1345
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
@@ -9375,12 +9510,12 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1354
+#: lib/util.php:1348
 msgid "about a day ago"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1358
+#: lib/util.php:1352
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
@@ -9388,12 +9523,12 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1361
+#: lib/util.php:1355
 msgid "about a month ago"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1365
+#: lib/util.php:1359
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
@@ -9401,7 +9536,7 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1368
+#: lib/util.php:1362
 msgid "about a year ago"
 msgstr ""
 
diff --git a/locale/sv/LC_MESSAGES/statusnet.po b/locale/sv/LC_MESSAGES/statusnet.po
index 8550a1fdd8..289b4b09f7 100644
--- a/locale/sv/LC_MESSAGES/statusnet.po
+++ b/locale/sv/LC_MESSAGES/statusnet.po
@@ -13,17 +13,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-11 18:15+0000\n"
-"PO-Revision-Date: 2011-03-11 18:17:27+0000\n"
+"POT-Creation-Date: 2011-03-17 09:47+0000\n"
+"PO-Revision-Date: 2011-03-17 09:49:57+0000\n"
 "Language-Team: Swedish <http://translatewiki.net/wiki/Portal:sv>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83703); Translate extension (2011-03-11)\n"
+"X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: sv\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-03-08 01:25:01+0000\n"
+"X-POT-Import-Date: 2011-03-11 18:52:41+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -592,7 +592,7 @@ msgstr "Kunde inte ta bort användare %1$s från grupp %2$s."
 msgid "%s's groups"
 msgstr "%ss grupper"
 
-#. TRANS: Used as subtitle in check for group membership. %1$s is a user name, %2$s is the site name.
+#. TRANS: Used as subtitle in check for group membership. %1$s is the site name, %2$s is a user name.
 #, php-format
 msgid "%1$s groups %2$s is a member of."
 msgstr "%1$s grupper %2$s är en medlem i."
@@ -4691,18 +4691,6 @@ msgstr "%s grupp"
 msgid "%1$s group, page %2$d"
 msgstr "%1$s grupp, sida %2$d"
 
-#. TRANS: Label for group description or group note (dt). Text hidden by default.
-msgid "Note"
-msgstr "Notis"
-
-#. TRANS: Label for group aliases (dt). Text hidden by default.
-msgid "Aliases"
-msgstr "Alias"
-
-#. TRANS: Group actions header (h2). Text hidden by default.
-msgid "Group actions"
-msgstr "Åtgärder för grupp"
-
 #. TRANS: Tooltip for feed link. %s is a group nickname.
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
@@ -4812,6 +4800,10 @@ msgstr "Meddelande från %1$s på %2$s"
 msgid "Notice deleted."
 msgstr "Notis borttagen."
 
+#, fuzzy
+msgid "Notice"
+msgstr "Notiser"
+
 #. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
 #, fuzzy, php-format
 msgid "%1$s tagged %2$s"
@@ -5346,7 +5338,6 @@ msgstr "Inget ID-argument."
 msgid "Tag %s"
 msgstr "Tagg %s"
 
-#. TRANS: H2 for user profile information.
 msgid "User profile"
 msgstr "Användarprofil"
 
@@ -6067,6 +6058,49 @@ msgstr ""
 msgid "No AtomPub API service for %s."
 msgstr ""
 
+#. TRANS: H2 for user actions in a profile.
+#. TRANS: H2 for entity actions in a profile.
+msgid "User actions"
+msgstr "Åtgärder för användare"
+
+#. TRANS: Text shown in user profile of not yet compeltely deleted users.
+msgid "User deletion in progress..."
+msgstr "Borttagning av användare pågår..."
+
+#. TRANS: Link title for link on user profile.
+msgid "Edit profile settings"
+msgstr "Redigera profilinställningar"
+
+#. TRANS: Link text for link on user profile.
+msgid "Edit"
+msgstr "Redigera"
+
+#. TRANS: Link title for link on user profile.
+msgid "Send a direct message to this user"
+msgstr "Skicka ett direktmeddelande till denna användare"
+
+#. TRANS: Link text for link on user profile.
+msgid "Message"
+msgstr "Meddelande"
+
+#. TRANS: Label text on user profile to select a user role.
+msgid "Moderate"
+msgstr "Moderera"
+
+#. TRANS: Label text on user profile to select a user role.
+msgid "User role"
+msgstr "Användarroll"
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Administrator"
+msgstr "Administratör"
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Moderator"
+msgstr "Moderator"
+
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
 #, php-format
 msgid "%1$s - %2$s"
@@ -6786,85 +6820,171 @@ msgid_plural "You are a member of these groups:"
 msgstr[0] "Du är en medlem i denna grupp:"
 msgstr[1] "Du är en medlem i dessa grupper:"
 
-#. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-msgid ""
-"Commands:\n"
-"on - turn on notifications\n"
-"off - turn off notifications\n"
-"help - show this help\n"
-"follow <nickname> - subscribe to user\n"
-"groups - lists the groups you have joined\n"
-"subscriptions - list the people you follow\n"
-"subscribers - list the people that follow you\n"
-"leave <nickname> - unsubscribe from user\n"
-"d <nickname> <text> - direct message to user\n"
-"get <nickname> - get last notice from user\n"
-"whois <nickname> - get profile info on user\n"
-"lose <nickname> - force user to stop following you\n"
-"fav <nickname> - add user's last notice as a 'fave'\n"
-"fav #<notice_id> - add notice with the given id as a 'fave'\n"
-"repeat #<notice_id> - repeat a notice with a given id\n"
-"repeat <nickname> - repeat the last notice from user\n"
-"reply #<notice_id> - reply to notice with a given id\n"
-"reply <nickname> - reply to the last notice from user\n"
-"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
-"drop <group> - leave group\n"
-"stats - get your stats\n"
-"stop - same as 'off'\n"
-"quit - same as 'off'\n"
-"sub <nickname> - same as 'follow'\n"
-"unsub <nickname> - same as 'leave'\n"
-"last <nickname> - same as 'get'\n"
-"on <nickname> - not yet implemented.\n"
-"off <nickname> - not yet implemented.\n"
-"nudge <nickname> - remind a user to update.\n"
-"invite <phone number> - not yet implemented.\n"
-"track <word> - not yet implemented.\n"
-"untrack <word> - not yet implemented.\n"
-"track off - not yet implemented.\n"
-"untrack all - not yet implemented.\n"
-"tracks - not yet implemented.\n"
-"tracking - not yet implemented.\n"
+#. TRANS: Header line of help text for commands.
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "Commands:"
+msgstr "Resultat av kommando"
+
+#. TRANS: Help message for IM/SMS command "on"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "turn on notifications"
+msgstr "Kan inte stänga av notifikation."
+
+#. TRANS: Help message for IM/SMS command "off"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "turn off notifications"
+msgstr "Kan inte sätta på notifikation."
+
+#. TRANS: Help message for IM/SMS command "help"
+msgctxt "COMMANDHELP"
+msgid "show this help"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "follow <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "subscribe to user"
+msgstr "Prenumerera på denna användare"
+
+#. TRANS: Help message for IM/SMS command "groups"
+msgctxt "COMMANDHELP"
+msgid "lists the groups you have joined"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscriptions"
+msgctxt "COMMANDHELP"
+msgid "list the people you follow"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscribers"
+msgctxt "COMMANDHELP"
+msgid "list the people that follow you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "leave <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "unsubscribe from user"
+msgstr "Avsluta prenumerationen på denna användare"
+
+#. TRANS: Help message for IM/SMS command "d <nickname> <text>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "direct message to user"
+msgstr "Direktmeddelande till %s"
+
+#. TRANS: Help message for IM/SMS command "get <nickname>"
+msgctxt "COMMANDHELP"
+msgid "get last notice from user"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "whois <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "get profile info on user"
+msgstr "Profilinformation"
+
+#. TRANS: Help message for IM/SMS command "lose <nickname>"
+msgctxt "COMMANDHELP"
+msgid "force user to stop following you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav <nickname>"
+msgctxt "COMMANDHELP"
+msgid "add user's last notice as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "add notice with the given id as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "repeat a notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "repeat the last notice from user"
+msgstr "Upprepa denna notis"
+
+#. TRANS: Help message for IM/SMS command "reply #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "reply to notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "reply <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "reply to the last notice from user"
+msgstr "Svara på denna notis"
+
+#. TRANS: Help message for IM/SMS command "join <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "join group"
+msgstr "Okänd grupp."
+
+#. TRANS: Help message for IM/SMS command "login"
+msgctxt "COMMANDHELP"
+msgid "Get a link to login to the web interface"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "drop <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "leave group"
+msgstr "Ta bort grupp"
+
+#. TRANS: Help message for IM/SMS command "stats"
+msgctxt "COMMANDHELP"
+msgid "get your stats"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "stop"
+#. TRANS: Help message for IM/SMS command "quit"
+msgctxt "COMMANDHELP"
+msgid "same as 'off'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "sub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'follow'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "unsub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'leave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "last <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'get'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "on <nickname>"
+#. TRANS: Help message for IM/SMS command "off <nickname>"
+#. TRANS: Help message for IM/SMS command "invite <phone number>"
+#. TRANS: Help message for IM/SMS command "track <word>"
+#. TRANS: Help message for IM/SMS command "untrack <word>"
+#. TRANS: Help message for IM/SMS command "track off"
+#. TRANS: Help message for IM/SMS command "untrack all"
+#. TRANS: Help message for IM/SMS command "tracks"
+#. TRANS: Help message for IM/SMS command "tracking"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "not yet implemented."
+msgstr "Kommando inte implementerat än."
+
+#. TRANS: Help message for IM/SMS command "nudge <nickname>"
+msgctxt "COMMANDHELP"
+msgid "remind a user to update."
 msgstr ""
-"Kommandon:\n"
-"on - sätt på notifikationer\n"
-"off - stäng av notifikationer\n"
-"help - visa denna hjälp\n"
-"follow <smeknamn> - prenumerera på användare\n"
-"groups - lista grupperna du tillhör\n"
-"subscriptions - lista personerna du följer\n"
-"subscribers - lista personerna som följer dig\n"
-"leave <smeknamn> - avsluta prenumeration på användare\n"
-"d <smeknamn> <text> - direktmeddelande till användare\n"
-"get <smeknamn> - hämta senaste notis från användare\n"
-"whois <smeknamn> - hämta profilinformation om användare\n"
-"lose <smeknamn> - tvinga användare att sluta följa dig\n"
-"fav <smeknamn> - lägg till användarens senaste notis som favorit\n"
-"fav #<notisid> - lägg till notis med given id som favorit\n"
-"repeat #<notisid> - upprepa en notis med en given id\n"
-"repeat <smeknamn> - upprepa den senaste notisen från användare\n"
-"reply #<notisid> - svara på notis med en given id\n"
-"reply <smeknamn> - svara på den senaste notisen från användare\n"
-"join <grupp> - gå med i grupp\n"
-"login - hämta en länk till webbgränssnittets inloggningssida\n"
-"drop <grupp> - lämna grupp\n"
-"stats - hämta din statistik\n"
-"stop - samma som 'off'\n"
-"quit - samma som 'off'\n"
-"sub <smeknamn> - samma som 'follow'\n"
-"unsub <smeknamn> - samma som 'leave'\n"
-"last <smeknamn> - samma som 'get'\n"
-"on <smeknamn> - inte implementerat än.\n"
-"off <smeknamn> - inte implementerat än.\n"
-"nudge <smeknamn> - påminn en användare om att uppdatera\n"
-"invite <telefonnummer> - inte implementerat än.\n"
-"track <ord> - inte implementerat än.\n"
-"untrack <ord> - inte implementerat än.\n"
-"track off - inte implementerat än.\n"
-"untrack all - inte implementerat än.\n"
-"tracks - inte implementerat än.\n"
-"tracking - inte implementerat än.\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #, fuzzy
@@ -7045,6 +7165,9 @@ msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\"."
 msgstr "Plats för gruppen, om den finns, såsom \"Stad, Län, Land\""
 
+msgid "Aliases"
+msgstr "Alias"
+
 #, fuzzy, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -7124,6 +7247,10 @@ msgctxt "TOOLTIP"
 msgid "Add or edit %s design"
 msgstr "Lägg till eller redigera %s utseende"
 
+#. TRANS: Group actions header (h2). Text hidden by default.
+msgid "Group actions"
+msgstr "Åtgärder för grupp"
+
 #. TRANS: Title for groups with the most members section.
 msgid "Groups with most members"
 msgstr "Grupper med flest medlemmar"
@@ -7691,6 +7818,7 @@ msgstr "Skicka en notis"
 msgid "What's up, %s?"
 msgstr "Vad är på gång, %s?"
 
+#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr "Bifoga"
 
@@ -8148,52 +8276,6 @@ msgstr "Avsluta pren."
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "Användaren har ingen profil."
 
-msgid "Edit Avatar"
-msgstr "Redigera avatar"
-
-#. TRANS: H2 for user actions in a profile.
-#. TRANS: H2 for entity actions in a profile.
-msgid "User actions"
-msgstr "Åtgärder för användare"
-
-#. TRANS: Text shown in user profile of not yet compeltely deleted users.
-msgid "User deletion in progress..."
-msgstr "Borttagning av användare pågår..."
-
-#. TRANS: Link title for link on user profile.
-msgid "Edit profile settings"
-msgstr "Redigera profilinställningar"
-
-#. TRANS: Link text for link on user profile.
-msgid "Edit"
-msgstr "Redigera"
-
-#. TRANS: Link title for link on user profile.
-msgid "Send a direct message to this user"
-msgstr "Skicka ett direktmeddelande till denna användare"
-
-#. TRANS: Link text for link on user profile.
-msgid "Message"
-msgstr "Meddelande"
-
-#. TRANS: Label text on user profile to select a user role.
-msgid "Moderate"
-msgstr "Moderera"
-
-#. TRANS: Label text on user profile to select a user role.
-msgid "User role"
-msgstr "Användarroll"
-
-#. TRANS: Role that can be set for a user profile.
-msgctxt "role"
-msgid "Administrator"
-msgstr "Administratör"
-
-#. TRANS: Role that can be set for a user profile.
-msgctxt "role"
-msgid "Moderator"
-msgstr "Moderator"
-
 #, fuzzy
 msgid "Not allowed to log in."
 msgstr "Inte inloggad."
@@ -8269,3 +8351,88 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#~ msgid "Note"
+#~ msgstr "Notis"
+
+#~ msgid ""
+#~ "Commands:\n"
+#~ "on - turn on notifications\n"
+#~ "off - turn off notifications\n"
+#~ "help - show this help\n"
+#~ "follow <nickname> - subscribe to user\n"
+#~ "groups - lists the groups you have joined\n"
+#~ "subscriptions - list the people you follow\n"
+#~ "subscribers - list the people that follow you\n"
+#~ "leave <nickname> - unsubscribe from user\n"
+#~ "d <nickname> <text> - direct message to user\n"
+#~ "get <nickname> - get last notice from user\n"
+#~ "whois <nickname> - get profile info on user\n"
+#~ "lose <nickname> - force user to stop following you\n"
+#~ "fav <nickname> - add user's last notice as a 'fave'\n"
+#~ "fav #<notice_id> - add notice with the given id as a 'fave'\n"
+#~ "repeat #<notice_id> - repeat a notice with a given id\n"
+#~ "repeat <nickname> - repeat the last notice from user\n"
+#~ "reply #<notice_id> - reply to notice with a given id\n"
+#~ "reply <nickname> - reply to the last notice from user\n"
+#~ "join <group> - join group\n"
+#~ "login - Get a link to login to the web interface\n"
+#~ "drop <group> - leave group\n"
+#~ "stats - get your stats\n"
+#~ "stop - same as 'off'\n"
+#~ "quit - same as 'off'\n"
+#~ "sub <nickname> - same as 'follow'\n"
+#~ "unsub <nickname> - same as 'leave'\n"
+#~ "last <nickname> - same as 'get'\n"
+#~ "on <nickname> - not yet implemented.\n"
+#~ "off <nickname> - not yet implemented.\n"
+#~ "nudge <nickname> - remind a user to update.\n"
+#~ "invite <phone number> - not yet implemented.\n"
+#~ "track <word> - not yet implemented.\n"
+#~ "untrack <word> - not yet implemented.\n"
+#~ "track off - not yet implemented.\n"
+#~ "untrack all - not yet implemented.\n"
+#~ "tracks - not yet implemented.\n"
+#~ "tracking - not yet implemented.\n"
+#~ msgstr ""
+#~ "Kommandon:\n"
+#~ "on - sätt på notifikationer\n"
+#~ "off - stäng av notifikationer\n"
+#~ "help - visa denna hjälp\n"
+#~ "follow <smeknamn> - prenumerera på användare\n"
+#~ "groups - lista grupperna du tillhör\n"
+#~ "subscriptions - lista personerna du följer\n"
+#~ "subscribers - lista personerna som följer dig\n"
+#~ "leave <smeknamn> - avsluta prenumeration på användare\n"
+#~ "d <smeknamn> <text> - direktmeddelande till användare\n"
+#~ "get <smeknamn> - hämta senaste notis från användare\n"
+#~ "whois <smeknamn> - hämta profilinformation om användare\n"
+#~ "lose <smeknamn> - tvinga användare att sluta följa dig\n"
+#~ "fav <smeknamn> - lägg till användarens senaste notis som favorit\n"
+#~ "fav #<notisid> - lägg till notis med given id som favorit\n"
+#~ "repeat #<notisid> - upprepa en notis med en given id\n"
+#~ "repeat <smeknamn> - upprepa den senaste notisen från användare\n"
+#~ "reply #<notisid> - svara på notis med en given id\n"
+#~ "reply <smeknamn> - svara på den senaste notisen från användare\n"
+#~ "join <grupp> - gå med i grupp\n"
+#~ "login - hämta en länk till webbgränssnittets inloggningssida\n"
+#~ "drop <grupp> - lämna grupp\n"
+#~ "stats - hämta din statistik\n"
+#~ "stop - samma som 'off'\n"
+#~ "quit - samma som 'off'\n"
+#~ "sub <smeknamn> - samma som 'follow'\n"
+#~ "unsub <smeknamn> - samma som 'leave'\n"
+#~ "last <smeknamn> - samma som 'get'\n"
+#~ "on <smeknamn> - inte implementerat än.\n"
+#~ "off <smeknamn> - inte implementerat än.\n"
+#~ "nudge <smeknamn> - påminn en användare om att uppdatera\n"
+#~ "invite <telefonnummer> - inte implementerat än.\n"
+#~ "track <ord> - inte implementerat än.\n"
+#~ "untrack <ord> - inte implementerat än.\n"
+#~ "track off - inte implementerat än.\n"
+#~ "untrack all - inte implementerat än.\n"
+#~ "tracks - inte implementerat än.\n"
+#~ "tracking - inte implementerat än.\n"
+
+#~ msgid "Edit Avatar"
+#~ msgstr "Redigera avatar"
diff --git a/locale/te/LC_MESSAGES/statusnet.po b/locale/te/LC_MESSAGES/statusnet.po
index a9718f4c01..afc3188748 100644
--- a/locale/te/LC_MESSAGES/statusnet.po
+++ b/locale/te/LC_MESSAGES/statusnet.po
@@ -10,17 +10,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-11 18:15+0000\n"
-"PO-Revision-Date: 2011-03-11 18:17:29+0000\n"
+"POT-Creation-Date: 2011-03-17 09:47+0000\n"
+"PO-Revision-Date: 2011-03-17 09:49:58+0000\n"
 "Language-Team: Telugu <http://translatewiki.net/wiki/Portal:te>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83703); Translate extension (2011-03-11)\n"
+"X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: te\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-03-08 01:25:01+0000\n"
+"X-POT-Import-Date: 2011-03-11 18:52:41+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -580,7 +580,7 @@ msgstr "వాడుకరి %1$sని %2$s గుంపు నుండి 
 msgid "%s's groups"
 msgstr "%s యొక్క గుంపులు"
 
-#. TRANS: Used as subtitle in check for group membership. %1$s is a user name, %2$s is the site name.
+#. TRANS: Used as subtitle in check for group membership. %1$s is the site name, %2$s is a user name.
 #, php-format
 msgid "%1$s groups %2$s is a member of."
 msgstr "%2$s సభ్యులుగా ఉన్న %2$s గుంపులు."
@@ -621,9 +621,8 @@ msgstr "పేరులో చిన్నబడి అక్షరాలు మ
 
 #. TRANS: API validation exception thrown when alias is the same as nickname.
 #. TRANS: Group create form validation error.
-#, fuzzy
 msgid "Alias cannot be the same as nickname."
-msgstr "మారుపేరు పేరుతో సమానంగా ఉండకూడదు."
+msgstr "మారుపేరు ముద్దుపేరూ ఒకటే కాకూడదు."
 
 #. TRANS: Client error displayed when uploading a media file has failed.
 msgid "Upload failed."
@@ -1244,9 +1243,8 @@ msgid "No file uploaded."
 msgstr "ఏ దస్త్రమూ ఎక్కింపబడలేదు."
 
 #. TRANS: Avatar upload form instruction after uploading a file.
-#, fuzzy
 msgid "Pick a square area of the image to be your avatar."
-msgstr "మీ అవతారానికి గానూ ఈ చిత్రం నుండి ఒక చతురస్రపు ప్రదేశాన్ని ఎంచుకోండి"
+msgstr "మీ అవతారంగా ఉండాల్సిన చతురస్రపు ప్రదేశాన్ని బొమ్మ నుండి ఎంచుకోండి."
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
 #. TRANS: Server error displayed trying to crop an uploaded group logo that is no longer present.
@@ -4598,18 +4596,6 @@ msgstr "%s గుంపు"
 msgid "%1$s group, page %2$d"
 msgstr "%1$s గుంపు , %2$dవ పేజీ"
 
-#. TRANS: Label for group description or group note (dt). Text hidden by default.
-msgid "Note"
-msgstr "గమనిక"
-
-#. TRANS: Label for group aliases (dt). Text hidden by default.
-msgid "Aliases"
-msgstr "మారుపేర్లు"
-
-#. TRANS: Group actions header (h2). Text hidden by default.
-msgid "Group actions"
-msgstr "గుంపు చర్యలు"
-
 #. TRANS: Tooltip for feed link. %s is a group nickname.
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
@@ -4723,6 +4709,10 @@ msgstr "%2$sలో %1$sకి స్పందనలు!"
 msgid "Notice deleted."
 msgstr "నోటీసుని తొలగించాం."
 
+#, fuzzy
+msgid "Notice"
+msgstr "సందేశాలు"
+
 #. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
 #, fuzzy, php-format
 msgid "%1$s tagged %2$s"
@@ -5252,7 +5242,6 @@ msgstr "జోడింపులు లేవు."
 msgid "Tag %s"
 msgstr "ట్యాగులు"
 
-#. TRANS: H2 for user profile information.
 msgid "User profile"
 msgstr "వాడుకరి ప్రొఫైలు"
 
@@ -5933,6 +5922,50 @@ msgstr ""
 msgid "No AtomPub API service for %s."
 msgstr ""
 
+#. TRANS: H2 for user actions in a profile.
+#. TRANS: H2 for entity actions in a profile.
+msgid "User actions"
+msgstr "వాడుకరి చర్యలు"
+
+#. TRANS: Text shown in user profile of not yet compeltely deleted users.
+msgid "User deletion in progress..."
+msgstr "వాడుకరి తొలగింపు కొనసాగుతూంది..."
+
+#. TRANS: Link title for link on user profile.
+msgid "Edit profile settings"
+msgstr "ఫ్రొఫైలు అమరికలని మార్చు"
+
+#. TRANS: Link text for link on user profile.
+msgid "Edit"
+msgstr "మార్చు"
+
+#. TRANS: Link title for link on user profile.
+msgid "Send a direct message to this user"
+msgstr "ఈ వాడుకరికి ఒక నేరు సందేశాన్ని పంపించండి"
+
+#. TRANS: Link text for link on user profile.
+msgid "Message"
+msgstr "సందేశం"
+
+#. TRANS: Label text on user profile to select a user role.
+#, fuzzy
+msgid "Moderate"
+msgstr "సమన్వయకర్త"
+
+#. TRANS: Label text on user profile to select a user role.
+msgid "User role"
+msgstr "వాడుకరి పాత్ర"
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Administrator"
+msgstr "నిర్వాహకులు"
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Moderator"
+msgstr "సమన్వయకర్త"
+
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
 #, php-format
 msgid "%1$s - %2$s"
@@ -6657,46 +6690,170 @@ msgid_plural "You are a member of these groups:"
 msgstr[0] "మీరు ఇప్పటికే లోనికి ప్రవేశించారు!"
 msgstr[1] "మీరు ఇప్పటికే లోనికి ప్రవేశించారు!"
 
-#. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-msgid ""
-"Commands:\n"
-"on - turn on notifications\n"
-"off - turn off notifications\n"
-"help - show this help\n"
-"follow <nickname> - subscribe to user\n"
-"groups - lists the groups you have joined\n"
-"subscriptions - list the people you follow\n"
-"subscribers - list the people that follow you\n"
-"leave <nickname> - unsubscribe from user\n"
-"d <nickname> <text> - direct message to user\n"
-"get <nickname> - get last notice from user\n"
-"whois <nickname> - get profile info on user\n"
-"lose <nickname> - force user to stop following you\n"
-"fav <nickname> - add user's last notice as a 'fave'\n"
-"fav #<notice_id> - add notice with the given id as a 'fave'\n"
-"repeat #<notice_id> - repeat a notice with a given id\n"
-"repeat <nickname> - repeat the last notice from user\n"
-"reply #<notice_id> - reply to notice with a given id\n"
-"reply <nickname> - reply to the last notice from user\n"
-"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
-"drop <group> - leave group\n"
-"stats - get your stats\n"
-"stop - same as 'off'\n"
-"quit - same as 'off'\n"
-"sub <nickname> - same as 'follow'\n"
-"unsub <nickname> - same as 'leave'\n"
-"last <nickname> - same as 'get'\n"
-"on <nickname> - not yet implemented.\n"
-"off <nickname> - not yet implemented.\n"
-"nudge <nickname> - remind a user to update.\n"
-"invite <phone number> - not yet implemented.\n"
-"track <word> - not yet implemented.\n"
-"untrack <word> - not yet implemented.\n"
-"track off - not yet implemented.\n"
-"untrack all - not yet implemented.\n"
-"tracks - not yet implemented.\n"
-"tracking - not yet implemented.\n"
+#. TRANS: Header line of help text for commands.
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "Commands:"
+msgstr "ఆదేశ ఫలితాలు"
+
+#. TRANS: Help message for IM/SMS command "on"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "turn on notifications"
+msgstr "మీ నోటీసుని మీరే పునరావృతించలేరు."
+
+#. TRANS: Help message for IM/SMS command "off"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "turn off notifications"
+msgstr "మీ నోటీసుని మీరే పునరావృతించలేరు."
+
+#. TRANS: Help message for IM/SMS command "help"
+msgctxt "COMMANDHELP"
+msgid "show this help"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "follow <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "subscribe to user"
+msgstr "ఈ వాడుకరికి చందాచేరు"
+
+#. TRANS: Help message for IM/SMS command "groups"
+msgctxt "COMMANDHELP"
+msgid "lists the groups you have joined"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscriptions"
+msgctxt "COMMANDHELP"
+msgid "list the people you follow"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscribers"
+msgctxt "COMMANDHELP"
+msgid "list the people that follow you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "leave <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "unsubscribe from user"
+msgstr "ఈ వాడుకరి నుండి చందామాను"
+
+#. TRANS: Help message for IM/SMS command "d <nickname> <text>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "direct message to user"
+msgstr "%s కి నేరు సందేశాలు"
+
+#. TRANS: Help message for IM/SMS command "get <nickname>"
+msgctxt "COMMANDHELP"
+msgid "get last notice from user"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "whois <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "get profile info on user"
+msgstr "ప్రొఫైలు సమాచారం"
+
+#. TRANS: Help message for IM/SMS command "lose <nickname>"
+msgctxt "COMMANDHELP"
+msgid "force user to stop following you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav <nickname>"
+msgctxt "COMMANDHELP"
+msgid "add user's last notice as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "add notice with the given id as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "repeat a notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "repeat the last notice from user"
+msgstr "ఈ నోటీసుని పునరావృతించు"
+
+#. TRANS: Help message for IM/SMS command "reply #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "reply to notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "reply <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "reply to the last notice from user"
+msgstr "ఈ నోటీసుపై స్పందించండి"
+
+#. TRANS: Help message for IM/SMS command "join <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "join group"
+msgstr "గుర్తుతెలియని గుంపు."
+
+#. TRANS: Help message for IM/SMS command "login"
+msgctxt "COMMANDHELP"
+msgid "Get a link to login to the web interface"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "drop <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "leave group"
+msgstr "గుంపు తొలగింపు"
+
+#. TRANS: Help message for IM/SMS command "stats"
+msgctxt "COMMANDHELP"
+msgid "get your stats"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "stop"
+#. TRANS: Help message for IM/SMS command "quit"
+msgctxt "COMMANDHELP"
+msgid "same as 'off'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "sub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'follow'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "unsub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'leave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "last <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'get'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "on <nickname>"
+#. TRANS: Help message for IM/SMS command "off <nickname>"
+#. TRANS: Help message for IM/SMS command "invite <phone number>"
+#. TRANS: Help message for IM/SMS command "track <word>"
+#. TRANS: Help message for IM/SMS command "untrack <word>"
+#. TRANS: Help message for IM/SMS command "track off"
+#. TRANS: Help message for IM/SMS command "untrack all"
+#. TRANS: Help message for IM/SMS command "tracks"
+#. TRANS: Help message for IM/SMS command "tracking"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "not yet implemented."
+msgstr "క్షమించండి, ఈ ఆదేశం ఇంకా అమలుపరచబడలేదు."
+
+#. TRANS: Help message for IM/SMS command "nudge <nickname>"
+msgctxt "COMMANDHELP"
+msgid "remind a user to update."
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
@@ -6879,6 +7036,9 @@ msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\"."
 msgstr "గుంపు యొక్క ప్రాంతం, ఉంటే, \"నగరం, రాష్ట్రం (లేదా ప్రాంతం), దేశం\""
 
+msgid "Aliases"
+msgstr "మారుపేర్లు"
+
 #, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -6956,6 +7116,10 @@ msgctxt "TOOLTIP"
 msgid "Add or edit %s design"
 msgstr ""
 
+#. TRANS: Group actions header (h2). Text hidden by default.
+msgid "Group actions"
+msgstr "గుంపు చర్యలు"
+
 #. TRANS: Title for groups with the most members section.
 msgid "Groups with most members"
 msgstr "ఎక్కువమంది సభ్యులున్న గుంపులు"
@@ -7510,6 +7674,7 @@ msgstr "సైటు గమనిక"
 msgid "What's up, %s?"
 msgstr "%s, ఏమిటి సంగతులు?"
 
+#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr "జోడించు"
 
@@ -7967,53 +8132,6 @@ msgstr "చందామాను"
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "వాడుకరికి ప్రొఫైలు లేదు."
 
-msgid "Edit Avatar"
-msgstr "అవతారాన్ని మార్చు"
-
-#. TRANS: H2 for user actions in a profile.
-#. TRANS: H2 for entity actions in a profile.
-msgid "User actions"
-msgstr "వాడుకరి చర్యలు"
-
-#. TRANS: Text shown in user profile of not yet compeltely deleted users.
-msgid "User deletion in progress..."
-msgstr "వాడుకరి తొలగింపు కొనసాగుతూంది..."
-
-#. TRANS: Link title for link on user profile.
-msgid "Edit profile settings"
-msgstr "ఫ్రొఫైలు అమరికలని మార్చు"
-
-#. TRANS: Link text for link on user profile.
-msgid "Edit"
-msgstr "మార్చు"
-
-#. TRANS: Link title for link on user profile.
-msgid "Send a direct message to this user"
-msgstr "ఈ వాడుకరికి ఒక నేరు సందేశాన్ని పంపించండి"
-
-#. TRANS: Link text for link on user profile.
-msgid "Message"
-msgstr "సందేశం"
-
-#. TRANS: Label text on user profile to select a user role.
-#, fuzzy
-msgid "Moderate"
-msgstr "సమన్వయకర్త"
-
-#. TRANS: Label text on user profile to select a user role.
-msgid "User role"
-msgstr "వాడుకరి పాత్ర"
-
-#. TRANS: Role that can be set for a user profile.
-msgctxt "role"
-msgid "Administrator"
-msgstr "నిర్వాహకులు"
-
-#. TRANS: Role that can be set for a user profile.
-msgctxt "role"
-msgid "Moderator"
-msgstr "సమన్వయకర్త"
-
 msgid "Not allowed to log in."
 msgstr "ప్రవేశించడానికి అనుమతి లేదు."
 
@@ -8087,3 +8205,9 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#~ msgid "Note"
+#~ msgstr "గమనిక"
+
+#~ msgid "Edit Avatar"
+#~ msgstr "అవతారాన్ని మార్చు"
diff --git a/locale/tr/LC_MESSAGES/statusnet.po b/locale/tr/LC_MESSAGES/statusnet.po
index 89e5b94c84..db1e94fb57 100644
--- a/locale/tr/LC_MESSAGES/statusnet.po
+++ b/locale/tr/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-03-11 18:15+0000\n"
-"PO-Revision-Date: 2011-03-11 18:17:30+0000\n"
+"POT-Creation-Date: 2011-03-17 09:47+0000\n"
+"PO-Revision-Date: 2011-03-17 09:49:59+0000\n"
 "Language-Team: Turkish <http://translatewiki.net/wiki/Portal:tr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83703); Translate extension (2011-03-11)\n"
+"X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tr\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-POT-Import-Date: 2011-03-08 01:25:01+0000\n"
+"X-POT-Import-Date: 2011-03-11 18:52:41+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -589,7 +589,7 @@ msgstr "%1$s kullanıcısı, %2$s grubundan silinemedi."
 msgid "%s's groups"
 msgstr "%s kullanıcısının grupları"
 
-#. TRANS: Used as subtitle in check for group membership. %1$s is a user name, %2$s is the site name.
+#. TRANS: Used as subtitle in check for group membership. %1$s is the site name, %2$s is a user name.
 #, php-format
 msgid "%1$s groups %2$s is a member of."
 msgstr "%2$s kullanıcısının üye olduğu %1$s grupları."
@@ -4633,18 +4633,6 @@ msgstr ""
 msgid "%1$s group, page %2$d"
 msgstr "Bütün abonelikler"
 
-#. TRANS: Label for group description or group note (dt). Text hidden by default.
-msgid "Note"
-msgstr "Not"
-
-#. TRANS: Label for group aliases (dt). Text hidden by default.
-msgid "Aliases"
-msgstr "Diğerisimler"
-
-#. TRANS: Group actions header (h2). Text hidden by default.
-msgid "Group actions"
-msgstr ""
-
 #. TRANS: Tooltip for feed link. %s is a group nickname.
 #, fuzzy, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
@@ -4747,6 +4735,10 @@ msgstr ""
 msgid "Notice deleted."
 msgstr "Durum mesajı silindi."
 
+#, fuzzy
+msgid "Notice"
+msgstr "Durum mesajları"
+
 #. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
 #, fuzzy, php-format
 msgid "%1$s tagged %2$s"
@@ -5275,7 +5267,6 @@ msgstr "Böyle bir belge yok."
 msgid "Tag %s"
 msgstr ""
 
-#. TRANS: H2 for user profile information.
 #, fuzzy
 msgid "User profile"
 msgstr "Kullanıcının profili yok."
@@ -5971,6 +5962,51 @@ msgstr ""
 msgid "No AtomPub API service for %s."
 msgstr ""
 
+#. TRANS: H2 for user actions in a profile.
+#. TRANS: H2 for entity actions in a profile.
+msgid "User actions"
+msgstr ""
+
+#. TRANS: Text shown in user profile of not yet compeltely deleted users.
+msgid "User deletion in progress..."
+msgstr ""
+
+#. TRANS: Link title for link on user profile.
+#, fuzzy
+msgid "Edit profile settings"
+msgstr "Profil ayarları"
+
+#. TRANS: Link text for link on user profile.
+msgid "Edit"
+msgstr ""
+
+#. TRANS: Link title for link on user profile.
+msgid "Send a direct message to this user"
+msgstr ""
+
+#. TRANS: Link text for link on user profile.
+msgid "Message"
+msgstr ""
+
+#. TRANS: Label text on user profile to select a user role.
+msgid "Moderate"
+msgstr ""
+
+#. TRANS: Label text on user profile to select a user role.
+#, fuzzy
+msgid "User role"
+msgstr "Kullanıcının profili yok."
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Administrator"
+msgstr ""
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Moderator"
+msgstr ""
+
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
 #, fuzzy, php-format
 msgid "%1$s - %2$s"
@@ -6696,46 +6732,167 @@ msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "Bize o profili yollamadınız"
 
-#. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-msgid ""
-"Commands:\n"
-"on - turn on notifications\n"
-"off - turn off notifications\n"
-"help - show this help\n"
-"follow <nickname> - subscribe to user\n"
-"groups - lists the groups you have joined\n"
-"subscriptions - list the people you follow\n"
-"subscribers - list the people that follow you\n"
-"leave <nickname> - unsubscribe from user\n"
-"d <nickname> <text> - direct message to user\n"
-"get <nickname> - get last notice from user\n"
-"whois <nickname> - get profile info on user\n"
-"lose <nickname> - force user to stop following you\n"
-"fav <nickname> - add user's last notice as a 'fave'\n"
-"fav #<notice_id> - add notice with the given id as a 'fave'\n"
-"repeat #<notice_id> - repeat a notice with a given id\n"
-"repeat <nickname> - repeat the last notice from user\n"
-"reply #<notice_id> - reply to notice with a given id\n"
-"reply <nickname> - reply to the last notice from user\n"
-"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
-"drop <group> - leave group\n"
-"stats - get your stats\n"
-"stop - same as 'off'\n"
-"quit - same as 'off'\n"
-"sub <nickname> - same as 'follow'\n"
-"unsub <nickname> - same as 'leave'\n"
-"last <nickname> - same as 'get'\n"
-"on <nickname> - not yet implemented.\n"
-"off <nickname> - not yet implemented.\n"
-"nudge <nickname> - remind a user to update.\n"
-"invite <phone number> - not yet implemented.\n"
-"track <word> - not yet implemented.\n"
-"untrack <word> - not yet implemented.\n"
-"track off - not yet implemented.\n"
-"untrack all - not yet implemented.\n"
-"tracks - not yet implemented.\n"
-"tracking - not yet implemented.\n"
+#. TRANS: Header line of help text for commands.
+msgctxt "COMMANDHELP"
+msgid "Commands:"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "on"
+msgctxt "COMMANDHELP"
+msgid "turn on notifications"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "off"
+msgctxt "COMMANDHELP"
+msgid "turn off notifications"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "help"
+msgctxt "COMMANDHELP"
+msgid "show this help"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "follow <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "subscribe to user"
+msgstr "Bize o profili yollamadınız"
+
+#. TRANS: Help message for IM/SMS command "groups"
+msgctxt "COMMANDHELP"
+msgid "lists the groups you have joined"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscriptions"
+msgctxt "COMMANDHELP"
+msgid "list the people you follow"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscribers"
+msgctxt "COMMANDHELP"
+msgid "list the people that follow you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "leave <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "unsubscribe from user"
+msgstr "Bize o profili yollamadınız"
+
+#. TRANS: Help message for IM/SMS command "d <nickname> <text>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "direct message to user"
+msgstr "%s kullanıcısına özel mesaj"
+
+#. TRANS: Help message for IM/SMS command "get <nickname>"
+msgctxt "COMMANDHELP"
+msgid "get last notice from user"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "whois <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "get profile info on user"
+msgstr "Profil ayarları"
+
+#. TRANS: Help message for IM/SMS command "lose <nickname>"
+msgctxt "COMMANDHELP"
+msgid "force user to stop following you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav <nickname>"
+msgctxt "COMMANDHELP"
+msgid "add user's last notice as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "add notice with the given id as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "repeat a notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "repeat the last notice from user"
+msgstr "Böyle bir durum mesajı yok."
+
+#. TRANS: Help message for IM/SMS command "reply #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "reply to notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "reply <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "reply to the last notice from user"
+msgstr "Böyle bir kullanıcı yok."
+
+#. TRANS: Help message for IM/SMS command "join <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "join group"
+msgstr "Yeni grup"
+
+#. TRANS: Help message for IM/SMS command "login"
+msgctxt "COMMANDHELP"
+msgid "Get a link to login to the web interface"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "drop <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "leave group"
+msgstr "Kullanıcıyı sil"
+
+#. TRANS: Help message for IM/SMS command "stats"
+msgctxt "COMMANDHELP"
+msgid "get your stats"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "stop"
+#. TRANS: Help message for IM/SMS command "quit"
+msgctxt "COMMANDHELP"
+msgid "same as 'off'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "sub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'follow'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "unsub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'leave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "last <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'get'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "on <nickname>"
+#. TRANS: Help message for IM/SMS command "off <nickname>"
+#. TRANS: Help message for IM/SMS command "invite <phone number>"
+#. TRANS: Help message for IM/SMS command "track <word>"
+#. TRANS: Help message for IM/SMS command "untrack <word>"
+#. TRANS: Help message for IM/SMS command "track off"
+#. TRANS: Help message for IM/SMS command "untrack all"
+#. TRANS: Help message for IM/SMS command "tracks"
+#. TRANS: Help message for IM/SMS command "tracking"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "not yet implemented."
+msgstr "showForm() gerçeklenmemiş."
+
+#. TRANS: Help message for IM/SMS command "nudge <nickname>"
+msgctxt "COMMANDHELP"
+msgid "remind a user to update."
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
@@ -6922,6 +7079,9 @@ msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\"."
 msgstr "Bulunduğunuz yer, \"Şehir, Eyalet (veya Bölge), Ülke\" gibi"
 
+msgid "Aliases"
+msgstr "Diğerisimler"
+
 #, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -6998,6 +7158,10 @@ msgctxt "TOOLTIP"
 msgid "Add or edit %s design"
 msgstr ""
 
+#. TRANS: Group actions header (h2). Text hidden by default.
+msgid "Group actions"
+msgstr ""
+
 #. TRANS: Title for groups with the most members section.
 msgid "Groups with most members"
 msgstr ""
@@ -7469,6 +7633,7 @@ msgstr "Yeni durum mesajı"
 msgid "What's up, %s?"
 msgstr "N'aber %s?"
 
+#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr ""
 
@@ -7942,55 +8107,6 @@ msgstr "Aboneliği sonlandır"
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "Kullanıcının profili yok."
 
-#, fuzzy
-msgid "Edit Avatar"
-msgstr "Avatar"
-
-#. TRANS: H2 for user actions in a profile.
-#. TRANS: H2 for entity actions in a profile.
-msgid "User actions"
-msgstr ""
-
-#. TRANS: Text shown in user profile of not yet compeltely deleted users.
-msgid "User deletion in progress..."
-msgstr ""
-
-#. TRANS: Link title for link on user profile.
-#, fuzzy
-msgid "Edit profile settings"
-msgstr "Profil ayarları"
-
-#. TRANS: Link text for link on user profile.
-msgid "Edit"
-msgstr ""
-
-#. TRANS: Link title for link on user profile.
-msgid "Send a direct message to this user"
-msgstr ""
-
-#. TRANS: Link text for link on user profile.
-msgid "Message"
-msgstr ""
-
-#. TRANS: Label text on user profile to select a user role.
-msgid "Moderate"
-msgstr ""
-
-#. TRANS: Label text on user profile to select a user role.
-#, fuzzy
-msgid "User role"
-msgstr "Kullanıcının profili yok."
-
-#. TRANS: Role that can be set for a user profile.
-msgctxt "role"
-msgid "Administrator"
-msgstr ""
-
-#. TRANS: Role that can be set for a user profile.
-msgctxt "role"
-msgid "Moderator"
-msgstr ""
-
 #, fuzzy
 msgid "Not allowed to log in."
 msgstr "Giriş yapılmadı."
@@ -8062,3 +8178,10 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#~ msgid "Note"
+#~ msgstr "Not"
+
+#, fuzzy
+#~ msgid "Edit Avatar"
+#~ msgstr "Avatar"
diff --git a/locale/uk/LC_MESSAGES/statusnet.po b/locale/uk/LC_MESSAGES/statusnet.po
index f2f3cdd6df..c4fe7648b3 100644
--- a/locale/uk/LC_MESSAGES/statusnet.po
+++ b/locale/uk/LC_MESSAGES/statusnet.po
@@ -12,18 +12,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-11 18:15+0000\n"
-"PO-Revision-Date: 2011-03-11 18:17:31+0000\n"
+"POT-Creation-Date: 2011-03-17 09:47+0000\n"
+"PO-Revision-Date: 2011-03-17 09:50:00+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83703); Translate extension (2011-03-11)\n"
+"X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
-"X-POT-Import-Date: 2011-03-08 01:25:01+0000\n"
+"X-POT-Import-Date: 2011-03-11 18:52:41+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -602,7 +602,7 @@ msgstr "Не вдалось видалити користувача %1$s зі с
 msgid "%s's groups"
 msgstr "Спільноти %s"
 
-#. TRANS: Used as subtitle in check for group membership. %1$s is a user name, %2$s is the site name.
+#. TRANS: Used as subtitle in check for group membership. %1$s is the site name, %2$s is a user name.
 #, php-format
 msgid "%1$s groups %2$s is a member of."
 msgstr "Спільноти на %1$s, до яких долучився %2$s."
@@ -1060,9 +1060,8 @@ msgid "Can only fave notices."
 msgstr "Можна лише додавати дописи до обраних."
 
 #. TRANS: Client exception thrown when trying favorite a notice without content.
-#, fuzzy
 msgid "Unknown notice."
-msgstr "Невідома примітка"
+msgstr "Невідомий допис."
 
 #. TRANS: Client exception thrown when trying favorite an already favorited notice.
 msgid "Already a favorite."
@@ -3110,9 +3109,8 @@ msgstr "Потрібна URL-адреса."
 msgid "Could not create application."
 msgstr "Не вдалося створити додаток."
 
-#, fuzzy
 msgid "Invalid image."
-msgstr "Недійсний розмір."
+msgstr "Неприпустиме зображення."
 
 #. TRANS: Title for form to create a group.
 msgid "New group"
@@ -3400,7 +3398,6 @@ msgstr ""
 "приватно."
 
 #. TRANS: Title for page where to change password.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Change password"
 msgstr "Змінити пароль"
@@ -3428,7 +3425,6 @@ msgid "6 or more characters."
 msgstr "6 або більше знаків."
 
 #. TRANS: Field label on page where to change password. In this field the new password should be typed a second time.
-#, fuzzy
 msgctxt "LABEL"
 msgid "Confirm"
 msgstr "Підтвердити"
@@ -3439,7 +3435,6 @@ msgid "Same as password above."
 msgstr "Такий само, як і пароль вище."
 
 #. TRANS: Button text on page where to change password.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Change"
 msgstr "Змінити"
@@ -3452,9 +3447,8 @@ msgid "Passwords don't match."
 msgstr "Паролі не співпадають."
 
 #. TRANS: Form validation error on page where to change password.
-#, fuzzy
 msgid "Incorrect old password."
-msgstr "Старий пароль є неточним"
+msgstr "Неправильний старий пароль."
 
 #. TRANS: Form validation error on page where to change password.
 msgid "Error saving user; invalid."
@@ -3541,12 +3535,11 @@ msgid "Fancy URLs"
 msgstr "Надзвичайні URL-адреси"
 
 #. TRANS: Field title in Paths admin panel.
-#, fuzzy
 msgid "Use fancy URLs (more readable and memorable)?"
-msgstr "Використовувати надзвичайні (найбільш пам’ятні і визначні) URL-адреси?"
+msgstr ""
+"Використовувати короткі (що їх легше прочитати і запам’ятати) URL-адреси?"
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "Theme"
 msgstr "Тема"
@@ -3660,10 +3653,9 @@ msgid "Directory where attachments are located."
 msgstr "Директорія, в якій знаходяться вкладення."
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "SSL"
-msgstr "SSL-шифрування"
+msgstr "SSL"
 
 #. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
 msgid "Never"
@@ -3745,7 +3737,6 @@ msgid "Enabled"
 msgstr "Увімкнений"
 
 #. TRANS: Tab and title for plugins admin panel.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Plugins"
 msgstr "Додатки"
@@ -3776,7 +3767,7 @@ msgstr "Недійсний зміст допису."
 
 #. TRANS: Exception thrown if a notice's license is not compatible with the StatusNet site license.
 #. TRANS: %1$s is the notice license, %2$s is the StatusNet site's license.
-#, fuzzy, php-format
+#, php-format
 msgid "Notice license \"%1$s\" is not compatible with site license \"%2$s\"."
 msgstr "Ліцензія допису «%1$s» є несумісною з ліцензією сайту «%2$s»."
 
@@ -4631,18 +4622,6 @@ msgstr "Спільнота %s"
 msgid "%1$s group, page %2$d"
 msgstr "Спільнота %1$s, сторінка %2$d"
 
-#. TRANS: Label for group description or group note (dt). Text hidden by default.
-msgid "Note"
-msgstr "Зауваження"
-
-#. TRANS: Label for group aliases (dt). Text hidden by default.
-msgid "Aliases"
-msgstr "Додаткові імена"
-
-#. TRANS: Group actions header (h2). Text hidden by default.
-msgid "Group actions"
-msgstr "Дії спільноти"
-
 #. TRANS: Tooltip for feed link. %s is a group nickname.
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
@@ -4753,6 +4732,10 @@ msgstr "Повідомлення від %1$s на %2$s"
 msgid "Notice deleted."
 msgstr "Допис видалено."
 
+#, fuzzy
+msgid "Notice"
+msgstr "Дописи"
+
 #. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
 #, php-format
 msgid "%1$s tagged %2$s"
@@ -5286,7 +5269,6 @@ msgstr "Немає ID аргументу."
 msgid "Tag %s"
 msgstr "Позначити %s"
 
-#. TRANS: H2 for user profile information.
 msgid "User profile"
 msgstr "Профіль користувача."
 
@@ -5996,6 +5978,49 @@ msgstr "Не вдається знайти XRD для %s."
 msgid "No AtomPub API service for %s."
 msgstr "Немає послуги AtomPub API для %s."
 
+#. TRANS: H2 for user actions in a profile.
+#. TRANS: H2 for entity actions in a profile.
+msgid "User actions"
+msgstr "Діяльність користувача"
+
+#. TRANS: Text shown in user profile of not yet compeltely deleted users.
+msgid "User deletion in progress..."
+msgstr "Видалення користувача у процесі..."
+
+#. TRANS: Link title for link on user profile.
+msgid "Edit profile settings"
+msgstr "Налаштування профілю"
+
+#. TRANS: Link text for link on user profile.
+msgid "Edit"
+msgstr "Правка"
+
+#. TRANS: Link title for link on user profile.
+msgid "Send a direct message to this user"
+msgstr "Надіслати пряме повідомлення цьому користувачеві"
+
+#. TRANS: Link text for link on user profile.
+msgid "Message"
+msgstr "Повідомлення"
+
+#. TRANS: Label text on user profile to select a user role.
+msgid "Moderate"
+msgstr "Модерувати"
+
+#. TRANS: Label text on user profile to select a user role.
+msgid "User role"
+msgstr "Роль користувача"
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Administrator"
+msgstr "Адміністратор"
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Moderator"
+msgstr "Модератор"
+
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
 #, php-format
 msgid "%1$s - %2$s"
@@ -6721,82 +6746,172 @@ msgstr[0] "Ви є учасником спільноти:"
 msgstr[1] "Ви є учасником таких спільнот:"
 msgstr[2] "Ви є учасником таких спільнот:"
 
-#. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-msgid ""
-"Commands:\n"
-"on - turn on notifications\n"
-"off - turn off notifications\n"
-"help - show this help\n"
-"follow <nickname> - subscribe to user\n"
-"groups - lists the groups you have joined\n"
-"subscriptions - list the people you follow\n"
-"subscribers - list the people that follow you\n"
-"leave <nickname> - unsubscribe from user\n"
-"d <nickname> <text> - direct message to user\n"
-"get <nickname> - get last notice from user\n"
-"whois <nickname> - get profile info on user\n"
-"lose <nickname> - force user to stop following you\n"
-"fav <nickname> - add user's last notice as a 'fave'\n"
-"fav #<notice_id> - add notice with the given id as a 'fave'\n"
-"repeat #<notice_id> - repeat a notice with a given id\n"
-"repeat <nickname> - repeat the last notice from user\n"
-"reply #<notice_id> - reply to notice with a given id\n"
-"reply <nickname> - reply to the last notice from user\n"
-"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
-"drop <group> - leave group\n"
-"stats - get your stats\n"
-"stop - same as 'off'\n"
-"quit - same as 'off'\n"
-"sub <nickname> - same as 'follow'\n"
-"unsub <nickname> - same as 'leave'\n"
-"last <nickname> - same as 'get'\n"
-"on <nickname> - not yet implemented.\n"
-"off <nickname> - not yet implemented.\n"
-"nudge <nickname> - remind a user to update.\n"
-"invite <phone number> - not yet implemented.\n"
-"track <word> - not yet implemented.\n"
-"untrack <word> - not yet implemented.\n"
-"track off - not yet implemented.\n"
-"untrack all - not yet implemented.\n"
-"tracks - not yet implemented.\n"
-"tracking - not yet implemented.\n"
+#. TRANS: Header line of help text for commands.
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "Commands:"
+msgstr "Результати команди"
+
+#. TRANS: Help message for IM/SMS command "on"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "turn on notifications"
+msgstr "Не можна увімкнути сповіщення."
+
+#. TRANS: Help message for IM/SMS command "off"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "turn off notifications"
+msgstr "Не можна вимкнути сповіщення."
+
+#. TRANS: Help message for IM/SMS command "help"
+msgctxt "COMMANDHELP"
+msgid "show this help"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "follow <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "subscribe to user"
+msgstr "Підписатись до цього користувача"
+
+#. TRANS: Help message for IM/SMS command "groups"
+msgctxt "COMMANDHELP"
+msgid "lists the groups you have joined"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscriptions"
+msgctxt "COMMANDHELP"
+msgid "list the people you follow"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscribers"
+msgctxt "COMMANDHELP"
+msgid "list the people that follow you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "leave <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "unsubscribe from user"
+msgstr "Відписатись від цього користувача"
+
+#. TRANS: Help message for IM/SMS command "d <nickname> <text>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "direct message to user"
+msgstr "Пряме повідомлення до %s"
+
+#. TRANS: Help message for IM/SMS command "get <nickname>"
+msgctxt "COMMANDHELP"
+msgid "get last notice from user"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "whois <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "get profile info on user"
+msgstr "Віддалений профіль не є спільнотою!"
+
+#. TRANS: Help message for IM/SMS command "lose <nickname>"
+msgctxt "COMMANDHELP"
+msgid "force user to stop following you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav <nickname>"
+msgctxt "COMMANDHELP"
+msgid "add user's last notice as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "add notice with the given id as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "repeat a notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "repeat the last notice from user"
+msgstr "Повторити цей допис"
+
+#. TRANS: Help message for IM/SMS command "reply #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "reply to notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "reply <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "reply to the last notice from user"
+msgstr "Відповісти на цей допис"
+
+#. TRANS: Help message for IM/SMS command "join <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "join group"
+msgstr "Невідома спільнота."
+
+#. TRANS: Help message for IM/SMS command "login"
+msgctxt "COMMANDHELP"
+msgid "Get a link to login to the web interface"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "drop <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "leave group"
+msgstr "Видалити спільноту"
+
+#. TRANS: Help message for IM/SMS command "stats"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "get your stats"
+msgstr "Оновити свій статус..."
+
+#. TRANS: Help message for IM/SMS command "stop"
+#. TRANS: Help message for IM/SMS command "quit"
+msgctxt "COMMANDHELP"
+msgid "same as 'off'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "sub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'follow'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "unsub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'leave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "last <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'get'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "on <nickname>"
+#. TRANS: Help message for IM/SMS command "off <nickname>"
+#. TRANS: Help message for IM/SMS command "invite <phone number>"
+#. TRANS: Help message for IM/SMS command "track <word>"
+#. TRANS: Help message for IM/SMS command "untrack <word>"
+#. TRANS: Help message for IM/SMS command "track off"
+#. TRANS: Help message for IM/SMS command "untrack all"
+#. TRANS: Help message for IM/SMS command "tracks"
+#. TRANS: Help message for IM/SMS command "tracking"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "not yet implemented."
+msgstr "Виконання команди ще не завершено."
+
+#. TRANS: Help message for IM/SMS command "nudge <nickname>"
+msgctxt "COMMANDHELP"
+msgid "remind a user to update."
 msgstr ""
-"Команди:\n"
-"on — увімкнути сповіщення\n"
-"off — вимкнути сповіщення\n"
-"help — список команд\n"
-"follow <nickname> — підписатись до користувача\n"
-"groups — спільноти, до яких ви входите\n"
-"subscriptions — користувачі, до яких ви підписані\n"
-"subscribers — користувачі, які підписані до вас\n"
-"leave <nickname> — відписатись від користувача\n"
-"d <nickname> <text> — надіслати особисте повідомлення\n"
-"get <nickname> — отримати останній допис користувача\n"
-"whois <nickname> — інфо про користувача\n"
-"fav <nickname> — додати останній допис користувача до обраних\n"
-"fav #<notice_id> — додати допис до обраних\n"
-"reply #<notice_id> — відповісти на допис\n"
-"reply <nickname> — відповісти на останній допис користувача\n"
-"join <group> — приєднатися до спільноти\n"
-"login — отримати посилання входу до веб-інтерфейсу\n"
-"drop <group> — залишити спільноту\n"
-"stats — отримати статистику\n"
-"stop — те саме що і 'off'\n"
-"quit — те саме що і 'off'\n"
-"sub <nickname> — те саме що і 'follow'\n"
-"unsub <nickname> — те саме що і 'leave'\n"
-"last <nickname> — те саме що і 'get'\n"
-"on <nickname> — наразі не виконується\n"
-"off <nickname> — наразі не виконується\n"
-"nudge <nickname> — «розштовхати»\n"
-"invite <phone number> — наразі не виконується\n"
-"track <word> — наразі не виконується\n"
-"untrack <word> — наразі не виконується\n"
-"track off — наразі не виконується\n"
-"untrack all — наразі не виконується\n"
-"tracks — наразі не виконується\n"
-"tracking — наразі не виконується\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 msgid "No configuration file found."
@@ -6970,6 +7085,9 @@ msgid ""
 msgstr ""
 "Розташування спільноти, на кшталт «Місто, область (або регіон), країна»."
 
+msgid "Aliases"
+msgstr "Додаткові імена"
+
 #, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -7054,6 +7172,10 @@ msgctxt "TOOLTIP"
 msgid "Add or edit %s design"
 msgstr "Додати або редагувати дизайн %s"
 
+#. TRANS: Group actions header (h2). Text hidden by default.
+msgid "Group actions"
+msgstr "Дії спільноти"
+
 #. TRANS: Title for groups with the most members section.
 msgid "Groups with most members"
 msgstr "Спільноти з найбільшою кількістю учасників"
@@ -7630,6 +7752,7 @@ msgstr "Надіслати допис"
 msgid "What's up, %s?"
 msgstr "Що нового, %s?"
 
+#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr "Вкласти"
 
@@ -7698,7 +7821,7 @@ msgid "Notice repeated"
 msgstr "Допис повторили"
 
 msgid "Update your status..."
-msgstr ""
+msgstr "Оновити свій статус..."
 
 msgid "Nudge this user"
 msgstr "«Розштовхати» користувача"
@@ -8089,52 +8212,6 @@ msgstr "Відписатись"
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "Користувач %1$s (%2$d) не має профілю."
 
-msgid "Edit Avatar"
-msgstr "Аватара"
-
-#. TRANS: H2 for user actions in a profile.
-#. TRANS: H2 for entity actions in a profile.
-msgid "User actions"
-msgstr "Діяльність користувача"
-
-#. TRANS: Text shown in user profile of not yet compeltely deleted users.
-msgid "User deletion in progress..."
-msgstr "Видалення користувача у процесі..."
-
-#. TRANS: Link title for link on user profile.
-msgid "Edit profile settings"
-msgstr "Налаштування профілю"
-
-#. TRANS: Link text for link on user profile.
-msgid "Edit"
-msgstr "Правка"
-
-#. TRANS: Link title for link on user profile.
-msgid "Send a direct message to this user"
-msgstr "Надіслати пряме повідомлення цьому користувачеві"
-
-#. TRANS: Link text for link on user profile.
-msgid "Message"
-msgstr "Повідомлення"
-
-#. TRANS: Label text on user profile to select a user role.
-msgid "Moderate"
-msgstr "Модерувати"
-
-#. TRANS: Label text on user profile to select a user role.
-msgid "User role"
-msgstr "Роль користувача"
-
-#. TRANS: Role that can be set for a user profile.
-msgctxt "role"
-msgid "Administrator"
-msgstr "Адміністратор"
-
-#. TRANS: Role that can be set for a user profile.
-msgctxt "role"
-msgid "Moderator"
-msgstr "Модератор"
-
 msgid "Not allowed to log in."
 msgstr "Вхід до системи не дозволено."
 
@@ -8212,3 +8289,85 @@ msgstr "Неправильний XML, корінь XRD відсутній."
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr "Отримання резервної копії файлу «%s»."
+
+#~ msgid "Note"
+#~ msgstr "Зауваження"
+
+#~ msgid ""
+#~ "Commands:\n"
+#~ "on - turn on notifications\n"
+#~ "off - turn off notifications\n"
+#~ "help - show this help\n"
+#~ "follow <nickname> - subscribe to user\n"
+#~ "groups - lists the groups you have joined\n"
+#~ "subscriptions - list the people you follow\n"
+#~ "subscribers - list the people that follow you\n"
+#~ "leave <nickname> - unsubscribe from user\n"
+#~ "d <nickname> <text> - direct message to user\n"
+#~ "get <nickname> - get last notice from user\n"
+#~ "whois <nickname> - get profile info on user\n"
+#~ "lose <nickname> - force user to stop following you\n"
+#~ "fav <nickname> - add user's last notice as a 'fave'\n"
+#~ "fav #<notice_id> - add notice with the given id as a 'fave'\n"
+#~ "repeat #<notice_id> - repeat a notice with a given id\n"
+#~ "repeat <nickname> - repeat the last notice from user\n"
+#~ "reply #<notice_id> - reply to notice with a given id\n"
+#~ "reply <nickname> - reply to the last notice from user\n"
+#~ "join <group> - join group\n"
+#~ "login - Get a link to login to the web interface\n"
+#~ "drop <group> - leave group\n"
+#~ "stats - get your stats\n"
+#~ "stop - same as 'off'\n"
+#~ "quit - same as 'off'\n"
+#~ "sub <nickname> - same as 'follow'\n"
+#~ "unsub <nickname> - same as 'leave'\n"
+#~ "last <nickname> - same as 'get'\n"
+#~ "on <nickname> - not yet implemented.\n"
+#~ "off <nickname> - not yet implemented.\n"
+#~ "nudge <nickname> - remind a user to update.\n"
+#~ "invite <phone number> - not yet implemented.\n"
+#~ "track <word> - not yet implemented.\n"
+#~ "untrack <word> - not yet implemented.\n"
+#~ "track off - not yet implemented.\n"
+#~ "untrack all - not yet implemented.\n"
+#~ "tracks - not yet implemented.\n"
+#~ "tracking - not yet implemented.\n"
+#~ msgstr ""
+#~ "Команди:\n"
+#~ "on — увімкнути сповіщення\n"
+#~ "off — вимкнути сповіщення\n"
+#~ "help — список команд\n"
+#~ "follow <nickname> — підписатись до користувача\n"
+#~ "groups — спільноти, до яких ви входите\n"
+#~ "subscriptions — користувачі, до яких ви підписані\n"
+#~ "subscribers — користувачі, які підписані до вас\n"
+#~ "leave <nickname> — відписатись від користувача\n"
+#~ "d <nickname> <text> — надіслати особисте повідомлення\n"
+#~ "get <nickname> — отримати останній допис користувача\n"
+#~ "whois <nickname> — інфо про користувача\n"
+#~ "fav <nickname> — додати останній допис користувача до обраних\n"
+#~ "fav #<notice_id> — додати допис до обраних\n"
+#~ "reply #<notice_id> — відповісти на допис\n"
+#~ "reply <nickname> — відповісти на останній допис користувача\n"
+#~ "join <group> — приєднатися до спільноти\n"
+#~ "login — отримати посилання входу до веб-інтерфейсу\n"
+#~ "drop <group> — залишити спільноту\n"
+#~ "stats — отримати статистику\n"
+#~ "stop — те саме що і 'off'\n"
+#~ "quit — те саме що і 'off'\n"
+#~ "sub <nickname> — те саме що і 'follow'\n"
+#~ "unsub <nickname> — те саме що і 'leave'\n"
+#~ "last <nickname> — те саме що і 'get'\n"
+#~ "on <nickname> — наразі не виконується\n"
+#~ "off <nickname> — наразі не виконується\n"
+#~ "nudge <nickname> — «розштовхати»\n"
+#~ "invite <phone number> — наразі не виконується\n"
+#~ "track <word> — наразі не виконується\n"
+#~ "untrack <word> — наразі не виконується\n"
+#~ "track off — наразі не виконується\n"
+#~ "untrack all — наразі не виконується\n"
+#~ "tracks — наразі не виконується\n"
+#~ "tracking — наразі не виконується\n"
+
+#~ msgid "Edit Avatar"
+#~ msgstr "Аватара"
diff --git a/locale/zh_CN/LC_MESSAGES/statusnet.po b/locale/zh_CN/LC_MESSAGES/statusnet.po
index 022e28922e..1b63db606d 100644
--- a/locale/zh_CN/LC_MESSAGES/statusnet.po
+++ b/locale/zh_CN/LC_MESSAGES/statusnet.po
@@ -15,18 +15,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-11 18:15+0000\n"
-"PO-Revision-Date: 2011-03-11 18:17:32+0000\n"
+"POT-Creation-Date: 2011-03-17 09:47+0000\n"
+"PO-Revision-Date: 2011-03-17 09:50:02+0000\n"
 "Language-Team: Simplified Chinese <http://translatewiki.net/wiki/Portal:zh-"
 "hans>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83703); Translate extension (2011-03-11)\n"
+"X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-POT-Import-Date: 2011-03-08 01:25:01+0000\n"
+"X-POT-Import-Date: 2011-03-11 18:52:41+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -581,7 +581,7 @@ msgstr "无法把用户%1$s从%2$s小组删除"
 msgid "%s's groups"
 msgstr "%s 的小组"
 
-#. TRANS: Used as subtitle in check for group membership. %1$s is a user name, %2$s is the site name.
+#. TRANS: Used as subtitle in check for group membership. %1$s is the site name, %2$s is a user name.
 #, php-format
 msgid "%1$s groups %2$s is a member of."
 msgstr "%1$s 的小组，%2$s 是小组成员。"
@@ -4493,18 +4493,6 @@ msgstr "%s 小组"
 msgid "%1$s group, page %2$d"
 msgstr "%1$s小组，第%2$d页"
 
-#. TRANS: Label for group description or group note (dt). Text hidden by default.
-msgid "Note"
-msgstr "注释"
-
-#. TRANS: Label for group aliases (dt). Text hidden by default.
-msgid "Aliases"
-msgstr "别名"
-
-#. TRANS: Group actions header (h2). Text hidden by default.
-msgid "Group actions"
-msgstr "小组动作"
-
 #. TRANS: Tooltip for feed link. %s is a group nickname.
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
@@ -4614,6 +4602,10 @@ msgstr "来自 %1$s 的 %2$s 消息"
 msgid "Notice deleted."
 msgstr "消息已删除"
 
+#, fuzzy
+msgid "Notice"
+msgstr "消息"
+
 #. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
 #, php-format
 msgid "%1$s tagged %2$s"
@@ -5129,7 +5121,6 @@ msgstr "没有 ID 冲突。"
 msgid "Tag %s"
 msgstr "将%s加为标签"
 
-#. TRANS: H2 for user profile information.
 msgid "User profile"
 msgstr "用户页面"
 
@@ -5803,6 +5794,49 @@ msgstr ""
 msgid "No AtomPub API service for %s."
 msgstr ""
 
+#. TRANS: H2 for user actions in a profile.
+#. TRANS: H2 for entity actions in a profile.
+msgid "User actions"
+msgstr "用户动作"
+
+#. TRANS: Text shown in user profile of not yet compeltely deleted users.
+msgid "User deletion in progress..."
+msgstr "用户删除处理中……"
+
+#. TRANS: Link title for link on user profile.
+msgid "Edit profile settings"
+msgstr "编辑个人信息设置"
+
+#. TRANS: Link text for link on user profile.
+msgid "Edit"
+msgstr "编辑"
+
+#. TRANS: Link title for link on user profile.
+msgid "Send a direct message to this user"
+msgstr "给该用户发送私信"
+
+#. TRANS: Link text for link on user profile.
+msgid "Message"
+msgstr "私信"
+
+#. TRANS: Label text on user profile to select a user role.
+msgid "Moderate"
+msgstr "审核"
+
+#. TRANS: Label text on user profile to select a user role.
+msgid "User role"
+msgstr "用户权限"
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Administrator"
+msgstr "管理员"
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Moderator"
+msgstr "审核员"
+
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
 #, php-format
 msgid "%1$s - %2$s"
@@ -6501,85 +6535,171 @@ msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "你是该小组成员："
 
-#. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-msgid ""
-"Commands:\n"
-"on - turn on notifications\n"
-"off - turn off notifications\n"
-"help - show this help\n"
-"follow <nickname> - subscribe to user\n"
-"groups - lists the groups you have joined\n"
-"subscriptions - list the people you follow\n"
-"subscribers - list the people that follow you\n"
-"leave <nickname> - unsubscribe from user\n"
-"d <nickname> <text> - direct message to user\n"
-"get <nickname> - get last notice from user\n"
-"whois <nickname> - get profile info on user\n"
-"lose <nickname> - force user to stop following you\n"
-"fav <nickname> - add user's last notice as a 'fave'\n"
-"fav #<notice_id> - add notice with the given id as a 'fave'\n"
-"repeat #<notice_id> - repeat a notice with a given id\n"
-"repeat <nickname> - repeat the last notice from user\n"
-"reply #<notice_id> - reply to notice with a given id\n"
-"reply <nickname> - reply to the last notice from user\n"
-"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
-"drop <group> - leave group\n"
-"stats - get your stats\n"
-"stop - same as 'off'\n"
-"quit - same as 'off'\n"
-"sub <nickname> - same as 'follow'\n"
-"unsub <nickname> - same as 'leave'\n"
-"last <nickname> - same as 'get'\n"
-"on <nickname> - not yet implemented.\n"
-"off <nickname> - not yet implemented.\n"
-"nudge <nickname> - remind a user to update.\n"
-"invite <phone number> - not yet implemented.\n"
-"track <word> - not yet implemented.\n"
-"untrack <word> - not yet implemented.\n"
-"track off - not yet implemented.\n"
-"untrack all - not yet implemented.\n"
-"tracks - not yet implemented.\n"
-"tracking - not yet implemented.\n"
+#. TRANS: Header line of help text for commands.
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "Commands:"
+msgstr "执行结果"
+
+#. TRANS: Help message for IM/SMS command "on"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "turn on notifications"
+msgstr "无法开启通知。"
+
+#. TRANS: Help message for IM/SMS command "off"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "turn off notifications"
+msgstr "无法关闭通知。"
+
+#. TRANS: Help message for IM/SMS command "help"
+msgctxt "COMMANDHELP"
+msgid "show this help"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "follow <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "subscribe to user"
+msgstr "关注这个用户"
+
+#. TRANS: Help message for IM/SMS command "groups"
+msgctxt "COMMANDHELP"
+msgid "lists the groups you have joined"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscriptions"
+msgctxt "COMMANDHELP"
+msgid "list the people you follow"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscribers"
+msgctxt "COMMANDHELP"
+msgid "list the people that follow you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "leave <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "unsubscribe from user"
+msgstr "取消关注这个用户"
+
+#. TRANS: Help message for IM/SMS command "d <nickname> <text>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "direct message to user"
+msgstr "发给%s的私信"
+
+#. TRANS: Help message for IM/SMS command "get <nickname>"
+msgctxt "COMMANDHELP"
+msgid "get last notice from user"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "whois <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "get profile info on user"
+msgstr "远程配置文件不是一个组 ！"
+
+#. TRANS: Help message for IM/SMS command "lose <nickname>"
+msgctxt "COMMANDHELP"
+msgid "force user to stop following you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav <nickname>"
+msgctxt "COMMANDHELP"
+msgid "add user's last notice as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "add notice with the given id as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "repeat a notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "repeat the last notice from user"
+msgstr "转发"
+
+#. TRANS: Help message for IM/SMS command "reply #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "reply to notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "reply <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "reply to the last notice from user"
+msgstr "回复"
+
+#. TRANS: Help message for IM/SMS command "join <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "join group"
+msgstr "未知的组。"
+
+#. TRANS: Help message for IM/SMS command "login"
+msgctxt "COMMANDHELP"
+msgid "Get a link to login to the web interface"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "drop <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "leave group"
+msgstr "删除小组"
+
+#. TRANS: Help message for IM/SMS command "stats"
+msgctxt "COMMANDHELP"
+msgid "get your stats"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "stop"
+#. TRANS: Help message for IM/SMS command "quit"
+msgctxt "COMMANDHELP"
+msgid "same as 'off'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "sub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'follow'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "unsub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'leave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "last <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'get'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "on <nickname>"
+#. TRANS: Help message for IM/SMS command "off <nickname>"
+#. TRANS: Help message for IM/SMS command "invite <phone number>"
+#. TRANS: Help message for IM/SMS command "track <word>"
+#. TRANS: Help message for IM/SMS command "untrack <word>"
+#. TRANS: Help message for IM/SMS command "track off"
+#. TRANS: Help message for IM/SMS command "untrack all"
+#. TRANS: Help message for IM/SMS command "tracks"
+#. TRANS: Help message for IM/SMS command "tracking"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "not yet implemented."
+msgstr "命令尚未实现。"
+
+#. TRANS: Help message for IM/SMS command "nudge <nickname>"
+msgctxt "COMMANDHELP"
+msgid "remind a user to update."
 msgstr ""
-"命令：\n"
-"on - 打开提醒\n"
-"off - 关闭提醒\n"
-"help - 显示此帮助\n"
-"follow <昵称> - 关注该用户\n"
-"groups - 列出你加入的小组\n"
-"subscriptions - 列出你关注的用户\n"
-"subscribers - 列出你的关注者\n"
-"leave <昵称> - 取消关注该用户\n"
-"d <昵称> <文字> - 给该用户发送私信\n"
-"get <昵称> - 获取该用户的最后一条消息\n"
-"whois <昵称> - 获取该用户的个人信息\n"
-"lose <昵称> - 强行取消该用户对你的关注\n"
-"fav <昵称> - 将该用户最后一条消息加为'收藏'\n"
-"fav #<消息id> - 将该id的消息加为'收藏'\n"
-"repeat #<消息id> - 转发该id的消息\n"
-"repeat <昵称> - 转发该用户的最后一条消息\n"
-"reply #<消息id> - 对该id消息回复\n"
-"reply <昵称> - 对该用户的最后一条消息回复\n"
-"join <小组> - 加入小组\n"
-"login - 获取网页登录的地址\n"
-"drop <小组> - 离开小组\n"
-"stats - 获取你的统计\n"
-"stop - 和'off'相同\n"
-"quit - 和'off'相同\n"
-"sub <昵称> - 和'follow'相同\n"
-"unsub <昵称> - 和'leave'相同\n"
-"last <昵称> - 和'get'相同\n"
-"on <昵称> - 尚未实现。\n"
-"off <昵称> - 尚未实现。\n"
-"nudge <昵称> - 提醒该用户更新消息。\n"
-"invite <电话号码> - 尚未实现。\n"
-"track <word> - 尚未实现。\n"
-"untrack <word> - 尚未实现。\n"
-"track off - 尚未实现。\n"
-"untrack all - 尚未实现。\n"
-"tracks - 尚未实现。\n"
-"tracking - 尚未实现。\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 msgid "No configuration file found."
@@ -6750,6 +6870,9 @@ msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\"."
 msgstr "小组的地理位置，例如“国家、省份、城市”。"
 
+msgid "Aliases"
+msgstr "别名"
+
 #, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -6826,6 +6949,10 @@ msgctxt "TOOLTIP"
 msgid "Add or edit %s design"
 msgstr "添加或编辑 %s 外观"
 
+#. TRANS: Group actions header (h2). Text hidden by default.
+msgid "Group actions"
+msgstr "小组动作"
+
 #. TRANS: Title for groups with the most members section.
 msgid "Groups with most members"
 msgstr "人气最旺的小组"
@@ -7381,6 +7508,7 @@ msgstr "发送一个通知"
 msgid "What's up, %s?"
 msgstr "%s，最近怎么样？"
 
+#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr "附件"
 
@@ -7829,52 +7957,6 @@ msgstr "取消关注"
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "用户 %1$s (%2$d) 没有个人信息记录。"
 
-msgid "Edit Avatar"
-msgstr "编辑头像"
-
-#. TRANS: H2 for user actions in a profile.
-#. TRANS: H2 for entity actions in a profile.
-msgid "User actions"
-msgstr "用户动作"
-
-#. TRANS: Text shown in user profile of not yet compeltely deleted users.
-msgid "User deletion in progress..."
-msgstr "用户删除处理中……"
-
-#. TRANS: Link title for link on user profile.
-msgid "Edit profile settings"
-msgstr "编辑个人信息设置"
-
-#. TRANS: Link text for link on user profile.
-msgid "Edit"
-msgstr "编辑"
-
-#. TRANS: Link title for link on user profile.
-msgid "Send a direct message to this user"
-msgstr "给该用户发送私信"
-
-#. TRANS: Link text for link on user profile.
-msgid "Message"
-msgstr "私信"
-
-#. TRANS: Label text on user profile to select a user role.
-msgid "Moderate"
-msgstr "审核"
-
-#. TRANS: Label text on user profile to select a user role.
-msgid "User role"
-msgstr "用户权限"
-
-#. TRANS: Role that can be set for a user profile.
-msgctxt "role"
-msgid "Administrator"
-msgstr "管理员"
-
-#. TRANS: Role that can be set for a user profile.
-msgctxt "role"
-msgid "Moderator"
-msgstr "审核员"
-
 msgid "Not allowed to log in."
 msgstr "不允许登录。"
 
@@ -7944,3 +8026,88 @@ msgstr "不合法的XML, 缺少XRD根"
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr "从文件'%s'获取备份。"
+
+#~ msgid "Note"
+#~ msgstr "注释"
+
+#~ msgid ""
+#~ "Commands:\n"
+#~ "on - turn on notifications\n"
+#~ "off - turn off notifications\n"
+#~ "help - show this help\n"
+#~ "follow <nickname> - subscribe to user\n"
+#~ "groups - lists the groups you have joined\n"
+#~ "subscriptions - list the people you follow\n"
+#~ "subscribers - list the people that follow you\n"
+#~ "leave <nickname> - unsubscribe from user\n"
+#~ "d <nickname> <text> - direct message to user\n"
+#~ "get <nickname> - get last notice from user\n"
+#~ "whois <nickname> - get profile info on user\n"
+#~ "lose <nickname> - force user to stop following you\n"
+#~ "fav <nickname> - add user's last notice as a 'fave'\n"
+#~ "fav #<notice_id> - add notice with the given id as a 'fave'\n"
+#~ "repeat #<notice_id> - repeat a notice with a given id\n"
+#~ "repeat <nickname> - repeat the last notice from user\n"
+#~ "reply #<notice_id> - reply to notice with a given id\n"
+#~ "reply <nickname> - reply to the last notice from user\n"
+#~ "join <group> - join group\n"
+#~ "login - Get a link to login to the web interface\n"
+#~ "drop <group> - leave group\n"
+#~ "stats - get your stats\n"
+#~ "stop - same as 'off'\n"
+#~ "quit - same as 'off'\n"
+#~ "sub <nickname> - same as 'follow'\n"
+#~ "unsub <nickname> - same as 'leave'\n"
+#~ "last <nickname> - same as 'get'\n"
+#~ "on <nickname> - not yet implemented.\n"
+#~ "off <nickname> - not yet implemented.\n"
+#~ "nudge <nickname> - remind a user to update.\n"
+#~ "invite <phone number> - not yet implemented.\n"
+#~ "track <word> - not yet implemented.\n"
+#~ "untrack <word> - not yet implemented.\n"
+#~ "track off - not yet implemented.\n"
+#~ "untrack all - not yet implemented.\n"
+#~ "tracks - not yet implemented.\n"
+#~ "tracking - not yet implemented.\n"
+#~ msgstr ""
+#~ "命令：\n"
+#~ "on - 打开提醒\n"
+#~ "off - 关闭提醒\n"
+#~ "help - 显示此帮助\n"
+#~ "follow <昵称> - 关注该用户\n"
+#~ "groups - 列出你加入的小组\n"
+#~ "subscriptions - 列出你关注的用户\n"
+#~ "subscribers - 列出你的关注者\n"
+#~ "leave <昵称> - 取消关注该用户\n"
+#~ "d <昵称> <文字> - 给该用户发送私信\n"
+#~ "get <昵称> - 获取该用户的最后一条消息\n"
+#~ "whois <昵称> - 获取该用户的个人信息\n"
+#~ "lose <昵称> - 强行取消该用户对你的关注\n"
+#~ "fav <昵称> - 将该用户最后一条消息加为'收藏'\n"
+#~ "fav #<消息id> - 将该id的消息加为'收藏'\n"
+#~ "repeat #<消息id> - 转发该id的消息\n"
+#~ "repeat <昵称> - 转发该用户的最后一条消息\n"
+#~ "reply #<消息id> - 对该id消息回复\n"
+#~ "reply <昵称> - 对该用户的最后一条消息回复\n"
+#~ "join <小组> - 加入小组\n"
+#~ "login - 获取网页登录的地址\n"
+#~ "drop <小组> - 离开小组\n"
+#~ "stats - 获取你的统计\n"
+#~ "stop - 和'off'相同\n"
+#~ "quit - 和'off'相同\n"
+#~ "sub <昵称> - 和'follow'相同\n"
+#~ "unsub <昵称> - 和'leave'相同\n"
+#~ "last <昵称> - 和'get'相同\n"
+#~ "on <昵称> - 尚未实现。\n"
+#~ "off <昵称> - 尚未实现。\n"
+#~ "nudge <昵称> - 提醒该用户更新消息。\n"
+#~ "invite <电话号码> - 尚未实现。\n"
+#~ "track <word> - 尚未实现。\n"
+#~ "untrack <word> - 尚未实现。\n"
+#~ "track off - 尚未实现。\n"
+#~ "untrack all - 尚未实现。\n"
+#~ "tracks - 尚未实现。\n"
+#~ "tracking - 尚未实现。\n"
+
+#~ msgid "Edit Avatar"
+#~ msgstr "编辑头像"
diff --git a/plugins/Directory/locale/ia/LC_MESSAGES/Directory.po b/plugins/Directory/locale/ia/LC_MESSAGES/Directory.po
new file mode 100644
index 0000000000..e1e04c8ca8
--- /dev/null
+++ b/plugins/Directory/locale/ia/LC_MESSAGES/Directory.po
@@ -0,0 +1,54 @@
+# Translation of StatusNet - Directory to Interlingua (Interlingua)
+# Exported from translatewiki.net
+#
+# Author: McDutchie
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Directory\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-17 09:47+0000\n"
+"PO-Revision-Date: 2011-03-17 09:50:27+0000\n"
+"Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-03-11 18:57:51+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: ia\n"
+"X-Message-Group: #out-statusnet-plugin-directory\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#, php-format
+msgid "User Directory, page %d"
+msgstr "Catalogo de usatores, pagina %d"
+
+msgid "User directory"
+msgstr "Catalogo de usatores"
+
+#, php-format
+msgid "User directory - %s"
+msgstr "Catalogo de usatores - %s"
+
+#, php-format
+msgid "User directory - %s, page %d"
+msgstr "Catalogo de usatores - %s, pagina %d"
+
+msgctxt "BUTTON"
+msgid "Search"
+msgstr "Cercar"
+
+#, php-format
+msgid "No users starting with %s"
+msgstr "Il non ha usatores de qui le nomine comencia con \"%s\""
+
+msgid "Add a user directory."
+msgstr "Adder un catalogo de usatores."
+
+msgid "Nickname"
+msgstr "Pseudonymo"
+
+msgid "Created"
+msgstr "Create le"
diff --git a/plugins/Directory/locale/mk/LC_MESSAGES/Directory.po b/plugins/Directory/locale/mk/LC_MESSAGES/Directory.po
new file mode 100644
index 0000000000..727c85c1ec
--- /dev/null
+++ b/plugins/Directory/locale/mk/LC_MESSAGES/Directory.po
@@ -0,0 +1,54 @@
+# Translation of StatusNet - Directory to Macedonian (Македонски)
+# Exported from translatewiki.net
+#
+# Author: Bjankuloski06
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Directory\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-17 09:47+0000\n"
+"PO-Revision-Date: 2011-03-17 09:50:27+0000\n"
+"Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-03-11 18:57:51+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: mk\n"
+"X-Message-Group: #out-statusnet-plugin-directory\n"
+"Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
+
+#, php-format
+msgid "User Directory, page %d"
+msgstr "Кориснички именик, стр. %d"
+
+msgid "User directory"
+msgstr "Кориснички именик"
+
+#, php-format
+msgid "User directory - %s"
+msgstr "Кориснички именик - %s"
+
+#, php-format
+msgid "User directory - %s, page %d"
+msgstr "Кориснички именик - %s, стр. %d"
+
+msgctxt "BUTTON"
+msgid "Search"
+msgstr "Пребарај"
+
+#, php-format
+msgid "No users starting with %s"
+msgstr "Нема корисници што почнуваат на %s"
+
+msgid "Add a user directory."
+msgstr "Додај кориснички именик."
+
+msgid "Nickname"
+msgstr "Прекар"
+
+msgid "Created"
+msgstr "Создадено"
diff --git a/plugins/Directory/locale/nl/LC_MESSAGES/Directory.po b/plugins/Directory/locale/nl/LC_MESSAGES/Directory.po
new file mode 100644
index 0000000000..62c9b48418
--- /dev/null
+++ b/plugins/Directory/locale/nl/LC_MESSAGES/Directory.po
@@ -0,0 +1,55 @@
+# Translation of StatusNet - Directory to Dutch (Nederlands)
+# Exported from translatewiki.net
+#
+# Author: McDutchie
+# Author: Siebrand
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Directory\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-17 09:47+0000\n"
+"PO-Revision-Date: 2011-03-17 09:50:27+0000\n"
+"Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-03-11 18:57:51+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: nl\n"
+"X-Message-Group: #out-statusnet-plugin-directory\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#, php-format
+msgid "User Directory, page %d"
+msgstr "Gebruikerslijst, pagina %d"
+
+msgid "User directory"
+msgstr "Gebruikerslijst"
+
+#, php-format
+msgid "User directory - %s"
+msgstr "Gebruikerslijst - %s"
+
+#, php-format
+msgid "User directory - %s, page %d"
+msgstr "Gebruikerslijst - %s, pagina %d"
+
+msgctxt "BUTTON"
+msgid "Search"
+msgstr "Zoeken"
+
+#, php-format
+msgid "No users starting with %s"
+msgstr "Er zijn geen gebruikers wiens naam begint met \"%s\""
+
+msgid "Add a user directory."
+msgstr "Een gebruikerslijst toevoegen."
+
+msgid "Nickname"
+msgstr "Gebruikersnaam"
+
+msgid "Created"
+msgstr "Aangemaakt"
diff --git a/plugins/Directory/locale/uk/LC_MESSAGES/Directory.po b/plugins/Directory/locale/uk/LC_MESSAGES/Directory.po
new file mode 100644
index 0000000000..fe4bd127f7
--- /dev/null
+++ b/plugins/Directory/locale/uk/LC_MESSAGES/Directory.po
@@ -0,0 +1,55 @@
+# Translation of StatusNet - Directory to Ukrainian (Українська)
+# Exported from translatewiki.net
+#
+# Author: Boogie
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Directory\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-17 09:47+0000\n"
+"PO-Revision-Date: 2011-03-17 09:50:27+0000\n"
+"Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-03-11 18:57:51+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: uk\n"
+"X-Message-Group: #out-statusnet-plugin-directory\n"
+"Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
+"2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
+
+#, php-format
+msgid "User Directory, page %d"
+msgstr "Каталог користувача, сторінка %d"
+
+msgid "User directory"
+msgstr "Каталог користувача"
+
+#, php-format
+msgid "User directory - %s"
+msgstr "Каталог користувача — %s"
+
+#, php-format
+msgid "User directory - %s, page %d"
+msgstr "Каталог користувача — %s, сторінка %d"
+
+msgctxt "BUTTON"
+msgid "Search"
+msgstr "Пошук"
+
+#, php-format
+msgid "No users starting with %s"
+msgstr "Немає користувачів, починаючи з %s"
+
+msgid "Add a user directory."
+msgstr "Додати каталог користувача."
+
+msgid "Nickname"
+msgstr "Псевдонім"
+
+msgid "Created"
+msgstr "Створено"
diff --git a/plugins/Event/locale/Event.pot b/plugins/Event/locale/Event.pot
index 5bc2222982..f20adc453e 100644
--- a/plugins/Event/locale/Event.pot
+++ b/plugins/Event/locale/Event.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-11 18:15+0000\n"
+"POT-Creation-Date: 2011-03-17 09:47+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -21,17 +21,17 @@ msgctxt "BUTTON"
 msgid "Cancel"
 msgstr ""
 
-#: rsvpform.php:116
+#: rsvpform.php:117
 msgctxt "BUTTON"
 msgid "Yes"
 msgstr ""
 
-#: rsvpform.php:117
+#: rsvpform.php:118
 msgctxt "BUTTON"
 msgid "No"
 msgstr ""
 
-#: rsvpform.php:118
+#: rsvpform.php:119
 msgctxt "BUTTON"
 msgid "Maybe"
 msgstr ""
diff --git a/plugins/Event/locale/ia/LC_MESSAGES/Event.po b/plugins/Event/locale/ia/LC_MESSAGES/Event.po
new file mode 100644
index 0000000000..375f447dae
--- /dev/null
+++ b/plugins/Event/locale/ia/LC_MESSAGES/Event.po
@@ -0,0 +1,48 @@
+# Translation of StatusNet - Event to Interlingua (Interlingua)
+# Exported from translatewiki.net
+#
+# Author: McDutchie
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Event\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-17 09:47+0000\n"
+"PO-Revision-Date: 2011-03-17 09:50:35+0000\n"
+"Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-03-11 18:57:56+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: ia\n"
+"X-Message-Group: #out-statusnet-plugin-event\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgctxt "BUTTON"
+msgid "Cancel"
+msgstr "Cancellar"
+
+msgctxt "BUTTON"
+msgid "Yes"
+msgstr "Si"
+
+msgctxt "BUTTON"
+msgid "No"
+msgstr "No"
+
+msgctxt "BUTTON"
+msgid "Maybe"
+msgstr "Forsan"
+
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "Salveguardar"
+
+msgid "Event invitations and RSVPs."
+msgstr "Invitationes a eventos e responsas a illos."
+
+msgid "Event"
+msgstr "Evento"
diff --git a/plugins/Event/locale/mk/LC_MESSAGES/Event.po b/plugins/Event/locale/mk/LC_MESSAGES/Event.po
new file mode 100644
index 0000000000..e00dab09fc
--- /dev/null
+++ b/plugins/Event/locale/mk/LC_MESSAGES/Event.po
@@ -0,0 +1,48 @@
+# Translation of StatusNet - Event to Macedonian (Македонски)
+# Exported from translatewiki.net
+#
+# Author: Bjankuloski06
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Event\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-17 09:47+0000\n"
+"PO-Revision-Date: 2011-03-17 09:50:35+0000\n"
+"Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-03-11 18:57:56+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: mk\n"
+"X-Message-Group: #out-statusnet-plugin-event\n"
+"Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
+
+msgctxt "BUTTON"
+msgid "Cancel"
+msgstr "Откажи"
+
+msgctxt "BUTTON"
+msgid "Yes"
+msgstr "Да"
+
+msgctxt "BUTTON"
+msgid "No"
+msgstr "Не"
+
+msgctxt "BUTTON"
+msgid "Maybe"
+msgstr "Можеби"
+
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "Зачувај"
+
+msgid "Event invitations and RSVPs."
+msgstr "Покани и одговори за настани"
+
+msgid "Event"
+msgstr "Настан"
diff --git a/plugins/Event/locale/nl/LC_MESSAGES/Event.po b/plugins/Event/locale/nl/LC_MESSAGES/Event.po
new file mode 100644
index 0000000000..6eb1afdf3d
--- /dev/null
+++ b/plugins/Event/locale/nl/LC_MESSAGES/Event.po
@@ -0,0 +1,48 @@
+# Translation of StatusNet - Event to Dutch (Nederlands)
+# Exported from translatewiki.net
+#
+# Author: Siebrand
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Event\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-17 09:47+0000\n"
+"PO-Revision-Date: 2011-03-17 09:50:35+0000\n"
+"Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-03-11 18:57:56+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: nl\n"
+"X-Message-Group: #out-statusnet-plugin-event\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgctxt "BUTTON"
+msgid "Cancel"
+msgstr "Annuleren"
+
+msgctxt "BUTTON"
+msgid "Yes"
+msgstr "Ja"
+
+msgctxt "BUTTON"
+msgid "No"
+msgstr "Nee"
+
+msgctxt "BUTTON"
+msgid "Maybe"
+msgstr "Misschien"
+
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "Opslaan"
+
+msgid "Event invitations and RSVPs."
+msgstr "Uitnodigingen en RVSP's."
+
+msgid "Event"
+msgstr "Gebeurtenis"
diff --git a/plugins/Event/locale/te/LC_MESSAGES/Event.po b/plugins/Event/locale/te/LC_MESSAGES/Event.po
new file mode 100644
index 0000000000..c5d6d3c0ce
--- /dev/null
+++ b/plugins/Event/locale/te/LC_MESSAGES/Event.po
@@ -0,0 +1,48 @@
+# Translation of StatusNet - Event to Telugu (తెలుగు)
+# Exported from translatewiki.net
+#
+# Author: Veeven
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Event\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-17 09:47+0000\n"
+"PO-Revision-Date: 2011-03-17 09:50:35+0000\n"
+"Language-Team: Telugu <http://translatewiki.net/wiki/Portal:te>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-03-11 18:57:56+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: te\n"
+"X-Message-Group: #out-statusnet-plugin-event\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgctxt "BUTTON"
+msgid "Cancel"
+msgstr "రద్దుచేయి"
+
+msgctxt "BUTTON"
+msgid "Yes"
+msgstr "అవును"
+
+msgctxt "BUTTON"
+msgid "No"
+msgstr "కాదు"
+
+msgctxt "BUTTON"
+msgid "Maybe"
+msgstr "కావొచ్చు"
+
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "భద్రపరచు"
+
+msgid "Event invitations and RSVPs."
+msgstr ""
+
+msgid "Event"
+msgstr ""
diff --git a/plugins/Event/locale/uk/LC_MESSAGES/Event.po b/plugins/Event/locale/uk/LC_MESSAGES/Event.po
new file mode 100644
index 0000000000..865f4fc01d
--- /dev/null
+++ b/plugins/Event/locale/uk/LC_MESSAGES/Event.po
@@ -0,0 +1,49 @@
+# Translation of StatusNet - Event to Ukrainian (Українська)
+# Exported from translatewiki.net
+#
+# Author: Boogie
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Event\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-17 09:47+0000\n"
+"PO-Revision-Date: 2011-03-17 09:50:35+0000\n"
+"Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-03-11 18:57:56+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: uk\n"
+"X-Message-Group: #out-statusnet-plugin-event\n"
+"Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
+"2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
+
+msgctxt "BUTTON"
+msgid "Cancel"
+msgstr "Відміна"
+
+msgctxt "BUTTON"
+msgid "Yes"
+msgstr "Так"
+
+msgctxt "BUTTON"
+msgid "No"
+msgstr "Ні"
+
+msgctxt "BUTTON"
+msgid "Maybe"
+msgstr "Можливо"
+
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "Зберегти"
+
+msgid "Event invitations and RSVPs."
+msgstr "Запрошення на заходи та RSVP (підтвердження прийняття запрошення)."
+
+msgid "Event"
+msgstr "Подія"
diff --git a/plugins/ExtendedProfile/locale/ExtendedProfile.pot b/plugins/ExtendedProfile/locale/ExtendedProfile.pot
index 89a6880e24..76634319a5 100644
--- a/plugins/ExtendedProfile/locale/ExtendedProfile.pot
+++ b/plugins/ExtendedProfile/locale/ExtendedProfile.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"POT-Creation-Date: 2011-03-17 09:47+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,101 +16,163 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ExtendedProfilePlugin.php:40
-msgid "UI extensions for additional profile fields."
+#: actions/profiledetailsettings.php:29
+msgid "Extended profile settings"
 msgstr ""
 
-#. TRANS: Link description in user account settings menu.
-#: ExtendedProfilePlugin.php:108
-msgid "Details"
+#: actions/profiledetailsettings.php:63
+msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 
-#: ExtendedProfilePlugin.php:116
-msgid "More details..."
+#. TRANS: Message given submitting a form with an unknown action
+#: actions/profiledetailsettings.php:74
+msgid "Unexpected form submission."
 msgstr ""
 
-#: extendedprofile.php:49 extendedprofile.php:103
-msgid "Personal"
+#: actions/profiledetailsettings.php:145
+#, php-format
+msgid "You must supply a date for \"%s\"."
 msgstr ""
 
-#: extendedprofile.php:52
-msgid "Full name"
+#: actions/profiledetailsettings.php:155
+#, php-format
+msgid "Invalid date entered for \"%s\": %s"
 msgstr ""
 
-#: extendedprofile.php:57
-msgid "Title"
+#: actions/profiledetailsettings.php:269
+#, php-format
+msgid "Invalid URL: %s"
 msgstr ""
 
-#: extendedprofile.php:61
-msgid "Manager"
+#: actions/profiledetailsettings.php:517 actions/profiledetailsettings.php:529
+msgid "Could not save profile details."
 msgstr ""
 
-#: extendedprofile.php:66
-msgid "Location"
-msgstr ""
-
-#: extendedprofile.php:70
-msgid "Bio"
-msgstr ""
-
-#: extendedprofile.php:75
-msgid "Tags"
-msgstr ""
-
-#: extendedprofile.php:82
-msgid "Contact"
-msgstr ""
-
-#: extendedprofile.php:85
-msgid "Phone"
-msgstr ""
-
-#: extendedprofile.php:91
-msgid "IM"
-msgstr ""
-
-#: extendedprofile.php:96
-msgid "Websites"
-msgstr ""
-
-#: extendedprofile.php:106
-msgid "Birthday"
-msgstr ""
-
-#: extendedprofile.php:111
-msgid "Spouse's name"
-msgstr ""
-
-#: extendedprofile.php:115
-msgid "Kids' names"
-msgstr ""
-
-#: extendedprofile.php:120
-msgid "Work experience"
-msgstr ""
-
-#: extendedprofile.php:124
-msgid "Employer"
-msgstr ""
-
-#: extendedprofile.php:129
-msgid "Education"
-msgstr ""
-
-#: extendedprofile.php:133
-msgid "Institution"
+#. TRANS: Validation error in form for profile settings.
+#. TRANS: %s is an invalid tag.
+#: actions/profiledetailsettings.php:574
+#, php-format
+msgid "Invalid tag: \"%s\"."
 msgstr ""
 
 #. TRANS: Link title for link on user profile.
-#: profiledetailaction.php:61
+#: actions/profiledetail.php:52
 msgid "Edit extended profile settings"
 msgstr ""
 
 #. TRANS: Link text for link on user profile.
-#: profiledetailaction.php:63
+#: actions/profiledetail.php:54
 msgid "Edit"
 msgstr ""
 
-#: profiledetailsettingsaction.php:29
-msgid "Extended profile settings"
+#: ExtendedProfilePlugin.php:41
+msgid "UI extensions for additional profile fields."
+msgstr ""
+
+#: ExtendedProfilePlugin.php:123
+msgid "More details..."
+msgstr ""
+
+#: lib/extendedprofilewidget.php:317 lib/extendedprofilewidget.php:359
+msgid "Company"
+msgstr ""
+
+#: lib/extendedprofilewidget.php:322 lib/extendedprofilewidget.php:366
+#: lib/extendedprofilewidget.php:407 lib/extendedprofilewidget.php:457
+msgid "Start"
+msgstr ""
+
+#: lib/extendedprofilewidget.php:329 lib/extendedprofilewidget.php:373
+#: lib/extendedprofilewidget.php:414 lib/extendedprofilewidget.php:464
+msgid "End"
+msgstr ""
+
+#: lib/extendedprofilewidget.php:341 lib/extendedprofilewidget.php:387
+msgid "Current"
+msgstr ""
+
+#: lib/extendedprofilewidget.php:399 lib/extendedprofilewidget.php:435
+#: lib/extendedprofile.php:242 lib/extendedprofile.php:254
+msgid "Institution"
+msgstr ""
+
+#: lib/extendedprofilewidget.php:403 lib/extendedprofilewidget.php:442
+msgid "Degree"
+msgstr ""
+
+#: lib/extendedprofilewidget.php:405 lib/extendedprofilewidget.php:449
+msgid "Description"
+msgstr ""
+
+#: lib/extendedprofilewidget.php:618
+msgctxt "BUTTON"
+msgid "Save"
+msgstr ""
+
+#: lib/extendedprofile.php:119 lib/extendedprofile.php:129
+msgid "Phone"
+msgstr ""
+
+#: lib/extendedprofile.php:150 lib/extendedprofile.php:156
+msgid "IM"
+msgstr ""
+
+#: lib/extendedprofile.php:176 lib/extendedprofile.php:182
+msgid "Website"
+msgstr ""
+
+#: lib/extendedprofile.php:205 lib/extendedprofile.php:216
+msgid "Employer"
+msgstr ""
+
+#: lib/extendedprofile.php:278 lib/extendedprofile.php:319
+msgid "Personal"
+msgstr ""
+
+#: lib/extendedprofile.php:281
+msgid "Full name"
+msgstr ""
+
+#: lib/extendedprofile.php:286
+msgid "Title"
+msgstr ""
+
+#: lib/extendedprofile.php:290
+msgid "Manager"
+msgstr ""
+
+#: lib/extendedprofile.php:295
+msgid "Location"
+msgstr ""
+
+#: lib/extendedprofile.php:299
+msgid "Bio"
+msgstr ""
+
+#: lib/extendedprofile.php:304
+msgid "Tags"
+msgstr ""
+
+#: lib/extendedprofile.php:311
+msgid "Contact"
+msgstr ""
+
+#: lib/extendedprofile.php:322
+msgid "Birthday"
+msgstr ""
+
+#: lib/extendedprofile.php:327
+msgid "Spouse's name"
+msgstr ""
+
+#: lib/extendedprofile.php:331
+msgid "Kids' names"
+msgstr ""
+
+#: lib/extendedprofile.php:336
+msgid "Work experience"
+msgstr ""
+
+#: lib/extendedprofile.php:342
+msgid "Education"
 msgstr ""
diff --git a/plugins/ExtendedProfile/locale/br/LC_MESSAGES/ExtendedProfile.po b/plugins/ExtendedProfile/locale/br/LC_MESSAGES/ExtendedProfile.po
index 3d8743fc1f..7811b90c57 100644
--- a/plugins/ExtendedProfile/locale/br/LC_MESSAGES/ExtendedProfile.po
+++ b/plugins/ExtendedProfile/locale/br/LC_MESSAGES/ExtendedProfile.po
@@ -9,28 +9,101 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ExtendedProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-06 02:34+0100\n"
-"PO-Revision-Date: 2011-03-06 01:37:09+0000\n"
+"POT-Creation-Date: 2011-03-17 09:47+0000\n"
+"PO-Revision-Date: 2011-03-17 09:50:37+0000\n"
 "Language-Team: Breton <http://translatewiki.net/wiki/Portal:br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-03 20:42:39+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-POT-Import-Date: 2011-03-11 18:53:18+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-extendedprofile\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+msgid "Extended profile settings"
+msgstr "Arventennoù ledanet ar profil"
+
+msgid "There was a problem with your session token. Try again, please."
+msgstr ""
+
+#. TRANS: Message given submitting a form with an unknown action
+msgid "Unexpected form submission."
+msgstr ""
+
+#, php-format
+msgid "You must supply a date for \"%s\"."
+msgstr ""
+
+#, php-format
+msgid "Invalid date entered for \"%s\": %s"
+msgstr ""
+
+#, php-format
+msgid "Invalid URL: %s"
+msgstr ""
+
+msgid "Could not save profile details."
+msgstr ""
+
+#. TRANS: Validation error in form for profile settings.
+#. TRANS: %s is an invalid tag.
+#, php-format
+msgid "Invalid tag: \"%s\"."
+msgstr ""
+
+#. TRANS: Link title for link on user profile.
+msgid "Edit extended profile settings"
+msgstr "Aozañ arventennoù ledanet ar profil"
+
+#. TRANS: Link text for link on user profile.
+msgid "Edit"
+msgstr "Aozañ"
+
 msgid "UI extensions for additional profile fields."
 msgstr ""
 
-#. TRANS: Link description in user account settings menu.
-msgid "Details"
-msgstr "Munudoù"
-
 msgid "More details..."
 msgstr "Muoic'h a vunudoù..."
 
+msgid "Company"
+msgstr ""
+
+msgid "Start"
+msgstr ""
+
+msgid "End"
+msgstr ""
+
+msgid "Current"
+msgstr ""
+
+msgid "Institution"
+msgstr "Ensavadur"
+
+msgid "Degree"
+msgstr ""
+
+msgid "Description"
+msgstr ""
+
+msgctxt "BUTTON"
+msgid "Save"
+msgstr ""
+
+msgid "Phone"
+msgstr "Pellgomz"
+
+msgid "IM"
+msgstr "IM"
+
+#, fuzzy
+msgid "Website"
+msgstr "Lec'hiennoù web"
+
+msgid "Employer"
+msgstr ""
+
 msgid "Personal"
 msgstr "Personel"
 
@@ -55,15 +128,6 @@ msgstr "Balizennoù"
 msgid "Contact"
 msgstr "Darempred"
 
-msgid "Phone"
-msgstr "Pellgomz"
-
-msgid "IM"
-msgstr "IM"
-
-msgid "Websites"
-msgstr "Lec'hiennoù web"
-
 msgid "Birthday"
 msgstr "Deiz-ha-bloaz"
 
@@ -76,22 +140,8 @@ msgstr "Anv ar vugale"
 msgid "Work experience"
 msgstr "Skiant-prenet"
 
-msgid "Employer"
-msgstr ""
-
 msgid "Education"
 msgstr "Deskadurezh"
 
-msgid "Institution"
-msgstr "Ensavadur"
-
-#. TRANS: Link title for link on user profile.
-msgid "Edit extended profile settings"
-msgstr "Aozañ arventennoù ledanet ar profil"
-
-#. TRANS: Link text for link on user profile.
-msgid "Edit"
-msgstr "Aozañ"
-
-msgid "Extended profile settings"
-msgstr "Arventennoù ledanet ar profil"
+#~ msgid "Details"
+#~ msgstr "Munudoù"
diff --git a/plugins/ExtendedProfile/locale/ia/LC_MESSAGES/ExtendedProfile.po b/plugins/ExtendedProfile/locale/ia/LC_MESSAGES/ExtendedProfile.po
index 6c1e781b7d..3db39dee2f 100644
--- a/plugins/ExtendedProfile/locale/ia/LC_MESSAGES/ExtendedProfile.po
+++ b/plugins/ExtendedProfile/locale/ia/LC_MESSAGES/ExtendedProfile.po
@@ -9,28 +9,101 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ExtendedProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-06 02:34+0100\n"
-"PO-Revision-Date: 2011-03-06 01:37:09+0000\n"
+"POT-Creation-Date: 2011-03-17 09:47+0000\n"
+"PO-Revision-Date: 2011-03-17 09:50:37+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-03 20:42:39+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-POT-Import-Date: 2011-03-11 18:53:18+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-extendedprofile\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+msgid "Extended profile settings"
+msgstr "Configuration extendite del profilo"
+
+msgid "There was a problem with your session token. Try again, please."
+msgstr ""
+
+#. TRANS: Message given submitting a form with an unknown action
+msgid "Unexpected form submission."
+msgstr ""
+
+#, php-format
+msgid "You must supply a date for \"%s\"."
+msgstr ""
+
+#, php-format
+msgid "Invalid date entered for \"%s\": %s"
+msgstr ""
+
+#, php-format
+msgid "Invalid URL: %s"
+msgstr ""
+
+msgid "Could not save profile details."
+msgstr ""
+
+#. TRANS: Validation error in form for profile settings.
+#. TRANS: %s is an invalid tag.
+#, php-format
+msgid "Invalid tag: \"%s\"."
+msgstr ""
+
+#. TRANS: Link title for link on user profile.
+msgid "Edit extended profile settings"
+msgstr "Modificar configuration extendite del profilo"
+
+#. TRANS: Link text for link on user profile.
+msgid "Edit"
+msgstr "Modificar"
+
 msgid "UI extensions for additional profile fields."
 msgstr "Extensiones del IU pro additional campos de profilo."
 
-#. TRANS: Link description in user account settings menu.
-msgid "Details"
-msgstr "Detalios"
-
 msgid "More details..."
 msgstr "Plus detalios..."
 
+msgid "Company"
+msgstr ""
+
+msgid "Start"
+msgstr ""
+
+msgid "End"
+msgstr ""
+
+msgid "Current"
+msgstr ""
+
+msgid "Institution"
+msgstr "Institution"
+
+msgid "Degree"
+msgstr ""
+
+msgid "Description"
+msgstr ""
+
+msgctxt "BUTTON"
+msgid "Save"
+msgstr ""
+
+msgid "Phone"
+msgstr "Telephono"
+
+msgid "IM"
+msgstr "MI"
+
+#, fuzzy
+msgid "Website"
+msgstr "Sitos web"
+
+msgid "Employer"
+msgstr "Empleator"
+
 msgid "Personal"
 msgstr "Personal"
 
@@ -55,15 +128,6 @@ msgstr "Etiquettas"
 msgid "Contact"
 msgstr "Contacto"
 
-msgid "Phone"
-msgstr "Telephono"
-
-msgid "IM"
-msgstr "MI"
-
-msgid "Websites"
-msgstr "Sitos web"
-
 msgid "Birthday"
 msgstr "Anniversario"
 
@@ -76,22 +140,8 @@ msgstr "Nomines del infantes"
 msgid "Work experience"
 msgstr "Experientia professional"
 
-msgid "Employer"
-msgstr "Empleator"
-
 msgid "Education"
 msgstr "Education"
 
-msgid "Institution"
-msgstr "Institution"
-
-#. TRANS: Link title for link on user profile.
-msgid "Edit extended profile settings"
-msgstr "Modificar configuration extendite del profilo"
-
-#. TRANS: Link text for link on user profile.
-msgid "Edit"
-msgstr "Modificar"
-
-msgid "Extended profile settings"
-msgstr "Configuration extendite del profilo"
+#~ msgid "Details"
+#~ msgstr "Detalios"
diff --git a/plugins/ExtendedProfile/locale/mk/LC_MESSAGES/ExtendedProfile.po b/plugins/ExtendedProfile/locale/mk/LC_MESSAGES/ExtendedProfile.po
index 15e6fb507a..895be3757e 100644
--- a/plugins/ExtendedProfile/locale/mk/LC_MESSAGES/ExtendedProfile.po
+++ b/plugins/ExtendedProfile/locale/mk/LC_MESSAGES/ExtendedProfile.po
@@ -9,28 +9,101 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ExtendedProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-06 02:34+0100\n"
-"PO-Revision-Date: 2011-03-06 01:37:09+0000\n"
+"POT-Creation-Date: 2011-03-17 09:47+0000\n"
+"PO-Revision-Date: 2011-03-17 09:50:37+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-03 20:42:39+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-POT-Import-Date: 2011-03-11 18:53:18+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-extendedprofile\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
 
+msgid "Extended profile settings"
+msgstr "Проширени профилни нагодувања"
+
+msgid "There was a problem with your session token. Try again, please."
+msgstr ""
+
+#. TRANS: Message given submitting a form with an unknown action
+msgid "Unexpected form submission."
+msgstr ""
+
+#, php-format
+msgid "You must supply a date for \"%s\"."
+msgstr ""
+
+#, php-format
+msgid "Invalid date entered for \"%s\": %s"
+msgstr ""
+
+#, php-format
+msgid "Invalid URL: %s"
+msgstr ""
+
+msgid "Could not save profile details."
+msgstr ""
+
+#. TRANS: Validation error in form for profile settings.
+#. TRANS: %s is an invalid tag.
+#, php-format
+msgid "Invalid tag: \"%s\"."
+msgstr ""
+
+#. TRANS: Link title for link on user profile.
+msgid "Edit extended profile settings"
+msgstr "Уреди проширени профилни нагодувања"
+
+#. TRANS: Link text for link on user profile.
+msgid "Edit"
+msgstr "Уреди"
+
 msgid "UI extensions for additional profile fields."
 msgstr "Посреднички дадатоци за дополнителни полиња во профилот."
 
-#. TRANS: Link description in user account settings menu.
-msgid "Details"
-msgstr "Подробности"
-
 msgid "More details..."
 msgstr "Поподробно..."
 
+msgid "Company"
+msgstr ""
+
+msgid "Start"
+msgstr ""
+
+msgid "End"
+msgstr ""
+
+msgid "Current"
+msgstr ""
+
+msgid "Institution"
+msgstr "Установа"
+
+msgid "Degree"
+msgstr ""
+
+msgid "Description"
+msgstr ""
+
+msgctxt "BUTTON"
+msgid "Save"
+msgstr ""
+
+msgid "Phone"
+msgstr "Телефон"
+
+msgid "IM"
+msgstr "IM"
+
+#, fuzzy
+msgid "Website"
+msgstr "Мрежни места"
+
+msgid "Employer"
+msgstr "Работодавач"
+
 msgid "Personal"
 msgstr "Лично"
 
@@ -55,15 +128,6 @@ msgstr "Ознаки"
 msgid "Contact"
 msgstr "Контакт"
 
-msgid "Phone"
-msgstr "Телефон"
-
-msgid "IM"
-msgstr "IM"
-
-msgid "Websites"
-msgstr "Мрежни места"
-
 msgid "Birthday"
 msgstr "Роденден"
 
@@ -76,22 +140,8 @@ msgstr "Имиња на децата"
 msgid "Work experience"
 msgstr "Работно искуство"
 
-msgid "Employer"
-msgstr "Работодавач"
-
 msgid "Education"
 msgstr "Образование"
 
-msgid "Institution"
-msgstr "Установа"
-
-#. TRANS: Link title for link on user profile.
-msgid "Edit extended profile settings"
-msgstr "Уреди проширени профилни нагодувања"
-
-#. TRANS: Link text for link on user profile.
-msgid "Edit"
-msgstr "Уреди"
-
-msgid "Extended profile settings"
-msgstr "Проширени профилни нагодувања"
+#~ msgid "Details"
+#~ msgstr "Подробности"
diff --git a/plugins/ExtendedProfile/locale/nl/LC_MESSAGES/ExtendedProfile.po b/plugins/ExtendedProfile/locale/nl/LC_MESSAGES/ExtendedProfile.po
index 5e34c2f79f..1adbdc93ec 100644
--- a/plugins/ExtendedProfile/locale/nl/LC_MESSAGES/ExtendedProfile.po
+++ b/plugins/ExtendedProfile/locale/nl/LC_MESSAGES/ExtendedProfile.po
@@ -9,28 +9,101 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ExtendedProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-06 02:34+0100\n"
-"PO-Revision-Date: 2011-03-06 01:37:09+0000\n"
+"POT-Creation-Date: 2011-03-17 09:47+0000\n"
+"PO-Revision-Date: 2011-03-17 09:50:37+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-03 20:42:39+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-POT-Import-Date: 2011-03-11 18:53:18+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-extendedprofile\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+msgid "Extended profile settings"
+msgstr "Uitgebreide profielinstellingen"
+
+msgid "There was a problem with your session token. Try again, please."
+msgstr ""
+
+#. TRANS: Message given submitting a form with an unknown action
+msgid "Unexpected form submission."
+msgstr ""
+
+#, php-format
+msgid "You must supply a date for \"%s\"."
+msgstr ""
+
+#, php-format
+msgid "Invalid date entered for \"%s\": %s"
+msgstr ""
+
+#, php-format
+msgid "Invalid URL: %s"
+msgstr ""
+
+msgid "Could not save profile details."
+msgstr ""
+
+#. TRANS: Validation error in form for profile settings.
+#. TRANS: %s is an invalid tag.
+#, php-format
+msgid "Invalid tag: \"%s\"."
+msgstr ""
+
+#. TRANS: Link title for link on user profile.
+msgid "Edit extended profile settings"
+msgstr "Uitgebreide profielinstellingen bewerken"
+
+#. TRANS: Link text for link on user profile.
+msgid "Edit"
+msgstr "Bewerken"
+
 msgid "UI extensions for additional profile fields."
 msgstr "UI-uitbreidingen voor extra profielvelden."
 
-#. TRANS: Link description in user account settings menu.
-msgid "Details"
-msgstr "Details"
-
 msgid "More details..."
 msgstr "Meer details..."
 
+msgid "Company"
+msgstr ""
+
+msgid "Start"
+msgstr ""
+
+msgid "End"
+msgstr ""
+
+msgid "Current"
+msgstr ""
+
+msgid "Institution"
+msgstr "Instelling"
+
+msgid "Degree"
+msgstr ""
+
+msgid "Description"
+msgstr ""
+
+msgctxt "BUTTON"
+msgid "Save"
+msgstr ""
+
+msgid "Phone"
+msgstr "Telefoonnummer"
+
+msgid "IM"
+msgstr "IM"
+
+#, fuzzy
+msgid "Website"
+msgstr "Websites"
+
+msgid "Employer"
+msgstr "Werkgever"
+
 msgid "Personal"
 msgstr "Persoonlijk"
 
@@ -55,15 +128,6 @@ msgstr "Labels"
 msgid "Contact"
 msgstr "Contact"
 
-msgid "Phone"
-msgstr "Telefoonnummer"
-
-msgid "IM"
-msgstr "IM"
-
-msgid "Websites"
-msgstr "Websites"
-
 msgid "Birthday"
 msgstr "Geboortedatum"
 
@@ -76,22 +140,8 @@ msgstr "Namen van kinderen"
 msgid "Work experience"
 msgstr "Werkervaring"
 
-msgid "Employer"
-msgstr "Werkgever"
-
 msgid "Education"
 msgstr "Opleiding"
 
-msgid "Institution"
-msgstr "Instelling"
-
-#. TRANS: Link title for link on user profile.
-msgid "Edit extended profile settings"
-msgstr "Uitgebreide profielinstellingen bewerken"
-
-#. TRANS: Link text for link on user profile.
-msgid "Edit"
-msgstr "Bewerken"
-
-msgid "Extended profile settings"
-msgstr "Uitgebreide profielinstellingen"
+#~ msgid "Details"
+#~ msgstr "Details"
diff --git a/plugins/ExtendedProfile/locale/sv/LC_MESSAGES/ExtendedProfile.po b/plugins/ExtendedProfile/locale/sv/LC_MESSAGES/ExtendedProfile.po
index 98224ba955..f935d8de42 100644
--- a/plugins/ExtendedProfile/locale/sv/LC_MESSAGES/ExtendedProfile.po
+++ b/plugins/ExtendedProfile/locale/sv/LC_MESSAGES/ExtendedProfile.po
@@ -9,28 +9,101 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ExtendedProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-11 18:15+0000\n"
-"PO-Revision-Date: 2011-03-11 18:18:04+0000\n"
+"POT-Creation-Date: 2011-03-17 09:47+0000\n"
+"PO-Revision-Date: 2011-03-17 09:50:37+0000\n"
 "Language-Team: Swedish <http://translatewiki.net/wiki/Portal:sv>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-08 01:22:06+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83703); Translate extension (2011-03-11)\n"
+"X-POT-Import-Date: 2011-03-11 18:53:18+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: sv\n"
 "X-Message-Group: #out-statusnet-plugin-extendedprofile\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+msgid "Extended profile settings"
+msgstr "Utökade profilinställningar"
+
+msgid "There was a problem with your session token. Try again, please."
+msgstr ""
+
+#. TRANS: Message given submitting a form with an unknown action
+msgid "Unexpected form submission."
+msgstr ""
+
+#, php-format
+msgid "You must supply a date for \"%s\"."
+msgstr ""
+
+#, php-format
+msgid "Invalid date entered for \"%s\": %s"
+msgstr ""
+
+#, php-format
+msgid "Invalid URL: %s"
+msgstr ""
+
+msgid "Could not save profile details."
+msgstr ""
+
+#. TRANS: Validation error in form for profile settings.
+#. TRANS: %s is an invalid tag.
+#, php-format
+msgid "Invalid tag: \"%s\"."
+msgstr ""
+
+#. TRANS: Link title for link on user profile.
+msgid "Edit extended profile settings"
+msgstr "Redigera utökade profilinställningar"
+
+#. TRANS: Link text for link on user profile.
+msgid "Edit"
+msgstr "Redigera"
+
 msgid "UI extensions for additional profile fields."
 msgstr ""
 
-#. TRANS: Link description in user account settings menu.
-msgid "Details"
-msgstr "Detaljer"
-
 msgid "More details..."
 msgstr "Mer detaljer..."
 
+msgid "Company"
+msgstr ""
+
+msgid "Start"
+msgstr ""
+
+msgid "End"
+msgstr ""
+
+msgid "Current"
+msgstr ""
+
+msgid "Institution"
+msgstr "Institution"
+
+msgid "Degree"
+msgstr ""
+
+msgid "Description"
+msgstr ""
+
+msgctxt "BUTTON"
+msgid "Save"
+msgstr ""
+
+msgid "Phone"
+msgstr "Telefon"
+
+msgid "IM"
+msgstr ""
+
+#, fuzzy
+msgid "Website"
+msgstr "Webbsidor"
+
+msgid "Employer"
+msgstr "Arbetsgivare"
+
 msgid "Personal"
 msgstr "Personlig"
 
@@ -55,15 +128,6 @@ msgstr "Taggar"
 msgid "Contact"
 msgstr "Kontakt"
 
-msgid "Phone"
-msgstr "Telefon"
-
-msgid "IM"
-msgstr ""
-
-msgid "Websites"
-msgstr "Webbsidor"
-
 msgid "Birthday"
 msgstr "Födelsedag"
 
@@ -76,22 +140,8 @@ msgstr "Barnens namn"
 msgid "Work experience"
 msgstr "Arbetserfarenhet"
 
-msgid "Employer"
-msgstr "Arbetsgivare"
-
 msgid "Education"
 msgstr "Utbildning"
 
-msgid "Institution"
-msgstr "Institution"
-
-#. TRANS: Link title for link on user profile.
-msgid "Edit extended profile settings"
-msgstr "Redigera utökade profilinställningar"
-
-#. TRANS: Link text for link on user profile.
-msgid "Edit"
-msgstr "Redigera"
-
-msgid "Extended profile settings"
-msgstr "Utökade profilinställningar"
+#~ msgid "Details"
+#~ msgstr "Detaljer"
diff --git a/plugins/ExtendedProfile/locale/te/LC_MESSAGES/ExtendedProfile.po b/plugins/ExtendedProfile/locale/te/LC_MESSAGES/ExtendedProfile.po
index cda6454eaf..c8fd432a17 100644
--- a/plugins/ExtendedProfile/locale/te/LC_MESSAGES/ExtendedProfile.po
+++ b/plugins/ExtendedProfile/locale/te/LC_MESSAGES/ExtendedProfile.po
@@ -9,28 +9,101 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ExtendedProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-11 18:15+0000\n"
-"PO-Revision-Date: 2011-03-11 18:18:04+0000\n"
+"POT-Creation-Date: 2011-03-17 09:47+0000\n"
+"PO-Revision-Date: 2011-03-17 09:50:37+0000\n"
 "Language-Team: Telugu <http://translatewiki.net/wiki/Portal:te>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-08 01:22:06+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83703); Translate extension (2011-03-11)\n"
+"X-POT-Import-Date: 2011-03-11 18:53:18+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: te\n"
 "X-Message-Group: #out-statusnet-plugin-extendedprofile\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+msgid "Extended profile settings"
+msgstr ""
+
+msgid "There was a problem with your session token. Try again, please."
+msgstr ""
+
+#. TRANS: Message given submitting a form with an unknown action
+msgid "Unexpected form submission."
+msgstr ""
+
+#, php-format
+msgid "You must supply a date for \"%s\"."
+msgstr ""
+
+#, php-format
+msgid "Invalid date entered for \"%s\": %s"
+msgstr ""
+
+#, php-format
+msgid "Invalid URL: %s"
+msgstr ""
+
+msgid "Could not save profile details."
+msgstr ""
+
+#. TRANS: Validation error in form for profile settings.
+#. TRANS: %s is an invalid tag.
+#, php-format
+msgid "Invalid tag: \"%s\"."
+msgstr ""
+
+#. TRANS: Link title for link on user profile.
+msgid "Edit extended profile settings"
+msgstr ""
+
+#. TRANS: Link text for link on user profile.
+msgid "Edit"
+msgstr "మార్చు"
+
 msgid "UI extensions for additional profile fields."
 msgstr ""
 
-#. TRANS: Link description in user account settings menu.
-msgid "Details"
-msgstr "వివరాలు"
-
 msgid "More details..."
 msgstr "మరిన్ని వివరాలు..."
 
+msgid "Company"
+msgstr ""
+
+msgid "Start"
+msgstr ""
+
+msgid "End"
+msgstr ""
+
+msgid "Current"
+msgstr ""
+
+msgid "Institution"
+msgstr ""
+
+msgid "Degree"
+msgstr ""
+
+msgid "Description"
+msgstr ""
+
+msgctxt "BUTTON"
+msgid "Save"
+msgstr ""
+
+msgid "Phone"
+msgstr ""
+
+msgid "IM"
+msgstr ""
+
+#, fuzzy
+msgid "Website"
+msgstr "జాలగూళ్ళు"
+
+msgid "Employer"
+msgstr ""
+
 msgid "Personal"
 msgstr "వ్యక్తిగతం"
 
@@ -55,15 +128,6 @@ msgstr "ట్యాగులు"
 msgid "Contact"
 msgstr "సంప్రదించండి"
 
-msgid "Phone"
-msgstr ""
-
-msgid "IM"
-msgstr ""
-
-msgid "Websites"
-msgstr "జాలగూళ్ళు"
-
 msgid "Birthday"
 msgstr "పుట్టినరోజు"
 
@@ -76,22 +140,8 @@ msgstr "పిల్లల పేర్లు"
 msgid "Work experience"
 msgstr "ఉద్యోగ అనుభవం"
 
-msgid "Employer"
-msgstr ""
-
 msgid "Education"
 msgstr "చదువు"
 
-msgid "Institution"
-msgstr ""
-
-#. TRANS: Link title for link on user profile.
-msgid "Edit extended profile settings"
-msgstr ""
-
-#. TRANS: Link text for link on user profile.
-msgid "Edit"
-msgstr "మార్చు"
-
-msgid "Extended profile settings"
-msgstr ""
+#~ msgid "Details"
+#~ msgstr "వివరాలు"
diff --git a/plugins/ExtendedProfile/locale/uk/LC_MESSAGES/ExtendedProfile.po b/plugins/ExtendedProfile/locale/uk/LC_MESSAGES/ExtendedProfile.po
index b98ce66ca3..9cb239b9b3 100644
--- a/plugins/ExtendedProfile/locale/uk/LC_MESSAGES/ExtendedProfile.po
+++ b/plugins/ExtendedProfile/locale/uk/LC_MESSAGES/ExtendedProfile.po
@@ -9,29 +9,102 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ExtendedProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-08 01:03+0000\n"
-"PO-Revision-Date: 2011-03-08 01:06:03+0000\n"
+"POT-Creation-Date: 2011-03-17 09:47+0000\n"
+"PO-Revision-Date: 2011-03-17 09:50:37+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-06 02:17:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
+"X-POT-Import-Date: 2011-03-11 18:53:18+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-extendedprofile\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
+msgid "Extended profile settings"
+msgstr "Розширені налаштування профілю"
+
+msgid "There was a problem with your session token. Try again, please."
+msgstr ""
+
+#. TRANS: Message given submitting a form with an unknown action
+msgid "Unexpected form submission."
+msgstr ""
+
+#, php-format
+msgid "You must supply a date for \"%s\"."
+msgstr ""
+
+#, php-format
+msgid "Invalid date entered for \"%s\": %s"
+msgstr ""
+
+#, php-format
+msgid "Invalid URL: %s"
+msgstr ""
+
+msgid "Could not save profile details."
+msgstr ""
+
+#. TRANS: Validation error in form for profile settings.
+#. TRANS: %s is an invalid tag.
+#, php-format
+msgid "Invalid tag: \"%s\"."
+msgstr ""
+
+#. TRANS: Link title for link on user profile.
+msgid "Edit extended profile settings"
+msgstr "Змінити розширені налаштування профілю"
+
+#. TRANS: Link text for link on user profile.
+msgid "Edit"
+msgstr "Змінити"
+
 msgid "UI extensions for additional profile fields."
 msgstr "Розширення інтерфейсу для додаткових полів у профілі."
 
-#. TRANS: Link description in user account settings menu.
-msgid "Details"
-msgstr "Деталі"
-
 msgid "More details..."
 msgstr "Детальніше..."
 
+msgid "Company"
+msgstr ""
+
+msgid "Start"
+msgstr ""
+
+msgid "End"
+msgstr ""
+
+msgid "Current"
+msgstr ""
+
+msgid "Institution"
+msgstr "Установа"
+
+msgid "Degree"
+msgstr ""
+
+msgid "Description"
+msgstr ""
+
+msgctxt "BUTTON"
+msgid "Save"
+msgstr ""
+
+msgid "Phone"
+msgstr "Телефон"
+
+msgid "IM"
+msgstr "ІМ"
+
+#, fuzzy
+msgid "Website"
+msgstr "Сайти"
+
+msgid "Employer"
+msgstr "Роботодавець"
+
 msgid "Personal"
 msgstr "Профіль"
 
@@ -56,15 +129,6 @@ msgstr "Теґи"
 msgid "Contact"
 msgstr "Контакти"
 
-msgid "Phone"
-msgstr "Телефон"
-
-msgid "IM"
-msgstr "ІМ"
-
-msgid "Websites"
-msgstr "Сайти"
-
 msgid "Birthday"
 msgstr "День народження"
 
@@ -77,22 +141,8 @@ msgstr "Імена дітей"
 msgid "Work experience"
 msgstr "Досвід роботи"
 
-msgid "Employer"
-msgstr "Роботодавець"
-
 msgid "Education"
 msgstr "Освіта"
 
-msgid "Institution"
-msgstr "Установа"
-
-#. TRANS: Link title for link on user profile.
-msgid "Edit extended profile settings"
-msgstr "Змінити розширені налаштування профілю"
-
-#. TRANS: Link text for link on user profile.
-msgid "Edit"
-msgstr "Змінити"
-
-msgid "Extended profile settings"
-msgstr "Розширені налаштування профілю"
+#~ msgid "Details"
+#~ msgstr "Деталі"
diff --git a/plugins/Msn/locale/el/LC_MESSAGES/Msn.po b/plugins/Msn/locale/el/LC_MESSAGES/Msn.po
new file mode 100644
index 0000000000..cc3e8ab390
--- /dev/null
+++ b/plugins/Msn/locale/el/LC_MESSAGES/Msn.po
@@ -0,0 +1,29 @@
+# Translation of StatusNet - Msn to Greek (Ελληνικά)
+# Exported from translatewiki.net
+#
+# Author: Evropi
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Msn\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-17 09:47+0000\n"
+"PO-Revision-Date: 2011-03-17 09:51:13+0000\n"
+"Language-Team: Greek <http://translatewiki.net/wiki/Portal:el>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-03-11 18:53:22+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: el\n"
+"X-Message-Group: #out-statusnet-plugin-msn\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "MSN"
+msgstr "MSN"
+
+msgid ""
+"The MSN plugin allows users to send and receive notices over the MSN network."
+msgstr ""
diff --git a/plugins/Poll/locale/Poll.pot b/plugins/Poll/locale/Poll.pot
index 85b1b74dc1..09a9626291 100644
--- a/plugins/Poll/locale/Poll.pot
+++ b/plugins/Poll/locale/Poll.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-11 18:15+0000\n"
+"POT-Creation-Date: 2011-03-17 09:47+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -72,24 +72,24 @@ msgid "Simple extension for supporting basic polls."
 msgstr ""
 
 #. TRANS: Exception thrown trying to respond to a poll without a poll reference.
-#: PollPlugin.php:234
+#: PollPlugin.php:230
 msgid "Invalid poll response: no poll reference."
 msgstr ""
 
 #. TRANS: Exception thrown trying to respond to a non-existing poll.
-#: PollPlugin.php:239
+#: PollPlugin.php:235
 msgid "Invalid poll response: poll is unknown."
 msgstr ""
 
 #. TRANS: Exception thrown when performing an unexpected action on a poll.
 #. TRANS: %s is the unpexpected object type.
-#: PollPlugin.php:266 PollPlugin.php:371
+#: PollPlugin.php:262 PollPlugin.php:420
 #, php-format
 msgid "Unexpected type for poll plugin: %s."
 msgstr ""
 
 #. TRANS: Application title.
-#: PollPlugin.php:432
+#: PollPlugin.php:481
 msgctxt "APPTITLE"
 msgid "Poll"
 msgstr ""
diff --git a/plugins/Poll/locale/ia/LC_MESSAGES/Poll.po b/plugins/Poll/locale/ia/LC_MESSAGES/Poll.po
new file mode 100644
index 0000000000..f8ae3a9010
--- /dev/null
+++ b/plugins/Poll/locale/ia/LC_MESSAGES/Poll.po
@@ -0,0 +1,152 @@
+# Translation of StatusNet - Poll to Interlingua (Interlingua)
+# Exported from translatewiki.net
+#
+# Author: McDutchie
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Poll\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-17 09:47+0000\n"
+"PO-Revision-Date: 2011-03-17 09:51:40+0000\n"
+"Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-03-11 18:58:12+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: ia\n"
+"X-Message-Group: #out-statusnet-plugin-poll\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Client exception thrown trying to view a non-existing poll.
+msgid "No such poll."
+msgstr "Iste sondage non existe."
+
+#. TRANS: Client exception thrown trying to view a non-existing poll notice.
+msgid "No such poll notice."
+msgstr "Iste nota de sondage non existe."
+
+#. TRANS: Client exception thrown trying to view a poll of a non-existing user.
+msgid "No such user."
+msgstr "Iste usator non existe."
+
+#. TRANS: Server exception thrown trying to view a poll for a user for which the profile could not be loaded.
+msgid "User without a profile."
+msgstr "Usator sin profilo."
+
+#. TRANS: Page title for a poll.
+#. TRANS: %1$s is the nickname of the user that created the poll, %2$s is the poll question.
+#, php-format
+msgid "%1$s's poll: %2$s"
+msgstr "Le sondage de %1$s: %2$s"
+
+#. TRANS: Field label on the page to create a poll.
+msgid "Question"
+msgstr "Question"
+
+#. TRANS: Field title on the page to create a poll.
+msgid "What question are people answering?"
+msgstr "A qual question responde le gente?"
+
+#. TRANS: Field label for an answer option on the page to create a poll.
+#. TRANS: %d is the option number.
+#, php-format
+msgid "Option %d"
+msgstr "Option %d"
+
+#. TRANS: Button text for saving a new poll.
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "Salveguardar"
+
+#. TRANS: Plugin description.
+msgid "Simple extension for supporting basic polls."
+msgstr "Extension simple pro supportar sondages basic."
+
+#. TRANS: Exception thrown trying to respond to a poll without a poll reference.
+msgid "Invalid poll response: no poll reference."
+msgstr "Responsa invalide a sondage: sin referentia a un sondage."
+
+#. TRANS: Exception thrown trying to respond to a non-existing poll.
+msgid "Invalid poll response: poll is unknown."
+msgstr "Responsa invalide a sondage: le sondage es incognite."
+
+#. TRANS: Exception thrown when performing an unexpected action on a poll.
+#. TRANS: %s is the unpexpected object type.
+#, php-format
+msgid "Unexpected type for poll plugin: %s."
+msgstr "Typo inexpectate pro le plug-in de sondages: %s."
+
+#. TRANS: Application title.
+msgctxt "APPTITLE"
+msgid "Poll"
+msgstr "Sondage"
+
+#. TRANS: Client exception thrown when responding to a poll with an invalid option.
+#. TRANS: Client exception thrown responding to a poll with an invalid answer.
+msgid "Invalid poll selection."
+msgstr "Selection de sondage invalide."
+
+#. TRANS: Notice content voting for a poll.
+#. TRANS: %s is the chosen option in the poll.
+#. TRANS: Rendered version of the notice content voting for a poll.
+#. TRANS: %s a link to the poll with the chosen option as link description.
+#, php-format
+msgid "voted for \"%s\""
+msgstr "votava pro \"%s\""
+
+#. TRANS: Button text for submitting a poll response.
+msgctxt "BUTTON"
+msgid "Submit"
+msgstr "Submitter"
+
+#. TRANS: Notice content creating a poll.
+#. TRANS: %1$s is the poll question, %2$s is a link to the poll.
+#, php-format
+msgid "Poll: %1$s %2$s"
+msgstr "Sondage: %1$s %2$s"
+
+#. TRANS: Rendered version of the notice content creating a poll.
+#. TRANS: %s a link to the poll with the question as link description.
+#, php-format
+msgid "Poll: %s"
+msgstr "Sondage: %s"
+
+#. TRANS: Title for poll page.
+msgid "New poll"
+msgstr "Nove sondage"
+
+#. TRANS: Client exception thrown trying to create a poll while not logged in.
+msgid "You must be logged in to post a poll."
+msgstr "Tu debe aperir un session pro publicar un sondage."
+
+#. TRANS: Client exception thrown trying to create a poll without a question.
+msgid "Poll must have a question."
+msgstr "Le sondage debe haber un question."
+
+#. TRANS: Client exception thrown trying to create a poll with fewer than two options.
+msgid "Poll must have at least two options."
+msgstr "Le sondage debe haber al minus duo optiones."
+
+#. TRANS: Page title after sending a notice.
+msgid "Notice posted"
+msgstr "Nota publicate"
+
+#. TRANS: Page title for poll response.
+msgid "Poll response"
+msgstr "Responsa al sondage"
+
+#. TRANS: Client exception thrown trying to respond to a poll while not logged in.
+msgid "You must be logged in to respond to a poll."
+msgstr "Tu debe aperir un session pro responder a un sondage."
+
+#. TRANS: Client exception thrown trying to respond to a non-existing poll.
+msgid "Invalid or missing poll."
+msgstr "Sondage invalide o mancante."
+
+#. TRANS: Page title after sending a poll response.
+msgid "Poll results"
+msgstr "Resultatos del sondage"
diff --git a/plugins/Poll/locale/mk/LC_MESSAGES/Poll.po b/plugins/Poll/locale/mk/LC_MESSAGES/Poll.po
new file mode 100644
index 0000000000..191c354b9b
--- /dev/null
+++ b/plugins/Poll/locale/mk/LC_MESSAGES/Poll.po
@@ -0,0 +1,152 @@
+# Translation of StatusNet - Poll to Macedonian (Македонски)
+# Exported from translatewiki.net
+#
+# Author: Bjankuloski06
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Poll\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-17 09:47+0000\n"
+"PO-Revision-Date: 2011-03-17 09:51:41+0000\n"
+"Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-03-11 18:58:12+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: mk\n"
+"X-Message-Group: #out-statusnet-plugin-poll\n"
+"Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
+
+#. TRANS: Client exception thrown trying to view a non-existing poll.
+msgid "No such poll."
+msgstr "Нема таква анкета."
+
+#. TRANS: Client exception thrown trying to view a non-existing poll notice.
+msgid "No such poll notice."
+msgstr "Нема таква анкетна забелешка."
+
+#. TRANS: Client exception thrown trying to view a poll of a non-existing user.
+msgid "No such user."
+msgstr "Нема таков корисник."
+
+#. TRANS: Server exception thrown trying to view a poll for a user for which the profile could not be loaded.
+msgid "User without a profile."
+msgstr "Корисник без профил."
+
+#. TRANS: Page title for a poll.
+#. TRANS: %1$s is the nickname of the user that created the poll, %2$s is the poll question.
+#, php-format
+msgid "%1$s's poll: %2$s"
+msgstr "Анкета на %1$s: %2$s"
+
+#. TRANS: Field label on the page to create a poll.
+msgid "Question"
+msgstr "Прашање"
+
+#. TRANS: Field title on the page to create a poll.
+msgid "What question are people answering?"
+msgstr "На кое прашање одговараат луѓето?"
+
+#. TRANS: Field label for an answer option on the page to create a poll.
+#. TRANS: %d is the option number.
+#, php-format
+msgid "Option %d"
+msgstr "Можност %d"
+
+#. TRANS: Button text for saving a new poll.
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "Зачувај"
+
+#. TRANS: Plugin description.
+msgid "Simple extension for supporting basic polls."
+msgstr "Прост додаток за поддршка на едноставни анкети."
+
+#. TRANS: Exception thrown trying to respond to a poll without a poll reference.
+msgid "Invalid poll response: no poll reference."
+msgstr "Неважечки одговор во анкетата: нема назнака на анкетата."
+
+#. TRANS: Exception thrown trying to respond to a non-existing poll.
+msgid "Invalid poll response: poll is unknown."
+msgstr "Неважечки одговор во анкетата: анкетата е непозната."
+
+#. TRANS: Exception thrown when performing an unexpected action on a poll.
+#. TRANS: %s is the unpexpected object type.
+#, php-format
+msgid "Unexpected type for poll plugin: %s."
+msgstr "Неочекуван тип за анкетен приклучок: %s."
+
+#. TRANS: Application title.
+msgctxt "APPTITLE"
+msgid "Poll"
+msgstr "Анкета"
+
+#. TRANS: Client exception thrown when responding to a poll with an invalid option.
+#. TRANS: Client exception thrown responding to a poll with an invalid answer.
+msgid "Invalid poll selection."
+msgstr "Неважечки избор на анкета."
+
+#. TRANS: Notice content voting for a poll.
+#. TRANS: %s is the chosen option in the poll.
+#. TRANS: Rendered version of the notice content voting for a poll.
+#. TRANS: %s a link to the poll with the chosen option as link description.
+#, php-format
+msgid "voted for \"%s\""
+msgstr "гласаше за „%s“"
+
+#. TRANS: Button text for submitting a poll response.
+msgctxt "BUTTON"
+msgid "Submit"
+msgstr "Поднеси"
+
+#. TRANS: Notice content creating a poll.
+#. TRANS: %1$s is the poll question, %2$s is a link to the poll.
+#, php-format
+msgid "Poll: %1$s %2$s"
+msgstr "Анкета: %1$s %2$s"
+
+#. TRANS: Rendered version of the notice content creating a poll.
+#. TRANS: %s a link to the poll with the question as link description.
+#, php-format
+msgid "Poll: %s"
+msgstr "Анкета: %s"
+
+#. TRANS: Title for poll page.
+msgid "New poll"
+msgstr "Нова анкета"
+
+#. TRANS: Client exception thrown trying to create a poll while not logged in.
+msgid "You must be logged in to post a poll."
+msgstr "Мора да сте најавени за да можете да објавите анкета."
+
+#. TRANS: Client exception thrown trying to create a poll without a question.
+msgid "Poll must have a question."
+msgstr "Анкетата мора да има прашање."
+
+#. TRANS: Client exception thrown trying to create a poll with fewer than two options.
+msgid "Poll must have at least two options."
+msgstr "Анкетата мора да има барем две можности."
+
+#. TRANS: Page title after sending a notice.
+msgid "Notice posted"
+msgstr "Забелешката е објавена"
+
+#. TRANS: Page title for poll response.
+msgid "Poll response"
+msgstr "Одговор на анкетата"
+
+#. TRANS: Client exception thrown trying to respond to a poll while not logged in.
+msgid "You must be logged in to respond to a poll."
+msgstr "Мора да сте најавени за да можете да одговарате на анкети."
+
+#. TRANS: Client exception thrown trying to respond to a non-existing poll.
+msgid "Invalid or missing poll."
+msgstr "Неважечка или непостоечка анкета."
+
+#. TRANS: Page title after sending a poll response.
+msgid "Poll results"
+msgstr "Резултати од анкетата"
diff --git a/plugins/Poll/locale/nl/LC_MESSAGES/Poll.po b/plugins/Poll/locale/nl/LC_MESSAGES/Poll.po
new file mode 100644
index 0000000000..89ce123826
--- /dev/null
+++ b/plugins/Poll/locale/nl/LC_MESSAGES/Poll.po
@@ -0,0 +1,152 @@
+# Translation of StatusNet - Poll to Dutch (Nederlands)
+# Exported from translatewiki.net
+#
+# Author: Siebrand
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Poll\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-17 09:47+0000\n"
+"PO-Revision-Date: 2011-03-17 09:51:41+0000\n"
+"Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-03-11 18:58:12+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: nl\n"
+"X-Message-Group: #out-statusnet-plugin-poll\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Client exception thrown trying to view a non-existing poll.
+msgid "No such poll."
+msgstr "Deze peiling bestaat niet."
+
+#. TRANS: Client exception thrown trying to view a non-existing poll notice.
+msgid "No such poll notice."
+msgstr "Dit peilingsbericht bestaat niet."
+
+#. TRANS: Client exception thrown trying to view a poll of a non-existing user.
+msgid "No such user."
+msgstr "Deze gebruiker bestaat niet."
+
+#. TRANS: Server exception thrown trying to view a poll for a user for which the profile could not be loaded.
+msgid "User without a profile."
+msgstr "Gebruiker zonder een profiel."
+
+#. TRANS: Page title for a poll.
+#. TRANS: %1$s is the nickname of the user that created the poll, %2$s is the poll question.
+#, php-format
+msgid "%1$s's poll: %2$s"
+msgstr "Peiling van %1$s: %2$s"
+
+#. TRANS: Field label on the page to create a poll.
+msgid "Question"
+msgstr "Vraag"
+
+#. TRANS: Field title on the page to create a poll.
+msgid "What question are people answering?"
+msgstr "Welke vraag beantwoorden de mensen?"
+
+#. TRANS: Field label for an answer option on the page to create a poll.
+#. TRANS: %d is the option number.
+#, php-format
+msgid "Option %d"
+msgstr "Keuze %d"
+
+#. TRANS: Button text for saving a new poll.
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "Opslaan"
+
+#. TRANS: Plugin description.
+msgid "Simple extension for supporting basic polls."
+msgstr "Eenvoudige plug-in voor peilingen."
+
+#. TRANS: Exception thrown trying to respond to a poll without a poll reference.
+msgid "Invalid poll response: no poll reference."
+msgstr "Ongeldig antwoord op peiling: heeft geen verwijzing naar een peiling."
+
+#. TRANS: Exception thrown trying to respond to a non-existing poll.
+msgid "Invalid poll response: poll is unknown."
+msgstr "Ongeldig antwoord op peiling: de peiling bestaat niet."
+
+#. TRANS: Exception thrown when performing an unexpected action on a poll.
+#. TRANS: %s is the unpexpected object type.
+#, php-format
+msgid "Unexpected type for poll plugin: %s."
+msgstr "Onverwacht type voor peilingplug-in: %s"
+
+#. TRANS: Application title.
+msgctxt "APPTITLE"
+msgid "Poll"
+msgstr "Peiling"
+
+#. TRANS: Client exception thrown when responding to a poll with an invalid option.
+#. TRANS: Client exception thrown responding to a poll with an invalid answer.
+msgid "Invalid poll selection."
+msgstr "Ongeldige keuze voor peiling."
+
+#. TRANS: Notice content voting for a poll.
+#. TRANS: %s is the chosen option in the poll.
+#. TRANS: Rendered version of the notice content voting for a poll.
+#. TRANS: %s a link to the poll with the chosen option as link description.
+#, php-format
+msgid "voted for \"%s\""
+msgstr "gestemd voor \"%s\""
+
+#. TRANS: Button text for submitting a poll response.
+msgctxt "BUTTON"
+msgid "Submit"
+msgstr "Opslaan"
+
+#. TRANS: Notice content creating a poll.
+#. TRANS: %1$s is the poll question, %2$s is a link to the poll.
+#, php-format
+msgid "Poll: %1$s %2$s"
+msgstr "Peiling: %1$s %2$s"
+
+#. TRANS: Rendered version of the notice content creating a poll.
+#. TRANS: %s a link to the poll with the question as link description.
+#, php-format
+msgid "Poll: %s"
+msgstr "Peiling: %s"
+
+#. TRANS: Title for poll page.
+msgid "New poll"
+msgstr "Nieuwe peiling"
+
+#. TRANS: Client exception thrown trying to create a poll while not logged in.
+msgid "You must be logged in to post a poll."
+msgstr "U moet aangemeld zijn om een peiling aan te kunnen maken."
+
+#. TRANS: Client exception thrown trying to create a poll without a question.
+msgid "Poll must have a question."
+msgstr "De peiling moet een vraag hebben."
+
+#. TRANS: Client exception thrown trying to create a poll with fewer than two options.
+msgid "Poll must have at least two options."
+msgstr "De peiling moet tenminste twee antwoordmogelijkheden hebben."
+
+#. TRANS: Page title after sending a notice.
+msgid "Notice posted"
+msgstr "De mededeling is verzonden"
+
+#. TRANS: Page title for poll response.
+msgid "Poll response"
+msgstr "Peilingreactie"
+
+#. TRANS: Client exception thrown trying to respond to a poll while not logged in.
+msgid "You must be logged in to respond to a poll."
+msgstr "U moet aangemeld zijn om te kunnen stemmen in een peiling."
+
+#. TRANS: Client exception thrown trying to respond to a non-existing poll.
+msgid "Invalid or missing poll."
+msgstr "De peiling is ongeldig of bestaat niet."
+
+#. TRANS: Page title after sending a poll response.
+msgid "Poll results"
+msgstr "Peilingresultaten"
diff --git a/plugins/Poll/locale/uk/LC_MESSAGES/Poll.po b/plugins/Poll/locale/uk/LC_MESSAGES/Poll.po
new file mode 100644
index 0000000000..dca23be16a
--- /dev/null
+++ b/plugins/Poll/locale/uk/LC_MESSAGES/Poll.po
@@ -0,0 +1,153 @@
+# Translation of StatusNet - Poll to Ukrainian (Українська)
+# Exported from translatewiki.net
+#
+# Author: Boogie
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Poll\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-17 09:47+0000\n"
+"PO-Revision-Date: 2011-03-17 09:51:41+0000\n"
+"Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-03-11 18:58:12+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: uk\n"
+"X-Message-Group: #out-statusnet-plugin-poll\n"
+"Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
+"2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
+
+#. TRANS: Client exception thrown trying to view a non-existing poll.
+msgid "No such poll."
+msgstr "Немає такого опитування."
+
+#. TRANS: Client exception thrown trying to view a non-existing poll notice.
+msgid "No such poll notice."
+msgstr "Немає допису щодо опитування."
+
+#. TRANS: Client exception thrown trying to view a poll of a non-existing user.
+msgid "No such user."
+msgstr "Такого користувача немає."
+
+#. TRANS: Server exception thrown trying to view a poll for a user for which the profile could not be loaded.
+msgid "User without a profile."
+msgstr "Користувач без профілю."
+
+#. TRANS: Page title for a poll.
+#. TRANS: %1$s is the nickname of the user that created the poll, %2$s is the poll question.
+#, php-format
+msgid "%1$s's poll: %2$s"
+msgstr "Опитування %1$s: %2$s"
+
+#. TRANS: Field label on the page to create a poll.
+msgid "Question"
+msgstr "Питання"
+
+#. TRANS: Field title on the page to create a poll.
+msgid "What question are people answering?"
+msgstr "На яке запитання відповідати людям?"
+
+#. TRANS: Field label for an answer option on the page to create a poll.
+#. TRANS: %d is the option number.
+#, php-format
+msgid "Option %d"
+msgstr "Варіант %d"
+
+#. TRANS: Button text for saving a new poll.
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "Зберегти"
+
+#. TRANS: Plugin description.
+msgid "Simple extension for supporting basic polls."
+msgstr "Простий додаток для підтримки проведення опитувань."
+
+#. TRANS: Exception thrown trying to respond to a poll without a poll reference.
+msgid "Invalid poll response: no poll reference."
+msgstr "Невірна відповідь: відсутнє посилання на опитування."
+
+#. TRANS: Exception thrown trying to respond to a non-existing poll.
+msgid "Invalid poll response: poll is unknown."
+msgstr "Неправильна відповідь на опитування: невідоме опитування."
+
+#. TRANS: Exception thrown when performing an unexpected action on a poll.
+#. TRANS: %s is the unpexpected object type.
+#, php-format
+msgid "Unexpected type for poll plugin: %s."
+msgstr "Неочікувана дія для додатку опитувань: %s."
+
+#. TRANS: Application title.
+msgctxt "APPTITLE"
+msgid "Poll"
+msgstr "Опитування"
+
+#. TRANS: Client exception thrown when responding to a poll with an invalid option.
+#. TRANS: Client exception thrown responding to a poll with an invalid answer.
+msgid "Invalid poll selection."
+msgstr "Невірний вибір опитування."
+
+#. TRANS: Notice content voting for a poll.
+#. TRANS: %s is the chosen option in the poll.
+#. TRANS: Rendered version of the notice content voting for a poll.
+#. TRANS: %s a link to the poll with the chosen option as link description.
+#, php-format
+msgid "voted for \"%s\""
+msgstr "проголосувало за «%s»"
+
+#. TRANS: Button text for submitting a poll response.
+msgctxt "BUTTON"
+msgid "Submit"
+msgstr "Надіслати"
+
+#. TRANS: Notice content creating a poll.
+#. TRANS: %1$s is the poll question, %2$s is a link to the poll.
+#, php-format
+msgid "Poll: %1$s %2$s"
+msgstr "Опитування: %1$s %2$s"
+
+#. TRANS: Rendered version of the notice content creating a poll.
+#. TRANS: %s a link to the poll with the question as link description.
+#, php-format
+msgid "Poll: %s"
+msgstr "Опитування: %s"
+
+#. TRANS: Title for poll page.
+msgid "New poll"
+msgstr "Нове опитування"
+
+#. TRANS: Client exception thrown trying to create a poll while not logged in.
+msgid "You must be logged in to post a poll."
+msgstr "Ви повинні увійти до системи, щоб взяти участь в опитуванні."
+
+#. TRANS: Client exception thrown trying to create a poll without a question.
+msgid "Poll must have a question."
+msgstr "Опитування повинно мати запитання."
+
+#. TRANS: Client exception thrown trying to create a poll with fewer than two options.
+msgid "Poll must have at least two options."
+msgstr "Опитування повинно мати принаймні два варіанти."
+
+#. TRANS: Page title after sending a notice.
+msgid "Notice posted"
+msgstr "Допис опубліковано"
+
+#. TRANS: Page title for poll response.
+msgid "Poll response"
+msgstr "Відповіді на опитування"
+
+#. TRANS: Client exception thrown trying to respond to a poll while not logged in.
+msgid "You must be logged in to respond to a poll."
+msgstr "Ви повинні увійти до системи, щоб відповісти на опитування."
+
+#. TRANS: Client exception thrown trying to respond to a non-existing poll.
+msgid "Invalid or missing poll."
+msgstr "Невірне або відсутнє опитування."
+
+#. TRANS: Page title after sending a poll response.
+msgid "Poll results"
+msgstr "Результати опитування"
diff --git a/plugins/SearchSub/locale/SearchSub.pot b/plugins/SearchSub/locale/SearchSub.pot
new file mode 100644
index 0000000000..c5b8798998
--- /dev/null
+++ b/plugins/SearchSub/locale/SearchSub.pot
@@ -0,0 +1,182 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-17 09:47+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. TRANS: Header for subscriptions overview for a user (first page).
+#. TRANS: %s is a user nickname.
+#: searchsubsaction.php:51
+#, php-format
+msgid "%s's search subscriptions"
+msgstr ""
+
+#. TRANS: Header for subscriptions overview for a user (not first page).
+#. TRANS: %1$s is a user nickname, %2$d is the page number.
+#: searchsubsaction.php:55
+#, php-format
+msgid "%1$s's search subscriptions, page %2$d"
+msgstr ""
+
+#. TRANS: Page notice for page with an overview of all search subscriptions
+#. TRANS: of the logged in user's own profile.
+#: searchsubsaction.php:68
+msgid ""
+"You have subscribed to receive all notices on this site matching the "
+"following searches:"
+msgstr ""
+
+#. TRANS: Page notice for page with an overview of all subscriptions of a user other
+#. TRANS: than the logged in user. %s is the user nickname.
+#: searchsubsaction.php:73
+#, php-format
+msgid ""
+"%s has subscribed to receive all notices on this site matching the following "
+"searches:"
+msgstr ""
+
+#. TRANS: Subscription list text when looking at the subscriptions for a of a user that has none
+#. TRANS: as an anonymous user. %s is the user nickname.
+#: searchsubsaction.php:130
+#, php-format
+msgid "%s is not subscribed to any searches."
+msgstr ""
+
+#: searchsubsaction.php:168
+#, php-format
+msgid "\"<a href=\"%s\">%s</a>\" since %s"
+msgstr ""
+
+#. TRANS: Error text shown a user tries to untrack a search query they're not subscribed to.
+#: searchsubuntrackcommand.php:21
+#, php-format
+msgid "You are not tracking the search \"%s\"."
+msgstr ""
+
+#. TRANS: Message given having failed to cancel a search subscription by untrack command.
+#: searchsubuntrackcommand.php:29
+#, php-format
+msgid "Could not end a search subscription for query \"%s\"."
+msgstr ""
+
+#. TRANS: Message given having removed a search subscription by untrack command.
+#: searchsubuntrackcommand.php:35
+#, php-format
+msgid "You are no longer subscribed to the search \"%s\"."
+msgstr ""
+
+#. TRANS: Page title when search subscription succeeded.
+#: searchsubaction.php:136
+msgid "Subscribed"
+msgstr ""
+
+#: searchunsubform.php:96 searchunsubform.php:107
+msgid "Unsubscribe from this search"
+msgstr ""
+
+#. TRANS: Page title when search unsubscription succeeded.
+#: searchunsubaction.php:76
+msgid "Unsubscribed"
+msgstr ""
+
+#. TRANS: Error text shown a user tries to track a search query they're already subscribed to.
+#: searchsubtrackcommand.php:21
+#, php-format
+msgid "You are already tracking the search \"%s\"."
+msgstr ""
+
+#. TRANS: Message given having failed to set up a search subscription by track command.
+#: searchsubtrackcommand.php:29
+#, php-format
+msgid "Could not start a search subscription for query \"%s\"."
+msgstr ""
+
+#. TRANS: Message given having added a search subscription by track command.
+#: searchsubtrackcommand.php:35
+#, php-format
+msgid "You are subscribed to the search \"%s\"."
+msgstr ""
+
+#. TRANS: Plugin description.
+#: SearchSubPlugin.php:132
+msgid "Plugin to allow following all messages with a given search."
+msgstr ""
+
+#. TRANS: SearchSub plugin menu item on user settings page.
+#: SearchSubPlugin.php:236
+msgctxt "MENU"
+msgid "Searches"
+msgstr ""
+
+#. TRANS: SearchSub plugin tooltip for user settings menu item.
+#: SearchSubPlugin.php:238
+msgid "Configure search subscriptions"
+msgstr ""
+
+#: SearchSubPlugin.php:259
+msgid "Search subscriptions"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "track <word>"
+#: SearchSubPlugin.php:309
+msgctxt "COMMANDHELP"
+msgid "Start following notices matching the given search query."
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "untrack <word>"
+#: SearchSubPlugin.php:311
+msgctxt "COMMANDHELP"
+msgid "Stop following notices matching the given search query."
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "track off"
+#. TRANS: Help message for IM/SMS command "untrack all"
+#: SearchSubPlugin.php:313 SearchSubPlugin.php:315
+msgctxt "COMMANDHELP"
+msgid "Disable all tracked search subscriptions."
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "tracks"
+#. TRANS: Help message for IM/SMS command "tracking"
+#: SearchSubPlugin.php:317 SearchSubPlugin.php:319
+msgctxt "COMMANDHELP"
+msgid "List all your search subscriptions."
+msgstr ""
+
+#. TRANS: Error text shown a user tries to disable all a search subscriptions with track off command, but has none.
+#: searchsubtrackingcommand.php:14 searchsubtrackoffcommand.php:14
+msgid "You are not tracking any searches."
+msgstr ""
+
+#. TRANS: Message given having disabled all search subscriptions with 'track off'.
+#: searchsubtrackingcommand.php:24
+#, php-format
+msgid "You are tracking searches for: %s"
+msgstr ""
+
+#: searchsubform.php:116 searchsubform.php:140
+msgid "Subscribe to this search"
+msgstr ""
+
+#. TRANS: Message given having failed to cancel one of the search subs with 'track off' command.
+#: searchsubtrackoffcommand.php:24
+#, php-format
+msgid "Error disabling search subscription for query \"%s\"."
+msgstr ""
+
+#. TRANS: Message given having disabled all search subscriptions with 'track off'.
+#: searchsubtrackoffcommand.php:31
+msgid "Disabled all your search subscriptions."
+msgstr ""
diff --git a/plugins/SubMirror/locale/SubMirror.pot b/plugins/SubMirror/locale/SubMirror.pot
index 81ae0a0f91..b152575321 100644
--- a/plugins/SubMirror/locale/SubMirror.pot
+++ b/plugins/SubMirror/locale/SubMirror.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"POT-Creation-Date: 2011-03-17 09:47+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,7 +17,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: actions/basemirror.php:71
-msgid "Invalid feed URL."
+#, php-format
+msgid "Invalid feed URL: %s"
 msgstr ""
 
 #. TRANS: Error message returned to user when setting up feed mirroring, but we were unable to resolve the given URL to a working feed.
@@ -58,7 +59,7 @@ msgstr ""
 msgid "Requested edit of missing mirror."
 msgstr ""
 
-#: actions/addmirror.php:72
+#: actions/addmirror.php:88
 msgid "Could not subscribe to feed."
 msgstr ""
 
@@ -74,34 +75,38 @@ msgid ""
 "timeline!"
 msgstr ""
 
-#: SubMirrorPlugin.php:90
+#: SubMirrorPlugin.php:93
 msgid "Pull feeds into your timeline!"
 msgstr ""
 
 #. TRANS: SubMirror plugin menu item on user settings page.
-#: SubMirrorPlugin.php:110
+#: SubMirrorPlugin.php:113
 msgctxt "MENU"
 msgid "Mirroring"
 msgstr ""
 
 #. TRANS: SubMirror plugin tooltip for user settings menu item.
-#: SubMirrorPlugin.php:112
+#: SubMirrorPlugin.php:115
 msgid "Configure mirroring of posts from other feeds"
 msgstr ""
 
-#: SubMirrorPlugin.php:183
+#: SubMirrorPlugin.php:186
 msgid "Mirrored feeds"
 msgstr ""
 
-#: lib/addmirrorform.php:59
+#: lib/addmirrorform.php:60
 msgid "Web page or feed URL:"
 msgstr ""
 
-#: lib/addmirrorform.php:64
+#: lib/addmirrorform.php:65 lib/addtwittermirrorform.php:55
 msgctxt "BUTTON"
 msgid "Add feed"
 msgstr ""
 
+#: lib/addtwittermirrorform.php:50
+msgid "Twitter username:"
+msgstr ""
+
 #: lib/editmirrorform.php:83
 msgctxt "LABEL"
 msgid "Remote feed:"
@@ -132,3 +137,15 @@ msgstr ""
 #: lib/editmirrorform.php:117
 msgid "Stop mirroring"
 msgstr ""
+
+#: lib/addmirrorwizard.php:76
+msgid "Twitter"
+msgstr ""
+
+#: lib/addmirrorwizard.php:109
+msgid "RSS or Atom feed"
+msgstr ""
+
+#: lib/addmirrorwizard.php:119
+msgid "Select a feed provider"
+msgstr ""
diff --git a/plugins/SubMirror/locale/de/LC_MESSAGES/SubMirror.po b/plugins/SubMirror/locale/de/LC_MESSAGES/SubMirror.po
index f3fb0f911f..76a5203c5e 100644
--- a/plugins/SubMirror/locale/de/LC_MESSAGES/SubMirror.po
+++ b/plugins/SubMirror/locale/de/LC_MESSAGES/SubMirror.po
@@ -9,19 +9,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SubMirror\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-06 02:34+0100\n"
-"PO-Revision-Date: 2011-03-06 01:38:18+0000\n"
+"POT-Creation-Date: 2011-03-17 09:47+0000\n"
+"PO-Revision-Date: 2011-03-17 09:52:01+0000\n"
 "Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-03 17:47:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-POT-Import-Date: 2011-03-06 02:19:34+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-submirror\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-msgid "Invalid feed URL."
+#, fuzzy, php-format
+msgid "Invalid feed URL: %s"
 msgstr "Ungültige Feed-URL."
 
 #. TRANS: Error message returned to user when setting up feed mirroring, but we were unable to resolve the given URL to a working feed.
@@ -88,6 +89,9 @@ msgctxt "BUTTON"
 msgid "Add feed"
 msgstr "Feed hinzufügen"
 
+msgid "Twitter username:"
+msgstr ""
+
 msgctxt "LABEL"
 msgid "Remote feed:"
 msgstr "Remote-Feed:"
@@ -113,3 +117,12 @@ msgstr "Speichern"
 
 msgid "Stop mirroring"
 msgstr "Mit dem Spiegeln aufhören"
+
+msgid "Twitter"
+msgstr ""
+
+msgid "RSS or Atom feed"
+msgstr ""
+
+msgid "Select a feed provider"
+msgstr ""
diff --git a/plugins/SubMirror/locale/fr/LC_MESSAGES/SubMirror.po b/plugins/SubMirror/locale/fr/LC_MESSAGES/SubMirror.po
index 5715014646..1216906eb9 100644
--- a/plugins/SubMirror/locale/fr/LC_MESSAGES/SubMirror.po
+++ b/plugins/SubMirror/locale/fr/LC_MESSAGES/SubMirror.po
@@ -10,19 +10,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SubMirror\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-06 02:34+0100\n"
-"PO-Revision-Date: 2011-03-06 01:38:18+0000\n"
+"POT-Creation-Date: 2011-03-17 09:47+0000\n"
+"PO-Revision-Date: 2011-03-17 09:52:01+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-03 17:47:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-POT-Import-Date: 2011-03-06 02:19:34+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-submirror\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-msgid "Invalid feed URL."
+#, fuzzy, php-format
+msgid "Invalid feed URL: %s"
 msgstr "Adresse URL de flux invalide."
 
 #. TRANS: Error message returned to user when setting up feed mirroring, but we were unable to resolve the given URL to a working feed.
@@ -93,6 +94,9 @@ msgctxt "BUTTON"
 msgid "Add feed"
 msgstr "Ajouter le flux"
 
+msgid "Twitter username:"
+msgstr ""
+
 msgctxt "LABEL"
 msgid "Remote feed:"
 msgstr "Flux distant :"
@@ -118,3 +122,12 @@ msgstr "Sauvegarder"
 
 msgid "Stop mirroring"
 msgstr "Arrêter le miroir"
+
+msgid "Twitter"
+msgstr ""
+
+msgid "RSS or Atom feed"
+msgstr ""
+
+msgid "Select a feed provider"
+msgstr ""
diff --git a/plugins/SubMirror/locale/ia/LC_MESSAGES/SubMirror.po b/plugins/SubMirror/locale/ia/LC_MESSAGES/SubMirror.po
index f6f1b5eb2a..19eb4e9f01 100644
--- a/plugins/SubMirror/locale/ia/LC_MESSAGES/SubMirror.po
+++ b/plugins/SubMirror/locale/ia/LC_MESSAGES/SubMirror.po
@@ -9,19 +9,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SubMirror\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-06 02:34+0100\n"
-"PO-Revision-Date: 2011-03-06 01:38:18+0000\n"
+"POT-Creation-Date: 2011-03-17 09:47+0000\n"
+"PO-Revision-Date: 2011-03-17 09:52:01+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-03 17:47:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-POT-Import-Date: 2011-03-06 02:19:34+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-submirror\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-msgid "Invalid feed URL."
+#, fuzzy, php-format
+msgid "Invalid feed URL: %s"
 msgstr "URL de syndication invalide."
 
 #. TRANS: Error message returned to user when setting up feed mirroring, but we were unable to resolve the given URL to a working feed.
@@ -90,6 +91,9 @@ msgctxt "BUTTON"
 msgid "Add feed"
 msgstr "Adder syndication"
 
+msgid "Twitter username:"
+msgstr ""
+
 msgctxt "LABEL"
 msgid "Remote feed:"
 msgstr "Syndication remote:"
@@ -115,3 +119,12 @@ msgstr "Salveguardar"
 
 msgid "Stop mirroring"
 msgstr "Cessar le republication"
+
+msgid "Twitter"
+msgstr ""
+
+msgid "RSS or Atom feed"
+msgstr ""
+
+msgid "Select a feed provider"
+msgstr ""
diff --git a/plugins/SubMirror/locale/mk/LC_MESSAGES/SubMirror.po b/plugins/SubMirror/locale/mk/LC_MESSAGES/SubMirror.po
index e6da0cb3ae..8ca0053775 100644
--- a/plugins/SubMirror/locale/mk/LC_MESSAGES/SubMirror.po
+++ b/plugins/SubMirror/locale/mk/LC_MESSAGES/SubMirror.po
@@ -9,19 +9,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SubMirror\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-06 02:34+0100\n"
-"PO-Revision-Date: 2011-03-06 01:38:18+0000\n"
+"POT-Creation-Date: 2011-03-17 09:47+0000\n"
+"PO-Revision-Date: 2011-03-17 09:52:01+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-03 17:47:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-POT-Import-Date: 2011-03-06 02:19:34+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-submirror\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
 
-msgid "Invalid feed URL."
+#, fuzzy, php-format
+msgid "Invalid feed URL: %s"
 msgstr "Неважечка URL-адреса за каналот."
 
 #. TRANS: Error message returned to user when setting up feed mirroring, but we were unable to resolve the given URL to a working feed.
@@ -90,6 +91,9 @@ msgctxt "BUTTON"
 msgid "Add feed"
 msgstr "Додај канал"
 
+msgid "Twitter username:"
+msgstr ""
+
 msgctxt "LABEL"
 msgid "Remote feed:"
 msgstr "Далечински канал:"
@@ -115,3 +119,12 @@ msgstr "Зачувај"
 
 msgid "Stop mirroring"
 msgstr "Престани со отсликување"
+
+msgid "Twitter"
+msgstr ""
+
+msgid "RSS or Atom feed"
+msgstr ""
+
+msgid "Select a feed provider"
+msgstr ""
diff --git a/plugins/SubMirror/locale/nl/LC_MESSAGES/SubMirror.po b/plugins/SubMirror/locale/nl/LC_MESSAGES/SubMirror.po
index f61cf8bab0..9c567df960 100644
--- a/plugins/SubMirror/locale/nl/LC_MESSAGES/SubMirror.po
+++ b/plugins/SubMirror/locale/nl/LC_MESSAGES/SubMirror.po
@@ -9,19 +9,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SubMirror\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-06 02:34+0100\n"
-"PO-Revision-Date: 2011-03-06 01:38:18+0000\n"
+"POT-Creation-Date: 2011-03-17 09:47+0000\n"
+"PO-Revision-Date: 2011-03-17 09:52:01+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-03 17:47:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-POT-Import-Date: 2011-03-06 02:19:34+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-submirror\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-msgid "Invalid feed URL."
+#, fuzzy, php-format
+msgid "Invalid feed URL: %s"
 msgstr "Ongeldige URL voor feed."
 
 #. TRANS: Error message returned to user when setting up feed mirroring, but we were unable to resolve the given URL to a working feed.
@@ -92,6 +93,9 @@ msgctxt "BUTTON"
 msgid "Add feed"
 msgstr "Feed toevoegen"
 
+msgid "Twitter username:"
+msgstr ""
+
 msgctxt "LABEL"
 msgid "Remote feed:"
 msgstr "Bronfeed:"
@@ -117,3 +121,12 @@ msgstr "Opslaan"
 
 msgid "Stop mirroring"
 msgstr "Spiegelen beëindigen"
+
+msgid "Twitter"
+msgstr ""
+
+msgid "RSS or Atom feed"
+msgstr ""
+
+msgid "Select a feed provider"
+msgstr ""
diff --git a/plugins/SubMirror/locale/tl/LC_MESSAGES/SubMirror.po b/plugins/SubMirror/locale/tl/LC_MESSAGES/SubMirror.po
index cd82af0273..05089e9660 100644
--- a/plugins/SubMirror/locale/tl/LC_MESSAGES/SubMirror.po
+++ b/plugins/SubMirror/locale/tl/LC_MESSAGES/SubMirror.po
@@ -9,19 +9,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SubMirror\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-06 02:34+0100\n"
-"PO-Revision-Date: 2011-03-06 01:38:18+0000\n"
+"POT-Creation-Date: 2011-03-17 09:47+0000\n"
+"PO-Revision-Date: 2011-03-17 09:52:01+0000\n"
 "Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-03 17:47:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-POT-Import-Date: 2011-03-06 02:19:34+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-submirror\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-msgid "Invalid feed URL."
+#, fuzzy, php-format
+msgid "Invalid feed URL: %s"
 msgstr "Hindi tanggap na URL ng pakain."
 
 #. TRANS: Error message returned to user when setting up feed mirroring, but we were unable to resolve the given URL to a working feed.
@@ -90,6 +91,9 @@ msgctxt "BUTTON"
 msgid "Add feed"
 msgstr "Idagdag ang pakain"
 
+msgid "Twitter username:"
+msgstr ""
+
 msgctxt "LABEL"
 msgid "Remote feed:"
 msgstr "Pakaing malayo:"
@@ -115,3 +119,12 @@ msgstr "Sagipin"
 
 msgid "Stop mirroring"
 msgstr "Ihinto ang pagsasalamin"
+
+msgid "Twitter"
+msgstr ""
+
+msgid "RSS or Atom feed"
+msgstr ""
+
+msgid "Select a feed provider"
+msgstr ""
diff --git a/plugins/SubMirror/locale/uk/LC_MESSAGES/SubMirror.po b/plugins/SubMirror/locale/uk/LC_MESSAGES/SubMirror.po
index 8c57930fdf..6693d90adb 100644
--- a/plugins/SubMirror/locale/uk/LC_MESSAGES/SubMirror.po
+++ b/plugins/SubMirror/locale/uk/LC_MESSAGES/SubMirror.po
@@ -9,20 +9,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SubMirror\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-06 02:34+0100\n"
-"PO-Revision-Date: 2011-03-06 01:38:18+0000\n"
+"POT-Creation-Date: 2011-03-17 09:47+0000\n"
+"PO-Revision-Date: 2011-03-17 09:52:01+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-03 17:47:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-POT-Import-Date: 2011-03-06 02:19:34+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-submirror\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-msgid "Invalid feed URL."
+#, fuzzy, php-format
+msgid "Invalid feed URL: %s"
 msgstr "Помилкова URL-адреса веб-стрічки."
 
 #. TRANS: Error message returned to user when setting up feed mirroring, but we were unable to resolve the given URL to a working feed.
@@ -91,6 +92,9 @@ msgctxt "BUTTON"
 msgid "Add feed"
 msgstr "Додати веб-стрічку"
 
+msgid "Twitter username:"
+msgstr ""
+
 msgctxt "LABEL"
 msgid "Remote feed:"
 msgstr "Віддалена веб-стрічка:"
@@ -116,3 +120,12 @@ msgstr "Зберегти"
 
 msgid "Stop mirroring"
 msgstr "Зупинити віддзеркалення"
+
+msgid "Twitter"
+msgstr ""
+
+msgid "RSS or Atom feed"
+msgstr ""
+
+msgid "Select a feed provider"
+msgstr ""
diff --git a/plugins/TagSub/locale/TagSub.pot b/plugins/TagSub/locale/TagSub.pot
new file mode 100644
index 0000000000..7992067332
--- /dev/null
+++ b/plugins/TagSub/locale/TagSub.pot
@@ -0,0 +1,98 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-17 09:47+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: tagunsubform.php:96 tagunsubform.php:107
+msgid "Unsubscribe from this tag"
+msgstr ""
+
+#. TRANS: Plugin description.
+#: TagSubPlugin.php:128
+msgid "Plugin to allow following all messages with a given tag."
+msgstr ""
+
+#. TRANS: SubMirror plugin menu item on user settings page.
+#: TagSubPlugin.php:202
+msgctxt "MENU"
+msgid "Tags"
+msgstr ""
+
+#. TRANS: SubMirror plugin tooltip for user settings menu item.
+#: TagSubPlugin.php:204
+msgid "Configure tag subscriptions"
+msgstr ""
+
+#: TagSubPlugin.php:225
+msgid "Tag subscriptions"
+msgstr ""
+
+#: tagsubform.php:116 tagsubform.php:140
+msgid "Subscribe to this tag"
+msgstr ""
+
+#. TRANS: Page title when tag unsubscription succeeded.
+#: tagunsubaction.php:76
+msgid "Unsubscribed"
+msgstr ""
+
+#. TRANS: Page title when tag subscription succeeded.
+#: tagsubaction.php:136
+msgid "Subscribed"
+msgstr ""
+
+#. TRANS: Header for subscriptions overview for a user (first page).
+#. TRANS: %s is a user nickname.
+#: tagsubsaction.php:51
+#, php-format
+msgid "%s's tag subscriptions"
+msgstr ""
+
+#. TRANS: Header for subscriptions overview for a user (not first page).
+#. TRANS: %1$s is a user nickname, %2$d is the page number.
+#: tagsubsaction.php:55
+#, php-format
+msgid "%1$s's tag subscriptions, page %2$d"
+msgstr ""
+
+#. TRANS: Page notice for page with an overview of all tag subscriptions
+#. TRANS: of the logged in user's own profile.
+#: tagsubsaction.php:68
+msgid ""
+"You have subscribed to receive all notices on this site containing the "
+"following tags:"
+msgstr ""
+
+#. TRANS: Page notice for page with an overview of all subscriptions of a user other
+#. TRANS: than the logged in user. %s is the user nickname.
+#: tagsubsaction.php:73
+#, php-format
+msgid ""
+"%s has subscribed to receive all notices on this site containing the "
+"following tags:"
+msgstr ""
+
+#. TRANS: Subscription list text when looking at the subscriptions for a of a user that has none
+#. TRANS: as an anonymous user. %s is the user nickname.
+#: tagsubsaction.php:130
+#, php-format
+msgid "%s is not listening to any tags."
+msgstr ""
+
+#: tagsubsaction.php:168
+#, php-format
+msgid "#<a href=\"%s\">%s</a> since %s"
+msgstr ""
diff --git a/plugins/UserLimit/locale/fa/LC_MESSAGES/UserLimit.po b/plugins/UserLimit/locale/fa/LC_MESSAGES/UserLimit.po
new file mode 100644
index 0000000000..f6f0b0df66
--- /dev/null
+++ b/plugins/UserLimit/locale/fa/LC_MESSAGES/UserLimit.po
@@ -0,0 +1,25 @@
+# Translation of StatusNet - UserLimit to Persian (فارسی)
+# Exported from translatewiki.net
+#
+# Author: Ebraminio
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - UserLimit\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-17 09:47+0000\n"
+"PO-Revision-Date: 2011-03-17 09:52:14+0000\n"
+"Language-Team: Persian <http://translatewiki.net/wiki/Portal:fa>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-03-06 02:19:38+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: fa\n"
+"X-Message-Group: #out-statusnet-plugin-userlimit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+msgid "Limit the number of users who can register."
+msgstr "محدودکردن تعداد کاربرانی که می‌توانید ثبت نام کنند."
diff --git a/plugins/YammerImport/locale/ru/LC_MESSAGES/YammerImport.po b/plugins/YammerImport/locale/ru/LC_MESSAGES/YammerImport.po
index ad166e3bb3..905d18a257 100644
--- a/plugins/YammerImport/locale/ru/LC_MESSAGES/YammerImport.po
+++ b/plugins/YammerImport/locale/ru/LC_MESSAGES/YammerImport.po
@@ -10,13 +10,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - YammerImport\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-06 02:34+0100\n"
-"PO-Revision-Date: 2011-03-06 01:38:37+0000\n"
+"POT-Creation-Date: 2011-03-17 09:47+0000\n"
+"PO-Revision-Date: 2011-03-17 09:52:24+0000\n"
 "Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-03 17:47:55+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-POT-Import-Date: 2011-03-06 02:19:42+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-yammerimport\n"
@@ -100,12 +100,12 @@ msgstr[2] "Импортировано %d пользователей."
 msgid "Import user groups"
 msgstr "Импорт групп пользователей"
 
-#, php-format
+#, fuzzy, php-format
 msgid "Importing %d group..."
 msgid_plural "Importing %d groups..."
 msgstr[0] "Импорт %d группы…"
 msgstr[1] "Импорт %d группы…"
-msgstr[2] ""
+msgstr[2] "Импорт %d группы…"
 
 #, php-format
 msgid "Imported %d group."

From 3d835bb8b5473783fffb571ccc7f51b6b82b225e Mon Sep 17 00:00:00 2001
From: Siebrand Mazeland <s.mazeland@xs4all.nl>
Date: Thu, 17 Mar 2011 11:38:18 +0100
Subject: [PATCH 649/655] Translator documentation added/updated. i18n/L10n
 updates.

---
 .../actions/profiledetailsettings.php         | 20 ++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/plugins/ExtendedProfile/actions/profiledetailsettings.php b/plugins/ExtendedProfile/actions/profiledetailsettings.php
index 23a6ce5d65..f01c25fc5f 100644
--- a/plugins/ExtendedProfile/actions/profiledetailsettings.php
+++ b/plugins/ExtendedProfile/actions/profiledetailsettings.php
@@ -37,7 +37,7 @@ class ProfileDetailSettingsAction extends ProfileSettingsAction
     function getInstructions()
     {
         // TRANS: Usage instructions for profile settings.
-        return _('You can update your personal profile info here '.
+        return _m('You can update your personal profile info here '.
                  'so people know more about you.');
     }
 
@@ -70,7 +70,7 @@ class ProfileDetailSettingsAction extends ProfileSettingsAction
         if ($this->arg('save')) {
             $this->saveDetails();
         } else {
-            // TRANS: Message given submitting a form with an unknown action
+            // TRANS: Message given submitting a form with an unknown action.
             $this->showForm(_m('Unexpected form submission.'));
         }
     }
@@ -133,7 +133,7 @@ class ProfileDetailSettingsAction extends ProfileSettingsAction
             return;
         }
 
-        $this->showForm(_('Details saved.'), true);
+        $this->showForm(_m('Details saved.'), true);
 
     }
 
@@ -142,6 +142,8 @@ class ProfileDetailSettingsAction extends ProfileSettingsAction
         if (empty($datestr)) {
             if ($required) {
                 $msg = sprintf(
+                    // TRANS: Exception thrown when no date was entered in a required date field.
+                    // TRANS: %s is the field name.
                     _m('You must supply a date for "%s".'),
                     $fieldname
                 );
@@ -152,7 +154,9 @@ class ProfileDetailSettingsAction extends ProfileSettingsAction
             if ($ts === false) {
                 throw new Exception(
                     sprintf(
-                        _m('Invalid date entered for "%s": %s'),
+                        // TRANS: Exception thrown on incorrect data input.
+                        // TRANS: %1$s is a field name, %2$s is the incorrect input.
+                        _m('Invalid date entered for "%1$s": %2$s.'),
                         $fieldname,
                         $ts
                     )
@@ -266,7 +270,9 @@ class ProfileDetailSettingsAction extends ProfileSettingsAction
                 $site['value'],
                 array('allowed_schemes' => array('http', 'https')))
             ) {
-                throw new Exception(sprintf(_m('Invalid URL: %s'), $site['value']));
+                // TRANS: Exception thrown when entering an invalid URL.
+                // TRANS: %s is the invalid URL.
+                throw new Exception(sprintf(_m('Invalid URL: %s.'), $site['value']));
             }
 
             if (!empty($site['value'])) {
@@ -613,7 +619,7 @@ class ProfileDetailSettingsAction extends ProfileSettingsAction
             if ($result === false) {
                 common_log_db_error($profile, 'UPDATE', __FILE__);
                 // TRANS: Server error thrown when user profile settings could not be saved.
-                $this->serverError(_('Could not save profile.'));
+                $this->serverError(_m('Could not save profile.'));
                 return;
             }
 
@@ -622,7 +628,7 @@ class ProfileDetailSettingsAction extends ProfileSettingsAction
 
             if (!$result) {
                 // TRANS: Server error thrown when user profile settings tags could not be saved.
-                $this->serverError(_('Could not save tags.'));
+                $this->serverError(_m('Could not save tags.'));
                 return;
             }
 

From 9785140da58bb8df330445bbf9fa0b0f8fe65835 Mon Sep 17 00:00:00 2001
From: Siebrand Mazeland <s.mazeland@xs4all.nl>
Date: Thu, 17 Mar 2011 11:46:49 +0100
Subject: [PATCH 650/655] Update translator documentation. L10n/i18n updates.
 Superfluous whitespace removed.

---
 actions/tagother.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/actions/tagother.php b/actions/tagother.php
index 258c13bdcc..c3bf219f67 100644
--- a/actions/tagother.php
+++ b/actions/tagother.php
@@ -21,6 +21,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/settingsaction.php');
 
+// @todo FIXME: documentation missing.
 class TagotherAction extends Action
 {
     var $profile = null;
@@ -127,10 +128,10 @@ class TagotherAction extends Action
         $this->elementStart('li');
         $this->input('tags', _('Tags'),
                      ($this->arg('tags')) ? $this->arg('tags') : implode(' ', Profile_tag::getTags($user->id, $this->profile->id)),
-                     _('Tags for this user (letters, numbers, -, ., and _), comma- or space- separated'));
+                     _('Tags for this user (letters, numbers, -, ., and _), separated by commas or spaces.'));
         $this->elementEnd('li');
         $this->elementEnd('ul');
-        $this->submit('save', _('Save'));
+        $this->submit('save', _m('BUTTON','Save'));
         $this->elementEnd('fieldset');
         $this->elementEnd('form');
     }
@@ -154,7 +155,9 @@ class TagotherAction extends Action
 
             foreach ($tags as $tag) {
                 if (!common_valid_profile_tag($tag)) {
-                    $this->showForm(sprintf(_('Invalid tag: "%s"'), $tag));
+                    // TRANS: Form validation error when entering an invalid tag.
+                    // TRANS: %s is the invalid tag.
+                    $this->showForm(sprintf(_('Invalid tag: "%s".'), $tag));
                     return;
                 }
             }
@@ -217,4 +220,3 @@ class TagotherAction extends Action
         }
     }
 }
-

From 726ddf7b4277f277bac73eef4b1a79a2e360dcf8 Mon Sep 17 00:00:00 2001
From: Siebrand Mazeland <s.mazeland@xs4all.nl>
Date: Thu, 17 Mar 2011 11:54:18 +0100
Subject: [PATCH 651/655] L10n updates. Translator documentation.

---
 plugins/SubMirror/actions/basemirror.php | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/plugins/SubMirror/actions/basemirror.php b/plugins/SubMirror/actions/basemirror.php
index 843dfb92e1..6a9109d13a 100644
--- a/plugins/SubMirror/actions/basemirror.php
+++ b/plugins/SubMirror/actions/basemirror.php
@@ -68,7 +68,9 @@ abstract class BaseMirrorAction extends Action
         if (common_valid_http_url($url)) {
             return $url;
         } else {
-            $this->clientError(sprintf(_m("Invalid feed URL: %s"), $url));
+            // TRANS: Client error displayed when entering an invalid URL for a feed.
+            // TRANS: %s is the invalid feed URL.
+            $this->clientError(sprintf(_m("Invalid feed URL: %s."), $url));
         }
     }
 
@@ -79,8 +81,9 @@ abstract class BaseMirrorAction extends Action
         if ($profile && $profile->id != $this->user->id) {
             return $profile;
         }
-        // TRANS: Error message returned to user when setting up feed mirroring, but we were unable to resolve the given URL to a working feed.
-        $this->clientError(_m("Invalid profile for mirroring."));
+        // TRANS: Error message returned to user when setting up feed mirroring,
+        // TRANS: but we were unable to resolve the given URL to a working feed.
+        $this->clientError(_m('Invalid profile for mirroring.'));
     }
 
     /**
@@ -98,7 +101,7 @@ abstract class BaseMirrorAction extends Action
             $oprofile = Ostatus_profile::ensureFeedURL($url);
         }
         if ($oprofile->isGroup()) {
-            $this->clientError(_m("Can't mirror a StatusNet group at this time."));
+            $this->clientError(_m("Cannot mirror a StatusNet group at this time."));
         }
         $this->oprofile = $oprofile; // @fixme ugly side effect :D
         return $oprofile->localProfile();

From 49952b08e19842e3f9ab8ad242b6f89ea704afd5 Mon Sep 17 00:00:00 2001
From: Samantha Doherty <sammy@status.net>
Date: Thu, 17 Mar 2011 08:32:18 -0400
Subject: [PATCH 652/655] A little more quick styling for Events.

---
 plugins/Event/EventPlugin.php |  2 +-
 theme/neo/css/display.css     | 17 ++++++++++++++++-
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/plugins/Event/EventPlugin.php b/plugins/Event/EventPlugin.php
index 5a6add9385..1ee6ef4309 100644
--- a/plugins/Event/EventPlugin.php
+++ b/plugins/Event/EventPlugin.php
@@ -297,7 +297,7 @@ class EventPlugin extends MicroappPlugin
         }
 
         // @fixme we have to start the name/avatar and open this div
-        $out->elementStart('div', array('class' => 'event-info')); // EVENT-INFO.ENTRY-CONTENT IN
+        $out->elementStart('div', array('class' => 'event-info entry-content')); // EVENT-INFO.ENTRY-CONTENT IN
 
         $profile = $notice->getProfile();
         $avatar = $profile->getAvatar(AVATAR_MINI_SIZE);
diff --git a/theme/neo/css/display.css b/theme/neo/css/display.css
index b13a74d667..cf3d5ca646 100644
--- a/theme/neo/css/display.css
+++ b/theme/neo/css/display.css
@@ -27,6 +27,8 @@ input, textarea, select, option {
 a {color: #3e3e8c;}
 a:hover {color: blue;}
 
+abbr {border-bottom: none;}
+
 h1 {font-size: 1.6em;}
 h2 {font-size: 1.6em;}
 h3 {font-size: 1.4em;}
@@ -1146,13 +1148,26 @@ table.profile_list tr.alt {
 
 /* Event specific styles */
 
+.notice .event div {
+    margin-bottom: 8px;
+}
+
+.event-info {
+    margin-left: 0px !important;
+    margin-top: 2px !important;
+}
+
+.notice .event-info + .notice-options {
+    margin-top: 14px;
+}
+
 #form_event_rsvp #new_rsvp_data {
     display: inline;
     margin: 10px 0px;
 }
 
 #form_event_rsvp input.submit {
-    height: 1.6em;
+    height: auto;
     padding: 0px 10px;
     margin-left: 10px;
     color:#fff;

From e845d6a8bfcbbffe03fcd4803eda0cda4bdfd974 Mon Sep 17 00:00:00 2001
From: Samantha Doherty <sammy@status.net>
Date: Thu, 17 Mar 2011 08:38:25 -0400
Subject: [PATCH 653/655] A few general style updates and fixes.

---
 theme/neo/css/display.css | 85 ++++++++++++++++++++++++++++++++++-----
 1 file changed, 76 insertions(+), 9 deletions(-)

diff --git a/theme/neo/css/display.css b/theme/neo/css/display.css
index cf3d5ca646..643a1f29dd 100644
--- a/theme/neo/css/display.css
+++ b/theme/neo/css/display.css
@@ -304,10 +304,36 @@ address {
     display: none; /* XXX move into input with js */
 }
 
-.form_notice textarea,
 .form_notice_placeholder .placeholder {
     width: 473px;
+    padding: 4px 10px 4px 10px;
+    border: 1px solid #a6a6a6;
+    -webkit-border-radius: 4px;
+    -moz-border-radius: 4px;
+    border-radius: 4px;
+    box-shadow: 0px 0px 4px rgba(0, 0, 0, 0.2);
+    -moz-box-shadow: 0px 0px 4px rgba(0, 0, 0, 0.2);
+    -webkit-box-shadow: 0px 0px 4px rgba(0, 0, 0, 0.2);
+    z-index: 97;
+    font-size: 1em;
 }
+
+.form_notice textarea {
+    width: 473px;
+    height: 42px;
+    padding: 6px 10px 18px 10px;
+    border: 1px solid #a6a6a6;
+    -webkit-border-radius: 4px;
+    -moz-border-radius: 4px;
+    border-radius: 4px;
+    box-shadow: 0px 0px 4px rgba(0, 0, 0, 0.2);
+    -moz-box-shadow: 0px 0px 4px rgba(0, 0, 0, 0.2);
+    -webkit-box-shadow: 0px 0px 4px rgba(0, 0, 0, 0.2);
+    z-index: 97;
+    font-size: 1.2em;
+}
+
+
 .form_notice textarea {
     height: 42px;
     padding: 6px 10px 18px 10px;
@@ -364,7 +390,7 @@ address {
     float: none;
     clear: none;
     margin-left: 0px;
-    margin-top: 5px;
+    margin-top: 10px;
     padding: 5px 5px 5px 10px;
     border: 1px solid #ccc;
 }
@@ -443,12 +469,12 @@ address {
 }
 
 .section ul.entities {
-    width: 220px;
+    width: 240px;
 }
 
 .section .entities li {
-    margin-right: 17px;
-    margin-bottom: 10px;
+    margin-right: 23px;
+    margin-bottom: 12px;
     width: 24px;
 }
 
@@ -552,6 +578,8 @@ div.entry-content a.response:after {
 }
 
 #content .notice .threaded-replies .notice {
+    width: 440px;
+    min-height: 1px;
     padding-bottom: 14px;
     padding-top: 5px;
     border-bottom: 2px dotted #eee;
@@ -583,7 +611,7 @@ div.entry-content a.response:after {
     clear:left;
     float:left;
     margin-left: 35px;
-    margin-top: 10px;
+    margin-top: 4px !important;
 }
 
 .threaded-replies li {
@@ -636,6 +664,26 @@ div.entry-content a.response:after {
     width: 390px; 
 }
 
+#content .notice .notice {
+    width: 100%;
+    margin-left: 0;
+    margin-top: 16px;
+    margin-bottom: 10px;
+}
+
+.notice .notice {
+background-color:rgba(200, 200, 200, 0.050);
+}
+.notice .notice .notice {
+background-color:rgba(200, 200, 200, 0.100);
+}
+.notice .notice .notice .notice {
+background-color:rgba(200, 200, 200, 0.150);
+}
+.notice .notice .notice .notice .notice {
+background-color:rgba(200, 200, 200, 0.300);
+}
+
 .pagination {
     height: 1.2em;
 }
@@ -864,6 +912,18 @@ padding-right:0;
     padding-left: 4px !important;
     padding-right: 4px !important;
     margin-right: 0px;
+    left: 0;
+    right: 0;
+    width: 400px;
+    overflow: visible;
+}
+
+.realtime-popup .threaded-replies {
+    margin-left: 10px;
+}
+
+.realtime-popup .input_forms {
+    display: none; /* XXX fixme! */
 }
 
 .realtime-popup .form_notice textarea {
@@ -946,7 +1006,7 @@ ul.bookmark-tags a {
     background: #f2f2f2;
     color: #3e3e8c !important;
     text-shadow: 0px 1px 1px rgba(255, 255, 255, 0.5);
-    font-size: 0.9em;
+    font-size: 0.88em;
 }
 
 ul.bookmark-tags a:hover {
@@ -961,7 +1021,7 @@ ul.bookmark-tags a:hover {
 }
 
 .bookmark div.entry-content {
-    font-size: 0.9em;
+    font-size: 0.88em;
     line-height: 1.2em;
     margin-top: 6px;
     opacity: 0.6;
@@ -1024,6 +1084,9 @@ ul.bookmark-tags a:hover {
 /* Onboard specific styles */
 
 .onboard-flash {
+    position: relative;
+    right: -800px;
+    top: 10px;
     border-radius: 6px;
  	-moz-border-radius: 6px;
    	-webkit-border-radius: 6px;
@@ -1148,7 +1211,7 @@ table.profile_list tr.alt {
 
 /* Event specific styles */
 
-.notice .event div {
+.notice .vevent div {
     margin-bottom: 8px;
 }
 
@@ -1161,6 +1224,10 @@ table.profile_list tr.alt {
     margin-top: 14px;
 }
 
+.notice .threaded-replies .event-info + .notice-options {
+    margin-top: 20px;
+}
+
 #form_event_rsvp #new_rsvp_data {
     display: inline;
     margin: 10px 0px;

From b74a7d7a75a3d72c44790f3e96af33558aea2ee8 Mon Sep 17 00:00:00 2001
From: Siebrand Mazeland <s.mazeland@xs4all.nl>
Date: Thu, 17 Mar 2011 12:08:44 +0100
Subject: [PATCH 654/655] Change email to SMS. Spotted by Nikerabbit.

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

diff --git a/actions/smssettings.php b/actions/smssettings.php
index cdf99a56d9..1545679c17 100644
--- a/actions/smssettings.php
+++ b/actions/smssettings.php
@@ -409,7 +409,7 @@ class SmssettingsAction extends SettingsAction
         if (!$result) {
             common_log_db_error($confirm, 'DELETE', __FILE__);
             // TRANS: Server error thrown on database error canceling SMS phone number confirmation.
-            $this->serverError(_('Could not delete email confirmation.'));
+            $this->serverError(_('Could not delete SMS confirmation.'));
             return;
         }
 

From a9f556795b5154fbb2880d816b83bee68b242bdb Mon Sep 17 00:00:00 2001
From: Siebrand Mazeland <s.mazeland@xs4all.nl>
Date: Thu, 17 Mar 2011 13:58:52 +0100
Subject: [PATCH 655/655] Localisation updates from http://translatewiki.net.

---
 locale/ar/LC_MESSAGES/statusnet.po            | 105 +-------
 locale/arz/LC_MESSAGES/statusnet.po           |  23 +-
 locale/bg/LC_MESSAGES/statusnet.po            |  24 +-
 locale/br/LC_MESSAGES/statusnet.po            |  24 +-
 locale/ca/LC_MESSAGES/statusnet.po            | 104 +-------
 locale/cs/LC_MESSAGES/statusnet.po            | 103 +-------
 locale/de/LC_MESSAGES/statusnet.po            | 104 +-------
 locale/en_GB/LC_MESSAGES/statusnet.po         | 104 +-------
 locale/eo/LC_MESSAGES/statusnet.po            | 103 +-------
 locale/es/LC_MESSAGES/statusnet.po            | 104 +-------
 locale/fa/LC_MESSAGES/statusnet.po            | 103 +-------
 locale/fi/LC_MESSAGES/statusnet.po            |  26 +-
 locale/fr/LC_MESSAGES/statusnet.po            | 105 +-------
 locale/fur/LC_MESSAGES/statusnet.po           |  23 +-
 locale/gl/LC_MESSAGES/statusnet.po            | 103 +-------
 locale/hsb/LC_MESSAGES/statusnet.po           |  23 +-
 locale/hu/LC_MESSAGES/statusnet.po            |  23 +-
 locale/ia/LC_MESSAGES/statusnet.po            | 103 +-------
 locale/it/LC_MESSAGES/statusnet.po            | 107 +-------
 locale/ja/LC_MESSAGES/statusnet.po            |  25 +-
 locale/ka/LC_MESSAGES/statusnet.po            |  24 +-
 locale/ko/LC_MESSAGES/statusnet.po            |  25 +-
 locale/mk/LC_MESSAGES/statusnet.po            | 104 +-------
 locale/ml/LC_MESSAGES/statusnet.po            |  20 +-
 locale/nb/LC_MESSAGES/statusnet.po            |  24 +-
 locale/nl/LC_MESSAGES/statusnet.po            | 180 +++----------
 locale/pl/LC_MESSAGES/statusnet.po            | 107 +-------
 locale/pt/LC_MESSAGES/statusnet.po            | 103 +-------
 locale/pt_BR/LC_MESSAGES/statusnet.po         | 105 +-------
 locale/ru/LC_MESSAGES/statusnet.po            | 249 ++++++------------
 locale/statusnet.pot                          |  50 ++--
 locale/sv/LC_MESSAGES/statusnet.po            | 104 +-------
 locale/te/LC_MESSAGES/statusnet.po            |  23 +-
 locale/tr/LC_MESSAGES/statusnet.po            |  27 +-
 locale/uk/LC_MESSAGES/statusnet.po            | 101 +------
 locale/zh_CN/LC_MESSAGES/statusnet.po         | 104 +-------
 .../locale/ExtendedProfile.pot                |  44 +++-
 .../locale/br/LC_MESSAGES/ExtendedProfile.po  |  37 ++-
 .../locale/ia/LC_MESSAGES/ExtendedProfile.po  |  37 ++-
 .../locale/mk/LC_MESSAGES/ExtendedProfile.po  |  37 ++-
 .../locale/nl/LC_MESSAGES/ExtendedProfile.po  |  72 +++--
 .../locale/sv/LC_MESSAGES/ExtendedProfile.po  |  37 ++-
 .../locale/uk/LC_MESSAGES/ExtendedProfile.po  |  37 ++-
 plugins/SubMirror/locale/SubMirror.pot        |  25 +-
 .../locale/de/LC_MESSAGES/SubMirror.po        |  16 +-
 .../locale/fr/LC_MESSAGES/SubMirror.po        |  16 +-
 .../locale/ia/LC_MESSAGES/SubMirror.po        |  16 +-
 .../locale/mk/LC_MESSAGES/SubMirror.po        |  16 +-
 .../locale/nl/LC_MESSAGES/SubMirror.po        |  26 +-
 .../locale/tl/LC_MESSAGES/SubMirror.po        |  16 +-
 .../locale/uk/LC_MESSAGES/SubMirror.po        |  16 +-
 51 files changed, 777 insertions(+), 2460 deletions(-)

diff --git a/locale/ar/LC_MESSAGES/statusnet.po b/locale/ar/LC_MESSAGES/statusnet.po
index 9650e26148..a2767e3bf0 100644
--- a/locale/ar/LC_MESSAGES/statusnet.po
+++ b/locale/ar/LC_MESSAGES/statusnet.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-17 09:47+0000\n"
-"PO-Revision-Date: 2011-03-17 09:49:21+0000\n"
+"POT-Creation-Date: 2011-03-17 12:35+0000\n"
+"PO-Revision-Date: 2011-03-17 12:37:44+0000\n"
 "Language-Team: Arabic <http://translatewiki.net/wiki/Portal:ar>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -24,7 +24,7 @@ msgstr ""
 "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-03-11 18:52:41+0000\n"
+"X-POT-Import-Date: 2011-03-17 10:19:27+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -3895,6 +3895,8 @@ msgstr "الاسم طويل جدا (الأقصى 255 حرفا)."
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
+#. TRANS: Form validation error when entering an invalid tag.
+#. TRANS: %s is the invalid tag.
 #, fuzzy, php-format
 msgid "Invalid tag: \"%s\"."
 msgstr "وسم غير صالح: \"%s\""
@@ -4716,9 +4718,8 @@ msgstr "نتائج البحث ل\"%1$s\" على %2$s"
 msgid "Notice deleted."
 msgstr "حُذف الإشعار."
 
-#, fuzzy
 msgid "Notice"
-msgstr "الإشعارات"
+msgstr "إشعارات"
 
 #. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
 #, fuzzy, php-format
@@ -5252,15 +5253,11 @@ msgstr "اوسم المستخدم"
 
 #, fuzzy
 msgid ""
-"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
-"separated"
+"Tags for this user (letters, numbers, -, ., and _), separated by commas or "
+"spaces."
 msgstr ""
 "سِم نفسك (حروف وأرقام و \"-\" و \".\" و \"_\")، افصلها بفاصلة (',') أو مسافة."
 
-#, php-format
-msgid "Invalid tag: \"%s\""
-msgstr "وسم غير صالح: \"%s\""
-
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
@@ -8244,87 +8241,5 @@ msgstr ""
 msgid "Getting backup from file '%s'."
 msgstr ""
 
-#~ msgid "Note"
-#~ msgstr "ملاحظة"
-
-#~ msgid ""
-#~ "Commands:\n"
-#~ "on - turn on notifications\n"
-#~ "off - turn off notifications\n"
-#~ "help - show this help\n"
-#~ "follow <nickname> - subscribe to user\n"
-#~ "groups - lists the groups you have joined\n"
-#~ "subscriptions - list the people you follow\n"
-#~ "subscribers - list the people that follow you\n"
-#~ "leave <nickname> - unsubscribe from user\n"
-#~ "d <nickname> <text> - direct message to user\n"
-#~ "get <nickname> - get last notice from user\n"
-#~ "whois <nickname> - get profile info on user\n"
-#~ "lose <nickname> - force user to stop following you\n"
-#~ "fav <nickname> - add user's last notice as a 'fave'\n"
-#~ "fav #<notice_id> - add notice with the given id as a 'fave'\n"
-#~ "repeat #<notice_id> - repeat a notice with a given id\n"
-#~ "repeat <nickname> - repeat the last notice from user\n"
-#~ "reply #<notice_id> - reply to notice with a given id\n"
-#~ "reply <nickname> - reply to the last notice from user\n"
-#~ "join <group> - join group\n"
-#~ "login - Get a link to login to the web interface\n"
-#~ "drop <group> - leave group\n"
-#~ "stats - get your stats\n"
-#~ "stop - same as 'off'\n"
-#~ "quit - same as 'off'\n"
-#~ "sub <nickname> - same as 'follow'\n"
-#~ "unsub <nickname> - same as 'leave'\n"
-#~ "last <nickname> - same as 'get'\n"
-#~ "on <nickname> - not yet implemented.\n"
-#~ "off <nickname> - not yet implemented.\n"
-#~ "nudge <nickname> - remind a user to update.\n"
-#~ "invite <phone number> - not yet implemented.\n"
-#~ "track <word> - not yet implemented.\n"
-#~ "untrack <word> - not yet implemented.\n"
-#~ "track off - not yet implemented.\n"
-#~ "untrack all - not yet implemented.\n"
-#~ "tracks - not yet implemented.\n"
-#~ "tracking - not yet implemented.\n"
-#~ msgstr ""
-#~ "الأوامر:\n"
-#~ "on - شغّل الإشعار\n"
-#~ "off - أطفئ الإشعار\n"
-#~ "help - أظهر هذه المساعدة\n"
-#~ "follow <nickname> - اشترك بالمستخدم\n"
-#~ "groups - اسرد المجموعات التي أنا عضو فيها\n"
-#~ "subscriptions - اسرد الذين أتابعهم\n"
-#~ "subscribers - اسرد الذين يتابعونني\n"
-#~ "leave <nickname> - ألغِ الاشتراك بمستخدم\n"
-#~ "d <nickname> <text> - وجّه رسالة مباشرة إلى مستخدم\n"
-#~ "get <nickname> - اجلب آخر رسالة من مستخدم\n"
-#~ "whois <nickname> - اجلب معلومات ملف المستخدم\n"
-#~ "lose <nickname> - أجبر المستخدم على عدم تتبعك\n"
-#~ "fav <nickname> - اجعل آخر إشعار من المستخدم مفضلًا\n"
-#~ "fav #<notice_id> - اجعل الإشعار ذا رقم الهوية المعطى مفضلا\n"
-#~ "repeat #<notice_id> - كرّر الإشعار ذا رقم الهوية المعطى\n"
-#~ "repeat <nickname> - كرّر آخر إشعار من المستخدم\n"
-#~ "reply #<notice_id> - رُد على الإشعار ذي رقم الهوية المعطى\n"
-#~ "reply <nickname> - رُد على آخر إشعار من المستخدم\n"
-#~ "join <group> - انضم إلى مجموعة\n"
-#~ "login - اجلب وصلة الولوج إلى واجهة الوب\n"
-#~ "drop <group> - اترك المجموعة\n"
-#~ "stats - اجلب إحصاءاتك\n"
-#~ "stop - مثل 'off'\n"
-#~ "quit - مثل 'off'\n"
-#~ "sub <nickname> - مثل 'follow'\n"
-#~ "unsub <nickname> - مثل 'leave'\n"
-#~ "last <nickname> - مثل 'get'\n"
-#~ "on <nickname> - لم يطبق بعد.\n"
-#~ "off <nickname> - لم يطبق بعد.\n"
-#~ "nudge <nickname> - ذكّر مستخدمًا بإشعار أرسلته.\n"
-#~ "invite <phone number> - لم يطبق بعد.\n"
-#~ "track <word> - لم يطبق بعد.\n"
-#~ "untrack <word> - لم يطبق بعد.\n"
-#~ "track off - لم يطبق بعد.\n"
-#~ "untrack all - لم يطبق بعد.\n"
-#~ "tracks - لم يطبق بعد.\n"
-#~ "tracking - لم يطبق بعد.\n"
-
-#~ msgid "Edit Avatar"
-#~ msgstr "عدّل الأفتار"
+#~ msgid "Invalid tag: \"%s\""
+#~ msgstr "وسم غير صالح: \"%s\""
diff --git a/locale/arz/LC_MESSAGES/statusnet.po b/locale/arz/LC_MESSAGES/statusnet.po
index ece9e2217b..402f98dd2d 100644
--- a/locale/arz/LC_MESSAGES/statusnet.po
+++ b/locale/arz/LC_MESSAGES/statusnet.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-17 09:47+0000\n"
-"PO-Revision-Date: 2011-03-17 09:49:22+0000\n"
+"POT-Creation-Date: 2011-03-17 12:35+0000\n"
+"PO-Revision-Date: 2011-03-17 12:37:45+0000\n"
 "Language-Team: Egyptian Spoken Arabic <http://translatewiki.net/wiki/Portal:"
 "arz>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,7 +23,7 @@ msgstr ""
 "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-03-11 18:52:41+0000\n"
+"X-POT-Import-Date: 2011-03-17 10:19:27+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -3935,6 +3935,8 @@ msgstr "الاسم طويل جدا (اكتر حاجه 255 رمز)."
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
+#. TRANS: Form validation error when entering an invalid tag.
+#. TRANS: %s is the invalid tag.
 #, fuzzy, php-format
 msgid "Invalid tag: \"%s\"."
 msgstr "وسم غير صالح: \"%s\""
@@ -5292,14 +5294,10 @@ msgid "Tag user"
 msgstr "اعمل tag لليوزر"
 
 msgid ""
-"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
-"separated"
+"Tags for this user (letters, numbers, -, ., and _), separated by commas or "
+"spaces."
 msgstr ""
 
-#, php-format
-msgid "Invalid tag: \"%s\""
-msgstr "وسم غير صالح: \"%s\""
-
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
@@ -8280,8 +8278,5 @@ msgstr ""
 msgid "Getting backup from file '%s'."
 msgstr ""
 
-#~ msgid "Note"
-#~ msgstr "ملاحظة"
-
-#~ msgid "Edit Avatar"
-#~ msgstr "عدّل الأفتار"
+#~ msgid "Invalid tag: \"%s\""
+#~ msgstr "وسم غير صالح: \"%s\""
diff --git a/locale/bg/LC_MESSAGES/statusnet.po b/locale/bg/LC_MESSAGES/statusnet.po
index 4d1cf6906c..2f63691648 100644
--- a/locale/bg/LC_MESSAGES/statusnet.po
+++ b/locale/bg/LC_MESSAGES/statusnet.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-17 09:47+0000\n"
-"PO-Revision-Date: 2011-03-17 09:49:23+0000\n"
+"POT-Creation-Date: 2011-03-17 12:35+0000\n"
+"PO-Revision-Date: 2011-03-17 12:37:46+0000\n"
 "Language-Team: Bulgarian <http://translatewiki.net/wiki/Portal:bg>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -21,7 +21,7 @@ msgstr ""
 "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-03-11 18:52:41+0000\n"
+"X-POT-Import-Date: 2011-03-17 10:19:27+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -3935,6 +3935,8 @@ msgstr "Името на езика е твърде дълго (може да е
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
+#. TRANS: Form validation error when entering an invalid tag.
+#. TRANS: %s is the invalid tag.
 #, fuzzy, php-format
 msgid "Invalid tag: \"%s\"."
 msgstr "Неправилен етикет: \"%s\""
@@ -4760,7 +4762,6 @@ msgstr "Съобщение от %1$s в %2$s"
 msgid "Notice deleted."
 msgstr "Бележката е изтрита."
 
-#, fuzzy
 msgid "Notice"
 msgstr "Бележки"
 
@@ -5291,14 +5292,10 @@ msgid "Tag user"
 msgstr "Етикети"
 
 msgid ""
-"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
-"separated"
+"Tags for this user (letters, numbers, -, ., and _), separated by commas or "
+"spaces."
 msgstr ""
 
-#, php-format
-msgid "Invalid tag: \"%s\""
-msgstr "Неправилен етикет: \"%s\""
-
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
@@ -8231,8 +8228,5 @@ msgstr ""
 msgid "Getting backup from file '%s'."
 msgstr ""
 
-#~ msgid "Note"
-#~ msgstr "Бележка"
-
-#~ msgid "Edit Avatar"
-#~ msgstr "Редактиране на аватара"
+#~ msgid "Invalid tag: \"%s\""
+#~ msgstr "Неправилен етикет: \"%s\""
diff --git a/locale/br/LC_MESSAGES/statusnet.po b/locale/br/LC_MESSAGES/statusnet.po
index 6bf976f0fd..2dd442d4dc 100644
--- a/locale/br/LC_MESSAGES/statusnet.po
+++ b/locale/br/LC_MESSAGES/statusnet.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-17 09:47+0000\n"
-"PO-Revision-Date: 2011-03-17 09:49:25+0000\n"
+"POT-Creation-Date: 2011-03-17 12:35+0000\n"
+"PO-Revision-Date: 2011-03-17 12:37:47+0000\n"
 "Language-Team: Breton <http://translatewiki.net/wiki/Portal:br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -22,7 +22,7 @@ msgstr ""
 "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-03-11 18:52:41+0000\n"
+"X-POT-Import-Date: 2011-03-17 10:19:27+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -3866,6 +3866,8 @@ msgstr "Re hir eo ar yezh (255 arouezenn d'ar muiañ)."
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
+#. TRANS: Form validation error when entering an invalid tag.
+#. TRANS: %s is the invalid tag.
 #, fuzzy, php-format
 msgid "Invalid tag: \"%s\"."
 msgstr "Balizenn direizh : \"%s\""
@@ -5223,17 +5225,14 @@ msgstr "Profil an implijer"
 msgid "Tag user"
 msgstr "Merkañ an implijer"
 
+#, fuzzy
 msgid ""
-"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
-"separated"
+"Tags for this user (letters, numbers, -, ., and _), separated by commas or "
+"spaces."
 msgstr ""
 "Merkoù evit an implijer-mañ (lizherennoù, sifroù, -, ., ha  _), dispartiet "
 "gant virgulennoù pe gant esaouennoù"
 
-#, php-format
-msgid "Invalid tag: \"%s\""
-msgstr "Balizenn direizh : \"%s\""
-
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
@@ -8119,8 +8118,5 @@ msgstr ""
 msgid "Getting backup from file '%s'."
 msgstr ""
 
-#~ msgid "Note"
-#~ msgstr "Notenn"
-
-#~ msgid "Edit Avatar"
-#~ msgstr "Kemmañ an Avatar"
+#~ msgid "Invalid tag: \"%s\""
+#~ msgstr "Balizenn direizh : \"%s\""
diff --git a/locale/ca/LC_MESSAGES/statusnet.po b/locale/ca/LC_MESSAGES/statusnet.po
index be175cd65b..f697268559 100644
--- a/locale/ca/LC_MESSAGES/statusnet.po
+++ b/locale/ca/LC_MESSAGES/statusnet.po
@@ -16,8 +16,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-17 09:47+0000\n"
-"PO-Revision-Date: 2011-03-17 09:49:26+0000\n"
+"POT-Creation-Date: 2011-03-17 12:35+0000\n"
+"PO-Revision-Date: 2011-03-17 12:37:49+0000\n"
 "Language-Team: Catalan <http://translatewiki.net/wiki/Portal:ca>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,7 +26,7 @@ msgstr ""
 "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-03-11 18:52:41+0000\n"
+"X-POT-Import-Date: 2011-03-17 10:19:27+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -3902,6 +3902,8 @@ msgstr "La llengua és massa llarga (màxim 50 caràcters)."
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
+#. TRANS: Form validation error when entering an invalid tag.
+#. TRANS: %s is the invalid tag.
 #, php-format
 msgid "Invalid tag: \"%s\"."
 msgstr "Etiqueta no vàlida: «%s»."
@@ -4753,7 +4755,6 @@ msgstr "Missatge de %1$s a %2$s"
 msgid "Notice deleted."
 msgstr "S'ha eliminat l'avís."
 
-#, fuzzy
 msgid "Notice"
 msgstr "Avisos"
 
@@ -5298,17 +5299,14 @@ msgstr "Perfil de l'usuari"
 msgid "Tag user"
 msgstr "Etiqueta usuari"
 
+#, fuzzy
 msgid ""
-"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
-"separated"
+"Tags for this user (letters, numbers, -, ., and _), separated by commas or "
+"spaces."
 msgstr ""
 "Etiquetes d'aquest usuari (lletres, nombres,, -, ., i _), comes o separades "
 "amb espais"
 
-#, php-format
-msgid "Invalid tag: \"%s\""
-msgstr "L'etiqueta no és vàlida: «%s»"
-
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
@@ -8298,87 +8296,5 @@ msgstr "L'XML no és vàlid, hi manca l'arrel XRD."
 msgid "Getting backup from file '%s'."
 msgstr "Es recupera la còpia de seguretat del fitxer '%s'."
 
-#~ msgid "Note"
-#~ msgstr "Avisos"
-
-#~ msgid ""
-#~ "Commands:\n"
-#~ "on - turn on notifications\n"
-#~ "off - turn off notifications\n"
-#~ "help - show this help\n"
-#~ "follow <nickname> - subscribe to user\n"
-#~ "groups - lists the groups you have joined\n"
-#~ "subscriptions - list the people you follow\n"
-#~ "subscribers - list the people that follow you\n"
-#~ "leave <nickname> - unsubscribe from user\n"
-#~ "d <nickname> <text> - direct message to user\n"
-#~ "get <nickname> - get last notice from user\n"
-#~ "whois <nickname> - get profile info on user\n"
-#~ "lose <nickname> - force user to stop following you\n"
-#~ "fav <nickname> - add user's last notice as a 'fave'\n"
-#~ "fav #<notice_id> - add notice with the given id as a 'fave'\n"
-#~ "repeat #<notice_id> - repeat a notice with a given id\n"
-#~ "repeat <nickname> - repeat the last notice from user\n"
-#~ "reply #<notice_id> - reply to notice with a given id\n"
-#~ "reply <nickname> - reply to the last notice from user\n"
-#~ "join <group> - join group\n"
-#~ "login - Get a link to login to the web interface\n"
-#~ "drop <group> - leave group\n"
-#~ "stats - get your stats\n"
-#~ "stop - same as 'off'\n"
-#~ "quit - same as 'off'\n"
-#~ "sub <nickname> - same as 'follow'\n"
-#~ "unsub <nickname> - same as 'leave'\n"
-#~ "last <nickname> - same as 'get'\n"
-#~ "on <nickname> - not yet implemented.\n"
-#~ "off <nickname> - not yet implemented.\n"
-#~ "nudge <nickname> - remind a user to update.\n"
-#~ "invite <phone number> - not yet implemented.\n"
-#~ "track <word> - not yet implemented.\n"
-#~ "untrack <word> - not yet implemented.\n"
-#~ "track off - not yet implemented.\n"
-#~ "untrack all - not yet implemented.\n"
-#~ "tracks - not yet implemented.\n"
-#~ "tracking - not yet implemented.\n"
-#~ msgstr ""
-#~ "Ordres:\n"
-#~ "on - activeu els avisos\n"
-#~ "off - desactiveu els avisos\n"
-#~ "help - mostra aquesta ajuda\n"
-#~ "follow <nickname> - se subscriu a l'usuari\n"
-#~ "groups - llista els grups on us heu unit\n"
-#~ "subscriptions - llista la gent que seguiu\n"
-#~ "subscribers - llista la gent que us segueix\n"
-#~ "leave <nickname> - cancel·la la subscripció de l'usuari\n"
-#~ "d <nickname> <text> - missatge directe a l'usuari\n"
-#~ "get <nickname> - s'obté el darrer avís de l'usuari\n"
-#~ "whois <nickname> - s'obté la informació del perfil de l'usuari\n"
-#~ "lose <nickname> - es força l'usuari a deixar de seguir-vos\n"
-#~ "fav <nickname> - afegeix el darrer avís de l'usuari com a «preferit»\n"
-#~ "fav #<notice_id> - afegeix l'avís amb l'id donat com a «preferit»\n"
-#~ "repeat #<notice_id> - repeteix l'avís amb l'id donat\n"
-#~ "repeat <nickname> - repeteix el darrer avís de l'usari\n"
-#~ "reply #<notice_id> - respon l'avís amb l'id donat\n"
-#~ "reply <nickname> - respon el darrer avís de l'usuari\n"
-#~ "join <group> - s'uneix al grup\n"
-#~ "login - s'obté un enllaç per iniciar una sessió des de la interfície web\n"
-#~ "drop <group> - es deixa el grup\n"
-#~ "stats - s'obté el vostre estat\n"
-#~ "stop - el mateix que «off»\n"
-#~ "quit - el mateix que «off»\n"
-#~ "sub <nickname> - el mateix que «follow»\n"
-#~ "unsub <nickname> - el mateix que «leave»\n"
-#~ "last <nickname> - el mateix que «get»\n"
-#~ "on <nickname> - no s'ha implementat encara.\n"
-#~ "off <nickname> - no s'ha implementat encara.\n"
-#~ "nudge <nickname> - es recorda a l'usuari que actualitzi.\n"
-#~ "invite <phone number> - no s'ha implementat encara.\n"
-#~ "track <word> - no s'ha implementat encara.\n"
-#~ "untrack <word> - no s'ha implementat encara.\n"
-#~ "track off - no s'ha implementat encara.\n"
-#~ "untrack all - no s'ha implementat encara.\n"
-#~ "tracks - no s'ha implementat encara.\n"
-#~ "tracking - no s'ha implementat encara.\n"
-
-#~ msgid "Edit Avatar"
-#~ msgstr "Edita l'avatar"
+#~ msgid "Invalid tag: \"%s\""
+#~ msgstr "L'etiqueta no és vàlida: «%s»"
diff --git a/locale/cs/LC_MESSAGES/statusnet.po b/locale/cs/LC_MESSAGES/statusnet.po
index 6dc8c4efc7..6ff0c2fc0c 100644
--- a/locale/cs/LC_MESSAGES/statusnet.po
+++ b/locale/cs/LC_MESSAGES/statusnet.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-17 09:47+0000\n"
-"PO-Revision-Date: 2011-03-17 09:49:27+0000\n"
+"POT-Creation-Date: 2011-03-17 12:35+0000\n"
+"PO-Revision-Date: 2011-03-17 12:37:50+0000\n"
 "Language-Team: Czech <http://translatewiki.net/wiki/Portal:cs>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -22,7 +22,7 @@ msgstr ""
 "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-03-11 18:52:41+0000\n"
+"X-POT-Import-Date: 2011-03-17 10:19:27+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -3975,6 +3975,8 @@ msgstr "Jazyk je příliš dlouhý (max. 50 znaků)."
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
+#. TRANS: Form validation error when entering an invalid tag.
+#. TRANS: %s is the invalid tag.
 #, fuzzy, php-format
 msgid "Invalid tag: \"%s\"."
 msgstr "Neplatná velikost"
@@ -5377,17 +5379,14 @@ msgstr "Uživatelský profil"
 msgid "Tag user"
 msgstr "Otagujte uživatele"
 
+#, fuzzy
 msgid ""
-"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
-"separated"
+"Tags for this user (letters, numbers, -, ., and _), separated by commas or "
+"spaces."
 msgstr ""
 "Tagy pro tohoto uživatele (písmena, číslice, -,., a _), oddělené čárkou nebo "
 "mezerou"
 
-#, php-format
-msgid "Invalid tag: \"%s\""
-msgstr "Neplatná velikost"
-
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
@@ -8410,87 +8409,5 @@ msgstr ""
 msgid "Getting backup from file '%s'."
 msgstr ""
 
-#~ msgid "Note"
-#~ msgstr "Poznámka"
-
-#~ msgid ""
-#~ "Commands:\n"
-#~ "on - turn on notifications\n"
-#~ "off - turn off notifications\n"
-#~ "help - show this help\n"
-#~ "follow <nickname> - subscribe to user\n"
-#~ "groups - lists the groups you have joined\n"
-#~ "subscriptions - list the people you follow\n"
-#~ "subscribers - list the people that follow you\n"
-#~ "leave <nickname> - unsubscribe from user\n"
-#~ "d <nickname> <text> - direct message to user\n"
-#~ "get <nickname> - get last notice from user\n"
-#~ "whois <nickname> - get profile info on user\n"
-#~ "lose <nickname> - force user to stop following you\n"
-#~ "fav <nickname> - add user's last notice as a 'fave'\n"
-#~ "fav #<notice_id> - add notice with the given id as a 'fave'\n"
-#~ "repeat #<notice_id> - repeat a notice with a given id\n"
-#~ "repeat <nickname> - repeat the last notice from user\n"
-#~ "reply #<notice_id> - reply to notice with a given id\n"
-#~ "reply <nickname> - reply to the last notice from user\n"
-#~ "join <group> - join group\n"
-#~ "login - Get a link to login to the web interface\n"
-#~ "drop <group> - leave group\n"
-#~ "stats - get your stats\n"
-#~ "stop - same as 'off'\n"
-#~ "quit - same as 'off'\n"
-#~ "sub <nickname> - same as 'follow'\n"
-#~ "unsub <nickname> - same as 'leave'\n"
-#~ "last <nickname> - same as 'get'\n"
-#~ "on <nickname> - not yet implemented.\n"
-#~ "off <nickname> - not yet implemented.\n"
-#~ "nudge <nickname> - remind a user to update.\n"
-#~ "invite <phone number> - not yet implemented.\n"
-#~ "track <word> - not yet implemented.\n"
-#~ "untrack <word> - not yet implemented.\n"
-#~ "track off - not yet implemented.\n"
-#~ "untrack all - not yet implemented.\n"
-#~ "tracks - not yet implemented.\n"
-#~ "tracking - not yet implemented.\n"
-#~ msgstr ""
-#~ "Příkazy:\n"
-#~ "on - zapnout oznámení\n"
-#~ "off - vypnout oznámení\n"
-#~ "help - zobrazí tuto nápovědu\n"
-#~ "follow <nickname> - Přihlásit se k uživatel\n"
-#~ "groups - seznam skupin, ke kterým jste připojen\n"
-#~ "subscriptions - seznam lidí, které sledujete\n"
-#~ "subscribers - seznam osob, které vás sledují\n"
-#~ "leave <přezdívka> - Odhlásit se od uživatele\n"
-#~ "d <přezdívka> <text> - Přímá zpráva uživateli\n"
-#~ "get <přezdívka> - Dostanete poslední upozornění od uživatele\n"
-#~ "whois <přezdívka> - Získat informace o profilu uživatele\n"
-#~ "lose <přezdívka> - Donutit uživatele přestat vás sledovat\n"
-#~ "fav <přezdívka> - Přidejte uživatelovo poslední oznámení jako 'Oblíbené'\n"
-#~ "fav #<notice_id> - Přidat upozornění s daným id jako 'Oblíbené'\n"
-#~ "repeat #<notice_id> - Opakovat oznámení s daným id\n"
-#~ "repeat <přezdívka> - Opakovat poslední oznámení od uživatele\n"
-#~ "reply #<notice_id> - Odpověď na oznámení s daným id\n"
-#~ "reply <přezdívka> - Odpověď na poslední oznámení od uživatele\n"
-#~ "join <skupina> - Připojit se ke skupině\n"
-#~ "login - Získat odkaz pro přihlášení k webovému rozhraní\n"
-#~ "drop <skupina> - Opustit skupinu\n"
-#~ "stats - získejte Vaše statistiky\n"
-#~ "stop - stejné jako 'off'\n"
-#~ "quit - stejné jako 'off'\n"
-#~ "sub <přezdívka> - Stejné jako 'follow'\n"
-#~ "unsub <přezdívka> - Stejné jako 'leave'\n"
-#~ "last <přezdívka> - Stejné jako 'get'\n"
-#~ "on <přezdívka> - Dosud neimplementován.\n"
-#~ "off <přezdívka> - Dosud neimplementován.\n"
-#~ "nudge <přezdívka> - Připomenout uživateli aby něco poslal.\n"
-#~ "invite <telefonní číslo> - Dosud neimplementován.\n"
-#~ "track <word> - Dosud neimplementován.\n"
-#~ "untrack <word> -Dosud neimplementován.\n"
-#~ "track off - Dosud neimplementován.\n"
-#~ "untrack all - Dosud neimplementován.\n"
-#~ "tracks -  Dosud neimplementován.\n"
-#~ "tracking - Dosud neimplementován.\n"
-
-#~ msgid "Edit Avatar"
-#~ msgstr "Upravit avatar"
+#~ msgid "Invalid tag: \"%s\""
+#~ msgstr "Neplatná velikost"
diff --git a/locale/de/LC_MESSAGES/statusnet.po b/locale/de/LC_MESSAGES/statusnet.po
index 0ef7232dc1..c2e809c478 100644
--- a/locale/de/LC_MESSAGES/statusnet.po
+++ b/locale/de/LC_MESSAGES/statusnet.po
@@ -22,8 +22,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-17 09:47+0000\n"
-"PO-Revision-Date: 2011-03-17 09:49:28+0000\n"
+"POT-Creation-Date: 2011-03-17 12:35+0000\n"
+"PO-Revision-Date: 2011-03-17 12:37:51+0000\n"
 "Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -32,7 +32,7 @@ msgstr ""
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-03-11 18:52:41+0000\n"
+"X-POT-Import-Date: 2011-03-17 10:19:27+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -3968,6 +3968,8 @@ msgstr "Die eingegebene Sprache ist zu lang (maximal 50 Zeichen)."
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
+#. TRANS: Form validation error when entering an invalid tag.
+#. TRANS: %s is the invalid tag.
 #, fuzzy, php-format
 msgid "Invalid tag: \"%s\"."
 msgstr "Ungültiges Stichwort: „%s“"
@@ -4839,7 +4841,6 @@ msgstr "Nachricht von %1$s auf %2$s"
 msgid "Notice deleted."
 msgstr "Nachricht gelöscht."
 
-#, fuzzy
 msgid "Notice"
 msgstr "Nachrichten"
 
@@ -5385,17 +5386,14 @@ msgstr "Benutzerprofil"
 msgid "Tag user"
 msgstr "Benutzer taggen"
 
+#, fuzzy
 msgid ""
-"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
-"separated"
+"Tags for this user (letters, numbers, -, ., and _), separated by commas or "
+"spaces."
 msgstr ""
 "Tags dieses Benutzers (Buchstaben, Nummer, -, ., und _), durch Komma oder "
 "Leerzeichen getrennt"
 
-#, php-format
-msgid "Invalid tag: \"%s\""
-msgstr "Ungültiges Stichwort: „%s“"
-
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
@@ -8405,87 +8403,5 @@ msgstr "Ungültiges XML, XRD-Root fehlt."
 msgid "Getting backup from file '%s'."
 msgstr "Hole Backup von der Datei „%s“."
 
-#~ msgid "Note"
-#~ msgstr "Nachricht"
-
-#~ msgid ""
-#~ "Commands:\n"
-#~ "on - turn on notifications\n"
-#~ "off - turn off notifications\n"
-#~ "help - show this help\n"
-#~ "follow <nickname> - subscribe to user\n"
-#~ "groups - lists the groups you have joined\n"
-#~ "subscriptions - list the people you follow\n"
-#~ "subscribers - list the people that follow you\n"
-#~ "leave <nickname> - unsubscribe from user\n"
-#~ "d <nickname> <text> - direct message to user\n"
-#~ "get <nickname> - get last notice from user\n"
-#~ "whois <nickname> - get profile info on user\n"
-#~ "lose <nickname> - force user to stop following you\n"
-#~ "fav <nickname> - add user's last notice as a 'fave'\n"
-#~ "fav #<notice_id> - add notice with the given id as a 'fave'\n"
-#~ "repeat #<notice_id> - repeat a notice with a given id\n"
-#~ "repeat <nickname> - repeat the last notice from user\n"
-#~ "reply #<notice_id> - reply to notice with a given id\n"
-#~ "reply <nickname> - reply to the last notice from user\n"
-#~ "join <group> - join group\n"
-#~ "login - Get a link to login to the web interface\n"
-#~ "drop <group> - leave group\n"
-#~ "stats - get your stats\n"
-#~ "stop - same as 'off'\n"
-#~ "quit - same as 'off'\n"
-#~ "sub <nickname> - same as 'follow'\n"
-#~ "unsub <nickname> - same as 'leave'\n"
-#~ "last <nickname> - same as 'get'\n"
-#~ "on <nickname> - not yet implemented.\n"
-#~ "off <nickname> - not yet implemented.\n"
-#~ "nudge <nickname> - remind a user to update.\n"
-#~ "invite <phone number> - not yet implemented.\n"
-#~ "track <word> - not yet implemented.\n"
-#~ "untrack <word> - not yet implemented.\n"
-#~ "track off - not yet implemented.\n"
-#~ "untrack all - not yet implemented.\n"
-#~ "tracks - not yet implemented.\n"
-#~ "tracking - not yet implemented.\n"
-#~ msgstr ""
-#~ "Befehle:\n"
-#~ "on - Benachrichtigung einschalten\n"
-#~ "off - Benachrichtigung ausschalten\n"
-#~ "help - diese Hilfe anzeigen\n"
-#~ "follow <nickname> - einem Benutzer folgen\n"
-#~ "groups - Gruppen auflisten in denen du Mitglied bist\n"
-#~ "subscriptions - Leute auflisten denen du folgst\n"
-#~ "subscribers - Leute auflisten die dir folgen\n"
-#~ "leave <nickname> - einem Benutzer nicht mehr folgen\n"
-#~ "d <nickname> <text> - Direkte Nachricht an einen Benutzer schicken\n"
-#~ "get <nickname> - letzte Nachricht eines Benutzers abrufen\n"
-#~ "whois <nickname> - Profil eines Benutzers abrufen\n"
-#~ "lose <nickname> - Benutzer zwingen dir nicht mehr zu folgen\n"
-#~ "fav <nickname> - letzte Nachricht eines Benutzers als Favorit markieren\n"
-#~ "fav #<notice_id> - Nachricht mit bestimmter ID als Favorit markieren\n"
-#~ "repeat #<notice_id> - Nachricht mit bestimmter ID wiederholen\n"
-#~ "repeat <nickname> - letzte Nachricht eines Benutzers wiederholen\n"
-#~ "reply #<notice_id> - Nachricht mit bestimmter ID beantworten\n"
-#~ "reply <nickname> - letzte Nachricht eines Benutzers beantworten\n"
-#~ "join <group> - Gruppe beitreten\n"
-#~ "login - Link zum Anmelden auf der Webseite anfordern\n"
-#~ "drop <group> - Gruppe verlassen\n"
-#~ "stats - deine Statistik abrufen\n"
-#~ "stop - Äquivalent zu „off“\n"
-#~ "quit - Äquivalent zu „off“\n"
-#~ "sub <nickname> - Äquivalent zu „follow“\n"
-#~ "unsub <nickname> - Äquivalent zu „leave“\n"
-#~ "last <nickname> - Äquivalent zu „get“\n"
-#~ "on <nickname> - noch nicht implementiert\n"
-#~ "off <nickname> - noch nicht implementiert\n"
-#~ "nudge <nickname> - einen Benutzer ans Aktualisieren erinnern\n"
-#~ "invite <phone number> - noch nicht implementiert\n"
-#~ "track <word> - noch nicht implementiert\n"
-#~ "untrack <word> - noch nicht implementiert\n"
-#~ "track off - noch nicht implementiert\n"
-#~ "untrack all - noch nicht implementiert\n"
-#~ "tracks - noch nicht implementiert\n"
-#~ "tracking - noch nicht implementiert\n"
-
-#~ msgid "Edit Avatar"
-#~ msgstr "Avatar bearbeiten"
+#~ msgid "Invalid tag: \"%s\""
+#~ msgstr "Ungültiges Stichwort: „%s“"
diff --git a/locale/en_GB/LC_MESSAGES/statusnet.po b/locale/en_GB/LC_MESSAGES/statusnet.po
index 7289070638..2e129e5e6b 100644
--- a/locale/en_GB/LC_MESSAGES/statusnet.po
+++ b/locale/en_GB/LC_MESSAGES/statusnet.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-17 09:47+0000\n"
-"PO-Revision-Date: 2011-03-17 09:49:29+0000\n"
+"POT-Creation-Date: 2011-03-17 12:35+0000\n"
+"PO-Revision-Date: 2011-03-17 12:37:53+0000\n"
 "Language-Team: British English <http://translatewiki.net/wiki/Portal:en-gb>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -23,7 +23,7 @@ msgstr ""
 "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-03-11 18:52:41+0000\n"
+"X-POT-Import-Date: 2011-03-17 10:19:27+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -3938,6 +3938,8 @@ msgstr "Language is too long (max 50 chars)."
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
+#. TRANS: Form validation error when entering an invalid tag.
+#. TRANS: %s is the invalid tag.
 #, fuzzy, php-format
 msgid "Invalid tag: \"%s\"."
 msgstr "Invalid tag: \"%s\""
@@ -4789,7 +4791,6 @@ msgstr "Message from %1$s on %2$s"
 msgid "Notice deleted."
 msgstr "Notice deleted."
 
-#, fuzzy
 msgid "Notice"
 msgstr "Notices"
 
@@ -5319,17 +5320,14 @@ msgstr "User profile"
 msgid "Tag user"
 msgstr "Tag user"
 
+#, fuzzy
 msgid ""
-"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
-"separated"
+"Tags for this user (letters, numbers, -, ., and _), separated by commas or "
+"spaces."
 msgstr ""
 "Tags for this user (letters, numbers, -, ., and _), comma- or space- "
 "separated"
 
-#, php-format
-msgid "Invalid tag: \"%s\""
-msgstr "Invalid tag: \"%s\""
-
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
@@ -8209,87 +8207,5 @@ msgstr ""
 msgid "Getting backup from file '%s'."
 msgstr ""
 
-#~ msgid "Note"
-#~ msgstr "Note"
-
-#~ msgid ""
-#~ "Commands:\n"
-#~ "on - turn on notifications\n"
-#~ "off - turn off notifications\n"
-#~ "help - show this help\n"
-#~ "follow <nickname> - subscribe to user\n"
-#~ "groups - lists the groups you have joined\n"
-#~ "subscriptions - list the people you follow\n"
-#~ "subscribers - list the people that follow you\n"
-#~ "leave <nickname> - unsubscribe from user\n"
-#~ "d <nickname> <text> - direct message to user\n"
-#~ "get <nickname> - get last notice from user\n"
-#~ "whois <nickname> - get profile info on user\n"
-#~ "lose <nickname> - force user to stop following you\n"
-#~ "fav <nickname> - add user's last notice as a 'fave'\n"
-#~ "fav #<notice_id> - add notice with the given id as a 'fave'\n"
-#~ "repeat #<notice_id> - repeat a notice with a given id\n"
-#~ "repeat <nickname> - repeat the last notice from user\n"
-#~ "reply #<notice_id> - reply to notice with a given id\n"
-#~ "reply <nickname> - reply to the last notice from user\n"
-#~ "join <group> - join group\n"
-#~ "login - Get a link to login to the web interface\n"
-#~ "drop <group> - leave group\n"
-#~ "stats - get your stats\n"
-#~ "stop - same as 'off'\n"
-#~ "quit - same as 'off'\n"
-#~ "sub <nickname> - same as 'follow'\n"
-#~ "unsub <nickname> - same as 'leave'\n"
-#~ "last <nickname> - same as 'get'\n"
-#~ "on <nickname> - not yet implemented.\n"
-#~ "off <nickname> - not yet implemented.\n"
-#~ "nudge <nickname> - remind a user to update.\n"
-#~ "invite <phone number> - not yet implemented.\n"
-#~ "track <word> - not yet implemented.\n"
-#~ "untrack <word> - not yet implemented.\n"
-#~ "track off - not yet implemented.\n"
-#~ "untrack all - not yet implemented.\n"
-#~ "tracks - not yet implemented.\n"
-#~ "tracking - not yet implemented.\n"
-#~ msgstr ""
-#~ "Commands:\n"
-#~ "on - turn on notifications\n"
-#~ "off - turn off notifications\n"
-#~ "help - show this help\n"
-#~ "follow <nickname> - subscribe to user\n"
-#~ "groups - lists the groups you have joined\n"
-#~ "subscriptions - list the people you follow\n"
-#~ "subscribers - list the people that follow you\n"
-#~ "leave <nickname> - unsubscribe from user\n"
-#~ "d <nickname> <text> - direct message to user\n"
-#~ "get <nickname> - get last notice from user\n"
-#~ "whois <nickname> - get profile info on user\n"
-#~ "lose <nickname> - force user to stop following you\n"
-#~ "fav <nickname> - add user's last notice as a 'fave'\n"
-#~ "fav #<notice_id> - add notice with the given id as a 'fave'\n"
-#~ "repeat #<notice_id> - repeat a notice with a given id\n"
-#~ "repeat <nickname> - repeat the last notice from user\n"
-#~ "reply #<notice_id> - reply to notice with a given id\n"
-#~ "reply <nickname> - reply to the last notice from user\n"
-#~ "join <group> - join group\n"
-#~ "login - Get a link to login to the web interface\n"
-#~ "drop <group> - leave group\n"
-#~ "stats - get your stats\n"
-#~ "stop - same as 'off'\n"
-#~ "quit - same as 'off'\n"
-#~ "sub <nickname> - same as 'follow'\n"
-#~ "unsub <nickname> - same as 'leave'\n"
-#~ "last <nickname> - same as 'get'\n"
-#~ "on <nickname> - not yet implemented.\n"
-#~ "off <nickname> - not yet implemented.\n"
-#~ "nudge <nickname> - remind a user to update.\n"
-#~ "invite <phone number> - not yet implemented.\n"
-#~ "track <word> - not yet implemented.\n"
-#~ "untrack <word> - not yet implemented.\n"
-#~ "track off - not yet implemented.\n"
-#~ "untrack all - not yet implemented.\n"
-#~ "tracks - not yet implemented.\n"
-#~ "tracking - not yet implemented.\n"
-
-#~ msgid "Edit Avatar"
-#~ msgstr "Edit Avatar"
+#~ msgid "Invalid tag: \"%s\""
+#~ msgstr "Invalid tag: \"%s\""
diff --git a/locale/eo/LC_MESSAGES/statusnet.po b/locale/eo/LC_MESSAGES/statusnet.po
index 029c3231b7..23778b484e 100644
--- a/locale/eo/LC_MESSAGES/statusnet.po
+++ b/locale/eo/LC_MESSAGES/statusnet.po
@@ -17,8 +17,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-17 09:47+0000\n"
-"PO-Revision-Date: 2011-03-17 09:49:30+0000\n"
+"POT-Creation-Date: 2011-03-17 12:35+0000\n"
+"PO-Revision-Date: 2011-03-17 12:37:54+0000\n"
 "Language-Team: Esperanto <http://translatewiki.net/wiki/Portal:eo>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -27,7 +27,7 @@ msgstr ""
 "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-03-11 18:52:41+0000\n"
+"X-POT-Import-Date: 2011-03-17 10:19:27+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -3906,6 +3906,8 @@ msgstr "Lingvo tro longas (maksimume 50 literoj)"
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
+#. TRANS: Form validation error when entering an invalid tag.
+#. TRANS: %s is the invalid tag.
 #, fuzzy, php-format
 msgid "Invalid tag: \"%s\"."
 msgstr "Nevalida markilo: \"%s\""
@@ -5297,17 +5299,14 @@ msgstr "Uzanta profilo"
 msgid "Tag user"
 msgstr "Etikedi uzanton"
 
+#, fuzzy
 msgid ""
-"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
-"separated"
+"Tags for this user (letters, numbers, -, ., and _), separated by commas or "
+"spaces."
 msgstr ""
 "Etikedoj por ĉi tiuj uzanto (literoj, ciferoj, -, . Kaj _), apartigu per "
 "komo aŭ spaco."
 
-#, php-format
-msgid "Invalid tag: \"%s\""
-msgstr "Nevalida markilo: \"%s\""
-
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr "Vi rajtas entikedi nur abonanton aŭ abonaton."
@@ -8299,87 +8298,5 @@ msgstr ""
 msgid "Getting backup from file '%s'."
 msgstr ""
 
-#~ msgid "Note"
-#~ msgstr "Noto"
-
-#~ msgid ""
-#~ "Commands:\n"
-#~ "on - turn on notifications\n"
-#~ "off - turn off notifications\n"
-#~ "help - show this help\n"
-#~ "follow <nickname> - subscribe to user\n"
-#~ "groups - lists the groups you have joined\n"
-#~ "subscriptions - list the people you follow\n"
-#~ "subscribers - list the people that follow you\n"
-#~ "leave <nickname> - unsubscribe from user\n"
-#~ "d <nickname> <text> - direct message to user\n"
-#~ "get <nickname> - get last notice from user\n"
-#~ "whois <nickname> - get profile info on user\n"
-#~ "lose <nickname> - force user to stop following you\n"
-#~ "fav <nickname> - add user's last notice as a 'fave'\n"
-#~ "fav #<notice_id> - add notice with the given id as a 'fave'\n"
-#~ "repeat #<notice_id> - repeat a notice with a given id\n"
-#~ "repeat <nickname> - repeat the last notice from user\n"
-#~ "reply #<notice_id> - reply to notice with a given id\n"
-#~ "reply <nickname> - reply to the last notice from user\n"
-#~ "join <group> - join group\n"
-#~ "login - Get a link to login to the web interface\n"
-#~ "drop <group> - leave group\n"
-#~ "stats - get your stats\n"
-#~ "stop - same as 'off'\n"
-#~ "quit - same as 'off'\n"
-#~ "sub <nickname> - same as 'follow'\n"
-#~ "unsub <nickname> - same as 'leave'\n"
-#~ "last <nickname> - same as 'get'\n"
-#~ "on <nickname> - not yet implemented.\n"
-#~ "off <nickname> - not yet implemented.\n"
-#~ "nudge <nickname> - remind a user to update.\n"
-#~ "invite <phone number> - not yet implemented.\n"
-#~ "track <word> - not yet implemented.\n"
-#~ "untrack <word> - not yet implemented.\n"
-#~ "track off - not yet implemented.\n"
-#~ "untrack all - not yet implemented.\n"
-#~ "tracks - not yet implemented.\n"
-#~ "tracking - not yet implemented.\n"
-#~ msgstr ""
-#~ "Komandoj:\n"
-#~ "on — ŝalti sciigon;\n"
-#~ "off — malŝalti sciigon;\n"
-#~ "help — montri ĉi tiun helpon;\n"
-#~ "follow <nickname> — aboni uzanton;\n"
-#~ "groups — listigi grupojn, kiujn vi aniĝis;\n"
-#~ "subscriptions — listigi viajn abonatojn;\n"
-#~ "subscribers — listigi viajn abonantojn;\n"
-#~ "leave <nickname> — malaboni uzanton;\n"
-#~ "d <nickname> <text> — sendi rektan mesaĝon al uzanto;\n"
-#~ "get <nickname> — legi la lastan avizon de uzanto;\n"
-#~ "whois <nickname> — legi profilan informon pri uzanto;\n"
-#~ "lose <nickname> — ĉesigi la uzanton de sekvi vin;\n"
-#~ "fav <nickname> — ŝati la lastan avizon de uzanto;\n"
-#~ "fav #<notice_id> — ŝati la avizon kun la ID;\n"
-#~ "repeat #<notice_id> — ripeti la avizon kun la ID;\n"
-#~ "repeat <nickname> — ripeti la lastan avizon de uzanto;\n"
-#~ "reply #<notice_id> — respondi la avizon kun la ID;\n"
-#~ "reply <nickname> — respondi la lastan avizon de uzanto;\n"
-#~ "join <group> — aniĝi al grupo;\n"
-#~ "login — havi ligilon por ensaluti al reta interfaco;\n"
-#~ "drop <group> — foriri el grupo;\n"
-#~ "stats — legi vian staton;\n"
-#~ "stop — same kiel «off»;\n"
-#~ "quit — same kiel «off»;\n"
-#~ "sub <nickname> — same kiel «follow»;\n"
-#~ "unsub <nickname> — same kiel «leave»;\n"
-#~ "last <nickname> — same kiel «get»;\n"
-#~ "on <nickname> — ankoraŭ ne realigita;\n"
-#~ "off <nickname> — ankoraŭ ne realigita;\n"
-#~ "nudge <nickname> — puŝeti la uzanton, ke li ĝisdatigu!\n"
-#~ "invite <phone number> — ankoraŭ ne realigita;\n"
-#~ "track <word> — ankoraŭ ne realigita;\n"
-#~ "untrack <word> — ankoraŭ ne realigita;\n"
-#~ "track off — ankoraŭ ne realigita;\n"
-#~ "untrack all — ankoraŭ ne realigita;\n"
-#~ "tracks — ankoraŭ ne realigita;\n"
-#~ "tracking — ankoraŭ ne realigita;\n"
-
-#~ msgid "Edit Avatar"
-#~ msgstr "Redakti vizaĝbildon"
+#~ msgid "Invalid tag: \"%s\""
+#~ msgstr "Nevalida markilo: \"%s\""
diff --git a/locale/es/LC_MESSAGES/statusnet.po b/locale/es/LC_MESSAGES/statusnet.po
index 5ece490d2e..0ef3b43543 100644
--- a/locale/es/LC_MESSAGES/statusnet.po
+++ b/locale/es/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-03-17 09:47+0000\n"
-"PO-Revision-Date: 2011-03-17 09:49:32+0000\n"
+"POT-Creation-Date: 2011-03-17 12:35+0000\n"
+"PO-Revision-Date: 2011-03-17 12:37:55+0000\n"
 "Language-Team: Spanish <http://translatewiki.net/wiki/Portal:es>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -29,7 +29,7 @@ msgstr ""
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-03-11 18:52:41+0000\n"
+"X-POT-Import-Date: 2011-03-17 10:19:27+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -3950,6 +3950,8 @@ msgstr "Idioma es muy largo ( max 50 car.)"
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
+#. TRANS: Form validation error when entering an invalid tag.
+#. TRANS: %s is the invalid tag.
 #, fuzzy, php-format
 msgid "Invalid tag: \"%s\"."
 msgstr "Etiqueta inválida: \"% s\""
@@ -4813,7 +4815,6 @@ msgstr "Mensaje de %1$s en %2$s"
 msgid "Notice deleted."
 msgstr "Mensaje borrado"
 
-#, fuzzy
 msgid "Notice"
 msgstr "Mensajes"
 
@@ -5361,17 +5362,14 @@ msgstr "Perfil de usuario"
 msgid "Tag user"
 msgstr "Etiquetar usuario"
 
+#, fuzzy
 msgid ""
-"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
-"separated"
+"Tags for this user (letters, numbers, -, ., and _), separated by commas or "
+"spaces."
 msgstr ""
 "Etiquetas para este usuario (letras, números, -, ., y _), separadas por "
 "comas o espacios"
 
-#, php-format
-msgid "Invalid tag: \"%s\""
-msgstr "Etiqueta inválida: \"% s\""
-
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
@@ -8384,87 +8382,5 @@ msgstr ""
 msgid "Getting backup from file '%s'."
 msgstr ""
 
-#~ msgid "Note"
-#~ msgstr "Nota"
-
-#~ msgid ""
-#~ "Commands:\n"
-#~ "on - turn on notifications\n"
-#~ "off - turn off notifications\n"
-#~ "help - show this help\n"
-#~ "follow <nickname> - subscribe to user\n"
-#~ "groups - lists the groups you have joined\n"
-#~ "subscriptions - list the people you follow\n"
-#~ "subscribers - list the people that follow you\n"
-#~ "leave <nickname> - unsubscribe from user\n"
-#~ "d <nickname> <text> - direct message to user\n"
-#~ "get <nickname> - get last notice from user\n"
-#~ "whois <nickname> - get profile info on user\n"
-#~ "lose <nickname> - force user to stop following you\n"
-#~ "fav <nickname> - add user's last notice as a 'fave'\n"
-#~ "fav #<notice_id> - add notice with the given id as a 'fave'\n"
-#~ "repeat #<notice_id> - repeat a notice with a given id\n"
-#~ "repeat <nickname> - repeat the last notice from user\n"
-#~ "reply #<notice_id> - reply to notice with a given id\n"
-#~ "reply <nickname> - reply to the last notice from user\n"
-#~ "join <group> - join group\n"
-#~ "login - Get a link to login to the web interface\n"
-#~ "drop <group> - leave group\n"
-#~ "stats - get your stats\n"
-#~ "stop - same as 'off'\n"
-#~ "quit - same as 'off'\n"
-#~ "sub <nickname> - same as 'follow'\n"
-#~ "unsub <nickname> - same as 'leave'\n"
-#~ "last <nickname> - same as 'get'\n"
-#~ "on <nickname> - not yet implemented.\n"
-#~ "off <nickname> - not yet implemented.\n"
-#~ "nudge <nickname> - remind a user to update.\n"
-#~ "invite <phone number> - not yet implemented.\n"
-#~ "track <word> - not yet implemented.\n"
-#~ "untrack <word> - not yet implemented.\n"
-#~ "track off - not yet implemented.\n"
-#~ "untrack all - not yet implemented.\n"
-#~ "tracks - not yet implemented.\n"
-#~ "tracking - not yet implemented.\n"
-#~ msgstr ""
-#~ "comandos:\n"
-#~ "on - activar notificaciones\n"
-#~ "off - desactivar notificaciones\n"
-#~ "help - mostrar esta ayuda\n"
-#~ "follow <usuario> - suscribirse al usuario\n"
-#~ "groups - listar los grupos que sigues\n"
-#~ "subscriptions - listar las personas que sigues\n"
-#~ "subscribers - listar los grupos que te siguen\n"
-#~ "leave <usuario> - cancelar la suscripción al usuario\n"
-#~ "d <usuario> <text> - dirigir mensaje al usuario\n"
-#~ "get <usuario> - obtener último aviso del usuario\n"
-#~ "whois <usuario> - obtener información del perfil del usuario\n"
-#~ "lose <usuario> - obligar al usuario a que deje de seguirte\n"
-#~ "fav <usuario> - añadir el último aviso del usario a tus favoritos\n"
-#~ "fav #<id_aviso> - añadir el aviso con el ID dado a tus favoritos\n"
-#~ "repeat #<id_aviso> - repetir el aviso con el ID dado\n"
-#~ "repeat <usuario> - repetir el último aviso del usuario\n"
-#~ "reply #<id_aviso> - responder al aviso del ID dado\n"
-#~ "reply <usuario> - responder al último aviso del usuario\n"
-#~ "join <grupo> - unirse a un grupo\n"
-#~ "login - obtener un vínculo para iniciar sesión en la interfaz Web\n"
-#~ "drop <grupo> - abandonar el grupo\n"
-#~ "stats - obtener tus estadísticas\n"
-#~ "stop - igual que 'desactivar'\n"
-#~ "quit - igual que 'desactivar'\n"
-#~ "sub <usuario> - igual que 'seguir'\n"
-#~ "unsub <usuario> - igual que 'abandonar'\n"
-#~ "last <usuario> - igual que 'obtener'\n"
-#~ "on <usuario> - aún sin implementar.\n"
-#~ "off <usuario> - aún sin implementar.\n"
-#~ "nudge <usuario> - recordarle a un ausuario que actualice.\n"
-#~ "invite <phone number> - aún sin implementar.\n"
-#~ "track <word> - aún sin implementar.\n"
-#~ "untrack <word> - aún sin implementar.\n"
-#~ "track off - aún sin implementar.\n"
-#~ "untrack all - aún sin implementar.\n"
-#~ "tracks - aún sin implementar.\n"
-#~ "tracking - aún sin implementar.\n"
-
-#~ msgid "Edit Avatar"
-#~ msgstr "Editar imagen"
+#~ msgid "Invalid tag: \"%s\""
+#~ msgstr "Etiqueta inválida: \"% s\""
diff --git a/locale/fa/LC_MESSAGES/statusnet.po b/locale/fa/LC_MESSAGES/statusnet.po
index 5dc14bc11d..241198cb2a 100644
--- a/locale/fa/LC_MESSAGES/statusnet.po
+++ b/locale/fa/LC_MESSAGES/statusnet.po
@@ -17,8 +17,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-17 09:47+0000\n"
-"PO-Revision-Date: 2011-03-17 09:49:33+0000\n"
+"POT-Creation-Date: 2011-03-17 12:35+0000\n"
+"PO-Revision-Date: 2011-03-17 12:37:56+0000\n"
 "Last-Translator: Ahmad Sufi Mahmudi\n"
 "Language-Team: Persian <http://translatewiki.net/wiki/Portal:fa>\n"
 "MIME-Version: 1.0\n"
@@ -29,7 +29,7 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
-"X-POT-Import-Date: 2011-03-11 18:52:41+0000\n"
+"X-POT-Import-Date: 2011-03-17 10:19:27+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -3951,6 +3951,8 @@ msgstr "زبان بسیار طولانی است ( حداکثر ۵۰ نویسه)"
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
+#. TRANS: Form validation error when entering an invalid tag.
+#. TRANS: %s is the invalid tag.
 #, fuzzy, php-format
 msgid "Invalid tag: \"%s\"."
 msgstr "نشان نادرست »%s«"
@@ -5361,16 +5363,13 @@ msgstr "نمایهٔ کاربر"
 msgid "Tag user"
 msgstr "برچسب‌گذاری کاربر"
 
+#, fuzzy
 msgid ""
-"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
-"separated"
+"Tags for this user (letters, numbers, -, ., and _), separated by commas or "
+"spaces."
 msgstr ""
 "برچسب‌ها برای این کاربر (حروف، اعداد، -، .، و _)، جدا شده با کاما- یا فاصله-"
 
-#, php-format
-msgid "Invalid tag: \"%s\""
-msgstr "نشان نادرست »%s«"
-
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
@@ -8351,87 +8350,5 @@ msgstr ""
 msgid "Getting backup from file '%s'."
 msgstr ""
 
-#~ msgid "Note"
-#~ msgstr "یادداشت"
-
-#~ msgid ""
-#~ "Commands:\n"
-#~ "on - turn on notifications\n"
-#~ "off - turn off notifications\n"
-#~ "help - show this help\n"
-#~ "follow <nickname> - subscribe to user\n"
-#~ "groups - lists the groups you have joined\n"
-#~ "subscriptions - list the people you follow\n"
-#~ "subscribers - list the people that follow you\n"
-#~ "leave <nickname> - unsubscribe from user\n"
-#~ "d <nickname> <text> - direct message to user\n"
-#~ "get <nickname> - get last notice from user\n"
-#~ "whois <nickname> - get profile info on user\n"
-#~ "lose <nickname> - force user to stop following you\n"
-#~ "fav <nickname> - add user's last notice as a 'fave'\n"
-#~ "fav #<notice_id> - add notice with the given id as a 'fave'\n"
-#~ "repeat #<notice_id> - repeat a notice with a given id\n"
-#~ "repeat <nickname> - repeat the last notice from user\n"
-#~ "reply #<notice_id> - reply to notice with a given id\n"
-#~ "reply <nickname> - reply to the last notice from user\n"
-#~ "join <group> - join group\n"
-#~ "login - Get a link to login to the web interface\n"
-#~ "drop <group> - leave group\n"
-#~ "stats - get your stats\n"
-#~ "stop - same as 'off'\n"
-#~ "quit - same as 'off'\n"
-#~ "sub <nickname> - same as 'follow'\n"
-#~ "unsub <nickname> - same as 'leave'\n"
-#~ "last <nickname> - same as 'get'\n"
-#~ "on <nickname> - not yet implemented.\n"
-#~ "off <nickname> - not yet implemented.\n"
-#~ "nudge <nickname> - remind a user to update.\n"
-#~ "invite <phone number> - not yet implemented.\n"
-#~ "track <word> - not yet implemented.\n"
-#~ "untrack <word> - not yet implemented.\n"
-#~ "track off - not yet implemented.\n"
-#~ "untrack all - not yet implemented.\n"
-#~ "tracks - not yet implemented.\n"
-#~ "tracking - not yet implemented.\n"
-#~ msgstr ""
-#~ "دستورات:\n"
-#~ "on - روشن‌کردن آگاه‌سازی‌ها\n"
-#~ "off - خاموش‌کردن آگاه‌سازی‌ها\n"
-#~ "help - نشان دادن این کمک\n"
-#~ "follow <nickname> - مشترک کاربر شدن\n"
-#~ "groups - گروه‌هایی را که به آن‌ها پیوسته‌اید، فهرست می‌کند\n"
-#~ "subscriptions - افرادی را که دنبال می‌کنید، فهرست می‌کند\n"
-#~ "subscribers - کاربرانی را که شما را دنبال می‌کنند، فهرست می‌کند\n"
-#~ "leave <nickname> - لغو اشتراک از کاربر\n"
-#~ "d <nickname> <text> - پیام مستقیم به کاربر\n"
-#~ "get <nickname> - دریافت آخرین پیام از کاربر\n"
-#~ "whois <nickname> - دریافت اطلاعات نمایهٔ کاربر\n"
-#~ "lose <nickname> - وادار کردن کاربر به توقف دنبال‌کردن شما\n"
-#~ "fav <nickname> - افزودن آخرین پیام کاربر به عنوان برگزیده\n"
-#~ "fav #<notice_id> - افزودن پیام با یک شناسهٔ داده‌شده به عنوان برگزیده\n"
-#~ "repeat #<notice_id> - تکرار کردن یک پیام با یک شناسهٔ داده‌شده\n"
-#~ "repeat <nickname> - تکرار کردن آخرین پیام از کاربر\n"
-#~ "reply #<notice_id> - پاسخ‌دادن به یک پیام با یک شناسهٔ داده‌شده\n"
-#~ "reply <nickname> - پاسخ‌دادن به آخرین پیام از کاربر\n"
-#~ "join <group> - پیوستن به گروه\n"
-#~ "login - دریافت یک پیوند برای واردشدن به رابط وب\n"
-#~ "drop <group> - ترک‌کردن گروه\n"
-#~ "stats - دریافت آمار شما\n"
-#~ "stop - مانند «off»\n"
-#~ "quit - مانند «off»\n"
-#~ "sub <nickname> - مانند «follow»\n"
-#~ "unsub <nickname> - مانند «leave»\n"
-#~ "last <nickname> - مانند «get»\n"
-#~ "on <nickname> - هنوز پیاده نشده است.\n"
-#~ "off <nickname> - هنوز پیاده نشده است.\n"
-#~ "nudge <nickname> - یادآوری‌کردن به یک کاربر برای به‌روز کردن\n"
-#~ "invite <phone number> - هنوز پیاده نشده است.\n"
-#~ "track <word> - هنوز پیاده نشده است.\n"
-#~ "untrack <word> - هنوز پیاده نشده است.\n"
-#~ "track off - هنوز پیاده نشده است.\n"
-#~ "untrack all - هنوز پیاده نشده است.\n"
-#~ "tracks - هنوز پیاده نشده است.\n"
-#~ "tracking - هنوز پیاده نشده است.\n"
-
-#~ msgid "Edit Avatar"
-#~ msgstr "ویرایش اواتور"
+#~ msgid "Invalid tag: \"%s\""
+#~ msgstr "نشان نادرست »%s«"
diff --git a/locale/fi/LC_MESSAGES/statusnet.po b/locale/fi/LC_MESSAGES/statusnet.po
index fcde77fab6..74b626acf6 100644
--- a/locale/fi/LC_MESSAGES/statusnet.po
+++ b/locale/fi/LC_MESSAGES/statusnet.po
@@ -15,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-17 09:47+0000\n"
-"PO-Revision-Date: 2011-03-17 09:49:34+0000\n"
+"POT-Creation-Date: 2011-03-17 12:35+0000\n"
+"PO-Revision-Date: 2011-03-17 12:37:57+0000\n"
 "Language-Team: Finnish <http://translatewiki.net/wiki/Portal:fi>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,7 +25,7 @@ msgstr ""
 "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-03-11 18:52:41+0000\n"
+"X-POT-Import-Date: 2011-03-17 10:19:27+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -3938,6 +3938,8 @@ msgstr "Kieli on liian pitkä (enintään 50 merkkiä)."
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
+#. TRANS: Form validation error when entering an invalid tag.
+#. TRANS: %s is the invalid tag.
 #, fuzzy, php-format
 msgid "Invalid tag: \"%s\"."
 msgstr "Virheellinen tagi: \"%s\""
@@ -4792,7 +4794,6 @@ msgstr "Viesti käyttäjältä %1$s, %2$s"
 msgid "Notice deleted."
 msgstr "Päivitys on poistettu."
 
-#, fuzzy
 msgid "Notice"
 msgstr "Päivitykset"
 
@@ -5333,17 +5334,14 @@ msgstr "Käyttäjän profiili"
 msgid "Tag user"
 msgstr "Tagaa käyttäjä"
 
+#, fuzzy
 msgid ""
-"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
-"separated"
+"Tags for this user (letters, numbers, -, ., and _), separated by commas or "
+"spaces."
 msgstr ""
 "Käyttäjän tagit (kirjaimet, numerot, -, ., ja _), pilkulla tai välilyönnillä "
 "erotettuna"
 
-#, php-format
-msgid "Invalid tag: \"%s\""
-msgstr "Virheellinen tagi: \"%s\""
-
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
@@ -8314,9 +8312,5 @@ msgstr ""
 msgid "Getting backup from file '%s'."
 msgstr ""
 
-#~ msgid "Note"
-#~ msgstr "Huomaa"
-
-#, fuzzy
-#~ msgid "Edit Avatar"
-#~ msgstr "Kuva"
+#~ msgid "Invalid tag: \"%s\""
+#~ msgstr "Virheellinen tagi: \"%s\""
diff --git a/locale/fr/LC_MESSAGES/statusnet.po b/locale/fr/LC_MESSAGES/statusnet.po
index cba78330be..76e99def48 100644
--- a/locale/fr/LC_MESSAGES/statusnet.po
+++ b/locale/fr/LC_MESSAGES/statusnet.po
@@ -21,8 +21,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-17 09:47+0000\n"
-"PO-Revision-Date: 2011-03-17 09:49:35+0000\n"
+"POT-Creation-Date: 2011-03-17 12:35+0000\n"
+"PO-Revision-Date: 2011-03-17 12:37:58+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -31,7 +31,7 @@ msgstr ""
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-POT-Import-Date: 2011-03-11 18:52:41+0000\n"
+"X-POT-Import-Date: 2011-03-17 10:19:27+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -3985,6 +3985,8 @@ msgstr "La langue est trop longue (limitée à 50 caractères maximum)."
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
+#. TRANS: Form validation error when entering an invalid tag.
+#. TRANS: %s is the invalid tag.
 #, fuzzy, php-format
 msgid "Invalid tag: \"%s\"."
 msgstr "Marque invalide : « %s »"
@@ -4862,7 +4864,6 @@ msgstr "Message reçu de %1$s le %2$s"
 msgid "Notice deleted."
 msgstr "Avis supprimé."
 
-#, fuzzy
 msgid "Notice"
 msgstr "Avis"
 
@@ -5416,17 +5417,14 @@ msgstr "Profil de l’utilisateur"
 msgid "Tag user"
 msgstr "Marquer l’utilisateur"
 
+#, fuzzy
 msgid ""
-"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
-"separated"
+"Tags for this user (letters, numbers, -, ., and _), separated by commas or "
+"spaces."
 msgstr ""
 "Marques pour cet utilisateur (lettres, chiffres, -, ., et _), séparées par "
 "des virgules ou des espaces"
 
-#, php-format
-msgid "Invalid tag: \"%s\""
-msgstr "Marque invalide : « %s »"
-
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
@@ -8458,88 +8456,5 @@ msgstr "XML invalide, racine XRD manquante."
 msgid "Getting backup from file '%s'."
 msgstr "Obtention de la sauvegarde depuis le fichier « %s »."
 
-#~ msgid "Note"
-#~ msgstr "Note"
-
-#~ msgid ""
-#~ "Commands:\n"
-#~ "on - turn on notifications\n"
-#~ "off - turn off notifications\n"
-#~ "help - show this help\n"
-#~ "follow <nickname> - subscribe to user\n"
-#~ "groups - lists the groups you have joined\n"
-#~ "subscriptions - list the people you follow\n"
-#~ "subscribers - list the people that follow you\n"
-#~ "leave <nickname> - unsubscribe from user\n"
-#~ "d <nickname> <text> - direct message to user\n"
-#~ "get <nickname> - get last notice from user\n"
-#~ "whois <nickname> - get profile info on user\n"
-#~ "lose <nickname> - force user to stop following you\n"
-#~ "fav <nickname> - add user's last notice as a 'fave'\n"
-#~ "fav #<notice_id> - add notice with the given id as a 'fave'\n"
-#~ "repeat #<notice_id> - repeat a notice with a given id\n"
-#~ "repeat <nickname> - repeat the last notice from user\n"
-#~ "reply #<notice_id> - reply to notice with a given id\n"
-#~ "reply <nickname> - reply to the last notice from user\n"
-#~ "join <group> - join group\n"
-#~ "login - Get a link to login to the web interface\n"
-#~ "drop <group> - leave group\n"
-#~ "stats - get your stats\n"
-#~ "stop - same as 'off'\n"
-#~ "quit - same as 'off'\n"
-#~ "sub <nickname> - same as 'follow'\n"
-#~ "unsub <nickname> - same as 'leave'\n"
-#~ "last <nickname> - same as 'get'\n"
-#~ "on <nickname> - not yet implemented.\n"
-#~ "off <nickname> - not yet implemented.\n"
-#~ "nudge <nickname> - remind a user to update.\n"
-#~ "invite <phone number> - not yet implemented.\n"
-#~ "track <word> - not yet implemented.\n"
-#~ "untrack <word> - not yet implemented.\n"
-#~ "track off - not yet implemented.\n"
-#~ "untrack all - not yet implemented.\n"
-#~ "tracks - not yet implemented.\n"
-#~ "tracking - not yet implemented.\n"
-#~ msgstr ""
-#~ "Commandes :\n"
-#~ "on - activer les notifications\n"
-#~ "off - désactiver les notifications\n"
-#~ "help - montrer cette aide\n"
-#~ "follow <nickname> - s’abonner à l’utilisateur\n"
-#~ "groups - lister les groupes que vous avez rejoints\n"
-#~ "subscriptions - lister les personnes que vous suivez\n"
-#~ "subscribers - lister les personnes qui vous suivent\n"
-#~ "leave <nickname> - se désabonner de l’utilisateur\n"
-#~ "d <nickname> <text> - message direct à l’utilisateur\n"
-#~ "get <nickname> - obtenir le dernier avis de l’utilisateur\n"
-#~ "whois <nickname> - obtenir le profil de l’utilisateur\n"
-#~ "lose <nickname> - forcer un utilisateur à arrêter de vous suivre\n"
-#~ "fav <nickname> - ajouter de dernier avis de l’utilisateur comme favori\n"
-#~ "fav #<notice_id> - ajouter l’avis correspondant à l’identifiant comme "
-#~ "favori\n"
-#~ "repeat #<notice_id> - reprendre l’avis correspondant à l’identifiant\n"
-#~ "repeat <nickname> - reprendre le dernier avis de l’utilisateur\n"
-#~ "reply #<notice_id> - répondre à l’avis correspondant à l’identifiant\n"
-#~ "reply <nickname> - répondre au dernier avis de l’utilisateur\n"
-#~ "join <group> - rejoindre le groupe\n"
-#~ "login - Obtenir un lien pour s’identifier sur l’interface web\n"
-#~ "drop <group> - quitter le groupe\n"
-#~ "stats - obtenir vos statistiques\n"
-#~ "stop - même effet que 'off'\n"
-#~ "quit - même effet que 'off'\n"
-#~ "sub <nickname> - même effet que 'follow'\n"
-#~ "unsub <nickname> - même effet que 'leave'\n"
-#~ "last <nickname> - même effet que 'get'\n"
-#~ "on <nickname> - pas encore implémenté.\n"
-#~ "off <nickname> - pas encore implémenté.\n"
-#~ "nudge <nickname> - envoyer un clin d’œil à l’utilisateur.\n"
-#~ "invite <phone number> - pas encore implémenté.\n"
-#~ "track <word> - pas encore implémenté.\n"
-#~ "untrack <word> - pas encore implémenté.\n"
-#~ "track off - pas encore implémenté.\n"
-#~ "untrack all - pas encore implémenté.\n"
-#~ "tracks - pas encore implémenté.\n"
-#~ "tracking - pas encore implémenté.\n"
-
-#~ msgid "Edit Avatar"
-#~ msgstr "Modifier l’avatar"
+#~ msgid "Invalid tag: \"%s\""
+#~ msgstr "Marque invalide : « %s »"
diff --git a/locale/fur/LC_MESSAGES/statusnet.po b/locale/fur/LC_MESSAGES/statusnet.po
index 94f77eb11c..8493929289 100644
--- a/locale/fur/LC_MESSAGES/statusnet.po
+++ b/locale/fur/LC_MESSAGES/statusnet.po
@@ -9,12 +9,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-17 09:47+0000\n"
-"PO-Revision-Date: 2011-03-17 09:49:36+0000\n"
+"POT-Creation-Date: 2011-03-17 12:35+0000\n"
+"PO-Revision-Date: 2011-03-17 12:38:00+0000\n"
 "Language-Team: Friulian <http://translatewiki.net/wiki/Portal:fur>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-11 18:52:41+0000\n"
+"X-POT-Import-Date: 2011-03-17 10:19:27+0000\n"
 "X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fur\n"
@@ -3750,6 +3750,8 @@ msgstr "La lenghe e je masse lungje (max 50 caratars)."
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
+#. TRANS: Form validation error when entering an invalid tag.
+#. TRANS: %s is the invalid tag.
 #, php-format
 msgid "Invalid tag: \"%s\"."
 msgstr ""
@@ -5071,14 +5073,10 @@ msgid "Tag user"
 msgstr "Etichete utent"
 
 msgid ""
-"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
-"separated"
+"Tags for this user (letters, numbers, -, ., and _), separated by commas or "
+"spaces."
 msgstr ""
 
-#, php-format
-msgid "Invalid tag: \"%s\""
-msgstr "La etichete no je valide: \"%s\""
-
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
@@ -7904,8 +7902,5 @@ msgstr ""
 msgid "Getting backup from file '%s'."
 msgstr ""
 
-#~ msgid "Note"
-#~ msgstr "Note"
-
-#~ msgid "Edit Avatar"
-#~ msgstr "Modifiche l'avatar"
+#~ msgid "Invalid tag: \"%s\""
+#~ msgstr "La etichete no je valide: \"%s\""
diff --git a/locale/gl/LC_MESSAGES/statusnet.po b/locale/gl/LC_MESSAGES/statusnet.po
index 98903771ff..ab5354348e 100644
--- a/locale/gl/LC_MESSAGES/statusnet.po
+++ b/locale/gl/LC_MESSAGES/statusnet.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-17 09:47+0000\n"
-"PO-Revision-Date: 2011-03-17 09:49:37+0000\n"
+"POT-Creation-Date: 2011-03-17 12:35+0000\n"
+"PO-Revision-Date: 2011-03-17 12:38:01+0000\n"
 "Language-Team: Galician <http://translatewiki.net/wiki/Portal:gl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -22,7 +22,7 @@ msgstr ""
 "X-Language-Code: gl\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-03-11 18:52:41+0000\n"
+"X-POT-Import-Date: 2011-03-17 10:19:27+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -3972,6 +3972,8 @@ msgstr "A lingua é longa de máis (o límite é de 50 caracteres)."
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
+#. TRANS: Form validation error when entering an invalid tag.
+#. TRANS: %s is the invalid tag.
 #, fuzzy, php-format
 msgid "Invalid tag: \"%s\"."
 msgstr "Etiqueta incorrecta: \"%s\""
@@ -5400,17 +5402,14 @@ msgstr "Perfil do usuario"
 msgid "Tag user"
 msgstr "Etiquetar ao usuario"
 
+#, fuzzy
 msgid ""
-"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
-"separated"
+"Tags for this user (letters, numbers, -, ., and _), separated by commas or "
+"spaces."
 msgstr ""
 "Etiquetas para este usuario (letras, números, -, ., e _), separadas por "
 "comas ou espazos en branco"
 
-#, php-format
-msgid "Invalid tag: \"%s\""
-msgstr "Etiqueta incorrecta: \"%s\""
-
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
@@ -8452,87 +8451,5 @@ msgstr ""
 msgid "Getting backup from file '%s'."
 msgstr ""
 
-#~ msgid "Note"
-#~ msgstr "Nota"
-
-#~ msgid ""
-#~ "Commands:\n"
-#~ "on - turn on notifications\n"
-#~ "off - turn off notifications\n"
-#~ "help - show this help\n"
-#~ "follow <nickname> - subscribe to user\n"
-#~ "groups - lists the groups you have joined\n"
-#~ "subscriptions - list the people you follow\n"
-#~ "subscribers - list the people that follow you\n"
-#~ "leave <nickname> - unsubscribe from user\n"
-#~ "d <nickname> <text> - direct message to user\n"
-#~ "get <nickname> - get last notice from user\n"
-#~ "whois <nickname> - get profile info on user\n"
-#~ "lose <nickname> - force user to stop following you\n"
-#~ "fav <nickname> - add user's last notice as a 'fave'\n"
-#~ "fav #<notice_id> - add notice with the given id as a 'fave'\n"
-#~ "repeat #<notice_id> - repeat a notice with a given id\n"
-#~ "repeat <nickname> - repeat the last notice from user\n"
-#~ "reply #<notice_id> - reply to notice with a given id\n"
-#~ "reply <nickname> - reply to the last notice from user\n"
-#~ "join <group> - join group\n"
-#~ "login - Get a link to login to the web interface\n"
-#~ "drop <group> - leave group\n"
-#~ "stats - get your stats\n"
-#~ "stop - same as 'off'\n"
-#~ "quit - same as 'off'\n"
-#~ "sub <nickname> - same as 'follow'\n"
-#~ "unsub <nickname> - same as 'leave'\n"
-#~ "last <nickname> - same as 'get'\n"
-#~ "on <nickname> - not yet implemented.\n"
-#~ "off <nickname> - not yet implemented.\n"
-#~ "nudge <nickname> - remind a user to update.\n"
-#~ "invite <phone number> - not yet implemented.\n"
-#~ "track <word> - not yet implemented.\n"
-#~ "untrack <word> - not yet implemented.\n"
-#~ "track off - not yet implemented.\n"
-#~ "untrack all - not yet implemented.\n"
-#~ "tracks - not yet implemented.\n"
-#~ "tracking - not yet implemented.\n"
-#~ msgstr ""
-#~ "Ordes:\n"
-#~ "on - activa as notificacións\n"
-#~ "off - desactiva as notificacións\n"
-#~ "help - amosa esta axuda\n"
-#~ "follow <alcume> - subscribirse ao usuario\n"
-#~ "groups - lista os grupos nos que está\n"
-#~ "subscriptions - lista a xente á que segue\n"
-#~ "subscribers - lista a xente que o segue\n"
-#~ "leave <alcume> - cancela a subscrición ao usuario\n"
-#~ "d <alcume> <texto> - mensaxe directa a un usuario\n"
-#~ "get <alcume> - obter a última nota do usuario\n"
-#~ "whois <alcume> - obtén a información do perfil do usuario\n"
-#~ "lose <alcume> - facer que o usuario deixe de seguilo\n"
-#~ "fav <alcume> - marcar como \"favorita\" a última nota do usuario\n"
-#~ "fav #<id da nota> - marcar como \"favorita\" a nota coa id indicada\n"
-#~ "repeat #<id da nota> - repetir a nota doa id indicada\n"
-#~ "repeat <alcume> - repetir a última nota do usuario\n"
-#~ "reply #<id da nota> - responder a unha nota coa id indicada\n"
-#~ "reply <alcume> - responder á última nota do usuario\n"
-#~ "join <grupo> - unirse ao grupo indicado\n"
-#~ "login - obter un enderezo para identificarse na interface web\n"
-#~ "drop <grupo> - deixar o grupo indicado\n"
-#~ "stats - obter as súas estatísticas\n"
-#~ "stop - idéntico a \"off\"\n"
-#~ "quit - idéntico a \"off\"\n"
-#~ "sub <alcume> - idéntico a \"follow\"\n"
-#~ "unsub <alcume> - idéntico a \"leave\"\n"
-#~ "last <alcume> - idéntico a \"get\"\n"
-#~ "on <alcume> - aínda non se integrou\n"
-#~ "off <alcume> - aínda non se integrou\n"
-#~ "nudge <alcume> - facerlle un aceno ao usuario indicado\n"
-#~ "invite <número de teléfono> - aínda non se integrou\n"
-#~ "track <palabra> - aínda non se integrou\n"
-#~ "untrack <palabra> - aínda non se integrou\n"
-#~ "track off - aínda non se integrou\n"
-#~ "untrack all - aínda non se integrou\n"
-#~ "tracks - aínda non se integrou\n"
-#~ "tracking - aínda non se integrou\n"
-
-#~ msgid "Edit Avatar"
-#~ msgstr "Modificar o avatar"
+#~ msgid "Invalid tag: \"%s\""
+#~ msgstr "Etiqueta incorrecta: \"%s\""
diff --git a/locale/hsb/LC_MESSAGES/statusnet.po b/locale/hsb/LC_MESSAGES/statusnet.po
index c61a1d5452..1eb46c7fd7 100644
--- a/locale/hsb/LC_MESSAGES/statusnet.po
+++ b/locale/hsb/LC_MESSAGES/statusnet.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-17 09:47+0000\n"
-"PO-Revision-Date: 2011-03-17 09:49:39+0000\n"
+"POT-Creation-Date: 2011-03-17 12:35+0000\n"
+"PO-Revision-Date: 2011-03-17 12:38:02+0000\n"
 "Language-Team: Upper Sorbian <http://translatewiki.net/wiki/Portal:hsb>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -22,7 +22,7 @@ msgstr ""
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : (n%100==3 || "
 "n%100==4) ? 2 : 3)\n"
-"X-POT-Import-Date: 2011-03-11 18:52:41+0000\n"
+"X-POT-Import-Date: 2011-03-17 10:19:27+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -3782,6 +3782,8 @@ msgstr "Mjeno rěče je předołhe (maks. 50 znamješkow)."
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
+#. TRANS: Form validation error when entering an invalid tag.
+#. TRANS: %s is the invalid tag.
 #, php-format
 msgid "Invalid tag: \"%s\"."
 msgstr "Njepłaćiwa taflička: \"%s\"."
@@ -5066,14 +5068,10 @@ msgid "Tag user"
 msgstr ""
 
 msgid ""
-"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
-"separated"
+"Tags for this user (letters, numbers, -, ., and _), separated by commas or "
+"spaces."
 msgstr ""
 
-#, php-format
-msgid "Invalid tag: \"%s\""
-msgstr "Njepłaćiwa taflička: \"%s\""
-
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
@@ -7956,8 +7954,5 @@ msgstr "Njepłaćiwy XML, korjeń XRD faluje."
 msgid "Getting backup from file '%s'."
 msgstr "Wobstaruje so zawěsćenje z dataje \"%s\"-"
 
-#~ msgid "Note"
-#~ msgstr "Přispomnjenka"
-
-#~ msgid "Edit Avatar"
-#~ msgstr "Awatar wobdźěłać"
+#~ msgid "Invalid tag: \"%s\""
+#~ msgstr "Njepłaćiwa taflička: \"%s\""
diff --git a/locale/hu/LC_MESSAGES/statusnet.po b/locale/hu/LC_MESSAGES/statusnet.po
index a3515effa3..fec5b9520a 100644
--- a/locale/hu/LC_MESSAGES/statusnet.po
+++ b/locale/hu/LC_MESSAGES/statusnet.po
@@ -12,12 +12,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-17 09:47+0000\n"
-"PO-Revision-Date: 2011-03-17 09:49:40+0000\n"
+"POT-Creation-Date: 2011-03-17 12:35+0000\n"
+"PO-Revision-Date: 2011-03-17 12:38:03+0000\n"
 "Language-Team: Hungarian <http://translatewiki.net/wiki/Portal:hu>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-11 18:52:41+0000\n"
+"X-POT-Import-Date: 2011-03-17 10:19:27+0000\n"
 "X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: hu\n"
@@ -3890,6 +3890,8 @@ msgstr "A nyelv túl hosszú (legfeljebb 50 karakter lehet)."
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
+#. TRANS: Form validation error when entering an invalid tag.
+#. TRANS: %s is the invalid tag.
 #, fuzzy, php-format
 msgid "Invalid tag: \"%s\"."
 msgstr "Érvénytelen címke: \"%s\""
@@ -5212,14 +5214,13 @@ msgstr "Felhasználói profil"
 msgid "Tag user"
 msgstr ""
 
+#, fuzzy
 msgid ""
-"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
-"separated"
+"Tags for this user (letters, numbers, -, ., and _), separated by commas or "
+"spaces."
 msgstr ""
-
-#, php-format
-msgid "Invalid tag: \"%s\""
-msgstr "Érvénytelen címke: \"%s\""
+"Címkék magadhoz (betűk, számok, -, ., és _), vesszővel vagy szóközzel "
+"elválasztva"
 
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
@@ -8126,5 +8127,5 @@ msgstr ""
 msgid "Getting backup from file '%s'."
 msgstr ""
 
-#~ msgid "Note"
-#~ msgstr "Megjegyzés"
+#~ msgid "Invalid tag: \"%s\""
+#~ msgstr "Érvénytelen címke: \"%s\""
diff --git a/locale/ia/LC_MESSAGES/statusnet.po b/locale/ia/LC_MESSAGES/statusnet.po
index 653cf949bd..7b92696be6 100644
--- a/locale/ia/LC_MESSAGES/statusnet.po
+++ b/locale/ia/LC_MESSAGES/statusnet.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-17 09:47+0000\n"
-"PO-Revision-Date: 2011-03-17 09:49:41+0000\n"
+"POT-Creation-Date: 2011-03-17 12:35+0000\n"
+"PO-Revision-Date: 2011-03-17 12:38:04+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -19,7 +19,7 @@ msgstr ""
 "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-03-11 18:52:41+0000\n"
+"X-POT-Import-Date: 2011-03-17 10:19:27+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -3860,6 +3860,8 @@ msgstr "Lingua es troppo longe (maximo 50 characteres)."
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
+#. TRANS: Form validation error when entering an invalid tag.
+#. TRANS: %s is the invalid tag.
 #, php-format
 msgid "Invalid tag: \"%s\"."
 msgstr "Etiquetta invalide: \"%s\"."
@@ -5247,17 +5249,14 @@ msgstr "Profilo del usator"
 msgid "Tag user"
 msgstr "Etiquettar usator"
 
+#, fuzzy
 msgid ""
-"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
-"separated"
+"Tags for this user (letters, numbers, -, ., and _), separated by commas or "
+"spaces."
 msgstr ""
 "Etiquettas pro iste usator (litteras, numeros, -, . e _), separate per "
 "commas o spatios"
 
-#, php-format
-msgid "Invalid tag: \"%s\""
-msgstr "Etiquetta invalide: \"%s\""
-
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
@@ -8240,87 +8239,5 @@ msgstr "XML invalide, radice XRD mancante."
 msgid "Getting backup from file '%s'."
 msgstr "Obtene copia de reserva ex file '%s'."
 
-#~ msgid "Note"
-#~ msgstr "Nota"
-
-#~ msgid ""
-#~ "Commands:\n"
-#~ "on - turn on notifications\n"
-#~ "off - turn off notifications\n"
-#~ "help - show this help\n"
-#~ "follow <nickname> - subscribe to user\n"
-#~ "groups - lists the groups you have joined\n"
-#~ "subscriptions - list the people you follow\n"
-#~ "subscribers - list the people that follow you\n"
-#~ "leave <nickname> - unsubscribe from user\n"
-#~ "d <nickname> <text> - direct message to user\n"
-#~ "get <nickname> - get last notice from user\n"
-#~ "whois <nickname> - get profile info on user\n"
-#~ "lose <nickname> - force user to stop following you\n"
-#~ "fav <nickname> - add user's last notice as a 'fave'\n"
-#~ "fav #<notice_id> - add notice with the given id as a 'fave'\n"
-#~ "repeat #<notice_id> - repeat a notice with a given id\n"
-#~ "repeat <nickname> - repeat the last notice from user\n"
-#~ "reply #<notice_id> - reply to notice with a given id\n"
-#~ "reply <nickname> - reply to the last notice from user\n"
-#~ "join <group> - join group\n"
-#~ "login - Get a link to login to the web interface\n"
-#~ "drop <group> - leave group\n"
-#~ "stats - get your stats\n"
-#~ "stop - same as 'off'\n"
-#~ "quit - same as 'off'\n"
-#~ "sub <nickname> - same as 'follow'\n"
-#~ "unsub <nickname> - same as 'leave'\n"
-#~ "last <nickname> - same as 'get'\n"
-#~ "on <nickname> - not yet implemented.\n"
-#~ "off <nickname> - not yet implemented.\n"
-#~ "nudge <nickname> - remind a user to update.\n"
-#~ "invite <phone number> - not yet implemented.\n"
-#~ "track <word> - not yet implemented.\n"
-#~ "untrack <word> - not yet implemented.\n"
-#~ "track off - not yet implemented.\n"
-#~ "untrack all - not yet implemented.\n"
-#~ "tracks - not yet implemented.\n"
-#~ "tracking - not yet implemented.\n"
-#~ msgstr ""
-#~ "Commandos:\n"
-#~ "on - activar notificationes\n"
-#~ "off - disactivar notificationes\n"
-#~ "help - monstrar iste adjuta\n"
-#~ "follow <pseudonymo> - subscriber te al usator\n"
-#~ "groups - listar le gruppos del quales tu es membro\n"
-#~ "subscriptions - listar le personas que tu seque\n"
-#~ "subscribers - listar le personas qui te seque\n"
-#~ "leave <pseudonymo> - cancellar subscription al usator\n"
-#~ "d <pseudonymo> <texto> - diriger un message al usator\n"
-#~ "get <pseudonymo> - obtener le ultime nota del usator\n"
-#~ "whois <pseudonymo> - obtener info de profilo del usator\n"
-#~ "lose <pseudonymo> - fortiar le usator de cessar de sequer te\n"
-#~ "fav <pseudonymo> - adder ultime nota del usator como favorite\n"
-#~ "fav #<id_de_nota> - adder nota con le ID date como favorite\n"
-#~ "repeat #<id_de_nota> - repeter le nota con le ID date\n"
-#~ "repeat <pseudonymo> - repeter le ultime nota del usator\n"
-#~ "reply #<id_de_nota> - responder al nota con le ID date\n"
-#~ "reply <pseudonymo> - responder al ultime nota del usator\n"
-#~ "join <gruppo> - facer te membro del gruppo\n"
-#~ "login - obtener ligamine pro aperir session al interfacie web\n"
-#~ "drop <gruppo> - quitar gruppo\n"
-#~ "stats - obtener tu statisticas\n"
-#~ "stop - como 'off'\n"
-#~ "quit - como 'off'\n"
-#~ "sub <pseudonymo> - como 'follow'\n"
-#~ "unsub <pseudonymo> - como 'leave'\n"
-#~ "last <pseudonymo> - como 'get'\n"
-#~ "on <pseudonymo> - non ancora implementate.\n"
-#~ "off <pseudonymo> - non ancora implementate.\n"
-#~ "nudge <pseudonymo> - rememorar un usator de scriber alique.\n"
-#~ "invite <numero de telephono> - non ancora implementate.\n"
-#~ "track <parola> - non ancora implementate.\n"
-#~ "untrack <parola> - non ancora implementate.\n"
-#~ "track off - non ancora implementate.\n"
-#~ "untrack all - non ancora implementate.\n"
-#~ "tracks - non ancora implementate.\n"
-#~ "tracking - non ancora implementate.\n"
-
-#~ msgid "Edit Avatar"
-#~ msgstr "Modificar avatar"
+#~ msgid "Invalid tag: \"%s\""
+#~ msgstr "Etiquetta invalide: \"%s\""
diff --git a/locale/it/LC_MESSAGES/statusnet.po b/locale/it/LC_MESSAGES/statusnet.po
index 3306a48eaa..dd41fd4948 100644
--- a/locale/it/LC_MESSAGES/statusnet.po
+++ b/locale/it/LC_MESSAGES/statusnet.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-17 09:47+0000\n"
-"PO-Revision-Date: 2011-03-17 09:49:42+0000\n"
+"POT-Creation-Date: 2011-03-17 12:35+0000\n"
+"PO-Revision-Date: 2011-03-17 12:38:05+0000\n"
 "Language-Team: Italian <http://translatewiki.net/wiki/Portal:it>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -21,7 +21,7 @@ msgstr ""
 "X-Language-Code: it\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-03-11 18:52:41+0000\n"
+"X-POT-Import-Date: 2011-03-17 10:19:27+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -3986,6 +3986,8 @@ msgstr "La lingua è troppo lunga (max 50 caratteri)."
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
+#. TRANS: Form validation error when entering an invalid tag.
+#. TRANS: %s is the invalid tag.
 #, fuzzy, php-format
 msgid "Invalid tag: \"%s\"."
 msgstr "Etichetta non valida: \"%s\""
@@ -4849,7 +4851,6 @@ msgstr "Messaggio da %1$s su %2$s"
 msgid "Notice deleted."
 msgstr "Messaggio eliminato."
 
-#, fuzzy
 msgid "Notice"
 msgstr "Messaggi"
 
@@ -5395,17 +5396,14 @@ msgstr "Profilo utente"
 msgid "Tag user"
 msgstr "Etichette utente"
 
+#, fuzzy
 msgid ""
-"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
-"separated"
+"Tags for this user (letters, numbers, -, ., and _), separated by commas or "
+"spaces."
 msgstr ""
 "Etichette per questo utente (lettere, numeri, -, . e _), separate da virgole "
 "o spazi"
 
-#, php-format
-msgid "Invalid tag: \"%s\""
-msgstr "Etichetta non valida: \"%s\""
-
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
@@ -8430,90 +8428,5 @@ msgstr ""
 msgid "Getting backup from file '%s'."
 msgstr ""
 
-#~ msgid "Note"
-#~ msgstr "Nota"
-
-#~ msgid ""
-#~ "Commands:\n"
-#~ "on - turn on notifications\n"
-#~ "off - turn off notifications\n"
-#~ "help - show this help\n"
-#~ "follow <nickname> - subscribe to user\n"
-#~ "groups - lists the groups you have joined\n"
-#~ "subscriptions - list the people you follow\n"
-#~ "subscribers - list the people that follow you\n"
-#~ "leave <nickname> - unsubscribe from user\n"
-#~ "d <nickname> <text> - direct message to user\n"
-#~ "get <nickname> - get last notice from user\n"
-#~ "whois <nickname> - get profile info on user\n"
-#~ "lose <nickname> - force user to stop following you\n"
-#~ "fav <nickname> - add user's last notice as a 'fave'\n"
-#~ "fav #<notice_id> - add notice with the given id as a 'fave'\n"
-#~ "repeat #<notice_id> - repeat a notice with a given id\n"
-#~ "repeat <nickname> - repeat the last notice from user\n"
-#~ "reply #<notice_id> - reply to notice with a given id\n"
-#~ "reply <nickname> - reply to the last notice from user\n"
-#~ "join <group> - join group\n"
-#~ "login - Get a link to login to the web interface\n"
-#~ "drop <group> - leave group\n"
-#~ "stats - get your stats\n"
-#~ "stop - same as 'off'\n"
-#~ "quit - same as 'off'\n"
-#~ "sub <nickname> - same as 'follow'\n"
-#~ "unsub <nickname> - same as 'leave'\n"
-#~ "last <nickname> - same as 'get'\n"
-#~ "on <nickname> - not yet implemented.\n"
-#~ "off <nickname> - not yet implemented.\n"
-#~ "nudge <nickname> - remind a user to update.\n"
-#~ "invite <phone number> - not yet implemented.\n"
-#~ "track <word> - not yet implemented.\n"
-#~ "untrack <word> - not yet implemented.\n"
-#~ "track off - not yet implemented.\n"
-#~ "untrack all - not yet implemented.\n"
-#~ "tracks - not yet implemented.\n"
-#~ "tracking - not yet implemented.\n"
-#~ msgstr ""
-#~ "Comandi:\n"
-#~ "on - abilita le notifiche\n"
-#~ "off - disabilita le notifiche\n"
-#~ "help - mostra questo aiuto\n"
-#~ "follow <soprannome> - ti abbona all'utente\n"
-#~ "groups - elenca i gruppi di cui fai parte\n"
-#~ "subscriptions - elenca le persone che segui\n"
-#~ "subscribers - elenca le persone che ti seguono\n"
-#~ "leave <soprannome> - annulla l'abbonamento dall'utente\n"
-#~ "d <soprannome> <testo> - invia un messaggio diretto all'utente\n"
-#~ "get <soprannome> - recupera l'ultimo messaggio dell'utente\n"
-#~ "whois <soprannome> - recupera le informazioni del profilo dell'utente\n"
-#~ "lose <soprannome> - forza un utente nel non seguirti più\n"
-#~ "fav <soprannome> - aggiunge l'ultimo messaggio dell'utente tra i tuoi "
-#~ "preferiti\n"
-#~ "fav #<ID_messaggio> - aggiunge un messaggio con quell'ID tra i tuoi "
-#~ "preferiti\n"
-#~ "repeat #<ID_messaggio> - ripete un messaggio con quell'ID\n"
-#~ "repeat <soprannome> - ripete l'ultimo messaggio dell'utente\n"
-#~ "reply #<ID_messaggio> - risponde al messaggio con quell'ID\n"
-#~ "reply <soprannome> - risponde all'ultimo messaggio dell'utente\n"
-#~ "join <gruppo> - ti iscrive al gruppo\n"
-#~ "login - recupera un collegamento all'interfaccia web per eseguire "
-#~ "l'accesso\n"
-#~ "drop <gruppo> - annulla la tua iscrizione al gruppo\n"
-#~ "stats - recupera il tuo stato\n"
-#~ "stop - stessa azione del comando \"off\"\n"
-#~ "quit - stessa azione del comando \"on\"\n"
-#~ "sub <soprannome> - stessa azione del comando \"follow\"\n"
-#~ "unsub <soprannome> - stessa azione del comando \"leave\"\n"
-#~ "last <soprannome> - stessa azione del comando \"get\"\n"
-#~ "on <soprannome> -non ancora implementato\n"
-#~ "off <soprannome> - non ancora implementato\n"
-#~ "nudge <soprannome> - ricorda a un utente di scrivere qualche cosa\n"
-#~ "invite <numero di telefono> - non ancora implementato\n"
-#~ "track <parola> - non ancora implementato\n"
-#~ "untrack <parola> - non ancora implementato\n"
-#~ "track off - non ancora implementato\n"
-#~ "untrack all - non ancora implementato\n"
-#~ "tracks - non ancora implementato\n"
-#~ "tracking - non ancora implementato\n"
-
-#~ msgid "Edit Avatar"
-#~ msgstr "Modifica immagine"
+#~ msgid "Invalid tag: \"%s\""
+#~ msgstr "Etichetta non valida: \"%s\""
diff --git a/locale/ja/LC_MESSAGES/statusnet.po b/locale/ja/LC_MESSAGES/statusnet.po
index 2f58935de5..dc59777cba 100644
--- a/locale/ja/LC_MESSAGES/statusnet.po
+++ b/locale/ja/LC_MESSAGES/statusnet.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-17 09:47+0000\n"
-"PO-Revision-Date: 2011-03-17 09:49:43+0000\n"
+"POT-Creation-Date: 2011-03-17 12:35+0000\n"
+"PO-Revision-Date: 2011-03-17 12:38:07+0000\n"
 "Language-Team: Japanese <http://translatewiki.net/wiki/Portal:ja>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -24,7 +24,7 @@ msgstr ""
 "X-Language-Code: ja\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-POT-Import-Date: 2011-03-11 18:52:41+0000\n"
+"X-POT-Import-Date: 2011-03-17 10:19:27+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -3977,6 +3977,8 @@ msgstr "言語が長すぎます。(最大50字)"
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
+#. TRANS: Form validation error when entering an invalid tag.
+#. TRANS: %s is the invalid tag.
 #, fuzzy, php-format
 msgid "Invalid tag: \"%s\"."
 msgstr "不正なタグ: \"%s\""
@@ -4843,7 +4845,6 @@ msgstr "%2$s 上の %1$s からのメッセージ"
 msgid "Notice deleted."
 msgstr "つぶやきを削除しました。"
 
-#, fuzzy
 msgid "Notice"
 msgstr "つぶやき"
 
@@ -5402,16 +5403,13 @@ msgstr "ユーザプロファイル"
 msgid "Tag user"
 msgstr "タグユーザ"
 
+#, fuzzy
 msgid ""
-"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
-"separated"
+"Tags for this user (letters, numbers, -, ., and _), separated by commas or "
+"spaces."
 msgstr ""
 "このユーザのタグ (アルファベット、数字、-、.、_)、カンマかスペース区切り"
 
-#, php-format
-msgid "Invalid tag: \"%s\""
-msgstr "不正なタグ: \"%s\""
-
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
@@ -8375,8 +8373,5 @@ msgstr ""
 msgid "Getting backup from file '%s'."
 msgstr ""
 
-#~ msgid "Note"
-#~ msgstr "ノート"
-
-#~ msgid "Edit Avatar"
-#~ msgstr "アバターを編集する"
+#~ msgid "Invalid tag: \"%s\""
+#~ msgstr "不正なタグ: \"%s\""
diff --git a/locale/ka/LC_MESSAGES/statusnet.po b/locale/ka/LC_MESSAGES/statusnet.po
index 2b54bf0f85..6774881bef 100644
--- a/locale/ka/LC_MESSAGES/statusnet.po
+++ b/locale/ka/LC_MESSAGES/statusnet.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-17 09:47+0000\n"
-"PO-Revision-Date: 2011-03-17 09:49:45+0000\n"
+"POT-Creation-Date: 2011-03-17 12:35+0000\n"
+"PO-Revision-Date: 2011-03-17 12:38:08+0000\n"
 "Language-Team: Georgian <http://translatewiki.net/wiki/Portal:ka>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -19,7 +19,7 @@ msgstr ""
 "X-Language-Code: ka\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-POT-Import-Date: 2011-03-11 18:52:41+0000\n"
+"X-POT-Import-Date: 2011-03-17 10:19:27+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -3934,6 +3934,8 @@ msgstr "ენა ძალიან გრძელია (არაუმე
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
+#. TRANS: Form validation error when entering an invalid tag.
+#. TRANS: %s is the invalid tag.
 #, fuzzy, php-format
 msgid "Invalid tag: \"%s\"."
 msgstr "არასწორი სანიშნე: \"%s\""
@@ -5319,17 +5321,14 @@ msgstr "მომხმარებლის პროფილი"
 msgid "Tag user"
 msgstr "მონიშნე მომხმარებელი"
 
+#, fuzzy
 msgid ""
-"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
-"separated"
+"Tags for this user (letters, numbers, -, ., and _), separated by commas or "
+"spaces."
 msgstr ""
 "სანიშნეები ამ მომხმარებლისთვის (ასოები, ციფრები, -, ., და _). გამოყავით "
 "მძიმით ან სივრცით"
 
-#, php-format
-msgid "Invalid tag: \"%s\""
-msgstr "არასწორი სანიშნე: \"%s\""
-
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
@@ -8305,8 +8304,5 @@ msgstr ""
 msgid "Getting backup from file '%s'."
 msgstr ""
 
-#~ msgid "Note"
-#~ msgstr "შენიშვნა"
-
-#~ msgid "Edit Avatar"
-#~ msgstr "ავატარის რედაქტირება"
+#~ msgid "Invalid tag: \"%s\""
+#~ msgstr "არასწორი სანიშნე: \"%s\""
diff --git a/locale/ko/LC_MESSAGES/statusnet.po b/locale/ko/LC_MESSAGES/statusnet.po
index faead36164..658fe1f789 100644
--- a/locale/ko/LC_MESSAGES/statusnet.po
+++ b/locale/ko/LC_MESSAGES/statusnet.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-17 09:47+0000\n"
-"PO-Revision-Date: 2011-03-17 09:49:46+0000\n"
+"POT-Creation-Date: 2011-03-17 12:35+0000\n"
+"PO-Revision-Date: 2011-03-17 12:38:09+0000\n"
 "Language-Team: Korean <http://translatewiki.net/wiki/Portal:ko>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -21,7 +21,7 @@ msgstr ""
 "X-Language-Code: ko\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-POT-Import-Date: 2011-03-11 18:52:41+0000\n"
+"X-POT-Import-Date: 2011-03-17 10:19:27+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -3910,6 +3910,8 @@ msgstr "언어가 너무 깁니다. (최대 50글자)"
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
+#. TRANS: Form validation error when entering an invalid tag.
+#. TRANS: %s is the invalid tag.
 #, fuzzy, php-format
 msgid "Invalid tag: \"%s\"."
 msgstr "올바르지 않은 태그: \"%s\""
@@ -4741,7 +4743,6 @@ msgstr "%1$s에서 %2$s까지 메시지"
 msgid "Notice deleted."
 msgstr "게시글이 등록되었습니다."
 
-#, fuzzy
 msgid "Notice"
 msgstr "통지"
 
@@ -5270,17 +5271,14 @@ msgstr "이용자 프로필"
 msgid "Tag user"
 msgstr "태그 사용자"
 
+#, fuzzy
 msgid ""
-"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
-"separated"
+"Tags for this user (letters, numbers, -, ., and _), separated by commas or "
+"spaces."
 msgstr ""
 "사용자를 위한 태그 (문자,숫자, -, . ,그리고 _), 콤마 혹은 공백으로 분리하세"
 "요."
 
-#, php-format
-msgid "Invalid tag: \"%s\""
-msgstr "올바르지 않은 태그: \"%s\""
-
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
@@ -8170,8 +8168,5 @@ msgstr ""
 msgid "Getting backup from file '%s'."
 msgstr ""
 
-#~ msgid "Note"
-#~ msgstr "설명"
-
-#~ msgid "Edit Avatar"
-#~ msgstr "아바타 편집"
+#~ msgid "Invalid tag: \"%s\""
+#~ msgstr "올바르지 않은 태그: \"%s\""
diff --git a/locale/mk/LC_MESSAGES/statusnet.po b/locale/mk/LC_MESSAGES/statusnet.po
index f5298423de..7b446ba05b 100644
--- a/locale/mk/LC_MESSAGES/statusnet.po
+++ b/locale/mk/LC_MESSAGES/statusnet.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-17 09:47+0000\n"
-"PO-Revision-Date: 2011-03-17 09:49:47+0000\n"
+"POT-Creation-Date: 2011-03-17 12:35+0000\n"
+"PO-Revision-Date: 2011-03-17 12:38:10+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -20,7 +20,7 @@ msgstr ""
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
-"X-POT-Import-Date: 2011-03-11 18:52:41+0000\n"
+"X-POT-Import-Date: 2011-03-17 10:19:27+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -3871,6 +3871,8 @@ msgstr "Јазикот е предолг (највеќе до 50 знаци)."
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
+#. TRANS: Form validation error when entering an invalid tag.
+#. TRANS: %s is the invalid tag.
 #, php-format
 msgid "Invalid tag: \"%s\"."
 msgstr "Неважечка ознака: „%s“."
@@ -4724,7 +4726,6 @@ msgstr "Порака од %1$s на %2$s"
 msgid "Notice deleted."
 msgstr "Избришана забелешка"
 
-#, fuzzy
 msgid "Notice"
 msgstr "Забелешки"
 
@@ -5270,17 +5271,14 @@ msgstr "Кориснички профил"
 msgid "Tag user"
 msgstr "Означи корисник"
 
+#, fuzzy
 msgid ""
-"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
-"separated"
+"Tags for this user (letters, numbers, -, ., and _), separated by commas or "
+"spaces."
 msgstr ""
 "Ознаки за овој корисник (букви, бројки, -, . и _), одделени со запирка или "
 "празно место"
 
-#, php-format
-msgid "Invalid tag: \"%s\""
-msgstr "Неважечка ознака: „%s“"
-
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
@@ -8268,87 +8266,5 @@ msgstr "Неважечки XML. Нема XRD-корен."
 msgid "Getting backup from file '%s'."
 msgstr "Земам резерва на податотеката „%s“."
 
-#~ msgid "Note"
-#~ msgstr "Забелешка"
-
-#~ msgid ""
-#~ "Commands:\n"
-#~ "on - turn on notifications\n"
-#~ "off - turn off notifications\n"
-#~ "help - show this help\n"
-#~ "follow <nickname> - subscribe to user\n"
-#~ "groups - lists the groups you have joined\n"
-#~ "subscriptions - list the people you follow\n"
-#~ "subscribers - list the people that follow you\n"
-#~ "leave <nickname> - unsubscribe from user\n"
-#~ "d <nickname> <text> - direct message to user\n"
-#~ "get <nickname> - get last notice from user\n"
-#~ "whois <nickname> - get profile info on user\n"
-#~ "lose <nickname> - force user to stop following you\n"
-#~ "fav <nickname> - add user's last notice as a 'fave'\n"
-#~ "fav #<notice_id> - add notice with the given id as a 'fave'\n"
-#~ "repeat #<notice_id> - repeat a notice with a given id\n"
-#~ "repeat <nickname> - repeat the last notice from user\n"
-#~ "reply #<notice_id> - reply to notice with a given id\n"
-#~ "reply <nickname> - reply to the last notice from user\n"
-#~ "join <group> - join group\n"
-#~ "login - Get a link to login to the web interface\n"
-#~ "drop <group> - leave group\n"
-#~ "stats - get your stats\n"
-#~ "stop - same as 'off'\n"
-#~ "quit - same as 'off'\n"
-#~ "sub <nickname> - same as 'follow'\n"
-#~ "unsub <nickname> - same as 'leave'\n"
-#~ "last <nickname> - same as 'get'\n"
-#~ "on <nickname> - not yet implemented.\n"
-#~ "off <nickname> - not yet implemented.\n"
-#~ "nudge <nickname> - remind a user to update.\n"
-#~ "invite <phone number> - not yet implemented.\n"
-#~ "track <word> - not yet implemented.\n"
-#~ "untrack <word> - not yet implemented.\n"
-#~ "track off - not yet implemented.\n"
-#~ "untrack all - not yet implemented.\n"
-#~ "tracks - not yet implemented.\n"
-#~ "tracking - not yet implemented.\n"
-#~ msgstr ""
-#~ "Наредби:\n"
-#~ "on - вклучи известувања\n"
-#~ "off - исклучи известувања\n"
-#~ "help - прикажи ја оваа помош\n"
-#~ "follow <nickname> - претплати се на корисник\n"
-#~ "groups - список на групи кадешто членувате\n"
-#~ "subscriptions - список на луѓе кои ги следите\n"
-#~ "subscribers - список на луѓе кои Ве следат\n"
-#~ "leave <nickname> - откажи претплата на корисник\n"
-#~ "d <nickname> <text> - директна порака за корисник\n"
-#~ "get <nickname> - прикажи последна забелешка на корисник\n"
-#~ "whois <nickname> - прикажи профилни информации за корисник\n"
-#~ "fav <nickname> - додај ја последната забелешка на корисникот во "
-#~ "бендисани\n"
-#~ "fav #<notice_id> - додај забелешка со даден id како бендисана\n"
-#~ "repeat #<notice_id> - повтори забелешка со даден id\n"
-#~ "repeat <nickname> - повтори последна забелешка на корисник\n"
-#~ "reply #<notice_id> - одговори на забелешка со даден id\n"
-#~ "reply <nickname> - одговори на последна забелешка на корисник\n"
-#~ "join <group> - зачлени се во група\n"
-#~ "login - Дај врска за најавување на посредникот\n"
-#~ "drop <group> - напушти група\n"
-#~ "stats - прикажи мои статистики\n"
-#~ "stop - исто што и 'off'\n"
-#~ "quit - исто што и 'off'\n"
-#~ "sub <nickname> - исто што и 'follow'\n"
-#~ "unsub <nickname> - исто што и 'leave'\n"
-#~ "last <nickname> - исто што и 'get'\n"
-#~ "on <nickname> - сè уште не е имплементирано.\n"
-#~ "off <nickname> - сè уште не е имплементирано.\n"
-#~ "nudge <nickname> - потсети корисник да поднови.\n"
-#~ "invite <phone number> - сè уште не е имплементирано.\n"
-#~ "track <word> - сè уште не е имплементирано.\n"
-#~ "untrack <word> - сè уште не е имплементирано.\n"
-#~ "track off - сè уште не е имплементирано.\n"
-#~ "untrack all - сè уште не е имплементирано.\n"
-#~ "tracks - сè уште не е имплементирано.\n"
-#~ "tracking - сè уште не е имплементирано.\n"
-
-#~ msgid "Edit Avatar"
-#~ msgstr "Уреди аватар"
+#~ msgid "Invalid tag: \"%s\""
+#~ msgstr "Неважечка ознака: „%s“"
diff --git a/locale/ml/LC_MESSAGES/statusnet.po b/locale/ml/LC_MESSAGES/statusnet.po
index a3e79892f0..7af7447b88 100644
--- a/locale/ml/LC_MESSAGES/statusnet.po
+++ b/locale/ml/LC_MESSAGES/statusnet.po
@@ -9,12 +9,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-17 09:47+0000\n"
-"PO-Revision-Date: 2011-03-17 09:49:48+0000\n"
+"POT-Creation-Date: 2011-03-17 12:35+0000\n"
+"PO-Revision-Date: 2011-03-17 12:38:11+0000\n"
 "Language-Team: Malayalam <http://translatewiki.net/wiki/Portal:ml>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-11 18:52:41+0000\n"
+"X-POT-Import-Date: 2011-03-17 10:19:27+0000\n"
 "X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ml\n"
@@ -3786,6 +3786,8 @@ msgstr "ഭാഷയുടെ നീളം വളരെ കൂടുതലാണ
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
+#. TRANS: Form validation error when entering an invalid tag.
+#. TRANS: %s is the invalid tag.
 #, fuzzy, php-format
 msgid "Invalid tag: \"%s\"."
 msgstr "അസാധുവായ റ്റാഗ്: \"%s\""
@@ -5110,14 +5112,10 @@ msgid "Tag user"
 msgstr "ഉപയോക്താവിനെ റ്റാഗ് ചെയ്യുക"
 
 msgid ""
-"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
-"separated"
+"Tags for this user (letters, numbers, -, ., and _), separated by commas or "
+"spaces."
 msgstr ""
 
-#, php-format
-msgid "Invalid tag: \"%s\""
-msgstr "അസാധുവായ റ്റാഗ്: \"%s\""
-
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
@@ -7944,5 +7942,5 @@ msgstr ""
 msgid "Getting backup from file '%s'."
 msgstr ""
 
-#~ msgid "Note"
-#~ msgstr "കുറിപ്പ്"
+#~ msgid "Invalid tag: \"%s\""
+#~ msgstr "അസാധുവായ റ്റാഗ്: \"%s\""
diff --git a/locale/nb/LC_MESSAGES/statusnet.po b/locale/nb/LC_MESSAGES/statusnet.po
index 55d575a366..337ab26b34 100644
--- a/locale/nb/LC_MESSAGES/statusnet.po
+++ b/locale/nb/LC_MESSAGES/statusnet.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-17 09:47+0000\n"
-"PO-Revision-Date: 2011-03-17 09:49:51+0000\n"
+"POT-Creation-Date: 2011-03-17 12:35+0000\n"
+"PO-Revision-Date: 2011-03-17 12:38:14+0000\n"
 "Language-Team: Norwegian (bokmål)‬ <http://translatewiki.net/wiki/Portal:no>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -22,7 +22,7 @@ msgstr ""
 "X-Language-Code: no\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-03-11 18:52:41+0000\n"
+"X-POT-Import-Date: 2011-03-17 10:19:27+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -3912,6 +3912,8 @@ msgstr "Språknavnet er for langt (maks 50 tegn)."
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
+#. TRANS: Form validation error when entering an invalid tag.
+#. TRANS: %s is the invalid tag.
 #, fuzzy, php-format
 msgid "Invalid tag: \"%s\"."
 msgstr "Ugyldig merkelapp: «%s»"
@@ -5314,16 +5316,12 @@ msgstr "Merk bruker"
 
 #, fuzzy
 msgid ""
-"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
-"separated"
+"Tags for this user (letters, numbers, -, ., and _), separated by commas or "
+"spaces."
 msgstr ""
 "Merkelapper for degselv (bokstaver, nummer, -, ., og _), adskilt med komma "
 "eller mellomrom"
 
-#, php-format
-msgid "Invalid tag: \"%s\""
-msgstr "Ugyldig merkelapp: «%s»"
-
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
@@ -8325,9 +8323,5 @@ msgstr ""
 msgid "Getting backup from file '%s'."
 msgstr ""
 
-#~ msgid "Note"
-#~ msgstr "Merk"
-
-#, fuzzy
-#~ msgid "Edit Avatar"
-#~ msgstr "Brukerbilde"
+#~ msgid "Invalid tag: \"%s\""
+#~ msgstr "Ugyldig merkelapp: «%s»"
diff --git a/locale/nl/LC_MESSAGES/statusnet.po b/locale/nl/LC_MESSAGES/statusnet.po
index c427d1e703..1fa61d8047 100644
--- a/locale/nl/LC_MESSAGES/statusnet.po
+++ b/locale/nl/LC_MESSAGES/statusnet.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-17 09:47+0000\n"
-"PO-Revision-Date: 2011-03-17 09:49:49+0000\n"
+"POT-Creation-Date: 2011-03-17 12:35+0000\n"
+"PO-Revision-Date: 2011-03-17 12:38:12+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -22,7 +22,7 @@ msgstr ""
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-03-11 18:52:41+0000\n"
+"X-POT-Import-Date: 2011-03-17 10:19:27+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -3898,6 +3898,8 @@ msgstr "De taal is te lang (maximaal 50 tekens)."
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
+#. TRANS: Form validation error when entering an invalid tag.
+#. TRANS: %s is the invalid tag.
 #, php-format
 msgid "Invalid tag: \"%s\"."
 msgstr "Ongeldig label: \"%s\"."
@@ -4756,9 +4758,8 @@ msgstr "Bericht van %1$s op %2$s"
 msgid "Notice deleted."
 msgstr "Deze mededeling is verwijderd."
 
-#, fuzzy
 msgid "Notice"
-msgstr "Mededelingen"
+msgstr "Mededeling"
 
 #. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
 #, php-format
@@ -5307,17 +5308,14 @@ msgstr "Gebruikersprofiel"
 msgid "Tag user"
 msgstr "Gebruiker labelen"
 
+#, fuzzy
 msgid ""
-"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
-"separated"
+"Tags for this user (letters, numbers, -, ., and _), separated by commas or "
+"spaces."
 msgstr ""
 "Labels voor deze gebruiker (letters, cijfers, -, ., en _). Gebruik komma's "
 "of spaties als scheidingsteken"
 
-#, php-format
-msgid "Invalid tag: \"%s\""
-msgstr "Ongeldig label: '%s'"
-
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
@@ -6802,152 +6800,140 @@ msgstr[0] "U bent lid van deze groep:"
 msgstr[1] "U bent lid van deze groepen:"
 
 #. TRANS: Header line of help text for commands.
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "Commands:"
-msgstr "Commandoresultaten"
+msgstr "Commando's:"
 
 #. TRANS: Help message for IM/SMS command "on"
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "turn on notifications"
-msgstr "Het is niet mogelijk de notificatie uit te schakelen."
+msgstr "meldingen inschakelen"
 
 #. TRANS: Help message for IM/SMS command "off"
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "turn off notifications"
-msgstr "Het is niet mogelijk de mededelingen uit te schakelen."
+msgstr "meldingen uitschakelen"
 
 #. TRANS: Help message for IM/SMS command "help"
 msgctxt "COMMANDHELP"
 msgid "show this help"
-msgstr ""
+msgstr "de hulptekst weergeven"
 
 #. TRANS: Help message for IM/SMS command "follow <nickname>"
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "subscribe to user"
-msgstr "Abonneren op deze gebruiker"
+msgstr "abonneren op gebruiker"
 
 #. TRANS: Help message for IM/SMS command "groups"
 msgctxt "COMMANDHELP"
 msgid "lists the groups you have joined"
-msgstr ""
+msgstr "geeft de groepen waar u lid van bent weer"
 
 #. TRANS: Help message for IM/SMS command "subscriptions"
 msgctxt "COMMANDHELP"
 msgid "list the people you follow"
-msgstr ""
+msgstr "geeft de mensen die u volgt weer"
 
 #. TRANS: Help message for IM/SMS command "subscribers"
 msgctxt "COMMANDHELP"
 msgid "list the people that follow you"
-msgstr ""
+msgstr "geeft de mensen die u volgen weer"
 
 #. TRANS: Help message for IM/SMS command "leave <nickname>"
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "unsubscribe from user"
-msgstr "Uitschrijven van deze gebruiker"
+msgstr "abonnement op gebruiker opzeggen"
 
 #. TRANS: Help message for IM/SMS command "d <nickname> <text>"
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "direct message to user"
-msgstr "Privéberichten aan %s"
+msgstr "privébericht aan gebruiker"
 
 #. TRANS: Help message for IM/SMS command "get <nickname>"
 msgctxt "COMMANDHELP"
 msgid "get last notice from user"
-msgstr ""
+msgstr "haal de laastste mededdeling van gebruiker op"
 
 #. TRANS: Help message for IM/SMS command "whois <nickname>"
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "get profile info on user"
-msgstr "Het profiel op de andere server is geen groep!"
+msgstr "profielgegevens van gebruiker ophalen"
 
 #. TRANS: Help message for IM/SMS command "lose <nickname>"
 msgctxt "COMMANDHELP"
 msgid "force user to stop following you"
-msgstr ""
+msgstr "dwing gebruiker u niet langer te volgen"
 
 #. TRANS: Help message for IM/SMS command "fav <nickname>"
 msgctxt "COMMANDHELP"
 msgid "add user's last notice as a 'fave'"
-msgstr ""
+msgstr "voegt de laatste mededeling van gebruiker toe als favoriet"
 
 #. TRANS: Help message for IM/SMS command "fav #<notice_id>"
 msgctxt "COMMANDHELP"
 msgid "add notice with the given id as a 'fave'"
-msgstr ""
+msgstr "voegt mededeling met het opgegeven ID toe als favoriet"
 
 #. TRANS: Help message for IM/SMS command "repeat #<notice_id>"
 msgctxt "COMMANDHELP"
 msgid "repeat a notice with a given id"
-msgstr ""
+msgstr "herhaalt de mededeling met het opgegeven ID"
 
 #. TRANS: Help message for IM/SMS command "repeat <nickname>"
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "repeat the last notice from user"
-msgstr "Deze mededeling herhalen"
+msgstr "de laatste mededeling van gebruiker herhalen"
 
 #. TRANS: Help message for IM/SMS command "reply #<notice_id>"
 msgctxt "COMMANDHELP"
 msgid "reply to notice with a given id"
-msgstr ""
+msgstr "antwoorden op mededeling met het opgegeven ID"
 
 #. TRANS: Help message for IM/SMS command "reply <nickname>"
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "reply to the last notice from user"
-msgstr "Op deze mededeling antwoorden"
+msgstr "op de laatste mededeling van gebruiker antwoorden"
 
 #. TRANS: Help message for IM/SMS command "join <group>"
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "join group"
-msgstr "Onbekende groep."
+msgstr "lid worden van groep"
 
 #. TRANS: Help message for IM/SMS command "login"
 msgctxt "COMMANDHELP"
 msgid "Get a link to login to the web interface"
-msgstr ""
+msgstr "Haal een verwijzing op naar het aanmeldscherm voor de webinterface"
 
 #. TRANS: Help message for IM/SMS command "drop <group>"
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "leave group"
-msgstr "Groep verwijderen"
+msgstr "groep verlaten"
 
 #. TRANS: Help message for IM/SMS command "stats"
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "get your stats"
-msgstr "Werk uw status bij..."
+msgstr "uw statistieken ophalen"
 
 #. TRANS: Help message for IM/SMS command "stop"
 #. TRANS: Help message for IM/SMS command "quit"
 msgctxt "COMMANDHELP"
 msgid "same as 'off'"
-msgstr ""
+msgstr "hetzelfde als \"uit\""
 
 #. TRANS: Help message for IM/SMS command "sub <nickname>"
 msgctxt "COMMANDHELP"
 msgid "same as 'follow'"
-msgstr ""
+msgstr "hetzelfde als 'follow'"
 
 #. TRANS: Help message for IM/SMS command "unsub <nickname>"
 msgctxt "COMMANDHELP"
 msgid "same as 'leave'"
-msgstr ""
+msgstr "hetzelfde als 'leave'"
 
 #. TRANS: Help message for IM/SMS command "last <nickname>"
 msgctxt "COMMANDHELP"
 msgid "same as 'get'"
-msgstr ""
+msgstr "hetzelfde als 'get'"
 
 #. TRANS: Help message for IM/SMS command "on <nickname>"
 #. TRANS: Help message for IM/SMS command "off <nickname>"
@@ -6958,15 +6944,14 @@ msgstr ""
 #. TRANS: Help message for IM/SMS command "untrack all"
 #. TRANS: Help message for IM/SMS command "tracks"
 #. TRANS: Help message for IM/SMS command "tracking"
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "not yet implemented."
-msgstr "Dit commando is nog niet geïmplementeerd."
+msgstr "nog niet geïmplementeerd."
 
 #. TRANS: Help message for IM/SMS command "nudge <nickname>"
 msgctxt "COMMANDHELP"
 msgid "remind a user to update."
-msgstr ""
+msgstr "herinner een gebruiker eraan bij te werken."
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 msgid "No configuration file found."
@@ -8333,90 +8318,5 @@ msgstr "Ongeldige XML. De XRD-root mist."
 msgid "Getting backup from file '%s'."
 msgstr "De back-up wordt uit het bestand \"%s\" geladen."
 
-#~ msgid "Note"
-#~ msgstr "Opmerking"
-
-#~ msgid ""
-#~ "Commands:\n"
-#~ "on - turn on notifications\n"
-#~ "off - turn off notifications\n"
-#~ "help - show this help\n"
-#~ "follow <nickname> - subscribe to user\n"
-#~ "groups - lists the groups you have joined\n"
-#~ "subscriptions - list the people you follow\n"
-#~ "subscribers - list the people that follow you\n"
-#~ "leave <nickname> - unsubscribe from user\n"
-#~ "d <nickname> <text> - direct message to user\n"
-#~ "get <nickname> - get last notice from user\n"
-#~ "whois <nickname> - get profile info on user\n"
-#~ "lose <nickname> - force user to stop following you\n"
-#~ "fav <nickname> - add user's last notice as a 'fave'\n"
-#~ "fav #<notice_id> - add notice with the given id as a 'fave'\n"
-#~ "repeat #<notice_id> - repeat a notice with a given id\n"
-#~ "repeat <nickname> - repeat the last notice from user\n"
-#~ "reply #<notice_id> - reply to notice with a given id\n"
-#~ "reply <nickname> - reply to the last notice from user\n"
-#~ "join <group> - join group\n"
-#~ "login - Get a link to login to the web interface\n"
-#~ "drop <group> - leave group\n"
-#~ "stats - get your stats\n"
-#~ "stop - same as 'off'\n"
-#~ "quit - same as 'off'\n"
-#~ "sub <nickname> - same as 'follow'\n"
-#~ "unsub <nickname> - same as 'leave'\n"
-#~ "last <nickname> - same as 'get'\n"
-#~ "on <nickname> - not yet implemented.\n"
-#~ "off <nickname> - not yet implemented.\n"
-#~ "nudge <nickname> - remind a user to update.\n"
-#~ "invite <phone number> - not yet implemented.\n"
-#~ "track <word> - not yet implemented.\n"
-#~ "untrack <word> - not yet implemented.\n"
-#~ "track off - not yet implemented.\n"
-#~ "untrack all - not yet implemented.\n"
-#~ "tracks - not yet implemented.\n"
-#~ "tracking - not yet implemented.\n"
-#~ msgstr ""
-#~ "Commando's:\n"
-#~ "on - notificaties inschakelen\n"
-#~ "off - notificaties uitschakelen\n"
-#~ "help - deze hulptekst weergeven\n"
-#~ "follow <gebruiker> - abonneren op gebruiker\n"
-#~ "groups - geef uw groepslidmaatschappen weer\n"
-#~ "subscriptions - geeft uw gebruikersabonnenmenten weer\n"
-#~ "subscribers - geeft de gebruikers die een abonnement op u hebben weer\n"
-#~ "leave <gebruiker> - abonnement op gebruiker opzeggen\n"
-#~ "d <gebruiker> <tekst> - direct bericht aan gebruiker\n"
-#~ "get <gebruiker> - laatste mededeling van gebruiker opvragen\n"
-#~ "whois <gebruiker> - profielinformatie van gebruiker opvragen\n"
-#~ "lose <gebruiker> - zorgt ervoor dat de gebruiker u niet meer volgt\n"
-#~ "fav <gebruiker> - laatste mededeling van gebruiker op favorietenlijst "
-#~ "zetten\n"
-#~ "fav #<mededeling-ID> - mededelingen met aangegeven ID op favorietenlijst "
-#~ "zetten\n"
-#~ "repeat #<mededeling-ID> - herhaal een mededelingen met een opgegeven ID\n"
-#~ "repeat <gebruiker> - herhaal de laatste mededelingen van gebruiker\n"
-#~ "reply #<mededeling-ID> - antwoorden op de mededeling met het aangegeven "
-#~ "ID\n"
-#~ "reply <gebruiker> - antwoorden op de laatste mededeling van gebruiker\n"
-#~ "join <groep> - lid worden van groep\n"
-#~ "login - verwijzing opvragen naar de webpagina voor aanmelden\n"
-#~ "drop <groep> - groepslidmaatschap opzeggen\n"
-#~ "stats - uw statistieken opvragen\n"
-#~ "stop - zelfde als 'off'\n"
-#~ "quit - zelfde als 'off'\n"
-#~ "sub <gebruiker> - zelfde als 'follow'\n"
-#~ "unsub <gebruiker> - zelfde als 'leave'\n"
-#~ "last <gebruiker> - zelfde als 'get'\n"
-#~ "on <gebruiker> - nog niet beschikbaar\n"
-#~ "off <gebruiker> - nog niet beschikbaar\n"
-#~ "nudge <gebruiker> - gebruiker porren\n"
-#~ "invite <phone number> - nog niet beschikbaar\n"
-#~ "track <word> - nog niet beschikbaar\n"
-#~ "untrack <word> - nog niet beschikbaar\n"
-#~ "track off - nog niet beschikbaar\n"
-#~ "untrack all - nog niet beschikbaar\n"
-#~ "tracks - nog niet beschikbaar\n"
-#~ "tracking - nog niet beschikbaar\n"
-
-#~ msgid "Edit Avatar"
-#~ msgstr "Avatar bewerken"
+#~ msgid "Invalid tag: \"%s\""
+#~ msgstr "Ongeldig label: \"%s\"."
diff --git a/locale/pl/LC_MESSAGES/statusnet.po b/locale/pl/LC_MESSAGES/statusnet.po
index c656fd64bd..4dee907dac 100644
--- a/locale/pl/LC_MESSAGES/statusnet.po
+++ b/locale/pl/LC_MESSAGES/statusnet.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-17 09:47+0000\n"
-"PO-Revision-Date: 2011-03-17 09:49:52+0000\n"
+"POT-Creation-Date: 2011-03-17 12:35+0000\n"
+"PO-Revision-Date: 2011-03-17 12:38:15+0000\n"
 "Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
 "Language-Team: Polish <http://translatewiki.net/wiki/Portal:pl>\n"
 "MIME-Version: 1.0\n"
@@ -24,7 +24,7 @@ msgstr ""
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pl\n"
 "X-Message-Group: #out-statusnet-core\n"
-"X-POT-Import-Date: 2011-03-11 18:52:41+0000\n"
+"X-POT-Import-Date: 2011-03-17 10:19:27+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -3924,6 +3924,8 @@ msgstr "Język jest za długi (maksymalnie 50 znaków)."
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
+#. TRANS: Form validation error when entering an invalid tag.
+#. TRANS: %s is the invalid tag.
 #, fuzzy, php-format
 msgid "Invalid tag: \"%s\"."
 msgstr "Nieprawidłowy znacznik: \"%s\""
@@ -4777,7 +4779,6 @@ msgstr "Wiadomość od użytkownika %1$s na %2$s"
 msgid "Notice deleted."
 msgstr "Usunięto wpis."
 
-#, fuzzy
 msgid "Notice"
 msgstr "Wpisy"
 
@@ -5324,17 +5325,14 @@ msgstr "Profil użytkownika"
 msgid "Tag user"
 msgstr "Znacznik użytkownika"
 
+#, fuzzy
 msgid ""
-"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
-"separated"
+"Tags for this user (letters, numbers, -, ., and _), separated by commas or "
+"spaces."
 msgstr ""
 "Znaczniki dla tego użytkownika (litery, liczby, -, . i _), oddzielone "
 "przecinkami lub spacjami"
 
-#, php-format
-msgid "Invalid tag: \"%s\""
-msgstr "Nieprawidłowy znacznik: \"%s\""
-
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
@@ -8360,90 +8358,5 @@ msgstr "Nieprawidłowy kod XML, brak głównego XRD."
 msgid "Getting backup from file '%s'."
 msgstr "Pobieranie kopii zapasowej z pliku \"%s\"."
 
-#~ msgid "Note"
-#~ msgstr "Wpis"
-
-#~ msgid ""
-#~ "Commands:\n"
-#~ "on - turn on notifications\n"
-#~ "off - turn off notifications\n"
-#~ "help - show this help\n"
-#~ "follow <nickname> - subscribe to user\n"
-#~ "groups - lists the groups you have joined\n"
-#~ "subscriptions - list the people you follow\n"
-#~ "subscribers - list the people that follow you\n"
-#~ "leave <nickname> - unsubscribe from user\n"
-#~ "d <nickname> <text> - direct message to user\n"
-#~ "get <nickname> - get last notice from user\n"
-#~ "whois <nickname> - get profile info on user\n"
-#~ "lose <nickname> - force user to stop following you\n"
-#~ "fav <nickname> - add user's last notice as a 'fave'\n"
-#~ "fav #<notice_id> - add notice with the given id as a 'fave'\n"
-#~ "repeat #<notice_id> - repeat a notice with a given id\n"
-#~ "repeat <nickname> - repeat the last notice from user\n"
-#~ "reply #<notice_id> - reply to notice with a given id\n"
-#~ "reply <nickname> - reply to the last notice from user\n"
-#~ "join <group> - join group\n"
-#~ "login - Get a link to login to the web interface\n"
-#~ "drop <group> - leave group\n"
-#~ "stats - get your stats\n"
-#~ "stop - same as 'off'\n"
-#~ "quit - same as 'off'\n"
-#~ "sub <nickname> - same as 'follow'\n"
-#~ "unsub <nickname> - same as 'leave'\n"
-#~ "last <nickname> - same as 'get'\n"
-#~ "on <nickname> - not yet implemented.\n"
-#~ "off <nickname> - not yet implemented.\n"
-#~ "nudge <nickname> - remind a user to update.\n"
-#~ "invite <phone number> - not yet implemented.\n"
-#~ "track <word> - not yet implemented.\n"
-#~ "untrack <word> - not yet implemented.\n"
-#~ "track off - not yet implemented.\n"
-#~ "untrack all - not yet implemented.\n"
-#~ "tracks - not yet implemented.\n"
-#~ "tracking - not yet implemented.\n"
-#~ msgstr ""
-#~ "Polecenia:\n"
-#~ "on - włącza powiadomienia\n"
-#~ "off - wyłącza powiadomienia\n"
-#~ "help - wyświetla tę pomoc\n"
-#~ "follow <pseudonim> - subskrybuje użytkownika\n"
-#~ "groups - wyświetla listę grup, do których dołączyłeś\n"
-#~ "subscriptions - wyświetla listę obserwowanych osób\n"
-#~ "subscribers - wyświetla listę osób, które cię obserwują\n"
-#~ "leave <pseudonim> - usuwa subskrypcję użytkownika\n"
-#~ "d <pseudonim> <tekst> - bezpośrednia wiadomość do użytkownika\n"
-#~ "get <pseudonim> - zwraca ostatni wpis użytkownika\n"
-#~ "whois <pseudonim> - zwraca informacje o profilu użytkownika\n"
-#~ "lose <pseudonim> - wymusza użytkownika do zatrzymania obserwowania cię\n"
-#~ "fav <pseudonim> - dodaje ostatni wpis użytkownika jako \"ulubiony\"\n"
-#~ "fav #<identyfikator_wpisu> - dodaje wpis z podanym identyfikatorem jako "
-#~ "\"ulubiony\"\n"
-#~ "repeat #<identyfikator_wpisu> - powtarza wiadomość z zadanym "
-#~ "identyfikatorem\n"
-#~ "repeat <pseudonim> - powtarza ostatnią wiadomość od użytkownika\n"
-#~ "reply #<identyfikator_wpisu> - odpowiada na wpis z podanym "
-#~ "identyfikatorem\n"
-#~ "reply <pseudonim> - odpowiada na ostatni wpis użytkownika\n"
-#~ "join <grupa> - dołącza do grupy\n"
-#~ "login - pobiera odnośnik do zalogowania się do interfejsu WWW\n"
-#~ "drop <grupa> - opuszcza grupę\n"
-#~ "stats - pobiera statystyki\n"
-#~ "stop - to samo co \"off\"\n"
-#~ "quit - to samo co \"off\"\n"
-#~ "sub <pseudonim> - to samo co \"follow\"\n"
-#~ "unsub <pseudonim> - to samo co \"leave\"\n"
-#~ "last <pseudonim> - to samo co \"get\"\n"
-#~ "on <pseudonim> - jeszcze nie zaimplementowano\n"
-#~ "off <pseudonim> - jeszcze nie zaimplementowano\n"
-#~ "nudge <pseudonim> - przypomina użytkownikowi o aktualizacji\n"
-#~ "invite <numer telefonu> - jeszcze nie zaimplementowano\n"
-#~ "track <wyraz> - jeszcze nie zaimplementowano\n"
-#~ "untrack <wyraz> - jeszcze nie zaimplementowano\n"
-#~ "track off - jeszcze nie zaimplementowano\n"
-#~ "untrack all - jeszcze nie zaimplementowano\n"
-#~ "tracks - jeszcze nie zaimplementowano\n"
-#~ "tracking - jeszcze nie zaimplementowano\n"
-
-#~ msgid "Edit Avatar"
-#~ msgstr "Zmodyfikuj awatar"
+#~ msgid "Invalid tag: \"%s\""
+#~ msgstr "Nieprawidłowy znacznik: \"%s\""
diff --git a/locale/pt/LC_MESSAGES/statusnet.po b/locale/pt/LC_MESSAGES/statusnet.po
index 1b1e41be95..93aaccd378 100644
--- a/locale/pt/LC_MESSAGES/statusnet.po
+++ b/locale/pt/LC_MESSAGES/statusnet.po
@@ -17,8 +17,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-17 09:47+0000\n"
-"PO-Revision-Date: 2011-03-17 09:49:53+0000\n"
+"POT-Creation-Date: 2011-03-17 12:35+0000\n"
+"PO-Revision-Date: 2011-03-17 12:38:16+0000\n"
 "Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -27,7 +27,7 @@ msgstr ""
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-03-11 18:52:41+0000\n"
+"X-POT-Import-Date: 2011-03-17 10:19:27+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -3892,6 +3892,8 @@ msgstr "Língua é demasiado extensa (máx. 50 caracteres)."
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
+#. TRANS: Form validation error when entering an invalid tag.
+#. TRANS: %s is the invalid tag.
 #, fuzzy, php-format
 msgid "Invalid tag: \"%s\"."
 msgstr "Categoria inválida: \"%s\""
@@ -5308,17 +5310,14 @@ msgstr "Perfil"
 msgid "Tag user"
 msgstr "Categorizar utilizador"
 
+#, fuzzy
 msgid ""
-"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
-"separated"
+"Tags for this user (letters, numbers, -, ., and _), separated by commas or "
+"spaces."
 msgstr ""
 "Categorias para este utilizador (letras, números, ., _), separadas por "
 "vírgulas ou espaços"
 
-#, php-format
-msgid "Invalid tag: \"%s\""
-msgstr "Categoria inválida: \"%s\""
-
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr "Só pode categorizar pessoas que subscreve ou os seus subscritores."
@@ -8326,87 +8325,5 @@ msgstr ""
 msgid "Getting backup from file '%s'."
 msgstr ""
 
-#~ msgid "Note"
-#~ msgstr "Anotação"
-
-#~ msgid ""
-#~ "Commands:\n"
-#~ "on - turn on notifications\n"
-#~ "off - turn off notifications\n"
-#~ "help - show this help\n"
-#~ "follow <nickname> - subscribe to user\n"
-#~ "groups - lists the groups you have joined\n"
-#~ "subscriptions - list the people you follow\n"
-#~ "subscribers - list the people that follow you\n"
-#~ "leave <nickname> - unsubscribe from user\n"
-#~ "d <nickname> <text> - direct message to user\n"
-#~ "get <nickname> - get last notice from user\n"
-#~ "whois <nickname> - get profile info on user\n"
-#~ "lose <nickname> - force user to stop following you\n"
-#~ "fav <nickname> - add user's last notice as a 'fave'\n"
-#~ "fav #<notice_id> - add notice with the given id as a 'fave'\n"
-#~ "repeat #<notice_id> - repeat a notice with a given id\n"
-#~ "repeat <nickname> - repeat the last notice from user\n"
-#~ "reply #<notice_id> - reply to notice with a given id\n"
-#~ "reply <nickname> - reply to the last notice from user\n"
-#~ "join <group> - join group\n"
-#~ "login - Get a link to login to the web interface\n"
-#~ "drop <group> - leave group\n"
-#~ "stats - get your stats\n"
-#~ "stop - same as 'off'\n"
-#~ "quit - same as 'off'\n"
-#~ "sub <nickname> - same as 'follow'\n"
-#~ "unsub <nickname> - same as 'leave'\n"
-#~ "last <nickname> - same as 'get'\n"
-#~ "on <nickname> - not yet implemented.\n"
-#~ "off <nickname> - not yet implemented.\n"
-#~ "nudge <nickname> - remind a user to update.\n"
-#~ "invite <phone number> - not yet implemented.\n"
-#~ "track <word> - not yet implemented.\n"
-#~ "untrack <word> - not yet implemented.\n"
-#~ "track off - not yet implemented.\n"
-#~ "untrack all - not yet implemented.\n"
-#~ "tracks - not yet implemented.\n"
-#~ "tracking - not yet implemented.\n"
-#~ msgstr ""
-#~ "Comandos:\n"
-#~ "on - ligar notificações\n"
-#~ "off - desligar notificações\n"
-#~ "help - mostrar esta ajuda\n"
-#~ "follow <utilizador> - subscrever este utilizador\n"
-#~ "groups - lista os grupos a que se juntou\n"
-#~ "subscriptions - lista as pessoas que está a seguir\n"
-#~ "subscribers - lista as pessoas que estão a segui-lo(a)\n"
-#~ "leave <utilizador> - deixar de subscrever este utilizador\n"
-#~ "d <utilizador> <texto> - mensagem directa para o utilizador\n"
-#~ "get <utilizador> - receber última nota do utilizador\n"
-#~ "whois <utilizador> - receber perfil do utilizador\n"
-#~ "lose <utilizador> - obrigar o utilizador a deixar de subscrevê-lo\n"
-#~ "fav <utilizador> - adicionar última nota do utilizador às favoritas\n"
-#~ "fav #<id_da_nota> - adicionar nota com esta identificação às favoritas\n"
-#~ "repeat #<id_da_nota> - repetir uma nota com uma certa identificação\n"
-#~ "repeat <utilizador> - repetir a última nota do utilizador\n"
-#~ "reply #<id_da_nota> - responder à nota com esta identificação\n"
-#~ "reply <utilizador> - responder à última nota do utilizador\n"
-#~ "join <grupo> - juntar-se ao grupo\n"
-#~ "login - Receber uma ligação para iniciar sessão na interface web\n"
-#~ "drop <grupo> - afastar-se do grupo\n"
-#~ "stats - receber as suas estatísticas\n"
-#~ "stop - o mesmo que 'off'\n"
-#~ "quit - o mesmo que 'off'\n"
-#~ "sub <utilizador> - o mesmo que 'follow'\n"
-#~ "unsub <utilizador> - o mesmo que 'leave'\n"
-#~ "last <utilizador> - o mesmo que 'get'\n"
-#~ "on <utilizador> - ainda não implementado.\n"
-#~ "off <utilizador> - ainda não implementado.\n"
-#~ "nudge <utilizador> - relembrar um utilizador para actualizar.\n"
-#~ "invite <número de telefone> - ainda não implementado.\n"
-#~ "track <palavra> - ainda não implementado.\n"
-#~ "untrack <palavra> - ainda não implementado.\n"
-#~ "track off - ainda não implementado.\n"
-#~ "untrack all - ainda não implementado.\n"
-#~ "tracks - ainda não implementado.\n"
-#~ "tracking - ainda não implementado.\n"
-
-#~ msgid "Edit Avatar"
-#~ msgstr "Editar Avatar"
+#~ msgid "Invalid tag: \"%s\""
+#~ msgstr "Categoria inválida: \"%s\""
diff --git a/locale/pt_BR/LC_MESSAGES/statusnet.po b/locale/pt_BR/LC_MESSAGES/statusnet.po
index fc2eacbe50..783aea3641 100644
--- a/locale/pt_BR/LC_MESSAGES/statusnet.po
+++ b/locale/pt_BR/LC_MESSAGES/statusnet.po
@@ -15,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-17 09:47+0000\n"
-"PO-Revision-Date: 2011-03-17 09:49:54+0000\n"
+"POT-Creation-Date: 2011-03-17 12:35+0000\n"
+"PO-Revision-Date: 2011-03-17 12:38:17+0000\n"
 "Language-Team: Brazilian Portuguese <http://translatewiki.net/wiki/Portal:pt-"
 "br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -26,7 +26,7 @@ msgstr ""
 "X-Language-Code: pt-br\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-POT-Import-Date: 2011-03-11 18:52:41+0000\n"
+"X-POT-Import-Date: 2011-03-17 10:19:27+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -3959,6 +3959,8 @@ msgstr "O nome do idioma é muito extenso (máx. 50 caracteres)."
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
+#. TRANS: Form validation error when entering an invalid tag.
+#. TRANS: %s is the invalid tag.
 #, fuzzy, php-format
 msgid "Invalid tag: \"%s\"."
 msgstr "Etiqueta inválida: \"%s\""
@@ -4830,7 +4832,6 @@ msgstr "Mensagem de %1$s no %2$s"
 msgid "Notice deleted."
 msgstr "A mensagem excluída."
 
-#, fuzzy
 msgid "Notice"
 msgstr "Mensagens"
 
@@ -5375,17 +5376,14 @@ msgstr "Perfil do usuário"
 msgid "Tag user"
 msgstr "Etiquetar o usuário"
 
+#, fuzzy
 msgid ""
-"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
-"separated"
+"Tags for this user (letters, numbers, -, ., and _), separated by commas or "
+"spaces."
 msgstr ""
 "Etiquetas para este usuário (letras, números, -, ., e _), separadas por "
 "vírgulas ou espaços"
 
-#, php-format
-msgid "Invalid tag: \"%s\""
-msgstr "Etiqueta inválida: \"%s\""
-
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr "Você só pode etiquetar pessoas às quais assina ou que assinam você."
@@ -8405,88 +8403,5 @@ msgstr ""
 msgid "Getting backup from file '%s'."
 msgstr ""
 
-#~ msgid "Note"
-#~ msgstr "Mensagem"
-
-#~ msgid ""
-#~ "Commands:\n"
-#~ "on - turn on notifications\n"
-#~ "off - turn off notifications\n"
-#~ "help - show this help\n"
-#~ "follow <nickname> - subscribe to user\n"
-#~ "groups - lists the groups you have joined\n"
-#~ "subscriptions - list the people you follow\n"
-#~ "subscribers - list the people that follow you\n"
-#~ "leave <nickname> - unsubscribe from user\n"
-#~ "d <nickname> <text> - direct message to user\n"
-#~ "get <nickname> - get last notice from user\n"
-#~ "whois <nickname> - get profile info on user\n"
-#~ "lose <nickname> - force user to stop following you\n"
-#~ "fav <nickname> - add user's last notice as a 'fave'\n"
-#~ "fav #<notice_id> - add notice with the given id as a 'fave'\n"
-#~ "repeat #<notice_id> - repeat a notice with a given id\n"
-#~ "repeat <nickname> - repeat the last notice from user\n"
-#~ "reply #<notice_id> - reply to notice with a given id\n"
-#~ "reply <nickname> - reply to the last notice from user\n"
-#~ "join <group> - join group\n"
-#~ "login - Get a link to login to the web interface\n"
-#~ "drop <group> - leave group\n"
-#~ "stats - get your stats\n"
-#~ "stop - same as 'off'\n"
-#~ "quit - same as 'off'\n"
-#~ "sub <nickname> - same as 'follow'\n"
-#~ "unsub <nickname> - same as 'leave'\n"
-#~ "last <nickname> - same as 'get'\n"
-#~ "on <nickname> - not yet implemented.\n"
-#~ "off <nickname> - not yet implemented.\n"
-#~ "nudge <nickname> - remind a user to update.\n"
-#~ "invite <phone number> - not yet implemented.\n"
-#~ "track <word> - not yet implemented.\n"
-#~ "untrack <word> - not yet implemented.\n"
-#~ "track off - not yet implemented.\n"
-#~ "untrack all - not yet implemented.\n"
-#~ "tracks - not yet implemented.\n"
-#~ "tracking - not yet implemented.\n"
-#~ msgstr ""
-#~ "Comandos:\n"
-#~ "on - ativa as notificações\n"
-#~ "off - desativa as notificações\n"
-#~ "help - exibe esta ajuda\n"
-#~ "follow <identificação> - assina o usuário\n"
-#~ "groups - lista os grupos aos quais você se associou\n"
-#~ "subscriptions - lista as pessoas que você segue\n"
-#~ "subscribers - lista as pessoas que seguem você\n"
-#~ "leave <identificação> - deixa de assinar o usuário\n"
-#~ "d <identificação> <texto> - mensagem direta para o usuário\n"
-#~ "get <identificação> - obtém a última mensagem do usuário\n"
-#~ "whois <identificação> - obtém as informações do perfil do usuário\n"
-#~ "lose <identificação> - obriga o usuário a deixar de segui-lo\n"
-#~ "fav <identificação> - adiciona a último mensagem do usuário como uma "
-#~ "'favorita'\n"
-#~ "fav #<id_da_mensagem> - adiciona a mensagem identificada como 'favorita'\n"
-#~ "repeat #<id_da_mensagem> - repete a mensagem identificada\n"
-#~ "repeat <identificação> - repete a última mensagem do usuário\n"
-#~ "reply #<id_da_mensagem> - responde a mensagem identificada\n"
-#~ "reply <identificação> - responde a última mensagem do usuário\n"
-#~ "join <grupo> - associa-se ao grupo\n"
-#~ "login - obtém um link para se autenticar na interface web\n"
-#~ "drop <grupo> - deixa o grupo\n"
-#~ "stats - obtém suas estatísticas\n"
-#~ "stop - o mesmo que 'off'\n"
-#~ "quit - o mesmo que 'off'\n"
-#~ "sub <identificação> - o mesmo que 'follow'\n"
-#~ "unsub <identificação> - o mesmo que 'leave'\n"
-#~ "last <identificação> - o mesmo que 'get'\n"
-#~ "on <identificação> - não implementado ainda\n"
-#~ "off <identificação> - não implementado ainda\n"
-#~ "nudge <identificação> - chama a atenção do usuário\n"
-#~ "invite <número_de_ telefone> - não implementado ainda\n"
-#~ "track <palavra> - não implementado ainda\n"
-#~ "untrack <palavra> - não implementado ainda\n"
-#~ "track off -  não implementado ainda\n"
-#~ "untrack all -  não implementado ainda\n"
-#~ "tracks -  não implementado ainda\n"
-#~ "tracking -  não implementado ainda\n"
-
-#~ msgid "Edit Avatar"
-#~ msgstr "Editar o avatar"
+#~ msgid "Invalid tag: \"%s\""
+#~ msgstr "Etiqueta inválida: \"%s\""
diff --git a/locale/ru/LC_MESSAGES/statusnet.po b/locale/ru/LC_MESSAGES/statusnet.po
index 115aad39de..53039bd47d 100644
--- a/locale/ru/LC_MESSAGES/statusnet.po
+++ b/locale/ru/LC_MESSAGES/statusnet.po
@@ -18,8 +18,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-17 09:47+0000\n"
-"PO-Revision-Date: 2011-03-17 09:49:55+0000\n"
+"POT-Creation-Date: 2011-03-17 12:35+0000\n"
+"PO-Revision-Date: 2011-03-17 12:38:18+0000\n"
 "Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -29,7 +29,7 @@ msgstr ""
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
-"X-POT-Import-Date: 2011-03-11 18:52:41+0000\n"
+"X-POT-Import-Date: 2011-03-17 10:19:27+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -1141,42 +1141,38 @@ msgid "No such group."
 msgstr "Нет такой группы."
 
 #. TRANS: Client exception thrown when trying to show membership of a non-subscribed group
-#, fuzzy
 msgid "Not a member."
-msgstr "Все участники"
+msgstr "Не является участником."
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
-#, fuzzy
 msgid "Cannot delete someone else's membership."
-msgstr "Невозможно удалить подписку на самого себя."
+msgstr "Не удаётся удалить членство другого пользователя."
 
 #. TRANS: Client exception thrown when trying to display a subscription for a non-existing profile ID.
 #. TRANS: %d is the non-existing profile ID number.
-#, fuzzy, php-format
+#, php-format
 msgid "No such profile id: %d."
-msgstr "Нет такого профиля."
+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.
-#, fuzzy, php-format
+#, php-format
 msgid "Profile %1$d not subscribed to profile %2$d."
-msgstr "Вы не подписаны на этот профиль."
+msgstr "Профиль %1$d не подписан на профиль %2$d."
 
 #. TRANS: Client exception thrown when trying to delete a subscription of another user.
-#, fuzzy
 msgid "Cannot delete someone else's subscription."
-msgstr "Невозможно удалить подписку на самого себя."
+msgstr "Невозможно удалить подписку у другого пользователя."
 
 #. TRANS: Subtitle for Atom subscription feed.
 #. TRANS: %1$s is a user nickname, %s$s is the StatusNet sitename.
-#, fuzzy, php-format
+#, php-format
 msgid "People %1$s has subscribed to on %2$s"
-msgstr "Люди подписанные на %s"
+msgstr "%1$s подписаны на %2$s"
 
 #. TRANS: Client error displayed when not using the follow verb.
-#, fuzzy
 msgid "Can only handle Follow activities."
-msgstr "Возможна обработка только POST-запросов."
+msgstr "Возможна обработка только Follow-запросов."
 
 #. TRANS: Client exception thrown when subscribing to an object that is not a person.
 msgid "Can only follow people."
@@ -1184,15 +1180,15 @@ msgstr "Можно следить только за людьми."
 
 #. TRANS: Client exception thrown when subscribing to a non-existing profile.
 #. TRANS: %s is the unknown profile ID.
-#, fuzzy, php-format
+#, php-format
 msgid "Unknown profile %s."
-msgstr "Неподдерживаемый тип файла"
+msgstr "Неизвестный профиль %s."
 
 #. TRANS: Client error displayed trying to subscribe to an already subscribed profile.
 #. TRANS: %s is the profile the user already has a subscription on.
-#, fuzzy, php-format
+#, php-format
 msgid "Already subscribed to %s."
-msgstr "Уже подписаны!"
+msgstr "Подписка на %s уже существует."
 
 #. TRANS: Client error displayed trying to get a non-existing attachment.
 msgid "No such attachment."
@@ -1277,9 +1273,8 @@ msgid "No file uploaded."
 msgstr "Файл не загружен."
 
 #. TRANS: Avatar upload form instruction after uploading a file.
-#, fuzzy
 msgid "Pick a square area of the image to be your avatar."
-msgstr "Подберите нужный квадратный участок для вашей аватары"
+msgstr "Отметьте квадратный участок на изображении для вашей аватары."
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
 #. TRANS: Server error displayed trying to crop an uploaded group logo that is no longer present.
@@ -1304,13 +1299,14 @@ msgid "Backup account"
 msgstr "Резервное копирование учетной записи"
 
 #. TRANS: Client exception thrown when trying to backup an account while not logged in.
-#, fuzzy
 msgid "Only logged-in users can backup their account."
-msgstr "Повторять записи могут только вошедшие пользователи."
+msgstr ""
+"Создавать резервную копию своей учётной записи могут только вошедшие "
+"пользователи."
 
 #. TRANS: Client exception thrown when trying to backup an account without having backup rights.
 msgid "You may not backup your account."
-msgstr ""
+msgstr "В не можете создавать резервную копию своей учётной записи."
 
 #. TRANS: Information displayed on the backup account page.
 msgid ""
@@ -1320,17 +1316,21 @@ msgid ""
 "addresses is not backed up. Additionally, uploaded files and direct messages "
 "are not backed up."
 msgstr ""
+"Вы можете создать резервную копию данных вышей учётной записи в формате <a "
+"href=\"http://activitystrea.ms/\">Activity Streams</a>. Эта возможность "
+"является экспериментальной и результат копирования не будет полным; личные "
+"данные, такие как email или IM-адрес не войдут в резервную копию. К тому же, "
+"прикрепленные к вашим сообщениям файлы и прямые сообщения также не войдут в "
+"резервную копию."
 
 #. TRANS: Submit button to backup an account on the backup account page.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Backup"
 msgstr "Создать резервную копию"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
-#, fuzzy
 msgid "Backup your account."
-msgstr "Резервное копирование учетной записи"
+msgstr "Создать резервную копию вашей учётной записи."
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
 msgid "You already blocked that user."
@@ -1363,9 +1363,8 @@ msgid "No"
 msgstr "Нет"
 
 #. TRANS: Submit button title for 'No' when blocking a user.
-#, fuzzy
 msgid "Do not block this user."
-msgstr "Не блокировать этого пользователя"
+msgstr "Не блокировать этого пользователя."
 
 #. TRANS: Button label on the user block form.
 #. TRANS: Button label on the delete application form.
@@ -1378,9 +1377,8 @@ msgid "Yes"
 msgstr "Да"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#, fuzzy
 msgid "Block this user."
-msgstr "Заблокировать пользователя."
+msgstr "Заблокировать этого пользователя."
 
 #. TRANS: Server error displayed when blocking a user fails.
 msgid "Failed to save block information."
@@ -1446,13 +1444,12 @@ msgstr "Этот адрес уже подтверждён."
 msgid "Couldn't update user."
 msgstr "Не удаётся обновить пользователя."
 
-#, fuzzy
 msgid "Couldn't update user im preferences."
-msgstr "Не удаётся обновить пользовательскую запись."
+msgstr "Не удаётся обновить настройки сервиса мгновенных сообщений."
 
-#, fuzzy
 msgid "Couldn't insert user im preferences."
-msgstr "Не удаётся вставить новую подписку."
+msgstr ""
+"Не удаётся поместить настройки сервиса мгновенных сообщений в базу данных."
 
 #. TRANS: Server error displayed when an address confirmation code deletion from the
 #. TRANS: database fails in the contact address confirmation action.
@@ -1479,14 +1476,14 @@ msgid "Notices"
 msgstr "Записи"
 
 #. TRANS: Client exception displayed trying to delete a user account while not logged in.
-#, fuzzy
 msgid "Only logged-in users can delete their account."
-msgstr "Повторять записи могут только вошедшие пользователи."
+msgstr ""
+"Только пользователи, находящиеся в системе, могут удалить свою учётную "
+"запись."
 
 #. TRANS: Client exception displayed trying to delete a user account without have the rights to do that.
-#, fuzzy
 msgid "You cannot delete your account."
-msgstr "Вы не можете удалять пользователей."
+msgstr "Вы не можете удалить свою учётную запись."
 
 #. TRANS: Confirmation text for user deletion. The user has to type this exactly the same, including punctuation.
 msgid "I am sure."
@@ -1496,24 +1493,24 @@ msgstr "Я уверен."
 #. TRANS: %s is the text that needs to be input.
 #, php-format
 msgid "You must write \"%s\" exactly in the box."
-msgstr ""
+msgstr "Вы должны написать «%s» прямо в этом поле."
 
 #. TRANS: Confirmation that a user account has been deleted.
-#, fuzzy
 msgid "Account deleted."
-msgstr "Аватар удалён."
+msgstr "Учётная запись удалена."
 
 #. TRANS: Page title for page on which a user account can be deleted.
 #. TRANS: Option in profile settings to delete the account of the currently logged in user.
-#, fuzzy
 msgid "Delete account"
-msgstr "Создать новый аккаунт"
+msgstr "Удаление учётной записи"
 
 #. TRANS: Form text for user deletion form.
 msgid ""
 "This will <strong>permanently delete</strong> your account data from this "
 "server."
 msgstr ""
+"Это действие приведёт <strong>удалению</strong> всех данных вашей учётной "
+"записи с этого сервера <strong>без возможности восстановления</strong>."
 
 #. TRANS: Additional form text for user deletion form shown if a user has account backup rights.
 #. TRANS: %s is a URL to the backup page.
@@ -1522,6 +1519,8 @@ msgid ""
 "You are strongly advised to <a href=\"%s\">back up your data</a> before "
 "deletion."
 msgstr ""
+"Настоятельно советуем вам <a href=\"%s\">сделать резервную копию</a> данных "
+"вашей учётной записи, прежде чем удалять её с сервера."
 
 #. TRANS: Field label for delete account confirmation entry.
 #. TRANS: Field label for password reset form where the password has to be typed again.
@@ -1530,14 +1529,14 @@ msgstr "Подтверждение"
 
 #. TRANS: Input title for the delete account field.
 #. TRANS: %s is the text that needs to be input.
-#, fuzzy, php-format
+#, php-format
 msgid "Enter \"%s\" to confirm that you want to delete your account."
-msgstr "Вы не можете удалять пользователей."
+msgstr ""
+"Введите «%s» для подтверждения своего согласия на удаление учётной записи."
 
 #. TRANS: Button title for user account deletion.
-#, fuzzy
 msgid "Permanently delete your account"
-msgstr "Вы не можете удалять пользователей."
+msgstr "Навсегда удалить учётную запись"
 
 #. TRANS: Client error displayed trying to delete an application while not logged in.
 msgid "You must be logged in to delete an application."
@@ -1572,14 +1571,12 @@ msgstr ""
 "пользователей."
 
 #. TRANS: Submit button title for 'No' when deleting an application.
-#, fuzzy
 msgid "Do not delete this application."
-msgstr "Не удаляйте это приложение"
+msgstr "Не удалять это приложение."
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
-#, fuzzy
 msgid "Delete this application."
-msgstr "Удалить это приложение"
+msgstr "Удалить это приложение."
 
 #. TRANS: Client error when trying to delete group while not logged in.
 msgid "You must be logged in to delete a group."
@@ -1623,14 +1620,12 @@ msgstr ""
 "записи в этой группе по прежнему останутся в личных лентах."
 
 #. TRANS: Submit button title for 'No' when deleting a group.
-#, fuzzy
 msgid "Do not delete this group."
-msgstr "Не удаляйте эту группу"
+msgstr "Не удалять эту группу."
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
-#, fuzzy
 msgid "Delete this group."
-msgstr "Удалить эту группу"
+msgstr "Удалить эту группу."
 
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
 #. TRANS: Client error displayed when trying to remove a favorite while not logged in.
@@ -1668,14 +1663,12 @@ msgid "Are you sure you want to delete this notice?"
 msgstr "Вы уверены, что хотите удалить эту запись?"
 
 #. TRANS: Submit button title for 'No' when deleting a notice.
-#, fuzzy
 msgid "Do not delete this notice."
-msgstr "Не удалять эту запись"
+msgstr "Не удалять эту запись."
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#, fuzzy
 msgid "Delete this notice."
-msgstr "Удалить эту запись"
+msgstr "Удалить эту запись."
 
 #. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
 msgid "You cannot delete users."
@@ -1686,10 +1679,9 @@ msgid "You can only delete local users."
 msgstr "Вы можете удалять только внутренних пользователей."
 
 #. TRANS: Title of delete user page.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Delete user"
-msgstr "Удалить пользователя"
+msgstr "Удаление пользователя"
 
 #. TRANS: Fieldset legend on delete user page.
 msgid "Delete user"
@@ -1704,14 +1696,12 @@ msgstr ""
 "всех данных о пользователе из базы данных без возможности восстановления."
 
 #. TRANS: Submit button title for 'No' when deleting a user.
-#, fuzzy
 msgid "Do not delete this user."
-msgstr "Не удаляйте эту группу"
+msgstr "Не удалять этого пользователя."
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
-#, fuzzy
 msgid "Delete this user."
-msgstr "Удалить этого пользователя"
+msgstr "Удалить этого пользователя."
 
 #. TRANS: Message used as title for design settings for the site.
 msgid "Design"
@@ -1806,9 +1796,8 @@ msgid "Tile background image"
 msgstr "Растянуть фоновое изображение"
 
 #. TRANS: Fieldset legend for theme colors.
-#, fuzzy
 msgid "Change colors"
-msgstr "Изменение цветовой гаммы"
+msgstr "Изменение цвета"
 
 #. TRANS: Field label for content color selector.
 #. TRANS: Label on profile design page for setting a profile page content colour.
@@ -1839,25 +1828,21 @@ msgid "Custom CSS"
 msgstr "Особый CSS"
 
 #. TRANS: Button text for resetting theme settings.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Use defaults"
 msgstr "Использовать значения по умолчанию"
 
 #. TRANS: Title for button for resetting theme settings.
-#, fuzzy
 msgid "Restore default designs."
-msgstr "Восстановить оформление по умолчанию"
+msgstr "Восстановить оформление по умолчанию."
 
 #. TRANS: Title for button for resetting theme settings.
-#, fuzzy
 msgid "Reset back to default."
-msgstr "Восстановить значения по умолчанию"
+msgstr "Восстановить значения по умолчанию."
 
 #. TRANS: Title for button for saving theme settings.
-#, fuzzy
 msgid "Save design."
-msgstr "Сохранить оформление"
+msgstr "Сохранить оформление."
 
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
 msgid "This notice is not a favorite!"
@@ -1869,9 +1854,9 @@ msgstr "Добавить в любимые"
 
 #. TRANS: Client exception thrown when requesting a document from the documentation that does not exist.
 #. TRANS: %s is the non-existing document.
-#, fuzzy, php-format
+#, php-format
 msgid "No such document \"%s\"."
-msgstr "Нет такого документа «%s»"
+msgstr "Нет такого документа «%s»."
 
 #. TRANS: Title for "Edit application" form.
 #. TRANS: Form legend.
@@ -2051,6 +2036,8 @@ msgid ""
 "To send notices via email, we need to create a unique email address for you "
 "on this server:"
 msgstr ""
+"Для отправки сообщений по электронной почте мы должны создать для вас "
+"уникальный email-адрес на этом сервере:"
 
 #. TRANS: Button label for adding an e-mail address to send notices from.
 #. TRANS: Button label for adding an SMS e-mail address to send notices from.
@@ -2817,9 +2804,9 @@ msgstr[2] ""
 #. TRANS: e-mail addresses to which invitations were sent.
 msgid "Invitation sent to the following person:"
 msgid_plural "Invitations sent to the following people:"
-msgstr[0] "Приглашение отправлено следующему адресату:"
-msgstr[1] "Приглашения отправлены следующим адресатам:"
-msgstr[2] ""
+msgstr[0] "Список адресов, на которые отправлены приглашения:"
+msgstr[1] "Список адресов, на которые отправлены приглашения:"
+msgstr[2] "Список адресов, на которые отправлены приглашения:"
 
 #. TRANS: Generic message displayed after sending out one or more invitations to
 #. TRANS: people to join a StatusNet site.
@@ -3959,6 +3946,8 @@ msgstr "Слишком длинный язык (максимум 50 символ
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
+#. TRANS: Form validation error when entering an invalid tag.
+#. TRANS: %s is the invalid tag.
 #, fuzzy, php-format
 msgid "Invalid tag: \"%s\"."
 msgstr "Неверный тег: «%s»"
@@ -4822,7 +4811,6 @@ msgstr "Сообщение от %1$s на %2$s"
 msgid "Notice deleted."
 msgstr "Запись удалена."
 
-#, fuzzy
 msgid "Notice"
 msgstr "Записи"
 
@@ -5371,17 +5359,14 @@ msgstr "Профиль пользователя"
 msgid "Tag user"
 msgstr "Теги для пользователя"
 
+#, fuzzy
 msgid ""
-"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
-"separated"
+"Tags for this user (letters, numbers, -, ., and _), separated by commas or "
+"spaces."
 msgstr ""
 "Теги для этого пользователя (буквы, цифры, -, ., и _), разделённые запятой "
 "или пробелом"
 
-#, php-format
-msgid "Invalid tag: \"%s\""
-msgstr "Неверный тег: «%s»"
-
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
@@ -8410,87 +8395,5 @@ msgstr "Неверный XML, отсутствует корень XRD."
 msgid "Getting backup from file '%s'."
 msgstr "Получение резервной копии из файла «%s»."
 
-#~ msgid "Note"
-#~ msgstr "Запись"
-
-#~ msgid ""
-#~ "Commands:\n"
-#~ "on - turn on notifications\n"
-#~ "off - turn off notifications\n"
-#~ "help - show this help\n"
-#~ "follow <nickname> - subscribe to user\n"
-#~ "groups - lists the groups you have joined\n"
-#~ "subscriptions - list the people you follow\n"
-#~ "subscribers - list the people that follow you\n"
-#~ "leave <nickname> - unsubscribe from user\n"
-#~ "d <nickname> <text> - direct message to user\n"
-#~ "get <nickname> - get last notice from user\n"
-#~ "whois <nickname> - get profile info on user\n"
-#~ "lose <nickname> - force user to stop following you\n"
-#~ "fav <nickname> - add user's last notice as a 'fave'\n"
-#~ "fav #<notice_id> - add notice with the given id as a 'fave'\n"
-#~ "repeat #<notice_id> - repeat a notice with a given id\n"
-#~ "repeat <nickname> - repeat the last notice from user\n"
-#~ "reply #<notice_id> - reply to notice with a given id\n"
-#~ "reply <nickname> - reply to the last notice from user\n"
-#~ "join <group> - join group\n"
-#~ "login - Get a link to login to the web interface\n"
-#~ "drop <group> - leave group\n"
-#~ "stats - get your stats\n"
-#~ "stop - same as 'off'\n"
-#~ "quit - same as 'off'\n"
-#~ "sub <nickname> - same as 'follow'\n"
-#~ "unsub <nickname> - same as 'leave'\n"
-#~ "last <nickname> - same as 'get'\n"
-#~ "on <nickname> - not yet implemented.\n"
-#~ "off <nickname> - not yet implemented.\n"
-#~ "nudge <nickname> - remind a user to update.\n"
-#~ "invite <phone number> - not yet implemented.\n"
-#~ "track <word> - not yet implemented.\n"
-#~ "untrack <word> - not yet implemented.\n"
-#~ "track off - not yet implemented.\n"
-#~ "untrack all - not yet implemented.\n"
-#~ "tracks - not yet implemented.\n"
-#~ "tracking - not yet implemented.\n"
-#~ msgstr ""
-#~ "Команды:\n"
-#~ "on — включить уведомления\n"
-#~ "off — отключить уведомления\n"
-#~ "help — показать эту справку\n"
-#~ "follow <nickname> — подписаться на пользователя\n"
-#~ "groups — список групп, к которым вы присоединены\n"
-#~ "subscriptions — список людей, за которыми вы следите\n"
-#~ "subscribers — список людей, следящих на вами\n"
-#~ "leave <nickname> — отписаться от пользователя\n"
-#~ "d <nickname> <text> — прямое сообщение пользователю\n"
-#~ "get <nickname> — получить последнюю запись от пользователя\n"
-#~ "whois <nickname> — получить информацию из профиля пользователя\n"
-#~ "lose <nickname> — отменить подписку пользователя на вас\n"
-#~ "fav <nickname> — добавить последнюю запись пользователя в число любимых\n"
-#~ "fav #<notice_id> — добавить запись с заданным id в число любимых\n"
-#~ "repeat #<notice_id> — повторить уведомление с заданным id\n"
-#~ "repeat <nickname> — повторить последнее уведомление от пользователя\n"
-#~ "reply #<notice_id> — ответить на запись с заданным id\n"
-#~ "reply <nickname> — ответить на последнюю запись пользователя\n"
-#~ "join <group> — присоединиться к группе\n"
-#~ "login — получить ссылку на вход в веб-интрефейсе\n"
-#~ "drop <group> — покинуть группу\n"
-#~ "stats — получить свою статистику\n"
-#~ "stop — то же, что и 'off'\n"
-#~ "quit — то же, что и 'off'\n"
-#~ "sub <nickname> — то же, что и 'follow'\n"
-#~ "unsub <nickname> — то же, что и 'leave'\n"
-#~ "last <nickname> — то же, что и 'get'\n"
-#~ "on <nickname> — пока не реализовано.\n"
-#~ "off <nickname> — пока не реализовано.\n"
-#~ "nudge <nickname> — напомнить пользователю обновиться.\n"
-#~ "invite <phone number> — пока не реализовано.\n"
-#~ "track <word> — пока не реализовано.\n"
-#~ "untrack <word> — пока не реализовано.\n"
-#~ "track off — пока не реализовано.\n"
-#~ "untrack all — пока не реализовано.\n"
-#~ "tracks — пока не реализовано.\n"
-#~ "tracking — пока не реализовано.\n"
-
-#~ msgid "Edit Avatar"
-#~ msgstr "Изменить аватару"
+#~ msgid "Invalid tag: \"%s\""
+#~ msgstr "Неверный тег: «%s»"
diff --git a/locale/statusnet.pot b/locale/statusnet.pot
index ad93b2765c..79467b6c30 100644
--- a/locale/statusnet.pot
+++ b/locale/statusnet.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-17 09:47+0000\n"
+"POT-Creation-Date: 2011-03-17 12:35+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -88,9 +88,9 @@ msgstr ""
 #: actions/licenseadminpanel.php:335 actions/pathsadminpanel.php:517
 #: actions/profilesettings.php:198 actions/sitenoticeadminpanel.php:197
 #: actions/smssettings.php:204 actions/subscriptions.php:261
-#: actions/urlsettings.php:152 actions/useradminpanel.php:298
-#: lib/applicationeditform.php:355 lib/designform.php:320
-#: lib/groupeditform.php:201
+#: actions/tagother.php:134 actions/urlsettings.php:152
+#: actions/useradminpanel.php:298 lib/applicationeditform.php:355
+#: lib/designform.php:320 lib/groupeditform.php:201
 msgctxt "BUTTON"
 msgid "Save"
 msgstr ""
@@ -857,7 +857,7 @@ msgstr ""
 #: actions/profilesettings.php:218 actions/recoverpassword.php:387
 #: actions/register.php:157 actions/remotesubscribe.php:76
 #: actions/repeat.php:82 actions/smssettings.php:249 actions/subedit.php:40
-#: actions/subscribe.php:87 actions/tagother.php:145
+#: actions/subscribe.php:87 actions/tagother.php:146
 #: actions/unsubscribe.php:69 actions/urlsettings.php:171
 #: actions/userauthorization.php:53 lib/designsettings.php:122
 msgid "There was a problem with your session token. Try again, please."
@@ -2005,7 +2005,7 @@ msgstr ""
 #: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:62 actions/newmessage.php:89 actions/newnotice.php:87
 #: actions/nudge.php:64 actions/pluginenable.php:98 actions/subedit.php:33
-#: actions/subscribe.php:98 actions/tagother.php:33 actions/unsubscribe.php:52
+#: actions/subscribe.php:98 actions/tagother.php:34 actions/unsubscribe.php:52
 #: lib/adminpanelaction.php:71 lib/profileformaction.php:63
 #: lib/settingsaction.php:72
 msgid "Not logged in."
@@ -2819,7 +2819,7 @@ msgstr ""
 #. TRANS: Client error displayed trying a change a subscription for a non-existant profile ID.
 #. TRANS: Client error displayed when trying to change user options without specifying an existing user to work on.
 #: actions/groupblock.php:77 actions/groupunblock.php:77
-#: actions/makeadmin.php:79 actions/subedit.php:57 actions/tagother.php:46
+#: actions/makeadmin.php:79 actions/subedit.php:57 actions/tagother.php:47
 #: actions/unsubscribe.php:84 lib/profileformaction.php:87
 msgid "No profile with that ID."
 msgstr ""
@@ -4549,8 +4549,8 @@ msgid "Share my current location when posting notices"
 msgstr ""
 
 #. TRANS: Field label in form for profile settings.
-#: actions/profilesettings.php:162 actions/tagother.php:128
-#: actions/tagother.php:188 lib/subscriptionlist.php:104
+#: actions/profilesettings.php:162 actions/tagother.php:129
+#: actions/tagother.php:191 lib/subscriptionlist.php:104
 #: lib/subscriptionlist.php:106
 msgid "Tags"
 msgstr ""
@@ -4610,7 +4610,9 @@ msgstr ""
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:292
+#. TRANS: Form validation error when entering an invalid tag.
+#. TRANS: %s is the invalid tag.
+#: actions/profilesettings.php:292 actions/tagother.php:160
 #, php-format
 msgid "Invalid tag: \"%s\"."
 msgstr ""
@@ -4627,7 +4629,7 @@ msgid "Could not save location prefs."
 msgstr ""
 
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:428 actions/tagother.php:179
+#: actions/profilesettings.php:428 actions/tagother.php:182
 msgid "Could not save tags."
 msgstr ""
 
@@ -5312,8 +5314,7 @@ msgstr ""
 
 #. TRANS: Submit button title.
 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/snapshotadminpanel.php:245 actions/tagother.php:133
-#: lib/applicationeditform.php:357
+#: actions/snapshotadminpanel.php:245 lib/applicationeditform.php:357
 msgid "Save"
 msgstr ""
 
@@ -6163,40 +6164,35 @@ msgstr ""
 msgid "Notice feed for tag %s (Atom)"
 msgstr ""
 
-#: actions/tagother.php:39
+#: actions/tagother.php:40
 msgid "No ID argument."
 msgstr ""
 
-#: actions/tagother.php:65
+#: actions/tagother.php:66
 #, php-format
 msgid "Tag %s"
 msgstr ""
 
-#: actions/tagother.php:77
+#: actions/tagother.php:78
 msgid "User profile"
 msgstr ""
 
-#: actions/tagother.php:120
+#: actions/tagother.php:121
 msgid "Tag user"
 msgstr ""
 
-#: actions/tagother.php:130
+#: actions/tagother.php:131
 msgid ""
-"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
-"separated"
+"Tags for this user (letters, numbers, -, ., and _), separated by commas or "
+"spaces."
 msgstr ""
 
-#: actions/tagother.php:157
-#, php-format
-msgid "Invalid tag: \"%s\""
-msgstr ""
-
-#: actions/tagother.php:172
+#: actions/tagother.php:175
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 
-#: actions/tagother.php:215
+#: actions/tagother.php:218
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
 
diff --git a/locale/sv/LC_MESSAGES/statusnet.po b/locale/sv/LC_MESSAGES/statusnet.po
index 289b4b09f7..53c43b45df 100644
--- a/locale/sv/LC_MESSAGES/statusnet.po
+++ b/locale/sv/LC_MESSAGES/statusnet.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-17 09:47+0000\n"
-"PO-Revision-Date: 2011-03-17 09:49:57+0000\n"
+"POT-Creation-Date: 2011-03-17 12:35+0000\n"
+"PO-Revision-Date: 2011-03-17 12:38:20+0000\n"
 "Language-Team: Swedish <http://translatewiki.net/wiki/Portal:sv>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -23,7 +23,7 @@ msgstr ""
 "X-Language-Code: sv\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-03-11 18:52:41+0000\n"
+"X-POT-Import-Date: 2011-03-17 10:19:27+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -3935,6 +3935,8 @@ msgstr "Språknamn är för långt (max 50 tecken)."
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
+#. TRANS: Form validation error when entering an invalid tag.
+#. TRANS: %s is the invalid tag.
 #, fuzzy, php-format
 msgid "Invalid tag: \"%s\"."
 msgstr "Ogiltig tagg: \"%s\""
@@ -4800,7 +4802,6 @@ msgstr "Meddelande från %1$s på %2$s"
 msgid "Notice deleted."
 msgstr "Notis borttagen."
 
-#, fuzzy
 msgid "Notice"
 msgstr "Notiser"
 
@@ -5344,17 +5345,14 @@ msgstr "Användarprofil"
 msgid "Tag user"
 msgstr "Tagga användare"
 
+#, fuzzy
 msgid ""
-"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
-"separated"
+"Tags for this user (letters, numbers, -, ., and _), separated by commas or "
+"spaces."
 msgstr ""
 "Taggar för denna användare (bokstäver, nummer, -, ., och _), separerade med "
 "kommatecken eller mellanslag"
 
-#, php-format
-msgid "Invalid tag: \"%s\""
-msgstr "Ogiltig tagg: \"%s\""
-
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
@@ -8352,87 +8350,5 @@ msgstr ""
 msgid "Getting backup from file '%s'."
 msgstr ""
 
-#~ msgid "Note"
-#~ msgstr "Notis"
-
-#~ msgid ""
-#~ "Commands:\n"
-#~ "on - turn on notifications\n"
-#~ "off - turn off notifications\n"
-#~ "help - show this help\n"
-#~ "follow <nickname> - subscribe to user\n"
-#~ "groups - lists the groups you have joined\n"
-#~ "subscriptions - list the people you follow\n"
-#~ "subscribers - list the people that follow you\n"
-#~ "leave <nickname> - unsubscribe from user\n"
-#~ "d <nickname> <text> - direct message to user\n"
-#~ "get <nickname> - get last notice from user\n"
-#~ "whois <nickname> - get profile info on user\n"
-#~ "lose <nickname> - force user to stop following you\n"
-#~ "fav <nickname> - add user's last notice as a 'fave'\n"
-#~ "fav #<notice_id> - add notice with the given id as a 'fave'\n"
-#~ "repeat #<notice_id> - repeat a notice with a given id\n"
-#~ "repeat <nickname> - repeat the last notice from user\n"
-#~ "reply #<notice_id> - reply to notice with a given id\n"
-#~ "reply <nickname> - reply to the last notice from user\n"
-#~ "join <group> - join group\n"
-#~ "login - Get a link to login to the web interface\n"
-#~ "drop <group> - leave group\n"
-#~ "stats - get your stats\n"
-#~ "stop - same as 'off'\n"
-#~ "quit - same as 'off'\n"
-#~ "sub <nickname> - same as 'follow'\n"
-#~ "unsub <nickname> - same as 'leave'\n"
-#~ "last <nickname> - same as 'get'\n"
-#~ "on <nickname> - not yet implemented.\n"
-#~ "off <nickname> - not yet implemented.\n"
-#~ "nudge <nickname> - remind a user to update.\n"
-#~ "invite <phone number> - not yet implemented.\n"
-#~ "track <word> - not yet implemented.\n"
-#~ "untrack <word> - not yet implemented.\n"
-#~ "track off - not yet implemented.\n"
-#~ "untrack all - not yet implemented.\n"
-#~ "tracks - not yet implemented.\n"
-#~ "tracking - not yet implemented.\n"
-#~ msgstr ""
-#~ "Kommandon:\n"
-#~ "on - sätt på notifikationer\n"
-#~ "off - stäng av notifikationer\n"
-#~ "help - visa denna hjälp\n"
-#~ "follow <smeknamn> - prenumerera på användare\n"
-#~ "groups - lista grupperna du tillhör\n"
-#~ "subscriptions - lista personerna du följer\n"
-#~ "subscribers - lista personerna som följer dig\n"
-#~ "leave <smeknamn> - avsluta prenumeration på användare\n"
-#~ "d <smeknamn> <text> - direktmeddelande till användare\n"
-#~ "get <smeknamn> - hämta senaste notis från användare\n"
-#~ "whois <smeknamn> - hämta profilinformation om användare\n"
-#~ "lose <smeknamn> - tvinga användare att sluta följa dig\n"
-#~ "fav <smeknamn> - lägg till användarens senaste notis som favorit\n"
-#~ "fav #<notisid> - lägg till notis med given id som favorit\n"
-#~ "repeat #<notisid> - upprepa en notis med en given id\n"
-#~ "repeat <smeknamn> - upprepa den senaste notisen från användare\n"
-#~ "reply #<notisid> - svara på notis med en given id\n"
-#~ "reply <smeknamn> - svara på den senaste notisen från användare\n"
-#~ "join <grupp> - gå med i grupp\n"
-#~ "login - hämta en länk till webbgränssnittets inloggningssida\n"
-#~ "drop <grupp> - lämna grupp\n"
-#~ "stats - hämta din statistik\n"
-#~ "stop - samma som 'off'\n"
-#~ "quit - samma som 'off'\n"
-#~ "sub <smeknamn> - samma som 'follow'\n"
-#~ "unsub <smeknamn> - samma som 'leave'\n"
-#~ "last <smeknamn> - samma som 'get'\n"
-#~ "on <smeknamn> - inte implementerat än.\n"
-#~ "off <smeknamn> - inte implementerat än.\n"
-#~ "nudge <smeknamn> - påminn en användare om att uppdatera\n"
-#~ "invite <telefonnummer> - inte implementerat än.\n"
-#~ "track <ord> - inte implementerat än.\n"
-#~ "untrack <ord> - inte implementerat än.\n"
-#~ "track off - inte implementerat än.\n"
-#~ "untrack all - inte implementerat än.\n"
-#~ "tracks - inte implementerat än.\n"
-#~ "tracking - inte implementerat än.\n"
-
-#~ msgid "Edit Avatar"
-#~ msgstr "Redigera avatar"
+#~ msgid "Invalid tag: \"%s\""
+#~ msgstr "Ogiltig tagg: \"%s\""
diff --git a/locale/te/LC_MESSAGES/statusnet.po b/locale/te/LC_MESSAGES/statusnet.po
index afc3188748..afcf3d11f3 100644
--- a/locale/te/LC_MESSAGES/statusnet.po
+++ b/locale/te/LC_MESSAGES/statusnet.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-17 09:47+0000\n"
-"PO-Revision-Date: 2011-03-17 09:49:58+0000\n"
+"POT-Creation-Date: 2011-03-17 12:35+0000\n"
+"PO-Revision-Date: 2011-03-17 12:38:21+0000\n"
 "Language-Team: Telugu <http://translatewiki.net/wiki/Portal:te>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -20,7 +20,7 @@ msgstr ""
 "X-Language-Code: te\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-03-11 18:52:41+0000\n"
+"X-POT-Import-Date: 2011-03-17 10:19:27+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -3865,6 +3865,8 @@ msgstr "భాష మరీ పెద్దగా ఉంది (50 అక్ష
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
+#. TRANS: Form validation error when entering an invalid tag.
+#. TRANS: %s is the invalid tag.
 #, php-format
 msgid "Invalid tag: \"%s\"."
 msgstr "చెల్లని ట్యాగు: \"%s\""
@@ -5250,14 +5252,10 @@ msgid "Tag user"
 msgstr "ట్యాగులు"
 
 msgid ""
-"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
-"separated"
+"Tags for this user (letters, numbers, -, ., and _), separated by commas or "
+"spaces."
 msgstr ""
 
-#, php-format
-msgid "Invalid tag: \"%s\""
-msgstr "తప్పుడు మారుపేరు: \"%s\""
-
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
@@ -8206,8 +8204,5 @@ msgstr ""
 msgid "Getting backup from file '%s'."
 msgstr ""
 
-#~ msgid "Note"
-#~ msgstr "గమనిక"
-
-#~ msgid "Edit Avatar"
-#~ msgstr "అవతారాన్ని మార్చు"
+#~ msgid "Invalid tag: \"%s\""
+#~ msgstr "తప్పుడు మారుపేరు: \"%s\""
diff --git a/locale/tr/LC_MESSAGES/statusnet.po b/locale/tr/LC_MESSAGES/statusnet.po
index db1e94fb57..73b1ec1ece 100644
--- a/locale/tr/LC_MESSAGES/statusnet.po
+++ b/locale/tr/LC_MESSAGES/statusnet.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-17 09:47+0000\n"
-"PO-Revision-Date: 2011-03-17 09:49:59+0000\n"
+"POT-Creation-Date: 2011-03-17 12:35+0000\n"
+"PO-Revision-Date: 2011-03-17 12:38:22+0000\n"
 "Language-Team: Turkish <http://translatewiki.net/wiki/Portal:tr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -22,7 +22,7 @@ msgstr ""
 "X-Language-Code: tr\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-POT-Import-Date: 2011-03-11 18:52:41+0000\n"
+"X-POT-Import-Date: 2011-03-17 10:19:27+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -3916,6 +3916,8 @@ msgstr "Dil çok uzun (maksimum: 50 karakter)."
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
+#. TRANS: Form validation error when entering an invalid tag.
+#. TRANS: %s is the invalid tag.
 #, fuzzy, php-format
 msgid "Invalid tag: \"%s\"."
 msgstr "Geçersiz büyüklük."
@@ -5274,14 +5276,13 @@ msgstr "Kullanıcının profili yok."
 msgid "Tag user"
 msgstr "Kullanıcıyı etiketle"
 
+#, fuzzy
 msgid ""
-"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
-"separated"
+"Tags for this user (letters, numbers, -, ., and _), separated by commas or "
+"spaces."
 msgstr ""
-
-#, php-format
-msgid "Invalid tag: \"%s\""
-msgstr "Geçersiz büyüklük."
+"Kendiniz için etiketler (harf, sayı, -. ., ve _ kullanılabilir), virgül veya "
+"boşlukla ayırabilirsiniz"
 
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
@@ -8179,9 +8180,5 @@ msgstr ""
 msgid "Getting backup from file '%s'."
 msgstr ""
 
-#~ msgid "Note"
-#~ msgstr "Not"
-
-#, fuzzy
-#~ msgid "Edit Avatar"
-#~ msgstr "Avatar"
+#~ msgid "Invalid tag: \"%s\""
+#~ msgstr "Geçersiz büyüklük."
diff --git a/locale/uk/LC_MESSAGES/statusnet.po b/locale/uk/LC_MESSAGES/statusnet.po
index c4fe7648b3..b4e2b8bf22 100644
--- a/locale/uk/LC_MESSAGES/statusnet.po
+++ b/locale/uk/LC_MESSAGES/statusnet.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-17 09:47+0000\n"
-"PO-Revision-Date: 2011-03-17 09:50:00+0000\n"
+"POT-Creation-Date: 2011-03-17 12:35+0000\n"
+"PO-Revision-Date: 2011-03-17 12:38:23+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -23,7 +23,7 @@ msgstr ""
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
-"X-POT-Import-Date: 2011-03-11 18:52:41+0000\n"
+"X-POT-Import-Date: 2011-03-17 10:19:27+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -3887,6 +3887,8 @@ msgstr "Мова надто довга (не більше 50 символів)."
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
+#. TRANS: Form validation error when entering an invalid tag.
+#. TRANS: %s is the invalid tag.
 #, php-format
 msgid "Invalid tag: \"%s\"."
 msgstr "Неприпустимий теґ: «%s»."
@@ -4732,7 +4734,6 @@ msgstr "Повідомлення від %1$s на %2$s"
 msgid "Notice deleted."
 msgstr "Допис видалено."
 
-#, fuzzy
 msgid "Notice"
 msgstr "Дописи"
 
@@ -5275,17 +5276,14 @@ msgstr "Профіль користувача."
 msgid "Tag user"
 msgstr "Позначити користувача"
 
+#, fuzzy
 msgid ""
-"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
-"separated"
+"Tags for this user (letters, numbers, -, ., and _), separated by commas or "
+"spaces."
 msgstr ""
 "Позначити користувача теґами (літери, цифри, -, . та _), відокремлюючи кожен "
 "комою або пробілом"
 
-#, php-format
-msgid "Invalid tag: \"%s\""
-msgstr "Недійсний теґ: «%s»"
-
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
@@ -8290,84 +8288,5 @@ msgstr "Неправильний XML, корінь XRD відсутній."
 msgid "Getting backup from file '%s'."
 msgstr "Отримання резервної копії файлу «%s»."
 
-#~ msgid "Note"
-#~ msgstr "Зауваження"
-
-#~ msgid ""
-#~ "Commands:\n"
-#~ "on - turn on notifications\n"
-#~ "off - turn off notifications\n"
-#~ "help - show this help\n"
-#~ "follow <nickname> - subscribe to user\n"
-#~ "groups - lists the groups you have joined\n"
-#~ "subscriptions - list the people you follow\n"
-#~ "subscribers - list the people that follow you\n"
-#~ "leave <nickname> - unsubscribe from user\n"
-#~ "d <nickname> <text> - direct message to user\n"
-#~ "get <nickname> - get last notice from user\n"
-#~ "whois <nickname> - get profile info on user\n"
-#~ "lose <nickname> - force user to stop following you\n"
-#~ "fav <nickname> - add user's last notice as a 'fave'\n"
-#~ "fav #<notice_id> - add notice with the given id as a 'fave'\n"
-#~ "repeat #<notice_id> - repeat a notice with a given id\n"
-#~ "repeat <nickname> - repeat the last notice from user\n"
-#~ "reply #<notice_id> - reply to notice with a given id\n"
-#~ "reply <nickname> - reply to the last notice from user\n"
-#~ "join <group> - join group\n"
-#~ "login - Get a link to login to the web interface\n"
-#~ "drop <group> - leave group\n"
-#~ "stats - get your stats\n"
-#~ "stop - same as 'off'\n"
-#~ "quit - same as 'off'\n"
-#~ "sub <nickname> - same as 'follow'\n"
-#~ "unsub <nickname> - same as 'leave'\n"
-#~ "last <nickname> - same as 'get'\n"
-#~ "on <nickname> - not yet implemented.\n"
-#~ "off <nickname> - not yet implemented.\n"
-#~ "nudge <nickname> - remind a user to update.\n"
-#~ "invite <phone number> - not yet implemented.\n"
-#~ "track <word> - not yet implemented.\n"
-#~ "untrack <word> - not yet implemented.\n"
-#~ "track off - not yet implemented.\n"
-#~ "untrack all - not yet implemented.\n"
-#~ "tracks - not yet implemented.\n"
-#~ "tracking - not yet implemented.\n"
-#~ msgstr ""
-#~ "Команди:\n"
-#~ "on — увімкнути сповіщення\n"
-#~ "off — вимкнути сповіщення\n"
-#~ "help — список команд\n"
-#~ "follow <nickname> — підписатись до користувача\n"
-#~ "groups — спільноти, до яких ви входите\n"
-#~ "subscriptions — користувачі, до яких ви підписані\n"
-#~ "subscribers — користувачі, які підписані до вас\n"
-#~ "leave <nickname> — відписатись від користувача\n"
-#~ "d <nickname> <text> — надіслати особисте повідомлення\n"
-#~ "get <nickname> — отримати останній допис користувача\n"
-#~ "whois <nickname> — інфо про користувача\n"
-#~ "fav <nickname> — додати останній допис користувача до обраних\n"
-#~ "fav #<notice_id> — додати допис до обраних\n"
-#~ "reply #<notice_id> — відповісти на допис\n"
-#~ "reply <nickname> — відповісти на останній допис користувача\n"
-#~ "join <group> — приєднатися до спільноти\n"
-#~ "login — отримати посилання входу до веб-інтерфейсу\n"
-#~ "drop <group> — залишити спільноту\n"
-#~ "stats — отримати статистику\n"
-#~ "stop — те саме що і 'off'\n"
-#~ "quit — те саме що і 'off'\n"
-#~ "sub <nickname> — те саме що і 'follow'\n"
-#~ "unsub <nickname> — те саме що і 'leave'\n"
-#~ "last <nickname> — те саме що і 'get'\n"
-#~ "on <nickname> — наразі не виконується\n"
-#~ "off <nickname> — наразі не виконується\n"
-#~ "nudge <nickname> — «розштовхати»\n"
-#~ "invite <phone number> — наразі не виконується\n"
-#~ "track <word> — наразі не виконується\n"
-#~ "untrack <word> — наразі не виконується\n"
-#~ "track off — наразі не виконується\n"
-#~ "untrack all — наразі не виконується\n"
-#~ "tracks — наразі не виконується\n"
-#~ "tracking — наразі не виконується\n"
-
-#~ msgid "Edit Avatar"
-#~ msgstr "Аватара"
+#~ msgid "Invalid tag: \"%s\""
+#~ msgstr "Недійсний теґ: «%s»"
diff --git a/locale/zh_CN/LC_MESSAGES/statusnet.po b/locale/zh_CN/LC_MESSAGES/statusnet.po
index 1b63db606d..dbb62b98fc 100644
--- a/locale/zh_CN/LC_MESSAGES/statusnet.po
+++ b/locale/zh_CN/LC_MESSAGES/statusnet.po
@@ -15,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-17 09:47+0000\n"
-"PO-Revision-Date: 2011-03-17 09:50:02+0000\n"
+"POT-Creation-Date: 2011-03-17 12:35+0000\n"
+"PO-Revision-Date: 2011-03-17 12:38:24+0000\n"
 "Language-Team: Simplified Chinese <http://translatewiki.net/wiki/Portal:zh-"
 "hans>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -26,7 +26,7 @@ msgstr ""
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-POT-Import-Date: 2011-03-11 18:52:41+0000\n"
+"X-POT-Import-Date: 2011-03-17 10:19:27+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -3792,6 +3792,8 @@ msgstr "语言过长(不能超过50个字符)。"
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
+#. TRANS: Form validation error when entering an invalid tag.
+#. TRANS: %s is the invalid tag.
 #, php-format
 msgid "Invalid tag: \"%s\"."
 msgstr "无效的标记： %s。"
@@ -4602,7 +4604,6 @@ msgstr "来自 %1$s 的 %2$s 消息"
 msgid "Notice deleted."
 msgstr "消息已删除"
 
-#, fuzzy
 msgid "Notice"
 msgstr "消息"
 
@@ -5127,16 +5128,13 @@ msgstr "用户页面"
 msgid "Tag user"
 msgstr "将用户加为标签"
 
+#, fuzzy
 msgid ""
-"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
-"separated"
+"Tags for this user (letters, numbers, -, ., and _), separated by commas or "
+"spaces."
 msgstr ""
 "给这个用户加注标签 (字母letters, 数字numbers, -, ., and _), 逗号或空格分隔"
 
-#, php-format
-msgid "Invalid tag: \"%s\""
-msgstr "无效的标签：\"%s\"。"
-
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr "你只能给你关注或关注你的人添加标签。"
@@ -8027,87 +8025,5 @@ msgstr "不合法的XML, 缺少XRD根"
 msgid "Getting backup from file '%s'."
 msgstr "从文件'%s'获取备份。"
 
-#~ msgid "Note"
-#~ msgstr "注释"
-
-#~ msgid ""
-#~ "Commands:\n"
-#~ "on - turn on notifications\n"
-#~ "off - turn off notifications\n"
-#~ "help - show this help\n"
-#~ "follow <nickname> - subscribe to user\n"
-#~ "groups - lists the groups you have joined\n"
-#~ "subscriptions - list the people you follow\n"
-#~ "subscribers - list the people that follow you\n"
-#~ "leave <nickname> - unsubscribe from user\n"
-#~ "d <nickname> <text> - direct message to user\n"
-#~ "get <nickname> - get last notice from user\n"
-#~ "whois <nickname> - get profile info on user\n"
-#~ "lose <nickname> - force user to stop following you\n"
-#~ "fav <nickname> - add user's last notice as a 'fave'\n"
-#~ "fav #<notice_id> - add notice with the given id as a 'fave'\n"
-#~ "repeat #<notice_id> - repeat a notice with a given id\n"
-#~ "repeat <nickname> - repeat the last notice from user\n"
-#~ "reply #<notice_id> - reply to notice with a given id\n"
-#~ "reply <nickname> - reply to the last notice from user\n"
-#~ "join <group> - join group\n"
-#~ "login - Get a link to login to the web interface\n"
-#~ "drop <group> - leave group\n"
-#~ "stats - get your stats\n"
-#~ "stop - same as 'off'\n"
-#~ "quit - same as 'off'\n"
-#~ "sub <nickname> - same as 'follow'\n"
-#~ "unsub <nickname> - same as 'leave'\n"
-#~ "last <nickname> - same as 'get'\n"
-#~ "on <nickname> - not yet implemented.\n"
-#~ "off <nickname> - not yet implemented.\n"
-#~ "nudge <nickname> - remind a user to update.\n"
-#~ "invite <phone number> - not yet implemented.\n"
-#~ "track <word> - not yet implemented.\n"
-#~ "untrack <word> - not yet implemented.\n"
-#~ "track off - not yet implemented.\n"
-#~ "untrack all - not yet implemented.\n"
-#~ "tracks - not yet implemented.\n"
-#~ "tracking - not yet implemented.\n"
-#~ msgstr ""
-#~ "命令：\n"
-#~ "on - 打开提醒\n"
-#~ "off - 关闭提醒\n"
-#~ "help - 显示此帮助\n"
-#~ "follow <昵称> - 关注该用户\n"
-#~ "groups - 列出你加入的小组\n"
-#~ "subscriptions - 列出你关注的用户\n"
-#~ "subscribers - 列出你的关注者\n"
-#~ "leave <昵称> - 取消关注该用户\n"
-#~ "d <昵称> <文字> - 给该用户发送私信\n"
-#~ "get <昵称> - 获取该用户的最后一条消息\n"
-#~ "whois <昵称> - 获取该用户的个人信息\n"
-#~ "lose <昵称> - 强行取消该用户对你的关注\n"
-#~ "fav <昵称> - 将该用户最后一条消息加为'收藏'\n"
-#~ "fav #<消息id> - 将该id的消息加为'收藏'\n"
-#~ "repeat #<消息id> - 转发该id的消息\n"
-#~ "repeat <昵称> - 转发该用户的最后一条消息\n"
-#~ "reply #<消息id> - 对该id消息回复\n"
-#~ "reply <昵称> - 对该用户的最后一条消息回复\n"
-#~ "join <小组> - 加入小组\n"
-#~ "login - 获取网页登录的地址\n"
-#~ "drop <小组> - 离开小组\n"
-#~ "stats - 获取你的统计\n"
-#~ "stop - 和'off'相同\n"
-#~ "quit - 和'off'相同\n"
-#~ "sub <昵称> - 和'follow'相同\n"
-#~ "unsub <昵称> - 和'leave'相同\n"
-#~ "last <昵称> - 和'get'相同\n"
-#~ "on <昵称> - 尚未实现。\n"
-#~ "off <昵称> - 尚未实现。\n"
-#~ "nudge <昵称> - 提醒该用户更新消息。\n"
-#~ "invite <电话号码> - 尚未实现。\n"
-#~ "track <word> - 尚未实现。\n"
-#~ "untrack <word> - 尚未实现。\n"
-#~ "track off - 尚未实现。\n"
-#~ "untrack all - 尚未实现。\n"
-#~ "tracks - 尚未实现。\n"
-#~ "tracking - 尚未实现。\n"
-
-#~ msgid "Edit Avatar"
-#~ msgstr "编辑头像"
+#~ msgid "Invalid tag: \"%s\""
+#~ msgstr "无效的标签：\"%s\"。"
diff --git a/plugins/ExtendedProfile/locale/ExtendedProfile.pot b/plugins/ExtendedProfile/locale/ExtendedProfile.pot
index 76634319a5..72ef814f07 100644
--- a/plugins/ExtendedProfile/locale/ExtendedProfile.pot
+++ b/plugins/ExtendedProfile/locale/ExtendedProfile.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-17 09:47+0000\n"
+"POT-Creation-Date: 2011-03-17 12:35+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -20,41 +20,67 @@ msgstr ""
 msgid "Extended profile settings"
 msgstr ""
 
+#. TRANS: Usage instructions for profile settings.
+#: actions/profiledetailsettings.php:40
+msgid ""
+"You can update your personal profile info here so people know more about you."
+msgstr ""
+
 #: actions/profiledetailsettings.php:63
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 
-#. TRANS: Message given submitting a form with an unknown action
+#. TRANS: Message given submitting a form with an unknown action.
 #: actions/profiledetailsettings.php:74
 msgid "Unexpected form submission."
 msgstr ""
 
-#: actions/profiledetailsettings.php:145
+#: actions/profiledetailsettings.php:136
+msgid "Details saved."
+msgstr ""
+
+#. TRANS: Exception thrown when no date was entered in a required date field.
+#. TRANS: %s is the field name.
+#: actions/profiledetailsettings.php:147
 #, php-format
 msgid "You must supply a date for \"%s\"."
 msgstr ""
 
-#: actions/profiledetailsettings.php:155
+#. TRANS: Exception thrown on incorrect data input.
+#. TRANS: %1$s is a field name, %2$s is the incorrect input.
+#: actions/profiledetailsettings.php:159
 #, php-format
-msgid "Invalid date entered for \"%s\": %s"
+msgid "Invalid date entered for \"%1$s\": %2$s."
 msgstr ""
 
-#: actions/profiledetailsettings.php:269
+#. TRANS: Exception thrown when entering an invalid URL.
+#. TRANS: %s is the invalid URL.
+#: actions/profiledetailsettings.php:275
 #, php-format
-msgid "Invalid URL: %s"
+msgid "Invalid URL: %s."
 msgstr ""
 
-#: actions/profiledetailsettings.php:517 actions/profiledetailsettings.php:529
+#: actions/profiledetailsettings.php:523 actions/profiledetailsettings.php:535
 msgid "Could not save profile details."
 msgstr ""
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
-#: actions/profiledetailsettings.php:574
+#: actions/profiledetailsettings.php:580
 #, php-format
 msgid "Invalid tag: \"%s\"."
 msgstr ""
 
+#. TRANS: Server error thrown when user profile settings could not be saved.
+#: actions/profiledetailsettings.php:622
+msgid "Could not save profile."
+msgstr ""
+
+#. TRANS: Server error thrown when user profile settings tags could not be saved.
+#: actions/profiledetailsettings.php:631
+msgid "Could not save tags."
+msgstr ""
+
 #. TRANS: Link title for link on user profile.
 #: actions/profiledetail.php:52
 msgid "Edit extended profile settings"
diff --git a/plugins/ExtendedProfile/locale/br/LC_MESSAGES/ExtendedProfile.po b/plugins/ExtendedProfile/locale/br/LC_MESSAGES/ExtendedProfile.po
index 7811b90c57..fdc8ebe42b 100644
--- a/plugins/ExtendedProfile/locale/br/LC_MESSAGES/ExtendedProfile.po
+++ b/plugins/ExtendedProfile/locale/br/LC_MESSAGES/ExtendedProfile.po
@@ -9,12 +9,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ExtendedProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-17 09:47+0000\n"
-"PO-Revision-Date: 2011-03-17 09:50:37+0000\n"
+"POT-Creation-Date: 2011-03-17 12:35+0000\n"
+"PO-Revision-Date: 2011-03-17 12:38:58+0000\n"
 "Language-Team: Breton <http://translatewiki.net/wiki/Portal:br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-11 18:53:18+0000\n"
+"X-POT-Import-Date: 2011-03-17 10:19:30+0000\n"
 "X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
@@ -24,23 +24,37 @@ msgstr ""
 msgid "Extended profile settings"
 msgstr "Arventennoù ledanet ar profil"
 
+#. TRANS: Usage instructions for profile settings.
+msgid ""
+"You can update your personal profile info here so people know more about you."
+msgstr ""
+
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 
-#. TRANS: Message given submitting a form with an unknown action
+#. TRANS: Message given submitting a form with an unknown action.
 msgid "Unexpected form submission."
 msgstr ""
 
+msgid "Details saved."
+msgstr ""
+
+#. TRANS: Exception thrown when no date was entered in a required date field.
+#. TRANS: %s is the field name.
 #, php-format
 msgid "You must supply a date for \"%s\"."
 msgstr ""
 
+#. TRANS: Exception thrown on incorrect data input.
+#. TRANS: %1$s is a field name, %2$s is the incorrect input.
 #, php-format
-msgid "Invalid date entered for \"%s\": %s"
+msgid "Invalid date entered for \"%1$s\": %2$s."
 msgstr ""
 
+#. TRANS: Exception thrown when entering an invalid URL.
+#. TRANS: %s is the invalid URL.
 #, php-format
-msgid "Invalid URL: %s"
+msgid "Invalid URL: %s."
 msgstr ""
 
 msgid "Could not save profile details."
@@ -52,6 +66,14 @@ msgstr ""
 msgid "Invalid tag: \"%s\"."
 msgstr ""
 
+#. TRANS: Server error thrown when user profile settings could not be saved.
+msgid "Could not save profile."
+msgstr ""
+
+#. TRANS: Server error thrown when user profile settings tags could not be saved.
+msgid "Could not save tags."
+msgstr ""
+
 #. TRANS: Link title for link on user profile.
 msgid "Edit extended profile settings"
 msgstr "Aozañ arventennoù ledanet ar profil"
@@ -142,6 +164,3 @@ msgstr "Skiant-prenet"
 
 msgid "Education"
 msgstr "Deskadurezh"
-
-#~ msgid "Details"
-#~ msgstr "Munudoù"
diff --git a/plugins/ExtendedProfile/locale/ia/LC_MESSAGES/ExtendedProfile.po b/plugins/ExtendedProfile/locale/ia/LC_MESSAGES/ExtendedProfile.po
index 3db39dee2f..9b393a529c 100644
--- a/plugins/ExtendedProfile/locale/ia/LC_MESSAGES/ExtendedProfile.po
+++ b/plugins/ExtendedProfile/locale/ia/LC_MESSAGES/ExtendedProfile.po
@@ -9,12 +9,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ExtendedProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-17 09:47+0000\n"
-"PO-Revision-Date: 2011-03-17 09:50:37+0000\n"
+"POT-Creation-Date: 2011-03-17 12:35+0000\n"
+"PO-Revision-Date: 2011-03-17 12:38:58+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-11 18:53:18+0000\n"
+"X-POT-Import-Date: 2011-03-17 10:19:30+0000\n"
 "X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
@@ -24,23 +24,37 @@ msgstr ""
 msgid "Extended profile settings"
 msgstr "Configuration extendite del profilo"
 
+#. TRANS: Usage instructions for profile settings.
+msgid ""
+"You can update your personal profile info here so people know more about you."
+msgstr ""
+
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 
-#. TRANS: Message given submitting a form with an unknown action
+#. TRANS: Message given submitting a form with an unknown action.
 msgid "Unexpected form submission."
 msgstr ""
 
+msgid "Details saved."
+msgstr ""
+
+#. TRANS: Exception thrown when no date was entered in a required date field.
+#. TRANS: %s is the field name.
 #, php-format
 msgid "You must supply a date for \"%s\"."
 msgstr ""
 
+#. TRANS: Exception thrown on incorrect data input.
+#. TRANS: %1$s is a field name, %2$s is the incorrect input.
 #, php-format
-msgid "Invalid date entered for \"%s\": %s"
+msgid "Invalid date entered for \"%1$s\": %2$s."
 msgstr ""
 
+#. TRANS: Exception thrown when entering an invalid URL.
+#. TRANS: %s is the invalid URL.
 #, php-format
-msgid "Invalid URL: %s"
+msgid "Invalid URL: %s."
 msgstr ""
 
 msgid "Could not save profile details."
@@ -52,6 +66,14 @@ msgstr ""
 msgid "Invalid tag: \"%s\"."
 msgstr ""
 
+#. TRANS: Server error thrown when user profile settings could not be saved.
+msgid "Could not save profile."
+msgstr ""
+
+#. TRANS: Server error thrown when user profile settings tags could not be saved.
+msgid "Could not save tags."
+msgstr ""
+
 #. TRANS: Link title for link on user profile.
 msgid "Edit extended profile settings"
 msgstr "Modificar configuration extendite del profilo"
@@ -142,6 +164,3 @@ msgstr "Experientia professional"
 
 msgid "Education"
 msgstr "Education"
-
-#~ msgid "Details"
-#~ msgstr "Detalios"
diff --git a/plugins/ExtendedProfile/locale/mk/LC_MESSAGES/ExtendedProfile.po b/plugins/ExtendedProfile/locale/mk/LC_MESSAGES/ExtendedProfile.po
index 895be3757e..7f96838a8b 100644
--- a/plugins/ExtendedProfile/locale/mk/LC_MESSAGES/ExtendedProfile.po
+++ b/plugins/ExtendedProfile/locale/mk/LC_MESSAGES/ExtendedProfile.po
@@ -9,12 +9,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ExtendedProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-17 09:47+0000\n"
-"PO-Revision-Date: 2011-03-17 09:50:37+0000\n"
+"POT-Creation-Date: 2011-03-17 12:35+0000\n"
+"PO-Revision-Date: 2011-03-17 12:38:58+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-11 18:53:18+0000\n"
+"X-POT-Import-Date: 2011-03-17 10:19:30+0000\n"
 "X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
@@ -24,23 +24,37 @@ msgstr ""
 msgid "Extended profile settings"
 msgstr "Проширени профилни нагодувања"
 
+#. TRANS: Usage instructions for profile settings.
+msgid ""
+"You can update your personal profile info here so people know more about you."
+msgstr ""
+
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 
-#. TRANS: Message given submitting a form with an unknown action
+#. TRANS: Message given submitting a form with an unknown action.
 msgid "Unexpected form submission."
 msgstr ""
 
+msgid "Details saved."
+msgstr ""
+
+#. TRANS: Exception thrown when no date was entered in a required date field.
+#. TRANS: %s is the field name.
 #, php-format
 msgid "You must supply a date for \"%s\"."
 msgstr ""
 
+#. TRANS: Exception thrown on incorrect data input.
+#. TRANS: %1$s is a field name, %2$s is the incorrect input.
 #, php-format
-msgid "Invalid date entered for \"%s\": %s"
+msgid "Invalid date entered for \"%1$s\": %2$s."
 msgstr ""
 
+#. TRANS: Exception thrown when entering an invalid URL.
+#. TRANS: %s is the invalid URL.
 #, php-format
-msgid "Invalid URL: %s"
+msgid "Invalid URL: %s."
 msgstr ""
 
 msgid "Could not save profile details."
@@ -52,6 +66,14 @@ msgstr ""
 msgid "Invalid tag: \"%s\"."
 msgstr ""
 
+#. TRANS: Server error thrown when user profile settings could not be saved.
+msgid "Could not save profile."
+msgstr ""
+
+#. TRANS: Server error thrown when user profile settings tags could not be saved.
+msgid "Could not save tags."
+msgstr ""
+
 #. TRANS: Link title for link on user profile.
 msgid "Edit extended profile settings"
 msgstr "Уреди проширени профилни нагодувања"
@@ -142,6 +164,3 @@ msgstr "Работно искуство"
 
 msgid "Education"
 msgstr "Образование"
-
-#~ msgid "Details"
-#~ msgstr "Подробности"
diff --git a/plugins/ExtendedProfile/locale/nl/LC_MESSAGES/ExtendedProfile.po b/plugins/ExtendedProfile/locale/nl/LC_MESSAGES/ExtendedProfile.po
index 1adbdc93ec..9028acbf78 100644
--- a/plugins/ExtendedProfile/locale/nl/LC_MESSAGES/ExtendedProfile.po
+++ b/plugins/ExtendedProfile/locale/nl/LC_MESSAGES/ExtendedProfile.po
@@ -9,12 +9,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ExtendedProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-17 09:47+0000\n"
-"PO-Revision-Date: 2011-03-17 09:50:37+0000\n"
+"POT-Creation-Date: 2011-03-17 12:35+0000\n"
+"PO-Revision-Date: 2011-03-17 12:38:58+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-11 18:53:18+0000\n"
+"X-POT-Import-Date: 2011-03-17 10:19:30+0000\n"
 "X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
@@ -24,33 +24,59 @@ msgstr ""
 msgid "Extended profile settings"
 msgstr "Uitgebreide profielinstellingen"
 
+#. TRANS: Usage instructions for profile settings.
+msgid ""
+"You can update your personal profile info here so people know more about you."
+msgstr ""
+
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
+"Er is een probleem ontstaan met uw sessie. Probeer het nog een keer, "
+"alstublieft."
 
-#. TRANS: Message given submitting a form with an unknown action
+#. TRANS: Message given submitting a form with an unknown action.
 msgid "Unexpected form submission."
+msgstr "Het formulier is onverwacht ingezonden."
+
+msgid "Details saved."
 msgstr ""
 
+#. TRANS: Exception thrown when no date was entered in a required date field.
+#. TRANS: %s is the field name.
 #, php-format
 msgid "You must supply a date for \"%s\"."
-msgstr ""
+msgstr "U moet een datum opgeven voor \"%s\"."
 
-#, php-format
-msgid "Invalid date entered for \"%s\": %s"
-msgstr ""
+#. TRANS: Exception thrown on incorrect data input.
+#. TRANS: %1$s is a field name, %2$s is the incorrect input.
+#, fuzzy, php-format
+msgid "Invalid date entered for \"%1$s\": %2$s."
+msgstr "Er is een ongeldige datum opgegeven voor \"%s\": %s."
 
-#, php-format
-msgid "Invalid URL: %s"
-msgstr ""
+#. TRANS: Exception thrown when entering an invalid URL.
+#. TRANS: %s is the invalid URL.
+#, fuzzy, php-format
+msgid "Invalid URL: %s."
+msgstr "Ongeldige URL: %s."
 
 msgid "Could not save profile details."
-msgstr ""
+msgstr "Het was niet mogelijk de profielgegevens op te slaan."
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
 #, php-format
 msgid "Invalid tag: \"%s\"."
-msgstr ""
+msgstr "Ongeldig label: \"%s\"."
+
+#. TRANS: Server error thrown when user profile settings could not be saved.
+#, fuzzy
+msgid "Could not save profile."
+msgstr "Het was niet mogelijk de profielgegevens op te slaan."
+
+#. TRANS: Server error thrown when user profile settings tags could not be saved.
+#, fuzzy
+msgid "Could not save tags."
+msgstr "Het was niet mogelijk de profielgegevens op te slaan."
 
 #. TRANS: Link title for link on user profile.
 msgid "Edit extended profile settings"
@@ -67,29 +93,29 @@ msgid "More details..."
 msgstr "Meer details..."
 
 msgid "Company"
-msgstr ""
+msgstr "Bedrijf"
 
 msgid "Start"
-msgstr ""
+msgstr "Begin"
 
 msgid "End"
-msgstr ""
+msgstr "Eind"
 
 msgid "Current"
-msgstr ""
+msgstr "Huidig"
 
 msgid "Institution"
 msgstr "Instelling"
 
 msgid "Degree"
-msgstr ""
+msgstr "Graad"
 
 msgid "Description"
-msgstr ""
+msgstr "Beschrijving"
 
 msgctxt "BUTTON"
 msgid "Save"
-msgstr ""
+msgstr "Opslaan"
 
 msgid "Phone"
 msgstr "Telefoonnummer"
@@ -97,9 +123,8 @@ msgstr "Telefoonnummer"
 msgid "IM"
 msgstr "IM"
 
-#, fuzzy
 msgid "Website"
-msgstr "Websites"
+msgstr "Website"
 
 msgid "Employer"
 msgstr "Werkgever"
@@ -142,6 +167,3 @@ msgstr "Werkervaring"
 
 msgid "Education"
 msgstr "Opleiding"
-
-#~ msgid "Details"
-#~ msgstr "Details"
diff --git a/plugins/ExtendedProfile/locale/sv/LC_MESSAGES/ExtendedProfile.po b/plugins/ExtendedProfile/locale/sv/LC_MESSAGES/ExtendedProfile.po
index f935d8de42..13ff3e2f9b 100644
--- a/plugins/ExtendedProfile/locale/sv/LC_MESSAGES/ExtendedProfile.po
+++ b/plugins/ExtendedProfile/locale/sv/LC_MESSAGES/ExtendedProfile.po
@@ -9,12 +9,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ExtendedProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-17 09:47+0000\n"
-"PO-Revision-Date: 2011-03-17 09:50:37+0000\n"
+"POT-Creation-Date: 2011-03-17 12:35+0000\n"
+"PO-Revision-Date: 2011-03-17 12:38:58+0000\n"
 "Language-Team: Swedish <http://translatewiki.net/wiki/Portal:sv>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-11 18:53:18+0000\n"
+"X-POT-Import-Date: 2011-03-17 10:19:30+0000\n"
 "X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: sv\n"
@@ -24,23 +24,37 @@ msgstr ""
 msgid "Extended profile settings"
 msgstr "Utökade profilinställningar"
 
+#. TRANS: Usage instructions for profile settings.
+msgid ""
+"You can update your personal profile info here so people know more about you."
+msgstr ""
+
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 
-#. TRANS: Message given submitting a form with an unknown action
+#. TRANS: Message given submitting a form with an unknown action.
 msgid "Unexpected form submission."
 msgstr ""
 
+msgid "Details saved."
+msgstr ""
+
+#. TRANS: Exception thrown when no date was entered in a required date field.
+#. TRANS: %s is the field name.
 #, php-format
 msgid "You must supply a date for \"%s\"."
 msgstr ""
 
+#. TRANS: Exception thrown on incorrect data input.
+#. TRANS: %1$s is a field name, %2$s is the incorrect input.
 #, php-format
-msgid "Invalid date entered for \"%s\": %s"
+msgid "Invalid date entered for \"%1$s\": %2$s."
 msgstr ""
 
+#. TRANS: Exception thrown when entering an invalid URL.
+#. TRANS: %s is the invalid URL.
 #, php-format
-msgid "Invalid URL: %s"
+msgid "Invalid URL: %s."
 msgstr ""
 
 msgid "Could not save profile details."
@@ -52,6 +66,14 @@ msgstr ""
 msgid "Invalid tag: \"%s\"."
 msgstr ""
 
+#. TRANS: Server error thrown when user profile settings could not be saved.
+msgid "Could not save profile."
+msgstr ""
+
+#. TRANS: Server error thrown when user profile settings tags could not be saved.
+msgid "Could not save tags."
+msgstr ""
+
 #. TRANS: Link title for link on user profile.
 msgid "Edit extended profile settings"
 msgstr "Redigera utökade profilinställningar"
@@ -142,6 +164,3 @@ msgstr "Arbetserfarenhet"
 
 msgid "Education"
 msgstr "Utbildning"
-
-#~ msgid "Details"
-#~ msgstr "Detaljer"
diff --git a/plugins/ExtendedProfile/locale/uk/LC_MESSAGES/ExtendedProfile.po b/plugins/ExtendedProfile/locale/uk/LC_MESSAGES/ExtendedProfile.po
index 9cb239b9b3..3aed7b288e 100644
--- a/plugins/ExtendedProfile/locale/uk/LC_MESSAGES/ExtendedProfile.po
+++ b/plugins/ExtendedProfile/locale/uk/LC_MESSAGES/ExtendedProfile.po
@@ -9,12 +9,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ExtendedProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-17 09:47+0000\n"
-"PO-Revision-Date: 2011-03-17 09:50:37+0000\n"
+"POT-Creation-Date: 2011-03-17 12:35+0000\n"
+"PO-Revision-Date: 2011-03-17 12:38:58+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-11 18:53:18+0000\n"
+"X-POT-Import-Date: 2011-03-17 10:19:30+0000\n"
 "X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
@@ -25,23 +25,37 @@ msgstr ""
 msgid "Extended profile settings"
 msgstr "Розширені налаштування профілю"
 
+#. TRANS: Usage instructions for profile settings.
+msgid ""
+"You can update your personal profile info here so people know more about you."
+msgstr ""
+
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 
-#. TRANS: Message given submitting a form with an unknown action
+#. TRANS: Message given submitting a form with an unknown action.
 msgid "Unexpected form submission."
 msgstr ""
 
+msgid "Details saved."
+msgstr ""
+
+#. TRANS: Exception thrown when no date was entered in a required date field.
+#. TRANS: %s is the field name.
 #, php-format
 msgid "You must supply a date for \"%s\"."
 msgstr ""
 
+#. TRANS: Exception thrown on incorrect data input.
+#. TRANS: %1$s is a field name, %2$s is the incorrect input.
 #, php-format
-msgid "Invalid date entered for \"%s\": %s"
+msgid "Invalid date entered for \"%1$s\": %2$s."
 msgstr ""
 
+#. TRANS: Exception thrown when entering an invalid URL.
+#. TRANS: %s is the invalid URL.
 #, php-format
-msgid "Invalid URL: %s"
+msgid "Invalid URL: %s."
 msgstr ""
 
 msgid "Could not save profile details."
@@ -53,6 +67,14 @@ msgstr ""
 msgid "Invalid tag: \"%s\"."
 msgstr ""
 
+#. TRANS: Server error thrown when user profile settings could not be saved.
+msgid "Could not save profile."
+msgstr ""
+
+#. TRANS: Server error thrown when user profile settings tags could not be saved.
+msgid "Could not save tags."
+msgstr ""
+
 #. TRANS: Link title for link on user profile.
 msgid "Edit extended profile settings"
 msgstr "Змінити розширені налаштування профілю"
@@ -143,6 +165,3 @@ msgstr "Досвід роботи"
 
 msgid "Education"
 msgstr "Освіта"
-
-#~ msgid "Details"
-#~ msgstr "Деталі"
diff --git a/plugins/SubMirror/locale/SubMirror.pot b/plugins/SubMirror/locale/SubMirror.pot
index b152575321..95f10897ac 100644
--- a/plugins/SubMirror/locale/SubMirror.pot
+++ b/plugins/SubMirror/locale/SubMirror.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-17 09:47+0000\n"
+"POT-Creation-Date: 2011-03-17 12:35+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,33 +16,36 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: actions/basemirror.php:71
+#. TRANS: Client error displayed when entering an invalid URL for a feed.
+#. TRANS: %s is the invalid feed URL.
+#: actions/basemirror.php:73
 #, php-format
-msgid "Invalid feed URL: %s"
+msgid "Invalid feed URL: %s."
 msgstr ""
 
-#. TRANS: Error message returned to user when setting up feed mirroring, but we were unable to resolve the given URL to a working feed.
-#: actions/basemirror.php:83
+#. TRANS: Error message returned to user when setting up feed mirroring,
+#. TRANS: but we were unable to resolve the given URL to a working feed.
+#: actions/basemirror.php:86
 msgid "Invalid profile for mirroring."
 msgstr ""
 
-#: actions/basemirror.php:101
-msgid "Can't mirror a StatusNet group at this time."
+#: actions/basemirror.php:104
+msgid "Cannot mirror a StatusNet group at this time."
 msgstr ""
 
-#: actions/basemirror.php:115
+#: actions/basemirror.php:118
 msgid "This action only accepts POST requests."
 msgstr ""
 
-#: actions/basemirror.php:123
+#: actions/basemirror.php:126
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 
-#: actions/basemirror.php:133
+#: actions/basemirror.php:136
 msgid "Not logged in."
 msgstr ""
 
-#: actions/basemirror.php:156
+#: actions/basemirror.php:159
 msgid "Subscribed"
 msgstr ""
 
diff --git a/plugins/SubMirror/locale/de/LC_MESSAGES/SubMirror.po b/plugins/SubMirror/locale/de/LC_MESSAGES/SubMirror.po
index 76a5203c5e..e5354f04fe 100644
--- a/plugins/SubMirror/locale/de/LC_MESSAGES/SubMirror.po
+++ b/plugins/SubMirror/locale/de/LC_MESSAGES/SubMirror.po
@@ -9,27 +9,31 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SubMirror\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-17 09:47+0000\n"
-"PO-Revision-Date: 2011-03-17 09:52:01+0000\n"
+"POT-Creation-Date: 2011-03-17 12:35+0000\n"
+"PO-Revision-Date: 2011-03-17 12:40:24+0000\n"
 "Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-06 02:19:34+0000\n"
+"X-POT-Import-Date: 2011-03-17 10:20:13+0000\n"
 "X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-submirror\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Client error displayed when entering an invalid URL for a feed.
+#. TRANS: %s is the invalid feed URL.
 #, fuzzy, php-format
-msgid "Invalid feed URL: %s"
+msgid "Invalid feed URL: %s."
 msgstr "Ungültige Feed-URL."
 
-#. TRANS: Error message returned to user when setting up feed mirroring, but we were unable to resolve the given URL to a working feed.
+#. TRANS: Error message returned to user when setting up feed mirroring,
+#. TRANS: but we were unable to resolve the given URL to a working feed.
 msgid "Invalid profile for mirroring."
 msgstr "Ungültiges Profil für das Spiegeln."
 
-msgid "Can't mirror a StatusNet group at this time."
+#, fuzzy
+msgid "Cannot mirror a StatusNet group at this time."
 msgstr "Kann im Moment keine StatusNet-Gruppe spiegeln."
 
 msgid "This action only accepts POST requests."
diff --git a/plugins/SubMirror/locale/fr/LC_MESSAGES/SubMirror.po b/plugins/SubMirror/locale/fr/LC_MESSAGES/SubMirror.po
index 1216906eb9..c2e0aebfe2 100644
--- a/plugins/SubMirror/locale/fr/LC_MESSAGES/SubMirror.po
+++ b/plugins/SubMirror/locale/fr/LC_MESSAGES/SubMirror.po
@@ -10,27 +10,31 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SubMirror\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-17 09:47+0000\n"
-"PO-Revision-Date: 2011-03-17 09:52:01+0000\n"
+"POT-Creation-Date: 2011-03-17 12:35+0000\n"
+"PO-Revision-Date: 2011-03-17 12:40:24+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-06 02:19:34+0000\n"
+"X-POT-Import-Date: 2011-03-17 10:20:13+0000\n"
 "X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-submirror\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#. TRANS: Client error displayed when entering an invalid URL for a feed.
+#. TRANS: %s is the invalid feed URL.
 #, fuzzy, php-format
-msgid "Invalid feed URL: %s"
+msgid "Invalid feed URL: %s."
 msgstr "Adresse URL de flux invalide."
 
-#. TRANS: Error message returned to user when setting up feed mirroring, but we were unable to resolve the given URL to a working feed.
+#. TRANS: Error message returned to user when setting up feed mirroring,
+#. TRANS: but we were unable to resolve the given URL to a working feed.
 msgid "Invalid profile for mirroring."
 msgstr "Profil invalide pour la mise en miroir."
 
-msgid "Can't mirror a StatusNet group at this time."
+#, fuzzy
+msgid "Cannot mirror a StatusNet group at this time."
 msgstr "Impossible de mettre en miroir un groupe StatusNet actuellement."
 
 msgid "This action only accepts POST requests."
diff --git a/plugins/SubMirror/locale/ia/LC_MESSAGES/SubMirror.po b/plugins/SubMirror/locale/ia/LC_MESSAGES/SubMirror.po
index 19eb4e9f01..c3ca96379b 100644
--- a/plugins/SubMirror/locale/ia/LC_MESSAGES/SubMirror.po
+++ b/plugins/SubMirror/locale/ia/LC_MESSAGES/SubMirror.po
@@ -9,27 +9,31 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SubMirror\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-17 09:47+0000\n"
-"PO-Revision-Date: 2011-03-17 09:52:01+0000\n"
+"POT-Creation-Date: 2011-03-17 12:35+0000\n"
+"PO-Revision-Date: 2011-03-17 12:40:24+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-06 02:19:34+0000\n"
+"X-POT-Import-Date: 2011-03-17 10:20:13+0000\n"
 "X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-submirror\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Client error displayed when entering an invalid URL for a feed.
+#. TRANS: %s is the invalid feed URL.
 #, fuzzy, php-format
-msgid "Invalid feed URL: %s"
+msgid "Invalid feed URL: %s."
 msgstr "URL de syndication invalide."
 
-#. TRANS: Error message returned to user when setting up feed mirroring, but we were unable to resolve the given URL to a working feed.
+#. TRANS: Error message returned to user when setting up feed mirroring,
+#. TRANS: but we were unable to resolve the given URL to a working feed.
 msgid "Invalid profile for mirroring."
 msgstr "Profilo invalide pro republication."
 
-msgid "Can't mirror a StatusNet group at this time."
+#, fuzzy
+msgid "Cannot mirror a StatusNet group at this time."
 msgstr "Al presente il es impossibile republicar un gruppo StatusNet."
 
 msgid "This action only accepts POST requests."
diff --git a/plugins/SubMirror/locale/mk/LC_MESSAGES/SubMirror.po b/plugins/SubMirror/locale/mk/LC_MESSAGES/SubMirror.po
index 8ca0053775..109120f33e 100644
--- a/plugins/SubMirror/locale/mk/LC_MESSAGES/SubMirror.po
+++ b/plugins/SubMirror/locale/mk/LC_MESSAGES/SubMirror.po
@@ -9,27 +9,31 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SubMirror\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-17 09:47+0000\n"
-"PO-Revision-Date: 2011-03-17 09:52:01+0000\n"
+"POT-Creation-Date: 2011-03-17 12:35+0000\n"
+"PO-Revision-Date: 2011-03-17 12:40:24+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-06 02:19:34+0000\n"
+"X-POT-Import-Date: 2011-03-17 10:20:13+0000\n"
 "X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-submirror\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
 
+#. TRANS: Client error displayed when entering an invalid URL for a feed.
+#. TRANS: %s is the invalid feed URL.
 #, fuzzy, php-format
-msgid "Invalid feed URL: %s"
+msgid "Invalid feed URL: %s."
 msgstr "Неважечка URL-адреса за каналот."
 
-#. TRANS: Error message returned to user when setting up feed mirroring, but we were unable to resolve the given URL to a working feed.
+#. TRANS: Error message returned to user when setting up feed mirroring,
+#. TRANS: but we were unable to resolve the given URL to a working feed.
 msgid "Invalid profile for mirroring."
 msgstr "Неважечки профил за отсликување."
 
-msgid "Can't mirror a StatusNet group at this time."
+#, fuzzy
+msgid "Cannot mirror a StatusNet group at this time."
 msgstr "Моментално не можам да отсликам група од StatusNet."
 
 msgid "This action only accepts POST requests."
diff --git a/plugins/SubMirror/locale/nl/LC_MESSAGES/SubMirror.po b/plugins/SubMirror/locale/nl/LC_MESSAGES/SubMirror.po
index 9c567df960..4117b8eeea 100644
--- a/plugins/SubMirror/locale/nl/LC_MESSAGES/SubMirror.po
+++ b/plugins/SubMirror/locale/nl/LC_MESSAGES/SubMirror.po
@@ -9,27 +9,31 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SubMirror\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-17 09:47+0000\n"
-"PO-Revision-Date: 2011-03-17 09:52:01+0000\n"
+"POT-Creation-Date: 2011-03-17 12:35+0000\n"
+"PO-Revision-Date: 2011-03-17 12:40:25+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-06 02:19:34+0000\n"
+"X-POT-Import-Date: 2011-03-17 10:20:13+0000\n"
 "X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-submirror\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Client error displayed when entering an invalid URL for a feed.
+#. TRANS: %s is the invalid feed URL.
 #, fuzzy, php-format
-msgid "Invalid feed URL: %s"
-msgstr "Ongeldige URL voor feed."
+msgid "Invalid feed URL: %s."
+msgstr "Ongeldige URL voor feed: %s."
 
-#. TRANS: Error message returned to user when setting up feed mirroring, but we were unable to resolve the given URL to a working feed.
+#. TRANS: Error message returned to user when setting up feed mirroring,
+#. TRANS: but we were unable to resolve the given URL to a working feed.
 msgid "Invalid profile for mirroring."
 msgstr "Ongeldig profiel om te spiegelen."
 
-msgid "Can't mirror a StatusNet group at this time."
+#, fuzzy
+msgid "Cannot mirror a StatusNet group at this time."
 msgstr "Het is niet mogelijk om een StatusNet-groep te spiegelen."
 
 msgid "This action only accepts POST requests."
@@ -94,7 +98,7 @@ msgid "Add feed"
 msgstr "Feed toevoegen"
 
 msgid "Twitter username:"
-msgstr ""
+msgstr "Twitter-gebruikersnaam:"
 
 msgctxt "LABEL"
 msgid "Remote feed:"
@@ -123,10 +127,10 @@ msgid "Stop mirroring"
 msgstr "Spiegelen beëindigen"
 
 msgid "Twitter"
-msgstr ""
+msgstr "Twitter"
 
 msgid "RSS or Atom feed"
-msgstr ""
+msgstr "RSS- of Atom-feed"
 
 msgid "Select a feed provider"
-msgstr ""
+msgstr "Selecteer een feedprovider"
diff --git a/plugins/SubMirror/locale/tl/LC_MESSAGES/SubMirror.po b/plugins/SubMirror/locale/tl/LC_MESSAGES/SubMirror.po
index 05089e9660..26e229b974 100644
--- a/plugins/SubMirror/locale/tl/LC_MESSAGES/SubMirror.po
+++ b/plugins/SubMirror/locale/tl/LC_MESSAGES/SubMirror.po
@@ -9,27 +9,31 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SubMirror\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-17 09:47+0000\n"
-"PO-Revision-Date: 2011-03-17 09:52:01+0000\n"
+"POT-Creation-Date: 2011-03-17 12:35+0000\n"
+"PO-Revision-Date: 2011-03-17 12:40:25+0000\n"
 "Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-06 02:19:34+0000\n"
+"X-POT-Import-Date: 2011-03-17 10:20:13+0000\n"
 "X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-submirror\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Client error displayed when entering an invalid URL for a feed.
+#. TRANS: %s is the invalid feed URL.
 #, fuzzy, php-format
-msgid "Invalid feed URL: %s"
+msgid "Invalid feed URL: %s."
 msgstr "Hindi tanggap na URL ng pakain."
 
-#. TRANS: Error message returned to user when setting up feed mirroring, but we were unable to resolve the given URL to a working feed.
+#. TRANS: Error message returned to user when setting up feed mirroring,
+#. TRANS: but we were unable to resolve the given URL to a working feed.
 msgid "Invalid profile for mirroring."
 msgstr "Hindi tanggap na balangkas para sa pagsasalamin."
 
-msgid "Can't mirror a StatusNet group at this time."
+#, fuzzy
+msgid "Cannot mirror a StatusNet group at this time."
 msgstr "Hindi maisalamin sa ngayon ang isang pangkat ng StatusNet."
 
 msgid "This action only accepts POST requests."
diff --git a/plugins/SubMirror/locale/uk/LC_MESSAGES/SubMirror.po b/plugins/SubMirror/locale/uk/LC_MESSAGES/SubMirror.po
index 6693d90adb..423ac24fee 100644
--- a/plugins/SubMirror/locale/uk/LC_MESSAGES/SubMirror.po
+++ b/plugins/SubMirror/locale/uk/LC_MESSAGES/SubMirror.po
@@ -9,12 +9,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SubMirror\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-17 09:47+0000\n"
-"PO-Revision-Date: 2011-03-17 09:52:01+0000\n"
+"POT-Creation-Date: 2011-03-17 12:35+0000\n"
+"PO-Revision-Date: 2011-03-17 12:40:25+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-06 02:19:34+0000\n"
+"X-POT-Import-Date: 2011-03-17 10:20:13+0000\n"
 "X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
@@ -22,15 +22,19 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
+#. TRANS: Client error displayed when entering an invalid URL for a feed.
+#. TRANS: %s is the invalid feed URL.
 #, fuzzy, php-format
-msgid "Invalid feed URL: %s"
+msgid "Invalid feed URL: %s."
 msgstr "Помилкова URL-адреса веб-стрічки."
 
-#. TRANS: Error message returned to user when setting up feed mirroring, but we were unable to resolve the given URL to a working feed.
+#. TRANS: Error message returned to user when setting up feed mirroring,
+#. TRANS: but we were unable to resolve the given URL to a working feed.
 msgid "Invalid profile for mirroring."
 msgstr "Помилковий профіль для віддзеркалення."
 
-msgid "Can't mirror a StatusNet group at this time."
+#, fuzzy
+msgid "Cannot mirror a StatusNet group at this time."
 msgstr "На даний момент не можу віддзеркалювати спільноту на сайті StatusNet."
 
 msgid "This action only accepts POST requests."